Index: OK/INSTALL
===================================================================
--- BOOK/INSTALL	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,47 +1,0 @@
-CLFS Book Conversion Tools Installation Instructions
-
-After downloading the SVN source, there are some things that need to be set up 
-on your computer if you want to convert the XML source into something easier to 
-read (e.g. HTML, TXT, or PDF).  If you are interested in this, then keep 
-reading.  If you are only interested in editing the XML source for re- 
-submission to the clfs-commits or clfs-dev mailing lists, then you do not need this 
-document.  Instead, you need to read the LFS Editor's Manual.  See the LFS 
-website at http://www.linuxfromscratch.org for more information.
-
--------------------------------------------------------------------------------
-
-If you want to convert the XML to HTML, install the following:
-
-* libxml2
-  - http://www.linuxfromscratch.org/blfs/view/svn/general/libxml2.html
-
-* libxslt
-  - http://www.linuxfromscratch.org/blfs/view/svn/general/libxslt.html
-
-* DocBook DTD 
-  - http://www.linuxfromscratch.org/blfs/view/svn/pst/xml.html
-
-* DocBook XSL Stylesheets 
-  - http://www.linuxfromscratch.org/blfs/view/svn/pst/docbook-xsl.html
-
-* HTMLTidy
-  - http://www.linuxfromscratch.org/blfs/view/svn/general/tidy.html
-
-------------------------------------------------------------------------------- 
-
-If you want to convert the XML to TXT, install the above items, and then install
-the following:
-
-* lynx
-  - http://www.linuxfromscratch.org/blfs/view/svn/basicnet/lynx.html
-
-------------------------------------------------------------------------------- 
-
-If you want to convert the XML to PDF, install the items listed above (except
-lynx) and then install the following:
-
-* JDK
-  - http://www.linuxfromscratch.org/blfs/view/svn/general/jdk.html
-
-* FOP and JAI
-  - http://www.linuxfromscratch.org/blfs/view/svn/pst/fop.html
Index: OK/Makefile
===================================================================
--- BOOK/Makefile	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,190 +1,0 @@
-BASEDIR		:= ~/cross-lfs-book
-DUMPDIR		:= ~/cross-lfs-commands
-DLLISTDIR	:= ~/cross-lfs-dllist
-RENDERTMP       := $(HOME)/tmp
-CHUNK_QUIET	:= 1
-ROOT_ID         :=
-
-S		:= -
-
-ARCHS		:= x86 x86_64 x86_64-64 sparc64 sparc64-64 ppc ppc64
-
-ARCHS_HTML	:= $(ARCHS:%=%$(S)html)
-ARCHS_NOCHUNKS	:= $(ARCHS:%=%$(S)nochunks)
-ARCHS_PDF	:= $(ARCHS:%=%$(S)pdf)
-ARCHS_VALIDATE	:= $(ARCHS:%=%$(S)validate)
-ARCHS_TROUBLE	:= $(ARCHS:%=%$(S)trouble)
-ARCHS_DUMP	:= $(ARCHS:%=%$(S)dump)
-ARCHS_DLLIST	:= $(ARCHS:%=%$(S)dllist)
-
-ifdef V
-  Q =
-else
-  Q = @
-endif
-
-.PHONY: lfs tidy render titlepage $(ARCHS_HTML) nochunks $(ARCHS_NOCHUNKS) pdf \
-	$(ARCHS_PDF) validate $(ARCHS_VALIDATE) trouble $(ARCHS_TROUBLE) \
-	dump-commands $(ARCHS_DUMP) download-list $(ARCHS_DLLIST) tmpdir
-
-lfs: tmpdir render tidy
-
-tmpdir:
-	@echo "Creating and cleaning $(RENDERTMP)"
-	$(Q)[ -d $(RENDERTMP) ] || mkdir -p $(RENDERTMP)
-	$(Q)rm -f $(RENDERTMP)/*-{full,html,pdf}.xml
-	$(Q)rm -f $(RENDERTMP)/*.fo
-
-ifeq ($(shell which tidy >/dev/null 2>&1 && echo yes),yes)
-tidy:
-	@echo "Running tidy on the created HTML"
-	$(Q)for filename in `find $(BASEDIR) -name "*.html"`; do \
-	  tidy -config $(PWD)/tidy.conf $$filename; \
-	  true; \
-	  sh $(PWD)/obfuscate.sh $$filename; \
-	  sed -i -e "s@text/html@application/xhtml+xml@g" $$filename; \
-	done;
-else
-tidy:
-	@echo "Tidy is not installed on this system"
-endif
-
-render: $(ARCHS_HTML) titlepage
-
-titlepage:
-	$(Q)xsltproc --nonet --output $(BASEDIR)/index.html \
-	  $(PWD)/stylesheets/top-index.xsl $(PWD)/index.xml
-
-$(ARCHS_HTML): override html_arch = $(@:%$(S)html=%)
-$(ARCHS_HTML):
-	@echo "Validating $(html_arch) book..."
-	$(Q)xmllint --nonet --noent --xinclude --postvalid \
-	  -o $(RENDERTMP)/$(html_arch)-full.xml $(PWD)/$(html_arch)-index.xml
-
-	@echo "Generating profiled $(html_arch) book for XHTML..."
-	$(Q)xsltproc --nonet --stringparam profile.condition html \
-	  --output $(RENDERTMP)/$(html_arch)-html.xml \
-	  $(PWD)/stylesheets/lfs-xsl/profile.xsl $(RENDERTMP)/$(html_arch)-full.xml
-
-	@echo "Rendering chunked XHTML of $(html_arch)..."
-	$(Q)mkdir -p $(BASEDIR)/$(html_arch)
-	$(Q)xsltproc --nonet -stringparam chunk.quietly $(CHUNK_QUIET) \
-	  -stringparam rootid "$(ROOT_ID)" \
-	  -stringparam base.dir $(BASEDIR)/$(html_arch)/ \
-	  $(PWD)/stylesheets/clfs-chunked.xsl $(RENDERTMP)/$(html_arch)-html.xml
-
-	@echo "Copying CSS code and images..."
-	$(Q)mkdir -p $(BASEDIR)/$(html_arch)/stylesheets
-	$(Q)cp $(PWD)/stylesheets/lfs-xsl/*.css $(BASEDIR)/$(html_arch)/stylesheets
-	$(Q)sed -i -e "s@../stylesheets@stylesheets@g" $(BASEDIR)/$(html_arch)/*.html
-	$(Q)mkdir -p $(BASEDIR)/$(html_arch)/images
-	$(Q)cp $(PWD)/images/*.png $(BASEDIR)/$(html_arch)/images
-	$(Q)sed -i -e "s@../images@images@g" $(BASEDIR)/$(html_arch)/*.html
-
-nochunks: tmpdir $(ARCHS_NOCHUNKS) tidy
-
-$(ARCHS_NOCHUNKS): override nochunk_arch = $(@:%$(S)nochunks=%)
-$(ARCHS_NOCHUNKS):
-	@echo "Validating $(nochunk_arch) book..."
-	$(Q)xmllint --nonet --noent --xinclude --postvalid \
-	  -o $(RENDERTMP)/$(nochunk_arch)-full.xml $(PWD)/$(nochunk_arch)-index.xml
-
-	@echo "Generating profiled $(nochunk_arch) book for XHTML..."
-	$(Q)xsltproc --nonet --stringparam profile.condition html \
-	  --output $(RENDERTMP)/$(nochunk_arch)-html.xml \
-	  $(PWD)/stylesheets/lfs-xsl/profile.xsl \
-	  $(RENDERTMP)/$(nochunk_arch)-full.xml
-
-	@echo "Rendering Single File HTML of $(nochunk_arch)..."
-	$(Q)mkdir -p $(BASEDIR)
-	$(Q)xsltproc --nonet -stringparam rootid "$(ROOT_ID)" \
-	  --output $(BASEDIR)/CLFS-$(nochunk_arch).html \
-	  $(PWD)/stylesheets/clfs-nochunks.xsl $(RENDERTMP)/$(nochunk_arch)-html.xml
-
-	@echo "Running Tidy..."
-	$(Q)tidy -config $(PWD)/tidy.conf $(BASEDIR)/CLFS-$(nochunk_arch).html || true
-	@echo "Running obfuscate.sh..."
-	$(Q)sh $(PWD)/obfuscate.sh $(BASEDIR)/CLFS-$(nochunk_arch).html
-	$(Q)sed -i -e "s@text/html@application/xhtml+xml@g"  \
-	  $(BASEDIR)/CLFS-$(nochunk_arch).html
-
-pdf: tmpdir $(ARCHS_PDF)
-
-$(ARCHS_PDF): override pdf_arch =  $(@:%$(S)pdf=%)
-$(ARCHS_PDF):
-	@echo "Validating $(pdf_arch) book..."
-	$(Q)xmllint --nonet --noent --xinclude --postvalid \
-	  -o $(RENDERTMP)/$(pdf_arch)-full.xml $(PWD)/$(pdf_arch)-index.xml
-
-	@echo "Generating profiled $(pdf_arch) book for PDF..."
-	$(Q)xsltproc --nonet --stringparam profile.condition pdf \
-	  --output $(RENDERTMP)/$(pdf_arch)-pdf.xml \
-	  $(PWD)/stylesheets/lfs-xsl/profile.xsl \
-	  $(RENDERTMP)/$(pdf_arch)-full.xml
-
-	@echo "Generating FO file of $(pdf_arch)..."
-	$(Q)xsltproc --nonet -stringparam rootid "$(ROOT_ID)" \
-	  --output $(RENDERTMP)/$(pdf_arch).fo $(PWD)/stylesheets/clfs-pdf.xsl \
-	  $(RENDERTMP)/$(pdf_arch)-pdf.xml
-	$(Q)sed -i -e 's/span="inherit"/span="all"/' $(RENDERTMP)/$(pdf_arch).fo
-
-	@echo "Rendering PDF of $(pdf_arch)..."
-	$(Q)mkdir -p $(BASEDIR)
-	$(Q)fop $(RENDERTMP)/$(pdf_arch).fo $(BASEDIR)/CLFS-$(pdf_arch).pdf
-
-validate: $(ARCHS_VALIDATE)
-
-$(ARCHS_VALIDATE): override validate_arch =  $(@:%$(S)validate=%)
-$(ARCHS_VALIDATE):
-	@echo "Validating $(validate_arch)..."
-	$(Q)xmllint --xinclude --noout --nonet --postvalid $(PWD)/$(validate_arch)-index.xml
-
-trouble: tmpdir $(ARCHS_TROUBLE)
-
-$(ARCHS_TROUBLE): override trouble_arch =  $(@:%$(S)trouble=%)
-$(ARCHS_TROUBLE):
-	@echo "Troubleshooting $(trouble_arch)..."
-	$(Q)xmllint --xinclude --nonet --postvalid \
-	  -o $(RENDERTMP)/dump-$(trouble_arch) $(PWD)/$(trouble_arch)-index.xml
-	$(Q)xmllint --xinclude --noout --nonet --valid $(RENDERTMP)/dump-$(trouble_arch)
-	@echo "You can now look at $(RENDERTMP)/dump-$(trouble_arch) to see the errors"
-
-dump-commands: $(ARCHS_DUMP)
-
-$(ARCHS_DUMP): override dump_arch =  $(@:%$(S)dump=%)
-$(ARCHS_DUMP):
-	@echo "Extracting commands from $(dump_arch)..."
-	$(Q)mkdir -p $(DUMPDIR)/$(dump_arch)
-	$(Q)xsltproc --xinclude --nonet --output $(DUMPDIR)/$(dump_arch)/ \
-	  $(PWD)/stylesheets/dump-commands.xsl $(PWD)/$(dump_arch)-index.xml
-
-download-list: $(ARCHS_DLLIST)
-
-$(ARCHS_DLLIST): override dllist_arch = $(@:%$(S)dllist=%)
-$(ARCHS_DLLIST):
-	@echo "Creating download list for $(dllist_arch)..."
-	$(Q)mkdir -p $(DLLISTDIR)
-	$(Q)xsltproc --xinclude --nonet --output $(DLLISTDIR)/$(dllist_arch).dl.list \
-	  $(PWD)/stylesheets/wget.xsl $(PWD)/$(dllist_arch)-index.xml
-
-help:
-	@echo "HTML Targets"
-	@echo -e "  \e[0;32mlfs tidy render titlepage \e[0;34m$(ARCHS_HTML)\e[0;0m"
-	@echo
-	@echo "NoChunks Targets"
-	@echo -e "  \e[0;32mnochunks tidy \e[0;34m$(ARCHS_NOCHUNKS)\e[0;0m"
-	@echo
-	@echo "PDF Targets"
-	@echo -e "  \e[0;32mpdf \e[0;34m$(ARCHS_PDF)\e[0;0m"
-	@echo
-	@echo "Validate Targets"
-	@echo -e "  \e[0;32mvalidate \e[0;34m$(ARCHS_VALIDATE)\e[0;0m"
-	@echo
-	@echo "Trouble Targets"
-	@echo -e "  \e[0;32mtrouble \e[0;34m$(ARCHS_TROUBLE)\e[0;0m"
-	@echo
-	@echo "Dump-Commands Targets"
-	@echo -e "  \e[0;32mdump-commands \e[0;34m$(ARCHS_DUMP)\e[0;0m"
-	@echo
-	@echo "Download-List Targets"
-	@echo -e "  \e[0;32mdownload-list \e[0;34m$(ARCHS_DLLIST)\e[0;0m"
Index: OK/README
===================================================================
--- BOOK/README	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,32 +1,0 @@
-CLFS Book README
-
-This document is meant to instruct the user on how to convert the book's XML 
-source to other formats (e.g. HTML, PDF, PS and TXT).  First, if you have not 
-already done so, please read the INSTALL file for instructions on how to install
-the required software.  If you have already completed the steps outlined in the
-INSTALL file, then continue reading for examples how to convert these files into
-various other formats.
-
-By default all books will be generated, to only generate the target your want
-you can specify ARCH={target} to create a particular book to any of the command
-lines below. To get a list of targets use make target-list
-
-XML to XHTML:
--------------
-make BASEDIR=/path/to/output/location
-
-
-XML to single file XHTML (nochunks):
-------------------------------------
-make BASEDIR=/path/to/output/location nochunks
-
-
-XML to TXT
-----------
-Follow the instructions for nochunks and then run:
-lynx -dump /path/to/nochunks >/path/to/output
-
-
-XML to PDF:
------------
-make BASEDIR=/path/to/output/location pdf
Index: OK/alpha-index.xml
===================================================================
--- BOOK/alpha-index.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,84 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "general.ent">
-  %general-entities;
-]>
-
-<book>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/alpha/bookinfo.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/dedication.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/preface.xml"/>
-
-  <part id="part1">
-    <?dbhtml filename="part1.html"?>
-
-    <title>Introduction</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="introduction/alpha-chapter.xml"/>
-
-  </part>
-
-  <part id="part2">
-    <?dbhtml filename="part2.html"?>
-
-    <title>Preparing for the Build</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="partitioning/alpha-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="materials/alpha-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-preps/chapter.xml"/>
-
-  </part>
-
-  <part id="part3">
-    <?dbhtml filename="part3.html"?>
-
-    <title>Make the Cross-Compile Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cross-tools/alpha-chapter.xml"/>
-
-  </part>
-
-  <part id="part4">
-    <?dbhtml filename="part4.html"?>
-
-    <title>Building the Basic Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="temp-system/alpha-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="boot/alpha-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="chroot/alpha-chapter.xml"/>
-
-  </part>
-
-  <part id="part5">
-    <?dbhtml filename="part5.html"?>
-
-    <title>Building the CLFS System</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/alpha-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/alpha-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/alpha-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/alpha-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>
-
-  </part>
-
-  <part id="part6">
-    <?dbhtml filename="part6.html"?>
-
-    <title>Appendices</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acknowledgments.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/alpha.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/license.xml"/>
-
-  </part>
-
-  <index/>
-
-</book>
Index: OK/appendices/acknowledgments.xml
===================================================================
--- BOOK/appendices/acknowledgments.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,421 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<appendix id="appendixb" xreflabel="Appendix B">
-  <?dbhtml dir="appendices"?>
-  <?dbhtml filename="acknowledgements.html"?>
-
-  <title>Acknowledgments</title>
-
-  <para>We would like to thank the following people and organizations
-  for their contributions to the Linux From Scratch Project.</para>
-
-  <itemizedlist>
-
-    <listitem>
-      <para><ulink url="mailto:gerard@linuxfromscratch.org">Gerard
-      Beekmans</ulink> &lt;gerard@linuxfromscratch.org&gt; &ndash;
-      LFS Creator, LFS Project Leader</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:matthew@linuxfromscratch.org">Matthew
-      Burgess</ulink> &lt;matthew@linuxfromscratch.org&gt; &ndash;
-      LFS Project Leader, LFS Technical Writer/Editor, LFS Release
-      Manager</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:archaic@linuxfromscratch.org">Archaic</ulink>
-      &lt;archaic@linuxfromscratch.org&gt; &ndash; LFS Technical Writer/Editor,
-      HLFS Project Leader, BLFS Editor, Hints and Patches Project
-      Maintainer</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:nathan@linuxfromscratch.org">Nathan
-      Coulson</ulink> &lt;nathan@linuxfromscratch.org&gt; &ndash;
-      LFS-Bootscripts Maintainer</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:bdubbs@linuxfromscratch.org">Bruce
-      Dubbs</ulink> &lt;bdubbs@linuxfromscratch.org&gt; &ndash; BLFS Project
-      Leader</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:manuel@linuxfromscratch.org">Manuel
-      Canales Esparcia</ulink> &lt;manuel@linuxfromscratch.org&gt; &ndash;
-      LFS/BLFS/HLFS XML and XSL Maintainer</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:jim@linuxfromscratch.org">Jim
-      Gifford</ulink> &lt;jim@linuxfromscratch.org&gt; &ndash; LFS Technical
-      Writer, Patches Project Leader</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:jhuntwork@linuxfromscratch.org">Jeremy
-      Huntwork</ulink> &lt;jhuntwork@linuxfromscratch.org&gt; &ndash; LFS
-      Technical Writer, LFS LiveCD Maintainer, ALFS Project Leader</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:lizardo@linuxfromscratch.org">Anderson
-      Lizardo</ulink> &lt;lizardo@linuxfromscratch.org&gt; &ndash; Website
-      Backend-Scripts Maintainer</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:ryan@linuxfromscratch.org">Ryan
-      Oliver</ulink> &lt;ryan@linuxfromscratch.org&gt; &ndash; LFS Toolchain
-      Maintainer</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:jwrober@linuxfromscratch.org">James
-      Robertson</ulink> &lt;jwrober@linuxfromscratch.org&gt; &ndash; Bugzilla
-      Maintainer</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:tushar@linuxfromscratch.org">Tushar
-      Teredesai</ulink> &lt;tushar@linuxfromscratch.org&gt; &ndash; BLFS Book
-      Editor, Hints and Patches Project Leader</para>
-    </listitem>
-
-    <listitem>
-      <para>Countless other people on the various LFS and BLFS mailing lists
-      who helped make this book possible by giving their suggestions, testing
-      the book, and submitting bug reports, instructions, and their
-      experiences with installing various packages.</para>
-    </listitem>
-
-  </itemizedlist>
-
-  <bridgehead renderas="sect2">Translators</bridgehead>
-
-  <itemizedlist>
-
-    <listitem>
-      <para><ulink url="mailto:macana@lfs-es.com">Manuel Canales
-      Esparcia</ulink> &lt;macana@lfs-es.com&gt; &ndash; Spanish
-      LFS translation project</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:johan@linuxfromscratch.org">Johan
-      Lenglet</ulink> &lt;johan@linuxfromscratch.org&gt; &ndash; French LFS
-      translation project</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:lizardo@linuxfromscratch.org">Anderson
-      Lizardo</ulink> &lt;lizardo@linuxfromscratch.org&gt; &ndash;
-      Portuguese LFS translation project</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:tr@erdfunkstelle.de">Thomas
-      Reitelbach </ulink> &lt;tr@erdfunkstelle.de&gt; &ndash; German LFS
-      translation project</para>
-    </listitem>
-
-  </itemizedlist>
-
-  <bridgehead renderas="sect2">Mirror Maintainers</bridgehead>
-
-  <bridgehead renderas="sect3">North American Mirrors</bridgehead>
-
-  <itemizedlist>
-
-    <listitem>
-      <para><ulink url="mailto:scott@osuosl.org">Scott Kveton</ulink>
-      &lt;scott@osuosl.org&gt; &ndash; lfs.oregonstate.edu mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:miha@xuy.biz">Mikhail Pastukhov</ulink>
-      &lt;miha@xuy.biz&gt; &ndash; lfs.130th.net mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:lost@l-w.net">William Astle</ulink>
-      &lt;lost@l-w.net&gt; &ndash; ca.linuxfromscratch.org mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:jpolen@rackspace.com">Jeremy Polen</ulink>
-      &lt;jpolen@rackspace.com&gt; &ndash; us2.linuxfromscratch.org mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:tim@idge.net">Tim Jackson</ulink>
-      &lt;tim@idge.net&gt; &ndash; linuxfromscratch.idge.net mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:jeremy@linux-phreak.net">Jeremy Utley</ulink>
-      &lt;jeremy@linux-phreak.net&gt; &ndash; lfs.linux-phreak.net mirror</para>
-    </listitem>
-
-  </itemizedlist>
-
-  <bridgehead renderas="sect3">South American Mirrors</bridgehead>
-
-  <itemizedlist>
-
-    <listitem>
-      <para><ulink url="mailto:sysop@mesi.com.ar">Andres Meggiotto</ulink>
-      &lt;sysop@mesi.com.ar&gt; &ndash; lfs.mesi.com.ar mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:manuel@linuxfromscratch.org">Manuel
-      Canales Esparcia</ulink> &lt;manuel@linuxfromscratch.org&gt; &ndash;
-      lfsmirror.lfs-es.info mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:ebf@aedsolucoes.com.br">Eduardo B.
-      Fonseca</ulink> &lt;ebf@aedsolucoes.com.br&gt; &ndash;
-      br.linuxfromscratch.org mirror</para>
-    </listitem>
-
-  </itemizedlist>
-
-  <bridgehead renderas="sect3">European Mirrors</bridgehead>
-
-  <itemizedlist>
-
-    <listitem>
-      <para><ulink url="mailto:barna@siker.hu">Barna Koczka</ulink>
-      &lt;barna@siker.hu&gt; &ndash; hu.linuxfromscratch.org mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="http://www.mirror.ac.uk">UK Mirror Service</ulink>
-      &ndash; linuxfromscratch.mirror.ac.uk mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:Martin.Voss@ada.de">Martin Voss</ulink>
-      &lt;Martin.Voss@ada.de&gt; &ndash; lfs.linux-matrix.net mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:guido@primerelay.net">Guido Passet</ulink>
-      &lt;guido@primerelay.net&gt; &ndash; nl.linuxfromscratch.org mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:baafie@planet.nl">Bastiaan Jacques</ulink>
-      &lt;baafie@planet.nl&gt; &ndash; lfs.pagefault.net mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:lfs-mirror@linuxfromscratch.rave.org">Roel
-      Neefs</ulink> &lt;lfs-mirror@linuxfromscratch.rave.org&gt; &ndash;
-      linuxfromscratch.rave.org mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:justin@jrknierim.de">Justin Knierim</ulink>
-      &lt;justin@jrknierim.de&gt; &ndash; www.lfs-matrix.de mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:stevie@stevie20.de">Stephan Brendel</ulink>
-      &lt;stevie@stevie20.de&gt; &ndash; lfs.netservice-neuss.de mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:Antonin.Sprinzl@tuwien.ac.at">Antonin
-      Sprinzl</ulink> &lt;Antonin.Sprinzl@tuwien.ac.at&gt; &ndash;
-      at.linuxfromscratch.org mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:fredan-lfs@fredan.org">Fredrik
-      Danerklint</ulink> &lt;fredan-lfs@fredan.org&gt; &ndash;
-      se.linuxfromscratch.org mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:archive@doc.cs.univ-paris8.fr">Parisian
-      sysadmins</ulink> &lt;archive@doc.cs.univ-paris8.fr&gt; &ndash;
-      www2.fr.linuxfromscratch.org mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:velin@zadnik.org">Alexander Velin</ulink>
-      &lt;velin@zadnik.org&gt; &ndash; bg.linuxfromscratch.org mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:dirk@securewebservices.co.uk"> Dirk
-      Webster</ulink> &lt;dirk@securewebservices.co.uk&gt; &ndash;
-      lfs.securewebservices.co.uk mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:thomas@sofagang.dk">Thomas Skyt</ulink>
-      &lt;thomas@sofagang.dk&gt; &ndash; dk.linuxfromscratch.org mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:sime@dot-sime.com">Simon Nicoll</ulink>
-      &lt;sime@dot-sime.com&gt; &ndash; uk.linuxfromscratch.org mirror</para>
-    </listitem>
-
-  </itemizedlist>
-
-  <bridgehead renderas="sect3">Asian Mirrors</bridgehead>
-
-  <itemizedlist>
-
-    <listitem>
-      <para><ulink url="mailto:pyng@spam.averse.net">Pui Yong</ulink>
-      &lt;pyng@spam.averse.net&gt; &ndash; sg.linuxfromscratch.org mirror</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:stuart@althalus.me.uk">Stuart
-      Harris</ulink> &lt;stuart@althalus.me.uk&gt; &ndash;
-      lfs.mirror.intermedia.com.sg mirror</para>
-    </listitem>
-
-  </itemizedlist>
-
-  <bridgehead renderas="sect3">Australian Mirrors</bridgehead>
-
-  <itemizedlist>
-
-    <listitem>
-      <para><ulink url="mailto:jason@dstc.edu.au">Jason Andrade</ulink>
-      &lt;jason@dstc.edu.au&gt; &ndash; au.linuxfromscratch.org mirror</para>
-    </listitem>
-
-  </itemizedlist>
-
-  <bridgehead renderas="sect2">Former Project Team Members</bridgehead>
-
-  <itemizedlist>
-
-    <listitem>
-      <para><ulink url="mailto:theladyskye@linuxfromscratch.org">Christine
-      Barczak</ulink> &lt;theladyskye@linuxfromscratch.org&gt; &ndash; LFS
-      Book Editor</para>
-    </listitem>
-
-    <listitem>
-      <para>Timothy Bauscher</para>
-    </listitem>
-
-    <listitem>
-      <para>Robert Briggs</para>
-    </listitem>
-
-    <listitem>
-      <para>Ian Chilton</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:jeroen@linuxfromscratch.org">Jeroen
-      Coumans</ulink> &lt;jeroen@linuxfromscratch.org&gt; &ndash; Website
-      Developer, FAQ Maintainer</para>
-    </listitem>
-
-    <listitem>
-      <para>Alex Groenewoud &ndash; LFS Technical Writer</para>
-    </listitem>
-
-    <listitem>
-      <para>Marc Heerdink</para>
-    </listitem>
-
-    <listitem>
-      <para>Mark Hymers</para>
-    </listitem>
-
-    <listitem><para>Seth W. Klein &ndash; FAQ maintainer</para></listitem>
-
-    <listitem>
-      <para><ulink url="mailto:nicholas@linuxfromscratch.org">Nicholas
-      Leippe</ulink> &lt;nicholas@linuxfromscratch.org&gt; &ndash; Wiki
-      Maintainer</para>
-    </listitem>
-
-    <listitem>
-      <para>Simon Perreault</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:scot@linuxfromscratch.org">Scot Mc
-      Pherson</ulink> &lt;scot@linuxfromscratch.org&gt; &ndash; LFS NNTP
-      Gateway Maintainer</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:semzx@newmail.ru">Alexander Patrakov</ulink>
-      &lt;semzx@newmail.ru&gt; &ndash; LFS Technical Writer</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:gschafer@zip.com.au">Greg Schafer</ulink>
-      &lt;gschafer@zip.com.au&gt; &ndash; LFS Technical Writer</para>
-    </listitem>
-
-    <listitem>
-      <para>Jesse Tie-Ten-Quee &ndash; LFS Technical Writer</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:jeremy@linuxfromscratch.org">Jeremy
-      Utley</ulink> &lt;jeremy@linuxfromscratch.org&gt; &ndash; LFS Technical
-      Writer, Bugzilla Maintainer, LFS-Bootscripts Maintainer</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:zwinkles@gmail.com">Zack Winkles</ulink>
-      &lt;zwinkles@gmail.com&gt; &ndash; LFS Technical Writer</para>
-    </listitem>
-
-  </itemizedlist>
-
-  <bridgehead renderas="sect2">A very special thank you to our
-  donators</bridgehead>
-
-  <itemizedlist>
-
-    <listitem>
-      <para><ulink url="mailto:dean@vipersoft.co.uk">Dean Benson</ulink>
-      &lt;dean@vipersoft.co.uk&gt; for several monetary contributions</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="mailto:hrx@hrxnet.de">Hagen Herrschaft</ulink>
-      &lt;hrx@hrxnet.de&gt; for donating a 2.2 GHz P4 system, now running
-      under the name of Lorien</para>
-    </listitem>
-
-    <listitem>
-      <para><ulink url="http://www.vasoftware.com">VA Software</ulink> who,
-      on behalf of <ulink url="http://www.linux.com">Linux.com</ulink>,
-      donated a VA Linux 420 (former StartX SP2) workstation</para>
-    </listitem>
-
-    <listitem>
-      <para>Mark Stone for donating Belgarath, the linuxfromscratch.org
-      server</para>
-    </listitem>
-
-  </itemizedlist>
-
-</appendix>
Index: OK/appendices/acronymlist.xml
===================================================================
--- BOOK/appendices/acronymlist.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,580 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<appendix id="appendixa" xreflabel="Appendix A">
-  <?dbhtml dir="appendices"?>
-  <?dbhtml filename="acronymlist.html"?>
-
-  <title>Acronyms and Terms</title>
-
-  <variablelist>
-    <?dbfo list-presentation="list"?>
-    <?dbhtml list-presentation="table"?>
-
-    <varlistentry>
-      <term><emphasis role="bold">ABI</emphasis></term>
-      <listitem>
-        <para>Application Binary Interface</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">ALFS</emphasis></term>
-      <listitem>
-        <para>Automated Linux From Scratch</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">ALSA</emphasis></term>
-      <listitem>
-        <para>Advanced Linux Sound Architecture</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">API</emphasis></term>
-      <listitem>
-        <para>Application Programming Interface</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">ASCII</emphasis></term>
-      <listitem>
-        <para>American Standard Code for Information Interchange</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">ATA</emphasis></term>
-      <listitem>
-        <para>Advanced Technology Attachment (see IDE)</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">BIOS</emphasis></term>
-      <listitem>
-        <para>Basic Input/Output System</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">bless</emphasis></term>
-      <listitem>
-        <para>manipulate a filesystem so that OF will boot from it</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">BLFS</emphasis></term>
-      <listitem>
-        <para>Beyond Linux From Scratch</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">BSD</emphasis></term>
-      <listitem>
-        <para>Berkeley Software Distribution</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">chroot</emphasis></term>
-      <listitem>
-        <para>change root</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">CLFS</emphasis></term>
-      <listitem>
-        <para>Cross-Compiled Linux From Scratch</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">CMOS</emphasis></term>
-      <listitem>
-        <para>Complementary Metal Oxide Semiconductor</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">COS</emphasis></term>
-      <listitem>
-        <para>Class Of Service</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">CPU</emphasis></term>
-      <listitem>
-        <para>Central Processing Unit</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">CRC</emphasis></term>
-      <listitem>
-        <para>Cyclic Redundancy Check</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">DHCP</emphasis></term>
-      <listitem>
-        <para>Dynamic Host Configuration Protocol</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">DNS</emphasis></term>
-      <listitem>
-        <para>Domain Name Service</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">EGA</emphasis></term>
-      <listitem>
-        <para>Enhanced Graphics Adapter</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">ELF</emphasis></term>
-      <listitem>
-        <para>Executable and Linkable Format</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">EOF</emphasis></term>
-      <listitem>
-        <para>End of File</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">EQN</emphasis></term>
-      <listitem>
-        <para>equation</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">EVMS</emphasis></term>
-      <listitem>
-        <para>Enterprise Volume Management System</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">ext2</emphasis></term>
-      <listitem>
-        <para>second extended file system</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">FAQ</emphasis></term>
-      <listitem>
-        <para>Frequently Asked Questions</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">FHS</emphasis></term>
-      <listitem>
-        <para>Filesystem Hierarchy Standard</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">FIFO</emphasis></term>
-      <listitem>
-        <para>First-In, First Out</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">FQDN</emphasis></term>
-      <listitem>
-        <para>Fully Qualified Domain Name</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">FTP</emphasis></term>
-      <listitem>
-        <para>File Transfer Protocol</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">GB</emphasis></term>
-      <listitem>
-        <para>Gibabytes</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">GCC</emphasis></term>
-      <listitem>
-        <para>GNU Compiler Collection</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">GID</emphasis></term>
-      <listitem>
-        <para>Group Identifier</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">GMT</emphasis></term>
-      <listitem>
-        <para>Greenwich Mean Time</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">HTML</emphasis></term>
-      <listitem>
-        <para>Hypertext Markup Language</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">IDE</emphasis></term>
-      <listitem>
-        <para>Integrated Drive Electronics</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">IEEE</emphasis></term>
-      <listitem>
-        <para>Institute of Electrical and Electronic Engineers</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">IO</emphasis></term>
-      <listitem>
-        <para>Input/Output</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">IP</emphasis></term>
-      <listitem>
-        <para>Internet Protocol</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">IPC</emphasis></term>
-      <listitem>
-        <para>Inter-Process Communication</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">IRC</emphasis></term>
-      <listitem>
-        <para>Internet Relay Chat</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">ISO</emphasis></term>
-      <listitem>
-        <para>International Organization for Standardization</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">ISP</emphasis></term>
-      <listitem>
-        <para>Internet Service Provider</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">KB</emphasis></term>
-      <listitem>
-        <para>Kilobytes</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">LED</emphasis></term>
-      <listitem>
-        <para>Light Emitting Diode</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">LFS</emphasis></term>
-      <listitem>
-        <para>Linux From Scratch</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">LSB</emphasis></term>
-      <listitem>
-        <para>Linux Standard Base</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">MB</emphasis></term>
-      <listitem>
-        <para>Megabytes</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">MBR</emphasis></term>
-      <listitem>
-        <para>Master Boot Record</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">MD5</emphasis></term>
-      <listitem>
-        <para>Message Digest 5</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">NIC</emphasis></term>
-      <listitem>
-        <para>Network Interface Card</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">NLS</emphasis></term>
-      <listitem>
-        <para>Native Language Support</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">NNTP</emphasis></term>
-      <listitem>
-        <para>Network News Transport Protocol</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">NPTL</emphasis></term>
-      <listitem>
-        <para>Native POSIX Threading Library</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">OF</emphasis></term>
-      <listitem>
-        <para>Open Firmware</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">OSS</emphasis></term>
-      <listitem>
-        <para>Open Sound System</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">PCH</emphasis></term>
-      <listitem>
-        <para>Pre-Compiled Headers</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">PCRE</emphasis></term>
-      <listitem>
-        <para>Perl Compatible Regular Expression</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">PID</emphasis></term>
-      <listitem>
-        <para>Process Identifier</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">PTY</emphasis></term>
-      <listitem>
-        <para>pseudo terminal</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">QA</emphasis></term>
-      <listitem>
-        <para>Quality Assurance</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">QOS</emphasis></term>
-      <listitem>
-        <para>Quality Of Service</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">RAM</emphasis></term>
-      <listitem>
-        <para>Random Access Memory</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">RPC</emphasis></term>
-      <listitem>
-        <para>Remote Procedure Call</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">RTC</emphasis></term>
-      <listitem>
-        <para>Real Time Clock</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">SCO</emphasis></term>
-      <listitem>
-        <para>The Santa Cruz Operation</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">SATA</emphasis></term>
-      <listitem>
-        <para>Serial ATA</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">SGR</emphasis></term>
-      <listitem>
-        <para>Select Graphic Rendition</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">SHA1</emphasis></term>
-      <listitem>
-        <para>Secure-Hash Algorithm 1</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">SMP</emphasis></term>
-      <listitem>
-        <para>Symmetric Multi-Processor</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">TLDP</emphasis></term>
-      <listitem>
-        <para>The Linux Documentation Project</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">TFTP</emphasis></term>
-      <listitem>
-        <para>Trivial File Transfer Protocol</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">TLS</emphasis></term>
-      <listitem>
-        <para>Thread-Local Storage</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">UID</emphasis></term>
-      <listitem>
-        <para>User Identifier</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">umask</emphasis></term>
-      <listitem>
-        <para>user file-creation mask</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">USB</emphasis></term>
-      <listitem>
-        <para>Universal Serial Bus</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">UTC</emphasis></term>
-      <listitem>
-        <para>Coordinated Universal Time</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">UUID</emphasis></term>
-      <listitem>
-        <para>Universally Unique Identifier</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">VC</emphasis></term>
-      <listitem>
-        <para>Virtual Console</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">VGA</emphasis></term>
-      <listitem>
-        <para>Video Graphics Array</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">VT</emphasis></term>
-      <listitem>
-        <para>Virtual Terminal</para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-</appendix>
Index: OK/appendices/dependencies/alpha.xml
===================================================================
--- BOOK/appendices/dependencies/alpha.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,44 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<appendix id="appendixc-alpha" xreflabel="Appendix C">
-  <?dbhtml dir="appendixc"?>
-  <?dbhtml filename="alpha-dependencies.html"?>
-
-  <title>Sparc Dependencies</title>
-
-  <para>This page contains dependency information for packages specific to Alpha.</para>
-
-<!-- Begin aboot dependency info -->
-  <bridgehead renderas="sect2" id="aboot-dep">Aboot</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, ELFtoaut, GCC, Glibc,
-         Grep, Make, Ncurses, Sed and Patch</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-</appendix>
Index: OK/appendices/dependencies/common.xml
===================================================================
--- BOOK/appendices/dependencies/common.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,1505 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<appendix id="appendixc" xreflabel="Appendix C">
-  <?dbhtml dir="appendixc"?>
-  <?dbhtml filename="dependencies.html"?>
-
-  <title>Dependencies</title>
-
-  <para>Every package built in CLFS relies on one or more other packages
-  in order to build and install properly. Some packages even participate
-  in circular dependencies, that is, the first package depends on the second
-  which in turn depends on the first. Because of these dependencies, the
-  order in which packages are built in CLFS is very important. The purpose
-  of this page is to document the dependencies of each package built in CLFS.</para>
-
-  <para>For each package we build, we have listed three types of dependencies.
-  The first lists what other packages need to be available in order to compile
-  and install the package in question. The second lists what packages, in
-  addition to those on the first list, need to be available in order to run the
-  testsuites. The last list of dependencies are packages that require this
-  package to be built and installed in its final location before they are built
-  and installed. In most cases, this is because these packages will hardcode
-  paths to binaries within their scripts. If not built in a certain order,
-  this could result in paths of /tools/bin/[binary] being placed inside
-  scripts installed to the final system. This is obviously not desirable.
-  </para>
-
-<!-- Begin Autoconf dependency info -->
-  <bridgehead renderas="sect2" id="autoconf-dep">Autoconf</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-          <seg>Bash, Coreutils, Grep, M4, Make, Perl, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Automake, Binutils, Diffutils, Findutils, Gawk, GCC and Libtool</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Automake</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Automake dependency info -->
-  <bridgehead renderas="sect2" id="automake-dep">Automake</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-          <seg>Autoconf, Bash, Coreutils, Gettext, Grep, M4, Make, Perl,
-          Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Binutils, Bison, Bzip2, DejaGNU, Diffutils, Expect, Findutils,
-          Flex, GCC, Gettext, Gzip, Libtool and Tar. Can also use several
-          other packages that are not installed in CLFS.</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Bash dependency info -->
-  <bridgehead renderas="sect2" id="bash-dep">Bash</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-          <seg>Bash, Bison, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep, Make,
-	  Ncurses, Patch, Readline, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Binutils dependency info -->
-  <bridgehead renderas="sect2" id="binutils-dep">Binutils</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, File, Gawk, GCC, Gettext, Glibc,
-         Grep, Make, Perl, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>DejaGNU and Expect</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Bison dependency info -->
-  <bridgehead renderas="sect2" id="bison-dep">Bison</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc,
-         Grep, M4, Make and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils, Findutils and Gawk</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Flex, Kbd and Tar</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Bzip2 dependency info -->
-  <bridgehead renderas="sect2" id="bzip2-dep">Bzip2</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Make</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin CLFS-Bootscripts dependency info -->
-  <bridgehead renderas="sect2" id="bootscripts-dep">CLFS-Bootscripts</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Coreutils, Make and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Coreutils dependency info -->
-  <bridgehead renderas="sect2" id="coreutils-dep">Coreutils</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, GCC, Gettext, Glibc, Grep, Make,
-	 Patch, Perl, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils, E2fsprogs</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Bash, Diffutils, Findutils, Man and Udev</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin DejaGNU dependency info -->
-  <bridgehead renderas="sect2" id="dejagnu-dep">DejaGNU</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Coreutils, Diffutils, GCC, Grep, Make and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Diffutils dependency info -->
-  <bridgehead renderas="sect2" id="diffutils-dep">Diffutils</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep,
-	 Make, Patch, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Expect dependency info -->
-  <bridgehead renderas="sect2" id="expect-dep">Expect</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
-	 Patch, Sed and Tcl</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin E2fsprogs dependency info -->
-  <bridgehead renderas="sect2" id="e2fsprogs-dep">E2fsprogs</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, GCC, Gettext, Glibc, Grep, Gzip,
-	 Make, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Bzip2 and Diffutils</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Util-linux-ng</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin File dependency info -->
-  <bridgehead renderas="sect2" id="file-dep">File</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
-	 Make, Sed and Zlib</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Findutils dependency info -->
-  <bridgehead renderas="sect2" id="findutils-dep">Findutils</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make,
-	 Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>DejaGNU, Diffutils, Expect and Gawk</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Flex dependency info -->
-  <bridgehead renderas="sect2" id="flex-dep">Flex</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, M4, Make,
-	 Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Bison, Diffutils and Gawk</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>IPRoute2, Kbd and Man</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Gawk dependency info -->
-  <bridgehead renderas="sect2" id="gawk-dep">Gawk</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make,
-	 Patch, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Gcc dependency info -->
-  <bridgehead renderas="sect2" id="gcc-dep">Gcc</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
-	 Gettext, Glibc, Grep, Make, Patch, Perl, Sed, Tar and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>DejaGNU and Expect</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Gettext dependency info -->
-  <bridgehead renderas="sect2" id="gettext-dep">Gettext</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep, Make,
-	 Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils, Perl and Tcl</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Automake</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Glibc dependency info -->
-  <bridgehead renderas="sect2" id="glibc-dep">Glibc</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Gettext,
-         Grep, Gzip, Make, Perl, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Grep dependency info -->
-  <bridgehead renderas="sect2" id="grep-dep">Grep</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Gettext, Glibc, Grep,
-         Make, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Gawk</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Man</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Groff dependency info -->
-  <bridgehead renderas="sect2" id="groff-dep">Groff</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Bison, Coreutils,  Gawk, GCC, Glibc, Grep, Make,
-	 Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Man and Perl</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Gzip dependency info -->
-  <bridgehead renderas="sect2" id="gzip-dep">Gzip</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make,
-	 Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Man</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Iana-Etc dependency info -->
-  <bridgehead renderas="sect2" id="iana-etc-dep">Iana-Etc</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Coreutils, Gawk and Make</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Perl</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Inetutils dependency info -->
-  <bridgehead renderas="sect2" id="inetutils-dep">Inetutils</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, Ncurses,
-	 Patch, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Tar</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin IProute2 dependency info -->
-  <bridgehead renderas="sect2" id="iproute2-dep">IProute2</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Bison, Coreutils, Flex, GCC, Glibc, Make
-	 and Linux-Headers</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Kbd dependency info -->
-  <bridgehead renderas="sect2" id="kbd-dep">Kbd</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Bison, Coreutils, Flex, GCC, Gettext, Glibc,
-	 Gzip, Make, and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Less dependency info -->
-  <bridgehead renderas="sect2" id="less-dep">Less</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
-	 Ncurses and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Libtool dependency info -->
-  <bridgehead renderas="sect2" id="libtool-dep">Libtool</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
-	 Make, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Findutils</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Linux-Headers dependency info -->
-  <bridgehead renderas="sect2" id="linux-headers-dep">Linux-Headers</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Binutils, Coreutils, Findutils, GCC, Grep, Make and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Linux Kernel dependency info -->
-  <bridgehead renderas="sect2" id="linux-dep">Linux Kernel</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, GCC, Glibc, Grep,
-	 Gzip, Make, Mktemp, Module-Init-Tools, Ncurses and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin M4 dependency info -->
-  <bridgehead renderas="sect2" id="m4-dep">M4</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Autoconf and Bison</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Make dependency info -->
-  <bridgehead renderas="sect2" id="make-dep">Make</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep,
-	 Make, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Perl and Procps</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Man dependency info -->
-  <bridgehead renderas="sect2" id="man-dep">Man</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Bzip2, Coreutils, Flex, Gawk, GCC, Gettext,
-	 Glibc, Grep, Groff, Gzip, Less, Make and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Mktemp dependency info -->
-  <bridgehead renderas="sect2" id="mktemp-dep">Mktemp</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Patch and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Module-Init-Tools dependency info -->
-  <bridgehead renderas="sect2" id="module-init-tools-dep">Module-Init-Tools</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Findutils, GCC, Glibc, Grep, Make,
-         Sed and Zlib</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils, File, Gawk, Gzip, and Mktemp</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Ncurses dependency info -->
-  <bridgehead renderas="sect2" id="ncurses-dep">Ncurses</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Gawk, GCC, Glibc, Grep,
-	 Make and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Bash, GRUB, Inetutils, Less, Procps, Psmisc, Readline, Texinfo,
-	  Util-linux-ng and Vim</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Patch dependency info -->
-  <bridgehead renderas="sect2" id="patch-dep">Patch</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Perl dependency info -->
-  <bridgehead renderas="sect2" id="perl-dep">Perl</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Gawk, GCC, Glibc, Grep,
-	 Groff, Make and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Iana-Etc and Procps</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Autoconf</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Procps dependency info -->
-  <bridgehead renderas="sect2" id="procps-dep">Procps</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make and Ncurses</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Psmisc dependency info -->
-  <bridgehead renderas="sect2" id="psmisc-dep">Psmisc</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make, Ncurses
-	 and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Readline dependency info -->
-  <bridgehead renderas="sect2" id="readline-dep">Readline</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make, Ncurses,
-         Patch, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Bash</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Sed dependency info -->
-  <bridgehead renderas="sect2" id="sed-dep">Sed</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make,
-	 Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils and Gawk</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>E2fsprogs, File, Libtool and Shadow</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Shadow dependency info -->
-  <bridgehead renderas="sect2" id="shadow-dep">Shadow</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, Findutils, Gawk, GCC,
-	 Gettext, Glibc, Grep, Make and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Sysklogd dependency info -->
-  <bridgehead renderas="sect2" id="sysklogd-dep">Sysklogd</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Binutils, Coreutils, GCC, Glibc and Make</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Sysvinit dependency info -->
-  <bridgehead renderas="sect2" id="sysvinit-dep">Sysvinit</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Binutils, Coreutils, GCC, Glibc, Make and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Tar dependency info -->
-  <bridgehead renderas="sect2" id="tar-dep">Tar</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Bison, Coreutils, GCC, Gettext, Glibc,
-	 Grep, Inetutils, Make, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils, Findutils, Gawk and Gzip</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Tcl dependency info -->
-  <bridgehead renderas="sect2" id="tcl-dep">Tcl</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep,
-	 Make and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Texinfo dependency info -->
-  <bridgehead renderas="sect2" id="texinfo-dep">Texinfo</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Gettext, Glibc, Grep, Make,
-	 Ncurses, Patch and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Diffutils</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Tree dependency info -->
-  <bridgehead renderas="sect2" id="tree-dep">Tree</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Coreutils, GCC and Make</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Udev dependency info -->
-  <bridgehead renderas="sect2" id="udev-dep">Udev</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Binutils, Coreutils, GCC, Glibc and Make</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>Findutils, Perl and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Util-linux-ng dependency info -->
-  <bridgehead renderas="sect2" id="util-linux-ng-dep">Util-linux-ng</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, E2fprogs, GCC, Gettext, Glibc, Grep,
-	 Make, Ncurses, Sed, Texinfo and Zlib</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>No testsuite available</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Vim dependency info -->
-  <bridgehead renderas="sect2" id="vim-dep">Vim</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
-	 Ncurses and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Zlib dependency info -->
-  <bridgehead renderas="sect2" id="zlib-dep">Zlib</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Grep, Make and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>File, Module-Init-Tools and Util-linux-ng</seg>
-        </seglistitem>
-      </segmentedlist>
-
-</appendix>
Index: OK/appendices/dependencies/mips.xml
===================================================================
--- BOOK/appendices/dependencies/mips.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,97 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<appendix id="appendixc-mips" xreflabel="Appendix C">
-  <?dbhtml dir="appendixc"?>
-  <?dbhtml filename="mips-dependencies.html"?>
-
-  <title>Mips Dependencies</title>
-
-  <para>This page contains dependency information for packages specific to Mips.</para>
-
-<!-- Begin arcload dependency info -->
-  <bridgehead renderas="sect2" id="arcload-dep">Arcload</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Binutils, Coreutils, Dvhtool, GCC, Make and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin colo dependency info -->
-  <bridgehead renderas="sect2" id="colo-dep">Colo</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Binutils, Coreutils, GCC, Gzip and Make</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin dvhtool dependency info -->
-  <bridgehead renderas="sect2" id="dvhtool-dep">Dvhtool</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Binutils, Coreutils, GCC and Make</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-</appendix>
Index: OK/appendices/dependencies/ppc.xml
===================================================================
--- BOOK/appendices/dependencies/ppc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,124 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<appendix id="appendixc-ppc" xreflabel="Appendix C">
-  <?dbhtml dir="appendixc"?>
-  <?dbhtml filename="ppc-dependencies.html"?>
-
-  <title>PowerPC Dependencies</title>
-
-  <para>This page contains dependency information for packages specific to ppc.</para>
-
-<!-- Begin hfsutils dependency info -->
-  <bridgehead renderas="sect2" id="hfsutils-dep">hfsutils</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC and Make</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin parted dependency info -->
-  <bridgehead renderas="sect2" id="parted-dep">Parted</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, E2fsprogs, GCC, Make, Ncurses and
-         Readline</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin powerpc-utils dependency info -->
-  <bridgehead renderas="sect2" id="powerpc-utils-dep">Powerpc-Utils</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Binutils, GCC, Make and Patch</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin yaboot dependency info -->
-  <bridgehead renderas="sect2" id="yaboot-dep">Yaboot</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Binutils, Coreutils, GCC, Make, Mktemp, Patch and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-</appendix>
Index: OK/appendices/dependencies/sparc.xml
===================================================================
--- BOOK/appendices/dependencies/sparc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,71 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<appendix id="appendixc-sparc" xreflabel="Appendix C">
-  <?dbhtml dir="appendixc"?>
-  <?dbhtml filename="sparc-dependencies.html"?>
-
-  <title>Sparc Dependencies</title>
-
-  <para>This page contains dependency information for packages specific to Sparc.</para>
-
-<!-- Begin elftoaout dependency info -->
-  <bridgehead renderas="sect2" id="elftoaout-dep">Elftoaout</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Binutils, GCC, Make and Patch</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin silo dependency info -->
-  <bridgehead renderas="sect2" id="silo-dep">Silo</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Binutils, Coreutils, Elftoaout, Gawk, GCC, Glibc, Grep, Gzip,
-         Make, Patch and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-</appendix>
Index: OK/appendices/dependencies/x86.xml
===================================================================
--- BOOK/appendices/dependencies/x86.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,44 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<appendix id="appendixc-x86" xreflabel="Appendix C">
-  <?dbhtml dir="appendixc"?>
-  <?dbhtml filename="x86-dependencies.html"?>
-
-  <title>x86 Dependencies</title>
-
-  <para>This page contains dependency information for packages specific to x86.</para>
-
-<!-- Begin GRUB dependency info -->
-  <bridgehead renderas="sect2" id="grub-dep">GRUB</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, Diffutils, GCC, Glibc, Grep, Make,
-	 Ncurses, Sed and Texinfo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-</appendix>
Index: OK/appendices/dependencies/x86_64-64.xml
===================================================================
--- BOOK/appendices/dependencies/x86_64-64.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,70 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<appendix id="appendixc-x86_64-64" xreflabel="Appendix C">
-  <?dbhtml dir="appendixc"?>
-  <?dbhtml filename="x86_64-64-dependencies.html"?>
-
-  <title>x86 Dependencies</title>
-
-  <para>This page contains dependency information for packages specific to x86 Pure64.</para>
-
-<!-- Begin Bin86 dependency info -->
-  <bridgehead renderas="sect2" id="bin86-dep">Bin86</bridgehead>
-
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Binutils, Coreutils, GCC, Glibc, Make and Patch</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>Lilo</seg>
-        </seglistitem>
-      </segmentedlist>
-
-<!-- Begin Lilo dependency info -->
-  <bridgehead renderas="sect2" id="lilo-dep">Lilo</bridgehead>
-  
-      <segmentedlist>
-        <segtitle>&dependencies;</segtitle>
-
-        <seglistitem>
-         <seg>Bash, Bin86, Binutils, Coreutils, GCC, Glibc, Make and Sed</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&testsuites;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-      <segmentedlist>
-        <segtitle>&before;</segtitle>
-
-        <seglistitem>
-          <seg>None</seg>
-        </seglistitem>
-      </segmentedlist>
-
-</appendix>
Index: OK/appendices/license.xml
===================================================================
--- BOOK/appendices/license.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,188 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<appendix id="license" xreflabel="Open Publication License">
-  <?dbhtml dir="appendices"?>
-  <?dbhtml filename="license.html"?>
-
-  <title>Open Publication License</title>
-  <bridgehead renderas="sect3">v1.0, 8 June 1999</bridgehead>
-
-
-  <bridgehead renderas="sect2">I. REQUIREMENTS ON BOTH UNMODIFIED AND
-  MODIFIED VERSIONS</bridgehead>
-
-  <para>The Open Publication works may be reproduced and distributed in
-  whole or in part, in any medium physical or electronic, provided that
-  the terms of this license are adhered to, and that this license or an
-  incorporation of it by reference (with any options elected by the
-  author(s) and/or publisher) is displayed in the reproduction.</para>
-
-  <para>Proper form for an incorporation by reference is as follows:</para>
-
-  <blockquote>
-    <para>Copyright &copy; &lt;year&gt; by &lt;author's name or designee&gt;.
-    This material may be distributed only subject to the terms and conditions
-    set forth in the Open Publication License, vX.Y or later (the latest
-    version is presently available at <ulink
-    url="http://www.opencontent.org/openpub/"/>).</para>
-  </blockquote>
-
-  <para>The reference must be immediately followed with any options elected
-  by the author(s) and/or publisher of the document (see section VI).</para>
-
-  <para>Commercial redistribution of Open Publication-licensed material
-  is permitted.</para>
-
-  <para>Any publication in standard (paper) book form shall require the
-  citation of the original publisher and author. The publisher and
-  author's names shall appear on all outer surfaces of the book. On all
-  outer surfaces of the book the original publisher's name shall be as
-  large as the bridgehead of the work and cited as possessive with respect
-  to the bridgehead.</para>
-
-
-  <bridgehead renderas="sect2">II. COPYRIGHT</bridgehead>
-
-  <para>The copyright to each Open Publication is owned by its
-  author(s) or designee.</para>
-
-  <bridgehead renderas="sect2">III. SCOPE OF LICENSE</bridgehead>
-
-  <para>The following license terms apply to all Open Publication works,
-  unless otherwise explicitly stated in the document.</para>
-
-  <para>Mere aggregation of Open Publication works or a portion of an
-  Open Publication work with other works or programs on the same media
-  shall not cause this license to apply to those other works. The
-  aggregate work shall contain a notice specifying the inclusion of the
-  Open Publication material and appropriate copyright notice.</para>
-
-  <para>SEVERABILITY. If any part of this license is found to be
-  unenforceable in any jurisdiction, the remaining portions of the
-  license remain in force.</para>
-
-  <para>NO WARRANTY. Open Publication works are licensed and provided
-  "as is" without warranty of any kind, express or implied, including,
-  but not limited to, the implied warranties of merchantability and
-  fitness for a particular purpose or a warranty of non-infringement.</para>
-
-
-  <bridgehead renderas="sect2">IV. REQUIREMENTS ON MODIFIED WORKS</bridgehead>
-
-  <para>All modified versions of documents covered by this license,
-  including translations, anthologies, compilations and partial documents,
-  must meet the following requirements:</para>
-
-  <orderedlist>
-    <listitem>
-      <para>The modified version must be labeled as such.</para>
-    </listitem>
-    <listitem>
-      <para>The person making the modifications must be identified and
-      the modifications dated.</para>
-    </listitem>
-    <listitem>
-      <para>Acknowledgement of the original author and publisher if
-      applicable must be retained according to normal academic citation
-      practices.</para>
-    </listitem>
-    <listitem>
-      <para>The location of the original unmodified document must be
-      identified.</para>
-    </listitem>
-    <listitem>
-      <para>The original author's (or authors') name(s) may not be used
-      to assert or imply endorsement of the resulting document without
-      the original author's (or authors') permission.</para>
-    </listitem>
-  </orderedlist>
-
-
-  <bridgehead renderas="sect2">V. GOOD-PRACTICE RECOMMENDATIONS</bridgehead>
-
-  <para>In addition to the requirements of this license, it is requested
-  from and strongly recommended of redistributors that:</para>
-
-  <orderedlist>
-    <listitem>
-      <para>If you are distributing Open Publication works on hardcopy
-      or CD-ROM, you provide email notification to the authors of your
-      intent to redistribute at least thirty days before your manuscript
-      or media freeze, to give the authors time to provide updated
-      documents. This notification should describe modifications, if any,
-      made to the document.</para>
-    </listitem>
-    <listitem>
-      <para>All substantive modifications (including deletions) be either
-      clearly marked up in the document or else described in an attachment
-      to the document.</para>
-    </listitem>
-    <listitem>
-      <para>Finally, while it is not mandatory under this license, it is
-      considered good form to offer a free copy of any hardcopy and CD-ROM
-      expression of an Open Publication-licensed work to its author(s).</para>
-    </listitem>
-  </orderedlist>
-
-
-  <bridgehead renderas="sect2">VI. LICENSE OPTIONS</bridgehead>
-
-  <para>The author(s) and/or publisher of an Open Publication-licensed
-  document may elect certain options by appending language to the reference
-  to or copy of the license. These options are considered part of the
-  license instance and must be included with the license (or its
-  incorporation by reference) in derived works.</para>
-
-  <para>A. To prohibit distribution of substantively modified versions
-  without the explicit permission of the author(s). "Substantive modification"
-  is defined as a change to the semantic content of the document, and
-  excludes mere changes in format or typographical corrections.</para>
-
-  <para>To accomplish this, add the phrase `Distribution of substantively
-  modified versions of this document is prohibited without the explicit
-  permission of the copyright holder.' to the license reference or copy.</para>
-
-  <para>B. To prohibit any publication of this work or derivative works in
-  whole or in part in standard (paper) book form for commercial purposes
-  is prohibited unless prior permission is obtained from the copyright
-  holder.</para>
-
-  <para>To accomplish this, add the phrase 'Distribution of the work or
-  derivative of the work in any standard (paper) book form is prohibited
-  unless prior permission is obtained from the copyright holder.' to the
-  license reference or copy.</para>
-
-
-  <bridgehead renderas="sect2">OPEN PUBLICATION POLICY APPENDIX</bridgehead>
-
-  <para>(This is not considered part of the license.)</para>
-
-  <para>Open Publication works are available in source format via the Open
-  Publication home page at <ulink url="http://works.opencontent.org/"/>.</para>
-
-  <para>Open Publication authors who want to include their own license on
-  Open Publication works may do so, as long as their terms are not more
-  restrictive than the Open Publication license.</para>
-
-  <para>If you have questions about the Open Publication License, please
-  contact David Wiley at dw@opencontent.org, and/or the Open Publication
-  Authors' List at opal@opencontent.org, via email.</para>
-
-  <para>To <emphasis role="strong">subscribe</emphasis> to the Open Publication
-  Authors' List: Send E-mail to opal-request@opencontent.org with the word
-  "subscribe" in the body.</para>
-
-  <para>To <emphasis role="strong">post</emphasis> to the Open Publication
-  Authors' List: Send E-mail to opal@opencontent.org or simply reply to a
-  previous post.</para>
-
-  <para>To <emphasis role="strong">unsubscribe</emphasis> from the Open
-  Publication Authors' List: Send E-mail to opal-request@opencontent.org
-  with the word "unsubscribe" in the body.</para>
-
-</appendix>
Index: OK/appendices/ppc/macmiscellany.xml
===================================================================
--- BOOK/appendices/ppc/macmiscellany.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,144 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<appendix id="appendixe" xreflabel="Appendix E">
-  <?dbhtml dir="appendices"?>
-  <?dbhtml filename="macmiscellany.html"?>
-
-  <title>Open Firmware and Mac issues.</title>
-
-    <para>This appendix documents some of the features of ppc macintoshes,
-    and in particular the requirements of coexisting with Mac OS's (OSX or
-    the old OS9).  It is only relevant to NewWorld hardware.</para>
-
-  <variablelist>
-
-    <varlistentry>
-      <term><emphasis role="bold">Open Firmware and blessed partitions</emphasis></term>
-      <listitem>
-        <para>The Open Firmware (OF) is the code in ROM or nvram which controls
-        how the machine boots.  If booting automatically, it will boot from the
-	first valid blessed partition it finds (this is a simplification,
-	but it is adequate for normal purposes).</para>
-
-	<para>It can only read apple filesystems (hfs, hfs+, or hfsx depending
-	on the version of the firmware).  For disks under linux, the blessing
-	is done by ybin when it installs yaboot (the loader) and yaboot.conf.</para>
-
-	<para>Mac OS's have a tendency to look at other hfs{,+,x} filesystems
-	on the disk, and unbless them if they do not match their expectations.
-	Unblessing makes them unbootable. Fortunately, a filesystem of type
-	<literal>Apple_Bootstrap</literal> can be read as hfs by the OF, but will
-	be ignored by Mac OS.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">Partitioning</emphasis></term>
-      <listitem>
-	<para>Macintoshes use their own partition format - this means that other
-	machines are unlikely to be able to read or write to macintosh partitions
-	(in particular, fdisk does not understand them). The format allows a large
-	number of individual partitions, and the native Mac tools had a tendency
-	to insert small "filler" partitions between the real partitions. Under
-	linux, using more than 15 partitions can be problematic (shortage of device
-	nodes), so the normal approach is to use the Mac tools to create an area
-	of freespace at the <emphasis>front</emphasis> of the disk, then put the
-	Mac OS partition(s) after it and (re-)install the Mac OS.  The
-	freespace can then be partitioned using <command>parted</command> or the
-	older <command>mac-fdisk</command>.  It seems that recent versions of the
-	Mac tools may no longer insert the filler partitions, so it may be
-	possible to do all the partitioning before installing OSX.</para>
-
-	<warning>
-	<para>The Macintosh resizing and partitioning tools are destructive and may
-	delete all data when a partition is resized, even on unaltered partitions.
-	</para>
-	</warning>
-
-	<para>For the Linux partitions, you will need a bootstrap partition - this
-	can normally be a mere 800KB in size (the smallest hfs partition available)
-	although the Fedora installer  has been known to insist on 800MB.  This has
-	to be in front of the Mac OS partition.  The bootstrap is
-	<emphasis>never</emphasis> mounted as a regular partition and should not
-	be confused with a <literal>/boot</literal> partition.  Other partitions
-	are as normal (at least one rootfs, perhaps swap, perhaps others).</para>
-
-	<para>According to the lfs-from-osx hint, the Mac partitioning tools
-	can create an apple_bootstrap partition and therefore there is no need
-	to use a Linux CD to create the desired partitions from freespace, but
-	using a Linux CD to create the partitions is a more widely tested approach.
-	</para>
-
-	<para>If you follow this approach, partition 1 will be the apple partition
-	map, partition 2 will be the bootstrap at the start of the disk, the
-	linux partitions will follow, and then the mac partition(s) - under OSX
-	the first mac partition will be number 3, under OS9 it would have a higher
-	number and there would be some apple driver partitions.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">OSX or OF upgrades</emphasis></term>
-      <listitem>
-	<para>If the machine is dual-booted with OSX, the mac kernel or the OF
-	will probably be upgraded at some point.  This appears to either unbless
-	the bootstrap,	or else just point the OF boot device to the mac partition
-	- so, the linux system will no longer be bootable.</para>
-
-	<para>Therefore, you will need to know which partition contains the bootstrap
-	so that you can boot it from OF (on an apple keyboard, hold down
-	option-command-o-f (that is, alt-apple-o-f) while booting then enter a
-	command like:</para>
-
-<screen><userinput role="nodump">boot hd:2,yaboot</userinput></screen>
-
-	<para>This will allow you to select a linux boot, and from there you
-	will have to rerun <command>ybin</command>.</para>
-
-	<para>The "OS chooser" menu that yaboot typically loads is stored in the
-	OF and will not be available after a Mac kernel or firmware upgrade until
-	<command>ybin</command> has been rerun.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">Yaboot's requirements</emphasis></term>
-      <listitem>
-	<para>Yaboot is the boot loader for linux, sometimes referred to as
-	the second stage loader.  It reads the yaboot.conf file on the bootstrap
-	partition to find which linux system(s) should be available, and
-	attempts to load the required kernel.</para>
-
-	<para>The bootstrap man page warns that the path to the kernel should
-	contain no more than one directory for reliability.</para>
-
-	<para>Yaboot has to be able to understand the filesystem, so that it
-	can find the kernel.  It understands hfs (not useful for linux, it is
-	not case-sensitive), ext2 (and therefore it can read ext3), reiser3,
-	and xfs.  If you want to use a different type of filesystem for '/'
-	you will have to create a separate boot partition with a supported
-	filesystem, and use that to hold the kernels.</para>
-
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><emphasis role="bold">Requirements if starting from OSX</emphasis></term>
-      <listitem>
-	<para>Older versions of OSX (panther, leopard) can write to ext2
-	filesystems using version 1.3 of ext2fsx.  The upgrade to tiger broke
-	this, and version 1.4 of ext2fsx only supports reading.  Users of
-	current OSX will therefore have to find some other way of creating
-	a suitable filesystem and populating it, such as a Live CD or rescue CD.
-	</para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-</appendix>
Index: OK/boot/64/createfiles.xml
===================================================================
--- BOOK/boot/64/createfiles.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<!-- for pure64 on multilib-capable architectures -->
-
-<sect1 id="ch-boot-createfiles">
-  <?dbhtml filename="createfiles.html"?>
-
-  <title>Creating Essential Symlinks</title>
-
-  <para os="a">Some programs use hard-wired paths to programs which do not exist
-  yet. In order to satisfy these programs, create a number of symbolic
-  links which will be replaced by real files throughout the course of
-  the next chapter after the software has been installed.</para>
-
-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,pwd,rm,stty} ${CLFS}/bin
-ln -sv /tools/bin/file ${CLFS}/usr/bin
-ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
-ln -sv /tools/lib/libstd*so* ${CLFS}/usr/lib
-ln -sv bash ${CLFS}/bin/sh</userinput></screen>
-
-  <para os="b">To enable some c++ tests in the glibc and binutils testsuites
-  to link, create a directory and make some symbolic links:</para>
-
-<screen><userinput>mkdir -pv ${CLFS}/usr/lib64
-ln -sv /tools/lib/libstd*so* ${CLFS}/usr/lib64</userinput></screen>
-
-</sect1>
Index: OK/boot/64/e2fsprogs.xml
===================================================================
--- BOOK/boot/64/e2fsprogs.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,87 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-e2fsprogs" role="wrap">
-  <?dbhtml filename="e2fsprogs.html"?>
-
-  <title>E2fsprogs-&e2fsprogs-version;</title>
-
-  <indexterm zone="ch-boot-e2fsprogs">
-    <primary sortas="a-E2fsprogs">E2fsprogs</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/e2fsprogs.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of E2fsprogs</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-e2fsprogs" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/64/udev.xml
===================================================================
--- BOOK/boot/64/udev.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,50 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-udev" role="wrap">
-  <?dbhtml filename="udev.html"?>
-
-  <title>Udev-&udev-version;</title>
-
-  <indexterm zone="ch-boot-udev">
-    <primary sortas="a-Udev">Udev</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/udev.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Udev</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make CROSS_COMPILE="${CLFS_TARGET}-" CC="${CC} ${BUILD64}" \
-    LD="${CC} ${BUILD64}"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-udev" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/alpha-chapter.xml
===================================================================
--- BOOK/boot/alpha-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,33 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-boot" xreflabel="If You Are Going to Boot">
-  <?dbhtml dir="boot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Boot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/aboot-build.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/aboot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatnext.xml"/>
-
-</chapter>
Index: OK/boot/alpha/aboot-build.xml
===================================================================
--- BOOK/boot/alpha/aboot-build.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,51 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-aboot-build" role="wrap">
-  <?dbhtml filename="aboot-build.html"?>
-
-  <title>Aboot-&aboot-version;</title>
-
-  <indexterm zone="ch-boot-aboot-build">
-    <primary sortas="a-Aboot">Aboot</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/alpha/aboot.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Aboot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/alpha/aboot.xml"
-  xpointer="xpointer(//*[@os='aa'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/alpha/aboot.xml"
-  xpointer="xpointer(//*[@os='ab'])"/>
-
-    <para>Compile the package:</para>
-
-<screen><userinput>make CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
-
-    <para>Install the package:</para>
-
-<screen><userinput>make DESTDIR="${CLFS}" BINDIR="/cross-tools/bin" install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-aboot" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/alpha/aboot.xml
===================================================================
--- BOOK/boot/alpha/aboot.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,38 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-aboot" role="wrap">
-  <?dbhtml filename="aboot.html"?>
-
-  <title>Making the Temporary System Bootable</title>
-
-  <indexterm zone="ch-boot-aboot">
-    <primary sortas="a-Aboot">Aboot</primary>
-    <secondary>boot, configuring</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/alpha/aboot.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>cat &gt; ${CLFS}/etc/aboot.conf &lt;&lt; "EOF"
-<literal># Begin /etc/aboot.conf
-0:1/boot/clfskernel-&linux-version; root=/dev/sda1
-# End /etc/aboot.conf</literal>
-EOF</userinput></screen>
-
-   <para os="b">If you already have aboot installed on your target system, you do
-   not need to reinstall it. aboot is just a chain loader and has no bearing on
-   the system build.</para>
-
-   <para os="c">After you get the build copied to when you can boot, you will need
-   to issue the following command:</para>
-
-<screen><userinput>swriteboot -f3 /dev/sda /boot/bootlx
-abootconf /dev/sda 1</userinput></screen>
-
-</sect1>
Index: OK/boot/alpha/kernel.xml
===================================================================
--- BOOK/boot/alpha/kernel.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,136 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version;</title>
-
-  <indexterm zone="ch-boot-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/alpha/kernel.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/alpha/kernel.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/alpha/kernel.xml"
-    xpointer="xpointer(//*[@os='a3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/alpha/kernel.xml"
-    xpointer="xpointer(//*[@os='a4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-<screen><userinput>make ARCH=alpha CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-<screen><userinput>make ARCH=alpha CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-<screen><userinput>make ARCH=alpha CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x1'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-kernel" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/common/bootscripts.xml
===================================================================
--- BOOK/boot/common/bootscripts.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-scripts-boot" role="wrap">
-  <?dbhtml filename="bootscripts.html"?>
-
-  <title>CLFS-Bootscripts-&clfs-bootscripts-version;</title>
-
-  <indexterm zone="ch-scripts-boot">
-    <primary sortas="a-Bootscripts">Bootscripts</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootscripts/common/bootscripts.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of CLFS-Bootscripts</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootscripts/common/bootscripts.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make DESTDIR=${CLFS} install-minimal</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootscripts/common/setclock.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <para os="c">If you do not know whether or not the hardware clock is set to UTC,
-    you can find out after you have booted the new machine by running the
-    <userinput>hwclock --localtime  --show</userinput> command, and if
-    necessary editing the <filename>/etc/sysconfig/clock</filename> script.
-    The worst that will happen if you make a wrong guess here is that the
-    time displayed will be wrong.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootscripts/common/setclock.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>cat &gt; ${CLFS}/etc/sysconfig/clock &lt;&lt; "EOF"
-<literal># Begin /etc/sysconfig/clock
-
-UTC=1
-
-# End /etc/sysconfig/clock</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-  <para>Details on this package are located in <xref
-  linkend="contents-bootscripts" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/common/changingowner.xml
===================================================================
--- BOOK/boot/common/changingowner.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-changingowner">
-  <?dbhtml filename="changingowner.html"?>
-
-  <title>Changing Ownership</title>
-
-  <para os="a">Currently, the <filename class="directory">${CLFS}</filename>
-  directory and all of its subdirectories  are owned by the user
-  <systemitem class="username">clfs</systemitem>, a user that exists only
-  on the host system. For security reasons, the ${CLFS} root directory and
-  all of it subdirectories should be owned by
-  <systemitem class="username">root</systemitem>. Change the ownership
-  for ${CLFS} and its subdirectories by running this command:</para>
-
-<screen os="b"><userinput>chown -Rv root:root ${CLFS}</userinput></screen>
-
-</sect1>
Index: OK/boot/common/createfiles.xml
===================================================================
--- BOOK/boot/common/createfiles.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,24 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-createfiles">
-  <?dbhtml filename="createfiles.html"?>
-
-  <title>Creating Essential Symlinks</title>
-
-  <para os="a">Some programs use hard-wired paths to programs which do not exist
-  yet. In order to satisfy these programs, create a number of symbolic
-  links which will be replaced by real files throughout the course of
-  the next chapter after the software has been installed.</para>
-
-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,pwd,rm,stty} ${CLFS}/bin
-ln -sv /tools/bin/file ${CLFS}/usr/bin
-ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
-ln -sv /tools/lib/libstd*so* ${CLFS}/usr/lib
-ln -sv bash ${CLFS}/bin/sh</userinput></screen>
-
-</sect1>
Index: OK/boot/common/creatingdirs.xml
===================================================================
--- BOOK/boot/common/creatingdirs.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-creatingdirs">
-  <?dbhtml filename="creatingdirs.html"?>
-
-  <title>Creating Directories</title>
-
-  <para os="a">It is time to create some structure in the CLFS file system. Create a
-  standard directory tree by issuing the following commands:</para>
-
-<screen os="b"><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,{etc/,}opt,home,lib,mnt}
-mkdir -pv ${CLFS}/{proc,media/{floppy,cdrom},sbin,srv,sys}
-mkdir -pv ${CLFS}/var/{lock,log,mail,run,spool}
-mkdir -pv ${CLFS}/var/{opt,cache,lib/{misc,locate},local}
-install -dv -m 0750 ${CLFS}/root
-install -dv -m 1777 ${CLFS}{/var,}/tmp
-mkdir -pv ${CLFS}/usr/{,local/}{bin,include,lib,sbin,src}
-mkdir -pv ${CLFS}/usr/{,local/}share/{doc,info,locale,man}
-mkdir -pv ${CLFS}/usr/{,local/}share/{misc,terminfo,zoneinfo}
-mkdir -pv ${CLFS}/usr/{,local/}share/man/man{1,2,3,4,5,6,7,8}
-for dir in ${CLFS}/usr{,/local}; do
-  ln -sv share/{man,doc,info} $dir
-done</userinput></screen>
-
-  <para os="c">Directories are, by default, created with permission mode 755,
-  but this is not desirable for all directories. In the commands above,
-  two changes are made&mdash;one to the home directory of user
-  <systemitem class="username">root</systemitem>, and another to the
-  directories for temporary files.</para>
-
-  <para os="d">The first mode change ensures that not just anybody can enter
-  the <filename class="directory">/root</filename> directory&mdash;the
-  same as a normal user would do with his or her home directory. The
-  second mode change makes sure that any user can write to the
-  <filename class="directory">/tmp</filename> and
-  <filename class="directory">/var/tmp</filename> directories, but
-  cannot remove another user's files from them. The latter is prohibited
-  by the so-called <quote>sticky bit,</quote> the highest bit (1) in the
-  1777 bit mask.</para>
-
-  <sect2 os="e">
-    <title>FHS Compliance Note</title>
-
-    <para>The directory tree is based on the Filesystem Hierarchy Standard
-    (FHS) (available at <ulink url="http://www.pathname.com/fhs/"/>). In
-    addition to the tree created above, this standard stipulates the
-    existence of <filename class="directory">/usr/local/games</filename>
-    and <filename class="directory">/usr/share/games</filename>. The FHS
-    is not precise as to the structure of the <filename
-    class="directory">/usr/local/share</filename> subdirectory, so we
-    create only the directories that are needed. However, feel free to
-    create these directories if you prefer to conform more strictly to
-    the FHS.</para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/common/devices.xml
===================================================================
--- BOOK/boot/common/devices.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,42 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-devices">
-  <?dbhtml filename="devices.html"?>
-
-  <title>Populating /dev</title>
-
-  <indexterm zone="ch-boot-devices">
-    <primary sortas="e-/dev/*">/dev/*</primary>
-  </indexterm>
-
-  <sect2>
-    <title>Creating Initial Device Nodes</title>
-
-    <note os="a">
-      <para>The commands in the remainder of the book should be run as
-      the <systemitem class="username">root</systemitem> user. Also,
-      double-check that ${CLFS} is set as
-      <systemitem class="username">root</systemitem>.</para>
-    </note>
-
-    <para os="b">When the kernel boots the system, it requires the presence
-    of a few device nodes, in particular the <filename
-    class="devicefile">console</filename> and <filename
-    class="devicefile">null</filename> devices. The device nodes will
-    be created on the hard disk so that they are available before
-    <command>udev</command> has been started, and additionally when Linux
-    is started in single user mode (hence the restrictive permissions on
-    <filename class="devicefile">console</filename>). Create these by running
-    the following commands:</para>
-
-<screen><userinput>mknod -m 600 ${CLFS}/dev/console c 5 1
-mknod -m 666 ${CLFS}/dev/null c 1 3</userinput></screen>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/common/e2fsprogs.xml
===================================================================
--- BOOK/boot/common/e2fsprogs.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,88 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-e2fsprogs" role="wrap">
-  <?dbhtml filename="e2fsprogs.html"?>
-
-  <title>E2fsprogs-&e2fsprogs-version;</title>
-
-  <indexterm zone="ch-boot-e2fsprogs">
-    <primary sortas="a-E2fsprogs">E2fsprogs</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/e2fsprogs.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of E2fsprogs</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="aa"><userinput>../configure --prefix=/tools \
-    --enable-elf-shlibs --disable-evms --with-cc=${CC} --with-linker=${LD} \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <variablelist os="e">
-      <title>The meaning of the configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../../final-system/common/e2fsprogs.xml"
-      xpointer="xpointer(//*[@os='e2'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../../final-system/common/e2fsprogs.xml"
-      xpointer="xpointer(//*[@os='e3'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <para os="h">Install the binaries, documentation and shared libraries:</para>
-
-<screen os="i"><userinput>make DESTDIR="${CLFS}" install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <para os="ad">Create needed symlinks for a bootable system:</para>
-
-<screen os="ae"><userinput>ln -sv /tools/sbin/{fsck.ext2,fsck.ext3,e2fsck} ${CLFS}/sbin</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-e2fsprogs" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/common/fstab.xml
===================================================================
--- BOOK/boot/common/fstab.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-fstab">
-  <?dbhtml filename="fstab.html"?>
-
-  <title>Creating the /etc/fstab File</title>
-
-  <indexterm zone="ch-boot-fstab">
-    <primary sortas="e-/etc/fstab">/etc/fstab</primary>
-  </indexterm>
-
-  <para os="a">The <filename>/etc/fstab</filename> file is used by some
-  programs to determine where file systems are to be mounted by default,
-  which must be checked, and in which order. Create a new file systems
-  table like this:</para>
-
-<screen><userinput>cat &gt; ${CLFS}/etc/fstab &lt;&lt; "EOF"
-<literal># Begin /etc/fstab
-
-# file system  mount-point  type   options          dump  fsck
-#                                                         order
-
-/dev/<replaceable>[xxx]</replaceable>     /            <replaceable>[fff]</replaceable>  defaults         1     1
-/dev/<replaceable>[yyy]</replaceable>     swap         swap   pri=1            0     0
-proc           /proc        proc   defaults         0     0
-sysfs          /sys         sysfs  defaults         0     0
-devpts         /dev/pts     devpts gid=4,mode=620   0     0
-shm            /dev/shm     tmpfs  defaults         0     0
-# End /etc/fstab</literal>
-EOF</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/common/fstab.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/common/fstab.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-</sect1>
Index: OK/boot/common/introduction.xml
===================================================================
--- BOOK/boot/common/introduction.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,30 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-introduction">
-  <?dbhtml filename="introduction.html"?>
-
-  <title>Introduction</title>
-
-  <para>This chapter shows how to complete the build of temporary tools to
-  create a minimal system that will be used to boot the target machine and to
-  build the final system packages.</para>
-
-  <para>There are a few additional packages that will need to be
-  installed to allow you to boot the minimal system. Some of these
-  packages will be installed onto root or in /usr on the CLFS
-  partition (${CLFS}/bin, ${CLFS}/usr/bin, etc...), rather than /tools, using the
-  "DESTDIR" option with make. This will require the
-  <systemitem class="username">clfs</systemitem> user to have write access to
-  the rest of the CLFS partition, so you will need to temporarily change the
-  ownership of ${CLFS} to the <systemitem class="username">clfs</systemitem> user.
-  Run the following command as <systemitem
-  class="username">root</systemitem>:</para>
-
-<screen><userinput>chown -v clfs ${CLFS}</userinput></screen>
-
-</sect1>
Index: OK/boot/common/module-init-tools.xml
===================================================================
--- BOOK/boot/common/module-init-tools.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-module-init-tools" role="wrap">
-  <?dbhtml filename="module-init-tools.html"?>
-
-  <title>Module-Init-Tools-&module-init-tools-version;</title>
-
-  <indexterm zone="ch-boot-module-init-tools">
-    <primary sortas="a-Module-Init-Tools">Module-Init-Tools</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/module-init-tools.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Module-Init-Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<screen os="f"><userinput>./configure --prefix=/ \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-<screen os="k"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-module-init-tools" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/common/pwdgroup.xml
===================================================================
--- BOOK/boot/common/pwdgroup.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,232 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-pwdgroup">
-  <?dbhtml filename="pwdgroup.html"?>
-
-  <title>Creating the passwd, group, and log Files</title>
-
-  <indexterm zone="ch-boot-pwdgroup">
-    <primary sortas="e-/etc/passwd">/etc/passwd</primary>
-  </indexterm>
-
-  <indexterm zone="ch-boot-pwdgroup">
-    <primary sortas="e-/etc/group">/etc/group</primary>
-  </indexterm>
-
-  <indexterm zone="ch-boot-pwdgroup">
-    <primary sortas="e-/var/run/utmp">/var/run/utmp</primary>
-  </indexterm>
-
-  <indexterm zone="ch-boot-pwdgroup">
-    <primary sortas="e-/var/log/btmp">/var/log/btmp</primary>
-  </indexterm>
-
-  <indexterm zone="ch-boot-pwdgroup">
-    <primary sortas="e-/var/log/lastlog">/var/log/lastlog</primary>
-  </indexterm>
-
-  <indexterm zone="ch-boot-pwdgroup">
-    <primary sortas="e-/var/log/wtmp">/var/log/wtmp</primary>
-  </indexterm>
-
-  <para os="a">In order for user <systemitem class="username">root</systemitem> to
-  be able to login and for the name <quote>root</quote> to be recognized,
-  there must be relevant entries in the <filename>/etc/passwd</filename>
-  and <filename>/etc/group</filename> files.</para>
-
-  <para>Create the <filename>${CLFS}/etc/passwd</filename> file by running
-  the following command:</para>
-
-<screen><userinput>cat &gt; ${CLFS}/etc/passwd &lt;&lt; "EOF"
-<literal>root::0:0:root:/root:/bin/bash</literal>
-EOF</userinput></screen>
-
-  <para os="b">The actual password for <systemitem class="username">root</systemitem>
-  (the <quote>::</quote> used here is just a placeholder and allow you to login
-  with no password) will be set later.</para>
-
-  <variablelist os="c">
-  
-    <title>Additional users you may want to add:</title>
-
-    <varlistentry>
-      <term><literal>bin:x:1:1:bin:/bin:/bin/false</literal></term>
-      <listitem>
-        <para>Can be useful for compatibility with legacy applications.</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>daemon:x:2:6:daemon:/sbin:/bin/false</literal></term>
-      <listitem>
-        <para>It is often recommended to use an unprivileged User ID/Group ID
-        for daemons to run as, in order to limit their access to the system.</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>adm:x:3:16:adm:/var/adm:/bin/false</literal></term>
-      <listitem>
-        <para>Was used for programs that performed administrative tasks.</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>lp:x:10:9:lp:/var/spool/lp:/bin/false</literal></term>
-      <listitem>
-        <para>Used by programs for printing</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>mail:x:30:30:mail:/var/mail:/bin/false</literal></term>
-      <listitem>
-        <para>Often used by email programs</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>news:x:31:31:news:/var/spool/news:/bin/false</literal></term>
-      <listitem>
-        <para>Often used for network news servers</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>uucp:x:32:32:uucp:/var/spool/uucp:/bin/false</literal></term>
-      <listitem>
-        <para>Often used for Unix-to-Unix Copy of files from one server to the next</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>operator:x:50:0:operator:/root:/bin/bash</literal></term>
-      <listitem>
-        <para>Often used to allow system operators to access the system</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>postmaster:x:51:30:postmaster:/var/spool/mail:/bin/false</literal></term>
-      <listitem>
-        <para>Generally used as an account that receives all the information of troubles with the mail server</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>nobody:x:65534:65534:nobody:/:/bin/false</literal></term>
-      <listitem>
-        <para>Used by NFS</para>
-      </listitem>
-    </varlistentry>
-  </variablelist>
-
-  <para>Create the <filename>${CLFS}/etc/group</filename> file by running
-  the following command:</para>
-
-<screen><userinput>cat &gt; ${CLFS}/etc/group &lt;&lt; "EOF"
-<literal>root:x:0:
-bin:x:1:
-sys:x:2:
-kmem:x:3:
-tty:x:4:
-tape:x:5:
-daemon:x:6:
-floppy:x:7:
-disk:x:8:
-lp:x:9:
-dialout:x:10:
-audio:x:11:
-video:x:12:
-utmp:x:13:
-usb:x:14:
-cdrom:x:15:</literal>
-EOF</userinput></screen>
-
-  <variablelist os="d">
-
-    <title>Additional groups you may want to add</title>
-
-    <varlistentry>
-      <term><literal>adm:x:16:root,adm,daemon</literal></term>
-      <listitem>
-        <para>All users in this group are allowed to do administrative tasks</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>console:x:17:</literal></term>
-      <listitem>
-        <para>This group has direct access to the console</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>cdrw:x:18:</literal></term>
-      <listitem>
-        <para>This group is allowed to use the CDRW drive</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>mail:x:30:mail</literal></term>
-      <listitem>
-        <para>Used by MTAs (Mail Transport Agents)</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>news:x:31:news</literal></term>
-      <listitem>
-        <para>Used by Network News Servers</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>uucp:x:32:uucp</literal></term>
-      <listitem>
-        <para>Used by the Unix-to-Unix copy users</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>users:x:1000:</literal></term>
-      <listitem>
-        <para>The default GID used by shadow for new users</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>nogroup:x:65533:</literal></term>
-      <listitem>
-        <para>This is a default group used by some programs that do not
-        require a group</para>
-      </listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><literal>nobody:x:65534:</literal></term>
-      <listitem>
-        <para>This is used by NFS</para>
-      </listitem>
-    </varlistentry>
-  </variablelist>
-
-  <para os="e">The created groups are not part of any standard&mdash;they are
-  groups decided on in part by the requirements of the Udev configuration
-  in the final system, and in part by common convention employed by a
-  number of existing Linux distributions. The Linux Standard Base (LSB,
-  available at <ulink url="http://www.linuxbase.org"/>) recommends only
-  that, besides the group <quote>root</quote> with a Group ID (GID) of 0,
-  a group <quote>bin</quote> with a GID of 1 be present. All other group
-  names and GIDs can be chosen freely by the system administrator since
-  well-written programs do not depend on GID numbers, but rather use the
-  group's name.</para>
-
-  <para os="f">The <command>login</command>, <command>agetty</command>, and
-  <command>init</command> programs (and others) use a number of log
-  files to record information such as who was logged into the system and
-  when. However, these programs will not write to the log files if they
-  do not already exist. Initialize the log files and give them
-  proper permissions:</para>
-
-<screen><userinput>touch ${CLFS}/var/run/utmp ${CLFS}/var/log/{btmp,lastlog,wtmp}
-chmod -v 664 ${CLFS}/var/run/utmp ${CLFS}/var/log/lastlog
-chmod -v 600 ${CLFS}/var/log/btmp</userinput></screen>
-
-  <para>The <filename>/var/run/utmp</filename> file records the users
-  that are currently logged in. The <filename>/var/log/wtmp</filename>
-  file records all logins and logouts. The
-  <filename>/var/log/lastlog</filename> file records when
-  each user last logged in. The <filename>/var/log/btmp</filename> file
-  records the bad login attempts.</para>
-
-</sect1>
Index: OK/boot/common/settingenviron.xml
===================================================================
--- BOOK/boot/common/settingenviron.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,40 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-settingenviron">
-  <?dbhtml filename="settingenvironment.html"?>
-
-  <title>Setting Up the Environment</title>
-
-  <para>The new instance of the shell that will start when the system is booted is a <emphasis>login</emphasis>
-  shell, which will read <filename>.bash_profile</filename> file. Create the
-  <filename>.bash_profile</filename> file now:</para>
-
-<screen><userinput>cat &gt; ${CLFS}/root/.bash_profile &lt;&lt; "EOF"
-<literal>set +h
-PS1='\u:\w\$ '
-LC_ALL=POSIX
-PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin:/tools/sbin
-export LC_ALL PATH PS1</literal>
-EOF</userinput></screen>
-
-  <para>The <envar>LC_ALL</envar> variable controls the localization of
-  certain programs, making their messages follow the conventions of a
-  specified country. 
-  Setting <envar>LC_ALL</envar> to <quote>POSIX</quote> or <quote>C</quote>
-  (the two are equivalent) ensures that everything will work as expected
-  on your temporary system.</para>
-
-  <para>By putting <filename class="directory">/tools/bin</filename> at
-  the end of the standard <envar>PATH</envar>, all the programs installed in
-  <xref linkend="chapter-temp-system"/> are only picked up by the shell
-  if they have not yet been built on the target system. This configuration
-  forces use of the final system binaries as they are built over the 
-  temp-system, minimising the chance of final system programs being built
-  against the temp-system.</para>
-
-</sect1>
Index: OK/boot/common/sysvinit.xml
===================================================================
--- BOOK/boot/common/sysvinit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,104 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-sysvinit" role="wrap">
-  <?dbhtml filename="sysvinit.html"?>
-
-  <title>Sysvinit-&sysvinit-version;</title>
-
-  <indexterm zone="ch-boot-sysvinit">
-    <primary sortas="a-Sysvinit">Sysvinit</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/sysvinit.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Sysvinit</title>
-
-    <para os="aa">Make some modifications to allow you to boot into
-    the minimal temp-system:</para>
-
-<screen os="ab"><userinput>cp -v src/Makefile src/Makefile.orig
-sed -e 's@root@0@g' \
-    -e "s@/dev/initctl@${CLFS}&amp;@g" \
-    -e 's@\(mknod \)-m \([0-9]* \)\(.* \)p@\1\3p; chmod \2\3@g' \
-    -e "s@/usr/lib@/tools/lib@" \
-    src/Makefile.orig > src/Makefile</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="ac"><userinput>make -C src clobber
-make -C src CC="${CC}"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<screen os="ad"><userinput>make -C src install INSTALL=install ROOT=${CLFS}</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="conf-tools-sysvinit" role="configuration">
-    <title>Configuring Sysvinit</title>
-
-    <indexterm zone="conf-tools-sysvinit">
-      <primary sortas="a-Sysvinit">Sysvinit</primary>
-      <secondary>boot, configuring</secondary>
-    </indexterm>
-
-    <indexterm zone="conf-tools-sysvinit">
-      <primary sortas="e-/etc/inittab">/etc/inittab</primary>
-    </indexterm>
-
-    <para os="ae">Create a new file <filename>${CLFS}/etc/inittab</filename> by
-    running the following:</para>
-
-<screen os="af"><userinput>cat &gt; ${CLFS}/etc/inittab &lt;&lt; "EOF"
-<literal># Begin /etc/inittab
-
-id:3:initdefault:
-
-si::sysinit:/etc/rc.d/init.d/rc sysinit
-
-l0:0:wait:/etc/rc.d/init.d/rc 0
-l1:S1:wait:/etc/rc.d/init.d/rc 1
-l2:2:wait:/etc/rc.d/init.d/rc 2
-l3:3:wait:/etc/rc.d/init.d/rc 3
-l4:4:wait:/etc/rc.d/init.d/rc 4
-l5:5:wait:/etc/rc.d/init.d/rc 5
-l6:6:wait:/etc/rc.d/init.d/rc 6
-
-ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now
-
-su:S016:once:/sbin/sulogin
-
-1:2345:respawn:/sbin/agetty -I '\033(K' tty1 9600
-2:2345:respawn:/sbin/agetty -I '\033(K' tty2 9600
-3:2345:respawn:/sbin/agetty -I '\033(K' tty3 9600
-4:2345:respawn:/sbin/agetty -I '\033(K' tty4 9600
-5:2345:respawn:/sbin/agetty -I '\033(K' tty5 9600
-6:2345:respawn:/sbin/agetty -I '\033(K' tty6 9600
-
-# End /etc/inittab</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-sysvinit" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/common/udev.xml
===================================================================
--- BOOK/boot/common/udev.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,47 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-udev" role="wrap">
-  <?dbhtml filename="udev.html"?>
-
-  <title>Udev-&udev-version;</title>
-
-  <indexterm zone="ch-boot-udev">
-    <primary sortas="a-Udev">Udev</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/udev.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Udev</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/udev.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make CROSS_COMPILE="${CLFS_TARGET}-" CC="${CC}" LD="${CC}"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/udev.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-udev" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/common/util-linux-ng.xml
===================================================================
--- BOOK/boot/common/util-linux-ng.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-util-linux-ng" role="wrap">
-  <?dbhtml filename="util-linux-ng.html"?>
-
-  <title>Util-linux-ng-&util-linux-ng-version;</title>
-
-  <indexterm zone="ch-boot-util-linux-ng">
-    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/util-linux-ng.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Util-linux-ng</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} --enable-login-utils \
-    --disable-makeinstall-chown</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-util-linux-ng" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/common/whatnext.xml
===================================================================
--- BOOK/boot/common/whatnext.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,53 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-whatnext">
-  <?dbhtml filename="whatnext.html"?>
-
-  <title>What to do next</title>
-
-  <para>Now you're at the point to get your <filename
-  class="directory">${CLFS}</filename> directory copied over to your target
-  machine. The easiest method would be to tar it up and copy the file.</para>
-
-<screen><userinput>tar -jcvf ${CLFS}.tar.bz2 ${CLFS}</userinput></screen>
-<!--
-  <para>Some others have came up with other ideas on how to do this.
-  Below is a table with the method and link to where the information
-  is stored.</para>
-
-  <table>
-    <title>Boot Methods</title>
-    <?dbfo table-width="6in" ?>
-
-    <tgroup cols="3">
-
-      <colspec colnum="1" colwidth="1in"   colname="Method"/>
-      <colspec colnum="2" colwidth="2.5in" colname="Arch"/>
-      <colspec colnum="3" colwidth="2.5in" colname="Link"/>
-
-      <thead>
-        <row>
-          <entry>Boot Method</entry>
-          <entry>For Architectures</entry>
-          <entry>Hyperlink</entry>
-        </row>
-      </thead>
-
-      <tbody>
-        <row>
-          <entry>nfsroot</entry>
-          <entry>MIPS, PPC, Sparc, x86, and x86_64</entry>
-          <entry><ulink url="http://documents.jg555.com/netboot"/></entry>
-        </row>
-      </tbody>
-
-    </tgroup>
-
-  </table>
--->
-</sect1>
Index: OK/boot/mips-chapter.xml
===================================================================
--- BOOK/boot/mips-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,34 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-boot" xreflabel="If You Are Going to Boot">
-  <?dbhtml dir="boot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Boot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/bootloaders.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/colo-build.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/colo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatnext.xml"/>
-
-</chapter>
Index: OK/boot/mips/bootloaders.xml
===================================================================
--- BOOK/boot/mips/bootloaders.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,22 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-bootloaders">
-  <?dbhtml filename="bootloaders.html"?>
-
-  <title>Bootloaders</title>
-
-  <para>On MIPS based platforms, we have 2 different bootloaders - Colo
-  for the Cobalt based MIPS machines and Arcload for the SGI Machines.
-  At this time, in the boot scenario, the only bootloader we can build
-  and that is usable is Cobalt bootloader. On SGI Machines that follow
-  this build method, we recommend to do a netboot. Information about
-  netbooting can be found at the link below.</para>
-
-  <para><ulink url="http://documents.jg555.com/netboot"/></para>
-
-</sect1>
Index: OK/boot/mips/colo-build.xml
===================================================================
--- BOOK/boot/mips/colo-build.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-colo-build" role="wrap">
-  <?dbhtml filename="colo-build.html"?>
-
-  <title>Colo-&colo-version;</title>
-
-  <indexterm zone="ch-boot-colo-build">
-    <primary sortas="a-Colo">Colo</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/mips/colo.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Colo</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/colo.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/colo.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/colo.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/colo.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="aa"><userinput>cd tools/elf2rfx
-make CC=gcc
-cd ../..
-make CROSS_COMPILE="${CLFS_TARGET}-" binary</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/colo.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="ab"><userinput>cp -v chain/colo-chain.elf ${CLFS}/boot/vmlinux
-gzip -9 ${CLFS}/boot/vmlinux</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-colo" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/mips/colo.xml
===================================================================
--- BOOK/boot/mips/colo.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,40 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-colo">
-  <?dbhtml filename="colo.html"?>
-
-  <title>Making the Temporary System Bootable</title>
-
-  <indexterm zone="ch-boot-colo">
-    <primary sortas="a-Colo">Colo</primary>
-    <secondary>boot, configuring</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/mips/colo.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/mips/colo.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/mips/colo.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="aa"><userinput>cat &gt; ${CLFS}/boot/default.colo &lt;&lt; "EOF"
-#:CoLo:#
-#
-# load linux
-#
-lcd 'Booting &linux-version;...'
-load vmlinux-&linux-version;.gz
-execute root=/dev/hda2 console=ttyS0,115200 ide1=noprobe
-EOF</userinput></screen>
-
-</sect1>
Index: OK/boot/mips/creatingdirs.xml
===================================================================
--- BOOK/boot/mips/creatingdirs.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,39 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-creatingdirs">
-  <?dbhtml filename="creatingdirs.html"?>
-
-  <title>Creating Directories</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-   <para>These entries are needed for the RaQ2 bootloader. Only use these
-   if you are utilizing the Colo bootloader:</para>
-
-<screen><userinput>cd ${CLFS}/boot
-ln -svf . boot</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-</sect1>
Index: OK/boot/mips/kernel.xml
===================================================================
--- BOOK/boot/mips/kernel.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,121 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version;</title>
-
-  <indexterm zone="ch-boot-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>cp -v vmlinux ${CLFS}/boot/vmlinux-&linux-version;
-gzip -9 ${CLFS}/boot/vmlinux-&linux-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x1'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-kernel" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/mips/sysvinit.xml
===================================================================
--- BOOK/boot/mips/sysvinit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,111 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-sysvinit" role="wrap">
-  <?dbhtml filename="sysvinit.html"?>
-
-  <title>Sysvinit-&sysvinit-version;</title>
-
-  <indexterm zone="ch-boot-sysvinit">
-    <primary sortas="a-Sysvinit">Sysvinit</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/sysvinit.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Sysvinit</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-  </sect2>
-
-  <sect2 id="conf-tools-sysvinit" role="configuration">
-    <title>Configuring Sysvinit</title>
-
-    <indexterm zone="conf-tools-sysvinit">
-      <primary sortas="a-Sysvinit">Sysvinit</primary>
-      <secondary>boot, configuring</secondary>
-    </indexterm>
-
-    <indexterm zone="conf-tools-sysvinit">
-      <primary sortas="e-/etc/inittab">/etc/inittab</primary>
-    </indexterm>
-
-    <para>Create a new file <filename>${CLFS}/etc/inittab</filename> by
-    running the following:</para>
-
-<screen><userinput>cat &gt; ${CLFS}/etc/inittab &lt;&lt; "EOF"
-<literal># Begin /etc/inittab
-
-id:3:initdefault:
-
-si::sysinit:/etc/rc.d/init.d/rc sysinit
-
-l0:0:wait:/etc/rc.d/init.d/rc 0
-l1:S1:wait:/etc/rc.d/init.d/rc 1
-l2:2:wait:/etc/rc.d/init.d/rc 2
-l3:3:wait:/etc/rc.d/init.d/rc 3
-l4:4:wait:/etc/rc.d/init.d/rc 4
-l5:5:wait:/etc/rc.d/init.d/rc 5
-l6:6:wait:/etc/rc.d/init.d/rc 6
-
-ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now
-
-su:S016:once:/sbin/sulogin
-
-# Remove this section if you System only
-# has a console port
-1:2345:respawn:/sbin/agetty -I '\033(K' tty1 9600
-2:2345:respawn:/sbin/agetty -I '\033(K' tty2 9600
-3:2345:respawn:/sbin/agetty -I '\033(K' tty3 9600
-4:2345:respawn:/sbin/agetty -I '\033(K' tty4 9600
-5:2345:respawn:/sbin/agetty -I '\033(K' tty5 9600
-6:2345:respawn:/sbin/agetty -I '\033(K' tty6 9600
-
-# Uncomment this section if your system has a console
-# port
-#c0:12345:respawn:/sbin/agetty 115200 ttyS0 vt100
-
-# End /etc/inittab</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-sysvinit" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/mips64-64-chapter.xml
===================================================================
--- BOOK/boot/mips64-64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,35 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-boot" xreflabel="If You Are Going to Boot">
-  <?dbhtml dir="boot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Boot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/bootloaders.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/colo-build.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/colo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatnext.xml"/>
-
-</chapter>
Index: OK/boot/mips64-64/flags.xml
===================================================================
--- BOOK/boot/mips64-64/flags.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para>We will need to copy our build variables into our new system:</para>
-
-<screen><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${CLFS}/root/.bash_profile</userinput></screen>
-
-</sect1>
Index: OK/boot/mips64-chapter.xml
===================================================================
--- BOOK/boot/mips64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,35 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-boot" xreflabel="If You Are Going to Boot">
-  <?dbhtml dir="boot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Boot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/bootloaders.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/colo-build.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/colo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatnext.xml"/>
-
-</chapter>
Index: OK/boot/mips64/colo-build.xml
===================================================================
--- BOOK/boot/mips64/colo-build.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,68 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-colo-build" role="wrap">
-  <?dbhtml filename="colo-build.html"?>
-
-  <title>Colo-&colo-version;</title>
-
-  <indexterm zone="ch-boot-colo-build">
-    <primary sortas="a-Colo">Colo</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/mips/colo.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Colo</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips64/colo.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips64/colo.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/colo.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/colo.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/colo-build.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="aa"><userinput>cd tools/elf2rfx
-make CC=gcc
-cd ../..
-make CC="${CC} ${BUILD64}" CROSS_COMPILE="${CLFS_TARGET}-" binary</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/colo-build.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/colo-build.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-colo" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/mips64/createfiles.xml
===================================================================
--- BOOK/boot/mips64/createfiles.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,27 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-createfiles">
-  <?dbhtml filename="createfiles.html"?>
-
-  <title>Creating Essential Symlinks</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/createfiles.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,pwd,stty} ${CLFS}/bin
-ln -sv /tools/bin/file ${CLFS}/usr/bin
-ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
-ln -sv /tools/lib32/libgcc_s.so{,.1} ${CLFS}/usr/lib32
-ln -sv /tools/lib64/libgcc_s.so{,.1} ${CLFS}/usr/lib64
-ln -sv /tools/lib/libstd*so* ${CLFS}/usr/lib
-ln -sv /tools/lib32/libstd*so* ${CLFS}/usr/lib32
-ln -sv /tools/lib64/libstd*so* ${CLFS}/usr/lib64
-ln -sv bash ${CLFS}/bin/sh</userinput></screen>
-
-</sect1>
Index: OK/boot/mips64/creatingdirs.xml
===================================================================
--- BOOK/boot/mips64/creatingdirs.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-creatingdirs">
-  <?dbhtml filename="creatingdirs.html"?>
-
-  <title>Creating Directories</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,{etc/,}opt,home,lib{,32,64},mnt}
-mkdir -pv ${CLFS}/{proc,media/{floppy,cdrom},sbin,srv,sys}
-mkdir -pv ${CLFS}/var/{lock,log,mail,run,spool}
-mkdir -pv ${CLFS}/var/{opt,cache,lib{,32,64}/{misc,locate},local}
-install -dv ${CLFS}/root -m 0750
-install -dv ${CLFS}{/var,}/tmp -m 1777
-mkdir -pv ${CLFS}/usr/{,local/}{bin,include,lib{,32,64},sbin,src}
-mkdir -pv ${CLFS}/usr/{,local/}share/{doc,info,locale,man}
-mkdir -pv ${CLFS}/usr/{,local/}share/{misc,terminfo,zoneinfo}
-mkdir -pv ${CLFS}/usr/{,local/}share/man/man{1,2,3,4,5,6,7,8}
-for dir in ${CLFS}/usr{,/local}; do
-  ln -sv share/{man,doc,info} $dir
-done
-install -dv ${CLFS}/usr/lib/locale
-ln -sv ../lib/locale ${CLFS}/usr/lib32
-ln -sv ../lib/locale ${CLFS}/usr/lib64</userinput></screen>
-
-   <para>These entries are needed for the RaQ2 bootloader. Only use these
-   if you are utilizing the Colo bootloader:</para>
-
-<screen><userinput>cd /${CLFS}/boot
-ln -svf . boot</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-</sect1>
Index: OK/boot/mips64/flags.xml
===================================================================
--- BOOK/boot/mips64/flags.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para>We will need to copy our build variables into our new system:</para>
-
-<screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ${CLFS}/root/.bash_profile
-echo export BUILDN32=\""${BUILDN32}\"" &gt;&gt; ${CLFS}/root/.bash_profile
-echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${CLFS}/root/.bash_profile
-echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; \
-    ${CLFS}/root/.bash_profile</userinput></screen>
-
-</sect1>
Index: OK/boot/mips64/kernel.xml
===================================================================
--- BOOK/boot/mips64/kernel.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,125 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version;</title>
-
-  <indexterm zone="ch-boot-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/kernel.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-<screen><userinput>make ARCH=mips CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>cp -v vmlinux ${CLFS}/boot/vmlinux-&linux-version;
-gzip -9 ${CLFS}/boot/vmlinux-&linux-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x1'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-kernel" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/mips64/sysvinit.xml
===================================================================
--- BOOK/boot/mips64/sysvinit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-sysvinit" role="wrap">
-  <?dbhtml filename="sysvinit.html"?>
-
-  <title>Sysvinit-&sysvinit-version;</title>
-
-  <indexterm zone="ch-boot-sysvinit">
-    <primary sortas="a-Sysvinit">Sysvinit</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/sysvinit.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Sysvinit</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/sysvinit.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/sysvinit.xml"
-  xpointer="xpointer(//*[@role='configuration'])"/>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-sysvinit" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/multilib/bootscripts.xml
===================================================================
--- BOOK/boot/multilib/bootscripts.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,53 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-scripts-boot" role="wrap">
-  <?dbhtml filename="bootscripts.html"?>
-
-  <title>CLFS-Bootscripts-&clfs-bootscripts-version;</title>
-
-  <indexterm zone="ch-scripts-boot">
-    <primary sortas="a-Bootscripts">Bootscripts</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootscripts/common/bootscripts.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of CLFS-Bootscripts</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bootscripts.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make DESTDIR=${CLFS} LIBDIR=${CLFS}/lib64 install-minimal</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootscripts/common/setclock.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bootscripts.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bootscripts.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-  <para>Details on this package are located in <xref
-  linkend="contents-bootscripts" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/multilib/createfiles.xml
===================================================================
--- BOOK/boot/multilib/createfiles.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-createfiles">
-  <?dbhtml filename="createfiles.html"?>
-
-  <title>Creating Essential Symlinks</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/createfiles.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,pwd,stty} ${CLFS}/bin
-ln -sv /tools/bin/file ${CLFS}/usr/bin
-ln -sv /tools/lib/libgcc_s.so{,.1} ${CLFS}/usr/lib
-ln -sv /tools/lib64/libgcc_s.so{,.1} ${CLFS}/usr/lib64
-ln -sv /tools/lib/libstd*so* ${CLFS}/usr/lib
-ln -sv /tools/lib64/libstd*so* ${CLFS}/usr/lib64
-ln -sv bash ${CLFS}/bin/sh</userinput></screen>
-
-</sect1>
Index: OK/boot/multilib/creatingdirs.xml
===================================================================
--- BOOK/boot/multilib/creatingdirs.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-creatingdirs">
-  <?dbhtml filename="creatingdirs.html"?>
-
-  <title>Creating Directories</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>mkdir -pv ${CLFS}/{bin,boot,dev,{etc/,}opt,home,lib{,64},mnt}
-mkdir -pv ${CLFS}/{proc,media/{floppy,cdrom},sbin,srv,sys}
-mkdir -pv ${CLFS}/var/{lock,log,mail,run,spool}
-mkdir -pv ${CLFS}/var/{opt,cache,lib{,64}/{misc,locate},local}
-install -dv ${CLFS}/root -m 0750
-install -dv ${CLFS}{/var,}/tmp -m 1777
-mkdir -pv ${CLFS}/usr/{,local/}{bin,include,lib{,64},sbin,src}
-mkdir -pv ${CLFS}/usr/{,local/}share/{doc,info,locale,man}
-mkdir -pv ${CLFS}/usr/{,local/}share/{misc,terminfo,zoneinfo}
-mkdir -pv ${CLFS}/usr/{,local/}share/man/man{1,2,3,4,5,6,7,8}
-for dir in ${CLFS}/usr{,/local}; do
-  ln -sv share/{man,doc,info} $dir
-done
-install -dv ${CLFS}/usr/lib/locale
-ln -sv ../lib/locale ${CLFS}/usr/lib64</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-</sect1>
Index: OK/boot/multilib/e2fsprogs.xml
===================================================================
--- BOOK/boot/multilib/e2fsprogs.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,94 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-e2fsprogs" role="wrap">
-  <?dbhtml filename="e2fsprogs.html"?>
-
-  <title>E2fsprogs-&e2fsprogs-version;</title>
-
-  <indexterm zone="ch-boot-e2fsprogs">
-    <primary sortas="a-E2fsprogs">E2fsprogs</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/e2fsprogs.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of E2fsprogs</title>
-
-    <para os="m1">Make sure the libraries get installed to
-    <filename class="directory">/tools/lib64</filename>:</para>
-
-<screen os="m2"><userinput>chmod -v 0755 configure
-cp -v configure{,.orig}
-sed -e "/libdir=.*\/lib/s@/lib@/lib64@g" configure.orig > configure</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="aa"><userinput>CC="${CC} ${BUILD64}" ../configure --prefix=/tools \
-    --enable-elf-shlibs --disable-evms --with-cc="${CC} ${BUILD64}" \
-    --with-linker=${LD} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-e2fsprogs" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/multilib/module-init-tools.xml
===================================================================
--- BOOK/boot/multilib/module-init-tools.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,66 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-module-init-tools" role="wrap">
-  <?dbhtml filename="module-init-tools.html"?>
-
-  <title>Module-Init-Tools-&module-init-tools-version;</title>
-
-  <indexterm zone="ch-boot-module-init-tools">
-    <primary sortas="a-Module-Init-Tools">Module-Init-Tools</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/module-init-tools.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Module-Init-Tools</title>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<screen os="f"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/ \
-   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-module-init-tools" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/multilib/sysvinit.xml
===================================================================
--- BOOK/boot/multilib/sysvinit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-sysvinit" role="wrap">
-  <?dbhtml filename="sysvinit.html"?>
-
-  <title>Sysvinit-&sysvinit-version;</title>
-
-  <indexterm zone="ch-boot-sysvinit">
-    <primary sortas="a-Sysvinit">Sysvinit</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/sysvinit.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Sysvinit</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="ac"><userinput>make -C src clobber
-make -C src CC="${CC} ${BUILD64}"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sysvinit.xml"
-  xpointer="xpointer(//*[@role='configuration'])"/>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-sysvinit" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/multilib/udev.xml
===================================================================
--- BOOK/boot/multilib/udev.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,58 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-udev" role="wrap">
-  <?dbhtml filename="udev.html"?>
-
-  <title>Udev-&udev-version;</title>
-
-  <indexterm zone="ch-boot-udev">
-    <primary sortas="a-Udev">Udev</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/udev.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Udev</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/multilib/udev-64bit.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/multilib/udev-64bit.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make CROSS_COMPILE="${CLFS_TARGET}-" CC="${CC} ${BUILD64}" \
-    LD="${CC} ${BUILD64}"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-udev" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/multilib/util-linux-ng.xml
===================================================================
--- BOOK/boot/multilib/util-linux-ng.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,59 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-util-linux-ng" role="wrap">
-  <?dbhtml filename="util-linux-ng.html"?>
-
-  <title>Util-linux-ng-&util-linux-ng-version;</title>
-
-  <indexterm zone="ch-boot-util-linux-ng">
-    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/util-linux-ng.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Util-linux-ng</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="be"><userinput>CC="${CC} ${BUILD64}" ./configure --build=${CLFS_HOST} \
-    --host=${CLFS_TARGET} --enable-login-utils \
-    --disable-makeinstall-chown</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-util-linux-ng" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/ppc-chapter.xml
===================================================================
--- BOOK/boot/ppc-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-boot" xreflabel="If You Are Going to Boot">
-  <?dbhtml dir="boot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Boot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/hfsutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/mktemp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/powerpc-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/yaboot-build.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/yaboot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatnext.xml"/>
-
-</chapter>
Index: OK/boot/ppc/hfsutils.xml
===================================================================
--- BOOK/boot/ppc/hfsutils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-hfsutils" role="wrap">
-  <?dbhtml filename="hfsutils.html"?>
-
-  <title>Hfsutils-&hfsutils-version;</title>
-
-  <indexterm zone="ch-boot-hfsutils">
-    <primary sortas="a-Hfsutils">Hfsutils</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/ppc/hfsutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Hfsutils</title>
-
-    <para>If you have created, or will create, the ext2 filesystem on your
-    Mac using ext2fsx you can jump ahead to
-    <xref linkend="ch-boot-yaboot-build" role="."/>. The next three packages
-    are for people who cannot do that.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>CC="${CC}" ./configure --prefix=/tools</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref linkend="contents-hfsutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/ppc/kernel.xml
===================================================================
--- BOOK/boot/ppc/kernel.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,125 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version;</title>
-
-  <indexterm zone="ch-boot-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
-
-    <warning>
-    <para>Ensure you select all of the necessary mac drivers, particularly for
-    ide and input.</para>
-    </warning>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-<screen><userinput>make ARCH=ppc CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x1'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-kernel" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/ppc/mktemp.xml
===================================================================
--- BOOK/boot/ppc/mktemp.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-mktemp" role="wrap">
-  <?dbhtml filename="mktemp.html"?>
-
-  <title>Mktemp-&mktemp-version;</title>
-
-  <indexterm zone="ch-boot-mktemp">
-    <primary sortas="a-Mktemp">Mktemp</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/mktemp.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Mktemp</title>
-
-    <para os="a">Mktemp will try to pass the <literal>-s</literal> switch to
-    <command>install</command> to strip the binaries. This will not work when
-    cross compiling, so run the following commands to remove this:</para>
-
-<screen os="b"><userinput>cp -v Makefile.in{,.orig}
-sed  's/\(0555 \)-s /\1/' Makefile.in.orig >Makefile.in</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/mktemp.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="e"><userinput>CC="${CC}" ./configure --prefix=/tools --with-libc\
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/mktemp.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/mktemp.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/mktemp.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref linkend="contents-mktemp" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/ppc/powerpc-utils.xml
===================================================================
--- BOOK/boot/ppc/powerpc-utils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,51 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-powerpc-utils" role="wrap">
-  <?dbhtml filename="powerpc-utils.html"?>
-
-  <title>Powerpc-Utils_&powerpcutils-version;</title>
-
-  <indexterm zone="ch-boot-powerpc-utils">
-    <primary sortas="a-Powerpc-Utils">Powerpc-Utils</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/ppc/powerpc-utils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Powerpc-Utils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <para os="a">This package's Makefile has issues with cross-compiling. Fortunately,
-    we only need one program and it is a simple task to compile it.</para>
-
-<screen><userinput>${CC} -o nvsetenv nvsetenv.c nwnvsetenv.c</userinput></screen>
-
-    <para os="c">Install the program:</para>
-
-<screen os="d"><userinput>install -v -m755 nvsetenv /tools/sbin</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref linkend="contents-powerpc-utils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/ppc/yaboot-build.xml
===================================================================
--- BOOK/boot/ppc/yaboot-build.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,80 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-yaboot-build" role="wrap">
-  <?dbhtml filename="yaboot-build.html"?>
-
-  <title>Yaboot-&yaboot-version;</title>
-
-  <indexterm zone="ch-boot-yaboot-build">
-    <primary sortas="a-Yaboot">Yaboot</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/ppc/yaboot.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Yaboot</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <para os="p1">The following patch allows <command>ofpath</command> to use
-    <literal>PATH_PREFIX</literal> like the other
-    <filename class="directory">ybin</filename> scripts:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&yaboot-ofpath_path-patch;</userinput></screen>
-
-    <para>The Makefile is already set to do kernel-style cross-compiling,
-    but it will try to use <command>strip</command> to strip the second-stage
-    loader. It also tries to change user and group ownership for the installed
-    files to <systemitem class="username">root</systemitem>, which the
-    <systemitem class="username">clfs</systemitem> user cannot do. The following
-    command fixes both issues:</para>
-
-<screen><userinput>cp Makefile{,.orig}
-sed -e "s/\(strip \)/${CLFS_TARGET}-\1/" \
-    -e 's/-o root -g root//' \
-    Makefile.orig > Makefile</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen><userinput>make CROSS=${CLFS_TARGET}-</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen><userinput>make CROSS=${CLFS_TARGET}- ROOT=/tools PREFIX="" install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref linkend="contents-yaboot" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/ppc/yaboot.xml
===================================================================
--- BOOK/boot/ppc/yaboot.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,82 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-yaboot">
-  <?dbhtml filename="yaboot.html"?>
-
-  <title>Making the Temporary System Bootable</title>
-
-  <indexterm zone="ch-boot-yaboot">
-    <primary sortas="a-Yaboot">Yaboot</primary>
-    <secondary>boot, configuring</secondary>
-  </indexterm>
-
-  <para os="a">Some of the idiosyncracies of booting on ppc are discussed in
-   <xref linkend="appendixe" role="."/>. Essentially, there are two options
-   here - either copy the bootloader to an  OSX root partition and boot from
-   Open Firmware, or use an install, Live, or rescue CD to set up a bootstrap
-   partition.</para>
-
-  <sect2 role=".">
-    <title>Copying the bootloader to OSX and booting from OF.</title>
-
-    <para os="b">You must now ensure that <filename>/tools/etc/yaboot.conf</filename>
-    contains the correct details for the CLFS system.  Consult
-    <xref linkend="ch-bootable-yaboot" role="."/> for details, but note that
-    at this point you do not need the <literal>install, magicboot, enablecdboot
-    </literal>or <literal>macosx</literal> parameters because these are not
-    available when you boot from Open Firmware.</para>
-
-    <para os="c">By this stage, you should have the temporary system on an ext2
-    filesystem on your Mac.  Now, from within OSX, copy
-    <filename>/tools/lib/yaboot/yaboot</filename>) and
-    <filename>/tools/etc/yaboot.conf</filename>) to the OSX <filename>/</filename>
-    directory.</para>
-
-   <para os="d">Each time you want to boot into the temporary system, hold down
-   the option-command-o-f keys to get to Open Firmware, then use the following
-   command, replacing <literal>X</literal> with the number of the partition
-   containing the <emphasis>OSX</emphasis> root filesystem (typically, this
-   will be '3').</para>
-
-<screen os="e" role="nodump"><userinput>boot hd:X,yaboot</userinput></screen>
-
-  </sect2>
-
-  <sect2 role=".">
-    <title>Using a CD to set up the bootstrap partition.</title>
-
-    <para os="f">This is particularly appropriate if you cannot write to an
-    ext2 filesystem from OSX. Boot from the CD, and (as necessary) create
-    partitions and filesystems, mount the CLFS partition at
-    <filename>/tools</filename>  and untar the temporary system there.</para>
-
-    <para os="g">Now set up <filename>/tools/etc/yaboot.conf</filename> - see
-    <xref linkend="ch-bootable-yaboot" role="."/> for details of what should be
-    in it, but note that the <emphasis>install</emphasis> and <emphasis>magicboot
-    </emphasis>specifications should point to<filename>/tools/lib/yaboot/</filename>
-    and <emphasis>not</emphasis> <filename>/usr/lib/yaboot</filename>.</para>
-
-    <para os="h">To write the bootloader to the disk, with <filename>/tools/sbin
-   </filename>first on your path and <filename>/proc</filename> mounted, run the
-   following command:</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-<screen os="j" role="nodump"><userinput>PATH_PREFIX=/tools ybin -v -C /tools/etc/yaboot.conf</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-<screen os="u" role="nodump"><userinput>PATH_PREFIX=/tools mkofboot</userinput></screen>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/ppc64-chapter.xml
===================================================================
--- BOOK/boot/ppc64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-boot" xreflabel="If You Are Going to Boot">
-  <?dbhtml dir="boot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Boot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/hfsutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/mktemp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/powerpc-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/yaboot-build.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/yaboot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatnext.xml"/>
-
-</chapter>
Index: OK/boot/ppc64/e2fsprogs.xml
===================================================================
--- BOOK/boot/ppc64/e2fsprogs.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,107 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-e2fsprogs" role="wrap">
-  <?dbhtml filename="e2fsprogs.html"?>
-
-  <title>E2fsprogs-&e2fsprogs-version;</title>
-
-  <indexterm zone="ch-boot-e2fsprogs">
-    <primary sortas="a-E2fsprogs">E2fsprogs</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/e2fsprogs.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of E2fsprogs</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <para>When cross-compiling configure cannot determine sizes and assumes
-    short=2, int=4, long=4, long long=8. This is not correct for PowerPC64.
-    Adjust the values with:</para>
-
-<!--<screen><userinput>echo "ac_cv_sizeof_long_long=8" &gt; config.cache
-echo "ac_cv_sizeof_long=8" &gt;&gt; config.cache
-echo "ac_cv_sizeof_int=4" &gt;&gt; config.cache
-echo "ac_cv_sizeof_short=2" &gt;&gt; config.cache</userinput></screen>-->
-
-<screen><userinput>echo "ac_cv_sizeof_long=8" &gt; config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="aa"><userinput>CC="${CC} ${BUILD64}" ../configure --prefix=/tools \
-    --enable-elf-shlibs --disable-evms --with-cc="${CC} ${BUILD64}" \
-    --with-linker=${LD} --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-e2fsprogs" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/ppc64/hfsutils.xml
===================================================================
--- BOOK/boot/ppc64/hfsutils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-hfsutils" role="wrap">
-  <?dbhtml filename="hfsutils.html"?>
-
-  <title>Hfsutils-&hfsutils-version;</title>
-
-  <indexterm zone="ch-boot-hfsutils">
-    <primary sortas="a-Hfsutils">Hfsutils</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/ppc/hfsutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Hfsutils</title>
-
-    <para>If you have created, or will create, the ext2 filesystem on your
-    Mac using ext2fsx you can jump ahead to
-    <xref linkend="ch-boot-yaboot-build" role="."/>. The next three packages
-    are for people who cannot do that.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref linkend="contents-hfsutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/ppc64/kernel.xml
===================================================================
--- BOOK/boot/ppc64/kernel.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,124 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version;</title>
-
-  <indexterm zone="ch-boot-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/kernel.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-<screen><userinput>make ARCH=powerpc CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x1'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-kernel" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/ppc64/mktemp.xml
===================================================================
--- BOOK/boot/ppc64/mktemp.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,70 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-mktemp" role="wrap">
-  <?dbhtml filename="mktemp.html"?>
-
-  <title>Mktemp-&mktemp-version;</title>
-
-  <indexterm zone="ch-boot-mktemp">
-    <primary sortas="a-Mktemp">Mktemp</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/mktemp.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Mktemp</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/mktemp.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/mktemp.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <para os="a">Mktemp will try to pass the <literal>-s</literal> switch to
-    <command>install</command> to strip the binaries. This will not work when
-    cross compiling, so run the following commands to remove this:</para>
-
-<screen os="b"><userinput>cp -v Makefile.in{,.orig}
-sed  's/\(0555 \)-s /\1/' Makefile.in.orig >Makefile.in</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/mktemp.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="e"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools --with-libc\
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/mktemp.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/mktemp.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/mktemp.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref linkend="contents-mktemp" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/ppc64/powerpc-utils.xml
===================================================================
--- BOOK/boot/ppc64/powerpc-utils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-powerpc-utils" role="wrap">
-  <?dbhtml filename="powerpc-utils.html"?>
-
-  <title>Powerpc-Utils_&powerpcutils-version;</title>
-
-  <indexterm zone="ch-boot-powerpc-utils">
-    <primary sortas="a-Powerpc-Utils">Powerpc-Utils</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/ppc/powerpc-utils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Powerpc-Utils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>${CC} ${BUILD32} -o nvsetenv nvsetenv.c nwnvsetenv.c</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref linkend="contents-powerpc-utils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/ppc64/yaboot-build.xml
===================================================================
--- BOOK/boot/ppc64/yaboot-build.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,100 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-yaboot-build" role="wrap">
-  <?dbhtml filename="yaboot-build.html"?>
-
-  <title>Yaboot-&yaboot-version;</title>
-
-  <indexterm zone="ch-boot-yaboot-build">
-    <primary sortas="a-Yaboot">Yaboot</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/ppc/yaboot.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Yaboot</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot-build.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot-build.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <para>The Makefile is already set to do kernel-style cross-compiling,
-    but it will try to use <command>strip</command> to strip the second-stage
-    loader.  It also expects to be running as root for the install, and to
-    install for the root user, which user CLFS cannot do.  We also need to use
-    the 32-bit compiler, and to force <command>ld</command> to use a 32-bit
-    emulation. The following commands will fix and achieve this:</para>
-
-<screen><userinput>cp Makefile{,.orig}
-sed -e "s/\(-print-libgcc-file-name\)/${BUILD32} \1/" \
-            -e "s/\(-Bstatic\)/-melf32ppclinux \1/" \
-            -e "s/\(strip \)/${CLFS_TARGET}-\1/" \
-            -e 's/-o root -g root//' \
-    Makefile.orig > Makefile</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen><userinput>CFLAGS=${BUILD32} make CROSS=${CLFS_TARGET}-</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc64/yaboot.xml"
-    xpointer="xpointer(//*[@os='j0'])"/>
-
-<screen><userinput>make CROSS=${CLFS_TARGET}- ROOT=/tools PREFIX= install 2&gt;&amp;1 | tee instlog</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc64/yaboot.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc64/yaboot.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/ppc64/yaboot.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref linkend="contents-yaboot" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/ppc64/yaboot.xml
===================================================================
--- BOOK/boot/ppc64/yaboot.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,78 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-yaboot">
-  <?dbhtml filename="yaboot.html"?>
-
-  <title>Making the Temporary System Bootable</title>
-
-  <indexterm zone="ch-boot-yaboot">
-    <primary sortas="a-Yaboot">Yaboot</primary>
-    <secondary>boot, configuring</secondary>
-  </indexterm>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-  <sect2 role=".">
-    <title>Copying the bootloader to OSX and booting from OF.</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-  </sect2>
-
-  <sect2 role=".">
-    <title>Using a CD to set up the bootstrap partition.</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <para os="f2">It is also appropriate if you are running an old 32-bit Linux
-    kernel on a 64-bit machine, or if the kernel personality has been forced to
-    32-bit.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-<screen os="u" role="nodump"><userinput>PATH_PREFIX=/tools mkofboot</userinput></screen>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/sparc-chapter.xml
===================================================================
--- BOOK/boot/sparc-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,34 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-boot" xreflabel="If You Are Going to Boot">
-  <?dbhtml dir="boot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Boot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/elftoaout.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/silo-build.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/silo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatnext.xml"/>
-
-</chapter>
Index: OK/boot/sparc/elftoaout.xml
===================================================================
--- BOOK/boot/sparc/elftoaout.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,51 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-elftoaout" role="wrap">
-  <?dbhtml filename="elftoaout.html"?>
-
-  <title>ELFtoaout-&elftoaout-version;</title>
-
-  <indexterm zone="ch-boot-elftoaout">
-    <primary sortas="a-ELFtoaout">ELFtoaout</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/sparc/elftoaout.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of ELFtoaout</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/elftoaout.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/elftoaout.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <para>Compile the ELFtoaout package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>Install the package:</para>
-
-<screen><userinput>install -v -m 0755 -s elftoaout /cross-tools/bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-elftoaout" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/sparc/fstab.xml
===================================================================
--- BOOK/boot/sparc/fstab.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-fstab">
-  <?dbhtml filename="fstab.html"?>
-
-  <title>Creating the /etc/fstab File</title>
-
-  <indexterm zone="ch-boot-fstab">
-    <primary sortas="e-/etc/fstab">/etc/fstab</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/fstab.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>cat &gt; ${CLFS}/etc/fstab &lt;&lt; "EOF"
-<literal># Begin /etc/fstab
-
-# file system  mount-point     type        options          dump  fsck
-#                                                                 order
-
-/dev/<replaceable>[xxx]</replaceable>        /            <replaceable>[fff]</replaceable>       defaults         1     1
-/dev/<replaceable>[yyy]</replaceable>        swap         swap        pri=1            0     0
-proc           /proc           proc        defaults         0     0
-sysfs          /sys            sysfs       defaults         0     0
-devpts         /dev/pts        devpts      gid=4,mode=620   0     0
-shm            /dev/shm        tmpfs       defaults         0     0
-none           /proc/openprom  openpromfs  defaults         0     0
-# End /etc/fstab</literal>
-EOF</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/fstab.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/fstab.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-</sect1>
Index: OK/boot/sparc/kernel.xml
===================================================================
--- BOOK/boot/sparc/kernel.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,120 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version;</title>
-
-  <indexterm zone="ch-boot-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-<title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-<screen><userinput>make ARCH=sparc CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-<screen><userinput>make ARCH=sparc CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-<screen><userinput>make ARCH=sparc CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x1'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-kernel" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/sparc/silo-build.xml
===================================================================
--- BOOK/boot/sparc/silo-build.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-silo-build" role="wrap">
-  <?dbhtml filename="silo-build.html"?>
-
-  <title>Silo-&silo-version;</title>
-
-  <indexterm zone="ch-boot-silo-build">
-    <primary sortas="a-Silo">Silo</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/sparc/silo.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Silo</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/silo.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/silo.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/silo.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="aa"><userinput>make CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/silo.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="ab"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-silo" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/sparc/silo.xml
===================================================================
--- BOOK/boot/sparc/silo.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-silo" role="wrap">
-  <?dbhtml filename="silo.html"?>
-
-  <title>Making the Temporary System Bootable</title>
-
-  <indexterm zone="ch-boot-silo">
-    <primary sortas="a-Silo">Silo</primary>
-    <secondary>boot, configuring</secondary>
-  </indexterm>
-
-  <para os="a">This is for the configuration of <command>silo</command>, similar
-  to what is in bootscripts.</para>
-
-<screen><userinput>cat &gt; ${CLFS}/etc/silo.conf &lt;&lt; "EOF"
-<literal># Begin /etc/silo.conf
-partition = 1         # Boot partition (= root partition)
-root = /dev/sda1      # Root partition
-timeout = 150         # Wait 15 seconds before booting the default section
-
-image = /boot/clfskernel-&linux-version;
-  label = linux
-# End /etc/silo.conf</literal>
-EOF</userinput></screen>
-
-   <para os="b">If you already have Silo installed on your target system, you do
-   not need to reinstall it. Silo is just a chain loader and has no bearing on
-   the system build.</para>
-
-   <para os="c">After you get the build copied to when you can boot, you will need
-   to issue the following command:</para>
-
-<screen os="d"><userinput>silo -f</userinput></screen>
-
-</sect1>
Index: OK/boot/sparc/sysvinit.xml
===================================================================
--- BOOK/boot/sparc/sysvinit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,111 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-sysvinit" role="wrap">
-  <?dbhtml filename="sysvinit.html"?>
-
-  <title>Sysvinit-&sysvinit-version;</title>
-
-  <indexterm zone="ch-boot-sysvinit">
-    <primary sortas="a-Sysvinit">Sysvinit</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/sysvinit.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Sysvinit</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-  </sect2>
-
-  <sect2 id="conf-tools-sysvinit" role="configuration">
-    <title>Configuring Sysvinit</title>
-
-    <indexterm zone="conf-tools-sysvinit">
-      <primary sortas="a-Sysvinit">Sysvinit</primary>
-      <secondary>boot, configuring</secondary>
-    </indexterm>
-
-    <indexterm zone="conf-tools-sysvinit">
-      <primary sortas="e-/etc/inittab">/etc/inittab</primary>
-    </indexterm>
-
-    <para>Create a new file <filename>${CLFS}/etc/inittab</filename> by
-    running the following:</para>
-
-<screen><userinput>cat &gt; ${CLFS}/etc/inittab &lt;&lt; "EOF"
-<literal># Begin /etc/inittab
-
-id:3:initdefault:
-
-si::sysinit:/etc/rc.d/init.d/rc sysinit
-
-l0:0:wait:/etc/rc.d/init.d/rc 0
-l1:S1:wait:/etc/rc.d/init.d/rc 1
-l2:2:wait:/etc/rc.d/init.d/rc 2
-l3:3:wait:/etc/rc.d/init.d/rc 3
-l4:4:wait:/etc/rc.d/init.d/rc 4
-l5:5:wait:/etc/rc.d/init.d/rc 5
-l6:6:wait:/etc/rc.d/init.d/rc 6
-
-ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now
-
-su:S016:once:/sbin/sulogin
-
-# Remove this section if you System only
-# has a console port
-1:2345:respawn:/sbin/agetty -I '\033(K' tty1 9600
-2:2345:respawn:/sbin/agetty -I '\033(K' tty2 9600
-3:2345:respawn:/sbin/agetty -I '\033(K' tty3 9600
-4:2345:respawn:/sbin/agetty -I '\033(K' tty4 9600
-5:2345:respawn:/sbin/agetty -I '\033(K' tty5 9600
-6:2345:respawn:/sbin/agetty -I '\033(K' tty6 9600
-
-# Uncomment this section if your system has a console
-# port
-#c0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100
-
-# End /etc/inittab</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-sysvinit" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/sparc64-64-chapter.xml
===================================================================
--- BOOK/boot/sparc64-64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,35 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-boot" xreflabel="If You Are Going to Boot">
-  <?dbhtml dir="boot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Boot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/elftoaout.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/silo-build.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/silo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatnext.xml"/>
-
-</chapter>
Index: OK/boot/sparc64-64/flags.xml
===================================================================
--- BOOK/boot/sparc64-64/flags.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para>We will need to copy our build variables into our new system:</para>
-
-<screen><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${CLFS}/root/.bash_profile</userinput></screen>
-
-</sect1>
Index: OK/boot/sparc64-64/silo-build.xml
===================================================================
--- BOOK/boot/sparc64-64/silo-build.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,65 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-silo-build" role="wrap">
-  <?dbhtml filename="silo-build.html"?>
-
-  <title>Silo-&silo-version;</title>
-
-  <indexterm zone="ch-boot-silo-build">
-    <primary sortas="a-Silo">Silo</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/sparc/silo.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Silo</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/silo.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/silo.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/silo.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/silo.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/silo.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/silo.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc/silo.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-<screen os="ac"><userinput>tar -xvf silo-loaders-&silo-version;.tar.gz -C ${CLFS}</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-silo" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/sparc64-chapter.xml
===================================================================
--- BOOK/boot/sparc64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,35 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-boot" xreflabel="If You Are Going to Boot">
-  <?dbhtml dir="boot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Boot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/elftoaout.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/silo-build.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/silo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatnext.xml"/>
-
-</chapter>
Index: OK/boot/sparc64/flags.xml
===================================================================
--- BOOK/boot/sparc64/flags.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para>We will need to copy our build variables into our new system:</para>
-
-<screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ${CLFS}/root/.bash_profile
-echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${CLFS}/root/.bash_profile
-echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; \
-    ${CLFS}/root/.bash_profile</userinput></screen>
-
-</sect1>
Index: OK/boot/sparc64/kernel.xml
===================================================================
--- BOOK/boot/sparc64/kernel.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,130 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version;</title>
-
-  <indexterm zone="ch-boot-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc64/kernel.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc64/kernel.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/kernel.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-<screen><userinput>make mrproper ARCH=sparc64 CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-<screen><userinput>make ARCH=sparc64 CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-<screen><userinput>make ARCH=sparc64 CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-<screen><userinput>make INSTALL_MOD_PATH=${CLFS} ARCH=sparc64 \
-   CROSS_COMPILE=${CLFS_TARGET}- modules_install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>cp -v vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x1'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-kernel" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/sparc64/sysvinit.xml
===================================================================
--- BOOK/boot/sparc64/sysvinit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-sysvinit" role="wrap">
-  <?dbhtml filename="sysvinit.html"?>
-
-  <title>Sysvinit-&sysvinit-version;</title>
-
-  <indexterm zone="ch-boot-sysvinit">
-    <primary sortas="a-Sysvinit">Sysvinit</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/sysvinit.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Sysvinit</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/sysvinit.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/sysvinit.xml"
-  xpointer="xpointer(//*[@role='configuration'])"/>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-sysvinit" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/x86-chapter.xml
===================================================================
--- BOOK/boot/x86-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,33 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-boot" xreflabel="If You Are Going to Boot">
-  <?dbhtml dir="boot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Boot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub-build.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatnext.xml"/>
-
-</chapter>
Index: OK/boot/x86/grub-build.xml
===================================================================
--- BOOK/boot/x86/grub-build.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,79 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-grub-build" role="wrap">
-  <?dbhtml filename="grub-build.html"?>
-
-  <title>GRUB-&grub-version;</title>
-
-  <indexterm zone="ch-boot-grub-build">
-    <primary sortas="a-GRUB">GRUB</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/x86/grub.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GRUB</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="aa"><userinput>./configure --prefix=/usr \
-   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/grub.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-<screen os="ab"><userinput>make DESTDIR=${CLFS} install
-mkdir -v ${CLFS}/boot/grub
-cp -v ${CLFS}/usr/lib/grub/*/stage{1,2} ${CLFS}/boot/grub</userinput></screen>
-
-    <para os="ac">The directory in
-    <filename class="directory">${CLFS}/usr/lib/grub</filename> (its name
-    depends on your arch) contains a number of <filename>*stage1_5</filename>
-    files, different ones for different file systems. Review the files
-    available and copy the appropriate ones to the <filename
-    class="directory">${CLFS}/boot/grub</filename> directory. Most users will
-    copy the <filename>e2fs_stage1_5</filename> and/or
-    <filename>reiserfs_stage1_5</filename> files.</para>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-grub" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/x86/grub.xml
===================================================================
--- BOOK/boot/x86/grub.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,106 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-grub">
-  <?dbhtml filename="grub.html"?>
-
-  <title>Making the Temporary System Bootable</title>
-
-  <indexterm zone="ch-boot-grub">
-    <primary sortas="a-GRUB">GRUB</primary>
-    <secondary>boot, configuring</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/grub.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/grub.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>dd if=${CLFS}/boot/grub/stage1 of=/dev/fd0 bs=512 count=1
-dd if=${CLFS}/boot/grub/stage2 of=/dev/fd0 bs=512 seek=1</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/grub.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/grub.xml"
-  xpointer="xpointer(//*[@os='f'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/grub.xml"
-  xpointer="xpointer(//*[@os='g'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/grub.xml"
-  xpointer="xpointer(//*[@os='h'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/grub.xml"
-  xpointer="xpointer(//*[@os='i'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/grub.xml"
-  xpointer="xpointer(//*[@os='j'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/grub.xml"
-  xpointer="xpointer(//*[@os='k'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/grub.xml"
-  xpointer="xpointer(//*[@os='l'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/grub.xml"
-  xpointer="xpointer(//*[@os='m'])"/>
-
-  <para os="n">If all went well, GRUB will have reported finding its files
-  in <filename class="directory">/boot/grub</filename>. That's
-  all there is to it. Quit the <command>grub</command> shell:</para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/grub.xml"
-  xpointer="xpointer(//*[@os='o'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/grub.xml"
-  xpointer="xpointer(//*[@os='p'])"/>
-
-<screen><userinput>cat &gt; ${CLFS}/boot/grub/menu.lst &lt;&lt; "EOF"
-<literal># Begin /boot/grub/menu.lst
-
-# By default boot the first menu entry.
-default 0
-
-# Allow 30 seconds before booting the default.
-timeout 30
-
-# Use prettier colors.
-color green/black light-green/black
-
-# The first entry is for CLFS.
-title CLFS &version;
-root (hd0,3)
-kernel /boot/clfskernel-&linux-version; root=/dev/hda4</literal>
-EOF</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/grub.xml"
-  xpointer="xpointer(//*[@os='q'])"/>
-
-<screen os="r"><userinput>cat &gt;&gt; ${CLFS}/boot/grub/menu.lst &lt;&lt; "EOF"
-<literal>title Red Hat
-root (hd0,2)
-kernel /boot/kernel-2.6.5 root=/dev/hda3
-initrd /boot/initrd-2.6.5</literal>
-EOF</userinput></screen>
-
-</sect1>
Index: OK/boot/x86/kernel.xml
===================================================================
--- BOOK/boot/x86/kernel.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,124 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version;</title>
-
-  <indexterm zone="ch-boot-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <warning os="aa">
-      <para>Here a temporary cross-compiled kernel will be built. When
-      configuring it, select the minimal amount of options required to
-      boot the target machine and build the final system. I.e., no support
-      for sound, printers, etc. will be needed.</para>
-
-      <para>Also, try to avoid the use of modules if possible, and don't
-      use the resulting kernel image for production systems.</para>
-    </warning>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <para os="ae">Configure the kernel via a menu-driven interface:</para>
-
-<screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-<screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
-
-    <para os="af">If the use of kernel modules can't be avoided, an
-    <filename>/etc/modprobe.conf</filename> file may be needed.
-    Information pertaining to modules and kernel configuration is
-    located in the kernel documentation in the <filename
-    class="directory">Documentation</filename> directory of the kernel
-    sources tree. The <filename>modprobe.conf</filename> man page may also
-    be of interest.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-<screen><userinput>make ARCH=i386 CROSS_COMPILE=${CLFS_TARGET}- \
-    INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
-
-    <para os="u">After kernel compilation is complete, additional steps are
-    required to complete the installation. Some files need to be copied to
-    the <filename class="directory">${CLFS}/boot</filename> directory.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>cp -v arch/i386/boot/bzImage ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-<screen os="w1"><userinput>cp -v System.map ${CLFS}/boot/System.map-&linux-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-<screen os="x1"><userinput>cp -v .config ${CLFS}/boot/config-&linux-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-kernel" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/x86_64-64-chapter.xml
===================================================================
--- BOOK/boot/x86_64-64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-boot" xreflabel="If You Are Going to Boot">
-  <?dbhtml dir="boot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Boot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/bootloaders.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/bin86.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/lilo-build.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/lilo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatnext.xml"/>
-
-</chapter>
Index: OK/boot/x86_64-64/bin86.xml
===================================================================
--- BOOK/boot/x86_64-64/bin86.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-bin86" role="wrap">
-  <?dbhtml filename="bin86.html"?>
-
-  <title>Bin86-&bin86-version;</title>
-
-  <indexterm zone="ch-boot-bin86">
-    <primary sortas="a-Bin86">Bin86</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/x86_64-64/bin86.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bin86</title>
-
-    <para os="a">We are building Bin86 so that we can compile Lilo.
-      Both <command>as86</command> and <command>ld86</command> need to
-      run on the host system to assemble x86_64 code.  We cannot
-      compile the whole package like this, but fortunately these two
-      programs are the only parts we require.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86_64-64/bin86.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86_64-64/bin86.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <para os="b">The Bin86 package does not contain a <command>configure
-      </command> script.  Natively compile only the necessary parts with:
-    </para>
-
-<screen os="c"><userinput>make CC=gcc -C as as86
-make CC=gcc -C ld ld86</userinput></screen>
-
-    <para os="e">Install the assembler and linker where they will be on
-      the PATH when we build Lilo, using prefixes to show that their
-      output is not for a native system.</para>
-
-<screen os="f"><userinput>install -v -m 755 -s as/as86 /cross-tools/bin/${CLFS_TARGET}-as86
-install -v -m 755 -s ld/ld86 /cross-tools/bin/${CLFS_TARGET}-ld86</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-bin86" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/x86_64-64/bootloaders.xml
===================================================================
--- BOOK/boot/x86_64-64/bootloaders.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-building-a-bootloader" role="wrap">
-  <?dbhtml filename="building-a-bootloader.html"?>
-
-  <title>Building a bootloader</title>
-
-    <para>On x86 and x86_64 (multilib) architectures, the preferred
-      bootloader is GRUB.  Unfortunately, GRUB doesn't work on x86_64
-      Pure64 - the stage2 files can be correctly built as 32-bit, but the
-      <command>grub</command> shell is a 64-bit program, and tries to
-      execute some of the stage2 routines - this results in a segmentation
-      fault. Therefore, in the final system we use Lilo as the bootloader.
-    </para>
-
-    <para>If you already have a bootloader, such as GRUB, installed on
-      the system then you should use that to make your new kernel bootable.
-   </para>
-
-  <note>
-    <para>We will now cross-compile Bin86 and Lilo - these instructions 
-      assume you are using an x86_64 machine (e.g. booted fron a Live CD),
-      either pure64 or multilib. This approach will not work if you are
-      running the machine as i686, because a 32-bit kernel will not be
-      able to execute a 64-bit binary to install the bootloader.  If that
-      is the case, you will need to install an i686 bootloader on the
-      host system. 
-    </para>
-  </note>
-
-</sect1>
Index: OK/boot/x86_64-64/flags.xml
===================================================================
--- BOOK/boot/x86_64-64/flags.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para>We will need to copy our build variables into our new system:</para>
-
-<screen><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${CLFS}/root/.bash_profile</userinput></screen>
-
-</sect1>
Index: OK/boot/x86_64-64/lilo-build.xml
===================================================================
--- BOOK/boot/x86_64-64/lilo-build.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,53 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-lilo-build" role="wrap">
-  <?dbhtml filename="lilo-build.html"?>
-
-  <title>Lilo-&lilo-version;</title>
-
-  <indexterm zone="ch-boot-lilo-build">
-    <primary sortas="a-Lilo">Lilo</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/x86_64-64/lilo.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Lilo</title>
-
-    <para os="a">The following patch forces Lilo to use our cross-compiler
-      (except for a couple of utilities which run during the compile),
-      and to look for as86 and ld86 under the names by which we installed
-      them.</para>
-
-<screen os="b"><userinput>patch -Np1 -i ../&lilo-cross-x86_64-patch;</userinput></screen>
-
-    <para os="c">Compile the program which installs the loader, linking
-      it statically so that it does not have to link to host libraries
-      when it runs:</para> 
-
-<screen os="d"><userinput>make lilo.static</userinput></screen>
-
-    <para os="e">Install only the parts we need:</para>
-
-<screen os="f"><userinput>install -v -m755 lilo.static /tools/bin
-install -v -m755 keytab-lilo.pl /tools/bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-lilo" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/x86_64-64/lilo.xml
===================================================================
--- BOOK/boot/x86_64-64/lilo.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,107 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-lilo">
-  <?dbhtml filename="lilo.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <indexterm zone="ch-boot-lilo">
-    <primary sortas="a-Lilo">Lilo</primary>
-    <secondary>configuring</secondary>
-  </indexterm>
-
-  <para os="a">You are nearly ready to boot to the new temporary system.
-  One of the last things to do is to ensure that the system can be booted.
-  The instructions below apply only to x86_64 machines on which Lilo is going
-  to be installed. Information on using a pre-installed GRUB on machines
-  currently running as x86 or x86_64 multilib should be available in the
-  usual resource-specific locations for those architectures.  If you have
-  installed an x86 version of Lilo, these instructions should be modified
-  to refer to the <command>lilo</command> and <command>keytab-lilo.pl
-  </command> commands you installed on the host system.</para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86_64-64/lilo.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <para os="d">Earlier, we compiled and installed the Lilo boot loader software
-  in preparation for this step. The procedure involves writing a boot image to
-  a specific location on the hard drive. If you have a floppy disk drive, or
-  if you have installed a cd recording program, we highly recommend using
-  mkrescue to create a Lilo boot floppy, or CD (using e.g. dvdrecord from
-  dvdrtools) as a test and as a backup.</para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86_64-64/lilo.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-<screen os="f" role="nodump"><userinput>keytab-lilo.pl uk >${CLFS}/boot/uk.ktl</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86_64-64/lilo.xml"
-  xpointer="xpointer(//*[@os='g'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86_64-64/lilo.xml"
-  xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j" role="nodump"><userinput>cat &gt; ${CLFS}/etc/lilo.conf &lt;&lt; "EOF"
-<literal># Begin /etc/lilo.conf
-# lilo.conf
-#
-# global options
-boot=/dev/&lt;bootdisk&gt;
-keytable=/boot/&lt;keytable&gt;
-lba32
-map=/boot/map
-prompt
-
-# set the name of the default image to boot
-default=clfs
-
-# define an image
-image=/boot/clfskernel
-    label=clfs
-    root=/dev/&lt;partition&gt;
-    read-only
-# optionally add parameters to pass, e.g.
-#   append="video=radeonfb:1024x768-16@70"
-
-# if you had an existing system, you could
-# add its details here.
-EOF</literal></userinput></screen>
-
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86_64-64/lilo.xml"
-  xpointer="xpointer(//*[@os='k'])"/>
-
-  <warning os="l">
-    <para>The following command will overwrite any current boot loader.
-    Do not run the command if this is not desired. If you have
-    cross-compiled on a different machine from the target, you must
-    install the bootloader on the target machine, the installed boot
-    block is not a file which can be copied with <command>tar</command>. 
-    </para>
-  </warning>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86_64-64/lilo.xml"
-  xpointer="xpointer(//*[@os='m'])"/>
-
-<screen os="n" role="nodump"><userinput>/tools/bin/lilo.static -v -C ${CLFS}/etc/lilo.conf</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86_64-64/lilo.xml"
-  xpointer="xpointer(//*[@os='o'])"/>
-
-</sect1>
Index: OK/boot/x86_64-chapter.xml
===================================================================
--- BOOK/boot/x86_64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,34 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-boot" xreflabel="If You Are Going to Boot">
-  <?dbhtml dir="boot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Boot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/grub-build.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatnext.xml"/>
-
-</chapter>
Index: OK/boot/x86_64/flags.xml
===================================================================
--- BOOK/boot/x86_64/flags.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para>We will need to copy our build variables into our new system:</para>
-
-<screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ${CLFS}/root/.bash_profile
-echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ${CLFS}/root/.bash_profile
-echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; \
-    ${CLFS}/root/.bash_profile</userinput></screen>
-
-</sect1>
Index: OK/boot/x86_64/grub-build.xml
===================================================================
--- BOOK/boot/x86_64/grub-build.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,83 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-grub-build" role="wrap">
-  <?dbhtml filename="grub-build.html"?>
-
-  <title>GRUB-&grub-version;</title>
-
-  <indexterm zone="ch-boot-grub-build">
-    <primary sortas="a-GRUB">GRUB</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/x86/grub.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GRUB</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86_64/grub.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86_64/grub.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="aa"><userinput>CC="${CC} ${BUILD32}" ./configure --prefix=/usr \
-   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub-build.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-grub" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/boot/x86_64/kernel.xml
===================================================================
--- BOOK/boot/x86_64/kernel.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,124 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-boot-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version;</title>
-
-  <indexterm zone="ch-boot-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../bootable/x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <para os="m1">To ensure that your system boots and you can properly run both
-    32 bit and 64 bit binaries, please make sure that you enable support for
-    ELF and emulations for 32bit ELF into the kernel.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-<screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-<screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-<screen><userinput>make ARCH=x86_64 CROSS_COMPILE=${CLFS_TARGET}- \
-   INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>cp -v arch/x86_64/boot/bzImage ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x1'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-kernel" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/bootable/alpha-chapter.xml
===================================================================
--- BOOK/bootable/alpha-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
-  <?dbhtml dir="bootable"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/aboot.xml"/>
-
-</chapter>
Index: OK/bootable/alpha/aboot.xml
===================================================================
--- BOOK/bootable/alpha/aboot.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-aboot">
-  <?dbhtml filename="aboot.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <indexterm zone="ch-bootable-aboot">
-    <primary sortas="a-Aboot">Aboot</primary>
-    <secondary>configuring</secondary>
-  </indexterm>
-
-  <para os="a">Create a <filename>aboot.conf</filename> file defining aboot's boot
-  menu:</para>
-
-<screen><userinput>cat &gt; /etc/aboot.conf &lt;&lt; "EOF"
-<literal># Begin /etc/aboot.conf
-0:1/boot/clfskernel-&linux-version; root=/dev/sda1
-# End /etc/aboot.conf</literal>
-EOF</userinput></screen>
-
-  <para os="b">Now to make aboot bootable:</para>
-
-<screen><userinput>swriteboot -f3 /dev/sda /boot/bootlx
-abootconf /dev/sda 1</userinput></screen>
-
-</sect1>
Index: OK/bootable/alpha/fstab.xml
===================================================================
--- BOOK/bootable/alpha/fstab.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,44 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-fstab">
-  <?dbhtml filename="fstab.html"?>
-
-  <title>Creating the /etc/fstab File</title>
-
-  <indexterm zone="ch-bootable-fstab">
-    <primary sortas="e-/etc/fstab">/etc/fstab</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/fstab.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>cat &gt; /etc/fstab &lt;&lt; "EOF"
-<literal># Begin /etc/fstab
-
-# file system  mount-point  type   options          dump  fsck
-#                                                         order
-
-/dev/<replaceable>[xxx]</replaceable>     /            <replaceable>[fff]</replaceable>  defaults         1     1
-/dev/<replaceable>[yyy]</replaceable>     swap         swap   pri=1            0     0
-proc           /proc        proc   defaults         0     0
-sysfs          /sys         sysfs  defaults         0     0
-devpts         /dev/pts     devpts gid=10,mode=620  0     0
-shm            /dev/shm     tmpfs  defaults         0     0
-# End /etc/fstab</literal>
-EOF</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/fstab.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/fstab.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-</sect1>
Index: OK/bootable/alpha/kernel.xml
===================================================================
--- BOOK/bootable/alpha/kernel.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,150 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version;</title>
-
-  <indexterm zone="ch-bootable-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <para os="a1">The following patch moves the PAGE_SIZE definiton in the
-    headers so it is available for userspace.</para>
-
-<screen os="a2"><userinput>patch -Np1 -i ../&linux-alpha_PAGE_SIZE-patch;</userinput></screen>
-
-    <para os="a3">The following sed prevents GCC from treating warnings as
-    errors when the kernel is compiled.</para>
-
-<screen os="a4"><userinput>sed -i "s/-Werror//" arch/alpha/kernel/Makefile</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>cp vmlinux /boot/clfskernel-&linux-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='y'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='y1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(id('contents-kernel'))"/>
-
-</sect1>
Index: OK/bootable/common/fstab.xml
===================================================================
--- BOOK/bootable/common/fstab.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-fstab">
-  <?dbhtml filename="fstab.html"?>
-
-  <title>Creating the /etc/fstab File</title>
-
-  <indexterm zone="ch-bootable-fstab">
-    <primary sortas="e-/etc/fstab">/etc/fstab</primary>
-  </indexterm>
-
-  <para os="a">The <filename>/etc/fstab</filename> file is used by some
-  programs to determine where file systems are to be mounted by default,
-  in which order, and which must be checked (for integrity errors) prior
-  to mounting. Create a new file systems table like this:</para>
-
-<screen><userinput>cat &gt; /etc/fstab &lt;&lt; "EOF"
-<literal># Begin /etc/fstab
-
-# file system  mount-point  type   options          dump  fsck
-#                                                         order
-
-/dev/<replaceable>[xxx]</replaceable>     /            <replaceable>[fff]</replaceable>  defaults         1     1
-/dev/<replaceable>[yyy]</replaceable>     swap         swap   pri=1            0     0
-proc           /proc        proc   defaults         0     0
-sysfs          /sys         sysfs  defaults         0     0
-devpts         /dev/pts     devpts gid=4,mode=620   0     0
-shm            /dev/shm     tmpfs  defaults         0     0
-# End /etc/fstab</literal>
-EOF</userinput></screen>
-
-  <para os="b">Replace <replaceable>[xxx]</replaceable>,
-  <replaceable>[yyy]</replaceable>, and <replaceable>[fff]</replaceable>
-  with the values appropriate for the system, for example, <filename
-  class="partition">hda2</filename>, <filename
-  class="partition">hda5</filename>, and <systemitem
-  class="filesystem">ext2</systemitem>. For details on the six
-  fields in this file, see <command>man 5 fstab</command>.</para>
-
-  <para os="c">The <filename class="directory">/dev/shm</filename> mount point
-  for <systemitem class="filesystem">tmpfs</systemitem> is included to
-  allow enabling POSIX-shared memory. The kernel must have the required
-  support built into it for this to work (more about this is in the next
-  section). Please note that very little software currently uses
-  POSIX-shared memory.  Therefore, consider the <filename
-  class="directory">/dev/shm</filename> mount point optional. For more
-  information, see <filename>Documentation/filesystems/tmpfs.txt</filename>
-  in the kernel source tree.</para>
-
-</sect1>
Index: OK/bootable/common/introduction.xml
===================================================================
--- BOOK/bootable/common/introduction.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-introduction">
-  <?dbhtml filename="introduction.html"?>
-
-  <title>Introduction</title>
-
-  <para>It is time to make the CLFS system bootable. This chapter
-  discusses creating an <filename>fstab</filename> file, building a
-  kernel for the new CLFS system, and installing the boot loader so
-  that the CLFS system can be selected for booting at startup.</para>
-
-</sect1>
-
Index: OK/bootable/mips-chapter.xml
===================================================================
--- BOOK/bootable/mips-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
-  <?dbhtml dir="bootable"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/arcload.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/colo.xml"/>
-
-</chapter>
Index: OK/bootable/mips/arcload.xml
===================================================================
--- BOOK/bootable/mips/arcload.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,51 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-arcload">
-  <?dbhtml filename="arcload.html"?>
-
-  <title>Making the CLFS System Bootable via Arcload</title>
-
-  <indexterm zone="ch-bootable-arcload">
-    <primary sortas="a-Arcload">Arcload</primary>
-    <secondary>configuring</secondary>
-  </indexterm>
-
-  <note os="a">
-    <para>This bootloader is for the MIPS based SGI Workstations and
-    Servers.</para>
-  </note>
-
-  <para os="b">Earlier, we compiled and installed the Arcload  boot loader
-  software in preparation for this step. Now we will configure our system
-  to boot using Arcload. Here is a simple <filename>arc.cf</filename>
-  to use.</para>
-
-<screen><userinput>cat &gt; /boot/arc.cf &lt;&lt; "EOF"
-<literal>append  "root=/dev/sda3";
-append  "console=ttyS0,9600";
-
-CLFS {
-  &linux-version; {
-    description  "&linux-version;";
-    image system "/&linux-version;";
-  }
-
-  debug {
-    description  "Debug Shell";
-    append "init=/bin/bash";
-  }
-}</literal>
-EOF</userinput></screen>
-
-  <para os="c">Now we use dvhtool to make the system bootable:</para>
-
-<screen os="d"><userinput>dvhtool --unix-to-vh /usr/lib/arcload/sash sash
-dvhtool --unix-to-vh /boot/arc.cf arc.cf
-dvhtool --unix-to-vh /boot/&linux-version; &linux-version;</userinput></screen>
-
-</sect1>
Index: OK/bootable/mips/colo.xml
===================================================================
--- BOOK/bootable/mips/colo.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,58 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-colo">
-  <?dbhtml filename="colo.html"?>
-
-  <title>Making the CLFS System Bootable via Colo</title>
-
-  <indexterm zone="ch-bootable-colo">
-    <primary sortas="a-Colo">Colo</primary>
-    <secondary>configuring</secondary>
-  </indexterm>
-
-  <note os="a">
-    <para>This bootloader is for the MIPS based cobalt servers RaQ,
-    RaQ2, Qube, or the Qube2.</para>
-  </note>
-
-  <para os="c">Your shiny new CLFS system is almost complete. One of the last
-  things to do is ensure you can boot it. The instructions below apply
-  only to Cobalt RaQ1/RaQ2/Cube2 servers. Information on <quote>boot
-  loading</quote> for other architectures should be available in the
-  usual resource-specific locations for those architectures.</para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <para os="d">Earlier, we compiled and installed the Cobalt boot loader
-  software in preparation for this step. Now we will configure our system
-  to boot using Colo. Here is a simple <filename>default.colo</filename>
-  to use.</para>
-
-<screen><userinput>cat &gt; /boot/default.colo &lt;&lt; "EOF"
-<literal>#:CoLo:#
-#
-# load linux
-#
-lcd 'Booting &linux-version;...'
-load vmlinux-&linux-version;.gz
-execute root=/dev/hda2 console=ttyS0,115200 ide1=noprobe</literal>
-EOF</userinput></screen>
-
-  <para os="e">Included in <filename class="directory">/usr/lib/colo/examples</filename>
-  are more examples of a <filename>default.colo</filename> file.</para>
-
-  <para os="v">The FHS stipulates that the bootloader's configuration file should
-  be symlinked to <filename class="symlink">/etc/{Bootloader Name}</filename>.
-  To satisfy this requirement for Colo, issue the following command:</para>
-
-<screen os="f"><userinput>mkdir -v /etc/colo &amp;&amp;
-ln -sv /boot/colo/default.colo /etc/colo</userinput></screen>
-
-</sect1>
Index: OK/bootable/mips/kernel.xml
===================================================================
--- BOOK/bootable/mips/kernel.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,137 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version;</title>
-
-  <indexterm zone="ch-bootable-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>cp vmlinux /boot/vmlinux-&linux-version;
-gzip -9 /boot/vmlinux-&linux-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='y'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='y1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(id('contents-kernel'))"/>
-
-</sect1>
Index: OK/bootable/mips64-64-chapter.xml
===================================================================
--- BOOK/bootable/mips64-64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
-  <?dbhtml dir="bootable"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/arcload.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/colo.xml"/>
-
-</chapter>
Index: OK/bootable/mips64-chapter.xml
===================================================================
--- BOOK/bootable/mips64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
-  <?dbhtml dir="bootable"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/arcload.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/colo.xml"/>
-
-</chapter>
Index: OK/bootable/mips64/arcload.xml
===================================================================
--- BOOK/bootable/mips64/arcload.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,51 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-arcload">
-  <?dbhtml filename="arcload.html"?>
-
-  <title>Making the CLFS System Bootable via Arcload</title>
-
-  <indexterm zone="ch-bootable-arcload">
-    <primary sortas="a-Arcload">Arcload</primary>
-    <secondary>configuring</secondary>
-  </indexterm>
-
-  <note os="a">
-    <para>This bootloader is for the MIPS based SGI Workstations and
-    Servers.</para>
-  </note>
-
-  <para os="b">Earlier, we compiled and installed the Arcload  boot loader
-  software in preparation for this step. Now we will configure our system
-  to boot using Arcload. Here is a simple <filename>arc.cf</filename>
-  to use.</para>
-
-<screen><userinput>cat &gt; /boot/arc.cf &lt;&lt; "EOF"
-<literal>append  "root=/dev/sda3";
-append  "console=ttyS0,9600";
-
-CLFS {
-  &linux-version; {
-    description  "&linux-version;";
-    image system "/&linux-version;";
-  }
-
-  debug {
-    description  "Debug Shell";
-    append "init=/bin/bash";
-  }
-}</literal>
-EOF</userinput></screen>
-
-  <para os="c">Now we use dvhtool to make the system bootable:</para>
-
-<screen os="d"><userinput>dvhtool --unix-to-vh /usr/lib/arcload/sash64 sash64
-dvhtool --unix-to-vh /boot/arc.cf arc.cf
-dvhtool --unix-to-vh /boot/&linux-version; &linux-version;</userinput></screen>
-
-</sect1>
Index: OK/bootable/mips64/kernel.xml
===================================================================
--- BOOK/bootable/mips64/kernel.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,137 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version;</title>
-
-  <indexterm zone="ch-bootable-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>cp vmlinux /boot/vmlinux-&linux-version;
-gzip -9 /boot/vmlinux-&linux-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='y'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='y1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(id('contents-kernel'))"/>
-
-</sect1>
Index: OK/bootable/ppc-chapter.xml
===================================================================
--- BOOK/bootable/ppc-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
-  <?dbhtml dir="bootable"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/yaboot.xml"/>
-
-</chapter>
Index: OK/bootable/ppc/kernel.xml
===================================================================
--- BOOK/bootable/ppc/kernel.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,147 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version;</title>
-
-  <indexterm zone="ch-bootable-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <warning>
-    <para>If you are using a config from when the ARCH was ppc (instead of
-    powerpc), you will have to run <command>make menuconfig</command> after
-    <command>make oldconfig</command> and manually select many of the
-    mac-specific options for ide and input.</para>
-    </warning>
-   
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>cp vmlinux /boot/clfskernel-&linux-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='y'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='y1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(id('contents-kernel'))"/>
-
-</sect1>
Index: OK/bootable/ppc/yaboot.xml
===================================================================
--- BOOK/bootable/ppc/yaboot.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,147 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-yaboot" arch="ppc">
-  <?dbhtml filename="yaboot.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <indexterm zone="ch-bootable-yaboot">
-    <primary sortas="a-Yaboot">Yaboot</primary>
-  <secondary>configuring</secondary></indexterm>
-
-  <para os="a">Your shiny new CLFS system is almost complete. One of the last
-  things to do is to ensure that the system can be properly booted. The
-  instructions below apply only to NewWorld Macintoshes.</para>
-
-  <para os="b">Boot loading can be a complex area, so a few cautionary words
-  are in order. Be familiar with the current boot loader and any other
-  operating systems present on the hard drive(s) that need to be bootable.
-  Make sure that an emergency CD is ready to <quote>rescue</quote> the
-  computer if it becomes un-bootable.  It is also a good idea to enable booting
-  from Open Firmware in case things go really wrong.</para>
-
-  <para os="c">Earlier, we compiled and installed the yaboot boot loader software
-  in preparation for this step. The procedure involves writing the bootloader
-  to a bootstrap partition and blessing it so that Open Firmware will boot from
-  it.  This is all handled by <command>ybin</command> the yaboot installer.</para>
-
-  <para os="d">Ybin writes an optional 'OS selector' menu into Open Firmware,
-  then writes yaboot and yaboot.conf to the bootstrap partition, blesses this,
-  and updates the boot device recorded in nvram. When booted, the OF provides
-  the initial menu to choose between linux, boot from CD, and e.g. OSX
-  (depending on what was in yaboot.conf). If you boot to 'linux', yaboot is
-  executed and lets you select which kernel to use.</para>
-
-  <para os="e">Images (kernels) are specified, together with any necessary path,
-  in yaboot.conf - the details are incorporated into the bootloader, but no attempt
-  is made to access or validate the paths until they are selected.  There are many
-  possible options that can be specified in yaboot.conf, see the man page for the
-  details.  Most people will be able to specify device=hd: (for a single hard disk),
-  but if you have multiple disks, or if you wish to be pedantic, you can specify the
-  full OF path to the device, obtained by running <command>ofpath /dev/hdX</command>
-  .</para>
-
-  <para os="h">Using the above information, determine the appropriate designators
-  for the bootstrap partition and the root partition.  For the following example,
-  it is assumed that the bootstrap partition is <filename class="partition">hda2
-  </filename> and the root partition is <filename class="partition">hda7</filename>
-  .  We will also assume that you wish to be able to boot an OSX installation on
-  <filename class="partition">hda4</filename>.  Change these items as necessary
-  for your machine.</para>
-
-  <para os="i">If your machine has a SATA disk, specify the partitions using
-  <filename class="devicefile">/dev/sda7</filename> and so forth in the usual
-  way.  At least some of the distros specify a full OF path to the 'device' and
-  to the image(s), such as
-  <parameter>device=/ht@0,f2000000/pci@3/k2-sata-root@c/k2-sata@0/disk@0:</parameter>
-  for the disk, and
-  <parameter>image=/ht@0,f2000000/pci@3/k2-sata-root@c/k2-sata@0/disk@0:9,/boot/clfskernel-&linux-version;</parameter>
-  which definitely works.</para>
-
-  <para os="k">Create a <quote>yaboot.conf</quote> file defining yaboot's boot
-  menu:</para>
-
-<screen os="l" role="nodump"><?dbfo keep-together="auto"?><userinput>cat &gt; /etc/yaboot.conf &lt;&lt; "EOF"
-<literal># Begin /etc/yaboot.conf
-
-# By default, yaboot will boot the first menu entry.
-
-# Allow 10 seconds before booting the default.
-# this will also apply to the first-stage os selector
-timeout=100
-
-# These variables are global
-# first, where to put the bootstrap partition
-boot=/dev/hda2
-
-# Which disk to use
-device=hd:
-
-# Default partition for the kernel images
-partition=7
-
-# default root partition
-root=/dev/hda7
-
-# where ybin is to find yaboot and ofboot
-install=/usr/lib/yaboot/yaboot
-magicboot=/usr/lib/yaboot/ofboot
-
-# allow the initial menu to offer CD as an option
-enablecdboot
-
-# allow the initial menu to offer booting from Open Firmware
-enableofboot
-
-# allow the initial menu to boot from mac osx
-macosx=/dev/hda4
-
-# white on black is boring!
-# note  the spellings : 'fgcolor' but 'light'
-# in this context, light means 'without high intensity'
-fgcolor=light-green
-
-# The first entry is for CLFS.
-# For all images, the pathname is relative to the filesystem
-# on which they are situated and can include at most one
-# directory
-image=/boot/clfskernel-&linux-version;
-    label=&version;
-    read-only</literal>
-EOF</userinput></screen>
-
-
-  <para os="n">Add an entry for the host distribution, if you have one. It might
-  look something like this if the kernel and initrd are in the host's '/'
-  directory on <filename class="partition">hda6</filename>:</para>
-
-<screen os="o" role="nodump"><userinput>cat &gt;&gt; /etc/yaboot.conf &lt;&lt; "EOF"
-<literal>title Debian
-image=/pci@f4000000/ata-6d/disk@0:6,/vmlinux
-    label=Debian
-    initrd=/pci@f4000000/ata-6d/disk@0:6,/initrd.gz
-    initrd-size=10000
-    append="root=/dev/hda7"
-    read-only</literal>
-EOF</userinput></screen>
-
-  <warning os="r">
-    <para>The following command will update the bootstrap partition and the
-    boot variable in Open Firmware. Do not run the command if this is not
-    desired.</para>
-  </warning>
-
-<screen os="s" role="nodump"><userinput>ybin</userinput></screen>
-
-  <para os="t">Alternatively, if the bootstrap partition has not already been
-  initialized, perhaps because you are using a Live CD, you will need to use
-  a different command to install the bootloader for the first time:</para>
-
-<screen os="u" role="nodump"><userinput>mkofboot</userinput></screen>
-
-</sect1>
Index: OK/bootable/ppc64-chapter.xml
===================================================================
--- BOOK/bootable/ppc64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
-  <?dbhtml dir="bootable"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/yaboot.xml"/>
-
-</chapter>
Index: OK/bootable/ppc64/kernel.xml
===================================================================
--- BOOK/bootable/ppc64/kernel.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,140 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version;</title>
-
-  <indexterm zone="ch-bootable-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>cp vmlinux /boot/clfskernel-&linux-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='y'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='y1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(id('contents-kernel'))"/>
-
-</sect1>
Index: OK/bootable/ppc64/yaboot.xml
===================================================================
--- BOOK/bootable/ppc64/yaboot.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,80 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-yaboot" arch="ppc">
-  <?dbhtml filename="yaboot.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <indexterm zone="ch-bootable-yaboot">
-    <primary sortas="a-Yaboot">Yaboot</primary>
-  <secondary>configuring</secondary></indexterm>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-  <para os="s1">You may see an error message referencing ioctl32 with 'Unknown
-  cmd' and '/dev/nvram'.  This does not appear to cause any problems.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-</sect1>
Index: OK/bootable/sparc-chapter.xml
===================================================================
--- BOOK/bootable/sparc-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
-  <?dbhtml dir="bootable"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/silo.xml"/>
-
-</chapter>
Index: OK/bootable/sparc/fstab.xml
===================================================================
--- BOOK/bootable/sparc/fstab.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-fstab">
-  <?dbhtml filename="fstab.html"?>
-
-  <title>Creating the /etc/fstab File</title>
-
-  <indexterm zone="ch-bootable-fstab">
-    <primary sortas="e-/etc/fstab">/etc/fstab</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/fstab.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>cat &gt; /etc/fstab &lt;&lt; "EOF"
-<literal># Begin /etc/fstab
-
-# file system  mount-point     type        options          dump  fsck
-#                                                                 order
-
-/dev/<replaceable>[xxx]</replaceable>     /               <replaceable>[fff]</replaceable>       defaults         1     1
-/dev/<replaceable>[yyy]</replaceable>     swap            swap        pri=1            0     0
-proc           /proc           proc        defaults         0     0
-sysfs          /sys            sysfs       defaults         0     0
-devpts         /dev/pts        devpts      gid=10,mode=620  0     0
-shm            /dev/shm        tmpfs       defaults         0     0
-none           /proc/openprom  openpromfs  defaults         0     0
-# End /etc/fstab</literal>
-EOF</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/fstab.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/fstab.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-</sect1>
Index: OK/bootable/sparc/kernel.xml
===================================================================
--- BOOK/bootable/sparc/kernel.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,140 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version;</title>
-
-  <indexterm zone="ch-bootable-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>cp vmlinux /boot/clfskernel-&linux-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='y'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='y1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(id('contents-kernel'))"/>
-
-</sect1>
Index: OK/bootable/sparc/silo.xml
===================================================================
--- BOOK/bootable/sparc/silo.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-silo">
-  <?dbhtml filename="silo.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <indexterm zone="ch-bootable-silo">
-    <primary sortas="a-silo">Silo</primary>
-    <secondary>configuring</secondary>
-  </indexterm>
-
-  <para>Create a <filename>silo.conf</filename> file defining silo's boot
-  menu:</para>
-
-<screen><userinput>cat &gt; /etc/silo.conf &lt;&lt; "EOF"
-<literal># Begin /etc/silo.conf
-partition = 1         # Boot partition (= root partition)
-root = /dev/sda1      # Root partition
-timeout = 150         # Wait 15 seconds before booting the default section
-
-image = /boot/clfskernel-&linux-version;
-  label = linux
-# End /etc/silo.conf</literal>
-EOF</userinput></screen>
-
-  <para>Now to make Silo bootable:</para>
-
-<screen><userinput>silo -f</userinput></screen>
-
-</sect1>
Index: OK/bootable/sparc64-64-chapter.xml
===================================================================
--- BOOK/bootable/sparc64-64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
-  <?dbhtml dir="bootable"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/silo.xml"/>
-
-</chapter>
Index: OK/bootable/sparc64-64/kernel.xml
===================================================================
--- BOOK/bootable/sparc64-64/kernel.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version;</title>
-
-  <indexterm zone="ch-bootable-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc64/kernel.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc64/kernel.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>cp vmlinux /boot/clfskernel-&linux-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='y'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='y1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(id('contents-kernel'))"/>
-
-</sect1>
Index: OK/bootable/sparc64-chapter.xml
===================================================================
--- BOOK/bootable/sparc64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
-  <?dbhtml dir="bootable"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/silo.xml"/>
-
-</chapter>
Index: OK/bootable/sparc64/kernel.xml
===================================================================
--- BOOK/bootable/sparc64/kernel.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,146 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version;</title>
-
-  <indexterm zone="ch-bootable-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <para os="s1">The following patch includes spitfire.h outside of kernel
-    space in elf.h. It also adds spitfire.h to the list of headers installed
-    on the system.</para>
-
-<screen os="s2"><userinput>patch -Np1 -i ../&linux-elf_spitfire_fix-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>cp vmlinux /boot/clfskernel-&linux-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='y'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='y1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(id('contents-kernel'))"/>
-
-</sect1>
Index: OK/bootable/x86-chapter.xml
===================================================================
--- BOOK/bootable/x86-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
-  <?dbhtml dir="bootable"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub.xml"/>
-
-</chapter>
Index: OK/bootable/x86/grub.xml
===================================================================
--- BOOK/bootable/x86/grub.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,140 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-grub">
-  <?dbhtml filename="grub.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <indexterm zone="ch-bootable-grub">
-    <primary sortas="a-GRUB">GRUB</primary>
-    <secondary>configuring</secondary>
-  </indexterm>
-
-  <para os="a">Your shiny new CLFS system is almost complete. One of the last
-  things to do is to ensure that the system can be properly booted. The
-  instructions below apply only to computers of IA-32 architecture,
-  meaning mainstream PCs. Information on <quote>boot loading</quote> for
-  other architectures should be available in the usual resource-specific
-  locations for those architectures.</para>
-
-  <para os="b">Boot loading can be a complex area, so a few cautionary words
-  are in order. Be familiar with the current boot loader and any other
-  operating systems present on the hard drive(s) that need to be bootable.
-  Make sure that an emergency boot disk is ready to <quote>rescue</quote>
-  the computer if the computer becomes unusable (un-bootable).</para>
-
-  <para os="c">Earlier, we compiled and installed the GRUB boot loader software
-  in preparation for this step. The procedure involves writing some special
-  GRUB files to specific locations on the hard drive. We highly recommend
-  creating a GRUB boot floppy diskette as a backup. Insert a blank floppy
-  diskette and run the following commands:</para>
-
-<screen os="d"><userinput>dd if=/boot/grub/stage1 of=/dev/fd0 bs=512 count=1
-dd if=/boot/grub/stage2 of=/dev/fd0 bs=512 seek=1</userinput></screen>
-
-  <para os="e">Remove the diskette and store it somewhere safe. Now, run the
-  <command>grub</command> shell:</para>
-
-<screen os="f"><userinput>grub</userinput></screen>
-
-  <para os="g">GRUB uses its own naming structure for drives and partitions in
-  the form of <emphasis>(hdn,m)</emphasis>, where <emphasis>n</emphasis>
-  is the hard drive number and <emphasis>m</emphasis> is the partition
-  number, both starting from zero. For example, partition <filename
-  class="partition">hda1</filename> is <emphasis>(hd0,0)</emphasis> to
-  GRUB and <filename class="partition">hdb3</filename> is
-  <emphasis>(hd1,2)</emphasis>. In contrast to Linux, GRUB does not
-  consider CD-ROM drives to be hard drives. For example, if using a CD
-  on <filename class="partition">hdb</filename> and a second hard drive
-  on <filename class="partition">hdc</filename>, that second hard drive
-  would still be <emphasis>(hd1)</emphasis>.</para>
-
-  <para os="h">Using the above information, determine the appropriate designator
-  for the root partition (or boot partition, if a separate one is used).
-  For the following example, it is assumed that the root (or separate boot)
-  partition is <filename class="partition">hda4</filename>.</para>
-
-  <para os="i">Tell GRUB where to search for its <filename>stage{1,2}</filename>
-  files. The Tab key can be used everywhere to make GRUB show the
-  alternatives:</para>
-
-<screen os="j"><userinput>root (hd0,3)</userinput></screen>
-
-  <warning os="k">
-    <para>The following command will overwrite the current boot loader.
-    Do not run the command if this is not desired, for example, if using
-    a third party boot manager to manage the Master Boot Record (MBR).
-    In this scenario, it would make more sense to install GRUB into the
-    <quote>boot sector</quote> of the CLFS partition. In this case, this
-    next command would become <userinput>setup (hd0,3)</userinput>.</para>
-  </warning>
-
-  <para os="l">Tell GRUB to install itself into the MBR of
-  <filename class="partition">hda</filename>:</para>
-
-<screen os="m"><userinput>setup (hd0)</userinput></screen>
-
-  <para os="n">If all went well, GRUB will have reported finding its files in
-  <filename class="directory">/boot/grub</filename>. That's all there is
-  to it. Quit the <command>grub</command> shell:</para>
-
-<screen os="o"><userinput>quit</userinput></screen>
-
-  <para os="p">Create a <quote>menu list</quote> file defining GRUB's boot
-  menu:</para>
-
-<screen><userinput>cat &gt; /boot/grub/menu.lst &lt;&lt; "EOF"
-<literal># Begin /boot/grub/menu.lst
-
-# By default boot the first menu entry.
-default 0
-
-# Allow 30 seconds before booting the default.
-timeout 30
-
-# Use prettier colors.
-color green/black light-green/black
-
-# The first entry is for CLFS.
-title CLFS &version;
-root (hd0,3)
-kernel /boot/clfskernel-&linux-version; root=/dev/hda4</literal>
-EOF</userinput></screen>
-
-
-  <para os="q">Add an entry for the host distribution if desired. It might look
-  like this:</para>
-
-<screen os="r"><userinput>cat &gt;&gt; /boot/grub/menu.lst &lt;&lt; "EOF"
-<literal>title Red Hat
-root (hd0,2)
-kernel /boot/kernel-2.6.5 root=/dev/hda3
-initrd /boot/initrd-2.6.5</literal>
-EOF</userinput></screen>
-
-  <para os="s">If dual-booting Windows, the following entry will allow
-  booting it:</para>
-
-<screen os="t"><userinput>cat &gt;&gt; /boot/grub/menu.lst &lt;&lt; "EOF"
-<literal>title Windows
-rootnoverify (hd0,0)
-chainloader +1</literal>
-EOF</userinput></screen>
-
-  <para os="u">If <command>info grub</command> does not provide all necessary
-  material, additional information regarding GRUB is located on its
-  website at: <ulink url="http://www.gnu.org/software/grub/"/>.</para>
-
-  <para os="v">The FHS stipulates that the bootloader's configuration file should
-  be symlinked to <filename class="symlink">/etc/{Bootloader Name}</filename>.
-  To satisfy this requirement for GRUB, issue the following command:</para>
-
-<screen os="w"><userinput>mkdir -v /etc/grub &amp;&amp;
-ln -sv /boot/grub/menu.lst /etc/grub</userinput></screen>
-
-</sect1>
Index: OK/bootable/x86/kernel.xml
===================================================================
--- BOOK/bootable/x86/kernel.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,214 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version;</title>
-
-  <indexterm zone="ch-bootable-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-  </indexterm>
-
-  <sect2 role="package"><title/>
-    <para>The Linux package contains the Linux kernel.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <para os="p1">A number of vulnerabilities have come to light after the
-    stable kernel team stopped supporting 2.6.24.  The following patch addresses
-    them:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&linux-security-patch;</userinput></screen>
-
-    <para os="a">Building the kernel involves a few steps&mdash;configuration,
-    compilation, and installation. Read the <filename>README</filename>
-    file in the kernel source tree for alternative methods to the way this
-    book configures the kernel.</para>
-
-    <para os="b">Prepare for compilation by running the following command:</para>
-
-<screen os="c"><userinput>make mrproper</userinput></screen>
-
-    <para os="d">This ensures that the kernel tree is absolutely clean. The
-    kernel team recommends that this command be issued prior to each
-    kernel compilation. Do not rely on the source tree being clean after
-    un-tarring.</para>
-
-    <para os="h">Configure the kernel via a menu-driven interface.
-    Please note that the udev bootscript requires "rtc" and "tmpfs" to be
-    enabled and built into the kernel, not as modules. CBLFS has
-    some information regarding particular kernel configuration requirements of
-    packages outside of CLFS at <ulink
-    url="&cblfs-root;"/>:</para>
-
-<screen os="i"><userinput>make menuconfig</userinput></screen>
-
-    <para os="j">Alternatively, <command>make oldconfig</command> may be more
-    appropriate in some situations. See the <filename>README</filename>
-    file for more information.</para>
-
-    <para os="k">If desired, skip kernel configuration by copying the kernel
-    config file, <filename>.config</filename>, from the host system
-    (assuming it is available) to the root directory of the unpacked kernel
-    sources. However, we do not recommend this option. It is often better
-    to explore all the configuration menus and create the kernel configuration
-    from scratch.</para>
-
-    <para os="m">Compile the kernel image and modules:</para>
-
-<screen os="n"><userinput>make</userinput></screen>
-
-    <para os="o">If using kernel modules, an
-    <filename>/etc/modprobe.conf</filename> file may be needed.
-    Information pertaining to modules and kernel configuration is
-    located in the kernel documentation in the <filename
-    class="directory">Documentation</filename> directory of the kernel
-    sources tree. Also, <filename>modprobe.conf(5)</filename> may
-    be of interest.</para>
-
-    <para os="p">Be very careful when reading other documentation relating to
-    kernel modules because it usually applies to 2.4.x kernels only. As
-    far as we know, kernel configuration issues specific to Hotplug and
-    Udev are not documented. The problem is that Udev will create a device
-    node only if Hotplug or a user-written script inserts the corresponding
-    module into the kernel, and not all modules are detectable by Hotplug.
-    Note that statements like the one below in the
-    <filename>/etc/modprobe.conf</filename> file do not work with Udev:</para>
-
-<screen os="q"><literal>alias char-major-XXX some-module</literal></screen>
-
-    <para os="r">Because of the complications with Udev and modules,
-    we strongly recommend starting with a completely non-modular kernel
-    configuration, especially if this is the first time using Udev.</para>
-
-    <para os="s">Install the modules, if the kernel configuration uses
-    them:</para>
-
-<screen os="t"><userinput>make modules_install</userinput></screen>
-
-    <para os="u">After kernel compilation is complete, additional steps are
-    required to complete the installation. Some files need to be copied to
-    the <filename class="directory">/boot</filename> directory.</para>
-
-    <para os="v">Issue the following command to install the kernel:</para>
-
-<screen><userinput>cp -v arch/i386/boot/bzImage /boot/clfskernel-&linux-version;</userinput></screen>
-
-    <para os="w"><filename>System.map</filename> is a symbol file for the kernel.
-    It maps the function entry points of every function in the kernel API,
-    as well as the addresses of the kernel data structures for the running
-    kernel. Issue the following command to install the map file:</para>
-
-<screen os="w1"><userinput>cp -v System.map /boot/System.map-&linux-version;</userinput></screen>
-
-    <para os="x">The kernel configuration file <filename>.config</filename>
-    produced by the <command>make menuconfig</command> step above contains
-    all the configuration selections for the kernel that was just compiled.
-    It is a good idea to keep this file for future reference:</para>
-
-<screen os="x1"><userinput>cp -v .config /boot/config-&linux-version;</userinput></screen>
-
-    <para os="y">It is important to note that the files in the kernel source
-    directory are not owned by <systemitem class="username">root</systemitem>.
-    Whenever a package is unpacked as user <systemitem
-    class="username">root</systemitem> (like we do inside the final-system
-    build environment), the files have the user and group IDs of whatever
-    they were on the packager's computer. This is usually not a problem
-    for any other package to be installed because the source tree is
-    removed after the installation. However, the Linux source tree is
-    often retained for a long time. Because of this, there is a chance
-    that whatever user ID the packager used will be assigned to somebody
-    on the machine. That person would then have write access to the kernel
-    source.</para>
-
-    <para os="y1">If the kernel source tree is going to retained, run
-    <command>chown -R 0:0</command> on the <filename
-    class="directory">linux-&linux-version;</filename> directory to
-    ensure all files are owned by user <systemitem
-    class="username">root</systemitem>.</para>
-
-    <warning os="z">
-      <para>Some kernel documentation recommends creating a symlink from
-      <filename class="symlink">/usr/src/linux</filename> pointing to the
-      kernel source directory. This is specific to kernels prior to the
-      2.6 series and <emphasis>must not</emphasis> be created on a CLFS
-      system as it can cause problems for packages you may wish to build
-      once your base CLFS system is complete.</para>
-
-      <para>Also, the headers in the system's <filename
-      class="directory">include</filename> directory should
-      <emphasis>always</emphasis> be the ones against which Glibc was
-      compiled (from the Linux-Headers package) and should
-      <emphasis>never</emphasis> be replaced by the kernel headers.</para>
-    </warning>
-
-  </sect2>
-
-  <sect2 id="contents-kernel" role="content">
-    <title>Contents of Linux</title>
-
-    <segmentedlist>
-      <segtitle>Installed files</segtitle>
-
-      <seglistitem>
-        <seg>config-[linux-version], clfskernel-[linux-version],
-        and System.map-[linux-version]</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="config">
-        <term><filename>config-[linux-version]</filename></term>
-        <listitem>
-          <para>Contains all the configuration selections for the kernel</para>
-          <indexterm zone="ch-bootable-kernel config">
-            <primary sortas="e-/boot/config">/boot/config-[linux-version]</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clfskernel">
-        <term><filename>clfskernel-[linux-version]</filename></term>
-        <listitem>
-          <para>The engine of the Linux system. When turning on the
-          computer, the kernel is the first part of the operating system
-          that gets loaded. It detects and initializes all components of
-          the computer's hardware, then makes these components available
-          as a tree of files to the software and turns a single CPU into
-          a multitasking machine capable of running scores of programs
-          seemingly at the same time.</para>
-          <indexterm zone="ch-bootable-kernel clfskernel">
-            <primary sortas="b-clfskernel">clfskernel-[linux-version]</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="System.map">
-        <term><filename>System.map-[linux-version]</filename></term>
-        <listitem>
-          <para>A list of addresses and symbols; it maps the entry points
-          and addresses of all the functions and data structures in the
-          kernel</para>
-          <indexterm zone="ch-bootable-kernel System.map">
-            <primary sortas="e-/boot/System.map">/boot/System.map-[linux-version]</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/bootable/x86_64-64-chapter.xml
===================================================================
--- BOOK/bootable/x86_64-64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
-  <?dbhtml dir="bootable"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/lilo.xml"/>
-
-</chapter>
Index: OK/bootable/x86_64-64/kernel.xml
===================================================================
--- BOOK/bootable/x86_64-64/kernel.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,140 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version;</title>
-
-  <indexterm zone="ch-bootable-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>cp arch/x86_64/boot/bzImage /boot/clfskernel-&linux-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='y'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='y1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(id('contents-kernel'))"/>
-
-</sect1>
Index: OK/bootable/x86_64-64/lilo.xml
===================================================================
--- BOOK/bootable/x86_64-64/lilo.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,136 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-lilo">
-  <?dbhtml filename="lilo.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <indexterm zone="ch-bootable-lilo">
-    <primary sortas="a-Lilo">Lilo</primary>
-    <secondary>configuring</secondary>
-  </indexterm>
-
-    <para os="a">Your shiny new CLFS system is almost complete. One of the
-      last things to do is to ensure that the system can be properly
-      booted. The instructions below apply only to computers using Lilo,
-      which in the context of this book means x86_64 Pure64 systems.
-      Information on <quote>boot loading</quote> for other architectures
-      should be available in the usual resource-specific locations for
-      those architectures.</para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-    <para os="c">If you have multiple systems on your machine using a
-      different bootloader such as GRUB, you may prefer to use that
-      instead - consult the appropriate documentation.  The rest of
-      this section assumes you are going to use Lilo.</para> 
-
-    <para os="d">Earlier, we compiled and installed the Lilo boot loader
-      software in preparation for this step. The procedure involves
-      writing a boot image to a specific location on the hard drive.
-      We highly recommend using mkrescue to create a Lilo boot CD
-      (using e.g. dvdrecord from dvdrtools) as a backup (this requires
-      loopback block device support in the kernel).</para>
-
-    <para os="e">Normally, you interact with Lilo by using the cursor
-      and <literal>enter</literal> keys to select from the available
-      option(s), but sometimes it is necessary to add other boot
-      options, such as e.g. 'init=/bin/bash' to debug boot failures.
-      The more your keyboard layout differs from the US qwerty layout,
-      the harder it becomes to type boot options unless Lilo knows
-      about your keyboard layout. So, we will create a key table for
-      Lilo (.ktl) file - at one point in the documentation these are
-      referred to as .klt files, which may be a typo, but has been
-      followed by some distros.  The name, and location, are not
-      important but it is conventional to put these in /boot with
-      the name representing the key layout.  For a British keyboard
-      layout, the following command will achieve this:</para> 
-
-<screen os="f" role="nodump"><userinput>keytab-lilo.pl uk >/boot/uk.ktl</userinput></screen>
-
-    <para os="g">The argument to the command is the name of the keymap,
-      or if necessary you can specify the full path to the keymap.  Use
-      whatever is appropriate for your keyboard.</para>
-
-    <para os="h">When the x86 CLFS book used to include Lilo, it
-    advised against running it from chroot in case the MBR became
-    corrupted. Provided you have /proc mounted and have device special
-    files for the disks, it seems to be safe to run recent versions of
-    Lilo in chroot, although it is always possible that an updated
-    bootloader, or defective configuration file, may render the system
-    unbootable.</para>  
-
-    <para os="i">The next step is to create /etc/lilo.conf:</para>
-
-<screen os="j" role="nodump"><userinput>cat &gt; /etc/lilo.conf &lt;&lt; "EOF"
-<literal># Begin /etc/lilo.conf
-# lilo.conf
-#
-# global options
-boot=/dev/&lt;bootdisk&gt;
-keytable=/boot/&lt;keytable&gt;
-lba32
-map=/boot/map
-prompt
-
-# set the name of the default image to boot
-default=clfs
-
-# define an image
-image=/boot/clfskernel
-    label=clfs
-    root=/dev/&lt;partition&gt;
-    read-only
-# optionally add parameters to pass, e.g.
-#   append="video=radeonfb:1024x768-16@70"
-
-# repeat for any other kernel images
-
-# optionally, add legacy operating systems
-# see man lilo.conf for examples 
-EOF</literal></userinput></screen>
-
-
-    <para os="k">Replace &lt;bootdisk&gt; with the name of the disk (or
-      partition) on which the boot sector is to be written, e.g. sda.
-      Replace &lt;keytable&gt; with the name of the keytable file you
-      created, and &lt;partition&gt; with the name of the root partition
-      for the new system.
-    </para>
-
-  <warning os="l">
-    <para>The following command will overwrite the current boot loader.
-    Do not run the command if this is not desired.</para>
-  </warning>
-
-    <para os="m">Run Lilo:</para>
-
-<screen os="n" role="nodump"><userinput>/sbin/lilo -v</userinput></screen>
-
-  <note os='o'>
-    <para>People who have been used to GRUB need to be aware that
-      Lilo works differently - in particular, you cannot edit the
-      available choices as you can in the <command>grub</command> shell,
-      and Lilo records the block addresses of the kernels into the boot
-      blocks each time /sbin/lilo is run. This means that when you
-      compile a new kernel, you have to add it to /etc/lilo.conf and
-      rerun /sbin/lilo.  It also means that if you recompile an existing
-      kernel and save it to the same name you still have to rerun /sbin/lilo
-      in case it now occupies different blocks on the filesystem.</para>
-  </note>
-
-    <para os="p">If you are running multiple systems on this box and
-    using Lilo, it is a good idea to ensure that each system is running
-    the same version of Lilo, otherwise an old version may not be able
-    to overwrite the bootloader from a newer version.  You will also
-    need to ensure that the copies of /etc/lilo.conf on each system are
-    kept synchronised.</para>
-
-</sect1>
Index: OK/bootable/x86_64-chapter.xml
===================================================================
--- BOOK/bootable/x86_64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootable" xreflabel="Making the CLFS System Bootable">
-  <?dbhtml dir="bootable"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Making the CLFS System Bootable</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/fstab.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/kernel.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub.xml"/>
-
-</chapter>
Index: OK/bootable/x86_64/kernel.xml
===================================================================
--- BOOK/bootable/x86_64/kernel.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,140 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-bootable-kernel" role="wrap">
-  <?dbhtml filename="kernel.html"?>
-
-  <title>Linux-&linux-version;</title>
-
-  <indexterm zone="ch-bootable-kernel">
-    <primary sortas="a-Linux">Linux</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of the kernel</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-<screen><userinput>cp arch/x86_64/boot/bzImage /boot/clfskernel-&linux-version;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='w1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='x1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='y'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='y1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/kernel.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/kernel.xml"
-  xpointer="xpointer(id('contents-kernel'))"/>
-
-</sect1>
Index: OK/bootscripts/alpha-chapter.xml
===================================================================
--- BOOK/bootscripts/alpha-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
-  <?dbhtml dir="bootscripts"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Setting Up System Bootscripts</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/setclock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inputrc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/network.xml"/>
-
-</chapter>
Index: OK/bootscripts/common/bootscripts.xml
===================================================================
--- BOOK/bootscripts/common/bootscripts.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,264 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-scripts-bootscripts" role="wrap">
-  <?dbhtml filename="bootscripts.html"?>
-
-  <title>CLFS-Bootscripts-&clfs-bootscripts-version;</title>
-
-  <indexterm zone="ch-scripts-bootscripts">
-    <primary sortas="a-Bootscripts">Bootscripts</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The CLFS-Bootscripts package contains a set of scripts to
-    start/stop the CLFS system at bootup/shutdown.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of CLFS-Bootscripts</title>
-
-    <para os="a">Install the package:</para>
-
-<screen os="b"><userinput>make install-bootscripts</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-bootscripts" role="content">
-    <title>Contents of CLFS-Bootscripts</title>
-
-    <segmentedlist>
-      <segtitle>Installed scripts</segtitle>
-
-      <seglistitem>
-        <seg>checkfs, cleanfs, console, functions, halt, ifdown,
-        ifup, localnet, mountfs, mountkernfs, network, rc, reboot, sendsignals,
-        setclock, static, swap, sysklogd, and template.</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="checkfs-bootscripts">
-        <term><command>checkfs</command></term>
-        <listitem>
-          <para>Checks the integrity of the file systems before they are
-          mounted (with the exception of journal and network based file
-          systems)</para>
-          <indexterm zone="ch-scripts-bootscripts checkfs-bootscripts">
-            <primary sortas="d-checkfs">checkfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cleanfs-bootscripts">
-        <term><command>cleanfs</command></term>
-        <listitem>
-          <para>Removes files that should not be preserved between reboots,
-          such as those in <filename class="directory">/var/run/</filename>
-          and <filename class="directory">/var/lock/</filename>; it re-creates
-          <filename>/var/run/utmp</filename> and removes the possibly present
-          <filename>/etc/nologin</filename>, <filename>/fastboot</filename>,
-          and <filename>/forcefsck</filename> files</para>
-          <indexterm zone="ch-scripts-bootscripts cleanfs-bootscripts">
-            <primary sortas="d-cleanfs">cleanfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="console-bootscripts">
-        <term><command>console</command></term>
-        <listitem>
-          <para>Loads the correct keymap table for the desired keyboard
-          layout; it also sets the screen font</para>
-          <indexterm zone="ch-scripts-bootscripts console-bootscripts">
-            <primary sortas="d-console">console</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="functions-bootscripts">
-        <term><command>functions</command></term>
-        <listitem>
-          <para>Contains common functions, such as error and status checking,
-          that are used by several bootscripts</para>
-          <indexterm zone="ch-scripts-bootscripts functions-bootscripts">
-            <primary sortas="d-functions">functions</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="halt-bootscripts">
-        <term><command>halt</command></term>
-        <listitem>
-          <para>Halts the system</para>
-          <indexterm zone="ch-scripts-bootscripts halt-bootscripts">
-            <primary sortas="d-halt">halt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ifdown-bootscripts">
-        <term><command>ifdown</command></term>
-        <listitem>
-          <para>Assists the network script with stopping network devices</para>
-          <indexterm zone="ch-scripts-bootscripts ifdown-bootscripts">
-            <primary sortas="d-ifdown">ifdown</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ifup-bootscripts">
-        <term><command>ifup</command></term>
-        <listitem>
-          <para>Assists the network script with starting network devices</para>
-          <indexterm zone="ch-scripts-bootscripts ifup-bootscripts">
-            <primary sortas="d-ifup">ifup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="localnet-bootscripts">
-        <term><command>localnet</command></term>
-        <listitem>
-          <para>Sets up the system's hostname and local loopback device</para>
-          <indexterm zone="ch-scripts-bootscripts localnet-bootscripts">
-            <primary sortas="d-localnet">localnet</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mountfs-bootscripts">
-        <term><command>mountfs</command></term>
-        <listitem>
-          <para>Mounts all file systems, except ones that are marked
-          <emphasis>noauto</emphasis> or are network based</para>
-          <indexterm zone="ch-scripts-bootscripts mountfs-bootscripts">
-            <primary sortas="d-mountfs">mountfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mountkernfs-bootscripts">
-        <term><command>mountkernfs</command></term>
-        <listitem>
-          <para>Mounts virtual kernel file systems, such as
-          <systemitem class="filesystem">proc</systemitem></para>
-          <indexterm zone="ch-scripts-bootscripts mountkernfs-bootscripts">
-            <primary sortas="d-mountkernfs">mountkernfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="network-bootscripts">
-        <term><command>network</command></term>
-        <listitem>
-          <para>Sets up network interfaces, such as network cards, and sets up
-          the default gateway (where applicable)</para>
-          <indexterm zone="ch-scripts-bootscripts network-bootscripts">
-            <primary sortas="d-network">network</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rc-bootscripts">
-        <term><command>rc</command></term>
-        <listitem>
-          <para>The master run-level control script; it is responsible for
-          running all the other bootscripts one-by-one, in a sequence
-          determined by the name of the symbolic links being processed</para>
-          <indexterm zone="ch-scripts-bootscripts rc-bootscripts">
-            <primary sortas="d-rc">rc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="reboot-bootscripts">
-        <term><command>reboot</command></term>
-        <listitem>
-          <para>Reboots the system</para>
-          <indexterm zone="ch-scripts-bootscripts reboot-bootscripts">
-            <primary sortas="d-reboot">reboot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sendsignals-bootscripts">
-        <term><command>sendsignals</command></term>
-        <listitem>
-          <para>Makes sure every process is terminated before the system reboots
-          or halts</para>
-          <indexterm zone="ch-scripts-bootscripts sendsignals-bootscripts">
-            <primary sortas="d-sendsignals">sendsignals</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setclock-bootscripts">
-        <term><command>setclock</command></term>
-        <listitem>
-          <para>Resets the kernel clock to local time in case the hardware clock
-          is not set to UTC time</para>
-          <indexterm zone="ch-scripts-bootscripts setclock-bootscripts">
-            <primary sortas="d-setclock">setclock</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="static-bootscripts">
-        <term><command>static</command></term>
-        <listitem>
-          <para>Provides the functionality needed to assign a static Internet
-          Protocol (IP) address to a network interface</para>
-          <indexterm zone="ch-scripts-bootscripts static-bootscripts">
-            <primary sortas="d-static">static</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="swap-bootscripts">
-        <term><command>swap</command></term>
-        <listitem>
-          <para>Enables and disables swap files and partitions</para>
-          <indexterm zone="ch-scripts-bootscripts swap-bootscripts">
-            <primary sortas="d-swap">swap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sysklogd-bootscripts">
-        <term><command>sysklogd</command></term>
-        <listitem>
-          <para>Starts and stops the system and kernel log daemons</para>
-          <indexterm zone="ch-scripts-bootscripts sysklogd-bootscripts">
-            <primary sortas="d-sysklogd">sysklogd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="template-bootscripts">
-        <term><command>template</command></term>
-        <listitem>
-          <para>A template to create custom bootscripts for other
-          daemons</para>
-          <indexterm zone="ch-scripts-bootscripts template-bootscripts">
-            <primary sortas="d-template">template</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/bootscripts/common/console.xml
===================================================================
--- BOOK/bootscripts/common/console.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,93 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-scripts-console">
-  <?dbhtml filename="console.html"?>
-  <title>Configuring the Linux Console</title>
-
-  <indexterm zone="ch-scripts-console">
-    <primary sortas="d-console">console</primary>
-  <secondary>configuring</secondary></indexterm>
-
-  <para>This section discusses how to configure the <command>console</command>
-  bootscript that sets up the keyboard map and the console font. If non-ASCII
-  characters (e.g., the British pound sign and Euro character) will not be
-  used and the keyboard is a U.S. one, skip this section. Without the
-  configuration file, the <command>console</command> bootscript will do
-  nothing.</para>
-
-  <para>The <command>console</command> script reads the
-  <filename>/etc/sysconfig/console</filename> file for configuration
-  information. Decide which keymap and screen font will be used. Various
-  language-specific HOWTO's can also help with this (see <ulink
-  url="http://www.tldp.org/HOWTO/HOWTO-INDEX/other-lang.html"/>. A pre-made
-  <filename>/etc/sysconfig/console</filename> file with known settings for
-  several countries was installed with the CLFS-Bootscripts package, so the
-  relevant section can be uncommented if the country is supported. If still
-  in doubt, look in the <filename class="directory">/lib/kbd</filename>
-  directory for valid keymaps and screen fonts. Read
-  <filename>loadkeys(1)</filename> and <filename>setfont(8)</filename> to
-  determine the correct arguments for these programs. Once decided, create
-  the configuration file with the following command:</para>
-
-<screen><userinput>cat &gt;/etc/sysconfig/console &lt;&lt;"EOF"
-<literal>KEYMAP="<replaceable>[arguments for loadkeys]</replaceable>"
-FONT="<replaceable>[arguments for setfont]</replaceable>"</literal>
-EOF</userinput></screen>
-
-  <para>For example, for Spanish users who also want to use the Euro
-  character (accessible by pressing AltGr+E), the following settings are
-  correct:</para>
-
-<screen><userinput>cat &gt;/etc/sysconfig/console &lt;&lt;"EOF"
-<literal>KEYMAP="es euro2"
-FONT="lat9-16 -u iso01"</literal>
-EOF</userinput></screen>
-
-  <note>
-    <para>The <envar>FONT</envar> line above is correct only for the ISO
-    8859-15 character set. If using ISO 8859-1 and, therefore, a pound sign
-    instead of Euro, the correct <envar>FONT</envar> line would be:</para>
-
-<screen><userinput>FONT="lat1-16"</userinput></screen>
-
-  </note>
-
-    <para>If the <envar>KEYMAP</envar> or <envar>FONT</envar> variable is not
-    set, the <command>console</command> initscript will not run the
-    corresponding program.</para>
-
-    <para>In some keymaps, the Backspace and Delete keys send characters
-    different from ones in the default keymap built into the kernel. This
-    confuses some applications. For example, Emacs displays its help (instead
-    of erasing the character before the cursor) when Backspace is pressed.
-    To check if the keymap in use is affected (this works only for i386
-    keymaps):</para>
-
-<screen><userinput>zgrep '\W14\W' <replaceable>[/path/to/your/keymap]</replaceable></userinput></screen>
-
-  <para>If the keycode 14 is Backspace instead of Delete, create the
-  following keymap snippet to fix this issue:</para>
-
-<screen><userinput>mkdir -pv /etc/kbd &amp;&amp; cat &gt; /etc/kbd/bs-sends-del &lt;&lt;"EOF"
-<literal>                  keycode  14 = Delete Delete Delete Delete
-              alt keycode  14 = Meta_Delete
-        altgr alt keycode  14 = Meta_Delete
-                  keycode 111 = Remove
-    altgr control keycode 111 = Boot
-      control alt keycode 111 = Boot
-altgr control alt keycode 111 = Boot</literal>
-EOF</userinput></screen>
-
-  <para>Tell the <command>console</command> script to load this
-  snippet after the main keymap:</para>
-
-<screen><userinput>cat &gt;&gt;/etc/sysconfig/console &lt;&lt;"EOF"
-<literal>KEYMAP_CORRECTIONS="/etc/kbd/bs-sends-del"</literal>
-EOF</userinput></screen>
-
-</sect1>
Index: OK/bootscripts/common/hostname.xml
===================================================================
--- BOOK/bootscripts/common/hostname.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,31 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-scripts-hostname">
-  <?dbhtml filename="hostname.html"?>
-
-  <title>Configuring the localnet Script</title>
-
-  <indexterm zone="ch-scripts-hostname">
-    <primary sortas="d-localnet">localnet</primary>
-  <secondary>configuring</secondary></indexterm>
-
-  <para>Part of the job of the <command>localnet</command> script is
-  setting the system's hostname. This needs to be configured in the
-  <filename>/etc/sysconfig/network</filename> file.</para>
-
-  <para>Create the <filename>/etc/sysconfig/network</filename> file
-  and enter a hostname by running:</para>
-
-  <screen><userinput>echo "HOSTNAME=<replaceable>[clfs]</replaceable>" &gt; /etc/sysconfig/network</userinput></screen>
-
-  <para><replaceable>[clfs]</replaceable> needs to be replaced with the
-  name given to the computer. Do not enter the Fully Qualified
-  Domain Name (FQDN) here. That information will be put in the
-  <filename>/etc/hosts</filename> file in the next section.</para>
-
-</sect1>
Index: OK/bootscripts/common/hosts.xml
===================================================================
--- BOOK/bootscripts/common/hosts.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,79 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-scripts-hosts">
-  <?dbhtml filename="hosts.html"?>
-
-  <title>Customizing the /etc/hosts File</title>
-
-  <indexterm zone="ch-scripts-hosts">
-    <primary sortas="e-/etc/hosts">/etc/hosts</primary>
-  </indexterm>
-
-  <indexterm zone="ch-scripts-hosts">
-    <primary sortas="d-localnet">localnet</primary>
-  <secondary>/etc/hosts</secondary></indexterm>
-
-  <indexterm zone="ch-scripts-hosts">
-    <primary sortas="d-network">network</primary>
-  <secondary>/etc/hosts</secondary></indexterm>
-
-  <para>If a network card is to be configured, decide on the IP address,
-  FQDN, and possible aliases for use in the
-  <filename>/etc/hosts</filename> file. The syntax is:</para>
-
-  <screen>&lt;IP address&gt; myhost.example.org aliases</screen>
-
-  <para>Unless the computer is to be visible to the Internet (i.e.,
-  there is a registered domain and a valid block of assigned IP
-  addresses&mdash;most users do not have this), make sure that the IP
-  address is in the private network IP address range. Valid ranges
-  are:</para>
-
-<screen><literal>  Class Networks
-  A     10.0.0.0
-  B     172.16.0.0 through 172.31.0.255
-  C     192.168.0.0 through 192.168.255.255</literal></screen>
-
-  <para>A valid IP address could be 192.168.1.1. A valid FQDN for this
-  IP could be <uri>www.linuxfromscratch.org</uri> (not recommended
-  because this is a valid registered domain address and could cause
-  domain name server issues).</para>
-
-  <para>Even if not using a network card, an FQDN is still required.
-  This is necessary for certain programs to operate correctly.</para>
-
-  <para>Create the  <filename>/etc/hosts</filename> file by running:</para>
-
-<screen><userinput>cat &gt; /etc/hosts &lt;&lt; "EOF"
-<literal># Begin /etc/hosts (network card version)
-
-127.0.0.1 localhost
-<replaceable>[192.168.1.1]</replaceable> <replaceable>[&lt;HOSTNAME&gt;.example.org]</replaceable> <replaceable>[HOSTNAME]</replaceable>
-
-# End /etc/hosts (network card version)</literal>
-EOF</userinput></screen>
-
-  <para>The <replaceable>[192.168.1.1]</replaceable> and
-  <replaceable>[&lt;HOSTNAME&gt;.example.org]</replaceable>
-  values need to be changed for specific users or requirements (if
-  assigned an IP address by a network/system administrator and the
-  machine will be connected to an existing network).</para>
-
-
-  <para>If a network card is not going to be configured, create the
-  <filename>/etc/hosts</filename> file by running:</para>
-
-<screen><userinput>cat &gt; /etc/hosts &lt;&lt; "EOF"
-<literal># Begin /etc/hosts (no network card version)
-
-127.0.0.1 <replaceable>[&lt;HOSTNAME&gt;.example.org]</replaceable> <replaceable>[HOSTNAME]</replaceable> localhost
-
-# End /etc/hosts (no network card version)</literal>
-EOF</userinput></screen>
-
-</sect1>
Index: OK/bootscripts/common/inputrc.xml
===================================================================
--- BOOK/bootscripts/common/inputrc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,85 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-   <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-scripts-inputrc">
-  <?dbhtml filename="inputrc.html"?>
-
-  <title>Creating the /etc/inputrc File</title>
-
-  <indexterm zone="ch-scripts-inputrc">
-    <primary sortas="e-/etc/inputrc">/etc/inputrc</primary>
-  </indexterm>
-
-  <para>The <filename>/etc/inputrc</filename> file deals with mapping
-  the keyboard for specific situations. This file is the start-up file
-  used by Readline &mdash; the input-related library &mdash; used by Bash
-  and most other shells.</para>
-
-  <para>Most people do not need user-specific keyboard mappings so
-  the command below creates a global <filename>/etc/inputrc</filename>
-  used by everyone who logs in. If you later decide you need to override
-  the defaults on a per-user basis, you can create a
-  <filename>.inputrc</filename> file in the user's home directory with
-  the modified mappings.</para>
-
-  <para>For more information on how to edit the <filename>inputrc</filename>
-  file, see <command>info bash</command> under the <emphasis>Readline Init
-  File</emphasis> section. <command>info readline</command> is also a good
-  source of information.</para>
-
-  <para>Below is a generic global <filename>inputrc</filename> along
-  with comments to explain what the various options do. Note that
-  comments cannot be on the same line as commands. Create the file
-  using the following command:</para>
-
-<screen><?dbfo keep-together="auto"?><userinput>cat &gt; /etc/inputrc &lt;&lt; "EOF"
-<literal># Begin /etc/inputrc
-# Modified by Chris Lynn &lt;roryo@roryo.dynup.net&gt;
-
-# Allow the command prompt to wrap to the next line
-set horizontal-scroll-mode Off
-
-# Enable 8bit input
-set meta-flag On
-set input-meta On
-
-# Turns off 8th bit stripping
-set convert-meta Off
-
-# Keep the 8th bit for display
-set output-meta On
-
-# none, visible or audible
-set bell-style none
-
-# All of the following map the escape sequence of the
-# value contained inside the 1st argument to the
-# readline specific functions
-
-"\eOd": backward-word
-"\eOc": forward-word
-
-# for linux console
-"\e[1~": beginning-of-line
-"\e[4~": end-of-line
-"\e[5~": beginning-of-history
-"\e[6~": end-of-history
-"\e[3~": delete-char
-"\e[2~": quoted-insert
-
-# for xterm
-"\eOH": beginning-of-line
-"\eOF": end-of-line
-
-# for Konsole
-"\e[H": beginning-of-line
-"\e[F": end-of-line
-
-# End /etc/inputrc</literal>
-EOF</userinput></screen>
-
-</sect1>
Index: OK/bootscripts/common/introduction.xml
===================================================================
--- BOOK/bootscripts/common/introduction.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-scripts-introduction">
-  <?dbhtml filename="introduction.html"?>
-
-  <title>Introduction</title>
-
-  <para>This chapter details how to install and configure the CLFS-Bootscripts
-  package. Most of these scripts will work without modification, but a few
-  require additional configuration files because they deal with
-  hardware-dependent information.</para>
-
-  <para>System-V style init scripts are employed in this book because they
-  are widely used. For additional options, a hint detailing the BSD style
-  init setup is available at <ulink
-  url="&hints-root;bsd-init.txt"/>.
-  Searching the LFS mailing lists for <quote>depinit</quote> will also offer
-  additional choices.</para>
-
-  <para>If using an alternative style of init scripts, skip this chapter and
-  move on to <xref linkend="chapter-bootable"/>.</para>
-
-</sect1>
Index: OK/bootscripts/common/network.xml
===================================================================
--- BOOK/bootscripts/common/network.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,116 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-scripts-network">
-  <?dbhtml filename="network.html"?>
-
-  <title>Configuring the network Script</title>
-
-  <indexterm zone="ch-scripts-network">
-    <primary sortas="d-network">network</primary>
-  <secondary>configuring</secondary></indexterm>
-
-  <para>This section only applies if a network card is to be
-  configured.</para>
-
-  <para>If a network card will not be used, there is likely no need to
-  create any configuration files relating to network cards. If that is
-  the case, remove the <filename class="symlink">network</filename>
-  symlinks from all run-level directories (<filename
-  class="directory">/etc/rc.d/rc*.d</filename>).</para>
-
-  <sect2>
-    <title>Creating Network Interface Configuration Files</title>
-
-    <para>Which interfaces are brought up and down by the network script
-    depends on the files and directories in the <filename
-    class="directory">/etc/sysconfig/network-devices</filename> hierarchy.
-    This directory should contain a sub-directory for each interface to be
-    configured, such as <filename>ifconfig.xyz</filename>, where
-    <quote>xyz</quote> is a network interface name. Inside this directory
-    would be files defining the attributes to this interface, such as its IP
-    address(es), subnet masks, and so forth.</para>
-
-    <para>The following command creates a sample <filename>ipv4</filename>
-    file for the <emphasis>eth0</emphasis> device:</para>
-
-<screen><userinput>cd /etc/sysconfig/network-devices &amp;&amp;
-mkdir -v ifconfig.eth0 &amp;&amp;
-cat &gt; ifconfig.eth0/ipv4 &lt;&lt; "EOF"
-<literal>ONBOOT=yes
-SERVICE=ipv4-static
-IP=192.168.1.1
-GATEWAY=192.168.1.2
-PREFIX=24
-BROADCAST=192.168.1.255</literal>
-EOF</userinput></screen>
-
-    <para>The values of these variables must be changed in every file to match
-    the proper setup. If the <envar>ONBOOT</envar> variable is set to
-    <quote>yes</quote> the network script will bring up the Network Interface
-    Card (NIC) during booting of the system. If set to anything but
-    <quote>yes</quote> the NIC will be ignored by the network script and not
-    be brought up.</para>
-
-    <para>The <envar>SERVICE</envar> variable defines the method used for
-    obtaining the IP address. The CLFS-Bootscripts package has a modular IP
-    assignment format, and creating additional files in the <filename
-    class="directory">/etc/sysconfig/network-devices/services</filename>
-    directory allows other IP assignment methods. This is commonly used for
-    Dynamic Host Configuration Protocol (DHCP), which is addressed in the
-    BLFS book.</para>
-
-    <para>The <envar>GATEWAY</envar> variable should contain the default
-    gateway IP address, if one is present. If not, then comment out the
-    variable entirely.</para>
-
-    <para>The <envar>PREFIX</envar> variable needs to contain the number of
-    bits used in the subnet. Each octet in an IP address is 8 bits. If the
-    subnet's netmask is 255.255.255.0, then it is using the first three octets
-    (24 bits) to specify the network number. If the netmask is 255.255.255.240,
-    it would be using the first 28 bits.  Prefixes longer than 24 bits are
-    commonly used by DSL and cable-based Internet Service Providers (ISPs).
-    In this example (PREFIX=24), the netmask is 255.255.255.0. Adjust the
-    <envar>PREFIX</envar> variable according to your specific subnet.</para>
-
-  </sect2>
-
-  <sect2 id="resolv.conf">
-    <title>Creating the /etc/resolv.conf File</title>
-
-    <indexterm zone="resolv.conf">
-      <primary sortas="e-/etc/resolv.conf">/etc/resolv.conf</primary>
-    </indexterm>
-
-    <para>If the system is going to be connected to the Internet, it will
-    need some means of Domain Name Service (DNS) name resolution to
-    resolve Internet domain names to IP addresses, and vice versa. This is
-    best achieved by placing the IP address of the DNS server, available
-    from the ISP or network administrator, into
-    <filename>/etc/resolv.conf</filename>. Create the file by running the
-    following:</para>
-
-<screen><userinput>cat &gt; /etc/resolv.conf &lt;&lt; "EOF"
-<literal># Begin /etc/resolv.conf
-
-domain <replaceable>[Your Domain Name]</replaceable>
-nameserver <replaceable>[IP address of your primary nameserver]</replaceable>
-nameserver <replaceable>[IP address of your secondary nameserver]</replaceable>
-
-# End /etc/resolv.conf</literal>
-EOF</userinput></screen>
-
-    <para>Replace <replaceable>[IP address of the nameserver]</replaceable>
-    with the IP address of the DNS most appropriate for the setup. There will
-    often be more than one entry (requirements demand secondary servers for
-    fallback capability). If you only need or want one DNS server, remove the
-    second <emphasis>nameserver</emphasis> line from the file. The IP address
-    may also be a router on the local network.</para>
-
-  </sect2>
-
-</sect1>
Index: OK/bootscripts/common/profile.xml
===================================================================
--- BOOK/bootscripts/common/profile.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,166 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-scripts-profile">
-  <title>The Bash Shell Startup Files</title>
-  <?dbhtml filename="profile.html"?>
-
-  <indexterm zone="ch-scripts-profile">
-    <primary sortas="e-/etc/profile">/etc/profile</primary>
-  </indexterm>
-
-  <para>The shell program <command>/bin/bash</command> (hereafter
-  referred to as <quote>the shell</quote>) uses a collection of startup
-  files to help create an environment to run in. Each file has a
-  specific use and may affect login and interactive environments
-  differently. The files in the <filename
-  class="directory">/etc</filename> directory provide global settings.
-  If an equivalent file exists in the home directory, it may override
-  the global settings.</para>
-
-  <para>An interactive login shell is started after a successful login,
-  using <command>/bin/login</command>, by reading the
-  <filename>/etc/passwd</filename> file. An interactive non-login shell
-  is started at the command-line (e.g.,
-  <prompt>[prompt]$</prompt><command>/bin/bash</command>). A
-  non-interactive shell is usually present when a shell script is
-  running. It is non-interactive because it is processing a script and
-  not waiting for user input between commands.</para>
-
-  <para>For more information, see <command>info bash</command> under the
-  <emphasis>Bash Startup Files and Interactive Shells</emphasis> section.</para>
-
-  <para>The files <filename>/etc/profile</filename> and
-  <filename>~/.bash_profile</filename> are read when the shell is
-  invoked as an interactive login shell.</para>
-
-  <para>The base <filename>/etc/profile</filename> below sets some
-  environment variables necessary for native language support. Setting
-  them properly results in:</para>
-
-  <itemizedlist>
-    <listitem>
-      <para>The output of programs translated into the native language</para>
-    </listitem>
-    <listitem>
-      <para>Correct classification of characters into letters, digits and
-      other classes. This is necessary for <command>bash</command> to
-      properly accept non-ASCII characters in command lines in non-English
-      locales</para>
-    </listitem>
-    <listitem>
-      <para>The correct alphabetical sorting order for the country</para>
-    </listitem>
-    <listitem>
-      <para>Appropriate default paper size</para>
-    </listitem>
-    <listitem>
-      <para>Correct formatting of monetary, time, and date values</para>
-    </listitem>
-  </itemizedlist>
-
-  <para>This script also sets the <envar>INPUTRC</envar> environment variable
-  that makes Bash and Readline use the <filename>/etc/inputrc</filename> file
-  created earlier.</para>
-
-  <para>Replace <replaceable>[ll]</replaceable> below with the
-  two-letter code for the desired language (e.g., <quote>en</quote>) and
-  <replaceable>[CC]</replaceable> with the two-letter code for the
-  appropriate country (e.g., <quote>GB</quote>).
-  <replaceable>[charmap]</replaceable> should be replaced with the
-  canonical charmap for your chosen locale.</para>
-
-  <para>The list of all locales supported by Glibc can be obtained by running
-  the following command:</para>
-
-<screen role="nodump"><userinput>locale -a</userinput></screen>
-
-  <para>Locales can have a number of synonyms, e.g. <quote>ISO-8859-1</quote>
-  is also referred to as <quote>iso8859-1</quote> and <quote>iso88591</quote>.
-  Some applications cannot handle the various synonyms correctly, so it is
-  safest to choose the canonical name for a particular locale. To determine
-  the canonical name, run the following command, where <replaceable>[locale
-  name]</replaceable> is the output given by <command>locale -a</command> for
-  your preferred locale (<quote>en_GB.iso88591</quote> in our example).</para>
-
-<screen role="nodump"><userinput>LC_ALL=<replaceable>[locale name]</replaceable> locale charmap</userinput></screen>
-
-  <para>For the <quote>en_GB.iso88591</quote> locale, the above command
-  will print:</para>
-
-<screen><computeroutput>ISO-8859-1</computeroutput></screen>
-
-  <para>This results in a final locale setting of <quote>en_GB.ISO-8859-1</quote>.
-  It is important that the locale found using the heuristic above is tested prior
-  to it being added to the Bash startup files:</para>
-
-<screen role="nodump"><userinput>LC_ALL=[locale name] locale country
-LC_ALL=[locale name] locale language
-LC_ALL=[locale name] locale charmap
-LC_ALL=[locale name] locale int_curr_symbol
-LC_ALL=[locale name] locale int_prefix</userinput></screen>
-
-  <para>The above commands should print the language name, the character
-  encoding used by the locale, the local currency, and the prefix to dial
-  before the telephone number in order to get into the country. If any of the
-  commands above fail with a message similar to the one shown below, this means
-  that your locale was either not installed in Chapter 10 or is not supported by
-  the default installation of Glibc.</para>
-
-<screen><computeroutput>locale: Cannot set LC_* to default locale: No such file or directory</computeroutput></screen>
-
-  <para>If this happens, you should either install the desired locale using
-  the <command>localedef</command> command, or consider choosing a different
-  locale. Further instructions assume that there are no such error messages
-  from Glibc.</para>
-
-  <para>Some packages beyond CLFS may also lack support for your chosen locale.
-  One example is the X library (part of the X Window System), which outputs
-  the following error message:</para>
-
-<screen><computeroutput>Warning: locale not supported by Xlib, locale set to C</computeroutput></screen>
-
-  <para>Sometimes it is possible to fix this by removing the charmap part of
-  the locale specification, as long as that does not change the character map
-  that Glibc associates with the locale (this can be checked by running the
-  <command>locale charmap</command> command in both locales). For example,
-  one would have to change &quot;de_DE.ISO-8859-15@euro&quot; to
-  &quot;de_DE@euro&quot; in order to get this locale recognized by Xlib.</para>
-
-  <para>Other packages can also function incorrectly (but may not necessarily
-  display any error messages) if the locale name does not meet their expectations.
-  In those cases, investigating how other Linux distributions support your locale
-  might provide some useful information.</para>
-
-  <para>Once the proper locale settings have been determined, create the
-  <filename>/etc/profile</filename> file:</para>
-
-<screen><userinput>cat &gt; /etc/profile &lt;&lt; "EOF"
-<literal># Begin /etc/profile
-
-export LANG=<replaceable>[ll]</replaceable>_<replaceable>[CC]</replaceable>.<replaceable>[charmap]</replaceable>
-export INPUTRC=/etc/inputrc
-
-# End /etc/profile</literal>
-EOF</userinput></screen>
-
-  <note>
-    <para>The <quote>C</quote> (default) and <quote>en_US</quote>
-    (the recommended one for United States English users) locales are
-    different.</para>
-  </note>
-
-  <para>Setting the keyboard layout, screen font, and locale-related
-  environment variables are the only internationalization steps needed to
-  support locales that use ordinary single-byte encodings and left-to-right
-  writing direction. More complex cases (including UTF-8 based locales)
-  require additional steps and additional patches because many applications
-  tend to not work properly under such conditions. These steps and patches
-  are not included in the CLFS book and such locales are not yet supported
-  by CLFS.</para>
-
-</sect1>
Index: OK/bootscripts/common/setclock.xml
===================================================================
--- BOOK/bootscripts/common/setclock.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-scripts-setclock">
-  <?dbhtml filename="setclock.html"?>
-
-  <title>Configuring the setclock Script</title>
-
-  <indexterm zone="ch-scripts-setclock">
-    <primary sortas="d-setclock">setclock</primary>
-  <secondary>configuring</secondary></indexterm>
-
-  <para os="a">The <command>setclock</command> script reads the time from the
-  hardware clock, also known as the BIOS or the Complementary Metal Oxide
-  Semiconductor (CMOS) clock. If the hardware clock is set to UTC, this
-  script will convert the hardware clock's time to the local time using
-  the <filename>/etc/localtime</filename> file (which tells the
-  <command>hwclock</command> program which timezone the user is in). There
-  is no way to detect whether or not the hardware clock is set to UTC, so
-  this needs to be configured manually.</para>
-
-  <para os="b">If you cannot remember whether or not the hardware clock is set
-  to UTC, find out by running the <userinput>hwclock --localtime
-  --show</userinput> command. This will display what the current time is
-  according to the hardware clock. If this time matches whatever your
-  watch says, then the hardware clock is set to local time. If the output
-  from <command>hwclock</command> is not local time, chances are it is set
-  to UTC time. Verify this by adding or subtracting the proper amount of
-  hours for the timezone to the time shown by <command>hwclock</command>.
-  For example, if you are currently in the MST timezone, which is also
-  known as GMT -0700, add seven hours to the local time.</para>
-
-  <para os="c">Change the value of the <envar>UTC</envar> variable below
-  to a value of <option>0</option> (zero) if the hardware clock
-  is <emphasis>not</emphasis> set to UTC time.</para>
-
-  <para os="d">Create a new file <filename>/etc/sysconfig/clock</filename> by running
-  the following:</para>
-
-<screen><userinput>cat &gt; /etc/sysconfig/clock &lt;&lt; "EOF"
-<literal># Begin /etc/sysconfig/clock
-
-UTC=1
-
-# End /etc/sysconfig/clock</literal>
-EOF</userinput></screen>
-
-  <para os="e">A good hint explaining how to deal with time on CLFS is available
-  at <ulink url="&hints-root;time.txt"/>. It explains issues such as
-  time zones, UTC, and the <envar>TZ</envar> environment variable.</para>
-
-</sect1>
Index: OK/bootscripts/common/symlinks.xml
===================================================================
--- BOOK/bootscripts/common/symlinks.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,141 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-scripts-symlinks">
-  <?dbhtml filename="symlinks.html"?>
-
-  <title>Creating custom symlinks to devices</title>
-
-  <sect2>
-
-    <title>CD-ROM symlinks</title>
-
-    <para>Some software that you may want to install later (e.g., various
-    media players) expect the /dev/cdrom and /dev/dvd symlinks to exist.
-    Also, it may be convenient to put references to those symlinks into
-    <filename>/etc/fstab</filename>. For each of your CD-ROM devices,
-    find the corresponding directory under
-    <filename class="directory">/sys</filename> (e.g., this can be
-    <filename class="directory">/sys/block/hdd</filename>) and
-    run a command similar to the following:</para>
-
-<screen role="nodump"><userinput>udevadm test /sys/block/hdd</userinput></screen>
-
-    <para>Look at the lines containing the output of various *_id programs.</para>
-
-    <para>There are two approaches to creating symlinks. The first one is to
-    use the model name and the serial number, the second one is based on the
-    location of the device on the bus. If you are going to use the first
-    approach, create a file similar to the following:</para>
-
-<screen role="nodump"><userinput>cat &gt;/etc/udev/rules.d/82-cdrom.rules &lt;&lt; EOF
-<literal>
-# Custom CD-ROM symlinks
-SUBSYSTEM=="block", ENV{ID_MODEL}=="SAMSUNG_CD-ROM_SC-148F", \
-    ENV{ID_REVISION}=="PS05", SYMLINK+="cdrom"
-SUBSYSTEM=="block", ENV{ID_MODEL}=="PHILIPS_CDD5301", \
-    ENV{ID_SERIAL}=="5VO1306DM00190", SYMLINK+="cdrom1 dvd"
-</literal>
-EOF</userinput></screen>
-
-    <note>
-      <para>Although the examples in this book work properly, be aware
-      that Udev does not recognize the backslash for line continuation.
-      If modifying Udev rules with an editor, be sure to leave each rule
-      on one physical line.</para>
-    </note>
-
-    <para>This way, the symlinks will stay correct even if you move the drives
-    to different positions on the IDE bus, but the
-    <filename>/dev/cdrom</filename> symlink won't be created if you replace
-    the old SAMSUNG CD-ROM with a new drive.</para>
-<!-- The symlinks in the first approach survive even the transition
-     to libata for IDE drives, but that is not for the book. -->
-
-    <para>The SUBSYSTEM==&quot;block&quot; key is needed in order to avoid
-    matching SCSI generic devices. Without it, in the case with SCSI
-    CD-ROMs, the symlinks will sometimes point to the correct
-    <filename>/dev/srX</filename> devices, and sometimes to
-    <filename>/dev/sgX</filename>, which is wrong.</para>
-
-    <para>The second approach yields:</para>
-
-<screen role="nodump"><userinput>cat &gt;/etc/udev/rules.d/82-cdrom.rules &lt;&lt; EOF
-<literal>
-# Custom CD-ROM symlinks
-SUBSYSTEM=="block", ENV{ID_TYPE}=="cd", \
-    ENV{ID_PATH}=="pci-0000:00:07.1-ide-0:1", SYMLINK+="cdrom"
-SUBSYSTEM=="block", ENV{ID_TYPE}=="cd", \
-    ENV{ID_PATH}=="pci-0000:00:07.1-ide-1:1", SYMLINK+="cdrom1 dvd"
-</literal>
-EOF</userinput></screen>
-
-    <para>This way, the symlinks will stay correct even if you replace drives
-    with different models, but place them to the old positions on the IDE
-    bus. The ENV{ID_TYPE}==&quot;cd&quot; key makes sure that the symlink
-    disappears if you put something other than a CD-ROM in that position on
-    the bus.</para>
-
-    <para>Of course, it is possible to mix the two approaches.</para>
-
-  </sect2>
-
-  <sect2>
-
-    <title>Dealing with duplicate devices</title>
-
-    <para>As explained in <xref linkend="ch-scripts-udev"/>, the order in
-    which devices with the same function appear in
-    <filename class="directory">/dev</filename> is essentially random.
-    E.g., if you have a USB web camera and a TV tuner, sometimes
-    <filename>/dev/video0</filename> refers to the camera and
-    <filename>/dev/video1</filename> refers to the tuner, and sometimes
-    after a reboot the order changes to the opposite one.
-    For all classes of hardware except sound cards and network cards, this is
-    fixable by creating udev rules for custom persistent symlinks.
-    The case of network cards is covered separately in
-    <xref linkend="ch-scripts-network"/>, and sound card configuration can
-    be found in <ulink url="&cblfs-root;">CBLFS</ulink>.</para>
-
-    <para>For each of your devices that is likely to have this problem
-    (even if the problem doesn't exist in your current Linux distribution),
-    find the corresponding directory under
-    <filename class="directory">/sys/class</filename> or
-    <filename class="directory">/sys/block</filename>.
-    For video devices, this may be
-    <filename
-    class="directory">/sys/class/video4linux/video<replaceable>X</replaceable></filename>.
-    Figure out the attributes that identify the device uniquely (usually,
-    vendor and product IDs and/or serial numbers work):</para>
-
-<screen role="nodump"><userinput>udevadm info -a -p /sys/class/video4linux/video0</userinput></screen>
-
-    <para>Then write rules that create the symlinks, e.g.:</para>
-
-<screen role="nodump"><userinput>cat &gt;/etc/udev/rules.d/83-duplicate_devs.rules &lt;&lt; EOF
-<literal>
-# Persistent symlinks for webcam and tuner
-KERNEL=="video*", SYSFS{idProduct}=="1910", SYSFS{idVendor}=="0d81", \
-    SYMLINK+="webcam"
-KERNEL=="video*", SYSFS{device}=="0x036f", SYSFS{vendor}=="0x109e", \
-    SYMLINK+="tvtuner"
-</literal>
-EOF</userinput></screen>
-
-    <para>The result is that <filename>/dev/video0</filename> and
-    <filename>/dev/video1</filename> devices still refer randomly to the tuner
-    and the web camera (and thus should never be used directly), but there are
-    symlinks <filename>/dev/tvtuner</filename> and
-    <filename>/dev/webcam</filename> that always point to the correct
-    device.</para>
-
-    <para>More information on writing Udev rules can be found in
-    <filename>/usr/share/doc/udev-&udev-version;/index.html</filename>.</para>
-
- </sect2>
-
-</sect1>
Index: OK/bootscripts/common/sysklogd.xml
===================================================================
--- BOOK/bootscripts/common/sysklogd.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-scripts-sysklogd">
-  <?dbhtml filename="sysklogd.html"?>
-
-  <title>Configuring the sysklogd script</title>
-
-  <indexterm zone="ch-scripts-sysklogd">
-    <primary sortas="d-sysklogd">sysklogd</primary>
-  <secondary>configuring</secondary></indexterm>
-
-  <para>The <filename>sysklogd</filename> script invokes the
-  <command>syslogd</command> program with the <option>-m 0</option> option.
-  This option turns off the periodic timestamp mark that
-  <command>syslogd</command> writes to the log files every 20 minutes by
-  default. If you want to turn on this periodic timestamp mark, edit the
-  <filename>sysklogd</filename> script and make the changes accordingly.
-  See <userinput>man syslogd</userinput> for more information.</para>
-
-</sect1>
Index: OK/bootscripts/common/udev.xml
===================================================================
--- BOOK/bootscripts/common/udev.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,352 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-scripts-udev">
-  <?dbhtml filename="udev.html"?>
-
-  <title>Device and Module Handling on a CLFS System</title>
-
-  <indexterm zone="ch-scripts-udev">
-    <primary sortas="a-Udev">Udev</primary>
-    <secondary>usage</secondary>
-  </indexterm>
-
-  <para>In <xref linkend="chapter-building-system"/>, we installed the Udev
-  package. Before we go into the details regarding how this works,
-  a brief history of previous methods of handling devices is in
-  order.</para>
-
-  <para>Linux systems in general traditionally use a static device creation
-  method, whereby a great many device nodes are created under <filename
-  class="directory">/dev</filename> (sometimes literally thousands of nodes),
-  regardless of whether the corresponding hardware devices actually exist. This
-  is typically done via a <command>MAKEDEV</command> script, which contains a
-  number of calls to the <command>mknod</command> program with the relevant
-  major and minor device numbers for every possible device that might exist in
-  the world.</para>
-
-  <para>Using the Udev method, only those devices which are detected by the
-  kernel get device nodes created for them. Because these device nodes will be
-  created each time the system boots, they will be stored on a <systemitem
-  class="filesystem">tmpfs</systemitem> file system (a virtual file system that
-  resides entirely in system memory). Device nodes do not require much space, so
-  the memory that is used is negligible.</para>
-
-  <sect2>
-    <title>History</title>
-
-    <para>In February 2000, a new filesystem called <systemitem
-    class="filesystem">devfs</systemitem> was merged into the 2.3.46 kernel
-    and was made available during the 2.4 series of stable kernels. Although
-    it was present in the kernel source itself, this method of creating devices
-    dynamically never received overwhelming support from the core kernel
-    developers.</para>
-
-    <para>The main problem with the approach adopted by <systemitem
-    class="filesystem">devfs</systemitem> was the way it handled device
-    detection, creation, and naming. The latter issue, that of device node
-    naming, was perhaps the most critical. It is generally accepted that if
-    device names are allowed to be configurable, then the device naming policy
-    should be up to a system administrator, not imposed on them by any
-    particular developer(s). The <systemitem
-    class="filesystem">devfs</systemitem> file system also suffers from race
-    conditions that are inherent in its design and cannot be fixed without a
-    substantial revision to the kernel. It has also been marked as deprecated
-    due to a lack of recent maintenance.</para>
-
-    <para>With the development of the unstable 2.5 kernel tree, later released
-    as the 2.6 series of stable kernels, a new virtual filesystem called
-    <systemitem class="filesystem">sysfs</systemitem> came to be. The job of
-    <systemitem class="filesystem">sysfs</systemitem> is to export a view of
-    the system's hardware configuration to userspace processes. With this
-    userspace-visible representation, the possibility of seeing a userspace
-    replacement for <systemitem class="filesystem">devfs</systemitem> became
-    much more realistic.</para>
-
-  </sect2>
-
-  <sect2>
-    <title>Udev Implementation</title>
-
-    <sect3>
-      <title>Sysfs</title>
-
-      <para>The <systemitem class="filesystem">sysfs</systemitem> filesystem was
-      mentioned briefly above. One may wonder how <systemitem
-      class="filesystem">sysfs</systemitem> knows about the devices present on
-      a system and what device numbers should be used for them. Drivers that
-      have been compiled into the kernel directly register their objects with
-      <systemitem class="filesystem">sysfs</systemitem> as they are detected by
-      the kernel. For drivers compiled as modules, this registration will happen
-      when the module is loaded. Once the <systemitem
-      class="filesystem">sysfs</systemitem> filesystem is mounted (on <filename
-      class="directory">/sys</filename>), data which the built-in drivers
-      registered with <systemitem class="filesystem">sysfs</systemitem> are
-      available to userspace processes and to <command>udevd</command> for device
-      node creation.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Udev Bootscript</title>
-
-      <para>The <command>S10udev</command> initscript takes care of creating
-      device nodes when Linux is booted. The script unsets the uevent handler
-      from the default of <command>/sbin/hotplug</command>.  This is done
-      because the kernel no longer needs to call out to an external binary.
-      Instead <command>udevd</command> will listen on a netlink socket for
-      uevents that the kernel raises. Next, the bootscript copies any static
-      device nodes that exist in <filename
-      class="directory">/lib/udev/devices</filename> to <filename
-      class="directory">/dev</filename>. This is necessary because some devices,
-      directories, and symlinks are needed before the dynamic device handling
-      processes are available during the early stages of booting a system.
-      Creating static device nodes in <filename
-      class="directory">/lib/udev/devices</filename> also provides an easy
-      workaround for devices that are not supported by the dynamic device
-      handling infrastructure. The bootscript then starts the Udev daemon,
-      <command>udevd</command>, which will act on any uevents it receives.
-      Finally, the bootscript forces the kernel to replay uevents for any
-      devices that have already been registered and then waits for
-      <command>udevd</command> to handle them.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Device Node Creation</title>
-
-      <para>To obtain the right major and minor number for a device, Udev relies
-      on the information provided by <systemitem
-      class="filesystem">sysfs</systemitem> in <filename
-      class="directory">/sys</filename>.  For example,
-      <filename>/sys/class/tty/vcs/dev</filename> contains the string
-      <quote>7:0</quote>. This string is used by <command>udevd</command>
-      to create a device node with major number <emphasis>7</emphasis> and minor
-      <emphasis>0</emphasis>. The names and permissions of the nodes created
-      under the <filename class="directory">/dev</filename> directory are
-      determined by rules specified in the files within the <filename
-      class="directory">/etc/udev/rules.d/</filename> directory. These are
-      numbered in a similar fashion to the CLFS-Bootscripts package. If
-      <command>udevd</command> can't find a rule for the device it is creating,
-      it will default permissions to <emphasis>660</emphasis> and ownership to
-      <emphasis>root:root</emphasis>. Documentation on the syntax of the Udev
-      rules configuration files are available in
-      <filename>/usr/share/doc/udev-&udev-version;/index.html</filename></para>
-
-    </sect3>
-
-    <sect3>
-      <title>Module Loading</title>
-
-      <para>Device drivers compiled as modules may have aliases built into them.
-      Aliases are visible in the output of the <command>modinfo</command>
-      program and are usually related to the bus-specific identifiers of devices
-      supported by a module. For example, the <emphasis>snd-fm801</emphasis>
-      driver supports PCI devices with vendor ID 0x1319 and device ID 0x0801,
-      and has an alias of <quote>pci:v00001319d00000801sv*sd*bc04sc01i*</quote>.
-      For most devices, the bus driver exports the alias of the driver that
-      would handle the device via <systemitem
-      class="filesystem">sysfs</systemitem>. E.g., the
-      <filename>/sys/bus/pci/devices/0000:00:0d.0/modalias</filename> file
-      might contain the string
-      <quote>pci:v00001319d00000801sv00001319sd00001319bc04sc01i00</quote>.
-      The rules that CLFS installs will cause <command>udevd</command> to call
-      out to <command>/sbin/modprobe</command> with the contents of the
-      <envar>MODALIAS</envar> uevent environment variable (that should be the
-      same as the contents of the <filename>modalias</filename> file in sysfs),
-      thus loading all modules whose aliases match this string after wildcard
-      expansion.</para>
-
-      <para>In this example, this means that, in addition to
-      <emphasis>snd-fm801</emphasis>, the obsolete (and unwanted)
-      <emphasis>forte</emphasis> driver will be loaded if it is
-      available. See below for ways in which the loading of unwanted drivers can
-      be prevented.</para>
-
-      <para>The kernel itself is also able to load modules for network
-      protocols, filesystems and NLS support on demand.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Handling Hotpluggable/Dynamic Devices</title>
-
-      <para>When you plug in a device, such as a Universal Serial Bus (USB) MP3
-      player, the kernel recognizes that the device is now connected and
-      generates a uevent. This uevent is then handled by
-      <command>udevd</command> as described above.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2>
-    <title>Problems with Loading Modules and Creating Devices</title>
-
-    <para>There are a few possible problems when it comes to automatically
-    creating device nodes.</para>
-
-    <sect3>
-      <title>A kernel module is not loaded automatically</title>
-
-      <para>Udev will only load a module if it has a bus-specific alias and the
-      bus driver properly exports the necessary aliases to <systemitem
-      class="filesystem">sysfs</systemitem>. In other cases, one should
-      arrange module loading by other means. With Linux-&linux-version;, Udev is
-      known to load properly-written drivers for INPUT, IDE, PCI, USB, SCSI,
-      SERIO and FireWire devices.</para>
-
-      <para>To determine if the device driver you require has the necessary
-      support for Udev, run <command>modinfo</command> with the module name as
-      the argument.  Now try locating the device directory under
-      <filename class="directory">/sys/bus</filename> and check whether there is
-      a <filename>modalias</filename> file there.</para>
-
-      <para>If the <filename>modalias</filename> file exists in <systemitem
-      class="filesystem">sysfs</systemitem>, the driver supports the device and
-      can talk to it directly, but doesn't have the alias, it is a bug in the
-      driver. Load the driver without the help from Udev and expect the issue
-      to be fixed later.</para>
-
-      <para>If there is no <filename>modalias</filename> file in the relevant
-      directory under <filename class="directory">/sys/bus</filename>, this
-      means that the kernel developers have not yet added modalias support to
-      this bus type. With Linux-&linux-version;, this is the case with ISA
-      busses. Expect this issue to be fixed in later kernel versions.</para>
-
-      <para>Udev is not intended to load <quote>wrapper</quote> drivers such as
-      <emphasis>snd-pcm-oss</emphasis> and non-hardware drivers such as
-      <emphasis>loop</emphasis> at all.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>A kernel module is not loaded automatically, and Udev is not
-      intended to load it</title>
-
-      <para>If the <quote>wrapper</quote> module only enhances the functionality
-      provided by some other module (e.g., <emphasis>snd-pcm-oss</emphasis>
-      enhances the functionality of <emphasis>snd-pcm</emphasis> by making the
-      sound cards available to OSS applications), configure
-      <command>modprobe</command> to load the wrapper after Udev loads the
-      wrapped module. To do this, add an <quote>install</quote> line in
-      <filename>/etc/modprobe.conf</filename>. For example:</para>
-
-<screen role="nodump"><literal>install snd-pcm /sbin/modprobe -i snd-pcm ; \
-    /sbin/modprobe snd-pcm-oss ; true</literal></screen>
-
-      <para>If the module in question is not a wrapper and is useful by itself,
-      configure the <command>S05modules</command> bootscript to load this
-      module on system boot. To do this, add the module name to the
-      <filename>/etc/sysconfig/modules</filename> file on a separate line.
-      This works for wrapper modules too, but is suboptimal in that case.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Udev loads some unwanted module</title>
-
-      <para>Either don't build the module, or blacklist it in
-      <filename>/etc/modprobe.conf</filename> file as done with the
-      <emphasis>forte</emphasis> module in the example below:</para>
-
-<screen role="nodump"><literal>blacklist forte</literal></screen>
-
-      <para>Blacklisted modules can still be loaded manually with the
-      explicit <command>modprobe</command> command.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Udev creates a device incorrectly, or makes a wrong symlink</title>
-
-      <para>This usually happens if a rule unexpectedly matches a device. For
-      example, a poorly-writen rule can match both a SCSI disk (as desired)
-      and the corresponding SCSI generic device (incorrectly) by vendor.
-      Find the offending rule and make it more specific.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Udev rule works unreliably</title>
-
-      <para>This may be another manifestation of the previous problem. If not,
-      and your rule uses <systemitem class="filesystem">sysfs</systemitem>
-      attributes, it may be a kernel timing issue, to be fixed in later kernels.
-      For now, you can work around it by creating a rule that waits for the used
-      <systemitem class="filesystem">sysfs</systemitem> attribute and appending
-      it to the <filename>/etc/udev/rules.d/10-wait_for_sysfs.rules</filename>
-      file. Please notify the CLFS Development list if you do so and it
-      helps.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Udev does not create a device</title>
-
-      <para>Further text assumes that the driver is built statically into the
-      kernel or already loaded as a module, and that you have already checked
-      that Udev doesn't create a misnamed device.</para>
-
-      <para>Udev has no information needed to create a device node if a kernel
-      driver does not export its data to <systemitem
-      class="filesystem">sysfs</systemitem>.
-      This is most common with third party drivers from outside the kernel
-      tree. Create a static device node in
-      <filename>/lib/udev/devices</filename> with the appropriate major/minor
-      numbers (see the file <filename>devices.txt</filename> inside the kernel
-      documentation or the documentation provided by the third party driver
-      vendor). The static device node will be copied to
-      <filename class="directory">/dev</filename> by the
-      <command>S10udev</command> bootscript.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Device naming order changes randomly after rebooting</title>
-
-      <para>This is due to the fact that Udev, by design, handles uevents and
-      loads modules in parallel, and thus in an unpredictable order. This will
-      never be <quote>fixed</quote>. You should not rely upon the kernel device
-      names being stable. Instead, create your own rules that make symlinks with
-      stable names based on some stable attributes of the device, such as a
-      serial number or the output of various *_id utilities installed by Udev.
-      See <xref linkend="ch-scripts-symlinks"/> and
-      <xref linkend="ch-scripts-network"/> for examples.</para>
-
-    </sect3>
-
-  </sect2>
-
-  <sect2>
-    <title>Useful Reading</title>
-
-    <para>Additional helpful documentation is available at the following
-    sites:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para remap="verbatim">A Userspace Implementation of <systemitem class="filesystem">devfs</systemitem>
-        <ulink url="http://www.kroah.com/linux/talks/ols_2003_udev_paper/Reprint-Kroah-Hartman-OLS2003.pdf"/></para>
-      </listitem>
-
-      <listitem>
-        <para remap="verbatim">udev FAQ
-        <ulink url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-FAQ"/></para>
-      </listitem>
-
-      <listitem>
-        <para remap="verbatim">The <systemitem class="filesystem">sysfs</systemitem> Filesystem
-        <ulink url="http://www.kernel.org/pub/linux/kernel/people/mochel/doc/papers/ols-2005/mochel.pdf"/></para>
-      </listitem>
-
-    </itemizedlist>
-
-  </sect2>
-
-</sect1>
Index: OK/bootscripts/common/usage.xml
===================================================================
--- BOOK/bootscripts/common/usage.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,129 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-scripts-usage">
-  <?dbhtml filename="usage.html"?>
-
-  <title>How Do These Bootscripts Work?</title>
-
-  <indexterm zone="ch-scripts-usage">
-    <primary sortas="a-Bootscripts">Bootscripts</primary>
-  <secondary>usage</secondary></indexterm>
-
-  <para>Linux uses a special booting facility named SysVinit that is
-  based on a concept of <emphasis>run-levels</emphasis>. It can be quite
-  different from one system to another, so it cannot be assumed that
-  because things worked in one particular Linux distribution, they should work
-  the same in CLFS too. CLFS has its own way of doing things, but it
-  respects generally accepted standards.</para>
-
-  <para>SysVinit (which will be referred to as <quote>init</quote> from
-  now on) works using a run-levels scheme. There are seven (numbered 0 to 6)
-  run-levels (actually, there are more run-levels, but they are for
-  special cases and are generally not used. See <filename>init(8)</filename>
-  for more details), and each one of those corresponds to the actions the
-  computer is supposed to perform when it starts up. The default
-  run-level is 3. Here are the descriptions of the different run-levels
-  as they are implemented:</para>
-
-<literallayout>0: halt the computer
-1: single-user mode
-2: multi-user mode without networking
-3: multi-user mode with networking
-4: reserved for customization, otherwise does the same as 3
-5: same as 4, it is usually used for GUI login (like X's <command>xdm</command> or KDE's <command>kdm</command>)
-6: reboot the computer</literallayout>
-
-  <para>The command used to change run-levels is <command>init
-  <replaceable>[runlevel]</replaceable></command>, where
-  <replaceable>[runlevel]</replaceable> is the target run-level. For example,
-  to reboot the computer, a user could issue the <command>init 6</command>
-  command, which is an alias for the <command>reboot</command> command.
-  Likewise, <command>init 0</command> is an alias for the
-  <command>halt</command> command.</para>
-
-  <para>There are a number of directories under <filename
-  class="directory">/etc/rc.d</filename> that look like <filename
-  class="directory">rc?.d</filename> (where ? is the number of the
-  run-level) and <filename class="directory">rcsysinit.d</filename>, all
-  containing a number of symbolic links. Some begin with a
-  <emphasis>K</emphasis>, the others begin with an
-  <emphasis>S</emphasis>, and all of them have two numbers following the
-  initial letter. The K means to stop (kill) a service and the S means
-  to start a service. The numbers determine the order in which the
-  scripts are run, from 00 to 99&mdash;the lower the number the earlier it
-  gets executed. When <command>init</command> switches to another run-level,
-  the appropriate services are either started or stopped, depending on the
-  runlevel chosen.</para>
-
-  <para>The real scripts are in <filename
-  class="directory">/etc/rc.d/init.d</filename>. They do the actual work,
-  and the symlinks all point to them. Killing links and starting links point
-  to the same script in <filename class="directory">/etc/rc.d/init.d</filename>.
-  This is because the scripts can be called with different parameters like
-  <option>start</option>, <option>stop</option>, <option>restart</option>,
-  <option>reload</option>, and <option>status</option>. When a K link is
-  encountered, the appropriate script is run with the <option>stop</option>
-  argument. When an S link is encountered, the appropriate script is run
-  with the <option>start</option> argument.</para>
-
-  <para>There is one exception to this explanation. Links that start
-  with an <emphasis>S</emphasis> in the <filename
-  class="directory">rc0.d</filename> and <filename
-  class="directory">rc6.d</filename> directories will not cause anything
-  to be started. They will be called with the parameter
-  <option>stop</option> to stop something. The logic behind this
-  is that when a user is going to reboot or halt the system, nothing
-  needs to be started. The system only needs to be stopped.</para>
-
-  <para>These are descriptions of what the arguments make the scripts
-  do:</para>
-
-  <variablelist>
-    <varlistentry>
-      <term><option>start</option></term>
-      <listitem>
-        <para>The service is started.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><option>stop</option></term>
-      <listitem>
-        <para>The service is stopped.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><option>restart</option></term>
-      <listitem>
-        <para>The service is stopped and then started again.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><option>reload</option></term>
-      <listitem>
-        <para>The configuration of the service is updated. This is used
-        after the configuration file of a service was modified, when the
-        service does not need to be restarted.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><option>status</option></term>
-      <listitem>
-        <para>Tells if the service is running and with which PIDs.</para>
-      </listitem>
-    </varlistentry>
-  </variablelist>
-
-  <para>Feel free to modify the way the boot process works (after all,
-  it is your own CLFS system). The files given here are an example of how
-  it can be done.</para>
-
-</sect1>
Index: OK/bootscripts/mips-chapter.xml
===================================================================
--- BOOK/bootscripts/mips-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
-  <?dbhtml dir="bootscripts"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Setting Up System Bootscripts</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/setclock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inputrc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/network.xml"/>
-
-</chapter>
Index: OK/bootscripts/mips64-64-chapter.xml
===================================================================
--- BOOK/bootscripts/mips64-64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
-  <?dbhtml dir="bootscripts"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Setting Up System Bootscripts</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/setclock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inputrc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/network.xml"/>
-
-</chapter>
Index: OK/bootscripts/mips64-chapter.xml
===================================================================
--- BOOK/bootscripts/mips64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
-  <?dbhtml dir="bootscripts"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Setting Up System Bootscripts</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/setclock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inputrc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/network.xml"/>
-
-</chapter>
Index: OK/bootscripts/multilib/bootscripts.xml
===================================================================
--- BOOK/bootscripts/multilib/bootscripts.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-scripts-bootscripts" role="wrap">
-  <?dbhtml filename="bootscripts.html"?>
-
-  <title>CLFS-Bootscripts-&clfs-bootscripts-version;</title>
-
-  <indexterm zone="ch-scripts-bootscripts">
-    <primary sortas="a-Bootscripts">Bootscripts</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/bootscripts.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of CLFS-Bootscripts</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bootscripts.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>make LIBDIR=/lib64 install-bootscripts</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/bootscripts.xml"
-  xpointer="xpointer(id('contents-bootscripts'))"/>
-
-</sect1>
Index: OK/bootscripts/ppc-chapter.xml
===================================================================
--- BOOK/bootscripts/ppc-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
-  <?dbhtml dir="bootscripts"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Setting Up System Bootscripts</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/setclock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inputrc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/network.xml"/>
-
-</chapter>
Index: OK/bootscripts/ppc64-chapter.xml
===================================================================
--- BOOK/bootscripts/ppc64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
-  <?dbhtml dir="bootscripts"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Setting Up System Bootscripts</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/setclock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inputrc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/network.xml"/>
-
-</chapter>
Index: OK/bootscripts/sparc-chapter.xml
===================================================================
--- BOOK/bootscripts/sparc-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
-  <?dbhtml dir="bootscripts"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Setting Up System Bootscripts</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/setclock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inputrc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/network.xml"/>
-
-</chapter>
Index: OK/bootscripts/sparc64-64-chapter.xml
===================================================================
--- BOOK/bootscripts/sparc64-64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
-  <?dbhtml dir="bootscripts"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Setting Up System Bootscripts</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/setclock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inputrc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/network.xml"/>
-
-</chapter>
Index: OK/bootscripts/sparc64-chapter.xml
===================================================================
--- BOOK/bootscripts/sparc64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
-  <?dbhtml dir="bootscripts"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Setting Up System Bootscripts</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/setclock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inputrc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/network.xml"/>
-
-</chapter>
Index: OK/bootscripts/x86-chapter.xml
===================================================================
--- BOOK/bootscripts/x86-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
-  <?dbhtml dir="bootscripts"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Setting Up System Bootscripts</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/setclock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inputrc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/network.xml"/>
-
-</chapter>
Index: OK/bootscripts/x86_64-64-chapter.xml
===================================================================
--- BOOK/bootscripts/x86_64-64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
-  <?dbhtml dir="bootscripts"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Setting Up System Bootscripts</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/setclock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inputrc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/network.xml"/>
-
-</chapter>
Index: OK/bootscripts/x86_64-chapter.xml
===================================================================
--- BOOK/bootscripts/x86_64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-bootscripts" xreflabel="Setting Up System Bootscripts">
-  <?dbhtml dir="bootscripts"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Setting Up System Bootscripts</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bootscripts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/usage.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/setclock.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/console.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inputrc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/profile.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hostname.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hosts.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/symlinks.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/network.xml"/>
-
-</chapter>
Index: OK/chroot/64/createfiles.xml
===================================================================
--- BOOK/chroot/64/createfiles.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<!-- for pure64 on multilib-capable architectures -->
-
-<sect1 id="ch-chroot-createfiles">
-  <?dbhtml filename="createfiles.html"?>
-
-  <title>Creating Essential Symlinks</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../boot/common/createfiles.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,pwd,rm,stty} /bin
-ln -sv /tools/bin/file /usr/bin
-ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
-ln -sv /tools/lib/libstd* /usr/lib
-ln -sv bash /bin/sh</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../boot/64/createfiles.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-<screen><userinput>mkdir -pv /usr/lib64
-ln -sv /tools/lib/libstd*so* /usr/lib64</userinput></screen>
-
-</sect1>
Index: OK/chroot/64/e2fsprogs.xml
===================================================================
--- BOOK/chroot/64/e2fsprogs.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,75 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-e2fsprogs" role="wrap">
-  <?dbhtml filename="e2fsprogs.html"?>
-
-  <title>E2fsprogs-&e2fsprogs-version;</title>
-
-  <indexterm zone="ch-chroot-e2fsprogs">
-    <primary sortas="a-E2fsprogs">E2fsprogs</primary>
-    <secondary>chroot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/e2fsprogs.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of E2fsprogs</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>CC="${CC} ${BUILD64}" ../configure --prefix=/tools \
-    --enable-elf-shlibs --disable-evms --with-cc="${CC} ${BUILD64}" \
-    --with-linker=${LD} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-e2fsprogs" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/chroot/alpha-chapter.xml
===================================================================
--- BOOK/chroot/alpha-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-chroot" xreflabel="If You Are Going to Chroot">
-  <?dbhtml dir="chroot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Chroot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
-
-</chapter>
Index: OK/chroot/common/changingowner.xml
===================================================================
--- BOOK/chroot/common/changingowner.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-changingowner">
-  <?dbhtml filename="changingowner.html"?>
-
-  <title>Changing Ownership</title>
-
-    <para os="a">Currently, the <filename class="directory">/tools</filename>
-    and <filename class="directory">/cross-tools</filename> directories
-    are owned by the user <emphasis>clfs</emphasis>, a user that
-    exists only on the host system. Although the <filename
-    class="directory">/tools</filename> and <filename
-    class="directory">/cross-tools</filename> directories can be deleted
-    once the CLFS system has been finished, they can be retained to build
-    additional CLFS systems. If the <filename class="directory">/tools</filename>
-    and <filename class="directory">/cross-tools</filename> directories are
-    kept as is, the files are owned by a user ID without a corresponding
-    account. This is dangerous because a user account created later could
-    get this same user ID and would own the <filename
-    class="directory">/tools</filename> directory and all the files therein,
-    thus exposing these files to possible malicious manipulation.</para>
-
-    <para os="b">To avoid this issue, add the <systemitem
-    class="username">clfs</systemitem> user to the new CLFS system later when
-    creating the <filename>/etc/passwd</filename> file, taking care to assign
-    it the same user and group IDs as on the host system. Alternatively,
-    assign the contents of the <filename class="directory">/tools</filename>
-    and <filename class="directory">/cross-tools</filename> directories to
-    user <systemitem class="username">root</systemitem> by running the
-    following commands:</para>
-
-<screen os="c"><userinput>chown -Rv 0:0 /tools
-chown -Rv 0:0 /cross-tools</userinput></screen>
-
-    <para os="d">The commands use <parameter>0:0</parameter> instead of
-    <parameter>root:root</parameter>, because <command>chown</command>
-    is unable to resolve the name <quote>root</quote> until the
-    <filename>passwd</filename> file has been created.</para>
-
-</sect1>
Index: OK/chroot/common/chroot.xml
===================================================================
--- BOOK/chroot/common/chroot.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-chroot">
-  <?dbhtml filename="chroot.html"?>
-
-  <title>Entering the Chroot Environment</title>
-
-  <para>It is time to enter the chroot environment to begin building
-  and installing the final CLFS system. As user <systemitem
-  class="username">root</systemitem>, run the following command to
-  enter the realm that is, at the moment, populated with only the
-  temporary tools:</para>
-
-<screen><userinput>chroot "${CLFS}" /tools/bin/env -i \
-    HOME=/root TERM="${TERM}" PS1='\u:\w\$ ' \
-    PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
-    /tools/bin/bash --login +h</userinput></screen>
-
-  <para>The <parameter>-i</parameter> option given to the
-  <command>env</command> command will clear all variables of the chroot
-  environment. After that, only the <envar>HOME</envar>,
-  <envar>TERM</envar>, <envar>PS1</envar>, and
-  <envar>PATH</envar> variables are set again. The
-  <parameter>TERM=${TERM}</parameter> construct will set the
-  <envar>TERM</envar> variable inside chroot to the same value as
-  outside chroot. This variable is needed for programs like
-  <command>vim</command> and <command>less</command> to operate
-  properly.  If other variables are needed, such as
-  <envar>CFLAGS</envar> or <envar>CXXFLAGS</envar>, this is
-  a good place to set them again.</para>
-
-  <para>From this point on, there is no need to use the
-  <envar>CLFS</envar> variable anymore, because all work will be
-  restricted to the CLFS file system.  This is because the Bash shell is
-  told that <filename class="directory">${CLFS}</filename> is now the root
-  (<filename class="directory">/</filename>) directory.</para>
-
-  <para>Notice that <filename class="directory">/tools/bin</filename> comes
-  last in the <envar>PATH</envar>. This means that a temporary tool will no
-  longer be used once its final version is installed. This occurs when the
-  shell does not <quote>remember</quote> the locations of executed
-  binaries&mdash;for this reason, hashing is switched off by passing the
-  <parameter>+h</parameter> option to <command>bash</command>.</para>
-
-  <para>It is important that all the commands throughout the remainder
-  of this chapter and the following chapters are run from within the
-  chroot environment. If you leave this environment for any reason
-  (rebooting for example), remember to first mount the <systemitem
-  class="filesystem">proc</systemitem> and <systemitem
-  class="filesystem">devpts</systemitem> file systems (discussed in the
-  previous section) and enter chroot again before continuing with the
-  installations.</para>
-
-  <para>Note that the <command>bash</command> prompt will say
-  <computeroutput>I have no name!</computeroutput> This is normal because the
-  <filename>/etc/passwd</filename> file has not been created yet.</para>
-
-</sect1>
Index: OK/chroot/common/createfiles.xml
===================================================================
--- BOOK/chroot/common/createfiles.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-createfiles">
-  <?dbhtml filename="createfiles.html"?>
-
-  <title>Creating Essential Symlinks</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../boot/common/createfiles.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,pwd,rm,stty} /bin
-ln -sv /tools/bin/file /usr/bin
-ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
-ln -sv /tools/lib/libstd* /usr/lib
-ln -sv bash /bin/sh</userinput></screen>
-
-</sect1>
Index: OK/chroot/common/creatingdirs.xml
===================================================================
--- BOOK/chroot/common/creatingdirs.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,43 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-creatingdirs">
-  <?dbhtml filename="creatingdirs.html"?>
-
-  <title>Creating Directories</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../boot/common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>mkdir -pv /{bin,boot,dev,{etc/,}opt,home,lib,mnt}
-mkdir -pv /{proc,media/{floppy,cdrom},sbin,srv,sys}
-mkdir -pv /var/{lock,log,mail,run,spool}
-mkdir -pv /var/{opt,cache,lib/{misc,locate},local}
-install -dv -m 0750 /root
-install -dv -m 1777 {/var,}/tmp
-mkdir -pv /usr/{,local/}{bin,include,lib,sbin,src}
-mkdir -pv /usr/{,local/}share/{doc,info,locale,man}
-mkdir -pv /usr/{,local/}share/{misc,terminfo,zoneinfo}
-mkdir -pv /usr/{,local/}share/man/man{1..8}
-for dir in /usr{,/local}; do
-  ln -sv share/{man,doc,info} $dir
-done</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../boot/common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../boot/common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../boot/common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-</sect1>
Index: OK/chroot/common/devices.xml
===================================================================
--- BOOK/chroot/common/devices.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-devices">
-  <?dbhtml filename="devices.html"?>
-
-  <title>Mounting Kernel Filesystems</title>
-
-  <indexterm zone="ch-chroot-devices">
-    <primary sortas="e-/dev/*">/dev/*</primary>
-  </indexterm>
-
-  <sect2>
-    <title>Mounting Additional Kernel Filesystems</title>
-
-    <para>Mount the proper virtual (kernel) file systems on the
-    newly-created directories:</para>
-
-<screen><userinput>mount -vt devpts -o gid=4,mode=620 none /dev/pts
-mount -vt tmpfs none /dev/shm</userinput></screen>
-
-    <para>The <command>mount</command> commands executed above may result
-    in the following warning message:</para>
-
-<screen><computeroutput>can't open /etc/fstab: No such file or directory.</computeroutput></screen>
-
-    <para>This file&mdash;<filename>/etc/fstab</filename>&mdash;has not
-    been created yet but is also not required for the file systems to be
-    properly mounted. As such, the warning can be safely ignored.</para>
-
-  </sect2>
-
-</sect1>
Index: OK/chroot/common/e2fsprogs.xml
===================================================================
--- BOOK/chroot/common/e2fsprogs.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,86 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-e2fsprogs" role="wrap">
-  <?dbhtml filename="e2fsprogs.html"?>
-
-  <title>E2fsprogs-&e2fsprogs-version;</title>
-
-  <indexterm zone="ch-chroot-e2fsprogs">
-    <primary sortas="a-E2fsprogs">E2fsprogs</primary>
-    <secondary>chroot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/e2fsprogs.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of E2fsprogs</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>../configure --prefix=/tools \
-    --enable-elf-shlibs --disable-evms --with-cc=${CC} --with-linker=${LD} \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <variablelist os="e">
-      <title>The meaning of the configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../../final-system/common/e2fsprogs.xml"
-      xpointer="xpointer(//*[@os='e2'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../../final-system/common/e2fsprogs.xml"
-      xpointer="xpointer(//*[@os='e3'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-<screen os="g"><userinput>make libs</userinput></screen>
-
-    <para os="h">Install the static libraries and headers:</para>
-
-<screen os="i"><userinput>make install-libs</userinput></screen>
-
-    <variablelist os="j">
-      <title>The meaning of the make option:</title>
-
-      <varlistentry>
-        <term><parameter>install-libs</parameter></term>
-        <listitem>
-          <para>This command will only install the e2fsprogs
-                libraries.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-e2fsprogs" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/chroot/common/introduction.xml
===================================================================
--- BOOK/chroot/common/introduction.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,16 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-introduction">
-  <?dbhtml filename="introduction.html"?>
-
-  <title>Introduction</title>
-
-  <para>This chapter shows how to prepare a <command>chroot</command>
-  jail to build the final system packages into.</para>
-
-</sect1>
Index: OK/chroot/common/kernfs.xml
===================================================================
--- BOOK/chroot/common/kernfs.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,59 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-kernfs">
-  <?dbhtml filename="kernfs.html"?>
-
-  <title>Mounting Virtual Kernel File Systems</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../boot/common/devices.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-  <para>Various file systems exported by the kernel are used to communicate
-  to and from the kernel itself. These file systems are virtual in that no
-  disk space is used for them. The content of the file systems resides in
-  memory.</para>
-
-  <para>Begin by creating directories onto which the file systems will
-  be mounted:</para>
-
-<screen><userinput>mkdir -pv ${CLFS}/{dev,proc,sys}</userinput></screen>
-
-  <para>Now mount the file systems:</para>
-
-<screen><userinput>mount -vt proc proc ${CLFS}/proc
-mount -vt sysfs sysfs ${CLFS}/sys</userinput></screen>
-
-  <para>Remember that if for any reason you stop working on the CLFS system
-  and start again later, it is important to check that these file systems
-  are mounted again before entering the chroot environment.</para>
-
-  <para>Two device nodes, /dev/console and /dev/null, are required to be
-  present on the filesystem.  These are needed by the kernel even before
-  starting Udev early in the boot process, so we create them here:</para>
-
-<screen><userinput>mknod -m 600 ${CLFS}/dev/console c 5 1
-mknod -m 666 ${CLFS}/dev/null c 1 3</userinput></screen>
-
-  <para>Once the system is complete and booting, the rest of our device
-  nodes are created by the Udev package.  Since this package is not
-  available to us right now, we must take other steps to provide device
-  nodes under on the CLFS filesystem.  We will use the <quote>bind</quote>
-  option in the mount command to make our host system's /dev structure
-  appear in the new CLFS filesystem:</para>
-
-<screen><userinput>mount -v -o bind /dev ${CLFS}/dev</userinput></screen>
-
-  <para>Additional file systems will soon be mounted from within the chroot 
-  environment. To keep the host up to date, perform a <quote>fake mount</quote>
-  for each of these now:</para>
-
-<screen><userinput>mount -f -vt tmpfs tmpfs ${CLFS}/dev/shm
-mount -f -vt devpts -o gid=4,mode=620 devpts ${CLFS}/dev/pts</userinput></screen>
-
-</sect1>
Index: OK/chroot/common/pwdgroup.xml
===================================================================
--- BOOK/chroot/common/pwdgroup.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,116 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-pwdgroup">
-  <?dbhtml filename="pwdgroup.html"?>
-
-  <title>Creating the passwd, group, and log Files</title>
-
-  <indexterm zone="ch-chroot-pwdgroup">
-    <primary sortas="e-/etc/passwd">/etc/passwd</primary>
-  </indexterm>
-
-  <indexterm zone="ch-chroot-pwdgroup">
-    <primary sortas="e-/etc/group">/etc/group</primary>
-  </indexterm>
-
-  <indexterm zone="ch-chroot-pwdgroup">
-    <primary sortas="e-/var/run/utmp">/var/run/utmp</primary>
-  </indexterm>
-
-  <indexterm zone="ch-chroot-pwdgroup">
-    <primary sortas="e-/var/log/btmp">/var/log/btmp</primary>
-  </indexterm>
-
-  <indexterm zone="ch-chroot-pwdgroup">
-    <primary sortas="e-/var/log/lastlog">/var/log/lastlog</primary>
-  </indexterm>
-
-  <indexterm zone="ch-chroot-pwdgroup">
-    <primary sortas="e-/var/log/wtmp">/var/log/wtmp</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../boot/common/pwdgroup.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-  
-  <para>Create the <filename>/etc/passwd</filename> file by running the
-  following command:</para>
-
-<screen><userinput>cat &gt; /etc/passwd &lt;&lt; "EOF"
-<literal>root:x:0:0:root:/root:/bin/bash</literal>
-EOF</userinput></screen>
-
-  <para os="b">The actual password for
-  <systemitem class="username">root</systemitem> (the <quote>x</quote>
-  used here is just a placeholder) will be set later.</para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../boot/common/pwdgroup.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <para>Create the <filename>/etc/group</filename> file by running the
-  following command:</para>
-
-<screen><userinput>cat &gt; /etc/group &lt;&lt; "EOF"
-<literal>root:x:0:
-bin:x:1:
-sys:x:2:
-kmem:x:3:
-tty:x:4:
-tape:x:5:
-daemon:x:6:
-floppy:x:7:
-disk:x:8:
-lp:x:9:
-dialout:x:10:
-audio:x:11:
-video:x:12:
-utmp:x:13:
-usb:x:14:
-cdrom:x:15:</literal>
-EOF</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../boot/common/pwdgroup.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../boot/common/pwdgroup.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <para>To remove the <quote>I have no name!</quote> prompt, start a
-  new shell. Since a full Glibc was installed in <xref
-  linkend="chapter-cross-tools"/> and the <filename>/etc/passwd</filename>
-  and <filename>/etc/group</filename> files have been created, user name
-  and group name resolution will now work.</para>
-
-<screen role="nodump"><userinput>exec /tools/bin/bash --login +h</userinput></screen>
-
-  <para>Note the use of the <parameter>+h</parameter> directive. This tells
-  <command>bash</command> not to use its internal path hashing. Without this
-  directive, <command>bash</command> would remember the paths to binaries it
-  has executed. To ensure the use of the newly compiled binaries as soon as
-  they are installed, the <parameter>+h</parameter> directive will be used
-  for the duration of the nexts chapters.</para>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../boot/common/pwdgroup.xml"
-  xpointer="xpointer(//*[@os='f'])"/>
-
-<screen><userinput>touch /var/run/utmp /var/log/{btmp,lastlog,wtmp}
-chgrp -v utmp /var/run/utmp /var/log/lastlog
-chmod -v 664 /var/run/utmp /var/log/lastlog
-chmod -v 600 /var/log/btmp</userinput></screen>
-
-  <para>The <filename>/var/run/utmp</filename> file records the users that
-  are currently logged in. The <filename>/var/log/wtmp</filename> file records
-  all logins and logouts. The <filename>/var/log/lastlog</filename> file
-  records when each user last logged in. The <filename>/var/log/btmp</filename>
-  file records the bad login attempts.</para>
-
-</sect1>
Index: OK/chroot/common/util-linux-ng.xml
===================================================================
--- BOOK/chroot/common/util-linux-ng.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-util-linux-ng" role="wrap">
-  <?dbhtml filename="util-linux-ng.html"?>
-
-  <title>Util-linux-ng-&util-linux-ng-version;</title>
-
-  <indexterm zone="ch-chroot-util-linux-ng">
-    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
-    <secondary>chroot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/util-linux-ng.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Util-linux-ng</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>make -C mount mount umount
-make -C text-utils more</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>cp -v mount/{,u}mount text-utils/more /tools/bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-util-linux-ng" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/chroot/mips-chapter.xml
===================================================================
--- BOOK/chroot/mips-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-chroot" xreflabel="If You Are Going to Chroot">
-  <?dbhtml dir="chroot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Chroot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/before-chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
-
-</chapter>
Index: OK/chroot/mips/before-chroot.xml
===================================================================
--- BOOK/chroot/mips/before-chroot.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,72 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-before-chroot">
-  <?dbhtml filename="before-chroot.html"?>
-  <title>Before Entering the Chroot Environment</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/before-chroot.xml"
-  xpointer="xpointer(//*[@role='determining-ifneeded'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/before-chroot.xml"
-  xpointer="xpointer(//*[@role='using-setarch'])"/>
-
-  <sect2 role="using-uname_hack">
-    <title>Using a Uname Hack</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uua'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uub'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uuc'])"/>
-
-<screen os="uud"><userinput>make uname_hack_fake_machine=mips</userinput></screen>
-
-    <variablelist os="uue">
-      <title>The meaning of the make and install options:</title>
-
-      <varlistentry os="uue1">
-        <term><parameter>uname_hack_fake_machine=i486</parameter></term>
-        <listitem>
-          <para>This parameter sets the value that the uts machine type will be
-          changed to.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uuf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uug'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uuh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uui'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uuj'])"/>
-
-  </sect2>
-
-</sect1>
Index: OK/chroot/mips/creatingdirs.xml
===================================================================
--- BOOK/chroot/mips/creatingdirs.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,39 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-creatingdirs">
-  <?dbhtml filename="creatingdirs.html"?>
-
-  <title>Creating Directories</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-   <para os="m1">These entries are needed for the RaQ2 bootloader. Only use these
-   if you are utilizing the Colo bootloader:</para>
-
-<screen os="m2"><userinput>cd /boot
-ln -svf . boot</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-</sect1>
Index: OK/chroot/mips64-64-chapter.xml
===================================================================
--- BOOK/chroot/mips64-64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-chroot" xreflabel="If You Are Going to Chroot">
-  <?dbhtml dir="chroot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Chroot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
-
-</chapter>
Index: OK/chroot/mips64-64/flags.xml
===================================================================
--- BOOK/chroot/mips64-64/flags.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para>We will need to setup target specific flags for the compiler
-  and linkers.</para>
-
-<screen><userinput>export BUILD64="-mabi=64"</userinput></screen>
-
-   <para>To prevent errors when you come back to your build, we will export these
-   variables to prevent any build issues in the future:</para>
-
-<screen><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bash_profile</userinput></screen>
-
-</sect1>
Index: OK/chroot/mips64-chapter.xml
===================================================================
--- BOOK/chroot/mips64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-chroot" xreflabel="If You Are Going to Chroot">
-  <?dbhtml dir="chroot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Chroot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
-
-</chapter>
Index: OK/chroot/mips64/createfiles.xml
===================================================================
--- BOOK/chroot/mips64/createfiles.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,27 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-createfiles">
-  <?dbhtml filename="createfiles.html"?>
-
-  <title>Creating Essential Symlinks</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/createfiles.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,pwd,stty} /bin
-ln -sv /tools/bin/file /usr/bin
-ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
-ln -sv /tools/lib32/libgcc_s.so{,.1} /usr/lib32
-ln -sv /tools/lib64/libgcc_s.so{,.1} /usr/lib64
-ln -sv /tools/lib/libstd* /usr/lib
-ln -sv /tools/lib32/libstd* /usr/lib32
-ln -sv /tools/lib64/libstd* /usr/lib64
-ln -sv bash /bin/sh</userinput></screen>
-
-</sect1>
Index: OK/chroot/mips64/creatingdirs.xml
===================================================================
--- BOOK/chroot/mips64/creatingdirs.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,54 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-creatingdirs">
-  <?dbhtml filename="creatingdirs.html"?>
-
-  <title>Creating Directories</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>mkdir -pv /{bin,boot,dev,{etc/,}opt,home,lib{,32,64},mnt}
-mkdir -pv /{proc,media/{floppy,cdrom},sbin,srv,sys}
-mkdir -pv /var/{lock,log,mail,run,spool}
-mkdir -pv /var/{opt,cache,lib{,32,64}/{misc,locate},local}
-install -dv /root -m 0750
-install -dv {/var,}/tmp -m 1777
-mkdir -pv /usr/{,local/}{bin,include,lib{,32,64},sbin,src}
-mkdir -pv /usr/{,local/}share/{doc,info,locale,man}
-mkdir -pv /usr/{,local/}share/{misc,terminfo,zoneinfo}
-mkdir -pv /usr/{,local/}share/man/man{1..8}
-for dir in /usr{,/local}; do
-  ln -sv share/{man,doc,info} $dir
-done
-install -dv /usr/lib/locale
-ln -sv ../lib/locale /usr/lib32
-ln -sv ../lib/locale /usr/lib64</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='m1'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='m2'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-</sect1>
Index: OK/chroot/mips64/flags.xml
===================================================================
--- BOOK/chroot/mips64/flags.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para>We will need to setup target specific flags for the compiler
-  and linkers.</para>
-
-<screen><userinput>export BUILD32="-mabi=32"
-export BUILDN32="-mabi=n32"
-export BUILD64="-mabi=64"</userinput></screen>
-
-  <para>You will need to set your host target triplet for o32 bit:</para>
-
-<screen><userinput>export CLFS_TARGET32="$(echo ${MACH_TYPE}| sed -e 's/64//g')"</userinput></screen>
-
-   <para>To prevent errors when you come back to your build, we will export these
-   variables to prevent any build issues in the future:</para>
-
-<screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bash_profile
-echo export BUILDN32=\""${BUILDN32}\"" &gt;&gt; ~/.bash_profile
-echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bash_profile
-echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; ~/.bash_profile</userinput></screen>
-
-</sect1>
Index: OK/chroot/multilib/createfiles.xml
===================================================================
--- BOOK/chroot/multilib/createfiles.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-createfiles">
-  <?dbhtml filename="createfiles.html"?>
-
-  <title>Creating Essential Symlinks</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/createfiles.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>ln -sv /tools/bin/{bash,cat,echo,grep,pwd,stty} /bin
-ln -sv /tools/bin/file /usr/bin
-ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
-ln -sv /tools/lib64/libgcc_s.so{,.1} /usr/lib64
-ln -sv /tools/lib/libstd* /usr/lib
-ln -sv /tools/lib64/libstd* /usr/lib64
-ln -sv bash /bin/sh</userinput></screen>
-
-</sect1>
Index: OK/chroot/multilib/creatingdirs.xml
===================================================================
--- BOOK/chroot/multilib/creatingdirs.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-creatingdirs">
-  <?dbhtml filename="creatingdirs.html"?>
-
-  <title>Creating Directories</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>mkdir -pv /{bin,boot,dev,{etc/,}opt,home,lib{,64},mnt}
-mkdir -pv /{proc,media/{floppy,cdrom},sbin,srv,sys}
-mkdir -pv /var/{lock,log,mail,run,spool}
-mkdir -pv /var/{opt,cache,lib{,64}/{misc,locate},local}
-install -dv /root -m 0750
-install -dv {/var,}/tmp -m 1777
-mkdir -pv /usr/{,local/}{bin,include,lib{,64},sbin,src}
-mkdir -pv /usr/{,local/}share/{doc,info,locale,man}
-mkdir -pv /usr/{,local/}share/{misc,terminfo,zoneinfo}
-mkdir -pv /usr/{,local/}share/man/man{1..8}
-for dir in /usr{,/local}; do
-  ln -sv share/{man,doc,info} $dir
-done
-install -dv /usr/lib/locale
-ln -sv ../lib/locale /usr/lib64</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingdirs.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-</sect1>
Index: OK/chroot/multilib/e2fsprogs.xml
===================================================================
--- BOOK/chroot/multilib/e2fsprogs.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,83 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-e2fsprogs" role="wrap">
-  <?dbhtml filename="e2fsprogs.html"?>
-
-  <title>E2fsprogs-&e2fsprogs-version;</title>
-
-  <indexterm zone="ch-chroot-e2fsprogs">
-    <primary sortas="a-E2fsprogs">E2fsprogs</primary>
-    <secondary>chroot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/e2fsprogs.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of E2fsprogs</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../boot/multilib/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../boot/multilib/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>CC="${CC} ${BUILD64}" ../configure --prefix=/tools \
-    --enable-elf-shlibs --disable-evms --with-cc="${CC} ${BUILD64}" \
-    --with-linker=${LD} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-e2fsprogs" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/chroot/multilib/util-linux-ng.xml
===================================================================
--- BOOK/chroot/multilib/util-linux-ng.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,58 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-util-linux-ng" role="wrap">
-  <?dbhtml filename="util-linux-ng.html"?>
-
-  <title>Util-linux-ng-&util-linux-ng-version;</title>
-
-  <indexterm zone="ch-chroot-util-linux-ng">
-    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
-    <secondary>chroot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/util-linux-ng.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Util-linux-ng</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="be"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-util-linux-ng" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/chroot/ppc-chapter.xml
===================================================================
--- BOOK/chroot/ppc-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-chroot" xreflabel="If You Are Going to Chroot">
-  <?dbhtml dir="chroot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Chroot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/before-chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
-
-</chapter>
Index: OK/chroot/ppc/before-chroot.xml
===================================================================
--- BOOK/chroot/ppc/before-chroot.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,72 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-before-chroot">
-  <?dbhtml filename="before-chroot.html"?>
-  <title>Before Entering the Chroot Environment</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/before-chroot.xml"
-  xpointer="xpointer(//*[@role='determining-ifneeded'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/before-chroot.xml"
-  xpointer="xpointer(//*[@role='using-setarch'])"/>
-
-  <sect2 role="using-uname_hack">
-    <title>Using a Uname Hack</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uua'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uub'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uuc'])"/>
-
-<screen os="uud"><userinput>make uname_hack_fake_machine=ppc</userinput></screen>
-
-    <variablelist os="uue">
-      <title>The meaning of the make and install options:</title>
-
-      <varlistentry os="uue1">
-        <term><parameter>uname_hack_fake_machine=ppc</parameter></term>
-        <listitem>
-          <para>This parameter sets the value that the uts machine type will be
-          changed to.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uuf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uug'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uuh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uui'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uuj'])"/>
-
-  </sect2>
-
-</sect1>
Index: OK/chroot/ppc64-chapter.xml
===================================================================
--- BOOK/chroot/ppc64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-chroot" xreflabel="If You Are Going to Chroot">
-  <?dbhtml dir="chroot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Chroot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
-
-</chapter>
Index: OK/chroot/ppc64/flags.xml
===================================================================
--- BOOK/chroot/ppc64/flags.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,30 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para>We will need to setup target specific flags for the compiler
-  and linkers.</para>
-
-<screen><userinput>export BUILD32="-m32"
-export BUILD64="-m64"</userinput></screen>
-
-  <para>You will need to set your host target triplet for 32 bit:</para>
-
-<screen><userinput>export CLFS_TARGET32="powerpc-unknown-linux-gnu"</userinput></screen>
-
-   <para>To prevent errors when you come back to your build, we will export these
-   variables to prevent any build issues in the future:</para>
-
-<screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bash_profile
-echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bash_profile
-echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; ~/.bash_profile</userinput></screen>
-
-</sect1>
Index: OK/chroot/sparc-chapter.xml
===================================================================
--- BOOK/chroot/sparc-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-chroot" xreflabel="If You Are Going to Chroot">
-  <?dbhtml dir="chroot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Chroot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/before-chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
-
-</chapter>
Index: OK/chroot/sparc/before-chroot.xml
===================================================================
--- BOOK/chroot/sparc/before-chroot.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,72 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-before-chroot">
-  <?dbhtml filename="before-chroot.html"?>
-  <title>Before Entering the Chroot Environment</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/before-chroot.xml"
-  xpointer="xpointer(//*[@role='determining-ifneeded'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/before-chroot.xml"
-  xpointer="xpointer(//*[@role='using-setarch'])"/>
-
-  <sect2 role="using-uname_hack">
-    <title>Using a Uname Hack</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uua'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uub'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uuc'])"/>
-
-<screen os="uud"><userinput>make uname_hack_fake_machine=sparc</userinput></screen>
-
-    <variablelist os="uue">
-      <title>The meaning of the make and install options:</title>
-
-      <varlistentry os="uue1">
-        <term><parameter>uname_hack_fake_machine=sparc</parameter></term>
-        <listitem>
-          <para>This parameter sets the value that the uts machine type will be
-          changed to.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uuf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uug'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uuh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uui'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/before-chroot.xml"
-    xpointer="xpointer(//*[@os='uuj'])"/>
-
-  </sect2>
-
-</sect1>
Index: OK/chroot/sparc64-64-chapter.xml
===================================================================
--- BOOK/chroot/sparc64-64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-chroot" xreflabel="If You Are Going to Chroot">
-  <?dbhtml dir="chroot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Chroot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
-
-</chapter>
Index: OK/chroot/sparc64-64/flags.xml
===================================================================
--- BOOK/chroot/sparc64-64/flags.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,31 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para>We will need to setup target specific flags for the compiler
-  and linkers.</para>
-
-<screen><userinput>export BUILD64="[BUILD64 entries]"</userinput></screen>
-
-   <para>To prevent errors when you come back to your build, we will export these
-   variables to prevent any build issues in the future:</para>
-
-<screen><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bash_profile</userinput></screen>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-   href="../../cross-tools/sparc64-64/flags.xml"
-   xpointer="xpointer(//*[@os='e'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-   href="../../cross-tools/sparc64-64/flags.xml"
-   xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: OK/chroot/sparc64-chapter.xml
===================================================================
--- BOOK/chroot/sparc64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-chroot" xreflabel="If You Are Going to Chroot">
-  <?dbhtml dir="chroot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Chroot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
-
-</chapter>
Index: OK/chroot/sparc64/flags.xml
===================================================================
--- BOOK/chroot/sparc64/flags.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,38 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para>We will need to setup target specific flags for the compiler
-  and linkers.</para>
-
-<screen><userinput>export BUILD32="[BUILD32 entries]"
-export BUILD64="[BUILD64 entries]"</userinput></screen>
-
-  <para>You will need to set your host target triplet for 32 bit:</para>
-
-<screen><userinput>export CLFS_TARGET32="sparcv9-unknown-linux-gnu"</userinput></screen>
-
-   <para>To prevent errors when you come back to your build, we will export these
-   variables to prevent any build issues in the future:</para>
-
-<screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bash_profile
-echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bash_profile
-echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; ~/.bash_profile</userinput></screen>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-   href="../../cross-tools/sparc64/flags.xml"
-   xpointer="xpointer(//*[@os='e'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-   href="../../cross-tools/sparc64/flags.xml"
-   xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: OK/chroot/x86-chapter.xml
===================================================================
--- BOOK/chroot/x86-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-chroot" xreflabel="If You Are Going to Chroot">
-  <?dbhtml dir="chroot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Chroot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/before-chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
-
-</chapter>
Index: OK/chroot/x86/before-chroot.xml
===================================================================
--- BOOK/chroot/x86/before-chroot.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,137 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-before-chroot">
-  <?dbhtml filename="before-chroot.html"?>
-  <title>Before Entering the Chroot Environment</title>
-
-  <sect2 role="determining-ifneeded">
-    <title>Determining if steps need to be taken</title>
-
-    <para>Before we can enter the chroot we have to make sure that the system is
-    in the proper state. From this point on the <envar>${CLFS_TARGET}</envar>
-    enviornment variable will no longer exist, so it will have no bearing on the
-    rest of the book. From this point on, most packages will rely on
-    <command>config.guess</command> provided by
-    <xref linkend="ch-system-automake"/>. Packages that do not use autotools
-    either do not care about the target triplet, or they have their own means
-    of determining it's value.</para>
-
-    <para>In both cases, The information about the host cpu used to determine
-    the target triplet is gathered from the same place,
-    <command>uname -m</command>. Executing this command outside of the chroot
-    aswell as inside the chroot will have the exact same output.</para>
-
-   <para>If you're unsure if you're host and target have the same target
-    triplet, you can use this test to determine what the hosts target triplet
-    is and if you need to take any steps to ensure that you don't build for the
-    wrong architecture. Extract the <xref linkend="ch-system-automake"/> tarball
-    and <command>cd</command> into the created directory. Then execute the
-    following to see what they detected target triplet is by
-    <command>config.guess</command>.</para>
-
-<screen><userinput>lib/config.guess</userinput></screen>
-
-    <para>If the output of that command does not equal what is in
-    <envar>${CLFS_TARGET}</envar> then you need to read on. If it does then you
-    can safely continue onto <xref linkend="ch-chroot-chroot"/>.</para>
-
-  </sect2>
-
-  <sect2 role="using-setarch">
-    <title>Using Setarch</title>
-
-    <para>If your host has a tool called <command>setarch</command> this may
-    solve your problems. The reason for saying may is because on a architecture
-    such as x86_64, using <command>setarch linux32 uname -m</command> will only
-    ever output i686. It is not possible to get an output of i486 or i586.</para>
-
-    <para>To test if setarch does everything you need it to, execute the
-    following command from inside of the <xref linkend="ch-system-automake"/>
-    directory:</para>
-
-<screen><userinput>setarch linux32 lib/config.guess</userinput></screen>
-
-    <para>If the output of the command above equals what is in
-    <envar>${CLFS_TARGET}</envar> then you have a viable solution. You can
-    wrap the chroot command on the next page with
-    <command>setarch linux32</command>. It will look like the following:</para>
-
-<screen><userinput>setarch linux32 chroot "${CLFS}" /tools/bin/env -i \
-    HOME=/root TERM="${TERM}" PS1='\u:\w\$ ' \
-    PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \
-    /tools/bin/bash --login +h</userinput></screen>
-
-    <para>If setarch works for you then you can safely continue onto
-    <xref linkend="ch-chroot-chroot"/>. If not, there is one more option
-    covered in this book.</para>
-
-  </sect2>
-
-  <sect2 role="using-uname_hack">
-    <title>Using a Uname Hack</title>
-
-    <para os="uua">The Uname Hack is a kernel module that modifies the output of
-    <command>uname -m</command> by directly changing the value of the
-    detected machine type. The kernel module will save the original value
-    and restore it when the module is unloaded.</para>
-
-    <variablelist os="uub" role="materials">
-      <varlistentry>
-        <term>Uname Hack (&uname_hack-version;) - &uname_hack-size;:</term>
-
-        <listitem>
-          <para>Home page: <ulink url="&uname_hack-home;"/></para>
-          <para>Download: <ulink url="&uname_hack-url;"/></para>
-          <para>MD5 sum: <literal>&uname_hack-md5;</literal></para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para os="uuc">Extract the tarball and <command>cd</command> into the
-    created directory. To build the Uname Hack you must have the kernel sources
-    for you currently running kernel available. Build the Uname Hack with the
-    following or similar command:</para>
-
-<screen os="uud"><userinput>make uname_hack_fake_machine=i486</userinput></screen>
-
-    <variablelist os="uue">
-      <title>The meaning of the make and install options:</title>
-
-      <varlistentry os="uue1">
-        <term><parameter>uname_hack_fake_machine=i486</parameter></term>
-        <listitem>
-          <para>This parameter sets the value that the uts machine type will be
-          changed to. Alternativley this could be set to i586 or i686.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="uuf">In the top level directory of the Uname Hack pacakage you
-    should see a file named uname_hack.ko. As soon as that module is loaded
-    into the running kernel the output of <command>uname -m</command> will be
-    affected immediately system-wide. Load the kernel module with the following
-    command:</para>
-
-<screen os="uug"><userinput>insmod uname_hack.ko</userinput></screen>
-
-    <para os="uuh">To test if the Uname Hack is working properly, execute the
-    following command from inside of the <xref linkend="ch-system-automake"/>
-    directory:</para>
-
-<screen os="uui"><userinput>lib/config.guess</userinput></screen>
-
-    <para os="uuj">The output of the above command should be the same as the
-    <envar>${CLFS_TARGET}</envar> enviornment variable. If this is not the
-    case, You can try and get help on the CLFS Support Mailing List or the
-    IRC Channel. See <xref linkend="ch-intro-askforhelp"/> for more
-    information.</para>
-
-  </sect2>
-
-</sect1>
Index: OK/chroot/x86_64-64-chapter.xml
===================================================================
--- BOOK/chroot/x86_64-64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-chroot" xreflabel="If You Are Going to Chroot">
-  <?dbhtml dir="chroot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Chroot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
-
-</chapter>
Index: OK/chroot/x86_64-64/flags.xml
===================================================================
--- BOOK/chroot/x86_64-64/flags.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para>We will need to setup target specific flags for the compiler
-  and linkers.</para>
-
-<screen><userinput>export BUILD64="-m64"</userinput></screen>
-
-   <para>To prevent errors when you come back to your build, we will export these
-   variables to prevent any build issues in the future:</para>
-
-<screen><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bash_profile</userinput></screen>
-
-</sect1>
Index: OK/chroot/x86_64-chapter.xml
===================================================================
--- BOOK/chroot/x86_64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-chroot" xreflabel="If You Are Going to Chroot">
-  <?dbhtml dir="chroot"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>If You Are Going to Chroot</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/chroot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/creatingdirs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/createfiles.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
-
-</chapter>
Index: OK/chroot/x86_64/flags.xml
===================================================================
--- BOOK/chroot/x86_64/flags.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,30 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-chroot-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para>We will need to setup target specific flags for the compiler
-  and linkers:</para>
-
-<screen><userinput>export BUILD32="-m32"
-export BUILD64="-m64"</userinput></screen>
-
-  <para>You will need to set your host target triplet for 32 bit:</para>
-
-<screen><userinput>export CLFS_TARGET32="i686-pc-linux-gnu"</userinput></screen>
-
-   <para>To prevent errors when you come back to your build, we will export these
-   variables to prevent any build issues in the future:</para>
-
-<screen><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bash_profile
-echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bash_profile
-echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; ~/.bash_profile</userinput></screen>
-
-</sect1>
Index: OK/cross-tools/64/binutils.xml
===================================================================
--- BOOK/cross-tools/64/binutils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,136 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-binutils" role="wrap">
-  <?dbhtml filename="binutils.html"?>
-
-  <title>Cross Binutils-&binutils-version;</title>
-
-  <indexterm zone="ch-cross-tools-binutils">
-    <primary sortas="a-Binutils">Binutils</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/binutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Cross Binutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='ba'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="ca"><userinput>AR=ar AS=as ../binutils-&binutils-version;/configure --prefix=/cross-tools \
-   --host=${CLFS_HOST} --target=${CLFS_TARGET} --with-lib-path=/tools/lib \
-   --disable-nls --enable-shared --enable-64-bit-bfd --disable-multilib</userinput></screen>
-
-    <variablelist os="bd">
-      <title>The meaning of the configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd1'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd2'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd3'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd4'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd5'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd6'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd7'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../multilib/binutils.xml"
-      xpointer="xpointer(//*[@os='bd8'])"/>
-
- </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bk'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-binutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/64/flags.xml
===================================================================
--- BOOK/cross-tools/64/flags.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para os="a">We will need to setup target specific flags for the compiler
-  and linkers.</para>
-
-<screen os="b"><userinput>export BUILD64="-m64"</userinput></screen>
-
-  <para os="c">Lets add the build flags to <filename>~/.bashrc</filename> to
-  prevent issues if we stop and come back later.</para>
-
-<screen os="d"><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bashrc</userinput></screen>
-
-</sect1>
Index: OK/cross-tools/64/glibc.xml
===================================================================
--- BOOK/cross-tools/64/glibc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,157 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version;</title>
-
-  <indexterm zone="ch-cross-tools-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='de'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD64}" \
-    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
-    ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${CLFS_TARGET} --build=${CLFS_HOST} \
-    --disable-profile --enable-add-ons \
-    --with-tls --enable-kernel=2.6.0 --with-__thread \
-    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-    --cache-file=config.cache</userinput></screen>
-
-    <variablelist os="dg">
-      <title>The meaning of the new configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg1'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../multilib/glibc-64bit.xml"
-      xpointer="xpointer(//*[@os='fa1'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg3'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg4'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg5'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg6'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg7'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg8'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg9'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg10'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='di'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dk'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dn'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/alpha-chapter.xml
===================================================================
--- BOOK/cross-tools/alpha-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-cross-tools" xreflabel="Constructing Cross-Compile Tools">
-  <?dbhtml dir="cross-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Cross-Compile Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/glibc-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/gcc-final.xml"/>
-
-</chapter>
Index: OK/cross-tools/alpha/gcc-final.xml
===================================================================
--- BOOK/cross-tools/alpha/gcc-final.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,129 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-final" role="wrap">
-  <?dbhtml filename="gcc-final.html"?>
-
-  <title>Cross GCC-&gcc-version; - Final</title>
-
-  <indexterm zone="ch-cross-tools-gcc-final">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, final</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC Cross Compiler</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bk'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/alpha/gcc-static.xml
===================================================================
--- BOOK/cross-tools/alpha/gcc-static.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,123 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-static" role="wrap">
-  <?dbhtml filename="gcc-static.html"?>
-
-  <title>Cross GCC-&gcc-version; - Static</title>
-
-  <indexterm zone="ch-cross-tools-gcc-static">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, static</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Cross GCC Compiler with Static libgcc
-    and no Threads</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-<screen os="ah"><userinput>echo "
-#undef STARTFILE_PREFIX_SPEC
-#define STARTFILE_PREFIX_SPEC \"/tools/lib/\"" &gt;&gt; gcc/config/alpha/linux.h</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --host=${CLFS_HOST} --target=${CLFS_TARGET} \
-    --with-local-prefix=/tools --disable-nls --disable-shared \
-    --disable-threads --enable-languages=c</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='am'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='an'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ao'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ap'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aq'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/alpha/glibc-headers.xml
===================================================================
--- BOOK/cross-tools/alpha/glibc-headers.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,166 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-glibc-headers" role="wrap">
-  <?dbhtml filename="glibc-headers.html"?>
-
-  <title>Glibc-&glibc-version; Headers</title>
-
-  <indexterm zone="ch-cross-tools-glibc-headers">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>cross tools, headers</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc Headers</title>
-
-    <para os="s1">The following sed removes a dependency of gcc 3.4.x from
-    the glibc we are using in cross-lfs. The reason we are changing it is
-    because this only installs the headers, no compiling takes place. In the
-    next Glibc installation, we use the GCC that's built right after this section:</para>
-
-<screen os="s2"><userinput>cp -v configure{,.orig}
-sed -e 's/3.4/3.[0-9]/g' configure.orig > configure</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dd'])"/>
-
-<screen os="de"><userinput>echo "libc_cv_forced_unwind=yes" &gt; config.cache
-echo "libc_cv_c_cleanup=yes" &gt;&gt; config.cache
-echo "libc_cv_mlong_double_128=yes" &gt;&gt; config.cache
-echo "libc_cv_alpha_tls=yes" &gt;&gt; config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="s3"><userinput>CC=gcc ../glibc-&glibc-version;/configure --prefix=/tools \
-   --host=${CLFS_TARGET} --build=${CLFS_HOST} \
-   --disable-sanity-checks --enable-kernel=2.6.0 \
-   --with-headers=/tools/include --cache-file=config.cache \
-   --with-binutils=/cross-tools/${CLFS_TARGET}/bin</userinput></screen>
-
-    <note os="e1">
-      <para><emphasis>Any</emphasis> error message you see about nptl at this point
-      can safely be ignored.</para>
-   </note>
-
-    <variablelist os="ca">
-       <title>The meaning of the configure options:</title>
-
-          <varlistentry os="ca1">
-             <term><parameter>CC=gcc</parameter></term>
-             <listitem>
-                <para>Tells Glibc to use the host's GCC compiler.</para>
-             </listitem>
-          </varlistentry>
-
-         <varlistentry os="ca2">
-            <term><parameter>--prefix=/tools</parameter></term>
-            <listitem>
-               <para>This tells the configure script to prepare to install the
- 	          package in the <filename class="directory">/tools</filename>
- 	          directory.</para>
-             </listitem>
-         </varlistentry>
-
-         <varlistentry os="ca3">
-            <term><parameter>--build=${CLFS_HOST}</parameter></term>
-            <listitem>
-               <para>When used with --host, this creates a cross-architecture
-                  executable that creates files for ${CLFS_TARGET} but runs on ${CLFS_HOST}.</para>
-            </listitem>
-        </varlistentry>
-
-        <varlistentry os="ca4">
-           <term><parameter>--host=${CLFS_TARGET}</parameter></term>
-           <listitem>
-               <para>When used with --build, this creates a cross-architecture
-                  executable that creates files for ${CLFS_TARGET} but runs on ${CLFS_HOST}.</para>
-           </listitem>
-        </varlistentry>
-
-       <varlistentry os="ca5">
-          <term><parameter>--disable-sanity-checks</parameter></term>
-          <listitem>
-             <para>This switch disables any checks that are in place.</para>
-           </listitem>
-       </varlistentry>
-
-       <varlistentry os="ca6">
-            <term><parameter>--enable-kernel=2.6.0</parameter></term>
-            <listitem>
-               <para>This tells Glibc to compile the library with support
-               for 2.6.x Linux kernels.</para>
-            </listitem>
-       </varlistentry>
-
-       <varlistentry os="ca7">
-           <term><parameter>--with-headers=/tools/include</parameter></term>
-           <listitem>
-              <para>This tells Glibc to compile itself against the headers
-              recently installed to the <filename class="directory">/tools</filename>
-              directory, so that it knows exactly what features the kernel has
-              and can optimize itself accordingly.</para>
-           </listitem>
-       </varlistentry>
-
-       <varlistentry os="ca8">
-           <term><parameter>--with-binutils=/cross-tools/${CLFS_TARGET}/bin</parameter></term>
-           <listitem>
-              <para>This tells Glibc to use the Binutils for our specific target architecture.</para>
-            </listitem>
-       </varlistentry>
-
-       </variablelist>
-
-   <para os="cb">Now, install the headers:</para>
-
-<screen os="cd"><userinput>make install-headers</userinput></screen>
-
-   <para os="ce">Some files aren't installed by the above command, so
-    we will copy the additional header files we need.</para>
-
-   <para os="cf">First we will copy a common file over to <filename
-   class="directory">/tools/include</filename>:</para>
-
-<screen os="cg"><userinput>install -dv /tools/include/bits
-cp -v bits/stdio_lim.h /tools/include/bits</userinput></screen>
-
-   <para os="ch">Now we will create a blank stub file:</para>
-
-<screen os="ci"><userinput>touch /tools/include/gnu/stubs.h</userinput></screen>
-
-   <para os="cj">Another header is needed for NPTL:</para>
-
-<screen><userinput>cp -v ../glibc-&glibc-version;/nptl/sysdeps/unix/sysv/linux/alpha/bits/pthreadtypes.h \
-    /tools/include/bits/</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/alpha/glibc.xml
===================================================================
--- BOOK/cross-tools/alpha/glibc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,119 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version;</title>
-
-  <indexterm zone="ch-cross-tools-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/alpha/glibc.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/alpha/glibc.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='de'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='df'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='di'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dk'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dn'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/alpha/linux-headers.xml
===================================================================
--- BOOK/cross-tools/alpha/linux-headers.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,57 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-linux-headers" role="wrap">
-  <?dbhtml filename="linux-headers.html"?>
-
-  <title>Linux-Headers-&linux-version;</title>
-
-  <indexterm zone="ch-cross-tools-linux-headers">
-    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/linux-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/alpha/linux-headers.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/alpha/linux-headers.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="c"><userinput>install -dv /tools/include
-make mrproper
-make ARCH=alpha headers_check
-make ARCH=alpha INSTALL_HDR_PATH=dest headers_install
-cp -rv dest/include/* /tools/include</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-linux-headers" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/alpha/variables.xml
===================================================================
--- BOOK/cross-tools/alpha/variables.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,100 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='t1'])"/>
-
-  <bridgehead renderas="sect4">Copy settings to the Environment</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  <table os="g">
-    <title>Processor Type and Target Triplets</title>
-
-    <tgroup cols="2">
-    <?dbfo table-width="5in" ?>
-
-      <colspec colnum="1" colwidth="2.5in" colname="Processor"/>
-      <colspec colnum="2" colwidth="2.5in" colname="Triplet"/>
-
-      <thead>
-        <row>
-          <entry>Processor</entry>
-          <entry>Target Triplet</entry>
-        </row>
-      </thead>
-
-      <tbody>
-        <row>
-          <entry>Unknown</entry>
-          <entry>alpha-unknown-linux-gnu</entry>
-        </row>
-        <row>
-          <entry>EV5 Series</entry>
-          <entry>alphaev5-unknown-linux-gnu</entry>
-        </row>
-        <row>
-          <entry>EV56 Series</entry>
-          <entry>alphaev56-unknown-linux-gnu</entry>
-        </row>
-        <row>
-          <entry>PCA56 Series</entry>
-          <entry>alphapca56-unknown-linux-gnu</entry>
-        </row>
-        <row>
-          <entry>PCA57 Series</entry>
-          <entry>alphapca57-unknown-linux-gnu</entry>
-        </row>
-        <row>
-          <entry>EV6 Series</entry>
-          <entry>alphaev6-unknown-linux-gnu</entry>
-        </row>
-        <row>
-          <entry>EV67 Series</entry>
-          <entry>alphaev67-unknown-linux-gnu</entry>
-        </row>
-        <row>
-          <entry>EV68 Series</entry>
-          <entry>alphaev68-unknown-linux-gnu</entry>
-        </row>
-      </tbody>
-
-    </tgroup>
-
-  </table>
-
-</sect1>
Index: OK/cross-tools/common/binutils.xml
===================================================================
--- BOOK/cross-tools/common/binutils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,160 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-binutils" role="wrap">
-  <?dbhtml filename="binutils.html"?>
-
-  <title>Cross Binutils-&binutils-version;</title>
-
-  <indexterm zone="ch-cross-tools-binutils">
-    <primary sortas="a-Binutils">Binutils</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/binutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Cross Binutils</title>
-
-    <para os="da">It is important that Binutils be compiled before Glibc and
-    GCC because both Glibc and GCC perform various tests on the available
-    linker and assembler to determine which of their own features to
-    enable.</para>
-
-    <para os="ba">To make sure that the proper syntax is used for a couple of
-    tools, apply the following patch:</para>
-
-<screen os="bb"><userinput>patch -Np1 -i ../&binutils-posix-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="bc"><userinput>AR=ar AS=as ../binutils-&binutils-version;/configure --prefix=/cross-tools \
-    --host=${CLFS_HOST} --target=${CLFS_TARGET} --with-lib-path=/tools/lib \
-    --disable-nls --enable-shared --disable-multilib</userinput></screen>
-
-    <variablelist os="bd">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry os="bd1">
-        <term><parameter>--prefix=/cross-tools</parameter></term>
-        <listitem>
-          <para>This tells the configure script to prepare to install the
-          package in the <filename class="directory">/cross-tools</filename>
-          directory.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bd2">
-        <term><parameter>--host=${CLFS_HOST}</parameter></term>
-        <listitem>
-          <para>When used with --target, this creates a cross-architecture
-          executable that creates files for ${CLFS_TARGET} but runs on ${CLFS_HOST}.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bd3">
-        <term><parameter>--target=${CLFS_TARGET}</parameter></term>
-        <listitem>
-          <para>When used with --host, this creates a cross-architecture
-          executable that creates files for ${CLFS_TARGET} but runs on ${CLFS_HOST}.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bd4">
-        <term><parameter>--with-lib-path=/tools/lib</parameter></term>
-        <listitem>
-          <para>This tells the configure script to specify the library
-          search path during the compilation of Binutils, resulting in
-          <filename class="directory">/tools/lib</filename> being passed
-          to the linker. This prevents the linker from searching through
-          library directories on the host.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bd5">
-        <term><parameter>--disable-nls</parameter></term>
-        <listitem>
-          <para>This disables internationalization as i18n is not needed for the
-          cross-compile tools.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bd6">
-        <term><parameter>--enable-shared</parameter></term>
-        <listitem>
-          <para>Enable the creation of the shared libraries.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bd7">
-        <term><parameter>--disable-multilib</parameter></term>
-        <listitem>
-          <para>This option disables the building of a multilib
-          capable Binutils.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="be">Compile the package:</para>
-
-<screen os="bf"><userinput>make configure-host
-make</userinput></screen>
-
-    <variablelist os="bg">
-      <title>The meaning of the make options:</title>
-
-      <varlistentry os="bg1">
-        <term><parameter>configure-host</parameter></term>
-        <listitem>
-          <para>This checks the host environment and makes sure all the
-          necessary tools are available to compile Binutils.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="bh">Install the package:</para>
-
-<screen os="bi"><userinput>make install</userinput></screen>
-
-    <para os="bj">Copy <filename class="headerfile">libiberty.h</filename> to
-    <filename class="directory">/tools/include</filename> directory:</para>
-
-<screen os="bk"><userinput>cp -v ../binutils-&binutils-version;/include/libiberty.h /tools/include</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-binutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/common/cflags.xml
===================================================================
--- BOOK/cross-tools/common/cflags.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-cflags">
-  <?dbhtml filename="cflags.html"?>
-
-  <title>Build CFLAGS</title>
-
-  <para><envar>CFLAGS</envar> and <envar>CXXFLAGS</envar> must not be
-  set during the building of cross-tools.</para>
-
-  <para>To disable <envar>CFLAGS</envar> and <envar>CXXFLAGS</envar>
-  use the following commands:</para>
-
-<screen><userinput>unset CFLAGS
-unset CXXFLAGS</userinput></screen>
-
-  <para>Now add these to <filename>~/.bashrc</filename>, just in
-  case you have to exit and restart building later:</para>
-
-<screen><userinput>echo unset CFLAGS &gt;&gt; ~/.bashrc
-echo unset CXXFLAGS &gt;&gt; ~/.bashrc</userinput></screen>
-
-</sect1>
Index: OK/cross-tools/common/file.xml
===================================================================
--- BOOK/cross-tools/common/file.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,46 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-file">
-  <?dbhtml filename="file.html"?>
-
-  <title>File-&file-version;</title>
-
-  <indexterm zone="ch-cross-tools-file">
-    <primary sortas="a-File">File</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/file.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of File</title>
-
-    <para>Prepare File for compilation:</para>
-
-<screen><userinput>./configure --prefix=/cross-tools</userinput></screen>
-
-    <para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-file" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/common/gcc-final.xml
===================================================================
--- BOOK/cross-tools/common/gcc-final.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,171 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-final" role="wrap">
-  <?dbhtml filename="gcc-final.html"?>
-
-  <title>Cross GCC-&gcc-version; - Final</title>
-
-  <indexterm zone="ch-cross-tools-gcc-final">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, final</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC Cross Compiler</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
-
-    <para os="bd">Finally, disable <option>-B</option> in <filename>configure</filename>,
-    so it doesn't pick up the host's header files:</para>
-
-<screen os="be"><userinput>cp -v configure{,.orig}
-sed -e  '/FLAGS_FOR_TARGET.*\/lib\//s@-B[^ ]*/lib/@@g' configure.orig > \
-    configure</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="bf"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --target=${CLFS_TARGET} --host=${CLFS_HOST} --disable-multilib \
-    --with-local-prefix=/tools --disable-nls --enable-shared \
-    --enable-languages=c,c++ --enable-__cxa_atexit \
-    --enable-c99 --enable-long-long --enable-threads=posix</userinput></screen>
-
-    <variablelist os="bg">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry os="bg1">
-        <term><parameter>--enable-languages=c,c++</parameter></term>
-        <listitem>
-          <para>This option ensures that only the C and C++ compilers are built.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bg2">
-        <term><parameter>--enable-__cxa_atexit</parameter></term>
-        <listitem>
-          <para>This option allows use of __cxa_atexit, rather than atexit,
-          to register C++ destructors for local statics and global objects
-          and is essential for fully standards-compliant handling of destructors.
-          It also affects the C++ ABI and therefore results in C++ shared libraries
-          and C++ programs that are interoperable with other Linux distributions.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bg3">
-        <term><parameter>--enable-c99</parameter></term>
-        <listitem>
-          <para>Enable C99 support for C programs.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bg4">
-        <term><parameter>--enable-long-long</parameter></term>
-        <listitem>
-          <para>Enables long long support in the compiler.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="bg5">
-        <term><parameter>--enable-threads=posix</parameter></term>
-        <listitem>
-          <para>This enables C++ exception handling for multi-threaded code.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="bh">Continue with compiling the package:</para>
-
-<screen os="bi"><userinput>make AS_FOR_TARGET="${CLFS_TARGET}-as" \
-    LD_FOR_TARGET="${CLFS_TARGET}-ld"</userinput></screen>
-
-    <para os="bj">Install the package:</para>
-
-<screen os="bk"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/common/gcc-static.xml
===================================================================
--- BOOK/cross-tools/common/gcc-static.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,142 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-static" role="wrap">
-  <?dbhtml filename="gcc-static.html"?>
-
-  <title>Cross GCC-&gcc-version; - Static</title>
-
-  <indexterm zone="ch-cross-tools-gcc-static">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, static</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Cross GCC Compiler with Static libgcc
-    and no Threads</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <para os="aa">Make a couple of essential adjustments to the specs file
-    to ensure GCC uses our build environment:</para>
-
-<screen os="ab"><userinput>patch -Np1 -i ../&gcc-specs-patch;</userinput></screen>
-
-    <para os="ac">To make sure that a couple of tools use the proper syntax,
-    apply the following patch:</para>
-
-<screen os="ad"><userinput>patch -Np1 -i ../&gcc-posix-patch;</userinput></screen>
-
-    <para os="ae">The following patch ensures that <command>gcc</command> does not
-    search the <filename class="directory">/usr</filename> directory for
-    <filename class="libraryfile">libgcc_s.so</filename> when
-    cross-compiling:</para>
-
-<screen os="af"><userinput>patch -Np1 -i ../&gcc-cross_search-patch;</userinput></screen>
-
-    <para os="ag">Change the StartFile Spec to point to the correct library
-    location:</para>
-
-<screen os="ah"><userinput>echo "
-#undef STARTFILE_PREFIX_SPEC
-#define STARTFILE_PREFIX_SPEC \"/tools/lib/\"" &gt;&gt; gcc/config/linux.h</userinput></screen>
-
-    <para os="ai">Now alter <command>gcc</command>'s c preprocessor's default
-    include search path to use <filename class="directory">/tools</filename> only:</para>
-
-<screen os="aj"><userinput>cp -v gcc/Makefile.in{,.orig}
-sed -e "s@\(^CROSS_SYSTEM_HEADER_DIR =\).*@\1 /tools/include@g" \
-    gcc/Makefile.in.orig > gcc/Makefile.in</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="al"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --host=${CLFS_HOST} --target=${CLFS_TARGET} --disable-multilib \
-    --with-local-prefix=/tools --disable-nls --disable-shared \
-    --disable-threads --enable-languages=c</userinput></screen>
-
-    <variablelist os="am">
-      <title>The meaning of the configure options:</title>
-
-     <varlistentry>
-        <term><parameter>--with-local-prefix=/tools</parameter></term>
-        <listitem>
-          <para>The purpose of this switch is to remove <filename
-          class="directory">/usr/local/include</filename> from
-          <command>gcc</command>'s include search path. This is not
-          absolutely essential, however, it helps to minimize the
-          influence of the host system.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-shared</parameter></term>
-        <listitem>
-          <para>Disables the creation of the shared libraries.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-threads</parameter></term>
-        <listitem>
-          <para>This will prevent GCC from looking for the multi-thread
-          include files, since they haven't been created for this architecture
-          yet. GCC will be able to find the multi-thread information after
-          the Glibc headers are created.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--enable-languages=c</parameter></term>
-        <listitem>
-          <para>This option ensures that only the C compiler is built.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="an">Continue with compiling the package:</para>
-
-<screen os="ao"><userinput>make all-gcc</userinput></screen>
-
-    <para os="ap">Install the package:</para>
-
-<screen os="aq"><userinput>make install-gcc</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/common/glibc.xml
===================================================================
--- BOOK/cross-tools/common/glibc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,199 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version;</title>
-
-  <indexterm zone="ch-cross-tools-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <para os="da">It should be noted that compiling Glibc in any way other than
-    the method suggested in this book puts the stability of the system at
-    risk.</para>
-
-    <para os="db">Disable linking to <filename>libgcc_eh</filename>:</para>
-
-<screen os="dc"><userinput>patch -Np1 -i ../&glibc-libgcc_eh-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <para os="dd">The following lines need to be added to
-    <filename>config.cache</filename> for Glibc to support NPTL:</para>
-
-<screen os="de"><userinput>echo "libc_cv_forced_unwind=yes" &gt; config.cache
-echo "libc_cv_c_cleanup=yes" &gt;&gt; config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc" \
-    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
-    ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${CLFS_TARGET} --build=${CLFS_HOST} \
-    --disable-profile --enable-add-ons \
-    --with-tls --enable-kernel=2.6.0 --with-__thread \
-    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-    --cache-file=config.cache</userinput></screen>
-
-    <variablelist os="dg">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry os="dg1">
-        <term><parameter>BUILD_CC="gcc"</parameter></term>
-        <listitem>
-          <para>This sets Glibc to use the current compiler on our system. This is
-          used to create the tools Glibc uses during its build.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg2">
-        <term><parameter>CC="${CLFS_TARGET}-gcc"</parameter></term>
-        <listitem>
-          <para>This forces Glibc to use the GCC compiler that we made for our target
-          architecture.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg3">
-        <term><parameter>AR="${CLFS_TARGET}-ar"</parameter></term>
-        <listitem>
-          <para>This forces Glibc to use the <command>ar</command> utility
-          we made for our target architecture.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg4">
-        <term><parameter>RANLIB="${CLFS_TARGET}-ranlib"</parameter></term>
-        <listitem>
-          <para>This forces Glibc to use the <command>ranlib</command> utility
-          we made for our target architecture.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg5">
-        <term><parameter>--disable-profile</parameter></term>
-        <listitem>
-          <para>This builds the libraries without profiling information. 
-	  Omit this option if profiling on the temporary tools is necessary.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg6">
-        <term><parameter>--enable-add-ons</parameter></term>
-        <listitem>
-          <para>This tells Glibc to utilize all add-ons that are
-          available.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg7">
-        <term><parameter>--with-tls</parameter></term>
-        <listitem>
-          <para>This tells Glibc to use Thread Local Storage.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg8">
-        <term><parameter>--enable-kernel=2.6.0</parameter></term>
-        <listitem>
-          <para>This tells Glibc to compile the library with support
-          for 2.6.x Linux kernels.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg9">
-        <term><parameter>--with-__thread</parameter></term>
-        <listitem>
-          <para>This tells Glibc to use use the __thread for libc and
-          libpthread builds.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg10">
-        <term><parameter>--with-binutils=/cross-tools/bin</parameter></term>
-        <listitem>
-          <para>This tells Glibc to use the Binutils that are specific to
-          our target architecture.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg11">
-        <term><parameter>--with-headers=/tools/include</parameter></term>
-        <listitem>
-          <para>This tells Glibc to compile itself against the headers
-          recently installed to the <filename class="directory">/tools</filename>
-          directory, so that it knows exactly what features the kernel has
-          and can optimize itself accordingly.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="dg12">
-        <term><parameter>--cache-file=config.cache</parameter></term>
-        <listitem>
-          <para>This tells Glibc to utilize a premade cache file.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="dh">During this stage the following warning might appear:</para>
-
-<blockquote os="di"><screen><computeroutput>configure: WARNING:
-*** These auxiliary programs are missing or
-*** incompatible versions: msgfmt
-*** some features will be disabled.
-*** Check the INSTALL file for required versions.</computeroutput></screen></blockquote>
-
-    <para os="dj">The missing or incompatible <command>msgfmt</command> program is
-    generally harmless. This <command>msgfmt</command> program is part of the
-    Gettext package which the host distribution should provide.</para>
-
-    <para os="dk">Compile the package:</para>
-
-<screen os="dl"><userinput>make</userinput></screen>
-
-    <para os="dm">Install the package:</para>
-
-<screen os="dn"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/common/introduction.xml
===================================================================
--- BOOK/cross-tools/common/introduction.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-introduction">
-  <?dbhtml filename="introduction.html"?>
-
-  <title>Introduction</title>
-
-  <para>This chapter shows you how to create cross platform tools.</para>
-
-  <para>If for some reason you have to stop and come back later, remember
-  to use the <command>su - clfs</command> command, and it will setup the
-  build environment that you left.</para>
-
-  <sect2>
-    <title>Common Notes</title>
-
-    <important>
-      <para>Before issuing the build instructions for a package, the package
-      should be unpacked as user <systemitem class="username">clfs</systemitem>,
-      and a <command>cd</command> into the created directory should be
-      performed. The build instructions assume that the <command>bash</command>
-      shell is in use.</para>
-    </important>
-
-    <para>Several of the packages are patched before compilation, but only
-    when the patch is needed to circumvent a problem. A patch is often needed
-    in both this and the next chapters, but sometimes in only one or the other.
-    Therefore, do not be concerned if instructions for a downloaded patch seem
-    to be missing. Warning messages about <emphasis>offset</emphasis> or
-    <emphasis>fuzz</emphasis> may also be encountered when applying a patch.
-    Do not worry about these warnings, as the patch was still successfully
-    applied.</para>
-
-    <para>During the compilation of most packages, there will be several
-    warnings that scroll by on the screen. These are normal and can safely
-    be ignored. These warnings are as they appear&mdash;warnings about
-    deprecated, but not invalid, use of the C or C++ syntax. C standards
-    change fairly often, and some packages still use the older standard.
-    This is not a problem, but does prompt the warning.</para>
-
-    <important>
-      <para>After installing each package, both in this and the next chapters,
-      delete its source and build directories, unless specifically instructed
-      otherwise. Deleting the sources prevents mis-configuration
-      when the same package is reinstalled later.</para>
-    </important>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/mips-chapter.xml
===================================================================
--- BOOK/cross-tools/mips-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,24 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-cross-tools" xreflabel="Constructing Cross-Compile Tools">
-  <?dbhtml dir="cross-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Cross-Compile Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/gcc-final.xml"/>
-
-</chapter>
Index: OK/cross-tools/mips/gcc-final.xml
===================================================================
--- BOOK/cross-tools/mips/gcc-final.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,130 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-final" role="wrap">
-  <?dbhtml filename="gcc-final.html"?>
-
-  <title>Cross GCC-&gcc-version; - Final</title>
-
-  <indexterm zone="ch-cross-tools-gcc-final">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, final</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC Cross Compiler</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-    <para>Continue with compiling the package:</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bk'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/mips/gcc-static.xml
===================================================================
--- BOOK/cross-tools/mips/gcc-static.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,122 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-static" role="wrap">
-  <?dbhtml filename="gcc-static.html"?>
-
-  <title>Cross GCC-&gcc-version; - Static</title>
-
-  <indexterm zone="ch-cross-tools-gcc-static">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, static</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Cross GCC Compiler with Static libgcc
-    and no Threads</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='al'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='am'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='an'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ao'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ap'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aq'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/mips/glibc.xml
===================================================================
--- BOOK/cross-tools/mips/glibc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,119 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version;</title>
-
-  <indexterm zone="ch-cross-tools-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@os='g1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips/glibc.xml"
-    xpointer="xpointer(//*[@os='g2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='de'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='df'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='di'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dk'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dn'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/mips/linux-headers.xml
===================================================================
--- BOOK/cross-tools/mips/linux-headers.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,49 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-linux-headers" role="wrap">
-  <?dbhtml filename="linux-headers.html"?>
-
-  <title>Linux-Headers-&linux-version;</title>
-
-  <indexterm zone="ch-cross-tools-linux-headers">
-    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/linux-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="c"><userinput>install -dv /tools/include
-make mrproper
-make ARCH=mips headers_check
-make ARCH=mips INSTALL_HDR_PATH=dest headers_install
-cp -rv dest/include/* /tools/include</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-linux-headers" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/mips/variables.xml
===================================================================
--- BOOK/cross-tools/mips/variables.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,43 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <para os="aa">For a MIPS Little Endian Machine:</para>
-
-<screen os="ab"><userinput>export CLFS_TARGET="mipsel-unknown-linux-gnu"</userinput></screen>
-
-    <para os="ac">For a MIPS Big Endian Machine:</para>
-
-<screen os="ad"><userinput>export CLFS_TARGET="mips-unknown-linux-gnu"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: OK/cross-tools/mips64-64-chapter.xml
===================================================================
--- BOOK/cross-tools/mips64-64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-cross-tools" xreflabel="Constructing Cross-Compile Tools">
-  <?dbhtml dir="cross-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Cross-Compile Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/gcc-final.xml"/>
-
-</chapter>
Index: OK/cross-tools/mips64-64/flags.xml
===================================================================
--- BOOK/cross-tools/mips64-64/flags.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,27 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-   href="../64/flags.xml"
-   xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>export BUILD64="-mabi=64"</userinput></screen>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-   href="../64/flags.xml"
-   xpointer="xpointer(//*[@os='c'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-   href="../64/flags.xml"
-   xpointer="xpointer(//*[@os='d'])"/>
-
-</sect1>
Index: OK/cross-tools/mips64-64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/mips64-64/gcc-final.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,159 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-final" role="wrap">
-  <?dbhtml filename="gcc-final.html"?>
-
-  <title>Cross GCC-&gcc-version; - Final</title>
-
-  <indexterm zone="ch-cross-tools-gcc-final">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, final</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC Cross Compiler</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="bf" ><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --target=${CLFS_TARGET} --host=${CLFS_HOST} --with-abi=64 \
-    --with-local-prefix=/tools --disable-nls --enable-shared \
-    --enable-languages=c,c++ --enable-__cxa_atexit --disable-multilib \
-    --enable-c99 --enable-long-long --enable-threads=posix</userinput></screen>
-
-    <variablelist os="bg">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--with-abi=64</parameter></term>
-        <listitem>
-          <para>This option do ...</para>
-        </listitem>
-      </varlistentry>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/gcc-final.xml"
-      xpointer="xpointer(//*[@os='bg1'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/gcc-final.xml"
-      xpointer="xpointer(//*[@os='bg2'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/gcc-final.xml"
-      xpointer="xpointer(//*[@os='bg3'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/gcc-final.xml"
-      xpointer="xpointer(//*[@os='bg4'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/gcc-final.xml"
-      xpointer="xpointer(//*[@os='bg5'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bk'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/mips64-64/gcc-static.xml
===================================================================
--- BOOK/cross-tools/mips64-64/gcc-static.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,123 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-static" role="wrap">
-  <?dbhtml filename="gcc-static.html"?>
-
-  <title>Cross GCC-&gcc-version; - Static</title>
-
-  <indexterm zone="ch-cross-tools-gcc-static">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, static</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Cross GCC Compiler with Static libgcc
-    and no Threads</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="al"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --host=${CLFS_HOST} --target=${CLFS_TARGET} --disable-mutlilib \
-    --with-local-prefix=/tools --disable-nls --disable-shared \
-    --disable-threads --enable-languages=c --with-abi=64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='am'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='an'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ao'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ap'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aq'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/mips64-64/glibc.xml
===================================================================
--- BOOK/cross-tools/mips64-64/glibc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,127 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version;</title>
-
-  <indexterm zone="ch-cross-tools-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='g1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='g2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips64/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='m3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips64/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='m4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='de'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/glibc.xml"
-    xpointer="xpointer(//*[@os='df'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/glibc.xml"
-    xpointer="xpointer(//*[@os='dg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='di'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dk'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dn'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/mips64-64/variables.xml
===================================================================
--- BOOK/cross-tools/mips64-64/variables.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,51 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/variables.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/variables.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/variables.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/variables.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: OK/cross-tools/mips64-chapter.xml
===================================================================
--- BOOK/cross-tools/mips64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,27 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-cross-tools" xreflabel="Constructing Cross-Compile Tools">
-  <?dbhtml dir="cross-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Cross-Compile Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/glibc-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/glibc-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/gcc-final.xml"/>
-
-</chapter>
Index: OK/cross-tools/mips64/flags.xml
===================================================================
--- BOOK/cross-tools/mips64/flags.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,29 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-     href="../multilib/flags.xml"
-     xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>export BUILD32="-mabi=32"
-export BUILDN32="-mabi=n32"
-export BUILD64="-mabi=64"</userinput></screen>
-
-     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-     href="../multilib/flags.xml"
-     xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bashrc
-echo export BUILDN32=\""${BUILDN32}\"" &gt;&gt; ~/.bashrc
-echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bashrc</userinput></screen>
-
-</sect1>
Index: OK/cross-tools/mips64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/mips64/gcc-final.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,137 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-final" role="wrap">
-  <?dbhtml filename="gcc-final.html"?>
-
-  <title>Cross GCC-&gcc-version; - Final</title>
-
-  <indexterm zone="ch-cross-tools-gcc-final">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, final</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC Cross Compiler</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc-final.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bk'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/mips64/gcc-static.xml
===================================================================
--- BOOK/cross-tools/mips64/gcc-static.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,122 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-static" role="wrap">
-  <?dbhtml filename="gcc-static.html"?>
-
-  <title>Cross GCC-&gcc-version; - Static</title>
-
-  <indexterm zone="ch-cross-tools-gcc-static">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, static</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Cross GCC Compiler with Static libgcc
-    and no Threads</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='al'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='am'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='an'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ao'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ap'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aq'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/mips64/glibc-64bit.xml
===================================================================
--- BOOK/cross-tools/mips64/glibc-64bit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,135 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-glibc-64" role="wrap">
-  <?dbhtml filename="glibc-64.html"?>
-
-  <title>Glibc-&glibc-version; 64-Bit</title>
-
-  <indexterm zone="ch-cross-tools-glibc-64">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>cross tools, 64 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='g1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='g2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips64/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='m3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips64/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='m4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='dd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='de'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='n1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='n2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='df'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='dg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='dh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='di'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='dj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='dk'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='dl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='dm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='dn'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/mips64/glibc-n32.xml
===================================================================
--- BOOK/cross-tools/mips64/glibc-n32.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,153 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-glibc-n32" role="wrap">
-  <?dbhtml filename="glibc-n32.html"?>
-
-  <title>Glibc-&glibc-version; N32</title>
-
-  <indexterm zone="ch-cross-tools-glibc-n32">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>cross tools, N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='g1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='g2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips64/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='m3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/mips64/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='m4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='dd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='de'])"/>
-
-    <para os="n1">Tell Glibc to install its 32-bit libraries into <filename
-    class="directory">/tools/lib32</filename>:</para>
-
-<screen os="n2"><userinput>echo "slibdir=/tools/lib32" &gt;&gt; configparms</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILDN32}" \
-    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
-    ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${CLFS_TARGET} --build=${CLFS_HOST} --libdir=/tools/lib32 \
-    --disable-profile --enable-add-ons \
-    --with-tls --enable-kernel=2.6.0 --with-__thread \
-    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-    --cache-file=config.cache</userinput></screen>
-
-    <variablelist os="fa">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry os="fa1">
-        <term><parameter>CC="${CLFS_TARGET}-gcc ${BUILDN32}"</parameter></term>
-        <listitem>
-          <para>Forces Glibc to utilize our target architecture GCC utilizing
-          the N32 flags.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--libdir=/tools/lib32</parameter></term>
-        <listitem>
-          <para>Installs Glibc into /tools/lib32 instead of /tools/lib.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='dh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='di'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='dj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='dk'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='dl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='dm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='dn'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/mips64/glibc.xml
===================================================================
--- BOOK/cross-tools/mips64/glibc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,119 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version; 32 Bit</title>
-
-  <indexterm zone="ch-cross-tools-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>cross tools, 32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='g1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='g2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='de'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='df'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='dg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='di'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dk'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dn'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/mips64/variables.xml
===================================================================
--- BOOK/cross-tools/mips64/variables.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/variables.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-<screen os="ab"><userinput>export CLFS_TARGET="mips64el-unknown-linux-gnu"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/variables.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-<screen os="ad"><userinput>export CLFS_TARGET="mips64-unknown-linux-gnu"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-<screen os="m2"><userinput>export CLFS_TARGET32="$(echo ${CLFS_TARGET}| sed -e 's/64//g')"</userinput></screen>
-
-  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: OK/cross-tools/multilib/binutils.xml
===================================================================
--- BOOK/cross-tools/multilib/binutils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,143 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-binutils" role="wrap">
-  <?dbhtml filename="binutils.html"?>
-
-  <title>Cross Binutils-&binutils-version;</title>
-
-  <indexterm zone="ch-cross-tools-binutils">
-    <primary sortas="a-Binutils">Binutils</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/binutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Cross Binutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='ba'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/multilib/binutils.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/multilib/binutils.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="bc"><userinput>AR=ar AS=as ../binutils-&binutils-version;/configure --prefix=/cross-tools \
-   --host=${CLFS_HOST} --target=${CLFS_TARGET} --with-lib-path=/tools/lib \
-   --disable-nls --enable-shared --enable-64-bit-bfd</userinput></screen>
-
-    <variablelist os="bd">
-      <title>The meaning of the configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd1'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd2'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd3'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd4'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd5'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/binutils.xml"
-      xpointer="xpointer(//*[@os='bd6'])"/>
-
-      <varlistentry os="bd8">
-        <term><parameter>--enable-64-bit-bfd</parameter></term>
-        <listitem>
-          <para>This adds 64 bit support to Binutils.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bk'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-binutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/multilib/flags.xml
===================================================================
--- BOOK/cross-tools/multilib/flags.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-flags">
-  <?dbhtml filename="flags.html"?>
-
-  <title>Build Flags</title>
-
-  <para os="a">We will need to setup target specific flags for the compiler
-  and linker:</para>
-
-<screen os="b"><userinput>export BUILD32="-m32"
-export BUILD64="-m64"</userinput></screen>
-
-  <para os="c">Let's add the build flags to <filename>~/.bashrc</filename> to
-  prevent issues if we stop and come back later:</para>
-
-<screen os="d"><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bashrc
-echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bashrc</userinput></screen>
-
-</sect1>
Index: OK/cross-tools/multilib/glibc-64bit.xml
===================================================================
--- BOOK/cross-tools/multilib/glibc-64bit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,137 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-glibc-64" role="wrap">
-  <?dbhtml filename="glibc-64.html"?>
-
-  <title>Glibc-&glibc-version; 64-Bit</title>
-
-  <indexterm zone="ch-cross-tools-glibc-64">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>cross tools, 64 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='dd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='de'])"/>
-
-    <para os="n1">Tell Glibc to install its 64-bit libraries into <filename
-    class="directory">/tools/lib64</filename>:</para>
-
-<screen os="n2"><userinput>echo "slibdir=/tools/lib64" &gt;&gt; configparms</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD64}" \
-    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
-    ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${CLFS_TARGET} --build=${CLFS_HOST} --libdir=/tools/lib64 \
-    --disable-profile --enable-add-ons \
-    --with-tls --enable-kernel=2.6.0 --with-__thread \
-    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-    --cache-file=config.cache</userinput></screen>
-
-    <variablelist os="dg">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry os="fa1">
-        <term><parameter>CC="${CLFS_TARGET}-gcc ${BUILD64}"</parameter></term>
-        <listitem>
-          <para>Forces Glibc to build using our target architecture GCC
-          utilizing the 64 Bit flags.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="fa2">
-        <term><parameter>--libdir=/tools/lib64</parameter></term>
-        <listitem>
-          <para>Puts Glibc into /tools/lib64 instead of /tools/lib.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='dh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='di'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='dj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='dk'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='dl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='dm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='dn'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/multilib/glibc.xml
===================================================================
--- BOOK/cross-tools/multilib/glibc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,161 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version; 32 Bit</title>
-
-  <indexterm zone="ch-cross-tools-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>cross tools, 32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='de'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD32}" \
-    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
-    ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${CLFS_TARGET32} --build=${CLFS_HOST} \
-    --disable-profile --enable-add-ons \
-    --with-tls --enable-kernel=2.6.0 --with-__thread \
-    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-    --cache-file=config.cache</userinput></screen>
-
-    <variablelist os="dg">
-      <title>The meaning of the new configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg1'])"/>
-
-      <varlistentry os="ea1">
-        <term><parameter>CC="${CLFS_TARGET}-gcc ${BUILD32}"</parameter></term>
-        <listitem>
-          <para>Forces Glibc to utilize our target architecture GCC utilizing
-          the 32 Bit flags.</para>
-        </listitem>
-      </varlistentry>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg3'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg4'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg5'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg6'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg7'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg8'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg9'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg10'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='di'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dk'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dn'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/ppc-chapter.xml
===================================================================
--- BOOK/cross-tools/ppc-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,24 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-cross-tools" xreflabel="Constructing Cross-Compile Tools">
-  <?dbhtml dir="cross-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Cross-Compile Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/gcc-final.xml"/>
-
-</chapter>
Index: OK/cross-tools/ppc/gcc-final.xml
===================================================================
--- BOOK/cross-tools/ppc/gcc-final.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,129 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-final" role="wrap">
-  <?dbhtml filename="gcc-final.html"?>
-
-  <title>Cross GCC-&gcc-version; - Final</title>
-
-  <indexterm zone="ch-cross-tools-gcc-final">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, final</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC Cross Compiler</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bk'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/ppc/gcc-static.xml
===================================================================
--- BOOK/cross-tools/ppc/gcc-static.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,122 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-static" role="wrap">
-  <?dbhtml filename="gcc-static.html"?>
-
-  <title>Cross GCC-&gcc-version; - Static</title>
-
-  <indexterm zone="ch-cross-tools-gcc-static">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, static</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Cross GCC Compiler with Static libgcc
-    and no Threads</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-<screen os="ah"><userinput>echo "
-#undef STARTFILE_PREFIX_SPEC
-#define STARTFILE_PREFIX_SPEC \"/tools/lib/\"" &gt;&gt; gcc/config/rs6000/linux.h</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='al'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='am'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='an'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ao'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ap'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aq'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/ppc/glibc.xml
===================================================================
--- BOOK/cross-tools/ppc/glibc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,119 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version;</title>
-
-  <indexterm zone="ch-cross-tools-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dd'])"/>
-
-<screen os="de"><userinput>echo "libc_cv_forced_unwind=yes" &gt; config.cache
-echo "libc_cv_c_cleanup=yes" &gt;&gt; config.cache
-echo "libc_cv_ppc_machine=yes" &gt;&gt; config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='df'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='di'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dk'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dn'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/ppc/linux-headers.xml
===================================================================
--- BOOK/cross-tools/ppc/linux-headers.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,49 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-linux-headers" role="wrap">
-  <?dbhtml filename="linux-headers.html"?>
-
-  <title>Linux-Headers-&linux-version;</title>
-
-  <indexterm zone="ch-cross-tools-linux-headers">
-    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/linux-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="c"><userinput>install -dv /tools/include
-make mrproper
-make ARCH=powerpc headers_check
-make ARCH=powerpc INSTALL_HDR_PATH=dest headers_install
-cp -rv dest/include/* /tools/include</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-linux-headers" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/ppc/variables.xml
===================================================================
--- BOOK/cross-tools/ppc/variables.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>export CLFS_TARGET="powerpc-unknown-linux-gnu"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: OK/cross-tools/ppc64-chapter.xml
===================================================================
--- BOOK/cross-tools/ppc64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-cross-tools" xreflabel="Constructing Cross-Compile Tools">
-  <?dbhtml dir="cross-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Cross-Compile Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/glibc-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/gcc-final.xml"/>
-
-</chapter>
Index: OK/cross-tools/ppc64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/ppc64/gcc-final.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,137 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-final" role="wrap">
-  <?dbhtml filename="gcc-final.html"?>
-
-  <title>Cross GCC-&gcc-version; - Final</title>
-
-  <indexterm zone="ch-cross-tools-gcc-final">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, final</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC Cross Compiler</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc-final.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bk'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/ppc64/gcc-static.xml
===================================================================
--- BOOK/cross-tools/ppc64/gcc-static.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,123 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-static" role="wrap">
-  <?dbhtml filename="gcc-static.html"?>
-
-  <title>Cross GCC-&gcc-version; - Static</title>
-
-  <indexterm zone="ch-cross-tools-gcc-static">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, static</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Cross GCC Compiler with Static libgcc
-    and no Threads</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-<screen os="ah"><userinput>echo "
-#undef STARTFILE_PREFIX_SPEC
-#define STARTFILE_PREFIX_SPEC \"/tools/lib/\"" &gt;&gt; gcc/config/rs6000/linux.h
-echo "
-#undef STARTFILE_PREFIX_SPEC
-#define STARTFILE_PREFIX_SPEC \"/tools/lib/\"" &gt;&gt; gcc/config/rs6000/linux64.h</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='al'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='am'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='an'])"/>
-
-<screen><userinput>make all-gcc</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ap'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aq'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/ppc64/glibc-64bit.xml
===================================================================
--- BOOK/cross-tools/ppc64/glibc-64bit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,127 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-glibc-64" role="wrap">
-  <?dbhtml filename="glibc-64.html"?>
-
-  <title>Glibc-&glibc-version; 64-Bit</title>
-
-  <indexterm zone="ch-cross-tools-glibc-64">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>cross tools, 64 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='de'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='n1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='n2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='df'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='dg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='di'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dk'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dn'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/ppc64/glibc.xml
===================================================================
--- BOOK/cross-tools/ppc64/glibc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,152 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version; 32 Bit</title>
-
-  <indexterm zone="ch-cross-tools-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>cross tools, 32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='de'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='df'])"/>
-
-    <variablelist os="dg">
-      <title>The meaning of the new configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg3'])"/>
-   
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg4'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg5'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg6'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg7'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg8'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg9'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg10'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='di'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dk'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dn'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/ppc64/variables.xml
===================================================================
--- BOOK/cross-tools/ppc64/variables.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,43 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>export CLFS_TARGET="powerpc64-unknown-linux-gnu"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-<screen os="m2"><userinput>export CLFS_TARGET32="powerpc-unknown-linux-gnu"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: OK/cross-tools/sparc-chapter.xml
===================================================================
--- BOOK/cross-tools/sparc-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,24 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-cross-tools" xreflabel="Constructing Cross-Compile Tools">
-  <?dbhtml dir="cross-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Cross-Compile Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/gcc-final.xml"/>
-
-</chapter>
Index: OK/cross-tools/sparc/gcc-final.xml
===================================================================
--- BOOK/cross-tools/sparc/gcc-final.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,137 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-final" role="wrap">
-  <?dbhtml filename="gcc-final.html"?>
-
-  <title>Cross GCC-&gcc-version; - Final</title>
-
-  <indexterm zone="ch-cross-tools-gcc-final">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, final</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC Cross Compiler</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bk'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/sparc/gcc-static.xml
===================================================================
--- BOOK/cross-tools/sparc/gcc-static.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,122 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-static" role="wrap">
-  <?dbhtml filename="gcc-static.html"?>
-
-  <title>Cross GCC-&gcc-version; - Static</title>
-
-  <indexterm zone="ch-cross-tools-gcc-static">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, static</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Cross GCC Compiler with Static libgcc
-    and no Threads</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-<screen os="ah"><userinput>echo "
-#undef STARTFILE_PREFIX_SPEC
-#define STARTFILE_PREFIX_SPEC \"/tools/lib/\"" &gt;&gt; gcc/config/sparc/linux.h</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='al'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='am'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='an'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ao'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ap'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aq'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/sparc/glibc.xml
===================================================================
--- BOOK/cross-tools/sparc/glibc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,111 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version;</title>
-
-  <indexterm zone="ch-cross-tools-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>cross tools, 32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='de'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='df'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='di'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dk'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dn'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/sparc/linux-headers.xml
===================================================================
--- BOOK/cross-tools/sparc/linux-headers.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,49 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-linux-headers" role="wrap">
-  <?dbhtml filename="linux-headers.html"?>
-
-  <title>Linux-Headers-&linux-version;</title>
-
-  <indexterm zone="ch-cross-tools-linux-headers">
-    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/linux-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="c"><userinput>install -dv /tools/include
-make mrproper
-make ARCH=sparc headers_check
-make ARCH=sparc INSTALL_HDR_PATH=dest headers_install
-cp -rv dest/include/* /tools/include</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-linux-headers" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/sparc/variables.xml
===================================================================
--- BOOK/cross-tools/sparc/variables.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>export CLFS_TARGET="sparc-unknown-linux-gnu"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: OK/cross-tools/sparc64-64-chapter.xml
===================================================================
--- BOOK/cross-tools/sparc64-64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-cross-tools" xreflabel="Constructing Cross-Compile Tools">
-  <?dbhtml dir="cross-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Cross-Compile Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/gcc-final.xml"/>
-
-</chapter>
Index: OK/cross-tools/sparc64-64/flags.xml
===================================================================
--- BOOK/cross-tools/sparc64-64/flags.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,66 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-flags">
-  <title>Build Flags</title>
-  <?dbhtml filename="flags.html"?>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-   href="../64/flags.xml"
-   xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>export BUILD64="<replaceable>[BUILD64 entries]</replaceable>"
-export GCCTARGET="<replaceable>[GCCTARGET entries]</replaceable>"</userinput></screen>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-   href="../64/flags.xml"
-   xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bashrc
-echo export GCCTARGET=\""${GCCTARGET}\"" &gt;&gt; ~/.bashrc</userinput></screen>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-   href="../sparc64/flags.xml"
-   xpointer="xpointer(//*[@os='e'])"/>
-
-  <table os="f">
-    <title>List of architectures, target triplets, and recommended book</title>
-    <?dbfo table-width="7in" ?>
-
-    <tgroup cols="3">
-
-      <colspec colnum="1" colwidth="1in"   colname="Processor"/>
-      <colspec colnum="2" colwidth="3.2in" colname="Build64"/>
-      <colspec colnum="3" colwidth="2.8in" colname="GCC"/>
-
-      <thead>
-        <row>
-          <entry>Processor</entry>
-          <entry>BUILD64</entry>
-          <entry>GCCTARGET</entry>
-        </row>
-      </thead>
-
-      <tbody>
-        <row>
-          <entry>Ultrasparc and Ultrasparc2</entry>
-          <entry>-m64 -mcpu=ultrasparc -mtune=ultrasparc</entry>
-          <entry>-mcpu=ultrasparc -mtune=ultrasparc</entry>
-        </row>
-        <row>
-          <entry>Ultrasparc3</entry>
-          <entry>-m64 -mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
-          <entry>-mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
-        </row>
-      </tbody>
-
-    </tgroup>
-
-  </table>
-
-</sect1>
-
Index: OK/cross-tools/sparc64-64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/sparc64-64/gcc-final.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,129 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-final" role="wrap">
-  <?dbhtml filename="gcc-final.html"?>
-
-  <title>Cross GCC-&gcc-version; - Final</title>
-
-  <indexterm zone="ch-cross-tools-gcc-final">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, final</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC Cross Compiler</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bk'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/sparc64-64/gcc-static.xml
===================================================================
--- BOOK/cross-tools/sparc64-64/gcc-static.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,120 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-static" role="wrap">
-  <?dbhtml filename="gcc-static.html"?>
-
-  <title>Cross GCC-&gcc-version; - Static</title>
-
-  <indexterm zone="ch-cross-tools-gcc-static">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, static</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Cross GCC Compiler with Static libgcc
-    and no Threads</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='al'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='am'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='an'])"/>
-
-<screen><userinput>make CFLAGS_FOR_TARGET="${GCCTARGET}" all-gcc</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ap'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aq'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/sparc64-64/glibc.xml
===================================================================
--- BOOK/cross-tools/sparc64-64/glibc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,117 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version;</title>
-
-  <indexterm zone="ch-cross-tools-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc64/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='de'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/glibc.xml"
-    xpointer="xpointer(//*[@os='df'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='dg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='di'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dk'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dn'])"/>
-
-    <para os="do">The stubs.h header installed by glibc looks for stubs-32.h
-    and stubs-64.h. This configuration of glibc only generates stubs-64.h. Fix
-    this with the following:</para>
-
-    <screen os="dp"><userinput>mv -v /tools/include/gnu/stubs{-64,}.h</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/sparc64-64/variables.xml
===================================================================
--- BOOK/cross-tools/sparc64-64/variables.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc64/variables.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: OK/cross-tools/sparc64-chapter.xml
===================================================================
--- BOOK/cross-tools/sparc64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-cross-tools" xreflabel="Constructing Cross-Compile Tools">
-  <?dbhtml dir="cross-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Cross-Compile Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/glibc-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/gcc-final.xml"/>
-
-</chapter>
Index: OK/cross-tools/sparc64/flags.xml
===================================================================
--- BOOK/cross-tools/sparc64/flags.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,72 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-flags">
-  <title>Build Flags</title>
-  <?dbhtml filename="flags.html"?>
-
-  <para os="a">We will need to setup target specific flags for the compiler
-  and linkers. You can choose the appropriate BUILD32 and BUILD64
-  from the table at the bottom of the page.</para>
-
-<screen os="b"><userinput>export BUILD32="<replaceable>[BUILD32 entries]</replaceable>"
-export BUILD64="<replaceable>[BUILD64 entries]</replaceable>"
-export GCCTARGET="<replaceable>[GCCTARGET entries]</replaceable>"</userinput></screen>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-   href="../multilib/flags.xml"
-   xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>echo export BUILD32=\""${BUILD32}\"" &gt;&gt; ~/.bashrc
-echo export BUILD64=\""${BUILD64}\"" &gt;&gt; ~/.bashrc
-echo export GCCTARGET=\""${GCCTARGET}\"" &gt;&gt; ~/.bashrc</userinput></screen>
-
-  <para os="e">The following table gives the entires for different Sparc 64 capable
-  processors. Pick the processor that matches your system. Note: GCC settings are
-  only needed in the early sections of the book, and will not be used in the final-system
-  builds.</para>
-
-  <table os="f">
-    <title>List of 32-Bit settings, 64-Bit Build settings, and GCC setting</title>
-    <?dbfo table-width="7in" ?>
-
-    <tgroup cols="4">
-
-      <colspec colnum="1" colwidth="1in" colname="Processor"/>
-      <colspec colnum="2" colwidth="2in" colname="Build32"/>
-      <colspec colnum="3" colwidth="2in" colname="Build64"/>
-      <colspec colnum="4" colwidth="2in" colname="GCC"/>
-
-      <thead>
-        <row>
-          <entry>Processor</entry>
-          <entry>BUILD32</entry>
-          <entry>BUILD64</entry>
-          <entry>GCCTARGET</entry>
-        </row>
-      </thead>
-
-      <tbody>
-        <row>
-          <entry>Ultrasparc and Ultrasparc2</entry>
-          <entry>-m32 -mcpu=ultrasparc -mtune=ultrasparc</entry>
-          <entry>-m64 -mcpu=ultrasparc -mtune=ultrasparc</entry>
-          <entry>-mcpu=ultrasparc -mtune=ultrasparc</entry>
-        </row>
-        <row>
-          <entry>Ultrasparc3</entry>
-          <entry>-m32 -mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
-          <entry>-m64 -mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
-          <entry>-mcpu=ultrasparc3 -mtune=ultrasparc3</entry>
-        </row>
-      </tbody>
-
-    </tgroup>
-
-  </table>
-
-</sect1>
Index: OK/cross-tools/sparc64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/sparc64/gcc-final.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,137 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-final" role="wrap">
-  <?dbhtml filename="gcc-final.html"?>
-
-  <title>Cross GCC-&gcc-version; - Final</title>
-
-  <indexterm zone="ch-cross-tools-gcc-final">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, final</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC Cross Compiler</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc-final.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bk'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/sparc64/gcc-static.xml
===================================================================
--- BOOK/cross-tools/sparc64/gcc-static.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,123 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-static" role="wrap">
-  <?dbhtml filename="gcc-static.html"?>
-
-  <title>Cross GCC-&gcc-version; - Static</title>
-
-  <indexterm zone="ch-cross-tools-gcc-static">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, static</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Cross GCC Compiler with Static libgcc
-    and no Threads</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-<screen os="ah"><userinput>echo "
-#undef STARTFILE_PREFIX_SPEC
-#define STARTFILE_PREFIX_SPEC \"/tools/lib/\"" &gt;&gt; gcc/config/sparc/linux.h
-echo "
-#undef STARTFILE_PREFIX_SPEC
-#define STARTFILE_PREFIX_SPEC \"/tools/lib/\"" &gt;&gt; gcc/config/sparc/linux64.h</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='al'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='am'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='an'])"/>
-
-<screen><userinput>make CFLAGS_FOR_TARGET="${GCCTARGET}" all-gcc</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ap'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aq'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/sparc64/glibc-64bit.xml
===================================================================
--- BOOK/cross-tools/sparc64/glibc-64bit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,119 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-glibc-64" role="wrap">
-  <?dbhtml filename="glibc-64.html"?>
-
-  <title>Glibc-&glibc-version; 64-Bit</title>
-
-  <indexterm zone="ch-cross-tools-glibc-64">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>cross tools, 64 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dd'])"/>
-
-<screen os="de"><userinput>echo "libc_cv_forced_unwind=yes" &gt; config.cache
-echo "libc_cv_c_cleanup=yes" &gt;&gt; config.cache
-echo "libc_cv_sparc64_tls=yes" &gt;&gt; config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='n1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='n2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='df'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='dg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='di'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dk'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dn'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/sparc64/glibc.xml
===================================================================
--- BOOK/cross-tools/sparc64/glibc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,161 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version; 32 Bit</title>
-
-  <indexterm zone="ch-cross-tools-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>cross tools, 32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='de'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD32}" \
-    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
-    ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${CLFS_TARGET32} --build=${CLFS_HOST} \
-    --disable-profile --enable-add-ons \
-    --with-tls --enable-kernel=2.6.0 --with-__thread \
-    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-    --cache-file=config.cache</userinput></screen>
-
-    <variablelist os="dg">
-      <title>The meaning of the new configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg1'])"/>
-
-      <varlistentry os="ea1">
-        <term><parameter>CC="${CLFS_TARGET}-gcc ${BUILD32}"</parameter></term>
-        <listitem>
-          <para>Forces Glibc to utilize our target architecture GCC utilizing
-          the 32 Bit flags.</para>
-        </listitem>
-      </varlistentry>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg3'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg4'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg5'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg6'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg7'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg8'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg9'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg10'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='di'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dk'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dn'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/sparc64/linux-headers.xml
===================================================================
--- BOOK/cross-tools/sparc64/linux-headers.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,57 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-linux-headers" role="wrap">
-  <?dbhtml filename="linux-headers.html"?>
-
-  <title>Linux-Headers-&linux-version;</title>
-
-  <indexterm zone="ch-cross-tools-linux-headers">
-    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/linux-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc64/linux-headers.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/sparc64/linux-headers.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="c"><userinput>install -dv /tools/include
-make mrproper
-make ARCH=sparc64 headers_check
-make ARCH=sparc64 INSTALL_HDR_PATH=dest headers_install
-cp -rv dest/include/* /tools/include</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-linux-headers" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/sparc64/variables.xml
===================================================================
--- BOOK/cross-tools/sparc64/variables.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>export CLFS_TARGET="sparc64-unknown-linux-gnu"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-<screen os="m2"><userinput>export CLFS_TARGET32="sparcv9-unknown-linux-gnu"</userinput></screen>
-
-  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: OK/cross-tools/x86-chapter.xml
===================================================================
--- BOOK/cross-tools/x86-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,24 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-cross-tools" xreflabel="Constructing Cross-Compile Tools">
-  <?dbhtml dir="cross-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Cross-Compile Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc-final.xml"/>
-
-</chapter>
Index: OK/cross-tools/x86/glibc.xml
===================================================================
--- BOOK/cross-tools/x86/glibc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,182 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version;</title>
-
-  <indexterm zone="ch-cross-tools-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(//*[@os='ap1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/x86/glibc.xml"
-    xpointer="xpointer(//*[@os='ap2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='de'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc" \
-    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
-    CFLAGS="-march=$(cut -d- -f1 &lt;&lt;&lt; $CLFS_TARGET) -mtune=generic -g -O2" \
-    ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${CLFS_TARGET} --build=${CLFS_HOST} \
-    --disable-profile --enable-add-ons \
-    --with-tls --enable-kernel=2.6.0 --with-__thread \
-    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-    --cache-file=config.cache</userinput></screen>
-
-    <variablelist os="dg">
-      <title>The meaning of the new configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg1'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg2'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg3'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg4'])"/>
-
-      <varlistentry os="ea2">
-        <term><parameter>CFLAGS="-march=$(cut -d- -f1 &lt;&lt;&lt;
-        $CLFS_TARGET) -mtune=generic -g -O2"</parameter></term>
-        <listitem>
-          <para>Forces Glibc to optimize for our target system.</para>
-        </listitem>
-      </varlistentry>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg5'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg6'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg7'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg8'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg9'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg10'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg11'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg12'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='di'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dk'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dn'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/x86/linux-headers.xml
===================================================================
--- BOOK/cross-tools/x86/linux-headers.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,49 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-linux-headers" role="wrap">
-  <?dbhtml filename="linux-headers.html"?>
-
-  <title>Linux-Headers-&linux-version;</title>
-
-  <indexterm zone="ch-cross-tools-linux-headers">
-    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/linux-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="c"><userinput>install -dv /tools/include
-make mrproper
-make ARCH=i386 headers_check
-make ARCH=i386 INSTALL_HDR_PATH=dest headers_install
-cp -rv dest/include/* /tools/include</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-linux-headers" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/x86/variables.xml
===================================================================
--- BOOK/cross-tools/x86/variables.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,86 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-  <para os="a">During the building of the cross-compile tools you will need to
-  set a few variables that will be dependent on your particular needs.
-  The first variable will be the triplet of the host machine, which will be
-  put into the <envar>CLFS_HOST</envar> variable. To account for the
-  possibility that the host and target are the same arch, as cross-compiling
-  won't work when host and target are the same, part of the triplet needs to
-  be changed slightly to add "cross". Set <envar>CLFS_HOST</envar> using the
-  following command:</para>
-
-<screen os="b"><userinput>export CLFS_HOST="$(echo $MACHTYPE | \
-    sed "s/$(echo $MACHTYPE | cut -d- -f2)/cross/")"</userinput></screen>
-
-  <para os="c">Now you will need to set the triplet for the target
-  architecture. Set the target variable using the following command:</para>
-
-<screen os="d"><userinput>export CLFS_TARGET="[target triplet]"</userinput></screen>
-
-  <para os="t1">Replace [target triplet] with the appropriate machine triplet
-  using the table at the bottom of the page.</para>
-
-  <bridgehead renderas="sect4">Copy settings to the Environment</bridgehead>
-
-  <para os="e">Now add these to <filename>~/.bashrc</filename>, just in
-  case you have to exit and restart building later:</para>
-
-<screen os="f"><userinput>echo export CLFS_HOST=\""${CLFS_HOST}\"" &gt;&gt; ~/.bashrc
-echo export CLFS_TARGET=\""${CLFS_TARGET}\"" &gt;&gt; ~/.bashrc</userinput></screen>
-
-  <table os="g">
-    <title>Processor Type and  Target Triplets</title>
-    <?dbfo table-width="5in" ?>
-
-    <tgroup cols="2">
-
-      <colspec colnum="1" colwidth="2.5in" colname="Processor"/>
-      <colspec colnum="2" colwidth="2.5in" colname="Triplet"/>
-
-      <thead>
-        <row>
-          <entry>Processor</entry>
-          <entry>Target Triplet</entry>
-        </row>
-      </thead>
-
-      <tbody>
-        <row>
-          <entry>386 Compatibles</entry>
-          <entry>Not Supported By Glibc</entry>
-        </row>
-        <row>
-          <entry>486 Compatibles</entry>
-          <entry>i486-pc-linux-gnu</entry>
-        </row>
-        <row>
-          <entry>Pentium, K6, 586 Compatibles</entry>
-          <entry>i586-pc-linux-gnu</entry>
-        </row>
-        <row>
-          <entry>Pentium II, Pentium III, Pentium 4</entry>
-          <entry>i686-pc-linux-gnu</entry>
-        </row>
-        <row>
-          <entry>Athlon, Duron</entry>
-          <entry>i686-pc-linux-gnu</entry>
-        </row>
-      </tbody>
-
-    </tgroup>
-
-  </table>
-
-</sect1>
Index: OK/cross-tools/x86_64-64-chapter.xml
===================================================================
--- BOOK/cross-tools/x86_64-64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-cross-tools" xreflabel="Constructing Cross-Compile Tools">
-  <?dbhtml dir="cross-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Cross-Compile Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/gcc-final.xml"/>
-
-</chapter>
Index: OK/cross-tools/x86_64-64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/x86_64-64/gcc-final.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,129 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-final" role="wrap">
-  <?dbhtml filename="gcc-final.html"?>
-
-  <title>Cross GCC-&gcc-version; - Final</title>
-
-  <indexterm zone="ch-cross-tools-gcc-final">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, final</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC Cross Compiler</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bk'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/x86_64-64/gcc-static.xml
===================================================================
--- BOOK/cross-tools/x86_64-64/gcc-static.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,121 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-static" role="wrap">
-  <?dbhtml filename="gcc-static.html"?>
-
-  <title>Cross GCC-&gcc-version; - Static</title>
-
-  <indexterm zone="ch-cross-tools-gcc-static">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, static</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Cross GCC Compiler with Static libgcc
-    and no Threads</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-<screen os="ab"><userinput>patch -Np1 -i ../&gcc-specs_pure64-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="al"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --host=${CLFS_HOST} --target=${CLFS_TARGET} --disable-multilib \
-    --with-local-prefix=/tools --disable-nls --disable-shared \
-    --disable-threads --enable-languages=c</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='am'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='an'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ao'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ap'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aq'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/x86_64-64/variables.xml
===================================================================
--- BOOK/cross-tools/x86_64-64/variables.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/variables.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: OK/cross-tools/x86_64-chapter.xml
===================================================================
--- BOOK/cross-tools/x86_64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-cross-tools" xreflabel="Constructing Cross-Compile Tools">
-  <?dbhtml dir="cross-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Cross-Compile Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/cflags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flags.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/gcc-static.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/glibc-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/gcc-final.xml"/>
-
-</chapter>
Index: OK/cross-tools/x86_64/gcc-final.xml
===================================================================
--- BOOK/cross-tools/x86_64/gcc-final.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,139 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-final" role="wrap">
-  <?dbhtml filename="gcc-final.html"?>
-
-  <title>Cross GCC-&gcc-version; - Final</title>
-
-  <indexterm zone="ch-cross-tools-gcc-final">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, final</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC Cross Compiler</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
-
-    <para os="bd">Finally, disable <option>-B</option> in
-    <filename>configure</filename> so wrong architecture libraries are not
-    picked up, as -B is not expanded by the multilib spec:</para>
-
-<screen os="be"><userinput>cp -v configure{,.orig}
-sed -e  '/FLAGS_FOR_TARGET.*\/lib\//s@-B[^ ]*/lib/@@g' configure.orig > \
-    configure</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="gcc-static.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="bf"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --target=${CLFS_TARGET} --host=${CLFS_HOST} \
-    --with-local-prefix=/tools --disable-nls --enable-shared \
-    --enable-languages=c,c++ --enable-__cxa_atexit \
-    --enable-c99 --enable-long-long --enable-threads=posix</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-final.xml"
-    xpointer="xpointer(//*[@os='bk'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/x86_64/gcc-static.xml
===================================================================
--- BOOK/cross-tools/x86_64/gcc-static.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,123 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-gcc-static" role="wrap">
-  <?dbhtml filename="gcc-static.html"?>
-
-  <title>Cross GCC-&gcc-version; - Static</title>
-
-  <indexterm zone="ch-cross-tools-gcc-static">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>cross tools, static</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Cross GCC Compiler with Static libgcc
-    and no Threads</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ag'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ah'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ai'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="al"><userinput>../gcc-&gcc-version;/configure --prefix=/cross-tools \
-    --host=${CLFS_HOST} --target=${CLFS_TARGET} \
-    --with-local-prefix=/tools --disable-nls --disable-shared \
-    --disable-threads --enable-languages=c</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='am'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='an'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ao'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ap'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aq'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/x86_64/glibc.xml
===================================================================
--- BOOK/cross-tools/x86_64/glibc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,166 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version; 32 Bit</title>
-
-  <indexterm zone="ch-cross-tools-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>cross tools, 32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='de'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="df"><userinput>BUILD_CC="gcc" CC="${CLFS_TARGET}-gcc ${BUILD32}" \
-    AR="${CLFS_TARGET}-ar" RANLIB="${CLFS_TARGET}-ranlib" \
-    CFLAGS="-march=$(cut -d- -f1 &lt;&lt;&lt; $CLFS_TARGET32) -mtune=generic -g -O2" \
-    ../glibc-&glibc-version;/configure --prefix=/tools \
-    --host=${CLFS_TARGET32} --build=${CLFS_HOST} \
-    --disable-profile --enable-add-ons \
-    --with-tls --enable-kernel=2.6.0 --with-__thread \
-    --with-binutils=/cross-tools/bin --with-headers=/tools/include \
-    --cache-file=config.cache</userinput></screen>
-
-    <variablelist os="dg">
-      <title>The meaning of the new configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg1'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../multilib/glibc.xml"
-      xpointer="xpointer(//*[@os='ea1'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg3'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg4'])"/>
-
-     <varlistentry os="ea2">
-        <term><parameter>CFLAGS="-march=$(cut -d- -f1 &lt;&lt;&lt;
-        $CLFS_TARGET32) -mtune=generic -g -O2"</parameter></term>
-        <listitem>
-          <para>Forces Glibc to optimize for our target system.</para>
-        </listitem>
-      </varlistentry>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg5'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg6'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg7'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg8'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg9'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/glibc.xml"
-      xpointer="xpointer(//*[@os='dg10'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='di'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dk'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='dn'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/x86_64/linux-headers.xml
===================================================================
--- BOOK/cross-tools/x86_64/linux-headers.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,49 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-linux-headers" role="wrap">
-  <?dbhtml filename="linux-headers.html"?>
-
-  <title>Linux-Headers-&linux-version;</title>
-
-  <indexterm zone="ch-cross-tools-linux-headers">
-    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
-    <secondary>cross tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/linux-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="c"><userinput>install -dv /tools/include
-make mrproper
-make ARCH=x86_64 headers_check
-make ARCH=x86_64 INSTALL_HDR_PATH=dest headers_install
-cp -rv dest/include/* /tools/include</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-linux-headers" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/cross-tools/x86_64/variables.xml
===================================================================
--- BOOK/cross-tools/x86_64/variables.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,43 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-cross-tools-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <bridgehead renderas="sect4">Setting Host and Target</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>export CLFS_TARGET="x86_64-unknown-linux-gnu"</userinput></screen>
-
-  <para os="m1">Now we will set our Target Triplet for 32 Bits:</para>
-
-<screen os="m2"><userinput>export CLFS_TARGET32="i686-pc-linux-gnu"</userinput></screen>
-
-  <bridgehead renderas="sect4">Copy settings to Environment</bridgehead>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/variables.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<screen os="f"><userinput>echo export CLFS_HOST=\""${CLFS_HOST}\"" &gt;&gt; ~/.bashrc
-echo export CLFS_TARGET=\""${CLFS_TARGET}\"" &gt;&gt; ~/.bashrc
-echo export CLFS_TARGET32=\""${CLFS_TARGET32}\"" &gt;&gt; ~/.bashrc</userinput></screen>
-
-</sect1>
Index: OK/editor-tools/Clean-spaces.sh
===================================================================
--- BOOK/editor-tools/Clean-spaces.sh	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,43 +1,0 @@
-#!/bin/bash -e
-
-# This script will clean the trailing spaces on the given file
-# or in all XML files under the given directory.
-
-NAME=`basename $0`
-
-if [ -z "$1" ]; then
-  echo "USAGE: $NAME -d directory"
-  echo "       $NAME -f file"
-  exit;
-fi
-
-case "$1" in
-  -d )
-
-    if [ -z "$2" ]; then
-      echo "A directory is needed"
-      exit
-    fi;
-
-    for filename in `find $2 -name "*.xml"`; do
-      sed  -i -e "s/[[:space:]]\+$//" "${filename}"
-    done;
-    exit;;
-
-  -f )
-
-    if [ -z "$2" ]; then
-      echo "A filename is needed"
-      exit
-    fi
-
-    sed  -i -e "s/[[:space:]]\+$//" $2
-    exit;;
-
-  * )
-
-    echo "USAGE: $NAME -d directory"
-    echo "       $NAME -f file"
-    exit;;
-
-esac
Index: OK/editor-tools/Find-files.sh
===================================================================
--- BOOK/editor-tools/Find-files.sh	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,18 +1,0 @@
-#!/bin/bash
-
-# This script will find all XML files in the working repository copy
-# that contains the same string in their name.
-
-# To be executed from the top-level directory.
-
-# Useful to find the files related with a same package in all
-# directories and architectures.
-
-NAME=`basename $0`
-
-if [ -z "$1" ]; then
-  echo "USAGE: $NAME string"
-  exit
-fi
-
-find . -name "*$1*.xml" | sort
Index: OK/editor-tools/Xinclude-resolver.sh
===================================================================
--- BOOK/editor-tools/Xinclude-resolver.sh	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,28 +1,0 @@
-#!/bin/bash
-
-# This script will create a copy of the given XML file
-# with the Xinclude tags resolved.
-
-# Must be executed from the same dir where the XML file
-# to be resolved is found.
-
-# The DTD declaration is removed from the output due that
-# xmllint add also the full set of entities.
-
-# Useful to see the actual text and commands and to know
-# in what files the Xincluded blocks are actually placed.
-
-# Remember to remove the full-*xml files after finished
-# your review of that files. They don't be commited to the
-# SVN repository.
-
-NAME=`basename $0`
-
-if [ -z "$1" ]; then
-  echo "USAGE: $NAME filename.xml"
-  exit
-fi
-
-xmllint -xinclude -output /tmp/temp.xml $1
-
-xmllint -dropdtd -output full-$1 /tmp/temp.xml
Index: OK/file_sizes
===================================================================
--- BOOK/file_sizes	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,6 +1,0 @@
-How we get files sizes.
-
-We need to have consistency on getting the file sizes. The method
-we should be using is du {filename}.
-
-
Index: OK/final-preps/aboutclfs.xml
===================================================================
--- BOOK/final-preps/aboutclfs.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,43 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-aboutclfs">
-  <?dbhtml filename="aboutclfs.html"?>
-
-  <title>About ${CLFS}</title>
-
-  <para>Throughout this book, the environment variable <envar>CLFS</envar> will
-  be used several times. It is paramount that this variable is always defined.
-  It should be set to the mount point chosen for the CLFS partition.
-  Check that the <envar>CLFS</envar> variable is set up properly with:</para>
-
-<screen><userinput>echo ${CLFS}</userinput></screen>
-
-  <para>Make sure the output shows the path to the CLFS partition's mount
-  point, which is <filename class="directory">/mnt/clfs</filename> if the
-  provided example was followed. If the output is incorrect, the
-  variable can be set with:</para>
-
-<screen><userinput>export CLFS=/mnt/clfs</userinput></screen>
-
-  <para>Having this variable set is beneficial in that commands such as
-  <command>install -dv ${CLFS}/tools</command> can be typed literally. The shell
-  will automatically replace <quote>${CLFS}</quote> with
-  <quote>/mnt/clfs</quote> (or whatever the variable was set to) when it
-  processes the command line.</para>
-
-  <para>If you haven't created the <filename class="directory">${CLFS}</filename>
-  directory, do so at this time by issuing the following commands:</para>
-
-<screen><userinput>install -dv ${CLFS}</userinput></screen>
-
-  <para>Do not forget to check that <envar>${CLFS}</envar> is set whenever
-  you leave and reenter the current working environment (as when doing a
-  <quote>su</quote> to <systemitem class="username">root</systemitem> or
-  another user).</para>
-
-</sect1>
Index: OK/final-preps/abouttestsuites.xml
===================================================================
--- BOOK/final-preps/abouttestsuites.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,22 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-abouttestsuites">
-  <?dbhtml filename="abouttestsuites.html"?>
-
-  <title>About the Test Suites</title>
-
-  <para>Most packages provide a test suite. Running the test suite for a
-  newly built package is a good idea because it can provide a <quote>sanity
-  check</quote> indicating that everything compiled correctly. A test suite
-  that passes its set of checks usually proves that the package is
-  functioning as the developer intended. It does not, however, guarantee
-  that the package is totally bug free.</para>
-
-  <para>It is not possible to run testsuites when cross-compiling, so package installation instructions do not explain how to run testsuites until <xref linkend="chapter-building-system"/>.</para>
-
-</sect1>
Index: OK/final-preps/addinguser.xml
===================================================================
--- BOOK/final-preps/addinguser.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,90 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-addinguser">
-  <?dbhtml filename="addinguser.html"?>
-
-  <title>Adding the CLFS User</title>
-
-  <para>When logged in as user <systemitem class="username">root</systemitem>,
-  making a single mistake can damage or destroy a system. Therefore, we
-  recommend building the packages as an unprivileged user.
-  You could use your own user name, but to make it easier to set up a clean
-  work environment, create a new user called <systemitem
-  class="username">clfs</systemitem> as a member of a new group (also named
-  <systemitem class="groupname">clfs</systemitem>) and use this user during
-  the installation process. As <systemitem class="username">root</systemitem>,
-  issue the following commands to add the new user:</para>
-
-<screen><userinput>groupadd clfs
-useradd -s /bin/bash -g clfs -d /home/clfs clfs
-mkdir -pv /home/clfs
-chown -v clfs:clfs /home/clfs</userinput></screen>
-
-  <variablelist>
-    <title>The meaning of the command line options:</title>
-
-    <varlistentry>
-      <term><parameter>-s /bin/bash</parameter></term>
-      <listitem>
-        <para>This makes <command>bash</command> the default shell for
-        user <systemitem class="username">clfs</systemitem>.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><parameter>-g clfs</parameter></term>
-      <listitem>
-        <para>This option adds user <systemitem class="username">clfs</systemitem>
-        to group <systemitem class="groupname">clfs</systemitem>.</para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><parameter>clfs</parameter></term>
-      <listitem>
-        <para>This is the actual name for the created group and user.</para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <para>To log in as <systemitem class="username">clfs</systemitem> (as
-  opposed to switching to user <systemitem class="username">clfs</systemitem>
-  when logged in as <systemitem class="username">root</systemitem>, which
-  does not require the <systemitem class="username">clfs</systemitem> user
-  to have a password), give <systemitem class="username">clfs</systemitem>
-  a password:</para>
-
-<screen><userinput>passwd clfs</userinput></screen>
-
-  <para>Grant <systemitem class="username">clfs</systemitem> full access to
-  <filename class="directory">${CLFS}/cross-tools</filename> and
-  <filename class="directory">${CLFS}/tools</filename> by making <systemitem
-  class="username">clfs</systemitem> the directorys' owner:</para>
-
-<screen><userinput>chown -v clfs ${CLFS}/tools
-chown -v clfs ${CLFS}/cross-tools</userinput></screen>
-
-  <para>If a separate working directory was created as suggested, 
-  give user <systemitem class="username">clfs</systemitem> ownership of this directory:</para>
-
-<screen><userinput>chown -v clfs ${CLFS}/sources</userinput></screen>
-
-  <para>Next, login as user <systemitem class="username">clfs</systemitem>.
-  This can be done via a virtual console, through a display manager, or
-  with the following substitute user command:</para>
-
-<screen><userinput>su - clfs</userinput></screen>
-
-  <para>The <quote><parameter>-</parameter></quote> instructs
-  <command>su</command> to start a login shell as opposed to a non-login
-  shell. The difference between these two types of shells can be found
-  in detail in <filename>bash(1)</filename> and <command>info
-  bash</command>.</para>
-
-</sect1>
Index: OK/final-preps/chapter.xml
===================================================================
--- BOOK/final-preps/chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-final-preps" xreflabel="Final Preparations">
-  <?dbhtml dir="final-preps"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Final Preparations</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="aboutclfs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="creatingtoolsdir.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="creatingcrossdir.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="addinguser.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="settingenviron.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="abouttestsuites.xml"/>
-
-</chapter>
Index: OK/final-preps/creatingcrossdir.xml
===================================================================
--- BOOK/final-preps/creatingcrossdir.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,38 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-creatingcrossdir">
-  <?dbhtml filename="creatingcrossdir.html"?>
-
-  <title>Creating the ${CLFS}/cross-tools Directory</title>
-
-  <para>The cross-binutils and cross-compiler built in
-  <xref linkend="chapter-cross-tools"/> will be installed under
-  <filename class="directory">${CLFS}/cross-tools</filename> to keep them
-  separate from the host programs. The programs compiled here are
-  cross-tools and will not be a part of the final CLFS system or the
-  temp-system. By keeping these programs in a separate directory, they
-  can easily be discarded later after their use.</para>
-
-  <para>Create the required directory by running the following as
-  <systemitem class="username">root</systemitem>:</para>
-
-<screen><userinput>install -dv ${CLFS}/cross-tools</userinput></screen>
-
-  <para>The next step is to create a <filename
-  class="symlink">/cross-tools</filename> symlink on the host system.
-  This will point to the newly-created directory on the CLFS partition.
-  Run this command as  <systemitem class="username">root</systemitem> as well:</para>
-
-<screen><userinput>ln -sv ${CLFS}/cross-tools /</userinput></screen>
-
-  <para>The symlink isn't technically necessary (though the book's
-  instructions do assume its existence), but is there mainly for
-  consistency (because /tools is also symlinked to ${CLFS}/tools) and to
-  simplify the installation of the cross-compile tools.</para>
-
-</sect1>
Index: OK/final-preps/creatingtoolsdir.xml
===================================================================
--- BOOK/final-preps/creatingtoolsdir.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,47 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-creatingtoolsdir">
-  <?dbhtml filename="creatingtoolsdir.html"?>
-
-  <title>Creating the ${CLFS}/tools Directory</title>
-
-  <para>All programs compiled in <xref linkend="chapter-temp-system"/>
-  will be installed under <filename class="directory">${CLFS}/tools</filename>
-  to keep them separate from the programs compiled in <xref
-  linkend="chapter-building-system"/>. The programs compiled here are
-  temporary tools and will not be a part of the final CLFS system. By keeping
-  these programs in a separate directory, they can easily be discarded later
-  after their use. This also prevents these programs from ending up in the
-  host production directories (easy to do by accident in <xref
-  linkend="chapter-temp-system"/>).</para>
-
-  <para>Create the required directory by running the following as
-  <systemitem class="username">root</systemitem>:</para>
-
-<screen><userinput>install -dv ${CLFS}/tools</userinput></screen>
-
-  <para>The next step is to create a <filename class="symlink">/tools</filename>
-  symlink on the host system. This will point to the newly-created directory
-  on the CLFS partition. Run this command as <systemitem
-  class="username">root</systemitem> as well:</para>
-
-<screen><userinput>ln -sv ${CLFS}/tools /</userinput></screen>
-
-  <note>
-    <para>The above command is correct. The <command>ln</command> command
-    has a few syntactic variations, so be sure to check <command>info
-    coreutils ln</command> and <filename>ln(1)</filename> before reporting
-    what you may think is an error.</para>
-  </note>
-
-  <para>The created symlink enables the toolchain to be compiled so that
-  it always refers to <filename class="directory">/tools</filename>,
-  meaning that the compiler, assembler, and linker will work. This will
-  provide a common place for our temporary tools system.</para>
-
-</sect1>
Index: OK/final-preps/settingenviron.xml
===================================================================
--- BOOK/final-preps/settingenviron.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,94 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-preps-settingenviron">
-  <?dbhtml filename="settingenvironment.html"?>
-
-  <title>Setting Up the Environment</title>
-
-  <para os="a">Set up a good working environment by creating two new startup
-  files for the <command>bash</command> shell. While logged in as user
-  <systemitem class="username">clfs</systemitem>, issue the following
-  command to create a new <filename>.bash_profile</filename>:</para>
-
-<screen os="b"><userinput>cat &gt; ~/.bash_profile &lt;&lt; "EOF"
-<literal>exec env -i HOME=${HOME} TERM=${TERM} PS1='\u:\w\$ ' /bin/bash</literal>
-EOF</userinput></screen>
-
-  <para os="c">When logged on as user <systemitem class="username">clfs</systemitem>,
-  the initial shell is usually a <emphasis>login</emphasis> shell which
-  reads the <filename>/etc/profile</filename> of the host (probably
-  containing some settings and environment variables) and then
-  <filename>.bash_profile</filename>. The
-  <command>exec env -i.../bin/bash</command> command in the
-  <filename>.bash_profile</filename> file replaces the running shell with
-  a new one with a completely empty environment, except for the
-  <envar>HOME</envar>, <envar>TERM</envar>, and <envar>PS1</envar> variables.
-  This ensures that no unwanted and potentially hazardous environment
-  variables from the host system leak into the build environment. The
-  technique used here achieves the goal of ensuring a clean environment.</para>
-
-  <para os="d">The new instance of the shell is a <emphasis>non-login</emphasis>
-  shell, which does not read the <filename>/etc/profile</filename> or
-  <filename>.bash_profile</filename> files, but rather reads the
-  <filename>.bashrc</filename> file instead. Create the
-  <filename>.bashrc</filename> file now:</para>
-
-<screen os="e"><userinput>cat &gt; ~/.bashrc &lt;&lt; "EOF"
-<literal>set +h
-umask 022
-CLFS=/mnt/clfs
-LC_ALL=POSIX
-PATH=/cross-tools/bin:/bin:/usr/bin
-export CLFS LC_ALL PATH</literal>
-EOF</userinput></screen>
-
-  <para os="f">The <command>set +h</command> command turns off
-  <command>bash</command>'s hash function. Hashing is ordinarily a useful
-  feature&mdash;<command>bash</command> uses a hash table to remember the
-  full path of executable files to avoid searching the <envar>PATH</envar>
-  time and again to find the same executable. However, the new tools should
-  be used as soon as they are installed. By switching off the hash function,
-  the shell will always search the <envar>PATH</envar> when a program is to
-  be run. As such, the shell will find the newly compiled tools in
-  <filename class="directory">/cross-tools</filename> as soon as they are
-  available without remembering a previous version of the same program in a
-  different location.</para>
-
-  <para os="g">Setting the user file-creation mask (umask) to 022 ensures that
-  newly created files and directories are only writable by their owner,
-  but are readable and executable by anyone (assuming default modes are
-  used by the open(2) system call, new files will end up with permission
-  mode 644 and directories with mode 755).</para>
-
-  <para os="h">The <envar>CLFS</envar> variable should be set to the
-  chosen mount point.</para>
-
-  <para os="i">The <envar>LC_ALL</envar> variable controls the localization
-  of certain programs, making their messages follow the conventions of a
-  specified country.  If the host system uses a version of Glibc older
-  than 2.2.4, having <envar>LC_ALL</envar> set to something other than
-  <quote>POSIX</quote> or <quote>C</quote> (during this chapter) may cause
-  issues if you exit the chroot environment and wish to return later.
-  Setting <envar>LC_ALL</envar> to <quote>POSIX</quote> or <quote>C</quote>
-  (the two are equivalent) ensures that everything will work as expected in
-  the chroot environment.</para>
-
-  <para os="j">By putting <filename class="directory">/cross-tools/bin</filename>
-  at the beginning of the <envar>PATH</envar>, the cross-compiler
-  built in <xref linkend="chapter-cross-tools"/> will be picked up by
-  the build process for the temp-system packages before anything that
-  may be installed on the host. This, combined with turning off
-  hashing, helps to ensure that you will be using the cross-compile
-  tools to build the temp-system in /tools.</para>
-
-  <para os="k">Finally, to have the environment fully prepared for building the
-  temporary tools, source the just-created user profile:</para>
-
-<screen os="l"><userinput>source ~/.bash_profile</userinput></screen>
-
-</sect1>
Index: OK/final-system/64/binutils.xml
===================================================================
--- BOOK/final-system/64/binutils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,137 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-binutils" role="wrap">
-  <?dbhtml filename="binutils.html"?>
-
-  <title>Binutils-&binutils-version;</title>
-
-  <indexterm zone="ch-system-binutils">
-    <primary sortas="a-Binutils">Binutils</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/binutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Binutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <para os="q1">Libiberty uses <command>gcc -print-multi-os-directory</command>
-    to determine where to install libiberty.a.  Because our temporary gcc is
-    still multilib-aware, the command returns <literal>../lib64</literal> which
-    causes the archive to be installed into /usr/lib64.  The following sed will
-    prevent this:</para>
-
-<screen os="q2"><userinput>sed -i 's%\(^MULTIOSDIR = \).*%\1 ../lib%' libiberty/Makefile.in</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="ca"><userinput>../binutils-&binutils-version;/configure --prefix=/usr \
-    --libdir=/usr/lib --enable-shared \
-    --disable-multilib --enable-64-bit-bfd</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <para os="w1">Now that the tests have completed, remove the symlinks in
-    /usr/lib64 - they should be the only things in that directory, so we
-    can remove it without force :</para>
-
-<screen os="w2"><userinput>rm -v /usr/lib64/libstd*so*
-rmdir -v /usr/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/binutils.xml"
-  xpointer="xpointer(id('contents-binutils'))"/>
-
-</sect1>
Index: OK/final-system/64/gcc.xml
===================================================================
--- BOOK/final-system/64/gcc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,145 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <para os="p5">Apply the following patch so that GCC links to /lib
-    instead of /lib64:</para>
-
-<screen os="p6"><userinput>patch -Np1 -i ../&gcc-pure64-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='e1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/gcc.xml"
-  xpointer="xpointer(id('contents-gcc'))"/>
-
-</sect1>
Index: OK/final-system/64/util-linux-ng.xml
===================================================================
--- BOOK/final-system/64/util-linux-ng.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-util-linux-ng" role="wrap">
-  <?dbhtml filename="util-linux-ng.html"?>
-
-  <title>Util-linux-ng-&util-linux-ng-version;</title>
-
-  <indexterm zone="ch-system-util-linux-ng">
-    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/util-linux-ng.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/util-linux-ng.xml"
-  xpointer="xpointer(//*[@id='fhs-util-linux-ng'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Util-linux-ng</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure --enable-partx \
-    --disable-wall --enable-write</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/util-linux-ng.xml"
-  xpointer="xpointer(id('contents-util-linux-ng'))"/>
-
-</sect1>
Index: OK/final-system/alpha-chapter.xml
===================================================================
--- BOOK/final-system/alpha-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,71 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-building-system" xreflabel="Installing Basic System Software">
-  <?dbhtml dir="final-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Installing Basic System Software</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkgmgt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/testsuitesagain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/adjusting.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/autoconf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mktemp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/aboot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/aboutdebug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/stripping.xml"/>
-
-</chapter>
Index: OK/final-system/alpha/aboot.xml
===================================================================
--- BOOK/final-system/alpha/aboot.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,103 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-aboot" role="wrap">
-  <?dbhtml filename="aboot.html"?>
-
-  <title>Aboot-&aboot-version;</title>
-
-  <indexterm zone="ch-system-aboot">
-    <primary sortas="a-Aboot">Aboot</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The aboot package contains the Alpha Bootloader.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of aboot</title>
-
-    <para os="aa">The following patch addresses build issues with GCC &gcc-version;:</para>
-
-<screen os="ab"><userinput>patch -Np1 -i ../&aboot-alpha-patch;</userinput></screen>
-
-    <para>Compile the package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para>Install the package:</para>
-
-<screen><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-aboot" role="content">
-    <title>Contents of aboot</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>abootconf, e2writeboot, isomarkboot, swriteboot</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="abootconf">
-        <term><command>abootconf</command></term>
-        <listitem>
-          <para>Sets the partition number that contains the configuration file
-          for the secondary bootloader.</para>
-          <indexterm zone="ch-system-aboot abootconf">
-            <primary sortas="a-abootconf">abootconf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="e2writeboot">
-        <term><command>e2writeboot</command></term>
-        <listitem>
-          <para>Can  be  used  to write a secondary bootstrap loader to an
-          ext2 formatted filesystem (normally on a floppy disk).</para>
-          <indexterm zone="ch-system-aboot e2writeboot">
-            <primary sortas="a-e2writeboot">e2writeboot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="isomarkboot">
-        <term><command>isomarkboot</command></term>
-        <listitem>
-          <para>Makes an iso image bootable.</para>
-          <indexterm zone="ch-system-aboot isomarkboot">
-            <primary sortas="a-isomarkboot">isomarkboot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="swriteboot">
-        <term><command>swriteboot</command></term>
-        <listitem>
-          <para>Used to write the secondary SRM bootloader to a harddisk.</para>
-          <indexterm zone="ch-system-aboot swriteboot">
-            <primary sortas="a-swriteboot">swriteboot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/alpha/glibc.xml
===================================================================
--- BOOK/final-system/alpha/glibc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,135 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc" role="wrap">
-  <title>Glibc-&glibc-version;</title>
-
-  <?dbhtml filename="glibc.html"?>
-
-  <indexterm zone="ch-system-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <para os="a1">The following patch moves PTR_MANGLE and ensures that
-    PTR_MANGLE is defined in all cases:</para>
-
-<screen os="a2"><userinput>patch -Np1 -i ../&glibc-alpha_ptr_mangle_fix-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('i18n-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-ld'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('contents-glibc'))"/>
-
-</sect1>
Index: OK/final-system/alpha/linux-headers.xml
===================================================================
--- BOOK/final-system/alpha/linux-headers.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,50 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-linux-headers" role="wrap">
-  <?dbhtml filename="linux-headers.html"?>
-
-  <title>Linux-Headers-&linux-version;</title>
-
-  <indexterm zone="ch-system-linux-headers">
-    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/linux-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/alpha/kernel.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/alpha/kernel.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/linux-headers.xml"
-  xpointer="xpointer(id('contents-linux-headers'))"/>
-
-</sect1>
Index: OK/final-system/common/aboutdebug.xml
===================================================================
--- BOOK/final-system/common/aboutdebug.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,49 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-aboutdebug">
-  <?dbhtml filename="aboutdebug.html"?>
-
-  <title>About Debugging Symbols</title>
-
-  <para os="a">Most programs and libraries are, by default, compiled with debugging
-  symbols included (with <command>gcc</command>'s <option>-g</option> option).
-  This means that when debugging a program or library that was compiled with
-  debugging information included, the debugger can provide not only memory
-  addresses, but also the names of the routines and variables.</para>
-
-  <para os="b">However, the inclusion of these debugging symbols enlarges a
-  program or library significantly. The following is an example of the
-  amount of space these symbols occupy:</para>
-
-  <itemizedlist os="c">
-    <listitem os="c1">
-      <para>a bash binary with debugging symbols: 1200 KB</para>
-    </listitem>
-    <listitem os="c2">
-      <para>a bash binary without debugging symbols: 480 KB</para>
-    </listitem>
-    <listitem os="c3">
-      <para>Glibc and GCC files (<filename class="directory">/lib</filename>
-      and <filename class="directory">/usr/lib</filename>) with debugging
-      symbols: 87 MB</para>
-    </listitem>
-    <listitem os="c4">
-      <para>Glibc and GCC files without debugging symbols: 16 MB</para>
-    </listitem>
-  </itemizedlist>
-
-  <para os="d">Sizes may vary depending on which compiler and C library were used,
-  but when comparing programs with and without debugging symbols, the
-  difference will usually be a factor between two and five.</para>
-
-  <para os="e">Because most users will never use a debugger on their system software,
-  a lot of disk space can be regained by removing these symbols. The next
-  section shows how to strip all debugging symbols from the programs and
-  libraries.</para>
-
-</sect1>
Index: OK/final-system/common/adjusting.xml
===================================================================
--- BOOK/final-system/common/adjusting.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,60 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-adjusting">
-  <?dbhtml filename="adjusting.html"?>
-
-  <title>Adjusting the Toolchain</title>
-
-  <para os="a">Now we amend the GCC specs file so that it points to the new
-  dynamic linker. A <command>perl</command> command accomplishes this:</para>
-
-<screen os="c"><userinput>gcc -dumpspecs | \
-perl -p -e 's@/tools/lib/ld@/lib/ld@g;' \
-     -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;' > \
-     $(dirname $(gcc --print-libgcc-file-name))/specs</userinput></screen>
-
-  <para os="d">It is a good idea to visually inspect the specs file to verify the
-  intended change was actually made.</para>
-
-  <para os="e">Note that <filename class="directory">/lib</filename> is now
-  the prefix of our dynamic linker.</para>
-
-  <caution>
-
-    <para os="f">It is imperative at this point to stop and ensure that
-    the basic functions (compiling and linking) of the adjusted toolchain
-    are working as expected. To do this, perform a sanity
-    check:</para>
-
-<screen os="g"><userinput>echo 'main(){}' &gt; dummy.c
-gcc dummy.c
-readelf -l a.out | grep ': /lib'</userinput></screen>
-
-    <para os="h">If everything is working correctly, there should be no errors,
-    and the output of the last command will be:</para>
-
-<screen os="i"><computeroutput>[Requesting program interpreter: /lib/ld-linux.so.2]</computeroutput></screen>
-
-    <para os="j">Note that <filename class="directory">/lib</filename> is now
-    the prefix of our dynamic linker.</para>
-
-    <para os="k">If the output does not appear as shown above or is not received
-    at all, then something is seriously wrong. Investigate and retrace the
-    steps to find out where the problem is and correct it. The most likely
-    reason is that something went wrong with the specs file amendment
-    above. Any issues will need to be resolved before continuing on with
-    the process.</para>
-
-    <para os="l">Once everything is working correctly, clean up the test
-    files:</para>
-
-<screen os="m"><userinput>rm -v dummy.c a.out</userinput></screen>
-
-  </caution>
-
-</sect1>
Index: OK/final-system/common/autoconf.xml
===================================================================
--- BOOK/final-system/common/autoconf.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,159 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-autoconf" role="wrap">
-  <?dbhtml filename="autoconf.html"?>
-
-  <title>Autoconf-&autoconf-version;</title>
-
-  <indexterm zone="ch-system-autoconf">
-    <primary sortas="a-Autoconf">Autoconf</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Autoconf package contains programs for producing shell scripts that
-    can automatically configure source code.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Autoconf</title>
-
-    <para os="a">Prepare Autoconf for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:
-    <userinput>make check</userinput>. 6 tests are skipped that use
-    Automake.  For full test coverage, Autoconf can be re-tested after
-    Automake has been installed.</para>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-autoconf" role="content">
-    <title>Contents of Autoconf</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>autoconf, autoheader, autom4te, autoreconf, autoscan, autoupdate,
-        and ifnames</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="autoconf">
-        <term><command>autoconf</command></term>
-        <listitem>
-          <para>Produces shell scripts that automatically configure software
-          source code packages to adapt to many kinds of Unix-like systems.
-          The configuration scripts it produces are independent&mdash;running
-          them does not require the <command>autoconf</command> program.</para>
-          <indexterm zone="ch-system-autoconf autoconf">
-            <primary sortas="b-autoconf">autoconf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="autoheader">
-        <term><command>autoheader</command> </term>
-        <listitem>
-          <para>A tool for creating template files of C
-          <emphasis>#define</emphasis> statements for configure to use</para>
-          <indexterm zone="ch-system-autoconf autoheader">
-            <primary sortas="b-autoheader">autoheader</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="autom4te">
-        <term><command>autom4te</command></term>
-        <listitem>
-          <para>A wrapper for the M4 macro processor</para>
-          <indexterm zone="ch-system-autoconf autom4te">
-            <primary sortas="b-autom4te">autom4te</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="autoreconf">
-        <term><command>autoreconf</command></term>
-        <listitem>
-          <para>Automatically runs <command>autoconf</command>,
-          <command>autoheader</command>, <command>aclocal</command>,
-          <command>automake</command>, <command>gettextize</command>, and
-          <command>libtoolize</command> in the correct order to save time
-          when changes are made to <command>autoconf</command> and
-          <command>automake</command> template files</para>
-          <indexterm zone="ch-system-autoconf autoreconf">
-            <primary sortas="b-autoreconf">autoreconf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="autoscan">
-        <term><command>autoscan</command> </term>
-        <listitem>
-          <para>Helps to create a <filename>configure.in</filename> file for a
-          software package; it examines the source files in a directory tree,
-          searching them for common portability issues, and creates a
-          <filename>configure.scan</filename> file that serves as as a
-          preliminary <filename>configure.in</filename> file for the package</para>
-          <indexterm zone="ch-system-autoconf autoscan">
-            <primary sortas="b-autoscan">autoscan</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="autoupdate">
-        <term><command>autoupdate</command></term>
-        <listitem>
-          <para>Modifies a <filename>configure.in</filename> file that still
-          calls <command>autoconf</command> macros by their old names to use the
-          current macro names</para>
-          <indexterm zone="ch-system-autoconf autoupdate">
-            <primary sortas="b-autoupdate">autoupdate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ifnames">
-        <term><command>ifnames</command> </term>
-        <listitem>
-          <para>Helps when writing <filename>configure.in</filename> files
-          for a software package; it prints the identifiers that the package
-          uses in C preprocessor conditionals. If a package has already been set
-          up to have some portability, this program can help determine what
-          <command>configure</command> needs to check for. It can also fill in
-          gaps in a <filename>configure.in</filename> file generated by
-          <command>autoscan</command></para>
-          <indexterm zone="ch-system-autoconf ifnames">
-            <primary sortas="b-ifnames">ifnames</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/automake.xml
===================================================================
--- BOOK/final-system/common/automake.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,253 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-automake" role="wrap">
-  <?dbhtml filename="automake.html"?>
-
-  <title>Automake-&automake-version;</title>
-
-  <indexterm zone="ch-system-automake">
-    <primary sortas="a-Automake">Automake</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Automake package contains programs for generating Makefiles
-    for use with Autoconf.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Automake</title>
-
-    <para os="a">Prepare Automake for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:
-    <userinput>make check</userinput>.</para>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-automake" role="content">
-    <title>Contents of Automake</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>acinstall, aclocal, aclocal-&automake-version2;, automake,
-        automake-&automake-version2;, compile, config.guess, config.sub,
-        depcomp, elisp-comp, install-sh, mdate-sh, missing, mkinstalldirs,
-        py-compile, symlink-tree, and ylwrap</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="acinstall">
-        <term><command>acinstall</command></term>
-        <listitem>
-          <para>A script that installs aclocal-style M4 files</para>
-          <indexterm zone="ch-system-automake acinstall">
-            <primary sortas="b-acinstall">acinstall</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aclocal">
-        <term><command>aclocal</command></term>
-        <listitem>
-          <para>Generates <filename>aclocal.m4</filename> files based on the
-          contents of <filename>configure.in</filename> files</para>
-          <indexterm zone="ch-system-automake aclocal">
-            <primary sortas="b-aclocal">aclocal</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="aclocal-version">
-        <term><command>aclocal-&automake-version2;</command></term>
-        <listitem>
-          <para>A hard link to <command>aclocal</command></para>
-          <indexterm zone="ch-system-automake aclocal-version">
-            <primary
-            sortas="b-aclocal-&automake-version;">aclocal-&automake-version;</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="automake">
-        <term><command>automake</command></term>
-        <listitem>
-          <para>A tool for automatically generating
-          <filename>Makefile.in</filename> files from
-          <filename>Makefile.am</filename> files. To create all the
-          <filename>Makefile.in</filename> files for a package, run this
-          program in the top-level directory. By scanning the
-          <filename>configure.in</filename> file, it automatically finds
-          each appropriate <filename>Makefile.am</filename> file and generates
-          the corresponding <filename>Makefile.in</filename> file</para>
-          <indexterm zone="ch-system-automake automake">
-            <primary sortas="b-automake">automake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="automake-version">
-        <term><command>automake-&automake-version2;</command></term>
-        <listitem>
-          <para>A hard link to <command>automake</command></para>
-          <indexterm zone="ch-system-automake automake-version">
-            <primary
-            sortas="b-automake-&automake-version;">automake-&automake-version;</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="compile">
-        <term><command>compile</command></term>
-        <listitem>
-          <para>A wrapper for compilers</para>
-          <indexterm zone="ch-system-automake compile">
-            <primary sortas="b-compile">compile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="config.guess">
-        <term><command>config.guess</command></term>
-        <listitem>
-          <para>A script that attempts to guess the canonical triplet for
-          the given build, host, or target architecture</para>
-          <indexterm zone="ch-system-automake config.guess">
-            <primary sortas="b-config.guess">config.guess</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="config.sub">
-        <term><command>config.sub</command></term>
-        <listitem>
-          <para>A configuration validation subroutine script</para>
-          <indexterm zone="ch-system-automake config.sub">
-            <primary sortas="b-config.sub">config.sub</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="depcomp">
-        <term><command>depcomp</command></term>
-        <listitem>
-          <para>A script for compiling a program so that dependency information
-          is generated in addition to the desired output</para>
-          <indexterm zone="ch-system-automake depcomp">
-            <primary sortas="b-depcomp">depcomp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="elisp-comp">
-        <term><command>elisp-comp</command></term>
-        <listitem>
-          <para>Byte-compiles Emacs Lisp code</para>
-          <indexterm zone="ch-system-automake elisp-comp">
-            <primary sortas="b-elisp-comp">elisp-comp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="install-sh">
-        <term><command>install-sh</command></term>
-        <listitem>
-          <para>A script that installs a program, script, or data file</para>
-          <indexterm zone="ch-system-automake install-sh">
-            <primary sortas="b-install-sh">install-sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mdate-sh">
-        <term><command>mdate-sh</command></term>
-        <listitem>
-          <para>A script that prints the modification time of a file or
-          directory</para>
-          <indexterm zone="ch-system-automake mdate-sh">
-            <primary sortas="b-mdate-sh">mdate-sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="missing">
-        <term><command>missing</command></term>
-        <listitem>
-          <para>A script acting as a common stub for missing GNU programs during
-          an installation</para>
-          <indexterm zone="ch-system-automake missing">
-            <primary sortas="b-missing">missing</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkinstalldirs">
-        <term><command>mkinstalldirs</command></term>
-        <listitem>
-          <para>A script that creates a directory tree</para>
-          <indexterm zone="ch-system-automake mkinstalldirs">
-            <primary sortas="b-mkinstalldirs">mkinstalldirs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="py-compile">
-        <term><command>py-compile</command></term>
-        <listitem>
-          <para>Compiles a Python program</para>
-          <indexterm zone="ch-system-automake py-compile">
-            <primary sortas="b-py-compile">py-compile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="symlink-tree">
-        <term><command>symlink-tree</command></term>
-        <listitem>
-          <para>A script to create a symlink tree of a directory tree</para>
-          <indexterm zone="ch-system-automake symlink-tree">
-            <primary sortas="b-symlink-tree">symlink-tree</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ylwrap">
-        <term><command>ylwrap</command></term>
-        <listitem>
-          <para>A wrapper for <command>lex</command> and
-          <command>yacc</command></para>
-          <indexterm zone="ch-system-automake ylwrap">
-            <primary sortas="b-ylwrap">ylwrap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/bash.xml
===================================================================
--- BOOK/final-system/common/bash.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,137 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-bash" role="wrap">
-  <?dbhtml filename="bash.html"?>
-
-  <title>Bash-&bash-version;</title>
-
-  <indexterm zone="ch-system-bash">
-    <primary sortas="a-Bash">Bash</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Bash package contains the Bourne-Again SHell.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Bash</title>
-
-    <para os="a">If you downloaded the Bash documentation tarball and wish to
-    install HTML documentation, issue the following commands:</para>
-
-<screen os="b"><userinput>tar -xvf ../bash-doc-&bash-doc-version;.tar.gz</userinput></screen>
-
-    <para os="p1">The following patch contains updates from the maintainer. The
-    maintainer of Bash only releases these patches to fix serious issues:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
-
-    <para os="g">Prepare Bash for compilation:</para>
-
-<screen os="h"><userinput>./configure --prefix=/usr --bindir=/bin \
-    --without-bash-malloc --with-installed-readline</userinput></screen>
-
-    <variablelist os="i">
-      <title>The meaning of the configure option:</title>
-
-      <varlistentry>
-        <term><parameter>--with-installed-readline</parameter></term>
-        <listitem>
-          <para>This option tells Bash to use the
-          <filename class="libraryfile">readline</filename> library that is
-          already installed on the system rather than using its own readline
-          version.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para os="j">Compile the package:</para>
-
-<screen os="k"><userinput>make</userinput></screen>
-
-    <para os="l">To test the results, issue:
-    <userinput>make tests</userinput>.</para>
-
-    <para os="m">Install the package:</para>
-
-<screen os="n"><userinput>make htmldir=/usr/share/doc/bash-&bash-version; install</userinput></screen>
-
-    <para os="o">Run the newly compiled <command>bash</command> program (replacing
-    the one that is currently being executed):</para>
-
-<screen os="p" role="nodump"><userinput>exec /bin/bash --login +h</userinput></screen>
-
-    <note os="q">
-      <para>The parameters used make the <command>bash</command>
-      process an interactive login shell and continue to disable hashing so
-      that new programs are found as they become available.</para>
-    </note>
-
-  </sect2>
-
-  <sect2 id="contents-bash" role="content">
-    <title>Contents of Bash</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>bash, bashbug, and sh (link to bash)</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bash">
-        <term><command>bash</command></term>
-        <listitem>
-          <para>A widely-used command interpreter; it performs many types of
-          expansions and substitutions on a given command line before executing
-          it, thus making this interpreter a powerful tool</para>
-          <indexterm zone="ch-system-bash bash">
-            <primary sortas="b-bash">bash</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bashbug">
-        <term><command>bashbug</command></term>
-        <listitem>
-          <para>A shell script to help the user compose and mail standard
-          formatted bug reports concerning <command>bash</command></para>
-          <indexterm zone="ch-system-bash bashbug">
-            <primary sortas="b-bashbug">bashbug</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sh">
-        <term><command>sh</command></term>
-        <listitem>
-          <para>A symlink to the <command>bash</command> program; when invoked
-          as <command>sh</command>, <command>bash</command> tries to mimic the
-          startup behavior of historical versions of <command>sh</command> as
-          closely as possible, while conforming to the POSIX standard as
-          well</para>
-          <indexterm zone="ch-system-bash sh">
-            <primary sortas="b-sh">sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/binutils.xml
===================================================================
--- BOOK/final-system/common/binutils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,326 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-binutils" role="wrap">
-  <?dbhtml filename="binutils.html"?>
-
-  <title>Binutils-&binutils-version;</title>
-
-  <indexterm zone="ch-system-binutils">
-    <primary sortas="a-Binutils">Binutils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Binutils package contains a linker, an assembler, and other
-    tools for handling object files.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Binutils</title>
-
-    <para os="b">Verify that the PTYs are working properly inside the build
-    environment. Check that everything is set up correctly by performing a
-    simple test:</para>
-
-<screen os="c" role="nodump"><userinput>expect -c "spawn ls"</userinput></screen>
-
-    <para os="d">If the following message shows up, the environment is not
-    set up for proper PTY operation:</para>
-
-<screen os="e"><computeroutput>The system has no more ptys.
-Ask your system administrator to create more.</computeroutput></screen>
-
-    <para os="f">This issue needs to be resolved before running the test suites
-    for Binutils and GCC.</para>
-
-    <para os="p1">The following patches merges all updates from the &binutils-version; Branch 
-    from the Binutils developers:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&binutils-branch_update-patch;</userinput></screen>
-
-    <para os="g">The Binutils documentation recommends building Binutils outside of the
-    source directory in a dedicated build directory:</para>
-
-<screen os="h"><userinput>mkdir -v ../binutils-build
-cd ../binutils-build</userinput></screen>
-
-    <para os="i">Prepare Binutils for compilation:</para>
-
-<screen os="ca"><userinput>../binutils-&binutils-version;/configure --prefix=/usr \
-    --enable-shared</userinput></screen>
-
-    <para os="j">Compile the package:</para>
-
-<screen os="k"><userinput>make configure-host</userinput></screen>
-
-    <important os="l">
-      <para>During <command>make configure-host</command> you may receive the
-      following error message. It is safe to ignore.</para>
-
-<screen><computeroutput>WARNING: `flex' is missing on your system. You should only
-need it if you modified a `.l' file. You may need the `Flex'
-package in order for those modifications to take effect. You
-can get `Flex' from any GNU archive site.</computeroutput></screen>
-    </important>
-
-<screen os="m"><userinput>make tooldir=/usr</userinput></screen>
-
-    <variablelist os="n">
-      <title>The meaning of the make parameter:</title>
-
-      <varlistentry>
-        <term><parameter>tooldir=/usr</parameter></term>
-        <listitem>
-          <para>Normally, the tooldir (the directory where the executables
-          will ultimately be located) is set to <filename
-          class="directory">$(exec_prefix)/$(target_alias)</filename>. Because this
-          is a custom system, this target-specific directory in <filename
-          class="directory">/usr</filename> is not required.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <important os="o">
-      <para>The test suite for Binutils is considered critical.
-      Do not skip it under any circumstance.</para>
-    </important>
-
-    <para os="p">Test the results:</para>
-
-<screen os="q"><userinput>make check</userinput></screen>
-
-    <para os="r">Install the package:</para>
-
-<screen os="s"><userinput>make tooldir=/usr install</userinput></screen>
-
-    <para os="t">Install the <filename class="headerfile">libiberty</filename> header
-    file that is needed by some packages:</para>
-
-<screen os="u"><userinput>cp -v ../binutils-&binutils-version;/include/libiberty.h /usr/include</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-binutils" role="content">
-    <title>Contents of Binutils</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-
-      <seglistitem>
-        <seg>addr2line, ar, as, c++filt, gprof, ld, nm, objcopy, objdump,
-        ranlib, readelf, size, strings, and strip</seg>
-        <seg>libiberty.a, libbfd.[a,so], and libopcodes.[a,so]</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="addr2line">
-        <term><command>addr2line</command></term>
-        <listitem>
-          <para>Translates program addresses to file names and line numbers;
-          given an address and the name of an executable, it uses the debugging
-          information in the executable to determine which source file and line
-          number are associated with the address</para>
-          <indexterm zone="ch-system-binutils addr2line">
-            <primary sortas="b-addr2line">addr2line</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ar">
-        <term><command>ar</command></term>
-        <listitem>
-          <para>Creates, modifies, and extracts from archives</para>
-          <indexterm zone="ch-system-binutils ar">
-            <primary sortas="b-ar">ar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="as">
-        <term><command>as</command></term>
-        <listitem>
-          <para>An assembler that assembles the output of <command>gcc</command>
-          into object files</para>
-          <indexterm zone="ch-system-binutils as">
-            <primary sortas="b-as">as</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="c-filt">
-        <term><command>c++filt</command></term>
-        <listitem>
-          <para>Used by the linker to de-mangle C++ and Java symbols and to keep
-          overloaded functions from clashing</para>
-          <indexterm zone="ch-system-binutils c-filt">
-            <primary sortas="b-c++filt">c++filt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gprof">
-        <term><command>gprof</command></term>
-        <listitem>
-          <para>Displays call graph profile data</para>
-          <indexterm zone="ch-system-binutils gprof">
-            <primary sortas="b-gprof">gprof</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ld">
-        <term><command>ld</command></term>
-        <listitem>
-          <para>A linker that combines a number of object and archive files
-          into a single file, relocating their data and tying up symbol
-          references</para>
-          <indexterm zone="ch-system-binutils ld">
-            <primary sortas="b-ld">ld</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nm">
-        <term><command>nm</command></term>
-        <listitem>
-          <para>Lists the symbols occurring in a given object file</para>
-          <indexterm zone="ch-system-binutils nm">
-            <primary sortas="b-nm">nm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="objcopy">
-        <term><command>objcopy</command></term>
-        <listitem>
-          <para>Translates one type of object file into another</para>
-          <indexterm zone="ch-system-binutils objcopy">
-            <primary sortas="b-objcopy">objcopy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="objdump">
-        <term><command>objdump</command></term>
-        <listitem>
-          <para>Displays information about the given object file, with options
-          controlling the particular information to display; the information
-          shown is useful to programmers who are working on the compilation
-          tools</para>
-          <indexterm zone="ch-system-binutils objdump">
-            <primary sortas="b-objdump">objdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ranlib">
-        <term><command>ranlib</command></term>
-        <listitem>
-          <para>Generates an index of the contents of an archive and stores it
-          in the archive; the index lists all of the symbols defined by archive
-          members that are relocatable object files</para>
-          <indexterm zone="ch-system-binutils ranlib">
-            <primary sortas="b-ranlib">ranlib</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="readelf">
-        <term><command>readelf</command></term>
-        <listitem>
-          <para>Displays information about ELF type binaries</para>
-          <indexterm zone="ch-system-binutils readelf">
-            <primary sortas="b-readelf">readelf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="size">
-        <term><command>size</command></term>
-        <listitem>
-          <para>Lists the section sizes and the total size for the given
-          object files</para>
-          <indexterm zone="ch-system-binutils size">
-            <primary sortas="b-size">size</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="strings">
-        <term><command>strings</command></term>
-        <listitem>
-          <para>Outputs, for each given file, the sequences of printable
-          characters that are of at least the specified length (defaulting to
-          four); for object files, it prints, by default, only the strings from
-          the initializing and loading sections while for other types of files,
-          it scans the entire file</para>
-          <indexterm zone="ch-system-binutils strings">
-            <primary sortas="b-strings">strings</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="strip">
-        <term><command>strip</command></term>
-        <listitem>
-          <para>Discards symbols from object files</para>
-          <indexterm zone="ch-system-binutils strip">
-            <primary sortas="b-strip">strip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libiberty">
-        <term><filename class="libraryfile">libiberty</filename></term>
-        <listitem>
-          <para>Contains routines used by various GNU programs, including
-          <command>getopt</command>, <command>obstack</command>,
-          <command>strerror</command>, <command>strtol</command>, and
-          <command>strtoul</command></para>
-          <indexterm zone="ch-system-binutils libiberty">
-            <primary sortas="c-libiberty">libiberty</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libbfd">
-        <term><filename class="libraryfile">libbfd</filename></term>
-        <listitem>
-          <para>The Binary File Descriptor library</para>
-          <indexterm zone="ch-system-binutils libbfd">
-            <primary sortas="c-libbfd">libbfd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libopcodes">
-        <term><filename class="libraryfile">libopcodes</filename></term>
-        <listitem>
-          <para>A library for dealing with opcodes&mdash;the <quote>readable
-          text</quote> versions of instructions for the processor;
-          it is used for building utilities like
-          <command>objdump</command>.</para>
-          <indexterm zone="ch-system-binutils libopcodes">
-            <primary sortas="c-libopcodes">libopcodes</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/bison.xml
===================================================================
--- BOOK/final-system/common/bison.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,110 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-bison" role="wrap">
-  <?dbhtml filename="bison.html"?>
-
-  <title>Bison-&bison-version;</title>
-
-  <indexterm zone="ch-system-bison">
-    <primary sortas="a-Bison">Bison</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Bison package contains a parser generator.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Bison</title>
-
-    <para os="a">Prepare Bison for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
-
-    <para os="b1">The configure system causes bison to be built without support
-    for internationalization of error messages if a <command>bison</command>
-    program is not already in $PATH.  The following addition will correct
-    this:</para>
-
-<screen os="b2"><userinput>echo '#define YYENABLE_NLS 1' >> config.h</userinput></screen>  
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:
-    <userinput>make check</userinput>.</para>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-bison" role="content">
-    <title>Contents of Bison</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed library</segtitle>
-
-      <seglistitem>
-        <seg>bison and yacc</seg>
-        <seg>liby.a</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bison">
-        <term><command>bison</command></term>
-        <listitem>
-          <para>Generates, from a series of rules, a program for analyzing
-          the structure of text files; Bison is a replacement for Yacc (Yet
-          Another Compiler Compiler)</para>
-          <indexterm zone="ch-system-bison bison">
-            <primary sortas="b-bison">bison</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="yacc">
-        <term><command>yacc</command></term>
-        <listitem>
-          <para>A wrapper for <command>bison</command>, meant for programs that
-          still call <command>yacc</command> instead of <command>bison</command>;
-          it calls <command>bison</command> with the <option>-y</option>
-          option</para>
-          <indexterm zone="ch-system-bison yacc">
-            <primary sortas="b-yacc">yacc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="liby.a">
-        <term><filename class="libraryfile">liby.a</filename></term>
-        <listitem>
-          <para>The Yacc library containing implementations of Yacc-compatible
-          <emphasis>yyerror</emphasis> and <emphasis>main</emphasis> functions;
-          this library is normally not very useful, but POSIX requires it</para>
-          <indexterm zone="ch-system-bison liby.a">
-            <primary sortas="c-liby.a">liby.a</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/bzip2.xml
===================================================================
--- BOOK/final-system/common/bzip2.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,211 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-bzip2" role="wrap">
-  <?dbhtml filename="bzip2.html"?>
-
-  <title>Bzip2-&bzip2-version;</title>
-
-  <indexterm zone="ch-system-bzip2">
-    <primary sortas="a-Bzip2">Bzip2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Bzip2 package contains programs for compressing and
-    decompressing files. Compressing text files with <command>bzip2</command>
-    yields a much better compression percentage than with the traditional
-    <command>gzip</command>.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Bzip2</title>
-
-    <para os="a">The Bzip2 package does not contain a <command>configure</command>
-    script. Compile it with:</para>
-
-<screen os="b"><userinput>make -f Makefile-libbz2_so
-make clean</userinput></screen>
-
-    <para os="c">The <parameter>-f</parameter> flag will cause Bzip2 to be built
-    using a different <filename>Makefile</filename> file, in this case the
-    <filename>Makefile-libbz2_so</filename> file, which creates a dynamic
-    <filename class="libraryfile">libbz2.so</filename> library and links the
-    Bzip2 utilities against it.</para>
-
-    <para os="d">Recompile the package using a non-shared library and test it:</para>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <para os="g">Install the programs:</para>
-
-<screen os="h"><userinput>make PREFIX=/usr install</userinput></screen>
-
-    <para os="i">Install the shared <command>bzip2</command> binary into the
-    <filename class="directory">/bin</filename> directory, make
-    some necessary symbolic links, and clean up:</para>
-
-<screen os="j"><userinput>cp -v bzip2-shared /bin/bzip2
-cp -av libbz2.so* /lib
-ln -sv ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so
-rm -v /usr/bin/{bunzip2,bzcat,bzip2}
-ln -sv bzip2 /bin/bunzip2
-ln -sv bzip2 /bin/bzcat</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-bzip2" role="content">
-    <title>Contents of Bzip2</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-
-      <seglistitem>
-        <seg>bunzip2 (link to bzip2), bzcat (link to bzip2), bzcmp, bzdiff,
-        bzegrep, bzfgrep, bzgrep, bzip2, bzip2recover, bzless, and bzmore</seg>
-        <seg>libbz2.a, libbz2.so (link to libbz2.so.1.0), libbz2.so.1.0 (link to
-        libbz2.so.&bzip2-version;), and libbz2.so.&bzip2-version;</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bunzip2">
-        <term><command>bunzip2</command></term>
-        <listitem>
-          <para>Decompresses bzipped files</para>
-          <indexterm zone="ch-system-bzip2 bunzip2">
-            <primary sortas="b-bunzip2">bunzip2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bzcat">
-        <term><command>bzcat</command></term>
-        <listitem>
-          <para>Decompresses to standard output</para>
-          <indexterm zone="ch-system-bzip2 bzcat">
-            <primary sortas="b-bzcat">bzcat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bzcmp">
-        <term><command>bzcmp</command></term>
-        <listitem>
-          <para>Runs <command>cmp</command> on bzipped files</para>
-          <indexterm zone="ch-system-bzip2 bzcmp">
-            <primary sortas="b-bzcmp">bzcmp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bzdiff">
-        <term><command>bzdiff</command></term>
-        <listitem>
-          <para>Runs <command>diff</command> on bzipped files</para>
-          <indexterm zone="ch-system-bzip2 bzdiff">
-            <primary sortas="b-bzdiff">bzdiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bzgrep">
-        <term><command>bzgrep</command></term>
-        <listitem>
-          <para>Runs <command>grep</command> on bzipped files</para>
-          <indexterm zone="ch-system-bzip2 bzgrep">
-            <primary sortas="b-bzgrep">bzgrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bzegrep">
-        <term><command>bzegrep</command></term>
-        <listitem>
-          <para>Runs <command>egrep</command> on bzipped files</para>
-          <indexterm zone="ch-system-bzip2 bzegrep">
-            <primary sortas="b-bzegrep">bzegrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bzfgrep">
-        <term><command>bzfgrep</command></term>
-        <listitem>
-          <para>Runs <command>fgrep</command> on bzipped files</para>
-          <indexterm zone="ch-system-bzip2 bzfgrep">
-            <primary sortas="b-bzfgrep">bzfgrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bzip2">
-        <term><command>bzip2</command></term>
-        <listitem>
-          <para>Compresses files using the Burrows-Wheeler block sorting text
-          compression algorithm with Huffman coding; the compression rate is
-          better than that achieved by more conventional compressors using
-          <quote>Lempel-Ziv</quote> algorithms, like <command>gzip</command></para>
-          <indexterm zone="ch-system-bzip2 bzip2">
-            <primary sortas="b-bzip2">bzip2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bzip2recover">
-        <term><command>bzip2recover</command></term>
-        <listitem>
-          <para>Tries to recover data from damaged bzipped files</para>
-          <indexterm zone="ch-system-bzip2 bzip2recover">
-            <primary sortas="b-bzip2recover">bzip2recover</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bzless">
-        <term><command>bzless</command></term>
-        <listitem>
-          <para>Runs <command>less</command> on bzipped files</para>
-          <indexterm zone="ch-system-bzip2 bzless">
-            <primary sortas="b-bzless">bzless</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="bzmore">
-        <term><command>bzmore</command></term>
-        <listitem>
-          <para>Runs <command>more</command> on bzipped files</para>
-          <indexterm zone="ch-system-bzip2 bzmore">
-            <primary sortas="b-bzmore">bzmore</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libbz2">
-        <term><filename class="libraryfile">libbz2*</filename></term>
-        <listitem>
-          <para>The library implementing lossless, block-sorting data
-          compression, using the Burrows-Wheeler algorithm</para>
-          <indexterm zone="ch-system-bzip2 libbz2">
-            <primary sortas="c-libbz2*">libbz2*</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/coreutils.xml
===================================================================
--- BOOK/final-system/common/coreutils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,1100 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-coreutils" role="wrap">
-  <?dbhtml filename="coreutils.html"?>
-
-  <title>Coreutils-&coreutils-version;</title>
-
-  <indexterm zone="ch-system-coreutils">
-    <primary sortas="a-Coreutils">Coreutils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Coreutils package contains utilities for showing and setting the
-    basic system characteristics.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Coreutils</title>
-
-    <para os="a">Prevent Coreutils from installing binaries that will be
-    installed by other packages:</para>
-
-<screen os="b"><userinput>patch -Np1 -i ../&coreutils-suppress-patch;</userinput></screen>
-
-    <para os="p1">A known issue with the <command>uname</command> program from
-    this package is that the <option>-p</option> switch always
-    returns <computeroutput>unknown</computeroutput>. The following patch
-    fixes this behavior for all architectures:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&coreutils-uname-patch;</userinput></screen>
-
-    <para os="s1">The following command renames the internal implementation of
-    futimens to gl_futimens as newer versions of Glibc provide an incompatible
-    version:</para>
-
-<screen os="s2"><userinput>sed -i "s/futimens/gl_&amp;/" $(grep -lr futimens *)</userinput></screen>
-
-    <para os="c">Now prepare Coreutils for compilation:</para>
-
-<screen os="d"><userinput>./configure --prefix=/usr</userinput></screen>
-
-    <para os="e">Compile the package:</para>
-
-<screen os="f"><userinput>make</userinput></screen>
-
-    <para os="g">The test suite of Coreutils makes several assumptions about the
-    presence of system users and groups that are not valid within the minimal
-    environment that exists at the moment. Therefore, additional items need
-    to be set up before running the tests. Skip down to <quote>Install the
-    package</quote> if not running the test suite.</para>
-
-    <para os="h">Create two <systemitem class="groupname">dummy</systemitem> groups
-    and a <systemitem class="username">dummy</systemitem> user:</para>
-
-<screen os="i"><userinput>echo "dummy1:x:1000:" &gt;&gt; /etc/group
-echo "dummy2:x:1001:dummy" &gt;&gt; /etc/group
-echo "dummy:x:1000:1000::/root:/bin/bash" &gt;&gt; /etc/passwd</userinput></screen>
-
-    <para os="j">Now the test suite is ready to be run. First, run
-    the tests that are meant to be run as user
-    <systemitem class="username">root</systemitem>:</para>
-
-<screen os="k"><userinput>make NON_ROOT_USERNAME=dummy check-root</userinput></screen>
-
-    <para os="l">Then run the remainder of the tests as the
-    <systemitem class="username">dummy</systemitem> user:</para>
-
-<screen os="m"><userinput>src/su dummy -c "make RUN_EXPENSIVE_TESTS=yes check"</userinput></screen>
-
-    <para os="n">When testing is complete, remove the
-    <systemitem class="username">dummy</systemitem> user and groups:</para>
-
-<screen os="o"><userinput>sed -i '/dummy/d' /etc/passwd /etc/group</userinput></screen>
-
-    <para os="p">Install the package:</para>
-
-<screen os="q"><userinput>make install</userinput></screen>
-
-    <para os="r">Move programs to the locations specified by the FHS:</para>
-
-<screen os="s"><userinput>mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date} /bin
-mv -v /usr/bin/{dd,df,echo,false,hostname,ln,ls,mkdir,mknod} /bin
-mv -v /usr/bin/{mv,pwd,rm,rmdir,stty,true,uname} /bin
-mv -v /usr/bin/chroot /usr/sbin</userinput></screen>
-
-    <para os="t">Other Coreutils programs are used by some of the scripts
-    in the CLFS-Bootscripts package. As <filename
-    class="directory">/usr</filename> may not be available during the early
-    stages of booting, those binaries need to be on the root partition:</para>
-
-<screen os="u"><userinput>mv -v /usr/bin/{[,basename,head,install,nice} /bin
-mv -v /usr/bin/{readlink,sleep,sync,test,touch} /bin
-ln -svf ../../bin/install /usr/bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-coreutils" role="content">
-    <title>Contents of Coreutils</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>[, base64, basename, cat, chgrp, chmod, chown, chroot, cksum,
-        comm, cp, csplit, cut, date, dd, df, dir, dircolors, dirname, du,
-        echo, env, expand, expr, factor, false, fmt, fold, groups, head,
-        hostid, hostname, id, install, join, link, ln, logname, ls, md5sum,
-        mkdir, mkfifo, mknod, mv, nice, nl, nohup, od, paste, pathchk, pinky,
-        pr, printenv, printf, ptx, pwd, readlink, rm, rmdir, seq, sha1sum,
-        sha224sum, sha256sum, sha384sum, sha512sum, shred, shuf, sleep, sort,
-        split, stat, stty, sum, sync, tac, tail, tee, test, touch, tr, true,
-        tsort, tty, uname, unexpand, uniq, unlink, users, vdir, wc, who,
-        whoami, and yes</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="base64">
-        <term><command>base64</command></term>
-        <listitem>
-          <para>Base64 encode/decode data and print to standard output</para>
-          <indexterm zone="ch-system-coreutils base64">
-            <primary sortas="b-base64">base64</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="basename">
-        <term><command>basename</command></term>
-        <listitem>
-          <para>Strips any path and a given suffix from a file name</para>
-          <indexterm zone="ch-system-coreutils basename">
-            <primary sortas="b-basename">basename</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cat">
-        <term><command>cat</command></term>
-        <listitem>
-          <para>Concatenates files to standard output</para>
-          <indexterm zone="ch-system-coreutils cat">
-            <primary sortas="b-cat">cat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="chgrp">
-        <term><command>chgrp</command></term>
-        <listitem>
-          <para>Changes the group ownership of files and directories</para>
-          <indexterm zone="ch-system-coreutils chgrp">
-            <primary sortas="b-chgrp">chgrp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="chmod">
-        <term><command>chmod</command></term>
-        <listitem>
-          <para>Changes the permissions of each file to the given mode; the mode
-          can be either a symbolic representation of the changes to make or an
-          octal number representing the new permissions</para>
-          <indexterm zone="ch-system-coreutils chmod">
-            <primary sortas="b-chmod">chmod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="chown">
-        <term><command>chown</command></term>
-        <listitem>
-          <para>Changes the user and/or group ownership of files and
-          directories</para>
-          <indexterm zone="ch-system-coreutils chown">
-            <primary sortas="b-chown">chown</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="chroot">
-        <term><command>chroot</command></term>
-        <listitem>
-          <para>Runs a command with the specified directory as the
-          <filename class="directory">/</filename> directory</para>
-          <indexterm zone="ch-system-coreutils chroot">
-            <primary sortas="b-chroot">chroot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cksum">
-        <term><command>cksum</command></term>
-        <listitem>
-          <para>Prints the Cyclic Redundancy Check (CRC) checksum and the byte
-          counts of each specified file</para>
-          <indexterm zone="ch-system-coreutils cksum">
-            <primary sortas="b-cksum">cksum</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="comm">
-        <term><command>comm</command></term>
-        <listitem>
-          <para>Compares two sorted files, outputting in three columns the lines
-          that are unique and the lines that are common</para>
-          <indexterm zone="ch-system-coreutils comm">
-            <primary sortas="b-comm">comm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cp">
-        <term><command>cp</command></term>
-        <listitem>
-          <para>Copies files</para>
-          <indexterm zone="ch-system-coreutils cp">
-            <primary sortas="b-cp">cp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="csplit">
-        <term><command>csplit</command></term>
-        <listitem>
-          <para>Splits a given file into several new files, separating them
-          according to given patterns or line numbers and outputting the byte
-          count of each new file</para>
-          <indexterm zone="ch-system-coreutils csplit">
-            <primary sortas="b-csplit">csplit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cut">
-        <term><command>cut</command></term>
-        <listitem>
-          <para>Prints sections of lines, selecting the parts according to given
-          fields or positions</para>
-          <indexterm zone="ch-system-coreutils cut">
-            <primary sortas="b-cut">cut</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="date">
-        <term><command>date</command></term>
-        <listitem>
-          <para>Displays the current time in the given format, or sets the
-          system date</para>
-          <indexterm zone="ch-system-coreutils date">
-            <primary sortas="b-date">date</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dd">
-        <term><command>dd</command> </term>
-        <listitem>
-          <para>Copies a file using the given block size and count, while
-          optionally performing conversions on it</para>
-          <indexterm zone="ch-system-coreutils dd">
-            <primary sortas="b-dd">dd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="df">
-        <term><command>df</command></term>
-        <listitem>
-          <para>Reports the amount of disk space available (and used) on all
-          mounted file systems, or only on the file systems holding the selected
-          files</para>
-          <indexterm zone="ch-system-coreutils df">
-            <primary sortas="b-df">df</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dir">
-        <term><command>dir</command></term>
-        <listitem>
-          <para>Lists the contents of each given directory (the same as
-          the <command>ls</command> command)</para>
-          <indexterm zone="ch-system-coreutils dir">
-            <primary sortas="b-dir">dir</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dircolors">
-        <term><command>dircolors</command></term>
-        <listitem>
-          <para>Outputs commands to set the <envar>LS_COLOR</envar>
-          environment variable to change the color scheme used by
-          <command>ls</command></para>
-          <indexterm zone="ch-system-coreutils dircolors">
-            <primary sortas="b-dircolors">dircolors</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dirname">
-        <term><command>dirname</command></term>
-        <listitem>
-          <para>Strips the non-directory suffix from a file name</para>
-          <indexterm zone="ch-system-coreutils dirname">
-            <primary sortas="b-dirname">dirname</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="du">
-        <term><command>du</command></term>
-        <listitem>
-          <para>Reports the amount of disk space used by the current directory,
-          by each of the given directories (including all subdirectories) or by
-          each of the given files</para>
-          <indexterm zone="ch-system-coreutils du">
-            <primary sortas="b-du">du</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="echo">
-        <term><command>echo</command></term>
-        <listitem>
-          <para>Displays the given strings</para>
-          <indexterm zone="ch-system-coreutils echo">
-            <primary sortas="b-echo">echo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="env">
-        <term><command>env</command></term>
-        <listitem>
-          <para>Runs a command in a modified environment</para>
-          <indexterm zone="ch-system-coreutils env">
-            <primary sortas="b-env">env</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="expand">
-        <term><command>expand</command></term>
-        <listitem>
-          <para>Converts tabs to spaces</para>
-          <indexterm zone="ch-system-coreutils expand">
-            <primary sortas="b-expand">expand</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="expr">
-        <term><command>expr</command></term>
-        <listitem>
-          <para>Evaluates expressions</para>
-          <indexterm zone="ch-system-coreutils expr">
-            <primary sortas="b-expr">expr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="factor">
-        <term><command>factor</command></term>
-        <listitem>
-          <para>Prints the prime factors of all specified integer numbers</para>
-          <indexterm zone="ch-system-coreutils factor">
-            <primary sortas="b-factor">factor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="false">
-        <term><command>false</command></term>
-        <listitem>
-          <para>Does nothing, unsuccessfully; it always exits with a status code
-          indicating failure</para>
-          <indexterm zone="ch-system-coreutils false">
-            <primary sortas="b-false">false</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fmt">
-        <term><command>fmt</command></term>
-        <listitem>
-          <para>Reformats the paragraphs in the given files</para>
-          <indexterm zone="ch-system-coreutils fmt">
-            <primary sortas="b-fmt">fmt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fold">
-        <term><command>fold</command></term>
-        <listitem>
-          <para>Wraps the lines in the given files</para>
-          <indexterm zone="ch-system-coreutils fold">
-            <primary sortas="b-fold">fold</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="groups">
-        <term><command>groups</command></term>
-        <listitem>
-          <para>Reports a user's group memberships</para>
-          <indexterm zone="ch-system-coreutils groups">
-            <primary sortas="b-groups">groups</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="head">
-        <term><command>head</command></term>
-        <listitem>
-          <para>Prints the first ten lines (or the given number of lines)
-          of each given file</para>
-          <indexterm zone="ch-system-coreutils head">
-            <primary sortas="b-head">head</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hostid">
-        <term><command>hostid</command></term>
-        <listitem>
-          <para>Reports the numeric identifier (in hexadecimal) of the host</para>
-          <indexterm zone="ch-system-coreutils hostid">
-            <primary sortas="b-hostid">hostid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hostname">
-        <term><command>hostname</command></term>
-        <listitem>
-          <para>Reports or sets the name of the host</para>
-          <indexterm zone="ch-system-coreutils hostname">
-            <primary sortas="b-hostname">hostname</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="id">
-        <term><command>id</command></term>
-        <listitem>
-          <para>Reports the effective user ID, group ID, and group memberships
-          of the current user or specified user</para>
-          <indexterm zone="ch-system-coreutils id">
-            <primary sortas="b-id">id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="install">
-        <term><command>install</command> </term>
-        <listitem>
-          <para>Copies files while setting their permission modes and, if
-          possible, their owner and group</para>
-          <indexterm zone="ch-system-coreutils install">
-            <primary sortas="b-install">install</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="join">
-        <term><command>join</command></term>
-        <listitem>
-          <para>Joins the lines that have identical join fields from two
-          separate files</para>
-          <indexterm zone="ch-system-coreutils join">
-            <primary sortas="b-join">join</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="link">
-        <term><command>link</command></term>
-        <listitem>
-          <para>Creates a hard link with the given name to a file</para>
-          <indexterm zone="ch-system-coreutils link">
-            <primary sortas="b-link">link</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ln">
-        <term><command>ln</command></term>
-        <listitem>
-          <para>Makes hard links or soft (symbolic) links between files</para>
-          <indexterm zone="ch-system-coreutils ln">
-            <primary sortas="b-ln">ln</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="logname">
-        <term><command>logname</command></term>
-        <listitem>
-          <para>Reports the current user's login name</para>
-          <indexterm zone="ch-system-coreutils logname">
-            <primary sortas="b-logname">logname</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ls">
-        <term><command>ls</command></term>
-        <listitem>
-          <para>Lists the contents of each given directory</para>
-          <indexterm zone="ch-system-coreutils ls">
-            <primary sortas="b-ls">ls</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="md5sum">
-        <term><command>md5sum</command></term>
-        <listitem>
-          <para>Reports or checks Message Digest 5 (MD5) checksums</para>
-          <indexterm zone="ch-system-coreutils md5sum">
-            <primary sortas="b-md5sum">md5sum</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkdir">
-        <term><command>mkdir</command></term>
-        <listitem>
-          <para>Creates directories with the given names</para>
-          <indexterm zone="ch-system-coreutils mkdir">
-            <primary sortas="b-mkdir">mkdir</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfifo">
-        <term><command>mkfifo</command></term>
-        <listitem>
-          <para>Creates First-In, First-Outs (FIFOs), a <quote>named
-          pipe</quote> in UNIX parlance, with the given names</para>
-          <indexterm zone="ch-system-coreutils mkfifo">
-            <primary sortas="b-mkfifo">mkfifo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mknod">
-        <term><command>mknod</command></term>
-        <listitem>
-          <para>Creates device nodes with the given names; a device node is a
-          character special file, a block special file, or a FIFO</para>
-          <indexterm zone="ch-system-coreutils mknod">
-            <primary sortas="b-mknod">mknod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mv">
-        <term><command>mv</command></term>
-        <listitem>
-          <para>Moves or renames files or directories</para>
-          <indexterm zone="ch-system-coreutils mv">
-            <primary sortas="b-mv">mv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nice">
-        <term><command>nice</command></term>
-        <listitem>
-          <para>Runs a program with modified scheduling priority</para>
-          <indexterm zone="ch-system-coreutils nice">
-            <primary sortas="b-nice">nice</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nl">
-        <term><command>nl</command></term>
-        <listitem>
-          <para>Numbers the lines from the given files</para>
-          <indexterm zone="ch-system-coreutils nl">
-            <primary sortas="b-nl">nl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nohup">
-        <term><command>nohup</command></term>
-        <listitem>
-          <para>Runs a command immune to hangups, with its output redirected to
-          a log file</para>
-          <indexterm zone="ch-system-coreutils nohup">
-            <primary sortas="b-nohup">nohup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="od">
-        <term><command>od</command></term>
-        <listitem>
-          <para>Dumps files in octal and other formats</para>
-          <indexterm zone="ch-system-coreutils od">
-            <primary sortas="b-od">od</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="paste">
-        <term><command>paste</command></term>
-        <listitem>
-          <para>Merges the given files, joining sequentially corresponding lines
-          side by side, separated by tab characters</para>
-          <indexterm zone="ch-system-coreutils paste">
-            <primary sortas="b-paste">paste</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pathchk">
-        <term><command>pathchk</command></term>
-        <listitem>
-          <para>Checks if file names are valid or portable</para>
-          <indexterm zone="ch-system-coreutils pathchk">
-            <primary sortas="b-pathchk">pathchk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pinky">
-        <term><command>pinky</command></term>
-        <listitem>
-          <para>Is a lightweight finger client; it reports some information
-          about the given users</para>
-          <indexterm zone="ch-system-coreutils pinky">
-            <primary sortas="b-pinky">pinky</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pr">
-        <term><command>pr</command></term>
-        <listitem>
-          <para>Paginates and columnates files for printing</para>
-          <indexterm zone="ch-system-coreutils pr">
-            <primary sortas="b-pr">pr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="printenv">
-        <term><command>printenv</command></term>
-        <listitem>
-          <para>Prints the environment</para>
-          <indexterm zone="ch-system-coreutils printenv">
-            <primary sortas="b-printenv">printenv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="printf">
-        <term><command>printf</command></term>
-        <listitem>
-          <para>Prints the given arguments according to the given format, much
-          like the C printf function</para>
-          <indexterm zone="ch-system-coreutils printf">
-            <primary sortas="b-printf">printf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ptx">
-        <term><command>ptx</command></term>
-        <listitem>
-          <para>Produces a permuted index from the contents of the given files,
-          with each keyword in its context</para>
-          <indexterm zone="ch-system-coreutils ptx">
-            <primary sortas="b-ptx">ptx</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pwd">
-        <term><command>pwd</command></term>
-        <listitem>
-          <para>Reports the name of the current working directory</para>
-          <indexterm zone="ch-system-coreutils pwd">
-            <primary sortas="b-pwd">pwd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="readlink">
-        <term><command>readlink</command></term>
-        <listitem>
-          <para>Reports the value of the given symbolic link</para>
-          <indexterm zone="ch-system-coreutils readlink">
-            <primary sortas="b-readlink">readlink</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rm">
-        <term><command>rm</command></term>
-        <listitem>
-          <para>Removes files or directories</para>
-          <indexterm zone="ch-system-coreutils rm">
-            <primary sortas="b-rm">rm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rmdir">
-        <term><command>rmdir</command></term>
-        <listitem>
-          <para>Removes directories if they are empty</para>
-          <indexterm zone="ch-system-coreutils rmdir">
-            <primary sortas="b-rmdir">rmdir</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="seq">
-        <term><command>seq</command></term>
-        <listitem>
-          <para>Prints a sequence of numbers within a given range and with a
-          given increment</para>
-          <indexterm zone="ch-system-coreutils seq">
-            <primary sortas="b-seq">seq</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sha1sum">
-        <term><command>sha1sum</command></term>
-        <listitem>
-          <para>Prints or checks 160-bit Secure Hash Algorithm 1 (SHA1)
-          checksums</para>
-          <indexterm zone="ch-system-coreutils sha1sum">
-            <primary sortas="b-sha1sum">sha1sum</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sha224sum">
-        <term><command>sha224sum</command></term>
-        <listitem>
-          <para>Prints or checks SHA224 checksums</para>
-          <indexterm zone="ch-system-coreutils sha224sum">
-            <primary sortas="b-sha224sum">sha224sum</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sha256sum">
-        <term><command>sha256sum</command></term>
-        <listitem>
-          <para>Prints or checks SHA256 checksums</para>
-          <indexterm zone="ch-system-coreutils sha256sum">
-            <primary sortas="b-sha256sum">sha256sum</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sha384sum">
-        <term><command>sha384sum</command></term>
-        <listitem>
-          <para>Prints or checks SHA384 checksums</para>
-          <indexterm zone="ch-system-coreutils sha384sum">
-            <primary sortas="b-sha384sum">sha384sum</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sha512sum">
-        <term><command>sha512sum</command></term>
-        <listitem>
-          <para>Prints or checks SHA512 checksums</para>
-          <indexterm zone="ch-system-coreutils sha512sum">
-            <primary sortas="b-sha512sum">sha512sum</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="shred">
-        <term><command>shred</command></term>
-        <listitem>
-          <para>Overwrites the given files repeatedly with complex patterns,
-          making it difficult to recover the data</para>
-          <indexterm zone="ch-system-coreutils shred">
-            <primary sortas="b-shred">shred</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="shuf">
-        <term><command>shuf</command></term>
-        <listitem>
-          <para>Write a random permutation of the input lines to standard output or a file</para>
-          <indexterm zone="ch-system-coreutils shuf">
-            <primary sortas="b-shuf">shuf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sleep">
-        <term><command>sleep</command></term>
-        <listitem>
-          <para>Pauses for the given amount of time</para>
-          <indexterm zone="ch-system-coreutils sleep">
-            <primary sortas="b-sleep">sleep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sort">
-        <term><command>sort</command></term>
-        <listitem>
-          <para>Sorts the lines from the given files</para>
-          <indexterm zone="ch-system-coreutils sort">
-            <primary sortas="b-sort">sort</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="split">
-        <term><command>split</command></term>
-        <listitem>
-          <para>Splits the given file into pieces, by size or by number of
-          lines</para>
-          <indexterm zone="ch-system-coreutils split">
-            <primary sortas="b-split">split</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="stat">
-        <term><command>stat</command></term>
-        <listitem>
-          <para>Displays file or filesystem status</para>
-          <indexterm zone="ch-system-coreutils stat">
-            <primary sortas="b-stat">stat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="stty">
-        <term><command>stty</command></term>
-        <listitem>
-          <para>Sets or reports terminal line settings</para>
-          <indexterm zone="ch-system-coreutils stty">
-            <primary sortas="b-stty">stty</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sum">
-        <term><command>sum</command></term>
-        <listitem>
-          <para>Prints checksum and block counts for each given file</para>
-          <indexterm zone="ch-system-coreutils sum">
-            <primary sortas="b-sum">sum</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sync">
-        <term><command>sync</command></term>
-        <listitem>
-          <para>Flushes file system buffers; it forces changed blocks to disk
-          and updates the super block</para>
-          <indexterm zone="ch-system-coreutils sync">
-            <primary sortas="b-sync">sync</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tac">
-        <term><command>tac</command></term>
-        <listitem>
-          <para>Concatenates the given files in reverse</para>
-          <indexterm zone="ch-system-coreutils tac">
-            <primary sortas="b-tac">tac</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tail">
-        <term><command>tail</command></term>
-        <listitem>
-          <para>Prints the last ten lines (or the given number of lines) of each
-          given file</para>
-          <indexterm zone="ch-system-coreutils tail">
-            <primary sortas="b-tail">tail</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tee">
-        <term><command>tee</command></term>
-        <listitem>
-          <para>Reads from standard input while writing both to standard output
-          and to the given files</para>
-          <indexterm zone="ch-system-coreutils tee">
-            <primary sortas="b-tee">tee</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="test">
-        <term><command>test</command> or <command>[</command></term>
-        <listitem>
-          <para>Compares values and checks file types</para>
-          <indexterm zone="ch-system-coreutils test">
-            <primary sortas="b-test">test</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="touch">
-        <term><command>touch</command></term>
-        <listitem>
-          <para>Changes file timestamps, setting the access and modification
-          times of the given files to the current time; files that do not exist
-          are created with zero length</para>
-          <indexterm zone="ch-system-coreutils touch">
-            <primary sortas="b-touch">touch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tr">
-        <term><command>tr</command></term>
-        <listitem>
-          <para>Translates, squeezes, and deletes the given characters from
-          standard input</para>
-          <indexterm zone="ch-system-coreutils tr">
-            <primary sortas="b-tr">tr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="true">
-        <term><command>true</command></term>
-        <listitem>
-          <para>Does nothing, successfully; it always exits with a status code
-          indicating success</para>
-          <indexterm zone="ch-system-coreutils true">
-            <primary sortas="b-true">true</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tsort">
-        <term><command>tsort</command></term>
-        <listitem>
-          <para>Performs a topological sort; it writes a completely ordered list
-          according to the partial ordering in a given file</para>
-          <indexterm zone="ch-system-coreutils tsort">
-            <primary sortas="b-tsort">tsort</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tty">
-        <term><command>tty</command></term>
-        <listitem>
-          <para>Reports the file name of the terminal connected to standard
-          input</para>
-          <indexterm zone="ch-system-coreutils tty">
-            <primary sortas="b-tty">tty</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uname">
-        <term><command>uname</command></term>
-        <listitem>
-          <para>Reports system information</para>
-          <indexterm zone="ch-system-coreutils uname">
-            <primary sortas="b-uname">uname</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unexpand">
-        <term><command>unexpand</command></term>
-        <listitem>
-          <para>Converts spaces to tabs</para>
-          <indexterm zone="ch-system-coreutils unexpand">
-            <primary sortas="b-unexpand">unexpand</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uniq">
-        <term><command>uniq</command></term>
-        <listitem>
-          <para>Discards all but one of successive identical lines</para>
-          <indexterm zone="ch-system-coreutils uniq">
-            <primary sortas="b-uniq">uniq</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unlink">
-        <term><command>unlink</command></term>
-        <listitem>
-          <para>Removes the given file</para>
-          <indexterm zone="ch-system-coreutils unlink">
-            <primary sortas="b-unlink">unlink</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="users">
-        <term><command>users</command></term>
-        <listitem>
-          <para>Reports the names of the users currently logged on</para>
-          <indexterm zone="ch-system-coreutils users">
-            <primary sortas="b-users">users</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vdir">
-        <term><command>vdir</command></term>
-        <listitem>
-          <para>Is the same as <command>ls -l</command></para>
-          <indexterm zone="ch-system-coreutils vdir">
-            <primary sortas="b-vdir">vdir</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wc">
-        <term><command>wc</command></term>
-        <listitem>
-          <para>Reports the number of lines, words, and bytes for each given
-          file, as well as a total line when more than one file is given</para>
-          <indexterm zone="ch-system-coreutils wc">
-            <primary sortas="b-wc">wc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="who">
-        <term><command>who</command></term>
-        <listitem>
-          <para>Reports who is logged on</para>
-          <indexterm zone="ch-system-coreutils who">
-            <primary sortas="b-who">who</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="whoami">
-        <term><command>whoami</command></term>
-        <listitem>
-          <para>Reports the user name associated with the current effective
-          user ID</para>
-          <indexterm zone="ch-system-coreutils whoami">
-            <primary sortas="b-whoami">whoami</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="yes">
-        <term><command>yes</command></term>
-        <listitem>
-          <para>Repeatedly outputs <quote>y</quote> or a given string until
-          killed</para>
-          <indexterm zone="ch-system-coreutils yes">
-            <primary sortas="b-yes">yes</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/diffutils.xml
===================================================================
--- BOOK/final-system/common/diffutils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,106 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-diffutils" role="wrap">
-  <?dbhtml filename="diffutils.html"?>
-
-  <title>Diffutils-&diffutils-version;</title>
-
-  <indexterm zone="ch-system-diffutils">
-    <primary sortas="a-Diffutils">Diffutils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Diffutils package contains programs that show the differences
-    between files or directories.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Diffutils</title>
-
-    <para os="a">Prepare Diffutils for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">This package does not come with a test suite.</para>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-diffutils" role="content">
-    <title>Contents of Diffutils</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>cmp, diff, diff3, and sdiff</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cmp">
-        <term><command>cmp</command></term>
-        <listitem>
-          <para>Compares two files and reports whether or in which bytes
-          they differ</para>
-          <indexterm zone="ch-system-diffutils cmp">
-            <primary sortas="b-cmp">cmp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="diff">
-        <term><command>diff</command></term>
-        <listitem>
-          <para>Compares two files or directories and reports which lines in
-          the files differ</para>
-          <indexterm zone="ch-system-diffutils diff">
-            <primary sortas="b-diff">diff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="diff3">
-        <term><command>diff3</command></term>
-        <listitem>
-          <para>Compares three files line by line</para>
-          <indexterm zone="ch-system-diffutils diff3">
-            <primary sortas="b-diff3">diff3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sdiff">
-        <term><command>sdiff</command></term>
-        <listitem>
-          <para>Merges two files and interactively outputs the results</para>
-          <indexterm zone="ch-system-diffutils sdiff">
-            <primary sortas="b-sdiff">sdiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/e2fsprogs.xml
===================================================================
--- BOOK/final-system/common/e2fsprogs.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,475 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-e2fsprogs" role="wrap">
-  <?dbhtml filename="e2fsprogs.html"?>
-
-  <title>E2fsprogs-&e2fsprogs-version;</title>
-
-  <indexterm zone="ch-system-e2fsprogs">
-    <primary sortas="a-E2fsprogs">E2fsprogs</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The E2fsprogs package contains the utilities for handling the
-    <systemitem class="filesystem">ext2</systemitem> file system. It also
-    supports the <systemitem class="filesystem">ext3</systemitem> journaling
-    file system.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of E2fsprogs</title>
-
-    <para os="a">The E2fsprogs documentation recommends that the package be
-    built in a subdirectory of the source tree:</para>
-
-<screen os="b"><userinput>mkdir -v build
-cd build</userinput></screen>
-
-    <para os="c">Prepare E2fsprogs for compilation:</para>
-
-<screen os="d"><userinput>../configure --prefix=/usr --with-root-prefix="" \
-    --enable-elf-shlibs --disable-evms \
-    --with-cc=gcc</userinput></screen>
-
-    <variablelist os="e">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry os="e1">
-        <term><parameter>--with-root-prefix=""</parameter></term>
-        <listitem>
-          <para>Certain programs (such as the <command>e2fsck</command>
-          program) are considered essential programs. When, for example,
-          <filename class="directory">/usr</filename> is not mounted,
-          these programs still need to be available. They belong in
-          directories like <filename class="directory">/lib</filename> and
-          <filename class="directory">/sbin</filename>. If this option is
-          not passed to E2fsprogs' configure, the programs are installed into
-          the <filename class="directory">/usr</filename> directory.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="e2">
-        <term><parameter>--enable-elf-shlibs</parameter></term>
-        <listitem>
-          <para>This creates the shared libraries which some programs
-          in this package use.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="e3">
-        <term><parameter>--disable-evms</parameter></term>
-        <listitem>
-          <para>This disables the building of the Enterprise Volume
-          Management System (EVMS) plugin. This plugin is not up-to-date with
-          the latest EVMS internal interfaces and EVMS is not installed as part
-          of a base CLFS system, so the plugin is not required. See the EVMS
-          website at <ulink url="http://evms.sourceforge.net/"/> for more
-          information regarding EVMS.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="f">Compile the package:</para>
-
-<screen os="g"><userinput>make</userinput></screen>
-
-    <para os="h">To test the results, issue:
-    <userinput>make check</userinput>.</para>
-
-    <para os="i">Install the binaries, documentation and shared libraries:</para>
-
-<screen os="j"><userinput>make install</userinput></screen>
-
-    <para os="k">Install the static libraries and headers:</para>
-
-<screen os="l"><userinput>make install-libs</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-e2fsprogs" role="content">
-    <title>Contents of E2fsprogs</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-
-      <seglistitem>
-        <seg>badblocks, blkid, chattr, compile_et, debugfs, dumpe2fs,
-        e2fsck, e2image, e2label, filefrag, findfs, fsck, fsck.ext2, fsck.ext3,
-        logsave, lsattr, mk_cmds, mke2fs, mkfs.ext2, mkfs.ext3,
-        mklost+found, resize2fs, tune2fs, uuidd, and uuidgen.</seg>
-        <seg>libblkid.[a,so], libcom_err.[a,so], libe2p.[a,so],
-        libext2fs.[a,so], libss.[a,so], and libuuid.[a,so]</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="badblocks">
-        <term><command>badblocks</command></term>
-        <listitem>
-          <para>Searches a device (usually a disk partition) for bad
-          blocks</para>
-          <indexterm zone="ch-system-e2fsprogs badblocks">
-            <primary sortas="b-badblocks">badblocks</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="blkid">
-        <term><command>blkid</command></term>
-        <listitem>
-          <para>A command line utility to locate and print block device
-          attributes</para>
-          <indexterm zone="ch-system-e2fsprogs blkid">
-            <primary sortas="b-blkid">blkid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="chattr">
-        <term><command>chattr</command></term>
-        <listitem>
-          <para>Changes the attributes of files on an <systemitem
-          class="filesystem">ext2</systemitem> file system; it also
-          changes <systemitem class="filesystem">ext3</systemitem>
-          file systems, the journaling version of <systemitem
-          class="filesystem">ext2</systemitem> file systems</para>
-          <indexterm zone="ch-system-e2fsprogs chattr">
-            <primary sortas="b-chattr">chattr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="compile_et">
-        <term><command>compile_et</command></term>
-        <listitem>
-          <para>An error table compiler; it converts a table of error-code
-          names and messages into a C source file suitable for use with the
-          <filename class="libraryfile">com_err</filename> library</para>
-          <indexterm zone="ch-system-e2fsprogs compile_et">
-            <primary sortas="b-compile_et">compile_et</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="debugfs">
-        <term><command>debugfs</command></term>
-        <listitem>
-          <para>A file system debugger; it can be used to examine and change
-          the state of an <systemitem class="filesystem">ext2</systemitem>
-          file system</para>
-          <indexterm zone="ch-system-e2fsprogs debugfs">
-            <primary sortas="b-debugfs">debugfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dumpe2fs">
-        <term><command>dumpe2fs</command></term>
-        <listitem>
-          <para>Prints the super block and blocks group information for the
-          file system present on a given device</para>
-          <indexterm zone="ch-system-e2fsprogs dumpe2fs">
-            <primary sortas="b-dumpe2fs">dumpe2fs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="e2fsck">
-        <term><command>e2fsck</command></term>
-        <listitem>
-          <para>Is used to check, and optionally repair <systemitem
-          class="filesystem">ext2</systemitem> file systems and <systemitem
-          class="filesystem">ext3</systemitem> file systems</para>
-          <indexterm zone="ch-system-e2fsprogs e2fsck">
-            <primary sortas="b-e2fsck">e2fsck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="e2image">
-        <term><command>e2image</command></term>
-        <listitem>
-          <para>Is used to save critical <systemitem
-          class="filesystem">ext2</systemitem> file system data to a file</para>
-          <indexterm zone="ch-system-e2fsprogs e2image">
-            <primary sortas="b-e2image">e2image</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="e2label">
-        <term><command>e2label</command></term>
-        <listitem>
-          <para>Displays or changes the file system label on the <systemitem
-          class="filesystem">ext2</systemitem> file system present on a given
-          device</para>
-          <indexterm zone="ch-system-e2fsprogs e2label">
-            <primary sortas="b-e2label">e2label</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="filefrag">
-        <term><command>filefrag</command></term>
-        <listitem>
-          <para>Reports on how badly fragmented a particular file might be</para>
-          <indexterm zone="ch-system-e2fsprogs filefrag">
-            <primary sortas="b-filefrag">filefrag</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="findfs">
-        <term><command>findfs</command></term>
-        <listitem>
-          <para>Finds a file system by label or Universally Unique Identifier
-          (UUID)</para>
-          <indexterm zone="ch-system-e2fsprogs findfs">
-            <primary sortas="b-findfs">findfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fsck">
-        <term><command>fsck</command></term>
-        <listitem>
-          <para>Is used to check, and optionally repair, file systems</para>
-          <indexterm zone="ch-system-e2fsprogs fsck">
-            <primary sortas="b-fsck">fsck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fsck.ext2">
-        <term><command>fsck.ext2</command></term>
-        <listitem>
-          <para>By default checks <systemitem class="filesystem">ext2</systemitem>
-          file systems</para>
-          <indexterm zone="ch-system-e2fsprogs fsck.ext2">
-            <primary sortas="b-fsck.ext2">fsck.ext2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fsck.ext3">
-        <term><command>fsck.ext3</command></term>
-        <listitem>
-          <para>By default checks <systemitem class="filesystem">ext3</systemitem>
-          file systems</para>
-          <indexterm zone="ch-system-e2fsprogs fsck.ext3">
-            <primary sortas="b-fsck.ext3">fsck.ext3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="logsave">
-        <term><command>logsave</command></term>
-        <listitem>
-          <para>Saves the output of a command in a log file</para>
-          <indexterm zone="ch-system-e2fsprogs logsave">
-            <primary sortas="b-logsave">logsave</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lsattr">
-        <term><command>lsattr</command></term>
-        <listitem>
-          <para>Lists the attributes of files on a second extended file
-          system</para>
-          <indexterm zone="ch-system-e2fsprogs lsattr">
-            <primary sortas="b-lsattr">lsattr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mk_cmds">
-        <term><command>mk_cmds</command></term>
-        <listitem>
-          <para>Converts a table of command names and help messages into a C
-          source file suitable for use with the <filename
-          class="libraryfile">libss</filename> subsystem library</para>
-          <indexterm zone="ch-system-e2fsprogs mk_cmds">
-            <primary sortas="b-mk_cmds">mk_cmds</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mke2fs">
-        <term><command>mke2fs</command></term>
-        <listitem>
-          <para>Creates an <systemitem class="filesystem">ext2</systemitem>
-          or <systemitem class="filesystem">ext3</systemitem> file system on
-          the given device</para>
-          <indexterm zone="ch-system-e2fsprogs mke2fs">
-            <primary sortas="b-mke2fs">mke2fs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfs.ext2">
-        <term><command>mkfs.ext2</command></term>
-        <listitem>
-          <para>By default creates <systemitem class="filesystem">ext2</systemitem>
-          file systems</para>
-          <indexterm zone="ch-system-e2fsprogs mkfs.ext2">
-            <primary sortas="b-mkfs.ext2">mkfs.ext2</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfs.ext3">
-        <term><command>mkfs.ext3</command></term>
-        <listitem>
-          <para>By default creates <systemitem class="filesystem">ext3</systemitem>
-          file systems</para>
-          <indexterm zone="ch-system-e2fsprogs mkfs.ext3">
-            <primary sortas="b-mkfs.ext3">mkfs.ext3</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mklost-found">
-        <term><command>mklost+found</command></term>
-        <listitem>
-          <para>Used to create a <filename class="directory">lost+found</filename>
-          directory on an <systemitem class="filesystem">ext2</systemitem> file
-          system; it pre-allocates disk blocks to this directory to lighten the
-          task of <command>e2fsck</command></para>
-          <indexterm zone="ch-system-e2fsprogs mklost-found">
-            <primary sortas="b-mklost+found">mklost+found</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="resize2fs">
-        <term><command>resize2fs</command></term>
-        <listitem>
-          <para>Can be used to enlarge or shrink an <systemitem
-          class="filesystem">ext2</systemitem> file system</para>
-          <indexterm zone="ch-system-e2fsprogs resize2fs">
-            <primary sortas="b-resize2fs">resize2fs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tune2fs">
-        <term><command>tune2fs</command></term>
-        <listitem>
-          <para>Adjusts tunable file system parameters on an <systemitem
-          class="filesystem">ext2</systemitem> file system</para>
-          <indexterm zone="ch-system-e2fsprogs tune2fs">
-            <primary sortas="b-tune2fs">tune2fs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uuidd">
-        <term><command>uuidd</command></term>
-        <listitem>
-          <para>The uuidd daemon is used by the UUID library to generate
-          universally unique identifiers (UUIDs), especially time-based UUID's
-          in a secure and guaranteed-unique fashion, even in the face of large
-          numbers of threads trying to grab UUID's running on different CPU's.
-          </para>
-          <indexterm zone="ch-system-e2fsprogs uuidd">
-            <primary sortas="b-uuidd">uuidd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uuidgen">
-        <term><command>uuidgen</command></term>
-        <listitem>
-          <para>Creates new UUIDs. Each new UUID can reasonably be considered
-          unique among all UUIDs created, on the local system and on other
-          systems, in the past and in the future</para>
-          <indexterm zone="ch-system-e2fsprogs uuidgen">
-            <primary sortas="b-uuidgen">uuidgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libblkid">
-        <term><filename class="libraryfile">libblkid</filename></term>
-        <listitem>
-          <para>Contains routines for device identification and token
-          extraction</para>
-          <indexterm zone="ch-system-e2fsprogs libblkid">
-            <primary sortas="c-libblkid">libblkid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcom_err">
-        <term><filename class="libraryfile">libcom_err</filename></term>
-        <listitem>
-          <para>The common error display routine</para>
-          <indexterm zone="ch-system-e2fsprogs libcom_err">
-            <primary sortas="c-libcom_err">libcom_err</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libe2p">
-        <term><filename class="libraryfile">libe2p</filename></term>
-        <listitem>
-          <para>Used by <command>dumpe2fs</command>, <command>chattr</command>,
-          and <command>lsattr</command></para>
-          <indexterm zone="ch-system-e2fsprogs libe2p">
-            <primary sortas="c-libe2p">libe2p</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libext2fs">
-        <term><filename class="libraryfile">libext2fs</filename></term>
-        <listitem>
-          <para>Contains routines to enable user-level programs to manipulate an
-          <systemitem class="filesystem">ext2</systemitem> file system</para>
-          <indexterm zone="ch-system-e2fsprogs libext2fs">
-            <primary sortas="c-libext2fs">libext2fs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libss">
-        <term><filename class="libraryfile">libss</filename></term>
-        <listitem>
-          <para>Used by <command>debugfs</command></para>
-          <indexterm zone="ch-system-e2fsprogs libss">
-            <primary sortas="c-libss">libss</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libuuid">
-        <term><filename class="libraryfile">libuuid</filename></term>
-        <listitem>
-          <para>Contains routines for generating unique identifiers for objects
-          that may be accessible beyond the local system</para>
-          <indexterm zone="ch-system-e2fsprogs libuuid">
-            <primary sortas="c-libuuid">libuuid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/file.xml
===================================================================
--- BOOK/final-system/common/file.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,89 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-file" role="wrap">
-  <?dbhtml filename="file.html"?>
-
-  <title>File-&file-version;</title>
-
-  <indexterm zone="ch-system-file">
-    <primary sortas="a-File">File</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The File package contains a utility for determining the type of
-    a given file or files.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of File</title>
-
-    <para os="a">Prepare File for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">This package does not come with a test suite.</para>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-file" role="content">
-    <title>Contents of File</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed library</segtitle>
-
-      <seglistitem>
-        <seg>file</seg>
-        <seg>libmagic.[a,so]</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="file">
-        <term><command>file</command></term>
-        <listitem>
-          <para>Tries to classify each given file; it does this by performing
-          several tests&mdash;file system tests, magic number tests, and
-          language tests</para>
-          <indexterm zone="ch-system-file file">
-            <primary sortas="b-file">file</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmagic">
-        <term><filename class="libraryfile">libmagic</filename></term>
-        <listitem>
-          <para>Contains routines for magic number recognition, used by the
-          <command>file</command> program</para>
-          <indexterm zone="ch-system-file libmagic">
-            <primary sortas="c-libmagic">libmagic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/findutils.xml
===================================================================
--- BOOK/final-system/common/findutils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,174 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-findutils" role="wrap">
-  <?dbhtml filename="findutils.html"?>
-
-  <title>Findutils-&findutils-version;</title>
-
-  <indexterm zone="ch-system-findutils">
-    <primary sortas="a-Findutils">Findutils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Findutils package contains programs to find files. These programs
-    are provided to recursively search through a directory tree and to
-    create, maintain, and search a database (often faster than the recursive
-    find, but unreliable if the database has not been recently updated).</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Findutils</title>
-
-    <para os="a">Prepare Findutils for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr --libexecdir=/usr/lib/locate \
-    --localstatedir=/var/lib/locate</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--localstatedir</parameter></term>
-        <listitem>
-          <para>This option changes the location of the <command>locate</command>
-          database to be in <filename class="directory">/var/lib/locate</filename>,
-          which is FHS-compliant.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="d">Compile the package:</para>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <para os="f">To test the results, issue:
-    <userinput>make check</userinput>.</para>
-
-    <para os="g">Install the package:</para>
-
-<screen os="h"><userinput>make install</userinput></screen>
-
-    <para os="i">The <command>find</command> program is used by some of the scripts
-    in the CLFS-Bootscripts package. As <filename
-    class="directory">/usr</filename> may not be available during the early
-    stages of booting, the <command>find</command> binary needs to be on
-    the root partition:</para>
-
-<screen os="j"><userinput>mv -v /usr/bin/find /bin</userinput></screen>
-
-    <para os="k">The <command>updatedb</command> script needs to be modified
-    to point to the new location for <command>find</command>:</para> 
-
-<screen os="l"><userinput>sed -i 's@find:=${BINDIR}@find:=/bin@' /usr/bin/updatedb</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-findutils" role="content">
-    <title>Contents of Findutils</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>bigram, code, find, frcode, locate, updatedb, and xargs</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bigram">
-        <term><command>bigram</command></term>
-        <listitem>
-          <para>Was formerly used to produce <command>locate</command>
-          databases</para>
-          <indexterm zone="ch-system-findutils bigram">
-            <primary sortas="b-bigram">bigram</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="code">
-        <term><command>code</command></term>
-        <listitem>
-          <para>Was formerly used to produce <command>locate</command>
-          databases; it is the ancestor of <command>frcode</command>.</para>
-          <indexterm zone="ch-system-findutils code">
-            <primary sortas="b-code">code</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="find">
-        <term><command>find</command></term>
-        <listitem>
-          <para>Searches given directory trees for files matching the specified
-          criteria</para>
-          <indexterm zone="ch-system-findutils find">
-            <primary sortas="b-find">find</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="frcode">
-        <term><command>frcode</command></term>
-        <listitem>
-          <para>Is called by <command>updatedb</command> to compress the list
-          of file names; it uses front-compression, reducing the database size
-          by a factor of four to five.</para>
-          <indexterm zone="ch-system-findutils frcode">
-            <primary sortas="b-frcode">frcode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="locate">
-        <term><command>locate</command></term>
-        <listitem>
-          <para>Searches through a database of file names and reports the names
-          that contain a given string or match a given pattern</para>
-          <indexterm zone="ch-system-findutils locate">
-            <primary sortas="b-locate">locate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="updatedb">
-        <term><command>updatedb</command></term>
-        <listitem>
-          <para>Updates the <command>locate</command> database; it scans the
-          entire file system (including other file systems that are currently
-          mounted, unless told not to) and puts every file name it finds into
-          the database</para>
-          <indexterm zone="ch-system-findutils updatedb">
-            <primary sortas="b-updatedb">updatedb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xargs">
-        <term><command>xargs</command></term>
-        <listitem>
-          <para>Can be used to apply a given command to a list of files</para>
-          <indexterm zone="ch-system-findutils xargs">
-            <primary sortas="b-xargs">xargs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/flex.xml
===================================================================
--- BOOK/final-system/common/flex.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,133 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-flex" role="wrap">
-  <?dbhtml filename="flex.html"?>
-
-  <title>Flex-&flex-version;</title>
-
-  <indexterm zone="ch-system-flex">
-    <primary sortas="a-Flex">Flex</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Flex package contains a utility for generating programs that
-    recognize patterns in text.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Flex</title>
-
-    <para os="e">Prepare Flex for compilation:</para>
-
-<screen os="f"><userinput>./configure --prefix=/usr</userinput></screen>
-
-    <para os="g">Compile the package:</para>
-
-<screen os="h"><userinput>make</userinput></screen>
-
-    <para os="i">To test the results, issue:
-    <userinput>make check</userinput>.</para>
-
-    <para os="j">Install the package:</para>
-
-<screen os="k"><userinput>make install</userinput></screen>
-
-    <para os="l">There are some packages that expect to find the
-    <filename class="libraryfile">lex</filename> library in <filename
-    class="directory">/usr/lib</filename>. Create a symlink to account for
-    this:</para>
-
-<screen os="m"><userinput>ln -sv libfl.a /usr/lib/libl.a</userinput></screen>
-
-    <para os="n">A few programs do not know about <command>flex</command> yet and
-    try to run its predecessor, <command>lex</command>. To support those
-    programs, create a wrapper script named <filename>lex</filename> that
-    calls <filename>flex</filename> in <command>lex</command> emulation
-    mode:</para>
-
-<screen os="o"><userinput>cat &gt; /usr/bin/lex &lt;&lt; "EOF"
-<literal>#!/bin/sh
-# Begin /usr/bin/lex
-
-exec /usr/bin/flex -l "$@"
-
-# End /usr/bin/lex</literal>
-EOF
-chmod -v 755 /usr/bin/lex</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-flex" role="content">
-    <title>Contents of Flex</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed library</segtitle>
-
-      <seglistitem>
-        <seg>flex and lex</seg>
-        <seg>libfl.a</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="flex">
-        <term><command>flex</command></term>
-        <listitem>
-          <para>A tool for generating programs that recognize patterns in text;
-          it allows for the versatility to specify the rules for pattern-finding,
-          eradicating the need to develop a specialized program</para>
-          <indexterm zone="ch-system-flex flex">
-            <primary sortas="b-flex">flex</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lex">
-        <term><command>lex</command></term>
-        <listitem>
-          <para>A script that runs <command>flex</command> in
-          <command>lex</command> emulation mode</para>
-          <indexterm zone="ch-system-flex lex">
-            <primary sortas="b-lex">lex</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfl.a">
-        <term><filename class="libraryfile">libfl.a</filename></term>
-        <listitem>
-          <para>The <filename class="libraryfile">flex</filename> library</para>
-          <indexterm zone="ch-system-flex libfl.a">
-            <primary sortas="c-libfl.a">libfl.a</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libfl_pic.a">
-        <term><filename class="libraryfile">libfl_pic.a</filename></term>
-        <listitem>
-          <para>The <filename class="libraryfile">flex</filename> library</para>
-          <indexterm zone="ch-system-flex libfl_pic.a">
-            <primary sortas="c-libfl.a">libfl_pic.a</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/gawk.xml
===================================================================
--- BOOK/final-system/common/gawk.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,152 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gawk" role="wrap">
-  <?dbhtml filename="gawk.html"?>
-
-  <title>Gawk-&gawk-version;</title>
-
-  <indexterm zone="ch-system-gawk">
-    <primary sortas="a-Gawk">Gawk</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Gawk package contains programs for manipulating text
-    files.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gawk</title>
-
-    <para os="a">Prepare Gawk for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr --libexecdir=/usr/lib</userinput></screen>
-
-    <para os="h1">Now fix an issue that will cause the Gettext testsuite
-    to fail:</para>
-
-<screen os="h2"><userinput>echo '#define HAVE_LC_MESSAGES 1' >> config.h</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:
-    <userinput>make check</userinput>.</para>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-gawk" role="content">
-    <title>Contents of Gawk</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>awk (link to gawk), gawk, gawk-&gawk-version;, grcat, igawk,
-        pgawk, pgawk-&gawk-version;, and pwcat</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="awk">
-        <term><command>awk</command></term>
-        <listitem>
-          <para>A link to <command>gawk</command></para>
-          <indexterm zone="ch-system-gawk awk">
-            <primary sortas="b-awk">awk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gawk">
-        <term><command>gawk</command></term>
-        <listitem>
-          <para>A program for manipulating text files; it is the GNU
-          implementation of <command>awk</command></para>
-          <indexterm zone="ch-system-gawk gawk">
-            <primary sortas="b-gawk">gawk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gawk-version">
-        <term><command>gawk-&gawk-version;</command></term>
-          <listitem>
-          <para>A hard link to <command>gawk</command></para>
-          <indexterm zone="ch-system-gawk gawk-version">
-            <primary sortas="b-gawk-&gawk-version;">gawk-&gawk-version;</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grcat">
-        <term><command>grcat</command></term>
-        <listitem>
-          <para>Dumps the group database <filename>/etc/group</filename></para>
-          <indexterm zone="ch-system-gawk grcat">
-            <primary sortas="b-grcat">grcat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="igawk">
-        <term><command>igawk</command></term>
-        <listitem>
-          <para>Gives <command>gawk</command> the ability to include files</para>
-          <indexterm zone="ch-system-gawk igawk">
-            <primary sortas="b-igawk">igawk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pgawk">
-        <term><command>pgawk</command></term>
-        <listitem>
-          <para>The profiling version of <command>gawk</command></para>
-          <indexterm zone="ch-system-gawk pgawk">
-            <primary sortas="b-pgawk">pgawk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pgawk-version">
-        <term><command>pgawk-&gawk-version;</command></term>
-        <listitem>
-          <para>Hard link to <command>pgawk</command></para>
-          <indexterm zone="ch-system-gawk pgawk-version">
-            <primary sortas="b-pgawk-&gawk-version;">pgawk-&gawk-version;</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pwcat">
-        <term><command>pwcat</command></term>
-        <listitem>
-          <para>Dumps the password database <filename>/etc/passwd</filename></para>
-          <indexterm zone="ch-system-gawk pwcat">
-            <primary sortas="b-pwcat">pwcat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/gcc.xml
===================================================================
--- BOOK/final-system/common/gcc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,250 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The GCC package contains the GNU compiler collection, which includes
-    the C and C++ compilers.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--
-    <para os="p1">The following patch merges all updates from the &gcc-version; Branch
-    of GCC:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&gcc-branch_update-patch;</userinput></screen>
--->
-
-    <para os="p3">The following patch enables fixes compilation errors with the kernel:</para>
-
-<screen os="p4"><userinput>patch -Np1 -i ../&gcc-PR31490-patch;</userinput></screen>
-
-    <para os="d">Apply a <command>sed</command> substitution that will suppress the
-    installation of <filename class="libraryfile">libiberty.a</filename>. The
-    version of <filename class="libraryfile">libiberty.a</filename> provided by
-    Binutils will be used instead:</para>
-
-<screen os="e"><userinput>sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in</userinput></screen>
-
-    <para os="e1">GCC provides a <command>gccbug</command> script which detects at
-    compile time whether mktemp is present, and hardcodes the result in a test.
-    If mktemp is not found, the script will fall back to using less
-    random names for temporary files.  We will be installing mktemp
-    later, so the following sed will simulate its presence:</para>
-
-<screen os="e2"><userinput>sed -i 's/@have_mktemp_command@/yes/' gcc/gccbug.in</userinput></screen>
-
-    <para os="f">The GCC documentation recommends building GCC outside of the source
-    directory in a dedicated build directory:</para>
-
-<screen os="g"><userinput>mkdir -v ../gcc-build
-cd ../gcc-build</userinput></screen>
-
-    <para os="h">Prepare GCC for compilation:</para>
-
-<screen os="i"><userinput>../gcc-&gcc-version;/configure --prefix=/usr \
-    --libexecdir=/usr/lib --enable-shared --enable-threads=posix \
-    --enable-__cxa_atexit --enable-c99 --enable-long-long \
-    --enable-clocale=gnu --enable-languages=c,c++ \
-    --disable-multilib --disable-libstdcxx-pch</userinput></screen>
-
-    <para os="j">Compile the package:</para>
-
-<screen os="k"><userinput>make bootstrap</userinput></screen>
-
-    <important os="l">
-      <para>The test suite for GCC is considered
-      critical. Do not skip it under any circumstance.</para>
-    </important>
-
-    <para os="m">Test the results, but do not stop at errors:</para>
-
-<screen os="n"><userinput>make -k check</userinput></screen>
-
-    <para os="o">The <parameter>-k</parameter> flag is used to make the test suite
-    run through to completion and not stop at the first failure. The GCC test
-    suite is very comprehensive and is almost guaranteed to generate a few
-    failures. To receive a summary of the test suite results, run:</para>
-
-<screen os="p"><userinput>../gcc-&gcc-version;/contrib/test_summary</userinput></screen>
-
-    <para os="q">For only the summaries, pipe the output through
-    <userinput>grep -A7 Summ</userinput>.</para>
-
-    <para os="r">A few unexpected failures cannot always be avoided. The
-    GCC developers are usually aware of these issues, but have not
-    resolved them yet.</para>
-
-    <para os="s">Install the package:</para>
-
-<screen os="t"><userinput>make install</userinput></screen>
-
-    <para os="u">Some packages expect the C preprocessor to be installed in the
-    <filename class="directory">/lib</filename> directory.
-    To support those packages, create this symlink:</para>
-
-<screen os="v"><userinput>ln -sv ../usr/bin/cpp /lib</userinput></screen>
-
-    <para os="w">Many packages use the name <command>cc</command> to call the C
-    compiler. To satisfy those packages, create a symlink:</para>
-
-<screen os="x"><userinput>ln -sv gcc /usr/bin/cc</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-gcc" role="content">
-    <title>Contents of GCC</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-
-      <seglistitem>
-        <seg>c++, cc (link to gcc), cpp, g++, gcc, gccbug, and gcov</seg>
-        <seg>libgcc.a, libgcc_eh.a, libgcc_s.so, libgomp.[a,so], libmudflap.[a,so], 
-        libmudflapth.[a,so], libssp.[a,so], libstdc++.[a,so], and
-        libsupc++.a</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="cc">
-        <term><command>cc</command></term>
-        <listitem>
-          <para>The C compiler</para>
-          <indexterm zone="ch-system-gcc cc">
-            <primary sortas="b-cc">cc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cpp">
-        <term><command>cpp</command></term>
-        <listitem>
-          <para>The C preprocessor; it is used by the compiler to expand the
-          #include, #define, and similar statements in the source files</para>
-          <indexterm zone="ch-system-gcc cpp">
-            <primary sortas="b-cpp">cpp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="c">
-        <term><command>c++</command></term>
-        <listitem>
-          <para>The C++ compiler</para>
-          <indexterm zone="ch-system-gcc c">
-            <primary sortas="b-c++">c++</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="g">
-        <term><command>g++</command></term>
-        <listitem>
-          <para>The C++ compiler</para>
-          <indexterm zone="ch-system-gcc g">
-            <primary sortas="b-g++">g++</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gcc">
-        <term><command>gcc</command></term>
-        <listitem>
-          <para>The C compiler</para>
-          <indexterm zone="ch-system-gcc gcc">
-            <primary sortas="b-gcc">gcc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gccbug">
-        <term><command>gccbug</command></term>
-        <listitem>
-          <para>A shell script used to help create useful bug reports</para>
-          <indexterm zone="ch-system-gcc gccbug">
-            <primary sortas="b-gccbug">gccbug</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gcov">
-        <term><command>gcov</command></term>
-        <listitem>
-          <para>A coverage testing tool; it is used to analyze programs to
-          determine where optimizations will have the most effect</para>
-          <indexterm zone="ch-system-gcc gcov">
-            <primary sortas="b-gcov">gcov</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgcc">
-        <term><filename class="libraryfile">libgcc</filename></term>
-        <listitem>
-          <para>Contains run-time support for <command>gcc</command></para>
-          <indexterm zone="ch-system-gcc libgcc">
-            <primary sortas="c-libgcc*">libgcc*</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmudflap">
-        <term><filename class="libraryfile">libmudflap</filename></term>
-        <listitem>
-          <para>The libmudflap libraries are used by GCC for instrumenting
-          pointer and array dereferencing operations.</para>
-          <indexterm zone="ch-system-gcc libmudflap">
-            <primary sortas="c-libmudflap*">libmudflap*</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libstdc">
-        <term><filename class="libraryfile">libstdc++</filename></term>
-        <listitem>
-          <para>The standard C++ library</para>
-          <indexterm zone="ch-system-gcc libstdc">
-            <primary sortas="c-libstdc++">libstdc++</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libsupc">
-        <term><filename class="libraryfile">libsupc++</filename></term>
-        <listitem>
-          <para>Provides supporting routines for the C++ programming
-          language</para>
-          <indexterm zone="ch-system-gcc libsupc">
-            <primary sortas="c-libsupc++">libsupc++</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/gettext.xml
===================================================================
--- BOOK/final-system/common/gettext.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,369 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gettext" role="wrap">
-  <?dbhtml filename="gettext.html"?>
-
-  <title>Gettext-&gettext-version;</title>
-
-  <indexterm zone="ch-system-gettext">
-    <primary sortas="a-Gettext">Gettext</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Gettext package contains utilities for internationalization
-    and localization. These allow programs to be compiled with NLS (Native
-    Language Support), enabling them to output messages in the user's native
-    language.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gettext</title>
-
-    <para os="a">Prepare Gettext for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue: <userinput>make check</userinput>.</para>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-gettext" role="content">
-    <title>Contents of Gettext</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-
-      <seglistitem>
-        <seg>autopoint, envsubst, gettext, gettext.sh, gettextize, hostname,
-        msgattrib, msgcat, msgcmp, msgcomm, msgconv, msgen, msgexec, msgfilter,
-        msgfmt, msggrep, msginit, msgmerge, msgunfmt, msguniq, ngettext,
-        recode-sr-latin, and xgettext</seg>
-        <seg>libasprintf.[a,so], libgettextlib.so, libgettextpo.[a,so], and
-        libgettextsrc.so</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="autopoint">
-        <term><command>autopoint</command></term>
-        <listitem>
-          <para>Copies standard Gettext infrastructure files into a source
-          package</para>
-          <indexterm zone="ch-system-gettext autopoint">
-            <primary sortas="b-autopoint">autopoint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="envsubst">
-        <term><command>envsubst</command></term>
-        <listitem>
-          <para>Substitutes environment variables in shell format strings</para>
-          <indexterm zone="ch-system-gettext envsubst">
-            <primary sortas="b-envsubst">envsubst</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gettext">
-        <term><command>gettext</command></term>
-        <listitem>
-          <para>Translates a natural language message into the user's language
-          by looking up the translation in a message catalog</para>
-          <indexterm zone="ch-system-gettext gettext">
-            <primary sortas="b-gettext">gettext</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gettext.sh">
-        <term><command>gettext.sh</command></term>
-        <listitem>
-          <para>Primarily serves as a shell function library for gettext</para>
-          <indexterm zone="ch-system-gettext gettext.sh">
-            <primary sortas="b-gettext.sh">gettext.sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gettextize">
-        <term><command>gettextize</command></term>
-        <listitem>
-          <para>Copies all standard Gettext files into the given top-level
-          directory of a package to begin internationalizing it</para>
-          <indexterm zone="ch-system-gettext gettextize">
-            <primary sortas="b-gettextize">gettextize</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hostname-gettext">
-        <term><command>hostname</command></term>
-        <listitem>
-          <para>Displays a network hostname in various forms</para>
-          <indexterm zone="ch-system-gettext hostname-gettext">
-            <primary sortas="b-hostname-gettext">hostname</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="msgattrib">
-        <term><command>msgattrib</command></term>
-        <listitem>
-          <para>Filters the messages of a translation catalog according to their
-          attributes and manipulates the attributes</para>
-          <indexterm zone="ch-system-gettext msgattrib">
-            <primary sortas="b-msgattrib">msgattrib</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="msgcat">
-        <term><command>msgcat</command></term>
-        <listitem>
-          <para>Concatenates and merges the given
-          <filename class="extension">.po</filename> files</para>
-          <indexterm zone="ch-system-gettext msgcat">
-            <primary sortas="b-msgcat">msgcat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="msgcmp">
-        <term><command>msgcmp</command></term>
-        <listitem>
-          <para>Compares two <filename class="extension">.po</filename>
-          files to check that both contain the same set of msgid strings</para>
-          <indexterm zone="ch-system-gettext msgcmp">
-            <primary sortas="b-msgcmp">msgcmp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="msgcomm">
-        <term><command>msgcomm</command></term>
-        <listitem>
-          <para>Finds the messages that are common to to the given
-          <filename class="extension">.po</filename> files</para>
-          <indexterm zone="ch-system-gettext msgcomm">
-            <primary sortas="b-msgcomm">msgcomm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="msgconv">
-        <term><command>msgconv</command></term>
-        <listitem>
-          <para>Converts a translation catalog to a different character
-          encoding</para>
-          <indexterm zone="ch-system-gettext msgconv">
-            <primary sortas="b-msgconv">msgconv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="msgen">
-        <term><command>msgen</command></term>
-        <listitem>
-          <para>Creates an English translation catalog</para>
-          <indexterm zone="ch-system-gettext msgen">
-            <primary sortas="b-msgen">msgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="msgexec">
-        <term><command>msgexec</command></term>
-        <listitem>
-          <para>Applies a command to all translations of a translation
-          catalog</para>
-          <indexterm zone="ch-system-gettext msgexec">
-            <primary sortas="b-msgexec">msgexec</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="msgfilter">
-        <term><command>msgfilter</command></term>
-        <listitem>
-          <para>Applies a filter to all translations of a translation
-          catalog</para>
-          <indexterm zone="ch-system-gettext msgfilter">
-            <primary sortas="b-msgfilter">msgfilter</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="msgfmt">
-        <term><command>msgfmt</command></term>
-        <listitem>
-          <para>Generates a binary message catalog from a translation
-          catalog</para>
-          <indexterm zone="ch-system-gettext msgfmt">
-            <primary sortas="b-msgfmt">msgfmt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="msggrep">
-        <term><command>msggrep</command></term>
-        <listitem>
-          <para>Extracts all messages of a translation catalog that match a
-          given pattern or belong to some given source files</para>
-          <indexterm zone="ch-system-gettext msggrep">
-            <primary sortas="b-msggrep">msggrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="msginit">
-        <term><command>msginit</command></term>
-        <listitem>
-          <para>Creates a new <filename class="extension">.po</filename> file,
-          initializing the meta information with values from the user's
-          environment</para>
-          <indexterm zone="ch-system-gettext msginit">
-            <primary sortas="b-msginit">msginit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="msgmerge">
-        <term><command>msgmerge</command></term>
-        <listitem>
-          <para>Combines two raw translations into a single file</para>
-          <indexterm zone="ch-system-gettext msgmerge">
-            <primary sortas="b-msgmerge">msgmerge</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="msgunfmt">
-        <term><command>msgunfmt</command></term>
-        <listitem>
-          <para>Decompiles a binary message catalog into raw translation
-          text</para>
-          <indexterm zone="ch-system-gettext msgunfmt">
-            <primary sortas="b-msgunfmt">msgunfmt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="msguniq">
-        <term><command>msguniq</command></term>
-        <listitem>
-          <para>Unifies duplicate translations in a translation catalog</para>
-          <indexterm zone="ch-system-gettext msguniq">
-            <primary sortas="b-msguniq">msguniq</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ngettext">
-        <term><command>ngettext</command></term>
-        <listitem>
-          <para>Displays native language translations of a textual message whose
-          grammatical form depends on a number</para>
-          <indexterm zone="ch-system-gettext ngettext">
-            <primary sortas="b-ngettext">ngettext</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="recode-sr-latin">
-        <term><command>recode-sr-latin</command></term>
-        <listitem>
-          <para>Recode Serbian text from Cyrillic to Latin script.</para>
-          <indexterm zone="ch-system-gettext recode-sr-latin">
-            <primary sortas="b-recode-sr-latin">recode-sr-latin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xgettext">
-        <term><command>xgettext</command></term>
-        <listitem>
-          <para>Extracts the translatable message lines from the given source
-          files to make the first translation template</para>
-          <indexterm zone="ch-system-gettext xgettext">
-            <primary sortas="b-xgettext">xgettext</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libasprintf">
-        <term><filename class="libraryfile">libasprintf</filename></term>
-        <listitem>
-          <para>defines the <emphasis>autosprintf</emphasis> class, which makes
-          C formatted output routines usable in C++ programs, for use with the
-          <emphasis>&lt;string&gt;</emphasis> strings and the
-          <emphasis>&lt;iostream&gt;</emphasis> streams</para>
-          <indexterm zone="ch-system-gettext libasprintf">
-            <primary sortas="c-libasprintf">libasprintf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgettextlib">
-        <term><filename class="libraryfile">libgettextlib</filename></term>
-        <listitem>
-          <para>a private library containing common routines used by the
-          various Gettext programs; these are not intended for general use</para>
-          <indexterm zone="ch-system-gettext libgettextlib">
-            <primary sortas="c-libgettextlib">libgettextlib</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgettextpo">
-        <term><filename class="libraryfile">libgettextpo</filename></term>
-        <listitem>
-          <para>Used to write specialized programs that process
-          <filename class="extension">.po</filename> files; this library is
-          used when the standard applications shipped with Gettext (such as
-          <command>msgcomm</command>, <command>msgcmp</command>,
-          <command>msgattrib</command>, and <command>msgen</command>) will
-          not suffice</para>
-          <indexterm zone="ch-system-gettext libgettextpo">
-            <primary sortas="c-libgettextpo">libgettextpo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libgettextsrc">
-        <term><filename class="libraryfile">libgettextsrc</filename></term>
-        <listitem>
-          <para>A private library containing common routines used by the
-          various Gettext programs; these are not intended for general use</para>
-          <indexterm zone="ch-system-gettext libgettextsrc">
-            <primary sortas="c-libgettextsrc">libgettextsrc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/glibc.xml
===================================================================
--- BOOK/final-system/common/glibc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,802 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version;</title>
-
-  <indexterm zone="ch-system-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Glibc package contains the main C library. This library provides
-    the basic routines for allocating memory, searching directories, opening and
-    closing files, reading and writing files, string handling, pattern matching,
-    arithmetic, and so on.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <note os="z">
-      <para>Some packages outside of CLFS suggest installing GNU libiconv in
-      order to translate data from one encoding to another. The project's
-      home page (<ulink url="http://www.gnu.org/software/libiconv/"/>) says
-      <quote>This library provides an <function>iconv()</function>
-      implementation, for use on systems which don't have one, or whose
-      implementation cannot convert from/to Unicode.</quote> Glibc provides
-      an <function>iconv()</function> implementation and can convert from/to
-      Unicode, therefore libiconv is not required on a CLFS system.</para>
-    </note>
-
-    <para os="b">The Glibc build system is self-contained and will install
-    perfectly, even though the compiler specs file and linker are still
-    pointing at <filename class="directory">/tools</filename>. The specs
-    and linker cannot be adjusted before the Glibc install because the
-    Glibc Autoconf tests would give false results and defeat the goal
-    of achieving a clean build.</para>
-
-    <para os="p1">The following patches merges all updates from the &glibc-version; Branch
-    from the Glibc developers:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&glibc-branch_update-patch;</userinput></screen>
-
-    <para os="c">The following patch fixes an issue that can
-    cause <command>localdef</command> to segfault:</para>
-
-<screen os="d"><userinput>patch -Np1 -i ../&glibc-localedef_segfault-patch;</userinput></screen>
-
-    <para os="e">The Glibc documentation recommends building Glibc outside of the
-    source directory in a dedicated build directory:</para>
-
-<screen os="f"><userinput>mkdir -v ../glibc-build
-cd ../glibc-build</userinput></screen>
-
-    <para os="g">Prepare Glibc for compilation:</para>
-
-<screen os="h"><userinput>../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
-    --libexecdir=/usr/lib/glibc</userinput></screen>
-
-    <variablelist os="i">
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry>
-        <term><parameter>--libexecdir=/usr/lib/glibc</parameter></term>
-        <listitem>
-          <para>This changes the location of the <command>pt_chown</command>
-          program from its default of <filename
-          class="directory">/usr/libexec</filename> to <filename
-          class="directory">/usr/lib/glibc</filename>.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para os="j">Compile the package:</para>
-
-<screen os="k"><userinput>make</userinput></screen>
-
-    <important os="l">
-      <para>The test suite for Glibc is considered critical.
-      Do not skip it under any circumstance.</para>
-    </important>
-
-    <para os="m">Test the results:</para>
-
-<!-- items n,o,p no longer the master, use x86_64 which has no failures -->
-
-<screen os="n"><userinput>make -k check &gt;glibc-check-log 2&gt;&amp;1 ; grep Error glibc-check-log</userinput></screen>
-
-    <para os="o">The Glibc test suite is highly dependent on certain functions of
-    the host system, in particular the kernel. The posix/annexc test normally fails
-    and you should see <literal>Error 1 (ignored)</literal> in the output. Apart
-    from this, the Glibc test suite is always expected to pass. However, in certain
-    circumstances, some failures are unavoidable. If a test fails because of a missing
-    program (or missing symbolic link), or a segfault, you will see an error code
-    greater than 127 and the details will be in the log. More commonly, tests will
-    fail with <literal>Error 2</literal> - for these, the contents of the corresponding
-    <filename>.out</filename> file, e.g. <filename>posix/annexc.out</filename> may be
-    informative. Here is a list of the most common issues:</para>
-
-    <itemizedlist os="p">
-      <listitem>
-        <para>The <emphasis>math</emphasis> tests sometimes fail.
-        Certain optimization settings are known to be a
-        factor here.</para>
-      </listitem>
-      <listitem>
-        <para>If you have mounted the CLFS partition with the
-        <parameter>noatime</parameter> option, the <emphasis>atime</emphasis> test
-        will fail. As mentioned in <xref linkend="ch-partitioning-mounting"/>,
-        do not use the <parameter>noatime</parameter> option while building
-        CLFS.</para>
-      </listitem>
-      <listitem>
-        <para>When running on older and slower hardware, some tests
-        can fail because of test timeouts being exceeded.</para>
-      </listitem>
-    </itemizedlist>
-
-    <para os="q">Though it is a harmless message, the install stage of Glibc will
-    complain about the absence of <filename>/etc/ld.so.conf</filename>.
-    Prevent this warning with:</para>
-
-<screen os="r"><userinput>touch /etc/ld.so.conf</userinput></screen>
-
-    <para os="s">Install the package:</para>
-
-<screen os="t"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="i18n-glibc" role="configuration">
-    <title>Internationalization</title>
-
-    <para>The locales that can make the system respond in a different
-    language were not installed by the above command. Install them
-    with:</para>
-
-<screen><userinput>make localedata/install-locales</userinput></screen>
-
-    <para>To save time, an alternative to running the previous command (which
-    generates and installs every locale listed in the
-    glibc-&glibc-version;/localedata/SUPPORTED file) is to install only
-    those locales that are wanted and needed. This can be achieved by using
-    the <command>localedef</command> command. Information on this command is
-    located in the <filename>INSTALL</filename> file in the Glibc source.
-    However, there are a number of locales that are essential in order for the
-    tests of future packages to pass, in particular, the
-    <emphasis>libstdc++</emphasis> tests from GCC. The following instructions,
-    instead of the <parameter>install-locales</parameter> target used above,
-    will install the minimum set of locales necessary for the tests to run
-    successfully:</para>
-
-<screen role="nodump"><userinput>mkdir -pv /usr/lib/locale
-localedef -i cs_CZ -f UTF-8 cs_CZ.UTF-8
-localedef -i de_DE -f ISO-8859-1 de_DE
-localedef -i de_DE@euro -f ISO-8859-15 de_DE@euro
-localedef -i en_HK -f ISO-8859-1 en_HK
-localedef -i en_PH -f ISO-8859-1 en_PH
-localedef -i en_US -f ISO-8859-1 en_US
-localedef -i es_MX -f ISO-8859-1 es_MX
-localedef -i fa_IR -f UTF-8 fa_IR
-localedef -i fr_FR -f ISO-8859-1 fr_FR
-localedef -i fr_FR@euro -f ISO-8859-15 fr_FR@euro
-localedef -i it_IT -f ISO-8859-1 it_IT
-localedef -i ja_JP -f EUC-JP ja_JP</userinput></screen>
-
-    <para>Some locales installed by the <command>make
-    localedata/install-locales</command> command above are not properly
-    supported by some applications that are in the CLFS and BLFS books. Because
-    of the various problems that arise due to application programmers making
-    assumptions that break in such locales, CLFS should not be used in locales
-    that utilize multibyte character sets (including UTF-8) or right-to-left
-    writing order.  Numerous unofficial and unstable patches are required to
-    fix these problems, and it has been decided by the CLFS developers not to
-    support such complex locales at this time. This applies to the ja_JP and
-    fa_IR locales as well&mdash;they have been installed only for GCC and
-    Gettext tests to pass, and the <command>watch</command> program (part of
-    the Procps package) does not work properly in them. Various attempts to
-    circumvent these restrictions are documented in internationalization-related
-    hints.</para>
-
-  </sect2>
-
-  <sect2 id="conf-glibc" role="configuration">
-    <title>Configuring Glibc</title>
-
-    <indexterm zone="conf-glibc">
-      <primary sortas="e-/etc/nsswitch.conf">/etc/nsswitch.conf</primary>
-    </indexterm>
-
-    <indexterm zone="conf-glibc">
-      <primary sortas="e-/etc/localtime">/etc/localtime</primary>
-    </indexterm>
-
-    <para>The <filename>/etc/nsswitch.conf</filename> file needs to be created
-    because, although Glibc provides defaults when this file is missing or
-    corrupt, the Glibc defaults do not work well in a networked environment.
-    The time zone also needs to be configured.</para>
-
-    <para>Create a new file <filename>/etc/nsswitch.conf</filename> by running
-    the following:</para>
-
-<screen><userinput>cat &gt; /etc/nsswitch.conf &lt;&lt; "EOF"
-<literal># Begin /etc/nsswitch.conf
-
-passwd: files
-group: files
-shadow: files
-
-hosts: files dns
-networks: files
-
-protocols: files
-services: files
-ethers: files
-rpc: files
-
-# End /etc/nsswitch.conf</literal>
-EOF</userinput></screen>
-
-    <para>To determine the local time zone, run the following script:</para>
-
-<screen role="nodump"><userinput>tzselect</userinput></screen>
-
-    <para>After answering a few questions about the location, the script will
-    output the name of the time zone (e.g., <emphasis>EST5EDT</emphasis> or
-    <emphasis>Canada/Eastern</emphasis>). Then create the
-    <filename>/etc/localtime</filename> file by running:</para>
-
-<screen><userinput>cp -v --remove-destination /usr/share/zoneinfo/<replaceable>[xxx]</replaceable> \
-    /etc/localtime</userinput></screen>
-
-    <para>Replace <replaceable>[xxx]</replaceable> with the name of the time zone
-    that <command>tzselect</command> provided (e.g., Canada/Eastern).</para>
-
-    <variablelist>
-      <title>The meaning of the cp option:</title>
-
-      <varlistentry>
-        <term><parameter>--remove-destination</parameter></term>
-        <listitem>
-          <para>This is needed to force removal of the already existing symbolic
-          link. The reason for copying the file instead of using a symlink is to
-          cover the situation where <filename class="directory">/usr</filename>
-          is on a separate partition. This could be important when booted into
-          single user mode.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-  <sect2 id="conf-ld" role="configuration">
-    <title>Configuring The Dynamic Loader</title>
-
-    <indexterm zone="conf-ld">
-      <primary sortas="e-/etc/ld.so.conf">/etc/ld.so.conf</primary>
-    </indexterm>
-
-    <para os="ld-a">By default, the dynamic loader (<filename
-    class="libraryfile">/lib/ld-linux.so.2</filename>) searches through
-    <filename class="directory">/lib</filename> and <filename
-    class="directory">/usr/lib</filename> for dynamic libraries that are
-    needed by programs as they are run. However, if there are libraries in
-    directories other than <filename class="directory">/lib</filename> and
-    <filename class="directory">/usr/lib</filename>, these need to be
-    added to the <filename>/etc/ld.so.conf</filename> file in order
-    for the dynamic loader to find them. Two directories that are commonly
-    known to contain additional libraries are <filename
-    class="directory">/usr/local/lib</filename> and <filename
-    class="directory">/opt/lib</filename>, so add those directories to the
-    dynamic loader's search path.</para>
-
-    <para os="ld-b">Create a new file <filename>/etc/ld.so.conf</filename> by running the
-    following:</para>
-
-<screen os="ld-c"><userinput>cat &gt; /etc/ld.so.conf &lt;&lt; "EOF"
-<literal># Begin /etc/ld.so.conf
-
-/usr/local/lib
-/opt/lib
-
-# End /etc/ld.so.conf</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-glibc" role="content">
-    <title>Contents of Glibc</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-
-      <seglistitem>
-        <seg>catchsegv, gencat, getconf, getent, iconv, iconvconfig, ldconfig,
-        ldd, lddlibc4, locale, localedef, mtrace, nscd,
-        pcprofiledump, pt_chown, rpcgen, rpcinfo, sln, sprof, tzselect, xtrace,
-        zdump, and zic</seg>
-        <seg>ld.so, libBrokenLocale.[a,so], libSegFault.so, libanl.[a,so],
-        libbsd-compat.a, libc.[a,so], libcrypt.[a,so], libdl.[a,so], libg.a,
-        libieee.a, libm.[a,so], libmcheck.a, libmemusage.so, libnsl.a,
-        libnss_compat.so, libnss_dns.so, libnss_files.so, libnss_hesiod.so,
-        libnss_nis.so, libnss_nisplus.so, libpcprofile.so, libpthread.[a,so],
-        libresolv.[a,so], librpcsvc.a, librt.[a,so], libthread_db.so, and
-        libutil.[a,so]</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="catchsegv">
-        <term><command>catchsegv</command></term>
-        <listitem>
-          <para>Can be used to create a stack trace when a program
-          terminates with a segmentation fault</para>
-          <indexterm zone="ch-system-glibc catchsegv">
-            <primary sortas="b-catchsegv">catchsegv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gencat">
-        <term><command>gencat</command></term>
-        <listitem>
-          <para>Generates message catalogues</para>
-          <indexterm zone="ch-system-glibc gencat">
-            <primary sortas="b-gencat">gencat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="getconf">
-        <term><command>getconf</command></term>
-        <listitem>
-          <para>Displays the system configuration values for file system specific
-          variables</para>
-          <indexterm zone="ch-system-glibc getconf">
-            <primary sortas="b-getconf">getconf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="getent">
-        <term><command>getent</command></term>
-        <listitem>
-          <para>Gets entries from an administrative database</para>
-          <indexterm zone="ch-system-glibc getent">
-            <primary sortas="b-getent">getent</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iconv">
-        <term><command>iconv</command></term>
-        <listitem>
-          <para>Performs character set conversion</para>
-          <indexterm zone="ch-system-glibc iconv">
-            <primary sortas="b-iconv">iconv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="iconvconfig">
-        <term><command>iconvconfig</command></term>
-        <listitem>
-          <para>Creates fastloading <command>iconv</command> module configuration
-          files</para>
-          <indexterm zone="ch-system-glibc iconvconfig">
-            <primary sortas="b-iconvconfig">iconvconfig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldconfig">
-        <term><command>ldconfig</command></term>
-        <listitem>
-          <para>Configures the dynamic linker runtime bindings</para>
-          <indexterm zone="ch-system-glibc ldconfig">
-            <primary sortas="b-ldconfig">ldconfig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ldd">
-        <term><command>ldd</command></term>
-        <listitem>
-          <para>Reports which shared libraries are required
-          by each given program or shared library</para>
-          <indexterm zone="ch-system-glibc ldd">
-            <primary sortas="b-ldd">ldd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lddlibc4">
-        <term><command>lddlibc4</command></term>
-        <listitem>
-          <para>Assists <command>ldd</command> with object files</para>
-          <indexterm zone="ch-system-glibc lddlibc4">
-            <primary sortas="b-lddlibc4">lddlibc4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="locale">
-        <term><command>locale</command></term>
-        <listitem>
-          <para>Tells the compiler to enable or disable the use of POSIX locales
-          for built-in operations</para>
-          <indexterm zone="ch-system-glibc locale">
-            <primary sortas="b-locale">locale</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="localedef">
-        <term><command>localedef</command></term>
-        <listitem>
-          <para>Compiles locale specifications</para>
-          <indexterm zone="ch-system-glibc localedef">
-            <primary sortas="b-localedef">localedef</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mtrace">
-        <term><command>mtrace</command></term>
-        <listitem>
-          <para>Reads and interprets a memory trace file and
-          displays a summary in human-readable format</para>
-          <indexterm zone="ch-system-glibc mtrace">
-            <primary sortas="b-mtrace">mtrace</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nscd">
-        <term><command>nscd</command></term>
-        <listitem>
-          <para>A daemon that provides a cache for the most common name
-          service requests</para>
-          <indexterm zone="ch-system-glibc nscd">
-            <primary sortas="b-nscd">nscd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pcprofiledump">
-        <term><command>pcprofiledump</command></term>
-        <listitem>
-          <para>Dumps information generated by PC profiling</para>
-          <indexterm zone="ch-system-glibc pcprofiledump">
-            <primary sortas="b-pcprofiledump">pcprofiledump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pt_chown">
-        <term><command>pt_chown</command></term>
-        <listitem>
-          <para>A helper program for <command>grantpt</command> to set the owner,
-          group and access permissions of a slave pseudo terminal</para>
-          <indexterm zone="ch-system-glibc pt_chown">
-            <primary sortas="b-pt_chown">pt_chown</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rpcgen">
-        <term><command>rpcgen</command></term>
-        <listitem>
-          <para>Generates C code to implement the Remote Procecure Call (RPC)
-          protocol</para>
-          <indexterm zone="ch-system-glibc rpcgen">
-            <primary sortas="b-rpcgen">rpcgen</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rpcinfo">
-        <term><command>rpcinfo</command></term>
-        <listitem>
-          <para>Makes an RPC call to an RPC server</para>
-          <indexterm zone="ch-system-glibc rpcinfo">
-            <primary sortas="b-rpcinfo">rpcinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sln">
-        <term><command>sln</command></term>
-        <listitem>
-          <para>A statically linked program that creates symbolic links</para>
-          <indexterm zone="ch-system-glibc sln">
-            <primary sortas="b-sln">sln</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sprof">
-        <term><command>sprof</command></term>
-        <listitem>
-          <para>Reads and displays shared object profiling data</para>
-          <indexterm zone="ch-system-glibc sprof">
-            <primary sortas="b-sprof">sprof</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tzselect">
-        <term><command>tzselect</command></term>
-        <listitem>
-          <para>Asks the user about the location of the
-          system and reports the corresponding time zone description</para>
-          <indexterm zone="ch-system-glibc tzselect">
-            <primary sortas="b-tzselect">tzselect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xtrace">
-        <term><command>xtrace</command></term>
-        <listitem>
-          <para>Traces the execution of a program by
-          printing the currently executed function</para>
-          <indexterm zone="ch-system-glibc xtrace">
-            <primary sortas="b-xtrace">xtrace</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zdump">
-        <term><command>zdump</command></term>
-        <listitem>
-          <para>The time zone dumper</para>
-          <indexterm zone="ch-system-glibc zdump">
-            <primary sortas="b-zdump">zdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zic">
-        <term><command>zic</command></term>
-        <listitem>
-          <para>The time zone compiler</para>
-          <indexterm zone="ch-system-glibc zic">
-            <primary sortas="b-zic">zic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ld.so">
-        <term><filename class="libraryfile">ld.so</filename></term>
-        <listitem>
-          <para>The helper program for shared library executables</para>
-          <indexterm zone="ch-system-glibc ld.so">
-            <primary sortas="c-ld.so">ld.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libBrokenLocale">
-        <term><filename class="libraryfile">libBrokenLocale</filename></term>
-        <listitem>
-          <para>Used by programs, such as Mozilla, to solve broken locales</para>
-          <indexterm zone="ch-system-glibc libBrokenLocale">
-            <primary sortas="c-libBrokenLocale">libBrokenLocale</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libSegFault">
-        <term><filename class="libraryfile">libSegFault</filename></term>
-        <listitem>
-          <para>The segmentation fault signal handler</para>
-          <indexterm zone="ch-system-glibc libSegFault">
-            <primary sortas="c-libSegFault">libSegFault</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libanl">
-        <term><filename class="libraryfile">libanl</filename></term>
-        <listitem>
-          <para>An asynchronous name lookup library</para>
-          <indexterm zone="ch-system-glibc libanl">
-            <primary sortas="c-libanl">libanl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libbsd-compat">
-        <term><filename class="libraryfile">libbsd-compat</filename></term>
-        <listitem>
-          <para>Provides the portability needed
-          in order to run certain Berkey Software Distribution (BSD) programs
-          under Linux</para>
-          <indexterm zone="ch-system-glibc libbsd-compat">
-            <primary sortas="c-libbsd-compat">libbsd-compat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libc">
-        <term><filename class="libraryfile">libc</filename></term>
-        <listitem>
-          <para>The main C library</para>
-          <indexterm zone="ch-system-glibc libc">
-            <primary sortas="c-libc">libc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcrypt">
-        <term><filename class="libraryfile">libcrypt</filename></term>
-        <listitem>
-          <para>The cryptography library</para>
-          <indexterm zone="ch-system-glibc libcrypt">
-            <primary sortas="c-libcrypt">libcrypt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libdl">
-        <term><filename class="libraryfile">libdl</filename></term>
-        <listitem>
-          <para>The dynamic linking interface library</para>
-          <indexterm zone="ch-system-glibc libdl">
-            <primary sortas="c-libdl">libdl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libg">
-        <term><filename class="libraryfile">libg</filename></term>
-        <listitem>
-          <para>A runtime library for <command>g++</command></para>
-          <indexterm zone="ch-system-glibc libg">
-            <primary sortas="c-libg">libg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libieee">
-        <term><filename class="libraryfile">libieee</filename></term>
-        <listitem>
-          <para>The Institute of Electrical and Electronic Engineers (IEEE)
-          floating point library</para>
-          <indexterm zone="ch-system-glibc libieee">
-            <primary sortas="c-libieee">libieee</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libm">
-        <term><filename class="libraryfile">libm</filename></term>
-        <listitem>
-          <para>The mathematical library</para>
-          <indexterm zone="ch-system-glibc libm">
-            <primary sortas="c-libm">libm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmcheck">
-        <term><filename class="libraryfile">libmcheck</filename></term>
-        <listitem>
-          <para>Contains code run at boot</para>
-          <indexterm zone="ch-system-glibc libmcheck">
-            <primary sortas="c-libmcheck">libmcheck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmemusage">
-        <term><filename class="libraryfile">libmemusage</filename></term>
-        <listitem>
-          <para>Used by <command>memusage</command> (included in Glibc, but
-          not built in a base CLFS system as it has additional dependencies)
-          to help collect information about the memory usage of a program</para>
-          <indexterm zone="ch-system-glibc libmemusage">
-            <primary sortas="c-libmemusage">libmemusage</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnsl">
-        <term><filename class="libraryfile">libnsl</filename></term>
-        <listitem>
-          <para>The network services library</para>
-          <indexterm zone="ch-system-glibc libnsl">
-            <primary sortas="c-libnsl">libnsl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnss">
-        <term><filename class="libraryfile">libnss</filename></term>
-        <listitem>
-          <para>The Name Service Switch libraries, containing functions for
-          resolving host names, user names, group names, aliases, services,
-          protocols, etc.</para>
-          <indexterm zone="ch-system-glibc libnss">
-            <primary sortas="c-libnss">libnss</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpcprofile">
-        <term><filename class="libraryfile">libpcprofile</filename></term>
-        <listitem>
-          <para>Contains profiling functions used to track the amount of CPU
-          time spent in specific source code lines</para>
-          <indexterm zone="ch-system-glibc libpcprofile">
-            <primary sortas="c-libpcprofile">libpcprofile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpthread">
-        <term><filename class="libraryfile">libpthread</filename></term>
-        <listitem>
-          <para>The POSIX threads library</para>
-          <indexterm zone="ch-system-glibc libpthread">
-            <primary sortas="c-libpthread">libpthread</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libresolv">
-        <term><filename class="libraryfile">libresolv</filename></term>
-        <listitem>
-          <para>Contains functions for creating, sending, and interpreting
-          packets to the Internet domain name servers</para>
-          <indexterm zone="ch-system-glibc libresolv">
-            <primary sortas="c-libresolv">libresolv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="librpcsvc">
-        <term><filename class="libraryfile">librpcsvc</filename></term>
-        <listitem>
-          <para>Contains functions providing miscellaneous RPC services</para>
-          <indexterm zone="ch-system-glibc librpcsvc">
-            <primary sortas="c-librpcsvc">librpcsvc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="librt">
-        <term><filename class="libraryfile">librt</filename></term>
-        <listitem>
-          <para>Contains functions providing most of the interfaces specified by
-          the POSIX.1b Realtime Extension</para>
-          <indexterm zone="ch-system-glibc librt">
-            <primary sortas="c-librt">librt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libthread_db">
-        <term><filename class="libraryfile">libthread_db</filename></term>
-        <listitem>
-          <para>Contains functions useful for
-          building debuggers for multi-threaded programs</para>
-          <indexterm zone="ch-system-glibc libthread_db">
-            <primary sortas="c-libthread_db">libthread_db</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libutil">
-        <term><filename class="libraryfile">libutil</filename></term>
-        <listitem>
-          <para>Contains code for <quote>standard</quote> functions used in
-          many different Unix utilities</para>
-          <indexterm zone="ch-system-glibc libutil">
-            <primary sortas="c-libutil">libutil</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/grep.xml
===================================================================
--- BOOK/final-system/common/grep.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,95 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-grep" role="wrap">
-  <?dbhtml filename="grep.html"?>
-
-  <title>Grep-&grep-version;</title>
-
-  <indexterm zone="ch-system-grep">
-    <primary sortas="a-Grep">Grep</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Grep package contains programs for searching through
-    files.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Grep</title>
-
-    <para os="a">Prepare Grep for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:
-    <userinput>make check</userinput>.</para>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-grep" role="content">
-    <title>Contents of Grep</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>egrep, fgrep, and grep</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="egrep">
-        <term><command>egrep</command></term>
-        <listitem>
-          <para>Prints lines matching an extended regular expression</para>
-          <indexterm zone="ch-system-grep egrep">
-            <primary sortas="b-egrep">egrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fgrep">
-        <term><command>fgrep</command></term>
-        <listitem>
-          <para>Prints lines matching a list of fixed strings</para>
-          <indexterm zone="ch-system-grep fgrep">
-            <primary sortas="b-fgrep">fgrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grep">
-        <term><command>grep</command></term>
-        <listitem>
-          <para>Prints lines matching a basic regular expression</para>
-          <indexterm zone="ch-system-grep grep">
-            <primary sortas="b-grep">grep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/groff.xml
===================================================================
--- BOOK/final-system/common/groff.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,484 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-groff" role="wrap">
-  <?dbhtml filename="groff.html"?>
-
-  <title>Groff-&groff-version;</title>
-
-  <indexterm zone="ch-system-groff">
-    <primary sortas="a-Groff">Groff</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Groff package contains programs for processing and formatting
-    text.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Groff</title>
-
-    <para os="a">Groff expects the environment variable <envar>PAGE</envar>
-    to contain the default paper size. For users in the United States,
-    <parameter>PAGE=letter</parameter> is appropriate. Elsewhere,
-    <parameter>PAGE=A4</parameter> may be more suitable.</para>
-
-    <para os="b">Prepare Groff for compilation:</para>
-
-<screen os="c"><userinput>PAGE=<replaceable>[paper_size]</replaceable> ./configure --prefix=/usr</userinput></screen>
-
-    <para os="d">Compile the package:</para>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <para os="f">This package does not come with a test suite.</para>
-
-    <para os="g">Install the package:</para>
-
-<screen os="h"><userinput>make install</userinput></screen>
-
-    <para os="i">Some documentation programs, such as <command>xman</command>,
-    will not work properly without the following symlinks:</para>
-
-<screen os="j"><userinput>ln -sv soelim /usr/bin/zsoelim
-ln -sv eqn /usr/bin/geqn
-ln -sv tbl /usr/bin/gtbl</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-groff" role="content">
-    <title>Contents of Groff</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>addftinfo, afmtodit, eqn, eqn2graph, gdiffmk, geqn (link to eqn),
-        grap2graph, grn, grodvi, groff, groffer, grog, grolbp, grolj4, grops,
-        grotty, gtbl (link to tbl), hpftodit, indxbib, lkbib, lookbib, mmroff,
-        neqn, nroff, pdfroff, pfbtops, pic, pic2graph, post-grohtml, pre-grohtml, refer,
-        soelim, tbl, tfmtodit, troff, and zsoelim (link to soelim)</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="addftinfo">
-        <term><command>addftinfo</command></term>
-        <listitem>
-          <para>Reads a troff font file and adds some additional font-metric
-          information that is used by the <command>groff</command> system</para>
-          <indexterm zone="ch-system-groff addftinfo">
-            <primary sortas="b-addftinfo">addftinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="afmtodit">
-        <term><command>afmtodit</command></term>
-        <listitem>
-          <para>Creates a font file for use with <command>groff</command> and
-          <command>grops</command></para>
-          <indexterm zone="ch-system-groff afmtodit">
-            <primary sortas="b-afmtodit">afmtodit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="eqn">
-        <term><command>eqn</command></term>
-        <listitem>
-          <para>Compiles descriptions of equations embedded within troff
-          input files into commands that are understood by
-          <command>troff</command></para>
-          <indexterm zone="ch-system-groff eqn">
-            <primary sortas="b-eqn">eqn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="eqn2graph">
-        <term><command>eqn2graph</command></term>
-        <listitem>
-          <para>Converts a troff EQN (equation) into a cropped image</para>
-          <indexterm zone="ch-system-groff eqn2graph">
-            <primary sortas="b-eqn2graph">eqn2graph</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gdiffmk">
-        <term><command>gdiffmk</command></term>
-        <listitem>
-          <para>Marks differences between groff/nroff/troff files</para>
-          <indexterm zone="ch-system-groff gdiffmk">
-            <primary sortas="b-gdiffmk">gdiffmk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="geqn">
-        <term><command>geqn</command></term>
-        <listitem>
-          <para>A link to <command>eqn</command></para>
-          <indexterm zone="ch-system-groff geqn">
-            <primary sortas="b-geqn">geqn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grap2graph">
-        <term><command>grap2graph</command></term>
-        <listitem>
-          <para>Converts a grap diagram into a cropped bitmap image</para>
-          <indexterm zone="ch-system-groff grap2graph">
-            <primary sortas="b-grap2graph">grap2graph</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grn">
-        <term><command>grn</command></term>
-        <listitem>
-          <para>A <command>groff</command> preprocessor for gremlin files</para>
-          <indexterm zone="ch-system-groff grn">
-            <primary sortas="b-grn">grn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grodvi">
-        <term><command>grodvi</command></term>
-        <listitem>
-          <para>A driver for <command>groff</command> that produces TeX dvi
-          format</para>
-          <indexterm zone="ch-system-groff grodvi">
-            <primary sortas="b-grodvi">grodvi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="groff">
-        <term><command>groff</command></term>
-        <listitem>
-          <para>A front-end to the groff document formatting system; normally, it
-          runs the <command>troff</command> program and a post-processor
-          appropriate for the selected device</para>
-          <indexterm zone="ch-system-groff groff">
-            <primary sortas="b-groff">groff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="groffer">
-        <term><command>groffer</command></term>
-        <listitem>
-          <para>Displays groff files and man pages on X and tty terminals</para>
-          <indexterm zone="ch-system-groff groffer">
-            <primary sortas="b-groffer">groffer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grog">
-        <term><command>grog</command></term>
-        <listitem>
-          <para>Reads files and guesses which of the <command>groff</command>
-          options <option>-e</option>, <option>-man</option>, <option>-me</option>,
-          <option>-mm</option>, <option>-ms</option>, <option>-p</option>,
-          <option>-s</option>, and <option>-t</option> are required for printing
-          files, and reports the <command>groff</command> command including those
-          options</para>
-          <indexterm zone="ch-system-groff grog">
-            <primary sortas="b-grog">grog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grolbp">
-        <term><command>grolbp</command></term>
-        <listitem>
-          <para>Is a <command>groff</command> driver for Canon CAPSL printers
-          (LBP-4 and LBP-8 series laser printers)</para>
-          <indexterm zone="ch-system-groff grolbp">
-            <primary sortas="b-grolbp">grolbp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grolj4">
-        <term><command>grolj4</command></term>
-        <listitem>
-          <para>Is a driver for <command>groff</command> that produces output
-          in PCL5 format suitable for an HP LaserJet 4 printer</para>
-          <indexterm zone="ch-system-groff grolj4">
-            <primary sortas="b-grolj4">grolj4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grops">
-        <term><command>grops</command></term>
-        <listitem>
-          <para>Translates the output of GNU <command>troff</command> to
-          PostScript</para>
-          <indexterm zone="ch-system-groff grops">
-            <primary sortas="b-grops">grops</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grotty">
-        <term><command>grotty</command></term>
-        <listitem>
-          <para>Translates the output of GNU <command>troff</command> into
-          a form suitable for typewriter-like devices</para>
-          <indexterm zone="ch-system-groff grotty">
-            <primary sortas="b-grotty">grotty</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gtbl">
-        <term><command>gtbl</command></term>
-        <listitem>
-          <para>A link to <command>tbl</command></para>
-          <indexterm zone="ch-system-groff gtbl">
-            <primary sortas="b-gtbl">gtbl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hpftodit">
-        <term><command>hpftodit</command></term>
-        <listitem>
-          <para>Creates a font file for use with <command>groff -Tlj4</command>
-          from an HP-tagged font metric file</para>
-          <indexterm zone="ch-system-groff hpftodit">
-            <primary sortas="b-hpftodit">hpftodit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="indxbib">
-        <term><command>indxbib</command></term>
-        <listitem>
-          <para>Creates an inverted index for the bibliographic databases with a
-          specified file for use with <command>refer</command>,
-          <command>lookbib</command>, and <command>lkbib</command></para>
-          <indexterm zone="ch-system-groff indxbib">
-            <primary sortas="b-indxbib">indxbib</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lkbib">
-        <term><command>lkbib</command></term>
-        <listitem>
-          <para>Searches bibliographic databases for references that contain
-          specified keys and reports any references found</para>
-          <indexterm zone="ch-system-groff lkbib">
-            <primary sortas="b-lkbib">lkbib</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lookbib">
-        <term><command>lookbib</command></term>
-        <listitem>
-          <para>Prints a prompt on the standard error (unless the standard input
-          is not a terminal), reads a line containing a set of keywords from the
-          standard input, searches the bibliographic databases in a specified file
-          for references containing those keywords, prints any references found
-          on the standard output, and repeats this process until the end of
-          input</para>
-          <indexterm zone="ch-system-groff lookbib">
-            <primary sortas="b-lookbib">lookbib</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mmroff">
-        <term><command>mmroff</command></term>
-        <listitem>
-          <para>A simple preprocessor for <command>groff</command></para>
-          <indexterm zone="ch-system-groff mmroff">
-            <primary sortas="b-mmroff">mmroff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="neqn">
-        <term><command>neqn</command></term>
-        <listitem>
-          <para>Formats equations for American Standard Code for Information
-          Interchange (ASCII) output</para>
-          <indexterm zone="ch-system-groff neqn">
-            <primary sortas="b-neqn">neqn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nroff">
-        <term><command>nroff</command></term>
-        <listitem>
-          <para>A script that emulates the <command>nroff</command> command
-          using <command>groff</command></para>
-          <indexterm zone="ch-system-groff nroff">
-            <primary sortas="b-nroff">nroff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pdfroff">
-        <term><command>pdfroff</command></term>
-        <listitem>
-          <para>Creates pdf documents using groff</para>
-          <indexterm zone="ch-system-groff pdfroff">
-            <primary sortas="b-pdfroff">pdfroff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pfbtops">
-        <term><command>pfbtops</command></term>
-        <listitem>
-          <para>Translates a PostScript font in <filename
-          class="extension">.pfb</filename> format to ASCII</para>
-          <indexterm zone="ch-system-groff pfbtops">
-            <primary sortas="b-pfbtops">pfbtops</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pic">
-        <term><command>pic</command></term>
-        <listitem>
-          <para>Compiles descriptions of pictures embedded within troff or
-          TeX input files into commands understood by TeX or
-          <command>troff</command></para>
-          <indexterm zone="ch-system-groff pic">
-            <primary sortas="b-pic">pic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pic2graph">
-        <term><command>pic2graph</command></term>
-        <listitem>
-          <para>Converts a PIC diagram into a cropped image</para>
-          <indexterm zone="ch-system-groff pic2graph">
-            <primary sortas="b-pic2graph">pic2graph</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="post-grohtml">
-        <term><command>post-grohtml</command></term>
-        <listitem>
-          <para>Translates the output of GNU <command>troff</command> to
-          HTML</para>
-          <indexterm zone="ch-system-groff post-grohtml">
-            <primary sortas="b-post-grohtml">post-grohtml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pre-grohtml">
-        <term><command>pre-grohtml </command></term>
-        <listitem>
-          <para>Translates the output of GNU <command>troff</command> to
-          HTML</para>
-          <indexterm zone="ch-system-groff pre-grohtml">
-            <primary sortas="b-pre-grohtml">pre-grohtml</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="refer">
-        <term><command>refer</command></term>
-        <listitem>
-          <para>Copies the contents of a file to the standard output, except
-          that lines between <emphasis>.[</emphasis> and <emphasis>.]</emphasis>
-          are interpreted as citations, and lines between <emphasis>.R1</emphasis>
-          and <emphasis>.R2</emphasis> are interpreted as commands for how
-          citations are to be processed</para>
-          <indexterm zone="ch-system-groff refer">
-            <primary sortas="b-refer">refer</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="soelim">
-        <term><command>soelim</command></term>
-        <listitem>
-          <para>Reads files and replaces lines of the form <emphasis>.so
-          file</emphasis> by the contents of the mentioned
-          <emphasis>file</emphasis></para>
-          <indexterm zone="ch-system-groff soelim">
-            <primary sortas="b-soelim">soelim</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tbl">
-        <term><command>tbl</command></term>
-        <listitem>
-          <para>Compiles descriptions of tables embedded within troff input
-          files into commands that are understood by
-          <command>troff</command></para>
-          <indexterm zone="ch-system-groff tbl">
-            <primary sortas="b-tbl">tbl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tfmtodit">
-        <term><command>tfmtodit</command></term>
-        <listitem>
-          <para>Creates a font file for use with <command>groff
-          -Tdvi</command></para>
-          <indexterm zone="ch-system-groff tfmtodit">
-            <primary sortas="b-tfmtodit">tfmtodit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="troff">
-        <term><command>troff</command></term>
-        <listitem>
-          <para>Is highly compatible with Unix <command>troff</command>; it
-          should usually be invoked using the <command>groff</command> command,
-          which will also run preprocessors and post-processors in the
-          appropriate order and with the appropriate options</para>
-          <indexterm zone="ch-system-groff troff">
-            <primary sortas="b-troff">troff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zsoelim">
-        <term><command>zsoelim</command></term>
-        <listitem>
-          <para>A link to <command>soelim</command></para>
-          <indexterm zone="ch-system-groff zsoelim">
-            <primary sortas="b-zsoelim">zsoelim</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/gzip.xml
===================================================================
--- BOOK/final-system/common/gzip.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,221 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gzip" role="wrap">
-  <?dbhtml filename="gzip.html"?>
-
-  <title>Gzip-&gzip-version;</title>
-
-  <indexterm zone="ch-system-gzip">
-    <primary sortas="a-Gzip">Gzip</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Gzip package contains programs for compressing and decompressing
-    files.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Gzip</title>
-
-    <para os="s1">The following command renames the internal implementation of
-    futimens to gl_futimens as newer versions of Glibc provide an incompatible
-    version:</para>
-
-<screen os="s2"><userinput>sed -i "s/futimens/gl_&amp;/" $(grep -lr futimens *)</userinput></screen>
-
-    <para os="a">Prepare Gzip for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue: <command>make check</command>.</para>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-    <para os="h">Now we will move some of utilities to /usr/bin to meet FHS compliance:</para>
-
-<screen os="i"><userinput>mv -v /bin/z{egrep,cmp,diff,fgrep,force,grep,less,more,new} /usr/bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-gzip" role="content">
-    <title>Contents of Gzip</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>gunzip, gzexe, gzip, uncompress, zcat, zcmp, zdiff,
-        zegrep, zfgrep, zforce, zgrep, zless, zmore, and znew</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="gunzip">
-        <term><command>gunzip</command></term>
-        <listitem>
-          <para>Decompresses gzipped files</para>
-          <indexterm zone="ch-system-gzip gunzip">
-            <primary sortas="b-gunzip">gunzip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gzexe">
-        <term><command>gzexe</command></term>
-        <listitem>
-          <para>Creates self-decompressing executable files</para>
-          <indexterm zone="ch-system-gzip gzexe">
-            <primary sortas="b-gzexe">gzexe</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gzip">
-        <term><command>gzip</command></term>
-        <listitem>
-          <para>Compresses the given files using Lempel-Ziv (LZ77) coding</para>
-          <indexterm zone="ch-system-gzip gzip">
-            <primary sortas="b-gzip">gzip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uncompress">
-        <term><command>uncompress</command></term>
-        <listitem>
-          <para>Decompresses compressed files</para>
-          <indexterm zone="ch-system-gzip uncompress">
-            <primary sortas="b-uncompress">uncompress</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zcat">
-        <term><command>zcat</command></term>
-        <listitem>
-          <para>Decompresses the given gzipped files to standard output</para>
-          <indexterm zone="ch-system-gzip zcat">
-            <primary sortas="b-zcat">zcat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zcmp">
-        <term><command>zcmp</command></term>
-        <listitem>
-          <para>Runs <command>cmp</command> on gzipped files</para>
-          <indexterm zone="ch-system-gzip zcmp">
-            <primary sortas="b-zcmp">zcmp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zdiff">
-        <term><command>zdiff</command></term>
-        <listitem>
-          <para>Runs <command>diff</command> on gzipped files</para>
-          <indexterm zone="ch-system-gzip zdiff">
-            <primary sortas="b-zdiff">zdiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zegrep">
-        <term><command>zegrep</command></term>
-        <listitem>
-          <para>Runs <command>egrep</command> on gzipped files</para>
-          <indexterm zone="ch-system-gzip zegrep">
-            <primary sortas="b-zegrep">zegrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zfgrep">
-        <term><command>zfgrep</command></term>
-        <listitem>
-          <para>Runs <command>fgrep</command> on gzipped files</para>
-          <indexterm zone="ch-system-gzip zfgrep">
-            <primary sortas="b-zfgrep">zfgrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zforce">
-        <term><command>zforce</command></term>
-        <listitem>
-          <para>Forces a <filename class="extension">.gz</filename> extension on
-          all given files that are gzipped files, so that <command>gzip</command>
-          will not compress them again; this can be useful when file names were
-          truncated during a file transfer</para>
-          <indexterm zone="ch-system-gzip zforce">
-            <primary sortas="b-zforce">zforce</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zgrep">
-        <term><command>zgrep</command></term>
-        <listitem>
-          <para>Runs <command>grep</command> on gzipped files</para>
-          <indexterm zone="ch-system-gzip zgrep">
-            <primary sortas="b-zgrep">zgrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zless">
-        <term><command>zless</command></term>
-        <listitem>
-          <para>Runs <command>less</command> on gzipped files</para>
-          <indexterm zone="ch-system-gzip zless">
-            <primary sortas="b-zless">zless</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="zmore">
-        <term><command>zmore</command></term>
-        <listitem>
-          <para>Runs <command>more</command> on gzipped files</para>
-          <indexterm zone="ch-system-gzip zmore">
-            <primary sortas="b-zmore">zmore</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="znew">
-        <term><command>znew</command></term>
-        <listitem>
-          <para>Re-compresses files from <command>compress</command> format to
-          <command>gzip</command> format&mdash;<filename
-          class="extension">.Z</filename> to <filename
-          class="extension">.gz</filename></para>
-          <indexterm zone="ch-system-gzip znew">
-            <primary sortas="b-znew">znew</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/iana-etc.xml
===================================================================
--- BOOK/final-system/common/iana-etc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,85 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-iana-etc" role="wrap">
-  <?dbhtml filename="iana-etc.html"?>
-
-  <title>Iana-Etc-&iana-etc-version;</title>
-
-  <indexterm zone="ch-system-iana-etc">
-    <primary sortas="a-Iana-Etc">Iana-Etc</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Iana-Etc package provides data for network services and
-    protocols.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Iana-Etc</title>
-
-    <para os="a">The following command converts the raw data provided by IANA into
-    the correct formats for the <filename>/etc/protocols</filename> and
-    <filename>/etc/services</filename> data files:</para>
-
-<screen os="b"><userinput>make</userinput></screen>
-
-    <para os="c">This package does not come with a test suite.</para>
-
-    <para os="d">Install the package:</para>
-
-<screen os="e"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-iana-etc" role="content">
-    <title>Contents of Iana-Etc</title>
-
-    <segmentedlist>
-      <segtitle>Installed files</segtitle>
-
-      <seglistitem>
-        <seg>/etc/protocols and /etc/services</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="protocols">
-        <term><filename>/etc/protocols</filename></term>
-        <listitem>
-          <para>Describes the various DARPA Internet protocols that are
-          available from the TCP/IP subsystem</para>
-          <indexterm zone="ch-system-iana-etc">
-            <primary sortas="e-/etc/protocols">/etc/protocols</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="services">
-        <term><filename>/etc/services</filename></term>
-        <listitem>
-          <para>Provides a mapping between friendly textual names for internet
-          services, and their underlying assigned port numbers and protocol
-          types</para>
-          <indexterm zone="ch-system-iana-etc">
-            <primary sortas="e-/etc/services">/etc/services</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/inetutils.xml
===================================================================
--- BOOK/final-system/common/inetutils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,221 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-inetutils" role="wrap">
-  <?dbhtml filename="inetutils.html"?>
-
-  <title>Inetutils-&inetutils-version;</title>
-
-  <indexterm zone="ch-system-inetutils">
-    <primary sortas="a-Inetutils">Inetutils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Inetutils package contains programs for basic networking.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Inetutils</title>
-
-    <para os="p1">Not all programs that come with Inetutils will be installed.
-    However, the Inetutils build system will insist on installing all the
-    man pages anyway. The following patch will correct this
-    situation:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&inetutils-man_pages-patch;</userinput></screen>
-
-    <para os="a">Prepare Inetutils for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr --libexecdir=/usr/sbin \
-    --sysconfdir=/etc --localstatedir=/var \
-    --disable-logger --disable-syslogd \
-    --disable-whois --disable-servers</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--disable-logger</parameter></term>
-        <listitem>
-          <para>This option prevents Inetutils from installing the
-          <command>logger</command> program, which is used by scripts to
-          pass messages to the System Log Daemon. Do not install it because
-          Util-linux-ng installs a better version later.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-syslogd</parameter></term>
-        <listitem>
-          <para>This option prevents Inetutils from installing the System Log
-          Daemon, which is installed with the Sysklogd package.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-whois</parameter></term>
-        <listitem>
-          <para>This option disables the building of the Inetutils
-          <command>whois</command> client, which is out of date.
-          Instructions for a better <command>whois</command> client are
-          in the CBLFS book.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-servers</parameter></term>
-        <listitem>
-          <para>This disables the installation of the various network
-          servers included as part of the Inetutils package. These servers are
-          deemed not appropriate in a basic CLFS system.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para os="d">Compile the package:</para>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <para os="f">This package does not come with a test suite.</para>
-
-    <para os="g">Install the package:</para>
-
-<screen os="h"><userinput>make install</userinput></screen>
-
-    <para os="i">Move the <command>ping</command> and <command>ping6</command>
-     programs to their FHS-compliant place:</para>
-
-<screen os="j"><userinput>mv -v /usr/bin/ping{,6} /bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-inetutils" role="content">
-    <title>Contents of Inetutils</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>ftp, ifconfig, ping, ping6, rcp, rlogin, rsh, talk, telnet, and tftp</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ftp">
-        <term><command>ftp</command></term>
-        <listitem>
-          <para>Is the file transfer protocol program</para>
-          <indexterm zone="ch-system-inetutils ftp">
-            <primary sortas="b-ftp">ftp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ifconfig">
-        <term><command>ifconfig</command></term>
-        <listitem>
-          <para>Utility for configuring network interfaces</para>
-          <indexterm zone="ch-system-inetutils ifconfig">
-            <primary sortas="b-ifconfig">ifconfig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ping">
-        <term><command>ping</command></term>
-        <listitem>
-          <para>Sends echo-request packets and reports how long the replies
-          take. This is the IPV4 version</para>
-          <indexterm zone="ch-system-inetutils ping">
-            <primary sortas="b-ping">ping</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ping6">
-        <term><command>ping6</command></term>
-        <listitem>
-          <para>Sends echo-request packets and reports how long the replies
-          take. This is the IPV6 version</para>
-          <indexterm zone="ch-system-inetutils ping6">
-            <primary sortas="b-ping6">ping6</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rcp">
-        <term><command>rcp</command></term>
-        <listitem>
-          <para>Performs remote file copy</para>
-          <indexterm zone="ch-system-inetutils rcp">
-            <primary sortas="b-rcp">rcp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rlogin">
-        <term><command>rlogin</command></term>
-        <listitem>
-          <para>Performs remote login</para>
-          <indexterm zone="ch-system-inetutils rlogin">
-            <primary sortas="b-rlogin">rlogin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rsh">
-        <term><command>rsh</command></term>
-        <listitem>
-          <para>Runs a remote shell</para>
-          <indexterm zone="ch-system-inetutils rsh">
-            <primary sortas="b-rsh">rsh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="talk">
-        <term><command>talk</command></term>
-        <listitem>
-          <para>Is used to chat with another user</para>
-          <indexterm zone="ch-system-inetutils talk">
-            <primary sortas="b-talk">talk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="telnet">
-        <term><command>telnet</command></term>
-        <listitem>
-          <para>An interface to the TELNET protocol</para>
-          <indexterm zone="ch-system-inetutils telnet">
-            <primary sortas="b-telnet">telnet</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tftp">
-        <term><command>tftp</command></term>
-        <listitem>
-          <para>A trivial file transfer program</para>
-          <indexterm zone="ch-system-inetutils tftp">
-            <primary sortas="b-tftp">tftp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/introduction.xml
===================================================================
--- BOOK/final-system/common/introduction.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-introduction">
-  <?dbhtml filename="introduction.html"?>
-
-  <title>Introduction</title>
-
-  <para os="a">In this chapter, we enter the building site and start
-  constructing the CLFS system in earnest. The installation of this
-  software is straightforward. Although in many cases the installation
-  instructions could be made shorter and more generic, we have opted
-  to provide the full instructions for every package to minimize the
-  possibilities for mistakes.  The key to learning what makes a Linux
-  system work is to know what each package is used for and why the user
-  (or the system) needs it.  For every installed package, a summary of
-  its contents is given, followed by concise descriptions of each
-  program and library the package installed.</para>
-
-  <para os="b">If using compiler optimizations, please review the
-  optimization hint at <ulink url="&hints-root;optimization.txt"/>.
-  Compiler optimizations can make a program run slightly faster, but
-  they may also cause compilation difficulties and problems when
-  running the program. If a package refuses to compile when using
-  optimization, try to compile it without optimization and see if
-  that fixes the problem. Even if the package
-  does compile when using optimization, there is the risk it may have
-  been compiled incorrectly because of the complex interactions between
-  the code and build tools.  Also note that the <option>-march</option>
-  and <option>-mtune</option> options may cause problems with the toolchain
-  packages (Binutils, GCC and Glibc). The small potential gains achieved in
-  using compiler optimizations are often outweighed by the risks. First-time
-  builders of CLFS are encouraged to build without custom optimizations.
-  The subsequent system will still run very fast and be stable at the
-  same time.</para>
-
-  <para os="c">The order that packages are installed in this chapter needs to
-  be strictly followed to ensure that no program accidentally acquires a
-  path referring to <filename class="directory">/tools</filename>
-  hard-wired into it. For the same reason, do not compile packages in
-  parallel. Compiling in parallel may save time (especially on dual-CPU
-  machines), but it could result in a program containing a hard-wired
-  path to <filename class="directory">/tools</filename>, which will
-  cause the program to stop working when that directory is
-  removed.</para>
-
-  <para os="d">To keep track of which package installs particular files, a
-  package manager can be used. For a general overview of different styles of
-  package managers, please take a look at the next page.</para>
-
-</sect1>
Index: OK/final-system/common/iproute2.xml
===================================================================
--- BOOK/final-system/common/iproute2.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,279 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-iproute2" role="wrap">
-  <?dbhtml filename="iproute2.html"?>
-
-  <title>IPRoute2-&iproute2-version;</title>
-
-  <indexterm zone="ch-system-iproute2">
-    <primary sortas="a-IPRoute2">IPRoute2</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The IPRoute2 package contains programs for basic and advanced
-    IPV4-based networking.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of IPRoute2</title>
-
-    <para os="s1">The <command>arpd</command> binary included in this package is
-    dependent on Berkeley DB.  Because <command>arpd</command> is not a
-    very common requirement on a base Linux system, remove the dependency
-    on Berkeley DB by applying the <command>sed</command> command below.
-    If the <command>arpd</command> binary is needed, instructions for
-    compiling Berkeley DB can be found in the BLFS Book at <ulink
-    url="&cblfs-root;index.php/Berkeley_DB"/>.</para>
-
-<screen os="s2"><userinput>sed -i '/^TARGETS/s@arpd@@g' misc/Makefile</userinput></screen>
-
-    <para os="a">Compile the package:</para>
-
-<screen os="b"><userinput>make SBINDIR=/sbin</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the make option:</title>
-
-      <varlistentry>
-        <term><parameter>SBINDIR=/sbin</parameter></term>
-        <listitem>
-          <para>This ensures that the IPRoute2 binaries will install into
-          <filename class="directory">/sbin</filename>. This is the correct
-          location according to the FHS, because some of the IPRoute2 binaries
-          are used by the CLFS-Bootscripts package.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para os="d">This package does not come with a test suite.</para>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make SBINDIR=/sbin install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-iproute2" role="content">
-    <title>Contents of IPRoute2</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>ctstat (link to lnstat), ifcfg, ifstat, ip, lnstat, nstat,
-        routef, routel, rtacct, rtmon, rtpr, rtstat (link to lnstat), ss,
-        and tc</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="ctstat">
-        <term><command>ctstat</command></term>
-        <listitem>
-          <para>Connection status utility</para>
-          <indexterm zone="ch-system-iproute2 ctstat">
-            <primary sortas="b-ctstat">ctstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ifcfg">
-        <term><command>ifcfg</command></term>
-        <listitem>
-          <para>A shell script wrapper for the <command>ip</command>
-          command</para>
-          <indexterm zone="ch-system-iproute2 ifcfg">
-            <primary sortas="b-ifcfg">ifcfg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ifstat">
-        <term><command>ifstat</command></term>
-        <listitem>
-          <para>Shows the interface statistics, including the amount of
-          transmitted and received packets by interface</para>
-          <indexterm zone="ch-system-iproute2 ifstat">
-            <primary sortas="b-ifstat">ifstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ip">
-        <term><command>ip</command></term>
-        <listitem>
-          <para>The main executable. It has several different functions:</para>
-
-          <para><command>ip link <replaceable>[device]</replaceable></command>
-          allows users to look at the state of devices and to make changes</para>
-
-          <para><command>ip addr</command> allows users to look at addresses and
-          their properties, add new addresses, and delete old ones</para>
-
-          <para><command>ip neighbor</command> allows users to look at neighbor
-          bindings and their properties, add new neighbor entries, and delete
-          old ones</para>
-
-          <para><command>ip rule</command> allows users to look at the routing
-          policies and change them</para>
-
-          <para><command>ip route</command> allows users to look at the routing
-          table and change routing table rules</para>
-
-          <para><command>ip tunnel</command> allows users to look at the IP
-          tunnels and their properties, and change them</para>
-
-          <para><command>ip maddr</command> allows users to look at the multicast
-          addresses and their properties, and change them</para>
-
-          <para><command>ip mroute</command> allows users to set, change, or
-          delete the multicast routing</para>
-
-          <para><command>ip monitor</command> allows users to continously monitor
-          the state of devices, addresses and routes</para>
-          <indexterm zone="ch-system-iproute2 ip">
-            <primary sortas="b-ip">ip</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lnstat">
-        <term><command>lnstat</command></term>
-        <listitem>
-          <para>Provides Linux network statistics. It is a generalized and more
-          feature-complete replacement for the old <command>rtstat</command>
-          program</para>
-          <indexterm zone="ch-system-iproute2 lnstat">
-            <primary sortas="b-lnstat">lnstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nstat">
-        <term><command>nstat</command></term>
-        <listitem>
-          <para>Shows network statistics</para>
-          <indexterm zone="ch-system-iproute2 nstat">
-            <primary sortas="b-nstat">nstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="routef">
-        <term><command>routef</command></term>
-        <listitem>
-          <para>A component of <command>ip route</command>. This is for flushing
-          the routing tables</para>
-          <indexterm zone="ch-system-iproute2 routef">
-            <primary sortas="b-routef">routef</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="routel">
-        <term><command>routel</command></term>
-        <listitem>
-          <para>A component of <command>ip route</command>. This is for listing
-          the routing tables</para>
-          <indexterm zone="ch-system-iproute2 routel">
-            <primary sortas="b-routel">routel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rtacct">
-        <term><command>rtacct</command></term>
-        <listitem>
-          <para>Displays the contents of
-          <filename>/proc/net/rt_acct</filename></para>
-          <indexterm zone="ch-system-iproute2 rtacct">
-            <primary sortas="b-rtacct">rtacct</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rtmon">
-        <term><command>rtmon</command></term>
-        <listitem>
-          <para>Route monitoring utility</para>
-          <indexterm zone="ch-system-iproute2 rtmon">
-            <primary sortas="b-rtmon">rtmon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rtpr">
-        <term><command>rtpr</command></term>
-        <listitem>
-          <para>Converts the output of <command>ip -o</command> back into a
-          readable form</para>
-          <indexterm zone="ch-system-iproute2 rtpr">
-            <primary sortas="b-rtpr">rtpr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rtstat">
-        <term><command>rtstat</command></term>
-        <listitem>
-          <para>Route status utility</para>
-          <indexterm zone="ch-system-iproute2 rtstat">
-            <primary sortas="b-rtstat">rtstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ss">
-        <term><command>ss</command></term>
-        <listitem>
-          <para>Similar to the <command>netstat</command> command; shows
-          active connections</para>
-          <indexterm zone="ch-system-iproute2 ss">
-            <primary sortas="b-ss">ss</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tc">
-        <term><command>tc</command></term>
-        <listitem>
-          <para>Traffic Controlling Executable; this is for Quality Of Service
-          (QOS) and Class Of Service (COS) implementations</para>
-
-          <para><command>tc qdisc</command> allows users to setup the queueing
-          discipline</para>
-
-          <para><command>tc class</command> allows users to setup classes based on
-          the queuing discipline scheduling</para>
-
-          <para><command>tc estimator</command> allows users to estimate the
-          network flow into a network</para>
-
-          <para><command>tc filter</command> allows users to setup the QOS/COS
-          packet filtering</para>
-
-          <para><command>tc policy</command> allows users to setup the QOS/COS
-          policies</para>
-          <indexterm zone="ch-system-iproute2 ss">
-            <primary sortas="b-tc">tc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/kbd.xml
===================================================================
--- BOOK/final-system/common/kbd.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,336 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-kbd" role="wrap">
-  <?dbhtml filename="kbd.html"?>
-
-  <title>Kbd-&kbd-version;</title>
-
-  <indexterm zone="ch-system-kbd">
-    <primary sortas="a-Kbd">Kbd</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Kbd package contains key-table files and keyboard
-    utilities.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Kbd</title>
-
-    <para os="a">Prepare Kbd for compilation:</para>
-
-<screen os="b"><userinput>./configure --datadir=/lib/kbd</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--datadir</parameter></term>
-        <listitem>
-          <para>This option places the Kbd data and keymap files into /lib/kbd,
-          as they are used by some of the scripts in the CLFS-Bootscripts
-          package and must be on the root partition.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="d">Compile the package:</para>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <para os="f">This package does not come with a test suite.</para>
-
-    <para os="g">Install the package:</para>
-
-<screen os="h"><userinput>make install</userinput></screen>
-
-    <para os="i">Some of the programs from Kbd are used by scripts
-    in the CLFS-Bootscripts package. As <filename
-    class="directory">/usr</filename> may not be available during the early
-    stages of booting, those binaries need to be on the root partition:</para>
-
-<screen os="j"><userinput>mv -v /usr/bin/{kbd_mode,openvt,setfont} /bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-kbd" role="content">
-    <title>Contents of Kbd</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>chvt, deallocvt, dumpkeys, fgconsole, getkeycodes, kbd_mode,
-        kbdrate, loadkeys, loadunimap, mapscrn, openvt, psfaddtable
-        (link to psfxtable), psfgettable (link to psfxtable), psfstriptable
-        (link to psfxtable), psfxtable, resizecons, setfont, setkeycodes,
-        setleds, setmetamode, showconsolefont, showkey, unicode_start, and
-        unicode_stop</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="chvt">
-        <term><command>chvt</command></term>
-        <listitem>
-          <para>Changes the foreground virtual terminal</para>
-          <indexterm zone="ch-system-kbd chvt">
-            <primary sortas="b-chvt">chvt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="deallocvt">
-        <term><command>deallocvt</command></term>
-        <listitem>
-          <para>Deallocates unused virtual terminals</para>
-          <indexterm zone="ch-system-kbd deallocvt">
-            <primary sortas="b-deallocvt">deallocvt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dumpkeys">
-        <term><command>dumpkeys</command></term>
-        <listitem>
-          <para>Dumps the keyboard translation tables</para>
-          <indexterm zone="ch-system-kbd dumpkeys">
-            <primary sortas="b-dumpkeys">dumpkeys</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fgconsole">
-        <term><command>fgconsole</command></term>
-        <listitem>
-          <para>Prints the number of the active virtual terminal</para>
-          <indexterm zone="ch-system-kbd fgconsole">
-            <primary sortas="b-fgconsole">fgconsole</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="getkeycodes">
-        <term><command>getkeycodes</command></term>
-        <listitem>
-          <para>Prints the kernel scancode-to-keycode mapping table</para>
-          <indexterm zone="ch-system-kbd getkeycodes">
-            <primary sortas="b-getkeycodes">getkeycodes</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kbd_mode">
-        <term><command>kbd_mode</command></term>
-        <listitem>
-          <para>Reports or sets the keyboard mode</para>
-          <indexterm zone="ch-system-kbd kbd_mode">
-            <primary sortas="b-kbd_mode">kbd_mode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kbdrate">
-        <term><command>kbdrate</command></term>
-        <listitem>
-          <para>Sets the keyboard repeat and delay rates</para>
-          <indexterm zone="ch-system-kbd kbdrate">
-            <primary sortas="b-kbdrate">kbdrate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="loadkeys">
-        <term><command>loadkeys</command></term>
-        <listitem>
-          <para>Loads the keyboard translation tables</para>
-          <indexterm zone="ch-system-kbd loadkeys">
-            <primary sortas="b-loadkeys">loadkeys</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="loadunimap">
-        <term><command>loadunimap</command></term>
-        <listitem>
-          <para>Loads the kernel unicode-to-font mapping table</para>
-          <indexterm zone="ch-system-kbd loadunimap">
-            <primary sortas="b-loadunimap">loadunimap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mapscrn">
-        <term><command>mapscrn</command></term>
-        <listitem>
-          <para>An obsolete program that used to load a user-defined output
-          character mapping table into the console driver; this is now done
-          by <command>setfont</command></para>
-          <indexterm zone="ch-system-kbd mapscrn">
-            <primary sortas="b-mapscrn">mapscrn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="openvt">
-        <term><command>openvt</command></term>
-        <listitem>
-          <para>Starts a program on a new virtual terminal (VT)</para>
-          <indexterm zone="ch-system-kbd openvt">
-            <primary sortas="b-openvt">openvt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="psfaddtable">
-        <term><command>psfaddtable</command></term>
-        <listitem>
-          <para>A link to <command>psfxtable</command></para>
-          <indexterm zone="ch-system-kbd psfaddtable">
-            <primary sortas="b-psfaddtable">psfaddtable</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="psfgettable">
-        <term><command>psfgettable</command></term>
-        <listitem>
-          <para>A link to <command>psfxtable</command></para>
-          <indexterm zone="ch-system-kbd psfgettable">
-            <primary sortas="b-psfgettable">psfgettable</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="psfstriptable">
-        <term><command>psfstriptable</command></term>
-        <listitem>
-          <para>A link to <command>psfxtable</command></para>
-          <indexterm zone="ch-system-kbd psfstriptable">
-            <primary sortas="b-psfstriptable">psfstriptable</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="psfxtable">
-        <term><command>psfxtable</command></term>
-        <listitem>
-          <para>Handle Unicode character tables for console fonts</para>
-          <indexterm zone="ch-system-kbd psfxtable">
-            <primary sortas="b-psfxtable">psfxtable</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="resizecons">
-        <term><command>resizecons</command></term>
-        <listitem>
-          <para>Changes the kernel idea of the console size</para>
-          <indexterm zone="ch-system-kbd resizecons">
-            <primary sortas="b-resizecons">resizecons</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setfont">
-        <term><command>setfont</command></term>
-        <listitem>
-          <para>Changes the Enhanced Graphic Adapter (EGA) and Video Graphics
-          Array (VGA) fonts on the console</para>
-          <indexterm zone="ch-system-kbd setfont">
-            <primary sortas="b-setfont">setfont</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setkeycodes">
-        <term><command>setkeycodes</command></term>
-        <listitem>
-          <para>Loads kernel scancode-to-keycode mapping table entries; this is
-          useful if there are unusual keys on the keyboard</para>
-          <indexterm zone="ch-system-kbd setkeycodes">
-            <primary sortas="b-setkeycodes">setkeycodes</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setleds">
-        <term><command>setleds</command></term>
-        <listitem>
-          <para>Sets the keyboard flags and Light Emitting Diodes (LEDs)</para>
-          <indexterm zone="ch-system-kbd setleds">
-            <primary sortas="b-setleds">setleds</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setmetamode">
-        <term><command>setmetamode</command></term>
-        <listitem>
-          <para>Defines the keyboard meta-key handling</para>
-          <indexterm zone="ch-system-kbd setmetamode">
-            <primary sortas="b-setmetamode">setmetamode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="showconsolefont">
-        <term><command>showconsolefont</command></term>
-        <listitem>
-          <para>Shows the current EGA/VGA console screen font</para>
-          <indexterm zone="ch-system-kbd showconsolefont">
-            <primary sortas="b-showconsolefont">showconsolefont</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="showkey">
-        <term><command>showkey</command></term>
-        <listitem>
-          <para>Reports the scancodes, keycodes, and ASCII codes of the keys
-          pressed on the keyboard</para>
-          <indexterm zone="ch-system-kbd showkey">
-            <primary sortas="b-showkey">showkey</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unicode_start">
-        <term><command>unicode_start</command></term>
-        <listitem>
-          <para>Puts the keyboard and console in UNICODE mode. Never use it on
-          CLFS, because applications are not configured to support UNICODE.</para>
-          <indexterm zone="ch-system-kbd unicode_start">
-            <primary sortas="b-unicode_start">unicode_start</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="unicode_stop">
-        <term><command>unicode_stop</command></term>
-        <listitem>
-          <para>Reverts keyboard and console from UNICODE mode</para>
-          <indexterm zone="ch-system-kbd unicode_stop">
-            <primary sortas="b-unicode_stop">unicode_stop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/less.xml
===================================================================
--- BOOK/final-system/common/less.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,113 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-less" role="wrap">
-  <?dbhtml filename="less.html"?>
-
-  <title>Less-&less-version;</title>
-
-  <indexterm zone="ch-system-less">
-    <primary sortas="a-Less">Less</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Less package contains a text file viewer.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Less</title>
-
-    <para os="a">Prepare Less for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr --sysconfdir=/etc</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the configure option:</title>
-
-      <varlistentry>
-        <term><parameter>--sysconfdir=/etc</parameter></term>
-        <listitem>
-          <para>This option tells the programs created by the package to look
-          in <filename class="directory">/etc</filename> for the configuration
-          files.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para os="d">Compile the package:</para>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <para os="f">This package does not come with a test suite.</para>
-
-    <para os="g">Install the package:</para>
-
-<screen os="h"><userinput>make install</userinput></screen>
-
-    <para os="i">Move less to /bin:</para>
-
-<screen os="j"><userinput>mv -v /usr/bin/less /bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-less" role="content">
-    <title>Contents of Less</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>less, lessecho, and lesskey</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="less">
-        <term><command>less</command></term>
-        <listitem>
-          <para>A file viewer or pager; it displays the contents of the given
-          file, letting the user scroll, find strings, and jump to marks</para>
-          <indexterm zone="ch-system-less less">
-            <primary sortas="b-less">less</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lessecho">
-        <term><command>lessecho</command></term>
-        <listitem>
-          <para>Needed to expand meta-characters, such as <emphasis>*</emphasis>
-          and <emphasis>?</emphasis>, in filenames on Unix systems</para>
-          <indexterm zone="ch-system-less lessecho">
-            <primary sortas="b-lessecho">lessecho</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lesskey">
-        <term><command>lesskey</command></term>
-        <listitem>
-          <para>Used to specify the key bindings for
-          <command>less</command></para>
-          <indexterm zone="ch-system-less lesskey">
-            <primary sortas="b-lesskey">lesskey</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/libtool.xml
===================================================================
--- BOOK/final-system/common/libtool.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,99 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-libtool" role="wrap">
-  <?dbhtml filename="libtool.html"?>
-
-  <title>Libtool-&libtool-version;</title>
-
-  <indexterm zone="ch-system-libtool">
-    <primary sortas="a-Libtool">Libtool</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Libtool package contains the GNU generic library support script.
-    It wraps the complexity of using shared libraries in a consistent, portable
-    interface.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Libtool</title>
-
-    <para os="a">Prepare Libtool for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:
-    <userinput>make check</userinput>.</para>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-libtool" role="content">
-    <title>Contents of Libtool</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-
-      <seglistitem>
-        <seg>libtool and libtoolize</seg>
-        <seg>libltdl.[a,so]</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libtool">
-        <term><command>libtool</command></term>
-        <listitem>
-          <para>Provides generalized library-building support services</para>
-          <indexterm zone="ch-system-libtool libtool">
-            <primary sortas="b-libtool">libtool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtoolize">
-        <term><command>libtoolize</command></term>
-        <listitem>
-          <para>Provides a standard way to add <command>libtool</command> support
-          to a package</para>
-          <indexterm zone="ch-system-libtool libtoolize">
-            <primary sortas="b-libtoolize">libtoolize</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libltdl">
-        <term><filename class="libraryfile">libltdl</filename></term>
-        <listitem>
-          <para>Hides the various difficulties of dlopening libraries</para>
-          <indexterm zone="ch-system-libtool libltdl">
-            <primary sortas="c-libltdl">libltdl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/linux-headers.xml
===================================================================
--- BOOK/final-system/common/linux-headers.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,71 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-linux-headers" role="wrap">
-  <?dbhtml filename="linux-headers.html"?>
-
-  <title>Linux-Headers-&linux-version;</title>
-
-  <indexterm zone="ch-system-linux-headers">
-    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Linux Kernel contains a make target that installs
-    <quote>sanitized</quote> kernel headers.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Headers</title>
-
-    <para os="a">For this step you will need the kernel tarballs.</para>
-
-    <para os="b">Install the header files that are common to all architectures:</para>
-
-<screen os="c"><userinput>make mrproper
-make headers_check
-make INSTALL_HDR_PATH=dest headers_install
-cp -rv dest/include/* /usr/include</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-linux-headers" role="content">
-    <title>Contents of Linux-Headers</title>
-
-    <segmentedlist>
-      <segtitle>Installed headers</segtitle>
-
-      <seglistitem>
-        <seg>/usr/include/{asm,asm-generic,linux,mtd,rdma,scsi,sound,video}/*.h</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="linux-headers">
-        <term><filename
-        class="headerfile">/usr/include/{asm,asm-generic,linux,mtd,rdma,scsi,sound,video}/*.h</filename></term>
-        <listitem>
-          <para>The Linux API headers</para>
-          <indexterm zone="ch-system-linux-headers linux-headers">
-            <primary
-            sortas="e-/usr/include/{asm,linux}/*.h">/usr/include/{asm,linux}/*.h</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/m4.xml
===================================================================
--- BOOK/final-system/common/m4.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,82 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-m4" role="wrap">
-  <?dbhtml filename="m4.html"?>
-
-  <title>M4-&m4-version;</title>
-
-  <indexterm zone="ch-system-m4">
-    <primary sortas="a-M4">M4</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The M4 package contains a macro processor.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of M4</title>
-
-    <para os="a">Prepare M4 for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:
-    <userinput>make check</userinput>.</para>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-m4" role="content">
-    <title>Contents of M4</title>
-
-    <segmentedlist>
-      <segtitle>Installed program</segtitle>
-
-      <seglistitem>
-        <seg>m4</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="m4">
-         <!-- Don't remove the extra space, it prevet a FOP warning. -->
-        <term><command>m4 </command></term>
-        <listitem>
-          <para>copies the given files while expanding the macros that they
-          contain. These macros are either built-in or user-defined and can
-          take any number of arguments. Besides performing macro expansion,
-          <command>m4</command> has built-in functions for including named
-          files, running Unix commands, performing integer arithmetic,
-          manipulating text, recursion, etc. The <command>m4</command>
-          program can be used either as a front-end to a compiler or as a
-          macro processor in its own right.</para>
-          <indexterm zone="ch-system-m4 m4">
-            <primary sortas="b-m4">m4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/make.xml
===================================================================
--- BOOK/final-system/common/make.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,75 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-make" role="wrap">
-  <?dbhtml filename="make.html"?>
-
-  <title>Make-&make-version;</title>
-
-  <indexterm zone="ch-system-make">
-    <primary sortas="a-Make">Make</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Make package contains a program for compiling packages.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Make</title>
-
-    <para os="a">Prepare Make for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:
-    <userinput>make check</userinput>.</para>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-make" role="content">
-    <title>Contents of Make</title>
-
-    <segmentedlist>
-      <segtitle>Installed program</segtitle>
-
-      <seglistitem>
-        <seg>make</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="make">
-        <term><command>make</command></term>
-        <listitem>
-          <para>Automatically determines which pieces of a package need to
-          be (re)compiled and then issues the relevant commands</para>
-          <indexterm zone="ch-system-make make">
-            <primary sortas="b-make">make</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/man-pages.xml
===================================================================
--- BOOK/final-system/common/man-pages.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,71 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-man-pages" role="wrap">
-  <?dbhtml filename="man-pages.html"?>
-
-  <title>Man-pages-&man-pages-version;</title>
-
-  <indexterm zone="ch-system-man-pages">
-    <primary sortas="a-Man-pages">Man-pages</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Man-pages package contains over 1,200 man pages.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Man-pages</title>
-
-    <para os="a">Install Man-pages by running:</para>
-
-<screen os="b"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-manpages" role="content">
-    <title>Contents of Man-pages</title>
-
-    <segmentedlist>
-      <segtitle>Installed files</segtitle>
-
-      <seglistitem>
-        <seg>various man pages</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="man-pages">
-        <term><filename>man pages</filename></term>
-        <listitem>
-          <para>This package contains man pages that describe the following:
-          POSIX headers (section 0p), 
-          POSIX utilities (section 1p), POSIX functions (section 3p),
-          user commands (section 1), system calls (section 2), 
-          libc calls (section 3), device information (section 4), 
-          file formats (section 5), games (section 6), 
-          conventions and macro packages (section 7),
-          system administration (section 8), and
-          kernel (section 9).</para>
-          <indexterm zone="ch-system-man-pages man-pages">
-            <primary sortas="e-man-pages">man pages</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/man.xml
===================================================================
--- BOOK/final-system/common/man.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,199 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-man" role="wrap">
-  <?dbhtml filename="man.html"?>
-
-  <title>Man-&man-version;</title>
-
-  <indexterm zone="ch-system-man">
-    <primary sortas="a-Man">Man</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Man package contains programs for finding and viewing man
-    pages.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Man</title>
-
-    <para os="a">A few adjustments need to be made to the sources of Man.</para>
-
-    <para os="b">First, a <command>sed</command> substitution is
-    needed to add the <option>-R</option> switch to the
-    <envar>PAGER</envar> variable so that escape sequences are
-    properly handled by Less:</para>
-
-<screen os="c"><userinput>sed -i 's@-is@&amp;R@g' configure</userinput></screen>
-
-    <para os="d">Another couple of <command>sed</command> substitutions
-    comment out the <quote>MANPATH /usr/man</quote> and
-    <quote>MANPATH /usr/local/man</quote> lines in the
-    <filename>man.conf</filename> file to prevent redundant
-    results when using programs such as <command>whatis</command>:</para>
-
-<screen os="e"><userinput>sed -i 's@MANPATH./usr/man@#&amp;@g' src/man.conf.in
-sed -i 's@MANPATH./usr/local/man@#&amp;@g' src/man.conf.in</userinput></screen>
-
-    <para os="h">Prepare Man for compilation:</para>
-
-<screen os="i"><userinput>./configure -confdir=/etc</userinput></screen>
-
-    <variablelist os="j">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-      <term><parameter>-confdir=/etc</parameter></term>
-      <listitem>
-        <para>This tells the <command>man</command> program to look for the
-        <filename>man.conf</filename> configuration file in the <filename
-        class="directory">/etc</filename> directory.</para>
-      </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para os="k">Compile the package:</para>
-
-<screen os="l"><userinput>make</userinput></screen>
-
-    <para os="m">This package does not come with a test suite.</para>
-
-    <para os="n">Install the package:</para>
-
-<screen os="o"><userinput>make install</userinput></screen>
-
-    <note os="p">
-      <para>If you will be working on a terminal that does not support
-      text attributes such as color and bold, you can disable Select
-      Graphic Rendition (SGR) escape sequences by editing the
-      <filename>man.conf</filename> file and adding the <option>-c</option>
-      option to the <envar>NROFF</envar> variable. If you use multiple
-      terminal types for one computer it may be better to selectively add
-      the <envar>GROFF_NO_SGR</envar> environment variable for the terminals
-      that do not support SGR.</para>
-    </note>
-
-    <para os="q">If the character set of the locale uses 8-bit characters, search
-    for the line beginning with <quote>NROFF</quote> in
-    <filename>/etc/man.conf</filename>, and verify that it matches the
-    following:</para>
-
-<screen os="r">NROFF /usr/bin/nroff -Tlatin1 -mandoc</screen>
-
-    <para os="s">Note that <quote>latin1</quote> should be used even if it is not
-    the character set of the locale. The reason is that, according to the
-    specification, <command>groff</command> has no means of typesetting
-    characters outside International Organization for Standards (ISO) 8859-1
-    without some strange escape codes. When formatting man pages,
-    <command>groff</command> thinks that they are in the ISO 8859-1 encoding
-    and this <parameter>-Tlatin1</parameter> switch tells
-    <command>groff</command> to use the same encoding for output. Since
-    <command>groff</command> does no recoding of input characters, the f
-    ormatted result is really in the same encoding as input, and therefore
-    it is usable as the input for a pager.</para>
-
-    <para os="t">This does not solve the problem of a non-working
-    <command>man2dvi</command> program for localized man pages in
-    non-ISO 8859-1 locales. Also, it does not work with multibyte
-    character sets. The first problem does not currently have a solution.
-    The second issue is not of concern because the CLFS installation does
-    not support multibyte character sets.</para>
-
-  </sect2>
-
-  <sect2 id="contents-man" role="content">
-    <title>Contents of Man</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>apropos, makewhatis, man, man2dvi, man2html, and whatis</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="apropos">
-        <term><command>apropos</command></term>
-        <listitem>
-          <para>Searches the <command>whatis</command> database and
-          displays the short descriptions of system commands that contain
-          a given string</para>
-          <indexterm zone="ch-system-man apropos">
-            <primary sortas="b-apropos">apropos</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="makewhatis">
-        <term><command>makewhatis</command></term>
-        <listitem>
-          <para>Builds the <command>whatis</command> database; it reads all
-          the man pages in the <envar>MANPATH</envar> and writes the name
-          and a short description in the <command>whatis</command> database
-          for each page</para>
-          <indexterm zone="ch-system-man makewhatis">
-            <primary sortas="b-makewhatis">makewhatis</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="man">
-        <term><command>man</command></term>
-        <listitem>
-          <para>Formats and displays the requested on-line man page</para>
-          <indexterm zone="ch-system-man man">
-            <primary sortas="b-man">man</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="man2dvi">
-        <term><command>man2dvi</command></term>
-        <listitem>
-          <para>Converts a man page into dvi format</para>
-          <indexterm zone="ch-system-man man2dvi">
-            <primary sortas="b-man2dvi">man2dvi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="man2html">
-        <term><command>man2html</command></term>
-        <listitem>
-          <para>Converts a man page into HTML</para>
-          <indexterm zone="ch-system-man man2html">
-            <primary sortas="b-man2html">man2html</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="whatis">
-        <term><command>whatis</command></term>
-        <listitem>
-          <para>Searches the <command>whatis</command> database and
-          displays the short descriptions of system commands that
-          contain the given keyword as a separate word</para>
-          <indexterm zone="ch-system-man whatis">
-            <primary sortas="b-whatis">whatis</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/mktemp.xml
===================================================================
--- BOOK/final-system/common/mktemp.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,107 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-mktemp" role="wrap">
-  <?dbhtml filename="mktemp.html"?>
-
-  <title>Mktemp-&mktemp-version;</title>
-
-  <indexterm zone="ch-system-mktemp">
-    <primary sortas="a-Mktemp">Mktemp</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Mktemp package contains programs used to create secure
-    temporary files in shell scripts.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Mktemp</title>
-
-    <para os="a">Many scripts still use the deprecated <command>tempfile</command>
-    program, which has functionality similar to <command>mktemp</command>.
-    Patch Mktemp to include a <command>tempfile</command> wrapper:</para>
-
-<screen os="b"><userinput>patch -Np1 -i ../&mktemp-tempfile-patch;</userinput></screen>
-
-    <para os="c">Prepare Mktemp for compilation:</para>
-
-<screen os="d"><userinput>./configure --prefix=/usr --with-libc</userinput></screen>
-
-    <variablelist os="e">
-      <title>The meaning of the configure option:</title>
-
-      <varlistentry>
-        <term><parameter>--with-libc</parameter></term>
-        <listitem>
-          <para>This causes the <command>mktemp</command> program to use the
-          <emphasis>mkstemp</emphasis> and <emphasis>mkdtemp</emphasis>
-          functions from the system C library.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para os="f">Compile the package:</para>
-
-<screen os="g"><userinput>make</userinput></screen>
-
-    <para os="h">This package does not come with a test suite.</para>
-
-    <para os="i">Install the package:</para>
-
-<screen os="j"><userinput>make install
-make install-tempfile</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-mktemp" role="content">
-    <title>Contents of Mktemp</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>mktemp and tempfile</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="mktemp">
-        <term><command>mktemp</command></term>
-        <listitem>
-          <para>Creates temporary files in a secure manner; it is used in
-          scripts</para>
-          <indexterm zone="ch-system-mktemp mktemp">
-            <primary sortas="b-mktemp">mktemp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tempfile">
-        <term><command>tempfile</command></term>
-        <listitem>
-          <para>Creates temporary files in a less secure manner than
-          <command>mktemp</command>; it is installed for
-          backwards-compatibility</para>
-          <indexterm zone="ch-system-mktemp tempfile">
-            <primary sortas="b-tempfile">tempfile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/module-init-tools.xml
===================================================================
--- BOOK/final-system/common/module-init-tools.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,197 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-module-init-tools" role="wrap">
-  <?dbhtml filename="module-init-tools.html"?>
-
-  <title>Module-Init-Tools-&module-init-tools-version;</title>
-
-  <indexterm zone="ch-system-module-init-tools">
-    <primary sortas="a-Module-Init-Tools">Module-Init-Tools</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Module-Init-Tools package contains programs for handling kernel
-    modules in Linux kernels greater than or equal to version 2.5.47.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Module-Init-Tools</title>
-
-    <para os="a1">The tarball only contains sgml source for the manual pages.  The
-    following patch contains the result of processing this through
-    <command>docbook2man</command> which we do not build as part of a basic clfs
-    install :</para>
-
-<screen os="a2"><userinput>patch -Np1 -i ../&module-init-tools-manpages-patch;</userinput></screen>
-
-    <para os="c">Issue the following commands to perform the tests</para>
-
-    <note os="cc">
-      <para>note that the <command>make clean</command>
-      command is required to clean up the source tree, otherwise the code
-      built for testing will be installed, and the test version of
-      <command>modprobe</command> does not function outside the test
-      environment.</para>
-    </note>
-
-<screen os="d"><userinput>./configure &amp;&amp;
-make check &amp;&amp;
-make clean</userinput></screen>
-
-    <para os="e">Prepare Module-Init-Tools for compilation:</para>
-
-<screen os="f"><userinput>./configure --prefix=/ --enable-zlib</userinput></screen>
-
-    <variablelist os="g">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--enable-zlib</parameter></term>
-        <listitem>
-          <para>This allows the Module-Init-Tools package to handle compressed
-          kernel modules.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="h">Compile the package:</para>
-
-<screen os="i"><userinput>make</userinput></screen>
-
-    <para os="j">Install the package:</para>
-
-<screen os="k"><userinput>make INSTALL=install install</userinput></screen>
-
-    <variablelist os="l">
-      <title>The meaning of the make install parameter:</title>
-      <varlistentry>
-        <term><parameter>INSTALL=install</parameter></term>
-        <listitem>
-          <para>Normally, <command>make install</command> will not install the binaries if they
-          already exist. This option overrides that behavior by calling
-          <command>install</command> instead of using the default wrapper
-          script.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-  <sect2 id="contents-module-init-tools" role="content">
-    <title>Contents of Module-Init-Tools</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>depmod, generate-modprobe.conf, insmod, insmod.static,
-        lsmod (link to insmod), modinfo, modprobe (link to insmod), and
-        rmmod (link to insmod)</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="depmod">
-        <term><command>depmod</command></term>
-        <listitem>
-          <para>Creates a dependency file based on the symbols it finds in
-          the existing set of modules; this dependency file is used by
-          <command>modprobe</command> to automatically load the required
-          modules</para>
-          <indexterm zone="ch-system-module-init-tools depmod">
-            <primary sortas="b-depmod">depmod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="generate-modprobe.conf">
-        <term><command>generate-modprobe.conf</command></term>
-        <listitem>
-          <para>Creates a modprobe.conf file from an existing 2.2 or 2.4
-          module setup</para>
-          <indexterm zone="ch-system-module-init-tools generate-modprobe.conf">
-            <primary sortas="b-generate-modprobe.conf">generate-modprobe.conf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="insmod">
-        <term><command>insmod</command></term>
-        <listitem>
-          <para>Installs a loadable module in the running kernel</para>
-          <indexterm zone="ch-system-module-init-tools insmod">
-            <primary sortas="b-insmod">insmod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="insmod.static">
-        <term><command>insmod.static</command></term>
-        <listitem>
-          <para>A statically compiled version of <command>insmod</command></para>
-          <indexterm zone="ch-system-module-init-tools insmod.static">
-            <primary sortas="b-insmod.static">insmod.static</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lsmod">
-        <term><command>lsmod</command></term>
-        <listitem>
-          <para>Lists currently loaded modules</para>
-          <indexterm zone="ch-system-module-init-tools lsmod">
-            <primary sortas="b-lsmod">lsmod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="modinfo">
-        <term><command>modinfo</command></term>
-        <listitem>
-          <para>Examines an object file associated with a kernel module and
-          displays any information that it can glean</para>
-          <indexterm zone="ch-system-module-init-tools modinfo">
-            <primary sortas="b-modinfo">modinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="modprobe">
-        <term><command>modprobe</command></term>
-        <listitem>
-          <para>Uses a dependency file, created by <command>depmod</command>,
-          to automatically load relevant modules</para>
-          <indexterm zone="ch-system-module-init-tools modprobe">
-            <primary sortas="b-modprobe">modprobe</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rmmod">
-        <term><command>rmmod</command></term>
-        <listitem>
-          <para>Unloads modules from the running kernel</para>
-          <indexterm zone="ch-system-module-init-tools rmmod">
-            <primary sortas="b-rmmod">rmmod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/ncurses.xml
===================================================================
--- BOOK/final-system/common/ncurses.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,262 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-ncurses" role="wrap">
-  <?dbhtml filename="ncurses.html"?>
-
-  <title>Ncurses-&ncurses-version;</title>
-
-  <indexterm zone="ch-system-ncurses">
-    <primary sortas="a-Ncurses">Ncurses</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Ncurses package contains libraries for terminal-independent
-    handling of character screens.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Ncurses</title>
-
-    <para os="p1">The following patches merges all updates from the &ncurses-version; Branch
-    from the Ncurses developers:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&ncurses-branch_update-patch;</userinput></screen>
-
-    <para os="a">Prepare Ncurses for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr --libdir=/lib \
-    --with-shared --without-debug</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">This package does not come with a test suite.</para>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-    <para os="h">Move the Ncurses static libraries to the proper location:</para>
-
-<screen os="i"><userinput>mv -v /lib/lib{panel,menu,form,ncurses,ncurses++,curses}.a /usr/lib</userinput></screen>
-
-    <para os="j">Create symlinks in <filename class="directory">/usr/lib:</filename></para>
-
-<screen os="k"><userinput>rm -v /lib/lib{ncurses,menu,panel,form,curses}.so
-ln -svf ../../lib/libncurses.so.5 /usr/lib/libcurses.so
-ln -svf ../../lib/libncurses.so.5 /usr/lib/libncurses.so
-ln -svf ../../lib/libmenu.so.5 /usr/lib/libmenu.so
-ln -svf ../../lib/libpanel.so.5 /usr/lib/libpanel.so
-ln -svf ../../lib/libform.so.5 /usr/lib/libform.so</userinput></screen>
-
-    <para os="l">Give the Ncurses dynamic libraries execute permissions:</para>
-
-<screen os="m"><userinput>chmod -v 755 /lib/lib{panel,menu,form,ncurses}.so.&ncurses-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-ncurses" role="content">
-    <title>Contents of Ncurses</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-
-      <seglistitem>
-        <seg>captoinfo (link to tic), clear, infocmp, infotocap (link to tic),
-        ncurses5-config, reset (link to tset), tack, tic, toe, tput, and tset</seg>
-        <seg>libcurses.[a,so] (link to libncurses.[a,so]), libform.[a,so],
-        libmenu.[a,so], libncurses++.a, libncurses.[a,so], and
-        libpanel.[a,so]</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="captoinfo">
-        <term><command>captoinfo</command></term>
-        <listitem>
-          <para>Converts a termcap description into a terminfo description</para>
-          <indexterm zone="ch-system-ncurses captoinfo">
-            <primary sortas="b-captoinfo">captoinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="clear">
-        <term><command>clear</command></term>
-        <listitem>
-          <para>Clears the screen, if possible</para>
-          <indexterm zone="ch-system-ncurses clear">
-            <primary sortas="b-clear">clear</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="infocmp">
-        <term><command>infocmp</command></term>
-        <listitem>
-          <para>Compares or prints out terminfo descriptions</para>
-          <indexterm zone="ch-system-ncurses infocmp">
-            <primary sortas="b-infocmp">infocmp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="infotocap">
-        <term><command>infotocap</command></term>
-        <listitem>
-          <para>Converts a terminfo description into a termcap description</para>
-          <indexterm zone="ch-system-ncurses infotocap">
-            <primary sortas="b-infotocap">infotocap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ncurses5-config">
-        <term><command>ncurses5-config</command></term>
-        <listitem>
-          <para>Provides configuration information for ncurses</para>
-          <indexterm zone="ch-system-ncurses ncurses5-config">
-            <primary sortas="b-ncurses5-config">ncurses5-config</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="reset">
-        <term><command>reset</command></term>
-        <listitem>
-          <para>Reinitializes a terminal to its default values</para>
-          <indexterm zone="ch-system-ncurses reset">
-            <primary sortas="b-reset">reset</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tack">
-        <term><command>tack</command></term>
-        <listitem>
-          <para>The terminfo action checker; it is mainly used to test the
-          accuracy of an entry in the terminfo database</para>
-          <indexterm zone="ch-system-ncurses tack">
-            <primary sortas="b-tack">tack</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tic">
-        <term><command>tic</command></term>
-        <listitem>
-          <para>The terminfo entry-description compiler that translates a
-          terminfo file from source format into the binary format needed for the
-          ncurses library routines. A terminfo file contains information on the
-          capabilities of a certain terminal</para>
-          <indexterm zone="ch-system-ncurses tic">
-            <primary sortas="b-tic">tic</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="toe">
-        <term><command>toe</command></term>
-        <listitem>
-          <para>Lists all available terminal types, giving the primary name and
-          description for each</para>
-          <indexterm zone="ch-system-ncurses toe">
-            <primary sortas="b-toe">toe</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tput">
-        <term><command>tput</command></term>
-        <listitem>
-          <para>Makes the values of terminal-dependent capabilities available to
-          the shell; it can also be used to reset or initialize a terminal or
-          report its long name</para>
-          <indexterm zone="ch-system-ncurses tput">
-            <primary sortas="b-tput">tput</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tset">
-        <term><command>tset</command></term>
-        <listitem>
-          <para>Can be used to initialize terminals</para>
-          <indexterm zone="ch-system-ncurses tset">
-            <primary sortas="b-tset">tset</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libcurses">
-        <term><filename class="libraryfile">libcurses</filename></term>
-        <listitem>
-          <para>A link to <filename>libncurses</filename></para>
-          <indexterm zone="ch-system-ncurses libcurses">
-            <primary sortas="c-libcurses">libcurses</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libncurses">
-        <term><filename class="libraryfile">libncurses</filename></term>
-        <listitem>
-          <para>Contains functions to display text in many complex ways on a
-          terminal screen; a good example of the use of these functions is the
-          menu displayed during the kernel's
-          <command>make menuconfig</command></para>
-          <indexterm zone="ch-system-ncurses libncurses">
-            <primary sortas="c-libncurses">libncurses</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libform">
-        <term><filename class="libraryfile">libform</filename></term>
-        <listitem>
-          <para>Contains functions to implement forms</para>
-          <indexterm zone="ch-system-ncurses libform">
-            <primary sortas="c-libform">libform</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libmenu">
-        <term><filename class="libraryfile">libmenu</filename></term>
-        <listitem>
-          <para>Contains functions to implement menus</para>
-          <indexterm zone="ch-system-ncurses libmenu">
-            <primary sortas="c-libmenu">libmenu</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libpanel">
-        <term><filename class="libraryfile">libpanel</filename></term>
-        <listitem>
-          <para>Contains functions to implement panels</para>
-          <indexterm zone="ch-system-ncurses libpanel">
-            <primary sortas="c-libpanel">libpanel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/patch.xml
===================================================================
--- BOOK/final-system/common/patch.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,78 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-patch" role="wrap">
-  <?dbhtml filename="patch.html"?>
-
-  <title>Patch-&patch-version;</title>
-
-  <indexterm zone="ch-system-patch">
-    <primary sortas="a-Patch">Patch</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Patch package contains a program for modifying or creating
-    files by applying a <quote>patch</quote> file typically created by the
-    <command>diff</command> program.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Patch</title>
-
-    <para os="a">Prepare Patch for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">This package does not come with a test suite.</para>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-patch" role="content">
-    <title>Contents of Patch</title>
-
-    <segmentedlist>
-      <segtitle>Installed program</segtitle>
-
-      <seglistitem>
-        <seg>patch</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="patch">
-        <term><command>patch</command></term>
-        <listitem>
-          <para>Modifies files according to a patch file. A patch file is
-          normally a difference listing created with the <command>diff</command>
-          program. By applying these differences to the original files,
-          <command>patch</command> creates the patched versions.</para>
-          <indexterm zone="ch-system-patch patch">
-            <primary sortas="b-patch">patch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/perl.xml
===================================================================
--- BOOK/final-system/common/perl.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,468 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-perl" role="wrap">
-  <?dbhtml filename="perl.html"?>
-
-  <title>Perl-&perl-version;</title>
-
-  <indexterm zone="ch-system-perl">
-    <primary sortas="a-Perl">Perl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Perl package contains the Practical Extraction and Report
-    Language.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Perl</title>
-
-    <para os="p1">The following patch causes makedepend.sh to also remove
-    <literal>&lt;command-line&gt;</literal> as well as
-    <literal>&lt;command line&gt;</literal>:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&perl-gcc42_fix-patch;</userinput></screen>
-
-    <para os="p3">The following patch prevents perl from including asm/page.h
-    which will no longer be available in headers provided by kernel 2.6.25 and
-    forward:</para>
-
-<screen os="p4"><userinput>patch -Np1 -i ../&perl-no_page_h-patch;</userinput></screen>
-
-    <para os="p5">The following patch fixes known vulnerabilities in perl:</para>
-
-<screen os="p6"><userinput>patch -Np1 -i ../&perl-security-patch;</userinput></screen>
-
-    <para os="s1">The following sed causes <filename>DynaLoader.a</filename>
-    to be built with -fPIC so it can be linked into a shared library
-    later:</para>
-
-<screen os="s2"><userinput>sed -i -e "s@pldlflags=''@pldlflags=\"\$cccdlflags\"@g" \
-    -e "s@static_target='static'@static_target='static_pic'@g" Makefile.SH</userinput></screen>
-
-    <note os="a00">
-      <para>If you are following the boot method you will need to enable the
-      loopback device as well as set a hostname for some of the tests:</para>
-
-      <screen><userinput>ip link set lo up
-hostname clfs</userinput></screen>
-    </note>
-
-    <para os="a01">Before starting to configure, create a basic
-    <filename>/etc/hosts</filename> file which will be referenced by one
-    of Perl's configuration files as well as used by the testsuite:</para>
-
-<screen os="a02"><userinput>echo "127.0.0.1 localhost $(hostname)" &gt; /etc/hosts</userinput></screen>
-
-    <para os="a">To have full control over the way Perl is set up, you can
-    run the interactive <command>Configure</command> script and hand-pick
-    the way this package is built. If you prefer instead to use the defaults
-    that Perl auto-detects, prepare Perl for compilation with:</para>
-
-<screen os="b"><userinput>CC=gcc ./configure.gnu --prefix=/usr \
-   -Dman1dir=/usr/share/man/man1 \
-   -Dman3dir=/usr/share/man/man3 \
-   -Dpager="/bin/less -isR" \
-   -Dusethreads</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the configure option:</title>
-
-      <varlistentry os="c1">
-        <term><parameter>-Dpager="/bin/less -isR"</parameter></term>
-        <listitem>
-          <para>This corrects an error in the way that <command>perldoc</command>
-          invokes the <command>less</command> program.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry os="c2">
-        <term><parameter>-Dman1dir=/usr/share/man/man1 -Dman3dir=/usr/share/man/man3</parameter></term>
-        <listitem>
-          <para>Since Groff is not installed yet,
-          <command>configure.gnu</command> thinks that we do not want
-          man pages for Perl. Issuing these parameters overrides this decision.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry os="c3">
-        <term><parameter>-Dusethreads</parameter></term>
-        <listitem>
-          <para>This tells Perl to use threads.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para os="d">Compile the package:</para>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <para os="h">To test the results, issue:
-    <userinput>make test</userinput>.</para>
-
-    <para os="j">Install the package:</para>
-
-<screen os="k"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-perl" role="content">
-    <title>Contents of Perl</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-
-      <seglistitem>
-        <seg>a2p, c2ph, cpan, dprofpp, enc2xs, find2perl, h2ph, h2xs, instmodsh, libnetcfg,
-        perl, perl&perl-version; (link to perl), perlbug, perlcc, perldoc,
-        perlivp, piconv, pl2pm, pod2html, pod2latex, pod2man, pod2text,
-        pod2usage, podchecker, podselect, prove, psed (link to s2p), pstruct (link
-        to c2ph), s2p, splain, and xsubpp</seg>
-        <seg>Several hundred which cannot all be listed here</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="a2p">
-        <term><command>a2p</command></term>
-        <listitem>
-          <para>Translates awk to Perl</para>
-          <indexterm zone="ch-system-perl a2p">
-            <primary sortas="b-a2p">a2p</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="c2ph">
-        <term><command>c2ph</command></term>
-        <listitem>
-          <para>Dumps C structures as generated from
-          <command>cc -g -S</command></para>
-          <indexterm zone="ch-system-perl c2ph">
-            <primary sortas="b-c2ph">c2ph</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cpan">
-        <term><command>cpan</command></term>
-        <listitem>
-          <para>Shell script that provides a command interface to CPAN.pm</para>
-          <indexterm zone="ch-system-perl cpan">
-            <primary sortas="b-cpan">cpan</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dprofpp">
-        <term><command>dprofpp</command></term>
-        <listitem>
-          <para>Displays Perl profile data</para>
-          <indexterm zone="ch-system-perl dprofpp">
-            <primary sortas="b-dprofpp">dprofpp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="enc2xs">
-        <term><command>enc2xs</command></term>
-        <listitem>
-          <para>Builds a Perl extension for the Encode module from either
-          Unicode Character Mappings or Tcl Encoding Files</para>
-          <indexterm zone="ch-system-perl enc2xs">
-            <primary sortas="b-enc2xs">enc2xs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="find2perl">
-        <term><command>find2perl</command></term>
-        <listitem>
-          <para>Translates <command>find</command> commands to Perl</para>
-          <indexterm zone="ch-system-perl find2perl">
-            <primary sortas="b-find2perl">find2perl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="h2ph">
-        <term><command>h2ph</command></term>
-        <listitem>
-          <para>Converts <filename class="extension">.h</filename> C header
-          files to <filename class="extension">.ph</filename> Perl header
-          files</para>
-          <indexterm zone="ch-system-perl h2ph">
-            <primary sortas="b-h2ph">h2ph</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="h2xs">
-        <term><command>h2xs</command></term>
-        <listitem>
-          <para>Converts <filename class="extension">.h</filename> C header
-          files to Perl extensions</para>
-          <indexterm zone="ch-system-perl h2xs">
-            <primary sortas="b-h2xs">h2xs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libnetcfg">
-        <term><command>libnetcfg</command></term>
-        <listitem>
-          <para>Can be used to configure the
-          <filename class="libraryfile">libnet</filename></para>
-          <indexterm zone="ch-system-perl libnetcfg">
-            <primary sortas="b-libnetcfg">libnetcfg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="instmodsh">
-        <term><command>instmodsh</command></term>
-        <listitem>
-          <para>A shell script for examining installed Perl modules,
-          and can even create a tarball from an installed module</para>
-          <indexterm zone="ch-system-perl instmodsh">
-            <primary sortas="b-instmodsh">instmodsh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="perl">
-        <term><command>perl</command></term>
-        <listitem>
-          <para>Combines some of the best features of C, <command>sed</command>,
-          <command>awk</command> and <command>sh</command> into a single
-          swiss-army-knife language</para>
-          <indexterm zone="ch-system-perl perl">
-            <primary sortas="b-perl">perl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="perl-version">
-        <term><command>perl&perl-version;</command></term>
-        <listitem>
-          <para>A hard link to <command>perl</command></para>
-          <indexterm zone="ch-system-perl perl-version">
-            <primary sortas="b-perl&perl-version;">perl&perl-version;</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="perlbug">
-        <term><command>perlbug</command></term>
-        <listitem>
-          <para>Used to generate bug reports about Perl, or the modules that come
-          with it, and mail them</para>
-          <indexterm zone="ch-system-perl perlbug">
-            <primary sortas="b-perlbug">perlbug</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="perlcc">
-        <term><command>perlcc</command></term>
-        <listitem>
-          <para>Generates executables from Perl programs</para>
-          <indexterm zone="ch-system-perl perlcc">
-            <primary sortas="b-perlcc">perlcc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="perldoc">
-        <term><command>perldoc</command></term>
-        <listitem>
-          <para>Displays a piece of documentation in pod format that is embedded
-          in the Perl installation tree or in a Perl script</para>
-          <indexterm zone="ch-system-perl perldoc">
-            <primary sortas="b-perldoc">perldoc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="perlivp">
-        <term><command>perlivp</command></term>
-        <listitem>
-          <para>The Perl Installation Verification Procedure; it can be used to
-          verify that Perl and its libraries have been installed
-          correctly</para>
-          <indexterm zone="ch-system-perl perlivp">
-            <primary sortas="b-perlivp">perlivp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="piconv">
-        <term><command>piconv</command></term>
-        <listitem>
-          <para>A Perl version of the character encoding converter
-          <command>iconv</command></para>
-          <indexterm zone="ch-system-perl piconv">
-            <primary sortas="b-piconv">piconv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pl2pm">
-        <term><command>pl2pm</command></term>
-        <listitem>
-          <para>A rough tool for converting Perl4
-          <filename class="extension">.pl</filename> files to Perl5
-          <filename class="extension">.pm</filename> modules</para>
-          <indexterm zone="ch-system-perl pl2pm">
-            <primary sortas="b-pl2pm">pl2pm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pod2html">
-        <term><command>pod2html</command></term>
-        <listitem>
-          <para>Converts files from pod format to HTML format</para>
-          <indexterm zone="ch-system-perl pod2html">
-            <primary sortas="b-pod2html">pod2html</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pod2latex">
-        <term><command>pod2latex</command></term>
-        <listitem>
-          <para>Converts files from pod format to LaTeX format</para>
-          <indexterm zone="ch-system-perl pod2latex">
-            <primary sortas="b-pod2latex">pod2latex</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pod2man">
-        <term><command>pod2man</command></term>
-        <listitem>
-          <para>Converts pod data to formatted *roff input</para>
-          <indexterm zone="ch-system-perl pod2man">
-            <primary sortas="b-pod2man">pod2man</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pod2text">
-        <term><command>pod2text</command></term>
-        <listitem>
-          <para>Converts pod data to formatted ASCII text</para>
-          <indexterm zone="ch-system-perl pod2text">
-            <primary sortas="b-pod2text">pod2text</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pod2usage">
-        <term><command>pod2usage</command></term>
-        <listitem>
-          <para>Prints usage messages from embedded pod docs in files</para>
-          <indexterm zone="ch-system-perl pod2usage">
-            <primary sortas="b-pod2usage">pod2usage</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="podchecker">
-        <term><command>podchecker</command></term>
-        <listitem>
-          <para>Checks the syntax of pod format documentation files</para>
-          <indexterm zone="ch-system-perl podchecker">
-            <primary sortas="b-podchecker">podchecker</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="podselect">
-        <term><command>podselect</command></term>
-        <listitem>
-          <para>Displays selected sections of pod documentation</para>
-          <indexterm zone="ch-system-perl podselect">
-            <primary sortas="b-podselect">podselect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="prove">
-        <term><command>prove</command></term>
-        <listitem>
-          <para>A command-line tool for running tests against Test::Harness</para>
-          <indexterm zone="ch-system-perl prove">
-            <primary sortas="b-prove">prove</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="psed">
-        <term><command>psed</command></term>
-        <listitem>
-          <para>A Perl version of the stream editor <command>sed</command></para>
-          <indexterm zone="ch-system-perl psed">
-            <primary sortas="b-psed">psed</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pstruct">
-        <term><command>pstruct</command></term>
-        <listitem>
-          <para>Dumps C structures as generated from <command>cc -g -S</command>
-          stabs</para>
-          <indexterm zone="ch-system-perl pstruct">
-            <primary sortas="b-pstruct">pstruct</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="s2p">
-        <term><command>s2p</command></term>
-        <listitem>
-          <para>Translates <command>sed</command> to Perl</para>
-          <indexterm zone="ch-system-perl s2p">
-            <primary sortas="b-s2p">s2p</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="splain">
-        <term><command>splain</command></term>
-        <listitem>
-          <para>Is used to force verbose warning diagnostics in Perl</para>
-          <indexterm zone="ch-system-perl splain">
-            <primary sortas="b-splain">splain</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xsubpp">
-        <term><command>xsubpp</command></term>
-        <listitem>
-          <para>Converts Perl XS code into C code</para>
-          <indexterm zone="ch-system-perl xsubpp">
-            <primary sortas="b-xsubpp">xsubpp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/pkgmgt.xml
===================================================================
--- BOOK/final-system/common/pkgmgt.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,231 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-pkgmgt">
-  <?dbhtml filename="pkgmgt.html"?>
-
-  <title>Package Management</title>
-
-  <para>Package Management is an often-requested addition to the CLFS Book. A
-  Package Manager allows tracking the installation of files making it easy to
-  remove and upgrade packages. Before you begin to wonder, NO&mdash;this section
-  will not talk about nor recommend any particular package manager. What it
-  provides is a roundup of the more popular techniques and how they work. The
-  perfect package manager for you may be among these techniques or may be a
-  combination of two or more of these techniques. This section briefly mentions
-  issues that may arise when upgrading packages.</para>
-
-  <para>Some reasons why no specific package manager is recommended in
-  CLFS or BLFS include:</para>
-
-  <itemizedlist>
-    <listitem>
-      <para>Dealing with package management takes the focus away from the goals
-      of these books&mdash;teaching how a Linux system is built.</para>
-    </listitem>
-
-    <listitem>
-      <para>There are multiple solutions for package management, each having
-      its strengths and drawbacks. Including one that satisfies all audiences
-      is difficult.</para>
-    </listitem>
-  </itemizedlist>
-
-  <para>There are some hints written on the topic of package management. Visit
-  the <ulink url="&hints-root;">Hints subproject</ulink> and see if one of them
-  fits your need.</para>
-
-  <sect2>
-    <title>Upgrade Issues</title>
-
-    <para>A Package Manager makes it easy to upgrade to newer versions when they
-    are released. Generally the instructions in the CLFS and BLFS Book can be
-    used to upgrade to the newer versions. Here are some points that you should
-    be aware of when upgrading packages, especially on a running system.</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>If one of the toolchain packages (Glibc, GCC or Binutils) needs
-        to be upgraded to a newer minor version, it is safer to
-        rebuild CLFS. Though you <emphasis>may</emphasis> be able to get by
-        rebuilding all the packages in their dependency order, we do not
-        recommend it. For example, if glibc-2.2.x needs to be updated to
-        glibc-2.3.x, it is safer to rebuild. For micro version updates, a
-        simple reinstallation usually works, but is not guaranteed. For
-        example, upgrading from glibc-2.3.4 to glibc-2.3.5 will not
-        usually cause any problems.</para>
-      </listitem>
-
-      <listitem>
-        <para>If a package containing a shared library is updated, and if the
-        name of the library changes, then all the packages dynamically linked
-        to the library need to be recompiled to link against the newer library.
-        (Note that there is no correlation between the package version and the
-        name of the library.) For example, consider a package foo-1.2.3 that
-        installs a shared library with name
-        <filename class='libraryfile'>libfoo.so.1</filename>. Say you upgrade
-        the package to a newer version foo-1.2.4 that installs a shared library
-        with name <filename class='libraryfile'>libfoo.so.2</filename>. In this
-        case, all packages that are dynamically linked to
-        <filename class='libraryfile'>libfoo.so.1</filename> need to be
-        recompiled to link against
-        <filename class='libraryfile'>libfoo.so.2</filename>. Note that you
-        should not remove the previous libraries until the dependent packages
-        are recompiled.</para>
-      </listitem>
-
-      <listitem>
-        <para>If you are upgrading a running system, be on the lookout for
-        packages that use <command>cp</command> instead of
-        <command>install</command> to install files. The latter command is
-        usually safer if the executable or library is already loaded in memory.
-        </para>
-      </listitem>
-    </itemizedlist>
-
-  </sect2>
-
-  <sect2>
-    <title>Package Management Techniques</title>
-
-    <para>The following are some common package management techniques. Before
-    making a decision on a package manager, do some research on the various
-    techniques, particularly the drawbacks of the particular scheme.</para>
-
-    <sect3>
-      <title>It is All in My Head!</title>
-
-      <para>Yes, this is a package management technique. Some folks do not find
-      the need for a package manager because they know the packages intimately
-      and know what files are installed by each package. Some users also do not
-      need any package management because they plan on rebuilding the entire
-      system when a package is changed.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Install in Separate Directories</title>
-
-      <para>This is a simplistic package management that does not need any extra
-      package to manage the installations. Each package is installed in a
-      separate directory. For example, package foo-1.1 is installed in
-      <filename class='directory'>/usr/pkg/foo-1.1</filename>
-      and a symlink is made from <filename>/usr/pkg/foo</filename> to
-      <filename class='directory'>/usr/pkg/foo-1.1</filename>. When installing
-      a new version foo-1.2, it is installed in
-      <filename class='directory'>/usr/pkg/foo-1.2</filename> and the previous
-      symlink is replaced by a symlink to the new version.</para>
-
-      <para>Environment variables such as <envar>PATH</envar>,
-      <envar>LD_LIBRARY_PATH</envar>, <envar>MANPATH</envar>,
-      <envar>INFOPATH</envar> and <envar>CPPFLAGS</envar> need to be expanded to
-      include <filename>/usr/pkg/foo</filename>. For more than a few packages,
-      this scheme becomes unmanageable.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Symlink Style Package Management</title>
-
-      <para>This is a variation of the previous package management technique.
-      Each package is installed similar to the previous scheme. But instead of
-      making the symlink, each file is symlinked into the
-      <filename class='directory'>/usr</filename> hierarchy. This removes the
-      need to expand the environment variables. Though the symlinks can be
-      created by the user to automate the creation, many package managers have
-      been written using this approach. A few of the popular ones include Stow,
-      Epkg, Graft, and Depot.</para>
-
-      <para>The installation needs to be faked, so that the package thinks that
-      it is installed in <filename class="directory">/usr</filename> though in
-      reality it is installed in the
-      <filename class="directory">/usr/pkg</filename> hierarchy. Installing in
-      this manner is not usually a trivial task. For example, consider that you
-      are installing a package libfoo-1.1. The following instructions may
-      not install the package properly:</para>
-
-<screen role="nodump"><userinput>./configure --prefix=/usr/pkg/libfoo/1.1
-make
-make install</userinput></screen>
-
-      <para>The installation will work, but the dependent packages may not link
-      to libfoo as you would expect. If you compile a package that links against
-      libfoo, you may notice that it is linked to
-      <filename class='libraryfile'>/usr/pkg/libfoo/1.1/lib/libfoo.so.1</filename>
-      instead of <filename class='libraryfile'>/usr/lib/libfoo.so.1</filename>
-      as you would expect. The correct approach is to use the
-      <envar>DESTDIR</envar> strategy to fake installation of the package. This
-      approach works as follows:</para>
-
-<screen role="nodump"><userinput>./configure --prefix=/usr
-make
-make DESTDIR=/usr/pkg/libfoo/1.1 install</userinput></screen>
-
-      <para>Most packages support this approach, but there are some which do not.
-      For the non-compliant packages, you may either need to manually install the
-      package, or you may find that it is easier to install some problematic
-      packages into <filename class='directory'>/opt</filename>.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Timestamp Based</title>
-
-      <para>In this technique, a file is timestamped before the installation of
-      the package. After the installation, a simple use of the
-      <command>find</command> command with the appropriate options can generate
-      a log of all the files installed after the timestamp file was created. A
-      package manager written with this approach is install-log.</para>
-
-      <para>Though this scheme has the advantage of being simple, it has two
-      drawbacks. If, during installation, the files are installed with any
-      timestamp other than the current time, those files will not be tracked by
-      the package manager. Also, this scheme can only be used when one package
-      is installed at a time. The logs are not reliable if two packages are
-      being installed on two different consoles.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>LD_PRELOAD Based</title>
-
-      <para>In this approach, a library is preloaded before installation. During
-      installation, this library tracks the packages that are being installed by
-      attaching itself to various executables such as <command>cp</command>,
-      <command>install</command>, <command>mv</command> and tracking the system
-      calls that modify the filesystem. For this approach to work, all the
-      executables need to be dynamically linked without the suid or sgid bit.
-      Preloading the library may cause some unwanted side-effects during
-      installation. Therefore, it is advised that one performs some tests to
-      ensure that the package manager does not break anything and logs all the
-      appropriate files.</para>
-
-    </sect3>
-
-    <sect3>
-      <title>Creating Package Archives</title>
-
-      <para>In this scheme, the package installation is faked into a separate
-      tree as described in the Symlink style package management. After the
-      installation, a package archive is created using the installed files.
-      This archive is then used to install the package either on the local
-      machine or can even be used to install the package on other machines.</para>
-
-      <para>This approach is used by most of the package managers found in the
-      commercial distributions. Examples of package managers that follow this
-      approach are RPM (which, incidentally, is required by the <ulink
-      url="http://lsbbook.gforge.freestandards.org/package.html#RPM">Linux
-      Standard Base Specification</ulink>), pkg-utils, Debian's apt, and
-      Gentoo's Portage system.  A hint describing how to adopt this style of
-      package management for CLFS systems is located at <ulink
-      url="&hints-root;/fakeroot.txt"/>.</para>
-
-    </sect3>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/procps.xml
===================================================================
--- BOOK/final-system/common/procps.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,253 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-procps" role="wrap">
-  <?dbhtml filename="procps.html"?>
-
-  <title>Procps-&procps-version;</title>
-
-  <indexterm zone="ch-system-procps">
-    <primary sortas="a-Procps">Procps</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Procps package contains programs for monitoring
-    processes.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Procps</title>
-
-    <para os="a">Compile the package:</para>
-
-<screen os="b"><userinput>make CC=gcc</userinput></screen>
-
-    <para os="c">This package does not come with a test suite.</para>
-
-    <para os="d">Install the package:</para>
-
-<screen os="e"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-procps" role="content">
-    <title>Contents of Procps</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed library</segtitle>
-
-      <seglistitem>
-        <seg>free, kill, pgrep, pkill, pmap, ps, pwdx, skill, slabtop, snice, sysctl,
-        tload, top, uptime, vmstat, w, and watch</seg>
-        <seg>libproc.so</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="free">
-        <term><command>free</command></term>
-        <listitem>
-          <para>Reports the amount of free and used memory (both physical and
-          swap memory) in the system</para>
-          <indexterm zone="ch-system-procps free">
-            <primary sortas="b-free">free</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="kill">
-        <term><command>kill</command></term>
-        <listitem>
-          <para>Sends signals to processes</para>
-          <indexterm zone="ch-system-procps kill">
-            <primary sortas="b-kill">kill</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pgrep">
-        <term><command>pgrep</command></term>
-        <listitem>
-          <para>Looks up processes based on their name and other attributes</para>
-          <indexterm zone="ch-system-procps pgrep">
-            <primary sortas="b-pgrep">pgrep</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pkill">
-        <term><command>pkill</command></term>
-        <listitem>
-          <para>Signals processes based on their name and other attributes</para>
-          <indexterm zone="ch-system-procps pkill">
-            <primary sortas="b-pkill">pkill</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pmap">
-        <term><command>pmap</command></term>
-        <listitem>
-          <para>Reports the memory map of the given process</para>
-          <indexterm zone="ch-system-procps pmap">
-            <primary sortas="b-pmap">pmap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ps">
-        <term><command>ps</command></term>
-        <listitem>
-          <para>Lists the current running processes</para>
-          <indexterm zone="ch-system-procps ps">
-            <primary sortas="b-ps">ps</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pwdx">
-        <term><command>pwdx</command></term>
-        <listitem>
-          <para>Reports the current working directory of a process</para>
-          <indexterm zone="ch-system-procps pwdx">
-            <primary sortas="b-pwdx">pwdx</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="skill">
-        <term><command>skill</command></term>
-        <listitem>
-          <para>Sends signals to processes matching the given criteria</para>
-          <indexterm zone="ch-system-procps skill">
-            <primary sortas="b-skill">skill</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="slabtop">
-        <term><command>slabtop</command></term>
-        <listitem>
-          <para>Displays detailed kernel slab cache information in real time</para>
-          <indexterm zone="ch-system-procps slabtop">
-            <primary sortas="b-slabtop">slabtop</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="snice">
-        <term><command>snice</command></term>
-        <listitem>
-          <para>Changes the scheduling priority of processes matching the given
-          criteria</para>
-          <indexterm zone="ch-system-procps snice">
-            <primary sortas="b-snice">snice</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sysctl">
-        <term><command>sysctl</command></term>
-        <listitem>
-          <para>Modifies kernel parameters at run time</para>
-          <indexterm zone="ch-system-procps sysctl">
-            <primary sortas="b-sysctl">sysctl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tload">
-        <term><command>tload</command></term>
-        <listitem>
-          <para>Prints a graph of the current system load average</para>
-          <indexterm zone="ch-system-procps tload">
-            <primary sortas="b-tload">tload</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="top">
-        <term><command>top</command></term>
-        <listitem>
-          <para>Displays a list of the most CPU intensive processes; it
-          provides an ongoing look at processor activity in real time</para>
-          <indexterm zone="ch-system-procps top">
-            <primary sortas="b-top">top</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="uptime">
-        <term><command>uptime</command></term>
-        <listitem>
-          <para>Reports how long the system has been running, how many users are
-          logged on, and the system load averages</para>
-          <indexterm zone="ch-system-procps uptime">
-            <primary sortas="b-uptime">uptime</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vmstat">
-        <term><command>vmstat</command></term>
-        <listitem>
-          <para>Reports virtual memory statistics, giving information about
-          processes, memory, paging, block Input/Output (IO), traps, and CPU
-          activity</para>
-          <indexterm zone="ch-system-procps vmstat">
-            <primary sortas="b-vmstat">vmstat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="w">
-        <term><command>w</command></term>
-        <listitem>
-          <para>Shows which users are currently logged on, where, and since
-          when</para>
-          <indexterm zone="ch-system-procps w">
-            <primary sortas="b-w">w</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="watch">
-        <term><command>watch</command></term>
-        <listitem>
-          <para>Runs a given command repeatedly, displaying the first
-          screen-full of its output; this allows a user to watch the output
-          change over time</para>
-          <indexterm zone="ch-system-procps watch">
-            <primary sortas="b-watch">watch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libproc">
-        <term><filename class="libraryfile">libproc</filename></term>
-        <listitem>
-          <para>Contains the functions used by most programs in this
-          package</para>
-          <indexterm zone="ch-system-procps libproc">
-            <primary sortas="c-libproc">libproc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/psmisc.xml
===================================================================
--- BOOK/final-system/common/psmisc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-psmisc" role="wrap">
-  <?dbhtml filename="psmisc.html"?>
-
-  <title>Psmisc-&psmisc-version;</title>
-
-  <indexterm zone="ch-system-psmisc">
-    <primary sortas="a-Psmisc">Psmisc</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Psmisc package contains programs for displaying information
-    about running processes.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Psmisc</title>
-
-    <para os="a">Prepare Psmisc for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr --exec-prefix=""</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the configure option:</title>
-
-      <varlistentry>
-        <term><parameter>--exec-prefix=""</parameter></term>
-        <listitem>
-          <para>This ensures that the Psmisc binaries will install into
-          <filename class="directory">/bin</filename> instead of
-          <filename class="directory">/usr/bin</filename>. This is the
-          correct location according to the FHS, because some of the Psmisc
-          binaries are used by the CLFS-Bootscripts package.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para os="d">Compile the package:</para>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <para os="f">This package does not come with a test suite.</para>
-
-    <para os="g">Install the package:</para>
-
-<screen os="h"><userinput>make install</userinput></screen>
-
-    <para os="i">There is no reason for the <command>pstree</command> and
-    <command>pstree.x11</command> programs to reside in <filename
-    class="directory">/bin</filename>. Therefore, move them to <filename
-    class="directory">/usr/bin</filename>:</para>
-
-<screen os="j"><userinput>mv -v /bin/pstree* /usr/bin</userinput></screen>
-
-    <para os="k">By default, Psmisc's <command>pidof</command> program is not installed.
-    This usually is not a problem because it is installed later in the Sysvinit
-    package, which provides a better <command>pidof</command> program. If
-    Sysvinit will not be used for a particular system, complete the installation
-    of Psmisc by creating the following symlink:</para>
-
-<screen os="l" role="nodump"><userinput>ln -sv killall /bin/pidof</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-psmisc" role="content">
-    <title>Contents of Psmisc</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>fuser, killall, pstree, and pstree.x11 (link to pstree)</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="fuser">
-        <term><command>fuser</command></term>
-        <listitem>
-          <para>Reports the Process IDs (PIDs) of processes that use the given
-          files or file systems</para>
-          <indexterm zone="ch-system-psmisc fuser">
-            <primary sortas="b-fuser">fuser</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="killall">
-        <term><command>killall</command></term>
-        <listitem>
-          <para>Kills processes by name; it sends a signal to all processes
-          running any of the given commands</para>
-          <indexterm zone="ch-system-psmisc killall">
-            <primary sortas="b-killall">killall</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="oldfuser">
-        <term><command>oldfuser</command></term>
-        <listitem>
-          <para>Reports the Process IDs (PIDs) of processes that use the given
-          files or file systems</para>
-          <indexterm zone="ch-system-psmisc oldfuser">
-            <primary sortas="b-oldfuser">oldfuser</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pstree">
-        <term><command>pstree</command></term>
-        <listitem>
-          <para>Displays running processes as a tree</para>
-          <indexterm zone="ch-system-psmisc pstree">
-            <primary sortas="b-pstree">pstree</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pstree.x11">
-        <term><command>pstree.x11</command></term>
-        <listitem>
-          <para>Same as <command>pstree</command>, except that it waits for
-          confirmation before exiting</para>
-          <indexterm zone="ch-system-psmisc pstree.x11">
-            <primary sortas="b-pstree.x11">pstree.x11</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/readline.xml
===================================================================
--- BOOK/final-system/common/readline.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,121 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-readline" role="wrap">
-  <?dbhtml filename="readline.html"?>
-
-  <title>Readline-&readline-version;</title>
-
-  <indexterm zone="ch-system-readline">
-    <primary sortas="a-Readline">Readline</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Readline package is a set of libraries that offers command-line
-    editing and history capabilities.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Readline</title>
-
-    <para os="p1">The following patch contains updates from the maintainer. The
-    maintainer of Readline only releases these patches to fix serious issues:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&readline-fixes-patch;</userinput></screen>
-
-    <para os="a">Prepare Readline for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr --libdir=/lib</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make SHLIB_XLDFLAGS=-lncurses</userinput></screen>
-
-    <variablelist os="e">
-      <title>The meaning of the make option:</title>
-
-      <varlistentry>
-        <term><parameter>SHLIB_XLDFLAGS=-lncurses</parameter></term>
-        <listitem>
-          <para>This option forces Readline to link against the
-          <filename class="libraryfile">libncurses</filename> library.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para os="f">This package does not come with a test suite.</para>
-
-    <para os="g">Install the package:</para>
-
-<screen os="h"><userinput>make install</userinput></screen>
-
-    <para os="i">Give Readline's dynamic libraries more appropriate
-    permissions:</para>
-
-<screen os="j"><userinput>chmod -v 755 /lib/lib{readline,history}.so*</userinput></screen>
-
-    <para os="k">Now move the static libraries to a more appropriate location:</para>
-
-<screen os="l"><userinput>mv -v /lib/lib{readline,history}.a /usr/lib</userinput></screen>
-
-    <para os="m">Next, remove the <filename class="extension">.so</filename>
-    files in <filename class="directory">/lib</filename> and relink them into
-    <filename class="directory">/usr/lib</filename>.</para>
-
-<screen os="n"><userinput>rm -v /lib/lib{readline,history}.so
-ln -svf ../../lib/libreadline.so.5 /usr/lib/libreadline.so
-ln -svf ../../lib/libhistory.so.5 /usr/lib/libhistory.so</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-readline" role="content">
-    <title>Contents of Readline</title>
-
-    <segmentedlist>
-      <segtitle>Installed libraries</segtitle>
-
-      <seglistitem>
-        <seg>libhistory.[a,so], and libreadline.[a,so]</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libhistory">
-        <term><filename class="libraryfile">libhistory</filename></term>
-        <listitem>
-          <para>Provides a consistent user interface
-          for recalling lines of history</para>
-          <indexterm zone="ch-system-readline libhistory">
-            <primary sortas="c-libhistory">libhistory</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libreadline">
-        <term><filename class="libraryfile">libreadline</filename></term>
-        <listitem>
-          <para>Aids in the consistency of user interface
-          across discrete programs that need to provide a command line
-          interface</para>
-          <indexterm zone="ch-system-readline libreadline">
-            <primary sortas="c-libreadline">libreadline</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/sed.xml
===================================================================
--- BOOK/final-system/common/sed.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,86 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-sed" role="wrap">
-  <?dbhtml filename="sed.html"?>
-
-  <title>Sed-&sed-version;</title>
-
-  <indexterm zone="ch-system-sed">
-    <primary sortas="a-Sed">Sed</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Sed package contains a stream editor.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Sed</title>
-
-    <para os="a">Prepare Sed for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin --enable-html</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry>
-        <term><parameter>--enable-html</parameter></term>
-        <listitem>
-          <para>This option tells Sed to build and install its HTML
-          documentation.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <para os="d">Compile the package:</para>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <para os="f">To test the results, issue:
-    <userinput>make check</userinput>.</para>
-
-    <para os="g">Install the package:</para>
-
-<screen os="h"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-sed" role="content">
-    <title>Contents of Sed</title>
-
-    <segmentedlist>
-      <segtitle>Installed program</segtitle>
-
-      <seglistitem>
-        <seg>sed</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="sed">
-        <term><command>sed</command></term>
-        <listitem>
-          <para>Filters and transforms text files in a single pass</para>
-          <indexterm zone="ch-system-sed sed">
-            <primary sortas="b-sed">sed</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/shadow.xml
===================================================================
--- BOOK/final-system/common/shadow.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,520 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-shadow" role="wrap">
-  <?dbhtml filename="shadow.html"?>
-
-  <title>Shadow-&shadow-version;</title>
-
-  <indexterm zone="ch-system-shadow">
-    <primary sortas="a-Shadow">Shadow</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Shadow package contains programs for handling passwords in a
-    secure way.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Shadow</title>
-
-    <note os="a">
-      <para>If you would like to enforce the use of strong passwords,
-      refer to <ulink url="&cblfs-root;index.php/Cracklib"/>
-      for installing Cracklib prior to building Shadow. Then add
-      <parameter>--with-libcrack</parameter> to the <command>configure</command>
-      command below.</para>
-    </note>
-
-    <para os="b">Prepare Shadow for compilation:</para>
-
-<screen os="c"><userinput>./configure --libdir=/lib --sysconfdir=/etc --enable-shared \
-    --without-libpam --without-audit --without-selinux</userinput></screen>
-
-<para os="d">The meaning of the configure options:</para>
-
-  <variablelist os="e">
-    <varlistentry>
-      <term><parameter>--sysconfdir=/etc</parameter></term>
-      <listitem><para>Tells Shadow to install its configuration files into
-      /etc, rather than /usr/etc.</para></listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><parameter>--without-libpam</parameter></term>
-      <listitem><para>Support for Linux-PAM is enabled by default in Shadow,
-      however PAM is not installed on a base CLFS system, so this switch
-      disables PAM support in Shadow. For instructions to install PAM and
-      link Shadow to it, you can look at
-      <ulink url="&cblfs-root;index.php/Linux-PAM"/>.</para></listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><parameter>--without-audit</parameter></term>
-      <listitem><para>Support for auditing is enabled by default, but a
-      library that it needs is not installed in a base CLFS system. This
-      switch disables auditing support.</para></listitem>
-    </varlistentry>
-    <varlistentry>
-      <term><parameter>--without-selinux</parameter></term>
-      <listitem><para>Support for selinux is enabled by default, but selinux
-      is not built in a base CLFS system and configure will fail without this
-      switch.</para></listitem>
-    </varlistentry>
-  </variablelist>
-
-    <para os="f">Disable the installation of the <command>groups</command>
-    program and its man pages, as Coreutils provides a better version:</para>
-
-<screen os="g"><userinput>sed -i 's/groups$(EXEEXT) //' src/Makefile
-find man -name Makefile -exec sed -i '/groups.1.xml/d' '{}' \;
-find man -name Makefile -exec sed -i 's/groups.1 //' '{}' \;</userinput></screen>
-
-    <para os="h">Compile the package:</para>
-
-<screen os="i"><userinput>make</userinput></screen>
-
-    <para os="j">This package does not come with a test suite.</para>
-
-    <para os="k">Install the package:</para>
-
-<screen os="l"><userinput>make install</userinput></screen>
-
-    <para os="m" id="shadow-login_defs">Instead of using the default
-    <emphasis>crypt</emphasis> method, use the more secure
-    <emphasis>MD5</emphasis> method of password encryption, which also allows
-    passwords longer than 8 characters. It is also necessary to change the
-    obsolete <filename class="directory">/var/spool/mail</filename> location
-    for user mailboxes that Shadow uses by default to the <filename
-    class="directory">/var/mail</filename> location used currently. Use the
-    following sed command to make these changes to the appropriate
-    configuration file:</para>
-
-    <indexterm os="n" zone="shadow-login_defs">
-      <primary sortas="e-/etc/login.defs">/etc/login.defs</primary>
-    </indexterm>
-
-<screen os="s"><userinput>sed -i /etc/login.defs \
-    -e 's@#MD5_CRYPT_ENAB.no@MD5_CRYPT_ENAB yes@' \
-    -e 's@/var/spool/mail@/var/mail@'</userinput></screen>
-
-    <note os="t">
-      <para>If you built Shadow with Cracklib support, execute
-      this <command>sed</command> to correct the path to the Cracklib
-      dictionary:</para>
-
-<screen role="nodump"><userinput>sed -i 's@DICTPATH.*@DICTPATH\t/lib/cracklib/pw_dict@' /etc/login.defs</userinput></screen>
-    </note>
-
-    <para os="u">Move a misplaced program to its proper location:</para>
-
-<screen os="v"><userinput>mv -v /usr/bin/passwd /bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="conf-shadow" role="configuration">
-    <title>Configuring Shadow</title>
-
-    <indexterm zone="conf-shadow">
-      <primary sortas="a-Shadow">Shadow</primary>
-      <secondary>configuring</secondary>
-    </indexterm>
-
-    <para>This package contains utilities to add, modify, and delete users and
-    groups; set and change their passwords; and perform other administrative
-    tasks. For a full explanation of what <emphasis>password shadowing</emphasis>
-    means, see the <filename>doc/HOWTO</filename> file within the unpacked source
-    tree. If using Shadow support, keep in mind that programs which need to
-    verify passwords (display managers, FTP programs, pop3 daemons, etc.) must
-    be Shadow-compliant. That is, they need to be able to work with shadowed
-    passwords.</para>
-
-    <para>To enable shadowed passwords, run the following command:</para>
-
-<screen><userinput>pwconv</userinput></screen>
-
-    <para>To enable shadowed group passwords, run:</para>
-
-<screen role="nodump"><userinput>grpconv</userinput></screen>
-
-    <para>To view or change the default settings for new user accounts that
-    you create, you can edit <filename>/etc/default/useradd</filename>. See
-    <command>man useradd</command> or
-    <ulink url="&cblfs-root;index.php/Configuring_for_Adding_Users"/> for more
-    information.</para>
-
-  </sect2>
-
-  <sect2 id="root-password" role="configuration">
-    <title>Setting the root password</title>
-
-    <para>Choose a password for user <systemitem
-    class="username">root</systemitem> and set it by running:</para>
-
-<screen role="nodump"><userinput>passwd root</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-shadow" role="content">
-    <title>Contents of Shadow</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>chage, chfn, chpasswd, chgpasswd, chsh, expiry, faillog, gpasswd,
-        groupadd, groupdel, groupmod, grpck, grpconv, grpunconv, lastlog,
-        login, logoutd, newgrp, newusers, nologin, passwd, pwck, pwconv,
-        pwunconv, sg (link to newgrp), useradd, userdel, usermod,
-        vigr (link to vipw), and vipw</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="chage">
-        <term><command>chage</command></term>
-        <listitem>
-          <para>Used to change the maximum number of days between obligatory
-          password changes</para>
-          <indexterm zone="ch-system-shadow chage">
-            <primary sortas="b-chage">chage</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="chfn">
-        <term><command>chfn</command></term>
-        <listitem>
-          <para>Used to change a user's full name and other information</para>
-          <indexterm zone="ch-system-shadow chfn">
-            <primary sortas="b-chfn">chfn</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="chgpasswd">
-        <term><command>chgpasswd</command></term>
-        <listitem>
-          <para>Used to update group passwords in batch mode</para>
-          <indexterm zone="ch-system-shadow chgpasswd">
-            <primary sortas="b-chgpasswd">chgpasswd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="chpasswd">
-        <term><command>chpasswd</command></term>
-        <listitem>
-          <para>Used to update the passwords of an entire series of user
-          accounts</para>
-          <indexterm zone="ch-system-shadow chpasswd">
-            <primary sortas="b-chpasswd">chpasswd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="chsh">
-        <term><command>chsh</command></term>
-        <listitem>
-          <para>Used to change a user's default login shell</para>
-          <indexterm zone="ch-system-shadow chsh">
-            <primary sortas="b-chsh">chsh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="expiry">
-        <term><command>expiry</command></term>
-        <listitem>
-          <para>Checks and enforces the current password expiration policy</para>
-          <indexterm zone="ch-system-shadow expiry">
-            <primary sortas="b-expiry">expiry</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="faillog">
-        <term><command>faillog</command></term>
-        <listitem>
-          <para>Is used to examine the log of login failures, to set a maximum
-          number of failures before an account is blocked, or to reset the
-          failure count</para>
-          <indexterm zone="ch-system-shadow faillog">
-            <primary sortas="b-faillog">faillog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="gpasswd">
-        <term><command>gpasswd</command></term>
-        <listitem>
-          <para>Is used to add and delete members and administrators to
-          groups</para>
-          <indexterm zone="ch-system-shadow gpasswd">
-            <primary sortas="b-gpasswd">gpasswd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="groupadd">
-        <term><command>groupadd</command></term>
-        <listitem>
-          <para>Creates a group with the given name</para>
-          <indexterm zone="ch-system-shadow groupadd">
-            <primary sortas="b-groupadd">groupadd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="groupdel">
-        <term><command>groupdel</command></term>
-        <listitem>
-          <para>Deletes the group with the given name</para>
-          <indexterm zone="ch-system-shadow groupdel">
-            <primary sortas="b-groupdel">groupdel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="groupmod">
-        <term><command>groupmod</command></term>
-        <listitem>
-          <para>Is used to modify the given group's name or GID</para>
-          <indexterm zone="ch-system-shadow groupmod">
-            <primary sortas="b-groupmod">groupmod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grpck">
-        <term><command>grpck</command></term>
-        <listitem>
-          <para>Verifies the integrity of the group files
-          <filename>/etc/group</filename> and
-          <filename>/etc/gshadow</filename></para>
-          <indexterm zone="ch-system-shadow grpck">
-            <primary sortas="b-grpck">grpck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grpconv">
-        <term><command>grpconv</command></term>
-        <listitem>
-          <para>Creates or updates the shadow group file from the normal
-          group file</para>
-          <indexterm zone="ch-system-shadow grpconv">
-            <primary sortas="b-grpconv">grpconv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grpunconv">
-        <term><command>grpunconv</command></term>
-        <listitem>
-          <para>Updates <filename>/etc/group</filename> from
-          <filename>/etc/gshadow</filename> and then deletes the latter</para>
-          <indexterm zone="ch-system-shadow grpunconv">
-            <primary sortas="b-grpunconv">grpunconv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lastlog">
-        <term><command>lastlog</command></term>
-        <listitem>
-          <para>Reports the most recent login of all users or of a
-          given user</para>
-          <indexterm zone="ch-system-shadow lastlog">
-            <primary sortas="b-lastlog">lastlog</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="login">
-        <term><command>login</command></term>
-        <listitem>
-          <para>Is used by the system to let users sign on</para>
-          <indexterm zone="ch-system-shadow login">
-            <primary sortas="b-login">login</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="logoutd">
-        <term><command>logoutd</command></term>
-        <listitem>
-          <para>Is a daemon used to enforce restrictions on log-on time
-          and ports</para>
-          <indexterm zone="ch-system-shadow logoutd">
-            <primary sortas="b-logoutd">logoutd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="newgrp">
-        <term><command>newgrp</command></term>
-        <listitem>
-          <para>Is used to change the current GID during a login session</para>
-          <indexterm zone="ch-system-shadow newgrp">
-            <primary sortas="b-newgrp">newgrp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="newusers">
-        <term><command>newusers</command></term>
-        <listitem>
-          <para>Is used to create or update an entire series of user
-          accounts</para>
-          <indexterm zone="ch-system-shadow newusers">
-            <primary sortas="b-newusers">newusers</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nologin">
-        <term><command>nologin</command></term>
-        <listitem>
-          <para>Displays a message that an account is not available. Designed
-          to be used as the default shell for accounts that have been
-          disabled</para>
-          <indexterm zone="ch-system-shadow nologin">
-            <primary sortas="b-nologin">nologin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="passwd">
-        <term><command>passwd</command></term>
-        <listitem>
-          <para>Is used to change the password for a user or group account</para>
-          <indexterm zone="ch-system-shadow passwd">
-            <primary sortas="b-passwd">passwd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pwck">
-        <term><command>pwck</command></term>
-        <listitem>
-          <para>Verifies the integrity of the password files
-          <filename>/etc/passwd</filename> and
-          <filename>/etc/shadow</filename></para>
-          <indexterm zone="ch-system-shadow pwck">
-            <primary sortas="b-pwck">pwck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pwconv">
-        <term><command>pwconv</command></term>
-        <listitem>
-          <para>Creates or updates the shadow password file from the normal
-          password file</para>
-          <indexterm zone="ch-system-shadow pwconv">
-            <primary sortas="b-pwconv">pwconv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pwunconv">
-        <term><command>pwunconv</command></term>
-        <listitem>
-          <para>Updates <filename>/etc/passwd</filename> from
-          <filename>/etc/shadow</filename> and then deletes the latter</para>
-          <indexterm zone="ch-system-shadow pwunconv">
-            <primary sortas="b-pwunconv">pwunconv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sg">
-        <term><command>sg</command></term>
-        <listitem>
-          <para>Executes a given command while the user's GID
-          is set to that of the given group</para>
-          <indexterm zone="ch-system-shadow sg">
-            <primary sortas="b-sg">sg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="su">
-        <term><command>su</command></term>
-        <listitem>
-          <para>Runs a shell with substitute user and group IDs</para>
-          <indexterm zone="ch-system-shadow su">
-            <primary sortas="b-su">su</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="useradd">
-        <term><command>useradd</command></term>
-        <listitem>
-          <para>Creates a new user with the given name, or updates the default
-          new-user information</para>
-          <indexterm zone="ch-system-shadow useradd">
-            <primary sortas="b-useradd">useradd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="userdel">
-        <term><command>userdel</command></term>
-        <listitem>
-          <para>Deletes the given user account</para>
-          <indexterm zone="ch-system-shadow userdel">
-            <primary sortas="b-userdel">userdel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="usermod">
-        <term><command>usermod</command></term>
-        <listitem>
-          <para>Is used to modify the given user's login name, User
-          Identification (UID), shell, initial group, home directory, etc.</para>
-          <indexterm zone="ch-system-shadow usermod">
-            <primary sortas="b-usermod">usermod</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vigr">
-        <term><command>vigr</command></term>
-        <listitem>
-          <para>Edits the <filename>/etc/group</filename> or
-          <filename>/etc/gshadow</filename> files</para>
-          <indexterm zone="ch-system-shadow vigr">
-            <primary sortas="b-vigr">vigr</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vipw">
-        <term><command>vipw</command></term>
-        <listitem>
-          <para>Edits the <filename>/etc/passwd</filename> or
-          <filename>/etc/shadow</filename> files</para>
-          <indexterm zone="ch-system-shadow vipw">
-            <primary sortas="b-vipw">vipw</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/stripping.xml
===================================================================
--- BOOK/final-system/common/stripping.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-stripping">
-  <?dbhtml filename="stripping.html"?>
-
-  <title>Stripping</title>
-
-  <para os="a">If the intended user is not a programmer and does not plan to do
-  any debugging on the system software, the system size can be decreased
-  by about 200 MB by removing the debugging symbols from binaries and
-  libraries. This causes no inconvenience other than not being able to
-  debug the software fully anymore.</para>
-
-  <para os="b">Most people who use the command mentioned below do not
-  experience any difficulties. However, it is easy to make a typo and
-  render the new system unusable, so before running the
-  <command>strip</command> command, it is a good idea to make a
-  backup of the current situation.</para>
-
-  <para os="c">Before performing the stripping, take special care to ensure that
-  none of the binaries that are about to be stripped are running. If
-  unsure whether the user entered chroot with the command given in
-  <xref linkend="chapter-chroot" role=","/> first exit from
-  chroot:</para>
-
-<screen os="d" role="nodump"><userinput>logout</userinput></screen>
-
-    <para os="e">Then reenter it with:</para>
-
-<screen os="f" role="nodump"><userinput>chroot ${CLFS} /tools/bin/env -i \
-    HOME=/root TERM=${TERM} PS1='\u:\w\$ ' \
-    PATH=/bin:/usr/bin:/sbin:/usr/sbin \
-    /tools/bin/bash --login</userinput></screen>
-
-    <para os="g">Now the binaries and libraries can be safely stripped:</para>
-
-<screen os="h"><userinput>/tools/bin/find /{,usr/}{bin,lib,sbin} -type f \
-   -exec /tools/bin/strip --strip-debug '{}' ';'</userinput></screen>
-
-    <para os="i">A large number of files will be reported as having their file
-    format not recognized. These warnings can be safely ignored. These
-    warnings indicate that those files are scripts instead of
-    binaries.</para>
-
-    <para os="j">If disk space is very tight, the <option>--strip-all</option>
-    option can be used on the binaries in <filename
-    class="directory">/{,usr/}{bin,sbin}</filename> to gain several more
-    megabytes. Do not use this option on libraries&mdash;they will be
-    destroyed.</para>
-
-</sect1>
Index: OK/final-system/common/sysklogd.xml
===================================================================
--- BOOK/final-system/common/sysklogd.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,118 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-sysklogd" xreflabel="Sysklogd" role="wrap">
-  <?dbhtml filename="sysklogd.html"?>
-
-  <title>Sysklogd-&sysklogd-version;</title>
-
-  <indexterm zone="ch-system-sysklogd">
-    <primary sortas="a-Sysklogd">Sysklogd</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Sysklogd package contains programs for logging system messages,
-    such as those given by the kernel when unusual things happen.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Sysklogd</title>
-
-    <para os="a">Compile the package:</para>
-
-<screen os="b"><userinput>make</userinput></screen>
-
-    <para os="c">This package does not come with a test suite.</para>
-
-    <para os="d">Install the package:</para>
-
-<screen os="e"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="conf-sysklogd" role="configuration">
-    <title>Configuring Sysklogd</title>
-
-    <indexterm zone="conf-sysklogd">
-      <primary sortas="a-Sysklogd">Sysklogd</primary>
-    <secondary>configuring</secondary></indexterm>
-
-    <indexterm zone="conf-sysklogd">
-      <primary sortas="e-/etc/syslog.conf">/etc/syslog.conf</primary>
-    </indexterm>
-
-    <para>Create a new <filename>/etc/syslog.conf</filename> file by running
-    the following:</para>
-
-<screen><userinput>cat &gt; /etc/syslog.conf &lt;&lt; "EOF"
-<literal># Begin /etc/syslog.conf
-
-auth,authpriv.*                                 -/var/log/auth.log
-*.*;auth,authpriv.none                          -/var/log/sys.log
-daemon.*                                        -/var/log/daemon.log
-kern.*                                          -/var/log/kern.log
-mail.*                                          -/var/log/mail.log
-user.*                                          -/var/log/user.log
-*.info;mail.none;authpriv.none;cron.none        -/var/log/messages
-*.emerg                                         *
-
-# log the bootscript output:
-local2.*                                        -/var/log/boot.log
-
-# End /etc/syslog.conf</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-sysklogd" role="content">
-    <title>Contents of Sysklogd</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>klogd and syslogd</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="klogd">
-        <term><command>klogd</command></term>
-        <listitem>
-          <para>A system daemon for intercepting and logging kernel
-          messages</para>
-          <indexterm zone="ch-system-sysklogd klogd">
-            <primary sortas="b-klogd">klogd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="syslogd">
-        <term><command>syslogd</command></term>
-        <listitem>
-          <para>Logs the messages that system programs offer for logging.
-          Every logged message contains at least a date stamp and a hostname,
-          and normally the program's name too, but that depends on how
-          trusting the logging daemon is told to be.</para>
-          <indexterm zone="ch-system-sysklogd syslogd">
-            <primary sortas="b-syslogd">syslogd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/sysvinit.xml
===================================================================
--- BOOK/final-system/common/sysvinit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,319 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-<sect1 id="ch-system-sysvinit" role="wrap">
-  <?dbhtml filename="sysvinit.html"?>
-
-  <title>Sysvinit-&sysvinit-version;</title>
-
-  <indexterm zone="ch-system-sysvinit">
-    <primary sortas="a-Sysvinit">Sysvinit</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Sysvinit package contains programs for controlling the startup,
-    running, and shutdown of the system.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Sysvinit</title>
-
-    <para os="a">When run-levels are changed (for example, when halting the
-    system), <command>init</command> sends termination signals to those
-    processes that <command>init</command> itself started and that should
-    not be running in the new run-level.  While doing this,
-    <command>init</command> outputs messages like <quote>Sending processes
-    the TERM signal</quote> which seem to imply that it is sending these
-    signals to all currently running processes. To avoid this
-    misinterpretation, modify the source so that these messages read like
-    <quote>Sending processes started by init the TERM signal</quote>
-    instead:</para>
-
-<screen os="b"><userinput>sed -i 's@Sending processes@&amp; started by init@g' \
-    src/init.c</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make -C src clobber
-make -C src</userinput></screen>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make -C src install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="conf-sysvinit" role="configuration">
-    <title>Configuring Sysvinit</title>
-
-    <indexterm zone="conf-sysvinit">
-      <primary sortas="a-Sysvinit">Sysvinit</primary>
-    <secondary>configuring</secondary></indexterm>
-
-    <indexterm zone="conf-sysvinit">
-      <primary sortas="e-/etc/inittab">/etc/inittab</primary>
-    </indexterm>
-
-    <para>Create a new file <filename>/etc/inittab</filename> by running the
-    following:</para>
-
-<screen><userinput>cat &gt; /etc/inittab &lt;&lt; "EOF"
-<literal># Begin /etc/inittab
-
-id:3:initdefault:
-
-si::sysinit:/etc/rc.d/init.d/rc sysinit
-
-l0:0:wait:/etc/rc.d/init.d/rc 0
-l1:S1:wait:/etc/rc.d/init.d/rc 1
-l2:2:wait:/etc/rc.d/init.d/rc 2
-l3:3:wait:/etc/rc.d/init.d/rc 3
-l4:4:wait:/etc/rc.d/init.d/rc 4
-l5:5:wait:/etc/rc.d/init.d/rc 5
-l6:6:wait:/etc/rc.d/init.d/rc 6
-
-ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now
-
-su:S016:once:/sbin/sulogin
-
-1:2345:respawn:/sbin/agetty -I '\033(K' tty1 9600
-2:2345:respawn:/sbin/agetty -I '\033(K' tty2 9600
-3:2345:respawn:/sbin/agetty -I '\033(K' tty3 9600
-4:2345:respawn:/sbin/agetty -I '\033(K' tty4 9600
-5:2345:respawn:/sbin/agetty -I '\033(K' tty5 9600
-6:2345:respawn:/sbin/agetty -I '\033(K' tty6 9600
-
-# End /etc/inittab</literal>
-EOF</userinput></screen>
-
-    <para>The <parameter>-I '\033(K'</parameter> option tells
-    <command>agetty</command> to send this escape sequence to the terminal
-    before doing anything else. This escape sequence switches the console
-    character set to a user-defined one, which can be modified by running
-    the <command>setfont</command> program. The <command>console</command>
-    initscript from the CLFS-Bootscripts package calls the
-    <command>setfont</command> program during system startup. Sending this
-    escape sequence is necessary for people who use non-ISO 8859-1 screen
-    fonts, but it does not affect native English speakers.</para>
-
-  </sect2>
-
-  <sect2 id="contents-sysvinit" role="content">
-    <title>Contents of Sysvinit</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>bootlogd, halt, init, killall5, last, lastb (link to last), mesg,
-        mountpoint, pidof (link to killall5), poweroff (link to halt),
-        reboot (link to halt), runlevel, shutdown, sulogin,
-        telinit (link to init), utmpdump, and wall</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bootlogd">
-        <term><command>bootlogd</command></term>
-        <listitem>
-          <para>Logs boot messages to a log file</para>
-          <indexterm zone="ch-system-sysvinit bootlogd">
-            <primary sortas="b-bootlogd">bootlogd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="halt">
-        <term><command>halt</command></term>
-        <listitem>
-          <para>Normally invokes <command>shutdown</command> with the
-          <parameter>-h</parameter> option, except when already in run-level 0,
-          then it tells the kernel to halt the system; it notes in the
-          file <filename>/var/log/wtmp</filename> that the system is being
-          brought down</para>
-          <indexterm zone="ch-system-sysvinit halt">
-            <primary sortas="b-halt">halt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="init">
-        <term><command>init</command></term>
-        <listitem>
-          <para>The first process to be started when the kernel has initialized
-          the hardware which takes over the boot process and starts all the
-          proceses it is instructed to</para>
-          <indexterm zone="ch-system-sysvinit init">
-            <primary sortas="b-init">init</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="killall5">
-        <term><command>killall5</command></term>
-        <listitem>
-          <para>Sends a signal to all processes, except the processes in its own
-          session so it will not kill the shell running the script that called
-          it</para>
-          <indexterm zone="ch-system-sysvinit killall5">
-            <primary sortas="b-killall5">killall5</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="last">
-        <term><command>last</command></term>
-        <listitem>
-          <para>Shows which users last logged in (and out), searching back
-          through the <filename>/var/log/wtmp</filename> file; it also shows
-          system boots, shutdowns, and run-level changes</para>
-          <indexterm zone="ch-system-sysvinit last">
-            <primary sortas="b-last">last</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lastb">
-        <term><command>lastb</command></term>
-        <listitem>
-          <para>Shows the failed login attempts, as logged in
-          <filename>/var/log/btmp</filename></para>
-          <indexterm zone="ch-system-sysvinit lastb">
-            <primary sortas="b-lastb">lastb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mesg">
-        <term><command>mesg</command></term>
-        <listitem>
-          <para>Controls whether other users can send messages to the current
-          user's terminal</para>
-          <indexterm zone="ch-system-sysvinit mesg">
-            <primary sortas="b-mesg">mesg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mountpoint">
-        <term><command>mountpoint</command></term>
-        <listitem>
-          <para>Tells you whether or not a directory is a mount point.</para>
-          <indexterm zone="ch-system-sysvinit mountpoint">
-            <primary sortas="b-mountpoint">mountpoint</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pidof">
-        <term><command>pidof</command></term>
-        <listitem>
-          <para>Reports the PIDs of the given programs</para>
-          <indexterm zone="ch-system-sysvinit pidof">
-            <primary sortas="b-pidof">pidof</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="poweroff">
-        <term><command>poweroff</command></term>
-        <listitem>
-          <para>Tells the kernel to halt the system and switch off the computer
-          (see <command>halt</command>)</para>
-          <indexterm zone="ch-system-sysvinit poweroff">
-            <primary sortas="b-poweroff">poweroff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="reboot">
-        <term><command>reboot</command></term>
-        <listitem>
-          <para>Tells the kernel to reboot the system (see
-          <command>halt</command>)</para>
-          <indexterm zone="ch-system-sysvinit reboot">
-            <primary sortas="b-reboot">reboot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="runlevel">
-        <term><command>runlevel</command></term>
-        <listitem>
-          <para>Reports the previous and the current run-level, as noted in
-          the last run-level record in <filename>/var/run/utmp</filename></para>
-          <indexterm zone="ch-system-sysvinit runlevel">
-            <primary sortas="b-runlevel">runlevel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="shutdown">
-        <term><command>shutdown</command></term>
-        <listitem>
-          <para>Brings the system down in a secure way, signaling all processes
-          and notifying all logged-in users</para>
-          <indexterm zone="ch-system-sysvinit shutdown">
-            <primary sortas="b-shutdown">shutdown</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sulogin">
-        <term><command>sulogin</command></term>
-        <listitem>
-          <para>Allows <emphasis>root</emphasis> to log in; it is normally
-          invoked by <command>init</command> when the system goes into single
-          user mode</para>
-          <indexterm zone="ch-system-sysvinit sulogin">
-            <primary sortas="b-sulogin">sulogin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="telinit">
-        <term><command>telinit</command></term>
-        <listitem>
-          <para>Tells <command>init</command> which run-level to change to</para>
-          <indexterm zone="ch-system-sysvinit telinit">
-            <primary sortas="b-telinit">telinit</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="utmpdump">
-        <term><command>utmpdump</command></term>
-        <listitem>
-          <para>Displays the content of the given login file in a more
-          user-friendly format</para>
-          <indexterm zone="ch-system-sysvinit utmpdump">
-            <primary sortas="b-utmpdump">utmpdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="wall">
-        <term><command>wall</command></term>
-        <listitem>
-          <para>Writes a message to all logged-in users</para>
-          <indexterm zone="ch-system-sysvinit wall">
-            <primary sortas="b-wall">wall</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/tar.xml
===================================================================
--- BOOK/final-system/common/tar.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,87 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-tar" role="wrap">
-  <?dbhtml filename="tar.html"?>
-
-  <title>Tar-&tar-version;</title>
-
-  <indexterm zone="ch-system-tar">
-    <primary sortas="a-Tar">Tar</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Tar package contains an archiving program.</para>
-
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Tar</title>
-
-    <para os="a">Prepare Tar for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr --bindir=/bin --libexecdir=/usr/sbin</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:
-    <userinput>make check</userinput>.</para>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-tar" role="content">
-    <title>Contents of Tar</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>rmt and tar</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="rmt">
-        <term><command>rmt</command></term>
-        <listitem>
-          <para>Remotely manipulates a magnetic
-          tape drive through an interprocess communication connection</para>
-          <indexterm zone="ch-system-tar rmt">
-            <primary sortas="b-rmt">rmt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tar">
-        <term><command>tar</command></term>
-        <listitem>
-          <para>Creates, extracts files from, and lists the contents of
-          archives, also known as tarballs</para>
-          <indexterm zone="ch-system-tar tar">
-            <primary sortas="b-tar">tar</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/temp-perl.xml
===================================================================
--- BOOK/final-system/common/temp-perl.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,97 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-temp-perl" role="wrap">
-  <?dbhtml filename="temp-perl.html"?>
-
-  <title>Temporary Perl-&perl-version;</title>
-
-  <indexterm zone="ch-system-temp-perl">
-    <primary sortas="a-Perl">Perl</primary>
-    <secondary>temporary tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/perl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Perl</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <para os="a">First adapt some hard-wired paths to the C library by applying
-    the following patch:</para>
-
-<screen os="b"><userinput>patch -Np1 -i ../&perl-libc-patch;</userinput></screen>
-
-<para os="c">Prepare Perl for compilation (make sure to get the 'Data/Dumper
-Fcntl IO POSIX' part of the command correct&mdash;they are all
-letters):</para>
-
-<screen os="d"><userinput>./configure.gnu --prefix=/tools \
-   -Dstatic_ext='Data/Dumper IO Fcntl POSIX' -Dcc="gcc"</userinput></screen>
-
-    <variablelist os="e">
-      <title>The meaning of the configure option:</title>
-
-      <varlistentry>
-        <term><parameter>-Dstatic_ext='Data/Dumper IO Fcntl POSIX'</parameter></term>
-        <listitem>
-          <para>This tells Perl to build the minimum set of static
-          extensions needed for installing and testing the Glibc and
-          Coreutils packages later in this chapter.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  <para os="f">Now we are ready to make our perl utilities:</para>
-
-<screen os="g"><userinput>make perl utilities</userinput></screen>
-
-  <para os="h">Although Perl comes with a test suite, it is not recommended
-  to run it at this point. Only part of Perl was built and running
-  <command>make test</command> now will cause the rest of Perl to be built
-  as well, which is unnecessary at this point. The test suite can be run
-  later in this chapter if desired.</para>
-
-    <para os="i">Install these tools and their libraries:</para>
-
-<screen os="j"><userinput>cp -v perl pod/pod2man /tools/bin
-install -dv /tools/lib/perl5/&perl-version;
-cp -Rv lib/* /tools/lib/perl5/&perl-version;</userinput></screen>
-
-    <para os="k">Finally, create a necessary symlink:</para>
-
-<screen os="l"><userinput>ln -sv /tools/bin/perl /usr/bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-perl" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/testsuitesagain.xml
===================================================================
--- BOOK/final-system/common/testsuitesagain.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,34 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-final-system-testsuitesagain">
-  <?dbhtml filename="testsuitesagain.html"?>
-
-  <title>About Test Suites, Again</title>
-
-  <para>In the final-system build, you are no longer cross-compiling so it
-  is possible to run package testsuites. Some test suites are more important
-  than others. For example,  the test suites for the core toolchain
-  packages&mdash;GCC, Binutils, and Glibc&mdash;are of the utmost
-  importance due to their central role in a properly functioning system.
-  The test suites for GCC and Glibc can take a very long time to complete,
-  especially on slower hardware, but are strongly recommended.</para>
-
-  <para>A common issue with running the test suites for Binutils and GCC
-  is running out of pseudo terminals (PTYs). This can result in a high
-  number of failing tests. This may happen for several reasons, but the
-  most likely cause (if you chrooted) is that the host system does not have the
-  <systemitem class="filesystem">devpts</systemitem> file system set up
-  correctly. This issue is discussed in greater detail at
-  <ulink url="&faq-root;#no-ptys"/>.</para>
-
-  <para>Sometimes package test suites will fail, but for reasons which the
-  developers are aware of and have deemed non-critical. Consult the logs located
-  at <ulink url="&test-results;"/> to verify whether or not these failures are
-  expected. This site is valid for all tests throughout this book.</para>
-
-</sect1>
Index: OK/final-system/common/texinfo.xml
===================================================================
--- BOOK/final-system/common/texinfo.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,158 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-texinfo" role="wrap">
-  <?dbhtml filename="texinfo.html"?>
-
-  <title>Texinfo-&texinfo-version;</title>
-
-  <indexterm zone="ch-system-texinfo">
-    <primary sortas="a-Texinfo">Texinfo</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Texinfo package contains programs for reading, writing, and
-    converting info pages.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Texinfo</title>
-
-    <para os="a">Prepare Texinfo for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:
-    <userinput>make check</userinput>.</para>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-    <para os="h">The Info documentation system uses a plain text file to hold
-    its list of menu entries. The file is located at
-    <filename>/usr/share/info/dir</filename>. Unfortunately, due to occasional
-    problems in the Makefiles of various packages, it can sometimes get out of
-    sync with the info pages installed on the system. If the
-    <filename>/usr/share/info/dir</filename> file ever needs to be recreated,
-    the following optional commands will accomplish the task:</para>
-
-<screen os="i" role="nodump"><userinput>cd /usr/share/info
-rm dir
-for f in *
-do install-info $f dir 2&gt;/dev/null
-done</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-texinfo" role="content">
-    <title>Contents of Texinfo</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>info, infokey, install-info, makeinfo, texi2dvi, texi2pdf,
-        and texindex</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="info">
-        <term><command>info</command></term>
-        <listitem>
-          <para>Used to read info pages which are similar to man
-          pages, but often go much deeper than just explaining all the command
-          line options. For example, compare <command>man bison</command> and
-          <command>info bison</command>.</para>
-          <indexterm zone="ch-system-texinfo info">
-            <primary sortas="b-info">info</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="infokey">
-        <term><command>infokey</command></term>
-        <listitem>
-          <para>Compiles a source file containing Info customizations into a
-          binary format</para>
-          <indexterm zone="ch-system-texinfo infokey">
-            <primary sortas="b-infokey">infokey</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="install-info">
-        <term><command>install-info</command></term>
-        <listitem>
-          <para>Used to install info pages; it updates entries in the
-          <command>info</command> index file</para>
-          <indexterm zone="ch-system-texinfo install-info">
-            <primary sortas="b-install-info">install-info</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="makeinfo">
-        <term><command>makeinfo</command></term>
-        <listitem>
-          <para>Translates the given Texinfo source documents into
-          info pages, plain text, or HTML</para>
-          <indexterm zone="ch-system-texinfo makeinfo">
-            <primary sortas="b-makeinfo">makeinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="texi2dvi">
-        <term><command>texi2dvi</command></term>
-        <listitem>
-          <para>Used to format the given Texinfo document into a
-          device-independent file that can be printed</para>
-          <indexterm zone="ch-system-texinfo texi2dvi">
-            <primary sortas="b-texi2dvi">texi2dvi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="texi2pdf">
-        <term><command>texi2pdf</command></term>
-        <listitem>
-          <para>Used to format the given Texinfo document into a
-          Portable Document Format (PDF) file</para>
-          <indexterm zone="ch-system-texinfo texi2pdf">
-            <primary sortas="b-texi2pdf">texi2pdf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="texindex">
-        <term><command>texindex</command></term>
-        <listitem>
-          <para>Used to sort Texinfo index files</para>
-          <indexterm zone="ch-system-texinfo texindex">
-            <primary sortas="b-texindex">texindex</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/udev.xml
===================================================================
--- BOOK/final-system/common/udev.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,347 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-udev" role="wrap">
-  <?dbhtml filename="udev.html"?>
-
-  <title>Udev-&udev-version;</title>
-
-  <indexterm zone="ch-system-udev">
-    <primary sortas="a-Udev">Udev</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Udev package contains programs for dynamic creation of device
-    nodes.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Udev</title>
-
-    <para os="a">Compile the package:</para>
-
-<screen os="b"><userinput>make EXTRAS="extras/ata_id extras/cdrom_id extras/collect \
-    extras/edd_id extras/firmware extras/floppy extras/path_id extras/rule_generator \
-    extras/scsi_id extras/usb_id extras/volume_id" udevdir=/dev</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the make parameter:</title>
-
-      <varlistentry>
-      <term><parameter>EXTRAS="extras/ata_id extras/cdrom_id extras/collect
-      extras/edd_id extras/firmware extras/floppy extras/path_id extras/rule_generator
-      extras/scsi_id extras/usb_id extras/volume_id"</parameter></term>
-        <listitem>
-          <para>This builds the helper applications that are used with
-          udev. The helper programs assist in correct handling of devices.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="d">If you want to run the testsuite, you need to change
-    a hardcoded reference to the <command>test</command> program:</para>
-
-    <screen os="e"><userinput>sed -i 's@/usr/bin/test@/bin/test@' test/udev-test.pl</userinput></screen>
-
-    <para os="f">To test the results, issue:
-    <userinput>make test</userinput>.</para>
-
-    <para os="g">Install the package:</para>
-
-<screen os="h"><userinput>make EXTRAS="extras/ata_id extras/cdrom_id extras/collect \
-    extras/edd_id extras/firmware extras/floppy extras/path_id extras/rule_generator \
-    extras/scsi_id extras/usb_id extras/volume_id" DESTDIR=/ udevdir=/dev install</userinput></screen>
-
-    <variablelist os="i">
-      <title>The meaning of the make parameter:</title>
-
-      <varlistentry>
-      <term><parameter>DESTDIR=/</parameter></term>
-        <listitem>
-          <para>This prevents the Udev build process from killing any
-          <command>udevd</command> processes that may be running on the
-          system.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="j">Install documentation:</para>
-
-<screen os="k"><userinput>install -v -m644 -D docs/writing_udev_rules/index.html \
-    /usr/share/doc/udev-&udev-version;/index.html</userinput></screen>
-
-    <para os="l">Create a directory for storing firmware that can be
-    loaded by <command>udev</command>:</para>
-
-<screen os="m"><userinput>install -dv /lib/firmware</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-udev" role="content">
-    <title>Contents of Udev</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed library</segtitle>
-      <segtitle>Installed directory</segtitle>
-
-      <seglistitem>
-        <seg>udevadm, udevd, udevinfo (symlink to udevadm),
-        udevsettle (symlink to udevadm)</seg>
-        <seg>libvolume_id</seg>
-        <seg>/etc/udev, /lib/udev</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="udevadm">
-        <term><command>udevadm</command></term>
-        <listitem>
-          <para>This program combines <command>udevinfo</command>,
-          <command>udevtrigger</command>, <command>udevsettle</command>,
-          <command>udevcontrol</command>, <command>udevmonitor</command>,
-          and <command>udevtest</command> into one command.</para>
-          <indexterm zone="ch-system-udev udevadm">
-            <primary sortas="b-udevadm">udevadm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="udevadm-control">
-        <term><command>udevadm control</command></term>
-        <listitem>
-          <para>Configures a number of options for the running
-          <command>udevd</command> daemon, such as the log level. (Symlink to
-          udevadm)</para>
-          <indexterm zone="ch-system-udev udevadm-control">
-            <primary sortas="b-udevadm-control">udevadm control</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="udevd">
-        <term><command>udevd</command></term>
-        <listitem>
-          <para>A daemon that reorders hotplug events before submitting them to
-          <command>udev</command>,
-          thus avoiding various race conditions</para>
-          <indexterm zone="ch-system-udev udevd">
-            <primary sortas="b-udevd">udevd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="udevinfo">
-        <term><command>udevinfo</command></term>
-        <listitem>
-          <para>Allows users to query the <command>udev</command> database for
-          information on any device currently present on the system; it also
-          provides a way to query any device in the <systemitem
-          class="filesystem">sysfs</systemitem> tree to help create udev
-          rules. (Symlink to udevadm)</para>
-          <indexterm zone="ch-system-udev udevinfo">
-            <primary sortas="b-udevinfo">udevinfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="udevadm-monitor">
-        <term><command>udevadm monitor</command></term>
-        <listitem>
-          <para>Prints the event received from the kernel and the event which
-          <command>udev</command> sends out after rule processing</para>
-          <indexterm zone="ch-system-udev udevadm-monitor">
-            <primary sortas="b-udevadm-monitor">udevadm monitor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="udevsettle">
-        <term><command>udevsettle</command></term>
-        <listitem>
-          <para>Watches the Udev event queue and exits if all current uevents
-          have been handled. (Symlink to udevadm)</para>
-          <indexterm zone="ch-system-udev udevsettle">
-            <primary sortas="b-udevsettle">udevsettle</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="udevadm-test">
-        <term><command>udevadm test</command></term>
-        <listitem>
-          <para>Simulates a <command>udev</command> run for the given device,
-          and prints out the name of the node the real <command>udev</command>
-          would have created or the name of the renamed network interface</para>
-          <indexterm zone="ch-system-udev udevadm-test">
-            <primary sortas="b-udevadm-test">udevadm test</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="udevadm-trigger">
-        <term><command>udevadm trigger</command></term>
-        <listitem>
-          <para>Walks the sysfs tree for devices that need to be added to the
-          system.</para>
-          <indexterm zone="ch-system-udev udevadm-trigger">
-            <primary sortas="b-udeadm-vtrigger">udevadm trigger</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>     
-
- <!-- Start of Helpers -->
-      <varlistentry id="ata_id">
-        <term><command>ata_id</command></term>
-        <listitem>
-          <para>Provides Udev with a unique string and additional
-          information (uuid, label) for an ATA drive</para>
-          <indexterm zone="ch-system-udev ata_id">
-            <primary sortas="b-ata_id">ata_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cdrom_id">
-        <term><command>cdrom_id</command></term>
-        <listitem>
-          <para>Print the capabilities of a CDROM or DVDROM drive.</para>
-          <indexterm zone="ch-system-udev cdrom_id">
-            <primary sortas="b-cdrom_id">cdrom_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="create_floppy_devices">
-        <term><command>create_floppy_devices</command></term>
-        <listitem>
-          <para>Creates all possible floppy devices based on the CMOS type</para>
-          <indexterm zone="ch-system-udev create_floppy_devices">
-            <primary sortas="b-create_floppy_devices">create_floppy_devices</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dasd_id">
-        <term><command>dasd_id</command></term>
-        <listitem>
-          <para>Read the label from an s390 block device.</para>
-          <indexterm zone="ch-system-udev dasd_id">
-            <primary sortas="b-dasd_id">dasd_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="edd_id">
-        <term><command>edd_id</command></term>
-        <listitem>
-          <para>Identify x86 disk drives from Enhanced Disk Drive calls.</para>
-          <indexterm zone="ch-system-udev edd_id">
-            <primary sortas="b-edd_id">edd_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="firmware.sh">
-        <term><command>firmware.sh</command></term>
-        <listitem>
-          <para>Script to load firmware for a device</para>
-          <indexterm zone="ch-system-udev firmware.sh">
-            <primary sortas="b-firmware.sh">firmware.sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="path_id">
-        <term><command>path_id</command></term>
-        <listitem>
-          <para>Provide the shortest possible unique hardware path to a
-          device</para>
-          <indexterm zone="ch-system-udev path_id">
-            <primary sortas="b-path_id">path_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scsi_id">
-        <term><command>scsi_id</command></term>
-        <listitem>
-          <para>Retrieve or generate a unique SCSI identifier.</para>
-          <indexterm zone="ch-system-udev scsi_id">
-            <primary sortas="b-scsi_id">scsi_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="usb_id">
-        <term><command>usb_id</command></term>
-        <listitem>
-          <para>Identify a USB block device.</para>
-          <indexterm zone="ch-system-udev usb_id">
-            <primary sortas="b-usb_id">usb_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vol_id">
-        <term><command>vol_id</command></term>
-        <listitem>
-          <para>Probe filesystem type and read label and uuid.</para>
-          <indexterm zone="ch-system-udev vol_id">
-            <primary sortas="b-vol_id">vol_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-<!-- End of Helpers -->
-
-      <varlistentry id="libvolume_id">
-        <term><filename class="libraryfile">libvolume_id</filename></term>
-        <listitem>
-          <para>This library provides programs such as <command>vol_id</command>
-          with a filesystems type, abel, and uuid from a device node or a
-          image.</para>
-          <indexterm zone="ch-system-udev libvolume_id">
-            <primary sortas="b-libvolume_id">libvolume_id</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="etc-udev">
-        <term><filename class="directory">/etc/udev</filename></term>
-        <listitem>
-          <para>Contains <command>udev</command> configuration files,
-          device permissions, and rules for device naming</para>
-          <indexterm zone="ch-system-udev etc-udev">
-            <primary sortas="e-/etc/udev">/etc/udev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lib-udev">
-        <term><filename class="directory">/lib/udev</filename></term>
-        <listitem>
-          <para>Contains <command>udev</command> helper programs
-          and static devices which get copied to /dev when booted.</para>
-          <indexterm zone="ch-system-udev lib-udev">
-            <primary sortas="e-/lib/udev">/lib/udev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/util-linux-ng.xml
===================================================================
--- BOOK/final-system/common/util-linux-ng.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,779 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-util-linux-ng" role="wrap">
-  <?dbhtml filename="util-linux-ng.html"?>
-
-  <title>Util-linux-ng-&util-linux-ng-version;</title>
-
-  <indexterm zone="ch-system-util-linux-ng">
-    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Util-linux-ng package contains miscellaneous utility programs.
-    Among them are utilities for handling file systems, consoles, partitions,
-    and messages.</para>
-
-
-  </sect2>
-
-  <sect2 id="fhs-util-linux-ng" role="installation">
-    <title>FHS compliance notes</title>
-
-    <para>The FHS recommends using the <filename
-    class="directory">/var/lib/hwclock</filename> directory instead of the
-    usual <filename class="directory">/etc</filename> directory as the
-    location for the <filename>adjtime</filename> file. To make the
-    <command>hwclock</command> program FHS-compliant, run the following:</para>
-
-<screen><userinput>sed -i 's@etc/adjtime@var/lib/hwclock/adjtime@g' \
-    hwclock/hwclock.c
-mkdir -pv /var/lib/hwclock</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Util-linux-ng</title>
-
-    <para os="a">Prepare Util-linux-ng for compilation:</para>
-
-<screen os="b"><userinput>./configure --enable-partx \
-    --disable-wall --enable-write</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--enable-partx</parameter></term>
-        <listitem>
-          <para>Enable partx stuff (need more description).</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--disable-wall</parameter></term>
-        <listitem>
-          <para>Disables building the <command>wall</command> program,
-          as the Sysvinit package installs its own version.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--enable-write</parameter></term>
-        <listitem>
-          <para>This option allows the <command>write</command> program to be
-          installed.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="d">Compile the package:</para>
-
-<screen os="e"><userinput>make</userinput></screen>
-
-    <para os="f">This package does not come with a test suite.</para>
-
-    <para os="g">Install the package:</para>
-
-<screen os="h"><userinput>make install</userinput></screen>
-
-    <para os="i">Move the <command>logger</command> binary to
-    <filename class="directory">/bin</filename> as it is needed by the
-    CLFS-Bootscripts package:</para>
-
-<screen os="j"><userinput>mv -v /usr/bin/logger /bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-util-linux-ng" role="content">
-    <title>Contents of Util-linux-ng</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>addpart, agetty, blockdev, cal, cfdisk, chkdupexe, col, colcrt,
-        colrm, column, ctrlaltdel, cytune, ddate, delpart, dmesg, fdformat,
-        fdisk, flock, fsck.cramfs, fsck.minix, getopt, hexdump, hwclock, ionice,
-        ipcrm, ipcs, isosize, line, logger, look, losetup, mcookie, mkfs,
-        mkfs.bfs, mkfs.cramfs, mkfs.minix, mkswap, more, mount, namei, partx,
-        pg, pivot_root, readprofile, rename, renice, rev, rtcwake, script,
-        scriptreplay, setarch, setsid, setterm, sfdisk, swapoff (link to swapon),
-        swapon, tailf, taskset, tunelp, ul, umount, whereis, and write</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="addpart">
-        <term><command>addpart</command></term>
-        <listitem>
-          <para>Informs the kernel of a new partition</para>
-          <indexterm zone="ch-system-util-linux-ng addpart">
-            <primary sortas="b-addpart">addpart</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="agetty">
-        <term><command>agetty</command></term>
-        <listitem>
-          <para>Opens a tty port, prompts for a login name,
-          and then invokes the <command>login</command> program</para>
-          <indexterm zone="ch-system-util-linux-ng agetty">
-            <primary sortas="b-agetty">agetty</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="blockdev">
-        <term><command>blockdev</command></term>
-        <listitem>
-          <para>Allows users to call block device ioctls from the command
-          line</para>
-          <indexterm zone="ch-system-util-linux-ng blockdev">
-            <primary sortas="b-blockdev">blockdev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cal">
-        <term><command>cal</command></term>
-        <listitem>
-          <para>Displays a simple calendar</para>
-          <indexterm zone="ch-system-util-linux-ng cal">
-            <primary sortas="b-cal">cal</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cfdisk">
-        <term><command>cfdisk</command></term>
-        <listitem>
-          <para>Manipulates the partition table of the given device</para>
-          <indexterm zone="ch-system-util-linux-ng cfdisk">
-            <primary sortas="b-cfdisk">cfdisk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="chkdupexe">
-        <term><command>chkdupexe</command></term>
-        <listitem>
-          <para>Finds duplicate executables</para>
-          <indexterm zone="ch-system-util-linux-ng chkdupexe">
-            <primary sortas="b-chkdupexe">chkdupexe</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="col">
-        <term><command>col</command></term>
-        <listitem>
-          <para>Filters out reverse line feeds</para>
-          <indexterm zone="ch-system-util-linux-ng col">
-            <primary sortas="b-col">col</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="colcrt">
-        <term><command>colcrt</command></term>
-        <listitem>
-          <para>Filters <command>nroff</command> output for terminals
-          that lack some capabilities, such as overstriking and half-lines</para>
-          <indexterm zone="ch-system-util-linux-ng colcrt">
-            <primary sortas="b-colcrt">colcrt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="colrm">
-        <term><command>colrm</command></term>
-        <listitem>
-          <para>Filters out the given columns</para>
-          <indexterm zone="ch-system-util-linux-ng colrm">
-            <primary sortas="b-colrm">colrm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="column">
-        <term><command>column</command></term>
-        <listitem>
-          <para>Formats a given file into multiple columns</para>
-          <indexterm zone="ch-system-util-linux-ng column">
-            <primary sortas="b-column">column</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ctrlaltdel">
-        <term><command>ctrlaltdel</command></term>
-        <listitem>
-          <para>Sets the function of the Ctrl+Alt+Del key combination to a
-          hard or a soft reset</para>
-          <indexterm zone="ch-system-util-linux-ng ctrlaltdel">
-            <primary sortas="b-ctrlaltdel">ctrlaltdel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="cytune">
-        <term><command>cytune</command></term>
-        <listitem>
-          <para>Tunes the parameters of the serial line drivers for
-          Cyclades cards</para>
-          <indexterm zone="ch-system-util-linux-ng cytune">
-            <primary sortas="b-cytune">cytune</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ddate">
-        <term><command>ddate</command></term>
-        <listitem>
-          <para>Gives the Discordian date or converts the given Gregorian date
-          to a Discordian one</para>
-          <indexterm zone="ch-system-util-linux-ng ddate">
-            <primary sortas="b-ddate">ddate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="delpart">
-        <term><command>delpart</command></term>
-        <listitem>
-          <para>Asks the kernel to remove a partition</para>
-          <indexterm zone="ch-system-util-linux-ng delpart">
-            <primary sortas="b-delpart">delpart</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="dmesg">
-        <term><command>dmesg</command></term>
-        <listitem>
-          <para>Dumps the kernel boot messages</para>
-          <indexterm zone="ch-system-util-linux-ng dmesg">
-            <primary sortas="b-dmesg">dmesg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fdformat">
-        <term><command>fdformat</command></term>
-        <listitem>
-          <para>Low-level formats a floppy disk</para>
-          <indexterm zone="ch-system-util-linux-ng fdformat">
-            <primary sortas="b-fdformat">fdformat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fdisk">
-        <term><command>fdisk</command></term>
-        <listitem>
-          <para>Manipulates the partition table of the given device</para>
-          <indexterm zone="ch-system-util-linux-ng fdisk">
-            <primary sortas="b-fdisk">fdisk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="flock">
-        <term><command>flock</command></term>
-        <listitem>
-          <para>Acquires a file lock and then executes a command with the lock
-          held</para>
-          <indexterm zone="ch-system-util-linux-ng flock">
-            <primary sortas="b-flock">flock</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fsck.cramfs">
-        <term><command>fsck.cramfs</command></term>
-        <listitem>
-          <para>Performs a consistency check on the Cramfs file system on the
-          given device</para>
-          <indexterm zone="ch-system-util-linux-ng fsck.cramfs">
-            <primary sortas="b-fsck.cramfs">fsck.cramfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="fsck.minix">
-        <term><command>fsck.minix</command></term>
-        <listitem>
-          <para>Performs a consistency check on the Minix file system on the
-          given device</para>
-          <indexterm zone="ch-system-util-linux-ng fsck.minix">
-            <primary sortas="b-fsck.minix">fsck.minix</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="getopt">
-        <term><command>getopt</command></term>
-        <listitem>
-          <para>Parses options in the given command line</para>
-          <indexterm zone="ch-system-util-linux-ng getopt">
-            <primary sortas="b-getopt">getopt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hexdump">
-        <term><command>hexdump</command></term>
-        <listitem>
-          <para>Dumps the given file in hexadecimal or in another given
-          format</para>
-          <indexterm zone="ch-system-util-linux-ng hexdump">
-            <primary sortas="b-hexdump">hexdump</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hwclock">
-        <term><command>hwclock</command></term>
-        <listitem>
-          <para>Reads or sets the system's hardware clock, also called
-          the Real-Time Clock (RTC) or Basic Input-Output System (BIOS)
-          clock</para>
-          <indexterm zone="ch-system-util-linux-ng hwclock">
-            <primary sortas="b-hwclock">hwclock</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ionice">
-        <term><command>ionice</command></term>
-        <listitem>
-          <para>Gives and sets program I/O scheduling class and priority</para>
-          <indexterm zone="ch-system-util-linux-ng ionice">
-            <primary sortas="b-ionice">ionice</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ipcrm">
-        <term><command>ipcrm</command></term>
-        <listitem>
-          <para>Removes the given Inter-Process Communication (IPC) resource</para>
-          <indexterm zone="ch-system-util-linux-ng ipcrm">
-            <primary sortas="b-ipcrm">ipcrm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ipcs">
-        <term><command>ipcs</command></term>
-        <listitem>
-          <para>Provides IPC status information</para>
-          <indexterm zone="ch-system-util-linux-ng ipcs">
-            <primary sortas="b-ipcs">ipcs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="isosize">
-        <term><command>isosize</command></term>
-        <listitem>
-          <para>Reports the size of an iso9660 file system</para>
-          <indexterm zone="ch-system-util-linux-ng isosize">
-            <primary sortas="b-isosize">isosize</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="line">
-        <term><command>line</command></term>
-        <listitem>
-          <para>Copies a single line</para>
-          <indexterm zone="ch-system-util-linux-ng line">
-            <primary sortas="b-line">line</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="logger">
-        <term><command>logger</command></term>
-        <listitem>
-          <para>Enters the given message into the system log</para>
-          <indexterm zone="ch-system-util-linux-ng logger">
-            <primary sortas="b-logger">logger</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="look">
-        <term><command>look</command></term>
-        <listitem>
-          <para>Displays lines that begin with the given string</para>
-          <indexterm zone="ch-system-util-linux-ng look">
-            <primary sortas="b-look">look</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="losetup">
-        <term><command>losetup</command></term>
-        <listitem>
-          <para>Sets up and controls loop devices</para>
-          <indexterm zone="ch-system-util-linux-ng losetup">
-            <primary sortas="b-losetup">losetup</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mcookie">
-        <term><command>mcookie</command></term>
-        <listitem>
-          <para>Generates magic cookies (128-bit random hexadecimal numbers) for
-          <command>xauth</command></para>
-          <indexterm zone="ch-system-util-linux-ng mcookie">
-            <primary sortas="b-mcookie">mcookie</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfs">
-        <term><command>mkfs</command></term>
-        <listitem>
-          <para>Builds a file system on a device (usually a hard disk
-          partition)</para>
-          <indexterm zone="ch-system-util-linux-ng mkfs">
-            <primary sortas="b-mkfs">mkfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfs.bfs">
-        <term><command>mkfs.bfs</command></term>
-        <listitem>
-          <para>Creates a Santa Cruz Operations (SCO) bfs file system</para>
-          <indexterm zone="ch-system-util-linux-ng mkfs.bfs">
-            <primary sortas="b-mkfs.bfs">mkfs.bfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfs.cramfs">
-        <term><command>mkfs.cramfs</command></term>
-        <listitem>
-          <para>Creates a cramfs file system</para>
-          <indexterm zone="ch-system-util-linux-ng mkfs.cramfs">
-            <primary sortas="b-mkfs.cramfs">mkfs.cramfs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkfs.minix">
-        <term><command>mkfs.minix</command></term>
-        <listitem>
-          <para>Creates a Minix file system</para>
-          <indexterm zone="ch-system-util-linux-ng mkfs.minix">
-            <primary sortas="b-mkfs.minix">mkfs.minix</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkswap">
-        <term><command>mkswap</command></term>
-        <listitem>
-          <para>Initializes the given device or file to be used as a swap
-          area</para>
-          <indexterm zone="ch-system-util-linux-ng mkswap">
-            <primary sortas="b-mkswap">mkswap</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="more">
-        <term><command>more</command></term>
-        <listitem>
-          <para>A filter for paging through text one screen at a time</para>
-          <indexterm zone="ch-system-util-linux-ng more">
-            <primary sortas="b-more">more</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mount">
-        <term><command>mount</command></term>
-        <listitem>
-          <para>Attaches the file system on the given device to a specified
-          directory in the file-system tree</para>
-          <indexterm zone="ch-system-util-linux-ng mount">
-            <primary sortas="b-mount">mount</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="namei">
-        <term><command>namei</command></term>
-        <listitem>
-          <para>Shows the symbolic links in the given pathnames</para>
-          <indexterm zone="ch-system-util-linux-ng namei">
-            <primary sortas="b-namei">namei</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="partx">
-        <term><command>partx</command></term>
-        <listitem>
-          <para>Tells the kernel about the presence and numbering of on-disk
-          partitions</para>
-          <indexterm zone="ch-system-util-linux-ng partx">
-            <primary sortas="b-partx">partx</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pg">
-        <term><command>pg</command></term>
-        <listitem>
-          <para>Displays a text file one screen full at a time</para>
-          <indexterm zone="ch-system-util-linux-ng pg">
-            <primary sortas="b-pg">pg</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pivot_root">
-        <term><command>pivot_root</command></term>
-        <listitem>
-          <para>Makes the given file system the new root file system of the
-          current process</para>
-          <indexterm zone="ch-system-util-linux-ng pivot_root">
-            <primary sortas="b-pivot_root">pivot_root</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="readprofile">
-        <term><command>readprofile</command></term>
-        <listitem>
-          <para>Reads kernel profiling information</para>
-          <indexterm zone="ch-system-util-linux-ng readprofile">
-            <primary sortas="b-readprofile">readprofile</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rename">
-        <term><command>rename</command></term>
-        <listitem>
-          <para>Renames the given files, replacing a given string with
-          another</para>
-          <indexterm zone="ch-system-util-linux-ng rename">
-            <primary sortas="b-rename">rename</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="renice">
-        <term><command>renice</command></term>
-        <listitem>
-          <para>Alters the priority of running processes</para>
-          <indexterm zone="ch-system-util-linux-ng renice">
-            <primary sortas="b-renice">renice</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rev">
-        <term><command>rev</command></term>
-        <listitem>
-          <para>Reverses the lines of a given file</para>
-          <indexterm zone="ch-system-util-linux-ng rev">
-            <primary sortas="b-rev">rev</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rtcwake">
-        <term><command>rtcwake</command></term>
-        <listitem>
-          <para>Enters a system sleep state until a specified wakeup time</para>
-          <indexterm zone="ch-system-util-linux-ng rtcwake">
-            <primary sortas="b-rtcwake">rtcwake</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="script">
-        <term><command>script</command></term>
-        <listitem>
-          <para>Makes a typescript of a terminal session</para>
-          <indexterm zone="ch-system-util-linux-ng script">
-            <primary sortas="b-script">script</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="scriptreplay">
-        <term><command>scriptreplay</command></term>
-        <listitem>
-          <para>Plays back typescripts created by <command>script</command></para>
-          <indexterm zone="ch-system-util-linux-ng scriptreplay">
-            <primary sortas="b-scriptreplay">scriptreplay</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setarch">
-        <term><command>setarch</command></term>
-        <listitem>
-          <para>Changes reported architecture in new program environment and
-          sets personality flags</para>
-          <indexterm zone="ch-system-util-linux-ng setarch">
-            <primary sortas="b-setarch">setarch</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setsid">
-        <term><command>setsid</command></term>
-        <listitem>
-          <para>Runs the given program in a new session</para>
-          <indexterm zone="ch-system-util-linux-ng setsid">
-            <primary sortas="b-setsid">setsid</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="setterm">
-        <term><command>setterm</command></term>
-        <listitem>
-          <para>Sets terminal attributes</para>
-          <indexterm zone="ch-system-util-linux-ng setterm">
-            <primary sortas="b-setterm">setterm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sfdisk">
-        <term><command>sfdisk</command></term>
-        <listitem>
-          <para>A disk partition table manipulator</para>
-          <indexterm zone="ch-system-util-linux-ng sfdisk">
-            <primary sortas="b-sfdisk">sfdisk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="swapoff">
-        <term><command>swapoff</command></term>
-        <listitem>
-          <para>Disables devices and files for paging and swapping</para>
-          <indexterm zone="ch-system-util-linux-ng swapoff">
-            <primary sortas="b-swapoff">swapoff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="swapon">
-        <term><command>swapon</command></term>
-        <listitem>
-          <para>Enables devices and files for paging and swapping and
-          lists the devices and files currently in use</para>
-          <indexterm zone="ch-system-util-linux-ng swapon">
-            <primary sortas="b-swapon">swapon</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tailf">
-        <term><command>tailf</command></term>
-        <listitem>
-          <para>Tracks the growth of a log file. Displays the last 10 lines
-          of a log file, then continues displaying any new entries in the
-          log file as they are created</para>
-          <indexterm zone="ch-system-util-linux-ng tailf">
-            <primary sortas="b-tailf">tailf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="taskset">
-        <term><command>taskset</command></term>
-        <listitem>
-          <para>Retrieves or sets a process's CPU affinity</para>
-          <indexterm zone="ch-system-util-linux-ng taskset">
-            <primary sortas="b-taskset">taskset</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tunelp">
-        <term><command>tunelp</command></term>
-        <listitem>
-          <para>Tunes the parameters of the line printer</para>
-          <indexterm zone="ch-system-util-linux-ng tunelp">
-            <primary sortas="b-tunelp">tunelp</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ul">
-        <term><command>ul</command></term>
-        <listitem>
-          <para>A filter for translating underscores into escape sequences
-          indicating underlining for the terminal in use</para>
-          <indexterm zone="ch-system-util-linux-ng ul">
-            <primary sortas="b-ul">ul</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="umount">
-        <term><command>umount</command></term>
-        <listitem>
-          <para>Disconnects a file system from the system's file tree</para>
-          <indexterm zone="ch-system-util-linux-ng umount">
-            <primary sortas="b-umount">umount</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="whereis">
-        <term><command>whereis</command></term>
-        <listitem>
-          <para>Reports the location of the binary, source, and man page
-          for the given command</para>
-          <indexterm zone="ch-system-util-linux-ng whereis">
-            <primary sortas="b-whereis">whereis</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="write">
-        <term><command>write</command></term>
-        <listitem>
-          <para>Sends a message to the given user <emphasis>if</emphasis> that
-          user has not disabled receipt of such messages</para>
-          <indexterm zone="ch-system-util-linux-ng write">
-            <primary sortas="b-write">write</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/vim.xml
===================================================================
--- BOOK/final-system/common/vim.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,411 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-vim" role="wrap">
-  <?dbhtml filename="vim.html"?>
-
-  <title>Vim-&vim-version;</title>
-
-  <indexterm zone="ch-system-vim">
-    <primary sortas="a-Vim">Vim</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Vim package contains a powerful text editor.</para>
-
-    <tip>
-      <title>Alternatives to Vim</title>
-
-      <para>If you prefer another editor&mdash;such as Emacs, Joe, or
-      Nano&mdash;please refer to <ulink
-      url="&cblfs-root;index.php/Category:Text_Editors"/>
-      for suggested installation instructions.</para>
-    </tip>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Vim</title>
-
-    <para os="a">First, unpack both <filename>vim-&vim-version;.tar.bz2</filename>
-    and (optionally) <filename>vim-&vim-version;-lang.tar.gz</filename>
-    archives into the same directory.</para>
-
-    <para os="p1">The following patches merges all updates from the &vim-version; Branch
-    from the Vim developers:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&vim-branch_update-patch;</userinput></screen>
-
-    <para os="b">Change the default location of
-    the <filename>vimrc</filename> configuration file to <filename
-    class="directory">/etc</filename>:</para>
-
-<screen os="c"><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' &gt;&gt; src/feature.h</userinput></screen>
-
-    <para os="d">Prepare Vim for compilation:</para>
-
-<screen os="e"><userinput>./configure --prefix=/usr --enable-multibyte</userinput></screen>
-
-    <variablelist os="f">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--enable-multibyte</parameter></term>
-        <listitem>
-          <para>This optional but highly recommended switch enables support
-          for editing files in multibyte character encodings. This is needed
-          if using a locale with a multibyte character set. This switch is
-          also helpful to be able to edit text files initially created in
-          Linux distributions like Fedora Core that use UTF-8 as a default
-          character set.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="g">Compile the package:</para>
-
-<screen os="h"><userinput>make</userinput></screen>
-
-    <para os="i">To test the results, issue: <userinput>make test</userinput>.
-    However, this test suite outputs a lot of binary data to the
-    screen, which can cause issues with the settings of the current terminal.
-    This can be resolved by redirecting the output to a log file.</para>
-
-    <para os="j">Install the package:</para>
-
-<screen os="k"><userinput>make install</userinput></screen>
-
-    <para os="l">Many users are accustomed to using <command>vi</command>
-    instead of <command>vim</command>. Some programs, such as
-    <command>vigr</command> and <command>vipw</command>, also use
-    <command>vi</command>. Create a symlink to permit execution of
-    <command>vim</command> when users habitually enter <command>vi</command>
-    and allow programs that use <command>vi</command> to work:</para>
-
-<screen os="m"><userinput>ln -sv vim /usr/bin/vi</userinput></screen>
-
-<para os="n">By default, Vim's documentation is installed in
-<filename class="directory">/usr/share/vim</filename>.  The following symlink
-allows the documentation to be accessed via
-<filename class="directory">/usr/share/doc/vim-&vim-version;</filename>, making
-it consistent with the location of documentation for other packages:</para>
-
-<screen os="o"><userinput>ln -sv ../vim/vim&vim-version2;/doc /usr/share/doc/vim-&vim-version;</userinput></screen>
-
-    <para os="p">If an X Window System is going to be installed on the CLFS
-    system, you may want to recompile Vim after installing X. Vim
-    comes with a GUI version of the editor that requires X and some
-    additional libraries to be installed. For more information, refer to the
-    Vim documentation and the Vim installation page
-    in the CBLFS book at <ulink
-    url="&cblfs-root;index.php/Vim"/>.</para>
-
-  </sect2>
-
-  <sect2 id="conf-vim" role="configuration">
-    <title>Configuring Vim</title>
-
-    <indexterm zone="conf-vim">
-      <primary sortas="e-/etc/vimrc">/etc/vimrc</primary>
-    </indexterm>
-
-    <para>By default, <command>vim</command> runs in vi-incompatible mode.
-    This may be new to users who have used other editors in the past. The
-    <quote>nocompatible</quote> setting is included below to highlight the
-    fact that a new behavior is being used. It also reminds those who would
-    change to <quote>compatible</quote> mode that it should be the first
-    setting in the configuration file. This is necessary because it changes
-    other settings, and overrides must come after this setting. Create a
-    default <command>vim</command> configuration file by running the
-    following:</para>
-
-<screen><userinput>cat &gt; /etc/vimrc &lt;&lt; "EOF"
-<literal>" Begin /etc/vimrc
-
-set nocompatible
-set backspace=2
-syntax on
-if (&amp;term == "iterm") || (&amp;term == "putty")
-  set background=dark
-endif
-
-" End /etc/vimrc</literal>
-EOF</userinput></screen>
-
-
-    <para>The <parameter>set nocompatible</parameter> makes
-    <command>vim</command> behave in a more useful way (the default) than
-    the vi-compatible manner. Remove the <quote>no</quote> to keep the
-    old <command>vi</command> behavior. The <parameter>set
-    backspace=2</parameter> allows backspacing over line breaks,
-    autoindents, and the start of insert. The <parameter>syntax
-    on</parameter> enables vim's syntax highlighting. Finally, the
-    <emphasis>if</emphasis> statement with the <parameter>set
-    background=dark</parameter> corrects <command>vim</command>'s guess
-    about the background color of some terminal emulators. This gives the
-    highlighting a better color scheme for use on the black background of
-    these programs.</para>
-
-    <para>Documentation for other available options can be obtained by
-    running the following command:</para>
-
-<screen role="nodump"><userinput>vim -c ':options'</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-vim" role="content">
-    <title>Contents of Vim</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>efm_filter.pl, efm_perl.pl, ex (link to vim), less.sh, mve.awk,
-        pltags.pl, ref, rview (link to vim), rvim (link to vim), shtags.pl,
-        tcltags, vi (link to vim), view (link to vim), vim, vim132, vim2html.pl,
-        vimdiff (link to vim), vimm, vimspell.sh, vimtutor, and xxd</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="efm_filter.pl">
-        <term><command>efm_filter.pl</command></term>
-        <listitem>
-          <para>A filter for creating an error file that can be read
-          by <command>vim</command></para>
-          <indexterm zone="ch-system-vim efm_filter.pl">
-            <primary sortas="b-efm_filter.pl">efm_filter.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="efm_perl.pl">
-        <term><command>efm_perl.pl</command></term>
-        <listitem>
-          <para>Reformats the error messages of the Perl interpreter for use
-          with the <quote>quickfix</quote> mode of <command>vim</command></para>
-          <indexterm zone="ch-system-vim efm_perl.pl">
-            <primary sortas="b-efm_perl.pl">efm_perl.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ex">
-        <term><command>ex</command></term>
-        <listitem>
-          <para>Starts <command>vim</command> in ex mode</para>
-          <indexterm zone="ch-system-vim ex">
-            <primary sortas="b-ex">ex</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="less.sh">
-        <term><command>less.sh</command></term>
-        <listitem>
-          <para>A script that starts <command>vim</command> with less.vim</para>
-          <indexterm zone="ch-system-vim less.sh">
-            <primary sortas="b-less.sh">less.sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mve.awk">
-        <term><command>mve.awk</command></term>
-        <listitem>
-          <para>Processes <command>vim</command> errors</para>
-          <indexterm zone="ch-system-vim mve.awk">
-            <primary sortas="b-mve.awk">mve.awk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="pltags.pl">
-        <term><command>pltags.pl</command></term>
-        <listitem>
-          <para>Creates a tags file for Perl code for use by
-          <command>vim</command></para>
-          <indexterm zone="ch-system-vim pltags.pl">
-            <primary sortas="b-pltags.pl">pltags.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ref">
-        <term><command>ref</command></term>
-        <listitem>
-          <para>Checks the spelling of arguments</para>
-          <indexterm zone="ch-system-vim ref">
-            <primary sortas="b-ref">ref</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rview">
-        <term><command>rview</command></term>
-        <listitem>
-          <para>Is a restricted version of <command>view</command>; no shell
-          commands can be started and <command>view</command> cannot be
-          suspended</para>
-          <indexterm zone="ch-system-vim rview">
-            <primary sortas="b-rview">rview</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="rvim">
-        <term><command>rvim</command></term>
-        <listitem>
-          <para>Is a restricted version of <command>vim</command>; no shell
-          commands can be started and <command>vim</command> cannot be
-          suspended</para>
-          <indexterm zone="ch-system-vim rvim">
-            <primary sortas="b-rvim">rvim</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="shtags.pl">
-        <term><command>shtags.pl</command></term>
-        <listitem>
-          <para>Generates a tags file for Perl scripts</para>
-          <indexterm zone="ch-system-vim shtags.pl">
-            <primary sortas="b-shtags.pl">shtags.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tcltags">
-        <term><command>tcltags</command></term>
-        <listitem>
-          <para>Generates a tags file for TCL code</para>
-          <indexterm zone="ch-system-vim tcltags">
-            <primary sortas="b-tcltags">tcltags</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="view">
-        <term><command>view</command></term>
-        <listitem>
-          <para>Starts <command>vim</command> in read-only mode</para>
-          <indexterm zone="ch-system-vim view">
-            <primary sortas="b-view">view</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vi">
-        <term><command>vi</command></term>
-        <listitem>
-          <para>Link to <command>vim</command></para>
-          <indexterm zone="ch-system-vim vi">
-            <primary sortas="b-vi">vi</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vim">
-        <term><command>vim</command></term>
-        <listitem>
-          <para>Is the editor</para>
-          <indexterm zone="ch-system-vim vim">
-            <primary sortas="b-vim">vim</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vim132">
-        <term><command>vim132</command></term>
-        <listitem>
-          <para>Starts <command>vim</command> with the terminal in 132-column
-          mode</para>
-          <indexterm zone="ch-system-vim vim132">
-            <primary sortas="b-vim132">vim132</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vim2html.pl">
-        <term><command>vim2html.pl</command></term>
-        <listitem>
-          <para>Converts Vim documentation to HypterText Markup Language
-          (HTML)</para>
-          <indexterm zone="ch-system-vim vim2html.pl">
-            <primary sortas="b-vim2html.pl">vim2html.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vimdiff">
-        <term><command>vimdiff</command></term>
-        <listitem>
-          <para>Edits two or three versions of a file with <command>vim</command>
-          and show differences</para>
-          <indexterm zone="ch-system-vim vimdiff">
-            <primary sortas="b-vimdiff">vimdiff</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vimm">
-        <term><command>vimm</command></term>
-        <listitem>
-          <para>Enables the DEC locator input model on a remote terminal</para>
-          <indexterm zone="ch-system-vim vimm">
-            <primary sortas="b-vimm">vimm</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vimspell.sh">
-        <term><command>vimspell.sh</command></term>
-        <listitem>
-          <para>Spell checks a file and generates the syntax statements
-          necessary to highlight in <command>vim</command>. This script
-          requires the old Unix <command>spell</command> command, which
-          is provided neither in CLFS nor in CBLFS</para>
-          <indexterm zone="ch-system-vim vimspell.sh">
-            <primary sortas="b-vimspell.sh">vimspell.sh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="vimtutor">
-        <term><command>vimtutor</command></term>
-        <listitem>
-          <para>Teaches the basic keys and commands of
-          <command>vim</command></para>
-          <indexterm zone="ch-system-vim vimtutor">
-            <primary sortas="b-vimtutor">vimtutor</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xxd">
-        <term><command>xxd</command></term>
-        <listitem>
-          <para>Creates a hex dump of the given file; it can
-          also do the reverse, so it can be used for binary patching</para>
-          <indexterm zone="ch-system-vim xxd">
-            <primary sortas="b-xxd">xxd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/common/zlib.xml
===================================================================
--- BOOK/final-system/common/zlib.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,94 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-zlib" role="wrap">
-  <?dbhtml filename="zlib.html"?>
-
-  <title>Zlib-&zlib-version;</title>
-
-  <indexterm zone="ch-system-zlib">
-    <primary sortas="a-Zlib">Zlib</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Zlib package contains compression and decompression routines
-    used by some programs.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Zlib</title>
-
-    <para os="p1">This patch will add -fPIC to our build and allow us to build
-    a static and shared library at the same time:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&zlib-fpic-patch;</userinput></screen>
-
-    <para os="a">Prepare Zlib for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/usr --shared</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:
-    <userinput>make check</userinput>.</para>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-    <para os="h">The previous command installed two <filename
-    class="extension">.so</filename> files into <filename
-    class="directory">/usr/lib</filename>. We will move it into
-    <filename class="directory">/lib</filename> and then relink it
-    to <filename class="directory">/usr/lib</filename>:</para>
-
-<screen os="i"><userinput>mv -v /usr/lib/libz.so.* /lib
-ln -svf ../../lib/libz.so.1 /usr/lib/libz.so</userinput></screen>
-
-    <para os="j">Now we fix the permissions on the static library:</para>
-
-<screen os="k"><userinput>chmod -v 644 /usr/lib/libz.a</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-zlib" role="content">
-    <title>Contents of Zlib</title>
-
-    <segmentedlist>
-      <segtitle>Installed libraries</segtitle>
-
-      <seglistitem>
-        <seg>libz.[a,so]</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="libz">
-        <term><filename class="libraryfile">libz</filename></term>
-        <listitem>
-          <para>Contains compression and decompression
-          functions used by some programs</para>
-          <indexterm zone="ch-system-zlib libz">
-            <primary sortas="c-libz">libz</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/mips-chapter.xml
===================================================================
--- BOOK/final-system/mips-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,73 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-building-system" xreflabel="Installing Basic System Software">
-  <?dbhtml dir="final-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Installing Basic System Software</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkgmgt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/testsuitesagain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/adjusting.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/autoconf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/mktemp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/colo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/dvhtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/arcload.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/aboutdebug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/stripping.xml"/>
-
-</chapter>
Index: OK/final-system/mips/adjusting.xml
===================================================================
--- BOOK/final-system/mips/adjusting.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-adjusting">
-  <?dbhtml filename="adjusting.html"?>
-
-  <title>Adjusting the Toolchain</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <caution>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="i"><computeroutput>[Requesting program interpreter: /lib/ld.so.1]</computeroutput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-  </caution>
-
-</sect1>
Index: OK/final-system/mips/arcload.xml
===================================================================
--- BOOK/final-system/mips/arcload.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,86 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-arcload" role="wrap">
-  <?dbhtml filename="arcload.html"?>
-
-  <title>Arcload-&arcload-version;</title>
-
-  <indexterm zone="ch-system-arcload">
-    <primary sortas="a-Arcload">Arcload</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Arcload package contains a SGI Bootloader.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Arcload</title>
-
- <note os="a">
-    <para>This program is the Arcload bootloader, which is for
-    SGI Workstations and SGI Servers based on MIPS Processors.</para>
-  </note>
-
-    <para os="d">Compile the package:</para>
-
-<screen os="e"><userinput>make MODE=M32 clean
-make CC="gcc" LD="ld" MODE=M32</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>install -dv /usr/lib/arcload
-cp -v arcload.ecoff /usr/lib/arcload/sash</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-arcload" role="content">
-    <title>Contents of Arcload</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>sashARCS or sash64</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="sashARCS">
-        <term><command>sashARCS</command></term>
-        <listitem>
-          <para>Is a bootloader for IP22/IP32 MIPS systems, which are
-          32 Bit.</para>
-          <indexterm zone="ch-system-arcload sashARCS">
-            <primary sortas="b-sashARCS">sashARCS</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="sash64">
-        <term><command>sash64</command></term>
-        <listitem>
-          <para>Is a bootloader IP27/IP28/IP30 MIPS systems, which are
-          64 Bit.</para>
-          <indexterm zone="ch-system-arcload sash64">
-            <primary sortas="b-sash64">sash64</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/mips/colo.xml
===================================================================
--- BOOK/final-system/mips/colo.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,137 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-colo" role="wrap">
-  <?dbhtml filename="colo.html"?>
-
-  <title>Colo-&colo-version;</title>
-
-  <indexterm zone="ch-system-colo">
-    <primary sortas="a-Colo">Colo</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Colo package contains the Cobalt Boot Loader.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Colo</title>
-
-  <note os="a">
-    <para>This bootloader is for the MIPS based cobalt servers RaQ,
-    RaQ2, Qube, or the Qube2.</para>
-  </note>
-
-    <para os="p3">This patch fixes a relocation error when linking with
-    Binutils:</para>
-
-<screen os="p4"><userinput>patch -Np1 -i ../&colo-relocation-patch;</userinput></screen>
-
-    <para os="b">Compile the Colo package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para os="c">Install the package:</para>
-
-<screen os="d"><userinput>install -dv  /usr/lib/colo/examples
-install -v chain/colo-chain.elf /usr/lib/colo
-install -v tools/lcdtools/e2fsck-lcd/e2fsck-lcd /sbin
-install -v tools/lcdtools/e2fsck-lcd/e2fsck-lcd.8 /usr/man/man8
-install -v tools/lcdtools/paneld/paneld /sbin
-install -v tools/lcdtools/paneld/paneld.8 /usr/man/man8
-install -v tools/lcdtools/putlcd/putlcd /sbin
-install -v tools/lcdtools/putlcd/putlcd.8 /usr/man/man8
-install -v examples/menu.colo /usr/lib/colo/examples
-install -v examples/simple.colo /usr/lib/colo/examples
-cp -v chain/colo-chain.elf /boot/vmlinux
-gzip -9 /boot/vmlinux</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-colo" role="content">
-    <title>Contents of Colo</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>colo-chain.elf, e2fsck-lcd, paneld and putlcd</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="colo-chain.elf">
-        <term><command>colo</command></term>
-        <listitem>
-          <para>Is the Cobalt Bootloader's chain mode executeable. This
-          file gets gzipped and renamed to <filename>vmlinux.gz</filename>,
-          so it can be booted automatically by the Cobalt's existing
-          firmware</para>
-          <indexterm zone="ch-system-colo colo-chain.elf">
-            <primary sortas="b-colo-chain.elf">colo-chain.elf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="e2fsck-lcd">
-        <term><command>e2fsck-lcd</command></term>
-        <listitem>
-          <para>Will output file system check progress information on the
-          Cobalt LCD</para>
-          <indexterm zone="ch-system-colo e2fsck-lcd">
-            <primary sortas="b-e2fsck-lcd">e2fsck-lcd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="paneld">
-        <term><command>paneld</command></term>
-        <listitem>
-          <para>Is an admin tool for the LCD panel of Cobalt machines. By
-          default, it will display the current time and optionally a message.
-          When you hold the enter or select button for a couple of seconds
-          you will get an admin menu. The menu will allow you to either halt
-          or reboot your Cobalt machine</para>
-          <indexterm zone="ch-system-colo paneld">
-            <primary sortas="b-paneld">paneld</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="putlcd">
-        <term><command>putlcd</command></term>
-        <listitem>
-          <para>Is a tool to display text on the LCD display of Cobalt
-          machines</para>
-          <indexterm zone="ch-system-colo putlcd">
-            <primary sortas="b-putlcd">putlcd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="md5rom">
-        <term><command>md5rom</command></term>
-        <listitem>
-          <para>Will output the MD5 checksum of a Cobalt's ROM</para>
-          <indexterm zone="ch-system-colo md5rom">
-            <primary sortas="b-md5rom">md5rom</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/mips/dvhtool.xml
===================================================================
--- BOOK/final-system/mips/dvhtool.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,84 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-dvhtool" role="wrap">
-  <?dbhtml filename="dvhtool.html"?>
-
-  <title>Dvhtool-&dvhtool-version;</title>
-
-  <indexterm zone="ch-system-dvhtool">
-    <primary sortas="a-Dvhtool">Dvhtool</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Dvhtool package is used to manipulate volume headers
-    of devices using sgi disk labels.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Dvhtool</title>
-
- <note os="a">
-    <para>This program is required for the Arcload bootloader, which is for
-    SGI Workstations and SGI Servers based on MIPS Processors.</para>
-  </note>
-
-    <para os="b">This patch fixes build issues with Dvhtool and adds support
-    for LVM and Linux partitions:</para>
-
-<screen os="c"><userinput>patch -Np1 -i ../&dvhtool-fixes-patch;</userinput></screen>
-
-    <para os="d">Prepare Dvhtool  for compilation:</para>
-
-<screen os="e"><userinput>./configure --prefix=/usr</userinput></screen>
-
-    <para os="f">Compile the package:</para>
-
-<screen os="g"><userinput>make</userinput></screen>
-
-    <para os="h">Install the package:</para>
-
-<screen os="i"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-dvhtool" role="content">
-    <title>Contents of Dvhtool</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>dvhtool</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="dvhtool">
-        <term><command>dvhtool</command></term>
-        <listitem>
-          <para>A utility for displaying SGI disk partition and volume header
-          information as well as for copying files to and from the volume
-          header</para>
-          <indexterm zone="ch-system-dvhtool dvhtool">
-            <primary sortas="b-dvhtool">dvhtool</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/mips/glibc.xml
===================================================================
--- BOOK/final-system/mips/glibc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,138 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc" role="wrap">
-  <title>Glibc-&glibc-version;</title>
-
-  <?dbhtml filename="glibc.html"?>
-
-  <indexterm zone="ch-system-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <para os="g1">MIPS is no longer supported in the main Glibc tree, so we have to
-    extract the glibc-ports-&glibc-version; package into our
-    glibc-&glibc-version; directory. Then we move
-    ports to the location expected by our build and patches:</para>
-
-<screen os="g2"><userinput>tar -jxvf ../glibc-ports-&glibc-ports-version;.tar.bz2
-mv -v glibc-ports-&glibc-version; ports</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('i18n-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../ppc/glibc.xml"
-  xpointer="xpointer(id('conf-ld'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('contents-glibc'))"/>
-
-</sect1>
Index: OK/final-system/mips/mktemp.xml
===================================================================
--- BOOK/final-system/mips/mktemp.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,76 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-mktemp" role="wrap">
-  <?dbhtml filename="mktemp.html"?>
-
-  <title>Mktemp-&mktemp-version;</title>
-
-  <indexterm zone="ch-system-mktemp">
-    <primary sortas="a-Mktemp">Mktemp</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/mktemp.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Mktemp</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <para os="p1">The configure files in this package do not recognise all
-    of the machines supported by CLFS. This patch updates <filename>config.guess</filename>
-    and <filename>config.sub</filename> for other processors:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&mktemp-update-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/mktemp.xml"
-  xpointer="xpointer(id('contents-mktemp'))"/>
-
-</sect1>
Index: OK/final-system/mips/sysvinit.xml
===================================================================
--- BOOK/final-system/mips/sysvinit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,106 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-sysvinit" role="wrap">
-  <?dbhtml filename="sysvinit.html"?>
-
-  <title>Sysvinit-&sysvinit-version;</title>
-
-  <indexterm zone="ch-system-sysvinit">
-    <primary sortas="a-Sysvinit">Sysvinit</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sysvinit.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Sysvinit</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <sect2 id="conf-sysvinit" role="configuration">
-    <title>Configuring Sysvinit</title>
-
-    <indexterm zone="conf-sysvinit">
-      <primary sortas="a-Sysvinit">Sysvinit</primary>
-      <secondary>configuring</secondary>
-    </indexterm>
-
-    <indexterm zone="conf-sysvinit">
-      <primary sortas="e-/etc/inittab">/etc/inittab</primary>
-    </indexterm>
-
-    <para>Create a new file <filename>/etc/inittab</filename> by running
-    the following:</para>
-
-<screen><userinput>cat &gt; /etc/inittab &lt;&lt; "EOF"
-<literal># Begin /etc/inittab
-
-id:3:initdefault:
-
-si::sysinit:/etc/rc.d/init.d/rc sysinit
-
-l0:0:wait:/etc/rc.d/init.d/rc 0
-l1:S1:wait:/etc/rc.d/init.d/rc 1
-l2:2:wait:/etc/rc.d/init.d/rc 2
-l3:3:wait:/etc/rc.d/init.d/rc 3
-l4:4:wait:/etc/rc.d/init.d/rc 4
-l5:5:wait:/etc/rc.d/init.d/rc 5
-l6:6:wait:/etc/rc.d/init.d/rc 6
-
-ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now
-
-su:S016:once:/sbin/sulogin
-
-# Remove this section if you System only
-# has a console port
-1:2345:respawn:/sbin/agetty -I '\033(K' tty1 9600
-2:2345:respawn:/sbin/agetty -I '\033(K' tty2 9600
-3:2345:respawn:/sbin/agetty -I '\033(K' tty3 9600
-4:2345:respawn:/sbin/agetty -I '\033(K' tty4 9600
-5:2345:respawn:/sbin/agetty -I '\033(K' tty5 9600
-6:2345:respawn:/sbin/agetty -I '\033(K' tty6 9600
-
-# Uncomment this section if your system has a console
-# port
-#c0:12345:respawn:/sbin/agetty 115200 ttyS0 vt100
-
-# End /etc/inittab</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sysvinit.xml"
-  xpointer="xpointer(id('contents-sysvinit'))"/>
-
-</sect1>
Index: OK/final-system/mips64-64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,73 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-building-system" xreflabel="Installing Basic System Software">
-  <?dbhtml dir="final-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Installing Basic System Software</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkgmgt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/testsuitesagain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/adjusting.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/autoconf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/mktemp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/colo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/dvhtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/arcload.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/aboutdebug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/stripping.xml"/>
-
-</chapter>
Index: OK/final-system/mips64-64/adjusting.xml
===================================================================
--- BOOK/final-system/mips64-64/adjusting.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,71 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-adjusting">
-  <?dbhtml filename="adjusting.html"?>
-
-  <title>Adjusting the Toolchain</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/adjusting.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="c"><userinput>gcc -dumpspecs | \
-perl -p -e 's@/tools/lib/ld@/lib/ld@g;' \
-     -e 's@/tools/lib32/ld@/lib32/ld@g;' \
-     -e 's@/tools/lib64/ld@/lib64/ld@g;' \
-     -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;' > \
-     $(dirname $(gcc --print-libgcc-file-name))/specs</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/adjusting.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <para>Note that <filename class="directory">/lib</filename>,
-  <filename class="directory">/lib32</filename>, or
-  <filename class="directory">/lib64</filename> is now the prefix
-  of our dynamic linker.</para>
-
-  <caution>
-
-    <para>It is imperative at this point to stop and ensure that
-    the basic functions (compiling and linking) of the adjusted toolchain
-    are working as expected. Since we are doing a 64 bit only build, we
-    will only test the 64 bit ABI. To do this, perform a sanity
-    check:</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/adjusting.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/adjusting.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/adjusting.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/adjusting.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/adjusting.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/adjusting.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-  </caution>
-
-</sect1>
Index: OK/final-system/mips64-64/arcload.xml
===================================================================
--- BOOK/final-system/mips64-64/arcload.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,50 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-arcload" role="wrap">
-  <?dbhtml filename="arcload.html"?>
-
-  <title>Arcload-&arcload-version;</title>
-
-  <indexterm zone="ch-system-arcload">
-    <primary sortas="a-Arcload">Arcload</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/arcload.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Arcload</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/arcload.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/arcload.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen><userinput>make MODE=M64 clean
-make CC="gcc" LD="ld" MODE=M64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/arcload.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-<screen><userinput>install -dv /usr/lib/arcload
-cp -v arcload /usr/lib/arcload/sash64</userinput></screen>
-
-  </sect2>
-
-<!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/arcload.xml"
-  xpointer="xpointer(id('contents-arcload'))"/>
--->
-
-</sect1>
Index: OK/final-system/mips64-64/gcc.xml
===================================================================
--- BOOK/final-system/mips64-64/gcc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,150 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/gcc.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/gcc.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='e1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="i"><userinput>../gcc-&gcc-version;/configure --prefix=/usr \
-    --libexecdir=/usr/lib --enable-shared --enable-threads=posix \
-    --enable-__cxa_atexit --enable-c99 --enable-long-long --with-abi=64 \
-    --enable-clocale=gnu --enable-languages=c,c++ --disable-libstdcxx-pch \
-    --disable-multilib</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/gcc.xml"
-  xpointer="xpointer(id('contents-gcc'))"/>
-
-</sect1>
Index: OK/final-system/mips64-64/glibc.xml
===================================================================
--- BOOK/final-system/mips64-64/glibc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,160 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version;</title>
-
-  <indexterm zone="ch-system-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='g1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='g2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='m3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='m4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/glibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/glibc.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
-
-    <para>Now we will force Glibc to build as 64-bit instead of the default
-    n32 with the following sed:</para>
-
-    <screen><userinput>sed -i '/default) machine=/s/n32/64/g' \
-       ports/sysdeps/mips/preconfigure</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/glibc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/glibc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('i18n-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/glibc.xml"
-  xpointer="xpointer(id('conf-ld'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('contents-glibc'))"/>
-
-</sect1>
Index: OK/final-system/mips64-chapter.xml
===================================================================
--- BOOK/final-system/mips64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,102 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-building-system" xreflabel="Installing Basic System Software">
-  <?dbhtml dir="final-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Installing Basic System Software</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkgmgt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/testsuitesagain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/glibc-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/glibc-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/adjusting.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/multiarch_wrapper.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bison-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bison-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/autoconf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/automake.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/man.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/mktemp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysklogd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev-n32.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/colo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/dvhtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/arcload.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/aboutdebug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/stripping.xml"/>
-
-</chapter>
Index: OK/final-system/mips64/aboutdebug.xml
===================================================================
--- BOOK/final-system/mips64/aboutdebug.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-aboutdebug">
-  <?dbhtml filename="aboutdebug.html"?>
-
-  <title>About Debugging Symbols</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/aboutdebug.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/aboutdebug.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <itemizedlist os="c">
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/aboutdebug.xml"
-    xpointer="xpointer(//*[@os='c1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/aboutdebug.xml"
-    xpointer="xpointer(//*[@os='c2'])"/>
-
-    <listitem os="c3">
-      <para>Glibc and GCC files (<filename class="directory">/lib</filename>,
-      <filename class="directory">/lib32,</filename>,
-      <filename class="directory">/lib64,</filename>,
-      <filename class="directory">/usr/lib</filename>,
-      <filename class="directory">/usr/lib32</filename>,
-      and <filename class="directory">/usr/lib64</filename>) with debugging
-      symbols: 87 MB</para>
-    </listitem>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/aboutdebug.xml"
-    xpointer="xpointer(//*[@os='c4'])"/>
-
-  </itemizedlist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/aboutdebug.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/aboutdebug.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-</sect1>
Index: OK/final-system/mips64/adjusting.xml
===================================================================
--- BOOK/final-system/mips64/adjusting.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,100 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-adjusting">
-  <?dbhtml filename="adjusting.html"?>
-
-  <title>Adjusting the Toolchain</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/adjusting.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="c"><userinput>gcc -dumpspecs | \
-perl -p -e 's@/tools/lib/ld@/lib/ld@g;' \
-     -e 's@/tools/lib32/ld@/lib32/ld@g;' \
-     -e 's@/tools/lib64/ld@/lib64/ld@g;' \
-     -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;' > \
-     $(dirname $(gcc --print-libgcc-file-name))/specs</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/adjusting.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <para>Note that <filename class="directory">/lib</filename>,
-  <filename class="directory">/lib32</filename>, or
-  <filename class="directory">/lib64</filename> is now the prefix
-  of our dynamic linker.</para>
-
-  <caution>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/adjusting.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/adjusting.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <para>For N32 ABI:</para>
-
-<screen><userinput>echo 'main(){}' &gt; dummy.c
-gcc ${BUILDN32} dummy.c
-readelf -l a.out | grep ': /lib'</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen><computeroutput>[Requesting program interpreter: /lib32/ld.so.1]</computeroutput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen><computeroutput>[Requesting program interpreter: /lib64/ld.so.1]</computeroutput></screen>
-
-    <para>Note that <filename class="directory">/lib</filename>,
-    <filename class="directory">/lib32</filename> or
-    <filename class="directory">/lib64</filename> is now the prefix
-    of our dynamic linker.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/adjusting.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/adjusting.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/adjusting.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-  </caution>
-
-</sect1>
Index: OK/final-system/mips64/arcload.xml
===================================================================
--- BOOK/final-system/mips64/arcload.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,50 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-arcload" role="wrap">
-  <?dbhtml filename="arcload.html"?>
-
-  <title>Arcload-&arcload-version;</title>
-
-  <indexterm zone="ch-system-arcload">
-    <primary sortas="a-Arcload">Arcload</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/arcload.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Arcload</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/arcload.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/arcload.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen><userinput>make MODE=M64 clean
-make CC="gcc" LD="ld" MODE=M64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/arcload.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-<screen><userinput>install -dv /usr/lib64/arcload
-cp -v arcload /usr/lib64/arcload/sash64</userinput></screen>
-
-  </sect2>
-
-<!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/arcload.xml"
-  xpointer="xpointer(id('contents-arcload'))"/>
--->
-
-</sect1>
Index: OK/final-system/mips64/colo.xml
===================================================================
--- BOOK/final-system/mips64/colo.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-colo" role="wrap">
-  <?dbhtml filename="colo.html"?>
-
-  <title>Colo-&colo-version;</title>
-
-  <indexterm zone="ch-system-colo">
-    <primary sortas="a-Colo">Colo</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/colo.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Colo</title>
-
-    <para os="p1">This patch updates the Colo bootloader to build under
-    64 bit:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&colo-make-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/colo.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/colo.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/colo.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/colo.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen><userinput>make binary
-make CC="gcc ${BUILD64}" tooldirs</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/colo.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/colo.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/colo.xml"
-  xpointer="xpointer(id('contents-colo'))"/>
-
-</sect1>
Index: OK/final-system/mips64/dvhtool.xml
===================================================================
--- BOOK/final-system/mips64/dvhtool.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,66 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-dvhtool" role="wrap">
-  <?dbhtml filename="dvhtool.html"?>
-
-  <title>Dvhtool-&dvhtool-version;</title>
-
-  <indexterm zone="ch-system-dvhtool">
-    <primary sortas="a-Dvhtool">Dvhtool</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/dvhtool.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Dvhtool</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/dvhtool.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/dvhtool.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/dvhtool.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/dvhtool.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/dvhtool.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/dvhtool.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/dvhtool.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/dvhtool.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-<!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/dvhtool.xml"
-  xpointer="xpointer(id('contents-dvhtool'))"/>
--->
-
-</sect1>
Index: OK/final-system/mips64/gcc.xml
===================================================================
--- BOOK/final-system/mips64/gcc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,142 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='e1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="i"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-    ../gcc-&gcc-version;/configure --prefix=/usr --libdir=/usr/lib64 \
-    --libexecdir=/usr/lib64 --enable-shared --enable-threads=posix \
-    --enable-__cxa_atexit --enable-c99 --enable-long-long --with-abi=64 \
-    --enable-clocale=gnu --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/gcc.xml"
-  xpointer="xpointer(id('contents-gcc'))"/>
-
-</sect1>
Index: OK/final-system/mips64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/mips64/glibc-64bit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,182 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc" role="wrap">
-  <?dbhtml filename="glibc-64bit.html"?>
-
-  <title>Glibc-&glibc-version; 64-Bit</title>
-
-  <indexterm zone="ch-system-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='g1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='g2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <para os="m3">The following will cause Glibc to use an absolute path to the
-    ldd-rewrite-script instead of a relative path:</para>
-
-<screen os="m4"><userinput>cp config.make.in{,.orig}
-sed '/ldd-rewrite-script/s:@:${objdir}/&amp;:' config.make.in.orig &gt; config.make.in</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('i18n-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-glibc'))"/>
-
-  <sect2 id="conf-ld" role="configuration">
-    <title>Configuring Dynamic Loader</title>
-
-    <indexterm zone="conf-ld">
-      <primary sortas="e-/etc/ld.so.conf">/etc/ld.so.conf</primary>
-    </indexterm>
-
-    <para os="ld-a">By default, the dynamic loader (<filename
-    class="libraryfile">/lib/ld.so.1</filename> for 32bit executables <filename
-    class="libraryfile">/lib32/ld.so.1</filename> for n32 executables and
-    <filename class="libraryfile">/lib64/ld.so.1</filename> for 64bit
-    executables) searches through
-    <filename class="directory">/lib</filename> and <filename
-    class="directory">/usr/lib</filename> for dynamic libraries that are
-    needed by programs as they are run. However, if there are libraries in
-    directories other than <filename class="directory">/lib</filename> and
-    <filename class="directory">/usr/lib</filename>, these need to be
-    added to the <filename>/etc/ld.so.conf</filename> file in order
-    for the dynamic loader to find them. Some directories that are commonly
-    known to contain additional libraries are
-    <filename class="directory">/usr/local/lib</filename>,
-    <filename class="directory">/usr/local/lib32</filename>,
-    <filename class="directory">/usr/local/lib64</filename>,
-    <filename class="directory">/opt/lib</filename>,
-    <filename class="directory">/opt/lib32</filename>,
-    and <filename class="directory">/opt/lib64</filename>,
-    so add those directories to the dynamic loader's search path.</para>
-
-    <para os="ld-b">Create a new file <filename>/etc/ld.so.conf</filename> by running the
-    following:</para>
-
-<screen os="ld-c"><userinput>cat &gt; /etc/ld.so.conf &lt;&lt; "EOF"
-<literal># Begin /etc/ld.so.conf
-
-/usr/local/lib
-/usr/local/lib32
-/usr/local/lib64
-/opt/lib
-/opt/lib32
-/opt/lib64
-
-# End /etc/ld.so.conf</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('contents-glibc'))"/>
-
-</sect1>
Index: OK/final-system/mips64/glibc-n32.xml
===================================================================
--- BOOK/final-system/mips64/glibc-n32.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,142 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc-n32" role="wrap">
-  <?dbhtml filename="glibc-n32.html"?>
-
-  <title>Glibc-&glibc-version; N32</title>
-
-  <indexterm zone="ch-system-glibc-n32">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='g1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='g2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='m3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='m4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <para os="m1">Tell Glibc to install its 32-bit libraries into
-    <filename class="directory">/lib32</filename>:</para>
-
-<screen os="m2"><userinput>echo "slibdir=/lib32" &gt;&gt; configparms</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
-    ../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
-    --libexecdir=/usr/lib32/glibc --libdir=/usr/lib32</userinput></screen>
-
-    <variablelist os="i">
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry>
-        <term><parameter>--libexecdir=/usr/lib32/glibc</parameter></term>
-        <listitem>
-          <para>This changes the location of the <command>pt_chown</command>
-          program from its default of <filename
-          class="directory">/usr/libexec</filename> to <filename
-          class="directory">/usr/lib32/glibc</filename>.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/mips64/glibc.xml
===================================================================
--- BOOK/final-system/mips64/glibc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,139 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc-32" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-glibc-32">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='g1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/glibc.xml"
-    xpointer="xpointer(//*[@os='g2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/mips64/mktemp.xml
===================================================================
--- BOOK/final-system/mips64/mktemp.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,78 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-mktemp" role="wrap">
-  <?dbhtml filename="mktemp.html"?>
-
-  <title>Mktemp-&mktemp-version;</title>
-
-  <indexterm zone="ch-system-mktemp">
-    <primary sortas="a-Mktemp">Mktemp</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/mktemp.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Mktemp</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/mktemp.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/mktemp.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/mktemp.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/mktemp.xml"
-  xpointer="xpointer(id('contents-mktemp'))"/>
-
-</sect1>
Index: OK/final-system/mips64/stripping.xml
===================================================================
--- BOOK/final-system/mips64/stripping.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-stripping">
-  <?dbhtml filename="stripping.html"?>
-
-  <title>Stripping</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='f'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>/tools/bin/find /{,usr/}{bin,lib,lib32,lib64,sbin} -type f \
-   -exec /tools/bin/strip --strip-debug '{}' ';'</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='i'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='j'])"/>
-
-</sect1>
Index: OK/final-system/mips64/sysvinit.xml
===================================================================
--- BOOK/final-system/mips64/sysvinit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,59 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-sysvinit" role="wrap">
-  <?dbhtml filename="sysvinit.html"?>
-
-  <title>Sysvinit-&sysvinit-version;</title>
-
-  <indexterm zone="ch-system-sysvinit">
-    <primary sortas="a-Sysvinit">Sysvinit</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sysvinit.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-
-    <title>Installation of Sysvinit</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/sysvinit.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/sysvinit.xml"
-  xpointer="xpointer(id('conf-sysvinit'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sysvinit.xml"
-  xpointer="xpointer(id('contents-sysvinit'))"/>
-
-</sect1>
Index: OK/final-system/multilib/aboutdebug.xml
===================================================================
--- BOOK/final-system/multilib/aboutdebug.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,53 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-aboutdebug">
-  <?dbhtml filename="aboutdebug.html"?>
-
-  <title>About Debugging Symbols</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/aboutdebug.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/aboutdebug.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <itemizedlist os="c">
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/aboutdebug.xml"
-    xpointer="xpointer(//*[@os='c1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/aboutdebug.xml"
-    xpointer="xpointer(//*[@os='c2'])"/>
-
-    <listitem os="c3">
-      <para>Glibc and GCC files (<filename class="directory">/lib</filename>,
-      <filename class="directory">/lib64,</filename>,
-      <filename class="directory">/usr/lib</filename>,
-      and <filename class="directory">/usr/lib64</filename>) with debugging
-      symbols: 87 MB</para>
-    </listitem>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/aboutdebug.xml"
-    xpointer="xpointer(//*[@os='c4'])"/>
-
-  </itemizedlist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/aboutdebug.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/aboutdebug.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-</sect1>
Index: OK/final-system/multilib/adjusting.xml
===================================================================
--- BOOK/final-system/multilib/adjusting.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,82 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-adjusting">
-  <?dbhtml filename="adjusting.html"?>
-
-  <title>Adjusting the Toolchain</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="c"><userinput>gcc -dumpspecs | \
-perl -p -e 's@/tools/lib/ld@/lib/ld@g;' \
-     -e 's@/tools/lib64/ld@/lib64/ld@g;' \
-     -e 's@\*startfile_prefix_spec:\n@$_/usr/lib/ @g;' > \
-     $(dirname $(gcc --print-libgcc-file-name))/specs</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <para os="m1">Note that <filename class="directory">/lib</filename> or
-  <filename class="directory">/lib64</filename> is now the prefix
-  of our dynamic linker.</para>
-
-  <caution>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <para os="m2">For 32 bit ABI:</para>
-
-<screen os="m3"><userinput>echo 'main(){}' &gt; dummy.c
-gcc ${BUILD32} dummy.c
-readelf -l a.out | grep ': /lib'</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <para os="m4">For 64 bit ABI:</para>
-
-<screen os="m5"><userinput>echo 'main(){}' &gt; dummy.c
-gcc ${BUILD64} dummy.c
-readelf -l a.out | grep ': /lib'</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <!-- specific to sparc64 -->
-<screen os="i"><computeroutput>[Requesting program interpreter: /lib64/ld-linux.so.2]</computeroutput></screen>
-
-    <para os="m7">Note that <filename class="directory">/lib</filename> or
-    <filename class="directory">/lib64</filename> is now the prefix
-    of our dynamic linker.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-  </caution>
-
-</sect1>
Index: OK/final-system/multilib/autoconf.xml
===================================================================
--- BOOK/final-system/multilib/autoconf.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-autoconf" role="wrap">
-  <?dbhtml filename="autoconf.html"?>
-
-  <title>Autoconf-&autoconf-version;</title>
-
-  <indexterm zone="ch-system-autoconf">
-    <primary sortas="a-Autoconf">Autoconf</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/autoconf.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Autoconf</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/autoconf.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/autoconf.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/autoconf.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/autoconf.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/autoconf.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/autoconf.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/autoconf.xml"
-  xpointer="xpointer(id('contents-autoconf'))"/>
-
-</sect1>
Index: OK/final-system/multilib/automake.xml
===================================================================
--- BOOK/final-system/multilib/automake.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-automake" role="wrap">
-  <?dbhtml filename="automake.html"?>
-
-  <title>Automake-&automake-version;</title>
-
-  <indexterm zone="ch-system-automake">
-    <primary sortas="a-Automake">Automake</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/automake.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Automake</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/automake.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/autoconf.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/autoconf.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/automake.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/autoconf.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/autoconf.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/automake.xml"
-  xpointer="xpointer(id('contents-automake'))"/>
-
-</sect1>
Index: OK/final-system/multilib/bash.xml
===================================================================
--- BOOK/final-system/multilib/bash.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,90 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-bash" role="wrap">
-  <?dbhtml filename="bash.html"?>
-
-  <title>Bash-&bash-version;</title>
-
-  <indexterm zone="ch-system-bash">
-    <primary sortas="a-Bash">Bash</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/bash.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bash</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-    ./configure --prefix=/usr --bindir=/bin \
-    --without-bash-malloc --with-installed-readline</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/bash.xml"
-  xpointer="xpointer(id('contents-bash'))"/>
-
-</sect1>
Index: OK/final-system/multilib/binutils.xml
===================================================================
--- BOOK/final-system/multilib/binutils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,128 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-binutils" role="wrap">
-  <?dbhtml filename="binutils.html"?>
-
-  <title>Binutils-&binutils-version;</title>
-
-  <indexterm zone="ch-system-binutils">
-    <primary sortas="a-Binutils">Binutils</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/binutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Binutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <para os="aa">The following patch makes Binutils search in both the
-    <filename class="directory">lib</filename> and <filename
-    class="directory">lib64</filename> directories in a multilib
-    environment:</para>
-
-<screen os="ab"><userinput>patch -Np1 -i ../&binutils-multilib-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="ca"><userinput>CC="gcc ${BUILD64}" ../binutils-&binutils-version;/configure --prefix=/usr \
-    --enable-shared --enable-64-bit-bfd --libdir=/usr/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/binutils.xml"
-  xpointer="xpointer(id('contents-binutils'))"/>
-
-</sect1>
Index: OK/final-system/multilib/bison-64bit.xml
===================================================================
--- BOOK/final-system/multilib/bison-64bit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-bison" role="wrap">
-  <?dbhtml filename="bison-64bit.html"?>
-
-  <title>Bison-&bison-version; 64Bit</title>
-
-  <indexterm zone="ch-system-bison">
-    <primary sortas="a-Bison">Bison</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/bison.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bison</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/bison.xml"
-  xpointer="xpointer(id('contents-bison'))"/>
-
-</sect1>
Index: OK/final-system/multilib/bison-n32.xml
===================================================================
--- BOOK/final-system/multilib/bison-n32.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,60 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-bison-n32" role="wrap">
-  <?dbhtml filename="bison-n32.html"?>
-
-  <title>Bison-&bison-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-bison-n32">
-    <primary sortas="a-Bison">Bison</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/bison.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bison</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-bison" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/bison.xml
===================================================================
--- BOOK/final-system/multilib/bison.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,60 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-bison-32" role="wrap">
-  <?dbhtml filename="bison.html"?>
-
-  <title>Bison-&bison-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-bison-32">
-    <primary sortas="a-Bison">Bison</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/bison.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bison</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bison.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-bison" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/bzip2-64bit.xml
===================================================================
--- BOOK/final-system/multilib/bzip2-64bit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,71 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-bzip2" role="wrap">
-  <?dbhtml filename="bzip2-64bit.html"?>
-
-  <title>Bzip2-&bzip2-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-bzip2">
-    <primary sortas="a-Bzip2">Bzip2</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/bzip2.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bzip2</title>
-
-    <para os="m1">We need to change the default lib path
-    to <filename class="directory">lib64</filename>:</para>
-
-<screen os="m2"><userinput>sed -i 's@/lib\(/\| \|$\)@/lib64\1@g' Makefile</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="bzip2.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make -f Makefile-libbz2_so CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}"
-make clean</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="bzip2.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>make CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j"><userinput>cp -v bzip2-shared /bin/bzip2
-cp -av libbz2.so* /lib64
-ln -sv ../../lib64/libbz2.so.1.0 /usr/lib64/libbz2.so
-rm -v /usr/bin/{bunzip2,bzcat,bzip2}
-ln -sv bzip2 /bin/bunzip2
-ln -sv bzip2 /bin/bzcat</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/bzip2.xml"
-  xpointer="xpointer(id('contents-bzip2'))"/>
-
-</sect1>
Index: OK/final-system/multilib/bzip2-n32.xml
===================================================================
--- BOOK/final-system/multilib/bzip2-n32.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-bzip2-n32" role="wrap">
-  <?dbhtml filename="bzip2-n32.html"?>
-
-  <title>Bzip2-&bzip2-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-bzip2-n32">
-    <primary sortas="a-Bzip2">Bzip2</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/bzip2.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bzip2</title>
-
-    <para os="m1">We need to change the default lib path
-    to <filename class="directory">lib32</filename>:</para>
-
-<screen os="m2"><userinput>sed -i 's@/lib\(/\| \|$\)@/lib32\1@g' Makefile</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="bzip2.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make -f Makefile-libbz2_so CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}"
-make clean</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="bzip2.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="bzip2.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>make CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" libbz2.a</userinput></screen>
-
-    <para os="e1">To test the results, issue:
-    <userinput>make CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" check</userinput>
-    .</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="bzip2.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j"><userinput>cp -v libbz2.a /usr/lib32
-cp -av libbz2.so* /lib32
-ln -sv ../../lib32/libbz2.so.1.0 /usr/lib32/libbz2.so</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-bzip2" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/bzip2.xml
===================================================================
--- BOOK/final-system/multilib/bzip2.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-bzip2-32" role="wrap">
-  <?dbhtml filename="bzip2.html"?>
-
-  <title>Bzip2-&bzip2-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-bzip2-32">
-    <primary sortas="a-Bzip2">Bzip2</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/bzip2.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bzip2</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make -f Makefile-libbz2_so CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}"
-make clean</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<para os="d">Recompile the package using a non-shared library:</para>
-
-<screen os="e"><userinput>make CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" libbz2.a</userinput></screen>
-
-    <para os="e1">To test the results, issue:
-    <userinput>make CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" check</userinput>
-    .</para>
-
-    <para os="i">Install the libraries and make
-    a necessary symbolic link:</para>
-
-<screen os="j"><userinput>cp -v libbz2.a /usr/lib
-cp -av libbz2.so* /lib
-ln -sv ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-bzip2" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/coreutils.xml
===================================================================
--- BOOK/final-system/multilib/coreutils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,128 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-coreutils" role="wrap">
-  <?dbhtml filename="coreutils.html"?>
-
-  <title>Coreutils-&coreutils-version;</title>
-
-  <indexterm zone="ch-system-coreutils">
-    <primary sortas="a-Coreutils">Coreutils</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/coreutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Coreutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/coreutils.xml"
-  xpointer="xpointer(id('contents-coreutils'))"/>
-
-</sect1>
Index: OK/final-system/multilib/diffutils.xml
===================================================================
--- BOOK/final-system/multilib/diffutils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-diffutils" role="wrap">
-  <?dbhtml filename="diffutils.html"?>
-
-  <title>Diffutils-&diffutils-version;</title>
-
-  <indexterm zone="ch-system-diffutils">
-    <primary sortas="a-Diffutils">Diffutils</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/diffutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Diffutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/diffutils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/diffutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/diffutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/diffutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/diffutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/diffutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/diffutils.xml"
-  xpointer="xpointer(id('contents-diffutils'))"/>
-
-</sect1>
Index: OK/final-system/multilib/e2fsprogs-64bit.xml
===================================================================
--- BOOK/final-system/multilib/e2fsprogs-64bit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,83 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-e2fsprogs" role="wrap">
-  <?dbhtml filename="e2fsprogs-64bit.html"?>
-
-  <title>E2fsprogs-&e2fsprogs-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-e2fsprogs">
-    <primary sortas="a-E2fsprogs">E2fsprogs</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/e2fsprogs.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of E2fsprogs</title>
-
-    <para os="m3">Change the library directory to <filename
-    class="directory">lib64</filename>:</para>
-
-<screen os="m4"><userinput>sed -i '/libdir=.*\/lib/s@/lib@/lib64@g' configure</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>CC="gcc ${BUILD64}" ../configure --prefix=/usr \
-    --with-root-prefix="" --enable-elf-shlibs --disable-evms \
-    --with-cc="gcc ${BUILD64}"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/e2fsprogs.xml"
-  xpointer="xpointer(id('contents-e2fsprogs'))"/>
-
-</sect1>
Index: OK/final-system/multilib/e2fsprogs-n32.xml
===================================================================
--- BOOK/final-system/multilib/e2fsprogs-n32.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,72 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-e2fsprogs-n32" role="wrap">
-  <?dbhtml filename="e2fsprogs-n32.html"?>
-
-  <title>E2fsprogs-&e2fsprogs-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-e2fsprogs-n32">
-    <primary sortas="a-E2fsprogs">E2fsprogs</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/e2fsprogs.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of E2fsprogs</title>
-
-    <para os="m3">Change the library directory to <filename
-    class="directory">lib32</filename>:</para>
-
-<screen os="m4"><userinput>sed -i '/libdir=.*\/lib/s@/lib@/lib32@g' configure</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>CC="gcc ${BUILDN32}" ../configure --prefix=/usr \
-    --with-root-prefix="" --enable-elf-shlibs --disable-evms \
-    --with-cc="gcc ${BUILDN32}"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-e2fsprogs" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/e2fsprogs.xml
===================================================================
--- BOOK/final-system/multilib/e2fsprogs.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,67 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-e2fsprogs-32" role="wrap">
-  <?dbhtml filename="e2fsprogs.html"?>
-
-  <title>E2fsprogs-&e2fsprogs-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-e2fsprogs-32">
-    <primary sortas="a-E2fsprogs">E2fsprogs</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/e2fsprogs.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of E2fsprogs</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>CC="gcc ${BUILD32}" ../configure --prefix=/usr \
-    --with-root-prefix="" --enable-elf-shlibs --disable-evms \
-    --with-cc="gcc ${BUILD32}"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <para os="m1">Compile the libraries:</para>
-
-<screen os="m2"><userinput>make libs</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/e2fsprogs.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-e2fsprogs" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/file-64bit.xml
===================================================================
--- BOOK/final-system/multilib/file-64bit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,57 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-file" role="wrap">
-  <?dbhtml filename="file-64bit.html"?>
-
-  <title>File-&file-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-file">
-    <primary sortas="a-File">File</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/file.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of File</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="file.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-   --libdir=/usr/lib64</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="file.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="file.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="file.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="file.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="file.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/file.xml"
-  xpointer="xpointer(id('contents-file'))"/>
-
-</sect1>
Index: OK/final-system/multilib/file-n32.xml
===================================================================
--- BOOK/final-system/multilib/file-n32.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-file-n32" role="wrap">
-  <?dbhtml filename="file-n32.html"?>
-
-  <title>File-&file-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-file-n32">
-    <primary sortas="a-File">File</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/file.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of File</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="file.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
-   --libdir=/usr/lib32</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="file.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="file.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="file.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="file.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="file.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-file" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/file.xml
===================================================================
--- BOOK/final-system/multilib/file.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-file-32" role="wrap">
-  <?dbhtml filename="file.html"?>
-
-  <title>File-&file-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-file-32">
-    <primary sortas="a-File">File</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/file.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of File</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-file" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/findutils.xml
===================================================================
--- BOOK/final-system/multilib/findutils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,182 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-findutils" role="wrap">
-  <?dbhtml filename="findutils.html"?>
-
-  <title>Findutils-&findutils-version;</title>
-
-  <indexterm zone="ch-system-findutils">
-    <primary sortas="a-Findutils">Findutils</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/findutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Findutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-    --libexecdir=/usr/lib64/locate --localstatedir=/var/lib64/locate</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--localstatedir</parameter></term>
-        <listitem>
-          <para>This option changes the location of the <command>locate</command>
-          database to be in <filename class="directory">/var/lib64/locate</filename>,
-          which is FHS-compliant.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-  </sect2>
-
-  <sect2 id="contents-findutils" role="content">
-    <title>Contents of Findutils</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>bigram, code, find, frcode, locate, updatedb, and xargs</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="bigram">
-        <term><command>bigram</command></term>
-        <listitem>
-          <para>Was formerly used to produce <command>locate</command>
-          databases</para>
-          <indexterm zone="ch-system-findutils bigram">
-            <primary sortas="b-bigram">bigram</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="code">
-        <term><command>code</command></term>
-        <listitem>
-          <para>Was formerly used to produce <command>locate</command>
-          databases; it is the ancestor of <command>frcode</command>.</para>
-          <indexterm zone="ch-system-findutils code">
-            <primary sortas="b-code">code</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="find">
-        <term><command>find</command></term>
-        <listitem>
-          <para>Searches given directory trees for files matching the specified
-          criteria</para>
-          <indexterm zone="ch-system-findutils find">
-            <primary sortas="b-find">find</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="frcode">
-        <term><command>frcode</command></term>
-        <listitem>
-          <para>Is called by <command>updatedb</command> to compress the list
-          of file names; it uses front-compression, reducing the database size
-          by a factor of four to five.</para>
-          <indexterm zone="ch-system-findutils frcode">
-            <primary sortas="b-frcode">frcode</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="locate">
-        <term><command>locate</command></term>
-        <listitem>
-          <para>Searches through a database of file names and reports the names
-          that contain a given string or match a given pattern</para>
-          <indexterm zone="ch-system-findutils locate">
-            <primary sortas="b-locate">locate</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="updatedb">
-        <term><command>updatedb</command></term>
-        <listitem>
-          <para>Updates the <command>locate</command> database; it scans the
-          entire file system (including other file systems that are currently
-          mounted, unless told not to) and puts every file name it finds into
-          the database</para>
-          <indexterm zone="ch-system-findutils updatedb">
-            <primary sortas="b-updatedb">updatedb</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="xargs">
-        <term><command>xargs</command></term>
-        <listitem>
-          <para>Can be used to apply a given command to a list of files</para>
-          <indexterm zone="ch-system-findutils xargs">
-            <primary sortas="b-xargs">xargs</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/flex-64bit.xml
===================================================================
--- BOOK/final-system/multilib/flex-64bit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,70 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-flex" role="wrap">
-  <?dbhtml filename="flex-64bit.html"?>
-
-  <title>Flex-&flex-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-flex">
-    <primary sortas="a-Flex">Flex</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/flex.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Flex</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<screen os="f"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-    --libdir=/usr/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>make</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <para os="l">There are some packages that expect to find the
-    <filename class="libraryfile">lex</filename> library in <filename
-    class="directory">/usr/lib64</filename>. Create a symlink to account for
-    this:</para>
-
-<screen os="m"><userinput>ln -sv libfl.a /usr/lib64/libl.a</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/flex.xml"
-  xpointer="xpointer(id('contents-flex'))"/>
-
-</sect1>
Index: OK/final-system/multilib/flex-n32.xml
===================================================================
--- BOOK/final-system/multilib/flex-n32.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-flex-n32" role="wrap">
-  <?dbhtml filename="flex-n32.html"?>
-
-  <title>Flex-&flex-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-flex-n32">
-    <primary sortas="a-Flex">Flex</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/flex.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Flex</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<screen os="f"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
-   --libdir=/usr/lib32</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="flex.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <para os="l">There are some packages that expect to find the
-    <filename class="libraryfile">lex</filename> library in <filename
-    class="directory">/usr/lib32</filename>. Create a symlink to account for
-    this:</para>
-
-<screen os="m"><userinput>ln -sv libfl.a /usr/lib32/libl.a</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-flex" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/flex.xml
===================================================================
--- BOOK/final-system/multilib/flex.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-flex-32" role="wrap">
-  <?dbhtml filename="flex.html"?>
-
-  <title>Flex-&flex-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-flex-32">
-    <primary sortas="a-Flex">Flex</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/flex.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Flex</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<screen os="f"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>make libfl.a</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-<screen os="k"><userinput>make install-libLIBRARIES</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/flex.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-flex" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/gawk.xml
===================================================================
--- BOOK/final-system/multilib/gawk.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,65 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gawk" role="wrap">
-  <?dbhtml filename="gawk.html"?>
-
-  <title>Gawk-&gawk-version;</title>
-
-  <indexterm zone="ch-system-gawk">
-    <primary sortas="a-Gawk">Gawk</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/gawk.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Gawk</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gawk.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-   --libexecdir=/usr/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gawk.xml"
-    xpointer="xpointer(//*[@os='h1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gawk.xml"
-    xpointer="xpointer(//*[@os='h2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gawk.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gawk.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gawk.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gawk.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gawk.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/gawk.xml"
-  xpointer="xpointer(id('contents-gawk'))"/>
-
-</sect1>
Index: OK/final-system/multilib/gcc.xml
===================================================================
--- BOOK/final-system/multilib/gcc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,142 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='e1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="i"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-    ../gcc-&gcc-version;/configure --prefix=/usr --libdir=/usr/lib64 \
-    --libexecdir=/usr/lib64 --enable-shared --enable-threads=posix \
-    --enable-__cxa_atexit --enable-c99 --enable-long-long \
-    --enable-clocale=gnu --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/gcc.xml"
-  xpointer="xpointer(id('contents-gcc'))"/>
-
-</sect1>
Index: OK/final-system/multilib/gettext-64bit.xml
===================================================================
--- BOOK/final-system/multilib/gettext-64bit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,57 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gettext" role="wrap">
-  <?dbhtml filename="gettext-64bit.html"?>
-
-  <title>Gettext-&gettext-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-gettext">
-    <primary sortas="a-Gettext">Gettext</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/gettext.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Gettext</title>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-   ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/gettext.xml"
-  xpointer="xpointer(id('contents-gettext'))"/>
-
-</sect1>
Index: OK/final-system/multilib/gettext-n32.xml
===================================================================
--- BOOK/final-system/multilib/gettext-n32.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gettext-n32" role="wrap">
-  <?dbhtml filename="gettext-n32.html"?>
-
-  <title>Gettext-&gettext-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-gettext-n32">
-    <primary sortas="a-Gettext">Gettext</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/gettext.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Gettext</title>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
-   ./configure --prefix=/usr --libdir=/usr/lib32</userinput></screen>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gettext" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/gettext.xml
===================================================================
--- BOOK/final-system/multilib/gettext.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gettext-32" role="wrap">
-  <?dbhtml filename="gettext.html"?>
-
-  <title>Gettext-&gettext-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-gettext-32">
-    <primary sortas="a-Gettext">Gettext</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/gettext.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Gettext</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
-   ./configure --prefix=/usr</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gettext" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/glibc-64bit.xml
===================================================================
--- BOOK/final-system/multilib/glibc-64bit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,172 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc" role="wrap">
-  <?dbhtml filename="glibc-64bit.html"?>
-
-  <title>Glibc-&glibc-version; 64-Bit</title>
-
-  <indexterm zone="ch-system-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <para os="m1">Tell Glibc to install its 64-bit libraries into
-    <filename class="directory">/lib64</filename>:</para>
-
-<screen os="m2"><userinput>echo "slibdir=/lib64" &gt;&gt; configparms</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-    ../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
-    --libexecdir=/usr/lib64/glibc --libdir=/usr/lib64</userinput></screen>
-
-    <variablelist os="i">
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry>
-        <term><parameter>--libexecdir=/usr/lib64/glibc</parameter></term>
-        <listitem>
-          <para>This changes the location of the <command>pt_chown</command>
-          program from its default of <filename
-          class="directory">/usr/libexec</filename> to <filename
-          class="directory">/usr/lib64/glibc</filename>.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('i18n-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-glibc'))"/>
-
-  <sect2 id="conf-ld" role="configuration">
-    <title>Configuring The Dynamic Loader</title>
-
-    <indexterm zone="conf-ld">
-      <primary sortas="e-/etc/ld.so.conf">/etc/ld.so.conf</primary>
-    </indexterm>
-
-    <para os="ld-a">By default, the dynamic loader (<filename
-    class="libraryfile">/lib/ld-linux.so.2</filename> for 32bit executables and
-    <filename class="libraryfile">/lib64/ld-linux.so.2</filename> for
-    64bit executables) searches through
-    <filename class="directory">/lib</filename>,
-    <filename class="directory">/lib64</filename>,
-    <filename class="directory">/usr/lib</filename>,
-    and <filename class="directory">/usr/lib64</filename> for dynamic
-    libraries that are needed by programs as they are run. However, if
-    there are libraries in directories other than these, they need to be
-    added to the <filename>/etc/ld.so.conf</filename> file in order
-    for the dynamic loader to find them. Some directories that are commonly
-    known to contain additional libraries are
-    <filename class="directory">/usr/local/lib</filename>,
-    <filename class="directory">/usr/local/lib64</filename>,
-    <filename class="directory">/opt/lib</filename>,
-    and <filename class="directory">/opt/lib64</filename>,
-    so add those directories to the dynamic loader's search path.</para>
-
-    <para os="ld-b">Create a new file <filename>/etc/ld.so.conf</filename> by running the
-    following:</para>
-
-<screen os="ld-c"><userinput>cat &gt; /etc/ld.so.conf &lt;&lt; "EOF"
-<literal># Begin /etc/ld.so.conf
-
-/usr/local/lib
-/usr/local/lib64
-/opt/lib
-/opt/lib64
-
-# End /etc/ld.so.conf</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('contents-glibc'))"/>
-
-</sect1>
Index: OK/final-system/multilib/glibc.xml
===================================================================
--- BOOK/final-system/multilib/glibc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,134 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc-32" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-glibc-32">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
-    ../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
-    --libexecdir=/usr/lib/glibc --host=${CLFS_TARGET32}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <para os="l1">In multilib, we tend to think that compiling for
-    <literal>${CLFS_TARGET32}</literal> is <emphasis>not</emphasis>
-    cross-compiling. Glibc takes the traditional view that if you are building
-    for a different host then you are cross-compiling, so you won't be running
-    the tests and therefore you don't need the locale files. When we run
-    the tests, many will fail if the locale files are missing. The following
-    sed allows these tests to succeed:</para>
-
-<screen os="l2"><userinput>sed -i '/cross-compiling/s@ifeq@ifneq@g' ../glibc-&glibc-version;/localedata/Makefile</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/grep.xml
===================================================================
--- BOOK/final-system/multilib/grep.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,57 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-grep" role="wrap">
-  <?dbhtml filename="grep.html"?>
-
-  <title>Grep-&grep-version;</title>
-
-  <indexterm zone="ch-system-grep">
-    <primary sortas="a-Grep">Grep</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/grep.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Grep</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-   --bindir=/bin</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/grep.xml"
-  xpointer="xpointer(id('contents-grep'))"/>
-
-</sect1>
Index: OK/final-system/multilib/groff.xml
===================================================================
--- BOOK/final-system/multilib/groff.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-groff" role="wrap">
-  <?dbhtml filename="groff.html"?>
-
-  <title>Groff-&groff-version;</title>
-
-  <indexterm zone="ch-system-groff">
-    <primary sortas="a-Groff">Groff</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/groff.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Groff</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/groff.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/groff.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="c"><userinput>PAGE=<replaceable>[paper_size]</replaceable> CC="gcc ${BUILD64}" \
-   CXX="g++ ${BUILD64}" ./configure --prefix=/usr --libdir=/usr/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/groff.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/groff.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/groff.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/groff.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/groff.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/groff.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/groff.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/groff.xml"
-  xpointer="xpointer(id('contents-groff'))"/>
-
-</sect1>
Index: OK/final-system/multilib/gzip.xml
===================================================================
--- BOOK/final-system/multilib/gzip.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,72 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gzip" role="wrap">
-  <?dbhtml filename="gzip.html"?>
-
-  <title>Gzip-&gzip-version;</title>
-
-  <indexterm zone="ch-system-gzip">
-    <primary sortas="a-Gzip">Gzip</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/gzip.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Gzip</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --bindir=/bin</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/gzip.xml"
-  xpointer="xpointer(id('contents-gzip'))"/>
-
-</sect1>
Index: OK/final-system/multilib/inetutils.xml
===================================================================
--- BOOK/final-system/multilib/inetutils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,79 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-inetutils" role="wrap">
-  <?dbhtml filename="inetutils.html"?>
-
-  <title>Inetutils-&inetutils-version;</title>
-
-  <indexterm zone="ch-system-inetutils">
-    <primary sortas="a-Inetutils">Inetutils</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/inetutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Inetutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libexecdir=/usr/sbin \
-    --sysconfdir=/etc --localstatedir=/var \
-    --disable-logger --disable-syslogd \
-    --disable-whois --disable-servers</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/inetutils.xml"
-  xpointer="xpointer(id('contents-inetutils'))"/>
-
-</sect1>
Index: OK/final-system/multilib/iproute2.xml
===================================================================
--- BOOK/final-system/multilib/iproute2.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-iproute2" role="wrap">
-  <?dbhtml filename="iproute2.html"?>
-
-  <title>IPRoute2-&iproute2-version;</title>
-
-  <indexterm zone="ch-system-iproute2">
-    <primary sortas="a-iproute2">IPRoute2</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/iproute2.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of IPRoute2</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/iproute2.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/iproute2.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <para os="p1">This patch adds the ability to update the LIBDIR path:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&iproute2-libdir-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/iproute2.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make CC="gcc ${BUILD64}" LIBDIR=/usr/lib64 VARLIB=/var/lib64 SBINDIR=/sbin</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/iproute2.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/iproute2.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/iproute2.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<screen os="f"><userinput>make LIBDIR=/usr/lib64 VARLIB=/var/lib64 SBINDIR=/sbin install</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/iproute2.xml"
-  xpointer="xpointer(id('contents-iproute2'))"/>
-
-</sect1>
Index: OK/final-system/multilib/kbd.xml
===================================================================
--- BOOK/final-system/multilib/kbd.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,76 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-kbd" role="wrap">
-  <?dbhtml filename="kbd.html"?>
-
-  <title>Kbd-&kbd-version;</title>
-
-  <indexterm zone="ch-system-kbd">
-    <primary sortas="a-Kbd">Kbd</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/kbd.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Kbd</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --datadir=/lib64/kbd</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--datadir</parameter></term>
-        <listitem>
-          <para>This option places the Kbd data and keymap files into
-          /lib64/kbd, as they are used by some of the scripts in the
-          CLFS-Bootscripts package and must be on the root partition.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/kbd.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/kbd.xml"
-  xpointer="xpointer(id('contents-kbd'))"/>
-
-</sect1>
Index: OK/final-system/multilib/less.xml
===================================================================
--- BOOK/final-system/multilib/less.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-less" role="wrap">
-  <?dbhtml filename="less.html"?>
-
-  <title>Less-&less-version;</title>
-
-  <indexterm zone="ch-system-less">
-    <primary sortas="a-Less">Less</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/less.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Less</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/less.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-    --sysconfdir=/etc</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/less.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/less.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/less.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/less.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/less.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/less.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/less.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/less.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/less.xml"
-  xpointer="xpointer(id('contents-less'))"/>
-
-</sect1>
Index: OK/final-system/multilib/libtool-64bit.xml
===================================================================
--- BOOK/final-system/multilib/libtool-64bit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,57 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-libtool" role="wrap">
-  <?dbhtml filename="libtool-64bit.html"?>
-
-  <title>Libtool-&libtool-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-libtool">
-    <primary sortas="a-Libtool">Libtool</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/libtool.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libtool</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-   --libdir=/usr/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/libtool.xml"
-  xpointer="xpointer(id('contents-libtool'))"/>
-
-</sect1>
Index: OK/final-system/multilib/libtool-n32.xml
===================================================================
--- BOOK/final-system/multilib/libtool-n32.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-libtool-n32" role="wrap">
-  <?dbhtml filename="libtool-n32.html"?>
-
-  <title>Libtool-&libtool-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-libtool-n32">
-    <primary sortas="a-Libtool">Libtool</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/libtool.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libtool</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="libtool.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" ./configure --prefix=/usr \
-   --libdir=/usr/lib32</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <para os="e">To test the results, identify the correct emulation, then issue:
-    <userinput>make LDEMULATION=[emulation] check</userinput>. The correct
-    emulation will be elf32btsmipn32 for a big-endian machine and elf32ltsmipn32
-    for a little-endian machine.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="libtool.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="libtool.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-libtool" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/libtool.xml
===================================================================
--- BOOK/final-system/multilib/libtool.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,98 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-libtool-32" role="wrap">
-  <?dbhtml filename="libtool.html"?>
-
-  <title>Libtool-&libtool-version; 32 Bit Libraries</title>
-
-<!-- with the introduction of an LDEMULATION  on make check, to fix a test
- failure which has appeared for unknown reasons, this text is now specific
- to mips -o32. -->
-
-  <indexterm zone="ch-system-libtool-32">
-    <primary sortas="a-Libtool">Libtool</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/libtool.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libtool</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <para os="e">To test the results, first identify whether you are on a big- or
-    little-endian machine.  SGI machines are usually big-endian, Cobalt are
-    usually little-endian.  If in doubt you can <command>echo ${MACHTYPE} | grep 'el-'
-    </command>- this will match a little-endian machine.</para>
-
-    <para os="e2">To test on a little-endian machine issue:
-    <userinput>make LDEMULATION=elf32ltsmip check</userinput>.</para>
-
-    <para os="e1">To test on a big-endian machine issue:
-    <userinput>make LDEMULATION=elf32btsmip check</userinput>.</para>
-
-    <variablelist os="c">
-      <title>The meaning of the override on make check:</title>
-
-      <varlistentry>
-        <term><parameter>LDEMULATION=[emulation]</parameter></term>
-	<!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-	href="../ppc64/libtool.xml"
-	xpointer="xpointer(//*[@os='c2'])"/> -->
-        <listitem os="c2">
-          <para>Libtool tends to do the wrong thing when building for multilib,
-	  at least on the non-default size(s) of architecture.  The causes of
-	  these errors are not well understood and they can appear, or disappear,
-	  as a result of apparently innocuous other changes in the build.  In
-	  this version of the book, one of the tests (pdemo-make) fails to link
-	  because it tries to link the 32-bit objects against 64-bit system
-	  libraries. This option enables the test to succeed without impacting
-	  the other tests (compare the common alternative fixes of
-	  <literal>LD="gcc ${BUILD32}"</literal> which causes far fewer tests
-	  to be executed, and configuring with
-	  <literal>LDFLAGS='-L/lib -L/usr/lib'</literal> which in this case
-	  causes other tests to fail.)</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-libtool" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/m4.xml
===================================================================
--- BOOK/final-system/multilib/m4.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-m4" role="wrap">
-  <?dbhtml filename="m4.html"?>
-
-  <title>M4-&m4-version;</title>
-
-  <indexterm zone="ch-system-m4">
-    <primary sortas="a-M4">M4</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/m4.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of M4</title>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/m4.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/m4.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/m4.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/m4.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/m4.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/m4.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/m4.xml"
-  xpointer="xpointer(id('contents-m4'))"/>
-
-</sect1>
Index: OK/final-system/multilib/make.xml
===================================================================
--- BOOK/final-system/multilib/make.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-make" role="wrap">
-  <?dbhtml filename="make.html"?>
-
-  <title>Make-&make-version;</title>
-
-  <indexterm zone="ch-system-make">
-    <primary sortas="a-Make">Make</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/make.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Make</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/make.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/make.xml"
-  xpointer="xpointer(id('contents-make'))"/>
-
-</sect1>
Index: OK/final-system/multilib/man.xml
===================================================================
--- BOOK/final-system/multilib/man.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,100 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-man" role="wrap">
-  <?dbhtml filename="man.html"?>
-
-  <title>Man-&man-version;</title>
-
-  <indexterm zone="ch-system-man">
-    <primary sortas="a-Man">Man</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/man.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Man</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/man.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/man.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/man.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/man.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/man.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/man.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="i"><userinput>CC="gcc ${BUILD64}" ./configure -confdir=/etc</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/man.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/man.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/man.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/man.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/man.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/man.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/man.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/man.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/man.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/man.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/man.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/man.xml"
-  xpointer="xpointer(id('contents-man'))"/>
-
-</sect1>
Index: OK/final-system/multilib/mktemp.xml
===================================================================
--- BOOK/final-system/multilib/mktemp.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,68 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-mktemp" role="wrap">
-  <?dbhtml filename="mktemp.html"?>
-
-  <title>Mktemp-&mktemp-version;</title>
-
-  <indexterm zone="ch-system-mktemp">
-    <primary sortas="a-Mktemp">Mktemp</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/mktemp.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Mktemp</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --with-libc</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/mktemp.xml"
-  xpointer="xpointer(id('contents-mktemp'))"/>
-
-</sect1>
Index: OK/final-system/multilib/module-init-tools.xml
===================================================================
--- BOOK/final-system/multilib/module-init-tools.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,81 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-module-init-tools" role="wrap">
-  <?dbhtml filename="module-init-tools.html"?>
-
-  <title>Module-Init-Tools-&module-init-tools-version;</title>
-
-  <indexterm zone="ch-system-module-init-tools">
-    <primary sortas="a-Module-Init-Tools">Module-Init-Tools</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/module-init-tools.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Module-Init-Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='a1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='a2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='cc'])"/>
-
-<screen os="d"><userinput>CC="gcc ${BUILD64}" ./configure &amp;&amp;
-make check &amp;&amp;
-make clean</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-<screen os="f"><userinput>CC="gcc ${BUILD64}" ./configure --prefix="/" \
-   --enable-zlib</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/module-init-tools.xml"
-  xpointer="xpointer(id('contents-module-init-tools'))"/>
-
-</sect1>
Index: OK/final-system/multilib/multiarch_wrapper.xml
===================================================================
--- BOOK/final-system/multilib/multiarch_wrapper.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,117 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-multiarch-wrapper" role="wrap">
-  <?dbhtml filename="multiarch_wrapper.html"?>
-
-  <title>Creating a Multiarch Wrapper</title>
-
-  <indexterm zone="ch-system-multiarch-wrapper">
-    <primary sortas="a-File">Multiarch Wrapper</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Multiarch Wrapper is used to wrap certain binaries that have
-    hardcoded paths to libraries or are architecture specific.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of The Multiarch Wrapper</title>
-
-    <para os="a">Create the source file:</para>
-
-<screen os="b"><userinput>cat &gt; multiarch_wrapper.c &lt;&lt; "EOF"
-#include &lt;unistd.h&gt;
-#include &lt;stdlib.h&gt;
-#include &lt;errno.h&gt;
-#include &lt;string.h&gt;
-
-#ifndef USE_ARCH
-#define USE_ARCH "64"
-#endif
-
-int main(int argc, char **argv)
-{
-  char *filename;
-  char *use_arch;
-
-  if(!(use_arch = getenv("USE_ARCH")))
-    use_arch = USE_ARCH;
-
-  filename = (char *) malloc(strlen(argv[0]) + strlen(use_arch) + 2);
-  strcpy(filename, argv[0]);
-  strcat(filename, "-");
-  strcat(filename, use_arch);
-
-  execvp(filename, argv);
-  perror(argv[0]);
-  free(filename);
-}
-EOF</userinput></screen>
-
-    <para os="c">Compile and Install the Multiarch Wrapper:</para>
-
-<screen os="d"><userinput>gcc ${BUILD64} multiarch_wrapper.c -o /usr/bin/multiarch_wrapper</userinput></screen>
-
-    <para os="e">This multiarch wrapper is going to be used later on in the book
-    with Perl. It will also be very useful outside of the base CLFS system.</para>
-
-    <para os="f">Create a testcase:</para>
-
-<screen os="g"><userinput>echo 'echo "32bit Version"' &gt; test-32
-echo 'echo "64bit Version"' &gt; test-64
-chmod 755 test-32 test-64
-ln -sv /usr/bin/multiarch_wrapper test</userinput></screen>
-
-    <para os="h">Test the wrapper:</para>
-
-<screen os="i"><userinput>USE_ARCH=32 ./test
-USE_ARCH=64 ./test</userinput></screen>
-
-    <para os="j">The output of the above command should be:</para>
-
-<screen os="k" role="nodump"><userinput>32bit Version
-64bit Version</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-multiarch-wrapper" role="content">
-    <title>Contents of The Multiarch Wrapper</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>multiarch_wrapper</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="multiarch_wrapper">
-        <term><command>multiarch_wrapper</command></term>
-        <listitem>
-          <para>Will execute a different program based on the
-          <envar>USE_ARCH</envar> variable. The <envar>USE_ARCH</envar>
-          variable will be the suffix of the executed program.</para>
-          <indexterm zone="ch-system-multiarch-wrapper multiarch_wrapper">
-            <primary sortas="b-multiarch_wrapper">multiarch_wrapper</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/ncurses-64bit.xml
===================================================================
--- BOOK/final-system/multilib/ncurses-64bit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,93 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-ncurses" role="wrap">
-  <?dbhtml filename="ncurses-64bit.html"?>
-
-  <title>Ncurses-&ncurses-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-ncurses">
-    <primary sortas="a-Ncurses">Ncurses</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/ncurses.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Ncurses</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-   ./configure --prefix=/usr --libdir=/lib64 \
-   --with-shared --without-debug</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <para os="m1">Prepare <filename>ncurses5-config</filename> to be wrapped by
-    the multiarch wrapper and then wrap it:</para>
-
-<screen os="m2"><userinput>mv -v /usr/bin/ncurses5-config{,-64}
-ln -sv multiarch_wrapper /usr/bin/ncurses5-config</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="i"><userinput>mv -v /lib64/lib{panel,menu,form,ncurses,ncurses++,curses}.a /usr/lib64</userinput></screen>
-
-    <para os="j">Create symlinks in <filename class="directory">/usr/lib64:</filename></para>
-
-<screen os="k"><userinput>rm -v /lib64/lib{ncurses,menu,panel,form,curses}.so
-ln -svf ../../lib64/libncurses.so.5 /usr/lib64/libncurses.so
-ln -svf ../../lib64/libncurses.so.5 /usr/lib64/libcurses.so
-ln -svf ../../lib64/libmenu.so.5 /usr/lib64/libmenu.so
-ln -svf ../../lib64/libpanel.so.5 /usr/lib64/libpanel.so
-ln -svf ../../lib64/libform.so.5 /usr/lib64/libform.so</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-<screen os="m"><userinput>chmod -v 755 /lib64/lib{panel,menu,form,ncurses}.so.&ncurses-version;</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/ncurses.xml"
-  xpointer="xpointer(id('contents-ncurses'))"/>
-
-</sect1>
Index: OK/final-system/multilib/ncurses-n32.xml
===================================================================
--- BOOK/final-system/multilib/ncurses-n32.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,97 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-ncurses-n32" role="wrap">
-  <?dbhtml filename="ncurses-n32.html"?>
-
-  <title>Ncurses-&ncurses-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-ncurses-n32">
-    <primary sortas="a-Ncurses">Ncurses</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/ncurses.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Ncurses</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
-   ./configure --prefix=/usr --libdir=/lib32 \
-   --with-shared --without-debug</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <para os="m1">Prepare <filename>ncurses5-config</filename> to be wrapped by
-    the multiarch wrapper:</para>
-
-<screen os="m2"><userinput>mv -v /usr/bin/ncurses5-config{,-n32}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="i"><userinput>mv -v /lib32/lib{panel,menu,form,ncurses,ncurses++,curses}.a /usr/lib32</userinput></screen>
-
-    <para os="j">Create symlinks in <filename class="directory">/usr/lib32:</filename></para>
-
-<screen os="k"><userinput>rm -v /lib32/lib{ncurses,menu,panel,form,curses}.so
-ln -svf ../../lib32/libncurses.so.5 /usr/lib32/libncurses.so
-ln -svf ../../lib32/libncurses.so.5 /usr/lib32/libcurses.so
-ln -svf ../../lib32/libmenu.so.5 /usr/lib32/libmenu.so
-ln -svf ../../lib32/libpanel.so.5 /usr/lib32/libpanel.so
-ln -svf ../../lib32/libform.so.5 /usr/lib32/libform.so</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="ncurses.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-<screen os="m"><userinput>chmod 755 /lib32/lib{panel,menu,form,ncurses}.so.&ncurses-version;</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-ncurses" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/ncurses.xml
===================================================================
--- BOOK/final-system/multilib/ncurses.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,100 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-ncurses-32" role="wrap">
-  <?dbhtml filename="ncurses.html"?>
-
-  <title>Ncurses-&ncurses-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-ncurses-32">
-    <primary sortas="a-Ncurses">Ncurses</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/ncurses.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Ncurses</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
-   ./configure --prefix=/usr --libdir=/lib \
-   --with-shared --without-debug</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <para os="m1">Prepare <filename>ncurses5-config</filename> to be wrapped by
-    the multiarch wrapper:</para>
-
-<screen os="m2"><userinput>mv -v /usr/bin/ncurses5-config{,-32}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-ncurses" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/patch.xml
===================================================================
--- BOOK/final-system/multilib/patch.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-patch" role="wrap">
-  <?dbhtml filename="patch.html"?>
-
-  <title>Patch-&patch-version;</title>
-
-  <indexterm zone="ch-system-patch">
-    <primary sortas="a-Patch">Patch</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/patch.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Patch</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/patch.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/patch.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/patch.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/patch.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/patch.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/patch.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/patch.xml"
-  xpointer="xpointer(id('contents-patch'))"/>
-
-</sect1>
Index: OK/final-system/multilib/perl-64bit.xml
===================================================================
--- BOOK/final-system/multilib/perl-64bit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,154 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-perl" role="wrap">
-  <?dbhtml filename="perl-64bit.html"?>
-
-  <title>Perl-&perl-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-perl">
-    <primary sortas="a-Perl">Perl</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/perl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Perl</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <para os="mp1">Perl does not, by default, know about library directories with names other
-    than lib, The following patch will allow it to install to other directories:</para>
-
-<screen os="mp2"><userinput>patch -Np1 -i ../&perl-multilib-patch;</userinput></screen>
-
-    <para os="s1">There is a further (possibly cosmetic) anomaly - if we install perl and
-    then run <command>perl -V</command> it will claim that libc is in /lib.  The
-    following sed fixes this, but only takes effect when <command>make install
-    </command> is run:</para>
-
-<screen os="s2"><userinput>sed -i "/libc/s@/lib@/lib64@" hints/linux.sh</userinput></screen>
-
-    <para os="m2">We still need to tell perl to actually use lib64:</para>
-
-<screen os="m3"><userinput>echo 'installstyle="lib64/perl5"' >>hints/linux.sh</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure.gnu --prefix=/usr \
-   -Dman1dir=/usr/share/man/man1 \
-   -Dman3dir=/usr/share/man/man3 \
-   -Dpager="/bin/less -isR" \
-   -Dlibpth="/usr/local/lib64 /lib64 /usr/lib64" \
-   -Dcc="gcc ${BUILD64}" \
-   -Dusethreads</userinput></screen>
-
-    <variablelist os="m4">
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry>
-        <term><parameter>-Dlibpth="/usr/local/lib64 /lib64 /usr/lib64"</parameter></term>
-        <listitem>
-          <para>This tells Perl to link against the 64-bit libraries.</para>
-        </listitem>
-      </varlistentry>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='c1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='c2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='c3'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="perl.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-<screen os="m"><userinput>mv /usr/bin/perl{,-64}
-mv /usr/bin/perl&perl-version;{,-64}</userinput></screen>
-
-    <para os="n">Now we need to create a link to the multiarch wrapper that
-    lets us choose which perl installation to use:</para>
-
-<screen os="o"><userinput>ln -sv multiarch_wrapper /usr/bin/perl
-ln -sv multiarch_wrapper /usr/bin/perl&perl-version;</userinput></screen>
-
-    <para os="p">The value of the <envar>USE_ARCH</envar> environment variable
-    will decide which perl binary to execute.
-    <command>USE_ARCH=32 perl -V:cc</command> will give the value of CC used to
-    build the 32bit perl. The multiarch_wrapper will help later with building
-    perl extensions and bindings. Without the multiarch_wrapper it is very hard
-    to setup a 32bit extension or binding.</para>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/perl.xml"
-  xpointer="xpointer(id('contents-perl'))"/>
-
-</sect1>
Index: OK/final-system/multilib/perl-n32.xml
===================================================================
--- BOOK/final-system/multilib/perl-n32.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-perl-n32" role="wrap">
-  <?dbhtml filename="perl-n32.html"?>
-
-  <title>Perl-&perl-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-perl-n32">
-    <primary sortas="a-Perl">Perl</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/perl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Perl</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="perl-64bit.xml"
-    xpointer="xpointer(//*[@os='mp1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="perl-64bit.xml"
-    xpointer="xpointer(//*[@os='mp2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="perl-64bit.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-<screen os="s2"><userinput>sed -i "/libc/s@/lib@/lib32@" hints/linux.sh</userinput></screen>
-
-    <para os="m2">We still need to tell perl to actually use lib32:</para>
-
-<screen os="m3"><userinput>echo 'installstyle="lib32/perl5"' >>hints/linux.sh</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure.gnu --prefix=/usr \
-   -Dman1dir=/usr/share/man/man1 \
-   -Dman3dir=/usr/share/man/man3 \
-   -Dpager="/bin/less -isR" \
-   -Dlibpth="/usr/local/lib32 /lib32 /usr/lib32" \
-   -Dcc="gcc ${BUILDN32}" \
-   -Dusethreads</userinput></screen>
-
-    <variablelist os="m4">
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry>
-        <term><parameter>-Dlibpth="/usr/local/lib32 /lib32 /usr/lib32"</parameter></term>
-        <listitem>
-          <para>This tells Perl to link against the N32 libraries.</para>
-        </listitem>
-      </varlistentry>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='c1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='c2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='c3'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="perl.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-<screen os="m"><userinput>mv /usr/bin/perl{,-n32}
-mv /usr/bin/perl&perl-version;{,-n32}</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-perl" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/perl.xml
===================================================================
--- BOOK/final-system/multilib/perl.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,119 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-perl-32" role="wrap">
-  <?dbhtml filename="perl.html"?>
-
-  <title>Perl-&perl-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-perl-32">
-    <primary sortas="a-Perl">Perl</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/perl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Perl</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p6'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='a00'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='a01'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='a02'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure.gnu --prefix=/usr \
-   -Dman1dir=/usr/share/man/man1 \
-   -Dman3dir=/usr/share/man/man3 \
-   -Dpager="/bin/less -isR" \
-   -Dcc="gcc ${BUILD32}" \
-   -Dusethreads</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <para os="l">Add a suffix to the <command>perl</command> binary which will
-    be used by the multiarch wrapper:</para>
-
-<screen os="m"><userinput>mv /usr/bin/perl{,-32}
-mv /usr/bin/perl&perl-version;{,-32}</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-perl" role="."/></para>
-
-  </sect2>
-</sect1>
Index: OK/final-system/multilib/procps-64bit.xml
===================================================================
--- BOOK/final-system/multilib/procps-64bit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,71 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-procps" role="wrap">
-  <?dbhtml filename="procps-64bit.html"?>
-
-  <title>Procps-&procps-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-procps">
-    <primary sortas="a-Procps">Procps</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/procps.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Procps</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/procps.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make CC="gcc ${BUILD64}" m64=""</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/procps.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/procps.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>make install lib64=lib64</userinput></screen>
-
-    <variablelist os="f">
-      <title>The meaning of the make and install options:</title>
-
-      <varlistentry os="f1">
-        <term><parameter>CC="gcc ${BUILD64}"</parameter></term>
-        <listitem>
-          <para>This allows us to compile using our gcc with our
-          options lists in ${BUILD64} variable.</para>
-        </listitem>
-      </varlistentry>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../multilib/procps.xml"
-      xpointer="xpointer(//*[@os='f2'])"/>
-
-      <varlistentry os="f3">
-        <term><parameter>lib64=lib64</parameter></term>
-        <listitem>
-          <para>The <filename>Makefile</filename> also attempts to install into
-          lib64 on multilib, so again we choose to override it.</para>
-        </listitem>
-      </varlistentry>
-
-  </variablelist>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/procps.xml"
-  xpointer="xpointer(id('contents-procps'))"/>
-
-</sect1>
Index: OK/final-system/multilib/procps-n32.xml
===================================================================
--- BOOK/final-system/multilib/procps-n32.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,77 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-procps-n32" role="wrap">
-  <?dbhtml filename="procps-n32.html"?>
-
-  <title>Procps-&procps-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-procps-n32">
-    <primary sortas="a-Procps">Procps</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/procps.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Procps</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/procps.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make CC="gcc ${BUILDN32}" m64=""</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/procps.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/procps.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-
-<screen os="e"><userinput>make install lib64=lib32</userinput></screen>
-
-    <variablelist os="f">
-      <title>The meaning of the make and install options:</title>
-
-      <varlistentry os="f1">
-        <term><parameter>CC="gcc ${BUILDN32}"</parameter></term>
-        <listitem>
-          <para>This allows us to compile using our gcc with our
-          options lists in ${BUILDN32} variable.</para>
-        </listitem>
-      </varlistentry>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../multilib/procps.xml"
-      xpointer="xpointer(//*[@os='f2'])"/>
-
-      <varlistentry os="f3">
-        <term><parameter>lib64=lib32</parameter></term>
-        <listitem>
-          <para>The <filename>Makefile</filename> also attempts to install into
-          lib64 on multilib, so again we choose to override it.</para>
-        </listitem>
-      </varlistentry>
-
-  </variablelist>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-file" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/procps.xml
===================================================================
--- BOOK/final-system/multilib/procps.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,82 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-procps-32" role="wrap">
-  <?dbhtml filename="procps.html"?>
-
-  <title>Procps-&procps-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-procps-32">
-    <primary sortas="a-Procps">Procps</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/procps.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Procps</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/procps.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make CC="gcc ${BUILD32}" m64=""</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/procps.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/procps.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>make install lib64=lib</userinput></screen>
-
-    <variablelist os="f">
-      <title>The meaning of the make and install options:</title>
-
-      <varlistentry os="f1">
-        <term><parameter>CC="gcc ${BUILD32}"</parameter></term>
-        <listitem>
-          <para>This allows us to compile using our gcc with our
-          options lists in ${BUILD32} variable.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="f2">
-        <term><parameter>m64=""</parameter></term>
-        <listitem>
-          <para>The <filename>Makefile</filename> for this package goes to some
-	  lengths to build as 64-bit if at all possible. In CLFS we build each
-	  library for each available ABI. Overriding the m64 option enables us
-	  ignore this completely.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="f3">
-        <term><parameter>lib64=lib</parameter></term>
-        <listitem>
-          <para>The <filename>Makefile</filename> also attempts to install into
-	  lib64 on multilib, so again we choose to override it.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-procps" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/psmisc.xml
===================================================================
--- BOOK/final-system/multilib/psmisc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,77 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-psmisc" role="wrap">
-  <?dbhtml filename="psmisc.html"?>
-
-  <title>Psmisc-&psmisc-version;</title>
-
-  <indexterm zone="ch-system-psmisc">
-    <primary sortas="a-Psmisc">Psmisc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/psmisc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Psmisc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/psmisc.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-   --exec-prefix=""</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/psmisc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/psmisc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/psmisc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/psmisc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/psmisc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/psmisc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/psmisc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/psmisc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/psmisc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/psmisc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/psmisc.xml"
-  xpointer="xpointer(id('contents-psmisc'))"/>
-
-</sect1>
Index: OK/final-system/multilib/readline-64bit.xml
===================================================================
--- BOOK/final-system/multilib/readline-64bit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,89 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-readline" role="wrap">
-  <?dbhtml filename="readline-64bit.html"?>
-
-  <title>Readline-&readline-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-readline">
-    <primary sortas="a-Readline">Readline</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/readline.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Readline</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-   ./configure --prefix=/usr --libdir=/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j"><userinput>chmod -v 755 /lib64/lib{readline,history}.so*</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-<screen os="l"><userinput>mv -v /lib64/lib{readline,history}.a /usr/lib64</userinput></screen>
-
-    <para os="m">Next, remove the <filename class="extension">.so</filename>
-    files in <filename class="directory">/lib64</filename> and relink them into
-    <filename class="directory">/usr/lib64</filename>.</para>
-
-<screen os="n"><userinput>rm -v /lib64/lib{readline,history}.so
-ln -svf ../../lib64/libreadline.so.5 /usr/lib64/libreadline.so
-ln -svf ../../lib64/libhistory.so.5 /usr/lib64/libhistory.so</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/readline.xml"
-  xpointer="xpointer(id('contents-readline'))"/>
-
-</sect1>
Index: OK/final-system/multilib/readline-n32.xml
===================================================================
--- BOOK/final-system/multilib/readline-n32.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,94 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-readline-n32" role="wrap">
-  <?dbhtml filename="readline-n32.html"?>
-
-  <title>Readline-&readline-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-readline-n32">
-    <primary sortas="a-Readline">Readline</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/readline.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Readline</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" \
-   ./configure --prefix=/usr --libdir=/lib32</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j"><userinput>chmod -v 755 /lib32/lib{readline,history}.so*</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="readline.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-<screen os="l"><userinput>mv -v /lib32/lib{readline,history}.a /usr/lib32</userinput></screen>
-
-    <para os="m">Next, remove the <filename class="extension">.so</filename>
-    files in <filename class="directory">/lib32</filename> and relink them into
-    <filename class="directory">/usr/lib32</filename>.</para>
-
-<screen os="n"><userinput>rm -v /lib32/lib{readline,history}.so
-ln -svf ../../lib32/libreadline.so.5 /usr/lib32/libreadline.so
-ln -svf ../../lib32/libhistory.so.5 /usr/lib32/libhistory.so</userinput></screen>
-
-  </sect2>
-
- <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-file" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/readline.xml
===================================================================
--- BOOK/final-system/multilib/readline.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,97 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-readline-32" role="wrap">
-  <?dbhtml filename="readline.html"?>
-
-  <title>Readline-&readline-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-readline-32">
-    <primary sortas="a-Readline">Readline</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/readline.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Readline</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
-   ./configure --prefix=/usr --libdir=/lib</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/readline.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-  </sect2>
-
- <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-readline" role="."/></para>
-
- </sect2>
-
-</sect1>
Index: OK/final-system/multilib/sed.xml
===================================================================
--- BOOK/final-system/multilib/sed.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-sed" role="wrap">
-  <?dbhtml filename="sed.html"?>
-
-  <title>Sed-&sed-version;</title>
-
-  <indexterm zone="ch-system-sed">
-    <primary sortas="a-Sed">Sed</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sed.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Sed</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sed.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-   --bindir=/bin --enable-html</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sed.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sed.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sed.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sed.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sed.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sed.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sed.xml"
-  xpointer="xpointer(id('contents-sed'))"/>
-
-</sect1>
Index: OK/final-system/multilib/shadow.xml
===================================================================
--- BOOK/final-system/multilib/shadow.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,109 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-shadow" role="wrap">
-  <?dbhtml filename="shadow.html"?>
-
-  <title>Shadow-&shadow-version;</title>
-
-  <indexterm zone="ch-system-shadow">
-    <primary sortas="a-Shadow">Shadow</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/shadow.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Shadow</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen os="c"><userinput>CC="gcc ${BUILD64}" ./configure --libdir=/lib64 --sysconfdir=/etc \
-   --enable-shared --without-libpam --without-audit --without-selinux</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/shadow.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/shadow.xml"
-  xpointer="xpointer(id('conf-shadow'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/shadow.xml"
-  xpointer="xpointer(id('root-password'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/shadow.xml"
-  xpointer="xpointer(id('contents-shadow'))"/>
-
-</sect1>
Index: OK/final-system/multilib/stripping.xml
===================================================================
--- BOOK/final-system/multilib/stripping.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-stripping">
-  <?dbhtml filename="stripping.html"?>
-
-  <title>Stripping</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='f'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>/tools/bin/find /{,usr/}{bin,lib,lib64,sbin} -type f \
-   -exec /tools/bin/strip --strip-debug '{}' ';'</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='i'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/stripping.xml"
-  xpointer="xpointer(//*[@os='j'])"/>
-
-</sect1>
Index: OK/final-system/multilib/sysklogd.xml
===================================================================
--- BOOK/final-system/multilib/sysklogd.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-sysklogd" xreflabel="Sysklogd" role="wrap">
-  <?dbhtml filename="sysklogd.html"?>
-
-  <title>Sysklogd-&sysklogd-version;</title>
-
-  <indexterm zone="ch-system-sysklogd">
-    <primary sortas="a-Sysklogd">Sysklogd</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sysklogd.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Sysklogd</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysklogd.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysklogd.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysklogd.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysklogd.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sysklogd.xml"
-  xpointer="xpointer(id('conf-sysklogd'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sysklogd.xml"
-  xpointer="xpointer(id('contents-sysklogd'))"/>
-
-</sect1>
Index: OK/final-system/multilib/sysvinit.xml
===================================================================
--- BOOK/final-system/multilib/sysvinit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-<sect1 id="ch-system-sysvinit" role="wrap">
-  <?dbhtml filename="sysvinit.html"?>
-
-  <title>Sysvinit-&sysvinit-version;</title>
-
-  <indexterm zone="ch-system-sysvinit">
-    <primary sortas="a-Sysvinit">Sysvinit</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sysvinit.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Sysvinit</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>make -C src clobber
-make -C src CC="gcc ${BUILD64}"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sysvinit.xml"
-  xpointer="xpointer(id('conf-sysvinit'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sysvinit.xml"
-  xpointer="xpointer(id('contents-sysvinit'))"/>
-
-</sect1>
Index: OK/final-system/multilib/tar.xml
===================================================================
--- BOOK/final-system/multilib/tar.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,57 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-tar" role="wrap">
-  <?dbhtml filename="tar.html"?>
-
-  <title>Tar-&tar-version;</title>
-
-  <indexterm zone="ch-system-tar">
-    <primary sortas="a-Tar">Tar</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/tar.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Tar</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr \
-   --bindir=/bin --libexecdir=/usr/sbin</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/tar.xml"
-  xpointer="xpointer(id('contents-tar'))"/>
-
-</sect1>
Index: OK/final-system/multilib/temp-perl.xml
===================================================================
--- BOOK/final-system/multilib/temp-perl.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,98 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-temp-perl" role="wrap">
-  <?dbhtml filename="temp-perl.html"?>
-
-  <title>Temporary Perl-&perl-version;</title>
-
-  <indexterm zone="ch-system-temp-perl">
-    <primary sortas="a-Perl">Perl</primary>
-    <secondary>temporary tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/perl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Perl</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/perl.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/temp-perl.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/temp-perl.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/temp-perl.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="c"><userinput>./configure.gnu --prefix=/tools \
-    -Dstatic_ext='Data/Dumper IO Fcntl POSIX' -Dcc="gcc ${BUILD32}"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/temp-perl.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/temp-perl.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/temp-perl.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/temp-perl.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/temp-perl.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/temp-perl.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/temp-perl.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/temp-perl.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-perl" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/texinfo.xml
===================================================================
--- BOOK/final-system/multilib/texinfo.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-texinfo" role="wrap">
-  <?dbhtml filename="texinfo.html"?>
-
-  <title>Texinfo-&texinfo-version;</title>
-
-  <indexterm zone="ch-system-texinfo">
-    <primary sortas="a-Texinfo">Texinfo</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/texinfo.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Texinfo</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/texinfo.xml"
-  xpointer="xpointer(id('contents-texinfo'))"/>
-
-</sect1>
Index: OK/final-system/multilib/udev-64bit.xml
===================================================================
--- BOOK/final-system/multilib/udev-64bit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,86 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-udev" role="wrap">
-  <?dbhtml filename="udev-64bit.html"?>
-
-  <title>Udev-&udev-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-udev">
-    <primary sortas="a-Udev">Udev</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/udev.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Udev</title>
-
-    <para os="p1">This patch moves /lib/udev to /lib64/udev, to keep
-    system consistency:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&udev-lib64-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make CC="gcc ${BUILD64}" LD="gcc ${BUILD64}" \
-    EXTRAS="extras/ata_id extras/cdrom_id extras/collect \
-    extras/edd_id extras/firmware extras/floppy extras/path_id extras/rule_generator \
-    extras/scsi_id extras/usb_id extras/volume_id" udevdir=/dev</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/udev.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-<screen os="m"><userinput>install -dv /lib64/firmware</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/udev.xml"
-  xpointer="xpointer(id('contents-udev'))"/>
-
-</sect1>
Index: OK/final-system/multilib/udev-n32.xml
===================================================================
--- BOOK/final-system/multilib/udev-n32.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,49 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-udev-n32" role="wrap">
-  <?dbhtml filename="udev-n32.html"?>
-
-  <title>Udev-&udev-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-udev-n32">
-    <primary sortas="a-Udev">Udev</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/udev.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Udev</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="udev.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>cd extras/volume_id/lib
-make CC="gcc ${BUILDN32}" AR=ar RANLIB=ranlib E=@echo Q=@</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="udev.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>make libdir=/lib32 usrlibdir=/usr/lib32 install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-udev" role="."/></para>
-
-  </sect2>
-</sect1>
-
-
-
Index: OK/final-system/multilib/udev.xml
===================================================================
--- BOOK/final-system/multilib/udev.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-udev-32" role="wrap">
-  <?dbhtml filename="udev.html"?>
-
-  <title>Udev-&udev-version;</title>
-
-  <indexterm zone="ch-system-udev-32">
-    <primary sortas="a-Udev">Udev 32 Bit Libraries</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/udev.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Udev</title>
-
-    <para os="a">Udev only provides one library, libvolume_id. Instead of
-    building the entire udev package for one library, We're just going to
-    compile the single library:</para>
-
-<screen os="b"><userinput>cd extras/volume_id/lib
-make CC="gcc ${BUILD32}" AR=ar RANLIB=ranlib E=@echo Q=@</userinput></screen>
-
-    <para os="c">Install the library:</para>
-
-<screen os="d"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-udev" role="."/></para>
-
-  </sect2>
-</sect1>
-
Index: OK/final-system/multilib/util-linux-ng.xml
===================================================================
--- BOOK/final-system/multilib/util-linux-ng.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-util-linux-ng" role="wrap">
-  <?dbhtml filename="util-linux-ng.html"?>
-
-  <title>Util-linux-ng-&util-linux-ng-version;</title>
-
-  <indexterm zone="ch-system-util-linux-ng">
-    <primary sortas="a-Util-linux-ng">Util-linux-ng</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/util-linux-ng.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/util-linux-ng.xml"
-  xpointer="xpointer(//*[@id='fhs-util-linux-ng'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Util-linux-ng</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" ./configure --libdir=/lib64 \
-    --enable-partx --disable-wall --enable-write</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/util-linux-ng.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/util-linux-ng.xml"
-  xpointer="xpointer(id('contents-util-linux-ng'))"/>
-
-</sect1>
Index: OK/final-system/multilib/vim.xml
===================================================================
--- BOOK/final-system/multilib/vim.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,105 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-vim" role="wrap">
-  <?dbhtml filename="vim.html"?>
-
-  <title>Vim-&vim-version;</title>
-
-  <indexterm zone="ch-system-vim">
-    <primary sortas="a-Vim">Vim</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/vim.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Vim</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-<screen os="e"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" ./configure --prefix=/usr \
-   --enable-multibyte</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/vim.xml"
-  xpointer="xpointer(id('conf-vim'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/vim.xml"
-  xpointer="xpointer(id('contents-vim'))"/>
-
-</sect1>
Index: OK/final-system/multilib/zlib-64bit.xml
===================================================================
--- BOOK/final-system/multilib/zlib-64bit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,80 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-zlib" role="wrap">
-  <?dbhtml filename="zlib-64bit.html"?>
-
-  <title>Zlib-&zlib-version; 64 Bit</title>
-
-  <indexterm zone="ch-system-zlib">
-    <primary sortas="a-Zlib">Zlib</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/zlib.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Zlib</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" ./configure --prefix=/usr \
-   --shared --libdir=/usr/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <para os="h">The previous command installed two <filename
-    class="extension">.so</filename> files into <filename
-    class="directory">/usr/lib64</filename>. We will move it into
-    <filename class="directory">/lib64</filename> and then relink it
-    to <filename class="directory">/usr/lib64</filename>:</para>
-
-<screen os="i"><userinput>mv -v /usr/lib64/libz.so.* /lib64
-ln -svf ../../lib64/libz.so.1 /usr/lib64/libz.so</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-<screen os="k"><userinput>chmod -v 644 /usr/lib64/libz.a</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/zlib.xml"
-  xpointer="xpointer(id('contents-zlib'))"/>
-
-</sect1>
Index: OK/final-system/multilib/zlib-n32.xml
===================================================================
--- BOOK/final-system/multilib/zlib-n32.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,85 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-zlib-n32" role="wrap">
-  <?dbhtml filename="zlib-n32.html"?>
-
-  <title>Zlib-&zlib-version; N32 Libraries</title>
-
-  <indexterm zone="ch-system-zlib-n32">
-    <primary sortas="a-Zlib">Zlib</primary>
-    <secondary>N32</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/zlib.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Zlib</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILDN32}" CXX="g++ ${BUILDN32}" ./configure --prefix=/usr \
-   --shared --libdir=/usr/lib32</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <para os="h">The previous command installed two <filename
-    class="extension">.so</filename> files into <filename
-    class="directory">/usr/lib32</filename>. We will remove itinto
-    <filename class="directory">/lib32</filename> and then relink it
-    to <filename class="directory">/usr/lib32</filename>:</para>
-
-<screen os="i"><userinput>mv -v /usr/lib32/libz.so.* /lib32
-ln -svf ../../lib32/libz.so.1 /usr/lib32/libz.so</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="zlib.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-<screen os="k"><userinput>chmod -v 644 /usr/lib32/libz.a</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-zlib" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/multilib/zlib.xml
===================================================================
--- BOOK/final-system/multilib/zlib.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,86 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-zlib-32" role="wrap">
-  <?dbhtml filename="zlib.html"?>
-
-  <title>Zlib-&zlib-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-zlib-32">
-    <primary sortas="a-Zlib">Zlib</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/zlib.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Zlib</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" ./configure --prefix=/usr \
-   --shared</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-zlib" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/ppc-chapter.xml
===================================================================
--- BOOK/final-system/ppc-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,74 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-building-system" xreflabel="Installing Basic System Software">
-  <?dbhtml dir="final-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Installing Basic System Software</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkgmgt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/testsuitesagain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/adjusting.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/autoconf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mktemp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/hfsutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/parted.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/powerpc-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/yaboot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/aboutdebug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/stripping.xml"/>
-
-</chapter>
Index: OK/final-system/ppc/adjusting.xml
===================================================================
--- BOOK/final-system/ppc/adjusting.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,62 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-<sect1 id="ch-system-adjusting">
-  <?dbhtml filename="adjusting.html"?>
-
-  <title>Adjusting the Toolchain</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <caution>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="i"><computeroutput>[Requesting program interpreter: /lib/ld.so.1]</computeroutput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-  </caution>
-
-</sect1>
Index: OK/final-system/ppc/glibc.xml
===================================================================
--- BOOK/final-system/ppc/glibc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,157 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version;</title>
-
-  <indexterm zone="ch-system-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('i18n-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-glibc'))"/>
-
-  <sect2 id="conf-ld" role="configuration">
-    <title>Configuring The Dynamic Loader</title>
-
-    <indexterm zone="conf-ld">
-      <primary sortas="e-/etc/ld.so.conf">/etc/ld.so.conf</primary>
-    </indexterm>
-
-    <para os="ld-a">By default, the dynamic loader (<filename
-    class="libraryfile">/lib/ld.so.1</filename>) searches through
-    <filename class="directory">/lib</filename> and <filename
-    class="directory">/usr/lib</filename> for dynamic libraries that are
-    needed by programs as they are run. However, if there are libraries in
-    directories other than <filename class="directory">/lib</filename> and
-    <filename class="directory">/usr/lib</filename>, these need to be
-    added to the <filename>/etc/ld.so.conf</filename> file in order
-    for the dynamic loader to find them. Two directories that are commonly
-    known to contain additional libraries are <filename
-    class="directory">/usr/local/lib</filename> and <filename
-    class="directory">/opt/lib</filename>, so add those directories to the
-    dynamic loader's search path.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='ld-b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='ld-c'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('contents-glibc'))"/>
-
-</sect1>
Index: OK/final-system/ppc/hfsutils.xml
===================================================================
--- BOOK/final-system/ppc/hfsutils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,214 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-hfsutils" role="wrap">
-  <?dbhtml filename="hfsutils.html"?>
-
-  <title>Hfsutils-&hfsutils-version;</title>
-
-  <indexterm zone="ch-system-hfsutils">
-    <primary sortas="a-Hfsutils">Hfsutils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Hfsutils package contains a number of utilities for accessing
-    files on hfs filesystems. It is needed to run <command>ybin</command>.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Hfsutils</title>
-
-    <para os="a">Prepare Hfsutils for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-hfsutils" role="content">
-    <title>Contents of Hfsutils</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>hattrib, hcd, hcopy, hdel, hdir, hfsutils, hformat, hls, hmkdir,
-        hmount, hpwd, hrename, hrmdir, humount, hvol (these are all hardlinks
-        to hfsutils).</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="hattrib">
-        <term><command>hattrib</command></term>
-        <listitem>
-          <para>Change FS file or directory attributes.</para>
-          <indexterm zone="ch-system-hfsutils hattrib">
-            <primary sortas="b-hattrib">hattrib</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hcd">
-        <term><command>hcd</command></term>
-        <listitem>
-          <para>Change working HFS directory.</para>
-          <indexterm zone="ch-system-hfsutils hcd">
-            <primary sortas="b-hcd">hcd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hcopy">
-        <term><command>hcopy</command></term>
-        <listitem>
-          <para>Copy files to or from an HFS volume.</para>
-          <indexterm zone="ch-system-hfsutils hcopy">
-            <primary sortas="b-hcopy">hcopy</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hdel">
-        <term><command>hdel</command></term>
-        <listitem>
-          <para>Delete both forks of an HFS file.</para>
-          <indexterm zone="ch-system-hfsutils hdel">
-            <primary sortas="b-hdel">hdel</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hdir">
-        <term><command>hdir</command></term>
-        <listitem>
-          <para>Display an HFS directory in long format.</para>
-          <indexterm zone="ch-system-hfsutils hdir">
-            <primary sortas="b-hdir">hdir</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hformat">
-        <term><command>hformat</command></term>
-        <listitem>
-          <para>Create a new HFS filesystem and make it current.</para>
-          <indexterm zone="ch-system-hfsutils hformat">
-            <primary sortas="b-hformat">hformat</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hfsutils">
-        <term><command>hfsutils</command></term>
-        <listitem>
-          <para>Tools for accessing Macintosh HFS-formatted volumes.</para>
-          <indexterm zone="ch-system-hfsutils hfsutils">
-            <primary sortas="b-hfsutils">hfsutils</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hls">
-        <term><command>hls</command></term>
-        <listitem>
-          <para>List files in an HFS directory.</para>
-          <indexterm zone="ch-system-hfsutils hls">
-            <primary sortas="b-hls">hls</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hmkdir">
-        <term><command>hmkdir</command></term>
-        <listitem>
-          <para>Create a new HFS directory.</para>
-          <indexterm zone="ch-system-hfsutils hmkdir">
-            <primary sortas="b-hmkdir">hmkdir</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hmount">
-        <term><command>hmount</command></term>
-        <listitem>
-          <para>Introduce a new HFS volume and make it current.</para>
-          <indexterm zone="ch-system-hfsutils hmount">
-            <primary sortas="b-hmount">hmount</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hpwd">
-        <term><command>hpwd</command></term>
-        <listitem>
-          <para>Print the full path to the current HFS working directory.</para>
-          <indexterm zone="ch-system-hfsutils hpwd">
-            <primary sortas="b-hpwd">hpwd</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hrename">
-        <term><command>hrename</command></term>
-        <listitem>
-          <para>Rename or move an HFS file or directory.</para>
-          <indexterm zone="ch-system-hfsutils hrename">
-            <primary sortas="b-hrename">hrename</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hrmdir">
-        <term><command>hrmdir</command></term>
-        <listitem>
-          <para>Remaove an empty HFS directory.</para>
-          <indexterm zone="ch-system-hfsutils hrmdir">
-            <primary sortas="b-hrmdir">hrmdir</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="humount">
-        <term><command>humount</command></term>
-        <listitem>
-          <para>Remove an HFS volume from the list of known volumes.</para>
-          <indexterm zone="ch-system-hfsutils humount">
-            <primary sortas="b-humount">humount</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="hvol">
-        <term><command>hvol</command></term>
-        <listitem>
-          <para>Display or change the current HFS volume.</para>
-          <indexterm zone="ch-system-hfsutils hvol">
-            <primary sortas="b-hvol">hvol</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/ppc/parted.xml
===================================================================
--- BOOK/final-system/ppc/parted.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,113 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-parted" role="wrap">
-  <?dbhtml filename="parted.html"?>
-
-  <title>Parted-&parted-version;</title>
-
-  <indexterm zone="ch-system-parted">
-    <primary sortas="a-Parted">Parted</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>Parted is a program for creating, copying and modifying partitions,
-    and the file systems on them. Parted is especially useful on PPC machines
-    in that, unlike <command>fdisk</command>, it accurately reads Macintosh
-    partition maps.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Parted</title>
-
-    <para os="a">Prepare Parted for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr --disable-Werror</userinput></screen>
-
-    <variablelist os="b">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry os="b1">
-        <term><parameter>--disable-Werror</parameter></term>
-        <listitem>
-          <para>The Makefile defaults to using -Werror. With <package>gcc&gcc-version;</package>
-	  that flag causes it to treat warnings (in this case, that C99 inline functions will
-	  be compiled as GNU89) as errors.  So, we disable the option.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="c">Compile the Parted package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-parted" role="content">
-    <title>Contents of Parted</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed libraries</segtitle>
-
-      <seglistitem>
-        <seg>parted, partprobe</seg>
-	<seg>libparted.[a,so]</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="parted">
-        <term><command>parted</command></term>
-        <listitem>
-          <para>A program for creating, destroying, resizing, checking and
-          copying partitions, and the filesystems on them. This is useful
-          for creating space for new operating systems, reorganising disk
-          usage, copying data between hard disks, and disk imaging.</para>
-          <indexterm zone="ch-system-parted parted">
-            <primary sortas="e-parted">parted</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="partprobe">
-        <term><command>partprobe</command></term>
-        <listitem>
-          <para>Informs the OS of partition table changes.</para>
-          <indexterm zone="ch-system-parted partprobe">
-            <primary sortas="e-partprobe">partprobe</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libparted">
-        <term><filename class="libraryfile">libparted</filename></term>
-        <listitem>
-          <para>A library to manipulate partitions.</para>
-          <indexterm zone="ch-system-parted libparted">
-            <primary sortas="c-libparted">libparted</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/ppc/powerpc-utils.xml
===================================================================
--- BOOK/final-system/ppc/powerpc-utils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,87 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-powerpc-utils" role="wrap">
-  <?dbhtml filename="powerpc-utils.html"?>
-
-  <title>Powerpc-Utils_&powerpcutils-version;</title>
-
-  <indexterm zone="ch-system-powerpc-utils">
-    <primary sortas="a-Powerpc-Utils">Powerpc-Utils</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Powerpc-Utils package contains a number of utilities for Power
-    Macintoshes and other similar machines.  Most of these utilities are now
-    obsolete, but <command>nvsetenv</command> is needed by <command>ybin</command>
-    to install the bootloader on an hfs partition.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Powerpc-Utils</title>
-
-    <para os="a">This package, originally pmac-utils, has issues with
-    NewWorld Macintoshes. The following patch fixes these issues
-    and generally updates the package:</para>
-
-<screen os="b"><userinput>patch -Np1 -i ../&powerpcutils-patch;</userinput></screen>
-
-    <para os="c">Compile the needed programs:</para>
-
-<screen os="d"><userinput>make nvsetenv nvsetvol</userinput></screen>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>install -v -m755 nvsetenv nvsetvol /usr/sbin
-install -v -m644 nvsetenv.8 nvsetvol.8 /usr/share/man/man8</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-powerpc-utils" role="content">
-    <title>Contents of Powerpc-Utils</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>nvsetenv, nvsetvol</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="nvsetenv">
-        <term><command>nvsetenv</command></term>
-        <listitem>
-          <para>Manipulate variables in the non-volatile RAM.</para>
-          <indexterm zone="ch-system-powerpc-utils nvsetenv">
-            <primary sortas="b-nvsetenv">nvsetenv</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nvsetvol">
-        <term><command>nvsetvol</command></term>
-        <listitem>
-          <para>Adjust the volume of the boot-up chime on Macintoshes.</para>
-          <indexterm zone="ch-system-powerpc-utils nvsetvol">
-            <primary sortas="b-nvsetvol">nvsetvol</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/ppc/yaboot.xml
===================================================================
--- BOOK/final-system/ppc/yaboot.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,163 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-yaboot" role="wrap">
-  <?dbhtml filename="yaboot.html"?>
-
-  <title>Yaboot-&yaboot-version;</title>
-
-  <indexterm zone="ch-system-yaboot">
-    <primary sortas="a-Yaboot">Yaboot</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Yaboot package contains a PowerPC Boot Loader for machines using
-    Open Firmware such as NewWorld Macintoshes.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Yaboot</title>
-
-    <para os="a">Yaboot has a compilation error. The following patch properly
-    fixes the issue:</para>
-
-<screen os="b"><userinput>patch -Np1 -i ../&yaboot-fix-patch;</userinput></screen>
-
-    <para os="c">The following patch removes a redundant test which prevents
-    <command>ofpath</command> from executing against SATA disks:</para>
-
-<screen os="d"><userinput>patch -Np1 -i ../&yaboot-sata-patch;</userinput></screen>
-
-    <para os="e">The supplied man pages have <filename
-    class="directory">/usr/local</filename> in the text. This sed will correct
-    that:</para>
-
-<screen os="f"><userinput>sed -i 's%/usr/local%/usr%' man/*</userinput></screen>
-
-    <para os="g">Compile the package:</para>
-
-<screen os="h"><userinput>make PREFIX=/usr</userinput></screen>
-
-    <para os="i">Install the package:</para>
-
-<screen os="j"><userinput>make PREFIX=/usr install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-yaboot" role="content">
-    <title>Contents of Yaboot</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed files</segtitle>
-
-      <seglistitem>
-        <seg>addnote, mkofboot (link to ybin), ofboot, ofpath, yaboot,
-        yabootconfig, ybin</seg>
-        <seg>yaboot.conf</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="addnote">
-        <term><command>addnote</command></term>
-  <listitem>
-    <para>For IBM CHRP machines, add a PT_NOTE program header
-    entry to an elf file so that it can be booted.</para>
-    <indexterm zone="ch-system-yaboot addnote">
-      <primary sortas="b-addnote">addnote</primary>
-    </indexterm>
-  </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkofboot">
-        <term><command>mkofboot</command></term>
-        <listitem>
-          <para>Format the bootstrap partition and install the yaboot
-          boot loader.</para>
-          <indexterm zone="ch-system-yaboot mkofboot">
-            <primary sortas="b-mkofboot">mkofboot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ofboot">
-        <term><command>ofboot</command></term>
-        <listitem>
-          <para>Script to format the boot menu using yaboot.conf and
-    write the resulting Open Firmware code to the bootstrap.</para>
-          <indexterm zone="ch-system-yaboot ofboot">
-            <primary sortas="b-ofboot">ofboot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ofpath">
-        <term><command>ofpath</command></term>
-        <listitem>
-          <para>Determine Open Firmware path corresponding to a device
-    node.</para>
-          <indexterm zone="ch-system-yaboot ofpath">
-            <primary sortas="b-ofpath">ofpath</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="yaboot">
-        <term><command>yaboot</command></term>
-        <listitem>
-          <para>Open Firmware boot loader.</para>
-          <indexterm zone="ch-system-yaboot yaboot">
-            <primary sortas="b-yaboot">yaboot</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="yabootconfig">
-        <term><command>yabootconfig</command></term>
-        <listitem>
-          <para>Generate and install a simple yaboot.conf.</para>
-          <indexterm zone="ch-system-yaboot yabootconfig">
-            <primary sortas="b-yabootconfig">yabootconfig</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ybin">
-        <term><command>ybin</command></term>
-        <listitem>
-          <para>Shell script to update or install the boot loader
-    on a bootstrap partition.</para>
-          <indexterm zone="ch-system-yaboot ybin">
-            <primary sortas="b-ybin">ybin</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="yaboot.conf">
-        <term><filename>yaboot.conf</filename></term>
-        <listitem>
-          <para>Configuration file used by <command>ybin</command> to determine
-    how to install <command>yaboot</command> on the bootstrap partition.</para>
-          <indexterm zone="ch-system-yaboot yaboot.conf">
-            <primary sortas="e-yaboot.conf">yaboot.conf</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/ppc64-chapter.xml
===================================================================
--- BOOK/final-system/ppc64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,89 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-building-system" xreflabel="Installing Basic System Software">
-  <?dbhtml dir="final-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Installing Basic System Software</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkgmgt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/testsuitesagain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/glibc-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/adjusting.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/multiarch_wrapper.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bison-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/autoconf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/automake.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/man.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/mktemp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysklogd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/hfsutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/parted.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/powerpc-utils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/yaboot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/aboutdebug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/stripping.xml"/>
-
-</chapter>
Index: OK/final-system/ppc64/adjusting.xml
===================================================================
--- BOOK/final-system/ppc64/adjusting.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,83 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-adjusting">
-  <?dbhtml filename="adjusting.html"?>
-
-  <title>Adjusting the Toolchain</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../multilib/adjusting.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../multilib/adjusting.xml"
-  xpointer="xpointer(//*[@os='m1'])"/>
-
-  <caution>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/adjusting.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen><computeroutput>[Requesting program interpreter: /lib64/ld64.so.1]</computeroutput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m7'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-  </caution>
-
-</sect1>
Index: OK/final-system/ppc64/binutils.xml
===================================================================
--- BOOK/final-system/ppc64/binutils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,136 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-binutils" role="wrap">
-  <?dbhtml filename="binutils.html"?>
-
-  <title>Binutils-&binutils-version;</title>
-
-  <indexterm zone="ch-system-binutils">
-    <primary sortas="a-Binutils">Binutils</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/binutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Binutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/binutils.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/binutils.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <para os="ac">The following patch corrects an error in the visibility
-    tests for <command>ld</command> which only affects ppc64, see <ulink
-    url="http://sourceware.org/ml/binutils/2004-08/msg00030.html"/>.</para>
-
-<screen os="ad"><userinput>patch -Np1 -i ../&binutils-ppc64-vistest-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/binutils.xml"
-    xpointer="xpointer(//*[@os='ca'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/binutils.xml"
-  xpointer="xpointer(id('contents-binutils'))"/>
-
-</sect1>
Index: OK/final-system/ppc64/gcc.xml
===================================================================
--- BOOK/final-system/ppc64/gcc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,147 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <para os="ap1">GCC includes a <filename class="directory">nof</filename> directory
-    of 32-bit code for processors which do not have hardware floating point.
-    Installing it causes a linkage failure on a 64-bit system. and is
-    unnecessary.  The following patch will prevent it being compiled.</para>
-
-<screen os="ap2"><userinput>patch -Np1 -i ../&gcc-nof-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='e1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='e2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/gcc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='v'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='w'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='x'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/gcc.xml"
-  xpointer="xpointer(id('contents-gcc'))"/>
-
-</sect1>
Index: OK/final-system/ppc64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/ppc64/glibc-64bit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,166 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc" role="wrap">
-  <?dbhtml filename="glibc-64bit.html"?>
-
-  <title>Glibc-&glibc-version; 64-Bit</title>
-
-  <indexterm zone="ch-system-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <para os="m1">Tell Glibc to install its 64-bit libraries into
-    <filename class="directory">/lib64</filename>:</para>
-
-<screen os="m2"><userinput>echo "slibdir=/lib64" &gt;&gt; configparms</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-    ../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
-    --libexecdir=/usr/lib64/glibc --libdir=/usr/lib64</userinput></screen>
-
-    <variablelist os="i">
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry>
-        <term><parameter>--libexecdir=/usr/lib64/glibc</parameter></term>
-        <listitem>
-          <para>This changes the location of the <command>pt_chown</command>
-          program from its default of <filename
-          class="directory">/usr/libexec</filename> to <filename
-          class="directory">/usr/lib64/glibc</filename>.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('i18n-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-glibc'))"/>
-
-  <sect2 id="conf-ld" role="configuration">
-    <title>Configuring The Dynamic Loader</title>
-
-    <indexterm zone="conf-ld">
-      <primary sortas="e-/etc/ld.so.conf">/etc/ld.so.conf</primary>
-    </indexterm>
-
-    <para>By default, the dynamic loader (<filename
-    class="libraryfile">/lib/ld.so.1</filename> for 32bit executables and
-    <filename class="libraryfile">/lib/ld64.so</filename> for
-    64bit executables) searches through
-    <filename class="directory">/lib</filename>,
-    <filename class="directory">/lib64</filename>,
-    <filename class="directory">/usr/lib</filename>,
-    and <filename class="directory">/usr/lib64</filename> for dynamic
-    libraries that are needed by programs as they are run. However, if
-    there are libraries in directories other than these, they need to be
-    added to the <filename>/etc/ld.so.conf</filename> file in order
-    for the dynamic loader to find them. Some directories that are commonly
-    known to contain additional libraries are
-    <filename class="directory">/usr/local/lib</filename>,
-    <filename class="directory">/usr/local/lib64</filename>,
-    <filename class="directory">/opt/lib</filename>,
-    and <filename class="directory">/opt/lib64</filename>,
-    so add those directories to the dynamic loader's search path.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='ld-b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='ld-c'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('contents-glibc'))"/>
-
-</sect1>
Index: OK/final-system/ppc64/glibc.xml
===================================================================
--- BOOK/final-system/ppc64/glibc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,148 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc-32" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-glibc-32">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <para os="u1">The powerpc (32) architecture is expected to fail the
-    check-textrel tests because it cannot protect some elf segments in
-    shared libraries from being executable and writable. Using the default
-    64-bit compiler means the test runs as <literal>__powerpc64__</literal>
-    which is <emphasis>not</emphasis> expected to fail. The problem only exists
-    in 32-bit, the 64-bit ABI allows the segments to be protected.</para>
-
-    <para os="u2">Other distributions alter gcc to default to 32-bits and
-    so do not see this failure.  Whether they then test correctly on 64-bit
-    libraries is not our problem.</para>
-
-    <para os="u3">Force the test to use the 32-bit compiler with the following
-    <command>sed</command> :</para>
-
-<screen os="u4"><userinput>sed -i "s/\(^check-textrel-CFLAGS = \)/\1 ${BUILD32} /" elf/Makefile</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
-    ../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
-    --libexecdir=/usr/lib/glibc --host=${CLFS_TARGET32}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/ppc64/hfsutils.xml
===================================================================
--- BOOK/final-system/ppc64/hfsutils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-hfsutils" role="wrap">
-  <?dbhtml filename="hfsutils.html"?>
-
-  <title>Hfsutils-&hfsutils-version;</title>
-
-  <indexterm zone="ch-system-hfsutils">
-    <primary sortas="a-Hfsutils">Hfsutils</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../ppc/hfsutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Hfsutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/hfsutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../ppc/hfsutils.xml"
-  xpointer="xpointer(id('contents-hfsutils'))"/>
-
-</sect1>
Index: OK/final-system/ppc64/libtool.xml
===================================================================
--- BOOK/final-system/ppc64/libtool.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,74 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-libtool-32" role="wrap">
-  <?dbhtml filename="libtool.html"?>
-
-  <title>Libtool-&libtool-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-libtool-32">
-    <primary sortas="a-Libtool">Libtool</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/libtool.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libtool</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/libtool.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <para os="e">To test the results, issue:
-    <userinput>make LDEMULATION=elf32ppc check</userinput>.</para>
-
-    <variablelist os="c">
-      <title>The meaning of the override on make check:</title>
-
-      <varlistentry>
-        <term><parameter>LDEMULATION=elf32ppc</parameter></term>
-	<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-	href="../multilib/libtool.xml"
-	xpointer="xpointer(//*[@os='c2'])"/>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-libtool" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/ppc64/mktemp.xml
===================================================================
--- BOOK/final-system/ppc64/mktemp.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,78 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-mktemp" role="wrap">
-  <?dbhtml filename="mktemp.html"?>
-
-  <title>Mktemp-&mktemp-version;</title>
-
-  <indexterm zone="ch-system-mktemp">
-    <primary sortas="a-Mktemp">Mktemp</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/mktemp.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Mktemp</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/mktemp.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/mktemp.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/mktemp.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/mktemp.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/mktemp.xml"
-  xpointer="xpointer(id('contents-mktemp'))"/>
-
-</sect1>
Index: OK/final-system/ppc64/parted.xml
===================================================================
--- BOOK/final-system/ppc64/parted.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-parted" role="wrap">
-  <?dbhtml filename="parted.html"?>
-
-  <title>Parted-&parted-version;</title>
-
-  <indexterm zone="ch-system-parted">
-    <primary sortas="a-Parted">Parted</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../ppc/parted.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Parted</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/parted.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/usr --libdir=/usr/lib64 --disable-Werror</userinput></screen>
-
-    <variablelist os="b">
-      <title>The meaning of the configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../../final-system/ppc/parted.xml"
-      xpointer="xpointer(//*[@os='b1'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/parted.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/parted.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/parted.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/parted.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../ppc/parted.xml"
-  xpointer="xpointer(id('contents-parted'))"/>
-
-</sect1>
Index: OK/final-system/ppc64/powerpc-utils.xml
===================================================================
--- BOOK/final-system/ppc64/powerpc-utils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,50 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-powerpc-utils" role="wrap">
-  <?dbhtml filename="powerpc-utils.html"?>
-
-  <title>Powerpc-Utils_&powerpcutils-version;</title>
-
-  <indexterm zone="ch-system-powerpc-utils">
-    <primary sortas="a-Powerpc-Utils">Powerpc-Utils</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../ppc/powerpc-utils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Powerpc-Utils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen><userinput>patch -Np1 -i ../&powerpcutils-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen><userinput>EXTRACFLAGS="${BUILD32}" make nvsetenv nvsetvol</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/powerpc-utils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../ppc/powerpc-utils.xml"
-  xpointer="xpointer(id('contents-powerpc-utils'))"/>
-
-</sect1>
Index: OK/final-system/ppc64/yaboot.xml
===================================================================
--- BOOK/final-system/ppc64/yaboot.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,116 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-yaboot" role="wrap">
-  <?dbhtml filename="yaboot.html"?>
-
-  <title>Yaboot-&yaboot-version;</title>
-
-  <indexterm zone="ch-system-yaboot">
-    <primary sortas="a-Yaboot">Yaboot</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../ppc/yaboot.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Yaboot</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <para>Existing multilib distributions alter gcc to default to 32-bit
-    output.  Because our gcc defaults to 64-bit, we need to pass appropriate
-    options to both the compiler and the linker.  The Makefile already
-    overrides any CC and ignores LDFLAGS in favour of its own variables, so we
-    need to use the following seds for a successful compile and install.</para>
-
-<screen><userinput>sed -i -e "s/\(-print-libgcc-file-name\)/${BUILD32} \1/" \
-    -e "s/\(-Bstatic\)/-melf32ppclinux \1/" Makefile
-</userinput></screen>
-
-    <variablelist os="j">
-      <title>The meaning of the sed parameters:</title>
-
-      <varlistentry>
-        <term><parameter>"s/\(-print-libgcc-file-name\)/${BUILD32} \1/"</parameter></term>
-        <listitem>
-          <para>This picks a convenient place within the Makefile's lgcc
-	  variable and inserts the flag to force <command>gcc</command> to
-          create 32-bit code when compiling yaboot.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term><parameter>"s/\(-Bstatic\)/-melf32ppclinux \1/"</parameter></term>
-        <listitem>
-          <para>This picks the end of the LFLAGS which the Makefile passes to
-	  the linker to create the second-stage linux loader, and inserts a
-	  flag to force <command>ld</command> to use a suitable 32-bit
-	  emulation picked from the output of <command>'ld -V'</command>.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>CFLAGS="${BUILD32}" make PREFIX=/usr</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/yaboot.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <important os="j0">
-      <para>The multilib install of yaboot can fail if you miss any of the
-      patches or seds, or omit the CFLAGS variable. <command>ld</command> will
-      issue warnings, but the install will appear to complete successfully.
-      That would result in an unbootable system, so you need to log the output
-      to check it.</para>
-    </important>
-
-<screen><userinput>make PREFIX=/usr install 2&gt;&amp;1 | tee instlog</userinput></screen>
-
-    <para os='k'>To ensure that the install was successful, run the following
-    command:</para>
-
-<screen os='l'><userinput>grep 'powerpc:common64' instlog</userinput></screen>
-
-    <para os='m'>If the command gave you <emphasis>any</emphasis> output
-    (... is incompatible with powerpc:common output) the build of yaboot is
-    broken and you will have to correct your error(s) and repeat it.</para>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../ppc/yaboot.xml"
-  xpointer="xpointer(id('contents-yaboot'))"/>
-
-</sect1>
Index: OK/final-system/sparc-chapter.xml
===================================================================
--- BOOK/final-system/sparc-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,72 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-building-system" xreflabel="Installing Basic System Software">
-  <?dbhtml dir="final-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Installing Basic System Software</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkgmgt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/testsuitesagain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/adjusting.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/autoconf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mktemp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/elftoaout.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/silo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/aboutdebug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/stripping.xml"/>
-
-</chapter>
Index: OK/final-system/sparc/elftoaout.xml
===================================================================
--- BOOK/final-system/sparc/elftoaout.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,73 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-elftoaout" role="wrap">
-  <?dbhtml filename="elftoaout.html"?>
-
-  <title>ELFtoaout-&elftoaout-version;</title>
-
-  <indexterm zone="ch-system-elftoaout">
-    <primary sortas="a-ELFtoaout">ELFtoaout</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The ELFtoaout package contains the Sparc ELF to a.out converter.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of ELFtoaout</title>
-
-    <para os="p1">The following patch fixes some 64 bit issues with
-    elftoaout:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&elftoaout-fixes-patch;</userinput></screen>
-
-    <para os="a">Compile the ELFtoaout package:</para>
-
-<screen os="b"><userinput>make</userinput></screen>
-
-    <para os="c">Install the package:</para>
-
-<screen os="d"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-elftoaout" role="content">
-    <title>Contents of ELFtoaout</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>elf2aout</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="elftoaout">
-        <term><command>elftoaout</command></term>
-        <listitem>
-          <para>Converts an ELF-formatted file to Sparc a.out format for use
-          with openprom</para>
-          <indexterm zone="ch-system-elftoaout elftoaout">
-            <primary sortas="a-elftoaout">elftoaout</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/sparc/glibc.xml
===================================================================
--- BOOK/final-system/sparc/glibc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,130 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc" role="wrap">
-  <title>Glibc-&glibc-version;</title>
-
-  <?dbhtml filename="glibc.html"?>
-
-  <indexterm zone="ch-system-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('i18n-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-ld'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('contents-glibc'))"/>
-
-</sect1>
Index: OK/final-system/sparc/silo.xml
===================================================================
--- BOOK/final-system/sparc/silo.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,106 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-silo" role="wrap">
-  <?dbhtml filename="silo.html"?>
-
-  <title>Silo-&silo-version;</title>
-
-  <indexterm zone="ch-system-silo">
-    <primary sortas="a-Silo">Silo</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Silo package contains the Sparc Improved boot LOader.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Silo</title>
-
-    <para os="a">The following patch fixes compile issues:</para>
-
-<screen os="b"><userinput>patch -Np1 -i ../&silo-fixes-patch;</userinput></screen>
-
-    <para os="c">Compile the Silo package:</para>
-
-<screen><userinput>make</userinput></screen>
-
-    <para os="d">Install the package:</para>
-
-<screen os="e"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-silo" role="content">
-    <title>Contents of Silo</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>silo, silocheck, maketile, and tilo.</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="silo">
-        <term><command>silo</command></term>
-        <listitem>
-          <para>Silo bootloader installer. This program installs the
-	  first stage into the bootblock.</para>
-          <indexterm zone="ch-system-silo silo">
-            <primary sortas="a-silo">silo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="silocheck">
-        <term><command>silocheck</command></term>
-        <listitem>
-          <para>Checks to see whether a file is readable
-	   by silo (very handy if you have larger disks).</para>
-          <indexterm zone="ch-system-silo silocheck">
-            <primary sortas="a-silocheck">silocheck</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="maketilo">
-        <term><command>maketilo</command></term>
-        <listitem>
-          <para>Is a file that is called by the tilo command to build
-          a TFTP boot image.</para>
-          <indexterm zone="ch-system-silo maketilo">
-            <primary sortas="a-maketilo">maketilo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tilo">
-        <term><command>tilo</command></term>
-        <listitem>
-          <para>Tilo is a tool for building a simple TFTP boot loader which
-	   embodies several kernel images for different Sun architectures and
-	   a ramdisk root image.</para>
-          <indexterm zone="ch-system-silo tilo">
-            <primary sortas="a-tilo">tilo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/sparc/sysvinit.xml
===================================================================
--- BOOK/final-system/sparc/sysvinit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,106 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-sysvinit" role="wrap">
-  <?dbhtml filename="sysvinit.html"?>
-
-  <title>Sysvinit-&sysvinit-version;</title>
-
-  <indexterm zone="ch-system-sysvinit">
-    <primary sortas="a-Sysvinit">Sysvinit</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sysvinit.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Sysvinit</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <sect2 id="conf-sysvinit" role="configuration">
-    <title>Configuring Sysvinit</title>
-
-    <indexterm zone="conf-sysvinit">
-      <primary sortas="a-Sysvinit">Sysvinit</primary>
-      <secondary>configuring</secondary>
-    </indexterm>
-
-    <indexterm zone="conf-sysvinit">
-      <primary sortas="e-/etc/inittab">/etc/inittab</primary>
-    </indexterm>
-
-    <para>Create a new file <filename>/etc/inittab</filename> by running
-    the following:</para>
-
-<screen><userinput>cat &gt; /etc/inittab &lt;&lt; "EOF"
-<literal># Begin /etc/inittab
-
-id:3:initdefault:
-
-si::sysinit:/etc/rc.d/init.d/rc sysinit
-
-l0:0:wait:/etc/rc.d/init.d/rc 0
-l1:S1:wait:/etc/rc.d/init.d/rc 1
-l2:2:wait:/etc/rc.d/init.d/rc 2
-l3:3:wait:/etc/rc.d/init.d/rc 3
-l4:4:wait:/etc/rc.d/init.d/rc 4
-l5:5:wait:/etc/rc.d/init.d/rc 5
-l6:6:wait:/etc/rc.d/init.d/rc 6
-
-ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now
-
-su:S016:once:/sbin/sulogin
-
-# Remove this section if you System only
-# has a console port
-1:2345:respawn:/sbin/agetty -I '\033(K' tty1 9600
-2:2345:respawn:/sbin/agetty -I '\033(K' tty2 9600
-3:2345:respawn:/sbin/agetty -I '\033(K' tty3 9600
-4:2345:respawn:/sbin/agetty -I '\033(K' tty4 9600
-5:2345:respawn:/sbin/agetty -I '\033(K' tty5 9600
-6:2345:respawn:/sbin/agetty -I '\033(K' tty6 9600
-
-# Uncomment this section if your system has a console
-# port
-#c0:12345:respawn:/sbin/agetty 9600 ttyS0 vt100
-
-# End /etc/inittab</literal>
-EOF</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sysvinit.xml"
-  xpointer="xpointer(id('contents-sysvinit'))"/>
-
-</sect1>
Index: OK/final-system/sparc64-64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,72 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-building-system" xreflabel="Installing Basic System Software">
-  <?dbhtml dir="final-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Installing Basic System Software</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkgmgt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/testsuitesagain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/adjusting.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/autoconf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mktemp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/elftoaout.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/silo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/aboutdebug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/stripping.xml"/>
-
-</chapter>
Index: OK/final-system/sparc64-64/glibc.xml
===================================================================
--- BOOK/final-system/sparc64-64/glibc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,153 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version;</title>
-
-  <indexterm zone="ch-system-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc64/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='t1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc64/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='t2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/glibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/glibc.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>CC="gcc ${BUILD64}" ../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
-    --libexecdir=/usr/lib/glibc --libdir=/usr/lib \
-    --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/glibc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <para os="u">The stubs.h header installed by glibc looks for stubs-32.h
-    and stubs-64.h. This configuration of glibc only generates stubs-64.h. Fix
-    this with the following:</para>
-
-    <screen os="v"><userinput>mv -v /usr/include/gnu/stubs{-64,}.h</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('i18n-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-ld'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('contents-glibc'))"/>
-
-</sect1>
Index: OK/final-system/sparc64-64/inetutils.xml
===================================================================
--- BOOK/final-system/sparc64-64/inetutils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,86 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-inetutils" role="wrap">
-  <?dbhtml filename="inetutils.html"?>
-
-  <title>Inetutils-&inetutils-version;</title>
-
-  <indexterm zone="ch-system-inetutils">
-    <primary sortas="a-Inetutils">Inetutils</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/inetutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Inetutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc64/inetutils.xml"
-    xpointer="xpointer(//*[@os='ap1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc64/inetutils.xml"
-    xpointer="xpointer(//*[@os='ap2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/inetutils.xml"
-  xpointer="xpointer(id('contents-inetutils'))"/>
-
-</sect1>
Index: OK/final-system/sparc64-64/silo.xml
===================================================================
--- BOOK/final-system/sparc64-64/silo.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,60 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-silo" role="wrap">
-  <?dbhtml filename="silo.html"?>
-
-  <title>Silo-&silo-version;</title>
-
-  <indexterm zone="ch-system-silo">
-    <primary sortas="a-Silo">Silo</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Silo package contains the Sparc Improved boot LOader.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Silo</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/silo.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/silo.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/silo.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/silo.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/silo.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-   <para os="f">Due to a compile issue with the current toolchains, we are going
-   to use the precompiled boot files. This is a temporary fix to the book, but
-   will give us a functional system. As soon as a fix is released, this section
-   will be removed. Here is how you install the precompiled files:</para>
-
-<screen os="g"><userinput>tar -xvf silo-loaders-&silo-version;.tar.gz -C /</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/silo.xml"
-  xpointer="xpointer(id('contents-silo'))"/>
-
-</sect1>
Index: OK/final-system/sparc64-chapter.xml
===================================================================
--- BOOK/final-system/sparc64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,87 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-building-system" xreflabel="Installing Basic System Software">
-  <?dbhtml dir="final-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Installing Basic System Software</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkgmgt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/testsuitesagain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/glibc-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/adjusting.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/multiarch_wrapper.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bison-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/autoconf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/automake.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/man.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/mktemp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysklogd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/elftoaout.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/silo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/aboutdebug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/stripping.xml"/>
-
-</chapter>
Index: OK/final-system/sparc64/elftoaout.xml
===================================================================
--- BOOK/final-system/sparc64/elftoaout.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-elftoaout" role="wrap">
-  <?dbhtml filename="elftoaout.html"?>
-
-  <title>ELFtoaout-&elftoaout-version;</title>
-
-  <indexterm zone="ch-system-elftoaout">
-    <primary sortas="a-ELFtoaout">ELFtoaout</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/elftoaout.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of ELFtoaout</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/elftoaout.xml"
-  xpointer="xpointer(//*[@os='p1'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/elftoaout.xml"
-  xpointer="xpointer(//*[@os='p2'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/elftoaout.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/elftoaout.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/elftoaout.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/elftoaout.xml"
-  xpointer="xpointer(id('contents-elftoaout'))"/>
-
-</sect1>
Index: OK/final-system/sparc64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/sparc64/glibc-64bit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,133 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc" role="wrap">
-  <?dbhtml filename="glibc-64bit.html"?>
-
-  <title>Glibc-&glibc-version; 64-Bit</title>
-
-  <indexterm zone="ch-system-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-    <para os="t1">For TLS support on the Sparc64 we will need to add the following lines to
-    <filename>config.cache</filename>:</para>
-
-<screen os="t2"><userinput>echo "libc_cv_sparc64_tls=yes" &gt;&gt; config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-    ../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
-    --libexecdir=/usr/lib64/glibc --libdir=/usr/lib64 \
-    --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('i18n-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../multilib/glibc-64bit.xml"
-  xpointer="xpointer(id('conf-ld'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('contents-glibc'))"/>
-
-</sect1>
Index: OK/final-system/sparc64/glibc.xml
===================================================================
--- BOOK/final-system/sparc64/glibc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,132 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc-32" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-glibc-32">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
-    ../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
-    --libexecdir=/usr/lib/glibc --host=${CLFS_TARGET32}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/sparc64/inetutils.xml
===================================================================
--- BOOK/final-system/sparc64/inetutils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,83 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-inetutils" role="wrap">
-  <?dbhtml filename="inetutils.html"?>
-
-  <title>Inetutils-&inetutils-version;</title>
-
-  <indexterm zone="ch-system-inetutils">
-    <primary sortas="a-Inetutils">Inetutils</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/inetutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Inetutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <para os="ap1">The follow patches fixes Bus Errors when you attempt to use
-    ping on sparc:</para>
-
-<screen os="ap2"><userinput>patch -Np1 -i ../&inetutils-memcpy_sparc64-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/inetutils.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/inetutils.xml"
-  xpointer="xpointer(id('contents-inetutils'))"/>
-
-</sect1>
Index: OK/final-system/sparc64/libtool.xml
===================================================================
--- BOOK/final-system/sparc64/libtool.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,74 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-libtool-32" role="wrap">
-  <?dbhtml filename="libtool.html"?>
-
-  <title>Libtool-&libtool-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-libtool-32">
-    <primary sortas="a-Libtool">Libtool</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/libtool.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libtool</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/libtool.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <para os="e">To test the results, issue:
-    <userinput>make LDEMULATION=elf32_sparc check</userinput>.</para>
-
-    <variablelist os="c">
-      <title>The meaning of the override on make check:</title>
-
-      <varlistentry>
-        <term><parameter>LDEMULATION=elf32_sparc</parameter></term>
-	<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-	href="../multilib/libtool.xml"
-	xpointer="xpointer(//*[@os='c2'])"/>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-libtool" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/sparc64/linux-headers.xml
===================================================================
--- BOOK/final-system/sparc64/linux-headers.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,50 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-linux-headers" role="wrap">
-  <?dbhtml filename="linux-headers.html"?>
-
-  <title>Linux-Headers-&linux-version;</title>
-
-  <indexterm zone="ch-system-linux-headers">
-    <primary sortas="a-Linux-Headers">Linux-Headers</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/linux-headers.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Linux-Headers</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc64/kernel.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../bootable/sparc64/kernel.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/linux-headers.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/linux-headers.xml"
-  xpointer="xpointer(id('contents-linux-headers'))"/>
-
-</sect1>
Index: OK/final-system/sparc64/silo.xml
===================================================================
--- BOOK/final-system/sparc64/silo.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-silo" role="wrap">
-  <?dbhtml filename="silo.html"?>
-
-  <title>Silo-&silo-version;</title>
-
-  <indexterm zone="ch-system-silo">
-    <primary sortas="a-Silo">Silo</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/silo.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Silo</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/silo.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/silo.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/silo.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen><userinput>make</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/silo.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/silo.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/silo.xml"
-  xpointer="xpointer(id('contents-silo'))"/>
-
-</sect1>
Index: OK/final-system/sparc64/sysvinit.xml
===================================================================
--- BOOK/final-system/sparc64/sysvinit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,59 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-sysvinit" role="wrap">
-  <?dbhtml filename="sysvinit.html"?>
-
-  <title>Sysvinit-&sysvinit-version;</title>
-
-  <indexterm zone="ch-system-sysvinit">
-    <primary sortas="a-Sysvinit">Sysvinit</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sysvinit.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-
-    <title>Installation of Sysvinit</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/sysvinit.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sysvinit.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/sysvinit.xml"
-  xpointer="xpointer(id('conf-sysvinit'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/sysvinit.xml"
-  xpointer="xpointer(id('contents-sysvinit'))"/>
-
-</sect1>
Index: OK/final-system/x86-chapter.xml
===================================================================
--- BOOK/final-system/x86-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,71 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-building-system" xreflabel="Installing Basic System Software">
-  <?dbhtml dir="final-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Installing Basic System Software</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkgmgt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/testsuitesagain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/adjusting.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/autoconf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mktemp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/aboutdebug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/stripping.xml"/>
-
-</chapter>
Index: OK/final-system/x86/glibc.xml
===================================================================
--- BOOK/final-system/x86/glibc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,156 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version;</title>
-
-  <indexterm zone="ch-system-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <para os="ap1">The following patch ensures that memcpy_chk, mempcpy_chk,
-    and memset_chk are defined for i586.</para>
-
-    <screen os="ap2"><userinput>patch -Np1 -i ../&glibc-i586_chk-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>CFLAGS="-march=$(cut -d- -f1 &lt;&lt;&lt; $MACHTYPE) \
-    -mtune=generic -g -O2" ../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
-    --libexecdir=/usr/lib/glibc</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <!-- this is specific to x86 because of the i686 reference in the math tests -->
-    <itemizedlist os="p">
-      <listitem>
-        <para>The <emphasis>math</emphasis> tests, at least on i686, fail in
-        the <emphasis>test-double</emphasis> and <emphasis>test-idouble</emphasis>
-        tests with gcc-&gcc-version;
-        . These two failures in the math tests appear to be harmless.
-        The math tests may also fail on systems where the CPU is not a relatively
-        new genuine Intel or authentic AMD. Certain optimization settings are
-        also known to be a factor here.</para>
-      </listitem>
-      <listitem>
-        <para>If you have mounted the CLFS partition with the
-        <parameter>noatime</parameter> option, the <emphasis>atime</emphasis> test
-        will fail. As mentioned in <xref linkend="ch-partitioning-mounting"/>,
-        do not use the <parameter>noatime</parameter> option while building
-        CLFS.</para>
-      </listitem>
-      <listitem>
-        <para>When running on older and slower hardware, some tests
-        can fail because of test timeouts being exceeded.</para>
-      </listitem>
-    </itemizedlist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('i18n-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-ld'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('contents-glibc'))"/>
-
-</sect1>
Index: OK/final-system/x86/grub.xml
===================================================================
--- BOOK/final-system/x86/grub.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,154 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-<sect1 id="ch-system-grub" role="wrap">
-  <?dbhtml filename="grub.html"?>
-
-  <title>GRUB-&grub-version;</title>
-
-  <indexterm zone="ch-system-grub">
-    <primary sortas="a-GRUB">GRUB</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The GRUB package contains the GRand Unified Bootloader.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of GRUB</title>
-
-    <para os="p1">GRUB has an issue where it sometimes doesn't detect
-    the disk geometry correctly when used with Linux 2.6, resulting
-    in the error message <literal>Error 24: Attempt to access block outside
-    partition</literal>. The following patch contains a fix for this issue
-    as well as various fixes for raid controllers and support for the
-    new Intel Mac:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&grub-fixes-patch;</userinput></screen>
-
-    <para os="p3">By default, GRUB doesn't support ext2 filesystems with 256-byte inodes. Fix this by applying the following patch:</para>
-
-<screen os="p4"><userinput>patch -Np1 -i ../&grub-256byte_inode-patch;</userinput></screen>
-
-    <para os="a">This package is known to have issues when its default optimization
-    flags (including the <option>-march</option> and <option>-mcpu</option>
-    options) are changed. If any environment variables that override default
-    optimizations have been defined, such as <envar>CFLAGS</envar> and
-    <envar>CXXFLAGS</envar>, unset them when building GRUB.</para>
-
-    <para os="b">Prepare GRUB for compilation:</para>
-
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">To test the results, issue:
-    <userinput>make check</userinput>.</para>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install
-mkdir -pv /boot/grub
-cp -v /usr/lib/grub/*/stage{1,2} /boot/grub</userinput></screen>
-
-    <para os="h">The directory in
-    <filename class="directory">/usr/lib/grub</filename> (its name depends
-    on your arch) contains a number of <filename>*stage1_5</filename> files,
-    different ones for different file systems. Review the files available and
-    copy the appropriate ones to the <filename
-    class="directory">/boot/grub</filename> directory. Most users will
-    copy the <filename>e2fs_stage1_5</filename> and/or
-    <filename>reiserfs_stage1_5</filename> files.</para>
-
-  </sect2>
-
-  <sect2 id="contents-grub" role="content">
-    <title>Contents of GRUB</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>grub, grub-install, grub-md5-crypt, grub-set-default, grub-terminfo, and mbchk</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="grub">
-        <term><command>grub</command></term>
-        <listitem>
-          <para>The Grand Unified Bootloader's command shell</para>
-          <indexterm zone="ch-system-grub grub">
-            <primary sortas="b-grub">grub</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grub-install">
-        <term><command>grub-install</command></term>
-        <listitem>
-          <para>Installs GRUB on the given device</para>
-          <indexterm zone="ch-system-grub grub-install">
-            <primary sortas="b-grub-install">grub-install</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grub-md5-crypt">
-        <term><command>grub-md5-crypt</command></term>
-        <listitem>
-          <para>Encrypts a password in MD5 format</para>
-          <indexterm zone="ch-system-grub grub-md5-crypt">
-            <primary sortas="b-grub-md5-crypt">grub-md5-crypt</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grub-set-default">
-        <term><command>grub-set-default</command></term>
-        <listitem>
-          <para>Sets the default boot entry for GRUB</para>
-          <indexterm zone="ch-system-grub grub-set-default">
-            <primary sortas="b-grub-set-default">grub-set-default</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="grub-terminfo">
-        <term><command>grub-terminfo</command></term>
-        <listitem>
-          <para>Generates a terminfo command from a terminfo name; it can be
-          employed if an unknown terminal is being used</para>
-          <indexterm zone="ch-system-grub grub-terminfo">
-            <primary sortas="b-grub-terminfo">grub-terminfo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mbchk">
-        <term><command>mbchk</command></term>
-        <listitem>
-          <para>Checks the format of a multi-boot kernel</para>
-          <indexterm zone="ch-system-grub mbchk">
-            <primary sortas="b-mbchk">mbchk</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/x86_64-64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,72 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-building-system" xreflabel="Installing Basic System Software">
-  <?dbhtml dir="final-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Installing Basic System Software</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkgmgt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/testsuitesagain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/adjusting.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/procps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/autoconf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/automake.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mktemp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/module-init-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysklogd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/bin86.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/lilo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/aboutdebug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/stripping.xml"/>
-
-</chapter>
Index: OK/final-system/x86_64-64/adjusting.xml
===================================================================
--- BOOK/final-system/x86_64-64/adjusting.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-adjusting">
-  <?dbhtml filename="adjusting.html"?>
-
-  <title>Adjusting the Toolchain</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <caution>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen><computeroutput>[Requesting program interpreter: /lib/ld-linux-x86-64.so.2]</computeroutput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-  </caution>
-
-</sect1>
Index: OK/final-system/x86_64-64/bin86.xml
===================================================================
--- BOOK/final-system/x86_64-64/bin86.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,118 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-<sect1 id="ch-system-bin86" role="wrap">
-  <?dbhtml filename="bin86.html"?>
-
-  <title>Bin86-&bin86-version;</title>
-
-  <indexterm zone="ch-system-bin86">
-    <primary sortas="a-Bin86">Bin86</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Bin86 package contains an assembler and linker to produce
-      16 or 32-bit 8086 machine code.</para>
-
-  </sect2>
-
-
-  <sect2 role="installation">
-    <title>Installation of Bin86</title>
-
-    <para os="a">We are building Bin86 because it is required to
-      compile Lilo, and at the moment no other bootloader builds and runs
-      on a pure64 system. If your machine has multiple systems (i.e. x86
-      or multilib) you may prefer to use the bootloader from those
-      systems, such as GRUB.</para>
-
-    <para os="p1">This patch updates Bin86 to compile on x86_64:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&bin86-x86_64-patch;</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make PREFIX=/usr install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-bin86" role="content">
-    <title>Contents of Bin86</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>as86, ld86, nm86, objdump86, size86</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="as86">
-        <term><command>as86</command></term>
-        <listitem>
-          <para>An 8086 assembler</para>
-          <indexterm zone="ch-system-bin86 as86">
-            <primary sortas="b-as86">as86</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="ld86">
-        <term><command>ld86</command></term>
-        <listitem>
-          <para>A linker for the object files produced by as86</para>
-          <indexterm zone="ch-system-bin86 ld86">
-            <primary sortas="b-ld86">ld86</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="nm86">
-        <term><command>nm86</command></term>
-        <listitem>
-          <para>Symbolic link to objdump86</para>
-          <indexterm zone="ch-system-bin86 nm86">
-            <primary sortas="b-nm86">nm86</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="objdump86">
-        <term><command>objdump86</command></term>
-        <listitem>
-          <para>A utility to examine and report on the output from as86 and ld86</para>
-          <indexterm zone="ch-system-bin86 objdump86">
-            <primary sortas="b-objdump86">objdump86</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="size86">
-        <term><command>size86</command></term>
-        <listitem>
-          <para>Symbolic link to objdump86</para>
-          <indexterm zone="ch-system-bin86 size86">
-            <primary sortas="b-size86">size86</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/x86_64-64/binutils.xml
===================================================================
--- BOOK/final-system/x86_64-64/binutils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,147 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-binutils" role="wrap">
-  <?dbhtml filename="binutils.html"?>
-
-  <title>Binutils-&binutils-version;</title>
-
-  <indexterm zone="ch-system-binutils">
-    <primary sortas="a-Binutils">Binutils</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/binutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Binutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/binutils.xml"
-    xpointer="xpointer(//*[@os='q1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/binutils.xml"
-    xpointer="xpointer(//*[@os='q2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/binutils.xml"
-    xpointer="xpointer(//*[@os='ca'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-      <para>The ld test suite accesses <filename>/lib64/ld-linux-x86-64.so</filename>
- 	in some of the tests. The following symbolic link will allow this:</para>
-
-<screen><userinput>ln -sv /lib /lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-	<para>Now remove the temporary symlink:</para>
-
-<screen><userinput>rm -v /lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/binutils.xml"
-    xpointer="xpointer(//*[@os='w1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/binutils.xml"
-    xpointer="xpointer(//*[@os='w2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='u'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/binutils.xml"
-  xpointer="xpointer(id('contents-binutils'))"/>
-
-</sect1>
Index: OK/final-system/x86_64-64/glibc.xml
===================================================================
--- BOOK/final-system/x86_64-64/glibc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,195 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version;</title>
-
-  <indexterm zone="ch-system-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <para os="l1">Tell Glibc to install its libraries into
-    <filename class="directory">/lib</filename>:</para>
-
-<screen os="l2"><userinput>echo "slibdir=/lib" &gt;&gt; configparms</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>CFLAGS="-mtune=generic -g -O2" \
-    ../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
-    --libexecdir=/usr/lib/glibc --libdir=/usr/lib</userinput></screen>
-
-    <variablelist os="i">
-      <title>The meaning of the new configure option:</title>
-
-      <varlistentry>
-        <term><parameter>--libexecdir=/usr/lib/glibc</parameter></term>
-        <listitem>
-          <para>This changes the location of the <command>pt_chown</command>
-          program from its default of <filename
-          class="directory">/usr/libexec</filename> to <filename
-          class="directory">/usr/lib/glibc</filename>.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <para>The install will finish by checking that everything is correctly installed.
-    Unfortunately, it will test for a multilib installation. On x86_64 Pure64 this means
-    it will try to test the non-existent 32-bit loader which has a different name
-    from the 64-bit loader (unlike on other 64-bit architectures).  We fool it by
-    creating a symlink to the real loader.</para>
-
-    <screen><userinput>ln -sv &glibc-ld-name; /lib/ld-linux.so.2</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-    <para>Now we can remove this symlink.  We also need to correct the <command>
-    /usr/bin/ldd</command> script - if you look at this, you will see it references
-    not only the 32-bit linker, but also /lib64 where it thinks the 64-bit linker
-    is. The following <command>sed</command> will correct this:</para>
-
-    <screen><userinput>rm -v /lib/ld-linux.so.2
-cp -v /usr/bin/ldd{,.bak}
-sed '/RTLDLIST/s%/ld-linux.so.2 /lib64%%' /usr/bin/ldd.bak >/usr/bin/ldd</userinput></screen>
-
-    <para>Check the script to make sure the sed worked correctly, then delete
-    the backup.</para>
-
-    <screen><userinput>rm -v /usr/bin/ldd.bak</userinput></screen>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('i18n-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-glibc'))"/>
-
-  <sect2 id="conf-ld" role="configuration">
-    <title>Configuring The Dynamic Loader</title>
-
-    <indexterm zone="conf-ld">
-      <primary sortas="e-/etc/ld.so.conf">/etc/ld.so.conf</primary>
-    </indexterm>
-
-    <para>By default, the dynamic loader (<filename
-    class="libraryfile">/lib/ld-linux-x86-64.so.2</filename>) searches through
-    <filename class="directory">/lib</filename> and <filename
-    class="directory">/usr/lib</filename> for dynamic libraries that are
-    needed by programs as they are run. However, if there are libraries in
-    directories other than <filename class="directory">/lib</filename> and
-    <filename class="directory">/usr/lib</filename>, these need to be
-    added to the <filename>/etc/ld.so.conf</filename> file in order
-    for the dynamic loader to find them. Two directories that are commonly
-    known to contain additional libraries are <filename
-    class="directory">/usr/local/lib</filename> and <filename
-    class="directory">/opt/lib</filename>, so add those directories to the
-    dynamic loader's search path.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='ld-b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='ld-c'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('contents-glibc'))"/>
-
-</sect1>
Index: OK/final-system/x86_64-64/lilo.xml
===================================================================
--- BOOK/final-system/x86_64-64/lilo.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,112 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-<sect1 id="ch-system-lilo" role="wrap">
-  <?dbhtml filename="lilo.html"?>
-
-  <title>Lilo-&lilo-version;</title>
-
-  <indexterm zone="ch-system-lilo">
-    <primary sortas="a-Lilo">Lilo</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para os="a">The Lilo package contains the Linux Loader, a bootloader.</para>
-
-    <para os="b">We have chosen to use Lilo because at the moment no other
-      bootloader builds and runs on a pure64 system. If your machine has
-      multiple systems (i.e. x86 or multilib) you may prefer to use the
-      bootloader from the other system, such as GRUB.</para>
-
-  </sect2>
-
-
-  <sect2 role="installation">
-    <title>Installation of Lilo</title>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make install</userinput></screen>
-
-    <para>At the end of the installation the make install process will
-      print a message stating that /sbin/lilo has to be executed to
-      complete the update. Don't do this as it has no use. The
-      /etc/lilo.conf isn't present yet. We will complete the
-      installation of Lilo in chapter 12.</para>
-
-  </sect2>
-
-  <sect2 id="contents-lilo" role="content">
-    <title>Contents of Lilo</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-
-      <seglistitem>
-        <seg>diag1.img, lilo, mkrescue, keytab-lilo.pl</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="diag1.img">
-        <term><command>diag1.img</command></term>
-        <listitem>
-          <para>A diagnostic disk boot image.</para>
-          <indexterm zone="ch-system-lilo diag1.img">
-            <primary sortas="b-diag1.img">diag1.img</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="lilo">
-        <term><command>lilo</command></term>
-        <listitem>
-          <para>Lilo installs the Linux boot loader which is used to start
-            a Linux system.</para>
-          <indexterm zone="ch-system-lilo lilo">
-            <primary sortas="b-lilo">lilo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="mkrescue">
-        <term><command>mkrescue</command></term>
-        <listitem>
-          <para>A script to make a bootable floppy or CD image using the
-	    default settings from the configuration file.</para>
-          <indexterm zone="ch-system-lilo mkrescue">
-            <primary sortas="b-mkrescue">mkrescue</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="keytab-lilo.pl">
-        <term><command>keytab-lilo.pl</command></term>
-        <listitem>
-          <para>A perl script to create a keyboard translation table to
-	    allow the bootloader to process keystrokes to match your
-	    keyboard layout.</para>
-          <indexterm zone="ch-system-lilo keytab-lilo.pl">
-            <primary sortas="b-keytab-lilo.pl">keytab-lilo.pl</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/x86_64-chapter.xml
===================================================================
--- BOOK/final-system/x86_64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,86 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-building-system" xreflabel="Installing Basic System Software">
-  <?dbhtml dir="final-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Installing Basic System Software</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pkgmgt.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/testsuitesagain.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/temp-perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/linux-headers.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/man-pages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/glibc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/glibc-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/adjusting.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/multiarch_wrapper.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/e2fsprogs-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/m4.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bison.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bison-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/procps-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/libtool.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/libtool-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/flex-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/iproute2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/perl-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/readline-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/autoconf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/automake.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/groff.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/inetutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/kbd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/less.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/man.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/mktemp.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/module-init-tools.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/psmisc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/shadow.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysklogd.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/udev-64bit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/util-linux-ng.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/vim.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/grub.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/aboutdebug.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/stripping.xml"/>
-
-</chapter>
Index: OK/final-system/x86_64/adjusting.xml
===================================================================
--- BOOK/final-system/x86_64/adjusting.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,83 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-adjusting">
-  <?dbhtml filename="adjusting.html"?>
-
-  <title>Adjusting the Toolchain</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../multilib/adjusting.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/adjusting.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../multilib/adjusting.xml"
-  xpointer="xpointer(//*[@os='m1'])"/>
-
-  <caution>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m5'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen><computeroutput>[Requesting program interpreter: /lib64/ld-linux-x86-64.so.2]</computeroutput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/adjusting.xml"
-    xpointer="xpointer(//*[@os='m7'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/adjusting.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-  </caution>
-
-</sect1>
Index: OK/final-system/x86_64/glibc-64bit.xml
===================================================================
--- BOOK/final-system/x86_64/glibc-64bit.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,160 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc" role="wrap">
-  <?dbhtml filename="glibc-64bit.html"?>
-
-  <title>Glibc-&glibc-version; 64-Bit</title>
-
-  <indexterm zone="ch-system-glibc">
-    <primary sortas="a-Glibc">Glibc</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" \
-    CFLAGS="-mtune=generic -g -O2" \
-    ../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
-    --libexecdir=/usr/lib64/glibc --libdir=/usr/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('i18n-glibc'))"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('conf-glibc'))"/>
-
-  <sect2 id="conf-ld" role="configuration">
-    <title>Configuring The Dynamic Loader</title>
-
-    <indexterm zone="conf-ld">
-      <primary sortas="e-/etc/ld.so.conf">/etc/ld.so.conf</primary>
-    </indexterm>
-
-    <para>By default, the dynamic loader (<filename
-    class="libraryfile">/lib/ld-linux.so.2</filename> for 32bit executables and
-    <filename class="libraryfile">/lib64/ld-linux-x86-64.so.2</filename> for
-    64bit executables) searches through
-    <filename class="directory">/lib</filename>,
-    <filename class="directory">/lib64</filename>,
-    <filename class="directory">/usr/lib</filename>,
-    and <filename class="directory">/usr/lib64</filename> for dynamic
-    libraries that are needed by programs as they are run. However, if
-    there are libraries in directories other than these, they need to be
-    added to the <filename>/etc/ld.so.conf</filename> file in order
-    for the dynamic loader to find them. Some directories that are commonly
-    known to contain additional libraries are
-    <filename class="directory">/usr/local/lib</filename>,
-    <filename class="directory">/usr/local/lib64</filename>,
-    <filename class="directory">/opt/lib</filename>,
-    and <filename class="directory">/opt/lib64</filename>,
-    so add those directories to the dynamic loader's search path.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='ld-b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc-64bit.xml"
-    xpointer="xpointer(//*[@os='ld-c'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(id('contents-glibc'))"/>
-
-</sect1>
Index: OK/final-system/x86_64/glibc.xml
===================================================================
--- BOOK/final-system/x86_64/glibc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,133 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-glibc-32" role="wrap">
-  <?dbhtml filename="glibc.html"?>
-
-  <title>Glibc-&glibc-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-glibc-32">
-    <primary sortas="a-Glibc">Glibc</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/glibc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Glibc</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='z'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>CC="gcc ${BUILD32}" CXX="g++ ${BUILD32}" \
-    CFLAGS="-march=$(cut -d- -f1 &lt;&lt;&lt; ${CLFS_TARGET32}) \
-    -mtune=generic -g -O2" ../glibc-&glibc-version;/configure --prefix=/usr \
-    --disable-profile --enable-add-ons --enable-kernel=2.6.0 \
-    --libexecdir=/usr/lib/glibc --host=${CLFS_TARGET32}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='l'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='l1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/glibc.xml"
-    xpointer="xpointer(//*[@os='l2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='o'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='p'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='q'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='r'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='s'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/glibc.xml"
-    xpointer="xpointer(//*[@os='t'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-glibc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/final-system/x86_64/grub.xml
===================================================================
--- BOOK/final-system/x86_64/grub.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,81 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-<sect1 id="ch-system-grub" role="wrap">
-  <?dbhtml filename="grub.html"?>
-
-  <title>GRUB-&grub-version;</title>
-
-  <indexterm zone="ch-system-grub">
-    <primary sortas="a-GRUB">GRUB</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GRUB</title>
-
-    <para os="ap3">GRUB has an issue that can cause it to segfault when you
-    try to configure a drive to utilize GRUB on x86_64 machines. The following
-    patch fixes this problem:</para>
-
-<screen os="ap4"><userinput>patch -Np1 -i ../&grub-use_mmap-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-<screen><userinput>CC="gcc ${BUILD32}" ./configure --prefix=/usr</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/grub.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/grub.xml"
-  xpointer="xpointer(id('contents-grub'))"/>
-
-</sect1>
Index: OK/final-system/x86_64/libtool.xml
===================================================================
--- BOOK/final-system/x86_64/libtool.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,74 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-system-libtool-32" role="wrap">
-  <?dbhtml filename="libtool.html"?>
-
-  <title>Libtool-&libtool-version; 32 Bit Libraries</title>
-
-  <indexterm zone="ch-system-libtool-32">
-    <primary sortas="a-Libtool">Libtool</primary>
-    <secondary>32 Bit</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/libtool.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Libtool</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/libtool.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <para os="e">To test the results, issue:
-    <userinput>make LDEMULATION=elf_i386 check</userinput>.</para>
-
-    <variablelist os="c">
-      <title>The meaning of the override on make check:</title>
-
-      <varlistentry>
-        <term><parameter>LDEMULATION=elf_i386</parameter></term>
-	<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-	href="../multilib/libtool.xml"
-	xpointer="xpointer(//*[@os='c2'])"/>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/libtool.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-libtool" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/general.ent
===================================================================
--- BOOK/general.ent	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!ENTITY month "09"> <!-- Use two digits -->
-<!ENTITY month_name "September">
-<!ENTITY day "14"> <!-- Use two digits -->
-<!ENTITY year "2008"> <!-- Use four digits -->
-
-<!ENTITY releasedate "&month_name; &day;, &year;">
-
-<!ENTITY major-version "1">
-<!ENTITY minor-version "1">
-<!ENTITY extra-version "0">
-<!ENTITY generic-version "&major-version;.&minor-version;.&extra-version;"> <!-- Use "svn", "testing", or "x.y.z[-pre{x}]" -->
-
-<!ENTITY version "&generic-version;">
-
-<!ENTITY version-x86 "&version;-x86">
-<!ENTITY version-x86_64 "&version;-x86_64-Multilib">
-<!ENTITY version-x86_64-64 "&version;-x86_64-Pure64">
-<!ENTITY version-ppc "&version;-PowerPC">
-<!ENTITY version-ppc64 "&version;-PowerPC64-Multilib">
-<!ENTITY version-sparc "&version;-Sparc">
-<!ENTITY version-sparcv8 "&version;-Sparc_v8">
-<!ENTITY version-sparc64 "&version;-Sparc64-Multilib">
-<!ENTITY version-sparc64-64 "&version;-Sparc64-Pure64">
-<!ENTITY version-mips "&version;-MIPS">
-<!ENTITY version-mips64 "&version;-MIPS64-Multilib">
-<!ENTITY version-mips64-64 "&version;-MIPS64-Pure64">
-<!ENTITY version-alpha "&version;-ALPHA">
-
-<!ENTITY lfs-root "http://www.linuxfromscratch.org/">
-<!ENTITY clfs-root "http://cross-lfs.org/">
-<!ENTITY clfs-wiki "http://trac.cross-lfs.org/">
-<!ENTITY cblfs-root "http://cblfs.cross-lfs.org/">
-<!ENTITY faq-root "&clfs-wiki;wiki/faq">
-<!ENTITY hints-root "http://hints.cross-lfs.org/">
-<!ENTITY livecd-root "&lfs-root;livecd/">
-<!ENTITY test-results "&clfs-root;testsuite-logs/clfs-&generic-version;/">
-<!ENTITY errata "&clfs-wiki;clfs/errata/&generic-version;/">
-
-<!ENTITY gnu "http://ftp.gnu.org/gnu/">
-<!ENTITY gnu-software "http://www.gnu.org/software/">
-<!ENTITY alpha-gnu "ftp://alpha.gnu.org/gnu/">
-<!ENTITY redhat "ftp://sources.redhat.com/pub/">
-<!ENTITY kernel "http://www.kernel.org/pub/">
-<!ENTITY sourceforge "http://downloads.sourceforge.net/">
-
-<!ENTITY dependencies "Installation depends on">
-<!ENTITY testsuites "Test suite depends on">
-<!ENTITY before "Must be installed before">
-
-<!ENTITY % packages-entities SYSTEM "packages.ent">
-%packages-entities;
-
-<!ENTITY % patches-entities SYSTEM "patches.ent">
-%patches-entities;
Index: OK/index.xml
===================================================================
--- BOOK/index.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "general.ent">
-  %general-entities;
-]>
-
-<bookinfo>
-  <title>Cross-Compiled Linux From Scratch</title>
-  <subtitle>Version &version;</subtitle>
-
-  <authorgroup>
-    <author>
-      <firstname>Jim</firstname>
-      <surname>Gifford</surname>
-    </author>
-    <author>
-      <firstname>Ryan</firstname>
-      <surname>Oliver</surname>
-    </author>
-  </authorgroup>
-
-  <copyright id="copyright">
-    <year>2005&ndash;&year;</year>
-    <holder>Jim Gifford &amp; Ryan Oliver</holder>
-  </copyright>
-
-  <bibliosource>
-    <emphasis>Based on LFS, Copyright &copy; 1999&ndash;2006 Gerard Beekmans</emphasis>
-  </bibliosource>
-
-</bookinfo>
Index: OK/introduction/alpha-chapter.xml
===================================================================
--- BOOK/introduction/alpha-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-intro" xreflabel="Introduction">
-  <?dbhtml dir="introduction"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Introduction</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/acknowledgements.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/how.xml"/>
-  <!-- Uncoment after the first CLFS release
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatsnew.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/whatsnew.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/resources.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/askforhelp.xml"/>
-
-</chapter>
Index: OK/introduction/alpha/changelog.xml
===================================================================
--- BOOK/introduction/alpha/changelog.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,105 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-changelog-alpha">
-  <?dbhtml filename="changelog-alpha.html"?>
-
-  <title>Changelog for Alpha</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/changelog.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Changelog Entries:</title>
-
-<!-- Changelog template
-
-    <listitem>
-      <para>Date</para>
-      <itemizedlist>
-        <listitem>
-          <para>[name] - Changelog entry.</para>
-        </listitem>
-        <listitem>
-          <para>[name] - Another changelog entry.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
--->
-
-    <listitem>
-      <para>July 13, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Bump the Linux Alpha PAGE_SIZE patch to -2.</para>
-         </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>Janurary 6, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Add a sed to the kernel build that removes -Werror
-          from a specific part of the build.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>Janurary 1, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Update the aboot patch so that it builds again.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>December 23, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Added a patch to the Kernel that makes the
-          PAGE_SIZE definition available in userspace.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>December 21, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Added a patch to Glibc that works around compile
-          errors with PTR_MANGLE.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>February 17, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Added a patch that adds sigsuspend_nocancel
-          support to Glibc.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>August 28, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Changelog restarted, see the 1.0.0 book for the old changelog..</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/alpha/whatsnew.xml
===================================================================
--- BOOK/introduction/alpha/whatsnew.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-whatsnew-alpha">
-  <?dbhtml filename="whatsnew-alpha.html"?>
-
-  <title>What's new for Alpha</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/whatsnew.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Upgraded to:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Added:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Removed:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/common/acknowledgements.xml
===================================================================
--- BOOK/introduction/common/acknowledgements.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,105 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-acknowledgements">
-  <title>Cross-LFS Acknowledgements</title>
-  <?dbhtml filename="acknowledgements.html"?>
-
-  <para>The CLFS team would like to acknowledge people who
-  have assisted in making the book what it is today.</para>
-
- <para>Our Leaders:</para>
-
-  <itemizedlist>
-    <listitem>
-      <para>Ryan Oliver - Build Process Developer.</para>
-    </listitem>
-    <listitem>
-      <para>Jim Gifford - Lead Developer.</para>
-    </listitem>
-    <listitem>
-      <para>Jeremy Utley - Release Manager 1.x Series.</para>
-    </listitem>
-  </itemizedlist>
-
-  <para>Our CLFS Team:</para>
-
-  <itemizedlist>
-    <listitem>
-      <para>Joe Ciccone - Alpha, MIPS, Sparc builds.</para>
-    </listitem>
-    <listitem>
-      <para>Nathan Coulson - Bootscripts.</para>
-    </listitem>
-    <listitem>
-      <para>Matt Darcy - x86, X86_64, and Sparc builds.</para>
-    </listitem>
-    <listitem>
-      <para>Manuel Canales Esparcia - Book XML.</para>
-    </listitem>
-    <listitem>
-      <para>Karen McGuiness - Proofreader.</para>
-    </listitem>
-    <listitem>
-      <para>Jeremy Huntwork - PowerPC, x86, Sparc builds.</para>
-    </listitem>
-    <listitem>
-      <para>Justin Knierim - Website Architect.</para>
-    </listitem>
-    <listitem>
-      <para>Ken Moffat - PowerPC and X86_64 builds. Developer of Pure 64 Hint.</para>
-    </listitem>
-    <listitem>
-      <para>Alexander E. Patrakov - Udev/Hotplug Integration</para>
-    </listitem>
-    <listitem>
-      <para>Chris Staub - x86 builds. Leader of Quality Control.</para>
-    </listitem>
-  </itemizedlist>
-
-  <para>Outside the Development Team</para>
- <itemizedlist>
-    <listitem>
-      <para>Jürg Billeter - Testing and assisting in the development of the Linux Headers Package</para>
-    </listitem>
-    <listitem>
-      <para>Richard Downing - Testing, typo, and content fixes.</para>
-    </listitem>
-    <listitem>
-      <para>Peter Ennis - Typo and content fixes.</para>
-    </listitem>
-    <listitem>
-      <para>Tony Morgan - Typo and content fixes.</para>
-    </listitem>
-  </itemizedlist>
-
-  <para>The CLFS team would also like to acknowledge contributions of people
-  from <ulink url="clfs-dev@lists.cross-lfs.org"/> and associated mailing lists
-  who have provided valuable technical and editorial corrections while testing
-  the Cross-LFS book.</para>
-
- <itemizedlist>
-    <listitem>
-      <para>G. Moko - Text updates and Typos</para>
-    </listitem>
-    <listitem>
-      <para>Maxim Osipov - MIPS Testing.</para>
-    </listitem>
-    <listitem>
-      <para>Doug Ronne - Various x86_64 fixes.</para>
-    </listitem>
-    <listitem>
-      <para>William Zhou - Text updates and Typos</para>
-    </listitem>
-    <listitem>
-      <para>Theo Schneider - Testing of the Linux Headers Package</para>
-    </listitem>
-  </itemizedlist>
-
-  <para>Thank you all for your support.</para>
-
-</sect1>
Index: OK/introduction/common/askforhelp.xml
===================================================================
--- BOOK/introduction/common/askforhelp.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,138 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-askforhelp">
-  <?dbhtml filename="askforhelp.html"?>
-
-  <title>Help</title>
-
-  <para>If an issue or a question is encountered while working through
-  this book, check the FAQ page at <ulink url="&faq-root;#generalfaq"/>.
-  Questions are often already answered there. If your question is not
-  answered on this page, try to find the source of the problem. The
-  following hint will give you some guidance for troubleshooting:
-  <ulink url="&hints-root;errors.txt"/>.</para>
-
-  <para>We also have a wonderful CLFS community that is willing to offer
-  assistance through the mailing lists and IRC (see the <xref
-  linkend="ch-intro-resources"/> section of this book). However, we
-  get several support questions everyday and many of them can be easily
-  answered by going to the FAQ and by searching the mailing lists first.
-  So for us to offer the best assistance possible, you need to do some
-  research on your own first. This allows us to focus on the more unusual
-  support needs. If your searches do not produce a solution, please include
-  all relevant information (mentioned below) in your request for help.</para>
-
-  <sect2>
-    <title>Things to Mention</title>
-
-    <para>Apart from a brief explanation of the problem being experienced,
-    the essential things to include in any request for help are:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>The version of the book being used (in this case
-        &version;)</para>
-      </listitem>
-      <listitem>
-        <para>The host distribution and version being used to
-        create CLFS.</para>
-      </listitem>
-      <listitem>
-        <para>The architecture of the host and target.</para>
-      </listitem>
-      <listitem>
-        <para>The value of the $CLFS_HOST, $CLFS_TARGET, $BUILD32, and $BUILD64
-        environment variables.</para>
-      </listitem>
-      <listitem>
-        <para>The package or section in which the problem was encountered.</para>
-      </listitem>
-      <listitem>
-        <para>The exact error message or symptom received. See <xref
-        linkend="ch-intro-askforhelp-compilation-problems"/> below for an
-        example.</para>
-      </listitem>
-      <listitem>
-        <para>Note whether you have deviated from the book at all. A package
-        version change or even a minor change to any command is considered
-        deviation.</para>
-      </listitem>
-    </itemizedlist>
-
-    <note>
-      <para>Deviating from this book does <emphasis>not</emphasis>
-      mean that we will not help you. After all, the CLFS project is
-      about personal preference. Be upfront about any changes to
-      the established procedure&mdash;this helps us evaluate and determine
-      possible causes of your problem.</para>
-    </note>
-
-  </sect2>
-
-  <sect2>
-    <title>Configure Script Problems</title>
-
-    <para>If something goes wrong while running the <command>configure</command>
-    script, review the <filename>config.log</filename> file. This file may
-    contain the errors you encountered during <command>configure</command>.
-    It often logs errors that may have not been printed to the screen. Include
-    only the <emphasis>relevant</emphasis> lines if you need to ask for
-    help.</para>
-
-  </sect2>
-
-  <sect2 id="ch-intro-askforhelp-compilation-problems">
-    <title>Compilation Problems</title>
-
-    <para>Both the screen output and the contents of various files are
-    useful in determining the cause of compilation problems. The screen output
-    from the <command>configure</command> script and the
-    <command>make</command> run can be helpful. It is not necessary to
-    include the entire output, but do include enough of the relevant
-    information. Below is an example of the type of information to include
-    from the screen output from <command>make</command>:</para>
-
-<screen><computeroutput>gcc -DALIASPATH=\"/mnt/clfs/usr/share/locale:.\"
--DLOCALEDIR=\"/mnt/clfs/usr/share/locale\"
--DLIBDIR=\"/mnt/clfs/usr/lib\"
--DINCLUDEDIR=\"/mnt/clfs/usr/include\" -DHAVE_CONFIG_H -I. -I.
--g -O2 -c getopt1.c
-gcc -g -O2 -static -o make ar.o arscan.o commands.o dir.o
-expand.o file.o function.o getopt.o implicit.o job.o main.o
-misc.o read.o remake.o rule.o signame.o variable.o vpath.o
-default.o remote-stub.o version.o opt1.o
--lutil job.o: In function `load_too_high':
-/clfs/tmp/make-3.79.1/job.c:1565: undefined reference
-to `getloadavg'
-collect2: ld returned 1 exit status
-make[2]: *** [make] Error 1
-make[2]: Leaving directory `/clfs/tmp/make-3.79.1'
-make[1]: *** [all-recursive] Error 1
-make[1]: Leaving directory `/clfs/tmp/make-3.79.1'
-make: *** [all-recursive-am] Error 2</computeroutput></screen>
-
-    <para>In this case, many people would just include the bottom
-    section:</para>
-
-<screen><computeroutput>make [2]: *** [make] Error 1</computeroutput></screen>
-
-    <para>This is not enough information to properly diagnose the problem
-    because it only notes that something went wrong, not
-    <emphasis>what</emphasis> went wrong.  The entire section, as in the
-    example above, is what should be saved because it includes the command
-    that was executed and the associated error message(s).</para>
-
-    <para>An excellent article about asking for help on the Internet is
-    available online at <ulink
-    url="http://catb.org/~esr/faqs/smart-questions.html"/>.  Read and
-    follow the hints in this document to increase the likelihood of getting
-    the help you need.</para>
-
-  </sect2>
-
-</sect1>
Index: OK/introduction/common/changelog.xml
===================================================================
--- BOOK/introduction/common/changelog.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,1650 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-changelog" xreflabel="Master Changelog">
-  <?dbhtml filename="changelog.html"?>
-
-  <title>Master Changelog</title>
-
-  <para>This is version &version; of the Cross-Compiled Linux From Scratch
-  book, dated &releasedate;. If this book is more than six months old, a newer
-  and better version is probably already available. To find out, please check
-  one of the mirrors via <ulink url="&clfs-wiki;"/>.</para>
-
-  <para>Below is a list of detailed changes made since the previous release of
-   the book.</para>
-
-  <itemizedlist>
-    <title>Changelog Entries:</title>
-
-<!-- Changelog template
-
-    <listitem>
-      <para>Date</para>
-      <itemizedlist>
-        <listitem>
-          <para>[name] - New changelog entry.</para>
-        </listitem>
-        <listitem>
-          <para>[name] - Previous changelog entry.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
--->
-
-    <listitem>
-      <para>September 13, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Checked and updated all download locations.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>September 7, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - A lot of text changes.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>August 27, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Add Texinfo to the list of Host System
-          Requirements.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>August 24, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Update the paths to ld.so when configuring Glibc
-          for each arch.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>July 13, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Add a page right before Entering the Chroot
-          Enviornment. This page covers the problem of building a 32bit system
-          from a 64bit host or building a older 32bit system from another
-          newer 32bit system.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>July 12, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Drop the minix tools from the chroot Util-Linux-NG
-          build.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>July 11, 2008</para>
-      <itemizedlist>
-	<listitem>
-          <para>[ken] - Add a patch to address known perl
-          vulnerabilities.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>July 7, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Change the command that creates the clfs user
-          to not include -k /dev/null. Newer versions of Shadow (4.1.2)
-          apparently any argument passed to -k to be a directory.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>July 7, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Fix a omission in the Udev lib64 patch. Thanks to
-          AcidPoison for catching this and reporting it in Trac.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>July 6, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Now that shadow doesn't provide any libraries
-          we only need to build it once on multilib.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>June 28, 2008</para>
-      <itemizedlist>
-	<listitem>
-          <para>[jciccone] - Downgraded the Vim Branch Update patch back to -2
-          from -3.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Remove the commands that relocate the Shadow
-          libraries as they are not provided in newer versions of
-          shadow. Also only build 64bit, since there are no libraries
-          anymore.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Link /tools/bin/echo to /bin/echo foe one of the
-          Glibc tests.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated GCC to 4.2.4.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>June 28, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Fixed the Glibc i586 chk patch entity.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated Tar to 1.20.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated Udev to 124.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated the Ncurses Branch Update patch to
-          -3/</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Add a config.cache entry to Coreutils so that the
-          <command>df</command> program will be built</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Fixed descriptions for lib64= in procps on the
-          various multilib pages.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Corrected the entities for the lilo x86_64 cross
-          compile patch.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Added a patch to perl so it wont include
-          asm/page.h.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated the Vim Branch Update patch to -3.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated Shadow to 4.1.2.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Fixed GCC Posix patch MD5SUM.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Fixed Inetutils MD5SUM.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated Util-Linux-NG to 2.14.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated the Util-Linux-NG homepage link.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated Man-Pages to 3.01.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated the Bash Fixes patch to -8.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>June 17, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Ken] - Fix all known kernel vulnerabilities by upgrading to
-          2.6.24.7 plus a patch extracted from debian for the more recent
-          fixes.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>June 7, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - Updated dependency info for several packages.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>Date</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Updated Flex to 2.5.35. This update fixes numerous
-          compilation issues against 2.5.34.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>February 12, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[ken] - Added cs_CZ.UTF-8 locale for grep's fmbtest.sh test.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>Frburary 3, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Updated the Kernel to 2.6.24.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>Feburary 2, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Updated Man-Pages to 2.77.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated Libtool to 1.5.26.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated Findutils to 4.2.32.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated Automake to 1.10.1.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated the bootscripts to 1.1-pre10. These use
-          udevadm instead of the individual udevcontrol, udevtrigger, and
-          udevsettle programs. Which are currently symlinked to udevadm.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>January 20, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Bigdissaved] - Changed the minimum ${CLFS} size from 1.5Gb to
-          2.5Gb. Thanks to Copper for seeing this </para>
-        </listitem>
-       </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>January 19, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Update the Kernel to 2.6.23.14.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>January 19, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Updated Man-Pages to 2.76.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated Util-Linux-NG to 2.13.1.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated Less to 418.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>January 14, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[ken] - Add patch for man pages in module-init-tools.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>January 13, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Updated the Kernel to 2.6.23.13.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>January 6, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Updated File to 4.23.</para>
-        </listitem>
-        <listitem>
-          <para>[ken] - Updated Glibc branch update patch to 1A, so that ppc and
-	  ppc64 build again.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>January 2, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Updated E2fsprogs to 1.40.4.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>Janurary 1, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Updated Shadow to 4.1.0.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>December 29, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[ken] - Make the current Module-Init-Tools testsuite run,
-	  update the instructions because distclean is no longer useful,
-	  and comment on the DOCBOOKTOMAN parameter.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>December 23, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Added a config.cache entry to Gettext to resolve some
-          errors.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>December 19, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Updated Util-Linux-NG to 2.13.0.1.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated Various Branch Update Patches.</para>
-        </listitem>
-       <listitem>
-          <para>[jciccone] - Updated Udev to 118.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated Psmisc to 22.6.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated Module Init Tools to 3.4.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated Man-Pages to 2.73.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated the Kernel to 2.6.23.12.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated Less to 416.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>December 16, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Updated Gettext to 0.17.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated e2fsprogs to 1.40.3.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated Flex to 2.5.34.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated the Kernel to 2.6.23.11.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated the bootscripts to 1.1-pre9.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>December 10, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Added --disable-makeinstall-chown to util-linux-ng
-          in the boot section.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>November 27, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Updated the bootscripts to 1.1-pre8.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>October 30, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to TCL 8.4.16.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Man-Pages 2.67.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Replaced Shadow Patch with better patch.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>October 29, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated Binutils 2.18 Branch Update Patch.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated Vim 7.1 Branch Update Patch.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Added Ncurses 5.6 Branch Update Patch.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Gawk 3.1.6.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Shadow 4.0.18.2.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Added Updated Useradd Fix Patch to Shadow 4.0.18.2.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>October 26, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Added Binutils 2.18 Branch Update Patch.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Added GCC 4.2.2 Branch Update Patch.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Added Glibc 2.7 Branch Update Patch.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>October 25, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated the bootscripts to 1.1-pre7.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Glibc 2.7.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated Bootscripts build to make sure the udev
-			devices get created correctly in boot section.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>October 16, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated the bootscripts to 1.1-pre6.
-		Combined with cblfs bootscripts, all bootscripts in one package.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Linux 2.6.23.1.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Removed Linux-Headers Package.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to GCC 4.2.2.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Tar 1.19.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Texinfo 4.11.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Less 409.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Udev 116.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Added patch to correct the detction of texinfo in binutils.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to IPRoute2 2.6.23.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>October 13, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Updated the bootscripts to 1.1-pre5. The Makefile
-          now creates the static nodes that the udev Makefile used to.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated the boot section Util-Linux-NG Build. Fixes
-		issues where files were missing during bootup and the ability
-		to login.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>September 24, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - More dependency updates for several packages.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>September 23, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - Updates to dependency info for several packages.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>September 12, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - Added more new programs to Util-Linux-Ng installed
-          programs list.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>September 11, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - Updated list of installed programs for Util-Linux-ng.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated CLFS Bootscripts to 1.1-pre4.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-    
-    <listitem>
-      <para>September 10, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - Added needed mkdir command to IPRoute2 instructions.</para>
-        </listitem>
-        <listitem>
-          <para>[Chris] - Fixed descriptive text in testsuite-tools
-          introduction page. Reported by gomoko (ticket #118).</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>September 09, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Build a PIC libfl.a with Flex.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated Util-Linux-ng in Boot Section, to cross-compile.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>September 03, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated Udev to 115.
-			This change also removed udev-cross-lfs package
-			since our rules are the same as base ones installed.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated Grep to 2.5.3.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated Man-Pages to 2.64.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated TCL to 8.4.15.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Linux 2.6.22.6.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Linux Headers 2.6.22.6-09032007.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated Less to 406.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated Sysklogd to 1.5.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated Kbd to 1.13.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated IPRoute2 to 2.6.22-070710.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated Shadow Patch for more fixes. Man Page Typos,
-          buffer overflows, useradd -G fixes, better name support, and
-          the previous useradd fix.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated Bash 3.2 Patch to -6.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated Readline 5.2 Patch to -3.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated Vim 3.1 Patch to -3.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>September 02, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated Util-linux-ng to 2.13.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated Tree to 1.5.1.1.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated Glibc to 2.6.1.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated Binutils to 2.18.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>August 05, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Updated the bash config.cache to contain all
-          of the differences between a cross-compiled and a native build.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>July 23, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Updated Texinfo to 4.9.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated E2fsprogs to 1.40.2.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated M4 to 1.4.10.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated Tar to 1.18.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated Libtool to 1.5.24.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated the Man Pages to 2.63.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>July 22, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Updated GCC to 4.2.1.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>July 20, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[ken] - Make coreutils build in temp-system when the host cannot
-	  run the target programs.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>July 1, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Updated the download location for the Man Pages
-          package.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>June 23, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Updated to Glibc 2.6. This includes adding a sed
-          to Coreutils and Gzip to rename their internal implementations of
-          futimens which are incompatible with the implementation provided
-          by Glibc.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>June 18, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Updated to Tar 1.17.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>June 17, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Updated to Vim 7.1.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated to Findutils 4.2.31.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated to File 4.21.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated to Less 403.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated to Man Pages 2.57.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>June 16, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - Removed creation of config.cache from temp-system
-          Coreutils, as it no longer looks for setvbuf.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>May 19, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Added a patch to Perl that accounts for a change
-          in GCC 4.2.0. The patch causes makedepend.sh to also remove
-          <literal>&lt;command-line&gt;</literal> as well as
-          <literal>&lt;command line&gt;</literal>.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>May 18, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Updated to GCC 4.2.0.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>April 30, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Updated to Man Pages 2.46.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>April 27, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jhuntwork] - We don't use the uname patch for temp-system Coreutils.
-	  No need to 'touch man/uname.1'.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>April 24, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Updated to Psmisc 22.5.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>April 20, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Updated to Gzip 1.3.12.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated to Psmisc 22.4.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated to Man Pages 2.44.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated to M4 1.4.9.</para>
-        </listitem>
-        <listitem>
-          <para>[jciccone] - Updated to Coreutils 6.9.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>April 10, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - Updated Gzip's list of installed programs - compress
-          is no longer installed, and gunzip, uncompress, and zcat are now bash
-          scripts rather than links.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>February 25, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Linux 2.6.20.1.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Linux Headers 2.6.20.1-02252007.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>February 17, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - Moved the build of the File package in cross-tools
-          to the beginning of the chapter.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Gzip 1.3.11.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>February 16, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - Changed the wording in the "Build Variables" page
-          to make it clearer.</para>
-          <para>[Chris] - Added command to Udev installation to remove Udev
-          rules it installs.</para>
-          <para>[Chris] - Removed Ncurses patch for buggy versions of Bash from
-          from the final-system build (it's still in the temp-system).</para>
-          <para>[Chris] - Removed unneeded /tools/bin/cc symlink.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>February 15, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Fix a building of Ncurses when an unpatched version of Bash 3.x is used.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>February 14, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to GCC 4.1.2.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>February 5, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Automake 1.10.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>February 4, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Linux 2.6.20.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Linux Headers 2.6.20-02042007.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Udev 105.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>January 23, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Linux Headers 2.6.19.2-01232007.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Update to Glibc Branch Update Patch.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>January 15, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Linux 2.6.19.2.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Linux Headers 2.6.19.2-01152007.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Tree 1.5.1.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Udev 104.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Udev Rules 1.1-pre4.</para>
-        </listitem>
-        <listitem>
-          <para>[Chris] - Removed obsolete note from bzip2 instructions
-          about performing rm /usr/bin/bz*.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>January 12, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Update to Glibc Branch Update Patch.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Update to Binutils Branch Update Patch.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>January 7, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Bzip2 1.0.4.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>December 23, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Updated to Ncurses 5.6.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>December 15, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Gzip 1.3.9.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to IPRoute2 2.6.19-061214.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>December 13, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Added File to Cross-tools.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>December 12, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Linux 2.6.19.1.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Linux Headers 2.6.19.1-12122006.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Added Readline Upstream Patch.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Update Bash Upstream Patch.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to File 4.19.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>December 10, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Gzip 1.3.8.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>December 9, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Tar 1.16.1.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>December 7, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Gzip 1.3.7.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Coreutils 6.7.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Reverting sysroot changes.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>December 1, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Man-Pages 2.43.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Removed MINOR patch and replaced it with a more complete
-          upstream patch will all current updates to the 2.5 branch of glibc.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Added Binutils Branch Update Patch.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Reverted change in gettext build in temp-system.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Coreutils 6.7.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>November 29, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Linux Headers 2.6.19-11302006.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Udev Rules 1.1-pre3.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>November 29, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Linux 2.6.19.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Linux Headers 2.6.19-11292006.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>November 27, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Gettext 0.16.1.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>November 26, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Man-Pages 2.42.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Gzip 1.3.6.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>November 25, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Findutils 4.2.29.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>November 23, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - Added /bin/rm to essential symlinks - e2fsprogs
-          testsuite hard-codes the location to that binary.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>November 22, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Coreutils 6.6.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Man 1.6e.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>November 20, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Coreutils 6.5.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Added Patch for Coreutils 6.5 ls segfault.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to M4 1.4.8.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Linux 2.6.18.3.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Linux Headers 2.6.18.3-11202006.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>November 17, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Autoconf 2.61.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>November 15, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to IANA-Etc 2.20.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>November 14, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Change to E2FSProgs, does not pick up the CC or LD
-	  variables.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>November 12, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Linux Headers 2.6.18.2-11122006.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Bash 3.2 patch updated with upstream fixes 001-005.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>November 5, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Linux 2.6.18.2.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Linux Headers 2.6.18.2-11052006.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>November 4, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - Modified the instructions for disabling the
-          installation of the groups program to account for changes in shadow's
-          Makefile.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>November 2, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to File 4.18.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>October 31, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Bash 3.2 patch updated with upstream fixes.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Bootscripts 1.1-pre3.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>October 30, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Udev Rules 1.1-pre2.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>October 27, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Bootscripts 1.1-pre2.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated syslog.conf file.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>October 26, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Linux-Headers 2.6.18.1-10262006.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Gettext 0.16.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - The nscd sed is no longer needed to build Glibc 2.5.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>October 25, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - Updated to Psmisc 22.3.</para>
-        </listitem>
-        <listitem>
-          <para>[Chris] - Updated to Tcl 8.4.14.</para>
-        </listitem>
-        <listitem>
-          <para>[Chris] - Moved e2fsprogs and sed before coreutils, as
-          Coreutils testsuite now requires e2fsprogs.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>October 23, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - Removed unneeded additions to config.cache for
-          temp-system Tar and Coreutils.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Added touch man/uname.1 in temp-system Coreutils to
-          prevent a build failure.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Added Patch for a Versioning issue with Glibc 2.5.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>October 22, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Linux 2.6.18.1.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Linux Headers 2.6.18.1-10222006.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Coreutils 6.4.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Removed out of place udev text in bootscripts Networking.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-     <para>October 21, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Inetutils 1.5.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to IPRoute2 2.6.18-061002.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Tar 1.16.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Udev 103.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Coreutils 6.3.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>October 20, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - Removed command to add "setvbuf_reversed" to
-          temp-system bash as it is no longer needed with Bash 3.2.</para>
-        </listitem>
-	<listitem>
-          <para>[Chris] - Added command to man instructions to comment out
-          MANPATH /usr/local/man (in addition to /usr/man).</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>October 15, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated Bash 3.2 with some unofficial upstream fixes. Thank you Chet Ramey.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>October 12, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Added patch to fix build issue with Bash 3.2.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Man-Pages 2.41.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Glibc 2.5.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>October 11, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Bash 3.2.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Readline 5.2.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Man-Pages 2.40.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Udev 102.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>October 4, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[manuel] - Changed book license to the Open Publication
-          License v1.0.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>October 1, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[Chris] - Removed obsolete command from Tcl instructions,
-          as the issue it fixes has been fixed in the latest Tcl version.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>September 29, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Linux Headers to 2.6.18-09302006.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - New patch for util-linux, replaces GCC 4 Fixes, the new
-          patches fixes the same issues, and removes the use of syscalls. Syscalls were
-          removed the unistd.h during santization.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>September 28, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Added patch for Util-Linux to fix build issues due to headers change in the
-          kernel.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Texinfo 4.8a.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>September 25, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated Bootscripts to 1.1-pre1. Adding in the boot logging feature.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Udev 100.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated Udev Rules for Udev 100.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to M4 1.4.7.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Linux to 2.6.18.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Linux Headers to 2.6.18-09252006.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Udev library libvolume_id is used by HAL, which makes
-          us change our build to a multilib build of udev libaries only for 32 and N32.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>September 18, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated Bison to a multilib build in all support architectures.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>August 28, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Gettext 0.15.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Shadow 4.0.18.1.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Coreutils 5.97.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Procps 3.2.7.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Man-Pages 2.39.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Autoconf 2.60.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to TCL 8.4.13.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to M4 1.4.6.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Findutils 4.2.28.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Coreutils Uname Patch -2, which supports all architectures.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Vim Patch -10, which contains upstream fixes.</para>
-        </listitem>
-        <listitem>
-          <para>[jim] - Updated to Udev 098 and udev-cross-lfs to 1.1-08272006 rules.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>August 28, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Changelog restarted, see the 1.0.0 book for the old changelog.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-  </itemizedlist>
-
-  <para>Branch Synced from the Release of LFS 6.0 on February 23rd, 2005</para>
-
-</sect1>
Index: OK/introduction/common/how.xml
===================================================================
--- BOOK/introduction/common/how.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,97 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-how">
-  <?dbhtml filename="how.html"?>
-
-  <title>How to Build a CLFS System</title>
-
-  <para>The CLFS system will be built by using a previously installed
-  Unix system or Linux distribution (such as Debian, Fedora, Mandriva, SUSE,
-  or Ubuntu). This existing system (the host) will be used as a starting
-  point to provide necessary programs, including a compiler, linker, and shell,
-  to build the new system. Select the <quote>development</quote> option
-  during the distribution installation to be able to access these
-  tools.</para>
-
-  <para>As an alternative to installing an entire separate distribution
-  onto your machine, you may wish to use the Linux From Scratch LiveCD.
-  This CD works well as a host system, providing all the tools you need to
-  successfully follow the instructions in this book. It does also
-  contain source packages and patches for the LFS book, and a copy of the LFS
-  book, but not the needed packages or book for CLFS. You can still use the
-  CD for building CLFS, but you will need to download the packages, patches
-  and book separately. You can also look at
-  <ulink url="&hints-root;lfscd-remastering-howto.txt"/>
-  for infomation on building your own CD, replacing the LFS packages and book
-  with those for CLFS. Once you have the CD, no network connection or
-  additional downloads are necessary. For more information about the LFS
-  LiveCD or to download a copy, visit <ulink url="&livecd-root;"/>.</para>
-
-  <para><xref linkend="chapter-partitioning"/> of this book describes how
-  to create a new Linux native partition and file system, the place
-  where the new CLFS system will be compiled and installed. <xref
-  linkend="chapter-getting-materials"/> explains which packages and
-  patches need to be downloaded to build a CLFS system and how to store
-  them on the new file system. <xref linkend="chapter-final-preps"/>
-  discusses the setup for an appropriate working environment. Please read
-  <xref linkend="chapter-final-preps"/> carefully as it explains several
-  important issues the developer should be aware of before beginning to
-  work through <xref linkend="chapter-cross-tools"/> and
-  beyond.</para>
-
-  <para><xref linkend="chapter-cross-tools"/> explains the installation of
-  cross-compile tools which will be built on the host but be able to compile
-  programs that run on the target machine. These cross-compile tools will
-  be used to create a temporary, minimal system that will be the basis for
-  building the final CLFS system. Some of these packages are needed to resolve
-  circular dependencies&mdash;for example, to compile a compiler, you need a
-  compiler.</para>
-
-  <para>The process of building cross-compile tools first involves building and
-  installing all the necessary tools to create a build system for the target 
-  machine. With these cross-compiled tools, we eliminate any
-  dependencies on the toolchain from our host distro.</para>
-
-  <para>After we build our <quote>Cross-Tools</quote>, we start building
-  a very minimal working system in /tools. This minimal system will be built
-  using the cross-toolchain in /cross-tools.</para>
-
-  <para>In <xref linkend="chapter-building-system"/>, the full CLFS system is
-  built. Depending on the system you are cross-compiling for, you will either
-  boot the minimal temp-system on the target machine, or chroot into it.</para>
-
-  <para>The <command>chroot</command> (change root) program is used to enter
-  a virtual environment and start a new shell whose root directory will be set
-  to the CLFS partition. This is very similar to rebooting and instructing the
-  kernel to mount the CLFS partition as the root partition.
-  The major advantage is that <quote>chrooting</quote> allows the builder to
-  continue using the host while CLFS is being built. While waiting for package
-  compilation to complete, a user can switch to a different virtual console
-  (VC) or X desktop and continue using the computer as normal.</para>
-
-  <para>Some systems cannot be built by chrooting so they must be
-  booted instead. Generally, if you building for a different arch than
-  the host system, you must reboot because the kernel will likely not
-  support the target machine. Booting involves installing a few
-  additional packages that are needed for bootup, installing
-  bootscripts, and building a miminal kernel. We also describe some
-  alternative booting methods in <xref linkend="ch-boot-whatnext"/></para>
-
-  <para>To finish the installation, the CLFS-Bootscripts are set up in <xref
-  linkend="chapter-bootscripts"/>, and the kernel and boot loader are set
-  up in <xref linkend="chapter-bootable"/>. <xref linkend="chapter-finalizing"/>
-  contains information on furthering the CLFS experience beyond this book.
-  After the steps in this book have been implemented, the computer will be
-  ready to reboot into the new CLFS system.</para>
-
-  <para>This is the process in a nutshell. Detailed information on each
-  step is discussed in the following chapters and package descriptions.
-  Items that may seem complicated will be clarified, and everything will
-  fall into place as the reader embarks on the CLFS adventure.</para>
-
-</sect1>
Index: OK/introduction/common/resources.xml
===================================================================
--- BOOK/introduction/common/resources.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,84 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-resources">
-  <?dbhtml filename="resources.html"?>
-
-  <title>Resources</title>
-
-  <sect2 id="ch-intro-faq">
-    <title>FAQ</title>
-
-    <para>If during the building of the CLFS system you encounter any
-    errors, have any questions, or think there is a typo in the book,
-    please start by consulting the Frequently Asked Questions (FAQ)
-    that is located at <ulink url="&faq-root;"/>.</para>
-
-  </sect2>
-
-  <sect2 id="ch-intro-maillists" xreflabel="Chapter 1 - Mailing Lists">
-    <title>Mailing Lists</title>
-
-    <para>The <uri>cross-lfs.org</uri> server hosts a number of
-    mailing lists used for the development of the CLFS project. These lists
-    include the main development and support lists, among others. If the
-    FAQ does not contain your answer, you can search the CLFS lists via
-    The Mail Archive <ulink url="http://www.mail-archive.com"/>. You can
-    find the mail lists with the following link:</para>
-
-    <para><ulink url="http://www.mail-archive.com/index.php?hunt=clfs"/></para>
-   
-    <para>For information on the different lists, how to subscribe, archive
-    locations, and additional information, visit <ulink url="&clfs-wiki;wiki/lists"/>.</para>
-
-  </sect2>
-
-  <sect2 id="ch-intro-newsserver">
-    <title>News Server</title>
-
-    <para>Cross-LFS does not maintain it's own News Server, but we do provide
-    access via <uri>gmane.org</uri> <ulink url="http://gmane.org"/>. If you want to subscribe
-    to the Cross-LFS via a newsreader you can utilize <uri>gmane.org</uri>.
-    You can find the game search for CLFS with the following link:</para>
-
-   <para><ulink url="http://dir.gmane.org/search.php?match=clfs"/></para>
-
-  </sect2>
-
-  <sect2 id="ch-intro-irc">
-    <title>IRC</title>
-
-    <para>Several members of the CLFS community offer assistance on our
-    community Internet Relay Chat (IRC) network. Before using this support,
-    please make sure that your question is not already answered in the CLFS
-    FAQ or the mailing list archives. You can find the IRC network at
-    <uri>chat.freenode.net</uri>. The support channel for cross-lfs is
-    named #cross-lfs. If you need to show people the output of your
-    problems, please use http://pastebin.cross-lfs.org and reference
-    the pastebin URL when asking your questions.</para>
-
-  </sect2>
-
-  <sect2 id="ch-intro-mirrors" xreflabel="Chapter 1 - Mirror sites">
-    <title>Mirror Sites</title>
-
-    <para>The CLFS project has a number of world-wide mirrors to make
-    accessing the website and downloading the required packages more
-    convenient. Please visit the CLFS website at
-    <ulink url="&clfs-wiki;wiki/mirrors"/> for mirrors of CLFS.</para>
-
-  </sect2>
-
-  <sect2 id="ch-intro-contactinfo">
-    <title>Contact Information</title>
-
-    <para>Please direct all your questions and comments to the
-    CLFS mailing lists (see above).</para>
-
-  </sect2>
-
-</sect1>
Index: OK/introduction/common/whatsnew.xml
===================================================================
--- BOOK/introduction/common/whatsnew.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,39 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-whatsnew" xreflabel="Master WhatsNew">
-  <?dbhtml filename="whatsnew.html"?>
-
-  <title>What's new since the last release.</title>
-
-  <para>Below is a list of package updates  made since the previous release of the book.</para>
-
-  <itemizedlist>
-    <title>Upgraded to:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Added:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Removed:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/mips-chapter.xml
===================================================================
--- BOOK/introduction/mips-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-intro" xreflabel="Introduction">
-  <?dbhtml dir="introduction"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Introduction</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/acknowledgements.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/how.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/buildinfo.xml"/>
-  <!-- Uncoment after the first CLFS release
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatsnew.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/whatsnew.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/resources.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/askforhelp.xml"/>
-
-</chapter>
Index: OK/introduction/mips/buildinfo.xml
===================================================================
--- BOOK/introduction/mips/buildinfo.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,31 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-introduction-buildinfo">
-  <?dbhtml filename="build-info.html"?>
-
-  <title>Recommended Build Information</title>
-
-  <para>On the RaQ2, we are recommending the following:</para>
-
-  <blockquote>
-
-    <para>The RaQ2 uses DOS style partitions, so build on a x86 and
-    put the RaQ2 hard drive into that system.</para>
-
-    <para>Follow the directions using the reboot section.</para>
-
-    <para>Remove the hard drive and put it into the RaQ2 and
-    continue your build.</para>
-
-  </blockquote>
-
-  <para>On other MIPS based systems, you will have to build on the
-  machine itself, since most of the other MIPS machines use SGI
-  style partitions.</para>
-
-</sect1>
Index: OK/introduction/mips/changelog.xml
===================================================================
--- BOOK/introduction/mips/changelog.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,65 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-changelog-mips">
-  <?dbhtml filename="changelog-mips.html"?>
-
-  <title>Changelog for MIPS 32 Bit</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/changelog.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Changelog Entries:</title>
-
-<!-- Changelog template
-
-    <listitem>
-      <para>Date</para>
-      <itemizedlist>
-        <listitem>
-          <para>[name] - Changelog entry.</para>
-        </listitem>
-        <listitem>
-          <para>[name] - Another changelog entry.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
--->
-
-    <listitem>
-      <para>November 21, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Colo 1.22.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>October 26, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Added patch to Glibc 2.5, to fix an issue of a missing ldd-rewrite.sed.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>August 28, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Changelog restarted, see the 1.0.0 book for the old changelog.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/mips/whatsnew.xml
===================================================================
--- BOOK/introduction/mips/whatsnew.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-whatsnew-mips">
-  <?dbhtml filename="whatsnew-mips.html"?>
-
-  <title>What's new for MIPS 32 Bit</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/whatsnew.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Upgraded to:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Added:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Removed:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/mips64-64-chapter.xml
===================================================================
--- BOOK/introduction/mips64-64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-intro" xreflabel="Introduction">
-  <?dbhtml dir="introduction"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Introduction</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/acknowledgements.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/how.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/buildinfo.xml"/>
-  <!-- Uncoment after the first CLFS release
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatsnew.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/whatsnew.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/resources.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/askforhelp.xml"/>
-
-</chapter>
Index: OK/introduction/mips64-64/changelog.xml
===================================================================
--- BOOK/introduction/mips64-64/changelog.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,79 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-changelog-mips64">
-  <?dbhtml filename="changelog-mips64.html"?>
-
-  <title>Changelog for MIPS64-64</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/changelog.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Changelog Entries:</title>
-
-<!-- Changelog template
-
-    <listitem>
-      <para>Date</para>
-      <itemizedlist>
-        <listitem>
-          <para>[name] - Changelog entry.</para>
-        </listitem>
-        <listitem>
-          <para>[name] - Another changelog entry.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
--->
-
-    <listitem>
-      <para>June 02, 2008</para>
-      <itemizedlist>
-        <listitem>
-	  <para>[ken] - create libstdc++.so symlinks in /usr/lib64 so that the
-	  glibc and ld tests all link, and delete them safely before installing
-	  binutils.</para>
-	  <para>[ken] - ensure binutils does not install libiberty.a into
-	  /usr/lib64.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>November 21, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Colo 1.22.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>October 26, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Added patch to Glibc 2.5, to fix an issue of a missing ldd-rewrite.sed.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>August 28, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Changelog restarted, see the 1.0.0 book for the old changelog.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-  </itemizedlist>
-
-</sect1>
-
Index: OK/introduction/mips64-64/whatsnew.xml
===================================================================
--- BOOK/introduction/mips64-64/whatsnew.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-whatsnew-mips64">
-  <?dbhtml filename="whatsnew-mips64.html"?>
-
-  <title>What's new for MIPS 64 Bit</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/whatsnew.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Upgraded to:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Added:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Removed:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/mips64-chapter.xml
===================================================================
--- BOOK/introduction/mips64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-intro" xreflabel="Introduction">
-  <?dbhtml dir="introduction"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Introduction</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/acknowledgements.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/how.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/buildinfo.xml"/>
-  <!-- Uncoment after the first CLFS release
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatsnew.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/whatsnew.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/resources.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/askforhelp.xml"/>
-
-</chapter>
Index: OK/introduction/mips64/changelog.xml
===================================================================
--- BOOK/introduction/mips64/changelog.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,75 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-changelog-mips64">
-  <?dbhtml filename="changelog-mips64.html"?>
-
-  <title>Changelog for MIPS 64 Bit</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/changelog.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Changelog Entries:</title>
-
-<!-- Changelog template
-
-    <listitem>
-      <para>Date</para>
-      <itemizedlist>
-        <listitem>
-          <para>[name] - Changelog entry.</para>
-        </listitem>
-        <listitem>
-          <para>[name] - Another changelog entry.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
--->
-
-    <listitem>
-      <para>November 17, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[ken] - Put e2fsprogs libraries into /tools/lib64 in "if you are going to chroot".
-		Thanks to Jacek Herold for the report.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>November 21, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Colo 1.22.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>October 26, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Added patch to Glibc 2.5, to fix an issue of a missing ldd-rewrite.sed.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>August 28, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Changelog restarted, see the 1.0.0 book for the old changelog.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/mips64/whatsnew.xml
===================================================================
--- BOOK/introduction/mips64/whatsnew.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-whatsnew-mips64">
-  <?dbhtml filename="whatsnew-mips64.html"?>
-
-  <title>What's new for MIPS 64 Bit Multilib</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/whatsnew.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Upgraded to:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Added:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Removed:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/ppc-chapter.xml
===================================================================
--- BOOK/introduction/ppc-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-intro" xreflabel="Introduction">
-  <?dbhtml dir="introduction"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Introduction</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/acknowledgements.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/how.xml"/>
-  <!-- Uncoment after the first CLFS release
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatsnew.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/whatsnew.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/resources.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/askforhelp.xml"/>
-
-</chapter>
Index: OK/introduction/ppc/changelog.xml
===================================================================
--- BOOK/introduction/ppc/changelog.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,102 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-changelog-ppc">
-  <?dbhtml filename="changelog-ppc.html"?>
-
-  <title>Changelog for PowerPC</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/changelog.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Changelog Entries:</title>
-
-<!-- Changelog template
-
-    <listitem>
-      <para>Date</para>
-      <itemizedlist>
-        <listitem>
-          <para>[name] - Changelog entry.</para>
-        </listitem>
-        <listitem>
-          <para>[name] - Another changelog entry.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
--->
-
-    <listitem>
-      <para>November 17, 2007</para>
-      <itemizedlist>
-        <listitem>
-	  <para>[ken] - Add --disable-Werror to parted (required by recent gcc).</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>September 03, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated Parted to 1.8.8.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>February 22, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[ken] - Mention that Parted installs a library.</para>
-	  <para>[ken] - Use the same patch for Powerpc-Utils as in ppc64.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>January 15, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Parted 1.8.2.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>November 17, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Parted 1.8.0.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>October 11, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Parted 1.7.1.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>August 28, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Changelog restarted, see the 1.0.0 book for the old changelog.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/ppc/whatsnew.xml
===================================================================
--- BOOK/introduction/ppc/whatsnew.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-whatsnew-ppc">
-  <?dbhtml filename="whatsnew-ppc.html"?>
-
-  <title>What's new for PowerPC</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/whatsnew.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Upgraded to:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Added:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Removed:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/ppc64-chapter.xml
===================================================================
--- BOOK/introduction/ppc64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-intro" xreflabel="Introduction">
-  <?dbhtml dir="introduction"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Introduction</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/acknowledgements.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/how.xml"/>
-  <!-- Uncoment after the first CLFS release
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatsnew.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/whatsnew.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/resources.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/askforhelp.xml"/>
-
-</chapter>
Index: OK/introduction/ppc64/changelog.xml
===================================================================
--- BOOK/introduction/ppc64/changelog.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,125 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-changelog-ppc64">
-  <?dbhtml filename="changelog-ppc64.html"?>
-
-  <title>Changelog for PowerPC64</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/changelog.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Changelog Entries:</title>
-
-<!-- Changelog template
-
-    <listitem>
-      <para>Date</para>
-      <itemizedlist>
-        <listitem>
-          <para>[name] - Changelog entry.</para>
-        </listitem>
-        <listitem>
-          <para>[name] - Another changelog entry.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
--->
-
-    <listitem>
-      <para>January 8, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[ken] - Patch gcc so it can compile a modular kernel.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>November 17, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[ken] - Put e2fsprogs libraries into /tools/lib64 in "if you are going to chroot".
-		Thanks to Jacek Herold for the report.</para>
-	  <para>[ken] - Add --disable-Werror to parted (required by recent gcc).</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>September 03, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated Parted to 1.8.8.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>July 24, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[ken] - Removed the patch for cross-compiling e2fsprogs, not
-	  needed with 1.40.2.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>February 22, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[ken] - Removed the glibc-headers from cross-tools.</para>
-          <para>[ken] - Removed the sed of procfs.h from the glibc instructions.
-	    </para>
-          <para>[ken] - Mention that Parted installs a library and put it in
-	    /usr/lib64.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>January 15, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Parted 1.8.2.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>November 17, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Parted 1.8.0.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>October 11, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Parted 1.7.1.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>August 28, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Changelog restarted, see the 1.0.0 book for the old changelog.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-  </itemizedlist>
-</sect1>
Index: OK/introduction/ppc64/whatsnew.xml
===================================================================
--- BOOK/introduction/ppc64/whatsnew.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-whatsnew-ppc">
-  <?dbhtml filename="whatsnew-ppc.html"?>
-
-  <title>What's new for PowerPC</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/whatsnew.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Upgraded to:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Added:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Removed:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/sparc-chapter.xml
===================================================================
--- BOOK/introduction/sparc-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-intro" xreflabel="Introduction">
-  <?dbhtml dir="introduction"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Introduction</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/acknowledgements.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/how.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/buildinfo.xml"/>
-  <!-- Uncoment after the first CLFS release
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatsnew.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/whatsnew.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/resources.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/askforhelp.xml"/>
-
-</chapter>
Index: OK/introduction/sparc/buildinfo.xml
===================================================================
--- BOOK/introduction/sparc/buildinfo.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,24 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-introduction-buildinfo">
-  <?dbhtml filename="build-info.html"?>
-
-  <title>Recommended Build Information</title>
-
-  <para>Sparc v8 and earlier</para>
-
-  <blockquote>
-
-    <para>Sparc v8 and earlier processors are not supported
-    by NPTL. Sparc v9 are supported by the Sparc 64 build instructions
-    which utilize NPTL. If you have an UltraSparc processor, you
-    have a Sparc v9 which is 64 Bit.</para>
-
-  </blockquote>
-
-</sect1>
Index: OK/introduction/sparc/changelog.xml
===================================================================
--- BOOK/introduction/sparc/changelog.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,74 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-changelog-sparc">
-  <?dbhtml filename="changelog-sparc.html"?>
-
-  <title>Changelog for Sparc</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/changelog.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Changelog Entries:</title>
-
-<!-- Changelog template
-
-    <listitem>
-      <para>Date</para>
-      <itemizedlist>
-        <listitem>
-          <para>[name] - Changelog entry.</para>
-        </listitem>
-        <listitem>
-          <para>[name] - Another changelog entry.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
--->
-
-   <listitem>
-      <para>November 2, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated Silo for 2.6.18.1 headers.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-   <listitem>
-      <para>October 24, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Fixed glibc in Sparc builds, add patch to fix missing symbols.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>September 11, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Silo 1.4.13.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>August 28, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Changelog restarted, see the 1.0.0 book for the old changelog.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/sparc/whatsnew.xml
===================================================================
--- BOOK/introduction/sparc/whatsnew.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-whatsnew-sparc">
-  <?dbhtml filename="whatsnew-sparc.html"?>
-
-  <title>What's new for Sparc</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/whatsnew.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Upgraded to:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Added:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Removed:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/sparc64-64-chapter.xml
===================================================================
--- BOOK/introduction/sparc64-64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-intro" xreflabel="Introduction">
-  <?dbhtml dir="introduction"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Introduction</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/acknowledgements.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/how.xml"/>
-  <!-- Uncoment after the first CLFS release
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatsnew.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/whatsnew.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/resources.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/askforhelp.xml"/>
-
-</chapter>
Index: OK/introduction/sparc64-64/changelog.xml
===================================================================
--- BOOK/introduction/sparc64-64/changelog.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,108 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-changelog-sparc64">
-  <?dbhtml filename="changelog-sparc64.html"?>
-
-  <title>Changelog for Sparc64-64</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/changelog.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Changelog Entries:</title>
-
-<!-- Changelog template
-
-    <listitem>
-      <para>Date</para>
-      <itemizedlist>
-        <listitem>
-          <para>[name] - Changelog entry.</para>
-        </listitem>
-        <listitem>
-          <para>[name] - Another changelog entry.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
--->
-
-    <listitem>
-      <para>August 24, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Added Ratrophy's memcpy patch to inetutils to
-          resolve the Bus Error problem with ping on sparc64.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>June 02, 2008</para>
-      <itemizedlist>
-        <listitem>
-	  <para>[ken] - create libstdc++.so symlinks in /usr/lib64 so that the
-	  glibc and ld tests all link, and delete them safely before installing
-	  binutils.</para>
-	  <para>[ken] - ensure binutils does not install libiberty.a into
-	  /usr/lib64.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>February 3, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Added a patch to the kernel that includes
-          spitfire.h in elf.h outside of kernel space. This fixed a
-          compilation error with elftoaout.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-   <listitem>
-      <para>November 2, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated Silo for 2.6.18.1 headers.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-   <listitem>
-      <para>October 24, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Fixed glibc in Sparc builds, add patch to fix missing symbols.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>September 11, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Silo 1.4.13.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>August 28, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Changelog restarted, see the 1.0.0 book for the old changelog.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/sparc64-64/whatsnew.xml
===================================================================
--- BOOK/introduction/sparc64-64/whatsnew.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-whatsnew-sparc64">
-  <?dbhtml filename="whatsnew-sparc64.html"?>
-
-  <title>What's new for Sparc64</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/whatsnew.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Upgraded to:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Added:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Removed:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/sparc64-chapter.xml
===================================================================
--- BOOK/introduction/sparc64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,25 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-intro" xreflabel="Introduction">
-  <?dbhtml dir="introduction"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Introduction</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/acknowledgements.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/how.xml"/>
-  <!-- Uncoment after the first CLFS release
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatsnew.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/whatsnew.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/resources.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/askforhelp.xml"/>
-
-</chapter>
Index: OK/introduction/sparc64/changelog.xml
===================================================================
--- BOOK/introduction/sparc64/changelog.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,125 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-changelog-sparc64">
-  <?dbhtml filename="changelog-sparc64.html"?>
-
-  <title>Changelog for Sparc64</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/changelog.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Changelog Entries:</title>
-
-<!-- Changelog template
-
-    <listitem>
-      <para>Date</para>
-      <itemizedlist>
-        <listitem>
-          <para>[name] - Changelog entry.</para>
-        </listitem>
-        <listitem>
-          <para>[name] - Another changelog entry.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
--->
-
-    <listitem>
-      <para>August 24, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Added Ratrophy's memcpy patch to inetutils to
-          resolve the Bus Error problem with ping on sparc64.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>Feburary 3, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Added a patch to the kernel that includes
-          spitfire.h in elf.h outside of kernel space. This fixed a
-          compilation error with elftoaout.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>Janurary 22, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Changed the default CLFS_TARGET32 to
-          sparcv9-unknown-linux-gnu.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>November 17, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[ken] - Put e2fsprogs libraries into /tools/lib64 in "if you are going to chroot".
-		Thanks to Jacek Herold for the report.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-   <listitem>
-      <para>February 26, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[ken] - Corrected 'Adjusting the Toolchain'. 64-bit linker is in /lib64.
-	    Thanks to William Harrington for the report.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-   <listitem>
-      <para>November 2, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated Silo for 2.6.18.1 headers.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-   <listitem>
-      <para>October 24, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Fixed glibc in Sparc builds, add patch to fix missing symbols.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>September 11, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Silo 1.4.13.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>August 28, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Changelog restarted, see the 1.0.0 book for the old changelog.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/sparc64/whatsnew.xml
===================================================================
--- BOOK/introduction/sparc64/whatsnew.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-whatsnew-sparc64">
-  <?dbhtml filename="whatsnew-sparc64.html"?>
-
-  <title>What's new for Sparc64 Multilib</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/whatsnew.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Upgraded to:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Added:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Removed:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/x86-chapter.xml
===================================================================
--- BOOK/introduction/x86-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-intro" xreflabel="Introduction">
-  <?dbhtml dir="introduction"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Introduction</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/acknowledgements.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/how.xml"/>
-  <!-- Uncoment after the first CLFS release
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatsnew.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/whatsnew.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/resources.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/askforhelp.xml"/>
-  <!-- This page is only for published versions if the LiveCD is included
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/livecd.xml"/>
-  -->
-
-</chapter>
Index: OK/introduction/x86/changelog.xml
===================================================================
--- BOOK/introduction/x86/changelog.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,65 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-changelog-x86">
-  <title>Changelog for x86</title>
-  <?dbhtml filename="changelog-x86.html"?>
-
-  <para>Below is a list of changes specifics for this architecture made
-  since the previous release of the book. For general changes see
-  <xref linkend="ch-intro-changelog"/>,</para>
-
-  <itemizedlist>
-    <title>Changelog Entries:</title>
-
-<!-- Changelog template
-
-    <listitem>
-      <para>Date</para>
-      <itemizedlist>
-        <listitem>
-          <para>[name] - Changelog entry.</para>
-        </listitem>
-        <listitem>
-          <para>[name] - Another changelog entry.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
--->
-
-    <listitem>
-      <para>July 08, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Added the 256-Byte Inode patch to Grub.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>March 18, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Fixed the Glibc i586_chk patch and updated it to -2.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>August 28, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Changelog restarted, see the 1.0.0 book for the old changelog.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-  </itemizedlist>
-
-</sect1>
-
Index: OK/introduction/x86/livecd.xml
===================================================================
--- BOOK/introduction/x86/livecd.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,101 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-bootcd" arch="x86">
-  <?dbhtml filename="bootcd.html"?>
-
-  <title>About the Included CD</title>
-
-  <para os="a">For your convenience, we have included a CD with this book that
-  contains the source packages needed for creating a Linux From Scratch
-  system.  The CD is bootable and provides a stable working environment
-  for building CLFS. This book refers to this system as the
-  <quote>host system.</quote>  The CD images are actively maintained and
-  updated versions can be found at
-  <ulink url="ftp://ftp.lfs-matrix.de/pub/lfs-livecd/"/></para>
-
-  <para os="b">In addition to the tools required to build LFS, the host system
-  on the CD has a number of other helpful tools installed:</para>
-
-  <itemizedlist os="c">
-
-    <listitem>
-      <para>The X Window System Environment</para>
-    </listitem>
-
-    <listitem>
-      <para>Web Tools</para>
-      <itemizedlist>
-        <listitem>
-          <para>Wget (command line file retriever)</para>
-        </listitem>
-        <listitem>
-          <para>Lynx (text web browser)</para>
-        </listitem>
-        <listitem>
-          <para>Irssi (console IRC client)</para>
-        </listitem>
-        <listitem>
-          <para>Firefox (graphical web browser)</para>
-        </listitem>
-        <listitem>
-          <para>Xchat (X-based IRC client)</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>Text Editors</para>
-      <itemizedlist>
-        <listitem>
-          <para>Vim</para>
-        </listitem>
-        <listitem>
-          <para>Nano</para>
-        </listitem>
-        <listitem>
-          <para>Joe</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>Network Tools</para>
-      <itemizedlist>
-        <listitem>
-          <para>SSH Server and Client</para>
-        </listitem>
-        <listitem>
-          <para>NFS Server and Client</para>
-        </listitem>
-        <listitem>
-          <para>Smbmount (mount.cifs) for Windows shares</para>
-        </listitem>
-        <listitem>
-          <para>Subversion</para>
-        </listitem>
-        <listitem>
-          <para>Dhcpcd (DHCP client)</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>Filesystem Programs</para>
-      <itemizedlist>
-        <listitem>
-          <para>Reiserfsprogs</para>
-        </listitem>
-        <listitem>
-          <para>Xfsprogs</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/x86/whatsnew.xml
===================================================================
--- BOOK/introduction/x86/whatsnew.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,40 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-whatsnew-x86">
-  <title>What's New for x86</title>
-  <?dbhtml filename="whatsnew-x86.html"?>
-
-  <para>Below is a list of changes specifics for this architecture made
-  since the previous release of the book. For general changes see
-  <xref linkend="ch-intro-whatsnew"/>,</para>
-
-  <itemizedlist>
-    <title>Upgraded to:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Added:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Removed:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/x86_64-64-chapter.xml
===================================================================
--- BOOK/introduction/x86_64-64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-intro" xreflabel="Introduction">
-  <?dbhtml dir="introduction"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Introduction</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/acknowledgements.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/how.xml"/>
-  <!-- Uncoment after the first CLFS release
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatsnew.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/whatsnew.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/resources.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/askforhelp.xml"/>
-  <!-- This page is only for published versions if the LiveCD is included
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/livecd.xml"/>
-  -->
-
-</chapter>
Index: OK/introduction/x86_64-64/changelog.xml
===================================================================
--- BOOK/introduction/x86_64-64/changelog.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,109 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-changelog-x86_64-64">
-  <?dbhtml filename="changelog-x86_64-64.html"?>
-
-  <title>Changelog for x86_64-64</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/changelog.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Changelog Entries:</title>
-
-<!-- Changelog template
-
-    <listitem>
-      <para>Date</para>
-      <itemizedlist>
-        <listitem>
-          <para>[name] - Changelog entry.</para>
-        </listitem>
-        <listitem>
-          <para>[name] - Another changelog entry.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
--->
-
-    <listitem>
-      <para>June 02, 2008</para>
-      <itemizedlist>
-        <listitem>
-	  <para>[ken] - create libstdc++.so symlinks in /usr/lib64 so that the
-	  glibc and ld tests all link, and delete them safely before installing
-	  binutils.</para>
-	  <para>[ken] - ensure binutils does not install libiberty.a into
-	  /usr/lib64.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>January 22, 2008</para>
-      <itemizedlist>
-        <listitem>
-	  <para>[ken] - Use ${CLFS}/etc/lilo.conf when running lilo in 'boot'.
-	  Thanks to b-vol for highlighting the issue.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>February 19, 2007</para>
-      <itemizedlist>
-        <listitem>
-	  <para>[jim] - Updated to Lilo 22.8.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>February 05, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[ken] - Target for lilo in boot/ is now lilo.static.</para>
-	</listitem>
-	<listitem>
-	  <para>[ken] - Remove sed for gettext testsuite, no longer needed.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>November 14, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[ken] - Fixed longstanding typo in lilo instructions for boot.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>August 28, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Updated to Lilo 22.7.3.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>August 28, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Changelog restarted, see the 1.0.0 book for the old changelog.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/x86_64-64/whatsnew.xml
===================================================================
--- BOOK/introduction/x86_64-64/whatsnew.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,42 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-whatsnew-x86_64">
-  <?dbhtml filename="whatsnew-x86_64.html"?>
-
-  <title>What's New for x86_64</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/whatsnew.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Upgraded to:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-
-  <itemizedlist>
-    <title>Added:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Removed:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/x86_64-chapter.xml
===================================================================
--- BOOK/introduction/x86_64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-intro" xreflabel="Introduction">
-  <?dbhtml dir="introduction"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Introduction</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/acknowledgements.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/how.xml"/>
-  <!-- Uncoment after the first CLFS release
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatsnew.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/whatsnew.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/changelog.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/resources.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/askforhelp.xml"/>
-  <!-- This page is only for published versions if the LiveCD is included
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/livecd.xml"/>
-  -->
-
-</chapter>
Index: OK/introduction/x86_64/changelog.xml
===================================================================
--- BOOK/introduction/x86_64/changelog.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,75 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-changelog-x86_64">
-  <?dbhtml filename="changelog-x86_64.html"?>
-
-  <title>Changelog for x86_64</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/changelog.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Changelog Entries:</title>
-
-<!-- Changelog template
-
-    <listitem>
-      <para>Date</para>
-      <itemizedlist>
-        <listitem>
-          <para>[name] - Changelog entry.</para>
-        </listitem>
-        <listitem>
-          <para>[name] - Another changelog entry.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
--->
-
-    <listitem>
-      <para>July 08, 2008</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jciccone] - Added the 256-Byte Inode patch to Grub.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>November 17, 2007</para>
-      <itemizedlist>
-        <listitem>
-          <para>[ken] - Put e2fsprogs libraries into /tools/lib64 in "if you are going to chroot".
-		Thanks to Jacek Herold for the report.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>February 05, 2007</para>
-      <itemizedlist>
-        <listitem>
-	  <para>[ken] - Remove sed for 64-bit gettext testsuite, no longer needed.</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-    <listitem>
-      <para>August 28, 2006</para>
-      <itemizedlist>
-        <listitem>
-          <para>[jim] - Changelog restarted, see the 1.0.0 book for the old changelog..</para>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-
-  </itemizedlist>
-
-</sect1>
Index: OK/introduction/x86_64/livecd.xml
===================================================================
--- BOOK/introduction/x86_64/livecd.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,27 +1,0 @@
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-bootcd" arch="x86">
-  <?dbhtml filename="bootcd.html"?>
-
-  <title>About the Included CD</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/livecd.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <para>The CD also contains a 64bit kernel for building a 64bit system.
-    </para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/livecd.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/livecd.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-</sect1>
Index: OK/introduction/x86_64/whatsnew.xml
===================================================================
--- BOOK/introduction/x86_64/whatsnew.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,42 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-intro-whatsnew-x86_64">
-  <?dbhtml filename="whatsnew-x86_64.html"?>
-
-  <title>What's New for x86_64 Multilib</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/whatsnew.xml"
-  xpointer="xpointer(/sect1/para[1])"/>
-
-  <itemizedlist>
-    <title>Upgraded to:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-
-  <itemizedlist>
-    <title>Added:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-  <itemizedlist>
-    <title>Removed:</title>
-
-    <listitem>
-      <para>None</para>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
Index: OK/materials/alpha-chapter.xml
===================================================================
--- BOOK/materials/alpha-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-getting-materials" xreflabel="Packages and Patches">
-  <?dbhtml dir="materials"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Packages and Patches</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patches.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/patches.xml"/>
-
-</chapter>
Index: OK/materials/alpha/packages.xml
===================================================================
--- BOOK/materials/alpha/packages.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,30 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-packages-alpha">
-  <?dbhtml filename="packages-alpha.html"?>
-
-  <title>Additional Packages for Alpha</title>
-
-  <variablelist role="materials">
-
-    <varlistentry>
-      <term>Aboot (&aboot-version;) - <token>&aboot-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&aboot-home;"/></para>
-        <para>Download: <ulink url="&aboot-url;"/></para>
-        <para>MD5 sum: <literal>&aboot-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/packages.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/alpha/patches.xml
===================================================================
--- BOOK/materials/alpha/patches.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-patches-alpha">
-  <?dbhtml filename="patches-alpha.html"?>
-
-  <title>Additional Patches for Alpha</title>
-
-  <variablelist role="materials">
-
-    <varlistentry>
-      <term>Aboot Patch - <token>&aboot-alpha-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&aboot-alpha-patch;"/></para>
-        <para>MD5 sum: <literal>&aboot-alpha-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/patches.xml"
-    xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
-
-    <varlistentry>
-      <term>Glibc PTR_MANGLE Fix Patch - <token>&glibc-alpha_ptr_mangle_fix-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&glibc-alpha_ptr_mangle_fix-patch;"/></para>
-        <para>MD5 sum: <literal>&glibc-alpha_ptr_mangle_fix-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Linux PAGE_SIZE Patch - <token>&linux-alpha_PAGE_SIZE-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&linux-alpha_PAGE_SIZE-patch;"/></para>
-        <para>MD5 sum: <literal>&linux-alpha_PAGE_SIZE-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/patches.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/common/introduction.xml
===================================================================
--- BOOK/materials/common/introduction.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-introduction">
-  <?dbhtml filename="introduction.html"?>
-
-  <title>Introduction</title>
-
-  <para>This chapter includes a list of packages that need to be downloaded
-  for building a basic Linux system. The listed version numbers correspond
-  to versions of the software that are known to work, and this book is based
-  on their use. We highly recommend not using newer versions because the
-  build commands for one version may not work with a newer version. The
-  newest package versions may also have problems that require work-arounds.
-  These work-arounds will be developed and stabilized in the development
-  version of the book.</para>
-
-  <para>Download locations may not always be accessible. If a download
-  location has changed since this book was published, Google (<ulink
-  url="http://www.google.com/"/>) provides a useful search engine for
-  most packages. If this search is unsuccessful, try one of the
-  alternative means of downloading discussed at <ulink
-  url="&packages-root;"/>.</para>
-
-  <para>Create a directory called
-  <filename class="directory">${CLFS}/sources</filename> and use it to store
-  your sources and patches. All packages should be compiled there as well.
-  Using any other location for compiling may have unexpected results.</para>
-
-  <para>To create this directory, execute, as user <systemitem
-  class="username">root</systemitem>, the following command before
-  starting the download session:</para>
-
-<screen><userinput>mkdir -v ${CLFS}/sources</userinput></screen>
-
-  <para>Make this directory writable and sticky. When a directory is
-  marked <quote>sticky</quote>, that means that even if multiple users have
-  write permission on that directory, any file within that directory can only be
-  deleted or modified by its owner. The following command will enable the
-  write and sticky modes:</para>
-
-<screen><userinput>chmod -v a+wt ${CLFS}/sources</userinput></screen>
-
-</sect1>
Index: OK/materials/common/packages.xml
===================================================================
--- BOOK/materials/common/packages.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,525 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-packages-common">
-  <?dbhtml filename="packages.html"?>
-
-  <title>All Packages</title>
-
-  <para>Download or otherwise obtain the following packages:</para>
-
-  <variablelist role="materials">
-
-    <varlistentry>
-      <term>Autoconf (&autoconf-version;) - <token>&autoconf-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&autoconf-home;"/></para>
-        <para>Download: <ulink url="&autoconf-url;"/></para>
-        <para>MD5 sum: <literal>&autoconf-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Automake (&automake-version;) - <token>&automake-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&automake-home;"/></para>
-        <para>Download: <ulink url="&automake-url;"/></para>
-        <para>MD5 sum: <literal>&automake-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Bash (&bash-version;) - <token>&bash-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&bash-home;"/></para>
-        <para>Download: <ulink url="&bash-url;"/></para>
-        <para>MD5 sum: <literal>&bash-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Bash Documentation (&bash-doc-version;) - <token>&bash-doc-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&bash-doc-home;"/></para>
-        <para>Download: <ulink url="&bash-doc-url;"/></para>
-        <para>MD5 sum: <literal>&bash-doc-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Binutils (&binutils-version;) - <token>&binutils-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&binutils-home;"/></para>
-        <para>Download: <ulink url="&binutils-url;"/></para>
-        <para>MD5 sum: <literal>&binutils-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Bison (&bison-version;) - <token>&bison-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&bison-home;"/></para>
-        <para>Download: <ulink url="&bison-url;"/></para>
-        <para>MD5 sum: <literal>&bison-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Bzip2 (&bzip2-version;) - <token>&bzip2-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&bzip2-home;"/></para>
-        <para>Download: <ulink url="&bzip2-url;"/></para>
-        <para>MD5 sum: <literal>&bzip2-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>CLFS-Bootscripts (&clfs-bootscripts-version;) - <token>&clfs-bootscripts-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&clfs-bootscripts-home;"/></para>
-        <para>Download: <ulink url="&clfs-bootscripts-url;"/></para>
-        <para>MD5 sum: <literal>&clfs-bootscripts-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Coreutils (&coreutils-version;) - <token>&coreutils-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&coreutils-home;"/></para>
-        <para>Download: <ulink url="&coreutils-url;"/></para>
-        <para>MD5 sum: <literal>&coreutils-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>DejaGNU (&dejagnu-version;) - <token>&dejagnu-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&dejagnu-home;"/></para>
-        <para>Download: <ulink url="&dejagnu-url;"/></para>
-        <para>MD5 sum: <literal>&dejagnu-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Diffutils (&diffutils-version;) - <token>&diffutils-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&diffutils-home;"/></para>
-        <para>Download: <ulink url="&diffutils-url;"/></para>
-        <para>MD5 sum: <literal>&diffutils-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>E2fsprogs (&e2fsprogs-version;) - <token>&e2fsprogs-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&e2fsprogs-home;"/></para>
-        <para>Download: <ulink url="&e2fsprogs-url;"/></para>
-        <para>MD5 sum: <literal>&e2fsprogs-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Expect (&expect-version;) - <token>&expect-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&expect-home;"/></para>
-        <para>Download: <ulink url="&expect-url;"/></para>
-        <para>MD5 sum: <literal>&expect-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>File (&file-version;) - <token>&file-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&file-home;"/></para>
-        <para>Download: <ulink url="&file-url;"/></para>
-        <para>MD5 sum: <literal>&file-md5;</literal></para>
-
-        <note>
-          <para>File (&file-version;) may no longer be available at the
-          listed location. The site administrators of the master download
-          location occasionally remove older versions when new ones are
-          released. An alternative download location that may have the
-          correct version available is <ulink
-          url="&packages-root;"/>.</para>
-        </note>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Findutils (&findutils-version;) - <token>&findutils-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&findutils-home;"/></para>
-        <para>Download: <ulink url="&findutils-url;"/></para>
-        <para>MD5 sum: <literal>&findutils-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Flex (&flex-version;) - <token>&flex-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&flex-home;"/></para>
-        <para>Download: <ulink url="&flex-url;"/></para>
-        <para>MD5 sum: <literal>&flex-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Gawk (&gawk-version;) - <token>&gawk-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&gawk-home;"/></para>
-        <para>Download: <ulink url="&gawk-url;"/></para>
-        <para>MD5 sum: <literal>&gawk-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>GCC (&gcc-version;) - <token>&gcc-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&gcc-home;"/></para>
-        <para>Download: <ulink url="&gcc-url;"/></para>
-        <para>MD5 sum: <literal>&gcc-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Gettext (&gettext-version;) - <token>&gettext-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&gettext-home;"/></para>
-        <para>Download: <ulink url="&gettext-url;"/></para>
-        <para>MD5 sum: <literal>&gettext-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Glibc (&glibc-version;) - <token>&glibc-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&glibc-home;"/></para>
-        <para>Download: <ulink url="&glibc-url;"/></para>
-        <para>MD5 sum: <literal>&glibc-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Grep (&grep-version;) - <token>&grep-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&grep-home;"/></para>
-        <para>Download: <ulink url="&grep-url;"/></para>
-        <para>MD5 sum: <literal>&grep-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Groff (&groff-version;) - <token>&groff-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&groff-home;"/></para>
-        <para>Download: <ulink url="&groff-url;"/></para>
-        <para>MD5 sum: <literal>&groff-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Gzip (&gzip-version;) - <token>&gzip-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&gzip-home;"/></para>
-        <para>Download: <ulink url="&gzip-url;"/></para>
-        <para>MD5 sum: <literal>&gzip-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Iana-Etc (&iana-etc-version;) - <token>&iana-etc-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&iana-etc-home;"/></para>
-        <para>Download: <ulink url="&iana-etc-url;"/></para>
-        <para>MD5 sum: <literal>&iana-etc-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Inetutils (&inetutils-version;) - <token>&inetutils-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&inetutils-home;"/></para>
-        <para>Download: <ulink url="&inetutils-url;"/></para>
-        <para>MD5 sum: <literal>&inetutils-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>IPRoute2 (&iproute2-version;) - <token>&iproute2-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&iproute2-home;"/></para>
-        <para>Download: <ulink url="&iproute2-url;"/></para>
-        <para>MD5 sum: <literal>&iproute2-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Kbd (&kbd-version;) - <token>&kbd-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&kbd-home;"/></para>
-        <para>Download: <ulink url="&kbd-url;"/></para>
-        <para>MD5 sum: <literal>&kbd-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Less (&less-version;) - <token>&less-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&less-home;"/></para>
-        <para>Download: <ulink url="&less-url;"/></para>
-        <para>MD5 sum: <literal>&less-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Libtool (&libtool-version;) - <token>&libtool-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&libtool-home;"/></para>
-        <para>Download: <ulink url="&libtool-url;"/></para>
-        <para>MD5 sum: <literal>&libtool-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Linux (&linux-version;) - <token>&linux-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&linux-home;"/></para>
-        <para>Download: <ulink url="&linux-url;"/></para>
-        <para>MD5 sum: <literal>&linux-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>M4 (&m4-version;) - <token>&m4-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&m4-home;"/></para>
-        <para>Download: <ulink url="&m4-url;"/></para>
-        <para>MD5 sum: <literal>&m4-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Make (&make-version;) - <token>&make-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&make-home;"/></para>
-        <para>Download: <ulink url="&make-url;"/></para>
-        <para>MD5 sum: <literal>&make-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Man (&man-version;) - <token>&man-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&man-home;"/></para>
-        <para>Download: <ulink url="&man-url;"/></para>
-        <para>MD5 sum: <literal>&man-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Man-pages (&man-pages-version;) - <token>&man-pages-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&man-pages-home;"/></para>
-        <para>Download: <ulink url="&man-pages-url;"/></para>
-        <para>MD5 sum: <literal>&man-pages-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Mktemp (&mktemp-version;) - <token>&mktemp-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&mktemp-home;"/></para>
-        <para>Download: <ulink url="&mktemp-url;"/></para>
-        <para>MD5 sum: <literal>&mktemp-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Module-Init-Tools (&module-init-tools-version;) - <token>&module-init-tools-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&module-init-tools-home;"/></para>
-        <para>Download: <ulink url="&module-init-tools-url;"/></para>
-        <para>MD5 sum: <literal>&module-init-tools-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Ncurses (&ncurses-version;) - <token>&ncurses-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&ncurses-home;"/></para>
-        <para>Download: <ulink url="&ncurses-url;"/></para>
-        <para>MD5 sum: <literal>&ncurses-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Patch (&patch-version;) - <token>&patch-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&patch-home;"/></para>
-        <para>Download: <ulink url="&patch-url;"/></para>
-        <para>MD5 sum: <literal>&patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Perl (&perl-version;) - <token>&perl-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&perl-home;"/></para>
-        <para>Download: <ulink url="&perl-url;"/></para>
-        <para>MD5 sum: <literal>&perl-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Procps (&procps-version;) - <token>&procps-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&procps-home;"/></para>
-        <para>Download: <ulink url="&procps-url;"/></para>
-        <para>MD5 sum: <literal>&procps-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Psmisc (&psmisc-version;) - <token>&psmisc-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&psmisc-home;"/></para>
-        <para>Download: <ulink url="&psmisc-url;"/></para>
-        <para>MD5 sum: <literal>&psmisc-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Readline (&readline-version;) - <token>&readline-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&readline-home;"/></para>
-        <para>Download: <ulink url="&readline-url;"/></para>
-        <para>MD5 sum: <literal>&readline-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Sed (&sed-version;) - <token>&sed-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&sed-home;"/></para>
-        <para>Download: <ulink url="&sed-url;"/></para>
-        <para>MD5 sum: <literal>&sed-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Shadow (&shadow-version;) - <token>&shadow-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&shadow-home;"/></para>
-        <para>Download: <ulink url="&shadow-url;"/></para>
-        <para>MD5 sum: <literal>&shadow-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Sysklogd (&sysklogd-version;) - <token>&sysklogd-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&sysklogd-home;"/></para>
-        <para>Download: <ulink url="&sysklogd-url;"/></para>
-        <para>MD5 sum: <literal>&sysklogd-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Sysvinit (&sysvinit-version;) - <token>&sysvinit-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&sysvinit-home;"/></para>
-        <para>Download: <ulink url="&sysvinit-url;"/></para>
-        <para>MD5 sum: <literal>&sysvinit-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Tar (&tar-version;) - <token>&tar-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&tar-home;"/></para>
-        <para>Download: <ulink url="&tar-url;"/></para>
-        <para>MD5 sum: <literal>&tar-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Tcl (&tcl-version;) - <token>&tcl-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&tcl-home;"/></para>
-        <para>Download: <ulink url="&tcl-url;"/></para>
-        <para>MD5 sum: <literal>&tcl-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Texinfo (&texinfo-version;) - <token>&texinfo-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&texinfo-home;"/></para>
-        <para>Download: <ulink url="&texinfo-url;"/></para>
-        <para>MD5 sum: <literal>&texinfo-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Tree (&tree-version;) - <token>&tree-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&tree-home;"/></para>
-        <para>Download: <ulink url="&tree-url;"/></para>
-        <para>MD5 sum: <literal>&tree-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Udev (&udev-version;) - <token>&udev-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&udev-home;"/></para>
-        <para>Download: <ulink url="&udev-url;"/></para>
-        <para>MD5 sum: <literal>&udev-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Util-linux-ng (&util-linux-ng-version;) - <token>&util-linux-ng-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&util-linux-ng-home;"/></para>
-        <para>Download: <ulink url="&util-linux-ng-url;"/></para>
-        <para>MD5 sum: <literal>&util-linux-ng-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Vim (&vim-version;) - <token>&vim-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&vim-home;"/></para>
-        <para>Download: <ulink url="&vim-url;"/></para>
-        <para>MD5 sum: <literal>&vim-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Vim (&vim-version;) language files (optional) - <token>&vim-language-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&vim-language-home;"/></para>
-        <para>Download: <ulink url="&vim-language-url;"/></para>
-        <para>MD5 sum: <literal>&vim-language-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Zlib (&zlib-version;) - <token>&zlib-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&zlib-home;"/></para>
-        <para>Download: <ulink url="&zlib-url;"/></para>
-        <para>MD5 sum: <literal>&zlib-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <para os="a">Total size of these packages: about <returnvalue/></para>
-
-</sect1>
Index: OK/materials/common/patches.xml
===================================================================
--- BOOK/materials/common/patches.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,276 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-patches-common">
-  <?dbhtml filename="patches.html"?>
-
-  <title>Needed Patches</title>
-
-  <para>In addition to the packages, several patches are also required.
-  These patches correct any mistakes in the packages that should be
-  fixed by the maintainer. The patches also make small modifications to
-  make the packages easier to work with. The following patches will be
-  needed to build a CLFS system:</para>
-
-  <variablelist role="materials">
-
-    <varlistentry>
-      <term>Bash Fixes - <token>&bash-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&bash-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&bash-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Binutils Branch Update Patch - <token>&binutils-branch_update-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&binutils-branch_update-patch;"/></para>
-        <para>MD5 sum: <literal>&binutils-branch_update-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Binutils Posix Patch - <token>&binutils-posix-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&binutils-posix-patch;"/></para>
-        <para>MD5 sum: <literal>&binutils-posix-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Coreutils Suppress Uptime, Kill, Su Patch - <token>&coreutils-suppress-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&coreutils-suppress-patch;"/></para>
-        <para>MD5 sum: <literal>&coreutils-suppress-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Coreutils Uname Patch - <token>&coreutils-uname-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&coreutils-uname-patch;"/></para>
-        <para>MD5 sum: <literal>&coreutils-uname-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Expect Spawn Patch - <token>&expect-spawn-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&expect-spawn-patch;"/></para>
-        <para>MD5 sum: <literal>&expect-spawn-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-<!--
-    <varlistentry>
-      <term>GCC Branch Update Patch - <token>&gcc-branch_update-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&gcc-branch_update-patch;"/></para>
-        <para>MD5 sum: <literal>&gcc-branch_update-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
--->
-
-    <varlistentry>
-      <term>GCC Cross Search Paths Patch - <token>&gcc-cross_search-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&gcc-cross_search-patch;"/></para>
-        <para>MD5 sum: <literal>&gcc-cross_search-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>GCC Posix Patch - <token>&gcc-posix-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&gcc-posix-patch;"/></para>
-        <para>MD5 sum: <literal>&gcc-posix-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>GCC PR31490 Patch - <token>&gcc-PR31490-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-	url="&patches-root;&gcc-PR31490-patch;"/></para>
-	<para>MD5 sum: <literal>&gcc-PR31490-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Glibc Branch Update Patch - <token>&glibc-branch_update-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&glibc-branch_update-patch;"/></para>
-        <para>MD5 sum: <literal>&glibc-branch_update-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Glibc Disable linking with libgcc_eh.a - <token>&glibc-libgcc_eh-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&glibc-libgcc_eh-patch;"/></para>
-        <para>MD5 sum: <literal>&glibc-libgcc_eh-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Glibc Localedef Segfault - <token>&glibc-localedef_segfault-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&glibc-localedef_segfault-patch;"/></para>
-        <para>MD5 sum: <literal>&glibc-localedef_segfault-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Inetutils No-Server-Man-Pages Patch - <token>&inetutils-man_pages-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&inetutils-man_pages-patch;"/></para>
-        <para>MD5 sum: <literal>&inetutils-man_pages-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Linux Security Fixes Patch - <token>&linux-security-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&linux-security-patch;"/></para>
-        <para>MD5 sum: <literal>&linux-security-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Mktemp Tempfile Patch - <token>&mktemp-tempfile-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&mktemp-tempfile-patch;"/></para>
-        <para>MD5 sum: <literal>&mktemp-tempfile-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Module-Init-Tools Manpages Patch - <token>&module-init-tools-manpages-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&module-init-tools-manpages-patch;"/></para>
-        <para>MD5 sum: <literal>&module-init-tools-manpages-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Ncurses Bash Patch - <token>&ncurses-bashfix-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&ncurses-bashfix-patch;"/></para>
-        <para>MD5 sum: <literal>&ncurses-bashfix-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Ncurses Branch Update Patch - <token>&ncurses-branch_update-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&ncurses-branch_update-patch;"/></para>
-        <para>MD5 sum: <literal>&ncurses-branch_update-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Perl GCC 4.2.x Fix Patch - <token>&perl-gcc42_fix-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&perl-gcc42_fix-patch;"/></para>
-        <para>MD5 sum: <literal>&perl-gcc42_fix-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Perl Libc Patch - <token>&perl-libc-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&perl-libc-patch;"/></para>
-        <para>MD5 sum: <literal>&perl-libc-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Perl No page.h Patch - <token>&perl-no_page_h-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&perl-no_page_h-patch;"/></para>
-        <para>MD5 sum: <literal>&perl-no_page_h-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Perl Security Fixes Patch - <token>&perl-security-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&perl-security-patch;"/></para>
-        <para>MD5 sum: <literal>&perl-security-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Readline Fixes - <token>&readline-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&readline-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&readline-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-       <term>Texinfo mbstate Fix Patch - <token>&texinfo-mbstate_fix-patch-size;</token>:</term>
-       <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&texinfo-mbstate_fix-patch;"/></para>
-        <para>MD5 sum: <literal>&texinfo-mbstate_fix-patch-md5;</literal></para>
-       </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Vim Branch Update Patch - <token>&vim-branch_update-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&vim-branch_update-patch;"/></para>
-        <para>MD5 sum: <literal>&vim-branch_update-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Zlib fPIC Patch - <token>&zlib-fpic-patch-size;</token>:</term> <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&zlib-fpic-patch;"/></para>
-        <para>MD5 sum: <literal>&zlib-fpic-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <para os="a">Total size of these patches: about <returnvalue/></para>
-
-  <para>In addition to the above required patches, there exist a number of
-  optional patches created by the CLFS community. These optional patches
-  solve minor problems or enable functionality that is not enabled by
-  default. Feel free to peruse the patches database located at
-  <ulink url="&patches-root;"/> and acquire any additional
-  patches to suit the system needs.</para>
-
-</sect1>
Index: OK/materials/mips-chapter.xml
===================================================================
--- BOOK/materials/mips-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-getting-materials" xreflabel="Packages and Patches">
-  <?dbhtml dir="materials"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Packages and Patches</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patches.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/patches.xml"/>
-
-</chapter>
Index: OK/materials/mips/packages.xml
===================================================================
--- BOOK/materials/mips/packages.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,57 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-packages-mips">
-  <?dbhtml filename="packages-mips.html"?>
-
-  <title>Additional Packages for MIPS</title>
-
-  <variablelist role="materials">
-
-    <varlistentry os="arcload">
-      <term>ARCLoad (&arcload-version;) - <token>&arcload-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&arcload-home;"/></para>
-        <para>Download: <ulink url="&arcload-url;"/></para>
-        <para>MD5 sum: <literal>&arcload-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="colo">
-      <term>Colo (&colo-version;) - <token>&colo-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&colo-home;"/></para>
-        <para>Download: <ulink url="&colo-url;"/></para>
-        <para>MD5 sum: <literal>&colo-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="dvhtool">
-      <term>DVHtool (&dvhtool-version;) - <token>&dvhtool-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&dvhtool-home;"/></para>
-        <para>Download: <ulink url="&dvhtool-url;"/></para>
-        <para>MD5 sum: <literal>&dvhtool-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="glibcports">
-      <term>Glibc Ports (&glibc-ports-version;) - <token>&glibc-ports-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&glibc-ports-home;"/></para>
-        <para>Download: <ulink url="&glibc-ports-url;"/></para>
-        <para>MD5 sum: <literal>&glibc-ports-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/packages.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/mips/patches.xml
===================================================================
--- BOOK/materials/mips/patches.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,60 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-patches-mips">
-  <?dbhtml filename="patches-mips.html"?>
-
-  <title>Additional Patches for MIPS</title>
-
-  <variablelist role="materials">
-
-    <varlistentry os="colo-relocation-patch">
-      <term>Colo Relocation Patch - <token>&colo-relocation-patch-size;</token>:</term> <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&colo-relocation-patch;"/></para>
-        <para>MD5 sum: <literal>&colo-relocation-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="dvhtool-fixes-patch">
-      <term>Dvhtool Fixes - <token>&dvhtool-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&dvhtool-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&dvhtool-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="expect-config_update-patch">
-      <term>Expect Config Update Patch - <token>&expect-config_update-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&expect-config_update-patch;"/></para>
-        <para>MD5 sum: <literal>&expect-config_update-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/patches.xml"
-    xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
-
-    <varlistentry os="mktemp-update-patch">
-      <term>Mktemp Config Update Patch - <token>&mktemp-update-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&mktemp-update-patch;"/></para>
-        <para>MD5 sum: <literal>&mktemp-update-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/patches.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/mips64-64-chapter.xml
===================================================================
--- BOOK/materials/mips64-64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-getting-materials" xreflabel="Packages and Patches">
-  <?dbhtml dir="materials"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Packages and Patches</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patches.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/patches.xml"/>
-
-</chapter>
Index: OK/materials/mips64-64/packages.xml
===================================================================
--- BOOK/materials/mips64-64/packages.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-packages-mips64">
-  <?dbhtml filename="packages-mips64.html"?>
-
-  <title>Additional Packages for MIPS 64 Bit</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/packages.xml"
-  xpointer="xpointer(//*[@role='materials'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/packages.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/mips64-64/patches.xml
===================================================================
--- BOOK/materials/mips64-64/patches.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-patches-mips64">
-  <?dbhtml filename="patches-mips64.html"?>
-
-  <title>Additional Patches for MIPS 64 Bit</title>
-
-  <variablelist role="materials">
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips64/patches.xml"
-    xpointer="xpointer(//*[@os='colo-mips-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='dvhtool-fixes-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='expect-config_update-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/patches.xml"
-    xpointer="xpointer(//*[@os='gcc-pure64-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/patches.xml"
-    xpointer="xpointer(//*[@os='gcc-specs_pure64-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='mktemp-update-patch'])"/>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/patches.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/mips64-chapter.xml
===================================================================
--- BOOK/materials/mips64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-getting-materials" xreflabel="Packages and Patches">
-  <?dbhtml dir="materials"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Packages and Patches</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patches.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/patches.xml"/>
-
-</chapter>
Index: OK/materials/mips64/packages.xml
===================================================================
--- BOOK/materials/mips64/packages.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-packages-mips64">
-  <?dbhtml filename="packages-mips64.html"?>
-
-  <title>Additional Packages for MIPS 64 Bit Multilib</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../mips/packages.xml"
-  xpointer="xpointer(//*[@role='materials'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/packages.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/mips64/patches.xml
===================================================================
--- BOOK/materials/mips64/patches.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,65 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-patches-mips64">
-  <?dbhtml filename="patches-mips64.html"?>
-
-  <title>Additional Patches for MIPS 64 Bit Multilib</title>
-
-  <variablelist role="materials">
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/patches.xml"
-    xpointer="xpointer(//*[@os='binutils-multilib-patch'])"/>
-
-    <varlistentry os="colo-mips-patch">
-      <term>Colo Make Patch - <token>&colo-make-patch-size;</token>:</term> <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&colo-make-patch;"/></para>
-        <para>MD5 sum: <literal>&colo-make-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='colo-relocation-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='dvhtool-fixes-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='expect-config_update-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/patches.xml"
-    xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/patches.xml"
-    xpointer="xpointer(//*[@os='iproute2-libdir-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='mktemp-update-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/patches.xml"
-    xpointer="xpointer(//*[@os='perl-multilib-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/patches.xml"
-    xpointer="xpointer(//*[@os='udev-lib64-patch'])"/>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/patches.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/ppc-chapter.xml
===================================================================
--- BOOK/materials/ppc-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-getting-materials" xreflabel="Packages and Patches">
-  <?dbhtml dir="materials"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Packages and Patches</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patches.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/patches.xml"/>
-
-</chapter>
Index: OK/materials/ppc/packages.xml
===================================================================
--- BOOK/materials/ppc/packages.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,57 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-packages-ppc">
-  <?dbhtml filename="packages-ppc.html"?>
-
-  <title>Additional Packages for PowerPC</title>
-
-  <variablelist role="materials">
-
-    <varlistentry>
-      <term>Hfsutils (&hfsutils-version;) - <token>&hfsutils-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&hfsutils-home;"/></para>
-        <para>Download: <ulink url="&hfsutils-url;"/></para>
-        <para>MD5 sum: <literal>&hfsutils-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Parted (&parted-version;) - <token>&parted-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&parted-home;"/></para>
-        <para>Download: <ulink url="&parted-url;"/></para>
-        <para>MD5 sum: <literal>&parted-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Powerpc-utils (&powerpcutils-version;) - <token>&powerpcutils-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&powerpcutils-home;"/></para>
-        <para>Download: <ulink url="&powerpcutils-url;"/></para>
-        <para>MD5 sum: <literal>&powerpcutils-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Yaboot (&yaboot-version;) - <token>&yaboot-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&yaboot-home;"/></para>
-        <para>Download: <ulink url="&yaboot-url;"/></para>
-        <para>MD5 sum: <literal>&yaboot-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/packages.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/ppc/patches.xml
===================================================================
--- BOOK/materials/ppc/patches.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,61 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-patches-ppc">
-  <?dbhtml filename="patches-ppc.html"?>
-
-  <title>Additional Patches for PowerPC</title>
-
-  <variablelist role="materials">
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/patches.xml"
-    xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
-
-    <varlistentry>
-      <term>Powerpc-utils Fixes Patch - <token>&powerpcutils-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&powerpcutils-patch;"/></para>
-        <para>MD5 sum: <literal>&powerpcutils-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="yaboot-fix-patch">
-      <term>Yaboot Fixes Patch - <token>&yaboot-fix-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&yaboot-fix-patch;"/></para>
-        <para>MD5 sum: <literal>&yaboot-fix-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="yaboot-ofpath_path-patch">
-      <term>Yaboot Ofpath_Path_Prefix Patch - <token>&yaboot-ofpath_path-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&yaboot-ofpath_path-patch;"/></para>
-        <para>MD5 sum: <literal>&yaboot-ofpath_path-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="yaboot-sata-patch">
-      <term>Yaboot SATA Patch - <token>&yaboot-sata-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&yaboot-sata-patch;"/></para>
-        <para>MD5 sum: <literal>&yaboot-sata-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/patches.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/ppc64-chapter.xml
===================================================================
--- BOOK/materials/ppc64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-getting-materials" xreflabel="Packages and Patches">
-  <?dbhtml dir="materials"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Packages and Patches</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patches.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/patches.xml"/>
-
-</chapter>
Index: OK/materials/ppc64/packages.xml
===================================================================
--- BOOK/materials/ppc64/packages.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-packages-ppc64">
-  <?dbhtml filename="packages-ppc64.html"?>
-
-  <title>Additional Packages for PowerPC64</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../ppc/packages.xml"
-  xpointer="xpointer(//*[@role='materials'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/packages.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/ppc64/patches.xml
===================================================================
--- BOOK/materials/ppc64/patches.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,85 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-patches-ppc64">
-  <?dbhtml filename="patches-ppc64.html"?>
-
-  <title>Additional Patches for PowerPC64</title>
-
-  <variablelist role="materials">
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/patches.xml"
-    xpointer="xpointer(//*[@os='binutils-multilib-patch'])"/>
-
-    <varlistentry>
-      <term>Binutils PPC64 Fix Testsuite Patch - <token>&binutils-ppc64-vistest-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&binutils-ppc64-vistest-patch;"/></para>
-        <para>MD5 sum: <literal>&binutils-ppc64-vistest-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>GCC PPC64 Multilib Patch - <token>&gcc-nof-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-	url="&patches-root;&gcc-nof-patch;"/></para>
-	<para>MD5 sum: <literal>&gcc-nof-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/patches.xml"
-    xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/patches.xml"
-    xpointer="xpointer(//*[@os='mktemp-update-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/patches.xml"
-    xpointer="xpointer(//*[@os='iproute2-libdir-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/patches.xml"
-    xpointer="xpointer(//*[@os='perl-multilib-patch'])"/>
-
-    <varlistentry>
-      <term>Powerpc-utils Fixes Patch - <token>&powerpcutils-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&powerpcutils-patch;"/></para>
-        <para>MD5 sum: <literal>&powerpcutils-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/patches.xml"
-    xpointer="xpointer(//*[@os='udev-lib64-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/patches.xml"
-    xpointer="xpointer(//*[@os='yaboot-fix-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/patches.xml"
-    xpointer="xpointer(//*[@os='yaboot-ofpath_path-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../ppc/patches.xml"
-    xpointer="xpointer(//*[@os='yaboot-sata-patch'])"/>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/patches.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
-
Index: OK/materials/sparc-chapter.xml
===================================================================
--- BOOK/materials/sparc-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-getting-materials" xreflabel="Packages and Patches">
-  <?dbhtml dir="materials"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Packages and Patches</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patches.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/patches.xml"/>
-
-</chapter>
Index: OK/materials/sparc/packages.xml
===================================================================
--- BOOK/materials/sparc/packages.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,39 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-packages-sparc">
-  <?dbhtml filename="packages-sparc.html"?>
-
-  <title>Additional Packages for Sparc</title>
-
-  <variablelist role="materials">
-
-    <varlistentry os="elftoaout">
-      <term>ELFtoaout (&elftoaout-version;) - <token>&elftoaout-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&elftoaout-home;"/></para>
-        <para>Download: <ulink url="&elftoaout-url;"/></para>
-        <para>MD5 sum: <literal>&elftoaout-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="silo">
-      <term>Silo (&silo-version;) - <token>&silo-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&silo-home;"/></para>
-        <para>Download: <ulink url="&silo-url;"/></para>
-        <para>MD5 sum: <literal>&silo-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/packages.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/sparc/patches.xml
===================================================================
--- BOOK/materials/sparc/patches.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,43 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-patches-sparc">
-  <?dbhtml filename="patches-sparc.html"?>
-
-  <title>Additional Patches for Sparc</title>
-
-  <variablelist role="materials">
-
-    <varlistentry os="elftoaout-fixes-patch">
-      <term>Elftoaout Fixes Patch - <token>&elftoaout-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&elftoaout-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&elftoaout-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/patches.xml"
-    xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
-
-    <varlistentry os="silo-fixes-patch">
-      <term>Silo Fixes Patch - <token>&silo-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&silo-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&silo-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/patches.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/sparc64-64-chapter.xml
===================================================================
--- BOOK/materials/sparc64-64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-getting-materials" xreflabel="Packages and Patches">
-  <?dbhtml dir="materials"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Packages and Patches</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patches.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/patches.xml"/>
-
-</chapter>
Index: OK/materials/sparc64-64/packages.xml
===================================================================
--- BOOK/materials/sparc64-64/packages.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-packages-sparc64">
-  <?dbhtml filename="packages-sparc64.html"?>
-
-  <title>Additional Packages for Sparc64</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/packages.xml"
-  xpointer="xpointer(//*[@role='materials'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/packages.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/sparc64-64/patches.xml
===================================================================
--- BOOK/materials/sparc64-64/patches.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,45 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-patches-sparc64">
-  <?dbhtml filename="patches-sparc64.html"?>
-
-  <title>Additional Patches for Sparc64</title>
-
-  <variablelist role="materials">
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/patches.xml"
-    xpointer="xpointer(//*[@os='elftoaout-fixes-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/patches.xml"
-    xpointer="xpointer(//*[@os='gcc-pure64-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/patches.xml"
-    xpointer="xpointer(//*[@os='gcc-specs_pure64-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc64/patches.xml"
-    xpointer="xpointer(//*[@os='inetutils-memcpy_sparc64-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc64/patches.xml"
-    xpointer="xpointer(//*[@os='linux-elf-spitfire-fix-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/patches.xml"
-    xpointer="xpointer(//*[@os='silo-fixes-patch'])"/>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/patches.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/sparc64-chapter.xml
===================================================================
--- BOOK/materials/sparc64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-getting-materials" xreflabel="Packages and Patches">
-  <?dbhtml dir="materials"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Packages and Patches</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patches.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/patches.xml"/>
-
-</chapter>
Index: OK/materials/sparc64/packages.xml
===================================================================
--- BOOK/materials/sparc64/packages.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-packages-sparc64">
-  <?dbhtml filename="packages-sparc64.html"?>
-
-  <title>Additional Packages for Sparc64 Multilib</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../sparc/packages.xml"
-  xpointer="xpointer(//*[@role='materials'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/packages.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/sparc64/patches.xml
===================================================================
--- BOOK/materials/sparc64/patches.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,67 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-patches-sparc64">
-  <?dbhtml filename="patches-sparc64.html"?>
-
-  <title>Additional Patches for Sparc64 Multilib</title>
-
-  <variablelist role="materials">
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/patches.xml"
-    xpointer="xpointer(//*[@os='binutils-multilib-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/patches.xml"
-    xpointer="xpointer(//*[@os='elftoaout-fixes-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/patches.xml"
-    xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
-
-    <varlistentry os="inetutils-memcpy_sparc64-patch">
-      <term>Inetutils Memcpy Sparc64 Patch - <token>&inetutils-memcpy_sparc64-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&inetutils-memcpy_sparc64-patch;"/></para>
-        <para>MD5 sum: <literal>&inetutils-memcpy_sparc64-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="linux-elf-spitfire-fix-patch">
-      <term>Linux Elf Spitfire Fix Patch - <token>&linux-elf_spitfire_fix-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&linux-elf_spitfire_fix-patch;"/></para>
-        <para>MD5 sum: <literal>&linux-elf_spitfire_fix-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/patches.xml"
-    xpointer="xpointer(//*[@os='iproute2-libdir-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/patches.xml"
-    xpointer="xpointer(//*[@os='perl-multilib-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc/patches.xml"
-    xpointer="xpointer(//*[@os='silo-fixes-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/patches.xml"
-    xpointer="xpointer(//*[@os='udev-lib64-patch'])"/>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/patches.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/x86-chapter.xml
===================================================================
--- BOOK/materials/x86-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-getting-materials" xreflabel="Packages and Patches">
-  <?dbhtml dir="materials"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Packages and Patches</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patches.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/patches.xml"/>
-
-</chapter>
Index: OK/materials/x86/packages.xml
===================================================================
--- BOOK/materials/x86/packages.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,30 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-packages-x86">
-  <?dbhtml filename="packages-x86.html"?>
-
-  <title>Additional Packages for x86</title>
-
-  <variablelist role="materials">
-
-    <varlistentry os="grub">
-      <term>GRUB (&grub-version;) - <token>&grub-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&grub-home;"/></para>
-        <para>Download: <ulink url="&grub-url;"/></para>
-        <para>MD5 sum: <literal>&grub-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/packages.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/x86/patches.xml
===================================================================
--- BOOK/materials/x86/patches.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,57 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-patches-x86">
-  <?dbhtml filename="patches-x86.html"?>
-
-  <title>Additional Patches for x86</title>
-
-  <variablelist role="materials">
-
-    <varlistentry os="gcc-specs-patch">
-      <term>GCC Specs Patch - <token>&gcc-specs-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&gcc-specs-patch;"/></para>
-        <para>MD5 sum: <literal>&gcc-specs-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="glibc-i586_chk-patch">
-      <term>Glibc i586 memcpy, mempcpy, memset Patch - <token>&glibc-i586_chk-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&glibc-i586_chk-patch;"/></para>
-        <para>MD5 sum: <literal>&glibc-i586_chk-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="grub-256byte_inode-patch">
-      <term>Grub 256-Byte Inode Patch - <token>&grub-256byte_inode-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&grub-256byte_inode-patch;"/></para>
-        <para>MD5 sum: <literal>&grub-256byte_inode-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="grub-fixes-patch">
-      <term>Grub Various Fixes - <token>&grub-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&grub-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&grub-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/patches.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/x86_64-64-chapter.xml
===================================================================
--- BOOK/materials/x86_64-64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-getting-materials" xreflabel="Packages and Patches">
-  <?dbhtml dir="materials"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Packages and Patches</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patches.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/patches.xml"/>
-
-</chapter>
Index: OK/materials/x86_64-64/packages.xml
===================================================================
--- BOOK/materials/x86_64-64/packages.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,39 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-packages-x86_64">
-  <?dbhtml filename="packages-x86_64.html"?>
-
-  <title>Additional Packages for x86_64</title>
-
-  <variablelist role="materials">
-
-    <varlistentry>
-      <term>Bin86 (&bin86-version;) - <token>&bin86-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&bin86-home;"/></para>
-        <para>Download: <ulink url="&bin86-url;"/></para>
-        <para>MD5 sum: <literal>&bin86-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Lilo (&lilo-version;) - <token>&lilo-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&lilo-home;"/></para>
-        <para>Download: <ulink url="&lilo-url;"/></para>
-        <para>MD5 sum: <literal>&lilo-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/packages.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/x86_64-64/patches.xml
===================================================================
--- BOOK/materials/x86_64-64/patches.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,57 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-patches-x86_64">
-  <?dbhtml filename="patches-x86_64.html"?>
-
-  <title>Additional Patches for x86_64</title>
-
-  <variablelist role="materials">
-
-    <varlistentry os="bin86 x86_64-patch">
-      <term>Bin86 x86_64 Patch - <token>&bin86-x86_64-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&bin86-x86_64-patch;"/></para>
-        <para>MD5 sum: <literal>&bin86-x86_64-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="gcc-pure64-patch">
-      <term>GCC Pure 64 Patch - <token>&gcc-pure64-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&gcc-pure64-patch;"/></para>
-        <para>MD5 sum: <literal>&gcc-pure64-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="gcc-specs_pure64-patch">
-      <term>GCC Specs Patch - <token>&gcc-specs_pure64-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&gcc-specs_pure64-patch;"/></para>
-        <para>MD5 sum: <literal>&gcc-specs_pure64-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="lilo-cross-x86_64-patch">
-      <term>Lilo x86_64 Cross Compile Patch - <token>&lilo-cross-x86_64-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&lilo-cross-x86_64-patch;"/></para>
-        <para>MD5 sum: <literal>&lilo-cross-x86_64-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/patches.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/x86_64-chapter.xml
===================================================================
--- BOOK/materials/x86_64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-getting-materials" xreflabel="Packages and Patches">
-  <?dbhtml dir="materials"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Packages and Patches</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/packages.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patches.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/patches.xml"/>
-
-</chapter>
Index: OK/materials/x86_64/packages.xml
===================================================================
--- BOOK/materials/x86_64/packages.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-packages-x86_64">
-  <?dbhtml filename="packages-x86_64.html"?>
-
-  <title>Additional Packages for x86_64 Multilib</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/packages.xml"
-  xpointer="xpointer(//*[@role='materials'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/packages.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/materials/x86_64/patches.xml
===================================================================
--- BOOK/materials/x86_64/patches.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,78 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-materials-patches-x86_64">
-  <?dbhtml filename="patches-x86_64.html"?>
-
-  <title>Additional Patches for x86_64 Multilib</title>
-
-  <variablelist role="materials">
-
-    <varlistentry os="binutils-multilib-patch">
-      <term>Binutils Multilib Patch - <token>&binutils-multilib-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&binutils-multilib-patch;"/></para>
-        <para>MD5 sum: <literal>&binutils-multilib-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/patches.xml"
-    xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/patches.xml"
-    xpointer="xpointer(//*[@os='grub-256byte_inode-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86/patches.xml"
-    xpointer="xpointer(//*[@os='grub-fixes-patch'])"/>
-
-    <varlistentry os="grub-use_mmap-patch">
-      <term>Grub Use MMAP Patch - <token>&grub-use_mmap-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&grub-use_mmap-patch;"/></para>
-        <para>MD5 sum: <literal>&grub-use_mmap-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="iproute2-libdir-patch">
-      <term>IPRoute2 Lib64 Patch - <token>&iproute2-libdir-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&iproute2-libdir-patch;"/></para>
-        <para>MD5 sum: <literal>&iproute2-libdir-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="perl-multilib-patch">
-      <term>Perl Configure Multilib Patch - <token>&perl-multilib-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&perl-multilib-patch;"/></para>
-        <para>MD5 sum: <literal>&perl-multilib-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry os="udev-lib64-patch">
-      <term>Udev Lib64 Patch - <token>&udev-lib64-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&udev-lib64-patch;"/></para>
-        <para>MD5 sum: <literal>&udev-lib64-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/patches.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-</sect1>
Index: OK/mips-index.xml
===================================================================
--- BOOK/mips-index.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,82 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "general.ent">
-  %general-entities;
-]>
-<book>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/mips/bookinfo.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/dedication.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/preface.xml"/>
-
-  <part id="part1">
-    <?dbhtml filename="part1.html"?>
-
-    <title>Introduction</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="introduction/mips-chapter.xml"/>
-
-  </part>
-
-  <part id="part2">
-    <?dbhtml filename="part2.html"?>
-
-    <title>Preparing for the Build</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="partitioning/mips-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="materials/mips-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-preps/chapter.xml"/>
-
-  </part>
-
-  <part id="part3">
-    <?dbhtml filename="part3.html"?>
-
-    <title>Make the Cross-Compile Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cross-tools/mips-chapter.xml"/>
-
-  </part>
-
-  <part id="part4">
-    <?dbhtml filename="part4.html"?>
-
-    <title>Building the Basic Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="temp-system/mips-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="boot/mips-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="chroot/mips-chapter.xml"/>
-
-  </part>
-
-  <part id="part5">
-    <?dbhtml filename="part5.html"?>
-
-    <title>Building the CLFS System</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/mips-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/mips-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/mips-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/mips-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>
-
-  </part>
-
-  <part id="part6">
-    <?dbhtml filename="part6.html"?>
-
-    <title>Appendices</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acknowledgments.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/mips.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/license.xml"/>
-
-  </part>
-
-  <index/>
-
-</book>
Index: OK/mips64-64-index.xml
===================================================================
--- BOOK/mips64-64-index.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,82 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "general.ent">
-  %general-entities;
-]>
-<book>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/mips64-64/bookinfo.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/dedication.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/preface.xml"/>
-
-  <part id="part1">
-    <?dbhtml filename="part1.html"?>
-
-    <title>Introduction</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="introduction/mips64-64-chapter.xml"/>
-
-  </part>
-
-  <part id="part2">
-    <?dbhtml filename="part2.html"?>
-
-    <title>Preparing for the Build</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="partitioning/mips-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="materials/mips64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-preps/chapter.xml"/>
-
-  </part>
-
-  <part id="part3">
-    <?dbhtml filename="part3.html"?>
-
-    <title>Make the Cross-Compile Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cross-tools/mips64-64-chapter.xml"/>
-
-  </part>
-
-  <part id="part4">
-    <?dbhtml filename="part4.html"?>
-
-    <title>Building the Basic Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="temp-system/mips64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="boot/mips64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="chroot/mips64-64-chapter.xml"/>
-
-  </part>
-
-  <part id="part5">
-    <?dbhtml filename="part5.html"?>
-
-    <title>Building the CLFS System</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/mips64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/mips64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/mips64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/mips64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>
-
-  </part>
-
-  <part id="part6">
-    <?dbhtml filename="part6.html"?>
-
-    <title>Appendices</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acknowledgments.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/mips.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/license.xml"/>
-
-  </part>
-
-  <index/>
-
-</book>
Index: OK/mips64-index.xml
===================================================================
--- BOOK/mips64-index.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,82 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "general.ent">
-  %general-entities;
-]>
-<book>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/mips64/bookinfo.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/dedication.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/preface.xml"/>
-
-  <part id="part1">
-    <?dbhtml filename="part1.html"?>
-
-    <title>Introduction</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="introduction/mips64-chapter.xml"/>
-
-  </part>
-
-  <part id="part2">
-    <?dbhtml filename="part2.html"?>
-
-    <title>Preparing for the Build</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="partitioning/mips-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="materials/mips64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-preps/chapter.xml"/>
-
-  </part>
-
-  <part id="part3">
-    <?dbhtml filename="part3.html"?>
-
-    <title>Make the Cross-Compile Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cross-tools/mips64-chapter.xml"/>
-
-  </part>
-
-  <part id="part4">
-    <?dbhtml filename="part4.html"?>
-
-    <title>Building the Basic Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="temp-system/mips64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="boot/mips64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="chroot/mips64-chapter.xml"/>
-
-  </part>
-
-  <part id="part5">
-    <?dbhtml filename="part5.html"?>
-
-    <title>Building the CLFS System</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/mips64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/mips64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/mips64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/mips64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>
-
-  </part>
-
-  <part id="part6">
-    <?dbhtml filename="part6.html"?>
-
-    <title>Appendices</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acknowledgments.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/mips.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/license.xml"/>
-
-  </part>
-
-  <index/>
-
-</book>
Index: OK/obfuscate.sh
===================================================================
--- BOOK/obfuscate.sh	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,39 +1,0 @@
-#!/bin/bash
-
-# obfuscate.sh
-# obfuscate email addresses in XML/HTML
-# Script written (and slight perl modification) by Archaic <archaic AT linuxfromscratch D0T org>
-# Modified from "sed -i" to old style "sed -e" by Manuel Canales <manuel AT linuxfromscratch D0T org>
-# to prevent hangs on very long files, like nonckunked books.
-# Original Perl expression by Anderson Lizardo <lizardo AT linuxfromscratch D0T org>
-# Released under the GNU General Public License
-#
-# This script currently only seeks out mailto: addresses. If those same
-# addresses also appear in plaintext, we need to obfuscate those as well.
-#
-# This script was made for a very specific purpose so I was a bit lazy in
-# writing the regex's.
-#
-# Please send comments, enhancements, etc. to the above address
-
-#set -e  # Bail on all errors
-
-# First, ensure that we are given a file to process
-# if [ $# -lt 1 ]; then
-#   echo -e "\nYou must provide an input file."
-#   exit 1
-# fi
-
-# Nothing like a backup plan!
-#cp "$1" "$1".bak
-
-for i in `grep -o '"mailto:.*@.*"' ${1} |sed -e 's|^"mailto:||' -e 's|"$||'`; do
-  link=`echo $i | perl -pe 's/[^\n]/"\\\&#".ord($&)."\;"/ge'`
-  plaintext=`echo $i | sed -e 's|@| AT |' -e 's|\.| D0T |g'`
-  cp ${1}{,.tmp}
-  sed -e "s|mailto:$i|mailto:$link|" \
-      -e "s|$i|$plaintext|" ${1}.tmp > ${1}
-  rm ${1}.tmp
-done
-#rm $FILE.tmp
-#exit 0
Index: OK/packages.ent
===================================================================
--- BOOK/packages.ent	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,438 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!ENTITY packages-root "&clfs-root;files/packages/&generic-version;/">
-<!ENTITY extras-root "&clfs-root;files/extras/">
-
-<!-- Note: For empty *-home entities use " " not "" -->
-
-<!ENTITY aboot-version "0.9b">
-<!ENTITY aboot-size "112 KB">
-<!ENTITY aboot-url "&sourceforge;aboot/aboot-&aboot-version;.tar.bz2">
-<!ENTITY aboot-md5 "5f16edbf4e9d52cd191adc4d4b6a5327">
-<!ENTITY aboot-home "http://sourceforge.net/projects/aboot">
-
-<!ENTITY arcload-version "0.5">
-<!ENTITY arcload-size "47 KB">
-<!ENTITY arcload-url "ftp://ftp.linux-mips.org/pub/linux/mips/people/skylark/arcload-&arcload-version;.tar.bz2">
-<!ENTITY arcload-md5 "b00e1c79074a13c2de97748f56f9bd1f">
-<!ENTITY arcload-home "http://www.linux-mips.org/wiki/ARCLoad">
-
-<!ENTITY autoconf-version "2.61">
-<!ENTITY autoconf-size "1,024 KB">
-<!ENTITY autoconf-url "&gnu;autoconf/autoconf-&autoconf-version;.tar.bz2">
-<!ENTITY autoconf-md5 "36d3fe706ad0950f1be10c46a429efe0">
-<!ENTITY autoconf-home "&gnu-software;autoconf">
-
-<!ENTITY automake-version "1.10.1">
-<!ENTITY automake-version2 "1.10">
-<!ENTITY automake-size "904 KB">
-<!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.bz2">
-<!ENTITY automake-md5 "4510391e6b3edaa4cffb3ced87c9560c">
-<!ENTITY automake-home "&gnu-software;automake">
-
-<!ENTITY bash-version "3.2">
-<!ENTITY bash-size "2,476 KB">
-<!ENTITY bash-url "&gnu;bash/bash-&bash-version;.tar.gz">
-<!ENTITY bash-md5 "00bfa16d58e034e3c2aa27f390390d30">
-<!ENTITY bash-home "&gnu-software;bash">
-
-<!ENTITY bash-doc-version "3.2">
-<!ENTITY bash-doc-size "2,148 KB">
-<!ENTITY bash-doc-url "&gnu;bash/bash-doc-&bash-doc-version;.tar.gz">
-<!ENTITY bash-doc-md5 "0e904cb46ca873fcfa65df19b024bec9">
-<!ENTITY bash-doc-home " ">
-
-<!ENTITY bin86-version "0.16.17">
-<!ENTITY bin86-size "149 KB">
-<!ENTITY bin86-url "http://homepage.ntlworld.com/robert.debath/dev86/bin86-&bin86-version;.tar.gz">
-<!ENTITY bin86-md5 "c9e8d72dd2e7457b52d0e3164fc199a1">
-<!ENTITY bin86-home "http://homepage.ntlworld.com/robert.debath">
-
-<!ENTITY binutils-version "2.18">
-<!ENTITY binutils-size "14,671 KB">
-<!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.bz2">
-<!ENTITY binutils-md5 "9d22ee4dafa3a194457caf4706f9cf01">
-<!ENTITY binutils-home "http://sources.redhat.com/binutils">
-
-<!ENTITY bison-version "2.3">
-<!ENTITY bison-size "1,060 KB">
-<!ENTITY bison-url "&gnu;bison/bison-&bison-version;.tar.bz2">
-<!ENTITY bison-md5 "c18640c6ec31a169d351e3117ecce3ec">
-<!ENTITY bison-home "&gnu-software;bison">
-
-<!ENTITY bzip2-version "1.0.4">
-<!ENTITY bzip2-size "828 KB">
-<!ENTITY bzip2-url "http://www.bzip.org/&bzip2-version;/bzip2-&bzip2-version;.tar.gz">
-<!ENTITY bzip2-md5 "fc310b254f6ba5fbb5da018f04533688">
-<!ENTITY bzip2-home "http://www.bzip.org/">
-
-<!ENTITY clfs-bootscripts-version "1.1.0">
-<!ENTITY clfs-bootscripts-size "40 KB">
-<!ENTITY clfs-bootscripts-url "&packages-root;bootscripts-cross-lfs-&clfs-bootscripts-version;.tar.bz2">
-<!ENTITY clfs-bootscripts-md5 "1e6fcdfcc25cee2b53091a2d9f07e464">
-<!ENTITY clfs-bootscripts-home " ">
-
-<!ENTITY colo-version "1.22">
-<!ENTITY colo-size "253 KB">
-<!ENTITY colo-url "http://www.colonel-panic.org/cobalt-mips/colo/colo-&colo-version;.tar.gz">
-<!ENTITY colo-md5 "52c16ad31f3b88f710f0fdb5abed0457">
-<!ENTITY colo-home "http://www.linux-mips.org/wiki/CoLo">
-
-<!ENTITY coreutils-version "6.9">
-<!ENTITY coreutils-size "5,272 KB">
-<!ENTITY coreutils-url "&gnu;coreutils/coreutils-&coreutils-version;.tar.bz2">
-<!ENTITY coreutils-md5 "c9607d8495f16e98906e7ed2d9751a06">
-<!ENTITY coreutils-home "&gnu-software;coreutils">
-
-<!ENTITY dejagnu-version "1.4.4">
-<!ENTITY dejagnu-size "1,056 KB">
-<!ENTITY dejagnu-url "&gnu;dejagnu/dejagnu-&dejagnu-version;.tar.gz">
-<!ENTITY dejagnu-md5 "053f18fd5d00873de365413cab17a666">
-<!ENTITY dejagnu-home "&gnu-software;dejagnu">
-
-<!ENTITY diffutils-version "2.8.7">
-<!ENTITY diffutils-size "1,034 KB">
-<!ENTITY diffutils-url "&alpha-gnu;diffutils/diffutils-&diffutils-version;.tar.gz">
-<!ENTITY diffutils-md5 "18d6587cb915e7aa110a5d463d6ed156">
-<!ENTITY diffutils-home "&gnu-software;diffutils">
-
-<!ENTITY dvhtool-version "1.0.1">
-<!ENTITY dvhtool-size "52 KB">
-<!ENTITY dvhtool-url "http://ftp.debian.org/debian/pool/main/d/dvhtool/dvhtool_&dvhtool-version;.orig.tar.gz">
-<!ENTITY dvhtool-md5 "4448c01e6a015685af90a79fbea8da4e">
-<!ENTITY dvhtool-home "http://packages.qa.debian.org/d/dvhtool.html">
-
-<!ENTITY e2fsprogs-version "1.40.4">
-<!ENTITY e2fsprogs-size "3,960 KB">
-<!ENTITY e2fsprogs-url "&sourceforge;e2fsprogs/e2fsprogs-&e2fsprogs-version;.tar.gz">
-<!ENTITY e2fsprogs-md5 "124d744bdf9d443591eb8193c085944b">
-<!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net">
-
-<!ENTITY elftoaout-version "2.3">
-<!ENTITY elftoaout-size "13 KB">
-<!ENTITY elftoaout-url "http://gd.tuwien.ac.at/opsys/linux/Owl/pool/sources/elftoaout/elftoaout-&elftoaout-version;.tgz">
-<!ENTITY elftoaout-md5 "be3bd6f7ba8ae107cbdbaa820ba64f86">
-<!ENTITY elftoaout-home " ">
-
-<!ENTITY expect-version "5.43.0">
-<!ENTITY expect-size "514 KB">
-<!ENTITY expect-url "http://expect.nist.gov/src/expect-&expect-version;.tar.gz">
-<!ENTITY expect-md5 "43e1dc0e0bc9492cf2e1a6f59f276bc3">
-<!ENTITY expect-home "http://expect.nist.gov">
-<!ENTITY expect-lib-version "5.43">
-
-<!ENTITY file-version "4.23">
-<!ENTITY file-size "556 KB">
-<!--
-<!ENTITY file-url "ftp://ftp.astron.com/pub/file/file-&file-version;.tar.gz">
--->
-<!ENTITY file-url "&packages-root;file-&file-version;.tar.gz">
-<!ENTITY file-md5 "014a69979a8d5225a6ca2bcc4d7e967e">
-<!ENTITY file-home "http://www.darwinsys.com/file">
-
-<!ENTITY findutils-version "4.2.32">
-<!ENTITY findutils-size "1,404 KB">
-<!ENTITY findutils-url "&gnu;findutils/findutils-&findutils-version;.tar.gz">
-<!ENTITY findutils-md5 "aaa6beeb41a6f04963dff58f24a55b96">
-<!ENTITY findutils-home "&gnu-software;findutils">
-
-<!ENTITY flex-version "2.5.35">
-<!ENTITY flex-size "1232 KB">
-<!ENTITY flex-url "&sourceforge;flex/flex-&flex-version;.tar.bz2">
-<!ENTITY flex-md5 "10714e50cea54dc7a227e3eddcd44d57">
-<!ENTITY flex-home "http://flex.sourceforge.net">
-
-<!ENTITY gawk-version "3.1.6">
-<!ENTITY gawk-size "1,824 KB">
-<!ENTITY gawk-url "&gnu;gawk/gawk-&gawk-version;.tar.bz2">
-<!ENTITY gawk-md5 "c9926c0bc8c177cb9579708ce67f0d75">
-<!ENTITY gawk-home "&gnu-software;gawk">
-
-<!ENTITY gcc-version "4.2.4">
-<!ENTITY gcc-size "43,044 KB">
-<!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.bz2">
-<!ENTITY gcc-md5 "d79f553e7916ea21c556329eacfeaa16">
-<!ENTITY gcc-home "http://gcc.gnu.org">
-
-<!ENTITY gettext-version "0.17">
-<!ENTITY gettext-size "11,388 KB">
-<!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.gz">
-<!ENTITY gettext-md5 "58a2bc6d39c0ba57823034d55d65d606">
-<!ENTITY gettext-home "&gnu-software;gettext">
-
-<!ENTITY glibc-version "2.7">
-<!ENTITY glibc-size "15624 KB">
-<!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.bz2">
-<!ENTITY glibc-md5 "065c5952b439deba40083ccd67bcc8f7">
-<!ENTITY glibc-home "&gnu-software;libc">
-<!ENTITY glibc-ld-name "ld-&glibc-version;.so">
-
-<!ENTITY glibc-ports-version "&glibc-version;">
-<!ENTITY glibc-ports-size "432 KB">
-<!ENTITY glibc-ports-url "&gnu;glibc/glibc-ports-&glibc-ports-version;.tar.bz2">
-<!ENTITY glibc-ports-md5 "eaeb8527b8fa286c2d887157214f9998">
-<!ENTITY glibc-ports-home " ">
-
-<!ENTITY grep-version "2.5.3">
-<!ENTITY grep-size "608 KB">
-<!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.bz2">
-<!ENTITY grep-md5 "27061ce1fde82876970b6549a156da8b">
-<!ENTITY grep-home "&gnu-software;grep">
-
-<!ENTITY groff-version "1.19.2">
-<!ENTITY groff-size "2,836 KB">
-<!ENTITY groff-url "&gnu;groff/groff-&groff-version;.tar.gz">
-<!ENTITY groff-md5 "f7c9cf2e4b9967d3af167d7c9fadaae4">
-<!ENTITY groff-home "&gnu-software;groff">
-
-<!ENTITY grub-version "0.97">
-<!ENTITY grub-size "950 KB">
-<!ENTITY grub-url "&alpha-gnu;grub/grub-&grub-version;.tar.gz">
-<!ENTITY grub-md5 "cd3f3eb54446be6003156158d51f4884">
-<!ENTITY grub-home "&gnu-software;grub">
-
-<!ENTITY gzip-version "1.3.12">
-<!ENTITY gzip-size "456 KB">
-<!ENTITY gzip-url "&gnu;gzip/gzip-&gzip-version;.tar.gz">
-<!ENTITY gzip-md5 "b5bac2d21840ae077e0217bc5e4845b1">
-<!ENTITY gzip-home "http://www.gzip.org">
-
-<!ENTITY hfsutils-version "3.2.6">
-<!ENTITY hfsutils-size "203 KB">
-<!ENTITY hfsutils-url "ftp://ftp.mars.org/pub/hfs/hfsutils-&hfsutils-version;.tar.gz">
-<!ENTITY hfsutils-md5 "fa572afd6da969e25c1455f728750ec4">
-<!ENTITY hfsutils-home "http://www.mars.org/home/rob/proj/hfs">
-
-<!ENTITY iana-etc-version "2.20">
-<!ENTITY iana-etc-size "192 KB">
-<!ENTITY iana-etc-url "http://www.sethwklein.net/projects/iana-etc/downloads/iana-etc-&iana-etc-version;.tar.bz2">
-<!ENTITY iana-etc-md5 "51d584b7b6115528c21e8ea32250f2b1">
-<!ENTITY iana-etc-home "http://www.sethwklein.net/projects/iana-etc">
-
-<!ENTITY inetutils-version "1.5">
-<!ENTITY inetutils-size "1360 KB">
-<!ENTITY inetutils-url "&gnu;inetutils/inetutils-&inetutils-version;.tar.gz">
-<!ENTITY inetutils-md5 "aeacd11d19bf25c89d4eff38346bdfb9">
-<!ENTITY inetutils-home "&gnu-software;inetutils">
-
-<!ENTITY iproute2-version "2.6.23">
-<!ENTITY iproute2-size "340 KB">
-<!ENTITY iproute2-url "http://developer.osdl.org/dev/iproute2/download/iproute2-&iproute2-version;.tar.bz2">
-<!ENTITY iproute2-md5 "2e59da739ef19990408cf0a5cb0cae3e">
-<!ENTITY iproute2-home "http://linux-net.osdl.org/index.php/Iproute2">
-
-<!ENTITY kbd-version "1.13">
-<!ENTITY kbd-size "625 KB">
-<!ENTITY kbd-url "http://ftp.altlinux.com/pub/people/legion/kbd/kbd-&kbd-version;.tar.bz2">
-<!ENTITY kbd-md5 "2639fdfe2412b29cbf6936d7db91cee3">
-<!ENTITY kbd-home " ">
-
-<!ENTITY less-version "418">
-<!ENTITY less-size "300 KB">
-<!ENTITY less-url "http://www.greenwoodsoftware.com/less/less-&less-version;.tar.gz">
-<!ENTITY less-md5 "b5864d76c54ddf4627fd57ab333c88b4">
-<!ENTITY less-home "http://www.greenwoodsoftware.com/less">
-
-<!ENTITY libtool-version "1.5.26">
-<!ENTITY libtool-size "2,900 KB">
-<!ENTITY libtool-url "&gnu;libtool/libtool-&libtool-version;.tar.gz">
-<!ENTITY libtool-md5 "aa9c5107f3ec9ef4200eb6556f3b3c29">
-<!ENTITY libtool-home "&gnu-software;libtool">
-
-<!ENTITY lilo-version "22.8">
-<!ENTITY lilo-size "431 KB">
-<!ENTITY lilo-url "http://home.san.rr.com/johninsd/pub/linux/lilo/lilo-&lilo-version;.src.tar.gz">
-<!ENTITY lilo-md5 "72765f2aafd20e23ecf07ebd22baeec7">
-<!ENTITY lilo-home "http://lilo.go.dyndns.org ">
-
-<!ENTITY linux-dl-version "2.6">
-
-<!ENTITY linux-version "2.6.24.7">
-<!ENTITY linux-size "45,638 KB">
-<!ENTITY linux-url "&kernel;linux/kernel/v&linux-dl-version;/linux-&linux-version;.tar.bz2">
-<!ENTITY linux-md5 "40a73780d51525d28d36dec852c680c4">
-<!ENTITY linux-home "http://www.kernel.org">
-
-<!ENTITY m4-version "1.4.10">
-<!ENTITY m4-size "728 KB">
-<!ENTITY m4-url "&gnu;m4/m4-&m4-version;.tar.bz2">
-<!ENTITY m4-md5 "0a35bab2f5d605e08083d7e3cbd4b8b0">
-<!ENTITY m4-home "&gnu-software;m4">
-
-<!ENTITY make-version "3.81">
-<!ENTITY make-size "1,125 KB">
-<!ENTITY make-url "&gnu;make/make-&make-version;.tar.bz2">
-<!ENTITY make-md5 "354853e0b2da90c527e35aabb8d6f1e6">
-<!ENTITY make-home "&gnu-software;make">
-
-<!ENTITY man-version "1.6e">
-<!ENTITY man-size "248 KB">
-<!ENTITY man-url "http://primates.ximian.com/~flucifredi/man/man-&man-version;.tar.gz">
-<!ENTITY man-md5 "d8187cd756398baefc48ba7d60ff6a8a">
-<!ENTITY man-home "http://primates.ximian.com/~flucifredi/man">
-
-<!ENTITY man-pages-version "3.01">
-<!ENTITY man-pages-size "904 KB">
-<!ENTITY man-pages-url "&kernel;linux/docs/manpages/Archive/man-pages-&man-pages-version;.tar.bz2">
-<!ENTITY man-pages-md5 "ef311ffb0c4f43bad822345fb88498f7">
-<!ENTITY man-pages-home "http://www.win.tue.nl/~aeb/linux/man">
-
-<!ENTITY mktemp-version "1.5">
-<!ENTITY mktemp-size "69 KB">
-<!ENTITY mktemp-url "ftp://ftp.mktemp.org/pub/mktemp/mktemp-&mktemp-version;.tar.gz">
-<!ENTITY mktemp-md5 "9a35c59502a228c6ce2be025fc6e3ff2">
-<!ENTITY mktemp-home "http://www.mktemp.org/">
-
-<!ENTITY module-init-tools-version "3.4">
-<!ENTITY module-init-tools-size "192 KB">
-<!ENTITY module-init-tools-url "http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-&module-init-tools-version;.tar.bz2">
-<!ENTITY module-init-tools-md5 "db6ac059e80e8dd4389dbe81ee61f3c6">
-<!ENTITY module-init-tools-home "http://www.kerneltools.org/KernelTools.org">
-
-<!ENTITY ncurses-version "5.6">
-<!ENTITY ncurses-size "2,352 KB">
-<!ENTITY ncurses-url "ftp://invisible-island.net/ncurses/ncurses-&ncurses-version;.tar.gz">
-<!ENTITY ncurses-md5 "b6593abe1089d6aab1551c105c9300e3">
-<!ENTITY ncurses-home "http://dickey.his.com/ncurses">
-
-<!ENTITY patch-version "2.5.9">
-<!ENTITY patch-size "198 KB">
-<!ENTITY patch-url "&alpha-gnu;diffutils/patch-&patch-version;.tar.gz">
-<!ENTITY patch-md5 "dacfb618082f8d3a2194601193cf8716">
-<!ENTITY patch-home "&gnu-software;patch">
-
-<!ENTITY parted-version "1.8.8">
-<!ENTITY parted-size "1,525 KB">
-<!ENTITY parted-url "&gnu;parted/parted-&parted-version;.tar.bz2">
-<!ENTITY parted-md5 "607ab4c3cfd8455af6588b97d99ad0ba">
-<!ENTITY parted-home "&gnu-software;parted">
-
-<!ENTITY perl-version "5.8.8">
-<!ENTITY perl-size "9,887 KB">
-<!ENTITY perl-url "http://ftp.funet.fi/pub/CPAN/src/perl-&perl-version;.tar.bz2">
-<!ENTITY perl-md5 "a377c0c67ab43fd96eeec29ce19e8382">
-<!ENTITY perl-home "http://www.perl.com">
-
-<!ENTITY powerpcutils-version "1.1.3">
-<!ENTITY powerpcutils-size "25 KB">
-<!ENTITY powerpcutils-url "http://ftp.debian.org/debian/pool/main/p/powerpc-utils/powerpc-utils_&powerpcutils-version;.orig.tar.gz">
-<!ENTITY powerpcutils-md5 "d879b109bb8f0d726304b60b147bff13">
-<!ENTITY powerpcutils-home "http://packages.qa.debian.org/p/powerpc-utils.html">
-
-<!ENTITY procps-version "3.2.7">
-<!ENTITY procps-size "280 KB">
-<!ENTITY procps-url "http://procps.sourceforge.net/procps-&procps-version;.tar.gz">
-<!ENTITY procps-md5 "f490bca772b16472962c7b9f23b1e97d">
-<!ENTITY procps-home "http://procps.sourceforge.net">
-
-<!ENTITY psmisc-version "22.6">
-<!ENTITY psmisc-size "284 KB">
-<!ENTITY psmisc-url "&sourceforge;psmisc/psmisc-&psmisc-version;.tar.gz">
-<!ENTITY psmisc-md5 "2e81938855cf5cc38856bd4a31d79a4c">
-<!ENTITY psmisc-home "http://psmisc.sourceforge.net">
-
-<!ENTITY readline-version "5.2">
-<!ENTITY readline-size "1,996 KB">
-<!ENTITY readline-url "&gnu;readline/readline-&readline-version;.tar.gz">
-<!ENTITY readline-md5 "e39331f32ad14009b9ff49cc10c5e751">
-<!ENTITY readline-home "http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html">
-
-<!ENTITY sed-version "4.1.5">
-<!ENTITY sed-size "781 KB">
-<!ENTITY sed-url "&gnu;sed/sed-&sed-version;.tar.gz">
-<!ENTITY sed-md5 "7a1cbbbb3341287308e140bd4834c3ba">
-<!ENTITY sed-home "&gnu-software;sed">
-
-<!ENTITY shadow-version "4.1.2">
-<!ENTITY shadow-size "1,660 KB">
-<!ENTITY shadow-url "ftp://pkg-shadow.alioth.debian.org/pub/pkg-shadow/shadow-&shadow-version;.tar.bz2">
-<!ENTITY shadow-md5 "ce90cbe9cba7f6673cb10cad49083c1c">
-<!ENTITY shadow-home "http://pkg-shadow.alioth.debian.org">
-
-<!ENTITY silo-version "1.4.13">
-<!ENTITY silo-size "140 KB">
-<!-- sparc-boot.org appears to be dead
-<!ENTITY silo-url "http://www.sparc-boot.org/pub/silo/silo-&silo-version;.tar.bz2">
--->
-<!ENTITY silo-url "&packages-root;silo-&silo-version;.tar.bz2">
-<!ENTITY silo-md5 "7039aabf3c1b3858ae8d0ccdde21343e">
-<!ENTITY silo-home "http://www.sparc-boot.org">
-
-<!ENTITY sysklogd-version "1.5">
-<!ENTITY sysklogd-size "86 KB">
-<!ENTITY sysklogd-url "http://www.infodrom.org/projects/sysklogd/download/sysklogd-&sysklogd-version;.tar.gz">
-<!ENTITY sysklogd-md5 "e053094e8103165f98ddafe828f6ae4b">
-<!ENTITY sysklogd-home "http://www.infodrom.org/projects/sysklogd">
-
-<!ENTITY sysvinit-version "2.86">
-<!ENTITY sysvinit-size "97 KB">
-<!ENTITY sysvinit-url "ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-&sysvinit-version;.tar.gz">
-<!ENTITY sysvinit-md5 "7d5d61c026122ab791ac04c8a84db967">
-<!ENTITY sysvinit-home " ">
-
-<!ENTITY tar-version "1.20">
-<!ENTITY tar-size "1,872 KB">
-<!ENTITY tar-url "&gnu;tar/tar-&tar-version;.tar.bz2">
-<!ENTITY tar-md5 "1a7e17f27abf583b3b0bc059a827e68b">
-<!ENTITY tar-home "&gnu-software;tar">
-
-<!ENTITY tcl-version "8.4.16">
-<!ENTITY tcl-size "3,560 KB">
-<!ENTITY tcl-url "&sourceforge;tcl/tcl&tcl-version;-src.tar.gz">
-<!ENTITY tcl-md5 "f1c783a49547778d160e10be2fb5d76f">
-<!ENTITY tcl-home "http://www.tcl.tk">
-
-<!ENTITY texinfo-version "4.11">
-<!ENTITY texinfo-size "1628 KB">
-<!ENTITY texinfo-url "&gnu;texinfo/texinfo-&texinfo-version;.tar.bz2">
-<!ENTITY texinfo-md5 "c6bf13df4fbeff8ce874aacd6a51e814">
-<!ENTITY texinfo-home "&gnu-software;texinfo">
-
-<!ENTITY tree-version "1.5.1.1">
-<!ENTITY tree-size "32 KB">
-<!ENTITY tree-url "ftp://mama.indstate.edu/linux/tree/old/tree-&tree-version;.tgz">
-<!ENTITY tree-md5 "f8fc70a9260b50bf8b4613e9d5f5e589">
-<!ENTITY tree-home "http://mama.indstate.edu/users/ice/tree">
-
-<!ENTITY udev-version "124">
-<!ENTITY udev-size "204 KB">
-<!ENTITY udev-url "&kernel;linux/utils/kernel/hotplug/udev-&udev-version;.tar.bz2">
-<!ENTITY udev-md5 "4da0471c0ca3a2a2a77692f67120c03d">
-<!ENTITY udev-home "http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html">
-
-<!ENTITY uname_hack-version "20080713">
-<!ENTITY uname_hack-size "2 KB">
-<!ENTITY uname_hack-url "&extras-root;uname_hack-&uname_hack-version;.tar.bz2">
-<!ENTITY uname_hack-md5 "dd7694f28ccc6e6bfb326b1790adb5e9">
-<!ENTITY uname_hack-home " ">
-
-<!ENTITY util-linux-ng-dl-version "2.14">
-
-<!ENTITY util-linux-ng-version "2.14">
-<!ENTITY util-linux-ng-size "2,804 KB">
-<!ENTITY util-linux-ng-url "&kernel;linux/utils/util-linux-ng/v&util-linux-ng-dl-version;/util-linux-ng-&util-linux-ng-version;.tar.bz2">
-<!ENTITY util-linux-ng-md5 "23f227da49df36f33fe47e917e332cd8">
-<!ENTITY util-linux-ng-home "http://userweb.kernel.org/~kzak/util-linux-ng/">
-
-<!ENTITY yaboot-version "1.3.13">
-<!ENTITY yaboot-size "269 KB">
-<!ENTITY yaboot-url "http://penguinppc.org/bootloaders/yaboot/yaboot-&yaboot-version;.tar.gz">
-<!ENTITY yaboot-md5 "f12798d1b2063f21d07e0ae7f602ccaf">
-<!ENTITY yaboot-home "http://yaboot.ozlabs.org">
-
-<!ENTITY vim-version "7.1">
-<!ENTITY vim-version2 "71">
-<!ENTITY vim-size "6,728 KB">
-<!ENTITY vim-url "ftp://ftp.vim.org/pub/vim/unix/vim-&vim-version;.tar.bz2">
-<!ENTITY vim-md5 "44c6b4914f38d6f9aa959640b89da329">
-<!ENTITY vim-home "http://www.vim.org">
-<!ENTITY vim-language-size "1,168 KB">
-<!ENTITY vim-language-url "ftp://ftp.vim.org/pub/vim/extra/vim-&vim-version;-lang.tar.gz">
-<!ENTITY vim-language-md5 "144aa049ba70621acf4247f0459f3ee7">
-<!ENTITY vim-language-home " ">
-
-<!ENTITY zlib-version "1.2.3">
-<!ENTITY zlib-size "485 KB">
-<!ENTITY zlib-url "http://www.zlib.net/zlib-&zlib-version;.tar.gz">
-<!ENTITY zlib-md5 "debc62758716a169df9f62e6ab2bc634">
-<!ENTITY zlib-home "http://www.zlib.net">
Index: OK/partitioning/alpha-chapter.xml
===================================================================
--- BOOK/partitioning/alpha-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-partitioning" xreflabel="Preparing a New Partition">
-  <?dbhtml dir="partitioning"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Preparing a New Partition</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/creatingpartition.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingfilesystem.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mounting.xml"/>
-
-</chapter>
Index: OK/partitioning/alpha/creatingpartition.xml
===================================================================
--- BOOK/partitioning/alpha/creatingpartition.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,42 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-partitioning-creatingpartition">
-  <?dbhtml filename="creatingpartition.html"?>
-
-  <title>Creating a New Partition</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingpartition.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingpartition.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingpartition.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingpartition.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingpartition.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <para>On a Alpha system a bsd disklabel is required. To create this disklabel
-  use the following commands:</para>
-
-<screen><userinput>fdisk /dev/[yyy]</userinput></screen>
-  
- <para>Then use option b to create the bsd disklabel. Before you exit use
- the w option to write the partition table.</para>
- 
-
-</sect1>
Index: OK/partitioning/common/creatingfilesystem.xml
===================================================================
--- BOOK/partitioning/common/creatingfilesystem.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-partitioning-creatingfilesystem">
-  <?dbhtml filename="creatingfilesystem.html"?>
-
-  <title>Creating a File System on the Partition</title>
-
-  <para os="a">Now that a blank partition has been set up, the file system can be
-  created. The most widely-used system in the Linux world is the second
-  extended file system (ext2), but with newer high-capacity hard disks,
-  journaling file systems are becoming increasingly popular. We will create
-  an <systemitem class="filesystem">ext2</systemitem> file system.
-  Instructions for other file systems can be found at
-  <ulink url="&cblfs-root;index.php?section=6#File_System_.2F_Block_Device_.2F_Inode_Management_Tools"/>.</para>
-
-  <para os="b">To create an <systemitem class="filesystem">ext2</systemitem> file
-  system on the CLFS partition, run the following:</para>
-
-<screen os="c"><userinput>mke2fs /dev/<replaceable>[xxx]</replaceable></userinput></screen>
-
-  <para os="d">Replace <replaceable>[xxx]</replaceable> with the name of the CLFS
-  partition (<filename class="devicefile">hda5</filename> in our previous
-  example).</para>
-
-  <note os="e">
-    <para>Some host distributions use custom features in their filesystem
-    creation tools (E2fsprogs). This can cause problems when booting into
-    your new CLFS system, as those features will not be supported by the
-    CLFS-installed E2fsprogs; you will get an error similar to
-    <computeroutput>unsupported filesystem features, upgrade your
-    e2fsprogs</computeroutput>. To check if your host system uses custom
-    enhancements, run the following command:</para>
-
-<screen os="f"><userinput>debugfs -R feature /dev/<replaceable>[xxx]</replaceable></userinput></screen>
-
-    <para>If the output contains features other than: dir_index; filetype;
-    large_file; resize_inode or sparse_super then your host system may have custom
-    enhancements.  In that case, to avoid later problems, you should compile the
-    stock E2fsprogs package and use the resulting binaries to re-create the
-    filesystem on your CLFS partition:</para>
-
-<screen os="g"><userinput>cd /tmp
-tar xjf /path/to/sources/e2fsprogs-&e2fsprogs-version;.tar.bz2
-cd e2fsprogs-&e2fsprogs-version;
-mkdir build
-cd build
-../configure
-make #note that we intentionally don't 'make install' here!
-./misc/mke2fs /dev/<replaceable>[xxx]</replaceable>
-cd /tmp
-rm -rf e2fsprogs-&e2fsprogs-version;</userinput></screen>
-
-  </note>
-
-  <para os="h">If a swap partition was created, it will need to be initialized
-  for use by issuing the command below. If you are using an existing swap
-  partition, there is no need to format it.</para>
-
-<screen os="i"><userinput>mkswap /dev/<replaceable>[yyy]</replaceable></userinput></screen>
-
-  <para os="j">Replace <replaceable>[yyy]</replaceable> with the name of the
-  swap partition.</para>
-
-</sect1>
Index: OK/partitioning/common/creatingpartition.xml
===================================================================
--- BOOK/partitioning/common/creatingpartition.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,50 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-partitioning-creatingpartition">
-  <?dbhtml filename="creatingpartition.html"?>
-
-  <title>Creating a New Partition</title>
-
-  <para os="a">Like most other operating systems, CLFS is usually installed
-  on a dedicated partition. The recommended approach to building a CLFS
-  system is to use an available empty partition or, if you have enough
-  unpartitioned space, to create one. However, if your building for a different
-  architecture you can simply build everything in <quote>/mnt/clfs</quote>
-  and transfer it to your target machine.</para>
-
-  <para os="b">A minimal system requires around 2.5 gigabytes (GB).
-  This is enough to store all the source tarballs and compile the packages. The CLFS
-  system itself will not take up this  much room. A large portion of this requirement
-  is to provide sufficient free temporary storage. Compiling packages can require a
-  lot of disk space which will be reclaimed after the package is installed. If the
-  CLFS system is intended to be the primary Linux system,  additional software will
-  probably be installed which will require additional space (2-10 GB). </para>
-
-  <para os="c">Because there is not always enough Random Access Memory (RAM)
-  available for compilation processes, it is a good idea to use a small disk
-  partition as swap space. This is used by the kernel to store seldom-used
-  data and leave more memory available for active processes. The swap
-  partition for an CLFS system can be the same as the one used by the host
-  system, in which case it is not necessary to create another one.</para>
-
-  <para os="d">Start a disk partitioning program such as <command>cfdisk</command>
-  or <command>fdisk</command> with a command line option naming the hard
-  disk on which the new partition will be created&mdash;for example
-  <filename class="devicefile">/dev/hda</filename> for the primary
-  Integrated Drive Electronics (IDE) disk. Create a Linux native partition
-  and a swap partition, if needed. Please refer to
-  <filename>cfdisk(8)</filename> or <filename>fdisk(8)</filename> if you
-  do not yet know how to use the programs.</para>
-
-  <para os="e">Remember the designation of the new partition (e.g.,
-  <filename class="devicefile">hda5</filename>). This book will refer to
-  this as the CLFS partition. Also remember the designation of the swap
-  partition. These names will be needed later for the
-  <filename>/etc/fstab</filename> file.</para>
-
-</sect1>
Index: OK/partitioning/common/introduction.xml
===================================================================
--- BOOK/partitioning/common/introduction.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,17 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-partitioning-introduction">
-  <?dbhtml filename="introduction.html"?>
-
-  <title>Introduction</title>
-
-  <para>In this chapter, the partition which will host the CLFS system is
-  prepared. We will create the partition itself, create a file system
-  on it, and mount it.</para>
-
-</sect1>
Index: OK/partitioning/common/mounting.xml
===================================================================
--- BOOK/partitioning/common/mounting.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,58 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-partitioning-mounting">
-  <?dbhtml filename="mounting.html"?>
-
-  <title>Mounting the New Partition</title>
-
-  <para>Now that a file system has been created, the partition needs to
-  be made accessible. In order to do this, the partition needs to be
-  mounted at a chosen mount point. For the purposes of this book, it is
-  assumed that the file system is mounted under <filename
-  class="directory">/mnt/clfs</filename>, but the directory choice is up
-  to you.</para>
-
-  <para>Choose a mount point and assign it to the <envar>CLFS</envar>
-  environment variable by running:</para>
-
-<screen><userinput>export CLFS=/mnt/clfs</userinput></screen>
-
-  <para>Next, create the mount point and mount the CLFS file system by
-  running:</para>
-
-<screen><userinput>mkdir -pv ${CLFS}
-mount -v /dev/<replaceable>[xxx]</replaceable> ${CLFS}</userinput></screen>
-
-  <para>Replace <replaceable>[xxx]</replaceable> with the designation of
-  the CLFS partition.</para>
-
-  <para>If using multiple partitions for CLFS (e.g., one for <filename
-  class="directory">/</filename> and another for <filename
-  class="directory">/usr</filename>), mount them using:</para>
-
-<screen><userinput>mkdir -pv ${CLFS}
-mount -v /dev/<replaceable>[xxx]</replaceable> ${CLFS}
-mkdir -v ${CLFS}/usr
-mount -v /dev/<replaceable>[yyy]</replaceable> ${CLFS}/usr</userinput></screen>
-
-  <para>Replace <replaceable>[xxx]</replaceable> and
-  <replaceable>[yyy]</replaceable> with the appropriate partition
-  names.</para>
-
-  <para>Ensure that this new partition is not mounted with permissions
-  that are too restrictive (such as the nosuid, nodev, or noatime options).
-  Run the <command>mount</command> command without any parameters to see
-  what options are set for the mounted CLFS partition. If
-  <option>nosuid</option>, <option>nodev</option>, and/or
-  <option>noatime</option> are set, the partition will need to be
-  remounted.</para>
-
-  <para>Now that there is an established place to work, it is time to
-  download the packages.</para>
-
-</sect1>
Index: OK/partitioning/mips-chapter.xml
===================================================================
--- BOOK/partitioning/mips-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-partitioning" xreflabel="Preparing a New Partition">
-  <?dbhtml dir="partitioning"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Preparing a New Partition</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/creatingpartition.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/creatingfilesystem.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mounting.xml"/>
-
-</chapter>
Index: OK/partitioning/mips/creatingfilesystem.xml
===================================================================
--- BOOK/partitioning/mips/creatingfilesystem.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,53 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-partitioning-creatingfilesystem">
-  <?dbhtml filename="creatingfilesystem.html"?>
-
-  <title>Creating a File System on the Partition</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingfilesystem.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingfilesystem.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingfilesystem.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingfilesystem.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingfilesystem.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingfilesystem.xml"
-  xpointer="xpointer(//*[@os='h'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingfilesystem.xml"
-  xpointer="xpointer(//*[@os='i'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingfilesystem.xml"
-  xpointer="xpointer(//*[@os='j'])"/>
-
-  <para>The commands listed below are specific to the Cobalt MIPS systems,
-  they have a special requirement to have a ext2 Revision 0 for the boot
-  partition. To make sure you satify this requirement, use the commands listed:</para>
-
-<screen><userinput>mke2fs -r 0 /dev/hda1
-mke2fs /dev/hda2
-mkswap /dev/hda3</userinput></screen>
-
-</sect1>
Index: OK/partitioning/mips/creatingpartition.xml
===================================================================
--- BOOK/partitioning/mips/creatingpartition.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-partitioning-creatingpartition">
-  <?dbhtml filename="creatingpartition.html"?>
-
-  <title>Creating a New Partition</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingpartition.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingpartition.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingpartition.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingpartition.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingpartition.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <para>On a Cobalt RaQ2/Cube2 we use the existing firmware for a boot loader,
-  it requires an <systemitem class="filesystem">ext2</systemitem> revision 0
-  partition to boot from. So here is the recommended partition for a Cobalt
-  RaQ2/Cube2 system:</para>
-
-  <itemizedlist>
-    <listitem>
-      <para>The first partition should be 50-100 MB.</para>
-    </listitem>
-    <listitem>
-      <para>The second partition should be all the remaining space minus the
-      amount of RAM in the system.</para>
-    </listitem>
-    <listitem>
-      <para>The third partition is going to be your swap partition, which will
-      be the same amount as the RAM installed in the system.</para>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
Index: OK/partitioning/ppc-chapter.xml
===================================================================
--- BOOK/partitioning/ppc-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-partitioning" xreflabel="Preparing a New Partition">
-  <?dbhtml dir="partitioning"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Preparing a New Partition</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/creatingpartition.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingfilesystem.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mounting.xml"/>
-
-</chapter>
Index: OK/partitioning/ppc/creatingpartition.xml
===================================================================
--- BOOK/partitioning/ppc/creatingpartition.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-partitioning-creatingpartition">
-  <?dbhtml filename="creatingpartition.html"?>
-
-  <title>Creating a New Partition</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/creatingpartition.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/creatingpartition.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/creatingpartition.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-  <para os="c1">Open Firmware and the Mac OS's impose certain requirements on
-  partitioning.  This is discussed in <xref linkend="appendixe" role="."/>.
-  In particular, you cannot use <command>fdisk</command>, you will need an
-  <literal>apple_bootstrap</literal> partition, and that should precede any
-  OSX partition.</para>
-
-  <para os="d">Start a disk partitioning program such as <command>parted</command>
-  with a command line option naming the hard
-  disk on which the new partition will be created&mdash;for example
-  <filename class="devicefile">/dev/hda</filename> for the primary
-  Integrated Drive Electronics (IDE) disk. Create at least an apple bootstrap
-  partition, a Linux native partition, and a swap partition, if needed. Please
-  refer to <filename>parted(8)</filename> if you do not yet know how to use the
-  programs.</para>
-
-  <para os="e">Remember the designation of the new partition (e.g.,
-  <filename class="devicefile">hda5</filename>). This book will refer to
-  this as the CLFS partition. Also remember the designation of the swap
-  partition. These names will be needed later for the
-  <filename>/etc/fstab</filename> file. You will also need to know the
-  designation of the apple_bootstrap partition for the <filename>yaboot.conf
-  </filename> when you set this up before you run <command>ybin</command>.</para>
-
-</sect1>
Index: OK/partitioning/ppc64-chapter.xml
===================================================================
--- BOOK/partitioning/ppc64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-partitioning" xreflabel="Preparing a New Partition">
-  <?dbhtml dir="partitioning"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Preparing a New Partition</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingpartition.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingfilesystem.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mounting.xml"/>
-
-</chapter>
Index: OK/partitioning/sparc-chapter.xml
===================================================================
--- BOOK/partitioning/sparc-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-partitioning" xreflabel="Preparing a New Partition">
-  <?dbhtml dir="partitioning"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Preparing a New Partition</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/creatingpartition.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingfilesystem.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mounting.xml"/>
-
-</chapter>
Index: OK/partitioning/sparc/creatingpartition.xml
===================================================================
--- BOOK/partitioning/sparc/creatingpartition.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,43 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-partitioning-creatingpartition">
-  <?dbhtml filename="creatingpartition.html"?>
-
-  <title>Creating a New Partition</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingpartition.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingpartition.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingpartition.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingpartition.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingpartition.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <para>On a Sparc system we have to create an special partition first. This
-  partition is called <quote>Whole disk</quote>, and must be the 3rd partition
-  on the disk.</para>
-
-  <para>The other partitions are virtual slices of this <quote>Whole disk</quote>
-  partition. But there are some limitations on the first partion of
-  <filename class="devicefile">hda</filename> or <filename
-  class="devicefile">sda</filename> on the system. This partition must be less
-  than 2 gigabytes and this partition must be root.</para>
-
-</sect1>
Index: OK/partitioning/sparc64-chapter.xml
===================================================================
--- BOOK/partitioning/sparc64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-partitioning" xreflabel="Preparing a New Partition">
-  <?dbhtml dir="partitioning"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Preparing a New Partition</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/creatingpartition.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingfilesystem.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mounting.xml"/>
-
-</chapter>
Index: OK/partitioning/sparc64/creatingpartition.xml
===================================================================
--- BOOK/partitioning/sparc64/creatingpartition.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,43 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-partitioning-creatingpartition">
-  <?dbhtml filename="creatingpartition.html"?>
-
-  <title>Creating a New Partition</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingpartition.xml"
-  xpointer="xpointer(//*[@os='a'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingpartition.xml"
-  xpointer="xpointer(//*[@os='b'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingpartition.xml"
-  xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingpartition.xml"
-  xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/creatingpartition.xml"
-  xpointer="xpointer(//*[@os='e'])"/>
-
-  <para>On a Sparc system we have to create an special partition first. This
-  partition is called <quote>Whole disk</quote>, and must be the 3rd partition
-  on the disk.</para>
-
-  <para>The other partitions are virtual slices of this <quote>Whole disk</quote>
-  partition. But there are some limitations on the first partion of
-  <filename class="devicefile">hda</filename> or <filename
-  class="devicefile">sda</filename> on the system. This partition must be less
-  than 2 gigabytes and this partition must be root.</para>
-
-</sect1>
Index: OK/partitioning/x86-chapter.xml
===================================================================
--- BOOK/partitioning/x86-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-partitioning" xreflabel="Preparing a New Partition">
-  <?dbhtml dir="partitioning"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Preparing a New Partition</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingpartition.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingfilesystem.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/mounting.xml"/>
-
-</chapter>
Index: OK/patches.ent
===================================================================
--- BOOK/patches.ent	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,263 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<!ENTITY patches-root "http://patches.cross-lfs.org/1.1.0/">
-
-<!-- Start of Common Patches -->
-
-<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-8.patch">
-<!ENTITY bash-fixes-patch-md5 "9f57c9bd5d7278529a9b13d8fc36a02e">
-<!ENTITY bash-fixes-patch-size "416 KB">
-
-<!ENTITY binutils-branch_update-patch "binutils-&binutils-version;-branch_update-3.patch">
-<!ENTITY binutils-branch_update-patch-md5 "afc0cc91efe7d2e5a14008d0625462ef">
-<!ENTITY binutils-branch_update-patch-size "432 KB">
-
-<!ENTITY binutils-posix-patch "binutils-&binutils-version;-posix-1.patch">
-<!ENTITY binutils-posix-patch-md5 "f2020cb369c2facbfd8987fa2263f31f">
-<!ENTITY binutils-posix-patch-size "4 KB">
-
-<!ENTITY coreutils-suppress-patch "coreutils-&coreutils-version;-suppress_uptime_kill_su-1.patch">
-<!ENTITY coreutils-suppress-patch-md5 "8bc938ec7210fff3885b37b1339dca45">
-<!ENTITY coreutils-suppress-patch-size "12 KB">
-
-<!ENTITY coreutils-uname-patch "coreutils-&coreutils-version;-uname-1.patch">
-<!ENTITY coreutils-uname-patch-md5 "865d271bec9039f45a3be0ada21edae0">
-<!ENTITY coreutils-uname-patch-size "8 KB">
-
-<!ENTITY expect-spawn-patch "expect-&expect-version;-spawn-2.patch">
-<!ENTITY expect-spawn-patch-md5 "7706e1e8238c72eed8dc905d6f3b6aa9">
-<!ENTITY expect-spawn-patch-size "6.9 KB">
-
-<!--
-<!ENTITY gcc-branch_update-patch "gcc-&gcc-version;-branch_update-2.patch">
-<!ENTITY gcc-branch_update-patch-md5 "b1133de39a90ec74f2821767d4af7746">
-<!ENTITY gcc-branch_update-patch-size "604 KB">
--->
-
-<!ENTITY gcc-cross_search-patch "gcc-&gcc-version;-cross_search_paths-1.patch">
-<!ENTITY gcc-cross_search-patch-md5 "2d316305d73bb14b3acd6a1f3a2ee4e9">
-<!ENTITY gcc-cross_search-patch-size "4 KB">
-
-<!ENTITY gcc-posix-patch "gcc-&gcc-version;-posix-1.patch">
-<!ENTITY gcc-posix-patch-md5 "8df4fe6a9f77135ae1b0851786c40410">
-<!ENTITY gcc-posix-patch-size "16 KB">
-
-<!ENTITY gcc-PR31490-patch "gcc-&gcc-version;-PR31490-1.patch">
-<!ENTITY gcc-PR31490-patch-md5 "43f3d086b57f02cb605819452936c4d7">
-<!ENTITY gcc-PR31490-patch-size "1.4 KB">
-
-<!ENTITY gcc-specs-patch "gcc-&gcc-version;-specs-1.patch">
-<!ENTITY gcc-specs-patch-md5 "1fbf4e719a469ab6eb54ed77692918c8">
-<!ENTITY gcc-specs-patch-size "20 KB">
-
-<!ENTITY glibc-branch_update-patch "glibc-&glibc-version;-branch_update-1A.patch">
-<!ENTITY glibc-branch_update-patch-md5 "dd1119b68f26308446d33ccde05732b4">
-<!ENTITY glibc-branch_update-patch-size "64 KB">
-
-<!ENTITY glibc-libgcc_eh-patch "glibc-&glibc-version;-libgcc_eh-1.patch">
-<!ENTITY glibc-libgcc_eh-patch-md5 "f868605171066a0d8f572314feea415c">
-<!ENTITY glibc-libgcc_eh-patch-size "8 KB">
-
-<!ENTITY glibc-localedef_segfault-patch "glibc-&glibc-version;-localedef_segfault-1.patch">
-<!ENTITY glibc-localedef_segfault-patch-md5 "3ce6946b16e90a73d90ac701a5940709">
-<!ENTITY glibc-localedef_segfault-patch-size "4 KB">
-
-<!ENTITY inetutils-man_pages-patch "inetutils-&inetutils-version;-no_server_man_pages-2.patch">
-<!ENTITY inetutils-man_pages-patch-md5 "b04f46e66c4b438f609565073590ffd5">
-<!ENTITY inetutils-man_pages-patch-size "8 KB">
-
-<!ENTITY linux-security-patch "linux-&linux-version;-security_fixes-1.patch">
-<!ENTITY linux-security-patch-md5 "7f244856cc40e478f5f66a6a6267d4c6">
-<!ENTITY linux-security-patch-size "15.5 KB">
-
-<!ENTITY mktemp-tempfile-patch "mktemp-&mktemp-version;-add_tempfile-3.patch">
-<!ENTITY mktemp-tempfile-patch-md5 "65d73faabe3f637ad79853b460d30a19">
-<!ENTITY mktemp-tempfile-patch-size "3.6 KB">
-
-<!ENTITY module-init-tools-manpages-patch "module-init-tools-&module-init-tools-version;-manpages-1.patch">
-<!ENTITY module-init-tools-manpages-patch-md5 "2271047586981ae23adf01cc13d97791">
-<!ENTITY module-init-tools-manpages-patch-size "35 KB">
-
-<!ENTITY ncurses-bashfix-patch "ncurses-&ncurses-version;-bash_fix-1.patch">
-<!ENTITY ncurses-bashfix-patch-md5 "c6f7f2ab0ebaf7721ebeb266641352db">
-<!ENTITY ncurses-bashfix-patch-size "4 KB">
-
-<!ENTITY ncurses-branch_update-patch "ncurses-&ncurses-version;-branch_update-3.patch">
-<!ENTITY ncurses-branch_update-patch-md5 "5c5436409af4699e8b81e4100b5203ec">
-<!ENTITY ncurses-branch_update-patch-size "7188 KB">
-
-<!ENTITY perl-gcc42_fix-patch "perl-&perl-version;-gcc42_fix-1.patch">
-<!ENTITY perl-gcc42_fix-patch-md5 "cd84d28231ea7f23d7e619d9304cc741">
-<!ENTITY perl-gcc42_fix-patch-size "4 KB">
-
-<!ENTITY perl-libc-patch "perl-&perl-version;-libc-2.patch">
-<!ENTITY perl-libc-patch-md5 "3bf8aef1fb6eb6110405e699e4141f99">
-<!ENTITY perl-libc-patch-size "4 KB">
-
-<!ENTITY perl-no_page_h-patch "perl-&perl-version;-no_page_h-1.patch">
-<!ENTITY perl-no_page_h-patch-md5 "fe49a8a539b14f53adfe24482c1fbe1f">
-<!ENTITY perl-no_page_h-patch-size "4 KB">
-
-<!ENTITY perl-security-patch "perl-&perl-version;-security_fixes-1.patch">
-<!ENTITY perl-security-patch-md5 "918a8f41d9e4fe1e272381e58be71497">
-<!ENTITY perl-security-patch-size "10 KB">
-
-<!ENTITY readline-fixes-patch "readline-&readline-version;-fixes-4.patch">
-<!ENTITY readline-fixes-patch-md5 "14ae1c3f3ff7223656f874bcf36e6f19">
-<!ENTITY readline-fixes-patch-size "20 KB">
-
-<!ENTITY texinfo-mbstate_fix-patch "texinfo-&texinfo-version;-mbstate_fix-1.patch">
-<!ENTITY texinfo-mbstate_fix-patch-md5 "37e3d170d809bb1c90e9741864839f66">
-<!ENTITY texinfo-mbstate_fix-patch-size "4 KB">
-
-<!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-2.patch">
-<!ENTITY vim-branch_update-patch-md5 "bd5ee693b6ed59567dc0e7c003d22694">
-<!ENTITY vim-branch_update-patch-size "284 KB">
-
-<!ENTITY zlib-fpic-patch "zlib-&zlib-version;-fPIC-1.patch">
-<!ENTITY zlib-fpic-patch-md5 "545d60b20bfde6f53023de44438cef59">
-<!ENTITY zlib-fpic-patch-size "3.2 KB">
-
-<!-- Start of multilib patches -->
-
-<!ENTITY binutils-multilib-patch "binutils-&binutils-version;-genscripts_multilib-1.patch">
-<!ENTITY binutils-multilib-patch-md5 "b1d8d22ab473212abf1b19978415775b">
-<!ENTITY binutils-multilib-patch-size "4 KB">
-
-<!ENTITY iproute2-libdir-patch "iproute2-&iproute2-version;-libdir-1.patch">
-<!ENTITY iproute2-libdir-patch-md5 "161768813d904b958c76af1e8f4974ac">
-<!ENTITY iproute2-libdir-patch-size "4 KB">
-
-<!ENTITY perl-multilib-patch "perl-&perl-version;-Configure_multilib-1.patch">
-<!ENTITY perl-multilib-patch-md5 "1f79780e26bc3493f7891e12841c38ed">
-<!ENTITY perl-multilib-patch-size "1.4 KB">
-
-<!ENTITY udev-lib64-patch "udev-&udev-version;-lib64-2.patch">
-<!ENTITY udev-lib64-patch-md5 "8e80d66bb1a19638bfb49548a780c86c">
-<!ENTITY udev-lib64-patch-size "12 KB">
-
-<!-- Start of Pure64 patches -->
-
-<!ENTITY gcc-specs_pure64-patch "gcc-&gcc-version;-pure64_specs-1.patch">
-<!ENTITY gcc-specs_pure64-patch-md5 "a543edb70d0fbebb4f365bdad0a9a393">
-<!ENTITY gcc-specs_pure64-patch-size "20 KB">
-
-<!ENTITY gcc-pure64-patch "gcc-&gcc-version;-pure64-1.patch">
-<!ENTITY gcc-pure64-patch-md5 "04d9b9cd2c3dad221d53a83d3a45d66f">
-<!ENTITY gcc-pure64-patch-size "8 KB">
-
-<!-- Start of Config Update patches -->
-
-<!ENTITY expect-config_update-patch "expect-&expect-version;-config_update-1.patch">
-<!ENTITY expect-config_update-patch-md5 "eb8989a8baf11e0f02efbdf7e6843fc1">
-<!ENTITY expect-config_update-patch-size "51 KB">
-
-<!ENTITY file-config_update-patch "file-&file-version;-config_update-1.patch">
-<!ENTITY file-config_update-patch-md5 "0c9ead298291fa5028a41a3368639d73">
-<!ENTITY file-config_update-patch-size "56 KB">
-
-<!-- Multiple Architecture patches -->
-
-<!ENTITY mktemp-update-patch "mktemp-&mktemp-version;-config_update-1.patch">
-<!ENTITY mktemp-update-patch-md5 "2eab6432dbf4d4447b85435363c6a557">
-<!ENTITY mktemp-update-patch-size "56 KB">
-
-<!-- Start of Alpha patches -->
-
-<!ENTITY aboot-alpha-patch "aboot-&aboot-version;-fixes-5.patch">
-<!ENTITY aboot-alpha-patch-md5 "33577862f8829e0149655397f95b5140">
-<!ENTITY aboot-alpha-patch-size "180 KB">
-
-<!ENTITY glibc-alpha_ptr_mangle_fix-patch "glibc-&glibc-version;-alpha_PTR_MANGLE_fix-1.patch">
-<!ENTITY glibc-alpha_ptr_mangle_fix-patch-md5 "9c13080aa4a17796815a7e814e18584c">
-<!ENTITY glibc-alpha_ptr_mangle_fix-patch-size "4 KB">
-
-<!ENTITY linux-alpha_PAGE_SIZE-patch "linux-&linux-version;-alpha_PAGE_SIZE-2.patch">
-<!ENTITY linux-alpha_PAGE_SIZE-patch-md5 "70bf07c2ae964c45108ad6a52044164b">
-<!ENTITY linux-alpha_PAGE_SIZE-patch-size "2 KB">
-
-<!-- Start of mips/mips64 patches -->
-
-<!ENTITY colo-make-patch "colo-&colo-version;-make_fix-1.patch">
-<!ENTITY colo-make-patch-md5 "b89575a0e385b5366b19a6b5f176d49b">
-<!ENTITY colo-make-patch-size "2.7 KB">
-
-<!ENTITY colo-relocation-patch "colo-&colo-version;-relocation_fix-1.patch">
-<!ENTITY colo-relocation-patch-md5 "e0607ee1071f2f805ffa1ef1c5b1a766">
-<!ENTITY colo-relocation-patch-size "4 KB">
-
-<!ENTITY dvhtool-fixes-patch "dvhtool-&dvhtool-version;-fixes-1.patch">
-<!ENTITY dvhtool-fixes-patch-md5 "a521b380354b6a0c96b2d6308372749d">
-<!ENTITY dvhtool-fixes-patch-size "6.2 KB">
-
-<!-- Start of ppc/ppc64 patches -->
-
-<!ENTITY binutils-ppc64-vistest-patch "binutils-&binutils-version;-ppc64_fix_testsuite-1.patch">
-<!ENTITY binutils-ppc64-vistest-patch-md5 "ae7b5bd6dcf238dd40a87d970f030af2">
-<!ENTITY binutils-ppc64-vistest-patch-size "3.5 KB">
-
-<!ENTITY gcc-nof-patch "gcc-&gcc-version;-powerpc64_multilib-1.patch">
-<!ENTITY gcc-nof-patch-md5 "cb19503a9c3e4d155dec55a8a74292ee">
-<!ENTITY gcc-nof-patch-size "4 KB">
-
-<!ENTITY powerpcutils-patch "powerpc-utils_&powerpcutils-version;-fixes-2.patch">
-<!ENTITY powerpcutils-patch-md5 "d2776b1a4977c5711037b8f1402f792a">
-<!ENTITY powerpcutils-patch-size "22 KB">
-
-<!ENTITY yaboot-fix-patch "yaboot-&yaboot-version;-fix-1.patch">
-<!ENTITY yaboot-fix-patch-md5 "2848f7b2a01469f9e302a8890f4daafd">
-<!ENTITY yaboot-fix-patch-size "1 KB">
-
-<!ENTITY yaboot-sata-patch "yaboot-&yaboot-version;-ofpath_sata-1.patch">
-<!ENTITY yaboot-sata-patch-md5 "bdc55ca22b1cfc774a7b2db732524eb6">
-<!ENTITY yaboot-sata-patch-size "1 KB">
-
-<!ENTITY yaboot-ofpath_path-patch "yaboot-&yaboot-version;-ofpath_path_prefix-1.patch">
-<!ENTITY yaboot-ofpath_path-patch-md5 "3faf70e0cb4e4f62a1e8815c3452ab38">
-<!ENTITY yaboot-ofpath_path-patch-size "1 KB">
-
-<!-- Start of sparc/sparc64 patches -->
-
-<!ENTITY elftoaout-fixes-patch "elftoaout-&elftoaout-version;-64bit_fixes-1.patch">
-<!ENTITY elftoaout-fixes-patch-md5 "485e77cf2ed082d3d0ea99c703f1f14b">
-<!ENTITY elftoaout-fixes-patch-size "6.7 KB">
-
-<!ENTITY linux-elf_spitfire_fix-patch "linux-&linux-version;-elf_spitfire_fix-1.patch">
-<!ENTITY linux-elf_spitfire_fix-patch-md5 "e0198bd54b7d1a2cd142d1bb22ae61f8">
-<!ENTITY linux-elf_spitfire_fix-patch-size "4 KB">
-
-<!ENTITY inetutils-memcpy_sparc64-patch "inetutils-&inetutils-version;-memcpy_sparc64-1.patch">
-<!ENTITY inetutils-memcpy_sparc64-patch-md5 "04ed919685f6790931eaa8684452a755">
-<!ENTITY inetutils-memcpy_sparc64-patch-size "24 KB">
-
-<!ENTITY silo-fixes-patch "silo-&silo-version;-fixes-3.patch">
-<!ENTITY silo-fixes-patch-md5 "c65334fd6b3b99d824c458d0a3eac9b1">
-<!ENTITY silo-fixes-patch-size "668 KB">
-
-<!-- Start of x86 patches -->
-
-<!ENTITY glibc-i586_chk-patch "glibc-&glibc-version;-i586_chk-2.patch">
-<!ENTITY glibc-i586_chk-patch-md5 "bb6e8f1936d357ec50e479d4977b9f98">
-<!ENTITY glibc-i586_chk-patch-size "4 KB">
-
-<!-- Start of x86/x86_64 patches -->
-
-<!ENTITY bin86-x86_64-patch "bin86-&bin86-version;-x86_64-1.patch">
-<!ENTITY bin86-x86_64-patch-md5 "92bdce7b0655cd2e9f83c83fc56d128e">
-<!ENTITY bin86-x86_64-patch-size "2 KB">
-
-<!ENTITY grub-256byte_inode-patch "grub-&grub-version;-256byte_inode-1.patch">
-<!ENTITY grub-256byte_inode-patch-md5 "2482bef9c1866b4045767a56268ba673">
-<!ENTITY grub-256byte_inode-patch-size "4 KB">
-
-<!ENTITY grub-fixes-patch "grub-&grub-version;-fixes-1.patch">
-<!ENTITY grub-fixes-patch-md5 "6f095b98bde1db8d5b1a7ceef96ca351">
-<!ENTITY grub-fixes-patch-size "136 KB">
-
-<!ENTITY grub-use_mmap-patch "grub-&grub-version;-use_mmap-1.patch">
-<!ENTITY grub-use_mmap-patch-md5 "d4467ed0b13e87900ffb564879e1f2e4">
-<!ENTITY grub-use_mmap-patch-size "4 KB">
-
-<!ENTITY lilo-cross-x86_64-patch "lilo-&lilo-version;-cross_compile_x86_64-2.patch">
-<!ENTITY lilo-cross-x86_64-patch-md5 "a7440e18ef7fa6c5d1c6181dc0cc4d10">
-<!ENTITY lilo-cross-x86_64-patch-size "4 KB">
Index: OK/ppc-index.xml
===================================================================
--- BOOK/ppc-index.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,85 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "general.ent">
-  %general-entities;
-]>
-
-<book>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/ppc/bookinfo.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/dedication.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/preface.xml"/>
-
-  <part id="part1">
-    <?dbhtml filename="part1.html"?>
-
-    <title>Introduction</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="introduction/ppc-chapter.xml"/>
-
-  </part>
-
-  <part id="part2">
-    <?dbhtml filename="part2.html"?>
-
-    <title>Preparing for the Build</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="partitioning/ppc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="materials/ppc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-preps/chapter.xml"/>
-
-  </part>
-
-  <part id="part3">
-    <?dbhtml filename="part3.html"?>
-
-    <title>Make the Cross-Compile Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cross-tools/ppc-chapter.xml"/>
-
-  </part>
-
-  <part id="part4">
-    <?dbhtml filename="part4.html"?>
-
-    <title>Building the Basic Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="temp-system/ppc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="boot/ppc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="chroot/ppc-chapter.xml"/>
-
-  </part>
-
-  <part id="part5">
-    <?dbhtml filename="part5.html"?>
-
-    <title>Building the CLFS System</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/ppc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/ppc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/ppc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/ppc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>
-
-  </part>
-
-  <part id="part6">
-    <?dbhtml filename="part6.html"?>
-
-    <title>Appendices</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acknowledgments.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/ppc.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/ppc/macmiscellany.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/license.xml"/>
-
-  </part>
-
-  <index/>
-
-</book>
Index: OK/ppc64-index.xml
===================================================================
--- BOOK/ppc64-index.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,85 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "general.ent">
-  %general-entities;
-]>
-
-<book>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/ppc64/bookinfo.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/dedication.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/preface.xml"/>
-
-  <part id="part1">
-    <?dbhtml filename="part1.html"?>
-
-    <title>Introduction</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="introduction/ppc64-chapter.xml"/>
-
-  </part>
-
-  <part id="part2">
-    <?dbhtml filename="part2.html"?>
-
-    <title>Preparing for the Build</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="partitioning/ppc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="materials/ppc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-preps/chapter.xml"/>
-
-  </part>
-
-  <part id="part3">
-    <?dbhtml filename="part3.html"?>
-
-    <title>Make the Cross-Compile Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cross-tools/ppc64-chapter.xml"/>
-
-  </part>
-
-  <part id="part4">
-    <?dbhtml filename="part4.html"?>
-
-    <title>Building the Basic Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="temp-system/ppc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="boot/ppc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="chroot/ppc64-chapter.xml"/>
-
-  </part>
-
-  <part id="part5">
-    <?dbhtml filename="part5.html"?>
-
-    <title>Building the CLFS System</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/ppc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/ppc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/ppc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/ppc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>
-
-  </part>
-
-  <part id="part6">
-    <?dbhtml filename="part6.html"?>
-
-    <title>Appendices</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acknowledgments.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/ppc.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/ppc/macmiscellany.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/license.xml"/>
-
-  </part>
-
-  <index/>
-
-</book>
Index: OK/prologue/alpha/bookinfo.xml
===================================================================
--- BOOK/prologue/alpha/bookinfo.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<bookinfo>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/title)"/>
-  
-  <subtitle>Version &version-alpha;</subtitle>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/authorgroup)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/copyright)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(bookinfo/bibliosource)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/legalnotice)"/>
-
-</bookinfo>
Index: OK/prologue/common/audience.xml
===================================================================
--- BOOK/prologue/common/audience.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,88 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="pre-audience">
-  <?dbhtml filename="audience.html"?>
-
-  <title>Audience</title>
-
-  <para>There are many reasons why somebody would want to read this book.
-  The principal reason is to install a Linux system from the  source code.
-  A question many people raise is, <quote>why go through all the hassle of
-  manually building a Linux system from scratch when you can just download
-  and install an existing one?</quote> That is a good question and is the
-  impetus for this section of the book.</para>
-
-  <para>One important reason for the existence of CLFS is to help people
-  understand how a Linux system works.  Building an CLFS system helps
-  demonstrate what makes Linux tick, and how things work together and
-  depend on each other. One of the best things this learning experience
-  provides is the ability to customize Linux to your own
-  tastes and needs.</para>
-
-  <para>A key benefit of CLFS is that it allows users to have more control
-  over their system without any reliance on a Linux implementation designed
-  by someone else.  With CLFS, <emphasis>you</emphasis> are in the driver's
-  seat and dictate every aspect of the system, such as the directory layout
-  and bootscript setup. You also dictate where, why, and how programs are
-  installed.</para>
-
-  <para>Another benefit of CLFS is the ability to create a very compact
-  Linux system. When installing a regular distribution, one is often forced
-  to include several programs which are probably never used. These programs
-  waste disk space or CPU cycles.  It is not difficult to build an CLFS
-  system of less than 100 megabytes (MB), which is substantially smaller
-  than the majority of existing installations.  Does this still sound like a
-  lot of space? A few of us have been working on creating a very small
-  embedded CLFS system. We successfully built a system that was specialized
-  to run the Apache web server with approximately 8MB of disk space used.
-  Further stripping could bring this down to 5 MB or less. Try that with a
-  regular distribution! This is only one of the many benefits of designing
-  your own Linux implementation.</para>
-
-  <para>We could compare Linux distributions to a hamburger purchased at
-  a fast-food restaurant&mdash;you have no idea what might be in what you
-  are eating. CLFS, on the other hand, does not give you a hamburger.
-  Rather, CLFS provides the recipe to make the exact hamburger desired.
-  This allows users to review the recipe, omit unwanted ingredients, and
-  add your own ingredients to enhance the flavor of the burger. When you
-  are satisfied with the recipe, move on to preparing it. It can be made
-  to exact specifications&mdash;broil it, bake it, deep-fry it, or
-  barbecue it.</para>
-
-  <para>Another analogy that we can use is that of comparing CLFS with a
-  finished house. CLFS provides the skeletal plan of a house, but it is up
-  to you to build it. CLFS maintains the freedom to adjust plans throughout
-  the process, customizing it to the needs and preferences of the user.</para>
-
-  <para>Security is an additional advantage of a custom built Linux system.
-  By compiling the entire system from source code, you are empowered to
-  audit everything and apply all the security patches desired. It is no
-  longer necessary to wait for somebody else to compile binary packages
-  that fix a security hole. Unless you examine the patch and implement it
-  yourself, you have no guarantee that the new binary package was built
-  correctly and adequately fixes the problem.</para>
-
-  <para>The goal of Cross Linux From Scratch is to build a complete and
-  usable foundation-level system. Readers who do not wish to build their
-  own Linux system from scratch may not benefit from the information in this
-  book. If you only want to know what happens while the computer boots,
-  we recommend the <quote>From Power Up To Bash Prompt</quote> HOWTO
-  located at <ulink url="http://axiom.anu.edu.au/~okeefe/p2b/"/> or on
-  The Linux Documentation Project's (TLDP) website at <ulink
-  url="http://www.tldp.org/HOWTO/From-PowerUp-To-Bash-Prompt-HOWTO.html"/>.
-  The HOWTO builds a system which is similar to that of this book, but it
-  focuses strictly on creating a system capable of booting to a BASH prompt.
-  Consider your objective. If you wish to build a Linux system and learn
-  along the way, this book is your best choice.</para>
-
-  <para>There are too many good reasons to build your own CLFS system to
-  list them all here. This section is only the tip of the iceberg. As
-  you continue in your CLFS experience, you will find the power that
-  information and knowledge truly bring.</para>
-
-</sect1>
Index: OK/prologue/common/dedication.xml
===================================================================
--- BOOK/prologue/common/dedication.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,11 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE dedication PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<dedication>
-  <title>Dedication</title>
-  <para>This book is dedicated</para>
-</dedication>
Index: OK/prologue/common/errata.xml
===================================================================
--- BOOK/prologue/common/errata.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,23 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="pre-errata">
-  <?dbhtml filename="errata.html"?>
-
-  <title>Errata</title>
-
-  <para>The software used to create a CLFS system is constantly being
-  updated and enhanced. Security warnings and bug fixes may become
-  available after the CLFS book has been released. Some host systems may
-  also have problems building CLFS. To check whether the package versions
-  or instructions in this release of CLFS need any modifications to
-  accommodate security vulnerabilities, other bug fixes, or host-specific
-  issues, please visit <ulink url="&errata;"/> before proceeding with your
-  build. You should note any changes shown and apply them to the relevant
-  section of the book as you progress with building the CLFS system.</para>
-
-</sect1>
Index: OK/prologue/common/foreword.xml
===================================================================
--- BOOK/prologue/common/foreword.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="pre-foreword">
-  <?dbhtml filename="foreword.html"?>
-
-  <title>Foreword</title>
-
-  <para>The Linux From Scratch Project has seen many changes in the
-  few years of its existence.  I personally became involved with the
-  project in 1999, around the time of the 2.x releases.  At that time,
-  the build process was to create static binaries with the host system,
-  then chroot and build the final binaries on top of the static ones.</para>
-
-  <para>Later came the use of the /static directory to hold the initial
-  static builds, keeping them separated from the final system, then
-  the PureLFS process developed by Ryan Oliver and Greg Schafer,
-  introducing a new toolchain build process that divorces even our initial
-  builds from the host.  Finally, LFS 6 bought Linux Kernel 2.6, the
-  udev dynamic device structure, sanitized kernel headers, and other
-  improvements to the Linux From Scratch system.</para>
-
-  <para>The one "flaw" in LFS is that it has always been based on an x86
-  class processor.  With the advent of the Athlon 64 and Intel EM64T
-  processors, the x86-only LFS is no longer ideal. Throughout this time,
-  Ryan Oliver developed and documented a process by which you could
-  build Linux for any system and from any system, by use of
-  cross-compilation techniques.  Thus, the Cross-Compiled LFS (CLFS) was
-  born.</para>
-
-  <para>CLFS follows the same guiding principles the LFS project has
-  always followed, e.g., knowing your system inside and out by virtue
-  of having built the system yourself.  Additionally, during a CLFS
-  build, you will learn advanced techniques such as cross-build toolchains,
-  multilib support (32 &amp; 64-bit libraries side-by-side), alternative
-  architectures such as Sparc, MIPS, and Alpha, and much more.</para>
-
-  <para>We hope you enjoy building your own CLFS system, and the benefits
-  that come from a system tailored to your needs.</para>
-
-<literallayout>--
-Jeremy Utley, CLFS 1.x Release Manager (Page Author)
-Jim Gifford, CLFS Project Co-leader
-Ryan Oliver, CLFS Project Co-leader
-Joe Ciccone, Justin Knierim, Chris Staub, Matt Darcy, Ken Moffat,
-Manuel Canales Esparcia, and Nathan Coulson - CLFS Developers</literallayout>
-
-</sect1>
Index: OK/prologue/common/hostreqs.xml
===================================================================
--- BOOK/prologue/common/hostreqs.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,134 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="pre-hostreqs">
-  <?dbhtml filename="hostreqs.html"?>
-
-  <title>Host System Requirements</title>
-
-    <para>You should be able to build a CLFS system from just about any
-    Unix-type operating system. Your host system should have the following
-    software with the minimum versions indicated. Also note that many
-    distributions will place software headers into separate packages, often in
-    the form of <quote>[package-name]-devel</quote> or
-    <quote>[package-name]-dev</quote>. Be sure to install those if
-    your distribution provides them.</para>
-
-  <itemizedlist spacing="compact">
-
-    <listitem>
-      <para><emphasis role="strong">Bash-2.05a</emphasis></para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Binutils-2.12</emphasis> (Versions
-      greater than &binutils-version; are not recommended as they have
-      not been tested)</para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Bison-1.875</emphasis></para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Bzip2-1.0.2</emphasis></para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Coreutils-5.0</emphasis> (or Sh-Utils-2.0,
-      Textutils-2.0, and Fileutils-4.1)</para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Diffutils-2.8</emphasis></para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Findutils-4.1.20</emphasis></para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Gawk-3.0</emphasis></para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Gcc-2.95.3</emphasis> (Versions
-      greater than &gcc-version; are not recommended as they have not
-      been tested)</para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Glibc-2.2.5</emphasis> (Versions
-      greater than &glibc-version; are not recommended as they have
-      not been tested)</para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Grep-2.5</emphasis></para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Gzip-1.2.4</emphasis></para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Make-3.79.1</emphasis></para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Ncurses-5.3</emphasis></para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Patch-2.5.4</emphasis></para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Sed-3.0.2</emphasis></para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Tar-1.14</emphasis></para>
-    </listitem>
-
-    <listitem>
-      <para><emphasis role="strong">Texinfo-4.4</emphasis></para>
-    </listitem>
-
-  </itemizedlist>
-
-  <para>To see whether your host system has all the appropriate versions, run the following:</para>
-
-<screen role="nodump"><userinput>cat &gt; version-check.sh &lt;&lt; "EOF"
-<literal>#!/bin/bash
-
-# Simple script to list version numbers of critical development tools
-
-bash --version | head -n1 | cut -d" " -f2-4
-echo -n "Binutils: "; ld --version | head -n1 | cut -d" " -f3-
-bison --version | head -n1
-bzip2 --version 2&gt;&amp;1 &lt; /dev/null | head -n1 | cut -d" " -f1,6-
-echo -n "Coreutils: "; chown --version | head -n1 | cut -d")" -f2
-diff --version | head -n1
-find --version | head -n1
-gawk --version | head -n1
-gcc --version | head -n1
-/lib/libc.so.6 | head -n1 | cut -d" " -f1-7
-grep --version | head -n1
-gzip --version | head -n1
-make --version | head -n1
-tic -V
-patch --version | head -n1
-sed --version | head -n1
-tar --version | head -n1
-makeinfo --version | head -n1</literal>
-
-EOF
-
-bash version-check.sh</userinput></screen>
-
-</sect1>
Index: OK/prologue/common/organization.xml
===================================================================
--- BOOK/prologue/common/organization.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,76 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-<sect1 id="pre-organization">
-  <?dbhtml filename="organization.html"?>
-
-  <title>Structure</title>
-
-  <para>This book is divided into the following parts.</para>
-
-  <sect2>
-    <title>Part I - Introduction</title>
-
-    <para>Part I explains a few important notes on how to proceed with the
-    Cross-LFS installation. This section also provides meta-information about
-    the book.</para>
-
-  </sect2>
-
-  <sect2>
-    <title>Part II - Preparing for the Build</title>
-
-    <para>Part II describes how to prepare for the building
-    process&mdash;making a partition and downloading the packages.</para>
-
-  </sect2>
-
-  <sect2>
-    <title>Part III - Make the Cross-Compile Tools</title>
-
-    <para>Part III shows you how to make a set of Cross-Compiler
-          tools. These tools can run on your host system but allow you to
-          build packages that will run on your target system.</para>
-
-  </sect2>
-
-  <sect2>
-    <title>Part IV - Building the Basic Tools</title>
-
-    <para>Part IV explains how to build a tool chain designed
-          to operate on your target system. These are the tools
-          that will allow you to build a working system on your 
-          target computer.</para>
-
-  </sect2>
-
-  <sect2>
-    <title>Part V - Building the CLFS System</title>
-
-    <para>Part V guides the reader through the building of the CLFS
-    system&mdash;compiling and installing all the packages one by one,
-    setting up the boot scripts, and installing the kernel. The resulting
-    Linux system is the foundation on which other software can be built to
-    expand the system as desired. At the end of this book, there is an
-    easy to use reference listing all of the programs, libraries, and
-    important files that have been installed.</para>
-
-  </sect2>
-
-  <sect2>
-    <title>Appendices</title>
-
-    <para>The appendices contain information that doesn't really fit anywhere
-    else in the book. Appendix A contains definitions of acronyms and
-    terms used in the book; Appendix B gives acknowledgments to people
-    who have helped work on the CLFS project and website; Appendix C and
-    D have information about package dependencies and the the build
-    order. Some architectures may have additional appendices for
-    arch-specific issues.</para>
-
-  </sect2>
-
-</sect1>
Index: OK/prologue/common/prerequisites.xml
===================================================================
--- BOOK/prologue/common/prerequisites.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,58 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="pre-prerequisites">
-  <?dbhtml filename="prerequisites.html"?>
-
-  <title>Prerequisites</title>
-
-  <para>Building a CLFS system is not a simple task. It requires a certain
-  level of existing knowledge of Unix system administration in order to
-  resolve problems, and correctly execute the commands listed. In particular,
-  as an absolute minimum, the reader should already have the ability to use
-  the command line (shell) to copy or move files and directories, list
-  directory and file contents, and change the current directory. It is also
-  expected that the reader has a reasonable knowledge of using and installing
-  Linux software. A basic knowledge of the architectures being used in 
-  the Cross LFS process and the host operating systems in use is also
-  required.</para>
-
-  <para>Because the CLFS book assumes <emphasis>at least</emphasis> this basic
-  level of skill, the various CLFS support forums are unlikely to be able to
-  provide you with much assistance. Your questions regarding such basic knowledge
-  will likely go unanswered, or you will be referred to the CLFS essential
-  pre-reading list.</para>
-
-  <para>Before building a CLFS system, we recommend reading the following
-  HOWTOs:</para>
-
-  <itemizedlist>
-    <listitem>
-      <para remap="verbatim">Software-Building-HOWTO
-      <ulink url="http://www.tldp.org/HOWTO/Software-Building-HOWTO.html"/></para>
-
-      <para>This is a comprehensive guide to building and installing
-      <quote>generic</quote> Unix software distributions under Linux.</para>
-    </listitem>
-    <listitem>
-      <para remap="verbatim">The Linux Users' Guide
-      <ulink url="http://www.linuxhq.com/guides/LUG/guide.html"/></para>
-
-      <para>This guide covers the usage of assorted Linux software.</para>
-    </listitem>
-    <listitem>
-      <para remap="verbatim">The Essential Pre-Reading Hint
-      <ulink url="&hints-root;essential_prereading.txt"/></para>
-
-      <para>This is a hint written specifically for users new to Linux.
-      It includes a list of links to excellent sources of information on a
-      wide range of topics. Anyone attempting to install CLFS should have an
-      understanding of many of the topics in this hint.</para>
-    </listitem>
-  </itemizedlist>
-
-</sect1>
Index: OK/prologue/common/typography.xml
===================================================================
--- BOOK/prologue/common/typography.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,80 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="pre-typography">
-  <?dbhtml filename="typography.html"?>
-
-  <title>Typography</title>
-
-  <para>To make things easier to follow, there are a few typographical
-  conventions used throughout this book. This section contains some
-  examples of the typographical format found throughout Cross-Compiled
-  Linux From Scratch.</para>
-
-<screen role="nodump"><userinput>./configure --prefix=/usr</userinput></screen>
-
-  <para>This form of text is designed to be typed exactly as seen unless
-  otherwise noted in the surrounding text. It is also used in the
-  explanation sections to identify which of the commands is being
-  referenced.</para>
-
-<screen><computeroutput>install-info: unknown option '--dir-file=/mnt/clfs/usr/info/dir'</computeroutput></screen>
-
-  <para>This form of text (fixed-width text) shows screen output,
-  probably as the result of commands issued.  This format is also used
-  to show filenames, such as <filename>/etc/ld.so.conf</filename>.</para>
-
-  <para><emphasis>Emphasis</emphasis></para>
-
-  <para>This form of text is used for several purposes in the book.
-  Its main purpose is to emphasize important points or items.</para>
-
-  <para><ulink url="&clfs-root;"/></para>
-
-  <para>This format is used for hyperlinks, both within the CLFS
-  community and to external pages. It includes HOWTOs, download locations,
-  and websites.</para>
-
-<screen role="nodump"><userinput>cat &gt; ${CLFS}/etc/group &lt;&lt; "EOF"
-<literal>root:x:0:
-bin:x:1:
-......</literal>
-EOF</userinput></screen>
-
-  <para>This format is used when creating configuration files. The first
-  command tells the system to create the file
-  <filename>${CLFS}/etc/group</filename> from whatever is typed on the
-  following lines until the sequence end of file (EOF) is encountered.
-  Therefore, this entire section is generally typed as seen.</para>
-
-  <para><replaceable>[REPLACED TEXT]</replaceable></para>
-
-  <para>This format is used to encapsulate text that is not to be typed
-  as seen or copied-and-pasted.</para>
-
-  <para><filename>passwd(5)</filename></para>
-
-  <para>This format is used to refer to a specific manual page (hereinafter
-  referred to simply as a <quote>man</quote> page). The number inside
-  parentheses indicates a specific section inside of <command>man</command>.
-  For example, <command>passwd</command> has two man pages. Per CLFS
-  installation instructions, those two man pages will be located at
-  <filename>/usr/share/man/man1/passwd.1</filename> and
-  <filename>/usr/share/man/man5/passwd.5</filename>. Both man pages have
-  different information in them. When the book uses
-  <filename>passwd(5)</filename> it is specifically referring to
-  <filename>/usr/share/man/man5/passwd.5</filename>.
-  <command>man passwd</command> will print the first man page it finds
-  that matches <quote>passwd</quote>, which will be
-  <filename>/usr/share/man/man1/passwd.1</filename>. For this example,
-  you will need to run <command>man 5 passwd</command> in order to read
-  the specific page being referred to. It should be noted that most man
-  pages do not have duplicate page names in different sections. Therefore,
-  <command>man <replaceable>[program name]</replaceable></command> is
-  generally sufficient.</para>
-
-</sect1>
Index: OK/prologue/mips/bookinfo.xml
===================================================================
--- BOOK/prologue/mips/bookinfo.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<bookinfo>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/title)"/>
-  
-  <subtitle>Version &version-mips;</subtitle>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/authorgroup)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/copyright)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(bookinfo/bibliosource)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/legalnotice)"/>
-
-</bookinfo>
Index: OK/prologue/mips64-64/bookinfo.xml
===================================================================
--- BOOK/prologue/mips64-64/bookinfo.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<bookinfo>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/title)"/>
-  
-  <subtitle>Version &version-mips64-64;</subtitle>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/authorgroup)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/copyright)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(bookinfo/bibliosource)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/legalnotice)"/>
-
-</bookinfo>
Index: OK/prologue/mips64/bookinfo.xml
===================================================================
--- BOOK/prologue/mips64/bookinfo.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<bookinfo>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/title)"/>
-  
-  <subtitle>Version &version-mips64;</subtitle>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/authorgroup)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/copyright)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(bookinfo/bibliosource)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/legalnotice)"/>
-
-</bookinfo>
Index: OK/prologue/ppc/bookinfo.xml
===================================================================
--- BOOK/prologue/ppc/bookinfo.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<bookinfo>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/title)"/>
-  
-  <subtitle>Version &version-ppc;</subtitle>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/authorgroup)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/copyright)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(bookinfo/bibliosource)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/legalnotice)"/>
-
-</bookinfo>
Index: OK/prologue/ppc64/bookinfo.xml
===================================================================
--- BOOK/prologue/ppc64/bookinfo.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<bookinfo>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/title)"/>
-  
-  <subtitle>Version &version-ppc64;</subtitle>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/authorgroup)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/copyright)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(bookinfo/bibliosource)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/legalnotice)"/>
-
-</bookinfo>
Index: OK/prologue/preface.xml
===================================================================
--- BOOK/prologue/preface.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,22 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<preface id="preface">
-  <?dbhtml dir="prologue"?>
-  <?dbhtml filename="preface.html"?>
-
-  <title>Preface</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/foreword.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/audience.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/prerequisites.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/hostreqs.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/typography.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/organization.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/errata.xml"/>
-
-</preface>
Index: OK/prologue/sparc/bookinfo.xml
===================================================================
--- BOOK/prologue/sparc/bookinfo.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<bookinfo>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/title)"/>
-  
-  <subtitle>Version &version-sparc;</subtitle>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/authorgroup)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/copyright)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(bookinfo/bibliosource)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/legalnotice)"/>
-
-</bookinfo>
Index: OK/prologue/sparc64-64/bookinfo.xml
===================================================================
--- BOOK/prologue/sparc64-64/bookinfo.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<bookinfo>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/title)"/>
-
-  <subtitle>Version &version-sparc64-64;</subtitle>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/authorgroup)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/copyright)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(bookinfo/bibliosource)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/legalnotice)"/>
-
-</bookinfo>
Index: OK/prologue/sparc64/bookinfo.xml
===================================================================
--- BOOK/prologue/sparc64/bookinfo.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<bookinfo>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/title)"/>
-
-  <subtitle>Version &version-sparc64;</subtitle>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/authorgroup)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/copyright)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(bookinfo/bibliosource)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/legalnotice)"/>
-
-</bookinfo>
Index: OK/prologue/x86/bookinfo.xml
===================================================================
--- BOOK/prologue/x86/bookinfo.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,86 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<bookinfo>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../index.xml"
-  xpointer="xpointer(/bookinfo/title)"/>
-
-  <subtitle>Version &version-x86;</subtitle>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../index.xml"
-  xpointer="xpointer(/bookinfo/authorgroup)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../index.xml"
-  xpointer="xpointer(/bookinfo/copyright)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../index.xml"
-  xpointer="xpointer(bookinfo/bibliosource)"/>
-
-  <legalnotice>
-    <para>Copyright &copy; 2005-&year;, Jim Gifford &amp; Ryan Oliver</para>
-
-    <para>All rights reserved.</para>
-
-    <para>This material may be distributed only subject to the terms and
-    conditions set forth in the <xref linkend="license"/> v1.0 or later
-    (the latest version is presently available at <ulink
-    url="http://www.opencontent.org/openpub/"/>).</para>
-
-    <!-- Modifications and limitations to the OPL (see section VI)
-    can be place here, if needed. -->
-
-    <para><trademark class='registered'>Linux</trademark> is a registered
-    trademark of Linus Torvalds.</para>
-
-    <para>This book is based on the "Linux From Scratch" book, that was
-    released under the following license:</para>
-
-    <para>Copyright (c) 1999&ndash;2006, Gerard Beekmans</para>
-
-    <para>All rights reserved.</para>
-
-    <para>Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are
-    met:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>Redistributions in any form must retain the above copyright
-        notice, this list of conditions and the following disclaimer</para>
-      </listitem>
-      <listitem>
-        <para>Neither the name of <quote>Linux From Scratch</quote> nor the
-        names of its contributors may be used to endorse or promote products
-        derived from  this material without specific prior written
-        permission</para>
-      </listitem>
-      <listitem>
-        <para>Any material derived from Linux From Scratch must contain
-        a reference to the <quote>Linux From Scratch</quote> project</para>
-      </listitem>
-    </itemizedlist>
-
-    <para>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-    <quote>AS IS</quote> AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-    BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-    FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
-    CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-    EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-    PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-    OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-    WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-    OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-    ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.</para>
-
-  </legalnotice>
-
-</bookinfo>
Index: OK/prologue/x86_64-64/bookinfo.xml
===================================================================
--- BOOK/prologue/x86_64-64/bookinfo.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<bookinfo>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/title)"/>
-
-  <subtitle>Version &version-x86_64-64;</subtitle>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/authorgroup)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/copyright)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(bookinfo/bibliosource)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/legalnotice)"/>
-
-</bookinfo>
Index: OK/prologue/x86_64/bookinfo.xml
===================================================================
--- BOOK/prologue/x86_64/bookinfo.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,32 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE bookinfo PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<bookinfo>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/title)"/>
-
-  <subtitle>Version &version-x86_64;</subtitle>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/authorgroup)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/copyright)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(bookinfo/bibliosource)"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../x86/bookinfo.xml"
-  xpointer="xpointer(/bookinfo/legalnotice)"/>
-
-</bookinfo>
Index: OK/render-jeremy.sh
===================================================================
--- BOOK/render-jeremy.sh	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,2 +1,0 @@
-#!/bin/bash
-make XSLROOTDIR=/usr/share/sgml/docbook/xsl-stylesheets-1.69.1-5 ${@}
Index: OK/sparc-index.xml
===================================================================
--- BOOK/sparc-index.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,84 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "general.ent">
-  %general-entities;
-]>
-
-<book>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/sparc/bookinfo.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/dedication.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/preface.xml"/>
-
-  <part id="part1">
-    <?dbhtml filename="part1.html"?>
-
-    <title>Introduction</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="introduction/sparc-chapter.xml"/>
-
-  </part>
-
-  <part id="part2">
-    <?dbhtml filename="part2.html"?>
-
-    <title>Preparing for the Build</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="partitioning/sparc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="materials/sparc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-preps/chapter.xml"/>
-
-  </part>
-
-  <part id="part3">
-    <?dbhtml filename="part3.html"?>
-
-    <title>Make the Cross-Compile Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cross-tools/sparc-chapter.xml"/>
-
-  </part>
-
-  <part id="part4">
-    <?dbhtml filename="part4.html"?>
-
-    <title>Building the Basic Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="temp-system/sparc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="boot/sparc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="chroot/sparc-chapter.xml"/>
-
-  </part>
-
-  <part id="part5">
-    <?dbhtml filename="part5.html"?>
-
-    <title>Building the CLFS System</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/sparc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/sparc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/sparc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/sparc-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>
-
-  </part>
-
-  <part id="part6">
-    <?dbhtml filename="part6.html"?>
-
-    <title>Appendices</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acknowledgments.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/sparc.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/license.xml"/>
-
-  </part>
-
-  <index/>
-
-</book>
Index: OK/sparc64-64-index.xml
===================================================================
--- BOOK/sparc64-64-index.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,84 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "general.ent">
-  %general-entities;
-]>
-
-<book>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/sparc64-64/bookinfo.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/dedication.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/preface.xml"/>
-
-  <part id="part1">
-    <?dbhtml filename="part1.html"?>
-
-    <title>Introduction</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="introduction/sparc64-64-chapter.xml"/>
-
-  </part>
-
-  <part id="part2">
-    <?dbhtml filename="part2.html"?>
-
-    <title>Preparing for the Build</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="partitioning/sparc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="materials/sparc64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-preps/chapter.xml"/>
-
-  </part>
-
-  <part id="part3">
-    <?dbhtml filename="part3.html"?>
-
-    <title>Make the Cross-Compile Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cross-tools/sparc64-64-chapter.xml"/>
-
-  </part>
-
-  <part id="part4">
-    <?dbhtml filename="part4.html"?>
-
-    <title>Building the Basic Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="temp-system/sparc64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="boot/sparc64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="chroot/sparc64-64-chapter.xml"/>
-
-  </part>
-
-  <part id="part5">
-    <?dbhtml filename="part5.html"?>
-
-    <title>Building the CLFS System</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/sparc64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/sparc64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/sparc64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/sparc64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>
-
-  </part>
-
-  <part id="part6">
-    <?dbhtml filename="part6.html"?>
-
-    <title>Appendices</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acknowledgments.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/sparc.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/license.xml"/>
-
-  </part>
-
-  <index/>
-
-</book>
Index: OK/sparc64-index.xml
===================================================================
--- BOOK/sparc64-index.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,84 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "general.ent">
-  %general-entities;
-]>
-
-<book>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/sparc64/bookinfo.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/dedication.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/preface.xml"/>
-
-  <part id="part1">
-    <?dbhtml filename="part1.html"?>
-
-    <title>Introduction</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="introduction/sparc64-chapter.xml"/>
-
-  </part>
-
-  <part id="part2">
-    <?dbhtml filename="part2.html"?>
-
-    <title>Preparing for the Build</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="partitioning/sparc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="materials/sparc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-preps/chapter.xml"/>
-
-  </part>
-
-  <part id="part3">
-    <?dbhtml filename="part3.html"?>
-
-    <title>Make the Cross-Compile Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cross-tools/sparc64-chapter.xml"/>
-
-  </part>
-
-  <part id="part4">
-    <?dbhtml filename="part4.html"?>
-
-    <title>Building the Basic Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="temp-system/sparc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="boot/sparc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="chroot/sparc64-chapter.xml"/>
-
-  </part>
-
-  <part id="part5">
-    <?dbhtml filename="part5.html"?>
-
-    <title>Building the CLFS System</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/sparc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/sparc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/sparc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/sparc64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>
-
-  </part>
-
-  <part id="part6">
-    <?dbhtml filename="part6.html"?>
-
-    <title>Appendices</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acknowledgments.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/sparc.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/license.xml"/>
-
-  </part>
-
-  <index/>
-
-</book>
Index: OK/stylesheets/clfs-chunked.xsl
===================================================================
--- BOOK/stylesheets/clfs-chunked.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,18 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-    <!-- LFS top-level chunk templates. -->
-  <xsl:import href="lfs-xsl/chunkfast.xsl"/>
-
-    <!-- The LFS book type to be processed (lfs, blfs, clfs, or hlfs) -->
-  <xsl:param name="book-type">clfs</xsl:param>
-
-</xsl:stylesheet>
Index: OK/stylesheets/clfs-nochunks.xsl
===================================================================
--- BOOK/stylesheets/clfs-nochunks.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,18 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-    <!-- LFS top-level no-chunk templates. -->
-  <xsl:import href="lfs-xsl/nochunks.xsl"/>
-
-    <!-- The LFS book type to be processed (lfs, blfs, clfs, or hlfs) -->
-  <xsl:param name="book-type">clfs</xsl:param>
-
-</xsl:stylesheet>
Index: OK/stylesheets/clfs-pdf.xsl
===================================================================
--- BOOK/stylesheets/clfs-pdf.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,18 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-    <!-- LFS top-level pdf templates. -->
-  <xsl:import href="lfs-xsl/pdf.xsl"/>
-
-    <!-- The LFS book type to be processed (lfs, blfs, clfs, or hlfs) -->
-  <xsl:param name="book-type">clfs</xsl:param>
-
-</xsl:stylesheet>
Index: OK/stylesheets/dump-commands.xsl
===================================================================
--- BOOK/stylesheets/dump-commands.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,84 +1,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:exsl="http://exslt.org/common"
-    extension-element-prefixes="exsl"
-    version="1.0">
-
-<!-- XSLT stylesheet to extract commands from [B,H]LFS books. -->
-
-  <xsl:template match="/">
-    <xsl:apply-templates select="//sect1"/>
-  </xsl:template>
-
-  <xsl:template match="sect1">
-      <!-- The dirs names -->
-    <xsl:variable name="pi-dir" select="../processing-instruction('dbhtml')"/>
-    <xsl:variable name="pi-dir-value" select="substring-after($pi-dir,'dir=')"/>
-    <xsl:variable name="quote-dir" select="substring($pi-dir-value,1,1)"/>
-    <xsl:variable name="dirname" select="substring-before(substring($pi-dir-value,2),$quote-dir)"/>
-      <!-- The file names -->
-    <xsl:variable name="pi-file" select="processing-instruction('dbhtml')"/>
-    <xsl:variable name="pi-file-value" select="substring-after($pi-file,'filename=')"/>
-    <xsl:variable name="filename" select="substring-before(substring($pi-file-value,2),'.html')"/>
-      <!-- The build order -->
-    <xsl:variable name="position" select="position()"/>
-    <xsl:variable name="order">
-      <xsl:choose>
-        <xsl:when test="string-length($position) = 1">
-          <xsl:text>00</xsl:text>
-          <xsl:value-of select="$position"/>
-        </xsl:when>
-        <xsl:when test="string-length($position) = 2">
-          <xsl:text>0</xsl:text>
-          <xsl:value-of select="$position"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$position"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-      <!-- Creating dirs and files -->
-    <exsl:document href="{$dirname}/{$order}-{$filename}" method="text">
-      <xsl:apply-templates select=".//screen"/>
-    </exsl:document>
-  </xsl:template>
-
-  <xsl:template match="screen">
-    <xsl:if test="child::* = userinput">
-      <xsl:choose>
-        <xsl:when test="@role = 'nodump'"/>
-        <xsl:when test="@role = 'root'">
-          <xsl:text>&#xA;</xsl:text>
-          <xsl:text># Run this as root</xsl:text>
-          <xsl:apply-templates select="userinput"/>
-          <xsl:text># End root commands</xsl:text>
-          <xsl:text>&#xA;</xsl:text>
-	</xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="userinput"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-  </xsl:template>
-
-  <xsl:template match="userinput">
-    <xsl:text>&#xA;</xsl:text>
-    <xsl:if test=".//replaceable">
-      <xsl:text># This block must be edited to suit your needs.</xsl:text>
-    </xsl:if>
-    <xsl:text>&#xA;</xsl:text>
-    <xsl:apply-templates/>
-    <xsl:text>&#xA;</xsl:text>
-    <xsl:if test=".//replaceable">
-      <xsl:text># End of editable block.</xsl:text>
-    </xsl:if>
-    <xsl:text>&#xA;</xsl:text>
-  </xsl:template>
-
-  <xsl:template match="replaceable">
-    <xsl:text>**EDITME</xsl:text>
-    <xsl:apply-templates/>
-    <xsl:text>EDITME**</xsl:text>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/chunk-master.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/chunk-master.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,53 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-   <!-- Top-level chunked code for normal processing.
-        Import customized output templates.
-        Include customized chunk templates.
-        Replaces {docbook-xsl}/xhtml/chunk.xsl -->
-
-    <!-- Our master non-chunking presentation templates -->
-  <xsl:import href="chunk-slave.xsl"/>
-
-    <!-- Upstream chunk code named templates -->
-  <xsl:import href="docbook-xsl-snapshot/xhtml/chunk-common.xsl"/>
-
-    <!-- Upstream chunk code match templates -->
-  <xsl:include href="docbook-xsl-snapshot/xhtml/chunk-code.xsl"/>
-
-    <!-- Including our customized chunks templates -->
-  <xsl:include href="xhtml/lfs-index.xsl"/>
-  <xsl:include href="xhtml/lfs-legalnotice.xsl"/>
-  <xsl:include href="xhtml/lfs-navigational.xsl"/>
-
-    <!-- sect1:
-           Prevent creation of dummy sect1 files used to emulate sub-chapters. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/chunk-code.xsl
-         It match also others sect* tags. The code for that tags is unchanged. -->
-  <xsl:template match="sect1">
-    <xsl:variable name="ischunk">
-      <xsl:call-template name="chunk"/>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="@role = 'dummy'"/>
-      <xsl:when test="not(parent::*)">
-        <xsl:call-template name="process-chunk-element"/>
-      </xsl:when>
-      <xsl:when test="$ischunk = 0">
-        <xsl:apply-imports/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="process-chunk-element"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/chunk-slave.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/chunk-slave.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-   <!-- Second level chunked output template.
-        Sets global params and include customized elements templates. -->
-
-    <!-- Upstream XHTML presentation templates -->
-  <xsl:import href="docbook-xsl-snapshot/xhtml/docbook.xsl"/>
-
-    <!-- Use ISO-8859-1 for output instead of default UTF-8 -->
-  <xsl:param name="chunker.output.encoding" select="'ISO-8859-1'"/>
-
-    <!-- Including our customized elements templates -->
-  <xsl:include href="common.xsl"/>
-  <xsl:include href="xhtml/lfs-admon.xsl"/>
-  <xsl:include href="xhtml/lfs-mixed.xsl"/>
-  <xsl:include href="xhtml/lfs-sections.xsl"/>
-  <xsl:include href="xhtml/lfs-titles.xsl"/>
-  <xsl:include href="xhtml/lfs-toc.xsl"/>
-  <xsl:include href="xhtml/lfs-xref.xsl"/>
-
-    <!-- The CSS Stylesheets. We set here relative path from sub-dirs HTML files.
-    The path from top-level HTML files (index.html, partX.html, etc) MUST be
-    fixed via a sed in the Makefile-->
-    <!-- Master CSS Stylesheet -->
-  <xsl:param name="html.stylesheet" select="'../stylesheets/lfs.css'"/>
-    <!-- Print CSS Stylesheet -->
-    <!-- The original template is in {docbook-xsl}/xhtml/docbook.xsl -->
-  <xsl:template name='user.head.content'>
-     <link rel="stylesheet" href="../stylesheets/lfs-print.css" type="text/css" media="print"/>
-  </xsl:template>
-
-    <!-- Dropping some unwanted style attributes -->
-  <xsl:param name="ulink.target" select="''"/>
-  <xsl:param name="css.decoration" select="0"/>
-
-    <!-- No XML declaration -->
-  <xsl:param name="chunker.output.omit-xml-declaration" select="'yes'"/>
-
-    <!-- Control generation of ToCs and LoTs -->
-  <xsl:param name="generate.toc">
-    book      toc,title
-    preface   toc
-    part      toc
-    chapter   toc
-    appendix  nop
-    sect1     nop
-    sect2     nop
-    sect3     nop
-    sect4     nop
-    sect5     nop
-    section   nop
-  </xsl:param>
-
-    <!-- How deep should recursive sections appear in the TOC? -->
-  <xsl:param name="toc.section.depth">1</xsl:param>
-
-    <!-- How maximaly deep should be each TOC? -->
-  <xsl:param name="toc.max.depth">3</xsl:param>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/chunkfast.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/chunkfast.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,76 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                xmlns:exsl="http://exslt.org/common"
-                xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0"
-                version="1.0"
-                exclude-result-prefixes="cf exsl">
-
-   <!-- Top-level chunked code for fast processing.
-        Import standart customized chunk code.
-        Replaces {docbook-xsl}/xhtml/chunkfast.xsl
-
-        Note: Using this file as the top-level for chunked output implies that
-              profiling must be done on a previous step. -->
-
-    <!-- Our master chunking templates -->
-  <xsl:import href="chunk-master.xsl"/>
-
-    <!-- Use chunk.fast code? 1 = yes, 0 = no -->
-  <xsl:param name="chunk.fast" select="1"/>
-
-  <!-- The code below was copied as-is from {docbook-xsl}/xhtml/chunkfast.xsl -->
-
-  <xsl:variable name="chunks" select="exsl:node-set($chunk.hierarchy)//cf:div"/>
-
-  <xsl:template name="process-chunk-element">
-    <xsl:choose>
-      <xsl:when test="$chunk.fast != 0 and function-available('exsl:node-set')">
-        <xsl:variable name="genid" select="generate-id()"/>
-
-        <xsl:variable name="div" select="$chunks[@id=$genid or @xml:id=$genid]"/>
-
-        <xsl:variable name="prevdiv" select="($div/preceding-sibling::cf:div|$div/preceding::cf:div|$div/parent::cf:div)[last()]"/>
-        <xsl:variable name="prev" select="key('genid', ($prevdiv/@id|$prevdiv/@xml:id)[1])"/>
-
-        <xsl:variable name="nextdiv" select="($div/following-sibling::cf:div|$div/following::cf:div|$div/cf:div)[1]"/>
-        <xsl:variable name="next" select="key('genid', ($nextdiv/@id|$nextdiv/@xml:id)[1])"/>
-
-        <xsl:choose>
-          <xsl:when test="$onechunk != 0 and parent::*">
-            <xsl:apply-imports/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="process-chunk">
-              <xsl:with-param name="prev" select="$prev"/>
-              <xsl:with-param name="next" select="$next"/>
-            </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:choose>
-          <xsl:when test="$onechunk != 0 and not(parent::*)">
-            <xsl:call-template name="chunk-all-sections"/>
-          </xsl:when>
-          <xsl:when test="$onechunk != 0">
-            <xsl:apply-imports/>
-          </xsl:when>
-          <xsl:when test="$chunk.first.sections = 0">
-            <xsl:call-template name="chunk-first-section-with-parent"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="chunk-all-sections"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/common.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/common.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,458 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-  <!-- This stylesheet contains common params and templates for all outputs. -->
-
-    <!-- This file contains our localization strings (for internationalization) -->
-  <xsl:param name="local.l10n.xml" select="document('lfs-l10n.xml')"/>
-
-
-<!-- INDEX -->
-
-    <!-- Should the Index be generated? 1 = yes, 0 = no -->
-  <xsl:param name="generate.index" select="1"></xsl:param>
-
-    <!-- The indexing method used. Only 'basic' is supported by xsltproc -->
-  <xsl:param name="index.method" select="'basic'"></xsl:param>
-
-    <!-- The Index title:
-           We create this param to can have gentext support in both
-           the Index page title and links that point to the Index page.
-           It also allow us to change the title, if wanted.
-           Note: To change the title involves creating the appropiate
-           entries in lfs-l10n.xml -->
-  <xsl:param name="index-title">Index</xsl:param>
-
-    <!-- Index title generation. -->
-    <!-- The original template is in {docbook-xsl}/common/titles.xsl -->
-  <xsl:template match="index" mode="title.markup">
-    <xsl:param name="allow-anchors" select="0"/>
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="$index-title"/>
-    </xsl:call-template>
-  </xsl:template>
-
-    <!-- indexterm:
-           Dropping unneeded anchors and fo:wraper elemments. -->
-    <!-- The original templates are in {docbook-xsl}/{xhtml,fo}/index.xsl -->
-  <xsl:template match="indexterm"/>
-
-<!-- -->
-
-<!-- LABELS -->
-
-    <!-- Are sections enumerated? 1 = yes, 0 = no -->
-  <xsl:param name="section.autolabel" select="1"/>
-
-    <!-- Do section labels include the component label? 1 = yes, 0 = no -->
-  <xsl:param name="section.label.includes.component.label" select="1"/>
-
-    <!-- sect1 label.markup:
-           Use lowercase roman numbers for sect1 in preface. -->
-    <!-- The original template is in {docbook-xsl}/common/labels.xsl -->
-  <xsl:template match="sect1" mode="label.markup">
-    <!-- if the parent is a component, maybe label that too -->
-    <xsl:variable name="parent.is.component">
-      <xsl:call-template name="is.component">
-        <xsl:with-param name="node" select=".."/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="component.label">
-      <xsl:if test="$section.label.includes.component.label != 0
-                    and $parent.is.component != 0">
-        <xsl:variable name="parent.label">
-          <xsl:apply-templates select=".." mode="label.markup"/>
-        </xsl:variable>
-        <xsl:if test="$parent.label != ''">
-          <xsl:apply-templates select=".." mode="label.markup"/>
-          <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
-        </xsl:if>
-      </xsl:if>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="@label">
-        <xsl:value-of select="@label"/>
-      </xsl:when>
-      <xsl:when test="$section.autolabel != 0">
-        <xsl:copy-of select="$component.label"/>
-        <xsl:choose>
-          <xsl:when test="ancestor::preface">
-            <xsl:number format="i" count="sect1"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:number format="1" count="sect1"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- sect2 label.markup:
-           Skip numeration for sect2 with empty title. -->
-    <!-- The original template is in {docbook-xsl}/common/labels.xsl
-         It match also sect3, sect4, and sect5, that are unchanged. -->
-  <xsl:template match="sect2" mode="label.markup">
-      <!-- label the parent -->
-      <xsl:variable name="parent.section.label">
-        <xsl:call-template name="label.this.section">
-          <xsl:with-param name="section" select=".."/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:if test="$parent.section.label != '0'">
-        <xsl:apply-templates select=".." mode="label.markup"/>
-        <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
-      </xsl:if>
-      <xsl:choose>
-        <xsl:when test="@label">
-          <xsl:value-of select="@label"/>
-        </xsl:when>
-        <xsl:when test="$section.autolabel != 0">
-          <xsl:choose>
-            <!-- If the first sect2 isn't numbered, renumber the remainig sections -->
-            <xsl:when test="string-length(../sect2[1]/title) = 0">
-              <xsl:variable name="totalsect2">
-                <xsl:number count="sect2"/>
-              </xsl:variable>
-              <xsl:number value="$totalsect2 - 1"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:number count="sect2"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-      </xsl:choose>
-  </xsl:template>
-
-    <!-- object.title.template:
-           Skip numeration for sectX > sect1 in preface. -->
-    <!-- The original template is in {docbook-xsl}/common/gentext.xsl. -->
-  <xsl:template match="section|sect1|sect2|sect3|sect4|sect5|simplesect|bridgehead"
-                mode="object.title.template">
-    <xsl:variable name="is.numbered">
-      <xsl:call-template name="label.this.section"/>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="$is.numbered != 0 and not(ancestor::preface/sect1)">
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'title-numbered'"/>
-          <xsl:with-param name="name">
-            <xsl:call-template name="xpath.location"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'title-unnumbered'"/>
-          <xsl:with-param name="name">
-            <xsl:call-template name="xpath.location"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-<!-- -->
-
-<!-- XREF (see {xhtml,pdf}/xref.xsl) -->
-
-    <!-- mode object.xref.markup:
-           Propagate role to named template substitute-markup -->
-    <!-- The original template is in {docbook-xsl}/common/gentext.xsl -->
-  <xsl:template match="*" mode="object.xref.markup">
-    <xsl:param name="purpose"/>
-    <xsl:param name="xrefstyle"/>
-    <xsl:param name="referrer"/>
-    <xsl:param name="verbose" select="1"/>
-    <xsl:param name="role"/>
-    <xsl:variable name="template">
-      <xsl:choose>
-        <xsl:when test="starts-with(normalize-space($xrefstyle), 'select:')">
-          <xsl:call-template name="make.gentext.template">
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-            <xsl:with-param name="purpose" select="$purpose"/>
-            <xsl:with-param name="referrer" select="$referrer"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="starts-with(normalize-space($xrefstyle), 'template:')">
-          <xsl:value-of select="substring-after(normalize-space($xrefstyle), 'template:')"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="." mode="object.xref.template">
-            <xsl:with-param name="purpose" select="$purpose"/>
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-            <xsl:with-param name="referrer" select="$referrer"/>
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="$template = '' and $verbose != 0">
-      <xsl:message>
-        <xsl:text>object.xref.markup: empty xref template</xsl:text>
-        <xsl:text> for linkend="</xsl:text>
-        <xsl:value-of select="@id|@xml:id"/>
-        <xsl:text>" and @xrefstyle="</xsl:text>
-        <xsl:value-of select="$xrefstyle"/>
-        <xsl:text>"</xsl:text>
-      </xsl:message>
-    </xsl:if>
-    <xsl:call-template name="substitute-markup">
-      <xsl:with-param name="purpose" select="$purpose"/>
-      <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-      <xsl:with-param name="referrer" select="$referrer"/>
-      <xsl:with-param name="template" select="$template"/>
-      <xsl:with-param name="verbose" select="$verbose"/>
-      <xsl:with-param name="role" select="$role"/>
-    </xsl:call-template>
-  </xsl:template>
-
-    <!-- substitute-markup:
-           Propagate role to mode insert.title.markup -->
-    <!-- The original template is in {docbook-xsl}/common/gentext.xsl -->
-  <xsl:template name="substitute-markup">
-    <xsl:param name="template" select="''"/>
-    <xsl:param name="allow-anchors" select="'0'"/>
-    <xsl:param name="title" select="''"/>
-    <xsl:param name="subtitle" select="''"/>
-    <xsl:param name="docname" select="''"/>
-    <xsl:param name="label" select="''"/>
-    <xsl:param name="pagenumber" select="''"/>
-    <xsl:param name="purpose"/>
-    <xsl:param name="xrefstyle"/>
-    <xsl:param name="referrer"/>
-    <xsl:param name="verbose"/>
-    <xsl:param name="role"/>
-    <xsl:choose>
-      <xsl:when test="contains($template, '%')">
-        <xsl:value-of select="substring-before($template, '%')"/>
-        <xsl:variable name="candidate"
-                      select="substring(substring-after($template, '%'), 1, 1)"/>
-        <xsl:choose>
-          <xsl:when test="$candidate = 't'">
-            <xsl:apply-templates select="." mode="insert.title.markup">
-              <xsl:with-param name="purpose" select="$purpose"/>
-              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-              <xsl:with-param name="role" select="$role"/>
-              <xsl:with-param name="title">
-                <xsl:choose>
-                  <xsl:when test="$title != ''">
-                    <xsl:copy-of select="$title"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:apply-templates select="." mode="title.markup">
-                      <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-                      <xsl:with-param name="verbose" select="$verbose"/>
-                    </xsl:apply-templates>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:with-param>
-            </xsl:apply-templates>
-          </xsl:when>
-          <xsl:when test="$candidate = 's'">
-            <xsl:apply-templates select="." mode="insert.subtitle.markup">
-              <xsl:with-param name="purpose" select="$purpose"/>
-              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-              <xsl:with-param name="subtitle">
-                <xsl:choose>
-                  <xsl:when test="$subtitle != ''">
-                    <xsl:copy-of select="$subtitle"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:apply-templates select="." mode="subtitle.markup">
-                      <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-                    </xsl:apply-templates>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:with-param>
-            </xsl:apply-templates>
-          </xsl:when>
-          <xsl:when test="$candidate = 'n'">
-            <xsl:apply-templates select="." mode="insert.label.markup">
-              <xsl:with-param name="purpose" select="$purpose"/>
-              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-              <xsl:with-param name="label">
-                <xsl:choose>
-                  <xsl:when test="$label != ''">
-                    <xsl:copy-of select="$label"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:apply-templates select="." mode="label.markup"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:with-param>
-            </xsl:apply-templates>
-          </xsl:when>
-          <xsl:when test="$candidate = 'p'">
-            <xsl:apply-templates select="." mode="insert.pagenumber.markup">
-              <xsl:with-param name="purpose" select="$purpose"/>
-              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-              <xsl:with-param name="pagenumber">
-                <xsl:choose>
-                  <xsl:when test="$pagenumber != ''">
-                    <xsl:copy-of select="$pagenumber"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:apply-templates select="." mode="pagenumber.markup"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:with-param>
-            </xsl:apply-templates>
-          </xsl:when>
-          <xsl:when test="$candidate = 'o'">
-            <!-- olink target document title -->
-            <xsl:apply-templates select="." mode="insert.olink.docname.markup">
-              <xsl:with-param name="purpose" select="$purpose"/>
-              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-              <xsl:with-param name="docname">
-                <xsl:choose>
-                  <xsl:when test="$docname != ''">
-                    <xsl:copy-of select="$docname"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:apply-templates select="." mode="olink.docname.markup"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:with-param>
-            </xsl:apply-templates>
-          </xsl:when>
-          <xsl:when test="$candidate = 'd'">
-            <xsl:apply-templates select="." mode="insert.direction.markup">
-              <xsl:with-param name="purpose" select="$purpose"/>
-              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-              <xsl:with-param name="direction">
-                <xsl:choose>
-                  <xsl:when test="$referrer">
-                    <xsl:variable name="referent-is-below">
-                      <xsl:for-each select="preceding::xref">
-                        <xsl:if test="generate-id(.) = generate-id($referrer)">1</xsl:if>
-                      </xsl:for-each>
-                    </xsl:variable>
-                    <xsl:choose>
-                      <xsl:when test="$referent-is-below = ''">
-                        <xsl:call-template name="gentext">
-                          <xsl:with-param name="key" select="'above'"/>
-                        </xsl:call-template>
-                      </xsl:when>
-                      <xsl:otherwise>
-                        <xsl:call-template name="gentext">
-                          <xsl:with-param name="key" select="'below'"/>
-                        </xsl:call-template>
-                      </xsl:otherwise>
-                    </xsl:choose>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:message>Attempt to use %d in gentext with no referrer!</xsl:message>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:with-param>
-            </xsl:apply-templates>
-          </xsl:when>
-          <xsl:when test="$candidate = '%' ">
-            <xsl:text>%</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:text>%</xsl:text><xsl:value-of select="$candidate"/>
-          </xsl:otherwise>
-        </xsl:choose>
-        <!-- recurse with the rest of the template string -->
-        <xsl:variable name="rest"
-              select="substring($template,
-              string-length(substring-before($template, '%'))+3)"/>
-        <xsl:call-template name="substitute-markup">
-          <xsl:with-param name="template" select="$rest"/>
-          <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-          <xsl:with-param name="title" select="$title"/>
-          <xsl:with-param name="subtitle" select="$subtitle"/>
-          <xsl:with-param name="docname" select="$docname"/>
-          <xsl:with-param name="label" select="$label"/>
-          <xsl:with-param name="pagenumber" select="$pagenumber"/>
-          <xsl:with-param name="purpose" select="$purpose"/>
-          <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-          <xsl:with-param name="referrer" select="$referrer"/>
-          <xsl:with-param name="verbose" select="$verbose"/>
-          <xsl:with-param name="role" select="$role"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$template"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-<!-- -->
-
-<!-- Total packages size calculation -->
-
-    <!-- returnvalue:
-            If the tag is not empty, apply the original template.
-            Otherwise apply the calculation template. -->
-  <xsl:template match="returnvalue">
-    <xsl:choose>
-      <xsl:when test="count(*)&gt;0">
-        <xsl:apply-imports/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="calculation">
-          <xsl:with-param name="scope" select="../../variablelist"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- Self-made calculation template. -->
-  <xsl:template name="calculation">
-    <xsl:param name="scope"/>
-    <xsl:param name="total">0</xsl:param>
-    <xsl:param name="position">1</xsl:param>
-    <xsl:variable name="tokens" select="count($scope/varlistentry)"/>
-    <xsl:variable name="token" select="$scope/varlistentry[$position]/term/token"/>
-    <xsl:variable name="size" select="substring-before($token,' KB')"/>
-    <xsl:variable name="rawsize">
-      <xsl:choose>
-        <xsl:when test="contains($size,',')">
-          <xsl:value-of select="concat(substring-before($size,','),substring-after($size,','))"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$size"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="$position &lt;= $tokens">
-        <xsl:call-template name="calculation">
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="position" select="$position +1"/>
-          <xsl:with-param name="total" select="$total + $rawsize"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:choose>
-          <xsl:when test="$total &lt; '1000'">
-            <xsl:value-of select="$total"/>
-            <xsl:text>  KB</xsl:text>
-          </xsl:when>
-          <xsl:when test="$total &gt; '1000' and $total &lt; '5000'">
-            <xsl:value-of select="substring($total,1,1)"/>
-            <xsl:text>,</xsl:text>
-            <xsl:value-of select="substring($total,2)"/>
-            <xsl:text>  KB</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="round($total div 1024)"/>
-            <xsl:text>  MB</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-<!-- -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/COPYING
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/COPYING	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,47 +1,0 @@
-Copyright
----------
-Copyright (C) 1999-2007 Norman Walsh
-Copyright (C) 2003 JiÅÃ­ Kosek
-Copyright (C) 2004-2007 Steve Ball
-Copyright (C) 2005-2007 The DocBook Project
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the ``Software''), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-Except as contained in this notice, the names of individuals
-credited with contribution to this software shall not be used in
-advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization
-from the individuals in question.
-
-Any stylesheet derived from this Software that is publically
-distributed will be identified with a different name and the
-version strings in any derived Software will be changed so that
-no possibility of confusion between the derived package and this
-Software will exist.
-
-Warranty
---------
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT.  IN NO EVENT SHALL NORMAN WALSH OR ANY OTHER
-CONTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-Contacting the Author
----------------------
-The DocBook XSL stylesheets are maintained by Norman Walsh,
-<ndw@nwalsh.com>, and members of the DocBook Project,
-<docbook-developers@sf.net>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/VERSION
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/VERSION	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,113 +1,0 @@
-<?xml version='1.0'?> <!-- -*- nxml -*- vim: set foldlevel=2: -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:fm="http://freshmeat.net/projects/freshmeat-submit/"
-  xmlns:sf="http://sourceforge.net/"
-  xmlns:dyn="http://exslt.org/dynamic"
-  xmlns:saxon="http://icl.com/saxon"
-  exclude-result-prefixes="fm sf"
-  version='1.0'>
-
-<xsl:output omit-xml-declaration="yes"/>
-
-<xsl:param name="get"/>
-<xsl:param name="VERSION" select="string(document('')//fm:Version[1])"/>
-<xsl:param name="Tag" select="concat('V',translate(string(document('')//fm:Version[1]),'.',''))"/>
-<xsl:param name="DistroTitle" select="string(document('')//fm:Branch[1])"/>
-<xsl:param name="sf-relid" select="0"/>
-
-<xsl:param name="DistroName">docbook-xsl</xsl:param>
-<xsl:param name="PreviousRelease">1.72.0</xsl:param>
-<xsl:param name="PreviousReleaseRevision">6549</xsl:param>
-<xsl:param name="Revision">$Revision$</xsl:param>
-<xsl:param name="VersionFileURL">$URL: https://docbook.svn.sourceforge.net/svnroot/docbook/trunk/xsl/VERSION $</xsl:param>
-
-<xsl:strip-space elements="fm:*"/>
-
-<fm:project>
-  <fm:Project>DocBook</fm:Project>
-  <fm:Branch>XSL Stylesheets</fm:Branch>
-  <fm:Version>1.73.2</fm:Version>
-<!--
-  <fm:License>MIT/X Consortium License</fm:License>
--->
-  <fm:Release-Focus>
-<!-- * Initial freshmeat announcement -->
-<!-- * Documentation -->
-<!-- * Code cleanup -->
-<!-- * Minor feature enhancements -->
-<!-- * Major feature enhancements -->
-Minor bugfixes
-<!-- * Major bugfixes -->
-<!-- * Minor security fixes -->
-<!-- * Major security fixes -->
-  </fm:Release-Focus>
-  <fm:Home-Page-URL>http://sourceforge.net/projects/docbook/</fm:Home-Page-URL>
-  <fm:Gzipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/{DISTRONAME-VERSION}.tar.gz?download</fm:Gzipped-Tar-URL>
-  <fm:Zipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/{DISTRONAME-VERSION}.zip?download</fm:Zipped-Tar-URL>
-  <fm:Bzipped-Tar-URL>http://prdownloads.sourceforge.net/docbook/{DISTRONAME-VERSION}.bz2?download</fm:Bzipped-Tar-URL>
-  <fm:Changelog-URL>http://sourceforge.net/project/shownotes.php?release_id={SFRELID}</fm:Changelog-URL>
-  <fm:CVS-URL>http://docbook.svn.sourceforge.net/viewvc/docbook/</fm:CVS-URL>
-  <fm:Mailing-List-URL>http://lists.oasis-open.org/archives/docbook-apps/</fm:Mailing-List-URL>
-  <fm:Changes>This is a bug-fix update to the 1.73.1 release.
-</fm:Changes>
-</fm:project>
-
-<xsl:template match="/" priority="-100">
-  <xsl:choose>
-    <xsl:when test="$get = 'Tag'">
-      <xsl:value-of select="$Tag"/>
-    </xsl:when>
-    <xsl:when test="$get = 'PreviousRelease'">
-      <xsl:value-of select="$PreviousRelease"/>
-    </xsl:when>
-    <xsl:when test="$get = 'PreviousReleaseRevision'">
-      <xsl:value-of select="$PreviousReleaseRevision"/>
-    </xsl:when>
-    <xsl:when test="$get = 'DistroTitle'">
-      <xsl:value-of select="$DistroTitle"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:if test="$sf-relid = 0">
-        <xsl:message terminate="yes">
-         <xsl:text>You must specify the sf-relid as a parameter.</xsl:text>
-        </xsl:message>
-      </xsl:if>
-      <xsl:apply-templates select="//fm:project"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="fm:project">
-  <xsl:apply-templates/>
-  <xsl:text>&#10;</xsl:text>
-  <xsl:apply-templates select="fm:Changes" mode="text"/>
-</xsl:template>
-
-<xsl:template match="fm:Changes"/>
-
-<xsl:template match="fm:Gzipped-Tar-URL|fm:Zipped-Tar-URL|fm:Bzipped-Tar-URL">
-  <xsl:value-of select="local-name(.)"/>
-  <xsl:text>: </xsl:text>
-  <xsl:value-of select="substring-before(., '{DISTRONAME-VERSION}')"/>
-  <xsl:value-of select="concat($DistroName, '-', $VERSION)"/>
-  <xsl:value-of select="substring-after(., '{DISTRONAME-VERSION}')"/>
-  <xsl:text>&#10;</xsl:text>
-</xsl:template>
-
-<xsl:template match="fm:Changelog-URL">
-  <xsl:value-of select="local-name(.)"/>
-  <xsl:text>: </xsl:text>
-  <xsl:value-of select="substring-before(., '{SFRELID}')"/>
-  <xsl:value-of select="$sf-relid"/>
-  <xsl:value-of select="substring-after(., '{SFRELID}')"/>
-  <xsl:text>&#10;</xsl:text>
-</xsl:template>
-
-<xsl:template match="fm:*">
-  <xsl:value-of select="local-name(.)"/>
-  <xsl:text>: </xsl:text>
-  <xsl:value-of select="normalize-space(.)"/>
-  <xsl:text>&#10;</xsl:text>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/common.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/common.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,1981 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-                xmlns:dyn="http://exslt.org/dynamic"
-                xmlns:saxon="http://icl.com/saxon"
-                exclude-result-prefixes="doc dyn saxon"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<doc:reference xmlns="" xml:id="base">
-  <info>
-    <title>Common Â» Base Template Reference</title>
-    <releaseinfo role="meta">
-      $Id$
-    </releaseinfo>
-  </info>
-  <!-- * yes, partintro is a valid child of a reference... -->
-  <partintro xml:id="partintro">
-    <title>Introduction</title>
-    <para>This is technical reference documentation for the âbaseâ
-      set of common templates in the DocBook XSL Stylesheets.</para>
-    <para>This is not intended to be user documentation. It is
-      provided for developers writing customization layers for the
-      stylesheets.</para>
-  </partintro>
-</doc:reference>
-
-<!-- ==================================================================== -->
-<!-- Establish strip/preserve whitespace rules -->
-
-<xsl:preserve-space elements="*"/>
-
-<xsl:strip-space elements="
-abstract affiliation anchor answer appendix area areaset areaspec
-artheader article audiodata audioobject author authorblurb authorgroup
-beginpage bibliodiv biblioentry bibliography biblioset blockquote book
-bookbiblio bookinfo callout calloutlist caption caution chapter
-citerefentry cmdsynopsis co collab colophon colspec confgroup
-copyright dedication docinfo editor entrytbl epigraph equation
-example figure footnote footnoteref formalpara funcprototype
-funcsynopsis glossary glossdef glossdiv glossentry glosslist graphicco
-group highlights imagedata imageobject imageobjectco important index
-indexdiv indexentry indexterm info informalequation informalexample
-informalfigure informaltable inlineequation inlinemediaobject
-itemizedlist itermset keycombo keywordset legalnotice listitem lot
-mediaobject mediaobjectco menuchoice msg msgentry msgexplan msginfo
-msgmain msgrel msgset msgsub msgtext note objectinfo
-orderedlist othercredit part partintro preface printhistory procedure
-programlistingco publisher qandadiv qandaentry qandaset question
-refentry reference refmeta refnamediv refsection refsect1 refsect1info refsect2
-refsect2info refsect3 refsect3info refsynopsisdiv refsynopsisdivinfo
-revhistory revision row sbr screenco screenshot sect1 sect1info sect2
-sect2info sect3 sect3info sect4 sect4info sect5 sect5info section
-sectioninfo seglistitem segmentedlist seriesinfo set setindex setinfo
-shortcut sidebar simplelist simplesect spanspec step subject
-subjectset substeps synopfragment table tbody textobject tfoot tgroup
-thead tip toc tocchap toclevel1 toclevel2 toclevel3 toclevel4
-toclevel5 tocpart varargs variablelist varlistentry videodata
-videoobject void warning subjectset
-
-classsynopsis
-constructorsynopsis
-destructorsynopsis
-fieldsynopsis
-methodparam
-methodsynopsis
-ooclass
-ooexception
-oointerface
-simplemsgentry
-manvolnum
-"/>
-<!-- ====================================================================== -->
-
-<doc:template name="is.component" xmlns="">
-<refpurpose>Tests if a given node is a component-level element</refpurpose>
-
-<refdescription id="is.component-desc">
-<para>This template returns '1' if the specified node is a component
-(Chapter, Appendix, etc.), and '0' otherwise.</para>
-</refdescription>
-
-<refparameter id="is.component-params">
-<variablelist>
-<varlistentry><term>node</term>
-<listitem>
-<para>The node which is to be tested.</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</refparameter>
-
-<refreturn id="is.component-returns">
-<para>This template returns '1' if the specified node is a component
-(Chapter, Appendix, etc.), and '0' otherwise.</para>
-</refreturn>
-</doc:template>
-
-<xsl:template name="is.component">
-  <xsl:param name="node" select="."/>
-  <xsl:choose>
-    <xsl:when test="local-name($node) = 'appendix'
-                    or local-name($node) = 'article'
-                    or local-name($node) = 'chapter'
-                    or local-name($node) = 'preface'
-                    or local-name($node) = 'bibliography'
-                    or local-name($node) = 'glossary'
-                    or local-name($node) = 'index'">1</xsl:when>
-    <xsl:otherwise>0</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ====================================================================== -->
-
-<doc:template name="is.section" xmlns="">
-<refpurpose>Tests if a given node is a section-level element</refpurpose>
-
-<refdescription id="is.section-desc">
-<para>This template returns '1' if the specified node is a section
-(Section, Sect1, Sect2, etc.), and '0' otherwise.</para>
-</refdescription>
-
-<refparameter id="is.section-params">
-<variablelist>
-<varlistentry><term>node</term>
-<listitem>
-<para>The node which is to be tested.</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</refparameter>
-
-<refreturn id="is.section-returns">
-<para>This template returns '1' if the specified node is a section
-(Section, Sect1, Sect2, etc.), and '0' otherwise.</para>
-</refreturn>
-</doc:template>
-
-<xsl:template name="is.section">
-  <xsl:param name="node" select="."/>
-  <xsl:choose>
-    <xsl:when test="local-name($node) = 'section'
-                    or local-name($node) = 'sect1'
-                    or local-name($node) = 'sect2'
-                    or local-name($node) = 'sect3'
-                    or local-name($node) = 'sect4'
-                    or local-name($node) = 'sect5'
-                    or local-name($node) = 'refsect1'
-                    or local-name($node) = 'refsect2'
-                    or local-name($node) = 'refsect3'
-                    or local-name($node) = 'simplesect'">1</xsl:when>
-    <xsl:otherwise>0</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ====================================================================== -->
-
-<doc:template name="section.level" xmlns="">
-<refpurpose>Returns the hierarchical level of a section</refpurpose>
-
-<refdescription id="section.level-desc">
-<para>This template calculates the hierarchical level of a section.
-The element <tag>sect1</tag> is at level 1, <tag>sect2</tag> is
-at level 2, etc.</para>
-
-<para>Recursive sections are calculated down to the fifth level.</para>
-</refdescription>
-
-<refparameter id="section.level-params">
-<variablelist>
-<varlistentry><term>node</term>
-<listitem>
-<para>The section node for which the level should be calculated.
-Defaults to the context node.</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</refparameter>
-
-<refreturn id="section.level-returns">
-<para>The section level, <quote>1</quote>, <quote>2</quote>, etc.
-</para>
-</refreturn>
-</doc:template>
-
-<xsl:template name="section.level">
-  <xsl:param name="node" select="."/>
-  <xsl:choose>
-    <xsl:when test="local-name($node)='sect1'">1</xsl:when>
-    <xsl:when test="local-name($node)='sect2'">2</xsl:when>
-    <xsl:when test="local-name($node)='sect3'">3</xsl:when>
-    <xsl:when test="local-name($node)='sect4'">4</xsl:when>
-    <xsl:when test="local-name($node)='sect5'">5</xsl:when>
-    <xsl:when test="local-name($node)='section'">
-      <xsl:choose>
-        <xsl:when test="$node/../../../../../../section">6</xsl:when>
-        <xsl:when test="$node/../../../../../section">5</xsl:when>
-        <xsl:when test="$node/../../../../section">4</xsl:when>
-        <xsl:when test="$node/../../../section">3</xsl:when>
-        <xsl:when test="$node/../../section">2</xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="local-name($node)='refsect1' or
-                    local-name($node)='refsect2' or
-                    local-name($node)='refsect3' or
-                    local-name($node)='refsection' or
-                    local-name($node)='refsynopsisdiv'">
-      <xsl:call-template name="refentry.section.level">
-        <xsl:with-param name="node" select="$node"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="local-name($node)='simplesect'">
-      <xsl:choose>
-        <xsl:when test="$node/../../sect1">2</xsl:when>
-        <xsl:when test="$node/../../sect2">3</xsl:when>
-        <xsl:when test="$node/../../sect3">4</xsl:when>
-        <xsl:when test="$node/../../sect4">5</xsl:when>
-        <xsl:when test="$node/../../sect5">5</xsl:when>
-        <xsl:when test="$node/../../section">
-          <xsl:choose>
-            <xsl:when test="$node/../../../../../section">5</xsl:when>
-            <xsl:when test="$node/../../../../section">4</xsl:when>
-            <xsl:when test="$node/../../../section">3</xsl:when>
-            <xsl:otherwise>2</xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>1</xsl:otherwise>
-  </xsl:choose>
-</xsl:template><!-- section.level -->
-
-<doc:template name="qanda.section.level" xmlns="">
-<refpurpose>Returns the hierarchical level of a QandASet</refpurpose>
-
-<refdescription id="qanda.section.level-desc">
-<para>This template calculates the hierarchical level of a QandASet.
-</para>
-</refdescription>
-
-<refreturn id="qanda.section.level-returns">
-<para>The level, <quote>1</quote>, <quote>2</quote>, etc.
-</para>
-</refreturn>
-</doc:template>
-
-<xsl:template name="qanda.section.level">
-  <xsl:variable name="section"
-                select="(ancestor::section
-                         |ancestor::simplesect
-                         |ancestor::sect5
-                         |ancestor::sect4
-                         |ancestor::sect3
-                         |ancestor::sect2
-                         |ancestor::sect1
-                         |ancestor::refsect3
-                         |ancestor::refsect2
-                         |ancestor::refsect1)[last()]"/>
-
-  <xsl:choose>
-    <xsl:when test="count($section) = '0'">1</xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="slevel">
-        <xsl:call-template name="section.level">
-          <xsl:with-param name="node" select="$section"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:value-of select="$slevel + 1"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- Finds the total section depth of a section in a refentry -->
-<xsl:template name="refentry.section.level">
-  <xsl:param name="node" select="."/>
-
-  <xsl:variable name="RElevel">
-    <xsl:call-template name="refentry.level">
-      <xsl:with-param name="node" select="$node/ancestor::refentry[1]"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="levelinRE">
-    <xsl:choose>
-      <xsl:when test="local-name($node)='refsynopsisdiv'">1</xsl:when>
-      <xsl:when test="local-name($node)='refsect1'">1</xsl:when>
-      <xsl:when test="local-name($node)='refsect2'">2</xsl:when>
-      <xsl:when test="local-name($node)='refsect3'">3</xsl:when>
-      <xsl:when test="local-name($node)='refsection'">
-        <xsl:choose>
-          <xsl:when test="$node/../../../../../refsection">5</xsl:when>
-          <xsl:when test="$node/../../../../refsection">4</xsl:when>
-          <xsl:when test="$node/../../../refsection">3</xsl:when>
-          <xsl:when test="$node/../../refsection">2</xsl:when>
-          <xsl:otherwise>1</xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:value-of select="$levelinRE + $RElevel"/>
-</xsl:template>
-
-<!-- Finds the section depth of a refentry -->
-<xsl:template name="refentry.level">
-  <xsl:param name="node" select="."/>
-  <xsl:variable name="container"
-                select="($node/ancestor::section |
-                        $node/ancestor::sect1 |
-                        $node/ancestor::sect2 |
-                        $node/ancestor::sect3 |
-                        $node/ancestor::sect4 |
-                        $node/ancestor::sect5)[last()]"/>
-
-  <xsl:choose>
-    <xsl:when test="$container">
-      <xsl:variable name="slevel">
-        <xsl:call-template name="section.level">
-          <xsl:with-param name="node" select="$container"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:value-of select="$slevel + 1"/>
-    </xsl:when>
-    <xsl:otherwise>1</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="qandadiv.section.level">
-  <xsl:variable name="section.level">
-    <xsl:call-template name="qanda.section.level"/>
-  </xsl:variable>
-  <xsl:variable name="anc.divs" select="ancestor::qandadiv"/>
-
-  <xsl:value-of select="count($anc.divs) + number($section.level)"/>
-</xsl:template>
-
-<xsl:template name="question.answer.label">
-  <xsl:variable name="deflabel">
-    <xsl:choose>
-      <xsl:when test="ancestor-or-self::*[@defaultlabel]">
-        <xsl:value-of select="(ancestor-or-self::*[@defaultlabel])[last()]
-                              /@defaultlabel"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$qanda.defaultlabel"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="label" select="@label"/>
-
-<!--
- (hnr      (hierarchical-number-recursive (normalize "qandadiv") node))
-
-         (parsect  (ancestor-member node (section-element-list)))
-
-         (defnum   (if (and %qanda-inherit-numeration% 
-                            %section-autolabel%)
-                       (if (node-list-empty? parsect)
-                           (section-autolabel-prefix node)
-                           (section-autolabel parsect))
-                       ""))
-
-         (hnumber  (let loop ((numlist hnr) (number defnum) 
-                              (sep (if (equal? defnum "") "" ".")))
-                     (if (null? numlist)
-                         number
-                         (loop (cdr numlist) 
-                               (string-append number
-                                              sep
-                                              (number->string (car numlist)))
-                               "."))))
-         (cnumber  (child-number (parent node)))
-         (number   (string-append hnumber 
-                                  (if (equal? hnumber "")
-                                      ""
-                                      ".")
-                                  (number->string cnumber))))
--->
-
-  <xsl:choose>
-    <xsl:when test="$deflabel = 'qanda'">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key">
-          <xsl:choose>
-            <xsl:when test="local-name(.) = 'question'">question</xsl:when>
-            <xsl:when test="local-name(.) = 'answer'">answer</xsl:when>
-            <xsl:when test="local-name(.) = 'qandadiv'">qandadiv</xsl:when>
-            <xsl:otherwise>qandaset</xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$deflabel = 'label'">
-      <xsl:value-of select="$label"/>
-    </xsl:when>
-    <xsl:when test="$deflabel = 'number'
-                    and local-name(.) = 'question'">
-      <xsl:apply-templates select="ancestor::qandaset[1]"
-                           mode="number"/>
-      <xsl:choose>
-        <xsl:when test="ancestor::qandadiv">
-          <xsl:apply-templates select="ancestor::qandadiv[1]"
-                               mode="number"/>
-          <xsl:apply-templates select="ancestor::qandaentry"
-                               mode="number"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="ancestor::qandaentry"
-                               mode="number"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- nothing -->
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="qandaset" mode="number">
-  <!-- FIXME: -->
-</xsl:template>
-
-<xsl:template match="qandadiv" mode="number">
-  <xsl:number level="multiple" from="qandaset" format="1."/>
-</xsl:template>
-
-<xsl:template match="qandaentry" mode="number">
-  <xsl:choose>
-    <xsl:when test="ancestor::qandadiv">
-      <xsl:number level="single" from="qandadiv" format="1."/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:number level="single" from="qandaset" format="1."/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ====================================================================== -->
-
-<xsl:template name="object.id">
-  <xsl:param name="object" select="."/>
-  <xsl:choose>
-    <xsl:when test="$object/@id">
-      <xsl:value-of select="$object/@id"/>
-    </xsl:when>
-    <xsl:when test="$object/@xml:id">
-      <xsl:value-of select="$object/@xml:id"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="generate-id($object)"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="person.name">
-  <!-- Formats a personal name. Handles corpauthor as a special case. -->
-  <xsl:param name="node" select="."/>
-
-  <xsl:variable name="style">
-    <xsl:choose>
-      <xsl:when test="$node/@role">
-        <xsl:value-of select="$node/@role"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'styles'"/>
-          <xsl:with-param name="name" select="'person-name'"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <!-- the personname element is a specialcase -->
-    <xsl:when test="$node/personname">
-      <xsl:call-template name="person.name">
-        <xsl:with-param name="node" select="$node/personname"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <!-- handle corpauthor as a special case...-->
-    <!-- * MikeSmith 2007-06: I'm wondering if the person.name template -->
-    <!-- * actually ever gets called to handle corpauthor.. maybe -->
-    <!-- * we don't actually need to check for corpauthor here. -->
-    <xsl:when test="local-name($node)='corpauthor'">
-      <xsl:apply-templates select="$node"/>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:choose>
-        <!-- Handle case when personname contains only general markup (DocBook 5.0) -->
-        <xsl:when test="$node/self::personname and not($node/firstname or $node/honorific or $node/lineage or $node/othername or $node/surname)">
-          <xsl:apply-templates select="$node/node()"/>
-        </xsl:when>
-        <xsl:when test="$style = 'family-given'">
-          <xsl:call-template name="person.name.family-given">
-            <xsl:with-param name="node" select="$node"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="$style = 'last-first'">
-          <xsl:call-template name="person.name.last-first">
-            <xsl:with-param name="node" select="$node"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="person.name.first-last">
-            <xsl:with-param name="node" select="$node"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="person.name.family-given">
-  <xsl:param name="node" select="."/>
-
-  <!-- The family-given style applies a convention for identifying given -->
-  <!-- and family names in locales where it may be ambiguous -->
-  <xsl:apply-templates select="$node//surname[1]"/>
-
-  <xsl:if test="$node//surname and $node//firstname">
-    <xsl:text> </xsl:text>
-  </xsl:if>
-
-  <xsl:apply-templates select="$node//firstname[1]"/>
-
-  <xsl:text> [FAMILY Given]</xsl:text>
-</xsl:template>
-
-<xsl:template name="person.name.last-first">
-  <xsl:param name="node" select="."/>
-
-  <xsl:apply-templates select="$node//surname[1]"/>
-
-  <xsl:if test="$node//surname and $node//firstname">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-
-  <xsl:apply-templates select="$node//firstname[1]"/>
-</xsl:template>
-
-<xsl:template name="person.name.first-last">
-  <xsl:param name="node" select="."/>
-
-  <xsl:if test="$node//honorific">
-    <xsl:apply-templates select="$node//honorific[1]"/>
-    <xsl:value-of select="$punct.honorific"/>
-  </xsl:if>
-
-  <xsl:if test="$node//firstname">
-    <xsl:if test="$node//honorific">
-      <xsl:text> </xsl:text>
-    </xsl:if>
-    <xsl:apply-templates select="$node//firstname[1]"/>
-  </xsl:if>
-
-  <xsl:if test="$node//othername and $author.othername.in.middle != 0">
-    <xsl:if test="$node//honorific or $node//firstname">
-      <xsl:text> </xsl:text>
-    </xsl:if>
-    <xsl:apply-templates select="$node//othername[1]"/>
-  </xsl:if>
-
-  <xsl:if test="$node//surname">
-    <xsl:if test="$node//honorific or $node//firstname
-                  or ($node//othername and $author.othername.in.middle != 0)">
-      <xsl:text> </xsl:text>
-    </xsl:if>
-    <xsl:apply-templates select="$node//surname[1]"/>
-  </xsl:if>
-
-  <xsl:if test="$node//lineage">
-    <xsl:text>, </xsl:text>
-    <xsl:apply-templates select="$node//lineage[1]"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="person.name.list">
-  <!-- Return a formatted string representation of the contents of
-       the current element. The current element must contain one or
-       more AUTHORs, CORPAUTHORs, OTHERCREDITs, and/or EDITORs.
-
-       John Doe
-     or
-       John Doe and Jane Doe
-     or
-       John Doe, Jane Doe, and A. Nonymous
-  -->
-  <xsl:param name="person.list"
-             select="author|corpauthor|othercredit|editor"/>
-  <xsl:param name="person.count" select="count($person.list)"/>
-  <xsl:param name="count" select="1"/>
-
-  <xsl:choose>
-    <xsl:when test="$count &gt; $person.count"></xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="person.name">
-        <xsl:with-param name="node" select="$person.list[position()=$count]"/>
-      </xsl:call-template>
-
-      <xsl:choose>
-        <xsl:when test="$person.count = 2 and $count = 1">
-          <xsl:call-template name="gentext.template">
-            <xsl:with-param name="context" select="'authorgroup'"/>
-            <xsl:with-param name="name" select="'sep2'"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="$person.count &gt; 2 and $count+1 = $person.count">
-          <xsl:call-template name="gentext.template">
-            <xsl:with-param name="context" select="'authorgroup'"/>
-            <xsl:with-param name="name" select="'seplast'"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="$count &lt; $person.count">
-          <xsl:call-template name="gentext.template">
-            <xsl:with-param name="context" select="'authorgroup'"/>
-            <xsl:with-param name="name" select="'sep'"/>
-          </xsl:call-template>
-        </xsl:when>
-      </xsl:choose>
-
-      <xsl:call-template name="person.name.list">
-        <xsl:with-param name="person.list" select="$person.list"/>
-        <xsl:with-param name="person.count" select="$person.count"/>
-        <xsl:with-param name="count" select="$count+1"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template><!-- person.name.list -->
-
-<!-- === synopsis ======================================================= -->
-<!-- The following definitions match those given in the reference
-     documentation for DocBook V3.0
--->
-
-<xsl:variable name="arg.choice.opt.open.str">[</xsl:variable>
-<xsl:variable name="arg.choice.opt.close.str">]</xsl:variable>
-<xsl:variable name="arg.choice.req.open.str">{</xsl:variable>
-<xsl:variable name="arg.choice.req.close.str">}</xsl:variable>
-<xsl:variable name="arg.choice.plain.open.str"><xsl:text> </xsl:text></xsl:variable>
-<xsl:variable name="arg.choice.plain.close.str"><xsl:text> </xsl:text></xsl:variable>
-<xsl:variable name="arg.choice.def.open.str">[</xsl:variable>
-<xsl:variable name="arg.choice.def.close.str">]</xsl:variable>
-<xsl:variable name="arg.rep.repeat.str">...</xsl:variable>
-<xsl:variable name="arg.rep.norepeat.str"></xsl:variable>
-<xsl:variable name="arg.rep.def.str"></xsl:variable>
-<xsl:variable name="arg.or.sep"> | </xsl:variable>
-<xsl:variable name="cmdsynopsis.hanging.indent">4pi</xsl:variable>
-
-<!-- ====================================================================== -->
-
-<!--
-<xsl:template name="xref.g.subst">
-  <xsl:param name="string"></xsl:param>
-  <xsl:param name="target" select="."/>
-  <xsl:variable name="subst">%g</xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, $subst)">
-      <xsl:value-of select="substring-before($string, $subst)"/>
-      <xsl:call-template name="gentext.element.name">
-        <xsl:with-param name="element.name" select="local-name($target)"/>
-      </xsl:call-template>
-      <xsl:call-template name="xref.g.subst">
-        <xsl:with-param name="string"
-                        select="substring-after($string, $subst)"/>
-        <xsl:with-param name="target" select="$target"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$string"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="xref.t.subst">
-  <xsl:param name="string"></xsl:param>
-  <xsl:param name="target" select="."/>
-  <xsl:variable name="subst">%t</xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, $subst)">
-      <xsl:call-template name="xref.g.subst">
-        <xsl:with-param name="string"
-                        select="substring-before($string, $subst)"/>
-        <xsl:with-param name="target" select="$target"/>
-      </xsl:call-template>
-      <xsl:call-template name="title.xref">
-        <xsl:with-param name="target" select="$target"/>
-      </xsl:call-template>
-      <xsl:call-template name="xref.t.subst">
-        <xsl:with-param name="string"
-                        select="substring-after($string, $subst)"/>
-        <xsl:with-param name="target" select="$target"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="xref.g.subst">
-        <xsl:with-param name="string" select="$string"/>
-        <xsl:with-param name="target" select="$target"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="xref.n.subst">
-  <xsl:param name="string"></xsl:param>
-  <xsl:param name="target" select="."/>
-  <xsl:variable name="subst">%n</xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, $subst)">
-      <xsl:call-template name="xref.t.subst">
-        <xsl:with-param name="string"
-                        select="substring-before($string, $subst)"/>
-        <xsl:with-param name="target" select="$target"/>
-      </xsl:call-template>
-      <xsl:call-template name="number.xref">
-        <xsl:with-param name="target" select="$target"/>
-      </xsl:call-template>
-      <xsl:call-template name="xref.t.subst">
-        <xsl:with-param name="string"
-                        select="substring-after($string, $subst)"/>
-        <xsl:with-param name="target" select="$target"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="xref.t.subst">
-        <xsl:with-param name="string" select="$string"/>
-        <xsl:with-param name="target" select="$target"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="subst.xref.text">
-  <xsl:param name="xref.text"></xsl:param>
-  <xsl:param name="target" select="."/>
-
-  <xsl:call-template name="xref.n.subst">
-    <xsl:with-param name="string" select="$xref.text"/>
-    <xsl:with-param name="target" select="$target"/>
-  </xsl:call-template>
-</xsl:template>
--->
-
-<!-- ====================================================================== -->
-
-<xsl:template name="filename-basename">
-  <!-- We assume all filenames are really URIs and use "/" -->
-  <xsl:param name="filename"></xsl:param>
-  <xsl:param name="recurse" select="false()"/>
-
-  <xsl:choose>
-    <xsl:when test="substring-after($filename, '/') != ''">
-      <xsl:call-template name="filename-basename">
-        <xsl:with-param name="filename"
-                        select="substring-after($filename, '/')"/>
-        <xsl:with-param name="recurse" select="true()"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$filename"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="filename-extension">
-  <xsl:param name="filename"></xsl:param>
-  <xsl:param name="recurse" select="false()"/>
-
-  <!-- Make sure we only look at the base name... -->
-  <xsl:variable name="basefn">
-    <xsl:choose>
-      <xsl:when test="$recurse">
-        <xsl:value-of select="$filename"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="filename-basename">
-          <xsl:with-param name="filename" select="$filename"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="substring-after($basefn, '.') != ''">
-      <xsl:call-template name="filename-extension">
-        <xsl:with-param name="filename"
-                        select="substring-after($basefn, '.')"/>
-        <xsl:with-param name="recurse" select="true()"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$recurse">
-      <xsl:value-of select="$basefn"/>
-    </xsl:when>
-    <xsl:otherwise></xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ====================================================================== -->
-
-<doc:template name="select.mediaobject" xmlns="">
-<refpurpose>Selects and processes an appropriate media object from a list</refpurpose>
-
-<refdescription id="select.mediaobject-desc">
-<para>This template takes a list of media objects (usually the
-children of a mediaobject or inlinemediaobject) and processes
-the "right" object.</para>
-
-<para>This template relies on a template named 
-"select.mediaobject.index" to determine which object
-in the list is appropriate.</para>
-
-<para>If no acceptable object is located, nothing happens.</para>
-</refdescription>
-
-<refparameter id="select.mediaobject-params">
-<variablelist>
-<varlistentry><term>olist</term>
-<listitem>
-<para>The node list of potential objects to examine.</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</refparameter>
-
-<refreturn id="select.mediaobject-returns">
-<para>Calls &lt;xsl:apply-templates&gt; on the selected object.</para>
-</refreturn>
-</doc:template>
-
-<xsl:template name="select.mediaobject">
-  <xsl:param name="olist"
-             select="imageobject|imageobjectco
-                     |videoobject|audioobject|textobject"/>
-  
-  <xsl:variable name="mediaobject.index">
-    <xsl:call-template name="select.mediaobject.index">
-      <xsl:with-param name="olist" select="$olist"/>
-      <xsl:with-param name="count" select="1"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:if test="$mediaobject.index != ''">
-    <xsl:apply-templates select="$olist[position() = $mediaobject.index]"/>
-  </xsl:if>
-</xsl:template>
-
-<!-- ====================================================================== -->
-
-<doc:template name="select.mediaobject.index" xmlns="">
-<refpurpose>Selects the position of the appropriate media object from a list</refpurpose>
-
-<refdescription id="select.mediaobject.index-desc">
-<para>This template takes a list of media objects (usually the
-children of a mediaobject or inlinemediaobject) and determines
-the "right" object. It returns the position of that object
-to be used by the calling template.</para>
-
-<para>If the parameter <parameter>use.role.for.mediaobject</parameter>
-is nonzero, then it first checks for an object with
-a role attribute of the appropriate value.  It takes the first
-of those.  Otherwise, it takes the first acceptable object
-through a recursive pass through the list.</para>
-
-<para>This template relies on a template named "is.acceptable.mediaobject"
-to determine if a given object is an acceptable graphic. The semantics
-of media objects is that the first acceptable graphic should be used.
-</para>
-
-<para>If no acceptable object is located, no index is returned.</para>
-</refdescription>
-
-<refparameter id="select.mediaobject.index-params">
-<variablelist>
-<varlistentry><term>olist</term>
-<listitem>
-<para>The node list of potential objects to examine.</para>
-</listitem>
-</varlistentry>
-<varlistentry><term>count</term>
-<listitem>
-<para>The position in the list currently being considered by the 
-recursive process.</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</refparameter>
-
-<refreturn id="select.mediaobject.index-returns">
-<para>Returns the position in the original list of the selected object.</para>
-</refreturn>
-</doc:template>
-
-<xsl:template name="select.mediaobject.index">
-  <xsl:param name="olist"
-             select="imageobject|imageobjectco
-                     |videoobject|audioobject|textobject"/>
-  <xsl:param name="count">1</xsl:param>
-
-  <xsl:choose>
-    <!-- Test for objects preferred by role -->
-    <xsl:when test="$use.role.for.mediaobject != 0 
-               and $preferred.mediaobject.role != ''
-               and $olist[@role = $preferred.mediaobject.role]"> 
-      
-      <!-- Get the first hit's position index -->
-      <xsl:for-each select="$olist">
-        <xsl:if test="@role = $preferred.mediaobject.role and
-             not(preceding-sibling::*[@role = $preferred.mediaobject.role])"> 
-          <xsl:value-of select="position()"/> 
-        </xsl:if>
-      </xsl:for-each>
-    </xsl:when>
-
-    <xsl:when test="$use.role.for.mediaobject != 0 
-               and $olist[@role = $stylesheet.result.type]">
-      <!-- Get the first hit's position index -->
-      <xsl:for-each select="$olist">
-        <xsl:if test="@role = $stylesheet.result.type and 
-              not(preceding-sibling::*[@role = $stylesheet.result.type])"> 
-          <xsl:value-of select="position()"/> 
-        </xsl:if>
-      </xsl:for-each>
-    </xsl:when>
-    <!-- Accept 'html' for $stylesheet.result.type = 'xhtml' -->
-    <xsl:when test="$use.role.for.mediaobject != 0 
-               and $stylesheet.result.type = 'xhtml'
-               and $olist[@role = 'html']">
-      <!-- Get the first hit's position index -->
-      <xsl:for-each select="$olist">
-        <xsl:if test="@role = 'html' and 
-              not(preceding-sibling::*[@role = 'html'])"> 
-          <xsl:value-of select="position()"/> 
-        </xsl:if>
-      </xsl:for-each>
-    </xsl:when>
-
-    <!-- If no selection by role, and there is only one object, use it -->
-    <xsl:when test="count($olist) = 1 and $count = 1">
-      <xsl:value-of select="$count"/> 
-    </xsl:when>
-
-    <xsl:otherwise>
-      <!-- Otherwise select first acceptable object -->
-      <xsl:if test="$count &lt;= count($olist)">
-        <xsl:variable name="object" select="$olist[position()=$count]"/>
-    
-        <xsl:variable name="useobject">
-          <xsl:choose>
-            <!-- The phrase is used only when contains TeX Math and output is FO -->
-            <xsl:when test="local-name($object)='textobject' and $object/phrase
-                            and $object/@role='tex' and $stylesheet.result.type = 'fo'
-                            and $tex.math.in.alt != ''">
-              <xsl:text>1</xsl:text> 
-            </xsl:when>
-            <!-- The phrase is never used -->
-            <xsl:when test="local-name($object)='textobject' and $object/phrase">
-              <xsl:text>0</xsl:text>
-            </xsl:when>
-            <xsl:when test="local-name($object)='textobject'
-                            and $object/ancestor::equation ">
-            <!-- The first textobject is not a reasonable fallback
-                 for equation image -->
-              <xsl:text>0</xsl:text>
-            </xsl:when>
-            <!-- The first textobject is a reasonable fallback -->
-            <xsl:when test="local-name($object)='textobject'
-                            and $object[not(@role) or @role!='tex']">
-              <xsl:text>1</xsl:text>
-            </xsl:when>
-            <!-- don't use graphic when output is FO, TeX Math is used 
-                 and there is math in alt element -->
-            <xsl:when test="$object/ancestor::equation and 
-                            $object/ancestor::equation/alt[@role='tex']
-                            and $stylesheet.result.type = 'fo'
-                            and $tex.math.in.alt != ''">
-              <xsl:text>0</xsl:text>
-            </xsl:when>
-            <!-- If there's only one object, use it -->
-            <xsl:when test="$count = 1 and count($olist) = 1">
-               <xsl:text>1</xsl:text>
-            </xsl:when>
-            <!-- Otherwise, see if this one is a useable graphic -->
-            <xsl:otherwise>
-              <xsl:choose>
-                <!-- peek inside imageobjectco to simplify the test -->
-                <xsl:when test="local-name($object) = 'imageobjectco'">
-                  <xsl:call-template name="is.acceptable.mediaobject">
-                    <xsl:with-param name="object" select="$object/imageobject"/>
-                  </xsl:call-template>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:call-template name="is.acceptable.mediaobject">
-                    <xsl:with-param name="object" select="$object"/>
-                  </xsl:call-template>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:variable>
-    
-        <xsl:choose>
-          <xsl:when test="$useobject='1'">
-            <xsl:value-of select="$count"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="select.mediaobject.index">
-              <xsl:with-param name="olist" select="$olist"/>
-              <xsl:with-param name="count" select="$count + 1"/>
-            </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<doc:template name="is.acceptable.mediaobject" xmlns="">
-<refpurpose>Returns '1' if the specified media object is recognized</refpurpose>
-
-<refdescription id="is.acceptable.mediaobject-desc">
-<para>This template examines a media object and returns '1' if the
-object is recognized as a graphic.</para>
-</refdescription>
-
-<refparameter id="is.acceptable.mediaobject-params">
-<variablelist>
-<varlistentry><term>object</term>
-<listitem>
-<para>The media object to consider.</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</refparameter>
-
-<refreturn id="is.acceptable.mediaobject-returns">
-<para>0 or 1</para>
-</refreturn>
-</doc:template>
-
-<xsl:template name="is.acceptable.mediaobject">
-  <xsl:param name="object"></xsl:param>
-
-  <xsl:variable name="filename">
-    <xsl:call-template name="mediaobject.filename">
-      <xsl:with-param name="object" select="$object"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="ext">
-    <xsl:call-template name="filename-extension">
-      <xsl:with-param name="filename" select="$filename"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <!-- there will only be one -->
-  <xsl:variable name="data" select="$object/videodata
-                                    |$object/imagedata
-                                    |$object/audiodata"/>
-
-  <xsl:variable name="format" select="$data/@format"/>
-
-  <xsl:variable name="graphic.format">
-    <xsl:if test="$format">
-      <xsl:call-template name="is.graphic.format">
-        <xsl:with-param name="format" select="$format"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="graphic.ext">
-    <xsl:if test="$ext">
-      <xsl:call-template name="is.graphic.extension">
-        <xsl:with-param name="ext" select="$ext"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$use.svg = 0 and $format = 'SVG'">0</xsl:when>
-    <xsl:when xmlns:svg="http://www.w3.org/2000/svg"
-              test="$use.svg != 0 and $object/svg:*">1</xsl:when>
-    <xsl:when test="$graphic.format = '1'">1</xsl:when>
-    <xsl:when test="$graphic.ext = '1'">1</xsl:when>
-    <xsl:otherwise>0</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="mediaobject.filename">
-  <xsl:param name="object"></xsl:param>
-
-  <xsl:variable name="data" select="$object/videodata
-                                    |$object/imagedata
-                                    |$object/audiodata
-                                    |$object"/>
-
-  <xsl:variable name="filename">
-    <xsl:choose>
-      <xsl:when test="$data[@fileref]">
-        <xsl:apply-templates select="$data/@fileref"/>
-      </xsl:when>
-      <xsl:when test="$data[@entityref]">
-        <xsl:value-of select="unparsed-entity-uri($data/@entityref)"/>
-      </xsl:when>
-      <xsl:otherwise></xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="real.ext">
-    <xsl:call-template name="filename-extension">
-      <xsl:with-param name="filename" select="$filename"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="ext">
-    <xsl:choose>
-      <xsl:when test="$real.ext != ''">
-        <xsl:value-of select="$real.ext"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$graphic.default.extension"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="graphic.ext">
-    <xsl:call-template name="is.graphic.extension">
-      <xsl:with-param name="ext" select="$ext"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$real.ext = ''">
-      <xsl:choose>
-        <xsl:when test="$ext != ''">
-          <xsl:value-of select="$filename"/>
-          <xsl:text>.</xsl:text>
-          <xsl:value-of select="$ext"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$filename"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="not($graphic.ext)">
-      <xsl:choose>
-        <xsl:when test="$graphic.default.extension != ''">
-          <xsl:value-of select="$filename"/>
-          <xsl:text>.</xsl:text>
-          <xsl:value-of select="$graphic.default.extension"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$filename"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$filename"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ====================================================================== -->
-
-<doc:template name="check.id.unique" xmlns="">
-<refpurpose>Warn users about references to non-unique IDs</refpurpose>
-<refdescription id="check.id.unique-desc">
-<para>If passed an ID in <varname>linkend</varname>,
-<function>check.id.unique</function> prints
-a warning message to the user if either the ID does not exist or
-the ID is not unique.</para>
-</refdescription>
-</doc:template>
-
-<xsl:template name="check.id.unique">
-  <xsl:param name="linkend"></xsl:param>
-  <xsl:if test="$linkend != ''">
-    <xsl:variable name="targets" select="key('id',$linkend)"/>
-    <xsl:variable name="target" select="$targets[1]"/>
-
-    <xsl:if test="count($targets)=0">
-      <xsl:message>
-        <xsl:text>Error: no ID for constraint linkend: </xsl:text>
-        <xsl:value-of select="$linkend"/>
-        <xsl:text>.</xsl:text>
-      </xsl:message>
-      <!--
-      <xsl:message>
-        <xsl:text>If the ID exists in your document, did your </xsl:text>
-        <xsl:text>XSLT Processor load the DTD?</xsl:text>
-      </xsl:message>
-      -->
-    </xsl:if>
-
-    <xsl:if test="count($targets)>1">
-      <xsl:message>
-        <xsl:text>Warning: multiple "IDs" for constraint linkend: </xsl:text>
-        <xsl:value-of select="$linkend"/>
-        <xsl:text>.</xsl:text>
-      </xsl:message>
-    </xsl:if>
-  </xsl:if>
-</xsl:template>
-
-<doc:template name="check.idref.targets" xmlns="">
-<refpurpose>Warn users about incorrectly typed references</refpurpose>
-<refdescription id="check.idref.targets-desc">
-<para>If passed an ID in <varname>linkend</varname>,
-<function>check.idref.targets</function> makes sure that the element
-pointed to by the link is one of the elements listed in
-<varname>element-list</varname> and warns the user otherwise.</para>
-</refdescription>
-</doc:template>
-
-<xsl:template name="check.idref.targets">
-  <xsl:param name="linkend"></xsl:param>
-  <xsl:param name="element-list"></xsl:param>
-  <xsl:if test="$linkend != ''">
-    <xsl:variable name="targets" select="key('id',$linkend)"/>
-    <xsl:variable name="target" select="$targets[1]"/>
-
-    <xsl:if test="count($target) &gt; 0">
-      <xsl:if test="not(contains(concat(' ', $element-list, ' '), local-name($target)))">
-        <xsl:message>
-          <xsl:text>Error: linkend (</xsl:text>
-          <xsl:value-of select="$linkend"/>
-          <xsl:text>) points to "</xsl:text>
-          <xsl:value-of select="local-name($target)"/>
-          <xsl:text>" not (one of): </xsl:text>
-          <xsl:value-of select="$element-list"/>
-        </xsl:message>
-      </xsl:if>
-    </xsl:if>
-  </xsl:if>
-</xsl:template>
-
-<!-- ====================================================================== -->
-<!-- Procedure Step Numeration -->
-
-<xsl:param name="procedure.step.numeration.formats" select="'1aiAI'"/>
-
-<xsl:template name="procedure.step.numeration">
-  <xsl:param name="context" select="."/>
-  <xsl:variable name="format.length"
-                select="string-length($procedure.step.numeration.formats)"/>
-  <xsl:choose>
-    <xsl:when test="local-name($context) = 'substeps'">
-      <xsl:variable name="ssdepth"
-                    select="count($context/ancestor::substeps)"/>
-      <xsl:variable name="sstype" select="($ssdepth mod $format.length)+2"/>
-      <xsl:choose>
-        <xsl:when test="$sstype &gt; $format.length">
-          <xsl:value-of select="substring($procedure.step.numeration.formats,1,1)"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="substring($procedure.step.numeration.formats,$sstype,1)"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="local-name($context) = 'step'">
-      <xsl:variable name="sdepth"
-                    select="count($context/ancestor::substeps)"/>
-      <xsl:variable name="stype" select="($sdepth mod $format.length)+1"/>
-      <xsl:value-of select="substring($procedure.step.numeration.formats,$stype,1)"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message>
-        <xsl:text>Unexpected context in procedure.step.numeration: </xsl:text>
-        <xsl:value-of select="local-name($context)"/>
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="step" mode="number">
-  <xsl:param name="rest" select="''"/>
-  <xsl:param name="recursive" select="1"/>
-  <xsl:variable name="format">
-    <xsl:call-template name="procedure.step.numeration"/>
-  </xsl:variable>
-  <xsl:variable name="num">
-    <xsl:number count="step" format="{$format}"/>
-  </xsl:variable>
-  <xsl:choose>
-    <xsl:when test="$recursive != 0 and ancestor::step">
-      <xsl:apply-templates select="ancestor::step[1]" mode="number">
-        <xsl:with-param name="rest" select="concat('.', $num, $rest)"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="concat($num, $rest)"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ====================================================================== -->
-<!-- OrderedList Numeration -->
-<xsl:template name="output-orderedlist-starting-number">
-  <xsl:param name="list"/>
-  <xsl:param name="pi-start"/>
-  <xsl:choose>
-    <xsl:when test="not($list/@continuation = 'continues')">
-      <xsl:choose>
-        <xsl:when test="@startingnumber">
-          <xsl:value-of select="@startingnumber"/>
-        </xsl:when>
-        <xsl:when test="$pi-start != ''">
-          <xsl:value-of select="$pi-start"/>
-        </xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="prevlist"
-        select="$list/preceding::orderedlist[1]"/>
-      <xsl:choose>
-        <xsl:when test="count($prevlist) = 0">2</xsl:when>
-        <xsl:otherwise>
-          <xsl:variable name="prevlength" select="count($prevlist/listitem)"/>
-          <xsl:variable name="prevstart">
-            <xsl:call-template name="orderedlist-starting-number">
-              <xsl:with-param name="list" select="$prevlist"/>
-            </xsl:call-template>
-          </xsl:variable>
-          <xsl:value-of select="$prevstart + $prevlength"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="orderedlist-item-number">
-  <!-- context node must be a listitem in an orderedlist -->
-  <xsl:param name="node" select="."/>
-  <xsl:choose>
-    <xsl:when test="$node/@override">
-      <xsl:value-of select="$node/@override"/>
-    </xsl:when>
-    <xsl:when test="$node/preceding-sibling::listitem">
-      <xsl:variable name="pnum">
-        <xsl:call-template name="orderedlist-item-number">
-          <xsl:with-param name="node" select="$node/preceding-sibling::listitem[1]"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:value-of select="$pnum + 1"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="orderedlist-starting-number">
-        <xsl:with-param name="list" select="parent::*"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="next.numeration">
-  <xsl:param name="numeration" select="'default'"/>
-  <xsl:choose>
-    <!-- Change this list if you want to change the order of numerations -->
-    <xsl:when test="$numeration = 'arabic'">loweralpha</xsl:when>
-    <xsl:when test="$numeration = 'loweralpha'">lowerroman</xsl:when>
-    <xsl:when test="$numeration = 'lowerroman'">upperalpha</xsl:when>
-    <xsl:when test="$numeration = 'upperalpha'">upperroman</xsl:when>
-    <xsl:when test="$numeration = 'upperroman'">arabic</xsl:when>
-    <xsl:otherwise>arabic</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="list.numeration">
-  <xsl:param name="node" select="."/>
-
-  <xsl:choose>
-    <xsl:when test="$node/@numeration">
-      <xsl:value-of select="$node/@numeration"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$node/ancestor::orderedlist">
-          <xsl:call-template name="next.numeration">
-            <xsl:with-param name="numeration">
-              <xsl:call-template name="list.numeration">
-                <xsl:with-param name="node" select="$node/ancestor::orderedlist[1]"/>
-              </xsl:call-template>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="next.numeration"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ====================================================================== -->
-<!-- ItemizedList "Numeration" -->
-
-<xsl:template name="next.itemsymbol">
-  <xsl:param name="itemsymbol" select="'default'"/>
-  <xsl:choose>
-    <!-- Change this list if you want to change the order of symbols -->
-    <xsl:when test="$itemsymbol = 'disc'">circle</xsl:when>
-    <xsl:when test="$itemsymbol = 'circle'">square</xsl:when>
-    <xsl:otherwise>disc</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="list.itemsymbol">
-  <xsl:param name="node" select="."/>
-
-  <xsl:choose>
-    <xsl:when test="@override">
-      <xsl:value-of select="@override"/>
-    </xsl:when>
-    <xsl:when test="$node/@mark">
-      <xsl:value-of select="$node/@mark"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$node/ancestor::itemizedlist">
-          <xsl:call-template name="next.itemsymbol">
-            <xsl:with-param name="itemsymbol">
-              <xsl:call-template name="list.itemsymbol">
-                <xsl:with-param name="node" select="$node/ancestor::itemizedlist[1]"/>
-              </xsl:call-template>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="next.itemsymbol"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ====================================================================== -->
-
-<doc:template name="copyright.years" xmlns="">
-<refpurpose>Print a set of years with collapsed ranges</refpurpose>
-
-<refdescription id="copyright.years-desc">
-<para>This template prints a list of year elements with consecutive
-years printed as a range. In other words:</para>
-
-<screen><![CDATA[<year>1992</year>
-<year>1993</year>
-<year>1994</year>]]></screen>
-
-<para>is printed <quote>1992-1994</quote>, whereas:</para>
-
-<screen><![CDATA[<year>1992</year>
-<year>1994</year>]]></screen>
-
-<para>is printed <quote>1992, 1994</quote>.</para>
-
-<para>This template assumes that all the year elements contain only
-decimal year numbers, that the elements are sorted in increasing
-numerical order, that there are no duplicates, and that all the years
-are expressed in full <quote>century+year</quote>
-(<quote>1999</quote> not <quote>99</quote>) notation.</para>
-</refdescription>
-
-<refparameter id="copyright.years-params">
-<variablelist>
-<varlistentry><term>years</term>
-<listitem>
-<para>The initial set of year elements.</para>
-</listitem>
-</varlistentry>
-<varlistentry><term>print.ranges</term>
-<listitem>
-<para>If non-zero, multi-year ranges are collapsed. If zero, all years
-are printed discretely.</para>
-</listitem>
-</varlistentry>
-<varlistentry><term>single.year.ranges</term>
-<listitem>
-<para>If non-zero, two consecutive years will be printed as a range,
-otherwise, they will be printed discretely. In other words, a single
-year range is <quote>1991-1992</quote> but discretely it's
-<quote>1991, 1992</quote>.</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</refparameter>
-
-<refreturn id="copyright.years-returns">
-<para>This template returns the formatted list of years.</para>
-</refreturn>
-</doc:template>
-
-<xsl:template name="copyright.years">
-  <xsl:param name="years"/>
-  <xsl:param name="print.ranges" select="1"/>
-  <xsl:param name="single.year.ranges" select="0"/>
-  <xsl:param name="firstyear" select="0"/>
-  <xsl:param name="nextyear" select="0"/>
-
-  <!--
-  <xsl:message terminate="no">
-    <xsl:text>CY: </xsl:text>
-    <xsl:value-of select="count($years)"/>
-    <xsl:text>, </xsl:text>
-    <xsl:value-of select="$firstyear"/>
-    <xsl:text>, </xsl:text>
-    <xsl:value-of select="$nextyear"/>
-    <xsl:text>, </xsl:text>
-    <xsl:value-of select="$print.ranges"/>
-    <xsl:text>, </xsl:text>
-    <xsl:value-of select="$single.year.ranges"/>
-    <xsl:text> (</xsl:text>
-    <xsl:value-of select="$years[1]"/>
-    <xsl:text>)</xsl:text>
-  </xsl:message>
-  -->
-
-  <xsl:choose>
-    <xsl:when test="$print.ranges = 0 and count($years) &gt; 0">
-      <xsl:choose>
-        <xsl:when test="count($years) = 1">
-          <xsl:apply-templates select="$years[1]" mode="titlepage.mode"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="$years[1]" mode="titlepage.mode"/>
-          <xsl:text>, </xsl:text>
-          <xsl:call-template name="copyright.years">
-            <xsl:with-param name="years"
-                            select="$years[position() &gt; 1]"/>
-            <xsl:with-param name="print.ranges" select="$print.ranges"/>
-            <xsl:with-param name="single.year.ranges"
-                            select="$single.year.ranges"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="count($years) = 0">
-      <xsl:variable name="lastyear" select="$nextyear - 1"/>
-      <xsl:choose>
-        <xsl:when test="$firstyear = 0">
-          <!-- there weren't any years at all -->
-        </xsl:when>
-        <xsl:when test="$firstyear = $lastyear">
-          <xsl:value-of select="$firstyear"/>
-        </xsl:when>
-        <xsl:when test="$single.year.ranges = 0
-                        and $lastyear = $firstyear + 1">
-          <xsl:value-of select="$firstyear"/>
-          <xsl:text>, </xsl:text>
-          <xsl:value-of select="$lastyear"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$firstyear"/>
-          <xsl:text>-</xsl:text>
-          <xsl:value-of select="$lastyear"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="$firstyear = 0">
-      <xsl:call-template name="copyright.years">
-        <xsl:with-param name="years"
-                        select="$years[position() &gt; 1]"/>
-        <xsl:with-param name="firstyear" select="$years[1]"/>
-        <xsl:with-param name="nextyear" select="$years[1] + 1"/>
-        <xsl:with-param name="print.ranges" select="$print.ranges"/>
-        <xsl:with-param name="single.year.ranges"
-                        select="$single.year.ranges"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$nextyear = $years[1]">
-      <xsl:call-template name="copyright.years">
-        <xsl:with-param name="years"
-                        select="$years[position() &gt; 1]"/>
-        <xsl:with-param name="firstyear" select="$firstyear"/>
-        <xsl:with-param name="nextyear" select="$nextyear + 1"/>
-        <xsl:with-param name="print.ranges" select="$print.ranges"/>
-        <xsl:with-param name="single.year.ranges"
-                        select="$single.year.ranges"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- we have years left, but they aren't in the current range -->
-      <xsl:choose>
-        <xsl:when test="$nextyear = $firstyear + 1">
-          <xsl:value-of select="$firstyear"/>
-          <xsl:text>, </xsl:text>
-        </xsl:when>
-        <xsl:when test="$single.year.ranges = 0
-                        and $nextyear = $firstyear + 2">
-          <xsl:value-of select="$firstyear"/>
-          <xsl:text>, </xsl:text>
-          <xsl:value-of select="$nextyear - 1"/>
-          <xsl:text>, </xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$firstyear"/>
-          <xsl:text>-</xsl:text>
-          <xsl:value-of select="$nextyear - 1"/>
-          <xsl:text>, </xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:call-template name="copyright.years">
-        <xsl:with-param name="years"
-                        select="$years[position() &gt; 1]"/>
-        <xsl:with-param name="firstyear" select="$years[1]"/>
-        <xsl:with-param name="nextyear" select="$years[1] + 1"/>
-        <xsl:with-param name="print.ranges" select="$print.ranges"/>
-        <xsl:with-param name="single.year.ranges"
-                        select="$single.year.ranges"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ====================================================================== -->
-
-<doc:template name="find.path.params" xmlns="">
-<refpurpose>Search in a table for the "best" match for the node</refpurpose>
-
-<refdescription id="find.path.params-desc">
-<para>This template searches in a table for the value that most-closely
-(in the typical best-match sense of XSLT) matches the current (element)
-node location.</para>
-</refdescription>
-</doc:template>
-
-<xsl:template name="find.path.params">
-  <xsl:param name="node" select="."/>
-  <xsl:param name="table" select="''"/>
-  <xsl:param name="location">
-    <xsl:call-template name="xpath.location">
-      <xsl:with-param name="node" select="$node"/>
-    </xsl:call-template>
-  </xsl:param>
-
-  <xsl:variable name="value">
-    <xsl:call-template name="lookup.key">
-      <xsl:with-param name="key" select="$location"/>
-      <xsl:with-param name="table" select="$table"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$value != ''">
-      <xsl:value-of select="$value"/>
-    </xsl:when>
-    <xsl:when test="contains($location, '/')">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="node" select="$node"/>
-        <xsl:with-param name="table" select="$table"/>
-        <xsl:with-param name="location" select="substring-after($location, '/')"/>
-      </xsl:call-template>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="relative-uri">
-  <xsl:param name="filename" select="."/>
-  <xsl:param name="destdir" select="''"/>
-  
-  <xsl:variable name="srcurl">
-    <xsl:call-template name="strippath">
-      <xsl:with-param name="filename">
-        <xsl:call-template name="xml.base.dirs">
-          <xsl:with-param name="base.elem" 
-                          select="$filename/ancestor-or-self::*
-                                   [@xml:base != ''][1]"/>
-        </xsl:call-template>
-        <xsl:value-of select="$filename"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="srcurl.trimmed">
-    <xsl:call-template name="trim.common.uri.paths">
-      <xsl:with-param name="uriA" select="$srcurl"/>
-      <xsl:with-param name="uriB" select="$destdir"/>
-      <xsl:with-param name="return" select="'A'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="destdir.trimmed">
-    <xsl:call-template name="trim.common.uri.paths">
-      <xsl:with-param name="uriA" select="$srcurl"/>
-      <xsl:with-param name="uriB" select="$destdir"/>
-      <xsl:with-param name="return" select="'B'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="depth">
-    <xsl:call-template name="count.uri.path.depth">
-      <xsl:with-param name="filename" select="$destdir.trimmed"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="copy-string">
-    <xsl:with-param name="string" select="'../'"/>
-    <xsl:with-param name="count" select="$depth"/>
-  </xsl:call-template>
-  <xsl:value-of select="$srcurl.trimmed"/>
-
-</xsl:template>
-
-<!-- ===================================== -->
-
-<xsl:template name="xml.base.dirs">
-  <xsl:param name="base.elem" select="NONODE"/>
-
-  <!-- Recursively resolve xml:base attributes, up to a 
-       full path with : in uri -->
-  <xsl:if test="$base.elem/ancestor::*[@xml:base != ''] and
-                not(contains($base.elem/@xml:base, ':'))">
-    <xsl:call-template name="xml.base.dirs">
-      <xsl:with-param name="base.elem" 
-                      select="$base.elem/ancestor::*[@xml:base != ''][1]"/>
-    </xsl:call-template>
-  </xsl:if>
-  <xsl:call-template name="getdir">
-    <xsl:with-param name="filename" select="$base.elem/@xml:base"/>
-  </xsl:call-template>
-
-</xsl:template>
-
-<!-- ===================================== -->
-
-<xsl:template name="strippath">
-  <xsl:param name="filename" select="''"/>
-  <xsl:choose>
-    <!-- Leading .. are not eliminated -->
-    <xsl:when test="starts-with($filename, '../')">
-      <xsl:value-of select="'../'"/>
-      <xsl:call-template name="strippath">
-        <xsl:with-param name="filename" select="substring-after($filename, '../')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="contains($filename, '/../')">
-      <xsl:call-template name="strippath">
-        <xsl:with-param name="filename">
-          <xsl:call-template name="getdir">
-            <xsl:with-param name="filename" select="substring-before($filename, '/../')"/>
-          </xsl:call-template>
-          <xsl:value-of select="substring-after($filename, '/../')"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$filename"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ===================================== -->
-
-<xsl:template name="getdir">
-  <xsl:param name="filename" select="''"/>
-  <xsl:if test="contains($filename, '/')">
-    <xsl:value-of select="substring-before($filename, '/')"/>
-    <xsl:text>/</xsl:text>
-    <xsl:call-template name="getdir">
-      <xsl:with-param name="filename" select="substring-after($filename, '/')"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<!-- ===================================== -->
-
-<doc:template name="string.upper" xmlns="">
-<refpurpose>Converts a string to all uppercase letters</refpurpose>
-
-<refdescription id="string.upper-desc">
-<para>Given a string, this template does a language-aware conversion
-of that string to all uppercase letters, based on the values of the
-<literal>lowercase.alpha</literal> and
-<literal>uppercase.alpha</literal> gentext keys for the current
-locale. It affects only those characters found in the values of
-<literal>lowercase.alpha</literal> and
-<literal>uppercase.alpha</literal>. All other characters are left
-unchanged.</para>
-</refdescription>
-
-<refparameter id="string.upper-params">
-<variablelist>
-<varlistentry><term>string</term>
-<listitem>
-<para>The string to convert to uppercase.</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</refparameter>
-</doc:template>
-<xsl:template name="string.upper">
-  <xsl:param name="string" select="''"/>
-  <xsl:variable name="lowercase.alpha">
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="'lowercase.alpha'"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="uppercase.alpha">
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="'uppercase.alpha'"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:value-of select="translate($string,$lowercase.alpha,$uppercase.alpha)"/>
-</xsl:template>
-
-<!-- ===================================== -->
-
-<doc:template name="string.lower" xmlns="">
-<refpurpose>Converts a string to all lowercase letters</refpurpose>
-
-<refdescription id="string.lower-desc">
-<para>Given a string, this template does a language-aware conversion
-of that string to all lowercase letters, based on the values of the
-<literal>uppercase.alpha</literal> and
-<literal>lowercase.alpha</literal> gentext keys for the current
-locale. It affects only those characters found in the values of
-<literal>uppercase.alpha</literal> and
-<literal>lowercase.alpha</literal>. All other characters are left
-unchanged.</para>
-</refdescription>
-
-<refparameter id="string.lower-params">
-<variablelist>
-<varlistentry><term>string</term>
-<listitem>
-<para>The string to convert to lowercase.</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</refparameter>
-</doc:template>
-<xsl:template name="string.lower">
-  <xsl:param name="string" select="''"/>
-  <xsl:variable name="uppercase.alpha">
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="'uppercase.alpha'"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="lowercase.alpha">
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="'lowercase.alpha'"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:value-of select="translate($string,$uppercase.alpha,$lowercase.alpha)"/>
-</xsl:template>
-
-<!-- ===================================== -->
-
-<doc:template name="select.choice.separator" xmlns="">
-  <refpurpose>Returns localized choice separator</refpurpose>
-  <refdescription id="select.choice.separator-desc">
-    <para>This template enables auto-generation of an appropriate
-    localized "choice" separator (for example, "and" or "or") before
-    the final item in an inline list (though it could also be useful
-    for generating choice separators for non-inline lists).</para>
-    <para>It currently works by evaluating a processing instruction
-    (PI) of the form &lt;?dbchoice&#xa0;choice="foo"?> :
-    <itemizedlist>
-      <listitem>
-        <simpara>if the value of the <tag>choice</tag>
-        pseudo-attribute is "and" or "or", returns a localized "and"
-        or "or"</simpara>
-      </listitem>
-      <listitem>
-        <simpara>otherwise returns the literal value of the
-        <tag>choice</tag> pseudo-attribute</simpara>
-      </listitem>
-    </itemizedlist>
-    The latter is provided only as a temporary workaround because the
-    locale files do not currently have translations for the word
-    <wordasword>or</wordasword>. So if you want to generate a a
-    logical "or" separator in French (for example), you currently need
-    to do this:
-    <literallayout>&lt;?dbchoice choice="ou"?></literallayout>
-    </para>
-    <warning>
-      <para>The <tag>dbchoice</tag> processing instruction is
-      an unfortunate hack; support for it may disappear in the future
-      (particularly if and when a more appropriate means for marking
-      up "choice" lists becomes available in DocBook).</para>
-    </warning>
-  </refdescription>
-</doc:template>
-<xsl:template name="select.choice.separator">
-  <xsl:variable name="choice">
-    <xsl:call-template name="pi.dbchoice_choice"/>
-  </xsl:variable>
-  <xsl:choose>
-    <!-- if value of $choice is "and" or "or", translate to equivalent in -->
-    <!-- current locale -->
-    <xsl:when test="$choice = 'and' or $choice = 'or'">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="$choice"/>
-      </xsl:call-template>
-    </xsl:when>
-    <!--  otherwise, just output value of $choice, whatever it is -->
-    <xsl:otherwise>
-      <xsl:value-of select="$choice"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ===================================== -->
-
-<doc:template name="evaluate.info.profile" xmlns="">
-  <refpurpose>Evaluates an info profile</refpurpose>
-  <refdescription id="evaluate.info.profile-desc">
-    <para>This template evaluates an "info profile" matching the XPath
-    expression given by the <parameter>profile</parameter>
-    parameter. It relies on the XSLT <function>evaluate()</function>
-    extension function.</para>
-
-    <para>The value of the <parameter>profile</parameter> parameter
-    can include the literal string <literal>$info</literal>. If found
-    in the value of the <parameter>profile</parameter> parameter, the
-    literal string <literal>$info</literal> string is replaced with
-    the value of the <parameter>info</parameter> parameter, which
-    should be a set of <replaceable>*info</replaceable> nodes; the
-    expression is then evaluated using the XSLT
-    <function>evaluate()</function> extension function.</para>
-  </refdescription>
-  <refparameter id="evaluate.info.profile-params">
-    <variablelist>
-       <varlistentry>
-        <term>profile</term>
-        <listitem>
-          <para>A string representing an XPath expression </para>
-        </listitem>
-      </varlistentry>
-       <varlistentry>
-        <term>info</term>
-        <listitem>
-          <para>A set of *info nodes</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-
-  <refreturn id="evaluate.info.profile-returns">
-    <para>Returns a node (the result of evaluating the
-    <parameter>profile</parameter> parameter)</para>
-  </refreturn>
-</doc:template>
-  <xsl:template name="evaluate.info.profile">
-    <xsl:param name="profile"/>
-    <xsl:param name="info"/>
-    <xsl:choose>
-      <!-- * xsltproc and Xalan both support dyn:evaluate() -->
-      <xsl:when test="function-available('dyn:evaluate')">
-        <xsl:apply-templates
-            select="dyn:evaluate($profile)" mode="get.refentry.metadata"/>
-      </xsl:when>
-      <!-- * Saxon has its own evaluate() & doesn't support dyn:evaluate() -->
-      <xsl:when test="function-available('saxon:evaluate')">
-        <xsl:apply-templates
-            select="saxon:evaluate($profile)" mode="get.refentry.metadata"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:message terminate="yes">
-Error: The "info profiling" mechanism currently requires an XSLT
-engine that supports the evaluate() XSLT extension function. Your XSLT
-engine does not support it.
-</xsl:message>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/de.xml
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/de.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,669 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="de" english-language-name="German">
-
-<!-- * This file is generated automatically. -->
-<!-- * To submit changes to this file upstream (to the DocBook Project) -->
-<!-- * do not submit an edited version of this file. Instead, submit an -->
-<!-- * edited version of the source file at the following location: -->
-<!-- * -->
-<!-- *  https://svn.sourceforge.net/svnroot/docbook/trunk/gentext/locale/de.xml -->
-<!-- * -->
-<!-- * E-mail the edited de.xml source file to: -->
-<!-- * -->
-<!-- *  docbook-developers@lists.sourceforge.net -->
-
-<!-- ******************************************************************** -->
-
-<!-- This file is part of the XSL DocBook Stylesheet distribution. -->
-<!-- See ../README or http://docbook.sf.net/release/xsl/current/ for -->
-<!-- copyright and other information. -->
-
-<!-- ******************************************************************** -->
-<!-- In these files, % with a letter is used for a placeholder: -->
-<!--   %t is the current element's title -->
-<!--   %s is the current element's subtitle (if applicable)-->
-<!--   %n is the current element's number label-->
-<!--   %p is the current element's page number (if applicable)-->
-<!-- ******************************************************************** -->
-
-
-<l:gentext key="Abstract" text="Zusammenfassung"/>
-<l:gentext key="abstract" text="Zusammenfassung"/>
-<l:gentext key="Answer" text="A:"/>
-<l:gentext key="answer" text="A:"/>
-<l:gentext key="Appendix" text="Anhang"/>
-<l:gentext key="appendix" text="Anhang"/>
-<l:gentext key="Article" text="Artikel"/>
-<l:gentext key="article" text="Artikel"/>
-<l:gentext key="Author" text="Autor"/>
-<l:gentext key="Bibliography" text="Literaturverzeichnis"/>
-<l:gentext key="bibliography" text="Literaturverzeichnis"/>
-<l:gentext key="Book" text="Buch"/>
-<l:gentext key="book" text="Buch"/>
-<l:gentext key="CAUTION" text="ACHTUNG"/>
-<l:gentext key="Caution" text="Achtung"/>
-<l:gentext key="caution" text="Achtung"/>
-<l:gentext key="Chapter" text="Kapitel"/>
-<l:gentext key="chapter" text="Kapitel"/>
-<l:gentext key="Colophon" text="Kolophon"/>
-<l:gentext key="colophon" text="Kolophon"/>
-<l:gentext key="Copyright" text="Copyright"/>
-<l:gentext key="copyright" text="Copyright"/>
-<l:gentext key="Dedication" text="Widmung"/>
-<l:gentext key="dedication" text="Widmung"/>
-<l:gentext key="Edition" text="Ausgabe"/>
-<l:gentext key="edition" text="Ausgabe"/>
-<l:gentext key="Editor" text="Editor" lang="en"/>
-<l:gentext key="Equation" text="Gleichung"/>
-<l:gentext key="equation" text="Gleichung"/>
-<l:gentext key="Example" text="Beispiel"/>
-<l:gentext key="example" text="Beispiel"/>
-<l:gentext key="Figure" text="Abbildung"/>
-<l:gentext key="figure" text="Abbildung"/>
-<l:gentext key="Glossary" text="Glossar"/>
-<l:gentext key="glossary" text="Glossar"/>
-<l:gentext key="GlossSee" text="Siehe"/>
-<l:gentext key="glosssee" text="Siehe"/>
-<l:gentext key="GlossSeeAlso" text="Siehe auch"/>
-<l:gentext key="glossseealso" text="Siehe auch"/>
-<l:gentext key="IMPORTANT" text="WICHTIG"/>
-<l:gentext key="important" text="Wichtig"/>
-<l:gentext key="Important" text="Wichtig"/>
-<l:gentext key="Index" text="Stichwortverzeichnis"/>
-<l:gentext key="index" text="Stichwortverzeichnis"/>
-<l:gentext key="ISBN" text="ISBN"/>
-<l:gentext key="isbn" text="ISBN"/>
-<l:gentext key="LegalNotice" text="Rechtlicher Hinweis"/>
-<l:gentext key="legalnotice" text="Rechtlicher Hinweis"/>
-<l:gentext key="MsgAud" text="Zielgruppe"/>
-<l:gentext key="msgaud" text="Zielgruppe"/>
-<l:gentext key="MsgLevel" text="Dringlichkeit"/>
-<l:gentext key="msglevel" text="Dringlichkeit"/>
-<l:gentext key="MsgOrig" text="Ursprung"/>
-<l:gentext key="msgorig" text="Ursprung"/>
-<l:gentext key="NOTE" text="ANMERKUNG"/>
-<l:gentext key="Note" text="Anmerkung"/>
-<l:gentext key="note" text="Anmerkung"/>
-<l:gentext key="Part" text="Teil"/>
-<l:gentext key="part" text="Teil"/>
-<l:gentext key="Preface" text="Vorwort"/>
-<l:gentext key="preface" text="Vorwort"/>
-<l:gentext key="Procedure" text="Prozedur"/>
-<l:gentext key="procedure" text="Prozedur"/>
-<l:gentext key="ProductionSet" text="Produktion"/>
-<l:gentext key="PubDate" text="VerÃ¶ffentlicht"/>
-<l:gentext key="pubdate" text="VerÃ¶ffentlicht"/>
-<l:gentext key="Published" text="VerÃ¶ffentlicht"/>
-<l:gentext key="published" text="VerÃ¶ffentlicht"/>
-<l:gentext key="Publisher" text="Publisher" lang="en"/>
-<l:gentext key="Qandadiv" text="F &amp; A"/>
-<l:gentext key="qandadiv" text="F &amp; A"/>
-<l:gentext key="QandASet" text="Frequently Asked Questions" lang="en"/>
-<l:gentext key="Question" text="F:"/>
-<l:gentext key="question" text="F:"/>
-<l:gentext key="RefEntry" text=""/>
-<l:gentext key="refentry" text=""/>
-<l:gentext key="Reference" text="Verweis"/>
-<l:gentext key="reference" text="Verweis"/>
-<l:gentext key="References" text="References" lang="en"/>
-<l:gentext key="RefName" text="Name"/>
-<l:gentext key="refname" text="Name"/>
-<l:gentext key="RefSection" text="Abschnitt"/>
-<l:gentext key="refsection" text="Abschnitt"/>
-<l:gentext key="RefSynopsisDiv" text="Synopsis"/>
-<l:gentext key="refsynopsisdiv" text="Synopsis"/>
-<l:gentext key="RevHistory" text="Versionsgeschichte"/>
-<l:gentext key="revhistory" text="Versionsgeschichte"/>
-<l:gentext key="revision" text="Version"/>
-<l:gentext key="Revision" text="Version"/>
-<l:gentext key="sect1" text="Abschnitt"/>
-<l:gentext key="sect2" text="Abschnitt"/>
-<l:gentext key="sect3" text="Abschnitt"/>
-<l:gentext key="sect4" text="Abschnitt"/>
-<l:gentext key="sect5" text="Abschnitt"/>
-<l:gentext key="section" text="Abschnitt"/>
-<l:gentext key="Section" text="Abschnitt"/>
-<l:gentext key="see" text="Siehe"/>
-<l:gentext key="See" text="Siehe"/>
-<l:gentext key="seealso" text="Siehe auch"/>
-<l:gentext key="Seealso" text="Siehe auch"/>
-<l:gentext key="SeeAlso" text="Siehe auch"/>
-<l:gentext key="set" text="Satz"/>
-<l:gentext key="Set" text="Satz"/>
-<l:gentext key="setindex" text="Stichwortverzeichnis"/>
-<l:gentext key="SetIndex" text="Stichwortverzeichnis"/>
-<l:gentext key="Sidebar" text="Randnotiz"/>
-<l:gentext key="sidebar" text="randnotiz"/>
-<l:gentext key="step" text="Schritt"/>
-<l:gentext key="Step" text="Schritt"/>
-<l:gentext key="table" text="Tabelle"/>
-<l:gentext key="Table" text="Tabelle"/>
-<l:gentext key="task" text="Task" lang="en"/>
-<l:gentext key="Task" text="Task" lang="en"/>
-<l:gentext key="tip" text="Tipp"/>
-<l:gentext key="TIP" text="TIPP"/>
-<l:gentext key="Tip" text="Tipp"/>
-<l:gentext key="Warning" text="Warnung"/>
-<l:gentext key="warning" text="Warnung"/>
-<l:gentext key="WARNING" text="WARNUNG"/>
-<l:gentext key="and" text="und"/>
-<l:gentext key="by" text="von"/>
-<l:gentext key="Edited" text="Herausgegeben"/>
-<l:gentext key="edited" text="Herausgegeben"/>
-<l:gentext key="Editedby" text="Herausgegeben von"/>
-<l:gentext key="editedby" text="Herausgegeben von"/>
-<l:gentext key="in" text="in"/>
-<l:gentext key="lastlistcomma" text=""/>
-<l:gentext key="listcomma" text=","/>
-<l:gentext key="nonexistantelement" text="nicht existierendes Element"/>
-<l:gentext key="notes" text="FuÃnoten"/>
-<l:gentext key="Notes" text="FuÃnoten"/>
-<l:gentext key="Pgs" text="Seiten"/>
-<l:gentext key="pgs" text="Seiten"/>
-<l:gentext key="Revisedby" text="GeÃ€ndert durch: "/>
-<l:gentext key="revisedby" text="GeÃ€ndert durch: "/>
-<l:gentext key="TableNotes" text="Bemerkungen"/>
-<l:gentext key="tablenotes" text="Bemerkungen"/>
-<l:gentext key="TableofContents" text="Inhaltsverzeichnis"/>
-<l:gentext key="tableofcontents" text="Inhaltsverzeichnis"/>
-<l:gentext key="unexpectedelementname" text="Unerwarteter Elementname"/>
-<l:gentext key="unsupported" text="wird nicht unterstÃŒtzt"/>
-<l:gentext key="xrefto" text="xref auf"/>
-<l:gentext key="Authors" text="Autoren"/>
-<l:gentext key="copyeditor" text="Copy Editor" lang="en"/>
-<l:gentext key="graphicdesigner" text="Graphic Designer" lang="en"/>
-<l:gentext key="productioneditor" text="Production Editor" lang="en"/>
-<l:gentext key="technicaleditor" text="Technical Editor" lang="en"/>
-<l:gentext key="translator" text="Translator" lang="en"/>
-<l:gentext key="listofequations" text="Gleichungen"/>
-<l:gentext key="ListofEquations" text="Gleichungen"/>
-<l:gentext key="ListofExamples" text="Beispiele"/>
-<l:gentext key="listofexamples" text="Beispiele"/>
-<l:gentext key="ListofFigures" text="Abbildungsverzeichnis"/>
-<l:gentext key="listoffigures" text="Abbildungsverzeichnis"/>
-<l:gentext key="ListofProcedures" text="List of Procedures" lang="en"/>
-<l:gentext key="listofprocedures" text="List of Procedures" lang="en"/>
-<l:gentext key="listoftables" text="Tabellenverzeichnis"/>
-<l:gentext key="ListofTables" text="Tabellenverzeichnis"/>
-<l:gentext key="ListofUnknown" text="???-Verzeichnis"/>
-<l:gentext key="listofunknown" text="???-Verzeichnis"/>
-<l:gentext key="nav-home" text="Zum Anfang"/>
-<l:gentext key="nav-next" text="Weiter"/>
-<l:gentext key="nav-next-sibling" text="Schnell weiter"/>
-<l:gentext key="nav-prev" text="ZurÃŒck"/>
-<l:gentext key="nav-prev-sibling" text="Schnell zurÃŒck"/>
-<l:gentext key="nav-up" text="Nach oben"/>
-<l:gentext key="nav-toc" text="InhV"/>
-<l:gentext key="Draft" text="Entwurf"/>
-<l:gentext key="above" text="oben"/>
-<l:gentext key="below" text="unten"/>
-<l:gentext key="sectioncalled" text="der Abschnitt namens"/>
-<l:gentext key="index symbols" text="Symbole"/>
-<l:gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyzÃ€Ã¶ÃŒÃ"/>
-<l:gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZÃÃÃÃ"/>
-<l:gentext key="normalize.sort.input" text="AaÃÃ ÃÃ¡ÃÃ¢ÃÃ£ÃÃ€Ã
-Ã¥ÄÄÄÄÄÄ
-ÇÇÇÇÇ Ç¡ÇºÇ»ÈÈÈÈÈŠÈ§ážážáºáº áº¡áº¢áº£áº€áº¥áºŠáº§áºšáº©áºªáº«áº¬áº­áº®áº¯áº°áº±áº²áº³áºŽáºµáº¶áº·BbÆÆÉÆÆážážážáž
-ážážCcÃÃ§ÄÄÄÄÄÄÄÄÆÆÉážážDdÄÄÄÄÆÉÆÆÇ
-Ç²È¡ÉážážážážážážážážážážEeÃÃšÃÃ©ÃÃªÃÃ«ÄÄÄÄÄÄÄÄÄÄÈÈ
-ÈÈÈšÈ©ážážážážážážážážážážáºžáº¹áººáº»áºŒáºœáºŸáº¿á»á»á»á»á»á»
-á»á»FfÆÆážážGgÄÄÄÄÄ Ä¡Ä¢Ä£ÆÉ Ç€Ç¥ÇŠÇ§ÇŽÇµáž áž¡HhÄ€Ä¥ÄŠÄ§ÈÈÉŠáž¢áž£áž€áž¥ážŠáž§ážšáž©ážªáž«áºIiÃÃ¬ÃÃ­ÃÃ®ÃÃ¯ÄšÄ©ÄªÄ«Ä¬Ä­Ä®Ä¯Ä°ÆÉšÇÇÈÈÈÈáž¬áž­áž®áž¯á»á»á»á»JjÄŽÄµÇ°ÊKkÄ¶Ä·ÆÆÇšÇ©áž°áž±áž²áž³ážŽážµLlÄ¹ÄºÄ»ÄŒÄœÄŸÄ¿ÅÅÅÆÇÈŽÉ«É¬É­áž¶áž·ážžáž¹ážºáž»ážŒážœMmÉ±ážŸáž¿á¹á¹á¹á¹NnÃÃ±ÅÅÅ
-ÅÅÅÆÉ²ÆÈ ÇÇžÇ¹ÈµÉ³á¹á¹
-á¹á¹á¹á¹á¹á¹OoÃÃ²ÃÃ³ÃÃŽÃÃµÃÃ¶ÃÃžÅÅÅÅÅÅÆÆ Æ¡ÇÇÇªÇ«Ç¬Ç­ÇŸÇ¿ÈÈÈÈÈªÈ«È¬È­È®È¯È°È±á¹á¹á¹á¹á¹á¹á¹á¹á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á» á»¡á»¢á»£PpÆ€Æ¥á¹á¹á¹á¹QqÊ RrÅÅÅÅÅÅÈÈÈÈÉŒÉœÉŸá¹á¹á¹á¹á¹á¹á¹á¹SsÅÅÅÅÅÅÅ Å¡ÈÈÊá¹ á¹¡á¹¢á¹£á¹€á¹¥á¹Šá¹§á¹šá¹©TtÅ¢Å£Å€Å¥ÅŠÅ§Æ«Æ¬Æ­Æ®ÊÈÈÈ¶á¹ªá¹«á¹¬á¹­á¹®á¹¯á¹°á¹±áºUuÃÃ¹ÃÃºÃÃ»ÃÃŒÅšÅ©ÅªÅ«Å¬Å­Å®Å¯Å°Å±Å²Å³Æ¯Æ°ÇÇÇÇÇÇÇÇÇÇÈÈÈÈá¹²á¹³á¹Žá¹µá¹¶á¹·á¹žá¹¹á¹ºá¹»á»€á»¥á»Šá»§á»šá»©á»ªá»«á»¬á»­á»®á»¯á»°á»±VvÆ²Êá¹Œá¹œá¹Ÿá¹¿WwÅŽÅµáºáºáºáºáºáº
-áºáºáºáºáºXxáºáºáºáºYyÃÃœÃ¿ÅžÅ¶Å·Æ³ÆŽÈ²È³áºáºáºá»²á»³á»Žá»µá»¶á»·á»žá»¹ZzÅ¹ÅºÅ»ÅŒÅœÅŸÆµÆ¶È€È¥ÊÊáºáºáºáºáºáºáº" lang="en"/>
-<l:gentext key="normalize.sort.output" text="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ" lang="en"/>
-<l:dingbat key="startquote" text="â"/>
-<l:dingbat key="endquote" text="â"/>
-<l:dingbat key="nestedstartquote" text="â"/>
-<l:dingbat key="nestedendquote" text="â"/>
-<l:dingbat key="singlestartquote" text="â"/>
-<l:dingbat key="singleendquote" text="â"/>
-<l:dingbat key="bullet" text="â¢"/>
-<l:gentext key="hyphenation-character" text="-"/>
-<l:gentext key="hyphenation-push-character-count" text="2"/>
-<l:gentext key="hyphenation-remain-character-count" text="3"/>
-<l:context name="styles"><l:template name="person-name" text="first-last"/>
-</l:context>
-<l:context name="title"><l:template name="abstract" text="%t"/>
-<l:template name="answer" text="%t"/>
-<l:template name="appendix" text="Anhang %n. %t"/>
-<l:template name="article" text="%t"/>
-<l:template name="authorblurb" text="%t"/>
-<l:template name="bibliodiv" text="%t"/>
-<l:template name="biblioentry" text="%t"/>
-<l:template name="bibliography" text="%t"/>
-<l:template name="bibliolist" text="%t" lang="en"/>
-<l:template name="bibliomixed" text="%t"/>
-<l:template name="bibliomset" text="%t"/>
-<l:template name="biblioset" text="%t"/>
-<l:template name="blockquote" text="%t"/>
-<l:template name="book" text="%t"/>
-<l:template name="calloutlist" text="%t"/>
-<l:template name="caution" text="%t"/>
-<l:template name="chapter" text="Kapitel %n. %t"/>
-<l:template name="colophon" text="%t"/>
-<l:template name="dedication" text="%t"/>
-<l:template name="equation" text="Gleichung %n. %t"/>
-<l:template name="example" text="Beispiel %n. %t"/>
-<l:template name="figure" text="Abbildung %n. %t"/>
-<l:template name="foil" text="%t" lang="en"/>
-<l:template name="foilgroup" text="%t" lang="en"/>
-<l:template name="formalpara" text="%t"/>
-<l:template name="glossary" text="%t"/>
-<l:template name="glossdiv" text="%t"/>
-<l:template name="glosslist" text="%t" lang="en"/>
-<l:template name="glossentry" text="%t"/>
-<l:template name="important" text="%t"/>
-<l:template name="index" text="%t"/>
-<l:template name="indexdiv" text="%t"/>
-<l:template name="itemizedlist" text="%t"/>
-<l:template name="legalnotice" text="%t"/>
-<l:template name="listitem" text=""/>
-<l:template name="lot" text="%t"/>
-<l:template name="msg" text="%t"/>
-<l:template name="msgexplan" text="%t"/>
-<l:template name="msgmain" text="%t"/>
-<l:template name="msgrel" text="%t"/>
-<l:template name="msgset" text="%t"/>
-<l:template name="msgsub" text="%t"/>
-<l:template name="note" text="%t"/>
-<l:template name="orderedlist" text="%t"/>
-<l:template name="part" text="Teil %n. %t"/>
-<l:template name="partintro" text="%t"/>
-<l:template name="preface" text="%t"/>
-<l:template name="procedure" text="%t"/>
-<l:template name="procedure.formal" text="Prozedur %n. %t"/>
-<l:template name="productionset" text="%t"/>
-<l:template name="productionset.formal" text="ProduktionÂ %n"/>
-<l:template name="qandadiv" text="%t"/>
-<l:template name="qandaentry" text="%t"/>
-<l:template name="qandaset" text="%t"/>
-<l:template name="question" text="F: %n"/>
-<l:template name="refentry" text="%t"/>
-<l:template name="reference" text="%t"/>
-<l:template name="refsection" text="%t"/>
-<l:template name="refsect1" text="%t"/>
-<l:template name="refsect2" text="%t"/>
-<l:template name="refsect3" text="%t"/>
-<l:template name="refsynopsisdiv" text="%t"/>
-<l:template name="refsynopsisdivinfo" text="%t"/>
-<l:template name="segmentedlist" text="%t"/>
-<l:template name="set" text="%t"/>
-<l:template name="setindex" text="%t"/>
-<l:template name="sidebar" text="%t"/>
-<l:template name="step" text="%t"/>
-<l:template name="table" text="Tabelle %n. %t"/>
-<l:template name="task" text="%t"/>
-<l:template name="tasksummary" text="%t" lang="en"/>
-<l:template name="taskprerequisites" text="%t" lang="en"/>
-<l:template name="taskrelated" text="%t" lang="en"/>
-<l:template name="tip" text="%t"/>
-<l:template name="toc" text="%t"/>
-<l:template name="variablelist" text="%t"/>
-<l:template name="varlistentry" text="" lang="en"/>
-<l:template name="warning" text="%t"/>
-</l:context>
-<l:context name="title-unnumbered"><l:template name="appendix" text="%t"/>
-<l:template name="article/appendix" text="%t"/>
-<l:template name="bridgehead" text="%t"/>
-<l:template name="chapter" text="%t"/>
-<l:template name="sect1" text="%t"/>
-<l:template name="sect2" text="%t"/>
-<l:template name="sect3" text="%t"/>
-<l:template name="sect4" text="%t"/>
-<l:template name="sect5" text="%t"/>
-<l:template name="section" text="%t"/>
-<l:template name="simplesect" text="%t"/>
-<l:template name="part" text="%t" lang="en"/>
-</l:context>
-<l:context name="title-numbered"><l:template name="appendix" text="Anhang %n. %t"/>
-<l:template name="article/appendix" text="%n.Â %t"/>
-<l:template name="bridgehead" text="%n.Â %t"/>
-<l:template name="chapter" text="Kapitel %n. %t"/>
-<l:template name="part" text="TeilÂ %n.Â %t"/>
-<l:template name="sect1" text="%n. %t"/>
-<l:template name="sect2" text="%n. %t"/>
-<l:template name="sect3" text="%n. %t"/>
-<l:template name="sect4" text="%n. %t"/>
-<l:template name="sect5" text="%n. %t"/>
-<l:template name="section" text="%n. %t"/>
-<l:template name="simplesect" text="%n. %t"/>
-</l:context>
-<l:context name="subtitle"><l:template name="appendix" text="%s"/>
-<l:template name="article" text="%s"/>
-<l:template name="bibliodiv" text="%s"/>
-<l:template name="biblioentry" text="%s"/>
-<l:template name="bibliography" text="%s"/>
-<l:template name="bibliomixed" text="%s"/>
-<l:template name="bibliomset" text="%s"/>
-<l:template name="biblioset" text="%s"/>
-<l:template name="book" text="%s"/>
-<l:template name="chapter" text="%s"/>
-<l:template name="colophon" text="%s"/>
-<l:template name="dedication" text="%s"/>
-<l:template name="glossary" text="%s"/>
-<l:template name="glossdiv" text="%s"/>
-<l:template name="index" text="%s"/>
-<l:template name="indexdiv" text="%s"/>
-<l:template name="lot" text="%s"/>
-<l:template name="part" text="%s"/>
-<l:template name="partintro" text="%s"/>
-<l:template name="preface" text="%s"/>
-<l:template name="refentry" text="%s"/>
-<l:template name="reference" text="%s"/>
-<l:template name="refsection" text="%s"/>
-<l:template name="refsect1" text="%s"/>
-<l:template name="refsect2" text="%s"/>
-<l:template name="refsect3" text="%s"/>
-<l:template name="refsynopsisdiv" text="%s"/>
-<l:template name="sect1" text="%s"/>
-<l:template name="sect2" text="%s"/>
-<l:template name="sect3" text="%s"/>
-<l:template name="sect4" text="%s"/>
-<l:template name="sect5" text="%s"/>
-<l:template name="section" text="%s"/>
-<l:template name="set" text="%s"/>
-<l:template name="setindex" text="%s"/>
-<l:template name="sidebar" text="%s"/>
-<l:template name="simplesect" text="%s"/>
-<l:template name="toc" text="%s"/>
-</l:context>
-<l:context name="xref"><l:template name="abstract" text="%t"/>
-<l:template name="answer" text="A:Â %n"/>
-<l:template name="appendix" text="%t"/>
-<l:template name="article" text="%t"/>
-<l:template name="authorblurb" text="%t"/>
-<l:template name="bibliodiv" text="%t"/>
-<l:template name="bibliography" text="%t"/>
-<l:template name="bibliomset" text="%t"/>
-<l:template name="biblioset" text="%t"/>
-<l:template name="blockquote" text="%t"/>
-<l:template name="book" text="%t"/>
-<l:template name="calloutlist" text="%t"/>
-<l:template name="caution" text="%t"/>
-<l:template name="chapter" text="%t"/>
-<l:template name="colophon" text="%t"/>
-<l:template name="constraintdef" text="%t"/>
-<l:template name="dedication" text="%t"/>
-<l:template name="equation" text="%t"/>
-<l:template name="example" text="%t"/>
-<l:template name="figure" text="%t"/>
-<l:template name="foil" text="%t" lang="en"/>
-<l:template name="foilgroup" text="%t" lang="en"/>
-<l:template name="formalpara" text="%t"/>
-<l:template name="glossary" text="%t"/>
-<l:template name="glossdiv" text="%t"/>
-<l:template name="important" text="%t"/>
-<l:template name="index" text="%t"/>
-<l:template name="indexdiv" text="%t"/>
-<l:template name="itemizedlist" text="%t"/>
-<l:template name="legalnotice" text="%t"/>
-<l:template name="listitem" text="%n"/>
-<l:template name="lot" text="%t"/>
-<l:template name="msg" text="%t"/>
-<l:template name="msgexplan" text="%t"/>
-<l:template name="msgmain" text="%t"/>
-<l:template name="msgrel" text="%t"/>
-<l:template name="msgset" text="%t"/>
-<l:template name="msgsub" text="%t"/>
-<l:template name="note" text="%t"/>
-<l:template name="orderedlist" text="%t"/>
-<l:template name="part" text="%t"/>
-<l:template name="partintro" text="%t"/>
-<l:template name="preface" text="%t"/>
-<l:template name="procedure" text="%t"/>
-<l:template name="productionset" text="%t"/>
-<l:template name="qandadiv" text="%t"/>
-<l:template name="qandaentry" text="F:Â %n"/>
-<l:template name="qandaset" text="%t"/>
-<l:template name="question" text="F: %n"/>
-<l:template name="reference" text="%t"/>
-<l:template name="refsynopsisdiv" text="%t"/>
-<l:template name="segmentedlist" text="%t"/>
-<l:template name="set" text="%t"/>
-<l:template name="setindex" text="%t"/>
-<l:template name="sidebar" text="%t"/>
-<l:template name="table" text="%t"/>
-<l:template name="task" text="%t" lang="en"/>
-<l:template name="tip" text="%t"/>
-<l:template name="toc" text="%t"/>
-<l:template name="variablelist" text="%t"/>
-<l:template name="varlistentry" text="%n"/>
-<l:template name="warning" text="%t"/>
-<l:template name="olink.document.citation" text=" in %o" lang="en"/>
-<l:template name="olink.page.citation" text=" (page %p)" lang="en"/>
-<l:template name="page.citation" text=" [%p]"/>
-<l:template name="page" text="(Seite %p)"/>
-<l:template name="docname" text=" in %o" lang="en"/>
-<l:template name="docnamelong" text=" in the document titled %o" lang="en"/>
-<l:template name="pageabbrev" text="(S. %p)"/>
-<l:template name="Page" text="Seite %p"/>
-<l:template name="bridgehead" text="â%tâ"/>
-<l:template name="refsection" text="â%tâ"/>
-<l:template name="refsect1" text="â%tâ"/>
-<l:template name="refsect2" text="â%tâ"/>
-<l:template name="refsect3" text="â%tâ"/>
-<l:template name="sect1" text="â%tâ"/>
-<l:template name="sect2" text="â%tâ"/>
-<l:template name="sect3" text="â%tâ"/>
-<l:template name="sect4" text="â%tâ"/>
-<l:template name="sect5" text="â%tâ"/>
-<l:template name="section" text="â%tâ"/>
-<l:template name="simplesect" text="â%tâ"/>
-</l:context>
-<l:context name="xref-number"><l:template name="answer" text="A:Â %n"/>
-<l:template name="appendix" text="AnhangÂ %n"/>
-<l:template name="bridgehead" text="AbschnittÂ %n"/>
-<l:template name="chapter" text="KapitelÂ %n"/>
-<l:template name="equation" text="GleichungÂ %n"/>
-<l:template name="example" text="BeispielÂ %n"/>
-<l:template name="figure" text="AbbildungÂ %n"/>
-<l:template name="part" text="TeilÂ %n"/>
-<l:template name="procedure" text="ProzedurÂ %n"/>
-<l:template name="productionset" text="ProduktionÂ %n"/>
-<l:template name="qandadiv" text="F &amp; AÂ %n"/>
-<l:template name="qandaentry" text="F:Â %n"/>
-<l:template name="question" text="F:Â %n"/>
-<l:template name="sect1" text="AbschnittÂ %n"/>
-<l:template name="sect2" text="AbschnittÂ %n"/>
-<l:template name="sect3" text="AbschnittÂ %n"/>
-<l:template name="sect4" text="AbschnittÂ %n"/>
-<l:template name="sect5" text="AbschnittÂ %n"/>
-<l:template name="section" text="AbschnittÂ %n"/>
-<l:template name="table" text="TabelleÂ %n"/>
-</l:context>
-<l:context name="xref-number-and-title"><l:template name="appendix" text="AnhangÂ %n, %t"/>
-<l:template name="bridgehead" text="AbschnittÂ %n, â%tâ"/>
-<l:template name="chapter" text="KapitelÂ %n, %t"/>
-<l:template name="equation" text="GleichungÂ %n, â%tâ"/>
-<l:template name="example" text="BeispielÂ %n, â%tâ"/>
-<l:template name="figure" text="AbbildungÂ %n, â%tâ"/>
-<l:template name="part" text="TeilÂ %n, â%tâ"/>
-<l:template name="procedure" text="ProzedurÂ %n, â%tâ"/>
-<l:template name="productionset" text="ProduktionÂ %n, â%tâ"/>
-<l:template name="qandadiv" text="F &amp; AÂ %n, â%tâ"/>
-<l:template name="refsect1" text="der Abschnitt namens â%tâ"/>
-<l:template name="refsect2" text="der Abschnitt namens â%tâ"/>
-<l:template name="refsect3" text="der Abschnitt namens â%tâ"/>
-<l:template name="refsection" text="der Abschnitt namens â%tâ"/>
-<l:template name="sect1" text="AbschnittÂ %n, â%tâ"/>
-<l:template name="sect2" text="AbschnittÂ %n, â%tâ"/>
-<l:template name="sect3" text="AbschnittÂ %n, â%tâ"/>
-<l:template name="sect4" text="AbschnittÂ %n, â%tâ"/>
-<l:template name="sect5" text="AbschnittÂ %n, â%tâ"/>
-<l:template name="section" text="AbschnittÂ %n, â%tâ"/>
-<l:template name="simplesect" text="der Abschnitt namens â%tâ"/>
-<l:template name="table" text="TabelleÂ %n, â%tâ"/>
-</l:context>
-<l:context name="authorgroup"><l:template name="sep" text=", "/>
-<l:template name="sep2" text=" und "/>
-<l:template name="seplast" text=" und "/>
-</l:context>
-<l:context name="glossary"><l:template name="see" text="Siehe %t"/>
-<l:template name="seealso" text="Siehe auch %t"/>
-</l:context>
-<l:context name="msgset"><l:template name="MsgAud" text="Zielgruppe: "/>
-<l:template name="MsgLevel" text="Dringlichkeit: "/>
-<l:template name="MsgOrig" text="Ursprung: "/>
-</l:context>
-<l:context name="datetime"><l:template name="format" text="d.m.Y"/>
-</l:context>
-<l:context name="termdef"><l:template name="prefix" text="[Definition: " lang="en"/>
-<l:template name="suffix" text="]" lang="en"/>
-</l:context>
-<l:context name="datetime-full"><l:template name="January" text="Januar"/>
-<l:template name="February" text="Februar"/>
-<l:template name="March" text="MÃ€rz"/>
-<l:template name="April" text="April"/>
-<l:template name="May" text="Mai"/>
-<l:template name="June" text="Juni"/>
-<l:template name="July" text="Juli"/>
-<l:template name="August" text="August"/>
-<l:template name="September" text="September"/>
-<l:template name="October" text="Oktober"/>
-<l:template name="November" text="November"/>
-<l:template name="December" text="Dezember"/>
-<l:template name="Monday" text="Montag"/>
-<l:template name="Tuesday" text="Dienstag"/>
-<l:template name="Wednesday" text="Mittwoch"/>
-<l:template name="Thursday" text="Donnerstag"/>
-<l:template name="Friday" text="Freitag"/>
-<l:template name="Saturday" text="Samstag"/>
-<l:template name="Sunday" text="Sonntag"/>
-</l:context>
-<l:context name="datetime-abbrev"><l:template name="Jan" text="Jan"/>
-<l:template name="Feb" text="Feb"/>
-<l:template name="Mar" text="Mar"/>
-<l:template name="Apr" text="Apr"/>
-<l:template name="May" text="Mai"/>
-<l:template name="Jun" text="Jun"/>
-<l:template name="Jul" text="Jul"/>
-<l:template name="Aug" text="Aug"/>
-<l:template name="Sep" text="Sep"/>
-<l:template name="Oct" text="Okt"/>
-<l:template name="Nov" text="Nov"/>
-<l:template name="Dec" text="Dez"/>
-<l:template name="Mon" text="Mo"/>
-<l:template name="Tue" text="Di"/>
-<l:template name="Wed" text="Mi"/>
-<l:template name="Thu" text="Do"/>
-<l:template name="Fri" text="Fr"/>
-<l:template name="Sat" text="Sa"/>
-<l:template name="Sun" text="So"/>
-</l:context>
-<l:context name="htmlhelp"><l:template name="langcode" text="0x0407 German (GERMANY)"/>
-</l:context>
-<l:context name="index"><l:template name="term-separator" text=", " lang="en"/>
-<l:template name="number-separator" text=", " lang="en"/>
-<l:template name="range-separator" text="-" lang="en"/>
-</l:context>
-<l:context name="iso690"><l:template name="lastfirst.sep" text=", " lang="en"/>
-<l:template name="alt.person.two.sep" text=" â " lang="en"/>
-<l:template name="alt.person.last.sep" text=" â " lang="en"/>
-<l:template name="alt.person.more.sep" text=" â " lang="en"/>
-<l:template name="primary.editor" text=" (ed.)" lang="en"/>
-<l:template name="primary.many" text=", et al." lang="en"/>
-<l:template name="primary.sep" text=". " lang="en"/>
-<l:template name="submaintitle.sep" text=": " lang="en"/>
-<l:template name="title.sep" text=". " lang="en"/>
-<l:template name="othertitle.sep" text=", " lang="en"/>
-<l:template name="medium1" text=" [" lang="en"/>
-<l:template name="medium2" text="]" lang="en"/>
-<l:template name="secondary.person.sep" text="; " lang="en"/>
-<l:template name="secondary.sep" text=". " lang="en"/>
-<l:template name="respons.sep" text=". " lang="en"/>
-<l:template name="edition.sep" text=". " lang="en"/>
-<l:template name="edition.serial.sep" text=", " lang="en"/>
-<l:template name="issuing.range" text="-" lang="en"/>
-<l:template name="issuing.div" text=", " lang="en"/>
-<l:template name="issuing.sep" text=". " lang="en"/>
-<l:template name="partnr.sep" text=". " lang="en"/>
-<l:template name="placepubl.sep" text=": " lang="en"/>
-<l:template name="publyear.sep" text=", " lang="en"/>
-<l:template name="pubinfo.sep" text=". " lang="en"/>
-<l:template name="spec.pubinfo.sep" text=", " lang="en"/>
-<l:template name="upd.sep" text=", " lang="en"/>
-<l:template name="datecit1" text=" [cited " lang="en"/>
-<l:template name="datecit2" text="]" lang="en"/>
-<l:template name="extent.sep" text=". " lang="en"/>
-<l:template name="locs.sep" text=", " lang="en"/>
-<l:template name="location.sep" text=". " lang="en"/>
-<l:template name="serie.sep" text=". " lang="en"/>
-<l:template name="notice.sep" text=". " lang="en"/>
-<l:template name="access" text="Available " lang="en"/>
-<l:template name="acctoo" text="Also available " lang="en"/>
-<l:template name="onwww" text="from World Wide Web" lang="en"/>
-<l:template name="oninet" text="from Internet" lang="en"/>
-<l:template name="access.end" text=": " lang="en"/>
-<l:template name="link1" text="&lt;" lang="en"/>
-<l:template name="link2" text="&gt;" lang="en"/>
-<l:template name="access.sep" text=". " lang="en"/>
-<l:template name="isbn" text="ISBN " lang="en"/>
-<l:template name="issn" text="ISSN " lang="en"/>
-<l:template name="stdnum.sep" text=". " lang="en"/>
-<l:template name="patcountry.sep" text=". " lang="en"/>
-<l:template name="pattype.sep" text=", " lang="en"/>
-<l:template name="patnum.sep" text=". " lang="en"/>
-<l:template name="patdate.sep" text=". " lang="en"/>
-</l:context><l:letters><l:l i="-1"/>
-<l:l i="0">Symbole</l:l>
-<l:l i="1">A</l:l>
-<l:l i="1">a</l:l>
-<l:l i="1">Ã</l:l>
-<l:l i="1">Ã€</l:l>
-<l:l i="2">B</l:l>
-<l:l i="2">b</l:l>
-<l:l i="3">C</l:l>
-<l:l i="3">c</l:l>
-<l:l i="4">D</l:l>
-<l:l i="4">d</l:l>
-<l:l i="5">E</l:l>
-<l:l i="5">e</l:l>
-<l:l i="6">F</l:l>
-<l:l i="6">f</l:l>
-<l:l i="7">G</l:l>
-<l:l i="7">g</l:l>
-<l:l i="8">H</l:l>
-<l:l i="8">h</l:l>
-<l:l i="9">I</l:l>
-<l:l i="9">i</l:l>
-<l:l i="10">J</l:l>
-<l:l i="10">j</l:l>
-<l:l i="11">K</l:l>
-<l:l i="11">k</l:l>
-<l:l i="12">L</l:l>
-<l:l i="12">l</l:l>
-<l:l i="13">M</l:l>
-<l:l i="13">m</l:l>
-<l:l i="14">N</l:l>
-<l:l i="14">n</l:l>
-<l:l i="15">O</l:l>
-<l:l i="15">o</l:l>
-<l:l i="15">Ã</l:l>
-<l:l i="15">Ã¶</l:l>
-<l:l i="16">P</l:l>
-<l:l i="16">p</l:l>
-<l:l i="17">Q</l:l>
-<l:l i="17">q</l:l>
-<l:l i="18">R</l:l>
-<l:l i="18">r</l:l>
-<l:l i="19">S</l:l>
-<l:l i="19">s</l:l>
-<l:l i="20">T</l:l>
-<l:l i="20">t</l:l>
-<l:l i="21">U</l:l>
-<l:l i="21">u</l:l>
-<l:l i="21">Ã</l:l>
-<l:l i="21">ÃŒ</l:l>
-<l:l i="22">V</l:l>
-<l:l i="22">v</l:l>
-<l:l i="23">W</l:l>
-<l:l i="23">w</l:l>
-<l:l i="24">X</l:l>
-<l:l i="24">x</l:l>
-<l:l i="25">Y</l:l>
-<l:l i="25">y</l:l>
-<l:l i="26">Z</l:l>
-<l:l i="26">z</l:l>
-</l:letters>
-</l:l10n>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/en.xml
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/en.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,1241 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="en" english-language-name="English">
-
-<!-- * This file is generated automatically. -->
-<!-- * To submit changes to this file upstream (to the DocBook Project) -->
-<!-- * do not submit an edited version of this file. Instead, submit an -->
-<!-- * edited version of the source file at the following location: -->
-<!-- * -->
-<!-- *  https://svn.sourceforge.net/svnroot/docbook/trunk/gentext/locale/en.xml -->
-<!-- * -->
-<!-- * E-mail the edited en.xml source file to: -->
-<!-- * -->
-<!-- *  docbook-developers@lists.sourceforge.net -->
-
-<!-- ******************************************************************** -->
-
-<!-- This file is part of the XSL DocBook Stylesheet distribution. -->
-<!-- See ../README or http://docbook.sf.net/release/xsl/current/ for -->
-<!-- copyright and other information. -->
-
-<!-- ******************************************************************** -->
-<!-- In these files, % with a letter is used for a placeholder: -->
-<!--   %t is the current element's title -->
-<!--   %s is the current element's subtitle (if applicable)-->
-<!--   %n is the current element's number label-->
-<!--   %p is the current element's page number (if applicable)-->
-<!-- ******************************************************************** -->
-
-
-<l:gentext key="Abstract" text="Abstract"/>
-<l:gentext key="abstract" text="Abstract"/>
-<l:gentext key="Answer" text="A:"/>
-<l:gentext key="answer" text="A:"/>
-<l:gentext key="Appendix" text="Appendix"/>
-<l:gentext key="appendix" text="Appendix"/>
-<l:gentext key="Article" text="Article"/>
-<l:gentext key="article" text="Article"/>
-<l:gentext key="Author" text="Author"/>
-<l:gentext key="Bibliography" text="Bibliography"/>
-<l:gentext key="bibliography" text="Bibliography"/>
-<l:gentext key="Book" text="Book"/>
-<l:gentext key="book" text="Book"/>
-<l:gentext key="CAUTION" text="CAUTION"/>
-<l:gentext key="Caution" text="Caution"/>
-<l:gentext key="caution" text="Caution"/>
-<l:gentext key="Chapter" text="Chapter"/>
-<l:gentext key="chapter" text="Chapter"/>
-<l:gentext key="Colophon" text="Colophon"/>
-<l:gentext key="colophon" text="Colophon"/>
-<l:gentext key="Copyright" text="Copyright"/>
-<l:gentext key="copyright" text="Copyright"/>
-<l:gentext key="Dedication" text="Dedication"/>
-<l:gentext key="dedication" text="Dedication"/>
-<l:gentext key="Edition" text="Edition"/>
-<l:gentext key="edition" text="Edition"/>
-<l:gentext key="Editor" text="Editor"/>
-<l:gentext key="Equation" text="Equation"/>
-<l:gentext key="equation" text="Equation"/>
-<l:gentext key="Example" text="Example"/>
-<l:gentext key="example" text="Example"/>
-<l:gentext key="Figure" text="Figure"/>
-<l:gentext key="figure" text="Figure"/>
-<l:gentext key="Glossary" text="Glossary"/>
-<l:gentext key="glossary" text="Glossary"/>
-<l:gentext key="GlossSee" text="See"/>
-<l:gentext key="glosssee" text="See"/>
-<l:gentext key="GlossSeeAlso" text="See Also"/>
-<l:gentext key="glossseealso" text="See Also"/>
-<l:gentext key="IMPORTANT" text="IMPORTANT"/>
-<l:gentext key="important" text="Important"/>
-<l:gentext key="Important" text="Important"/>
-<l:gentext key="Index" text="Index"/>
-<l:gentext key="index" text="Index"/>
-<l:gentext key="ISBN" text="ISBN"/>
-<l:gentext key="isbn" text="ISBN"/>
-<l:gentext key="LegalNotice" text="Legal Notice"/>
-<l:gentext key="legalnotice" text="Legal Notice"/>
-<l:gentext key="MsgAud" text="Audience"/>
-<l:gentext key="msgaud" text="Audience"/>
-<l:gentext key="MsgLevel" text="Level"/>
-<l:gentext key="msglevel" text="Level"/>
-<l:gentext key="MsgOrig" text="Origin"/>
-<l:gentext key="msgorig" text="Origin"/>
-<l:gentext key="NOTE" text="NOTE"/>
-<l:gentext key="Note" text="Note"/>
-<l:gentext key="note" text="Note"/>
-<l:gentext key="Part" text="Part"/>
-<l:gentext key="part" text="Part"/>
-<l:gentext key="Preface" text="Preface"/>
-<l:gentext key="preface" text="Preface"/>
-<l:gentext key="Procedure" text="Procedure"/>
-<l:gentext key="procedure" text="Procedure"/>
-<l:gentext key="ProductionSet" text="Production"/>
-<l:gentext key="PubDate" text="Publication Date"/>
-<l:gentext key="pubdate" text="Publication date"/>
-<l:gentext key="Published" text="Published"/>
-<l:gentext key="published" text="Published"/>
-<l:gentext key="Publisher" text="Publisher"/>
-<l:gentext key="Qandadiv" text="Q &amp; A"/>
-<l:gentext key="qandadiv" text="Q &amp; A"/>
-<l:gentext key="QandASet" text="Frequently Asked Questions"/>
-<l:gentext key="Question" text="Q:"/>
-<l:gentext key="question" text="Q:"/>
-<l:gentext key="RefEntry" text=""/>
-<l:gentext key="refentry" text=""/>
-<l:gentext key="Reference" text="Reference"/>
-<l:gentext key="reference" text="Reference"/>
-<l:gentext key="References" text="References"/>
-<l:gentext key="RefName" text="Name"/>
-<l:gentext key="refname" text="Name"/>
-<l:gentext key="RefSection" text=""/>
-<l:gentext key="refsection" text=""/>
-<l:gentext key="RefSynopsisDiv" text="Synopsis"/>
-<l:gentext key="refsynopsisdiv" text="Synopsis"/>
-<l:gentext key="RevHistory" text="Revision History"/>
-<l:gentext key="revhistory" text="Revision History"/>
-<l:gentext key="revision" text="Revision"/>
-<l:gentext key="Revision" text="Revision"/>
-<l:gentext key="sect1" text="Section"/>
-<l:gentext key="sect2" text="Section"/>
-<l:gentext key="sect3" text="Section"/>
-<l:gentext key="sect4" text="Section"/>
-<l:gentext key="sect5" text="Section"/>
-<l:gentext key="section" text="Section"/>
-<l:gentext key="Section" text="Section"/>
-<l:gentext key="see" text="see"/>
-<l:gentext key="See" text="See"/>
-<l:gentext key="seealso" text="see also"/>
-<l:gentext key="Seealso" text="See also"/>
-<l:gentext key="SeeAlso" text="See Also"/>
-<l:gentext key="set" text="Set"/>
-<l:gentext key="Set" text="Set"/>
-<l:gentext key="setindex" text="Set Index"/>
-<l:gentext key="SetIndex" text="Set Index"/>
-<l:gentext key="Sidebar" text=""/>
-<l:gentext key="sidebar" text="sidebar"/>
-<l:gentext key="step" text="step"/>
-<l:gentext key="Step" text="Step"/>
-<l:gentext key="table" text="Table"/>
-<l:gentext key="Table" text="Table"/>
-<l:gentext key="task" text="Task"/>
-<l:gentext key="Task" text="Task"/>
-<l:gentext key="tip" text="Tip"/>
-<l:gentext key="TIP" text="TIP"/>
-<l:gentext key="Tip" text="Tip"/>
-<l:gentext key="Warning" text="Warning"/>
-<l:gentext key="warning" text="Warning"/>
-<l:gentext key="WARNING" text="WARNING"/>
-<l:gentext key="and" text="and"/>
-<l:gentext key="by" text="by"/>
-<l:gentext key="Edited" text="Edited"/>
-<l:gentext key="edited" text="Edited"/>
-<l:gentext key="Editedby" text="Edited by"/>
-<l:gentext key="editedby" text="Edited by"/>
-<l:gentext key="in" text="in"/>
-<l:gentext key="lastlistcomma" text=","/>
-<l:gentext key="listcomma" text=","/>
-<l:gentext key="nonexistantelement" text="non-existant element"/>
-<l:gentext key="notes" text="Notes"/>
-<l:gentext key="Notes" text="Notes"/>
-<l:gentext key="Pgs" text="Pgs."/>
-<l:gentext key="pgs" text="Pgs."/>
-<l:gentext key="Revisedby" text="Revised by: "/>
-<l:gentext key="revisedby" text="Revised by: "/>
-<l:gentext key="TableNotes" text="Notes"/>
-<l:gentext key="tablenotes" text="Notes"/>
-<l:gentext key="TableofContents" text="Table of Contents"/>
-<l:gentext key="tableofcontents" text="Table of Contents"/>
-<l:gentext key="unexpectedelementname" text="Unexpected element name"/>
-<l:gentext key="unsupported" text="unsupported"/>
-<l:gentext key="xrefto" text="xref to"/>
-<l:gentext key="Authors" text="Authors"/>
-<l:gentext key="copyeditor" text="Copy Editor"/>
-<l:gentext key="graphicdesigner" text="Graphic Designer"/>
-<l:gentext key="productioneditor" text="Production Editor"/>
-<l:gentext key="technicaleditor" text="Technical Editor"/>
-<l:gentext key="translator" text="Translator"/>
-<l:gentext key="listofequations" text="List of Equations"/>
-<l:gentext key="ListofEquations" text="List of Equations"/>
-<l:gentext key="ListofExamples" text="List of Examples"/>
-<l:gentext key="listofexamples" text="List of Examples"/>
-<l:gentext key="ListofFigures" text="List of Figures"/>
-<l:gentext key="listoffigures" text="List of Figures"/>
-<l:gentext key="ListofProcedures" text="List of Procedures"/>
-<l:gentext key="listofprocedures" text="List of Procedures"/>
-<l:gentext key="listoftables" text="List of Tables"/>
-<l:gentext key="ListofTables" text="List of Tables"/>
-<l:gentext key="ListofUnknown" text="List of Unknown"/>
-<l:gentext key="listofunknown" text="List of Unknown"/>
-<l:gentext key="nav-home" text="Home"/>
-<l:gentext key="nav-next" text="Next"/>
-<l:gentext key="nav-next-sibling" text="Fast Forward"/>
-<l:gentext key="nav-prev" text="Prev"/>
-<l:gentext key="nav-prev-sibling" text="Fast Backward"/>
-<l:gentext key="nav-up" text="Up"/>
-<l:gentext key="nav-toc" text="ToC"/>
-<l:gentext key="Draft" text="Draft"/>
-<l:gentext key="above" text="above"/>
-<l:gentext key="below" text="below"/>
-<l:gentext key="sectioncalled" text="the section called"/>
-<l:gentext key="index symbols" text="Symbols"/>
-<l:gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyz"/>
-<l:gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZ"/>
-<l:gentext key="normalize.sort.input" text="AaÃÃ ÃÃ¡ÃÃ¢ÃÃ£ÃÃ€Ã
-Ã¥ÄÄÄÄÄÄ
-ÇÇÇÇÇ Ç¡ÇºÇ»ÈÈÈÈÈŠÈ§ážážáºáº áº¡áº¢áº£áº€áº¥áºŠáº§áºšáº©áºªáº«áº¬áº­áº®áº¯áº°áº±áº²áº³áºŽáºµáº¶áº·BbÆÆÉÆÆážážážáž
-ážážCcÃÃ§ÄÄÄÄÄÄÄÄÆÆÉážážDdÄÄÄÄÆÉÆÆÇ
-Ç²È¡ÉážážážážážážážážážážEeÃÃšÃÃ©ÃÃªÃÃ«ÄÄÄÄÄÄÄÄÄÄÈÈ
-ÈÈÈšÈ©ážážážážážážážážážážáºžáº¹áººáº»áºŒáºœáºŸáº¿á»á»á»á»á»á»
-á»á»FfÆÆážážGgÄÄÄÄÄ Ä¡Ä¢Ä£ÆÉ Ç€Ç¥ÇŠÇ§ÇŽÇµáž áž¡HhÄ€Ä¥ÄŠÄ§ÈÈÉŠáž¢áž£áž€áž¥ážŠáž§ážšáž©ážªáž«áºIiÃÃ¬ÃÃ­ÃÃ®ÃÃ¯ÄšÄ©ÄªÄ«Ä¬Ä­Ä®Ä¯Ä°ÆÉšÇÇÈÈÈÈáž¬áž­áž®áž¯á»á»á»á»JjÄŽÄµÇ°ÊKkÄ¶Ä·ÆÆÇšÇ©áž°áž±áž²áž³ážŽážµLlÄ¹ÄºÄ»ÄŒÄœÄŸÄ¿ÅÅÅÆÇÈŽÉ«É¬É­áž¶áž·ážžáž¹ážºáž»ážŒážœMmÉ±ážŸáž¿á¹á¹á¹á¹NnÃÃ±ÅÅÅ
-ÅÅÅÆÉ²ÆÈ ÇÇžÇ¹ÈµÉ³á¹á¹
-á¹á¹á¹á¹á¹á¹OoÃÃ²ÃÃ³ÃÃŽÃÃµÃÃ¶ÃÃžÅÅÅÅÅÅÆÆ Æ¡ÇÇÇªÇ«Ç¬Ç­ÇŸÇ¿ÈÈÈÈÈªÈ«È¬È­È®È¯È°È±á¹á¹á¹á¹á¹á¹á¹á¹á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á» á»¡á»¢á»£PpÆ€Æ¥á¹á¹á¹á¹QqÊ RrÅÅÅÅÅÅÈÈÈÈÉŒÉœÉŸá¹á¹á¹á¹á¹á¹á¹á¹SsÅÅÅÅÅÅÅ Å¡ÈÈÊá¹ á¹¡á¹¢á¹£á¹€á¹¥á¹Šá¹§á¹šá¹©TtÅ¢Å£Å€Å¥ÅŠÅ§Æ«Æ¬Æ­Æ®ÊÈÈÈ¶á¹ªá¹«á¹¬á¹­á¹®á¹¯á¹°á¹±áºUuÃÃ¹ÃÃºÃÃ»ÃÃŒÅšÅ©ÅªÅ«Å¬Å­Å®Å¯Å°Å±Å²Å³Æ¯Æ°ÇÇÇÇÇÇÇÇÇÇÈÈÈÈá¹²á¹³á¹Žá¹µá¹¶á¹·á¹žá¹¹á¹ºá¹»á»€á»¥á»Šá»§á»šá»©á»ªá»«á»¬á»­á»®á»¯á»°á»±VvÆ²Êá¹Œá¹œá¹Ÿá¹¿WwÅŽÅµáºáºáºáºáºáº
-áºáºáºáºáºXxáºáºáºáºYyÃÃœÃ¿ÅžÅ¶Å·Æ³ÆŽÈ²È³áºáºáºá»²á»³á»Žá»µá»¶á»·á»žá»¹ZzÅ¹ÅºÅ»ÅŒÅœÅŸÆµÆ¶È€È¥ÊÊáºáºáºáºáºáºáº"/>
-<l:gentext key="normalize.sort.output" text="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ"/>
-<l:dingbat key="startquote" text="â"/>
-<l:dingbat key="endquote" text="â"/>
-<l:dingbat key="nestedstartquote" text="â"/>
-<l:dingbat key="nestedendquote" text="â"/>
-<l:dingbat key="singlestartquote" text="â"/>
-<l:dingbat key="singleendquote" text="â"/>
-<l:dingbat key="bullet" text="â¢"/>
-<l:gentext key="hyphenation-character" text="-"/>
-<l:gentext key="hyphenation-push-character-count" text="2"/>
-<l:gentext key="hyphenation-remain-character-count" text="2"/>
-<l:context name="styles"><l:template name="person-name" text="first-last"/>
-</l:context>
-<l:context name="title"><l:template name="abstract" text="%t"/>
-<l:template name="answer" text="%t"/>
-<l:template name="appendix" text="AppendixÂ %n.Â %t"/>
-<l:template name="article" text="%t"/>
-<l:template name="authorblurb" text="%t"/>
-<l:template name="bibliodiv" text="%t"/>
-<l:template name="biblioentry" text="%t"/>
-<l:template name="bibliography" text="%t"/>
-<l:template name="bibliolist" text="%t"/>
-<l:template name="bibliomixed" text="%t"/>
-<l:template name="bibliomset" text="%t"/>
-<l:template name="biblioset" text="%t"/>
-<l:template name="blockquote" text="%t"/>
-<l:template name="book" text="%t"/>
-<l:template name="calloutlist" text="%t"/>
-<l:template name="caution" text="%t"/>
-<l:template name="chapter" text="ChapterÂ %n.Â %t"/>
-<l:template name="colophon" text="%t"/>
-<l:template name="dedication" text="%t"/>
-<l:template name="equation" text="EquationÂ %n.Â %t"/>
-<l:template name="example" text="ExampleÂ %n.Â %t"/>
-<l:template name="figure" text="FigureÂ %n.Â %t"/>
-<l:template name="foil" text="%t"/>
-<l:template name="foilgroup" text="%t"/>
-<l:template name="formalpara" text="%t"/>
-<l:template name="glossary" text="%t"/>
-<l:template name="glossdiv" text="%t"/>
-<l:template name="glosslist" text="%t"/>
-<l:template name="glossentry" text="%t"/>
-<l:template name="important" text="%t"/>
-<l:template name="index" text="%t"/>
-<l:template name="indexdiv" text="%t"/>
-<l:template name="itemizedlist" text="%t"/>
-<l:template name="legalnotice" text="%t"/>
-<l:template name="listitem" text=""/>
-<l:template name="lot" text="%t"/>
-<l:template name="msg" text="%t"/>
-<l:template name="msgexplan" text="%t"/>
-<l:template name="msgmain" text="%t"/>
-<l:template name="msgrel" text="%t"/>
-<l:template name="msgset" text="%t"/>
-<l:template name="msgsub" text="%t"/>
-<l:template name="note" text="%t"/>
-<l:template name="orderedlist" text="%t"/>
-<l:template name="part" text="PartÂ %n.Â %t"/>
-<l:template name="partintro" text="%t"/>
-<l:template name="preface" text="%t"/>
-<l:template name="procedure" text="%t"/>
-<l:template name="procedure.formal" text="ProcedureÂ %n.Â %t"/>
-<l:template name="productionset" text="%t"/>
-<l:template name="productionset.formal" text="ProductionÂ %n"/>
-<l:template name="qandadiv" text="%t"/>
-<l:template name="qandaentry" text="%t"/>
-<l:template name="qandaset" text="%t"/>
-<l:template name="question" text="%t"/>
-<l:template name="refentry" text="%t"/>
-<l:template name="reference" text="%t"/>
-<l:template name="refsection" text="%t"/>
-<l:template name="refsect1" text="%t"/>
-<l:template name="refsect2" text="%t"/>
-<l:template name="refsect3" text="%t"/>
-<l:template name="refsynopsisdiv" text="%t"/>
-<l:template name="refsynopsisdivinfo" text="%t"/>
-<l:template name="segmentedlist" text="%t"/>
-<l:template name="set" text="%t"/>
-<l:template name="setindex" text="%t"/>
-<l:template name="sidebar" text="%t"/>
-<l:template name="step" text="%t"/>
-<l:template name="table" text="TableÂ %n.Â %t"/>
-<l:template name="task" text="%t"/>
-<l:template name="tasksummary" text="%t"/>
-<l:template name="taskprerequisites" text="%t"/>
-<l:template name="taskrelated" text="%t"/>
-<l:template name="tip" text="%t"/>
-<l:template name="toc" text="%t"/>
-<l:template name="variablelist" text="%t"/>
-<l:template name="varlistentry" text=""/>
-<l:template name="warning" text="%t"/>
-</l:context>
-<l:context name="title-unnumbered"><l:template name="appendix" text="%t"/>
-<l:template name="article/appendix" text="%t"/>
-<l:template name="bridgehead" text="%t"/>
-<l:template name="chapter" text="%t"/>
-<l:template name="sect1" text="%t"/>
-<l:template name="sect2" text="%t"/>
-<l:template name="sect3" text="%t"/>
-<l:template name="sect4" text="%t"/>
-<l:template name="sect5" text="%t"/>
-<l:template name="section" text="%t"/>
-<l:template name="simplesect" text="%t"/>
-<l:template name="part" text="%t"/>
-</l:context>
-<l:context name="title-numbered"><l:template name="appendix" text="AppendixÂ %n.Â %t"/>
-<l:template name="article/appendix" text="%n.Â %t"/>
-<l:template name="bridgehead" text="%n.Â %t"/>
-<l:template name="chapter" text="ChapterÂ %n.Â %t"/>
-<l:template name="part" text="PartÂ %n.Â %t"/>
-<l:template name="sect1" text="%n.Â %t"/>
-<l:template name="sect2" text="%n.Â %t"/>
-<l:template name="sect3" text="%n.Â %t"/>
-<l:template name="sect4" text="%n.Â %t"/>
-<l:template name="sect5" text="%n.Â %t"/>
-<l:template name="section" text="%n.Â %t"/>
-<l:template name="simplesect" text="%t"/>
-</l:context>
-<l:context name="subtitle"><l:template name="appendix" text="%s"/>
-<l:template name="article" text="%s"/>
-<l:template name="bibliodiv" text="%s"/>
-<l:template name="biblioentry" text="%s"/>
-<l:template name="bibliography" text="%s"/>
-<l:template name="bibliomixed" text="%s"/>
-<l:template name="bibliomset" text="%s"/>
-<l:template name="biblioset" text="%s"/>
-<l:template name="book" text="%s"/>
-<l:template name="chapter" text="%s"/>
-<l:template name="colophon" text="%s"/>
-<l:template name="dedication" text="%s"/>
-<l:template name="glossary" text="%s"/>
-<l:template name="glossdiv" text="%s"/>
-<l:template name="index" text="%s"/>
-<l:template name="indexdiv" text="%s"/>
-<l:template name="lot" text="%s"/>
-<l:template name="part" text="%s"/>
-<l:template name="partintro" text="%s"/>
-<l:template name="preface" text="%s"/>
-<l:template name="refentry" text="%s"/>
-<l:template name="reference" text="%s"/>
-<l:template name="refsection" text="%s"/>
-<l:template name="refsect1" text="%s"/>
-<l:template name="refsect2" text="%s"/>
-<l:template name="refsect3" text="%s"/>
-<l:template name="refsynopsisdiv" text="%s"/>
-<l:template name="sect1" text="%s"/>
-<l:template name="sect2" text="%s"/>
-<l:template name="sect3" text="%s"/>
-<l:template name="sect4" text="%s"/>
-<l:template name="sect5" text="%s"/>
-<l:template name="section" text="%s"/>
-<l:template name="set" text="%s"/>
-<l:template name="setindex" text="%s"/>
-<l:template name="sidebar" text="%s"/>
-<l:template name="simplesect" text="%s"/>
-<l:template name="toc" text="%s"/>
-</l:context>
-<l:context name="xref"><l:template name="abstract" text="%t"/>
-<l:template name="answer" text="A:Â %n"/>
-<l:template name="appendix" text="%t"/>
-<l:template name="article" text="%t"/>
-<l:template name="authorblurb" text="%t"/>
-<l:template name="bibliodiv" text="%t"/>
-<l:template name="bibliography" text="%t"/>
-<l:template name="bibliomset" text="%t"/>
-<l:template name="biblioset" text="%t"/>
-<l:template name="blockquote" text="%t"/>
-<l:template name="book" text="%t"/>
-<l:template name="calloutlist" text="%t"/>
-<l:template name="caution" text="%t"/>
-<l:template name="chapter" text="%t"/>
-<l:template name="colophon" text="%t"/>
-<l:template name="constraintdef" text="%t"/>
-<l:template name="dedication" text="%t"/>
-<l:template name="equation" text="%t"/>
-<l:template name="example" text="%t"/>
-<l:template name="figure" text="%t"/>
-<l:template name="foil" text="%t"/>
-<l:template name="foilgroup" text="%t"/>
-<l:template name="formalpara" text="%t"/>
-<l:template name="glossary" text="%t"/>
-<l:template name="glossdiv" text="%t"/>
-<l:template name="important" text="%t"/>
-<l:template name="index" text="%t"/>
-<l:template name="indexdiv" text="%t"/>
-<l:template name="itemizedlist" text="%t"/>
-<l:template name="legalnotice" text="%t"/>
-<l:template name="listitem" text="%n"/>
-<l:template name="lot" text="%t"/>
-<l:template name="msg" text="%t"/>
-<l:template name="msgexplan" text="%t"/>
-<l:template name="msgmain" text="%t"/>
-<l:template name="msgrel" text="%t"/>
-<l:template name="msgset" text="%t"/>
-<l:template name="msgsub" text="%t"/>
-<l:template name="note" text="%t"/>
-<l:template name="orderedlist" text="%t"/>
-<l:template name="part" text="%t"/>
-<l:template name="partintro" text="%t"/>
-<l:template name="preface" text="%t"/>
-<l:template name="procedure" text="%t"/>
-<l:template name="productionset" text="%t"/>
-<l:template name="qandadiv" text="%t"/>
-<l:template name="qandaentry" text="Q:Â %n"/>
-<l:template name="qandaset" text="%t"/>
-<l:template name="question" text="Q:Â %n"/>
-<l:template name="reference" text="%t"/>
-<l:template name="refsynopsisdiv" text="%t"/>
-<l:template name="segmentedlist" text="%t"/>
-<l:template name="set" text="%t"/>
-<l:template name="setindex" text="%t"/>
-<l:template name="sidebar" text="%t"/>
-<l:template name="table" text="%t"/>
-<l:template name="task" text="%t"/>
-<l:template name="tip" text="%t"/>
-<l:template name="toc" text="%t"/>
-<l:template name="variablelist" text="%t"/>
-<l:template name="varlistentry" text="%n"/>
-<l:template name="warning" text="%t"/>
-<l:template name="olink.document.citation" text=" in %o"/>
-<l:template name="olink.page.citation" text=" (page %p)"/>
-<l:template name="page.citation" text=" [%p]"/>
-<l:template name="page" text="(page %p)"/>
-<l:template name="docname" text=" in %o"/>
-<l:template name="docnamelong" text=" in the document titled %o"/>
-<l:template name="pageabbrev" text="(p. %p)"/>
-<l:template name="Page" text="Page %p"/>
-<l:template name="bridgehead" text="the section called â%tâ"/>
-<l:template name="refsection" text="the section called â%tâ"/>
-<l:template name="refsect1" text="the section called â%tâ"/>
-<l:template name="refsect2" text="the section called â%tâ"/>
-<l:template name="refsect3" text="the section called â%tâ"/>
-<l:template name="sect1" text="the section called â%tâ"/>
-<l:template name="sect2" text="the section called â%tâ"/>
-<l:template name="sect3" text="the section called â%tâ"/>
-<l:template name="sect4" text="the section called â%tâ"/>
-<l:template name="sect5" text="the section called â%tâ"/>
-<l:template name="section" text="the section called â%tâ"/>
-<l:template name="simplesect" text="the section called â%tâ"/>
-</l:context>
-<l:context name="xref-number"><l:template name="answer" text="A:Â %n"/>
-<l:template name="appendix" text="AppendixÂ %n"/>
-<l:template name="bridgehead" text="SectionÂ %n"/>
-<l:template name="chapter" text="ChapterÂ %n"/>
-<l:template name="equation" text="EquationÂ %n"/>
-<l:template name="example" text="ExampleÂ %n"/>
-<l:template name="figure" text="FigureÂ %n"/>
-<l:template name="part" text="PartÂ %n"/>
-<l:template name="procedure" text="ProcedureÂ %n"/>
-<l:template name="productionset" text="ProductionÂ %n"/>
-<l:template name="qandadiv" text="Q &amp; AÂ %n"/>
-<l:template name="qandaentry" text="Q:Â %n"/>
-<l:template name="question" text="Q:Â %n"/>
-<l:template name="sect1" text="SectionÂ %n"/>
-<l:template name="sect2" text="SectionÂ %n"/>
-<l:template name="sect3" text="SectionÂ %n"/>
-<l:template name="sect4" text="SectionÂ %n"/>
-<l:template name="sect5" text="SectionÂ %n"/>
-<l:template name="section" text="SectionÂ %n"/>
-<l:template name="table" text="TableÂ %n"/>
-</l:context>
-<l:context name="xref-number-and-title"><l:template name="appendix" text="AppendixÂ %n, %t"/>
-<l:template name="bridgehead" text="SectionÂ %n, â%tâ"/>
-<l:template name="chapter" text="ChapterÂ %n, %t"/>
-<l:template name="equation" text="EquationÂ %n, â%tâ"/>
-<l:template name="example" text="ExampleÂ %n, â%tâ"/>
-<l:template name="figure" text="FigureÂ %n, â%tâ"/>
-<l:template name="part" text="PartÂ %n, â%tâ"/>
-<l:template name="procedure" text="ProcedureÂ %n, â%tâ"/>
-<l:template name="productionset" text="ProductionÂ %n, â%tâ"/>
-<l:template name="qandadiv" text="Q &amp; AÂ %n, â%tâ"/>
-<l:template name="refsect1" text="the section called â%tâ"/>
-<l:template name="refsect2" text="the section called â%tâ"/>
-<l:template name="refsect3" text="the section called â%tâ"/>
-<l:template name="refsection" text="the section called â%tâ"/>
-<l:template name="sect1" text="SectionÂ %n, â%tâ"/>
-<l:template name="sect2" text="SectionÂ %n, â%tâ"/>
-<l:template name="sect3" text="SectionÂ %n, â%tâ"/>
-<l:template name="sect4" text="SectionÂ %n, â%tâ"/>
-<l:template name="sect5" text="SectionÂ %n, â%tâ"/>
-<l:template name="section" text="SectionÂ %n, â%tâ"/>
-<l:template name="simplesect" text="the section called â%tâ"/>
-<l:template name="table" text="TableÂ %n, â%tâ"/>
-</l:context>
-<l:context name="authorgroup"><l:template name="sep" text=", "/>
-<l:template name="sep2" text=" and "/>
-<l:template name="seplast" text=", and "/>
-</l:context>
-<l:context name="glossary"><l:template name="see" text="See %t"/>
-<l:template name="seealso" text="See Also %t"/>
-</l:context>
-<l:context name="msgset"><l:template name="MsgAud" text="Audience: "/>
-<l:template name="MsgLevel" text="Level: "/>
-<l:template name="MsgOrig" text="Origin: "/>
-</l:context>
-<l:context name="datetime"><l:template name="format" text="m/d/Y"/>
-</l:context>
-<l:context name="termdef"><l:template name="prefix" text="[Definition: "/>
-<l:template name="suffix" text="]"/>
-</l:context>
-<l:context name="datetime-full"><l:template name="January" text="January"/>
-<l:template name="February" text="February"/>
-<l:template name="March" text="March"/>
-<l:template name="April" text="April"/>
-<l:template name="May" text="May"/>
-<l:template name="June" text="June"/>
-<l:template name="July" text="July"/>
-<l:template name="August" text="August"/>
-<l:template name="September" text="September"/>
-<l:template name="October" text="October"/>
-<l:template name="November" text="November"/>
-<l:template name="December" text="December"/>
-<l:template name="Monday" text="Monday"/>
-<l:template name="Tuesday" text="Tuesday"/>
-<l:template name="Wednesday" text="Wednesday"/>
-<l:template name="Thursday" text="Thursday"/>
-<l:template name="Friday" text="Friday"/>
-<l:template name="Saturday" text="Saturday"/>
-<l:template name="Sunday" text="Sunday"/>
-</l:context>
-<l:context name="datetime-abbrev"><l:template name="Jan" text="Jan"/>
-<l:template name="Feb" text="Feb"/>
-<l:template name="Mar" text="Mar"/>
-<l:template name="Apr" text="Apr"/>
-<l:template name="May" text="May"/>
-<l:template name="Jun" text="Jun"/>
-<l:template name="Jul" text="Jul"/>
-<l:template name="Aug" text="Aug"/>
-<l:template name="Sep" text="Sep"/>
-<l:template name="Oct" text="Oct"/>
-<l:template name="Nov" text="Nov"/>
-<l:template name="Dec" text="Dec"/>
-<l:template name="Mon" text="Mon"/>
-<l:template name="Tue" text="Tue"/>
-<l:template name="Wed" text="Wed"/>
-<l:template name="Thu" text="Thu"/>
-<l:template name="Fri" text="Fri"/>
-<l:template name="Sat" text="Sat"/>
-<l:template name="Sun" text="Sun"/>
-</l:context>
-<l:context name="htmlhelp"><l:template name="langcode" text="0x0409 English (UNITED STATES)"/>
-</l:context>
-<l:context name="index"><l:template name="term-separator" text=", "/>
-<l:template name="number-separator" text=", "/>
-<l:template name="range-separator" text="-"/>
-</l:context>
-<l:context name="iso690"><l:template name="lastfirst.sep" text=", "/>
-<l:template name="alt.person.two.sep" text=" â "/>
-<l:template name="alt.person.last.sep" text=" â "/>
-<l:template name="alt.person.more.sep" text=" â "/>
-<l:template name="primary.editor" text=" (ed.)"/>
-<l:template name="primary.many" text=", et al."/>
-<l:template name="primary.sep" text=". "/>
-<l:template name="submaintitle.sep" text=": "/>
-<l:template name="title.sep" text=". "/>
-<l:template name="othertitle.sep" text=", "/>
-<l:template name="medium1" text=" ["/>
-<l:template name="medium2" text="]"/>
-<l:template name="secondary.person.sep" text="; "/>
-<l:template name="secondary.sep" text=". "/>
-<l:template name="respons.sep" text=". "/>
-<l:template name="edition.sep" text=". "/>
-<l:template name="edition.serial.sep" text=", "/>
-<l:template name="issuing.range" text="-"/>
-<l:template name="issuing.div" text=", "/>
-<l:template name="issuing.sep" text=". "/>
-<l:template name="partnr.sep" text=". "/>
-<l:template name="placepubl.sep" text=": "/>
-<l:template name="publyear.sep" text=", "/>
-<l:template name="pubinfo.sep" text=". "/>
-<l:template name="spec.pubinfo.sep" text=", "/>
-<l:template name="upd.sep" text=", "/>
-<l:template name="datecit1" text=" [cited "/>
-<l:template name="datecit2" text="]"/>
-<l:template name="extent.sep" text=". "/>
-<l:template name="locs.sep" text=", "/>
-<l:template name="location.sep" text=". "/>
-<l:template name="serie.sep" text=". "/>
-<l:template name="notice.sep" text=". "/>
-<l:template name="access" text="Available "/>
-<l:template name="acctoo" text="Also available "/>
-<l:template name="onwww" text="from World Wide Web"/>
-<l:template name="oninet" text="from Internet"/>
-<l:template name="access.end" text=": "/>
-<l:template name="link1" text="&lt;"/>
-<l:template name="link2" text="&gt;"/>
-<l:template name="access.sep" text=". "/>
-<l:template name="isbn" text="ISBN "/>
-<l:template name="issn" text="ISSN "/>
-<l:template name="stdnum.sep" text=". "/>
-<l:template name="patcountry.sep" text=". "/>
-<l:template name="pattype.sep" text=", "/>
-<l:template name="patnum.sep" text=". "/>
-<l:template name="patdate.sep" text=". "/>
-</l:context><l:letters><l:l i="-1"/>
-<l:l i="0">Symbols</l:l>
-<l:l i="10">A</l:l>
-<l:l i="10">a</l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã </l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã¡</l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã¢</l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã£</l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã€</l:l>
-<l:l i="10">Ã
-</l:l>
-<l:l i="10">Ã¥</l:l>
-<l:l i="10">Ä</l:l>
-<l:l i="10">Ä</l:l>
-<l:l i="10">Ä</l:l>
-<l:l i="10">Ä</l:l>
-<l:l i="10">Ä</l:l>
-<l:l i="10">Ä
-</l:l>
-<l:l i="10">Ç</l:l>
-<l:l i="10">Ç</l:l>
-<l:l i="10">Ç</l:l>
-<l:l i="10">Ç</l:l>
-<l:l i="10">Ç </l:l>
-<l:l i="10">Ç¡</l:l>
-<l:l i="10">Çº</l:l>
-<l:l i="10">Ç»</l:l>
-<l:l i="10">È</l:l>
-<l:l i="10">È</l:l>
-<l:l i="10">È</l:l>
-<l:l i="10">È</l:l>
-<l:l i="10">ÈŠ</l:l>
-<l:l i="10">È§</l:l>
-<l:l i="10">áž</l:l>
-<l:l i="10">áž</l:l>
-<l:l i="10">áº</l:l>
-<l:l i="10">áº </l:l>
-<l:l i="10">áº¡</l:l>
-<l:l i="10">áº¢</l:l>
-<l:l i="10">áº£</l:l>
-<l:l i="10">áº€</l:l>
-<l:l i="10">áº¥</l:l>
-<l:l i="10">áºŠ</l:l>
-<l:l i="10">áº§</l:l>
-<l:l i="10">áºš</l:l>
-<l:l i="10">áº©</l:l>
-<l:l i="10">áºª</l:l>
-<l:l i="10">áº«</l:l>
-<l:l i="10">áº¬</l:l>
-<l:l i="10">áº­</l:l>
-<l:l i="10">áº®</l:l>
-<l:l i="10">áº¯</l:l>
-<l:l i="10">áº°</l:l>
-<l:l i="10">áº±</l:l>
-<l:l i="10">áº²</l:l>
-<l:l i="10">áº³</l:l>
-<l:l i="10">áºŽ</l:l>
-<l:l i="10">áºµ</l:l>
-<l:l i="10">áº¶</l:l>
-<l:l i="10">áº·</l:l>
-<l:l i="20">B</l:l>
-<l:l i="20">b</l:l>
-<l:l i="20">Æ</l:l>
-<l:l i="20">Æ</l:l>
-<l:l i="20">É</l:l>
-<l:l i="20">Æ</l:l>
-<l:l i="20">Æ</l:l>
-<l:l i="20">áž</l:l>
-<l:l i="20">áž</l:l>
-<l:l i="20">áž</l:l>
-<l:l i="20">áž
-</l:l>
-<l:l i="20">áž</l:l>
-<l:l i="20">áž</l:l>
-<l:l i="30">C</l:l>
-<l:l i="30">c</l:l>
-<l:l i="30">Ã</l:l>
-<l:l i="30">Ã§</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Æ</l:l>
-<l:l i="30">Æ</l:l>
-<l:l i="30">É</l:l>
-<l:l i="30">áž</l:l>
-<l:l i="30">áž</l:l>
-<l:l i="40">D</l:l>
-<l:l i="40">d</l:l>
-<l:l i="40">Ä</l:l>
-<l:l i="40">Ä</l:l>
-<l:l i="40">Ä</l:l>
-<l:l i="40">Ä</l:l>
-<l:l i="40">Æ</l:l>
-<l:l i="40">É</l:l>
-<l:l i="40">Æ</l:l>
-<l:l i="40">Æ</l:l>
-<l:l i="40">Ç
-</l:l>
-<l:l i="40">Ç²</l:l>
-<l:l i="40">È¡</l:l>
-<l:l i="40">É</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="50">E</l:l>
-<l:l i="50">e</l:l>
-<l:l i="50">Ã</l:l>
-<l:l i="50">Ãš</l:l>
-<l:l i="50">Ã</l:l>
-<l:l i="50">Ã©</l:l>
-<l:l i="50">Ã</l:l>
-<l:l i="50">Ãª</l:l>
-<l:l i="50">Ã</l:l>
-<l:l i="50">Ã«</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">È</l:l>
-<l:l i="50">È
-</l:l>
-<l:l i="50">È</l:l>
-<l:l i="50">È</l:l>
-<l:l i="50">Èš</l:l>
-<l:l i="50">È©</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áºž</l:l>
-<l:l i="50">áº¹</l:l>
-<l:l i="50">áºº</l:l>
-<l:l i="50">áº»</l:l>
-<l:l i="50">áºŒ</l:l>
-<l:l i="50">áºœ</l:l>
-<l:l i="50">áºŸ</l:l>
-<l:l i="50">áº¿</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»
-</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="60">F</l:l>
-<l:l i="60">f</l:l>
-<l:l i="60">Æ</l:l>
-<l:l i="60">Æ</l:l>
-<l:l i="60">áž</l:l>
-<l:l i="60">áž</l:l>
-<l:l i="70">G</l:l>
-<l:l i="70">g</l:l>
-<l:l i="70">Ä</l:l>
-<l:l i="70">Ä</l:l>
-<l:l i="70">Ä</l:l>
-<l:l i="70">Ä</l:l>
-<l:l i="70">Ä </l:l>
-<l:l i="70">Ä¡</l:l>
-<l:l i="70">Ä¢</l:l>
-<l:l i="70">Ä£</l:l>
-<l:l i="70">Æ</l:l>
-<l:l i="70">É </l:l>
-<l:l i="70">Ç€</l:l>
-<l:l i="70">Ç¥</l:l>
-<l:l i="70">ÇŠ</l:l>
-<l:l i="70">Ç§</l:l>
-<l:l i="70">ÇŽ</l:l>
-<l:l i="70">Çµ</l:l>
-<l:l i="70">áž </l:l>
-<l:l i="70">áž¡</l:l>
-<l:l i="80">H</l:l>
-<l:l i="80">h</l:l>
-<l:l i="80">Ä€</l:l>
-<l:l i="80">Ä¥</l:l>
-<l:l i="80">ÄŠ</l:l>
-<l:l i="80">Ä§</l:l>
-<l:l i="80">È</l:l>
-<l:l i="80">È</l:l>
-<l:l i="80">ÉŠ</l:l>
-<l:l i="80">áž¢</l:l>
-<l:l i="80">áž£</l:l>
-<l:l i="80">áž€</l:l>
-<l:l i="80">áž¥</l:l>
-<l:l i="80">ážŠ</l:l>
-<l:l i="80">áž§</l:l>
-<l:l i="80">ážš</l:l>
-<l:l i="80">áž©</l:l>
-<l:l i="80">ážª</l:l>
-<l:l i="80">áž«</l:l>
-<l:l i="80">áº</l:l>
-<l:l i="90">I</l:l>
-<l:l i="90">i</l:l>
-<l:l i="90">Ã</l:l>
-<l:l i="90">Ã¬</l:l>
-<l:l i="90">Ã</l:l>
-<l:l i="90">Ã­</l:l>
-<l:l i="90">Ã</l:l>
-<l:l i="90">Ã®</l:l>
-<l:l i="90">Ã</l:l>
-<l:l i="90">Ã¯</l:l>
-<l:l i="90">Äš</l:l>
-<l:l i="90">Ä©</l:l>
-<l:l i="90">Äª</l:l>
-<l:l i="90">Ä«</l:l>
-<l:l i="90">Ä¬</l:l>
-<l:l i="90">Ä­</l:l>
-<l:l i="90">Ä®</l:l>
-<l:l i="90">Ä¯</l:l>
-<l:l i="90">Ä°</l:l>
-<l:l i="90">Æ</l:l>
-<l:l i="90">Éš</l:l>
-<l:l i="90">Ç</l:l>
-<l:l i="90">Ç</l:l>
-<l:l i="90">È</l:l>
-<l:l i="90">È</l:l>
-<l:l i="90">È</l:l>
-<l:l i="90">È</l:l>
-<l:l i="90">áž¬</l:l>
-<l:l i="90">áž­</l:l>
-<l:l i="90">áž®</l:l>
-<l:l i="90">áž¯</l:l>
-<l:l i="90">á»</l:l>
-<l:l i="90">á»</l:l>
-<l:l i="90">á»</l:l>
-<l:l i="90">á»</l:l>
-<l:l i="100">J</l:l>
-<l:l i="100">j</l:l>
-<l:l i="100">ÄŽ</l:l>
-<l:l i="100">Äµ</l:l>
-<l:l i="100">Ç°</l:l>
-<l:l i="100">Ê</l:l>
-<l:l i="110">K</l:l>
-<l:l i="110">k</l:l>
-<l:l i="110">Ä¶</l:l>
-<l:l i="110">Ä·</l:l>
-<l:l i="110">Æ</l:l>
-<l:l i="110">Æ</l:l>
-<l:l i="110">Çš</l:l>
-<l:l i="110">Ç©</l:l>
-<l:l i="110">áž°</l:l>
-<l:l i="110">áž±</l:l>
-<l:l i="110">áž²</l:l>
-<l:l i="110">áž³</l:l>
-<l:l i="110">ážŽ</l:l>
-<l:l i="110">ážµ</l:l>
-<l:l i="120">L</l:l>
-<l:l i="120">l</l:l>
-<l:l i="120">Ä¹</l:l>
-<l:l i="120">Äº</l:l>
-<l:l i="120">Ä»</l:l>
-<l:l i="120">ÄŒ</l:l>
-<l:l i="120">Äœ</l:l>
-<l:l i="120">ÄŸ</l:l>
-<l:l i="120">Ä¿</l:l>
-<l:l i="120">Å</l:l>
-<l:l i="120">Å</l:l>
-<l:l i="120">Å</l:l>
-<l:l i="120">Æ</l:l>
-<l:l i="120">Ç</l:l>
-<l:l i="120">ÈŽ</l:l>
-<l:l i="120">É«</l:l>
-<l:l i="120">É¬</l:l>
-<l:l i="120">É­</l:l>
-<l:l i="120">áž¶</l:l>
-<l:l i="120">áž·</l:l>
-<l:l i="120">ážž</l:l>
-<l:l i="120">áž¹</l:l>
-<l:l i="120">ážº</l:l>
-<l:l i="120">áž»</l:l>
-<l:l i="120">ážŒ</l:l>
-<l:l i="120">ážœ</l:l>
-<l:l i="130">M</l:l>
-<l:l i="130">m</l:l>
-<l:l i="130">É±</l:l>
-<l:l i="130">ážŸ</l:l>
-<l:l i="130">áž¿</l:l>
-<l:l i="130">á¹</l:l>
-<l:l i="130">á¹</l:l>
-<l:l i="130">á¹</l:l>
-<l:l i="130">á¹</l:l>
-<l:l i="140">N</l:l>
-<l:l i="140">n</l:l>
-<l:l i="140">Ã</l:l>
-<l:l i="140">Ã±</l:l>
-<l:l i="140">Å</l:l>
-<l:l i="140">Å</l:l>
-<l:l i="140">Å
-</l:l>
-<l:l i="140">Å</l:l>
-<l:l i="140">Å</l:l>
-<l:l i="140">Å</l:l>
-<l:l i="140">Æ</l:l>
-<l:l i="140">É²</l:l>
-<l:l i="140">Æ</l:l>
-<l:l i="140">È </l:l>
-<l:l i="140">Ç</l:l>
-<l:l i="140">Çž</l:l>
-<l:l i="140">Ç¹</l:l>
-<l:l i="140">Èµ</l:l>
-<l:l i="140">É³</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹
-</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="150">O</l:l>
-<l:l i="150">o</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">Ã²</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">Ã³</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">ÃŽ</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">Ãµ</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">Ã¶</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">Ãž</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Æ</l:l>
-<l:l i="150">Æ </l:l>
-<l:l i="150">Æ¡</l:l>
-<l:l i="150">Ç</l:l>
-<l:l i="150">Ç</l:l>
-<l:l i="150">Çª</l:l>
-<l:l i="150">Ç«</l:l>
-<l:l i="150">Ç¬</l:l>
-<l:l i="150">Ç­</l:l>
-<l:l i="150">ÇŸ</l:l>
-<l:l i="150">Ç¿</l:l>
-<l:l i="150">È</l:l>
-<l:l i="150">È</l:l>
-<l:l i="150">È</l:l>
-<l:l i="150">È</l:l>
-<l:l i="150">Èª</l:l>
-<l:l i="150">È«</l:l>
-<l:l i="150">È¬</l:l>
-<l:l i="150">È­</l:l>
-<l:l i="150">È®</l:l>
-<l:l i="150">È¯</l:l>
-<l:l i="150">È°</l:l>
-<l:l i="150">È±</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á» </l:l>
-<l:l i="150">á»¡</l:l>
-<l:l i="150">á»¢</l:l>
-<l:l i="150">á»£</l:l>
-<l:l i="160">P</l:l>
-<l:l i="160">p</l:l>
-<l:l i="160">Æ€</l:l>
-<l:l i="160">Æ¥</l:l>
-<l:l i="160">á¹</l:l>
-<l:l i="160">á¹</l:l>
-<l:l i="160">á¹</l:l>
-<l:l i="160">á¹</l:l>
-<l:l i="170">Q</l:l>
-<l:l i="170">q</l:l>
-<l:l i="170">Ê </l:l>
-<l:l i="180">R</l:l>
-<l:l i="180">r</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">È</l:l>
-<l:l i="180">È</l:l>
-<l:l i="180">È</l:l>
-<l:l i="180">È</l:l>
-<l:l i="180">ÉŒ</l:l>
-<l:l i="180">Éœ</l:l>
-<l:l i="180">ÉŸ</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="190">S</l:l>
-<l:l i="190">s</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å </l:l>
-<l:l i="190">Å¡</l:l>
-<l:l i="190">È</l:l>
-<l:l i="190">È</l:l>
-<l:l i="190">Ê</l:l>
-<l:l i="190">á¹ </l:l>
-<l:l i="190">á¹¡</l:l>
-<l:l i="190">á¹¢</l:l>
-<l:l i="190">á¹£</l:l>
-<l:l i="190">á¹€</l:l>
-<l:l i="190">á¹¥</l:l>
-<l:l i="190">á¹Š</l:l>
-<l:l i="190">á¹§</l:l>
-<l:l i="190">á¹š</l:l>
-<l:l i="190">á¹©</l:l>
-<l:l i="200">T</l:l>
-<l:l i="200">t</l:l>
-<l:l i="200">Å¢</l:l>
-<l:l i="200">Å£</l:l>
-<l:l i="200">Å€</l:l>
-<l:l i="200">Å¥</l:l>
-<l:l i="200">ÅŠ</l:l>
-<l:l i="200">Å§</l:l>
-<l:l i="200">Æ«</l:l>
-<l:l i="200">Æ¬</l:l>
-<l:l i="200">Æ­</l:l>
-<l:l i="200">Æ®</l:l>
-<l:l i="200">Ê</l:l>
-<l:l i="200">È</l:l>
-<l:l i="200">È</l:l>
-<l:l i="200">È¶</l:l>
-<l:l i="200">á¹ª</l:l>
-<l:l i="200">á¹«</l:l>
-<l:l i="200">á¹¬</l:l>
-<l:l i="200">á¹­</l:l>
-<l:l i="200">á¹®</l:l>
-<l:l i="200">á¹¯</l:l>
-<l:l i="200">á¹°</l:l>
-<l:l i="200">á¹±</l:l>
-<l:l i="200">áº</l:l>
-<l:l i="210">U</l:l>
-<l:l i="210">u</l:l>
-<l:l i="210">Ã</l:l>
-<l:l i="210">Ã¹</l:l>
-<l:l i="210">Ã</l:l>
-<l:l i="210">Ãº</l:l>
-<l:l i="210">Ã</l:l>
-<l:l i="210">Ã»</l:l>
-<l:l i="210">Ã</l:l>
-<l:l i="210">ÃŒ</l:l>
-<l:l i="210">Åš</l:l>
-<l:l i="210">Å©</l:l>
-<l:l i="210">Åª</l:l>
-<l:l i="210">Å«</l:l>
-<l:l i="210">Å¬</l:l>
-<l:l i="210">Å­</l:l>
-<l:l i="210">Å®</l:l>
-<l:l i="210">Å¯</l:l>
-<l:l i="210">Å°</l:l>
-<l:l i="210">Å±</l:l>
-<l:l i="210">Å²</l:l>
-<l:l i="210">Å³</l:l>
-<l:l i="210">Æ¯</l:l>
-<l:l i="210">Æ°</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">È</l:l>
-<l:l i="210">È</l:l>
-<l:l i="210">È</l:l>
-<l:l i="210">È</l:l>
-<l:l i="210">á¹²</l:l>
-<l:l i="210">á¹³</l:l>
-<l:l i="210">á¹Ž</l:l>
-<l:l i="210">á¹µ</l:l>
-<l:l i="210">á¹¶</l:l>
-<l:l i="210">á¹·</l:l>
-<l:l i="210">á¹ž</l:l>
-<l:l i="210">á¹¹</l:l>
-<l:l i="210">á¹º</l:l>
-<l:l i="210">á¹»</l:l>
-<l:l i="210">á»€</l:l>
-<l:l i="210">á»¥</l:l>
-<l:l i="210">á»Š</l:l>
-<l:l i="210">á»§</l:l>
-<l:l i="210">á»š</l:l>
-<l:l i="210">á»©</l:l>
-<l:l i="210">á»ª</l:l>
-<l:l i="210">á»«</l:l>
-<l:l i="210">á»¬</l:l>
-<l:l i="210">á»­</l:l>
-<l:l i="210">á»®</l:l>
-<l:l i="210">á»¯</l:l>
-<l:l i="210">á»°</l:l>
-<l:l i="210">á»±</l:l>
-<l:l i="220">V</l:l>
-<l:l i="220">v</l:l>
-<l:l i="220">Æ²</l:l>
-<l:l i="220">Ê</l:l>
-<l:l i="220">á¹Œ</l:l>
-<l:l i="220">á¹œ</l:l>
-<l:l i="220">á¹Ÿ</l:l>
-<l:l i="220">á¹¿</l:l>
-<l:l i="230">W</l:l>
-<l:l i="230">w</l:l>
-<l:l i="230">ÅŽ</l:l>
-<l:l i="230">Åµ</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº
-</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="240">X</l:l>
-<l:l i="240">x</l:l>
-<l:l i="240">áº</l:l>
-<l:l i="240">áº</l:l>
-<l:l i="240">áº</l:l>
-<l:l i="240">áº</l:l>
-<l:l i="250">Y</l:l>
-<l:l i="250">y</l:l>
-<l:l i="250">Ã</l:l>
-<l:l i="250">Ãœ</l:l>
-<l:l i="250">Ã¿</l:l>
-<l:l i="250">Åž</l:l>
-<l:l i="250">Å¶</l:l>
-<l:l i="250">Å·</l:l>
-<l:l i="250">Æ³</l:l>
-<l:l i="250">ÆŽ</l:l>
-<l:l i="250">È²</l:l>
-<l:l i="250">È³</l:l>
-<l:l i="250">áº</l:l>
-<l:l i="250">áº</l:l>
-<l:l i="250">áº</l:l>
-<l:l i="250">á»²</l:l>
-<l:l i="250">á»³</l:l>
-<l:l i="250">á»Ž</l:l>
-<l:l i="250">á»µ</l:l>
-<l:l i="250">á»¶</l:l>
-<l:l i="250">á»·</l:l>
-<l:l i="250">á»ž</l:l>
-<l:l i="250">á»¹</l:l>
-<l:l i="260">Z</l:l>
-<l:l i="260">z</l:l>
-<l:l i="260">Å¹</l:l>
-<l:l i="260">Åº</l:l>
-<l:l i="260">Å»</l:l>
-<l:l i="260">ÅŒ</l:l>
-<l:l i="260">Åœ</l:l>
-<l:l i="260">ÅŸ</l:l>
-<l:l i="260">Æµ</l:l>
-<l:l i="260">Æ¶</l:l>
-<l:l i="260">È€</l:l>
-<l:l i="260">È¥</l:l>
-<l:l i="260">Ê</l:l>
-<l:l i="260">Ê</l:l>
-<l:l i="260">áº</l:l>
-<l:l i="260">áº</l:l>
-<l:l i="260">áº</l:l>
-<l:l i="260">áº</l:l>
-<l:l i="260">áº</l:l>
-<l:l i="260">áº</l:l>
-</l:letters>
-</l:l10n>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/entities.ent
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/entities.ent	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,47 +1,0 @@
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-     
-     This file contains common entity declarations used for
-     sorting by various templates.
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!ENTITY lowercase "'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;'">
-<!ENTITY uppercase "'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ'">
-
-<!ENTITY primary   'normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))'>
-<!ENTITY secondary 'normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = ""]))'>
-<!ENTITY tertiary  'normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = ""]))'>
-
-
-<!ENTITY section   '(ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()]'>
-
-<!ENTITY section.id 'generate-id(&section;)'>
-<!ENTITY sep '" "'>
-
-<!ENTITY scope 'count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))'>
-
-<!ENTITY setup-language-variable '
-<xsl:variable name="language" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:call-template name="l10n.language"/>
-</xsl:variable>
-
-<xsl:variable name="lowercase" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key">normalize.sort.input</xsl:with-param>
-  </xsl:call-template>
-</xsl:variable>
-
-<xsl:variable name="uppercase" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key">normalize.sort.output</xsl:with-param>
-  </xsl:call-template>
-</xsl:variable>
-'>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/es.xml
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/es.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,679 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="es" english-language-name="Spanish">
-
-<!-- * This file is generated automatically. -->
-<!-- * To submit changes to this file upstream (to the DocBook Project) -->
-<!-- * do not submit an edited version of this file. Instead, submit an -->
-<!-- * edited version of the source file at the following location: -->
-<!-- * -->
-<!-- *  https://svn.sourceforge.net/svnroot/docbook/trunk/gentext/locale/es.xml -->
-<!-- * -->
-<!-- * E-mail the edited es.xml source file to: -->
-<!-- * -->
-<!-- *  docbook-developers@lists.sourceforge.net -->
-
-<!-- ******************************************************************** -->
-
-<!-- This file is part of the XSL DocBook Stylesheet distribution. -->
-<!-- See ../README or http://docbook.sf.net/release/xsl/current/ for -->
-<!-- copyright and other information. -->
-
-<!-- ******************************************************************** -->
-<!-- In these files, % with a letter is used for a placeholder: -->
-<!--   %t is the current element's title -->
-<!--   %s is the current element's subtitle (if applicable)-->
-<!--   %n is the current element's number label-->
-<!--   %p is the current element's page number (if applicable)-->
-<!-- ******************************************************************** -->
-
-
-<l:gentext key="Abstract" text="Resumen"/>
-<l:gentext key="abstract" text="resumen"/>
-<l:gentext key="Answer" text="R:"/>
-<l:gentext key="answer" text="r:"/>
-<l:gentext key="Appendix" text="ApÃ©ndice"/>
-<l:gentext key="appendix" text="apÃ©ndice"/>
-<l:gentext key="Article" text="ArtÃ­culo"/>
-<l:gentext key="article" text="artÃ­culo"/>
-<l:gentext key="Author" text="Autor"/>
-<l:gentext key="Bibliography" text="BibliografÃ­a"/>
-<l:gentext key="bibliography" text="bibliografÃ­a"/>
-<l:gentext key="Book" text="Libro"/>
-<l:gentext key="book" text="libro"/>
-<l:gentext key="CAUTION" text="ATENCIÃN"/>
-<l:gentext key="Caution" text="AtenciÃ³n"/>
-<l:gentext key="caution" text="atenciÃ³n"/>
-<l:gentext key="Chapter" text="CapÃ­tulo"/>
-<l:gentext key="chapter" text="capÃ­tulo"/>
-<l:gentext key="Colophon" text="ColofÃ³n"/>
-<l:gentext key="colophon" text="colofÃ³n"/>
-<l:gentext key="Copyright" text="Copyright"/>
-<l:gentext key="copyright" text="copyright"/>
-<l:gentext key="Dedication" text="Dedicatoria"/>
-<l:gentext key="dedication" text="dedicatoria"/>
-<l:gentext key="Edition" text="EdiciÃ³n"/>
-<l:gentext key="edition" text="ediciÃ³n"/>
-<l:gentext key="Editor" text="Editor" lang="en"/>
-<l:gentext key="Equation" text="EcuaciÃ³n"/>
-<l:gentext key="equation" text="ecuaciÃ³n"/>
-<l:gentext key="Example" text="Ejemplo"/>
-<l:gentext key="example" text="ejemplo"/>
-<l:gentext key="Figure" text="Figura"/>
-<l:gentext key="figure" text="figura"/>
-<l:gentext key="Glossary" text="Glosario"/>
-<l:gentext key="glossary" text="glosario"/>
-<l:gentext key="GlossSee" text="Ver"/>
-<l:gentext key="glosssee" text="ver"/>
-<l:gentext key="GlossSeeAlso" text="Ver tambiÃ©n"/>
-<l:gentext key="glossseealso" text="ver tambiÃ©n"/>
-<l:gentext key="IMPORTANT" text="IMPORTANTE"/>
-<l:gentext key="important" text="importante"/>
-<l:gentext key="Important" text="Importante"/>
-<l:gentext key="Index" text="Ãndice"/>
-<l:gentext key="index" text="Ã­ndice"/>
-<l:gentext key="ISBN" text="ISBN"/>
-<l:gentext key="isbn" text="isbn"/>
-<l:gentext key="LegalNotice" text="Aviso Legal"/>
-<l:gentext key="legalnotice" text="aviso legal"/>
-<l:gentext key="MsgAud" text="Audiencia"/>
-<l:gentext key="msgaud" text="audiencia"/>
-<l:gentext key="MsgLevel" text="Nivel"/>
-<l:gentext key="msglevel" text="nivel"/>
-<l:gentext key="MsgOrig" text="Origen"/>
-<l:gentext key="msgorig" text="origen"/>
-<l:gentext key="NOTE" text="NOTA"/>
-<l:gentext key="Note" text="Nota"/>
-<l:gentext key="note" text="nota"/>
-<l:gentext key="Part" text="Parte"/>
-<l:gentext key="part" text="parte"/>
-<l:gentext key="Preface" text="Prefacio"/>
-<l:gentext key="preface" text="prefacio"/>
-<l:gentext key="Procedure" text="Procedimiento"/>
-<l:gentext key="procedure" text="procedimiento"/>
-<l:gentext key="ProductionSet" text="ProducciÃ³n"/>
-<l:gentext key="PubDate" text="Fecha de publicaciÃ³n"/>
-<l:gentext key="pubdate" text="fecha de publicaciÃ³n"/>
-<l:gentext key="Published" text="Publicado"/>
-<l:gentext key="published" text="publicado"/>
-<l:gentext key="Publisher" text="Publisher" lang="en"/>
-<l:gentext key="Qandadiv" text="P y R"/>
-<l:gentext key="qandadiv" text="P y R"/>
-<l:gentext key="QandASet" text="Frequently Asked Questions" lang="en"/>
-<l:gentext key="Question" text="P:"/>
-<l:gentext key="question" text="p:"/>
-<l:gentext key="RefEntry" text="Entrada de referencia"/>
-<l:gentext key="refentry" text="entrada de referencia"/>
-<l:gentext key="Reference" text="Referencia"/>
-<l:gentext key="reference" text="referencia"/>
-<l:gentext key="References" text="References" lang="en"/>
-<l:gentext key="RefName" text="Nombre de referencia"/>
-<l:gentext key="refname" text="nombre de referencia"/>
-<l:gentext key="RefSection" text="SecciÃ³n de referencia"/>
-<l:gentext key="refsection" text="secciÃ³n de referencia"/>
-<l:gentext key="RefSynopsisDiv" text="Sinopsis"/>
-<l:gentext key="refsynopsisdiv" text="sinopsis"/>
-<l:gentext key="RevHistory" text="Historial de revisiones"/>
-<l:gentext key="revhistory" text="Historial de revisiones"/>
-<l:gentext key="revision" text="revisiÃ³n"/>
-<l:gentext key="Revision" text="RevisiÃ³n"/>
-<l:gentext key="sect1" text="SecciÃ³n"/>
-<l:gentext key="sect2" text="SecciÃ³n"/>
-<l:gentext key="sect3" text="SecciÃ³n"/>
-<l:gentext key="sect4" text="SecciÃ³n"/>
-<l:gentext key="sect5" text="SecciÃ³n"/>
-<l:gentext key="section" text="secciÃ³n"/>
-<l:gentext key="Section" text="SecciÃ³n"/>
-<l:gentext key="see" text="ver"/>
-<l:gentext key="See" text="Ver"/>
-<l:gentext key="seealso" text="ver tambiÃ©n"/>
-<l:gentext key="Seealso" text="Ver tambiÃ©n"/>
-<l:gentext key="SeeAlso" text="Ver TambiÃ©n"/>
-<l:gentext key="set" text="conjunto"/>
-<l:gentext key="Set" text="Conjunto"/>
-<l:gentext key="setindex" text="Ã­ndice del conjunto"/>
-<l:gentext key="SetIndex" text="Ãndice del Conjunto"/>
-<l:gentext key="Sidebar" text="Barra lateral"/>
-<l:gentext key="sidebar" text="barra lateral"/>
-<l:gentext key="step" text="paso"/>
-<l:gentext key="Step" text="Paso"/>
-<l:gentext key="table" text="tabla"/>
-<l:gentext key="Table" text="Tabla"/>
-<l:gentext key="task" text="Task" lang="en"/>
-<l:gentext key="Task" text="Task" lang="en"/>
-<l:gentext key="tip" text="sugerencia"/>
-<l:gentext key="TIP" text="SUGERENCIA"/>
-<l:gentext key="Tip" text="Sugerencia"/>
-<l:gentext key="Warning" text="Aviso"/>
-<l:gentext key="warning" text="aviso"/>
-<l:gentext key="WARNING" text="AVISO"/>
-<l:gentext key="and" text="y"/>
-<l:gentext key="by" text="por"/>
-<l:gentext key="Edited" text="Editado"/>
-<l:gentext key="edited" text="editado"/>
-<l:gentext key="Editedby" text="Editado por"/>
-<l:gentext key="editedby" text="editado por"/>
-<l:gentext key="in" text="en"/>
-<l:gentext key="lastlistcomma" text=","/>
-<l:gentext key="listcomma" text=","/>
-<l:gentext key="nonexistantelement" text="elemento inexistente"/>
-<l:gentext key="notes" text="notas"/>
-<l:gentext key="Notes" text="Notas"/>
-<l:gentext key="Pgs" text="PÃ¡gs."/>
-<l:gentext key="pgs" text="pÃ¡gs."/>
-<l:gentext key="Revisedby" text="Revisado por: "/>
-<l:gentext key="revisedby" text="revisado por: "/>
-<l:gentext key="TableNotes" text="Notas de tabla"/>
-<l:gentext key="tablenotes" text="notas de tabla"/>
-<l:gentext key="TableofContents" text="Tabla de contenidos"/>
-<l:gentext key="tableofcontents" text="tabla de contenidos"/>
-<l:gentext key="unexpectedelementname" text="nombre de elemento inesperado"/>
-<l:gentext key="unsupported" text="no soportado"/>
-<l:gentext key="xrefto" text="referencia a"/>
-<l:gentext key="Authors" text="Authors" lang="en"/>
-<l:gentext key="copyeditor" text="Copy Editor" lang="en"/>
-<l:gentext key="graphicdesigner" text="Graphic Designer" lang="en"/>
-<l:gentext key="productioneditor" text="Production Editor" lang="en"/>
-<l:gentext key="technicaleditor" text="Technical Editor" lang="en"/>
-<l:gentext key="translator" text="Translator" lang="en"/>
-<l:gentext key="listofequations" text="lista de ecuaciones"/>
-<l:gentext key="ListofEquations" text="Lista de ecuaciones"/>
-<l:gentext key="ListofExamples" text="Lista de ejemplos"/>
-<l:gentext key="listofexamples" text="lista de ejemplos"/>
-<l:gentext key="ListofFigures" text="Lista de figuras"/>
-<l:gentext key="listoffigures" text="lista de figuras"/>
-<l:gentext key="ListofProcedures" text="List of Procedures" lang="en"/>
-<l:gentext key="listofprocedures" text="List of Procedures" lang="en"/>
-<l:gentext key="listoftables" text="lista de tablas"/>
-<l:gentext key="ListofTables" text="Lista de tablas"/>
-<l:gentext key="ListofUnknown" text="Lista de desconocido"/>
-<l:gentext key="listofunknown" text="lista de desconocido"/>
-<l:gentext key="nav-home" text="Inicio"/>
-<l:gentext key="nav-next" text="Siguiente"/>
-<l:gentext key="nav-next-sibling" text="Avanzar"/>
-<l:gentext key="nav-prev" text="Anterior"/>
-<l:gentext key="nav-prev-sibling" text="Retroceder"/>
-<l:gentext key="nav-up" text="Subir"/>
-<l:gentext key="nav-toc" text="ToC" lang="en"/>
-<l:gentext key="Draft" text="Borrador"/>
-<l:gentext key="above" text="arriba"/>
-<l:gentext key="below" text="abajo"/>
-<l:gentext key="sectioncalled" text="secciÃ³n llamada"/>
-<l:gentext key="index symbols" text="SÃ­mbolos"/>
-<l:gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyzÃ¡Ã©Ã­Ã³ÃºÃ±"/>
-<l:gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZÃÃÃÃÃÃ"/>
-<l:gentext key="normalize.sort.input" text="AaÃÃ ÃÃ¡ÃÃ¢ÃÃ£ÃÃ€Ã
-Ã¥ÄÄÄÄÄÄ
-ÇÇÇÇÇ Ç¡ÇºÇ»ÈÈÈÈÈŠÈ§ážážáºáº áº¡áº¢áº£áº€áº¥áºŠáº§áºšáº©áºªáº«áº¬áº­áº®áº¯áº°áº±áº²áº³áºŽáºµáº¶áº·BbÆÆÉÆÆážážážáž
-ážážCcÃÃ§ÄÄÄÄÄÄÄÄÆÆÉážážDdÄÄÄÄÆÉÆÆÇ
-Ç²È¡ÉážážážážážážážážážážEeÃÃšÃÃ©ÃÃªÃÃ«ÄÄÄÄÄÄÄÄÄÄÈÈ
-ÈÈÈšÈ©ážážážážážážážážážážáºžáº¹áººáº»áºŒáºœáºŸáº¿á»á»á»á»á»á»
-á»á»FfÆÆážážGgÄÄÄÄÄ Ä¡Ä¢Ä£ÆÉ Ç€Ç¥ÇŠÇ§ÇŽÇµáž áž¡HhÄ€Ä¥ÄŠÄ§ÈÈÉŠáž¢áž£áž€áž¥ážŠáž§ážšáž©ážªáž«áºIiÃÃ¬ÃÃ­ÃÃ®ÃÃ¯ÄšÄ©ÄªÄ«Ä¬Ä­Ä®Ä¯Ä°ÆÉšÇÇÈÈÈÈáž¬áž­áž®áž¯á»á»á»á»JjÄŽÄµÇ°ÊKkÄ¶Ä·ÆÆÇšÇ©áž°áž±áž²áž³ážŽážµLlÄ¹ÄºÄ»ÄŒÄœÄŸÄ¿ÅÅÅÆÇÈŽÉ«É¬É­áž¶áž·ážžáž¹ážºáž»ážŒážœMmÉ±ážŸáž¿á¹á¹á¹á¹NnÃÃ±ÅÅÅ
-ÅÅÅÆÉ²ÆÈ ÇÇžÇ¹ÈµÉ³á¹á¹
-á¹á¹á¹á¹á¹á¹OoÃÃ²ÃÃ³ÃÃŽÃÃµÃÃ¶ÃÃžÅÅÅÅÅÅÆÆ Æ¡ÇÇÇªÇ«Ç¬Ç­ÇŸÇ¿ÈÈÈÈÈªÈ«È¬È­È®È¯È°È±á¹á¹á¹á¹á¹á¹á¹á¹á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á» á»¡á»¢á»£PpÆ€Æ¥á¹á¹á¹á¹QqÊ RrÅÅÅÅÅÅÈÈÈÈÉŒÉœÉŸá¹á¹á¹á¹á¹á¹á¹á¹SsÅÅÅÅÅÅÅ Å¡ÈÈÊá¹ á¹¡á¹¢á¹£á¹€á¹¥á¹Šá¹§á¹šá¹©TtÅ¢Å£Å€Å¥ÅŠÅ§Æ«Æ¬Æ­Æ®ÊÈÈÈ¶á¹ªá¹«á¹¬á¹­á¹®á¹¯á¹°á¹±áºUuÃÃ¹ÃÃºÃÃ»ÃÃŒÅšÅ©ÅªÅ«Å¬Å­Å®Å¯Å°Å±Å²Å³Æ¯Æ°ÇÇÇÇÇÇÇÇÇÇÈÈÈÈá¹²á¹³á¹Žá¹µá¹¶á¹·á¹žá¹¹á¹ºá¹»á»€á»¥á»Šá»§á»šá»©á»ªá»«á»¬á»­á»®á»¯á»°á»±VvÆ²Êá¹Œá¹œá¹Ÿá¹¿WwÅŽÅµáºáºáºáºáºáº
-áºáºáºáºáºXxáºáºáºáºYyÃÃœÃ¿ÅžÅ¶Å·Æ³ÆŽÈ²È³áºáºáºá»²á»³á»Žá»µá»¶á»·á»žá»¹ZzÅ¹ÅºÅ»ÅŒÅœÅŸÆµÆ¶È€È¥ÊÊáºáºáºáºáºáºáº" lang="en"/>
-<l:gentext key="normalize.sort.output" text="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ" lang="en"/>
-<l:dingbat key="startquote" text="â"/>
-<l:dingbat key="endquote" text="â"/>
-<l:dingbat key="nestedstartquote" text="â"/>
-<l:dingbat key="nestedendquote" text="â"/>
-<l:dingbat key="singlestartquote" text="â" lang="en"/>
-<l:dingbat key="singleendquote" text="â" lang="en"/>
-<l:dingbat key="bullet" text="â¢"/>
-<l:gentext key="hyphenation-character" text="-" lang="en"/>
-<l:gentext key="hyphenation-push-character-count" text="2" lang="en"/>
-<l:gentext key="hyphenation-remain-character-count" text="2" lang="en"/>
-<l:context name="styles"><l:template name="person-name" text="first-last"/>
-</l:context>
-<l:context name="title"><l:template name="abstract" text="%t"/>
-<l:template name="answer" text="%t"/>
-<l:template name="appendix" text="ApÃ©ndice %n. %t"/>
-<l:template name="article" text="%t"/>
-<l:template name="authorblurb" text="%t"/>
-<l:template name="bibliodiv" text="%t"/>
-<l:template name="biblioentry" text="%t"/>
-<l:template name="bibliography" text="%t"/>
-<l:template name="bibliolist" text="%t" lang="en"/>
-<l:template name="bibliomixed" text="%t"/>
-<l:template name="bibliomset" text="%t"/>
-<l:template name="biblioset" text="%t"/>
-<l:template name="blockquote" text="%t"/>
-<l:template name="book" text="%t"/>
-<l:template name="calloutlist" text="%t"/>
-<l:template name="caution" text="%t"/>
-<l:template name="chapter" text="CapÃ­tulo %n. %t"/>
-<l:template name="colophon" text="%t"/>
-<l:template name="dedication" text="%t"/>
-<l:template name="equation" text="EcuaciÃ³n %n. %t"/>
-<l:template name="example" text="Ejemplo %n. %t"/>
-<l:template name="figure" text="Figura %n. %t"/>
-<l:template name="foil" text="%t" lang="en"/>
-<l:template name="foilgroup" text="%t" lang="en"/>
-<l:template name="formalpara" text="%t"/>
-<l:template name="glossary" text="%t"/>
-<l:template name="glossdiv" text="%t"/>
-<l:template name="glosslist" text="%t" lang="en"/>
-<l:template name="glossentry" text="%t" lang="en"/>
-<l:template name="important" text="%t"/>
-<l:template name="index" text="%t"/>
-<l:template name="indexdiv" text="%t"/>
-<l:template name="itemizedlist" text="%t"/>
-<l:template name="legalnotice" text="%t"/>
-<l:template name="listitem" text=""/>
-<l:template name="lot" text="%t"/>
-<l:template name="msg" text="%t"/>
-<l:template name="msgexplan" text="%t"/>
-<l:template name="msgmain" text="%t"/>
-<l:template name="msgrel" text="%t"/>
-<l:template name="msgset" text="%t"/>
-<l:template name="msgsub" text="%t"/>
-<l:template name="note" text="%t"/>
-<l:template name="orderedlist" text="%t"/>
-<l:template name="part" text="Parte %n. %t"/>
-<l:template name="partintro" text="%t"/>
-<l:template name="preface" text="%t"/>
-<l:template name="procedure" text="%t"/>
-<l:template name="procedure.formal" text="Procedimiento %n. %t"/>
-<l:template name="productionset" text="%t"/>
-<l:template name="productionset.formal" text="ProducciÃ³n %n"/>
-<l:template name="qandadiv" text="%t"/>
-<l:template name="qandaentry" text="%t"/>
-<l:template name="qandaset" text="%t"/>
-<l:template name="question" text="%t"/>
-<l:template name="refentry" text="%t"/>
-<l:template name="reference" text="%t"/>
-<l:template name="refsection" text="%t"/>
-<l:template name="refsect1" text="%t"/>
-<l:template name="refsect2" text="%t"/>
-<l:template name="refsect3" text="%t"/>
-<l:template name="refsynopsisdiv" text="%t"/>
-<l:template name="refsynopsisdivinfo" text="%t"/>
-<l:template name="segmentedlist" text="%t"/>
-<l:template name="set" text="%t"/>
-<l:template name="setindex" text="%t"/>
-<l:template name="sidebar" text="%t"/>
-<l:template name="step" text="%t"/>
-<l:template name="table" text="Tabla %n. %t"/>
-<l:template name="task" text="%t" lang="en"/>
-<l:template name="tasksummary" text="%t" lang="en"/>
-<l:template name="taskprerequisites" text="%t" lang="en"/>
-<l:template name="taskrelated" text="%t" lang="en"/>
-<l:template name="tip" text="%t"/>
-<l:template name="toc" text="%t"/>
-<l:template name="variablelist" text="%t"/>
-<l:template name="varlistentry" text="" lang="en"/>
-<l:template name="warning" text="%t"/>
-</l:context>
-<l:context name="title-unnumbered"><l:template name="appendix" text="%t"/>
-<l:template name="article/appendix" text="%t" lang="en"/>
-<l:template name="bridgehead" text="%t"/>
-<l:template name="chapter" text="%t"/>
-<l:template name="sect1" text="%t"/>
-<l:template name="sect2" text="%t"/>
-<l:template name="sect3" text="%t"/>
-<l:template name="sect4" text="%t"/>
-<l:template name="sect5" text="%t"/>
-<l:template name="section" text="%t"/>
-<l:template name="simplesect" text="%t"/>
-<l:template name="part" text="%t" lang="en"/>
-</l:context>
-<l:context name="title-numbered"><l:template name="appendix" text="ApÃ©ndice %n. %t"/>
-<l:template name="article/appendix" text="%n.Â %t" lang="en"/>
-<l:template name="bridgehead" text="%n. %t"/>
-<l:template name="chapter" text="CapÃ­tulo %n. %t"/>
-<l:template name="part" text="ParteÂ %n.Â %t"/>
-<l:template name="sect1" text="%n. %t"/>
-<l:template name="sect2" text="%n. %t"/>
-<l:template name="sect3" text="%n. %t"/>
-<l:template name="sect4" text="%n. %t"/>
-<l:template name="sect5" text="%n. %t"/>
-<l:template name="section" text="%n. %t"/>
-<l:template name="simplesect" text="%t"/>
-</l:context>
-<l:context name="subtitle"><l:template name="appendix" text="%s"/>
-<l:template name="article" text="%s"/>
-<l:template name="bibliodiv" text="%s"/>
-<l:template name="biblioentry" text="%s"/>
-<l:template name="bibliography" text="%s"/>
-<l:template name="bibliomixed" text="%s"/>
-<l:template name="bibliomset" text="%s"/>
-<l:template name="biblioset" text="%s"/>
-<l:template name="book" text="%s"/>
-<l:template name="chapter" text="%s"/>
-<l:template name="colophon" text="%s"/>
-<l:template name="dedication" text="%s"/>
-<l:template name="glossary" text="%s"/>
-<l:template name="glossdiv" text="%s"/>
-<l:template name="index" text="%s"/>
-<l:template name="indexdiv" text="%s"/>
-<l:template name="lot" text="%s"/>
-<l:template name="part" text="%s"/>
-<l:template name="partintro" text="%s"/>
-<l:template name="preface" text="%s"/>
-<l:template name="refentry" text="%s"/>
-<l:template name="reference" text="%s"/>
-<l:template name="refsection" text="%s"/>
-<l:template name="refsect1" text="%s"/>
-<l:template name="refsect2" text="%s"/>
-<l:template name="refsect3" text="%s"/>
-<l:template name="refsynopsisdiv" text="%s"/>
-<l:template name="sect1" text="%s"/>
-<l:template name="sect2" text="%s"/>
-<l:template name="sect3" text="%s"/>
-<l:template name="sect4" text="%s"/>
-<l:template name="sect5" text="%s"/>
-<l:template name="section" text="%s"/>
-<l:template name="set" text="%s"/>
-<l:template name="setindex" text="%s"/>
-<l:template name="sidebar" text="%s"/>
-<l:template name="simplesect" text="%s"/>
-<l:template name="toc" text="%s"/>
-</l:context>
-<l:context name="xref"><l:template name="abstract" text="%t"/>
-<l:template name="answer" text="R:Â %n"/>
-<l:template name="appendix" text="%t"/>
-<l:template name="article" text="%t"/>
-<l:template name="authorblurb" text="%t"/>
-<l:template name="bibliodiv" text="%t"/>
-<l:template name="bibliography" text="%t"/>
-<l:template name="bibliomset" text="%t"/>
-<l:template name="biblioset" text="%t"/>
-<l:template name="blockquote" text="%t"/>
-<l:template name="book" text="%t"/>
-<l:template name="calloutlist" text="%t"/>
-<l:template name="caution" text="%t"/>
-<l:template name="chapter" text="%t"/>
-<l:template name="colophon" text="%t"/>
-<l:template name="constraintdef" text="%t"/>
-<l:template name="dedication" text="%t"/>
-<l:template name="equation" text="%t"/>
-<l:template name="example" text="%t"/>
-<l:template name="figure" text="%t"/>
-<l:template name="foil" text="%t" lang="en"/>
-<l:template name="foilgroup" text="%t" lang="en"/>
-<l:template name="formalpara" text="%t"/>
-<l:template name="glossary" text="%t"/>
-<l:template name="glossdiv" text="%t"/>
-<l:template name="important" text="%t"/>
-<l:template name="index" text="%t"/>
-<l:template name="indexdiv" text="%t"/>
-<l:template name="itemizedlist" text="%t"/>
-<l:template name="legalnotice" text="%t"/>
-<l:template name="listitem" text="%n"/>
-<l:template name="lot" text="%t"/>
-<l:template name="msg" text="%t"/>
-<l:template name="msgexplan" text="%t"/>
-<l:template name="msgmain" text="%t"/>
-<l:template name="msgrel" text="%t"/>
-<l:template name="msgset" text="%t"/>
-<l:template name="msgsub" text="%t"/>
-<l:template name="note" text="%t"/>
-<l:template name="orderedlist" text="%t"/>
-<l:template name="part" text="%t"/>
-<l:template name="partintro" text="%t"/>
-<l:template name="preface" text="%t"/>
-<l:template name="procedure" text="%t"/>
-<l:template name="productionset" text="%t"/>
-<l:template name="qandadiv" text="%t"/>
-<l:template name="qandaentry" text="P:Â %n"/>
-<l:template name="qandaset" text="%t"/>
-<l:template name="question" text="P:Â %n"/>
-<l:template name="reference" text="%t"/>
-<l:template name="refsynopsisdiv" text="%t"/>
-<l:template name="segmentedlist" text="%t"/>
-<l:template name="set" text="%t"/>
-<l:template name="setindex" text="%t"/>
-<l:template name="sidebar" text="%t"/>
-<l:template name="table" text="%t"/>
-<l:template name="task" text="%t" lang="en"/>
-<l:template name="tip" text="%t"/>
-<l:template name="toc" text="%t"/>
-<l:template name="variablelist" text="%t"/>
-<l:template name="varlistentry" text="%n"/>
-<l:template name="warning" text="%t"/>
-<l:template name="olink.document.citation" text=" in %o" lang="en"/>
-<l:template name="olink.page.citation" text=" (page %p)" lang="en"/>
-<l:template name="page.citation" text=" [%p]"/>
-<l:template name="page" text="(page %p)" lang="en"/>
-<l:template name="docname" text=" in %o" lang="en"/>
-<l:template name="docnamelong" text=" in the document titled %o" lang="en"/>
-<l:template name="pageabbrev" text="(p. %p)" lang="en"/>
-<l:template name="Page" text="Page %p" lang="en"/>
-<l:template name="bridgehead" text="â%tâ"/>
-<l:template name="refsection" text="â%tâ"/>
-<l:template name="refsect1" text="â%tâ"/>
-<l:template name="refsect2" text="â%tâ"/>
-<l:template name="refsect3" text="â%tâ"/>
-<l:template name="sect1" text="â%tâ"/>
-<l:template name="sect2" text="â%tâ"/>
-<l:template name="sect3" text="â%tâ"/>
-<l:template name="sect4" text="â%tâ"/>
-<l:template name="sect5" text="â%tâ"/>
-<l:template name="section" text="â%tâ"/>
-<l:template name="simplesect" text="â%tâ"/>
-</l:context>
-<l:context name="xref-number"><l:template name="answer" text="R:Â %n"/>
-<l:template name="appendix" text="ApÃ©ndiceÂ %n"/>
-<l:template name="bridgehead" text="SecciÃ³nÂ %n"/>
-<l:template name="chapter" text="CapÃ­tuloÂ %n"/>
-<l:template name="equation" text="EcuaciÃ³nÂ %n"/>
-<l:template name="example" text="EjemploÂ %n"/>
-<l:template name="figure" text="FiguraÂ %n"/>
-<l:template name="part" text="ParteÂ %n"/>
-<l:template name="procedure" text="ProcedimientoÂ %n"/>
-<l:template name="productionset" text="ProducciÃ³nÂ %n"/>
-<l:template name="qandadiv" text="P y RÂ %n"/>
-<l:template name="qandaentry" text="P:Â %n"/>
-<l:template name="question" text="P:Â %n"/>
-<l:template name="sect1" text="SecciÃ³nÂ %n"/>
-<l:template name="sect2" text="SecciÃ³nÂ %n"/>
-<l:template name="sect3" text="SecciÃ³nÂ %n"/>
-<l:template name="sect4" text="SecciÃ³nÂ %n"/>
-<l:template name="sect5" text="SecciÃ³nÂ %n"/>
-<l:template name="section" text="SecciÃ³nÂ %n"/>
-<l:template name="table" text="TablaÂ %n"/>
-</l:context>
-<l:context name="xref-number-and-title"><l:template name="appendix" text="ApÃ©ndiceÂ %n, %t"/>
-<l:template name="bridgehead" text="SecciÃ³nÂ %n, â%tâ"/>
-<l:template name="chapter" text="CapÃ­tuloÂ %n, %t"/>
-<l:template name="equation" text="EcuaciÃ³nÂ %n, â%tâ"/>
-<l:template name="example" text="EjemploÂ %n, â%tâ"/>
-<l:template name="figure" text="FiguraÂ %n, â%tâ"/>
-<l:template name="part" text="ParteÂ %n, â%tâ"/>
-<l:template name="procedure" text="ProcedimientoÂ %n, â%tâ"/>
-<l:template name="productionset" text="ProducciÃ³nÂ %n, â%tâ"/>
-<l:template name="qandadiv" text="P y RÂ %n, â%tâ"/>
-<l:template name="refsect1" text="secciÃ³n llamada â%tâ"/>
-<l:template name="refsect2" text="secciÃ³n llamada â%tâ"/>
-<l:template name="refsect3" text="secciÃ³n llamada â%tâ"/>
-<l:template name="refsection" text="secciÃ³n llamada â%tâ"/>
-<l:template name="sect1" text="SecciÃ³nÂ %n, â%tâ"/>
-<l:template name="sect2" text="SecciÃ³nÂ %n, â%tâ"/>
-<l:template name="sect3" text="SecciÃ³nÂ %n, â%tâ"/>
-<l:template name="sect4" text="SecciÃ³nÂ %n, â%tâ"/>
-<l:template name="sect5" text="SecciÃ³nÂ %n, â%tâ"/>
-<l:template name="section" text="SecciÃ³nÂ %n, â%tâ"/>
-<l:template name="simplesect" text="secciÃ³n llamada â%tâ"/>
-<l:template name="table" text="TablaÂ %n, â%tâ"/>
-</l:context>
-<l:context name="authorgroup"><l:template name="sep" text=", "/>
-<l:template name="sep2" text=" y "/>
-<l:template name="seplast" text=", y "/>
-</l:context>
-<l:context name="glossary"><l:template name="see" text="Ver %t"/>
-<l:template name="seealso" text="Ver tambiÃ©n %t"/>
-</l:context>
-<l:context name="msgset"><l:template name="MsgAud" text="Audiencia: "/>
-<l:template name="MsgLevel" text="Nivel: "/>
-<l:template name="MsgOrig" text="Origen: "/>
-</l:context>
-<l:context name="datetime"><l:template name="format" text="m/d/Y" lang="en"/>
-</l:context>
-<l:context name="termdef"><l:template name="prefix" text="[Definition: " lang="en"/>
-<l:template name="suffix" text="]" lang="en"/>
-</l:context>
-<l:context name="datetime-full"><l:template name="January" text="January" lang="en"/>
-<l:template name="February" text="February" lang="en"/>
-<l:template name="March" text="March" lang="en"/>
-<l:template name="April" text="April" lang="en"/>
-<l:template name="May" text="May" lang="en"/>
-<l:template name="June" text="June" lang="en"/>
-<l:template name="July" text="July" lang="en"/>
-<l:template name="August" text="August" lang="en"/>
-<l:template name="September" text="September" lang="en"/>
-<l:template name="October" text="October" lang="en"/>
-<l:template name="November" text="November" lang="en"/>
-<l:template name="December" text="December" lang="en"/>
-<l:template name="Monday" text="Monday" lang="en"/>
-<l:template name="Tuesday" text="Tuesday" lang="en"/>
-<l:template name="Wednesday" text="Wednesday" lang="en"/>
-<l:template name="Thursday" text="Thursday" lang="en"/>
-<l:template name="Friday" text="Friday" lang="en"/>
-<l:template name="Saturday" text="Saturday" lang="en"/>
-<l:template name="Sunday" text="Sunday" lang="en"/>
-</l:context>
-<l:context name="datetime-abbrev"><l:template name="Jan" text="Jan" lang="en"/>
-<l:template name="Feb" text="Feb" lang="en"/>
-<l:template name="Mar" text="Mar" lang="en"/>
-<l:template name="Apr" text="Apr" lang="en"/>
-<l:template name="May" text="May" lang="en"/>
-<l:template name="Jun" text="Jun" lang="en"/>
-<l:template name="Jul" text="Jul" lang="en"/>
-<l:template name="Aug" text="Aug" lang="en"/>
-<l:template name="Sep" text="Sep" lang="en"/>
-<l:template name="Oct" text="Oct" lang="en"/>
-<l:template name="Nov" text="Nov" lang="en"/>
-<l:template name="Dec" text="Dec" lang="en"/>
-<l:template name="Mon" text="Mon" lang="en"/>
-<l:template name="Tue" text="Tue" lang="en"/>
-<l:template name="Wed" text="Wed" lang="en"/>
-<l:template name="Thu" text="Thu" lang="en"/>
-<l:template name="Fri" text="Fri" lang="en"/>
-<l:template name="Sat" text="Sat" lang="en"/>
-<l:template name="Sun" text="Sun" lang="en"/>
-</l:context>
-<l:context name="htmlhelp"><l:template name="langcode" text="0x040a Spanish (Traditional Sort)"/>
-</l:context>
-<l:context name="index"><l:template name="term-separator" text=", " lang="en"/>
-<l:template name="number-separator" text=", " lang="en"/>
-<l:template name="range-separator" text="-" lang="en"/>
-</l:context>
-<l:context name="iso690"><l:template name="lastfirst.sep" text=", " lang="en"/>
-<l:template name="alt.person.two.sep" text=" â " lang="en"/>
-<l:template name="alt.person.last.sep" text=" â " lang="en"/>
-<l:template name="alt.person.more.sep" text=" â " lang="en"/>
-<l:template name="primary.editor" text=" (ed.)" lang="en"/>
-<l:template name="primary.many" text=", et al." lang="en"/>
-<l:template name="primary.sep" text=". " lang="en"/>
-<l:template name="submaintitle.sep" text=": " lang="en"/>
-<l:template name="title.sep" text=". " lang="en"/>
-<l:template name="othertitle.sep" text=", " lang="en"/>
-<l:template name="medium1" text=" [" lang="en"/>
-<l:template name="medium2" text="]" lang="en"/>
-<l:template name="secondary.person.sep" text="; " lang="en"/>
-<l:template name="secondary.sep" text=". " lang="en"/>
-<l:template name="respons.sep" text=". " lang="en"/>
-<l:template name="edition.sep" text=". " lang="en"/>
-<l:template name="edition.serial.sep" text=", " lang="en"/>
-<l:template name="issuing.range" text="-" lang="en"/>
-<l:template name="issuing.div" text=", " lang="en"/>
-<l:template name="issuing.sep" text=". " lang="en"/>
-<l:template name="partnr.sep" text=". " lang="en"/>
-<l:template name="placepubl.sep" text=": " lang="en"/>
-<l:template name="publyear.sep" text=", " lang="en"/>
-<l:template name="pubinfo.sep" text=". " lang="en"/>
-<l:template name="spec.pubinfo.sep" text=", " lang="en"/>
-<l:template name="upd.sep" text=", " lang="en"/>
-<l:template name="datecit1" text=" [cited " lang="en"/>
-<l:template name="datecit2" text="]" lang="en"/>
-<l:template name="extent.sep" text=". " lang="en"/>
-<l:template name="locs.sep" text=", " lang="en"/>
-<l:template name="location.sep" text=". " lang="en"/>
-<l:template name="serie.sep" text=". " lang="en"/>
-<l:template name="notice.sep" text=". " lang="en"/>
-<l:template name="access" text="Available " lang="en"/>
-<l:template name="acctoo" text="Also available " lang="en"/>
-<l:template name="onwww" text="from World Wide Web" lang="en"/>
-<l:template name="oninet" text="from Internet" lang="en"/>
-<l:template name="access.end" text=": " lang="en"/>
-<l:template name="link1" text="&lt;" lang="en"/>
-<l:template name="link2" text="&gt;" lang="en"/>
-<l:template name="access.sep" text=". " lang="en"/>
-<l:template name="isbn" text="ISBN " lang="en"/>
-<l:template name="issn" text="ISSN " lang="en"/>
-<l:template name="stdnum.sep" text=". " lang="en"/>
-<l:template name="patcountry.sep" text=". " lang="en"/>
-<l:template name="pattype.sep" text=", " lang="en"/>
-<l:template name="patnum.sep" text=". " lang="en"/>
-<l:template name="patdate.sep" text=". " lang="en"/>
-</l:context><l:letters><l:l i="-1"/>
-<l:l i="0">SÃ­mbolos</l:l>
-<l:l i="1">A</l:l>
-<l:l i="1">a</l:l>
-<l:l i="1">Ã¡</l:l>
-<l:l i="1">Ã</l:l>
-<l:l i="2">B</l:l>
-<l:l i="2">b</l:l>
-<l:l i="3">C</l:l>
-<l:l i="3">c</l:l>
-<l:l i="4">CH</l:l>
-<l:l i="4">ch</l:l>
-<l:l i="5">D</l:l>
-<l:l i="5">d</l:l>
-<l:l i="6">E</l:l>
-<l:l i="6">e</l:l>
-<l:l i="6">Ã</l:l>
-<l:l i="6">Ã©</l:l>
-<l:l i="7">F</l:l>
-<l:l i="7">f</l:l>
-<l:l i="8">G</l:l>
-<l:l i="8">g</l:l>
-<l:l i="9">H</l:l>
-<l:l i="9">h</l:l>
-<l:l i="10">I</l:l>
-<l:l i="10">i</l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã­</l:l>
-<l:l i="11">J</l:l>
-<l:l i="11">j</l:l>
-<l:l i="12">K</l:l>
-<l:l i="12">k</l:l>
-<l:l i="13">L</l:l>
-<l:l i="13">l</l:l>
-<l:l i="14">LL</l:l>
-<l:l i="14">ll</l:l>
-<l:l i="15">M</l:l>
-<l:l i="15">m</l:l>
-<l:l i="16">N</l:l>
-<l:l i="16">n</l:l>
-<l:l i="17">Ã</l:l>
-<l:l i="17">Ã±</l:l>
-<l:l i="18">O</l:l>
-<l:l i="18">o</l:l>
-<l:l i="18">Ã</l:l>
-<l:l i="18">Ã³</l:l>
-<l:l i="19">P</l:l>
-<l:l i="19">p</l:l>
-<l:l i="20">Q</l:l>
-<l:l i="20">q</l:l>
-<l:l i="21">R</l:l>
-<l:l i="21">r</l:l>
-<l:l i="22">S</l:l>
-<l:l i="22">s</l:l>
-<l:l i="23">T</l:l>
-<l:l i="23">t</l:l>
-<l:l i="24">U</l:l>
-<l:l i="24">u</l:l>
-<l:l i="24">Ã</l:l>
-<l:l i="24">Ãº</l:l>
-<l:l i="25">V</l:l>
-<l:l i="25">v</l:l>
-<l:l i="26">W</l:l>
-<l:l i="26">w</l:l>
-<l:l i="27">X</l:l>
-<l:l i="27">x</l:l>
-<l:l i="28">Y</l:l>
-<l:l i="28">y</l:l>
-<l:l i="29">Z</l:l>
-<l:l i="29">z</l:l>
-</l:letters>
-</l:l10n>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/fr.xml
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/fr.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,693 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="fr" english-language-name="French">
-
-<!-- * This file is generated automatically. -->
-<!-- * To submit changes to this file upstream (to the DocBook Project) -->
-<!-- * do not submit an edited version of this file. Instead, submit an -->
-<!-- * edited version of the source file at the following location: -->
-<!-- * -->
-<!-- *  https://svn.sourceforge.net/svnroot/docbook/trunk/gentext/locale/fr.xml -->
-<!-- * -->
-<!-- * E-mail the edited fr.xml source file to: -->
-<!-- * -->
-<!-- *  docbook-developers@lists.sourceforge.net -->
-
-<!-- ******************************************************************** -->
-
-<!-- This file is part of the XSL DocBook Stylesheet distribution. -->
-<!-- See ../README or http://docbook.sf.net/release/xsl/current/ for -->
-<!-- copyright and other information. -->
-
-<!-- ******************************************************************** -->
-<!-- In these files, % with a letter is used for a placeholder: -->
-<!--   %t is the current element's title -->
-<!--   %s is the current element's subtitle (if applicable)-->
-<!--   %n is the current element's number label-->
-<!--   %p is the current element's page number (if applicable)-->
-<!-- ******************************************************************** -->
-
-
-<l:gentext key="Abstract" text="RÃ©sumÃ©"/>
-<l:gentext key="abstract" text="RÃ©sumÃ©"/>
-<l:gentext key="Answer" text="RÂ :"/>
-<l:gentext key="answer" text="RÂ :"/>
-<l:gentext key="Appendix" text="Annexe"/>
-<l:gentext key="appendix" text="annexe"/>
-<l:gentext key="Article" text="Article"/>
-<l:gentext key="article" text="Article"/>
-<l:gentext key="Author" text="Auteur"/>
-<l:gentext key="Bibliography" text="Bibliographie"/>
-<l:gentext key="bibliography" text="Bibliographie"/>
-<l:gentext key="Book" text="Livre"/>
-<l:gentext key="book" text="Livre"/>
-<l:gentext key="CAUTION" text="ATTENTION"/>
-<l:gentext key="Caution" text="Attention"/>
-<l:gentext key="caution" text="Attention"/>
-<l:gentext key="Chapter" text="Chapitre"/>
-<l:gentext key="chapter" text="chapitre"/>
-<l:gentext key="Colophon" text="AchevÃ© d'imprimer"/>
-<l:gentext key="colophon" text="AchevÃ© d'imprimer"/>
-<l:gentext key="Copyright" text="Copyright"/>
-<l:gentext key="copyright" text="Copyright"/>
-<l:gentext key="Dedication" text="DÃ©dicace"/>
-<l:gentext key="dedication" text="DÃ©dicace"/>
-<l:gentext key="Edition" text="Ãdition"/>
-<l:gentext key="edition" text="Ãdition"/>
-<l:gentext key="Editor" text="Editor" lang="en"/>
-<l:gentext key="Equation" text="Ãquation"/>
-<l:gentext key="equation" text="Ãquation"/>
-<l:gentext key="Example" text="Exemple"/>
-<l:gentext key="example" text="Exemple"/>
-<l:gentext key="Figure" text="Figure"/>
-<l:gentext key="figure" text="Figure"/>
-<l:gentext key="Glossary" text="Glossaire"/>
-<l:gentext key="glossary" text="Glossaire"/>
-<l:gentext key="GlossSee" text="Voir"/>
-<l:gentext key="glosssee" text="Voir"/>
-<l:gentext key="GlossSeeAlso" text="Voir aussi"/>
-<l:gentext key="glossseealso" text="Voir aussi"/>
-<l:gentext key="IMPORTANT" text="IMPORTANT"/>
-<l:gentext key="important" text="Important"/>
-<l:gentext key="Important" text="Important"/>
-<l:gentext key="Index" text="Index"/>
-<l:gentext key="index" text="Index"/>
-<l:gentext key="ISBN" text="ISBN"/>
-<l:gentext key="isbn" text="ISBN"/>
-<l:gentext key="LegalNotice" text="Note lÃ©gale"/>
-<l:gentext key="legalnotice" text="Note lÃ©gale"/>
-<l:gentext key="MsgAud" text="Public visÃ©"/>
-<l:gentext key="msgaud" text="Public visÃ©"/>
-<l:gentext key="MsgLevel" text="Niveau"/>
-<l:gentext key="msglevel" text="Niveau"/>
-<l:gentext key="MsgOrig" text="Origine"/>
-<l:gentext key="msgorig" text="Origine"/>
-<l:gentext key="NOTE" text="NOTE"/>
-<l:gentext key="Note" text="Note"/>
-<l:gentext key="note" text="Note"/>
-<l:gentext key="Part" text="Partie"/>
-<l:gentext key="part" text="Partie"/>
-<l:gentext key="Preface" text="PrÃ©face"/>
-<l:gentext key="preface" text="PrÃ©face"/>
-<l:gentext key="Procedure" text="ProcÃ©dure"/>
-<l:gentext key="procedure" text="ProcÃ©dure"/>
-<l:gentext key="ProductionSet" text="Production"/>
-<l:gentext key="PubDate" text="Date de publication"/>
-<l:gentext key="pubdate" text="Date de publication"/>
-<l:gentext key="Published" text="PubliÃ© le"/>
-<l:gentext key="published" text="PubliÃ© le"/>
-<l:gentext key="Publisher" text="Publisher" lang="en"/>
-<l:gentext key="Qandadiv" text="Q &amp; R"/>
-<l:gentext key="qandadiv" text="Q &amp; R"/>
-<l:gentext key="QandASet" text="Frequently Asked Questions" lang="en"/>
-<l:gentext key="Question" text="QÂ :"/>
-<l:gentext key="question" text="QÂ :"/>
-<l:gentext key="RefEntry" text=""/>
-<l:gentext key="refentry" text=""/>
-<l:gentext key="Reference" text="RÃ©fÃ©rence"/>
-<l:gentext key="reference" text="RÃ©fÃ©rence"/>
-<l:gentext key="References" text="References" lang="en"/>
-<l:gentext key="RefName" text="Nom"/>
-<l:gentext key="refname" text="Nom"/>
-<l:gentext key="RefSection" text=""/>
-<l:gentext key="refsection" text=""/>
-<l:gentext key="RefSynopsisDiv" text="Synopsis"/>
-<l:gentext key="refsynopsisdiv" text="Synopsis"/>
-<l:gentext key="RevHistory" text="Historique des versions"/>
-<l:gentext key="revhistory" text="Historique des versions"/>
-<l:gentext key="revision" text="Version"/>
-<l:gentext key="Revision" text="Version"/>
-<l:gentext key="sect1" text="Section"/>
-<l:gentext key="sect2" text="Section"/>
-<l:gentext key="sect3" text="Section"/>
-<l:gentext key="sect4" text="Section"/>
-<l:gentext key="sect5" text="Section"/>
-<l:gentext key="section" text="section"/>
-<l:gentext key="Section" text="Section"/>
-<l:gentext key="see" text="voir"/>
-<l:gentext key="See" text="Voir"/>
-<l:gentext key="seealso" text="voir aussi"/>
-<l:gentext key="Seealso" text="Voir aussi"/>
-<l:gentext key="SeeAlso" text="Voir Aussi"/>
-<l:gentext key="set" text="Ensemble"/>
-<l:gentext key="Set" text="Ensemble"/>
-<l:gentext key="setindex" text="Index"/>
-<l:gentext key="SetIndex" text="Index"/>
-<l:gentext key="Sidebar" text="Filet vertical"/>
-<l:gentext key="sidebar" text="Filet vertical"/>
-<l:gentext key="step" text="Ã©tape"/>
-<l:gentext key="Step" text="Ãtape"/>
-<l:gentext key="table" text="Tableau"/>
-<l:gentext key="Table" text="Tableau"/>
-<l:gentext key="task" text="Task" lang="en"/>
-<l:gentext key="Task" text="Task" lang="en"/>
-<l:gentext key="tip" text="ASTUCE"/>
-<l:gentext key="TIP" text="ASTUCE"/>
-<l:gentext key="Tip" text="Astuce"/>
-<l:gentext key="Warning" text="Avertissement"/>
-<l:gentext key="warning" text="AVERTISSEMENT"/>
-<l:gentext key="WARNING" text="AVERTISSEMENT"/>
-<l:gentext key="and" text="et"/>
-<l:gentext key="by" text="par"/>
-<l:gentext key="Edited" text="PubliÃ©"/>
-<l:gentext key="edited" text="PubliÃ©"/>
-<l:gentext key="Editedby" text="PubliÃ© par"/>
-<l:gentext key="editedby" text="PubliÃ© par"/>
-<l:gentext key="in" text="dans"/>
-<l:gentext key="lastlistcomma" text=","/>
-<l:gentext key="listcomma" text=","/>
-<l:gentext key="nonexistantelement" text="Cet Ã©lÃ©ment n'existe pas"/>
-<l:gentext key="notes" text="Notes"/>
-<l:gentext key="Notes" text="Notes"/>
-<l:gentext key="Pgs" text="Pages"/>
-<l:gentext key="pgs" text="Pages"/>
-<l:gentext key="Revisedby" text="Revu et corrigÃ© parÂ : "/>
-<l:gentext key="revisedby" text="Revu et corrigÃ© parÂ : "/>
-<l:gentext key="TableNotes" text="Remarques"/>
-<l:gentext key="tablenotes" text="Remarques"/>
-<l:gentext key="TableofContents" text="Table des matiÃšres"/>
-<l:gentext key="tableofcontents" text="Table des matiÃšres"/>
-<l:gentext key="unexpectedelementname" text="Nom d'Ã©lÃ©ment inattendu"/>
-<l:gentext key="unsupported" text="Non reconnu par le systÃšme"/>
-<l:gentext key="xrefto" text="RÃ©fÃ©rence vers"/>
-<l:gentext key="Authors" text="Authors" lang="en"/>
-<l:gentext key="copyeditor" text="Copy Editor" lang="en"/>
-<l:gentext key="graphicdesigner" text="Graphic Designer" lang="en"/>
-<l:gentext key="productioneditor" text="Production Editor" lang="en"/>
-<l:gentext key="technicaleditor" text="Technical Editor" lang="en"/>
-<l:gentext key="translator" text="Translator" lang="en"/>
-<l:gentext key="listofequations" text="Liste des Ã©quations"/>
-<l:gentext key="ListofEquations" text="Liste des Ã©quations"/>
-<l:gentext key="ListofExamples" text="Liste des exemples"/>
-<l:gentext key="listofexamples" text="Liste des exemples"/>
-<l:gentext key="ListofFigures" text="Liste des illustrations"/>
-<l:gentext key="listoffigures" text="Liste des illustrations"/>
-<l:gentext key="ListofProcedures" text="Liste des procÃ©dures"/>
-<l:gentext key="listofprocedures" text="Liste des procÃ©dures"/>
-<l:gentext key="listoftables" text="Liste des tableaux"/>
-<l:gentext key="ListofTables" text="Liste des tableaux"/>
-<l:gentext key="ListofUnknown" text="Liste inconnue"/>
-<l:gentext key="listofunknown" text="Liste inconnue"/>
-<l:gentext key="nav-home" text="Sommaire"/>
-<l:gentext key="nav-next" text="Suivant"/>
-<l:gentext key="nav-next-sibling" text="Avance rapide"/>
-<l:gentext key="nav-prev" text="PrÃ©cÃ©dent"/>
-<l:gentext key="nav-prev-sibling" text="ArriÃšre rapide"/>
-<l:gentext key="nav-up" text="Niveau supÃ©rieur"/>
-<l:gentext key="nav-toc" text="TdM"/>
-<l:gentext key="Draft" text="Brouillon"/>
-<l:gentext key="above" text="au-dessus"/>
-<l:gentext key="below" text="au-dessous"/>
-<l:gentext key="sectioncalled" text="la section intitulÃ©e"/>
-<l:gentext key="index symbols" text="Symboles"/>
-<l:gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyzÃ¢ÃªÃ®ÃŽÃ»Ã«Ã¯ÃŒÃ ÃšÃ¹Ã©Ã§ÃŠÅ"/>
-<l:gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZÃÃÃÃÃÃÃÃÃÃÃÃÃÃÅ"/>
-<l:gentext key="normalize.sort.input" text="AaÃÃ ÃÃ¡ÃÃ¢ÃÃ£ÃÃ€Ã
-Ã¥ÄÄÄÄÄÄ
-ÇÇÇÇÇ Ç¡ÇºÇ»ÈÈÈÈÈŠÈ§ážážáºáº áº¡áº¢áº£áº€áº¥áºŠáº§áºšáº©áºªáº«áº¬áº­áº®áº¯áº°áº±áº²áº³áºŽáºµáº¶áº·BbÆÆÉÆÆážážážáž
-ážážCcÃÃ§ÄÄÄÄÄÄÄÄÆÆÉážážDdÄÄÄÄÆÉÆÆÇ
-Ç²È¡ÉážážážážážážážážážážEeÃÃšÃÃ©ÃÃªÃÃ«ÄÄÄÄÄÄÄÄÄÄÈÈ
-ÈÈÈšÈ©ážážážážážážážážážážáºžáº¹áººáº»áºŒáºœáºŸáº¿á»á»á»á»á»á»
-á»á»FfÆÆážážGgÄÄÄÄÄ Ä¡Ä¢Ä£ÆÉ Ç€Ç¥ÇŠÇ§ÇŽÇµáž áž¡HhÄ€Ä¥ÄŠÄ§ÈÈÉŠáž¢áž£áž€áž¥ážŠáž§ážšáž©ážªáž«áºIiÃÃ¬ÃÃ­ÃÃ®ÃÃ¯ÄšÄ©ÄªÄ«Ä¬Ä­Ä®Ä¯Ä°ÆÉšÇÇÈÈÈÈáž¬áž­áž®áž¯á»á»á»á»JjÄŽÄµÇ°ÊKkÄ¶Ä·ÆÆÇšÇ©áž°áž±áž²áž³ážŽážµLlÄ¹ÄºÄ»ÄŒÄœÄŸÄ¿ÅÅÅÆÇÈŽÉ«É¬É­áž¶áž·ážžáž¹ážºáž»ážŒážœMmÉ±ážŸáž¿á¹á¹á¹á¹NnÃÃ±ÅÅÅ
-ÅÅÅÆÉ²ÆÈ ÇÇžÇ¹ÈµÉ³á¹á¹
-á¹á¹á¹á¹á¹á¹OoÃÃ²ÃÃ³ÃÃŽÃÃµÃÃ¶ÃÃžÅÅÅÅÅÅÆÆ Æ¡ÇÇÇªÇ«Ç¬Ç­ÇŸÇ¿ÈÈÈÈÈªÈ«È¬È­È®È¯È°È±á¹á¹á¹á¹á¹á¹á¹á¹á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á» á»¡á»¢á»£PpÆ€Æ¥á¹á¹á¹á¹QqÊ RrÅÅÅÅÅÅÈÈÈÈÉŒÉœÉŸá¹á¹á¹á¹á¹á¹á¹á¹SsÅÅÅÅÅÅÅ Å¡ÈÈÊá¹ á¹¡á¹¢á¹£á¹€á¹¥á¹Šá¹§á¹šá¹©TtÅ¢Å£Å€Å¥ÅŠÅ§Æ«Æ¬Æ­Æ®ÊÈÈÈ¶á¹ªá¹«á¹¬á¹­á¹®á¹¯á¹°á¹±áºUuÃÃ¹ÃÃºÃÃ»ÃÃŒÅšÅ©ÅªÅ«Å¬Å­Å®Å¯Å°Å±Å²Å³Æ¯Æ°ÇÇÇÇÇÇÇÇÇÇÈÈÈÈá¹²á¹³á¹Žá¹µá¹¶á¹·á¹žá¹¹á¹ºá¹»á»€á»¥á»Šá»§á»šá»©á»ªá»«á»¬á»­á»®á»¯á»°á»±VvÆ²Êá¹Œá¹œá¹Ÿá¹¿WwÅŽÅµáºáºáºáºáºáº
-áºáºáºáºáºXxáºáºáºáºYyÃÃœÃ¿ÅžÅ¶Å·Æ³ÆŽÈ²È³áºáºáºá»²á»³á»Žá»µá»¶á»·á»žá»¹ZzÅ¹ÅºÅ»ÅŒÅœÅŸÆµÆ¶È€È¥ÊÊáºáºáºáºáºáºáº" lang="en"/>
-<l:gentext key="normalize.sort.output" text="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ" lang="en"/>
-<l:dingbat key="startquote" text="Â«Â "/>
-<l:dingbat key="endquote" text="Â Â»"/>
-<l:dingbat key="nestedstartquote" text="â"/>
-<l:dingbat key="nestedendquote" text="â"/>
-<l:dingbat key="singlestartquote" text="â¹"/>
-<l:dingbat key="singleendquote" text="âº"/>
-<l:dingbat key="bullet" text="â¢"/>
-<l:gentext key="hyphenation-character" text="-"/>
-<l:gentext key="hyphenation-push-character-count" text="2"/>
-<l:gentext key="hyphenation-remain-character-count" text="2"/>
-<l:context name="styles"><l:template name="person-name" text="first-last"/>
-</l:context>
-<l:context name="title"><l:template name="abstract" text="%t"/>
-<l:template name="answer" text="%t"/>
-<l:template name="appendix" text="AnnexeÂ %n.Â %t"/>
-<l:template name="article" text="%t"/>
-<l:template name="authorblurb" text="%t"/>
-<l:template name="bibliodiv" text="%t"/>
-<l:template name="biblioentry" text="%t"/>
-<l:template name="bibliography" text="%t"/>
-<l:template name="bibliolist" text="%t" lang="en"/>
-<l:template name="bibliomixed" text="%t"/>
-<l:template name="bibliomset" text="%t"/>
-<l:template name="biblioset" text="%t"/>
-<l:template name="blockquote" text="%t"/>
-<l:template name="book" text="%t"/>
-<l:template name="calloutlist" text="%t"/>
-<l:template name="caution" text="%t"/>
-<l:template name="chapter" text="ChapitreÂ %n.Â %t"/>
-<l:template name="colophon" text="%t"/>
-<l:template name="dedication" text="%t"/>
-<l:template name="equation" text="ÃquationÂ %n.Â %t"/>
-<l:template name="example" text="ExempleÂ %n.Â %t"/>
-<l:template name="figure" text="FigureÂ %n.Â %t"/>
-<l:template name="foil" text="%t" lang="en"/>
-<l:template name="foilgroup" text="%t" lang="en"/>
-<l:template name="formalpara" text="%t"/>
-<l:template name="glossary" text="%t"/>
-<l:template name="glossdiv" text="%t"/>
-<l:template name="glosslist" text="%t" lang="en"/>
-<l:template name="glossentry" text="%t"/>
-<l:template name="important" text="%t"/>
-<l:template name="index" text="%t"/>
-<l:template name="indexdiv" text="%t"/>
-<l:template name="itemizedlist" text="%t"/>
-<l:template name="legalnotice" text="%t"/>
-<l:template name="listitem" text=""/>
-<l:template name="lot" text="%t"/>
-<l:template name="msg" text="%t"/>
-<l:template name="msgexplan" text="%t"/>
-<l:template name="msgmain" text="%t"/>
-<l:template name="msgrel" text="%t"/>
-<l:template name="msgset" text="%t"/>
-<l:template name="msgsub" text="%t"/>
-<l:template name="note" text="%t"/>
-<l:template name="orderedlist" text="%t"/>
-<l:template name="part" text="%t"/>
-<l:template name="partintro" text="%t"/>
-<l:template name="preface" text="%t"/>
-<l:template name="procedure" text="%t"/>
-<l:template name="procedure.formal" text="ProcÃ©dureÂ %n.Â %t"/>
-<l:template name="productionset" text="%t"/>
-<l:template name="productionset.formal" text="ProductionÂ %n"/>
-<l:template name="qandadiv" text="%t"/>
-<l:template name="qandaentry" text="%t"/>
-<l:template name="qandaset" text="%t"/>
-<l:template name="question" text="%t"/>
-<l:template name="refentry" text="%t"/>
-<l:template name="reference" text="%t"/>
-<l:template name="refsection" text="%t"/>
-<l:template name="refsect1" text="%t"/>
-<l:template name="refsect2" text="%t"/>
-<l:template name="refsect3" text="%t"/>
-<l:template name="refsynopsisdiv" text="%t"/>
-<l:template name="refsynopsisdivinfo" text="%t"/>
-<l:template name="segmentedlist" text="%t"/>
-<l:template name="set" text="%t"/>
-<l:template name="setindex" text="%t"/>
-<l:template name="sidebar" text="%t"/>
-<l:template name="step" text="%t"/>
-<l:template name="table" text="TableauÂ %n.Â %t"/>
-<l:template name="task" text="%t"/>
-<l:template name="tasksummary" text="%t" lang="en"/>
-<l:template name="taskprerequisites" text="%t" lang="en"/>
-<l:template name="taskrelated" text="%t" lang="en"/>
-<l:template name="tip" text="%t"/>
-<l:template name="toc" text="%t"/>
-<l:template name="variablelist" text="%t"/>
-<l:template name="varlistentry" text=""/>
-<l:template name="warning" text="%t"/>
-</l:context>
-<l:context name="title-unnumbered"><l:template name="appendix" text="%t"/>
-<l:template name="article/appendix" text="%t"/>
-<l:template name="bridgehead" text="%t"/>
-<l:template name="chapter" text="%t"/>
-<l:template name="sect1" text="%t"/>
-<l:template name="sect2" text="%t"/>
-<l:template name="sect3" text="%t"/>
-<l:template name="sect4" text="%t"/>
-<l:template name="sect5" text="%t"/>
-<l:template name="section" text="%t"/>
-<l:template name="simplesect" text="%t"/>
-<l:template name="part" text="%t" lang="en"/>
-</l:context>
-<l:context name="title-numbered"><l:template name="appendix" text="AnnexeÂ %n.Â %t"/>
-<l:template name="article/appendix" text="%n.Â %t"/>
-<l:template name="bridgehead" text="%n.Â %t"/>
-<l:template name="chapter" text="ChapitreÂ %n.Â %t"/>
-<l:template name="part" text="PartieÂ %n.Â %t"/>
-<l:template name="sect1" text="%n.Â %t"/>
-<l:template name="sect2" text="%n.Â %t"/>
-<l:template name="sect3" text="%n.Â %t"/>
-<l:template name="sect4" text="%n.Â %t"/>
-<l:template name="sect5" text="%n.Â %t"/>
-<l:template name="section" text="%n.Â %t"/>
-<l:template name="simplesect" text="%t"/>
-</l:context>
-<l:context name="subtitle"><l:template name="appendix" text="%s"/>
-<l:template name="article" text="%s"/>
-<l:template name="bibliodiv" text="%s"/>
-<l:template name="biblioentry" text="%s"/>
-<l:template name="bibliography" text="%s"/>
-<l:template name="bibliomixed" text="%s"/>
-<l:template name="bibliomset" text="%s"/>
-<l:template name="biblioset" text="%s"/>
-<l:template name="book" text="%s"/>
-<l:template name="chapter" text="%s"/>
-<l:template name="colophon" text="%s"/>
-<l:template name="dedication" text="%s"/>
-<l:template name="glossary" text="%s"/>
-<l:template name="glossdiv" text="%s"/>
-<l:template name="index" text="%s"/>
-<l:template name="indexdiv" text="%s"/>
-<l:template name="lot" text="%s"/>
-<l:template name="part" text="%s"/>
-<l:template name="partintro" text="%s"/>
-<l:template name="preface" text="%s"/>
-<l:template name="refentry" text="%s"/>
-<l:template name="reference" text="%s"/>
-<l:template name="refsection" text="%s"/>
-<l:template name="refsect1" text="%s"/>
-<l:template name="refsect2" text="%s"/>
-<l:template name="refsect3" text="%s"/>
-<l:template name="refsynopsisdiv" text="%s"/>
-<l:template name="sect1" text="%s"/>
-<l:template name="sect2" text="%s"/>
-<l:template name="sect3" text="%s"/>
-<l:template name="sect4" text="%s"/>
-<l:template name="sect5" text="%s"/>
-<l:template name="section" text="%s"/>
-<l:template name="set" text="%s"/>
-<l:template name="setindex" text="%s"/>
-<l:template name="sidebar" text="%s"/>
-<l:template name="simplesect" text="%s"/>
-<l:template name="toc" text="%s"/>
-</l:context>
-<l:context name="xref"><l:template name="abstract" text="%t"/>
-<l:template name="answer" text="RÂ :Â %n"/>
-<l:template name="appendix" text="%t"/>
-<l:template name="article" text="%t"/>
-<l:template name="authorblurb" text="%t"/>
-<l:template name="bibliodiv" text="%t"/>
-<l:template name="bibliography" text="%t"/>
-<l:template name="bibliomset" text="%t"/>
-<l:template name="biblioset" text="%t"/>
-<l:template name="blockquote" text="%t"/>
-<l:template name="book" text="%t"/>
-<l:template name="calloutlist" text="%t"/>
-<l:template name="caution" text="%t"/>
-<l:template name="chapter" text="%t"/>
-<l:template name="colophon" text="%t"/>
-<l:template name="constraintdef" text="%t"/>
-<l:template name="dedication" text="%t"/>
-<l:template name="equation" text="%t"/>
-<l:template name="example" text="%t"/>
-<l:template name="figure" text="%t"/>
-<l:template name="foil" text="%t" lang="en"/>
-<l:template name="foilgroup" text="%t" lang="en"/>
-<l:template name="formalpara" text="%t"/>
-<l:template name="glossary" text="%t"/>
-<l:template name="glossdiv" text="%t"/>
-<l:template name="important" text="%t"/>
-<l:template name="index" text="%t"/>
-<l:template name="indexdiv" text="%t"/>
-<l:template name="itemizedlist" text="%t"/>
-<l:template name="legalnotice" text="%t"/>
-<l:template name="listitem" text="%n"/>
-<l:template name="lot" text="%t"/>
-<l:template name="msg" text="%t"/>
-<l:template name="msgexplan" text="%t"/>
-<l:template name="msgmain" text="%t"/>
-<l:template name="msgrel" text="%t"/>
-<l:template name="msgset" text="%t"/>
-<l:template name="msgsub" text="%t"/>
-<l:template name="note" text="%t"/>
-<l:template name="orderedlist" text="%t"/>
-<l:template name="part" text="%t"/>
-<l:template name="partintro" text="%t"/>
-<l:template name="preface" text="%t"/>
-<l:template name="procedure" text="%t"/>
-<l:template name="productionset" text="%t"/>
-<l:template name="qandadiv" text="%t"/>
-<l:template name="qandaentry" text="QÂ :Â %n"/>
-<l:template name="qandaset" text="%t"/>
-<l:template name="question" text="QÂ :Â %n"/>
-<l:template name="reference" text="%t"/>
-<l:template name="refsynopsisdiv" text="%t"/>
-<l:template name="segmentedlist" text="%t"/>
-<l:template name="set" text="%t"/>
-<l:template name="setindex" text="%t"/>
-<l:template name="sidebar" text="%t"/>
-<l:template name="table" text="%t"/>
-<l:template name="task" text="%t" lang="en"/>
-<l:template name="tip" text="%t"/>
-<l:template name="toc" text="%t"/>
-<l:template name="variablelist" text="%t"/>
-<l:template name="varlistentry" text="%n"/>
-<l:template name="warning" text="%t"/>
-<l:template name="olink.document.citation" text=" in %o" lang="en"/>
-<l:template name="olink.page.citation" text=" (page %p)" lang="en"/>
-<l:template name="page.citation" text=" [%p]"/>
-<l:template name="page" text="(page %p)"/>
-<l:template name="docname" text=" in %o" lang="en"/>
-<l:template name="docnamelong" text=" in the document titled %o" lang="en"/>
-<l:template name="pageabbrev" text="(p. %p)"/>
-<l:template name="Page" text="Page %p"/>
-<l:template name="bridgehead" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="refsection" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="refsect1" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="refsect2" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="refsect3" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="sect1" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="sect2" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="sect3" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="sect4" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="sect5" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="section" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="simplesect" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-</l:context>
-<l:context name="xref-number"><l:template name="answer" text="RÂ :Â %n"/>
-<l:template name="appendix" text="AnnexeÂ %n"/>
-<l:template name="bridgehead" text="SectionÂ %n"/>
-<l:template name="chapter" text="ChapitreÂ %n"/>
-<l:template name="equation" text="ÃquationÂ %n"/>
-<l:template name="example" text="ExempleÂ %n"/>
-<l:template name="figure" text="FigureÂ %n"/>
-<l:template name="part" text="PartieÂ %n"/>
-<l:template name="procedure" text="ProcÃ©dureÂ %n"/>
-<l:template name="productionset" text="ProductionÂ %n"/>
-<l:template name="qandadiv" text="Q &amp; RÂ %n"/>
-<l:template name="qandaentry" text="QÂ :Â %n"/>
-<l:template name="question" text="QÂ :Â %n"/>
-<l:template name="sect1" text="SectionÂ %n"/>
-<l:template name="sect2" text="SectionÂ %n"/>
-<l:template name="sect3" text="SectionÂ %n"/>
-<l:template name="sect4" text="SectionÂ %n"/>
-<l:template name="sect5" text="SectionÂ %n"/>
-<l:template name="section" text="SectionÂ %n"/>
-<l:template name="table" text="TableauÂ %n"/>
-</l:context>
-<l:context name="xref-number-and-title"><l:template name="appendix" text="AnnexeÂ %n, %t"/>
-<l:template name="bridgehead" text="SectionÂ %n, Â«Â %tÂ Â»"/>
-<l:template name="chapter" text="ChapitreÂ %n, %t"/>
-<l:template name="equation" text="ÃquationÂ %n, Â«Â %tÂ Â»"/>
-<l:template name="example" text="ExempleÂ %n, Â«Â %tÂ Â»"/>
-<l:template name="figure" text="FigureÂ %n, Â«Â %tÂ Â»"/>
-<l:template name="part" text="PartieÂ %n, Â«Â %tÂ Â»"/>
-<l:template name="procedure" text="ProcÃ©dureÂ %n, Â«Â %tÂ Â»"/>
-<l:template name="productionset" text="ProductionÂ %n, Â«Â %tÂ Â»"/>
-<l:template name="qandadiv" text="Q &amp; RÂ %n, Â«Â %tÂ Â»"/>
-<l:template name="refsect1" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="refsect2" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="refsect3" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="refsection" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="sect1" text="SectionÂ %n, Â«Â %tÂ Â»"/>
-<l:template name="sect2" text="SectionÂ %n, Â«Â %tÂ Â»"/>
-<l:template name="sect3" text="SectionÂ %n, Â«Â %tÂ Â»"/>
-<l:template name="sect4" text="SectionÂ %n, Â«Â %tÂ Â»"/>
-<l:template name="sect5" text="SectionÂ %n, Â«Â %tÂ Â»"/>
-<l:template name="section" text="SectionÂ %n, Â«Â %tÂ Â»"/>
-<l:template name="simplesect" text="la section intitulÃ©e Â«Â %tÂ Â»"/>
-<l:template name="table" text="TableauÂ %n, Â«Â %tÂ Â»"/>
-</l:context>
-<l:context name="authorgroup"><l:template name="sep" text=", "/>
-<l:template name="sep2" text=" et "/>
-<l:template name="seplast" text=", et "/>
-</l:context>
-<l:context name="glossary"><l:template name="see" text="Voir %t"/>
-<l:template name="seealso" text="Voir aussi %t"/>
-</l:context>
-<l:context name="msgset"><l:template name="MsgAud" text="Public visÃ©: "/>
-<l:template name="MsgLevel" text="Niveau: "/>
-<l:template name="MsgOrig" text="Origine: "/>
-</l:context>
-<l:context name="datetime"><l:template name="format" text="d/m/Y"/>
-</l:context>
-<l:context name="termdef"><l:template name="prefix" text="[Definition: " lang="en"/>
-<l:template name="suffix" text="]" lang="en"/>
-</l:context>
-<l:context name="datetime-full"><l:template name="January" text="janvier"/>
-<l:template name="February" text="fÃ©vrier"/>
-<l:template name="March" text="mars"/>
-<l:template name="April" text="avril"/>
-<l:template name="May" text="mai"/>
-<l:template name="June" text="juin"/>
-<l:template name="July" text="juillet"/>
-<l:template name="August" text="aoÃ»t"/>
-<l:template name="September" text="septembre"/>
-<l:template name="October" text="octobre"/>
-<l:template name="November" text="novembre"/>
-<l:template name="December" text="dÃ©cembre"/>
-<l:template name="Monday" text="lundi"/>
-<l:template name="Tuesday" text="mardi"/>
-<l:template name="Wednesday" text="mercredi"/>
-<l:template name="Thursday" text="jeudi"/>
-<l:template name="Friday" text="vendredi"/>
-<l:template name="Saturday" text="samedi"/>
-<l:template name="Sunday" text="dimanche"/>
-</l:context>
-<l:context name="datetime-abbrev"><l:template name="Jan" text="jan"/>
-<l:template name="Feb" text="fÃ©v"/>
-<l:template name="Mar" text="mar"/>
-<l:template name="Apr" text="avr"/>
-<l:template name="May" text="mai"/>
-<l:template name="Jun" text="jun"/>
-<l:template name="Jul" text="jui"/>
-<l:template name="Aug" text="aoÃ»"/>
-<l:template name="Sep" text="sep"/>
-<l:template name="Oct" text="oct"/>
-<l:template name="Nov" text="nov"/>
-<l:template name="Dec" text="dÃ©c"/>
-<l:template name="Mon" text="lun"/>
-<l:template name="Tue" text="mar"/>
-<l:template name="Wed" text="mer"/>
-<l:template name="Thu" text="jeu"/>
-<l:template name="Fri" text="ven"/>
-<l:template name="Sat" text="sam"/>
-<l:template name="Sun" text="dim"/>
-</l:context>
-<l:context name="htmlhelp"><l:template name="langcode" text="0x040c French (FRANCE)"/>
-</l:context>
-<l:context name="index"><l:template name="term-separator" text=", " lang="en"/>
-<l:template name="number-separator" text=", " lang="en"/>
-<l:template name="range-separator" text="-" lang="en"/>
-</l:context>
-<l:context name="iso690"><l:template name="lastfirst.sep" text=", " lang="en"/>
-<l:template name="alt.person.two.sep" text=" â " lang="en"/>
-<l:template name="alt.person.last.sep" text=" â " lang="en"/>
-<l:template name="alt.person.more.sep" text=" â " lang="en"/>
-<l:template name="primary.editor" text=" (ed.)" lang="en"/>
-<l:template name="primary.many" text=", et al." lang="en"/>
-<l:template name="primary.sep" text=". " lang="en"/>
-<l:template name="submaintitle.sep" text=": " lang="en"/>
-<l:template name="title.sep" text=". " lang="en"/>
-<l:template name="othertitle.sep" text=", " lang="en"/>
-<l:template name="medium1" text=" [" lang="en"/>
-<l:template name="medium2" text="]" lang="en"/>
-<l:template name="secondary.person.sep" text="; " lang="en"/>
-<l:template name="secondary.sep" text=". " lang="en"/>
-<l:template name="respons.sep" text=". " lang="en"/>
-<l:template name="edition.sep" text=". " lang="en"/>
-<l:template name="edition.serial.sep" text=", " lang="en"/>
-<l:template name="issuing.range" text="-" lang="en"/>
-<l:template name="issuing.div" text=", " lang="en"/>
-<l:template name="issuing.sep" text=". " lang="en"/>
-<l:template name="partnr.sep" text=". " lang="en"/>
-<l:template name="placepubl.sep" text=": " lang="en"/>
-<l:template name="publyear.sep" text=", " lang="en"/>
-<l:template name="pubinfo.sep" text=". " lang="en"/>
-<l:template name="spec.pubinfo.sep" text=", " lang="en"/>
-<l:template name="upd.sep" text=", " lang="en"/>
-<l:template name="datecit1" text=" [cited " lang="en"/>
-<l:template name="datecit2" text="]" lang="en"/>
-<l:template name="extent.sep" text=". " lang="en"/>
-<l:template name="locs.sep" text=", " lang="en"/>
-<l:template name="location.sep" text=". " lang="en"/>
-<l:template name="serie.sep" text=". " lang="en"/>
-<l:template name="notice.sep" text=". " lang="en"/>
-<l:template name="access" text="Available " lang="en"/>
-<l:template name="acctoo" text="Also available " lang="en"/>
-<l:template name="onwww" text="from World Wide Web" lang="en"/>
-<l:template name="oninet" text="from Internet" lang="en"/>
-<l:template name="access.end" text=": " lang="en"/>
-<l:template name="link1" text="&lt;" lang="en"/>
-<l:template name="link2" text="&gt;" lang="en"/>
-<l:template name="access.sep" text=". " lang="en"/>
-<l:template name="isbn" text="ISBN " lang="en"/>
-<l:template name="issn" text="ISSN " lang="en"/>
-<l:template name="stdnum.sep" text=". " lang="en"/>
-<l:template name="patcountry.sep" text=". " lang="en"/>
-<l:template name="pattype.sep" text=", " lang="en"/>
-<l:template name="patnum.sep" text=". " lang="en"/>
-<l:template name="patdate.sep" text=". " lang="en"/>
-</l:context><l:letters><l:l i="-1"/>
-<l:l i="0">Symboles</l:l>
-<l:l i="1">A</l:l>
-<l:l i="1">a</l:l>
-<l:l i="1">Ã </l:l>
-<l:l i="1">Ã</l:l>
-<l:l i="1">Ã¢</l:l>
-<l:l i="1">Ã</l:l>
-<l:l i="1">Ã</l:l>
-<l:l i="1">ÃŠ</l:l>
-<l:l i="2">B</l:l>
-<l:l i="2">b</l:l>
-<l:l i="3">C</l:l>
-<l:l i="3">c</l:l>
-<l:l i="3">Ã§</l:l>
-<l:l i="4">D</l:l>
-<l:l i="4">d</l:l>
-<l:l i="5">E</l:l>
-<l:l i="5">e</l:l>
-<l:l i="5">Ãª</l:l>
-<l:l i="5">Ã</l:l>
-<l:l i="5">Ã©</l:l>
-<l:l i="5">Ã</l:l>
-<l:l i="5">Ãš</l:l>
-<l:l i="5">Ã</l:l>
-<l:l i="5">Ã«</l:l>
-<l:l i="5">Ã</l:l>
-<l:l i="5">â¬</l:l>
-<l:l i="6">F</l:l>
-<l:l i="6">f</l:l>
-<l:l i="7">G</l:l>
-<l:l i="7">g</l:l>
-<l:l i="8">H</l:l>
-<l:l i="8">h</l:l>
-<l:l i="9">I</l:l>
-<l:l i="9">i</l:l>
-<l:l i="9">Ã</l:l>
-<l:l i="9">Ã®</l:l>
-<l:l i="9">Ã</l:l>
-<l:l i="9">Ã¯</l:l>
-<l:l i="10">J</l:l>
-<l:l i="10">j</l:l>
-<l:l i="11">K</l:l>
-<l:l i="11">k</l:l>
-<l:l i="12">L</l:l>
-<l:l i="12">l</l:l>
-<l:l i="13">M</l:l>
-<l:l i="13">m</l:l>
-<l:l i="14">N</l:l>
-<l:l i="14">n</l:l>
-<l:l i="15">O</l:l>
-<l:l i="15">o</l:l>
-<l:l i="15">Ã</l:l>
-<l:l i="15">Ã¶</l:l>
-<l:l i="15">Å</l:l>
-<l:l i="15">Å</l:l>
-<l:l i="16">P</l:l>
-<l:l i="16">p</l:l>
-<l:l i="17">Q</l:l>
-<l:l i="17">q</l:l>
-<l:l i="18">R</l:l>
-<l:l i="18">r</l:l>
-<l:l i="19">S</l:l>
-<l:l i="19">s</l:l>
-<l:l i="20">T</l:l>
-<l:l i="20">t</l:l>
-<l:l i="21">U</l:l>
-<l:l i="21">u</l:l>
-<l:l i="21">Ã</l:l>
-<l:l i="21">Ã¹</l:l>
-<l:l i="21">Ã</l:l>
-<l:l i="21">Ã»</l:l>
-<l:l i="21">Ã</l:l>
-<l:l i="21">ÃŒ</l:l>
-<l:l i="22">V</l:l>
-<l:l i="22">v</l:l>
-<l:l i="23">W</l:l>
-<l:l i="23">w</l:l>
-<l:l i="24">X</l:l>
-<l:l i="24">x</l:l>
-<l:l i="25">Y</l:l>
-<l:l i="25">y</l:l>
-<l:l i="26">Z</l:l>
-<l:l i="26">z</l:l>
-</l:letters>
-</l:l10n>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/gentext.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/gentext.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,831 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-                exclude-result-prefixes="doc"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-
-<xsl:template match="*" mode="object.title.template">
-  <xsl:call-template name="gentext.template">
-    <xsl:with-param name="context" select="'title'"/>
-    <xsl:with-param name="name">
-      <xsl:call-template name="xpath.location"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="chapter" mode="object.title.template">
-  <xsl:choose>
-    <xsl:when test="string($chapter.autolabel) != 0">
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'title-numbered'"/>
-        <xsl:with-param name="name">
-          <xsl:call-template name="xpath.location"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'title-unnumbered'"/>
-        <xsl:with-param name="name">
-          <xsl:call-template name="xpath.location"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="appendix" mode="object.title.template">
-  <xsl:choose>
-    <xsl:when test="string($appendix.autolabel) != 0">
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'title-numbered'"/>
-        <xsl:with-param name="name">
-          <xsl:call-template name="xpath.location"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'title-unnumbered'"/>
-        <xsl:with-param name="name">
-          <xsl:call-template name="xpath.location"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="part" mode="object.title.template">
-  <xsl:choose>
-    <xsl:when test="string($part.autolabel) != 0">
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'title-numbered'"/>
-        <xsl:with-param name="name">
-          <xsl:call-template name="xpath.location"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'title-unnumbered'"/>
-        <xsl:with-param name="name">
-          <xsl:call-template name="xpath.location"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="section|sect1|sect2|sect3|sect4|sect5|simplesect
-                     |bridgehead"
-              mode="object.title.template">
-  <xsl:variable name="is.numbered">
-    <xsl:call-template name="label.this.section"/>
-  </xsl:variable>
-  <xsl:choose>
-    <xsl:when test="$is.numbered != 0">
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'title-numbered'"/>
-        <xsl:with-param name="name">
-          <xsl:call-template name="xpath.location"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'title-unnumbered'"/>
-        <xsl:with-param name="name">
-          <xsl:call-template name="xpath.location"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="procedure" mode="object.title.template">
-  <xsl:choose>
-    <xsl:when test="$formal.procedures != 0 and title">
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'title'"/>
-        <xsl:with-param name="name">
-          <xsl:call-template name="xpath.location"/>
-          <xsl:text>.formal</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'title'"/>
-        <xsl:with-param name="name">
-          <xsl:call-template name="xpath.location"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template match="*" mode="object.subtitle.template">
-  <xsl:call-template name="gentext.template">
-    <xsl:with-param name="context" select="'subtitle'"/>
-    <xsl:with-param name="name">
-      <xsl:call-template name="xpath.location"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template match="*" mode="is.autonumber">
-  <xsl:value-of select="'0'"/>
-</xsl:template>
-
-<xsl:template match="section|sect1|sect2|sect3|sect4|sect5" 
-              mode="is.autonumber">
-  <xsl:call-template name="label.this.section"/>
-</xsl:template>
-
-<xsl:template match="figure|example|table|equation" mode="is.autonumber">
-  <xsl:value-of select="'1'"/>
-</xsl:template>
-
-<xsl:template match="appendix" mode="is.autonumber">
-  <xsl:value-of select="$appendix.autolabel"/>
-</xsl:template>
-
-<xsl:template match="chapter" mode="is.autonumber">
-  <xsl:value-of select="$chapter.autolabel"/>
-</xsl:template>
-
-<xsl:template match="part" mode="is.autonumber">
-  <xsl:value-of select="$part.autolabel"/>
-</xsl:template>
-
-<xsl:template match="preface" mode="is.autonumber">
-  <xsl:value-of select="$preface.autolabel"/>
-</xsl:template>
-
-<xsl:template match="question|answer" mode="is.autonumber">
-  <xsl:choose>
-    <xsl:when test="$qanda.defaultlabel = 'number'
-                    and not(label)">
-      <xsl:value-of select="'1'"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="'0'"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="qandadiv" mode="is.autonumber">
-  <xsl:value-of select="$qandadiv.autolabel"/>
-</xsl:template>
-
-<xsl:template match="bridgehead" mode="is.autonumber">
-  <xsl:value-of select="$section.autolabel"/>
-</xsl:template>
-
-<xsl:template match="*" mode="object.xref.template">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="referrer"/>
-
-  <!-- Is autonumbering on? -->
-  <xsl:variable name="autonumber">
-    <xsl:apply-templates select="." mode="is.autonumber"/>
-  </xsl:variable>
-
-  <xsl:variable name="number-and-title-template">
-    <xsl:call-template name="gentext.template.exists">
-      <xsl:with-param name="context" select="'xref-number-and-title'"/>
-      <xsl:with-param name="name">
-        <xsl:call-template name="xpath.location"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="number-template">
-    <xsl:call-template name="gentext.template.exists">
-      <xsl:with-param name="context" select="'xref-number'"/>
-      <xsl:with-param name="name">
-        <xsl:call-template name="xpath.location"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="context">
-    <xsl:choose>
-      <xsl:when test="string($autonumber) != 0 
-                      and $number-and-title-template != 0
-                      and $xref.with.number.and.title != 0">
-         <xsl:value-of select="'xref-number-and-title'"/>
-      </xsl:when>
-      <xsl:when test="string($autonumber) != 0 
-                      and $number-template != 0">
-         <xsl:value-of select="'xref-number'"/>
-      </xsl:when>
-      <xsl:otherwise>
-         <xsl:value-of select="'xref'"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:call-template name="gentext.template">
-    <xsl:with-param name="context" select="$context"/>
-    <xsl:with-param name="name">
-      <xsl:call-template name="xpath.location"/>
-    </xsl:with-param>
-    <xsl:with-param name="purpose" select="$purpose"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-  </xsl:call-template>
-
-</xsl:template>
-
-
-<!-- ============================================================ -->
-
-<xsl:template match="*" mode="object.title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:variable name="template">
-    <xsl:apply-templates select="." mode="object.title.template"/>
-  </xsl:variable>
-
-<!--
-  <xsl:message>
-    <xsl:text>object.title.markup: </xsl:text>
-    <xsl:value-of select="local-name(.)"/>
-    <xsl:text>: </xsl:text>
-    <xsl:value-of select="$template"/>
-  </xsl:message>
--->
-
-  <xsl:call-template name="substitute-markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-    <xsl:with-param name="template" select="$template"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="*" mode="object.title.markup.textonly">
-  <xsl:variable name="title">
-    <xsl:apply-templates select="." mode="object.title.markup"/>
-  </xsl:variable>
-  <xsl:value-of select="normalize-space($title)"/>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template match="*" mode="object.titleabbrev.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-
-  <!-- Just for consistency in template naming -->
-
-  <xsl:apply-templates select="." mode="titleabbrev.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template match="*" mode="object.subtitle.markup">
-  <xsl:variable name="template">
-    <xsl:apply-templates select="." mode="object.subtitle.template"/>
-  </xsl:variable>
-
-  <xsl:call-template name="substitute-markup">
-    <xsl:with-param name="template" select="$template"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template match="*" mode="object.xref.markup">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="referrer"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:variable name="template">
-    <xsl:choose>
-      <xsl:when test="starts-with(normalize-space($xrefstyle), 'select:')">
-        <xsl:call-template name="make.gentext.template">
-          <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-          <xsl:with-param name="purpose" select="$purpose"/>
-          <xsl:with-param name="referrer" select="$referrer"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="starts-with(normalize-space($xrefstyle), 'template:')">
-        <xsl:value-of select="substring-after(normalize-space($xrefstyle), 'template:')"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates select="." mode="object.xref.template">
-          <xsl:with-param name="purpose" select="$purpose"/>
-          <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-          <xsl:with-param name="referrer" select="$referrer"/>
-        </xsl:apply-templates>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-<!-- 
-  <xsl:message>
-    <xsl:text>object.xref.markup: </xsl:text>
-    <xsl:value-of select="local-name(.)"/>
-    <xsl:text>(</xsl:text>
-    <xsl:value-of select="$xrefstyle"/>
-    <xsl:text>, </xsl:text>
-    <xsl:value-of select="$purpose"/>
-    <xsl:text>)</xsl:text>
-    <xsl:text>: [</xsl:text>
-    <xsl:value-of select="$template"/>
-    <xsl:text>]</xsl:text>
-  </xsl:message>
--->
-
-  <xsl:if test="$template = '' and $verbose != 0">
-    <xsl:message>
-      <xsl:text>object.xref.markup: empty xref template</xsl:text>
-      <xsl:text> for linkend="</xsl:text>
-      <xsl:value-of select="@id|@xml:id"/>
-      <xsl:text>" and @xrefstyle="</xsl:text>
-      <xsl:value-of select="$xrefstyle"/>
-      <xsl:text>"</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:call-template name="substitute-markup">
-    <xsl:with-param name="purpose" select="$purpose"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="template" select="$template"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="listitem" mode="object.xref.markup">
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:choose>
-    <xsl:when test="parent::orderedlist">
-      <xsl:variable name="template">
-        <xsl:apply-templates select="." mode="object.xref.template"/>
-      </xsl:variable>
-      <xsl:call-template name="substitute-markup">
-        <xsl:with-param name="template" select="$template"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$verbose != 0">
-      <xsl:message>
-        <xsl:text>Xref is only supported to listitems in an</xsl:text>
-        <xsl:text> orderedlist: </xsl:text>
-        <xsl:value-of select="@id|@xml:id"/>
-      </xsl:message>
-      <xsl:text>???</xsl:text>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="question" mode="object.xref.markup">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="referrer"/>
-
-  <xsl:variable name="deflabel">
-    <xsl:choose>
-      <xsl:when test="ancestor-or-self::*[@defaultlabel]">
-        <xsl:value-of select="(ancestor-or-self::*[@defaultlabel])[last()]
-                              /@defaultlabel"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$qanda.defaultlabel"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="template">
-    <xsl:choose>
-      <!-- This avoids double Q: Q: in xref when defaultlabel=qanda -->
-      <xsl:when test="$deflabel = 'qanda' and not(label)">%n</xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates select="." mode="object.xref.template">
-          <xsl:with-param name="purpose" select="$purpose"/>
-          <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-          <xsl:with-param name="referrer" select="$referrer"/>
-        </xsl:apply-templates>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:call-template name="substitute-markup">
-    <xsl:with-param name="purpose" select="$purpose"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="template" select="$template"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template name="substitute-markup">
-  <xsl:param name="template" select="''"/>
-  <xsl:param name="allow-anchors" select="'0'"/>
-  <xsl:param name="title" select="''"/>
-  <xsl:param name="subtitle" select="''"/>
-  <xsl:param name="docname" select="''"/>
-  <xsl:param name="label" select="''"/>
-  <xsl:param name="pagenumber" select="''"/>
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="referrer"/>
-  <xsl:param name="verbose"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($template, '%')">
-      <xsl:value-of select="substring-before($template, '%')"/>
-      <xsl:variable name="candidate"
-             select="substring(substring-after($template, '%'), 1, 1)"/>
-      <xsl:choose>
-        <xsl:when test="$candidate = 't'">
-          <xsl:apply-templates select="." mode="insert.title.markup">
-            <xsl:with-param name="purpose" select="$purpose"/>
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-            <xsl:with-param name="title">
-              <xsl:choose>
-                <xsl:when test="$title != ''">
-                  <xsl:copy-of select="$title"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:apply-templates select="." mode="title.markup">
-                    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-                    <xsl:with-param name="verbose" select="$verbose"/>
-                  </xsl:apply-templates>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:with-param>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:when test="$candidate = 's'">
-          <xsl:apply-templates select="." mode="insert.subtitle.markup">
-            <xsl:with-param name="purpose" select="$purpose"/>
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-            <xsl:with-param name="subtitle">
-              <xsl:choose>
-                <xsl:when test="$subtitle != ''">
-                  <xsl:copy-of select="$subtitle"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:apply-templates select="." mode="subtitle.markup">
-                    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-                  </xsl:apply-templates>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:with-param>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:when test="$candidate = 'n'">
-          <xsl:apply-templates select="." mode="insert.label.markup">
-            <xsl:with-param name="purpose" select="$purpose"/>
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-            <xsl:with-param name="label">
-              <xsl:choose>
-                <xsl:when test="$label != ''">
-                  <xsl:copy-of select="$label"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:apply-templates select="." mode="label.markup"/>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:with-param>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:when test="$candidate = 'p'">
-          <xsl:apply-templates select="." mode="insert.pagenumber.markup">
-            <xsl:with-param name="purpose" select="$purpose"/>
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-            <xsl:with-param name="pagenumber">
-              <xsl:choose>
-                <xsl:when test="$pagenumber != ''">
-                  <xsl:copy-of select="$pagenumber"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:apply-templates select="." mode="pagenumber.markup"/>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:with-param>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:when test="$candidate = 'o'">
-          <!-- olink target document title -->
-          <xsl:apply-templates select="." mode="insert.olink.docname.markup">
-            <xsl:with-param name="purpose" select="$purpose"/>
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-            <xsl:with-param name="docname">
-              <xsl:choose>
-                <xsl:when test="$docname != ''">
-                  <xsl:copy-of select="$docname"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:apply-templates select="." mode="olink.docname.markup"/>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:with-param>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:when test="$candidate = 'd'">
-          <xsl:apply-templates select="." mode="insert.direction.markup">
-            <xsl:with-param name="purpose" select="$purpose"/>
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-            <xsl:with-param name="direction">
-              <xsl:choose>
-                <xsl:when test="$referrer">
-                  <xsl:variable name="referent-is-below">
-                    <xsl:for-each select="preceding::xref">
-                      <xsl:if test="generate-id(.) = generate-id($referrer)">1</xsl:if>
-                    </xsl:for-each>
-                  </xsl:variable>
-                  <xsl:choose>
-                    <xsl:when test="$referent-is-below = ''">
-                      <xsl:call-template name="gentext">
-                        <xsl:with-param name="key" select="'above'"/>
-                      </xsl:call-template>
-                    </xsl:when>
-                    <xsl:otherwise>
-                      <xsl:call-template name="gentext">
-                        <xsl:with-param name="key" select="'below'"/>
-                      </xsl:call-template>
-                    </xsl:otherwise>
-                  </xsl:choose>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:message>Attempt to use %d in gentext with no referrer!</xsl:message>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:with-param>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:when test="$candidate = '%' ">
-          <xsl:text>%</xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>%</xsl:text><xsl:value-of select="$candidate"/>
-        </xsl:otherwise>
-      </xsl:choose>
-      <!-- recurse with the rest of the template string -->
-      <xsl:variable name="rest"
-            select="substring($template,
-            string-length(substring-before($template, '%'))+3)"/>
-      <xsl:call-template name="substitute-markup">
-        <xsl:with-param name="template" select="$rest"/>
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-        <xsl:with-param name="title" select="$title"/>
-        <xsl:with-param name="subtitle" select="$subtitle"/>
-        <xsl:with-param name="docname" select="$docname"/>
-        <xsl:with-param name="label" select="$label"/>
-        <xsl:with-param name="pagenumber" select="$pagenumber"/>
-        <xsl:with-param name="purpose" select="$purpose"/>
-        <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-        <xsl:with-param name="referrer" select="$referrer"/>
-        <xsl:with-param name="verbose" select="$verbose"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$template"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template name="make.gentext.template">
-  <xsl:param name="xrefstyle" select="''"/>
-  <xsl:param name="purpose"/>
-  <xsl:param name="referrer"/>
-  <xsl:param name="lang">
-    <xsl:call-template name="l10n.language"/>
-  </xsl:param>
-  <xsl:param name="target.elem" select="local-name(.)"/>
-
-  <!-- parse xrefstyle to get parts -->
-  <xsl:variable name="parts"
-      select="substring-after(normalize-space($xrefstyle), 'select:')"/>
-
-  <xsl:variable name="labeltype">
-    <xsl:choose>
-      <xsl:when test="contains($parts, 'labelnumber')">
-         <xsl:text>labelnumber</xsl:text>
-      </xsl:when>
-      <xsl:when test="contains($parts, 'labelname')">
-         <xsl:text>labelname</xsl:text>
-      </xsl:when>
-      <xsl:when test="contains($parts, 'label')">
-         <xsl:text>label</xsl:text>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="titletype">
-    <xsl:choose>
-      <xsl:when test="contains($parts, 'quotedtitle')">
-         <xsl:text>quotedtitle</xsl:text>
-      </xsl:when>
-      <xsl:when test="contains($parts, 'title')">
-         <xsl:text>title</xsl:text>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="pagetype">
-    <xsl:choose>
-      <xsl:when test="$insert.olink.page.number = 'no' and
-                      local-name($referrer) = 'olink'">
-        <!-- suppress page numbers -->
-      </xsl:when>
-      <xsl:when test="$insert.xref.page.number = 'no' and
-                      local-name($referrer) != 'olink'">
-        <!-- suppress page numbers -->
-      </xsl:when>
-      <xsl:when test="contains($parts, 'nopage')">
-         <xsl:text>nopage</xsl:text>
-      </xsl:when>
-      <xsl:when test="contains($parts, 'pagenumber')">
-         <xsl:text>pagenumber</xsl:text>
-      </xsl:when>
-      <xsl:when test="contains($parts, 'pageabbrev')">
-         <xsl:text>pageabbrev</xsl:text>
-      </xsl:when>
-      <xsl:when test="contains($parts, 'Page')">
-         <xsl:text>Page</xsl:text>
-      </xsl:when>
-      <xsl:when test="contains($parts, 'page')">
-         <xsl:text>page</xsl:text>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="docnametype">
-    <xsl:choose>
-      <xsl:when test="($olink.doctitle = 0 or
-                       $olink.doctitle = 'no') and
-                      local-name($referrer) = 'olink'">
-        <!-- suppress docname -->
-      </xsl:when>
-      <xsl:when test="contains($parts, 'nodocname')">
-         <xsl:text>nodocname</xsl:text>
-      </xsl:when>
-      <xsl:when test="contains($parts, 'docnamelong')">
-         <xsl:text>docnamelong</xsl:text>
-      </xsl:when>
-      <xsl:when test="contains($parts, 'docname')">
-         <xsl:text>docname</xsl:text>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:if test="$labeltype != ''">
-    <xsl:choose>
-      <xsl:when test="$labeltype = 'labelname'">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key">
-            <xsl:choose>
-              <xsl:when test="local-name($referrer) = 'olink'">
-                <xsl:value-of select="$target.elem"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="local-name(.)"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="$labeltype = 'labelnumber'">
-        <xsl:text>%n</xsl:text>
-      </xsl:when>
-      <xsl:when test="$labeltype = 'label'">
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'xref-number'"/>
-          <xsl:with-param name="name">
-            <xsl:choose>
-              <xsl:when test="local-name($referrer) = 'olink'">
-                <xsl:value-of select="$target.elem"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:call-template name="xpath.location"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
-          <xsl:with-param name="purpose" select="$purpose"/>
-          <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-          <xsl:with-param name="referrer" select="$referrer"/>
-        </xsl:call-template>
-      </xsl:when>
-    </xsl:choose>
-
-    <xsl:choose>
-      <xsl:when test="$titletype != ''">
-        <xsl:value-of select="$xref.label-title.separator"/>
-      </xsl:when>
-      <xsl:when test="$pagetype != ''">
-        <xsl:value-of select="$xref.label-page.separator"/>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:if>
-
-  <xsl:if test="$titletype != ''">
-    <xsl:choose>
-      <xsl:when test="$titletype = 'title'">
-        <xsl:text>%t</xsl:text>
-      </xsl:when>
-      <xsl:when test="$titletype = 'quotedtitle'">
-        <xsl:call-template name="gentext.dingbat">
-          <xsl:with-param name="dingbat" select="'startquote'"/>
-        </xsl:call-template>
-        <xsl:text>%t</xsl:text>
-        <xsl:call-template name="gentext.dingbat">
-          <xsl:with-param name="dingbat" select="'endquote'"/>
-        </xsl:call-template>
-      </xsl:when>
-    </xsl:choose>
-
-    <xsl:choose>
-      <xsl:when test="$pagetype != '' and $pagetype != 'nopage'">
-        <xsl:value-of select="$xref.title-page.separator"/>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:if>
-  
-  <!-- special case: use regular xref template if just turning off page -->
-  <xsl:if test="($pagetype = 'nopage' or $docnametype = 'nodocname')
-                  and local-name($referrer) != 'olink'
-                  and $labeltype = '' 
-                  and $titletype = ''">
-    <xsl:apply-templates select="." mode="object.xref.template">
-      <xsl:with-param name="purpose" select="$purpose"/>
-      <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-      <xsl:with-param name="referrer" select="$referrer"/>
-    </xsl:apply-templates>
-  </xsl:if>
-
-  <xsl:if test="$pagetype != ''">
-    <xsl:choose>
-      <xsl:when test="$pagetype = 'page'">
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'xref'"/>
-          <xsl:with-param name="name" select="'page'"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="$pagetype = 'Page'">
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'xref'"/>
-          <xsl:with-param name="name" select="'Page'"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="$pagetype = 'pageabbrev'">
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'xref'"/>
-          <xsl:with-param name="name" select="'pageabbrev'"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="$pagetype = 'pagenumber'">
-        <xsl:text>%p</xsl:text>
-      </xsl:when>
-    </xsl:choose>
-
-  </xsl:if>
-
-  <!-- Add reference to other document title -->
-  <xsl:if test="$docnametype != '' and local-name($referrer) = 'olink'">
-    <!-- Any separator should be in the gentext template -->
-    <xsl:choose>
-      <xsl:when test="$docnametype = 'docnamelong'">
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'xref'"/>
-          <xsl:with-param name="name" select="'docnamelong'"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="$docnametype = 'docname'">
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'xref'"/>
-          <xsl:with-param name="name" select="'docname'"/>
-        </xsl:call-template>
-      </xsl:when>
-    </xsl:choose>
-
-  </xsl:if>
-  
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/insertfile.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/insertfile.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,111 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:xi="http://www.w3.org/2001/XInclude"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:param name="textdata.default.encoding"></xsl:param>
-
-<!-- * This stylesheet makes a copy of a source tree, replacing all -->
-<!-- * instances of the following with corresponding Xinclude instances -->
-<!-- * in the result tree. -->
-<!-- * -->
-<!-- *   <textobject><textdata fileref="foo.txt"> -->
-<!-- *   <imagedata format="linespecific" fileref="foo.txt"> -->
-<!-- *   <inlinegraphic format="linespecific" fileref="foo.txt"> -->
-<!-- * -->
-<!-- * Those become: -->
-<!-- * -->
-<!-- *   <xi:include href="foo.txt" parse="text"/> -->
-<!-- * -->
-<!-- * It also works as expected with entityref in place of fileref, -->
-<!-- * and copies over the value of the <textdata>âencodingâ atrribute (if -->
-<!-- * found). It is basically intended as an alternative to using the -->
-<!-- * DocBook XSLT Java insertfile() extension. -->
-
-<!-- ==================================================================== -->
-
-<xsl:template name="get.external.filename">
-  <xsl:choose>
-    <xsl:when test="@entityref">
-      <xsl:value-of select="unparsed-entity-uri(@entityref)"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="@fileref"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="textobject[child::textdata[@entityref|@fileref]]">
-  <xsl:apply-templates select="textdata"/>
-</xsl:template>
-
-<xsl:template match="textdata[@entityref|@fileref]">
-  <xsl:variable name="filename">
-    <xsl:call-template name="get.external.filename"/>
-  </xsl:variable>
-  <xsl:variable name="encoding">
-    <xsl:choose>
-      <xsl:when test="@encoding">
-        <xsl:value-of select="@encoding"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$textdata.default.encoding"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xi:include href="{$filename}" parse="text" encoding="{$encoding}"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template
-    match="inlinemediaobject
-           [child::imageobject
-           [child::imagedata
-           [@format = 'linespecific' and
-           (@entityref|@fileref)]]]">
-  <xsl:apply-templates select="imageobject/imagedata"/>
-</xsl:template>
-
-<xsl:template match="imagedata
-                     [@format = 'linespecific' and
-                     (@entityref|@fileref)]">
-  <xsl:variable name="filename">
-    <xsl:call-template name="get.external.filename"/>
-  </xsl:variable>
-  <xi:include href="{$filename}" parse="text" encoding="{$textdata.default.encoding}"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="inlinegraphic
-                     [@format = 'linespecific' and
-                     (@entityref|@fileref)]">
-  <xsl:variable name="filename">
-    <xsl:call-template name="get.external.filename"/>
-  </xsl:variable>
-  <xi:include href="{$filename}" parse="text" encoding="{$textdata.default.encoding}"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- * copy everything else into result tree as-is -->
-<xsl:template match="node() | @*">
-  <xsl:copy>
-    <xsl:apply-templates select="@* | node()"/>
-  </xsl:copy>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/it.xml
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/it.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,1241 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="it" english-language-name="Italian">
-
-<!-- * This file is generated automatically. -->
-<!-- * To submit changes to this file upstream (to the DocBook Project) -->
-<!-- * do not submit an edited version of this file. Instead, submit an -->
-<!-- * edited version of the source file at the following location: -->
-<!-- * -->
-<!-- *  https://svn.sourceforge.net/svnroot/docbook/trunk/gentext/locale/it.xml -->
-<!-- * -->
-<!-- * E-mail the edited it.xml source file to: -->
-<!-- * -->
-<!-- *  docbook-developers@lists.sourceforge.net -->
-
-<!-- ******************************************************************** -->
-
-<!-- This file is part of the XSL DocBook Stylesheet distribution. -->
-<!-- See ../README or http://docbook.sf.net/release/xsl/current/ for -->
-<!-- copyright and other information. -->
-
-<!-- ******************************************************************** -->
-<!-- In these files, % with a letter is used for a placeholder: -->
-<!--   %t is the current element's title -->
-<!--   %s is the current element's subtitle (if applicable)-->
-<!--   %n is the current element's number label-->
-<!--   %p is the current element's page number (if applicable)-->
-<!-- ******************************************************************** -->
-
-
-<l:gentext key="Abstract" text="Estratto"/>
-<l:gentext key="abstract" text="Estratto"/>
-<l:gentext key="Answer" text="R:"/>
-<l:gentext key="answer" text="R:"/>
-<l:gentext key="Appendix" text="Appendice"/>
-<l:gentext key="appendix" text="appendice"/>
-<l:gentext key="Article" text="Articolo"/>
-<l:gentext key="article" text="Articolo"/>
-<l:gentext key="Author" text="Autori"/>
-<l:gentext key="Bibliography" text="Bibliografia"/>
-<l:gentext key="bibliography" text="Bibliografia"/>
-<l:gentext key="Book" text="Libro"/>
-<l:gentext key="book" text="Libro"/>
-<l:gentext key="CAUTION" text="ATTENZIONE"/>
-<l:gentext key="Caution" text="Attenzione"/>
-<l:gentext key="caution" text="Attenzione"/>
-<l:gentext key="Chapter" text="Capitolo"/>
-<l:gentext key="chapter" text="capitolo"/>
-<l:gentext key="Colophon" text="Colophon"/>
-<l:gentext key="colophon" text="Colophon"/>
-<l:gentext key="Copyright" text="Copyright"/>
-<l:gentext key="copyright" text="Copyright"/>
-<l:gentext key="Dedication" text="Dedica"/>
-<l:gentext key="dedication" text="Dedica"/>
-<l:gentext key="Edition" text="Edizione"/>
-<l:gentext key="edition" text="Edizione"/>
-<l:gentext key="Editor" text="Editor" lang="en"/>
-<l:gentext key="Equation" text="Equazione"/>
-<l:gentext key="equation" text="Equazione"/>
-<l:gentext key="Example" text="Esempio"/>
-<l:gentext key="example" text="Esempio"/>
-<l:gentext key="Figure" text="Figura"/>
-<l:gentext key="figure" text="Figura"/>
-<l:gentext key="Glossary" text="Glossario"/>
-<l:gentext key="glossary" text="Glossario"/>
-<l:gentext key="GlossSee" text="Vedi"/>
-<l:gentext key="glosssee" text="Vedi"/>
-<l:gentext key="GlossSeeAlso" text="Vedi Anche"/>
-<l:gentext key="glossseealso" text="Vedi Anche"/>
-<l:gentext key="IMPORTANT" text="IMPORTANTE"/>
-<l:gentext key="important" text="Importante"/>
-<l:gentext key="Important" text="Importante"/>
-<l:gentext key="Index" text="Indice"/>
-<l:gentext key="index" text="Indice"/>
-<l:gentext key="ISBN" text="ISBN"/>
-<l:gentext key="isbn" text="ISBN"/>
-<l:gentext key="LegalNotice" text="Note Legali"/>
-<l:gentext key="legalnotice" text="Note Legali"/>
-<l:gentext key="MsgAud" text="Pubblico"/>
-<l:gentext key="msgaud" text="Pubblico"/>
-<l:gentext key="MsgLevel" text="Livello"/>
-<l:gentext key="msglevel" text="Livello"/>
-<l:gentext key="MsgOrig" text="Origine"/>
-<l:gentext key="msgorig" text="Origine"/>
-<l:gentext key="NOTE" text="NOTA"/>
-<l:gentext key="Note" text="Nota"/>
-<l:gentext key="note" text="Nota"/>
-<l:gentext key="Part" text="Parte"/>
-<l:gentext key="part" text="Parte"/>
-<l:gentext key="Preface" text="Prefazione"/>
-<l:gentext key="preface" text="Prefazione"/>
-<l:gentext key="Procedure" text="Procedura"/>
-<l:gentext key="procedure" text="Procedura"/>
-<l:gentext key="ProductionSet" text="Produzione"/>
-<l:gentext key="PubDate" text="Data di pubblicazione"/>
-<l:gentext key="pubdate" text="Data di pubblicazione"/>
-<l:gentext key="Published" text="Pubblicato"/>
-<l:gentext key="published" text="Pubblicato"/>
-<l:gentext key="Publisher" text="Publisher" lang="en"/>
-<l:gentext key="Qandadiv" text="D e R"/>
-<l:gentext key="qandadiv" text="D e R"/>
-<l:gentext key="QandASet" text="Frequently Asked Questions" lang="en"/>
-<l:gentext key="Question" text="D:"/>
-<l:gentext key="question" text="D:"/>
-<l:gentext key="RefEntry" text=""/>
-<l:gentext key="refentry" text=""/>
-<l:gentext key="Reference" text="Riferimento"/>
-<l:gentext key="reference" text="Riferimento"/>
-<l:gentext key="References" text="Riferimenti"/>
-<l:gentext key="RefName" text="Nome"/>
-<l:gentext key="refname" text="Nome"/>
-<l:gentext key="RefSection" text=""/>
-<l:gentext key="refsection" text=""/>
-<l:gentext key="RefSynopsisDiv" text="Sinossi"/>
-<l:gentext key="refsynopsisdiv" text="Sinossi"/>
-<l:gentext key="RevHistory" text="Diario delle Revisioni"/>
-<l:gentext key="revhistory" text="Diario delle Revisioni"/>
-<l:gentext key="revision" text="Revisione"/>
-<l:gentext key="Revision" text="Revisione"/>
-<l:gentext key="sect1" text="Sezione"/>
-<l:gentext key="sect2" text="Sezione"/>
-<l:gentext key="sect3" text="Sezione"/>
-<l:gentext key="sect4" text="Sezione"/>
-<l:gentext key="sect5" text="Sezione"/>
-<l:gentext key="section" text="Sezione"/>
-<l:gentext key="Section" text="Sezione"/>
-<l:gentext key="see" text="Vd."/>
-<l:gentext key="See" text="Vd."/>
-<l:gentext key="seealso" text="Vd. Anche"/>
-<l:gentext key="Seealso" text="Vd. anche"/>
-<l:gentext key="SeeAlso" text="Vd. Anche"/>
-<l:gentext key="set" text="Raccolta"/>
-<l:gentext key="Set" text="Raccolta"/>
-<l:gentext key="setindex" text="Indice Raccolta"/>
-<l:gentext key="SetIndex" text="Indice Raccolta"/>
-<l:gentext key="Sidebar" text=""/>
-<l:gentext key="sidebar" text="nota a margine"/>
-<l:gentext key="step" text="passo"/>
-<l:gentext key="Step" text="Passo"/>
-<l:gentext key="table" text="Tabella"/>
-<l:gentext key="Table" text="Tabella"/>
-<l:gentext key="task" text="Task" lang="en"/>
-<l:gentext key="Task" text="Task" lang="en"/>
-<l:gentext key="tip" text="Suggerimento"/>
-<l:gentext key="TIP" text="SUGGERIMENTO"/>
-<l:gentext key="Tip" text="Suggerimento"/>
-<l:gentext key="Warning" text="Avvertimento"/>
-<l:gentext key="warning" text="avvertimento"/>
-<l:gentext key="WARNING" text="AVVERTIMENTO"/>
-<l:gentext key="and" text="e"/>
-<l:gentext key="by" text="di"/>
-<l:gentext key="Edited" text="A cura"/>
-<l:gentext key="edited" text="A cura"/>
-<l:gentext key="Editedby" text="A cura di"/>
-<l:gentext key="editedby" text="A cura di"/>
-<l:gentext key="in" text="in"/>
-<l:gentext key="lastlistcomma" text=","/>
-<l:gentext key="listcomma" text=","/>
-<l:gentext key="nonexistantelement" text="elemento non esistente"/>
-<l:gentext key="notes" text="Note"/>
-<l:gentext key="Notes" text="Note"/>
-<l:gentext key="Pgs" text="pp."/>
-<l:gentext key="pgs" text="pp."/>
-<l:gentext key="Revisedby" text="Revisionato da: "/>
-<l:gentext key="revisedby" text="Revisionato da: "/>
-<l:gentext key="TableNotes" text="Note"/>
-<l:gentext key="tablenotes" text="Note"/>
-<l:gentext key="TableofContents" text="Sommario"/>
-<l:gentext key="tableofcontents" text="Sommario"/>
-<l:gentext key="unexpectedelementname" text="Nome elemento inaspettato"/>
-<l:gentext key="unsupported" text="non supportato"/>
-<l:gentext key="xrefto" text="riferimento a"/>
-<l:gentext key="Authors" text="Autori"/>
-<l:gentext key="copyeditor" text="Copy Editor" lang="en"/>
-<l:gentext key="graphicdesigner" text="Designer Grafico"/>
-<l:gentext key="productioneditor" text="Production Editor" lang="en"/>
-<l:gentext key="technicaleditor" text="Technical Editor" lang="en"/>
-<l:gentext key="translator" text="Traduttore"/>
-<l:gentext key="listofequations" text="Lista delle Equazioni"/>
-<l:gentext key="ListofEquations" text="Lista delle Equazioni"/>
-<l:gentext key="ListofExamples" text="Lista degli Esempi"/>
-<l:gentext key="listofexamples" text="Lista degli Esempi"/>
-<l:gentext key="ListofFigures" text="Lista delle Figure"/>
-<l:gentext key="listoffigures" text="Lista delle Figure"/>
-<l:gentext key="ListofProcedures" text="Lista delle procedure"/>
-<l:gentext key="listofprocedures" text="Lista delle procedure"/>
-<l:gentext key="listoftables" text="Lista delle Tabelle"/>
-<l:gentext key="ListofTables" text="Lista delle Tabelle"/>
-<l:gentext key="ListofUnknown" text="Lista degli Sconosciuti"/>
-<l:gentext key="listofunknown" text="Lista degli Sconosciuti"/>
-<l:gentext key="nav-home" text="Partenza"/>
-<l:gentext key="nav-next" text="Avanti"/>
-<l:gentext key="nav-next-sibling" text="Salta Avanti"/>
-<l:gentext key="nav-prev" text="Indietro"/>
-<l:gentext key="nav-prev-sibling" text="Salta Indietro"/>
-<l:gentext key="nav-up" text="Risali"/>
-<l:gentext key="nav-toc" text="ToC" lang="en"/>
-<l:gentext key="Draft" text="Bozza"/>
-<l:gentext key="above" text="sopra"/>
-<l:gentext key="below" text="sotto"/>
-<l:gentext key="sectioncalled" text="la sezione chiamata"/>
-<l:gentext key="index symbols" text="Simboli"/>
-<l:gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyz"/>
-<l:gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZ"/>
-<l:gentext key="normalize.sort.input" text="AaÃÃ ÃÃ¡ÃÃ¢ÃÃ£ÃÃ€Ã
-Ã¥ÄÄÄÄÄÄ
-ÇÇÇÇÇ Ç¡ÇºÇ»ÈÈÈÈÈŠÈ§ážážáºáº áº¡áº¢áº£áº€áº¥áºŠáº§áºšáº©áºªáº«áº¬áº­áº®áº¯áº°áº±áº²áº³áºŽáºµáº¶áº·BbÆÆÉÆÆážážážáž
-ážážCcÃÃ§ÄÄÄÄÄÄÄÄÆÆÉážážDdÄÄÄÄÆÉÆÆÇ
-Ç²È¡ÉážážážážážážážážážážEeÃÃšÃÃ©ÃÃªÃÃ«ÄÄÄÄÄÄÄÄÄÄÈÈ
-ÈÈÈšÈ©ážážážážážážážážážážáºžáº¹áººáº»áºŒáºœáºŸáº¿á»á»á»á»á»á»
-á»á»FfÆÆážážGgÄÄÄÄÄ Ä¡Ä¢Ä£ÆÉ Ç€Ç¥ÇŠÇ§ÇŽÇµáž áž¡HhÄ€Ä¥ÄŠÄ§ÈÈÉŠáž¢áž£áž€áž¥ážŠáž§ážšáž©ážªáž«áºIiÃÃ¬ÃÃ­ÃÃ®ÃÃ¯ÄšÄ©ÄªÄ«Ä¬Ä­Ä®Ä¯Ä°ÆÉšÇÇÈÈÈÈáž¬áž­áž®áž¯á»á»á»á»JjÄŽÄµÇ°ÊKkÄ¶Ä·ÆÆÇšÇ©áž°áž±áž²áž³ážŽážµLlÄ¹ÄºÄ»ÄŒÄœÄŸÄ¿ÅÅÅÆÇÈŽÉ«É¬É­áž¶áž·ážžáž¹ážºáž»ážŒážœMmÉ±ážŸáž¿á¹á¹á¹á¹NnÃÃ±ÅÅÅ
-ÅÅÅÆÉ²ÆÈ ÇÇžÇ¹ÈµÉ³á¹á¹
-á¹á¹á¹á¹á¹á¹OoÃÃ²ÃÃ³ÃÃŽÃÃµÃÃ¶ÃÃžÅÅÅÅÅÅÆÆ Æ¡ÇÇÇªÇ«Ç¬Ç­ÇŸÇ¿ÈÈÈÈÈªÈ«È¬È­È®È¯È°È±á¹á¹á¹á¹á¹á¹á¹á¹á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á» á»¡á»¢á»£PpÆ€Æ¥á¹á¹á¹á¹QqÊ RrÅÅÅÅÅÅÈÈÈÈÉŒÉœÉŸá¹á¹á¹á¹á¹á¹á¹á¹SsÅÅÅÅÅÅÅ Å¡ÈÈÊá¹ á¹¡á¹¢á¹£á¹€á¹¥á¹Šá¹§á¹šá¹©TtÅ¢Å£Å€Å¥ÅŠÅ§Æ«Æ¬Æ­Æ®ÊÈÈÈ¶á¹ªá¹«á¹¬á¹­á¹®á¹¯á¹°á¹±áºUuÃÃ¹ÃÃºÃÃ»ÃÃŒÅšÅ©ÅªÅ«Å¬Å­Å®Å¯Å°Å±Å²Å³Æ¯Æ°ÇÇÇÇÇÇÇÇÇÇÈÈÈÈá¹²á¹³á¹Žá¹µá¹¶á¹·á¹žá¹¹á¹ºá¹»á»€á»¥á»Šá»§á»šá»©á»ªá»«á»¬á»­á»®á»¯á»°á»±VvÆ²Êá¹Œá¹œá¹Ÿá¹¿WwÅŽÅµáºáºáºáºáºáº
-áºáºáºáºáºXxáºáºáºáºYyÃÃœÃ¿ÅžÅ¶Å·Æ³ÆŽÈ²È³áºáºáºá»²á»³á»Žá»µá»¶á»·á»žá»¹ZzÅ¹ÅºÅ»ÅŒÅœÅŸÆµÆ¶È€È¥ÊÊáºáºáºáºáºáºáº" lang="en"/>
-<l:gentext key="normalize.sort.output" text="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ" lang="en"/>
-<l:dingbat key="startquote" text="Â«"/>
-<l:dingbat key="endquote" text="Â»"/>
-<l:dingbat key="nestedstartquote" text="â"/>
-<l:dingbat key="nestedendquote" text="â"/>
-<l:dingbat key="singlestartquote" text="â" lang="en"/>
-<l:dingbat key="singleendquote" text="â" lang="en"/>
-<l:dingbat key="bullet" text="â¢"/>
-<l:gentext key="hyphenation-character" text="-" lang="en"/>
-<l:gentext key="hyphenation-push-character-count" text="2" lang="en"/>
-<l:gentext key="hyphenation-remain-character-count" text="2" lang="en"/>
-<l:context name="styles"><l:template name="person-name" text="first-last"/>
-</l:context>
-<l:context name="title"><l:template name="abstract" text="%t"/>
-<l:template name="answer" text="%t"/>
-<l:template name="appendix" text="AppendiceÂ %n.Â %t"/>
-<l:template name="article" text="%t"/>
-<l:template name="authorblurb" text="%t"/>
-<l:template name="bibliodiv" text="%t"/>
-<l:template name="biblioentry" text="%t"/>
-<l:template name="bibliography" text="%t"/>
-<l:template name="bibliolist" text="%t" lang="en"/>
-<l:template name="bibliomixed" text="%t"/>
-<l:template name="bibliomset" text="%t"/>
-<l:template name="biblioset" text="%t"/>
-<l:template name="blockquote" text="%t"/>
-<l:template name="book" text="%t"/>
-<l:template name="calloutlist" text="%t"/>
-<l:template name="caution" text="%t"/>
-<l:template name="chapter" text="CapitoloÂ %n.Â %t"/>
-<l:template name="colophon" text="%t"/>
-<l:template name="dedication" text="%t"/>
-<l:template name="equation" text="EquazioneÂ %n.Â %t"/>
-<l:template name="example" text="EsempioÂ %n.Â %t"/>
-<l:template name="figure" text="FiguraÂ %n.Â %t"/>
-<l:template name="foil" text="%t" lang="en"/>
-<l:template name="foilgroup" text="%t" lang="en"/>
-<l:template name="formalpara" text="%t"/>
-<l:template name="glossary" text="%t"/>
-<l:template name="glossdiv" text="%t"/>
-<l:template name="glosslist" text="%t" lang="en"/>
-<l:template name="glossentry" text="%t" lang="en"/>
-<l:template name="important" text="%t"/>
-<l:template name="index" text="%t"/>
-<l:template name="indexdiv" text="%t"/>
-<l:template name="itemizedlist" text="%t"/>
-<l:template name="legalnotice" text="%t"/>
-<l:template name="listitem" text=""/>
-<l:template name="lot" text="%t"/>
-<l:template name="msg" text="%t"/>
-<l:template name="msgexplan" text="%t"/>
-<l:template name="msgmain" text="%t"/>
-<l:template name="msgrel" text="%t"/>
-<l:template name="msgset" text="%t"/>
-<l:template name="msgsub" text="%t"/>
-<l:template name="note" text="%t"/>
-<l:template name="orderedlist" text="%t"/>
-<l:template name="part" text="ParteÂ %n.Â %t"/>
-<l:template name="partintro" text="%t"/>
-<l:template name="preface" text="%t"/>
-<l:template name="procedure" text="%t"/>
-<l:template name="procedure.formal" text="ProceduraÂ %n.Â %t"/>
-<l:template name="productionset" text="%t"/>
-<l:template name="productionset.formal" text="ProduzioneÂ %n"/>
-<l:template name="qandadiv" text="%t"/>
-<l:template name="qandaentry" text="%t"/>
-<l:template name="qandaset" text="%t"/>
-<l:template name="question" text="%t"/>
-<l:template name="refentry" text="%t"/>
-<l:template name="reference" text="%t"/>
-<l:template name="refsection" text="%t"/>
-<l:template name="refsect1" text="%t"/>
-<l:template name="refsect2" text="%t"/>
-<l:template name="refsect3" text="%t"/>
-<l:template name="refsynopsisdiv" text="%t"/>
-<l:template name="refsynopsisdivinfo" text="%t"/>
-<l:template name="segmentedlist" text="%t"/>
-<l:template name="set" text="%t"/>
-<l:template name="setindex" text="%t"/>
-<l:template name="sidebar" text="%t"/>
-<l:template name="step" text="%t"/>
-<l:template name="table" text="TabellaÂ %n.Â %t"/>
-<l:template name="task" text="%t" lang="en"/>
-<l:template name="tasksummary" text="%t" lang="en"/>
-<l:template name="taskprerequisites" text="%t" lang="en"/>
-<l:template name="taskrelated" text="%t" lang="en"/>
-<l:template name="tip" text="%t"/>
-<l:template name="toc" text="%t"/>
-<l:template name="variablelist" text="%t"/>
-<l:template name="varlistentry" text=""/>
-<l:template name="warning" text="%t"/>
-</l:context>
-<l:context name="title-unnumbered"><l:template name="appendix" text="%t"/>
-<l:template name="article/appendix" text="%t" lang="en"/>
-<l:template name="bridgehead" text="%t"/>
-<l:template name="chapter" text="%t"/>
-<l:template name="sect1" text="%t"/>
-<l:template name="sect2" text="%t"/>
-<l:template name="sect3" text="%t"/>
-<l:template name="sect4" text="%t"/>
-<l:template name="sect5" text="%t"/>
-<l:template name="section" text="%t"/>
-<l:template name="simplesect" text="%t"/>
-<l:template name="part" text="%t" lang="en"/>
-</l:context>
-<l:context name="title-numbered"><l:template name="appendix" text="AppendiceÂ %n.Â %t"/>
-<l:template name="article/appendix" text="%n.Â %t" lang="en"/>
-<l:template name="bridgehead" text="%n.Â %t"/>
-<l:template name="chapter" text="CapitoloÂ %n.Â %t"/>
-<l:template name="part" text="ParteÂ %n.Â %t"/>
-<l:template name="sect1" text="%n.Â %t"/>
-<l:template name="sect2" text="%n.Â %t"/>
-<l:template name="sect3" text="%n.Â %t"/>
-<l:template name="sect4" text="%n.Â %t"/>
-<l:template name="sect5" text="%n.Â %t"/>
-<l:template name="section" text="%n.Â %t"/>
-<l:template name="simplesect" text="%t"/>
-</l:context>
-<l:context name="subtitle"><l:template name="appendix" text="%s"/>
-<l:template name="article" text="%s"/>
-<l:template name="bibliodiv" text="%s"/>
-<l:template name="biblioentry" text="%s"/>
-<l:template name="bibliography" text="%s"/>
-<l:template name="bibliomixed" text="%s"/>
-<l:template name="bibliomset" text="%s"/>
-<l:template name="biblioset" text="%s"/>
-<l:template name="book" text="%s"/>
-<l:template name="chapter" text="%s"/>
-<l:template name="colophon" text="%s"/>
-<l:template name="dedication" text="%s"/>
-<l:template name="glossary" text="%s"/>
-<l:template name="glossdiv" text="%s"/>
-<l:template name="index" text="%s"/>
-<l:template name="indexdiv" text="%s"/>
-<l:template name="lot" text="%s"/>
-<l:template name="part" text="%s"/>
-<l:template name="partintro" text="%s"/>
-<l:template name="preface" text="%s"/>
-<l:template name="refentry" text="%s"/>
-<l:template name="reference" text="%s"/>
-<l:template name="refsection" text="%s"/>
-<l:template name="refsect1" text="%s"/>
-<l:template name="refsect2" text="%s"/>
-<l:template name="refsect3" text="%s"/>
-<l:template name="refsynopsisdiv" text="%s"/>
-<l:template name="sect1" text="%s"/>
-<l:template name="sect2" text="%s"/>
-<l:template name="sect3" text="%s"/>
-<l:template name="sect4" text="%s"/>
-<l:template name="sect5" text="%s"/>
-<l:template name="section" text="%s"/>
-<l:template name="set" text="%s"/>
-<l:template name="setindex" text="%s"/>
-<l:template name="sidebar" text="%s"/>
-<l:template name="simplesect" text="%s"/>
-<l:template name="toc" text="%s"/>
-</l:context>
-<l:context name="xref"><l:template name="abstract" text="%t"/>
-<l:template name="answer" text="R:Â %n"/>
-<l:template name="appendix" text="%t"/>
-<l:template name="article" text="%t"/>
-<l:template name="authorblurb" text="%t"/>
-<l:template name="bibliodiv" text="%t"/>
-<l:template name="bibliography" text="%t"/>
-<l:template name="bibliomset" text="%t"/>
-<l:template name="biblioset" text="%t"/>
-<l:template name="blockquote" text="%t"/>
-<l:template name="book" text="%t"/>
-<l:template name="calloutlist" text="%t"/>
-<l:template name="caution" text="%t"/>
-<l:template name="chapter" text="%t"/>
-<l:template name="colophon" text="%t"/>
-<l:template name="constraintdef" text="%t"/>
-<l:template name="dedication" text="%t"/>
-<l:template name="equation" text="%t"/>
-<l:template name="example" text="%t"/>
-<l:template name="figure" text="%t"/>
-<l:template name="foil" text="%t" lang="en"/>
-<l:template name="foilgroup" text="%t" lang="en"/>
-<l:template name="formalpara" text="%t"/>
-<l:template name="glossary" text="%t"/>
-<l:template name="glossdiv" text="%t"/>
-<l:template name="important" text="%t"/>
-<l:template name="index" text="%t"/>
-<l:template name="indexdiv" text="%t"/>
-<l:template name="itemizedlist" text="%t"/>
-<l:template name="legalnotice" text="%t"/>
-<l:template name="listitem" text="%n"/>
-<l:template name="lot" text="%t"/>
-<l:template name="msg" text="%t"/>
-<l:template name="msgexplan" text="%t"/>
-<l:template name="msgmain" text="%t"/>
-<l:template name="msgrel" text="%t"/>
-<l:template name="msgset" text="%t"/>
-<l:template name="msgsub" text="%t"/>
-<l:template name="note" text="%t"/>
-<l:template name="orderedlist" text="%t"/>
-<l:template name="part" text="%t"/>
-<l:template name="partintro" text="%t"/>
-<l:template name="preface" text="%t"/>
-<l:template name="procedure" text="%t"/>
-<l:template name="productionset" text="%t"/>
-<l:template name="qandadiv" text="%t"/>
-<l:template name="qandaentry" text="D:Â %n"/>
-<l:template name="qandaset" text="%t"/>
-<l:template name="question" text="D:Â %n"/>
-<l:template name="reference" text="%t"/>
-<l:template name="refsynopsisdiv" text="%t"/>
-<l:template name="segmentedlist" text="%t"/>
-<l:template name="set" text="%t"/>
-<l:template name="setindex" text="%t"/>
-<l:template name="sidebar" text="%t"/>
-<l:template name="table" text="%t"/>
-<l:template name="task" text="%t" lang="en"/>
-<l:template name="tip" text="%t"/>
-<l:template name="toc" text="%t"/>
-<l:template name="variablelist" text="%t"/>
-<l:template name="varlistentry" text="%n"/>
-<l:template name="warning" text="%t"/>
-<l:template name="olink.document.citation" text=" in %o" lang="en"/>
-<l:template name="olink.page.citation" text=" (page %p)" lang="en"/>
-<l:template name="page.citation" text=" [%p]"/>
-<l:template name="page" text="(page %p)" lang="en"/>
-<l:template name="docname" text=" in %o" lang="en"/>
-<l:template name="docnamelong" text=" in the document titled %o" lang="en"/>
-<l:template name="pageabbrev" text="(p. %p)" lang="en"/>
-<l:template name="Page" text="Page %p" lang="en"/>
-<l:template name="bridgehead" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="refsection" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="refsect1" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="refsect2" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="refsect3" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="sect1" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="sect2" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="sect3" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="sect4" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="sect5" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="section" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="simplesect" text="la sezione chiamata Â«%tÂ»"/>
-</l:context>
-<l:context name="xref-number"><l:template name="answer" text="R:Â %n"/>
-<l:template name="appendix" text="AppendiceÂ %n"/>
-<l:template name="bridgehead" text="SezioneÂ %n"/>
-<l:template name="chapter" text="CapitoloÂ %n"/>
-<l:template name="equation" text="EquazioneÂ %n"/>
-<l:template name="example" text="EsempioÂ %n"/>
-<l:template name="figure" text="FiguraÂ %n"/>
-<l:template name="part" text="ParteÂ %n"/>
-<l:template name="procedure" text="ProceduraÂ %n"/>
-<l:template name="productionset" text="ProduzioneÂ %n"/>
-<l:template name="qandadiv" text="D e RÂ %n"/>
-<l:template name="qandaentry" text="D:Â %n"/>
-<l:template name="question" text="D:Â %n"/>
-<l:template name="sect1" text="SezioneÂ %n"/>
-<l:template name="sect2" text="SezioneÂ %n"/>
-<l:template name="sect3" text="SezioneÂ %n"/>
-<l:template name="sect4" text="SezioneÂ %n"/>
-<l:template name="sect5" text="SezioneÂ %n"/>
-<l:template name="section" text="SezioneÂ %n"/>
-<l:template name="table" text="TabellaÂ %n"/>
-</l:context>
-<l:context name="xref-number-and-title"><l:template name="appendix" text="AppendiceÂ %n, %t"/>
-<l:template name="bridgehead" text="SezioneÂ %n, Â«%tÂ»"/>
-<l:template name="chapter" text="CapitoloÂ %n, %t"/>
-<l:template name="equation" text="EquazioneÂ %n, Â«%tÂ»"/>
-<l:template name="example" text="EsempioÂ %n, Â«%tÂ»"/>
-<l:template name="figure" text="FiguraÂ %n, Â«%tÂ»"/>
-<l:template name="part" text="ParteÂ %n, Â«%tÂ»"/>
-<l:template name="procedure" text="ProceduraÂ %n, Â«%tÂ»"/>
-<l:template name="productionset" text="ProduzioneÂ %n, Â«%tÂ»"/>
-<l:template name="qandadiv" text="D e RÂ %n, Â«%tÂ»"/>
-<l:template name="refsect1" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="refsect2" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="refsect3" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="refsection" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="sect1" text="SezioneÂ %n, Â«%tÂ»"/>
-<l:template name="sect2" text="SezioneÂ %n, Â«%tÂ»"/>
-<l:template name="sect3" text="SezioneÂ %n, Â«%tÂ»"/>
-<l:template name="sect4" text="SezioneÂ %n, Â«%tÂ»"/>
-<l:template name="sect5" text="SezioneÂ %n, Â«%tÂ»"/>
-<l:template name="section" text="SezioneÂ %n, Â«%tÂ»"/>
-<l:template name="simplesect" text="la sezione chiamata Â«%tÂ»"/>
-<l:template name="table" text="TabellaÂ %n, Â«%tÂ»"/>
-</l:context>
-<l:context name="authorgroup"><l:template name="sep" text=", "/>
-<l:template name="sep2" text=" e "/>
-<l:template name="seplast" text=", e "/>
-</l:context>
-<l:context name="glossary"><l:template name="see" text="Vedi %t"/>
-<l:template name="seealso" text="Vedi Anche %t"/>
-</l:context>
-<l:context name="msgset"><l:template name="MsgAud" text="Pubblico: "/>
-<l:template name="MsgLevel" text="Livello: "/>
-<l:template name="MsgOrig" text="Origine: "/>
-</l:context>
-<l:context name="datetime"><l:template name="format" text="d/m/Y"/>
-</l:context>
-<l:context name="termdef"><l:template name="prefix" text="[Definition: " lang="en"/>
-<l:template name="suffix" text="]" lang="en"/>
-</l:context>
-<l:context name="datetime-full"><l:template name="January" text="gennaio"/>
-<l:template name="February" text="febbraio"/>
-<l:template name="March" text="marzo"/>
-<l:template name="April" text="aprile"/>
-<l:template name="May" text="maggio"/>
-<l:template name="June" text="giugno"/>
-<l:template name="July" text="luglio"/>
-<l:template name="August" text="agosto"/>
-<l:template name="September" text="settembre"/>
-<l:template name="October" text="ottobre"/>
-<l:template name="November" text="novembre"/>
-<l:template name="December" text="dicembre"/>
-<l:template name="Monday" text="lunedÃ¬"/>
-<l:template name="Tuesday" text="martedÃ¬"/>
-<l:template name="Wednesday" text="mercoledÃ¬"/>
-<l:template name="Thursday" text="giovedÃ¬"/>
-<l:template name="Friday" text="venerdÃ¬"/>
-<l:template name="Saturday" text="sabato"/>
-<l:template name="Sunday" text="domenica"/>
-</l:context>
-<l:context name="datetime-abbrev"><l:template name="Jan" text="gen"/>
-<l:template name="Feb" text="feb"/>
-<l:template name="Mar" text="mar"/>
-<l:template name="Apr" text="apr"/>
-<l:template name="May" text="mag"/>
-<l:template name="Jun" text="giu"/>
-<l:template name="Jul" text="lug"/>
-<l:template name="Aug" text="ago"/>
-<l:template name="Sep" text="set"/>
-<l:template name="Oct" text="ott"/>
-<l:template name="Nov" text="nov"/>
-<l:template name="Dec" text="dic"/>
-<l:template name="Mon" text="lun"/>
-<l:template name="Tue" text="mar"/>
-<l:template name="Wed" text="mer"/>
-<l:template name="Thu" text="gio"/>
-<l:template name="Fri" text="ven"/>
-<l:template name="Sat" text="sab"/>
-<l:template name="Sun" text="dom"/>
-</l:context>
-<l:context name="htmlhelp"><l:template name="langcode" text="0x0410 Italian"/>
-</l:context>
-<l:context name="index"><l:template name="term-separator" text=", " lang="en"/>
-<l:template name="number-separator" text=", " lang="en"/>
-<l:template name="range-separator" text="-" lang="en"/>
-</l:context>
-<l:context name="iso690"><l:template name="lastfirst.sep" text=", " lang="en"/>
-<l:template name="alt.person.two.sep" text=" â " lang="en"/>
-<l:template name="alt.person.last.sep" text=" â " lang="en"/>
-<l:template name="alt.person.more.sep" text=" â " lang="en"/>
-<l:template name="primary.editor" text=" (ed.)" lang="en"/>
-<l:template name="primary.many" text=", et al." lang="en"/>
-<l:template name="primary.sep" text=". " lang="en"/>
-<l:template name="submaintitle.sep" text=": " lang="en"/>
-<l:template name="title.sep" text=". " lang="en"/>
-<l:template name="othertitle.sep" text=", " lang="en"/>
-<l:template name="medium1" text=" [" lang="en"/>
-<l:template name="medium2" text="]" lang="en"/>
-<l:template name="secondary.person.sep" text="; " lang="en"/>
-<l:template name="secondary.sep" text=". " lang="en"/>
-<l:template name="respons.sep" text=". " lang="en"/>
-<l:template name="edition.sep" text=". " lang="en"/>
-<l:template name="edition.serial.sep" text=", " lang="en"/>
-<l:template name="issuing.range" text="-" lang="en"/>
-<l:template name="issuing.div" text=", " lang="en"/>
-<l:template name="issuing.sep" text=". " lang="en"/>
-<l:template name="partnr.sep" text=". " lang="en"/>
-<l:template name="placepubl.sep" text=": " lang="en"/>
-<l:template name="publyear.sep" text=", " lang="en"/>
-<l:template name="pubinfo.sep" text=". " lang="en"/>
-<l:template name="spec.pubinfo.sep" text=", " lang="en"/>
-<l:template name="upd.sep" text=", " lang="en"/>
-<l:template name="datecit1" text=" [cited " lang="en"/>
-<l:template name="datecit2" text="]" lang="en"/>
-<l:template name="extent.sep" text=". " lang="en"/>
-<l:template name="locs.sep" text=", " lang="en"/>
-<l:template name="location.sep" text=". " lang="en"/>
-<l:template name="serie.sep" text=". " lang="en"/>
-<l:template name="notice.sep" text=". " lang="en"/>
-<l:template name="access" text="Available " lang="en"/>
-<l:template name="acctoo" text="Also available " lang="en"/>
-<l:template name="onwww" text="from World Wide Web" lang="en"/>
-<l:template name="oninet" text="from Internet" lang="en"/>
-<l:template name="access.end" text=": " lang="en"/>
-<l:template name="link1" text="&lt;" lang="en"/>
-<l:template name="link2" text="&gt;" lang="en"/>
-<l:template name="access.sep" text=". " lang="en"/>
-<l:template name="isbn" text="ISBN " lang="en"/>
-<l:template name="issn" text="ISSN " lang="en"/>
-<l:template name="stdnum.sep" text=". " lang="en"/>
-<l:template name="patcountry.sep" text=". " lang="en"/>
-<l:template name="pattype.sep" text=", " lang="en"/>
-<l:template name="patnum.sep" text=". " lang="en"/>
-<l:template name="patdate.sep" text=". " lang="en"/>
-</l:context><l:letters lang="en"><l:l i="-1"/>
-<l:l i="0">Symbols</l:l>
-<l:l i="10">A</l:l>
-<l:l i="10">a</l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã </l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã¡</l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã¢</l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã£</l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã€</l:l>
-<l:l i="10">Ã
-</l:l>
-<l:l i="10">Ã¥</l:l>
-<l:l i="10">Ä</l:l>
-<l:l i="10">Ä</l:l>
-<l:l i="10">Ä</l:l>
-<l:l i="10">Ä</l:l>
-<l:l i="10">Ä</l:l>
-<l:l i="10">Ä
-</l:l>
-<l:l i="10">Ç</l:l>
-<l:l i="10">Ç</l:l>
-<l:l i="10">Ç</l:l>
-<l:l i="10">Ç</l:l>
-<l:l i="10">Ç </l:l>
-<l:l i="10">Ç¡</l:l>
-<l:l i="10">Çº</l:l>
-<l:l i="10">Ç»</l:l>
-<l:l i="10">È</l:l>
-<l:l i="10">È</l:l>
-<l:l i="10">È</l:l>
-<l:l i="10">È</l:l>
-<l:l i="10">ÈŠ</l:l>
-<l:l i="10">È§</l:l>
-<l:l i="10">áž</l:l>
-<l:l i="10">áž</l:l>
-<l:l i="10">áº</l:l>
-<l:l i="10">áº </l:l>
-<l:l i="10">áº¡</l:l>
-<l:l i="10">áº¢</l:l>
-<l:l i="10">áº£</l:l>
-<l:l i="10">áº€</l:l>
-<l:l i="10">áº¥</l:l>
-<l:l i="10">áºŠ</l:l>
-<l:l i="10">áº§</l:l>
-<l:l i="10">áºš</l:l>
-<l:l i="10">áº©</l:l>
-<l:l i="10">áºª</l:l>
-<l:l i="10">áº«</l:l>
-<l:l i="10">áº¬</l:l>
-<l:l i="10">áº­</l:l>
-<l:l i="10">áº®</l:l>
-<l:l i="10">áº¯</l:l>
-<l:l i="10">áº°</l:l>
-<l:l i="10">áº±</l:l>
-<l:l i="10">áº²</l:l>
-<l:l i="10">áº³</l:l>
-<l:l i="10">áºŽ</l:l>
-<l:l i="10">áºµ</l:l>
-<l:l i="10">áº¶</l:l>
-<l:l i="10">áº·</l:l>
-<l:l i="20">B</l:l>
-<l:l i="20">b</l:l>
-<l:l i="20">Æ</l:l>
-<l:l i="20">Æ</l:l>
-<l:l i="20">É</l:l>
-<l:l i="20">Æ</l:l>
-<l:l i="20">Æ</l:l>
-<l:l i="20">áž</l:l>
-<l:l i="20">áž</l:l>
-<l:l i="20">áž</l:l>
-<l:l i="20">áž
-</l:l>
-<l:l i="20">áž</l:l>
-<l:l i="20">áž</l:l>
-<l:l i="30">C</l:l>
-<l:l i="30">c</l:l>
-<l:l i="30">Ã</l:l>
-<l:l i="30">Ã§</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Æ</l:l>
-<l:l i="30">Æ</l:l>
-<l:l i="30">É</l:l>
-<l:l i="30">áž</l:l>
-<l:l i="30">áž</l:l>
-<l:l i="40">D</l:l>
-<l:l i="40">d</l:l>
-<l:l i="40">Ä</l:l>
-<l:l i="40">Ä</l:l>
-<l:l i="40">Ä</l:l>
-<l:l i="40">Ä</l:l>
-<l:l i="40">Æ</l:l>
-<l:l i="40">É</l:l>
-<l:l i="40">Æ</l:l>
-<l:l i="40">Æ</l:l>
-<l:l i="40">Ç
-</l:l>
-<l:l i="40">Ç²</l:l>
-<l:l i="40">È¡</l:l>
-<l:l i="40">É</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="50">E</l:l>
-<l:l i="50">e</l:l>
-<l:l i="50">Ã</l:l>
-<l:l i="50">Ãš</l:l>
-<l:l i="50">Ã</l:l>
-<l:l i="50">Ã©</l:l>
-<l:l i="50">Ã</l:l>
-<l:l i="50">Ãª</l:l>
-<l:l i="50">Ã</l:l>
-<l:l i="50">Ã«</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">È</l:l>
-<l:l i="50">È
-</l:l>
-<l:l i="50">È</l:l>
-<l:l i="50">È</l:l>
-<l:l i="50">Èš</l:l>
-<l:l i="50">È©</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áºž</l:l>
-<l:l i="50">áº¹</l:l>
-<l:l i="50">áºº</l:l>
-<l:l i="50">áº»</l:l>
-<l:l i="50">áºŒ</l:l>
-<l:l i="50">áºœ</l:l>
-<l:l i="50">áºŸ</l:l>
-<l:l i="50">áº¿</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»
-</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="60">F</l:l>
-<l:l i="60">f</l:l>
-<l:l i="60">Æ</l:l>
-<l:l i="60">Æ</l:l>
-<l:l i="60">áž</l:l>
-<l:l i="60">áž</l:l>
-<l:l i="70">G</l:l>
-<l:l i="70">g</l:l>
-<l:l i="70">Ä</l:l>
-<l:l i="70">Ä</l:l>
-<l:l i="70">Ä</l:l>
-<l:l i="70">Ä</l:l>
-<l:l i="70">Ä </l:l>
-<l:l i="70">Ä¡</l:l>
-<l:l i="70">Ä¢</l:l>
-<l:l i="70">Ä£</l:l>
-<l:l i="70">Æ</l:l>
-<l:l i="70">É </l:l>
-<l:l i="70">Ç€</l:l>
-<l:l i="70">Ç¥</l:l>
-<l:l i="70">ÇŠ</l:l>
-<l:l i="70">Ç§</l:l>
-<l:l i="70">ÇŽ</l:l>
-<l:l i="70">Çµ</l:l>
-<l:l i="70">áž </l:l>
-<l:l i="70">áž¡</l:l>
-<l:l i="80">H</l:l>
-<l:l i="80">h</l:l>
-<l:l i="80">Ä€</l:l>
-<l:l i="80">Ä¥</l:l>
-<l:l i="80">ÄŠ</l:l>
-<l:l i="80">Ä§</l:l>
-<l:l i="80">È</l:l>
-<l:l i="80">È</l:l>
-<l:l i="80">ÉŠ</l:l>
-<l:l i="80">áž¢</l:l>
-<l:l i="80">áž£</l:l>
-<l:l i="80">áž€</l:l>
-<l:l i="80">áž¥</l:l>
-<l:l i="80">ážŠ</l:l>
-<l:l i="80">áž§</l:l>
-<l:l i="80">ážš</l:l>
-<l:l i="80">áž©</l:l>
-<l:l i="80">ážª</l:l>
-<l:l i="80">áž«</l:l>
-<l:l i="80">áº</l:l>
-<l:l i="90">I</l:l>
-<l:l i="90">i</l:l>
-<l:l i="90">Ã</l:l>
-<l:l i="90">Ã¬</l:l>
-<l:l i="90">Ã</l:l>
-<l:l i="90">Ã­</l:l>
-<l:l i="90">Ã</l:l>
-<l:l i="90">Ã®</l:l>
-<l:l i="90">Ã</l:l>
-<l:l i="90">Ã¯</l:l>
-<l:l i="90">Äš</l:l>
-<l:l i="90">Ä©</l:l>
-<l:l i="90">Äª</l:l>
-<l:l i="90">Ä«</l:l>
-<l:l i="90">Ä¬</l:l>
-<l:l i="90">Ä­</l:l>
-<l:l i="90">Ä®</l:l>
-<l:l i="90">Ä¯</l:l>
-<l:l i="90">Ä°</l:l>
-<l:l i="90">Æ</l:l>
-<l:l i="90">Éš</l:l>
-<l:l i="90">Ç</l:l>
-<l:l i="90">Ç</l:l>
-<l:l i="90">È</l:l>
-<l:l i="90">È</l:l>
-<l:l i="90">È</l:l>
-<l:l i="90">È</l:l>
-<l:l i="90">áž¬</l:l>
-<l:l i="90">áž­</l:l>
-<l:l i="90">áž®</l:l>
-<l:l i="90">áž¯</l:l>
-<l:l i="90">á»</l:l>
-<l:l i="90">á»</l:l>
-<l:l i="90">á»</l:l>
-<l:l i="90">á»</l:l>
-<l:l i="100">J</l:l>
-<l:l i="100">j</l:l>
-<l:l i="100">ÄŽ</l:l>
-<l:l i="100">Äµ</l:l>
-<l:l i="100">Ç°</l:l>
-<l:l i="100">Ê</l:l>
-<l:l i="110">K</l:l>
-<l:l i="110">k</l:l>
-<l:l i="110">Ä¶</l:l>
-<l:l i="110">Ä·</l:l>
-<l:l i="110">Æ</l:l>
-<l:l i="110">Æ</l:l>
-<l:l i="110">Çš</l:l>
-<l:l i="110">Ç©</l:l>
-<l:l i="110">áž°</l:l>
-<l:l i="110">áž±</l:l>
-<l:l i="110">áž²</l:l>
-<l:l i="110">áž³</l:l>
-<l:l i="110">ážŽ</l:l>
-<l:l i="110">ážµ</l:l>
-<l:l i="120">L</l:l>
-<l:l i="120">l</l:l>
-<l:l i="120">Ä¹</l:l>
-<l:l i="120">Äº</l:l>
-<l:l i="120">Ä»</l:l>
-<l:l i="120">ÄŒ</l:l>
-<l:l i="120">Äœ</l:l>
-<l:l i="120">ÄŸ</l:l>
-<l:l i="120">Ä¿</l:l>
-<l:l i="120">Å</l:l>
-<l:l i="120">Å</l:l>
-<l:l i="120">Å</l:l>
-<l:l i="120">Æ</l:l>
-<l:l i="120">Ç</l:l>
-<l:l i="120">ÈŽ</l:l>
-<l:l i="120">É«</l:l>
-<l:l i="120">É¬</l:l>
-<l:l i="120">É­</l:l>
-<l:l i="120">áž¶</l:l>
-<l:l i="120">áž·</l:l>
-<l:l i="120">ážž</l:l>
-<l:l i="120">áž¹</l:l>
-<l:l i="120">ážº</l:l>
-<l:l i="120">áž»</l:l>
-<l:l i="120">ážŒ</l:l>
-<l:l i="120">ážœ</l:l>
-<l:l i="130">M</l:l>
-<l:l i="130">m</l:l>
-<l:l i="130">É±</l:l>
-<l:l i="130">ážŸ</l:l>
-<l:l i="130">áž¿</l:l>
-<l:l i="130">á¹</l:l>
-<l:l i="130">á¹</l:l>
-<l:l i="130">á¹</l:l>
-<l:l i="130">á¹</l:l>
-<l:l i="140">N</l:l>
-<l:l i="140">n</l:l>
-<l:l i="140">Ã</l:l>
-<l:l i="140">Ã±</l:l>
-<l:l i="140">Å</l:l>
-<l:l i="140">Å</l:l>
-<l:l i="140">Å
-</l:l>
-<l:l i="140">Å</l:l>
-<l:l i="140">Å</l:l>
-<l:l i="140">Å</l:l>
-<l:l i="140">Æ</l:l>
-<l:l i="140">É²</l:l>
-<l:l i="140">Æ</l:l>
-<l:l i="140">È </l:l>
-<l:l i="140">Ç</l:l>
-<l:l i="140">Çž</l:l>
-<l:l i="140">Ç¹</l:l>
-<l:l i="140">Èµ</l:l>
-<l:l i="140">É³</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹
-</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="150">O</l:l>
-<l:l i="150">o</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">Ã²</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">Ã³</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">ÃŽ</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">Ãµ</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">Ã¶</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">Ãž</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Æ</l:l>
-<l:l i="150">Æ </l:l>
-<l:l i="150">Æ¡</l:l>
-<l:l i="150">Ç</l:l>
-<l:l i="150">Ç</l:l>
-<l:l i="150">Çª</l:l>
-<l:l i="150">Ç«</l:l>
-<l:l i="150">Ç¬</l:l>
-<l:l i="150">Ç­</l:l>
-<l:l i="150">ÇŸ</l:l>
-<l:l i="150">Ç¿</l:l>
-<l:l i="150">È</l:l>
-<l:l i="150">È</l:l>
-<l:l i="150">È</l:l>
-<l:l i="150">È</l:l>
-<l:l i="150">Èª</l:l>
-<l:l i="150">È«</l:l>
-<l:l i="150">È¬</l:l>
-<l:l i="150">È­</l:l>
-<l:l i="150">È®</l:l>
-<l:l i="150">È¯</l:l>
-<l:l i="150">È°</l:l>
-<l:l i="150">È±</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á» </l:l>
-<l:l i="150">á»¡</l:l>
-<l:l i="150">á»¢</l:l>
-<l:l i="150">á»£</l:l>
-<l:l i="160">P</l:l>
-<l:l i="160">p</l:l>
-<l:l i="160">Æ€</l:l>
-<l:l i="160">Æ¥</l:l>
-<l:l i="160">á¹</l:l>
-<l:l i="160">á¹</l:l>
-<l:l i="160">á¹</l:l>
-<l:l i="160">á¹</l:l>
-<l:l i="170">Q</l:l>
-<l:l i="170">q</l:l>
-<l:l i="170">Ê </l:l>
-<l:l i="180">R</l:l>
-<l:l i="180">r</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">È</l:l>
-<l:l i="180">È</l:l>
-<l:l i="180">È</l:l>
-<l:l i="180">È</l:l>
-<l:l i="180">ÉŒ</l:l>
-<l:l i="180">Éœ</l:l>
-<l:l i="180">ÉŸ</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="190">S</l:l>
-<l:l i="190">s</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å </l:l>
-<l:l i="190">Å¡</l:l>
-<l:l i="190">È</l:l>
-<l:l i="190">È</l:l>
-<l:l i="190">Ê</l:l>
-<l:l i="190">á¹ </l:l>
-<l:l i="190">á¹¡</l:l>
-<l:l i="190">á¹¢</l:l>
-<l:l i="190">á¹£</l:l>
-<l:l i="190">á¹€</l:l>
-<l:l i="190">á¹¥</l:l>
-<l:l i="190">á¹Š</l:l>
-<l:l i="190">á¹§</l:l>
-<l:l i="190">á¹š</l:l>
-<l:l i="190">á¹©</l:l>
-<l:l i="200">T</l:l>
-<l:l i="200">t</l:l>
-<l:l i="200">Å¢</l:l>
-<l:l i="200">Å£</l:l>
-<l:l i="200">Å€</l:l>
-<l:l i="200">Å¥</l:l>
-<l:l i="200">ÅŠ</l:l>
-<l:l i="200">Å§</l:l>
-<l:l i="200">Æ«</l:l>
-<l:l i="200">Æ¬</l:l>
-<l:l i="200">Æ­</l:l>
-<l:l i="200">Æ®</l:l>
-<l:l i="200">Ê</l:l>
-<l:l i="200">È</l:l>
-<l:l i="200">È</l:l>
-<l:l i="200">È¶</l:l>
-<l:l i="200">á¹ª</l:l>
-<l:l i="200">á¹«</l:l>
-<l:l i="200">á¹¬</l:l>
-<l:l i="200">á¹­</l:l>
-<l:l i="200">á¹®</l:l>
-<l:l i="200">á¹¯</l:l>
-<l:l i="200">á¹°</l:l>
-<l:l i="200">á¹±</l:l>
-<l:l i="200">áº</l:l>
-<l:l i="210">U</l:l>
-<l:l i="210">u</l:l>
-<l:l i="210">Ã</l:l>
-<l:l i="210">Ã¹</l:l>
-<l:l i="210">Ã</l:l>
-<l:l i="210">Ãº</l:l>
-<l:l i="210">Ã</l:l>
-<l:l i="210">Ã»</l:l>
-<l:l i="210">Ã</l:l>
-<l:l i="210">ÃŒ</l:l>
-<l:l i="210">Åš</l:l>
-<l:l i="210">Å©</l:l>
-<l:l i="210">Åª</l:l>
-<l:l i="210">Å«</l:l>
-<l:l i="210">Å¬</l:l>
-<l:l i="210">Å­</l:l>
-<l:l i="210">Å®</l:l>
-<l:l i="210">Å¯</l:l>
-<l:l i="210">Å°</l:l>
-<l:l i="210">Å±</l:l>
-<l:l i="210">Å²</l:l>
-<l:l i="210">Å³</l:l>
-<l:l i="210">Æ¯</l:l>
-<l:l i="210">Æ°</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">È</l:l>
-<l:l i="210">È</l:l>
-<l:l i="210">È</l:l>
-<l:l i="210">È</l:l>
-<l:l i="210">á¹²</l:l>
-<l:l i="210">á¹³</l:l>
-<l:l i="210">á¹Ž</l:l>
-<l:l i="210">á¹µ</l:l>
-<l:l i="210">á¹¶</l:l>
-<l:l i="210">á¹·</l:l>
-<l:l i="210">á¹ž</l:l>
-<l:l i="210">á¹¹</l:l>
-<l:l i="210">á¹º</l:l>
-<l:l i="210">á¹»</l:l>
-<l:l i="210">á»€</l:l>
-<l:l i="210">á»¥</l:l>
-<l:l i="210">á»Š</l:l>
-<l:l i="210">á»§</l:l>
-<l:l i="210">á»š</l:l>
-<l:l i="210">á»©</l:l>
-<l:l i="210">á»ª</l:l>
-<l:l i="210">á»«</l:l>
-<l:l i="210">á»¬</l:l>
-<l:l i="210">á»­</l:l>
-<l:l i="210">á»®</l:l>
-<l:l i="210">á»¯</l:l>
-<l:l i="210">á»°</l:l>
-<l:l i="210">á»±</l:l>
-<l:l i="220">V</l:l>
-<l:l i="220">v</l:l>
-<l:l i="220">Æ²</l:l>
-<l:l i="220">Ê</l:l>
-<l:l i="220">á¹Œ</l:l>
-<l:l i="220">á¹œ</l:l>
-<l:l i="220">á¹Ÿ</l:l>
-<l:l i="220">á¹¿</l:l>
-<l:l i="230">W</l:l>
-<l:l i="230">w</l:l>
-<l:l i="230">ÅŽ</l:l>
-<l:l i="230">Åµ</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº
-</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="240">X</l:l>
-<l:l i="240">x</l:l>
-<l:l i="240">áº</l:l>
-<l:l i="240">áº</l:l>
-<l:l i="240">áº</l:l>
-<l:l i="240">áº</l:l>
-<l:l i="250">Y</l:l>
-<l:l i="250">y</l:l>
-<l:l i="250">Ã</l:l>
-<l:l i="250">Ãœ</l:l>
-<l:l i="250">Ã¿</l:l>
-<l:l i="250">Åž</l:l>
-<l:l i="250">Å¶</l:l>
-<l:l i="250">Å·</l:l>
-<l:l i="250">Æ³</l:l>
-<l:l i="250">ÆŽ</l:l>
-<l:l i="250">È²</l:l>
-<l:l i="250">È³</l:l>
-<l:l i="250">áº</l:l>
-<l:l i="250">áº</l:l>
-<l:l i="250">áº</l:l>
-<l:l i="250">á»²</l:l>
-<l:l i="250">á»³</l:l>
-<l:l i="250">á»Ž</l:l>
-<l:l i="250">á»µ</l:l>
-<l:l i="250">á»¶</l:l>
-<l:l i="250">á»·</l:l>
-<l:l i="250">á»ž</l:l>
-<l:l i="250">á»¹</l:l>
-<l:l i="260">Z</l:l>
-<l:l i="260">z</l:l>
-<l:l i="260">Å¹</l:l>
-<l:l i="260">Åº</l:l>
-<l:l i="260">Å»</l:l>
-<l:l i="260">ÅŒ</l:l>
-<l:l i="260">Åœ</l:l>
-<l:l i="260">ÅŸ</l:l>
-<l:l i="260">Æµ</l:l>
-<l:l i="260">Æ¶</l:l>
-<l:l i="260">È€</l:l>
-<l:l i="260">È¥</l:l>
-<l:l i="260">Ê</l:l>
-<l:l i="260">Ê</l:l>
-<l:l i="260">áº</l:l>
-<l:l i="260">áº</l:l>
-<l:l i="260">áº</l:l>
-<l:l i="260">áº</l:l>
-<l:l i="260">áº</l:l>
-<l:l i="260">áº</l:l>
-</l:letters>
-</l:l10n>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/l10n.dtd
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/l10n.dtd	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<!ENTITY % prefix "l">
-
-<!ENTITY % xmlns "xmlns:%prefix;">
-<!ENTITY % uri "'http://docbook.sourceforge.net/xmlns/l10n/1.0'">
-
-<!ENTITY % i18n "%prefix;:i18n">
-<!ENTITY % l10n "%prefix;:l10n">
-<!ENTITY % gentext "%prefix;:gentext">
-<!ENTITY % dingbat "%prefix;:dingbat">
-<!ENTITY % context "%prefix;:context">
-<!ENTITY % template "%prefix;:template">
-<!ENTITY % letters "%prefix;:letters">
-<!ENTITY % l "%prefix;:l">
-<!ENTITY % lang "lang NMTOKEN #IMPLIED"> 
-
-<!ELEMENT %i18n; ((%l10n;)+)>
-<!ATTLIST %i18n;
-	%xmlns;		CDATA	#FIXED %uri;
->
-
-<!ELEMENT %l10n; (%gentext;|%dingbat;|%context;|%letters;)*>
-<!ATTLIST %l10n;
-	%xmlns;		CDATA	#FIXED %uri;
-	language	CDATA	#REQUIRED
-	english-language-name	CDATA	#IMPLIED
->
-
-<!ELEMENT %gentext; EMPTY>
-<!ATTLIST %gentext;
-	%lang;
-	key		CDATA	#REQUIRED
-	text		CDATA	#REQUIRED
->
-
-<!ELEMENT %dingbat; EMPTY>
-<!ATTLIST %dingbat;
-        %lang;
-	key		CDATA	#REQUIRED
-	text		CDATA	#REQUIRED
->
-
-<!ELEMENT %context; ((%template;)+)>
-<!ATTLIST %context;
-	name		CDATA	#REQUIRED
->
-
-<!ELEMENT %template; EMPTY>
-<!ATTLIST %template;
-        %lang;
-	name		CDATA	#REQUIRED
-	text		CDATA	#REQUIRED
-	style		CDATA	#IMPLIED
->
-
-<!ELEMENT %letters; ((%l;)+)>
-<!ATTLIST %letters;
-          %lang;
->
-
-<!ELEMENT %l; (#PCDATA)>
-<!ATTLIST %l;
-          i 		CDATA 	#REQUIRED
->
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/l10n.xml
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/l10n.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE l:i18n SYSTEM "l10n.dtd" [
-<!ENTITY de SYSTEM "de.xml">
-<!ENTITY en SYSTEM "en.xml">
-<!ENTITY es SYSTEM "es.xml">
-<!ENTITY fr SYSTEM "fr.xml">
-<!ENTITY it SYSTEM "it.xml">
-<!ENTITY zh_cn SYSTEM "zh_cn.xml">
-<!ENTITY zh_tw SYSTEM "zh_tw.xml">
-]>
-<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
-&de;
-&en;
-&es;
-&fr;
-&it;
-&zh_cn;
-&zh_tw;
-</l:i18n>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/l10n.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/l10n.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,441 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"
-                exclude-result-prefixes="l"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     This file contains localization templates (for internationalization)
-     ******************************************************************** -->
-
-<xsl:param name="l10n.xml" select="document('../common/l10n.xml')"/>
-<xsl:param name="local.l10n.xml" select="document('')"/>
-
-<xsl:template name="l10n.language">
-  <xsl:param name="target" select="."/>
-  <xsl:param name="xref-context" select="false()"/>
-
-  <xsl:variable name="mc-language">
-    <xsl:choose>
-      <xsl:when test="$l10n.gentext.language != ''">
-        <xsl:value-of select="$l10n.gentext.language"/>
-      </xsl:when>
-
-      <xsl:when test="$xref-context or $l10n.gentext.use.xref.language != 0">
-        <!-- can't do this one step: attributes are unordered! -->
-        <xsl:variable name="lang-scope"
-                      select="$target/ancestor-or-self::*
-                              [@lang or @xml:lang][1]"/>
-        <xsl:variable name="lang-attr"
-                      select="($lang-scope/@lang | $lang-scope/@xml:lang)[1]"/>
-        <xsl:choose>
-          <xsl:when test="string($lang-attr) = ''">
-            <xsl:value-of select="$l10n.gentext.default.language"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$lang-attr"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-
-      <xsl:otherwise>
-        <!-- can't do this one step: attributes are unordered! -->
-        <xsl:variable name="lang-scope"
-                      select="$target/ancestor-or-self::*
-                              [@lang or @xml:lang][1]"/>
-        <xsl:variable name="lang-attr"
-                      select="($lang-scope/@lang | $lang-scope/@xml:lang)[1]"/>
-
-        <xsl:choose>
-          <xsl:when test="string($lang-attr) = ''">
-            <xsl:value-of select="$l10n.gentext.default.language"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$lang-attr"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="language" select="translate($mc-language,
-                                        'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
-                                        'abcdefghijklmnopqrstuvwxyz')"/>
-
-  <xsl:variable name="adjusted.language">
-    <xsl:choose>
-      <xsl:when test="contains($language,'-')">
-        <xsl:value-of select="substring-before($language,'-')"/>
-        <xsl:text>_</xsl:text>
-        <xsl:value-of select="substring-after($language,'-')"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$language"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$l10n.xml/l:i18n/l:l10n[@language=$adjusted.language]">
-      <xsl:value-of select="$adjusted.language"/>
-    </xsl:when>
-    <!-- try just the lang code without country -->
-    <xsl:when test="$l10n.xml/l:i18n/l:l10n[@language=substring-before($adjusted.language,'_')]">
-      <xsl:value-of select="substring-before($adjusted.language,'_')"/>
-    </xsl:when>
-    <!-- or use the default -->
-    <xsl:otherwise>
-      <xsl:message>
-        <xsl:text>No localization exists for "</xsl:text>
-        <xsl:value-of select="$adjusted.language"/>
-        <xsl:text>" or "</xsl:text>
-        <xsl:value-of select="substring-before($adjusted.language,'_')"/>
-        <xsl:text>". Using default "</xsl:text>
-        <xsl:value-of select="$l10n.gentext.default.language"/>
-        <xsl:text>".</xsl:text>
-      </xsl:message>
-      <xsl:value-of select="$l10n.gentext.default.language"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="language.attribute">
-  <xsl:param name="node" select="."/>
-
-  <xsl:variable name="language">
-    <xsl:choose>
-      <xsl:when test="$l10n.gentext.language != ''">
-        <xsl:value-of select="$l10n.gentext.language"/>
-      </xsl:when>
-
-      <xsl:otherwise>
-        <!-- can't do this one step: attributes are unordered! -->
-        <xsl:variable name="lang-scope"
-                      select="$node/ancestor-or-self::*
-                              [@lang or @xml:lang][1]"/>
-        <xsl:variable name="lang-attr"
-                      select="($lang-scope/@lang | $lang-scope/@xml:lang)[1]"/>
-
-        <xsl:choose>
-          <xsl:when test="string($lang-attr) = ''">
-            <xsl:value-of select="$l10n.gentext.default.language"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$lang-attr"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:if test="$language != ''">
-    <xsl:attribute name="lang">
-      <xsl:choose>
-        <xsl:when test="$l10n.lang.value.rfc.compliant != 0">
-          <xsl:value-of select="translate($language, '_', '-')"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$language"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-  </xsl:if>
-
-  <!-- FIXME: This is sort of hack, but it was the easiest way to add at least partial support for dir attribute -->
-  <xsl:copy-of select="ancestor-or-self::*[@dir][1]/@dir"/>
-</xsl:template>
-
-<xsl:template name="gentext">
-  <xsl:param name="key" select="local-name(.)"/>
-  <xsl:param name="lang">
-    <xsl:call-template name="l10n.language"/>
-  </xsl:param>
-
-  <xsl:variable name="local.l10n.gentext"
-                select="($local.l10n.xml//l:i18n/l:l10n[@language=$lang]/l:gentext[@key=$key])[1]"/>
-
-  <xsl:variable name="l10n.gentext"
-                select="($l10n.xml/l:i18n/l:l10n[@language=$lang]/l:gentext[@key=$key])[1]"/>
-
-  <xsl:choose>
-    <xsl:when test="$local.l10n.gentext">
-      <xsl:value-of select="$local.l10n.gentext/@text"/>
-    </xsl:when>
-    <xsl:when test="$l10n.gentext">
-      <xsl:value-of select="$l10n.gentext/@text"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message>
-        <xsl:text>No "</xsl:text>
-        <xsl:value-of select="$lang"/>
-        <xsl:text>" localization of "</xsl:text>
-        <xsl:value-of select="$key"/>
-        <xsl:text>" exists</xsl:text>
-        <xsl:choose>
-          <xsl:when test="$lang = 'en'">
-             <xsl:text>.</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-             <xsl:text>; using "en".</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:message>
-
-      <xsl:value-of select="($l10n.xml/l:i18n/l:l10n[@language='en']/l:gentext[@key=$key])[1]/@text"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="gentext.element.name">
-  <xsl:param name="element.name" select="local-name(.)"/>
-  <xsl:param name="lang">
-    <xsl:call-template name="l10n.language"/>
-  </xsl:param>
-
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key" select="$element.name"/>
-    <xsl:with-param name="lang" select="$lang"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="gentext.space">
-  <xsl:text> </xsl:text>
-</xsl:template>
-
-<xsl:template name="gentext.edited.by">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key" select="'Editedby'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="gentext.by">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key" select="'by'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="gentext.dingbat">
-  <xsl:param name="dingbat">bullet</xsl:param>
-  <xsl:param name="lang">
-    <xsl:call-template name="l10n.language"/>
-  </xsl:param>
-
-  <xsl:variable name="local.l10n.dingbat"
-                select="($local.l10n.xml//l:i18n/l:l10n[@language=$lang]/l:dingbat[@key=$dingbat])[1]"/>
-
-  <xsl:variable name="l10n.dingbat"
-                select="($l10n.xml/l:i18n/l:l10n[@language=$lang]/l:dingbat[@key=$dingbat])[1]"/>
-
-  <xsl:choose>
-    <xsl:when test="$local.l10n.dingbat">
-      <xsl:value-of select="$local.l10n.dingbat/@text"/>
-    </xsl:when>
-    <xsl:when test="$l10n.dingbat">
-      <xsl:value-of select="$l10n.dingbat/@text"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message>
-        <xsl:text>No "</xsl:text>
-        <xsl:value-of select="$lang"/>
-        <xsl:text>" localization of dingbat </xsl:text>
-        <xsl:value-of select="$dingbat"/>
-        <xsl:text> exists; using "en".</xsl:text>
-      </xsl:message>
-
-      <xsl:value-of select="($l10n.xml/l:i18n/l:l10n[@language='en']/l:dingbat[@key=$dingbat])[1]/@text"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="gentext.startquote">
-  <xsl:call-template name="gentext.dingbat">
-    <xsl:with-param name="dingbat">startquote</xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="gentext.endquote">
-  <xsl:call-template name="gentext.dingbat">
-    <xsl:with-param name="dingbat">endquote</xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="gentext.nestedstartquote">
-  <xsl:call-template name="gentext.dingbat">
-    <xsl:with-param name="dingbat">nestedstartquote</xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="gentext.nestedendquote">
-  <xsl:call-template name="gentext.dingbat">
-    <xsl:with-param name="dingbat">nestedendquote</xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="gentext.nav.prev">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key" select="'nav-prev'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="gentext.nav.next">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key" select="'nav-next'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="gentext.nav.home">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key" select="'nav-home'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="gentext.nav.up">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key" select="'nav-up'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template name="gentext.template">
-  <xsl:param name="context" select="'default'"/>
-  <xsl:param name="name" select="'default'"/>
-  <xsl:param name="origname" select="$name"/>
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="referrer"/>
-  <xsl:param name="lang">
-    <xsl:call-template name="l10n.language"/>
-  </xsl:param>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:variable name="local.localization.node"
-                select="($local.l10n.xml//l:i18n/l:l10n[@language=$lang])[1]"/>
-
-  <xsl:variable name="localization.node"
-                select="($l10n.xml/l:i18n/l:l10n[@language=$lang])[1]"/>
-
-  <xsl:if test="count($localization.node) = 0
-                and count($local.localization.node) = 0
-                and $verbose != 0">
-    <xsl:message>
-      <xsl:text>No "</xsl:text>
-      <xsl:value-of select="$lang"/>
-      <xsl:text>" localization exists.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:variable name="local.context.node"
-                select="$local.localization.node/l:context[@name=$context]"/>
-
-  <xsl:variable name="context.node"
-                select="$localization.node/l:context[@name=$context]"/>
-
-  <xsl:if test="count($context.node) = 0
-                and count($local.context.node) = 0
-                and $verbose != 0">
-    <xsl:message>
-      <xsl:text>No context named "</xsl:text>
-      <xsl:value-of select="$context"/>
-      <xsl:text>" exists in the "</xsl:text>
-      <xsl:value-of select="$lang"/>
-      <xsl:text>" localization.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:variable name="local.template.node"
-                select="($local.context.node/l:template[@name=$name
-                                                        and @style
-                                                        and @style=$xrefstyle]
-                        |$local.context.node/l:template[@name=$name
-                                                        and not(@style)])[1]"/>
-
-  <xsl:variable name="template.node"
-                select="($context.node/l:template[@name=$name
-                                                  and @style
-                                                  and @style=$xrefstyle]
-                        |$context.node/l:template[@name=$name
-                                                  and not(@style)])[1]"/>
-
-  <xsl:choose>
-    <xsl:when test="$local.template.node/@text">
-      <xsl:value-of select="$local.template.node/@text"/>
-    </xsl:when>
-    <xsl:when test="$template.node/@text">
-      <xsl:value-of select="$template.node/@text"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="contains($name, '/')">
-          <xsl:call-template name="gentext.template">
-            <xsl:with-param name="context" select="$context"/>
-            <xsl:with-param name="name" select="substring-after($name, '/')"/>
-            <xsl:with-param name="origname" select="$origname"/>
-            <xsl:with-param name="purpose" select="$purpose"/>
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-            <xsl:with-param name="referrer" select="$referrer"/>
-            <xsl:with-param name="lang" select="$lang"/>
-            <xsl:with-param name="verbose" select="$verbose"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="$verbose = 0">
-          <!-- silence -->
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>No template for "</xsl:text>
-            <xsl:value-of select="$origname"/>
-            <xsl:text>" (or any of its leaves) exists
-in the context named "</xsl:text>
-            <xsl:value-of select="$context"/>
-            <xsl:text>" in the "</xsl:text>
-            <xsl:value-of select="$lang"/>
-            <xsl:text>" localization.</xsl:text>
-          </xsl:message>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- silently test if a gentext template exists -->
-
-<xsl:template name="gentext.template.exists">
-  <xsl:param name="context" select="'default'"/>
-  <xsl:param name="name" select="'default'"/>
-  <xsl:param name="origname" select="$name"/>
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="referrer"/>
-  <xsl:param name="lang">
-    <xsl:call-template name="l10n.language"/>
-  </xsl:param>
-
-  <xsl:variable name="template">
-    <xsl:call-template name="gentext.template">
-      <xsl:with-param name="context" select="$context"/>
-      <xsl:with-param name="name" select="$name"/>
-      <xsl:with-param name="origname" select="$origname"/>
-      <xsl:with-param name="purpose" select="$purpose"/>
-      <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-      <xsl:with-param name="referrer" select="$referrer"/>
-      <xsl:with-param name="lang" select="$lang"/>
-      <xsl:with-param name="verbose" select="0"/>
-    </xsl:call-template>
-  </xsl:variable>
-  
-  <xsl:choose>
-    <xsl:when test="string-length($template) != 0">1</xsl:when>
-    <xsl:otherwise>0</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/labels.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/labels.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,869 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-                exclude-result-prefixes="doc"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!-- label markup -->
-
-<doc:mode mode="label.markup" xmlns="">
-<refpurpose>Provides access to element labels</refpurpose>
-<refdescription id="label.markup-desc">
-<para>Processing an element in the
-<literal role="mode">label.markup</literal> mode produces the
-element label.</para>
-<para>Trailing punctuation is not added to the label.
-</para>
-</refdescription>
-</doc:mode>
-
-<xsl:template match="*" mode="intralabel.punctuation">
-  <xsl:text>.</xsl:text>
-</xsl:template>
-
-<xsl:template match="*" mode="label.markup">
-  <xsl:param name="verbose" select="1"/>
-  <xsl:if test="$verbose">
-    <xsl:message>
-      <xsl:text>Request for label of unexpected element: </xsl:text>
-      <xsl:value-of select="local-name(.)"/>
-    </xsl:message>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="set|book" mode="label.markup">
-  <xsl:if test="@label">
-    <xsl:value-of select="@label"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="part" mode="label.markup">
-  <xsl:choose>
-    <xsl:when test="@label">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:when test="string($part.autolabel) != 0">
-      <xsl:variable name="format">
-        <xsl:call-template name="autolabel.format">
-          <xsl:with-param name="format" select="$part.autolabel"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:number from="book" count="part" format="{$format}"/>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="partintro" mode="label.markup">
-  <!-- no label -->
-</xsl:template>
-
-<xsl:template match="preface" mode="label.markup">
-  <xsl:choose>
-    <xsl:when test="@label">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:when test="string($preface.autolabel) != 0">
-      <xsl:if test="$component.label.includes.part.label != 0 and
-                      ancestor::part">
-        <xsl:variable name="part.label">
-          <xsl:apply-templates select="ancestor::part" 
-                               mode="label.markup"/>
-        </xsl:variable>
-        <xsl:if test="$part.label != ''">
-          <xsl:value-of select="$part.label"/>
-          <xsl:apply-templates select="ancestor::part" 
-                               mode="intralabel.punctuation"/>
-        </xsl:if>
-      </xsl:if>
-      <xsl:variable name="format">
-        <xsl:call-template name="autolabel.format">
-          <xsl:with-param name="format" select="$preface.autolabel"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="$label.from.part != 0 and ancestor::part">
-          <xsl:number from="part" count="preface" format="{$format}" level="any"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:number from="book" count="preface" format="{$format}" level="any"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="chapter" mode="label.markup">
-  <xsl:choose>
-    <xsl:when test="@label">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:when test="string($chapter.autolabel) != 0">
-      <xsl:if test="$component.label.includes.part.label != 0 and
-                      ancestor::part">
-        <xsl:variable name="part.label">
-          <xsl:apply-templates select="ancestor::part" 
-                               mode="label.markup"/>
-        </xsl:variable>
-        <xsl:if test="$part.label != ''">
-          <xsl:value-of select="$part.label"/>
-          <xsl:apply-templates select="ancestor::part" 
-                               mode="intralabel.punctuation"/>
-        </xsl:if>
-      </xsl:if>
-      <xsl:variable name="format">
-        <xsl:call-template name="autolabel.format">
-          <xsl:with-param name="format" select="$chapter.autolabel"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="$label.from.part != 0 and ancestor::part">
-          <xsl:number from="part" count="chapter" format="{$format}" level="any"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:number from="book" count="chapter" format="{$format}" level="any"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="appendix" mode="label.markup">
-  <xsl:choose>
-    <xsl:when test="@label">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:when test="string($appendix.autolabel) != 0">
-      <xsl:if test="$component.label.includes.part.label != 0 and
-                      ancestor::part">
-        <xsl:variable name="part.label">
-          <xsl:apply-templates select="ancestor::part" 
-                               mode="label.markup"/>
-        </xsl:variable>
-        <xsl:if test="$part.label != ''">
-          <xsl:value-of select="$part.label"/>
-          <xsl:apply-templates select="ancestor::part" 
-                               mode="intralabel.punctuation"/>
-        </xsl:if>
-      </xsl:if>
-      <xsl:variable name="format">
-        <xsl:call-template name="autolabel.format">
-          <xsl:with-param name="format" select="$appendix.autolabel"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="$label.from.part != 0 and ancestor::part">
-          <xsl:number from="part" count="appendix" format="{$format}" level="any"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:number from="book|article"
-                      count="appendix" format="{$format}" level="any"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="article" mode="label.markup">
-  <xsl:if test="@label">
-    <xsl:value-of select="@label"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="dedication|colophon" mode="label.markup">
-  <xsl:if test="@label">
-    <xsl:value-of select="@label"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="reference" mode="label.markup">
-  <xsl:choose>
-    <xsl:when test="@label">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:when test="string($reference.autolabel) != 0">
-      <xsl:if test="$component.label.includes.part.label != 0 and
-                      ancestor::part">
-        <xsl:variable name="part.label">
-          <xsl:apply-templates select="ancestor::part" 
-                               mode="label.markup"/>
-        </xsl:variable>
-        <xsl:if test="$part.label != ''">
-          <xsl:value-of select="$part.label"/>
-          <xsl:apply-templates select="ancestor::part" 
-                               mode="intralabel.punctuation"/>
-        </xsl:if>
-      </xsl:if>
-      <xsl:variable name="format">
-        <xsl:call-template name="autolabel.format">
-          <xsl:with-param name="format" select="$reference.autolabel"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="$label.from.part != 0 and ancestor::part">
-          <xsl:number from="part" count="reference" format="{$format}" level="any"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:number from="book" count="reference" format="{$format}" level="any"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="refentry" mode="label.markup">
-  <xsl:if test="@label">
-    <xsl:value-of select="@label"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="section" mode="label.markup">
-  <!-- if this is a nested section, label the parent -->
-  <xsl:if test="local-name(..) = 'section'">
-    <xsl:variable name="parent.section.label">
-      <xsl:call-template name="label.this.section">
-        <xsl:with-param name="section" select=".."/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:if test="$parent.section.label != '0'">
-      <xsl:apply-templates select=".." mode="label.markup"/>
-      <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
-    </xsl:if>
-  </xsl:if>
-
-  <!-- if the parent is a component, maybe label that too -->
-  <xsl:variable name="parent.is.component">
-    <xsl:call-template name="is.component">
-      <xsl:with-param name="node" select=".."/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <!-- does this section get labelled? -->
-  <xsl:variable name="label">
-    <xsl:call-template name="label.this.section">
-      <xsl:with-param name="section" select="."/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:if test="$section.label.includes.component.label != 0
-                and $parent.is.component != 0">
-    <xsl:variable name="parent.label">
-      <xsl:apply-templates select=".." mode="label.markup"/>
-    </xsl:variable>
-    <xsl:if test="$parent.label != ''">
-      <xsl:apply-templates select=".." mode="label.markup"/>
-      <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
-    </xsl:if>
-  </xsl:if>
-
-<!--
-  <xsl:message>
-    test: <xsl:value-of select="$label"/>, <xsl:number count="section"/>
-  </xsl:message>
--->
-
-  <xsl:choose>
-    <xsl:when test="@label">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:when test="$label != 0">      
-      <xsl:variable name="format">
-        <xsl:call-template name="autolabel.format">
-          <xsl:with-param name="format" select="$section.autolabel"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:number format="{$format}" count="section"/>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="sect1" mode="label.markup">
-  <!-- if the parent is a component, maybe label that too -->
-  <xsl:variable name="parent.is.component">
-    <xsl:call-template name="is.component">
-      <xsl:with-param name="node" select=".."/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="component.label">
-    <xsl:if test="$section.label.includes.component.label != 0
-                  and $parent.is.component != 0">
-      <xsl:variable name="parent.label">
-        <xsl:apply-templates select=".." mode="label.markup"/>
-      </xsl:variable>
-      <xsl:if test="$parent.label != ''">
-        <xsl:apply-templates select=".." mode="label.markup"/>
-        <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
-      </xsl:if>
-    </xsl:if>
-  </xsl:variable>
-
-
-  <xsl:variable name="is.numbered">
-    <xsl:call-template name="label.this.section"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="@label">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:when test="$is.numbered != 0">
-      <xsl:variable name="format">
-        <xsl:call-template name="autolabel.format">
-          <xsl:with-param name="format" select="$section.autolabel"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:copy-of select="$component.label"/>
-      <xsl:number format="{$format}" count="sect1"/>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="sect2|sect3|sect4|sect5" mode="label.markup">
-  <!-- label the parent -->
-  <xsl:variable name="parent.section.label">
-    <xsl:call-template name="label.this.section">
-      <xsl:with-param name="section" select=".."/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:if test="$parent.section.label != '0'">
-    <xsl:apply-templates select=".." mode="label.markup"/>
-    <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
-  </xsl:if>
-
-  <xsl:variable name="is.numbered">
-    <xsl:call-template name="label.this.section"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="@label">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:when test="$is.numbered != 0">
-      <xsl:variable name="format">
-        <xsl:call-template name="autolabel.format">
-          <xsl:with-param name="format" select="$section.autolabel"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="local-name(.) = 'sect2'">
-          <xsl:number format="{$format}" count="sect2"/>
-        </xsl:when>
-        <xsl:when test="local-name(.) = 'sect3'">
-          <xsl:number format="{$format}" count="sect3"/>
-        </xsl:when>
-        <xsl:when test="local-name(.) = 'sect4'">
-          <xsl:number format="{$format}" count="sect4"/>
-        </xsl:when>
-        <xsl:when test="local-name(.) = 'sect5'">
-          <xsl:number format="{$format}" count="sect5"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>label.markup: this can't happen!</xsl:message>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="bridgehead" mode="label.markup">
-  <!-- FIXME: could we do a better job here? -->
-  <xsl:variable name="contsec"
-                select="(ancestor::section
-                         |ancestor::simplesect
-                         |ancestor::sect1
-                         |ancestor::sect2
-                         |ancestor::sect3
-                         |ancestor::sect4
-                         |ancestor::sect5
-                         |ancestor::refsect1
-                         |ancestor::refsect2
-                         |ancestor::refsect3
-                         |ancestor::chapter
-                         |ancestor::appendix
-                         |ancestor::preface)[last()]"/>
-
-  <xsl:apply-templates select="$contsec" mode="label.markup"/>
-</xsl:template>
-
-<xsl:template match="refsect1" mode="label.markup">
-  <xsl:choose>
-    <xsl:when test="@label">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:when test="$section.autolabel != 0">
-      <xsl:variable name="format">
-        <xsl:call-template name="autolabel.format">
-          <xsl:with-param name="format" select="$section.autolabel"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:number count="refsect1" format="{$format}"/>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="refsect2|refsect3" mode="label.markup">
-  <!-- label the parent -->
-  <xsl:variable name="parent.label">
-    <xsl:apply-templates select=".." mode="label.markup"/>
-  </xsl:variable>
-  <xsl:if test="$parent.label != ''">
-    <xsl:apply-templates select=".." mode="label.markup"/>
-    <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
-  </xsl:if>
-
-  <xsl:choose>
-    <xsl:when test="@label">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:when test="$section.autolabel != 0">
-      <xsl:variable name="format">
-        <xsl:call-template name="autolabel.format">
-          <xsl:with-param name="format" select="$section.autolabel"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="local-name(.) = 'refsect2'">
-          <xsl:number count="refsect2" format="{$format}"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:number count="refsect3" format="{$format}"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="simplesect" mode="label.markup">
-  <!-- if this is a nested section, label the parent -->
-  <xsl:if test="local-name(..) = 'section'
-                or local-name(..) = 'sect1'
-                or local-name(..) = 'sect2'
-                or local-name(..) = 'sect3'
-                or local-name(..) = 'sect4'
-                or local-name(..) = 'sect5'">
-    <xsl:variable name="parent.section.label">
-      <xsl:apply-templates select=".." mode="label.markup"/>
-    </xsl:variable>
-    <xsl:if test="$parent.section.label != ''">
-      <xsl:apply-templates select=".." mode="label.markup"/>
-      <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
-    </xsl:if>
-  </xsl:if>
-
-  <!-- if the parent is a component, maybe label that too -->
-  <xsl:variable name="parent.is.component">
-    <xsl:call-template name="is.component">
-      <xsl:with-param name="node" select=".."/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <!-- does this section get labelled? -->
-  <xsl:variable name="label">
-    <xsl:call-template name="label.this.section">
-      <xsl:with-param name="section" select="."/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:if test="$section.label.includes.component.label != 0
-                and $parent.is.component != 0">
-    <xsl:variable name="parent.label">
-      <xsl:apply-templates select=".." mode="label.markup"/>
-    </xsl:variable>
-    <xsl:if test="$parent.label != ''">
-      <xsl:apply-templates select=".." mode="label.markup"/>
-      <xsl:apply-templates select=".." mode="intralabel.punctuation"/>
-    </xsl:if>
-  </xsl:if>
-
-  <xsl:choose>
-    <xsl:when test="@label">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:when test="$label != 0">
-      <xsl:variable name="format">
-        <xsl:call-template name="autolabel.format">
-          <xsl:with-param name="format" select="$section.autolabel"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:number format="{$format}" count="simplesect"/>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="qandadiv" mode="label.markup">
-  <xsl:variable name="lparent" select="(ancestor::set
-                                       |ancestor::book
-                                       |ancestor::chapter
-                                       |ancestor::appendix
-                                       |ancestor::preface
-                                       |ancestor::section
-                                       |ancestor::simplesect
-                                       |ancestor::sect1
-                                       |ancestor::sect2
-                                       |ancestor::sect3
-                                       |ancestor::sect4
-                                       |ancestor::sect5
-                                       |ancestor::refsect1
-                                       |ancestor::refsect2
-                                       |ancestor::refsect3)[last()]"/>
-
-  <xsl:variable name="lparent.prefix">
-    <xsl:apply-templates select="$lparent" mode="label.markup"/>
-  </xsl:variable>
-
-  <xsl:variable name="prefix">
-    <xsl:if test="$qanda.inherit.numeration != 0">
-      <xsl:if test="$lparent.prefix != ''">
-        <xsl:apply-templates select="$lparent" mode="label.markup"/>
-        <xsl:apply-templates select="$lparent" mode="intralabel.punctuation"/>
-      </xsl:if>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$qandadiv.autolabel != 0">
-      <xsl:variable name="format">
-        <xsl:call-template name="autolabel.format">
-          <xsl:with-param name="format" select="$qandadiv.autolabel"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:value-of select="$prefix"/>
-      <xsl:number level="multiple" count="qandadiv" format="{$format}"/>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="question|answer" mode="label.markup">
-  <xsl:variable name="lparent" select="(ancestor::set
-                                       |ancestor::book
-                                       |ancestor::chapter
-                                       |ancestor::appendix
-                                       |ancestor::preface
-                                       |ancestor::section
-                                       |ancestor::simplesect
-                                       |ancestor::sect1
-                                       |ancestor::sect2
-                                       |ancestor::sect3
-                                       |ancestor::sect4
-                                       |ancestor::sect5
-                                       |ancestor::refsect1
-                                       |ancestor::refsect2
-                                       |ancestor::refsect3)[last()]"/>
-
-  <xsl:variable name="lparent.prefix">
-    <xsl:apply-templates select="$lparent" mode="label.markup"/>
-  </xsl:variable>
-
-  <xsl:variable name="prefix">
-    <xsl:if test="$qanda.inherit.numeration != 0">
-      <xsl:choose>
-        <xsl:when test="ancestor::qandadiv">
-          <xsl:apply-templates select="ancestor::qandadiv[1]" mode="label.markup"/>
-          <xsl:apply-templates select="ancestor::qandadiv[1]"
-                               mode="intralabel.punctuation"/>
-        </xsl:when>
-        <xsl:when test="$lparent.prefix != ''">
-          <xsl:apply-templates select="$lparent" mode="label.markup"/>
-          <xsl:apply-templates select="$lparent" mode="intralabel.punctuation"/>
-        </xsl:when>
-      </xsl:choose>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="inhlabel"
-                select="ancestor-or-self::qandaset/@defaultlabel[1]"/>
-
-  <xsl:variable name="deflabel">
-    <xsl:choose>
-      <xsl:when test="$inhlabel != ''">
-        <xsl:value-of select="$inhlabel"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$qanda.defaultlabel"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="label" select="label"/>
-
-  <xsl:choose>
-    <xsl:when test="count($label)>0">
-      <xsl:apply-templates select="$label"/>
-    </xsl:when>
-
-    <xsl:when test="$deflabel = 'qanda' and local-name(.) = 'question'">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'Question'"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:when test="$deflabel = 'qanda' and local-name(.) = 'answer'">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'Answer'"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:when test="$deflabel = 'number' and local-name(.) = 'question'">
-      <xsl:value-of select="$prefix"/>
-      <xsl:number level="multiple" count="qandaentry" format="1"/>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="bibliography|glossary|
-                     qandaset|index|setindex" mode="label.markup">
-  <xsl:if test="@label">
-    <xsl:value-of select="@label"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="figure|table|example" mode="label.markup">
-  <xsl:variable name="pchap"
-                select="ancestor::chapter
-                        |ancestor::appendix
-                        |ancestor::article[ancestor::book]"/>
-
-  <xsl:variable name="prefix">
-    <xsl:if test="count($pchap) &gt; 0">
-      <xsl:apply-templates select="$pchap" mode="label.markup"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="@label">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$prefix != ''">
-            <xsl:apply-templates select="$pchap" mode="label.markup"/>
-            <xsl:apply-templates select="$pchap" mode="intralabel.punctuation"/>
-          <xsl:number format="1" from="chapter|appendix" level="any"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:number format="1" from="book|article" level="any"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="procedure" mode="label.markup">
-  <xsl:variable name="pchap"
-                select="ancestor::chapter
-                        |ancestor::appendix
-                        |ancestor::article[ancestor::book]"/>
-
-  <xsl:variable name="prefix">
-    <xsl:if test="count($pchap) &gt; 0">
-      <xsl:apply-templates select="$pchap" mode="label.markup"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="@label">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:when test="$formal.procedures = 0">
-      <!-- No label -->
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="count($pchap)>0">
-          <xsl:if test="$prefix != ''">
-            <xsl:apply-templates select="$pchap" mode="label.markup"/>
-            <xsl:apply-templates select="$pchap" mode="intralabel.punctuation"/>
-          </xsl:if>
-          <xsl:number count="procedure[title]" format="1" 
-                      from="chapter|appendix" level="any"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:number count="procedure[title]" format="1" 
-                      from="book|article" level="any"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="equation" mode="label.markup">
-  <xsl:variable name="pchap"
-                select="ancestor::chapter
-                        |ancestor::appendix
-                        |ancestor::article[ancestor::book]"/>
-
-  <xsl:variable name="prefix">
-    <xsl:if test="count($pchap) &gt; 0">
-      <xsl:apply-templates select="$pchap" mode="label.markup"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="@label">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="count($pchap)>0">
-          <xsl:if test="$prefix != ''">
-            <xsl:apply-templates select="$pchap" mode="label.markup"/>
-            <xsl:apply-templates select="$pchap" mode="intralabel.punctuation"/>
-          </xsl:if>
-          <xsl:number format="1" count="equation[title or info/title]" 
-	              from="chapter|appendix" level="any"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:number format="1" count="equation[title or info/title]" 
-	              from="book|article" level="any"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="orderedlist/listitem" mode="label.markup">
-  <xsl:variable name="numeration">
-    <xsl:call-template name="list.numeration">
-      <xsl:with-param name="node" select="parent::orderedlist"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="type">
-    <xsl:choose>
-      <xsl:when test="$numeration='arabic'">1</xsl:when>
-      <xsl:when test="$numeration='loweralpha'">a</xsl:when>
-      <xsl:when test="$numeration='lowerroman'">i</xsl:when>
-      <xsl:when test="$numeration='upperalpha'">A</xsl:when>
-      <xsl:when test="$numeration='upperroman'">I</xsl:when>
-      <!-- What!? This should never happen -->
-      <xsl:otherwise>
-        <xsl:message>
-          <xsl:text>Unexpected numeration: </xsl:text>
-          <xsl:value-of select="$numeration"/>
-        </xsl:message>
-        <xsl:value-of select="1."/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="item-number">
-    <xsl:call-template name="orderedlist-item-number"/>
-  </xsl:variable>
-
-  <xsl:number value="$item-number" format="{$type}"/>
-</xsl:template>
-
-<xsl:template match="abstract" mode="label.markup">
-  <!-- nop -->
-</xsl:template>
-
-<xsl:template match="sidebar" mode="label.markup">
-  <!-- nop -->
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template name="label.this.section">
-  <xsl:param name="section" select="."/>
-
-  <xsl:variable name="level">
-    <xsl:call-template name="section.level"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$level &lt;= $section.autolabel.max.depth">      
-      <xsl:value-of select="$section.autolabel"/>
-    </xsl:when>
-    <xsl:otherwise>0</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<doc:template name="label.this.section" xmlns="">
-<refpurpose>Returns true if $section should be labelled</refpurpose>
-<refdescription id="label.this.section-desc">
-<para>Returns true if the specified section should be labelled.
-By default, this template returns zero unless 
-the section level is less than or equal to the value of the
-<literal>$section.autolabel.max.depth</literal> parameter, in
-which case it returns
-<literal>$section.autolabel</literal>.
-Custom stylesheets may override it to get more selective behavior.</para>
-</refdescription>
-</doc:template>
-
-<!-- ============================================================ -->
-
-<xsl:template name="default.autolabel.format">
-  <xsl:param name="context" select="."/>
-  <xsl:choose>
-    <xsl:when test="local-name($context) = 'appendix'">
-      <xsl:value-of select="'A'"/>
-    </xsl:when>
-    <xsl:when test="local-name($context) = 'part'">
-      <xsl:value-of select="'I'"/>
-    </xsl:when>
-    <xsl:otherwise>1</xsl:otherwise>
-  </xsl:choose>  
-</xsl:template>
-  
-<xsl:template name="autolabel.format">
-  <xsl:param name="context" select="."/>
-  <xsl:param name="format"/>
-
-  <xsl:choose>
-    <xsl:when test="string($format) != 0">
-      <xsl:choose>
-        <xsl:when test="string($format)='arabic' or $format='1'">1</xsl:when>
-        <xsl:when test="$format='loweralpha' or $format='a'">
-          <xsl:value-of select="'a'"/>
-        </xsl:when>
-        <xsl:when test="$format='lowerroman' or $format='i'">
-          <xsl:value-of select="'i'"/>
-        </xsl:when>
-        <xsl:when test="$format='upperalpha' or $format='A'">
-          <xsl:value-of select="'A'"/>
-        </xsl:when>
-        <xsl:when test="$format='upperroman' or $format='I'">
-          <xsl:value-of select="'I'"/>
-        </xsl:when>      
-	<xsl:when test="$format='arabicindic' or $format='&#x661;'">
-	  <xsl:value-of select="'&#x661;'"/>
-	</xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>Unexpected </xsl:text><xsl:value-of select="local-name(.)"/><xsl:text>.autolabel value: </xsl:text>
-            <xsl:value-of select="$format"/><xsl:text>; using default.</xsl:text>
-          </xsl:message>
-          <xsl:call-template name="default.autolabel.format"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<doc:template name="autolabel.format" xmlns="">
-<refpurpose>Returns format for autolabel parameters</refpurpose>
-<refdescription id="autolabel.format-desc">
-<para>Returns format passed as parameter if non zero. Supported
-  format are 'arabic' or '1', 'loweralpha' or 'a', 'lowerroman' or 'i', 
-  'upperlapha' or 'A', 'upperroman' or 'I', 'arabicindic' or '&#x661;'.
-  If its not one of these then 
-  returns the default format.</para>
-</refdescription>
-</doc:template>
-
-<!-- ============================================================ -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/olink.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/olink.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,1149 +1,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-<!-- Create keys for quickly looking up olink targets -->
-<xsl:key name="targetdoc-key" match="document" use="@targetdoc" />
-<xsl:key name="targetptr-key"  match="div|obj"
-         use="concat(ancestor::document/@targetdoc, '/',
-                     @targetptr, '/', ancestor::document/@lang)" />
-
-<!-- Return filename of database -->
-<xsl:template name="select.target.database">
-  <xsl:param name="targetdoc.att" select="''"/>
-  <xsl:param name="targetptr.att" select="''"/>
-  <xsl:param name="olink.lang" select="''"/>
-
-  <!-- use root's xml:base if exists -->
-  <xsl:variable name="xml.base" select="/*/@xml:base"/>
-
-  <!-- This selection can be customized if needed -->
-  <xsl:variable name="target.database.filename">
-    <xsl:choose>
-      <xsl:when test="$xml.base != '' and
-                   not(starts-with($target.database.document, 'file:/')) and
-                   not(starts-with($target.database.document, '/'))">
-        <xsl:call-template name="systemIdToBaseURI">
-          <xsl:with-param name="systemId" select="$xml.base"/>
-        </xsl:call-template>
-        <xsl:value-of select="$target.database.document"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$target.database.document"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="target.database" 
-      select="document($target.database.filename,/)"/>
-
-  <xsl:choose>
-    <!-- Was the database document parameter not set? -->
-    <xsl:when test="$target.database.document = ''">
-      <xsl:message>
-        <xsl:text>Olinks not processed: must specify a </xsl:text>
-        <xsl:text>$target.database.document parameter&#10;</xsl:text>
-        <xsl:text>when using olinks with targetdoc </xsl:text>
-        <xsl:text>and targetptr attributes.</xsl:text>
-      </xsl:message>
-    </xsl:when>
-    <!-- Did it not open? Should be a targetset element -->
-    <xsl:when test="not($target.database/*)">
-      <xsl:message>
-        <xsl:text>Olink error: could not open target database '</xsl:text>
-        <xsl:value-of select="$target.database.filename"/>
-        <xsl:text>'.</xsl:text>
-      </xsl:message>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$target.database.filename"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="select.olink.key">
-  <xsl:param name="targetdoc.att" select="''"/>
-  <xsl:param name="targetptr.att" select="''"/>
-  <xsl:param name="olink.lang" select="''"/>
-  <xsl:param name="target.database"/>
-
-  <xsl:if test="$target.database/*">
-    <xsl:variable name="olink.fallback.sequence">
-      <xsl:call-template name="select.olink.lang.fallback">
-        <xsl:with-param name="olink.lang" select="$olink.lang"/>
-      </xsl:call-template>
-    </xsl:variable>
-  
-    <!-- Recurse through the languages until you find a match -->
-    <xsl:call-template name="select.olink.key.in.lang">
-      <xsl:with-param name="targetdoc.att" select="$targetdoc.att"/>
-      <xsl:with-param name="targetptr.att" select="$targetptr.att"/>
-      <xsl:with-param name="olink.lang" select="$olink.lang"/>
-      <xsl:with-param name="target.database" select="$target.database"/>
-      <xsl:with-param name="fallback.index" select="1"/>
-      <xsl:with-param name="olink.fallback.sequence"
-                      select="$olink.fallback.sequence"/>
-    </xsl:call-template>
-  </xsl:if>
-  
-</xsl:template>
-
-<!-- Locate olink key in a particular language -->
-<xsl:template name="select.olink.key.in.lang">
-  <xsl:param name="targetdoc.att" select="''"/>
-  <xsl:param name="targetptr.att" select="''"/>
-  <xsl:param name="olink.lang" select="''"/>
-  <xsl:param name="target.database"/>
-  <xsl:param name="fallback.index" select="1"/>
-  <xsl:param name="olink.fallback.sequence" select="''"/>
-  
-  <xsl:variable name="target.lang">
-    <xsl:call-template name="select.target.lang">
-      <xsl:with-param name="fallback.index" select="$fallback.index"/>
-      <xsl:with-param name="olink.fallback.sequence"
-                      select="$olink.fallback.sequence"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:if test="$olink.debug != 0">
-    <xsl:message><xsl:text>Olink debug: cases for targetdoc='</xsl:text>
-      <xsl:value-of select="$targetdoc.att"/>
-      <xsl:text>' and targetptr='</xsl:text>
-      <xsl:value-of select="$targetptr.att"/>
-      <xsl:text>' in language '</xsl:text>
-      <xsl:value-of select="$target.lang"/>
-      <xsl:text>'.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <!-- Customize these cases if you want different selection logic -->
-  <xsl:variable name="CaseA">
-    <!-- targetdoc.att = not blank
-         targetptr.att = not blank
-    -->
-    <xsl:if test="$targetdoc.att != '' and
-                  $targetptr.att != ''">
-      <xsl:for-each select="$target.database">
-        <xsl:variable name="key" 
-                      select="concat($targetdoc.att, '/', 
-                                     $targetptr.att, '/',
-                                     $target.lang)"/>
-        <xsl:choose>
-          <xsl:when test="key('targetptr-key', $key)/@href != ''">
-            <xsl:value-of select="$key"/>
-            <xsl:if test="$olink.debug != 0">
-              <xsl:message>Olink debug: CaseA matched.</xsl:message>
-            </xsl:if>
-          </xsl:when>
-          <xsl:when test="$olink.debug != 0">
-            <xsl:message>Olink debug: CaseA NOT matched</xsl:message>
-          </xsl:when>
-        </xsl:choose>
-      </xsl:for-each>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="CaseB">
-    <!-- targetdoc.att = not blank
-         targetptr.att = not blank
-         prefer.internal.olink = not zero
-         current.docid = not blank 
-    -->
-    <xsl:if test="$targetdoc.att != '' and
-                  $targetptr.att != '' and
-                  $current.docid != '' and
-                  $prefer.internal.olink != 0">
-      <xsl:for-each select="$target.database">
-        <xsl:variable name="key" 
-                      select="concat($current.docid, '/', 
-                                     $targetptr.att, '/',
-                                     $target.lang)"/>
-        <xsl:choose>
-          <xsl:when test="key('targetptr-key', $key)/@href != ''">
-            <xsl:value-of select="$key"/>
-            <xsl:if test="$olink.debug != 0">
-              <xsl:message>Olink debug: CaseB matched.</xsl:message>
-            </xsl:if>
-          </xsl:when>
-          <xsl:when test="$olink.debug != 0">
-            <xsl:message>Olink debug: CaseB NOT matched</xsl:message>
-          </xsl:when>
-        </xsl:choose>
-      </xsl:for-each>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="CaseC">
-    <!-- targetdoc.att = blank
-         targetptr.att = not blank
-         current.docid = not blank 
-    -->
-    <xsl:if test="string-length($targetdoc.att) = 0 and
-                  $targetptr.att != '' and
-                  $current.docid != ''">
-      <!-- Must use a for-each to change context for keys to work -->
-      <xsl:for-each select="$target.database">
-        <xsl:variable name="key" 
-                      select="concat($current.docid, '/', 
-                                     $targetptr.att, '/',
-                                     $target.lang)"/>
-        <xsl:choose>
-          <xsl:when test="key('targetptr-key', $key)/@href != ''">
-            <xsl:value-of select="$key"/>
-            <xsl:if test="$olink.debug != 0">
-              <xsl:message>Olink debug: CaseC matched.</xsl:message>
-            </xsl:if>
-          </xsl:when>
-          <xsl:when test="$olink.debug != 0">
-            <xsl:message>Olink debug: CaseC NOT matched.</xsl:message>
-          </xsl:when>
-        </xsl:choose>
-      </xsl:for-each>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="CaseD">
-    <!-- targetdoc.att = blank
-         targetptr.att = not blank
-         current.docid = blank 
-    -->
-    <!-- This is possible if only one document in the database -->
-    <xsl:if test="string-length($targetdoc.att) = 0 and
-                  $targetptr.att != '' and
-                  string-length($current.docid) = 0 and
-                  count($target.database//document) = 1">
-      <xsl:for-each select="$target.database">
-        <xsl:variable name="key" 
-                      select="concat(.//document/@targetdoc, '/', 
-                                     $targetptr.att, '/',
-                                     $target.lang)"/>
-        <xsl:choose>
-          <xsl:when test="key('targetptr-key', $key)/@href != ''">
-            <xsl:value-of select="$key"/>
-            <xsl:if test="$olink.debug != 0">
-              <xsl:message>Olink debug: CaseD matched.</xsl:message>
-            </xsl:if>
-          </xsl:when>
-          <xsl:when test="$olink.debug != 0">
-            <xsl:message>Olink debug: CaseD NOT matched</xsl:message>
-          </xsl:when>
-        </xsl:choose>
-      </xsl:for-each>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="CaseE">
-    <!-- targetdoc.att = not blank
-         targetptr.att = blank
-    -->
-    <xsl:if test="$targetdoc.att != '' and
-                  string-length($targetptr.att) = 0">
-
-      <!-- Try the document's root element id -->
-      <xsl:variable name="rootid">
-        <xsl:choose>
-          <xsl:when test="$target.lang != ''">
-            <xsl:value-of select="$target.database//document[@targetdoc = $targetdoc.att and @lang = $target.lang]/*[1]/@targetptr"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$target.database//document[@targetdoc = $targetdoc.att and not(@lang)]/*[1]/@targetptr"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:for-each select="$target.database">
-        <xsl:variable name="key" 
-                      select="concat($targetdoc.att, '/', 
-                                     $rootid, '/',
-                                     $target.lang)"/>
-        <xsl:choose>
-          <xsl:when test="key('targetptr-key', $key)/@href != ''">
-            <xsl:value-of select="$key"/>
-            <xsl:if test="$olink.debug != 0">
-              <xsl:message>Olink debug: CaseE matched.</xsl:message>
-            </xsl:if>
-          </xsl:when>
-          <xsl:when test="$olink.debug != 0">
-            <xsl:message>Olink debug: CaseE NOT matched.</xsl:message>
-          </xsl:when>
-        </xsl:choose>
-      </xsl:for-each>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="CaseF">
-    <!-- targetdoc.att = not blank
-         targetptr.att = blank
-         prefer.internal.olink = not zero
-         current.docid = not blank 
-    -->
-    <xsl:if test="$targetdoc.att != '' and
-                  string-length($targetptr.att) = 0 and
-                  $current.docid != '' and
-                  $prefer.internal.olink != 0">
-      <!-- Try the document's root element id -->
-      <xsl:variable name="rootid">
-        <xsl:choose>
-          <xsl:when test="$target.lang != ''">
-            <xsl:value-of select="$target.database//document[@targetdoc = $current.docid and @lang = $target.lang]/*[1]/@targetptr"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$target.database//document[@targetdoc = $current.docid and not(@lang)]/*[1]/@targetptr"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:for-each select="$target.database">
-        <xsl:variable name="key" 
-                      select="concat($current.docid, '/', 
-                                     $rootid, '/',
-                                     $target.lang)"/>
-        <xsl:choose>
-          <xsl:when test="key('targetptr-key', $key)/@href != ''">
-            <xsl:value-of select="$key"/>
-            <xsl:if test="$olink.debug != 0">
-              <xsl:message>Olink debug: CaseF matched.</xsl:message>
-            </xsl:if>
-          </xsl:when>
-          <xsl:when test="$olink.debug != 0">
-            <xsl:message>Olink debug: CaseF NOT matched.</xsl:message>
-          </xsl:when>
-        </xsl:choose>
-      </xsl:for-each>
-    </xsl:if>
-  </xsl:variable>
-
-  <!-- Now select the best match. Customize the order if needed -->
-  <xsl:variable name="selected.key">
-    <xsl:choose>
-      <xsl:when test="$CaseB != ''">
-        <xsl:value-of select="$CaseB"/>
-        <xsl:if test="$olink.debug != 0">
-          <xsl:message>
-            <xsl:text>Olink debug: CaseB key is the final selection: </xsl:text>
-            <xsl:value-of select="$CaseB"/>
-          </xsl:message>
-        </xsl:if>
-      </xsl:when>
-      <xsl:when test="$CaseA != ''">
-        <xsl:value-of select="$CaseA"/>
-        <xsl:if test="$olink.debug != 0">
-          <xsl:message>
-            <xsl:text>Olink debug: CaseA key is the final selection: </xsl:text>
-            <xsl:value-of select="$CaseA"/>
-          </xsl:message>
-        </xsl:if>
-      </xsl:when>
-      <xsl:when test="$CaseC != ''">
-        <xsl:value-of select="$CaseC"/>
-        <xsl:if test="$olink.debug != 0">
-          <xsl:message>
-            <xsl:text>Olink debug: CaseC key is the final selection: </xsl:text>
-            <xsl:value-of select="$CaseC"/>
-          </xsl:message>
-        </xsl:if>
-      </xsl:when>
-      <xsl:when test="$CaseD != ''">
-        <xsl:value-of select="$CaseD"/>
-        <xsl:if test="$olink.debug != 0">
-          <xsl:message>
-            <xsl:text>Olink debug: CaseD key is the final selection: </xsl:text>
-            <xsl:value-of select="$CaseD"/>
-          </xsl:message>
-        </xsl:if>
-      </xsl:when>
-      <xsl:when test="$CaseF != ''">
-        <xsl:value-of select="$CaseF"/>
-        <xsl:if test="$olink.debug != 0">
-          <xsl:message>
-            <xsl:text>Olink debug: CaseF key is the final selection: </xsl:text>
-            <xsl:value-of select="$CaseF"/>
-          </xsl:message>
-        </xsl:if>
-      </xsl:when>
-      <xsl:when test="$CaseE != ''">
-        <xsl:value-of select="$CaseE"/>
-        <xsl:if test="$olink.debug != 0">
-          <xsl:message>
-            <xsl:text>Olink debug: CaseE key is the final selection: </xsl:text>
-            <xsl:value-of select="$CaseE"/>
-          </xsl:message>
-        </xsl:if>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:if test="$olink.debug != 0">
-          <xsl:message>
-            <xsl:text>Olink debug: No case matched for lang '</xsl:text>
-            <xsl:value-of select="$target.lang"/>
-            <xsl:text>'.</xsl:text>
-          </xsl:message>
-        </xsl:if>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$selected.key != ''">
-      <xsl:value-of select="$selected.key"/>
-    </xsl:when>
-    <xsl:when test="string-length($selected.key) = 0 and 
-                    string-length($target.lang) = 0">
-      <!-- No match on last try, and we are done -->
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- Recurse through next language -->
-      <xsl:call-template name="select.olink.key.in.lang">
-        <xsl:with-param name="targetdoc.att" select="$targetdoc.att"/>
-        <xsl:with-param name="targetptr.att" select="$targetptr.att"/>
-        <xsl:with-param name="olink.lang" select="$olink.lang"/>
-        <xsl:with-param name="target.database" select="$target.database"/>
-        <xsl:with-param name="fallback.index" select="$fallback.index + 1"/>
-        <xsl:with-param name="olink.fallback.sequence"
-                        select="$olink.fallback.sequence"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="select.target.lang">
-  <xsl:param name="fallback.index" select="1"/>
-  <xsl:param name="olink.fallback.sequence" select="''"/>
-
-  <!-- recurse backwards to find the lang matching the index -->
-  <xsl:variable name="firstlang" 
-                select="substring-before($olink.fallback.sequence, ' ')"/>
-  <xsl:variable name="rest" 
-                select="substring-after($olink.fallback.sequence, ' ')"/>
-  <xsl:choose>
-    <xsl:when test="$fallback.index = 1">
-      <xsl:value-of select="$firstlang"/>
-    </xsl:when>
-    <xsl:when test="$fallback.index &gt; 1">
-      <xsl:call-template name="select.target.lang">
-        <xsl:with-param name="fallback.index" select="$fallback.index - 1"/>
-        <xsl:with-param name="olink.fallback.sequence"
-                        select="$rest"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="select.olink.lang.fallback">
-  <xsl:param name="olink.lang" select="''"/>
-
-  <!-- Prefer language of the olink element -->
-  <xsl:value-of select="concat(normalize-space(concat($olink.lang, ' ', 
-                        $olink.lang.fallback.sequence)), ' ')"/>
-</xsl:template>
-
-<!-- Returns the complete olink href value if found -->
-<xsl:template name="make.olink.href">
-  <xsl:param name="olink.key" select="''"/>
-  <xsl:param name="target.database"/>
-
-  <xsl:if test="$olink.key != ''">
-    <xsl:variable name="target.href" >
-      <xsl:for-each select="$target.database" >
-        <xsl:value-of select="key('targetptr-key', $olink.key)/@href" />
-      </xsl:for-each>
-    </xsl:variable>
-  
-    <xsl:variable name="targetdoc">
-      <xsl:value-of select="substring-before($olink.key, '/')"/>
-    </xsl:variable>
-  
-    <!-- Does the target database use a sitemap? -->
-    <xsl:variable name="use.sitemap">
-      <xsl:choose>
-        <xsl:when test="$target.database//sitemap">1</xsl:when>
-        <xsl:otherwise>0</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-  
-  
-    <!-- Get the baseuri for this targetptr -->
-    <xsl:variable name="baseuri" >
-      <xsl:choose>
-        <!-- Does the database use a sitemap? -->
-        <xsl:when test="$use.sitemap != 0" >
-          <xsl:choose>
-            <!-- Was current.docid parameter set? -->
-            <xsl:when test="$current.docid != ''">
-              <!-- Was it found in the database? -->
-              <xsl:variable name="currentdoc.key" >
-                <xsl:for-each select="$target.database" >
-                  <xsl:value-of select="key('targetdoc-key',
-                                        $current.docid)/@targetdoc" />
-                </xsl:for-each>
-              </xsl:variable>
-              <xsl:choose>
-                <xsl:when test="$currentdoc.key != ''">
-                  <xsl:for-each select="$target.database" >
-                    <xsl:call-template name="targetpath" >
-                      <xsl:with-param name="dirnode" 
-                          select="key('targetdoc-key', $current.docid)/parent::dir"/>
-                      <xsl:with-param name="targetdoc" select="$targetdoc"/>
-                    </xsl:call-template>
-                  </xsl:for-each >
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:message>
-                    <xsl:text>Olink error: cannot compute relative </xsl:text>
-                    <xsl:text>sitemap path because $current.docid '</xsl:text>
-                    <xsl:value-of select="$current.docid"/>
-                    <xsl:text>' not found in target database.</xsl:text>
-                  </xsl:message>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:message>
-                <xsl:text>Olink warning: cannot compute relative </xsl:text>
-                <xsl:text>sitemap path without $current.docid parameter</xsl:text>
-              </xsl:message>
-            </xsl:otherwise>
-          </xsl:choose> 
-          <!-- In either case, add baseuri from its document entry-->
-          <xsl:variable name="docbaseuri">
-            <xsl:for-each select="$target.database" >
-              <xsl:value-of select="key('targetdoc-key', $targetdoc)/@baseuri" />
-            </xsl:for-each>
-          </xsl:variable>
-          <xsl:if test="$docbaseuri != ''" >
-            <xsl:value-of select="$docbaseuri"/>
-          </xsl:if>
-        </xsl:when>
-        <!-- No database sitemap in use -->
-        <xsl:otherwise>
-          <!-- Just use any baseuri from its document entry -->
-          <xsl:variable name="docbaseuri">
-            <xsl:for-each select="$target.database" >
-              <xsl:value-of select="key('targetdoc-key', $targetdoc)/@baseuri" />
-            </xsl:for-each>
-          </xsl:variable>
-          <xsl:if test="$docbaseuri != ''" >
-            <xsl:value-of select="$docbaseuri"/>
-          </xsl:if>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-  
-    <!-- Form the href information -->
-    <xsl:if test="$baseuri != ''">
-      <xsl:value-of select="$baseuri"/>
-      <xsl:if test="substring($target.href,1,1) != '#'">
-        <!--xsl:text>/</xsl:text-->
-      </xsl:if>
-    </xsl:if>
-    <!-- optionally turn off frag for PDF references -->
-    <xsl:if test="not($insert.olink.pdf.frag = 0 and
-          translate(substring($baseuri, string-length($baseuri) - 3),
-                    'PDF', 'pdf') = '.pdf'
-          and starts-with($target.href, '#') )">
-      <xsl:value-of select="$target.href"/>
-    </xsl:if>
-  </xsl:if>
-</xsl:template>
-
-<!-- Computes the href of the object containing the olink element -->
-<xsl:template name="olink.from.uri">
-  <xsl:param name="target.database"/>
-  <xsl:param name="object" select="NotAnElement"/>
-  <xsl:param name="object.targetdoc" select="$current.docid"/>
-  <xsl:param name="object.lang" 
-           select="concat($object/ancestor::*[last()]/@lang,
-                          $object/ancestor::*[last()]/@xml:lang)"/>
-
-  <xsl:variable name="parent.id">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$object"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <!-- Get the olink key for the parent of olink element -->
-  <xsl:variable name="from.key">
-    <xsl:call-template name="select.olink.key">
-      <xsl:with-param name="targetdoc.att" select="$object.targetdoc"/>
-      <xsl:with-param name="targetptr.att" select="$parent.id"/>
-      <xsl:with-param name="olink.lang" select="$object.lang"/>
-      <xsl:with-param name="target.database" select="$target.database"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="from.olink.href">
-    <xsl:for-each select="$target.database" >
-      <xsl:value-of select="key('targetptr-key', $from.key)/@href" />
-    </xsl:for-each>
-  </xsl:variable>
-
-  <xsl:choose>
-    <!-- we found the olink object -->
-    <xsl:when test="$from.olink.href != ''">
-      <xsl:value-of select="$from.olink.href"/>
-    </xsl:when>
-    <xsl:when test="not($object/parent::*)">
-      <xsl:value-of select="$from.olink.href"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- recurse upward in current document -->
-      <xsl:call-template name="olink.from.uri">
-        <xsl:with-param name="target.database" select="$target.database"/>
-        <xsl:with-param name="object" select="$object/parent::*"/>
-        <xsl:with-param name="object.targetdoc" select="$object.targetdoc"/>
-        <xsl:with-param name="object.lang" select="$object.lang"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="olink.hottext">
-  <xsl:param name="target.database"/>
-  <xsl:param name="olink.lang" select="''"/>
-  <xsl:param name="olink.key" select="''"/>
-  <xsl:param name="referrer" select="."/>
-  <xsl:param name="xrefstyle">
-    <xsl:choose>
-      <xsl:when test="@role and not(@xrefstyle) 
-                      and $use.role.as.xrefstyle != 0">
-        <xsl:value-of select="@role"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="@xrefstyle"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:param>
-
-  <xsl:choose>
-    <!-- If it has elements or text (not just PI or comment) -->
-    <xsl:when test="child::text() or child::*">
-      <xsl:apply-templates/>
-    </xsl:when>
-    <xsl:when test="$olink.key != ''">
-      <!-- Get the xref text for this record -->
-      <xsl:variable name="xref.text" >
-        <xsl:for-each select="$target.database" >
-          <xsl:copy-of 
-                  select="key('targetptr-key', $olink.key)/xreftext/node()" />
-        </xsl:for-each>
-      </xsl:variable>
-
-      <xsl:variable name="xref.number" >
-        <xsl:for-each select="$target.database" >
-          <xsl:value-of select="key('targetptr-key', $olink.key)/@number" />
-        </xsl:for-each>
-      </xsl:variable>
-
-      <xsl:variable name="target.elem" >
-        <xsl:for-each select="$target.database" >
-          <xsl:value-of select="key('targetptr-key', $olink.key)/@element" />
-        </xsl:for-each>
-      </xsl:variable>
-
-      <xsl:variable name="lang">
-        <xsl:variable name="candidate">
-          <xsl:for-each select="$target.database" >
-            <xsl:value-of 
-                      select="key('targetptr-key', $olink.key)/@lang" />
-          </xsl:for-each>
-        </xsl:variable>
-        <xsl:choose>
-          <xsl:when test="$candidate != ''">
-            <xsl:value-of select="$candidate"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$olink.lang"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="targetdoc">
-        <xsl:value-of select="substring-before($olink.key, '/')"/>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="$xrefstyle != '' and
-                        starts-with(normalize-space($xrefstyle), 'select:') and
-                        (contains($xrefstyle, 'nodocname') or
-                        contains($xrefstyle, 'nopage')) and
-                        not(contains($xrefstyle, 'title')) and
-                        not(contains($xrefstyle, 'label'))"> 
-          <xsl:copy-of select="$xref.text"/>
-        </xsl:when>
-        <xsl:when test="$xrefstyle != ''">
-          <xsl:if test="$olink.debug != 0">
-            <xsl:message>
-              <xsl:text>xrefstyle is '</xsl:text>
-              <xsl:value-of select="$xrefstyle"/>
-              <xsl:text>'.</xsl:text>
-            </xsl:message>
-          </xsl:if>
-          <xsl:variable name="template">
-            <xsl:choose>
-              <xsl:when test="starts-with(normalize-space($xrefstyle),
-                                          'select:')">
-                <xsl:call-template name="make.gentext.template">
-                  <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-                  <xsl:with-param name="purpose" select="'olink'"/>
-                  <xsl:with-param name="referrer" select="."/>
-                  <xsl:with-param name="target.elem" select="$target.elem"/>
-                </xsl:call-template>
-              </xsl:when>
-              <xsl:when test="starts-with(normalize-space($xrefstyle),
-                                          'template:')">
-                <xsl:value-of select="substring-after(
-                                 normalize-space($xrefstyle), 'template:')"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <!-- Look for Gentext template with @style attribute -->
-                <!-- Must compare to no style value because gentext.template
-                     falls back to no style -->
-
-                <xsl:variable name="xref-context">
-                  <xsl:call-template name="gentext.template">
-                    <xsl:with-param name="context" select="'xref'"/>
-                    <xsl:with-param name="name" select="$target.elem"/>
-                    <xsl:with-param name="lang" select="$lang"/>
-                  </xsl:call-template>
-                </xsl:variable>
-
-                <xsl:variable name="styled-xref-context">
-                  <xsl:call-template name="gentext.template">
-                    <xsl:with-param name="context" select="'xref'"/>
-                    <xsl:with-param name="name" select="$target.elem"/>
-                    <xsl:with-param name="lang" select="$lang"/>
-                    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-                  </xsl:call-template>
-                </xsl:variable>
-
-                <xsl:variable name="xref-number-context">
-                  <xsl:call-template name="gentext.template">
-                    <xsl:with-param name="context" select="'xref-number'"/>
-                    <xsl:with-param name="name" select="$target.elem"/>
-                    <xsl:with-param name="lang" select="$lang"/>
-                  </xsl:call-template>
-                </xsl:variable>
-
-                <xsl:variable name="styled-xref-number-context">
-                  <xsl:call-template name="gentext.template">
-                    <xsl:with-param name="context" select="'xref-number'"/>
-                    <xsl:with-param name="name" select="$target.elem"/>
-                    <xsl:with-param name="lang" select="$lang"/>
-                    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-                  </xsl:call-template>
-                </xsl:variable>
-
-                <xsl:variable name="xref-number-and-title-context">
-                  <xsl:call-template name="gentext.template">
-                    <xsl:with-param name="context" 
-                                    select="'xref-number-and-title'"/>
-                    <xsl:with-param name="name" select="$target.elem"/>
-                    <xsl:with-param name="lang" select="$lang"/>
-                  </xsl:call-template>
-                </xsl:variable>
-
-                <xsl:variable name="styled-xref-number-and-title-context">
-                  <xsl:call-template name="gentext.template">
-                    <xsl:with-param name="context" 
-                                    select="'xref-number-and-title'"/>
-                    <xsl:with-param name="name" select="$target.elem"/>
-                    <xsl:with-param name="lang" select="$lang"/>
-                    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-                  </xsl:call-template>
-                </xsl:variable>
-
-                <xsl:choose>
-                  <xsl:when test="$xref-number-and-title-context != 
-                                 $styled-xref-number-and-title-context and
-                                 $xref.number != '' and
-                                 $xref.with.number.and.title != 0">
-                    <xsl:value-of 
-                            select="$styled-xref-number-and-title-context"/>
-                  </xsl:when>
-                  <xsl:when test="$xref-number-context != 
-                                 $styled-xref-number-context and
-                                 $xref.number != ''">
-                    <xsl:value-of select="$styled-xref-number-context"/>
-                  </xsl:when>
-                  <xsl:when test="$xref-context != $styled-xref-context">
-                    <xsl:value-of select="$styled-xref-context"/>
-                  </xsl:when>
-                  <xsl:when test="$xref-number-and-title-context != '' and
-                                 $xref.number != '' and
-                                 $xref.with.number.and.title != 0">
-                    <xsl:value-of 
-                            select="$xref-number-and-title-context"/>
-                    <xsl:if test="$olink.debug">
-                      <xsl:message>
-                        <xsl:text>Olink error: no gentext template</xsl:text>
-                        <xsl:text> exists for xrefstyle '</xsl:text>
-                        <xsl:value-of select="$xrefstyle"/>
-                        <xsl:text>' for element '</xsl:text>
-                        <xsl:value-of select="$target.elem"/>
-                        <xsl:text>' in language '</xsl:text>
-                        <xsl:value-of select="$lang"/>
-                        <xsl:text>' in context 'xref-number-and-title</xsl:text>
-                        <xsl:text>'. Using template without @style.</xsl:text>
-                      </xsl:message>
-                    </xsl:if>
-                  </xsl:when>
-                  <xsl:when test="$xref-number-context != '' and
-                                 $xref.number != ''">
-                    <xsl:value-of select="$xref-number-context"/>
-                    <xsl:if test="$olink.debug">
-                      <xsl:message>
-                        <xsl:text>Olink error: no gentext template</xsl:text>
-                        <xsl:text> exists for xrefstyle '</xsl:text>
-                        <xsl:value-of select="$xrefstyle"/>
-                        <xsl:text>' for element '</xsl:text>
-                        <xsl:value-of select="$target.elem"/>
-                        <xsl:text>' in language '</xsl:text>
-                        <xsl:value-of select="$lang"/>
-                        <xsl:text>' in context 'xref-number</xsl:text>
-                        <xsl:text>'. Using template without @style.</xsl:text>
-                      </xsl:message>
-                    </xsl:if>
-                  </xsl:when>
-                  <xsl:when test="$xref-context != ''">
-                    <xsl:value-of select="$xref-context"/>
-                    <xsl:if test="$olink.debug">
-                      <xsl:message>
-                        <xsl:text>Olink error: no gentext template</xsl:text>
-                        <xsl:text> exists for xrefstyle '</xsl:text>
-                        <xsl:value-of select="$xrefstyle"/>
-                        <xsl:text>' for element '</xsl:text>
-                        <xsl:value-of select="$target.elem"/>
-                        <xsl:text>' in language '</xsl:text>
-                        <xsl:value-of select="$lang"/>
-                        <xsl:text>' in context 'xref</xsl:text>
-                        <xsl:text>'. Using template without @style.</xsl:text>
-                      </xsl:message>
-                    </xsl:if>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:message>
-                      <xsl:text>Olink error: no gentext template</xsl:text>
-                      <xsl:text> exists for xrefstyle '</xsl:text>
-                      <xsl:value-of select="$xrefstyle"/>
-                      <xsl:text>' for element '</xsl:text>
-                      <xsl:value-of select="$target.elem"/>
-                      <xsl:text>' in language '</xsl:text>
-                      <xsl:value-of select="$lang"/>
-                      <xsl:text>'. Trying '%t'.</xsl:text>
-                    </xsl:message>
-                    <xsl:value-of select="'%t'"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:variable>
-
-          <xsl:if test="$olink.debug != 0">
-            <xsl:message>
-              <xsl:text>Olink debug: xrefstyle template is '</xsl:text>
-              <xsl:value-of select="$template"/>
-              <xsl:text>'.</xsl:text>
-            </xsl:message>
-          </xsl:if>
-
-          <xsl:call-template name="substitute-markup">
-            <xsl:with-param name="template" select="$template"/>
-            <xsl:with-param name="title">
-              <xsl:for-each select="$target.database" >
-                <xsl:value-of select="key('targetptr-key', $olink.key)/ttl" />
-              </xsl:for-each>
-            </xsl:with-param>
-            <xsl:with-param name="label">
-              <xsl:for-each select="$target.database" >
-                <xsl:value-of 
-                        select="key('targetptr-key', $olink.key)/@number" />
-              </xsl:for-each>
-            </xsl:with-param>
-            <xsl:with-param name="pagenumber">
-              <xsl:for-each select="$target.database" >
-                <xsl:value-of 
-                        select="key('targetptr-key', $olink.key)/@page" />
-              </xsl:for-each>
-            </xsl:with-param>
-            <xsl:with-param name="docname">
-              <xsl:for-each select="$target.database" >
-                <xsl:value-of 
-                       select="key('targetdoc-key', $targetdoc)/div[1]/ttl" />
-              </xsl:for-each>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-
-        <xsl:when test="$use.local.olink.style != 0">
-
-          <xsl:variable name="template">
-            <xsl:call-template name="gentext.template">
-              <xsl:with-param name="context" select="'xref'"/>
-              <xsl:with-param name="name" select="$target.elem"/>
-              <xsl:with-param name="lang" select="$lang"/>
-            </xsl:call-template>
-          </xsl:variable>
-
-          <xsl:call-template name="substitute-markup">
-            <xsl:with-param name="template" select="$template"/>
-            <xsl:with-param name="title">
-              <xsl:for-each select="$target.database" >
-                <xsl:value-of select="key('targetptr-key', $olink.key)/ttl" />
-              </xsl:for-each>
-            </xsl:with-param>
-            <xsl:with-param name="label">
-              <xsl:for-each select="$target.database" >
-                <xsl:value-of 
-                          select="key('targetptr-key', $olink.key)/@number" />
-              </xsl:for-each>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="$xref.text !=''">
-          <xsl:copy-of select="$xref.text"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>Olink error: no generated text for </xsl:text>
-            <xsl:text>targetdoc/targetptr/lang = '</xsl:text>
-            <xsl:value-of select="$olink.key"/>
-            <xsl:text>'.</xsl:text>
-          </xsl:message>
-          <xsl:text>????</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="@targetdoc != '' or @targetptr != ''">
-      <xsl:if test="$olink.key != ''">
-        <xsl:message>
-          <xsl:text>Olink error: no generated text for </xsl:text>
-          <xsl:text>targetdoc/targetptr/lang = '</xsl:text>
-          <xsl:value-of select="$olink.key"/>
-          <xsl:text>'.</xsl:text>
-        </xsl:message>
-      </xsl:if>
-      <xsl:text>????</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- old style olink -->
-      <xsl:call-template name="olink.outline">
-        <xsl:with-param name="outline.base.uri"
-                        select="unparsed-entity-uri(@targetdocent)"/>
-        <xsl:with-param name="localinfo" select="@localinfo"/>
-        <xsl:with-param name="return" select="'xreftext'"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="olink.docname.markup">
-  <!-- No-op for now -->
-</xsl:template>
-
-<xsl:template name="targetpath">
-  <xsl:param name="dirnode" />
-  <xsl:param name="targetdoc" select="''"/>
-
-<!-- 
-<xsl:message>dirnode is <xsl:value-of select="$dirnode/@name"/></xsl:message>
-<xsl:message>targetdoc is <xsl:value-of select="$targetdoc"/></xsl:message>
--->
-  <!-- recursive template generates path to olink target directory -->
-  <xsl:choose>
-    <!-- Have we arrived at the final path step? -->
-    <xsl:when test="$dirnode/child::document[@targetdoc = $targetdoc]">
-      <!-- We are done -->
-    </xsl:when>
-    <!-- Have we reached the top without a match? -->
-    <xsl:when test="local-name($dirnode) != 'dir'" >
-        <xsl:message>Olink error: cannot locate targetdoc <xsl:value-of select="$targetdoc"/> in sitemap</xsl:message>
-    </xsl:when>
-    <!-- Is the target in a descendant? -->
-    <xsl:when test="$dirnode/descendant::document/@targetdoc = $targetdoc">
-      <xsl:variable name="step" select="$dirnode/child::dir[descendant::document/@targetdoc = $targetdoc]"/>
-      <xsl:if test = "$step">
-        <xsl:value-of select="$step/@name"/>
-        <xsl:text>/</xsl:text>
-      </xsl:if>
-      <!-- Now recurse with the child -->
-      <xsl:call-template name="targetpath" >
-        <xsl:with-param name="dirnode" select="$step"/>
-        <xsl:with-param name="targetdoc" select="$targetdoc"/>
-      </xsl:call-template>
-    </xsl:when>
-    <!-- Otherwise we need to move up a step -->
-    <xsl:otherwise>
-      <xsl:if test="$dirnode/parent::dir">
-        <xsl:text>../</xsl:text>
-      </xsl:if>
-      <xsl:call-template name="targetpath" >
-        <xsl:with-param name="dirnode" select="$dirnode/parent::*"/>
-        <xsl:with-param name="targetdoc" select="$targetdoc"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="olink.page.citation">
-  <xsl:param name="olink.key" select="''"/>
-  <xsl:param name="olink.lang" select="'en'"/>
-  <xsl:param name="target.database"/>
-  <xsl:param name="linkend" select="''"/>
-  <xsl:param name="xrefstyle">
-    <xsl:choose>
-      <xsl:when test="@role and not(@xrefstyle) 
-                      and $use.role.as.xrefstyle != 0">
-        <xsl:value-of select="@role"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="@xrefstyle"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:param>
-
-  <xsl:variable name="targetdoc">
-    <xsl:value-of select="substring-before($olink.key, '/')"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$linkend != ''">
-      <xsl:call-template name="xref.page.citation">
-        <xsl:with-param name="linkend" select="$linkend"/>
-        <xsl:with-param name="target" select="key('id', $linkend)"/>
-        <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="not(starts-with(normalize-space($xrefstyle),
-                        'select:') 
-                and (contains($xrefstyle, 'page')
-                     or contains($xrefstyle, 'Page')))
-                and $current.docid != '' 
-                and $current.docid != $targetdoc
-                and $insert.olink.page.number = 'yes' ">
-  
-      <xsl:variable name="page-number">
-        <xsl:for-each select="$target.database" >
-          <xsl:value-of 
-                 select="key('targetptr-key', $olink.key)/@page" />
-        </xsl:for-each>
-      </xsl:variable>
-  
-      <xsl:if test="$page-number != ''">
-        <xsl:call-template name="substitute-markup">
-          <xsl:with-param name="template">
-            <xsl:call-template name="gentext.template">
-              <xsl:with-param name="name" select="'olink.page.citation'"/>
-              <xsl:with-param name="context" select="'xref'"/>
-              <xsl:with-param name="lang" select="$olink.lang"/>
-            </xsl:call-template>
-          </xsl:with-param>
-          <xsl:with-param name="pagenumber" select="$page-number"/>
-        </xsl:call-template>
-      </xsl:if>
-  
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="olink.document.citation">
-  <xsl:param name="olink.key" select="''"/>
-  <xsl:param name="olink.lang" select="'en'"/>
-  <xsl:param name="target.database"/>
-  <xsl:param name="xrefstyle">
-    <xsl:choose>
-      <xsl:when test="@role and not(@xrefstyle) 
-                      and $use.role.as.xrefstyle != 0">
-        <xsl:value-of select="@role"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="@xrefstyle"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:param>
-
-  <xsl:variable name="page">
-    <xsl:for-each select="$target.database" >
-      <xsl:value-of 
-             select="key('targetptr-key', $olink.key)/@page" />
-    </xsl:for-each>
-  </xsl:variable>
-
-  <xsl:variable name="targetdoc">
-    <xsl:value-of select="substring-before($olink.key, '/')"/>
-  </xsl:variable>
-
-  <xsl:variable name="targetptr">
-    <xsl:value-of 
-          select="substring-before(substring-after($olink.key, '/'), '/')"/>
-  </xsl:variable>
-
-  <!-- Don't add docname if pointing to root element -->
-  <xsl:variable name="rootptr">
-    <xsl:for-each select="$target.database" >
-      <xsl:value-of 
-             select="key('targetdoc-key', $targetdoc)/div[1]/@targetptr" />
-    </xsl:for-each>
-  </xsl:variable>
-
-  <xsl:variable name="docname">
-    <xsl:for-each select="$target.database" >
-      <xsl:value-of 
-             select="key('targetdoc-key', $targetdoc)/div[1]/ttl" />
-    </xsl:for-each>
-  </xsl:variable>
-
-  <xsl:if test="not(starts-with(normalize-space($xrefstyle), 'select:') 
-              and (contains($xrefstyle, 'docname')))
-              and ($olink.doctitle = 'yes' or $olink.doctitle = '1')
-              and $current.docid != '' 
-              and $rootptr != $targetptr
-              and $current.docid != $targetdoc
-              and $docname != ''">
-    <xsl:call-template name="substitute-markup">
-      <xsl:with-param name="template">
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="name" select="'olink.document.citation'"/>
-          <xsl:with-param name="context" select="'xref'"/>
-          <xsl:with-param name="lang" select="$olink.lang"/>
-        </xsl:call-template>
-      </xsl:with-param>
-      <xsl:with-param name="docname" select="$docname"/>
-      <xsl:with-param name="pagenumber" select="$page"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="xref.page.citation">
-  <!-- Determine if this xref should have a page citation.
-       Context node is the xref or local olink element -->
-  <xsl:param name="linkend" select="@linkend"/>
-  <xsl:param name="target" select="key('id', $linkend)"/>
-  <xsl:param name="xrefstyle">
-    <xsl:choose>
-      <xsl:when test="@role and not(@xrefstyle) 
-                      and $use.role.as.xrefstyle != 0">
-        <xsl:value-of select="@role"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="@xrefstyle"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:param>
-
-  <xsl:if test="not(starts-with(normalize-space($xrefstyle),'select:')
-                    and (contains($xrefstyle, 'page')
-                         or contains($xrefstyle, 'Page')))
-                and ( $insert.xref.page.number = 'yes' 
-                   or $insert.xref.page.number = '1')
-                or local-name($target) = 'para'">
-    <xsl:apply-templates select="$target" mode="page.citation">
-      <xsl:with-param name="id" select="$linkend"/>
-    </xsl:apply-templates>
-  </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/pi.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/pi.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,346 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-  xmlns:date="http://exslt.org/dates-and-times"
-  xmlns:exsl="http://exslt.org/common"
-  xmlns:xlink="http://www.w3.org/1999/xlink"
-  exclude-result-prefixes="doc date exsl"
-  extension-element-prefixes="date exsl"
-  version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<doc:reference xmlns=""><info><title>Common Processing Instruction Reference</title>
-    <releaseinfo role="meta">
-      $Id$
-    </releaseinfo>
-  </info>
-  <partintro id="partintro">
-    <title>Introduction</title>
-    <para>This is generated reference documentation for all
-      user-specifiable processing instructions (PIs) in the
-      âcommonâ part of the DocBook XSL stylesheets.
-      <note>
-        <para>You add these PIs at particular points in a document to
-          cause specific âexceptionsâ to formatting/output behavior. To
-          make global changes in formatting/output behavior across an
-          entire document, itâs better to do it by setting an
-          appropriate stylesheet parameter (if there is one).</para>
-      </note>
-    </para>
-  </partintro>
-</doc:reference>
-
-<!-- ==================================================================== -->
-<doc:pi name="dbchoice_choice" xmlns="">
-  <refpurpose>Generates a localized choice separator</refpurpose>
-  <refdescription id="select.choice.separator-desc">
-    <para>Use the <tag class="xmlpi">dbchoice choice</tag> PI to
-      generate an appropriate localized âchoiceâ separator (for
-      example, <literal>and</literal> or <literal>or</literal>)
-      before the final item in an inline <tag>simplelist</tag></para>
-    <warning>
-      <para>This PI is a less-than-ideal hack; support for it may
-        disappear in the future (particularly if and when a more
-        appropriate means for marking up "choice" lists becomes
-        available in DocBook).</para>
-    </warning>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbchoice choice="and"|"or"|<replaceable>string</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>choice="and"</term>
-        <listitem>
-          <para>generates a localized <literal>and</literal> separator</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>choice="or"</term>
-        <listitem>
-          <para>generates a localized <literal>or</literal> separator</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>choice="<replaceable>string</replaceable>"</term>
-        <listitem>
-          <para>generates a literal <replaceable>string</replaceable> separator</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-</doc:pi>
-<xsl:template name="pi.dbchoice_choice">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="pi-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbchoice')"/>
-    <xsl:with-param name="attribute">choice</xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbtimestamp" xmlns="">
-  <refpurpose>Inserts a date timestamp</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbtimestamp</tag> PI at any point in a
-      source document to cause a date timestamp (a formatted
-      string representing the current date and time) to be
-      inserted in output of the document.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbtimestamp format="<replaceable>formatstring</replaceable>" [padding="0"|"1"]</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>format="<replaceable>formatstring</replaceable>"</term>
-        <listitem>
-          <para>Specifies format in which the date and time are
-            output</para>
-        <note>
-          <para>For details of the content of the format string,
-            see <link role="tcg" xlink:href="Datetime.html"
-              >Date and time</link>.</para>
-        </note>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>padding="0"|"1"</term>
-        <listitem>
-          <para>Specifies padding behavior; if non-zero, padding is is added</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-</doc:pi>
-<xsl:template name="pi.dbtimestamp">
-  <xsl:variable name="format">
-    <xsl:variable name="pi-format">
-      <xsl:call-template name="pi-attribute">
-        <xsl:with-param name="pis" select="."/>
-        <xsl:with-param name="attribute">format</xsl:with-param>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="$pi-format != ''">
-        <xsl:value-of select="$pi-format"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'datetime'"/>
-          <xsl:with-param name="name" select="'format'"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable> 
-  <xsl:variable name="padding">
-    <xsl:variable name="pi-padding">
-      <xsl:call-template name="pi-attribute">
-        <xsl:with-param name="pis" select="."/>
-        <xsl:with-param name="attribute">padding</xsl:with-param>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="$pi-padding != ''">
-        <xsl:value-of select="$pi-padding"/>
-      </xsl:when>
-      <xsl:otherwise>1</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:variable name="date">
-    <xsl:choose>
-      <xsl:when test="function-available('date:date-time')">
-        <xsl:value-of select="date:date-time()"/>
-      </xsl:when>
-      <xsl:when test="function-available('date:dateTime')">
-        <!-- Xalan quirk -->
-        <xsl:value-of select="date:dateTime()"/>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:choose>
-    <xsl:when test="function-available('date:date-time') or
-      function-available('date:dateTime')">
-      <xsl:call-template name="datetime.format">
-        <xsl:with-param name="date" select="$date"/>
-        <xsl:with-param name="format" select="$format"/>
-        <xsl:with-param name="padding" select="$padding"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message>
-        Timestamp processing requires XSLT processor with EXSLT date support.
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<doc:pi name="dbtex_delims" xmlns="">
-  <refpurpose>Generates delimiters around embedded TeX equations
-    in output</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbtex delims</tag> PI as a
-      child of a <tag>textobject</tag> containing embedded TeX
-      markup, to cause that markup to be surrounded by
-      <literal>$</literal> delimiter characters in output.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbtex delims="no"|"yes"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>dbtex delims="no"|"yes"</term>
-        <listitem>
-          <para>Specifies whether delimiters are output</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="params">
-    <para><parameter>tex.math.delims</parameter></para>
-  </refsee>
-  <refsee role="tcg">
-    <para><link role="tcg"
-        xlink:href="TexMath.html"
-        >DBTeXMath</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbtex_delims">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="pi-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbtex')"/>
-    <xsl:with-param name="attribute" select="'delims'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="processing-instruction()" mode="titlepage.mode">
-  <!-- * Als process PIs on title pages -->
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template match="processing-instruction('dbtimestamp')">
-  <xsl:call-template name="pi.dbtimestamp"/>
-</xsl:template>
-
-<xsl:template name="datetime.format">
-  <xsl:param name="date"/>
-  <xsl:param name="format"/>
-  <xsl:param name="padding" select="1"/>
-  <xsl:if test="$format != ''">
-    <!-- replace any whitespace in the format string with a non-breaking space -->
-    <xsl:variable name="format-nbsp"
-      select="translate($format,
-      '&#x20;&#x9;&#xd;&#xa;',
-      '&#xa0;&#xa0;&#xa0;&#xa0;')"/>
-    <xsl:variable name="tokenized-format-string">
-      <xsl:call-template name="str.tokenize.keep.delimiters">
-        <xsl:with-param name="string" select="$format-nbsp"/>
-        <xsl:with-param name="delimiters" select="'&#xa0;,./-()[]:'"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:choose>
-      <!-- include extra test for Xalan quirk -->
-      <xsl:when test="function-available('exsl:node-set') or 
-        contains(system-property('xsl:vendor'),'Apache Software Foundation')">
-        <!-- We must preserve context node in order to get valid language -->
-        <xsl:variable name="context" select="."/>
-        <xsl:for-each select="exsl:node-set($tokenized-format-string)/node()">
-          <xsl:variable name="token">
-            <xsl:value-of select="."/>
-          </xsl:variable>
-          <!-- Restore context node -->
-          <xsl:for-each select="$context">
-            <xsl:choose>
-              <xsl:when test="$token = 'a'">
-                <xsl:call-template name="gentext.template">
-                  <xsl:with-param name="context" select="'datetime-abbrev'"/>
-                  <xsl:with-param name="name" select="date:day-abbreviation($date)"/>
-                </xsl:call-template>
-              </xsl:when>
-              <xsl:when test="$token = 'A'">
-                <xsl:call-template name="gentext.template">
-                  <xsl:with-param name="context" select="'datetime-full'"/>
-                  <xsl:with-param name="name" select="date:day-name($date)"/>
-                </xsl:call-template>
-              </xsl:when>
-              <xsl:when test="$token = 'b'">
-                <xsl:call-template name="gentext.template">
-                  <xsl:with-param name="context" select="'datetime-abbrev'"/>
-                  <xsl:with-param name="name" select="date:month-abbreviation($date)"/>
-                </xsl:call-template>
-              </xsl:when>
-              <xsl:when test="$token = 'c'">
-                <xsl:value-of select="date:date($date)"/>
-                <xsl:text> </xsl:text>
-                <xsl:value-of select="date:time($date)"/>
-              </xsl:when>
-              <xsl:when test="$token = 'B'">
-                <xsl:call-template name="gentext.template">
-                  <xsl:with-param name="context" select="'datetime-full'"/>
-                  <xsl:with-param name="name" select="date:month-name($date)"/>
-                </xsl:call-template>
-              </xsl:when>
-              <xsl:when test="$token = 'd'">
-                <xsl:if test="$padding = 1 and
-                  string-length(date:day-in-month($date)) = 1">0</xsl:if>
-                <xsl:value-of select="date:day-in-month($date)"/>
-              </xsl:when>
-              <xsl:when test="$token = 'H'">
-                <xsl:if test="$padding = 1 and string-length(date:hour-in-day($date)) = 1">0</xsl:if>
-                <xsl:value-of select="date:hour-in-day($date)"/>
-              </xsl:when>
-              <xsl:when test="$token = 'j'">
-                <xsl:value-of select="date:day-in-year($date)"/>
-              </xsl:when>
-              <xsl:when test="$token = 'm'">
-                <xsl:if test="$padding = 1 and string-length(date:month-in-year($date)) = 1">0</xsl:if>
-                <xsl:value-of select="date:month-in-year($date)"/>
-              </xsl:when>
-              <xsl:when test="$token = 'M'">
-                <xsl:if test="string-length(date:minute-in-hour($date)) = 1">0</xsl:if>
-                <xsl:value-of select="date:minute-in-hour($date)"/>
-              </xsl:when>
-              <xsl:when test="$token = 'S'">
-                <xsl:if test="string-length(date:second-in-minute($date)) = 1">0</xsl:if>
-                <xsl:value-of select="date:second-in-minute($date)"/>
-              </xsl:when>
-              <xsl:when test="$token = 'U'">
-                <xsl:value-of select="date:week-in-year($date)"/>
-              </xsl:when>
-              <xsl:when test="$token = 'w'">
-                <xsl:value-of select="date:day-in-week($date)"/>
-              </xsl:when>
-              <xsl:when test="$token = 'x'">
-                <xsl:value-of select="date:date($date)"/>
-              </xsl:when>
-              <xsl:when test="$token = 'X'">
-                <xsl:value-of select="date:time($date)"/>
-              </xsl:when>
-              <xsl:when test="$token = 'Y'">
-                <xsl:value-of select="date:year($date)"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="$token"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:for-each>
-        </xsl:for-each>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:message>
-          Timestamp processing requires an XSLT processor with support
-          for the EXSLT node-set() function.
-        </xsl:message>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/refentry.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/refentry.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,1277 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-                xmlns:date="http://exslt.org/dates-and-times"
-                exclude-result-prefixes="doc date"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-<doc:reference xmlns="" xml:id="refentry">
-  <info>
-    <title>Common Â» Refentry Metadata Template Reference</title>
-    <releaseinfo role="meta">
-      $Id$
-    </releaseinfo>
-  </info>
-  <!-- * yes, partintro is a valid child of a reference... -->
-  <partintro xml:id="partintro">
-    <title>Introduction</title>
-    <para>This is technical reference documentation for the ârefentry
-    metadataâ templates in the DocBook XSL Stylesheets.</para>
-    <para>This is not intended to be user documentation. It is provided
-    for developers writing customization layers for the stylesheets.</para>
-    <note>
-      <para>Currently, only the manpages stylesheets make use of these
-      templates. They are, however, potentially useful elsewhere.</para>
-    </note>
-  </partintro>
-</doc:reference>
-
-<!-- ==================================================================== -->
-<doc:template name="get.refentry.metadata" xmlns="">
-  <refpurpose>Gathers metadata from a refentry and its ancestors</refpurpose>
-  <refdescription id="get.refentry.metadata-desc">
-    <para>Reference documentation for particular commands, functions,
-    etc., is sometimes viewed in isolation from its greater "context". For
-    example, users view Unix man pages as, well, individual pages, not as
-    part of a "book" of some kind. Therefore, it is sometimes necessary to
-    embed "context" information in output for each <tag>refentry</tag>.</para>
-
-    <para>However, one problem is that different users mark up that
-    context information in different ways. Often (usually), the
-    context information is not actually part of the content of the
-    <tag>refentry</tag> itself, but instead part of the content of a
-    parent or ancestor element to the the <tag>refentry</tag>. And
-    even then, DocBook provides a variety of elements that users might
-    potentially use to mark up the same kind of information. One user
-    might use the <tag>productnumber</tag> element to mark up version
-    information about a particular product, while another might use
-    the <tag>releaseinfo</tag> element.</para>
-
-    <para>Taking all that in mind, the
-    <function>get.refentry.metadata</function> template tries to gather
-    metadata from a <tag>refentry</tag> element and its ancestor
-    elements in an intelligent and user-configurable way. The basic
-    mechanism used in the XPath expressions throughout this stylesheet
-    is to select the relevant metadata from the *info element that is
-    closest to the actual <tag>refentry</tag>&#160;â either on the
-    <tag>refentry</tag> itself, or on its nearest ancestor.</para>
-
-    <note>
-      <para>The <function>get.refentry.metadata</function>
-        template is actually just sort of a "driver" template; it
-        calls other templates that do the actual data collection,
-        then returns the data as a set.</para>
-    </note>
-
-  </refdescription>
-  <refparameter id="get.refentry.metadata-params">
-    <variablelist>
-      <varlistentry>
-        <term>refname</term>
-        <listitem>
-          <para>The first <tag>refname</tag> in the refentry</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>info</term>
-        <listitem>
-          <para>A set of info nodes (from a <tag>refentry</tag>
-          element and its ancestors)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>prefs</term>
-        <listitem>
-          <para>A node containing user preferences (from global
-          stylesheet parameters)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refreturn id="get.refentry.metadata-returns">
-    <para>Returns a node set with the following elements. The
-    descriptions are verbatim from the <literal>man(7)</literal> man
-    page.
-    <variablelist>
-      <varlistentry>
-        <term>title</term>
-        <listitem>
-          <para>the title of the man page (e.g., <literal>MAN</literal>)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>section</term>
-        <listitem>
-          <para>the section number the man page should be placed in (e.g.,
-          <literal>7</literal>)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>date</term>
-        <listitem>
-          <para>the date of the last revision</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>source</term>
-        <listitem>
-          <para>the source of the command</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>manual</term>
-        <listitem>
-          <para>the title of the manual (e.g., <citetitle>Linux
-          Programmer's Manual</citetitle>)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-    </para>
-  </refreturn>
-</doc:template>
-<xsl:template name="get.refentry.metadata">
-  <xsl:param name="refname"/>
-  <xsl:param name="info"/>
-  <xsl:param name="prefs"/>
-  <title>
-    <xsl:call-template name="get.refentry.title">
-      <xsl:with-param name="refname" select="$refname"/>
-    </xsl:call-template>
-  </title>
-  <section>
-    <xsl:call-template name="get.refentry.section">
-      <xsl:with-param name="refname" select="$refname"/>
-    </xsl:call-template>
-  </section>
-  <date>
-    <xsl:call-template name="get.refentry.date">
-      <xsl:with-param name="info" select="$info"/>
-      <xsl:with-param name="refname" select="$refname"/>
-      <xsl:with-param name="prefs" select="$prefs/DatePrefs"/>
-    </xsl:call-template>
-  </date>
-  <source>
-    <xsl:call-template name="get.refentry.source">
-      <xsl:with-param name="info" select="$info"/>
-      <xsl:with-param name="refname" select="$refname"/>
-      <xsl:with-param name="prefs" select="$prefs/SourcePrefs"/>
-    </xsl:call-template>
-  </source>
-  <manual>
-    <xsl:call-template name="get.refentry.manual">
-      <xsl:with-param name="info" select="$info"/>
-      <xsl:with-param name="refname" select="$refname"/>
-      <xsl:with-param name="prefs" select="$prefs/ManualPrefs"/>
-    </xsl:call-template>
-  </manual>
-</xsl:template>
-
-<!-- ====================================================================== -->
-<doc:template name="get.refentry.title" xmlns="">
-  <refpurpose>Gets title metadata for a refentry</refpurpose>
-  <refdescription id="get.refentry.title-desc">
-    <para>The <literal>man(7)</literal> man page describes this as "the
-    title of the man page (e.g., <literal>MAN</literal>). This differs
-    from <tag>refname</tag> in that, if the <tag>refentry</tag> has a
-    <tag>refentrytitle</tag>, we use that as the <tag>title</tag>;
-    otherwise, we just use first <tag>refname</tag> in the first
-    <tag>refnamediv</tag> in the source.</para>
-  </refdescription>
-  <refparameter id="get.refentry.title-params">
-    <variablelist>
-      <varlistentry>
-        <term>refname</term>
-        <listitem>
-          <para>The first <tag>refname</tag> in the refentry</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refreturn id="get.refentry.title-returns">
-  <para>Returns a <tag>title</tag> node.</para></refreturn>
-</doc:template>
-<xsl:template name="get.refentry.title">
-  <xsl:param name="refname"/>
-  <xsl:choose>
-    <xsl:when test="refmeta/refentrytitle">
-      <xsl:copy>
-        <xsl:apply-templates select="refmeta/refentrytitle/node()"/>
-      </xsl:copy>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$refname"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<doc:template name="get.refentry.section" xmlns="">
-  <refpurpose>Gets section metadata for a refentry</refpurpose>
-  <refdescription id="get.refentry.section-desc">
-    <para>The <literal>man(7)</literal> man page describes this as "the
-    section number the man page should be placed in (e.g.,
-    <literal>7</literal>)". If we do not find a <tag>manvolnum</tag>
-    specified in the source, and we find that the <tag>refentry</tag> is
-    for a function, we use the section number <literal>3</literal>
-    ["Library calls (functions within program libraries)"]; otherwise, we
-    default to using <literal>1</literal> ["Executable programs or shell
-    commands"].</para>
-  </refdescription>
-  <refparameter id="get.refentry.section-params">
-    <variablelist>
-      <varlistentry>
-        <term>refname</term>
-        <listitem>
-          <para>The first <tag>refname</tag> in the refentry</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>quiet</term>
-        <listitem>
-          <para>If non-zero, no "missing" message is emitted</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refreturn id="get.refentry.section-returns">
-  <para>Returns a string representing a section number.</para></refreturn>
-</doc:template>
-<xsl:template name="get.refentry.section">
-  <xsl:param name="refname"/>
-  <xsl:param name="quiet" select="0"/>
-  <xsl:choose>
-    <xsl:when test="refmeta/manvolnum">
-      <xsl:value-of select="refmeta/manvolnum"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:if test="$quiet = 0">
-        <xsl:if test="$refentry.meta.get.quietly = 0">
-          <xsl:call-template name="log.message">
-            <xsl:with-param name="level">Note</xsl:with-param>
-            <xsl:with-param name="source" select="$refname"/>
-            <xsl:with-param name="context-desc">meta manvol</xsl:with-param>
-            <xsl:with-param name="message">
-              <xsl:text>no refentry/refmeta/manvolnum</xsl:text>
-            </xsl:with-param>
-          </xsl:call-template>
-          <xsl:call-template name="log.message">
-            <xsl:with-param name="level">Note</xsl:with-param>
-            <xsl:with-param name="source" select="$refname"/>
-            <xsl:with-param name="context-desc">meta manvol</xsl:with-param>
-            <xsl:with-param name="message">
-              <xsl:text>see http://docbook.sf.net/el/manvolnum</xsl:text>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-      </xsl:if>
-      <xsl:choose>
-        <xsl:when test=".//funcsynopsis">
-          <xsl:if test="$quiet = 0">
-            <xsl:if test="$refentry.meta.get.quietly = 0">
-              <xsl:call-template name="log.message">
-                <xsl:with-param name="level">Note</xsl:with-param>
-                <xsl:with-param name="source" select="$refname"/>
-                <xsl:with-param name="context-desc">meta manvol</xsl:with-param>
-                <xsl:with-param name="message">
-                  <xsl:text>Setting man section to 3</xsl:text>
-                </xsl:with-param>
-              </xsl:call-template>
-            </xsl:if>
-          </xsl:if>
-          <xsl:text>3</xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>1</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<doc:template name="get.refentry.date" xmlns="">
-  <refpurpose>Gets date metadata for a refentry</refpurpose>
-  <refdescription id="get.refentry.date-desc">
-    <para>The <literal>man(7)</literal> man page describes this as "the
-    date of the last revision". If we cannot find a date in the source, we
-    generate one.</para>
-  </refdescription>
-  <refparameter id="get.refentry.date-params">
-    <variablelist>
-      <varlistentry>
-        <term>refname</term>
-        <listitem>
-          <para>The first <tag>refname</tag> in the refentry</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>info</term>
-        <listitem>
-          <para>A set of info nodes (from a <tag>refentry</tag>
-          element and its ancestors)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>prefs</term>
-        <listitem>
-          <para>A node containing users preferences (from global stylesheet parameters)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refreturn id="get.refentry.date-returns">
-    <para>Returns a <tag>date</tag> node.</para>
-  </refreturn>
-</doc:template>
-<xsl:template name="get.refentry.date">
-  <xsl:param name="refname"/>
-  <xsl:param name="info"/>
-  <xsl:param name="prefs"/>
-  <xsl:variable name="Date">
-    <xsl:choose>
-      <!-- * if profiling is enabled for date, and the date -->
-      <!-- * profile is non-empty, use it -->
-      <xsl:when test="not($prefs/@profileEnabled = 0) and
-                      not($prefs/@profile = '')">
-        <xsl:call-template name="evaluate.info.profile">
-          <xsl:with-param name="profile" select="$prefs/@profile"/>
-          <xsl:with-param name="info" select="$info"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- * either profiling is not enabled for date, or the-->
-        <!-- * date profile is empty, so we need to look for date -->
-        <!-- * in *info -->
-        <xsl:choose>
-          <!-- * look for date or pubdate in *info -->
-          <xsl:when test="$info/date/node()
-                          |$info/pubdate/node()">
-            <xsl:apply-templates
-                select="(($info[date])[last()]/date)[1]|
-                        (($info[pubdate])[last()]/pubdate)[1]"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <!-- * found no Date or Pubdate -->
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:choose>
-    <xsl:when test="not($Date = '')">
-      <xsl:value-of select="$Date"/>
-    </xsl:when>
-    <!-- * We couldn't find a date, so we generate a date. -->
-    <!-- * And we make it an appropriately localized date. -->
-    <xsl:otherwise>
-      <xsl:if test="$refentry.meta.get.quietly = 0">
-        <xsl:call-template name="log.message">
-          <xsl:with-param name="level">Note</xsl:with-param>
-          <xsl:with-param name="source" select="$refname"/>
-          <xsl:with-param name="context-desc">meta date</xsl:with-param>
-          <xsl:with-param name="message">
-            <xsl:text>no date; using generated date</xsl:text>
-          </xsl:with-param>
-        </xsl:call-template>
-        <xsl:call-template name="log.message">
-          <xsl:with-param name="level">Note</xsl:with-param>
-          <xsl:with-param name="source" select="$refname"/>
-          <xsl:with-param name="context-desc">meta date</xsl:with-param>
-          <xsl:with-param name="message">
-            <xsl:text>see http://docbook.sf.net/el/date</xsl:text>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <xsl:call-template name="datetime.format">
-        <xsl:with-param name="date">
-          <xsl:choose>
-            <xsl:when test="function-available('date:date-time')">
-              <xsl:value-of select="date:date-time()"/>
-            </xsl:when>
-            <xsl:when test="function-available('date:dateTime')">
-              <!-- Xalan quirk -->
-              <xsl:value-of select="date:dateTime()"/>
-            </xsl:when>
-          </xsl:choose>
-        </xsl:with-param>
-        <xsl:with-param name="format">
-          <xsl:call-template name="gentext.template">
-            <xsl:with-param name="context" select="'datetime'"/>
-            <xsl:with-param name="name" select="'format'"/>
-          </xsl:call-template>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<doc:template name="get.refentry.source" xmlns="">
-  <refpurpose>Gets source metadata for a refentry</refpurpose>
-  <refdescription id="get.refentry.source-desc">
-    <para>The <literal>man(7)</literal> man page describes this as "the
-    source of the command", and provides the following examples:
-    <itemizedlist>
-      <listitem>
-        <para>For binaries, use something like: GNU, NET-2, SLS
-        Distribution, MCC Distribution.</para>
-      </listitem>
-      <listitem>
-        <para>For system calls, use the version of the kernel that you are
-        currently looking at: Linux 0.99.11.</para>
-      </listitem>
-      <listitem>
-        <para>For library calls, use the source of the function: GNU, BSD
-        4.3, Linux DLL 4.4.1.</para>
-      </listitem>
-    </itemizedlist>
-    </para>
-
-    <para>The <literal>solbook(5)</literal> man page describes
-    something very much like what <literal>man(7)</literal> calls
-    "source", except that <literal>solbook(5)</literal> names it
-    "software" and describes it like this:
-    <blockquote>
-      <para>This is the name of the software product that the topic
-      discussed on the reference page belongs to. For example UNIX
-      commands are part of the <literal>SunOS x.x</literal>
-      release.</para>
-    </blockquote>
-    </para>
-
-    <para>In practice, there are many pages that simply have a version
-    number in the "source" field. So, it looks like what we have is a
-    two-part field,
-    <replaceable>Name</replaceable>&#160;<replaceable>Version</replaceable>,
-    where:
-    <variablelist>
-      <varlistentry>
-        <term>Name</term>
-        <listitem>
-          <para>product name (e.g., BSD) or org. name (e.g., GNU)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>Version</term>
-        <listitem>
-          <para>version name</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-    Each part is optional. If the <replaceable>Name</replaceable> is a
-    product name, then the <replaceable>Version</replaceable> is probably
-    the version of the product. Or there may be no
-    <replaceable>Name</replaceable>, in which case, if there is a
-    <replaceable>Version</replaceable>, it is probably the version of the
-    item itself, not the product it is part of. Or, if the
-    <replaceable>Name</replaceable> is an organization name, then there
-    probably will be no <replaceable>Version</replaceable>.
-    </para>
-  </refdescription>
-  <refparameter id="get.refentry.source-params">
-    <variablelist>
-      <varlistentry>
-        <term>refname</term>
-        <listitem>
-          <para>The first <tag>refname</tag> in the refentry</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>info</term>
-        <listitem>
-          <para>A set of info nodes (from a <tag>refentry</tag>
-          element and its ancestors)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>prefs</term>
-        <listitem>
-          <para>A node containing users preferences (from global
-          stylesheet parameters)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refreturn id="get.refentry.source-returns">
-    <para>Returns a <tag>source</tag> node.</para>
-  </refreturn>
-</doc:template>
-<xsl:template name="get.refentry.source">
-  <xsl:param name="refname"/>
-  <xsl:param name="info"/>
-  <xsl:param name="prefs"/>
-  <xsl:variable name="Name">
-    <xsl:if test="$prefs/Name/@suppress = 0">
-      <xsl:call-template name="get.refentry.source.name">
-        <xsl:with-param name="info" select="$info"/>
-        <xsl:with-param name="refname" select="$refname"/>
-        <xsl:with-param name="prefs" select="$prefs/Name"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="Version">
-    <xsl:if test="$prefs/Version/@suppress = 0">
-      <xsl:call-template name="get.refentry.version">
-        <xsl:with-param name="info" select="$info"/>
-        <xsl:with-param name="refname" select="$refname"/>
-        <xsl:with-param name="prefs" select="$prefs/Version"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:choose>
-    <!-- * if we have a Name and/or Version, use either or both -->
-    <!-- * of those, in the form "Name Version" or just "Name" -->
-    <!-- * or just "Version" -->
-    <xsl:when test="not($Name = '') or not($Version = '')">
-      <xsl:choose>
-        <xsl:when test="not($Name = '') and not($Version = '')">
-          <xsl:copy-of select="$Name"/>
-          <xsl:text> </xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:copy-of select="$Name"/>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:copy-of select="$Version"/>
-    </xsl:when>
-    <!-- * if no Name and no Version, use fallback (if any) -->
-    <xsl:when test="not($prefs/@fallback = '')">
-      <xsl:variable name="source.fallback">
-        <xsl:call-template name="evaluate.info.profile">
-          <xsl:with-param name="profile" select="$prefs/@fallback"/>
-          <xsl:with-param name="info" select="$info"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="not($source.fallback = '')">
-          <xsl:value-of select="$source.fallback"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:if test="$refentry.meta.get.quietly = 0">
-            <xsl:call-template name="log.message">
-              <xsl:with-param name="level">Warn</xsl:with-param>
-              <xsl:with-param name="source" select="$refname"/>
-              <xsl:with-param name="context-desc">meta source</xsl:with-param>
-              <xsl:with-param name="message">
-                <xsl:text>no valid fallback for source; leaving empty</xsl:text>
-              </xsl:with-param>
-            </xsl:call-template>
-          </xsl:if>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:if test="$refentry.meta.get.quietly = 0">
-        <xsl:call-template name="log.message">
-          <xsl:with-param name="level">Warn</xsl:with-param>
-          <xsl:with-param name="source" select="$refname"/>
-          <xsl:with-param name="context-desc">meta source</xsl:with-param>
-          <xsl:with-param name="message">
-            <xsl:text>no source fallback specified; leaving empty</xsl:text>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<doc:template name="get.refentry.source.name" xmlns="">
-  <refpurpose>Gets source-name metadata for a refentry</refpurpose>
-  <refdescription id="get.refentry.source.name-desc">
-    <para>A "source name" is one part of a (potentially) two-part
-    <replaceable>Name</replaceable>&#160;<replaceable>Version</replaceable>
-    source field. For more details, see the documentation for the
-    <function>get.refentry.source</function> template.</para>
-  </refdescription>
-  <refparameter id="get.refentry.source.name-params">
-    <variablelist>
-      <varlistentry>
-        <term>refname</term>
-        <listitem>
-          <para>The first <tag>refname</tag> in the refentry</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>info</term>
-        <listitem>
-          <para>A set of info nodes (from a <tag>refentry</tag>
-          element and its ancestors)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>prefs</term>
-        <listitem>
-          <para>A node containing users preferences (from global
-          stylesheet parameters)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refreturn id="get.refentry.source.name-returns">
-    <para>Depending on what output method is used for the
-  current stylesheet, either returns a text node or possibly an element
-  node, containing "source name" data.</para>
-  </refreturn>
-</doc:template>
-<xsl:template name="get.refentry.source.name">
-  <xsl:param name="refname"/>
-  <xsl:param name="info"/>
-  <xsl:param name="prefs"/>
-  <xsl:choose>
-    <!-- * if profiling is enabled for source.name, and the -->
-    <!-- * source.name profile is non-empty, use it -->
-    <xsl:when test="not($prefs/@profileEnabled = 0) and
-                    not($prefs/@profile = '')">
-      <xsl:call-template name="evaluate.info.profile">
-        <xsl:with-param name="profile" select="$prefs/@profile"/>
-        <xsl:with-param name="info" select="$info"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- * either profiling for source.name is not enabled, or-->
-      <!-- * the source.name profile is empty; so we need to look -->
-      <!-- * for a name to use -->
-      <xsl:choose>
-        <xsl:when test="refmeta/refmiscinfo[@class = 'source' or @class = 'software']">
-          <xsl:apply-templates 
-              select="refmeta/refmiscinfo[@class = 'source' or @class='software'][1]/node()"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:choose>
-            <xsl:when test="$info/productname">
-              <xsl:call-template name="set.refentry.metadata">
-                <xsl:with-param name="refname" select="$refname"/>
-                <xsl:with-param
-                    name="info"
-                    select="($info[productname])[last()]"/>
-                <xsl:with-param
-                    name="contents"
-                    select="(($info[productname])[last()]/productname)[1]"/>
-                <xsl:with-param name="context">source</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$info/corpname">
-              <xsl:call-template name="set.refentry.metadata">
-                <xsl:with-param name="refname" select="$refname"/>
-                <xsl:with-param
-                    name="info"
-                    select="($info[corpname])[last()]"/>
-                <xsl:with-param
-                    name="contents"
-                    select="(($info[corpname])[last()]/corpname)[1]"/>
-                <xsl:with-param name="context">source</xsl:with-param>
-                <xsl:with-param name="preferred">productname</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$info/corpcredit">
-              <xsl:call-template name="set.refentry.metadata">
-                <xsl:with-param name="refname" select="$refname"/>
-                <xsl:with-param
-                    name="info"
-                    select="($info[corpcredit])[last()]"/>
-                <xsl:with-param
-                    name="contents"
-                    select="(($info[corpcredit])[last()]/corpcredit)[1]"/>
-                <xsl:with-param name="context">source</xsl:with-param>
-                <xsl:with-param name="preferred">productname</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$info/corpauthor">
-              <xsl:call-template name="set.refentry.metadata">
-                <xsl:with-param name="refname" select="$refname"/>
-                <xsl:with-param
-                    name="info"
-                    select="($info[corpauthor])[last()]"/>
-                <xsl:with-param
-                    name="contents"
-                    select="(($info[corpauthor])[last()]/corpauthor)[1]"/>
-                <xsl:with-param name="context">source</xsl:with-param>
-                <xsl:with-param name="preferred">productname</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$info//orgname">
-              <xsl:call-template name="set.refentry.metadata">
-                <xsl:with-param name="refname" select="$refname"/>
-                <xsl:with-param
-                    name="info"
-                    select="($info[//orgname])[last()]"/>
-                <xsl:with-param
-                    name="contents"
-                    select="(($info[//orgname])[last()]//orgname)[1]"/>
-                <xsl:with-param name="context">source</xsl:with-param>
-                <xsl:with-param name="preferred">productname</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$info//publishername">
-              <xsl:call-template name="set.refentry.metadata">
-                <xsl:with-param name="refname" select="$refname"/>
-                <xsl:with-param
-                    name="info"
-                    select="($info[//publishername])[last()]"/>
-                <xsl:with-param
-                    name="contents"
-                    select="(($info[//publishername])[last()]//publishername)[1]"/>
-                <xsl:with-param name="context">source</xsl:with-param>
-                <xsl:with-param name="preferred">productname</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:if test="$refentry.meta.get.quietly = 0">
-                <xsl:call-template name="log.message">
-                  <xsl:with-param name="level">Note</xsl:with-param>
-                  <xsl:with-param name="source" select="$refname"/>
-                  <xsl:with-param name="context-desc">meta source</xsl:with-param>
-                  <xsl:with-param name="message">
-                    <xsl:text>no *info/productname or alternative</xsl:text>
-                  </xsl:with-param>
-                </xsl:call-template>
-                <xsl:call-template name="log.message">
-                  <xsl:with-param name="level">Note</xsl:with-param>
-                  <xsl:with-param name="source" select="$refname"/>
-                  <xsl:with-param name="context-desc">meta source</xsl:with-param>
-                  <xsl:with-param name="message">
-                    <xsl:text>see http://docbook.sf.net/el/productname</xsl:text>
-                  </xsl:with-param>
-                </xsl:call-template>
-                <xsl:call-template name="log.message">
-                  <xsl:with-param name="level">Note</xsl:with-param>
-                  <xsl:with-param name="source" select="$refname"/>
-                  <xsl:with-param name="context-desc">meta source</xsl:with-param>
-                  <xsl:with-param name="message">
-                    <xsl:text>no refentry/refmeta/refmiscinfo@class=source</xsl:text>
-                  </xsl:with-param>
-                </xsl:call-template>
-                <xsl:call-template name="log.message">
-                  <xsl:with-param name="level">Note</xsl:with-param>
-                  <xsl:with-param name="source" select="$refname"/>
-                  <xsl:with-param name="context-desc">meta source</xsl:with-param>
-                  <xsl:with-param name="message">
-                    <xsl:text>see http://docbook.sf.net/el/refmiscinfo</xsl:text>
-                  </xsl:with-param>
-                </xsl:call-template>
-              </xsl:if>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<doc:template name="get.refentry.version" xmlns="">
-  <refpurpose>Gets version metadata for a refentry</refpurpose>
-  <refdescription id="get.refentry.version-desc">
-    <para>A "version" is one part of a (potentially) two-part
-    <replaceable>Name</replaceable>&#160;<replaceable>Version</replaceable>
-    source field. For more details, see the documentation for the
-    <function>get.refentry.source</function> template.</para>
-  </refdescription>
-  <refparameter id="get.refentry.version-params">
-    <variablelist>
-      <varlistentry>
-        <term>refname</term>
-        <listitem>
-          <para>The first <tag>refname</tag> in the refentry</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>info</term>
-        <listitem>
-          <para>A set of info nodes (from a <tag>refentry</tag>
-          element and its ancestors)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>prefs</term>
-        <listitem>
-          <para>A node containing users preferences (from global
-          stylesheet parameters)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refreturn id="get.refentry.version-returns">
-    <para>Depending on what output method is used for the
-  current stylesheet, either returns a text node or possibly an element
-  node, containing "version" data.</para>
-  </refreturn>
-</doc:template>
-<xsl:template name="get.refentry.version">
-  <xsl:param name="refname"/>
-  <xsl:param name="info"/>
-  <xsl:param name="prefs"/>
-  <xsl:choose>
-    <!-- * if profiling is enabled for version, and the -->
-    <!-- * version profile is non-empty, use it -->
-    <xsl:when test="not($prefs/@profileEnabled = 0) and
-                    not($prefs/@profile = '')">
-      <xsl:call-template name="evaluate.info.profile">
-        <xsl:with-param name="profile" select="$prefs/@profile"/>
-        <xsl:with-param name="info" select="$info"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- * either profiling for source.name is not enabled, or-->
-      <!-- * the source.name profile is empty; so we need to look -->
-      <!-- * for a name to use -->
-      <xsl:choose>
-        <xsl:when test="refmeta/refmiscinfo[@class = 'version']">
-          <xsl:apply-templates 
-              select="refmeta/refmiscinfo[@class = 'version'][1]/node()"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:choose>
-            <xsl:when test="$info/productnumber">
-              <xsl:call-template name="set.refentry.metadata">
-                <xsl:with-param name="refname" select="$refname"/>
-                <xsl:with-param
-                    name="info"
-                    select="($info[productnumber])[last()]"/>
-                <xsl:with-param
-                    name="contents"
-                    select="(($info[productnumber])[last()]/productnumber)[1]"/>
-                <xsl:with-param name="context">version</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$info/edition">
-              <xsl:call-template name="set.refentry.metadata">
-                <xsl:with-param name="refname" select="$refname"/>
-                <xsl:with-param
-                    name="info"
-                    select="($info[edition])[last()]"/>
-                <xsl:with-param
-                    name="contents"
-                    select="(($info[edition])[last()]/edition)[1]"/>
-                <xsl:with-param name="context">version</xsl:with-param>
-                <xsl:with-param name="preferred">productnumber</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$info/releaseinfo">
-              <xsl:call-template name="set.refentry.metadata">
-                <xsl:with-param name="refname" select="$refname"/>
-                <xsl:with-param
-                    name="info"
-                    select="($info[releaseinfo])[last()]"/>
-                <xsl:with-param
-                    name="contents"
-                    select="(($info[releaseinfo])[last()]/releaseinfo)[1]"/>
-                <xsl:with-param name="context">version</xsl:with-param>
-                <xsl:with-param name="preferred">productnumber</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:if test="$refentry.meta.get.quietly = 0">
-                <xsl:call-template name="log.message">
-                  <xsl:with-param name="level">Note</xsl:with-param>
-                  <xsl:with-param name="source" select="$refname"/>
-                  <xsl:with-param name="context-desc">meta version</xsl:with-param>
-                  <xsl:with-param name="message">
-                    <xsl:text>no *info/productnumber or alternative</xsl:text>
-                  </xsl:with-param>
-                </xsl:call-template>
-                <xsl:call-template name="log.message">
-                  <xsl:with-param name="level">Note</xsl:with-param>
-                  <xsl:with-param name="source" select="$refname"/>
-                  <xsl:with-param name="context-desc">meta version</xsl:with-param>
-                  <xsl:with-param name="message">
-                    <xsl:text>see http://docbook.sf.net/el/productnumber</xsl:text>
-                  </xsl:with-param>
-                </xsl:call-template>
-                <xsl:call-template name="log.message">
-                  <xsl:with-param name="level">Note</xsl:with-param>
-                  <xsl:with-param name="source" select="$refname"/>
-                  <xsl:with-param name="context-desc">meta version</xsl:with-param>
-                  <xsl:with-param name="message">
-                    <xsl:text>no refentry/refmeta/refmiscinfo@class=version</xsl:text>
-                  </xsl:with-param>
-                </xsl:call-template>
-                <xsl:call-template name="log.message">
-                  <xsl:with-param name="level">Note</xsl:with-param>
-                  <xsl:with-param name="source" select="$refname"/>
-                  <xsl:with-param name="context-desc">meta version</xsl:with-param>
-                  <xsl:with-param name="message">
-                    <xsl:text>see http://docbook.sf.net/el/refmiscinfo</xsl:text>
-                  </xsl:with-param>
-                </xsl:call-template>
-              </xsl:if>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<doc:template name="get.refentry.manual" xmlns="">
-  <refpurpose>Gets source metadata for a refentry</refpurpose>
-  <refdescription id="get.refentry.manual-desc">
-    <para>The <literal>man(7)</literal> man page describes this as "the
-    title of the manual (e.g., <citetitle>Linux Programmer's
-    Manual</citetitle>)". Here are some examples from existing man pages:
-    <itemizedlist>
-      <listitem>
-        <para><citetitle>dpkg utilities</citetitle>
-        (<command>dpkg-name</command>)</para>
-      </listitem>
-      <listitem>
-        <para><citetitle>User Contributed Perl Documentation</citetitle>
-        (<command>GET</command>)</para>
-      </listitem>
-      <listitem>
-        <para><citetitle>GNU Development Tools</citetitle>
-        (<command>ld</command>)</para>
-      </listitem>
-      <listitem>
-        <para><citetitle>Emperor Norton Utilities</citetitle>
-        (<command>ddate</command>)</para>
-      </listitem>
-      <listitem>
-        <para><citetitle>Debian GNU/Linux manual</citetitle>
-        (<command>faked</command>)</para>
-      </listitem>
-      <listitem>
-        <para><citetitle>GIMP Manual Pages</citetitle>
-        (<command>gimp</command>)</para>
-      </listitem>
-      <listitem>
-        <para><citetitle>KDOC Documentation System</citetitle>
-        (<command>qt2kdoc</command>)</para>
-      </listitem>
-    </itemizedlist>
-    </para>
-
-    <para>The <literal>solbook(5)</literal> man page describes
-    something very much like what <literal>man(7)</literal> calls
-    "manual", except that <literal>solbook(5)</literal> names it
-    "sectdesc" and describes it like this:
-    <blockquote>
-      <para>This is the section title of the reference page; for
-      example <literal>User Commands</literal>.</para>
-    </blockquote>
-    </para>
-
-  </refdescription>
-  <refparameter id="get.refentry.manual-params">
-    <variablelist>
-      <varlistentry>
-        <term>refname</term>
-        <listitem>
-          <para>The first <tag>refname</tag> in the refentry</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>info</term>
-        <listitem>
-          <para>A set of info nodes (from a <tag>refentry</tag>
-          element and its ancestors)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>prefs</term>
-        <listitem>
-          <para>A node containing users preferences (from global
-          stylesheet parameters)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refreturn id="get.refentry.manual-returns">
-    <para>Returns a <tag>manual</tag> node.</para>
-  </refreturn>
-</doc:template>
-<xsl:template name="get.refentry.manual">
-  <xsl:param name="refname"/>
-  <xsl:param name="info"/>
-  <xsl:param name="prefs"/>
-  <xsl:variable name="Manual">
-    <xsl:choose>
-      <!-- * if profiling is enabled for manual, and the manual -->
-      <!-- * profile is non-empty, use it -->
-      <xsl:when test="not($prefs/@profileEnabled = 0) and
-                      not($prefs/@profile = '')">
-        <xsl:call-template name="evaluate.info.profile">
-          <xsl:with-param name="profile" select="$prefs/@profile"/>
-          <xsl:with-param name="info" select="$info"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:choose>
-          <xsl:when test="refmeta/refmiscinfo[@class = 'manual' or @class = 'sectdesc']">
-            <xsl:apply-templates 
-                select="refmeta/refmiscinfo[@class = 'manual' or @class = 'sectdesc'][1]/node()"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <!-- * only in the case of choosing appropriate -->
-            <!-- * "manual" content do we select the furthest -->
-            <!-- * (first) matching element instead of the -->
-            <!-- * closest (last) matching one -->
-            <xsl:choose>
-              <xsl:when test="ancestor::*/title">
-                <xsl:call-template name="set.refentry.metadata">
-                  <xsl:with-param name="refname" select="$refname"/>
-                  <xsl:with-param
-                      name="info"
-                      select="(ancestor::*[title])[1]"/>
-                  <xsl:with-param
-                      name="contents"
-                      select="(ancestor::*[title])[1]/title"/>
-                  <xsl:with-param name="context">manual</xsl:with-param>
-                </xsl:call-template>
-              </xsl:when>
-              <xsl:when test="$info/title">
-                <xsl:call-template name="set.refentry.metadata">
-                  <xsl:with-param name="refname" select="$refname"/>
-                  <xsl:with-param
-                      name="info"
-                      select="($info[title])[1]"/>
-                  <xsl:with-param
-                      name="contents"
-                      select="(($info[title])[1]/title)[1]"/>
-                  <xsl:with-param name="context">manual</xsl:with-param>
-                </xsl:call-template>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:if test="$refentry.meta.get.quietly = 0">
-                  <xsl:call-template name="log.message">
-                    <xsl:with-param name="level">Note</xsl:with-param>
-                    <xsl:with-param name="source" select="$refname"/>
-                    <xsl:with-param name="context-desc">meta manual</xsl:with-param>
-                    <xsl:with-param name="message">
-                      <xsl:text>no titled ancestor of refentry</xsl:text>
-                    </xsl:with-param>
-                  </xsl:call-template>
-                  <xsl:call-template name="log.message">
-                    <xsl:with-param name="level">Note</xsl:with-param>
-                    <xsl:with-param name="source" select="$refname"/>
-                    <xsl:with-param name="context-desc">meta manual</xsl:with-param>
-                    <xsl:with-param name="message">
-                      <xsl:text>no refentry/refmeta/refmiscinfo@class=manual</xsl:text>
-                    </xsl:with-param>
-                  </xsl:call-template>
-                  <xsl:call-template name="log.message">
-                    <xsl:with-param name="level">Note</xsl:with-param>
-                    <xsl:with-param name="source" select="$refname"/>
-                    <xsl:with-param name="context-desc">meta manual</xsl:with-param>
-                    <xsl:with-param name="message">
-                      <xsl:text>see http://docbook.sf.net/el/refmiscinfo</xsl:text>
-                    </xsl:with-param>
-                  </xsl:call-template>
-                </xsl:if>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:choose>
-    <xsl:when test="not($Manual = '')">
-      <xsl:copy-of select="$Manual"/>
-    </xsl:when>
-    <!-- * if no Manual, use contents of specified Fallback (if any) -->
-    <xsl:when test="not($prefs/@fallback = '')">
-      <xsl:variable name="manual.fallback">
-        <xsl:call-template name="evaluate.info.profile">
-          <xsl:with-param name="profile" select="$prefs/@fallback"/>
-          <xsl:with-param name="info" select="$info"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="not($manual.fallback = '')">
-          <xsl:value-of select="$manual.fallback"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:if test="$refentry.meta.get.quietly = 0">
-            <xsl:call-template name="log.message">
-              <xsl:with-param name="level">Warn</xsl:with-param>
-              <xsl:with-param name="source" select="$refname"/>
-              <xsl:with-param name="context-desc">meta manual</xsl:with-param>
-              <xsl:with-param name="message">
-                <xsl:text>no valid fallback for manual; leaving empty</xsl:text>
-              </xsl:with-param>
-            </xsl:call-template>
-          </xsl:if>
-        </xsl:otherwise>
-      </xsl:choose>
-
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:if test="$refentry.meta.get.quietly = 0">
-        <xsl:call-template name="log.message">
-          <xsl:with-param name="level">Warn</xsl:with-param>
-          <xsl:with-param name="source" select="$refname"/>
-          <xsl:with-param name="context-desc">meta manual</xsl:with-param>
-          <xsl:with-param name="message">
-            <xsl:text>no manual fallback specified; leaving empty</xsl:text>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ====================================================================== -->
-<doc:template name="get.refentry.metadata.prefs" xmlns="">
-  <refpurpose>Gets user preferences for refentry metadata gathering</refpurpose>
-  <refdescription id="get.refentry.metadata.prefs-desc">
-    <para>The DocBook XSL stylesheets include several user-configurable
-    global stylesheet parameters for controlling <tag>refentry</tag>
-    metadata gathering. Those parameters are not read directly by the
-    other <tag>refentry</tag> metadata-gathering
-    templates. Instead, they are read only by the
-    <function>get.refentry.metadata.prefs</function> template,
-    which assembles them into a structure that is then passed to
-    the other <tag>refentry</tag> metadata-gathering
-    templates.</para>
-
-    <para>So the, <function>get.refentry.metadata.prefs</function>
-    template is the only interface to collecting stylesheet parameters for
-    controlling <tag>refentry</tag> metadata gathering.</para>
-  </refdescription>
-  <refparameter id="get.refentry.metadata.prefs-params">
-    <para>There are no local parameters for this template; however, it
-    does rely on a number of global parameters.</para>
-  </refparameter>
-  <refreturn id="get.refentry.metadata.prefs-returns">
-    <para>Returns a <tag>manual</tag> node.</para>
-  </refreturn>
-</doc:template>
-<xsl:template name="get.refentry.metadata.prefs">
-  <DatePrefs>
-    <xsl:attribute name="profile">
-      <xsl:value-of select="$refentry.date.profile"/>
-    </xsl:attribute>
-    <xsl:attribute name="profileEnabled">
-      <xsl:value-of select="$refentry.date.profile.enabled"/>
-    </xsl:attribute>
-  </DatePrefs>
-  <SourcePrefs>
-    <xsl:attribute name="fallback">
-      <xsl:value-of select="$refentry.source.fallback.profile"/>
-    </xsl:attribute>
-    <Name>
-      <xsl:attribute name="profile">
-        <xsl:value-of select="$refentry.source.name.profile"/>
-      </xsl:attribute>
-      <xsl:attribute name="profileEnabled">
-        <xsl:value-of select="$refentry.source.name.profile.enabled"/>
-      </xsl:attribute>
-      <xsl:attribute name="suppress">
-        <xsl:value-of select="$refentry.source.name.suppress"/>
-      </xsl:attribute>
-    </Name>
-    <Version>
-      <xsl:attribute name="profile">
-        <xsl:value-of select="$refentry.version.profile"/>
-      </xsl:attribute>
-      <xsl:attribute name="profileEnabled">
-        <xsl:value-of select="$refentry.version.profile.enabled"/>
-      </xsl:attribute>
-      <xsl:attribute name="suppress">
-        <xsl:value-of select="$refentry.version.suppress"/>
-      </xsl:attribute>
-    </Version>
-  </SourcePrefs>
-  <ManualPrefs>
-    <xsl:attribute name="fallback">
-      <xsl:value-of select="$refentry.manual.fallback.profile"/>
-    </xsl:attribute>
-    <xsl:attribute name="profile">
-      <xsl:value-of select="$refentry.manual.profile"/>
-    </xsl:attribute>
-    <xsl:attribute name="profileEnabled">
-      <xsl:value-of select="$refentry.manual.profile.enabled"/>
-    </xsl:attribute>
-  </ManualPrefs>
-</xsl:template>
-
-<!-- ====================================================================== -->
-<doc:template name="set.refentry.metadata" xmlns="">
-  <refpurpose>Sets content of a refentry metadata item</refpurpose>
-  <refdescription id="set.refentry.metadata-desc">
-    <para>The <function>set.refentry.metadata</function> template is
-    called each time a suitable source element is found for a certain
-    metadata field.</para>
-  </refdescription>
-  <refparameter id="set.refentry.metadata-params">
-    <variablelist>
-      <varlistentry>
-        <term>refname</term>
-        <listitem>
-          <para>The first <tag>refname</tag> in the refentry</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>info</term>
-        <listitem>
-          <para>A single *info node that contains the selected source element.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>contents</term>
-        <listitem>
-          <para>A node containing the selected source element.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>context</term>
-        <listitem>
-          <para>A string describing the metadata context in which the
-          <function>set.refentry.metadata</function> template was
-          called: either "date", "source", "version", or "manual".</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refreturn id="set.refentry.metadata-returns">
-  <para>Returns formatted contents of a selected source element.</para></refreturn>
-</doc:template>
-<xsl:template name="set.refentry.metadata">
-  <xsl:param name="refname"/>
-  <xsl:param name="info"/>
-  <xsl:param name="contents"/>
-  <xsl:param name="context"/>
-  <xsl:param name="preferred"/>
-  <xsl:if test="not($preferred = '')">
-    <xsl:if test="$refentry.meta.get.quietly = 0">
-      <xsl:call-template name="log.message">
-        <xsl:with-param name="level">Note</xsl:with-param>
-        <xsl:with-param name="source" select="$refname"/>
-        <xsl:with-param name="context-desc" select="concat('meta ', $context)"/>
-        <xsl:with-param name="message" select="concat('No ', $preferred)"/>
-      </xsl:call-template>
-      <xsl:call-template name="log.message">
-        <xsl:with-param name="level">Note</xsl:with-param>
-        <xsl:with-param name="source" select="$refname"/>
-        <xsl:with-param name="context-desc" select="concat('meta ', $context)"/>
-        <xsl:with-param name="message">
-          <xsl:text>no refentry/refmeta/refmiscinfo@class=</xsl:text>
-          <xsl:value-of select="$context"/>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:call-template name="log.message">
-        <xsl:with-param name="level">Note</xsl:with-param>
-        <xsl:with-param name="source" select="$refname"/>
-        <xsl:with-param name="context-desc" select="concat('meta ', $context)"/>
-        <xsl:with-param name="message" select="concat('Using ', local-name($contents))"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:if>
-  <xsl:value-of select="$contents"/>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/stripns.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/stripns.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,342 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:ng="http://docbook.org/docbook-ng"
-                xmlns:db="http://docbook.org/ns/docbook"
-                xmlns:saxon="http://icl.com/saxon"
-                xmlns:NodeInfo="http://org.apache.xalan.lib.NodeInfo"
-                xmlns:exsl="http://exslt.org/common"
-                exclude-result-prefixes="db ng exsl saxon NodeInfo"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- put an xml:base attribute on the root element -->
-<xsl:template match="/*" mode="stripNS">
-  <xsl:choose>
-    <xsl:when test="self::ng:* or self::db:*">
-      <xsl:element name="{local-name(.)}">
-        <xsl:copy-of select="@*[not(name(.) = 'xml:id')
-                                and not(name(.) = 'version')]"/>
-        <xsl:if test="@xml:id">
-          <xsl:attribute name="id">
-            <xsl:value-of select="@xml:id"/>
-          </xsl:attribute>
-        </xsl:if>
-
-        <xsl:call-template name="add-xml-base"/>
-
-        <xsl:apply-templates mode="stripNS"/>
-      </xsl:element>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy>
-        <xsl:copy-of select="@*[not(name(.) = 'xml:id')
-                                and not(name(.) = 'version')]"/>
-        <xsl:if test="@xml:id">
-          <xsl:attribute name="id">
-            <xsl:value-of select="@xml:id"/>
-          </xsl:attribute>
-        </xsl:if>
-
-        <xsl:call-template name="add-xml-base"/>
-
-        <xsl:apply-templates mode="stripNS"/>
-      </xsl:copy>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="stripNS">
-  <xsl:choose>
-    <xsl:when test="self::ng:* or self::db:*">
-      <xsl:element name="{local-name(.)}">
-        <xsl:copy-of select="@*[not(name(.) = 'xml:id')
-                                and not(name(.) = 'version')]"/>
-        <xsl:if test="@xml:id">
-          <xsl:attribute name="id">
-            <xsl:value-of select="@xml:id"/>
-          </xsl:attribute>
-        </xsl:if>
-        <xsl:apply-templates mode="stripNS"/>
-      </xsl:element>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy>
-        <xsl:copy-of select="@*[not(name(.) = 'xml:id')
-                                and not(name(.) = 'version')]"/>
-        <xsl:if test="@xml:id">
-          <xsl:attribute name="id">
-            <xsl:value-of select="@xml:id"/>
-          </xsl:attribute>
-        </xsl:if>
-        <xsl:apply-templates mode="stripNS"/>
-      </xsl:copy>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="db:info" mode="stripNS">
-  <xsl:variable name="info">
-    <xsl:choose>
-      <xsl:when test="parent::db:article
-                      |parent::db:appendix
-                      |parent::db:bibliography
-                      |parent::db:book
-                      |parent::db:chapter
-                      |parent::db:glossary
-                      |parent::db:index
-                      |parent::db:part
-                      |parent::db:preface
-                      |parent::db:refentry
-                      |parent::db:reference
-                      |parent::db:refsect1
-                      |parent::db:refsect2
-                      |parent::db:refsect3
-                      |parent::db:refsection
-                      |parent::db:refsynopsisdiv
-                      |parent::db:sect1
-                      |parent::db:sect2
-                      |parent::db:sect3
-                      |parent::db:sect4
-                      |parent::db:sect5
-                      |parent::db:section
-                      |parent::db:setindex
-                      |parent::db:set
-                      |parent::db:slides
-                      |parent::db:sidebar">
-        <xsl:value-of select="local-name(parent::*)"/>
-        <xsl:text>info</xsl:text>
-      </xsl:when>
-      <xsl:when test="parent::db:audioobject
-                      |parent::db:imageobject
-                      |parent::db:inlinemediaobject
-                      |parent::db:mediaobject
-                      |parent::db:mediaobjectco
-                      |parent::db:textobject
-                      |parent::db:videoobject">
-        <xsl:text>objectinfo</xsl:text>
-      </xsl:when>
-      <xsl:otherwise>blockinfo</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:element name="{$info}">
-    <xsl:copy-of select="@*[not(name(.) = 'xml:id')
-                         and not(name(.) = 'version')]"/>
-    <xsl:if test="@xml:id">
-      <xsl:attribute name="id">
-        <xsl:value-of select="@xml:id"/>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:apply-templates mode="stripNS"/>
-  </xsl:element>
-
-  <xsl:if test="(not(../db:title) and not(../ng:title))
-                and ($info = 'prefaceinfo'
-                     or $info = 'chapterinfo'
-                     or $info = 'sectioninfo'
-                     or $info = 'sect1info'
-                     or $info = 'sect2info'
-                     or $info = 'sect3info'
-                     or $info = 'sect4info'
-                     or $info = 'sect5info'
-                     or $info = 'refsectioninfo'
-                     or $info = 'refsect1info'
-                     or $info = 'refsect2info'
-                     or $info = 'refsect3info'
-                     or $info = 'blockinfo'
-                     or $info = 'appendixinfo')">
-    <xsl:apply-templates select="db:title|ng:title" mode="stripNS"/>
-  </xsl:if>
-
-</xsl:template>
-
-<xsl:template match="ng:link|db:link" mode="stripNS">
-  <xsl:variable xmlns:xlink="http://www.w3.org/1999/xlink"
-                name="href" select="@xlink:href|@href"/>
-  <xsl:choose>
-    <xsl:when test="$href != '' and not(starts-with($href,'#'))">
-      <ulink url="{$href}">
-        <xsl:for-each select="@*">
-          <xsl:if test="local-name(.) != 'href'
-                        and name(.) != 'version'
-                        and name(.) != 'xml:id'">
-            <xsl:copy/>
-          </xsl:if>
-        </xsl:for-each>
-        <xsl:if test="@xml:id">
-          <xsl:attribute name="id">
-            <xsl:value-of select="@xml:id"/>
-          </xsl:attribute>
-        </xsl:if>
-        <xsl:apply-templates mode="stripNS"/>
-      </ulink>
-    </xsl:when>
-    <xsl:when test="$href != '' and starts-with($href,'#')">
-      <link linkend="{substring-after($href,'#')}">
-        <xsl:for-each select="@*">
-          <xsl:if test="local-name(.) != 'href'
-                        and name(.) != 'version'
-                        and name(.) != 'xml:id'">
-            <xsl:copy/>
-          </xsl:if>
-        </xsl:for-each>
-        <xsl:if test="@xml:id">
-          <xsl:attribute name="id">
-            <xsl:value-of select="@xml:id"/>
-          </xsl:attribute>
-        </xsl:if>
-        <xsl:apply-templates mode="stripNS"/>
-      </link>
-    </xsl:when>
-    <xsl:otherwise>
-      <link>
-        <xsl:copy-of select="@*[not(name(.) = 'xml:id')
-                             and not(name(.) = 'version')]"/>
-        <xsl:if test="@xml:id">
-          <xsl:attribute name="id">
-            <xsl:value-of select="@xml:id"/>
-          </xsl:attribute>
-        </xsl:if>
-        <xsl:apply-templates mode="stripNS"/>
-      </link>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="ng:tag|db:tag" mode="stripNS">
-  <sgmltag>
-    <xsl:copy-of select="@*[not(name(.) = 'xml:id')
-                         and not(name(.) = 'version')]"/>
-    <xsl:apply-templates mode="stripNS"/>
-  </sgmltag>
-</xsl:template>
-
-<xsl:template match="ng:textdata|db:textdata
-                     |ng:imagedata|db:imagedata
-                     |ng:videodata|db:videodata
-                     |ng:audiodata|db:audiodata" mode="stripNS">
-  <xsl:element name="{local-name(.)}">
-    <xsl:copy-of select="@*[not(name(.) = 'xml:id')
-                            and not(name(.) = 'version')
-                            and not(name(.) = 'entityref')]"/>
-    <xsl:if test="@xml:id">
-      <xsl:attribute name="id">
-        <xsl:value-of select="@xml:id"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:choose>
-      <xsl:when test="@entityref">
-        <xsl:attribute name="fileref">
-          <xsl:value-of select="unparsed-entity-uri(@entityref)"/>
-        </xsl:attribute>
-      </xsl:when>
-    </xsl:choose>
-
-    <xsl:apply-templates mode="stripNS"/>
-  </xsl:element>
-</xsl:template>
-
-<xsl:template name="add-xml-base">
-  <xsl:if test="not(@xml:base)">
-    <xsl:variable name="base">
-      <xsl:choose>
-        <xsl:when test="function-available('saxon:systemId')">
-          <xsl:value-of select="saxon:systemId()"/>
-        </xsl:when>
-        <xsl:when test="function-available('NodeInfo:systemId')">
-          <xsl:value-of select="NodeInfo:systemId()"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>WARNING: cannot add @xml:base to node </xsl:text>
-            <xsl:text>set root element.  </xsl:text>
-            <xsl:text>Relative paths may not work.</xsl:text>
-          </xsl:message>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <!-- debug
-    <xsl:message>base is <xsl:value-of select="$base"/></xsl:message>
-    -->
-    <xsl:if test="$base != ''">
-      <xsl:attribute name="xml:base">
-        <xsl:call-template name="systemIdToBaseURI">
-          <xsl:with-param name="systemId">
-            <!-- file: seems to confuse some processors. -->
-            <xsl:choose>
-              <!-- however, windows paths must use file:///c:/path -->
-              <xsl:when test="starts-with($base, 'file:///') and
-                              substring($base, 10, 1) = ':'">
-                <xsl:value-of select="$base"/>
-              </xsl:when>
-              <xsl:when test="starts-with($base, 'file:/')
-                              and substring($base, 8, 1) = ':'">
-                <xsl:value-of select="concat('file:///', 
-                                      substring-after($base,'file:/'))"/>
-              </xsl:when>
-              <xsl:when test="starts-with($base, 'file:///')">
-                <xsl:value-of select="substring-after($base,'file://')"/>
-              </xsl:when>
-              <xsl:when test="starts-with($base, 'file://')">
-                <xsl:value-of select="substring-after($base,'file:/')"/>
-              </xsl:when>
-              <xsl:when test="starts-with($base, 'file:/')">
-                <xsl:value-of select="substring-after($base,'file:')"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="$base"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:attribute>
-    </xsl:if>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="systemIdToBaseURI">
-  <xsl:param name="systemId" select="''"/>
-  <xsl:if test="contains($systemId,'/')">
-    <xsl:value-of select="substring-before($systemId,'/')"/>
-    <xsl:text>/</xsl:text>
-    <xsl:call-template name="systemIdToBaseURI">
-      <xsl:with-param name="systemId"
-                      select="substring-after($systemId,'/')"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="comment()|processing-instruction()|text()" mode="stripNS">
-  <xsl:copy/>
-</xsl:template>
-
-<xsl:template match="/" priority="-1">
-  <xsl:choose>
-    <xsl:when test="(function-available('exsl:node-set') or
-                     contains(system-property('xsl:vendor'),
-                       'Apache Software Foundation'))
-                    and (*/self::ng:* or */self::db:*)">
-      <xsl:message>Stripping namespace from DocBook 5 document.</xsl:message>
-      <xsl:variable name="nons">
-        <xsl:apply-templates mode="stripNS"/>
-      </xsl:variable>
-      <xsl:message>Processing stripped document.</xsl:message>
-      <xsl:apply-templates select="exsl:node-set($nons)"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="@* | node()"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/subtitles.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/subtitles.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,155 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-                exclude-result-prefixes="doc"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!-- subtitle markup -->
-
-<doc:mode mode="subtitle.markup" xmlns="">
-<refpurpose>Provides access to element subtitles</refpurpose>
-<refdescription id="subtitle.markup-desc">
-<para>Processing an element in the
-<literal role="mode">subtitle.markup</literal> mode produces the
-subtitle of the element.
-</para>
-</refdescription>
-</doc:mode>
-
-<xsl:template match="*" mode="subtitle.markup">
-  <xsl:message>
-    <xsl:text>Request for subtitle of unexpected element: </xsl:text>
-    <xsl:value-of select="local-name(.)"/>
-  </xsl:message>
-  <xsl:text>???SUBTITLE???</xsl:text>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="subtitle.markup">
-  <xsl:param name="allow-anchors" select="'0'"/>
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="set" mode="subtitle.markup">
-  <xsl:param name="allow-anchors" select="'0'"/>
-  <xsl:apply-templates select="(setinfo/subtitle|info/subtitle|subtitle)[1]"
-                       mode="subtitle.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="book" mode="subtitle.markup">
-  <xsl:param name="allow-anchors" select="'0'"/>
-  <xsl:apply-templates select="(bookinfo/subtitle|info/subtitle|subtitle)[1]"
-                       mode="subtitle.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="part" mode="subtitle.markup">
-  <xsl:param name="allow-anchors" select="'0'"/>
-  <xsl:apply-templates select="(partinfo/subtitle
-                                |docinfo/subtitle
-                                |info/subtitle
-                                |subtitle)[1]"
-                       mode="subtitle.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="preface|chapter|appendix" mode="subtitle.markup">
-  <xsl:param name="allow-anchors" select="'0'"/>
-  <xsl:apply-templates select="(docinfo/subtitle
-                                |info/subtitle
-                                |prefaceinfo/subtitle
-                                |chapterinfo/subtitle
-                                |appendixinfo/subtitle
-                                |subtitle)[1]"
-                       mode="subtitle.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="article" mode="subtitle.markup">
-  <xsl:param name="allow-anchors" select="'0'"/>
-  <xsl:apply-templates select="(artheader/subtitle
-                                |articleinfo/subtitle
-                                |info/subtitle
-                                |subtitle)[1]"
-                       mode="subtitle.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="dedication|colophon" mode="subtitle.markup">
-  <xsl:param name="allow-anchors" select="'0'"/>
-  <xsl:apply-templates select="(subtitle|info/subtitle)[1]"
-                       mode="subtitle.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="reference" mode="subtitle.markup">
-  <xsl:param name="allow-anchors" select="'0'"/>
-  <xsl:apply-templates select="(referenceinfo/subtitle
-                                |docinfo/subtitle
-                                |info/subtitle
-                                |subtitle)[1]"
-                       mode="subtitle.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="qandaset" mode="subtitle.markup">
-  <xsl:param name="allow-anchors" select="'0'"/>
-  <xsl:apply-templates select="(blockinfo/subtitle|info/subtitle)[1]"
-                       mode="subtitle.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="refentry" mode="subtitle.markup">
-  <xsl:param name="allow-anchors" select="'0'"/>
-  <xsl:apply-templates select="(refentryinfo/subtitle
-                                |info/subtitle
-                                |docinfo/subtitle)[1]"
-                       mode="subtitle.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="section
-                     |sect1|sect2|sect3|sect4|sect5
-                     |refsect1|refsect2|refsect3
-                     |simplesect"
-              mode="subtitle.markup">
-  <xsl:param name="allow-anchors" select="'0'"/>
-  <xsl:apply-templates select="(info/subtitle
-                                |sectioninfo/subtitle
-                                |sect1info/subtitle
-                                |sect2info/subtitle
-                                |sect3info/subtitle
-                                |sect4info/subtitle
-                                |sect5info/subtitle
-                                |refsect1info/subtitle
-                                |refsect2info/subtitle
-                                |refsect3info/subtitle
-                                |subtitle)[1]"
-                       mode="subtitle.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/table.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/table.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,514 +1,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-                exclude-result-prefixes="doc"
-                version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template name="blank.spans">
-  <xsl:param name="cols" select="1"/>
-  <xsl:if test="$cols &gt; 0">
-    <xsl:text>0:</xsl:text>
-    <xsl:call-template name="blank.spans">
-      <xsl:with-param name="cols" select="$cols - 1"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="calculate.following.spans">
-  <xsl:param name="colspan" select="1"/>
-  <xsl:param name="spans" select="''"/>
-
-  <xsl:choose>
-    <xsl:when test="$colspan &gt; 0">
-      <xsl:call-template name="calculate.following.spans">
-        <xsl:with-param name="colspan" select="$colspan - 1"/>
-        <xsl:with-param name="spans" select="substring-after($spans,':')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$spans"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="finaltd">
-  <xsl:param name="spans"/>
-  <xsl:param name="col" select="0"/>
-
-  <xsl:if test="$spans != ''">
-    <xsl:choose>
-      <xsl:when test="starts-with($spans,'0:')">
-        <xsl:call-template name="empty.table.cell">
-          <xsl:with-param name="colnum" select="$col"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise></xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:call-template name="finaltd">
-      <xsl:with-param name="spans" select="substring-after($spans,':')"/>
-      <xsl:with-param name="col" select="$col+1"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="sfinaltd">
-  <xsl:param name="spans"/>
-
-  <xsl:if test="$spans != ''">
-    <xsl:choose>
-      <xsl:when test="starts-with($spans,'0:')">0:</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="substring-before($spans,':')-1"/>
-        <xsl:text>:</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:call-template name="sfinaltd">
-      <xsl:with-param name="spans" select="substring-after($spans,':')"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="entry.colnum">
-  <xsl:param name="entry" select="."/>
-
-  <xsl:choose>
-    <xsl:when test="$entry/@spanname">
-      <xsl:variable name="spanname" select="$entry/@spanname"/>
-      <xsl:variable name="spanspec"
-                    select="($entry/ancestor::tgroup/spanspec[@spanname=$spanname]
-                             |$entry/ancestor::entrytbl/spanspec[@spanname=$spanname])[last()]"/>
-      <xsl:variable name="colspec"
-                    select="($entry/ancestor::tgroup/colspec[@colname=$spanspec/@namest]
-                             |$entry/ancestor::entrytbl/colspec[@colname=$spanspec/@namest])[last()]"/>
-      <xsl:call-template name="colspec.colnum">
-        <xsl:with-param name="colspec" select="$colspec"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$entry/@colname">
-      <xsl:variable name="colname" select="$entry/@colname"/>
-      <xsl:variable name="colspec"
-                    select="($entry/ancestor::tgroup/colspec[@colname=$colname]
-                             |$entry/ancestor::entrytbl/colspec[@colname=$colname])[last()]"/>
-      <xsl:call-template name="colspec.colnum">
-        <xsl:with-param name="colspec" select="$colspec"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$entry/@namest">
-      <xsl:variable name="namest" select="$entry/@namest"/>
-      <xsl:variable name="colspec"
-                    select="($entry/ancestor::tgroup/colspec[@colname=$namest]
-                             |$entry/ancestor::entrytbl/colspec[@colname=$namest])[last()]"/>
-      <xsl:call-template name="colspec.colnum">
-        <xsl:with-param name="colspec" select="$colspec"/>
-      </xsl:call-template>
-    </xsl:when>
-    <!-- no idea, return 0 -->
-    <xsl:otherwise>0</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<doc:template name="entry.colnum" xmlns="">
-<refpurpose>Determine the column number in which a given entry occurs</refpurpose>
-<refdescription id="entry.colnum-desc">
-<para>If an <tag>entry</tag> has a
-<tag class="attribute">colname</tag> or
-<tag class="attribute">namest</tag> attribute, this template
-will determine the number of the column in which the entry should occur.
-For other <tag>entry</tag>s, nothing is returned.</para>
-</refdescription>
-<refparameter id="entry.colnum-params">
-<variablelist>
-<varlistentry><term>entry</term>
-<listitem>
-<para>The <tag>entry</tag>-element which is to be tested.</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</refparameter>
-
-<refreturn id="entry.colnum-returns">
-<para>This template returns the column number if it can be determined,
-or 0 (the empty string)</para>
-</refreturn>
-</doc:template>
-
-<xsl:template name="colspec.colnum">
-  <xsl:param name="colspec" select="."/>
-  <xsl:choose>
-    <xsl:when test="$colspec/@colnum">
-      <xsl:value-of select="$colspec/@colnum"/>
-    </xsl:when>
-    <xsl:when test="$colspec/preceding-sibling::colspec">
-      <xsl:variable name="prec.colspec.colnum">
-        <xsl:call-template name="colspec.colnum">
-          <xsl:with-param name="colspec"
-                          select="$colspec/preceding-sibling::colspec[1]"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:value-of select="$prec.colspec.colnum + 1"/>
-    </xsl:when>
-    <xsl:otherwise>1</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="calculate.colspan">
-  <xsl:param name="entry" select="."/>
-  <xsl:variable name="spanname" select="$entry/@spanname"/>
-  <xsl:variable name="spanspec"
-                select="($entry/ancestor::tgroup/spanspec[@spanname=$spanname]
-                         |$entry/ancestor::entrytbl/spanspec[@spanname=$spanname])[last()]"/>
-
-  <xsl:variable name="namest">
-    <xsl:choose>
-      <xsl:when test="@spanname">
-        <xsl:value-of select="$spanspec/@namest"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$entry/@namest"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="nameend">
-    <xsl:choose>
-      <xsl:when test="@spanname">
-        <xsl:value-of select="$spanspec/@nameend"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$entry/@nameend"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="scol">
-    <xsl:call-template name="colspec.colnum">
-      <xsl:with-param name="colspec"
-                      select="($entry/ancestor::tgroup/colspec[@colname=$namest]
-                               |$entry/ancestor::entrytbl/colspec[@colname=$namest])[last()]"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="ecol">
-    <xsl:call-template name="colspec.colnum">
-      <xsl:with-param name="colspec"
-                      select="($entry/ancestor::tgroup/colspec[@colname=$nameend]
-                               |$entry/ancestor::entrytbl/colspec[@colname=$nameend])[last()]"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$namest != '' and $nameend != ''">
-      <xsl:choose>
-        <xsl:when test="number($ecol) &gt;= number($scol)">
-          <xsl:value-of select="number($ecol) - number($scol) + 1"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="number($scol) - number($ecol) + 1"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>1</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="calculate.rowsep">
-  <xsl:param name="entry" select="."/>
-  <xsl:param name="colnum" select="0"/>
-
-  <xsl:call-template name="inherited.table.attribute">
-    <xsl:with-param name="entry" select="$entry"/>
-    <xsl:with-param name="colnum" select="$colnum"/>
-    <xsl:with-param name="attribute" select="'rowsep'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="calculate.colsep">
-  <xsl:param name="entry" select="."/>
-  <xsl:param name="colnum" select="0"/>
-
-  <xsl:call-template name="inherited.table.attribute">
-    <xsl:with-param name="entry" select="$entry"/>
-    <xsl:with-param name="colnum" select="$colnum"/>
-    <xsl:with-param name="attribute" select="'colsep'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="inherited.table.attribute">
-  <xsl:param name="entry" select="."/>
-  <xsl:param name="row" select="$entry/ancestor-or-self::row[1]"/>
-  <xsl:param name="colnum" select="0"/>
-  <xsl:param name="attribute" select="'colsep'"/>
-
-  <xsl:variable name="tgroup" select="$row/parent::*/parent::tgroup[1]"/>
-  <xsl:variable name="tbody" select="$row/parent::*[1]"/>
-
-  <xsl:variable name="table" select="($tgroup/ancestor::table
-                                     |$tgroup/ancestor::informaltable
-				     |$entry/ancestor::entrytbl)[last()]"/>
-
-  <xsl:variable name="entry.value">
-    <xsl:call-template name="get-attribute">
-      <xsl:with-param name="element" select="$entry"/>
-      <xsl:with-param name="attribute" select="$attribute"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="row.value">
-    <xsl:call-template name="get-attribute">
-      <xsl:with-param name="element" select="$row"/>
-      <xsl:with-param name="attribute" select="$attribute"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="span.value">
-    <xsl:if test="$entry/@spanname">
-      <xsl:variable name="spanname" select="$entry/@spanname"/>
-      <xsl:variable name="spanspec"
-                    select="$tgroup/spanspec[@spanname=$spanname]"/>
-      <xsl:variable name="span.colspec"
-                    select="$tgroup/colspec[@colname=$spanspec/@namest]"/>
-
-      <xsl:variable name="spanspec.value">
-        <xsl:call-template name="get-attribute">
-          <xsl:with-param name="element" select="$spanspec"/>
-          <xsl:with-param name="attribute" select="$attribute"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="scolspec.value">
-        <xsl:call-template name="get-attribute">
-          <xsl:with-param name="element" select="$span.colspec"/>
-          <xsl:with-param name="attribute" select="$attribute"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="$spanspec.value != ''">
-          <xsl:value-of select="$spanspec.value"/>
-        </xsl:when>
-        <xsl:when test="$scolspec.value != ''">
-          <xsl:value-of select="$scolspec.value"/>
-        </xsl:when>
-        <xsl:otherwise></xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="namest.value">
-    <xsl:if test="$entry/@namest">
-      <xsl:variable name="namest" select="$entry/@namest"/>
-      <xsl:variable name="colspec"
-                    select="$tgroup/colspec[@colname=$namest]"/>
-
-      <xsl:variable name="inner.namest.value">
-        <xsl:call-template name="get-attribute">
-          <xsl:with-param name="element" select="$colspec"/>
-          <xsl:with-param name="attribute" select="$attribute"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="$inner.namest.value">
-          <xsl:value-of select="$inner.namest.value"/>
-        </xsl:when>
-        <xsl:otherwise></xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="tgroup.value">
-    <xsl:call-template name="get-attribute">
-      <xsl:with-param name="element" select="$tgroup"/>
-      <xsl:with-param name="attribute" select="$attribute"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="tbody.value">
-    <xsl:call-template name="get-attribute">
-      <xsl:with-param name="element" select="$tbody"/>
-      <xsl:with-param name="attribute" select="$attribute"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="table.value">
-    <xsl:call-template name="get-attribute">
-      <xsl:with-param name="element" select="$table"/>
-      <xsl:with-param name="attribute" select="$attribute"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="default.value">
-    <!-- This section used to say that rowsep and colsep have defaults based -->
-    <!-- on the frame setting. Further reflection and closer examination of the -->
-    <!-- CALS spec reveals I was mistaken. The default is "1" for rowsep and colsep. -->
-    <!-- For everything else, the default is the tgroup value -->
-    <xsl:choose>
-      <xsl:when test="$tgroup.value != ''">
-        <xsl:value-of select="$tgroup.value"/>
-      </xsl:when>
-      <xsl:when test="$attribute = 'rowsep'">1</xsl:when>
-      <xsl:when test="$attribute = 'colsep'">1</xsl:when>
-      <xsl:otherwise><!-- empty --></xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="calc.colvalue">
-    <xsl:if test="$colnum &gt; 0">
-      <xsl:call-template name="colnum.colspec">
-        <xsl:with-param name="colnum" select="$colnum"/>
-        <xsl:with-param name="attribute" select="$attribute"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$entry.value != ''">
-      <xsl:value-of select="$entry.value"/>
-    </xsl:when>
-    <xsl:when test="$row.value != ''">
-      <xsl:value-of select="$row.value"/>
-    </xsl:when>
-    <xsl:when test="$span.value != ''">
-      <xsl:value-of select="$span.value"/>
-    </xsl:when>
-    <xsl:when test="$namest.value != ''">
-      <xsl:value-of select="$namest.value"/>
-    </xsl:when>
-    <xsl:when test="$calc.colvalue != ''">
-      <xsl:value-of select="$calc.colvalue"/>
-    </xsl:when>
-    <xsl:when test="$tbody.value != ''">
-      <xsl:value-of select="$tbody.value"/>
-    </xsl:when>
-    <xsl:when test="$tgroup.value != ''">
-      <xsl:value-of select="$tgroup.value"/>
-    </xsl:when>
-    <xsl:when test="$table.value != ''">
-      <xsl:value-of select="$table.value"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$default.value"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="colnum.colspec">
-  <xsl:param name="colnum" select="0"/>
-  <xsl:param name="attribute" select="'colname'"/>
-  <xsl:param name="colspec.ancestor" 
-             select="(ancestor::tgroup|ancestor::entrytbl)
-	             [position() = last()]"/>
-  <xsl:param name="colspecs" select="$colspec.ancestor/colspec"/>
-  <xsl:param name="count" select="1"/>
-
-  <xsl:choose>
-    <xsl:when test="not($colspecs) or $count &gt; $colnum">
-      <!-- nop -->
-    </xsl:when>
-    <xsl:when test="$colspecs[1]/@colnum">
-      <xsl:choose>
-        <xsl:when test="$colspecs[1]/@colnum = $colnum">
-          <xsl:call-template name="get-attribute">
-            <xsl:with-param name="element" select="$colspecs[1]"/>
-            <xsl:with-param name="attribute" select="$attribute"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="colnum.colspec">
-            <xsl:with-param name="colnum" select="$colnum"/>
-            <xsl:with-param name="attribute" select="$attribute"/>
-            <xsl:with-param name="colspecs"
-                            select="$colspecs[position()&gt;1]"/>
-            <xsl:with-param name="count"
-                            select="$colspecs[1]/@colnum+1"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$count = $colnum">
-          <xsl:call-template name="get-attribute">
-            <xsl:with-param name="element" select="$colspecs[1]"/>
-            <xsl:with-param name="attribute" select="$attribute"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="colnum.colspec">
-            <xsl:with-param name="colnum" select="$colnum"/>
-            <xsl:with-param name="attribute" select="$attribute"/>
-            <xsl:with-param name="colspecs"
-                            select="$colspecs[position()&gt;1]"/>
-            <xsl:with-param name="count" select="$count+1"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="get-attribute">
-  <xsl:param name="element" select="."/>
-  <xsl:param name="attribute" select="''"/>
-
-  <xsl:for-each select="$element/@*">
-    <xsl:if test="local-name(.) = $attribute">
-      <xsl:value-of select="."/>
-    </xsl:if>
-  </xsl:for-each>
-</xsl:template>
-
-<xsl:template name="consume-row">
-  <xsl:param name="spans"/>
-
-  <xsl:if test="contains($spans,':')">
-    <xsl:value-of select="substring-before($spans,':') - 1"/>
-    <xsl:text>:</xsl:text>
-    <xsl:call-template name="consume-row">
-      <xsl:with-param name="spans" select="substring-after($spans,':')"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<!-- Returns the table style for the context element -->
-<xsl:template name="tabstyle">
-  <xsl:param name="node" select="."/>
-
-  <xsl:variable name="tgroup" select="$node/tgroup[1] | 
-                                      $node/ancestor-or-self::tgroup[1]"/>
-
-  <xsl:variable name="table" 
-                select="($node/ancestor-or-self::table | 
-                         $node/ancestor-or-self::informaltable)[1]"/>
-
-  <xsl:variable name="tabstyle">
-    <xsl:choose>
-      <xsl:when test="$table/@tabstyle != ''">
-        <xsl:value-of select="normalize-space($table/@tabstyle)"/>
-      </xsl:when>
-      <xsl:when test="$tgroup/@tgroupstyle != ''">
-        <xsl:value-of select="normalize-space($tgroup/@tgroupstyle)"/>
-      </xsl:when>
-      <xsl:otherwise>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:value-of select="$tabstyle"/>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/targetdatabase.dtd
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/targetdatabase.dtd	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,49 +1,0 @@
-<!-- targetdatabase.dtd -->
-<!-- A DTD for managing cross reference target information -->
-
-<!ELEMENT targetset (targetsetinfo?, sitemap*, document*) >
-
-<!ELEMENT targetsetinfo ANY >
-
-<!ELEMENT sitemap (dir) >
-
-<!ELEMENT dir ((dir|document)*) >
-<!ATTLIST dir
-        name      CDATA   #REQUIRED
->
-
-<!ELEMENT document (div*) >
-<!ATTLIST document
-        targetdoc CDATA   #REQUIRED
-        uri       CDATA   #IMPLIED
-        baseuri   CDATA   #IMPLIED
-        href      CDATA   #IMPLIED
-        dir       CDATA   #IMPLIED
->
-
-<!ELEMENT div (ttl?, objttl?, xreftext?, (div|obj)*)>
-<!ATTLIST div
-        targetptr  CDATA   #IMPLIED
-        element   CDATA   #IMPLIED
-        name      CDATA   #IMPLIED
-        number    CDATA   #IMPLIED
-        href      CDATA   #IMPLIED
-        lang      CDATA   #IMPLIED
-        page      CDATA   #IMPLIED
->
-        
-        
-<!ELEMENT ttl ANY >
-<!ELEMENT objttl ANY >
-<!ELEMENT xreftext ANY >
-
-<!ELEMENT obj (ttl?, objttl?, xreftext?)>
-<!ATTLIST obj
-        targetptr  CDATA   #IMPLIED
-        element   CDATA   #IMPLIED
-        name      CDATA   #IMPLIED
-        number    CDATA   #IMPLIED
-        href      CDATA   #IMPLIED
-        lang      CDATA   #IMPLIED
-        page      CDATA   #IMPLIED
->
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/targets.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/targets.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,272 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-                exclude-result-prefixes="doc"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!-- cross reference target collection  -->
-
-<doc:mode mode="collect.targets" xmlns="">
-<refpurpose>Collects information for potential cross reference targets</refpurpose>
-<refdescription id="collect.targets-desc">
-<para>Processing the root element in the
-<literal role="mode">collect.targets</literal> mode produces 
-a set of target database elements that can be used by
-the olink mechanism to resolve external cross references.
-The collection process is controlled by the <literal>
-collect.xref.targets</literal> parameter, which can be
-<literal>yes</literal> to collect targets and process
-the document for output, <literal>only</literal> to
-only collect the targets, and <literal>no</literal>
-(default) to not collect the targets and only process the document.
-</para>
-<para>
-A <literal>targets.filename</literal> parameter must be
-specified to receive the output if 
-<literal>collect.xref.targets</literal> is
-set to <literal>yes</literal> so as to
-redirect the target data to a file separate from the
-document output.
-</para>
-</refdescription>
-</doc:mode>
-
-<!-- ============================================================ -->
-
-<xsl:template match="*" mode="collect.targets">
-  <xsl:choose>
-    <xsl:when test="$collect.xref.targets = 'yes' and $targets.filename = ''">
-      <xsl:message>
-        Must specify a $targets.filename parameter when
-        $collect.xref.targets is set to 'yes'.
-        The xref targets were not collected.
-      </xsl:message>
-    </xsl:when> 
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$targets.filename">
-          <xsl:call-template name="write.chunk">
-            <xsl:with-param name="filename" select="$targets.filename"/>
-            <xsl:with-param name="method" select="'xml'"/>
-            <xsl:with-param name="encoding" select="'utf-8'"/>
-            <xsl:with-param name="omit-xml-declaration" select="'yes'"/>
-            <xsl:with-param name="doctype-public" select="''"/>
-            <xsl:with-param name="doctype-system" select="''"/>
-            <xsl:with-param name="indent" select="'no'"/>
-            <xsl:with-param name="quiet" select="0"/>
-            <xsl:with-param name="content">
-              <xsl:apply-templates select="." mode="olink.mode"/>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <!-- Else write to standard output -->
-          <xsl:apply-templates select="." mode="olink.mode"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="olink.href.target">
-  <xsl:param name="nd" select="."/>
-
-  <xsl:value-of select="$olink.base.uri"/>
-  <xsl:call-template name="href.target">
-    <xsl:with-param name="object" select="$nd"/>
-    <xsl:with-param name="context" select="NOTANODE"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- Templates for extracting cross reference information
-     from a document for use in an xref database.
--->
-
-<xsl:template name="attrs">
-  <xsl:param name="nd" select="."/>
-
-  <xsl:attribute name="element">
-    <xsl:value-of select="local-name(.)"/>
-  </xsl:attribute>
-
-  <xsl:attribute name="href">
-    <xsl:call-template name="olink.href.target">
-      <xsl:with-param name="nd" select="$nd"/>
-    </xsl:call-template>
-  </xsl:attribute>
-
-  <xsl:variable name="num">
-    <xsl:apply-templates select="$nd" mode="label.markup">
-      <xsl:with-param name="verbose" select="0"/>
-    </xsl:apply-templates>
-  </xsl:variable>
-
-  <xsl:if test="$num">
-    <xsl:attribute name="number">
-      <xsl:value-of select="$num"/>
-    </xsl:attribute>
-  </xsl:if>
-
-  <xsl:choose>
-    <xsl:when test="$nd/@id">
-      <xsl:attribute name="targetptr">
-        <xsl:value-of select="$nd/@id"/>
-      </xsl:attribute>
-    </xsl:when>
-    <xsl:when test="$nd/@xml:id">
-      <xsl:attribute name="targetptr">
-        <xsl:value-of select="$nd/@xml:id"/>
-      </xsl:attribute>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:if test="$nd/@lang">
-    <xsl:attribute name="lang">
-      <xsl:value-of select="$nd/@lang"/>
-    </xsl:attribute>
-  </xsl:if>
-
-</xsl:template>
-
-<xsl:template name="div">
-  <xsl:param name="nd" select="."/>
-
-  <div>
-    <xsl:call-template name="attrs">
-      <xsl:with-param name="nd" select="$nd"/>
-    </xsl:call-template>
-    <ttl>
-      <xsl:apply-templates select="$nd" mode="title.markup">
-        <xsl:with-param name="verbose" select="0"/>
-      </xsl:apply-templates>
-    </ttl>
-    <xreftext>
-      <xsl:choose>
-        <xsl:when test="$nd/@xreflabel">
-          <xsl:call-template name="xref.xreflabel">
-            <xsl:with-param name="target" select="$nd"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="$nd" mode="xref-to">
-            <xsl:with-param name="verbose" select="0"/>
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xreftext>
-    <xsl:apply-templates mode="olink.mode"/>
-  </div>
-</xsl:template>
-
-<xsl:template name="obj">
-  <xsl:param name="nd" select="."/>
-
-  <obj>
-    <xsl:call-template name="attrs">
-      <xsl:with-param name="nd" select="$nd"/>
-    </xsl:call-template>
-    <ttl>
-      <xsl:apply-templates select="$nd" mode="title.markup">
-        <xsl:with-param name="verbose" select="0"/>
-      </xsl:apply-templates>
-    </ttl>
-    <xreftext>
-      <xsl:choose>
-        <xsl:when test="$nd/@xreflabel">
-          <xsl:call-template name="xref.xreflabel">
-            <xsl:with-param name="target" select="$nd"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="$nd" mode="xref-to">
-            <xsl:with-param name="verbose" select="0"/>
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xreftext>
-  </obj>
-</xsl:template>
-
-<xsl:template match="text()|processing-instruction()|comment()"
-              mode="olink.mode">
-  <!-- nop -->
-</xsl:template>
-
-<!--
-<xsl:template match="*" mode="olink.mode">
-</xsl:template>
--->
-
-<xsl:template match="set" mode="olink.mode">
-  <xsl:call-template name="div"/>
-</xsl:template>
-
-<xsl:template match="book" mode="olink.mode">
-  <xsl:call-template name="div"/>
-</xsl:template>
-
-<xsl:template match="preface|chapter|appendix" mode="olink.mode">
-  <xsl:call-template name="div"/>
-</xsl:template>
-
-<xsl:template match="part|reference" mode="olink.mode">
-  <xsl:call-template name="div"/>
-</xsl:template>
-
-<xsl:template match="article" mode="olink.mode">
-  <xsl:call-template name="div"/>
-</xsl:template>
-
-<xsl:template match="bibliography|bibliodiv" mode="olink.mode">
-  <xsl:call-template name="div"/>
-</xsl:template>
-
-<xsl:template match="biblioentry|bibliomixed" mode="olink.mode">
-  <xsl:call-template name="obj"/>
-</xsl:template>
-
-<xsl:template match="refentry" mode="olink.mode">
-  <xsl:call-template name="div"/>
-</xsl:template>
-
-<xsl:template match="section|sect1|sect2|sect3|sect4|sect5" mode="olink.mode">
-  <xsl:call-template name="div"/>
-</xsl:template>
-
-<xsl:template match="refsection|refsect1|refsect2|refsect3" mode="olink.mode">
-  <xsl:call-template name="div"/>
-</xsl:template>
-
-<xsl:template match="figure|example|table" mode="olink.mode">
-  <xsl:call-template name="obj"/>
-  <xsl:apply-templates mode="olink.mode"/>
-</xsl:template>
-
-<xsl:template match="equation[title or info/title]" mode="olink.mode">
-  <xsl:call-template name="obj"/>
-</xsl:template>
-
-<xsl:template match="qandaset|qandaentry" mode="olink.mode">
-  <xsl:call-template name="div"/>
-</xsl:template>
-
-<xsl:template match="*" mode="olink.mode">
-  <xsl:if test="@id or @xml:id">
-    <xsl:call-template name="obj"/>
-  </xsl:if> 
-  <xsl:apply-templates mode="olink.mode"/>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/titles.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/titles.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,740 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-                exclude-result-prefixes="doc"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!-- title markup -->
-
-<doc:mode mode="title.markup" xmlns="">
-<refpurpose>Provides access to element titles</refpurpose>
-<refdescription id="title.markup-desc">
-<para>Processing an element in the
-<literal role="mode">title.markup</literal> mode produces the
-title of the element. This does not include the label.
-</para>
-</refdescription>
-</doc:mode>
-
-<xsl:template match="*" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:param name="verbose" select="1"/>
-  <xsl:choose>
-    <!-- * FIXME: this should handle other *info elements as well -->
-    <!-- * but this is good enough for now. -->
-    <xsl:when test="title|info/title">
-      <xsl:apply-templates select="title[1]|info/title[1]" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="local-name(.) = 'partintro'">
-      <!-- partintro's don't have titles, use the parent (part or reference)
-           title instead. -->
-      <xsl:apply-templates select="parent::*" mode="title.markup"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:if test="$verbose != 0">
-        <xsl:message>
-          <xsl:text>Request for title of element with no title: </xsl:text>
-          <xsl:value-of select="local-name(.)"/>
-          <xsl:choose>
-            <xsl:when test="@id">
-              <xsl:text> (id="</xsl:text>
-              <xsl:value-of select="@id"/>
-              <xsl:text>")</xsl:text>
-            </xsl:when>
-            <xsl:when test="@xml:id">
-              <xsl:text> (xml:id="</xsl:text>
-              <xsl:value-of select="@xml:id"/>
-              <xsl:text>")</xsl:text>
-            </xsl:when>
-          </xsl:choose>
-        </xsl:message>
-      </xsl:if>
-      <xsl:text>???TITLE???</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="title" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-
-  <xsl:choose>
-    <xsl:when test="$allow-anchors != 0">
-      <xsl:apply-templates/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="no.anchor.mode"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- only occurs in HTML Tables! -->
-<xsl:template match="caption" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-
-  <xsl:choose>
-    <xsl:when test="$allow-anchors != 0">
-      <xsl:apply-templates/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="no.anchor.mode"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="set" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:apply-templates select="(setinfo/title|info/title|title)[1]"
-                       mode="title.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="book" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:apply-templates select="(bookinfo/title|info/title|title)[1]"
-                       mode="title.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="part" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:apply-templates select="(partinfo/title|info/title|docinfo/title|title)[1]"
-                       mode="title.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="preface|chapter|appendix" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-
-<!--
-  <xsl:message>
-    <xsl:value-of select="local-name(.)"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="$allow-anchors"/>
-  </xsl:message>
--->
-
-  <xsl:variable name="title" select="(docinfo/title
-                                      |info/title
-                                      |prefaceinfo/title
-                                      |chapterinfo/title
-                                      |appendixinfo/title
-                                      |title)[1]"/>
-  <xsl:apply-templates select="$title" mode="title.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="dedication" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:choose>
-    <xsl:when test="title">
-      <xsl:apply-templates select="(title|info/title)[1]" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'Dedication'"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="colophon" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:choose>
-    <xsl:when test="title">
-      <xsl:apply-templates select="(title|info/title)[1]" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'Colophon'"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="article" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:variable name="title" select="(artheader/title
-                                      |articleinfo/title
-                                      |info/title
-                                      |title)[1]"/>
-
-  <xsl:apply-templates select="$title" mode="title.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="reference" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:apply-templates select="(referenceinfo/title|docinfo/title|info/title|title)[1]"
-                       mode="title.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="refentry" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:variable name="refmeta" select=".//refmeta"/>
-  <xsl:variable name="refentrytitle" select="$refmeta//refentrytitle"/>
-  <xsl:variable name="refnamediv" select=".//refnamediv"/>
-  <xsl:variable name="refname" select="$refnamediv//refname"/>
-  <xsl:variable name="refdesc" select="$refnamediv//refdescriptor"/>
-
-  <xsl:variable name="title">
-    <xsl:choose>
-      <xsl:when test="$refentrytitle">
-        <xsl:apply-templates select="$refentrytitle[1]" mode="title.markup"/>
-      </xsl:when>
-      <xsl:when test="$refdesc">
-        <xsl:apply-templates select="$refdesc" mode="title.markup"/>
-      </xsl:when>
-      <xsl:when test="$refname">
-        <xsl:apply-templates select="$refname[1]" mode="title.markup"/>
-      </xsl:when>
-      <xsl:otherwise>REFENTRY WITHOUT TITLE???</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:copy-of select="$title"/>
-</xsl:template>
-
-<xsl:template match="refentrytitle|refname|refdescriptor" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:choose>
-    <xsl:when test="$allow-anchors != 0">
-      <xsl:apply-templates/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="no.anchor.mode"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="section
-                     |sect1|sect2|sect3|sect4|sect5
-                     |refsect1|refsect2|refsect3|refsection
-                     |simplesect"
-              mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:variable name="title" select="(info/title
-                                      |sectioninfo/title
-                                      |sect1info/title
-                                      |sect2info/title
-                                      |sect3info/title
-                                      |sect4info/title
-                                      |sect5info/title
-                                      |refsect1info/title
-                                      |refsect2info/title
-                                      |refsect3info/title
-                                      |refsectioninfo/title
-                                      |title)[1]"/>
-
-  <xsl:apply-templates select="$title" mode="title.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="bridgehead" mode="title.markup">
-  <xsl:apply-templates mode="title.markup"/>
-</xsl:template>
-
-<xsl:template match="refsynopsisdiv" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:choose>
-    <xsl:when test="title">
-      <xsl:apply-templates select="title" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'RefSynopsisDiv'"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="bibliography" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:variable name="title" select="(bibliographyinfo/title|info/title|title)[1]"/>
-  <xsl:choose>
-    <xsl:when test="$title">
-      <xsl:apply-templates select="$title" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'Bibliography'"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="glossary" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:variable name="title" select="(glossaryinfo/title|info/title|title)[1]"/>
-  <xsl:choose>
-    <xsl:when test="$title">
-      <xsl:apply-templates select="$title" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext.element.name">
-        <xsl:with-param name="element.name" select="local-name(.)"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="glossdiv" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:variable name="title" select="(info/title|title)[1]"/>
-  <xsl:choose>
-    <xsl:when test="$title">
-      <xsl:apply-templates select="$title" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message>ERROR: glossdiv missing its required title</xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="glossentry" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:apply-templates select="glossterm" mode="title.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="glossterm" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-
-  <xsl:choose>
-    <xsl:when test="$allow-anchors != 0">
-      <xsl:apply-templates/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="no.anchor.mode"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="index" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:variable name="title" select="(indexinfo/title|info/title|title)[1]"/>
-  <xsl:choose>
-    <xsl:when test="$title">
-      <xsl:apply-templates select="$title" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'Index'"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="setindex" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:variable name="title" select="(setindexinfo/title|info/title|title)[1]"/>
-  <xsl:choose>
-    <xsl:when test="$title">
-      <xsl:apply-templates select="$title" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'SetIndex'"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="figure|example|equation" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:apply-templates select="title|info/title" mode="title.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="table" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:apply-templates select="(title|caption)[1]" mode="title.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="procedure" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:apply-templates select="title" mode="title.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="task" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:apply-templates select="title" mode="title.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="sidebar" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:apply-templates select="(info/title|sidebarinfo/title|title)[1]"
-                       mode="title.markup">
-    <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="abstract" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:choose>
-    <xsl:when test="title|info/title">
-      <xsl:apply-templates select="(title|info/title)[1]" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'Abstract'"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="caution|tip|warning|important|note" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:variable name="title" select="(title|info/title)[1]"/>
-  <xsl:choose>
-    <xsl:when test="$title">
-      <xsl:apply-templates select="$title" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key">
-          <xsl:choose>
-            <xsl:when test="local-name(.)='note'">Note</xsl:when>
-            <xsl:when test="local-name(.)='important'">Important</xsl:when>
-            <xsl:when test="local-name(.)='caution'">Caution</xsl:when>
-            <xsl:when test="local-name(.)='warning'">Warning</xsl:when>
-            <xsl:when test="local-name(.)='tip'">Tip</xsl:when>
-          </xsl:choose>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="question" mode="title.markup">
-  <!-- questions don't have titles -->
-  <xsl:text>Question</xsl:text>
-</xsl:template>
-
-<xsl:template match="answer" mode="title.markup">
-  <!-- answers don't have titles -->
-  <xsl:text>Answer</xsl:text>
-</xsl:template>
-
-<xsl:template match="qandaentry" mode="title.markup">
-  <!-- qandaentrys are represented by the first question in them -->
-  <xsl:text>Question</xsl:text>
-</xsl:template>
-
-<xsl:template match="qandaset" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:variable name="title" select="(info/title|
-                                      blockinfo/title|
-                                      title)[1]"/>
-  <xsl:choose>
-    <xsl:when test="$title">
-      <xsl:apply-templates select="$title" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'QandASet'"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:choose>
-    <xsl:when test="title">
-      <xsl:apply-templates select="title" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'LegalNotice'"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template match="*" mode="titleabbrev.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:choose>
-    <xsl:when test="titleabbrev">
-      <xsl:apply-templates select="titleabbrev[1]" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="." mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-        <xsl:with-param name="verbose" select="$verbose"/>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="book|preface|chapter|appendix" mode="titleabbrev.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:variable name="titleabbrev" select="(docinfo/titleabbrev
-                                           |bookinfo/titleabbrev
-                                           |info/titleabbrev
-                                           |prefaceinfo/titleabbrev
-                                           |chapterinfo/titleabbrev
-                                           |appendixinfo/titleabbrev
-                                           |titleabbrev)[1]"/>
-
-  <xsl:choose>
-    <xsl:when test="$titleabbrev">
-      <xsl:apply-templates select="$titleabbrev" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="." mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-        <xsl:with-param name="verbose" select="$verbose"/>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="article" mode="titleabbrev.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:variable name="titleabbrev" select="(artheader/titleabbrev
-                                           |articleinfo/titleabbrev
-                                           |info/titleabbrev
-                                           |titleabbrev)[1]"/>
-
-  <xsl:choose>
-    <xsl:when test="$titleabbrev">
-      <xsl:apply-templates select="$titleabbrev" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="." mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-        <xsl:with-param name="verbose" select="$verbose"/>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="section
-                     |sect1|sect2|sect3|sect4|sect5
-                     |refsect1|refsect2|refsect3
-                     |simplesect"
-              mode="titleabbrev.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:variable name="titleabbrev" select="(info/titleabbrev
-                                            |sectioninfo/titleabbrev
-                                            |sect1info/titleabbrev
-                                            |sect2info/titleabbrev
-                                            |sect3info/titleabbrev
-                                            |sect4info/titleabbrev
-                                            |sect5info/titleabbrev
-                                            |refsect1info/titleabbrev
-                                            |refsect2info/titleabbrev
-                                            |refsect3info/titleabbrev
-                                            |titleabbrev)[1]"/>
-
-  <xsl:choose>
-    <xsl:when test="$titleabbrev">
-      <xsl:apply-templates select="$titleabbrev" mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="." mode="title.markup">
-        <xsl:with-param name="allow-anchors" select="$allow-anchors"/>
-        <xsl:with-param name="verbose" select="$verbose"/>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="titleabbrev" mode="title.markup">
-  <xsl:param name="allow-anchors" select="0"/>
-
-  <xsl:choose>
-    <xsl:when test="$allow-anchors != 0">
-      <xsl:apply-templates/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="no.anchor.mode"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template match="*" mode="no.anchor.mode">
-  <!-- Switch to normal mode if no links -->
-  <xsl:choose>
-    <xsl:when test="descendant-or-self::footnote or
-                    descendant-or-self::anchor or
-                    descendant-or-self::ulink or
-                    descendant-or-self::link or
-                    descendant-or-self::olink or
-                    descendant-or-self::xref or
-                    descendant-or-self::indexterm">
-
-      <xsl:apply-templates mode="no.anchor.mode"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="."/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="footnote" mode="no.anchor.mode">
-  <!-- nop, suppressed -->
-</xsl:template>
-
-<xsl:template match="anchor" mode="no.anchor.mode">
-  <!-- nop, suppressed -->
-</xsl:template>
-
-<xsl:template match="ulink" mode="no.anchor.mode">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="link" mode="no.anchor.mode">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="olink" mode="no.anchor.mode">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="no.anchor.mode">
-  <!-- nop, suppressed -->
-</xsl:template>
-
-<xsl:template match="xref" mode="no.anchor.mode">
-  <xsl:variable name="targets" select="key('id',@linkend)"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-  <xsl:variable name="refelem" select="local-name($target)"/>
-  
-  <xsl:call-template name="check.id.unique">
-    <xsl:with-param name="linkend" select="@linkend"/>
-  </xsl:call-template>
-
-  <xsl:choose>
-    <xsl:when test="count($target) = 0">
-      <xsl:message>
-        <xsl:text>XRef to nonexistent id: </xsl:text>
-        <xsl:value-of select="@linkend"/>
-      </xsl:message>
-      <xsl:text>???</xsl:text>
-    </xsl:when>
-
-    <xsl:when test="@endterm">
-      <xsl:variable name="etargets" select="key('id',@endterm)"/>
-      <xsl:variable name="etarget" select="$etargets[1]"/>
-      <xsl:choose>
-        <xsl:when test="count($etarget) = 0">
-          <xsl:message>
-            <xsl:value-of select="count($etargets)"/>
-            <xsl:text>Endterm points to nonexistent ID: </xsl:text>
-            <xsl:value-of select="@endterm"/>
-          </xsl:message>
-          <xsl:text>???</xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="$etarget" mode="endterm"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:when test="$target/@xreflabel">
-      <xsl:call-template name="xref.xreflabel">
-        <xsl:with-param name="target" select="$target"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:apply-templates select="$target" mode="xref-to-prefix"/>
-
-      <xsl:apply-templates select="$target" mode="xref-to">
-        <xsl:with-param name="referrer" select="."/>
-        <xsl:with-param name="xrefstyle">
-          <xsl:choose>
-            <xsl:when test="@role and not(@xrefstyle) and $use.role.as.xrefstyle != 0">
-              <xsl:value-of select="@role"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="@xrefstyle"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
-      </xsl:apply-templates>
-
-      <xsl:apply-templates select="$target" mode="xref-to-suffix"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/utility.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/utility.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,290 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-                xmlns:dyn="http://exslt.org/dynamic"
-                xmlns:saxon="http://icl.com/saxon"
-                xmlns:xlink="http://www.w3.org/1999/xlink"
-                exclude-result-prefixes="doc dyn saxon"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-<doc:reference xmlns="" xml:id="utility">
-  <info>
-    <title>Common Â» Utility Template Reference</title>
-    <releaseinfo role="meta">
-      $Id$
-    </releaseinfo>
-  </info>
-  <!-- * yes, partintro is a valid child of a reference... -->
-  <partintro xml:id="partintro">
-    <title>Introduction</title>
-    <para>This is technical reference documentation for the
-      miscellaneous utility templates in the DocBook XSL
-      Stylesheets.</para>
-    <note>
-      <para>These templates are defined in a separate file from the set
-        of âcommonâ templates because some of the common templates
-        reference DocBook XSL stylesheet parameters, requiring the
-        entire set of parameters to be imported/included in any
-        stylesheet that imports/includes the common templates.</para>
-      <para>The utility templates donât import or include any DocBook
-        XSL stylesheet parameters, so the utility templates can be used
-        without importing the whole set of parameters.</para>
-    </note>
-    <para>This is not intended to be user documentation. It is
-      provided for developers writing customization layers for the
-      stylesheets.</para>
-  </partintro>
-</doc:reference>
-
-<!-- ====================================================================== -->
-
-<doc:template name="log.message" xmlns="">
-  <refpurpose>Logs/emits formatted notes and warnings</refpurpose>
-
-  <refdescription id="log.message-desc">
-    <para>The <function>log.message</function> template is a utility
-    template for logging/emitting formatted messages&#xa0;â that is,
-    notes and warnings, along with a given log âlevelâ and an
-    identifier for the âsourceâ that the message relates to.</para>
-  </refdescription>
-
-  <refparameter id="log.message-params">
-    <variablelist>
-      <varlistentry><term>level</term>
-        <listitem>
-          <para>Text to log/emit in the message-level field to
-            indicate the message level
-          (<literal>Note</literal> or
-          <literal>Warning</literal>)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>source</term>
-        <listitem>
-          <para>Text to log/emit in the source field to identify the
-            âsourceâ to which the notification/warning relates.
-            This can be any arbitrary string, but because the
-            message lacks line and column numbers to identify the
-            exact part of the source document to which it
-            relates, the intention is that the value you pass
-            into the <literal>source</literal> parameter should
-            give the user some way to identify the portion of
-            their source document on which to take potentially
-            take action in response to the log message (for
-            example, to edit, change, or add content).</para>
-          <para>So the <literal>source</literal> value should be,
-            for example, an ID, book/chapter/article title, title
-            of some formal object, or even a string giving an
-            XPath expression.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>context-desc</term>
-        <listitem>
-          <para>Text to log/emit in the context-description field to
-            describe the context for the message.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>context-desc-field-length</term>
-        <listitem>
-          <para>Specifies length of the context-description field
-            (in characters); default is 12</para>
-          <para>If the text specified by the
-            <literal>context-desc</literal> parameter is longer
-            than the number of characters specified in
-            <literal>context-desc-field-length</literal>, it is
-            truncated to <literal>context-desc-field-length</literal>
-            (12 characters by default).</para>
-          <para>If the specified text is shorter than
-            <literal>context-desc-field-length</literal>,
-          it is right-padded out to
-          <literal>context-desc-field-length</literal> (12 by
-          default).</para>
-        <para>If no value has been specified for the
-          <literal>context-desc</literal> parameter, the field is
-          left empty and the text of the log message begins with
-          the value of the <literal>message</literal>
-          parameter.</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>message</term>
-        <listitem>
-          <para>Text to log/emit in the actual message field</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>message-field-length</term>
-        <listitem>
-          <para>Specifies length of the message
-            field (in characters); default is 45</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refreturn id="log.message-returns">
-  <para>Outputs a message (generally, to standard error).</para></refreturn>
-</doc:template>
-<xsl:template name="log.message">
-  <xsl:param name="level"/>
-  <xsl:param name="source"/>
-  <xsl:param name="context-desc"/>
-  <xsl:param name="context-desc-field-length">12</xsl:param>
-  <xsl:param name="context-desc-padded">
-    <xsl:if test="not($context-desc = '')">
-      <xsl:call-template name="pad-string">
-        <xsl:with-param name="leftRight">right</xsl:with-param>
-        <xsl:with-param name="padVar"
-          select="substring($context-desc, 1, $context-desc-field-length)"/>
-        <xsl:with-param name="length" select="$context-desc-field-length"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:param>
-  <xsl:param name="message"/>
-  <xsl:param name="message-field-length" select="45"/>
-  <xsl:param name="message-padded">
-    <xsl:variable name="spaces-for-blank-level">
-      <!-- * if the level field is blank, we'll need to pad out -->
-      <!-- * the message field with spaces to compensate -->
-      <xsl:choose>
-        <xsl:when test="$level = ''">
-          <xsl:value-of select="4 + 2"/>
-          <!-- * 4 = hard-coded length of comment text ("Note" or "Warn") -->
-          <!-- * + 2 = length of colon-plus-space separator ": " -->
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="0"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="spaces-for-blank-context-desc">
-      <!-- * if the context-description field is blank, we'll need -->
-      <!-- * to pad out the message field with spaces to compensate -->
-      <xsl:choose>
-        <xsl:when test="$context-desc = ''">
-          <xsl:value-of select="$context-desc-field-length + 2"/>
-          <!-- * + 2 = length of colon-plus-space separator ": " -->
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="0"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="extra-spaces"
-      select="$spaces-for-blank-level + $spaces-for-blank-context-desc"/>
-    <xsl:call-template name="pad-string">
-      <xsl:with-param name="leftRight">right</xsl:with-param>
-      <xsl:with-param name="padVar"
-        select="substring($message, 1, ($message-field-length + $extra-spaces))"/>
-      <xsl:with-param name="length"
-        select="$message-field-length + $extra-spaces"/>
-    </xsl:call-template>
-  </xsl:param>
-  <!-- * emit the actual log message -->
-  <xsl:message>
-    <xsl:if test="not($level = '')">
-      <xsl:value-of select="$level"/>
-      <xsl:text>: </xsl:text>
-    </xsl:if>
-    <xsl:if test="not($context-desc = '')">
-      <xsl:value-of select="$context-desc-padded"/>
-      <xsl:text>: </xsl:text>
-    </xsl:if>
-    <xsl:value-of select="$message-padded"/>
-    <xsl:text>  </xsl:text>
-    <xsl:value-of select="$source"/>
-  </xsl:message>
-</xsl:template>
-
-<!-- ===================================== -->
-<doc:template name="get.doc.title" xmlns="">
-  <refpurpose>Gets a title from the current document</refpurpose>
-  <refdescription id="get.doc.title-desc">
-    <para>The <function>get.doc.title</function> template is a
-      utility template for returning the first title found in the
-      current document.</para>
-  </refdescription>
-  <refreturn id="get.doc.title-returns">
-  <para>Returns a string containing some identifying title for the
-    current document .</para></refreturn>
-</doc:template>
-<xsl:template name="get.doc.title">
-  <xsl:choose>
-    <xsl:when test="//*[local-name() = 'title'
-      or local-name() = 'refname']">
-      <xsl:value-of select="//*[local-name() = 'title'
-        or local-name() = 'refname'][1]"/>
-    </xsl:when>
-    <xsl:when test="substring(local-name(*[1]),
-      string-length(local-name(*[1])-3) = 'info')
-      and *[1]/*[local-name() = 'title']">
-      <xsl:value-of select="*[1]/*[local-name() = 'title'][1]"/>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ===================================== -->
-<doc:template name="pad-string" xmlns="">
-  <refpurpose>Right-pads or left-pads a string out to a certain length</refpurpose>
-  <refdescription id="pad-string-desc">
-    <para>This function takes string <parameter>padVar</parameter> and
-      pads it out in the direction <parameter>rightLeft</parameter> to
-      the string-length <parameter>length</parameter>, using string
-      <parameter>padChar</parameter> (a space character by default) as
-      the padding string (note that <parameter>padChar</parameter> can
-      be a string; it is not limited to just being a single
-      character).</para>
-    <note>
-      <para>This function began as a copy of Nate Austin's
-        <function>prepend-pad</function> function in the <link
-          xlink:href="http://www.dpawson.co.uk/xsl/sect2/padding.html" >Padding
-          Content</link> section of Dave Pawson's <link
-          xlink:href="http://www.dpawson.co.uk/xsl/index.html" >XSLT
-          FAQ</link>.</para>
-    </note>
-  </refdescription>
-  <refreturn id="pad-string-returns">
-  <para>Returns a (padded) string.</para></refreturn>
-</doc:template>
-<xsl:template name="pad-string">
-  <!-- * recursive template to right/left pad the value with -->
-  <!-- * whatever padChar is passed in -->
-  <xsl:param name="padChar" select="' '"/>
-  <xsl:param name="leftRight">left</xsl:param>
-  <xsl:param name="padVar"/>
-  <xsl:param name="length"/>
-  <xsl:choose>
-    <xsl:when test="string-length($padVar) &lt; $length">
-      <xsl:call-template name="pad-string">
-        <xsl:with-param name="padChar" select="$padChar"/>
-        <xsl:with-param name="leftRight" select="$leftRight"/>
-        <xsl:with-param name="padVar">
-          <xsl:choose>
-            <!-- * determine whether string should be -->
-            <!-- * right- or left-padded -->
-            <xsl:when test="$leftRight = 'left'">
-              <!-- * pad it to left -->
-              <xsl:value-of select="concat($padChar,$padVar)"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <!-- * otherwise, right-pad the string -->
-              <xsl:value-of select="concat($padVar,$padChar)"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
-        <xsl:with-param name="length" select="$length"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of 
-        select="substring($padVar,string-length($padVar) - $length + 1)"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/zh_cn.xml
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/zh_cn.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,698 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="zh_cn" english-language-name="Chinese Simplified">
-
-<!-- * This file is generated automatically. -->
-<!-- * To submit changes to this file upstream (to the DocBook Project) -->
-<!-- * do not submit an edited version of this file. Instead, submit an -->
-<!-- * edited version of the source file at the following location: -->
-<!-- * -->
-<!-- *  https://svn.sourceforge.net/svnroot/docbook/trunk/gentext/locale/zh_cn.xml -->
-<!-- * -->
-<!-- * E-mail the edited zh_cn.xml source file to: -->
-<!-- * -->
-<!-- *  docbook-developers@lists.sourceforge.net -->
-
-<!-- ******************************************************************** -->
-
-<!-- This file is part of the XSL DocBook Stylesheet distribution. -->
-<!-- See ../README or http://docbook.sf.net/release/xsl/current/ for -->
-<!-- copyright and other information. -->
-
-<!-- ******************************************************************** -->
-<!-- In these files, % with a letter is used for a placeholder: -->
-<!--   %t is the current element's title -->
-<!--   %s is the current element's subtitle (if applicable)-->
-<!--   %n is the current element's number label-->
-<!--   %p is the current element's page number (if applicable)-->
-<!-- ******************************************************************** -->
-
-
-<l:gentext key="Abstract" text="æèŠ"/>
-<l:gentext key="abstract" text="æèŠ"/>
-<l:gentext key="Answer" text="ç­ïŒ"/>
-<l:gentext key="answer" text="ç­ïŒ"/>
-<l:gentext key="Appendix" text="éåœ"/>
-<l:gentext key="appendix" text="éåœ"/>
-<l:gentext key="Article" text="æç« "/>
-<l:gentext key="article" text="æç« "/>
-<l:gentext key="Author" text="Author" lang="en"/>
-<l:gentext key="Bibliography" text="åèä¹Šç®"/>
-<l:gentext key="bibliography" text="åèä¹Šç®"/>
-<l:gentext key="Book" text="ä¹Š"/>
-<l:gentext key="book" text="ä¹Š"/>
-<l:gentext key="CAUTION" text="å°å¿"/>
-<l:gentext key="Caution" text="å°å¿"/>
-<l:gentext key="caution" text="å°å¿"/>
-<l:gentext key="Chapter" text="ç« "/>
-<l:gentext key="chapter" text="ç« "/>
-<l:gentext key="Colophon" text="Colophon"/>
-<l:gentext key="colophon" text="Colophon"/>
-<l:gentext key="Copyright" text="çæ"/>
-<l:gentext key="copyright" text="çæ"/>
-<l:gentext key="Dedication" text="é¢è¯"/>
-<l:gentext key="dedication" text="é¢è¯"/>
-<l:gentext key="Edition" text="ç"/>
-<l:gentext key="edition" text="ç"/>
-<l:gentext key="Editor" text="çŒè
-"/>
-<l:gentext key="Equation" text="å
-¬åŒ"/>
-<l:gentext key="equation" text="å
-¬åŒ"/>
-<l:gentext key="Example" text="äŸ"/>
-<l:gentext key="example" text="äŸ"/>
-<l:gentext key="Figure" text="åŸ"/>
-<l:gentext key="figure" text="åŸ"/>
-<l:gentext key="Glossary" text="æ¯è¯­è¡š"/>
-<l:gentext key="glossary" text="æ¯è¯­è¡š"/>
-<l:gentext key="GlossSee" text="è§"/>
-<l:gentext key="glosssee" text="è§"/>
-<l:gentext key="GlossSeeAlso" text="åè§"/>
-<l:gentext key="glossseealso" text="åè§"/>
-<l:gentext key="IMPORTANT" text="éèŠ"/>
-<l:gentext key="important" text="éèŠ"/>
-<l:gentext key="Important" text="éèŠ"/>
-<l:gentext key="Index" text="çŽ¢åŒ"/>
-<l:gentext key="index" text="çŽ¢åŒ"/>
-<l:gentext key="ISBN" text="ISBN"/>
-<l:gentext key="isbn" text="ISBN"/>
-<l:gentext key="LegalNotice" text="æ³åŸéå"/>
-<l:gentext key="legalnotice" text="æ³åŸéå"/>
-<l:gentext key="MsgAud" text="åäŒ"/>
-<l:gentext key="msgaud" text="åäŒ"/>
-<l:gentext key="MsgLevel" text="çº§å«"/>
-<l:gentext key="msglevel" text="çº§å«"/>
-<l:gentext key="MsgOrig" text="åºå€"/>
-<l:gentext key="msgorig" text="åºå€"/>
-<l:gentext key="NOTE" text="æ³šæ"/>
-<l:gentext key="Note" text="æ³šæ"/>
-<l:gentext key="note" text="æ³šæ"/>
-<l:gentext key="Part" text="éšå"/>
-<l:gentext key="part" text="éšå"/>
-<l:gentext key="Preface" text="åèš"/>
-<l:gentext key="preface" text="åèš"/>
-<l:gentext key="Procedure" text="è¿çš"/>
-<l:gentext key="procedure" text="è¿çš"/>
-<l:gentext key="ProductionSet" text="äº§å"/>
-<l:gentext key="PubDate" text="åºçæ¥æ"/>
-<l:gentext key="pubdate" text="åºçæ¥æ"/>
-<l:gentext key="Published" text="åºçæ¹"/>
-<l:gentext key="published" text="åºçæ¹"/>
-<l:gentext key="Publisher" text="åºçè
-"/>
-<l:gentext key="Qandadiv" text="èŽšä¿"/>
-<l:gentext key="qandadiv" text="èŽšä¿"/>
-<l:gentext key="QandASet" text="åžžè§é®é¢"/>
-<l:gentext key="Question" text="é®ïŒ"/>
-<l:gentext key="question" text="é®ïŒ"/>
-<l:gentext key="RefEntry" text=""/>
-<l:gentext key="refentry" text=""/>
-<l:gentext key="Reference" text="åè"/>
-<l:gentext key="reference" text="åè"/>
-<l:gentext key="References" text="åè"/>
-<l:gentext key="RefName" text="åç§°"/>
-<l:gentext key="refname" text="åç§°"/>
-<l:gentext key="RefSection" text=""/>
-<l:gentext key="refsection" text=""/>
-<l:gentext key="RefSynopsisDiv" text="å€§çº²"/>
-<l:gentext key="refsynopsisdiv" text="å€§çº²"/>
-<l:gentext key="RevHistory" text="ä¿®è®¢åå²"/>
-<l:gentext key="revhistory" text="ä¿®è®¢åå²"/>
-<l:gentext key="revision" text="ä¿®è®¢"/>
-<l:gentext key="Revision" text="ä¿®è®¢"/>
-<l:gentext key="sect1" text="è"/>
-<l:gentext key="sect2" text="è"/>
-<l:gentext key="sect3" text="è"/>
-<l:gentext key="sect4" text="è"/>
-<l:gentext key="sect5" text="è"/>
-<l:gentext key="section" text="è"/>
-<l:gentext key="Section" text="è"/>
-<l:gentext key="see" text="è§"/>
-<l:gentext key="See" text="è§"/>
-<l:gentext key="seealso" text="åè§"/>
-<l:gentext key="Seealso" text="åè§"/>
-<l:gentext key="SeeAlso" text="åè§"/>
-<l:gentext key="set" text="Set"/>
-<l:gentext key="Set" text="Set"/>
-<l:gentext key="setindex" text="Set Index"/>
-<l:gentext key="SetIndex" text="Set Index"/>
-<l:gentext key="Sidebar" text=""/>
-<l:gentext key="sidebar" text="sidebar"/>
-<l:gentext key="step" text="æ­¥éª€"/>
-<l:gentext key="Step" text="æ­¥éª€"/>
-<l:gentext key="table" text="è¡š"/>
-<l:gentext key="Table" text="è¡š"/>
-<l:gentext key="task" text="ä»»å¡"/>
-<l:gentext key="Task" text="ä»»å¡"/>
-<l:gentext key="tip" text="æç€º"/>
-<l:gentext key="TIP" text="æç€º"/>
-<l:gentext key="Tip" text="æç€º"/>
-<l:gentext key="Warning" text="è­Šå"/>
-<l:gentext key="warning" text="è­Šå"/>
-<l:gentext key="WARNING" text="è­Šå"/>
-<l:gentext key="and" text="å"/>
-<l:gentext key="by" text="ç±"/>
-<l:gentext key="Edited" text="çŒèŸæ¶éŽ"/>
-<l:gentext key="edited" text="çŒèŸæ¶éŽ"/>
-<l:gentext key="Editedby" text="çŒèŸè
-"/>
-<l:gentext key="editedby" text="çŒèŸè
-"/>
-<l:gentext key="in" text="äº"/>
-<l:gentext key="lastlistcomma" text=""/>
-<l:gentext key="listcomma" text="ã"/>
-<l:gentext key="nonexistantelement" text="äžå­åšçå
-çŽ "/>
-<l:gentext key="notes" text="å€æ³š"/>
-<l:gentext key="Notes" text="å€æ³š"/>
-<l:gentext key="Pgs" text="é¡µ"/>
-<l:gentext key="pgs" text="é¡µ"/>
-<l:gentext key="Revisedby" text="ä¿®è®¢è
-ïŒ"/>
-<l:gentext key="revisedby" text="ä¿®è®¢è
-ïŒ"/>
-<l:gentext key="TableNotes" text="è¡šæ³š"/>
-<l:gentext key="tablenotes" text="è¡šæ³š"/>
-<l:gentext key="TableofContents" text="ç®åœ"/>
-<l:gentext key="tableofcontents" text="ç®åœ"/>
-<l:gentext key="unexpectedelementname" text="æªé¢æçåç§°"/>
-<l:gentext key="unsupported" text="äžæ¯æ"/>
-<l:gentext key="xrefto" text="xref to"/>
-<l:gentext key="Authors" text="äœè
-"/>
-<l:gentext key="copyeditor" text="çæçŒèŸ"/>
-<l:gentext key="graphicdesigner" text="çŸæ¯çŒèŸ"/>
-<l:gentext key="productioneditor" text="äº§åçŒèŸ"/>
-<l:gentext key="technicaleditor" text="ææ¯çŒèŸ"/>
-<l:gentext key="translator" text="è¯è
-"/>
-<l:gentext key="listofequations" text="å
-¬åŒæž
-å"/>
-<l:gentext key="ListofEquations" text="å
-¬åŒæž
-å"/>
-<l:gentext key="ListofExamples" text="èäŸæž
-å"/>
-<l:gentext key="listofexamples" text="èäŸæž
-å"/>
-<l:gentext key="ListofFigures" text="æåŸæž
-å"/>
-<l:gentext key="listoffigures" text="æåŸæž
-å"/>
-<l:gentext key="ListofProcedures" text="è¿çšæž
-å"/>
-<l:gentext key="listofprocedures" text="è¿çšæž
-å"/>
-<l:gentext key="listoftables" text="è¡šæ Œæž
-å"/>
-<l:gentext key="ListofTables" text="è¡šæ Œæž
-å"/>
-<l:gentext key="ListofUnknown" text="æªç¥æž
-å"/>
-<l:gentext key="listofunknown" text="æªç¥æž
-å"/>
-<l:gentext key="nav-home" text="èµ·å§é¡µ"/>
-<l:gentext key="nav-next" text="äžäžé¡µ"/>
-<l:gentext key="nav-next-sibling" text="å¿«è¿"/>
-<l:gentext key="nav-prev" text="äžäžé¡µ"/>
-<l:gentext key="nav-prev-sibling" text="å¿«é"/>
-<l:gentext key="nav-up" text="äžäžçº§"/>
-<l:gentext key="nav-toc" text="ç®åœ"/>
-<l:gentext key="Draft" text="èçš¿"/>
-<l:gentext key="above" text="ä»¥äž"/>
-<l:gentext key="below" text="ä»¥äž"/>
-<l:gentext key="sectioncalled" text="äžè"/>
-<l:gentext key="index symbols" text="ç¬Šå·"/>
-<l:gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyz"/>
-<l:gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZ"/>
-<l:gentext key="normalize.sort.input" text="AaÃÃ ÃÃ¡ÃÃ¢ÃÃ£ÃÃ€Ã
-Ã¥ÄÄÄÄÄÄ
-ÇÇÇÇÇ Ç¡ÇºÇ»ÈÈÈÈÈŠÈ§ážážáºáº áº¡áº¢áº£áº€áº¥áºŠáº§áºšáº©áºªáº«áº¬áº­áº®áº¯áº°áº±áº²áº³áºŽáºµáº¶áº·BbÆÆÉÆÆážážážáž
-ážážCcÃÃ§ÄÄÄÄÄÄÄÄÆÆÉážážDdÄÄÄÄÆÉÆÆÇ
-Ç²È¡ÉážážážážážážážážážážEeÃÃšÃÃ©ÃÃªÃÃ«ÄÄÄÄÄÄÄÄÄÄÈÈ
-ÈÈÈšÈ©ážážážážážážážážážážáºžáº¹áººáº»áºŒáºœáºŸáº¿á»á»á»á»á»á»
-á»á»FfÆÆážážGgÄÄÄÄÄ Ä¡Ä¢Ä£ÆÉ Ç€Ç¥ÇŠÇ§ÇŽÇµáž áž¡HhÄ€Ä¥ÄŠÄ§ÈÈÉŠáž¢áž£áž€áž¥ážŠáž§ážšáž©ážªáž«áºIiÃÃ¬ÃÃ­ÃÃ®ÃÃ¯ÄšÄ©ÄªÄ«Ä¬Ä­Ä®Ä¯Ä°ÆÉšÇÇÈÈÈÈáž¬áž­áž®áž¯á»á»á»á»JjÄŽÄµÇ°ÊKkÄ¶Ä·ÆÆÇšÇ©áž°áž±áž²áž³ážŽážµLlÄ¹ÄºÄ»ÄŒÄœÄŸÄ¿ÅÅÅÆÇÈŽÉ«É¬É­áž¶áž·ážžáž¹ážºáž»ážŒážœMmÉ±ážŸáž¿á¹á¹á¹á¹NnÃÃ±ÅÅÅ
-ÅÅÅÆÉ²ÆÈ ÇÇžÇ¹ÈµÉ³á¹á¹
-á¹á¹á¹á¹á¹á¹OoÃÃ²ÃÃ³ÃÃŽÃÃµÃÃ¶ÃÃžÅÅÅÅÅÅÆÆ Æ¡ÇÇÇªÇ«Ç¬Ç­ÇŸÇ¿ÈÈÈÈÈªÈ«È¬È­È®È¯È°È±á¹á¹á¹á¹á¹á¹á¹á¹á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á» á»¡á»¢á»£PpÆ€Æ¥á¹á¹á¹á¹QqÊ RrÅÅÅÅÅÅÈÈÈÈÉŒÉœÉŸá¹á¹á¹á¹á¹á¹á¹á¹SsÅÅÅÅÅÅÅ Å¡ÈÈÊá¹ á¹¡á¹¢á¹£á¹€á¹¥á¹Šá¹§á¹šá¹©TtÅ¢Å£Å€Å¥ÅŠÅ§Æ«Æ¬Æ­Æ®ÊÈÈÈ¶á¹ªá¹«á¹¬á¹­á¹®á¹¯á¹°á¹±áºUuÃÃ¹ÃÃºÃÃ»ÃÃŒÅšÅ©ÅªÅ«Å¬Å­Å®Å¯Å°Å±Å²Å³Æ¯Æ°ÇÇÇÇÇÇÇÇÇÇÈÈÈÈá¹²á¹³á¹Žá¹µá¹¶á¹·á¹žá¹¹á¹ºá¹»á»€á»¥á»Šá»§á»šá»©á»ªá»«á»¬á»­á»®á»¯á»°á»±VvÆ²Êá¹Œá¹œá¹Ÿá¹¿WwÅŽÅµáºáºáºáºáºáº
-áºáºáºáºáºXxáºáºáºáºYyÃÃœÃ¿ÅžÅ¶Å·Æ³ÆŽÈ²È³áºáºáºá»²á»³á»Žá»µá»¶á»·á»žá»¹ZzÅ¹ÅºÅ»ÅŒÅœÅŸÆµÆ¶È€È¥ÊÊáºáºáºáºáºáºáº" lang="en"/>
-<l:gentext key="normalize.sort.output" text="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ" lang="en"/>
-<l:dingbat key="startquote" text="â"/>
-<l:dingbat key="endquote" text="â"/>
-<l:dingbat key="nestedstartquote" text="â"/>
-<l:dingbat key="nestedendquote" text="â"/>
-<l:dingbat key="singlestartquote" text="â"/>
-<l:dingbat key="singleendquote" text="â"/>
-<l:dingbat key="bullet" text="Â·"/>
-<l:gentext key="hyphenation-character" text="-"/>
-<l:gentext key="hyphenation-push-character-count" text="2"/>
-<l:gentext key="hyphenation-remain-character-count" text="2"/>
-<l:context name="styles"><l:template name="person-name" text="first-last"/>
-</l:context>
-<l:context name="title"><l:template name="abstract" text="%t"/>
-<l:template name="answer" text="%t"/>
-<l:template name="appendix" text="éåœÂ %n.Â %t"/>
-<l:template name="article" text="%t"/>
-<l:template name="authorblurb" text="%t"/>
-<l:template name="bibliodiv" text="%t"/>
-<l:template name="biblioentry" text="%t"/>
-<l:template name="bibliography" text="%t"/>
-<l:template name="bibliolist" text="%t"/>
-<l:template name="bibliomixed" text="%t"/>
-<l:template name="bibliomset" text="%t"/>
-<l:template name="biblioset" text="%t"/>
-<l:template name="blockquote" text="%t"/>
-<l:template name="book" text="%t"/>
-<l:template name="calloutlist" text="%t"/>
-<l:template name="caution" text="%t"/>
-<l:template name="chapter" text="ç¬¬Â %nÂ ç« Â %t"/>
-<l:template name="colophon" text="%t"/>
-<l:template name="dedication" text="%t"/>
-<l:template name="equation" text="å
-¬åŒÂ %n.Â %t"/>
-<l:template name="example" text="äŸÂ %n.Â %t"/>
-<l:template name="figure" text="åŸÂ %n.Â %t"/>
-<l:template name="foil" text="%t" lang="en"/>
-<l:template name="foilgroup" text="%t" lang="en"/>
-<l:template name="formalpara" text="%t"/>
-<l:template name="glossary" text="%t"/>
-<l:template name="glossdiv" text="%t"/>
-<l:template name="glosslist" text="%t"/>
-<l:template name="glossentry" text="%t"/>
-<l:template name="important" text="%t"/>
-<l:template name="index" text="%t"/>
-<l:template name="indexdiv" text="%t"/>
-<l:template name="itemizedlist" text="%t"/>
-<l:template name="legalnotice" text="%t"/>
-<l:template name="listitem" text=""/>
-<l:template name="lot" text="%t"/>
-<l:template name="msg" text="%t"/>
-<l:template name="msgexplan" text="%t"/>
-<l:template name="msgmain" text="%t"/>
-<l:template name="msgrel" text="%t"/>
-<l:template name="msgset" text="%t"/>
-<l:template name="msgsub" text="%t"/>
-<l:template name="note" text="%t"/>
-<l:template name="orderedlist" text="%t"/>
-<l:template name="part" text="ç¬¬Â %nÂ éšåÂ %t"/>
-<l:template name="partintro" text="%t"/>
-<l:template name="preface" text="%t"/>
-<l:template name="procedure" text="%t"/>
-<l:template name="procedure.formal" text="è¿çšÂ %n.Â %t"/>
-<l:template name="productionset" text="%t"/>
-<l:template name="productionset.formal" text="äº§åÂ %n"/>
-<l:template name="qandadiv" text="%t"/>
-<l:template name="qandaentry" text="%t"/>
-<l:template name="qandaset" text="%t"/>
-<l:template name="question" text="%t"/>
-<l:template name="refentry" text="%t"/>
-<l:template name="reference" text="%t"/>
-<l:template name="refsection" text="%t"/>
-<l:template name="refsect1" text="%t"/>
-<l:template name="refsect2" text="%t"/>
-<l:template name="refsect3" text="%t"/>
-<l:template name="refsynopsisdiv" text="%t"/>
-<l:template name="refsynopsisdivinfo" text="%t"/>
-<l:template name="segmentedlist" text="%t"/>
-<l:template name="set" text="%t"/>
-<l:template name="setindex" text="%t"/>
-<l:template name="sidebar" text="%t"/>
-<l:template name="step" text="%t"/>
-<l:template name="table" text="è¡šÂ %n.Â %t"/>
-<l:template name="task" text="%t"/>
-<l:template name="tasksummary" text="%t" lang="en"/>
-<l:template name="taskprerequisites" text="%t" lang="en"/>
-<l:template name="taskrelated" text="%t" lang="en"/>
-<l:template name="tip" text="%t"/>
-<l:template name="toc" text="%t"/>
-<l:template name="variablelist" text="%t"/>
-<l:template name="varlistentry" text=""/>
-<l:template name="warning" text="%t"/>
-</l:context>
-<l:context name="title-unnumbered"><l:template name="appendix" text="%t"/>
-<l:template name="article/appendix" text="%t"/>
-<l:template name="bridgehead" text="%t"/>
-<l:template name="chapter" text="%t"/>
-<l:template name="sect1" text="%t"/>
-<l:template name="sect2" text="%t"/>
-<l:template name="sect3" text="%t"/>
-<l:template name="sect4" text="%t"/>
-<l:template name="sect5" text="%t"/>
-<l:template name="section" text="%t"/>
-<l:template name="simplesect" text="%t"/>
-<l:template name="part" text="%t" lang="en"/>
-</l:context>
-<l:context name="title-numbered"><l:template name="appendix" text="éåœÂ %n.Â %t"/>
-<l:template name="article/appendix" text="%n.Â %t"/>
-<l:template name="bridgehead" text="%n.Â %t"/>
-<l:template name="chapter" text="ç¬¬Â %nÂ ç« Â %t"/>
-<l:template name="part" text="éšåÂ %n.Â %t"/>
-<l:template name="sect1" text="%n.Â %t"/>
-<l:template name="sect2" text="%n.Â %t"/>
-<l:template name="sect3" text="%n.Â %t"/>
-<l:template name="sect4" text="%n.Â %t"/>
-<l:template name="sect5" text="%n.Â %t"/>
-<l:template name="section" text="%n.Â %t"/>
-<l:template name="simplesect" text="%t"/>
-</l:context>
-<l:context name="subtitle"><l:template name="appendix" text="%s"/>
-<l:template name="article" text="%s"/>
-<l:template name="bibliodiv" text="%s"/>
-<l:template name="biblioentry" text="%s"/>
-<l:template name="bibliography" text="%s"/>
-<l:template name="bibliomixed" text="%s"/>
-<l:template name="bibliomset" text="%s"/>
-<l:template name="biblioset" text="%s"/>
-<l:template name="book" text="%s"/>
-<l:template name="chapter" text="%s"/>
-<l:template name="colophon" text="%s"/>
-<l:template name="dedication" text="%s"/>
-<l:template name="glossary" text="%s"/>
-<l:template name="glossdiv" text="%s"/>
-<l:template name="index" text="%s"/>
-<l:template name="indexdiv" text="%s"/>
-<l:template name="lot" text="%s"/>
-<l:template name="part" text="%s"/>
-<l:template name="partintro" text="%s"/>
-<l:template name="preface" text="%s"/>
-<l:template name="refentry" text="%s"/>
-<l:template name="reference" text="%s"/>
-<l:template name="refsection" text="%s"/>
-<l:template name="refsect1" text="%s"/>
-<l:template name="refsect2" text="%s"/>
-<l:template name="refsect3" text="%s"/>
-<l:template name="refsynopsisdiv" text="%s"/>
-<l:template name="sect1" text="%s"/>
-<l:template name="sect2" text="%s"/>
-<l:template name="sect3" text="%s"/>
-<l:template name="sect4" text="%s"/>
-<l:template name="sect5" text="%s"/>
-<l:template name="section" text="%s"/>
-<l:template name="set" text="%s"/>
-<l:template name="setindex" text="%s"/>
-<l:template name="sidebar" text="%s"/>
-<l:template name="simplesect" text="%s"/>
-<l:template name="toc" text="%s"/>
-</l:context>
-<l:context name="xref"><l:template name="abstract" text="%t"/>
-<l:template name="answer" text="ç­ïŒÂ %n"/>
-<l:template name="appendix" text="%t"/>
-<l:template name="article" text="%t"/>
-<l:template name="authorblurb" text="%t"/>
-<l:template name="bibliodiv" text="%t"/>
-<l:template name="bibliography" text="%t"/>
-<l:template name="bibliomset" text="%t"/>
-<l:template name="biblioset" text="%t"/>
-<l:template name="blockquote" text="%t"/>
-<l:template name="book" text="%t"/>
-<l:template name="calloutlist" text="%t"/>
-<l:template name="caution" text="%t"/>
-<l:template name="chapter" text="%t"/>
-<l:template name="colophon" text="%t"/>
-<l:template name="constraintdef" text="%t"/>
-<l:template name="dedication" text="%t"/>
-<l:template name="equation" text="%t"/>
-<l:template name="example" text="%t"/>
-<l:template name="figure" text="%t"/>
-<l:template name="foil" text="%t" lang="en"/>
-<l:template name="foilgroup" text="%t" lang="en"/>
-<l:template name="formalpara" text="%t"/>
-<l:template name="glossary" text="%t"/>
-<l:template name="glossdiv" text="%t"/>
-<l:template name="important" text="%t"/>
-<l:template name="index" text="%t"/>
-<l:template name="indexdiv" text="%t"/>
-<l:template name="itemizedlist" text="%t"/>
-<l:template name="legalnotice" text="%t"/>
-<l:template name="listitem" text="%n"/>
-<l:template name="lot" text="%t"/>
-<l:template name="msg" text="%t"/>
-<l:template name="msgexplan" text="%t"/>
-<l:template name="msgmain" text="%t"/>
-<l:template name="msgrel" text="%t"/>
-<l:template name="msgset" text="%t"/>
-<l:template name="msgsub" text="%t"/>
-<l:template name="note" text="%t"/>
-<l:template name="orderedlist" text="%t"/>
-<l:template name="part" text="%t"/>
-<l:template name="partintro" text="%t"/>
-<l:template name="preface" text="%t"/>
-<l:template name="procedure" text="%t"/>
-<l:template name="productionset" text="%t"/>
-<l:template name="qandadiv" text="%t"/>
-<l:template name="qandaentry" text="é®ïŒÂ %n"/>
-<l:template name="qandaset" text="%t"/>
-<l:template name="question" text="é®ïŒÂ %n"/>
-<l:template name="reference" text="%t"/>
-<l:template name="refsynopsisdiv" text="%t"/>
-<l:template name="segmentedlist" text="%t"/>
-<l:template name="set" text="%t"/>
-<l:template name="setindex" text="%t"/>
-<l:template name="sidebar" text="%t"/>
-<l:template name="table" text="%t"/>
-<l:template name="task" text="%t" lang="en"/>
-<l:template name="tip" text="%t"/>
-<l:template name="toc" text="%t"/>
-<l:template name="variablelist" text="%t"/>
-<l:template name="varlistentry" text="%n"/>
-<l:template name="warning" text="%t"/>
-<l:template name="olink.document.citation" text=" in %o" lang="en"/>
-<l:template name="olink.page.citation" text=" (page %p)" lang="en"/>
-<l:template name="page.citation" text=" [%p]"/>
-<l:template name="page" text="(ç¬¬ %p é¡µ)"/>
-<l:template name="docname" text=" in %o" lang="en"/>
-<l:template name="docnamelong" text=" in the document titled %o" lang="en"/>
-<l:template name="pageabbrev" text="(ç¬¬ %p é¡µ)"/>
-<l:template name="Page" text="ç¬¬ %p é¡µ"/>
-<l:template name="bridgehead" text="â%tâäžè"/>
-<l:template name="refsection" text="â%tâäžè"/>
-<l:template name="refsect1" text="â%tâäžè"/>
-<l:template name="refsect2" text="â%tâäžè"/>
-<l:template name="refsect3" text="â%tâäžè"/>
-<l:template name="sect1" text="â%tâäžè"/>
-<l:template name="sect2" text="â%tâäžè"/>
-<l:template name="sect3" text="â%tâäžè"/>
-<l:template name="sect4" text="â%tâäžè"/>
-<l:template name="sect5" text="â%tâäžè"/>
-<l:template name="section" text="â%tâäžè"/>
-<l:template name="simplesect" text="â%tâäžè"/>
-</l:context>
-<l:context name="xref-number"><l:template name="answer" text="ç­ïŒÂ %n"/>
-<l:template name="appendix" text="éåœÂ %n"/>
-<l:template name="bridgehead" text="ç¬¬Â %nÂ è"/>
-<l:template name="chapter" text="ç¬¬Â %nÂ ç« "/>
-<l:template name="equation" text="å
-¬åŒÂ %n"/>
-<l:template name="example" text="äŸÂ %n"/>
-<l:template name="figure" text="åŸÂ %n"/>
-<l:template name="part" text="ç¬¬Â %nÂ éšå"/>
-<l:template name="procedure" text="è¿çšÂ %n"/>
-<l:template name="productionset" text="äº§åÂ %n"/>
-<l:template name="qandadiv" text="èŽšä¿Â %n"/>
-<l:template name="qandaentry" text="é®ïŒÂ %n"/>
-<l:template name="question" text="é®ïŒÂ %n"/>
-<l:template name="sect1" text="ç¬¬Â %nÂ è"/>
-<l:template name="sect2" text="ç¬¬Â %nÂ è"/>
-<l:template name="sect3" text="ç¬¬Â %nÂ è"/>
-<l:template name="sect4" text="ç¬¬Â %nÂ è"/>
-<l:template name="sect5" text="ç¬¬Â %nÂ è"/>
-<l:template name="section" text="ç¬¬Â %nÂ è"/>
-<l:template name="table" text="è¡šÂ %n"/>
-</l:context>
-<l:context name="xref-number-and-title"><l:template name="appendix" text="éåœÂ %n, %t"/>
-<l:template name="bridgehead" text="ç¬¬Â %nÂ è â%tâ"/>
-<l:template name="chapter" text="ç¬¬Â %nÂ ç«  %t"/>
-<l:template name="equation" text="å
-¬åŒÂ %n â%tâ"/>
-<l:template name="example" text="äŸÂ %n â%tâ"/>
-<l:template name="figure" text="åŸÂ %n â%tâ"/>
-<l:template name="part" text="ç¬¬Â %nÂ éšå â%tâ"/>
-<l:template name="procedure" text="è¿çšÂ %n, â%tâ"/>
-<l:template name="productionset" text="äº§åÂ %n, â%tâ"/>
-<l:template name="qandadiv" text="èŽšä¿Â %n, â%tâ"/>
-<l:template name="refsect1" text="â%tâäžè"/>
-<l:template name="refsect2" text="â%tâäžè"/>
-<l:template name="refsect3" text="â%tâäžè"/>
-<l:template name="refsection" text="â%tâäžè"/>
-<l:template name="sect1" text="ç¬¬Â %nÂ è â%tâ"/>
-<l:template name="sect2" text="ç¬¬Â %nÂ è â%tâ"/>
-<l:template name="sect3" text="ç¬¬Â %nÂ è â%tâ"/>
-<l:template name="sect4" text="ç¬¬Â %nÂ è â%tâ"/>
-<l:template name="sect5" text="ç¬¬Â %nÂ è â%tâ"/>
-<l:template name="section" text="ç¬¬Â %nÂ è â%tâ"/>
-<l:template name="simplesect" text="â%tâäžè"/>
-<l:template name="table" text="è¡šÂ %n â%tâ"/>
-</l:context>
-<l:context name="authorgroup"><l:template name="sep" text="ã"/>
-<l:template name="sep2" text="å"/>
-<l:template name="seplast" text="å"/>
-</l:context>
-<l:context name="glossary"><l:template name="see" text="è§%t"/>
-<l:template name="seealso" text="åè§%t"/>
-</l:context>
-<l:context name="msgset"><l:template name="MsgAud" text="åäŒïŒ"/>
-<l:template name="MsgLevel" text="çº§å«ïŒ"/>
-<l:template name="MsgOrig" text="åºå€ïŒ"/>
-</l:context>
-<l:context name="datetime"><l:template name="format" text="Y-m-d"/>
-</l:context>
-<l:context name="termdef"><l:template name="prefix" text="[Definition: " lang="en"/>
-<l:template name="suffix" text="]" lang="en"/>
-</l:context>
-<l:context name="datetime-full"><l:template name="January" text="äžæ"/>
-<l:template name="February" text="äºæ"/>
-<l:template name="March" text="äžæ"/>
-<l:template name="April" text="åæ"/>
-<l:template name="May" text="äºæ"/>
-<l:template name="June" text="å
-­æ"/>
-<l:template name="July" text="äžæ"/>
-<l:template name="August" text="å
-«æ"/>
-<l:template name="September" text="ä¹æ"/>
-<l:template name="October" text="åæ"/>
-<l:template name="November" text="åäžæ"/>
-<l:template name="December" text="åäºæ"/>
-<l:template name="Monday" text="ææäž"/>
-<l:template name="Tuesday" text="ææäº"/>
-<l:template name="Wednesday" text="ææäž"/>
-<l:template name="Thursday" text="ææå"/>
-<l:template name="Friday" text="ææäº"/>
-<l:template name="Saturday" text="ææå
-­"/>
-<l:template name="Sunday" text="æææ¥"/>
-</l:context>
-<l:context name="datetime-abbrev"><l:template name="Jan" text="äžæ"/>
-<l:template name="Feb" text="äºæ"/>
-<l:template name="Mar" text="äžæ"/>
-<l:template name="Apr" text="åæ"/>
-<l:template name="May" text="äºæ"/>
-<l:template name="Jun" text="å
-­æ"/>
-<l:template name="Jul" text="äžæ"/>
-<l:template name="Aug" text="å
-«æ"/>
-<l:template name="Sep" text="ä¹æ"/>
-<l:template name="Oct" text="åæ"/>
-<l:template name="Nov" text="åäžæ"/>
-<l:template name="Dec" text="åäºæ"/>
-<l:template name="Mon" text="åšäž"/>
-<l:template name="Tue" text="åšäº"/>
-<l:template name="Wed" text="åšäž"/>
-<l:template name="Thu" text="åšå"/>
-<l:template name="Fri" text="åšäº"/>
-<l:template name="Sat" text="åšå
-­"/>
-<l:template name="Sun" text="åšæ¥"/>
-</l:context>
-<l:context name="htmlhelp"><l:template name="langcode" text="0x0804 Chinese (CHINA)"/>
-</l:context>
-<l:context name="index"><l:template name="term-separator" text=", " lang="en"/>
-<l:template name="number-separator" text=", " lang="en"/>
-<l:template name="range-separator" text="-" lang="en"/>
-</l:context>
-<l:context name="iso690"><l:template name="lastfirst.sep" text=", " lang="en"/>
-<l:template name="alt.person.two.sep" text=" â " lang="en"/>
-<l:template name="alt.person.last.sep" text=" â " lang="en"/>
-<l:template name="alt.person.more.sep" text=" â " lang="en"/>
-<l:template name="primary.editor" text=" (ed.)" lang="en"/>
-<l:template name="primary.many" text=", et al." lang="en"/>
-<l:template name="primary.sep" text=". " lang="en"/>
-<l:template name="submaintitle.sep" text=": " lang="en"/>
-<l:template name="title.sep" text=". " lang="en"/>
-<l:template name="othertitle.sep" text=", " lang="en"/>
-<l:template name="medium1" text=" [" lang="en"/>
-<l:template name="medium2" text="]" lang="en"/>
-<l:template name="secondary.person.sep" text="; " lang="en"/>
-<l:template name="secondary.sep" text=". " lang="en"/>
-<l:template name="respons.sep" text=". " lang="en"/>
-<l:template name="edition.sep" text=". " lang="en"/>
-<l:template name="edition.serial.sep" text=", " lang="en"/>
-<l:template name="issuing.range" text="-" lang="en"/>
-<l:template name="issuing.div" text=", " lang="en"/>
-<l:template name="issuing.sep" text=". " lang="en"/>
-<l:template name="partnr.sep" text=". " lang="en"/>
-<l:template name="placepubl.sep" text=": " lang="en"/>
-<l:template name="publyear.sep" text=", " lang="en"/>
-<l:template name="pubinfo.sep" text=". " lang="en"/>
-<l:template name="spec.pubinfo.sep" text=", " lang="en"/>
-<l:template name="upd.sep" text=", " lang="en"/>
-<l:template name="datecit1" text=" [cited " lang="en"/>
-<l:template name="datecit2" text="]" lang="en"/>
-<l:template name="extent.sep" text=". " lang="en"/>
-<l:template name="locs.sep" text=", " lang="en"/>
-<l:template name="location.sep" text=". " lang="en"/>
-<l:template name="serie.sep" text=". " lang="en"/>
-<l:template name="notice.sep" text=". " lang="en"/>
-<l:template name="access" text="Available " lang="en"/>
-<l:template name="acctoo" text="Also available " lang="en"/>
-<l:template name="onwww" text="from World Wide Web" lang="en"/>
-<l:template name="oninet" text="from Internet" lang="en"/>
-<l:template name="access.end" text=": " lang="en"/>
-<l:template name="link1" text="&lt;" lang="en"/>
-<l:template name="link2" text="&gt;" lang="en"/>
-<l:template name="access.sep" text=". " lang="en"/>
-<l:template name="isbn" text="ISBN " lang="en"/>
-<l:template name="issn" text="ISSN " lang="en"/>
-<l:template name="stdnum.sep" text=". " lang="en"/>
-<l:template name="patcountry.sep" text=". " lang="en"/>
-<l:template name="pattype.sep" text=", " lang="en"/>
-<l:template name="patnum.sep" text=". " lang="en"/>
-<l:template name="patdate.sep" text=". " lang="en"/>
-</l:context><l:letters><l:l i="-1"/>
-<l:l i="0">å
-¶å®</l:l>
-<l:l i="10">A</l:l>
-<l:l i="10">a</l:l>
-<l:l i="20">B</l:l>
-<l:l i="20">b</l:l>
-<l:l i="30">C</l:l>
-<l:l i="30">c</l:l>
-<l:l i="40">D</l:l>
-<l:l i="40">d</l:l>
-<l:l i="50">E</l:l>
-<l:l i="50">e</l:l>
-<l:l i="60">F</l:l>
-<l:l i="60">f</l:l>
-<l:l i="70">G</l:l>
-<l:l i="70">g</l:l>
-<l:l i="80">H</l:l>
-<l:l i="80">h</l:l>
-<l:l i="90">I</l:l>
-<l:l i="90">i</l:l>
-<l:l i="100">J</l:l>
-<l:l i="100">j</l:l>
-<l:l i="110">K</l:l>
-<l:l i="110">k</l:l>
-<l:l i="120">L</l:l>
-<l:l i="120">l</l:l>
-<l:l i="130">M</l:l>
-<l:l i="130">m</l:l>
-<l:l i="140">N</l:l>
-<l:l i="140">n</l:l>
-<l:l i="150">O</l:l>
-<l:l i="150">o</l:l>
-<l:l i="160">P</l:l>
-<l:l i="160">p</l:l>
-<l:l i="170">Q</l:l>
-<l:l i="170">q</l:l>
-<l:l i="180">R</l:l>
-<l:l i="180">r</l:l>
-<l:l i="190">S</l:l>
-<l:l i="190">s</l:l>
-<l:l i="200">T</l:l>
-<l:l i="200">t</l:l>
-<l:l i="210">U</l:l>
-<l:l i="210">u</l:l>
-<l:l i="220">V</l:l>
-<l:l i="220">v</l:l>
-<l:l i="230">W</l:l>
-<l:l i="230">w</l:l>
-<l:l i="240">X</l:l>
-<l:l i="240">x</l:l>
-<l:l i="250">Y</l:l>
-<l:l i="250">y</l:l>
-<l:l i="260">Z</l:l>
-<l:l i="260">z</l:l>
-</l:letters>
-</l:l10n>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/zh_tw.xml
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/common/zh_tw.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,1262 +1,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" language="zh_tw" english-language-name="Chinese (Taiwan)">
-
-<!-- * This file is generated automatically. -->
-<!-- * To submit changes to this file upstream (to the DocBook Project) -->
-<!-- * do not submit an edited version of this file. Instead, submit an -->
-<!-- * edited version of the source file at the following location: -->
-<!-- * -->
-<!-- *  https://svn.sourceforge.net/svnroot/docbook/trunk/gentext/locale/zh_tw.xml -->
-<!-- * -->
-<!-- * E-mail the edited zh_tw.xml source file to: -->
-<!-- * -->
-<!-- *  docbook-developers@lists.sourceforge.net -->
-
-<!-- ******************************************************************** -->
-
-<!-- This file is part of the XSL DocBook Stylesheet distribution. -->
-<!-- See ../README or http://docbook.sf.net/release/xsl/current/ for -->
-<!-- copyright and other information. -->
-
-<!-- ******************************************************************** -->
-<!-- In these files, % with a letter is used for a placeholder: -->
-<!--   %t is the current element's title -->
-<!--   %s is the current element's subtitle (if applicable)-->
-<!--   %n is the current element's number label-->
-<!--   %p is the current element's page number (if applicable)-->
-<!-- ******************************************************************** -->
-
-
-<l:gentext key="Abstract" text="æèŠ"/>
-<l:gentext key="abstract" text="æèŠ"/>
-<l:gentext key="Answer" text="ç­ïŒ"/>
-<l:gentext key="answer" text="ç­ïŒ"/>
-<l:gentext key="Appendix" text="éé"/>
-<l:gentext key="appendix" text="éé"/>
-<l:gentext key="Article" text="æç« "/>
-<l:gentext key="article" text="æç« "/>
-<l:gentext key="Author" text="Author" lang="en"/>
-<l:gentext key="Bibliography" text="åèæç»"/>
-<l:gentext key="bibliography" text="åèæç»"/>
-<l:gentext key="Book" text="æžç®"/>
-<l:gentext key="book" text="æžç®"/>
-<l:gentext key="CAUTION" text="æ³šæ"/>
-<l:gentext key="Caution" text="æ³šæ"/>
-<l:gentext key="caution" text="æ³šæ"/>
-<l:gentext key="Chapter" text="ç« "/>
-<l:gentext key="chapter" text="ç« "/>
-<l:gentext key="Colophon" text="çæ¬èšé"/>
-<l:gentext key="colophon" text="çæ¬èšé"/>
-<l:gentext key="Copyright" text="çæ¬"/>
-<l:gentext key="copyright" text="çæ¬"/>
-<l:gentext key="Dedication" text="å¥ç»"/>
-<l:gentext key="dedication" text="å¥ç»"/>
-<l:gentext key="Edition" text="ç"/>
-<l:gentext key="edition" text="ç"/>
-<l:gentext key="Editor" text="Editor" lang="en"/>
-<l:gentext key="Equation" text="æ¹çšåŒ"/>
-<l:gentext key="equation" text="æ¹çšåŒ"/>
-<l:gentext key="Example" text="ç¯äŸ"/>
-<l:gentext key="example" text="ç¯äŸ"/>
-<l:gentext key="Figure" text="ååœ¢"/>
-<l:gentext key="figure" text="ååœ¢"/>
-<l:gentext key="Glossary" text="å°èŸ­åœ"/>
-<l:gentext key="glossary" text="å°èŸ­åœ"/>
-<l:gentext key="GlossSee" text="åèŠ"/>
-<l:gentext key="glosssee" text="åèŠ"/>
-<l:gentext key="GlossSeeAlso" text="åŠåèŠ"/>
-<l:gentext key="glossseealso" text="åŠåèŠ"/>
-<l:gentext key="IMPORTANT" text="éèŠ"/>
-<l:gentext key="important" text="éèŠ"/>
-<l:gentext key="Important" text="éèŠ"/>
-<l:gentext key="Index" text="çŽ¢åŒ"/>
-<l:gentext key="index" text="çŽ¢åŒ"/>
-<l:gentext key="ISBN" text="ISBN"/>
-<l:gentext key="isbn" text="ISBN"/>
-<l:gentext key="LegalNotice" text="æ³åŸè²æ"/>
-<l:gentext key="legalnotice" text="æ³åŸè²æ"/>
-<l:gentext key="MsgAud" text="è®è
-"/>
-<l:gentext key="msgaud" text="è®è
-"/>
-<l:gentext key="MsgLevel" text="çšåºŠ"/>
-<l:gentext key="msglevel" text="çšåºŠ"/>
-<l:gentext key="MsgOrig" text="åºè"/>
-<l:gentext key="msgorig" text="åºè"/>
-<l:gentext key="NOTE" text="æ³š"/>
-<l:gentext key="Note" text="æ³š"/>
-<l:gentext key="note" text="æ³š"/>
-<l:gentext key="Part" text="éš"/>
-<l:gentext key="part" text="éš"/>
-<l:gentext key="Preface" text="åºèš"/>
-<l:gentext key="preface" text="åºèš"/>
-<l:gentext key="Procedure" text="éçš"/>
-<l:gentext key="procedure" text="éçš"/>
-<l:gentext key="ProductionSet" text="Production"/>
-<l:gentext key="PubDate" text="Publication Date" lang="en"/>
-<l:gentext key="pubdate" text="Publication date" lang="en"/>
-<l:gentext key="Published" text="åºç"/>
-<l:gentext key="published" text="åºç"/>
-<l:gentext key="Publisher" text="Publisher" lang="en"/>
-<l:gentext key="Qandadiv" text="åïŒäžç­ïŒ"/>
-<l:gentext key="qandadiv" text="åïŒäžç­ïŒ"/>
-<l:gentext key="QandASet" text="Frequently Asked Questions" lang="en"/>
-<l:gentext key="Question" text="åïŒ"/>
-<l:gentext key="question" text="åïŒ"/>
-<l:gentext key="RefEntry" text="åç
-§é 
-ç®"/>
-<l:gentext key="refentry" text="åç
-§é 
-ç®"/>
-<l:gentext key="Reference" text="åè"/>
-<l:gentext key="reference" text="åè"/>
-<l:gentext key="References" text="References" lang="en"/>
-<l:gentext key="RefName" text="åèå"/>
-<l:gentext key="refname" text="åèå"/>
-<l:gentext key="RefSection" text="åç
-§ç« ç¯"/>
-<l:gentext key="refsection" text="åç
-§ç« ç¯"/>
-<l:gentext key="RefSynopsisDiv" text="å€§ç¶±"/>
-<l:gentext key="refsynopsisdiv" text="å€§ç¶±"/>
-<l:gentext key="RevHistory" text="ä¿®èšèšé"/>
-<l:gentext key="revhistory" text="ä¿®èšèšé"/>
-<l:gentext key="revision" text="ä¿®èš"/>
-<l:gentext key="Revision" text="ä¿®èš"/>
-<l:gentext key="sect1" text="Section"/>
-<l:gentext key="sect2" text="Section"/>
-<l:gentext key="sect3" text="Section"/>
-<l:gentext key="sect4" text="Section"/>
-<l:gentext key="sect5" text="Section"/>
-<l:gentext key="section" text="ç¯"/>
-<l:gentext key="Section" text="ç¯"/>
-<l:gentext key="see" text="èŠ"/>
-<l:gentext key="See" text="èŠ"/>
-<l:gentext key="seealso" text="åŠèŠ"/>
-<l:gentext key="Seealso" text="åŠèŠ"/>
-<l:gentext key="SeeAlso" text="åŠèŠ"/>
-<l:gentext key="set" text="Set"/>
-<l:gentext key="Set" text="Set"/>
-<l:gentext key="setindex" text="Set Index"/>
-<l:gentext key="SetIndex" text="Set Index"/>
-<l:gentext key="Sidebar" text=""/>
-<l:gentext key="sidebar" text=""/>
-<l:gentext key="step" text="æ­¥é©"/>
-<l:gentext key="Step" text="æ­¥é©"/>
-<l:gentext key="table" text="è¡šæ Œ"/>
-<l:gentext key="Table" text="è¡šæ Œ"/>
-<l:gentext key="task" text="Task" lang="en"/>
-<l:gentext key="Task" text="Task" lang="en"/>
-<l:gentext key="tip" text="æç€º"/>
-<l:gentext key="TIP" text="æç€º"/>
-<l:gentext key="Tip" text="æç€º"/>
-<l:gentext key="Warning" text="è­Šå"/>
-<l:gentext key="warning" text="è­Šå"/>
-<l:gentext key="WARNING" text="è­Šå"/>
-<l:gentext key="and" text="äž"/>
-<l:gentext key="by" text="ç±"/>
-<l:gentext key="Edited" text="ç·šèŒ¯"/>
-<l:gentext key="edited" text="ç·šèŒ¯"/>
-<l:gentext key="Editedby" text="ç·šèŒ¯"/>
-<l:gentext key="editedby" text="ç·šèŒ¯"/>
-<l:gentext key="in" text="åš"/>
-<l:gentext key="lastlistcomma" text=","/>
-<l:gentext key="listcomma" text=","/>
-<l:gentext key="nonexistantelement" text="äžå­åšçå
-çŽ "/>
-<l:gentext key="notes" text="æ³š"/>
-<l:gentext key="Notes" text="æ³š"/>
-<l:gentext key="Pgs" text="é "/>
-<l:gentext key="pgs" text="é "/>
-<l:gentext key="Revisedby" text="ä¿®èš"/>
-<l:gentext key="revisedby" text="ä¿®èš"/>
-<l:gentext key="TableNotes" text="æ³šé"/>
-<l:gentext key="tablenotes" text="æ³šé"/>
-<l:gentext key="TableofContents" text="å
-§å®¹ç®é"/>
-<l:gentext key="tableofcontents" text="å
-§å®¹ç®é"/>
-<l:gentext key="unexpectedelementname" text="éé æçå
-çŽ å"/>
-<l:gentext key="unsupported" text="æªæ¯æŽ"/>
-<l:gentext key="xrefto" text="åç
-§"/>
-<l:gentext key="Authors" text="Authors" lang="en"/>
-<l:gentext key="copyeditor" text="Copy Editor" lang="en"/>
-<l:gentext key="graphicdesigner" text="Graphic Designer" lang="en"/>
-<l:gentext key="productioneditor" text="Production Editor" lang="en"/>
-<l:gentext key="technicaleditor" text="Technical Editor" lang="en"/>
-<l:gentext key="translator" text="Translator" lang="en"/>
-<l:gentext key="listofequations" text="å
-¬åŒç®é"/>
-<l:gentext key="ListofEquations" text="å
-¬åŒç®é"/>
-<l:gentext key="ListofExamples" text="ç¯äŸç®é"/>
-<l:gentext key="listofexamples" text="ç¯äŸç®é"/>
-<l:gentext key="ListofFigures" text="éåç®é"/>
-<l:gentext key="listoffigures" text="éåç®é"/>
-<l:gentext key="ListofProcedures" text="List of Procedures" lang="en"/>
-<l:gentext key="listofprocedures" text="List of Procedures" lang="en"/>
-<l:gentext key="listoftables" text="éè¡šç®é"/>
-<l:gentext key="ListofTables" text="éè¡šç®é"/>
-<l:gentext key="ListofUnknown" text="å
-¶å®å
-§å®¹ç®é"/>
-<l:gentext key="listofunknown" text="å
-¶å®å
-§å®¹ç®é"/>
-<l:gentext key="nav-home" text="å
-§å®¹"/>
-<l:gentext key="nav-next" text="äžäžé "/>
-<l:gentext key="nav-next-sibling" text="å¿«éååŸ"/>
-<l:gentext key="nav-prev" text="åäžé "/>
-<l:gentext key="nav-prev-sibling" text="å¿«éåå"/>
-<l:gentext key="nav-up" text="äžäžå±€"/>
-<l:gentext key="nav-toc" text="ToC" lang="en"/>
-<l:gentext key="Draft" text="Draft"/>
-<l:gentext key="above" text="above"/>
-<l:gentext key="below" text="below"/>
-<l:gentext key="sectioncalled" text="the section called"/>
-<l:gentext key="index symbols" text="Symbols"/>
-<l:gentext key="lowercase.alpha" text="abcdefghijklmnopqrstuvwxyz" lang="en"/>
-<l:gentext key="uppercase.alpha" text="ABCDEFGHIJKLMNOPQRSTUVWXYZ" lang="en"/>
-<l:gentext key="normalize.sort.input" text="AaÃÃ ÃÃ¡ÃÃ¢ÃÃ£ÃÃ€Ã
-Ã¥ÄÄÄÄÄÄ
-ÇÇÇÇÇ Ç¡ÇºÇ»ÈÈÈÈÈŠÈ§ážážáºáº áº¡áº¢áº£áº€áº¥áºŠáº§áºšáº©áºªáº«áº¬áº­áº®áº¯áº°áº±áº²áº³áºŽáºµáº¶áº·BbÆÆÉÆÆážážážáž
-ážážCcÃÃ§ÄÄÄÄÄÄÄÄÆÆÉážážDdÄÄÄÄÆÉÆÆÇ
-Ç²È¡ÉážážážážážážážážážážEeÃÃšÃÃ©ÃÃªÃÃ«ÄÄÄÄÄÄÄÄÄÄÈÈ
-ÈÈÈšÈ©ážážážážážážážážážážáºžáº¹áººáº»áºŒáºœáºŸáº¿á»á»á»á»á»á»
-á»á»FfÆÆážážGgÄÄÄÄÄ Ä¡Ä¢Ä£ÆÉ Ç€Ç¥ÇŠÇ§ÇŽÇµáž áž¡HhÄ€Ä¥ÄŠÄ§ÈÈÉŠáž¢áž£áž€áž¥ážŠáž§ážšáž©ážªáž«áºIiÃÃ¬ÃÃ­ÃÃ®ÃÃ¯ÄšÄ©ÄªÄ«Ä¬Ä­Ä®Ä¯Ä°ÆÉšÇÇÈÈÈÈáž¬áž­áž®áž¯á»á»á»á»JjÄŽÄµÇ°ÊKkÄ¶Ä·ÆÆÇšÇ©áž°áž±áž²áž³ážŽážµLlÄ¹ÄºÄ»ÄŒÄœÄŸÄ¿ÅÅÅÆÇÈŽÉ«É¬É­áž¶áž·ážžáž¹ážºáž»ážŒážœMmÉ±ážŸáž¿á¹á¹á¹á¹NnÃÃ±ÅÅÅ
-ÅÅÅÆÉ²ÆÈ ÇÇžÇ¹ÈµÉ³á¹á¹
-á¹á¹á¹á¹á¹á¹OoÃÃ²ÃÃ³ÃÃŽÃÃµÃÃ¶ÃÃžÅÅÅÅÅÅÆÆ Æ¡ÇÇÇªÇ«Ç¬Ç­ÇŸÇ¿ÈÈÈÈÈªÈ«È¬È­È®È¯È°È±á¹á¹á¹á¹á¹á¹á¹á¹á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á»á» á»¡á»¢á»£PpÆ€Æ¥á¹á¹á¹á¹QqÊ RrÅÅÅÅÅÅÈÈÈÈÉŒÉœÉŸá¹á¹á¹á¹á¹á¹á¹á¹SsÅÅÅÅÅÅÅ Å¡ÈÈÊá¹ á¹¡á¹¢á¹£á¹€á¹¥á¹Šá¹§á¹šá¹©TtÅ¢Å£Å€Å¥ÅŠÅ§Æ«Æ¬Æ­Æ®ÊÈÈÈ¶á¹ªá¹«á¹¬á¹­á¹®á¹¯á¹°á¹±áºUuÃÃ¹ÃÃºÃÃ»ÃÃŒÅšÅ©ÅªÅ«Å¬Å­Å®Å¯Å°Å±Å²Å³Æ¯Æ°ÇÇÇÇÇÇÇÇÇÇÈÈÈÈá¹²á¹³á¹Žá¹µá¹¶á¹·á¹žá¹¹á¹ºá¹»á»€á»¥á»Šá»§á»šá»©á»ªá»«á»¬á»­á»®á»¯á»°á»±VvÆ²Êá¹Œá¹œá¹Ÿá¹¿WwÅŽÅµáºáºáºáºáºáº
-áºáºáºáºáºXxáºáºáºáºYyÃÃœÃ¿ÅžÅ¶Å·Æ³ÆŽÈ²È³áºáºáºá»²á»³á»Žá»µá»¶á»·á»žá»¹ZzÅ¹ÅºÅ»ÅŒÅœÅŸÆµÆ¶È€È¥ÊÊáºáºáºáºáºáºáº" lang="en"/>
-<l:gentext key="normalize.sort.output" text="AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ" lang="en"/>
-<l:dingbat key="startquote" text="â"/>
-<l:dingbat key="endquote" text="â"/>
-<l:dingbat key="nestedstartquote" text="â"/>
-<l:dingbat key="nestedendquote" text="â"/>
-<l:dingbat key="singlestartquote" text="â" lang="en"/>
-<l:dingbat key="singleendquote" text="â" lang="en"/>
-<l:dingbat key="bullet" text="â¢"/>
-<l:gentext key="hyphenation-character" text="-" lang="en"/>
-<l:gentext key="hyphenation-push-character-count" text="2" lang="en"/>
-<l:gentext key="hyphenation-remain-character-count" text="2" lang="en"/>
-<l:context name="styles"><l:template name="person-name" text="first-last"/>
-</l:context>
-<l:context name="title"><l:template name="abstract" text="%t"/>
-<l:template name="answer" text="%t"/>
-<l:template name="appendix" text="éé %n. %t"/>
-<l:template name="article" text="%t"/>
-<l:template name="authorblurb" text="%t"/>
-<l:template name="bibliodiv" text="%t"/>
-<l:template name="biblioentry" text="%t"/>
-<l:template name="bibliography" text="%t"/>
-<l:template name="bibliolist" text="%t" lang="en"/>
-<l:template name="bibliomixed" text="%t"/>
-<l:template name="bibliomset" text="%t"/>
-<l:template name="biblioset" text="%t"/>
-<l:template name="blockquote" text="%t"/>
-<l:template name="book" text="%t"/>
-<l:template name="calloutlist" text="%t"/>
-<l:template name="caution" text="%t"/>
-<l:template name="chapter" text="ç«  %n. %t"/>
-<l:template name="colophon" text="%t"/>
-<l:template name="dedication" text="%t"/>
-<l:template name="equation" text="æ¹çšåŒ %n. %t"/>
-<l:template name="example" text="ç¯äŸ %n. %t"/>
-<l:template name="figure" text="ååœ¢ %n. %t"/>
-<l:template name="foil" text="%t" lang="en"/>
-<l:template name="foilgroup" text="%t" lang="en"/>
-<l:template name="formalpara" text="%t"/>
-<l:template name="glossary" text="%t"/>
-<l:template name="glossdiv" text="%t"/>
-<l:template name="glosslist" text="%t" lang="en"/>
-<l:template name="glossentry" text="%t" lang="en"/>
-<l:template name="important" text="%t"/>
-<l:template name="index" text="%t"/>
-<l:template name="indexdiv" text="%t"/>
-<l:template name="itemizedlist" text="%t"/>
-<l:template name="legalnotice" text="%t"/>
-<l:template name="listitem" text=""/>
-<l:template name="lot" text="%t"/>
-<l:template name="msg" text="%t"/>
-<l:template name="msgexplan" text="%t"/>
-<l:template name="msgmain" text="%t"/>
-<l:template name="msgrel" text="%t"/>
-<l:template name="msgset" text="%t"/>
-<l:template name="msgsub" text="%t"/>
-<l:template name="note" text="%t"/>
-<l:template name="orderedlist" text="%t"/>
-<l:template name="part" text="éš %n. %t"/>
-<l:template name="partintro" text="%t"/>
-<l:template name="preface" text="%t"/>
-<l:template name="procedure" text="%t"/>
-<l:template name="procedure.formal" text="éçšÂ %n.Â %t"/>
-<l:template name="productionset" text="%t"/>
-<l:template name="productionset.formal" text="ProductionÂ %n"/>
-<l:template name="qandadiv" text="%t"/>
-<l:template name="qandaentry" text="%t"/>
-<l:template name="qandaset" text="%t"/>
-<l:template name="question" text="%t"/>
-<l:template name="refentry" text="%t"/>
-<l:template name="reference" text="%t"/>
-<l:template name="refsection" text="%t" lang="en"/>
-<l:template name="refsect1" text="%t"/>
-<l:template name="refsect2" text="%t"/>
-<l:template name="refsect3" text="%t"/>
-<l:template name="refsynopsisdiv" text="%t"/>
-<l:template name="refsynopsisdivinfo" text="%t"/>
-<l:template name="segmentedlist" text="%t"/>
-<l:template name="set" text="%t"/>
-<l:template name="setindex" text="%t"/>
-<l:template name="sidebar" text="%t"/>
-<l:template name="step" text="%t"/>
-<l:template name="table" text="è¡šæ Œ %n. %t"/>
-<l:template name="task" text="%t" lang="en"/>
-<l:template name="tasksummary" text="%t" lang="en"/>
-<l:template name="taskprerequisites" text="%t" lang="en"/>
-<l:template name="taskrelated" text="%t" lang="en"/>
-<l:template name="tip" text="%t"/>
-<l:template name="toc" text="%t"/>
-<l:template name="variablelist" text="%t"/>
-<l:template name="varlistentry" text="" lang="en"/>
-<l:template name="warning" text="%t"/>
-</l:context>
-<l:context name="title-unnumbered"><l:template name="appendix" text="%t"/>
-<l:template name="article/appendix" text="%t" lang="en"/>
-<l:template name="bridgehead" text="%t"/>
-<l:template name="chapter" text="%t"/>
-<l:template name="sect1" text="%t"/>
-<l:template name="sect2" text="%t"/>
-<l:template name="sect3" text="%t"/>
-<l:template name="sect4" text="%t"/>
-<l:template name="sect5" text="%t"/>
-<l:template name="section" text="%t"/>
-<l:template name="simplesect" text="%t"/>
-<l:template name="part" text="%t" lang="en"/>
-</l:context>
-<l:context name="title-numbered"><l:template name="appendix" text="éé %n. %t"/>
-<l:template name="article/appendix" text="%n.Â %t" lang="en"/>
-<l:template name="bridgehead" text="%t"/>
-<l:template name="chapter" text="ç«  %n. %t"/>
-<l:template name="part" text="éšÂ %n.Â %t"/>
-<l:template name="sect1" text="%n. %t"/>
-<l:template name="sect2" text="%n. %t"/>
-<l:template name="sect3" text="%n. %t"/>
-<l:template name="sect4" text="%n. %t"/>
-<l:template name="sect5" text="%n. %t"/>
-<l:template name="section" text="%n. %t"/>
-<l:template name="simplesect" text="%n. %t"/>
-</l:context>
-<l:context name="subtitle"><l:template name="appendix" text="%s"/>
-<l:template name="article" text="%s"/>
-<l:template name="bibliodiv" text="%s"/>
-<l:template name="biblioentry" text="%s"/>
-<l:template name="bibliography" text="%s"/>
-<l:template name="bibliomixed" text="%s"/>
-<l:template name="bibliomset" text="%s"/>
-<l:template name="biblioset" text="%s"/>
-<l:template name="book" text="%s"/>
-<l:template name="chapter" text="%s"/>
-<l:template name="colophon" text="%s"/>
-<l:template name="dedication" text="%s"/>
-<l:template name="glossary" text="%s"/>
-<l:template name="glossdiv" text="%s"/>
-<l:template name="index" text="%s"/>
-<l:template name="indexdiv" text="%s"/>
-<l:template name="lot" text="%s"/>
-<l:template name="part" text="%s"/>
-<l:template name="partintro" text="%s"/>
-<l:template name="preface" text="%s"/>
-<l:template name="refentry" text="%s"/>
-<l:template name="reference" text="%s"/>
-<l:template name="refsection" text="%s" lang="en"/>
-<l:template name="refsect1" text="%s"/>
-<l:template name="refsect2" text="%s"/>
-<l:template name="refsect3" text="%s"/>
-<l:template name="refsynopsisdiv" text="%s"/>
-<l:template name="sect1" text="%s"/>
-<l:template name="sect2" text="%s"/>
-<l:template name="sect3" text="%s"/>
-<l:template name="sect4" text="%s"/>
-<l:template name="sect5" text="%s"/>
-<l:template name="section" text="%s"/>
-<l:template name="set" text="%s"/>
-<l:template name="setindex" text="%s"/>
-<l:template name="sidebar" text="%s"/>
-<l:template name="simplesect" text="%s"/>
-<l:template name="toc" text="%s"/>
-</l:context>
-<l:context name="xref"><l:template name="abstract" text="%t"/>
-<l:template name="answer" text="ç­ïŒÂ %n"/>
-<l:template name="appendix" text="%t"/>
-<l:template name="article" text="%t"/>
-<l:template name="authorblurb" text="%t"/>
-<l:template name="bibliodiv" text="%t"/>
-<l:template name="bibliography" text="%t"/>
-<l:template name="bibliomset" text="%t"/>
-<l:template name="biblioset" text="%t"/>
-<l:template name="blockquote" text="%t"/>
-<l:template name="book" text="%t"/>
-<l:template name="calloutlist" text="%t"/>
-<l:template name="caution" text="%t"/>
-<l:template name="chapter" text="%t"/>
-<l:template name="colophon" text="%t"/>
-<l:template name="constraintdef" text="%t"/>
-<l:template name="dedication" text="%t"/>
-<l:template name="equation" text="%t"/>
-<l:template name="example" text="%t"/>
-<l:template name="figure" text="%t"/>
-<l:template name="foil" text="%t" lang="en"/>
-<l:template name="foilgroup" text="%t" lang="en"/>
-<l:template name="formalpara" text="%t"/>
-<l:template name="glossary" text="%t"/>
-<l:template name="glossdiv" text="%t"/>
-<l:template name="important" text="%t"/>
-<l:template name="index" text="%t"/>
-<l:template name="indexdiv" text="%t"/>
-<l:template name="itemizedlist" text="%t"/>
-<l:template name="legalnotice" text="%t"/>
-<l:template name="listitem" text="%n"/>
-<l:template name="lot" text="%t"/>
-<l:template name="msg" text="%t"/>
-<l:template name="msgexplan" text="%t"/>
-<l:template name="msgmain" text="%t"/>
-<l:template name="msgrel" text="%t"/>
-<l:template name="msgset" text="%t"/>
-<l:template name="msgsub" text="%t"/>
-<l:template name="note" text="%t"/>
-<l:template name="orderedlist" text="%t"/>
-<l:template name="part" text="%t"/>
-<l:template name="partintro" text="%t"/>
-<l:template name="preface" text="%t"/>
-<l:template name="procedure" text="%t"/>
-<l:template name="productionset" text="%t"/>
-<l:template name="qandadiv" text="%t"/>
-<l:template name="qandaentry" text="åïŒÂ %n"/>
-<l:template name="qandaset" text="%t"/>
-<l:template name="question" text="åïŒÂ %n"/>
-<l:template name="reference" text="%t"/>
-<l:template name="refsynopsisdiv" text="%t"/>
-<l:template name="segmentedlist" text="%t"/>
-<l:template name="set" text="%t"/>
-<l:template name="setindex" text="%t"/>
-<l:template name="sidebar" text="%t"/>
-<l:template name="table" text="%t"/>
-<l:template name="task" text="%t" lang="en"/>
-<l:template name="tip" text="%t"/>
-<l:template name="toc" text="%t"/>
-<l:template name="variablelist" text="%t"/>
-<l:template name="varlistentry" text="%n"/>
-<l:template name="warning" text="%t"/>
-<l:template name="olink.document.citation" text=" in %o" lang="en"/>
-<l:template name="olink.page.citation" text=" (page %p)" lang="en"/>
-<l:template name="page.citation" text=" [%p]"/>
-<l:template name="page" text="(page %p)" lang="en"/>
-<l:template name="docname" text=" in %o" lang="en"/>
-<l:template name="docnamelong" text=" in the document titled %o" lang="en"/>
-<l:template name="pageabbrev" text="(p. %p)" lang="en"/>
-<l:template name="Page" text="Page %p" lang="en"/>
-<l:template name="bridgehead" text="â%tâ"/>
-<l:template name="refsection" text="â%tâ"/>
-<l:template name="refsect1" text="â%tâ"/>
-<l:template name="refsect2" text="â%tâ"/>
-<l:template name="refsect3" text="â%tâ"/>
-<l:template name="sect1" text="â%tâ"/>
-<l:template name="sect2" text="â%tâ"/>
-<l:template name="sect3" text="â%tâ"/>
-<l:template name="sect4" text="â%tâ"/>
-<l:template name="sect5" text="â%tâ"/>
-<l:template name="section" text="â%tâ"/>
-<l:template name="simplesect" text="â%tâ"/>
-</l:context>
-<l:context name="xref-number"><l:template name="answer" text="ç­ïŒÂ %n"/>
-<l:template name="appendix" text="ééÂ %n"/>
-<l:template name="bridgehead" text="ç¯Â %n"/>
-<l:template name="chapter" text="ç« Â %n"/>
-<l:template name="equation" text="æ¹çšåŒÂ %n"/>
-<l:template name="example" text="ç¯äŸÂ %n"/>
-<l:template name="figure" text="ååœ¢Â %n"/>
-<l:template name="part" text="éšÂ %n"/>
-<l:template name="procedure" text="éçšÂ %n"/>
-<l:template name="productionset" text="ProductionÂ %n"/>
-<l:template name="qandadiv" text="åïŒäžç­ïŒÂ %n"/>
-<l:template name="qandaentry" text="åïŒÂ %n"/>
-<l:template name="question" text="åïŒÂ %n"/>
-<l:template name="sect1" text="ç¯Â %n"/>
-<l:template name="sect2" text="ç¯Â %n"/>
-<l:template name="sect3" text="ç¯Â %n"/>
-<l:template name="sect4" text="ç¯Â %n"/>
-<l:template name="sect5" text="ç¯Â %n"/>
-<l:template name="section" text="ç¯Â %n"/>
-<l:template name="table" text="è¡šæ ŒÂ %n"/>
-</l:context>
-<l:context name="xref-number-and-title"><l:template name="appendix" text="ééÂ %n, %t"/>
-<l:template name="bridgehead" text="ç¯Â %n, â%tâ"/>
-<l:template name="chapter" text="ç« Â %n, %t"/>
-<l:template name="equation" text="æ¹çšåŒÂ %n, â%tâ"/>
-<l:template name="example" text="ç¯äŸÂ %n, â%tâ"/>
-<l:template name="figure" text="ååœ¢Â %n, â%tâ"/>
-<l:template name="part" text="éšÂ %n, â%tâ"/>
-<l:template name="procedure" text="éçšÂ %n, â%tâ"/>
-<l:template name="productionset" text="ProductionÂ %n, â%tâ"/>
-<l:template name="qandadiv" text="åïŒäžç­ïŒÂ %n, â%tâ"/>
-<l:template name="refsect1" text="the section called â%tâ"/>
-<l:template name="refsect2" text="the section called â%tâ"/>
-<l:template name="refsect3" text="the section called â%tâ"/>
-<l:template name="refsection" text="the section called â%tâ"/>
-<l:template name="sect1" text="ç¯Â %n, â%tâ"/>
-<l:template name="sect2" text="ç¯Â %n, â%tâ"/>
-<l:template name="sect3" text="ç¯Â %n, â%tâ"/>
-<l:template name="sect4" text="ç¯Â %n, â%tâ"/>
-<l:template name="sect5" text="ç¯Â %n, â%tâ"/>
-<l:template name="section" text="ç¯Â %n, â%tâ"/>
-<l:template name="simplesect" text="the section called â%tâ"/>
-<l:template name="table" text="è¡šæ ŒÂ %n, â%tâ"/>
-</l:context>
-<l:context name="authorgroup"><l:template name="sep" text=", "/>
-<l:template name="sep2" text=" äž "/>
-<l:template name="seplast" text=", äž "/>
-</l:context>
-<l:context name="glossary"><l:template name="see" text="åèŠ %t"/>
-<l:template name="seealso" text="åŠåèŠ %t"/>
-</l:context>
-<l:context name="msgset"><l:template name="MsgAud" text="è®è
-: "/>
-<l:template name="MsgLevel" text="çšåºŠ: "/>
-<l:template name="MsgOrig" text="åºè: "/>
-</l:context>
-<l:context name="datetime"><l:template name="format" text="m/d/Y" lang="en"/>
-</l:context>
-<l:context name="termdef"><l:template name="prefix" text="[Definition: " lang="en"/>
-<l:template name="suffix" text="]" lang="en"/>
-</l:context>
-<l:context name="datetime-full"><l:template name="January" text="January" lang="en"/>
-<l:template name="February" text="February" lang="en"/>
-<l:template name="March" text="March" lang="en"/>
-<l:template name="April" text="April" lang="en"/>
-<l:template name="May" text="May" lang="en"/>
-<l:template name="June" text="June" lang="en"/>
-<l:template name="July" text="July" lang="en"/>
-<l:template name="August" text="August" lang="en"/>
-<l:template name="September" text="September" lang="en"/>
-<l:template name="October" text="October" lang="en"/>
-<l:template name="November" text="November" lang="en"/>
-<l:template name="December" text="December" lang="en"/>
-<l:template name="Monday" text="Monday" lang="en"/>
-<l:template name="Tuesday" text="Tuesday" lang="en"/>
-<l:template name="Wednesday" text="Wednesday" lang="en"/>
-<l:template name="Thursday" text="Thursday" lang="en"/>
-<l:template name="Friday" text="Friday" lang="en"/>
-<l:template name="Saturday" text="Saturday" lang="en"/>
-<l:template name="Sunday" text="Sunday" lang="en"/>
-</l:context>
-<l:context name="datetime-abbrev"><l:template name="Jan" text="Jan" lang="en"/>
-<l:template name="Feb" text="Feb" lang="en"/>
-<l:template name="Mar" text="Mar" lang="en"/>
-<l:template name="Apr" text="Apr" lang="en"/>
-<l:template name="May" text="May" lang="en"/>
-<l:template name="Jun" text="Jun" lang="en"/>
-<l:template name="Jul" text="Jul" lang="en"/>
-<l:template name="Aug" text="Aug" lang="en"/>
-<l:template name="Sep" text="Sep" lang="en"/>
-<l:template name="Oct" text="Oct" lang="en"/>
-<l:template name="Nov" text="Nov" lang="en"/>
-<l:template name="Dec" text="Dec" lang="en"/>
-<l:template name="Mon" text="Mon" lang="en"/>
-<l:template name="Tue" text="Tue" lang="en"/>
-<l:template name="Wed" text="Wed" lang="en"/>
-<l:template name="Thu" text="Thu" lang="en"/>
-<l:template name="Fri" text="Fri" lang="en"/>
-<l:template name="Sat" text="Sat" lang="en"/>
-<l:template name="Sun" text="Sun" lang="en"/>
-</l:context>
-<l:context name="htmlhelp"><l:template name="langcode" text="0x0404 Chinese (TAIWAN)"/>
-</l:context>
-<l:context name="index"><l:template name="term-separator" text=", " lang="en"/>
-<l:template name="number-separator" text=", " lang="en"/>
-<l:template name="range-separator" text="-" lang="en"/>
-</l:context>
-<l:context name="iso690"><l:template name="lastfirst.sep" text=", " lang="en"/>
-<l:template name="alt.person.two.sep" text=" â " lang="en"/>
-<l:template name="alt.person.last.sep" text=" â " lang="en"/>
-<l:template name="alt.person.more.sep" text=" â " lang="en"/>
-<l:template name="primary.editor" text=" (ed.)" lang="en"/>
-<l:template name="primary.many" text=", et al." lang="en"/>
-<l:template name="primary.sep" text=". " lang="en"/>
-<l:template name="submaintitle.sep" text=": " lang="en"/>
-<l:template name="title.sep" text=". " lang="en"/>
-<l:template name="othertitle.sep" text=", " lang="en"/>
-<l:template name="medium1" text=" [" lang="en"/>
-<l:template name="medium2" text="]" lang="en"/>
-<l:template name="secondary.person.sep" text="; " lang="en"/>
-<l:template name="secondary.sep" text=". " lang="en"/>
-<l:template name="respons.sep" text=". " lang="en"/>
-<l:template name="edition.sep" text=". " lang="en"/>
-<l:template name="edition.serial.sep" text=", " lang="en"/>
-<l:template name="issuing.range" text="-" lang="en"/>
-<l:template name="issuing.div" text=", " lang="en"/>
-<l:template name="issuing.sep" text=". " lang="en"/>
-<l:template name="partnr.sep" text=". " lang="en"/>
-<l:template name="placepubl.sep" text=": " lang="en"/>
-<l:template name="publyear.sep" text=", " lang="en"/>
-<l:template name="pubinfo.sep" text=". " lang="en"/>
-<l:template name="spec.pubinfo.sep" text=", " lang="en"/>
-<l:template name="upd.sep" text=", " lang="en"/>
-<l:template name="datecit1" text=" [cited " lang="en"/>
-<l:template name="datecit2" text="]" lang="en"/>
-<l:template name="extent.sep" text=". " lang="en"/>
-<l:template name="locs.sep" text=", " lang="en"/>
-<l:template name="location.sep" text=". " lang="en"/>
-<l:template name="serie.sep" text=". " lang="en"/>
-<l:template name="notice.sep" text=". " lang="en"/>
-<l:template name="access" text="Available " lang="en"/>
-<l:template name="acctoo" text="Also available " lang="en"/>
-<l:template name="onwww" text="from World Wide Web" lang="en"/>
-<l:template name="oninet" text="from Internet" lang="en"/>
-<l:template name="access.end" text=": " lang="en"/>
-<l:template name="link1" text="&lt;" lang="en"/>
-<l:template name="link2" text="&gt;" lang="en"/>
-<l:template name="access.sep" text=". " lang="en"/>
-<l:template name="isbn" text="ISBN " lang="en"/>
-<l:template name="issn" text="ISSN " lang="en"/>
-<l:template name="stdnum.sep" text=". " lang="en"/>
-<l:template name="patcountry.sep" text=". " lang="en"/>
-<l:template name="pattype.sep" text=", " lang="en"/>
-<l:template name="patnum.sep" text=". " lang="en"/>
-<l:template name="patdate.sep" text=". " lang="en"/>
-</l:context><l:letters lang="en"><l:l i="-1"/>
-<l:l i="0">Symbols</l:l>
-<l:l i="10">A</l:l>
-<l:l i="10">a</l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã </l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã¡</l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã¢</l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã£</l:l>
-<l:l i="10">Ã</l:l>
-<l:l i="10">Ã€</l:l>
-<l:l i="10">Ã
-</l:l>
-<l:l i="10">Ã¥</l:l>
-<l:l i="10">Ä</l:l>
-<l:l i="10">Ä</l:l>
-<l:l i="10">Ä</l:l>
-<l:l i="10">Ä</l:l>
-<l:l i="10">Ä</l:l>
-<l:l i="10">Ä
-</l:l>
-<l:l i="10">Ç</l:l>
-<l:l i="10">Ç</l:l>
-<l:l i="10">Ç</l:l>
-<l:l i="10">Ç</l:l>
-<l:l i="10">Ç </l:l>
-<l:l i="10">Ç¡</l:l>
-<l:l i="10">Çº</l:l>
-<l:l i="10">Ç»</l:l>
-<l:l i="10">È</l:l>
-<l:l i="10">È</l:l>
-<l:l i="10">È</l:l>
-<l:l i="10">È</l:l>
-<l:l i="10">ÈŠ</l:l>
-<l:l i="10">È§</l:l>
-<l:l i="10">áž</l:l>
-<l:l i="10">áž</l:l>
-<l:l i="10">áº</l:l>
-<l:l i="10">áº </l:l>
-<l:l i="10">áº¡</l:l>
-<l:l i="10">áº¢</l:l>
-<l:l i="10">áº£</l:l>
-<l:l i="10">áº€</l:l>
-<l:l i="10">áº¥</l:l>
-<l:l i="10">áºŠ</l:l>
-<l:l i="10">áº§</l:l>
-<l:l i="10">áºš</l:l>
-<l:l i="10">áº©</l:l>
-<l:l i="10">áºª</l:l>
-<l:l i="10">áº«</l:l>
-<l:l i="10">áº¬</l:l>
-<l:l i="10">áº­</l:l>
-<l:l i="10">áº®</l:l>
-<l:l i="10">áº¯</l:l>
-<l:l i="10">áº°</l:l>
-<l:l i="10">áº±</l:l>
-<l:l i="10">áº²</l:l>
-<l:l i="10">áº³</l:l>
-<l:l i="10">áºŽ</l:l>
-<l:l i="10">áºµ</l:l>
-<l:l i="10">áº¶</l:l>
-<l:l i="10">áº·</l:l>
-<l:l i="20">B</l:l>
-<l:l i="20">b</l:l>
-<l:l i="20">Æ</l:l>
-<l:l i="20">Æ</l:l>
-<l:l i="20">É</l:l>
-<l:l i="20">Æ</l:l>
-<l:l i="20">Æ</l:l>
-<l:l i="20">áž</l:l>
-<l:l i="20">áž</l:l>
-<l:l i="20">áž</l:l>
-<l:l i="20">áž
-</l:l>
-<l:l i="20">áž</l:l>
-<l:l i="20">áž</l:l>
-<l:l i="30">C</l:l>
-<l:l i="30">c</l:l>
-<l:l i="30">Ã</l:l>
-<l:l i="30">Ã§</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Ä</l:l>
-<l:l i="30">Æ</l:l>
-<l:l i="30">Æ</l:l>
-<l:l i="30">É</l:l>
-<l:l i="30">áž</l:l>
-<l:l i="30">áž</l:l>
-<l:l i="40">D</l:l>
-<l:l i="40">d</l:l>
-<l:l i="40">Ä</l:l>
-<l:l i="40">Ä</l:l>
-<l:l i="40">Ä</l:l>
-<l:l i="40">Ä</l:l>
-<l:l i="40">Æ</l:l>
-<l:l i="40">É</l:l>
-<l:l i="40">Æ</l:l>
-<l:l i="40">Æ</l:l>
-<l:l i="40">Ç
-</l:l>
-<l:l i="40">Ç²</l:l>
-<l:l i="40">È¡</l:l>
-<l:l i="40">É</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="40">áž</l:l>
-<l:l i="50">E</l:l>
-<l:l i="50">e</l:l>
-<l:l i="50">Ã</l:l>
-<l:l i="50">Ãš</l:l>
-<l:l i="50">Ã</l:l>
-<l:l i="50">Ã©</l:l>
-<l:l i="50">Ã</l:l>
-<l:l i="50">Ãª</l:l>
-<l:l i="50">Ã</l:l>
-<l:l i="50">Ã«</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">Ä</l:l>
-<l:l i="50">È</l:l>
-<l:l i="50">È
-</l:l>
-<l:l i="50">È</l:l>
-<l:l i="50">È</l:l>
-<l:l i="50">Èš</l:l>
-<l:l i="50">È©</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áž</l:l>
-<l:l i="50">áºž</l:l>
-<l:l i="50">áº¹</l:l>
-<l:l i="50">áºº</l:l>
-<l:l i="50">áº»</l:l>
-<l:l i="50">áºŒ</l:l>
-<l:l i="50">áºœ</l:l>
-<l:l i="50">áºŸ</l:l>
-<l:l i="50">áº¿</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»
-</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="50">á»</l:l>
-<l:l i="60">F</l:l>
-<l:l i="60">f</l:l>
-<l:l i="60">Æ</l:l>
-<l:l i="60">Æ</l:l>
-<l:l i="60">áž</l:l>
-<l:l i="60">áž</l:l>
-<l:l i="70">G</l:l>
-<l:l i="70">g</l:l>
-<l:l i="70">Ä</l:l>
-<l:l i="70">Ä</l:l>
-<l:l i="70">Ä</l:l>
-<l:l i="70">Ä</l:l>
-<l:l i="70">Ä </l:l>
-<l:l i="70">Ä¡</l:l>
-<l:l i="70">Ä¢</l:l>
-<l:l i="70">Ä£</l:l>
-<l:l i="70">Æ</l:l>
-<l:l i="70">É </l:l>
-<l:l i="70">Ç€</l:l>
-<l:l i="70">Ç¥</l:l>
-<l:l i="70">ÇŠ</l:l>
-<l:l i="70">Ç§</l:l>
-<l:l i="70">ÇŽ</l:l>
-<l:l i="70">Çµ</l:l>
-<l:l i="70">áž </l:l>
-<l:l i="70">áž¡</l:l>
-<l:l i="80">H</l:l>
-<l:l i="80">h</l:l>
-<l:l i="80">Ä€</l:l>
-<l:l i="80">Ä¥</l:l>
-<l:l i="80">ÄŠ</l:l>
-<l:l i="80">Ä§</l:l>
-<l:l i="80">È</l:l>
-<l:l i="80">È</l:l>
-<l:l i="80">ÉŠ</l:l>
-<l:l i="80">áž¢</l:l>
-<l:l i="80">áž£</l:l>
-<l:l i="80">áž€</l:l>
-<l:l i="80">áž¥</l:l>
-<l:l i="80">ážŠ</l:l>
-<l:l i="80">áž§</l:l>
-<l:l i="80">ážš</l:l>
-<l:l i="80">áž©</l:l>
-<l:l i="80">ážª</l:l>
-<l:l i="80">áž«</l:l>
-<l:l i="80">áº</l:l>
-<l:l i="90">I</l:l>
-<l:l i="90">i</l:l>
-<l:l i="90">Ã</l:l>
-<l:l i="90">Ã¬</l:l>
-<l:l i="90">Ã</l:l>
-<l:l i="90">Ã­</l:l>
-<l:l i="90">Ã</l:l>
-<l:l i="90">Ã®</l:l>
-<l:l i="90">Ã</l:l>
-<l:l i="90">Ã¯</l:l>
-<l:l i="90">Äš</l:l>
-<l:l i="90">Ä©</l:l>
-<l:l i="90">Äª</l:l>
-<l:l i="90">Ä«</l:l>
-<l:l i="90">Ä¬</l:l>
-<l:l i="90">Ä­</l:l>
-<l:l i="90">Ä®</l:l>
-<l:l i="90">Ä¯</l:l>
-<l:l i="90">Ä°</l:l>
-<l:l i="90">Æ</l:l>
-<l:l i="90">Éš</l:l>
-<l:l i="90">Ç</l:l>
-<l:l i="90">Ç</l:l>
-<l:l i="90">È</l:l>
-<l:l i="90">È</l:l>
-<l:l i="90">È</l:l>
-<l:l i="90">È</l:l>
-<l:l i="90">áž¬</l:l>
-<l:l i="90">áž­</l:l>
-<l:l i="90">áž®</l:l>
-<l:l i="90">áž¯</l:l>
-<l:l i="90">á»</l:l>
-<l:l i="90">á»</l:l>
-<l:l i="90">á»</l:l>
-<l:l i="90">á»</l:l>
-<l:l i="100">J</l:l>
-<l:l i="100">j</l:l>
-<l:l i="100">ÄŽ</l:l>
-<l:l i="100">Äµ</l:l>
-<l:l i="100">Ç°</l:l>
-<l:l i="100">Ê</l:l>
-<l:l i="110">K</l:l>
-<l:l i="110">k</l:l>
-<l:l i="110">Ä¶</l:l>
-<l:l i="110">Ä·</l:l>
-<l:l i="110">Æ</l:l>
-<l:l i="110">Æ</l:l>
-<l:l i="110">Çš</l:l>
-<l:l i="110">Ç©</l:l>
-<l:l i="110">áž°</l:l>
-<l:l i="110">áž±</l:l>
-<l:l i="110">áž²</l:l>
-<l:l i="110">áž³</l:l>
-<l:l i="110">ážŽ</l:l>
-<l:l i="110">ážµ</l:l>
-<l:l i="120">L</l:l>
-<l:l i="120">l</l:l>
-<l:l i="120">Ä¹</l:l>
-<l:l i="120">Äº</l:l>
-<l:l i="120">Ä»</l:l>
-<l:l i="120">ÄŒ</l:l>
-<l:l i="120">Äœ</l:l>
-<l:l i="120">ÄŸ</l:l>
-<l:l i="120">Ä¿</l:l>
-<l:l i="120">Å</l:l>
-<l:l i="120">Å</l:l>
-<l:l i="120">Å</l:l>
-<l:l i="120">Æ</l:l>
-<l:l i="120">Ç</l:l>
-<l:l i="120">ÈŽ</l:l>
-<l:l i="120">É«</l:l>
-<l:l i="120">É¬</l:l>
-<l:l i="120">É­</l:l>
-<l:l i="120">áž¶</l:l>
-<l:l i="120">áž·</l:l>
-<l:l i="120">ážž</l:l>
-<l:l i="120">áž¹</l:l>
-<l:l i="120">ážº</l:l>
-<l:l i="120">áž»</l:l>
-<l:l i="120">ážŒ</l:l>
-<l:l i="120">ážœ</l:l>
-<l:l i="130">M</l:l>
-<l:l i="130">m</l:l>
-<l:l i="130">É±</l:l>
-<l:l i="130">ážŸ</l:l>
-<l:l i="130">áž¿</l:l>
-<l:l i="130">á¹</l:l>
-<l:l i="130">á¹</l:l>
-<l:l i="130">á¹</l:l>
-<l:l i="130">á¹</l:l>
-<l:l i="140">N</l:l>
-<l:l i="140">n</l:l>
-<l:l i="140">Ã</l:l>
-<l:l i="140">Ã±</l:l>
-<l:l i="140">Å</l:l>
-<l:l i="140">Å</l:l>
-<l:l i="140">Å
-</l:l>
-<l:l i="140">Å</l:l>
-<l:l i="140">Å</l:l>
-<l:l i="140">Å</l:l>
-<l:l i="140">Æ</l:l>
-<l:l i="140">É²</l:l>
-<l:l i="140">Æ</l:l>
-<l:l i="140">È </l:l>
-<l:l i="140">Ç</l:l>
-<l:l i="140">Çž</l:l>
-<l:l i="140">Ç¹</l:l>
-<l:l i="140">Èµ</l:l>
-<l:l i="140">É³</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹
-</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="140">á¹</l:l>
-<l:l i="150">O</l:l>
-<l:l i="150">o</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">Ã²</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">Ã³</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">ÃŽ</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">Ãµ</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">Ã¶</l:l>
-<l:l i="150">Ã</l:l>
-<l:l i="150">Ãž</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Å</l:l>
-<l:l i="150">Æ</l:l>
-<l:l i="150">Æ </l:l>
-<l:l i="150">Æ¡</l:l>
-<l:l i="150">Ç</l:l>
-<l:l i="150">Ç</l:l>
-<l:l i="150">Çª</l:l>
-<l:l i="150">Ç«</l:l>
-<l:l i="150">Ç¬</l:l>
-<l:l i="150">Ç­</l:l>
-<l:l i="150">ÇŸ</l:l>
-<l:l i="150">Ç¿</l:l>
-<l:l i="150">È</l:l>
-<l:l i="150">È</l:l>
-<l:l i="150">È</l:l>
-<l:l i="150">È</l:l>
-<l:l i="150">Èª</l:l>
-<l:l i="150">È«</l:l>
-<l:l i="150">È¬</l:l>
-<l:l i="150">È­</l:l>
-<l:l i="150">È®</l:l>
-<l:l i="150">È¯</l:l>
-<l:l i="150">È°</l:l>
-<l:l i="150">È±</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á¹</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á»</l:l>
-<l:l i="150">á» </l:l>
-<l:l i="150">á»¡</l:l>
-<l:l i="150">á»¢</l:l>
-<l:l i="150">á»£</l:l>
-<l:l i="160">P</l:l>
-<l:l i="160">p</l:l>
-<l:l i="160">Æ€</l:l>
-<l:l i="160">Æ¥</l:l>
-<l:l i="160">á¹</l:l>
-<l:l i="160">á¹</l:l>
-<l:l i="160">á¹</l:l>
-<l:l i="160">á¹</l:l>
-<l:l i="170">Q</l:l>
-<l:l i="170">q</l:l>
-<l:l i="170">Ê </l:l>
-<l:l i="180">R</l:l>
-<l:l i="180">r</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">Å</l:l>
-<l:l i="180">È</l:l>
-<l:l i="180">È</l:l>
-<l:l i="180">È</l:l>
-<l:l i="180">È</l:l>
-<l:l i="180">ÉŒ</l:l>
-<l:l i="180">Éœ</l:l>
-<l:l i="180">ÉŸ</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="180">á¹</l:l>
-<l:l i="190">S</l:l>
-<l:l i="190">s</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å</l:l>
-<l:l i="190">Å </l:l>
-<l:l i="190">Å¡</l:l>
-<l:l i="190">È</l:l>
-<l:l i="190">È</l:l>
-<l:l i="190">Ê</l:l>
-<l:l i="190">á¹ </l:l>
-<l:l i="190">á¹¡</l:l>
-<l:l i="190">á¹¢</l:l>
-<l:l i="190">á¹£</l:l>
-<l:l i="190">á¹€</l:l>
-<l:l i="190">á¹¥</l:l>
-<l:l i="190">á¹Š</l:l>
-<l:l i="190">á¹§</l:l>
-<l:l i="190">á¹š</l:l>
-<l:l i="190">á¹©</l:l>
-<l:l i="200">T</l:l>
-<l:l i="200">t</l:l>
-<l:l i="200">Å¢</l:l>
-<l:l i="200">Å£</l:l>
-<l:l i="200">Å€</l:l>
-<l:l i="200">Å¥</l:l>
-<l:l i="200">ÅŠ</l:l>
-<l:l i="200">Å§</l:l>
-<l:l i="200">Æ«</l:l>
-<l:l i="200">Æ¬</l:l>
-<l:l i="200">Æ­</l:l>
-<l:l i="200">Æ®</l:l>
-<l:l i="200">Ê</l:l>
-<l:l i="200">È</l:l>
-<l:l i="200">È</l:l>
-<l:l i="200">È¶</l:l>
-<l:l i="200">á¹ª</l:l>
-<l:l i="200">á¹«</l:l>
-<l:l i="200">á¹¬</l:l>
-<l:l i="200">á¹­</l:l>
-<l:l i="200">á¹®</l:l>
-<l:l i="200">á¹¯</l:l>
-<l:l i="200">á¹°</l:l>
-<l:l i="200">á¹±</l:l>
-<l:l i="200">áº</l:l>
-<l:l i="210">U</l:l>
-<l:l i="210">u</l:l>
-<l:l i="210">Ã</l:l>
-<l:l i="210">Ã¹</l:l>
-<l:l i="210">Ã</l:l>
-<l:l i="210">Ãº</l:l>
-<l:l i="210">Ã</l:l>
-<l:l i="210">Ã»</l:l>
-<l:l i="210">Ã</l:l>
-<l:l i="210">ÃŒ</l:l>
-<l:l i="210">Åš</l:l>
-<l:l i="210">Å©</l:l>
-<l:l i="210">Åª</l:l>
-<l:l i="210">Å«</l:l>
-<l:l i="210">Å¬</l:l>
-<l:l i="210">Å­</l:l>
-<l:l i="210">Å®</l:l>
-<l:l i="210">Å¯</l:l>
-<l:l i="210">Å°</l:l>
-<l:l i="210">Å±</l:l>
-<l:l i="210">Å²</l:l>
-<l:l i="210">Å³</l:l>
-<l:l i="210">Æ¯</l:l>
-<l:l i="210">Æ°</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">Ç</l:l>
-<l:l i="210">È</l:l>
-<l:l i="210">È</l:l>
-<l:l i="210">È</l:l>
-<l:l i="210">È</l:l>
-<l:l i="210">á¹²</l:l>
-<l:l i="210">á¹³</l:l>
-<l:l i="210">á¹Ž</l:l>
-<l:l i="210">á¹µ</l:l>
-<l:l i="210">á¹¶</l:l>
-<l:l i="210">á¹·</l:l>
-<l:l i="210">á¹ž</l:l>
-<l:l i="210">á¹¹</l:l>
-<l:l i="210">á¹º</l:l>
-<l:l i="210">á¹»</l:l>
-<l:l i="210">á»€</l:l>
-<l:l i="210">á»¥</l:l>
-<l:l i="210">á»Š</l:l>
-<l:l i="210">á»§</l:l>
-<l:l i="210">á»š</l:l>
-<l:l i="210">á»©</l:l>
-<l:l i="210">á»ª</l:l>
-<l:l i="210">á»«</l:l>
-<l:l i="210">á»¬</l:l>
-<l:l i="210">á»­</l:l>
-<l:l i="210">á»®</l:l>
-<l:l i="210">á»¯</l:l>
-<l:l i="210">á»°</l:l>
-<l:l i="210">á»±</l:l>
-<l:l i="220">V</l:l>
-<l:l i="220">v</l:l>
-<l:l i="220">Æ²</l:l>
-<l:l i="220">Ê</l:l>
-<l:l i="220">á¹Œ</l:l>
-<l:l i="220">á¹œ</l:l>
-<l:l i="220">á¹Ÿ</l:l>
-<l:l i="220">á¹¿</l:l>
-<l:l i="230">W</l:l>
-<l:l i="230">w</l:l>
-<l:l i="230">ÅŽ</l:l>
-<l:l i="230">Åµ</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº
-</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="230">áº</l:l>
-<l:l i="240">X</l:l>
-<l:l i="240">x</l:l>
-<l:l i="240">áº</l:l>
-<l:l i="240">áº</l:l>
-<l:l i="240">áº</l:l>
-<l:l i="240">áº</l:l>
-<l:l i="250">Y</l:l>
-<l:l i="250">y</l:l>
-<l:l i="250">Ã</l:l>
-<l:l i="250">Ãœ</l:l>
-<l:l i="250">Ã¿</l:l>
-<l:l i="250">Åž</l:l>
-<l:l i="250">Å¶</l:l>
-<l:l i="250">Å·</l:l>
-<l:l i="250">Æ³</l:l>
-<l:l i="250">ÆŽ</l:l>
-<l:l i="250">È²</l:l>
-<l:l i="250">È³</l:l>
-<l:l i="250">áº</l:l>
-<l:l i="250">áº</l:l>
-<l:l i="250">áº</l:l>
-<l:l i="250">á»²</l:l>
-<l:l i="250">á»³</l:l>
-<l:l i="250">á»Ž</l:l>
-<l:l i="250">á»µ</l:l>
-<l:l i="250">á»¶</l:l>
-<l:l i="250">á»·</l:l>
-<l:l i="250">á»ž</l:l>
-<l:l i="250">á»¹</l:l>
-<l:l i="260">Z</l:l>
-<l:l i="260">z</l:l>
-<l:l i="260">Å¹</l:l>
-<l:l i="260">Åº</l:l>
-<l:l i="260">Å»</l:l>
-<l:l i="260">ÅŒ</l:l>
-<l:l i="260">Åœ</l:l>
-<l:l i="260">ÅŸ</l:l>
-<l:l i="260">Æµ</l:l>
-<l:l i="260">Æ¶</l:l>
-<l:l i="260">È€</l:l>
-<l:l i="260">È¥</l:l>
-<l:l i="260">Ê</l:l>
-<l:l i="260">Ê</l:l>
-<l:l i="260">áº</l:l>
-<l:l i="260">áº</l:l>
-<l:l i="260">áº</l:l>
-<l:l i="260">áº</l:l>
-<l:l i="260">áº</l:l>
-<l:l i="260">áº</l:l>
-</l:letters>
-</l:l10n>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/admon.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/admon.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,130 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:template match="note|important|warning|caution|tip">
-  <xsl:choose>
-    <xsl:when test="$admon.graphics != 0">
-      <xsl:call-template name="graphical.admonition"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="nongraphical.admonition"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="admon.graphic.width">
-  <xsl:param name="node" select="."/>
-  <xsl:text>36pt</xsl:text>
-</xsl:template>
-
-<xsl:template name="admon.graphic">
-  <xsl:param name="node" select="."/>
-
-  <xsl:variable name="filename">
-    <xsl:value-of select="$admon.graphics.path"/>
-    <xsl:choose>
-      <xsl:when test="local-name($node)='note'">note</xsl:when>
-      <xsl:when test="local-name($node)='warning'">warning</xsl:when>
-      <xsl:when test="local-name($node)='caution'">caution</xsl:when>
-      <xsl:when test="local-name($node)='tip'">tip</xsl:when>
-      <xsl:when test="local-name($node)='important'">important</xsl:when>
-      <xsl:otherwise>note</xsl:otherwise>
-    </xsl:choose>
-    <xsl:value-of select="$admon.graphics.extension"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$passivetex.extensions != 0
-                    or $fop.extensions != 0
-                    or $arbortext.extensions != 0">
-      <xsl:value-of select="$filename"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text>url(</xsl:text>
-      <xsl:value-of select="$filename"/>
-      <xsl:text>)</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="graphical.admonition">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  <xsl:variable name="graphic.width">
-     <xsl:apply-templates select="." mode="admon.graphic.width"/>
-  </xsl:variable>
-
-  <fo:block id="{$id}"
-            xsl:use-attribute-sets="graphical.admonition.properties">
-    <fo:list-block provisional-distance-between-starts="{$graphic.width} + 18pt"
-                    provisional-label-separation="18pt">
-      <fo:list-item>
-          <fo:list-item-label end-indent="label-end()">
-            <fo:block>
-              <fo:external-graphic width="auto" height="auto"
-                                         content-width="{$graphic.width}" >
-                <xsl:attribute name="src">
-                  <xsl:call-template name="admon.graphic"/>
-                </xsl:attribute>
-              </fo:external-graphic>
-            </fo:block>
-          </fo:list-item-label>
-          <fo:list-item-body start-indent="body-start()">
-            <xsl:if test="$admon.textlabel != 0 or title or info/title">
-              <fo:block xsl:use-attribute-sets="admonition.title.properties">
-                <xsl:apply-templates select="." mode="object.title.markup">
-		  <xsl:with-param name="allow-anchors" select="1"/>
-		</xsl:apply-templates>
-              </fo:block>
-            </xsl:if>
-            <fo:block xsl:use-attribute-sets="admonition.properties">
-              <xsl:apply-templates/>
-            </fo:block>
-          </fo:list-item-body>
-      </fo:list-item>
-    </fo:list-block>
-  </fo:block>
-</xsl:template>
-
-<xsl:template name="nongraphical.admonition">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:block id="{$id}"
-            xsl:use-attribute-sets="nongraphical.admonition.properties">
-    <xsl:if test="$admon.textlabel != 0 or title or info/title">
-      <fo:block keep-with-next.within-column='always'
-                xsl:use-attribute-sets="admonition.title.properties">
-         <xsl:apply-templates select="." mode="object.title.markup">
-	   <xsl:with-param name="allow-anchors" select="1"/>
-	 </xsl:apply-templates>
-      </fo:block>
-    </xsl:if>
-
-    <fo:block xsl:use-attribute-sets="admonition.properties">
-      <xsl:apply-templates/>
-    </fo:block>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="note/title"></xsl:template>
-<xsl:template match="important/title"></xsl:template>
-<xsl:template match="warning/title"></xsl:template>
-<xsl:template match="caution/title"></xsl:template>
-<xsl:template match="tip/title"></xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/annotations.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/annotations.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,18 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:template match="annotation"/>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx-kimber.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx-kimber.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,178 +1,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE xsl:stylesheet [
-
-<!ENTITY primary   'normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))'>
-<!ENTITY secondary 'normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = ""]))'>
-<!ENTITY tertiary  'normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = ""]))'>
-
-<!ENTITY sep '" "'>
-<!-- Documents using the kimber index method must have a lang attribute -->
-<!-- Only one of these should be present in the entity -->
-<!ENTITY lang 'concat(/*/@lang, /*/@xml:lang)'>
-
-<!ENTITY scope 'count(ancestor::node()|$scope) = count(ancestor::node())
-                and ($role = @role or $type = @type or
-                (string-length($role) = 0 and string-length($type) = 0))'>
-]>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:k="java:com.isogen.saxoni18n.Saxoni18nService"
-                exclude-result-prefixes="k"
-                version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the DocBook XSL Stylesheet distribution.
-     See ../README or http://docbook.sf.net/ for copyright
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-<!-- The "kimber" method contributed by Eliot Kimber of Innodata Isogen.  -->
-<!-- ==================================================================== -->
-<!--   *** THIS MODULE ONLY WORKS WITH SAXON 6 OR SAXON 8 ***             -->
-<!-- ==================================================================== -->
-
-<xsl:include href="../common/autoidx-kimber.xsl"/>
-
-<!-- Java sort apparently works only on lang part, not country -->
-<xsl:param name="sort.lang">
-  <xsl:choose>
-    <xsl:when test="contains(&lang;, '-')">
-      <xsl:value-of select="substring-before(&lang;, '-')"/>
-    </xsl:when>
-    <xsl:when test="contains(&lang;, '_')">
-      <xsl:value-of select="substring-before(&lang;, '_')"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="&lang;"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-
-<xsl:template name="generate-kimber-index">
-  <xsl:param name="scope" select="NOTANODE"/>
-
-  <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
-  <xsl:if test="not(contains($vendor, 'SAXON '))">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kimber' index method requires the </xsl:text>
-      <xsl:text>Saxon version 6 or 8 XSLT processor.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:if test="not(function-available('k:getIndexGroupKey'))">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kimber' index method requires the </xsl:text>
-      <xsl:text>Innodata Isogen &#x0A;Java extensions for </xsl:text>
-      <xsl:text>internationalized indexes. &#x0A;Install those </xsl:text>
-      <xsl:text>extensions, or use a different index method.&#x0A;</xsl:text>
-      <xsl:text>For more information, see:&#x0A;</xsl:text>
-      <xsl:text>http://www.innodata-isogen.com/knowledge_center/tools_downloads/i18nsupport</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:variable name="role">
-    <xsl:if test="$index.on.role != 0">
-      <xsl:value-of select="@role"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="type">
-    <xsl:if test="$index.on.type != 0">
-      <xsl:value-of select="@type"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="terms"
-                select="//indexterm[count(.|key('k-group',
-                   k:getIndexGroupKey(&lang;, &primary;))
-                   [&scope;][1]) = 1
-                   and not(@class = 'endofrange')]"/>
-
-  <xsl:variable name="alphabetical"
-                select="$terms[not(starts-with(
-                k:getIndexGroupKey(&lang;, &primary;),
-                '#NUMERIC'
-                ))]"/>
-
-  <xsl:variable name="others"
-                select="$terms[starts-with(
-                k:getIndexGroupKey(&lang;, &primary;),
-                '#NUMERIC'
-                )]"/>
-
-  <fo:block>
-    <xsl:if test="$others">
-      <xsl:call-template name="indexdiv.title">
-        <xsl:with-param name="titlecontent">
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'index symbols'"/>
-          </xsl:call-template>
-        </xsl:with-param>
-      </xsl:call-template>
-
-      <fo:block>
-        <xsl:apply-templates select="$others"
-                             mode="index-symbol-div">
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-          <xsl:sort lang="{$sort.lang}"
-              select="k:getIndexGroupSortKey(&lang;,
-                      k:getIndexGroupKey(&lang;, &primary;))"/>
-        </xsl:apply-templates>
-      </fo:block>
-    </xsl:if>
-
-    <xsl:apply-templates select="$alphabetical"
-                         mode="index-div-kimber">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort lang="{$sort.lang}"
-             select="k:getIndexGroupSortKey(&lang;,
-                     k:getIndexGroupKey(&lang;, &primary;))"/>
-    </xsl:apply-templates>
-  </fo:block>
-
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-div-kimber">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:variable name="key"
-          select="k:getIndexGroupKey(&lang;, &primary;)"/>
-
-  <xsl:variable name="label"
-          select="k:getIndexGroupLabel(&lang;, $key)"/>
-
-  <xsl:if test="key('k-group', $key)[&scope;]
-                [count(.|key('primary', &primary;)[&scope;][1]) = 1]">
-    <fo:block>
-      <xsl:call-template name="indexdiv.title">
-        <xsl:with-param name="titlecontent">
-          <xsl:value-of select="$label"/>
-        </xsl:with-param>
-      </xsl:call-template>
-      <fo:block>
-        <xsl:apply-templates select="key('k-group', $key)[&scope;]
-                            [count(.|key('primary', &primary;)[&scope;]
-                            [1])=1]"
-                             mode="index-primary">
-          <xsl:sort select="&primary;" lang="{$sort.lang}"/>
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-        </xsl:apply-templates>
-      </fo:block>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx-kosek.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx-kosek.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,150 +1,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE xsl:stylesheet [
-
-<!ENTITY primary   'normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))'>
-<!ENTITY secondary 'normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = ""]))'>
-<!ENTITY tertiary  'normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = ""]))'>
-
-<!ENTITY sep '" "'>
-<!-- Documents using the kimber index method must have a lang attribute -->
-<!-- Only one of these should be present in the entity -->
-
-<!ENTITY scope 'count(ancestor::node()|$scope) = count(ancestor::node())
-                and ($role = @role or $type = @type or
-                (string-length($role) = 0 and string-length($type) = 0))'>
-]>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:rx="http://www.renderx.com/XSL/Extensions"
-                xmlns:axf="http://www.antennahouse.com/names/XSL/Extensions"
-                xmlns:i="urn:cz-kosek:functions:index"
-                xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"
-                xmlns:func="http://exslt.org/functions"
-                xmlns:exslt="http://exslt.org/common"
-                extension-element-prefixes="func exslt"
-                exclude-result-prefixes="func exslt i l"
-                version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the DocBook XSL Stylesheet distribution.
-     See ../README or http://docbook.sf.net/ for copyright
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-<!-- The "kosek" method contributed by Jirka Kosek. -->
-
-<xsl:include href="../common/autoidx-kosek.xsl"/>
-
-<xsl:template name="generate-kosek-index">
-  <xsl:param name="scope" select="NOTANODE"/>
-
-  <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
-  <xsl:if test="contains($vendor, 'libxslt')">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kosek' index method does not </xsl:text>
-      <xsl:text>work with the xsltproc XSLT processor.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:if test="contains($vendor, 'Saxonica')">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kosek' index method does not </xsl:text>
-      <xsl:text>work with the Saxon 8 XSLT processor.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-
-  <xsl:if test="not(function-available('exslt:node-set') or
-                    function-available('exslt:nodeSet'))">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kosek' index method requires the </xsl:text>
-      <xsl:text>exslt:node-set() function. Use a processor that </xsl:text>
-      <xsl:text>has it, or use a different index method.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:if test="not(function-available('i:group-index'))">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kosek' index method requires the&#xA;</xsl:text>
-      <xsl:text>index extension functions be imported:&#xA;</xsl:text>
-      <xsl:text>  xsl:import href="common/autoidx-kosek.xsl"</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:variable name="role">
-    <xsl:if test="$index.on.role != 0">
-      <xsl:value-of select="@role"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="type">
-    <xsl:if test="$index.on.type != 0">
-      <xsl:value-of select="@type"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="terms"
-                select="//indexterm[count(.|key('group-code',
-                                          i:group-index(&primary;))
-                                          [&scope;][1]) = 1
-                                and not(@class = 'endofrange')]"/>
-  <fo:block>
-    <xsl:apply-templates select="$terms" mode="index-div-kosek">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort select="i:group-index(&primary;)" data-type="number"/>
-    </xsl:apply-templates>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-div-kosek">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:variable name="key"
-                select="i:group-index(&primary;)"/>
-
-  <xsl:variable name="lang">
-    <xsl:call-template name="l10n.language"/>
-  </xsl:variable>
-
-  <xsl:if test="key('group-code', $key)[&scope;]
-                [count(.|key('primary', &primary;)[&scope;][1]) = 1]">
-    <fo:block>
-      <xsl:call-template name="indexdiv.title">
-        <xsl:with-param name="titlecontent">
-          <xsl:choose>
-            <xsl:when test="$key = 0">
-              <xsl:call-template name="gentext">
-                <xsl:with-param name="key" select="'index symbols'"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="i:group-letter($key)"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
-      </xsl:call-template>
-      <fo:block>
-        <xsl:apply-templates select="key('group-code', $key)[&scope;]
-                                     [count(.|key('primary', &primary;)
-                                     [&scope;][1])=1]"
-                             mode="index-primary">
-          <xsl:sort select="&primary;" lang="{$lang}"/>
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-        </xsl:apply-templates>
-      </fo:block>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx-ng.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx-ng.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the DocBook XSL Stylesheet distribution.
-     See ../README or http://docbook.sf.net/ for copyright
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- You should have this directly in your customization file. -->
-<!-- This file is there only to retain backward compatibility. -->
-<xsl:import href="autoidx-kosek.xsl"/>
-<xsl:param name="index.method">kosek</xsl:param>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autoidx.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,1310 +1,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE xsl:stylesheet [
-<!ENTITY % common.entities SYSTEM "../common/entities.ent">
-%common.entities;
-]>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:rx="http://www.renderx.com/XSL/Extensions"
-                xmlns:axf="http://www.antennahouse.com/names/XSL/Extensions"
-                xmlns:exslt="http://exslt.org/common"
-                extension-element-prefixes="exslt"
-                exclude-result-prefixes="exslt"
-                version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the DocBook XSL Stylesheet distribution.
-     See ../README or http://docbook.sf.net/ for copyright
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-<!-- The "basic" method derived from Jeni Tennison's work. -->
-<!-- The "kosek" method contributed by Jirka Kosek. -->
-<!-- The "kimber" method contributed by Eliot Kimber of Innodata Isogen. -->
-
-<!-- Importing module for kimber or kosek method overrides one of these -->
-<xsl:param name="kimber.imported" select="0"/>
-<xsl:param name="kosek.imported" select="0"/>
-
-<!-- These keys used primary in all methods -->
-<xsl:key name="letter"
-         match="indexterm"
-         use="translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;)"/>
-
-<xsl:key name="primary"
-         match="indexterm"
-         use="&primary;"/>
-
-<xsl:key name="secondary"
-         match="indexterm"
-         use="concat(&primary;, &sep;, &secondary;)"/>
-
-<xsl:key name="tertiary"
-         match="indexterm"
-         use="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;)"/>
-
-<xsl:key name="endofrange"
-         match="indexterm[@class='endofrange']"
-         use="@startref"/>
-
-<xsl:key name="see-also"
-         match="indexterm[seealso]"
-         use="concat(&primary;, &sep;, 
-                     &secondary;, &sep;, 
-                     &tertiary;, &sep;, seealso)"/>
-
-<xsl:key name="see"
-         match="indexterm[see]"
-         use="concat(&primary;, &sep;, 
-                     &secondary;, &sep;, 
-                     &tertiary;, &sep;, see)"/>
-
-
-<xsl:template name="generate-index">
-  <xsl:param name="scope" select="(ancestor::book|/)[last()]"/>
-
-  <xsl:choose>
-    <xsl:when test="$index.method = 'kosek'">
-      <xsl:call-template name="generate-kosek-index">
-        <xsl:with-param name="scope" select="$scope"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$index.method = 'kimber'">
-      <xsl:call-template name="generate-kimber-index">
-        <xsl:with-param name="scope" select="$scope"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:call-template name="generate-basic-index">
-        <xsl:with-param name="scope" select="$scope"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-      
-<xsl:template name="generate-basic-index">
-  <xsl:param name="scope" select="NOTANODE"/>
-
-  <xsl:variable name="role">
-    <xsl:if test="$index.on.role != 0">
-      <xsl:value-of select="@role"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="type">
-    <xsl:if test="$index.on.type != 0">
-      <xsl:value-of select="@type"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="terms"
-                select="//indexterm
-                        [count(.|key('letter',
-                          translate(substring(&primary;, 1, 1),
-                             &lowercase;,
-                             &uppercase;))
-                          [&scope;][1]) = 1
-                          and not(@class = 'endofrange')]"/>
-
-  <xsl:variable name="alphabetical"
-                select="$terms[contains(concat(&lowercase;, &uppercase;),
-                                        substring(&primary;, 1, 1))]"/>
-
-  <xsl:variable name="others" select="$terms[not(contains(
-                                        concat(&lowercase;,
-                                        &uppercase;),
-                                        substring(&primary;, 1, 1)))]"/>
-  <fo:block>
-    <xsl:if test="$others">
-      <xsl:call-template name="indexdiv.title">
-        <xsl:with-param name="titlecontent">
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'index symbols'"/>
-          </xsl:call-template>
-        </xsl:with-param>
-      </xsl:call-template>
-
-      <fo:block>
-        <xsl:apply-templates select="$others[count(.|key('primary',
-                                     &primary;)[&scope;][1]) = 1]"
-                             mode="index-symbol-div">
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-          <xsl:sort select="translate(&primary;, &lowercase;, 
-                            &uppercase;)"/>
-        </xsl:apply-templates>
-      </fo:block>
-    </xsl:if>
-
-    <xsl:apply-templates select="$alphabetical[count(.|key('letter',
-                                 translate(substring(&primary;, 1, 1),
-                                           &lowercase;,&uppercase;))
-                                           [&scope;][1]) = 1]"
-                         mode="index-div-basic">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/>
-    </xsl:apply-templates>
-  </fo:block>
-</xsl:template>
-
-<!-- This template not used if fo/autoidx-kosek.xsl is imported -->
-<xsl:template name="generate-kosek-index">
-  <xsl:param name="scope" select="NOTANODE"/>
-
-  <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
-  <xsl:if test="contains($vendor, 'libxslt')">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kosek' index method does not </xsl:text>
-      <xsl:text>work with the xsltproc XSLT processor.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-
-  <xsl:if test="not(function-available('exslt:node-set') or
-                    function-available('exslt:nodeSet'))">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kosek' index method requires the </xsl:text>
-      <xsl:text>exslt:node-set() function. Use a processor that </xsl:text>
-      <xsl:text>has it, or use a different index method.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:if test="$kosek.imported = 0">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kosek' index method requires the&#xA;</xsl:text>
-      <xsl:text>kosek index extensions be imported:&#xA;</xsl:text>
-      <xsl:text>  xsl:import href="fo/autoidx-kosek.xsl"</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-</xsl:template>
-
-
-<!-- This template not used if fo/autoidx-kimber.xsl is imported -->
-<xsl:template name="generate-kimber-index">
-  <xsl:param name="scope" select="NOTANODE"/>
-
-  <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
-  <xsl:if test="not(contains($vendor, 'SAXON '))">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kimber' index method requires the </xsl:text>
-      <xsl:text>Saxon version 6 or 8 XSLT processor.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:if test="$kimber.imported = 0">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kimber' index method requires the&#xA;</xsl:text>
-      <xsl:text>kimber index extensions be imported:&#xA;</xsl:text>
-      <xsl:text>  xsl:import href="fo/autoidx-kimber.xsl"</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-div-basic">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:variable name="key"
-                select="translate(substring(&primary;, 1, 1),
-                         &lowercase;,&uppercase;)"/>
-
-  <xsl:if test="key('letter', $key)[&scope;]
-                [count(.|key('primary', &primary;)[&scope;][1]) = 1]">
-    <fo:block>
-      <xsl:if test="contains(concat(&lowercase;, &uppercase;), $key)">
-        <xsl:call-template name="indexdiv.title">
-          <xsl:with-param name="titlecontent">
-            <xsl:value-of select="translate($key, &lowercase;, &uppercase;)"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:block xsl:use-attribute-sets="index.entry.properties">
-        <xsl:apply-templates select="key('letter', $key)[&scope;]
-                                     [count(.|key('primary', &primary;)
-                                     [&scope;][1])=1]"
-                             mode="index-primary">
-          <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/>
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-        </xsl:apply-templates>
-      </fo:block>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-symbol-div">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:variable name="key"
-                select="translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;)"/>
-
-  <fo:block xsl:use-attribute-sets="index.entry.properties">
-    <xsl:apply-templates select="key('letter', $key)[&scope;][count(.|key('primary', &primary;)[&scope;][1]) = 1]"
-                         mode="index-primary">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/>
-    </xsl:apply-templates>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-primary">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:variable name="key" select="&primary;"/>
-  <xsl:variable name="refs" select="key('primary', $key)[&scope;]"/>
-
-  <xsl:variable name="term.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.term.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="range.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.range.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="number.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.number.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <fo:block>
-    <xsl:if test="$axf.extensions != 0">
-      <xsl:attribute name="axf:suppress-duplicate-page-number">true</xsl:attribute>
-    </xsl:if>
-    <xsl:value-of select="primary"/>
-
-    <xsl:choose>
-      <xsl:when test="$xep.extensions != 0">
-        <xsl:if test="$refs[not(see) and not(secondary)]">
-          <xsl:copy-of select="$term.separator"/>
-          <xsl:variable name="primary" select="&primary;"/>
-          <xsl:variable name="primary.significant" select="concat(&primary;, $significant.flag)"/>
-          <rx:page-index list-separator="{$number.separator}"
-                         range-separator="{$range.separator}">
-            <xsl:if test="$refs[@significance='preferred'][not(see) and not(secondary)]">
-              <rx:index-item xsl:use-attribute-sets="index.preferred.page.properties xep.index.item.properties"
-                ref-key="{$primary.significant}"/>
-            </xsl:if>
-            <xsl:if test="$refs[not(@significance) or @significance!='preferred'][not(see) and not(secondary)]">
-              <rx:index-item xsl:use-attribute-sets="xep.index.item.properties"
-                ref-key="{$primary}"/>
-            </xsl:if>
-          </rx:page-index>        
-        </xsl:if>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:variable name="page-number-citations">
-          <xsl:for-each select="$refs[not(see) 
-                                and not(secondary)]">
-            <xsl:apply-templates select="." mode="reference">
-              <xsl:with-param name="scope" select="$scope"/>
-              <xsl:with-param name="role" select="$role"/>
-              <xsl:with-param name="type" select="$type"/>
-              <xsl:with-param name="position" select="position()"/>
-            </xsl:apply-templates>
-          </xsl:for-each>
-        </xsl:variable>
-
-        <xsl:choose>
-          <xsl:when test="$passivetex.extensions != '0'">
-            <fotex:sort xmlns:fotex="http://www.tug.org/fotex">
-              <xsl:copy-of select="$page-number-citations"/>
-            </fotex:sort>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:copy-of select="$page-number-citations"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:if test="$refs[not(secondary)]/*[self::see]">
-      <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &sep;, &sep;, see))[&scope;][1])]"
-                           mode="index-see">
-         <xsl:with-param name="scope" select="$scope"/>
-         <xsl:with-param name="role" select="$role"/>
-         <xsl:with-param name="type" select="$type"/>
-         <xsl:sort select="translate(see, &lowercase;, &uppercase;)"/>
-      </xsl:apply-templates>
-    </xsl:if>
-
-  </fo:block>
-
-  <xsl:if test="$refs/secondary or $refs[not(secondary)]/*[self::seealso]">
-    <fo:block start-indent="1pc">
-      <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(&primary;, &sep;, &sep;, &sep;, seealso))[&scope;][1])]"
-                           mode="index-seealso">
-         <xsl:with-param name="scope" select="$scope"/>
-         <xsl:with-param name="role" select="$role"/>
-         <xsl:with-param name="type" select="$type"/>
-         <xsl:sort select="translate(seealso, &lowercase;, &uppercase;)"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates select="$refs[secondary and count(.|key('secondary', concat($key, &sep;, &secondary;))[&scope;][1]) = 1]"
-                           mode="index-secondary">
-       <xsl:with-param name="scope" select="$scope"/>
-       <xsl:with-param name="role" select="$role"/>
-       <xsl:with-param name="type" select="$type"/>
-       <xsl:sort select="translate(&secondary;, &lowercase;, &uppercase;)"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-secondary">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:variable name="key" select="concat(&primary;, &sep;, &secondary;)"/>
-  <xsl:variable name="refs" select="key('secondary', $key)[&scope;]"/>
-
-  <xsl:variable name="term.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.term.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="range.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.range.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="number.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.number.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <fo:block>
-    <xsl:if test="$axf.extensions != 0">
-      <xsl:attribute name="axf:suppress-duplicate-page-number">true</xsl:attribute>
-    </xsl:if>
-    <xsl:value-of select="secondary"/>
-
-    <xsl:choose>
-      <xsl:when test="$xep.extensions != 0">
-        <xsl:if test="$refs[not(see) and not(tertiary)]">
-          <xsl:copy-of select="$term.separator"/>
-          <xsl:variable name="primary" select="&primary;"/>
-          <xsl:variable name="secondary" select="&secondary;"/>
-          <xsl:variable name="primary.significant" select="concat(&primary;, $significant.flag)"/>
-          <rx:page-index list-separator="{$number.separator}"
-                         range-separator="{$range.separator}">
-            <xsl:if test="$refs[@significance='preferred'][not(see) and not(tertiary)]">
-              <rx:index-item xsl:use-attribute-sets="index.preferred.page.properties xep.index.item.properties">
-                <xsl:attribute name="ref-key">
-                  <xsl:value-of select="$primary.significant"/>
-                  <xsl:text>, </xsl:text>
-                  <xsl:value-of select="$secondary"/>
-                </xsl:attribute>
-              </rx:index-item>
-            </xsl:if>
-            <xsl:if test="$refs[not(@significance) or @significance!='preferred'][not(see) and not(tertiary)]">
-              <rx:index-item xsl:use-attribute-sets="xep.index.item.properties">
-                <xsl:attribute name="ref-key">
-                  <xsl:value-of select="$primary"/>
-                  <xsl:text>, </xsl:text>
-                  <xsl:value-of select="$secondary"/>
-                </xsl:attribute>
-              </rx:index-item>
-            </xsl:if>
-          </rx:page-index>
-        </xsl:if>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:variable name="page-number-citations">
-          <xsl:for-each select="$refs[not(see) 
-                                and not(tertiary)]">
-            <xsl:apply-templates select="." mode="reference">
-              <xsl:with-param name="scope" select="$scope"/>
-              <xsl:with-param name="role" select="$role"/>
-              <xsl:with-param name="type" select="$type"/>
-              <xsl:with-param name="position" select="position()"/>
-            </xsl:apply-templates>
-          </xsl:for-each>
-        </xsl:variable>
-
-        <xsl:choose>
-          <xsl:when test="$passivetex.extensions != '0'">
-            <fotex:sort xmlns:fotex="http://www.tug.org/fotex">
-              <xsl:copy-of select="$page-number-citations"/>
-            </fotex:sort>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:copy-of select="$page-number-citations"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:if test="$refs[not(tertiary)]/*[self::see]">
-      <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &secondary;, &sep;, &sep;, see))[&scope;][1])]"
-                           mode="index-see">
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-        <xsl:sort select="translate(see, &lowercase;, &uppercase;)"/>
-      </xsl:apply-templates>
-    </xsl:if>
-
-  </fo:block>
-
-  <xsl:if test="$refs/tertiary or $refs[not(tertiary)]/*[self::seealso]">
-    <fo:block start-indent="2pc">
-      <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(&primary;, &sep;, &secondary;, &sep;, &sep;, seealso))[&scope;][1])]"
-                           mode="index-seealso">
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-          <xsl:sort select="translate(seealso, &lowercase;, &uppercase;)"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates select="$refs[tertiary and count(.|key('tertiary', concat($key, &sep;, &tertiary;))[&scope;][1]) = 1]" 
-                           mode="index-tertiary">
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-          <xsl:sort select="translate(&tertiary;, &lowercase;, &uppercase;)"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-tertiary">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-  <xsl:variable name="key" select="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;)"/>
-  <xsl:variable name="refs" select="key('tertiary', $key)[&scope;]"/>
-
-  <xsl:variable name="term.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.term.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="range.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.range.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="number.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.number.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <fo:block>
-    <xsl:if test="$axf.extensions != 0">
-      <xsl:attribute name="axf:suppress-duplicate-page-number">true</xsl:attribute>
-    </xsl:if>
-    <xsl:value-of select="tertiary"/>
-
-    <xsl:choose>
-      <xsl:when test="$xep.extensions != 0">
-        <xsl:if test="$refs[not(see)]">
-          <xsl:copy-of select="$term.separator"/>
-          <xsl:variable name="primary" select="&primary;"/>
-          <xsl:variable name="secondary" select="&secondary;"/>
-          <xsl:variable name="tertiary" select="&tertiary;"/>
-          <xsl:variable name="primary.significant" select="concat(&primary;, $significant.flag)"/>
-          <rx:page-index list-separator="{$number.separator}"
-                         range-separator="{$range.separator}">
-            <xsl:if test="$refs[@significance='preferred'][not(see)]">
-              <rx:index-item xsl:use-attribute-sets="index.preferred.page.properties xep.index.item.properties">
-                <xsl:attribute name="ref-key">
-                  <xsl:value-of select="$primary.significant"/>
-                  <xsl:text>, </xsl:text>
-                  <xsl:value-of select="$secondary"/>
-                  <xsl:text>, </xsl:text>
-                  <xsl:value-of select="$tertiary"/>
-                </xsl:attribute>
-              </rx:index-item>
-            </xsl:if>
-            <xsl:if test="$refs[not(@significance) or @significance!='preferred'][not(see)]">
-              <rx:index-item xsl:use-attribute-sets="xep.index.item.properties">
-                <xsl:attribute name="ref-key">
-                  <xsl:value-of select="$primary"/>
-                  <xsl:text>, </xsl:text>
-                  <xsl:value-of select="$secondary"/>
-                  <xsl:text>, </xsl:text>
-                  <xsl:value-of select="$tertiary"/>
-                </xsl:attribute>
-              </rx:index-item>
-            </xsl:if>
-          </rx:page-index>
-        </xsl:if>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:variable name="page-number-citations">
-          <xsl:for-each select="$refs[not(see)]">
-            <xsl:apply-templates select="." mode="reference">
-              <xsl:with-param name="scope" select="$scope"/>
-              <xsl:with-param name="role" select="$role"/>
-              <xsl:with-param name="type" select="$type"/>
-              <xsl:with-param name="position" select="position()"/>
-            </xsl:apply-templates>
-          </xsl:for-each>
-        </xsl:variable>
-
-        <xsl:choose>
-          <xsl:when test="$passivetex.extensions != '0'">
-            <fotex:sort xmlns:fotex="http://www.tug.org/fotex">
-              <xsl:copy-of select="$page-number-citations"/>
-            </fotex:sort>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:copy-of select="$page-number-citations"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:if test="$refs/see">
-      <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, see))[&scope;][1])]"
-                           mode="index-see">
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-        <xsl:sort select="translate(see, &lowercase;, &uppercase;)"/>
-      </xsl:apply-templates>
-    </xsl:if>
-
-  </fo:block>
-
-  <xsl:if test="$refs/seealso">
-    <fo:block>
-      <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, seealso))[&scope;][1])]"
-                           mode="index-seealso">
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-        <xsl:sort select="translate(seealso, &lowercase;, &uppercase;)"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="reference">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-  <xsl:param name="position" select="0"/>
-  <xsl:param name="separator" select="''"/>
-
-  <xsl:variable name="term.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.term.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="range.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.range.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="number.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.number.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$separator != ''">
-      <xsl:value-of select="$separator"/>
-    </xsl:when>
-    <xsl:when test="$position = 1">
-      <xsl:value-of select="$term.separator"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$number.separator"/>
-    </xsl:otherwise>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="@zone and string(@zone)">
-      <xsl:call-template name="reference">
-        <xsl:with-param name="zones" select="normalize-space(@zone)"/>
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="ancestor::*[contains(local-name(),'info') and not(starts-with(local-name(),'info'))]">
-      <xsl:call-template name="info.reference">
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:variable>
-
-      <fo:basic-link internal-destination="{$id}"
-                     xsl:use-attribute-sets="index.page.number.properties">
-        <fo:page-number-citation ref-id="{$id}"/>
-      </fo:basic-link>
-
-      <xsl:if test="key('endofrange', $id)[&scope;]">
-        <xsl:apply-templates select="key('endofrange', $id)[&scope;][last()]"
-                             mode="reference">
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-          <xsl:with-param name="separator" select="$range.separator"/>
-        </xsl:apply-templates>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="reference">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-  <xsl:param name="zones"/>
-
-  <xsl:variable name="number.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.number.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="contains($zones, ' ')">
-      <xsl:variable name="zone" select="substring-before($zones, ' ')"/>
-      <xsl:variable name="target" select="key('id', $zone)[&scope;]"/>
-
-      <xsl:variable name="id">
-        <xsl:call-template name="object.id">
-           <xsl:with-param name="object" select="$target[1]"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <fo:basic-link internal-destination="{$id}"
-                     xsl:use-attribute-sets="index.page.number.properties">
-        <fo:page-number-citation ref-id="{$id}"/>
-      </fo:basic-link>
-
-      <xsl:if test="$passivetex.extensions = '0'">
-        <xsl:copy-of select="$number.separator"/>
-      </xsl:if>
-      <xsl:call-template name="reference">
-        <xsl:with-param name="zones" select="substring-after($zones, ' ')"/>
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="zone" select="$zones"/>
-      <xsl:variable name="target" select="key('id', $zone)[&scope;]"/>
-
-      <xsl:variable name="id">
-        <xsl:call-template name="object.id">
-          <xsl:with-param name="object" select="$target[1]"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <fo:basic-link internal-destination="{$id}"
-                     xsl:use-attribute-sets="index.page.number.properties">
-        <fo:page-number-citation ref-id="{$id}"/>
-      </fo:basic-link>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="info.reference">
-  <!-- This is not perfect. It doesn't treat indexterm inside info element as a range covering whole parent of info.
-       It also not work when there is no ID generated for parent element. But it works in the most common cases. -->
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:variable name="target" select="(ancestor::appendix|ancestor::article|ancestor::bibliography|ancestor::book|
-                                       ancestor::chapter|ancestor::glossary|ancestor::part|ancestor::preface|
-                                       ancestor::refentry|ancestor::reference|ancestor::refsect1|ancestor::refsect2|
-                                       ancestor::refsect3|ancestor::refsection|ancestor::refsynopsisdiv|
-                                       ancestor::sect1|ancestor::sect2|ancestor::sect3|ancestor::sect4|ancestor::sect5|
-                                       ancestor::section|ancestor::setindex|ancestor::set|ancestor::sidebar)[&scope;]"/>
-  
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$target[1]"/>
-    </xsl:call-template>
-  </xsl:variable>
-  
-  <fo:basic-link internal-destination="{$id}"
-                 xsl:use-attribute-sets="index.page.number.properties">
-    <fo:page-number-citation ref-id="{$id}"/>
-  </fo:basic-link>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-see">
-   <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-   <fo:inline>
-     <xsl:text> (</xsl:text>
-     <xsl:call-template name="gentext">
-       <xsl:with-param name="key" select="'see'"/>
-     </xsl:call-template>
-     <xsl:text> </xsl:text>
-     <xsl:value-of select="see"/>
-     <xsl:text>)</xsl:text>
-   </fo:inline>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-seealso">
-   <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:for-each select="seealso">
-    <xsl:sort select="translate(., &lowercase;, &uppercase;)"/>
-    <fo:block>
-      <xsl:text>(</xsl:text>
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'seealso'"/>
-      </xsl:call-template>
-      <xsl:text> </xsl:text>
-      <xsl:value-of select="."/>
-      <xsl:text>)</xsl:text>
-    </fo:block>
-  </xsl:for-each>
-
-</xsl:template>
-
-<!-- ====================================================================== -->
-
-<xsl:template name="generate-index-markup">
-  <xsl:param name="scope" select="(ancestor::book|/)[last()]"/>
-  <xsl:param name="role" select="@role"/>
-  <xsl:param name="type" select="@type"/>
-
-  <xsl:variable name="terms" select="$scope//indexterm[count(.|key('letter',
-                                     translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;))[&scope;][1]) = 1]"/>
-  <xsl:variable name="alphabetical"
-                select="$terms[contains(concat(&lowercase;, &uppercase;),
-                                        substring(&primary;, 1, 1))]"/>
-  <xsl:variable name="others" select="$terms[not(contains(concat(&lowercase;,
-                                                 &uppercase;),
-                                             substring(&primary;, 1, 1)))]"/>
-
-  <xsl:text>&lt;index&gt;&#10;</xsl:text>
-  <xsl:if test="$others">
-    <xsl:text>&#10;&lt;indexdiv&gt;&#10;</xsl:text>
-    <xsl:text>&lt;title&gt;</xsl:text>
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="'index symbols'"/>
-    </xsl:call-template>
-    <xsl:text>&lt;/title&gt;&#10;</xsl:text>
-    <xsl:apply-templates select="$others[count(.|key('primary',
-                                 &primary;)[&scope;][1]) = 1]"
-                         mode="index-symbol-div-markup">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/>
-    </xsl:apply-templates>
-    <xsl:text>&lt;/indexdiv&gt;&#10;</xsl:text>
-  </xsl:if>
-
-  <xsl:apply-templates select="$alphabetical[count(.|key('letter',
-                               translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;))[&scope;][1]) = 1]"
-                       mode="index-div-markup">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/>
-  </xsl:apply-templates>
-  <xsl:text>&lt;/index&gt;&#10;</xsl:text>
-</xsl:template>
-
-<xsl:template match="*" mode="index-markup">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:text>&lt;</xsl:text>
-  <xsl:value-of select="local-name(.)"/>
-  <xsl:text>&gt;&#10;</xsl:text>
-  <xsl:apply-templates mode="index-markup">
-    <xsl:with-param name="scope" select="$scope"/>
-    <xsl:with-param name="role" select="$role"/>
-    <xsl:with-param name="type" select="$type"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-div-markup">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-  <xsl:variable name="key" select="translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;)"/>
-  <xsl:text>&#10;&lt;indexdiv&gt;&#10;</xsl:text>
-  <xsl:text>&lt;title&gt;</xsl:text>
-  <xsl:value-of select="translate($key, &lowercase;, &uppercase;)"/>
-  <xsl:text>&lt;/title&gt;&#10;</xsl:text>
-
-  <xsl:apply-templates select="key('letter', $key)[&scope;][count(.|key('primary', &primary;)[&scope;][1]) = 1]"
-                       mode="index-primary-markup">
-    <xsl:with-param name="scope" select="$scope"/>
-    <xsl:with-param name="role" select="$role"/>
-    <xsl:with-param name="type" select="$type"/>
-    <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/>
-  </xsl:apply-templates>
-  <xsl:text>&lt;/indexdiv&gt;&#10;</xsl:text>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-symbol-div-markup">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-  <xsl:variable name="key" select="translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;)"/>
-
-  <xsl:apply-templates select="key('letter', $key)[&scope;][count(.|key('primary', &primary;)[&scope;][1]) = 1]"
-                       mode="index-primary-markup">
-    <xsl:with-param name="scope" select="$scope"/>
-    <xsl:with-param name="role" select="$role"/>
-    <xsl:with-param name="type" select="$type"/>
-    <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-primary-markup">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-  <xsl:variable name="key" select="&primary;"/>
-  <xsl:variable name="refs" select="key('primary', $key)[&scope;]"/>
-  <xsl:variable name="pages" select="$refs[not(see) and not(seealso)]"/>
-
-  <xsl:text>&#10;&lt;indexentry&gt;&#10;</xsl:text>
-  <xsl:text>&lt;primaryie&gt;</xsl:text>
-  <xsl:text>&lt;phrase&gt;</xsl:text>
-  <xsl:call-template name="escape-text">
-    <xsl:with-param name="text" select="string(primary)"/>
-  </xsl:call-template>
-  <xsl:text>&lt;/phrase&gt;</xsl:text>
-  <xsl:if test="$pages">,</xsl:if>
-  <xsl:text>&#10;</xsl:text>
-
-  <xsl:for-each select="$pages">
-    <xsl:apply-templates select="." mode="reference-markup">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-    </xsl:apply-templates>
-  </xsl:for-each>
-
-  <xsl:text>&lt;/primaryie&gt;&#10;</xsl:text>
-
-  <xsl:if test="$refs/secondary or $refs[not(secondary)]/*[self::see or self::seealso]">
-    <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &sep;, &sep;, see))[&scope;][1])]"
-                         mode="index-see-markup">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort select="translate(see, &lowercase;, &uppercase;)"/>
-    </xsl:apply-templates>
-
-    <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(&primary;, &sep;, &sep;, &sep;, seealso))[&scope;][1])]"
-                         mode="index-seealso-markup">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort select="translate(seealso, &lowercase;, &uppercase;)"/>
-    </xsl:apply-templates>
-
-    <xsl:apply-templates select="$refs[secondary and count(.|key('secondary', concat($key, &sep;, &secondary;))[&scope;][1]) = 1]" 
-                         mode="index-secondary-markup">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort select="translate(&secondary;, &lowercase;, &uppercase;)"/>
-    </xsl:apply-templates>
-  </xsl:if>
-  <xsl:text>&lt;/indexentry&gt;&#10;</xsl:text>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-secondary-markup">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-  <xsl:variable name="key" select="concat(&primary;, &sep;, &secondary;)"/>
-  <xsl:variable name="refs" select="key('secondary', $key)[&scope;]"/>
-  <xsl:variable name="pages" select="$refs[not(see) and not(seealso)]"/>
-
-  <xsl:text>&lt;secondaryie&gt;</xsl:text>
-  <xsl:text>&lt;phrase&gt;</xsl:text>
-  <xsl:call-template name="escape-text">
-    <xsl:with-param name="text" select="string(secondary)"/>
-  </xsl:call-template>
-  <xsl:text>&lt;/phrase&gt;</xsl:text>
-  <xsl:if test="$pages">,</xsl:if>
-  <xsl:text>&#10;</xsl:text>
-
-  <xsl:for-each select="$pages">
-    <xsl:apply-templates select="." mode="reference-markup">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-    </xsl:apply-templates>
-  </xsl:for-each>
-
-  <xsl:text>&lt;/secondaryie&gt;&#10;</xsl:text>
-
-  <xsl:if test="$refs/tertiary or $refs[not(tertiary)]/*[self::see or self::seealso]">
-    <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &secondary;, &sep;, &sep;, see))[&scope;][1])]"
-                         mode="index-see-markup">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort select="translate(see, &lowercase;, &uppercase;)"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(&primary;, &sep;, &secondary;, &sep;, &sep;, seealso))[&scope;][1])]"
-                         mode="index-seealso-markup">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort select="translate(seealso, &lowercase;, &uppercase;)"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates select="$refs[tertiary and count(.|key('tertiary', concat($key, &sep;, &tertiary;))[&scope;][1]) = 1]" 
-                         mode="index-tertiary-markup">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort select="translate(&tertiary;, &lowercase;, &uppercase;)"/>
-    </xsl:apply-templates>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-tertiary-markup">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-  <xsl:variable name="key" select="concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;)"/>
-  <xsl:variable name="refs" select="key('tertiary', $key)[&scope;]"/>
-  <xsl:variable name="pages" select="$refs[not(see) and not(seealso)]"/>
-
-  <xsl:text>&lt;tertiaryie&gt;</xsl:text>
-  <xsl:text>&lt;phrase&gt;</xsl:text>
-  <xsl:call-template name="escape-text">
-    <xsl:with-param name="text" select="string(tertiary)"/>
-  </xsl:call-template>
-  <xsl:text>&lt;/phrase&gt;</xsl:text>
-  <xsl:if test="$pages">,</xsl:if>
-  <xsl:text>&#10;</xsl:text>
-
-  <xsl:for-each select="$pages">
-    <xsl:apply-templates select="." mode="reference-markup">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-    </xsl:apply-templates>
-  </xsl:for-each>
-
-  <xsl:text>&lt;/tertiaryie&gt;&#10;</xsl:text>
-
-  <xsl:variable name="see" select="$refs/see | $refs/seealso"/>
-  <xsl:if test="$see">
-    <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, see))[&scope;][1])]"
-                         mode="index-see-markup">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort select="translate(see, &lowercase;, &uppercase;)"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(&primary;, &sep;, &secondary;, &sep;, &tertiary;, &sep;, seealso))[&scope;][1])]"
-                         mode="index-seealso-markup">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort select="translate(seealso, &lowercase;, &uppercase;)"/>
-    </xsl:apply-templates>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="reference-markup">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:choose>
-    <xsl:when test="@zone and string(@zone)">
-      <xsl:call-template name="reference-markup">
-        <xsl:with-param name="zones" select="normalize-space(@zone)"/>
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:variable>
-
-
-      <xsl:choose>
-        <xsl:when test="@startref and @class='endofrange'">
-          <xsl:text>&lt;phrase role="pageno"&gt;</xsl:text>
-          <xsl:text>&lt;link linkend="</xsl:text>
-          <xsl:value-of select="@startref"/>
-          <xsl:text>"&gt;</xsl:text>
-          <fo:basic-link internal-destination="{@startref}"
-                     xsl:use-attribute-sets="index.page.number.properties">
-            <fo:page-number-citation ref-id="{@startref}"/>
-            <xsl:text>-</xsl:text>
-            <fo:page-number-citation ref-id="{$id}"/>
-          </fo:basic-link>
-          <xsl:text>&lt;/link&gt;</xsl:text>
-          <xsl:text>&lt;/phrase&gt;&#10;</xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>&lt;phrase role="pageno"&gt;</xsl:text>
-          <xsl:if test="$id">
-            <xsl:text>&lt;link linkend="</xsl:text>
-            <xsl:value-of select="$id"/>
-            <xsl:text>"&gt;</xsl:text>
-          </xsl:if>
-          <fo:basic-link internal-destination="{$id}"
-                     xsl:use-attribute-sets="index.page.number.properties">
-            <fo:page-number-citation ref-id="{$id}"/>
-          </fo:basic-link>
-          <xsl:if test="$id">
-            <xsl:text>&lt;/link&gt;</xsl:text>
-          </xsl:if>
-          <xsl:text>&lt;/phrase&gt;&#10;</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="reference-markup">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-  <xsl:param name="zones"/>
-  <xsl:choose>
-    <xsl:when test="contains($zones, ' ')">
-      <xsl:variable name="zone" select="substring-before($zones, ' ')"/>
-      <xsl:variable name="target" select="key('id', $zone)[&scope;]"/>
-
-      <xsl:variable name="id">
-        <xsl:call-template name="object.id">
-          <xsl:with-param name="object" select="$target[1]"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:text>&lt;phrase fole="pageno"&gt;</xsl:text>
-      <xsl:if test="$target[1]/@id or $target[1]/@xml:id">
-        <xsl:text>&lt;link linkend="</xsl:text>
-        <xsl:value-of select="$id"/>
-        <xsl:text>"&gt;</xsl:text>
-      </xsl:if>
-      <fo:basic-link internal-destination="{$id}"
-                     xsl:use-attribute-sets="index.page.number.properties">
-        <fo:page-number-citation ref-id="{$id}"/>
-      </fo:basic-link>
-      <xsl:if test="$target[1]/@id or $target[1]/@xml:id">
-        <xsl:text>&lt;/link&gt;</xsl:text>
-      </xsl:if>
-      <xsl:text>&lt;/phrase&gt;&#10;</xsl:text>
-
-      <xsl:call-template name="reference">
-        <xsl:with-param name="zones" select="substring-after($zones, ' ')"/>
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="zone" select="$zones"/>
-      <xsl:variable name="target" select="key('id', $zone)[&scope;]"/>
-
-      <xsl:variable name="id">
-        <xsl:call-template name="object.id">
-          <xsl:with-param name="object" select="$target[1]"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:text>&lt;phrase role="pageno"&gt;</xsl:text>
-      <xsl:if test="$target[1]/@id or target[1]/@xml:id">
-        <xsl:text>&lt;link linkend="</xsl:text>
-        <xsl:value-of select="$id"/>
-        <xsl:text>"&gt;</xsl:text>
-      </xsl:if>
-      <fo:basic-link internal-destination="{$id}"
-                     xsl:use-attribute-sets="index.page.number.properties">
-        <fo:page-number-citation ref-id="{$id}"/>
-      </fo:basic-link>
-      <xsl:if test="$target[1]/@id or target[1]/@xml:id">
-        <xsl:text>&lt;/link&gt;</xsl:text>
-      </xsl:if>
-      <xsl:text>&lt;/phrase&gt;&#10;</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-see-markup">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-  <fo:block>
-    <xsl:text>&lt;seeie&gt;</xsl:text>
-    <xsl:text>&lt;phrase&gt;</xsl:text>
-    <xsl:call-template name="escape-text">
-      <xsl:with-param name="text" select="string(see)"/>
-    </xsl:call-template>
-    <xsl:text>&lt;/phrase&gt;</xsl:text>
-    <xsl:text>&lt;/seeie&gt;&#10;</xsl:text>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-seealso-markup">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-  <fo:block>
-    <xsl:text>&lt;seealsoie&gt;</xsl:text>
-    <xsl:text>&lt;phrase&gt;</xsl:text>
-    <xsl:call-template name="escape-text">
-      <xsl:with-param name="text" select="string(seealso)"/>
-    </xsl:call-template>
-    <xsl:text>&lt;/phrase&gt;</xsl:text>
-    <xsl:text>&lt;/seealsoie&gt;&#10;</xsl:text>
-  </fo:block>
-</xsl:template>
-
-<xsl:template name="escape-text">
-  <xsl:param name="text" select="''"/>
-
-  <xsl:variable name="ltpos" select="substring-before($text, '&lt;')"/>
-  <xsl:variable name="amppos" select="substring-before($text, '&amp;')"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($text,'&lt;') and contains($text, '&amp;')
-                    and string-length($ltpos) &lt; string-length($amppos)">
-      <xsl:value-of select="$ltpos"/>
-      <xsl:text>&amp;lt;</xsl:text>
-      <xsl:call-template name="escape-text">
-        <xsl:with-param name="text" select="substring-after($text, '&lt;')"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:when test="contains($text,'&lt;') and contains($text, '&amp;')
-                    and string-length($amppos) &lt; string-length($ltpos)">
-      <xsl:value-of select="$amppos"/>
-      <xsl:text>&amp;amp;</xsl:text>
-      <xsl:call-template name="escape-text">
-        <xsl:with-param name="text" select="substring-after($text, '&amp;')"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:when test="contains($text, '&lt;')">
-      <xsl:value-of select="$ltpos"/>
-      <xsl:text>&amp;lt;</xsl:text>
-      <xsl:call-template name="escape-text">
-        <xsl:with-param name="text" select="substring-after($text, '&lt;')"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:when test="contains($text, '&amp;')">
-      <xsl:value-of select="$amppos"/>
-      <xsl:text>&amp;amp;</xsl:text>
-      <xsl:call-template name="escape-text">
-        <xsl:with-param name="text" select="substring-after($text, '&amp;')"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:value-of select="$text"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="index.separator">
-  <xsl:param name="key" select="''"/>
-  <xsl:param name="lang">
-    <xsl:call-template name="l10n.language"/>
-  </xsl:param>
-
-  <xsl:choose>
-    <xsl:when test="$key = 'index.term.separator'">
-      <xsl:choose>
-        <!-- Use the override if not blank -->
-        <xsl:when test="$index.term.separator != ''">
-          <xsl:copy-of select="$index.term.separator"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="gentext.template">
-            <xsl:with-param name="lang" select="$lang"/>
-            <xsl:with-param name="context">index</xsl:with-param>
-            <xsl:with-param name="name">term-separator</xsl:with-param>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="$key = 'index.number.separator'">
-      <xsl:choose>
-        <!-- Use the override if not blank -->
-        <xsl:when test="$index.number.separator != ''">
-          <xsl:copy-of select="$index.number.separator"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="gentext.template">
-            <xsl:with-param name="lang" select="$lang"/>
-            <xsl:with-param name="context">index</xsl:with-param>
-            <xsl:with-param name="name">number-separator</xsl:with-param>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="$key = 'index.range.separator'">
-      <xsl:choose>
-        <!-- Use the override if not blank -->
-        <xsl:when test="$index.range.separator != ''">
-          <xsl:copy-of select="$index.range.separator"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="gentext.template">
-            <xsl:with-param name="lang" select="$lang"/>
-            <xsl:with-param name="context">index</xsl:with-param>
-            <xsl:with-param name="name">range-separator</xsl:with-param>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autotoc.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/autotoc.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,855 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:axf="http://www.antennahouse.com/names/XSL/Extensions"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template name="set.toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="nodes" select="book|setindex"/>
-
-  <xsl:if test="$nodes">
-    <fo:block id="toc...{$id}"
-              xsl:use-attribute-sets="toc.margin.properties">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:attribute name="axf:outline-level">1</xsl:attribute>
-        <xsl:attribute name="axf:outline-expand">false</xsl:attribute>
-        <xsl:attribute name="axf:outline-title">
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'TableofContents'"/>
-          </xsl:call-template>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:call-template name="table.of.contents.titlepage"/>
-      <xsl:apply-templates select="$nodes" mode="toc">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="division.toc">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:param name="toc.title.p" select="true()"/>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="nodes"
-                select="$toc-context/part
-                        |$toc-context/reference
-                        |$toc-context/preface
-                        |$toc-context/chapter
-                        |$toc-context/appendix
-                        |$toc-context/article
-                        |$toc-context/bibliography
-                        |$toc-context/glossary
-                        |$toc-context/index"/>
-
-  <xsl:if test="$nodes">
-    <fo:block id="toc...{$cid}"
-              xsl:use-attribute-sets="toc.margin.properties">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:attribute name="axf:outline-level">1</xsl:attribute>
-        <xsl:attribute name="axf:outline-expand">false</xsl:attribute>
-        <xsl:attribute name="axf:outline-title">
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'TableofContents'"/>
-          </xsl:call-template>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:if test="$toc.title.p">
-        <xsl:call-template name="table.of.contents.titlepage"/>
-      </xsl:if>
-      <xsl:apply-templates select="$nodes" mode="toc">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="component.toc">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:param name="toc.title.p" select="true()"/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="nodes" select="section|sect1|refentry
-                                     |article|bibliography|glossary
-                                     |qandaset[$qanda.in.toc != 0]
-                                     |appendix|index"/>
-  <xsl:if test="$nodes">
-    <fo:block id="toc...{$id}"
-              xsl:use-attribute-sets="toc.margin.properties">
-      <xsl:if test="$toc.title.p">
-        <xsl:call-template name="table.of.contents.titlepage"/>
-      </xsl:if>
-      <xsl:apply-templates select="$nodes" mode="toc">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="component.toc.separator">
-  <!-- Customize to output something between
-       component.toc and first output -->
-</xsl:template>
-
-<xsl:template name="section.toc">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:param name="toc.title.p" select="true()"/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="nodes"
-                select="section|sect1|sect2|sect3|sect4|sect5|refentry
-                        |qandaset[$qanda.in.toc != 0]
-                        |bridgehead[$bridgehead.in.toc != 0]"/>
-
-  <xsl:variable name="level">
-    <xsl:call-template name="section.level"/>
-  </xsl:variable>
-
-  <xsl:if test="$nodes">
-    <fo:block id="toc...{$id}"
-              xsl:use-attribute-sets="toc.margin.properties">
-
-      <xsl:if test="$toc.title.p">
-        <xsl:call-template name="section.heading">
-          <xsl:with-param name="level" select="$level + 1"/>
-          <xsl:with-param name="title">
-            <fo:block space-after="0.5em">
-              <xsl:call-template name="gentext">
-                <xsl:with-param name="key" select="'TableofContents'"/>
-              </xsl:call-template>
-            </fo:block>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-
-      <xsl:apply-templates select="$nodes" mode="toc">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="section.toc.separator">
-  <!-- Customize to output something between
-       section.toc and first output -->
-</xsl:template>
-<!-- ==================================================================== -->
-
-<xsl:template name="toc.line">
-  <xsl:param name="toc-context" select="NOTANODE"/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="label">
-    <xsl:apply-templates select="." mode="label.markup"/>
-  </xsl:variable>
-
-  <fo:block xsl:use-attribute-sets="toc.line.properties">
-    <fo:inline keep-with-next.within-line="always">
-      <fo:basic-link internal-destination="{$id}">
-        <xsl:if test="$label != ''">
-          <xsl:copy-of select="$label"/>
-          <xsl:value-of select="$autotoc.label.separator"/>
-        </xsl:if>
-        <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-      </fo:basic-link>
-    </fo:inline>
-    <fo:inline keep-together.within-line="always">
-      <xsl:text> </xsl:text>
-      <fo:leader leader-pattern="dots"
-                 leader-pattern-width="3pt"
-                 leader-alignment="reference-area"
-                 keep-with-next.within-line="always"/>
-      <xsl:text> </xsl:text> 
-      <fo:basic-link internal-destination="{$id}">
-        <fo:page-number-citation ref-id="{$id}"/>
-      </fo:basic-link>
-    </fo:inline>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<xsl:template name="qandaset.toc">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:param name="toc.title.p" select="true()"/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="nodes" select="qandadiv|qandaentry"/>
-
-  <xsl:if test="$nodes">
-    <fo:block id="toc...{$id}"
-              xsl:use-attribute-sets="toc.margin.properties">
-      <xsl:if test="$toc.title.p">
-        <xsl:call-template name="table.of.contents.titlepage"/>
-      </xsl:if>
-      <xsl:apply-templates select="$nodes" mode="toc">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="qandaset.toc.separator">
-  <!-- Customize to output something between
-       qandaset.toc and first output -->
-</xsl:template>
-
-<xsl:template match="qandadiv" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="toc.line">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-
-  <xsl:variable name="nodes" select="qandadiv|qandaentry"/>
-
-  <xsl:if test="$nodes">
-    <fo:block id="toc.{$cid}.{$id}">
-      <xsl:attribute name="margin-left">
-        <xsl:call-template name="set.toc.indent"/>
-      </xsl:attribute>
-
-      <xsl:apply-templates select="$nodes" mode="toc">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="qandaentry" mode="toc">
-  <xsl:apply-templates select="question" mode="toc"/>
-</xsl:template>
-
-<xsl:template match="question" mode="toc">
-  <xsl:variable name="firstchunk">
-    <xsl:apply-templates select="(*[local-name(.)!='label'])[1]/node()"/>
-  </xsl:variable>
-
-  <xsl:variable name="deflabel">
-    <xsl:choose>
-      <xsl:when test="ancestor-or-self::*[@defaultlabel]">
-        <xsl:value-of select="(ancestor-or-self::*[@defaultlabel])[last()]
-                              /@defaultlabel"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$qanda.defaultlabel"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="label">
-    <xsl:apply-templates select="." mode="label.markup"/>
-  </xsl:variable>
-
-  <fo:block xsl:use-attribute-sets="toc.line.properties"
-	    margin-left="3em"
-	    text-indent="-3em"
-            end-indent="{$toc.indent.width}pt"
-            last-line-end-indent="-{$toc.indent.width}pt">
-    <fo:inline keep-with-next.within-line="always">
-      <fo:basic-link internal-destination="{$id}">
-        <xsl:if test="$label != ''">
-          <xsl:copy-of select="$label"/>
-          <xsl:if test="$deflabel = 'number' and not(label)">
-            <xsl:value-of select="$autotoc.label.separator"/>
-          </xsl:if>
-	  <xsl:text> </xsl:text>
-        </xsl:if>
-        <xsl:copy-of select="$firstchunk"/>
-      </fo:basic-link>
-    </fo:inline>
-    <fo:inline keep-together.within-line="always">
-      <xsl:text> </xsl:text>
-      <fo:leader leader-pattern="dots"
-                 leader-pattern-width="3pt"
-                 leader-alignment="reference-area"
-                 keep-with-next.within-line="always"/>
-      <xsl:text> </xsl:text> 
-      <fo:basic-link internal-destination="{$id}">
-        <fo:page-number-citation ref-id="{$id}"/>
-      </fo:basic-link>
-    </fo:inline>
-  </fo:block>
-
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="book|setindex" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="toc.line">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-
-  <xsl:variable name="nodes" select="glossary|bibliography|preface|chapter
-                                     |reference|part|article|appendix|index"/>
-
-  <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:if test="$toc.section.depth > 0 
-                and $toc.max.depth > $depth.from.context
-                and $nodes">
-    <fo:block id="toc.{$cid}.{$id}">
-      <xsl:attribute name="margin-left">
-        <xsl:call-template name="set.toc.indent"/>
-      </xsl:attribute>
-
-      <xsl:apply-templates select="$nodes" mode="toc">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="part" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="toc.line">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-
-  <xsl:variable name="nodes" select="chapter|appendix|preface|reference|
-                                     refentry|article|index|glossary|
-                                     bibliography"/>
-
-  <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:if test="$toc.section.depth > 0 
-                and $toc.max.depth > $depth.from.context
-                and $nodes">
-    <fo:block id="toc.{$cid}.{$id}">
-      <xsl:attribute name="margin-left">
-        <xsl:call-template name="set.toc.indent"/>
-      </xsl:attribute>
-      
-      <xsl:apply-templates select="$nodes" mode="toc">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="reference" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:call-template name="toc.line">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-
-  <xsl:if test="$toc.section.depth > 0
-                and $toc.max.depth > $depth.from.context
-                and refentry">
-    <fo:block id="toc.{$cid}.{$id}">
-      <xsl:attribute name="margin-left">
-        <xsl:call-template name="set.toc.indent"/>
-      </xsl:attribute>
-              
-      <xsl:apply-templates select="refentry" mode="toc">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="refentry" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:call-template name="toc.line">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="preface|chapter|appendix|article"
-              mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="toc.line">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-
-  <xsl:variable name="nodes" select="section|sect1
-                                     |qandaset[$qanda.in.toc != 0]
-                                     |simplesect[$simplesect.in.toc != 0]
-                                     |refentry|appendix"/>
-
-  <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:if test="$toc.section.depth > 0 
-                and $toc.max.depth > $depth.from.context
-                and $nodes">
-    <fo:block id="toc.{$cid}.{$id}">
-      <xsl:attribute name="margin-left">
-        <xsl:call-template name="set.toc.indent"/>
-      </xsl:attribute>
-              
-      <xsl:apply-templates select="$nodes" mode="toc">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="sect1" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="toc.line">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-
-  <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:if test="$toc.section.depth > 1 
-                and $toc.max.depth > $depth.from.context
-                and sect2">
-    <fo:block id="toc.{$cid}.{$id}">
-      <xsl:attribute name="margin-left">
-        <xsl:call-template name="set.toc.indent"/>
-      </xsl:attribute>
-              
-      <xsl:apply-templates select="sect2|qandaset[$qanda.in.toc != 0]" 
-                           mode="toc">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="sect2" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="toc.line">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-
-  <xsl:variable name="reldepth"
-                select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:if test="$toc.section.depth > 2 
-                and $toc.max.depth > $depth.from.context
-                and sect3">
-    <fo:block id="toc.{$cid}.{$id}">
-      <xsl:attribute name="margin-left">
-        <xsl:call-template name="set.toc.indent">
-          <xsl:with-param name="reldepth" select="$reldepth"/>
-        </xsl:call-template>
-      </xsl:attribute>
-              
-      <xsl:apply-templates select="sect3|qandaset[$qanda.in.toc != 0]" 
-                           mode="toc">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="sect3" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="toc.line">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-
-  <xsl:variable name="reldepth"
-                select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:if test="$toc.section.depth > 3 
-                and $toc.max.depth > $depth.from.context
-                and sect4">
-    <fo:block id="toc.{$cid}.{$id}">
-      <xsl:attribute name="margin-left">
-        <xsl:call-template name="set.toc.indent">
-          <xsl:with-param name="reldepth" select="$reldepth"/>
-        </xsl:call-template>
-      </xsl:attribute>
-              
-      <xsl:apply-templates select="sect4|qandaset[$qanda.in.toc != 0]" 
-                           mode="toc">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="sect4" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="toc.line">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-
-  <xsl:variable name="reldepth"
-                select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:if test="$toc.section.depth > 4 
-                and $toc.max.depth > $depth.from.context
-                and sect5">
-    <fo:block id="toc.{$cid}.{$id}">
-      <xsl:attribute name="margin-left">
-        <xsl:call-template name="set.toc.indent">
-          <xsl:with-param name="reldepth" select="$reldepth"/>
-        </xsl:call-template>
-      </xsl:attribute>
-              
-      <xsl:apply-templates select="sect5|qandaset[$qanda.in.toc != 0]" 
-                           mode="toc">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="sect5|simplesect" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:call-template name="toc.line">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="set.toc.indent">
-  <xsl:param name="reldepth"/>
-
-  <xsl:variable name="depth">
-    <xsl:choose>
-      <xsl:when test="$reldepth != ''">
-        <xsl:value-of select="$reldepth"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="count(ancestor::*)"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$fop.extensions != 0 or $passivetex.extensions != 0">
-       <xsl:value-of select="concat($depth*$toc.indent.width, 'pt')"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="concat($toc.indent.width, 'pt')"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-
-<xsl:template match="section" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="depth" select="count(ancestor::section) + 1"/>
-  <xsl:variable name="reldepth"
-                select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:if test="$toc.section.depth &gt;= $depth">
-    <xsl:call-template name="toc.line">
-      <xsl:with-param name="toc-context" select="$toc-context"/>
-    </xsl:call-template>
-
-    <xsl:if test="$toc.section.depth > $depth 
-                  and $toc.max.depth > $depth.from.context
-                  and section">
-      <fo:block id="toc.{$cid}.{$id}">
-        <xsl:attribute name="margin-left">
-          <xsl:call-template name="set.toc.indent">
-            <xsl:with-param name="reldepth" select="$reldepth"/>
-          </xsl:call-template>
-        </xsl:attribute>
-                
-        <xsl:apply-templates select="section|qandaset[$qanda.in.toc != 0]" 
-                           mode="toc">
-          <xsl:with-param name="toc-context" select="$toc-context"/>
-        </xsl:apply-templates>
-      </fo:block>
-    </xsl:if>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="bibliography|glossary"
-              mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:call-template name="toc.line">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="index" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:if test="* or $generate.index != 0">
-    <xsl:call-template name="toc.line">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="title" mode="toc">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="list.of.titles">
-  <xsl:param name="titles" select="'table'"/>
-  <xsl:param name="nodes" select=".//table"/>
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:if test="$nodes">
-    <fo:block id="lot...{$titles}...{$id}">
-      <xsl:choose>
-        <xsl:when test="$titles='table'">
-          <xsl:call-template name="list.of.tables.titlepage"/>
-        </xsl:when>
-        <xsl:when test="$titles='figure'">
-          <xsl:call-template name="list.of.figures.titlepage"/>
-        </xsl:when>
-        <xsl:when test="$titles='equation'">
-          <xsl:call-template name="list.of.equations.titlepage"/>
-        </xsl:when>
-        <xsl:when test="$titles='example'">
-          <xsl:call-template name="list.of.examples.titlepage"/>
-        </xsl:when>
-        <xsl:when test="$titles='procedure'">
-          <xsl:call-template name="list.of.procedures.titlepage"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="list.of.unknowns.titlepage"/>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="$nodes" mode="toc">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:apply-templates>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="figure|table|example|equation|procedure" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:call-template name="toc.line">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- qandaset handled like a section when qanda.in.toc is set -->
-<xsl:template match="qandaset" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="cid">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="depth" select="count(ancestor::section) + 1"/>
-  <xsl:variable name="reldepth"
-                select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:if test="$toc.section.depth &gt;= $depth">
-    <xsl:call-template name="toc.line">
-      <xsl:with-param name="toc-context" select="$toc-context"/>
-    </xsl:call-template>
-
-    <xsl:if test="$toc.section.depth > $depth 
-                  and $toc.max.depth > $depth.from.context
-                  and (child::qandadiv or child::qandaentry)">
-      <fo:block id="toc.{$cid}.{$id}">
-        <xsl:attribute name="margin-left">
-          <xsl:call-template name="set.toc.indent">
-            <xsl:with-param name="reldepth" select="$reldepth"/>
-          </xsl:call-template>
-        </xsl:attribute>
-                
-        <xsl:apply-templates select="qandadiv|qandaentry" mode="toc">
-          <xsl:with-param name="toc-context" select="$toc-context"/>
-        </xsl:apply-templates>
-      </fo:block>
-    </xsl:if>
-  </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/axf.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/axf.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,110 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:axf="http://www.antennahouse.com/names/XSL/Extensions"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ******************************************************************** -->
-
-<xsl:template name="axf-document-information">
-
-    <xsl:variable name="authors" select="(//author|//editor|
-                                          //corpauthor|//authorgroup)[1]"/>
-    <xsl:if test="$authors">
-      <xsl:variable name="author">
-        <xsl:choose>
-          <xsl:when test="$authors[self::authorgroup]">
-            <xsl:call-template name="person.name.list">
-              <xsl:with-param name="person.list" 
-                 select="$authors/*[self::author|self::corpauthor|
-                               self::othercredit|self::editor]"/>
-            </xsl:call-template>
-          </xsl:when>
-          <xsl:when test="$authors[self::corpauthor]">
-            <xsl:value-of select="$authors"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="person.name">
-              <xsl:with-param name="node" select="$authors"/>
-            </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:element name="axf:document-info">
-        <xsl:attribute name="name">author</xsl:attribute>
-        <xsl:attribute name="value">
-          <xsl:value-of select="normalize-space($author)"/>
-        </xsl:attribute>
-      </xsl:element>
-    </xsl:if>
-
-    <xsl:variable name="title">
-      <xsl:apply-templates select="/*[1]" mode="label.markup"/>
-      <xsl:apply-templates select="/*[1]" mode="title.markup"/>
-    </xsl:variable>
-
-    <!-- * see bug report #1465301 - mzjn -->
-    <axf:document-info name="title">
-      <xsl:attribute name="value">
-        <xsl:value-of select="normalize-space($title)"/>
-      </xsl:attribute>
-    </axf:document-info>
-
-    <xsl:if test="//keyword">
-      <xsl:element name="axf:document-info">
-        <xsl:attribute name="name">keywords</xsl:attribute>
-        <xsl:attribute name="value">
-          <xsl:for-each select="//keyword">
-            <xsl:value-of select="normalize-space(.)"/>
-            <xsl:if test="position() != last()">
-              <xsl:text>, </xsl:text>
-            </xsl:if>
-          </xsl:for-each>
-        </xsl:attribute>
-      </xsl:element>
-    </xsl:if>
-
-    <xsl:if test="//subjectterm">
-      <xsl:element name="axf:document-info">
-        <xsl:attribute name="name">subject</xsl:attribute>
-        <xsl:attribute name="value">
-          <xsl:for-each select="//subjectterm">
-            <xsl:value-of select="normalize-space(.)"/>
-            <xsl:if test="position() != last()">
-              <xsl:text>, </xsl:text>
-            </xsl:if>
-          </xsl:for-each>
-        </xsl:attribute>
-      </xsl:element>
-    </xsl:if>
-
-</xsl:template>
-
-<!-- These properties are added to fo:simple-page-master -->
-<xsl:template name="axf-page-master-properties">
-  <xsl:param name="page.master" select="''"/>
-
-  <xsl:if test="$crop.marks != 0">
-    <xsl:attribute name="axf:printer-marks">crop</xsl:attribute>
-    <xsl:attribute name="axf:bleed"><xsl:value-of
-                          select="$crop.mark.bleed"/></xsl:attribute>
-    <xsl:attribute name="axf:printer-marks-line-width"><xsl:value-of
-                          select="$crop.mark.width"/></xsl:attribute>
-    <xsl:attribute name="axf:crop-offset"><xsl:value-of
-                          select="$crop.mark.offset"/></xsl:attribute>
-  </xsl:if>
-
-  <xsl:call-template name="user-axf-page-master-properties">
-    <xsl:with-param name="page.master" select="$page.master"/>
-  </xsl:call-template>
-
-</xsl:template>
-
-<xsl:template name="user-axf-page-master-properties">
-  <xsl:param name="page.master" select="''"/>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/biblio-iso690.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/biblio-iso690.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,1300 +1,0 @@
-<?xml version="1.0" encoding="windows-1250"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     The original code for processing bibliography in ISO690 style
-     was provided by Jana Dvorakova <jana4u@seznam.cz>
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!-- if biblioentry.alt.primary.seps is set to nonzero value then use alternative separators for primary responsibility - $alt.person.two.sep, $alt.person.last.sep, $alt.person.more.sep  -->
-<xsl:param name="biblioentry.alt.primary.seps" select="0"/>
-
-<!-- how many authors will be printed if there is more than three authors - set to number 1 (default value), 2 or 3 -->
-<xsl:param name="biblioentry.primary.count" select="1"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="iso690.makecitation">
-<!-- Types of resources -->
-  <xsl:choose>
-
-    <!-- SYSTEMS OF ELECTRONIC COMMUNICATION : ENTIRE MESSAGE SYSTEM -->
-    <!-- same as Monographs -->
-    <xsl:when test="./@role='messagesystem'">
-      <xsl:call-template name="iso690.monogr"/>
-    </xsl:when>
-
-    <!-- SYSTEMS OF ELECTRONIC COMMUNICATION : ELECTRONIC MESSAGES -->
-    <!-- same as Contributions to Monographs -->
-    <xsl:when test="./@role='message'">
-      <xsl:call-template name="iso690.paper.mon"/>
-    </xsl:when>
-
-    <!-- SERIALS -->
-    <xsl:when test="./@role='serial' or ./biblioid/@class='issn' or ./issn">
-      <xsl:call-template name="iso690.serial"/>
-    </xsl:when>
-
-    <!-- PARTS OF MONOGRAPHS -->
-    <xsl:when test="./@role='part' or (./bibliomisc[@role='secnum']|./bibliomisc[@role='sectitle'])">
-      <xsl:call-template name="iso690.monogr.part"/>
-    </xsl:when>
-
-    <!-- CONTRIBUTIONS TO MONOGRAPHS -->
-    <xsl:when test="./@role='contribution' or (./biblioset/@relation='part' and ./biblioset/@relation='book')">
-      <xsl:call-template name="iso690.paper.mon"/>
-    </xsl:when>
-
-    <!-- ARTICLES, ETC., IN SERIALS -->
-    <xsl:when test="./@role='article' or (./biblioset/@relation='journal' and ./biblioset/@relation='article')">
-      <xsl:call-template name="iso690.article"/>
-    </xsl:when>
-
-    <!-- PATENT DOCUMENTS -->
-    <xsl:when test="./@role='patent' or (./bibliomisc[@role='patenttype'] and ./bibliomisc[@role='patentnum'])">
-      <xsl:call-template name="iso690.patent"/>
-    </xsl:when>
-
-    <!-- MONOGRAPHS -->
-    <xsl:otherwise>
-      <xsl:call-template name="iso690.monogr"/>
-    </xsl:otherwise>
-
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- MONOGRAPHS -->
-<xsl:template name="iso690.monogr">
-  <!-- Primary responsibility -->
-  <xsl:call-template name="iso690.primary"/>
-  <!-- Title and Type of medium -->
-  <xsl:call-template name="iso690.title"/>
-  <!-- Subordinate responsibility -->
-  <xsl:call-template name="iso690.secondary"/>
-  <!-- Edition -->
-  <xsl:call-template name="iso690.edition"/>
-  <!-- Place of publication, Publisher, Year/Date of publication, Date of update/revision, Date of citation -->
-  <xsl:call-template name="iso690.pub"/>
-  <!-- Extent -->
-  <xsl:call-template name="iso690.extent"/>
-  <!-- Series -->
-  <xsl:call-template name="iso690.serie"/>
-  <!-- Notes -->
-  <xsl:call-template name="iso690.notice"/>
-  <!-- Avaibility and access -->
-  <xsl:call-template name="iso690.access"/>
-  <!-- Standard number -->
-  <xsl:call-template name="iso690.isbn"/>
-</xsl:template>
-
-<!-- SERIALS -->
-<xsl:template name="iso690.serial">
-  <!-- Title and Type of medium -->
-  <xsl:call-template name="iso690.title"/>
-  <!-- Responsibility [nonEL] -->
-  <xsl:if test="not(./bibliomisc[@role='medium'])">
-    <xsl:call-template name="iso690.secondary"/>
-  </xsl:if>
-  <!-- Edition -->
-  <xsl:call-template name="iso690.edition">
-    <xsl:with-param name="after" select="./bibliomisc[@role='issuing']"/>
-  </xsl:call-template>
-  <!-- Issue designation (date and/or n°) [nonEL] -->
-  <xsl:if test="not(./bibliomisc[@role='medium'])">
-    <xsl:call-template name="iso690.issuing"/>
-  </xsl:if>
-  <!-- Place of publication, Publisher, Year/Date of publication, Date of update/revision, Date of citation -->
-  <xsl:call-template name="iso690.pub"/>
-  <!-- Series -->
-  <xsl:call-template name="iso690.serie"/>
-  <!-- Notes -->
-  <xsl:call-template name="iso690.notice"/>
-  <!-- Avaibility and access -->
-  <xsl:call-template name="iso690.access"/>
-  <!-- Standard number -->
-  <xsl:call-template name="iso690.issn"/>
-</xsl:template>
-
-<!-- PARTS OF MONOGRAPHS -->
-<xsl:template name="iso690.monogr.part">
-  <!-- Primary responsibility of host document -->
-  <xsl:call-template name="iso690.primary"/>
-  <!-- Title and Type of medium of host document -->
-  <xsl:call-template name="iso690.title"/>
-  <!-- Subordinate responsibility of host document [EL] -->
-  <xsl:if test="./bibliomisc[@role='medium']">
-    <xsl:call-template name="iso690.secondary"/>
-  </xsl:if>
-  <!-- Edition -->
-  <xsl:call-template name="iso690.edition">
-    <xsl:with-param name="after" select="./volumenum"/>
-  </xsl:call-template>
-  <!-- Numeration of the part [nonEL]-->
-  <xsl:if test="not(./bibliomisc[@role='medium'])">
-    <xsl:call-template name="iso690.partnr"/>
-  <!-- Subordinate responsibility [nonEL] -->
-    <xsl:call-template name="iso690.secondary"/>
-  </xsl:if>
-  <!-- Place of publication, Publisher, Year/Date of publication, Date of update/revision, Date of citation -->
-  <xsl:call-template name="iso690.pub"/>
-  <!-- Location within host -->
-  <xsl:call-template name="iso690.part.location"/>
-  <xsl:if test="./bibliomisc[@role='medium']">
-  <!-- Numeration within host document [EL] -->
-  <!-- Notes [EL] -->
-    <xsl:call-template name="iso690.notice"/>
-  <!-- Avaibility and access [EL] -->
-    <xsl:call-template name="iso690.access"/>
-  <!-- Standard number [EL] -->
-    <xsl:call-template name="iso690.isbn"/>
-  </xsl:if>
-</xsl:template>
-
-<!-- CONTRIBUTIONS TO MONOGRAPHS -->
-<xsl:template name="iso690.paper.mon">
-<!-- Contribution -->
-  <xsl:apply-templates mode="iso690.paper.part" select="./biblioset[@relation='part']"/>
-<!-- In -->
-  <xsl:text>In </xsl:text>
-<!-- Host -->
-  <xsl:apply-templates mode="iso690.paper.book" select="./biblioset[@relation='book']"/>
-</xsl:template>
-
-<xsl:template match="biblioset" mode="iso690.paper.part">
-<!-- Contribution -->
-  <!-- Primary responsibility -->
-  <xsl:call-template name="iso690.primary"/>
-  <!-- Title -->
-  <xsl:call-template name="iso690.title">
-    <xsl:with-param name="italic" select="0"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="biblioset" mode="iso690.paper.book">
-<!-- Host -->
-  <!-- Primary responsibility -->
-  <xsl:call-template name="iso690.primary"/>
-  <!-- Title and Type of medium -->
-  <xsl:call-template name="iso690.title"/>
-  <!-- Subordinate responsibility [EL] -->
-  <xsl:if test="./bibliomisc[@role='medium']">
-    <xsl:call-template name="iso690.secondary"/>
-  </xsl:if>
-  <!-- Edition -->
-  <xsl:call-template name="iso690.edition"/>
-  <!-- Place of publication, Publisher, Year/Date of publication, Date of update/revision, Date of citation -->
-  <xsl:call-template  name="iso690.paper.pub"/>
-  <!-- Numeration within host document [EL] -->
-  <!-- Location within host -->
-  <xsl:call-template name="iso690.location"/>
-  <xsl:if test="./bibliomisc[@role='medium']">
-  <!-- Notes [EL] -->
-    <xsl:call-template name="iso690.notice"/>
-  <!-- Avaibility and access [EL] -->
-    <xsl:call-template name="iso690.access"/>
-  <!-- Standard number [EL] -->
-    <xsl:call-template name="iso690.isbn"/>
-  </xsl:if>
-</xsl:template>
-
-<!-- ARTICLES, ETC., IN SERIALS -->
-<xsl:template name="iso690.article">
-<!-- Article -->
-  <xsl:apply-templates mode="iso690.article.art" select="./biblioset[@relation='article']"/>
-<!-- Serial -->
-  <xsl:apply-templates mode="iso690.article.jour" select="./biblioset[@relation='journal']"/>
-</xsl:template>
-
-<xsl:template match="biblioset" mode="iso690.article.art">
-<!-- Article -->
-  <!-- Primary responsibility -->
-  <xsl:call-template name="iso690.primary"/>
-  <!-- Title -->
-  <xsl:call-template name="iso690.title">
-    <xsl:with-param name="italic" select="0"/>
-  </xsl:call-template>
-  <!-- Subordinate responsibility [nonEL] -->
-  <xsl:if test="not(../*/bibliomisc[@role='medium'])">
-    <xsl:call-template name="iso690.secondary"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="biblioset" mode="iso690.article.jour">
-<!-- Serial -->
-  <!-- Title and Type of medium -->
-  <xsl:call-template name="iso690.title"/>
-  <!-- Edition -->
-  <xsl:call-template name="iso690.edition">
-    <xsl:with-param name="after" select="./pubdate[not(@role='issuing')]|./volumenum|./issuenum|./pagenums"/>
-  </xsl:call-template>
-  <!-- Number designation [EL] -->
-  <!-- Location within host -->
-  <xsl:call-template name="iso690.article.location"/>
-  <xsl:if test="./bibliomisc[@role='medium']">
-  <!-- Notes [EL] -->
-    <xsl:call-template name="iso690.notice"/>
-  <!-- Avaibility and access [EL] -->
-    <xsl:call-template name="iso690.access"/>
-  <!-- Standard number [EL] -->
-    <xsl:call-template name="iso690.issn"/>
-  </xsl:if>
-</xsl:template>
-
-<!-- PATENT DOCUMENTS -->
-<xsl:template name="iso690.patent">
-  <!-- Primary responsibility (applicant) -->
-  <xsl:call-template name="iso690.primary"/>
-  <!-- Title of the invention -->
-  <xsl:call-template name="iso690.title"/>
-  <!-- Subordinate responsibility -->
-  <xsl:call-template name="iso690.secondary"/>
-  <!-- Notes -->
-  <xsl:call-template name="iso690.notice"/>
-  <!-- Identification -->
-  <xsl:call-template name="iso690.pat.ident"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<!-- Elements -->
-
-<!-- Primary responsibility -->
-<xsl:template name="iso690.primary">
-  <xsl:param name="primary.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'primary.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="./authorgroup/author|./author">
-      <xsl:call-template name="iso690.author.list">
-        <xsl:with-param name="person.list" select=".//authorgroup/author|.//author"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="./authorgroup/editor|./editor">
-      <xsl:call-template name="iso690.author.list">
-        <xsl:with-param name="person.list" select=".//authorgroup/editor|.//editor"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="./authorgroup/corpauthor|./corpauthor">
-      <xsl:call-template name="iso690.author.list">
-        <xsl:with-param name="person.list" select=".//authorgroup/corpauthor|.//corpauthor"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:if test="(./firstname)and(./surname)">
-        <xsl:call-template name="iso690.author"/>
-        <xsl:call-template name="iso690.endsep">
-          <xsl:with-param name="text" select="string(./firstname[1])"/>
-          <xsl:with-param name="sep" select="$primary.sep"/>
-        </xsl:call-template>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.author.list">
-  <xsl:param name="person.list"
-             select="author|corpauthor|editor"/>
-  <xsl:param name="person.count" select="count($person.list)"/>
-  <xsl:param name="count" select="1"/>
-  <xsl:param name="group" select="./authorgroup[@role='many']"/>
-  <xsl:param name="many" select="0"/>
-
-  <xsl:param name="primary.many">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'primary.many'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="primary.editor">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'primary.editor'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="primary.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'primary.sep'"/></xsl:call-template>
-  </xsl:param>
-
-  <xsl:choose>
-    <xsl:when test="$count &gt; $person.count"></xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$person.count &lt; 4 and not($group)">
-          <xsl:call-template name="iso690.author">
-            <xsl:with-param name="node" select="$person.list[position()=$count]"/>
-          </xsl:call-template>
-          <xsl:choose>
-            <xsl:when test="$person.count = 2 and $count = 1 and $biblioentry.alt.primary.seps != 0">
-              <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'alt.person.two.sep'"/></xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$person.count = 2 and $count = 1">
-              <xsl:call-template name="gentext.template">
-                <xsl:with-param name="context" select="'authorgroup'"/>
-                <xsl:with-param name="name" select="'sep2'"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$person.count &gt; 2 and $count+1 = $person.count and $biblioentry.alt.primary.seps != 0">
-              <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'alt.person.last.sep'"/></xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$person.count &gt; 2 and $count+1 = $person.count">
-              <xsl:call-template name="gentext.template">
-                <xsl:with-param name="context" select="'authorgroup'"/>
-                <xsl:with-param name="name" select="'seplast'"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$count &lt; $person.count and $biblioentry.alt.primary.seps != 0">
-              <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'alt.person.more.sep'"/></xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$count &lt; $person.count">
-              <xsl:call-template name="gentext.template">
-                <xsl:with-param name="context" select="'authorgroup'"/>
-                <xsl:with-param name="name" select="'sep'"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="($count = $person.count)">
-              <xsl:choose>
-                <xsl:when test="$many!=0">
-                  <xsl:if test="name($person.list[position()=$count])='editor'">
-                    <xsl:value-of select="$primary.editor"/>
-                  </xsl:if>
-                  <xsl:value-of select="$primary.many"/>
-                  <xsl:call-template name="iso690.endsep">
-                    <xsl:with-param name="text" select="$primary.many"/>
-                    <xsl:with-param name="sep" select="$primary.sep"/>
-                  </xsl:call-template>
-                </xsl:when>
-                <xsl:when test="name($person.list[position()=$count])='editor'">
-                  <xsl:value-of select="$primary.editor"/>
-                  <xsl:value-of select="$primary.sep"/>
-                </xsl:when>
-                <xsl:when test="name($person.list[position()=$count])='corpauthor'">
-                  <xsl:call-template name="iso690.endsep">
-                    <xsl:with-param name="text" select="string($person.list[position()=$count])"/>
-                    <xsl:with-param name="sep" select="$primary.sep"/>
-                  </xsl:call-template>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:call-template name="iso690.endsep">
-                    <xsl:with-param name="text" select="string($person.list[position()=$count]//firstname[1])"/>
-                    <xsl:with-param name="sep" select="$primary.sep"/>
-                  </xsl:call-template>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:when>
-          </xsl:choose>
-
-          <xsl:call-template name="iso690.author.list">
-            <xsl:with-param name="person.list" select="$person.list"/>
-            <xsl:with-param name="person.count" select="$person.count"/>
-            <xsl:with-param name="count" select="$count+1"/>
-            <xsl:with-param name="many" select="$many"/>
-            <xsl:with-param name="group"/>
-          </xsl:call-template>
-        </xsl:when>
-
-        <xsl:otherwise>
-          <xsl:choose>
-            <xsl:when test="($biblioentry.primary.count&gt;=3) and ($person.count&gt;=3)">
-              <xsl:call-template name="iso690.author.list">
-                <xsl:with-param name="person.list" select="$person.list[1]|$person.list[2]|$person.list[3]"/>
-                <xsl:with-param name="person.count" select="3"/>
-                <xsl:with-param name="count" select="1"/>
-                <xsl:with-param name="many" select="1"/>
-                <xsl:with-param name="group"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="($biblioentry.primary.count&gt;1) and  ($person.count&gt;1)">
-              <xsl:call-template name="iso690.author.list">
-                <xsl:with-param name="person.list" select="$person.list[1]|$person.list[2]"/>
-                <xsl:with-param name="person.count" select="2"/>
-                <xsl:with-param name="count" select="1"/>
-                <xsl:with-param name="many" select="1"/>
-                <xsl:with-param name="group"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:call-template name="iso690.author.list">
-                <xsl:with-param name="person.list" select="$person.list[1]"/>
-                <xsl:with-param name="person.count" select="1"/>
-                <xsl:with-param name="count" select="1"/>
-                <xsl:with-param name="many" select="1"/>
-                <xsl:with-param name="group"/>
-              </xsl:call-template>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.author">
-  <xsl:param name="node" select="."/>
-  <xsl:param name="lastfirst.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'lastfirst.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="name($node)!='corpauthor'">
-      <fo:inline text-transform="uppercase">
-        <xsl:apply-templates mode="iso690.mode" select="$node//surname[1]"/>
-      </fo:inline>
-      <xsl:if test="$node//surname and $node//firstname">
-        <xsl:value-of select="$lastfirst.sep"/>
-      </xsl:if>
-      <xsl:apply-templates mode="iso690.mode" select="$node//firstname[1]"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:inline text-transform="uppercase">
-        <xsl:apply-templates mode="iso690.mode" select="$node"/>
-      </fo:inline>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="corpauthor|firstname|surname" mode="iso690.mode">
-  <xsl:apply-templates mode="iso690.mode"/>
-</xsl:template>
-
-<!-- Title and Type of medium -->
-<xsl:template name="iso690.title">
-  <xsl:param name="medium" select="./bibliomisc[@role='medium']"/>
-  <xsl:param name="italic" select="1"/>
-  <xsl:param name="sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'title.sep'"/></xsl:call-template>
-  </xsl:param>
-
-  <xsl:apply-templates mode="iso690.mode" select="./title">
-    <xsl:with-param name="medium" select="$medium"/>
-    <xsl:with-param name="italic" select="$italic"/>
-    <xsl:with-param name="sep" select="$sep"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="title" mode="iso690.mode">
-  <xsl:param name="medium"/>
-  <xsl:param name="italic" select="1"/>
-  <xsl:param name="sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'title.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="medium1">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'medium1'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="medium2">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'medium2'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="$italic=1">
-      <xsl:call-template name="iso690.italic.title"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="iso690.make.title"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:if test="$medium">
-    <xsl:value-of select="$medium1"/>
-    <xsl:apply-templates mode="iso690.mode" select="$medium"/>
-    <xsl:value-of select="$medium2"/>
-  </xsl:if>
-  <xsl:call-template name="iso690.endsep">
-    <xsl:with-param name="text" select="concat(string(.),string(../subtitle))"/>
-    <xsl:with-param name="sep" select="$sep"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="iso690.italic.title">
-  <fo:inline font-style="italic">
-    <xsl:call-template name="iso690.make.title"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template name="iso690.make.title">
-  <xsl:param name="submaintitle.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'submaintitle.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:if test="../subtitle">
-    <xsl:value-of select="$submaintitle.sep"/>
-    <xsl:apply-templates mode="iso690.mode" select="../subtitle"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="iso690.mode">
-  <xsl:apply-templates mode="iso690.mode"/>
-</xsl:template>
-
-<xsl:template match="bibliomisc[@role='medium']" mode="iso690.mode">
-  <xsl:apply-templates mode="iso690.mode"/>
-</xsl:template>
-
-<!-- Subordinate responsibility -->
-<xsl:template name="iso690.secondary">
-  <xsl:param name="secondary.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'secondary.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="secondary.person.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'secondary.person.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:for-each select="./bibliomisc[@role='secondary']">
-    <xsl:apply-templates mode="iso690.mode" select="."/>
-    <xsl:choose>
-      <xsl:when test="position()=count(../bibliomisc[@role='secondary'])">
-        <xsl:call-template name="iso690.endsep">
-          <xsl:with-param name="text" select="string(.)"/>
-          <xsl:with-param name="sep" select="$secondary.sep"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$secondary.person.sep"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:for-each>
-</xsl:template>
-
-<xsl:template match="bibliomisc[@role='secondary']" mode="iso690.mode">
-  <xsl:apply-templates mode="iso690.mode"/>
-</xsl:template>
-
-<!-- Edition -->
-<xsl:template name="iso690.edition">
-  <xsl:param name="after"/>
-  <xsl:param name="edition.serial.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'edition.serial.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="string($after)!=''">
-      <xsl:apply-templates mode="iso690.mode" select="./edition">
-        <xsl:with-param name="sep" select="$edition.serial.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="iso690.mode" select="./edition"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="edition" mode="iso690.mode">
-  <xsl:param name="sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'edition.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.endsep">
-    <xsl:with-param name="text" select="string(.)"/>
-    <xsl:with-param name="sep" select="$sep"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- Issue designation (date and/or n°) -->
-<xsl:template name="iso690.issuing">
-  <xsl:param name="issuing.div">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.div'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="issuing.range">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.range'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="issuing.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="./pubdate[@role='issuing'] and ./volumenum[2] and ./issuenum[2]">
-      <xsl:call-template name="iso690.issuedate"/>
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum[1]">
-        <xsl:with-param name="sep" select="$issuing.div"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./issuenum[1]">
-        <xsl:with-param name="sep" select="$issuing.range"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum[2]">
-        <xsl:with-param name="sep" select="$issuing.div"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./issuenum[2]">
-        <xsl:with-param name="sep" select="$issuing.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="./pubdate[@role='issuing'] and ./volumenum[2]">
-      <xsl:call-template name="iso690.issuedate"/>
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum[1]">
-        <xsl:with-param name="sep" select="$issuing.range"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum[2]">
-        <xsl:with-param name="sep" select="$issuing.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="./pubdate[@role='issuing'] and ./volumenum and ./issuenum">
-      <xsl:apply-templates mode="iso690.mode" select="./pubdate[@role='issuing']">
-        <xsl:with-param name="sep" select="$issuing.div"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum">
-        <xsl:with-param name="sep" select="$issuing.div"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./issuenum">
-        <xsl:with-param name="sep" select="$issuing.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="./pubdate[@role='issuing']">
-      <xsl:apply-templates mode="iso690.mode" select="./pubdate[@role='issuing']">
-        <xsl:with-param name="sep" select="$issuing.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="./volumenum">
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum">
-        <xsl:with-param name="sep" select="$issuing.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="./issuenum">
-      <xsl:apply-templates mode="iso690.mode" select="./issuenum">
-        <xsl:with-param name="sep" select="$issuing.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.issuedate">
-  <xsl:param name="issuing.div">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.div'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="issuing.range">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.range'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="issuing.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="./pubdate[@role='issuing'][2]">
-      <xsl:apply-templates mode="iso690.mode" select="./pubdate[@role='issuing'][1]">
-        <xsl:with-param name="sep" select="$issuing.range"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./pubdate[@role='issuing'][2]">
-        <xsl:with-param name="sep" select="$issuing.div"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="iso690.mode" select="./pubdate[@role='issuing']">
-        <xsl:with-param name="sep" select="$issuing.div"/>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="pubdate[@role='issuing']" mode="iso690.mode">
-  <xsl:param name="sep"/>
-  <xsl:variable name="substr" select="substring(string(.),string-length(string(.)))"/>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.space">
-    <xsl:with-param name="text" select="$substr"/>
-  </xsl:call-template>
-  <xsl:choose>
-    <xsl:when test="$substr='-'">
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="' '"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="string(.)"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- Numeration of the part -->
-<xsl:template name="iso690.partnr">
-  <xsl:param name="partnr.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'partnr.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode" select="./volumenum">
-    <xsl:with-param name="sep" select="$partnr.sep"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<!-- Place of publication, Publisher, Year/Date of publication, Date of update/revision, Date of citation -->
-<xsl:template name="iso690.pub">
-  <xsl:param name="onlydate" select="0"/>
-  <xsl:param name="placesep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'placepubl.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="pubsep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'publyear.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="endsep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'pubinfo.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="(./publisher/publishername|./publishername|./publisher/address/city)and($onlydate=0)and(./pubdate[not(@role='issuing')]|./copyright/year|./date[@role='upd']|./date[@role='upd'])">
-      <xsl:apply-templates mode="iso690.mode" select="./publisher/address/city">
-        <xsl:with-param name="sep" select="$placesep"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./publisher/publishername|./publishername">
-        <xsl:with-param name="sep" select="$pubsep"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]|./copyright/year">
-        <xsl:with-param name="sep" select="$endsep"/>
-      </xsl:apply-templates>
-      <xsl:if test="not(./pubdate[not(@role='issuing')]|./copyright/year)">
-        <xsl:call-template name="iso690.data">
-          <xsl:with-param name="sep" select="$endsep"/>
-        </xsl:call-template>
-      </xsl:if>
-    </xsl:when>
-    <xsl:when test="(./publisher/publishername|./publishername)and(./publisher/address/city)and($onlydate=0)">
-      <xsl:apply-templates mode="iso690.mode" select="./publisher/address/city">
-        <xsl:with-param name="sep" select="$placesep"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./publisher/publishername|./publishername">
-        <xsl:with-param name="sep" select="$endsep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="($onlydate=1)or(./pubdate[not(@role='issuing')]|./copyright/year)">
-      <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]|./copyright/year">
-        <xsl:with-param name="sep" select="$endsep"/>
-      </xsl:apply-templates>
-      <xsl:if test="$onlydate=1">
-        <xsl:call-template name="iso690.location">
-          <xsl:with-param name="onlypages" select="1"/>
-        </xsl:call-template>
-      </xsl:if>
-    </xsl:when>
-    <xsl:when test="not(./pubdate[not(@role='issuing')]|./copyright/year)">
-      <xsl:call-template name="iso690.data">
-        <xsl:with-param name="sep" select="$endsep"/>
-      </xsl:call-template>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.paper.pub">
-  <xsl:param name="spec.pubinfo.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'spec.pubinfo.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="./volumnum|./issuenum|./pagenums">
-      <xsl:call-template name="iso690.pub">
-        <xsl:with-param name="endsep" select="$spec.pubinfo.sep"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="iso690.pub"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.data">
-  <xsl:param name="sep"/>
-  <xsl:param name="datecit2">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'datecit2'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode" select="./date[@role='upd']">
-    <xsl:with-param name="sep"/>
-  </xsl:apply-templates>
-  <xsl:apply-templates mode="iso690.mode" select="./date[@role='cit']"/>
-  <xsl:choose>
-    <xsl:when test="./date[@role='cit']">
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="$datecit2"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="./date[@role='upd']">
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="string(./date[@role='upd'])"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="publisher/address/city|publishername" mode="iso690.mode">
-  <xsl:param name="sep"/>
-  <xsl:param name="upd" select="0"/>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.endsep">
-    <xsl:with-param name="text" select="string(.)"/>
-    <xsl:with-param name="sep" select="$sep"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="pubdate|copyright/year" mode="iso690.mode">
-  <xsl:param name="sep"/>
-  <xsl:param name="upd" select="1"/>
-  <xsl:param name="datecit2">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'datecit2'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:variable name="substr" select="substring(string(.),string-length(string(.)))"/>
-  <xsl:if test="name(.)!='pubdate'">
-    <xsl:value-of select="'&#x00A9;'"/><!-- copyright -->
-  </xsl:if>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.space">
-    <xsl:with-param name="text" select="$substr"/>
-  </xsl:call-template>
-  <xsl:if test="$upd!=0">
-    <xsl:choose>
-      <xsl:when test="name(.)='pubdate'">
-        <xsl:apply-templates mode="iso690.mode" select="../date[@role='upd']"/>
-        <xsl:apply-templates mode="iso690.mode" select="../date[@role='cit']"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates mode="iso690.mode" select="../../date[@role='upd']"/>
-        <xsl:apply-templates mode="iso690.mode" select="../../date[@role='cit']"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:if>
-  <xsl:choose>
-    <xsl:when test="../date[@role='cit']|../../date[@role='cit'] and $upd!=0">
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="$datecit2"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="../date[@role='upd']|../../date[@role='upd'] and $upd!=0">
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="string(../date[@role='upd'])"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$substr='-'">
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="' '"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="string(.)"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.space">
-  <xsl:param name="text" select="substring(string(.),string-length(string(.)))"/>
-  <xsl:if test="$text='-'">
-    <xsl:value-of select="' '"/>
-  </xsl:if>
-</xsl:template>
-
-<!-- Date of update/revision -->
-<xsl:template match="date[@role='upd']" mode="iso690.mode">
-  <xsl:param name="sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'upd.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:value-of select="$sep"/>
-  <xsl:apply-templates mode="iso690.mode"/>
-</xsl:template>
-
-<!-- Date of citation -->
-<xsl:template match="date[@role='cit']" mode="iso690.mode">
-  <xsl:param name="datecit1">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'datecit1'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="datecit2">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'datecit2'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:value-of select="$datecit1"/>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:value-of select="$datecit2"/>
-</xsl:template>
-
-<!-- Extent -->
-<xsl:template name="iso690.extent">
-  <xsl:param name="extent.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'extent.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode" select="./pagenums">
-    <xsl:with-param name="sep" select="$extent.sep"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<!-- Location within host -->
-<xsl:template name="iso690.part.location">
-  <xsl:param name="location.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'location.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="./pagenums">
-      <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='secnum']"/>
-      <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='sectitle']"/>
-      <xsl:apply-templates mode="iso690.mode" select="./pagenums"/>
-    </xsl:when>
-    <xsl:when test="./bibliomisc[@role='sectitle']">
-      <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='secnum']"/>
-      <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='sectitle']">
-        <xsl:with-param name="sep" select="$location.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='secnum']">
-        <xsl:with-param name="sep" select="$location.sep"/>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.article.location">
-  <xsl:param name="location.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'location.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="locs.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'locs.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="not(./date[@role='upd']|./date[@role='cit'])">
-      <xsl:choose>
-        <xsl:when test="./volumenum|./issuenum|./pagenums">
-          <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]">
-            <xsl:with-param name="upd" select="0"/>
-            <xsl:with-param name="sep" select="$locs.sep"/>
-          </xsl:apply-templates>
-          <xsl:call-template name="iso690.location"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]">
-            <xsl:with-param name="sep" select="$location.sep"/>
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="./volumenum|./issuenum|./pagenums">
-          <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]">
-            <xsl:with-param name="upd" select="0"/>
-            <xsl:with-param name="sep" select="$locs.sep"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]">
-            <xsl:with-param name="upd" select="0"/>
-            <xsl:with-param name="sep" select="$location.sep"/>
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:choose>
-        <xsl:when test="./issuenum">
-          <xsl:apply-templates mode="iso690.mode" select="./volumenum"/>
-          <xsl:apply-templates mode="iso690.mode" select="./issuenum">
-            <xsl:with-param name="sep"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates mode="iso690.mode" select="./volumenum">
-            <xsl:with-param name="sep"/>
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:choose>
-        <xsl:when test="./pagenums">
-          <xsl:call-template name="iso690.data">
-            <xsl:with-param name="sep" select="$locs.sep"/>
-          </xsl:call-template>
-          <xsl:apply-templates mode="iso690.mode" select="./pagenums"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="iso690.data">
-            <xsl:with-param name="sep" select="$location.sep"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.location">
-  <xsl:param name="location.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'location.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="./volumenum and not(./issuenum) and not(./pagenums)">
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum">
-        <xsl:with-param name="sep" select="$location.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="./issuenum and not(./pagenums)">
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum"/>
-      <xsl:apply-templates mode="iso690.mode" select="./issuenum">
-        <xsl:with-param name="sep" select="$location.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="./pagenums">
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum"/>
-      <xsl:apply-templates mode="iso690.mode" select="./issuenum"/>
-      <xsl:apply-templates mode="iso690.mode" select="./pagenums"/>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="bibliomisc[@role='secnum']|bibliomisc[@role='sectitle']" mode="iso690.mode">
-  <xsl:param name="sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'locs.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.endsep">
-    <xsl:with-param name="text" select="string(.)"/>
-    <xsl:with-param name="sep" select="$sep"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="volumenum|issuenum" mode="iso690.mode">
-  <xsl:param name="sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'locs.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.endsep">
-    <xsl:with-param name="text" select="string(.)"/>
-    <xsl:with-param name="sep" select="$sep"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="pagenums" mode="iso690.mode">
-  <xsl:param name="sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'location.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.endsep">
-    <xsl:with-param name="text" select="string(.)"/>
-    <xsl:with-param name="sep" select="$sep"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- Series -->
-<xsl:template name="iso690.serie">
-  <xsl:apply-templates mode="iso690.mode" select=".//bibliomisc[@role='serie']"/>
-</xsl:template>
-
-<!-- Notes -->
-<xsl:template name="iso690.notice">
-  <xsl:apply-templates mode="iso690.mode" select=".//bibliomisc[not(@role)]"/>
-</xsl:template>
-
-<xsl:template match="bibliomisc[not(@role)]|bibliomisc[@role='serie']" mode="iso690.mode">
-  <xsl:param name="notice.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'notice.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.endsep">
-    <xsl:with-param name="text" select="string(.)"/>
-    <xsl:with-param name="sep" select="$notice.sep"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- Avaibility and access -->
-<xsl:template name="iso690.access">
-  <xsl:for-each select="./biblioid[@class='uri']|./bibliomisc[@role='access']">
-    <xsl:choose>
-      <xsl:when test="position()=1">
-        <xsl:apply-templates mode="iso690.mode" select="."/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates mode="iso690.mode" select=".">
-          <xsl:with-param name="firstacc" select="0"/>
-        </xsl:apply-templates>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:for-each>
-</xsl:template>
-
-<xsl:template match="biblioid[@class='uri']/ulink|bibliomisc[@role='access']/ulink" mode="iso690.mode">
-  <xsl:param name="link1">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'link1'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="link2">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'link2'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:value-of select="$link1"/>
-  <xsl:call-template name="ulink"/>
-  <xsl:value-of select="$link2"/>
-</xsl:template>
-
-<xsl:template match="biblioid[@class='uri']|bibliomisc[@role='access']" mode="iso690.mode">
-  <xsl:param name="firstacc" select="1"/>
-  <xsl:param name="access">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'access'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="acctoo">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'acctoo'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="onwww">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'onwww'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="oninet">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'oninet'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="access.end">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'access.end'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="access.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'access.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="$firstacc=1">
-      <xsl:value-of select="$access"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$acctoo"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:choose>
-    <xsl:when test="(./ulink)and(string(./ulink)=string(.))">
-      <xsl:choose>
-        <xsl:when test="(starts-with(./ulink/@url,'http://')or(starts-with(./ulink/@url,'https://')))">
-          <xsl:value-of select="$onwww"/>
-          <xsl:value-of select="$access.end"/>
-          <xsl:apply-templates mode="iso690.mode" select="./ulink"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$oninet"/>
-          <xsl:value-of select="$access.end"/>
-          <xsl:apply-templates mode="iso690.mode" select="./ulink"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="(./ulink)and(string(./ulink)!=string(.))">
-      <xsl:value-of select="text()[1]"/>
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="text()[1]"/>
-        <xsl:with-param name="sep" select="$access.end"/>
-      </xsl:call-template>
-      <xsl:apply-templates mode="iso690.mode" select="./ulink"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="iso690.mode"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:value-of select="$access.sep"/>
-</xsl:template>
-
-<!-- Standard number - ISBN -->
-<xsl:template name="iso690.isbn">
-  <xsl:choose>
-    <xsl:when test="./biblioid/@class='isbn'">
-      <xsl:apply-templates mode="iso690.mode" select="./biblioid[@class='isbn']"/>
-    </xsl:when>
-    <xsl:when test="./isbn">
-      <xsl:apply-templates mode="iso690.mode" select="./isbn"/>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="isbn|biblioid[@class='isbn']" mode="iso690.mode">
-  <xsl:param name="isbn">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'isbn'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="stdnum.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'stdnum.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:value-of select="$isbn"/>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:value-of select="$stdnum.sep"/>
-</xsl:template>
-
-<!-- Standard number - ISSN -->
-<xsl:template name="iso690.issn">
-  <xsl:choose>
-    <xsl:when test="./biblioid/@class='issn'">
-      <xsl:apply-templates mode="iso690.mode" select="./biblioid[@class='issn']"/>
-    </xsl:when>
-    <xsl:when test="./issn">
-      <xsl:apply-templates mode="iso690.mode" select="./issn"/>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="issn|biblioid[@class='issn']" mode="iso690.mode">
-  <xsl:param name="issn">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issn'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="stdnum.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'stdnum.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:value-of select="$issn"/>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:value-of select="$stdnum.sep"/>
-</xsl:template>
-
-<!-- Identification of patent document -->
-<xsl:template name="iso690.pat.ident">
-  <xsl:param name="patdate.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'patdate.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode" select="./address/country"/>
-  <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='patenttype']"/>
-  <xsl:choose>
-    <xsl:when test="./biblioid[@class='other' and @otherclass='patentnum']">
-      <xsl:apply-templates mode="iso690.mode" select="./biblioid[@class='other' and @otherclass='patentnum']"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='patentnum']"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]">
-    <xsl:with-param name="sep" select="$patdate.sep"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<!-- Country or issuing office -->
-<xsl:template match="address/country" mode="iso690.mode">
-  <xsl:param name="patcountry.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'patcountry.sep'"/></xsl:call-template>
-  </xsl:param>
-  <fo:inline font-style="italic">
-    <xsl:apply-templates mode="iso690.mode"/>
-  </fo:inline>
-  <xsl:value-of select="$patcountry.sep"/>
-</xsl:template>
-
-<!-- Kind of patent document -->
-<xsl:template match="bibliomisc[@role='patenttype']" mode="iso690.mode">
-  <xsl:param name="pattype.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'pattype.sep'"/></xsl:call-template>
-  </xsl:param>
-  <fo:inline font-style="italic">
-    <xsl:apply-templates mode="iso690.mode"/>
-  </fo:inline>
-  <xsl:value-of select="$pattype.sep"/>
-</xsl:template>
-
-<!-- Number -->
-<xsl:template match="biblioid[@class='other' and @otherclass='patentnum']|bibliomisc[@role='patentnum']" mode="iso690.mode">
-  <xsl:param name="patnum.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'patnum.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:value-of select="$patnum.sep"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<!-- Supplementary templates -->
-
-<xsl:template name="iso690.endsep">
-  <xsl:param name="text"/>
-  <xsl:param name="sep" select=". "/>
-  <xsl:choose>
-    <xsl:when test="substring($text,string-length($text))!=substring($sep,1,1)">
-      <xsl:value-of select="$sep"/>
-    </xsl:when>
-    <xsl:when test="substring($text,string-length($text))=' '">
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="' '"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="iso690.mode">
-  <xsl:apply-templates select="."/><!-- try the default mode -->
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/biblio.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/biblio.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,1169 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="bibliography">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="not(parent::*) or parent::part or parent::book">
-      <xsl:variable name="master-reference">
-        <xsl:call-template name="select.pagemaster"/>
-      </xsl:variable>
-
-      <fo:page-sequence hyphenate="{$hyphenate}"
-                        master-reference="{$master-reference}">
-        <xsl:attribute name="language">
-          <xsl:call-template name="l10n.language"/>
-        </xsl:attribute>
-        <xsl:attribute name="format">
-          <xsl:call-template name="page.number.format">
-            <xsl:with-param name="master-reference" select="$master-reference"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:attribute name="initial-page-number">
-          <xsl:call-template name="initial.page.number">
-            <xsl:with-param name="master-reference" select="$master-reference"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:attribute name="force-page-count">
-          <xsl:call-template name="force.page.count">
-            <xsl:with-param name="master-reference" select="$master-reference"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:attribute name="hyphenation-character">
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'hyphenation-character'"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:attribute name="hyphenation-push-character-count">
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:attribute name="hyphenation-remain-character-count">
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-          </xsl:call-template>
-        </xsl:attribute>
-
-        <xsl:apply-templates select="." mode="running.head.mode">
-          <xsl:with-param name="master-reference" select="$master-reference"/>
-        </xsl:apply-templates>
-        <xsl:apply-templates select="." mode="running.foot.mode">
-          <xsl:with-param name="master-reference" select="$master-reference"/>
-        </xsl:apply-templates>
-
-        <fo:flow flow-name="xsl-region-body">
-          <xsl:call-template name="set.flow.properties">
-            <xsl:with-param name="element" select="local-name(.)"/>
-            <xsl:with-param name="master-reference" select="$master-reference"/>
-          </xsl:call-template>
-
-          <fo:block id="{$id}">
-            <xsl:call-template name="bibliography.titlepage"/>
-          </fo:block>
-          <xsl:apply-templates/>
-        </fo:flow>
-      </fo:page-sequence>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:block id="{$id}"
-                space-before.minimum="1em"
-                space-before.optimum="1.5em"
-                space-before.maximum="2em">
-        <xsl:call-template name="bibliography.titlepage"/>
-      </fo:block>
-      <xsl:apply-templates/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="bibliography/bibliographyinfo"></xsl:template>
-<xsl:template match="bibliography/info"></xsl:template>
-<xsl:template match="bibliography/title"></xsl:template>
-<xsl:template match="bibliography/subtitle"></xsl:template>
-<xsl:template match="bibliography/titleabbrev"></xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="bibliodiv">
-  <fo:block>
-    <xsl:attribute name="id">
-      <xsl:call-template name="object.id"/>
-    </xsl:attribute>
-    <xsl:call-template name="bibliodiv.titlepage"/>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="bibliodiv/title"/>
-<xsl:template match="bibliodiv/subtitle"/>
-<xsl:template match="bibliodiv/titleabbrev"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="bibliolist">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:block id="{$id}"
-            space-before.minimum="1em"
-            space-before.optimum="1.5em"
-            space-before.maximum="2em">
-
-    <xsl:if test="blockinfo/title|info/title|title">
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-
-    <xsl:apply-templates select="*[not(self::blockinfo)
-                                   and not(self::info)
-                                   and not(self::title)
-                                   and not(self::titleabbrev)]"/>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="biblioentry">
-  <xsl:param name="label">
-    <xsl:call-template name="biblioentry.label"/>
-  </xsl:param>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="string(.) = ''">
-      <xsl:variable name="bib" select="document($bibliography.collection,.)"/>
-      <xsl:variable name="entry" select="$bib/bibliography/
-                                         *[@id=$id or @xml:id=$id][1]"/>
-      <xsl:choose>
-        <xsl:when test="$entry">
-          <xsl:choose>
-            <xsl:when test="$bibliography.numbered != 0">
-              <xsl:apply-templates select="$entry">
-                <xsl:with-param name="label" select="$label"/>
-              </xsl:apply-templates>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates select="$entry"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>No bibliography entry: </xsl:text>
-            <xsl:value-of select="$id"/>
-            <xsl:text> found in </xsl:text>
-            <xsl:value-of select="$bibliography.collection"/>
-          </xsl:message>
-          <fo:block id="{$id}" xsl:use-attribute-sets="normal.para.spacing">
-            <xsl:text>Error: no bibliography entry: </xsl:text>
-            <xsl:value-of select="$id"/>
-            <xsl:text> found in </xsl:text>
-            <xsl:value-of select="$bibliography.collection"/>
-          </fo:block>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:block id="{$id}" xsl:use-attribute-sets="biblioentry.properties">
-        <xsl:copy-of select="$label"/>
-	<xsl:choose>
-	  <xsl:when test="$bibliography.style = 'iso690'">
-	    <xsl:call-template name="iso690.makecitation"/>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <xsl:apply-templates mode="bibliography.mode"/>
-	  </xsl:otherwise>
-	</xsl:choose>
-      </fo:block>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="bibliomixed">
-  <xsl:param name="label">
-    <xsl:call-template name="biblioentry.label"/>
-  </xsl:param>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="string(.) = ''">
-      <xsl:variable name="bib" select="document($bibliography.collection,.)"/>
-      <xsl:variable name="entry" select="$bib/bibliography/
-                                         *[@id=$id or @xml:id=$id][1]"/>
-      <xsl:choose>
-        <xsl:when test="$entry">
-          <xsl:choose>
-            <xsl:when test="$bibliography.numbered != 0">
-              <xsl:apply-templates select="$entry">
-                <xsl:with-param name="label" select="$label"/>
-              </xsl:apply-templates>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates select="$entry"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>No bibliography entry: </xsl:text>
-            <xsl:value-of select="$id"/>
-            <xsl:text> found in </xsl:text>
-            <xsl:value-of select="$bibliography.collection"/>
-          </xsl:message>
-          <fo:block id="{$id}" xsl:use-attribute-sets="normal.para.spacing">
-            <xsl:text>Error: no bibliography entry: </xsl:text>
-            <xsl:value-of select="$id"/>
-            <xsl:text> found in </xsl:text>
-            <xsl:value-of select="$bibliography.collection"/>
-          </fo:block>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:block id="{$id}" xsl:use-attribute-sets="biblioentry.properties">
-        <xsl:copy-of select="$label"/>
-        <xsl:apply-templates mode="bibliomixed.mode"/>
-      </fo:block>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="biblioentry.label">
-  <xsl:param name="node" select="."/>
-
-  <xsl:choose>
-    <xsl:when test="$bibliography.numbered != 0">
-      <xsl:text>[</xsl:text>
-      <xsl:number from="bibliography" count="biblioentry|bibliomixed"
-                  level="any" format="1"/>
-      <xsl:text>] </xsl:text>
-    </xsl:when>
-    <xsl:when test="local-name($node/child::*[1]) = 'abbrev'">
-      <xsl:text>[</xsl:text>
-      <xsl:apply-templates select="$node/abbrev[1]"/>
-      <xsl:text>] </xsl:text>
-    </xsl:when>
-    <xsl:when test="$node/@xreflabel">
-      <xsl:text>[</xsl:text>
-      <xsl:value-of select="$node/@xreflabel"/>
-      <xsl:text>] </xsl:text>
-    </xsl:when>
-    <xsl:when test="$node/@id or $node/@xml:id">
-      <xsl:text>[</xsl:text>
-      <xsl:value-of select="($node/@id|$node/@xml:id)[1]"/>
-      <xsl:text>] </xsl:text>
-    </xsl:when>
-    <xsl:otherwise><!-- nop --></xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="bibliography.mode">
-  <xsl:apply-templates select="."/><!-- try the default mode -->
-</xsl:template>
-
-<xsl:template match="abbrev" mode="bibliography.mode">
-  <xsl:if test="preceding-sibling::*">
-    <fo:inline>
-      <xsl:apply-templates mode="bibliography.mode"/>
-    </fo:inline>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="abstract" mode="bibliography.mode">
-  <!-- suppressed -->
-</xsl:template>
-
-<xsl:template match="address" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="affiliation" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="shortaffil" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="jobtitle" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="artheader|articleinfo|article/info" 
-              mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="artpagenums" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="author" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:call-template name="person.name"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="authorblurb|personblurb" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:call-template name="person.name.list"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="authorinitials" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="bibliomisc" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="bibliomset" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<!-- ================================================== -->
-
-<xsl:template match="biblioset" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="biblioset/title|biblioset/citetitle" 
-              mode="bibliography.mode">
-  <xsl:variable name="relation" select="../@relation"/>
-  <xsl:choose>
-    <xsl:when test="$relation='article' or @pubwork='article'">
-      <xsl:call-template name="gentext.startquote"/>
-      <xsl:apply-templates mode="bibliography.mode"/>
-      <xsl:call-template name="gentext.endquote"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:inline font-style="italic">
-        <xsl:apply-templates/>
-      </fo:inline>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:value-of select="$biblioentry.item.separator"/>
-</xsl:template>
-
-<!-- ================================================== -->
-
-<xsl:template match="bookbiblio" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="citetitle" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:choose>
-      <xsl:when test="@pubwork = 'article'">
-        <xsl:call-template name="gentext.startquote"/>
-        <xsl:apply-templates mode="bibliography.mode"/>
-        <xsl:call-template name="gentext.endquote"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <fo:inline font-style="italic">
-          <xsl:apply-templates mode="bibliography.mode"/>
-        </fo:inline>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="collab" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="confgroup" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="contractnum" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="contractsponsor" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="contrib" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<!-- ================================================== -->
-
-<xsl:template match="copyright" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="'Copyright'"/>
-    </xsl:call-template>
-    <xsl:call-template name="gentext.space"/>
-    <xsl:call-template name="dingbat">
-      <xsl:with-param name="dingbat">copyright</xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="gentext.space"/>
-    <xsl:apply-templates select="year" mode="bibliography.mode"/>
-    <xsl:if test="holder">
-      <xsl:call-template name="gentext.space"/>
-      <xsl:apply-templates select="holder" mode="bibliography.mode"/>
-    </xsl:if>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="year" mode="bibliography.mode">
-  <xsl:apply-templates/><xsl:text>, </xsl:text>
-</xsl:template>
-
-<xsl:template match="year[position()=last()]" mode="bibliography.mode">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="holder" mode="bibliography.mode">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<!-- ================================================== -->
-
-<xsl:template match="corpauthor" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="corpcredit" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="corpname" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="date" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="edition" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="editor" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:call-template name="person.name"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="firstname" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="honorific" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="bibliography.mode">
-  <xsl:apply-templates select="."/> 
-</xsl:template>
-
-<xsl:template match="invpartnumber" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="isbn" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="issn" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="issuenum" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="lineage" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="orgname" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="othername" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="pagenums" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="printhistory" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="productname" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="productnumber" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="publisher" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="publishername" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="pubsnumber" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="bibliography.mode">
-  <fo:block>
-    <xsl:apply-templates select="."/> <!-- use normal mode -->
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="seriesinfo" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="seriesvolnums" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="surname" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="title" mode="bibliography.mode">
-  <fo:inline>
-    <fo:inline font-style="italic">
-      <xsl:apply-templates mode="bibliography.mode"/>
-    </fo:inline>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="titleabbrev" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="volumenum" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="orgdiv" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="collabname" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="confdates" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="conftitle" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="confnum" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="confsponsor" mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="bibliocoverage|biblioid|bibliorelation|bibliosource"
-              mode="bibliography.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:value-of select="$biblioentry.item.separator"/>
-  </fo:inline>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="bibliomixed.mode">
-  <xsl:apply-templates select="."/><!-- try the default mode -->
-</xsl:template>
-
-<xsl:template match="abbrev" mode="bibliomixed.mode">
-  <xsl:if test="preceding-sibling::*">
-    <fo:inline>
-      <xsl:apply-templates mode="bibliomixed.mode"/>
-    </fo:inline>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="abstract" mode="bibliomixed.mode">
-  <fo:block start-indent="1in">
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="para" mode="bibliomixed.mode">
-  <fo:block>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="address" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="affiliation" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="shortaffil" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="jobtitle" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliography.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="artpagenums" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="author" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:call-template name="person.name"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="authorblurb|personblurb" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="authorinitials" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="bibliomisc" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<!-- ================================================== -->
-
-<xsl:template match="bibliomset" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="bibliomset/title|bibliomset/citetitle" 
-              mode="bibliomixed.mode">
-  <xsl:variable name="relation" select="../@relation"/>
-  <xsl:choose>
-    <xsl:when test="$relation='article' or @pubwork='article'">
-      <xsl:call-template name="gentext.startquote"/>
-      <xsl:apply-templates mode="bibliomixed.mode"/>
-      <xsl:call-template name="gentext.endquote"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:inline font-style="italic">
-        <xsl:apply-templates/>
-      </fo:inline>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ================================================== -->
-
-<xsl:template match="biblioset" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="citetitle" mode="bibliomixed.mode">
-  <xsl:choose>
-    <xsl:when test="@pubwork = 'article'">
-      <xsl:call-template name="gentext.startquote"/>
-      <xsl:apply-templates mode="bibliomixed.mode"/>
-      <xsl:call-template name="gentext.endquote"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:inline font-style="italic">
-        <xsl:apply-templates mode="bibliography.mode"/>
-      </fo:inline>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="collab" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="confgroup" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="contractnum" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="contractsponsor" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="contrib" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="copyright" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="corpcredit" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="corpname" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="date" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="edition" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="editor" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="firstname" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="honorific" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="bibliomixed.mode">
-  <xsl:apply-templates select="."/> 
-</xsl:template>
-
-<xsl:template match="invpartnumber" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="isbn" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="issn" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="issuenum" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="lineage" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="orgname" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="othername" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="pagenums" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="printhistory" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="productname" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="productnumber" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="publisher" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="publishername" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="pubsnumber" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="seriesvolnums" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="surname" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="title" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="titleabbrev" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="volumenum" mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="bibliocoverage|biblioid|bibliorelation|bibliosource"
-              mode="bibliomixed.mode">
-  <fo:inline>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </fo:inline>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/block.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/block.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,600 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-<!-- What should we do about styling blockinfo? -->
-
-<xsl:template match="blockinfo|info">
-  <!-- suppress -->
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="block.object">
-  <fo:block>
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="para">
-  <fo:block xsl:use-attribute-sets="normal.para.spacing">
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="simpara">
-  <fo:block xsl:use-attribute-sets="normal.para.spacing">
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="formalpara">
-  <fo:block xsl:use-attribute-sets="normal.para.spacing">
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<!-- Only use title from info -->
-<xsl:template match="formalpara/info">
-  <xsl:apply-templates select="title"/>
-</xsl:template>
-
-<xsl:template match="formalpara/title|formalpara/info/title">
-  <xsl:variable name="titleStr">
-      <xsl:apply-templates/>
-  </xsl:variable>
-  <xsl:variable name="lastChar">
-    <xsl:if test="$titleStr != ''">
-      <xsl:value-of select="substring($titleStr,string-length($titleStr),1)"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <fo:inline font-weight="bold"
-             keep-with-next.within-line="always"
-             padding-end="1em">
-    <xsl:copy-of select="$titleStr"/>
-    <xsl:if test="$lastChar != ''
-                  and not(contains($runinhead.title.end.punct, $lastChar))">
-      <xsl:value-of select="$runinhead.default.title.end.punct"/>
-    </xsl:if>
-    <xsl:text>&#160;</xsl:text>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="formalpara/para">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="blockquote">
-  <fo:block xsl:use-attribute-sets="blockquote.properties">
-    <xsl:call-template name="anchor"/>
-    <fo:block>
-      <xsl:if test="title|info/title">
-        <fo:block xsl:use-attribute-sets="formal.title.properties">
-          <xsl:apply-templates select="." mode="object.title.markup"/>
-        </fo:block>
-      </xsl:if>
-      <xsl:apply-templates select="*[local-name(.) != 'title'
-                                   and local-name(.) != 'attribution']"/>
-    </fo:block>
-    <xsl:if test="attribution">
-      <fo:block text-align="right">
-        <!-- mdash -->
-        <xsl:text>&#x2014;</xsl:text>
-        <xsl:apply-templates select="attribution"/>
-      </fo:block>
-    </xsl:if>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="epigraph">
-  <fo:block>
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates select="para|simpara|formalpara|literallayout"/>
-    <xsl:if test="attribution">
-      <fo:inline>
-        <xsl:text>--</xsl:text>
-        <xsl:apply-templates select="attribution"/>
-      </fo:inline>
-    </xsl:if>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="attribution">
-  <fo:inline><xsl:apply-templates/></fo:inline>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="floater">
-  <xsl:param name="position" select="'none'"/>
-  <xsl:param name="clear" select="'both'"/>
-  <xsl:param name="width"/>
-  <xsl:param name="content"/>
-  <xsl:param name="start.indent">0pt</xsl:param>
-  <xsl:param name="end.indent">0pt</xsl:param>
-
-  <xsl:choose>
-    <xsl:when test="not($fop.extensions = 0)">
-      <!-- fop 0.20.5 does not support floats -->
-      <xsl:copy-of select="$content"/>
-    </xsl:when>
-    <xsl:when test="$position = 'none'">
-      <xsl:copy-of select="$content"/>
-    </xsl:when>
-    <xsl:when test="$position = 'before'">
-      <fo:float float="before">
-        <xsl:copy-of select="$content"/>
-      </fo:float>
-    </xsl:when>
-    <xsl:when test="$position = 'left' or
-                    $position = 'start' or
-                    $position = 'right' or
-                    $position = 'end' or
-                    $position = 'inside' or
-                    $position = 'outside'">
-      <xsl:variable name="float">
-        <fo:float float="{$position}"
-                  clear="{$clear}">
-          <fo:block-container 
-                    start-indent="{$start.indent}"
-                    end-indent="{$end.indent}">
-            <xsl:if test="$width != ''">
-              <xsl:attribute name="inline-progression-dimension">
-                <xsl:value-of select="$width"/>
-              </xsl:attribute>
-            </xsl:if>
-            <fo:block>
-              <xsl:copy-of select="$content"/>
-            </fo:block>
-          </fo:block-container>
-        </fo:float>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="$axf.extensions != 0 and self::sidebar">
-          <fo:block xsl:use-attribute-sets="normal.para.spacing"
-                    space-after="0pt"
-                    space-after.precedence="force"
-                    start-indent="0pt" end-indent="0pt">
-            <xsl:copy-of select="$float"/>
-          </fo:block>
-        </xsl:when>
-        <xsl:when test="$axf.extensions != 0 and 
-                        ($position = 'left' or $position = 'start')">
-          <fo:float float="{$position}"
-                    clear="{$clear}">
-            <fo:block-container 
-                      inline-progression-dimension=".001mm"
-                      end-indent="{$start.indent} + {$width} + {$end.indent}">
-              <xsl:attribute name="start-indent">
-                <xsl:choose>
-                  <xsl:when test="ancestor::para">
-                    <!-- Special case for handling inline floats
-                         in Antenna House-->
-                    <xsl:value-of select="concat('-', $body.start.indent)"/>
-                  </xsl:when>
-                  <xsl:otherwise>0pt</xsl:otherwise>
-                </xsl:choose>
-              </xsl:attribute>
-              <fo:block start-indent="{$start.indent}"
-                        end-indent="-{$start.indent} - {$width}">
-                <xsl:copy-of select="$content"/>
-              </fo:block>
-            </fo:block-container>
-          </fo:float>
-
-        </xsl:when>
-        <xsl:when test="$axf.extensions != 0 and 
-                        ($position = 'right' or $position = 'end')">
-          <!-- Special case for handling inline floats in Antenna House-->
-          <fo:float float="{$position}"
-                    clear="{$clear}">
-            <fo:block-container 
-                      inline-progression-dimension=".001mm"
-                      end-indent="-{$body.end.indent}"
-                      start-indent="{$start.indent} + {$width} + {$end.indent}">
-              <fo:block end-indent="{$end.indent}"
-                        start-indent="-{$end.indent} - {$width}">
-                <xsl:copy-of select="$content"/>
-              </fo:block>
-            </fo:block-container>
-          </fo:float>
-
-        </xsl:when>
-        <xsl:when test="$xep.extensions != 0 and self::sidebar">
-          <!-- float needs some space above  to line up with following para -->
-          <fo:block xsl:use-attribute-sets="normal.para.spacing">
-            <xsl:copy-of select="$float"/>
-          </fo:block>
-        </xsl:when>
-        <xsl:when test="$xep.extensions != 0">
-          <xsl:copy-of select="$float"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:copy-of select="$float"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$content"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="sidebar" name="sidebar">
-  <!-- Also does margin notes -->
-  <xsl:variable name="pi-type">
-    <xsl:call-template name="pi.dbfo_float-type"/>
-  </xsl:variable>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$pi-type = 'margin.note'">
-      <xsl:call-template name="margin.note"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="content">
-        <fo:block xsl:use-attribute-sets="sidebar.properties"
-                  id="{$id}">
-          <xsl:call-template name="sidebar.titlepage"/>
-          <xsl:apply-templates select="node()[not(self::title) and
-                                         not(self::info) and
-                                         not(self::sidebarinfo)]"/>
-        </fo:block>
-      </xsl:variable>
-
-      <xsl:variable name="pi-width">
-        <xsl:call-template name="pi.dbfo_sidebar-width"/>
-      </xsl:variable>
-
-      <xsl:variable name="position">
-        <xsl:choose>
-          <xsl:when test="$pi-type != ''">
-            <xsl:value-of select="$pi-type"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$sidebar.float.type"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-    
-      <xsl:call-template name="floater">
-        <xsl:with-param name="content" select="$content"/>
-        <xsl:with-param name="position" select="$position"/>
-        <xsl:with-param name="width">
-          <xsl:choose>
-            <xsl:when test="$pi-width != ''">
-              <xsl:value-of select="$pi-width"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="$sidebar.float.width"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
-        <xsl:with-param name="start.indent">
-          <xsl:choose>
-            <xsl:when test="$position = 'start' or 
-                            $position = 'left'">0pt</xsl:when>
-            <xsl:when test="$position = 'end' or 
-                            $position = 'right'">0.5em</xsl:when>
-            <xsl:otherwise>0pt</xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
-        <xsl:with-param name="end.indent">
-          <xsl:choose>
-            <xsl:when test="$position = 'start' or 
-                            $position = 'left'">0.5em</xsl:when>
-            <xsl:when test="$position = 'end' or 
-                            $position = 'right'">0pt</xsl:when>
-            <xsl:otherwise>0pt</xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template match="sidebar/title|sidebarinfo|sidebar/info"/>
-
-<xsl:template match="sidebar/title|sidebarinfo/title|sidebar/info/title"
-              mode="titlepage.mode" priority="1">
-  <fo:block xsl:use-attribute-sets="sidebar.title.properties">
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template name="margin.note">
-  <xsl:param name="content">
-    <fo:block xsl:use-attribute-sets="margin.note.properties">
-      <xsl:if test="./title">
-        <fo:block xsl:use-attribute-sets="margin.note.title.properties">
-          <xsl:apply-templates select="./title" mode="margin.note.title.mode"/>
-        </fo:block>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </fo:block>
-  </xsl:param>
-
-  <xsl:variable name="pi-width">
-    <xsl:call-template name="pi.dbfo_sidebar-width"/>
-  </xsl:variable>
-
-  <xsl:variable name="position" select="$margin.note.float.type"/>
-
-  <xsl:call-template name="floater">
-    <xsl:with-param name="content" select="$content"/>
-    <xsl:with-param name="position" select="$position"/>
-    <xsl:with-param name="width" >
-      <xsl:choose>
-        <xsl:when test="$pi-width != ''">
-          <xsl:value-of select="$pi-width"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$margin.note.width"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:with-param>
-    <xsl:with-param name="start.indent">
-      <xsl:choose>
-        <xsl:when test="$position = 'start' or 
-                        $position = 'left'">0pt</xsl:when>
-        <xsl:when test="$position = 'end' or 
-                        $position = 'right'">0.5em</xsl:when>
-        <xsl:otherwise>0pt</xsl:otherwise>
-      </xsl:choose>
-    </xsl:with-param>
-    <xsl:with-param name="end.indent">
-      <xsl:choose>
-        <xsl:when test="$position = 'start' or 
-                        $position = 'left'">0.5em</xsl:when>
-        <xsl:when test="$position = 'end' or 
-                        $position = 'right'">0pt</xsl:when>
-        <xsl:otherwise>0pt</xsl:otherwise>
-      </xsl:choose>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="sidebar/title" mode="margin.note.title.mode">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="abstract">
-  <fo:block xsl:use-attribute-sets="abstract.properties">
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="abstract/title|abstract/info/title">
-  <fo:block xsl:use-attribute-sets="abstract.title.properties">
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="msgset">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="msgentry">
-  <xsl:call-template name="block.object"/>
-</xsl:template>
-
-<xsl:template match="simplemsgentry">
-  <xsl:call-template name="block.object"/>
-</xsl:template>
-
-<xsl:template match="msg">
-  <xsl:call-template name="block.object"/>
-</xsl:template>
-
-<xsl:template match="msgmain">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="msgsub">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="msgrel">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="msgtext">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="msginfo">
-  <xsl:call-template name="block.object"/>
-</xsl:template>
-
-<xsl:template match="msglevel">
-  <fo:block>
-    <fo:inline font-weight="bold"
-               keep-with-next.within-line="always">
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'msgset'"/>
-        <xsl:with-param name="name" select="'MsgLevel'"/>
-      </xsl:call-template>
-    </fo:inline>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="msgorig">
-  <fo:block>
-    <fo:inline font-weight="bold"
-               keep-with-next.within-line="always">
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'msgset'"/>
-        <xsl:with-param name="name" select="'MsgOrig'"/>
-      </xsl:call-template>
-    </fo:inline>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="msgaud">
-  <fo:block>
-    <fo:inline font-weight="bold"
-               keep-with-next.within-line="always">
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'msgset'"/>
-        <xsl:with-param name="name" select="'MsgAud'"/>
-      </xsl:call-template>
-    </fo:inline>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="msgexplan">
-  <xsl:call-template name="block.object"/>
-</xsl:template>
-
-<xsl:template match="msgexplan/title">
-  <fo:block font-weight="bold"
-            keep-with-next.within-column="always"
-            hyphenate="false">
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<!-- For better or worse, revhistory is allowed in content... -->
-
-<xsl:template match="revhistory">
-  <fo:table table-layout="fixed" xsl:use-attribute-sets="revhistory.table.properties">
-    <xsl:call-template name="anchor"/>
-    <fo:table-column column-number="1" column-width="proportional-column-width(1)"/>
-    <fo:table-column column-number="2" column-width="proportional-column-width(1)"/>
-    <fo:table-column column-number="3" column-width="proportional-column-width(1)"/>
-    <fo:table-body start-indent="0pt" end-indent="0pt">
-      <fo:table-row>
-        <fo:table-cell number-columns-spanned="3" xsl:use-attribute-sets="revhistory.table.cell.properties">
-          <fo:block xsl:use-attribute-sets="revhistory.title.properties">
-            <xsl:call-template name="gentext">
-              <xsl:with-param name="key" select="'RevHistory'"/>
-            </xsl:call-template>
-          </fo:block>
-        </fo:table-cell>
-      </fo:table-row>
-      <xsl:apply-templates/>
-    </fo:table-body>
-  </fo:table>
-</xsl:template>
-
-<xsl:template match="revhistory/revision">
-  <xsl:variable name="revnumber" select="revnumber"/>
-  <xsl:variable name="revdate"   select="date"/>
-  <xsl:variable name="revauthor" select="authorinitials|author"/>
-  <xsl:variable name="revremark" select="revremark|revdescription"/>
-  <fo:table-row>
-    <fo:table-cell xsl:use-attribute-sets="revhistory.table.cell.properties">
-      <fo:block>
-        <xsl:call-template name="anchor"/>
-        <xsl:if test="$revnumber">
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'Revision'"/>
-          </xsl:call-template>
-          <xsl:call-template name="gentext.space"/>
-          <xsl:apply-templates select="$revnumber[1]"/>
-        </xsl:if>
-      </fo:block>
-    </fo:table-cell>
-    <fo:table-cell xsl:use-attribute-sets="revhistory.table.cell.properties">
-      <fo:block>
-        <xsl:apply-templates select="$revdate[1]"/>
-      </fo:block>
-    </fo:table-cell>
-    <fo:table-cell xsl:use-attribute-sets="revhistory.table.cell.properties">
-      <fo:block>
-        <xsl:for-each select="$revauthor">
-          <xsl:apply-templates select="."/>
-          <xsl:if test="position() != last()">
-            <xsl:text>, </xsl:text>
-          </xsl:if>
-        </xsl:for-each>
-      </fo:block>
-    </fo:table-cell>
-  </fo:table-row>
-  <xsl:if test="$revremark">
-    <fo:table-row>
-      <fo:table-cell number-columns-spanned="3" xsl:use-attribute-sets="revhistory.table.cell.properties">
-        <fo:block>
-          <xsl:apply-templates select="$revremark[1]"/>
-        </fo:block>
-      </fo:table-cell>
-    </fo:table-row>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="revision/revnumber">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="revision/date">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="revision/authorinitials">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="revision/author">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="revision/revremark">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="revision/revdescription">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="ackno">
-  <fo:block xsl:use-attribute-sets="normal.para.spacing">
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="highlights">
-  <xsl:call-template name="block.object"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/callout.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/callout.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,231 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:sverb="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Verbatim"
-                xmlns:xverb="com.nwalsh.xalan.Verbatim"
-                xmlns:lxslt="http://xml.apache.org/xslt"
-                exclude-result-prefixes="sverb xverb lxslt"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<lxslt:component prefix="xverb"
-                 functions="insertCallouts"/>
-
-<xsl:template match="programlistingco|screenco">
-  <xsl:variable name="verbatim" select="programlisting|screen"/>
-  <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
-
-  <xsl:choose>
-    <xsl:when test="$use.extensions != '0'
-                    and $callouts.extension != '0'">
-      <xsl:variable name="rtf">
-        <xsl:apply-templates select="$verbatim">
-          <xsl:with-param name="suppress-numbers" select="'1'"/>
-        </xsl:apply-templates>
-      </xsl:variable>
-
-      <xsl:variable name="rtf-with-callouts">
-        <xsl:choose>
-          <xsl:when test="contains($vendor, 'SAXON ')">
-            <xsl:copy-of select="sverb:insertCallouts(areaspec,$rtf)"/>
-          </xsl:when>
-          <xsl:when test="contains($vendor, 'Apache Software Foundation')">
-            <xsl:copy-of select="xverb:insertCallouts(areaspec,$rtf)"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:message terminate="yes">
-              <xsl:text>Don't know how to do callouts with </xsl:text>
-              <xsl:value-of select="$vendor"/>
-            </xsl:message>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="$verbatim/@linenumbering = 'numbered'
-                        and $linenumbering.extension != '0'">
-          <xsl:call-template name="number.rtf.lines">
-            <xsl:with-param name="rtf" select="$rtf-with-callouts"/>
-            <xsl:with-param name="pi.context"
-                            select="programlisting|screen"/>
-          </xsl:call-template>
-          <xsl:apply-templates select="calloutlist"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:copy-of select="$rtf-with-callouts"/>
-          <xsl:apply-templates select="calloutlist"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="areaspec|areaset|area">
-</xsl:template>
-
-<xsl:template match="areaset" mode="conumber">
-  <xsl:number count="area|areaset" format="1"/>
-</xsl:template>
-
-<xsl:template match="area" mode="conumber">
-  <xsl:number count="area|areaset" format="1"/>
-</xsl:template>
-
-<xsl:template match="co">
-  <fo:inline>
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates select="." mode="callout-bug"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="coref">
-  <!-- tricky; this relies on the fact that we can process the "co" that's -->
-  <!-- "over there" as if it were "right here" -->
-
-  <xsl:variable name="co" select="key('id', @linkend)"/>
-  <xsl:choose>
-    <xsl:when test="not($co)">
-      <xsl:message>
-        <xsl:text>Error: coref link is broken: </xsl:text>
-        <xsl:value-of select="@linkend"/>
-      </xsl:message>
-    </xsl:when>
-    <xsl:when test="local-name($co) != 'co'">
-      <xsl:message>
-        <xsl:text>Error: coref doesn't point to a co: </xsl:text>
-        <xsl:value-of select="@linkend"/>
-      </xsl:message>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:inline>
-        <xsl:call-template name="anchor"/>
-        <xsl:apply-templates select="$co" mode="callout-bug"/>
-      </fo:inline>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="co" mode="callout-bug">
-  <xsl:call-template name="callout-bug">
-    <xsl:with-param name="conum">
-      <xsl:number count="co"
-                  level="any"
-                  from="programlisting|screen|literallayout|synopsis"
-                  format="1"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="callout-bug">
-  <xsl:param name="conum" select='1'/>
-
-  <xsl:choose>
-    <!-- Draw callouts as images -->
-    <xsl:when test="$callout.graphics != '0'
-                    and $conum &lt;= $callout.graphics.number.limit">
-      <xsl:variable name="filename"
-                    select="concat($callout.graphics.path, $conum,
-		                   $callout.graphics.extension)"/>
-
-      <fo:external-graphic content-width="{$callout.icon.size}"
-                           width="{$callout.icon.size}">
-        <xsl:attribute name="src">
-          <xsl:choose>
-            <xsl:when test="$passivetex.extensions != 0
-                            or $fop.extensions != 0
-                            or $arbortext.extensions != 0">
-              <xsl:value-of select="$filename"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:text>url(</xsl:text>
-              <xsl:value-of select="$filename"/>
-              <xsl:text>)</xsl:text>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:attribute>
-      </fo:external-graphic>
-    </xsl:when>
-
-    <xsl:when test="$callout.unicode != 0
-                    and $conum &lt;= $callout.unicode.number.limit">
-      <xsl:variable name="comarkup">
-        <xsl:choose>
-          <xsl:when test="$callout.unicode.start.character = 10102">
-            <xsl:choose>
-              <xsl:when test="$conum = 1">&#10102;</xsl:when>
-              <xsl:when test="$conum = 2">&#10103;</xsl:when>
-              <xsl:when test="$conum = 3">&#10104;</xsl:when>
-              <xsl:when test="$conum = 4">&#10105;</xsl:when>
-              <xsl:when test="$conum = 5">&#10106;</xsl:when>
-              <xsl:when test="$conum = 6">&#10107;</xsl:when>
-              <xsl:when test="$conum = 7">&#10108;</xsl:when>
-              <xsl:when test="$conum = 8">&#10109;</xsl:when>
-              <xsl:when test="$conum = 9">&#10110;</xsl:when>
-              <xsl:when test="$conum = 10">&#10111;</xsl:when>
-            </xsl:choose>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:message>
-              <xsl:text>Don't know how to generate Unicode callouts </xsl:text>
-              <xsl:text>when $callout.unicode.start.character is </xsl:text>
-              <xsl:value-of select="$callout.unicode.start.character"/>
-            </xsl:message>
-            <fo:inline background-color="#404040"
-                       color="white"
-                       padding-top="0.1em"
-                       padding-bottom="0.1em"
-                       padding-start="0.2em"
-                       padding-end="0.2em"
-                       baseline-shift="0.1em"
-                       font-family="{$body.fontset}"
-                       font-weight="bold"
-                       font-size="75%">
-              <xsl:value-of select="$conum"/>
-            </fo:inline>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="$callout.unicode.font != ''">
-          <fo:inline font-family="{$callout.unicode.font}">
-            <xsl:copy-of select="$comarkup"/>
-          </fo:inline>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:copy-of select="$comarkup"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <!-- Most safe: draw a dark gray square with a white number inside -->
-    <xsl:otherwise>
-      <fo:inline background-color="#404040"
-                 color="white"
-                 padding-top="0.1em"
-                 padding-bottom="0.1em"
-                 padding-start="0.2em"
-                 padding-end="0.2em"
-                 baseline-shift="0.1em"
-                 font-family="{$body.fontset}"
-                 font-weight="bold"
-                 font-size="75%">
-        <xsl:value-of select="$conum"/>
-      </fo:inline>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/component.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/component.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,797 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:axf="http://www.antennahouse.com/names/XSL/Extensions"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-
-<xsl:template name="component.title">
-  <xsl:param name="node" select="."/>
-  <xsl:param name="pagewide" select="0"/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$node"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="title">
-    <xsl:apply-templates select="$node" mode="object.title.markup">
-      <xsl:with-param name="allow-anchors" select="1"/>
-    </xsl:apply-templates>
-  </xsl:variable>
-
-  <xsl:variable name="titleabbrev">
-    <xsl:apply-templates select="$node" mode="titleabbrev.markup"/>
-  </xsl:variable>
-
-  <xsl:variable name="level">
-    <xsl:choose>
-      <xsl:when test="ancestor::section">
-        <xsl:value-of select="count(ancestor::section)+1"/>
-      </xsl:when>
-      <xsl:when test="ancestor::sect5">6</xsl:when>
-      <xsl:when test="ancestor::sect4">5</xsl:when>
-      <xsl:when test="ancestor::sect3">4</xsl:when>
-      <xsl:when test="ancestor::sect2">3</xsl:when>
-      <xsl:when test="ancestor::sect1">2</xsl:when>
-      <xsl:otherwise>1</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:if test="$passivetex.extensions != 0">
-    <fotex:bookmark xmlns:fotex="http://www.tug.org/fotex"
-                    fotex-bookmark-level="2"
-                    fotex-bookmark-label="{$id}">
-      <xsl:value-of select="$titleabbrev"/>
-    </fotex:bookmark>
-  </xsl:if>
-
-  <fo:block xsl:use-attribute-sets="component.title.properties">
-    <xsl:if test="$pagewide != 0">
-      <!-- Doesn't work to use 'all' here since not a child of fo:flow -->
-      <xsl:attribute name="span">inherit</xsl:attribute>
-    </xsl:if>
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:if test="$axf.extensions != 0">
-      <xsl:attribute name="axf:outline-level">
-        <xsl:value-of select="count($node/ancestor::*)"/>
-      </xsl:attribute>
-      <xsl:attribute name="axf:outline-expand">false</xsl:attribute>
-      <xsl:attribute name="axf:outline-title">
-        <xsl:value-of select="normalize-space($title)"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <!-- Let's handle the case where a component (bibliography, for example)
-         occurs inside a section; will we need parameters for this?
-         Danger Will Robinson: using section.title.level*.properties here
-         runs the risk that someone will set something other than
-         font-size there... -->
-    <xsl:choose>
-      <xsl:when test="$level=2">
-        <fo:block xsl:use-attribute-sets="section.title.level2.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$level=3">
-        <fo:block xsl:use-attribute-sets="section.title.level3.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$level=4">
-        <fo:block xsl:use-attribute-sets="section.title.level4.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$level=5">
-        <fo:block xsl:use-attribute-sets="section.title.level5.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$level=6">
-        <fo:block xsl:use-attribute-sets="section.title.level6.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- not in a section: do nothing special -->
-        <xsl:copy-of select="$title"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="dedication" mode="dedication">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster"/>
-  </xsl:variable>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$master-reference}">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language"/>
-    </xsl:attribute>
-    <xsl:attribute name="format">
-      <xsl:call-template name="page.number.format">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="initial-page-number">
-      <xsl:call-template name="initial.page.number">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="force-page-count">
-      <xsl:call-template name="force.page.count">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="set.flow.properties">
-        <xsl:with-param name="element" select="local-name(.)"/>
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="component.titlepage.properties">
-        <xsl:call-template name="dedication.titlepage"/>
-      </fo:block>
-      <xsl:apply-templates/>
-    </fo:flow>
-  </fo:page-sequence>
-</xsl:template>
-
-<xsl:template match="dedication"></xsl:template> <!-- see mode="dedication" -->
-<xsl:template match="dedication/docinfo"></xsl:template>
-<xsl:template match="dedication/title"></xsl:template>
-<xsl:template match="dedication/subtitle"></xsl:template>
-<xsl:template match="dedication/titleabbrev"></xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="colophon">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster"/>
-  </xsl:variable>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$master-reference}">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language"/>
-    </xsl:attribute>
-    <xsl:attribute name="format">
-      <xsl:call-template name="page.number.format">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="initial-page-number">
-      <xsl:call-template name="initial.page.number">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="force-page-count">
-      <xsl:call-template name="force.page.count">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="set.flow.properties">
-        <xsl:with-param name="element" select="local-name(.)"/>
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="component.titlepage.properties">
-        <xsl:call-template name="colophon.titlepage"/>
-      </fo:block>
-      <xsl:apply-templates/>
-    </fo:flow>
-  </fo:page-sequence>
-</xsl:template>
-
-<xsl:template match="colophon/title"></xsl:template>
-<xsl:template match="colophon/subtitle"></xsl:template>
-<xsl:template match="colophon/titleabbrev"></xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="preface">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster"/>
-  </xsl:variable>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$master-reference}">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language"/>
-    </xsl:attribute>
-    <xsl:attribute name="format">
-      <xsl:call-template name="page.number.format">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="initial-page-number">
-      <xsl:call-template name="initial.page.number">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="force-page-count">
-      <xsl:call-template name="force.page.count">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="set.flow.properties">
-        <xsl:with-param name="element" select="local-name(.)"/>
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="component.titlepage.properties">
-        <xsl:call-template name="preface.titlepage"/>
-      </fo:block>
-
-      <xsl:variable name="toc.params">
-        <xsl:call-template name="find.path.params">
-          <xsl:with-param name="table" 
-                          select="normalize-space($generate.toc)"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:if test="contains($toc.params, 'toc')">
-        <xsl:call-template name="component.toc">
-          <xsl:with-param name="toc.title.p" 
-                          select="contains($toc.params, 'title')"/>
-        </xsl:call-template>
-        <xsl:call-template name="component.toc.separator"/>
-      </xsl:if>
-
-      <xsl:apply-templates/>
-    </fo:flow>
-  </fo:page-sequence>
-</xsl:template>
-
-<xsl:template match="preface/docinfo|prefaceinfo"></xsl:template>
-<xsl:template match="preface/info"></xsl:template>
-<xsl:template match="preface/title"></xsl:template>
-<xsl:template match="preface/titleabbrev"></xsl:template>
-<xsl:template match="preface/subtitle"></xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="chapter">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster"/>
-  </xsl:variable>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$master-reference}">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language"/>
-    </xsl:attribute>
-    <xsl:attribute name="format">
-      <xsl:call-template name="page.number.format">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="initial-page-number">
-      <xsl:call-template name="initial.page.number">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="force-page-count">
-      <xsl:call-template name="force.page.count">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="set.flow.properties">
-        <xsl:with-param name="element" select="local-name(.)"/>
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="component.titlepage.properties">
-        <xsl:call-template name="chapter.titlepage"/>
-      </fo:block>
-
-      <xsl:variable name="toc.params">
-        <xsl:call-template name="find.path.params">
-          <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:if test="contains($toc.params, 'toc')">
-        <xsl:call-template name="component.toc">
-          <xsl:with-param name="toc.title.p" 
-                          select="contains($toc.params, 'title')"/>
-        </xsl:call-template>
-        <xsl:call-template name="component.toc.separator"/>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </fo:flow>
-  </fo:page-sequence>
-</xsl:template>
-
-<xsl:template match="chapter/docinfo|chapterinfo"></xsl:template>
-<xsl:template match="chapter/info"></xsl:template>
-<xsl:template match="chapter/title"></xsl:template>
-<xsl:template match="chapter/titleabbrev"></xsl:template>
-<xsl:template match="chapter/subtitle"></xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="appendix">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster"/>
-  </xsl:variable>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$master-reference}">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language"/>
-    </xsl:attribute>
-    <xsl:attribute name="format">
-      <xsl:call-template name="page.number.format">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="initial-page-number">
-      <xsl:call-template name="initial.page.number">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="force-page-count">
-      <xsl:call-template name="force.page.count">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="set.flow.properties">
-        <xsl:with-param name="element" select="local-name(.)"/>
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="component.titlepage.properties">
-        <xsl:call-template name="appendix.titlepage"/>
-      </fo:block>
-
-      <xsl:variable name="toc.params">
-        <xsl:call-template name="find.path.params">
-          <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:if test="contains($toc.params, 'toc')">
-        <xsl:call-template name="component.toc">
-          <xsl:with-param name="toc.title.p" 
-                          select="contains($toc.params, 'title')"/>
-        </xsl:call-template>
-        <xsl:call-template name="component.toc.separator"/>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </fo:flow>
-  </fo:page-sequence>
-</xsl:template>
-
-<xsl:template match="appendix/docinfo|appendixinfo"></xsl:template>
-<xsl:template match="appendix/info"></xsl:template>
-<xsl:template match="appendix/title"></xsl:template>
-<xsl:template match="appendix/titleabbrev"></xsl:template>
-<xsl:template match="appendix/subtitle"></xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="article">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster"/>
-  </xsl:variable>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$master-reference}">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language"/>
-    </xsl:attribute>
-    <xsl:attribute name="format">
-      <xsl:call-template name="page.number.format">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="initial-page-number">
-      <xsl:call-template name="initial.page.number">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="force-page-count">
-      <xsl:call-template name="force.page.count">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="set.flow.properties">
-        <xsl:with-param name="element" select="local-name(.)"/>
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="component.titlepage.properties">
-        <xsl:call-template name="article.titlepage"/>
-      </fo:block>
-
-      <xsl:variable name="toc.params">
-        <xsl:call-template name="find.path.params">
-          <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:if test="contains($toc.params, 'toc')">
-        <xsl:call-template name="component.toc">
-          <xsl:with-param name="toc.title.p" 
-                          select="contains($toc.params, 'title')"/>
-        </xsl:call-template>
-        <xsl:call-template name="component.toc.separator"/>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </fo:flow>
-  </fo:page-sequence>
-</xsl:template>
-
-<xsl:template match="article/artheader"></xsl:template>
-<xsl:template match="article/articleinfo"></xsl:template>
-<xsl:template match="article/info"></xsl:template>
-<xsl:template match="article/title"></xsl:template>
-<xsl:template match="article/subtitle"></xsl:template>
-<xsl:template match="article/titleabbrev"></xsl:template>
-
-<xsl:template match="article/appendix">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="title">
-    <xsl:apply-templates select="." mode="object.title.markup"/>
-  </xsl:variable>
-
-  <xsl:variable name="titleabbrev">
-    <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-  </xsl:variable>
-
-  <fo:block id='{$id}'>
-    <xsl:if test="$axf.extensions != 0">
-      <xsl:attribute name="axf:outline-level">
-        <xsl:value-of select="count(ancestor::*)+2"/>
-      </xsl:attribute>
-      <xsl:attribute name="axf:outline-expand">false</xsl:attribute>
-      <xsl:attribute name="axf:outline-title">
-        <xsl:value-of select="normalize-space($titleabbrev)"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:if test="$passivetex.extensions != 0">
-      <fotex:bookmark xmlns:fotex="http://www.tug.org/fotex" 
-                      fotex-bookmark-level="{count(ancestor::*)+2}" 
-                      fotex-bookmark-label="{$id}">
-        <xsl:value-of select="$titleabbrev"/>
-      </fotex:bookmark>
-    </xsl:if>
-
-    <fo:block xsl:use-attribute-sets="article.appendix.title.properties">
-      <fo:marker marker-class-name="section.head.marker">
-        <xsl:choose>
-          <xsl:when test="$titleabbrev = ''">
-            <xsl:value-of select="$title"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$titleabbrev"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </fo:marker>
-      <xsl:copy-of select="$title"/>
-    </fo:block>
-
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- Utility template to create a page sequence for an element -->
-<xsl:template match="*" mode="page.sequence" name="page.sequence">
-  <xsl:param name="content">
-    <xsl:apply-templates/>
-  </xsl:param>
-  <xsl:param name="master-reference">
-    <xsl:call-template name="select.pagemaster"/>
-  </xsl:param>
-  <xsl:param name="element" select="local-name(.)"/>
-  <xsl:param name="gentext-key" select="local-name(.)"/>
-  <xsl:param name="language">
-    <xsl:call-template name="l10n.language"/>
-  </xsl:param>
-
-  <xsl:param name="format">
-    <xsl:call-template name="page.number.format">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-      <xsl:with-param name="element" select="$element"/>
-    </xsl:call-template>
-  </xsl:param>
-
-  <xsl:param name="initial-page-number">
-    <xsl:call-template name="initial.page.number">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-      <xsl:with-param name="element" select="$element"/>
-    </xsl:call-template>
-  </xsl:param>
-
-  <xsl:param name="force-page-count">
-    <xsl:call-template name="force.page.count">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-      <xsl:with-param name="element" select="$element"/>
-    </xsl:call-template>
-  </xsl:param>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$master-reference}">
-    <xsl:attribute name="language">
-      <xsl:value-of select="$language"/>
-    </xsl:attribute>
-    <xsl:attribute name="format">
-      <xsl:value-of select="$format"/>
-    </xsl:attribute>
-
-    <xsl:attribute name="initial-page-number">
-      <xsl:value-of select="$initial-page-number"/>
-    </xsl:attribute>
-
-    <xsl:attribute name="force-page-count">
-      <xsl:value-of select="$force-page-count"/>
-    </xsl:attribute>
-
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-      <xsl:with-param name="gentext-key" select="$gentext-key"/>
-    </xsl:apply-templates>
-
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-      <xsl:with-param name="gentext-key" select="$gentext-key"/>
-    </xsl:apply-templates>
-
-    <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="set.flow.properties">
-        <xsl:with-param name="element" select="local-name(.)"/>
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-
-      <xsl:copy-of select="$content"/>
-
-    </fo:flow>
-  </fo:page-sequence>
-</xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/division.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/division.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,611 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:axf="http://www.antennahouse.com/names/XSL/Extensions"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template name="division.title">
-  <xsl:param name="node" select="."/>
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$node"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="title">
-    <xsl:apply-templates select="$node" mode="object.title.markup"/>
-  </xsl:variable>
-
-  <xsl:if test="$passivetex.extensions != 0">
-    <fotex:bookmark xmlns:fotex="http://www.tug.org/fotex"
-                    fotex-bookmark-level="1"
-                    fotex-bookmark-label="{$id}">
-      <xsl:value-of select="$title"/>
-    </fotex:bookmark>
-  </xsl:if>
-
-  <fo:block keep-with-next.within-column="always"
-            hyphenate="false">
-    <xsl:if test="$axf.extensions != 0">
-      <xsl:attribute name="axf:outline-level">
-        <xsl:choose>
-          <xsl:when test="count($node/ancestor::*) > 0">
-            <xsl:value-of select="count($node/ancestor::*)"/>
-          </xsl:when>
-          <xsl:otherwise>1</xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-      <xsl:attribute name="axf:outline-expand">false</xsl:attribute>
-      <xsl:attribute name="axf:outline-title">
-        <xsl:value-of select="normalize-space($title)"/>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:copy-of select="$title"/>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="set">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="preamble"
-                select="*[not(self::book or self::setindex)]"/>
-
-  <xsl:variable name="content" select="book|setindex"/>
-
-  <xsl:variable name="titlepage-master-reference">
-    <xsl:call-template name="select.pagemaster">
-      <xsl:with-param name="pageclass" select="'titlepage'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="lot-master-reference">
-    <xsl:call-template name="select.pagemaster">
-      <xsl:with-param name="pageclass" select="'lot'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:if test="$preamble">
-    <fo:page-sequence hyphenate="{$hyphenate}"
-                      master-reference="{$titlepage-master-reference}">
-      <xsl:attribute name="language">
-        <xsl:call-template name="l10n.language"/>
-      </xsl:attribute>
-      <xsl:attribute name="format">
-        <xsl:call-template name="page.number.format">
-          <xsl:with-param name="master-reference" 
-                          select="$titlepage-master-reference"/>
-        </xsl:call-template>
-      </xsl:attribute>
-
-      <xsl:attribute name="initial-page-number">
-        <xsl:call-template name="initial.page.number">
-          <xsl:with-param name="master-reference" 
-                          select="$titlepage-master-reference"/>
-        </xsl:call-template>
-      </xsl:attribute>
-
-      <xsl:attribute name="force-page-count">
-        <xsl:call-template name="force.page.count">
-          <xsl:with-param name="master-reference" 
-                          select="$titlepage-master-reference"/>
-        </xsl:call-template>
-      </xsl:attribute>
-
-      <xsl:attribute name="hyphenation-character">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'hyphenation-character'"/>
-        </xsl:call-template>
-      </xsl:attribute>
-      <xsl:attribute name="hyphenation-push-character-count">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-        </xsl:call-template>
-      </xsl:attribute>
-      <xsl:attribute name="hyphenation-remain-character-count">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-        </xsl:call-template>
-      </xsl:attribute>
-
-      <xsl:apply-templates select="." mode="running.head.mode">
-        <xsl:with-param name="master-reference" select="$titlepage-master-reference"/>
-      </xsl:apply-templates>
-
-      <xsl:apply-templates select="." mode="running.foot.mode">
-        <xsl:with-param name="master-reference" select="$titlepage-master-reference"/>
-      </xsl:apply-templates>
-
-      <fo:flow flow-name="xsl-region-body">
-        <xsl:call-template name="set.flow.properties">
-          <xsl:with-param name="element" select="local-name(.)"/>
-          <xsl:with-param name="master-reference" 
-                          select="$titlepage-master-reference"/>
-        </xsl:call-template>
-
-        <fo:block id="{$id}">
-          <xsl:call-template name="set.titlepage"/>
-        </fo:block>
-      </fo:flow>
-    </fo:page-sequence>
-  </xsl:if>
-
-  <xsl:variable name="toc.params">
-    <xsl:call-template name="find.path.params">
-      <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:if test="contains($toc.params, 'toc')">
-    <fo:page-sequence hyphenate="{$hyphenate}"
-                      master-reference="{$lot-master-reference}">
-      <xsl:attribute name="language">
-        <xsl:call-template name="l10n.language"/>
-      </xsl:attribute>
-      <xsl:attribute name="format">
-        <xsl:call-template name="page.number.format">
-          <xsl:with-param name="element" select="'toc'"/>
-          <xsl:with-param name="master-reference"
-                          select="$lot-master-reference"/>
-        </xsl:call-template>
-      </xsl:attribute>
-      <xsl:attribute name="initial-page-number">
-        <xsl:call-template name="initial.page.number">
-          <xsl:with-param name="master-reference"
-                          select="$lot-master-reference"/>
-        </xsl:call-template>
-      </xsl:attribute>
-      <xsl:attribute name="force-page-count">
-        <xsl:call-template name="force.page.count">
-          <xsl:with-param name="master-reference"
-                          select="$lot-master-reference"/>
-        </xsl:call-template>
-      </xsl:attribute>
-
-      <xsl:attribute name="hyphenation-character">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'hyphenation-character'"/>
-        </xsl:call-template>
-      </xsl:attribute>
-      <xsl:attribute name="hyphenation-push-character-count">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-        </xsl:call-template>
-      </xsl:attribute>
-      <xsl:attribute name="hyphenation-remain-character-count">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-        </xsl:call-template>
-      </xsl:attribute>
-
-      <xsl:apply-templates select="." mode="running.head.mode">
-        <xsl:with-param name="master-reference" select="$lot-master-reference"/>
-      </xsl:apply-templates>
-
-      <xsl:apply-templates select="." mode="running.foot.mode">
-        <xsl:with-param name="master-reference" select="$lot-master-reference"/>
-      </xsl:apply-templates>
-
-      <fo:flow flow-name="xsl-region-body">
-        <xsl:call-template name="set.flow.properties">
-          <xsl:with-param name="element" select="local-name(.)"/>
-          <xsl:with-param name="master-reference" 
-                          select="$lot-master-reference"/>
-        </xsl:call-template>
-
-        <xsl:call-template name="set.toc"/>
-      </fo:flow>
-    </fo:page-sequence>
-  </xsl:if>
-
-  <xsl:apply-templates select="$content"/>
-</xsl:template>
-
-<xsl:template match="set/setinfo"></xsl:template>
-<xsl:template match="set/title"></xsl:template>
-<xsl:template match="set/subtitle"></xsl:template>
-<xsl:template match="set/titleabbrev"></xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="book">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="preamble"
-                select="title|subtitle|titleabbrev|bookinfo|info"/>
-
-  <xsl:variable name="content"
-                select="node()[not(self::title or self::subtitle
-                            or self::titleabbrev
-                            or self::info
-                            or self::bookinfo)]"/>
-
-  <xsl:variable name="titlepage-master-reference">
-    <xsl:call-template name="select.pagemaster">
-      <xsl:with-param name="pageclass" select="'titlepage'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="front.cover"/>
-
-  <xsl:if test="$preamble">
-    <xsl:call-template name="page.sequence">
-      <xsl:with-param name="master-reference"
-                      select="$titlepage-master-reference"/>
-      <xsl:with-param name="content">
-        <fo:block id="{$id}">
-          <xsl:call-template name="book.titlepage"/>
-        </fo:block>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:if>
-
-  <xsl:apply-templates select="dedication" mode="dedication"/>
-
-  <xsl:call-template name="make.book.tocs"/>
-
-  <xsl:apply-templates select="$content"/>
-
-  <xsl:call-template name="back.cover"/>
-
-</xsl:template>
-
-<xsl:template match="book/bookinfo"></xsl:template>
-<xsl:template match="book/info"></xsl:template>
-<xsl:template match="book/title"></xsl:template>
-<xsl:template match="book/subtitle"></xsl:template>
-<xsl:template match="book/titleabbrev"></xsl:template>
-
-<!-- Placeholder templates -->
-<xsl:template name="front.cover"/>
-<xsl:template name="back.cover"/>
-
-<!-- ================================================================= -->
-<xsl:template name="make.book.tocs">
-
-  <xsl:variable name="lot-master-reference">
-    <xsl:call-template name="select.pagemaster">
-      <xsl:with-param name="pageclass" select="'lot'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="toc.params">
-    <xsl:call-template name="find.path.params">
-      <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:if test="contains($toc.params, 'toc')">
-    <xsl:call-template name="page.sequence">
-      <xsl:with-param name="master-reference"
-                      select="$lot-master-reference"/>
-      <xsl:with-param name="element" select="'toc'"/>
-      <xsl:with-param name="gentext-key" select="'TableofContents'"/>
-      <xsl:with-param name="content">
-        <xsl:call-template name="division.toc">
-          <xsl:with-param name="toc.title.p" 
-                          select="contains($toc.params, 'title')"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:if>
-
-  <xsl:if test="contains($toc.params,'figure') and .//figure">
-    <xsl:call-template name="page.sequence">
-      <xsl:with-param name="master-reference"
-                      select="$lot-master-reference"/>
-      <xsl:with-param name="element" select="'toc'"/>
-      <xsl:with-param name="gentext-key" select="'ListofFigures'"/>
-      <xsl:with-param name="content">
-        <xsl:call-template name="list.of.titles">
-          <xsl:with-param name="titles" select="'figure'"/>
-          <xsl:with-param name="nodes" select=".//figure"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:if>
-
-  <xsl:if test="contains($toc.params,'table') and .//table">
-    <xsl:call-template name="page.sequence">
-      <xsl:with-param name="master-reference"
-                      select="$lot-master-reference"/>
-      <xsl:with-param name="element" select="'toc'"/>
-      <xsl:with-param name="gentext-key" select="'ListofTables'"/>
-      <xsl:with-param name="content">
-        <xsl:call-template name="list.of.titles">
-          <xsl:with-param name="titles" select="'table'"/>
-          <xsl:with-param name="nodes" select=".//table"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:if>
-
-  <xsl:if test="contains($toc.params,'example') and .//example">
-    <xsl:call-template name="page.sequence">
-      <xsl:with-param name="master-reference"
-                      select="$lot-master-reference"/>
-      <xsl:with-param name="element" select="'toc'"/>
-      <xsl:with-param name="gentext-key" select="'ListofExample'"/>
-      <xsl:with-param name="content">
-        <xsl:call-template name="list.of.titles">
-          <xsl:with-param name="titles" select="'example'"/>
-          <xsl:with-param name="nodes" select=".//example"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:if>
-
-  <xsl:if test="contains($toc.params,'equation') and 
-                 .//equation[title or info/title]">
-    <xsl:call-template name="page.sequence">
-      <xsl:with-param name="master-reference"
-                      select="$lot-master-reference"/>
-      <xsl:with-param name="element" select="'toc'"/>
-      <xsl:with-param name="gentext-key" select="'ListofEquations'"/>
-      <xsl:with-param name="content">
-        <xsl:call-template name="list.of.titles">
-          <xsl:with-param name="titles" select="'equation'"/>
-          <xsl:with-param name="nodes" 
-                          select=".//equation[title or info/title]"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:if>
-
-  <xsl:if test="contains($toc.params,'procedure') and 
-                 .//procedure[title or info/title]">
-    <xsl:call-template name="page.sequence">
-      <xsl:with-param name="master-reference"
-                      select="$lot-master-reference"/>
-      <xsl:with-param name="element" select="'toc'"/>
-      <xsl:with-param name="gentext-key" select="'ListofProcedures'"/>
-      <xsl:with-param name="content">
-        <xsl:call-template name="list.of.titles">
-          <xsl:with-param name="titles" select="'procedure'"/>
-          <xsl:with-param name="nodes" 
-                          select=".//procedure[title or info/title]"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-<!-- ==================================================================== -->
-
-<xsl:template match="part">
-  <xsl:if test="not(partintro)">
-    <xsl:apply-templates select="." mode="part.titlepage.mode"/>
-    <xsl:call-template name="generate.part.toc"/>
-  </xsl:if>
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="part" mode="part.titlepage.mode">
-  <!-- done this way to force the context node to be the part -->
-  <xsl:param name="additional.content"/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="titlepage-master-reference">
-    <xsl:call-template name="select.pagemaster">
-      <xsl:with-param name="pageclass" select="'titlepage'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$titlepage-master-reference}">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language"/>
-    </xsl:attribute>
-    <xsl:attribute name="format">
-      <xsl:call-template name="page.number.format">
-        <xsl:with-param name="master-reference" 
-                        select="$titlepage-master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="initial-page-number">
-      <xsl:call-template name="initial.page.number">
-        <xsl:with-param name="master-reference" 
-                        select="$titlepage-master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="force-page-count">
-      <xsl:call-template name="force.page.count">
-        <xsl:with-param name="master-reference" 
-                        select="$titlepage-master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$titlepage-master-reference"/>
-    </xsl:apply-templates>
-
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$titlepage-master-reference"/>
-    </xsl:apply-templates>
-
-    <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="set.flow.properties">
-        <xsl:with-param name="element" select="local-name(.)"/>
-        <xsl:with-param name="master-reference" 
-                        select="$titlepage-master-reference"/>
-      </xsl:call-template>
-
-      <fo:block id="{$id}">
-        <xsl:call-template name="part.titlepage"/>
-      </fo:block>
-      <xsl:copy-of select="$additional.content"/>
-    </fo:flow>
-  </fo:page-sequence>
-</xsl:template>
-
-<xsl:template match="part/docinfo|partinfo"></xsl:template>
-<xsl:template match="part/info"></xsl:template>
-<xsl:template match="part/title"></xsl:template>
-<xsl:template match="part/subtitle"></xsl:template>
-<xsl:template match="part/titleabbrev"></xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="generate.part.toc">
-  <xsl:param name="part" select="."/>
-
-  <xsl:variable name="lot-master-reference">
-    <xsl:call-template name="select.pagemaster">
-      <xsl:with-param name="pageclass" select="'lot'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="toc.params">
-    <xsl:call-template name="find.path.params">
-      <xsl:with-param name="node" select="$part"/>
-      <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="nodes" select="reference|
-                                     preface|
-                                     chapter|
-                                     appendix|
-                                     article|
-                                     bibliography|
-                                     glossary|
-                                     index"/>
-
-  <xsl:if test="count($nodes) &gt; 0 and contains($toc.params, 'toc')">
-    <fo:page-sequence hyphenate="{$hyphenate}"
-                      master-reference="{$lot-master-reference}">
-      <xsl:attribute name="language">
-        <xsl:call-template name="l10n.language"/>
-      </xsl:attribute>
-      <xsl:attribute name="format">
-        <xsl:call-template name="page.number.format">
-          <xsl:with-param name="element" select="'toc'"/>
-          <xsl:with-param name="master-reference" 
-                          select="$lot-master-reference"/>
-        </xsl:call-template>
-      </xsl:attribute>
-      <xsl:attribute name="initial-page-number">
-        <xsl:call-template name="initial.page.number">
-          <xsl:with-param name="element" select="'toc'"/>
-          <xsl:with-param name="master-reference" 
-                          select="$lot-master-reference"/>
-         </xsl:call-template>
-      </xsl:attribute>
-      <xsl:attribute name="force-page-count">
-        <xsl:call-template name="force.page.count">
-          <xsl:with-param name="master-reference" 
-                          select="$lot-master-reference"/>
-        </xsl:call-template>
-      </xsl:attribute>
-
-      <xsl:attribute name="hyphenation-character">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'hyphenation-character'"/>
-        </xsl:call-template>
-      </xsl:attribute>
-      <xsl:attribute name="hyphenation-push-character-count">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-        </xsl:call-template>
-      </xsl:attribute>
-      <xsl:attribute name="hyphenation-remain-character-count">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-        </xsl:call-template>
-      </xsl:attribute>
-
-      <xsl:apply-templates select="$part" mode="running.head.mode">
-        <xsl:with-param name="master-reference" select="$lot-master-reference"/>
-      </xsl:apply-templates>
-
-      <xsl:apply-templates select="$part" mode="running.foot.mode">
-        <xsl:with-param name="master-reference" select="$lot-master-reference"/>
-      </xsl:apply-templates>
-
-      <fo:flow flow-name="xsl-region-body">
-        <xsl:call-template name="set.flow.properties">
-          <xsl:with-param name="element" select="local-name(.)"/>
-          <xsl:with-param name="master-reference" 
-                          select="$lot-master-reference"/>
-        </xsl:call-template>
-
-        <xsl:call-template name="division.toc">
-          <xsl:with-param name="toc-context" select="$part"/>
-          <xsl:with-param name="toc.title.p" 
-                          select="contains($toc.params, 'title')"/>
-        </xsl:call-template>
-
-      </fo:flow>
-    </fo:page-sequence>
-  </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="part/partintro">
-  <xsl:apply-templates select=".." mode="part.titlepage.mode">
-    <xsl:with-param name="additional.content">
-      <xsl:if test="title">
-        <xsl:call-template name="partintro.titlepage"/>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </xsl:with-param>
-  </xsl:apply-templates>
-
-  <xsl:call-template name="generate.part.toc">
-    <xsl:with-param name="part" select=".."/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="partintro/title"></xsl:template>
-<xsl:template match="partintro/subtitle"></xsl:template>
-<xsl:template match="partintro/titleabbrev"></xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="book" mode="division.number">
-  <xsl:number from="set" count="book" format="1."/>
-</xsl:template>
-
-<xsl:template match="part" mode="division.number">
-  <xsl:number from="book" count="part" format="I."/>
-</xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/docbook.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/docbook.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,331 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:exsl="http://exslt.org/common"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:ng="http://docbook.org/docbook-ng"
-                xmlns:db="http://docbook.org/ns/docbook"
-                exclude-result-prefixes="db ng exsl"
-                version='1.0'>
-
-<!-- It is important to use indent="no" here, otherwise verbatim -->
-<!-- environments get broken by indented tags...at least when the -->
-<!-- callout extension is used...at least with some processors -->
-<xsl:output method="xml" indent="no"/>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:include href="../VERSION"/>
-<xsl:include href="param.xsl"/>
-<xsl:include href="../lib/lib.xsl"/>
-<xsl:include href="../common/l10n.xsl"/>
-<xsl:include href="../common/common.xsl"/>
-<xsl:include href="../common/utility.xsl"/>
-<xsl:include href="../common/labels.xsl"/>
-<xsl:include href="../common/titles.xsl"/>
-<xsl:include href="../common/subtitles.xsl"/>
-<xsl:include href="../common/gentext.xsl"/>
-<xsl:include href="../common/olink.xsl"/>
-<xsl:include href="../common/targets.xsl"/>
-<xsl:include href="../common/pi.xsl"/>
-<xsl:include href="autotoc.xsl"/>
-<xsl:include href="autoidx.xsl"/>
-<xsl:include href="lists.xsl"/>
-<xsl:include href="callout.xsl"/>
-<xsl:include href="verbatim.xsl"/>
-<xsl:include href="graphics.xsl"/>
-<xsl:include href="xref.xsl"/>
-<xsl:include href="formal.xsl"/>
-<xsl:include href="table.xsl"/>
-<xsl:include href="htmltbl.xsl"/>
-<xsl:include href="sections.xsl"/>
-<xsl:include href="inline.xsl"/>
-<xsl:include href="footnote.xsl"/>
-<xsl:include href="fo.xsl"/>
-<xsl:include href="fo-rtf.xsl"/>
-<xsl:include href="info.xsl"/>
-<xsl:include href="keywords.xsl"/>
-<xsl:include href="division.xsl"/>
-<xsl:include href="index.xsl"/>
-<xsl:include href="toc.xsl"/>
-<xsl:include href="refentry.xsl"/>
-<xsl:include href="math.xsl"/>
-<xsl:include href="admon.xsl"/>
-<xsl:include href="component.xsl"/>
-<xsl:include href="biblio.xsl"/>
-<xsl:include href="biblio-iso690.xsl"/>
-<xsl:include href="glossary.xsl"/>
-<xsl:include href="block.xsl"/>
-<xsl:include href="task.xsl"/>
-<xsl:include href="qandaset.xsl"/>
-<xsl:include href="synop.xsl"/>
-<xsl:include href="titlepage.xsl"/>
-<xsl:include href="titlepage.templates.xsl"/>
-<xsl:include href="pagesetup.xsl"/>
-<xsl:include href="pi.xsl"/>
-<xsl:include href="spaces.xsl"/>
-<xsl:include href="ebnf.xsl"/>
-<xsl:include href="../html/chunker.xsl"/>
-<xsl:include href="annotations.xsl"/>
-<xsl:include href="../common/stripns.xsl"/>
-
-<xsl:include href="fop.xsl"/>
-<xsl:include href="fop1.xsl"/>
-<xsl:include href="passivetex.xsl"/>
-<xsl:include href="xep.xsl"/>
-<xsl:include href="axf.xsl"/>
-<xsl:include href="ptc.xsl"/>
-
-<xsl:param name="stylesheet.result.type" select="'fo'"/>
-
-<!-- ==================================================================== -->
-
-<xsl:key name="id" match="*" use="@id|@xml:id"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*">
-  <xsl:message>
-    <xsl:value-of select="name(.)"/>
-    <xsl:text> encountered</xsl:text>
-    <xsl:if test="parent::*">
-      <xsl:text> in </xsl:text>
-      <xsl:value-of select="name(parent::*)"/>
-    </xsl:if>
-    <xsl:text>, but no template matches.</xsl:text>
-  </xsl:message>
-  <fo:block color="red">
-    <xsl:text>&lt;</xsl:text>
-    <xsl:value-of select="name(.)"/>
-    <xsl:text>&gt;</xsl:text>
-    <xsl:apply-templates/> 
-    <xsl:text>&lt;/</xsl:text>
-    <xsl:value-of select="name(.)"/>
-    <xsl:text>&gt;</xsl:text>
-  </fo:block>
-</xsl:template>
-
-<!-- Update this list if new root elements supported -->
-<xsl:variable name="root.elements" select="' appendix article bibliography book chapter colophon dedication glossary index part preface qandaset refentry reference sect1 section set setindex '"/>
-
-<xsl:template match="/">
-  <!-- * Get a title for current doc so that we let the user -->
-  <!-- * know what document we are processing at this point. -->
-  <xsl:variable name="doc.title">
-    <xsl:call-template name="get.doc.title"/>
-  </xsl:variable>
-  <xsl:choose>
-    <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document,
-         toss the namespace and continue.  Use the docbook5 namespaced
-         stylesheets for DocBook5 if you don't want to use this feature.-->
-    <!-- include extra test for Xalan quirk -->
-    <xsl:when test="(function-available('exsl:node-set') or
-                     contains(system-property('xsl:vendor'),
-                       'Apache Software Foundation'))
-                    and (*/self::ng:* or */self::db:*)">
-      <xsl:call-template name="log.message">
-        <xsl:with-param name="level">Note</xsl:with-param>
-        <xsl:with-param name="source" select="$doc.title"/>
-        <xsl:with-param name="context-desc">
-          <xsl:text>namesp. cut</xsl:text>
-        </xsl:with-param>
-        <xsl:with-param name="message">
-          <xsl:text>stripped namespace before processing</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:variable name="nons">
-        <xsl:apply-templates mode="stripNS"/>
-      </xsl:variable>
-      <xsl:call-template name="log.message">
-        <xsl:with-param name="level">Note</xsl:with-param>
-        <xsl:with-param name="source" select="$doc.title"/>
-        <xsl:with-param name="context-desc">
-          <xsl:text>namesp. cut</xsl:text>
-        </xsl:with-param>
-        <xsl:with-param name="message">
-          <xsl:text>processing stripped document</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:apply-templates select="exsl:node-set($nons)"/>
-    </xsl:when>
-    <!-- Can't process unless namespace removed -->
-    <xsl:when test="*/self::ng:* or */self::db:*">
-      <xsl:message terminate="yes">
-        <xsl:text>Unable to strip the namespace from DB5 document,</xsl:text>
-        <xsl:text> cannot proceed.</xsl:text>
-      </xsl:message>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$rootid != ''">
-          <xsl:variable name="root.element" select="key('id', $rootid)"/>
-          <xsl:choose>
-            <xsl:when test="count($root.element) = 0">
-              <xsl:message terminate="yes">
-                <xsl:text>ID '</xsl:text>
-                <xsl:value-of select="$rootid"/>
-                <xsl:text>' not found in document.</xsl:text>
-              </xsl:message>
-            </xsl:when>
-            <xsl:when test="not(contains($root.elements, concat(' ', local-name($root.element), ' ')))">
-              <xsl:message terminate="yes">
-                <xsl:text>ERROR: Document root element ($rootid=</xsl:text>
-                <xsl:value-of select="$rootid"/>
-                <xsl:text>) for FO output </xsl:text>
-                <xsl:text>must be one of the following elements:</xsl:text>
-                <xsl:value-of select="$root.elements"/>
-              </xsl:message>
-            </xsl:when>
-            <!-- Otherwise proceed -->
-            <xsl:otherwise>
-              <xsl:if test="$collect.xref.targets = 'yes' or
-                            $collect.xref.targets = 'only'">
-                <xsl:apply-templates select="$root.element"
-                                     mode="collect.targets"/>
-              </xsl:if>
-              <xsl:if test="$collect.xref.targets != 'only'">
-                <xsl:apply-templates select="$root.element"
-                                     mode="process.root"/>
-              </xsl:if>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <!-- Otherwise process the document root element -->
-        <xsl:otherwise>
-          <xsl:variable name="document.element" select="*[1]"/>
-          <xsl:choose>
-            <xsl:when test="not(contains($root.elements,
-                     concat(' ', local-name($document.element), ' ')))">
-              <xsl:message terminate="yes">
-                <xsl:text>ERROR: Document root element for FO output </xsl:text>
-                <xsl:text>must be one of the following elements:</xsl:text>
-                <xsl:value-of select="$root.elements"/>
-              </xsl:message>
-            </xsl:when>
-            <!-- Otherwise proceed -->
-            <xsl:otherwise>
-              <xsl:if test="$collect.xref.targets = 'yes' or
-                            $collect.xref.targets = 'only'">
-                <xsl:apply-templates select="/"
-                                     mode="collect.targets"/>
-              </xsl:if>
-              <xsl:if test="$collect.xref.targets != 'only'">
-                <xsl:apply-templates select="/"
-                                     mode="process.root"/>
-              </xsl:if>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="process.root">
-  <xsl:variable name="document.element" select="self::*"/>
-
-  <xsl:call-template name="root.messages"/>
-
-  <xsl:variable name="title">
-    <xsl:choose>
-      <xsl:when test="$document.element/title[1]">
-        <xsl:value-of select="$document.element/title[1]"/>
-      </xsl:when>
-      <xsl:otherwise>[could not find document title]</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  
-  <!-- Include all id values in XEP output -->
-  <xsl:if test="$xep.extensions != 0">
-    <xsl:processing-instruction 
-     name="xep-pdf-drop-unused-destinations">false</xsl:processing-instruction>
-  </xsl:if>
-
-  <fo:root xsl:use-attribute-sets="root.properties">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language">
-        <xsl:with-param name="target" select="/*[1]"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:if test="$xep.extensions != 0">
-      <xsl:call-template name="xep-pis"/>
-      <xsl:call-template name="xep-document-information"/>
-    </xsl:if>
-    <xsl:if test="$axf.extensions != 0">
-      <xsl:call-template name="axf-document-information"/>
-    </xsl:if>
-
-    <xsl:call-template name="setup.pagemasters"/>
-
-    <xsl:if test="$fop.extensions != 0">
-      <xsl:apply-templates select="$document.element" mode="fop.outline"/>
-    </xsl:if>
-
-    <xsl:if test="$fop1.extensions != 0">
-      <xsl:variable name="bookmarks">
-        <xsl:apply-templates select="$document.element" 
-                             mode="fop1.outline"/>
-      </xsl:variable>
-      <xsl:if test="string($bookmarks) != ''">
-        <fo:bookmark-tree>
-          <xsl:copy-of select="$bookmarks"/>
-        </fo:bookmark-tree>
-      </xsl:if>
-    </xsl:if>
-
-    <xsl:if test="$xep.extensions != 0">
-      <xsl:variable name="bookmarks">
-        <xsl:apply-templates select="$document.element" mode="xep.outline"/>
-      </xsl:variable>
-      <xsl:if test="string($bookmarks) != ''">
-        <rx:outline xmlns:rx="http://www.renderx.com/XSL/Extensions">
-          <xsl:copy-of select="$bookmarks"/>
-        </rx:outline>
-      </xsl:if>
-    </xsl:if>
-
-    <xsl:if test="$arbortext.extensions != 0 and $ati.xsl11.bookmarks != 0">
-      <xsl:variable name="bookmarks">
-        <xsl:apply-templates select="$document.element"
-                             mode="ati.xsl11.bookmarks"/>
-      </xsl:variable>
-      <xsl:if test="string($bookmarks) != ''">
-        <fo:bookmark-tree>
-          <xsl:copy-of select="$bookmarks"/>
-        </fo:bookmark-tree>
-      </xsl:if>
-    </xsl:if>
-
-    <xsl:apply-templates select="$document.element"/>
-  </fo:root>
-</xsl:template>
-
-<xsl:template name="root.messages">
-  <!-- redefine this any way you'd like to output messages -->
-  <!-- DO NOT OUTPUT ANYTHING FROM THIS TEMPLATE -->
-  <xsl:message>
-    <xsl:text>Making </xsl:text>
-    <xsl:value-of select="$page.orientation"/>
-    <xsl:text> pages on </xsl:text>
-    <xsl:value-of select="$paper.type"/>
-    <xsl:text> paper (</xsl:text>
-    <xsl:value-of select="$page.width"/>
-    <xsl:text>x</xsl:text>
-    <xsl:value-of select="$page.height"/>
-    <xsl:text>)</xsl:text>
-  </xsl:message>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/ebnf.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/ebnf.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,325 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-                exclude-result-prefixes="doc"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<doc:reference xmlns="">
-<referenceinfo>
-<releaseinfo role="meta">
-$Id$
-</releaseinfo>
-<author><surname>Walsh</surname>
-<firstname>Norman</firstname></author>
-<copyright><year>1999</year><year>2000</year><year>2001</year>
-<holder>Norman Walsh</holder>
-</copyright>
-</referenceinfo>
-<title>HTML EBNF Reference</title>
-
-<partintro>
-<section><title>Introduction</title>
-
-<para>This is technical reference documentation for the DocBook XSL
-Stylesheets; it documents (some of) the parameters, templates, and
-other elements of the stylesheets.</para>
-
-<para>This reference describes the templates and parameters relevant
-to formatting EBNF markup.</para>
-
-<para>This is not intended to be <quote>user</quote> documentation.
-It is provided for developers writing customization layers for the
-stylesheets, and for anyone who's interested in <quote>how it
-works</quote>.</para>
-
-<para>Although I am trying to be thorough, this documentation is known
-to be incomplete. Don't forget to read the source, too :-)</para>
-</section>
-</partintro>
-</doc:reference>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="productionset">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="title">
-      <fo:block id="{$id}" xsl:use-attribute-sets="formal.object.properties">
-        <xsl:call-template name="formal.object.heading">
-          <xsl:with-param name="placement" select="'before'"/>
-        </xsl:call-template>
-
-        <fo:table table-layout="fixed" width="100%">
-          <fo:table-column column-number="1" column-width="3%"/>
-          <fo:table-column column-number="2" column-width="15%"/>
-          <fo:table-column column-number="3" column-width="5%"/>
-          <fo:table-column column-number="4" column-width="52%"/>
-          <fo:table-column column-number="5" column-width="25%"/>
-          <fo:table-body start-indent="0pt" end-indent="0pt">
-            <xsl:apply-templates select="production|productionrecap"/>
-          </fo:table-body>
-        </fo:table>
-      </fo:block>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:table id="{$id}" table-layout="fixed" width="100%">
-        <fo:table-column column-number="1" column-width="3%"/>
-        <fo:table-column column-number="2" column-width="15%"/>
-        <fo:table-column column-number="3" column-width="5%"/>
-        <fo:table-column column-number="4" column-width="52%"/>
-        <fo:table-column column-number="5" column-width="25%"/>
-        <fo:table-body start-indent="0pt" end-indent="0pt">
-          <xsl:apply-templates select="production|productionrecap"/>
-        </fo:table-body>
-      </fo:table>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="productionset/title">
-  <!-- suppressed -->
-</xsl:template>
-
-<xsl:template match="production">
-  <xsl:param name="recap" select="false()"/>
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-  <fo:table-row>
-    <fo:table-cell>
-      <fo:block text-align="start">
-        <xsl:text>[</xsl:text>
-        <xsl:number count="production" level="any"/>
-        <xsl:text>]</xsl:text>
-      </fo:block>
-    </fo:table-cell>
-    <fo:table-cell>
-      <fo:block text-align="end">
-        <xsl:choose>
-          <xsl:when test="$recap">
-            <fo:basic-link internal-destination="{$id}"
-                           xsl:use-attribute-sets="xref.properties">
-              <xsl:apply-templates select="lhs"/>
-            </fo:basic-link>
-          </xsl:when>
-          <xsl:otherwise>
-            <fo:wrapper id="{$id}">
-              <xsl:apply-templates select="lhs"/>
-            </fo:wrapper>
-          </xsl:otherwise>
-        </xsl:choose>
-      </fo:block>
-    </fo:table-cell>
-    <fo:table-cell>
-      <fo:block text-align="center">
-        <xsl:copy-of select="$ebnf.assignment"/>
-      </fo:block>
-    </fo:table-cell>
-    <fo:table-cell>
-      <fo:block>
-        <xsl:apply-templates select="rhs"/>
-        <xsl:copy-of select="$ebnf.statement.terminator"/>
-      </fo:block>
-    </fo:table-cell>
-    <fo:table-cell border-start-width="3pt">
-      <fo:block text-align="start">
-        <xsl:choose>
-          <xsl:when test="rhs/lineannotation|constraint">
-            <xsl:apply-templates select="rhs/lineannotation" mode="rhslo"/>
-            <xsl:apply-templates select="constraint"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:text>&#160;</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </fo:block>
-    </fo:table-cell>
-  </fo:table-row>
-</xsl:template>
-
-<xsl:template match="productionrecap">
-  <xsl:variable name="targets" select="key('id',@linkend)"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-
-  <xsl:if test="count($targets)=0">
-    <xsl:message>
-      <xsl:text>Error: no ID for productionrecap linkend: </xsl:text>
-      <xsl:value-of select="@linkend"/>
-      <xsl:text>.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:if test="count($targets)>1">
-    <xsl:message>
-      <xsl:text>Warning: multiple "IDs" for productionrecap linkend: </xsl:text>
-      <xsl:value-of select="@linkend"/>
-      <xsl:text>.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:apply-templates select="$target">
-    <xsl:with-param name="recap" select="true()"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="lhs">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="rhs">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="nonterminal">
-  <xsl:variable name="linkend">
-    <xsl:call-template name="xpointer.idref">
-      <xsl:with-param name="xpointer" select="@def"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="check.id.unique">
-    <xsl:with-param name="linkend" select="$linkend"/>
-  </xsl:call-template>
-
-  <xsl:call-template name="check.idref.targets">
-    <xsl:with-param name="linkend" select="$linkend"/>
-    <xsl:with-param name="element-list">production</xsl:with-param>
-  </xsl:call-template>
-
-  <!-- If you don't provide content, you can't point outside this doc. -->
-  <xsl:choose>
-    <xsl:when test="*|text()"><!--nop--></xsl:when>
-    <xsl:otherwise>
-      <xsl:if test="$linkend = ''">
-	<xsl:message>
-	  <xsl:text>Non-terminals with no content must point to </xsl:text>
-	  <xsl:text>production elements in the current document.</xsl:text>
-	</xsl:message>
-	<xsl:message>
-	  <xsl:text>Invalid xpointer for empty nt: </xsl:text>
-	  <xsl:value-of select="@def"/>
-	</xsl:message>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-
-  <xsl:variable name="href">
-    <xsl:choose>
-      <xsl:when test="$linkend != ''">
-	<xsl:variable name="targets" select="key('id',$linkend)"/>
-	<xsl:variable name="target" select="$targets[1]"/>
-        <xsl:call-template name="object.id">
-          <xsl:with-param name="object" select="$target"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-	<xsl:value-of select="@def"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <fo:basic-link internal-destination="{$href}"
-                 xsl:use-attribute-sets="xref.properties">
-    <xsl:choose>
-      <xsl:when test="*|text()">
-        <xsl:apply-templates/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:choose>
-          <xsl:when test="$linkend != ''">
-            <xsl:variable name="targets" select="key('id',$linkend)"/>
-            <xsl:variable name="target" select="$targets[1]"/>
-            <xsl:apply-templates select="$target/lhs"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:text>???</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </fo:basic-link>
-</xsl:template>
-
-<xsl:template match="rhs/lineannotation">
-  <!--nop-->
-</xsl:template>
-
-<xsl:template match="rhs/lineannotation" mode="rhslo">
-  <xsl:text>/*&#160;</xsl:text>
-  <xsl:apply-templates/>
-  <xsl:text>&#160;*/</xsl:text>
-</xsl:template>
-
-<xsl:template match="constraint">
-  <xsl:call-template name="check.id.unique">
-    <xsl:with-param name="linkend" select="@linkend"/>
-  </xsl:call-template>
-
-  <xsl:call-template name="check.idref.targets">
-    <xsl:with-param name="linkend" select="@linkend"/>
-    <xsl:with-param name="element-list">constraintdef</xsl:with-param>
-  </xsl:call-template>
-
-  <xsl:variable name="href">
-    <xsl:variable name="targets" select="key('id',@linkend)"/>
-    <xsl:variable name="target" select="$targets[1]"/>
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$target"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:if test="preceding-sibling::constraint">
-    <fo:inline linefeed-treatment="preserve">&#xA;</fo:inline>
-  </xsl:if>
-  <xsl:text>[&#160;</xsl:text>
-
-  <xsl:choose>
-    <xsl:when test="@role">
-      <xsl:value-of select="@role"/>
-      <xsl:text>: </xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="targets" select="key('id',@linkend)"/>
-      <xsl:variable name="target" select="$targets[1]"/>
-      <xsl:if test="$target/@role">
-	<xsl:value-of select="$target/@role"/>
-	<xsl:text>: </xsl:text>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-
-  <fo:basic-link internal-destination="{$href}"
-                 xsl:use-attribute-sets="xref.properties">
-    <xsl:variable name="targets" select="key('id',@linkend)"/>
-    <xsl:variable name="target" select="$targets[1]"/>
-    <xsl:apply-templates select="$target" mode="title.markup"/>
-  </fo:basic-link>
-  <xsl:text>&#160;]</xsl:text>
-</xsl:template>
-
-<xsl:template match="constraintdef">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-  <fo:block id="{$id}">
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="constraintdef/title">
-  <fo:block font-weight="bold">
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fo-rtf.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fo-rtf.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,154 +1,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:exsl="http://exslt.org/common"
-                xmlns:set="http://exslt.org/sets"
-                exclude-result-prefixes="exsl set"
-                version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the DocBook XSL Stylesheet distribution.
-     See ../README or http://docbook.sf.net/ for copyright
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- This module contains templates that match against FO nodes. It is used
-     to post-process result tree fragments for some sorts of cleanup.
-     These templates can only ever be fired by a processor that supports
-     exslt:node-set(). -->
-
-<!-- ==================================================================== -->
-
-<!-- insert.fo.fnum mode templates insert a particular RTF at the beginning
-     of the first paragraph in the primary RTF. In fact, they are inserting
-     a footnote-number, so we tinker a few other things too, like spacing and
-     font-sizes. -->
-
-<xsl:template match="/" mode="insert.fo.fnum">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:apply-templates mode="insert.fo.fnum">
-    <xsl:with-param name="mark" select="$mark"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="*" mode="insert.fo.fnum">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates mode="insert.fo.fnum">
-      <xsl:with-param name="mark" select="$mark"/>
-    </xsl:apply-templates>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="fo:block" mode="insert.fo.fnum">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:copy>
-    <xsl:for-each select="@*">
-      <xsl:choose>
-        <xsl:when test="starts-with(name(.), 'space-before')"/>
-        <xsl:when test="starts-with(name(.), 'space-after')"/>
-        <xsl:when test="starts-with(name(.), 'font-size')"/>
-        <xsl:otherwise>
-          <xsl:copy-of select="."/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:for-each>
-    <xsl:if test="not(preceding::fo:block)">
-      <xsl:copy-of select="$mark"/>
-    </xsl:if>
-    <xsl:apply-templates mode="insert.fo.fnum">
-      <xsl:with-param name="mark" select="$mark"/>
-    </xsl:apply-templates>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="text()|processing-instruction()|comment()" mode="insert.fo.fnum">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:copy/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- insert.fo.block mode templates insert a particular RTF at the beginning
-     of the first paragraph in the primary RTF. -->
-
-<xsl:template match="/" mode="insert.fo.block">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:apply-templates mode="insert.fo.block">
-    <xsl:with-param name="mark" select="$mark"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="*" mode="insert.fo.block">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates mode="insert.fo.block">
-      <xsl:with-param name="mark" select="$mark"/>
-    </xsl:apply-templates>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="fo:block" mode="insert.fo.block">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:if test="not(preceding::fo:block)">
-      <xsl:copy-of select="$mark"/>
-    </xsl:if>
-    <xsl:apply-templates mode="insert.fo.block">
-      <xsl:with-param name="mark" select="$mark"/>
-    </xsl:apply-templates>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="text()|processing-instruction()|comment()" mode="insert.fo.block">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:copy/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- insert.fo.text mode templates insert a particular RTF at the beginning
-     of the first text-node in the primary RTF. -->
-
-<xsl:template match="/" mode="insert.fo.text">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:apply-templates mode="insert.fo.text">
-    <xsl:with-param name="mark" select="$mark"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="*" mode="insert.fo.text">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates mode="insert.fo.text">
-      <xsl:with-param name="mark" select="$mark"/>
-    </xsl:apply-templates>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="text()|processing-instruction()|comment()" mode="insert.fo.text">
-  <xsl:param name="mark" select="'?'"/>
-
-  <xsl:if test="not(preceding::text())">
-    <xsl:copy-of select="$mark"/>
-  </xsl:if>
-
-  <xsl:copy/>
-</xsl:template>
-
-<xsl:template match="processing-instruction()|comment()" mode="insert.fo.text">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:copy/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fo.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fo.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,71 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:template name="anchor">
-  <xsl:param name="node" select="."/>
-  <xsl:param name="conditional" select="1"/>
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$node"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:if test="$conditional = 0 or $node/@id or $node/@xml:id">
-    <xsl:attribute name="id"><xsl:value-of select="$id"/></xsl:attribute>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="dingbat">
-  <xsl:param name="dingbat">bullet</xsl:param>
-  <xsl:variable name="symbol">
-    <xsl:choose>
-      <xsl:when test="$dingbat='bullet'">o</xsl:when>
-      <xsl:when test="$dingbat='copyright'">&#x00A9;</xsl:when>
-      <xsl:when test="$dingbat='trademark'">&#x2122;</xsl:when>
-      <xsl:when test="$dingbat='trade'">&#x2122;</xsl:when>
-      <xsl:when test="$dingbat='registered'">&#x00AE;</xsl:when>
-      <xsl:when test="$dingbat='service'">(SM)</xsl:when>
-      <xsl:when test="$dingbat='ldquo'">"</xsl:when>
-      <xsl:when test="$dingbat='rdquo'">"</xsl:when>
-      <xsl:when test="$dingbat='lsquo'">'</xsl:when>
-      <xsl:when test="$dingbat='rsquo'">'</xsl:when>
-      <xsl:when test="$dingbat='em-dash'">&#x2014;</xsl:when>
-      <xsl:when test="$dingbat='en-dash'">-</xsl:when>
-      <xsl:otherwise>o</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$dingbat.font.family = ''">
-      <xsl:copy-of select="$symbol"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:inline font-family="{$dingbat.font.family}">
-        <xsl:copy-of select="$symbol"/>
-      </fo:inline>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="href.target">
-  <xsl:param name="context" select="."/>
-  <xsl:param name="object" select="."/>
-  <xsl:text>#</xsl:text>
-  <xsl:call-template name="object.id">
-    <xsl:with-param name="object" select="$object"/>
-  </xsl:call-template>
-</xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/footnote.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/footnote.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,186 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:exsl="http://exslt.org/common"
-                exclude-result-prefixes="exsl"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:template name="format.footnote.mark">
-  <xsl:param name="mark" select="'?'"/>
-  <fo:inline xsl:use-attribute-sets="footnote.mark.properties">
-    <xsl:choose>
-      <xsl:when test="$fop.extensions != 0">
-        <xsl:attribute name="vertical-align">super</xsl:attribute>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute name="baseline-shift">super</xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:copy-of select="$mark"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="footnote">
-  <xsl:choose>
-    <xsl:when test="ancestor::table or ancestor::informaltable">
-      <xsl:call-template name="format.footnote.mark">
-        <xsl:with-param name="mark">
-          <xsl:apply-templates select="." mode="footnote.number"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:footnote>
-        <fo:inline>
-          <xsl:call-template name="format.footnote.mark">
-            <xsl:with-param name="mark">
-              <xsl:apply-templates select="." mode="footnote.number"/>
-            </xsl:with-param>
-          </xsl:call-template>
-        </fo:inline>
-        <fo:footnote-body xsl:use-attribute-sets="footnote.properties">
-          <xsl:apply-templates/>
-        </fo:footnote-body>
-      </fo:footnote>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="footnoteref">
-  <xsl:variable name="footnote" select="key('id',@linkend)"/>
-  <xsl:call-template name="format.footnote.mark">
-    <xsl:with-param name="mark">
-      <xsl:apply-templates select="$footnote" mode="footnote.number"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="footnote" mode="footnote.number">
-  <xsl:choose>
-    <xsl:when test="string-length(@label) != 0">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:when test="ancestor::table or ancestor::informaltable">
-      <xsl:variable name="tfnum">
-        <xsl:number level="any" from="table|informaltable" format="1"/>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="string-length($table.footnote.number.symbols) &gt;= $tfnum">
-          <xsl:value-of select="substring($table.footnote.number.symbols, $tfnum, 1)"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:number level="any" from="table|informaltable"
-                      format="{$table.footnote.number.format}"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="fnum">
-        <!-- FIXME: list in @from is probably not complete -->
-        <xsl:number level="any" 
-                    from="chapter|appendix|preface|article|refentry|bibliography" 
-                    count="footnote[not(@label)][not(ancestor::table) and not(ancestor::informaltable)]|ulink[$ulink.footnotes != 0][node()][@url != .][not(ancestor::footnote)][$ulink.show != 0]" 
-                    format="1"/>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="string-length($footnote.number.symbols) &gt;= $fnum">
-          <xsl:value-of select="substring($footnote.number.symbols, $fnum, 1)"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:number value="$fnum" format="{$footnote.number.format}"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="footnote.body.number">
-  <xsl:variable name="footnote.mark">
-    <xsl:call-template name="format.footnote.mark">
-      <xsl:with-param name="mark">
-        <xsl:apply-templates select="ancestor::footnote" mode="footnote.number"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="fo">
-    <xsl:apply-templates select="."/>
-  </xsl:variable>
-
-  <xsl:variable name="fo-nodes" select="exsl:node-set($fo)"/>
-
-  <xsl:choose>
-    <xsl:when test="$fo-nodes//fo:block">
-      <xsl:apply-templates select="$fo-nodes" mode="insert.fo.fnum">
-        <xsl:with-param name="mark" select="$footnote.mark"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="$fo-nodes" mode="insert.fo.text">
-        <xsl:with-param name="mark" select="$footnote.mark"/>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="footnote/para[1]
-                     |footnote/simpara[1]
-                     |footnote/formalpara[1]"
-              priority="2">
-  <!-- this only works if the first thing in a footnote is a para, -->
-  <!-- which is ok, because it usually is. -->
-  <fo:block>
-    <xsl:call-template name="format.footnote.mark">
-      <xsl:with-param name="mark">
-        <xsl:apply-templates select="ancestor::footnote" mode="footnote.number"/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="footnote" mode="table.footnote.mode">
-  <xsl:choose>
-    <xsl:when test="local-name(*[1]) = 'para' or local-name(*[1]) = 'simpara'">
-      <fo:block xsl:use-attribute-sets="table.footnote.properties">
-        <xsl:apply-templates/>
-      </fo:block>
-    </xsl:when>
-
-    <xsl:when test="function-available('exsl:node-set')">
-      <fo:block xsl:use-attribute-sets="table.footnote.properties">
-        <xsl:apply-templates select="*[1]" mode="footnote.body.number"/>
-        <xsl:apply-templates select="*[position() &gt; 1]"/>
-      </fo:block>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:message>
-        <xsl:text>Warning: footnote number may not be generated </xsl:text>
-        <xsl:text>correctly; </xsl:text>
-        <xsl:value-of select="local-name(*[1])"/>
-        <xsl:text> unexpected as first child of footnote.</xsl:text>
-      </xsl:message>
-      <fo:block xsl:use-attribute-sets="table.footnote.properties">
-        <xsl:apply-templates/>
-      </fo:block>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fop.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fop.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,92 +1,0 @@
-<?xml version='1.0' encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:fox="http://xml.apache.org/fop/extensions"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-     (c) Stephane Bline Peregrine Systems 2001
-     Driver file to allow pdf bookmarking (based on fop implementation).
-     ******************************************************************** -->
-<!--
-In PDF bookmarks can't be used characters with code>255. This version of file
-translates characters with code>255 back to ASCII.
-
-   Pavel Zampach (zampach@volny.cz)
--->
-
-<xsl:variable name="a-dia" select=
-"'&#257;&#259;&#261;&#263;&#265;&#267;&#269;&#271;&#273;&#275;&#277;&#279;&#281;&#283;&#339;&#285;&#287;&#289;&#291;&#293;&#295;&#297;&#299;&#301;&#303;&#305;&#309;&#311;&#314;&#316;&#318;&#320;&#322;&#324;&#326;&#328;&#331;&#333;&#335;&#337;&#341;&#343;&#345;&#347;&#349;&#351;&#353;&#355;&#357;&#359;&#361;&#363;&#365;&#367;&#369;&#371;&#373;&#375;&#378;&#380;&#382;&#256;&#258;&#260;&#262;&#264;&#266;&#268;&#270;&#272;&#274;&#276;&#278;&#280;&#282;&#338;&#284;&#286;&#288;&#290;&#292;&#294;&#296;&#298;&#300;&#302;&#304;&#308;&#310;&#313;&#315;&#317;&#319;&#321;&#323;&#325;&#327;&#330;&#332;&#334;&#336;&#340;&#342;&#344;&#346;&#348;&#350;&#352;&#354;&#356;&#358;&#360;&#362;&#364;&#366;&#368;&#370;&#372;&#374;&#376;&#377;&#379;&#381;'"/>
-<xsl:variable name="a-asc" select=
-"'aaaccccddeeeeeegggghhiiiiijklllllnnnnooorrrsssstttuuuuuuwyzzzAAACCCCDDEEEEEEGGGGHHIIIIIJKLLLLLNNNNOOORRRSSSSTTTUUUUUUWYYZZZ'"/>
-
-<xsl:template match="*" mode="fop.outline">
-  <xsl:variable name="id">
-    <xsl:value-of select="(@id|@xml:id)[1]"/>
-  </xsl:variable>
-  <xsl:if test="$id != ''">
-    <fox:destination internal-destination="{$id}"/>
-  </xsl:if>
-  <xsl:apply-templates select="*" mode="fop.outline"/>
-</xsl:template>
-
-<xsl:template match="set|book|part|reference|preface|chapter|appendix|article
-                     |glossary|bibliography|index|setindex
-                     |refentry
-                     |sect1|sect2|sect3|sect4|sect5|section"
-              mode="fop.outline">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  <xsl:variable name="bookmark-label">
-    <xsl:apply-templates select="." mode="object.title.markup"/>
-  </xsl:variable>
-
-  <!-- Put the root element bookmark at the same level as its children -->
-  <!-- If the object is a set or book, generate a bookmark for the toc -->
-
-  <xsl:choose>
-    <xsl:when test="parent::*">
-      <fox:outline internal-destination="{$id}">
-        <fox:label>
-          <xsl:value-of select="normalize-space(translate($bookmark-label, $a-dia, $a-asc))"/>
-        </fox:label>
-        <xsl:apply-templates select="*" mode="fop.outline"/>
-      </fox:outline>
-    </xsl:when>
-    <xsl:otherwise>
-      <fox:outline internal-destination="{$id}">
-        <fox:label>
-          <xsl:value-of select="normalize-space(translate($bookmark-label, $a-dia, $a-asc))"/>
-        </fox:label>
-      </fox:outline>
-
-      <xsl:variable name="toc.params">
-        <xsl:call-template name="find.path.params">
-          <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:if test="contains($toc.params, 'toc')
-                    and (book|part|reference|preface|chapter|appendix|article
-                         |glossary|bibliography|index|setindex
-                         |refentry
-                         |sect1|sect2|sect3|sect4|sect5|section)">
-        <fox:outline internal-destination="toc...{$id}">
-          <fox:label>
-            <xsl:call-template name="gentext">
-              <xsl:with-param name="key" select="'TableofContents'"/>
-            </xsl:call-template>
-          </fox:label>
-        </fox:outline>
-      </xsl:if>
-      <xsl:apply-templates select="*" mode="fop.outline"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <fox:destination internal-destination="{$id}"/>
-</xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fop1.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/fop1.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,71 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<xsl:template match="*" mode="fop1.outline">
-  <xsl:apply-templates select="*" mode="fop1.outline"/>
-</xsl:template>
-
-<xsl:template match="set|book|part|reference|
-                     preface|chapter|appendix|article
-                     |glossary|bibliography|index|setindex
-                     |refentry
-                     |sect1|sect2|sect3|sect4|sect5|section"
-              mode="fop1.outline">
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  <xsl:variable name="bookmark-label">
-    <xsl:apply-templates select="." mode="object.title.markup"/>
-  </xsl:variable>
-
-  <!-- Put the root element bookmark at the same level as its children -->
-  <!-- If the object is a set or book, generate a bookmark for the toc -->
-
-  <xsl:choose>
-    <xsl:when test="parent::*">
-      <fo:bookmark internal-destination="{$id}">
-        <fo:bookmark-title>
-          <xsl:value-of select="normalize-space(translate($bookmark-label, $a-dia, $a-asc))"/>
-        </fo:bookmark-title>
-        <xsl:apply-templates select="*" mode="fop1.outline"/>
-      </fo:bookmark>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:bookmark internal-destination="{$id}">
-        <fo:bookmark-title>
-          <xsl:value-of select="normalize-space(translate($bookmark-label, $a-dia, $a-asc))"/>
-        </fo:bookmark-title>
-      </fo:bookmark>
-
-      <xsl:variable name="toc.params">
-        <xsl:call-template name="find.path.params">
-          <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:if test="contains($toc.params, 'toc')
-                    and (book|part|reference|preface|chapter|appendix|article
-                         |glossary|bibliography|index|setindex
-                         |refentry
-                         |sect1|sect2|sect3|sect4|sect5|section)">
-        <fo:bookmark internal-destination="toc...{$id}">
-          <fo:bookmark-title>
-            <xsl:call-template name="gentext">
-              <xsl:with-param name="key" select="'TableofContents'"/>
-            </xsl:call-template>
-          </fo:bookmark-title>
-        </fo:bookmark>
-      </xsl:if>
-      <xsl:apply-templates select="*" mode="fop1.outline"/>
-    </xsl:otherwise>
-  </xsl:choose>
-<!--
-  <fo:bookmark internal-destination="{$id}"/>
--->
-</xsl:template>
-
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/formal.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/formal.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,534 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- formal.object creates a basic block containing the
-     result of processing the object, including its title
-     and any keep-together properties.
-     The template calling formal.object may wrap these results in a
-     float or pgwide block. -->
-
-<xsl:template name="formal.object">
-  <xsl:param name="placement" select="'before'"/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="content">
-    <xsl:if test="$placement = 'before'">
-      <xsl:call-template name="formal.object.heading">
-        <xsl:with-param name="placement" select="$placement"/>
-      </xsl:call-template>
-    </xsl:if>
-    <xsl:apply-templates/>
-    <xsl:if test="$placement != 'before'">
-      <xsl:call-template name="formal.object.heading">
-        <xsl:with-param name="placement" select="$placement"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="keep.together">
-    <xsl:call-template name="pi.dbfo_keep-together"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <!-- tables have their own templates and 
-         are not handled by formal.object -->
-    <xsl:when test="self::figure">
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="figure.properties">
-        <xsl:if test="$keep.together != ''">
-          <xsl:attribute name="keep-together.within-column"><xsl:value-of
-                          select="$keep.together"/></xsl:attribute>
-        </xsl:if>
-        <xsl:copy-of select="$content"/>
-      </fo:block>
-    </xsl:when>
-    <xsl:when test="self::example">
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="example.properties">
-        <xsl:if test="$keep.together != ''">
-          <xsl:attribute name="keep-together.within-column"><xsl:value-of
-                          select="$keep.together"/></xsl:attribute>
-        </xsl:if>
-        <xsl:copy-of select="$content"/>
-      </fo:block>
-    </xsl:when>
-    <xsl:when test="self::equation">
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="equation.properties">
-        <xsl:if test="$keep.together != ''">
-          <xsl:attribute name="keep-together.within-column"><xsl:value-of
-                          select="$keep.together"/></xsl:attribute>
-        </xsl:if>
-        <xsl:copy-of select="$content"/>
-      </fo:block>
-    </xsl:when>
-    <xsl:when test="self::procedure">
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="procedure.properties">
-        <xsl:if test="$keep.together != ''">
-          <xsl:attribute name="keep-together.within-column"><xsl:value-of
-                          select="$keep.together"/></xsl:attribute>
-        </xsl:if>
-        <xsl:copy-of select="$content"/>
-      </fo:block>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="formal.object.properties">
-        <xsl:if test="$keep.together != ''">
-          <xsl:attribute name="keep-together.within-column"><xsl:value-of
-                          select="$keep.together"/></xsl:attribute>
-        </xsl:if>
-        <xsl:copy-of select="$content"/>
-      </fo:block>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="formal.object.heading">
-  <xsl:param name="object" select="."/>
-  <xsl:param name="placement" select="'before'"/>
-
-  <fo:block xsl:use-attribute-sets="formal.title.properties">
-    <xsl:choose>
-      <xsl:when test="$placement = 'before'">
-        <xsl:attribute
-               name="keep-with-next.within-column">always</xsl:attribute>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute
-               name="keep-with-previous.within-column">always</xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:apply-templates select="$object" mode="object.title.markup">
-      <xsl:with-param name="allow-anchors" select="1"/>
-    </xsl:apply-templates>
-  </fo:block>
-</xsl:template>
-
-<xsl:template name="informal.object">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="keep.together">
-    <xsl:call-template name="pi.dbfo_keep-together"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <!-- informaltables have their own templates and 
-         are not handled by formal.object -->
-    <xsl:when test="local-name(.) = 'equation'">
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="equation.properties">
-        <xsl:if test="$keep.together != ''">
-          <xsl:attribute name="keep-together.within-column"><xsl:value-of
-                          select="$keep.together"/></xsl:attribute>
-        </xsl:if>
-        <xsl:apply-templates/>
-      </fo:block>
-    </xsl:when>
-    <xsl:when test="local-name(.) = 'procedure'">
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="procedure.properties">
-        <xsl:if test="$keep.together != ''">
-          <xsl:attribute name="keep-together.within-column"><xsl:value-of
-                          select="$keep.together"/></xsl:attribute>
-        </xsl:if>
-        <xsl:apply-templates/>
-      </fo:block>
-    </xsl:when>
-    <xsl:when test="local-name(.) = 'informalfigure'">
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="informalfigure.properties">
-        <xsl:if test="$keep.together != ''">
-          <xsl:attribute name="keep-together.within-column"><xsl:value-of
-                          select="$keep.together"/></xsl:attribute>
-        </xsl:if>
-        <xsl:apply-templates/>
-      </fo:block>
-    </xsl:when>
-    <xsl:when test="local-name(.) = 'informalexample'">
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="informalexample.properties">
-        <xsl:if test="$keep.together != ''">
-          <xsl:attribute name="keep-together.within-column"><xsl:value-of
-                          select="$keep.together"/></xsl:attribute>
-        </xsl:if>
-        <xsl:apply-templates/>
-      </fo:block>
-    </xsl:when>
-    <xsl:when test="local-name(.) = 'informalequation'">
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="informalequation.properties">
-        <xsl:apply-templates/>
-      </fo:block>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:block id="{$id}" 
-                xsl:use-attribute-sets="informal.object.properties">
-        <xsl:if test="$keep.together != ''">
-          <xsl:attribute name="keep-together.within-column"><xsl:value-of
-                          select="$keep.together"/></xsl:attribute>
-        </xsl:if>
-        <xsl:apply-templates/>
-      </fo:block>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="semiformal.object">
-  <xsl:param name="placement" select="'before'"/>
-  <xsl:choose>
-    <xsl:when test="./title">
-      <xsl:call-template name="formal.object">
-        <xsl:with-param name="placement" select="$placement"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="informal.object"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="figure">
-  <xsl:variable name="param.placement"
-              select="substring-after(normalize-space($formal.title.placement),
-                                      concat(local-name(.), ' '))"/>
-
-  <xsl:variable name="placement">
-    <xsl:choose>
-      <xsl:when test="contains($param.placement, ' ')">
-        <xsl:value-of select="substring-before($param.placement, ' ')"/>
-      </xsl:when>
-      <xsl:when test="$param.placement = ''">before</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$param.placement"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="figure">
-    <xsl:choose>
-      <xsl:when test="@pgwide = '1'">
-        <fo:block xsl:use-attribute-sets="pgwide.properties">
-          <xsl:call-template name="formal.object">
-            <xsl:with-param name="placement" select="$placement"/>
-          </xsl:call-template>
-        </fo:block>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="formal.object">
-          <xsl:with-param name="placement" select="$placement"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="floatstyle">
-    <xsl:call-template name="floatstyle"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$floatstyle != ''">
-      <xsl:call-template name="floater">
-        <xsl:with-param name="position" select="$floatstyle"/>
-        <xsl:with-param name="content" select="$figure"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$figure"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="example">
-  <xsl:variable name="param.placement"
-             select="substring-after(normalize-space($formal.title.placement),
-                                     concat(local-name(.), ' '))"/>
-
-  <xsl:variable name="placement">
-    <xsl:choose>
-      <xsl:when test="contains($param.placement, ' ')">
-        <xsl:value-of select="substring-before($param.placement, ' ')"/>
-      </xsl:when>
-      <xsl:when test="$param.placement = ''">before</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$param.placement"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <!-- Example doesn't have a pgwide attribute, so may use a PI -->
-  <xsl:variable name="pgwide.pi">
-    <xsl:call-template name="pi.dbfo_pgwide"/>
-  </xsl:variable>
-
-  <xsl:variable name="pgwide">
-    <xsl:choose>
-      <xsl:when test="$pgwide.pi">
-        <xsl:value-of select="$pgwide.pi"/>
-      </xsl:when>
-      <!-- child element may set pgwide -->
-      <xsl:when test="*[@pgwide]">
-        <xsl:value-of select="*[@pgwide][1]/@pgwide"/>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:variable>
-
-  <!-- Get align value from internal mediaobject -->
-  <xsl:variable name="align">
-    <xsl:if test="mediaobject|mediaobjectco">
-      <xsl:variable name="olist" select="mediaobject/imageobject
-                     |mediaobjectco/imageobjectco
-                     |mediaobject/videoobject
-                     |mediaobject/audioobject
-                     |mediaobject/textobject"/>
-
-      <xsl:variable name="object.index">
-        <xsl:call-template name="select.mediaobject.index">
-          <xsl:with-param name="olist" select="$olist"/>
-          <xsl:with-param name="count" select="1"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="object" select="$olist[position() = $object.index]"/>
-
-      <xsl:value-of select="$object/descendant::imagedata[@align][1]/@align"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="example">
-    <xsl:choose>
-      <xsl:when test="$pgwide = '1'">
-        <fo:block xsl:use-attribute-sets="pgwide.properties">
-          <xsl:if test="$align != ''">
-            <xsl:attribute name="text-align">
-              <xsl:value-of select="$align"/>
-            </xsl:attribute>
-          </xsl:if>
-          <xsl:call-template name="formal.object">
-            <xsl:with-param name="placement" select="$placement"/>
-          </xsl:call-template>
-        </fo:block>
-      </xsl:when>
-      <xsl:otherwise>
-        <fo:block>
-          <xsl:if test="$align != ''">
-            <xsl:attribute name="text-align">
-              <xsl:value-of select="$align"/>
-            </xsl:attribute>
-          </xsl:if>
-          <xsl:call-template name="formal.object">
-            <xsl:with-param name="placement" select="$placement"/>
-          </xsl:call-template>
-        </fo:block>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="floatstyle">
-    <xsl:call-template name="floatstyle"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$floatstyle != ''">
-      <xsl:call-template name="floater">
-        <xsl:with-param name="position" select="$floatstyle"/>
-        <xsl:with-param name="content" select="$example"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$example"/>
-    </xsl:otherwise>
-  </xsl:choose>
-
-</xsl:template>
-
-<!-- Unified handling of CALS and HTML tables, formal and not -->
-<!-- Creates a hierarchy of nested containers:
-     - Outer container does a float.
-     - Nested container does block-container for rotation
-     - Nested block contains title, layout table and footnotes
-     - Nested layout table placeholder template supports extensions.
-     - fo:table is innermost.
-     Created from the innermost and working out.
-     Not all layers apply to every table.
--->
-<xsl:template match="table|informaltable">
-  <xsl:if test="tgroup/tbody/tr
-                |tgroup/thead/tr
-                |tgroup/tfoot/tr">
-    <xsl:message terminate="yes">
-      <xsl:text>Broken table: tr descendent of CALS Table.</xsl:text>
-      <xsl:text>The text in the first tr is:&#10;</xsl:text>
-      <xsl:value-of 
-               select="(tgroup//tr)[1]"/>
-    </xsl:message>
-  </xsl:if>
-  <xsl:if test="not(tgroup) and .//row">
-    <xsl:message terminate="yes">
-      <xsl:text>Broken table: row descendent of HTML table.</xsl:text>
-      <xsl:text>The text in the first row is:&#10;</xsl:text>
-      <xsl:value-of 
-               select=".//row[1]"/>
-    </xsl:message>
-  </xsl:if>
-
-  <!-- Contains fo:table, not title or footnotes -->
-  <xsl:variable name="table.content">
-    <xsl:call-template name="make.table.content"/>
-  </xsl:variable>
-
-  <!-- Optional layout table template for extensions -->
-  <xsl:variable name="table.layout">
-    <xsl:call-template name="table.layout">
-      <xsl:with-param name="table.content" select="$table.content"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <!-- fo:block contains title, layout table, and footnotes  -->
-  <xsl:variable name="table.block">
-    <xsl:call-template name="table.block">
-      <xsl:with-param name="table.layout" select="$table.layout"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <!-- pgwide or orient container -->
-  <xsl:variable name="table.container">
-    <xsl:call-template name="table.container">
-      <xsl:with-param name="table.block" select="$table.block"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <!-- float or not -->
-  <xsl:variable name="floatstyle">
-    <xsl:call-template name="floatstyle"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$floatstyle != ''">
-      <xsl:call-template name="floater">
-        <xsl:with-param name="position" select="$floatstyle"/>
-        <xsl:with-param name="content" select="$table.container"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$table.container"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-
-<xsl:template match="equation">
-  <xsl:variable name="param.placement"
-              select="substring-after(normalize-space($formal.title.placement),
-                                      concat(local-name(.), ' '))"/>
-
-  <xsl:variable name="placement">
-    <xsl:choose>
-      <xsl:when test="contains($param.placement, ' ')">
-        <xsl:value-of select="substring-before($param.placement, ' ')"/>
-      </xsl:when>
-      <xsl:when test="$param.placement = ''">before</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$param.placement"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <!-- Equation doesn't have a pgwide attribute, so may use a PI -->
-  <xsl:variable name="pgwide">
-    <xsl:call-template name="pi.dbfo_pgwide"/>
-  </xsl:variable>
-
-  <xsl:variable name="equation">
-    <xsl:choose>
-      <xsl:when test="$pgwide = '1'">
-        <fo:block xsl:use-attribute-sets="pgwide.properties">
-          <xsl:call-template name="semiformal.object">
-            <xsl:with-param name="placement" select="$placement"/>
-          </xsl:call-template>
-        </fo:block>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="semiformal.object">
-          <xsl:with-param name="placement" select="$placement"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="floatstyle">
-    <xsl:call-template name="floatstyle"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$floatstyle != ''">
-      <xsl:call-template name="floater">
-        <xsl:with-param name="position" select="$floatstyle"/>
-        <xsl:with-param name="content" select="$equation"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$equation"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="figure/title"></xsl:template>
-<xsl:template match="figure/titleabbrev"></xsl:template>
-<xsl:template match="table/title"></xsl:template>
-<xsl:template match="table/titleabbrev"></xsl:template>
-<xsl:template match="table/textobject"></xsl:template>
-<xsl:template match="example/title"></xsl:template>
-<xsl:template match="example/titleabbrev"></xsl:template>
-<xsl:template match="equation/title"></xsl:template>
-<xsl:template match="equation/titleabbrev"></xsl:template>
-
-<xsl:template match="informalfigure">
-  <xsl:call-template name="informal.object"/>
-</xsl:template>
-
-<xsl:template match="informalexample">
-  <xsl:call-template name="informal.object"/>
-</xsl:template>
-
-<xsl:template match="informaltable/textobject"></xsl:template>
-
-<xsl:template match="informalequation">
-  <xsl:call-template name="informal.object"/>
-</xsl:template>
-
-<xsl:template name="floatstyle">
-  <xsl:if test="(@float and @float != '0') or @floatstyle != ''">
-    <xsl:choose>
-      <xsl:when test="@floatstyle != ''">
-        <xsl:value-of select="@floatstyle"/>
-      </xsl:when>
-      <xsl:when test="@float = '1'">
-        <xsl:value-of select="$default.float.class"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="@float"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/glossary.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/glossary.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,1139 +1,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE xsl:stylesheet [
-<!ENTITY % common.entities SYSTEM "../common/entities.ent">
-%common.entities;
-]>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="glossary">
-  <xsl:call-template name="make-glossary"/>
-</xsl:template>
-
-<xsl:template match="glossdiv/title"/>
-<xsl:template match="glossdiv/subtitle"/>
-<xsl:template match="glossdiv/titleabbrev"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="make-glossary">
-  <xsl:param name="divs" select="glossdiv"/>
-  <xsl:param name="entries" select="glossentry"/>
-  <xsl:param name="preamble" select="*[not(self::title
-                                           or self::subtitle
-                                           or self::glossdiv
-                                           or self::glossentry)]"/>
-
-  &setup-language-variable;
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="presentation">
-    <xsl:call-template name="pi.dbfo_glossary-presentation"/>
-  </xsl:variable>
-
-  <xsl:variable name="term-width">
-    <xsl:call-template name="pi.dbfo_glossterm-width"/>
-  </xsl:variable>
-
-  <xsl:variable name="width">
-    <xsl:choose>
-      <xsl:when test="$term-width = ''">
-        <xsl:value-of select="$glossterm.width"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$term-width"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <fo:block id="{$id}">
-    <xsl:call-template name="glossary.titlepage"/>
-  </fo:block>
-
-  <xsl:if test="$preamble">
-    <xsl:apply-templates select="$preamble"/>
-  </xsl:if>
-
-  <xsl:choose>
-    <xsl:when test="$presentation = 'list'">
-      <xsl:apply-templates select="$divs" mode="glossary.as.list">
-        <xsl:with-param name="width" select="$width"/>
-      </xsl:apply-templates>
-      <xsl:if test="$entries">
-        <fo:list-block provisional-distance-between-starts="{$width}"
-                       provisional-label-separation="{$glossterm.separation}"
-                       xsl:use-attribute-sets="normal.para.spacing">
-          <xsl:choose>
-            <xsl:when test="$glossary.sort != 0">
-              <xsl:apply-templates select="$entries" mode="glossary.as.list">
-                <xsl:sort lang="{$language}"
-                          select="translate(glossterm, $lowercase, 
-                                            $uppercase)"/>
-              </xsl:apply-templates>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates select="$entries" mode="glossary.as.list"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </fo:list-block>
-      </xsl:if>
-    </xsl:when>
-    <xsl:when test="$presentation = 'blocks'">
-      <xsl:apply-templates select="$divs" mode="glossary.as.blocks"/>
-      <xsl:choose>
-        <xsl:when test="$glossary.sort != 0">
-          <xsl:apply-templates select="$entries" mode="glossary.as.blocks">
-            <xsl:sort lang="{$language}"
-                      select="translate(glossterm, $lowercase, 
-                                        $uppercase)"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="$entries" mode="glossary.as.blocks"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="$glossary.as.blocks != 0">
-      <xsl:apply-templates select="$divs" mode="glossary.as.blocks"/>
-      <xsl:choose>
-        <xsl:when test="$glossary.sort != 0">
-          <xsl:apply-templates select="$entries" mode="glossary.as.blocks">
-            <xsl:sort lang="{$language}"
-                      select="translate(glossterm, $lowercase, 
-                                        $uppercase)"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="$entries" mode="glossary.as.blocks"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="$divs" mode="glossary.as.list">
-        <xsl:with-param name="width" select="$width"/>
-      </xsl:apply-templates>
-      <xsl:if test="$entries">
-        <fo:list-block provisional-distance-between-starts="{$width}"
-                       provisional-label-separation="{$glossterm.separation}"
-                       xsl:use-attribute-sets="normal.para.spacing">
-          <xsl:choose>
-            <xsl:when test="$glossary.sort != 0">
-              <xsl:apply-templates select="$entries" mode="glossary.as.list">
-                <xsl:sort lang="{$language}"
-                          select="translate(glossterm, $lowercase, 
-                                            $uppercase)"/>
-              </xsl:apply-templates>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates select="$entries" mode="glossary.as.list"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </fo:list-block>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="book/glossary|part/glossary|/glossary" priority="2">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster"/>
-  </xsl:variable>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$master-reference}">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language"/>
-    </xsl:attribute>
-
-    <xsl:attribute name="format">
-      <xsl:call-template name="page.number.format">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    
-    <xsl:attribute name="initial-page-number">
-      <xsl:call-template name="initial.page.number">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="force-page-count">
-      <xsl:call-template name="force.page.count">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="set.flow.properties">
-        <xsl:with-param name="element" select="local-name(.)"/>
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-
-      <xsl:call-template name="make-glossary"/>
-    </fo:flow>
-  </fo:page-sequence>
-</xsl:template>
-
-<xsl:template match="glossary/glossaryinfo"></xsl:template>
-<xsl:template match="glossary/info"></xsl:template>
-<xsl:template match="glossary/title"></xsl:template>
-<xsl:template match="glossary/subtitle"></xsl:template>
-<xsl:template match="glossary/titleabbrev"></xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="glosslist">
-  &setup-language-variable;
-
-  <xsl:variable name="presentation">
-    <xsl:call-template name="pi.dbfo_glosslist-presentation"/>
-  </xsl:variable>
-
-  <xsl:variable name="term-width">
-    <xsl:call-template name="pi.dbfo_glossterm-width"/>
-  </xsl:variable>
-
-  <xsl:variable name="width">
-    <xsl:choose>
-      <xsl:when test="$term-width = ''">
-        <xsl:value-of select="$glossterm.width"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$term-width"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:if test="title or info/title">
-    <xsl:apply-templates select="(title|info/title)[1]" mode="list.title.mode"/>
-  </xsl:if>
-
-  <xsl:choose>
-    <xsl:when test="$presentation = 'list'">
-      <fo:list-block provisional-distance-between-starts="{$width}"
-                     provisional-label-separation="{$glossterm.separation}"
-                     xsl:use-attribute-sets="normal.para.spacing">
-        <xsl:choose>
-          <xsl:when test="$glossary.sort != 0">
-            <xsl:apply-templates select="glossentry" mode="glossary.as.list">
-              <xsl:sort lang="{$language}"
-                        select="translate(glossterm, $lowercase, 
-                                          $uppercase)"/>
-            </xsl:apply-templates>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates select="glossentry" mode="glossary.as.list"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </fo:list-block>
-    </xsl:when>
-    <xsl:when test="$presentation = 'blocks'">
-      <xsl:choose>
-        <xsl:when test="$glossary.sort != 0">
-          <xsl:apply-templates select="glossentry" mode="glossary.as.blocks">
-            <xsl:sort lang="{$language}"
-                      select="translate(glossterm, $lowercase, 
-                                        $uppercase)"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="glossentry" mode="glossary.as.blocks"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="$glosslist.as.blocks != 0">
-      <xsl:choose>
-        <xsl:when test="$glossary.sort != 0">
-          <xsl:apply-templates select="glossentry" mode="glossary.as.blocks">
-            <xsl:sort lang="{$language}"
-                      select="translate(glossterm, $lowercase, 
-                                        $uppercase)"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="glossentry" mode="glossary.as.blocks"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:list-block provisional-distance-between-starts="{$width}"
-                     provisional-label-separation="{$glossterm.separation}"
-                     xsl:use-attribute-sets="normal.para.spacing">
-        <xsl:choose>
-          <xsl:when test="$glossary.sort != 0">
-            <xsl:apply-templates select="glossentry" mode="glossary.as.list">
-              <xsl:sort lang="{$language}"
-                        select="translate(glossterm, $lowercase, 
-                                          $uppercase)"/>
-            </xsl:apply-templates>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates select="glossentry" mode="glossary.as.list"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </fo:list-block>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<!-- Glossary collection -->
-
-<xsl:template match="glossary[@role='auto']" priority="2">
-  <xsl:variable name="collection" select="document($glossary.collection, .)"/>
-  <xsl:if test="$glossary.collection = ''">
-    <xsl:message>
-      <xsl:text>Warning: processing automatic glossary </xsl:text>
-      <xsl:text>without a glossary.collection file.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:if test="not($collection) and $glossary.collection != ''">
-    <xsl:message>
-      <xsl:text>Warning: processing automatic glossary but unable to </xsl:text>
-      <xsl:text>open glossary.collection file '</xsl:text>
-      <xsl:value-of select="$glossary.collection"/>
-      <xsl:text>'</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:call-template name="make-auto-glossary"/>
-</xsl:template>
-
-<xsl:template name="make-auto-glossary">
-  <xsl:param name="collection" select="document($glossary.collection, .)"/>
-  <xsl:param name="terms" select="//glossterm[not(parent::glossdef)]|//firstterm"/>
-  <xsl:param name="preamble" select="*[not(self::title
-                                           or self::subtitle
-                                           or self::glossdiv
-                                           or self::glossentry)]"/>
-
-  &setup-language-variable;
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="presentation">
-    <xsl:call-template name="pi.dbfo_glossary-presentation"/>
-  </xsl:variable>
-
-  <xsl:variable name="term-width">
-    <xsl:call-template name="pi.dbfo_glossterm-width"/>
-  </xsl:variable>
-
-  <xsl:variable name="width">
-    <xsl:choose>
-      <xsl:when test="$term-width = ''">
-        <xsl:value-of select="$glossterm.width"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$term-width"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:if test="$glossary.collection = ''">
-    <xsl:message>
-      <xsl:text>Warning: processing automatic glossary </xsl:text>
-      <xsl:text>without a glossary.collection file.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <fo:block id="{$id}">
-    <xsl:call-template name="glossary.titlepage"/>
-  </fo:block>
-
-  <xsl:if test="$preamble">
-    <xsl:apply-templates select="$preamble"/>
-  </xsl:if>
-
-  <xsl:choose>
-    <xsl:when test="glossdiv and $collection//glossdiv">
-      <xsl:for-each select="$collection//glossdiv">
-        <!-- first see if there are any in this div -->
-        <xsl:variable name="exist.test">
-          <xsl:for-each select="glossentry">
-            <xsl:variable name="cterm" select="glossterm"/>
-            <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-              <xsl:value-of select="glossterm"/>
-            </xsl:if>
-          </xsl:for-each>
-        </xsl:variable>
-
-        <xsl:if test="$exist.test != ''">
-          <xsl:choose>
-            <xsl:when test="$presentation = 'list'">
-              <xsl:apply-templates select="." mode="auto-glossary-as-list">
-                <xsl:with-param name="width" select="$width"/>
-                <xsl:with-param name="terms" select="$terms"/>
-              </xsl:apply-templates>
-            </xsl:when>
-            <xsl:when test="$presentation = 'blocks'">
-              <xsl:apply-templates select="." mode="auto-glossary-as-blocks">
-                <xsl:with-param name="terms" select="$terms"/>
-              </xsl:apply-templates>
-            </xsl:when>
-            <xsl:when test="$glossary.as.blocks != 0">
-              <xsl:apply-templates select="." mode="auto-glossary-as-blocks">
-                <xsl:with-param name="terms" select="$terms"/>
-              </xsl:apply-templates>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates select="." mode="auto-glossary-as-list">
-                <xsl:with-param name="width" select="$width"/>
-                <xsl:with-param name="terms" select="$terms"/>
-              </xsl:apply-templates>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:if>
-      </xsl:for-each>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$presentation = 'list'">
-          <fo:list-block provisional-distance-between-starts="{$width}"
-                         provisional-label-separation="{$glossterm.separation}"
-                         xsl:use-attribute-sets="normal.para.spacing">
-            <xsl:choose>
-              <xsl:when test="$glossary.sort != 0">
-                <xsl:for-each select="$collection//glossentry">
-                  <xsl:sort lang="{$language}"
-                            select="translate(glossterm, $lowercase, 
-                                              $uppercase)"/>
-                  <xsl:variable name="cterm" select="glossterm"/>
-                  <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-                    <xsl:apply-templates select="." 
-                                         mode="auto-glossary-as-list"/>
-                  </xsl:if>
-                </xsl:for-each>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:for-each select="$collection//glossentry">
-                  <xsl:variable name="cterm" select="glossterm"/>
-                  <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-                    <xsl:apply-templates select="." 
-                                         mode="auto-glossary-as-list"/>
-                  </xsl:if>
-                </xsl:for-each>
-              </xsl:otherwise>
-            </xsl:choose>
-          </fo:list-block>
-        </xsl:when>
-        <xsl:when test="$presentation = 'blocks' or
-                        $glossary.as.blocks != 0">
-          <xsl:choose>
-            <xsl:when test="$glossary.sort != 0">
-              <xsl:for-each select="$collection//glossentry">
-                <xsl:sort lang="{$language}"
-                          select="translate(glossterm, $lowercase, 
-                                            $uppercase)"/>
-                <xsl:variable name="cterm" select="glossterm"/>
-                <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-                  <xsl:apply-templates select="." 
-                                       mode="auto-glossary-as-blocks"/>
-                </xsl:if>
-              </xsl:for-each>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:for-each select="$collection//glossentry">
-                <xsl:variable name="cterm" select="glossterm"/>
-                <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-                  <xsl:apply-templates select="." 
-                                       mode="auto-glossary-as-blocks"/>
-                </xsl:if>
-              </xsl:for-each>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <fo:list-block provisional-distance-between-starts="{$width}"
-                         provisional-label-separation="{$glossterm.separation}"
-                         xsl:use-attribute-sets="normal.para.spacing">
-            <xsl:choose>
-              <xsl:when test="$glossary.sort != 0">
-                <xsl:for-each select="$collection//glossentry">
-                  <xsl:sort lang="{$language}"
-                            select="translate(glossterm, $lowercase, 
-                                              $uppercase)"/>
-                  <xsl:variable name="cterm" select="glossterm"/>
-                  <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-                    <xsl:apply-templates select="." 
-                                         mode="auto-glossary-as-list"/>
-                  </xsl:if>
-                </xsl:for-each>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:for-each select="$collection//glossentry">
-                  <xsl:variable name="cterm" select="glossterm"/>
-                  <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-                    <xsl:apply-templates select="." 
-                                         mode="auto-glossary-as-list"/>
-                  </xsl:if>
-                </xsl:for-each>
-              </xsl:otherwise>
-            </xsl:choose>
-          </fo:list-block>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="book/glossary[@role='auto']|
-                     part/glossary[@role='auto']|
-                     /glossary[@role='auto']" priority="2.5">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster"/>
-  </xsl:variable>
-
-  <xsl:if test="$glossary.collection = ''">
-    <xsl:message>
-      <xsl:text>Warning: processing automatic glossary </xsl:text>
-      <xsl:text>without a glossary.collection file.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$master-reference}">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language"/>
-    </xsl:attribute>
-    <xsl:attribute name="format">
-      <xsl:call-template name="page.number.format">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="initial-page-number">
-      <xsl:call-template name="initial.page.number">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="force-page-count">
-      <xsl:call-template name="force.page.count">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="set.flow.properties">
-        <xsl:with-param name="element" select="local-name(.)"/>
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-
-      <xsl:call-template name="make-auto-glossary"/>
-    </fo:flow>
-  </fo:page-sequence>
-</xsl:template>
-
-<xsl:template match="glossdiv" mode="auto-glossary-as-list">
-  <xsl:param name="width" select="$glossterm.width"/>
-  <xsl:param name="terms" select="."/>
-
-  &setup-language-variable;
-
-  <xsl:variable name="preamble"
-                select="*[not(self::title
-                            or self::subtitle
-                            or self::glossentry)]"/>
-
-  <xsl:call-template name="glossdiv.titlepage"/>
-
-  <xsl:apply-templates select="$preamble"/>
-
-  <fo:list-block provisional-distance-between-starts="{$width}"
-                 provisional-label-separation="{$glossterm.separation}"
-                 xsl:use-attribute-sets="normal.para.spacing">
-    <xsl:choose>
-      <xsl:when test="$glossary.sort != 0">
-        <xsl:for-each select="glossentry">
-          <xsl:sort lang="{$language}"
-                    select="translate(glossterm, $lowercase, $uppercase)"/>
-          <xsl:variable name="cterm" select="glossterm"/>
-          <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-            <xsl:apply-templates select="." mode="auto-glossary-as-list"/>
-          </xsl:if>
-        </xsl:for-each>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:for-each select="glossentry">
-          <xsl:variable name="cterm" select="glossterm"/>
-          <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-            <xsl:apply-templates select="." mode="auto-glossary-as-list"/>
-          </xsl:if>
-        </xsl:for-each>
-      </xsl:otherwise>
-    </xsl:choose>
-  </fo:list-block>
-</xsl:template>
-
-<xsl:template match="glossentry" mode="auto-glossary-as-list">
-  <xsl:apply-templates select="." mode="glossary.as.list"/>
-</xsl:template>
-
-<xsl:template match="glossdiv" mode="auto-glossary-as-blocks">
-  <xsl:param name="terms" select="."/>
-
-  &setup-language-variable;
-
-  <xsl:variable name="preamble"
-                select="*[not(self::title
-                            or self::subtitle
-                            or self::glossentry)]"/>
-
-  <xsl:call-template name="glossdiv.titlepage"/>
-
-  <xsl:apply-templates select="$preamble"/>
-
-  <xsl:choose>
-    <xsl:when test="$glossary.sort != 0">
-      <xsl:for-each select="glossentry">
-        <xsl:sort lang="{$language}"
-                  select="translate(glossterm, $lowercase, $uppercase)"/>
-        <xsl:variable name="cterm" select="glossterm"/>
-        <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-          <xsl:apply-templates select="." mode="auto-glossary-as-blocks"/>
-        </xsl:if>
-      </xsl:for-each>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:for-each select="glossentry">
-        <xsl:variable name="cterm" select="glossterm"/>
-        <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-          <xsl:apply-templates select="." mode="auto-glossary-as-blocks"/>
-        </xsl:if>
-      </xsl:for-each>
-    </xsl:otherwise>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template match="glossentry" mode="auto-glossary-as-blocks">
-  <xsl:apply-templates select="." mode="glossary.as.blocks"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<!-- Format glossary as a list -->
-
-<xsl:template match="glossdiv" mode="glossary.as.list">
-  <xsl:param name="width" select="$glossterm.width"/>
-
-  &setup-language-variable;
-
-  <xsl:variable name="entries" select="glossentry"/>
-
-  <xsl:variable name="preamble"
-                select="*[not(self::title
-                            or self::subtitle
-                            or self::glossentry)]"/>
-
-  <xsl:call-template name="glossdiv.titlepage"/>
-
-  <xsl:apply-templates select="$preamble"/>
-
-  <fo:list-block provisional-distance-between-starts="{$width}"
-                 provisional-label-separation="{$glossterm.separation}"
-                 xsl:use-attribute-sets="normal.para.spacing">
-    <xsl:choose>
-      <xsl:when test="$glossary.sort != 0">
-        <xsl:apply-templates select="$entries" mode="glossary.as.list">
-          <xsl:sort lang="{$language}"
-                    select="translate(glossterm, $lowercase, 
-                                      $uppercase)"/>
-        </xsl:apply-templates>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates select="$entries" mode="glossary.as.list"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </fo:list-block>
-</xsl:template>
-
-<!--
-GlossEntry ::=
-  GlossTerm, Acronym?, Abbrev?,
-  (IndexTerm)*,
-  RevHistory?,
-  (GlossSee | GlossDef+)
--->
-
-<xsl:template match="glossentry" mode="glossary.as.list">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:list-item xsl:use-attribute-sets="normal.para.spacing">
-    <xsl:call-template name="anchor">
-      <xsl:with-param name="conditional">
-        <xsl:choose>
-          <xsl:when test="$glossterm.auto.link != 0
-                          or $glossary.collection != ''">0</xsl:when>
-          <xsl:otherwise>1</xsl:otherwise>
-        </xsl:choose>
-      </xsl:with-param>
-    </xsl:call-template>
-
-    <fo:list-item-label end-indent="label-end()">
-      <fo:block>
-        <xsl:choose>
-          <xsl:when test="$glossentry.show.acronym = 'primary'">
-            <xsl:choose>
-              <xsl:when test="acronym|abbrev">
-                <xsl:apply-templates select="acronym|abbrev" 
-                                     mode="glossary.as.list"/>
-                <xsl:text> (</xsl:text>
-                <xsl:apply-templates select="glossterm" 
-                                     mode="glossary.as.list"/>
-                <xsl:text>)</xsl:text>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:apply-templates select="glossterm" 
-                                     mode="glossary.as.list"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:when>
-
-          <xsl:when test="$glossentry.show.acronym = 'yes'">
-            <xsl:apply-templates select="glossterm" mode="glossary.as.list"/>
-
-            <xsl:if test="acronym|abbrev">
-              <xsl:text> (</xsl:text>
-              <xsl:apply-templates select="acronym|abbrev" 
-                                   mode="glossary.as.list"/>
-              <xsl:text>)</xsl:text>
-            </xsl:if>
-          </xsl:when>
-
-          <xsl:otherwise>
-            <xsl:apply-templates select="glossterm" mode="glossary.as.list"/>
-          </xsl:otherwise>
-        </xsl:choose>
-        <xsl:apply-templates select="indexterm"/>
-      </fo:block>
-    </fo:list-item-label>
-
-    <fo:list-item-body start-indent="body-start()">
-      <xsl:apply-templates select="glosssee|glossdef" mode="glossary.as.list"/>
-    </fo:list-item-body>
-  </fo:list-item>
-</xsl:template>
-
-<xsl:template match="glossentry/glossterm" mode="glossary.as.list">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  <fo:inline id="{$id}">
-    <xsl:apply-templates/>
-  </fo:inline>
-  <xsl:if test="following-sibling::glossterm">, </xsl:if>
-</xsl:template>
-
-<xsl:template match="glossentry/acronym" mode="glossary.as.list">
-  <xsl:apply-templates/>
-  <xsl:if test="following-sibling::acronym|following-sibling::abbrev">, </xsl:if>
-</xsl:template>
-
-<xsl:template match="glossentry/abbrev" mode="glossary.as.list">
-  <xsl:apply-templates/>
-  <xsl:if test="following-sibling::acronym|following-sibling::abbrev">, </xsl:if>
-</xsl:template>
-
-<xsl:template match="glossentry/revhistory" mode="glossary.as.list">
-</xsl:template>
-
-<xsl:template match="glossentry/glosssee" mode="glossary.as.list">
-  <xsl:variable name="otherterm" select="@otherterm"/>
-  <xsl:variable name="targets" select="key('id', $otherterm)"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-
-  <fo:block>
-    <xsl:variable name="template">
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'glossary'"/>
-        <xsl:with-param name="name" select="'see'"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="title">
-      <xsl:choose>
-        <xsl:when test="$target">
-          <fo:basic-link internal-destination="{$otherterm}"
-                         xsl:use-attribute-sets="xref.properties">
-            <xsl:apply-templates select="$target" mode="xref-to"/>
-          </fo:basic-link>
-        </xsl:when>
-        <xsl:when test="$otherterm != '' and not($target)">
-          <xsl:message>
-            <xsl:text>Warning: glosssee @otherterm reference not found: </xsl:text>
-            <xsl:value-of select="$otherterm"/>
-          </xsl:message>
-          <xsl:apply-templates mode="glossary.as.list"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates mode="glossary.as.list"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:call-template name="substitute-markup">
-      <xsl:with-param name="template" select="$template"/>
-      <xsl:with-param name="title" select="$title"/>
-    </xsl:call-template>
-
-    <xsl:text>.</xsl:text>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="glossentry/glossdef" mode="glossary.as.list">
-  <xsl:apply-templates select="*[local-name(.) != 'glossseealso']"/>
-  <xsl:if test="glossseealso">
-    <fo:block>
-      <xsl:variable name="template">
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'glossary'"/>
-          <xsl:with-param name="name" select="'seealso'"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:variable name="title">
-        <xsl:apply-templates select="glossseealso" mode="glossary.as.list"/>
-      </xsl:variable>
-      <xsl:call-template name="substitute-markup">
-        <xsl:with-param name="template" select="$template"/>
-        <xsl:with-param name="title" select="$title"/>
-      </xsl:call-template>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="glossentry/glossdef/para[1]|glossentry/glossdef/simpara[1]"
-              mode="glossary.as.list">
-  <fo:block>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="glossseealso" mode="glossary.as.list">
-  <xsl:variable name="otherterm" select="@otherterm"/>
-  <xsl:variable name="targets" select="key('id', $otherterm)"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-
-  <xsl:choose>
-    <xsl:when test="$target">
-      <fo:basic-link internal-destination="{$otherterm}"
-                     xsl:use-attribute-sets="xref.properties">
-        <xsl:apply-templates select="$target" mode="xref-to"/>
-      </fo:basic-link>
-    </xsl:when>
-    <xsl:when test="$otherterm != '' and not($target)">
-      <xsl:message>
-        <xsl:text>Warning: glossseealso @otherterm reference not found: </xsl:text>
-        <xsl:value-of select="$otherterm"/>
-      </xsl:message>
-      <xsl:apply-templates mode="glossary.as.list"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="glossary.as.list"/>
-    </xsl:otherwise>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="position() = last()">
-      <xsl:text>.</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text>, </xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<!-- Format glossary blocks -->
-
-<xsl:template match="glossdiv" mode="glossary.as.blocks">
-  &setup-language-variable;
-  <xsl:variable name="entries" select="glossentry"/>
-  <xsl:variable name="preamble"
-                select="*[not(self::title
-                            or self::subtitle
-                            or self::glossentry)]"/>
-
-  <xsl:call-template name="glossdiv.titlepage"/>
-
-  <xsl:apply-templates select="$preamble"/>
-
-  <xsl:choose>
-    <xsl:when test="$glossary.sort != 0">
-      <xsl:apply-templates select="$entries" mode="glossary.as.blocks">
-        <xsl:sort lang="{$language}"
-                  select="translate(glossterm, $lowercase, 
-                                    $uppercase)"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="$entries" mode="glossary.as.blocks"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!--
-GlossEntry ::=
-  GlossTerm, Acronym?, Abbrev?,
-  (IndexTerm)*,
-  RevHistory?,
-  (GlossSee | GlossDef+)
--->
-
-<xsl:template match="glossentry" mode="glossary.as.blocks">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:block xsl:use-attribute-sets="list.item.spacing"
-           keep-with-next.within-column="always" 
-           keep-together.within-column="always">
-    <xsl:call-template name="anchor">
-      <xsl:with-param name="conditional">
-        <xsl:choose>
-          <xsl:when test="$glossterm.auto.link != 0
-                          or $glossary.collection != ''">0</xsl:when>
-          <xsl:otherwise>1</xsl:otherwise>
-        </xsl:choose>
-      </xsl:with-param>
-    </xsl:call-template>
-
-    <xsl:choose>
-      <xsl:when test="$glossentry.show.acronym = 'primary'">
-        <xsl:choose>
-          <xsl:when test="acronym|abbrev">
-            <xsl:apply-templates select="acronym|abbrev" mode="glossary.as.blocks"/>
-            <xsl:text> (</xsl:text>
-            <xsl:apply-templates select="glossterm" mode="glossary.as.blocks"/>
-            <xsl:text>)</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates select="glossterm" mode="glossary.as.blocks"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-
-      <xsl:when test="$glossentry.show.acronym = 'yes'">
-        <xsl:apply-templates select="glossterm" mode="glossary.as.blocks"/>
-
-        <xsl:if test="acronym|abbrev">
-          <xsl:text> (</xsl:text>
-          <xsl:apply-templates select="acronym|abbrev" mode="glossary.as.blocks"/>
-          <xsl:text>)</xsl:text>
-        </xsl:if>
-      </xsl:when>
-
-      <xsl:otherwise>
-        <xsl:apply-templates select="glossterm" mode="glossary.as.blocks"/>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:apply-templates select="indexterm"/>
-  </fo:block>
-
-  <fo:block margin-left="0.25in">
-    <xsl:apply-templates select="glosssee|glossdef" mode="glossary.as.blocks"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="glossentry/glossterm" mode="glossary.as.blocks">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  <fo:inline id="{$id}">
-    <xsl:apply-templates/>
-  </fo:inline>
-  <xsl:if test="following-sibling::glossterm">, </xsl:if>
-</xsl:template>
-
-<xsl:template match="glossentry/acronym" mode="glossary.as.blocks">
-  <xsl:apply-templates/>
-  <xsl:if test="following-sibling::acronym|following-sibling::abbrev">, </xsl:if>
-</xsl:template>
-
-<xsl:template match="glossentry/abbrev" mode="glossary.as.blocks">
-  <xsl:apply-templates/>
-  <xsl:if test="following-sibling::acronym|following-sibling::abbrev">, </xsl:if>
-</xsl:template>
-
-<xsl:template match="glossentry/glosssee" mode="glossary.as.blocks">
-  <xsl:variable name="otherterm" select="@otherterm"/>
-  <xsl:variable name="targets" select="key('id', $otherterm)"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-
-  <xsl:variable name="template">
-    <xsl:call-template name="gentext.template">
-      <xsl:with-param name="context" select="'glossary'"/>
-      <xsl:with-param name="name" select="'see'"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="title">
-    <xsl:choose>
-      <xsl:when test="$target">
-        <fo:basic-link internal-destination="{$otherterm}"
-                       xsl:use-attribute-sets="xref.properties">
-          <xsl:apply-templates select="$target" mode="xref-to"/>
-        </fo:basic-link>
-      </xsl:when>
-      <xsl:when test="$otherterm != '' and not($target)">
-        <xsl:message>
-          <xsl:text>Warning: glosssee @otherterm reference not found: </xsl:text>
-          <xsl:value-of select="$otherterm"/>
-        </xsl:message>
-        <xsl:apply-templates mode="glossary.as.blocks"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates mode="glossary.as.blocks"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:call-template name="substitute-markup">
-    <xsl:with-param name="template" select="$template"/>
-    <xsl:with-param name="title" select="$title"/>
-  </xsl:call-template>
-
-  <xsl:text>.</xsl:text>
-</xsl:template>
-
-<xsl:template match="glossentry/glossdef" mode="glossary.as.blocks">
-  <xsl:apply-templates select="*[local-name(.) != 'glossseealso']"
-                       mode="glossary.as.blocks"/>
-  <xsl:if test="glossseealso">
-    <fo:block>
-      <xsl:variable name="template">
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'glossary'"/>
-          <xsl:with-param name="name" select="'seealso'"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:variable name="title">
-        <xsl:apply-templates select="glossseealso" mode="glossary.as.blocks"/>
-      </xsl:variable>
-      <xsl:call-template name="substitute-markup">
-        <xsl:with-param name="template" select="$template"/>
-        <xsl:with-param name="title" select="$title"/>
-      </xsl:call-template>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="glossentry/glossdef/para[1]|glossentry/glossdef/simpara[1]"
-              mode="glossary.as.blocks">
-  <fo:block>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<!-- Handle any other glossdef content normally -->
-<xsl:template match="*" mode="glossary.as.blocks">
-  <xsl:apply-templates select="." />
-</xsl:template>
-
-<xsl:template match="glossseealso" mode="glossary.as.blocks">
-  <xsl:variable name="otherterm" select="@otherterm"/>
-  <xsl:variable name="targets" select="key('id', $otherterm)"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-
-  <xsl:choose>
-    <xsl:when test="$target">
-      <fo:basic-link internal-destination="{$otherterm}"
-                     xsl:use-attribute-sets="xref.properties">
-        <xsl:apply-templates select="$target" mode="xref-to"/>
-      </fo:basic-link>
-    </xsl:when>
-    <xsl:when test="$otherterm != '' and not($target)">
-      <xsl:message>
-        <xsl:text>Warning: glossseealso @otherterm reference not found: </xsl:text>
-        <xsl:value-of select="$otherterm"/>
-      </xsl:message>
-      <xsl:apply-templates mode="glossary.as.blocks"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="glossary.as.blocks"/>
-    </xsl:otherwise>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="position() = last()">
-      <xsl:text>.</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text>, </xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/graphics.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/graphics.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,637 +1,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE xsl:stylesheet [
-<!ENTITY lowercase "'abcdefghijklmnopqrstuvwxyz'">
-<!ENTITY uppercase "'ABCDEFGHIJKLMNOPQRSTUVWXYZ'">
- ]>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:xlink="http://www.w3.org/1999/xlink"
-                xmlns:stext="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.TextFactory"
-                xmlns:xtext="com.nwalsh.xalan.Text"
-                xmlns:lxslt="http://xml.apache.org/xslt"
-                exclude-result-prefixes="xlink stext xtext lxslt"
-                extension-element-prefixes="stext xtext"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     Contributors:
-     Colin Paul Adams, <colin@colina.demon.co.uk>
-     Paul Grosso, <pgrosso@arbortext.com>
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-<!-- Graphic format tests for the FO backend -->
-
-<xsl:param name="graphic.notations">
-  <!-- n.b. exactly one leading space, one trailing space, and one inter-word space -->
-  <xsl:choose>
-    <xsl:when test="$passivetex.extensions != 0">
-      <xsl:text> PNG PDF JPG JPEG linespecific </xsl:text>
-    </xsl:when>
-    <xsl:when test="$fop1.extensions != 0">
-      <xsl:text> BMP GIF TIFF SVG PNG EPS JPG JPEG linespecific </xsl:text>
-    </xsl:when>
-    <xsl:when test="$fop.extensions != 0">
-      <xsl:text> BMP GIF TIFF SVG PNG EPS JPG JPEG linespecific </xsl:text>
-    </xsl:when>
-    <xsl:when test="$arbortext.extensions != 0">
-      <xsl:text> PNG PDF JPG JPEG linespecific GIF GIF87a GIF89a TIFF BMP </xsl:text>
-    </xsl:when>
-    <xsl:when test="$xep.extensions != 0">
-      <xsl:text> SVG PNG PDF JPG JPEG linespecific GIF GIF87a GIF89a TIFF BMP </xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text> PNG PDF JPG JPEG linespecific GIF GIF87a GIF89a TIFF BMP </xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-
-<xsl:template name="is.graphic.format">
-  <xsl:param name="format"/>
-  <xsl:if test="contains($graphic.notations, concat(' ',$format,' '))">1</xsl:if>
-</xsl:template>
-
-<xsl:param name="graphic.extensions">
-  <!-- n.b. exactly one leading space, one trailing space, and one inter-word space -->
-  <xsl:choose>
-    <xsl:when test="$passivetex.extensions != 0">
-      <xsl:text> png pdf jpg jpeg </xsl:text>
-    </xsl:when>
-    <xsl:when test="$fop1.extensions != 0">
-      <xsl:text> bmp gif tif tiff svg png pdf jpg jpeg eps </xsl:text>
-    </xsl:when>
-    <xsl:when test="$fop.extensions != 0">
-      <xsl:text> bmp gif tif tiff svg png pdf jpg jpeg eps </xsl:text>
-    </xsl:when>
-    <xsl:when test="$arbortext.extensions != 0">
-      <xsl:text> png pdf jpg jpeg gif tif tiff bmp </xsl:text>
-    </xsl:when>
-    <xsl:when test="$xep.extensions != 0">
-      <xsl:text> svg png pdf jpg jpeg gif tif tiff bmp eps </xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text> svg png pdf jpg jpeg gif tif tiff bmp eps </xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-
-<xsl:template name="is.graphic.extension">
-  <xsl:param name="ext"/>
-  <xsl:variable name="lcext" select="translate($ext,
-                                       'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
-                                       'abcdefghijklmnopqrstuvwxyz')"/>
-
-  <xsl:if test="contains($graphic.extensions,
-                         concat(' ', $lcext, ' '))">1</xsl:if>
-</xsl:template>
-
-<xsl:template name="graphic.format.content-type">
-  <xsl:param name="format"/>
-  <xsl:variable name="is.graphic.format">
-    <xsl:call-template name="is.graphic.format">
-      <xsl:with-param name="format" select="$format"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:if test="$is.graphic.format">
-    <xsl:choose>
-      <xsl:when test="$format = ''"></xsl:when>
-      <xsl:when test="$format = 'linespecific'"></xsl:when>
-      <xsl:when test="$format = 'PS'">application/postscript</xsl:when>
-      <xsl:when test="$format = 'PDF'">application/pdf</xsl:when>
-      <xsl:when test="$format = 'PNG'">image/png</xsl:when>
-      <xsl:when test="$format = 'SVG'">image/svg+xml</xsl:when>
-      <xsl:when test="$format = 'JPG'">image/jpeg</xsl:when>
-      <xsl:when test="$format = 'GIF87a'">image/gif</xsl:when>
-      <xsl:when test="$format = 'GIF89a'">image/gif</xsl:when>
-      <xsl:otherwise>
-          <xsl:value-of select="concat('image/', 
-            translate($format, &uppercase;, &lowercase;))"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:if>
-</xsl:template>
-
-
-<!-- ==================================================================== -->
-
-<xsl:template match="screenshot">
-  <fo:block>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="screeninfo">
-</xsl:template>
-
-<!-- ==================================================================== -->
-<!-- Override these templates for FO -->
-<!-- ==================================================================== -->
-
-<xsl:template name="process.image">
-  <!-- When this template is called, the current node should be  -->
-  <!-- a graphic, inlinegraphic, imagedata, or videodata. All    -->
-  <!-- those elements have the same set of attributes, so we can -->
-  <!-- handle them all in one place.                             -->
-
-  <xsl:variable name="scalefit">
-    <xsl:choose>
-      <xsl:when test="$ignore.image.scaling != 0">0</xsl:when>
-      <xsl:when test="@contentwidth">0</xsl:when>
-      <xsl:when test="@contentdepth and 
-                      @contentdepth != '100%'">0</xsl:when>
-      <xsl:when test="@scale">0</xsl:when>
-      <xsl:when test="@scalefit"><xsl:value-of select="@scalefit"/></xsl:when>
-      <xsl:when test="@width or @depth">1</xsl:when>
-      <xsl:otherwise>0</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="scale">
-    <xsl:choose>
-      <xsl:when test="$ignore.image.scaling != 0">0</xsl:when>
-      <xsl:when test="@contentwidth or @contentdepth">1.0</xsl:when>
-      <xsl:when test="@scale">
-        <xsl:value-of select="@scale div 100.0"/>
-      </xsl:when>
-      <xsl:otherwise>1.0</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="filename">
-    <xsl:choose>
-      <xsl:when test="local-name(.) = 'graphic'
-                      or local-name(.) = 'inlinegraphic'">
-        <!-- handle legacy graphic and inlinegraphic by new template --> 
-        <xsl:call-template name="mediaobject.filename">
-          <xsl:with-param name="object" select="."/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- imagedata, videodata, audiodata -->
-        <xsl:call-template name="mediaobject.filename">
-          <xsl:with-param name="object" select=".."/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="content-type">
-    <xsl:if test="@format">
-      <xsl:call-template name="graphic.format.content-type">
-        <xsl:with-param name="format" select="@format"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="bgcolor">
-    <xsl:call-template name="pi.dbfo_background-color">
-      <xsl:with-param name="node" select=".."/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <fo:external-graphic>
-    <xsl:attribute name="src">
-      <xsl:call-template name="fo-external-image">
-        <xsl:with-param name="filename">
-          <xsl:if test="$img.src.path != '' and
-                        not(starts-with($filename, '/')) and
-                        not(contains($filename, '://'))">
-            <xsl:value-of select="$img.src.path"/>
-          </xsl:if>
-          <xsl:value-of select="$filename"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="width">
-      <xsl:choose>
-        <xsl:when test="$ignore.image.scaling != 0">auto</xsl:when>
-        <xsl:when test="contains(@width,'%')">
-          <xsl:value-of select="@width"/>
-        </xsl:when>
-        <xsl:when test="@width and not(@width = '')">
-          <xsl:call-template name="length-spec">
-            <xsl:with-param name="length" select="@width"/>
-            <xsl:with-param name="default.units" select="'px'"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="not(@depth) and $default.image.width != ''">
-          <xsl:call-template name="length-spec">
-            <xsl:with-param name="length" select="$default.image.width"/>
-            <xsl:with-param name="default.units" select="'px'"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>auto</xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-
-    <xsl:attribute name="height">
-      <xsl:choose>
-        <xsl:when test="$ignore.image.scaling != 0">auto</xsl:when>
-        <xsl:when test="contains(@depth,'%')">
-          <xsl:value-of select="@depth"/>
-        </xsl:when>
-        <xsl:when test="@depth">
-          <xsl:call-template name="length-spec">
-            <xsl:with-param name="length" select="@depth"/>
-            <xsl:with-param name="default.units" select="'px'"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>auto</xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-
-    <xsl:attribute name="content-width">
-      <xsl:choose>
-        <xsl:when test="$ignore.image.scaling != 0">auto</xsl:when>
-        <xsl:when test="contains(@contentwidth,'%')">
-          <xsl:value-of select="@contentwidth"/>
-        </xsl:when>
-        <xsl:when test="@contentwidth">
-          <xsl:call-template name="length-spec">
-            <xsl:with-param name="length" select="@contentwidth"/>
-            <xsl:with-param name="default.units" select="'px'"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="number($scale) != 1.0">
-          <xsl:value-of select="$scale * 100"/>
-          <xsl:text>%</xsl:text>
-        </xsl:when>
-        <xsl:when test="$scalefit = 1">scale-to-fit</xsl:when>
-        <xsl:otherwise>auto</xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-
-    <xsl:attribute name="content-height">
-      <xsl:choose>
-        <xsl:when test="$ignore.image.scaling != 0">auto</xsl:when>
-        <xsl:when test="contains(@contentdepth,'%')">
-          <xsl:value-of select="@contentdepth"/>
-        </xsl:when>
-        <xsl:when test="@contentdepth">
-          <xsl:call-template name="length-spec">
-            <xsl:with-param name="length" select="@contentdepth"/>
-            <xsl:with-param name="default.units" select="'px'"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="number($scale) != 1.0">
-          <xsl:value-of select="$scale * 100"/>
-          <xsl:text>%</xsl:text>
-        </xsl:when>
-        <xsl:when test="$scalefit = 1">scale-to-fit</xsl:when>
-        <xsl:otherwise>auto</xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-
-    <xsl:if test="$content-type != ''">
-      <xsl:attribute name="content-type">
-        <xsl:value-of select="concat('content-type:',$content-type)"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:if test="$bgcolor != ''">
-      <xsl:attribute name="background-color">
-        <xsl:value-of select="$bgcolor"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:if test="@align">
-      <xsl:attribute name="text-align">
-        <xsl:value-of select="@align"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:if test="@valign">
-      <xsl:attribute name="display-align">
-        <xsl:choose>
-          <xsl:when test="@valign = 'top'">before</xsl:when>
-          <xsl:when test="@valign = 'middle'">center</xsl:when>
-          <xsl:when test="@valign = 'bottom'">after</xsl:when>
-          <xsl:otherwise>auto</xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-    </xsl:if>
-  </fo:external-graphic>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="graphic">
-  <xsl:choose>
-    <xsl:when test="parent::inlineequation">
-      <xsl:call-template name="process.image"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:block>
-        <xsl:if test="@align">
-          <xsl:attribute name="text-align">
-            <xsl:value-of select="@align"/>
-          </xsl:attribute>
-        </xsl:if>
-        <xsl:call-template name="process.image"/>
-      </fo:block>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="inlinegraphic">
-  <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
-  <xsl:variable name="filename">
-    <xsl:choose>
-      <xsl:when test="@entityref">
-        <xsl:value-of select="unparsed-entity-uri(@entityref)"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates select="@fileref"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="@format='linespecific'">
-      <xsl:choose>
-        <xsl:when test="$use.extensions != '0'
-                        and $textinsert.extension != '0'">
-          <xsl:choose>
-            <xsl:when test="contains($vendor, 'SAXON')">
-              <stext:insertfile href="{$filename}" encoding="{$textdata.default.encoding}"/>
-            </xsl:when>
-            <xsl:when test="contains($vendor, 'Apache Software Foundation')">
-              <xtext:insertfile href="{$filename}"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:message terminate="yes">
-                <xsl:text>Don't know how to insert files with </xsl:text>
-                <xsl:value-of select="$vendor"/>
-              </xsl:message>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-	<xsl:otherwise>
-	  <xsl:message terminate="yes">
-	    <xsl:text>Cannot insert </xsl:text><xsl:value-of select="$filename"/>
-	    <xsl:text>. Check use.extensions and textinsert.extension parameters.</xsl:text> 
-	  </xsl:message>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="process.image"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="mediaobject|mediaobjectco">
-
-  <xsl:variable name="olist" select="imageobject|imageobjectco
-                     |videoobject|audioobject
-                     |textobject"/>
-
-  <xsl:variable name="object.index">
-    <xsl:call-template name="select.mediaobject.index">
-      <xsl:with-param name="olist" select="$olist"/>
-      <xsl:with-param name="count" select="1"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="object" select="$olist[position() = $object.index]"/>
-
-  <xsl:variable name="align">
-    <xsl:value-of select="$object/descendant::imagedata[@align][1]/@align"/>
-  </xsl:variable>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:block id="{$id}">
-    <xsl:if test="$align != '' ">
-      <xsl:attribute name="text-align">
-        <xsl:value-of select="$align"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:apply-templates select="$object"/>
-    <xsl:apply-templates select="caption"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="inlinemediaobject">
-  <xsl:call-template name="select.mediaobject"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="imageobjectco">
-  <xsl:apply-templates select="imageobject"/>
-  <xsl:apply-templates select="calloutlist"/>
-</xsl:template>
-
-<xsl:template match="imageobject">
-  <xsl:choose>
-    <xsl:when test="imagedata">
-      <xsl:apply-templates select="imagedata"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:instream-foreign-object>
-        <xsl:apply-templates mode="copy-all"/>
-      </fo:instream-foreign-object>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="copy-all">
-  <xsl:copy>
-    <xsl:for-each select="@*">
-      <xsl:copy/>
-    </xsl:for-each>
-    <xsl:apply-templates mode="copy-all"/>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="text()|comment()|processing-instruction()" mode="copy-all">
-  <xsl:copy/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="imagedata">
-  <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
-  <xsl:variable name="filename">
-    <xsl:call-template name="mediaobject.filename">
-      <xsl:with-param name="object" select=".."/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="@format='linespecific'">
-      <xsl:choose>
-        <xsl:when test="$use.extensions != '0'
-                        and $textinsert.extension != '0'">
-          <xsl:choose>
-            <xsl:when test="contains($vendor, 'SAXON')">
-              <stext:insertfile href="{$filename}" encoding="{$textdata.default.encoding}"/>
-            </xsl:when>
-            <xsl:when test="contains($vendor, 'Apache Software Foundation')">
-              <xtext:insertfile href="{$filename}"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:message terminate="yes">
-                <xsl:text>Don't know how to insert files with </xsl:text>
-                <xsl:value-of select="$vendor"/>
-              </xsl:message>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-	  <xsl:message terminate="yes">
-	    <xsl:text>Cannot insert </xsl:text><xsl:value-of select="$filename"/>
-	    <xsl:text>. Check use.extensions and textinsert.extension parameters.</xsl:text> 
-	  </xsl:message>
-	</xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="process.image"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="videoobject">
-  <xsl:apply-templates select="videodata"/>
-</xsl:template>
-
-<xsl:template match="videodata">
-  <xsl:call-template name="process.image"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="audioobject">
-  <xsl:apply-templates select="audiodata"/>
-</xsl:template>
-
-<xsl:template match="audiodata">
-  <xsl:call-template name="process.image"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="textobject">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="textdata">
-  <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
-  <xsl:variable name="filename">
-    <xsl:choose>
-      <xsl:when test="@entityref">
-        <xsl:value-of select="unparsed-entity-uri(@entityref)"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates select="@fileref"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="encoding">
-    <xsl:choose>
-      <xsl:when test="@encoding">
-        <xsl:value-of select="@encoding"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$textdata.default.encoding"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$use.extensions != '0'
-                    and $textinsert.extension != '0'">
-      <xsl:choose>
-        <xsl:when test="element-available('stext:insertfile')">
-          <stext:insertfile href="{$filename}" encoding="{$encoding}"/>
-        </xsl:when>
-        <xsl:when test="element-available('xtext:insertfile')">
-          <xtext:insertfile href="{$filename}"/>
-        </xsl:when>
-	<xsl:otherwise>
-	  <xsl:message terminate="yes">
-	    <xsl:text>Don't know how to insert files with </xsl:text>
-	    <xsl:value-of select="$vendor"/>
-	  </xsl:message>
-	</xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message terminate="yes">
-	<xsl:text>Cannot insert </xsl:text><xsl:value-of select="$filename"/>
-	<xsl:text>. Check use.extensions and textinsert.extension parameters.</xsl:text> 
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="caption">
-  <fo:block>
-    <xsl:if test="@align = 'right' or @align = 'left' or @align='center'">
-      <xsl:attribute name="text-align"><xsl:value-of
-                         select="@align"/></xsl:attribute>
-    </xsl:if>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="fo-external-image">
-  <xsl:param name="filename"/>
-
-  <xsl:choose>
-    <xsl:when test="$passivetex.extensions != 0
-                    or $fop.extensions != 0">
-      <xsl:value-of select="$filename"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="concat('url(', $filename, ')')"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- Resolve xml:base attributes -->
-<xsl:template match="@fileref">
-  <!-- need a check for absolute urls -->
-  <xsl:choose>
-    <xsl:when test="contains(., ':') or starts-with(.,'/')">
-      <!-- it has a uri scheme or starts with '/', so it is an absolute uri -->
-      <xsl:value-of select="."/>
-    </xsl:when>
-    <xsl:when test="$keep.relative.image.uris != 0">
-      <!-- leave it alone -->
-      <xsl:value-of select="."/>
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- its a relative uri -->
-      <xsl:call-template name="relative-uri">
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/highlight.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/highlight.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,57 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-		xmlns:fo="http://www.w3.org/1999/XSL/Format"
-		xmlns:xslthl="http://xslthl.sf.net"
-                exclude-result-prefixes="xslthl"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     and other information.
-
-     ******************************************************************** -->
-
-<xsl:template match='xslthl:keyword'>
-  <fo:inline font-weight="bold"><xsl:apply-templates/></fo:inline>
-</xsl:template>
-
-<xsl:template match='xslthl:string'>
-  <fo:inline font-weight="bold" font-style="italic"><xsl:apply-templates/></fo:inline>
-</xsl:template>
-
-<xsl:template match='xslthl:comment'>
-  <fo:inline font-style="italic"><xsl:apply-templates/></fo:inline>
-</xsl:template>
-
-<xsl:template match='xslthl:tag'>
-  <fo:inline font-weight="bold"><xsl:apply-templates/></fo:inline>
-</xsl:template>
-
-<xsl:template match='xslthl:attribute'>
-  <fo:inline font-weight="bold"><xsl:apply-templates/></fo:inline>
-</xsl:template>
-
-<xsl:template match='xslthl:value'>
-  <fo:inline font-weight="bold"><xsl:apply-templates/></fo:inline>
-</xsl:template>
-
-<!--
-<xsl:template match='xslthl:html'>
-  <span style='background:#AFF'><font color='blue'><xsl:apply-templates/></font></span>
-</xsl:template>
-
-<xsl:template match='xslthl:xslt'>
-  <span style='background:#AAA'><font color='blue'><xsl:apply-templates/></font></span>
-</xsl:template>
-
-<xsl:template match='xslthl:section'>
-  <span style='background:yellow'><xsl:apply-templates/></span>
-</xsl:template>
--->
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/htmltbl.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/htmltbl.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,217 +1,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:attribute-set name="th.style">
-  <xsl:attribute name="font-weight">bold</xsl:attribute>
-</xsl:attribute-set>
-
-<!-- Outputs an fo:table only, not the caption -->
-<xsl:template match="table|informaltable" mode="htmlTable">
-
-  <xsl:variable name="numcols">
-    <xsl:call-template name="widest-html-row">
-      <xsl:with-param name="rows" select=".//tr"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="prop-columns"
-                select=".//col[contains(@width, '%')] |
-                        .//colgroup[contains(@width, '%')]"/>
-
-  <xsl:variable name="table.width">
-    <xsl:call-template name="table.width"/>
-  </xsl:variable>
-
-  <fo:table xsl:use-attribute-sets="table.table.properties">
-    <xsl:choose>
-      <xsl:when test="$fop.extensions != 0 or
-                      $passivetex.extensions != 0">
-        <xsl:attribute name="table-layout">fixed</xsl:attribute>
-      </xsl:when>
-    </xsl:choose>
-    <xsl:attribute name="width">
-      <xsl:choose>
-        <xsl:when test="@width">
-          <xsl:value-of select="@width"/>
-        </xsl:when>
-        <xsl:when test="$table.width">
-          <xsl:value-of select="$table.width"/>
-        </xsl:when>
-        <xsl:otherwise>100%</xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-    <xsl:call-template name="make-html-table-columns">
-      <xsl:with-param name="count" select="$numcols"/>
-    </xsl:call-template>
-    <xsl:apply-templates select="thead" mode="htmlTable"/>
-    <xsl:apply-templates select="tfoot" mode="htmlTable"/>
-    <xsl:choose>
-      <xsl:when test="tbody">
-        <xsl:apply-templates select="tbody" mode="htmlTable"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <fo:table-body start-indent="0pt" end-indent="0pt">
-          <xsl:apply-templates select="tr" mode="htmlTable"/>
-        </fo:table-body>
-      </xsl:otherwise>
-    </xsl:choose>
-  </fo:table>
-
-</xsl:template>
-
-<xsl:template match="caption" mode="htmlTable">
-  <!-- Handled by formal.object.heading -->
-</xsl:template>
-
-<xsl:template name="widest-html-row">
-  <xsl:param name="rows" select="''"/>
-  <xsl:param name="count" select="0"/>
-  <xsl:choose>
-    <xsl:when test="count($rows) = 0">
-      <xsl:value-of select="$count"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$count &gt; count($rows[1]/*)">
-          <xsl:call-template name="widest-html-row">
-            <xsl:with-param name="rows" select="$rows[position() &gt; 1]"/>
-            <xsl:with-param name="count" select="$count"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="widest-html-row">
-            <xsl:with-param name="rows" select="$rows[position() &gt; 1]"/>
-            <xsl:with-param name="count" select="count($rows[1]/*)"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="make-html-table-columns">
-  <xsl:param name="count" select="0"/>
-  <xsl:param name="number" select="1"/>
-
-  <xsl:choose>
-    <xsl:when test="col|colgroup/col">
-      <xsl:for-each select="col|colgroup/col">
-        <fo:table-column>
-          <xsl:attribute name="column-number">
-            <xsl:number from="table|informaltable" level="any" format="1"/>
-          </xsl:attribute>
-          <xsl:if test="@width">
-            <xsl:attribute name="column-width">
-              <xsl:choose>
-                <xsl:when test="$fop.extensions != 0 and 
-                                contains(@width, '%')">
-                  <xsl:value-of select="concat('proportional-column-width(',
-                                               substring-before(@width, '%'),
-                                               ')')"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:value-of select="@width"/>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:attribute>
-          </xsl:if>
-        </fo:table-column>
-      </xsl:for-each>
-    </xsl:when>
-    <xsl:when test="$fop.extensions != 0">
-      <xsl:if test="$number &lt;= $count">
-        <fo:table-column column-number="{$number}"
-                         column-width="{6.5 div $count}in"/>
-        <xsl:call-template name="make-html-table-columns">
-          <xsl:with-param name="count" select="$count"/>
-          <xsl:with-param name="number" select="$number + 1"/>
-        </xsl:call-template>
-      </xsl:if>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="tbody" mode="htmlTable">
-  <fo:table-body border-bottom-width="0.25pt"
-                 border-bottom-style="solid"
-                 border-bottom-color="black"
-                 start-indent="0pt"
-                 end-indent="0pt">
-    <xsl:apply-templates mode="htmlTable"/>
-  </fo:table-body>
-</xsl:template>
-
-<xsl:template match="td" mode="htmlTable">
-  <xsl:variable name="bgcolor">
-    <xsl:call-template name="pi.dbfo_bgcolor"/>
-  </xsl:variable>
-  <fo:table-cell xsl:use-attribute-sets="table.cell.padding">
-    <xsl:call-template name="table.cell.properties">
-      <xsl:with-param name="bgcolor.pi" select="$bgcolor"/>
-      <xsl:with-param name="rowsep.inherit" select="0"/>
-      <xsl:with-param name="colsep.inherit" select="0"/>
-    </xsl:call-template>
-    <fo:block>
-      <xsl:call-template name="table.cell.block.properties"/>
-      <xsl:apply-templates/>
-    </fo:block>
-  </fo:table-cell>
-</xsl:template>
-
-<xsl:template match="tfoot" mode="htmlTable">
-  <fo:table-footer start-indent="0pt"
-                   end-indent="0pt">
-    <xsl:apply-templates mode="htmlTable"/>
-  </fo:table-footer>
-</xsl:template>
-
-<xsl:template match="th" mode="htmlTable">
-  <xsl:variable name="bgcolor">
-    <xsl:call-template name="pi.dbfo_bgcolor"/>
-  </xsl:variable>
-  <fo:table-cell xsl:use-attribute-sets="th.style table.cell.padding">
-    <xsl:call-template name="table.cell.properties">
-      <xsl:with-param name="bgcolor.pi" select="$bgcolor"/>
-      <xsl:with-param name="rowsep.inherit" select="0"/>
-      <xsl:with-param name="colsep.inherit" select="0"/>
-    </xsl:call-template>
-    <fo:block>
-      <xsl:call-template name="table.cell.block.properties"/>
-      <xsl:apply-templates/>
-    </fo:block>
-  </fo:table-cell>
-</xsl:template>
-
-<xsl:template match="thead" mode="htmlTable">
-  <fo:table-header border-bottom-width="0.25pt"
-                   border-bottom-style="solid"
-                   border-bottom-color="black"
-                   start-indent="0pt"
-                   end-indent="0pt"
-                   font-weight="bold">
-    <xsl:apply-templates mode="htmlTable"/>
-  </fo:table-header>
-</xsl:template>
-
-<xsl:template match="tr" mode="htmlTable">
-  <fo:table-row>
-    <xsl:call-template name="table.row.properties"/>
-    <xsl:apply-templates mode="htmlTable"/>
-  </fo:table-row>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/index.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/index.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,479 +1,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE xsl:stylesheet [
-<!ENTITY primary   'normalize-space(concat(primary/@sortas, primary[not(@sortas)]))'>
-<!ENTITY secondary 'normalize-space(concat(secondary/@sortas, secondary[not(@sortas)]))'>
-<!ENTITY tertiary  'normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas)]))'>
-]>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:rx="http://www.renderx.com/XSL/Extensions"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="index">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
- <xsl:if test="$generate.index != 0">
-  <xsl:choose>
-    <xsl:when test="$make.index.markup != 0">
-      <fo:block>
-        <xsl:call-template name="generate-index-markup">
-          <xsl:with-param name="scope" select="(ancestor::book|/)[last()]"/>
-        </xsl:call-template>
-      </fo:block>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:block id="{$id}">
-        <xsl:call-template name="index.titlepage"/>
-      </fo:block>
-      <xsl:apply-templates/>
-      <xsl:if test="count(indexentry) = 0 and count(indexdiv) = 0">
-        <xsl:call-template name="generate-index">
-          <xsl:with-param name="scope" select="(ancestor::book|/)[last()]"/>
-        </xsl:call-template>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
- </xsl:if>
-</xsl:template>
-
-<xsl:template match="book/index|part/index">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
- <xsl:if test="$generate.index != 0">
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster">
-      <xsl:with-param name="pageclass">
-        <xsl:if test="$make.index.markup != 0">body</xsl:if>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$master-reference}">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language"/>
-    </xsl:attribute>
-    <xsl:attribute name="format">
-      <xsl:call-template name="page.number.format">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="initial-page-number">
-      <xsl:call-template name="initial.page.number">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="force-page-count">
-      <xsl:call-template name="force.page.count">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="set.flow.properties">
-        <xsl:with-param name="element" select="local-name(.)"/>
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-
-      <fo:block id="{$id}">
-        <xsl:call-template name="index.titlepage"/>
-      </fo:block>
-      <xsl:apply-templates/>
-      <xsl:if test="count(indexentry) = 0 and count(indexdiv) = 0">
-
-        <xsl:choose>
-          <xsl:when test="$make.index.markup != 0">
-            <fo:block wrap-option='no-wrap'
-                      white-space-collapse='false'
-                      xsl:use-attribute-sets="monospace.verbatim.properties"
-                      linefeed-treatment="preserve">
-              <xsl:call-template name="generate-index-markup">
-                <xsl:with-param name="scope" select="(ancestor::book|/)[last()]"/>
-              </xsl:call-template>
-            </fo:block>
-          </xsl:when>
-          <xsl:when test="indexentry|indexdiv/indexentry">
-            <xsl:apply-templates/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="generate-index">
-              <xsl:with-param name="scope" select="(ancestor::book|/)[last()]"/>
-            </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:if>
-    </fo:flow>
-  </fo:page-sequence>
- </xsl:if>
-</xsl:template>
-
-<xsl:template match="setindex">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
- <xsl:if test="$generate.index != 0">
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster">
-      <xsl:with-param name="pageclass">
-        <xsl:choose>
-          <xsl:when test="$make.index.markup != 0">body</xsl:when>
-          <xsl:otherwise>index</xsl:otherwise>
-        </xsl:choose>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$master-reference}">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language"/>
-    </xsl:attribute>
-    <xsl:attribute name="format">
-      <xsl:call-template name="page.number.format">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="initial-page-number">
-      <xsl:call-template name="initial.page.number">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="force-page-count">
-      <xsl:call-template name="force.page.count">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="set.flow.properties">
-        <xsl:with-param name="element" select="local-name(.)"/>
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-
-      <fo:block id="{$id}">
-        <xsl:call-template name="setindex.titlepage"/>
-      </fo:block>
-      <xsl:apply-templates/>
-      <xsl:if test="count(indexentry) = 0 and count(indexdiv) = 0">
-
-        <xsl:choose>
-          <xsl:when test="$make.index.markup != 0">
-            <fo:block wrap-option='no-wrap'
-                      white-space-collapse='false'
-                      xsl:use-attribute-sets="monospace.verbatim.properties"
-                      linefeed-treatment="preserve">
-              <xsl:call-template name="generate-index-markup">
-                <xsl:with-param name="scope" select="/"/>
-              </xsl:call-template>
-            </fo:block>
-          </xsl:when>
-          <xsl:when test="indexentry|indexdiv/indexentry">
-            <xsl:apply-templates/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="generate-index">
-              <xsl:with-param name="scope" select="/"/>
-            </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:if>
-    </fo:flow>
-  </fo:page-sequence>
- </xsl:if>
-</xsl:template>
-
-<xsl:template match="index/indexinfo"></xsl:template>
-<xsl:template match="index/info"></xsl:template>
-<xsl:template match="index/title"></xsl:template>
-<xsl:template match="index/subtitle"></xsl:template>
-<xsl:template match="index/titleabbrev"></xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="indexdiv.title">
-  <xsl:param name="title"/>
-  <xsl:param name="titlecontent"/>
-
-  <fo:block xsl:use-attribute-sets="index.div.title.properties">
-    <xsl:choose>
-      <xsl:when test="$title">
-        <xsl:apply-templates select="." mode="object.title.markup">
-          <xsl:with-param name="allow-anchors" select="1"/>
-        </xsl:apply-templates>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:copy-of select="$titlecontent"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="indexdiv">
-  <fo:block>
-    <xsl:call-template name="indexdiv.titlepage"/>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="indexdiv/title"/>
-<xsl:template match="indexdiv/subtitle"/>
-<xsl:template match="indexdiv/titleabbrev"/>
-
-<!-- ==================================================================== -->
-
-<!-- Text used for distiguishing between normal and significant entries -->
-<xsl:variable name="significant.flag">.tnacifingis</xsl:variable>
-
-<xsl:template match="indexterm" name="indexterm">
-  <!-- Temporal workaround for bug in AXF -->
-  <xsl:variable name="wrapper.name">
-    <xsl:choose>
-      <xsl:when test="$axf.extensions != 0">
-        <xsl:call-template name="inline.or.block"/>
-      </xsl:when>
-      <xsl:otherwise>fo:wrapper</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:element name="{$wrapper.name}">
-    <xsl:attribute name="id">
-      <xsl:call-template name="object.id"/>
-    </xsl:attribute>
-    <xsl:choose>
-      <xsl:when test="$xep.extensions != 0">
-        <xsl:attribute name="rx:key">
-          <xsl:value-of select="&primary;"/>
-          <xsl:if test="@significance='preferred'"><xsl:value-of select="$significant.flag"/></xsl:if>
-          <xsl:if test="secondary">
-            <xsl:text>, </xsl:text>
-            <xsl:value-of select="&secondary;"/>
-          </xsl:if>
-          <xsl:if test="tertiary">
-            <xsl:text>, </xsl:text>
-            <xsl:value-of select="&tertiary;"/>
-          </xsl:if>
-        </xsl:attribute>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:comment>
-          <xsl:call-template name="comment-escape-string">
-            <xsl:with-param name="string">
-              <xsl:value-of select="primary"/>
-              <xsl:if test="secondary">
-                <xsl:text>, </xsl:text>
-                <xsl:value-of select="secondary"/>
-              </xsl:if>
-              <xsl:if test="tertiary">
-                <xsl:text>, </xsl:text>
-                <xsl:value-of select="tertiary"/>
-              </xsl:if>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:comment>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:element>
-</xsl:template>
-
-<xsl:template match="indexterm[@class='startofrange']">
-  <xsl:choose>
-    <xsl:when test="$xep.extensions != 0">
-      <rx:begin-index-range>
-        <xsl:call-template name="anchor"/>
-        <xsl:attribute name="rx:key">
-          <xsl:value-of select="&primary;"/>
-          <xsl:if test="@significance='preferred'"><xsl:value-of select="$significant.flag"/></xsl:if>
-          <xsl:if test="secondary">
-            <xsl:text>, </xsl:text>
-            <xsl:value-of select="&secondary;"/>
-          </xsl:if>
-          <xsl:if test="tertiary">
-            <xsl:text>, </xsl:text>
-            <xsl:value-of select="&tertiary;"/>
-          </xsl:if>
-        </xsl:attribute>
-      </rx:begin-index-range>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="indexterm"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="indexterm[@class='endofrange']">
-  <xsl:choose>
-    <xsl:when test="$xep.extensions != 0">
-      <rx:end-index-range>
-        <xsl:attribute name="ref-id">
-          <xsl:value-of select="@startref"/>
-        </xsl:attribute>
-      </rx:end-index-range>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="indexterm"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="indexentry">
-  <fo:block>
-    <!-- don't process 'seeie's from here -->
-    <xsl:apply-templates select="primaryie|secondaryie|tertiaryie|seealsoie"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="primaryie">
-  <fo:block>
-    <xsl:apply-templates/>
-    <xsl:if test="following-sibling::seeie">
-      <xsl:text> (</xsl:text>
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'see'"/>
-      </xsl:call-template>
-      <xsl:text> </xsl:text>
-      <xsl:apply-templates select="following-sibling::seeie"/>
-      <xsl:text>)</xsl:text>
-    </xsl:if>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="secondaryie">
-  <fo:block start-indent="1pc">
-    <xsl:apply-templates/>
-    <xsl:if test="following-sibling::seeie">
-      <xsl:text> (</xsl:text>
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'see'"/>
-      </xsl:call-template>
-      <xsl:text> </xsl:text>
-      <xsl:apply-templates select="following-sibling::seeie"/>
-      <xsl:text>)</xsl:text>
-    </xsl:if>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="tertiaryie">
-  <fo:block start-indent="2pc">
-    <xsl:apply-templates/>
-    <xsl:if test="following-sibling::seeie">
-      <xsl:text> (</xsl:text>
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'see'"/>
-      </xsl:call-template>
-      <xsl:text> </xsl:text>
-      <xsl:apply-templates select="following-sibling::seeie"/>
-      <xsl:text>)</xsl:text>
-    </xsl:if>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="seeie">
-  <fo:inline>
-    <xsl:apply-templates/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="seealsoie">
-  <fo:block>
-    <xsl:attribute name="start-indent">
-      <xsl:choose>
-        <xsl:when test="preceding-sibling::tertiaryie">3pc</xsl:when>
-        <xsl:when test="preceding-sibling::secondaryie">2pc</xsl:when>
-        <xsl:otherwise>1pc</xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-    <xsl:text>(</xsl:text>
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="'seealso'"/>
-    </xsl:call-template>
-    <xsl:text> </xsl:text>
-    <xsl:apply-templates/>
-    <xsl:text>)</xsl:text>
-  </fo:block>
-</xsl:template>
-
-<!-- Determines if an object should be inserted as an fo:inline
-     or an fo:block.  Used for indexterms -->
-<xsl:template name="inline.or.block">
-  <xsl:param name="parentnode" select=".."/>
-
-  <xsl:variable name="parent" select="local-name($parentnode)"/>
-
-  <xsl:variable name="block.parents" select="'|answer|appendix|appendixinfo|article|articleinfo|bibliodiv|bibliography|bibliographyinfo|blockinfo|blockquote|bookinfo|callout|caution|chapter|chapterinfo|dedication|example|figure|formalpara|funcsynopsisinfo|glossary|glossaryinfo|glossdef|glossdiv|glossentry|highlights|important|index|indexinfo|info|informalexample|informalfigure|informaltable|itemizedlist|legalnotice|listitem|msgexplan|msgtext|note|objectinfo|orderedlist|partinfo|partintro|preface|prefaceinfo|procedure|qandadiv|qandaset|question|refentry|refentryinfo|referenceinfo|refmeta|refmiscinfo|refsect1|refsect1info|refsect2|refsect2info|refsect3|refsect3info|refsection|refsectioninfo|refsynopsisdiv|refsynopsisdivinfo|revdescription|screeninfo|sect1|sect1info|sect2|sect2info|sect3|sect3info|sect4|sect4info|sect5|sect5info|section|sectioninfo|setindex|setindexinfo|setinfo|sidebar|sidebarinfo|simplesect|step|table|task|taskprerequisites|taskrelated|tasksummary|tip|variablelist|warning|'"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($parent, $block.parents)">fo:block</xsl:when>
-    <xsl:otherwise>fo:inline</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/info.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/info.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,34 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- These templates define the "default behavior" for info
-     elements.  Even if you don't process the *info wrappers,
-     some of these elements are needed because the elements are
-     processed from named templates that are called with modes.
-     Since modes aren't sticky, these rules apply. 
-     (TODO: clarify this comment) -->
-
-<!-- ==================================================================== -->
-<!-- called from named templates in a given mode -->
-
-<xsl:template match="corpauthor">
-  <fo:inline>
-    <xsl:apply-templates/>
-  </fo:inline>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/inline.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/inline.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,1234 +1,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE xsl:stylesheet [
-  <!ENTITY comment.block.parents "parent::answer|parent::appendix|parent::article|parent::bibliodiv|
-                                  parent::bibliography|parent::blockquote|parent::caution|parent::chapter|
-                                  parent::glossary|parent::glossdiv|parent::important|parent::index|
-                                  parent::indexdiv|parent::listitem|parent::note|parent::orderedlist|
-                                  parent::partintro|parent::preface|parent::procedure|parent::qandadiv|
-                                  parent::qandaset|parent::question|parent::refentry|parent::refnamediv|
-                                  parent::refsect1|parent::refsect2|parent::refsect3|parent::refsection|
-                                  parent::refsynopsisdiv|parent::sect1|parent::sect2|parent::sect3|parent::sect4|
-                                  parent::sect5|parent::section|parent::setindex|parent::sidebar|
-                                  parent::simplesect|parent::taskprerequisites|parent::taskrelated|
-                                  parent::tasksummary|parent::warning">
-]>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:xlink='http://www.w3.org/1999/xlink'
-                exclude-result-prefixes="xlink"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:template name="simple.xlink">
-  <xsl:param name="node" select="."/>
-  <xsl:param name="content">
-    <xsl:apply-templates/>
-  </xsl:param>
-  <xsl:param name="linkend" select="$node/@linkend"/>
-  <xsl:param name="xhref" select="$node/@xlink:href"/>
-
-  <xsl:choose>
-    <xsl:when test="$xhref
-                    and (not($node/@xlink:type) or 
-                         $node/@xlink:type='simple')">
-
-      <!-- Is it a local idref? -->
-      <xsl:variable name="is.idref">
-        <xsl:choose>
-          <!-- if the href starts with # and does not contain an "(" -->
-          <!-- or if the href starts with #xpointer(id(, it's just an ID -->
-          <xsl:when test="starts-with($xhref,'#')
-                          and (not(contains($xhref,'&#40;'))
-                          or starts-with($xhref,
-                                     '#xpointer&#40;id&#40;'))">1</xsl:when>
-          <xsl:otherwise>0</xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <!-- Is it an olink ? -->
-      <xsl:variable name="is.olink">
-        <xsl:choose>
-	  <!-- If xlink:role="http://docbook.org/xlink/role/olink" -->
-          <!-- and if the href contains # -->
-          <xsl:when test="contains($xhref,'#') and
-	       @xlink:role = $xolink.role">1</xsl:when>
-          <xsl:otherwise>0</xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="$is.idref = 1">
-
-          <xsl:variable name="idref">
-            <xsl:call-template name="xpointer.idref">
-              <xsl:with-param name="xpointer" select="$xhref"/>
-            </xsl:call-template>
-          </xsl:variable>
-
-          <xsl:variable name="targets" select="key('id',$idref)"/>
-          <xsl:variable name="target" select="$targets[1]"/>
-
-          <xsl:call-template name="check.id.unique">
-            <xsl:with-param name="linkend" select="$idref"/>
-          </xsl:call-template>
-
-          <xsl:choose>
-            <xsl:when test="count($target) = 0">
-              <xsl:message>
-                <xsl:text>XLink to nonexistent id: </xsl:text>
-                <xsl:value-of select="$idref"/>
-              </xsl:message>
-              <xsl:copy-of select="$content"/>
-            </xsl:when>
-
-            <xsl:otherwise>
-              <fo:basic-link internal-destination="{$idref}">
-                <xsl:copy-of select="$content"/>
-              </fo:basic-link>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-
-        <xsl:when test="$is.olink = 1">
-	  <xsl:call-template name="olink">
-	    <xsl:with-param name="content" select="$content"/>
-	  </xsl:call-template>
-        </xsl:when>
-
-        <!-- otherwise it's a URI -->
-        <xsl:otherwise>
-          <fo:basic-link external-destination="url({$xhref})">
-            <xsl:copy-of select="$content"/>
-          </fo:basic-link>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:when test="$linkend">
-      <xsl:variable name="targets" select="key('id',$linkend)"/>
-      <xsl:variable name="target" select="$targets[1]"/>
-
-      <xsl:call-template name="check.id.unique">
-        <xsl:with-param name="linkend" select="$linkend"/>
-      </xsl:call-template>
-
-      <xsl:choose>
-        <xsl:when test="count($target) = 0">
-          <xsl:message>
-            <xsl:text>XLink to nonexistent id: </xsl:text>
-            <xsl:value-of select="$linkend"/>
-          </xsl:message>
-          <xsl:copy-of select="$content"/>
-        </xsl:when>
-
-        <xsl:otherwise>
-          <fo:basic-link internal-destination="{$linkend}">
-            <xsl:copy-of select="$content"/>
-          </fo:basic-link>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:copy-of select="$content"/>
-    </xsl:otherwise>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="inline.charseq">
-  <xsl:param name="content">
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-
-  <xsl:choose>
-    <xsl:when test="@dir">
-      <fo:inline>
-        <xsl:attribute name="direction">
-          <xsl:choose>
-            <xsl:when test="@dir = 'ltr' or @dir = 'lro'">ltr</xsl:when>
-            <xsl:otherwise>rtl</xsl:otherwise>
-          </xsl:choose>
-        </xsl:attribute>
-        <xsl:copy-of select="$content"/>
-      </fo:inline>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$content"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="inline.monoseq">
-  <xsl:param name="content">
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-
-  <fo:inline xsl:use-attribute-sets="monospace.properties">
-    <xsl:if test="@dir">
-      <xsl:attribute name="direction">
-        <xsl:choose>
-          <xsl:when test="@dir = 'ltr' or @dir = 'lro'">ltr</xsl:when>
-          <xsl:otherwise>rtl</xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:copy-of select="$content"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template name="inline.boldseq">
-  <xsl:param name="content">
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-
-  <fo:inline font-weight="bold">
-    <xsl:if test="@dir">
-      <xsl:attribute name="direction">
-        <xsl:choose>
-          <xsl:when test="@dir = 'ltr' or @dir = 'lro'">ltr</xsl:when>
-          <xsl:otherwise>rtl</xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:copy-of select="$content"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template name="inline.italicseq">
-  <xsl:param name="content">
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-
-  <fo:inline font-style="italic">
-    <xsl:call-template name="anchor"/>
-    <xsl:if test="@dir">
-      <xsl:attribute name="direction">
-        <xsl:choose>
-          <xsl:when test="@dir = 'ltr' or @dir = 'lro'">ltr</xsl:when>
-          <xsl:otherwise>rtl</xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:copy-of select="$content"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template name="inline.boldmonoseq">
-  <xsl:param name="content">
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-
-  <fo:inline font-weight="bold" xsl:use-attribute-sets="monospace.properties">
-    <xsl:call-template name="anchor"/>
-    <xsl:if test="@dir">
-      <xsl:attribute name="direction">
-        <xsl:choose>
-          <xsl:when test="@dir = 'ltr' or @dir = 'lro'">ltr</xsl:when>
-          <xsl:otherwise>rtl</xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:copy-of select="$content"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template name="inline.italicmonoseq">
-  <xsl:param name="content">
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-
-  <fo:inline font-style="italic" xsl:use-attribute-sets="monospace.properties">
-    <xsl:call-template name="anchor"/>
-    <xsl:if test="@dir">
-      <xsl:attribute name="direction">
-        <xsl:choose>
-          <xsl:when test="@dir = 'ltr' or @dir = 'lro'">ltr</xsl:when>
-          <xsl:otherwise>rtl</xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:copy-of select="$content"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template name="inline.superscriptseq">
-  <xsl:param name="content">
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-
-  <fo:inline xsl:use-attribute-sets="superscript.properties">
-    <xsl:call-template name="anchor"/>
-    <xsl:if test="@dir">
-      <xsl:attribute name="direction">
-        <xsl:choose>
-          <xsl:when test="@dir = 'ltr' or @dir = 'lro'">ltr</xsl:when>
-          <xsl:otherwise>rtl</xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:choose>
-      <xsl:when test="$fop.extensions != 0">
-        <xsl:attribute name="vertical-align">super</xsl:attribute>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute name="baseline-shift">super</xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:copy-of select="$content"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template name="inline.subscriptseq">
-  <xsl:param name="content">
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-
-  <fo:inline xsl:use-attribute-sets="subscript.properties">
-    <xsl:call-template name="anchor"/>
-    <xsl:if test="@dir">
-      <xsl:attribute name="direction">
-        <xsl:choose>
-          <xsl:when test="@dir = 'ltr' or @dir = 'lro'">ltr</xsl:when>
-          <xsl:otherwise>rtl</xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:choose>
-      <xsl:when test="$fop.extensions != 0">
-        <xsl:attribute name="vertical-align">sub</xsl:attribute>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute name="baseline-shift">sub</xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:copy-of select="$content"/>
-  </fo:inline>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<!-- some special cases -->
-
-<xsl:template match="author">
-  <xsl:call-template name="simple.xlink">
-    <xsl:with-param name="content">
-      <xsl:call-template name="person.name"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="editor">
-  <xsl:call-template name="simple.xlink">
-    <xsl:with-param name="content">
-      <xsl:call-template name="person.name"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="othercredit">
-  <xsl:call-template name="simple.xlink">
-    <xsl:with-param name="content">
-      <xsl:call-template name="person.name"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="authorinitials">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="accel">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="action">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="application">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="classname">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="exceptionname">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="interfacename">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="methodname">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="command">
-  <xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="computeroutput">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="constant">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="database">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="date">
-  <!-- should this support locale-specific formatting? how? -->
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="errorcode">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="errorname">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="errortype">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="errortext">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="envar">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="filename">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="function">
-  <xsl:choose>
-    <xsl:when test="$function.parens != '0'
-                    and (parameter or function or replaceable)">
-      <xsl:variable name="nodes" select="text()|*"/>
-      <xsl:call-template name="inline.monoseq">
-        <xsl:with-param name="content">
-          <xsl:call-template name="simple.xlink">
-            <xsl:with-param name="content">
-              <xsl:apply-templates select="$nodes[1]"/>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:text>(</xsl:text>
-      <xsl:apply-templates select="$nodes[position()>1]"/>
-      <xsl:text>)</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-     <xsl:call-template name="inline.monoseq"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="function/parameter" priority="2">
-  <xsl:call-template name="inline.italicmonoseq"/>
-  <xsl:if test="following-sibling::*">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="function/replaceable" priority="2">
-  <xsl:call-template name="inline.italicmonoseq"/>
-  <xsl:if test="following-sibling::*">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="guibutton">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="guiicon">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="guilabel">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="guimenu">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="guimenuitem">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="guisubmenu">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="hardware">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="interface">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="interfacedefinition">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="keycap">
-  <xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="keycode">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="keysym">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="literal">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="code">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="medialabel">
-  <xsl:call-template name="inline.italicseq"/>
-</xsl:template>
-
-<xsl:template match="shortcut">
-  <xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="mousebutton">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="option">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="package">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="parameter">
-  <xsl:call-template name="inline.italicmonoseq"/>
-</xsl:template>
-
-<xsl:template match="property">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="prompt">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="replaceable">
-  <xsl:call-template name="inline.italicmonoseq"/>
-</xsl:template>
-
-<xsl:template match="returnvalue">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="structfield">
-  <xsl:call-template name="inline.italicmonoseq"/>
-</xsl:template>
-
-<xsl:template match="structname">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="symbol">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="systemitem">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="token">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="type">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="userinput">
-  <xsl:call-template name="inline.boldmonoseq"/>
-</xsl:template>
-
-<xsl:template match="abbrev">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="acronym">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="citerefentry">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="citetitle">
-  <xsl:choose>
-    <xsl:when test="@pubwork = 'article'">
-      <xsl:call-template name="gentext.startquote"/>
-      <xsl:call-template name="inline.charseq"/>
-      <xsl:call-template name="gentext.endquote"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="inline.italicseq"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="emphasis">
-  <xsl:variable name="depth">
-    <xsl:call-template name="dot.count">
-      <xsl:with-param name="string">
-        <xsl:number level="multiple"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="@role='bold' or @role='strong'">
-      <xsl:call-template name="inline.boldseq"/>
-    </xsl:when>
-    <xsl:when test="@role='underline'">
-      <fo:inline text-decoration="underline">
-        <xsl:call-template name="inline.charseq"/>
-      </fo:inline>
-    </xsl:when>
-    <xsl:when test="@role='strikethrough'">
-      <fo:inline text-decoration="line-through">
-        <xsl:call-template name="inline.charseq"/>
-      </fo:inline>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$depth mod 2 = 1">
-          <fo:inline font-style="normal">
-            <xsl:apply-templates/>
-          </fo:inline>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="inline.italicseq"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="foreignphrase">
-  <xsl:call-template name="inline.italicseq"/>
-</xsl:template>
-
-<xsl:template match="markup">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="phrase">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="quote">
-  <xsl:variable name="depth">
-    <xsl:call-template name="dot.count">
-      <xsl:with-param name="string"><xsl:number level="multiple"/></xsl:with-param>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:choose>
-    <xsl:when test="$depth mod 2 = 0">
-      <xsl:call-template name="gentext.startquote"/>
-      <xsl:call-template name="inline.charseq"/>
-      <xsl:call-template name="gentext.endquote"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext.nestedstartquote"/>
-      <xsl:call-template name="inline.charseq"/>
-      <xsl:call-template name="gentext.nestedendquote"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="varname">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="wordasword">
-  <xsl:call-template name="inline.italicseq"/>
-</xsl:template>
-
-<xsl:template match="lineannotation">
-  <fo:inline font-style="italic">
-    <xsl:call-template name="inline.charseq"/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="superscript">
-  <xsl:call-template name="inline.superscriptseq"/>
-</xsl:template>
-
-<xsl:template match="subscript">
-  <xsl:call-template name="inline.subscriptseq"/>
-</xsl:template>
-
-<xsl:template match="trademark">
-  <xsl:call-template name="inline.charseq"/>
-  <xsl:choose>
-    <xsl:when test="@class = 'copyright'
-                    or @class = 'registered'">
-      <xsl:call-template name="dingbat">
-        <xsl:with-param name="dingbat" select="@class"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="@class = 'service'">
-      <xsl:call-template name="inline.superscriptseq">
-        <xsl:with-param name="content" select="'SM'"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="dingbat">
-        <xsl:with-param name="dingbat" select="'trademark'"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="firstterm">
-  <xsl:call-template name="glossterm">
-    <xsl:with-param name="firstterm" select="1"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="glossterm" name="glossterm">
-  <xsl:param name="firstterm" select="0"/>
-
-  <xsl:choose>
-    <xsl:when test="($firstterm.only.link = 0 or $firstterm = 1) and @linkend">
-      <xsl:variable name="targets" select="key('id',@linkend)"/>
-      <xsl:variable name="target" select="$targets[1]"/>
-
-      <xsl:choose>
-        <xsl:when test="$target">
-          <fo:basic-link internal-destination="{@linkend}" 
-                         xsl:use-attribute-sets="xref.properties">
-            <xsl:call-template name="inline.italicseq"/>
-          </fo:basic-link>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="inline.italicseq"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:when test="not(@linkend)
-                    and ($firstterm.only.link = 0 or $firstterm = 1)
-                    and ($glossterm.auto.link != 0)
-                    and $glossary.collection != ''">
-      <xsl:variable name="term">
-        <xsl:choose>
-          <xsl:when test="@baseform"><xsl:value-of select="@baseform"/></xsl:when>
-          <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-      <xsl:variable name="cterm"
-           select="(document($glossary.collection,.)//glossentry[glossterm=$term])[1]"/>
-
-      <xsl:choose>
-        <xsl:when test="not($cterm)">
-          <xsl:message>
-            <xsl:text>There's no entry for </xsl:text>
-            <xsl:value-of select="$term"/>
-            <xsl:text> in </xsl:text>
-            <xsl:value-of select="$glossary.collection"/>
-          </xsl:message>
-          <xsl:call-template name="inline.italicseq"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:variable name="id">
-            <xsl:call-template name="object.id">
-              <xsl:with-param name="object" select="$cterm"/>
-            </xsl:call-template>
-          </xsl:variable>
-          <fo:basic-link internal-destination="{$id}"
-                         xsl:use-attribute-sets="xref.properties">
-            <xsl:call-template name="inline.italicseq"/>
-          </fo:basic-link>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:when test="not(@linkend)
-                    and ($firstterm.only.link = 0 or $firstterm = 1)
-                    and $glossterm.auto.link != 0">
-      <xsl:variable name="term">
-        <xsl:choose>
-          <xsl:when test="@baseform">
-            <xsl:value-of select="@baseform"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="."/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="targets"
-                    select="//glossentry[glossterm=$term or glossterm/@baseform=$term]"/>
-
-      <xsl:variable name="target" select="$targets[1]"/>
-
-      <xsl:choose>
-        <xsl:when test="count($targets)=0">
-          <xsl:message>
-            <xsl:text>Error: no glossentry for glossterm: </xsl:text>
-            <xsl:value-of select="."/>
-            <xsl:text>.</xsl:text>
-          </xsl:message>
-          <xsl:call-template name="inline.italicseq"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:variable name="termid">
-            <xsl:call-template name="object.id">
-              <xsl:with-param name="object" select="$target"/>
-            </xsl:call-template>
-          </xsl:variable>
-
-          <fo:basic-link internal-destination="{$termid}"
-                         xsl:use-attribute-sets="xref.properties">
-            <xsl:call-template name="inline.charseq"/>
-          </fo:basic-link>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="inline.italicseq"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="termdef">
-  <fo:inline>
-    <xsl:call-template name="gentext.template">
-      <xsl:with-param name="context" select="'termdef'"/>
-      <xsl:with-param name="name" select="'prefix'"/>
-    </xsl:call-template>
-    <xsl:apply-templates/>
-    <xsl:call-template name="gentext.template">
-      <xsl:with-param name="context" select="'termdef'"/>
-      <xsl:with-param name="name" select="'suffix'"/>
-    </xsl:call-template>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="sgmltag|tag">
-  <xsl:variable name="class">
-    <xsl:choose>
-      <xsl:when test="@class">
-        <xsl:value-of select="@class"/>
-      </xsl:when>
-      <xsl:otherwise>element</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$class='attribute'">
-      <xsl:call-template name="inline.monoseq"/>
-    </xsl:when>
-    <xsl:when test="$class='attvalue'">
-      <xsl:call-template name="inline.monoseq"/>
-    </xsl:when>
-    <xsl:when test="$class='element'">
-      <xsl:call-template name="inline.monoseq"/>
-    </xsl:when>
-    <xsl:when test="$class='endtag'">
-      <xsl:call-template name="inline.monoseq">
-        <xsl:with-param name="content">
-          <xsl:text>&lt;/</xsl:text>
-          <xsl:apply-templates/>
-          <xsl:text>&gt;</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$class='genentity'">
-      <xsl:call-template name="inline.monoseq">
-        <xsl:with-param name="content">
-          <xsl:text>&amp;</xsl:text>
-          <xsl:apply-templates/>
-          <xsl:text>;</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$class='numcharref'">
-      <xsl:call-template name="inline.monoseq">
-        <xsl:with-param name="content">
-          <xsl:text>&amp;#</xsl:text>
-          <xsl:apply-templates/>
-          <xsl:text>;</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$class='paramentity'">
-      <xsl:call-template name="inline.monoseq">
-        <xsl:with-param name="content">
-          <xsl:text>%</xsl:text>
-          <xsl:apply-templates/>
-          <xsl:text>;</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$class='pi'">
-      <xsl:call-template name="inline.monoseq">
-        <xsl:with-param name="content">
-          <xsl:text>&lt;?</xsl:text>
-          <xsl:apply-templates/>
-          <xsl:text>&gt;</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$class='xmlpi'">
-      <xsl:call-template name="inline.monoseq">
-        <xsl:with-param name="content">
-          <xsl:text>&lt;?</xsl:text>
-          <xsl:apply-templates/>
-          <xsl:text>?&gt;</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$class='starttag'">
-      <xsl:call-template name="inline.monoseq">
-        <xsl:with-param name="content">
-          <xsl:text>&lt;</xsl:text>
-          <xsl:apply-templates/>
-          <xsl:text>&gt;</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$class='emptytag'">
-      <xsl:call-template name="inline.monoseq">
-        <xsl:with-param name="content">
-          <xsl:text>&lt;</xsl:text>
-          <xsl:apply-templates/>
-          <xsl:text>/&gt;</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$class='sgmlcomment' or $class='comment'">
-      <xsl:call-template name="inline.monoseq">
-        <xsl:with-param name="content">
-          <xsl:text>&lt;!--</xsl:text>
-          <xsl:apply-templates/>
-          <xsl:text>--&gt;</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="inline.charseq"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="email">
-  <xsl:call-template name="inline.monoseq">
-    <xsl:with-param name="content">
-      <fo:inline keep-together.within-line="always" hyphenate="false">
-        <xsl:if test="not($email.delimiters.enabled = 0)">
-          <xsl:text>&lt;</xsl:text>
-        </xsl:if>
-        <xsl:apply-templates/>
-        <xsl:if test="not($email.delimiters.enabled = 0)">
-          <xsl:text>&gt;</xsl:text>
-        </xsl:if>
-      </fo:inline>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="keycombo">
-  <xsl:variable name="action" select="@action"/>
-  <xsl:variable name="joinchar">
-    <xsl:choose>
-      <xsl:when test="$action='seq'"><xsl:text> </xsl:text></xsl:when>
-      <xsl:when test="$action='simul'">+</xsl:when>
-      <xsl:when test="$action='press'">-</xsl:when>
-      <xsl:when test="$action='click'">-</xsl:when>
-      <xsl:when test="$action='double-click'">-</xsl:when>
-      <xsl:when test="$action='other'"></xsl:when>
-      <xsl:otherwise>+</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:for-each select="*">
-    <xsl:if test="position()>1"><xsl:value-of select="$joinchar"/></xsl:if>
-    <xsl:apply-templates select="."/>
-  </xsl:for-each>
-</xsl:template>
-
-<xsl:template match="uri">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="menuchoice">
-  <xsl:variable name="shortcut" select="./shortcut"/>
-  <xsl:call-template name="process.menuchoice"/>
-  <xsl:if test="$shortcut">
-    <xsl:text> (</xsl:text>
-    <xsl:apply-templates select="$shortcut"/>
-    <xsl:text>)</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="process.menuchoice">
-  <xsl:param name="nodelist" select="guibutton|guiicon|guilabel|guimenu|guimenuitem|guisubmenu|interface"/><!-- not(shortcut) -->
-  <xsl:param name="count" select="1"/>
-
-  <xsl:variable name="mm.separator">
-    <xsl:choose>
-      <xsl:when test="($fop.extensions != 0 or $fop1.extensions != 0 ) and
-                contains($menuchoice.menu.separator, '&#x2192;')">
-        <fo:inline font-family="Symbol">
-          <xsl:copy-of select="$menuchoice.menu.separator"/>
-        </fo:inline>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:copy-of select="$menuchoice.menu.separator"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$count>count($nodelist)"></xsl:when>
-    <xsl:when test="$count=1">
-      <xsl:apply-templates select="$nodelist[$count=position()]"/>
-      <xsl:call-template name="process.menuchoice">
-        <xsl:with-param name="nodelist" select="$nodelist"/>
-        <xsl:with-param name="count" select="$count+1"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="node" select="$nodelist[$count=position()]"/>
-      <xsl:choose>
-        <xsl:when test="local-name($node)='guimenuitem'
-                        or local-name($node)='guisubmenu'">
-          <xsl:copy-of select="$mm.separator"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:copy-of select="$menuchoice.separator"/>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="$node"/>
-      <xsl:call-template name="process.menuchoice">
-        <xsl:with-param name="nodelist" select="$nodelist"/>
-        <xsl:with-param name="count" select="$count+1"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="optional">
-  <xsl:value-of select="$arg.choice.opt.open.str"/>
-  <xsl:call-template name="inline.charseq"/>
-  <xsl:value-of select="$arg.choice.opt.close.str"/>
-</xsl:template>
-
-<xsl:template match="citation">
-  <!-- todo: integrate with bibliography collection -->
-  <xsl:variable name="targets" select="(//biblioentry | //bibliomixed)[abbrev = string(current())]"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-
-  <xsl:choose>
-    <!-- try automatic linking based on match to abbrev -->
-    <xsl:when test="$target and not(xref) and not(link)">
-
-      <xsl:text>[</xsl:text>
-      <fo:basic-link>
-        <xsl:attribute name="internal-destination">
-          <xsl:call-template name="object.id">
-            <xsl:with-param name="object" select="$target"/>
-          </xsl:call-template>
-        </xsl:attribute>
-
-	<xsl:choose>
-	  <xsl:when test="$bibliography.numbered != 0">
-	    <xsl:apply-templates select="$target" mode="citation"/>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <xsl:call-template name="inline.charseq"/>
-	  </xsl:otherwise>
-	</xsl:choose>
-     
-      </fo:basic-link>
-      <xsl:text>]</xsl:text>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:text>[</xsl:text>
-      <xsl:call-template name="inline.charseq"/>
-      <xsl:text>]</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="biblioentry|bibliomixed" mode="citation">
-  <xsl:number from="bibliography" count="biblioentry|bibliomixed"
-	      level="any" format="1"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="comment[&comment.block.parents;]|remark[&comment.block.parents;]">
-  <xsl:if test="$show.comments != 0">
-    <fo:block font-style="italic">
-      <xsl:call-template name="inline.charseq"/>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="comment|remark">
-  <xsl:if test="$show.comments != 0">
-    <fo:inline font-style="italic">
-      <xsl:call-template name="inline.charseq"/>
-    </fo:inline>
-  </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="productname">
-  <xsl:call-template name="inline.charseq"/>
-  <xsl:if test="@class">
-    <xsl:call-template name="dingbat">
-      <xsl:with-param name="dingbat" select="@class"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="productnumber">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="pob|street|city|state|postcode|country|otheraddr">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="phone|fax">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<!-- in Addresses, for example -->
-<xsl:template match="honorific|firstname|surname|lineage|othername">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="person">
-  <xsl:apply-templates select="personname"/>
-</xsl:template>
-
-<xsl:template match="personname">
-  <xsl:call-template name="simple.xlink">
-    <xsl:with-param name="content">
-      <xsl:call-template name="person.name"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="jobtitle">
-  <xsl:call-template name="simple.xlink">
-    <xsl:with-param name="content">
-      <xsl:apply-templates/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="org">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="orgname">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="orgdiv">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="affiliation">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="beginpage">
-  <!-- does nothing; this *is not* markup to force a page break. -->
-</xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/keywords.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/keywords.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:template match="keywordset"></xsl:template>
-<xsl:template match="subjectset"></xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/lists.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/lists.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,1287 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="itemizedlist">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="pi-label-width">
-    <xsl:call-template name="pi.dbfo_label-width"/>
-  </xsl:variable>
-
-  <xsl:variable name="label-width">
-    <xsl:choose>
-      <xsl:when test="$pi-label-width = ''">
-	<xsl:value-of select="$itemizedlist.label.width"/>
-      </xsl:when>
-      <xsl:otherwise>
-	<xsl:value-of select="$pi-label-width"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:if test="title">
-    <xsl:apply-templates select="title" mode="list.title.mode"/>
-  </xsl:if>
-
-  <!-- Preserve order of PIs and comments -->
-  <xsl:apply-templates 
-      select="*[not(self::listitem
-                or self::title
-                or self::titleabbrev)]
-              |comment()[not(preceding-sibling::listitem)]
-              |processing-instruction()[not(preceding-sibling::listitem)]"/>
-
-  <xsl:variable name="content">
-    <xsl:apply-templates 
-          select="listitem
-                  |comment()[preceding-sibling::listitem]
-                  |processing-instruction()[preceding-sibling::listitem]"/>
-  </xsl:variable>
-
-  <!-- nested lists don't add extra list-block spacing -->
-  <xsl:choose>
-    <xsl:when test="ancestor::listitem">
-      <fo:list-block id="{$id}" xsl:use-attribute-sets="itemizedlist.properties">
-	<xsl:attribute name="provisional-distance-between-starts">
-	  <xsl:value-of select="$label-width"/>
-	</xsl:attribute>
-        <xsl:copy-of select="$content"/>
-      </fo:list-block>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:list-block id="{$id}" xsl:use-attribute-sets="list.block.spacing itemizedlist.properties">
-	<xsl:attribute name="provisional-distance-between-starts">
-	  <xsl:value-of select="$label-width"/>
-	</xsl:attribute>
-	<xsl:copy-of select="$content"/>
-      </fo:list-block>
-    </xsl:otherwise>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template match="itemizedlist/title|orderedlist/title">
-  <!--nop-->
-</xsl:template>
-
-<xsl:template match="variablelist/title" mode="vl.as.list">
-  <!--nop-->
-</xsl:template>
-
-<xsl:template match="variablelist/title" mode="vl.as.blocks">
-  <!--nop-->
-</xsl:template>
-
-<xsl:template match="itemizedlist/titleabbrev|orderedlist/titleabbrev">
-  <!--nop-->
-</xsl:template>
-
-<xsl:template match="procedure/titleabbrev">
-  <!--nop-->
-</xsl:template>
-
-<xsl:template match="variablelist/titleabbrev" mode="vl.as.list">
-  <!--nop-->
-</xsl:template>
-
-<xsl:template match="variablelist/titleabbrev" mode="vl.as.blocks">
-  <!--nop-->
-</xsl:template>
-
-<xsl:template match="itemizedlist/listitem">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-
-  <xsl:variable name="item.contents">
-    <fo:list-item-label end-indent="label-end()" xsl:use-attribute-sets="itemizedlist.label.properties">
-      <fo:block>
-        <xsl:call-template name="itemizedlist.label.markup">
-          <xsl:with-param name="itemsymbol">
-            <xsl:call-template name="list.itemsymbol">
-              <xsl:with-param name="node" select="parent::itemizedlist"/>
-            </xsl:call-template>
-          </xsl:with-param>
-        </xsl:call-template>
-      </fo:block>
-    </fo:list-item-label>
-    <fo:list-item-body start-indent="body-start()">
-      <xsl:choose>
-        <!-- * work around broken passivetex list-item-body rendering -->
-        <xsl:when test="$passivetex.extensions = '1'">
-          <xsl:apply-templates/>
-        </xsl:when>
-        <xsl:otherwise>
-          <fo:block>
-            <xsl:apply-templates/>
-          </fo:block>
-        </xsl:otherwise>
-      </xsl:choose>
-    </fo:list-item-body>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="parent::*/@spacing = 'compact'">
-      <fo:list-item id="{$id}" xsl:use-attribute-sets="compact.list.item.spacing">
-        <xsl:copy-of select="$item.contents"/>
-      </fo:list-item>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:list-item id="{$id}" xsl:use-attribute-sets="list.item.spacing">
-        <xsl:copy-of select="$item.contents"/>
-      </fo:list-item>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="itemizedlist.label.markup">
-  <xsl:param name="itemsymbol" select="'disc'"/>
-
-  <xsl:choose>
-    <xsl:when test="$itemsymbol='none'"></xsl:when>
-    <xsl:when test="$itemsymbol='disc'">&#x2022;</xsl:when>
-    <xsl:when test="$itemsymbol='bullet'">&#x2022;</xsl:when>
-    <xsl:when test="$itemsymbol='endash'">&#x2013;</xsl:when>
-    <xsl:when test="$itemsymbol='emdash'">&#x2014;</xsl:when>
-    <!-- Some of these may work in your XSL-FO processor and fonts -->
-    <!--
-    <xsl:when test="$itemsymbol='square'">&#x25A0;</xsl:when>
-    <xsl:when test="$itemsymbol='box'">&#x25A0;</xsl:when>
-    <xsl:when test="$itemsymbol='smallblacksquare'">&#x25AA;</xsl:when>
-    <xsl:when test="$itemsymbol='circle'">&#x25CB;</xsl:when>
-    <xsl:when test="$itemsymbol='opencircle'">&#x25CB;</xsl:when>
-    <xsl:when test="$itemsymbol='whitesquare'">&#x25A1;</xsl:when>
-    <xsl:when test="$itemsymbol='smallwhitesquare'">&#x25AB;</xsl:when>
-    <xsl:when test="$itemsymbol='round'">&#x25CF;</xsl:when>
-    <xsl:when test="$itemsymbol='blackcircle'">&#x25CF;</xsl:when>
-    <xsl:when test="$itemsymbol='whitebullet'">&#x25E6;</xsl:when>
-    <xsl:when test="$itemsymbol='triangle'">&#x2023;</xsl:when>
-    <xsl:when test="$itemsymbol='point'">&#x203A;</xsl:when>
-    <xsl:when test="$itemsymbol='hand'"><fo:inline 
-                         font-family="Wingdings 2">A</fo:inline></xsl:when>
-    -->
-    <xsl:otherwise>&#x2022;</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="orderedlist">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="pi-label-width">
-    <xsl:call-template name="pi.dbfo_label-width"/>
-  </xsl:variable>
-
-  <xsl:variable name="label-width">
-    <xsl:choose>
-      <xsl:when test="$pi-label-width = ''">
-	<xsl:value-of select="$orderedlist.label.width"/>
-      </xsl:when>
-      <xsl:otherwise>
-	<xsl:value-of select="$pi-label-width"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:if test="title">
-    <xsl:apply-templates select="title" mode="list.title.mode"/>
-  </xsl:if>
-
-  <!-- Preserve order of PIs and comments -->
-  <xsl:apply-templates 
-      select="*[not(self::listitem
-                or self::title
-                or self::titleabbrev)]
-              |comment()[not(preceding-sibling::listitem)]
-              |processing-instruction()[not(preceding-sibling::listitem)]"/>
-
-  <xsl:variable name="content">
-    <xsl:apply-templates 
-          select="listitem
-                  |comment()[preceding-sibling::listitem]
-                  |processing-instruction()[preceding-sibling::listitem]"/>
-  </xsl:variable>
-
-  <!-- nested lists don't add extra list-block spacing -->
-  <xsl:choose>
-    <xsl:when test="ancestor::listitem">
-      <fo:list-block id="{$id}" xsl:use-attribute-sets="orderedlist.properties">
-	<xsl:attribute name="provisional-distance-between-starts">
-	  <xsl:value-of select="$label-width"/>
-	</xsl:attribute>
-        <xsl:copy-of select="$content"/>
-      </fo:list-block>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:list-block id="{$id}" xsl:use-attribute-sets="list.block.spacing orderedlist.properties">
-	<xsl:attribute name="provisional-distance-between-starts">
-	  <xsl:value-of select="$label-width"/>
-	</xsl:attribute>
-        <xsl:copy-of select="$content"/>
-      </fo:list-block>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="orderedlist/listitem" mode="item-number">
-  <xsl:variable name="numeration">
-    <xsl:call-template name="list.numeration">
-      <xsl:with-param name="node" select="parent::orderedlist"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="type">
-    <xsl:choose>
-      <xsl:when test="$numeration='arabic'">1.</xsl:when>
-      <xsl:when test="$numeration='loweralpha'">a.</xsl:when>
-      <xsl:when test="$numeration='lowerroman'">i.</xsl:when>
-      <xsl:when test="$numeration='upperalpha'">A.</xsl:when>
-      <xsl:when test="$numeration='upperroman'">I.</xsl:when>
-      <!-- What!? This should never happen -->
-      <xsl:otherwise>
-        <xsl:message>
-          <xsl:text>Unexpected numeration: </xsl:text>
-          <xsl:value-of select="$numeration"/>
-        </xsl:message>
-        <xsl:value-of select="1."/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="item-number">
-    <xsl:call-template name="orderedlist-item-number"/>
-  </xsl:variable>
-
-  <xsl:if test="parent::orderedlist/@inheritnum='inherit'
-                and ancestor::listitem[parent::orderedlist]">
-    <xsl:apply-templates select="ancestor::listitem[parent::orderedlist][1]"
-                         mode="item-number"/>
-  </xsl:if>
-
-  <xsl:number value="$item-number" format="{$type}"/>
-</xsl:template>
-
-<xsl:template match="orderedlist/listitem">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-
-  <xsl:variable name="item.contents">
-    <fo:list-item-label end-indent="label-end()" xsl:use-attribute-sets="orderedlist.label.properties">
-      <fo:block>
-        <xsl:apply-templates select="." mode="item-number"/>
-      </fo:block>
-    </fo:list-item-label>
-    <fo:list-item-body start-indent="body-start()">
-      <fo:block>
-        <xsl:apply-templates/>
-      </fo:block>
-    </fo:list-item-body>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="parent::*/@spacing = 'compact'">
-      <fo:list-item id="{$id}" xsl:use-attribute-sets="compact.list.item.spacing">
-        <xsl:copy-of select="$item.contents"/>
-      </fo:list-item>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:list-item id="{$id}" xsl:use-attribute-sets="list.item.spacing">
-        <xsl:copy-of select="$item.contents"/>
-      </fo:list-item>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="listitem/*[1][local-name()='para' or 
-                                   local-name()='simpara' or 
-                                   local-name()='formalpara']
-                     |glossdef/*[1][local-name()='para' or 
-                                   local-name()='simpara' or 
-                                   local-name()='formalpara']
-                     |step/*[1][local-name()='para' or 
-                                   local-name()='simpara' or 
-                                   local-name()='formalpara']
-                     |callout/*[1][local-name()='para' or 
-                                   local-name()='simpara' or 
-                                   local-name()='formalpara']"
-              priority="2">
-  <fo:block>
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="variablelist">
-  <xsl:variable name="presentation">
-    <xsl:call-template name="pi.dbfo_list-presentation"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$presentation = 'list'">
-      <xsl:apply-templates select="." mode="vl.as.list"/>
-    </xsl:when>
-    <xsl:when test="$presentation = 'blocks'">
-      <xsl:apply-templates select="." mode="vl.as.blocks"/>
-    </xsl:when>
-    <xsl:when test="$variablelist.as.blocks != 0">
-      <xsl:apply-templates select="." mode="vl.as.blocks"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="." mode="vl.as.list"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="variablelist" mode="vl.as.list">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="term-width">
-    <xsl:call-template name="pi.dbfo_term-width"/>
-  </xsl:variable>
-
-  <xsl:variable name="termlength">
-    <xsl:choose>
-      <xsl:when test="$term-width != ''">
-        <xsl:value-of select="$term-width"/>
-      </xsl:when>
-      <xsl:when test="@termlength">
-        <xsl:variable name="termlength.is.number">
-          <xsl:value-of select="@termlength + 0"/>
-        </xsl:variable>
-        <xsl:choose>
-          <xsl:when test="string($termlength.is.number) = 'NaN'">
-            <!-- if the term length isn't just a number, assume it's a measurement -->
-            <xsl:value-of select="@termlength"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="@termlength"/>
-            <xsl:choose>
-              <!-- workaround for passivetex lack of support for non-constant expressions -->
-              <xsl:when test="$passivetex.extensions != 0">
-                <xsl:text>em</xsl:text>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:text>em * 0.60</xsl:text>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="longest.term">
-          <xsl:with-param name="terms" select="varlistentry/term"/>
-          <xsl:with-param name="maxlength" select="$variablelist.max.termlength"/>
-        </xsl:call-template>
-        <xsl:choose>
-          <!-- workaround for passivetex lack of support for non-constant expressions -->
-          <xsl:when test="$passivetex.extensions != 0">
-            <xsl:text>em</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:text>em * 0.60</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-<!--
-  <xsl:message>
-    <xsl:text>term width: </xsl:text>
-    <xsl:value-of select="$termlength"/>
-  </xsl:message>
--->
-
-  <xsl:variable name="label-separation">1em</xsl:variable>
-  <xsl:variable name="distance-between-starts">
-    <xsl:choose>
-      <!-- workaround for passivetex lack of support for non-constant expressions -->
-      <xsl:when test="$passivetex.extensions != 0">
-        <xsl:value-of select="$termlength"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$termlength"/>
-        <xsl:text>+</xsl:text>
-        <xsl:value-of select="$label-separation"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:if test="title">
-    <xsl:apply-templates select="title" mode="list.title.mode"/>
-  </xsl:if>
-
-  <!-- Preserve order of PIs and comments -->
-  <xsl:apply-templates 
-    select="*[not(self::varlistentry
-              or self::title
-              or self::titleabbrev)]
-            |comment()[not(preceding-sibling::varlistentry)]
-            |processing-instruction()[not(preceding-sibling::varlistentry)]"/>
-
-  <xsl:variable name="content">
-    <xsl:apply-templates mode="vl.as.list"
-      select="varlistentry
-              |comment()[preceding-sibling::varlistentry]
-              |processing-instruction()[preceding-sibling::varlistentry]"/>
-  </xsl:variable>
-
-  <!-- nested lists don't add extra list-block spacing -->
-  <xsl:choose>
-    <xsl:when test="ancestor::listitem">
-      <fo:list-block id="{$id}"
-                     provisional-distance-between-starts=
-                        "{$distance-between-starts}"
-                     provisional-label-separation="{$label-separation}">
-        <xsl:copy-of select="$content"/>
-      </fo:list-block>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:list-block id="{$id}"
-                     provisional-distance-between-starts=
-                        "{$distance-between-starts}"
-                     provisional-label-separation="{$label-separation}"
-                     xsl:use-attribute-sets="list.block.spacing">
-        <xsl:copy-of select="$content"/>
-      </fo:list-block>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="longest.term">
-  <xsl:param name="longest" select="0"/>
-  <xsl:param name="terms" select="."/>
-  <xsl:param name="maxlength" select="-1"/>
-
-  <!-- Process out any indexterms in the term -->
-  <xsl:variable name="term.text">
-    <xsl:apply-templates select="$terms[1]"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$longest &gt; $maxlength and $maxlength &gt; 0">
-      <xsl:value-of select="$maxlength"/>
-    </xsl:when>
-    <xsl:when test="not($terms)">
-      <xsl:value-of select="$longest"/>
-    </xsl:when>
-    <xsl:when test="string-length($term.text) &gt; $longest">
-      <xsl:call-template name="longest.term">
-        <xsl:with-param name="longest" 
-            select="string-length($term.text)"/>
-        <xsl:with-param name="maxlength" select="$maxlength"/>
-        <xsl:with-param name="terms" select="$terms[position() &gt; 1]"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="longest.term">
-        <xsl:with-param name="longest" select="$longest"/>
-        <xsl:with-param name="maxlength" select="$maxlength"/>
-        <xsl:with-param name="terms" select="$terms[position() &gt; 1]"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="varlistentry" mode="vl.as.list">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  <xsl:variable name="item.contents">
-    <fo:list-item-label end-indent="label-end()" text-align="start">
-      <fo:block>
-        <xsl:apply-templates select="term"/>
-      </fo:block>
-    </fo:list-item-label>
-    <fo:list-item-body start-indent="body-start()">
-      <fo:block>
-        <xsl:apply-templates select="listitem"/>
-      </fo:block>
-    </fo:list-item-body>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="parent::*/@spacing = 'compact'">
-      <fo:list-item id="{$id}"
-          xsl:use-attribute-sets="compact.list.item.spacing">
-        <xsl:copy-of select="$item.contents"/>
-      </fo:list-item>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:list-item id="{$id}" xsl:use-attribute-sets="list.item.spacing">
-        <xsl:copy-of select="$item.contents"/>
-      </fo:list-item>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-
-<xsl:template match="variablelist" mode="vl.as.blocks">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <!-- termlength is irrelevant -->
-
-  <xsl:if test="title">
-    <xsl:apply-templates select="title" mode="list.title.mode"/>
-  </xsl:if>
-
-  <!-- Preserve order of PIs and comments -->
-  <xsl:apply-templates 
-    select="*[not(self::varlistentry
-              or self::title
-              or self::titleabbrev)]
-            |comment()[not(preceding-sibling::varlistentry)]
-            |processing-instruction()[not(preceding-sibling::varlistentry)]"/>
-
-  <xsl:variable name="content">
-    <xsl:apply-templates mode="vl.as.blocks"
-      select="varlistentry
-              |comment()[preceding-sibling::varlistentry]
-              |processing-instruction()[preceding-sibling::varlistentry]"/>
-  </xsl:variable>
-
-  <!-- nested lists don't add extra list-block spacing -->
-  <xsl:choose>
-    <xsl:when test="ancestor::listitem">
-      <fo:block id="{$id}">
-        <xsl:copy-of select="$content"/>
-      </fo:block>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:block id="{$id}" xsl:use-attribute-sets="list.block.spacing">
-        <xsl:copy-of select="$content"/>
-      </fo:block>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="varlistentry" mode="vl.as.blocks">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-
-  <fo:block id="{$id}" xsl:use-attribute-sets="list.item.spacing"  
-      keep-together.within-column="always" 
-      keep-with-next.within-column="always">
-    <xsl:apply-templates select="term"/>
-  </fo:block>
-
-  <fo:block margin-left="0.25in">
-    <xsl:apply-templates select="listitem"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="varlistentry/term">
-  <fo:inline>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </fo:inline>
-  <xsl:choose>
-    <xsl:when test="not(following-sibling::term)"/> <!-- do nothing -->
-    <xsl:otherwise>
-      <!-- * if we have multiple terms in the same varlistentry, generate -->
-      <!-- * a separator (", " by default) and/or an additional line -->
-      <!-- * break after each one except the last -->
-      <fo:inline><xsl:value-of select="$variablelist.term.separator"/></fo:inline>
-      <xsl:if test="not($variablelist.term.break.after = '0')">
-        <fo:block/>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="varlistentry/listitem">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="title" mode="list.title.mode">
-  <xsl:call-template name="formal.object.heading">
-    <xsl:with-param name="object" select=".."/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="simplelist|simplelist[@type='vert']">
-  <!-- with no type specified, the default is 'vert' -->
-
-  <xsl:variable name="explicit.table.width">
-    <xsl:call-template name="dbfo-attribute">
-      <xsl:with-param name="pis"
-		      select="processing-instruction('dbfo')"/>
-      <xsl:with-param name="attribute" select="'list-width'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="table.width">
-    <xsl:choose>
-      <xsl:when test="$explicit.table.width != ''">
-        <xsl:value-of select="$explicit.table.width"/>
-      </xsl:when>
-      <xsl:when test="$default.table.width = ''">
-        <xsl:text>100%</xsl:text>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$default.table.width"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <fo:table xsl:use-attribute-sets="normal.para.spacing">
-
-    <xsl:choose>
-      <xsl:when test="$axf.extensions != 0 or $xep.extensions != 0">
-	<xsl:attribute name="table-layout">auto</xsl:attribute>
-        <xsl:if test="$explicit.table.width != ''">
-          <xsl:attribute name="width"><xsl:value-of 
-	  select="$explicit.table.width"/></xsl:attribute>
-        </xsl:if>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute name="table-layout">fixed</xsl:attribute>
-        <xsl:attribute name="width"><xsl:value-of 
-                                      select="$table.width"/></xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:call-template name="simplelist.table.columns">
-      <xsl:with-param name="cols">
-        <xsl:choose>
-          <xsl:when test="@columns">
-            <xsl:value-of select="@columns"/>
-          </xsl:when>
-          <xsl:otherwise>1</xsl:otherwise>
-        </xsl:choose>
-      </xsl:with-param>
-    </xsl:call-template>
-    <fo:table-body start-indent="0pt" end-indent="0pt">
-      <xsl:call-template name="simplelist.vert">
-        <xsl:with-param name="cols">
-          <xsl:choose>
-            <xsl:when test="@columns">
-              <xsl:value-of select="@columns"/>
-            </xsl:when>
-            <xsl:otherwise>1</xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
-      </xsl:call-template>
-    </fo:table-body>
-  </fo:table>
-</xsl:template>
-
-<xsl:template match="simplelist[@type='inline']">
-  <!-- if dbchoice PI exists, use that to determine the choice separator -->
-  <!-- (that is, equivalent of "and" or "or" in current locale), or literal -->
-  <!-- value of "choice" otherwise -->
-  <fo:inline><xsl:variable name="localized-choice-separator">
-    <xsl:choose>
-      <xsl:when test="processing-instruction('dbchoice')">
-        <xsl:call-template name="select.choice.separator"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- empty -->
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:for-each select="member">
-    <xsl:apply-templates/>
-    <xsl:choose>
-      <xsl:when test="position() = last()"/> <!-- do nothing -->
-      <xsl:otherwise>
-	<xsl:text>, </xsl:text>
-	<xsl:if test="position() = last() - 1">
-	  <xsl:if test="$localized-choice-separator != ''">
-	    <xsl:value-of select="$localized-choice-separator"/>
-	    <xsl:text> </xsl:text>
-	  </xsl:if>
-	</xsl:if>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:for-each></fo:inline>
-</xsl:template>
-
-<xsl:template match="simplelist[@type='horiz']">
-
-  <xsl:variable name="explicit.table.width">
-    <xsl:call-template name="pi.dbfo_list-width"/>
-  </xsl:variable>
-
-  <xsl:variable name="table.width">
-    <xsl:choose>
-      <xsl:when test="$explicit.table.width != ''">
-        <xsl:value-of select="$explicit.table.width"/>
-      </xsl:when>
-      <xsl:when test="$default.table.width = ''">
-        <xsl:text>100%</xsl:text>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$default.table.width"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <fo:table xsl:use-attribute-sets="normal.para.spacing">
-    <xsl:choose>
-      <xsl:when test="$axf.extensions != 0 or $xep.extensions != 0">
-        <xsl:attribute name="table-layout">auto</xsl:attribute>
-        <xsl:if test="$explicit.table.width != ''">
-          <xsl:attribute name="width"><xsl:value-of 
-                             select="$explicit.table.width"/></xsl:attribute>
-        </xsl:if>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute name="table-layout">fixed</xsl:attribute>
-        <xsl:attribute name="width"><xsl:value-of 
-                                      select="$table.width"/></xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:call-template name="simplelist.table.columns">
-      <xsl:with-param name="cols">
-        <xsl:choose>
-          <xsl:when test="@columns">
-            <xsl:value-of select="@columns"/>
-          </xsl:when>
-          <xsl:otherwise>1</xsl:otherwise>
-        </xsl:choose>
-      </xsl:with-param>
-    </xsl:call-template>
-    <fo:table-body start-indent="0pt" end-indent="0pt">
-      <xsl:call-template name="simplelist.horiz">
-        <xsl:with-param name="cols">
-          <xsl:choose>
-            <xsl:when test="@columns">
-              <xsl:value-of select="@columns"/>
-            </xsl:when>
-            <xsl:otherwise>1</xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
-      </xsl:call-template>
-    </fo:table-body>
-  </fo:table>
-</xsl:template>
-
-<xsl:template name="simplelist.table.columns">
-  <xsl:param name="cols" select="1"/>
-  <xsl:param name="curcol" select="1"/>
-  <fo:table-column column-number="{$curcol}"
-                   column-width="proportional-column-width(1)"/>
-  <xsl:if test="$curcol &lt; $cols">
-    <xsl:call-template name="simplelist.table.columns">
-      <xsl:with-param name="cols" select="$cols"/>
-      <xsl:with-param name="curcol" select="$curcol + 1"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="simplelist.horiz">
-  <xsl:param name="cols">1</xsl:param>
-  <xsl:param name="cell">1</xsl:param>
-  <xsl:param name="members" select="./member"/>
-
-  <xsl:if test="$cell &lt;= count($members)">
-    <fo:table-row>
-      <xsl:call-template name="simplelist.horiz.row">
-        <xsl:with-param name="cols" select="$cols"/>
-        <xsl:with-param name="cell" select="$cell"/>
-        <xsl:with-param name="members" select="$members"/>
-      </xsl:call-template>
-   </fo:table-row>
-    <xsl:call-template name="simplelist.horiz">
-      <xsl:with-param name="cols" select="$cols"/>
-      <xsl:with-param name="cell" select="$cell + $cols"/>
-      <xsl:with-param name="members" select="$members"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="simplelist.horiz.row">
-  <xsl:param name="cols">1</xsl:param>
-  <xsl:param name="cell">1</xsl:param>
-  <xsl:param name="members" select="./member"/>
-  <xsl:param name="curcol">1</xsl:param>
-
-  <xsl:if test="$curcol &lt;= $cols">
-    <fo:table-cell>
-      <fo:block>
-        <xsl:if test="$members[position()=$cell]">
-          <xsl:apply-templates select="$members[position()=$cell]"/>
-        </xsl:if>
-      </fo:block>
-    </fo:table-cell>
-    <xsl:call-template name="simplelist.horiz.row">
-      <xsl:with-param name="cols" select="$cols"/>
-      <xsl:with-param name="cell" select="$cell+1"/>
-      <xsl:with-param name="members" select="$members"/>
-      <xsl:with-param name="curcol" select="$curcol+1"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="simplelist.vert">
-  <xsl:param name="cols">1</xsl:param>
-  <xsl:param name="cell">1</xsl:param>
-  <xsl:param name="members" select="./member"/>
-  <xsl:param name="rows"
-             select="floor((count($members)+$cols - 1) div $cols)"/>
-
-  <xsl:if test="$cell &lt;= $rows">
-    <fo:table-row>
-      <xsl:call-template name="simplelist.vert.row">
-        <xsl:with-param name="cols" select="$cols"/>
-        <xsl:with-param name="rows" select="$rows"/>
-        <xsl:with-param name="cell" select="$cell"/>
-        <xsl:with-param name="members" select="$members"/>
-      </xsl:call-template>
-   </fo:table-row>
-    <xsl:call-template name="simplelist.vert">
-      <xsl:with-param name="cols" select="$cols"/>
-      <xsl:with-param name="cell" select="$cell+1"/>
-      <xsl:with-param name="members" select="$members"/>
-      <xsl:with-param name="rows" select="$rows"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="simplelist.vert.row">
-  <xsl:param name="cols">1</xsl:param>
-  <xsl:param name="rows">1</xsl:param>
-  <xsl:param name="cell">1</xsl:param>
-  <xsl:param name="members" select="./member"/>
-  <xsl:param name="curcol">1</xsl:param>
-
-  <xsl:if test="$curcol &lt;= $cols">
-    <fo:table-cell>
-      <fo:block>
-        <xsl:if test="$members[position()=$cell]">
-          <xsl:apply-templates select="$members[position()=$cell]"/>
-        </xsl:if>
-      </fo:block>
-    </fo:table-cell>
-    <xsl:call-template name="simplelist.vert.row">
-      <xsl:with-param name="cols" select="$cols"/>
-      <xsl:with-param name="rows" select="$rows"/>
-      <xsl:with-param name="cell" select="$cell+$rows"/>
-      <xsl:with-param name="members" select="$members"/>
-      <xsl:with-param name="curcol" select="$curcol+1"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="member">
-  <xsl:call-template name="simple.xlink">
-    <xsl:with-param name="content">
-      <xsl:apply-templates/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="procedure">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="param.placement"
-                select="substring-after(normalize-space($formal.title.placement),
-                                        concat(local-name(.), ' '))"/>
-
-  <xsl:variable name="placement">
-    <xsl:choose>
-      <xsl:when test="contains($param.placement, ' ')">
-        <xsl:value-of select="substring-before($param.placement, ' ')"/>
-      </xsl:when>
-      <xsl:when test="$param.placement = ''">before</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$param.placement"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <!-- Preserve order of PIs and comments -->
-  <xsl:variable name="preamble"
-        select="*[not(self::step
-                  or self::title
-                  or self::titleabbrev)]
-                |comment()[not(preceding-sibling::step)]
-                |processing-instruction()[not(preceding-sibling::step)]"/>
-
-  <xsl:variable name="steps" 
-                select="step
-                        |comment()[preceding-sibling::step]
-                        |processing-instruction()[preceding-sibling::step]"/>
-
-  <fo:block id="{$id}" xsl:use-attribute-sets="procedure.properties list.block.spacing">
-    <xsl:if test="./title and $placement = 'before'">
-      <!-- n.b. gentext code tests for $formal.procedures and may make an "informal" -->
-      <!-- heading even though we called formal.object.heading. odd but true. -->
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-
-    <xsl:apply-templates select="$preamble"/>
-
-    <fo:list-block xsl:use-attribute-sets="list.block.spacing"
-                   provisional-distance-between-starts="2em"
-                   provisional-label-separation="0.2em">
-      <xsl:apply-templates select="$steps"/>
-    </fo:list-block>
-
-    <xsl:if test="./title and $placement != 'before'">
-      <!-- n.b. gentext code tests for $formal.procedures and may make an "informal" -->
-      <!-- heading even though we called formal.object.heading. odd but true. -->
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="procedure/title">
-</xsl:template>
-
-<xsl:template match="substeps">
-  <fo:list-block xsl:use-attribute-sets="list.block.spacing"
-                 provisional-distance-between-starts="2em"
-                 provisional-label-separation="0.2em">
-    <xsl:apply-templates/>
-  </fo:list-block>
-</xsl:template>
-
-<xsl:template match="procedure/step|substeps/step">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:list-item xsl:use-attribute-sets="list.item.spacing">
-    <fo:list-item-label end-indent="label-end()">
-      <fo:block id="{$id}">
-        <!-- dwc: fix for one step procedures. Use a bullet if there's no step 2 -->
-        <xsl:choose>
-          <xsl:when test="count(../step) = 1">
-            <xsl:text>&#x2022;</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates select="." mode="number">
-              <xsl:with-param name="recursive" select="0"/>
-            </xsl:apply-templates>.
-          </xsl:otherwise>
-        </xsl:choose>
-      </fo:block>
-    </fo:list-item-label>
-    <fo:list-item-body start-indent="body-start()">
-      <fo:block>
-        <xsl:apply-templates/>
-      </fo:block>
-    </fo:list-item-body>
-  </fo:list-item>
-</xsl:template>
-
-<xsl:template match="stepalternatives">
-  <fo:list-block provisional-distance-between-starts="2em"
-                 provisional-label-separation="0.2em">
-    <xsl:apply-templates select="step"/>
-  </fo:list-block>
-</xsl:template>
-
-<xsl:template match="stepalternatives/step">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:list-item xsl:use-attribute-sets="list.item.spacing">
-    <fo:list-item-label end-indent="label-end()">
-      <fo:block id="{$id}">
-        <xsl:text>&#x2022;</xsl:text>
-      </fo:block>
-    </fo:list-item-label>
-    <fo:list-item-body start-indent="body-start()">
-      <fo:block>
-        <xsl:apply-templates/>
-      </fo:block>
-    </fo:list-item-body>
-  </fo:list-item>
-</xsl:template>
-
-<xsl:template match="step/title">
-  <fo:block font-weight="bold"
-            keep-together.within-column="always" 
-            keep-with-next.within-column="always">
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="segmentedlist">
-  <xsl:variable name="presentation">
-    <xsl:call-template name="pi.dbfo_list-presentation"/>
-  </xsl:variable>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$presentation = 'table'">
-      <fo:block id="{$id}">
-        <xsl:apply-templates select="." mode="seglist-table"/>
-      </fo:block>
-    </xsl:when>
-    <xsl:when test="$presentation = 'list'">
-      <fo:block id="{$id}">
-        <xsl:apply-templates/>
-      </fo:block>
-    </xsl:when>
-    <xsl:when test="$segmentedlist.as.table != 0">
-      <fo:block id="{$id}">
-        <xsl:apply-templates select="." mode="seglist-table"/>
-      </fo:block>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:block id="{$id}">
-        <xsl:apply-templates/>
-      </fo:block>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="segmentedlist/title">
-  <xsl:apply-templates select="." mode="list.title.mode" />
-</xsl:template>
-
-<xsl:template match="segtitle">
-</xsl:template>
-
-<xsl:template match="segtitle" mode="segtitle-in-seg">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="seglistitem">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  <fo:block id="{$id}">
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="seg">
-  <xsl:variable name="segnum" select="count(preceding-sibling::seg)+1"/>
-  <xsl:variable name="seglist" select="ancestor::segmentedlist"/>
-  <xsl:variable name="segtitles" select="$seglist/segtitle"/>
-
-  <!--
-     Note: segtitle is only going to be the right thing in a well formed
-     SegmentedList.  If there are too many Segs or too few SegTitles,
-     you'll get something odd...maybe an error
-  -->
-
-  <fo:block>
-    <fo:inline font-weight="bold">
-      <xsl:apply-templates select="$segtitles[$segnum=position()]"
-                           mode="segtitle-in-seg"/>
-      <xsl:text>: </xsl:text>
-    </fo:inline>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="segmentedlist" mode="seglist-table">
-  <xsl:apply-templates select="title" mode="list.title.mode" />
-  <fo:table>
-    <fo:table-column column-number="1" column-width="proportional-column-width(1)"/>
-    <fo:table-column column-number="2" column-width="proportional-column-width(1)"/>
-    <fo:table-header start-indent="0pt" end-indent="0pt">
-      <fo:table-row>
-        <xsl:apply-templates select="segtitle" mode="seglist-table"/>
-      </fo:table-row>
-    </fo:table-header>
-    <fo:table-body start-indent="0pt" end-indent="0pt">
-      <xsl:apply-templates select="seglistitem" mode="seglist-table"/>
-    </fo:table-body>
-  </fo:table>
-</xsl:template>
-
-<xsl:template match="segtitle" mode="seglist-table">
-  <fo:table-cell>
-    <fo:block font-weight="bold">
-      <xsl:apply-templates/>
-    </fo:block>
-  </fo:table-cell>
-</xsl:template>
-
-<xsl:template match="seglistitem" mode="seglist-table">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  <fo:table-row id="{$id}">
-    <xsl:apply-templates mode="seglist-table"/>
-  </fo:table-row>
-</xsl:template>
-
-<xsl:template match="seg" mode="seglist-table">
-  <fo:table-cell>
-    <fo:block>
-      <xsl:apply-templates/>
-    </fo:block>
-  </fo:table-cell>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="calloutlist">
-  <xsl:variable name="id">
-  <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:block id="{$id}"
-            text-align="{$alignment}">
-    <!-- The above restores alignment altered by image align attribute -->
-    <xsl:if test="title|info/title">
-      <xsl:apply-templates select="(title|info/title)[1]" 
-                           mode="list.title.mode"/>
-    </xsl:if>
-
-    <!-- Preserve order of PIs and comments -->
-    <xsl:apply-templates 
-         select="*[not(self::callout or self::title or self::titleabbrev)]
-                   |comment()[not(preceding-sibling::callout)]
-                   |processing-instruction()[not(preceding-sibling::callout)]"/>
-
-    <fo:list-block space-before.optimum="1em"
-                   space-before.minimum="0.8em"
-                   space-before.maximum="1.2em"
-                   provisional-distance-between-starts="2.2em"
-                   provisional-label-separation="0.2em">
-      <xsl:apply-templates select="callout
-                                |comment()[preceding-sibling::callout]
-                                |processing-instruction()[preceding-sibling::callout]"/>
-    </fo:list-block>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="calloutlist/title">
-</xsl:template>
-
-<xsl:template match="callout">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-  <fo:list-item id="{$id}">
-    <fo:list-item-label end-indent="label-end()">
-      <fo:block>
-        <xsl:call-template name="callout.arearefs">
-          <xsl:with-param name="arearefs" select="@arearefs"/>
-        </xsl:call-template>
-      </fo:block>
-    </fo:list-item-label>
-    <fo:list-item-body start-indent="body-start()">
-      <fo:block>
-        <xsl:apply-templates/>
-      </fo:block>
-    </fo:list-item-body>
-  </fo:list-item>
-</xsl:template>
-
-<xsl:template name="callout.arearefs">
-  <xsl:param name="arearefs"></xsl:param>
-  <xsl:if test="$arearefs!=''">
-    <xsl:choose>
-      <xsl:when test="substring-before($arearefs,' ')=''">
-        <xsl:call-template name="callout.arearef">
-          <xsl:with-param name="arearef" select="$arearefs"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="callout.arearef">
-          <xsl:with-param name="arearef"
-                          select="substring-before($arearefs,' ')"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:call-template name="callout.arearefs">
-      <xsl:with-param name="arearefs"
-                      select="substring-after($arearefs,' ')"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="callout.arearef">
-  <xsl:param name="arearef"></xsl:param>
-  <xsl:variable name="targets" select="key('id',$arearef)"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-
-  <xsl:choose>
-    <xsl:when test="count($target)=0">
-      <xsl:value-of select="$arearef"/>
-      <xsl:text>: ???</xsl:text>
-    </xsl:when>
-    <xsl:when test="local-name($target)='co'">
-      <xsl:apply-templates select="$target" mode="callout-bug"/>
-    </xsl:when>
-    <xsl:when test="local-name($target)='areaset'">
-      <xsl:call-template name="callout-bug">
-        <xsl:with-param name="conum">
-          <xsl:apply-templates select="$target" mode="conumber"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="local-name($target)='area'">
-      <xsl:choose>
-        <xsl:when test="$target/parent::areaset">
-          <xsl:call-template name="callout-bug">
-            <xsl:with-param name="conum">
-              <xsl:apply-templates select="$target/parent::areaset"
-                                   mode="conumber"/>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="callout-bug">
-            <xsl:with-param name="conum">
-              <xsl:apply-templates select="$target" mode="conumber"/>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text>???</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="orderedlist-starting-number">
-  <xsl:param name="list" select="."/>
-  <xsl:variable name="pi-start">
-    <xsl:call-template name="pi.dbfo_start">
-      <xsl:with-param name="node" select="$list"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:call-template name="output-orderedlist-starting-number">
-    <xsl:with-param name="list" select="$list"/>
-    <xsl:with-param name="pi-start" select="$pi-start"/>
-  </xsl:call-template>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/math.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/math.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,128 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:mml="http://www.w3.org/1998/Math/MathML"
-                exclude-result-prefixes="mml"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:template match="inlineequation">
-  <xsl:choose>
-    <xsl:when test="$passivetex.extensions != 0 and $tex.math.in.alt != ''">
-      <xsl:apply-templates select="alt[@role='tex'] | inlinemediaobject/textobject[@role='tex']">
-        <xsl:with-param name="output.delims">
-          <xsl:call-template name="tex.math.output.delims"/>
-        </xsl:with-param>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="alt">
-</xsl:template>
-
-<xsl:template match="mathphrase">
-  <fo:inline>
-    <xsl:apply-templates/>
-  </fo:inline>
-</xsl:template>
-
-<!-- "Support" for MathML -->
-
-<xsl:template match="mml:math" xmlns:mml="http://www.w3.org/1998/Math/MathML">
-  <fo:instream-foreign-object>
-    <xsl:copy>
-      <xsl:copy-of select="@*"/>
-      <xsl:apply-templates/>
-    </xsl:copy>
-  </fo:instream-foreign-object>
-</xsl:template>
-
-<xsl:template match="mml:*" xmlns:mml="http://www.w3.org/1998/Math/MathML">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates/>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="equation/graphic | informalequation/graphic">
-  <xsl:if test="$passivetex.extensions = 0 or $tex.math.in.alt = ''">
-    <fo:block>
-      <xsl:call-template name="process.image"/>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="inlineequation/alt[@role='tex'] | 
-                     inlineequation/inlinemediaobject/textobject[@role='tex']" priority="1">
-  <xsl:param name="output.delims" select="1"/>
-  <xsl:if test="$passivetex.extensions != 0 and $tex.math.in.alt != ''">
-    <xsl:processing-instruction name="xmltex">
-      <xsl:if test="$output.delims != 0">
-        <xsl:text>$</xsl:text>
-      </xsl:if>
-      <xsl:value-of select="."/>
-      <xsl:if test="$output.delims != 0">
-        <xsl:text>$</xsl:text>
-      </xsl:if>
-    </xsl:processing-instruction>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="equation/alt[@role='tex'] | informalequation/alt[@role='tex'] |
-                     equation/mediaobject/textobject[@role='tex'] |
-                     informalequation/mediaobject/textobject[@role='tex']" priority="1">
-  <xsl:variable name="output.delims">
-    <xsl:call-template name="tex.math.output.delims"/>
-  </xsl:variable>
-  <xsl:if test="$passivetex.extensions != 0 and $tex.math.in.alt != ''">
-    <xsl:processing-instruction name="xmltex">
-      <xsl:if test="$output.delims != 0">
-        <xsl:text>$$</xsl:text>
-      </xsl:if>
-      <xsl:value-of select="."/>
-      <xsl:if test="$output.delims != 0">
-        <xsl:text>$$</xsl:text>
-      </xsl:if>
-    </xsl:processing-instruction>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="alt[@role='tex']">
-  <xsl:if test="$passivetex.extensions != 0 and $tex.math.in.alt != ''">
-    <xsl:message>
-      Your equation is misplaced. It should be in inlineequation, equation or informalequation.
-    </xsl:message>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="tex.math.output.delims">
-  <xsl:variable name="pi.delims">
-    <xsl:call-template name="pi-attribute">
-      <xsl:with-param name="pis" select=".//processing-instruction('dbtex')"/>
-      <xsl:with-param name="attribute" select="'delims'"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="result">
-    <xsl:choose>
-      <xsl:when test="$pi.delims = 'no'">0</xsl:when>
-      <xsl:when test="$pi.delims = '' and $tex.math.delims = 0">0</xsl:when>
-      <xsl:otherwise>1</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:value-of select="$result"/>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/pagesetup.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/pagesetup.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,2314 +1,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the DocBook XSL Stylesheet distribution.
-     See ../README or http://docbook.sf.net/ for copyright
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:param name="body.fontset">
-  <xsl:value-of select="$body.font.family"/>
-  <xsl:if test="$body.font.family != ''
-                and $symbol.font.family  != ''">,</xsl:if>
-    <xsl:value-of select="$symbol.font.family"/>
-</xsl:param>
-
-<xsl:param name="title.fontset">
-  <xsl:value-of select="$title.font.family"/>
-  <xsl:if test="$title.font.family != ''
-                and $symbol.font.family  != ''">,</xsl:if>
-    <xsl:value-of select="$symbol.font.family"/>
-</xsl:param>
-
-<!-- PassiveTeX can't handle the math expression for
-     title.margin.left being negative, so ignore it.
-     margin-left="{$page.margin.outer} - {$title.margin.left}"
--->
-<xsl:param name="margin.left.outer">
-  <xsl:choose>
-    <xsl:when test="$passivetex.extensions != 0">
-      <xsl:value-of select="$page.margin.outer"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$page.margin.outer"/>
-      <xsl:text> - </xsl:text>
-      <xsl:value-of select="$title.margin.left"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-
-<xsl:param name="margin.left.inner">
-  <xsl:choose>
-    <xsl:when test="$passivetex.extensions != 0">
-      <xsl:value-of select="$page.margin.inner"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$page.margin.inner"/>
-      <xsl:text> - </xsl:text>
-      <xsl:value-of select="$title.margin.left"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-
-<xsl:template name="setup.pagemasters">
-  <fo:layout-master-set>
-    <!-- blank pages -->
-    <fo:simple-page-master master-name="blank"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.outer}"
-                           margin-right="{$page.margin.inner}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">blank</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body display-align="center"
-                      margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}">
-        <xsl:if test="$fop.extensions = 0 and $fop1.extensions = 0">
-          <xsl:attribute name="region-name">blank-body</xsl:attribute>
-        </xsl:if>
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-blank"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-blank"
-                       extent="{$region.after.extent}"
-                        display-align="after"/>
-    </fo:simple-page-master>
-
-    <!-- title pages -->
-    <fo:simple-page-master master-name="titlepage-first"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.inner}"
-                           margin-right="{$page.margin.outer}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">titlepage-first</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.titlepage}"
-                      column-count="{$column.count.titlepage}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-first"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-first"
-                       extent="{$region.after.extent}"
-                        display-align="after"/>
-    </fo:simple-page-master>
-
-    <fo:simple-page-master master-name="titlepage-odd"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.inner}"
-                           margin-right="{$page.margin.outer}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">titlepage-odd</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.titlepage}"
-                      column-count="{$column.count.titlepage}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-odd"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-odd"
-                       extent="{$region.after.extent}"
-                        display-align="after"/>
-    </fo:simple-page-master>
-
-    <fo:simple-page-master master-name="titlepage-even"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.outer}"
-                           margin-right="{$page.margin.inner}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">titlepage-even</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.titlepage}"
-                      column-count="{$column.count.titlepage}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-even"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-even"
-                       extent="{$region.after.extent}"
-                        display-align="after"/>
-    </fo:simple-page-master>
-
-    <!-- list-of-title pages -->
-    <fo:simple-page-master master-name="lot-first"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.inner}"
-                           margin-right="{$page.margin.outer}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">lot-first</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.lot}"
-                      column-count="{$column.count.lot}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-first"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-first"
-                       extent="{$region.after.extent}"
-                       display-align="after"/>
-    </fo:simple-page-master>
-
-    <fo:simple-page-master master-name="lot-odd"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.inner}"
-                           margin-right="{$page.margin.outer}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">lot-odd</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.lot}"
-                      column-count="{$column.count.lot}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-odd"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-odd"
-                       extent="{$region.after.extent}"
-                        display-align="after"/>
-    </fo:simple-page-master>
-
-    <fo:simple-page-master master-name="lot-even"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.outer}"
-                           margin-right="{$page.margin.inner}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">lot-even</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.lot}"
-                      column-count="{$column.count.lot}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-even"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-even"
-                       extent="{$region.after.extent}"
-                        display-align="after"/>
-    </fo:simple-page-master>
-
-    <!-- frontmatter pages -->
-    <fo:simple-page-master master-name="front-first"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.inner}"
-                           margin-right="{$page.margin.outer}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">front-first</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.front}"
-                      column-count="{$column.count.front}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-first"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-first"
-                       extent="{$region.after.extent}"
-                        display-align="after"/>
-    </fo:simple-page-master>
-
-    <fo:simple-page-master master-name="front-odd"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.inner}"
-                           margin-right="{$page.margin.outer}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">front-odd</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.front}"
-                      column-count="{$column.count.front}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-odd"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-odd"
-                       extent="{$region.after.extent}"
-                        display-align="after"/>
-    </fo:simple-page-master>
-
-    <fo:simple-page-master master-name="front-even"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.outer}"
-                           margin-right="{$page.margin.inner}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">front-even</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.front}"
-                      column-count="{$column.count.front}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-even"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-even"
-                       extent="{$region.after.extent}"
-                        display-align="after"/>
-    </fo:simple-page-master>
-
-    <!-- body pages -->
-    <fo:simple-page-master master-name="body-first"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.inner}"
-                           margin-right="{$page.margin.outer}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">body-first</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.body}"
-                      column-count="{$column.count.body}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-first"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-first"
-                       extent="{$region.after.extent}"
-                       display-align="after"/>
-    </fo:simple-page-master>
-
-    <fo:simple-page-master master-name="body-odd"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.inner}"
-                           margin-right="{$page.margin.outer}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">body-odd</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.body}"
-                      column-count="{$column.count.body}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-odd"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-odd"
-                       extent="{$region.after.extent}"
-                       display-align="after"/>
-    </fo:simple-page-master>
-
-    <fo:simple-page-master master-name="body-even"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.outer}"
-                           margin-right="{$page.margin.inner}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">body-even</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.body}"
-                      column-count="{$column.count.body}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-even"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-even"
-                       extent="{$region.after.extent}"
-                       display-align="after"/>
-    </fo:simple-page-master>
-
-    <!-- backmatter pages -->
-    <fo:simple-page-master master-name="back-first"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.inner}"
-                           margin-right="{$page.margin.outer}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">back-first</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.back}"
-                      column-count="{$column.count.back}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-first"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-first"
-                       extent="{$region.after.extent}"
-                       display-align="after"/>
-    </fo:simple-page-master>
-
-    <fo:simple-page-master master-name="back-odd"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.inner}"
-                           margin-right="{$page.margin.outer}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">back-odd</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.back}"
-                      column-count="{$column.count.back}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-odd"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-odd"
-                       extent="{$region.after.extent}"
-                       display-align="after"/>
-    </fo:simple-page-master>
-
-    <fo:simple-page-master master-name="back-even"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$margin.left.outer}"
-                           margin-right="{$page.margin.inner}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">back-even</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.back}"
-                      column-count="{$column.count.back}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-even"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-even"
-                       extent="{$region.after.extent}"
-                       display-align="after"/>
-    </fo:simple-page-master>
-
-    <!-- index pages -->
-    <fo:simple-page-master master-name="index-first"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$page.margin.inner}"
-                           margin-right="{$page.margin.outer}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">index-first</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.index}"
-                      column-count="{$column.count.index}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-first"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-first"
-                       extent="{$region.after.extent}"
-                       display-align="after"/>
-    </fo:simple-page-master>
-
-    <fo:simple-page-master master-name="index-odd"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$page.margin.inner}"
-                           margin-right="{$page.margin.outer}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">index-odd</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.index}"
-                      column-count="{$column.count.index}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-odd"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-odd"
-                       extent="{$region.after.extent}"
-                       display-align="after"/>
-    </fo:simple-page-master>
-
-    <fo:simple-page-master master-name="index-even"
-                           page-width="{$page.width}"
-                           page-height="{$page.height}"
-                           margin-top="{$page.margin.top}"
-                           margin-bottom="{$page.margin.bottom}"
-                           margin-left="{$page.margin.outer}"
-                           margin-right="{$page.margin.inner}">
-      <xsl:if test="$axf.extensions != 0">
-        <xsl:call-template name="axf-page-master-properties">
-          <xsl:with-param name="page.master">index-even</xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-      <fo:region-body margin-bottom="{$body.margin.bottom}"
-                      margin-top="{$body.margin.top}"
-                      column-gap="{$column.gap.index}"
-                      column-count="{$column.count.index}">
-      </fo:region-body>
-      <fo:region-before region-name="xsl-region-before-even"
-                        extent="{$region.before.extent}"
-                        display-align="before"/>
-      <fo:region-after region-name="xsl-region-after-even"
-                       extent="{$region.after.extent}"
-                       display-align="after"/>
-    </fo:simple-page-master>
-
-    <xsl:if test="$draft.mode != 'no'">
-      <!-- draft blank pages -->
-      <fo:simple-page-master master-name="blank-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.outer}"
-                             margin-right="{$page.margin.inner}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">blank-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-blank"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-blank"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <!-- draft title pages -->
-      <fo:simple-page-master master-name="titlepage-first-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.inner}"
-                             margin-right="{$page.margin.outer}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">titlepage-first-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.titlepage}"
-                        column-count="{$column.count.titlepage}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-first"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-first"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <fo:simple-page-master master-name="titlepage-odd-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.inner}"
-                             margin-right="{$page.margin.outer}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">titlepage-odd-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.titlepage}"
-                        column-count="{$column.count.titlepage}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-odd"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-odd"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <fo:simple-page-master master-name="titlepage-even-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.outer}"
-                             margin-right="{$page.margin.inner}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">titlepage-even-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.titlepage}"
-                        column-count="{$column.count.titlepage}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-even"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-even"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <!-- draft list-of-title pages -->
-      <fo:simple-page-master master-name="lot-first-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.inner}"
-                             margin-right="{$page.margin.outer}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">lot-first-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.lot}"
-                        column-count="{$column.count.lot}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-first"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-first"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <fo:simple-page-master master-name="lot-odd-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.inner}"
-                             margin-right="{$page.margin.outer}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">lot-odd-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.lot}"
-                        column-count="{$column.count.lot}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-odd"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-odd"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <fo:simple-page-master master-name="lot-even-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.outer}"
-                             margin-right="{$page.margin.inner}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">lot-even-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.lot}"
-                        column-count="{$column.count.lot}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-even"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-even"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <!-- draft frontmatter pages -->
-      <fo:simple-page-master master-name="front-first-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.inner}"
-                             margin-right="{$page.margin.outer}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">front-first-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.front}"
-                        column-count="{$column.count.front}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-first"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-first"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <fo:simple-page-master master-name="front-odd-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.inner}"
-                             margin-right="{$page.margin.outer}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">front-odd-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.front}"
-                        column-count="{$column.count.front}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-odd"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-odd"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <fo:simple-page-master master-name="front-even-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.outer}"
-                             margin-right="{$page.margin.inner}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">front-even-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.front}"
-                        column-count="{$column.count.front}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-even"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-even"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <!-- draft body pages -->
-      <fo:simple-page-master master-name="body-first-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.inner}"
-                             margin-right="{$page.margin.outer}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">body-first-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.body}"
-                        column-count="{$column.count.body}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-first"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-first"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <fo:simple-page-master master-name="body-odd-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.inner}"
-                             margin-right="{$page.margin.outer}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">body-odd-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.body}"
-                        column-count="{$column.count.body}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-odd"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-odd"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <fo:simple-page-master master-name="body-even-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.outer}"
-                             margin-right="{$page.margin.inner}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">body-even-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.body}"
-                        column-count="{$column.count.body}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-even"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-even"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <!-- draft backmatter pages -->
-      <fo:simple-page-master master-name="back-first-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.inner}"
-                             margin-right="{$page.margin.outer}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">back-first-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.back}"
-                        column-count="{$column.count.back}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-first"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-first"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <fo:simple-page-master master-name="back-odd-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.inner}"
-                             margin-right="{$page.margin.outer}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">back-odd-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.back}"
-                        column-count="{$column.count.back}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-odd"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-odd"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <fo:simple-page-master master-name="back-even-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$margin.left.outer}"
-                             margin-right="{$page.margin.inner}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">back-even-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.back}"
-                        column-count="{$column.count.back}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-even"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-even"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <!-- draft index pages -->
-      <fo:simple-page-master master-name="index-first-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$page.margin.inner}"
-                             margin-right="{$page.margin.outer}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">index-first-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.index}"
-                        column-count="{$column.count.index}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-first"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-first"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <fo:simple-page-master master-name="index-odd-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-left="{$page.margin.inner}"
-                             margin-right="{$page.margin.outer}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">index-odd-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.index}"
-                        column-count="{$column.count.index}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-odd"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-odd"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-
-      <fo:simple-page-master master-name="index-even-draft"
-                             page-width="{$page.width}"
-                             page-height="{$page.height}"
-                             margin-top="{$page.margin.top}"
-                             margin-bottom="{$page.margin.bottom}"
-                             margin-right="{$page.margin.inner}"
-                             margin-left="{$page.margin.outer}">
-        <xsl:if test="$axf.extensions != 0">
-          <xsl:call-template name="axf-page-master-properties">
-            <xsl:with-param name="page.master">index-even-draft</xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:region-body margin-bottom="{$body.margin.bottom}"
-                        margin-top="{$body.margin.top}"
-                        column-gap="{$column.gap.index}"
-                        column-count="{$column.count.index}">
-          <xsl:if test="$draft.watermark.image != ''">
-            <xsl:attribute name="background-image">
-              <xsl:call-template name="fo-external-image">
-                <xsl:with-param name="filename" select="$draft.watermark.image"/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:attribute name="background-attachment">fixed</xsl:attribute>
-            <xsl:attribute name="background-repeat">no-repeat</xsl:attribute>
-            <xsl:attribute name="background-position-horizontal">center</xsl:attribute>
-            <xsl:attribute name="background-position-vertical">center</xsl:attribute>
-          </xsl:if>
-        </fo:region-body>
-        <fo:region-before region-name="xsl-region-before-even"
-                          extent="{$region.before.extent}"
-                          display-align="before"/>
-        <fo:region-after region-name="xsl-region-after-even"
-                         extent="{$region.after.extent}"
-                         display-align="after"/>
-      </fo:simple-page-master>
-    </xsl:if>
-
-    <!-- setup for title page(s) -->
-    <fo:page-sequence-master master-name="titlepage">
-      <fo:repeatable-page-master-alternatives>
-        <fo:conditional-page-master-reference master-reference="blank"
-                                              blank-or-not-blank="blank"/>
-        <fo:conditional-page-master-reference master-reference="titlepage-first"
-                                              page-position="first"/>
-        <fo:conditional-page-master-reference master-reference="titlepage-odd"
-                                              odd-or-even="odd"/>
-        <fo:conditional-page-master-reference 
-                                              odd-or-even="even">
-          <xsl:attribute name="master-reference">
-            <xsl:choose>
-              <xsl:when test="$double.sided != 0">titlepage-even</xsl:when>
-              <xsl:otherwise>titlepage-odd</xsl:otherwise>
-            </xsl:choose>
-          </xsl:attribute>
-        </fo:conditional-page-master-reference>
-      </fo:repeatable-page-master-alternatives>
-    </fo:page-sequence-master>
-
-    <!-- setup for lots -->
-    <fo:page-sequence-master master-name="lot">
-      <fo:repeatable-page-master-alternatives>
-        <fo:conditional-page-master-reference master-reference="blank"
-                                              blank-or-not-blank="blank"/>
-        <fo:conditional-page-master-reference master-reference="lot-first"
-                                              page-position="first"/>
-        <fo:conditional-page-master-reference master-reference="lot-odd"
-                                              odd-or-even="odd"/>
-        <fo:conditional-page-master-reference 
-                                              odd-or-even="even">
-          <xsl:attribute name="master-reference">
-            <xsl:choose>
-              <xsl:when test="$double.sided != 0">lot-even</xsl:when>
-              <xsl:otherwise>lot-odd</xsl:otherwise>
-            </xsl:choose>
-          </xsl:attribute>
-        </fo:conditional-page-master-reference>
-      </fo:repeatable-page-master-alternatives>
-    </fo:page-sequence-master>
-
-    <!-- setup front matter -->
-    <fo:page-sequence-master master-name="front">
-      <fo:repeatable-page-master-alternatives>
-        <fo:conditional-page-master-reference master-reference="blank"
-                                              blank-or-not-blank="blank"/>
-        <fo:conditional-page-master-reference master-reference="front-first"
-                                              page-position="first"/>
-        <fo:conditional-page-master-reference master-reference="front-odd"
-                                              odd-or-even="odd"/>
-        <fo:conditional-page-master-reference 
-                                              odd-or-even="even">
-          <xsl:attribute name="master-reference">
-            <xsl:choose>
-              <xsl:when test="$double.sided != 0">front-even</xsl:when>
-              <xsl:otherwise>front-odd</xsl:otherwise>
-            </xsl:choose>
-          </xsl:attribute>
-        </fo:conditional-page-master-reference>
-      </fo:repeatable-page-master-alternatives>
-    </fo:page-sequence-master>
-
-    <!-- setup for body pages -->
-    <fo:page-sequence-master master-name="body">
-      <fo:repeatable-page-master-alternatives>
-        <fo:conditional-page-master-reference master-reference="blank"
-                                              blank-or-not-blank="blank"/>
-        <fo:conditional-page-master-reference master-reference="body-first"
-                                              page-position="first"/>
-        <fo:conditional-page-master-reference master-reference="body-odd"
-                                              odd-or-even="odd"/>
-        <fo:conditional-page-master-reference 
-                                              odd-or-even="even">
-          <xsl:attribute name="master-reference">
-            <xsl:choose>
-              <xsl:when test="$double.sided != 0">body-even</xsl:when>
-              <xsl:otherwise>body-odd</xsl:otherwise>
-            </xsl:choose>
-          </xsl:attribute>
-        </fo:conditional-page-master-reference>
-      </fo:repeatable-page-master-alternatives>
-    </fo:page-sequence-master>
-
-    <!-- setup back matter -->
-    <fo:page-sequence-master master-name="back">
-      <fo:repeatable-page-master-alternatives>
-        <fo:conditional-page-master-reference master-reference="blank"
-                                              blank-or-not-blank="blank"/>
-        <fo:conditional-page-master-reference master-reference="back-first"
-                                              page-position="first"/>
-        <fo:conditional-page-master-reference master-reference="back-odd"
-                                              odd-or-even="odd"/>
-        <fo:conditional-page-master-reference 
-                                              odd-or-even="even">
-          <xsl:attribute name="master-reference">
-            <xsl:choose>
-              <xsl:when test="$double.sided != 0">back-even</xsl:when>
-              <xsl:otherwise>back-odd</xsl:otherwise>
-            </xsl:choose>
-          </xsl:attribute>
-        </fo:conditional-page-master-reference>
-      </fo:repeatable-page-master-alternatives>
-    </fo:page-sequence-master>
-
-    <!-- setup back matter -->
-    <fo:page-sequence-master master-name="index">
-      <fo:repeatable-page-master-alternatives>
-        <fo:conditional-page-master-reference master-reference="blank"
-                                              blank-or-not-blank="blank"/>
-        <fo:conditional-page-master-reference master-reference="index-first"
-                                              page-position="first"/>
-        <fo:conditional-page-master-reference master-reference="index-odd"
-                                              odd-or-even="odd"/>
-        <fo:conditional-page-master-reference 
-                                              odd-or-even="even">
-          <xsl:attribute name="master-reference">
-            <xsl:choose>
-              <xsl:when test="$double.sided != 0">index-even</xsl:when>
-              <xsl:otherwise>index-odd</xsl:otherwise>
-            </xsl:choose>
-          </xsl:attribute>
-        </fo:conditional-page-master-reference>
-      </fo:repeatable-page-master-alternatives>
-    </fo:page-sequence-master>
-
-    <xsl:if test="$draft.mode != 'no'">
-      <!-- setup for draft title page(s) -->
-      <fo:page-sequence-master master-name="titlepage-draft">
-        <fo:repeatable-page-master-alternatives>
-          <fo:conditional-page-master-reference master-reference="blank-draft"
-                                                blank-or-not-blank="blank"/>
-          <fo:conditional-page-master-reference master-reference="titlepage-first-draft"
-                                                page-position="first"/>
-          <fo:conditional-page-master-reference master-reference="titlepage-odd-draft"
-                                                odd-or-even="odd"/>
-          <fo:conditional-page-master-reference 
-                                                odd-or-even="even">
-            <xsl:attribute name="master-reference">
-              <xsl:choose>
-                <xsl:when test="$double.sided != 0">titlepage-even-draft</xsl:when>
-                <xsl:otherwise>titlepage-odd-draft</xsl:otherwise>
-              </xsl:choose>
-            </xsl:attribute>
-          </fo:conditional-page-master-reference>
-        </fo:repeatable-page-master-alternatives>
-      </fo:page-sequence-master>
-
-      <!-- setup for draft lots -->
-      <fo:page-sequence-master master-name="lot-draft">
-        <fo:repeatable-page-master-alternatives>
-          <fo:conditional-page-master-reference master-reference="blank-draft"
-                                                blank-or-not-blank="blank"/>
-          <fo:conditional-page-master-reference master-reference="lot-first-draft"
-                                                page-position="first"/>
-          <fo:conditional-page-master-reference master-reference="lot-odd-draft"
-                                                odd-or-even="odd"/>
-          <fo:conditional-page-master-reference 
-                                                odd-or-even="even">
-            <xsl:attribute name="master-reference">
-              <xsl:choose>
-                <xsl:when test="$double.sided != 0">lot-even-draft</xsl:when>
-                <xsl:otherwise>lot-odd-draft</xsl:otherwise>
-              </xsl:choose>
-            </xsl:attribute>
-          </fo:conditional-page-master-reference>
-        </fo:repeatable-page-master-alternatives>
-      </fo:page-sequence-master>
-
-      <!-- setup draft front matter -->
-      <fo:page-sequence-master master-name="front-draft">
-        <fo:repeatable-page-master-alternatives>
-          <fo:conditional-page-master-reference master-reference="blank-draft"
-                                                blank-or-not-blank="blank"/>
-          <fo:conditional-page-master-reference master-reference="front-first-draft"
-                                                page-position="first"/>
-          <fo:conditional-page-master-reference master-reference="front-odd-draft"
-                                                odd-or-even="odd"/>
-          <fo:conditional-page-master-reference 
-                                                odd-or-even="even">
-            <xsl:attribute name="master-reference">
-              <xsl:choose>
-                <xsl:when test="$double.sided != 0">front-even-draft</xsl:when>
-                <xsl:otherwise>front-odd-draft</xsl:otherwise>
-              </xsl:choose>
-            </xsl:attribute>
-          </fo:conditional-page-master-reference>
-        </fo:repeatable-page-master-alternatives>
-      </fo:page-sequence-master>
-
-      <!-- setup for draft body pages -->
-      <fo:page-sequence-master master-name="body-draft">
-        <fo:repeatable-page-master-alternatives>
-          <fo:conditional-page-master-reference master-reference="blank-draft"
-                                                blank-or-not-blank="blank"/>
-          <fo:conditional-page-master-reference master-reference="body-first-draft"
-                                                page-position="first"/>
-          <fo:conditional-page-master-reference master-reference="body-odd-draft"
-                                                odd-or-even="odd"/>
-          <fo:conditional-page-master-reference 
-                                                odd-or-even="even">
-            <xsl:attribute name="master-reference">
-              <xsl:choose>
-                <xsl:when test="$double.sided != 0">body-even-draft</xsl:when>
-                <xsl:otherwise>body-odd-draft</xsl:otherwise>
-              </xsl:choose>
-            </xsl:attribute>
-          </fo:conditional-page-master-reference>
-        </fo:repeatable-page-master-alternatives>
-      </fo:page-sequence-master>
-
-      <!-- setup draft back matter -->
-      <fo:page-sequence-master master-name="back-draft">
-        <fo:repeatable-page-master-alternatives>
-          <fo:conditional-page-master-reference master-reference="blank-draft"
-                                                blank-or-not-blank="blank"/>
-          <fo:conditional-page-master-reference master-reference="back-first-draft"
-                                                page-position="first"/>
-          <fo:conditional-page-master-reference master-reference="back-odd-draft"
-                                                odd-or-even="odd"/>
-          <fo:conditional-page-master-reference 
-                                                odd-or-even="even">
-            <xsl:attribute name="master-reference">
-              <xsl:choose>
-                <xsl:when test="$double.sided != 0">back-even-draft</xsl:when>
-                <xsl:otherwise>back-odd-draft</xsl:otherwise>
-              </xsl:choose>
-            </xsl:attribute>
-          </fo:conditional-page-master-reference>
-        </fo:repeatable-page-master-alternatives>
-      </fo:page-sequence-master>
-
-      <!-- setup draft index pages -->
-      <fo:page-sequence-master master-name="index-draft">
-        <fo:repeatable-page-master-alternatives>
-          <fo:conditional-page-master-reference master-reference="blank-draft"
-                                                blank-or-not-blank="blank"/>
-          <fo:conditional-page-master-reference master-reference="index-first-draft"
-                                                page-position="first"/>
-          <fo:conditional-page-master-reference master-reference="index-odd-draft"
-                                                odd-or-even="odd"/>
-          <fo:conditional-page-master-reference 
-                                                odd-or-even="even">
-            <xsl:attribute name="master-reference">
-              <xsl:choose>
-                <xsl:when test="$double.sided != 0">index-even-draft</xsl:when>
-                <xsl:otherwise>index-odd-draft</xsl:otherwise>
-              </xsl:choose>
-            </xsl:attribute>
-          </fo:conditional-page-master-reference>
-        </fo:repeatable-page-master-alternatives>
-      </fo:page-sequence-master>
-    </xsl:if>
-
-    <xsl:call-template name="user.pagemasters"/>
-
-    </fo:layout-master-set>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="user.pagemasters"/> <!-- intentionally empty -->
-
-<!-- ==================================================================== -->
-
-<xsl:template name="select.pagemaster">
-  <xsl:param name="element" select="local-name(.)"/>
-  <xsl:param name="pageclass" select="''"/>
-
-  <xsl:variable name="pagemaster">
-    <xsl:choose>
-      <xsl:when test="$pageclass != ''">
-        <xsl:value-of select="$pageclass"/>
-      </xsl:when>
-      <xsl:when test="$pageclass = 'lot'">lot</xsl:when>
-      <xsl:when test="$element = 'dedication'">front</xsl:when>
-      <xsl:when test="$element = 'preface'">front</xsl:when>
-      <xsl:when test="$element = 'appendix'">back</xsl:when>
-      <xsl:when test="$element = 'glossary'">back</xsl:when>
-      <xsl:when test="$element = 'bibliography'">back</xsl:when>
-      <xsl:when test="$element = 'index'">index</xsl:when>
-      <xsl:when test="$element = 'colophon'">back</xsl:when>
-      <xsl:otherwise>body</xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:choose>
-      <xsl:when test="$draft.mode = 'yes'">
-        <xsl:text>-draft</xsl:text>
-      </xsl:when>
-      <xsl:when test="$draft.mode = 'no'">
-        <!-- nop -->
-      </xsl:when>
-      <xsl:when test="ancestor-or-self::*[@status][1]/@status = 'draft'">
-        <xsl:text>-draft</xsl:text>
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- nop -->
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:call-template name="select.user.pagemaster">
-    <xsl:with-param name="element" select="$element"/>
-    <xsl:with-param name="pageclass" select="$pageclass"/>
-    <xsl:with-param name="default-pagemaster" select="$pagemaster"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="select.user.pagemaster">
-  <xsl:param name="element"/>
-  <xsl:param name="pageclass"/>
-  <xsl:param name="default-pagemaster"/>
-
-  <!-- by default, return the default. But if you've created your own
-       pagemasters in user.pagemasters, you might want to select one here. -->
-  <xsl:value-of select="$default-pagemaster"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="head.sep.rule">
-  <xsl:param name="pageclass"/>
-  <xsl:param name="sequence"/>
-  <xsl:param name="gentext-key"/>
-
-  <xsl:if test="$header.rule != 0">
-    <xsl:attribute name="border-bottom-width">0.5pt</xsl:attribute>
-    <xsl:attribute name="border-bottom-style">solid</xsl:attribute>
-    <xsl:attribute name="border-bottom-color">black</xsl:attribute>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="foot.sep.rule">
-  <xsl:param name="pageclass"/>
-  <xsl:param name="sequence"/>
-  <xsl:param name="gentext-key"/>
-
-  <xsl:if test="$footer.rule != 0">
-    <xsl:attribute name="border-top-width">0.5pt</xsl:attribute>
-    <xsl:attribute name="border-top-style">solid</xsl:attribute>
-    <xsl:attribute name="border-top-color">black</xsl:attribute>
-  </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="running.head.mode">
-  <xsl:param name="master-reference" select="'unknown'"/>
-  <xsl:param name="gentext-key" select="local-name(.)"/>
-
-  <!-- remove -draft from reference -->
-  <xsl:variable name="pageclass">
-    <xsl:choose>
-      <xsl:when test="contains($master-reference, '-draft')">
-        <xsl:value-of select="substring-before($master-reference, '-draft')"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$master-reference"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <fo:static-content flow-name="xsl-region-before-first">
-    <fo:block xsl:use-attribute-sets="header.content.properties">
-      <xsl:call-template name="header.table">
-        <xsl:with-param name="pageclass" select="$pageclass"/>
-        <xsl:with-param name="sequence" select="'first'"/>
-        <xsl:with-param name="gentext-key" select="$gentext-key"/>
-      </xsl:call-template>
-    </fo:block>
-  </fo:static-content>
-
-  <fo:static-content flow-name="xsl-region-before-odd">
-    <fo:block xsl:use-attribute-sets="header.content.properties">
-      <xsl:call-template name="header.table">
-        <xsl:with-param name="pageclass" select="$pageclass"/>
-        <xsl:with-param name="sequence" select="'odd'"/>
-        <xsl:with-param name="gentext-key" select="$gentext-key"/>
-      </xsl:call-template>
-    </fo:block>
-  </fo:static-content>
-
-  <fo:static-content flow-name="xsl-region-before-even">
-    <fo:block xsl:use-attribute-sets="header.content.properties">
-      <xsl:call-template name="header.table">
-        <xsl:with-param name="pageclass" select="$pageclass"/>
-        <xsl:with-param name="sequence" select="'even'"/>
-        <xsl:with-param name="gentext-key" select="$gentext-key"/>
-      </xsl:call-template>
-    </fo:block>
-  </fo:static-content>
-
-  <fo:static-content flow-name="xsl-region-before-blank">
-    <fo:block xsl:use-attribute-sets="header.content.properties">
-      <xsl:call-template name="header.table">
-        <xsl:with-param name="pageclass" select="$pageclass"/>
-        <xsl:with-param name="sequence" select="'blank'"/>
-        <xsl:with-param name="gentext-key" select="$gentext-key"/>
-      </xsl:call-template>
-    </fo:block>
-  </fo:static-content>
-
-  <xsl:call-template name="footnote-separator"/>
-
-  <xsl:if test="$fop.extensions = 0 and $fop1.extensions = 0">
-    <xsl:call-template name="blank.page.content"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="footnote-separator">
-  <fo:static-content flow-name="xsl-footnote-separator">
-    <fo:block>
-      <fo:leader xsl:use-attribute-sets="footnote.sep.leader.properties"/>
-    </fo:block>
-  </fo:static-content>
-</xsl:template>
-
-<xsl:template name="blank.page.content">
-  <fo:static-content flow-name="blank-body">
-    <fo:block text-align="center"/>
-  </fo:static-content>
-</xsl:template>
-
-<xsl:template name="header.table">
-  <xsl:param name="pageclass" select="''"/>
-  <xsl:param name="sequence" select="''"/>
-  <xsl:param name="gentext-key" select="''"/>
-
-  <!-- default is a single table style for all headers -->
-  <!-- Customize it for different page classes or sequence location -->
-
-  <xsl:choose>
-      <xsl:when test="$pageclass = 'index'">
-          <xsl:attribute name="margin-left">0pt</xsl:attribute>
-      </xsl:when>
-  </xsl:choose>
-
-  <xsl:variable name="column1">
-    <xsl:choose>
-      <xsl:when test="$double.sided = 0">1</xsl:when>
-      <xsl:when test="$sequence = 'first' or $sequence = 'odd'">1</xsl:when>
-      <xsl:otherwise>3</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="column3">
-    <xsl:choose>
-      <xsl:when test="$double.sided = 0">3</xsl:when>
-      <xsl:when test="$sequence = 'first' or $sequence = 'odd'">3</xsl:when>
-      <xsl:otherwise>1</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="candidate">
-    <fo:table xsl:use-attribute-sets="header.table.properties">
-      <xsl:call-template name="head.sep.rule">
-        <xsl:with-param name="pageclass" select="$pageclass"/>
-        <xsl:with-param name="sequence" select="$sequence"/>
-        <xsl:with-param name="gentext-key" select="$gentext-key"/>
-      </xsl:call-template>
-
-      <fo:table-column column-number="1">
-        <xsl:attribute name="column-width">
-          <xsl:text>proportional-column-width(</xsl:text>
-          <xsl:call-template name="header.footer.width">
-            <xsl:with-param name="location">header</xsl:with-param>
-            <xsl:with-param name="position" select="$column1"/>
-          </xsl:call-template>
-          <xsl:text>)</xsl:text>
-        </xsl:attribute>
-      </fo:table-column>
-      <fo:table-column column-number="2">
-        <xsl:attribute name="column-width">
-          <xsl:text>proportional-column-width(</xsl:text>
-          <xsl:call-template name="header.footer.width">
-            <xsl:with-param name="location">header</xsl:with-param>
-            <xsl:with-param name="position" select="2"/>
-          </xsl:call-template>
-          <xsl:text>)</xsl:text>
-        </xsl:attribute>
-      </fo:table-column>
-      <fo:table-column column-number="3">
-        <xsl:attribute name="column-width">
-          <xsl:text>proportional-column-width(</xsl:text>
-          <xsl:call-template name="header.footer.width">
-            <xsl:with-param name="location">header</xsl:with-param>
-            <xsl:with-param name="position" select="$column3"/>
-          </xsl:call-template>
-          <xsl:text>)</xsl:text>
-        </xsl:attribute>
-      </fo:table-column>
-
-      <fo:table-body>
-        <fo:table-row>
-          <xsl:attribute name="block-progression-dimension.minimum">
-            <xsl:value-of select="$header.table.height"/>
-          </xsl:attribute>
-          <fo:table-cell text-align="left"
-                         display-align="before">
-            <xsl:if test="$fop.extensions = 0">
-              <xsl:attribute name="relative-align">baseline</xsl:attribute>
-            </xsl:if>
-            <fo:block>
-              <xsl:call-template name="header.content">
-                <xsl:with-param name="pageclass" select="$pageclass"/>
-                <xsl:with-param name="sequence" select="$sequence"/>
-                <xsl:with-param name="position" select="'left'"/>
-                <xsl:with-param name="gentext-key" select="$gentext-key"/>
-              </xsl:call-template>
-            </fo:block>
-          </fo:table-cell>
-          <fo:table-cell text-align="center"
-                         display-align="before">
-            <xsl:if test="$fop.extensions = 0">
-              <xsl:attribute name="relative-align">baseline</xsl:attribute>
-            </xsl:if>
-            <fo:block>
-              <xsl:call-template name="header.content">
-                <xsl:with-param name="pageclass" select="$pageclass"/>
-                <xsl:with-param name="sequence" select="$sequence"/>
-                <xsl:with-param name="position" select="'center'"/>
-                <xsl:with-param name="gentext-key" select="$gentext-key"/>
-              </xsl:call-template>
-            </fo:block>
-          </fo:table-cell>
-          <fo:table-cell text-align="right"
-                         display-align="before">
-            <xsl:if test="$fop.extensions = 0">
-              <xsl:attribute name="relative-align">baseline</xsl:attribute>
-            </xsl:if>
-            <fo:block>
-              <xsl:call-template name="header.content">
-                <xsl:with-param name="pageclass" select="$pageclass"/>
-                <xsl:with-param name="sequence" select="$sequence"/>
-                <xsl:with-param name="position" select="'right'"/>
-                <xsl:with-param name="gentext-key" select="$gentext-key"/>
-              </xsl:call-template>
-            </fo:block>
-          </fo:table-cell>
-        </fo:table-row>
-      </fo:table-body>
-    </fo:table>
-  </xsl:variable>
-
-  <!-- Really output a header? -->
-  <xsl:choose>
-    <xsl:when test="$pageclass = 'titlepage' and $gentext-key = 'book'
-                    and $sequence='first'">
-      <!-- no, book titlepages have no headers at all -->
-    </xsl:when>
-    <xsl:when test="$sequence = 'blank' and $headers.on.blank.pages = 0">
-      <!-- no output -->
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$candidate"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="header.content">
-  <xsl:param name="pageclass" select="''"/>
-  <xsl:param name="sequence" select="''"/>
-  <xsl:param name="position" select="''"/>
-  <xsl:param name="gentext-key" select="''"/>
-
-<!--
-  <fo:block>
-    <xsl:value-of select="$pageclass"/>
-    <xsl:text>, </xsl:text>
-    <xsl:value-of select="$sequence"/>
-    <xsl:text>, </xsl:text>
-    <xsl:value-of select="$position"/>
-    <xsl:text>, </xsl:text>
-    <xsl:value-of select="$gentext-key"/>
-  </fo:block>
--->
-
-  <fo:block>
-
-    <!-- sequence can be odd, even, first, blank -->
-    <!-- position can be left, center, right -->
-    <xsl:choose>
-      <xsl:when test="$sequence = 'blank'">
-        <!-- nothing -->
-      </xsl:when>
-
-      <xsl:when test="$position='left'">
-        <!-- Same for odd, even, empty, and blank sequences -->
-        <xsl:call-template name="draft.text"/>
-      </xsl:when>
-
-      <xsl:when test="($sequence='odd' or $sequence='even') and $position='center'">
-        <xsl:if test="$pageclass != 'titlepage'">
-          <xsl:choose>
-            <xsl:when test="ancestor::book and ($double.sided != 0)">
-              <fo:retrieve-marker retrieve-class-name="section.head.marker"
-                                  retrieve-position="first-including-carryover"
-                                  retrieve-boundary="page-sequence"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:if>
-      </xsl:when>
-
-      <xsl:when test="$position='center'">
-        <!-- nothing for empty and blank sequences -->
-      </xsl:when>
-
-      <xsl:when test="$position='right'">
-        <!-- Same for odd, even, empty, and blank sequences -->
-        <xsl:call-template name="draft.text"/>
-      </xsl:when>
-
-      <xsl:when test="$sequence = 'first'">
-        <!-- nothing for first pages -->
-      </xsl:when>
-
-      <xsl:when test="$sequence = 'blank'">
-        <!-- nothing for blank pages -->
-      </xsl:when>
-    </xsl:choose>
-  </fo:block>
-</xsl:template>
-
-<xsl:template name="header.footer.width">
-  <xsl:param name="location" select="'header'"/>
-  <xsl:param name="position" select="1"/>
-
-  <xsl:variable name="width.set">
-    <xsl:choose>
-      <xsl:when test="$location = 'header'">
-        <xsl:value-of select="normalize-space($header.column.widths)"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="normalize-space($footer.column.widths)"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-
-  <xsl:variable name="width">
-    <xsl:choose>
-      <xsl:when test="$position = 1">
-        <xsl:value-of select="substring-before($width.set, ' ')"/>
-      </xsl:when>
-      <xsl:when test="$position = 2">
-        <xsl:value-of select="substring-before(substring-after($width.set, ' '), ' ')"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="substring-after(substring-after($width.set, ' '), ' ')"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <!-- Make sure it is a number -->
-  <xsl:choose>
-    <xsl:when test = "$width = number($width)">
-      <xsl:value-of select="$width"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message>Error: value in <xsl:value-of select="$location"/>.column.widths at position <xsl:value-of select="$position"/> is not a number.</xsl:message>
-      <xsl:text>1</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="draft.text">
-  <xsl:choose>
-    <xsl:when test="$draft.mode = 'yes'">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'Draft'"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$draft.mode = 'no'">
-      <!-- nop -->
-    </xsl:when>
-    <xsl:when test="ancestor-or-self::*[@status][1]/@status = 'draft'">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'Draft'"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- nop -->
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="running.foot.mode">
-  <xsl:param name="master-reference" select="'unknown'"/>
-  <xsl:param name="gentext-key" select="local-name(.)"/>
-
-  <!-- remove -draft from reference -->
-  <xsl:variable name="pageclass">
-    <xsl:choose>
-      <xsl:when test="contains($master-reference, '-draft')">
-        <xsl:value-of select="substring-before($master-reference, '-draft')"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$master-reference"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <fo:static-content flow-name="xsl-region-after-first">
-    <fo:block xsl:use-attribute-sets="footer.content.properties">
-      <xsl:call-template name="footer.table">
-        <xsl:with-param name="pageclass" select="$pageclass"/>
-        <xsl:with-param name="sequence" select="'first'"/>
-        <xsl:with-param name="gentext-key" select="$gentext-key"/>
-      </xsl:call-template>
-    </fo:block>
-  </fo:static-content>
-
-  <fo:static-content flow-name="xsl-region-after-odd">
-    <fo:block xsl:use-attribute-sets="footer.content.properties">
-      <xsl:call-template name="footer.table">
-        <xsl:with-param name="pageclass" select="$pageclass"/>
-        <xsl:with-param name="sequence" select="'odd'"/>
-        <xsl:with-param name="gentext-key" select="$gentext-key"/>
-      </xsl:call-template>
-    </fo:block>
-  </fo:static-content>
-
-  <fo:static-content flow-name="xsl-region-after-even">
-    <fo:block xsl:use-attribute-sets="footer.content.properties">
-      <xsl:call-template name="footer.table">
-        <xsl:with-param name="pageclass" select="$pageclass"/>
-        <xsl:with-param name="sequence" select="'even'"/>
-        <xsl:with-param name="gentext-key" select="$gentext-key"/>
-      </xsl:call-template>
-    </fo:block>
-  </fo:static-content>
-
-  <fo:static-content flow-name="xsl-region-after-blank">
-    <fo:block xsl:use-attribute-sets="footer.content.properties">
-      <xsl:call-template name="footer.table">
-        <xsl:with-param name="pageclass" select="$pageclass"/>
-        <xsl:with-param name="sequence" select="'blank'"/>
-        <xsl:with-param name="gentext-key" select="$gentext-key"/>
-      </xsl:call-template>
-    </fo:block>
-  </fo:static-content>
-</xsl:template>
-
-<xsl:template name="footer.table">
-  <xsl:param name="pageclass" select="''"/>
-  <xsl:param name="sequence" select="''"/>
-  <xsl:param name="gentext-key" select="''"/>
-
-  <!-- default is a single table style for all footers -->
-  <!-- Customize it for different page classes or sequence location -->
-
-  <xsl:choose>
-      <xsl:when test="$pageclass = 'index'">
-          <xsl:attribute name="margin-left">0pt</xsl:attribute>
-      </xsl:when>
-  </xsl:choose>
-
-  <xsl:variable name="column1">
-    <xsl:choose>
-      <xsl:when test="$double.sided = 0">1</xsl:when>
-      <xsl:when test="$sequence = 'first' or $sequence = 'odd'">1</xsl:when>
-      <xsl:otherwise>3</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="column3">
-    <xsl:choose>
-      <xsl:when test="$double.sided = 0">3</xsl:when>
-      <xsl:when test="$sequence = 'first' or $sequence = 'odd'">3</xsl:when>
-      <xsl:otherwise>1</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="candidate">
-    <fo:table xsl:use-attribute-sets="footer.table.properties">
-      <xsl:call-template name="foot.sep.rule">
-        <xsl:with-param name="pageclass" select="$pageclass"/>
-        <xsl:with-param name="sequence" select="$sequence"/>
-        <xsl:with-param name="gentext-key" select="$gentext-key"/>
-      </xsl:call-template>
-      <fo:table-column column-number="1">
-        <xsl:attribute name="column-width">
-          <xsl:text>proportional-column-width(</xsl:text>
-          <xsl:call-template name="header.footer.width">
-            <xsl:with-param name="location">footer</xsl:with-param>
-            <xsl:with-param name="position" select="$column1"/>
-          </xsl:call-template>
-          <xsl:text>)</xsl:text>
-        </xsl:attribute>
-      </fo:table-column>
-      <fo:table-column column-number="2">
-        <xsl:attribute name="column-width">
-          <xsl:text>proportional-column-width(</xsl:text>
-          <xsl:call-template name="header.footer.width">
-            <xsl:with-param name="location">footer</xsl:with-param>
-            <xsl:with-param name="position" select="2"/>
-          </xsl:call-template>
-          <xsl:text>)</xsl:text>
-        </xsl:attribute>
-      </fo:table-column>
-      <fo:table-column column-number="3">
-        <xsl:attribute name="column-width">
-          <xsl:text>proportional-column-width(</xsl:text>
-          <xsl:call-template name="header.footer.width">
-            <xsl:with-param name="location">footer</xsl:with-param>
-            <xsl:with-param name="position" select="$column3"/>
-          </xsl:call-template>
-          <xsl:text>)</xsl:text>
-        </xsl:attribute>
-      </fo:table-column>
-
-      <fo:table-body>
-        <fo:table-row>
-          <xsl:attribute name="block-progression-dimension.minimum">
-            <xsl:value-of select="$footer.table.height"/>
-          </xsl:attribute>
-          <fo:table-cell text-align="left"
-                         display-align="after">
-            <xsl:if test="$fop.extensions = 0">
-              <xsl:attribute name="relative-align">baseline</xsl:attribute>
-            </xsl:if>
-            <fo:block>
-              <xsl:call-template name="footer.content">
-                <xsl:with-param name="pageclass" select="$pageclass"/>
-                <xsl:with-param name="sequence" select="$sequence"/>
-                <xsl:with-param name="position" select="'left'"/>
-                <xsl:with-param name="gentext-key" select="$gentext-key"/>
-              </xsl:call-template>
-            </fo:block>
-          </fo:table-cell>
-          <fo:table-cell text-align="center"
-                         display-align="after">
-            <xsl:if test="$fop.extensions = 0">
-              <xsl:attribute name="relative-align">baseline</xsl:attribute>
-            </xsl:if>
-            <fo:block>
-              <xsl:call-template name="footer.content">
-                <xsl:with-param name="pageclass" select="$pageclass"/>
-                <xsl:with-param name="sequence" select="$sequence"/>
-                <xsl:with-param name="position" select="'center'"/>
-                <xsl:with-param name="gentext-key" select="$gentext-key"/>
-              </xsl:call-template>
-            </fo:block>
-          </fo:table-cell>
-          <fo:table-cell text-align="right"
-                         display-align="after">
-            <xsl:if test="$fop.extensions = 0">
-              <xsl:attribute name="relative-align">baseline</xsl:attribute>
-            </xsl:if>
-            <fo:block>
-              <xsl:call-template name="footer.content">
-                <xsl:with-param name="pageclass" select="$pageclass"/>
-                <xsl:with-param name="sequence" select="$sequence"/>
-                <xsl:with-param name="position" select="'right'"/>
-                <xsl:with-param name="gentext-key" select="$gentext-key"/>
-              </xsl:call-template>
-            </fo:block>
-          </fo:table-cell>
-        </fo:table-row>
-      </fo:table-body>
-    </fo:table>
-  </xsl:variable>
-
-  <!-- Really output a footer? -->
-  <xsl:choose>
-    <xsl:when test="$pageclass='titlepage' and $gentext-key='book'
-                    and $sequence='first'">
-      <!-- no, book titlepages have no footers at all -->
-    </xsl:when>
-    <xsl:when test="$sequence = 'blank' and $footers.on.blank.pages = 0">
-      <!-- no output -->
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$candidate"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="footer.content">
-  <xsl:param name="pageclass" select="''"/>
-  <xsl:param name="sequence" select="''"/>
-  <xsl:param name="position" select="''"/>
-  <xsl:param name="gentext-key" select="''"/>
-
-<!--
-  <fo:block>
-    <xsl:value-of select="$pageclass"/>
-    <xsl:text>, </xsl:text>
-    <xsl:value-of select="$sequence"/>
-    <xsl:text>, </xsl:text>
-    <xsl:value-of select="$position"/>
-    <xsl:text>, </xsl:text>
-    <xsl:value-of select="$gentext-key"/>
-  </fo:block>
--->
-
-  <fo:block>
-    <!-- pageclass can be front, body, back -->
-    <!-- sequence can be odd, even, first, blank -->
-    <!-- position can be left, center, right -->
-    <xsl:choose>
-      <xsl:when test="$pageclass = 'titlepage'">
-        <!-- nop; no footer on title pages -->
-      </xsl:when>
-
-      <xsl:when test="$double.sided != 0 and $sequence = 'even'
-                      and $position='left'">
-        <fo:page-number/>
-      </xsl:when>
-
-      <xsl:when test="$double.sided != 0 and ($sequence = 'odd' or $sequence = 'first')
-                      and $position='right'">
-        <fo:page-number/>
-      </xsl:when>
-
-      <xsl:when test="$double.sided = 0 and $position='center'">
-        <fo:page-number/>
-      </xsl:when>
-
-      <xsl:when test="$sequence='blank'">
-        <xsl:choose>
-          <xsl:when test="$double.sided != 0 and $position = 'left'">
-            <fo:page-number/>
-          </xsl:when>
-          <xsl:when test="$double.sided = 0 and $position = 'center'">
-            <fo:page-number/>
-          </xsl:when>
-          <xsl:otherwise>
-            <!-- nop -->
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-
-
-      <xsl:otherwise>
-        <!-- nop -->
-      </xsl:otherwise>
-    </xsl:choose>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="page.number.format">
-  <xsl:param name="element" select="local-name(.)"/>
-  <xsl:param name="master-reference" select="''"/>
-
-  <xsl:choose>
-    <xsl:when test="$element = 'toc' and self::book">i</xsl:when>
-    <xsl:when test="$element = 'preface'">i</xsl:when>
-    <xsl:when test="$element = 'dedication'">i</xsl:when>
-    <xsl:otherwise>1</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="initial.page.number">
-  <xsl:param name="element" select="local-name(.)"/>
-  <xsl:param name="master-reference" select="''"/>
-
-  <!-- Select the first content that the stylesheet places
-       after the TOC -->
-  <xsl:variable name="first.book.content" 
-                select="ancestor::book/*[
-                          not(self::title or
-                              self::subtitle or
-                              self::titleabbrev or
-                              self::bookinfo or
-                              self::info or
-                              self::dedication or
-                              self::preface or
-                              self::toc or
-                              self::lot)][1]"/>
-  <xsl:choose>
-    <!-- double-sided output -->
-    <xsl:when test="$double.sided != 0">
-      <xsl:choose>
-        <xsl:when test="$element = 'toc'">auto-odd</xsl:when>
-        <xsl:when test="$element = 'book'">1</xsl:when>
-        <!-- preface typically continues TOC roman numerals -->
-        <!-- Change page.number.format if not -->
-        <xsl:when test="$element = 'preface'">auto-odd</xsl:when>
-        <xsl:when test="($element = 'dedication' or $element = 'article') 
-                    and not(preceding::chapter
-                            or preceding::preface
-                            or preceding::appendix
-                            or preceding::article
-                            or preceding::dedication
-                            or parent::part
-                            or parent::reference)">1</xsl:when>
-        <xsl:when test="generate-id($first.book.content) =
-                        generate-id(.)">1</xsl:when>
-        <xsl:otherwise>auto-odd</xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <!-- single-sided output -->
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$element = 'toc'">auto</xsl:when>
-        <xsl:when test="$element = 'book'">1</xsl:when>
-        <xsl:when test="$element = 'preface'">auto</xsl:when>
-       <xsl:when test="($element = 'dedication' or $element = 'article') and
-                        not(preceding::chapter
-                            or preceding::preface
-                            or preceding::appendix
-                            or preceding::article
-                            or preceding::dedication
-                            or parent::part
-                            or parent::reference)">1</xsl:when>
-        <xsl:when test="generate-id($first.book.content) =
-                        generate-id(.)">1</xsl:when>
-        <xsl:otherwise>auto</xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="force.page.count">
-  <xsl:param name="element" select="local-name(.)"/>
-  <xsl:param name="master-reference" select="''"/>
-
-  <xsl:choose>
-    <!-- double-sided output -->
-    <xsl:when test="$double.sided != 0">end-on-even</xsl:when>
-    <!-- single-sided output -->
-    <xsl:otherwise>no-force</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="set.flow.properties">
-  <xsl:param name="element" select="local-name(.)"/>
-  <xsl:param name="master-reference" select="''"/>
-
-  <!-- This template is called after each <fo:flow> starts. -->
-  <!-- Customize this template to set attributes on fo:flow -->
-
-  <!-- remove -draft from reference -->
-  <xsl:variable name="pageclass">
-    <xsl:choose>
-      <xsl:when test="contains($master-reference, '-draft')">
-        <xsl:value-of select="substring-before($master-reference, '-draft')"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$master-reference"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$fop.extensions != 0 or $passivetex.extensions != 0">
-      <!-- body.start.indent does not work well with these processors -->
-    </xsl:when>
-    <xsl:when test="starts-with($pageclass, 'body') or
-                    starts-with($pageclass, 'lot') or
-                    starts-with($pageclass, 'front') or
-                    $element = 'preface' or
-                    (starts-with($pageclass, 'back') and
-                    $element = 'appendix')">
-      <xsl:attribute name="start-indent">
-        <xsl:value-of select="$body.start.indent"/>
-      </xsl:attribute>
-      <xsl:attribute name="end-indent">
-        <xsl:value-of select="$body.end.indent"/>
-      </xsl:attribute>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/param.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/param.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,891 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-<!-- This file is generated from param.xweb -->
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:attribute-set name="abstract.properties">
-  <xsl:attribute name="start-indent">0.0in</xsl:attribute>
-  <xsl:attribute name="end-indent">0.0in</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="abstract.title.properties">
-  <xsl:attribute name="font-family"><xsl:value-of select="$title.fontset"/></xsl:attribute>
-  <xsl:attribute name="font-weight">bold</xsl:attribute>
-  <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-  <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-  <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
-  <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt * 0.8')"/></xsl:attribute>
-  <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt * 1.2')"/></xsl:attribute>
-  <xsl:attribute name="hyphenate">false</xsl:attribute>
-  <xsl:attribute name="text-align">center</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="admon.graphics.extension">.png</xsl:param>
-<xsl:param name="admon.graphics" select="0"/>
-<xsl:param name="admon.graphics.path">images/</xsl:param>
-<xsl:param name="admon.textlabel" select="1"/>
-<xsl:attribute-set name="admonition.properties"/>
-<xsl:attribute-set name="admonition.title.properties">
-  <xsl:attribute name="font-size">14pt</xsl:attribute>
-  <xsl:attribute name="font-weight">bold</xsl:attribute>
-  <xsl:attribute name="hyphenate">false</xsl:attribute>
-  <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="graphical.admonition.properties">
-  <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
-  <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
-  <xsl:attribute name="space-after.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-after.minimum">0.8em</xsl:attribute>
-  <xsl:attribute name="space-after.maximum">1.2em</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="nongraphical.admonition.properties">
-  <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
-  <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
-  <xsl:attribute name="margin-left">0.25in</xsl:attribute>
-  <xsl:attribute name="margin-right">0.25in</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="alignment">justify</xsl:param>
-<xsl:param name="appendix.autolabel">A</xsl:param>
-<xsl:param name="arbortext.extensions" select="0"/>
-<xsl:attribute-set name="article.appendix.title.properties" use-attribute-sets="section.title.properties                          section.title.level1.properties">
-  <xsl:attribute name="margin-left">
-    <xsl:value-of select="$title.margin.left"/>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="author.othername.in.middle" select="1"/>
-<xsl:param name="autotoc.label.separator">. </xsl:param>
-<xsl:param name="axf.extensions" select="0"/>
-<xsl:param name="biblioentry.item.separator">. </xsl:param>
-<xsl:attribute-set name="biblioentry.properties" use-attribute-sets="normal.para.spacing">
-  <xsl:attribute name="start-indent">0.5in</xsl:attribute>
-  <xsl:attribute name="text-indent">-0.5in</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="bibliography.collection">http://docbook.sourceforge.net/release/bibliography/bibliography.xml</xsl:param>
-
-<xsl:param name="bibliography.numbered" select="0"/>
-<xsl:param name="bibliography.style">normal</xsl:param>
-<xsl:attribute-set name="blockquote.properties">
-<xsl:attribute name="margin-left">0.5in</xsl:attribute>
-<xsl:attribute name="margin-right">0.5in</xsl:attribute>
-<xsl:attribute name="space-after.minimum">0.5em</xsl:attribute>
-<xsl:attribute name="space-after.optimum">1em</xsl:attribute>
-<xsl:attribute name="space-after.maximum">2em</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="body.font.family">serif</xsl:param>
-<xsl:param name="body.font.master">10</xsl:param>
-<xsl:param name="body.font.size">
- <xsl:value-of select="$body.font.master"/><xsl:text>pt</xsl:text>
-</xsl:param>
-<xsl:param name="body.margin.bottom">0.5in</xsl:param>
-<xsl:param name="body.margin.top">0.5in</xsl:param>
-<xsl:param name="body.start.indent">
-  <xsl:choose>
-    <xsl:when test="$fop.extensions != 0">0pt</xsl:when>
-    <xsl:when test="$passivetex.extensions != 0">0pt</xsl:when>
-    <xsl:otherwise>4pc</xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-<xsl:param name="body.end.indent">0pt</xsl:param>
-<xsl:param name="bridgehead.in.toc" select="0"/>
-<xsl:param name="callout.defaultcolumn">60</xsl:param>
-
-<xsl:param name="callout.graphics.extension">.svg</xsl:param>
-<xsl:param name="callout.graphics" select="1"/>
-<xsl:param name="callout.icon.size">7pt</xsl:param>
-
-<xsl:param name="callout.graphics.number.limit">30</xsl:param>
-<xsl:param name="callout.graphics.path">images/callouts/</xsl:param>
-<xsl:param name="callout.unicode.font">ZapfDingbats</xsl:param>
-<xsl:param name="callout.unicode" select="0"/>
-<xsl:param name="callout.unicode.number.limit">10</xsl:param>
-<xsl:param name="callout.unicode.start.character">10102</xsl:param>
-<xsl:param name="callouts.extension" select="1"/>
-<xsl:param name="chapter.autolabel" select="1"/>
-<xsl:param name="collect.xref.targets">no</xsl:param>
-<xsl:param name="column.count.back" select="1"/>
-<xsl:param name="column.count.body" select="1"/>
-<xsl:param name="column.count.front" select="1"/>
-<xsl:param name="column.count.index">2</xsl:param>
-<xsl:param name="column.count.lot" select="1"/>
-<xsl:param name="column.count.titlepage" select="1"/>
-<xsl:param name="column.gap.back">12pt</xsl:param>
-<xsl:param name="column.gap.body">12pt</xsl:param>
-<xsl:param name="column.gap.front">12pt</xsl:param>
-<xsl:param name="column.gap.index">12pt</xsl:param>
-<xsl:param name="column.gap.lot">12pt</xsl:param>
-<xsl:param name="column.gap.titlepage">12pt</xsl:param>
-<xsl:attribute-set name="compact.list.item.spacing">
-  <xsl:attribute name="space-before.optimum">0em</xsl:attribute>
-  <xsl:attribute name="space-before.minimum">0em</xsl:attribute>
-  <xsl:attribute name="space-before.maximum">0.2em</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="component.label.includes.part.label" select="0"/>
-<xsl:attribute-set name="component.title.properties">
-  <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-  <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
-  <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt * 0.8')"/></xsl:attribute>
-  <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt * 1.2')"/></xsl:attribute>
-  <xsl:attribute name="hyphenate">false</xsl:attribute>
-  <xsl:attribute name="text-align">
-    <xsl:choose>
-      <xsl:when test="((parent::article | parent::articleinfo | parent::info/parent::article) and not(ancestor::book) and not(self::bibliography))         or (parent::slides | parent::slidesinfo)">center</xsl:when>
-      <xsl:otherwise>left</xsl:otherwise>
-    </xsl:choose>
-  </xsl:attribute>
-  <xsl:attribute name="start-indent"><xsl:value-of select="$title.margin.left"/></xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="component.titlepage.properties">
-</xsl:attribute-set>
-<xsl:param name="crop.marks" select="0"/>
-<xsl:param name="crop.mark.width">0.5pt</xsl:param>
-<xsl:param name="crop.mark.offset">24pt</xsl:param>
-<xsl:param name="crop.mark.bleed">6pt</xsl:param>
-<xsl:param name="current.docid"/>
-<xsl:param name="default.float.class">
-  <xsl:choose>
-    <xsl:when test="contains($stylesheet.result.type,'html')">left</xsl:when>
-    <xsl:otherwise>before</xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-<xsl:param name="default.image.width"/>
-<xsl:param name="default.table.width"/>
-<xsl:param name="default.table.frame">all</xsl:param>
-<xsl:param name="default.units">pt</xsl:param>
-<xsl:param name="dingbat.font.family">serif</xsl:param>
-<xsl:param name="double.sided" select="0"/>
-<xsl:param name="draft.mode">maybe</xsl:param>
-<xsl:param name="draft.watermark.image">http://docbook.sourceforge.net/release/images/draft.png</xsl:param>
-
-<xsl:param name="ebnf.assignment">
-  <fo:inline xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="{$monospace.font.family}">
-    <xsl:text>::=</xsl:text>
-  </fo:inline>
-</xsl:param>
-
-<xsl:param name="ebnf.statement.terminator"/>
-<xsl:param name="email.delimiters.enabled" select="1"/>
-<xsl:attribute-set name="equation.properties" use-attribute-sets="formal.object.properties"/>
-<xsl:attribute-set name="example.properties" use-attribute-sets="formal.object.properties"/>
-<xsl:attribute-set name="figure.properties" use-attribute-sets="formal.object.properties"/>
-<xsl:param name="firstterm.only.link" select="0"/>
-<xsl:attribute-set name="footer.content.properties">
-  <xsl:attribute name="font-family">
-    <xsl:value-of select="$body.fontset"/>
-  </xsl:attribute>
-  <xsl:attribute name="margin-left">
-    <xsl:value-of select="$title.margin.left"/>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="footer.rule" select="1"/>
-<xsl:param name="footer.column.widths">1 1 1</xsl:param>
-<xsl:param name="footer.table.height">14pt</xsl:param>
-<xsl:attribute-set name="footer.table.properties">
-  <xsl:attribute name="table-layout">fixed</xsl:attribute>
-  <xsl:attribute name="width">100%</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="footers.on.blank.pages" select="1"/>
-<xsl:param name="footnote.font.size">
- <xsl:value-of select="$body.font.master * 0.8"/><xsl:text>pt</xsl:text>
-</xsl:param>
-<xsl:param name="footnote.number.format">1</xsl:param>
-<xsl:param name="footnote.number.symbols"/>
-<xsl:attribute-set name="footnote.mark.properties">
-  <xsl:attribute name="font-size">75%</xsl:attribute>
-  <xsl:attribute name="font-weight">normal</xsl:attribute>
-  <xsl:attribute name="font-style">normal</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="footnote.properties">
-  <xsl:attribute name="font-family"><xsl:value-of select="$body.fontset"/></xsl:attribute>
-  <xsl:attribute name="font-size"><xsl:value-of select="$footnote.font.size"/></xsl:attribute>
-  <xsl:attribute name="font-weight">normal</xsl:attribute>
-  <xsl:attribute name="font-style">normal</xsl:attribute>
-  <xsl:attribute name="text-align"><xsl:value-of select="$alignment"/></xsl:attribute>
-  <xsl:attribute name="start-indent">0pt</xsl:attribute>
-  <xsl:attribute name="text-indent">0pt</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="footnote.sep.leader.properties">
-  <xsl:attribute name="color">black</xsl:attribute>
-  <xsl:attribute name="leader-pattern">rule</xsl:attribute>
-  <xsl:attribute name="leader-length">1in</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="fop.extensions" select="0"/>
-<xsl:param name="fop1.extensions" select="0"/>
-<xsl:attribute-set name="formal.object.properties">
-  <xsl:attribute name="space-before.minimum">0.5em</xsl:attribute>
-  <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-before.maximum">2em</xsl:attribute>
-  <xsl:attribute name="space-after.minimum">0.5em</xsl:attribute>
-  <xsl:attribute name="space-after.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-after.maximum">2em</xsl:attribute>
-  <xsl:attribute name="keep-together.within-column">always</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="formal.procedures" select="1"/>
-<xsl:param name="formal.title.placement">
-figure before
-example before
-equation before
-table before
-procedure before
-task before
-</xsl:param>
-<xsl:attribute-set name="formal.title.properties" use-attribute-sets="normal.para.spacing">
-  <xsl:attribute name="font-weight">bold</xsl:attribute>
-  <xsl:attribute name="font-size">
-    <xsl:value-of select="$body.font.master * 1.2"/>
-    <xsl:text>pt</xsl:text>
-  </xsl:attribute>
-  <xsl:attribute name="hyphenate">false</xsl:attribute>
-  <xsl:attribute name="space-after.minimum">0.4em</xsl:attribute>
-  <xsl:attribute name="space-after.optimum">0.6em</xsl:attribute>
-  <xsl:attribute name="space-after.maximum">0.8em</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="funcsynopsis.decoration" select="1"/>
-<xsl:param name="funcsynopsis.style">kr</xsl:param>
-<xsl:param name="function.parens" select="0"/>
-<xsl:param name="generate.index" select="1"/>
-<xsl:param name="generate.section.toc.level" select="0"/>
-
-<xsl:param name="generate.toc">
-/appendix toc,title
-article/appendix  nop
-/article  toc,title
-book      toc,title,figure,table,example,equation
-/chapter  toc,title
-part      toc,title
-/preface  toc,title
-reference toc,title
-/sect1    toc
-/sect2    toc
-/sect3    toc
-/sect4    toc
-/sect5    toc
-/section  toc
-set       toc,title
-</xsl:param>
-<xsl:param name="glossary.as.blocks" select="0"/>
-<xsl:param name="glossary.collection"/>
-<xsl:param name="glossary.sort" select="0"/>
-<xsl:param name="glossentry.show.acronym">no</xsl:param>
-<xsl:param name="glosslist.as.blocks" select="0"/>
-<xsl:param name="glossterm.auto.link" select="0"/>
-<xsl:param name="glossterm.separation">0.25in</xsl:param>
-<xsl:param name="glossterm.width">2in</xsl:param>
-<xsl:param name="graphic.default.extension"/>
-<xsl:attribute-set name="header.content.properties">
-  <xsl:attribute name="font-family">
-    <xsl:value-of select="$body.fontset"/>
-  </xsl:attribute>
-  <xsl:attribute name="margin-left">
-    <xsl:value-of select="$title.margin.left"/>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="header.rule" select="1"/>
-<xsl:param name="header.column.widths">1 1 1</xsl:param>
-<xsl:param name="header.table.height">14pt</xsl:param>
-<xsl:attribute-set name="header.table.properties">
-  <xsl:attribute name="table-layout">fixed</xsl:attribute>
-  <xsl:attribute name="width">100%</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="headers.on.blank.pages" select="1"/>
-<xsl:param name="highlight.default.language"/>
-<xsl:param name="highlight.source" select="0"/>
-<xsl:param name="hyphenate">true</xsl:param>
-<xsl:param name="hyphenate.verbatim" select="0"/>
-<xsl:param name="hyphenate.verbatim.characters"/>
-<xsl:param name="ignore.image.scaling" select="0"/>
-<xsl:param name="img.src.path"/>
-<xsl:param name="index.method">basic</xsl:param>
-<xsl:param name="index.on.role" select="0"/>
-<xsl:param name="index.on.type" select="0"/>
-<xsl:attribute-set name="index.page.number.properties">
-</xsl:attribute-set>
-<xsl:attribute-set name="informalequation.properties" use-attribute-sets="informal.object.properties"/>
-<xsl:attribute-set name="informalexample.properties" use-attribute-sets="informal.object.properties"/>
-<xsl:attribute-set name="informalfigure.properties" use-attribute-sets="informal.object.properties"/>
-<xsl:attribute-set name="informal.object.properties">
-  <xsl:attribute name="space-before.minimum">0.5em</xsl:attribute>
-  <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-before.maximum">2em</xsl:attribute>
-  <xsl:attribute name="space-after.minimum">0.5em</xsl:attribute>
-  <xsl:attribute name="space-after.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-after.maximum">2em</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="informaltable.properties" use-attribute-sets="informal.object.properties"/>
-<xsl:attribute-set name="index.preferred.page.properties">
-  <xsl:attribute name="font-weight">bold</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="index.div.title.properties">
-  <xsl:attribute name="margin-left">0pt</xsl:attribute>
-  <xsl:attribute name="font-size">14.4pt</xsl:attribute>
-  <xsl:attribute name="font-family"><xsl:value-of select="$title.fontset"/></xsl:attribute>
-  <xsl:attribute name="font-weight">bold</xsl:attribute>
-  <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-  <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master,'pt')"/></xsl:attribute>
-  <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master,'pt * 0.8')"/></xsl:attribute>
-  <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master,'pt * 1.2')"/></xsl:attribute>
-  <xsl:attribute name="start-indent">0pt</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="index.entry.properties">
-  <xsl:attribute name="start-indent">0pt</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="index.number.separator"/>
-<xsl:param name="index.range.separator"/>
-<xsl:param name="index.term.separator"/>
-<xsl:param name="insert.link.page.number">no</xsl:param>
-<xsl:param name="insert.xref.page.number">no</xsl:param>
-<xsl:attribute-set name="itemizedlist.properties" use-attribute-sets="list.block.properties">
-</xsl:attribute-set>
-<xsl:attribute-set name="itemizedlist.label.properties">
-</xsl:attribute-set>
-    <xsl:param name="itemizedlist.label.width">1.0em</xsl:param>
-  
-
-<xsl:param name="keep.relative.image.uris" select="0"/>
-<xsl:param name="l10n.gentext.default.language">en</xsl:param>
-<xsl:param name="l10n.gentext.language"/>
-<xsl:param name="l10n.gentext.use.xref.language" select="0"/>
-<xsl:param name="l10n.lang.value.rfc.compliant" select="1"/>
-<xsl:param name="label.from.part" select="0"/>
-<xsl:param name="line-height">normal</xsl:param>
-<xsl:param name="linenumbering.everyNth">5</xsl:param>
-<xsl:param name="linenumbering.extension" select="1"/>
-<xsl:param name="linenumbering.separator"><xsl:text> </xsl:text></xsl:param>
-<xsl:param name="linenumbering.width">3</xsl:param>
-<xsl:attribute-set name="list.block.properties">
-  <xsl:attribute name="provisional-label-separation">0.2em</xsl:attribute>
-  <xsl:attribute name="provisional-distance-between-starts">1.5em</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="list.block.spacing">
-  <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
-  <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
-  <xsl:attribute name="space-after.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-after.minimum">0.8em</xsl:attribute>
-  <xsl:attribute name="space-after.maximum">1.2em</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="list.item.spacing">
-  <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
-  <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="make.index.markup" select="0"/>
-<xsl:param name="make.single.year.ranges" select="0"/>
-<xsl:param name="make.year.ranges" select="0"/>
-<xsl:attribute-set name="margin.note.properties">
-  <xsl:attribute name="font-size">90%</xsl:attribute>
-  <xsl:attribute name="text-align">start</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="margin.note.title.properties">
-  <xsl:attribute name="font-weight">bold</xsl:attribute>
-  <xsl:attribute name="hyphenate">false</xsl:attribute>
-  <xsl:attribute name="text-align">start</xsl:attribute>
-  <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="margin.note.float.type">none</xsl:param>
-<xsl:param name="margin.note.width">1in</xsl:param>
-<xsl:param name="marker.section.level">2</xsl:param>
-<xsl:param name="menuchoice.menu.separator"> &#8594; </xsl:param>
-<xsl:param name="menuchoice.separator">+</xsl:param>
-<xsl:param name="monospace.font.family">monospace</xsl:param>
-<xsl:attribute-set name="monospace.properties">
-  <xsl:attribute name="font-family">
-    <xsl:value-of select="$monospace.font.family"/>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="monospace.verbatim.properties" use-attribute-sets="verbatim.properties monospace.properties">
-  <xsl:attribute name="text-align">start</xsl:attribute>
-  <xsl:attribute name="wrap-option">no-wrap</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="nominal.table.width">6in</xsl:param>
-<xsl:attribute-set name="normal.para.spacing">
-  <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
-  <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="olink.doctitle">no</xsl:param> 
-<xsl:param name="olink.base.uri"/>
-<xsl:param name="olink.debug" select="0"/>
-<xsl:attribute-set name="olink.properties">
-  <xsl:attribute name="show-destination">replace</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="olink.lang.fallback.sequence"/>
-<xsl:attribute-set name="orderedlist.properties" use-attribute-sets="list.block.properties">
-  <xsl:attribute name="provisional-distance-between-starts">2em</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="orderedlist.label.properties">
-</xsl:attribute-set>
-<xsl:param name="orderedlist.label.width">1.2em</xsl:param>
-<xsl:param name="prefer.internal.olink" select="0"/>
-<xsl:param name="insert.olink.page.number">no</xsl:param>
-<xsl:param name="insert.olink.pdf.frag" select="0"/>
-<xsl:param name="page.height">
-  <xsl:choose>
-    <xsl:when test="$page.orientation = 'portrait'">
-      <xsl:value-of select="$page.height.portrait"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$page.width.portrait"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-<xsl:param name="page.height.portrait">
-  <xsl:choose>
-    <xsl:when test="$paper.type = 'A4landscape'">210mm</xsl:when>
-    <xsl:when test="$paper.type = 'USletter'">11in</xsl:when>
-    <xsl:when test="$paper.type = 'USlandscape'">8.5in</xsl:when>
-    <xsl:when test="$paper.type = '4A0'">2378mm</xsl:when>
-    <xsl:when test="$paper.type = '2A0'">1682mm</xsl:when>
-    <xsl:when test="$paper.type = 'A0'">1189mm</xsl:when>
-    <xsl:when test="$paper.type = 'A1'">841mm</xsl:when>
-    <xsl:when test="$paper.type = 'A2'">594mm</xsl:when>
-    <xsl:when test="$paper.type = 'A3'">420mm</xsl:when>
-    <xsl:when test="$paper.type = 'A4'">297mm</xsl:when>
-    <xsl:when test="$paper.type = 'A5'">210mm</xsl:when>
-    <xsl:when test="$paper.type = 'A6'">148mm</xsl:when>
-    <xsl:when test="$paper.type = 'A7'">105mm</xsl:when>
-    <xsl:when test="$paper.type = 'A8'">74mm</xsl:when>
-    <xsl:when test="$paper.type = 'A9'">52mm</xsl:when>
-    <xsl:when test="$paper.type = 'A10'">37mm</xsl:when>
-    <xsl:when test="$paper.type = 'B0'">1414mm</xsl:when>
-    <xsl:when test="$paper.type = 'B1'">1000mm</xsl:when>
-    <xsl:when test="$paper.type = 'B2'">707mm</xsl:when>
-    <xsl:when test="$paper.type = 'B3'">500mm</xsl:when>
-    <xsl:when test="$paper.type = 'B4'">353mm</xsl:when>
-    <xsl:when test="$paper.type = 'B5'">250mm</xsl:when>
-    <xsl:when test="$paper.type = 'B6'">176mm</xsl:when>
-    <xsl:when test="$paper.type = 'B7'">125mm</xsl:when>
-    <xsl:when test="$paper.type = 'B8'">88mm</xsl:when>
-    <xsl:when test="$paper.type = 'B9'">62mm</xsl:when>
-    <xsl:when test="$paper.type = 'B10'">44mm</xsl:when>
-    <xsl:when test="$paper.type = 'C0'">1297mm</xsl:when>
-    <xsl:when test="$paper.type = 'C1'">917mm</xsl:when>
-    <xsl:when test="$paper.type = 'C2'">648mm</xsl:when>
-    <xsl:when test="$paper.type = 'C3'">458mm</xsl:when>
-    <xsl:when test="$paper.type = 'C4'">324mm</xsl:when>
-    <xsl:when test="$paper.type = 'C5'">229mm</xsl:when>
-    <xsl:when test="$paper.type = 'C6'">162mm</xsl:when>
-    <xsl:when test="$paper.type = 'C7'">114mm</xsl:when>
-    <xsl:when test="$paper.type = 'C8'">81mm</xsl:when>
-    <xsl:when test="$paper.type = 'C9'">57mm</xsl:when>
-    <xsl:when test="$paper.type = 'C10'">40mm</xsl:when>
-    <xsl:otherwise>11in</xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-<xsl:param name="page.margin.bottom">0.5in</xsl:param>
-<xsl:param name="page.margin.inner">
-  <xsl:choose>
-    <xsl:when test="$double.sided != 0">1.25in</xsl:when>
-    <xsl:otherwise>1in</xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-<xsl:param name="page.margin.outer">
-  <xsl:choose>
-    <xsl:when test="$double.sided != 0">0.75in</xsl:when>
-    <xsl:otherwise>1in</xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-<xsl:param name="page.margin.top">0.5in</xsl:param>
-<xsl:param name="page.orientation">portrait</xsl:param>
-<xsl:param name="page.width">
-  <xsl:choose>
-    <xsl:when test="$page.orientation = 'portrait'">
-      <xsl:value-of select="$page.width.portrait"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$page.height.portrait"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-<xsl:param name="page.width.portrait">
-  <xsl:choose>
-    <xsl:when test="$paper.type = 'USletter'">8.5in</xsl:when>
-    <xsl:when test="$paper.type = '4A0'">1682mm</xsl:when>
-    <xsl:when test="$paper.type = '2A0'">1189mm</xsl:when>
-    <xsl:when test="$paper.type = 'A0'">841mm</xsl:when>
-    <xsl:when test="$paper.type = 'A1'">594mm</xsl:when>
-    <xsl:when test="$paper.type = 'A2'">420mm</xsl:when>
-    <xsl:when test="$paper.type = 'A3'">297mm</xsl:when>
-    <xsl:when test="$paper.type = 'A4'">210mm</xsl:when>
-    <xsl:when test="$paper.type = 'A5'">148mm</xsl:when>
-    <xsl:when test="$paper.type = 'A6'">105mm</xsl:when>
-    <xsl:when test="$paper.type = 'A7'">74mm</xsl:when>
-    <xsl:when test="$paper.type = 'A8'">52mm</xsl:when>
-    <xsl:when test="$paper.type = 'A9'">37mm</xsl:when>
-    <xsl:when test="$paper.type = 'A10'">26mm</xsl:when>
-    <xsl:when test="$paper.type = 'B0'">1000mm</xsl:when>
-    <xsl:when test="$paper.type = 'B1'">707mm</xsl:when>
-    <xsl:when test="$paper.type = 'B2'">500mm</xsl:when>
-    <xsl:when test="$paper.type = 'B3'">353mm</xsl:when>
-    <xsl:when test="$paper.type = 'B4'">250mm</xsl:when>
-    <xsl:when test="$paper.type = 'B5'">176mm</xsl:when>
-    <xsl:when test="$paper.type = 'B6'">125mm</xsl:when>
-    <xsl:when test="$paper.type = 'B7'">88mm</xsl:when>
-    <xsl:when test="$paper.type = 'B8'">62mm</xsl:when>
-    <xsl:when test="$paper.type = 'B9'">44mm</xsl:when>
-    <xsl:when test="$paper.type = 'B10'">31mm</xsl:when>
-    <xsl:when test="$paper.type = 'C0'">917mm</xsl:when>
-    <xsl:when test="$paper.type = 'C1'">648mm</xsl:when>
-    <xsl:when test="$paper.type = 'C2'">458mm</xsl:when>
-    <xsl:when test="$paper.type = 'C3'">324mm</xsl:when>
-    <xsl:when test="$paper.type = 'C4'">229mm</xsl:when>
-    <xsl:when test="$paper.type = 'C5'">162mm</xsl:when>
-    <xsl:when test="$paper.type = 'C6'">114mm</xsl:when>
-    <xsl:when test="$paper.type = 'C7'">81mm</xsl:when>
-    <xsl:when test="$paper.type = 'C8'">57mm</xsl:when>
-    <xsl:when test="$paper.type = 'C9'">40mm</xsl:when>
-    <xsl:when test="$paper.type = 'C10'">28mm</xsl:when>
-    <xsl:otherwise>8.5in</xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-<xsl:param name="paper.type">USletter</xsl:param>
-<xsl:param name="part.autolabel">I</xsl:param>
-<xsl:param name="passivetex.extensions" select="0"/>
-<xsl:attribute-set name="pgwide.properties">
-  <xsl:attribute name="start-indent">0pt</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="preface.autolabel" select="0"/>
-<xsl:param name="preferred.mediaobject.role"/>
-<xsl:attribute-set name="procedure.properties" use-attribute-sets="formal.object.properties">
-  <xsl:attribute name="keep-together.within-column">auto</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="process.empty.source.toc" select="0"/>
-<xsl:param name="process.source.toc" select="0"/>
-<xsl:param name="profile.arch"/>
-<xsl:param name="profile.audience"/>
-<xsl:param name="profile.attribute"/>
-<xsl:param name="profile.condition"/>
-<xsl:param name="profile.conformance"/>
-<xsl:param name="profile.lang"/>
-<xsl:param name="profile.os"/>
-<xsl:param name="profile.revision"/>
-<xsl:param name="profile.revisionflag"/>
-<xsl:param name="profile.role"/>
-<xsl:param name="profile.security"/>
-<xsl:param name="profile.separator">;</xsl:param>
-<xsl:param name="profile.status"/>
-<xsl:param name="profile.userlevel"/>
-<xsl:param name="profile.value"/>
-<xsl:param name="profile.vendor"/>
-<xsl:param name="profile.wordsize"/>
-<xsl:param name="punct.honorific">.</xsl:param>
-<xsl:param name="qanda.defaultlabel">number</xsl:param>
-<xsl:param name="qanda.in.toc" select="0"/>
-<xsl:param name="qanda.nested.in.toc" select="0"/>
-<xsl:param name="qanda.inherit.numeration" select="1"/>
-<xsl:param name="qandadiv.autolabel" select="1"/>
-<xsl:attribute-set name="qanda.title.level1.properties">
-  <xsl:attribute name="font-size">
-    <xsl:value-of select="$body.font.master * 2.0736"/>
-    <xsl:text>pt</xsl:text>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="qanda.title.level2.properties">
-  <xsl:attribute name="font-size">
-    <xsl:value-of select="$body.font.master * 1.728"/>
-    <xsl:text>pt</xsl:text>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="qanda.title.level3.properties">
-  <xsl:attribute name="font-size">
-    <xsl:value-of select="$body.font.master * 1.44"/>
-    <xsl:text>pt</xsl:text>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="qanda.title.level4.properties">
-  <xsl:attribute name="font-size">
-    <xsl:value-of select="$body.font.master * 1.2"/>
-    <xsl:text>pt</xsl:text>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="qanda.title.level5.properties">
-  <xsl:attribute name="font-size">
-    <xsl:value-of select="$body.font.master"/>
-    <xsl:text>pt</xsl:text>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="qanda.title.level6.properties">
-  <xsl:attribute name="font-size">
-    <xsl:value-of select="$body.font.master"/>
-    <xsl:text>pt</xsl:text>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="qanda.title.properties">
-  <xsl:attribute name="font-family">
-    <xsl:value-of select="$title.font.family"/>
-  </xsl:attribute>
-  <xsl:attribute name="font-weight">bold</xsl:attribute>
-  <!-- font size is calculated dynamically by qanda.heading template -->
-  <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-  <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
-  <xsl:attribute name="space-before.optimum">1.0em</xsl:attribute>
-  <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="refentry.generate.name" select="1"/>
-<xsl:param name="refentry.generate.title" select="0"/>
-<xsl:param name="refentry.pagebreak" select="1"/>
-<xsl:attribute-set name="refentry.title.properties">
-  <xsl:attribute name="font-family">
-    <xsl:value-of select="$title.font.family"/>
-  </xsl:attribute>
-  <xsl:attribute name="font-size">18pt</xsl:attribute>
-  <xsl:attribute name="font-weight">bold</xsl:attribute>
-  <xsl:attribute name="space-after">1em</xsl:attribute>
-  <xsl:attribute name="hyphenate">false</xsl:attribute>
-  <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-  <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
-  <xsl:attribute name="space-before.optimum">1.0em</xsl:attribute>
-  <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
-  <xsl:attribute name="space-after.optimum">0.5em</xsl:attribute>
-  <xsl:attribute name="space-after.minimum">0.4em</xsl:attribute>
-  <xsl:attribute name="space-after.maximum">0.6em</xsl:attribute>
-  <xsl:attribute name="start-indent"><xsl:value-of select="$title.margin.left"/></xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="refentry.xref.manvolnum" select="1"/>
-  <xsl:param name="reference.autolabel">I</xsl:param>
-<xsl:param name="refclass.suppress" select="0"/>
-<xsl:param name="region.after.extent">0.4in</xsl:param>
-<xsl:param name="region.before.extent">0.4in</xsl:param>
-<xsl:attribute-set name="revhistory.table.properties">
-</xsl:attribute-set>
-<xsl:attribute-set name="revhistory.table.cell.properties">
-</xsl:attribute-set>
-<xsl:attribute-set name="revhistory.title.properties">
-</xsl:attribute-set>
-<xsl:attribute-set name="root.properties">
-  <xsl:attribute name="font-family">
-    <xsl:value-of select="$body.fontset"/>
-  </xsl:attribute>
-  <xsl:attribute name="font-size">
-    <xsl:value-of select="$body.font.size"/>
-  </xsl:attribute>
-  <xsl:attribute name="text-align">
-    <xsl:value-of select="$alignment"/>
-  </xsl:attribute>
-  <xsl:attribute name="line-height">
-    <xsl:value-of select="$line-height"/>
-  </xsl:attribute>
-  <xsl:attribute name="font-selection-strategy">character-by-character</xsl:attribute>
-  <xsl:attribute name="line-height-shift-adjustment">disregard-shifts</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="rootid"/>
-<xsl:param name="runinhead.default.title.end.punct">.</xsl:param>
-<xsl:param name="runinhead.title.end.punct">.!?:</xsl:param>
-<xsl:param name="sans.font.family">sans-serif</xsl:param>
-<xsl:param name="section.autolabel" select="0"/>
-<xsl:param name="section.autolabel.max.depth">8</xsl:param>
-<xsl:param name="section.container.element">block</xsl:param>
-<xsl:param name="section.label.includes.component.label" select="0"/>
-<xsl:attribute-set name="section.title.level1.properties">
-  <xsl:attribute name="font-size">
-    <xsl:value-of select="$body.font.master * 2.0736"/>
-    <xsl:text>pt</xsl:text>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="section.title.level2.properties">
-  <xsl:attribute name="font-size">
-    <xsl:value-of select="$body.font.master * 1.728"/>
-    <xsl:text>pt</xsl:text>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="section.title.level3.properties">
-  <xsl:attribute name="font-size">
-    <xsl:value-of select="$body.font.master * 1.44"/>
-    <xsl:text>pt</xsl:text>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="section.title.level4.properties">
-  <xsl:attribute name="font-size">
-    <xsl:value-of select="$body.font.master * 1.2"/>
-    <xsl:text>pt</xsl:text>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="section.title.level5.properties">
-  <xsl:attribute name="font-size">
-    <xsl:value-of select="$body.font.master"/>
-    <xsl:text>pt</xsl:text>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="section.title.level6.properties">
-  <xsl:attribute name="font-size">
-    <xsl:value-of select="$body.font.master"/>
-    <xsl:text>pt</xsl:text>
-  </xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="section.title.properties">
-  <xsl:attribute name="font-family">
-    <xsl:value-of select="$title.font.family"/>
-  </xsl:attribute>
-  <xsl:attribute name="font-weight">bold</xsl:attribute>
-  <!-- font size is calculated dynamically by section.heading template -->
-  <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-  <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
-  <xsl:attribute name="space-before.optimum">1.0em</xsl:attribute>
-  <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
-  <xsl:attribute name="text-align">left</xsl:attribute>
-  <xsl:attribute name="start-indent"><xsl:value-of select="$title.margin.left"/></xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="section.level1.properties" use-attribute-sets="section.properties">
-</xsl:attribute-set>
-<xsl:attribute-set name="section.level2.properties" use-attribute-sets="section.properties">
-</xsl:attribute-set>
-<xsl:attribute-set name="section.level3.properties" use-attribute-sets="section.properties">
-</xsl:attribute-set>
-<xsl:attribute-set name="section.level4.properties" use-attribute-sets="section.properties">
-</xsl:attribute-set>
-<xsl:attribute-set name="section.level5.properties" use-attribute-sets="section.properties">
-</xsl:attribute-set>
-<xsl:attribute-set name="section.level6.properties" use-attribute-sets="section.properties">
-</xsl:attribute-set>
-<xsl:attribute-set name="section.properties">
-</xsl:attribute-set>
-<xsl:param name="segmentedlist.as.table" select="0"/>
-<xsl:param name="shade.verbatim" select="0"/>
-
-<xsl:attribute-set name="shade.verbatim.style">
-  <xsl:attribute name="background-color">#E0E0E0</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="show.comments" select="1"/>
-<xsl:attribute-set name="sidebar.properties" use-attribute-sets="formal.object.properties">
-  <xsl:attribute name="border-style">solid</xsl:attribute>
-  <xsl:attribute name="border-width">1pt</xsl:attribute>
-  <xsl:attribute name="border-color">black</xsl:attribute>
-  <xsl:attribute name="background-color">#DDDDDD</xsl:attribute>
-  <xsl:attribute name="padding-left">12pt</xsl:attribute>
-  <xsl:attribute name="padding-right">12pt</xsl:attribute>
-  <xsl:attribute name="padding-top">6pt</xsl:attribute>
-  <xsl:attribute name="padding-bottom">6pt</xsl:attribute>
-  <xsl:attribute name="margin-left">0pt</xsl:attribute>
-  <xsl:attribute name="margin-right">0pt</xsl:attribute>
-<!--
-  <xsl:attribute name="margin-top">6pt</xsl:attribute>
-  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
--->
-</xsl:attribute-set>
-<xsl:attribute-set name="sidebar.title.properties">
-  <xsl:attribute name="font-weight">bold</xsl:attribute>
-  <xsl:attribute name="hyphenate">false</xsl:attribute>
-  <xsl:attribute name="text-align">start</xsl:attribute>
-  <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="sidebar.float.type">none</xsl:param>
-<xsl:param name="sidebar.float.width">1in</xsl:param>
-<xsl:param name="simplesect.in.toc" select="0"/>
-<xsl:attribute-set name="subscript.properties">
-  <xsl:attribute name="font-size">75%</xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="superscript.properties">
-  <xsl:attribute name="font-size">75%</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="symbol.font.family">Symbol,ZapfDingbats</xsl:param>
-
-<xsl:param name="table.cell.border.color">black</xsl:param>
-<xsl:param name="table.cell.border.style">solid</xsl:param>
-<xsl:param name="table.cell.border.thickness">0.5pt</xsl:param>
-<xsl:attribute-set name="table.cell.padding">
-  <xsl:attribute name="padding-left">2pt</xsl:attribute>
-  <xsl:attribute name="padding-right">2pt</xsl:attribute>
-  <xsl:attribute name="padding-top">2pt</xsl:attribute>
-  <xsl:attribute name="padding-bottom">2pt</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="table.footnote.number.format">a</xsl:param>
-<xsl:param name="table.footnote.number.symbols"/>
-<xsl:attribute-set name="table.footnote.properties">
-  <xsl:attribute name="font-family"><xsl:value-of select="$body.fontset"/></xsl:attribute>
-  <xsl:attribute name="font-size"><xsl:value-of select="$footnote.font.size"/></xsl:attribute>
-  <xsl:attribute name="font-weight">normal</xsl:attribute>
-  <xsl:attribute name="font-style">normal</xsl:attribute>
-  <xsl:attribute name="space-before">2pt</xsl:attribute>
-  <xsl:attribute name="text-align"><xsl:value-of select="$alignment"/></xsl:attribute>
-</xsl:attribute-set>
-
-<xsl:param name="table.frame.border.color">black</xsl:param>
-<xsl:param name="table.frame.border.style">solid</xsl:param>
-<xsl:param name="table.frame.border.thickness">0.5pt</xsl:param>
-<xsl:attribute-set name="table.properties" use-attribute-sets="formal.object.properties"/>
-<xsl:param name="tablecolumns.extension" select="1"/>
-<xsl:attribute-set name="table.table.properties">
-  <xsl:attribute name="border-before-width.conditionality">retain</xsl:attribute>
-  <xsl:attribute name="border-collapse">collapse</xsl:attribute>
-</xsl:attribute-set>
- <xsl:param name="target.database.document">olinkdb.xml</xsl:param>
-<xsl:param name="targets.filename">target.db</xsl:param>
-<xsl:param name="textdata.default.encoding"/>
-<xsl:param name="tex.math.delims" select="1"/>
-<xsl:param name="tex.math.in.alt"/>
-  <xsl:param name="textinsert.extension" select="1"/>
-<xsl:param name="title.font.family">sans-serif</xsl:param>
-<xsl:param name="title.margin.left">
-  <xsl:choose>
-    <xsl:when test="$fop.extensions != 0">-4pc</xsl:when>
-    <xsl:when test="$passivetex.extensions != 0">0pt</xsl:when>
-    <xsl:otherwise>0pt</xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-<xsl:param name="toc.indent.width">24</xsl:param>
-<!-- inconsistant point specification? -->
-<xsl:attribute-set name="toc.line.properties">
-  <xsl:attribute name="text-align-last">justify</xsl:attribute>
-  <xsl:attribute name="text-align">start</xsl:attribute>
-  <xsl:attribute name="end-indent"><xsl:value-of select="concat($toc.indent.width, 'pt')"/></xsl:attribute>
-  <xsl:attribute name="last-line-end-indent"><xsl:value-of select="concat('-', $toc.indent.width, 'pt')"/></xsl:attribute>
-</xsl:attribute-set>
-<xsl:attribute-set name="toc.margin.properties">
-  <xsl:attribute name="space-before.minimum">0.5em</xsl:attribute>
-  <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-before.maximum">2em</xsl:attribute>
-  <xsl:attribute name="space-after.minimum">0.5em</xsl:attribute>
-  <xsl:attribute name="space-after.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-after.maximum">2em</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="toc.max.depth">8</xsl:param>
-<xsl:param name="toc.section.depth">2</xsl:param>
-<xsl:param name="ulink.footnotes" select="0"/>
-<xsl:param name="ulink.hyphenate"/>
-<xsl:param name="ulink.hyphenate.chars">/</xsl:param>
-<xsl:param name="ulink.show" select="1"/>
-<xsl:param name="use.extensions" select="0"/>
-<xsl:param name="use.local.olink.style" select="0"/> 
-<xsl:param name="use.role.as.xrefstyle" select="1"/>
-<xsl:param name="use.role.for.mediaobject" select="1"/>
-<xsl:param name="use.svg" select="1"/>
-<xsl:param name="variablelist.as.blocks" select="0"/>
-<xsl:param name="variablelist.max.termlength">24</xsl:param>
-<xsl:param name="variablelist.term.separator">, </xsl:param>
-<xsl:param name="variablelist.term.break.after">0</xsl:param>
-<xsl:attribute-set name="verbatim.properties">
-  <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
-  <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
-  <xsl:attribute name="space-after.minimum">0.8em</xsl:attribute>
-  <xsl:attribute name="space-after.optimum">1em</xsl:attribute>
-  <xsl:attribute name="space-after.maximum">1.2em</xsl:attribute>
-  <xsl:attribute name="hyphenate">false</xsl:attribute>
-  <xsl:attribute name="wrap-option">no-wrap</xsl:attribute>
-  <xsl:attribute name="white-space-collapse">false</xsl:attribute>
-  <xsl:attribute name="white-space-treatment">preserve</xsl:attribute>
-  <xsl:attribute name="linefeed-treatment">preserve</xsl:attribute>
-  <xsl:attribute name="text-align">start</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="xep.extensions" select="0"/>
-<xsl:attribute-set name="xep.index.item.properties" use-attribute-sets="index.page.number.properties">
-  <xsl:attribute name="merge-subsequent-page-numbers">true</xsl:attribute>
-  <xsl:attribute name="link-back">true</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="xref.label-page.separator"><xsl:text> </xsl:text></xsl:param>
-<xsl:param name="xref.label-title.separator">: </xsl:param>
-<xsl:attribute-set name="xref.properties">
-</xsl:attribute-set>
-<xsl:param name="xref.title-page.separator"><xsl:text> </xsl:text></xsl:param>
-<xsl:param name="xref.with.number.and.title" select="1"/>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/passivetex.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/passivetex.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version='1.0' encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-      This extension stops PassiveTeX from merging subsequent '-' to 
-      dashes. You must set passivetex.extensions to '1' if you want get
-      this functionality.
-     ******************************************************************** -->
-
-<xsl:template name="passivetex.dash.subst">
-  <xsl:param name="string"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, '--')">
-      <xsl:variable name="rest">
-        <xsl:call-template name="passivetex.dash.subst">
-          <xsl:with-param name="string"
-                          select="concat('-', substring-after($string, '--'))"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:value-of select="concat(substring-before($string, '--'),
-                                   '-&#x200b;',
-                                   $rest)"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$string"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/pdf2index
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/pdf2index	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,140 +1,0 @@
-#!/usr/bin/perl -- # -*- Perl -*-
-
-# this needs some cleanup...
-
-my $PSTOTEXT = "pstotext";
-
-my $pdf = shift @ARGV;
-
-my $index = "";
-my $inindex = 0;
-open (F, "$PSTOTEXT $pdf |");
-while (<F>) {
-    if (/^<\/index/) {
-	$index .= $_;
-	$inindex = 0;
-    }
-    $inindex = 1 if /^<index/;
-
-    if ($inindex) {
-	$index .= $_ if /^\s*</;
-    }
-}
-
-my $cindex = "";
-while ($index =~ /^(.*?)((<phrase role=\"pageno\">.*?<\/phrase>\s*)+)/s) {
-    $cindex .= $1;
-    $_ = $2;
-    $index = $'; # '
-
-    my @pages = m/<phrase role=\"pageno\">.*?<\/phrase>\s*/sg;
-
-    # Expand ranges
-    if ($#pages >= 0) {
-	my @mpages = ();
-	foreach my $page (@pages) {
-	    my $pageno = &pageno($page);
-	    if ($pageno =~ /^([0-9]+)[^0-9]([0-9]+)$/) { # funky -
-		for (my $count = $1; $count <= $2; $count++) {
-		    push (@mpages, "<phrase role=\"$pageno\">$count</phrase>");
-		}
-	    } else {
-		push (@mpages, $page);
-	    }
-	}
-	@pages = sort rangesort @mpages;
-    }
-
-    # Remove duplicates...
-    if ($#pages > 0) {
-	my @mpages = ();
-	my $current = "";
-	foreach my $page (@pages) {
-	    my $pageno = &pageno($page);
-	    if ($pageno ne $current) {
-		push (@mpages, $page);
-		$current = $pageno;
-	    }
-	}
-	@pages = @mpages;
-    }
-
-    # Collapse ranges...
-    if ($#pages > 1) {
-	my @cpages = ();
-	while (@pages) {
-	    my $count = 0;
-	    my $len = &rangelen($count, @pages);
-	    if ($len <= 2) {
-		my $page = shift @pages;
-		push (@cpages, $page);
-	    } else {
-		my $fpage = shift @pages;
-		my $lpage = "";
-		while ($len > 1) {
-		    $lpage = shift @pages;
-		    $len--;
-		}
-		my $fpno = &pageno($fpage);
-		my $lpno = &pageno($lpage);
-		$fpage =~ s/>$fpno</>${fpno}-$lpno</s;
-		push (@cpages, $fpage);
-	    }
-	}
-	@pages = @cpages;
-    }
-
-    my $page = shift @pages;
-    $page =~ s/\s*$//s;
-    $cindex .= $page;
-    while (@pages) {
-	$page = shift @pages;
-	$page =~ s/\s*$//s;
-	$cindex .= ", $page";
-    }
-}
-$cindex .= $index;
-
-print "$cindex\n";
-
-sub pageno {
-    my $page = shift;
-
-    $page =~ s/^<phrase.*?>//;
-    $page =~ s/^<link.*?>//;
-
-    return $1 if $page =~ /^([^<>]+)/;
-    return "?";
-}
-
-sub rangesort {
-    my $apno = &pageno($a);
-    my $bpno = &pageno($b);
-
-    # Make sure roman pages come before arabic ones, otherwise sort them in order
-    return -1 if ($apno !~ /^\d+/ && $bpno =~ /^\d+/);
-    return  1 if ($apno =~ /^\d+/ && $bpno !~ /^\d+/);
-    return $apno <=> $bpno;
-}
-
-sub rangelen {
-    my $count = shift;
-    my @pages = @_;
-    my $len = 1;
-    my $inrange = 1;
-
-    my $current = &pageno($pages[$count]);
-    while ($count < $#pages && $inrange) {
-	$count++;
-	my $next = &pageno($pages[$count]);
-	if ($current + 1 eq $next) {
-	    $current = $next;
-	    $inrange = 1;
-	    $len++;
-	} else {
-	    $inrange = 0;
-	}
-    }
-
-    return $len;
-}
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/pi.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/pi.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,1008 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-  xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-  xmlns:fo="http://www.w3.org/1999/XSL/Format"
-  xmlns:xlink="http://www.w3.org/1999/xlink"
-  exclude-result-prefixes="doc"
-  version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<doc:reference xmlns=""><info><title>FO Processing Instruction Reference</title>
-    <releaseinfo role="meta">
-      $Id$
-    </releaseinfo>
-  </info>
-
-  <partintro id="partintro">
-    <title>Introduction</title>
-
-    <para>This is generated reference documentation for all
-      user-specifiable processing instructions (PIs) in the DocBook
-      XSL stylesheets for FO output.
-      <note>
-        <para>You add these PIs at particular points in a document to
-          cause specific âexceptionsâ to formatting/output behavior. To
-          make global changes in formatting/output behavior across an
-          entire document, itâs better to do it by setting an
-          appropriate stylesheet parameter (if there is one).</para>
-      </note>
-    </para>
-  </partintro>
-</doc:reference>
-
-<!-- ==================================================================== -->
-
-<doc:pi name="dbfo_background-color" xmlns="">
-  <refpurpose>Sets background color for an image</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo background-color</tag> PI before or
-      after an image (<tag>graphic</tag>, <tag>inlinegraphic</tag>,
-      <tag>imagedata</tag>, or <tag>videodata</tag> element) as a
-      sibling to the element, to set a background color for the
-      image.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo background-color="<replaceable>color</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>background-color="<replaceable>color</replaceable>"</term>
-        <listitem>
-          <para>An HTML color value</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="tcg">
-    <para><link role="tcg"
-        xlink:href="BGcolor.html"
-        >Background color</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_background-color">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'background-color'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_bgcolor" xmlns="">
-  <refpurpose>Sets background color on a table row or table cell</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo bgcolor</tag> PI as child of a table row
-      or cell to set a background color for that table row or cell.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo bgcolor="<replaceable>color</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>bgcolor="<replaceable>color</replaceable>"</term>
-        <listitem>
-          <para>An HTML color value</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="tcg">
-    <para><link role="tcg"
-        xlink:href="BGtableColor.html#CellBGColor"
-        >Cell background color</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_bgcolor">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'bgcolor'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_float-type" xmlns="">
-  <refpurpose>Specifies float behavior for a sidebar</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo float-type</tag> PI to specify the float
-      behavior for a <tag>sidebar</tag> (to cause the sidebar to be
-      displayed as a marginal note).</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo float-type="margin.note"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>float-type="margin.note"</term>
-        <listitem>
-          <para>Specifies that the <tag>sidebar</tag> should be
-            displayed as a marginal note.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="params">
-    <para><parameter>sidebar.float.type parameter</parameter>,
-      <parameter>sidebar.float.width parameter</parameter>, 
-      <parameter>sidebar.properties attribute-set</parameter>,
-      <parameter>sidebar.title.properties</parameter>
-    </para>
-  </refsee>
-  <refsee role="tcg">
-    <para><link xlink:href="SideFloats.html#SidebarFloats" >A sidebar as
-        side float</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_float-type">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'float-type'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_glossary-presentation" xmlns="">
-  <refpurpose>Specifies presentation style for a glossary</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo glossary-presentation</tag> PI as a child of
-      a <tag>glossary</tag> to control its presentation style.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo glossary-presentation="list"|"blocks"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>glossary-presentation="list"</term>
-        <listitem>
-          <para>Displays the glossary as a list</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>glossary-presentation="blocks"</term>
-        <listitem>
-          <para>Displays the glossary as blocks</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="params">
-    <para><parameter>glossary.as.blocks</parameter></para>
-  </refsee>
-  <refsee role="tcg">
-    <para><link xlink:href="Glossaries.html#GlossaryFormatPrint" >Glossary
-        formatting in print</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_glossary-presentation">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'glossary-presentation'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_glosslist-presentation" xmlns="">
-  <refpurpose>Specifies presentation style for a glosslist</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo glosslist-presentation</tag> PI as a child of
-      a <tag>glosslist</tag> to control its presentation style.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo glosslist-presentation="list"|"blocks"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>glosslist-presentation="list"</term>
-        <listitem>
-          <para>Displays the glosslist as a list</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>glosslist-presentation="blocks"</term>
-        <listitem>
-          <para>Displays the glosslist as blocks</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="params">
-    <para><parameter>glosslist.as.blocks</parameter> </para>
-  </refsee>
-  <refsee role="tcg">
-    <para><link xlink:href="Glossaries.html#GlossaryFormatPrint" >Glossary
-        formatting in print</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_glosslist-presentation">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'glosslist-presentation'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_glossterm-width" xmlns="">
-  <refpurpose>Specifies the glossterm width for a glossary or
-    glosslist</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo glossterm-width</tag> PI as a child of a
-      <tag>glossary</tag> or <tag>glosslist</tag> to specify the
-      width for output of <tag>glossterm</tag> instances in the
-      output.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo glossterm-width="<replaceable>width</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>glossterm-width="<replaceable>width</replaceable>"</term>
-        <listitem>
-          <para>Specifies the glossterm width (including units)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="params">
-    <para><parameter>glossterm.width</parameter>,
-      <parameter>glossterm.separation</parameter>
-    </para>
-  </refsee>
-  <refsee role="tcg">
-    <para><link xlink:href="Glossaries.html#GlossaryFormatPrint" >Glossary
-        formatting in print</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_glossterm-width">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'glossterm-width'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_keep-together" xmlns="">
-  <refpurpose>Specifies âkeepâ behavior for a table, example,
-    figure, or equation</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo keep-together</tag> PI as a child of a
-      formal object (<tag>table</tag>, <tag>example</tag>,
-      <tag>figure</tag>, or <tag>equation</tag>) or their informal
-      equivalents) to specify âkeepâ behavior for the object (to
-      allow the object to âbreakâ across a page).</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo keep-together="auto"|"always"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>keep-together="auto"</term>
-        <listitem>
-          <para>Enables the object to break across a page</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>keep-together="always"</term>
-        <listitem>
-          <para>Prevents the object from breaking across a page (the
-            default stylesheet behavior)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="params">
-    <para>formal.object.properties</para>
-  </refsee>
-  <refsee role="tcg">
-    <para><link xlink:href="PageBreaking.html#KeepTogetherPI"
-        >Keep-together processing instruction</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_keep-together">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'keep-together'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_label-width" xmlns="">
-  <refpurpose>Specifies the label width for a qandaset</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo label-width</tag> PI as a child of a
-      <tag>qandaset</tag> to specify the width of labels.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo label-width="<replaceable>width</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>label-width="<replaceable>width</replaceable>"</term>
-        <listitem>
-          <para>Specifies the label width (including units)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="tcg">
-    <para><link role="tcg"
-        xlink:href="QandAformat.html"
-        >Q and A formatting</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_label-width">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'label-width'"/>
-  </xsl:call-template>
-</xsl:template> 
-
-<doc:pi name="dbfo_linenumbering.everyNth" xmlns="">
-  <refpurpose>Specifies interval for lines numbers in verbatims</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo linenumbering.everyNth</tag> PI as a child
-      of a âverbatimâ element â <tag>programlisting</tag>,
-      <tag>screen</tag>, <tag>synopsis</tag> â to specify
-      the interval at which lines are numbered.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo linenumbering.everyNth="<replaceable>N</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>linenumbering.everyNth="<replaceable>N</replaceable>"</term>
-        <listitem>
-          <para>Specifies numbering interval; a number is output
-            before every <replaceable>N</replaceable>th line</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="params">
-    <para><parameter>linenumbering.everyNth</parameter></para>
-  </refsee>
-  <refsee role="tcg">
-    <para><link role="tcg"
-        xlink:href="AnnotateListing.html#LineNumbering"
-        >Line numbering</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_linenumbering.everyNth">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'linenumbering.everyNth'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_linenumbering.separator" xmlns="">
-  <refpurpose>Specifies separator text for line numbers in verbatims</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo linenumbering.separator</tag> PI as a child
-      of a âverbatimâ element â <tag>programlisting</tag>,
-      <tag>screen</tag>, <tag>synopsis</tag> â to specify
-      the separator text output between the line numbers and content.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo linenumbering.separator="<replaceable>text</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>linenumbering.separator="<replaceable>text</replaceable>"</term>
-        <listitem>
-          <para>Specifies the text (zero or more characters)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="params">
-    <para><parameter>linenumbering.separator</parameter></para>
-  </refsee>
-  <refsee role="tcg">
-    <para><link role="tcg"
-        xlink:href="AnnotateListing.html#LineNumbering"
-        >Line numbering</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_linenumbering.separator">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'linenumbering.separator'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_linenumbering.width" xmlns="">
-  <refpurpose>Specifies width for line numbers in verbatims</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo linenumbering.width</tag> PI as a child
-      of a âverbatimâ element â <tag>programlisting</tag>,
-      <tag>screen</tag>, <tag>synopsis</tag> â to specify
-      the width set aside for line numbers.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo linenumbering.width="<replaceable>width</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>linenumbering.width="<replaceable>width</replaceable>"</term>
-        <listitem>
-          <para>Specifies the width (inluding units)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="params">
-    <para><parameter>linenumbering.width</parameter></para>
-  </refsee>
-  <refsee role="tcg">
-    <para><link role="tcg"
-        xlink:href="AnnotateListing.html#LineNumbering"
-        >Line numbering</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_linenumbering.width">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'linenumbering.width'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_list-presentation" xmlns="">
-  <refpurpose>Specifies presentation style for a variablelist or
-    segmentedlist</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo list-presentation</tag> PI as a child of
-      a <tag>variablelist</tag> or <tag>segmentedlist</tag> to
-      control the presentation style for the list (to cause it, for
-      example, to be displayed as a table).</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo list-presentation="list"|"blocks"|"table"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>list-presentation="list"</term>
-        <listitem>
-          <para>Displays the list as a list</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>list-presentation="blocks"</term>
-        <listitem>
-          <para>(<tag>variablelist</tag> only) Displays the list as blocks</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>list-presentation="table"</term>
-        <listitem>
-          <para>(<tag>segmentedlist</tag> only) Displays the list as a table</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="params">
-    <itemizedlist>
-      <listitem>
-        <para><parameter>variablelist.as.blocks</parameter></para>
-      </listitem>
-      <listitem>
-        <para><parameter>variablelist.as.table</parameter></para>
-      </listitem>
-    </itemizedlist>
-  </refsee>
-  <refsee role="tcg">
-    <para><link role="tcg"
-        xlink:href="Variablelists.html#ListIndents"
-        >Variable list formatting in print</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_list-presentation">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'list-presentation'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_list-width" xmlns="">
-  <refpurpose>Specifies the width of a horizontal simplelist</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo list-width</tag> PI as a child of a
-      <tag>simplelist</tag> whose <tag class="attribute">class</tag>
-      value is <literal>horizontal</literal>, to specify the width
-      of the <tag>simplelist</tag>.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo list-width="<replaceable>width</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>list-width="<replaceable>width</replaceable>"</term>
-        <listitem>
-          <para>Specifies the <tag>simplelist</tag> width (including units)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-</doc:pi>
-<xsl:template name="pi.dbfo_list-width">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'list-width'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_orientation" xmlns="">
-  <refpurpose>Specifies the orientation for table row or cell</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo orientation</tag> PI as a child of an
-      <tag>table</tag> row or cell to specify the orientation
-      (rotation) for the row or cell.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo orientation="0"|"90"|"180"|"270"|"-90"|"-180"|"-270"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>orientation="0"|"90"|"180"|"270"|"-90"|"-180"|"-270"</term>
-        <listitem>
-          <para>Specifies the number of degrees by which the cell or
-            row is rotated</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-</doc:pi>
-<xsl:template name="pi.dbfo_orientation">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'orientation'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_pgwide" xmlns="">
-  <refpurpose>Specifies if an <tag>equation</tag> or <tag>example</tag> goes across full page width</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo pgwide</tag> PI as a child of an
-      <tag>equation</tag> or <tag>example</tag> to specify that the
-      content should rendered across the full width of the page.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo pgwide="0"|"1"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>pgwide="0"</term>
-        <listitem>
-          <para>If zero, the content is rendered across the current
-            text flow</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>pgwide="1"</term>
-        <listitem>
-          <para>If <code>1</code> (or any non-zero value), the
-            content is rendered across the full width of the page</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="params">
-    <para><parameter>pgwide.properties</parameter></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_pgwide">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'pgwide'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_rotated-width" xmlns="">
-  <refpurpose>Specifies the width for a table <tag>entry</tag> or
-    <tag>row</tag></refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo rotated-width</tag> PI as a child of an
-      <tag>entry</tag> or <tag>row</tag> instance to specify the
-      width of that the <tag>entry</tag> or <tag>row</tag>; or
-      use it higher up in table to cause the width to be inherited
-      recursively down.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo rotated-width="<replaceable>width</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>rotated-width="<replaceable>width</replaceable>"</term>
-        <listitem>
-          <para>Specifies the width of a row or cell (including units)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-</doc:pi>
-<xsl:template name="pi.dbfo_rotated-width">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'rotated-width'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_sidebar-width" xmlns="">
-  <refpurpose>Specifies the width of a sidebar</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo sidebar-width</tag> PI as a child of a
-      <tag>sidebar</tag> to specify the width of the sidebar.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo sidebar-width="<replaceable>width</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>sidebar-width="<replaceable>width</replaceable>"</term>
-        <listitem>
-          <para>Specifies the <tag>sidebar</tag> width (including units)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="params">
-    <para><parameter>sidebar.float.type parameter</parameter>,
-      <parameter>sidebar.float.width parameter</parameter>, 
-      <parameter>sidebar.properties attribute-set</parameter>,
-      <parameter>sidebar.title.properties</parameter>
-    </para>
-  </refsee>
-  <refsee role="tcg">
-    <para><link xlink:href="SideFloats.html#SidebarFloats" >A sidebar as
-        side float</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_sidebar-width">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'sidebar-width'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_start" xmlns="">
-  <refpurpose>(obsolete) Sets the starting number on an ordered list</refpurpose>
-  <refdescription>
-    <para><emphasis>This PI is obsolete</emphasis>. The intent of
-      it was to provide a means for setting a specific starting
-      number for an ordered list. Instead of this PI, set a value
-      for the <literal>override</literal> attribute on the first
-      <tag>listitem</tag> in the list; that will have the same
-      effect as what this PI was intended for.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo start="<replaceable>character</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>start="<replaceable>character</replaceable>"</term>
-        <listitem>
-          <para>Specifies the character to use as the starting
-            number; use 0-9, a-z, A-Z, or lowercase or uppercase
-            Roman numerals</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="tcg">
-    <para><link role="tcg"
-        xlink:href="Orderedlists.html#ListStartNum"
-        >List starting number</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_start">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="pi-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'start'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_table-width" xmlns="">
-  <refpurpose>Specifies the width for a table or for revhistory
-    output</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo table-width</tag> PI as a child or
-      sibling of a <tag>table</tag>, or as a child of an
-      <tag>informaltable</tag>, <tag>entrybl</tag>, or
-      <tag>revhistory</tag> instance (which is rendered as a table
-      in output) to specify the width of the table in output.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo table-width="<replaceable>width</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>table-width="<replaceable>width</replaceable>"</term>
-        <listitem>
-          <para>Specifies the table width (including units or as a percentage)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="tcg">
-    <para><link role="tcg"
-        xlink:href="Tables.html#TableWidth"
-        >Table width</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_table-width">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'table-width'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_term-width" xmlns="">
-  <refpurpose>Specifies the term width for a variablelist</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo term-width</tag> PI as a child of a
-      <tag>variablelist</tag> to specify the width for
-      <tag>term</tag> output.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo term-width="<replaceable>width</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>term-width="<replaceable>width</replaceable>"</term>
-        <listitem>
-          <para>Specifies the term width (including units)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="tcg">
-    <para><link role="tcg"
-        xlink:href="Variablelists.html#ListIndents"
-        >Variable list formatting in print</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_term-width">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'term-width'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo_toc" xmlns="">
-  <refpurpose>Specifies whether a TOC should be generated for a qandaset</refpurpose>
-  <refdescription>
-    <para>Use the <tag class="xmlpi">dbfo toc</tag> PI as a child of a
-      <tag>qandaset</tag> to specify whether a table of contents
-      (TOC) is generated for the <tag>qandaset</tag>.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo toc="0"|"1"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>toc="0"</term>
-        <listitem>
-          <para>If zero, no TOC is generated</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>toc="1"</term>
-        <listitem>
-          <para>If <code>1</code> (or any non-zero value),
-            a TOC is generated</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="tcg">
-    <para><link role="tcg"
-        xlink:href="QandAtoc.html"
-        >Q and A list of questions</link>,
-      <link role="tcg"
-        xlink:href="QandAformat.html"
-        >Q and A formatting</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo_toc">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbfo-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbfo')"/>
-    <xsl:with-param name="attribute" select="'toc'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi name="dbfo-need" xmlns="">
-  <refpurpose>Specify a need for space (a kind of soft page break)</refpurpose>
-  <refdescription>
-    <para>A âneedâ is a request for space on a page.  If the
-      requested space is not available, the page breaks and the
-      content that follows the need request appears on the next
-      page. If the requested space is available, then no page break
-      is inserted.</para>
-  </refdescription>
-  <refsynopsisdiv>
-    <synopsis><tag class="xmlpi">dbfo-need height="<replaceable>n</replaceable>" [space-before="<replaceable>n</replaceable>"]</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter>
-    <variablelist>
-      <varlistentry><term>height="<replaceable>n</replaceable>"</term>
-        <listitem>
-          <para>The amount of height needed (including units)</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>space-before="<replaceable>n</replaceable>"</term>
-        <listitem>
-          <para>The amount of extra vertical space to add (including units)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee role="tcg">
-    <para><link role="tcg"
-        xlink:href="PageBreaking.html#SoftPageBreaks"
-        >Soft page breaks</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbfo-need">
-  <xsl:variable name="pi-height">
-    <xsl:call-template name="dbfo-attribute">
-      <xsl:with-param name="pis" select="."/>
-      <xsl:with-param name="attribute" select="'height'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="height">
-    <xsl:choose>
-      <xsl:when test="$pi-height != ''">
-        <xsl:value-of select="$pi-height"/>
-      </xsl:when>
-      <xsl:otherwise>0pt</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="pi-before">
-    <xsl:call-template name="dbfo-attribute">
-      <xsl:with-param name="pis" select="."/>
-      <xsl:with-param name="attribute" select="'space-before'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="spacer">
-    <fo:block-container width="100%" height="{$height}">
-      <fo:block><fo:leader leader-length="0pt"/></fo:block>
-    </fo:block-container>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$fop.extensions != 0">
-      <!-- Doesn't work in fop -->
-    </xsl:when>
-    <xsl:when test="$pi-before != '' and
-      not(following-sibling::listitem) and
-      not(following-sibling::step)">
-      <fo:block space-after="0pt" space-before="{$pi-before}">
-        <xsl:copy-of select="$spacer"/>
-      </fo:block>
-    </xsl:when>
-    <xsl:when test="following-sibling::para">
-      <fo:block space-after="0pt" 
-        xsl:use-attribute-sets="normal.para.spacing">
-        <xsl:copy-of select="$spacer"/>
-      </fo:block>
-    </xsl:when>
-    <xsl:when test="following-sibling::table or
-      following-sibling::figure or
-      following-sibling::example or
-      following-sibling::equation">
-      <fo:block space-after="0pt" 
-        xsl:use-attribute-sets="formal.object.properties">
-        <xsl:copy-of select="$spacer"/>
-      </fo:block>
-    </xsl:when>
-    <xsl:when test="following-sibling::informaltable or
-      following-sibling::informalfigure or
-      following-sibling::informalexample or
-      following-sibling::informalequation">
-      <fo:block space-after="0pt" 
-        xsl:use-attribute-sets="informal.object.properties">
-        <xsl:copy-of select="$spacer"/>
-      </fo:block>
-    </xsl:when>
-    <xsl:when test="following-sibling::itemizedlist or
-      following-sibling::orderedlist or
-      following-sibling::variablelist or
-      following-sibling::simplelist">
-      <fo:block space-after="0pt" 
-        xsl:use-attribute-sets="informal.object.properties">
-        <xsl:copy-of select="$spacer"/>
-      </fo:block>
-    </xsl:when>
-    <xsl:when test="following-sibling::listitem or
-      following-sibling::step">
-      <fo:list-item space-after="0pt" 
-        xsl:use-attribute-sets="informal.object.properties">
-        <fo:list-item-label/>
-        <fo:list-item-body start-indent="0pt" end-indent="0pt">
-          <xsl:copy-of select="$spacer"/>
-        </fo:list-item-body>
-      </fo:list-item>
-    </xsl:when>
-    <xsl:when test="following-sibling::sect1 or
-      following-sibling::sect2 or
-      following-sibling::sect3 or
-      following-sibling::sect4 or
-      following-sibling::sect5 or
-      following-sibling::section">
-      <fo:block space-after="0pt" 
-        xsl:use-attribute-sets="section.title.properties">
-        <xsl:copy-of select="$spacer"/>
-      </fo:block>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:block space-after="0pt" space-before="0em">
-        <xsl:copy-of select="$spacer"/>
-      </fo:block>
-    </xsl:otherwise>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="$fop.extensions != 0">
-      <!-- Doesn't work in fop -->
-    </xsl:when>
-    <xsl:when test="following-sibling::listitem or
-      following-sibling::step">
-      <fo:list-item space-before.precedence="force"
-        space-before="-{$height}"
-        space-after="0pt"
-        space-after.precedence="force">
-        <fo:list-item-label/>
-        <fo:list-item-body start-indent="0pt" end-indent="0pt"/>
-      </fo:list-item>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:block space-before.precedence="force"
-        space-before="-{$height}"
-        space-after="0pt"
-        space-after.precedence="force">
-      </fo:block>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="dbfo-attribute">
-  <!-- * dbfo-attribute is an interal utility template for retrieving -->
-  <!-- * pseudo-attributes/parameters from PIs -->
-  <xsl:param name="pis" select="processing-instruction('dbfo')"/>
-  <xsl:param name="attribute">filename</xsl:param>
-  <xsl:call-template name="pi-attribute">
-    <xsl:with-param name="pis" select="$pis"/>
-    <xsl:with-param name="attribute" select="$attribute"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="processing-instruction()">
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="processing-instruction('dbfo-need')">
-  <xsl:call-template name="pi.dbfo-need"/>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/profile-docbook.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/profile-docbook.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,284 +1,0 @@
-<?xml version="1.0" encoding="US-ASCII"?>
-<!--This file was created automatically by xsl2profile-->
-<!--from the DocBook XSL stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:ng="http://docbook.org/docbook-ng" xmlns:db="http://docbook.org/ns/docbook" xmlns:exslt="http://exslt.org/common" exslt:dummy="dummy" ng:dummy="dummy" db:dummy="dummy" extension-element-prefixes="exslt" exclude-result-prefixes="db ng exsl exslt" version="1.0">
-
-<!-- It is important to use indent="no" here, otherwise verbatim -->
-<!-- environments get broken by indented tags...at least when the -->
-<!-- callout extension is used...at least with some processors -->
-<xsl:output method="xml" indent="no"/>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:include href="../VERSION"/>
-<xsl:include href="param.xsl"/>
-<xsl:include href="../lib/lib.xsl"/>
-<xsl:include href="../common/l10n.xsl"/>
-<xsl:include href="../common/common.xsl"/>
-<xsl:include href="../common/utility.xsl"/>
-<xsl:include href="../common/labels.xsl"/>
-<xsl:include href="../common/titles.xsl"/>
-<xsl:include href="../common/subtitles.xsl"/>
-<xsl:include href="../common/gentext.xsl"/>
-<xsl:include href="../common/olink.xsl"/>
-<xsl:include href="../common/targets.xsl"/>
-<xsl:include href="../common/pi.xsl"/>
-<xsl:include href="autotoc.xsl"/>
-<xsl:include href="autoidx.xsl"/>
-<xsl:include href="lists.xsl"/>
-<xsl:include href="callout.xsl"/>
-<xsl:include href="verbatim.xsl"/>
-<xsl:include href="graphics.xsl"/>
-<xsl:include href="xref.xsl"/>
-<xsl:include href="formal.xsl"/>
-<xsl:include href="table.xsl"/>
-<xsl:include href="htmltbl.xsl"/>
-<xsl:include href="sections.xsl"/>
-<xsl:include href="inline.xsl"/>
-<xsl:include href="footnote.xsl"/>
-<xsl:include href="fo.xsl"/>
-<xsl:include href="fo-rtf.xsl"/>
-<xsl:include href="info.xsl"/>
-<xsl:include href="keywords.xsl"/>
-<xsl:include href="division.xsl"/>
-<xsl:include href="index.xsl"/>
-<xsl:include href="toc.xsl"/>
-<xsl:include href="refentry.xsl"/>
-<xsl:include href="math.xsl"/>
-<xsl:include href="admon.xsl"/>
-<xsl:include href="component.xsl"/>
-<xsl:include href="biblio.xsl"/>
-<xsl:include href="biblio-iso690.xsl"/>
-<xsl:include href="glossary.xsl"/>
-<xsl:include href="block.xsl"/>
-<xsl:include href="task.xsl"/>
-<xsl:include href="qandaset.xsl"/>
-<xsl:include href="synop.xsl"/>
-<xsl:include href="titlepage.xsl"/>
-<xsl:include href="titlepage.templates.xsl"/>
-<xsl:include href="pagesetup.xsl"/>
-<xsl:include href="pi.xsl"/>
-<xsl:include href="spaces.xsl"/>
-<xsl:include href="ebnf.xsl"/>
-<xsl:include href="../html/chunker.xsl"/>
-<xsl:include href="annotations.xsl"/>
-<xsl:include href="../common/stripns.xsl"/>
-
-<xsl:include href="fop.xsl"/>
-<xsl:include href="fop1.xsl"/>
-<xsl:include href="passivetex.xsl"/>
-<xsl:include href="xep.xsl"/>
-<xsl:include href="axf.xsl"/>
-<xsl:include href="ptc.xsl"/>
-
-<xsl:param name="stylesheet.result.type" select="'fo'"/>
-
-<!-- ==================================================================== -->
-
-<xsl:key name="id" match="*" use="@id|@xml:id"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*">
-  <xsl:message>
-    <xsl:value-of select="name(.)"/>
-    <xsl:text> encountered</xsl:text>
-    <xsl:if test="parent::*">
-      <xsl:text> in </xsl:text>
-      <xsl:value-of select="name(parent::*)"/>
-    </xsl:if>
-    <xsl:text>, but no template matches.</xsl:text>
-  </xsl:message>
-  <fo:block color="red">
-    <xsl:text>&lt;</xsl:text>
-    <xsl:value-of select="name(.)"/>
-    <xsl:text>&gt;</xsl:text>
-    <xsl:apply-templates/> 
-    <xsl:text>&lt;/</xsl:text>
-    <xsl:value-of select="name(.)"/>
-    <xsl:text>&gt;</xsl:text>
-  </fo:block>
-</xsl:template>
-
-<!-- Update this list if new root elements supported -->
-<xsl:variable name="root.elements" select="' appendix article bibliography book chapter colophon dedication glossary index part preface qandaset refentry reference sect1 section set setindex '"/>
-
-<xslo:include xmlns:xslo="http://www.w3.org/1999/XSL/Transform" href="../profiling/profile-mode.xsl"/><xslo:variable xmlns:xslo="http://www.w3.org/1999/XSL/Transform" name="profiled-content"><xslo:choose><xslo:when test="*/self::ng:* or */self::db:*"><xslo:message>Note: namesp. cut : stripped namespace before processing</xslo:message><xslo:variable name="stripped-content"><xslo:apply-templates select="/" mode="stripNS"/></xslo:variable><xslo:message>Note: namesp. cut : processing stripped document</xslo:message><xslo:apply-templates select="exslt:node-set($stripped-content)" mode="profile"/></xslo:when><xslo:otherwise><xslo:apply-templates select="/" mode="profile"/></xslo:otherwise></xslo:choose></xslo:variable><xslo:variable xmlns:xslo="http://www.w3.org/1999/XSL/Transform" name="profiled-nodes" select="exslt:node-set($profiled-content)"/><xsl:template match="/">
-  <!-- * Get a title for current doc so that we let the user -->
-  <!-- * know what document we are processing at this point. -->
-  <xsl:variable name="doc.title">
-    <xsl:call-template name="get.doc.title"/>
-  </xsl:variable>
-  <xsl:choose>
-    <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document,
-         toss the namespace and continue.  Use the docbook5 namespaced
-         stylesheets for DocBook5 if you don't want to use this feature.-->
-    <!-- include extra test for Xalan quirk -->
-    <xsl:when test="false()"/>
-    <!-- Can't process unless namespace removed -->
-    <xsl:when test="false()"/>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$rootid != ''">
-          <xsl:variable name="root.element" select="key('id', $rootid)"/>
-          <xsl:choose>
-            <xsl:when test="count($root.element) = 0">
-              <xsl:message terminate="yes">
-                <xsl:text>ID '</xsl:text>
-                <xsl:value-of select="$rootid"/>
-                <xsl:text>' not found in document.</xsl:text>
-              </xsl:message>
-            </xsl:when>
-            <xsl:when test="not(contains($root.elements, concat(' ', local-name($root.element), ' ')))">
-              <xsl:message terminate="yes">
-                <xsl:text>ERROR: Document root element ($rootid=</xsl:text>
-                <xsl:value-of select="$rootid"/>
-                <xsl:text>) for FO output </xsl:text>
-                <xsl:text>must be one of the following elements:</xsl:text>
-                <xsl:value-of select="$root.elements"/>
-              </xsl:message>
-            </xsl:when>
-            <!-- Otherwise proceed -->
-            <xsl:otherwise>
-              <xsl:if test="$collect.xref.targets = 'yes' or                             $collect.xref.targets = 'only'">
-                <xsl:apply-templates select="$root.element" mode="collect.targets"/>
-              </xsl:if>
-              <xsl:if test="$collect.xref.targets != 'only'">
-                <xsl:apply-templates select="$root.element" mode="process.root"/>
-              </xsl:if>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <!-- Otherwise process the document root element -->
-        <xsl:otherwise>
-          <xsl:variable name="document.element" select="*[1]"/>
-          <xsl:choose>
-            <xsl:when test="not(contains($root.elements,                      concat(' ', local-name($document.element), ' ')))">
-              <xsl:message terminate="yes">
-                <xsl:text>ERROR: Document root element for FO output </xsl:text>
-                <xsl:text>must be one of the following elements:</xsl:text>
-                <xsl:value-of select="$root.elements"/>
-              </xsl:message>
-            </xsl:when>
-            <!-- Otherwise proceed -->
-            <xsl:otherwise>
-              <xsl:if test="$collect.xref.targets = 'yes' or                             $collect.xref.targets = 'only'">
-                <xsl:apply-templates select="$profiled-nodes" mode="collect.targets"/>
-              </xsl:if>
-              <xsl:if test="$collect.xref.targets != 'only'">
-                <xsl:apply-templates select="$profiled-nodes" mode="process.root"/>
-              </xsl:if>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="process.root">
-  <xsl:variable name="document.element" select="self::*"/>
-
-  <xsl:call-template name="root.messages"/>
-
-  <xsl:variable name="title">
-    <xsl:choose>
-      <xsl:when test="$document.element/title[1]">
-        <xsl:value-of select="$document.element/title[1]"/>
-      </xsl:when>
-      <xsl:otherwise>[could not find document title]</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  
-  <!-- Include all id values in XEP output -->
-  <xsl:if test="$xep.extensions != 0">
-    <xsl:processing-instruction name="xep-pdf-drop-unused-destinations">false</xsl:processing-instruction>
-  </xsl:if>
-
-  <fo:root xsl:use-attribute-sets="root.properties">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language">
-        <xsl:with-param name="target" select="/*[1]"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:if test="$xep.extensions != 0">
-      <xsl:call-template name="xep-pis"/>
-      <xsl:call-template name="xep-document-information"/>
-    </xsl:if>
-    <xsl:if test="$axf.extensions != 0">
-      <xsl:call-template name="axf-document-information"/>
-    </xsl:if>
-
-    <xsl:call-template name="setup.pagemasters"/>
-
-    <xsl:if test="$fop.extensions != 0">
-      <xsl:apply-templates select="$document.element" mode="fop.outline"/>
-    </xsl:if>
-
-    <xsl:if test="$fop1.extensions != 0">
-      <xsl:variable name="bookmarks">
-        <xsl:apply-templates select="$document.element" mode="fop1.outline"/>
-      </xsl:variable>
-      <xsl:if test="string($bookmarks) != ''">
-        <fo:bookmark-tree>
-          <xsl:copy-of select="$bookmarks"/>
-        </fo:bookmark-tree>
-      </xsl:if>
-    </xsl:if>
-
-    <xsl:if test="$xep.extensions != 0">
-      <xsl:variable name="bookmarks">
-        <xsl:apply-templates select="$document.element" mode="xep.outline"/>
-      </xsl:variable>
-      <xsl:if test="string($bookmarks) != ''">
-        <rx:outline xmlns:rx="http://www.renderx.com/XSL/Extensions">
-          <xsl:copy-of select="$bookmarks"/>
-        </rx:outline>
-      </xsl:if>
-    </xsl:if>
-
-    <xsl:if test="$arbortext.extensions != 0 and $ati.xsl11.bookmarks != 0">
-      <xsl:variable name="bookmarks">
-        <xsl:apply-templates select="$document.element" mode="ati.xsl11.bookmarks"/>
-      </xsl:variable>
-      <xsl:if test="string($bookmarks) != ''">
-        <fo:bookmark-tree>
-          <xsl:copy-of select="$bookmarks"/>
-        </fo:bookmark-tree>
-      </xsl:if>
-    </xsl:if>
-
-    <xsl:apply-templates select="$document.element"/>
-  </fo:root>
-</xsl:template>
-
-<xsl:template name="root.messages">
-  <!-- redefine this any way you'd like to output messages -->
-  <!-- DO NOT OUTPUT ANYTHING FROM THIS TEMPLATE -->
-  <xsl:message>
-    <xsl:text>Making </xsl:text>
-    <xsl:value-of select="$page.orientation"/>
-    <xsl:text> pages on </xsl:text>
-    <xsl:value-of select="$paper.type"/>
-    <xsl:text> paper (</xsl:text>
-    <xsl:value-of select="$page.width"/>
-    <xsl:text>x</xsl:text>
-    <xsl:value-of select="$page.height"/>
-    <xsl:text>)</xsl:text>
-  </xsl:message>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/ptc.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/ptc.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,76 +1,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-		xmlns:fo="http://www.w3.org/1999/XSL/Format"
-		version="1.0">
-
-<!-- ================================================================ -->
-<!--                                                                  -->
-<!-- PTC/Arbortext Code for XSL 1.1 bookmark support                  -->
-<!--                                                                  -->
-<!-- ================================================================ -->
-
-<xsl:param name="ati.xsl11.bookmarks" select="1"/>
-
-<xsl:variable name="ati-a-dia" select=
-"'&#257;&#259;&#261;&#263;&#265;&#267;&#269;&#271;&#273;&#275;&#277;&#279;&#281;&#283;&#339;&#285;&#287;&#289;&#291;&#293;&#295;&#297;&#299;&#301;&#303;&#305;&#309;&#311;&#314;&#316;&#318;&#320;&#322;&#324;&#326;&#328;&#331;&#333;&#335;&#337;&#341;&#343;&#345;&#347;&#349;&#351;&#353;&#355;&#357;&#359;&#361;&#363;&#365;&#367;&#369;&#371;&#373;&#375;&#378;&#380;&#382;&#256;&#258;&#260;&#262;&#264;&#266;&#268;&#270;&#272;&#274;&#276;&#278;&#280;&#282;&#338;&#284;&#286;&#288;&#290;&#292;&#294;&#296;&#298;&#300;&#302;&#304;&#308;&#310;&#313;&#315;&#317;&#319;&#321;&#323;&#325;&#327;&#330;&#332;&#334;&#336;&#340;&#342;&#344;&#346;&#348;&#350;&#352;&#354;&#356;&#358;&#360;&#362;&#364;&#366;&#368;&#370;&#372;&#374;&#376;&#377;&#379;&#381;'"/>
-
-<xsl:variable name="ati-a-asc" select=
-"'aaaccccddeeeeeegggghhiiiiijklllllnnnnooorrrsssstttuuuuuuwyzzzAAACCCCDDEEEEEEGGGGHHIIIIIJKLLLLLNNNNOOORRRSSSSTTTUUUUUUWYYZZZ'"/>
-
-<xsl:template match="*" mode="ati.xsl11.bookmarks">
-  <xsl:apply-templates select="*" mode="ati.xsl11.bookmarks"/>
-</xsl:template>
-
-<xsl:template match="set|book|part|reference|preface|chapter|appendix|article
-                     |glossary|bibliography|index|setindex
-                     |refentry
-                     |sect1|sect2|sect3|sect4|sect5|section"
-              mode="ati.xsl11.bookmarks">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  <xsl:variable name="bookmark-label">
-    <xsl:apply-templates select="." mode="object.title.markup"/>
-  </xsl:variable>
-
-  <!-- Put the root element bookmark at the same level as its children -->
-  <!-- If the object is a set or book, generate a bookmark for the toc -->
-
-  <xsl:choose>
-    <xsl:when test="parent::*">
-      <fo:bookmark internal-destination="{$id}">
-        <fo:bookmark-title>
-          <xsl:value-of select="translate($bookmark-label, $ati-a-dia, $ati-a-asc)"/>
-        </fo:bookmark-title>
-        <xsl:apply-templates select="*" mode="ati.xsl11.bookmarks"/>
-      </fo:bookmark>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:bookmark internal-destination="{$id}">
-        <fo:bookmark-title>
-          <xsl:value-of select="translate($bookmark-label, $ati-a-dia, $ati-a-asc)"/>
-        </fo:bookmark-title>
-      </fo:bookmark>
-
-      <xsl:variable name="toc.params">
-        <xsl:call-template name="find.path.params">
-          <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:if test="contains($toc.params, 'toc')
-                    and section|sect1|refentry
-                        |article|bibliography|glossary
-                        |appendix">
-        <fo:bookmark internal-destination="toc...{$id}">
-          <fo:bookmark-title>
-            <xsl:call-template name="gentext">
-              <xsl:with-param name="key" select="'TableofContents'"/>
-            </xsl:call-template>
-          </fo:bookmark-title>
-        </fo:bookmark>
-      </xsl:if>
-      <xsl:apply-templates select="*" mode="ati.xsl11.bookmarks"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/qandaset.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/qandaset.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,393 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="qandaset" name="process.qandaset">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="label-width">
-    <xsl:call-template name="pi.dbfo_label-width"/>
-  </xsl:variable>
-
-  <xsl:variable name="label-length">
-    <xsl:choose>
-      <xsl:when test="$label-width != ''">
-        <xsl:value-of select="$label-width"/>
-      </xsl:when>
-      <xsl:when test="descendant::label">
-        <xsl:call-template name="longest.term">
-          <xsl:with-param name="terms" select="descendant::label"/>
-          <xsl:with-param name="maxlength" select="20"/>
-        </xsl:call-template>
-        <xsl:text>em * 0.50</xsl:text>
-      </xsl:when>
-      <xsl:otherwise>2.5em</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  
-  <xsl:variable name="toc">
-    <xsl:call-template name="pi.dbfo_toc"/>
-  </xsl:variable>
-
-  <xsl:variable name="toc.params">
-    <xsl:call-template name="find.path.params">
-      <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="content">
-    <fo:block id="{$id}">
-      <xsl:choose>
-        <xsl:when test="parent::*">
-          <xsl:if test="blockinfo/title|info/title|title">
-            <xsl:apply-templates select="(blockinfo/title|
-                                          info/title|title)[1]"/>
-          </xsl:if>
-        </xsl:when>
-        <!-- If it is the root element -->
-        <xsl:otherwise>
-          <xsl:call-template name="qandaset.titlepage"/>
-        </xsl:otherwise>
-      </xsl:choose>
-  
-      <xsl:if test="(contains($toc.params, 'toc') and $toc != '0') 
-                    or $toc = '1'">
-        <xsl:call-template name="qandaset.toc">
-          <xsl:with-param name="toc.title.p"
-                          select="contains($toc.params, 'title')"/>
-        </xsl:call-template>
-      </xsl:if>
-
-      <xsl:call-template name="qandaset.toc.separator"/>
-
-      <xsl:apply-templates select="*[local-name(.) != 'title'
-                                   and local-name(.) != 'titleabbrev'
-                                   and local-name(.) != 'qandadiv'
-                                   and local-name(.) != 'qandaentry']"/>
-      <xsl:apply-templates select="qandadiv"/>
-  
-      <xsl:if test="qandaentry">
-        <fo:list-block xsl:use-attribute-sets="list.block.spacing"
-                       provisional-label-separation="0.2em">
-          <xsl:attribute name="provisional-distance-between-starts">
-            <xsl:choose>
-              <xsl:when test="$label-length != ''">
-                <xsl:value-of select="$label-length"/>
-              </xsl:when>
-              <xsl:otherwise>2.5em</xsl:otherwise>
-            </xsl:choose>
-          </xsl:attribute>
-          <xsl:apply-templates select="qandaentry"/>
-        </fo:list-block>
-      </xsl:if>
-    </fo:block>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="parent::*">
-      <xsl:copy-of select="$content"/>
-    </xsl:when>
-    <!-- Otherwise create a page sequence -->
-    <xsl:otherwise>
-      <xsl:apply-templates select="." mode="page.sequence">
-        <xsl:with-param name="content" select="$content"/>
-        <xsl:with-param name="master-reference" select="'body'"/>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-  
-</xsl:template>
-
-<xsl:template match="qandaset/blockinfo/title|qandset/info/title|qandaset/title">
-  <xsl:variable name="enclsect" select="(ancestor::section
-                                        | ancestor::simplesect
-                                        | ancestor::sect5
-                                        | ancestor::sect4
-                                        | ancestor::sect3
-                                        | ancestor::sect2
-                                        | ancestor::sect1
-                                        | ancestor::refsect3
-                                        | ancestor::refsect2
-                                        | ancestor::refsect1)[last()]"/>
-  <xsl:variable name="sectlvl">
-    <xsl:call-template name="section.level">
-      <xsl:with-param name="node" select="$enclsect"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="qanda.heading">
-    <xsl:with-param name="level" select="$sectlvl + 1"/>
-    <xsl:with-param name="marker" select="0"/>
-    <xsl:with-param name="title">
-      <xsl:apply-templates/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="qandaset/blockinfo|qandaset/info">
-  <!-- what should this template really do? -->
-  <xsl:apply-templates select="legalnotice" mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="qandadiv">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-
-  <xsl:variable name="label-width">
-    <xsl:call-template name="pi.dbfo_label-width"/>
-  </xsl:variable>
-
-  <xsl:variable name="label-length">
-    <xsl:choose>
-      <xsl:when test="$label-width != ''">
-        <xsl:value-of select="$label-width"/>
-      </xsl:when>
-      <xsl:when test="descendant::label">
-        <xsl:call-template name="longest.term">
-          <xsl:with-param name="terms" select="descendant::label"/>
-          <xsl:with-param name="maxlength" select="20"/>
-        </xsl:call-template>
-        <xsl:text>*0.6em</xsl:text>
-      </xsl:when>
-      <xsl:otherwise>2.5em</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <fo:block id="{$id}">
-    <xsl:apply-templates select="(blockinfo/title|info/title|title)[1]"/>
-    <xsl:apply-templates select="*[local-name(.) != 'title'
-                                 and local-name(.) != 'titleabbrev'
-                                 and local-name(.) != 'qandadiv'
-                                 and local-name(.) != 'qandaentry']"/>
-    <fo:block>
-      <xsl:apply-templates select="qandadiv"/>
-
-      <xsl:if test="qandaentry">
-        <fo:list-block xsl:use-attribute-sets="list.block.spacing"
-                       provisional-label-separation="0.2em">
-          <xsl:attribute name="provisional-distance-between-starts">
-            <xsl:choose>
-              <xsl:when test="$label-length != ''">
-                <xsl:value-of select="$label-length"/>
-              </xsl:when>
-              <xsl:otherwise>2.5em</xsl:otherwise>
-            </xsl:choose>
-          </xsl:attribute>
-          <xsl:apply-templates select="qandaentry"/>
-        </fo:list-block>
-      </xsl:if>
-    </fo:block>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="qandadiv/blockinfo/title|qandadiv/info/title|qandadiv/title">
-  <xsl:variable name="enclsect" select="(ancestor::section
-                                        | ancestor::simplesect
-                                        | ancestor::sect5
-                                        | ancestor::sect4
-                                        | ancestor::sect3
-                                        | ancestor::sect2
-                                        | ancestor::sect1
-                                        | ancestor::refsect3
-                                        | ancestor::refsect2
-                                        | ancestor::refsect1)[last()]"/>
-  <xsl:variable name="sectlvl">
-    <xsl:call-template name="section.level">
-      <xsl:with-param name="node" select="$enclsect"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="qanda.heading">
-    <xsl:with-param name="level"  select="$sectlvl + 1 + count(ancestor::qandadiv)"/>
-    <xsl:with-param name="marker" select="0"/>
-    <xsl:with-param name="title">
-      <xsl:apply-templates select="parent::qandadiv" mode="label.markup"/>
-      <xsl:if test="$qandadiv.autolabel != 0">
-        <xsl:apply-templates select="." mode="intralabel.punctuation"/>
-        <xsl:text> </xsl:text>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="qandaentry">
-  <!-- Omit revhistory from fo:list-block because it is a table -->
-  <xsl:apply-templates select="question|answer"/>
-</xsl:template>
-
-<xsl:template match="question">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-
-  <xsl:variable name="entry.id">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="parent::*"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="deflabel">
-    <xsl:choose>
-      <xsl:when test="ancestor-or-self::*[@defaultlabel]">
-        <xsl:value-of select="(ancestor-or-self::*[@defaultlabel])[last()]
-                              /@defaultlabel"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$qanda.defaultlabel"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-
-      <xsl:variable name="label.content">
-        <xsl:apply-templates select="." mode="label.markup"/>
-        <xsl:if test="$deflabel = 'number' and not(label)">
-          <xsl:apply-templates select="." mode="intralabel.punctuation"/>
-        </xsl:if>
-      </xsl:variable>
-
-  <fo:list-item id="{$entry.id}" xsl:use-attribute-sets="list.item.spacing">
-    <fo:list-item-label id="{$id}" end-indent="label-end()">
-        <xsl:if test="string-length($label.content) &gt; 0">
-			<fo:block font-weight="bold">
-			  <xsl:copy-of select="$label.content"/>          
-			</fo:block>
-        </xsl:if>
-    </fo:list-item-label>
-    <fo:list-item-body start-indent="body-start()">
-      <xsl:choose>
-        <xsl:when test="$deflabel = 'none' and not(label)">
-          <fo:block font-weight="bold">
-            <xsl:apply-templates select="*[local-name(.)!='label']"/>
-          </fo:block>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="*[local-name(.)!='label']"/>
-        </xsl:otherwise>
-      </xsl:choose>
-      <!-- Uncomment this line to get revhistory output in the question -->
-      <!-- <xsl:apply-templates select="preceding-sibling::revhistory"/> -->
-    </fo:list-item-body>
-  </fo:list-item>
-</xsl:template>
-
-<xsl:template match="answer">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-  <xsl:variable name="entry.id">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="parent::*"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="deflabel">
-    <xsl:choose>
-      <xsl:when test="ancestor-or-self::*[@defaultlabel]">
-        <xsl:value-of select="(ancestor-or-self::*[@defaultlabel])[last()]
-                              /@defaultlabel"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$qanda.defaultlabel"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-      <xsl:variable name="answer.label">
-        <xsl:apply-templates select="." mode="label.markup"/>
-      </xsl:variable>
-
-  <fo:list-item xsl:use-attribute-sets="list.item.spacing">
-    <fo:list-item-label id="{$id}" end-indent="label-end()">
-      <xsl:choose>
-        <xsl:when test="string-length($answer.label) &gt; 0">
-			<fo:block font-weight="bold">
-			  <xsl:copy-of select="$answer.label"/>
-			</fo:block>
-        </xsl:when>
-        <xsl:otherwise>
-			<fo:block/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </fo:list-item-label>
-    <fo:list-item-body start-indent="body-start()">
-      <xsl:apply-templates select="*[local-name(.)!='label' and local-name(.) != 'qandaentry']"/>
-      <!-- * handle nested answer/qandaentry instances -->
-      <!-- * (bug 1509043 from Daniel Leidert) -->
-      <xsl:if test="descendant::question">
-        <xsl:call-template name="process.qandaset"/>
-      </xsl:if>
-    </fo:list-item-body>
-  </fo:list-item>
-</xsl:template>
-
-<xsl:template match="label">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template name="qanda.heading">
-  <xsl:param name="level" select="1"/>
-  <xsl:param name="marker" select="0"/>
-  <xsl:param name="title"/>
-  <xsl:param name="titleabbrev"/>
-
-  <fo:block xsl:use-attribute-sets="qanda.title.properties">
-    <xsl:if test="$marker != 0">
-      <fo:marker marker-class-name="section.head.marker">
-        <xsl:choose>
-          <xsl:when test="$titleabbrev = ''">
-            <xsl:value-of select="$title"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$titleabbrev"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </fo:marker>
-    </xsl:if>
-    <xsl:choose>
-      <xsl:when test="$level=1">
-        <fo:block xsl:use-attribute-sets="qanda.title.level1.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$level=2">
-        <fo:block xsl:use-attribute-sets="qanda.title.level2.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$level=3">
-        <fo:block xsl:use-attribute-sets="qanda.title.level3.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$level=4">
-        <fo:block xsl:use-attribute-sets="qanda.title.level4.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$level=5">
-        <fo:block xsl:use-attribute-sets="qanda.title.level5.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:otherwise>
-        <fo:block xsl:use-attribute-sets="qanda.title.level6.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:otherwise>
-    </xsl:choose>
-  </fo:block>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/refentry.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/refentry.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,637 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:axf="http://www.antennahouse.com/names/XSL/Extensions"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="reference">
-   <xsl:if test="not(partintro)">
-    <xsl:variable name="id">
-      <xsl:call-template name="object.id"/>
-    </xsl:variable>
-    <xsl:variable name="master-reference">
-      <xsl:call-template name="select.pagemaster"/>
-    </xsl:variable>
-
-    <fo:page-sequence hyphenate="{$hyphenate}"
-                      master-reference="{$master-reference}">
-      <xsl:attribute name="language">
-        <xsl:call-template name="l10n.language"/>
-      </xsl:attribute>
-      <xsl:attribute name="format">
-        <xsl:call-template name="page.number.format">
-          <xsl:with-param name="master-reference" select="$master-reference"/>
-        </xsl:call-template>
-      </xsl:attribute>
-
-      <xsl:attribute name="initial-page-number">
-        <xsl:call-template name="initial.page.number">
-          <xsl:with-param name="master-reference" select="$master-reference"/>
-        </xsl:call-template>
-      </xsl:attribute>
-
-      <xsl:attribute name="force-page-count">
-        <xsl:call-template name="force.page.count">
-          <xsl:with-param name="master-reference" select="$master-reference"/>
-        </xsl:call-template>
-      </xsl:attribute>
-
-      <xsl:attribute name="hyphenation-character">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'hyphenation-character'"/>
-        </xsl:call-template>
-      </xsl:attribute>
-      <xsl:attribute name="hyphenation-push-character-count">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-        </xsl:call-template>
-      </xsl:attribute>
-      <xsl:attribute name="hyphenation-remain-character-count">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-        </xsl:call-template>
-      </xsl:attribute>
-
-      <xsl:apply-templates select="." mode="running.head.mode">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates select="." mode="running.foot.mode">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:apply-templates>
-
-      <fo:flow flow-name="xsl-region-body">
-        <xsl:call-template name="set.flow.properties">
-          <xsl:with-param name="element" select="local-name(.)"/>
-          <xsl:with-param name="master-reference" select="$master-reference"/>
-        </xsl:call-template>
-
-        <fo:block id="{$id}">
-          <xsl:call-template name="reference.titlepage"/>
-        </fo:block>
-        <!-- Create one page sequence if no pagebreaks needed -->
-        <xsl:if test="$refentry.pagebreak = 0">
-          <xsl:apply-templates select="refentry"/>
-        </xsl:if>
-      </fo:flow>
-    </fo:page-sequence>
-  </xsl:if>
-  <xsl:apply-templates select="partintro"/>
-  <xsl:if test="$refentry.pagebreak != 0">
-    <xsl:apply-templates select="refentry"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="reference" mode="reference.titlepage.mode">
-  <xsl:call-template name="reference.titlepage"/>
-</xsl:template>
-
-<xsl:template match="reference/partintro">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="ancestor::reference"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster"/>
-  </xsl:variable>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$master-reference}">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language"/>
-    </xsl:attribute>
-    <xsl:attribute name="format">
-      <xsl:call-template name="page.number.format">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="initial-page-number">
-      <xsl:call-template name="initial.page.number">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="force-page-count">
-      <xsl:call-template name="force.page.count">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="set.flow.properties">
-        <xsl:with-param name="element" select="local-name(.)"/>
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-      <fo:block id="{$id}">
-        <xsl:apply-templates select=".." mode="reference.titlepage.mode"/>
-      </fo:block>
-      <xsl:if test="title">
-        <xsl:call-template name="partintro.titlepage"/>
-      </xsl:if>
-      <xsl:apply-templates/>
-      <!-- Create one page sequence if no pagebreaks needed -->
-      <xsl:if test="$refentry.pagebreak = 0">
-        <xsl:apply-templates select="../refentry"/>
-      </xsl:if>
-    </fo:flow>
-  </fo:page-sequence>
-</xsl:template>
-
-<xsl:template match="reference/docinfo|refentry/refentryinfo"></xsl:template>
-<xsl:template match="reference/info"></xsl:template>
-<xsl:template match="reference/title"></xsl:template>
-<xsl:template match="reference/subtitle"></xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="refentry">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster"/>
-  </xsl:variable>
-
-  <xsl:variable name="refentry.content">
-    <fo:block id="{$id}">
-      <xsl:apply-templates/>
-    </fo:block>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="not(parent::*) or 
-                    (parent::reference and $refentry.pagebreak != 0) or 
-                    parent::part">
-      <!-- make a page sequence -->
-      <fo:page-sequence hyphenate="{$hyphenate}"
-                        master-reference="{$master-reference}">
-        <xsl:attribute name="language">
-          <xsl:call-template name="l10n.language"/>
-        </xsl:attribute>
-        <xsl:attribute name="format">
-          <xsl:call-template name="page.number.format">
-            <xsl:with-param name="master-reference" select="$master-reference"/>
-          </xsl:call-template>
-        </xsl:attribute>
-
-        <xsl:attribute name="initial-page-number">
-          <xsl:call-template name="initial.page.number">
-            <xsl:with-param name="master-reference" select="$master-reference"/>
-          </xsl:call-template>
-        </xsl:attribute>
-
-        <xsl:attribute name="force-page-count">
-          <xsl:call-template name="force.page.count">
-            <xsl:with-param name="master-reference" select="$master-reference"/>
-          </xsl:call-template>
-        </xsl:attribute>
-
-        <xsl:attribute name="hyphenation-character">
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'hyphenation-character'"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:attribute name="hyphenation-push-character-count">
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:attribute name="hyphenation-remain-character-count">
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-          </xsl:call-template>
-        </xsl:attribute>
-
-        <xsl:apply-templates select="." mode="running.head.mode">
-          <xsl:with-param name="master-reference" select="$master-reference"/>
-        </xsl:apply-templates>
-        <xsl:apply-templates select="." mode="running.foot.mode">
-          <xsl:with-param name="master-reference" select="$master-reference"/>
-        </xsl:apply-templates>
-
-        <fo:flow flow-name="xsl-region-body">
-          <xsl:call-template name="set.flow.properties">
-            <xsl:with-param name="element" select="local-name(.)"/>
-            <xsl:with-param name="master-reference" select="$master-reference"/>
-          </xsl:call-template>
-
-          <xsl:copy-of select="$refentry.content"/>
-        </fo:flow>
-      </fo:page-sequence>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:block>
-        <xsl:if test="$refentry.pagebreak != 0">
-          <xsl:attribute name="break-before">page</xsl:attribute>
-        </xsl:if>
-        <xsl:copy-of select="$refentry.content"/>
-      </fo:block>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="refmeta">
-</xsl:template>
-
-<xsl:template match="manvolnum">
-  <xsl:if test="$refentry.xref.manvolnum != 0">
-    <xsl:text>(</xsl:text>
-    <xsl:apply-templates/>
-    <xsl:text>)</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="refmiscinfo">
-</xsl:template>
-
-<xsl:template match="refentrytitle">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="refnamediv">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:block id="{$id}">
-
-    <!-- if refentry.generate.name is non-zero, then we need to generate a -->
-    <!-- localized "Name" subheading for this refnamdiv (unless it has a -->
-    <!-- preceding sibling that is a refnamediv, in which case we have already -->
-    <!-- generated a "Name" subheading, so we don't need to do it again -->
-    <xsl:if test="$refentry.generate.name != 0">
-        <xsl:choose>
-          <xsl:when test="preceding-sibling::refnamediv">
-            <!-- no generated title on secondary refnamedivs! -->
-          </xsl:when>
-          <xsl:otherwise>
-            <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                      xsl:use-attribute-sets="refnamediv.titlepage.recto.style"
-                      font-family="{$title.fontset}">
-              <!-- Contents of what is now the format.refentry.subheading -->
-              <!-- template were formerly intended to be used only to -->
-              <!-- process those subsections of Refentry that have "real" -->
-              <!-- title children. So as a kludge to get around the fact -->
-              <!-- that the template still basically "expects" to be -->
-              <!-- processing that kind of a node, when we call the -->
-              <!-- template to process generated titles, we must call it -->
-              <!-- with values for the "offset" and "section" parameters -->
-              <!-- that are different from the default values in the -->
-              <!-- format.refentry.subheading template itself. Because -->
-              <!-- those defaults are the values appropriate for processing -->
-              <!-- "real" title nodes. -->
-              <xsl:call-template name="format.refentry.subheading">
-                <xsl:with-param name="section" select="self::*"/>
-                <xsl:with-param name="offset" select="1"/>
-                <xsl:with-param name="gentext.key" select="'RefName'"/>
-              </xsl:call-template>
-            </fo:block>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:if>
-
-      <xsl:if test="$refentry.generate.title != 0">
-  <xsl:variable name="section.level">
-    <xsl:call-template name="refentry.level">
-      <xsl:with-param name="node" select="ancestor::refentry"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="reftitle">
-        <xsl:choose>
-          <xsl:when test="../refmeta/refentrytitle">
-            <xsl:apply-templates select="../refmeta/refentrytitle"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates select="refname[1]"/>
-          </xsl:otherwise>
-        </xsl:choose>
-  </xsl:variable>
-
-  <!-- xsl:use-attribute-sets takes only a Qname, not a variable -->
-    <xsl:choose>
-      <xsl:when test="preceding-sibling::refnamediv">
-	<!-- no title on secondary refnamedivs! -->
-      </xsl:when>
-      <xsl:when test="$section.level = 1">
-        <fo:block xsl:use-attribute-sets="refentry.title.properties">
-          <fo:block xsl:use-attribute-sets="section.title.level1.properties">
-            <xsl:value-of select="$reftitle"/>
-          </fo:block>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$section.level = 2">
-        <fo:block xsl:use-attribute-sets="refentry.title.properties">
-          <fo:block xsl:use-attribute-sets="section.title.level2.properties">
-            <xsl:value-of select="$reftitle"/>
-          </fo:block>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$section.level = 3">
-        <fo:block xsl:use-attribute-sets="refentry.title.properties">
-          <fo:block xsl:use-attribute-sets="section.title.level3.properties">
-            <xsl:value-of select="$reftitle"/>
-          </fo:block>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$section.level = 4">
-        <fo:block xsl:use-attribute-sets="refentry.title.properties">
-          <fo:block xsl:use-attribute-sets="section.title.level4.properties">
-            <xsl:value-of select="$reftitle"/>
-          </fo:block>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$section.level = 5">
-        <fo:block xsl:use-attribute-sets="refentry.title.properties">
-          <fo:block xsl:use-attribute-sets="section.title.level5.properties">
-            <xsl:value-of select="$reftitle"/>
-          </fo:block>
-        </fo:block>
-      </xsl:when>
-      <xsl:otherwise>
-        <fo:block xsl:use-attribute-sets="refentry.title.properties">
-          <fo:block xsl:use-attribute-sets="section.title.level6.properties">
-            <xsl:value-of select="$reftitle"/>
-          </fo:block>
-        </fo:block>
-      </xsl:otherwise>
-    </xsl:choose>
-    </xsl:if>
-
-    <fo:block>
-      <xsl:if test="not(following-sibling::refnamediv)">
-	<xsl:attribute name="space-after">1em</xsl:attribute>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </fo:block>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="refname">
-  <xsl:if test="not(preceding-sibling::refdescriptor)">
-    <xsl:apply-templates/>
-    <xsl:if test="following-sibling::refname">
-      <xsl:text>, </xsl:text>
-    </xsl:if>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="refpurpose">
-  <xsl:if test="node()">
-    <xsl:text> </xsl:text>
-    <xsl:call-template name="dingbat">
-      <xsl:with-param name="dingbat">em-dash</xsl:with-param>
-    </xsl:call-template>
-    <xsl:text> </xsl:text>
-    <xsl:apply-templates/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="refdescriptor">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="refclass">
-  <xsl:if test="$refclass.suppress = 0">
-  <fo:block font-weight="bold">
-    <xsl:if test="@role">
-      <xsl:value-of select="@role"/>
-      <xsl:text>: </xsl:text>
-    </xsl:if>
-    <xsl:apply-templates/>
-  </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="refsynopsisdiv">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:block id="{$id}">
-    <xsl:if test="not(refsynopsisdivinfo/title|docinfo/title|info/title|title)">
-      <!-- * if we there is no appropriate title for this Refsynopsisdiv, -->
-      <!-- * then we need to call format.refentry.subheading to generate one -->
-      <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xsl:use-attribute-sets="refsynopsisdiv.titlepage.recto.style"
-                font-family="{$title.fontset}">
-        <!-- Contents of what is now the format.refentry.subheading -->
-        <!-- template were formerly intended to be used only to -->
-        <!-- process those subsections of Refentry that have "real" -->
-        <!-- title children. So as a kludge to get around the fact -->
-        <!-- that the template still basically "expects" to be -->
-        <!-- processing that kind of a node, when we call the -->
-        <!-- template to process generated titles, we must call it -->
-        <!-- with values for the "offset" and "section" parameters -->
-        <!-- that are different from the default values in the -->
-        <!-- format.refentry.subheading template itself. Because -->
-        <!-- those defaults are the values appropriate for processing -->
-        <!-- "real" title nodes. -->
-        <xsl:call-template name="format.refentry.subheading">
-          <xsl:with-param name="section" select="parent::*"/>
-          <xsl:with-param name="offset" select="1"/>
-          <xsl:with-param name="gentext.key" select="'RefSynopsisDiv'"/>
-        </xsl:call-template>
-      </fo:block>
-    </xsl:if>
-    <xsl:call-template name="refsynopsisdiv.titlepage"/>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="refsection">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:block id="{$id}">
-    <xsl:call-template name="refsection.titlepage"/>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="refsect1">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:block id="{$id}">
-    <xsl:call-template name="refsect1.titlepage"/>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="refsect2">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:block id="{$id}">
-    <xsl:call-template name="refsect2.titlepage"/>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="refsect3">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:block id="{$id}">
-    <xsl:call-template name="refsect3.titlepage"/>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="refsynopsisdiv/title
-                     |refsection/title
-                     |refsect1/title
-                     |refsect2/title
-                     |refsect3/title">
-  <!-- nop; titlepage.mode instead -->
-</xsl:template>
-
-<xsl:template match="refsynopsisdiv/title
-                     |refsection/title
-                     |refsect1/title
-                     |refsect2/title
-                     |refsect3/title
-                     |refsynopsisdiv/info/title
-                     |refsection/info/title
-                     |refsect1/info/title
-                     |refsect2/info/title
-                     |refsect3/info/title"
-              mode="titlepage.mode"
-              priority="2">
-  <xsl:call-template name="format.refentry.subheading"/>
-</xsl:template>
-
-<xsl:template name="format.refentry.subheading">
-<!-- This template is now called to process generated titles for -->
-<!-- Refnamediv and Refsynopsisdiv, as well as "real" titles for -->
-<!-- Refsynopsisdiv, Refsection, and Refsect[1-3]. -->
-<!-- -->
-<!-- But the contents of this template were formerly intended to be used -->
-<!-- only to process those subsections of Refentry that have "real" title -->
-<!-- children. So as a kludge to get around the fact that the template -->
-<!-- still basically "expects" to be processing that kind of a node, the -->
-<!-- "offset" parameter was added and the "section" variable was changed to -->
-<!-- a parameter so that when called for a generated title on a Refnamediv -->
-<!-- or Refsynopsisdiv, we can call it like this: -->
-<!-- -->
-<!--     <xsl:call-template name="format.refentry.subheading"> -->
-<!--       <xsl:with-param name="section" select="self::*"/> -->
-<!--       <xsl:with-param name="offset" select="1"/> -->
-<!--       <xsl:with-param name="gentext.key" select="'RefName'"/> -->
-<!--     </xsl:call-template> -->
-<!-- -->
-  <xsl:param name="section" 
-             select="(ancestor::refsynopsysdiv 
-                     |ancestor::refsection
-                     |ancestor::refsect1
-                     |ancestor::refsect2
-                     |ancestor::refsect3)[last()]"/>
-  <xsl:param name="offset" select="0"/>
-  <xsl:param name="gentext.key"/>
-
-  <fo:block keep-with-next.within-column="always">
-    <xsl:variable name="id">
-      <xsl:call-template name="object.id">
-        <xsl:with-param name="object" select="$section"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:variable name="level">
-      <xsl:call-template name="section.level">
-        <xsl:with-param name="node" select="$section"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:variable name="title">
-      <!-- If we have a non-empty value for the $gentext.key param, then we -->
-      <!-- generate an appropriate title here. Otherwise, we have a real -->
-      <!-- title child, so we copy contents of that to the result tree. -->
-      <xsl:choose>
-        <xsl:when test="$gentext.key != ''">
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="$gentext.key"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="$section" mode="object.title.markup">
-            <xsl:with-param name="allow-anchors" select="1"/>
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <xsl:if test="$passivetex.extensions != 0">
-      <fotex:bookmark xmlns:fotex="http://www.tug.org/fotex" 
-                      fotex-bookmark-level="{$level + 2 + $offset}" 
-                      fotex-bookmark-label="{$id}">
-        <xsl:value-of select="$title"/>
-      </fotex:bookmark>
-    </xsl:if>
-
-    <xsl:if test="$axf.extensions != 0">
-      <xsl:attribute name="axf:outline-level">
-        <xsl:value-of select="count(ancestor::*)-1 + $offset"/>
-      </xsl:attribute>
-      <xsl:attribute name="axf:outline-expand">false</xsl:attribute>
-      <xsl:attribute name="axf:outline-title">
-        <xsl:value-of select="$title"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="section.heading">
-      <xsl:with-param name="level" select="$level + $offset"/>
-      <xsl:with-param name="title" select="$title"/>
-    </xsl:call-template>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="refsectioninfo|refsection/info"></xsl:template>
-<xsl:template match="refsect1info|refsect1/info"></xsl:template>
-<xsl:template match="refsect2info|refsect2/info"></xsl:template>
-<xsl:template match="refsect3info|refsect3/info"></xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/sections.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/sections.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,764 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:axf="http://www.antennahouse.com/names/XSL/Extensions"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="section">
-  <xsl:choose>
-    <xsl:when test="$rootid = @id or $rootid = @xml:id">
-      <xsl:call-template name="section.page.sequence"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:variable>
-
-      <xsl:variable name="renderas">
-        <xsl:choose>
-          <xsl:when test="@renderas = 'sect1'">1</xsl:when>
-          <xsl:when test="@renderas = 'sect2'">2</xsl:when>
-          <xsl:when test="@renderas = 'sect3'">3</xsl:when>
-          <xsl:when test="@renderas = 'sect4'">4</xsl:when>
-          <xsl:when test="@renderas = 'sect5'">5</xsl:when>
-          <xsl:otherwise><xsl:value-of select="''"/></xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="level">
-        <xsl:choose>
-          <xsl:when test="$renderas != ''">
-            <xsl:value-of select="$renderas"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="section.level"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <!-- xsl:use-attribute-sets takes only a Qname, not a variable -->
-      <xsl:choose>
-        <xsl:when test="$level = 1">
-          <xsl:element name="fo:{$section.container.element}"
-		       use-attribute-sets="section.level1.properties">
-            <xsl:attribute name="id"><xsl:value-of 
-                                select="$id"/></xsl:attribute>
-            <xsl:call-template name="section.content"/>
-          </xsl:element>
-        </xsl:when>
-        <xsl:when test="$level = 2">
-          <xsl:element name="fo:{$section.container.element}"
-		       use-attribute-sets="section.level2.properties">
-            <xsl:attribute name="id"><xsl:value-of 
-                                select="$id"/></xsl:attribute>
-            <xsl:call-template name="section.content"/>
-          </xsl:element>
-        </xsl:when>
-        <xsl:when test="$level = 3">
-          <xsl:element name="fo:{$section.container.element}"
-                       use-attribute-sets="section.level3.properties">
-            <xsl:attribute name="id"><xsl:value-of 
-                                select="$id"/></xsl:attribute>
-            <xsl:call-template name="section.content"/>
-          </xsl:element>
-        </xsl:when>
-        <xsl:when test="$level = 4">
-          <xsl:element name="fo:{$section.container.element}"
-                       use-attribute-sets="section.level4.properties">
-            <xsl:attribute name="id"><xsl:value-of 
-                                select="$id"/></xsl:attribute>
-            <xsl:call-template name="section.content"/>
-          </xsl:element>
-        </xsl:when>
-        <xsl:when test="$level = 5">
-          <xsl:element name="fo:{$section.container.element}"
-		       use-attribute-sets="section.level5.properties">
-            <xsl:attribute name="id"><xsl:value-of 
-                                select="$id"/></xsl:attribute>
-            <xsl:call-template name="section.content"/>
-          </xsl:element>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:element name="fo:{$section.container.element}"
-		       use-attribute-sets="section.level6.properties">
-            <xsl:attribute name="id"><xsl:value-of 
-                                select="$id"/></xsl:attribute>
-            <xsl:call-template name="section.content"/>
-          </xsl:element>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="section.content">
-  <xsl:call-template name="section.titlepage"/>
-
-  <xsl:variable name="toc.params">
-    <xsl:call-template name="find.path.params">
-      <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:if test="contains($toc.params, 'toc')
-                and (count(ancestor::section)+1) &lt;= 
-		$generate.section.toc.level">
-    <xsl:call-template name="section.toc">
-      <xsl:with-param name="toc.title.p" 
-                      select="contains($toc.params, 'title')"/>
-    </xsl:call-template>
-   <xsl:call-template name="section.toc.separator"/>
-  </xsl:if>
-
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="/section" name="section.page.sequence">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster"/>
-  </xsl:variable>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$master-reference}">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language"/>
-    </xsl:attribute>
-    <xsl:attribute name="format">
-      <xsl:call-template name="page.number.format">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="initial-page-number">
-      <xsl:call-template name="initial.page.number">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="force-page-count">
-      <xsl:call-template name="force.page.count">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="set.flow.properties">
-        <xsl:with-param name="element" select="local-name(.)"/>
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-
-      <fo:block id="{$id}" 
-            xsl:use-attribute-sets="section.level1.properties">
-        <xsl:call-template name="section.titlepage"/>
-      </fo:block>
-
-      <xsl:variable name="toc.params">
-        <xsl:call-template name="find.path.params">
-          <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:if test="contains($toc.params, 'toc')
-                    and (count(ancestor::section)+1) &lt;= 
-		    $generate.section.toc.level">
-        <xsl:call-template name="section.toc">
-          <xsl:with-param name="toc.title.p" 
-                          select="contains($toc.params, 'title')"/>
-        </xsl:call-template>
-        <xsl:call-template name="section.toc.separator"/>
-      </xsl:if>
-
-      <xsl:apply-templates/>
-   </fo:flow>
-  </fo:page-sequence>
-</xsl:template>
-
-<xsl:template match="section/title
-                     |simplesect/title
-                     |sect1/title
-                     |sect2/title
-                     |sect3/title
-                     |sect4/title
-                     |sect5/title
-                     |section/info/title
-                     |simplesect/info/title
-                     |sect1/info/title
-                     |sect2/info/title
-                     |sect3/info/title
-                     |sect4/info/title
-                     |sect5/info/title
-                     |section/sectioninfo/title
-                     |sect1/sect1info/title
-                     |sect2/sect2info/title
-                     |sect3/sect3info/title
-                     |sect4/sect4info/title
-                     |sect5/sect5info/title"
-              mode="titlepage.mode"
-              priority="2">
-
-  <xsl:variable name="section" 
-                select="(ancestor::section |
-                        ancestor::simplesect |
-                        ancestor::sect1 |
-                        ancestor::sect2 |
-                        ancestor::sect3 |
-                        ancestor::sect4 |
-                        ancestor::sect5)[position() = last()]"/>
-
-  <fo:block keep-with-next.within-column="always">
-    <xsl:variable name="id">
-      <xsl:call-template name="object.id">
-        <xsl:with-param name="object" select="$section"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:variable name="renderas">
-      <xsl:choose>
-        <xsl:when test="$section/@renderas = 'sect1'">1</xsl:when>
-        <xsl:when test="$section/@renderas = 'sect2'">2</xsl:when>
-        <xsl:when test="$section/@renderas = 'sect3'">3</xsl:when>
-        <xsl:when test="$section/@renderas = 'sect4'">4</xsl:when>
-        <xsl:when test="$section/@renderas = 'sect5'">5</xsl:when>
-        <xsl:otherwise><xsl:value-of select="''"/></xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-  
-    <xsl:variable name="level">
-      <xsl:choose>
-        <xsl:when test="$renderas != ''">
-          <xsl:value-of select="$renderas"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="section.level">
-            <xsl:with-param name="node" select="$section"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <xsl:variable name="marker">
-      <xsl:choose>
-        <xsl:when test="$level &lt;= $marker.section.level">1</xsl:when>
-        <xsl:otherwise>0</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <xsl:variable name="title">
-      <xsl:apply-templates select="$section" mode="object.title.markup">
-        <xsl:with-param name="allow-anchors" select="1"/>
-      </xsl:apply-templates>
-    </xsl:variable>
-
-    <xsl:variable name="marker.title">
-      <xsl:apply-templates select="$section" mode="titleabbrev.markup">
-        <xsl:with-param name="allow-anchors" select="0"/>
-      </xsl:apply-templates>
-    </xsl:variable>
-
-    <xsl:if test="$passivetex.extensions != 0">
-      <fotex:bookmark xmlns:fotex="http://www.tug.org/fotex" 
-                      fotex-bookmark-level="{$level + 2}" 
-                      fotex-bookmark-label="{$id}">
-        <xsl:value-of select="$marker.title"/>
-      </fotex:bookmark>
-    </xsl:if>
-
-    <xsl:if test="$axf.extensions != 0">
-      <xsl:attribute name="axf:outline-level">
-        <xsl:value-of select="count(ancestor::*)-1"/>
-      </xsl:attribute>
-      <xsl:attribute name="axf:outline-expand">false</xsl:attribute>
-      <xsl:attribute name="axf:outline-title">
-        <xsl:value-of select="normalize-space($title)"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="section.heading">
-      <xsl:with-param name="level" select="$level"/>
-      <xsl:with-param name="title" select="$title"/>
-      <xsl:with-param name="marker" select="$marker"/>
-      <xsl:with-param name="marker.title" select="$marker.title"/>
-    </xsl:call-template>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="sect1">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:element name="fo:{$section.container.element}"
-               use-attribute-sets="section.level1.properties">
-    <xsl:attribute name="id"><xsl:value-of 
-                        select="$id"/></xsl:attribute>
-    <xsl:call-template name="sect1.titlepage"/>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:if test="contains($toc.params, 'toc')
-                  and $generate.section.toc.level &gt;= 1">
-      <xsl:call-template name="section.toc">
-        <xsl:with-param name="toc.title.p" 
-                        select="contains($toc.params, 'title')"/>
-      </xsl:call-template>
-      <xsl:call-template name="section.toc.separator"/>
-    </xsl:if>
-
-    <xsl:apply-templates/>
-  </xsl:element>
-</xsl:template>
-
-<xsl:template match="/sect1">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster"/>
-  </xsl:variable>
-
-  <fo:page-sequence hyphenate="{$hyphenate}"
-                    master-reference="{$master-reference}">
-    <xsl:attribute name="language">
-      <xsl:call-template name="l10n.language"/>
-    </xsl:attribute>
-    <xsl:attribute name="format">
-      <xsl:call-template name="page.number.format">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="initial-page-number">
-      <xsl:call-template name="initial.page.number">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="force-page-count">
-      <xsl:call-template name="force.page.count">
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:attribute name="hyphenation-character">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-character'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-push-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenation-remain-character-count">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-      </xsl:call-template>
-    </xsl:attribute>
-
-    <xsl:apply-templates select="." mode="running.head.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-    <xsl:apply-templates select="." mode="running.foot.mode">
-      <xsl:with-param name="master-reference" select="$master-reference"/>
-    </xsl:apply-templates>
-
-    <fo:flow flow-name="xsl-region-body">
-      <xsl:call-template name="set.flow.properties">
-        <xsl:with-param name="element" select="local-name(.)"/>
-        <xsl:with-param name="master-reference" select="$master-reference"/>
-      </xsl:call-template>
-
-      <fo:block id="{$id}" 
-                xsl:use-attribute-sets="section.level1.properties">
-        <xsl:call-template name="sect1.titlepage"/>
-      </fo:block>
-
-      <xsl:variable name="toc.params">
-        <xsl:call-template name="find.path.params">
-          <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:if test="contains($toc.params, 'toc')
-                    and $generate.section.toc.level &gt;= 1">
-        <xsl:call-template name="section.toc">
-          <xsl:with-param name="toc.title.p" 
-                          select="contains($toc.params, 'title')"/>
-        </xsl:call-template>
-        <xsl:call-template name="section.toc.separator"/>
-      </xsl:if>
-
-      <xsl:apply-templates/>
-   </fo:flow>
-  </fo:page-sequence>
-</xsl:template>
-
-<xsl:template match="sect2">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:element name="fo:{$section.container.element}"
-	       use-attribute-sets="section.level2.properties">
-    <xsl:attribute name="id"><xsl:value-of 
-                        select="$id"/></xsl:attribute>
-    <xsl:call-template name="sect2.titlepage"/>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:if test="contains($toc.params, 'toc')
-                   and $generate.section.toc.level &gt;= 2">
-      <xsl:call-template name="section.toc">
-        <xsl:with-param name="toc.title.p" 
-                        select="contains($toc.params, 'title')"/>
-      </xsl:call-template>
-      <xsl:call-template name="section.toc.separator"/>
-    </xsl:if>
-
-    <xsl:apply-templates/>
-  </xsl:element>
-</xsl:template>
-
-<xsl:template match="sect3">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:element name="fo:{$section.container.element}"
-	       use-attribute-sets="section.level3.properties">
-    <xsl:attribute name="id"><xsl:value-of 
-                        select="$id"/></xsl:attribute>
-    <xsl:call-template name="sect3.titlepage"/>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:if test="contains($toc.params, 'toc')
-                  and $generate.section.toc.level &gt;= 3">
-      <xsl:call-template name="section.toc">
-        <xsl:with-param name="toc.title.p" 
-                        select="contains($toc.params, 'title')"/>
-      </xsl:call-template>
-      <xsl:call-template name="section.toc.separator"/>
-    </xsl:if>
-
-    <xsl:apply-templates/>
-  </xsl:element>
-</xsl:template>
-
-<xsl:template match="sect4">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:element name="fo:{$section.container.element}"
-	       use-attribute-sets="section.level4.properties">
-    <xsl:attribute name="id"><xsl:value-of 
-                        select="$id"/></xsl:attribute>
-    <xsl:call-template name="sect4.titlepage"/>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:if test="contains($toc.params, 'toc')
-                  and $generate.section.toc.level &gt;= 4">
-      <xsl:call-template name="section.toc">
-        <xsl:with-param name="toc.title.p" 
-                        select="contains($toc.params, 'title')"/>
-      </xsl:call-template>
-      <xsl:call-template name="section.toc.separator"/>
-    </xsl:if>
-
-    <xsl:apply-templates/>
-  </xsl:element>
-</xsl:template>
-
-<xsl:template match="sect5">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:element name="fo:{$section.container.element}"
-	       use-attribute-sets="section.level5.properties">
-    <xsl:attribute name="id"><xsl:value-of 
-                        select="$id"/></xsl:attribute>
-    <xsl:call-template name="sect5.titlepage"/>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:if test="contains($toc.params, 'toc')
-                  and $generate.section.toc.level &gt;= 5">
-      <xsl:call-template name="section.toc">
-        <xsl:with-param name="toc.title.p" 
-                        select="contains($toc.params, 'title')"/>
-      </xsl:call-template>
-      <xsl:call-template name="section.toc.separator"/>
-    </xsl:if>
-
-    <xsl:apply-templates/>
-  </xsl:element>
-</xsl:template>
-
-<xsl:template match="simplesect">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:element name="fo:{$section.container.element}">
-    <xsl:attribute name="id"><xsl:value-of 
-                        select="$id"/></xsl:attribute>
-    <xsl:call-template name="simplesect.titlepage"/>
-    <xsl:apply-templates/>
-  </xsl:element>
-</xsl:template>
-
-<xsl:template match="sectioninfo"></xsl:template>
-<xsl:template match="section/info"></xsl:template>
-<xsl:template match="section/title"></xsl:template>
-<xsl:template match="section/titleabbrev"></xsl:template>
-<xsl:template match="section/subtitle"></xsl:template>
-
-<xsl:template match="sect1info"></xsl:template>
-<xsl:template match="sect1/info"></xsl:template>
-<xsl:template match="sect1/title"></xsl:template>
-<xsl:template match="sect1/titleabbrev"></xsl:template>
-<xsl:template match="sect1/subtitle"></xsl:template>
-
-<xsl:template match="sect2info"></xsl:template>
-<xsl:template match="sect2/info"></xsl:template>
-<xsl:template match="sect2/title"></xsl:template>
-<xsl:template match="sect2/titleabbrev"></xsl:template>
-<xsl:template match="sect2/subtitle"></xsl:template>
-
-<xsl:template match="sect3info"></xsl:template>
-<xsl:template match="sect3/info"></xsl:template>
-<xsl:template match="sect3/title"></xsl:template>
-<xsl:template match="sect3/titleabbrev"></xsl:template>
-<xsl:template match="sect3/subtitle"></xsl:template>
-
-<xsl:template match="sect4info"></xsl:template>
-<xsl:template match="sect4/info"></xsl:template>
-<xsl:template match="sect4/title"></xsl:template>
-<xsl:template match="sect4/titleabbrev"></xsl:template>
-<xsl:template match="sect4/subtitle"></xsl:template>
-
-<xsl:template match="sect5info"></xsl:template>
-<xsl:template match="sect5/info"></xsl:template>
-<xsl:template match="sect5/title"></xsl:template>
-<xsl:template match="sect5/titleabbrev"></xsl:template>
-<xsl:template match="sect5/subtitle"></xsl:template>
-
-<xsl:template match="simplesect/info"></xsl:template>
-<xsl:template match="simplesect/title"></xsl:template>
-<xsl:template match="simplesect/titleabbrev"></xsl:template>
-<xsl:template match="simplesect/subtitle"></xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="section.heading">
-  <xsl:param name="level" select="1"/>
-  <xsl:param name="marker" select="1"/>
-  <xsl:param name="title"/>
-  <xsl:param name="marker.title"/>
-
-  <fo:block xsl:use-attribute-sets="section.title.properties">
-    <xsl:if test="$marker != 0">
-      <fo:marker marker-class-name="section.head.marker">
-        <xsl:copy-of select="$marker.title"/>
-      </fo:marker>
-    </xsl:if>
-
-    <xsl:choose>
-      <xsl:when test="$level=1">
-        <fo:block xsl:use-attribute-sets="section.title.level1.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$level=2">
-        <fo:block xsl:use-attribute-sets="section.title.level2.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$level=3">
-        <fo:block xsl:use-attribute-sets="section.title.level3.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$level=4">
-        <fo:block xsl:use-attribute-sets="section.title.level4.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="$level=5">
-        <fo:block xsl:use-attribute-sets="section.title.level5.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:otherwise>
-        <fo:block xsl:use-attribute-sets="section.title.level6.properties">
-          <xsl:copy-of select="$title"/>
-        </fo:block>
-      </xsl:otherwise>
-    </xsl:choose>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="bridgehead">
-  <xsl:variable name="container"
-                select="(ancestor::appendix
-                        |ancestor::article
-                        |ancestor::bibliography
-                        |ancestor::chapter
-                        |ancestor::glossary
-                        |ancestor::glossdiv
-                        |ancestor::index
-                        |ancestor::partintro
-                        |ancestor::preface
-                        |ancestor::refsect1
-                        |ancestor::refsect2
-                        |ancestor::refsect3
-                        |ancestor::sect1
-                        |ancestor::sect2
-                        |ancestor::sect3
-                        |ancestor::sect4
-                        |ancestor::sect5
-                        |ancestor::section
-                        |ancestor::setindex
-                        |ancestor::simplesect)[last()]"/>
-
-  <xsl:variable name="clevel">
-    <xsl:choose>
-      <xsl:when test="local-name($container) = 'appendix'
-                      or local-name($container) = 'chapter'
-                      or local-name($container) = 'article'
-                      or local-name($container) = 'bibliography'
-                      or local-name($container) = 'glossary'
-                      or local-name($container) = 'index'
-                      or local-name($container) = 'partintro'
-                      or local-name($container) = 'preface'
-                      or local-name($container) = 'setindex'">2</xsl:when>
-      <xsl:when test="local-name($container) = 'glossdiv'">
-        <xsl:value-of select="count(ancestor::glossdiv)+2"/>
-      </xsl:when>
-      <xsl:when test="local-name($container) = 'sect1'
-                      or local-name($container) = 'sect2'
-                      or local-name($container) = 'sect3'
-                      or local-name($container) = 'sect4'
-                      or local-name($container) = 'sect5'
-                      or local-name($container) = 'refsect1'
-                      or local-name($container) = 'refsect2'
-                      or local-name($container) = 'refsect3'
-                      or local-name($container) = 'section'
-                      or local-name($container) = 'simplesect'">
-        <xsl:variable name="slevel">
-          <xsl:call-template name="section.level">
-            <xsl:with-param name="node" select="$container"/>
-          </xsl:call-template>
-        </xsl:variable>
-        <xsl:value-of select="$slevel + 1"/>
-      </xsl:when>
-      <xsl:otherwise>2</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="level">
-    <xsl:choose>
-      <xsl:when test="@renderas = 'sect1'">1</xsl:when>
-      <xsl:when test="@renderas = 'sect2'">2</xsl:when>
-      <xsl:when test="@renderas = 'sect3'">3</xsl:when>
-      <xsl:when test="@renderas = 'sect4'">4</xsl:when>
-      <xsl:when test="@renderas = 'sect5'">5</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$clevel"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="marker">
-    <xsl:choose>
-      <xsl:when test="$level &lt;= $marker.section.level">1</xsl:when>
-      <xsl:otherwise>0</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="marker.title">
-    <xsl:apply-templates/>
-  </xsl:variable>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:block id="{$id}">
-    <xsl:call-template name="section.heading">
-      <xsl:with-param name="level" select="$level"/>
-      <xsl:with-param name="title">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-      <xsl:with-param name="marker" select="$marker"/>
-      <xsl:with-param name="marker.title" select="$marker.title"/>
-    </xsl:call-template>
-  </fo:block>
-</xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/spaces.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/spaces.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,273 +1,0 @@
-<?xml version='1.0' encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-     XSL-FO specification treats all space characters like ordinary spaces.
-     We need to map them to fo:leader with different widths in order to
-     simulate desired behaviour.
-     ******************************************************************** -->
-
-<xsl:template match="text()[namespace-uri(..) = '']">
-  <xsl:choose>
-    <xsl:when test="$passivetex.extensions != 0">
-      <xsl:call-template name="passivetex.dash.subst">
-        <xsl:with-param name="string">
-	  <xsl:call-template name="space.2000.subst">
-	    <xsl:with-param name="string" select="."/>
-	  </xsl:call-template>
-	</xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="space.2000.subst">
-	<xsl:with-param name="string" select="."/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:param name="space.enquad.width">0.5em</xsl:param>   <!-- U+2000 -->
-<xsl:param name="space.emquad.width">1em</xsl:param>     <!-- U+2001 -->
-<xsl:param name="space.enspace.width">0.5em</xsl:param>  <!-- U+2002 -->
-<xsl:param name="space.emspace.width">1em</xsl:param>    <!-- U+2003 -->
-<xsl:param name="space.3emspace.width">0.33em</xsl:param><!-- U+2004 -->
-<xsl:param name="space.4emspace.width">0.25em</xsl:param><!-- U+2005 -->
-<xsl:param name="space.6emspace.width">0.16em</xsl:param><!-- U+2006 -->
-<xsl:param name="space.figspace.width"></xsl:param>      <!-- U+2007 -->
-<xsl:param name="space.punctspace.width"></xsl:param>    <!-- U+2008 -->
-<xsl:param name="space.thinspace.width">0.2em</xsl:param><!-- U+2009 -->
-<xsl:param name="space.hairspace.width">0.1em</xsl:param><!-- U+200A -->
-
-<xsl:template name="space.2000.subst">
-  <xsl:param name="string"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, '&#x2000;') and $space.enquad.width != ''">
-      <xsl:call-template name="space.2001.subst">
-	<xsl:with-param name="string" select="substring-before($string, '&#x2000;')"/>
-      </xsl:call-template>
-      <fo:leader leader-length="{$space.enquad.width}"/>
-      <xsl:call-template name="space.2000.subst">
-	<xsl:with-param name="string" select="substring-after($string, '&#x2000;')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="space.2001.subst">
-	<xsl:with-param name="string" select="$string"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="space.2001.subst">
-  <xsl:param name="string"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, '&#x2001;') and $space.emquad.width != ''">
-      <xsl:call-template name="space.2002.subst">
-	<xsl:with-param name="string" select="substring-before($string, '&#x2001;')"/>
-      </xsl:call-template>
-      <fo:leader leader-length="{$space.emquad.width}"/>
-      <xsl:call-template name="space.2001.subst">
-	<xsl:with-param name="string" select="substring-after($string, '&#x2001;')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="space.2002.subst">
-	<xsl:with-param name="string" select="$string"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="space.2002.subst">
-  <xsl:param name="string"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, '&#x2002;') and $space.enspace.width != ''">
-      <xsl:call-template name="space.2003.subst">
-	<xsl:with-param name="string" select="substring-before($string, '&#x2002;')"/>
-      </xsl:call-template>
-      <fo:leader leader-length="{$space.enspace.width}"/>
-      <xsl:call-template name="space.2002.subst">
-	<xsl:with-param name="string" select="substring-after($string, '&#x2002;')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="space.2003.subst">
-	<xsl:with-param name="string" select="$string"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="space.2003.subst">
-  <xsl:param name="string"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, '&#x2003;') and $space.emspace.width != ''">
-      <xsl:call-template name="space.2004.subst">
-	<xsl:with-param name="string" select="substring-before($string, '&#x2003;')"/>
-      </xsl:call-template>
-      <fo:leader leader-length="{$space.emspace.width}"/>
-      <xsl:call-template name="space.2003.subst">
-	<xsl:with-param name="string" select="substring-after($string, '&#x2003;')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="space.2004.subst">
-	<xsl:with-param name="string" select="$string"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="space.2004.subst">
-  <xsl:param name="string"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, '&#x2004;') and $space.3emspace.width != ''">
-      <xsl:call-template name="space.2005.subst">
-	<xsl:with-param name="string" select="substring-before($string, '&#x2004;')"/>
-      </xsl:call-template>
-      <fo:leader leader-length="{$space.3emspace.width}"/>
-      <xsl:call-template name="space.2004.subst">
-	<xsl:with-param name="string" select="substring-after($string, '&#x2004;')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="space.2005.subst">
-	<xsl:with-param name="string" select="$string"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="space.2005.subst">
-  <xsl:param name="string"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, '&#x2005;') and $space.4emspace.width != ''">
-      <xsl:call-template name="space.2006.subst">
-	<xsl:with-param name="string" select="substring-before($string, '&#x2005;')"/>
-      </xsl:call-template>
-      <fo:leader leader-length="{$space.4emspace.width}"/>
-      <xsl:call-template name="space.2005.subst">
-	<xsl:with-param name="string" select="substring-after($string, '&#x2005;')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="space.2006.subst">
-	<xsl:with-param name="string" select="$string"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="space.2006.subst">
-  <xsl:param name="string"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, '&#x2006;') and $space.6emspace.width != ''">
-      <xsl:call-template name="space.2007.subst">
-	<xsl:with-param name="string" select="substring-before($string, '&#x2006;')"/>
-      </xsl:call-template>
-      <fo:leader leader-length="{$space.6emspace.width}"/>
-      <xsl:call-template name="space.2006.subst">
-	<xsl:with-param name="string" select="substring-after($string, '&#x2006;')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="space.2007.subst">
-	<xsl:with-param name="string" select="$string"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="space.2007.subst">
-  <xsl:param name="string"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, '&#x2007;') and $space.figspace.width != ''">
-      <xsl:call-template name="space.2008.subst">
-	<xsl:with-param name="string" select="substring-before($string, '&#x2007;')"/>
-      </xsl:call-template>
-      <fo:leader leader-length="{$space.figspace.width}"/>
-      <xsl:call-template name="space.2007.subst">
-	<xsl:with-param name="string" select="substring-after($string, '&#x2007;')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="space.2008.subst">
-	<xsl:with-param name="string" select="$string"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="space.2008.subst">
-  <xsl:param name="string"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, '&#x2008;') and $space.punctspace.width != ''">
-      <xsl:call-template name="space.2009.subst">
-	<xsl:with-param name="string" select="substring-before($string, '&#x2008;')"/>
-      </xsl:call-template>
-      <fo:leader leader-length="{$space.punctspace.width}"/>
-      <xsl:call-template name="space.2008.subst">
-	<xsl:with-param name="string" select="substring-after($string, '&#x2008;')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="space.2009.subst">
-	<xsl:with-param name="string" select="$string"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="space.2009.subst">
-  <xsl:param name="string"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, '&#x2009;') and $space.thinspace.width != ''">
-      <xsl:call-template name="space.200A.subst">
-	<xsl:with-param name="string" select="substring-before($string, '&#x2009;')"/>
-      </xsl:call-template>
-      <fo:leader leader-length="{$space.thinspace.width}"/>
-      <xsl:call-template name="space.2009.subst">
-	<xsl:with-param name="string" select="substring-after($string, '&#x2009;')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="space.200A.subst">
-	<xsl:with-param name="string" select="$string"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="space.200A.subst">
-  <xsl:param name="string"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, '&#x200A;') and $space.hairspace.width != ''">
-      <xsl:value-of select="substring-before($string, '&#x200A;')"/>
-      <fo:leader leader-length="{$space.hairspace.width}"/>
-      <xsl:call-template name="space.200A.subst">
-	<xsl:with-param name="string" select="substring-after($string, '&#x200A;')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$string"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/synop.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/synop.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,967 +1,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE xsl:stylesheet [
-<!ENTITY RE "&#10;">
-<!ENTITY nbsp "&#160;">
-]>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!-- synopsis is in verbatim -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="cmdsynopsis">
-  <fo:block xsl:use-attribute-sets="normal.para.spacing">
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="cmdsynopsis/command">
-  <xsl:call-template name="inline.monoseq"/>
-  <xsl:text> </xsl:text>
-</xsl:template>
-
-<xsl:template match="cmdsynopsis/command[1]" priority="2">
-  <xsl:call-template name="inline.monoseq"/>
-  <xsl:text> </xsl:text>
-</xsl:template>
-
-<xsl:template match="group|arg" name="group-or-arg">
-  <xsl:variable name="choice" select="@choice"/>
-  <xsl:variable name="rep" select="@rep"/>
-  <xsl:variable name="sepchar">
-    <xsl:choose>
-      <xsl:when test="ancestor-or-self::*/@sepchar">
-        <xsl:value-of select="ancestor-or-self::*/@sepchar"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text> </xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:if test="preceding-sibling::*">
-    <xsl:value-of select="$sepchar"/>
-  </xsl:if>
-  <xsl:choose>
-    <xsl:when test="$choice='plain'">
-      <xsl:value-of select="$arg.choice.plain.open.str"/>
-    </xsl:when>
-    <xsl:when test="$choice='req'">
-      <xsl:value-of select="$arg.choice.req.open.str"/>
-    </xsl:when>
-    <xsl:when test="$choice='opt'">
-      <xsl:value-of select="$arg.choice.opt.open.str"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$arg.choice.def.open.str"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:apply-templates/>
-  <xsl:choose>
-    <xsl:when test="$rep='repeat'">
-      <xsl:value-of select="$arg.rep.repeat.str"/>
-    </xsl:when>
-    <xsl:when test="$rep='norepeat'">
-      <xsl:value-of select="$arg.rep.norepeat.str"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$arg.rep.def.str"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:choose>
-    <xsl:when test="$choice='plain'">
-      <xsl:value-of select="$arg.choice.plain.close.str"/>
-    </xsl:when>
-    <xsl:when test="$choice='req'">
-      <xsl:value-of select="$arg.choice.req.close.str"/>
-    </xsl:when>
-    <xsl:when test="$choice='opt'">
-      <xsl:value-of select="$arg.choice.opt.close.str"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$arg.choice.def.close.str"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="group/arg">
-  <xsl:variable name="choice" select="@choice"/>
-  <xsl:variable name="rep" select="@rep"/>
-  <xsl:if test="preceding-sibling::*">
-    <xsl:value-of select="$arg.or.sep"/>
-  </xsl:if>
-  <xsl:call-template name="group-or-arg"/>
-</xsl:template>
-
-<xsl:template match="sbr">
-  <fo:block/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="synopfragmentref">
-  <xsl:variable name="target" select="key('id',@linkend)"/>
-  <xsl:variable name="snum">
-    <xsl:apply-templates select="$target" mode="synopfragment.number"/>
-  </xsl:variable>
-  <fo:inline font-style="italic">
-    <fo:basic-link internal-destination="{@linkend}"
-                   xsl:use-attribute-sets="xref.properties">
-      <xsl:text>(</xsl:text>
-      <xsl:value-of select="$snum"/>
-      <xsl:text>)</xsl:text>
-    </fo:basic-link>
-    <xsl:text>&#160;</xsl:text>
-    <xsl:apply-templates/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="synopfragment" mode="synopfragment.number">
-  <xsl:number format="1"/>
-</xsl:template>
-
-<xsl:template match="synopfragment">
-  <xsl:variable name="snum">
-    <xsl:apply-templates select="." mode="synopfragment.number"/>
-  </xsl:variable>
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  <fo:block id="{$id}">
-    <xsl:text>(</xsl:text>
-    <xsl:value-of select="$snum"/>
-    <xsl:text>)</xsl:text>
-    <xsl:text> </xsl:text>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="funcsynopsis">
-  <xsl:call-template name="informal.object"/>
-</xsl:template>
-
-<xsl:template match="funcsynopsisinfo">
-  <fo:block space-after.minimum="0.8em"
-            space-after.optimum="1em"
-            space-after.maximum="1.2em">
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="funcprototype">
-  <fo:block font-family="{$monospace.font.family}"
-          space-before.minimum="0.8em"
-          space-before.optimum="1em"
-          space-before.maximum="1.2em">
-    <xsl:apply-templates/>
-    <xsl:if test="$funcsynopsis.style='kr'">
-      <fo:block
-          space-before.minimum="0.8em"
-          space-before.optimum="1em"
-          space-before.maximum="1.2em">
-      <xsl:apply-templates select="./paramdef" mode="kr-funcsynopsis-mode"/>
-      </fo:block>
-    </xsl:if>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="funcdef">
-  <fo:inline font-family="{$monospace.font.family}">
-    <xsl:apply-templates/>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template match="funcdef/function">
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.decoration != 0">
-      <fo:inline font-weight="bold">
-        <xsl:apply-templates/>
-      </fo:inline>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="void">
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.style='ansi'">
-      <xsl:text>(void);</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text>();</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="varargs">
-  <xsl:text>(...);</xsl:text>
-</xsl:template>
-
-<xsl:template match="paramdef">
-  <xsl:variable name="paramnum">
-    <xsl:number count="paramdef" format="1"/>
-  </xsl:variable>
-  <xsl:if test="$paramnum=1">(</xsl:if>
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.style='ansi'">
-      <xsl:apply-templates/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="./parameter"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:choose>
-    <xsl:when test="following-sibling::paramdef">
-      <xsl:text>, </xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text>);</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="paramdef/parameter">
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.decoration != 0">
-      <xsl:call-template name="inline.italicseq"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:if test="following-sibling::parameter">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="paramdef" mode="kr-funcsynopsis-mode">
-  <fo:block>
-    <xsl:apply-templates/>
-    <xsl:text>;</xsl:text>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="funcparams">
-  <xsl:text>(</xsl:text>
-  <xsl:apply-templates/>
-  <xsl:text>)</xsl:text>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:variable name="default-classsynopsis-language">java</xsl:variable>
-
-<xsl:template match="classsynopsis
-                     |fieldsynopsis
-                     |methodsynopsis
-                     |constructorsynopsis
-                     |destructorsynopsis">
-  <xsl:param name="language">
-    <xsl:choose>
-      <xsl:when test="@language">
-	<xsl:value-of select="@language"/>
-      </xsl:when>
-      <xsl:otherwise>
-	<xsl:value-of select="$default-classsynopsis-language"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:param>
-
-  <!--
-  <xsl:message>process <xsl:value-of select="local-name(.)"/> in <xsl:value-of select="$language"/></xsl:message>
-  -->
-
-  <xsl:choose>
-    <xsl:when test="$language='java' or $language='Java'">
-      <xsl:apply-templates select="." mode="java"/>
-    </xsl:when>
-    <xsl:when test="$language='perl' or $language='Perl'">
-      <xsl:apply-templates select="." mode="perl"/>
-    </xsl:when>
-    <xsl:when test="$language='idl' or $language='IDL'">
-      <xsl:apply-templates select="." mode="idl"/>
-    </xsl:when>
-    <xsl:when test="$language='cpp' or $language='c++' or $language='C++'">
-      <xsl:apply-templates select="." mode="cpp"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message>
-	<xsl:text>Unrecognized language on </xsl:text>
-        <xsl:value-of select="local-name(.)"/>
-        <xsl:text>: </xsl:text>
-	<xsl:value-of select="$language"/>
-      </xsl:message>
-      <xsl:apply-templates select=".">
-	<xsl:with-param name="language"
-	  select="$default-classsynopsis-language"/>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="synop-break">
-  <xsl:if test="parent::classsynopsis
-                or (following-sibling::fieldsynopsis
-                    |following-sibling::methodsynopsis
-                    |following-sibling::constructorsynopsis
-                    |following-sibling::destructorsynopsis)">
-    <fo:inline>&RE;</fo:inline>
-  </xsl:if>
-</xsl:template>
-
-<!-- ===== Java ======================================================== -->
-
-<xsl:template match="classsynopsis" mode="java">
-  <fo:block wrap-option='no-wrap'
-            white-space-collapse='false'
-            linefeed-treatment="preserve"
-            xsl:use-attribute-sets="monospace.verbatim.properties">
-    <xsl:apply-templates select="ooclass[1]" mode="java"/>
-    <xsl:if test="ooclass[preceding-sibling::*]">
-      <xsl:text> extends</xsl:text>
-      <xsl:apply-templates select="ooclass[preceding-sibling::*]" mode="java"/>
-      <xsl:if test="oointerface|ooexception">
-        <xsl:text>&RE;&nbsp;&nbsp;&nbsp;&nbsp;</xsl:text>
-      </xsl:if>
-    </xsl:if>
-    <xsl:if test="oointerface">
-      <xsl:text>implements</xsl:text>
-      <xsl:apply-templates select="oointerface" mode="java"/>
-      <xsl:if test="ooexception">
-	<xsl:text>&RE;&nbsp;&nbsp;&nbsp;&nbsp;</xsl:text>
-      </xsl:if>
-    </xsl:if>
-    <xsl:if test="ooexception">
-      <xsl:text>throws</xsl:text>
-      <xsl:apply-templates select="ooexception" mode="java"/>
-    </xsl:if>
-    <xsl:text>&nbsp;{&RE;</xsl:text>
-    <xsl:apply-templates select="constructorsynopsis
-                                 |destructorsynopsis
-                                 |fieldsynopsis
-                                 |methodsynopsis
-                                 |classsynopsisinfo" mode="java"/>
-    <xsl:text>}</xsl:text>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="classsynopsisinfo" mode="java">
-  <xsl:apply-templates mode="java"/>
-</xsl:template>
-
-<xsl:template match="ooclass|oointerface|ooexception" mode="java">
-  <xsl:choose>
-    <xsl:when test="preceding-sibling::*">
-      <xsl:text>, </xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text> </xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:apply-templates mode="java"/>
-</xsl:template>
-
-<xsl:template match="modifier|package" mode="java">
-  <xsl:apply-templates mode="java"/>
-  <xsl:if test="following-sibling::*">
-    <xsl:text>&nbsp;</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="classname" mode="java">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'classname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="java"/>
-</xsl:template>
-
-<xsl:template match="interfacename" mode="java">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'interfacename'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="java"/>
-</xsl:template>
-
-<xsl:template match="exceptionname" mode="java">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'exceptionname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="java"/>
-</xsl:template>
-
-<xsl:template match="fieldsynopsis" mode="java">
-  <fo:block wrap-option='no-wrap'
-            white-space-collapse='false'
-            linefeed-treatment="preserve"
-            xsl:use-attribute-sets="monospace.verbatim.properties">
-    <xsl:text>&nbsp;&nbsp;</xsl:text>
-    <xsl:apply-templates mode="java"/>
-    <xsl:text>;</xsl:text>
-    <xsl:call-template name="synop-break"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="type" mode="java">
-  <xsl:apply-templates mode="java"/>
-  <xsl:text>&nbsp;</xsl:text>
-</xsl:template>
-
-<xsl:template match="varname" mode="java">
-  <xsl:apply-templates mode="java"/>
-  <xsl:text>&nbsp;</xsl:text>
-</xsl:template>
-
-<xsl:template match="initializer" mode="java">
-  <xsl:text>=&nbsp;</xsl:text>
-  <xsl:apply-templates mode="java"/>
-</xsl:template>
-
-<xsl:template match="void" mode="java">
-  <xsl:text>void&nbsp;</xsl:text>
-</xsl:template>
-
-<xsl:template match="methodname" mode="java">
-  <xsl:apply-templates mode="java"/>
-</xsl:template>
-
-<xsl:template match="methodparam" mode="java">
-  <xsl:param name="indent">0</xsl:param>
-  <xsl:if test="preceding-sibling::methodparam">
-    <xsl:text>,&RE;</xsl:text>
-    <xsl:if test="$indent &gt; 0">
-      <xsl:call-template name="copy-string">
-	<xsl:with-param name="string">&nbsp;</xsl:with-param>
-	<xsl:with-param name="count" select="$indent + 1"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:if>
-  <xsl:apply-templates mode="java"/>
-</xsl:template>
-
-<xsl:template match="parameter" mode="java">
-  <xsl:apply-templates mode="java"/>
-</xsl:template>
-
-<xsl:template mode="java"
-  match="constructorsynopsis|destructorsynopsis|methodsynopsis">
-  <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[local-name(.) != 'modifier']]"/>
-  <xsl:variable name="notmod" select="*[local-name(.) != 'modifier']"/>
-  <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"/>
-  <xsl:variable name="decl">
-    <xsl:text>  </xsl:text>
-    <xsl:apply-templates select="$start-modifiers" mode="java"/>
-
-    <!-- type -->
-    <xsl:if test="local-name($notmod[1]) != 'methodname'">
-      <xsl:apply-templates select="$notmod[1]" mode="java"/>
-    </xsl:if>
-
-    <xsl:apply-templates select="methodname" mode="java"/>
-  </xsl:variable>
-
-  <fo:block wrap-option='no-wrap'
-            white-space-collapse='false'
-            linefeed-treatment="preserve"
-            xsl:use-attribute-sets="monospace.verbatim.properties">
-    <xsl:copy-of select="$decl"/>
-    <xsl:text>(</xsl:text>
-    <xsl:apply-templates select="methodparam" mode="java">
-      <xsl:with-param name="indent" select="string-length($decl)"/>
-    </xsl:apply-templates>
-    <xsl:text>)</xsl:text>
-    <xsl:if test="exceptionname">
-      <xsl:text>&RE;&nbsp;&nbsp;&nbsp;&nbsp;throws&nbsp;</xsl:text>
-      <xsl:apply-templates select="exceptionname" mode="java"/>
-    </xsl:if>
-    <xsl:if test="modifier[preceding-sibling::*[local-name(.) != 'modifier']]">
-      <xsl:text> </xsl:text>
-      <xsl:apply-templates select="$end-modifiers" mode="java"/>
-    </xsl:if>
-    <xsl:text>;</xsl:text>
-  </fo:block>
-  <xsl:call-template name="synop-break"/>
-</xsl:template>
-
-<!-- ===== C++ ========================================================= -->
-
-<xsl:template match="classsynopsis" mode="cpp">
-  <fo:block wrap-option='no-wrap'
-            white-space-collapse='false'
-            linefeed-treatment="preserve"
-            xsl:use-attribute-sets="monospace.verbatim.properties">
-    <xsl:apply-templates select="ooclass[1]" mode="cpp"/>
-    <xsl:if test="ooclass[preceding-sibling::*]">
-      <xsl:text>: </xsl:text>
-      <xsl:apply-templates select="ooclass[preceding-sibling::*]" mode="cpp"/>
-      <xsl:if test="oointerface|ooexception">
-	<xsl:text>&RE;&nbsp;&nbsp;&nbsp;&nbsp;</xsl:text>
-      </xsl:if>
-    </xsl:if>
-    <xsl:if test="oointerface">
-      <xsl:text> implements</xsl:text>
-      <xsl:apply-templates select="oointerface" mode="cpp"/>
-      <xsl:if test="ooexception">
-	<xsl:text>&RE;&nbsp;&nbsp;&nbsp;&nbsp;</xsl:text>
-      </xsl:if>
-    </xsl:if>
-    <xsl:if test="ooexception">
-      <xsl:text> throws</xsl:text>
-      <xsl:apply-templates select="ooexception" mode="cpp"/>
-    </xsl:if>
-    <xsl:text>&nbsp;{&RE;</xsl:text>
-    <xsl:apply-templates select="constructorsynopsis
-                                 |destructorsynopsis
-                                 |fieldsynopsis
-                                 |methodsynopsis
-                                 |classsynopsisinfo" mode="cpp"/>
-    <xsl:text>}</xsl:text>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="classsynopsisinfo" mode="cpp">
-  <xsl:apply-templates mode="cpp"/>
-</xsl:template>
-
-<xsl:template match="ooclass|oointerface|ooexception" mode="cpp">
-  <xsl:if test="preceding-sibling::*">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="cpp"/>
-</xsl:template>
-
-<xsl:template match="modifier|package" mode="cpp">
-  <xsl:apply-templates mode="cpp"/>
-    <xsl:if test="following-sibling::*">
-      <xsl:text>&nbsp;</xsl:text>
-    </xsl:if>
-</xsl:template>
-
-<xsl:template match="classname" mode="cpp">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'classname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="cpp"/>
-</xsl:template>
-
-<xsl:template match="interfacename" mode="cpp">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'interfacename'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="cpp"/>
-</xsl:template>
-
-<xsl:template match="exceptionname" mode="cpp">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'exceptionname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="cpp"/>
-</xsl:template>
-
-<xsl:template match="fieldsynopsis" mode="cpp">
-  <fo:block wrap-option='no-wrap'
-            white-space-collapse='false'
-            linefeed-treatment="preserve"
-            xsl:use-attribute-sets="monospace.verbatim.properties">
-    <xsl:text>&nbsp;&nbsp;</xsl:text>
-    <xsl:apply-templates mode="cpp"/>
-    <xsl:text>;</xsl:text>
-  </fo:block>
-  <xsl:call-template name="synop-break"/>
-</xsl:template>
-
-<xsl:template match="type" mode="cpp">
-  <xsl:apply-templates mode="cpp"/>
-  <xsl:text>&nbsp;</xsl:text>
-</xsl:template>
-
-<xsl:template match="varname" mode="cpp">
-  <xsl:apply-templates mode="cpp"/>
-  <xsl:text>&nbsp;</xsl:text>
-</xsl:template>
-
-<xsl:template match="initializer" mode="cpp">
-  <xsl:text>=&nbsp;</xsl:text>
-  <xsl:apply-templates mode="cpp"/>
-</xsl:template>
-
-<xsl:template match="void" mode="cpp">
-  <xsl:text>void&nbsp;</xsl:text>
-</xsl:template>
-
-<xsl:template match="methodname" mode="cpp">
-  <xsl:apply-templates mode="cpp"/>
-</xsl:template>
-
-<xsl:template match="methodparam" mode="cpp">
-  <xsl:if test="preceding-sibling::methodparam">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="cpp"/>
-</xsl:template>
-
-<xsl:template match="parameter" mode="cpp">
-  <xsl:apply-templates mode="cpp"/>
-</xsl:template>
-
-<xsl:template mode="cpp"
-  match="constructorsynopsis|destructorsynopsis|methodsynopsis">
-  <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[local-name(.) != 'modifier']]"/>
-  <xsl:variable name="notmod" select="*[local-name(.) != 'modifier']"/>
-  <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"/>
-
-  <fo:block wrap-option='no-wrap'
-            white-space-collapse='false'
-            linefeed-treatment="preserve"
-            xsl:use-attribute-sets="monospace.verbatim.properties">
-    <xsl:text>  </xsl:text>
-    <xsl:apply-templates select="$start-modifiers" mode="cpp"/>
-
-    <!-- type -->
-    <xsl:if test="local-name($notmod[1]) != 'methodname'">
-      <xsl:apply-templates select="$notmod[1]" mode="cpp"/>
-    </xsl:if>
-
-    <xsl:apply-templates select="methodname" mode="cpp"/>
-    <xsl:text>(</xsl:text>
-    <xsl:apply-templates select="methodparam" mode="cpp"/>
-    <xsl:text>)</xsl:text>
-    <xsl:if test="exceptionname">
-      <xsl:text>&RE;&nbsp;&nbsp;&nbsp;&nbsp;throws&nbsp;</xsl:text>
-      <xsl:apply-templates select="exceptionname" mode="cpp"/>
-    </xsl:if>
-    <xsl:if test="modifier[preceding-sibling::*[local-name(.) != 'modifier']]">
-      <xsl:text> </xsl:text>
-      <xsl:apply-templates select="$end-modifiers" mode="cpp"/>
-    </xsl:if>
-    <xsl:text>;</xsl:text>
-  </fo:block>
-  <xsl:call-template name="synop-break"/>
-</xsl:template>
-
-<!-- ===== IDL ========================================================= -->
-
-<xsl:template match="classsynopsis" mode="idl">
-  <fo:block wrap-option='no-wrap'
-            white-space-collapse='false'
-            linefeed-treatment="preserve"
-            xsl:use-attribute-sets="monospace.verbatim.properties">
-    <xsl:text>interface </xsl:text>
-    <xsl:apply-templates select="ooclass[1]" mode="idl"/>
-    <xsl:if test="ooclass[preceding-sibling::*]">
-      <xsl:text>: </xsl:text>
-      <xsl:apply-templates select="ooclass[preceding-sibling::*]" mode="idl"/>
-      <xsl:if test="oointerface|ooexception">
-	<xsl:text>&RE;&nbsp;&nbsp;&nbsp;&nbsp;</xsl:text>
-      </xsl:if>
-    </xsl:if>
-    <xsl:if test="oointerface">
-      <xsl:text> implements</xsl:text>
-      <xsl:apply-templates select="oointerface" mode="idl"/>
-      <xsl:if test="ooexception">
-	<xsl:text>&RE;&nbsp;&nbsp;&nbsp;&nbsp;</xsl:text>
-      </xsl:if>
-    </xsl:if>
-    <xsl:if test="ooexception">
-      <xsl:text> throws</xsl:text>
-      <xsl:apply-templates select="ooexception" mode="idl"/>
-    </xsl:if>
-    <xsl:text>&nbsp;{&RE;</xsl:text>
-    <xsl:apply-templates select="constructorsynopsis
-                                 |destructorsynopsis
-                                 |fieldsynopsis
-                                 |methodsynopsis
-                                 |classsynopsisinfo" mode="idl"/>
-    <xsl:text>}</xsl:text>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="classsynopsisinfo" mode="idl">
-  <xsl:apply-templates mode="idl"/>
-</xsl:template>
-
-<xsl:template match="ooclass|oointerface|ooexception" mode="idl">
-  <xsl:if test="preceding-sibling::*">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="idl"/>
-</xsl:template>
-
-<xsl:template match="modifier|package" mode="idl">
-  <xsl:apply-templates mode="idl"/>
-    <xsl:if test="following-sibling::*">
-      <xsl:text>&nbsp;</xsl:text>
-    </xsl:if>
-</xsl:template>
-
-<xsl:template match="classname" mode="idl">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'classname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="idl"/>
-</xsl:template>
-
-<xsl:template match="interfacename" mode="idl">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'interfacename'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="idl"/>
-</xsl:template>
-
-<xsl:template match="exceptionname" mode="idl">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'exceptionname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="idl"/>
-</xsl:template>
-
-<xsl:template match="fieldsynopsis" mode="idl">
-  <fo:block wrap-option='no-wrap'
-            white-space-collapse='false'
-            linefeed-treatment="preserve"
-            xsl:use-attribute-sets="monospace.verbatim.properties">
-    <xsl:text>&nbsp;&nbsp;</xsl:text>
-    <xsl:apply-templates mode="idl"/>
-    <xsl:text>;</xsl:text>
-  </fo:block>
-  <xsl:call-template name="synop-break"/>
-</xsl:template>
-
-<xsl:template match="type" mode="idl">
-  <xsl:apply-templates mode="idl"/>
-  <xsl:text>&nbsp;</xsl:text>
-</xsl:template>
-
-<xsl:template match="varname" mode="idl">
-  <xsl:apply-templates mode="idl"/>
-  <xsl:text>&nbsp;</xsl:text>
-</xsl:template>
-
-<xsl:template match="initializer" mode="idl">
-  <xsl:text>=&nbsp;</xsl:text>
-  <xsl:apply-templates mode="idl"/>
-</xsl:template>
-
-<xsl:template match="void" mode="idl">
-  <xsl:text>void&nbsp;</xsl:text>
-</xsl:template>
-
-<xsl:template match="methodname" mode="idl">
-  <xsl:apply-templates mode="idl"/>
-</xsl:template>
-
-<xsl:template match="methodparam" mode="idl">
-  <xsl:if test="preceding-sibling::methodparam">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="idl"/>
-</xsl:template>
-
-<xsl:template match="parameter" mode="idl">
-  <xsl:apply-templates mode="idl"/>
-</xsl:template>
-
-<xsl:template mode="idl"
-  match="constructorsynopsis|destructorsynopsis|methodsynopsis">
-  <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[local-name(.) != 'modifier']]"/>
-  <xsl:variable name="notmod" select="*[local-name(.) != 'modifier']"/>
-  <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"/>
-
-  <fo:block wrap-option='no-wrap'
-            white-space-collapse='false'
-            linefeed-treatment="preserve"
-            xsl:use-attribute-sets="monospace.verbatim.properties">
-    <xsl:text>  </xsl:text>
-    <xsl:apply-templates select="$start-modifiers" mode="idl"/>
-
-    <!-- type -->
-    <xsl:if test="local-name($notmod[1]) != 'methodname'">
-      <xsl:apply-templates select="$notmod[1]" mode="idl"/>
-    </xsl:if>
-
-    <xsl:apply-templates select="methodname" mode="idl"/>
-    <xsl:text>(</xsl:text>
-    <xsl:apply-templates select="methodparam" mode="idl"/>
-    <xsl:text>)</xsl:text>
-    <xsl:if test="exceptionname">
-      <xsl:text>&RE;&nbsp;&nbsp;&nbsp;&nbsp;raises(</xsl:text>
-      <xsl:apply-templates select="exceptionname" mode="idl"/>
-      <xsl:text>)</xsl:text>
-    </xsl:if>
-    <xsl:if test="modifier[preceding-sibling::*[local-name(.) != 'modifier']]">
-      <xsl:text> </xsl:text>
-      <xsl:apply-templates select="$end-modifiers" mode="idl"/>
-    </xsl:if>
-    <xsl:text>;</xsl:text>
-  </fo:block>
-  <xsl:call-template name="synop-break"/>
-</xsl:template>
-
-<!-- ===== Perl ======================================================== -->
-
-<xsl:template match="classsynopsis" mode="perl">
-  <fo:block wrap-option='no-wrap'
-            white-space-collapse='false'
-            linefeed-treatment="preserve"
-            xsl:use-attribute-sets="monospace.verbatim.properties">
-    <xsl:text>package </xsl:text>
-    <xsl:apply-templates select="ooclass[1]" mode="perl"/>
-    <xsl:text>;&RE;</xsl:text>
-
-    <xsl:if test="ooclass[preceding-sibling::*]">
-      <xsl:text>@ISA = (</xsl:text>
-      <xsl:apply-templates select="ooclass[preceding-sibling::*]" mode="perl"/>
-      <xsl:text>);&RE;</xsl:text>
-    </xsl:if>
-
-    <xsl:apply-templates select="constructorsynopsis
-                                 |destructorsynopsis
-                                 |fieldsynopsis
-                                 |methodsynopsis
-                                 |classsynopsisinfo" mode="perl"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="classsynopsisinfo" mode="perl">
-  <xsl:apply-templates mode="perl"/>
-</xsl:template>
-
-<xsl:template match="ooclass|oointerface|ooexception" mode="perl">
-  <xsl:if test="preceding-sibling::*">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="perl"/>
-</xsl:template>
-
-<xsl:template match="modifier|package" mode="perl">
-  <xsl:apply-templates mode="perl"/>
-    <xsl:if test="following-sibling::*">
-      <xsl:text>&nbsp;</xsl:text>
-    </xsl:if>
-</xsl:template>
-
-<xsl:template match="classname" mode="perl">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'classname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="perl"/>
-</xsl:template>
-
-<xsl:template match="interfacename" mode="perl">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'interfacename'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="perl"/>
-</xsl:template>
-
-<xsl:template match="exceptionname" mode="perl">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'exceptionname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="perl"/>
-</xsl:template>
-
-<xsl:template match="fieldsynopsis" mode="perl">
-  <fo:block wrap-option='no-wrap'
-            white-space-collapse='false'
-            linefeed-treatment="preserve"
-            xsl:use-attribute-sets="monospace.verbatim.properties">
-    <xsl:text>&nbsp;&nbsp;</xsl:text>
-    <xsl:apply-templates mode="perl"/>
-    <xsl:text>;</xsl:text>
-  </fo:block>
-  <xsl:call-template name="synop-break"/>
-</xsl:template>
-
-<xsl:template match="type" mode="perl">
-  <xsl:apply-templates mode="perl"/>
-  <xsl:text>&nbsp;</xsl:text>
-</xsl:template>
-
-<xsl:template match="varname" mode="perl">
-  <xsl:apply-templates mode="perl"/>
-  <xsl:text>&nbsp;</xsl:text>
-</xsl:template>
-
-<xsl:template match="initializer" mode="perl">
-  <xsl:text>=&nbsp;</xsl:text>
-  <xsl:apply-templates mode="perl"/>
-</xsl:template>
-
-<xsl:template match="void" mode="perl">
-  <xsl:text>void&nbsp;</xsl:text>
-</xsl:template>
-
-<xsl:template match="methodname" mode="perl">
-  <xsl:apply-templates mode="perl"/>
-</xsl:template>
-
-<xsl:template match="methodparam" mode="perl">
-  <xsl:if test="preceding-sibling::methodparam">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="perl"/>
-</xsl:template>
-
-<xsl:template match="parameter" mode="perl">
-  <xsl:apply-templates mode="perl"/>
-</xsl:template>
-
-<xsl:template mode="perl"
-  match="constructorsynopsis|destructorsynopsis|methodsynopsis">
-  <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[local-name(.) != 'modifier']]"/>
-  <xsl:variable name="notmod" select="*[local-name(.) != 'modifier']"/>
-  <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"/>
-
-  <fo:block wrap-option='no-wrap'
-            white-space-collapse='false'
-            linefeed-treatment="preserve"
-            xsl:use-attribute-sets="monospace.verbatim.properties">
-    <xsl:text>sub </xsl:text>
-
-    <xsl:apply-templates select="methodname" mode="perl"/>
-    <xsl:text> { ... };</xsl:text>
-    <xsl:call-template name="synop-break"/>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- * DocBook 5 allows linking elements (link, olink, and xref) -->
-<!-- * within the OO *synopsis elements (classsynopsis, fieldsynopsis, -->
-<!-- * methodsynopsis, constructorsynopsis, destructorsynopsis) and -->
-<!-- * their children. So we need to have mode="java|cpp|idl|perl" -->
-<!-- * per-mode matches for those linking elements in order for them -->
-<!-- * to be processed as expected. -->
-
-<xsl:template match="link|olink|xref" mode="java">
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template match="link|olink|xref" mode="cpp">
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template match="link|olink|xref" mode="idl">
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template match="link|olink|xref" mode="perl">
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/table.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/table.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,1535 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:rx="http://www.renderx.com/XSL/Extensions"
-                xmlns:stbl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Table"
-                xmlns:xtbl="com.nwalsh.xalan.Table"
-                xmlns:lxslt="http://xml.apache.org/xslt"
-                xmlns:ptbl="http://nwalsh.com/xslt/ext/xsltproc/python/Table"
-                exclude-result-prefixes="doc stbl xtbl lxslt ptbl"
-                version='1.0'>
-
-<xsl:include href="../common/table.xsl"/>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<doc:reference xmlns="" xml:id="table-templates">
-  <?dbhtml dir="fo"?>
-  <info>
-    <title>Formatting Object Table Reference</title>
-    <releaseinfo role="meta">
-      $Id$
-    </releaseinfo>
-  </info>
-  <partintro xml:id="partintro">
-    <title>Introduction</title>
-    <para>This is technical reference documentation for the FO
-      table-processing templates in the DocBook XSL Stylesheets.</para>
-    <para>This is not intended to be user documentation.  It is
-      provided for developers writing customization layers for the
-      stylesheets.</para>
-  </partintro>
-</doc:reference>
-
-<!-- ==================================================================== -->
-
-<lxslt:component prefix="xtbl"
-                 functions="adjustColumnWidths"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="make.table.content">
-  <xsl:choose>
-    <xsl:when test="tgroup|mediaobject|graphic">
-      <xsl:call-template name="calsTable"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="." mode="htmlTable"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="calsTable">
-
-  <xsl:variable name="keep.together">
-    <xsl:call-template name="pi.dbfo_keep-together"/>
-  </xsl:variable>
-
-  <xsl:for-each select="tgroup">
-
-    <fo:table xsl:use-attribute-sets="table.table.properties">
-      <xsl:if test="$keep.together != ''">
-        <xsl:attribute name="keep-together.within-column">
-          <xsl:value-of select="$keep.together"/>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:call-template name="table.frame"/>
-      <xsl:if test="following-sibling::tgroup">
-        <xsl:attribute name="border-bottom-width">0pt</xsl:attribute>
-        <xsl:attribute name="border-bottom-style">none</xsl:attribute>
-        <xsl:attribute name="padding-bottom">0pt</xsl:attribute>
-        <xsl:attribute name="margin-bottom">0pt</xsl:attribute>
-        <xsl:attribute name="space-after">0pt</xsl:attribute>
-        <xsl:attribute name="space-after.minimum">0pt</xsl:attribute>
-        <xsl:attribute name="space-after.optimum">0pt</xsl:attribute>
-        <xsl:attribute name="space-after.maximum">0pt</xsl:attribute>
-      </xsl:if>
-      <xsl:if test="preceding-sibling::tgroup">
-        <xsl:attribute name="border-top-width">0pt</xsl:attribute>
-        <xsl:attribute name="border-top-style">none</xsl:attribute>
-        <xsl:attribute name="padding-top">0pt</xsl:attribute>
-        <xsl:attribute name="margin-top">0pt</xsl:attribute>
-        <xsl:attribute name="space-before">0pt</xsl:attribute>
-        <xsl:attribute name="space-before.minimum">0pt</xsl:attribute>
-        <xsl:attribute name="space-before.optimum">0pt</xsl:attribute>
-        <xsl:attribute name="space-before.maximum">0pt</xsl:attribute>
-      </xsl:if>
-      <xsl:apply-templates select="."/>
-    </fo:table>
-  </xsl:for-each>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- Placeholder template enables wrapping a fo:table in
-     another table for purposes of layout or applying
-     extensions such as XEP table-omit-initial-header to
-     create "continued" titles on page breaks. -->
-<xsl:template name="table.layout">
-  <xsl:param name="table.content" select="NOTANODE"/>
-
-  <xsl:copy-of select="$table.content"/>
-</xsl:template>
-
-<xsl:template name="table.block">
-  <xsl:param name="table.layout" select="NOTANODE"/>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="param.placement"
-                select="substring-after(normalize-space(
-                   $formal.title.placement), concat(local-name(.), ' '))"/>
-
-  <xsl:variable name="placement">
-    <xsl:choose>
-      <xsl:when test="contains($param.placement, ' ')">
-        <xsl:value-of select="substring-before($param.placement, ' ')"/>
-      </xsl:when>
-      <xsl:when test="$param.placement = ''">before</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$param.placement"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="self::table">
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="table.properties">
-        <xsl:if test="$placement = 'before'">
-          <xsl:call-template name="formal.object.heading">
-            <xsl:with-param name="placement" select="$placement"/>
-          </xsl:call-template>
-        </xsl:if>
-        <xsl:copy-of select="$table.layout"/>
-        <xsl:call-template name="table.footnote.block"/>
-        <xsl:if test="$placement != 'before'">
-          <xsl:call-template name="formal.object.heading">
-            <xsl:with-param name="placement" select="$placement"/>
-          </xsl:call-template>
-        </xsl:if>
-      </fo:block>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="informaltable.properties">
-        <xsl:copy-of select="$table.layout"/>
-        <xsl:call-template name="table.footnote.block"/>
-      </fo:block>
-    </xsl:otherwise>
-  </xsl:choose>
-
-
-</xsl:template>
-
-<!-- Output a table's footnotes in a block -->
-<xsl:template name="table.footnote.block">
-  <xsl:if test=".//footnote">
-    <fo:block keep-with-previous.within-column="always">
-      <xsl:apply-templates select=".//footnote" mode="table.footnote.mode"/>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="table.container">
-  <xsl:param name="table.block"/>
-  <xsl:choose>
-    <xsl:when test="@orient='land' and 
-                    $fop.extensions = 0 and 
-                    $passivetex.extensions = 0" >
-      <fo:block-container reference-orientation="90"
-            padding="6pt"
-            xsl:use-attribute-sets="list.block.spacing">
-        <xsl:attribute name="width">
-          <xsl:call-template name="table.width"/>
-        </xsl:attribute>
-        <fo:block start-indent="0pt" end-indent="0pt">
-          <xsl:copy-of select="$table.block"/>
-        </fo:block>
-      </fo:block-container>
-    </xsl:when>
-    <xsl:when test="@pgwide = 1">
-      <fo:block xsl:use-attribute-sets="pgwide.properties">
-        <xsl:copy-of select="$table.block"/>
-      </fo:block>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$table.block"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="empty.table.cell">
-  <xsl:param name="colnum" select="0"/>
-
-  <xsl:variable name="rowsep">
-    <xsl:choose>
-      <!-- If this is the last row, rowsep never applies. -->
-      <xsl:when test="not(ancestor-or-self::row[1]/following-sibling::row
-                          or ancestor-or-self::thead/following-sibling::tbody
-                          or ancestor-or-self::tbody/preceding-sibling::tfoot)">
-        <xsl:value-of select="0"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="inherited.table.attribute">
-          <xsl:with-param name="entry" select="NOT-AN-ELEMENT-NAME"/>
-          <xsl:with-param name="row" select="ancestor-or-self::row[1]"/>
-          <xsl:with-param name="colnum" select="$colnum"/>
-          <xsl:with-param name="attribute" select="'rowsep'"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="colsep">
-    <xsl:choose>
-      <!-- If this is the last column, colsep never applies. -->
-      <xsl:when test="number($colnum) &gt;= ancestor::tgroup/@cols">0</xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="inherited.table.attribute">
-          <xsl:with-param name="entry" select="NOT-AN-ELEMENT-NAME"/>
-          <xsl:with-param name="row" select="ancestor-or-self::row[1]"/>
-          <xsl:with-param name="colnum" select="$colnum"/>
-          <xsl:with-param name="attribute" select="'colsep'"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <fo:table-cell text-align="center"
-                 display-align="center"
-                 xsl:use-attribute-sets="table.cell.padding">
-    <xsl:if test="$xep.extensions != 0">
-      <!-- Suggested by RenderX to workaround a bug in their implementation -->
-      <xsl:attribute name="keep-together.within-column">always</xsl:attribute>
-    </xsl:if>
-    <xsl:if test="$rowsep &gt; 0">
-      <xsl:call-template name="border">
-        <xsl:with-param name="side" select="'bottom'"/>
-      </xsl:call-template>
-    </xsl:if>
-
-    <xsl:if test="$colsep &gt; 0 and number($colnum) &lt; ancestor::tgroup/@cols">
-      <xsl:call-template name="border">
-        <xsl:with-param name="side" select="'right'"/>
-      </xsl:call-template>
-    </xsl:if>
-
-    <!-- fo:table-cell should not be empty -->
-    <fo:block/>
-  </fo:table-cell>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<xsl:template name="table.frame">
-  <xsl:variable name="frame">
-    <xsl:choose>
-      <xsl:when test="../@frame">
-        <xsl:value-of select="../@frame"/>
-      </xsl:when>
-      <xsl:when test="$default.table.frame != ''">
-        <xsl:value-of select="$default.table.frame"/>
-      </xsl:when>
-      <xsl:otherwise>all</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$frame='all'">
-      <xsl:attribute name="border-left-style">
-        <xsl:value-of select="$table.frame.border.style"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-right-style">
-        <xsl:value-of select="$table.frame.border.style"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-top-style">
-        <xsl:value-of select="$table.frame.border.style"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-bottom-style">
-        <xsl:value-of select="$table.frame.border.style"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-left-width">
-        <xsl:value-of select="$table.frame.border.thickness"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-right-width">
-        <xsl:value-of select="$table.frame.border.thickness"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-top-width">
-        <xsl:value-of select="$table.frame.border.thickness"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-bottom-width">
-        <xsl:value-of select="$table.frame.border.thickness"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-left-color">
-        <xsl:value-of select="$table.frame.border.color"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-right-color">
-        <xsl:value-of select="$table.frame.border.color"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-top-color">
-        <xsl:value-of select="$table.frame.border.color"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-bottom-color">
-        <xsl:value-of select="$table.frame.border.color"/>
-      </xsl:attribute>
-    </xsl:when>
-    <xsl:when test="$frame='bottom'">
-      <xsl:attribute name="border-left-style">none</xsl:attribute>
-      <xsl:attribute name="border-right-style">none</xsl:attribute>
-      <xsl:attribute name="border-top-style">none</xsl:attribute>
-      <xsl:attribute name="border-bottom-style">
-        <xsl:value-of select="$table.frame.border.style"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-bottom-width">
-        <xsl:value-of select="$table.frame.border.thickness"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-bottom-color">
-        <xsl:value-of select="$table.frame.border.color"/>
-      </xsl:attribute>
-    </xsl:when>
-    <xsl:when test="$frame='sides'">
-      <xsl:attribute name="border-left-style">
-        <xsl:value-of select="$table.frame.border.style"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-right-style">
-        <xsl:value-of select="$table.frame.border.style"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-top-style">none</xsl:attribute>
-      <xsl:attribute name="border-bottom-style">none</xsl:attribute>
-      <xsl:attribute name="border-left-width">
-        <xsl:value-of select="$table.frame.border.thickness"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-right-width">
-        <xsl:value-of select="$table.frame.border.thickness"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-left-color">
-        <xsl:value-of select="$table.frame.border.color"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-right-color">
-        <xsl:value-of select="$table.frame.border.color"/>
-      </xsl:attribute>
-    </xsl:when>
-    <xsl:when test="$frame='top'">
-      <xsl:attribute name="border-left-style">none</xsl:attribute>
-      <xsl:attribute name="border-right-style">none</xsl:attribute>
-      <xsl:attribute name="border-top-style">
-        <xsl:value-of select="$table.frame.border.style"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-bottom-style">none</xsl:attribute>
-      <xsl:attribute name="border-top-width">
-        <xsl:value-of select="$table.frame.border.thickness"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-top-color">
-        <xsl:value-of select="$table.frame.border.color"/>
-      </xsl:attribute>
-    </xsl:when>
-    <xsl:when test="$frame='topbot'">
-      <xsl:attribute name="border-left-style">none</xsl:attribute>
-      <xsl:attribute name="border-right-style">none</xsl:attribute>
-      <xsl:attribute name="border-top-style">
-        <xsl:value-of select="$table.frame.border.style"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-bottom-style">
-        <xsl:value-of select="$table.frame.border.style"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-top-width">
-        <xsl:value-of select="$table.frame.border.thickness"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-bottom-width">
-        <xsl:value-of select="$table.frame.border.thickness"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-top-color">
-        <xsl:value-of select="$table.frame.border.color"/>
-      </xsl:attribute>
-      <xsl:attribute name="border-bottom-color">
-        <xsl:value-of select="$table.frame.border.color"/>
-      </xsl:attribute>
-    </xsl:when>
-    <xsl:when test="$frame='none'">
-      <xsl:attribute name="border-left-style">none</xsl:attribute>
-      <xsl:attribute name="border-right-style">none</xsl:attribute>
-      <xsl:attribute name="border-top-style">none</xsl:attribute>
-      <xsl:attribute name="border-bottom-style">none</xsl:attribute>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message>
-        <xsl:text>Impossible frame on table: </xsl:text>
-        <xsl:value-of select="$frame"/>
-      </xsl:message>
-      <xsl:attribute name="border-left-style">none</xsl:attribute>
-      <xsl:attribute name="border-right-style">none</xsl:attribute>
-      <xsl:attribute name="border-top-style">none</xsl:attribute>
-      <xsl:attribute name="border-bottom-style">none</xsl:attribute>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="border">
-  <xsl:param name="side" select="'left'"/>
-
-  <xsl:attribute name="border-{$side}-width">
-    <xsl:value-of select="$table.cell.border.thickness"/>
-  </xsl:attribute>
-  <xsl:attribute name="border-{$side}-style">
-    <xsl:value-of select="$table.cell.border.style"/>
-  </xsl:attribute>
-  <xsl:attribute name="border-{$side}-color">
-    <xsl:value-of select="$table.cell.border.color"/>
-  </xsl:attribute>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="tgroup" name="tgroup">
-  <xsl:if test="not(@cols) or @cols = '' or string(number(@cols)) = 'NaN'">
-    <xsl:message terminate="yes">
-      <xsl:text>Error: CALS tables must specify the number of columns.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:variable name="table.width">
-    <xsl:call-template name="table.width"/>
-  </xsl:variable>
-
-  <xsl:variable name="colspecs">
-    <xsl:choose>
-      <xsl:when test="$use.extensions != 0
-                      and $tablecolumns.extension != 0">
-        <xsl:call-template name="generate.colgroup.raw">
-          <xsl:with-param name="cols" select="@cols"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="generate.colgroup">
-          <xsl:with-param name="cols" select="@cols"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="prop-columns"
-                select=".//colspec[contains(@colwidth, '*')]"/>
-  <xsl:if test="count($prop-columns) != 0 or
-                $fop.extensions != 0 or
-                $fop1.extensions != 0 or
-                $passivetex.extensions != 0">
-    <xsl:attribute name="table-layout">fixed</xsl:attribute>
-  </xsl:if>
- 
-    <xsl:attribute name="width">
-      <xsl:value-of select="$table.width"/>
-    </xsl:attribute>
- 
-  <xsl:choose>
-    <xsl:when test="$use.extensions != 0
-                    and $tablecolumns.extension != 0">
-      <xsl:choose>
-        <xsl:when test="function-available('stbl:adjustColumnWidths')">
-          <xsl:copy-of select="stbl:adjustColumnWidths($colspecs)"/>
-        </xsl:when>
-        <xsl:when test="function-available('xtbl:adjustColumnWidths')">
-          <xsl:copy-of select="xtbl:adjustColumnWidths($colspecs)"/>
-        </xsl:when>
-        <xsl:when test="function-available('ptbl:adjustColumnWidths')">
-          <xsl:copy-of select="ptbl:adjustColumnWidths($colspecs)"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message terminate="yes">
-            <xsl:text>No adjustColumnWidths function available.</xsl:text>
-          </xsl:message>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$colspecs"/>
-    </xsl:otherwise>
-  </xsl:choose>
-
-  <xsl:apply-templates select="thead"/>
-  <xsl:apply-templates select="tfoot"/>
-  <xsl:apply-templates select="tbody"/>
-</xsl:template>
-
-<xsl:template match="colspec"></xsl:template>
-
-<xsl:template name="table.width">
-
-  <xsl:variable name="numcols">
-    <xsl:call-template name="widest-html-row">
-      <xsl:with-param name="rows" select=".//tr"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="explicit.table.width">
-    <xsl:choose>
-      <xsl:when test="self::entrytbl">
-        <xsl:call-template name="pi.dbfo_table-width"/>
-      </xsl:when>
-      <xsl:when test="self::table or self::informaltable">
-        <xsl:call-template name="pi.dbfo_table-width"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- * no dbfo@table-width PI as a child of this table, so check -->
-        <!-- * the parent of this table to see if the table has any -->
-        <!-- * sibling dbfo@table-width PIs (FIXME: 2007-07 MikeSmith: we -->
-        <!-- * should really instead be checking here just to see if the -->
-        <!-- * first preceding sibling of this table is a -->
-        <!-- * dbfo@table-width PI) -->
-        <xsl:call-template name="pi.dbfo_table-width">
-          <xsl:with-param name="node" select=".."/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="column.sum">
-    <xsl:choose>
-      <!-- CALS table -->
-      <xsl:when test="@cols">
-        <xsl:if test="count(colspec) = @cols">
-          <xsl:for-each select="colspec">
-            <xsl:if test="position() != 1">
-              <xsl:text> + </xsl:text>
-            </xsl:if>
-            <xsl:choose>
-              <xsl:when test="not(@colwidth)">NOWIDTH</xsl:when>
-              <xsl:when test="contains(@colwidth, '*')">NOWIDTH</xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="@colwidth"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:for-each>
-        </xsl:if>
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- HTML table -->
-        <xsl:if test="count(col|colgroup/col) = $numcols">
-          <xsl:for-each select="col|colgroup/col">
-            <xsl:if test="position() != 1">
-              <xsl:text> + </xsl:text>
-            </xsl:if>
-            <xsl:choose>
-              <xsl:when test="not(@width)">NOWIDTH</xsl:when>
-              <xsl:when test="contains(@width, '%')">NOWIDTH</xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="@width"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:for-each>
-        </xsl:if>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="column.sum.width">
-    <xsl:if test="not(contains($column.sum, 'NOWIDTH'))">
-      <xsl:value-of select="$column.sum"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="prop-columns"
-                select=".//colspec[contains(@colwidth, '*')]"/>
-
-  <xsl:variable name="table.width">
-    <xsl:choose>
-      <xsl:when test="$explicit.table.width != ''">
-        <xsl:value-of select="$explicit.table.width"/>
-      </xsl:when>
-      <xsl:when test="$column.sum.width != ''">
-        <xsl:value-of select="$column.sum.width"/>
-      </xsl:when>
-      <xsl:when test="$default.table.width = ''">
-        <xsl:choose>
-          <!-- These processors don't support table-layout="auto" -->
-          <xsl:when test="$fop.extensions != 0 or
-                          $fop1.extensions != 0 or
-                          $passivetex.extensions != 0">
-            <xsl:text>100%</xsl:text>
-          </xsl:when>
-          <!-- Proportional columns imply 100% width -->
-          <xsl:when test="count($prop-columns) != 0">
-            <xsl:text>100%</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:text>auto</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$default.table.width"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:value-of select="$table.width"/>
-
-</xsl:template>
-
-<xsl:template match="spanspec"></xsl:template>
-
-<xsl:template match="thead">
-  <xsl:variable name="tgroup" select="parent::*"/>
-
-  <fo:table-header start-indent="0pt" end-indent="0pt">
-    <xsl:apply-templates select="row[1]">
-      <xsl:with-param name="spans">
-        <xsl:call-template name="blank.spans">
-          <xsl:with-param name="cols" select="../@cols"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:apply-templates>
-  </fo:table-header>
-</xsl:template>
-
-<xsl:template match="tfoot">
-  <xsl:variable name="tgroup" select="parent::*"/>
-
-  <fo:table-footer start-indent="0pt" end-indent="0pt">
-    <xsl:apply-templates select="row[1]">
-      <xsl:with-param name="spans">
-        <xsl:call-template name="blank.spans">
-          <xsl:with-param name="cols" select="../@cols"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:apply-templates>
-
-  </fo:table-footer>
-</xsl:template>
-
-<xsl:template match="tbody">
-  <xsl:variable name="tgroup" select="parent::*"/>
-
-  <fo:table-body start-indent="0pt" end-indent="0pt">
-    <xsl:apply-templates select="row[1]">
-      <xsl:with-param name="spans">
-        <xsl:call-template name="blank.spans">
-          <xsl:with-param name="cols" select="../@cols"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:apply-templates>
-  </fo:table-body>
-</xsl:template>
-
-<xsl:template match="row">
-  <xsl:param name="spans"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($spans, '0')">
-      <xsl:call-template name="normal-row">
-        <xsl:with-param name="spans" select="$spans"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <!--
-      <xsl:message>
-        <xsl:text>Ignoring row: </xsl:text>
-        <xsl:value-of select="$spans"/>
-        <xsl:text> = </xsl:text>
-        <xsl:call-template name="consume-row">
-          <xsl:with-param name="spans" select="$spans"/>
-        </xsl:call-template>
-      </xsl:message>
-      -->
-
-      <xsl:if test="normalize-space(.//text()) != ''">
-        <xsl:message>Warning: overlapped row contains content!</xsl:message>
-      </xsl:if>
-
-      <fo:table-row>
-        <xsl:comment> This row intentionally left blank </xsl:comment>
-        <fo:table-cell><fo:block/></fo:table-cell>
-      </fo:table-row>
-
-      <xsl:apply-templates select="following-sibling::row[1]">
-        <xsl:with-param name="spans">
-          <xsl:call-template name="consume-row">
-            <xsl:with-param name="spans" select="$spans"/>
-          </xsl:call-template>
-        </xsl:with-param>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="normal-row">
-  <xsl:param name="spans"/>
-
-  <fo:table-row>
-    <xsl:call-template name="table.row.properties"/>
-    <xsl:call-template name="anchor"/>
-
-    <xsl:apply-templates select="(entry|entrytbl)[1]">
-      <xsl:with-param name="spans" select="$spans"/>
-    </xsl:apply-templates>
-  </fo:table-row>
-
-  <xsl:if test="following-sibling::row">
-    <xsl:variable name="nextspans">
-      <xsl:apply-templates select="(entry|entrytbl)[1]" mode="span">
-        <xsl:with-param name="spans" select="$spans"/>
-      </xsl:apply-templates>
-    </xsl:variable>
-
-    <xsl:apply-templates select="following-sibling::row[1]">
-      <xsl:with-param name="spans" select="$nextspans"/>
-    </xsl:apply-templates>
-  </xsl:if>
-</xsl:template>
-
-<!-- customize this template to add row properties -->
-<xsl:template name="table.row.properties">
-  <xsl:variable name="bgcolor">
-    <xsl:call-template name="pi.dbfo_bgcolor"/>
-  </xsl:variable>
-  <xsl:if test="$bgcolor != ''">
-    <xsl:attribute name="background-color">
-      <xsl:value-of select="$bgcolor"/>
-    </xsl:attribute>
-  </xsl:if>
-
-  <!-- Keep header row with next row -->
-  <xsl:if test="ancestor::thead">
-    <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-  </xsl:if>
-
-</xsl:template>
-
-<xsl:template match="entry|entrytbl" name="entry">
-  <xsl:param name="col" select="1"/>
-  <xsl:param name="spans"/>
-
-  <xsl:variable name="row" select="parent::row"/>
-  <xsl:variable name="group" select="$row/parent::*[1]"/>
-  <xsl:variable name="frame" select="ancestor::tgroup/parent::*/@frame"/>
-
-  <xsl:variable name="empty.cell" select="count(node()) = 0"/>
-
-  <xsl:variable name="named.colnum">
-    <xsl:call-template name="entry.colnum"/>
-  </xsl:variable>
-
-  <xsl:variable name="entry.colnum">
-    <xsl:choose>
-      <xsl:when test="$named.colnum &gt; 0">
-        <xsl:value-of select="$named.colnum"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$col"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="entry.colspan">
-    <xsl:choose>
-      <xsl:when test="@spanname or @namest">
-        <xsl:call-template name="calculate.colspan"/>
-      </xsl:when>
-      <xsl:otherwise>1</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="following.spans">
-    <xsl:call-template name="calculate.following.spans">
-      <xsl:with-param name="colspan" select="$entry.colspan"/>
-      <xsl:with-param name="spans" select="$spans"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="rowsep">
-    <xsl:choose>
-      <!-- If this is the last row, rowsep never applies. -->
-      <xsl:when test="not(ancestor-or-self::row[1]/following-sibling::row
-                          or ancestor-or-self::thead/following-sibling::tbody
-                          or ancestor-or-self::tbody/preceding-sibling::tfoot)">
-        <xsl:value-of select="0"/>
-      </xsl:when>
-      <!-- Check for morerows too -->
-      <xsl:when test="(@morerows and count(ancestor-or-self::row[1]/
-                       following-sibling::row) = @morerows )
-                      and not (ancestor-or-self::thead/following-sibling::tbody
-                       or ancestor-or-self::tbody/preceding-sibling::tfoot)">
-        <xsl:value-of select="0"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="inherited.table.attribute">
-          <xsl:with-param name="entry" select="."/>
-          <xsl:with-param name="colnum" select="$entry.colnum"/>
-          <xsl:with-param name="attribute" select="'rowsep'"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-<!--
-  <xsl:message><xsl:value-of select="."/>: <xsl:value-of select="$rowsep"/></xsl:message>
--->
-
-  <xsl:variable name="colsep">
-    <xsl:choose>
-      <!-- If this is the last column, colsep never applies. -->
-      <xsl:when test="$following.spans = ''">0</xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="inherited.table.attribute">
-          <xsl:with-param name="entry" select="."/>
-          <xsl:with-param name="colnum" select="$entry.colnum"/>
-          <xsl:with-param name="attribute" select="'colsep'"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="valign">
-    <xsl:call-template name="inherited.table.attribute">
-      <xsl:with-param name="entry" select="."/>
-      <xsl:with-param name="colnum" select="$entry.colnum"/>
-      <xsl:with-param name="attribute" select="'valign'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="align">
-    <xsl:call-template name="inherited.table.attribute">
-      <xsl:with-param name="entry" select="."/>
-      <xsl:with-param name="colnum" select="$entry.colnum"/>
-      <xsl:with-param name="attribute" select="'align'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="char">
-    <xsl:call-template name="inherited.table.attribute">
-      <xsl:with-param name="entry" select="."/>
-      <xsl:with-param name="colnum" select="$entry.colnum"/>
-      <xsl:with-param name="attribute" select="'char'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="charoff">
-    <xsl:call-template name="inherited.table.attribute">
-      <xsl:with-param name="entry" select="."/>
-      <xsl:with-param name="colnum" select="$entry.colnum"/>
-      <xsl:with-param name="attribute" select="'charoff'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$spans != '' and not(starts-with($spans,'0:'))">
-      <xsl:call-template name="entry">
-        <xsl:with-param name="col" select="$col+1"/>
-        <xsl:with-param name="spans" select="substring-after($spans,':')"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:when test="number($entry.colnum) &gt; $col">
-      <xsl:call-template name="empty.table.cell">
-        <xsl:with-param name="colnum" select="$col"/>
-      </xsl:call-template>
-      <xsl:call-template name="entry">
-        <xsl:with-param name="col" select="$col+1"/>
-        <xsl:with-param name="spans" select="substring-after($spans,':')"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:variable name="cell.content">
-        <fo:block>
-          <xsl:call-template name="table.cell.block.properties"/>
-
-          <!-- are we missing any indexterms? -->
-          <xsl:if test="not(preceding-sibling::entry)
-                        and not(parent::row/preceding-sibling::row)">
-            <!-- this is the first entry of the first row -->
-            <xsl:if test="ancestor::thead or
-                          (ancestor::tbody
-                           and not(ancestor::tbody/preceding-sibling::thead
-                                   or ancestor::tbody/preceding-sibling::tbody))">
-              <!-- of the thead or the first tbody -->
-              <xsl:apply-templates select="ancestor::tgroup/preceding-sibling::indexterm"/>
-            </xsl:if>
-          </xsl:if>
-
-          <!--
-          <xsl:text>(</xsl:text>
-          <xsl:value-of select="$rowsep"/>
-          <xsl:text>,</xsl:text>
-          <xsl:value-of select="$colsep"/>
-          <xsl:text>)</xsl:text>
-          -->
-          <xsl:choose>
-            <xsl:when test="$empty.cell">
-              <xsl:text>&#160;</xsl:text>
-            </xsl:when>
-            <xsl:when test="self::entrytbl">
-              <xsl:variable name="prop-columns"
-                            select=".//colspec[contains(@colwidth, '*')]"/>
-              <fo:table xsl:use-attribute-sets="table.table.properties">
-                <xsl:if test="count($prop-columns) != 0">
-                  <xsl:attribute name="table-layout">fixed</xsl:attribute>
-                </xsl:if>
-                <xsl:call-template name="tgroup"/>
-              </fo:table>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </fo:block>
-      </xsl:variable>
-
-      <xsl:variable name="cell-orientation">
-        <xsl:call-template name="pi.dbfo_orientation">
-          <xsl:with-param name="node" select="ancestor-or-self::entry"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="row-orientation">
-        <xsl:call-template name="pi.dbfo_orientation">
-          <xsl:with-param name="node" select="ancestor-or-self::row"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="cell-width">
-        <xsl:call-template name="pi.dbfo_rotated-width">
-          <xsl:with-param name="node" select="ancestor-or-self::entry"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="row-width">
-        <xsl:call-template name="pi.dbfo_rotated-width">
-          <xsl:with-param name="node" select="ancestor-or-self::row"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="orientation">
-        <xsl:choose>
-          <xsl:when test="$cell-orientation != ''">
-            <xsl:value-of select="$cell-orientation"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$row-orientation"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="rotated-width">
-        <xsl:choose>
-          <xsl:when test="$cell-width != ''">
-            <xsl:value-of select="$cell-width"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$row-width"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="bgcolor">
-        <xsl:call-template name="pi.dbfo_bgcolor">
-          <xsl:with-param name="node" select="ancestor-or-self::entry"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <fo:table-cell xsl:use-attribute-sets="table.cell.padding">
-        <xsl:call-template name="table.cell.properties">
-          <xsl:with-param name="bgcolor.pi" select="$bgcolor"/>
-          <xsl:with-param name="rowsep.inherit" select="$rowsep"/>
-          <xsl:with-param name="colsep.inherit" select="$colsep"/>
-          <xsl:with-param name="col" select="$col"/>
-          <xsl:with-param name="valign.inherit" select="$valign"/>
-          <xsl:with-param name="align.inherit" select="$align"/>
-          <xsl:with-param name="char.inherit" select="$char"/>
-        </xsl:call-template>
-
-        <xsl:call-template name="anchor"/>
-
-        <xsl:if test="@morerows">
-          <xsl:attribute name="number-rows-spanned">
-            <xsl:value-of select="@morerows+1"/>
-          </xsl:attribute>
-        </xsl:if>
-
-        <xsl:if test="$entry.colspan &gt; 1">
-          <xsl:attribute name="number-columns-spanned">
-            <xsl:value-of select="$entry.colspan"/>
-          </xsl:attribute>
-        </xsl:if>
-
-<!--
-        <xsl:if test="@charoff">
-          <xsl:attribute name="charoff">
-            <xsl:value-of select="@charoff"/>
-          </xsl:attribute>
-        </xsl:if>
--->
-
-        <xsl:choose>
-          <xsl:when test="$fop.extensions = 0 and $passivetex.extensions = 0
-                          and $orientation != ''">
-            <fo:block-container reference-orientation="{$orientation}">
-              <xsl:if test="$rotated-width != ''">
-                <xsl:attribute name="width">
-                  <xsl:value-of select="$rotated-width"/>
-                </xsl:attribute>
-              </xsl:if>
-              <xsl:copy-of select="$cell.content"/>
-            </fo:block-container>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:copy-of select="$cell.content"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </fo:table-cell>
-
-      <xsl:choose>
-        <xsl:when test="following-sibling::entry|following-sibling::entrytbl">
-          <xsl:apply-templates select="(following-sibling::entry
-                                       |following-sibling::entrytbl)[1]">
-            <xsl:with-param name="col" select="$col+$entry.colspan"/>
-            <xsl:with-param name="spans" select="$following.spans"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="finaltd">
-            <xsl:with-param name="spans" select="$following.spans"/>
-            <xsl:with-param name="col" select="$col+$entry.colspan"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- Expand this template to add properties to any fo:table-cell -->
-<xsl:template name="table.cell.properties">
-  <xsl:param name="bgcolor.pi" select="''"/>
-  <xsl:param name="rowsep.inherit" select="1"/>
-  <xsl:param name="colsep.inherit" select="1"/>
-  <xsl:param name="col" select="1"/>
-  <xsl:param name="valign.inherit" select="''"/>
-  <xsl:param name="align.inherit" select="''"/>
-  <xsl:param name="char.inherit" select="''"/>
-
-  <xsl:choose>
-    <xsl:when test="ancestor::tgroup">
-      <xsl:if test="$bgcolor.pi != ''">
-        <xsl:attribute name="background-color">
-          <xsl:value-of select="$bgcolor.pi"/>
-        </xsl:attribute>
-      </xsl:if>
-
-      <xsl:if test="$rowsep.inherit &gt; 0">
-        <xsl:call-template name="border">
-          <xsl:with-param name="side" select="'bottom'"/>
-        </xsl:call-template>
-      </xsl:if>
-
-      <xsl:if test="$colsep.inherit &gt; 0 and 
-                      $col &lt; ancestor::tgroup/@cols">
-        <xsl:call-template name="border">
-          <xsl:with-param name="side" select="'right'"/>
-        </xsl:call-template>
-      </xsl:if>
-
-      <xsl:if test="$valign.inherit != ''">
-        <xsl:attribute name="display-align">
-          <xsl:choose>
-            <xsl:when test="$valign.inherit='top'">before</xsl:when>
-            <xsl:when test="$valign.inherit='middle'">center</xsl:when>
-            <xsl:when test="$valign.inherit='bottom'">after</xsl:when>
-            <xsl:otherwise>
-              <xsl:message>
-                <xsl:text>Unexpected valign value: </xsl:text>
-                <xsl:value-of select="$valign.inherit"/>
-                <xsl:text>, center used.</xsl:text>
-              </xsl:message>
-              <xsl:text>center</xsl:text>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:attribute>
-      </xsl:if>
-
-      <xsl:choose>
-        <xsl:when test="$align.inherit = 'char' and $char.inherit != ''">
-          <xsl:attribute name="text-align">
-            <xsl:value-of select="$char.inherit"/>
-          </xsl:attribute>
-        </xsl:when>
-        <xsl:when test="$align.inherit != ''">
-          <xsl:attribute name="text-align">
-            <xsl:value-of select="$align.inherit"/>
-          </xsl:attribute>
-        </xsl:when>
-      </xsl:choose>
-
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- HTML table -->
-      <xsl:variable name="border" 
-                    select="(ancestor::table |
-                             ancestor::informaltable)[last()]/@border"/>
-      <xsl:if test="$border != '' and $border != 0">
-        <xsl:attribute name="border">
-          <xsl:value-of select="$table.cell.border.thickness"/>
-          <xsl:text> </xsl:text>
-          <xsl:value-of select="$table.cell.border.style"/>
-          <xsl:text> </xsl:text>
-          <xsl:value-of select="$table.cell.border.color"/>
-        </xsl:attribute>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-
-</xsl:template>
-
-<!-- Expand this template to add properties to any cell's block -->
-<xsl:template name="table.cell.block.properties">
-  <!-- highlight this entry? -->
-  <xsl:if test="ancestor::thead or ancestor::tfoot">
-    <xsl:attribute name="font-weight">bold</xsl:attribute>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="entry|entrytbl" name="sentry" mode="span">
-  <xsl:param name="col" select="1"/>
-  <xsl:param name="spans"/>
-
-  <xsl:variable name="entry.colnum">
-    <xsl:call-template name="entry.colnum"/>
-  </xsl:variable>
-
-  <xsl:variable name="entry.colspan">
-    <xsl:choose>
-      <xsl:when test="@spanname or @namest">
-        <xsl:call-template name="calculate.colspan"/>
-      </xsl:when>
-      <xsl:otherwise>1</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="following.spans">
-    <xsl:call-template name="calculate.following.spans">
-      <xsl:with-param name="colspan" select="$entry.colspan"/>
-      <xsl:with-param name="spans" select="$spans"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$spans != '' and not(starts-with($spans,'0:'))">
-      <xsl:value-of select="substring-before($spans,':')-1"/>
-      <xsl:text>:</xsl:text>
-      <xsl:call-template name="sentry">
-        <xsl:with-param name="col" select="$col+1"/>
-        <xsl:with-param name="spans" select="substring-after($spans,':')"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:when test="number($entry.colnum) &gt; $col">
-      <xsl:text>0:</xsl:text>
-      <xsl:call-template name="sentry">
-        <xsl:with-param name="col" select="$col+$entry.colspan"/>
-        <xsl:with-param name="spans" select="$following.spans"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:call-template name="copy-string">
-        <xsl:with-param name="count" select="$entry.colspan"/>
-        <xsl:with-param name="string">
-          <xsl:choose>
-            <xsl:when test="@morerows">
-              <xsl:value-of select="@morerows"/>
-            </xsl:when>
-            <xsl:otherwise>0</xsl:otherwise>
-          </xsl:choose>
-          <xsl:text>:</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-
-      <xsl:choose>
-        <xsl:when test="following-sibling::entry|following-sibling::entrytbl">
-          <xsl:apply-templates select="(following-sibling::entry
-                                       |following-sibling::entrytbl)[1]"
-                               mode="span">
-            <xsl:with-param name="col" select="$col+$entry.colspan"/>
-            <xsl:with-param name="spans" select="$following.spans"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="sfinaltd">
-            <xsl:with-param name="spans" select="$following.spans"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="generate.colgroup.raw">
-  <xsl:param name="cols" select="1"/>
-  <xsl:param name="count" select="1"/>
-
-  <xsl:choose>
-    <xsl:when test="$count>$cols"></xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="generate.col.raw">
-        <xsl:with-param name="countcol" select="$count"/>
-      </xsl:call-template>
-      <xsl:call-template name="generate.colgroup.raw">
-        <xsl:with-param name="cols" select="$cols"/>
-        <xsl:with-param name="count" select="$count+1"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="generate.colgroup">
-  <xsl:param name="cols" select="1"/>
-  <xsl:param name="count" select="1"/>
-
-  <xsl:choose>
-    <xsl:when test="$count>$cols"></xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="generate.col">
-        <xsl:with-param name="countcol" select="$count"/>
-      </xsl:call-template>
-      <xsl:call-template name="generate.colgroup">
-        <xsl:with-param name="cols" select="$cols"/>
-        <xsl:with-param name="count" select="$count+1"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="generate.col.raw">
-  <!-- generate the table-column for column countcol -->
-  <xsl:param name="countcol">1</xsl:param>
-  <xsl:param name="colspecs" select="./colspec"/>
-  <xsl:param name="count">1</xsl:param>
-  <xsl:param name="colnum">1</xsl:param>
-
-  <xsl:choose>
-    <xsl:when test="$count>count($colspecs)">
-      <fo:table-column column-number="{$countcol}"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="colspec" select="$colspecs[$count=position()]"/>
-
-      <xsl:variable name="colspec.colnum">
-        <xsl:choose>
-          <xsl:when test="$colspec/@colnum">
-            <xsl:value-of select="$colspec/@colnum"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$colnum"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="colspec.colwidth">
-        <xsl:choose>
-          <xsl:when test="$colspec/@colwidth">
-            <xsl:value-of select="$colspec/@colwidth"/>
-          </xsl:when>
-          <xsl:otherwise>1*</xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="$colspec.colnum=$countcol">
-          <fo:table-column column-number="{$countcol}">
-            <xsl:attribute name="column-width">
-              <xsl:value-of select="$colspec.colwidth"/>
-            </xsl:attribute>
-          </fo:table-column>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="generate.col.raw">
-            <xsl:with-param name="countcol" select="$countcol"/>
-            <xsl:with-param name="colspecs" select="$colspecs"/>
-            <xsl:with-param name="count" select="$count+1"/>
-            <xsl:with-param name="colnum">
-              <xsl:choose>
-                <xsl:when test="$colspec/@colnum">
-                  <xsl:value-of select="$colspec/@colnum + 1"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:value-of select="$colnum + 1"/>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:with-param>
-           </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="generate.col">
-  <!-- generate the table-column for column countcol -->
-  <xsl:param name="countcol">1</xsl:param>
-  <xsl:param name="colspecs" select="./colspec"/>
-  <xsl:param name="count">1</xsl:param>
-  <xsl:param name="colnum">1</xsl:param>
-
-  <xsl:choose>
-    <xsl:when test="$count>count($colspecs)">
-      <fo:table-column column-number="{$countcol}">
-        <xsl:variable name="colwidth">
-          <xsl:call-template name="calc.column.width"/>
-        </xsl:variable>
-        <xsl:if test="$colwidth != 'proportional-column-width(1)'">
-          <xsl:attribute name="column-width">
-            <xsl:value-of select="$colwidth"/>
-          </xsl:attribute>
-        </xsl:if>
-      </fo:table-column>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="colspec" select="$colspecs[$count=position()]"/>
-
-      <xsl:variable name="colspec.colnum">
-        <xsl:choose>
-          <xsl:when test="$colspec/@colnum">
-            <xsl:value-of select="$colspec/@colnum"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$colnum"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="colspec.colwidth">
-        <xsl:choose>
-          <xsl:when test="$colspec/@colwidth">
-            <xsl:value-of select="$colspec/@colwidth"/>
-          </xsl:when>
-          <xsl:otherwise>1*</xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="$colspec.colnum=$countcol">
-          <fo:table-column column-number="{$countcol}">
-            <xsl:variable name="colwidth">
-              <xsl:call-template name="calc.column.width">
-                <xsl:with-param name="colwidth">
-                  <xsl:value-of select="$colspec.colwidth"/>
-                </xsl:with-param>
-              </xsl:call-template>
-            </xsl:variable>
-            <xsl:if test="$colwidth != 'proportional-column-width(1)'">
-              <xsl:attribute name="column-width">
-                <xsl:value-of select="$colwidth"/>
-              </xsl:attribute>
-            </xsl:if>
-          </fo:table-column>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="generate.col">
-            <xsl:with-param name="countcol" select="$countcol"/>
-            <xsl:with-param name="colspecs" select="$colspecs"/>
-            <xsl:with-param name="count" select="$count+1"/>
-            <xsl:with-param name="colnum">
-              <xsl:choose>
-                <xsl:when test="$colspec/@colnum">
-                  <xsl:value-of select="$colspec/@colnum + 1"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:value-of select="$colnum + 1"/>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:with-param>
-           </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<doc:template name="calc.column.width" xmlns="">
-<refpurpose>Calculate an XSL FO table column width specification from a
-CALS table column width specification.</refpurpose>
-
-<refdescription>
-<para>CALS expresses table column widths in the following basic
-forms:</para>
-
-<itemizedlist>
-<listitem>
-<para><emphasis>99.99units</emphasis>, a fixed length specifier.</para>
-</listitem>
-<listitem>
-<para><emphasis>99.99</emphasis>, a fixed length specifier without any units.</para>
-</listitem>
-<listitem>
-<para><emphasis>99.99*</emphasis>, a relative length specifier.</para>
-</listitem>
-<listitem>
-<para><emphasis>99.99*+99.99units</emphasis>, a combination of both.</para>
-</listitem>
-</itemizedlist>
-
-<para>The CALS units are points (pt), picas (pi), centimeters (cm),
-millimeters (mm), and inches (in). These are the same units as XSL,
-except that XSL abbreviates picas "pc" instead of "pi". If a length
-specifier has no units, the CALS default unit (pt) is assumed.</para>
-
-<para>Relative length specifiers are represented in XSL with the
-proportional-column-width() function.</para>
-
-<para>Here are some examples:</para>
-
-<itemizedlist>
-<listitem>
-<para>"36pt" becomes "36pt"</para>
-</listitem>
-<listitem>
-<para>"3pi" becomes "3pc"</para>
-</listitem>
-<listitem>
-<para>"36" becomes "36pt"</para>
-</listitem>
-<listitem>
-<para>"3*" becomes "proportional-column-width(3)"</para>
-</listitem>
-<listitem>
-<para>"3*+2pi" becomes "proportional-column-width(3)+2pc"</para>
-</listitem>
-<listitem>
-<para>"1*+2" becomes "proportional-column-width(1)+2pt"</para>
-</listitem>
-</itemizedlist>
-</refdescription>
-
-<refparameter>
-<variablelist>
-<varlistentry><term>colwidth</term>
-<listitem>
-<para>The CALS column width specification.</para>
-</listitem>
-</varlistentry>
-</variablelist>
-</refparameter>
-
-<refreturn>
-<para>The XSL column width specification.</para>
-</refreturn>
-</doc:template>
-
-<xsl:template name="calc.column.width">
-  <xsl:param name="colwidth">1*</xsl:param>
-
-  <!-- Ok, the colwidth could have any one of the following forms: -->
-  <!--        1*       = proportional width -->
-  <!--         *       = same as 1* -->
-  <!--     1unit       = 1.0 units wide -->
-  <!--         1       = 1pt wide -->
-  <!--  1*+1unit       = proportional width + some fixed width -->
-  <!--      1*+1       = proportional width + some fixed width -->
-
-  <!-- If it has a proportional width, translate it to XSL -->
-  <xsl:if test="contains($colwidth, '*')">
-    <xsl:text>proportional-column-width(</xsl:text>
-    <xsl:choose>
-      <xsl:when test="substring-before($colwidth, '*') != ''"> 
-        <xsl:value-of select="substring-before($colwidth, '*')"/>
-      </xsl:when>
-      <xsl:otherwise>
-         <xsl:text>1.00</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:text>)</xsl:text>
-  </xsl:if>
-
-  <!-- Now grab the non-proportional part of the specification -->
-  <xsl:variable name="width-units">
-    <xsl:choose>
-      <xsl:when test="contains($colwidth, '*')">
-        <xsl:value-of
-             select="normalize-space(substring-after($colwidth, '*'))"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="normalize-space($colwidth)"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <!-- Ok, now the width-units could have any one of the following forms: -->
-  <!--                 = <empty string> -->
-  <!--     1unit       = 1.0 units wide -->
-  <!--         1       = 1pt wide -->
-  <!-- with an optional leading sign -->
-
-  <!-- Grab the width part by blanking out the units part and discarding -->
-  <!-- whitespace. It's not pretty, but it works. -->
-  <xsl:variable name="width"
-       select="normalize-space(translate($width-units,
-                                         '+-0123456789.abcdefghijklmnopqrstuvwxyz',
-                                         '+-0123456789.'))"/>
-
-  <!-- Grab the units part by blanking out the width part and discarding -->
-  <!-- whitespace. It's not pretty, but it works. -->
-  <xsl:variable name="units"
-       select="normalize-space(translate($width-units,
-                                         'abcdefghijklmnopqrstuvwxyz+-0123456789.',
-                                         'abcdefghijklmnopqrstuvwxyz'))"/>
-
-  <!-- Output the width -->
-  <xsl:value-of select="$width"/>
-
-  <!-- Output the units, translated appropriately -->
-  <xsl:choose>
-    <xsl:when test="$units = 'pi'">pc</xsl:when>
-    <xsl:when test="$units = '' and $width != ''">pt</xsl:when>
-    <xsl:otherwise><xsl:value-of select="$units"/></xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/task.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/task.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,81 +1,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="task">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="param.placement"
-                select="substring-after(normalize-space($formal.title.placement),
-                                        concat(local-name(.), ' '))"/>
-
-  <xsl:variable name="placement">
-    <xsl:choose>
-      <xsl:when test="contains($param.placement, ' ')">
-        <xsl:value-of select="substring-before($param.placement, ' ')"/>
-      </xsl:when>
-      <xsl:when test="$param.placement = ''">before</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$param.placement"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="preamble"
-                select="*[not(self::title
-                              or self::titleabbrev)]"/>
-
-  <fo:block id="{$id}"
-            xsl:use-attribute-sets="formal.object.properties">
-    <xsl:call-template name="anchor"/>
-
-    <xsl:if test="title and $placement = 'before'">
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-
-    <xsl:apply-templates select="$preamble"/>
-
-    <xsl:if test="title and $placement != 'before'">
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="task/title">
-  <!-- nop -->
-</xsl:template>
-
-<xsl:template match="tasksummary">
-  <xsl:call-template name="semiformal.object"/>
-</xsl:template>
-
-<xsl:template match="tasksummary/title"/>
-
-<xsl:template match="taskprerequisites">
-  <xsl:call-template name="semiformal.object"/>
-</xsl:template>
-
-<xsl:template match="taskprerequisites/title"/>
-
-<xsl:template match="taskrelated">
-  <xsl:call-template name="semiformal.object"/>
-</xsl:template>
-
-<xsl:template match="taskrelated/title"/>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/titlepage.templates.xml
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/titlepage.templates.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,1311 +1,0 @@
-<!DOCTYPE t:templates [
-<!ENTITY hsize0 "10pt">
-<!ENTITY hsize1 "12pt">
-<!ENTITY hsize2 "14.4pt">
-<!ENTITY hsize3 "17.28pt">
-<!ENTITY hsize4 "20.736pt">
-<!ENTITY hsize5 "24.8832pt">
-<!ENTITY hsize0space "7.5pt"> <!-- 0.75 * hsize0 -->
-<!ENTITY hsize1space "9pt"> <!-- 0.75 * hsize1 -->
-<!ENTITY hsize2space "10.8pt"> <!-- 0.75 * hsize2 -->
-<!ENTITY hsize3space "12.96pt"> <!-- 0.75 * hsize3 -->
-<!ENTITY hsize4space "15.552pt"> <!-- 0.75 * hsize4 -->
-<!ENTITY hsize5space "18.6624pt"> <!-- 0.75 * hsize5 -->
-]>
-<t:templates xmlns:t="http://nwalsh.com/docbook/xsl/template/1.0"
-	     xmlns:param="http://nwalsh.com/docbook/xsl/template/1.0/param"
-             xmlns:fo="http://www.w3.org/1999/XSL/Format"
-             xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the DocBook XSL Stylesheet distribution.
-     See ../README or http://docbook.sf.net/ for copyright
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<t:titlepage t:element="article" t:wrapper="fo:block"
-             font-family="{$title.fontset}">
-
-  <t:titlepage-content t:side="recto"
-	     start-indent="0pt"
-             text-align="center">
-
-    <title t:named-template="component.title"
-	   param:node="ancestor-or-self::article[1]"
-	   keep-with-next.within-column="always"
-	   font-size="&hsize5;"
-	   font-weight="bold"/>
-
-    <subtitle/>
-
-    <corpauthor space-before="0.5em"
-                font-size="&hsize2;"/>
-    <authorgroup space-before="0.5em"
-                 font-size="&hsize2;"/>
-    <author space-before="0.5em"
-            font-size="&hsize2;"/>
-
-    <othercredit space-before="0.5em"/>
-    <releaseinfo space-before="0.5em"/>
-    <copyright space-before="0.5em"/>
-    <legalnotice text-align="start"
-                 margin-left="0.5in"
-                 margin-right="0.5in"
-                 font-family="{$body.fontset}"/>
-    <pubdate space-before="0.5em"/>
-    <revision space-before="0.5em"/>
-    <revhistory space-before="0.5em"/>
-    <abstract space-before="0.5em"
-	      text-align="start"
-	      margin-left="0.5in"
-              margin-right="0.5in"
-              font-family="{$body.fontset}"/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-<t:titlepage t:element="set" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-      <title
-	     t:named-template="division.title"
-	     param:node="ancestor-or-self::set[1]"
-	     text-align="center"
-	     font-size="&hsize5;"
-	     space-before="&hsize5space;"
-	     font-weight="bold"
-	     font-family="{$title.fontset}"/>
-    <subtitle
-	      font-family="{$title.fontset}"
-	      text-align="center"/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-  <t:titlepage t:element="book" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:named-template="division.title"
-	     param:node="ancestor-or-self::book[1]"
-	     text-align="center"
-	     font-size="&hsize5;"
-	     space-before="&hsize5space;"
-	     font-weight="bold"
-	     font-family="{$title.fontset}"/>
-      <subtitle
-		text-align="center"
-		font-size="&hsize4;"
-		space-before="&hsize4space;"
-		font-family="{$title.fontset}"/>
-      <corpauthor font-size="&hsize3;"
-		  keep-with-next.within-column="always"
-		  space-before="2in"/>
-      <authorgroup space-before="2in"/>
-      <author font-size="&hsize3;"
-	      space-before="&hsize2space;"
-	      keep-with-next.within-column="always"/>
-    </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-      <title
-	     t:named-template="book.verso.title"
-	     font-size="&hsize2;"
-	     font-weight="bold"
-	     font-family="{$title.fontset}"/>
-      <corpauthor/>
-      <authorgroup t:named-template="verso.authorgroup"/>
-      <author/>
-      <othercredit/>
-      <releaseinfo space-before="0.5em"/>
-      <pubdate space-before="1em"/>
-      <copyright/>
-      <abstract/>
-      <legalnotice font-size="8pt"/>
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-      <fo:block break-after="page"/>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-      <fo:block break-after="page"/>
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-<t:titlepage t:element="part" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-      <title
-	     t:named-template="division.title"
-	     param:node="ancestor-or-self::part[1]"
-	     text-align="center"
-	     font-size="&hsize5;"
-	     space-before="&hsize5space;"
-	     font-weight="bold"
-	     font-family="{$title.fontset}"/>
-    <subtitle
-	      text-align="center"
-	      font-size="&hsize4;"
-	      space-before="&hsize4space;"
-	      font-weight='bold'
-	      font-style='italic'
-	      font-family="{$title.fontset}"/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<t:titlepage t:element="partintro" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-    <title
-	   text-align="center"
-	   font-size="&hsize5;"
-	   font-weight="bold"
-	   space-before="1em"
-	   font-family="{$title.fontset}"/>
-    <subtitle
-	      text-align="center"
-	      font-size="&hsize2;"
-	      font-weight="bold"
-	      font-style="italic"
-	      font-family="{$title.fontset}"/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-<t:titlepage t:element="reference" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-      <title
-	     t:named-template="division.title"
-	     param:node="ancestor-or-self::reference[1]"
-	     text-align="center"
-	     font-size="&hsize5;"
-	     space-before="&hsize5space;"
-	     font-weight="bold"
-	     font-family="{$title.fontset}"/>
-    <subtitle
-	      font-family="{$title.fontset}"
-	      text-align="center"/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-<t:titlepage t:element="refsynopsisdiv" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-    <title
-	   font-family="{$title.fontset}"/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-<t:titlepage t:element="refsection" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-    <title
-	   font-family="{$title.fontset}"/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-<t:titlepage t:element="refsect1" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-    <title
-	   font-family="{$title.fontset}"/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-<t:titlepage t:element="refsect2" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-    <title
-	   font-family="{$title.fontset}"/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-<t:titlepage t:element="refsect3" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-    <title
-	   font-family="{$title.fontset}"/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-  <t:titlepage t:element="dedication" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:force="1"
-	     t:named-template="component.title"
-	     param:node="ancestor-or-self::dedication[1]"
-	     margin-left="{$title.margin.left}"
-	     font-size="&hsize5;"
-	     font-family="{$title.fontset}"
-	     font-weight="bold"/>
-      <subtitle
-		font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-  <t:titlepage t:element="preface" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:force="1"
-	     t:named-template="component.title"
-	     param:node="ancestor-or-self::preface[1]"
-	     margin-left="{$title.margin.left}"
-	     font-size="&hsize5;"
-	     font-family="{$title.fontset}"
-	     font-weight="bold"/>
-      <subtitle
-		font-family="{$title.fontset}"/>
-      <corpauthor/>
-      <authorgroup/>
-      <author/>
-      <othercredit/>
-      <releaseinfo/>
-      <copyright/>
-      <legalnotice/>
-      <pubdate/>
-      <revision/>
-      <revhistory/>
-      <abstract/>
-    </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-  <t:titlepage t:element="chapter" t:wrapper="fo:block"
-               font-family="{$title.fontset}">
-    <t:titlepage-content t:side="recto" margin-left="{$title.margin.left}">
-      <title t:named-template="component.title"
-	     param:node="ancestor-or-self::chapter[1]"
-	     font-size="&hsize5;"
-	     font-weight="bold"/>
-
-      <subtitle space-before="0.5em"
-		font-style="italic"
-		font-size="&hsize2;"
-		font-weight="bold"/>
-
-      <corpauthor  space-before="0.5em"
-	           space-after="0.5em"
-                   font-size="&hsize2;"/>
-
-      <authorgroup space-before="0.5em"
-	           space-after="0.5em"
-                   font-size="&hsize2;"/>
-
-      <author      space-before="0.5em"
-	           space-after="0.5em"
-                   font-size="&hsize2;"/>
-
-      <othercredit/>
-      <releaseinfo/>
-      <copyright/>
-      <legalnotice/>
-      <pubdate/>
-      <revision/>
-      <revhistory/>
-      <abstract/>
-    </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-  <t:titlepage t:element="appendix" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:named-template="component.title"
-	     param:node="ancestor-or-self::appendix[1]"
-	     margin-left="{$title.margin.left}"
-	     font-size="&hsize5;"
-	     font-weight="bold"
-	     font-family="{$title.fontset}"/>
-      <subtitle
-		font-family="{$title.fontset}"/>
-      <corpauthor/>
-      <authorgroup/>
-      <author/>
-      <othercredit/>
-      <releaseinfo/>
-      <copyright/>
-      <legalnotice/>
-      <pubdate/>
-      <revision/>
-      <revhistory/>
-      <abstract/>
-    </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-<t:titlepage t:element="section" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-    <title
-	   margin-left="{$title.margin.left}"
-	   font-family="{$title.fontset}"/>
-    <subtitle
-	      font-family="{$title.fontset}"/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<t:titlepage t:element="sect1" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-    <title
-	   margin-left="{$title.margin.left}"
-	   font-family="{$title.fontset}"/>
-    <subtitle
-	      font-family="{$title.fontset}"/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<t:titlepage t:element="sect2" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-    <title
-	   margin-left="{$title.margin.left}"
-	   font-family="{$title.fontset}"/>
-    <subtitle
-	      font-family="{$title.fontset}"/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<t:titlepage t:element="sect3" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-    <title
-	   margin-left="{$title.margin.left}"
-	   font-family="{$title.fontset}"/>
-    <subtitle
-	      font-family="{$title.fontset}"/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<t:titlepage t:element="sect4" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-    <title
-	   margin-left="{$title.margin.left}"
-	   font-family="{$title.fontset}"/>
-    <subtitle
-	      font-family="{$title.fontset}"/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<t:titlepage t:element="sect5" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-    <title
-	   margin-left="{$title.margin.left}"
-	   font-family="{$title.fontset}"/>
-    <subtitle
-	      font-family="{$title.fontset}"/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<t:titlepage t:element="simplesect" t:wrapper="fo:block">
-  <t:titlepage-content t:side="recto">
-    <title
-	   margin-left="{$title.margin.left}"
-	   font-family="{$title.fontset}"/>
-    <subtitle
-	      font-family="{$title.fontset}"/>
-    <corpauthor/>
-    <authorgroup/>
-    <author/>
-    <othercredit/>
-    <releaseinfo/>
-    <copyright/>
-    <legalnotice/>
-    <pubdate/>
-    <revision/>
-    <revhistory/>
-    <abstract/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-  <t:titlepage t:element="bibliography" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:force="1"
-	     t:named-template="component.title"
-	     param:node="ancestor-or-self::bibliography[1]"
-	     margin-left="{$title.margin.left}"
-	     font-size="&hsize5;"
-	     font-family="{$title.fontset}"
-	     font-weight="bold"/>
-      <subtitle
-		font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-    <t:titlepage-content t:side="verso">
-    </t:titlepage-content>
-
-    <t:titlepage-separator>
-    </t:titlepage-separator>
-
-    <t:titlepage-before t:side="recto">
-    </t:titlepage-before>
-
-    <t:titlepage-before t:side="verso">
-    </t:titlepage-before>
-  </t:titlepage>
-
-<!-- ==================================================================== -->
-
-  <t:titlepage t:element="bibliodiv" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title t:named-template="component.title"
-	     param:node="ancestor-or-self::bibliodiv[1]"
-	     margin-left="{$title.margin.left}"
-	     font-size="&hsize4;"
-	     font-family="{$title.fontset}"
-	     font-weight="bold"/>
-      <subtitle
-		font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-    <t:titlepage-content t:side="verso">
-    </t:titlepage-content>
-
-    <t:titlepage-separator>
-    </t:titlepage-separator>
-
-    <t:titlepage-before t:side="recto">
-    </t:titlepage-before>
-
-    <t:titlepage-before t:side="verso">
-    </t:titlepage-before>
-  </t:titlepage>
-
-<!-- ==================================================================== -->
-
-  <t:titlepage t:element="glossary" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:force="1"
-	     t:named-template="component.title"
-	     param:node="ancestor-or-self::glossary[1]"
-	     margin-left="{$title.margin.left}"
-	     font-size="&hsize5;"
-	     font-family="{$title.fontset}"
-	     font-weight="bold"/>
-      <subtitle
-		font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-    <t:titlepage-content t:side="verso">
-    </t:titlepage-content>
-
-    <t:titlepage-separator>
-    </t:titlepage-separator>
-
-    <t:titlepage-before t:side="recto">
-    </t:titlepage-before>
-
-    <t:titlepage-before t:side="verso">
-    </t:titlepage-before>
-  </t:titlepage>
-
-<!-- ==================================================================== -->
-
-  <t:titlepage t:element="glossdiv" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title t:named-template="component.title"
-	     param:node="ancestor-or-self::glossdiv[1]"
-	     margin-left="{$title.margin.left}"
-	     font-size="&hsize4;"
-	     font-family="{$title.fontset}"
-	     font-weight="bold"/>
-      <subtitle
-		font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-    <t:titlepage-content t:side="verso">
-    </t:titlepage-content>
-
-    <t:titlepage-separator>
-    </t:titlepage-separator>
-
-    <t:titlepage-before t:side="recto">
-    </t:titlepage-before>
-
-    <t:titlepage-before t:side="verso">
-    </t:titlepage-before>
-  </t:titlepage>
-
-<!-- ==================================================================== -->
-
-  <t:titlepage t:element="index" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:force="1"
-	     t:named-template="component.title"
-	     param:node="ancestor-or-self::index[1]"
-             param:pagewide="1"
-	     margin-left="0pt"
-	     font-size="&hsize5;"
-	     font-family="{$title.fontset}"
-	     font-weight="bold"/>
-      <subtitle
-		font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-    <t:titlepage-content t:side="verso">
-    </t:titlepage-content>
-
-    <t:titlepage-separator>
-    </t:titlepage-separator>
-
-    <t:titlepage-before t:side="recto">
-    </t:titlepage-before>
-
-    <t:titlepage-before t:side="verso">
-    </t:titlepage-before>
-  </t:titlepage>
-
-<!-- ==================================================================== -->
-
-  <!-- The indexdiv.title template is used so that manual and -->
-  <!-- automatically generated indexdiv titles get the same -->
-  <!-- formatting. -->
-
-  <t:titlepage t:element="indexdiv" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title t:force="1"
-	     t:named-template="indexdiv.title"
-	     param:title="title"/>
-      <subtitle
-		font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-    <t:titlepage-content t:side="verso">
-    </t:titlepage-content>
-
-    <t:titlepage-separator>
-    </t:titlepage-separator>
-
-    <t:titlepage-before t:side="recto">
-    </t:titlepage-before>
-
-    <t:titlepage-before t:side="verso">
-    </t:titlepage-before>
-  </t:titlepage>
-
-<!-- ==================================================================== -->
-
-  <t:titlepage t:element="setindex" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:force="1"
-	     t:named-template="component.title"
-	     param:node="ancestor-or-self::setindex[1]"
-             param:pagewide="1"
-	     margin-left="0pt"
-	     font-size="&hsize5;"
-	     font-family="{$title.fontset}"
-	     font-weight="bold"/>
-      <subtitle
-		font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-    <t:titlepage-content t:side="verso">
-    </t:titlepage-content>
-
-    <t:titlepage-separator>
-    </t:titlepage-separator>
-
-    <t:titlepage-before t:side="recto">
-    </t:titlepage-before>
-
-    <t:titlepage-before t:side="verso">
-    </t:titlepage-before>
-  </t:titlepage>
-
-<!-- ==================================================================== -->
-
-  <t:titlepage t:element="colophon" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:force="1"
-	     t:named-template="component.title"
-	     param:node="ancestor-or-self::colophon[1]"
-	     margin-left="{$title.margin.left}"
-	     font-size="&hsize5;"
-	     font-family="{$title.fontset}"
-	     font-weight="bold"/>
-      <subtitle
-		font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-  <t:titlepage t:element="sidebar" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title 
-	     font-family="{$title.fontset}"
-	     font-weight="bold"/>
-      <subtitle
-		font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-    <t:titlepage-content t:side="verso">
-    </t:titlepage-content>
-
-    <t:titlepage-separator>
-    </t:titlepage-separator>
-
-    <t:titlepage-before t:side="recto">
-    </t:titlepage-before>
-
-    <t:titlepage-before t:side="verso">
-    </t:titlepage-before>
-  </t:titlepage>
-
-<!-- ==================================================================== -->
-<t:titlepage t:element="qandaset" t:wrapper="fo:block"
-             font-family="{$title.fontset}">
-
-  <t:titlepage-content t:side="recto"
-	     start-indent="0pt"
-             text-align="center">
-
-    <title t:named-template="component.title"
-	   param:node="ancestor-or-self::qandaset[1]"
-	   keep-with-next.within-column="always"
-	   font-size="&hsize5;"
-	   font-weight="bold"/>
-
-    <subtitle/>
-
-    <corpauthor space-before="0.5em"
-                font-size="&hsize2;"/>
-    <authorgroup space-before="0.5em"
-                 font-size="&hsize2;"/>
-    <author space-before="0.5em"
-            font-size="&hsize2;"/>
-
-    <othercredit space-before="0.5em"/>
-    <releaseinfo space-before="0.5em"/>
-    <copyright space-before="0.5em"/>
-    <legalnotice text-align="start"
-                 margin-left="0.5in"
-                 margin-right="0.5in"
-                 font-family="{$body.fontset}"/>
-    <pubdate space-before="0.5em"/>
-    <revision space-before="0.5em"/>
-    <revhistory space-before="0.5em"/>
-    <abstract space-before="0.5em"
-	      text-align="start"
-	      margin-left="0.5in"
-              margin-right="0.5in"
-              font-family="{$body.fontset}"/>
-  </t:titlepage-content>
-
-  <t:titlepage-content t:side="verso">
-  </t:titlepage-content>
-
-  <t:titlepage-separator>
-  </t:titlepage-separator>
-
-  <t:titlepage-before t:side="recto">
-  </t:titlepage-before>
-
-  <t:titlepage-before t:side="verso">
-  </t:titlepage-before>
-</t:titlepage>
-
-<!-- ==================================================================== -->
-
-  <t:titlepage t:element="table.of.contents" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:force="1"
-	     t:named-template="gentext"
-	     param:key="'TableofContents'"
-             space-before.minimum="1em"
-             space-before.optimum="1.5em"
-             space-before.maximum="2em"
-	     space-after="0.5em"
-	     margin-left="{$title.margin.left}"
-	     start-indent="0pt"
-	     font-size="&hsize3;"
-	     font-weight="bold"
-	     font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-    <t:titlepage-content t:side="verso">
-    </t:titlepage-content>
-
-    <t:titlepage-separator>
-    </t:titlepage-separator>
-
-    <t:titlepage-before t:side="recto">
-    </t:titlepage-before>
-
-    <t:titlepage-before t:side="verso">
-    </t:titlepage-before>
-  </t:titlepage>
-
-  <t:titlepage t:element="list.of.tables" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:force="1"
-	     t:named-template="gentext"
-	     param:key="'ListofTables'"
-             space-before.minimum="1em"
-             space-before.optimum="1.5em"
-             space-before.maximum="2em"
-	     space-after="0.5em"
-	     margin-left="{$title.margin.left}"
-	     start-indent="0pt"
-	     font-size="&hsize3;"
-	     font-weight="bold"
-	     font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-    <t:titlepage-content t:side="verso">
-    </t:titlepage-content>
-
-    <t:titlepage-separator>
-    </t:titlepage-separator>
-
-    <t:titlepage-before t:side="recto">
-    </t:titlepage-before>
-
-    <t:titlepage-before t:side="verso">
-    </t:titlepage-before>
-  </t:titlepage>
-
-  <t:titlepage t:element="list.of.figures" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:force="1"
-	     t:named-template="gentext"
-	     param:key="'ListofFigures'"
-             space-before.minimum="1em"
-             space-before.optimum="1.5em"
-             space-before.maximum="2em"
-	     space-after="0.5em"
-	     margin-left="{$title.margin.left}"
-	     start-indent="0pt"
-	     font-size="&hsize3;"
-	     font-weight="bold"
-	     font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-    <t:titlepage-content t:side="verso">
-    </t:titlepage-content>
-
-    <t:titlepage-separator>
-    </t:titlepage-separator>
-
-    <t:titlepage-before t:side="recto">
-    </t:titlepage-before>
-
-    <t:titlepage-before t:side="verso">
-    </t:titlepage-before>
-  </t:titlepage>
-
-  <t:titlepage t:element="list.of.examples" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:force="1"
-	     t:named-template="gentext"
-	     param:key="'ListofExamples'"
-             space-before.minimum="1em"
-             space-before.optimum="1.5em"
-             space-before.maximum="2em"
-	     space-after="0.5em"
-	     margin-left="{$title.margin.left}"
-	     start-indent="0pt"
-	     font-size="&hsize3;"
-	     font-weight="bold"
-	     font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-    <t:titlepage-content t:side="verso">
-    </t:titlepage-content>
-
-    <t:titlepage-separator>
-    </t:titlepage-separator>
-
-    <t:titlepage-before t:side="recto">
-    </t:titlepage-before>
-
-    <t:titlepage-before t:side="verso">
-    </t:titlepage-before>
-  </t:titlepage>
-
-  <t:titlepage t:element="list.of.equations" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:force="1"
-	     t:named-template="gentext"
-	     param:key="'ListofEquations'"
-             space-before.minimum="1em"
-             space-before.optimum="1.5em"
-             space-before.maximum="2em"
-	     space-after="0.5em"
-	     margin-left="{$title.margin.left}"
-	     start-indent="0pt"
-	     font-size="&hsize3;"
-	     font-weight="bold"
-	     font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-    <t:titlepage-content t:side="verso">
-    </t:titlepage-content>
-
-    <t:titlepage-separator>
-    </t:titlepage-separator>
-
-    <t:titlepage-before t:side="recto">
-    </t:titlepage-before>
-
-    <t:titlepage-before t:side="verso">
-    </t:titlepage-before>
-  </t:titlepage>
-
-  <t:titlepage t:element="list.of.procedures" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:force="1"
-	     t:named-template="gentext"
-	     param:key="'ListofProcedures'"
-             space-before.minimum="1em"
-             space-before.optimum="1.5em"
-             space-before.maximum="2em"
-	     space-after="0.5em"
-	     margin-left="{$title.margin.left}"
-	     start-indent="0pt"
-	     font-size="&hsize3;"
-	     font-weight="bold"
-	     font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-    <t:titlepage-content t:side="verso">
-    </t:titlepage-content>
-
-    <t:titlepage-separator>
-    </t:titlepage-separator>
-
-    <t:titlepage-before t:side="recto">
-    </t:titlepage-before>
-
-    <t:titlepage-before t:side="verso">
-    </t:titlepage-before>
-  </t:titlepage>
-
-  <t:titlepage t:element="list.of.unknowns" t:wrapper="fo:block">
-    <t:titlepage-content t:side="recto">
-      <title
-	     t:force="1"
-	     t:named-template="gentext"
-	     param:key="'ListofUnknown'"
-             space-before.minimum="1em"
-             space-before.optimum="1.5em"
-             space-before.maximum="2em"
-	     space-after="0.5em"
-	     margin-left="{$title.margin.left}"
-	     start-indent="0pt"
-	     font-size="&hsize3;"
-	     font-weight="bold"
-	     font-family="{$title.fontset}"/>
-    </t:titlepage-content>
-
-    <t:titlepage-content t:side="verso">
-    </t:titlepage-content>
-
-    <t:titlepage-separator>
-    </t:titlepage-separator>
-
-    <t:titlepage-before t:side="recto">
-    </t:titlepage-before>
-
-    <t:titlepage-before t:side="verso">
-    </t:titlepage-before>
-  </t:titlepage>
-
-<!-- ==================================================================== -->
-
-</t:templates>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/titlepage.templates.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/titlepage.templates.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,5094 +1,0 @@
-<?xml version="1.0"?>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" version="1.0" exclude-result-prefixes="exsl">
-
-<!-- This stylesheet was created by template/titlepage.xsl-->
-
-<xsl:template name="article.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="articleinfo/title">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/title"/>
-    </xsl:when>
-    <xsl:when test="artheader/title">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="articleinfo/subtitle">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="artheader/subtitle">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/corpauthor"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/corpauthor"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/authorgroup"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/authorgroup"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/author"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/author"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/othercredit"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/othercredit"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/releaseinfo"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/releaseinfo"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/copyright"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/copyright"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/legalnotice"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/legalnotice"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/pubdate"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/pubdate"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/revision"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/revision"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/revhistory"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/revhistory"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/abstract"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/abstract"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="article.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="article.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="article.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="article.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="article.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="{$title.fontset}">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="article.titlepage.before.recto"/>
-      <xsl:call-template name="article.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block start-indent="0pt" text-align="center"><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="article.titlepage.before.verso"/>
-      <xsl:call-template name="article.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="article.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="article.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="article.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" keep-with-next.within-column="always" font-size="24.8832pt" font-weight="bold">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::article[1]"/>
-</xsl:call-template>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em" font-size="14.4pt">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em" font-size="14.4pt">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em" font-size="14.4pt">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" text-align="start" margin-left="0.5in" margin-right="0.5in" font-family="{$body.fontset}">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revision" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="article.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="article.titlepage.recto.style" space-before="0.5em" text-align="start" margin-left="0.5in" margin-right="0.5in" font-family="{$body.fontset}">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="set.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="setinfo/title">
-      <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="setinfo/subtitle">
-      <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/corpauthor"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/authorgroup"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/author"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/othercredit"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/releaseinfo"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/copyright"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/legalnotice"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/pubdate"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/revision"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/revhistory"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/abstract"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="set.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="set.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="set.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="set.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="set.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="set.titlepage.before.recto"/>
-      <xsl:call-template name="set.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="set.titlepage.before.verso"/>
-      <xsl:call-template name="set.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="set.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="set.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="set.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style" text-align="center" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="{$title.fontset}">
-<xsl:call-template name="division.title">
-<xsl:with-param name="node" select="ancestor-or-self::set[1]"/>
-</xsl:call-template>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style" font-family="{$title.fontset}" text-align="center">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revision" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="set.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="book.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="bookinfo/title">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="bookinfo/subtitle">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/corpauthor"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/authorgroup"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/author"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/author"/>
-</xsl:template>
-
-<xsl:template name="book.titlepage.verso">
-  <xsl:choose>
-    <xsl:when test="bookinfo/title">
-      <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/corpauthor"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/authorgroup"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/author"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/othercredit"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/releaseinfo"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/pubdate"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/copyright"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/abstract"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/abstract"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/legalnotice"/>
-  <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="info/legalnotice"/>
-</xsl:template>
-
-<xsl:template name="book.titlepage.separator"><fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" break-after="page"/>
-</xsl:template>
-
-<xsl:template name="book.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="book.titlepage.before.verso"><fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" break-after="page"/>
-</xsl:template>
-
-<xsl:template name="book.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="book.titlepage.before.recto"/>
-      <xsl:call-template name="book.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="book.titlepage.before.verso"/>
-      <xsl:call-template name="book.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="book.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="book.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="book.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" text-align="center" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="{$title.fontset}">
-<xsl:call-template name="division.title">
-<xsl:with-param name="node" select="ancestor-or-self::book[1]"/>
-</xsl:call-template>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" text-align="center" font-size="20.736pt" space-before="15.552pt" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" font-size="17.28pt" keep-with-next.within-column="always" space-before="2in">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" space-before="2in">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="book.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.recto.style" font-size="17.28pt" space-before="10.8pt" keep-with-next.within-column="always">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="title" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style" font-size="14.4pt" font-weight="bold" font-family="{$title.fontset}">
-<xsl:call-template name="book.verso.title">
-</xsl:call-template>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style">
-<xsl:apply-templates select="." mode="book.titlepage.verso.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style">
-<xsl:call-template name="verso.authorgroup">
-</xsl:call-template>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style">
-<xsl:apply-templates select="." mode="book.titlepage.verso.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style">
-<xsl:apply-templates select="." mode="book.titlepage.verso.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style" space-before="0.5em">
-<xsl:apply-templates select="." mode="book.titlepage.verso.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style" space-before="1em">
-<xsl:apply-templates select="." mode="book.titlepage.verso.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style">
-<xsl:apply-templates select="." mode="book.titlepage.verso.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style">
-<xsl:apply-templates select="." mode="book.titlepage.verso.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="book.titlepage.verso.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="book.titlepage.verso.style" font-size="8pt">
-<xsl:apply-templates select="." mode="book.titlepage.verso.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="part.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="partinfo/title">
-      <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="partinfo/subtitle">
-      <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="part.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="part.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="part.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="part.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="part.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="part.titlepage.before.recto"/>
-      <xsl:call-template name="part.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="part.titlepage.before.verso"/>
-      <xsl:call-template name="part.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="part.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="part.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="part.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="part.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="part.titlepage.recto.style" text-align="center" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="{$title.fontset}">
-<xsl:call-template name="division.title">
-<xsl:with-param name="node" select="ancestor-or-self::part[1]"/>
-</xsl:call-template>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="part.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="part.titlepage.recto.style" text-align="center" font-size="20.736pt" space-before="15.552pt" font-weight="bold" font-style="italic" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="partintro.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="partintroinfo/title">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="partintroinfo/subtitle">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/corpauthor"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/authorgroup"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/author"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/author"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/othercredit"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/releaseinfo"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/copyright"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/copyright"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/legalnotice"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/pubdate"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/revision"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/revision"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/revhistory"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/abstract"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/abstract"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="partintro.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="partintro.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="partintro.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="partintro.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="partintro.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="partintro.titlepage.before.recto"/>
-      <xsl:call-template name="partintro.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="partintro.titlepage.before.verso"/>
-      <xsl:call-template name="partintro.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="partintro.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="partintro.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="partintro.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style" text-align="center" font-size="24.8832pt" font-weight="bold" space-before="1em" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style" text-align="center" font-size="14.4pt" font-weight="bold" font-style="italic" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revision" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="partintro.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="reference.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="referenceinfo/title">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="referenceinfo/subtitle">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/corpauthor"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/authorgroup"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/author"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/author"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/othercredit"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/releaseinfo"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/copyright"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/copyright"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/legalnotice"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/pubdate"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/revision"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/revision"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/revhistory"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/abstract"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/abstract"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="reference.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="reference.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="reference.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="reference.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="reference.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="reference.titlepage.before.recto"/>
-      <xsl:call-template name="reference.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="reference.titlepage.before.verso"/>
-      <xsl:call-template name="reference.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="reference.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="reference.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="reference.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style" text-align="center" font-size="24.8832pt" space-before="18.6624pt" font-weight="bold" font-family="{$title.fontset}">
-<xsl:call-template name="division.title">
-<xsl:with-param name="node" select="ancestor-or-self::reference[1]"/>
-</xsl:call-template>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style" font-family="{$title.fontset}" text-align="center">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revision" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="reference.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="refsynopsisdiv.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="refsynopsisdivinfo/title">
-      <xsl:apply-templates mode="refsynopsisdiv.titlepage.recto.auto.mode" select="refsynopsisdivinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="refsynopsisdiv.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="refsynopsisdiv.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="refsynopsisdiv.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="refsynopsisdiv.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="refsynopsisdiv.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="refsynopsisdiv.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="refsynopsisdiv.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="refsynopsisdiv.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="refsynopsisdiv.titlepage.before.recto"/>
-      <xsl:call-template name="refsynopsisdiv.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="refsynopsisdiv.titlepage.before.verso"/>
-      <xsl:call-template name="refsynopsisdiv.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="refsynopsisdiv.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="refsynopsisdiv.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="refsynopsisdiv.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="refsynopsisdiv.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="refsynopsisdiv.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="refsynopsisdiv.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="refsection.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="refsectioninfo/title">
-      <xsl:apply-templates mode="refsection.titlepage.recto.auto.mode" select="refsectioninfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="refsection.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="refsection.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="refsection.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="refsection.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="refsection.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="refsection.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="refsection.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="refsection.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="refsection.titlepage.before.recto"/>
-      <xsl:call-template name="refsection.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="refsection.titlepage.before.verso"/>
-      <xsl:call-template name="refsection.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="refsection.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="refsection.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="refsection.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="refsection.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="refsection.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="refsection.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="refsect1.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="refsect1info/title">
-      <xsl:apply-templates mode="refsect1.titlepage.recto.auto.mode" select="refsect1info/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="refsect1.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="refsect1.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="refsect1.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="refsect1.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="refsect1.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="refsect1.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="refsect1.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="refsect1.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="refsect1.titlepage.before.recto"/>
-      <xsl:call-template name="refsect1.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="refsect1.titlepage.before.verso"/>
-      <xsl:call-template name="refsect1.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="refsect1.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="refsect1.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="refsect1.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="refsect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="refsect1.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="refsect1.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="refsect2.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="refsect2info/title">
-      <xsl:apply-templates mode="refsect2.titlepage.recto.auto.mode" select="refsect2info/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="refsect2.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="refsect2.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="refsect2.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="refsect2.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="refsect2.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="refsect2.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="refsect2.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="refsect2.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="refsect2.titlepage.before.recto"/>
-      <xsl:call-template name="refsect2.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="refsect2.titlepage.before.verso"/>
-      <xsl:call-template name="refsect2.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="refsect2.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="refsect2.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="refsect2.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="refsect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="refsect2.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="refsect2.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="refsect3.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="refsect3info/title">
-      <xsl:apply-templates mode="refsect3.titlepage.recto.auto.mode" select="refsect3info/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="refsect3.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="refsect3.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="refsect3.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="refsect3.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="refsect3.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="refsect3.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="refsect3.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="refsect3.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="refsect3.titlepage.before.recto"/>
-      <xsl:call-template name="refsect3.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="refsect3.titlepage.before.verso"/>
-      <xsl:call-template name="refsect3.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="refsect3.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="refsect3.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="refsect3.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="refsect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="refsect3.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="refsect3.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="dedication.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="dedication.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::dedication[1]"/>
-</xsl:call-template></fo:block>
-  <xsl:choose>
-    <xsl:when test="dedicationinfo/subtitle">
-      <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="dedicationinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="dedication.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="dedication.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="dedication.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="dedication.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="dedication.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="dedication.titlepage.before.recto"/>
-      <xsl:call-template name="dedication.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="dedication.titlepage.before.verso"/>
-      <xsl:call-template name="dedication.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="dedication.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="dedication.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="dedication.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="dedication.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="dedication.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="dedication.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="preface.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::preface[1]"/>
-</xsl:call-template></fo:block>
-  <xsl:choose>
-    <xsl:when test="prefaceinfo/subtitle">
-      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/corpauthor"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/authorgroup"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/author"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/author"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/othercredit"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/releaseinfo"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/copyright"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/copyright"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/legalnotice"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/pubdate"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/revision"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/revision"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/revhistory"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/abstract"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/abstract"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="preface.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="preface.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="preface.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="preface.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="preface.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="preface.titlepage.before.recto"/>
-      <xsl:call-template name="preface.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="preface.titlepage.before.verso"/>
-      <xsl:call-template name="preface.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="preface.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="preface.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="preface.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revision" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="preface.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="chapter.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="chapterinfo/title">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="chapterinfo/subtitle">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/corpauthor"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/authorgroup"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/author"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/author"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/othercredit"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/releaseinfo"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/copyright"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/copyright"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/legalnotice"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/pubdate"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/revision"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/revision"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/revhistory"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/abstract"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/abstract"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="chapter.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="chapter.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="chapter.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="chapter.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="chapter.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="{$title.fontset}">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="chapter.titlepage.before.recto"/>
-      <xsl:call-template name="chapter.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block margin-left="{$title.margin.left}"><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="chapter.titlepage.before.verso"/>
-      <xsl:call-template name="chapter.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="chapter.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="chapter.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="chapter.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style" font-size="24.8832pt" font-weight="bold">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::chapter[1]"/>
-</xsl:call-template>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style" space-before="0.5em" font-style="italic" font-size="14.4pt" font-weight="bold">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style" space-before="0.5em" space-after="0.5em" font-size="14.4pt">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style" space-before="0.5em" space-after="0.5em" font-size="14.4pt">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style" space-before="0.5em" space-after="0.5em" font-size="14.4pt">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revision" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="chapter.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="appendix.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="appendixinfo/title">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="appendixinfo/subtitle">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/corpauthor"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/authorgroup"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/author"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/author"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/othercredit"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/releaseinfo"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/copyright"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/copyright"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/legalnotice"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/pubdate"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/revision"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/revision"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/revhistory"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/abstract"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/abstract"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="appendix.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="appendix.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="appendix.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="appendix.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="appendix.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="appendix.titlepage.before.recto"/>
-      <xsl:call-template name="appendix.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="appendix.titlepage.before.verso"/>
-      <xsl:call-template name="appendix.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="appendix.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="appendix.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="appendix.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-weight="bold" font-family="{$title.fontset}">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::appendix[1]"/>
-</xsl:call-template>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revision" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="appendix.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="section.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="sectioninfo/title">
-      <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="sectioninfo/subtitle">
-      <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/corpauthor"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/authorgroup"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/author"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/othercredit"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/releaseinfo"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/copyright"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/legalnotice"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/pubdate"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/revision"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/revhistory"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/abstract"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="section.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="section.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="section.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="section.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="section.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="section.titlepage.before.recto"/>
-      <xsl:call-template name="section.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="section.titlepage.before.verso"/>
-      <xsl:call-template name="section.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="section.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="section.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="section.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revision" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="section.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="sect1.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="sect1info/title">
-      <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="sect1info/subtitle">
-      <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/corpauthor"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/authorgroup"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/author"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/othercredit"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/releaseinfo"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/copyright"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/legalnotice"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/pubdate"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/revision"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/revhistory"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/abstract"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="sect1.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="sect1.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="sect1.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="sect1.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="sect1.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="sect1.titlepage.before.recto"/>
-      <xsl:call-template name="sect1.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="sect1.titlepage.before.verso"/>
-      <xsl:call-template name="sect1.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="sect1.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="sect1.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="sect1.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revision" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="sect1.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="sect2.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="sect2info/title">
-      <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="sect2info/subtitle">
-      <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/corpauthor"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/authorgroup"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/author"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/othercredit"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/releaseinfo"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/copyright"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/legalnotice"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/pubdate"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/revision"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/revhistory"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/abstract"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="sect2.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="sect2.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="sect2.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="sect2.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="sect2.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="sect2.titlepage.before.recto"/>
-      <xsl:call-template name="sect2.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="sect2.titlepage.before.verso"/>
-      <xsl:call-template name="sect2.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="sect2.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="sect2.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="sect2.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revision" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="sect2.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="sect3.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="sect3info/title">
-      <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="sect3info/subtitle">
-      <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/corpauthor"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/authorgroup"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/author"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/othercredit"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/releaseinfo"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/copyright"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/legalnotice"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/pubdate"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/revision"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/revhistory"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/abstract"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="sect3.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="sect3.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="sect3.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="sect3.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="sect3.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="sect3.titlepage.before.recto"/>
-      <xsl:call-template name="sect3.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="sect3.titlepage.before.verso"/>
-      <xsl:call-template name="sect3.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="sect3.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="sect3.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="sect3.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revision" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="sect3.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="sect4.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="sect4info/title">
-      <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="sect4info/subtitle">
-      <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/corpauthor"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/authorgroup"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/author"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/othercredit"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/releaseinfo"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/copyright"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/legalnotice"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/pubdate"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/revision"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/revhistory"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/abstract"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="sect4.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="sect4.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="sect4.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="sect4.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="sect4.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="sect4.titlepage.before.recto"/>
-      <xsl:call-template name="sect4.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="sect4.titlepage.before.verso"/>
-      <xsl:call-template name="sect4.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="sect4.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="sect4.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="sect4.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revision" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="sect4.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="sect5.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="sect5info/title">
-      <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="sect5info/subtitle">
-      <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/corpauthor"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/authorgroup"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/author"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/othercredit"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/releaseinfo"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/copyright"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/legalnotice"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/pubdate"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/revision"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/revhistory"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/abstract"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="sect5.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="sect5.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="sect5.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="sect5.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="sect5.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="sect5.titlepage.before.recto"/>
-      <xsl:call-template name="sect5.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="sect5.titlepage.before.verso"/>
-      <xsl:call-template name="sect5.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="sect5.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="sect5.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="sect5.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revision" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="sect5.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="simplesect.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="simplesectinfo/title">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="simplesectinfo/subtitle">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/corpauthor"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/authorgroup"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/author"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/author"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/othercredit"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/releaseinfo"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/copyright"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/copyright"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/legalnotice"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/pubdate"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/revision"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/revision"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/revhistory"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/abstract"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/abstract"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="simplesect.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="simplesect.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="simplesect.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="simplesect.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="simplesect.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="simplesect.titlepage.before.recto"/>
-      <xsl:call-template name="simplesect.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="simplesect.titlepage.before.verso"/>
-      <xsl:call-template name="simplesect.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="simplesect.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="simplesect.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="simplesect.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style" margin-left="{$title.margin.left}" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revision" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="simplesect.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="bibliography.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="bibliography.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::bibliography[1]"/>
-</xsl:call-template></fo:block>
-  <xsl:choose>
-    <xsl:when test="bibliographyinfo/subtitle">
-      <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="bibliographyinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="bibliography.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="bibliography.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="bibliography.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="bibliography.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="bibliography.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="bibliography.titlepage.before.recto"/>
-      <xsl:call-template name="bibliography.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="bibliography.titlepage.before.verso"/>
-      <xsl:call-template name="bibliography.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="bibliography.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="bibliography.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="bibliography.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="bibliography.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="bibliography.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="bibliography.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="bibliodiv.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="bibliodivinfo/title">
-      <xsl:apply-templates mode="bibliodiv.titlepage.recto.auto.mode" select="bibliodivinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="bibliodiv.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="bibliodiv.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="bibliodiv.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="bibliodivinfo/subtitle">
-      <xsl:apply-templates mode="bibliodiv.titlepage.recto.auto.mode" select="bibliodivinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="bibliodiv.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="bibliodiv.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="bibliodiv.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="bibliodiv.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="bibliodiv.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="bibliodiv.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="bibliodiv.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="bibliodiv.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="bibliodiv.titlepage.before.recto"/>
-      <xsl:call-template name="bibliodiv.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="bibliodiv.titlepage.before.verso"/>
-      <xsl:call-template name="bibliodiv.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="bibliodiv.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="bibliodiv.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="bibliodiv.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="bibliodiv.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="bibliodiv.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="20.736pt" font-family="{$title.fontset}" font-weight="bold">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::bibliodiv[1]"/>
-</xsl:call-template>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="bibliodiv.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="bibliodiv.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="bibliodiv.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="glossary.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="glossary.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::glossary[1]"/>
-</xsl:call-template></fo:block>
-  <xsl:choose>
-    <xsl:when test="glossaryinfo/subtitle">
-      <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="glossaryinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="glossary.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="glossary.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="glossary.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="glossary.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="glossary.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="glossary.titlepage.before.recto"/>
-      <xsl:call-template name="glossary.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="glossary.titlepage.before.verso"/>
-      <xsl:call-template name="glossary.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="glossary.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="glossary.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="glossary.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="glossary.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="glossary.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="glossary.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="glossdiv.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="glossdivinfo/title">
-      <xsl:apply-templates mode="glossdiv.titlepage.recto.auto.mode" select="glossdivinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="glossdiv.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="glossdiv.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="glossdiv.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="glossdivinfo/subtitle">
-      <xsl:apply-templates mode="glossdiv.titlepage.recto.auto.mode" select="glossdivinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="glossdiv.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="glossdiv.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="glossdiv.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="glossdiv.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="glossdiv.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="glossdiv.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="glossdiv.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="glossdiv.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="glossdiv.titlepage.before.recto"/>
-      <xsl:call-template name="glossdiv.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="glossdiv.titlepage.before.verso"/>
-      <xsl:call-template name="glossdiv.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="glossdiv.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="glossdiv.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="glossdiv.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="glossdiv.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="glossdiv.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="20.736pt" font-family="{$title.fontset}" font-weight="bold">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::glossdiv[1]"/>
-</xsl:call-template>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="glossdiv.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="glossdiv.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="glossdiv.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="index.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="index.titlepage.recto.style" margin-left="0pt" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::index[1]"/>
-<xsl:with-param name="pagewide" select="1"/>
-</xsl:call-template></fo:block>
-  <xsl:choose>
-    <xsl:when test="indexinfo/subtitle">
-      <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="indexinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="index.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="index.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="index.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="index.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="index.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="index.titlepage.before.recto"/>
-      <xsl:call-template name="index.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="index.titlepage.before.verso"/>
-      <xsl:call-template name="index.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="index.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="index.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="index.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="index.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="index.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="index.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="indexdiv.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="indexdiv.titlepage.recto.style">
-<xsl:call-template name="indexdiv.title">
-<xsl:with-param name="title" select="title"/>
-</xsl:call-template></fo:block>
-  <xsl:choose>
-    <xsl:when test="indexdivinfo/subtitle">
-      <xsl:apply-templates mode="indexdiv.titlepage.recto.auto.mode" select="indexdivinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="indexdiv.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="indexdiv.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="indexdiv.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="indexdiv.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="indexdiv.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="indexdiv.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="indexdiv.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="indexdiv.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="indexdiv.titlepage.before.recto"/>
-      <xsl:call-template name="indexdiv.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="indexdiv.titlepage.before.verso"/>
-      <xsl:call-template name="indexdiv.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="indexdiv.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="indexdiv.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="indexdiv.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="indexdiv.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="indexdiv.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="indexdiv.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="setindex.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="setindex.titlepage.recto.style" margin-left="0pt" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::setindex[1]"/>
-<xsl:with-param name="pagewide" select="1"/>
-</xsl:call-template></fo:block>
-  <xsl:choose>
-    <xsl:when test="setindexinfo/subtitle">
-      <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="setindexinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="setindex.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="setindex.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="setindex.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="setindex.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="setindex.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="setindex.titlepage.before.recto"/>
-      <xsl:call-template name="setindex.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="setindex.titlepage.before.verso"/>
-      <xsl:call-template name="setindex.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="setindex.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="setindex.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="setindex.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="setindex.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="setindex.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="setindex.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="colophon.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="colophon.titlepage.recto.style" margin-left="{$title.margin.left}" font-size="24.8832pt" font-family="{$title.fontset}" font-weight="bold">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::colophon[1]"/>
-</xsl:call-template></fo:block>
-  <xsl:choose>
-    <xsl:when test="colophoninfo/subtitle">
-      <xsl:apply-templates mode="colophon.titlepage.recto.auto.mode" select="colophoninfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="colophon.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="colophon.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="colophon.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="colophon.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="colophon.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="colophon.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="colophon.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="colophon.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="colophon.titlepage.before.recto"/>
-      <xsl:call-template name="colophon.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="colophon.titlepage.before.verso"/>
-      <xsl:call-template name="colophon.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="colophon.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="colophon.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="colophon.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="colophon.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="colophon.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="colophon.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="sidebar.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="sidebarinfo/title">
-      <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="sidebarinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="sidebarinfo/subtitle">
-      <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="sidebarinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="sidebar.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="sidebar.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="sidebar.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="sidebar.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="sidebar.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="sidebar.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="sidebar.titlepage.before.recto"/>
-      <xsl:call-template name="sidebar.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="sidebar.titlepage.before.verso"/>
-      <xsl:call-template name="sidebar.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="sidebar.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="sidebar.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="sidebar.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="sidebar.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sidebar.titlepage.recto.style" font-family="{$title.fontset}" font-weight="bold">
-<xsl:apply-templates select="." mode="sidebar.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="sidebar.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="sidebar.titlepage.recto.style" font-family="{$title.fontset}">
-<xsl:apply-templates select="." mode="sidebar.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="qandaset.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="qandasetinfo/title">
-      <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="qandasetinfo/title"/>
-    </xsl:when>
-    <xsl:when test="blockinfo/title">
-      <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="blockinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="qandasetinfo/subtitle">
-      <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="qandasetinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="blockinfo/subtitle">
-      <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="blockinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="qandasetinfo/corpauthor"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="blockinfo/corpauthor"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="qandasetinfo/authorgroup"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="blockinfo/authorgroup"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="qandasetinfo/author"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="blockinfo/author"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="qandasetinfo/othercredit"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="blockinfo/othercredit"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="qandasetinfo/releaseinfo"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="blockinfo/releaseinfo"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="qandasetinfo/copyright"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="blockinfo/copyright"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="qandasetinfo/legalnotice"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="blockinfo/legalnotice"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="qandasetinfo/pubdate"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="blockinfo/pubdate"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="qandasetinfo/revision"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="blockinfo/revision"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="qandasetinfo/revhistory"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="blockinfo/revhistory"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="qandasetinfo/abstract"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="blockinfo/abstract"/>
-  <xsl:apply-templates mode="qandaset.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="qandaset.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="qandaset.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="qandaset.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="qandaset.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="qandaset.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" font-family="{$title.fontset}">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="qandaset.titlepage.before.recto"/>
-      <xsl:call-template name="qandaset.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block start-indent="0pt" text-align="center"><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="qandaset.titlepage.before.verso"/>
-      <xsl:call-template name="qandaset.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="qandaset.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="qandaset.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="qandaset.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" keep-with-next.within-column="always" font-size="24.8832pt" font-weight="bold">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::qandaset[1]"/>
-</xsl:call-template>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style">
-<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em" font-size="14.4pt">
-<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em" font-size="14.4pt">
-<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="author" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em" font-size="14.4pt">
-<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em">
-<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em">
-<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="copyright" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em">
-<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" text-align="start" margin-left="0.5in" margin-right="0.5in" font-family="{$body.fontset}">
-<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em">
-<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revision" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em">
-<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em">
-<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template match="abstract" mode="qandaset.titlepage.recto.auto.mode">
-<fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="qandaset.titlepage.recto.style" space-before="0.5em" text-align="start" margin-left="0.5in" margin-right="0.5in" font-family="{$body.fontset}">
-<xsl:apply-templates select="." mode="qandaset.titlepage.recto.mode"/>
-</fo:block>
-</xsl:template>
-
-<xsl:template name="table.of.contents.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="table.of.contents.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}">
-<xsl:call-template name="gentext">
-<xsl:with-param name="key" select="'TableofContents'"/>
-</xsl:call-template></fo:block>
-</xsl:template>
-
-<xsl:template name="table.of.contents.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="table.of.contents.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="table.of.contents.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="table.of.contents.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="table.of.contents.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="table.of.contents.titlepage.before.recto"/>
-      <xsl:call-template name="table.of.contents.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="table.of.contents.titlepage.before.verso"/>
-      <xsl:call-template name="table.of.contents.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="table.of.contents.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="table.of.contents.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="table.of.contents.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template name="list.of.tables.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.tables.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}">
-<xsl:call-template name="gentext">
-<xsl:with-param name="key" select="'ListofTables'"/>
-</xsl:call-template></fo:block>
-</xsl:template>
-
-<xsl:template name="list.of.tables.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="list.of.tables.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="list.of.tables.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="list.of.tables.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="list.of.tables.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="list.of.tables.titlepage.before.recto"/>
-      <xsl:call-template name="list.of.tables.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="list.of.tables.titlepage.before.verso"/>
-      <xsl:call-template name="list.of.tables.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="list.of.tables.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="list.of.tables.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="list.of.tables.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template name="list.of.figures.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.figures.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}">
-<xsl:call-template name="gentext">
-<xsl:with-param name="key" select="'ListofFigures'"/>
-</xsl:call-template></fo:block>
-</xsl:template>
-
-<xsl:template name="list.of.figures.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="list.of.figures.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="list.of.figures.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="list.of.figures.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="list.of.figures.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="list.of.figures.titlepage.before.recto"/>
-      <xsl:call-template name="list.of.figures.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="list.of.figures.titlepage.before.verso"/>
-      <xsl:call-template name="list.of.figures.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="list.of.figures.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="list.of.figures.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="list.of.figures.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template name="list.of.examples.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.examples.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}">
-<xsl:call-template name="gentext">
-<xsl:with-param name="key" select="'ListofExamples'"/>
-</xsl:call-template></fo:block>
-</xsl:template>
-
-<xsl:template name="list.of.examples.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="list.of.examples.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="list.of.examples.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="list.of.examples.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="list.of.examples.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="list.of.examples.titlepage.before.recto"/>
-      <xsl:call-template name="list.of.examples.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="list.of.examples.titlepage.before.verso"/>
-      <xsl:call-template name="list.of.examples.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="list.of.examples.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="list.of.examples.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="list.of.examples.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template name="list.of.equations.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.equations.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}">
-<xsl:call-template name="gentext">
-<xsl:with-param name="key" select="'ListofEquations'"/>
-</xsl:call-template></fo:block>
-</xsl:template>
-
-<xsl:template name="list.of.equations.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="list.of.equations.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="list.of.equations.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="list.of.equations.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="list.of.equations.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="list.of.equations.titlepage.before.recto"/>
-      <xsl:call-template name="list.of.equations.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="list.of.equations.titlepage.before.verso"/>
-      <xsl:call-template name="list.of.equations.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="list.of.equations.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="list.of.equations.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="list.of.equations.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template name="list.of.procedures.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.procedures.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}">
-<xsl:call-template name="gentext">
-<xsl:with-param name="key" select="'ListofProcedures'"/>
-</xsl:call-template></fo:block>
-</xsl:template>
-
-<xsl:template name="list.of.procedures.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="list.of.procedures.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="list.of.procedures.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="list.of.procedures.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="list.of.procedures.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="list.of.procedures.titlepage.before.recto"/>
-      <xsl:call-template name="list.of.procedures.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="list.of.procedures.titlepage.before.verso"/>
-      <xsl:call-template name="list.of.procedures.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="list.of.procedures.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="list.of.procedures.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="list.of.procedures.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template name="list.of.unknowns.titlepage.recto">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format" xsl:use-attribute-sets="list.of.unknowns.titlepage.recto.style" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em" space-after="0.5em" margin-left="{$title.margin.left}" start-indent="0pt" font-size="17.28pt" font-weight="bold" font-family="{$title.fontset}">
-<xsl:call-template name="gentext">
-<xsl:with-param name="key" select="'ListofUnknown'"/>
-</xsl:call-template></fo:block>
-</xsl:template>
-
-<xsl:template name="list.of.unknowns.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="list.of.unknowns.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="list.of.unknowns.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="list.of.unknowns.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="list.of.unknowns.titlepage">
-  <fo:block xmlns:fo="http://www.w3.org/1999/XSL/Format">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="list.of.unknowns.titlepage.before.recto"/>
-      <xsl:call-template name="list.of.unknowns.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$recto.content"/></fo:block>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="list.of.unknowns.titlepage.before.verso"/>
-      <xsl:call-template name="list.of.unknowns.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <fo:block><xsl:copy-of select="$verso.content"/></fo:block>
-    </xsl:if>
-    <xsl:call-template name="list.of.unknowns.titlepage.separator"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="*" mode="list.of.unknowns.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="list.of.unknowns.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/titlepage.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/titlepage.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,738 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:attribute-set name="book.titlepage.recto.style">
-  <xsl:attribute name="font-family">
-    <xsl:value-of select="$title.fontset"/>
-  </xsl:attribute>
-  <xsl:attribute name="font-weight">bold</xsl:attribute>
-  <xsl:attribute name="font-size">12pt</xsl:attribute>
-  <xsl:attribute name="text-align">center</xsl:attribute>
-</xsl:attribute-set>
-
-<xsl:attribute-set name="book.titlepage.verso.style">
-  <xsl:attribute name="font-size">10pt</xsl:attribute>
-</xsl:attribute-set>
-
-<xsl:attribute-set name="article.titlepage.recto.style"/>
-<xsl:attribute-set name="article.titlepage.verso.style"/>
-
-<xsl:attribute-set name="set.titlepage.recto.style"/>
-<xsl:attribute-set name="set.titlepage.verso.style"/>
-
-<xsl:attribute-set name="part.titlepage.recto.style">
-  <xsl:attribute name="text-align">center</xsl:attribute>
-</xsl:attribute-set>
-
-<xsl:attribute-set name="part.titlepage.verso.style"/>
-
-<xsl:attribute-set name="partintro.titlepage.recto.style"/>
-<xsl:attribute-set name="partintro.titlepage.verso.style"/>
-
-<xsl:attribute-set name="reference.titlepage.recto.style"/>
-<xsl:attribute-set name="reference.titlepage.verso.style"/>
-
-<xsl:attribute-set name="dedication.titlepage.recto.style"/>
-<xsl:attribute-set name="dedication.titlepage.verso.style"/>
-
-<xsl:attribute-set name="preface.titlepage.recto.style"/>
-<xsl:attribute-set name="preface.titlepage.verso.style"/>
-
-<xsl:attribute-set name="chapter.titlepage.recto.style"/>
-<xsl:attribute-set name="chapter.titlepage.verso.style"/>
-
-<xsl:attribute-set name="appendix.titlepage.recto.style"/>
-<xsl:attribute-set name="appendix.titlepage.verso.style"/>
-
-<xsl:attribute-set name="bibliography.titlepage.recto.style"/>
-<xsl:attribute-set name="bibliography.titlepage.verso.style"/>
-
-<xsl:attribute-set name="bibliodiv.titlepage.recto.style"/>
-<xsl:attribute-set name="bibliodiv.titlepage.verso.style"/>
-
-<xsl:attribute-set name="glossary.titlepage.recto.style"/>
-<xsl:attribute-set name="glossary.titlepage.verso.style"/>
-
-<xsl:attribute-set name="glossdiv.titlepage.recto.style"/>
-<xsl:attribute-set name="glossdiv.titlepage.verso.style"/>
-
-<xsl:attribute-set name="index.titlepage.recto.style"/>
-<xsl:attribute-set name="index.titlepage.verso.style"/>
-
-<xsl:attribute-set name="setindex.titlepage.recto.style"/>
-<xsl:attribute-set name="setindex.titlepage.verso.style"/>
-
-<xsl:attribute-set name="indexdiv.titlepage.recto.style"/>
-<xsl:attribute-set name="indexdiv.titlepage.verso.style"/>
-
-<xsl:attribute-set name="colophon.titlepage.recto.style"/>
-<xsl:attribute-set name="colophon.titlepage.verso.style"/>
-
-<xsl:attribute-set name="sidebar.titlepage.recto.style"/>
-<xsl:attribute-set name="sidebar.titlepage.verso.style"/>
-
-<xsl:attribute-set name="qandaset.titlepage.recto.style"/>
-<xsl:attribute-set name="qandaset.titlepage.verso.style"/>
-
-<xsl:attribute-set name="section.titlepage.recto.style">
-  <xsl:attribute name="keep-together.within-column">always</xsl:attribute>
-</xsl:attribute-set>
-
-<xsl:attribute-set name="section.titlepage.verso.style">
-  <xsl:attribute name="keep-together.within-column">always</xsl:attribute>
-  <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-</xsl:attribute-set>
-
-<xsl:attribute-set name="sect1.titlepage.recto.style"
-                   use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="sect1.titlepage.verso.style"
-                   use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="sect2.titlepage.recto.style"
-                   use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="sect2.titlepage.verso.style"
-                   use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="sect3.titlepage.recto.style"
-                   use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="sect3.titlepage.verso.style"
-                   use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="sect4.titlepage.recto.style"
-                   use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="sect4.titlepage.verso.style"
-                   use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="sect5.titlepage.recto.style"
-                   use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="sect5.titlepage.verso.style"
-                   use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="simplesect.titlepage.recto.style"
-                   use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="simplesect.titlepage.verso.style"
-                   use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="refnamediv.titlepage.recto.style"
-                   use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="refnamediv.titlepage.verso.style"
-                   use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="refsynopsisdiv.titlepage.recto.style"
-                   use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="refsynopsisdiv.titlepage.verso.style"
-                   use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="refsection.titlepage.recto.style"
-                   use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="refsection.titlepage.verso.style"
-                   use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="refsect1.titlepage.recto.style"
-                   use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="refsect1.titlepage.verso.style"
-                   use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="refsect2.titlepage.recto.style"
-                   use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="refsect2.titlepage.verso.style"
-                   use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="refsect3.titlepage.recto.style"
-                   use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="refsect3.titlepage.verso.style"
-                   use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="table.of.contents.titlepage.recto.style"/>
-<xsl:attribute-set name="table.of.contents.titlepage.verso.style"/>
-
-<xsl:attribute-set name="list.of.tables.titlepage.recto.style"/>
-<xsl:attribute-set name="list.of.tables.contents.titlepage.verso.style"/>
-
-<xsl:attribute-set name="list.of.figures.titlepage.recto.style"/>
-<xsl:attribute-set name="list.of.figures.contents.titlepage.verso.style"/>
-
-<xsl:attribute-set name="list.of.equations.titlepage.recto.style"/>
-<xsl:attribute-set name="list.of.equations.contents.titlepage.verso.style"/>
-
-<xsl:attribute-set name="list.of.examples.titlepage.recto.style"/>
-<xsl:attribute-set name="list.of.examples.contents.titlepage.verso.style"/>
-
-<xsl:attribute-set name="list.of.procedures.titlepage.recto.style"/>
-<xsl:attribute-set name="list.of.procedures.contents.titlepage.verso.style"/>
-
-<xsl:attribute-set name="list.of.unknowns.titlepage.recto.style"/>
-<xsl:attribute-set name="list.of.unknowns.contents.titlepage.verso.style"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="titlepage.mode">
-  <!-- if an element isn't found in this mode, try the default mode -->
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template match="abbrev" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="abstract" mode="titlepage.mode">
-  <fo:block>
-    <xsl:call-template name="formal.object.heading">
-      <xsl:with-param name="title">
-        <xsl:apply-templates select="." mode="title.markup"/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="abstract/title" mode="titlepage.mode"/>
-
-<xsl:template match="abstract/title" mode="titlepage.abstract.title.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="address" mode="titlepage.mode">
-  <!-- use the normal address handling code -->
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template match="affiliation" mode="titlepage.mode">
-  <fo:block>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="artpagenums" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="author" mode="titlepage.mode">
-  <fo:block>
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="person.name"/>
-    <xsl:if test="affiliation/orgname">
-      <xsl:text>, </xsl:text>
-      <xsl:apply-templates select="affiliation/orgname" mode="titlepage.mode"/>
-    </xsl:if>
-    <xsl:if test="email|affiliation/address/email">
-      <xsl:text> </xsl:text>
-      <xsl:apply-templates select="(email|affiliation/address/email)[1]"/>
-    </xsl:if>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="authorblurb" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="titlepage.mode">
-  <fo:wrapper>
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </fo:wrapper>
-</xsl:template>
-
-<xsl:template match="authorinitials" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="bibliomisc" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="bibliomset" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="collab" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="confgroup" mode="titlepage.mode">
-  <fo:block>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="confdates" mode="titlepage.mode">
-  <fo:block>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="conftitle" mode="titlepage.mode">
-  <fo:block>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="confnum" mode="titlepage.mode">
-  <!-- suppress -->
-</xsl:template>
-
-<xsl:template match="contractnum" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="contractsponsor" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="contrib" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="copyright" mode="titlepage.mode">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key" select="'Copyright'"/>
-  </xsl:call-template>
-  <xsl:call-template name="gentext.space"/>
-  <xsl:call-template name="dingbat">
-    <xsl:with-param name="dingbat">copyright</xsl:with-param>
-  </xsl:call-template>
-  <xsl:call-template name="gentext.space"/>
-  <xsl:call-template name="copyright.years">
-    <xsl:with-param name="years" select="year"/>
-    <xsl:with-param name="print.ranges" select="$make.year.ranges"/>
-    <xsl:with-param name="single.year.ranges"
-                    select="$make.single.year.ranges"/>
-  </xsl:call-template>
-  <xsl:call-template name="gentext.space"/>
-  <xsl:apply-templates select="holder" mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="year" mode="titlepage.mode">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="holder" mode="titlepage.mode">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="corpcredit" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="corpname" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="date" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="edition" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-  <xsl:call-template name="gentext.space"/>
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key" select="'Edition'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="editor" mode="titlepage.mode">
-  <!-- The first editor is dealt with in the following template,
-       which in turn displays all editors of the same mode. -->
-</xsl:template>
-
-<xsl:template match="editor[1]" priority="2" mode="titlepage.mode">
-  <xsl:call-template name="gentext.edited.by"/>
-  <xsl:call-template name="gentext.space"/>
-  <xsl:call-template name="person.name.list">
-    <xsl:with-param name="person.list" select="../editor"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="firstname" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="graphic" mode="titlepage.mode">
-  <!-- use the normal graphic handling code -->
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template match="honorific" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="isbn" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="issn" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="biblioid" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="itermset" mode="titlepage.mode">
-  <!-- discard -->
-</xsl:template>
-
-<xsl:template match="invpartnumber" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="issuenum" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="jobtitle" mode="titlepage.mode">
-  <fo:block>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="keywordset" mode="titlepage.mode">
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="titlepage.mode">
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <fo:block id="{$id}">
-    <xsl:if test="title"> <!-- FIXME: add param for using default title? -->
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="legalnotice/title" mode="titlepage.mode">
-</xsl:template>
-
-<xsl:template match="lineage" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="modespec" mode="titlepage.mode">
-  <!-- discard -->
-</xsl:template>
-
-<xsl:template match="orgdiv" mode="titlepage.mode">
-  <xsl:if test="preceding-sibling::*[1][self::orgname]">
-    <xsl:text> </xsl:text>
-  </xsl:if>
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="orgname" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="titlepage.mode">
-  <xsl:variable name="contrib" select="string(contrib)"/>
-  <xsl:choose>
-    <xsl:when test="contrib">
-      <xsl:if test="not(preceding-sibling::othercredit[string(contrib)=$contrib])">
-        <fo:block>
-          <xsl:apply-templates mode="titlepage.mode" select="contrib"/>
-          <xsl:text>: </xsl:text>
-          <xsl:call-template name="person.name"/>
-          <xsl:apply-templates mode="titlepage.mode" select="affiliation"/>
-          <xsl:apply-templates select="following-sibling::othercredit[string(contrib)=$contrib]" mode="titlepage.othercredits"/>
-        </fo:block>
-      </xsl:if>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:block><xsl:call-template name="person.name"/></fo:block>
-      <xsl:apply-templates mode="titlepage.mode" select="./affiliation"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="titlepage.othercredits">
-  <xsl:text>, </xsl:text>
-  <xsl:call-template name="person.name"/>
-</xsl:template>
-
-<xsl:template match="othername" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="pagenums" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="printhistory" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="productname" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="productnumber" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="publisher" mode="titlepage.mode">
-  <fo:block>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="publishername" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="pubsnumber" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="titlepage.mode">
-
-  <xsl:variable name="explicit.table.width">
-    <xsl:call-template name="pi.dbfo_table-width"/>
-  </xsl:variable>
-
-  <xsl:variable name="table.width">
-    <xsl:choose>
-      <xsl:when test="$explicit.table.width != ''">
-        <xsl:value-of select="$explicit.table.width"/>
-      </xsl:when>
-      <xsl:when test="$default.table.width = ''">
-        <xsl:text>100%</xsl:text>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$default.table.width"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <fo:table table-layout="fixed" width="{$table.width}" xsl:use-attribute-sets="revhistory.table.properties">
-    <fo:table-column column-number="1" column-width="proportional-column-width(1)"/>
-    <fo:table-column column-number="2" column-width="proportional-column-width(1)"/>
-    <fo:table-column column-number="3" column-width="proportional-column-width(1)"/>
-    <fo:table-body start-indent="0pt" end-indent="0pt">
-      <fo:table-row>
-        <fo:table-cell number-columns-spanned="3" xsl:use-attribute-sets="revhistory.table.cell.properties">
-          <fo:block xsl:use-attribute-sets="revhistory.title.properties">
-            <xsl:call-template name="gentext">
-              <xsl:with-param name="key" select="'RevHistory'"/>
-            </xsl:call-template>
-          </fo:block>
-        </fo:table-cell>
-      </fo:table-row>
-      <xsl:apply-templates mode="titlepage.mode"/>
-    </fo:table-body>
-  </fo:table>
-</xsl:template>
-
-<xsl:template match="revhistory/revision" mode="titlepage.mode">
-  <xsl:variable name="revnumber" select="revnumber"/>
-  <xsl:variable name="revdate"   select="date"/>
-  <xsl:variable name="revauthor" select="authorinitials|author"/>
-  <xsl:variable name="revremark" select="revremark|revdescription"/>
-  <fo:table-row>
-    <fo:table-cell xsl:use-attribute-sets="revhistory.table.cell.properties">
-      <fo:block>
-        <xsl:if test="$revnumber">
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'Revision'"/>
-          </xsl:call-template>
-          <xsl:call-template name="gentext.space"/>
-          <xsl:apply-templates select="$revnumber[1]" mode="titlepage.mode"/>
-        </xsl:if>
-      </fo:block>
-    </fo:table-cell>
-    <fo:table-cell xsl:use-attribute-sets="revhistory.table.cell.properties">
-      <fo:block>
-        <xsl:apply-templates select="$revdate[1]" mode="titlepage.mode"/>
-      </fo:block>
-    </fo:table-cell>
-    <fo:table-cell xsl:use-attribute-sets="revhistory.table.cell.properties">
-      <fo:block>
-        <xsl:for-each select="$revauthor">
-          <xsl:apply-templates select="." mode="titlepage.mode"/>
-          <xsl:if test="position() != last()">
-            <xsl:text>, </xsl:text>
-          </xsl:if>
-        </xsl:for-each>
-      </fo:block>
-    </fo:table-cell>
-  </fo:table-row>
-  <xsl:if test="$revremark">
-    <fo:table-row>
-      <fo:table-cell number-columns-spanned="3" xsl:use-attribute-sets="revhistory.table.cell.properties">
-        <fo:block>
-          <xsl:apply-templates select="$revremark[1]" mode="titlepage.mode"/>
-        </fo:block>
-      </fo:table-cell>
-    </fo:table-row>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="revision/revnumber" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="revision/date" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="revision/authorinitials" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="revision/author" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="revision/revremark" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="revision/revdescription" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="seriesvolnums" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="shortaffil" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="subjectset" mode="titlepage.mode">
-  <!-- discard -->
-</xsl:template>
-
-<xsl:template match="subtitle" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="surname" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="titleabbrev" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="volumenum" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<!-- Book templates -->
-
-<!-- Note: these templates cannot use *.titlepage.recto.mode or
-     *.titlepage.verso.mode. If they do then subsequent use of a custom
-     titlepage.templates.xml file will not work correctly. -->
-
-<!-- book recto -->
-
-<xsl:template match="bookinfo/authorgroup|info/authorgroup"
-              mode="titlepage.mode" priority="2">
-  <fo:block>
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </fo:block>
-</xsl:template>
-
-<!-- book verso -->
-
-<xsl:template name="book.verso.title">
-  <fo:block>
-    <xsl:apply-templates mode="titlepage.mode"/>
-
-    <xsl:if test="following-sibling::subtitle
-                  |following-sibling::info/subtitle
-                  |following-sibling::bookinfo/subtitle">
-      <xsl:text>: </xsl:text>
-
-      <xsl:apply-templates select="(following-sibling::subtitle
-                                   |following-sibling::info/subtitle
-                                   |following-sibling::bookinfo/subtitle)[1]"
-                           mode="book.verso.subtitle.mode"/>
-    </xsl:if>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="book.verso.subtitle.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-  <xsl:if test="following-sibling::subtitle">
-    <xsl:text>: </xsl:text>
-    <xsl:apply-templates select="following-sibling::subtitle[1]"
-                         mode="book.verso.subtitle.mode"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="verso.authorgroup">
-  <fo:block>
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="'by'"/>
-    </xsl:call-template>
-    <xsl:text> </xsl:text>
-    <xsl:call-template name="person.name.list">
-      <xsl:with-param name="person.list" select="author|corpauthor|editor"/>
-    </xsl:call-template>
-  </fo:block>
-  <xsl:apply-templates select="othercredit" mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="bookinfo/author|info/author"
-              mode="titlepage.mode" priority="2">
-  <fo:block>
-    <xsl:call-template name="person.name"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="bookinfo/corpauthor|info/corpauthor"
-              mode="titlepage.mode" priority="2">
-  <fo:block>
-    <xsl:apply-templates/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template match="bookinfo/pubdate|info/pubdate"
-              mode="titlepage.mode" priority="2">
-  <fo:block>
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="'published'"/>
-    </xsl:call-template>
-    <xsl:text> </xsl:text>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/toc.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/toc.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,280 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!-- FIXME: in the contexts where <toc> can occur, I think it's always
-     the case that a page-sequence is required. Is that true? -->
-
-<xsl:template match="toc">
-  <xsl:variable name="master-reference">
-    <xsl:call-template name="select.pagemaster"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="*">
-      <xsl:if test="$process.source.toc != 0">
-        <!-- if the toc isn't empty, process it -->
-        <fo:page-sequence hyphenate="{$hyphenate}"
-                          master-reference="{$master-reference}">
-          <xsl:attribute name="language">
-            <xsl:call-template name="l10n.language"/>
-          </xsl:attribute>
-          <xsl:attribute name="format">
-            <xsl:call-template name="page.number.format">
-              <xsl:with-param name="element" select="'toc'"/>
-              <xsl:with-param name="master-reference" 
-                              select="$master-reference"/>
-            </xsl:call-template>
-          </xsl:attribute>
-
-          <xsl:attribute name="initial-page-number">
-            <xsl:call-template name="initial.page.number">
-              <xsl:with-param name="element" select="'toc'"/>
-              <xsl:with-param name="master-reference" 
-                              select="$master-reference"/>
-            </xsl:call-template>
-          </xsl:attribute>
-
-          <xsl:attribute name="force-page-count">
-            <xsl:call-template name="force.page.count">
-              <xsl:with-param name="master-reference" 
-	                      select="$master-reference"/>
-            </xsl:call-template>
-          </xsl:attribute>
-
-          <xsl:attribute name="hyphenation-character">
-            <xsl:call-template name="gentext">
-              <xsl:with-param name="key" select="'hyphenation-character'"/>
-            </xsl:call-template>
-          </xsl:attribute>
-          <xsl:attribute name="hyphenation-push-character-count">
-            <xsl:call-template name="gentext">
-              <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-            </xsl:call-template>
-          </xsl:attribute>
-          <xsl:attribute name="hyphenation-remain-character-count">
-            <xsl:call-template name="gentext">
-              <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-            </xsl:call-template>
-          </xsl:attribute>
-
-          <xsl:apply-templates select="." mode="running.head.mode">
-            <xsl:with-param name="master-reference" select="$master-reference"/>
-          </xsl:apply-templates>
-          <xsl:apply-templates select="." mode="running.foot.mode">
-            <xsl:with-param name="master-reference" select="$master-reference"/>
-          </xsl:apply-templates>
-
-          <fo:flow flow-name="xsl-region-body">
-            <xsl:call-template name="set.flow.properties">
-              <xsl:with-param name="element" select="local-name(.)"/>
-              <xsl:with-param name="master-reference" 
-                              select="$master-reference"/>
-            </xsl:call-template>
-
-            <fo:block xsl:use-attribute-sets="toc.margin.properties">
-              <xsl:call-template name="table.of.contents.titlepage"/>
-              <xsl:apply-templates/>
-            </fo:block>
-          </fo:flow>
-        </fo:page-sequence>
-      </xsl:if>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:if test="$process.empty.source.toc != 0">
-        <fo:page-sequence hyphenate="{$hyphenate}"
-                          master-reference="{$master-reference}">
-          <xsl:attribute name="language">
-            <xsl:call-template name="l10n.language"/>
-          </xsl:attribute>
-          <xsl:attribute name="format">
-            <xsl:call-template name="page.number.format">
-              <xsl:with-param name="element" select="'toc'"/>
-              <xsl:with-param name="master-reference" 
-                              select="$master-reference"/>
-            </xsl:call-template>
-          </xsl:attribute>
-
-          <xsl:attribute name="initial-page-number">
-            <xsl:call-template name="initial.page.number">
-              <xsl:with-param name="element" select="'toc'"/>
-              <xsl:with-param name="master-reference" 
-                              select="$master-reference"/>
-            </xsl:call-template>
-          </xsl:attribute>
-
-          <xsl:attribute name="hyphenation-character">
-            <xsl:call-template name="gentext">
-              <xsl:with-param name="key" select="'hyphenation-character'"/>
-            </xsl:call-template>
-          </xsl:attribute>
-          <xsl:attribute name="hyphenation-push-character-count">
-            <xsl:call-template name="gentext">
-              <xsl:with-param name="key" select="'hyphenation-push-character-count'"/>
-            </xsl:call-template>
-          </xsl:attribute>
-          <xsl:attribute name="hyphenation-remain-character-count">
-            <xsl:call-template name="gentext">
-              <xsl:with-param name="key" select="'hyphenation-remain-character-count'"/>
-            </xsl:call-template>
-          </xsl:attribute>
-
-          <xsl:apply-templates select="." mode="running.head.mode">
-            <xsl:with-param name="master-reference" select="$master-reference"/>
-          </xsl:apply-templates>
-          <xsl:apply-templates select="." mode="running.foot.mode">
-            <xsl:with-param name="master-reference" select="$master-reference"/>
-          </xsl:apply-templates>
-
-          <fo:flow flow-name="xsl-region-body">
-            <xsl:choose>
-              <xsl:when test="parent::section
-                              or parent::sect1
-                              or parent::sect2
-                              or parent::sect3
-                              or parent::sect4
-                              or parent::sect5">
-                <xsl:apply-templates select="parent::*"
-                                     mode="toc.for.section"/>
-              </xsl:when>
-              <xsl:when test="parent::article">
-                <xsl:apply-templates select="parent::*"
-                                     mode="toc.for.component"/>
-              </xsl:when>
-              <xsl:when test="parent::book
-                              or parent::part">
-                <xsl:apply-templates select="parent::*"
-                                     mode="toc.for.division"/>
-              </xsl:when>
-              <xsl:when test="parent::set">
-                <xsl:apply-templates select="parent::*"
-                                     mode="toc.for.set"/>
-              </xsl:when>
-              <!-- there aren't any other contexts that allow toc -->
-              <xsl:otherwise>
-                <xsl:message>
-                  <xsl:text>I don't know how to make a TOC in this context!</xsl:text>
-                </xsl:message>
-              </xsl:otherwise>
-            </xsl:choose>
-          </fo:flow>
-        </fo:page-sequence>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="tocpart|tocchap
-                     |toclevel1|toclevel2|toclevel3|toclevel4|toclevel5">
-  <xsl:apply-templates select="tocentry"/>
-  <xsl:if test="tocchap|toclevel1|toclevel2|toclevel3|toclevel4|toclevel5">
-    <fo:block start-indent="{count(ancestor::*)*2}pc">
-      <xsl:apply-templates select="tocchap|toclevel1|toclevel2|toclevel3|toclevel4|toclevel5"/>
-    </fo:block>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="tocentry|tocfront|tocback">
-  <fo:block text-align-last="justify"
-            end-indent="2pc"
-            last-line-end-indent="-2pc">
-    <fo:inline keep-with-next.within-line="always">
-      <xsl:choose>
-        <xsl:when test="@linkend">
-          <fo:basic-link internal-destination="{@linkend}">
-            <xsl:apply-templates/>
-          </fo:basic-link>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </fo:inline>
-
-    <xsl:choose>
-      <xsl:when test="@linkend">
-        <fo:inline keep-together.within-line="always">
-          <xsl:text> </xsl:text>
-          <fo:leader leader-pattern="dots"
-                     keep-with-next.within-line="always"/>
-          <xsl:text> </xsl:text>
-          <fo:basic-link internal-destination="{@linkend}">
-            <xsl:choose>
-              <xsl:when test="@pagenum">
-                <xsl:value-of select="@pagenum"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <fo:page-number-citation ref-id="{@linkend}"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </fo:basic-link>
-        </fo:inline>
-      </xsl:when>
-      <xsl:when test="@pagenum">
-        <fo:inline keep-together.within-line="always">
-          <xsl:text> </xsl:text>
-          <fo:leader leader-pattern="dots"
-                     keep-with-next.within-line="always"/>
-          <xsl:text> </xsl:text>
-          <xsl:value-of select="@pagenum"/>
-        </fo:inline>
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- just the leaders, what else can I do? -->
-        <fo:inline keep-together.within-line="always">
-          <xsl:text> </xsl:text>
-          <fo:leader leader-pattern="space"
-                     keep-with-next.within-line="always"/>
-        </fo:inline>
-      </xsl:otherwise>
-    </xsl:choose>
-  </fo:block>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="toc.for.section">
-<!--
-  <xsl:call-template name="section.toc"/>
--->
-</xsl:template>
-
-<xsl:template match="*" mode="toc.for.component">
-  <xsl:call-template name="component.toc"/>
-</xsl:template>
-
-<xsl:template match="*" mode="toc.for.section">
-<!--
-  <xsl:call-template name="section.toc"/>
--->
-</xsl:template>
-
-<xsl:template match="*" mode="toc.for.division">
-  <xsl:call-template name="division.toc"/>
-</xsl:template>
-
-<xsl:template match="*" mode="toc.for.set">
-<!--
-  <xsl:call-template name="set.toc"/>
--->
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="lot|lotentry">
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/verbatim.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/verbatim.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,417 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:sverb="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Verbatim"
-                xmlns:xverb="com.nwalsh.xalan.Verbatim"
-                xmlns:lxslt="http://xml.apache.org/xslt"
-                xmlns:exsl="http://exslt.org/common"
-                exclude-result-prefixes="sverb xverb lxslt exsl"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:include href="../highlighting/common.xsl"/>
-<xsl:include href="highlight.xsl"/>
-
-<lxslt:component prefix="xverb"
-                 functions="numberLines"/>
-
-<xsl:template match="programlisting|screen|synopsis">
-  <xsl:param name="suppress-numbers" select="'0'"/>
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-
-  <xsl:variable name="content">
-    <xsl:choose>
-      <xsl:when test="$suppress-numbers = '0'
-                      and @linenumbering = 'numbered'
-                      and $use.extensions != '0'
-                      and $linenumbering.extension != '0'">
-        <xsl:call-template name="number.rtf.lines">
-          <xsl:with-param name="rtf">
-	    <xsl:call-template name="apply-highlighting"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-	<xsl:call-template name="apply-highlighting"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$shade.verbatim != 0">
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="monospace.verbatim.properties shade.verbatim.style">
-        <xsl:choose>
-          <xsl:when test="$hyphenate.verbatim != 0 and function-available('exsl:node-set')">
-            <xsl:apply-templates select="exsl:node-set($content)" mode="hyphenate.verbatim"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:copy-of select="$content"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </fo:block>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:block id="{$id}"
-                xsl:use-attribute-sets="monospace.verbatim.properties">
-        <xsl:choose>
-          <xsl:when test="$hyphenate.verbatim != 0 and function-available('exsl:node-set')">
-            <xsl:apply-templates select="exsl:node-set($content)" mode="hyphenate.verbatim"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:copy-of select="$content"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </fo:block>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="literallayout">
-  <xsl:param name="suppress-numbers" select="'0'"/>
-
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-
-  <xsl:variable name="content">
-    <xsl:choose>
-      <xsl:when test="$suppress-numbers = '0'
-                      and @linenumbering = 'numbered'
-                      and $use.extensions != '0'
-                      and $linenumbering.extension != '0'">
-        <xsl:call-template name="number.rtf.lines">
-          <xsl:with-param name="rtf">
-            <xsl:apply-templates/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="@class='monospaced'">
-      <xsl:choose>
-        <xsl:when test="$shade.verbatim != 0">
-          <fo:block id="{$id}"
-                    xsl:use-attribute-sets="monospace.verbatim.properties shade.verbatim.style">
-
-            <xsl:copy-of select="$content"/>
-          </fo:block>
-        </xsl:when>
-        <xsl:otherwise>
-          <fo:block id="{$id}"
-                    xsl:use-attribute-sets="monospace.verbatim.properties">
-            <xsl:copy-of select="$content"/>
-          </fo:block>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$shade.verbatim != 0">
-          <fo:block id="{$id}"
-                    xsl:use-attribute-sets="verbatim.properties shade.verbatim.style">
-            <xsl:copy-of select="$content"/>
-          </fo:block>
-        </xsl:when>
-        <xsl:otherwise>
-          <fo:block id="{$id}"
-                    xsl:use-attribute-sets="verbatim.properties">
-            <xsl:copy-of select="$content"/>
-          </fo:block>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="address">
-  <xsl:param name="suppress-numbers" select="'0'"/>
-
-  <xsl:variable name="content">
-    <xsl:choose>
-      <xsl:when test="$suppress-numbers = '0'
-                      and @linenumbering = 'numbered'
-                      and $use.extensions != '0'
-                      and $linenumbering.extension != '0'">
-        <xsl:call-template name="number.rtf.lines">
-          <xsl:with-param name="rtf">
-            <xsl:apply-templates/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <fo:block xsl:use-attribute-sets="verbatim.properties">
-    <xsl:copy-of select="$content"/>
-  </fo:block>
-</xsl:template>
-
-<xsl:template name="number.rtf.lines">
-  <xsl:param name="rtf" select="''"/>
-  <xsl:param name="pi.context" select="."/>
-
-  <!-- Save the global values -->
-  <xsl:variable name="global.linenumbering.everyNth"
-                select="$linenumbering.everyNth"/>
-
-  <xsl:variable name="global.linenumbering.separator"
-                select="$linenumbering.separator"/>
-
-  <xsl:variable name="global.linenumbering.width"
-                select="$linenumbering.width"/>
-
-  <!-- Extract the <?dbfo linenumbering.*?> PI values -->
-  <xsl:variable name="pi.linenumbering.everyNth">
-    <xsl:call-template name="pi.dbfo_linenumbering.everyNth">
-      <xsl:with-param name="node" select="$pi.context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="pi.linenumbering.separator">
-    <xsl:call-template name="pi.dbfo_linenumbering.separator">
-      <xsl:with-param name="node" select="$pi.context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="pi.linenumbering.width">
-    <xsl:call-template name="pi.dbfo_linenumbering.width">
-      <xsl:with-param name="node" select="$pi.context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <!-- Construct the 'in-context' values -->
-  <xsl:variable name="linenumbering.everyNth">
-    <xsl:choose>
-      <xsl:when test="$pi.linenumbering.everyNth != ''">
-        <xsl:value-of select="$pi.linenumbering.everyNth"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$global.linenumbering.everyNth"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="linenumbering.separator">
-    <xsl:choose>
-      <xsl:when test="$pi.linenumbering.separator != ''">
-        <xsl:value-of select="$pi.linenumbering.separator"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$global.linenumbering.separator"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="linenumbering.width">
-    <xsl:choose>
-      <xsl:when test="$pi.linenumbering.width != ''">
-        <xsl:value-of select="$pi.linenumbering.width"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$global.linenumbering.width"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="linenumbering.startinglinenumber">
-    <xsl:choose>
-      <xsl:when test="$pi.context/@startinglinenumber">
-        <xsl:value-of select="$pi.context/@startinglinenumber"/>
-      </xsl:when>
-      <xsl:when test="$pi.context/@continuation='continues'">
-        <xsl:variable name="lastLine">
-          <xsl:choose>
-            <xsl:when test="$pi.context/self::programlisting">
-              <xsl:call-template name="lastLineNumber">
-                <xsl:with-param name="listings"
-                     select="preceding::programlisting[@linenumbering='numbered']"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$pi.context/self::screen">
-              <xsl:call-template name="lastLineNumber">
-                <xsl:with-param name="listings"
-                     select="preceding::screen[@linenumbering='numbered']"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$pi.context/self::literallayout">
-              <xsl:call-template name="lastLineNumber">
-                <xsl:with-param name="listings"
-                     select="preceding::literallayout[@linenumbering='numbered']"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$pi.context/self::address">
-              <xsl:call-template name="lastLineNumber">
-                <xsl:with-param name="listings"
-                     select="preceding::address[@linenumbering='numbered']"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$pi.context/self::synopsis">
-              <xsl:call-template name="lastLineNumber">
-                <xsl:with-param name="listings"
-                     select="preceding::synopsis[@linenumbering='numbered']"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:message>
-                <xsl:text>Unexpected verbatim environment: </xsl:text>
-                <xsl:value-of select="local-name(.)"/>
-              </xsl:message>
-              <xsl:value-of select="0"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:variable>
-
-        <xsl:value-of select="$lastLine + 1"/>
-      </xsl:when>
-      <xsl:otherwise>1</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="function-available('sverb:numberLines')">
-      <xsl:copy-of select="sverb:numberLines($rtf)"/>
-    </xsl:when>
-    <xsl:when test="function-available('xverb:numberLines')">
-      <xsl:copy-of select="xverb:numberLines($rtf)"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message terminate="yes">
-        <xsl:text>No numberLines function available.</xsl:text>
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ======================================================================== -->
-
-<xsl:template name="lastLineNumber">
-  <xsl:param name="listings"/>
-  <xsl:param name="number" select="0"/>
-
-  <xsl:variable name="lines">
-    <xsl:call-template name="countLines">
-      <xsl:with-param name="listing" select="string($listings[1])"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="not($listings)">
-      <xsl:value-of select="$number"/>
-    </xsl:when>
-    <xsl:when test="$listings[1]/@startinglinenumber">
-      <xsl:value-of select="$number + $listings[1]/@startinglinenumber + $lines - 1"/>
-    </xsl:when>
-    <xsl:when test="$listings[1]/@continuation='continues'">
-      <xsl:call-template name="lastLineNumber">
-        <xsl:with-param name="listings" select="listings[position() &gt; 1]"/>
-        <xsl:with-param name="number" select="$number + $lines"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$lines"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="countLines">
-  <xsl:param name="listing"/>
-  <xsl:param name="count" select="1"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($listing, '&#10;')">
-      <xsl:call-template name="countLines">
-        <xsl:with-param name="listing" select="substring-after($listing, '&#10;')"/>
-        <xsl:with-param name="count" select="$count + 1"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$count"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ======================================================================== -->
-
-<xsl:template match="node()|@*" mode="hyphenate.verbatim">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates mode="hyphenate.verbatim"/>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="text()" mode="hyphenate.verbatim" priority="2">
-  <xsl:call-template name="hyphenate.verbatim.block">
-    <xsl:with-param name="content" select="."/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="hyphenate.verbatim.block">
-  <xsl:param name="content" select="''"/>
-  <xsl:param name="count" select="1"/>
-
-  <!-- recurse on lines first to keep recursion depth reasonable -->
-  <xsl:choose>
-    <xsl:when test="contains($content, '&#xA;')">
-      <xsl:variable name="line" select="substring-before($content, '&#xA;')"/>
-      <xsl:variable name="rest" select="substring-after($content, '&#xA;')"/>
-      <xsl:call-template name="hyphenate.verbatim">
-        <xsl:with-param name="content" select="concat($line, '&#xA;')"/>
-      </xsl:call-template>
-      <xsl:call-template name="hyphenate.verbatim.block">
-        <xsl:with-param name="content" select="$rest"/>
-        <xsl:with-param name="count" select="$count + 1"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="hyphenate.verbatim">
-        <xsl:with-param name="content" select="$content"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-  
-</xsl:template>
-
-<xsl:template name="hyphenate.verbatim">
-  <xsl:param name="content"/>
-  <xsl:variable name="head" select="substring($content, 1, 1)"/>
-  <xsl:variable name="tail" select="substring($content, 2)"/>
-  <xsl:choose>
-    <!-- Place soft-hyphen after space or non-breakable space. -->
-    <xsl:when test="$head = ' ' or $head = '&#160;'">
-      <xsl:text>&#160;</xsl:text>
-      <xsl:text>&#x00AD;</xsl:text>
-    </xsl:when>
-    <xsl:when test="$hyphenate.verbatim.characters != '' and
-                    translate($head, $hyphenate.verbatim.characters, '') = '' and not($tail = '')">
-      <xsl:value-of select="$head"/>
-      <xsl:text>&#x00AD;</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$head"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:if test="$tail">
-    <xsl:call-template name="hyphenate.verbatim">
-      <xsl:with-param name="content" select="$tail"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/xep.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/xep.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,180 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:rx="http://www.renderx.com/XSL/Extensions"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-     (c) Stephane Bline Peregrine Systems 2001
-     Implementation of xep extensions:
-       * Pdf bookmarks (based on the XEP 2.5 implementation)
-       * Document information (XEP 2.5 meta information extensions)
-     ******************************************************************** -->
-
-<!-- FIXME: Norm, I changed things so that the top-level element (book or set)
-     does not appear in the TOC. Is this the right thing? -->
-
-<xsl:template name="xep-document-information">
-  <rx:meta-info>
-    <xsl:variable name="authors" 
-                  select="(//author|//editor|//corpauthor|//authorgroup)[1]"/>
-    <xsl:if test="$authors">
-      <xsl:variable name="author">
-        <xsl:choose>
-          <xsl:when test="$authors[self::authorgroup]">
-            <xsl:call-template name="person.name.list">
-              <xsl:with-param name="person.list" 
-                        select="$authors/*[self::author|self::corpauthor|
-                               self::othercredit|self::editor]"/>
-            </xsl:call-template>
-          </xsl:when>
-          <xsl:when test="$authors[self::corpauthor]">
-            <xsl:value-of select="$authors"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="person.name">
-              <xsl:with-param name="node" select="$authors"/>
-            </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-      <xsl:element name="rx:meta-field">
-        <xsl:attribute name="name">author</xsl:attribute>
-        <xsl:attribute name="value">
-          <xsl:value-of select="normalize-space($author)"/>
-        </xsl:attribute>
-      </xsl:element>
-    </xsl:if>
-
-    <xsl:variable name="title">
-      <xsl:apply-templates select="/*[1]" mode="label.markup"/>
-      <xsl:apply-templates select="/*[1]" mode="title.markup"/>
-    </xsl:variable>
-
-    <xsl:element name="rx:meta-field">
-      <xsl:attribute name="name">creator</xsl:attribute>
-      <xsl:attribute name="value">
-        <xsl:text>DocBook </xsl:text>
-        <xsl:value-of select="$DistroTitle"/>
-        <xsl:text> V</xsl:text>
-        <xsl:value-of select="$VERSION"/>
-      </xsl:attribute>
-    </xsl:element>
-
-    <xsl:element name="rx:meta-field">
-      <xsl:attribute name="name">title</xsl:attribute>
-      <xsl:attribute name="value">
-        <xsl:value-of select="normalize-space($title)"/>
-      </xsl:attribute>
-    </xsl:element>
-
-    <xsl:if test="//keyword">
-      <xsl:element name="rx:meta-field">
-        <xsl:attribute name="name">keywords</xsl:attribute>
-        <xsl:attribute name="value">
-          <xsl:for-each select="//keyword">
-            <xsl:value-of select="normalize-space(.)"/>
-            <xsl:if test="position() != last()">
-              <xsl:text>, </xsl:text>
-            </xsl:if>
-          </xsl:for-each>
-        </xsl:attribute>
-      </xsl:element>
-    </xsl:if>
-
-    <xsl:if test="//subjectterm">
-      <xsl:element name="rx:meta-field">
-        <xsl:attribute name="name">subject</xsl:attribute>
-        <xsl:attribute name="value">
-          <xsl:for-each select="//subjectterm">
-            <xsl:value-of select="normalize-space(.)"/>
-            <xsl:if test="position() != last()">
-              <xsl:text>, </xsl:text>
-            </xsl:if>
-          </xsl:for-each>
-        </xsl:attribute>
-      </xsl:element>
-    </xsl:if>
-  </rx:meta-info>
-</xsl:template>
-
-<!-- ********************************************************************
-     Pdf bookmarks
-     ******************************************************************** -->
-
-<xsl:template match="*" mode="xep.outline">
-  <xsl:apply-templates select="*" mode="xep.outline"/>
-</xsl:template>
-
-<xsl:template match="set|book|part|reference|preface|chapter|appendix|article
-                     |glossary|bibliography|index|setindex
-                     |refentry|refsynopsisdiv
-                     |refsect1|refsect2|refsect3|refsection
-                     |sect1|sect2|sect3|sect4|sect5|section"
-              mode="xep.outline">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  <xsl:variable name="bookmark-label">
-    <xsl:apply-templates select="." mode="object.title.markup"/>
-  </xsl:variable>
-
-  <!-- Put the root element bookmark at the same level as its children -->
-  <!-- If the object is a set or book, generate a bookmark for the toc -->
-
-  <xsl:choose>
-    <xsl:when test="parent::*">
-      <rx:bookmark internal-destination="{$id}">
-        <rx:bookmark-label>
-          <xsl:value-of select="normalize-space($bookmark-label)"/>
-        </rx:bookmark-label>
-        <xsl:apply-templates select="*" mode="xep.outline"/>
-      </rx:bookmark>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:if test="$bookmark-label != ''">
-        <rx:bookmark internal-destination="{$id}">
-          <rx:bookmark-label>
-            <xsl:value-of select="normalize-space($bookmark-label)"/>
-          </rx:bookmark-label>
-        </rx:bookmark>
-      </xsl:if>
-
-      <xsl:variable name="toc.params">
-        <xsl:call-template name="find.path.params">
-          <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:if test="contains($toc.params, 'toc')
-                    and set|book|part|reference|section|sect1|refentry
-                        |article|bibliography|glossary|chapter
-                        |appendix">
-        <rx:bookmark internal-destination="toc...{$id}">
-          <rx:bookmark-label>
-            <xsl:call-template name="gentext">
-              <xsl:with-param name="key" select="'TableofContents'"/>
-            </xsl:call-template>
-          </rx:bookmark-label>
-        </rx:bookmark>
-      </xsl:if>
-      <xsl:apply-templates select="*" mode="xep.outline"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="xep-pis">
-  <xsl:if test="$crop.marks != 0">
-    <xsl:processing-instruction name="xep-pdf-crop-mark-width"><xsl:value-of select="$crop.mark.width"/></xsl:processing-instruction>
-    <xsl:processing-instruction name="xep-pdf-crop-offset"><xsl:value-of select="$crop.mark.offset"/></xsl:processing-instruction>
-    <xsl:processing-instruction name="xep-pdf-bleed"><xsl:value-of select="$crop.mark.bleed"/></xsl:processing-instruction>
-  </xsl:if>
-
-  <xsl:call-template name="user-xep-pis"/>
-</xsl:template>
-
-<!-- Placeholder for user defined PIs -->
-<xsl:template name="user-xep-pis"/>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/xref.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/fo/xref.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,1440 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:exsl="http://exslt.org/common"
-                xmlns:xlink='http://www.w3.org/1999/xlink'
-                exclude-result-prefixes="exsl"
-                version='1.0'>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- Use internal variable for olink xlink role for consistency -->
-<xsl:variable 
-      name="xolink.role">http://docbook.org/xlink/role/olink</xsl:variable>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="anchor">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  <fo:inline id="{$id}"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="xref" name="xref">
-  <xsl:param name="xhref" select="@xlink:href"/>
-  <!-- is the @xlink:href a local idref link? -->
-  <xsl:param name="xlink.idref">
-    <xsl:if test="starts-with($xhref,'#')
-                  and (not(contains($xhref,'&#40;'))
-                  or starts-with($xhref, '#xpointer&#40;id&#40;'))">
-      <xsl:call-template name="xpointer.idref">
-        <xsl:with-param name="xpointer" select="$xhref"/>
-      </xsl:call-template>
-   </xsl:if>
-  </xsl:param>
-  <xsl:param name="xlink.targets" select="key('id',$xlink.idref)"/>
-  <xsl:param name="linkend.targets" select="key('id',@linkend)"/>
-  <xsl:param name="target" select="($xlink.targets | $linkend.targets)[1]"/>
-  <xsl:param name="refelem" select="local-name($target)"/>
-
-  <xsl:variable name="xrefstyle">
-    <xsl:choose>
-      <xsl:when test="@role and not(@xrefstyle) 
-                      and $use.role.as.xrefstyle != 0">
-        <xsl:value-of select="@role"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="@xrefstyle"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="content">
-    <fo:inline xsl:use-attribute-sets="xref.properties">
-      <xsl:choose>
-        <xsl:when test="@endterm">
-          <xsl:variable name="etargets" select="key('id',@endterm)"/>
-          <xsl:variable name="etarget" select="$etargets[1]"/>
-          <xsl:choose>
-            <xsl:when test="count($etarget) = 0">
-              <xsl:message>
-                <xsl:value-of select="count($etargets)"/>
-                <xsl:text>Endterm points to nonexistent ID: </xsl:text>
-                <xsl:value-of select="@endterm"/>
-              </xsl:message>
-              <xsl:text>???</xsl:text>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates select="$etarget" mode="endterm"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-  
-        <xsl:when test="$target/@xreflabel">
-          <xsl:call-template name="xref.xreflabel">
-            <xsl:with-param name="target" select="$target"/>
-          </xsl:call-template>
-        </xsl:when>
-  
-        <xsl:when test="$target">
-          <xsl:if test="not(parent::citation)">
-            <xsl:apply-templates select="$target" mode="xref-to-prefix"/>
-          </xsl:if>
-  
-          <xsl:apply-templates select="$target" mode="xref-to">
-            <xsl:with-param name="referrer" select="."/>
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-          </xsl:apply-templates>
-  
-          <xsl:if test="not(parent::citation)">
-            <xsl:apply-templates select="$target" mode="xref-to-suffix"/>
-          </xsl:if>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>ERROR: xref linking to </xsl:text>
-            <xsl:value-of select="@linkend|@xlink:href"/>
-            <xsl:text> has no generated link text.</xsl:text>
-          </xsl:message>
-          <xsl:text>???</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </fo:inline>
-  </xsl:variable>
-
-  <!-- Convert it into an active link -->
-  <xsl:call-template name="simple.xlink">
-    <xsl:with-param name="content" select="$content"/>
-  </xsl:call-template>
-
-  <!-- Add standard page reference? -->
-  <xsl:choose>
-    <xsl:when test="not($target)">
-      <!-- page numbers only for local targets -->
-    </xsl:when>
-    <xsl:when test="starts-with(normalize-space($xrefstyle), 'select:') 
-                  and contains($xrefstyle, 'nopage')">
-      <!-- negative xrefstyle in instance turns it off -->
-    </xsl:when>
-    <!-- positive xrefstyle already handles it -->
-    <xsl:when test="not(starts-with(normalize-space($xrefstyle), 'select:') 
-                  and (contains($xrefstyle, 'page')
-                       or contains($xrefstyle, 'Page')))
-                  and ( $insert.xref.page.number = 'yes' 
-                     or $insert.xref.page.number = '1')
-                  or local-name($target) = 'para'">
-      <xsl:apply-templates select="$target" mode="page.citation">
-        <xsl:with-param name="id" select="$target/@id|$target/@xml:id"/>
-      </xsl:apply-templates>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- Handled largely like an xref -->
-<!-- To be done: add support for begin, end, and units attributes -->
-<xsl:template match="biblioref" name="biblioref">
-  <xsl:variable name="targets" select="key('id',@linkend)"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-  <xsl:variable name="refelem" select="local-name($target)"/>
-
-  <xsl:call-template name="check.id.unique">
-    <xsl:with-param name="linkend" select="@linkend"/>
-  </xsl:call-template>
-
-  <xsl:choose>
-    <xsl:when test="$refelem=''">
-      <xsl:message>
-        <xsl:text>XRef to nonexistent id: </xsl:text>
-        <xsl:value-of select="@linkend"/>
-      </xsl:message>
-      <xsl:text>???</xsl:text>
-    </xsl:when>
-
-    <xsl:when test="@endterm">
-      <fo:basic-link internal-destination="{@linkend}"
-                     xsl:use-attribute-sets="xref.properties">
-        <xsl:variable name="etargets" select="key('id',@endterm)"/>
-        <xsl:variable name="etarget" select="$etargets[1]"/>
-        <xsl:choose>
-          <xsl:when test="count($etarget) = 0">
-            <xsl:message>
-              <xsl:value-of select="count($etargets)"/>
-              <xsl:text>Endterm points to nonexistent ID: </xsl:text>
-              <xsl:value-of select="@endterm"/>
-            </xsl:message>
-            <xsl:text>???</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates select="$etarget" mode="endterm"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </fo:basic-link>
-    </xsl:when>
-
-    <xsl:when test="$target/@xreflabel">
-      <fo:basic-link internal-destination="{@linkend}"
-                     xsl:use-attribute-sets="xref.properties">
-        <xsl:call-template name="xref.xreflabel">
-          <xsl:with-param name="target" select="$target"/>
-        </xsl:call-template>
-      </fo:basic-link>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:if test="not(parent::citation)">
-        <xsl:apply-templates select="$target" mode="xref-to-prefix"/>
-      </xsl:if>
-
-      <fo:basic-link internal-destination="{@linkend}"
-                     xsl:use-attribute-sets="xref.properties">
-        <xsl:apply-templates select="$target" mode="xref-to">
-          <xsl:with-param name="referrer" select="."/>
-          <xsl:with-param name="xrefstyle">
-            <xsl:choose>
-              <xsl:when test="@role and not(@xrefstyle) and $use.role.as.xrefstyle != 0">
-                <xsl:value-of select="@role"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="@xrefstyle"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
-        </xsl:apply-templates>
-      </fo:basic-link>
-
-      <xsl:if test="not(parent::citation)">
-        <xsl:apply-templates select="$target" mode="xref-to-suffix"/>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="endterm">
-  <!-- Process the children of the endterm element -->
-  <xsl:variable name="endterm">
-    <xsl:apply-templates select="child::node()"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="function-available('exsl:node-set')">
-      <xsl:apply-templates select="exsl:node-set($endterm)" mode="remove-ids"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$endterm"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="remove-ids">
-  <xsl:copy>
-    <xsl:for-each select="@*">
-      <xsl:choose>
-        <xsl:when test="name(.) != 'id'">
-          <xsl:copy/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>removing <xsl:value-of select="name(.)"/></xsl:message>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:for-each>
-    <xsl:apply-templates mode="remove-ids"/>
-  </xsl:copy>
-</xsl:template>
-
-<!--- ==================================================================== -->
-
-<xsl:template match="*" mode="xref-to-prefix"/>
-<xsl:template match="*" mode="xref-to-suffix"/>
-
-<xsl:template match="*" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-
-  <xsl:if test="$verbose != 0">
-    <xsl:message>
-      <xsl:text>Don't know what gentext to create for xref to: "</xsl:text>
-      <xsl:value-of select="name(.)"/>
-      <xsl:text>"</xsl:text>
-    </xsl:message>
-    <xsl:text>???</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="title" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <!-- if you xref to a title, xref to the parent... -->
-  <xsl:choose>
-    <!-- FIXME: how reliable is this? -->
-    <xsl:when test="contains(local-name(parent::*), 'info')">
-      <xsl:apply-templates select="parent::*[2]" mode="xref-to">
-        <xsl:with-param name="referrer" select="$referrer"/>
-        <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-        <xsl:with-param name="verbose" select="$verbose"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="parent::*" mode="xref-to">
-        <xsl:with-param name="referrer" select="$referrer"/>
-        <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-        <xsl:with-param name="verbose" select="$verbose"/>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="abstract|article|authorblurb|bibliodiv|bibliomset
-                     |biblioset|blockquote|calloutlist|caution|colophon
-                     |constraintdef|formalpara|glossdiv|important|indexdiv
-                     |itemizedlist|legalnotice|lot|msg|msgexplan|msgmain
-                     |msgrel|msgset|msgsub|note|orderedlist|partintro
-                     |productionset|qandadiv|refsynopsisdiv|segmentedlist
-                     |set|setindex|sidebar|tip|toc|variablelist|warning"
-              mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <!-- catch-all for things with (possibly optional) titles -->
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="author|editor|othercredit|personname" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:call-template name="person.name"/>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:call-template name="person.name.list"/>
-</xsl:template>
-
-<xsl:template match="figure|example|table|equation" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="procedure" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="task" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="cmdsynopsis" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="(.//command)[1]" mode="xref"/>
-</xsl:template>
-
-<xsl:template match="funcsynopsis" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="(.//function)[1]" mode="xref"/>
-</xsl:template>
-
-<xsl:template match="dedication|preface|chapter|appendix" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="bibliography" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="biblioentry|bibliomixed" mode="xref-to-prefix">
-  <xsl:text>[</xsl:text>
-</xsl:template>
-
-<xsl:template match="biblioentry|bibliomixed" mode="xref-to-suffix">
-  <xsl:text>]</xsl:text>
-</xsl:template>
-
-<xsl:template match="biblioentry|bibliomixed" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <!-- handles both biblioentry and bibliomixed -->
-  <xsl:choose>
-    <xsl:when test="string(.) = ''">
-      <xsl:variable name="bib" select="document($bibliography.collection,.)"/>
-      <xsl:variable name="id" select="(@id|@xml:id)[1]"/>
-      <xsl:variable name="entry" select="$bib/bibliography/
-                                         *[@id=$id or @xml:id=$id][1]"/>
-      <xsl:choose>
-        <xsl:when test="$entry">
-          <xsl:choose>
-            <xsl:when test="$bibliography.numbered != 0">
-              <xsl:number from="bibliography" count="biblioentry|bibliomixed"
-                          level="any" format="1"/>
-            </xsl:when>
-            <xsl:when test="local-name($entry/*[1]) = 'abbrev'">
-              <xsl:apply-templates select="$entry/*[1]"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="(@id|@xml:id)[1]"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>No bibliography entry: </xsl:text>
-            <xsl:value-of select="$id"/>
-            <xsl:text> found in </xsl:text>
-            <xsl:value-of select="$bibliography.collection"/>
-          </xsl:message>
-          <xsl:value-of select="(@id|@xml:id)[1]"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$bibliography.numbered != 0">
-          <xsl:number from="bibliography" count="biblioentry|bibliomixed"
-                      level="any" format="1"/>
-        </xsl:when>
-        <xsl:when test="local-name(*[1]) = 'abbrev'">
-          <xsl:apply-templates select="*[1]"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="(@id|@xml:id)[1]"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="glossary" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="glossentry" mode="xref-to">
-  <xsl:choose>
-    <xsl:when test="$glossentry.show.acronym = 'primary'">
-      <xsl:choose>
-        <xsl:when test="acronym|abbrev">
-          <xsl:apply-templates select="(acronym|abbrev)[1]"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="glossterm[1]" mode="xref-to"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="glossterm[1]" mode="xref-to"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="glossterm" mode="xref-to">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="index" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="listitem" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="section|simplesect
-                     |sect1|sect2|sect3|sect4|sect5
-                     |refsect1|refsect2|refsect3|refsection" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-  <!-- What about "in Chapter X"? -->
-</xsl:template>
-
-<xsl:template match="bridgehead" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-  <!-- What about "in Chapter X"? -->
-</xsl:template>
-
-<xsl:template match="qandaset" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="qandadiv" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="qandaentry" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="question[1]" mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="question|answer" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="part|reference" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="refentry" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:choose>
-    <xsl:when test="refmeta/refentrytitle">
-      <xsl:apply-templates select="refmeta/refentrytitle"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="refnamediv/refname[1]"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:apply-templates select="refmeta/manvolnum"/>
-</xsl:template>
-
-<xsl:template match="refnamediv" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="refname[1]" mode="xref-to">
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="refname" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates mode="xref-to">
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="step" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key" select="'Step'"/>
-  </xsl:call-template>
-  <xsl:text> </xsl:text>
-  <xsl:apply-templates select="." mode="number"/>
-</xsl:template>
-
-<xsl:template match="varlistentry" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="term[1]" mode="xref-to">
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="varlistentry/term" mode="xref-to">
-  <xsl:param name="verbose" select="1"/>
-  <!-- to avoid the comma that will be generated if there are several terms -->
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="co" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="callout-bug"/>
-</xsl:template>
-
-<xsl:template match="area|areaset" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-
-  <xsl:call-template name="callout-bug">
-    <xsl:with-param name="conum">
-      <xsl:apply-templates select="." mode="conumber"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="book" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="para" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose"/>
-
-  <xsl:variable name="context" select="(ancestor::simplesect
-                                       |ancestor::section
-                                       |ancestor::sect1
-                                       |ancestor::sect2
-                                       |ancestor::sect3
-                                       |ancestor::sect4
-                                       |ancestor::sect5
-                                       |ancestor::refsection
-                                       |ancestor::refsect1
-                                       |ancestor::refsect2
-                                       |ancestor::refsect3
-                                       |ancestor::chapter
-                                       |ancestor::appendix
-                                       |ancestor::preface
-                                       |ancestor::partintro
-                                       |ancestor::dedication
-                                       |ancestor::colophon
-                                       |ancestor::bibliography
-                                       |ancestor::index
-                                       |ancestor::glossary
-                                       |ancestor::glossentry
-                                       |ancestor::listitem
-                                       |ancestor::varlistentry)[last()]"/>
-
-  <xsl:apply-templates select="$context" mode="xref-to">
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="link" name="link">
-  <xsl:param name="linkend" select="@linkend"/>
-  <xsl:param name="targets" select="key('id',$linkend)"/>
-  <xsl:param name="target" select="$targets[1]"/>
-
-  <xsl:variable name="xrefstyle">
-    <xsl:choose>
-      <xsl:when test="@role and not(@xrefstyle) 
-                      and $use.role.as.xrefstyle != 0">
-        <xsl:value-of select="@role"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="@xrefstyle"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="content">
-    <fo:inline xsl:use-attribute-sets="xref.properties">
-      <xsl:choose>
-        <xsl:when test="count(child::node()) &gt; 0">
-          <!-- If it has content, use it -->
-          <xsl:apply-templates/>
-        </xsl:when>
-        <!-- look for an endterm -->
-        <xsl:when test="@endterm">
-          <xsl:variable name="etargets" select="key('id',@endterm)"/>
-          <xsl:variable name="etarget" select="$etargets[1]"/>
-          <xsl:choose>
-            <xsl:when test="count($etarget) = 0">
-              <xsl:message>
-                <xsl:value-of select="count($etargets)"/>
-                <xsl:text>Endterm points to nonexistent ID: </xsl:text>
-                <xsl:value-of select="@endterm"/>
-              </xsl:message>
-              <xsl:text>???</xsl:text>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:apply-templates select="$etarget" mode="endterm"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <!-- Use the xlink:href if no other text -->
-        <xsl:when test="@xlink:href">
-          <xsl:value-of select="@xlink:href"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>Link element has no content and no Endterm. </xsl:text>
-            <xsl:text>Nothing to show in the link to </xsl:text>
-            <xsl:value-of select="$target"/>
-          </xsl:message>
-          <xsl:text>???</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </fo:inline>
-  </xsl:variable>
-
-  <xsl:call-template name="simple.xlink">
-    <xsl:with-param name="node" select="."/>
-    <xsl:with-param name="linkend" select="$linkend"/>
-    <xsl:with-param name="content" select="$content"/>
-  </xsl:call-template>
-
-  <!-- Add standard page reference? -->
-  <xsl:choose>
-    <!-- page numbering on link only enabled for @linkend -->
-    <!-- There is no link element in DB5 with xlink:href -->
-    <xsl:when test="not($linkend)">
-    </xsl:when>
-    <!-- negative xrefstyle in instance turns it off -->
-    <xsl:when test="starts-with(normalize-space($xrefstyle), 'select:') 
-                  and contains($xrefstyle, 'nopage')">
-    </xsl:when>
-    <xsl:when test="(starts-with(normalize-space($xrefstyle), 'select:') 
-                  and $insert.link.page.number = 'maybe'  
-                  and (contains($xrefstyle, 'page')
-                       or contains($xrefstyle, 'Page')))
-                  or ( $insert.link.page.number = 'yes' 
-                     or $insert.link.page.number = '1')
-                  or local-name($target) = 'para'">
-      <xsl:apply-templates select="$target" mode="page.citation">
-        <xsl:with-param name="id" select="$linkend"/>
-      </xsl:apply-templates>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="ulink" name="ulink">
-  <xsl:param name="url" select="@url"/>
-
-  <xsl:variable name ="ulink.url">
-    <xsl:call-template name="fo-external-image">
-      <xsl:with-param name="filename" select="$url"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <fo:basic-link xsl:use-attribute-sets="xref.properties"
-                 external-destination="{$ulink.url}">
-    <xsl:choose>
-      <xsl:when test="count(child::node())=0">
-        <xsl:call-template name="hyphenate-url">
-          <xsl:with-param name="url" select="$url"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </fo:basic-link>
-
-  <xsl:if test="count(child::node()) != 0
-                and string(.) != $url
-                and $ulink.show != 0">
-    <!-- yes, show the URI -->
-    <xsl:choose>
-      <xsl:when test="$ulink.footnotes != 0 and not(ancestor::footnote)">
-        <fo:footnote>
-          <xsl:call-template name="ulink.footnote.number"/>
-          <fo:footnote-body xsl:use-attribute-sets="footnote.properties">
-            <fo:block>
-              <xsl:call-template name="ulink.footnote.number"/>
-              <xsl:text> </xsl:text>
-              <fo:basic-link external-destination="{$ulink.url}">
-                <xsl:value-of select="$url"/>
-              </fo:basic-link>
-            </fo:block>
-          </fo:footnote-body>
-        </fo:footnote>
-      </xsl:when>
-      <xsl:otherwise>
-        <fo:inline hyphenate="false">
-          <xsl:text> [</xsl:text>
-          <fo:basic-link external-destination="{$ulink.url}">
-            <xsl:call-template name="hyphenate-url">
-              <xsl:with-param name="url" select="$url"/>
-            </xsl:call-template>
-          </fo:basic-link>
-          <xsl:text>]</xsl:text>
-        </fo:inline>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:if>
-
-</xsl:template>
-
-<xsl:template name="ulink.footnote.number">
-  <fo:inline xsl:use-attribute-sets="footnote.mark.properties">
-    <xsl:choose>
-      <xsl:when test="$fop.extensions != 0">
-        <xsl:attribute name="vertical-align">super</xsl:attribute>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute name="baseline-shift">super</xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:variable name="fnum">
-      <!-- FIXME: list in @from is probably not complete -->
-      <xsl:number level="any" 
-                  from="chapter|appendix|preface|article|refentry|bibliography[not(parent::article)]" 
-                  count="footnote[not(@label)][not(ancestor::tgroup)]|ulink[node()][@url != .][not(ancestor::footnote)]" 
-                  format="1"/>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="string-length($footnote.number.symbols) &gt;= $fnum">
-        <xsl:value-of select="substring($footnote.number.symbols, $fnum, 1)"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:number value="$fnum" format="{$footnote.number.format}"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </fo:inline>
-</xsl:template>
-
-<xsl:template name="hyphenate-url">
-  <xsl:param name="url" select="''"/>
-  <xsl:choose>
-    <xsl:when test="$ulink.hyphenate = ''">
-      <xsl:value-of select="$url"/>
-    </xsl:when>
-    <xsl:when test="string-length($url) &gt; 1">
-      <xsl:variable name="char" select="substring($url, 1, 1)"/>
-      <xsl:value-of select="$char"/>
-      <xsl:if test="contains($ulink.hyphenate.chars, $char)">
-        <!-- Do not hyphen in-between // -->
-        <xsl:if test="not($char = '/' and substring($url,2,1) = '/')">
-          <xsl:copy-of select="$ulink.hyphenate"/>
-        </xsl:if>
-      </xsl:if>
-      <!-- recurse to the next character -->
-      <xsl:call-template name="hyphenate-url">
-        <xsl:with-param name="url" select="substring($url, 2)"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$url"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="olink" name="olink">
-  <!-- olink content may be passed in from xlink olink -->
-  <xsl:param name="content" select="NOTANELEMENT"/>
-
-  <xsl:call-template name="anchor"/>
-
-  <xsl:variable name="localinfo" select="@localinfo"/>
-
-  <xsl:choose>
-    <!-- olinks resolved by stylesheet and target database -->
-    <xsl:when test="@targetdoc or @targetptr or
-                    (@xlink:role=$xolink.role and
-                     contains(@xlink:href, '#') )" >
-
-      <xsl:variable name="targetdoc.att">
-        <xsl:choose>
-          <xsl:when test="@targetdoc != ''">
-            <xsl:value-of select="@targetdoc"/>
-          </xsl:when>
-          <xsl:when test="@xlink:role=$xolink.role and
-                       contains(@xlink:href, '#')" >
-            <xsl:value-of select="substring-before(@xlink:href, '#')"/>
-          </xsl:when>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="targetptr.att">
-        <xsl:choose>
-          <xsl:when test="@targetptr != ''">
-            <xsl:value-of select="@targetptr"/>
-          </xsl:when>
-          <xsl:when test="@xlink:role=$xolink.role and
-                       contains(@xlink:href, '#')" >
-            <xsl:value-of select="substring-after(@xlink:href, '#')"/>
-          </xsl:when>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="olink.lang">
-        <xsl:call-template name="l10n.language">
-          <xsl:with-param name="xref-context" select="true()"/>
-        </xsl:call-template>
-      </xsl:variable>
-    
-      <xsl:variable name="target.database.filename">
-        <xsl:call-template name="select.target.database">
-          <xsl:with-param name="targetdoc.att" select="$targetdoc.att"/>
-          <xsl:with-param name="targetptr.att" select="$targetptr.att"/>
-          <xsl:with-param name="olink.lang" select="$olink.lang"/>
-        </xsl:call-template>
-      </xsl:variable>
-    
-      <xsl:variable name="target.database" 
-          select="document($target.database.filename, /)"/>
-    
-      <xsl:if test="$olink.debug != 0">
-        <xsl:message>
-          <xsl:text>Olink debug: root element of target.database is '</xsl:text>
-          <xsl:value-of select="local-name($target.database/*[1])"/>
-          <xsl:text>'.</xsl:text>
-        </xsl:message>
-      </xsl:if>
-    
-      <xsl:variable name="olink.key">
-        <xsl:call-template name="select.olink.key">
-          <xsl:with-param name="targetdoc.att" select="$targetdoc.att"/>
-          <xsl:with-param name="targetptr.att" select="$targetptr.att"/>
-          <xsl:with-param name="olink.lang" select="$olink.lang"/>
-          <xsl:with-param name="target.database" select="$target.database"/>
-        </xsl:call-template>
-      </xsl:variable>
-    
-      <xsl:if test="string-length($olink.key) = 0">
-        <xsl:message>
-          <xsl:text>Error: unresolved olink: </xsl:text>
-          <xsl:text>targetdoc/targetptr = '</xsl:text>
-          <xsl:value-of select="$targetdoc.att"/>
-          <xsl:text>/</xsl:text>
-          <xsl:value-of select="$targetptr.att"/>
-          <xsl:text>'.</xsl:text>
-        </xsl:message>
-      </xsl:if>
-
-      <xsl:variable name="href">
-        <xsl:call-template name="make.olink.href">
-          <xsl:with-param name="olink.key" select="$olink.key"/>
-          <xsl:with-param name="target.database" select="$target.database"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <!-- Olink that points to internal id can be a link -->
-      <xsl:variable name="linkend">
-        <xsl:call-template name="olink.as.linkend">
-          <xsl:with-param name="olink.key" select="$olink.key"/>
-          <xsl:with-param name="olink.lang" select="$olink.lang"/>
-          <xsl:with-param name="target.database" select="$target.database"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="hottext">
-        <xsl:choose>
-          <xsl:when test="$content">
-            <xsl:copy-of select="$content"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="olink.hottext">
-              <xsl:with-param name="olink.key" select="$olink.key"/>
-              <xsl:with-param name="olink.lang" select="$olink.lang"/>
-              <xsl:with-param name="target.database" select="$target.database"/>
-            </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="olink.docname.citation">
-        <xsl:call-template name="olink.document.citation">
-          <xsl:with-param name="olink.key" select="$olink.key"/>
-          <xsl:with-param name="target.database" select="$target.database"/>
-          <xsl:with-param name="olink.lang" select="$olink.lang"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="olink.page.citation">
-        <xsl:call-template name="olink.page.citation">
-          <xsl:with-param name="olink.key" select="$olink.key"/>
-          <xsl:with-param name="target.database" select="$target.database"/>
-          <xsl:with-param name="olink.lang" select="$olink.lang"/>
-          <xsl:with-param name="linkend" select="$linkend"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="$linkend != ''">
-          <fo:basic-link internal-destination="{$linkend}"
-                       xsl:use-attribute-sets="xref.properties">
-            <xsl:copy-of select="$hottext"/>
-            <xsl:copy-of select="$olink.page.citation"/>
-          </fo:basic-link>
-        </xsl:when>
-        <xsl:when test="$href != ''">
-          <xsl:choose>
-            <xsl:when test="$xep.extensions != 0">
-              <fo:basic-link external-destination="url({$href})"
-                             xsl:use-attribute-sets="olink.properties">
-                <xsl:copy-of select="$hottext"/>
-              </fo:basic-link>
-              <xsl:copy-of select="$olink.page.citation"/>
-              <xsl:copy-of select="$olink.docname.citation"/>
-            </xsl:when>
-            <xsl:when test="$axf.extensions != 0">
-              <fo:basic-link external-destination="{$href}"
-                             xsl:use-attribute-sets="olink.properties">
-                <xsl:copy-of select="$hottext"/>
-              </fo:basic-link>
-              <xsl:copy-of select="$olink.page.citation"/>
-              <xsl:copy-of select="$olink.docname.citation"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <fo:basic-link external-destination="{$href}"
-                             xsl:use-attribute-sets="olink.properties">
-                <xsl:copy-of select="$hottext"/>
-              </fo:basic-link>
-              <xsl:copy-of select="$olink.page.citation"/>
-              <xsl:copy-of select="$olink.docname.citation"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:copy-of select="$hottext"/>
-          <xsl:copy-of select="$olink.page.citation"/>
-          <xsl:copy-of select="$olink.docname.citation"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <!-- olink never implemented in FO for old olink entity syntax -->
-    <xsl:otherwise>
-      <xsl:apply-templates/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="insert.olink.docname.markup">
-  <xsl:param name="docname" select="''"/>
-  
-  <fo:inline font-style="italic">
-    <xsl:value-of select="$docname"/>
-  </fo:inline>
-
-</xsl:template>
-
-<!-- This prevents error message when processing olinks with xrefstyle -->
-<xsl:template match="olink" mode="object.xref.template"/>
-
-
-<xsl:template name="olink.as.linkend">
-  <xsl:param name="olink.key" select="''"/>
-  <xsl:param name="olink.lang" select="''"/>
-  <xsl:param name="target.database" select="NotANode"/>
-
-  <xsl:variable name="targetdoc">
-    <xsl:value-of select="substring-before($olink.key, '/')"/>
-  </xsl:variable>
-
-  <xsl:variable name="targetptr">
-    <xsl:value-of 
-       select="substring-before(substring-after($olink.key, '/'), '/')"/>
-  </xsl:variable>
-
-  <xsl:variable name="target.lang">
-    <xsl:variable name="candidate">
-      <xsl:for-each select="$target.database" >
-        <xsl:value-of 
-                  select="key('targetptr-key', $olink.key)/@lang" />
-      </xsl:for-each>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="$candidate != ''">
-        <xsl:value-of select="$candidate"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$olink.lang"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:if test="$current.docid = $targetdoc and 
-                $olink.lang = $target.lang">
-    <xsl:variable name="targets" select="key('id',$targetptr)"/>
-    <xsl:variable name="target" select="$targets[1]"/>
-    <xsl:if test="$target">
-      <xsl:value-of select="$targetptr"/>
-    </xsl:if>
-  </xsl:if>
-
-</xsl:template>
-
-
-<xsl:template name="olink.outline">
-  <xsl:param name="outline.base.uri"/>
-  <xsl:param name="localinfo"/>
-  <xsl:param name="return" select="href"/>
-
-  <xsl:message terminate="yes">Fatal error: olink.outline template: what is this supposed to do?</xsl:message>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="title.xref">
-  <xsl:param name="target" select="."/>
-  <xsl:choose>
-    <xsl:when test="local-name($target) = 'figure'
-                    or local-name($target) = 'example'
-                    or local-name($target) = 'equation'
-                    or local-name($target) = 'table'
-                    or local-name($target) = 'dedication'
-                    or local-name($target) = 'preface'
-                    or local-name($target) = 'bibliography'
-                    or local-name($target) = 'glossary'
-                    or local-name($target) = 'index'
-                    or local-name($target) = 'setindex'
-                    or local-name($target) = 'colophon'">
-      <xsl:call-template name="gentext.startquote"/>
-      <xsl:apply-templates select="$target" mode="title.markup"/>
-      <xsl:call-template name="gentext.endquote"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <fo:inline font-style="italic">
-        <xsl:apply-templates select="$target" mode="title.markup"/>
-      </fo:inline>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="number.xref">
-  <xsl:param name="target" select="."/>
-  <xsl:apply-templates select="$target" mode="label.markup"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="xref.xreflabel">
-  <!-- called to process an xreflabel...you might use this to make  -->
-  <!-- xreflabels come out in the right font for different targets, -->
-  <!-- for example. -->
-  <xsl:param name="target" select="."/>
-  <xsl:value-of select="$target/@xreflabel"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="title" mode="xref">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="command" mode="xref">
-  <xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="function" mode="xref">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="*" mode="page.citation">
-  <xsl:param name="id" select="'???'"/>
-
-  <fo:basic-link internal-destination="{$id}"
-                 xsl:use-attribute-sets="xref.properties">
-    <fo:inline keep-together.within-line="always">
-      <xsl:call-template name="substitute-markup">
-        <xsl:with-param name="template">
-          <xsl:call-template name="gentext.template">
-            <xsl:with-param name="name" select="'page.citation'"/>
-            <xsl:with-param name="context" select="'xref'"/>
-          </xsl:call-template>
-        </xsl:with-param>
-      </xsl:call-template>
-    </fo:inline>
-  </fo:basic-link>
-</xsl:template>
-
-<xsl:template match="*" mode="pagenumber.markup">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  <fo:page-number-citation ref-id="{$id}"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="insert.title.markup">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="title"/>
-
-  <xsl:choose>
-    <!-- FIXME: what about the case where titleabbrev is inside the info? -->
-    <xsl:when test="$purpose = 'xref' and titleabbrev">
-      <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$title"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="chapter|appendix" mode="insert.title.markup">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="title"/>
-
-  <xsl:choose>
-    <xsl:when test="$purpose = 'xref'">
-      <fo:inline font-style="italic">
-        <xsl:copy-of select="$title"/>
-      </fo:inline>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$title"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="insert.subtitle.markup">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="subtitle"/>
-
-  <xsl:copy-of select="$subtitle"/>
-</xsl:template>
-
-<xsl:template match="*" mode="insert.label.markup">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="label"/>
-
-  <xsl:copy-of select="$label"/>
-</xsl:template>
-
-<xsl:template match="*" mode="insert.pagenumber.markup">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="pagenumber"/>
-
-  <xsl:copy-of select="$pagenumber"/>
-</xsl:template>
-
-<xsl:template match="*" mode="insert.direction.markup">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="direction"/>
-
-  <xsl:copy-of select="$direction"/>
-</xsl:template>
-
-<xsl:template match="olink" mode="pagenumber.markup">
-  <!-- Local olinks can use page-citation -->
-  <xsl:variable name="targetdoc.att" select="@targetdoc"/>
-  <xsl:variable name="targetptr.att" select="@targetptr"/>
-
-  <xsl:variable name="olink.lang">
-    <xsl:call-template name="l10n.language">
-      <xsl:with-param name="xref-context" select="true()"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="target.database.filename">
-    <xsl:call-template name="select.target.database">
-      <xsl:with-param name="targetdoc.att" select="$targetdoc.att"/>
-      <xsl:with-param name="targetptr.att" select="$targetptr.att"/>
-      <xsl:with-param name="olink.lang" select="$olink.lang"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="target.database" 
-      select="document($target.database.filename, /)"/>
-
-  <xsl:if test="$olink.debug != 0">
-    <xsl:message>
-      <xsl:text>Olink debug: root element of target.database is '</xsl:text>
-      <xsl:value-of select="local-name($target.database/*[1])"/>
-      <xsl:text>'.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:variable name="olink.key">
-    <xsl:call-template name="select.olink.key">
-      <xsl:with-param name="targetdoc.att" select="$targetdoc.att"/>
-      <xsl:with-param name="targetptr.att" select="$targetptr.att"/>
-      <xsl:with-param name="olink.lang" select="$olink.lang"/>
-      <xsl:with-param name="target.database" select="$target.database"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <!-- Olink that points to internal id can be a link -->
-  <xsl:variable name="linkend">
-    <xsl:call-template name="olink.as.linkend">
-      <xsl:with-param name="olink.key" select="$olink.key"/>
-      <xsl:with-param name="olink.lang" select="$olink.lang"/>
-      <xsl:with-param name="target.database" select="$target.database"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$linkend != ''">
-      <fo:page-number-citation ref-id="{$linkend}"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message>
-        <xsl:text>Olink error: no page number linkend for local olink '</xsl:text>
-        <xsl:value-of select="$olink.key"/>
-        <xsl:text>'</xsl:text>
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/highlighting/common.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/highlighting/common.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,16 +1,0 @@
-<?xml version='1.0'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version='1.0'>
-
-<!-- ********************************************************************
-
-     Fake file to keep happy ../{fo,xhtml}/verbatim.xsl
-
-     ******************************************************************** -->
-
-  <xsl:template name="apply-highlighting">
-    <xsl:apply-templates/>
-  </xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/html/chunker.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/html/chunker.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,439 +1,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:saxon="http://icl.com/saxon"
-                xmlns:lxslt="http://xml.apache.org/xslt"
-                xmlns:redirect="http://xml.apache.org/xalan/redirect"
-                xmlns:exsl="http://exslt.org/common"
-                xmlns:doc="http://nwalsh.com/xsl/documentation/1.0"
-		version="1.0"
-                exclude-result-prefixes="doc"
-                extension-element-prefixes="saxon redirect lxslt exsl">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!-- This stylesheet works with XSLT implementations that support -->
-<!-- exsl:document, saxon:output, or Xalan's redirect:write -->
-<!-- Note: Only Saxon 6.4.2 or later is supported. -->
-
-<xsl:param name="chunker.output.method" select="'html'"/>
-<xsl:param name="chunker.output.encoding" select="'ISO-8859-1'"/>
-<xsl:param name="chunker.output.indent" select="'no'"/>
-<xsl:param name="chunker.output.omit-xml-declaration" select="'no'"/>
-<xsl:param name="chunker.output.standalone" select="'no'"/>
-<xsl:param name="chunker.output.doctype-public" select="''"/>
-<xsl:param name="chunker.output.doctype-system" select="''"/>
-<xsl:param name="chunker.output.media-type" select="''"/>
-<xsl:param name="chunker.output.cdata-section-elements" select="''"/>
-<xsl:param name="chunker.output.quiet" select="0"/>
-
-<xsl:param name="saxon.character.representation" select="'entity;decimal'"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="make-relative-filename">
-  <xsl:param name="base.dir" select="'./'"/>
-  <xsl:param name="base.name" select="''"/>
-
-  <xsl:choose>
-    <!-- put Saxon first to work around a bug in libxslt -->
-    <xsl:when test="element-available('saxon:output')">
-      <!-- Saxon doesn't make the chunks relative -->
-      <xsl:value-of select="concat($base.dir,$base.name)"/>
-    </xsl:when>
-    <xsl:when test="element-available('exsl:document')">
-      <!-- EXSL document does make the chunks relative, I think -->
-      <xsl:choose>
-        <xsl:when test="count(parent::*) = 0">
-          <xsl:value-of select="concat($base.dir,$base.name)"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$base.name"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="element-available('redirect:write')">
-      <!-- Xalan doesn't make the chunks relative -->
-      <xsl:value-of select="concat($base.dir,$base.name)"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message terminate="yes">
-        <xsl:text>Don't know how to chunk with </xsl:text>
-        <xsl:value-of select="system-property('xsl:vendor')"/>
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="write.chunk">
-  <xsl:param name="filename" select="''"/>
-  <xsl:param name="quiet" select="$chunker.output.quiet"/>
-  <xsl:param name="suppress-context-node-name" select="0"/>
-  <xsl:param name="message-prolog"/>
-  <xsl:param name="message-epilog"/>
-
-  <xsl:param name="method" select="$chunker.output.method"/>
-  <xsl:param name="encoding" select="$chunker.output.encoding"/>
-  <xsl:param name="indent" select="$chunker.output.indent"/>
-  <xsl:param name="omit-xml-declaration"
-             select="$chunker.output.omit-xml-declaration"/>
-  <xsl:param name="standalone" select="$chunker.output.standalone"/>
-  <xsl:param name="doctype-public" select="$chunker.output.doctype-public"/>
-  <xsl:param name="doctype-system" select="$chunker.output.doctype-system"/>
-  <xsl:param name="media-type" select="$chunker.output.media-type"/>
-  <xsl:param name="cdata-section-elements"
-             select="$chunker.output.cdata-section-elements"/>
-
-  <xsl:param name="content"/>
-
-  <xsl:if test="$quiet = 0">
-    <xsl:message>
-      <xsl:if test="not($message-prolog = '')">
-        <xsl:value-of select="$message-prolog"/>
-      </xsl:if>
-      <xsl:text>Writing </xsl:text>
-      <xsl:value-of select="$filename"/>
-      <xsl:if test="name(.) != '' and $suppress-context-node-name = 0">
-        <xsl:text> for </xsl:text>
-        <xsl:value-of select="name(.)"/>
-        <xsl:if test="@id or @xml:id">
-          <xsl:text>(</xsl:text>
-          <xsl:value-of select="(@id|@xml:id)[1]"/>
-          <xsl:text>)</xsl:text>
-        </xsl:if>
-      </xsl:if>
-      <xsl:if test="not($message-epilog = '')">
-        <xsl:value-of select="$message-epilog"/>
-      </xsl:if>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:choose>
-    <xsl:when test="element-available('exsl:document')">
-      <xsl:choose>
-        <!-- Handle the permutations ... -->
-        <xsl:when test="$media-type != ''">
-          <xsl:choose>
-            <xsl:when test="$doctype-public != '' and $doctype-system != ''">
-              <exsl:document href="{$filename}"
-                             method="{$method}"
-                             encoding="{$encoding}"
-                             indent="{$indent}"
-                             omit-xml-declaration="{$omit-xml-declaration}"
-                             cdata-section-elements="{$cdata-section-elements}"
-                             media-type="{$media-type}"
-                             doctype-public="{$doctype-public}"
-                             doctype-system="{$doctype-system}"
-                             standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:when>
-            <xsl:when test="$doctype-public != '' and $doctype-system = ''">
-              <exsl:document href="{$filename}"
-                             method="{$method}"
-                             encoding="{$encoding}"
-                             indent="{$indent}"
-                             omit-xml-declaration="{$omit-xml-declaration}"
-                             cdata-section-elements="{$cdata-section-elements}"
-                             media-type="{$media-type}"
-                             doctype-public="{$doctype-public}"
-                             standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:when>
-            <xsl:when test="$doctype-public = '' and $doctype-system != ''">
-              <exsl:document href="{$filename}"
-                             method="{$method}"
-                             encoding="{$encoding}"
-                             indent="{$indent}"
-                             omit-xml-declaration="{$omit-xml-declaration}"
-                             cdata-section-elements="{$cdata-section-elements}"
-                             media-type="{$media-type}"
-                             doctype-system="{$doctype-system}"
-                             standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:when>
-            <xsl:otherwise><!-- $doctype-public = '' and $doctype-system = ''"> -->
-              <exsl:document href="{$filename}"
-                             method="{$method}"
-                             encoding="{$encoding}"
-                             indent="{$indent}"
-                             omit-xml-declaration="{$omit-xml-declaration}"
-                             cdata-section-elements="{$cdata-section-elements}"
-                             media-type="{$media-type}"
-                             standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:choose>
-            <xsl:when test="$doctype-public != '' and $doctype-system != ''">
-              <exsl:document href="{$filename}"
-                             method="{$method}"
-                             encoding="{$encoding}"
-                             indent="{$indent}"
-                             omit-xml-declaration="{$omit-xml-declaration}"
-                             cdata-section-elements="{$cdata-section-elements}"
-                             doctype-public="{$doctype-public}"
-                             doctype-system="{$doctype-system}"
-                             standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:when>
-            <xsl:when test="$doctype-public != '' and $doctype-system = ''">
-              <exsl:document href="{$filename}"
-                             method="{$method}"
-                             encoding="{$encoding}"
-                             indent="{$indent}"
-                             omit-xml-declaration="{$omit-xml-declaration}"
-                             cdata-section-elements="{$cdata-section-elements}"
-                             doctype-public="{$doctype-public}"
-                             standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:when>
-            <xsl:when test="$doctype-public = '' and $doctype-system != ''">
-              <exsl:document href="{$filename}"
-                             method="{$method}"
-                             encoding="{$encoding}"
-                             indent="{$indent}"
-                             omit-xml-declaration="{$omit-xml-declaration}"
-                             cdata-section-elements="{$cdata-section-elements}"
-                             doctype-system="{$doctype-system}"
-                             standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:when>
-            <xsl:otherwise><!-- $doctype-public = '' and $doctype-system = ''"> -->
-              <exsl:document href="{$filename}"
-                             method="{$method}"
-                             encoding="{$encoding}"
-                             indent="{$indent}"
-                             omit-xml-declaration="{$omit-xml-declaration}"
-                             cdata-section-elements="{$cdata-section-elements}"
-                             standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:when test="element-available('saxon:output')">
-      <xsl:choose>
-        <!-- Handle the permutations ... -->
-        <xsl:when test="$media-type != ''">
-          <xsl:choose>
-            <xsl:when test="$doctype-public != '' and $doctype-system != ''">
-              <saxon:output saxon:character-representation="{$saxon.character.representation}"
-                            href="{$filename}"
-                            method="{$method}"
-                            encoding="{$encoding}"
-                            indent="{$indent}"
-                            omit-xml-declaration="{$omit-xml-declaration}"
-                            cdata-section-elements="{$cdata-section-elements}"
-                            media-type="{$media-type}"
-                            doctype-public="{$doctype-public}"
-                            doctype-system="{$doctype-system}"
-                            standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:when>
-            <xsl:when test="$doctype-public != '' and $doctype-system = ''">
-              <saxon:output saxon:character-representation="{$saxon.character.representation}"
-                            href="{$filename}"
-                            method="{$method}"
-                            encoding="{$encoding}"
-                            indent="{$indent}"
-                            omit-xml-declaration="{$omit-xml-declaration}"
-                            cdata-section-elements="{$cdata-section-elements}"
-                            media-type="{$media-type}"
-                            doctype-public="{$doctype-public}"
-                            standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:when>
-            <xsl:when test="$doctype-public = '' and $doctype-system != ''">
-              <saxon:output saxon:character-representation="{$saxon.character.representation}"
-                            href="{$filename}"
-                            method="{$method}"
-                            encoding="{$encoding}"
-                            indent="{$indent}"
-                            omit-xml-declaration="{$omit-xml-declaration}"
-                            cdata-section-elements="{$cdata-section-elements}"
-                            media-type="{$media-type}"
-                            doctype-system="{$doctype-system}"
-                            standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:when>
-            <xsl:otherwise><!-- $doctype-public = '' and $doctype-system = ''"> -->
-              <saxon:output saxon:character-representation="{$saxon.character.representation}"
-                            href="{$filename}"
-                            method="{$method}"
-                            encoding="{$encoding}"
-                            indent="{$indent}"
-                            omit-xml-declaration="{$omit-xml-declaration}"
-                            cdata-section-elements="{$cdata-section-elements}"
-                            media-type="{$media-type}"
-                            standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:choose>
-            <xsl:when test="$doctype-public != '' and $doctype-system != ''">
-              <saxon:output saxon:character-representation="{$saxon.character.representation}"
-                            href="{$filename}"
-                            method="{$method}"
-                            encoding="{$encoding}"
-                            indent="{$indent}"
-                            omit-xml-declaration="{$omit-xml-declaration}"
-                            cdata-section-elements="{$cdata-section-elements}"
-                            doctype-public="{$doctype-public}"
-                            doctype-system="{$doctype-system}"
-                            standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:when>
-            <xsl:when test="$doctype-public != '' and $doctype-system = ''">
-              <saxon:output saxon:character-representation="{$saxon.character.representation}"
-                            href="{$filename}"
-                            method="{$method}"
-                            encoding="{$encoding}"
-                            indent="{$indent}"
-                            omit-xml-declaration="{$omit-xml-declaration}"
-                            cdata-section-elements="{$cdata-section-elements}"
-                            doctype-public="{$doctype-public}"
-                            standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:when>
-            <xsl:when test="$doctype-public = '' and $doctype-system != ''">
-              <saxon:output saxon:character-representation="{$saxon.character.representation}"
-                            href="{$filename}"
-                            method="{$method}"
-                            encoding="{$encoding}"
-                            indent="{$indent}"
-                            omit-xml-declaration="{$omit-xml-declaration}"
-                            cdata-section-elements="{$cdata-section-elements}"
-                            doctype-system="{$doctype-system}"
-                            standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:when>
-            <xsl:otherwise><!-- $doctype-public = '' and $doctype-system = ''"> -->
-              <saxon:output saxon:character-representation="{$saxon.character.representation}"
-                            href="{$filename}"
-                            method="{$method}"
-                            encoding="{$encoding}"
-                            indent="{$indent}"
-                            omit-xml-declaration="{$omit-xml-declaration}"
-                            cdata-section-elements="{$cdata-section-elements}"
-                            standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:when test="element-available('redirect:write')">
-      <!-- Xalan uses redirect -->
-      <redirect:write file="{$filename}">
-        <xsl:copy-of select="$content"/>
-      </redirect:write>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <!-- it doesn't matter since we won't be making chunks... -->
-      <xsl:message terminate="yes">
-        <xsl:text>Can't make chunks with </xsl:text>
-        <xsl:value-of select="system-property('xsl:vendor')"/>
-        <xsl:text>'s processor.</xsl:text>
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="write.chunk.with.doctype">
-  <xsl:param name="filename" select="''"/>
-  <xsl:param name="quiet" select="$chunker.output.quiet"/>
-
-  <xsl:param name="method" select="$chunker.output.method"/>
-  <xsl:param name="encoding" select="$chunker.output.encoding"/>
-  <xsl:param name="indent" select="$chunker.output.indent"/>
-  <xsl:param name="omit-xml-declaration"
-             select="$chunker.output.omit-xml-declaration"/>
-  <xsl:param name="standalone" select="$chunker.output.standalone"/>
-  <xsl:param name="doctype-public" select="$chunker.output.doctype-public"/>
-  <xsl:param name="doctype-system" select="$chunker.output.doctype-system"/>
-  <xsl:param name="media-type" select="$chunker.output.media-type"/>
-  <xsl:param name="cdata-section-elements"
-             select="$chunker.output.cdata-section-elements"/>
-
-  <xsl:param name="content"/>
-
-  <xsl:call-template name="write.chunk">
-    <xsl:with-param name="filename" select="$filename"/>
-    <xsl:with-param name="quiet" select="$quiet"/>
-    <xsl:with-param name="method" select="$method"/>
-    <xsl:with-param name="encoding" select="$encoding"/>
-    <xsl:with-param name="indent" select="$indent"/>
-    <xsl:with-param name="omit-xml-declaration" select="$omit-xml-declaration"/>
-    <xsl:with-param name="standalone" select="$standalone"/>
-    <xsl:with-param name="doctype-public" select="$doctype-public"/>
-    <xsl:with-param name="doctype-system" select="$doctype-system"/>
-    <xsl:with-param name="media-type" select="$media-type"/>
-    <xsl:with-param name="cdata-section-elements" select="$cdata-section-elements"/>
-    <xsl:with-param name="content" select="$content"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="write.text.chunk">
-  <xsl:param name="filename" select="''"/>
-  <xsl:param name="quiet" select="$chunker.output.quiet"/>
-  <xsl:param name="suppress-context-node-name" select="0"/>
-  <xsl:param name="message-prolog"/>
-  <xsl:param name="message-epilog"/>
-  <xsl:param name="method" select="'text'"/>
-  <xsl:param name="encoding" select="$chunker.output.encoding"/>
-  <xsl:param name="media-type" select="$chunker.output.media-type"/>
-  <xsl:param name="content"/>
-
-  <xsl:call-template name="write.chunk">
-    <xsl:with-param name="filename" select="$filename"/>
-    <xsl:with-param name="quiet" select="$quiet"/>
-    <xsl:with-param name="suppress-context-node-name" select="$suppress-context-node-name"/>
-    <xsl:with-param name="message-prolog" select="$message-prolog"/>
-    <xsl:with-param name="message-epilog" select="$message-epilog"/>
-    <xsl:with-param name="method" select="$method"/>
-    <xsl:with-param name="encoding" select="$encoding"/>
-    <xsl:with-param name="indent" select="'no'"/>
-    <xsl:with-param name="omit-xml-declaration" select="'no'"/>
-    <xsl:with-param name="standalone" select="'no'"/>
-    <xsl:with-param name="doctype-public"/>
-    <xsl:with-param name="doctype-system"/>
-    <xsl:with-param name="media-type" select="$media-type"/>
-    <xsl:with-param name="cdata-section-elements"/>
-    <xsl:with-param name="content" select="$content"/>
-  </xsl:call-template>
-</xsl:template>
-
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/lib/lib.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/lib/lib.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,480 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     This module implements DTD-independent functions
-
-     ******************************************************************** -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
-
-<xsl:template name="dot.count">
-  <!-- Returns the number of "." characters in a string -->
-  <xsl:param name="string"/>
-  <xsl:param name="count" select="0"/>
-  <xsl:choose>
-    <xsl:when test="contains($string, '.')">
-      <xsl:call-template name="dot.count">
-        <xsl:with-param name="string" select="substring-after($string, '.')"/>
-        <xsl:with-param name="count" select="$count+1"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$count"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-<xsl:template name="copy-string">
-  <!-- returns 'count' copies of 'string' -->
-  <xsl:param name="string"/>
-  <xsl:param name="count" select="0"/>
-  <xsl:param name="result"/>
-
-  <xsl:choose>
-    <xsl:when test="$count&gt;0">
-      <xsl:call-template name="copy-string">
-        <xsl:with-param name="string" select="$string"/>
-        <xsl:with-param name="count" select="$count - 1"/>
-        <xsl:with-param name="result">
-          <xsl:value-of select="$result"/>
-          <xsl:value-of select="$string"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$result"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-<xsl:template name="string.subst">
-  <xsl:param name="string"/>
-  <xsl:param name="target"/>
-  <xsl:param name="replacement"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($string, $target)">
-      <xsl:variable name="rest">
-        <xsl:call-template name="string.subst">
-          <xsl:with-param name="string" select="substring-after($string, $target)"/>
-          <xsl:with-param name="target" select="$target"/>
-          <xsl:with-param name="replacement" select="$replacement"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:value-of select="concat(substring-before($string, $target),                                    $replacement,                                    $rest)"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$string"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-<xsl:template name="xpointer.idref">
-  <xsl:param name="xpointer">http://...</xsl:param>
-  <xsl:choose>
-    <xsl:when test="starts-with($xpointer, '#xpointer(id(')">
-      <xsl:variable name="rest" select="substring-after($xpointer, '#xpointer(id(')"/>
-      <xsl:variable name="quote" select="substring($rest, 1, 1)"/>
-      <xsl:value-of select="substring-before(substring-after($xpointer, $quote), $quote)"/>
-    </xsl:when>
-    <xsl:when test="starts-with($xpointer, '#')">
-      <xsl:value-of select="substring-after($xpointer, '#')"/>
-    </xsl:when>
-    <!-- otherwise it's a pointer to some other document -->
-  </xsl:choose>
-</xsl:template>
-<xsl:template name="length-magnitude">
-  <xsl:param name="length" select="'0pt'"/>
-
-  <xsl:choose>
-    <xsl:when test="string-length($length) = 0"/>
-    <xsl:when test="substring($length,1,1) = '0'                     or substring($length,1,1) = '1'                     or substring($length,1,1) = '2'                     or substring($length,1,1) = '3'                     or substring($length,1,1) = '4'                     or substring($length,1,1) = '5'                     or substring($length,1,1) = '6'                     or substring($length,1,1) = '7'                     or substring($length,1,1) = '8'                     or substring($length,1,1) = '9'                     or substring($length,1,1) = '.'">
-      <xsl:value-of select="substring($length,1,1)"/>
-      <xsl:call-template name="length-magnitude">
-        <xsl:with-param name="length" select="substring($length,2)"/>
-      </xsl:call-template>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-<xsl:template name="length-units">
-  <xsl:param name="length" select="'0pt'"/>
-  <xsl:param name="default.units" select="'px'"/>
-  <xsl:variable name="magnitude">
-    <xsl:call-template name="length-magnitude">
-      <xsl:with-param name="length" select="$length"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="units">
-    <xsl:value-of select="substring($length, string-length($magnitude)+1)"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$units = ''">
-      <xsl:value-of select="$default.units"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$units"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-<xsl:template name="length-spec">
-  <xsl:param name="length" select="'0pt'"/>
-  <xsl:param name="default.units" select="'px'"/>
-
-  <xsl:variable name="magnitude">
-    <xsl:call-template name="length-magnitude">
-      <xsl:with-param name="length" select="$length"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="units">
-    <xsl:value-of select="substring($length, string-length($magnitude)+1)"/>
-  </xsl:variable>
-
-  <xsl:value-of select="$magnitude"/>
-  <xsl:choose>
-    <xsl:when test="$units='cm'                     or $units='mm'                     or $units='in'                     or $units='pt'                     or $units='pc'                     or $units='px'                     or $units='em'">
-      <xsl:value-of select="$units"/>
-    </xsl:when>
-    <xsl:when test="$units = ''">
-      <xsl:value-of select="$default.units"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message>
-        <xsl:text>Unrecognized unit of measure: </xsl:text>
-        <xsl:value-of select="$units"/>
-        <xsl:text>.</xsl:text>
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-<xsl:template name="length-in-points">
-  <xsl:param name="length" select="'0pt'"/>
-  <xsl:param name="em.size" select="10"/>
-  <xsl:param name="pixels.per.inch" select="90"/>
-
-  <xsl:variable name="magnitude">
-    <xsl:call-template name="length-magnitude">
-      <xsl:with-param name="length" select="$length"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="units">
-    <xsl:value-of select="substring($length, string-length($magnitude)+1)"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$units = 'pt'">
-      <xsl:value-of select="$magnitude"/>
-    </xsl:when>
-    <xsl:when test="$units = 'cm'">
-      <xsl:value-of select="$magnitude div 2.54 * 72.0"/>
-    </xsl:when>
-    <xsl:when test="$units = 'mm'">
-      <xsl:value-of select="$magnitude div 25.4 * 72.0"/>
-    </xsl:when>
-    <xsl:when test="$units = 'in'">
-      <xsl:value-of select="$magnitude * 72.0"/>
-    </xsl:when>
-    <xsl:when test="$units = 'pc'">
-      <xsl:value-of select="$magnitude * 12.0"/>
-    </xsl:when>
-    <xsl:when test="$units = 'px'">
-      <xsl:value-of select="$magnitude div $pixels.per.inch * 72.0"/>
-    </xsl:when>
-    <xsl:when test="$units = 'em'">
-      <xsl:value-of select="$magnitude * $em.size"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message>
-        <xsl:text>Unrecognized unit of measure: </xsl:text>
-        <xsl:value-of select="$units"/>
-        <xsl:text>.</xsl:text>
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-<xsl:template name="pi-attribute">
-  <xsl:param name="pis" select="processing-instruction('BOGUS_PI')"/>
-  <xsl:param name="attribute">filename</xsl:param>
-  <xsl:param name="count">1</xsl:param>
-
-  <xsl:choose>
-    <xsl:when test="$count&gt;count($pis)">
-      <!-- not found -->
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="pi">
-        <xsl:value-of select="$pis[$count]"/>
-      </xsl:variable>
-      <xsl:variable name="pivalue">
-        <xsl:value-of select="concat(' ', normalize-space($pi))"/>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="contains($pivalue,concat(' ', $attribute, '='))">
-          <xsl:variable name="rest" select="substring-after($pivalue,concat(' ', $attribute,'='))"/>
-          <xsl:variable name="quote" select="substring($rest,1,1)"/>
-          <xsl:value-of select="substring-before(substring($rest,2),$quote)"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="pi-attribute">
-            <xsl:with-param name="pis" select="$pis"/>
-            <xsl:with-param name="attribute" select="$attribute"/>
-            <xsl:with-param name="count" select="$count + 1"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-<xsl:template name="lookup.key">
-  <xsl:param name="key" select="''"/>
-  <xsl:param name="table" select="''"/>
-
-  <xsl:if test="contains($table, ' ')">
-    <xsl:choose>
-      <xsl:when test="substring-before($table, ' ') = $key">
-        <xsl:variable name="rest" select="substring-after($table, ' ')"/>
-        <xsl:choose>
-          <xsl:when test="contains($rest, ' ')">
-            <xsl:value-of select="substring-before($rest, ' ')"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$rest"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="lookup.key">
-          <xsl:with-param name="key" select="$key"/>
-          <xsl:with-param name="table" select="substring-after(substring-after($table,' '), ' ')"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:if>
-</xsl:template>
-<xsl:template name="xpath.location">
-  <xsl:param name="node" select="."/>
-  <xsl:param name="path" select="''"/>
-
-  <xsl:variable name="next.path">
-    <xsl:value-of select="local-name($node)"/>
-    <xsl:if test="$path != ''">/</xsl:if>
-    <xsl:value-of select="$path"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$node/parent::*">
-      <xsl:call-template name="xpath.location">
-        <xsl:with-param name="node" select="$node/parent::*"/>
-        <xsl:with-param name="path" select="$next.path"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text>/</xsl:text>
-      <xsl:value-of select="$next.path"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-<xsl:template name="comment-escape-string">
-  <xsl:param name="string" select="''"/>
-
-  <xsl:if test="starts-with($string, '-')">
-    <xsl:text> </xsl:text>
-  </xsl:if>
-
-  <xsl:call-template name="comment-escape-string.recursive">
-    <xsl:with-param name="string" select="$string"/>
-  </xsl:call-template>
-
-  <xsl:if test="substring($string, string-length($string), 1) = '-'">
-    <xsl:text> </xsl:text>
-  </xsl:if>
-</xsl:template>
-<xsl:template name="comment-escape-string.recursive">
-  <xsl:param name="string" select="''"/>
-  <xsl:choose>
-    <xsl:when test="contains($string, '--')">
-      <xsl:value-of select="substring-before($string, '--')"/>
-      <xsl:value-of select="'- -'"/>
-      <xsl:call-template name="comment-escape-string.recursive">
-        <xsl:with-param name="string" select="substring-after($string, '--')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$string"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-  <xsl:template name="str.tokenize.keep.delimiters">
-    <xsl:param name="string" select="''"/>
-    <xsl:param name="delimiters" select="' '"/>
-    <xsl:choose>
-      <xsl:when test="not($string)"/>
-      <xsl:when test="not($delimiters)">
-        <xsl:call-template name="str.tokenize.keep.delimiters-characters">
-          <xsl:with-param name="string" select="$string"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="str.tokenize.keep.delimiters-delimiters">
-          <xsl:with-param name="string" select="$string"/>
-          <xsl:with-param name="delimiters" select="$delimiters"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-  <xsl:template name="str.tokenize.keep.delimiters-characters">
-    <xsl:param name="string"/>
-    <xsl:if test="$string">
-      <ssb:token xmlns:ssb="http://sideshowbarker.net/ns"><xsl:value-of select="substring($string, 1, 1)"/></ssb:token>
-      <xsl:call-template name="str.tokenize.keep.delimiters-characters">
-        <xsl:with-param name="string" select="substring($string, 2)"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:template>
-  <xsl:template name="str.tokenize.keep.delimiters-delimiters">
-    <xsl:param name="string"/>
-    <xsl:param name="delimiters"/>
-    <xsl:variable name="delimiter" select="substring($delimiters, 1, 1)"/>
-    <xsl:choose>
-      <xsl:when test="not($delimiter)">
-        <ssb:token xmlns:ssb="http://sideshowbarker.net/ns"><xsl:value-of select="$string"/></ssb:token>
-      </xsl:when>
-      <xsl:when test="contains($string, $delimiter)">
-        <xsl:if test="not(starts-with($string, $delimiter))">
-          <xsl:call-template name="str.tokenize.keep.delimiters-delimiters">
-            <xsl:with-param name="string" select="substring-before($string, $delimiter)"/>
-            <xsl:with-param name="delimiters" select="substring($delimiters, 2)"/>
-          </xsl:call-template>
-        </xsl:if>
-        <!-- output each delimiter -->
-        <xsl:value-of select="$delimiter"/>
-        <xsl:call-template name="str.tokenize.keep.delimiters-delimiters">
-          <xsl:with-param name="string" select="substring-after($string, $delimiter)"/>
-          <xsl:with-param name="delimiters" select="$delimiters"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="str.tokenize.keep.delimiters-delimiters">
-          <xsl:with-param name="string" select="$string"/>
-          <xsl:with-param name="delimiters" select="substring($delimiters, 2)"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-    <xsl:template name="apply-string-subst-map">
-      <xsl:param name="content"/>
-      <xsl:param name="map.contents"/>
-      <xsl:variable name="replaced_text">
-        <xsl:call-template name="string.subst">
-          <xsl:with-param name="string" select="$content"/>
-          <xsl:with-param name="target" select="$map.contents[1]/@oldstring"/>
-          <xsl:with-param name="replacement" select="$map.contents[1]/@newstring"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="$map.contents[2]">
-          <xsl:call-template name="apply-string-subst-map">
-            <xsl:with-param name="content" select="$replaced_text"/>
-            <xsl:with-param name="map.contents" select="$map.contents[position() &gt; 1]"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$replaced_text"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:template>
-  
-<xsl:template name="count.uri.path.depth">
-  <xsl:param name="filename" select="''"/>
-  <xsl:param name="count" select="0"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($filename, '/')">
-      <xsl:call-template name="count.uri.path.depth">
-        <xsl:with-param name="filename" select="substring-after($filename, '/')"/>
-        <xsl:with-param name="count" select="$count + 1"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$count"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-<xsl:template name="trim.common.uri.paths">
-  <xsl:param name="uriA" select="''"/>
-  <xsl:param name="uriB" select="''"/>
-  <xsl:param name="return" select="'A'"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($uriA, '/') and contains($uriB, '/')                     and substring-before($uriA, '/') = substring-before($uriB, '/')">
-      <xsl:call-template name="trim.common.uri.paths">
-        <xsl:with-param name="uriA" select="substring-after($uriA, '/')"/>
-        <xsl:with-param name="uriB" select="substring-after($uriB, '/')"/>
-        <xsl:with-param name="return" select="$return"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$return = 'A'">
-          <xsl:value-of select="$uriA"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$uriB"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-  <xsl:template name="trim.text">
-    <xsl:param name="contents" select="."/>
-    <xsl:variable name="contents-left-trimmed">
-      <xsl:call-template name="trim-left">
-        <xsl:with-param name="contents" select="$contents"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="contents-trimmed">
-      <xsl:call-template name="trim-right">
-        <xsl:with-param name="contents" select="$contents-left-trimmed"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:value-of select="$contents-trimmed"/>
-  </xsl:template>
-
-  <xsl:template name="trim-left">
-    <xsl:param name="contents"/>
-    <xsl:choose>
-      <xsl:when test="starts-with($contents,'&#10;') or                       starts-with($contents,'&#13;') or                       starts-with($contents,' ') or                       starts-with($contents,'&#9;')">
-        <xsl:call-template name="trim-left">
-          <xsl:with-param name="contents" select="substring($contents, 2)"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$contents"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-  <xsl:template name="trim-right">
-    <xsl:param name="contents"/>
-    <xsl:variable name="last-char">
-      <xsl:value-of select="substring($contents, string-length($contents), 1)"/>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="($last-char = '&#10;') or                       ($last-char = '&#13;') or                       ($last-char = ' ') or                       ($last-char = '&#9;')">
-        <xsl:call-template name="trim-right">
-          <xsl:with-param name="contents" select="substring($contents, 1, string-length($contents) - 1)"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$contents"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/profile-mode.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/profile-mode.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,239 +1,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:saxon="http://icl.com/saxon"
-                exclude-result-prefixes="saxon"
-                version="1.0">
-
-<!-- Should be base URI for imagedata and so on fixed? -->
-<xsl:param name="profile.baseuri.fixup" select="true()"/>
-
-<!-- Copy all non-element nodes -->
-<xsl:template match="@*|text()|comment()|processing-instruction()" mode="profile">
-  <xsl:copy/>
-</xsl:template>
-
-<!-- Profile elements based on input parameters -->
-<xsl:template match="*" mode="profile">
-
-  <xsl:variable name="arch.content">
-    <xsl:if test="@arch">
-      <xsl:call-template name="cross.compare">
-        <xsl:with-param name="a" select="$profile.arch"/>
-        <xsl:with-param name="b" select="@arch"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="arch.ok" select="not(@arch) or not($profile.arch) or
-                                       $arch.content != '' or @arch = ''"/>
-
-  <xsl:variable name="audience.content">
-    <xsl:if test="@audience">
-      <xsl:call-template name="cross.compare">
-        <xsl:with-param name="a" select="$profile.audience"/>
-        <xsl:with-param name="b" select="@audience"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="audience.ok" 
-                        select="not(@audience) or not($profile.audience) or
-                                $audience.content != '' or @audience = ''"/>
-
-  <xsl:variable name="condition.content">
-    <xsl:if test="@condition">
-      <xsl:call-template name="cross.compare">
-        <xsl:with-param name="a" select="$profile.condition"/>
-        <xsl:with-param name="b" select="@condition"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="condition.ok" select="not(@condition) or not($profile.condition) or
-                                            $condition.content != '' or @condition = ''"/>
-
-  <xsl:variable name="conformance.content">
-    <xsl:if test="@conformance">
-      <xsl:call-template name="cross.compare">
-        <xsl:with-param name="a" select="$profile.conformance"/>
-        <xsl:with-param name="b" select="@conformance"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="conformance.ok" select="not(@conformance) or not($profile.conformance) or
-                                              $conformance.content != '' or @conformance = ''"/>
-
-  <xsl:variable name="lang.content">
-    <xsl:if test="@lang | @xml:lang">
-      <xsl:call-template name="cross.compare">
-        <xsl:with-param name="a" select="$profile.lang"/>
-        <xsl:with-param name="b" select="(@lang | @xml:lang)[1]"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="lang.ok" select="not(@lang | @xml:lang) or not($profile.lang) or
-                                       $lang.content != '' or @lang = '' or @xml:lang = ''"/>
-
-  <xsl:variable name="os.content">
-    <xsl:if test="@os">
-      <xsl:call-template name="cross.compare">
-        <xsl:with-param name="a" select="$profile.os"/>
-        <xsl:with-param name="b" select="@os"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="os.ok" select="not(@os) or not($profile.os) or
-                                     $os.content != '' or @os = ''"/>
-
-  <xsl:variable name="revision.content">
-    <xsl:if test="@revision">
-      <xsl:call-template name="cross.compare">
-        <xsl:with-param name="a" select="$profile.revision"/>
-        <xsl:with-param name="b" select="@revision"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="revision.ok" select="not(@revision) or not($profile.revision) or
-                                           $revision.content != '' or @revision = ''"/>
-
-  <xsl:variable name="revisionflag.content">
-    <xsl:if test="@revisionflag">
-      <xsl:call-template name="cross.compare">
-        <xsl:with-param name="a" select="$profile.revisionflag"/>
-        <xsl:with-param name="b" select="@revisionflag"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="revisionflag.ok" select="not(@revisionflag) or not($profile.revisionflag) or
-                                               $revisionflag.content != '' or @revisionflag = ''"/>
-
-  <xsl:variable name="role.content">
-    <xsl:if test="@role">
-      <xsl:call-template name="cross.compare">
-        <xsl:with-param name="a" select="$profile.role"/>
-        <xsl:with-param name="b" select="@role"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="role.ok" select="not(@role) or not($profile.role) or
-                                       $role.content != '' or @role = ''"/>
-
-  <xsl:variable name="security.content">
-    <xsl:if test="@security">
-      <xsl:call-template name="cross.compare">
-        <xsl:with-param name="a" select="$profile.security"/>
-        <xsl:with-param name="b" select="@security"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="security.ok" select="not(@security) or not($profile.security) or
-                                           $security.content != '' or @security = ''"/>
-
-  <xsl:variable name="status.content">
-    <xsl:if test="@status">
-      <xsl:call-template name="cross.compare">
-        <xsl:with-param name="a" select="$profile.status"/>
-        <xsl:with-param name="b" select="@status"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="status.ok" select="not(@status) or not($profile.status) or
-                                           $status.content != '' or @status = ''"/>
-
-  <xsl:variable name="userlevel.content">
-    <xsl:if test="@userlevel">
-      <xsl:call-template name="cross.compare">
-        <xsl:with-param name="a" select="$profile.userlevel"/>
-        <xsl:with-param name="b" select="@userlevel"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="userlevel.ok" select="not(@userlevel) or not($profile.userlevel) or
-                                            $userlevel.content != '' or @userlevel = ''"/>
-
-  <xsl:variable name="vendor.content">
-    <xsl:if test="@vendor">
-      <xsl:call-template name="cross.compare">
-        <xsl:with-param name="a" select="$profile.vendor"/>
-        <xsl:with-param name="b" select="@vendor"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="vendor.ok" select="not(@vendor) or not($profile.vendor) or
-                                         $vendor.content != '' or @vendor = ''"/>
-
-  <xsl:variable name="wordsize.content">
-    <xsl:if test="@wordsize">
-      <xsl:call-template name="cross.compare">
-        <xsl:with-param name="a" select="$profile.wordsize"/>
-        <xsl:with-param name="b" select="@wordsize"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="wordsize.ok" 
-                        select="not(@wordsize) or not($profile.wordsize) or
-                                $wordsize.content != '' or @wordsize = ''"/>
-
-  <xsl:variable name="attribute.content">
-    <xsl:if test="@*[local-name()=$profile.attribute]">
-      <xsl:call-template name="cross.compare">
-        <xsl:with-param name="a" select="$profile.value"/>
-        <xsl:with-param name="b" select="@*[local-name()=$profile.attribute]"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="attribute.ok" 
-                select="not(@*[local-name()=$profile.attribute]) or 
-                        not($profile.value) or $attribute.content != '' or 
-                        @*[local-name()=$profile.attribute] = '' or 
-                        not($profile.attribute)"/>
-
-  <xsl:if test="$arch.ok and 
-                $audience.ok and 
-                $condition.ok and 
-                $conformance.ok and 
-                $lang.ok and 
-                $os.ok and 
-                $revision.ok and 
-                $revisionflag.ok and 
-                $role.ok and 
-                $security.ok and 
-                $status.ok and 
-                $userlevel.ok and 
-                $vendor.ok and 
-                $wordsize.ok and 
-                $attribute.ok">
-    <xsl:copy>
-      <xsl:copy-of select="@*"/>
-
-      <!-- Entity references must be replaced with filereferences for temporary tree -->
-      <xsl:if test="@entityref and $profile.baseuri.fixup">
-        <xsl:attribute name="fileref">
-          <xsl:value-of select="unparsed-entity-uri(@entityref)"/>
-        </xsl:attribute>
-      </xsl:if>
-
-      <!-- xml:base is eventually added to the root element -->
-      <xsl:if test="not(../..) and $profile.baseuri.fixup">
-        <xsl:call-template name="add-xml-base"/>
-      </xsl:if>
-
-      <xsl:apply-templates select="node()" mode="profile"/>
-    </xsl:copy>
-  </xsl:if>
-</xsl:template>
-
-<!-- Returns non-empty string if list in $b contains one ore more values from list $a -->
-<xsl:template name="cross.compare">
-  <xsl:param name="a"/>
-  <xsl:param name="b"/>
-  <xsl:param name="sep" select="$profile.separator"/>
-  <xsl:variable name="head" select="substring-before(concat($a, $sep), $sep)"/>
-  <xsl:variable name="tail" select="substring-after($a, $sep)"/>
-  <xsl:if test="contains(concat($sep, $b, $sep), concat($sep, $head, $sep))">1</xsl:if>
-  <xsl:if test="$tail">
-    <xsl:call-template name="cross.compare">
-      <xsl:with-param name="a" select="$tail"/>
-      <xsl:with-param name="b" select="$b"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/profile.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/profile.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,49 +1,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-<!-- Include common profiling stylesheet -->
-<xsl:import href="profile-mode.xsl"/>
-
-<!-- This file must be included, because profile-mode is using templates from it -->
-<xsl:import href="../common/stripns.xsl"/>
-
-<!-- In the two pass processing there is no need for base URI fixup -->
-<xsl:param name="profile.baseuri.fixup" select="false()"/>
-
-<!-- If you need to validate profiled content against DTD, 
-     create customization that will import this stylesheet and
-     will use xsl:output (see example bellow) to output reference 
-     to the desired DTD version. --> 
-<!-- Generate DocBook instance with correct DOCTYPE -->
-<!--
-<xsl:output method="xml" 
-            doctype-public="-//OASIS//DTD DocBook XML V4.5//EN"
-            doctype-system="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"/>
--->
-
-<!-- Profiling parameters -->
-<xsl:param name="profile.arch" select="''"/>
-<xsl:param name="profile.audience" select="''"/>
-<xsl:param name="profile.condition" select="''"/>
-<xsl:param name="profile.conformance" select="''"/>
-<xsl:param name="profile.lang" select="''"/>
-<xsl:param name="profile.os" select="''"/>
-<xsl:param name="profile.revision" select="''"/>
-<xsl:param name="profile.revisionflag" select="''"/>
-<xsl:param name="profile.role" select="''"/>
-<xsl:param name="profile.security" select="''"/>
-<xsl:param name="profile.status" select="''"/>
-<xsl:param name="profile.userlevel" select="''"/>
-<xsl:param name="profile.vendor" select="''"/>
-<xsl:param name="profile.wordsize" select="''"/>
-<xsl:param name="profile.attribute" select="''"/>
-<xsl:param name="profile.value" select="''"/>
-<xsl:param name="profile.separator" select="';'"/>
-
-<!-- Call common profiling mode -->
-<xsl:template match="/">
-  <xsl:apply-templates select="." mode="profile"/>
-</xsl:template>
-
-</xsl:stylesheet>
-
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/strip-attributes.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/strip-attributes.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,27 +1,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-<xsl:output method="xml"/>
-
-<xsl:param name="attributes" select="''"/>
-
-<xsl:variable name="strip-attributes"
-              select="concat(' ', normalize-space($attributes), ' ')"/>
-
-<xsl:template match="@*|text()|comment()|processing-instruction()">
-  <xsl:copy/>
-</xsl:template>
-
-<xsl:template match="*">
-  <xsl:copy>
-    <xsl:for-each select="@*">
-      <xsl:if test="not(contains($strip-attributes, concat(' ',name(.),' ')))">
-        <xsl:copy-of select="."/>
-      </xsl:if>
-    </xsl:for-each>
-    <xsl:apply-templates select="node()"/>
-  </xsl:copy>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/xsl2profile.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/profiling/xsl2profile.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,159 +1,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:xslo="http://www.w3.org/1999/XSL/TransformAlias"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                exclude-result-prefixes="fo"
-                version="1.0">
-
-<xsl:include href="../lib/lib.xsl"/>
-
-<xsl:output method="xml" encoding="US-ASCII"/>
-
-<xsl:namespace-alias stylesheet-prefix="xslo" result-prefix="xsl"/>
-
-<xsl:preserve-space elements="*"/>
-
-<xsl:template match="/">
-  <xsl:comment>This file was created automatically by xsl2profile</xsl:comment>
-  <xsl:comment>from the DocBook XSL stylesheets.</xsl:comment>
-  <xsl:apply-templates/>
-</xsl:template>
-
-<!-- Make sure we override some templates and parameters appropriately for XHTML -->
-<xsl:template match="xsl:stylesheet">
-  <xsl:copy>
-    <xsl:attribute name="exslt:dummy" xmlns:exslt="http://exslt.org/common">dummy</xsl:attribute>
-    <xsl:attribute name="ng:dummy" xmlns:ng="http://docbook.org/docbook-ng">dummy</xsl:attribute>
-    <xsl:attribute name="db:dummy" xmlns:db="http://docbook.org/ns/docbook">dummy</xsl:attribute>
-    <xsl:if test="not(@extension-element-prefixes)">
-      <xsl:attribute name="extension-element-prefixes">exslt</xsl:attribute>
-    </xsl:if>
-    <xsl:if test="not(@exclude-result-prefixes)">
-      <xsl:attribute name="exclude-result-prefixes">exslt</xsl:attribute>
-    </xsl:if>
-    <xsl:for-each select="@*">
-      <xsl:choose>
-        <xsl:when test="local-name(.) = 'extension-element-prefixes' or
-                        local-name(.) = 'exclude-result-prefixes'">
-          <xsl:attribute name="{local-name(.)}"><xsl:value-of select="concat(., ' exslt')"/></xsl:attribute>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:attribute name="{local-name(.)}"><xsl:value-of select="."/></xsl:attribute>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:for-each>
-    <xsl:apply-templates/>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="*">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates/>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="comment()|processing-instruction()|text()">
-  <xsl:copy/>
-</xsl:template>
-
-<xsl:template match="xsl:template[@match='/']">
-  <xslo:include href="../profiling/profile-mode.xsl"/>
-  <xslo:variable name="profiled-content">
-    <xslo:choose>
-      <xslo:when test="*/self::ng:* or */self::db:*">
-        <xslo:message>Note: namesp. cut : stripped namespace before processing</xslo:message>
-        <xslo:variable name="stripped-content">
-          <xslo:apply-templates select="/" mode="stripNS"/>
-        </xslo:variable>
-        <xslo:message>Note: namesp. cut : processing stripped document</xslo:message>
-        <xslo:apply-templates select="exslt:node-set($stripped-content)" mode="profile"/>
-      </xslo:when>
-      <xslo:otherwise>
-        <xslo:apply-templates select="/" mode="profile"/>
-      </xslo:otherwise>
-    </xslo:choose>
-  </xslo:variable>
-  <xslo:variable name="profiled-nodes" select="exslt:node-set($profiled-content)"/>
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates mode="correct"/>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="xsl:template[@name='hhc-main' or @name='hhp-main' or @name='etoc'] | xsl:variable[@name='raw.help.title']">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates mode="correct"/>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="*[starts-with(@select, '/')]" mode="correct">
-  <xsl:copy>
-    <xsl:for-each select="@*">
-      <xsl:choose>
-        <xsl:when test="local-name(.) = 'select' and string(.) =  '/'">
-          <xsl:attribute name="{local-name(.)}">$profiled-nodes</xsl:attribute>
-        </xsl:when>
-        <xsl:when test="local-name(.) = 'select' and starts-with(., '/')">
-          <xsl:attribute name="{local-name(.)}">$profiled-nodes<xsl:value-of select="."/></xsl:attribute>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:attribute name="{local-name(.)}"><xsl:value-of select="."/></xsl:attribute>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:for-each>
-    <xsl:apply-templates mode="correct"/>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match='*[contains(@*, "key(&apos;id&apos;,$rootid)")]' mode="correct" priority="2">
-  <xsl:copy>
-    <xsl:for-each select="@*">
-      <xsl:choose>
-        <xsl:when test='contains(., "key(&apos;id&apos;,$rootid)")'>
-          <xsl:attribute name="{local-name(.)}">
-            <xsl:call-template name="string.subst">
-              <xsl:with-param name="string" select="."/>
-              <xsl:with-param name="target">key('id',$rootid)</xsl:with-param>
-              <xsl:with-param name="replacement">$profiled-nodes//*[@id=$rootid]</xsl:with-param>
-            </xsl:call-template>
-          </xsl:attribute>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:attribute name="{local-name(.)}"><xsl:value-of select="."/></xsl:attribute>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:for-each>
-    <xsl:apply-templates mode="correct"/>
-  </xsl:copy>
-</xsl:template>
-
-<!-- FO stylesheet has apply-templates without select, we must detect it by context -->
-<xsl:template match="fo:root//xsl:apply-templates" mode="correct">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:attribute name="select">$profiled-nodes/node()</xsl:attribute>
-    <xsl:apply-templates mode="correct"/>
-  </xsl:copy>
-</xsl:template>
-
-<!-- DB5 namespace stripping is already done  -->
-<xsl:template match="xsl:when[contains(@test, 'self::db')]" mode="correct">
-  <xsl:copy>
-    <xsl:attribute name="test">false()</xsl:attribute>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="*" mode="correct">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates mode="correct"/>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="comment()|processing-instruction()|text()" mode="correct">
-  <xsl:copy/>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/admon.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/admon.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,133 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:template match="*" mode="admon.graphic.width">
-  <xsl:param name="node" select="."/>
-  <xsl:text>25</xsl:text>
-</xsl:template>
-
-<xsl:template match="note|important|warning|caution|tip">
-  <xsl:choose>
-    <xsl:when test="$admon.graphics != 0">
-      <xsl:call-template name="graphical.admonition"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="nongraphical.admonition"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="admon.graphic">
-  <xsl:param name="node" select="."/>
-  <xsl:value-of select="$admon.graphics.path"/>
-  <xsl:choose>
-    <xsl:when test="local-name($node)='note'">note</xsl:when>
-    <xsl:when test="local-name($node)='warning'">warning</xsl:when>
-    <xsl:when test="local-name($node)='caution'">caution</xsl:when>
-    <xsl:when test="local-name($node)='tip'">tip</xsl:when>
-    <xsl:when test="local-name($node)='important'">important</xsl:when>
-    <xsl:otherwise>note</xsl:otherwise>
-  </xsl:choose>
-  <xsl:value-of select="$admon.graphics.extension"/>
-</xsl:template>
-
-<xsl:template name="graphical.admonition">
-  <xsl:variable name="admon.type">
-    <xsl:choose>
-      <xsl:when test="local-name(.)='note'">Note</xsl:when>
-      <xsl:when test="local-name(.)='warning'">Warning</xsl:when>
-      <xsl:when test="local-name(.)='caution'">Caution</xsl:when>
-      <xsl:when test="local-name(.)='tip'">Tip</xsl:when>
-      <xsl:when test="local-name(.)='important'">Important</xsl:when>
-      <xsl:otherwise>Note</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="alt">
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="$admon.type"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="$admon.style != ''">
-      <xsl:attribute name="style">
-        <xsl:value-of select="$admon.style"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <table border="0">
-      <xsl:attribute name="summary">
-        <xsl:value-of select="$admon.type"/>
-        <xsl:if test="title|info/title">
-          <xsl:text>: </xsl:text>
-          <xsl:value-of select="(title|info/title)[1]"/>
-        </xsl:if>
-      </xsl:attribute>
-      <tr>
-        <td rowspan="2" align="center" valign="top">
-          <xsl:attribute name="width">
-            <xsl:apply-templates select="." mode="admon.graphic.width"/>
-          </xsl:attribute>
-          <img alt="[{$alt}]">
-            <xsl:attribute name="src">
-              <xsl:call-template name="admon.graphic"/>
-            </xsl:attribute>
-          </img>
-        </td>
-        <th align="left">
-          <xsl:call-template name="anchor"/>
-          <xsl:if test="$admon.textlabel != 0 or title or info/title">
-            <xsl:apply-templates select="." mode="object.title.markup"/>
-          </xsl:if>
-        </th>
-      </tr>
-      <tr>
-        <td align="left" valign="top">
-          <xsl:apply-templates/>
-        </td>
-      </tr>
-    </table>
-  </div>
-</xsl:template>
-
-<xsl:template name="nongraphical.admonition">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="$admon.style">
-      <xsl:attribute name="style">
-        <xsl:value-of select="$admon.style"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:if test="$admon.textlabel != 0 or title or info/title">
-      <h3 class="title">
-        <xsl:call-template name="anchor"/>
-        <xsl:apply-templates select="." mode="object.title.markup"/>
-      </h3>
-    </xsl:if>
-
-    <xsl:apply-templates/>
-  </div>
-</xsl:template>
-
-<xsl:template match="note/title"/>
-<xsl:template match="important/title"/>
-<xsl:template match="warning/title"/>
-<xsl:template match="caution/title"/>
-<xsl:template match="tip/title"/>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/annotations.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/annotations.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,158 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<xsl:template name="add.annotation.links">
-  <xsl:param name="scripts" select="normalize-space($annotation.js)"/>
-  <xsl:choose>
-    <xsl:when test="contains($scripts, ' ')">
-      <script type="text/javascript" src="{substring-before($scripts, ' ')}"/>
-      <xsl:call-template name="add.annotation.links">
-        <xsl:with-param name="scripts" select="substring-after($scripts, ' ')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <script type="text/javascript" src="{$scripts}"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="annotation"/>
-
-<xsl:template name="apply-annotations">
-  <xsl:if test="$annotation.support != 0">
-  <!-- do any annotations apply to the context node? -->
-  <xsl:variable name="id" select="(@id|@xml:id)[1]"/>
-
-  <xsl:variable name="aids">
-    <xsl:for-each select="//annotation">
-      <xsl:if test="@annotates=$id                     or starts-with(@annotates, concat($id, ' '))                     or contains(@annotates, concat(' ', $id, ' '))                     or substring(@annotates, string-length(@annotates)-3)                        = concat(' ', $id)">
-        <xsl:value-of select="generate-id()"/>
-        <xsl:text> </xsl:text>
-      </xsl:if>
-    </xsl:for-each>
-    <xsl:if test="normalize-space(@annotations) != ''">
-      <xsl:call-template name="annotations-pointed-to">
-        <xsl:with-param name="annotations" select="normalize-space(@annotations)"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:if test="$aids != ''">
-    <xsl:call-template name="apply-annotations-by-gid">
-      <xsl:with-param name="gids" select="normalize-space($aids)"/>
-    </xsl:call-template>
-  </xsl:if>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="annotations-pointed-to">
-  <xsl:param name="annotations"/>
-  <xsl:choose>
-    <xsl:when test="contains($annotations, ' ')">
-      <xsl:variable name="a" select="key('id', substring-before($annotations, ' '))"/>
-      <xsl:if test="$a">
-        <xsl:value-of select="generate-id($a)"/>
-        <xsl:text> </xsl:text>
-      </xsl:if>
-      <xsl:call-template name="annotations-pointed-to">
-        <xsl:with-param name="annotations" select="substring-after($annotations, ' ')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="a" select="key('id', $annotations)"/>
-      <xsl:if test="$a">
-        <xsl:value-of select="generate-id($a)"/>
-        <xsl:text> </xsl:text>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="apply-annotations-by-gid">
-  <xsl:param name="gids"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($gids, ' ')">
-      <xsl:variable name="gid" select="substring-before($gids, ' ')"/>
-      <xsl:apply-templates select="key('gid', $gid)" mode="annotation-inline"/>
-      <xsl:call-template name="apply-annotations-by-gid">
-        <xsl:with-param name="gids" select="substring-after($gids, ' ')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="key('gid', $gids)" mode="annotation-inline"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="annotation" mode="annotation-inline">
-  <xsl:variable name="title">
-    <xsl:choose>
-      <xsl:when test="title">
-        <xsl:value-of select="title"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text>[Annotation #</xsl:text>
-        <xsl:number count="annotation" level="any" format="1"/>
-        <xsl:text>]</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <a id="anch-{generate-id(.)}" href="#annot-{generate-id(.)}" title="{$title}">
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:attribute name="onClick">
-      <xsl:text>popup_</xsl:text>
-      <xsl:value-of select="generate-id(.)"/>
-      <xsl:text>.showPopup('anch-</xsl:text>
-      <xsl:value-of select="generate-id(.)"/>
-      <xsl:text>'); return false;</xsl:text>
-    </xsl:attribute>
-    <img src="{$annotation.graphic.open}" border="0" alt="{$title}"/>
-  </a>
-</xsl:template>
-
-<xsl:template match="annotation" mode="annotation-popup">
-  <div class="annotation-nocss">
-    <p>
-      <a id="annot-{generate-id(.)}"/>
-      <xsl:text>Annotation #</xsl:text>
-      <xsl:number count="annotation" level="any" format="1"/>
-      <xsl:text>:</xsl:text>
-    </p>
-  </div>
-
-  <div id="popup-{generate-id(.)}" class="annotation-popup">
-    <xsl:if test="string-length(.) &gt; 300">
-      <xsl:attribute name="style">width:400px</xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="annotation-title"/>
-    <div class="annotation-body">
-      <xsl:apply-templates select="*[local-name(.) != 'title']"/>
-    </div>
-    <div class="annotation-close">
-      <a href="#" onclick="popup_{generate-id(.)}.hidePopup();return false;">
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <img src="{$annotation.graphic.close}" alt="X" border="0"/>
-      </a>
-    </div>
-  </div>
-</xsl:template>
-
-<xsl:template name="annotation-title">
-  <div class="annotation-title">
-    <xsl:choose>
-      <xsl:when test="title">
-        <xsl:apply-templates select="title/node()"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text>Annotation</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-  </div>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx-kimber.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx-kimber.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,139 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:k="http://www.isogen.com/functions/com.isogen.saxoni18n.Saxoni18nService" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="k" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-<!-- The "kimber" method contributed by Eliot Kimber of Innodata Isogen.  -->
-<!-- ==================================================================== -->
-<!--   *** THIS MODULE ONLY WORKS WITH SAXON 6 OR SAXON 8 ***             -->
-<!-- ==================================================================== -->
-
-
-<xsl:include href="../common/autoidx-kimber.xsl"/>
-
-<!-- Java sort apparently works only on lang part, not country -->
-<xsl:param name="sort.lang">
-  <xsl:choose>
-    <xsl:when test="contains(concat(/*/@lang, /*/@xml:lang), '-')">
-      <xsl:value-of select="substring-before(concat(/*/@lang, /*/@xml:lang), '-')"/>
-    </xsl:when>
-    <xsl:when test="contains(concat(/*/@lang, /*/@xml:lang), '_')">
-      <xsl:value-of select="substring-before(concat(/*/@lang, /*/@xml:lang), '_')"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="concat(/*/@lang, /*/@xml:lang)"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-
-<xsl:template name="generate-kimber-index">
-  <xsl:param name="scope" select="NOTANODE"/>
-
-  <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
-  <xsl:if test="not(contains($vendor, 'SAXON '))">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kimber' index method requires the </xsl:text>
-      <xsl:text>Saxon version 6 or 8 XSLT processor.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:if test="not(function-available('k:getIndexGroupKey'))">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kimber' index method requires the </xsl:text>
-      <xsl:text>Innodata Isogen 
-Java extensions for </xsl:text>
-      <xsl:text>internationalized indexes. 
-Install those </xsl:text>
-      <xsl:text>extensions, or use a different index method.
-</xsl:text>
-      <xsl:text>For more information, see:
-</xsl:text>
-      <xsl:text>http://www.innodata-isogen.com/knowledge_center/tools_downloads/i18nsupport</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:variable name="role">
-    <xsl:if test="$index.on.role != 0">
-      <xsl:value-of select="@role"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="type">
-    <xsl:if test="$index.on.type != 0">
-      <xsl:value-of select="@type"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="terms" select="//indexterm[count(.|key('k-group', k:getIndexGroupKey(concat(/*/@lang, /*/@xml:lang), normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;]))))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1 and not(@class = 'endofrange')]"/>
-
-  <xsl:variable name="alphabetical" select="$terms[not(starts-with(                 k:getIndexGroupKey(concat(/*/@lang, /*/@xml:lang), normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;]))),                 '#NUMERIC'                 ))]"/>
-
-  <xsl:variable name="others" select="$terms[starts-with(                 k:getIndexGroupKey(concat(/*/@lang, /*/@xml:lang), normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;]))),                 '#NUMERIC'                 )]"/>
-
-  <div class="index">
-    <xsl:if test="$others">
-      <div class="indexdev">
-        <h3>
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'index symbols'"/>
-          </xsl:call-template>
-        </h3>
-        <dl>
-          <xsl:apply-templates select="$others" mode="index-symbol-div">
-            <xsl:with-param name="scope" select="$scope"/>
-            <xsl:with-param name="role" select="$role"/>
-            <xsl:with-param name="type" select="$type"/>
-            <xsl:sort lang="{$sort.lang}" select="k:getIndexGroupSortKey(concat(/*/@lang, /*/@xml:lang),                         k:getIndexGroupKey(concat(/*/@lang, /*/@xml:lang), normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;]))))"/>
-          </xsl:apply-templates>
-        </dl>
-      </div>
-    </xsl:if>
-
-    <xsl:apply-templates select="$alphabetical" mode="index-div-kimber">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort lang="{$sort.lang}" select="k:getIndexGroupSortKey(concat(/*/@lang, /*/@xml:lang),                      k:getIndexGroupKey(concat(/*/@lang, /*/@xml:lang), normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;]))))"/>
-    </xsl:apply-templates>
-  </div>
-
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-div-kimber">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:variable name="key" select="k:getIndexGroupKey(concat(/*/@lang, /*/@xml:lang), normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])))"/>
-
-  <xsl:variable name="label" select="k:getIndexGroupLabel(concat(/*/@lang, /*/@xml:lang), $key)"/>
-
-  <xsl:if test="key('k-group', $label)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]">
-    <div class="indexdiv">
-      <h3>
-        <xsl:value-of select="$label"/>
-      </h3>
-      <dl>
-        <xsl:apply-templates select="key('k-group', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]                             [count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]                             [1])=1]" mode="index-primary">
-          <xsl:sort select="normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;]))" lang="{$sort.lang}"/>
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-        </xsl:apply-templates>
-      </dl>
-    </div>
-  </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx-kosek.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx-kosek.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,109 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:i="urn:cz-kosek:functions:index" xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0" xmlns:func="http://exslt.org/functions" xmlns:k="http://www.isogen.com/functions/com.isogen.saxoni18n.Saxoni18nService" xmlns:exslt="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" extension-element-prefixes="func exslt" exclude-result-prefixes="func exslt i l k" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-<!-- The "kosek" method contributed by Jirka Kosek. -->
-
-<xsl:include href="../common/autoidx-kosek.xsl"/>
-
-<xsl:template name="generate-kosek-index">
-  <xsl:param name="scope" select="(ancestor::book|/)[last()]"/>
-
-  <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
-  <xsl:if test="contains($vendor, 'libxslt')">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kosek' index method does not </xsl:text>
-      <xsl:text>work with the xsltproc XSLT processor.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:if test="contains($vendor, 'Saxonica')">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kosek' index method does not </xsl:text>
-      <xsl:text>work with the Saxon 8 XSLT processor.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:if test="not(function-available('exslt:node-set') or                     function-available('exslt:nodeSet'))">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kosek' index method requires the </xsl:text>
-      <xsl:text>exslt:node-set() function. Use a processor that </xsl:text>
-      <xsl:text>has it, or use a different index method.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:if test="not(function-available('i:group-index'))">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kosek' index method requires the
-</xsl:text>
-      <xsl:text>index extension functions be imported:
-</xsl:text>
-      <xsl:text>  xsl:import href="common/autoidx-kosek.xsl"</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:variable name="role">
-    <xsl:if test="$index.on.role != 0">
-      <xsl:value-of select="@role"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="type">
-    <xsl:if test="$index.on.type != 0">
-      <xsl:value-of select="@type"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="terms" select="//indexterm[count(.|key('group-code', i:group-index(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;]))))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1 and not(@class = 'endofrange')]"/>
-
-  <div class="index">
-    <xsl:apply-templates select="$terms" mode="index-div-kosek">
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort select="i:group-index(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])))" data-type="number"/>
-    </xsl:apply-templates>
-  </div>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-div-kosek">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:variable name="key" select="i:group-index(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])))"/>
-
-  <xsl:variable name="lang">
-    <xsl:call-template name="l10n.language"/>
-  </xsl:variable>
-
-  <xsl:if test="key('group-code', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]">
-    <div class="indexdiv">
-      <h3>
-        <xsl:value-of select="i:group-letter($key)"/>
-      </h3>
-      <dl>
-        <xsl:apply-templates select="key('group-code', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])=1]" mode="index-primary">
-          <xsl:sort select="normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;]))" lang="{$lang}"/>
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-        </xsl:apply-templates>
-      </dl>
-    </div>
-  </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx-ng.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx-ng.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,21 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the DocBook XSL Stylesheet distribution.
-     See ../README or http://docbook.sf.net/ for copyright
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- You should have this directly in your customization file. -->
-<!-- This file is there only to retain backward compatibility. -->
-<xsl:import href="autoidx-kosek.xsl"/>
-<xsl:param name="index.method">kosek</xsl:param>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autoidx.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,588 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exslt="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" extension-element-prefixes="exslt" exclude-result-prefixes="exslt" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-<!-- The "basic" method derived from Jeni Tennison's work. -->
-<!-- The "kosek" method contributed by Jirka Kosek. -->
-<!-- The "kimber" method contributed by Eliot Kimber of Innodata Isogen. -->
-
-<xsl:variable name="kimber.imported" select="0"/>
-<xsl:variable name="kosek.imported" select="0"/>
-
-<xsl:key name="letter" match="indexterm" use="translate(substring(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), 1, 1),'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;','AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-
-<xsl:key name="primary" match="indexterm" use="normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;]))"/>
-
-<xsl:key name="secondary" match="indexterm" use="concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = &quot;&quot;])))"/>
-
-<xsl:key name="tertiary" match="indexterm" use="concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = &quot;&quot;])))"/>
-
-<xsl:key name="endofrange" match="indexterm[@class='endofrange']" use="@startref"/>
-
-<xsl:key name="primary-section" match="indexterm[not(secondary) and not(see)]" use="concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, generate-id((ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()]))"/>
-
-<xsl:key name="secondary-section" match="indexterm[not(tertiary) and not(see)]" use="concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, generate-id((ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()]))"/>
-
-<xsl:key name="tertiary-section" match="indexterm[not(see)]" use="concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, generate-id((ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()]))"/>
-
-<xsl:key name="see-also" match="indexterm[seealso]" use="concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, seealso)"/>
-
-<xsl:key name="see" match="indexterm[see]" use="concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, see)"/>
-
-<xsl:key name="sections" match="*[@id or @xml:id]" use="@id|@xml:id"/>
-
-
-<xsl:template name="generate-index">
-  <xsl:param name="scope" select="(ancestor::book|/)[last()]"/>
-
-  <xsl:choose>
-    <xsl:when test="$index.method = 'kosek'">
-      <xsl:call-template name="generate-kosek-index">
-        <xsl:with-param name="scope" select="$scope"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$index.method = 'kimber'">
-      <xsl:call-template name="generate-kimber-index">
-        <xsl:with-param name="scope" select="$scope"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:call-template name="generate-basic-index">
-        <xsl:with-param name="scope" select="$scope"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-      
-<xsl:template name="generate-basic-index">
-  <xsl:param name="scope" select="NOTANODE"/>
-
-  <xsl:variable name="role">
-    <xsl:if test="$index.on.role != 0">
-      <xsl:value-of select="@role"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="type">
-    <xsl:if test="$index.on.type != 0">
-      <xsl:value-of select="@type"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="terms" select="//indexterm                         [count(.|key('letter',                           translate(substring(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), 1, 1),                              'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;',                              'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ'))                           [count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1                           and not(@class = 'endofrange')]"/>
-
-  <xsl:variable name="alphabetical" select="$terms[contains(concat('Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ'),                                         substring(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), 1, 1))]"/>
-
-  <xsl:variable name="others" select="$terms[not(contains(concat('Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;',                                                  'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ'),                                              substring(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), 1, 1)))]"/>
-  <div class="index">
-    <xsl:if test="$others">
-      <div class="indexdiv">
-        <h3>
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'index symbols'"/>
-          </xsl:call-template>
-        </h3>
-        <dl>
-          <xsl:apply-templates select="$others[count(.|key('primary',                                        normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]" mode="index-symbol-div">
-            <xsl:with-param name="position" select="position()"/>                                
-            <xsl:with-param name="scope" select="$scope"/>
-            <xsl:with-param name="role" select="$role"/>
-            <xsl:with-param name="type" select="$type"/>
-            <xsl:sort select="translate(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), 'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-          </xsl:apply-templates>
-        </dl>
-      </div>
-    </xsl:if>
-
-    <xsl:apply-templates select="$alphabetical[count(.|key('letter',                                  translate(substring(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), 1, 1),                                            'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;','AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ'))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]" mode="index-div-basic">
-      <xsl:with-param name="position" select="position()"/>
-      <xsl:with-param name="scope" select="$scope"/>
-      <xsl:with-param name="role" select="$role"/>
-      <xsl:with-param name="type" select="$type"/>
-      <xsl:sort select="translate(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), 'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-    </xsl:apply-templates>
-  </div>
-</xsl:template>
-
-<!-- This template not used if html/autoidx-kosek.xsl is imported -->
-<xsl:template name="generate-kosek-index">
-  <xsl:param name="scope" select="NOTANODE"/>
-
-  <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
-  <xsl:if test="contains($vendor, 'libxslt')">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kosek' index method does not </xsl:text>
-      <xsl:text>work with the xsltproc XSLT processor.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-
-  <xsl:if test="not(function-available('exslt:node-set') or                     function-available('exslt:nodeSet'))">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kosek' index method requires the </xsl:text>
-      <xsl:text>exslt:node-set() function. Use a processor that </xsl:text>
-      <xsl:text>has it, or use a different index method.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:if test="$kosek.imported = 0">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kosek' index method requires the
-</xsl:text>
-      <xsl:text>kosek index extensions be imported:
-</xsl:text>
-      <xsl:text>  xsl:import href="html/autoidx-kosek.xsl"</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-</xsl:template>
-
-<!-- This template not used if html/autoidx-kimber.xsl is imported -->
-<xsl:template name="generate-kimber-index">
-  <xsl:param name="scope" select="NOTANODE"/>
-
-  <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
-  <xsl:if test="not(contains($vendor, 'SAXON '))">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kimber' index method requires the </xsl:text>
-      <xsl:text>Saxon version 6 or 8 XSLT processor.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:if test="$kimber.imported = 0">
-    <xsl:message terminate="yes">
-      <xsl:text>ERROR: the 'kimber' index method requires the
-</xsl:text>
-      <xsl:text>kimber index extensions be imported:
-</xsl:text>
-      <xsl:text>  xsl:import href="html/autoidx-kimber.xsl"</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-div-basic">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:variable name="key" select="translate(substring(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), 1, 1),                          'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;','AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-
-  <xsl:if test="key('letter', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]                 [count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]">
-    <div class="indexdiv">
-      <xsl:if test="contains(concat('Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ'), $key)">
-        <h3>
-          <xsl:value-of select="translate($key, 'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-        </h3>
-      </xsl:if>
-      <dl>
-        <xsl:apply-templates select="key('letter', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]                                      [count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])))                                      [count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])=1]" mode="index-primary">
-          <xsl:with-param name="position" select="position()"/>
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-          <xsl:sort select="translate(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), 'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-        </xsl:apply-templates>
-      </dl>
-    </div>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-symbol-div">
-  <xsl:param name="scope" select="/"/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:variable name="key" select="translate(substring(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), 1, 1),                                              'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;','AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-
-  <xsl:apply-templates select="key('letter', $key)                                [count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][count(.|key('primary', normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])))[1]) = 1]" mode="index-primary">
-    <xsl:with-param name="position" select="position()"/>
-    <xsl:with-param name="scope" select="$scope"/>
-    <xsl:with-param name="role" select="$role"/>
-    <xsl:with-param name="type" select="$type"/>
-    <xsl:sort select="translate(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), 'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-primary">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:variable name="key" select="normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;]))"/>
-  <xsl:variable name="refs" select="key('primary', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]"/>
-  <dt>
-    <xsl:value-of select="primary"/>
-    <xsl:for-each select="$refs[generate-id() = generate-id(key('primary-section', concat($key, &quot; &quot;, generate-id((ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]">
-      <xsl:apply-templates select="." mode="reference">
-        <xsl:with-param name="position" select="position()"/>
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-      </xsl:apply-templates>
-    </xsl:for-each>
-
-    <xsl:if test="$refs[not(secondary)]/*[self::see]">
-      <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, &quot; &quot;, &quot; &quot;, see))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]" mode="index-see">
-        <xsl:with-param name="position" select="position()"/>
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-        <xsl:sort select="translate(see, 'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-      </xsl:apply-templates>
-    </xsl:if>
-  </dt>
-  <xsl:if test="$refs/secondary or $refs[not(secondary)]/*[self::seealso]">
-    <dd>
-      <dl>
-        <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, &quot; &quot;, &quot; &quot;, seealso))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]" mode="index-seealso">
-          <xsl:with-param name="position" select="position()"/>
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-          <xsl:sort select="translate(seealso, 'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-        </xsl:apply-templates>
-        <xsl:apply-templates select="$refs[secondary and count(.|key('secondary', concat($key, &quot; &quot;, normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = &quot;&quot;]))))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]" mode="index-secondary">
-          <xsl:with-param name="position" select="position()"/>
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-          <xsl:sort select="translate(normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = &quot;&quot;])), 'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-        </xsl:apply-templates>
-      </dl>
-    </dd>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-secondary">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:variable name="key" select="concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = &quot;&quot;])))"/>
-  <xsl:variable name="refs" select="key('secondary', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]"/>
-  <dt>
-    <xsl:value-of select="secondary"/>
-    <xsl:for-each select="$refs[generate-id() = generate-id(key('secondary-section', concat($key, &quot; &quot;, generate-id((ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]">
-      <xsl:apply-templates select="." mode="reference">
-        <xsl:with-param name="position" select="position()"/>
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-      </xsl:apply-templates>
-    </xsl:for-each>
-
-    <xsl:if test="$refs[not(tertiary)]/*[self::see]">
-      <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, &quot; &quot;, see))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]" mode="index-see">
-        <xsl:with-param name="position" select="position()"/>
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-        <xsl:sort select="translate(see, 'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-      </xsl:apply-templates>
-    </xsl:if>
-  </dt>
-  <xsl:if test="$refs/tertiary or $refs[not(tertiary)]/*[self::seealso]">
-    <dd>
-      <dl>
-        <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, &quot; &quot;, seealso))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]" mode="index-seealso">
-          <xsl:with-param name="position" select="position()"/>
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-          <xsl:sort select="translate(seealso, 'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-        </xsl:apply-templates>
-        <xsl:apply-templates select="$refs[tertiary and count(.|key('tertiary', concat($key, &quot; &quot;, normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = &quot;&quot;]))))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]) = 1]" mode="index-tertiary">
-          <xsl:with-param name="position" select="position()"/>
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-          <xsl:sort select="translate(normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = &quot;&quot;])), 'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-        </xsl:apply-templates>
-      </dl>
-    </dd>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-tertiary">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:variable name="key" select="concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = &quot;&quot;])))"/>
-  <xsl:variable name="refs" select="key('tertiary', $key)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]"/>
-  <dt>
-    <xsl:value-of select="tertiary"/>
-    <xsl:for-each select="$refs[generate-id() = generate-id(key('tertiary-section', concat($key, &quot; &quot;, generate-id((ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()])))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]">
-      <xsl:apply-templates select="." mode="reference">
-        <xsl:with-param name="position" select="position()"/>
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-      </xsl:apply-templates>
-    </xsl:for-each>
-
-    <xsl:if test="$refs/see">
-      <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see', concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, see))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]" mode="index-see">
-        <xsl:with-param name="position" select="position()"/>
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-        <xsl:sort select="translate(see, 'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-      </xsl:apply-templates>
-    </xsl:if>
-  </dt>
-  <xsl:if test="$refs/seealso">
-    <dd>
-      <dl>
-        <xsl:apply-templates select="$refs[generate-id() = generate-id(key('see-also', concat(normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, normalize-space(concat(tertiary/@sortas, tertiary[not(@sortas) or @sortas = &quot;&quot;])), &quot; &quot;, seealso))[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1])]" mode="index-seealso">
-          <xsl:with-param name="position" select="position()"/>
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-          <xsl:sort select="translate(seealso, 'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-        </xsl:apply-templates>
-      </dl>
-    </dd>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="reference">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-  <xsl:param name="position"/>
-  
-  <xsl:variable name="term.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.term.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="number.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.number.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="range.separator">
-    <xsl:call-template name="index.separator">
-      <xsl:with-param name="key" select="'index.range.separator'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$position = 1">
-      <xsl:value-of select="$term.separator"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$number.separator"/>
-    </xsl:otherwise>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="@zone and string(@zone)">
-      <xsl:call-template name="reference">
-        <xsl:with-param name="zones" select="normalize-space(@zone)"/>
-        <xsl:with-param name="position" select="position()"/>
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <a>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:variable name="title">
-          <xsl:choose>
-            <xsl:when test="(ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()]/titleabbrev and $index.prefer.titleabbrev != 0">
-              <xsl:apply-templates select="(ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()]" mode="titleabbrev.markup"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates select="(ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()]" mode="title.markup"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:variable>
-
-        <xsl:attribute name="href">
-          <xsl:call-template name="href.target">
-            <xsl:with-param name="object" select="(ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()]"/>
-            <xsl:with-param name="context" select="//index[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]"/>
-          </xsl:call-template>
-        </xsl:attribute>
-
-        <xsl:value-of select="$title"/> <!-- text only -->
-      </a>
-
-      <xsl:variable name="id" select="(@id|@xml:id)[1]"/>
-      <xsl:if test="key('endofrange', $id)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]">
-        <xsl:apply-templates select="key('endofrange', $id)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][last()]" mode="reference">
-          <xsl:with-param name="position" select="position()"/>
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:with-param name="role" select="$role"/>
-          <xsl:with-param name="type" select="$type"/>
-          <xsl:with-param name="separator" select="$range.separator"/>
-        </xsl:apply-templates>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="reference">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-  <xsl:param name="zones"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($zones, ' ')">
-      <xsl:variable name="zone" select="substring-before($zones, ' ')"/>
-      <xsl:variable name="target" select="key('sections', $zone)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]"/>
-
-      <a>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:attribute name="href">
-          <xsl:call-template name="href.target">
-            <xsl:with-param name="object" select="$target[1]"/>
-            <xsl:with-param name="context" select="//index[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:apply-templates select="$target[1]" mode="index-title-content"/>
-      </a>
-      <xsl:text>, </xsl:text>
-      <xsl:call-template name="reference">
-        <xsl:with-param name="zones" select="substring-after($zones, ' ')"/>
-        <xsl:with-param name="position" select="position()"/>
-        <xsl:with-param name="scope" select="$scope"/>
-        <xsl:with-param name="role" select="$role"/>
-        <xsl:with-param name="type" select="$type"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="zone" select="$zones"/>
-      <xsl:variable name="target" select="key('sections', $zone)[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))]"/>
-
-      <a>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:attribute name="href">
-          <xsl:call-template name="href.target">
-            <xsl:with-param name="object" select="$target[1]"/>
-            <xsl:with-param name="context" select="//index[count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))][1]"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:apply-templates select="$target[1]" mode="index-title-content"/>
-      </a>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-see">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:text> (</xsl:text>
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key" select="'see'"/>
-  </xsl:call-template>
-  <xsl:text> </xsl:text>
-  <xsl:value-of select="see"/>
-  <xsl:text>)</xsl:text>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="index-seealso">
-  <xsl:param name="scope" select="."/>
-  <xsl:param name="role" select="''"/>
-  <xsl:param name="type" select="''"/>
-
-  <xsl:for-each select="seealso">
-    <xsl:sort select="translate(., 'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ')"/>
-    <dt>
-    <xsl:text>(</xsl:text>
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="'seealso'"/>
-    </xsl:call-template>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="."/>
-    <xsl:text>)</xsl:text>
-    </dt>
-  </xsl:for-each>
-</xsl:template>
-
-<xsl:template match="*" mode="index-title-content">
-  <xsl:variable name="title">
-    <xsl:apply-templates select="(ancestor-or-self::set|ancestor-or-self::book|ancestor-or-self::part|ancestor-or-self::reference|ancestor-or-self::partintro|ancestor-or-self::chapter|ancestor-or-self::appendix|ancestor-or-self::preface|ancestor-or-self::article|ancestor-or-self::section|ancestor-or-self::sect1|ancestor-or-self::sect2|ancestor-or-self::sect3|ancestor-or-self::sect4|ancestor-or-self::sect5|ancestor-or-self::refentry|ancestor-or-self::refsect1|ancestor-or-self::refsect2|ancestor-or-self::refsect3|ancestor-or-self::simplesect|ancestor-or-self::bibliography|ancestor-or-self::glossary|ancestor-or-self::index|ancestor-or-self::webpage)[last()]" mode="title.markup"/>
-  </xsl:variable>
-
-  <xsl:value-of select="$title"/>
-</xsl:template>
-
-<xsl:template name="index.separator">
-  <xsl:param name="key" select="''"/>
-  <xsl:param name="lang">
-    <xsl:call-template name="l10n.language"/>
-  </xsl:param>
-
-  <xsl:choose>
-    <xsl:when test="$key = 'index.term.separator'">
-      <xsl:choose>
-        <!-- Use the override if not blank -->
-        <xsl:when test="$index.term.separator != ''">
-          <xsl:copy-of select="$index.term.separator"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="gentext.template">
-            <xsl:with-param name="lang" select="$lang"/>
-            <xsl:with-param name="context">index</xsl:with-param>
-            <xsl:with-param name="name">term-separator</xsl:with-param>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="$key = 'index.number.separator'">
-      <xsl:choose>
-        <!-- Use the override if not blank -->
-        <xsl:when test="$index.number.separator != ''">
-          <xsl:copy-of select="$index.number.separator"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="gentext.template">
-            <xsl:with-param name="lang" select="$lang"/>
-            <xsl:with-param name="context">index</xsl:with-param>
-            <xsl:with-param name="name">number-separator</xsl:with-param>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="$key = 'index.range.separator'">
-      <xsl:choose>
-        <!-- Use the override if not blank -->
-        <xsl:when test="$index.range.separator != ''">
-          <xsl:copy-of select="$index.range.separator"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="gentext.template">
-            <xsl:with-param name="lang" select="$lang"/>
-            <xsl:with-param name="context">index</xsl:with-param>
-            <xsl:with-param name="name">range-separator</xsl:with-param>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autotoc.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/autotoc.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,632 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:variable name="toc.listitem.type">
-  <xsl:choose>
-    <xsl:when test="$toc.list.type = 'dl'">dt</xsl:when>
-    <xsl:otherwise>li</xsl:otherwise>
-  </xsl:choose>
-</xsl:variable>
-
-<!-- this is just hack because dl and ul aren't completely isomorphic -->
-<xsl:variable name="toc.dd.type">
-  <xsl:choose>
-    <xsl:when test="$toc.list.type = 'dl'">dd</xsl:when>
-    <xsl:otherwise/>
-  </xsl:choose>
-</xsl:variable>
-
-<xsl:template name="make.toc">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:param name="toc.title.p" select="true()"/>
-  <xsl:param name="nodes" select="/NOT-AN-ELEMENT"/>
-
-  <xsl:variable name="nodes.plus" select="$nodes | qandaset"/>
-
-  <xsl:variable name="toc.title">
-    <xsl:if test="$toc.title.p">
-      <p>
-        <b>
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key">TableofContents</xsl:with-param>
-          </xsl:call-template>
-        </b>
-      </p>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$manual.toc != ''">
-      <xsl:variable name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:variable>
-      <xsl:variable name="toc" select="document($manual.toc, .)"/>
-      <xsl:variable name="tocentry" select="$toc//tocentry[@linkend=$id]"/>
-      <xsl:if test="$tocentry and $tocentry/*">
-        <div class="toc">
-          <xsl:copy-of select="$toc.title"/>
-          <xsl:element name="{$toc.list.type}" namespace="http://www.w3.org/1999/xhtml">
-            <xsl:call-template name="manual-toc">
-              <xsl:with-param name="tocentry" select="$tocentry/*[1]"/>
-            </xsl:call-template>
-          </xsl:element>
-        </div>
-      </xsl:if>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$qanda.in.toc != 0">
-          <xsl:if test="$nodes.plus">
-            <div class="toc">
-              <xsl:copy-of select="$toc.title"/>
-              <xsl:element name="{$toc.list.type}" namespace="http://www.w3.org/1999/xhtml">
-                <xsl:apply-templates select="$nodes.plus" mode="toc">
-                  <xsl:with-param name="toc-context" select="$toc-context"/>
-                </xsl:apply-templates>
-              </xsl:element>
-            </div>
-          </xsl:if>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:if test="$nodes">
-            <div class="toc">
-              <xsl:copy-of select="$toc.title"/>
-              <xsl:element name="{$toc.list.type}" namespace="http://www.w3.org/1999/xhtml">
-                <xsl:apply-templates select="$nodes" mode="toc">
-                  <xsl:with-param name="toc-context" select="$toc-context"/>
-                </xsl:apply-templates>
-              </xsl:element>
-            </div>
-          </xsl:if>
-        </xsl:otherwise>
-      </xsl:choose>
-
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="make.lots">
-  <xsl:param name="toc.params" select="''"/>
-  <xsl:param name="toc"/>
-
-  <xsl:if test="contains($toc.params, 'toc')">
-    <xsl:copy-of select="$toc"/>
-  </xsl:if>
-
-  <xsl:if test="contains($toc.params, 'figure')">
-    <xsl:call-template name="list.of.titles">
-      <xsl:with-param name="titles" select="'figure'"/>
-      <xsl:with-param name="nodes" select=".//figure"/>
-    </xsl:call-template>
-  </xsl:if>
-
-  <xsl:if test="contains($toc.params, 'table')">
-    <xsl:call-template name="list.of.titles">
-      <xsl:with-param name="titles" select="'table'"/>
-      <xsl:with-param name="nodes" select=".//table"/>
-    </xsl:call-template>
-  </xsl:if>
-
-  <xsl:if test="contains($toc.params, 'example')">
-    <xsl:call-template name="list.of.titles">
-      <xsl:with-param name="titles" select="'example'"/>
-      <xsl:with-param name="nodes" select=".//example"/>
-    </xsl:call-template>
-  </xsl:if>
-
-  <xsl:if test="contains($toc.params, 'equation')">
-    <xsl:call-template name="list.of.titles">
-      <xsl:with-param name="titles" select="'equation'"/>
-      <xsl:with-param name="nodes" select=".//equation[title or info/title]"/>
-    </xsl:call-template>
-  </xsl:if>
-
-  <xsl:if test="contains($toc.params, 'procedure')">
-    <xsl:call-template name="list.of.titles">
-      <xsl:with-param name="titles" select="'procedure'"/>
-      <xsl:with-param name="nodes" select=".//procedure[title]"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<!-- ====================================================================== -->
-
-<xsl:template name="set.toc">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:param name="toc.title.p" select="true()"/>
-
-  <xsl:call-template name="make.toc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-    <xsl:with-param name="toc.title.p" select="$toc.title.p"/>
-    <xsl:with-param name="nodes" select="book|setindex"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="division.toc">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:param name="toc.title.p" select="true()"/>
-
-  <xsl:call-template name="make.toc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-    <xsl:with-param name="toc.title.p" select="$toc.title.p"/>
-    <xsl:with-param name="nodes" select="part|reference                                          |preface|chapter|appendix                                          |article                                          |bibliography|glossary|index                                          |refentry                                          |bridgehead[$bridgehead.in.toc != 0]"/>
-
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="component.toc">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:param name="toc.title.p" select="true()"/>
-
-  <xsl:call-template name="make.toc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-    <xsl:with-param name="toc.title.p" select="$toc.title.p"/>
-    <xsl:with-param name="nodes" select="section|sect1                                          |simplesect[$simplesect.in.toc != 0]                                          |refentry                                          |article|bibliography|glossary                                          |appendix|index                                          |bridgehead[not(@renderas)                                                      and $bridgehead.in.toc != 0]                                          |.//bridgehead[@renderas='sect1'                                                         and $bridgehead.in.toc != 0]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="component.toc.separator">
-  <!-- Customize to output something between
-       component.toc and first output -->
-</xsl:template>
-
-<xsl:template name="section.toc">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:param name="toc.title.p" select="true()"/>
-
-  <xsl:call-template name="make.toc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-    <xsl:with-param name="toc.title.p" select="$toc.title.p"/>
-    <xsl:with-param name="nodes" select="section|sect1|sect2|sect3|sect4|sect5|refentry                            |bridgehead[$bridgehead.in.toc != 0]"/>
-
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="section.toc.separator">
-  <!-- Customize to output something between
-       section.toc and first output -->
-</xsl:template>
-<!-- ==================================================================== -->
-
-<xsl:template name="subtoc">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:param name="nodes" select="NOT-AN-ELEMENT"/>
-
-  <xsl:variable name="nodes.plus" select="$nodes | qandaset"/>
-
-  <xsl:variable name="subtoc">
-    <xsl:element name="{$toc.list.type}" namespace="http://www.w3.org/1999/xhtml">
-      <xsl:choose>
-        <xsl:when test="$qanda.in.toc != 0">
-          <xsl:apply-templates mode="toc" select="$nodes.plus">
-            <xsl:with-param name="toc-context" select="$toc-context"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates mode="toc" select="$nodes">
-            <xsl:with-param name="toc-context" select="$toc-context"/>
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:element>
-  </xsl:variable>
-
-  <xsl:variable name="depth">
-    <xsl:choose>
-      <xsl:when test="local-name(.) = 'section'">
-        <xsl:value-of select="count(ancestor::section) + 1"/>
-      </xsl:when>
-      <xsl:when test="local-name(.) = 'sect1'">1</xsl:when>
-      <xsl:when test="local-name(.) = 'sect2'">2</xsl:when>
-      <xsl:when test="local-name(.) = 'sect3'">3</xsl:when>
-      <xsl:when test="local-name(.) = 'sect4'">4</xsl:when>
-      <xsl:when test="local-name(.) = 'sect5'">5</xsl:when>
-      <xsl:when test="local-name(.) = 'refsect1'">1</xsl:when>
-      <xsl:when test="local-name(.) = 'refsect2'">2</xsl:when>
-      <xsl:when test="local-name(.) = 'refsect3'">3</xsl:when>
-      <xsl:when test="local-name(.) = 'simplesect'">
-        <!-- sigh... -->
-        <xsl:choose>
-          <xsl:when test="local-name(..) = 'section'">
-            <xsl:value-of select="count(ancestor::section)"/>
-          </xsl:when>
-          <xsl:when test="local-name(..) = 'sect1'">2</xsl:when>
-          <xsl:when test="local-name(..) = 'sect2'">3</xsl:when>
-          <xsl:when test="local-name(..) = 'sect3'">4</xsl:when>
-          <xsl:when test="local-name(..) = 'sect4'">5</xsl:when>
-          <xsl:when test="local-name(..) = 'sect5'">6</xsl:when>
-          <xsl:when test="local-name(..) = 'refsect1'">2</xsl:when>
-          <xsl:when test="local-name(..) = 'refsect2'">3</xsl:when>
-          <xsl:when test="local-name(..) = 'refsect3'">4</xsl:when>
-          <xsl:otherwise>1</xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>0</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="depth.from.context" select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-
-  <xsl:variable name="subtoc.list">
-    <xsl:choose>
-      <xsl:when test="$toc.dd.type = ''">
-        <xsl:copy-of select="$subtoc"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:element name="{$toc.dd.type}" namespace="http://www.w3.org/1999/xhtml">
-          <xsl:copy-of select="$subtoc"/>
-        </xsl:element>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:element name="{$toc.listitem.type}" namespace="http://www.w3.org/1999/xhtml">
-    <xsl:call-template name="toc.line">
-      <xsl:with-param name="toc-context" select="$toc-context"/>
-    </xsl:call-template>
-    <xsl:if test="$toc.listitem.type = 'li'                   and $toc.section.depth &gt; $depth and                    ( ($qanda.in.toc = 0 and count($nodes)&gt;0) or                     ($qanda.in.toc != 0 and count($nodes.plus)&gt;0) )                   and $toc.max.depth &gt; $depth.from.context">
-      <xsl:copy-of select="$subtoc.list"/>
-    </xsl:if>
-  </xsl:element>
-  <xsl:if test="$toc.listitem.type != 'li'                 and $toc.section.depth &gt; $depth and                  ( ($qanda.in.toc = 0 and count($nodes)&gt;0) or                   ($qanda.in.toc != 0 and count($nodes.plus)&gt;0) )                 and $toc.max.depth &gt; $depth.from.context">
-    <xsl:copy-of select="$subtoc.list"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="toc.line">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:param name="depth" select="1"/>
-  <xsl:param name="depth.from.context" select="8"/>
-
- <span>
-  <xsl:attribute name="class"><xsl:value-of select="local-name(.)"/></xsl:attribute>
-
-  <!-- * if $autotoc.label.in.hyperlink is zero, then output the label -->
-  <!-- * before the hyperlinked title (as the DSSSL stylesheet does) -->
-  <xsl:if test="$autotoc.label.in.hyperlink = 0">
-    <xsl:variable name="label">
-      <xsl:apply-templates select="." mode="label.markup"/>
-    </xsl:variable>
-    <xsl:copy-of select="$label"/>
-    <xsl:if test="$label != ''">
-      <xsl:value-of select="$autotoc.label.separator"/>
-    </xsl:if>
-  </xsl:if>
-
-  <a>
-    <xsl:attribute name="href">
-      <xsl:call-template name="href.target">
-        <xsl:with-param name="context" select="$toc-context"/>
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    
-  <!-- * if $autotoc.label.in.hyperlink is non-zero, then output the label -->
-  <!-- * as part of the hyperlinked title -->
-  <xsl:if test="not($autotoc.label.in.hyperlink = 0)">
-    <xsl:variable name="label">
-      <xsl:apply-templates select="." mode="label.markup"/>
-    </xsl:variable>
-    <xsl:copy-of select="$label"/>
-    <xsl:if test="$label != ''">
-      <xsl:value-of select="$autotoc.label.separator"/>
-    </xsl:if>
-  </xsl:if>
-
-    <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-  </a>
-  </span>
-</xsl:template>
-
-<xsl:template match="book" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:call-template name="subtoc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-    <xsl:with-param name="nodes" select="part|reference                                          |preface|chapter|appendix                                          |article                                          |bibliography|glossary|index                                          |refentry                                          |bridgehead[$bridgehead.in.toc != 0]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="setindex" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <!-- If the setindex tag is not empty, it should be it in the TOC -->
-  <xsl:if test="* or $generate.index != 0">
-    <xsl:call-template name="subtoc">
-      <xsl:with-param name="toc-context" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="part|reference" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:call-template name="subtoc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-    <xsl:with-param name="nodes" select="appendix|chapter|article                                          |index|glossary|bibliography                                          |preface|reference|refentry                                          |bridgehead[$bridgehead.in.toc != 0]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="preface|chapter|appendix|article" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:call-template name="subtoc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-    <xsl:with-param name="nodes" select="section|sect1                                          |simplesect[$simplesect.in.toc != 0]                                          |refentry                                          |glossary|bibliography|index                                          |bridgehead[$bridgehead.in.toc != 0]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="sect1" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:call-template name="subtoc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-    <xsl:with-param name="nodes" select="sect2                                          |bridgehead[$bridgehead.in.toc != 0]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="sect2" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:call-template name="subtoc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-    <xsl:with-param name="nodes" select="sect3                                          |bridgehead[$bridgehead.in.toc != 0]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="sect3" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:call-template name="subtoc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-    <xsl:with-param name="nodes" select="sect4                                          |bridgehead[$bridgehead.in.toc != 0]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="sect4" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:call-template name="subtoc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-    <xsl:with-param name="nodes" select="sect5                                          |bridgehead[$bridgehead.in.toc != 0]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="sect5" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:call-template name="subtoc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="simplesect" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:call-template name="subtoc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="section" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:call-template name="subtoc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-    <xsl:with-param name="nodes" select="section                                          |bridgehead[$bridgehead.in.toc != 0]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="bridgehead" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:if test="$bridgehead.in.toc != 0">
-    <xsl:call-template name="subtoc">
-      <xsl:with-param name="toc-context" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="bibliography|glossary" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:call-template name="subtoc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="index" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <!-- If the index tag is not empty, it should be it in the TOC -->
-  <xsl:if test="* or $generate.index != 0">
-    <xsl:call-template name="subtoc">
-      <xsl:with-param name="toc-context" select="$toc-context"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="refentry" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:variable name="refmeta" select=".//refmeta"/>
-  <xsl:variable name="refentrytitle" select="$refmeta//refentrytitle"/>
-  <xsl:variable name="refnamediv" select=".//refnamediv"/>
-  <xsl:variable name="refname" select="$refnamediv//refname"/>
-  <xsl:variable name="refdesc" select="$refnamediv//refdescriptor"/>
-  <xsl:variable name="title">
-    <xsl:choose>
-      <xsl:when test="$refentrytitle">
-        <xsl:apply-templates select="$refentrytitle[1]" mode="titleabbrev.markup"/>
-      </xsl:when>
-      <xsl:when test="$refdesc">
-        <xsl:apply-templates select="$refdesc" mode="titleabbrev.markup"/>
-      </xsl:when>
-      <xsl:when test="$refname">
-        <xsl:apply-templates select="$refname[1]" mode="titleabbrev.markup"/>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:element name="{$toc.listitem.type}" namespace="http://www.w3.org/1999/xhtml">
-    <span class="refentrytitle">
-      <a>
-        <xsl:attribute name="href">
-          <xsl:call-template name="href.target">
-            <xsl:with-param name="toc-context" select="$toc-context"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:copy-of select="$title"/>
-      </a>
-    </span>
-    <span class="refpurpose">
-      <xsl:if test="$annotate.toc != 0">
-        <!-- * DocBook 5 says inlinemediaobject (among other things) -->
-        <!-- * is allowed in refpurpose; so we need to run -->
-        <!-- * apply-templates on refpurpose here, instead of value-of  -->
-        <xsl:apply-templates select="refnamediv/refpurpose"/>
-      </xsl:if>
-    </span>
-  </xsl:element>
-</xsl:template>
-
-<xsl:template match="title" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <a>
-    <xsl:attribute name="href">
-      <xsl:call-template name="href.target">
-        <xsl:with-param name="object" select=".."/>
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:apply-templates/>
-  </a>
-</xsl:template>
-
-<xsl:template name="manual-toc">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:param name="tocentry"/>
-
-  <!-- be careful, we don't want to change the current document to the other tree! -->
-
-  <xsl:if test="$tocentry">
-    <xsl:variable name="node" select="key('id', $tocentry/@linkend)"/>
-
-    <xsl:element name="{$toc.listitem.type}" namespace="http://www.w3.org/1999/xhtml">
-      <xsl:variable name="label">
-        <xsl:apply-templates select="$node" mode="label.markup"/>
-      </xsl:variable>
-      <xsl:copy-of select="$label"/>
-      <xsl:if test="$label != ''">
-        <xsl:value-of select="$autotoc.label.separator"/>
-      </xsl:if>
-      <a>
-        <xsl:attribute name="href">
-          <xsl:call-template name="href.target">
-            <xsl:with-param name="object" select="$node"/>
-            <xsl:with-param name="toc-context" select="$toc-context"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:apply-templates select="$node" mode="titleabbrev.markup"/>
-      </a>
-    </xsl:element>
-
-    <xsl:if test="$tocentry/*">
-      <xsl:element name="{$toc.list.type}" namespace="http://www.w3.org/1999/xhtml">
-        <xsl:call-template name="manual-toc">
-          <xsl:with-param name="tocentry" select="$tocentry/*[1]"/>
-        </xsl:call-template>
-      </xsl:element>
-    </xsl:if>
-
-    <xsl:if test="$tocentry/following-sibling::*">
-      <xsl:call-template name="manual-toc">
-        <xsl:with-param name="tocentry" select="$tocentry/following-sibling::*[1]"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="list.of.titles">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:param name="titles" select="'table'"/>
-  <xsl:param name="nodes" select=".//table"/>
-
-  <xsl:if test="$nodes">
-    <div class="list-of-{$titles}s">
-      <p>
-        <b>
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key">
-              <xsl:choose>
-                <xsl:when test="$titles='table'">ListofTables</xsl:when>
-                <xsl:when test="$titles='figure'">ListofFigures</xsl:when>
-                <xsl:when test="$titles='equation'">ListofEquations</xsl:when>
-                <xsl:when test="$titles='example'">ListofExamples</xsl:when>
-                <xsl:when test="$titles='procedure'">ListofProcedures</xsl:when>
-                <xsl:otherwise>ListofUnknown</xsl:otherwise>
-              </xsl:choose>
-            </xsl:with-param>
-          </xsl:call-template>
-        </b>
-      </p>
-
-      <xsl:element name="{$toc.list.type}" namespace="http://www.w3.org/1999/xhtml">
-        <xsl:apply-templates select="$nodes" mode="toc">
-          <xsl:with-param name="toc-context" select="$toc-context"/>
-        </xsl:apply-templates>
-      </xsl:element>
-    </div>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="figure|table|example|equation|procedure" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:element name="{$toc.listitem.type}" namespace="http://www.w3.org/1999/xhtml">
-    <xsl:variable name="label">
-      <xsl:apply-templates select="." mode="label.markup"/>
-    </xsl:variable>
-    <xsl:copy-of select="$label"/>
-    <xsl:if test="$label != ''">
-      <xsl:value-of select="$autotoc.label.separator"/>
-    </xsl:if>
-    <a>
-      <xsl:attribute name="href">
-        <xsl:call-template name="href.target">
-          <xsl:with-param name="toc-context" select="$toc-context"/>
-        </xsl:call-template>
-      </xsl:attribute>
-      <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-    </a>
-  </xsl:element>
-</xsl:template>
-
-<!-- Used only if qanda.in.toc parameter is non-zero -->
-<xsl:template match="qandaset" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-  <xsl:call-template name="subtoc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-    <xsl:with-param name="nodes" select="qandadiv | qandaentry"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="qandadiv|qandaentry" mode="toc">
-  <xsl:apply-templates select="." mode="qandatoc.mode"/>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/biblio-iso690.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/biblio-iso690.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,1300 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     The original code for processing bibliography in ISO690 style
-     was provided by Jana Dvorakova <jana4u@seznam.cz>
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!-- if biblioentry.alt.primary.seps is set to nonzero value then use alternative separators for primary responsibility - $alt.person.two.sep, $alt.person.last.sep, $alt.person.more.sep  -->
-<xsl:param name="biblioentry.alt.primary.seps" select="0"/>
-
-<!-- how many authors will be printed if there is more than three authors - set to number 1 (default value), 2 or 3 -->
-<xsl:param name="biblioentry.primary.count" select="1"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="iso690.makecitation">
-<!-- Types of resources -->
-  <xsl:choose>
-
-    <!-- SYSTEMS OF ELECTRONIC COMMUNICATION : ENTIRE MESSAGE SYSTEM -->
-    <!-- same as Monographs -->
-    <xsl:when test="./@role='messagesystem'">
-      <xsl:call-template name="iso690.monogr"/>
-    </xsl:when>
-
-    <!-- SYSTEMS OF ELECTRONIC COMMUNICATION : ELECTRONIC MESSAGES -->
-    <!-- same as Contributions to Monographs -->
-    <xsl:when test="./@role='message'">
-      <xsl:call-template name="iso690.paper.mon"/>
-    </xsl:when>
-
-    <!-- SERIALS -->
-    <xsl:when test="./@role='serial' or ./biblioid/@class='issn' or ./issn">
-      <xsl:call-template name="iso690.serial"/>
-    </xsl:when>
-
-    <!-- PARTS OF MONOGRAPHS -->
-    <xsl:when test="./@role='part' or (./bibliomisc[@role='secnum']|./bibliomisc[@role='sectitle'])">
-      <xsl:call-template name="iso690.monogr.part"/>
-    </xsl:when>
-
-    <!-- CONTRIBUTIONS TO MONOGRAPHS -->
-    <xsl:when test="./@role='contribution' or (./biblioset/@relation='part' and ./biblioset/@relation='book')">
-      <xsl:call-template name="iso690.paper.mon"/>
-    </xsl:when>
-
-    <!-- ARTICLES, ETC., IN SERIALS -->
-    <xsl:when test="./@role='article' or (./biblioset/@relation='journal' and ./biblioset/@relation='article')">
-      <xsl:call-template name="iso690.article"/>
-    </xsl:when>
-
-    <!-- PATENT DOCUMENTS -->
-    <xsl:when test="./@role='patent' or (./bibliomisc[@role='patenttype'] and ./bibliomisc[@role='patentnum'])">
-      <xsl:call-template name="iso690.patent"/>
-    </xsl:when>
-
-    <!-- MONOGRAPHS -->
-    <xsl:otherwise>
-      <xsl:call-template name="iso690.monogr"/>
-    </xsl:otherwise>
-
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- MONOGRAPHS -->
-<xsl:template name="iso690.monogr">
-  <!-- Primary responsibility -->
-  <xsl:call-template name="iso690.primary"/>
-  <!-- Title and Type of medium -->
-  <xsl:call-template name="iso690.title"/>
-  <!-- Subordinate responsibility -->
-  <xsl:call-template name="iso690.secondary"/>
-  <!-- Edition -->
-  <xsl:call-template name="iso690.edition"/>
-  <!-- Place of publication, Publisher, Year/Date of publication, Date of update/revision, Date of citation -->
-  <xsl:call-template name="iso690.pub"/>
-  <!-- Extent -->
-  <xsl:call-template name="iso690.extent"/>
-  <!-- Series -->
-  <xsl:call-template name="iso690.serie"/>
-  <!-- Notes -->
-  <xsl:call-template name="iso690.notice"/>
-  <!-- Avaibility and access -->
-  <xsl:call-template name="iso690.access"/>
-  <!-- Standard number -->
-  <xsl:call-template name="iso690.isbn"/>
-</xsl:template>
-
-<!-- SERIALS -->
-<xsl:template name="iso690.serial">
-  <!-- Title and Type of medium -->
-  <xsl:call-template name="iso690.title"/>
-  <!-- Responsibility [nonEL] -->
-  <xsl:if test="not(./bibliomisc[@role='medium'])">
-    <xsl:call-template name="iso690.secondary"/>
-  </xsl:if>
-  <!-- Edition -->
-  <xsl:call-template name="iso690.edition">
-    <xsl:with-param name="after" select="./bibliomisc[@role='issuing']"/>
-  </xsl:call-template>
-  <!-- Issue designation (date and/or num) [nonEL] -->
-  <xsl:if test="not(./bibliomisc[@role='medium'])">
-    <xsl:call-template name="iso690.issuing"/>
-  </xsl:if>
-  <!-- Place of publication, Publisher, Year/Date of publication, Date of update/revision, Date of citation -->
-  <xsl:call-template name="iso690.pub"/>
-  <!-- Series -->
-  <xsl:call-template name="iso690.serie"/>
-  <!-- Notes -->
-  <xsl:call-template name="iso690.notice"/>
-  <!-- Avaibility and access -->
-  <xsl:call-template name="iso690.access"/>
-  <!-- Standard number -->
-  <xsl:call-template name="iso690.issn"/>
-</xsl:template>
-
-<!-- PARTS OF MONOGRAPHS -->
-<xsl:template name="iso690.monogr.part">
-  <!-- Primary responsibility of host document -->
-  <xsl:call-template name="iso690.primary"/>
-  <!-- Title and Type of medium of host document -->
-  <xsl:call-template name="iso690.title"/>
-  <!-- Subordinate responsibility of host document [EL] -->
-  <xsl:if test="./bibliomisc[@role='medium']">
-    <xsl:call-template name="iso690.secondary"/>
-  </xsl:if>
-  <!-- Edition -->
-  <xsl:call-template name="iso690.edition">
-    <xsl:with-param name="after" select="./volumenum"/>
-  </xsl:call-template>
-  <!-- Numeration of the part [nonEL]-->
-  <xsl:if test="not(./bibliomisc[@role='medium'])">
-    <xsl:call-template name="iso690.partnr"/>
-  <!-- Subordinate responsibility [nonEL] -->
-    <xsl:call-template name="iso690.secondary"/>
-  </xsl:if>
-  <!-- Place of publication, Publisher, Year/Date of publication, Date of update/revision, Date of citation -->
-  <xsl:call-template name="iso690.pub"/>
-  <!-- Location within host -->
-  <xsl:call-template name="iso690.part.location"/>
-  <xsl:if test="./bibliomisc[@role='medium']">
-  <!-- Numeration within host document [EL] -->
-  <!-- Notes [EL] -->
-    <xsl:call-template name="iso690.notice"/>
-  <!-- Avaibility and access [EL] -->
-    <xsl:call-template name="iso690.access"/>
-  <!-- Standard number [EL] -->
-    <xsl:call-template name="iso690.isbn"/>
-  </xsl:if>
-</xsl:template>
-
-<!-- CONTRIBUTIONS TO MONOGRAPHS -->
-<xsl:template name="iso690.paper.mon">
-<!-- Contribution -->
-  <xsl:apply-templates mode="iso690.paper.part" select="./biblioset[@relation='part']"/>
-<!-- In -->
-  <xsl:text>In </xsl:text>
-<!-- Host -->
-  <xsl:apply-templates mode="iso690.paper.book" select="./biblioset[@relation='book']"/>
-</xsl:template>
-
-<xsl:template match="biblioset" mode="iso690.paper.part">
-<!-- Contribution -->
-  <!-- Primary responsibility -->
-  <xsl:call-template name="iso690.primary"/>
-  <!-- Title -->
-  <xsl:call-template name="iso690.title">
-    <xsl:with-param name="italic" select="0"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="biblioset" mode="iso690.paper.book">
-<!-- Host -->
-  <!-- Primary responsibility -->
-  <xsl:call-template name="iso690.primary"/>
-  <!-- Title and Type of medium -->
-  <xsl:call-template name="iso690.title"/>
-  <!-- Subordinate responsibility [EL] -->
-  <xsl:if test="./bibliomisc[@role='medium']">
-    <xsl:call-template name="iso690.secondary"/>
-  </xsl:if>
-  <!-- Edition -->
-  <xsl:call-template name="iso690.edition"/>
-  <!-- Place of publication, Publisher, Year/Date of publication, Date of update/revision, Date of citation -->
-  <xsl:call-template name="iso690.paper.pub"/>
-  <!-- Numeration within host document [EL] -->
-  <!-- Location within host -->
-  <xsl:call-template name="iso690.location"/>
-  <xsl:if test="./bibliomisc[@role='medium']">
-  <!-- Notes [EL] -->
-    <xsl:call-template name="iso690.notice"/>
-  <!-- Avaibility and access [EL] -->
-    <xsl:call-template name="iso690.access"/>
-  <!-- Standard number [EL] -->
-    <xsl:call-template name="iso690.isbn"/>
-  </xsl:if>
-</xsl:template>
-
-<!-- ARTICLES, ETC., IN SERIALS -->
-<xsl:template name="iso690.article">
-<!-- Article -->
-  <xsl:apply-templates mode="iso690.article.art" select="./biblioset[@relation='article']"/>
-<!-- Serial -->
-  <xsl:apply-templates mode="iso690.article.jour" select="./biblioset[@relation='journal']"/>
-</xsl:template>
-
-<xsl:template match="biblioset" mode="iso690.article.art">
-<!-- Article -->
-  <!-- Primary responsibility -->
-  <xsl:call-template name="iso690.primary"/>
-  <!-- Title -->
-  <xsl:call-template name="iso690.title">
-    <xsl:with-param name="italic" select="0"/>
-  </xsl:call-template>
-  <!-- Subordinate responsibility [nonEL] -->
-  <xsl:if test="not(../*/bibliomisc[@role='medium'])">
-    <xsl:call-template name="iso690.secondary"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="biblioset" mode="iso690.article.jour">
-<!-- Serial -->
-  <!-- Title and Type of medium -->
-  <xsl:call-template name="iso690.title"/>
-  <!-- Edition -->
-  <xsl:call-template name="iso690.edition">
-    <xsl:with-param name="after" select="./pubdate[not(@role='issuing')]|./volumenum|./issuenum|./pagenums"/>
-  </xsl:call-template>
-  <!-- Number designation [EL] -->
-  <!-- Location within host -->
-  <xsl:call-template name="iso690.article.location"/>
-  <xsl:if test="./bibliomisc[@role='medium']">
-  <!-- Notes [EL] -->
-    <xsl:call-template name="iso690.notice"/>
-  <!-- Avaibility and access [EL] -->
-    <xsl:call-template name="iso690.access"/>
-  <!-- Standard number [EL] -->
-    <xsl:call-template name="iso690.issn"/>
-  </xsl:if>
-</xsl:template>
-
-<!-- PATENT DOCUMENTS -->
-<xsl:template name="iso690.patent">
-  <!-- Primary responsibility (applicant) -->
-  <xsl:call-template name="iso690.primary"/>
-  <!-- Title of the invention -->
-  <xsl:call-template name="iso690.title"/>
-  <!-- Subordinate responsibility -->
-  <xsl:call-template name="iso690.secondary"/>
-  <!-- Notes -->
-  <xsl:call-template name="iso690.notice"/>
-  <!-- Identification -->
-  <xsl:call-template name="iso690.pat.ident"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<!-- Elements -->
-
-<!-- Primary responsibility -->
-<xsl:template name="iso690.primary">
-  <xsl:param name="primary.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'primary.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="./authorgroup/author|./author">
-      <xsl:call-template name="iso690.author.list">
-        <xsl:with-param name="person.list" select=".//authorgroup/author|.//author"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="./authorgroup/editor|./editor">
-      <xsl:call-template name="iso690.author.list">
-        <xsl:with-param name="person.list" select=".//authorgroup/editor|.//editor"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="./authorgroup/corpauthor|./corpauthor">
-      <xsl:call-template name="iso690.author.list">
-        <xsl:with-param name="person.list" select=".//authorgroup/corpauthor|.//corpauthor"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:if test="(./firstname)and(./surname)">
-        <xsl:call-template name="iso690.author"/>
-        <xsl:call-template name="iso690.endsep">
-          <xsl:with-param name="text" select="string(./firstname[1])"/>
-          <xsl:with-param name="sep" select="$primary.sep"/>
-        </xsl:call-template>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.author.list">
-  <xsl:param name="person.list" select="author|corpauthor|editor"/>
-  <xsl:param name="person.count" select="count($person.list)"/>
-  <xsl:param name="count" select="1"/>
-  <xsl:param name="group" select="./authorgroup[@role='many']"/>
-  <xsl:param name="many" select="0"/>
-
-  <xsl:param name="primary.many">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'primary.many'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="primary.editor">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'primary.editor'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="primary.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'primary.sep'"/></xsl:call-template>
-  </xsl:param>
-
-  <xsl:choose>
-    <xsl:when test="$count &gt; $person.count"/>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$person.count &lt; 4 and not($group)">
-          <xsl:call-template name="iso690.author">
-            <xsl:with-param name="node" select="$person.list[position()=$count]"/>
-          </xsl:call-template>
-          <xsl:choose>
-            <xsl:when test="$person.count = 2 and $count = 1 and $biblioentry.alt.primary.seps != 0">
-              <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'alt.person.two.sep'"/></xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$person.count = 2 and $count = 1">
-              <xsl:call-template name="gentext.template">
-                <xsl:with-param name="context" select="'authorgroup'"/>
-                <xsl:with-param name="name" select="'sep2'"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$person.count &gt; 2 and $count+1 = $person.count and $biblioentry.alt.primary.seps != 0">
-              <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'alt.person.last.sep'"/></xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$person.count &gt; 2 and $count+1 = $person.count">
-              <xsl:call-template name="gentext.template">
-                <xsl:with-param name="context" select="'authorgroup'"/>
-                <xsl:with-param name="name" select="'seplast'"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$count &lt; $person.count and $biblioentry.alt.primary.seps != 0">
-              <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'alt.person.more.sep'"/></xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$count &lt; $person.count">
-              <xsl:call-template name="gentext.template">
-                <xsl:with-param name="context" select="'authorgroup'"/>
-                <xsl:with-param name="name" select="'sep'"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="($count = $person.count)">
-              <xsl:choose>
-                <xsl:when test="$many!=0">
-                  <xsl:if test="name($person.list[position()=$count])='editor'">
-                    <xsl:value-of select="$primary.editor"/>
-                  </xsl:if>
-                  <xsl:value-of select="$primary.many"/>
-                  <xsl:call-template name="iso690.endsep">
-                    <xsl:with-param name="text" select="$primary.many"/>
-                    <xsl:with-param name="sep" select="$primary.sep"/>
-                  </xsl:call-template>
-                </xsl:when>
-                <xsl:when test="name($person.list[position()=$count])='editor'">
-                  <xsl:value-of select="$primary.editor"/>
-                  <xsl:value-of select="$primary.sep"/>
-                </xsl:when>
-                <xsl:when test="name($person.list[position()=$count])='corpauthor'">
-                  <xsl:call-template name="iso690.endsep">
-                    <xsl:with-param name="text" select="string($person.list[position()=$count])"/>
-                    <xsl:with-param name="sep" select="$primary.sep"/>
-                  </xsl:call-template>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:call-template name="iso690.endsep">
-                    <xsl:with-param name="text" select="string($person.list[position()=$count]//firstname[1])"/>
-                    <xsl:with-param name="sep" select="$primary.sep"/>
-                  </xsl:call-template>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:when>
-          </xsl:choose>
-
-          <xsl:call-template name="iso690.author.list">
-            <xsl:with-param name="person.list" select="$person.list"/>
-            <xsl:with-param name="person.count" select="$person.count"/>
-            <xsl:with-param name="count" select="$count+1"/>
-            <xsl:with-param name="many" select="$many"/>
-            <xsl:with-param name="group"/>
-          </xsl:call-template>
-        </xsl:when>
-
-        <xsl:otherwise>
-          <xsl:choose>
-            <xsl:when test="($biblioentry.primary.count&gt;=3) and ($person.count&gt;=3)">
-              <xsl:call-template name="iso690.author.list">
-                <xsl:with-param name="person.list" select="$person.list[1]|$person.list[2]|$person.list[3]"/>
-                <xsl:with-param name="person.count" select="3"/>
-                <xsl:with-param name="count" select="1"/>
-                <xsl:with-param name="many" select="1"/>
-                <xsl:with-param name="group"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="($biblioentry.primary.count&gt;1) and  ($person.count&gt;1)">
-              <xsl:call-template name="iso690.author.list">
-                <xsl:with-param name="person.list" select="$person.list[1]|$person.list[2]"/>
-                <xsl:with-param name="person.count" select="2"/>
-                <xsl:with-param name="count" select="1"/>
-                <xsl:with-param name="many" select="1"/>
-                <xsl:with-param name="group"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:call-template name="iso690.author.list">
-                <xsl:with-param name="person.list" select="$person.list[1]"/>
-                <xsl:with-param name="person.count" select="1"/>
-                <xsl:with-param name="count" select="1"/>
-                <xsl:with-param name="many" select="1"/>
-                <xsl:with-param name="group"/>
-              </xsl:call-template>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.author">
-  <xsl:param name="node" select="."/>
-  <xsl:param name="lastfirst.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'lastfirst.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="name($node)!='corpauthor'">
-      <span style="text-transform:uppercase">
-        <xsl:apply-templates mode="iso690.mode" select="$node//surname[1]"/>
-      </span>
-      <xsl:if test="$node//surname and $node//firstname">
-        <xsl:value-of select="$lastfirst.sep"/>
-      </xsl:if>
-      <xsl:apply-templates mode="iso690.mode" select="$node//firstname[1]"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <span style="text-transform:uppercase">
-        <xsl:apply-templates mode="iso690.mode" select="$node"/>
-      </span>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="corpauthor|firstname|surname" mode="iso690.mode">
-  <xsl:apply-templates mode="iso690.mode"/>
-</xsl:template>
-
-<!-- Title and Type of medium -->
-<xsl:template name="iso690.title">
-  <xsl:param name="medium" select="./bibliomisc[@role='medium']"/>
-  <xsl:param name="italic" select="1"/>
-  <xsl:param name="sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'title.sep'"/></xsl:call-template>
-  </xsl:param>
-
-  <xsl:apply-templates mode="iso690.mode" select="./title">
-    <xsl:with-param name="medium" select="$medium"/>
-    <xsl:with-param name="italic" select="$italic"/>
-    <xsl:with-param name="sep" select="$sep"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="title" mode="iso690.mode">
-  <xsl:param name="medium"/>
-  <xsl:param name="italic" select="1"/>
-  <xsl:param name="sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'title.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="medium1">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'medium1'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="medium2">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'medium2'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="$italic=1">
-      <xsl:call-template name="iso690.italic.title"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="iso690.make.title"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:if test="$medium">
-    <xsl:value-of select="$medium1"/>
-    <xsl:apply-templates mode="iso690.mode" select="$medium"/>
-    <xsl:value-of select="$medium2"/>
-  </xsl:if>
-  <xsl:call-template name="iso690.endsep">
-    <xsl:with-param name="text" select="concat(string(.),string(../subtitle))"/>
-    <xsl:with-param name="sep" select="$sep"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="iso690.italic.title">
-  <i>
-    <xsl:call-template name="iso690.make.title"/>
-  </i>
-</xsl:template>
-
-<xsl:template name="iso690.make.title">
-  <xsl:param name="submaintitle.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'submaintitle.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:if test="../subtitle">
-    <xsl:value-of select="$submaintitle.sep"/>
-    <xsl:apply-templates mode="iso690.mode" select="../subtitle"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="iso690.mode">
-  <xsl:apply-templates mode="iso690.mode"/>
-</xsl:template>
-
-<xsl:template match="bibliomisc[@role='medium']" mode="iso690.mode">
-  <xsl:apply-templates mode="iso690.mode"/>
-</xsl:template>
-
-<!-- Subordinate responsibility -->
-<xsl:template name="iso690.secondary">
-  <xsl:param name="secondary.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'secondary.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="secondary.person.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'secondary.person.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:for-each select="./bibliomisc[@role='secondary']">
-    <xsl:apply-templates mode="iso690.mode" select="."/>
-    <xsl:choose>
-      <xsl:when test="position()=count(../bibliomisc[@role='secondary'])">
-        <xsl:call-template name="iso690.endsep">
-          <xsl:with-param name="text" select="string(.)"/>
-          <xsl:with-param name="sep" select="$secondary.sep"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$secondary.person.sep"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:for-each>
-</xsl:template>
-
-<xsl:template match="bibliomisc[@role='secondary']" mode="iso690.mode">
-  <xsl:apply-templates mode="iso690.mode"/>
-</xsl:template>
-
-<!-- Edition -->
-<xsl:template name="iso690.edition">
-  <xsl:param name="after"/>
-  <xsl:param name="edition.serial.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'edition.serial.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="string($after)!=''">
-      <xsl:apply-templates mode="iso690.mode" select="./edition">
-        <xsl:with-param name="sep" select="$edition.serial.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="iso690.mode" select="./edition"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="edition" mode="iso690.mode">
-  <xsl:param name="sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'edition.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.endsep">
-    <xsl:with-param name="text" select="string(.)"/>
-    <xsl:with-param name="sep" select="$sep"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- Issue designation (date and/or num) -->
-<xsl:template name="iso690.issuing">
-  <xsl:param name="issuing.div">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.div'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="issuing.range">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.range'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="issuing.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="./pubdate[@role='issuing'] and ./volumenum[2] and ./issuenum[2]">
-      <xsl:call-template name="iso690.issuedate"/>
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum[1]">
-        <xsl:with-param name="sep" select="$issuing.div"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./issuenum[1]">
-        <xsl:with-param name="sep" select="$issuing.range"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum[2]">
-        <xsl:with-param name="sep" select="$issuing.div"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./issuenum[2]">
-        <xsl:with-param name="sep" select="$issuing.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="./pubdate[@role='issuing'] and ./volumenum[2]">
-      <xsl:call-template name="iso690.issuedate"/>
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum[1]">
-        <xsl:with-param name="sep" select="$issuing.range"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum[2]">
-        <xsl:with-param name="sep" select="$issuing.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="./pubdate[@role='issuing'] and ./volumenum and ./issuenum">
-      <xsl:apply-templates mode="iso690.mode" select="./pubdate[@role='issuing']">
-        <xsl:with-param name="sep" select="$issuing.div"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum">
-        <xsl:with-param name="sep" select="$issuing.div"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./issuenum">
-        <xsl:with-param name="sep" select="$issuing.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="./pubdate[@role='issuing']">
-      <xsl:apply-templates mode="iso690.mode" select="./pubdate[@role='issuing']">
-        <xsl:with-param name="sep" select="$issuing.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="./volumenum">
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum">
-        <xsl:with-param name="sep" select="$issuing.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="./issuenum">
-      <xsl:apply-templates mode="iso690.mode" select="./issuenum">
-        <xsl:with-param name="sep" select="$issuing.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.issuedate">
-  <xsl:param name="issuing.div">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.div'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="issuing.range">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.range'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="issuing.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issuing.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="./pubdate[@role='issuing'][2]">
-      <xsl:apply-templates mode="iso690.mode" select="./pubdate[@role='issuing'][1]">
-        <xsl:with-param name="sep" select="$issuing.range"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./pubdate[@role='issuing'][2]">
-        <xsl:with-param name="sep" select="$issuing.div"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="iso690.mode" select="./pubdate[@role='issuing']">
-        <xsl:with-param name="sep" select="$issuing.div"/>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="pubdate[@role='issuing']" mode="iso690.mode">
-  <xsl:param name="sep"/>
-  <xsl:variable name="substr" select="substring(string(.),string-length(string(.)))"/>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.space">
-    <xsl:with-param name="text" select="$substr"/>
-  </xsl:call-template>
-  <xsl:choose>
-    <xsl:when test="$substr='-'">
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="' '"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="string(.)"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- Numeration of the part -->
-<xsl:template name="iso690.partnr">
-  <xsl:param name="partnr.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'partnr.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode" select="./volumenum">
-    <xsl:with-param name="sep" select="$partnr.sep"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<!-- Place of publication, Publisher, Year/Date of publication, Date of update/revision, Date of citation -->
-<xsl:template name="iso690.pub">
-  <xsl:param name="onlydate" select="0"/>
-  <xsl:param name="placesep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'placepubl.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="pubsep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'publyear.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="endsep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'pubinfo.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="(./publisher/publishername|./publishername|./publisher/address/city)and($onlydate=0)and(./pubdate[not(@role='issuing')]|./copyright/year|./date[@role='upd']|./date[@role='upd'])">
-      <xsl:apply-templates mode="iso690.mode" select="./publisher/address/city">
-        <xsl:with-param name="sep" select="$placesep"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./publisher/publishername|./publishername">
-        <xsl:with-param name="sep" select="$pubsep"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]|./copyright/year">
-        <xsl:with-param name="sep" select="$endsep"/>
-      </xsl:apply-templates>
-      <xsl:if test="not(./pubdate[not(@role='issuing')]|./copyright/year)">
-        <xsl:call-template name="iso690.data">
-          <xsl:with-param name="sep" select="$endsep"/>
-        </xsl:call-template>
-      </xsl:if>
-    </xsl:when>
-    <xsl:when test="(./publisher/publishername|./publishername)and(./publisher/address/city)and($onlydate=0)">
-      <xsl:apply-templates mode="iso690.mode" select="./publisher/address/city">
-        <xsl:with-param name="sep" select="$placesep"/>
-      </xsl:apply-templates>
-      <xsl:apply-templates mode="iso690.mode" select="./publisher/publishername|./publishername">
-        <xsl:with-param name="sep" select="$endsep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="($onlydate=1)or(./pubdate[not(@role='issuing')]|./copyright/year)">
-      <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]|./copyright/year">
-        <xsl:with-param name="sep" select="$endsep"/>
-      </xsl:apply-templates>
-      <xsl:if test="$onlydate=1">
-        <xsl:call-template name="iso690.location">
-          <xsl:with-param name="onlypages" select="1"/>
-        </xsl:call-template>
-      </xsl:if>
-    </xsl:when>
-    <xsl:when test="not(./pubdate[not(@role='issuing')]|./copyright/year)">
-      <xsl:call-template name="iso690.data">
-        <xsl:with-param name="sep" select="$endsep"/>
-      </xsl:call-template>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.paper.pub">
-  <xsl:param name="spec.pubinfo.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'spec.pubinfo.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="./volumnum|./issuenum|./pagenums">
-      <xsl:call-template name="iso690.pub">
-        <xsl:with-param name="endsep" select="$spec.pubinfo.sep"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="iso690.pub"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.data">
-  <xsl:param name="sep"/>
-  <xsl:param name="datecit2">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'datecit2'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode" select="./date[@role='upd']">
-    <xsl:with-param name="sep"/>
-  </xsl:apply-templates>
-  <xsl:apply-templates mode="iso690.mode" select="./date[@role='cit']"/>
-  <xsl:choose>
-    <xsl:when test="./date[@role='cit']">
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="$datecit2"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="./date[@role='upd']">
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="string(./date[@role='upd'])"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="publisher/address/city|publishername" mode="iso690.mode">
-  <xsl:param name="sep"/>
-  <xsl:param name="upd" select="0"/>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.endsep">
-    <xsl:with-param name="text" select="string(.)"/>
-    <xsl:with-param name="sep" select="$sep"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="pubdate|copyright/year" mode="iso690.mode">
-  <xsl:param name="sep"/>
-  <xsl:param name="upd" select="1"/>
-  <xsl:param name="datecit2">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'datecit2'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:variable name="substr" select="substring(string(.),string-length(string(.)))"/>
-  <xsl:if test="name(.)!='pubdate'">
-    <xsl:value-of select="'&#169;'"/><!-- copyright -->
-  </xsl:if>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.space">
-    <xsl:with-param name="text" select="$substr"/>
-  </xsl:call-template>
-  <xsl:if test="$upd!=0">
-    <xsl:choose>
-      <xsl:when test="name(.)='pubdate'">
-        <xsl:apply-templates mode="iso690.mode" select="../date[@role='upd']"/>
-        <xsl:apply-templates mode="iso690.mode" select="../date[@role='cit']"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates mode="iso690.mode" select="../../date[@role='upd']"/>
-        <xsl:apply-templates mode="iso690.mode" select="../../date[@role='cit']"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:if>
-  <xsl:choose>
-    <xsl:when test="../date[@role='cit']|../../date[@role='cit'] and $upd!=0">
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="$datecit2"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="../date[@role='upd']|../../date[@role='upd'] and $upd!=0">
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="string(../date[@role='upd'])"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$substr='-'">
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="' '"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="string(.)"/>
-        <xsl:with-param name="sep" select="$sep"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.space">
-  <xsl:param name="text" select="substring(string(.),string-length(string(.)))"/>
-  <xsl:if test="$text='-'">
-    <xsl:value-of select="' '"/>
-  </xsl:if>
-</xsl:template>
-
-<!-- Date of update/revision -->
-<xsl:template match="date[@role='upd']" mode="iso690.mode">
-  <xsl:param name="sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'upd.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:value-of select="$sep"/>
-  <xsl:apply-templates mode="iso690.mode"/>
-</xsl:template>
-
-<!-- Date of citation -->
-<xsl:template match="date[@role='cit']" mode="iso690.mode">
-  <xsl:param name="datecit1">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'datecit1'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="datecit2">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'datecit2'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:value-of select="$datecit1"/>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:value-of select="$datecit2"/>
-</xsl:template>
-
-<!-- Extent -->
-<xsl:template name="iso690.extent">
-  <xsl:param name="extent.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'extent.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode" select="./pagenums">
-    <xsl:with-param name="sep" select="$extent.sep"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<!-- Location within host -->
-<xsl:template name="iso690.part.location">
-  <xsl:param name="location.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'location.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="./pagenums">
-      <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='secnum']"/>
-      <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='sectitle']"/>
-      <xsl:apply-templates mode="iso690.mode" select="./pagenums"/>
-    </xsl:when>
-    <xsl:when test="./bibliomisc[@role='sectitle']">
-      <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='secnum']"/>
-      <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='sectitle']">
-        <xsl:with-param name="sep" select="$location.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='secnum']">
-        <xsl:with-param name="sep" select="$location.sep"/>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.article.location">
-  <xsl:param name="location.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'location.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="locs.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'locs.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="not(./date[@role='upd']|./date[@role='cit'])">
-      <xsl:choose>
-        <xsl:when test="./volumenum|./issuenum|./pagenums">
-          <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]">
-            <xsl:with-param name="upd" select="0"/>
-            <xsl:with-param name="sep" select="$locs.sep"/>
-          </xsl:apply-templates>
-          <xsl:call-template name="iso690.location"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]">
-            <xsl:with-param name="sep" select="$location.sep"/>
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="./volumenum|./issuenum|./pagenums">
-          <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]">
-            <xsl:with-param name="upd" select="0"/>
-            <xsl:with-param name="sep" select="$locs.sep"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]">
-            <xsl:with-param name="upd" select="0"/>
-            <xsl:with-param name="sep" select="$location.sep"/>
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:choose>
-        <xsl:when test="./issuenum">
-          <xsl:apply-templates mode="iso690.mode" select="./volumenum"/>
-          <xsl:apply-templates mode="iso690.mode" select="./issuenum">
-            <xsl:with-param name="sep"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates mode="iso690.mode" select="./volumenum">
-            <xsl:with-param name="sep"/>
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:choose>
-        <xsl:when test="./pagenums">
-          <xsl:call-template name="iso690.data">
-            <xsl:with-param name="sep" select="$locs.sep"/>
-          </xsl:call-template>
-          <xsl:apply-templates mode="iso690.mode" select="./pagenums"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="iso690.data">
-            <xsl:with-param name="sep" select="$location.sep"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="iso690.location">
-  <xsl:param name="location.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'location.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="./volumenum and not(./issuenum) and not(./pagenums)">
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum">
-        <xsl:with-param name="sep" select="$location.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="./issuenum and not(./pagenums)">
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum"/>
-      <xsl:apply-templates mode="iso690.mode" select="./issuenum">
-        <xsl:with-param name="sep" select="$location.sep"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:when test="./pagenums">
-      <xsl:apply-templates mode="iso690.mode" select="./volumenum"/>
-      <xsl:apply-templates mode="iso690.mode" select="./issuenum"/>
-      <xsl:apply-templates mode="iso690.mode" select="./pagenums"/>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="bibliomisc[@role='secnum']|bibliomisc[@role='sectitle']" mode="iso690.mode">
-  <xsl:param name="sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'locs.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.endsep">
-    <xsl:with-param name="text" select="string(.)"/>
-    <xsl:with-param name="sep" select="$sep"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="volumenum|issuenum" mode="iso690.mode">
-  <xsl:param name="sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'locs.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.endsep">
-    <xsl:with-param name="text" select="string(.)"/>
-    <xsl:with-param name="sep" select="$sep"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="pagenums" mode="iso690.mode">
-  <xsl:param name="sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'location.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.endsep">
-    <xsl:with-param name="text" select="string(.)"/>
-    <xsl:with-param name="sep" select="$sep"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- Series -->
-<xsl:template name="iso690.serie">
-  <xsl:apply-templates mode="iso690.mode" select=".//bibliomisc[@role='serie']"/>
-</xsl:template>
-
-<!-- Notes -->
-<xsl:template name="iso690.notice">
-  <xsl:apply-templates mode="iso690.mode" select=".//bibliomisc[not(@role)]"/>
-</xsl:template>
-
-<xsl:template match="bibliomisc[not(@role)]|bibliomisc[@role='serie']" mode="iso690.mode">
-  <xsl:param name="notice.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'notice.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:call-template name="iso690.endsep">
-    <xsl:with-param name="text" select="string(.)"/>
-    <xsl:with-param name="sep" select="$notice.sep"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- Avaibility and access -->
-<xsl:template name="iso690.access">
-  <xsl:for-each select="./biblioid[@class='uri']|./bibliomisc[@role='access']">
-    <xsl:choose>
-      <xsl:when test="position()=1">
-        <xsl:apply-templates mode="iso690.mode" select="."/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates mode="iso690.mode" select=".">
-          <xsl:with-param name="firstacc" select="0"/>
-        </xsl:apply-templates>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:for-each>
-</xsl:template>
-
-<xsl:template match="biblioid[@class='uri']/ulink|bibliomisc[@role='access']/ulink" mode="iso690.mode">
-  <xsl:param name="link1">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'link1'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="link2">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'link2'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:value-of select="$link1"/>
-  <xsl:call-template name="ulink"/>
-  <xsl:value-of select="$link2"/>
-</xsl:template>
-
-<xsl:template match="biblioid[@class='uri']|bibliomisc[@role='access']" mode="iso690.mode">
-  <xsl:param name="firstacc" select="1"/>
-  <xsl:param name="access">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'access'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="acctoo">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'acctoo'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="onwww">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'onwww'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="oninet">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'oninet'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="access.end">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'access.end'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="access.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'access.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="$firstacc=1">
-      <xsl:value-of select="$access"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$acctoo"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:choose>
-    <xsl:when test="(./ulink)and(string(./ulink)=string(.))">
-      <xsl:choose>
-        <xsl:when test="(starts-with(./ulink/@url,'http://')or(starts-with(./ulink/@url,'https://')))">
-          <xsl:value-of select="$onwww"/>
-          <xsl:value-of select="$access.end"/>
-          <xsl:apply-templates mode="iso690.mode" select="./ulink"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$oninet"/>
-          <xsl:value-of select="$access.end"/>
-          <xsl:apply-templates mode="iso690.mode" select="./ulink"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="(./ulink)and(string(./ulink)!=string(.))">
-      <xsl:value-of select="text()[1]"/>
-      <xsl:call-template name="iso690.endsep">
-        <xsl:with-param name="text" select="text()[1]"/>
-        <xsl:with-param name="sep" select="$access.end"/>
-      </xsl:call-template>
-      <xsl:apply-templates mode="iso690.mode" select="./ulink"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="iso690.mode"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:value-of select="$access.sep"/>
-</xsl:template>
-
-<!-- Standard number - ISBN -->
-<xsl:template name="iso690.isbn">
-  <xsl:choose>
-    <xsl:when test="./biblioid/@class='isbn'">
-      <xsl:apply-templates mode="iso690.mode" select="./biblioid[@class='isbn']"/>
-    </xsl:when>
-    <xsl:when test="./isbn">
-      <xsl:apply-templates mode="iso690.mode" select="./isbn"/>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="isbn|biblioid[@class='isbn']" mode="iso690.mode">
-  <xsl:param name="isbn">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'isbn'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="stdnum.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'stdnum.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:value-of select="$isbn"/>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:value-of select="$stdnum.sep"/>
-</xsl:template>
-
-<!-- Standard number - ISSN -->
-<xsl:template name="iso690.issn">
-  <xsl:choose>
-    <xsl:when test="./biblioid/@class='issn'">
-      <xsl:apply-templates mode="iso690.mode" select="./biblioid[@class='issn']"/>
-    </xsl:when>
-    <xsl:when test="./issn">
-      <xsl:apply-templates mode="iso690.mode" select="./issn"/>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="issn|biblioid[@class='issn']" mode="iso690.mode">
-  <xsl:param name="issn">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'issn'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:param name="stdnum.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'stdnum.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:value-of select="$issn"/>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:value-of select="$stdnum.sep"/>
-</xsl:template>
-
-<!-- Identification of patent document -->
-<xsl:template name="iso690.pat.ident">
-  <xsl:param name="patdate.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'patdate.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode" select="./address/country"/>
-  <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='patenttype']"/>
-  <xsl:choose>
-    <xsl:when test="./biblioid[@class='other' and @otherclass='patentnum']">
-      <xsl:apply-templates mode="iso690.mode" select="./biblioid[@class='other' and @otherclass='patentnum']"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="iso690.mode" select="./bibliomisc[@role='patentnum']"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:apply-templates mode="iso690.mode" select="./pubdate[not(@role='issuing')]">
-    <xsl:with-param name="sep" select="$patdate.sep"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<!-- Country or issuing office -->
-<xsl:template match="address/country" mode="iso690.mode">
-  <xsl:param name="patcountry.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'patcountry.sep'"/></xsl:call-template>
-  </xsl:param>
-  <i>
-    <xsl:apply-templates mode="iso690.mode"/>
-  </i>
-  <xsl:value-of select="$patcountry.sep"/>
-</xsl:template>
-
-<!-- Kind of patent document -->
-<xsl:template match="bibliomisc[@role='patenttype']" mode="iso690.mode">
-  <xsl:param name="pattype.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'pattype.sep'"/></xsl:call-template>
-  </xsl:param>
-  <i>
-    <xsl:apply-templates mode="iso690.mode"/>
-  </i>
-  <xsl:value-of select="$pattype.sep"/>
-</xsl:template>
-
-<!-- Number -->
-<xsl:template match="biblioid[@class='other' and @otherclass='patentnum']|bibliomisc[@role='patentnum']" mode="iso690.mode">
-  <xsl:param name="patnum.sep">
-    <xsl:call-template name="gentext.template"><xsl:with-param name="context" select="'iso690'"/><xsl:with-param name="name" select="'patnum.sep'"/></xsl:call-template>
-  </xsl:param>
-  <xsl:apply-templates mode="iso690.mode"/>
-  <xsl:value-of select="$patnum.sep"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<!-- Supplementary templates -->
-
-<xsl:template name="iso690.endsep">
-  <xsl:param name="text"/>
-  <xsl:param name="sep" select=". "/>
-  <xsl:choose>
-    <xsl:when test="substring($text,string-length($text))!=substring($sep,1,1)">
-      <xsl:value-of select="$sep"/>
-    </xsl:when>
-    <xsl:when test="substring($text,string-length($text))=' '">
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="' '"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="iso690.mode">
-  <xsl:apply-templates select="."/><!-- try the default mode -->
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/biblio.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/biblio.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,1217 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="bibliography">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="$generate.id.attributes != 0">
-      <xsl:attribute name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="bibliography.titlepage"/>
-
-    <xsl:apply-templates/>
-
-    <xsl:if test="not(parent::article)">
-      <xsl:call-template name="process.footnotes"/>
-    </xsl:if>
-  </div>
-</xsl:template>
-
-<xsl:template match="bibliography/bibliographyinfo"/>
-<xsl:template match="bibliography/info"/>
-<xsl:template match="bibliography/title"/>
-<xsl:template match="bibliography/subtitle"/>
-<xsl:template match="bibliography/titleabbrev"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="bibliodiv">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates/>
-  </div>
-</xsl:template>
-
-<xsl:template match="bibliodiv/title">
-  <h3>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor">
-      <xsl:with-param name="node" select=".."/>
-    </xsl:call-template>
-    <xsl:apply-templates/>
-  </h3>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="bibliolist">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor"/>
-    <xsl:if test="blockinfo/title|info/title|title">
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-    <xsl:apply-templates select="*[not(self::blockinfo)                                    and not(self::info)                                    and not(self::title)                                    and not(self::titleabbrev)                                    and not(self::biblioentry)                                    and not(self::bibliomixed)]"/>
-    <xsl:apply-templates select="biblioentry|bibliomixed"/>
-  </div>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="biblioentry">
-  <xsl:param name="label">
-    <xsl:call-template name="biblioentry.label"/>
-  </xsl:param>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="string(.) = ''">
-      <xsl:variable name="bib" select="document($bibliography.collection,.)"/>
-      <xsl:variable name="entry" select="$bib/bibliography/                                          *[@id=$id or @xml:id=$id][1]"/>
-      <xsl:choose>
-        <xsl:when test="$entry">
-          <xsl:choose>
-            <xsl:when test="$bibliography.numbered != 0">
-              <xsl:apply-templates select="$entry">
-                <xsl:with-param name="label" select="$label"/>
-              </xsl:apply-templates>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates select="$entry"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>No bibliography entry: </xsl:text>
-            <xsl:value-of select="$id"/>
-            <xsl:text> found in </xsl:text>
-            <xsl:value-of select="$bibliography.collection"/>
-          </xsl:message>
-          <div>
-            <xsl:apply-templates select="." mode="class.attribute"/>
-            <xsl:call-template name="anchor"/>
-            <p>
-              <xsl:copy-of select="$label"/>
-              <xsl:text>Error: no bibliography entry: </xsl:text>
-              <xsl:value-of select="$id"/>
-              <xsl:text> found in </xsl:text>
-              <xsl:value-of select="$bibliography.collection"/>
-            </p>
-          </div>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <div>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:call-template name="anchor">
-          <xsl:with-param name="conditional" select="0"/>
-        </xsl:call-template>
-        <p>
-          <xsl:copy-of select="$label"/>
-	  <xsl:choose>
-	    <xsl:when test="$bibliography.style = 'iso690'">
-	      <xsl:call-template name="iso690.makecitation"/>
-	    </xsl:when>
-	    <xsl:otherwise>
-	      <xsl:apply-templates mode="bibliography.mode"/>
-	    </xsl:otherwise>
-	  </xsl:choose>
-        </p>
-      </div>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="bibliomixed">
-  <xsl:param name="label">
-    <xsl:call-template name="biblioentry.label"/>
-  </xsl:param>
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="string(.) = ''">
-      <xsl:variable name="bib" select="document($bibliography.collection,.)"/>
-      <xsl:variable name="entry" select="$bib/bibliography/                                          *[@id=$id or @xml:id=$id][1]"/>
-      <xsl:choose>
-        <xsl:when test="$entry">
-          <xsl:choose>
-            <xsl:when test="$bibliography.numbered != 0">
-              <xsl:apply-templates select="$entry">
-                <xsl:with-param name="label" select="$label"/>
-              </xsl:apply-templates>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates select="$entry"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>No bibliography entry: </xsl:text>
-            <xsl:value-of select="$id"/>
-            <xsl:text> found in </xsl:text>
-            <xsl:value-of select="$bibliography.collection"/>
-          </xsl:message>
-          <div>
-            <xsl:apply-templates select="." mode="class.attribute"/>
-            <xsl:call-template name="anchor"/>
-            <p>
-              <xsl:copy-of select="$label"/>
-              <xsl:text>Error: no bibliography entry: </xsl:text>
-              <xsl:value-of select="$id"/>
-              <xsl:text> found in </xsl:text>
-              <xsl:value-of select="$bibliography.collection"/>
-            </p>
-          </div>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <div>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:call-template name="anchor">
-          <xsl:with-param name="conditional" select="0"/>
-        </xsl:call-template>
-        <p>
-          <xsl:apply-templates select="." mode="class.attribute"/>
-          <xsl:copy-of select="$label"/>
-          <xsl:apply-templates mode="bibliomixed.mode"/>
-        </p>
-      </div>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="biblioentry.label">
-  <xsl:param name="node" select="."/>
-
-  <xsl:choose>
-    <xsl:when test="$bibliography.numbered != 0">
-      <xsl:text>[</xsl:text>
-      <xsl:number from="bibliography" count="biblioentry|bibliomixed" level="any" format="1"/>
-      <xsl:text>] </xsl:text>
-    </xsl:when>
-    <xsl:when test="local-name($node/child::*[1]) = 'abbrev'">
-      <xsl:text>[</xsl:text>
-      <xsl:apply-templates select="$node/abbrev[1]"/>
-      <xsl:text>] </xsl:text>
-    </xsl:when>
-    <xsl:when test="$node/@xreflabel">
-      <xsl:text>[</xsl:text>
-      <xsl:value-of select="$node/@xreflabel"/>
-      <xsl:text>] </xsl:text>
-    </xsl:when>
-    <xsl:when test="$node/@id">
-      <xsl:text>[</xsl:text>
-      <xsl:value-of select="$node/@id"/>
-      <xsl:text>] </xsl:text>
-    </xsl:when>
-    <xsl:when test="$node/@xml:id">
-      <xsl:text>[</xsl:text>
-      <xsl:value-of select="$node/@xml:id"/>
-      <xsl:text>] </xsl:text>
-    </xsl:when>
-    <xsl:otherwise><!-- nop --></xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="bibliography.mode">
-  <xsl:apply-templates select="."/><!-- try the default mode -->
-</xsl:template>
-
-<xsl:template match="abbrev" mode="bibliography.mode">
-  <xsl:if test="preceding-sibling::*">
-    <xsl:apply-templates mode="bibliography.mode"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="abstract" mode="bibliography.mode">
-  <!-- suppressed -->
-</xsl:template>
-
-<xsl:template match="address" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="affiliation" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="shortaffil" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="jobtitle" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="artheader|articleinfo|info" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="artpagenums" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="author" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="person.name"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="authorblurb|personblurb" mode="bibliography.mode">
-  <!-- suppressed -->
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="person.name.list"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="authorinitials" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="bibliomisc" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="bibliomset" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<!-- ================================================== -->
-
-<xsl:template match="biblioset" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="biblioset/title|biblioset/citetitle" mode="bibliography.mode">
-  <xsl:variable name="relation" select="../@relation"/>
-  <xsl:choose>
-    <xsl:when test="$relation='article' or @pubwork='article'">
-      <xsl:call-template name="gentext.startquote"/>
-      <xsl:apply-templates/>
-      <xsl:call-template name="gentext.endquote"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <i><xsl:apply-templates/></i>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:copy-of select="$biblioentry.item.separator"/>
-</xsl:template>
-
-<!-- ================================================== -->
-
-<xsl:template match="bookbiblio" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="citetitle" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:choose>
-      <xsl:when test="@pubwork = 'article'">
-        <xsl:call-template name="gentext.startquote"/>
-        <xsl:call-template name="inline.charseq"/>
-        <xsl:call-template name="gentext.endquote"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="inline.italicseq"/>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="collab" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="collabname" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="confgroup" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="confdates" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="conftitle" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="confnum" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="confsponsor" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="contractnum" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="contractsponsor" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="contrib" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<!-- ================================================== -->
-
-<xsl:template match="copyright" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="'Copyright'"/>
-    </xsl:call-template>
-    <xsl:call-template name="gentext.space"/>
-    <xsl:call-template name="dingbat">
-      <xsl:with-param name="dingbat">copyright</xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="gentext.space"/>
-    <xsl:apply-templates select="year" mode="bibliography.mode"/>
-    <xsl:if test="holder">
-      <xsl:call-template name="gentext.space"/>
-      <xsl:apply-templates select="holder" mode="bibliography.mode"/>
-    </xsl:if>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="year" mode="bibliography.mode">
-  <xsl:apply-templates/><xsl:text>, </xsl:text>
-</xsl:template>
-
-<xsl:template match="year[position()=last()]" mode="bibliography.mode">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="holder" mode="bibliography.mode">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<!-- ================================================== -->
-
-<xsl:template match="corpauthor" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="corpcredit" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="corpname" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="date" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="edition" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="editor" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="person.name"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="firstname" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="honorific" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="invpartnumber" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="isbn" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="issn" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="issuenum" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="lineage" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="orgname" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="orgdiv" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="othername" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="pagenums" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="printhistory" mode="bibliography.mode">
-  <!-- suppressed -->
-</xsl:template>
-
-<xsl:template match="productname" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="productnumber" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="publisher" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="publishername" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="pubsnumber" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="bibliography.mode">
-  <!-- suppressed; how could this be represented? -->
-</xsl:template>
-
-<xsl:template match="seriesinfo" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="seriesvolnums" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="surname" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="title" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <i><xsl:apply-templates mode="bibliography.mode"/></i>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="titleabbrev" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="volumenum" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="bibliocoverage|biblioid|bibliorelation|bibliosource" mode="bibliography.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliography.mode"/>
-    <xsl:copy-of select="$biblioentry.item.separator"/>
-  </span>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="bibliomixed.mode">
-  <xsl:apply-templates select="."/><!-- try the default mode -->
-</xsl:template>
-
-<xsl:template match="abbrev" mode="bibliomixed.mode">
-  <xsl:if test="preceding-sibling::*">
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="abstract" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="address" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="affiliation" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="shortaffil" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="jobtitle" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="artpagenums" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="author" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="authorblurb|personblurb" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="authorinitials" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="bibliomisc" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<!-- ================================================== -->
-
-<xsl:template match="bibliomset" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="bibliomset/title|bibliomset/citetitle" mode="bibliomixed.mode">
-  <xsl:variable name="relation" select="../@relation"/>
-  <xsl:choose>
-    <xsl:when test="$relation='article' or @pubwork='article'">
-      <xsl:call-template name="gentext.startquote"/>
-      <xsl:apply-templates/>
-      <xsl:call-template name="gentext.endquote"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <i><xsl:apply-templates/></i>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ================================================== -->
-
-<xsl:template match="biblioset" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="citetitle" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:choose>
-      <xsl:when test="@pubwork = 'article'">
-        <xsl:call-template name="gentext.startquote"/>
-        <xsl:call-template name="inline.charseq"/>
-        <xsl:call-template name="gentext.endquote"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="inline.italicseq"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </span>
-</xsl:template>
-
-
-<xsl:template match="collab" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="confgroup" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="contractnum" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="contractsponsor" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="contrib" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="copyright" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="corpcredit" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="corpname" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="date" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="edition" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="editor" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="firstname" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="honorific" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="indexterm" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="invpartnumber" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="isbn" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="issn" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="issuenum" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="lineage" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="orgname" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="othername" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="pagenums" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="printhistory" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="productname" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="productnumber" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="publisher" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="publishername" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="pubsnumber" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="bibliomixed.mode">
-  <!-- suppressed; how could this be represented? -->
-</xsl:template>
-
-<xsl:template match="seriesvolnums" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="surname" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="title" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="titleabbrev" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="volumenum" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="bibliocoverage|biblioid|bibliorelation|bibliosource" mode="bibliomixed.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="bibliomixed.mode"/>
-  </span>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/block.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/block.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,432 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-<!-- What should we do about styling blockinfo? -->
-
-<xsl:template match="blockinfo|info">
-  <!-- suppress -->
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="block.object">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates/>
-  </div>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="para">
-  <xsl:call-template name="paragraph">
-    <xsl:with-param name="class">
-      <xsl:if test="@role and $para.propagates.style != 0">
-        <xsl:value-of select="@role"/>
-      </xsl:if>
-    </xsl:with-param>
-    <xsl:with-param name="content">
-      <xsl:if test="position() = 1 and parent::listitem">
-        <xsl:call-template name="anchor">
-          <xsl:with-param name="node" select="parent::listitem"/>
-        </xsl:call-template>
-      </xsl:if>
-
-      <xsl:call-template name="anchor"/>
-      <xsl:apply-templates/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="paragraph">
-  <xsl:param name="class" select="''"/>
-  <xsl:param name="content"/>
-
-  <xsl:variable name="p">
-    <p>
-      <xsl:call-template name="dir"/>
-      <xsl:if test="$class != ''">
-        <xsl:apply-templates select="." mode="class.attribute">
-          <xsl:with-param name="class" select="$class"/>
-        </xsl:apply-templates>
-      </xsl:if>
-      <xsl:copy-of select="$content"/>
-    </p>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$html.cleanup != 0">
-      <xsl:call-template name="unwrap.p">
-        <xsl:with-param name="p" select="$p"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$p"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="simpara">
-  <!-- see also listitem/simpara in lists.xsl -->
-  <p>
-    <xsl:if test="@role and $para.propagates.style != 0">
-      <xsl:apply-templates select="." mode="class.attribute">
-        <xsl:with-param name="class" select="@role"/>
-      </xsl:apply-templates>
-    </xsl:if>
-
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates/>
-  </p>
-</xsl:template>
-
-<xsl:template match="formalpara">
-  <xsl:call-template name="paragraph">
-    <xsl:with-param name="class">
-      <xsl:if test="@role and $para.propagates.style != 0">
-        <xsl:value-of select="@role"/>
-      </xsl:if>
-    </xsl:with-param>
-    <xsl:with-param name="content">
-      <xsl:call-template name="anchor"/>
-      <xsl:apply-templates/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- Only use title from info -->
-<xsl:template match="formalpara/info">
-  <xsl:apply-templates select="title"/>
-</xsl:template>
-
-<xsl:template match="formalpara/title|formalpara/info/title">
-  <xsl:variable name="titleStr">
-      <xsl:apply-templates/>
-  </xsl:variable>
-  <xsl:variable name="lastChar">
-    <xsl:if test="$titleStr != ''">
-      <xsl:value-of select="substring($titleStr,string-length($titleStr),1)"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <b>
-    <xsl:copy-of select="$titleStr"/>
-    <xsl:if test="$lastChar != ''                   and not(contains($runinhead.title.end.punct, $lastChar))">
-      <xsl:value-of select="$runinhead.default.title.end.punct"/>
-    </xsl:if>
-    <xsl:text>&#160;</xsl:text>
-  </b>
-</xsl:template>
-
-<xsl:template match="formalpara/para">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="blockquote">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="@lang or @xml:lang">
-      <xsl:call-template name="language.attribute"/>
-    </xsl:if>
-    <xsl:call-template name="anchor"/>
-
-    <xsl:choose>
-      <xsl:when test="attribution">
-        <table border="0" width="100%" cellspacing="0" cellpadding="0" class="blockquote" summary="Block quote">
-          <tr>
-            <td width="10%" valign="top">&#160;</td>
-            <td width="80%" valign="top">
-              <xsl:apply-templates select="child::*[local-name(.)!='attribution']"/>
-            </td>
-            <td width="10%" valign="top">&#160;</td>
-          </tr>
-          <tr>
-            <td width="10%" valign="top">&#160;</td>
-            <td colspan="2" align="right" valign="top">
-              <xsl:text>--</xsl:text>
-              <xsl:apply-templates select="attribution"/>
-            </td>
-          </tr>
-        </table>
-      </xsl:when>
-      <xsl:otherwise>
-        <blockquote>
-          <xsl:apply-templates select="." mode="class.attribute"/>
-          <xsl:apply-templates/>
-        </blockquote>
-      </xsl:otherwise>
-    </xsl:choose>
-  </div>
-</xsl:template>
-
-<xsl:template match="blockquote/title|blockquote/info/title">
-  <div class="blockquote-title">
-    <p>
-      <b>
-        <xsl:apply-templates/>
-      </b>
-    </p>
-  </div>
-</xsl:template>
-
-<xsl:template match="epigraph">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-      <xsl:apply-templates select="para|simpara|formalpara|literallayout"/>
-      <xsl:if test="attribution">
-        <div class="attribution">
-          <span>--<xsl:apply-templates select="attribution"/></span>
-        </div>
-      </xsl:if>
-  </div>
-</xsl:template>
-
-<xsl:template match="attribution">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates/>
-  </span>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="abstract|sidebar">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="formal.object.heading">
-      <xsl:with-param name="title">
-        <xsl:apply-templates select="." mode="title.markup">
-          <xsl:with-param name="allow-anchors" select="'1'"/>
-        </xsl:apply-templates>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:apply-templates/>
-  </div>
-</xsl:template>
-
-<xsl:template match="abstract/title|sidebar/title">
-</xsl:template>
-
-<xsl:template match="sidebar/sidebarinfo|sidebar/info"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="msgset">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="msgentry">
-  <xsl:call-template name="block.object"/>
-</xsl:template>
-
-<xsl:template match="simplemsgentry">
-  <xsl:call-template name="block.object"/>
-</xsl:template>
-
-<xsl:template match="msg">
-  <xsl:call-template name="block.object"/>
-</xsl:template>
-
-<xsl:template match="msgmain">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="msgmain/title">
-  <b><xsl:apply-templates/></b>
-</xsl:template>
-
-<xsl:template match="msgsub">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="msgsub/title">
-  <b><xsl:apply-templates/></b>
-</xsl:template>
-
-<xsl:template match="msgrel">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="msgrel/title">
-  <b><xsl:apply-templates/></b>
-</xsl:template>
-
-<xsl:template match="msgtext">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="msginfo">
-  <xsl:call-template name="block.object"/>
-</xsl:template>
-
-<xsl:template match="msglevel">
-  <p>
-    <b>
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'msgset'"/>
-        <xsl:with-param name="name" select="'MsgLevel'"/>
-      </xsl:call-template>
-    </b>
-    <xsl:apply-templates/>
-  </p>
-</xsl:template>
-
-<xsl:template match="msgorig">
-  <p>
-    <b>
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'msgset'"/>
-        <xsl:with-param name="name" select="'MsgOrig'"/>
-      </xsl:call-template>
-    </b>
-    <xsl:apply-templates/>
-  </p>
-</xsl:template>
-
-<xsl:template match="msgaud">
-  <p>
-    <b>
-      <xsl:call-template name="gentext.template">
-        <xsl:with-param name="context" select="'msgset'"/>
-        <xsl:with-param name="name" select="'MsgAud'"/>
-      </xsl:call-template>
-    </b>
-    <xsl:apply-templates/>
-  </p>
-</xsl:template>
-
-<xsl:template match="msgexplan">
-  <xsl:call-template name="block.object"/>
-</xsl:template>
-
-<xsl:template match="msgexplan/title">
-  <p><b><xsl:apply-templates/></b></p>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="revhistory">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <table border="0" width="100%" summary="Revision history">
-      <tr>
-        <th align="left" valign="top" colspan="3">
-          <b>
-            <xsl:call-template name="gentext">
-              <xsl:with-param name="key" select="'RevHistory'"/>
-            </xsl:call-template>
-          </b>
-        </th>
-      </tr>
-      <xsl:apply-templates/>
-    </table>
-  </div>
-</xsl:template>
-
-<xsl:template match="revhistory/revision">
-  <xsl:variable name="revnumber" select="revnumber"/>
-  <xsl:variable name="revdate" select="date"/>
-  <xsl:variable name="revauthor" select="authorinitials|author"/>
-  <xsl:variable name="revremark" select="revremark|revdescription"/>
-  <tr>
-    <td align="left">
-      <xsl:if test="$revnumber">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'Revision'"/>
-        </xsl:call-template>
-        <xsl:call-template name="gentext.space"/>
-        <xsl:apply-templates select="$revnumber"/>
-      </xsl:if>
-    </td>
-    <td align="left">
-      <xsl:apply-templates select="$revdate"/>
-    </td>
-    <xsl:choose>
-      <xsl:when test="count($revauthor)=0">
-        <td align="left">
-          <xsl:call-template name="dingbat">
-            <xsl:with-param name="dingbat">nbsp</xsl:with-param>
-          </xsl:call-template>
-        </td>
-      </xsl:when>
-      <xsl:otherwise>
-        <td align="left">
-          <xsl:for-each select="$revauthor">
-            <xsl:apply-templates select="."/>
-            <xsl:if test="position() != last()">
-              <xsl:text>, </xsl:text>
-            </xsl:if>
-          </xsl:for-each>
-        </td>
-      </xsl:otherwise>
-    </xsl:choose>
-  </tr>
-  <xsl:if test="$revremark">
-    <tr>
-      <td align="left" colspan="3">
-        <xsl:apply-templates select="$revremark"/>
-      </td>
-    </tr>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="revision/revnumber">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="revision/date">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="revision/authorinitials">
-  <xsl:text>, </xsl:text>
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="revision/authorinitials[1]" priority="2">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="revision/revremark">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="revision/revdescription">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="ackno">
-  <p>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates/>
-  </p>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="highlights">
-  <xsl:call-template name="block.object"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/callout.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/callout.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,188 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:sverb="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Verbatim" xmlns:xverb="xalan://com.nwalsh.xalan.Verbatim" xmlns:lxslt="http://xml.apache.org/xslt" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="sverb xverb lxslt" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<lxslt:component prefix="xverb" functions="insertCallouts"/>
-
-<xsl:template match="programlistingco|screenco">
-  <xsl:variable name="verbatim" select="programlisting|screen"/>
-
-  <xsl:choose>
-    <xsl:when test="$use.extensions != '0'                     and $callouts.extension != '0'">
-      <xsl:variable name="rtf">
-        <xsl:apply-templates select="$verbatim">
-          <xsl:with-param name="suppress-numbers" select="'1'"/>
-        </xsl:apply-templates>
-      </xsl:variable>
-
-      <xsl:variable name="rtf-with-callouts">
-        <xsl:choose>
-          <xsl:when test="function-available('sverb:insertCallouts')">
-            <xsl:copy-of select="sverb:insertCallouts(areaspec,$rtf)"/>
-          </xsl:when>
-          <xsl:when test="function-available('xverb:insertCallouts')">
-            <xsl:copy-of select="xverb:insertCallouts(areaspec,$rtf)"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:message terminate="yes">
-              <xsl:text>No insertCallouts function is available.</xsl:text>
-            </xsl:message>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="$verbatim/@linenumbering = 'numbered'                         and $linenumbering.extension != '0'">
-          <div>
-            <xsl:apply-templates select="." mode="class.attribute"/>
-            <xsl:call-template name="number.rtf.lines">
-              <xsl:with-param name="rtf" select="$rtf-with-callouts"/>
-              <xsl:with-param name="pi.context" select="programlisting|screen"/>
-            </xsl:call-template>
-            <xsl:apply-templates select="calloutlist"/>
-          </div>
-        </xsl:when>
-        <xsl:otherwise>
-          <div>
-            <xsl:apply-templates select="." mode="class.attribute"/>
-            <xsl:copy-of select="$rtf-with-callouts"/>
-            <xsl:apply-templates select="calloutlist"/>
-          </div>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <div>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:apply-templates/>
-      </div>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="areaspec|areaset|area">
-</xsl:template>
-
-<xsl:template match="areaset" mode="conumber">
-  <xsl:number count="area|areaset" format="1"/>
-</xsl:template>
-
-<xsl:template match="area" mode="conumber">
-  <xsl:number count="area|areaset" format="1"/>
-</xsl:template>
-
-<xsl:template match="co" name="co">
-  <!-- Support a single linkend in HTML -->
-  <xsl:variable name="targets" select="key('id', @linkends)"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-  <xsl:choose>
-    <xsl:when test="$target">
-      <a>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:if test="@id or @xml:id">
-          <xsl:attribute name="id">
-            <xsl:value-of select="(@id|@xml:id)[1]"/>
-          </xsl:attribute>
-        </xsl:if>
-        <xsl:attribute name="href">
-          <xsl:call-template name="href.target">
-            <xsl:with-param name="object" select="$target"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:apply-templates select="." mode="callout-bug"/>
-      </a>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="anchor"/>
-      <xsl:apply-templates select="." mode="callout-bug"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="coref">
-  <!-- tricky; this relies on the fact that we can process the "co" that's -->
-  <!-- "over there" as if it were "right here" -->
-
-  <xsl:variable name="co" select="key('id', @linkend)"/>
-  <xsl:choose>
-    <xsl:when test="not($co)">
-      <xsl:message>
-        <xsl:text>Error: coref link is broken: </xsl:text>
-        <xsl:value-of select="@linkend"/>
-      </xsl:message>
-    </xsl:when>
-    <xsl:when test="local-name($co) != 'co'">
-      <xsl:message>
-        <xsl:text>Error: coref doesn't point to a co: </xsl:text>
-        <xsl:value-of select="@linkend"/>
-      </xsl:message>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="$co"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="co" mode="callout-bug">
-  <xsl:call-template name="callout-bug">
-    <xsl:with-param name="conum">
-      <xsl:number count="co" level="any" from="programlisting|screen|literallayout|synopsis" format="1"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="callout-bug">
-  <xsl:param name="conum" select="1"/>
-
-  <xsl:choose>
-    <xsl:when test="$callout.graphics != 0                     and $conum &lt;= $callout.graphics.number.limit">
-      <img src="{$callout.graphics.path}{$conum}{$callout.graphics.extension}" alt="{$conum}" border="0"/>
-    </xsl:when>
-    <xsl:when test="$callout.unicode != 0                     and $conum &lt;= $callout.unicode.number.limit">
-      <xsl:choose>
-        <xsl:when test="$callout.unicode.start.character = 10102">
-          <xsl:choose>
-            <xsl:when test="$conum = 1">&#10102;</xsl:when>
-            <xsl:when test="$conum = 2">&#10103;</xsl:when>
-            <xsl:when test="$conum = 3">&#10104;</xsl:when>
-            <xsl:when test="$conum = 4">&#10105;</xsl:when>
-            <xsl:when test="$conum = 5">&#10106;</xsl:when>
-            <xsl:when test="$conum = 6">&#10107;</xsl:when>
-            <xsl:when test="$conum = 7">&#10108;</xsl:when>
-            <xsl:when test="$conum = 8">&#10109;</xsl:when>
-            <xsl:when test="$conum = 9">&#10110;</xsl:when>
-            <xsl:when test="$conum = 10">&#10111;</xsl:when>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>Don't know how to generate Unicode callouts </xsl:text>
-            <xsl:text>when $callout.unicode.start.character is </xsl:text>
-            <xsl:value-of select="$callout.unicode.start.character"/>
-          </xsl:message>
-          <xsl:text>(</xsl:text>
-          <xsl:value-of select="$conum"/>
-          <xsl:text>)</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text>(</xsl:text>
-      <xsl:value-of select="$conum"/>
-      <xsl:text>)</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/changebars.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/changebars.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,72 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-<xsl:import href="docbook.xsl"/>
-
-<xsl:param name="show.revisionflag" select="'1'"/>
-
-<xsl:template name="system.head.content">
-<xsl:param name="node" select="."/>
-
-<style type="text/css">
-<xsl:text>
-div.added    { background-color: #ffff99; 
-               text-decoration: underline; }
-div.deleted  { text-decoration: line-through;
-               background-color: #FF7F7F; }
-div.changed  { background-color: #99ff99; }
-div.off      {  }
-
-span.added   { background-color: #ffff99; 
-               text-decoration: underline; }
-span.deleted { text-decoration: line-through;
-               background-color: #FF7F7F; }
-span.changed { background-color: #99ff99; }
-span.off     {  }
-</xsl:text>
-</style>
-</xsl:template>
-
-<xsl:template match="*[@revisionflag]">
-  <xsl:choose>
-    <xsl:when test="local-name(.) = 'para'                     or local-name(.) = 'simpara'                     or local-name(.) = 'formalpara'                     or local-name(.) = 'section'                     or local-name(.) = 'sect1'                     or local-name(.) = 'sect2'                     or local-name(.) = 'sect3'                     or local-name(.) = 'sect4'                     or local-name(.) = 'sect5'                     or local-name(.) = 'chapter'                     or local-name(.) = 'preface'                     or local-name(.) = 'itemizedlist'                     or local-name(.) = 'varlistentry'                     or local-name(.) = 'glossary'                     or local-name(.) = 'bibliography'                     or local-name(.) = 'index'                     or local-name(.) = 'appendix'">
-      <div class="{@revisionflag}">
-	<xsl:apply-imports/>
-      </div>
-    </xsl:when>
-    <xsl:when test="local-name(.) = 'phrase'                     or local-name(.) = 'ulink'                     or local-name(.) = 'link'                     or local-name(.) = 'filename'                     or local-name(.) = 'literal'                     or local-name(.) = 'member'                     or local-name(.) = 'glossterm'                     or local-name(.) = 'sgmltag'                     or local-name(.) = 'quote'                     or local-name(.) = 'emphasis'                     or local-name(.) = 'command'                     or local-name(.) = 'xref'">
-      <span class="{@revisionflag}">
-	<xsl:apply-imports/>
-      </span>
-    </xsl:when>
-    <xsl:when test="local-name(.) = 'listitem'                     or local-name(.) = 'entry'                     or local-name(.) = 'title'">
-      <!-- nop; these are handled directly in the stylesheet -->
-      <xsl:apply-imports/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message>
-	<xsl:text>Revisionflag on unexpected element: </xsl:text>
-	<xsl:value-of select="local-name(.)"/>
-	<xsl:text> (Assuming block)</xsl:text>
-      </xsl:message>
-      <div class="{@revisionflag}">
-	<xsl:apply-imports/>
-      </div>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-code.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-code.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,639 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0" xmlns:ng="http://docbook.org/docbook-ng" xmlns:db="http://docbook.org/ns/docbook" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="exsl cf ng db" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-
-<xsl:template match="*" mode="chunk-filename">
-  <!-- returns the filename of a chunk -->
-  <xsl:variable name="ischunk">
-    <xsl:call-template name="chunk"/>
-  </xsl:variable>
-
-  <xsl:variable name="fn">
-    <xsl:apply-templates select="." mode="recursive-chunk-filename"/>
-  </xsl:variable>
-
-  <!--
-  <xsl:message>
-    <xsl:value-of select="$ischunk"/>
-    <xsl:text> (</xsl:text>
-    <xsl:value-of select="local-name(.)"/>
-    <xsl:text>) </xsl:text>
-    <xsl:value-of select="$fn"/>
-    <xsl:text>, </xsl:text>
-    <xsl:call-template name="dbhtml-dir"/>
-  </xsl:message>
-  -->
-
-  <!-- 2003-11-25 by ndw:
-       The following test used to read test="$ischunk != 0 and $fn != ''"
-       I've removed the ischunk part of the test so that href.to.uri and
-       href.from.uri will be fully qualified even if the source or target
-       isn't a chunk. I *think* that if $fn != '' then it's appropriate
-       to put the directory on the front, even if the element isn't a
-       chunk. I could be wrong. -->
-
-  <xsl:if test="$fn != ''">
-    <xsl:call-template name="dbhtml-dir"/>
-  </xsl:if>
-
-  <xsl:value-of select="$fn"/>
-  <!-- You can't add the html.ext here because dbhtml filename= may already -->
-  <!-- have added it. It really does have to be handled in the recursive template -->
-</xsl:template>
-
-<xsl:template match="*" mode="recursive-chunk-filename">
-  <xsl:param name="recursive" select="false()"/>
-
-  <!-- returns the filename of a chunk -->
-  <xsl:variable name="ischunk">
-    <xsl:call-template name="chunk"/>
-  </xsl:variable>
-
-  <xsl:variable name="dbhtml-filename">
-    <xsl:call-template name="pi.dbhtml_filename"/>
-  </xsl:variable>
-
-  <xsl:variable name="filename">
-    <xsl:choose>
-      <xsl:when test="$dbhtml-filename != ''">
-        <xsl:value-of select="$dbhtml-filename"/>
-      </xsl:when>
-      <!-- if this is the root element, use the root.filename -->
-      <xsl:when test="not(parent::*) and $root.filename != ''">
-        <xsl:value-of select="$root.filename"/>
-        <xsl:value-of select="$html.ext"/>
-      </xsl:when>
-      <!-- Special case -->
-      <xsl:when test="self::legalnotice and not($generate.legalnotice.link = 0)">
-        <xsl:choose>
-          <xsl:when test="(@id or @xml:id) and not($use.id.as.filename = 0)">
-            <!-- * if this legalnotice has an ID, then go ahead and use -->
-            <!-- * just the value of that ID as the basename for the file -->
-            <!-- * (that is, without prepending an "ln-" too it) -->
-            <xsl:value-of select="(@id|@xml:id)[1]"/>
-            <xsl:value-of select="$html.ext"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <!-- * otherwise, if this legalnotice does not have an ID, -->
-            <!-- * then we generate an ID... -->
-            <xsl:variable name="id">
-              <xsl:call-template name="object.id"/>
-            </xsl:variable>
-            <!-- * ...and then we take that generated ID, prepend an -->
-            <!-- * "ln-" to it, and use that as the basename for the file -->
-            <xsl:value-of select="concat('ln-',$id,$html.ext)"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <!-- if there's no dbhtml filename, and if we're to use IDs as -->
-      <!-- filenames, then use the ID to generate the filename. -->
-      <xsl:when test="(@id or @xml:id) and $use.id.as.filename != 0">
-        <xsl:value-of select="(@id|@xml:id)[1]"/>
-        <xsl:value-of select="$html.ext"/>
-      </xsl:when>
-      <xsl:otherwise/>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$ischunk='0'">
-      <!-- if called on something that isn't a chunk, walk up... -->
-      <xsl:choose>
-        <xsl:when test="count(parent::*)&gt;0">
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="$recursive"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <!-- unless there is no up, in which case return "" -->
-        <xsl:otherwise/>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:when test="not($recursive) and $filename != ''">
-      <!-- if this chunk has an explicit name, use it -->
-      <xsl:value-of select="$filename"/>
-    </xsl:when>
-
-    <xsl:when test="self::set">
-      <xsl:value-of select="$root.filename"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::book">
-      <xsl:text>bk</xsl:text>
-      <xsl:number level="any" format="01"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::article">
-      <xsl:if test="/set">
-        <!-- in a set, make sure we inherit the right book info... -->
-        <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-          <xsl:with-param name="recursive" select="true()"/>
-        </xsl:apply-templates>
-      </xsl:if>
-
-      <xsl:text>ar</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::preface">
-      <xsl:if test="/set">
-        <!-- in a set, make sure we inherit the right book info... -->
-        <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-          <xsl:with-param name="recursive" select="true()"/>
-        </xsl:apply-templates>
-      </xsl:if>
-
-      <xsl:text>pr</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::chapter">
-      <xsl:if test="/set">
-        <!-- in a set, make sure we inherit the right book info... -->
-        <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-          <xsl:with-param name="recursive" select="true()"/>
-        </xsl:apply-templates>
-      </xsl:if>
-
-      <xsl:text>ch</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::appendix">
-      <xsl:if test="/set">
-        <!-- in a set, make sure we inherit the right book info... -->
-        <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-          <xsl:with-param name="recursive" select="true()"/>
-        </xsl:apply-templates>
-      </xsl:if>
-
-      <xsl:text>ap</xsl:text>
-      <xsl:number level="any" format="a" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::part">
-      <xsl:choose>
-        <xsl:when test="/set">
-          <!-- in a set, make sure we inherit the right book info... -->
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="true()"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-        </xsl:otherwise>
-      </xsl:choose>
-
-      <xsl:text>pt</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::reference">
-      <xsl:choose>
-        <xsl:when test="/set">
-          <!-- in a set, make sure we inherit the right book info... -->
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="true()"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-        </xsl:otherwise>
-      </xsl:choose>
-
-      <xsl:text>rn</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::refentry">
-      <xsl:choose>
-        <xsl:when test="parent::reference">
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="true()"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-        </xsl:otherwise>
-      </xsl:choose>
-
-      <xsl:text>re</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::colophon">
-      <xsl:choose>
-        <xsl:when test="/set">
-          <!-- in a set, make sure we inherit the right book info... -->
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="true()"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-        </xsl:otherwise>
-      </xsl:choose>
-
-      <xsl:text>co</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::sect1                     or self::sect2                     or self::sect3                     or self::sect4                     or self::sect5                     or self::section">
-      <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-        <xsl:with-param name="recursive" select="true()"/>
-      </xsl:apply-templates>
-      <xsl:text>s</xsl:text>
-      <xsl:number format="01"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::bibliography">
-      <xsl:choose>
-        <xsl:when test="/set">
-          <!-- in a set, make sure we inherit the right book info... -->
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="true()"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-        </xsl:otherwise>
-      </xsl:choose>
-
-      <xsl:text>bi</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::glossary">
-      <xsl:choose>
-        <xsl:when test="/set">
-          <!-- in a set, make sure we inherit the right book info... -->
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="true()"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-        </xsl:otherwise>
-      </xsl:choose>
-
-      <xsl:text>go</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::index">
-      <xsl:choose>
-        <xsl:when test="/set">
-          <!-- in a set, make sure we inherit the right book info... -->
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="true()"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-        </xsl:otherwise>
-      </xsl:choose>
-
-      <xsl:text>ix</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::setindex">
-      <xsl:text>si</xsl:text>
-      <xsl:number level="any" format="01" from="set"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:text>chunk-filename-error-</xsl:text>
-      <xsl:value-of select="name(.)"/>
-      <xsl:number level="any" format="01" from="set"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-
-
-<xsl:template match="processing-instruction('dbhtml')">
-  <!-- nop -->
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-
-<xsl:template match="*" mode="find.chunks">
-  <xsl:variable name="chunk">
-    <xsl:call-template name="chunk"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$chunk != 0">
-      <cf:div id="{generate-id()}">
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:apply-templates select="*" mode="find.chunks"/>
-      </cf:div>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="*" mode="find.chunks"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="/">
-  <!-- * Get a title for current doc so that we let the user -->
-  <!-- * know what document we are processing at this point. -->
-  <xsl:variable name="doc.title">
-    <xsl:call-template name="get.doc.title"/>
-  </xsl:variable>
-  <xsl:choose>
-    <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document,
-         toss the namespace and continue.  Use the docbook5 namespaced
-	 stylesheets for DocBook5 if you don't want to use this feature.-->
-    <!-- include extra test for Xalan quirk -->
-    <xsl:when test="(function-available('exsl:node-set') or                      contains(system-property('xsl:vendor'),                        'Apache Software Foundation'))                     and (*/self::ng:* or */self::db:*)">
-      <xsl:call-template name="log.message">
-        <xsl:with-param name="level">Note</xsl:with-param>
-        <xsl:with-param name="source" select="$doc.title"/>
-        <xsl:with-param name="context-desc">
-          <xsl:text>namesp. cut</xsl:text>
-        </xsl:with-param>
-        <xsl:with-param name="message">
-          <xsl:text>stripped namespace before processing</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:variable name="nons">
-        <xsl:apply-templates mode="stripNS"/>
-      </xsl:variable>
-      <xsl:call-template name="log.message">
-        <xsl:with-param name="level">Note</xsl:with-param>
-        <xsl:with-param name="source" select="$doc.title"/>
-        <xsl:with-param name="context-desc">
-          <xsl:text>namesp. cut</xsl:text>
-        </xsl:with-param>
-        <xsl:with-param name="message">
-          <xsl:text>processing stripped document</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:apply-templates select="exsl:node-set($nons)"/>
-    </xsl:when>
-    <!-- Can't process unless namespace removed -->
-    <xsl:when test="*/self::ng:* or */self::db:*">
-      <xsl:message terminate="yes">
-        <xsl:text>Unable to strip the namespace from DB5 document,</xsl:text>
-        <xsl:text> cannot proceed.</xsl:text>
-      </xsl:message>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$rootid != ''">
-          <xsl:choose>
-            <xsl:when test="count(key('id',$rootid)) = 0">
-              <xsl:message terminate="yes">
-                <xsl:text>ID '</xsl:text>
-                <xsl:value-of select="$rootid"/>
-                <xsl:text>' not found in document.</xsl:text>
-              </xsl:message>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:if test="$collect.xref.targets = 'yes' or                             $collect.xref.targets = 'only'">
-                <xsl:apply-templates select="key('id', $rootid)" mode="collect.targets"/>
-              </xsl:if>
-              <xsl:if test="$collect.xref.targets != 'only'">
-                <xsl:apply-templates select="key('id',$rootid)" mode="process.root"/>
-                <xsl:if test="$tex.math.in.alt != ''">
-                  <xsl:apply-templates select="key('id',$rootid)" mode="collect.tex.math"/>
-                </xsl:if>
-                <xsl:if test="$generate.manifest != 0">
-                  <xsl:call-template name="generate.manifest">
-                    <xsl:with-param name="node" select="key('id',$rootid)"/>
-                  </xsl:call-template>
-                </xsl:if>
-              </xsl:if>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:if test="$collect.xref.targets = 'yes' or                         $collect.xref.targets = 'only'">
-            <xsl:apply-templates select="/" mode="collect.targets"/>
-          </xsl:if>
-          <xsl:if test="$collect.xref.targets != 'only'">
-            <xsl:apply-templates select="/" mode="process.root"/>
-            <xsl:if test="$tex.math.in.alt != ''">
-              <xsl:apply-templates select="/" mode="collect.tex.math"/>
-            </xsl:if>
-            <xsl:if test="$generate.manifest != 0">
-              <xsl:call-template name="generate.manifest">
-                <xsl:with-param name="node" select="/"/>
-              </xsl:call-template>
-            </xsl:if>
-          </xsl:if>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="process.root">
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<!-- ====================================================================== -->
-
-<xsl:template match="set|book|part|preface|chapter|appendix                      |article                      |reference|refentry                      |book/glossary|article/glossary|part/glossary                      |book/bibliography|article/bibliography|part/bibliography                      |colophon">
-  <xsl:choose>
-    <xsl:when test="$onechunk != 0 and parent::*">
-      <xsl:apply-imports/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="process-chunk-element"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="sect1|sect2|sect3|sect4|sect5|section">
-  <xsl:variable name="ischunk">
-    <xsl:call-template name="chunk"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="not(parent::*)">
-      <xsl:call-template name="process-chunk-element"/>
-    </xsl:when>
-    <xsl:when test="$ischunk = 0">
-      <xsl:apply-imports/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="process-chunk-element"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="setindex                      |book/index                      |article/index                      |part/index">
-  <!-- some implementations use completely empty index tags to indicate -->
-  <!-- where an automatically generated index should be inserted. so -->
-  <!-- if the index is completely empty, skip it. -->
-  <xsl:if test="count(*)&gt;0 or $generate.index != '0'">
-    <xsl:call-template name="process-chunk-element"/>
-  </xsl:if>
-</xsl:template>
-
-<!-- Resolve xml:base attributes -->
-<xsl:template match="@fileref">
-  <!-- need a check for absolute urls -->
-  <xsl:choose>
-    <xsl:when test="contains(., ':')">
-      <!-- it has a uri scheme so it is an absolute uri -->
-      <xsl:value-of select="."/>
-    </xsl:when>
-    <xsl:when test="$keep.relative.image.uris != 0">
-      <!-- leave it alone -->
-      <xsl:value-of select="."/>
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- its a relative uri -->
-      <xsl:call-template name="relative-uri">
-        <xsl:with-param name="destdir">
-          <xsl:call-template name="dbhtml-dir">
-            <xsl:with-param name="context" select=".."/>
-          </xsl:call-template>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<xsl:template match="set|book|part|preface|chapter|appendix                      |article                      |reference|refentry                      |sect1|sect2|sect3|sect4|sect5                      |section                      |book/glossary|article/glossary|part/glossary                      |book/bibliography|article/bibliography|part/bibliography                      |colophon" mode="enumerate-files">
-  <xsl:variable name="ischunk"><xsl:call-template name="chunk"/></xsl:variable>
-  <xsl:if test="$ischunk='1'">
-    <xsl:call-template name="make-relative-filename">
-      <xsl:with-param name="base.dir">
-        <xsl:if test="$manifest.in.base.dir = 0">
-          <xsl:value-of select="$base.dir"/>
-        </xsl:if>
-      </xsl:with-param>
-      <xsl:with-param name="base.name">
-        <xsl:apply-templates mode="chunk-filename" select="."/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:text>
-</xsl:text>
-  </xsl:if>
-  <xsl:apply-templates select="*" mode="enumerate-files"/>
-</xsl:template>
-
-<xsl:template match="book/index|article/index|part/index" mode="enumerate-files">
-  <xsl:if test="$htmlhelp.output != 1">
-    <xsl:variable name="ischunk"><xsl:call-template name="chunk"/></xsl:variable>
-    <xsl:if test="$ischunk='1'">
-      <xsl:call-template name="make-relative-filename">
-        <xsl:with-param name="base.dir">
-          <xsl:if test="$manifest.in.base.dir = 0">
-            <xsl:value-of select="$base.dir"/>
-          </xsl:if>
-        </xsl:with-param>
-        <xsl:with-param name="base.name">
-          <xsl:apply-templates mode="chunk-filename" select="."/>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:text>
-</xsl:text>
-    </xsl:if>
-    <xsl:apply-templates select="*" mode="enumerate-files"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="enumerate-files">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-  <xsl:if test="$generate.legalnotice.link != 0">
-    <xsl:call-template name="make-relative-filename">
-      <xsl:with-param name="base.dir">
-        <xsl:if test="$manifest.in.base.dir = 0">
-          <xsl:value-of select="$base.dir"/>
-        </xsl:if>
-      </xsl:with-param>
-      <xsl:with-param name="base.name">
-        <xsl:apply-templates mode="chunk-filename" select="."/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:text>
-</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="mediaobject[imageobject] | inlinemediaobject[imageobject]" mode="enumerate-files">
-  <xsl:variable name="longdesc.uri">
-    <xsl:call-template name="longdesc.uri">
-      <xsl:with-param name="mediaobject" select="."/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="mediaobject" select="."/>
-
-  <xsl:if test="$html.longdesc != 0 and $mediaobject/textobject[not(phrase)]">
-    <xsl:call-template name="longdesc.uri">
-      <xsl:with-param name="mediaobject" select="$mediaobject"/>
-    </xsl:call-template>
-    <xsl:text>
-</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="text()" mode="enumerate-files">
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-common.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk-common.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,1545 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0" xmlns:ng="http://docbook.org/docbook-ng" xmlns:db="http://docbook.org/ns/docbook" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl cf ng db">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:param name="onechunk" select="0"/>
-<xsl:param name="refentry.separator" select="0"/>
-<xsl:param name="chunk.fast" select="0"/>
-
-<xsl:key name="genid" match="*" use="generate-id()"/>
-
-<!-- ==================================================================== -->
-
-<xsl:variable name="chunk.hierarchy">
-  <xsl:if test="$chunk.fast != 0">
-    <xsl:choose>
-      <xsl:when test="function-available('exsl:node-set')">
-        <xsl:message>Computing chunks...</xsl:message>
-        <xsl:apply-templates select="/*" mode="find.chunks"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:message>
-          <xsl:text>Fast chunking requires exsl:node-set(). </xsl:text>
-          <xsl:text>Using "slow" chunking.</xsl:text>
-        </xsl:message>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:if>
-</xsl:variable>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="process-chunk-element">
-  <xsl:param name="content">
-    <xsl:apply-imports/>
-  </xsl:param>
-
-  <xsl:choose>
-    <xsl:when test="$chunk.fast != 0 and function-available('exsl:node-set')">
-      <xsl:variable name="chunks" select="exsl:node-set($chunk.hierarchy)//cf:div"/>
-      <xsl:variable name="genid" select="generate-id()"/>
-
-      <xsl:variable name="div" select="$chunks[@id=$genid or @xml:id=$genid]"/>
-
-      <xsl:variable name="prevdiv" select="($div/preceding-sibling::cf:div|$div/preceding::cf:div|$div/parent::cf:div)[last()]"/>
-      <xsl:variable name="prev" select="key('genid', ($prevdiv/@id|$prevdiv/@xml:id)[1])"/>
-
-      <xsl:variable name="nextdiv" select="($div/following-sibling::cf:div|$div/following::cf:div|$div/cf:div)[1]"/>
-      <xsl:variable name="next" select="key('genid', ($nextdiv/@id|$nextdiv/@xml:id)[1])"/>
-
-      <xsl:choose>
-        <xsl:when test="$onechunk != 0 and parent::*">
-          <xsl:copy-of select="$content"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="process-chunk">
-            <xsl:with-param name="prev" select="$prev"/>
-            <xsl:with-param name="next" select="$next"/>
-            <xsl:with-param name="content" select="$content"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$onechunk != 0 and not(parent::*)">
-          <xsl:call-template name="chunk-all-sections">
-            <xsl:with-param name="content" select="$content"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="$onechunk != 0">
-          <xsl:copy-of select="$content"/>
-        </xsl:when>
-        <xsl:when test="$chunk.first.sections = 0">
-          <xsl:call-template name="chunk-first-section-with-parent">
-            <xsl:with-param name="content" select="$content"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="chunk-all-sections">
-            <xsl:with-param name="content" select="$content"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="process-chunk">
-  <xsl:param name="prev" select="."/>
-  <xsl:param name="next" select="."/>
-  <xsl:param name="content">
-    <xsl:apply-imports/>
-  </xsl:param>
-
-  <xsl:variable name="ischunk">
-    <xsl:call-template name="chunk"/>
-  </xsl:variable>
-
-  <xsl:variable name="chunkfn">
-    <xsl:if test="$ischunk='1'">
-      <xsl:apply-templates mode="chunk-filename" select="."/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:if test="$ischunk='0'">
-    <xsl:message>
-      <xsl:text>Error </xsl:text>
-      <xsl:value-of select="name(.)"/>
-      <xsl:text> is not a chunk!</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:variable name="filename">
-    <xsl:call-template name="make-relative-filename">
-      <xsl:with-param name="base.dir" select="$base.dir"/>
-      <xsl:with-param name="base.name" select="$chunkfn"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="write.chunk">
-    <xsl:with-param name="filename" select="$filename"/>
-    <xsl:with-param name="content">
-      <xsl:call-template name="chunk-element-content">
-        <xsl:with-param name="prev" select="$prev"/>
-        <xsl:with-param name="next" select="$next"/>
-        <xsl:with-param name="content" select="$content"/>
-      </xsl:call-template>
-    </xsl:with-param>
-    <xsl:with-param name="quiet" select="$chunk.quietly"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="chunk-first-section-with-parent">
-  <xsl:param name="content">
-    <xsl:apply-imports/>
-  </xsl:param>
-
-  <!-- These xpath expressions are really hairy. The trick is to pick sections -->
-  <!-- that are not first children and are not the children of first children -->
-
-  <!-- Break these variables into pieces to work around
-       http://nagoya.apache.org/bugzilla/show_bug.cgi?id=6063 -->
-
-  <xsl:variable name="prev-v1" select="(ancestor::sect1[$chunk.section.depth &gt; 0                                and preceding-sibling::sect1][1]               |ancestor::sect2[$chunk.section.depth &gt; 1                                and preceding-sibling::sect2                                and parent::sect1[preceding-sibling::sect1]][1]               |ancestor::sect3[$chunk.section.depth &gt; 2                                and preceding-sibling::sect3                                and parent::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |ancestor::sect4[$chunk.section.depth &gt; 3                                and preceding-sibling::sect4                                and parent::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |ancestor::sect5[$chunk.section.depth &gt; 4                                and preceding-sibling::sect5                                and parent::sect4[preceding-sibling::sect4]                                and ancestor::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |ancestor::section[$chunk.section.depth &gt; count(ancestor::section)                                 and not(ancestor::section[not(preceding-sibling::section)])][1])[last()]"/>
-
-  <xsl:variable name="prev-v2" select="(preceding::sect1[$chunk.section.depth &gt; 0                                and preceding-sibling::sect1][1]               |preceding::sect2[$chunk.section.depth &gt; 1                                and preceding-sibling::sect2                                and parent::sect1[preceding-sibling::sect1]][1]               |preceding::sect3[$chunk.section.depth &gt; 2                                and preceding-sibling::sect3                                and parent::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |preceding::sect4[$chunk.section.depth &gt; 3                                and preceding-sibling::sect4                                and parent::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |preceding::sect5[$chunk.section.depth &gt; 4                                and preceding-sibling::sect5                                and parent::sect4[preceding-sibling::sect4]                                and ancestor::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |preceding::section[$chunk.section.depth &gt; count(ancestor::section)                                  and preceding-sibling::section                                  and not(ancestor::section[not(preceding-sibling::section)])][1])[last()]"/>
-
-  <xsl:variable name="prev" select="(preceding::book[1]              |preceding::preface[1]              |preceding::chapter[1]              |preceding::appendix[1]              |preceding::part[1]              |preceding::reference[1]              |preceding::refentry[1]              |preceding::colophon[1]              |preceding::article[1]              |preceding::bibliography[parent::article or parent::book or parent::part][1]              |preceding::glossary[parent::article or parent::book or parent::part][1]              |preceding::index[$generate.index != 0]                                [parent::article or parent::book or parent::part][1]              |preceding::setindex[$generate.index != 0][1]              |ancestor::set              |ancestor::book[1]              |ancestor::preface[1]              |ancestor::chapter[1]              |ancestor::appendix[1]              |ancestor::part[1]              |ancestor::reference[1]              |ancestor::article[1]              |$prev-v1              |$prev-v2)[last()]"/>
-
-  <xsl:variable name="next-v1" select="(following::sect1[$chunk.section.depth &gt; 0                                and preceding-sibling::sect1][1]               |following::sect2[$chunk.section.depth &gt; 1                                and preceding-sibling::sect2                                and parent::sect1[preceding-sibling::sect1]][1]               |following::sect3[$chunk.section.depth &gt; 2                                and preceding-sibling::sect3                                and parent::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |following::sect4[$chunk.section.depth &gt; 3                                and preceding-sibling::sect4                                and parent::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |following::sect5[$chunk.section.depth &gt; 4                                and preceding-sibling::sect5                                and parent::sect4[preceding-sibling::sect4]                                and ancestor::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |following::section[$chunk.section.depth &gt; count(ancestor::section)                                  and preceding-sibling::section                                  and not(ancestor::section[not(preceding-sibling::section)])][1])[1]"/>
-
-  <xsl:variable name="next-v2" select="(descendant::sect1[$chunk.section.depth &gt; 0                                and preceding-sibling::sect1][1]               |descendant::sect2[$chunk.section.depth &gt; 1                                and preceding-sibling::sect2                                and parent::sect1[preceding-sibling::sect1]][1]               |descendant::sect3[$chunk.section.depth &gt; 2                                and preceding-sibling::sect3                                and parent::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |descendant::sect4[$chunk.section.depth &gt; 3                                and preceding-sibling::sect4                                and parent::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |descendant::sect5[$chunk.section.depth &gt; 4                                and preceding-sibling::sect5                                and parent::sect4[preceding-sibling::sect4]                                and ancestor::sect3[preceding-sibling::sect3]                                and ancestor::sect2[preceding-sibling::sect2]                                and ancestor::sect1[preceding-sibling::sect1]][1]               |descendant::section[$chunk.section.depth &gt; count(ancestor::section)                                  and preceding-sibling::section                                  and not(ancestor::section[not(preceding-sibling::section)])])[1]"/>
-
-  <xsl:variable name="next" select="(following::book[1]              |following::preface[1]              |following::chapter[1]              |following::appendix[1]              |following::part[1]              |following::reference[1]              |following::refentry[1]              |following::colophon[1]              |following::bibliography[parent::article or parent::book or parent::part][1]              |following::glossary[parent::article or parent::book or parent::part][1]              |following::index[$generate.index != 0]                                [parent::article or parent::book or parent::part][1]              |following::article[1]              |following::setindex[$generate.index != 0][1]              |descendant::book[1]              |descendant::preface[1]              |descendant::chapter[1]              |descendant::appendix[1]              |descendant::article[1]              |descendant::bibliography[parent::article or parent::book or parent::part][1]              |descendant::glossary[parent::article or parent::book or parent::part][1]              |descendant::index[$generate.index != 0]                                [parent::article or parent::book or parent::part][1]              |descendant::colophon[1]              |descendant::setindex[$generate.index != 0][1]              |descendant::part[1]              |descendant::reference[1]              |descendant::refentry[1]              |$next-v1              |$next-v2)[1]"/>
-
-  <xsl:call-template name="process-chunk">
-    <xsl:with-param name="prev" select="$prev"/>
-    <xsl:with-param name="next" select="$next"/>
-    <xsl:with-param name="content" select="$content"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="chunk-all-sections">
-  <xsl:param name="content">
-    <xsl:apply-imports/>
-  </xsl:param>
-
-  <xsl:variable name="prev-v1" select="(preceding::sect1[$chunk.section.depth &gt; 0][1]              |preceding::sect2[$chunk.section.depth &gt; 1][1]              |preceding::sect3[$chunk.section.depth &gt; 2][1]              |preceding::sect4[$chunk.section.depth &gt; 3][1]              |preceding::sect5[$chunk.section.depth &gt; 4][1]              |preceding::section[$chunk.section.depth &gt; count(ancestor::section)][1])[last()]"/>
-
-  <xsl:variable name="prev-v2" select="(ancestor::sect1[$chunk.section.depth &gt; 0][1]              |ancestor::sect2[$chunk.section.depth &gt; 1][1]              |ancestor::sect3[$chunk.section.depth &gt; 2][1]              |ancestor::sect4[$chunk.section.depth &gt; 3][1]              |ancestor::sect5[$chunk.section.depth &gt; 4][1]              |ancestor::section[$chunk.section.depth &gt; count(ancestor::section)][1])[last()]"/>
-
-  <xsl:variable name="prev" select="(preceding::book[1]              |preceding::preface[1]              |preceding::chapter[1]              |preceding::appendix[1]              |preceding::part[1]              |preceding::reference[1]              |preceding::refentry[1]              |preceding::colophon[1]              |preceding::article[1]              |preceding::bibliography[parent::article or parent::book or parent::part][1]              |preceding::glossary[parent::article or parent::book or parent::part][1]              |preceding::index[$generate.index != 0]                                [parent::article or parent::book or parent::part][1]              |preceding::setindex[$generate.index != 0][1]              |ancestor::set              |ancestor::book[1]              |ancestor::preface[1]              |ancestor::chapter[1]              |ancestor::appendix[1]              |ancestor::part[1]              |ancestor::reference[1]              |ancestor::article[1]              |$prev-v1              |$prev-v2)[last()]"/>
-
-  <xsl:variable name="next-v1" select="(following::sect1[$chunk.section.depth &gt; 0][1]              |following::sect2[$chunk.section.depth &gt; 1][1]              |following::sect3[$chunk.section.depth &gt; 2][1]              |following::sect4[$chunk.section.depth &gt; 3][1]              |following::sect5[$chunk.section.depth &gt; 4][1]              |following::section[$chunk.section.depth &gt; count(ancestor::section)][1])[1]"/>
-
-  <xsl:variable name="next-v2" select="(descendant::sect1[$chunk.section.depth &gt; 0][1]              |descendant::sect2[$chunk.section.depth &gt; 1][1]              |descendant::sect3[$chunk.section.depth &gt; 2][1]              |descendant::sect4[$chunk.section.depth &gt; 3][1]              |descendant::sect5[$chunk.section.depth &gt; 4][1]              |descendant::section[$chunk.section.depth                                    &gt; count(ancestor::section)][1])[1]"/>
-
-  <xsl:variable name="next" select="(following::book[1]              |following::preface[1]              |following::chapter[1]              |following::appendix[1]              |following::part[1]              |following::reference[1]              |following::refentry[1]              |following::colophon[1]              |following::bibliography[parent::article or parent::book or parent::part][1]              |following::glossary[parent::article or parent::book or parent::part][1]              |following::index[$generate.index != 0]                                [parent::article or parent::book][1]              |following::article[1]              |following::setindex[$generate.index != 0][1]              |descendant::book[1]              |descendant::preface[1]              |descendant::chapter[1]              |descendant::appendix[1]              |descendant::article[1]              |descendant::bibliography[parent::article or parent::book][1]              |descendant::glossary[parent::article or parent::book or parent::part][1]              |descendant::index[$generate.index != 0]                                [parent::article or parent::book][1]              |descendant::colophon[1]              |descendant::setindex[$generate.index != 0][1]              |descendant::part[1]              |descendant::reference[1]              |descendant::refentry[1]              |$next-v1              |$next-v2)[1]"/>
-
-  <xsl:call-template name="process-chunk">
-    <xsl:with-param name="prev" select="$prev"/>
-    <xsl:with-param name="next" select="$next"/>
-    <xsl:with-param name="content" select="$content"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- ==================================================================== -->
-
-<xsl:template name="make.lots">
-  <xsl:param name="toc.params" select="''"/>
-  <xsl:param name="toc"/>
-
-  <xsl:variable name="lots">
-    <xsl:if test="contains($toc.params, 'toc')">
-      <xsl:copy-of select="$toc"/>
-    </xsl:if>
-
-    <xsl:if test="contains($toc.params, 'figure')">
-      <xsl:choose>
-        <xsl:when test="$chunk.separate.lots != '0'">
-          <xsl:call-template name="make.lot.chunk">
-            <xsl:with-param name="type" select="'figure'"/>
-            <xsl:with-param name="lot">
-              <xsl:call-template name="list.of.titles">
-                <xsl:with-param name="titles" select="'figure'"/>
-                <xsl:with-param name="nodes" select=".//figure"/>
-              </xsl:call-template>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="list.of.titles">
-            <xsl:with-param name="titles" select="'figure'"/>
-            <xsl:with-param name="nodes" select=".//figure"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-
-    <xsl:if test="contains($toc.params, 'table')">
-      <xsl:choose>
-        <xsl:when test="$chunk.separate.lots != '0'">
-          <xsl:call-template name="make.lot.chunk">
-            <xsl:with-param name="type" select="'table'"/>
-            <xsl:with-param name="lot">
-              <xsl:call-template name="list.of.titles">
-                <xsl:with-param name="titles" select="'table'"/>
-                <xsl:with-param name="nodes" select=".//table"/>
-              </xsl:call-template>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="list.of.titles">
-            <xsl:with-param name="titles" select="'table'"/>
-            <xsl:with-param name="nodes" select=".//table"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-
-    <xsl:if test="contains($toc.params, 'example')">
-      <xsl:choose>
-        <xsl:when test="$chunk.separate.lots != '0'">
-          <xsl:call-template name="make.lot.chunk">
-            <xsl:with-param name="type" select="'example'"/>
-            <xsl:with-param name="lot">
-              <xsl:call-template name="list.of.titles">
-                <xsl:with-param name="titles" select="'example'"/>
-                <xsl:with-param name="nodes" select=".//example"/>
-              </xsl:call-template>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="list.of.titles">
-            <xsl:with-param name="titles" select="'example'"/>
-            <xsl:with-param name="nodes" select=".//example"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-
-    <xsl:if test="contains($toc.params, 'equation')">
-      <xsl:choose>
-        <xsl:when test="$chunk.separate.lots != '0'">
-          <xsl:call-template name="make.lot.chunk">
-            <xsl:with-param name="type" select="'equation'"/>
-            <xsl:with-param name="lot">
-              <xsl:call-template name="list.of.titles">
-                <xsl:with-param name="titles" select="'equation'"/>
-                <xsl:with-param name="nodes" select=".//equation"/>
-              </xsl:call-template>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="list.of.titles">
-            <xsl:with-param name="titles" select="'equation'"/>
-            <xsl:with-param name="nodes" select=".//equation"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-
-    <xsl:if test="contains($toc.params, 'procedure')">
-      <xsl:choose>
-        <xsl:when test="$chunk.separate.lots != '0'">
-          <xsl:call-template name="make.lot.chunk">
-            <xsl:with-param name="type" select="'procedure'"/>
-            <xsl:with-param name="lot">
-              <xsl:call-template name="list.of.titles">
-                <xsl:with-param name="titles" select="'procedure'"/>
-                <xsl:with-param name="nodes" select=".//procedure[title]"/>
-              </xsl:call-template>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="list.of.titles">
-            <xsl:with-param name="titles" select="'procedure'"/>
-            <xsl:with-param name="nodes" select=".//procedure[title]"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:if test="string($lots) != ''">
-    <xsl:choose>
-      <xsl:when test="$chunk.tocs.and.lots != 0 and not(parent::*)">
-        <xsl:call-template name="write.chunk">
-          <xsl:with-param name="filename">
-            <xsl:call-template name="make-relative-filename">
-              <xsl:with-param name="base.dir" select="$base.dir"/>
-              <xsl:with-param name="base.name">
-                <xsl:call-template name="dbhtml-dir"/>
-                <xsl:apply-templates select="." mode="recursive-chunk-filename">
-                  <xsl:with-param name="recursive" select="true()"/>
-                </xsl:apply-templates>
-                <xsl:text>-toc</xsl:text>
-                <xsl:value-of select="$html.ext"/>
-              </xsl:with-param>
-            </xsl:call-template>
-          </xsl:with-param>
-          <xsl:with-param name="content">
-            <xsl:call-template name="chunk-element-content">
-              <xsl:with-param name="prev" select="/foo"/>
-              <xsl:with-param name="next" select="/foo"/>
-              <xsl:with-param name="nav.context" select="'toc'"/>
-              <xsl:with-param name="content">
-                <xsl:if test="$chunk.tocs.and.lots.has.title != 0">
-                  <h1>
-                    <xsl:apply-templates select="." mode="object.title.markup"/>
-                  </h1>
-                </xsl:if>
-                <xsl:copy-of select="$lots"/>
-              </xsl:with-param>
-            </xsl:call-template>
-          </xsl:with-param>
-          <xsl:with-param name="quiet" select="$chunk.quietly"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:copy-of select="$lots"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="make.lot.chunk">
-  <xsl:param name="type" select="''"/>
-  <xsl:param name="lot"/>
-
-  <xsl:if test="string($lot) != ''">
-    <xsl:variable name="filename">
-      <xsl:call-template name="make-relative-filename">
-        <xsl:with-param name="base.dir" select="$base.dir"/>
-        <xsl:with-param name="base.name">
-          <xsl:call-template name="dbhtml-dir"/>
-          <xsl:value-of select="$type"/>
-          <xsl:text>-toc</xsl:text>
-          <xsl:value-of select="$html.ext"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:variable name="href">
-      <xsl:call-template name="make-relative-filename">
-        <xsl:with-param name="base.name">
-          <xsl:call-template name="dbhtml-dir"/>
-          <xsl:value-of select="$type"/>
-          <xsl:text>-toc</xsl:text>
-          <xsl:value-of select="$html.ext"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:call-template name="write.chunk">
-      <xsl:with-param name="filename" select="$filename"/>
-      <xsl:with-param name="content">
-        <xsl:call-template name="chunk-element-content">
-          <xsl:with-param name="prev" select="/foo"/>
-          <xsl:with-param name="next" select="/foo"/>
-          <xsl:with-param name="nav.context" select="'toc'"/>
-          <xsl:with-param name="content">
-            <xsl:copy-of select="$lot"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:with-param>
-      <xsl:with-param name="quiet" select="$chunk.quietly"/>
-    </xsl:call-template>
-    <!-- And output a link to this file -->
-    <div>
-      <xsl:attribute name="class">
-        <xsl:text>ListofTitles</xsl:text>
-      </xsl:attribute>
-      <a href="{$href}">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key">
-            <xsl:choose>
-              <xsl:when test="$type='table'">ListofTables</xsl:when>
-              <xsl:when test="$type='figure'">ListofFigures</xsl:when>
-              <xsl:when test="$type='equation'">ListofEquations</xsl:when>
-              <xsl:when test="$type='example'">ListofExamples</xsl:when>
-              <xsl:when test="$type='procedure'">ListofProcedures</xsl:when>
-              <xsl:otherwise>ListofUnknown</xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
-        </xsl:call-template>
-      </a>
-    </div>
-  </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="in.other.chunk">
-  <xsl:param name="chunk" select="."/>
-  <xsl:param name="node" select="."/>
-
-  <xsl:variable name="is.chunk">
-    <xsl:call-template name="chunk">
-      <xsl:with-param name="node" select="$node"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-<!--
-  <xsl:message>
-    <xsl:text>in.other.chunk: </xsl:text>
-    <xsl:value-of select="name($chunk)"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="name($node)"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="$chunk = $node"/>
-    <xsl:text> </xsl:text>
-    <xsl:value-of select="$is.chunk"/>
-  </xsl:message>
--->
-
-  <xsl:choose>
-    <xsl:when test="$chunk = $node">0</xsl:when>
-    <xsl:when test="$is.chunk = 1">1</xsl:when>
-    <xsl:when test="count($node) = 0">0</xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="in.other.chunk">
-        <xsl:with-param name="chunk" select="$chunk"/>
-        <xsl:with-param name="node" select="$node/parent::*"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="count.footnotes.in.this.chunk">
-  <xsl:param name="node" select="."/>
-  <xsl:param name="footnotes" select="$node//footnote"/>
-  <xsl:param name="count" select="0"/>
-
-<!--
-  <xsl:message>
-    <xsl:text>count.footnotes.in.this.chunk: </xsl:text>
-    <xsl:value-of select="name($node)"/>
-  </xsl:message>
--->
-
-  <xsl:variable name="in.other.chunk">
-    <xsl:call-template name="in.other.chunk">
-      <xsl:with-param name="chunk" select="$node"/>
-      <xsl:with-param name="node" select="$footnotes[1]"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="count($footnotes) = 0">
-      <xsl:value-of select="$count"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$in.other.chunk != 0">
-          <xsl:call-template name="count.footnotes.in.this.chunk">
-            <xsl:with-param name="node" select="$node"/>
-            <xsl:with-param name="footnotes" select="$footnotes[position() &gt; 1]"/>
-            <xsl:with-param name="count" select="$count"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="$footnotes[1]/ancestor::table                         |$footnotes[1]/ancestor::informaltable">
-          <xsl:call-template name="count.footnotes.in.this.chunk">
-            <xsl:with-param name="node" select="$node"/>
-            <xsl:with-param name="footnotes" select="$footnotes[position() &gt; 1]"/>
-            <xsl:with-param name="count" select="$count"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="count.footnotes.in.this.chunk">
-            <xsl:with-param name="node" select="$node"/>
-            <xsl:with-param name="footnotes" select="$footnotes[position() &gt; 1]"/>
-            <xsl:with-param name="count" select="$count + 1"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="process.footnotes.in.this.chunk">
-  <xsl:param name="node" select="."/>
-  <xsl:param name="footnotes" select="$node//footnote"/>
-
-<!--
-  <xsl:message>process.footnotes.in.this.chunk</xsl:message>
--->
-
-  <xsl:variable name="in.other.chunk">
-    <xsl:call-template name="in.other.chunk">
-      <xsl:with-param name="chunk" select="$node"/>
-      <xsl:with-param name="node" select="$footnotes[1]"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="count($footnotes) = 0">
-      <!-- nop -->
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$in.other.chunk != 0">
-          <xsl:call-template name="process.footnotes.in.this.chunk">
-            <xsl:with-param name="node" select="$node"/>
-            <xsl:with-param name="footnotes" select="$footnotes[position() &gt; 1]"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="$footnotes[1]/ancestor::table                         |$footnotes[1]/ancestor::informaltable">
-          <xsl:call-template name="process.footnotes.in.this.chunk">
-            <xsl:with-param name="node" select="$node"/>
-            <xsl:with-param name="footnotes" select="$footnotes[position() &gt; 1]"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="$footnotes[1]" mode="process.footnote.mode"/>
-          <xsl:call-template name="process.footnotes.in.this.chunk">
-            <xsl:with-param name="node" select="$node"/>
-            <xsl:with-param name="footnotes" select="$footnotes[position() &gt; 1]"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="process.footnotes">
-  <xsl:variable name="footnotes" select=".//footnote"/>
-  <xsl:variable name="fcount">
-    <xsl:call-template name="count.footnotes.in.this.chunk">
-      <xsl:with-param name="node" select="."/>
-      <xsl:with-param name="footnotes" select="$footnotes"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-<!--
-  <xsl:message>
-    <xsl:value-of select="name(.)"/>
-    <xsl:text> fcount: </xsl:text>
-    <xsl:value-of select="$fcount"/>
-  </xsl:message>
--->
-
-  <!-- Only bother to do this if there's at least one non-table footnote -->
-  <xsl:if test="$fcount &gt; 0">
-    <div class="footnotes">
-      <br/>
-      <hr width="100" align="left"/>
-      <xsl:call-template name="process.footnotes.in.this.chunk">
-        <xsl:with-param name="node" select="."/>
-        <xsl:with-param name="footnotes" select="$footnotes"/>
-      </xsl:call-template>
-    </div>
-  </xsl:if>
-
-  <!-- FIXME: When chunking, only the annotations actually used
-              in this chunk should be referenced. I don't think it
-              does any harm to reference them all, but it adds
-              unnecessary bloat to each chunk. -->
-  <xsl:if test="$annotation.support != 0 and //annotation">
-    <div class="annotation-list">
-      <div class="annotation-nocss">
-        <p>The following annotations are from this essay. You are seeing
-        them here because your browser doesn&#8217;t support the user-interface
-        techniques used to make them appear as &#8216;popups&#8217; on modern browsers.</p>
-      </div>
-
-      <xsl:apply-templates select="//annotation" mode="annotation-popup"/>
-    </div>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="process.chunk.footnotes">
-  <xsl:variable name="is.chunk">
-    <xsl:call-template name="chunk"/>
-  </xsl:variable>
-  <xsl:if test="$is.chunk = 1">
-    <xsl:call-template name="process.footnotes"/>
-  </xsl:if>
-</xsl:template>
-
-<!-- ====================================================================== -->
-
-<xsl:template name="chunk">
-  <xsl:param name="node" select="."/>
-  <!-- returns 1 if $node is a chunk -->
-
-  <!-- ==================================================================== -->
-  <!-- What's a chunk?
-
-       The root element
-       appendix
-       article
-       bibliography  in article or part or book
-       book
-       chapter
-       colophon
-       glossary      in article or part or book
-       index         in article or part or book
-       part
-       preface
-       refentry
-       reference
-       sect{1,2,3,4,5}  if position()>1 && depth < chunk.section.depth
-       section          if position()>1 && depth < chunk.section.depth
-       set
-       setindex
-                                                                            -->
-  <!-- ==================================================================== -->
-
-<!--
-  <xsl:message>
-    <xsl:text>chunk: </xsl:text>
-    <xsl:value-of select="name($node)"/>
-    <xsl:text>(</xsl:text>
-    <xsl:value-of select="$node/@id"/>
-    <xsl:text>)</xsl:text>
-    <xsl:text> csd: </xsl:text>
-    <xsl:value-of select="$chunk.section.depth"/>
-    <xsl:text> cfs: </xsl:text>
-    <xsl:value-of select="$chunk.first.sections"/>
-    <xsl:text> ps: </xsl:text>
-    <xsl:value-of select="count($node/parent::section)"/>
-    <xsl:text> prs: </xsl:text>
-    <xsl:value-of select="count($node/preceding-sibling::section)"/>
-  </xsl:message>
--->
-
-  <xsl:choose>
-    <xsl:when test="not($node/parent::*)">1</xsl:when>
-
-    <xsl:when test="local-name($node) = 'sect1'                     and $chunk.section.depth &gt;= 1                     and ($chunk.first.sections != 0                          or count($node/preceding-sibling::sect1) &gt; 0)">
-      <xsl:text>1</xsl:text>
-    </xsl:when>
-    <xsl:when test="local-name($node) = 'sect2'                     and $chunk.section.depth &gt;= 2                     and ($chunk.first.sections != 0                          or count($node/preceding-sibling::sect2) &gt; 0)">
-      <xsl:call-template name="chunk">
-        <xsl:with-param name="node" select="$node/parent::*"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="local-name($node) = 'sect3'                     and $chunk.section.depth &gt;= 3                     and ($chunk.first.sections != 0                          or count($node/preceding-sibling::sect3) &gt; 0)">
-      <xsl:call-template name="chunk">
-        <xsl:with-param name="node" select="$node/parent::*"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="local-name($node) = 'sect4'                     and $chunk.section.depth &gt;= 4                     and ($chunk.first.sections != 0                          or count($node/preceding-sibling::sect4) &gt; 0)">
-      <xsl:call-template name="chunk">
-        <xsl:with-param name="node" select="$node/parent::*"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="local-name($node) = 'sect5'                     and $chunk.section.depth &gt;= 5                     and ($chunk.first.sections != 0                          or count($node/preceding-sibling::sect5) &gt; 0)">
-      <xsl:call-template name="chunk">
-        <xsl:with-param name="node" select="$node/parent::*"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="local-name($node) = 'section'                     and $chunk.section.depth &gt;= count($node/ancestor::section)+1                     and ($chunk.first.sections != 0                          or count($node/preceding-sibling::section) &gt; 0)">
-      <xsl:call-template name="chunk">
-        <xsl:with-param name="node" select="$node/parent::*"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:when test="local-name($node)='preface'">1</xsl:when>
-    <xsl:when test="local-name($node)='chapter'">1</xsl:when>
-    <xsl:when test="local-name($node)='appendix'">1</xsl:when>
-    <xsl:when test="local-name($node)='article'">1</xsl:when>
-    <xsl:when test="local-name($node)='part'">1</xsl:when>
-    <xsl:when test="local-name($node)='reference'">1</xsl:when>
-    <xsl:when test="local-name($node)='refentry'">1</xsl:when>
-    <xsl:when test="local-name($node)='index' and ($generate.index != 0 or count($node/*) &gt; 0)                     and (local-name($node/parent::*) = 'article'                     or local-name($node/parent::*) = 'book'                     or local-name($node/parent::*) = 'part'                     )">1</xsl:when>
-    <xsl:when test="local-name($node)='bibliography'                     and (local-name($node/parent::*) = 'article'                     or local-name($node/parent::*) = 'book'                     or local-name($node/parent::*) = 'part'                     )">1</xsl:when>
-    <xsl:when test="local-name($node)='glossary'                     and (local-name($node/parent::*) = 'article'                     or local-name($node/parent::*) = 'book'                     or local-name($node/parent::*) = 'part'                     )">1</xsl:when>
-    <xsl:when test="local-name($node)='colophon'">1</xsl:when>
-    <xsl:when test="local-name($node)='book'">1</xsl:when>
-    <xsl:when test="local-name($node)='set'">1</xsl:when>
-    <xsl:when test="local-name($node)='setindex'">1</xsl:when>
-    <xsl:when test="local-name($node)='legalnotice'                     and $generate.legalnotice.link != 0">1</xsl:when>
-    <xsl:otherwise>0</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<xsl:template name="href.target.uri">
-  <xsl:param name="object" select="."/>
-  <xsl:variable name="ischunk">
-    <xsl:call-template name="chunk">
-      <xsl:with-param name="node" select="$object"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:apply-templates mode="chunk-filename" select="$object"/>
-
-  <xsl:if test="$ischunk='0'">
-    <xsl:text>#</xsl:text>
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$object"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="href.target">
-  <xsl:param name="context" select="."/>
-  <xsl:param name="object" select="."/>
-  <xsl:param name="toc-context" select="."/>
-  <!-- * If $toc-context contains some node other than the current node, -->
-  <!-- * it means we're processing a link in a TOC. In that case, to -->
-  <!-- * ensure the link will work correctly, we need to take a look at -->
-  <!-- * where the file containing the TOC will get written, and where -->
-  <!-- * the file that's being linked to will get written. -->
-  <xsl:variable name="toc-output-dir">
-    <xsl:if test="not($toc-context = .)">
-      <!-- * Get the $toc-context node and all its ancestors, look down -->
-      <!-- * through them to find the last/closest node to the -->
-      <!-- * toc-context node that has a "dbhtml dir" PI, and get the -->
-      <!-- * directory name from that. That's the name of the directory -->
-      <!-- * to which the current toc output file will get written. -->
-      <xsl:call-template name="dbhtml-dir">
-        <xsl:with-param name="context" select="$toc-context/ancestor-or-self::*[processing-instruction('dbhtml')[contains(.,'dir')]][last()]"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="linked-file-output-dir">
-    <xsl:if test="not($toc-context = .)">
-      <!-- * Get the current node and all its ancestors, look down -->
-      <!-- * through them to find the last/closest node to the current -->
-      <!-- * node that has a "dbhtml dir" PI, and get the directory name -->
-      <!-- * from that.  That's the name of the directory to which the -->
-      <!-- * file that's being linked to will get written. -->
-      <xsl:call-template name="dbhtml-dir">
-        <xsl:with-param name="context" select="ancestor-or-self::*[processing-instruction('dbhtml')[contains(.,'dir')]][last()]"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="href.to.uri">
-    <xsl:call-template name="href.target.uri">
-      <xsl:with-param name="object" select="$object"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="href.from.uri">
-    <xsl:call-template name="href.target.uri">
-      <xsl:with-param name="object" select="$context"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <!-- * <xsl:message>toc-context: <xsl:value-of select="local-name($toc-context)"/></xsl:message> -->
-  <!-- * <xsl:message>node: <xsl:value-of select="local-name(.)"/></xsl:message> -->
-  <!-- * <xsl:message>context: <xsl:value-of select="local-name($context)"/></xsl:message> -->
-  <!-- * <xsl:message>object: <xsl:value-of select="local-name($object)"/></xsl:message> -->
-  <!-- * <xsl:message>toc-output-dir: <xsl:value-of select="$toc-output-dir"/></xsl:message> -->
-  <!-- * <xsl:message>linked-file-output-dir: <xsl:value-of select="$linked-file-output-dir"/></xsl:message> -->
-  <!-- * <xsl:message>href.to.uri: <xsl:value-of select="$href.to.uri"/></xsl:message> -->
-  <!-- * <xsl:message>href.from.uri: <xsl:value-of select="$href.from.uri"/></xsl:message> -->
-  <xsl:variable name="href.to">
-    <xsl:choose>
-      <!-- * 2007-07-19, MikeSmith: Added the following conditional to -->
-      <!-- * deal with a problem case for links in TOCs. It checks to see -->
-      <!-- * if the output dir that a TOC will get written to is -->
-      <!-- * different from the output dir of the file being linked to. -->
-      <!-- * If it is different, we do not call trim.common.uri.paths. -->
-      <!-- *  -->
-      <!-- * Reason why I added that conditional is: I ran into a bug for -->
-      <!-- * this case: -->
-      <!-- *  -->
-      <!-- * 1. we are chunking into separate dirs -->
-      <!-- *  -->
-      <!-- * 2. output for the TOC is written to current dir, but the file -->
-      <!-- *    being linked to is written to some subdir "foo". -->
-      <!-- *  -->
-      <!-- * For that case, links to that file in that TOC did not show -->
-      <!-- * the correct path - they omitted the "foo". -->
-      <!-- *  -->
-      <!-- * The cause of that problem was that the trim.common.uri.paths -->
-      <!-- * template[1] was being called under all conditions. But it's -->
-      <!-- * apparent that we don't want to call trim.common.uri.paths in -->
-      <!-- * the case where a linked file is being written to a different -->
-      <!-- * directory than the TOC that contains the link, because doing -->
-      <!-- * so will cause a necessary (not redundant) directory-name -->
-      <!-- * part of the link to get inadvertently trimmed, resulting in -->
-      <!-- * a broken link to that file. Thus, added the conditional. -->
-      <!-- *  -->
-      <!-- * [1] The purpose of the trim.common.uri.paths template is to -->
-      <!-- * prevent cases where, if we didn't call it, we end up with -->
-      <!-- * unnecessary, redundant directory names getting output; for -->
-      <!-- * example, "foo/foo/refname.html". -->
-      <xsl:when test="not($toc-output-dir = $linked-file-output-dir)">
-        <xsl:value-of select="$href.to.uri"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="trim.common.uri.paths">
-          <xsl:with-param name="uriA" select="$href.to.uri"/>
-          <xsl:with-param name="uriB" select="$href.from.uri"/>
-          <xsl:with-param name="return" select="'A'"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:variable name="href.from">
-    <xsl:call-template name="trim.common.uri.paths">
-      <xsl:with-param name="uriA" select="$href.to.uri"/>
-      <xsl:with-param name="uriB" select="$href.from.uri"/>
-      <xsl:with-param name="return" select="'B'"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="depth">
-    <xsl:call-template name="count.uri.path.depth">
-      <xsl:with-param name="filename" select="$href.from"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="href">
-    <xsl:call-template name="copy-string">
-      <xsl:with-param name="string" select="'../'"/>
-      <xsl:with-param name="count" select="$depth"/>
-    </xsl:call-template>
-    <xsl:value-of select="$href.to"/>
-  </xsl:variable>
-  <!--
-  <xsl:message>
-    <xsl:text>In </xsl:text>
-    <xsl:value-of select="name(.)"/>
-    <xsl:text> (</xsl:text>
-    <xsl:value-of select="$href.from"/>
-    <xsl:text>,</xsl:text>
-    <xsl:value-of select="$depth"/>
-    <xsl:text>) </xsl:text>
-    <xsl:value-of select="name($object)"/>
-    <xsl:text> href=</xsl:text>
-    <xsl:value-of select="$href"/>
-  </xsl:message>
-  -->
-  <xsl:value-of select="$href"/>
-</xsl:template>
-
-<!-- Returns the complete olink href value if found -->
-<!-- Must take into account any dbhtml dir of the chunk containing the olink -->
-<xsl:template name="make.olink.href">
-  <xsl:param name="olink.key" select="''"/>
-  <xsl:param name="target.database"/>
-
-  <xsl:if test="$olink.key != ''">
-    <xsl:variable name="target.href">
-      <xsl:for-each select="$target.database">
-        <xsl:value-of select="key('targetptr-key', $olink.key)/@href"/>
-      </xsl:for-each>
-    </xsl:variable>
-  
-    <!-- an olink starting point may be in a subdirectory, so need
-         the "from" reference point to compute a relative path -->
-
-    <xsl:variable name="from.href">
-      <xsl:call-template name="olink.from.uri">
-        <xsl:with-param name="target.database" select="$target.database"/>
-        <xsl:with-param name="object" select="."/>
-        <xsl:with-param name="object.targetdoc" select="$current.docid"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <!-- If the from.href has directory path, then must "../" upward
-         to document level -->
-    <xsl:variable name="upward.from.path">
-      <xsl:call-template name="upward.path">
-        <xsl:with-param name="path" select="$from.href"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:variable name="targetdoc">
-      <xsl:value-of select="substring-before($olink.key, '/')"/>
-    </xsl:variable>
-  
-    <!-- Does the target database use a sitemap? -->
-    <xsl:variable name="use.sitemap">
-      <xsl:choose>
-        <xsl:when test="$target.database//sitemap">1</xsl:when>
-        <xsl:otherwise>0</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-  
-  
-    <!-- Get the baseuri for this targetptr -->
-    <xsl:variable name="baseuri">
-      <xsl:choose>
-        <!-- Does the database use a sitemap? -->
-        <xsl:when test="$use.sitemap != 0">
-          <xsl:choose>
-            <!-- Was current.docid parameter set? -->
-            <xsl:when test="$current.docid != ''">
-              <!-- Was it found in the database? -->
-              <xsl:variable name="currentdoc.key">
-                <xsl:for-each select="$target.database">
-                  <xsl:value-of select="key('targetdoc-key',                                         $current.docid)/@targetdoc"/>
-                </xsl:for-each>
-              </xsl:variable>
-              <xsl:choose>
-                <xsl:when test="$currentdoc.key != ''">
-                  <xsl:for-each select="$target.database">
-                    <xsl:call-template name="targetpath">
-                      <xsl:with-param name="dirnode" select="key('targetdoc-key', $current.docid)/parent::dir"/>
-                      <xsl:with-param name="targetdoc" select="$targetdoc"/>
-                    </xsl:call-template>
-                  </xsl:for-each>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:message>
-                    <xsl:text>Olink error: cannot compute relative </xsl:text>
-                    <xsl:text>sitemap path because $current.docid '</xsl:text>
-                    <xsl:value-of select="$current.docid"/>
-                    <xsl:text>' not found in target database.</xsl:text>
-                  </xsl:message>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:message>
-                <xsl:text>Olink warning: cannot compute relative </xsl:text>
-                <xsl:text>sitemap path without $current.docid parameter</xsl:text>
-              </xsl:message>
-            </xsl:otherwise>
-          </xsl:choose> 
-          <!-- In either case, add baseuri from its document entry-->
-          <xsl:variable name="docbaseuri">
-            <xsl:for-each select="$target.database">
-              <xsl:value-of select="key('targetdoc-key', $targetdoc)/@baseuri"/>
-            </xsl:for-each>
-          </xsl:variable>
-          <xsl:if test="$docbaseuri != ''">
-            <xsl:value-of select="$docbaseuri"/>
-          </xsl:if>
-        </xsl:when>
-        <!-- No database sitemap in use -->
-        <xsl:otherwise>
-          <!-- Just use any baseuri from its document entry -->
-          <xsl:variable name="docbaseuri">
-            <xsl:for-each select="$target.database">
-              <xsl:value-of select="key('targetdoc-key', $targetdoc)/@baseuri"/>
-            </xsl:for-each>
-          </xsl:variable>
-          <xsl:if test="$docbaseuri != ''">
-            <xsl:value-of select="$docbaseuri"/>
-          </xsl:if>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-  
-    <!-- Form the href information -->
-    <xsl:if test="not(contains($baseuri, ':'))">
-      <!-- if not an absolute uri, add upward path from olink chunk -->
-      <xsl:value-of select="$upward.from.path"/>
-    </xsl:if>
-
-    <xsl:if test="$baseuri != ''">
-      <xsl:value-of select="$baseuri"/>
-      <xsl:if test="substring($target.href,1,1) != '#'">
-        <!--xsl:text>/</xsl:text-->
-      </xsl:if>
-    </xsl:if>
-    <!-- optionally turn off frag for PDF references -->
-    <xsl:if test="not($insert.olink.pdf.frag = 0 and           translate(substring($baseuri, string-length($baseuri) - 3),                     'PDF', 'pdf') = '.pdf'           and starts-with($target.href, '#') )">
-      <xsl:value-of select="$target.href"/>
-    </xsl:if>
-  </xsl:if>
-</xsl:template>
-
-<!-- Computes "../" to reach top -->
-<xsl:template name="upward.path">
-  <xsl:param name="path" select="''"/>
-  <xsl:choose> 
-    <!-- Don't bother with absolute uris -->
-    <xsl:when test="contains($path, ':')"/>
-    <xsl:when test="starts-with($path, '/')"/>
-    <xsl:when test="contains($path, '/')">
-      <xsl:text>../</xsl:text>
-      <xsl:call-template name="upward.path">
-        <xsl:with-param name="path" select="substring-after($path, '/')"/>
-      </xsl:call-template>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="html.head">
-  <xsl:param name="prev" select="/foo"/>
-  <xsl:param name="next" select="/foo"/>
-  <xsl:variable name="this" select="."/>
-  <xsl:variable name="home" select="/*[1]"/>
-  <xsl:variable name="up" select="parent::*"/>
-
-  <head>
-    <xsl:call-template name="system.head.content"/>
-    <xsl:call-template name="head.content"/>
-
-    <xsl:if test="$home">
-      <link rel="start">
-        <xsl:attribute name="href">
-          <xsl:call-template name="href.target">
-            <xsl:with-param name="object" select="$home"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:attribute name="title">
-          <xsl:apply-templates select="$home" mode="object.title.markup.textonly"/>
-        </xsl:attribute>
-      </link>
-    </xsl:if>
-
-    <xsl:if test="$up">
-      <link rel="up">
-        <xsl:attribute name="href">
-          <xsl:call-template name="href.target">
-            <xsl:with-param name="object" select="$up"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:attribute name="title">
-          <xsl:apply-templates select="$up" mode="object.title.markup.textonly"/>
-        </xsl:attribute>
-      </link>
-    </xsl:if>
-
-    <xsl:if test="$prev">
-      <link rel="prev">
-        <xsl:attribute name="href">
-          <xsl:call-template name="href.target">
-            <xsl:with-param name="object" select="$prev"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:attribute name="title">
-          <xsl:apply-templates select="$prev" mode="object.title.markup.textonly"/>
-        </xsl:attribute>
-      </link>
-    </xsl:if>
-
-    <xsl:if test="$next">
-      <link rel="next">
-        <xsl:attribute name="href">
-          <xsl:call-template name="href.target">
-            <xsl:with-param name="object" select="$next"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:attribute name="title">
-          <xsl:apply-templates select="$next" mode="object.title.markup.textonly"/>
-        </xsl:attribute>
-      </link>
-    </xsl:if>
-
-    <xsl:if test="$html.extra.head.links != 0">
-      <xsl:for-each select="//part                             |//reference                             |//preface                             |//chapter                             |//article                             |//refentry                             |//appendix[not(parent::article)]|appendix                             |//glossary[not(parent::article)]|glossary                             |//index[not(parent::article)]|index">
-        <link rel="{local-name(.)}">
-          <xsl:attribute name="href">
-            <xsl:call-template name="href.target">
-              <xsl:with-param name="context" select="$this"/>
-              <xsl:with-param name="object" select="."/>
-            </xsl:call-template>
-          </xsl:attribute>
-          <xsl:attribute name="title">
-            <xsl:apply-templates select="." mode="object.title.markup.textonly"/>
-          </xsl:attribute>
-        </link>
-      </xsl:for-each>
-
-      <xsl:for-each select="section|sect1|refsection|refsect1">
-        <link>
-          <xsl:attribute name="rel">
-            <xsl:choose>
-              <xsl:when test="local-name($this) = 'section'                               or local-name($this) = 'refsection'">
-                <xsl:value-of select="'subsection'"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="'section'"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:attribute>
-          <xsl:attribute name="href">
-            <xsl:call-template name="href.target">
-              <xsl:with-param name="context" select="$this"/>
-              <xsl:with-param name="object" select="."/>
-            </xsl:call-template>
-          </xsl:attribute>
-          <xsl:attribute name="title">
-            <xsl:apply-templates select="." mode="object.title.markup.textonly"/>
-          </xsl:attribute>
-        </link>
-      </xsl:for-each>
-
-      <xsl:for-each select="sect2|sect3|sect4|sect5|refsect2|refsect3">
-        <link rel="subsection">
-          <xsl:attribute name="href">
-            <xsl:call-template name="href.target">
-              <xsl:with-param name="context" select="$this"/>
-              <xsl:with-param name="object" select="."/>
-            </xsl:call-template>
-          </xsl:attribute>
-          <xsl:attribute name="title">
-            <xsl:apply-templates select="." mode="object.title.markup.textonly"/>
-          </xsl:attribute>
-        </link>
-      </xsl:for-each>
-    </xsl:if>
-
-    <!-- * if we have a legalnotice and user wants it output as a -->
-    <!-- * separate page and $html.head.legalnotice.link.types is -->
-    <!-- * non-empty, we generate a link or links for each value in -->
-    <!-- * $html.head.legalnotice.link.types -->
-    <xsl:if test="//legalnotice                   and not($generate.legalnotice.link = 0)                   and not($html.head.legalnotice.link.types = '')">
-      <xsl:call-template name="make.legalnotice.head.links"/>
-    </xsl:if>
-
-    <xsl:call-template name="user.head.content"/>
-  </head>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="header.navigation">
-  <xsl:param name="prev" select="/foo"/>
-  <xsl:param name="next" select="/foo"/>
-  <xsl:param name="nav.context"/>
-
-  <xsl:variable name="home" select="/*[1]"/>
-  <xsl:variable name="up" select="parent::*"/>
-
-  <xsl:variable name="row1" select="$navig.showtitles != 0"/>
-  <xsl:variable name="row2" select="count($prev) &gt; 0                                     or (count($up) &gt; 0                                          and generate-id($up) != generate-id($home)                                         and $navig.showtitles != 0)                                     or count($next) &gt; 0"/>
-
-  <xsl:if test="$suppress.navigation = '0' and $suppress.header.navigation = '0'">
-    <div class="navheader">
-      <xsl:if test="$row1 or $row2">
-        <table width="100%" summary="Navigation header">
-          <xsl:if test="$row1">
-            <tr>
-              <th colspan="3" align="center">
-                <xsl:apply-templates select="." mode="object.title.markup"/>
-              </th>
-            </tr>
-          </xsl:if>
-
-          <xsl:if test="$row2">
-            <tr>
-              <td width="20%" align="left">
-                <xsl:if test="count($prev)&gt;0">
-                  <a accesskey="p">
-                    <xsl:attribute name="href">
-                      <xsl:call-template name="href.target">
-                        <xsl:with-param name="object" select="$prev"/>
-                      </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="navig.content">
-                      <xsl:with-param name="direction" select="'prev'"/>
-                    </xsl:call-template>
-                  </a>
-                </xsl:if>
-                <xsl:text>&#160;</xsl:text>
-              </td>
-              <th width="60%" align="center">
-                <xsl:choose>
-                  <xsl:when test="count($up) &gt; 0                                   and generate-id($up) != generate-id($home)                                   and $navig.showtitles != 0">
-                    <xsl:apply-templates select="$up" mode="object.title.markup"/>
-                  </xsl:when>
-                  <xsl:otherwise>&#160;</xsl:otherwise>
-                </xsl:choose>
-              </th>
-              <td width="20%" align="right">
-                <xsl:text>&#160;</xsl:text>
-                <xsl:if test="count($next)&gt;0">
-                  <a accesskey="n">
-                    <xsl:attribute name="href">
-                      <xsl:call-template name="href.target">
-                        <xsl:with-param name="object" select="$next"/>
-                      </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="navig.content">
-                      <xsl:with-param name="direction" select="'next'"/>
-                    </xsl:call-template>
-                  </a>
-                </xsl:if>
-              </td>
-            </tr>
-          </xsl:if>
-        </table>
-      </xsl:if>
-      <xsl:if test="$header.rule != 0">
-        <hr/>
-      </xsl:if>
-    </div>
-  </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="footer.navigation">
-  <xsl:param name="prev" select="/foo"/>
-  <xsl:param name="next" select="/foo"/>
-  <xsl:param name="nav.context"/>
-
-  <xsl:variable name="home" select="/*[1]"/>
-  <xsl:variable name="up" select="parent::*"/>
-
-  <xsl:variable name="row1" select="count($prev) &gt; 0                                     or count($up) &gt; 0                                     or count($next) &gt; 0"/>
-
-  <xsl:variable name="row2" select="($prev and $navig.showtitles != 0)                                     or (generate-id($home) != generate-id(.)                                         or $nav.context = 'toc')                                     or ($chunk.tocs.and.lots != 0                                         and $nav.context != 'toc')                                     or ($next and $navig.showtitles != 0)"/>
-
-  <xsl:if test="$suppress.navigation = '0' and $suppress.footer.navigation = '0'">
-    <div class="navfooter">
-      <xsl:if test="$footer.rule != 0">
-        <hr/>
-      </xsl:if>
-
-      <xsl:if test="$row1 or $row2">
-        <table width="100%" summary="Navigation footer">
-          <xsl:if test="$row1">
-            <tr>
-              <td width="40%" align="left">
-                <xsl:if test="count($prev)&gt;0">
-                  <a accesskey="p">
-                    <xsl:attribute name="href">
-                      <xsl:call-template name="href.target">
-                        <xsl:with-param name="object" select="$prev"/>
-                      </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="navig.content">
-                      <xsl:with-param name="direction" select="'prev'"/>
-                    </xsl:call-template>
-                  </a>
-                </xsl:if>
-                <xsl:text>&#160;</xsl:text>
-              </td>
-              <td width="20%" align="center">
-                <xsl:choose>
-                  <xsl:when test="count($up)&gt;0                                   and generate-id($up) != generate-id($home)">
-                    <a accesskey="u">
-                      <xsl:attribute name="href">
-                        <xsl:call-template name="href.target">
-                          <xsl:with-param name="object" select="$up"/>
-                        </xsl:call-template>
-                      </xsl:attribute>
-                      <xsl:call-template name="navig.content">
-                        <xsl:with-param name="direction" select="'up'"/>
-                      </xsl:call-template>
-                    </a>
-                  </xsl:when>
-                  <xsl:otherwise>&#160;</xsl:otherwise>
-                </xsl:choose>
-              </td>
-              <td width="40%" align="right">
-                <xsl:text>&#160;</xsl:text>
-                <xsl:if test="count($next)&gt;0">
-                  <a accesskey="n">
-                    <xsl:attribute name="href">
-                      <xsl:call-template name="href.target">
-                        <xsl:with-param name="object" select="$next"/>
-                      </xsl:call-template>
-                    </xsl:attribute>
-                    <xsl:call-template name="navig.content">
-                      <xsl:with-param name="direction" select="'next'"/>
-                    </xsl:call-template>
-                  </a>
-                </xsl:if>
-              </td>
-            </tr>
-          </xsl:if>
-
-          <xsl:if test="$row2">
-            <tr>
-              <td width="40%" align="left" valign="top">
-                <xsl:if test="$navig.showtitles != 0">
-                  <xsl:apply-templates select="$prev" mode="object.title.markup"/>
-                </xsl:if>
-                <xsl:text>&#160;</xsl:text>
-              </td>
-              <td width="20%" align="center">
-                <xsl:choose>
-                  <xsl:when test="$home != . or $nav.context = 'toc'">
-                    <a accesskey="h">
-                      <xsl:attribute name="href">
-                        <xsl:call-template name="href.target">
-                          <xsl:with-param name="object" select="$home"/>
-                        </xsl:call-template>
-                      </xsl:attribute>
-                      <xsl:call-template name="navig.content">
-                        <xsl:with-param name="direction" select="'home'"/>
-                      </xsl:call-template>
-                    </a>
-                    <xsl:if test="$chunk.tocs.and.lots != 0 and $nav.context != 'toc'">
-                      <xsl:text>&#160;|&#160;</xsl:text>
-                    </xsl:if>
-                  </xsl:when>
-                  <xsl:otherwise>&#160;</xsl:otherwise>
-                </xsl:choose>
-
-                <xsl:if test="$chunk.tocs.and.lots != 0 and $nav.context != 'toc'">
-                  <a accesskey="t">
-                    <xsl:attribute name="href">
-                      <xsl:apply-templates select="/*[1]" mode="recursive-chunk-filename">
-                        <xsl:with-param name="recursive" select="true()"/>
-                      </xsl:apply-templates>
-                      <xsl:text>-toc</xsl:text>
-                      <xsl:value-of select="$html.ext"/>
-                    </xsl:attribute>
-                    <xsl:call-template name="gentext">
-                      <xsl:with-param name="key" select="'nav-toc'"/>
-                    </xsl:call-template>
-                  </a>
-                </xsl:if>
-              </td>
-              <td width="40%" align="right" valign="top">
-                <xsl:text>&#160;</xsl:text>
-                <xsl:if test="$navig.showtitles != 0">
-                  <xsl:apply-templates select="$next" mode="object.title.markup"/>
-                </xsl:if>
-              </td>
-            </tr>
-          </xsl:if>
-        </table>
-      </xsl:if>
-    </div>
-  </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="navig.content">
-    <xsl:param name="direction" select="next"/>
-    <xsl:variable name="navtext">
-        <xsl:choose>
-            <xsl:when test="$direction = 'prev'">
-                <xsl:call-template name="gentext.nav.prev"/>
-            </xsl:when>
-            <xsl:when test="$direction = 'next'">
-                <xsl:call-template name="gentext.nav.next"/>
-            </xsl:when>
-            <xsl:when test="$direction = 'up'">
-                <xsl:call-template name="gentext.nav.up"/>
-            </xsl:when>
-            <xsl:when test="$direction = 'home'">
-                <xsl:call-template name="gentext.nav.home"/>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:text>xxx</xsl:text>
-            </xsl:otherwise>
-        </xsl:choose>
-    </xsl:variable>
-
-    <xsl:choose>
-        <xsl:when test="$navig.graphics != 0">
-            <img>
-                <xsl:attribute name="src">
-                    <xsl:value-of select="$navig.graphics.path"/>
-                    <xsl:value-of select="$direction"/>
-                    <xsl:value-of select="$navig.graphics.extension"/>
-                </xsl:attribute>
-                <xsl:attribute name="alt">
-                    <xsl:value-of select="$navtext"/>
-                </xsl:attribute>
-            </img>
-        </xsl:when>
-        <xsl:otherwise>
-            <xsl:value-of select="$navtext"/>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- * The following template assumes that the first legalnotice -->
-<!-- * instance found in a document applies to the contents of the -->
-<!-- * entire document. It generates an HTML link in each chunk, back -->
-<!-- * to the file containing the contents of the first legalnotice. -->
-<!-- * -->
-<!-- * Actually, it may generate multiple link instances in each chunk, -->
-<!-- * because it walks through the space-separated list of link -->
-<!-- * types specified in the $html.head.legalnotice.link.types param, -->
-<!-- * popping off link types and generating links for them until it -->
-<!-- * depletes the list. -->
-  
-<xsl:template name="make.legalnotice.head.links">
-  <!-- * the following ID is used as part of the legalnotice filename; -->
-  <!-- * we need it in order to construct the filename for use in the -->
-  <!-- * value of the href attribute on the link -->
-  <xsl:param name="id">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="(//legalnotice)[1]"/>
-    </xsl:call-template>
-  </xsl:param>
-  <xsl:param name="linktype">
-    <xsl:choose>
-      <xsl:when test="contains($html.head.legalnotice.link.types, ' ')">
-        <xsl:value-of select="normalize-space(                     substring-before($html.head.legalnotice.link.types, ' '))"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$html.head.legalnotice.link.types"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:param>
-  <xsl:param name="remaining.linktypes" select="concat(               normalize-space(               substring-after($html.head.legalnotice.link.types, ' ')),' ')"/>
-  <xsl:if test="not($linktype = '')">
-    <link rel="{$linktype}">
-      <xsl:attribute name="href">
-        <xsl:value-of select="concat('ln-',$id,$html.ext)"/>
-      </xsl:attribute>
-      <xsl:attribute name="title">
-        <xsl:apply-templates select="(//legalnotice)[1]" mode="object.title.markup.textonly"/>
-      </xsl:attribute>
-    </link>
-    <xsl:call-template name="make.legalnotice.head.links">
-      <!-- * pop the next value off the list of link types -->
-      <xsl:with-param name="linktype" select="substring-before($remaining.linktypes, ' ')"/>
-      <!-- * remove the link type from the list of remaining link types -->
-      <xsl:with-param name="remaining.linktypes" select="substring-after($remaining.linktypes, ' ')"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<xsl:template name="chunk-element-content">
-  <xsl:param name="prev"/>
-  <xsl:param name="next"/>
-  <xsl:param name="nav.context"/>
-  <xsl:param name="content">
-    <xsl:apply-imports/>
-  </xsl:param>
-
-  <xsl:call-template name="user.preroot"/>
-
-  <html>
-    <xsl:call-template name="html.head">
-      <xsl:with-param name="prev" select="$prev"/>
-      <xsl:with-param name="next" select="$next"/>
-    </xsl:call-template>
-
-    <body>
-      <xsl:call-template name="body.attributes"/>
-      <xsl:call-template name="user.header.navigation"/>
-
-      <xsl:call-template name="header.navigation">
-        <xsl:with-param name="prev" select="$prev"/>
-        <xsl:with-param name="next" select="$next"/>
-        <xsl:with-param name="nav.context" select="$nav.context"/>
-      </xsl:call-template>
-
-      <xsl:call-template name="user.header.content"/>
-
-      <xsl:copy-of select="$content"/>
-
-      <xsl:call-template name="user.footer.content"/>
-
-      <xsl:call-template name="footer.navigation">
-        <xsl:with-param name="prev" select="$prev"/>
-        <xsl:with-param name="next" select="$next"/>
-        <xsl:with-param name="nav.context" select="$nav.context"/>
-      </xsl:call-template>
-
-      <xsl:call-template name="user.footer.navigation"/>
-    </body>
-  </html>
-  <xsl:value-of select="$chunk.append"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<xsl:template name="generate.manifest">
-  <xsl:param name="node" select="/"/>
-  <xsl:call-template name="write.text.chunk">
-    <xsl:with-param name="filename">
-      <xsl:if test="$manifest.in.base.dir != 0">
-        <xsl:value-of select="$base.dir"/>
-      </xsl:if>
-      <xsl:value-of select="$manifest"/>
-    </xsl:with-param>
-    <xsl:with-param name="method" select="'text'"/>
-    <xsl:with-param name="content">
-      <xsl:apply-templates select="$node" mode="enumerate-files"/>
-    </xsl:with-param>
-    <xsl:with-param name="encoding" select="$chunker.output.encoding"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="dbhtml-dir">
-  <xsl:param name="context" select="."/>
-  <!-- directories are now inherited from previous levels -->
-  <xsl:variable name="ppath">
-    <xsl:if test="$context/parent::*">
-      <xsl:call-template name="dbhtml-dir">
-        <xsl:with-param name="context" select="$context/parent::*"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="path">
-    <xsl:call-template name="pi.dbhtml_dir">
-      <xsl:with-param name="node" select="$context"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:choose>
-    <xsl:when test="$path = ''">
-      <xsl:if test="$ppath != ''">
-        <xsl:value-of select="$ppath"/>
-      </xsl:if>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:if test="$ppath != ''">
-        <xsl:value-of select="$ppath"/>
-        <xsl:if test="substring($ppath, string-length($ppath), 1) != '/'">
-          <xsl:text>/</xsl:text>
-        </xsl:if>
-      </xsl:if>
-      <xsl:value-of select="$path"/>
-      <xsl:text>/</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunk.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!-- First import the non-chunking templates that format elements
-     within each chunk file. In a customization, you should
-     create a separate non-chunking customization layer such
-     as mydocbook.xsl that imports the original docbook.xsl and
-     customizes any presentation templates. Then your chunking
-     customization should import mydocbook.xsl instead of
-     docbook.xsl.  -->
-<xsl:import href="docbook.xsl"/>
-
-<!-- chunk-common.xsl contains all the named templates for chunking.
-     In a customization file, you import chunk-common.xsl, then
-     add any customized chunking templates of the same name. 
-     They will have import precedence over the original 
-     chunking templates in chunk-common.xsl. -->
-<xsl:import href="chunk-common.xsl"/>
-
-<!-- The manifest.xsl module is no longer imported because its
-     templates were moved into chunk-common and chunk-code -->
-
-<!-- chunk-code.xsl contains all the chunking templates that use
-     a match attribute.  In a customization it should be referenced
-     using <xsl:include> instead of <xsl:import>, and then add
-     any customized chunking templates with match attributes. But be sure
-     to add a priority="1" to such customized templates to resolve
-     its conflict with the original, since they have the
-     same import precedence.
-     
-     Using xsl:include prevents adding another layer
-     of import precedence, which would cause any
-     customizations that use xsl:apply-imports to wrongly
-     apply the chunking version instead of the original
-     non-chunking version to format an element.  -->
-<xsl:include href="chunk-code.xsl"/>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunker.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunker.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,302 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saxon="http://icl.com/saxon" xmlns:lxslt="http://xml.apache.org/xslt" xmlns:redirect="http://xml.apache.org/xalan/redirect" xmlns:exsl="http://exslt.org/common" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="doc" extension-element-prefixes="saxon redirect lxslt exsl">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!-- This stylesheet works with XSLT implementations that support -->
-<!-- exsl:document, saxon:output, or Xalan's redirect:write -->
-<!-- Note: Only Saxon 6.4.2 or later is supported. -->
-
-<xsl:param name="chunker.output.method" select="'xml'"/>
-<xsl:param name="chunker.output.encoding" select="'UTF-8'"/>
-<xsl:param name="chunker.output.indent" select="'no'"/>
-<xsl:param name="chunker.output.omit-xml-declaration" select="'no'"/>
-<xsl:param name="chunker.output.standalone" select="'no'"/>
-<xsl:param name="chunker.output.doctype-public" select="'-//W3C//DTD XHTML 1.0 Transitional//EN'"/>
-<xsl:param name="chunker.output.doctype-system" select="'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'"/>
-<xsl:param name="chunker.output.media-type" select="''"/>
-<xsl:param name="chunker.output.cdata-section-elements" select="''"/>
-<xsl:param name="chunker.output.quiet" select="0"/>
-
-<xsl:param name="saxon.character.representation" select="'entity;decimal'"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="make-relative-filename">
-  <xsl:param name="base.dir" select="'./'"/>
-  <xsl:param name="base.name" select="''"/>
-
-  <xsl:choose>
-    <!-- put Saxon first to work around a bug in libxslt -->
-    <xsl:when test="element-available('saxon:output')">
-      <!-- Saxon doesn't make the chunks relative -->
-      <xsl:value-of select="concat($base.dir,$base.name)"/>
-    </xsl:when>
-    <xsl:when test="element-available('exsl:document')">
-      <!-- EXSL document does make the chunks relative, I think -->
-      <xsl:choose>
-        <xsl:when test="count(parent::*) = 0">
-          <xsl:value-of select="concat($base.dir,$base.name)"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$base.name"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:when test="element-available('redirect:write')">
-      <!-- Xalan doesn't make the chunks relative -->
-      <xsl:value-of select="concat($base.dir,$base.name)"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message terminate="yes">
-        <xsl:text>Don't know how to chunk with </xsl:text>
-        <xsl:value-of select="system-property('xsl:vendor')"/>
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="write.chunk">
-  <xsl:param name="filename" select="''"/>
-  <xsl:param name="quiet" select="$chunker.output.quiet"/>
-  <xsl:param name="suppress-context-node-name" select="0"/>
-  <xsl:param name="message-prolog"/>
-  <xsl:param name="message-epilog"/>
-
-  <xsl:param name="method" select="$chunker.output.method"/>
-  <xsl:param name="encoding" select="$chunker.output.encoding"/>
-  <xsl:param name="indent" select="$chunker.output.indent"/>
-  <xsl:param name="omit-xml-declaration" select="$chunker.output.omit-xml-declaration"/>
-  <xsl:param name="standalone" select="$chunker.output.standalone"/>
-  <xsl:param name="doctype-public" select="$chunker.output.doctype-public"/>
-  <xsl:param name="doctype-system" select="$chunker.output.doctype-system"/>
-  <xsl:param name="media-type" select="$chunker.output.media-type"/>
-  <xsl:param name="cdata-section-elements" select="$chunker.output.cdata-section-elements"/>
-
-  <xsl:param name="content"/>
-
-  <xsl:if test="$quiet = 0">
-    <xsl:message>
-      <xsl:if test="not($message-prolog = '')">
-        <xsl:value-of select="$message-prolog"/>
-      </xsl:if>
-      <xsl:text>Writing </xsl:text>
-      <xsl:value-of select="$filename"/>
-      <xsl:if test="name(.) != '' and $suppress-context-node-name = 0">
-        <xsl:text> for </xsl:text>
-        <xsl:value-of select="name(.)"/>
-        <xsl:if test="@id or @xml:id">
-          <xsl:text>(</xsl:text>
-          <xsl:value-of select="(@id|@xml:id)[1]"/>
-          <xsl:text>)</xsl:text>
-        </xsl:if>
-      </xsl:if>
-      <xsl:if test="not($message-epilog = '')">
-        <xsl:value-of select="$message-epilog"/>
-      </xsl:if>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:choose>
-    <xsl:when test="element-available('exsl:document')">
-      <xsl:choose>
-        <!-- Handle the permutations ... -->
-        <xsl:when test="$media-type != ''">
-          <xsl:choose>
-            <xsl:when test="$doctype-public != '' and $doctype-system != ''">
-              <exsl:document href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" media-type="{$media-type}" doctype-public="{$doctype-public}" doctype-system="{$doctype-system}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:when>
-            <xsl:when test="$doctype-public != '' and $doctype-system = ''">
-              <exsl:document href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" media-type="{$media-type}" doctype-public="{$doctype-public}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:when>
-            <xsl:when test="$doctype-public = '' and $doctype-system != ''">
-              <exsl:document href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" media-type="{$media-type}" doctype-system="{$doctype-system}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:when>
-            <xsl:otherwise><!-- $doctype-public = '' and $doctype-system = ''"> -->
-              <exsl:document href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" media-type="{$media-type}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:choose>
-            <xsl:when test="$doctype-public != '' and $doctype-system != ''">
-              <exsl:document href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" doctype-public="{$doctype-public}" doctype-system="{$doctype-system}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:when>
-            <xsl:when test="$doctype-public != '' and $doctype-system = ''">
-              <exsl:document href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" doctype-public="{$doctype-public}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:when>
-            <xsl:when test="$doctype-public = '' and $doctype-system != ''">
-              <exsl:document href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" doctype-system="{$doctype-system}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:when>
-            <xsl:otherwise><!-- $doctype-public = '' and $doctype-system = ''"> -->
-              <exsl:document href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </exsl:document>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:when test="element-available('saxon:output')">
-      <xsl:choose>
-        <!-- Handle the permutations ... -->
-        <xsl:when test="$media-type != ''">
-          <xsl:choose>
-            <xsl:when test="$doctype-public != '' and $doctype-system != ''">
-              <saxon:output saxon:character-representation="{$saxon.character.representation}" href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" media-type="{$media-type}" doctype-public="{$doctype-public}" doctype-system="{$doctype-system}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:when>
-            <xsl:when test="$doctype-public != '' and $doctype-system = ''">
-              <saxon:output saxon:character-representation="{$saxon.character.representation}" href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" media-type="{$media-type}" doctype-public="{$doctype-public}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:when>
-            <xsl:when test="$doctype-public = '' and $doctype-system != ''">
-              <saxon:output saxon:character-representation="{$saxon.character.representation}" href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" media-type="{$media-type}" doctype-system="{$doctype-system}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:when>
-            <xsl:otherwise><!-- $doctype-public = '' and $doctype-system = ''"> -->
-              <saxon:output saxon:character-representation="{$saxon.character.representation}" href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" media-type="{$media-type}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:choose>
-            <xsl:when test="$doctype-public != '' and $doctype-system != ''">
-              <saxon:output saxon:character-representation="{$saxon.character.representation}" href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" doctype-public="{$doctype-public}" doctype-system="{$doctype-system}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:when>
-            <xsl:when test="$doctype-public != '' and $doctype-system = ''">
-              <saxon:output saxon:character-representation="{$saxon.character.representation}" href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" doctype-public="{$doctype-public}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:when>
-            <xsl:when test="$doctype-public = '' and $doctype-system != ''">
-              <saxon:output saxon:character-representation="{$saxon.character.representation}" href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" doctype-system="{$doctype-system}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:when>
-            <xsl:otherwise><!-- $doctype-public = '' and $doctype-system = ''"> -->
-              <saxon:output saxon:character-representation="{$saxon.character.representation}" href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" omit-xml-declaration="{$omit-xml-declaration}" cdata-section-elements="{$cdata-section-elements}" standalone="{$standalone}">
-                <xsl:copy-of select="$content"/>
-              </saxon:output>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:when test="element-available('redirect:write')">
-      <!-- Xalan uses redirect -->
-      <redirect:write file="{$filename}">
-        <xsl:copy-of select="$content"/>
-      </redirect:write>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <!-- it doesn't matter since we won't be making chunks... -->
-      <xsl:message terminate="yes">
-        <xsl:text>Can't make chunks with </xsl:text>
-        <xsl:value-of select="system-property('xsl:vendor')"/>
-        <xsl:text>'s processor.</xsl:text>
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="write.chunk.with.doctype">
-  <xsl:param name="filename" select="''"/>
-  <xsl:param name="quiet" select="$chunker.output.quiet"/>
-
-  <xsl:param name="method" select="$chunker.output.method"/>
-  <xsl:param name="encoding" select="$chunker.output.encoding"/>
-  <xsl:param name="indent" select="$chunker.output.indent"/>
-  <xsl:param name="omit-xml-declaration" select="$chunker.output.omit-xml-declaration"/>
-  <xsl:param name="standalone" select="$chunker.output.standalone"/>
-  <xsl:param name="doctype-public" select="$chunker.output.doctype-public"/>
-  <xsl:param name="doctype-system" select="$chunker.output.doctype-system"/>
-  <xsl:param name="media-type" select="$chunker.output.media-type"/>
-  <xsl:param name="cdata-section-elements" select="$chunker.output.cdata-section-elements"/>
-
-  <xsl:param name="content"/>
-
-  <xsl:call-template name="write.chunk">
-    <xsl:with-param name="filename" select="$filename"/>
-    <xsl:with-param name="quiet" select="$quiet"/>
-    <xsl:with-param name="method" select="$method"/>
-    <xsl:with-param name="encoding" select="$encoding"/>
-    <xsl:with-param name="indent" select="$indent"/>
-    <xsl:with-param name="omit-xml-declaration" select="$omit-xml-declaration"/>
-    <xsl:with-param name="standalone" select="$standalone"/>
-    <xsl:with-param name="doctype-public" select="$doctype-public"/>
-    <xsl:with-param name="doctype-system" select="$doctype-system"/>
-    <xsl:with-param name="media-type" select="$media-type"/>
-    <xsl:with-param name="cdata-section-elements" select="$cdata-section-elements"/>
-    <xsl:with-param name="content" select="$content"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="write.text.chunk">
-  <xsl:param name="filename" select="''"/>
-  <xsl:param name="quiet" select="$chunker.output.quiet"/>
-  <xsl:param name="suppress-context-node-name" select="0"/>
-  <xsl:param name="message-prolog"/>
-  <xsl:param name="message-epilog"/>
-  <xsl:param name="method" select="'text'"/>
-  <xsl:param name="encoding" select="$chunker.output.encoding"/>
-  <xsl:param name="media-type" select="$chunker.output.media-type"/>
-  <xsl:param name="content"/>
-
-  <xsl:call-template name="write.chunk">
-    <xsl:with-param name="filename" select="$filename"/>
-    <xsl:with-param name="quiet" select="$quiet"/>
-    <xsl:with-param name="suppress-context-node-name" select="$suppress-context-node-name"/>
-    <xsl:with-param name="message-prolog" select="$message-prolog"/>
-    <xsl:with-param name="message-epilog" select="$message-epilog"/>
-    <xsl:with-param name="method" select="$method"/>
-    <xsl:with-param name="encoding" select="$encoding"/>
-    <xsl:with-param name="indent" select="'no'"/>
-    <xsl:with-param name="omit-xml-declaration" select="'no'"/>
-    <xsl:with-param name="standalone" select="'no'"/>
-    <xsl:with-param name="doctype-public"/>
-    <xsl:with-param name="doctype-system"/>
-    <xsl:with-param name="media-type" select="$media-type"/>
-    <xsl:with-param name="cdata-section-elements"/>
-    <xsl:with-param name="content" select="$content"/>
-  </xsl:call-template>
-</xsl:template>
-
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunkfast.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunkfast.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="cf exsl">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:import href="chunk.xsl"/>
-<xsl:param name="chunk.fast" select="1"/>
-
-<xsl:variable name="chunks" select="exsl:node-set($chunk.hierarchy)//cf:div"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="process-chunk-element">
-  <xsl:choose>
-    <xsl:when test="$chunk.fast != 0 and function-available('exsl:node-set')">
-      <xsl:variable name="genid" select="generate-id()"/>
-
-      <xsl:variable name="div" select="$chunks[@id=$genid or @xml:id=$genid]"/>
-
-      <xsl:variable name="prevdiv" select="($div/preceding-sibling::cf:div|$div/preceding::cf:div|$div/parent::cf:div)[last()]"/>
-      <xsl:variable name="prev" select="key('genid', ($prevdiv/@id|$prevdiv/@xml:id)[1])"/>
-
-      <xsl:variable name="nextdiv" select="($div/following-sibling::cf:div|$div/following::cf:div|$div/cf:div)[1]"/>
-      <xsl:variable name="next" select="key('genid', ($nextdiv/@id|$nextdiv/@xml:id)[1])"/>
-
-      <xsl:choose>
-        <xsl:when test="$onechunk != 0 and parent::*">
-          <xsl:apply-imports/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="process-chunk">
-            <xsl:with-param name="prev" select="$prev"/>
-            <xsl:with-param name="next" select="$next"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$onechunk != 0 and not(parent::*)">
-          <xsl:call-template name="chunk-all-sections"/>
-        </xsl:when>
-        <xsl:when test="$onechunk != 0">
-          <xsl:apply-imports/>
-        </xsl:when>
-        <xsl:when test="$chunk.first.sections = 0">
-          <xsl:call-template name="chunk-first-section-with-parent"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="chunk-all-sections"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunktoc.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/chunktoc.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,462 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="doc">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:import href="docbook.xsl"/>
-<xsl:import href="chunk-common.xsl"/>
-
-<xsl:template name="chunk">
-  <xsl:param name="node" select="."/>
-  <!-- returns 1 if $node is a chunk -->
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$node"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="chunks" select="document($chunk.toc,/)"/>
-
-  <xsl:choose>
-    <xsl:when test="$chunks//tocentry[@linkend=$id]">1</xsl:when>
-    <xsl:otherwise>0</xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="chunk-filename">
-  <!-- returns the filename of a chunk -->
-
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="chunks" select="document($chunk.toc,/)"/>
-
-  <xsl:variable name="chunk" select="$chunks//tocentry[@linkend=$id]"/>
-  <xsl:variable name="filename">
-    <xsl:call-template name="pi.dbhtml_filename">
-      <xsl:with-param name="node" select="$chunk"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$chunk">
-      <xsl:value-of select="$filename"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="parent::*" mode="chunk-filename"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="process-chunk">
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:variable name="chunks" select="document($chunk.toc,/)"/>
-
-  <xsl:variable name="chunk" select="$chunks//tocentry[@linkend=$id]"/>
-  <xsl:variable name="prev-id" select="($chunk/preceding::tocentry                          |$chunk/ancestor::tocentry)[last()]/@linkend"/>
-  <xsl:variable name="next-id" select="($chunk/following::tocentry                          |$chunk/child::tocentry)[1]/@linkend"/>
-
-  <xsl:variable name="prev" select="key('id',$prev-id)"/>
-  <xsl:variable name="next" select="key('id',$next-id)"/>
-
-  <xsl:variable name="ischunk">
-    <xsl:call-template name="chunk"/>
-  </xsl:variable>
-
-  <xsl:variable name="chunkfn">
-    <xsl:if test="$ischunk='1'">
-      <xsl:apply-templates mode="chunk-filename" select="."/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="filename">
-    <xsl:call-template name="make-relative-filename">
-      <xsl:with-param name="base.dir" select="$base.dir"/>
-      <xsl:with-param name="base.name" select="$chunkfn"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$ischunk = 0">
-      <xsl:apply-imports/>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:call-template name="write.chunk">
-        <xsl:with-param name="filename" select="$filename"/>
-        <xsl:with-param name="content">
-          <xsl:call-template name="chunk-element-content">
-            <xsl:with-param name="prev" select="$prev"/>
-            <xsl:with-param name="next" select="$next"/>
-          </xsl:call-template>
-        </xsl:with-param>
-        <xsl:with-param name="quiet" select="$chunk.quietly"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="set">
-  <xsl:call-template name="process-chunk"/>
-</xsl:template>
-
-<xsl:template match="book">
-  <xsl:call-template name="process-chunk"/>
-</xsl:template>
-
-<xsl:template match="book/appendix">
-  <xsl:call-template name="process-chunk"/>
-</xsl:template>
-
-<xsl:template match="book/glossary">
-  <xsl:call-template name="process-chunk"/>
-</xsl:template>
-
-<xsl:template match="book/bibliography">
-  <xsl:call-template name="process-chunk"/>
-</xsl:template>
-
-<xsl:template match="dedication" mode="dedication">
-  <xsl:call-template name="process-chunk"/>
-</xsl:template>
-
-<xsl:template match="preface|chapter">
-  <xsl:call-template name="process-chunk"/>
-</xsl:template>
-
-<xsl:template match="part|reference">
-  <xsl:call-template name="process-chunk"/>
-</xsl:template>
-
-<xsl:template match="refentry">
-  <xsl:call-template name="process-chunk"/>
-</xsl:template>
-
-<xsl:template match="colophon">
-  <xsl:call-template name="process-chunk"/>
-</xsl:template>
-
-<xsl:template match="article">
-  <xsl:call-template name="process-chunk"/>
-</xsl:template>
-
-<xsl:template match="article/appendix">
-  <xsl:call-template name="process-chunk"/>
-</xsl:template>
-
-<xsl:template match="article/glossary">
-  <xsl:call-template name="process-chunk"/>
-</xsl:template>
-
-<xsl:template match="article/bibliography">
-  <xsl:call-template name="process-chunk"/>
-</xsl:template>
-
-<xsl:template match="sect1|sect2|sect3|sect4|sect5|section">
-  <xsl:variable name="ischunk">
-    <xsl:call-template name="chunk"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$ischunk != 0">
-      <xsl:call-template name="process-chunk"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-imports/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="setindex                      |book/index                      |article/index">
-  <!-- some implementations use completely empty index tags to indicate -->
-  <!-- where an automatically generated index should be inserted. so -->
-  <!-- if the index is completely empty, skip it. -->
-  <xsl:if test="count(*)&gt;0 or $generate.index != '0'">
-    <xsl:call-template name="process-chunk"/>
-  </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="/">
-  <xsl:choose>
-    <xsl:when test="$chunk.toc = ''">
-      <xsl:message terminate="yes">
-        <xsl:text>The chunk.toc file is not set.</xsl:text>
-      </xsl:message>
-    </xsl:when>
-
-    <xsl:when test="$rootid != ''">
-      <xsl:choose>
-        <xsl:when test="count(key('id',$rootid)) = 0">
-          <xsl:message terminate="yes">
-            <xsl:text>ID '</xsl:text>
-            <xsl:value-of select="$rootid"/>
-            <xsl:text>' not found in document.</xsl:text>
-          </xsl:message>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="key('id',$rootid)"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:apply-templates select="/" mode="process.root"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="process.root">
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template name="make.lots">
-  <xsl:param name="toc.params" select="''"/>
-  <xsl:param name="toc"/>
-
-  <xsl:variable name="lots">
-    <xsl:if test="contains($toc.params, 'toc')">
-      <xsl:copy-of select="$toc"/>
-    </xsl:if>
-
-    <xsl:if test="contains($toc.params, 'figure')">
-      <xsl:choose>
-        <xsl:when test="$chunk.separate.lots != '0'">
-          <xsl:call-template name="make.lot.chunk">
-            <xsl:with-param name="type" select="'figure'"/>
-            <xsl:with-param name="lot">
-              <xsl:call-template name="list.of.titles">
-                <xsl:with-param name="titles" select="'figure'"/>
-                <xsl:with-param name="nodes" select=".//figure"/>
-              </xsl:call-template>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="list.of.titles">
-            <xsl:with-param name="titles" select="'figure'"/>
-            <xsl:with-param name="nodes" select=".//figure"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-
-    <xsl:if test="contains($toc.params, 'table')">
-      <xsl:choose>
-        <xsl:when test="$chunk.separate.lots != '0'">
-          <xsl:call-template name="make.lot.chunk">
-            <xsl:with-param name="type" select="'table'"/>
-            <xsl:with-param name="lot">
-              <xsl:call-template name="list.of.titles">
-                <xsl:with-param name="titles" select="'table'"/>
-                <xsl:with-param name="nodes" select=".//table"/>
-              </xsl:call-template>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="list.of.titles">
-            <xsl:with-param name="titles" select="'table'"/>
-            <xsl:with-param name="nodes" select=".//table"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-
-    <xsl:if test="contains($toc.params, 'example')">
-      <xsl:choose>
-        <xsl:when test="$chunk.separate.lots != '0'">
-          <xsl:call-template name="make.lot.chunk">
-            <xsl:with-param name="type" select="'example'"/>
-            <xsl:with-param name="lot">
-              <xsl:call-template name="list.of.titles">
-                <xsl:with-param name="titles" select="'example'"/>
-                <xsl:with-param name="nodes" select=".//example"/>
-              </xsl:call-template>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="list.of.titles">
-            <xsl:with-param name="titles" select="'example'"/>
-            <xsl:with-param name="nodes" select=".//example"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-
-    <xsl:if test="contains($toc.params, 'equation')">
-      <xsl:choose>
-        <xsl:when test="$chunk.separate.lots != '0'">
-          <xsl:call-template name="make.lot.chunk">
-            <xsl:with-param name="type" select="'equation'"/>
-            <xsl:with-param name="lot">
-              <xsl:call-template name="list.of.titles">
-                <xsl:with-param name="titles" select="'equation'"/>
-                <xsl:with-param name="nodes" select=".//equation"/>
-              </xsl:call-template>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="list.of.titles">
-            <xsl:with-param name="titles" select="'equation'"/>
-            <xsl:with-param name="nodes" select=".//equation"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-
-    <xsl:if test="contains($toc.params, 'procedure')">
-      <xsl:choose>
-        <xsl:when test="$chunk.separate.lots != '0'">
-          <xsl:call-template name="make.lot.chunk">
-            <xsl:with-param name="type" select="'procedure'"/>
-            <xsl:with-param name="lot">
-              <xsl:call-template name="list.of.titles">
-                <xsl:with-param name="titles" select="'procedure'"/>
-                <xsl:with-param name="nodes" select=".//procedure[title]"/>
-              </xsl:call-template>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="list.of.titles">
-            <xsl:with-param name="titles" select="'procedure'"/>
-            <xsl:with-param name="nodes" select=".//procedure[title]"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:if test="string($lots) != ''">
-    <xsl:choose>
-      <xsl:when test="$chunk.tocs.and.lots != 0 and not(parent::*)">
-        <xsl:call-template name="write.chunk">
-          <xsl:with-param name="filename">
-            <xsl:call-template name="make-relative-filename">
-              <xsl:with-param name="base.dir" select="$base.dir"/>
-              <xsl:with-param name="base.name">
-                <xsl:call-template name="dbhtml-dir"/>
-                <xsl:apply-templates select="." mode="recursive-chunk-filename">
-                  <xsl:with-param name="recursive" select="true()"/>
-                </xsl:apply-templates>
-                <xsl:text>-toc</xsl:text>
-                <xsl:value-of select="$html.ext"/>
-              </xsl:with-param>
-            </xsl:call-template>
-          </xsl:with-param>
-          <xsl:with-param name="content">
-            <xsl:call-template name="chunk-element-content">
-              <xsl:with-param name="prev" select="/foo"/>
-              <xsl:with-param name="next" select="/foo"/>
-              <xsl:with-param name="nav.context" select="'toc'"/>
-              <xsl:with-param name="content">
-                <h1>
-                  <xsl:apply-templates select="." mode="object.title.markup"/>
-                </h1>
-                <xsl:copy-of select="$lots"/>
-              </xsl:with-param>
-            </xsl:call-template>
-          </xsl:with-param>
-          <xsl:with-param name="quiet" select="$chunk.quietly"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:copy-of select="$lots"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="make.lot.chunk">
-  <xsl:param name="type" select="''"/>
-  <xsl:param name="lot"/>
-
-  <xsl:if test="string($lot) != ''">
-    <xsl:variable name="filename">
-      <xsl:call-template name="make-relative-filename">
-        <xsl:with-param name="base.dir" select="$base.dir"/>
-        <xsl:with-param name="base.name">
-          <xsl:call-template name="dbhtml-dir"/>
-          <xsl:value-of select="$type"/>
-          <xsl:text>-toc</xsl:text>
-          <xsl:value-of select="$html.ext"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:variable name="href">
-      <xsl:call-template name="make-relative-filename">
-        <xsl:with-param name="base.name">
-          <xsl:call-template name="dbhtml-dir"/>
-          <xsl:value-of select="$type"/>
-          <xsl:text>-toc</xsl:text>
-          <xsl:value-of select="$html.ext"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:call-template name="write.chunk">
-      <xsl:with-param name="filename" select="$filename"/>
-      <xsl:with-param name="content">
-        <xsl:call-template name="chunk-element-content">
-          <xsl:with-param name="prev" select="/foo"/>
-          <xsl:with-param name="next" select="/foo"/>
-          <xsl:with-param name="nav.context" select="'toc'"/>
-          <xsl:with-param name="content">
-            <xsl:copy-of select="$lot"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:with-param>
-      <xsl:with-param name="quiet" select="$chunk.quietly"/>
-    </xsl:call-template>
-    <!-- And output a link to this file -->
-    <div>
-      <xsl:attribute name="class">
-        <xsl:text>ListofTitles</xsl:text>
-      </xsl:attribute>
-      <a href="{$href}">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key">
-            <xsl:choose>
-              <xsl:when test="$type='table'">ListofTables</xsl:when>
-              <xsl:when test="$type='figure'">ListofFigures</xsl:when>
-              <xsl:when test="$type='equation'">ListofEquations</xsl:when>
-              <xsl:when test="$type='example'">ListofExamples</xsl:when>
-              <xsl:when test="$type='procedure'">ListofProcedures</xsl:when>
-              <xsl:otherwise>ListofUnknown</xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
-        </xsl:call-template>
-      </a>
-    </div>
-  </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/component.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/component.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,375 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template name="component.title">
-  <xsl:param name="node" select="."/>
-
-  <xsl:variable name="level">
-    <xsl:choose>
-      <xsl:when test="ancestor::section">
-        <xsl:value-of select="count(ancestor::section)+1"/>
-      </xsl:when>
-      <xsl:when test="ancestor::sect5">6</xsl:when>
-      <xsl:when test="ancestor::sect4">5</xsl:when>
-      <xsl:when test="ancestor::sect3">4</xsl:when>
-      <xsl:when test="ancestor::sect2">3</xsl:when>
-      <xsl:when test="ancestor::sect1">2</xsl:when>
-      <xsl:otherwise>1</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <!-- Let's handle the case where a component (bibliography, for example)
-       occurs inside a section; will we need parameters for this? -->
-
-  <xsl:element name="h{$level+1}" namespace="http://www.w3.org/1999/xhtml">
-    <xsl:attribute name="class">title</xsl:attribute>
-    <xsl:if test="$generate.id.attributes = 0">
-      <xsl:call-template name="anchor">
-	<xsl:with-param name="node" select="$node"/>
-	<xsl:with-param name="conditional" select="0"/>
-      </xsl:call-template>
-    </xsl:if>
-      <xsl:apply-templates select="$node" mode="object.title.markup">
-      <xsl:with-param name="allow-anchors" select="1"/>
-    </xsl:apply-templates>
-  </xsl:element>
-</xsl:template>
-
-<xsl:template name="component.subtitle">
-  <xsl:param name="node" select="."/>
-  <xsl:variable name="subtitle" select="($node/docinfo/subtitle                         |$node/info/subtitle                         |$node/prefaceinfo/subtitle                         |$node/chapterinfo/subtitle                         |$node/appendixinfo/subtitle                         |$node/articleinfo/subtitle                         |$node/artheader/subtitle                         |$node/subtitle)[1]"/>
-
-  <xsl:if test="$subtitle">
-    <h3 class="subtitle">
-      <i>
-        <xsl:apply-templates select="$node" mode="object.subtitle.markup"/>
-      </i>
-    </h3>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="component.separator">
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="dedication" mode="dedication">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-    <xsl:call-template name="dedication.titlepage"/>
-    <xsl:apply-templates/>
-    <xsl:call-template name="process.footnotes"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="dedication/title|dedication/info/title" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="component.title">
-    <xsl:with-param name="node" select="ancestor::dedication[1]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="dedication/subtitle|dedication/info/subtitle" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="component.subtitle">
-    <xsl:with-param name="node" select="ancestor::dedication[1]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="dedication"/> <!-- see mode="dedication" -->
-<xsl:template match="dedication/title"/>
-<xsl:template match="dedication/subtitle"/>
-<xsl:template match="dedication/titleabbrev"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="colophon">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-    <xsl:if test="$generate.id.attributes != 0">
-      <xsl:attribute name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="component.separator"/>
-    <xsl:call-template name="component.title"/>
-    <xsl:call-template name="component.subtitle"/>
-
-    <xsl:apply-templates/>
-    <xsl:call-template name="process.footnotes"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="colophon/title"/>
-<xsl:template match="colophon/subtitle"/>
-<xsl:template match="colophon/titleabbrev"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="preface">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-    <xsl:if test="$generate.id.attributes != 0">
-      <xsl:attribute name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="component.separator"/>
-    <xsl:call-template name="preface.titlepage"/>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:if test="contains($toc.params, 'toc')">
-      <xsl:call-template name="component.toc">
-        <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
-      </xsl:call-template>
-      <xsl:call-template name="component.toc.separator"/>
-    </xsl:if>
-    <xsl:apply-templates/>
-    <xsl:call-template name="process.footnotes"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="preface/title" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="component.title">
-    <xsl:with-param name="node" select="ancestor::preface[1]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="preface/subtitle                      |preface/prefaceinfo/subtitle                      |preface/info/subtitle                      |preface/docinfo/subtitle" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="component.subtitle">
-    <xsl:with-param name="node" select="ancestor::preface[1]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="preface/docinfo|prefaceinfo"/>
-<xsl:template match="preface/info"/>
-<xsl:template match="preface/title"/>
-<xsl:template match="preface/titleabbrev"/>
-<xsl:template match="preface/subtitle"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="chapter">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-    <xsl:if test="$generate.id.attributes != 0">
-      <xsl:attribute name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="component.separator"/>
-    <xsl:call-template name="chapter.titlepage"/>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:if test="contains($toc.params, 'toc')">
-      <xsl:call-template name="component.toc">
-        <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
-      </xsl:call-template>
-      <xsl:call-template name="component.toc.separator"/>
-    </xsl:if>
-    <xsl:apply-templates/>
-    <xsl:call-template name="process.footnotes"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="chapter/title" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="component.title">
-    <xsl:with-param name="node" select="ancestor::chapter[1]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="chapter/subtitle                      |chapter/chapterinfo/subtitle                      |chapter/info/subtitle                      |chapter/docinfo/subtitle" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="component.subtitle">
-    <xsl:with-param name="node" select="ancestor::chapter[1]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="chapter/docinfo|chapterinfo"/>
-<xsl:template match="chapter/info"/>
-<xsl:template match="chapter/title"/>
-<xsl:template match="chapter/titleabbrev"/>
-<xsl:template match="chapter/subtitle"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="appendix">
-  <xsl:variable name="ischunk">
-    <xsl:call-template name="chunk"/>
-  </xsl:variable>
-
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-    <xsl:if test="$generate.id.attributes != 0">
-      <xsl:attribute name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:choose>
-      <xsl:when test="parent::article and $ischunk = 0">
-        <xsl:call-template name="section.heading">
-          <xsl:with-param name="level" select="1"/>
-          <xsl:with-param name="title">
-            <xsl:apply-templates select="." mode="object.title.markup"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="component.separator"/>
-        <xsl:call-template name="appendix.titlepage"/>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:if test="contains($toc.params, 'toc')">
-      <xsl:call-template name="component.toc">
-        <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
-      </xsl:call-template>
-      <xsl:call-template name="component.toc.separator"/>
-    </xsl:if>
-
-    <xsl:apply-templates/>
-
-    <xsl:if test="not(parent::article) or $ischunk != 0">
-      <xsl:call-template name="process.footnotes"/>
-    </xsl:if>
-  </div>
-</xsl:template>
-
-<xsl:template match="appendix/title" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="component.title">
-    <xsl:with-param name="node" select="ancestor::appendix[1]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="appendix/subtitle                      |appendix/appendixinfo/subtitle                      |appendix/info/subtitle                      |appendix/docinfo/subtitle" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="component.subtitle">
-    <xsl:with-param name="node" select="ancestor::appendix[1]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="appendix/docinfo|appendixinfo"/>
-<xsl:template match="appendix/info"/>
-<xsl:template match="appendix/title"/>
-<xsl:template match="appendix/titleabbrev"/>
-<xsl:template match="appendix/subtitle"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="article">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-    <xsl:if test="$generate.id.attributes != 0">
-      <xsl:attribute name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="article.titlepage"/>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:call-template name="make.lots">
-      <xsl:with-param name="toc.params" select="$toc.params"/>
-      <xsl:with-param name="toc">
-        <xsl:call-template name="component.toc">
-          <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:call-template>
-
-    <xsl:apply-templates/>
-    <xsl:call-template name="process.footnotes"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="article/title|article/articleinfo/title" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="component.title">
-    <xsl:with-param name="node" select="ancestor::article[1]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="article/subtitle                      |article/articleinfo/subtitle                      |article/info/subtitle                      |article/artheader/subtitle" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="component.subtitle">
-    <xsl:with-param name="node" select="ancestor::article[1]"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="article/artheader|article/articleinfo"/>
-<xsl:template match="article/info"/>
-<xsl:template match="article/title"/>
-<xsl:template match="article/titleabbrev"/>
-<xsl:template match="article/subtitle"/>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/division.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/division.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,228 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="set">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-    <xsl:if test="$generate.id.attributes != 0">
-      <xsl:attribute name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="set.titlepage"/>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:call-template name="make.lots">
-      <xsl:with-param name="toc.params" select="$toc.params"/>
-      <xsl:with-param name="toc">
-        <xsl:call-template name="set.toc">
-          <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:call-template>
-
-    <xsl:apply-templates/>
-  </div>
-</xsl:template>
-
-<xsl:template match="set/setinfo"/>
-<xsl:template match="set/title"/>
-<xsl:template match="set/titleabbrev"/>
-<xsl:template match="set/subtitle"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="book">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-    <xsl:if test="$generate.id.attributes != 0">
-      <xsl:attribute name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="book.titlepage"/>
-
-    <xsl:apply-templates select="dedication" mode="dedication"/>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:call-template name="make.lots">
-      <xsl:with-param name="toc.params" select="$toc.params"/>
-      <xsl:with-param name="toc">
-        <xsl:call-template name="division.toc">
-          <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:call-template>
-
-    <xsl:apply-templates/>
-  </div>
-</xsl:template>
-
-<xsl:template match="book/bookinfo"/>
-<xsl:template match="book/info"/>
-<xsl:template match="book/title"/>
-<xsl:template match="book/titleabbrev"/>
-<xsl:template match="book/subtitle"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="part">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-    <xsl:if test="$generate.id.attributes != 0">
-      <xsl:attribute name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="part.titlepage"/>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:if test="not(partintro) and contains($toc.params, 'toc')">
-      <xsl:call-template name="division.toc"/>
-    </xsl:if>
-    <xsl:apply-templates/>
-  </div>
-</xsl:template>
-
-<xsl:template match="part" mode="make.part.toc">
-  <xsl:call-template name="division.toc"/>
-</xsl:template>
-
-<xsl:template match="reference" mode="make.part.toc">
-  <xsl:call-template name="division.toc"/>
-</xsl:template>
-
-<xsl:template match="part/docinfo"/>
-<xsl:template match="part/partinfo"/>
-<xsl:template match="part/info"/>
-<xsl:template match="part/title"/>
-<xsl:template match="part/titleabbrev"/>
-<xsl:template match="part/subtitle"/>
-
-<xsl:template match="partintro">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-    <xsl:if test="$generate.id.attributes != 0">
-      <xsl:attribute name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="partintro.titlepage"/>
-    <xsl:apply-templates/>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="node" select="parent::*"/>
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:if test="contains($toc.params, 'toc')">
-      <!-- not ancestor::part because partintro appears in reference -->
-      <xsl:apply-templates select="parent::*" mode="make.part.toc"/>
-    </xsl:if>
-    <xsl:call-template name="process.footnotes"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="partintro/title"/>
-<xsl:template match="partintro/titleabbrev"/>
-<xsl:template match="partintro/subtitle"/>
-
-<xsl:template match="partintro/title" mode="partintro.title.mode">
-  <h2>
-    <xsl:apply-templates/>
-  </h2>
-</xsl:template>
-
-<xsl:template match="partintro/subtitle" mode="partintro.title.mode">
-  <h3>
-    <i><xsl:apply-templates/></i>
-  </h3>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="book" mode="division.number">
-  <xsl:number from="set" count="book" format="1."/>
-</xsl:template>
-
-<xsl:template match="part" mode="division.number">
-  <xsl:number from="book" count="part" format="I."/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="division.title">
-  <xsl:param name="node" select="."/>
-
-  <h1>
-    <xsl:attribute name="class">title</xsl:attribute>
-    <xsl:if test="$generate.id.attributes = 0">
-      <xsl:call-template name="anchor">
-	<xsl:with-param name="node" select="$node"/>
-	<xsl:with-param name="conditional" select="0"/>
-      </xsl:call-template>
-    </xsl:if>
-      <xsl:apply-templates select="$node" mode="object.title.markup">
-      <xsl:with-param name="allow-anchors" select="1"/>
-    </xsl:apply-templates>
-  </h1>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/docbook.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/docbook.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,447 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:ng="http://docbook.org/docbook-ng" xmlns:db="http://docbook.org/ns/docbook" xmlns:exsl="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="db ng exsl" version="1.0">
-
-<xsl:output method="xml" encoding="UTF-8" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:include href="../VERSION"/>
-<xsl:include href="param.xsl"/>
-<xsl:include href="../lib/lib.xsl"/>
-<xsl:include href="../common/l10n.xsl"/>
-<xsl:include href="../common/common.xsl"/>
-<xsl:include href="../common/utility.xsl"/>
-<xsl:include href="../common/labels.xsl"/>
-<xsl:include href="../common/titles.xsl"/>
-<xsl:include href="../common/subtitles.xsl"/>
-<xsl:include href="../common/gentext.xsl"/>
-<xsl:include href="../common/targets.xsl"/>
-<xsl:include href="../common/olink.xsl"/>
-<xsl:include href="../common/pi.xsl"/>
-<xsl:include href="autotoc.xsl"/>
-<xsl:include href="autoidx.xsl"/>
-<xsl:include href="lists.xsl"/>
-<xsl:include href="callout.xsl"/>
-<xsl:include href="verbatim.xsl"/>
-<xsl:include href="graphics.xsl"/>
-<xsl:include href="xref.xsl"/>
-<xsl:include href="formal.xsl"/>
-<xsl:include href="table.xsl"/>
-<xsl:include href="htmltbl.xsl"/>
-<xsl:include href="sections.xsl"/>
-<xsl:include href="inline.xsl"/>
-<xsl:include href="footnote.xsl"/>
-<xsl:include href="html.xsl"/>
-<xsl:include href="info.xsl"/>
-<xsl:include href="keywords.xsl"/>
-<xsl:include href="division.xsl"/>
-<xsl:include href="toc.xsl"/>
-<xsl:include href="index.xsl"/>
-<xsl:include href="refentry.xsl"/>
-<xsl:include href="math.xsl"/>
-<xsl:include href="admon.xsl"/>
-<xsl:include href="component.xsl"/>
-<xsl:include href="biblio.xsl"/>
-<xsl:include href="biblio-iso690.xsl"/>
-<xsl:include href="glossary.xsl"/>
-<xsl:include href="block.xsl"/>
-<xsl:include href="task.xsl"/>
-<xsl:include href="qandaset.xsl"/>
-<xsl:include href="synop.xsl"/>
-<xsl:include href="titlepage.xsl"/>
-<xsl:include href="titlepage.templates.xsl"/>
-<xsl:include href="pi.xsl"/>
-<xsl:include href="ebnf.xsl"/>
-<xsl:include href="chunker.xsl"/>
-<xsl:include href="html-rtf.xsl"/>
-<xsl:include href="annotations.xsl"/>
-<xsl:include href="../common/stripns.xsl"/>
-
-<xsl:param name="stylesheet.result.type" select="'xhtml'"/>
-<xsl:param name="htmlhelp.output" select="0"/>
-
-<!-- ==================================================================== -->
-
-<xsl:key name="id" match="*" use="@id|@xml:id"/>
-<xsl:key name="gid" match="*" use="generate-id()"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*">
-  <xsl:message>
-    <xsl:text>Element </xsl:text>
-    <xsl:value-of select="local-name(.)"/>
-    <xsl:text> in namespace '</xsl:text>
-    <xsl:value-of select="namespace-uri(.)"/>
-    <xsl:text>' encountered</xsl:text>
-    <xsl:if test="parent::*">
-      <xsl:text> in </xsl:text>
-      <xsl:value-of select="name(parent::*)"/>
-    </xsl:if>
-    <xsl:text>, but no template matches.</xsl:text>
-  </xsl:message>
-
-  <span style="color: red">
-    <xsl:text>&lt;</xsl:text>
-    <xsl:value-of select="name(.)"/>
-    <xsl:text>&gt;</xsl:text>
-    <xsl:apply-templates/>
-    <xsl:text>&lt;/</xsl:text>
-    <xsl:value-of select="name(.)"/>
-    <xsl:text>&gt;</xsl:text>
-  </span>
-</xsl:template>
-
-<xsl:template match="text()">
-  <xsl:value-of select="."/>
-</xsl:template>
-
-<xsl:template name="body.attributes">
-<!-- no apply-templates; make it empty -->
-</xsl:template>
-
-<xsl:template name="head.content">
-  <xsl:param name="node" select="."/>
-  <xsl:param name="title">
-    <xsl:apply-templates select="$node" mode="object.title.markup.textonly"/>
-  </xsl:param>
-
-  <title>
-    <xsl:copy-of select="$title"/>
-  </title>
-
-  <xsl:if test="$html.stylesheet != ''">
-    <xsl:call-template name="output.html.stylesheets">
-      <xsl:with-param name="stylesheets" select="normalize-space($html.stylesheet)"/>
-    </xsl:call-template>
-  </xsl:if>
-
-  <xsl:if test="$link.mailto.url != ''">
-    <link rev="made" href="{$link.mailto.url}"/>
-  </xsl:if>
-
-  <xsl:if test="$html.base != ''">
-    <base href="{$html.base}"/>
-  </xsl:if>
-
-  <meta name="generator" content="DocBook {$DistroTitle} V{$VERSION}"/>
-
-  <xsl:if test="$generate.meta.abstract != 0">
-    <xsl:variable name="info" select="(articleinfo                                       |bookinfo                                       |prefaceinfo                                       |chapterinfo                                       |appendixinfo                                       |sectioninfo                                       |sect1info                                       |sect2info                                       |sect3info                                       |sect4info                                       |sect5info                                       |referenceinfo                                       |refentryinfo                                       |partinfo                                       |info                                       |docinfo)[1]"/>
-    <xsl:if test="$info and $info/abstract">
-      <meta name="description">
-        <xsl:attribute name="content">
-          <xsl:for-each select="$info/abstract[1]/*">
-            <xsl:value-of select="normalize-space(.)"/>
-            <xsl:if test="position() &lt; last()">
-              <xsl:text> </xsl:text>
-            </xsl:if>
-          </xsl:for-each>
-        </xsl:attribute>
-      </meta>
-    </xsl:if>
-  </xsl:if>
-
-  <xsl:if test="($draft.mode = 'yes' or                 ($draft.mode = 'maybe' and                 ancestor-or-self::*[@status][1]/@status = 'draft'))                 and $draft.watermark.image != ''">
-    <style type="text/css"><xsl:text>
-body { background-image: url('</xsl:text>
-<xsl:value-of select="$draft.watermark.image"/><xsl:text>');
-       background-repeat: no-repeat;
-       background-position: top left;
-       /* The following properties make the watermark "fixed" on the page. */
-       /* I think that's just a bit too distracting for the reader... */
-       /* background-attachment: fixed; */
-       /* background-position: center center; */
-     }</xsl:text>
-    </style>
-  </xsl:if>
-  <xsl:apply-templates select="." mode="head.keywords.content"/>
-</xsl:template>
-
-<xsl:template name="output.html.stylesheets">
-  <xsl:param name="stylesheets" select="''"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($stylesheets, ' ')">
-      <link rel="stylesheet" href="{substring-before($stylesheets, ' ')}">
-        <xsl:if test="$html.stylesheet.type != ''">
-          <xsl:attribute name="type">
-            <xsl:value-of select="$html.stylesheet.type"/>
-          </xsl:attribute>
-        </xsl:if>
-      </link>
-      <xsl:call-template name="output.html.stylesheets">
-        <xsl:with-param name="stylesheets" select="substring-after($stylesheets, ' ')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$stylesheets != ''">
-      <link rel="stylesheet" href="{$stylesheets}">
-        <xsl:if test="$html.stylesheet.type != ''">
-          <xsl:attribute name="type">
-            <xsl:value-of select="$html.stylesheet.type"/>
-          </xsl:attribute>
-        </xsl:if>
-      </link>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template match="*" mode="head.keywords.content">
-  <xsl:apply-templates select="chapterinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="appendixinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="prefaceinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="bookinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="setinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="articleinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="artheader/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="sect1info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="sect2info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="sect3info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="sect4info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="sect5info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="sectioninfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="refsect1info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="refsect2info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="refsect3info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="bibliographyinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="glossaryinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="indexinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="refentryinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="partinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="referenceinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="docinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="info/keywordset" mode="html.header"/>
-
-  <xsl:if test="$inherit.keywords != 0                 and parent::*">
-    <xsl:apply-templates select="parent::*" mode="head.keywords.content"/>
-  </xsl:if>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template name="system.head.content">
-  <xsl:param name="node" select="."/>
-
-  <!-- FIXME: When chunking, only the annotations actually used
-              in this chunk should be referenced. I don't think it
-              does any harm to reference them all, but it adds
-              unnecessary bloat to each chunk. -->
-  <xsl:if test="$annotation.support != 0 and //annotation">
-    <xsl:call-template name="add.annotation.links"/>
-    <script type="text/javascript">
-      <xsl:text>
-// Create PopupWindow objects</xsl:text>
-      <xsl:for-each select="//annotation">
-        <xsl:text>
-var popup_</xsl:text>
-        <xsl:value-of select="generate-id(.)"/>
-        <xsl:text> = new PopupWindow("popup-</xsl:text>
-        <xsl:value-of select="generate-id(.)"/>
-        <xsl:text>");
-</xsl:text>
-        <xsl:text>popup_</xsl:text>
-        <xsl:value-of select="generate-id(.)"/>
-        <xsl:text>.offsetY = 15;
-</xsl:text>
-        <xsl:text>popup_</xsl:text>
-        <xsl:value-of select="generate-id(.)"/>
-        <xsl:text>.autoHide();
-</xsl:text>
-      </xsl:for-each>
-    </script>
-
-    <style type="text/css">
-      <xsl:value-of select="$annotation.css"/>
-    </style>
-  </xsl:if>
-
-  <!-- system.head.content is like user.head.content, except that
-       it is called before head.content. This is important because it
-       means, for example, that <style> elements output by system.head.content
-       have a lower CSS precedence than the users stylesheet. -->
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template name="user.preroot">
-  <!-- Pre-root output, can be used to output comments and PIs. -->
-  <!-- This must not output any element content! -->
-</xsl:template>
-
-<xsl:template name="user.head.content">
-  <xsl:param name="node" select="."/>
-</xsl:template>
-
-<xsl:template name="user.header.navigation">
-  <xsl:param name="node" select="."/>
-</xsl:template>
-
-<xsl:template name="user.header.content">
-  <xsl:param name="node" select="."/>
-</xsl:template>
-
-<xsl:template name="user.footer.content">
-  <xsl:param name="node" select="."/>
-</xsl:template>
-
-<xsl:template name="user.footer.navigation">
-  <xsl:param name="node" select="."/>
-</xsl:template>
-
-<xsl:template match="/">
-  <!-- * Get a title for current doc so that we let the user -->
-  <!-- * know what document we are processing at this point. -->
-  <xsl:variable name="doc.title">
-    <xsl:call-template name="get.doc.title"/>
-  </xsl:variable>
-  <xsl:choose>
-    <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document,
-         toss the namespace and continue.  Use the docbook5 namespaced
-         stylesheets for DocBook5 if you don't want to use this feature.-->
-    <!-- include extra test for Xalan quirk -->
-    <xsl:when test="(function-available('exsl:node-set') or                      contains(system-property('xsl:vendor'),                        'Apache Software Foundation'))                     and (*/self::ng:* or */self::db:*)">
-      <xsl:call-template name="log.message">
-        <xsl:with-param name="level">Note</xsl:with-param>
-        <xsl:with-param name="source" select="$doc.title"/>
-        <xsl:with-param name="context-desc">
-          <xsl:text>namesp. cut</xsl:text>
-        </xsl:with-param>
-        <xsl:with-param name="message">
-          <xsl:text>stripped namespace before processing</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:variable name="nons">
-        <xsl:apply-templates mode="stripNS"/>
-      </xsl:variable>
-      <!--
-      <xsl:message>Saving stripped document.</xsl:message>
-      <xsl:call-template name="write.chunk">
-        <xsl:with-param name="filename" select="'/tmp/stripped.xml'"/>
-        <xsl:with-param name="method" select="'xml'"/>
-        <xsl:with-param name="content">
-          <xsl:copy-of select="exsl:node-set($nons)"/>
-        </xsl:with-param>
-      </xsl:call-template>
-      -->
-      <xsl:call-template name="log.message">
-        <xsl:with-param name="level">Note</xsl:with-param>
-        <xsl:with-param name="source" select="$doc.title"/>
-        <xsl:with-param name="context-desc">
-          <xsl:text>namesp. cut</xsl:text>
-        </xsl:with-param>
-        <xsl:with-param name="message">
-          <xsl:text>processing stripped document</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:apply-templates select="exsl:node-set($nons)"/>
-    </xsl:when>
-    <!-- Can't process unless namespace removed -->
-    <xsl:when test="*/self::ng:* or */self::db:*">
-      <xsl:message terminate="yes">
-        <xsl:text>Unable to strip the namespace from DB5 document,</xsl:text>
-        <xsl:text> cannot proceed.</xsl:text>
-      </xsl:message>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$rootid != ''">
-          <xsl:choose>
-            <xsl:when test="count(key('id',$rootid)) = 0">
-              <xsl:message terminate="yes">
-                <xsl:text>ID '</xsl:text>
-                <xsl:value-of select="$rootid"/>
-                <xsl:text>' not found in document.</xsl:text>
-              </xsl:message>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:if test="$collect.xref.targets = 'yes' or                             $collect.xref.targets = 'only'">
-                <xsl:apply-templates select="key('id', $rootid)" mode="collect.targets"/>
-              </xsl:if>
-              <xsl:if test="$collect.xref.targets != 'only'">
-                <xsl:apply-templates select="key('id',$rootid)" mode="process.root"/>
-                <xsl:if test="$tex.math.in.alt != ''">
-                  <xsl:apply-templates select="key('id',$rootid)" mode="collect.tex.math"/>
-                </xsl:if>
-              </xsl:if>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:if test="$collect.xref.targets = 'yes' or                         $collect.xref.targets = 'only'">
-            <xsl:apply-templates select="/" mode="collect.targets"/>
-          </xsl:if>
-          <xsl:if test="$collect.xref.targets != 'only'">
-            <xsl:apply-templates select="/" mode="process.root"/>
-            <xsl:if test="$tex.math.in.alt != ''">
-              <xsl:apply-templates select="/" mode="collect.tex.math"/>
-            </xsl:if>
-          </xsl:if>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="process.root">
-  <xsl:variable name="doc" select="self::*"/>
-
-  <xsl:call-template name="user.preroot"/>
-  <xsl:call-template name="root.messages"/>
-
-  <html>
-    <head>
-      <xsl:call-template name="system.head.content">
-        <xsl:with-param name="node" select="$doc"/>
-      </xsl:call-template>
-      <xsl:call-template name="head.content">
-        <xsl:with-param name="node" select="$doc"/>
-      </xsl:call-template>
-      <xsl:call-template name="user.head.content">
-        <xsl:with-param name="node" select="$doc"/>
-      </xsl:call-template>
-    </head>
-    <body>
-      <xsl:call-template name="body.attributes"/>
-      <xsl:call-template name="user.header.content">
-        <xsl:with-param name="node" select="$doc"/>
-      </xsl:call-template>
-      <xsl:apply-templates select="."/>
-      <xsl:call-template name="user.footer.content">
-        <xsl:with-param name="node" select="$doc"/>
-      </xsl:call-template>
-    </body>
-  </html>
-  <xsl:value-of select="$html.append"/>
-</xsl:template>
-
-<xsl:template name="root.messages">
-  <!-- redefine this any way you'd like to output messages -->
-  <!-- DO NOT OUTPUT ANYTHING FROM THIS TEMPLATE -->
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="chunk">
-  <xsl:param name="node" select="."/>
-
-  <!-- The default is that we are not chunking... -->
-  <xsl:text>0</xsl:text>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/ebnf.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/ebnf.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,328 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="doc" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<doc:reference xmlns="">
-<referenceinfo xmlns="http://www.w3.org/1999/xhtml">
-<releaseinfo role="meta">
-$Id$
-</releaseinfo>
-<author><surname>Walsh</surname>
-<firstname>Norman</firstname></author>
-<copyright><year>1999</year><year>2000</year>
-<holder>Norman Walsh</holder>
-</copyright>
-</referenceinfo>
-<title xmlns="http://www.w3.org/1999/xhtml">HTML EBNF Reference</title>
-
-<partintro xmlns="http://www.w3.org/1999/xhtml">
-<section><title>Introduction</title>
-
-<para>This is technical reference documentation for the DocBook XSL
-Stylesheets; it documents (some of) the parameters, templates, and
-other elements of the stylesheets.</para>
-
-<para>This reference describes the templates and parameters relevant
-to formatting EBNF markup.</para>
-
-<para>This is not intended to be <quote>user</quote> documentation.
-It is provided for developers writing customization layers for the
-stylesheets, and for anyone who's interested in <quote>how it
-works</quote>.</para>
-
-<para>Although I am trying to be thorough, this documentation is known
-to be incomplete. Don't forget to read the source, too :-)</para>
-</section>
-</partintro>
-</doc:reference>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="productionset">
-  <table width="100%" cellpadding="5">
-    <xsl:if test="$ebnf.table.bgcolor != ''">
-      <xsl:attribute name="bgcolor">
-        <xsl:value-of select="$ebnf.table.bgcolor"/>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:if test="$ebnf.table.border != 0">
-      <xsl:attribute name="border">1</xsl:attribute>
-    </xsl:if>
-    <xsl:attribute name="class">
-      <xsl:value-of select="local-name(.)"/>
-    </xsl:attribute>
-    <xsl:attribute name="summary">
-      <xsl:text>EBNF</xsl:text>
-      <xsl:if test="title">
-        <xsl:text> for </xsl:text>
-        <xsl:value-of select="title"/>
-      </xsl:if>
-    </xsl:attribute>
-
-    <xsl:if test="title">
-      <tr>
-        <th align="left" valign="top">
-          <xsl:apply-templates select="." mode="class.attribute"/>
-          <xsl:apply-templates select="title"/>
-        </th>
-      </tr>
-    </xsl:if>
-    <tr>
-      <td>
-        <table border="0" width="99%" cellpadding="0">
-          <xsl:if test="$ebnf.table.bgcolor != ''">
-            <xsl:attribute name="bgcolor">
-              <xsl:value-of select="$ebnf.table.bgcolor"/>
-            </xsl:attribute>
-          </xsl:if>
-          <xsl:attribute name="class">
-            <xsl:value-of select="local-name(.)"/>
-          </xsl:attribute>
-          <xsl:attribute name="summary">EBNF productions</xsl:attribute>
-          <xsl:apply-templates select="production|productionrecap"/>
-        </table>
-      </td>
-    </tr>
-  </table>
-</xsl:template>
-
-<xsl:template match="productionset/title">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="production">
-  <xsl:param name="recap" select="false()"/>
-  <tr>
-    <td align="left" valign="top" width="3%">
-      <xsl:text>[</xsl:text>
-      <xsl:number count="production" level="any"/>
-      <xsl:text>]</xsl:text>
-    </td>
-    <td align="right" valign="top" width="10%">
-      <xsl:choose>
-        <xsl:when test="$recap">
-          <a>
-            <xsl:attribute name="href">
-              <xsl:call-template name="href.target">
-                <xsl:with-param name="object" select="."/>
-              </xsl:call-template>
-            </xsl:attribute>
-            <xsl:apply-templates select="lhs"/>
-          </a>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="anchor"/>
-          <xsl:apply-templates select="lhs"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </td>
-    <td valign="top" width="5%" align="center">
-      <xsl:copy-of select="$ebnf.assignment"/>
-    </td>
-    <td valign="top" width="52%">
-      <xsl:apply-templates select="rhs"/>
-      <xsl:copy-of select="$ebnf.statement.terminator"/>
-    </td>
-    <td align="left" valign="top" width="30%">
-      <xsl:choose>
-        <xsl:when test="rhs/lineannotation|constraint">
-          <xsl:apply-templates select="rhs/lineannotation" mode="rhslo"/>
-          <xsl:apply-templates select="constraint"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>&#160;</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </td>
-  </tr>
-</xsl:template>
-
-<xsl:template match="productionrecap">
-  <xsl:variable name="targets" select="key('id',@linkend)"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-
-  <xsl:if test="count($targets)=0">
-    <xsl:message>
-      <xsl:text>Error: no ID for productionrecap linkend: </xsl:text>
-      <xsl:value-of select="@linkend"/>
-      <xsl:text>.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:if test="count($targets)&gt;1">
-    <xsl:message>
-      <xsl:text>Warning: multiple "IDs" for productionrecap linkend: </xsl:text>
-      <xsl:value-of select="@linkend"/>
-      <xsl:text>.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:apply-templates select="$target">
-    <xsl:with-param name="recap" select="true()"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="lhs">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="rhs">
-  <xsl:apply-templates/>
-  <xsl:if test="following-sibling::rhs">
-    <xsl:text> |</xsl:text>
-    <br/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="nonterminal">
-  <xsl:variable name="linkend">
-    <xsl:call-template name="xpointer.idref">
-      <xsl:with-param name="xpointer" select="@def"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="check.id.unique">
-    <xsl:with-param name="linkend" select="$linkend"/>
-  </xsl:call-template>
-
-  <xsl:call-template name="check.idref.targets">
-    <xsl:with-param name="linkend" select="$linkend"/>
-    <xsl:with-param name="element-list">production</xsl:with-param>
-  </xsl:call-template>
-
-  <!-- If you don't provide content, you can't point outside this doc. -->
-  <xsl:choose>
-    <xsl:when test="*|text()"><!--nop--></xsl:when>
-    <xsl:otherwise>
-      <xsl:if test="$linkend = ''">
-        <xsl:message>
-          <xsl:text>Non-terminals with no content must point to </xsl:text>
-          <xsl:text>production elements in the current document.</xsl:text>
-        </xsl:message>
-        <xsl:message>
-          <xsl:text>Invalid xpointer for empty nt: </xsl:text>
-          <xsl:value-of select="@def"/>
-        </xsl:message>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-
-  <xsl:variable name="href">
-    <xsl:choose>
-      <xsl:when test="$linkend != ''">
-        <xsl:variable name="targets" select="key('id',$linkend)"/>
-        <xsl:variable name="target" select="$targets[1]"/>
-        <xsl:call-template name="href.target">
-          <xsl:with-param name="object" select="$target"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="@def"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <a href="{$href}">
-    <xsl:choose>
-      <xsl:when test="*|text()">
-        <xsl:apply-templates/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:choose>
-          <xsl:when test="$linkend != ''">
-            <xsl:variable name="targets" select="key('id',$linkend)"/>
-            <xsl:variable name="target" select="$targets[1]"/>
-            <xsl:apply-templates select="$target/lhs"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:text>???</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:otherwise>
-    </xsl:choose>
-  </a>
-</xsl:template>
-
-<xsl:template match="rhs/lineannotation">
-  <!--nop-->
-</xsl:template>
-
-<xsl:template match="rhs/lineannotation" mode="rhslo">
-  <xsl:text>/*&#160;</xsl:text>
-  <xsl:apply-templates/>
-  <xsl:text>&#160;*/</xsl:text>
-  <br/>
-</xsl:template>
-
-<xsl:template match="constraint">
-  <xsl:call-template name="check.id.unique">
-    <xsl:with-param name="linkend" select="@linkend"/>
-  </xsl:call-template>
-
-  <xsl:call-template name="check.idref.targets">
-    <xsl:with-param name="linkend" select="@linkend"/>
-    <xsl:with-param name="element-list">constraintdef</xsl:with-param>
-  </xsl:call-template>
-
-  <xsl:variable name="href">
-    <xsl:variable name="targets" select="key('id',@linkend)"/>
-    <xsl:variable name="target" select="$targets[1]"/>
-    <xsl:call-template name="href.target">
-      <xsl:with-param name="object" select="$target"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:text>[&#160;</xsl:text>
-
-  <xsl:choose>
-    <xsl:when test="@role">
-      <xsl:value-of select="@role"/>
-      <xsl:text>: </xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="targets" select="key('id',@linkend)"/>
-      <xsl:variable name="target" select="$targets[1]"/>
-      <xsl:if test="$target/@role">
-        <xsl:value-of select="$target/@role"/>
-        <xsl:text>: </xsl:text>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-
-  <a href="{$href}">
-    <xsl:variable name="targets" select="key('id',@linkend)"/>
-    <xsl:variable name="target" select="$targets[1]"/>
-    <xsl:apply-templates select="$target" mode="title.markup"/>
-  </a>
-  <xsl:text>&#160;]</xsl:text>
-  <xsl:if test="following-sibling::constraint">
-    <br/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="constraintdef">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates/>
-  </div>
-</xsl:template>
-
-<xsl:template match="constraintdef/title">
-  <p><b><xsl:apply-templates/></b></p>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/footnote.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/footnote.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,292 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="exsl" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:template match="footnote">
-  <xsl:variable name="name">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-  <xsl:variable name="href">
-    <xsl:text>#ftn.</xsl:text>
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="ancestor::tgroup">
-      <sup>
-        <xsl:text>[</xsl:text>
-        <a id="{$name}" href="{$href}">
-          <xsl:apply-templates select="." mode="class.attribute"/>
-          <xsl:apply-templates select="." mode="footnote.number"/>
-        </a>
-        <xsl:text>]</xsl:text>
-      </sup>
-    </xsl:when>
-    <xsl:otherwise>
-      <sup>
-        <xsl:text>[</xsl:text>
-        <a id="{$name}" href="{$href}">
-          <xsl:apply-templates select="." mode="class.attribute"/>
-          <xsl:apply-templates select="." mode="footnote.number"/>
-        </a>
-        <xsl:text>]</xsl:text>
-      </sup>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="footnoteref">
-  <xsl:variable name="targets" select="key('id',@linkend)"/>
-  <xsl:variable name="footnote" select="$targets[1]"/>
-
-  <xsl:variable name="target.href">
-    <xsl:call-template name="href.target">
-      <xsl:with-param name="object" select="$footnote"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="href">
-    <xsl:value-of select="substring-before($target.href, '#')"/>
-    <xsl:text>#ftn.</xsl:text>
-    <xsl:value-of select="substring-after($target.href, '#')"/>
-  </xsl:variable>
-
-  <sup>
-    <xsl:text>[</xsl:text>
-    <a href="{$href}">
-      <xsl:apply-templates select="." mode="class.attribute"/>
-      <xsl:apply-templates select="$footnote" mode="footnote.number"/>
-    </a>
-    <xsl:text>]</xsl:text>
-  </sup>
-</xsl:template>
-
-<xsl:template match="footnote" mode="footnote.number">
-  <xsl:choose>
-    <xsl:when test="string-length(@label) != 0">
-      <xsl:value-of select="@label"/>
-    </xsl:when>
-    <xsl:when test="ancestor::tgroup">
-      <xsl:variable name="tfnum">
-        <xsl:number level="any" from="table|informaltable" format="1"/>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="string-length($table.footnote.number.symbols) &gt;= $tfnum">
-          <xsl:value-of select="substring($table.footnote.number.symbols, $tfnum, 1)"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:number level="any" from="tgroup" format="{$table.footnote.number.format}"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="pfoot" select="preceding::footnote[not(@label)]"/>
-      <xsl:variable name="ptfoot" select="preceding::tgroup//footnote"/>
-      <xsl:variable name="fnum" select="count($pfoot) - count($ptfoot) + 1"/>
-
-      <xsl:choose>
-        <xsl:when test="string-length($footnote.number.symbols) &gt;= $fnum">
-          <xsl:value-of select="substring($footnote.number.symbols, $fnum, 1)"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:number value="$fnum" format="{$footnote.number.format}"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="footnote/para[1]|footnote/simpara[1]" priority="2">
-  <!-- this only works if the first thing in a footnote is a para, -->
-  <!-- which is ok, because it usually is. -->
-  <xsl:variable name="name">
-    <xsl:text>ftn.</xsl:text>
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="ancestor::footnote"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="href">
-    <xsl:text>#</xsl:text>
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="ancestor::footnote"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <p>
-    <xsl:if test="@role and $para.propagates.style != 0">
-      <xsl:apply-templates select="." mode="class.attribute">
-        <xsl:with-param name="class" select="@role"/>
-      </xsl:apply-templates>
-    </xsl:if>
-    <sup>
-      <xsl:text>[</xsl:text>
-      <a id="{$name}" href="{$href}">
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:apply-templates select="ancestor::footnote" mode="footnote.number"/>
-      </a>
-      <xsl:text>] </xsl:text>
-    </sup>
-    <xsl:apply-templates/>
-  </p>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="footnote.body.number">
-  <xsl:variable name="name">
-    <xsl:text>ftn.</xsl:text>
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="ancestor::footnote"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="href">
-    <xsl:text>#</xsl:text>
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="ancestor::footnote"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="footnote.mark">
-    <sup>
-      <xsl:text>[</xsl:text>
-      <a id="{$name}" href="{$href}">
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:apply-templates select="ancestor::footnote" mode="footnote.number"/>
-      </a>
-      <xsl:text>] </xsl:text>
-    </sup>
-  </xsl:variable>
-
-  <xsl:variable name="html">
-    <xsl:apply-templates select="."/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="function-available('exsl:node-set')">
-      <xsl:variable name="html-nodes" select="exsl:node-set($html)"/>
-      <xsl:choose>
-        <xsl:when test="$html-nodes//p">
-          <xsl:apply-templates select="$html-nodes" mode="insert.html.p">
-            <xsl:with-param name="mark" select="$footnote.mark"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="$html-nodes" mode="insert.html.text">
-            <xsl:with-param name="mark" select="$footnote.mark"/>
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$html"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!--
-<xsl:template name="count-element-from">
-  <xsl:param name="from" select=".."/>
-  <xsl:param name="to" select="."/>
-  <xsl:param name="count" select="0"/>
-  <xsl:param name="list" select="$from/following::*[local-name(.)=local-name($to)]
-                                 |$from/descendant-or-self::*[local-name(.)=local-name($to)]"/>
-
-  <xsl:choose>
-    <xsl:when test="not($list)">
-      <xsl:text>-1</xsl:text>
-    </xsl:when>
-    <xsl:when test="$list[1] = $to">
-      <xsl:value-of select="$count + 1"/>
-    </xsl:when>
-    <xsl:otherwise>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
--->
-
-<!-- ==================================================================== -->
-
-<xsl:template name="process.footnotes">
-  <xsl:variable name="footnotes" select=".//footnote"/>
-  <xsl:variable name="table.footnotes" select=".//tgroup//footnote"/>
-
-  <!-- Only bother to do this if there's at least one non-table footnote -->
-  <xsl:if test="count($footnotes)&gt;count($table.footnotes)">
-    <div class="footnotes">
-      <br/>
-      <hr width="100" align="left"/>
-      <xsl:apply-templates select="$footnotes" mode="process.footnote.mode"/>
-    </div>
-  </xsl:if>
-
-  <xsl:if test="$annotation.support != 0 and //annotation">
-    <div class="annotation-list">
-      <div class="annotation-nocss">
-	<p>The following annotations are from this essay. You are seeing
-	them here because your browser doesn&#8217;t support the user-interface
-	techniques used to make them appear as &#8216;popups&#8217; on modern browsers.</p>
-      </div>
-
-      <xsl:apply-templates select="//annotation" mode="annotation-popup"/>
-    </div>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="process.chunk.footnotes">
-  <!-- nop -->
-</xsl:template>
-
-<xsl:template match="footnote" name="process.footnote" mode="process.footnote.mode">
-  <xsl:choose>
-    <xsl:when test="local-name(*[1]) = 'para' or local-name(*[1]) = 'simpara'">
-      <div>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:apply-templates/>
-      </div>
-    </xsl:when>
-
-    <xsl:when test="$html.cleanup != 0 and function-available('exsl:node-set')">
-      <div>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:apply-templates select="*[1]" mode="footnote.body.number"/>
-        <xsl:apply-templates select="*[position() &gt; 1]"/>
-      </div>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:message>
-        <xsl:text>Warning: footnote number may not be generated </xsl:text>
-        <xsl:text>correctly; </xsl:text>
-        <xsl:value-of select="local-name(*[1])"/>
-        <xsl:text> unexpected as first child of footnote.</xsl:text>
-      </xsl:message>
-      <div>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:apply-templates/>
-      </div>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="tgroup//footnote" mode="process.footnote.mode">
-</xsl:template>
-
-<xsl:template match="footnote" mode="table.footnote.mode">
-  <xsl:call-template name="process.footnote"/>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/formal.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/formal.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,386 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:param name="formal.object.break.after">1</xsl:param>
-
-<xsl:template name="formal.object">
-  <xsl:param name="placement" select="'before'"/>
-  <xsl:param name="class">
-    <xsl:apply-templates select="." mode="class.value"/>
-  </xsl:param>
-
-  <xsl:call-template name="id.warning"/>
-
-  <xsl:variable name="content">
-    <div class="{$class}">
-      <xsl:call-template name="anchor">
-        <xsl:with-param name="conditional" select="0"/>
-      </xsl:call-template>
-    
-      <xsl:choose>
-        <xsl:when test="$placement = 'before'">
-          <xsl:call-template name="formal.object.heading"/>
-          <div class="{$class}-contents">
-            <xsl:apply-templates/>
-          </div>
-          <!-- HACK: This doesn't belong inside formal.object; it 
-               should be done by the table template, but I want 
-               the link to be inside the DIV, so... -->
-          <xsl:if test="local-name(.) = 'table'">
-            <xsl:call-template name="table.longdesc"/>
-          </xsl:if>
-    
-          <xsl:if test="$spacing.paras != 0"><p/></xsl:if>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:if test="$spacing.paras != 0"><p/></xsl:if>
-          <div class="{$class}-contents"><xsl:apply-templates/></div>
-          <!-- HACK: This doesn't belong inside formal.object; it 
-               should be done by the table template, but I want 
-               the link to be inside the DIV, so... -->
-          <xsl:if test="local-name(.) = 'table'">
-            <xsl:call-template name="table.longdesc"/>
-          </xsl:if>
-    
-          <xsl:call-template name="formal.object.heading"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </div>
-    <xsl:if test="not($formal.object.break.after = '0')">
-      <br class="{$class}-break"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="floatstyle">
-    <xsl:call-template name="floatstyle"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$floatstyle != ''">
-      <xsl:call-template name="floater">
-        <xsl:with-param name="class"><xsl:value-of select="$class"/>-float</xsl:with-param>
-        <xsl:with-param name="floatstyle" select="$floatstyle"/>
-        <xsl:with-param name="content" select="$content"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$content"/>
-    </xsl:otherwise>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="formal.object.heading">
-  <xsl:param name="object" select="."/>
-  <xsl:param name="title">
-    <xsl:apply-templates select="$object" mode="object.title.markup">
-      <xsl:with-param name="allow-anchors" select="1"/>
-    </xsl:apply-templates>
-  </xsl:param>
-
-  <p class="title">
-    <b>
-      <xsl:copy-of select="$title"/>
-    </b>
-  </p>
-</xsl:template>
-
-<xsl:template name="informal.object">
-  <xsl:param name="class" select="local-name(.)"/>
-
-  <xsl:variable name="content">
-    <div class="{$class}">
-      <xsl:if test="$spacing.paras != 0"><p/></xsl:if>
-      <xsl:call-template name="anchor"/>
-      <xsl:apply-templates/>
-  
-      <!-- HACK: This doesn't belong inside formal.object; it 
-           should be done by the table template, but I want 
-           the link to be inside the DIV, so... -->
-      <xsl:if test="local-name(.) = 'informaltable'">
-        <xsl:call-template name="table.longdesc"/>
-      </xsl:if>
-  
-      <xsl:if test="$spacing.paras != 0"><p/></xsl:if>
-    </div>
-  </xsl:variable>
-
-  <xsl:variable name="floatstyle">
-    <xsl:call-template name="floatstyle"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$floatstyle != ''">
-      <xsl:call-template name="floater">
-        <xsl:with-param name="class"><xsl:value-of select="$class"/>-float</xsl:with-param>
-        <xsl:with-param name="floatstyle" select="$floatstyle"/>
-        <xsl:with-param name="content" select="$content"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$content"/>
-    </xsl:otherwise>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="semiformal.object">
-  <xsl:param name="placement" select="'before'"/>
-  <xsl:param name="class" select="local-name(.)"/>
-
-  <xsl:choose>
-    <xsl:when test="title">
-      <xsl:call-template name="formal.object">
-        <xsl:with-param name="placement" select="$placement"/>
-        <xsl:with-param name="class" select="$class"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="informal.object">
-        <xsl:with-param name="class" select="$class"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="figure">
-  <xsl:variable name="param.placement" select="substring-after(normalize-space($formal.title.placement),                                         concat(local-name(.), ' '))"/>
-
-  <xsl:variable name="placement">
-    <xsl:choose>
-      <xsl:when test="contains($param.placement, ' ')">
-        <xsl:value-of select="substring-before($param.placement, ' ')"/>
-      </xsl:when>
-      <xsl:when test="$param.placement = ''">before</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$param.placement"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:call-template name="formal.object">
-    <xsl:with-param name="placement" select="$placement"/>
-  </xsl:call-template>
-
-</xsl:template>
-
-<xsl:template match="table">
-  <xsl:choose>
-    <xsl:when test="tgroup|mediaobject|graphic">
-      <xsl:call-template name="calsTable"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy>
-        <xsl:copy-of select="@*[not(local-name()='id')]"/>
-        <xsl:attribute name="id">
-          <xsl:call-template name="object.id"/>
-        </xsl:attribute>
-        <xsl:call-template name="htmlTable"/>
-      </xsl:copy>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="calsTable">
-  <xsl:if test="tgroup/tbody/tr                 |tgroup/thead/tr                 |tgroup/tfoot/tr">
-    <xsl:message terminate="yes">Broken table: tr descendent of CALS Table.</xsl:message>
-  </xsl:if>
-
-  <xsl:variable name="param.placement" select="substring-after(normalize-space($formal.title.placement),                                         concat(local-name(.), ' '))"/>
-
-  <xsl:variable name="placement">
-    <xsl:choose>
-      <xsl:when test="contains($param.placement, ' ')">
-        <xsl:value-of select="substring-before($param.placement, ' ')"/>
-      </xsl:when>
-      <xsl:when test="$param.placement = ''">before</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$param.placement"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:call-template name="formal.object">
-    <xsl:with-param name="placement" select="$placement"/>
-    <xsl:with-param name="class">
-      <xsl:choose>
-        <xsl:when test="@tabstyle">
-          <!-- hack, this will only ever occur on table, not example -->
-          <xsl:value-of select="@tabstyle"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="local-name(.)"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="htmlTable">
-  <xsl:if test="tgroup/tbody/row                 |tgroup/thead/row                 |tgroup/tfoot/row">
-    <xsl:message terminate="yes">Broken table: row descendent of HTML table.</xsl:message>
-  </xsl:if>
-
-  <xsl:apply-templates mode="htmlTable"/>
-</xsl:template>
-
-<xsl:template match="example">
-  <xsl:variable name="param.placement" select="substring-after(normalize-space($formal.title.placement),                      concat(local-name(.), ' '))"/>
-
-  <xsl:variable name="placement">
-    <xsl:choose>
-      <xsl:when test="contains($param.placement, ' ')">
-        <xsl:value-of select="substring-before($param.placement, ' ')"/>
-      </xsl:when>
-      <xsl:when test="$param.placement = ''">before</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$param.placement"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:call-template name="formal.object">
-    <xsl:with-param name="placement" select="$placement"/>
-  </xsl:call-template>
-
-</xsl:template>
-
-<xsl:template match="equation">
-  <xsl:variable name="param.placement" select="substring-after(normalize-space($formal.title.placement),                                       concat(local-name(.), ' '))"/>
-
-  <xsl:variable name="placement">
-    <xsl:choose>
-      <xsl:when test="contains($param.placement, ' ')">
-        <xsl:value-of select="substring-before($param.placement, ' ')"/>
-      </xsl:when>
-      <xsl:when test="$param.placement = ''">before</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$param.placement"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:call-template name="formal.object">
-    <xsl:with-param name="placement" select="$placement"/>
-  </xsl:call-template>
-
-</xsl:template>
-
-<xsl:template match="figure/title"/>
-<xsl:template match="figure/titleabbrev"/>
-<xsl:template match="table/title"/>
-<xsl:template match="table/titleabbrev"/>
-<xsl:template match="table/textobject"/>
-<xsl:template match="example/title"/>
-<xsl:template match="example/titleabbrev"/>
-<xsl:template match="equation/title"/>
-<xsl:template match="equation/titleabbrev"/>
-
-<xsl:template match="informalfigure">
-  <xsl:call-template name="informal.object"/>
-</xsl:template>
-
-<xsl:template match="informalexample">
-  <xsl:call-template name="informal.object"/>
-</xsl:template>
-
-<xsl:template match="informaltable">
-  <xsl:choose>
-    <xsl:when test="tgroup|mediaobject|graphic">
-      <xsl:call-template name="informal.object">
-        <xsl:with-param name="class">
-          <xsl:choose>
-            <xsl:when test="@tabstyle">
-              <xsl:value-of select="@tabstyle"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="local-name(.)"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <table>
-        <xsl:copy-of select="@*"/>
-        <xsl:call-template name="htmlTable"/>
-      </table>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="informaltable/textobject"/>
-
-<xsl:template name="table.longdesc">
-  <!-- HACK: This doesn't belong inside formal.objectt; it should be done by -->
-  <!-- the table template, but I want the link to be inside the DIV, so... -->
-  <xsl:variable name="longdesc.uri">
-    <xsl:call-template name="longdesc.uri">
-      <xsl:with-param name="mediaobject" select="."/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="irrelevant">
-    <!-- write.longdesc returns the filename ... -->
-    <xsl:call-template name="write.longdesc">
-      <xsl:with-param name="mediaobject" select="."/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:if test="$html.longdesc != 0 and $html.longdesc.link != 0                 and textobject[not(phrase)]">
-    <xsl:call-template name="longdesc.link">
-      <xsl:with-param name="longdesc.uri" select="$longdesc.uri"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="informalequation">
-  <xsl:call-template name="informal.object"/>
-</xsl:template>
-
-<xsl:template name="floatstyle">
-  <xsl:if test="(@float and @float != '0') or @floatstyle != ''">
-    <xsl:choose>
-      <xsl:when test="@floatstyle != ''">
-        <xsl:value-of select="@floatstyle"/>
-      </xsl:when>
-      <xsl:when test="@float = '1'">
-        <xsl:value-of select="$default.float.class"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="@float"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="floater">
-  <xsl:param name="content"/>
-  <xsl:param name="class" select="'float'"/>
-  <xsl:param name="floatstyle" select="'left'"/>
-
-  <div class="{$class}">
-    <xsl:if test="$floatstyle = 'left' or $floatstyle = 'right'">
-      <xsl:attribute name="style">
-        <xsl:text>float: </xsl:text>
-        <xsl:value-of select="$floatstyle"/>
-        <xsl:text>;</xsl:text>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:copy-of select="$content"/>
-  </div>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/glossary.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/glossary.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,548 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="glossary">
-  
-<xsl:variable name="language">
-  <xsl:call-template name="l10n.language"/>
-</xsl:variable>
-
-<xsl:variable name="lowercase">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key">normalize.sort.input</xsl:with-param>
-  </xsl:call-template>
-</xsl:variable>
-
-<xsl:variable name="uppercase">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key">normalize.sort.output</xsl:with-param>
-  </xsl:call-template>
-</xsl:variable>
-
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="$generate.id.attributes != 0">
-      <xsl:attribute name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="glossary.titlepage"/>
-
-    <xsl:choose>
-      <xsl:when test="glossdiv">
-        <xsl:apply-templates select="(glossdiv[1]/preceding-sibling::*)"/>
-      </xsl:when>
-      <xsl:when test="glossentry">
-        <xsl:apply-templates select="(glossentry[1]/preceding-sibling::*)"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates/>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:choose>
-      <xsl:when test="glossdiv">
-        <xsl:apply-templates select="glossdiv"/>
-      </xsl:when>
-      <xsl:when test="glossentry">
-        <dl>
-          <xsl:choose>
-            <xsl:when test="$glossary.sort != 0">
-              <xsl:apply-templates select="glossentry">
-                <xsl:sort lang="{$language}" select="translate(glossterm, $lowercase,                                              $uppercase)"/>
-              </xsl:apply-templates>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates select="glossentry"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </dl>
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- empty glossary -->
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:if test="not(parent::article)">
-      <xsl:call-template name="process.footnotes"/>
-    </xsl:if>
-  </div>
-</xsl:template>
-
-<xsl:template match="glossary/glossaryinfo"/>
-<xsl:template match="glossary/info"/>
-<xsl:template match="glossary/title"/>
-<xsl:template match="glossary/subtitle"/>
-<xsl:template match="glossary/titleabbrev"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="glosslist">
-  
-<xsl:variable name="language">
-  <xsl:call-template name="l10n.language"/>
-</xsl:variable>
-
-<xsl:variable name="lowercase">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key">normalize.sort.input</xsl:with-param>
-  </xsl:call-template>
-</xsl:variable>
-
-<xsl:variable name="uppercase">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key">normalize.sort.output</xsl:with-param>
-  </xsl:call-template>
-</xsl:variable>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor"/>
-    <xsl:if test="blockinfo/title|info/title|title">
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-    <dl>
-      <xsl:choose>
-        <xsl:when test="$glossary.sort != 0">
-          <xsl:apply-templates select="glossentry">
-            <xsl:sort lang="{$language}" select="translate(glossterm, $lowercase,                                          $uppercase)"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="glossentry"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </dl>
-  </div>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="glossdiv">
-  
-<xsl:variable name="language">
-  <xsl:call-template name="l10n.language"/>
-</xsl:variable>
-
-<xsl:variable name="lowercase">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key">normalize.sort.input</xsl:with-param>
-  </xsl:call-template>
-</xsl:variable>
-
-<xsl:variable name="uppercase">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key">normalize.sort.output</xsl:with-param>
-  </xsl:call-template>
-</xsl:variable>
-
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates select="(glossentry[1]/preceding-sibling::*)"/>
-
-    <dl>
-      <xsl:choose>
-        <xsl:when test="$glossary.sort != 0">
-          <xsl:apply-templates select="glossentry">
-            <xsl:sort lang="{$language}" select="translate(glossterm, $lowercase,                                          $uppercase)"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="glossentry"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </dl>
-  </div>
-</xsl:template>
-
-<xsl:template match="glossdiv/title">
-  <h3>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates/>
-  </h3>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!--
-GlossEntry ::=
-  GlossTerm, Acronym?, Abbrev?,
-  (IndexTerm)*,
-  RevHistory?,
-  (GlossSee | GlossDef+)
--->
-
-<xsl:template match="glossentry">
-  <xsl:choose>
-    <xsl:when test="$glossentry.show.acronym = 'primary'">
-      <dt>
-        <xsl:call-template name="anchor">
-          <xsl:with-param name="conditional">
-            <xsl:choose>
-              <xsl:when test="$glossterm.auto.link != 0">0</xsl:when>
-              <xsl:otherwise>1</xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
-        </xsl:call-template>
-
-        <xsl:choose>
-          <xsl:when test="acronym|abbrev">
-            <xsl:apply-templates select="acronym|abbrev"/>
-            <xsl:text> (</xsl:text>
-            <xsl:apply-templates select="glossterm"/>
-            <xsl:text>)</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates select="glossterm"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </dt>
-    </xsl:when>
-    <xsl:when test="$glossentry.show.acronym = 'yes'">
-      <dt>
-        <xsl:call-template name="anchor">
-          <xsl:with-param name="conditional">
-            <xsl:choose>
-              <xsl:when test="$glossterm.auto.link != 0">0</xsl:when>
-              <xsl:otherwise>1</xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
-        </xsl:call-template>
-
-        <xsl:apply-templates select="glossterm"/>
-
-        <xsl:if test="acronym|abbrev">
-          <xsl:text> (</xsl:text>
-          <xsl:apply-templates select="acronym|abbrev"/>
-          <xsl:text>)</xsl:text>
-        </xsl:if>
-      </dt>
-    </xsl:when>
-    <xsl:otherwise>
-      <dt>
-        <xsl:call-template name="anchor">
-          <xsl:with-param name="conditional">
-            <xsl:choose>
-              <xsl:when test="$glossterm.auto.link != 0">0</xsl:when>
-              <xsl:otherwise>1</xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
-        </xsl:call-template>
-
-        <xsl:apply-templates select="glossterm"/>
-      </dt>
-    </xsl:otherwise>
-  </xsl:choose>
-
-  <xsl:apply-templates select="indexterm|revhistory|glosssee|glossdef"/>
-</xsl:template>
-
-<xsl:template match="glossentry/glossterm">
-  <xsl:apply-templates/>
-  <xsl:if test="following-sibling::glossterm">, </xsl:if>
-</xsl:template>
-
-<xsl:template match="glossentry/acronym">
-  <xsl:apply-templates/>
-  <xsl:if test="following-sibling::acronym|following-sibling::abbrev">, </xsl:if>
-</xsl:template>
-
-<xsl:template match="glossentry/abbrev">
-  <xsl:apply-templates/>
-  <xsl:if test="following-sibling::acronym|following-sibling::abbrev">, </xsl:if>
-</xsl:template>
-
-<xsl:template match="glossentry/revhistory">
-</xsl:template>
-
-<xsl:template match="glossentry/glosssee">
-  <xsl:variable name="otherterm" select="@otherterm"/>
-  <xsl:variable name="targets" select="key('id', $otherterm)"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-
-  <dd>
-    <p>
-      <xsl:variable name="template">
-        <xsl:call-template name="gentext.template">
-          <xsl:with-param name="context" select="'glossary'"/>
-          <xsl:with-param name="name" select="'see'"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="title">
-        <xsl:choose>
-          <xsl:when test="$target">
-            <a>
-              <xsl:apply-templates select="." mode="class.attribute"/>
-              <xsl:attribute name="href">
-                <xsl:call-template name="href.target">
-                  <xsl:with-param name="object" select="$target"/>
-                </xsl:call-template>
-              </xsl:attribute>
-              <xsl:apply-templates select="$target" mode="xref-to"/>
-            </a>
-          </xsl:when>
-          <xsl:when test="$otherterm != '' and not($target)">
-            <xsl:message>
-              <xsl:text>Warning: glosssee @otherterm reference not found: </xsl:text>
-              <xsl:value-of select="$otherterm"/>
-            </xsl:message>
-            <xsl:apply-templates/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:call-template name="substitute-markup">
-        <xsl:with-param name="template" select="$template"/>
-        <xsl:with-param name="title" select="$title"/>
-      </xsl:call-template>
-      <xsl:text>.</xsl:text>
-    </p>
-  </dd>
-</xsl:template>
-
-<xsl:template match="glossentry/glossdef">
-  <dd>
-    <xsl:apply-templates select="*[local-name(.) != 'glossseealso']"/>
-    <xsl:if test="glossseealso">
-      <p>
-        <xsl:variable name="template">
-          <xsl:call-template name="gentext.template">
-            <xsl:with-param name="context" select="'glossary'"/>
-            <xsl:with-param name="name" select="'seealso'"/>
-          </xsl:call-template>
-        </xsl:variable>
-        <xsl:variable name="title">
-          <xsl:apply-templates select="glossseealso"/>
-        </xsl:variable>
-        <xsl:call-template name="substitute-markup">
-          <xsl:with-param name="template" select="$template"/>
-          <xsl:with-param name="title" select="$title"/>
-        </xsl:call-template>
-      </p>
-    </xsl:if>
-  </dd>
-</xsl:template>
-
-<xsl:template match="glossseealso">
-  <xsl:variable name="otherterm" select="@otherterm"/>
-  <xsl:variable name="targets" select="key('id', $otherterm)"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-
-  <xsl:choose>
-    <xsl:when test="$target">
-      <a>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:attribute name="href">
-          <xsl:call-template name="href.target">
-            <xsl:with-param name="object" select="$target"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:apply-templates select="$target" mode="xref-to"/>
-      </a>
-    </xsl:when>
-    <xsl:when test="$otherterm != '' and not($target)">
-      <xsl:message>
-        <xsl:text>Warning: glossseealso @otherterm reference not found: </xsl:text>
-        <xsl:value-of select="$otherterm"/>
-      </xsl:message>
-      <xsl:apply-templates/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates/>
-    </xsl:otherwise>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="position() = last()">
-      <xsl:text>.</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text>, </xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- Glossary collection -->
-
-<xsl:template match="glossary[@role='auto']" priority="2">
-  
-<xsl:variable name="language">
-  <xsl:call-template name="l10n.language"/>
-</xsl:variable>
-
-<xsl:variable name="lowercase">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key">normalize.sort.input</xsl:with-param>
-  </xsl:call-template>
-</xsl:variable>
-
-<xsl:variable name="uppercase">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key">normalize.sort.output</xsl:with-param>
-  </xsl:call-template>
-</xsl:variable>
-
-  <xsl:variable name="terms" select="//glossterm[not(parent::glossdef)]|//firstterm"/>
-  <xsl:variable name="collection" select="document($glossary.collection, .)"/>
-
-  <xsl:call-template name="id.warning"/>
-
-  <xsl:if test="$glossary.collection = ''">
-    <xsl:message>
-      <xsl:text>Warning: processing automatic glossary </xsl:text>
-      <xsl:text>without a glossary.collection file.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:if test="not($collection) and $glossary.collection != ''">
-    <xsl:message>
-      <xsl:text>Warning: processing automatic glossary but unable to </xsl:text>
-      <xsl:text>open glossary.collection file '</xsl:text>
-      <xsl:value-of select="$glossary.collection"/>
-      <xsl:text>'</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="$generate.id.attributes != 0">
-      <xsl:attribute name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="glossary.titlepage"/>
-
-    <xsl:choose>
-      <xsl:when test="glossdiv and $collection//glossdiv">
-        <xsl:for-each select="$collection//glossdiv">
-          <!-- first see if there are any in this div -->
-          <xsl:variable name="exist.test">
-            <xsl:for-each select="glossentry">
-              <xsl:variable name="cterm" select="glossterm"/>
-              <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-                <xsl:value-of select="glossterm"/>
-              </xsl:if>
-            </xsl:for-each>
-          </xsl:variable>
-
-          <xsl:if test="$exist.test != ''">
-            <xsl:apply-templates select="." mode="auto-glossary">
-              <xsl:with-param name="terms" select="$terms"/>
-            </xsl:apply-templates>
-          </xsl:if>
-        </xsl:for-each>
-      </xsl:when>
-      <xsl:otherwise>
-        <dl>
-          <xsl:choose>
-            <xsl:when test="$glossary.sort != 0">
-              <xsl:for-each select="$collection//glossentry">
-                <xsl:sort lang="{$language}" select="translate(glossterm, $lowercase,                                              $uppercase)"/>
-                <xsl:variable name="cterm" select="glossterm"/>
-                <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-                  <xsl:apply-templates select="." mode="auto-glossary"/>
-                </xsl:if>
-              </xsl:for-each>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:for-each select="$collection//glossentry">
-                <xsl:variable name="cterm" select="glossterm"/>
-                <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-                  <xsl:apply-templates select="." mode="auto-glossary"/>
-                </xsl:if>
-              </xsl:for-each>
-            </xsl:otherwise>
-          </xsl:choose>
-        </dl>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:if test="not(parent::article)">
-      <xsl:call-template name="process.footnotes"/>
-    </xsl:if>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="auto-glossary">
-  <!-- pop back out to the default mode for most elements -->
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template match="glossdiv" mode="auto-glossary">
-  <xsl:param name="terms" select="."/>
-
-  
-<xsl:variable name="language">
-  <xsl:call-template name="l10n.language"/>
-</xsl:variable>
-
-<xsl:variable name="lowercase">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key">normalize.sort.input</xsl:with-param>
-  </xsl:call-template>
-</xsl:variable>
-
-<xsl:variable name="uppercase">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key">normalize.sort.output</xsl:with-param>
-  </xsl:call-template>
-</xsl:variable>
-
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates select="(glossentry[1]/preceding-sibling::*)"/>
-
-    <dl>
-      <xsl:choose>
-        <xsl:when test="$glossary.sort != 0">
-          <xsl:for-each select="glossentry">
-            <xsl:sort lang="{$language}" select="translate(glossterm, $lowercase,                                          $uppercase)"/>
-            <xsl:variable name="cterm" select="glossterm"/>
-            <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-              <xsl:apply-templates select="." mode="auto-glossary"/>
-            </xsl:if>
-          </xsl:for-each>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:for-each select="glossentry">
-            <xsl:variable name="cterm" select="glossterm"/>
-            <xsl:if test="$terms[@baseform = $cterm or . = $cterm]">
-              <xsl:apply-templates select="." mode="auto-glossary"/>
-            </xsl:if>
-          </xsl:for-each>
-        </xsl:otherwise>
-      </xsl:choose>
-    </dl>
-  </div>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/graphics.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/graphics.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,1414 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:stext="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.TextFactory" xmlns:simg="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.ImageIntrinsics" xmlns:ximg="xalan://com.nwalsh.xalan.ImageIntrinsics" xmlns:xtext="xalan://com.nwalsh.xalan.Text" xmlns:lxslt="http://xml.apache.org/xslt" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="xlink stext xtext lxslt simg ximg" extension-element-prefixes="stext xtext" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     Contributors:
-     Colin Paul Adams, <colin@colina.demon.co.uk>
-
-     ******************************************************************** -->
-
-<lxslt:component prefix="xtext" elements="insertfile"/>
-<lxslt:component prefix="ximg" functions="new getWidth getDepth"/>
-
-<!-- ==================================================================== -->
-<!-- Graphic format tests for the HTML backend -->
-
-<xsl:template name="is.graphic.format">
-  <xsl:param name="format"/>
-  <xsl:if test="$format = 'SVG'                 or $format = 'PNG'                 or $format = 'JPG'                 or $format = 'JPEG'                 or $format = 'linespecific'                 or $format = 'GIF'                 or $format = 'GIF87a'                 or $format = 'GIF89a'                 or $format = 'BMP'">1</xsl:if>
-</xsl:template>
-
-<xsl:template name="is.graphic.extension">
-  <xsl:param name="ext"/>
-  <xsl:variable name="lcext" select="translate($ext,                                        'ABCDEFGHIJKLMNOPQRSTUVWXYZ',                                        'abcdefghijklmnopqrstuvwxyz')"/>
-  <xsl:if test="$lcext = 'svg'              or $lcext = 'png'              or $lcext = 'jpeg'              or $lcext = 'jpg'              or $lcext = 'avi'              or $lcext = 'mpg'              or $lcext = 'mpeg'              or $lcext = 'qt'              or $lcext = 'gif'              or $lcext = 'bmp'">1</xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="screenshot">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates/>
-  </div>
-</xsl:template>
-
-<xsl:template match="screeninfo">
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="process.image">
-  <!-- When this template is called, the current node should be  -->
-  <!-- a graphic, inlinegraphic, imagedata, or videodata. All    -->
-  <!-- those elements have the same set of attributes, so we can -->
-  <!-- handle them all in one place.                             -->
-  <xsl:param name="tag" select="'img'"/>
-  <xsl:param name="alt"/>
-  <xsl:param name="longdesc"/>
-
-  <!-- The HTML img element only supports the notion of content-area
-       scaling; it doesn't support the distinction between a
-       content-area and a viewport-area, so we have to make some
-       compromises.
-
-       1. If only the content-area is specified, everything is fine.
-          (If you ask for a three inch image, that's what you'll get.)
-
-       2. If only the viewport-area is provided:
-          - If scalefit=1, treat it as both the content-area and
-            the viewport-area. (If you ask for an image in a five inch
-            area, we'll make the image five inches to fill that area.)
-          - If scalefit=0, ignore the viewport-area specification.
-
-          Note: this is not quite the right semantic and has the additional
-          problem that it can result in anamorphic scaling, which scalefit
-          should never cause.
-
-       3. If both the content-area and the viewport-area is specified
-          on a graphic element, ignore the viewport-area.
-          (If you ask for a three inch image in a five inch area, we'll assume
-           it's better to give you a three inch image in an unspecified area
-           than a five inch image in a five inch area.
-
-       Relative units also cause problems. As a general rule, the stylesheets
-       are operating too early and too loosely coupled with the rendering engine
-       to know things like the current font size or the actual dimensions of
-       an image. Therefore:
-
-       1. We use a fixed size for pixels, $pixels.per.inch
-
-       2. We use a fixed size for "em"s, $points.per.em
-
-       Percentages are problematic. In the following discussion, we speak
-       of width and contentwidth, but the same issues apply to depth and
-       contentdepth
-
-       1. A width of 50% means "half of the available space for the image."
-          That's fine. But note that in HTML, this is a dynamic property and
-          the image size will vary if the browser window is resized.
-
-       2. A contentwidth of 50% means "half of the actual image width". But
-          the stylesheets have no way to assess the image's actual size. Treating
-          this as a width of 50% is one possibility, but it produces behavior
-          (dynamic scaling) that seems entirely out of character with the
-          meaning.
-
-          Instead, the stylesheets define a $nominal.image.width
-          and convert percentages to actual values based on that nominal size.
-
-       Scale can be problematic. Scale applies to the contentwidth, so
-       a scale of 50 when a contentwidth is not specified is analagous to a
-       width of 50%. (If a contentwidth is specified, the scaling factor can
-       be applied to that value and no problem exists.)
-
-       If scale is specified but contentwidth is not supplied, the
-       nominal.image.width is used to calculate a base size
-       for scaling.
-
-       Warning: as a consequence of these decisions, unless the aspect ratio
-       of your image happens to be exactly the same as (nominal width / nominal height),
-       specifying contentwidth="50%" and contentdepth="50%" is NOT going to
-       scale the way you expect (or really, the way it should).
-
-       Don't do that. In fact, a percentage value is not recommended for content
-       size at all. Use scale instead.
-
-       Finally, align and valign are troublesome. Horizontal alignment is now
-       supported by wrapping the image in a <div align="{@align}"> (in block
-       contexts!). I can't think of anything (practical) to do about vertical
-       alignment.
-  -->
-
-  <xsl:variable name="width-units">
-    <xsl:choose>
-      <xsl:when test="$ignore.image.scaling != 0"/>
-      <xsl:when test="@width">
-        <xsl:call-template name="length-units">
-          <xsl:with-param name="length" select="@width"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:when test="not(@depth) and $default.image.width != ''">
-        <xsl:call-template name="length-units">
-          <xsl:with-param name="length" select="$default.image.width"/>
-        </xsl:call-template>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="width">
-    <xsl:choose>
-      <xsl:when test="$ignore.image.scaling != 0"/>
-      <xsl:when test="@width">
-        <xsl:choose>
-          <xsl:when test="$width-units = '%'">
-            <xsl:value-of select="@width"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="length-spec">
-              <xsl:with-param name="length" select="@width"/>
-            </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:when test="not(@depth) and $default.image.width != ''">
-        <xsl:value-of select="$default.image.width"/>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="scalefit">
-    <xsl:choose>
-      <xsl:when test="$ignore.image.scaling != 0">0</xsl:when>
-      <xsl:when test="@contentwidth or @contentdepth">0</xsl:when>
-      <xsl:when test="@scale">0</xsl:when>
-      <xsl:when test="@scalefit"><xsl:value-of select="@scalefit"/></xsl:when>
-      <xsl:when test="$width != '' or @depth">1</xsl:when>
-      <xsl:otherwise>0</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="scale">
-    <xsl:choose>
-      <xsl:when test="$ignore.image.scaling != 0">1.0</xsl:when>
-      <xsl:when test="@contentwidth or @contentdepth">1.0</xsl:when>
-      <xsl:when test="@scale">
-        <xsl:value-of select="@scale div 100.0"/>
-      </xsl:when>
-      <xsl:otherwise>1.0</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="filename">
-    <xsl:choose>
-      <xsl:when test="local-name(.) = 'graphic'                       or local-name(.) = 'inlinegraphic'">
-        <!-- handle legacy graphic and inlinegraphic by new template --> 
-        <xsl:call-template name="mediaobject.filename">
-          <xsl:with-param name="object" select="."/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- imagedata, videodata, audiodata -->
-        <xsl:call-template name="mediaobject.filename">
-          <xsl:with-param name="object" select=".."/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="output_filename">
-    <xsl:choose>
-      <xsl:when test="@entityref">
-        <xsl:value-of select="$filename"/>
-      </xsl:when>
-      <!--
-        Moved test for $keep.relative.image.uris to template below:
-            <xsl:template match="@fileref">
-      -->
-      <xsl:otherwise>
-        <xsl:value-of select="$filename"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="img.src.path.pi">
-    <xsl:call-template name="pi.dbhtml_img.src.path">
-      <xsl:with-param name="node" select=".."/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="filename.for.graphicsize">
-    <xsl:choose>
-      <xsl:when test="$img.src.path.pi != ''">
-        <xsl:value-of select="concat($img.src.path.pi, $filename)"/>
-      </xsl:when>
-      <xsl:when test="$img.src.path != '' and                       $graphicsize.use.img.src.path != 0 and                       $tag = 'img' and                       not(starts-with($filename, '/')) and                       not(contains($filename, '://'))">
-        <xsl:value-of select="concat($img.src.path, $filename)"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$filename"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="realintrinsicwidth">
-    <!-- This funny compound test works around a bug in XSLTC -->
-    <xsl:choose>
-      <xsl:when test="$use.extensions != 0 and $graphicsize.extension != 0">
-        <xsl:choose>
-          <xsl:when test="function-available('simg:getWidth')">
-            <xsl:value-of select="simg:getWidth(simg:new($filename.for.graphicsize),                                                 $nominal.image.width)"/>
-          </xsl:when>
-          <xsl:when test="function-available('ximg:getWidth')">
-            <xsl:value-of select="ximg:getWidth(ximg:new($filename.for.graphicsize),                                                 $nominal.image.width)"/>
-          </xsl:when>
-          <xsl:otherwise>
-           <xsl:value-of select="0"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="0"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="intrinsicwidth">
-    <xsl:choose>
-      <xsl:when test="$realintrinsicwidth = 0">
-       <xsl:value-of select="$nominal.image.width"/>
-      </xsl:when>
-      <xsl:otherwise>
-       <xsl:value-of select="$realintrinsicwidth"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="intrinsicdepth">
-    <!-- This funny compound test works around a bug in XSLTC -->
-    <xsl:choose>
-      <xsl:when test="$use.extensions != 0 and $graphicsize.extension != 0">
-        <xsl:choose>
-          <xsl:when test="function-available('simg:getDepth')">
-            <xsl:value-of select="simg:getDepth(simg:new($filename.for.graphicsize),                                                 $nominal.image.depth)"/>
-          </xsl:when>
-          <xsl:when test="function-available('ximg:getDepth')">
-            <xsl:value-of select="ximg:getDepth(ximg:new($filename.for.graphicsize),                                                 $nominal.image.depth)"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$nominal.image.depth"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$nominal.image.depth"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="contentwidth">
-    <xsl:choose>
-      <xsl:when test="$ignore.image.scaling != 0"/>
-      <xsl:when test="@contentwidth">
-        <xsl:variable name="units">
-          <xsl:call-template name="length-units">
-            <xsl:with-param name="length" select="@contentwidth"/>
-          </xsl:call-template>
-        </xsl:variable>
-
-        <xsl:choose>
-          <xsl:when test="$units = '%'">
-            <xsl:variable name="cmagnitude">
-              <xsl:call-template name="length-magnitude">
-                <xsl:with-param name="length" select="@contentwidth"/>
-              </xsl:call-template>
-            </xsl:variable>
-            <xsl:value-of select="$intrinsicwidth * $cmagnitude div 100.0"/>
-            <xsl:text>px</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="length-spec">
-              <xsl:with-param name="length" select="@contentwidth"/>
-            </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$intrinsicwidth"/>
-        <xsl:text>px</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="scaled.contentwidth">
-    <xsl:if test="$contentwidth != ''">
-      <xsl:variable name="cwidth.in.points">
-        <xsl:call-template name="length-in-points">
-          <xsl:with-param name="length" select="$contentwidth"/>
-          <xsl:with-param name="pixels.per.inch" select="$pixels.per.inch"/>
-          <xsl:with-param name="em.size" select="$points.per.em"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:value-of select="$cwidth.in.points div 72.0 * $pixels.per.inch * $scale"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="html.width">
-    <xsl:choose>
-      <xsl:when test="$ignore.image.scaling != 0"/>
-      <xsl:when test="$width-units = '%'">
-        <xsl:value-of select="$width"/>
-      </xsl:when>
-      <xsl:when test="$width != ''">
-        <xsl:variable name="width.in.points">
-          <xsl:call-template name="length-in-points">
-            <xsl:with-param name="length" select="$width"/>
-            <xsl:with-param name="pixels.per.inch" select="$pixels.per.inch"/>
-            <xsl:with-param name="em.size" select="$points.per.em"/>
-          </xsl:call-template>
-        </xsl:variable>
-        <xsl:value-of select="round($width.in.points div 72.0 * $pixels.per.inch)"/>
-      </xsl:when>
-      <xsl:otherwise/>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="contentdepth">
-    <xsl:choose>
-      <xsl:when test="$ignore.image.scaling != 0"/>
-      <xsl:when test="@contentdepth">
-        <xsl:variable name="units">
-          <xsl:call-template name="length-units">
-            <xsl:with-param name="length" select="@contentdepth"/>
-          </xsl:call-template>
-        </xsl:variable>
-
-        <xsl:choose>
-          <xsl:when test="$units = '%'">
-            <xsl:variable name="cmagnitude">
-              <xsl:call-template name="length-magnitude">
-                <xsl:with-param name="length" select="@contentdepth"/>
-              </xsl:call-template>
-            </xsl:variable>
-            <xsl:value-of select="$intrinsicdepth * $cmagnitude div 100.0"/>
-            <xsl:text>px</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="length-spec">
-              <xsl:with-param name="length" select="@contentdepth"/>
-            </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$intrinsicdepth"/>
-        <xsl:text>px</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="scaled.contentdepth">
-    <xsl:if test="$contentdepth != ''">
-      <xsl:variable name="cdepth.in.points">
-        <xsl:call-template name="length-in-points">
-          <xsl:with-param name="length" select="$contentdepth"/>
-          <xsl:with-param name="pixels.per.inch" select="$pixels.per.inch"/>
-          <xsl:with-param name="em.size" select="$points.per.em"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:value-of select="$cdepth.in.points div 72.0 * $pixels.per.inch * $scale"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="depth-units">
-    <xsl:if test="@depth">
-      <xsl:call-template name="length-units">
-        <xsl:with-param name="length" select="@depth"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="depth">
-    <xsl:if test="@depth">
-      <xsl:choose>
-        <xsl:when test="$depth-units = '%'">
-          <xsl:value-of select="@depth"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="length-spec">
-            <xsl:with-param name="length" select="@depth"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="html.depth">
-    <xsl:choose>
-      <xsl:when test="$ignore.image.scaling != 0"/>
-      <xsl:when test="$depth-units = '%'">
-        <xsl:value-of select="$depth"/>
-      </xsl:when>
-      <xsl:when test="@depth and @depth != ''">
-        <xsl:variable name="depth.in.points">
-          <xsl:call-template name="length-in-points">
-            <xsl:with-param name="length" select="$depth"/>
-            <xsl:with-param name="pixels.per.inch" select="$pixels.per.inch"/>
-            <xsl:with-param name="em.size" select="$points.per.em"/>
-          </xsl:call-template>
-        </xsl:variable>
-        <xsl:value-of select="round($depth.in.points div 72.0 * $pixels.per.inch)"/>
-      </xsl:when>
-      <xsl:otherwise/>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="viewport">
-    <xsl:choose>
-      <xsl:when test="$ignore.image.scaling != 0">0</xsl:when>
-      <xsl:when test="local-name(.) = 'inlinegraphic'                       or ancestor::inlinemediaobject                       or ancestor::inlineequation">0</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$make.graphic.viewport"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-<!--
-  <xsl:message>=====================================
-scale: <xsl:value-of select="$scale"/>, <xsl:value-of select="$scalefit"/>
-@contentwidth <xsl:value-of select="@contentwidth"/>
-$contentwidth <xsl:value-of select="$contentwidth"/>
-scaled.contentwidth: <xsl:value-of select="$scaled.contentwidth"/>
-@width: <xsl:value-of select="@width"/>
-width: <xsl:value-of select="$width"/>
-html.width: <xsl:value-of select="$html.width"/>
-@contentdepth <xsl:value-of select="@contentdepth"/>
-$contentdepth <xsl:value-of select="$contentdepth"/>
-scaled.contentdepth: <xsl:value-of select="$scaled.contentdepth"/>
-@depth: <xsl:value-of select="@depth"/>
-depth: <xsl:value-of select="$depth"/>
-html.depth: <xsl:value-of select="$html.depth"/>
-align: <xsl:value-of select="@align"/>
-valign: <xsl:value-of select="@valign"/></xsl:message>
--->
-
-  <xsl:variable name="scaled" select="@width|@depth|@contentwidth|@contentdepth                         |@scale|@scalefit"/>
-
-  <xsl:variable name="img">
-    <xsl:choose>
-      <xsl:when test="@format = 'SVG'">
-        <object data="{$output_filename}" type="image/svg+xml">
-          <xsl:call-template name="process.image.attributes">
-            <!--xsl:with-param name="alt" select="$alt"/ there's no alt here-->
-            <xsl:with-param name="html.depth" select="$html.depth"/>
-            <xsl:with-param name="html.width" select="$html.width"/>
-            <xsl:with-param name="longdesc" select="$longdesc"/>
-            <xsl:with-param name="scale" select="$scale"/>
-            <xsl:with-param name="scalefit" select="$scalefit"/>
-            <xsl:with-param name="scaled.contentdepth" select="$scaled.contentdepth"/>
-            <xsl:with-param name="scaled.contentwidth" select="$scaled.contentwidth"/>
-            <xsl:with-param name="viewport" select="$viewport"/>
-          </xsl:call-template>
-          <xsl:if test="@align">
-            <xsl:attribute name="align">
-                <xsl:choose>
-                  <xsl:when test="@align = 'center'">middle</xsl:when>
-                  <xsl:otherwise>
-                    <xsl:value-of select="@align"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-            </xsl:attribute>
-          </xsl:if>
-          <xsl:if test="$use.embed.for.svg != 0">
-            <embed src="{$output_filename}" type="image/svg+xml">
-              <xsl:call-template name="process.image.attributes">
-                <!--xsl:with-param name="alt" select="$alt"/ there's no alt here -->
-                <xsl:with-param name="html.depth" select="$html.depth"/>
-                <xsl:with-param name="html.width" select="$html.width"/>
-                <xsl:with-param name="longdesc" select="$longdesc"/>
-                <xsl:with-param name="scale" select="$scale"/>
-                <xsl:with-param name="scalefit" select="$scalefit"/>
-                <xsl:with-param name="scaled.contentdepth" select="$scaled.contentdepth"/>
-                <xsl:with-param name="scaled.contentwidth" select="$scaled.contentwidth"/>
-                <xsl:with-param name="viewport" select="$viewport"/>
-              </xsl:call-template>
-            </embed>
-          </xsl:if>
-        </object>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:element name="{$tag}" namespace="http://www.w3.org/1999/xhtml">
-         <xsl:if test="$tag = 'img' and ../../self::imageobjectco">
-           <xsl:variable name="mapname">
-             <xsl:call-template name="object.id">
-               <xsl:with-param name="object" select="../../areaspec"/>
-             </xsl:call-template>
-           </xsl:variable>
-           <xsl:choose>
-             <xsl:when test="$scaled">
-              <!-- It might be possible to handle some scaling; needs -->
-              <!-- more investigation -->
-              <xsl:message>
-                <xsl:text>Warning: imagemaps not supported </xsl:text>
-                <xsl:text>on scaled images</xsl:text>
-              </xsl:message>
-             </xsl:when>
-             <xsl:otherwise>
-              <xsl:attribute name="border">0</xsl:attribute>
-              <xsl:attribute name="usemap">
-                <xsl:value-of select="concat('#', $mapname)"/>
-              </xsl:attribute>
-             </xsl:otherwise>
-           </xsl:choose>
-         </xsl:if>
-
-          <xsl:attribute name="src">
-           <xsl:choose>
-             <xsl:when test="$img.src.path != '' and                            $tag = 'img' and                              not(starts-with($output_filename, '/')) and                            not(contains($output_filename, '://'))">
-               <xsl:value-of select="$img.src.path"/>
-             </xsl:when>
-           </xsl:choose>
-            <xsl:value-of select="$output_filename"/>
-          </xsl:attribute>
-
-          <xsl:if test="@align">
-            <xsl:attribute name="align">
-              <xsl:choose>
-                <xsl:when test="@align = 'center'">middle</xsl:when>
-                <xsl:otherwise>
-                  <xsl:value-of select="@align"/>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:attribute>
-          </xsl:if>
-
-          <xsl:call-template name="process.image.attributes">
-            <xsl:with-param name="alt">
-              <xsl:choose>
-                <xsl:when test="$alt != ''">
-                  <xsl:copy-of select="$alt"/>
-                </xsl:when>
-                <xsl:when test="ancestor::figure">
-                  <xsl:value-of select="normalize-space(ancestor::figure/title)"/>
-                </xsl:when>
-              </xsl:choose>
-            </xsl:with-param>
-            <xsl:with-param name="html.depth" select="$html.depth"/>
-            <xsl:with-param name="html.width" select="$html.width"/>
-            <xsl:with-param name="longdesc" select="$longdesc"/>
-            <xsl:with-param name="scale" select="$scale"/>
-            <xsl:with-param name="scalefit" select="$scalefit"/>
-            <xsl:with-param name="scaled.contentdepth" select="$scaled.contentdepth"/>
-            <xsl:with-param name="scaled.contentwidth" select="$scaled.contentwidth"/>
-            <xsl:with-param name="viewport" select="$viewport"/>
-          </xsl:call-template>
-        </xsl:element>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="bgcolor">
-    <xsl:call-template name="pi.dbhtml_background-color">
-      <xsl:with-param name="node" select=".."/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="use.viewport" select="$viewport != 0                         and ($html.width != ''                              or ($html.depth != '' and $depth-units != '%')                              or $bgcolor != ''                              or @valign)"/>
-
-  <xsl:choose>
-    <xsl:when test="$use.viewport">
-      <table border="0" summary="manufactured viewport for HTML img" cellspacing="0" cellpadding="0">
-        <xsl:if test="$html.width != ''">
-          <xsl:attribute name="width">
-            <xsl:value-of select="$html.width"/>
-          </xsl:attribute>
-        </xsl:if>
-        <tr>
-          <xsl:if test="$html.depth != '' and $depth-units != '%'">
-            <!-- don't do this for percentages because browsers get confused -->
-            <xsl:choose>
-              <xsl:when test="$css.decoration != 0">
-                <xsl:attribute name="style">
-                  <xsl:text>height: </xsl:text>
-                  <xsl:value-of select="$html.depth"/>
-                  <xsl:text>px</xsl:text>
-                </xsl:attribute>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:attribute name="height">
-                  <xsl:value-of select="$html.depth"/>
-                </xsl:attribute>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:if>
-          <td>
-            <xsl:if test="$bgcolor != ''">
-              <xsl:choose>
-                <xsl:when test="$css.decoration != 0">
-                  <xsl:attribute name="style">
-                    <xsl:text>background-color: </xsl:text>
-                    <xsl:value-of select="$bgcolor"/>
-                  </xsl:attribute>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:attribute name="bgcolor">
-                    <xsl:value-of select="$bgcolor"/>
-                  </xsl:attribute>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:if>
-            <xsl:if test="@align">
-              <xsl:attribute name="align">
-                <xsl:value-of select="@align"/>
-              </xsl:attribute>
-            </xsl:if>
-            <xsl:if test="@valign">
-              <xsl:attribute name="valign">
-                <xsl:value-of select="@valign"/>
-              </xsl:attribute>
-            </xsl:if>
-            <xsl:copy-of select="$img"/>
-          </td>
-        </tr>
-      </table>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$img"/>
-    </xsl:otherwise>
-  </xsl:choose>
-
-  <xsl:if test="$tag = 'img' and ../../self::imageobjectco and not($scaled)">
-    <xsl:variable name="mapname">
-      <xsl:call-template name="object.id">
-        <xsl:with-param name="object" select="../../areaspec"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <map name="{$mapname}">
-      <xsl:for-each select="../../areaspec//area">
-        <xsl:variable name="units">
-          <xsl:choose>
-            <xsl:when test="@units = 'other' and @otherunits">
-              <xsl:value-of select="@otherunits"/>
-            </xsl:when>
-            <xsl:when test="@units">
-              <xsl:value-of select="@units"/>
-            </xsl:when>
-            <!-- areaspec|areaset/area -->
-            <xsl:when test="../@units = 'other' and ../@otherunits">
-              <xsl:value-of select="../@otherunits"/>
-            </xsl:when>
-            <xsl:when test="../@units">
-              <xsl:value-of select="../@units"/>
-            </xsl:when>
-            <!-- areaspec/areaset/area -->
-            <xsl:when test="../../@units = 'other' and ../../@otherunits">
-              <xsl:value-of select="../@otherunits"/>
-            </xsl:when>
-            <xsl:when test="../../@units">
-              <xsl:value-of select="../../@units"/>
-            </xsl:when>
-            <xsl:otherwise>calspair</xsl:otherwise>
-          </xsl:choose>
-        </xsl:variable>
- 
-        <xsl:choose>
-          <xsl:when test="$units = 'calspair' or                           $units = 'imagemap'">
-            <xsl:variable name="coords" select="normalize-space(@coords)"/>
-
-            <area shape="rect">
-              <xsl:variable name="linkends">
-                <xsl:choose>
-                  <xsl:when test="@linkends">
-                    <xsl:value-of select="normalize-space(@linkends)"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:value-of select="normalize-space(../@linkends)"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:variable>
- 
-              <xsl:variable name="href">
-                <xsl:choose>
-                  <xsl:when test="@xlink:href">
-                    <xsl:value-of select="@xlink:href"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:value-of select="../@xlink:href"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:variable>
- 
-              <xsl:choose>
-                <xsl:when test="$linkends != ''">
-                  <xsl:variable name="linkend">
-                    <xsl:choose>
-                      <xsl:when test="contains($linkends, ' ')">
-                        <xsl:value-of select="substring-before($linkends, ' ')"/>
-                      </xsl:when>
-                      <xsl:otherwise>
-                        <xsl:value-of select="$linkends"/>
-                      </xsl:otherwise>
-                    </xsl:choose>
-                  </xsl:variable>
-                  
-                  <xsl:variable name="target" select="key('id', $linkend)[1]"/>
-                 
-                  <xsl:if test="$target">
-                    <xsl:attribute name="href">
-                      <xsl:call-template name="href.target">
-                        <xsl:with-param name="object" select="$target"/>
-                      </xsl:call-template>
-                    </xsl:attribute>
-                  </xsl:if>
-                </xsl:when>
-                <xsl:when test="$href != ''">
-                  <xsl:attribute name="href">
-                    <xsl:value-of select="$href"/>
-                  </xsl:attribute>
-                </xsl:when>
-              </xsl:choose>
- 
-              <xsl:if test="alt">
-                <xsl:attribute name="alt">
-                  <xsl:value-of select="alt[1]"/>
-                </xsl:attribute>
-              </xsl:if>
- 
-              <xsl:attribute name="coords">
-                <xsl:choose>
-                  <xsl:when test="$units = 'calspair'">
-
-                    <xsl:variable name="p1" select="substring-before($coords, ' ')"/>
-                    <xsl:variable name="p2" select="substring-after($coords, ' ')"/>
-         
-                    <xsl:variable name="x1" select="substring-before($p1,',')"/>
-                    <xsl:variable name="y1" select="substring-after($p1,',')"/>
-                    <xsl:variable name="x2" select="substring-before($p2,',')"/>
-                    <xsl:variable name="y2" select="substring-after($p2,',')"/>
-         
-                    <xsl:variable name="x1p" select="$x1 div 100.0"/>
-                    <xsl:variable name="y1p" select="$y1 div 100.0"/>
-                    <xsl:variable name="x2p" select="$x2 div 100.0"/>
-                    <xsl:variable name="y2p" select="$y2 div 100.0"/>
-         
-         <!--
-                    <xsl:message>
-                      <xsl:text>units: </xsl:text>
-                      <xsl:value-of select="$units"/>
-                      <xsl:text> </xsl:text>
-                      <xsl:value-of select="$x1p"/><xsl:text>, </xsl:text>
-                      <xsl:value-of select="$y1p"/><xsl:text>, </xsl:text>
-                      <xsl:value-of select="$x2p"/><xsl:text>, </xsl:text>
-                      <xsl:value-of select="$y2p"/><xsl:text>, </xsl:text>
-                    </xsl:message>
-         
-                    <xsl:message>
-                      <xsl:text>      </xsl:text>
-                      <xsl:value-of select="$intrinsicwidth"/>
-                      <xsl:text>, </xsl:text>
-                      <xsl:value-of select="$intrinsicdepth"/>
-                    </xsl:message>
-         
-                    <xsl:message>
-                      <xsl:text>      </xsl:text>
-                      <xsl:value-of select="$units"/>
-                      <xsl:text> </xsl:text>
-                      <xsl:value-of 
-                            select="round($x1p * $intrinsicwidth div 100.0)"/>
-                      <xsl:text>,</xsl:text>
-                      <xsl:value-of select="round($intrinsicdepth
-                                       - ($y2p * $intrinsicdepth div 100.0))"/>
-                      <xsl:text>,</xsl:text>
-                      <xsl:value-of select="round($x2p * 
-                                            $intrinsicwidth div 100.0)"/>
-                      <xsl:text>,</xsl:text>
-                      <xsl:value-of select="round($intrinsicdepth
-                                       - ($y1p * $intrinsicdepth div 100.0))"/>
-                    </xsl:message>
-         -->
-                    <xsl:value-of select="round($x1p * $intrinsicwidth div 100.0)"/>
-                    <xsl:text>,</xsl:text>
-                    <xsl:value-of select="round($intrinsicdepth                                         - ($y2p * $intrinsicdepth div 100.0))"/>
-                    <xsl:text>,</xsl:text>
-                    <xsl:value-of select="round($x2p * $intrinsicwidth div 100.0)"/>
-                    <xsl:text>,</xsl:text>
-                    <xsl:value-of select="round($intrinsicdepth                                       - ($y1p * $intrinsicdepth div 100.0))"/>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:copy-of select="$coords"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </xsl:attribute>
-            </area>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:message>
-              <xsl:text>Warning: only calspair or </xsl:text>
-              <xsl:text>otherunits='imagemap' supported </xsl:text>
-              <xsl:text>in imageobjectco</xsl:text>
-            </xsl:message>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:for-each>
-    </map>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="process.image.attributes">
-  <xsl:param name="alt"/>
-  <xsl:param name="html.width"/>
-  <xsl:param name="html.depth"/>
-  <xsl:param name="longdesc"/>
-  <xsl:param name="scale"/>
-  <xsl:param name="scalefit"/>
-  <xsl:param name="scaled.contentdepth"/>
-  <xsl:param name="scaled.contentwidth"/>
-  <xsl:param name="viewport"/>
-
-  <xsl:choose>
-    <xsl:when test="@contentwidth or @contentdepth">
-      <!-- ignore @width/@depth, @scale, and @scalefit if specified -->
-      <xsl:if test="@contentwidth and $scaled.contentwidth != ''">
-        <xsl:attribute name="width">
-          <xsl:value-of select="$scaled.contentwidth"/>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:if test="@contentdepth and $scaled.contentdepth != ''">
-        <xsl:attribute name="height">
-          <xsl:value-of select="$scaled.contentdepth"/>
-        </xsl:attribute>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="number($scale) != 1.0">
-      <!-- scaling is always uniform, so we only have to specify one dimension -->
-      <!-- ignore @scalefit if specified -->
-      <xsl:attribute name="width">
-        <xsl:value-of select="$scaled.contentwidth"/>
-      </xsl:attribute>
-    </xsl:when>
-
-    <xsl:when test="$scalefit != 0">
-      <xsl:choose>
-        <xsl:when test="contains($html.width, '%')">
-          <xsl:choose>
-            <xsl:when test="$viewport != 0">
-              <!-- The *viewport* will be scaled, so use 100% here! -->
-              <xsl:attribute name="width">
-                <xsl:value-of select="'100%'"/>
-              </xsl:attribute>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:attribute name="width">
-                <xsl:value-of select="$html.width"/>
-              </xsl:attribute>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-
-        <xsl:when test="contains($html.depth, '%')">
-          <!-- HTML doesn't deal with this case very well...do nothing -->
-        </xsl:when>
-
-        <xsl:when test="$scaled.contentwidth != '' and $html.width != ''                         and $scaled.contentdepth != '' and $html.depth != ''">
-          <!-- scalefit should not be anamorphic; figure out which direction -->
-          <!-- has the limiting scale factor and scale in that direction -->
-          <xsl:choose>
-            <xsl:when test="$html.width div $scaled.contentwidth &gt;                             $html.depth div $scaled.contentdepth">
-              <xsl:attribute name="height">
-                <xsl:value-of select="$html.depth"/>
-              </xsl:attribute>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:attribute name="width">
-                <xsl:value-of select="$html.width"/>
-              </xsl:attribute>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-
-        <xsl:when test="$scaled.contentwidth != '' and $html.width != ''">
-          <xsl:attribute name="width">
-            <xsl:value-of select="$html.width"/>
-          </xsl:attribute>
-        </xsl:when>
-
-        <xsl:when test="$scaled.contentdepth != '' and $html.depth != ''">
-          <xsl:attribute name="height">
-            <xsl:value-of select="$html.depth"/>
-          </xsl:attribute>
-        </xsl:when>
-      </xsl:choose>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:if test="$alt != ''">
-    <xsl:attribute name="alt">
-      <xsl:value-of select="normalize-space($alt)"/>
-    </xsl:attribute>
-  </xsl:if>
-
-  <xsl:if test="$longdesc != ''">
-    <xsl:attribute name="longdesc">
-      <xsl:value-of select="$longdesc"/>
-    </xsl:attribute>
-  </xsl:if>
-
-  <xsl:if test="@align and $viewport = 0">
-    <xsl:attribute name="align">
-      <xsl:choose>
-        <xsl:when test="@align = 'center'">middle</xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="@align"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-  </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="graphic">
-  <xsl:choose>
-    <xsl:when test="parent::inlineequation">
-      <xsl:call-template name="anchor"/>
-      <xsl:call-template name="process.image"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <div>
-        <xsl:if test="@align">
-          <xsl:attribute name="align">
-            <xsl:value-of select="@align"/>
-          </xsl:attribute>
-        </xsl:if>
-        <xsl:call-template name="anchor"/>
-        <xsl:call-template name="process.image"/>
-      </div>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="inlinegraphic">
-  <xsl:variable name="filename">
-    <xsl:choose>
-      <xsl:when test="@entityref">
-        <xsl:value-of select="unparsed-entity-uri(@entityref)"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates select="@fileref"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:call-template name="anchor"/>
-
-  <xsl:choose>
-    <xsl:when test="@format='linespecific'">
-      <xsl:choose>
-        <xsl:when test="$use.extensions != '0'                         and $textinsert.extension != '0'">
-          <xsl:choose>
-            <xsl:when test="element-available('stext:insertfile')">
-              <stext:insertfile href="{$filename}" encoding="{$textdata.default.encoding}"/>
-            </xsl:when>
-            <xsl:when test="element-available('xtext:insertfile')">
-              <xtext:insertfile href="{$filename}"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:message terminate="yes">
-                <xsl:text>No insertfile extension available.</xsl:text>
-              </xsl:message>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <a xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad" href="{$filename}"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="process.image"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="mediaobject|mediaobjectco">
-
-  <xsl:variable name="olist" select="imageobject|imageobjectco                      |videoobject|audioobject                      |textobject"/>
-
-  <xsl:variable name="object.index">
-    <xsl:call-template name="select.mediaobject.index">
-      <xsl:with-param name="olist" select="$olist"/>
-      <xsl:with-param name="count" select="1"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="object" select="$olist[position() = $object.index]"/>
-
-  <xsl:variable name="align">
-    <xsl:value-of select="$object/descendant::imagedata[@align][1]/@align"/>
-  </xsl:variable>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="$align != '' ">
-      <xsl:attribute name="align">
-        <xsl:value-of select="$align"/>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:call-template name="anchor"/>
-
-    <xsl:apply-templates select="$object"/>
-    <xsl:apply-templates select="caption"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="inlinemediaobject">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="select.mediaobject"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="programlisting/inlinemediaobject                      |screen/inlinemediaobject" priority="2">
-  <!-- the additional span causes problems in some cases -->
-  <xsl:call-template name="select.mediaobject"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="imageobjectco">
-  <xsl:call-template name="anchor"/>
-  <xsl:apply-templates select="imageobject"/>
-  <xsl:apply-templates select="calloutlist"/>
-</xsl:template>
-
-<xsl:template match="imageobject">
-  <xsl:apply-templates select="imagedata"/>
-</xsl:template>
-
-<xsl:template match="imagedata">
-  <xsl:variable name="filename">
-    <xsl:call-template name="mediaobject.filename">
-      <xsl:with-param name="object" select=".."/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <!-- Handle MathML and SVG markup in imagedata -->
-    <xsl:when xmlns:mml="http://www.w3.org/1998/Math/MathML" test="mml:*">
-      <xsl:apply-templates/>
-    </xsl:when>
-    
-    <xsl:when xmlns:svg="http://www.w3.org/2000/svg" test="svg:*">
-      <xsl:apply-templates/>
-    </xsl:when>
-
-    <xsl:when test="@format='linespecific'">
-      <xsl:choose>
-        <xsl:when test="$use.extensions != '0'                         and $textinsert.extension != '0'">
-          <xsl:choose>
-            <xsl:when test="element-available('stext:insertfile')">
-              <stext:insertfile href="{$filename}" encoding="{$textdata.default.encoding}"/>
-            </xsl:when>
-            <xsl:when test="element-available('xtext:insertfile')">
-              <xtext:insertfile href="{$filename}"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:message terminate="yes">
-                <xsl:text>No insertfile extension available.</xsl:text>
-              </xsl:message>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <a xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad" href="{$filename}"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="longdesc.uri">
-        <xsl:call-template name="longdesc.uri">
-          <xsl:with-param name="mediaobject" select="ancestor::imageobject/parent::*"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="phrases" select="ancestor::mediaobject/textobject[phrase]                             |ancestor::inlinemediaobject/textobject[phrase]                             |ancestor::mediaobjectco/textobject[phrase]"/>
-
-      <xsl:call-template name="process.image">
-        <xsl:with-param name="alt">
-          <xsl:apply-templates select="$phrases[not(@role) or @role!='tex'][1]"/>
-        </xsl:with-param>
-        <xsl:with-param name="longdesc">
-          <xsl:call-template name="write.longdesc">
-            <xsl:with-param name="mediaobject" select="ancestor::imageobject/parent::*"/>
-          </xsl:call-template>
-        </xsl:with-param>
-      </xsl:call-template>
-
-      <xsl:if test="$html.longdesc != 0 and $html.longdesc.link != 0                     and ancestor::imageobject/parent::*/textobject[not(phrase)]">
-        <xsl:call-template name="longdesc.link">
-          <xsl:with-param name="longdesc.uri" select="$longdesc.uri"/>
-        </xsl:call-template>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="longdesc.uri">
-  <xsl:param name="mediaobject" select="."/>
-  <xsl:if test="$html.longdesc">
-    <xsl:if test="$mediaobject/textobject[not(phrase)]">
-      <xsl:variable name="dbhtml.dir">
-        <xsl:call-template name="dbhtml-dir"/>
-      </xsl:variable>
-      <xsl:variable name="filename">
-        <xsl:call-template name="make-relative-filename">
-          <xsl:with-param name="base.dir">
-            <xsl:choose>
-              <xsl:when test="$dbhtml.dir != ''">
-                <xsl:value-of select="$dbhtml.dir"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="$base.dir"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
-          <xsl:with-param name="base.name">
-            <xsl:choose>
-              <xsl:when test="                 $mediaobject/@*[local-name() = 'id']                 and not($use.id.as.filename = 0)">
-                <!-- * if this mediaobject has an ID, then we use the -->
-                <!-- * value of that ID as basename for the "longdesc" -->
-                <!-- * file (that is, without prepending an "ld-" too it) -->
-                <xsl:value-of select="$mediaobject/@*[local-name() = 'id']"/>
-                <xsl:value-of select="$html.ext"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <!-- * otherwise, if this mediaobject does not have an -->
-                <!-- * ID, then we generate an ID... -->
-                <xsl:variable name="image-id">
-                  <xsl:call-template name="object.id">
-                    <xsl:with-param name="object" select="$mediaobject"/>
-                  </xsl:call-template>
-                </xsl:variable>
-                <!-- * ...and then we take that generated ID, prepend an -->
-                <!-- * "ld-" to it, and use that as the basename for the file -->
-                <xsl:value-of select="concat('ld-',$image-id,$html.ext)"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:value-of select="$filename"/>
-    </xsl:if>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="write.longdesc">
-  <xsl:param name="mediaobject" select="."/>
-  <xsl:if test="$html.longdesc != 0 and $mediaobject/textobject[not(phrase)]">
-    <xsl:variable name="filename">
-      <xsl:call-template name="longdesc.uri">
-        <xsl:with-param name="mediaobject" select="$mediaobject"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:value-of select="$filename"/>
-
-    <xsl:call-template name="write.chunk">
-      <xsl:with-param name="filename" select="$filename"/>
-      <xsl:with-param name="quiet" select="$chunk.quietly"/>
-      <xsl:with-param name="content">
-      <xsl:call-template name="user.preroot"/>
-        <html>
-          <head>
-            <xsl:call-template name="system.head.content"/>
-            <xsl:call-template name="head.content">
-              <xsl:with-param name="title" select="'Long Description'"/>
-            </xsl:call-template>
-            <xsl:call-template name="user.head.content"/>
-          </head>
-          <body>
-            <xsl:call-template name="body.attributes"/>
-            <xsl:for-each select="$mediaobject/textobject[not(phrase)]">
-              <xsl:apply-templates select="./*"/>
-            </xsl:for-each>
-          </body>
-        </html>
-        <xsl:value-of select="$chunk.append"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="longdesc.link">
-  <xsl:param name="longdesc.uri" select="''"/>
-
-  <xsl:variable name="this.uri">
-    <xsl:call-template name="make-relative-filename">
-      <xsl:with-param name="base.dir" select="$base.dir"/>
-      <xsl:with-param name="base.name">
-        <xsl:call-template name="href.target.uri"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="href.to">
-    <xsl:call-template name="trim.common.uri.paths">
-      <xsl:with-param name="uriA" select="$longdesc.uri"/>
-      <xsl:with-param name="uriB" select="$this.uri"/>
-      <xsl:with-param name="return" select="'A'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <div class="longdesc-link" align="right">
-    <br clear="all"/>
-    <span class="longdesc-link">
-      <xsl:text>[</xsl:text>
-      <a href="{$href.to}" target="longdesc">D</a>
-      <xsl:text>]</xsl:text>
-    </span>
-  </div>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="videoobject">
-  <xsl:apply-templates select="videodata"/>
-</xsl:template>
-
-<xsl:template match="videodata">
-  <xsl:call-template name="process.image">
-    <xsl:with-param name="tag" select="'embed'"/>
-    <xsl:with-param name="alt">
-      <xsl:apply-templates select="(../../textobject/phrase)[1]"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="audioobject">
-  <xsl:apply-templates select="audiodata"/>
-</xsl:template>
-
-<xsl:template match="audiodata">
-  <xsl:call-template name="process.image">
-    <xsl:with-param name="tag" select="'embed'"/>
-    <xsl:with-param name="alt">
-      <xsl:apply-templates select="(../../textobject/phrase)[1]"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="textobject">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="textdata">
-  <xsl:variable name="filename">
-    <xsl:choose>
-      <xsl:when test="@entityref">
-        <xsl:value-of select="unparsed-entity-uri(@entityref)"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates select="@fileref"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="encoding">
-    <xsl:choose>
-      <xsl:when test="@encoding">
-        <xsl:value-of select="@encoding"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$textdata.default.encoding"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$use.extensions != '0'                     and $textinsert.extension != '0'">
-      <xsl:choose>
-        <xsl:when test="element-available('stext:insertfile')">
-          <stext:insertfile href="{$filename}" encoding="{$encoding}"/>
-        </xsl:when>
-        <xsl:when test="element-available('xtext:insertfile')">
-          <xtext:insertfile href="{$filename}"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message terminate="yes">
-            <xsl:text>No insertfile extension available.</xsl:text>
-          </xsl:message>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <a xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad" href="{$filename}"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="caption">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="@align = 'right' or @align = 'left' or @align='center'">
-      <xsl:attribute name="align"><xsl:value-of select="@align"/></xsl:attribute>
-    </xsl:if>
-    <xsl:apply-templates/>
-  </div>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<!-- "Support" for SVG -->
-
-<xsl:template xmlns:svg="http://www.w3.org/2000/svg" match="svg:*">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates/>
-  </xsl:copy>
-</xsl:template>
-
-
-<!-- The following works sometimes, but needs to take into account
-             1. When there is no /*/@xml:base
-             2. When the chunks are going somewhere else
-<xsl:variable name="relpath">
-  <xsl:call-template name="relative-uri">
-    <xsl:with-param name="filename" select="@fileref"/>
-  </xsl:call-template>
-</xsl:variable>
-
-<xsl:choose>
-  <xsl:when test="/*/@xml:base
-                  and starts-with($relpath,/*/@xml:base)">
-    <xsl:value-of select="substring-after($relpath,/*/@xml:base)"/>
-  </xsl:when>
-  <xsl:otherwise>
-    <xsl:value-of select="@fileref"/>
-  </xsl:otherwise>
-</xsl:choose>
-<xsl:value-of select="@fileref"/>
-      </xsl:when>
--->
-<!-- Resolve xml:base attributes -->
-<xsl:template match="@fileref">
-  <!-- need a check for absolute urls -->
-  <xsl:choose>
-    <xsl:when test="contains(., ':')">
-      <!-- it has a uri scheme so it is an absolute uri -->
-      <xsl:value-of select="."/>
-    </xsl:when>
-    <xsl:when test="$keep.relative.image.uris != 0">
-      <!-- leave it alone -->
-      <xsl:value-of select="."/>
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- its a relative uri that needs xml:base processing -->
-      <xsl:call-template name="relative-uri">
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/highlight.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/highlight.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xslthl="http://xslthl.sf.net" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="xslthl" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     and other information.
-
-     ******************************************************************** -->
-
-<xsl:template match="xslthl:keyword">
-  <b class="hl-keyword"><xsl:apply-templates/></b>
-</xsl:template>
-
-<xsl:template match="xslthl:string">
-  <b class="hl-string"><i style="color:red"><xsl:apply-templates/></i></b>
-</xsl:template>
-
-<xsl:template match="xslthl:comment">
-  <i class="hl-comment" style="color: silver"><xsl:apply-templates/></i>
-</xsl:template>
-
-<xsl:template match="xslthl:tag">
-  <b class="hl-tag" style="color: blue"><xsl:apply-templates/></b>
-</xsl:template>
-
-<xsl:template match="xslthl:attribute">
-  <span class="hl-attribute" style="color: blue"><xsl:apply-templates/></span>
-</xsl:template>
-
-<xsl:template match="xslthl:value">
-  <span class="hl-value" style="color: blue"><xsl:apply-templates/></span>
-</xsl:template>
-
-<xsl:template match="xslthl:html">
-  <b><i style="color: red"><xsl:apply-templates/></i></b>
-</xsl:template>
-
-<xsl:template match="xslthl:xslt">
-  <b style="color: blue"><xsl:apply-templates/></b>
-</xsl:template>
-
-<xsl:template match="xslthl:section">
-  <b><xsl:apply-templates/></b>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/html-rtf.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/html-rtf.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,321 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns:set="http://exslt.org/sets" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="exsl set" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!-- This module contains templates that match against HTML nodes. It is used
-     to post-process result tree fragments for some sorts of cleanup.
-     These templates can only ever be fired by a processor that supports
-     exslt:node-set(). -->
-
-<!-- ==================================================================== -->
-
-<!-- insert.html.p mode templates insert a particular RTF at the beginning
-     of the first paragraph in the primary RTF. -->
-
-<xsl:template match="/" mode="insert.html.p">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:apply-templates mode="insert.html.p">
-    <xsl:with-param name="mark" select="$mark"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="*" mode="insert.html.p">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates mode="insert.html.p">
-      <xsl:with-param name="mark" select="$mark"/>
-    </xsl:apply-templates>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template xmlns:html="http://www.w3.org/1999/xhtml" match="html:p|p" mode="insert.html.p">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:if test="not(preceding::p|preceding::html:p)">
-      <xsl:copy-of select="$mark"/>
-    </xsl:if>
-    <xsl:apply-templates mode="insert.html.p">
-      <xsl:with-param name="mark" select="$mark"/>
-    </xsl:apply-templates>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="text()|processing-instruction()|comment()" mode="insert.html.p">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:copy/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- insert.html.text mode templates insert a particular RTF at the beginning
-     of the first text-node in the primary RTF. -->
-
-<xsl:template match="/" mode="insert.html.text">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:apply-templates mode="insert.html.text">
-    <xsl:with-param name="mark" select="$mark"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="*" mode="insert.html.text">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates mode="insert.html.text">
-      <xsl:with-param name="mark" select="$mark"/>
-    </xsl:apply-templates>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="text()|processing-instruction()|comment()" mode="insert.html.text">
-  <xsl:param name="mark" select="'?'"/>
-
-  <xsl:if test="not(preceding::text())">
-    <xsl:copy-of select="$mark"/>
-  </xsl:if>
-
-  <xsl:copy/>
-</xsl:template>
-
-<xsl:template match="processing-instruction()|comment()" mode="insert.html.text">
-  <xsl:param name="mark" select="'?'"/>
-  <xsl:copy/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- unwrap.p mode templates remove blocks from HTML p elements (and
-     other places where blocks aren't allowed) -->
-
-<xsl:template name="unwrap.p">
-  <xsl:param name="p"/>
-  <xsl:choose>
-    <xsl:when test="function-available('exsl:node-set')                     and function-available('set:leading')                     and function-available('set:trailing')">
-      <xsl:apply-templates select="exsl:node-set($p)" mode="unwrap.p"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$p"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template xmlns:html="http://www.w3.org/1999/xhtml" match="html:p|p" mode="unwrap.p">
-  <!-- xmlns:html is necessary for the xhtml stylesheet case -->
-  <xsl:variable name="blocks" select="address|blockquote|div|hr|h1|h2|h3|h4|h5|h6                         |layer|p|pre|table|dl|menu|ol|ul|form                         |html:address|html:blockquote|html:div|html:hr                         |html:h1|html:h2|html:h3|html:h4|html:h5|html:h6                         |html:layer|html:p|html:pre|html:table|html:dl                         |html:menu|html:ol|html:ul|html:form"/>
-  <xsl:choose>
-    <xsl:when test="$blocks">
-      <xsl:call-template name="unwrap.p.nodes">
-        <xsl:with-param name="wrap" select="."/>
-        <xsl:with-param name="first" select="1"/>
-        <xsl:with-param name="nodes" select="node()"/>
-        <xsl:with-param name="blocks" select="$blocks"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy>
-        <xsl:copy-of select="@*"/>
-        <xsl:apply-templates mode="unwrap.p"/>
-      </xsl:copy>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="unwrap.p">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates mode="unwrap.p"/>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="text()|processing-instruction()|comment()" mode="unwrap.p">
-  <xsl:copy/>
-</xsl:template>
-
-<xsl:template name="unwrap.p.nodes">
-  <xsl:param name="wrap" select="."/>
-  <xsl:param name="first" select="0"/>
-  <xsl:param name="nodes"/>
-  <xsl:param name="blocks"/>
-  <xsl:variable name="block" select="$blocks[1]"/>
-
-  <!-- This template should never get called if these functions aren't available -->
-  <!-- but this test is still necessary so that processors don't choke on the -->
-  <!-- function calls if they don't support the set: functions -->
-  <xsl:if test="function-available('set:leading')                 and function-available('set:trailing')">
-    <xsl:choose>
-      <xsl:when test="$blocks">
-        <xsl:variable name="leading" select="set:leading($nodes,$block)"/>
-        <xsl:variable name="trailing" select="set:trailing($nodes,$block)"/>
-
-        <xsl:if test="(($wrap/@id or $wrap/@xml:id)                          and $first = 1) or $leading">
-          <xsl:element name="{local-name($wrap)}" namespace="http://www.w3.org/1999/xhtml">
-            <xsl:for-each select="$wrap/@*">
-              <xsl:if test="$first != 0 or local-name(.) != 'id'">
-                <xsl:copy/>
-              </xsl:if>
-            </xsl:for-each>
-            <xsl:apply-templates select="$leading" mode="unwrap.p"/>
-          </xsl:element>
-        </xsl:if>
-
-        <xsl:apply-templates select="$block" mode="unwrap.p"/>
-
-        <xsl:if test="$trailing">
-          <xsl:call-template name="unwrap.p.nodes">
-            <xsl:with-param name="wrap" select="$wrap"/>
-            <xsl:with-param name="nodes" select="$trailing"/>
-            <xsl:with-param name="blocks" select="$blocks[position() &gt; 1]"/>
-          </xsl:call-template>
-        </xsl:if>
-      </xsl:when>
-
-      <xsl:otherwise>
-        <xsl:if test="(($wrap/@id or $wrap/@xml:id) and $first = 1) or $nodes">
-          <xsl:element name="{local-name($wrap)}" namespace="http://www.w3.org/1999/xhtml">
-            <xsl:for-each select="$wrap/@*">
-              <xsl:if test="$first != 0 or local-name(.) != 'id'">
-                <xsl:copy/>
-              </xsl:if>
-            </xsl:for-each>
-            <xsl:apply-templates select="$nodes" mode="unwrap.p"/>
-          </xsl:element>
-        </xsl:if>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<!-- make.verbatim.mode replaces spaces and newlines -->
-
-<xsl:template match="/" mode="make.verbatim.mode">
-  <xsl:apply-templates mode="make.verbatim.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="make.verbatim.mode">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates mode="make.verbatim.mode"/>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="processing-instruction()|comment()" mode="make.verbatim.mode">
-  <xsl:copy/>
-</xsl:template>
-
-<xsl:template match="text()" mode="make.verbatim.mode">
-  <xsl:variable name="text" select="translate(., ' ', '&#160;')"/>
-
-  <xsl:choose>
-    <xsl:when test="not(contains($text, '&#10;'))">
-      <xsl:value-of select="$text"/>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:variable name="len" select="string-length($text)"/>
-
-      <xsl:choose>
-        <xsl:when test="$len = 1">
-          <br/><xsl:text>
-</xsl:text>
-        </xsl:when>
-
-        <xsl:otherwise>
-          <xsl:variable name="half" select="$len div 2"/>
-          <xsl:call-template name="make-verbatim-recursive">
-            <xsl:with-param name="text" select="substring($text, 1, $half)"/>
-          </xsl:call-template>
-          <xsl:call-template name="make-verbatim-recursive">
-            <xsl:with-param name="text" select="substring($text, ($half + 1), $len)"/>
-          </xsl:call-template>
-    	</xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="make-verbatim-recursive">
-  <xsl:param name="text" select="''"/>
-
-  <xsl:choose>
-    <xsl:when test="not(contains($text, '&#10;'))">
-      <xsl:value-of select="$text"/>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:variable name="len" select="string-length($text)"/>
-
-      <xsl:choose>
-        <xsl:when test="$len = 1">
-          <br/><xsl:text>
-</xsl:text>
-        </xsl:when>
-
-        <xsl:otherwise>
-    	  <xsl:variable name="half" select="$len div 2"/>
-          <xsl:call-template name="make-verbatim-recursive">
-    	    <xsl:with-param name="text" select="substring($text, 1, $half)"/>
-    	  </xsl:call-template>
-    	  <xsl:call-template name="make-verbatim-recursive">
-    	    <xsl:with-param name="text" select="substring($text, ($half + 1), $len)"/>
-    	  </xsl:call-template>
-    	</xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- remove.empty.div mode templates remove empty blocks -->
-
-<xsl:template name="remove.empty.div">
-  <xsl:param name="div"/>
-  <xsl:choose>
-    <xsl:when test="function-available('exsl:node-set')">
-      <xsl:apply-templates select="exsl:node-set($div)" mode="remove.empty.div"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$div"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template xmlns:html="http://www.w3.org/1999/xhtml" match="html:p|p|html:div|div" mode="remove.empty.div">
-  <xsl:if test="node()">
-    <xsl:copy>
-      <xsl:copy-of select="@*"/>
-      <xsl:apply-templates mode="remove.empty.div"/>
-    </xsl:copy>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="*" mode="remove.empty.div">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates mode="remove.empty.div"/>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="text()|processing-instruction()|comment()" mode="remove.empty.div">
-  <xsl:copy/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/html.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/html.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,236 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- The generate.html.title template is currently used for generating HTML -->
-<!-- "title" attributes for some inline elements only, but not for any -->
-<!-- block elements. It is called in eleven places in the inline.xsl -->
-<!-- file. But it's called by all the inline.* templates (e.g., -->
-<!-- inline.boldseq), which in turn are called by other (element) -->
-<!-- templates, so it results, currently, in supporting generation of the -->
-<!-- HTML "title" attribute for a total of about 92 elements. -->
-<!-- You can use mode="html.title.attribute" to get a title for -->
-<!-- an element specified by a param, including targets of cross references. -->
-<xsl:template name="generate.html.title">
-  <xsl:apply-templates select="." mode="html.title.attribute"/>
-</xsl:template>
-
-<!-- Generate a title attribute for the context node -->
-<xsl:template match="*" mode="html.title.attribute">
-  <xsl:variable name="is.title">
-    <xsl:call-template name="gentext.template.exists">
-      <xsl:with-param name="context" select="'title'"/>
-      <xsl:with-param name="name" select="local-name(.)"/>
-      <xsl:with-param name="lang">
-        <xsl:call-template name="l10n.language"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="is.title-numbered">
-    <xsl:call-template name="gentext.template.exists">
-      <xsl:with-param name="context" select="'title-numbered'"/>
-      <xsl:with-param name="name" select="local-name(.)"/>
-      <xsl:with-param name="lang">
-        <xsl:call-template name="l10n.language"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="is.title-unnumbered">
-    <xsl:call-template name="gentext.template.exists">
-      <xsl:with-param name="context" select="'title-unnumbered'"/>
-      <xsl:with-param name="name" select="local-name(.)"/>
-      <xsl:with-param name="lang">
-        <xsl:call-template name="l10n.language"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="gentext.title">
-    <xsl:if test="$is.title != 0 or                   $is.title-numbered != 0 or                   $is.title-unnumbered != 0">
-      <xsl:apply-templates select="." mode="object.title.markup.textonly"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="string-length($gentext.title) != 0">
-      <xsl:attribute name="title">
-        <xsl:value-of select="$gentext.title"/>
-      </xsl:attribute>
-    </xsl:when>
-    <!-- Fall back to alt if available -->
-    <xsl:when test="alt">
-      <xsl:attribute name="title">
-        <xsl:value-of select="normalize-space(alt)"/>
-      </xsl:attribute>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="dir">
-  <xsl:param name="inherit" select="0"/>
-
-  <xsl:variable name="dir">
-    <xsl:choose>
-      <xsl:when test="@dir">
-        <xsl:value-of select="@dir"/>
-      </xsl:when>
-      <xsl:when test="$inherit != 0">
-        <xsl:value-of select="ancestor::*/@dir[1]"/>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:if test="$dir != ''">
-    <xsl:attribute name="dir">
-      <xsl:value-of select="$dir"/>
-    </xsl:attribute>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="anchor">
-  <xsl:param name="node" select="."/>
-  <xsl:param name="conditional" select="1"/>
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="$node"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:if test="$conditional = 0 or $node/@id or $node/@xml:id">
-    <a id="{$id}"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="href.target.uri">
-  <xsl:param name="context" select="."/>
-  <xsl:param name="object" select="."/>
-  <xsl:text>#</xsl:text>
-  <xsl:call-template name="object.id">
-    <xsl:with-param name="object" select="$object"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="href.target">
-  <xsl:param name="context" select="."/>
-  <xsl:param name="object" select="."/>
-  <xsl:text>#</xsl:text>
-  <xsl:call-template name="object.id">
-    <xsl:with-param name="object" select="$object"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="href.target.with.base.dir">
-  <xsl:param name="context" select="."/>
-  <xsl:param name="object" select="."/>
-  <xsl:if test="$manifest.in.base.dir = 0">
-    <xsl:value-of select="$base.dir"/>
-  </xsl:if>
-  <xsl:call-template name="href.target">
-    <xsl:with-param name="context" select="$context"/>
-    <xsl:with-param name="object" select="$object"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="dingbat">
-  <xsl:param name="dingbat">bullet</xsl:param>
-  <xsl:call-template name="dingbat.characters">
-    <xsl:with-param name="dingbat" select="$dingbat"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template name="dingbat.characters">
-  <!-- now that I'm using the real serializer, all that dingbat malarky -->
-  <!-- isn't necessary anymore... -->
-  <xsl:param name="dingbat">bullet</xsl:param>
-  <xsl:choose>
-    <xsl:when test="$dingbat='bullet'">&#8226;</xsl:when>
-    <xsl:when test="$dingbat='copyright'">&#169;</xsl:when>
-    <xsl:when test="$dingbat='trademark'">&#8482;</xsl:when>
-    <xsl:when test="$dingbat='trade'">&#8482;</xsl:when>
-    <xsl:when test="$dingbat='registered'">&#174;</xsl:when>
-    <xsl:when test="$dingbat='service'">(SM)</xsl:when>
-    <xsl:when test="$dingbat='nbsp'">&#160;</xsl:when>
-    <xsl:when test="$dingbat='ldquo'">&#8220;</xsl:when>
-    <xsl:when test="$dingbat='rdquo'">&#8221;</xsl:when>
-    <xsl:when test="$dingbat='lsquo'">&#8216;</xsl:when>
-    <xsl:when test="$dingbat='rsquo'">&#8217;</xsl:when>
-    <xsl:when test="$dingbat='em-dash'">&#8212;</xsl:when>
-    <xsl:when test="$dingbat='mdash'">&#8212;</xsl:when>
-    <xsl:when test="$dingbat='en-dash'">&#8211;</xsl:when>
-    <xsl:when test="$dingbat='ndash'">&#8211;</xsl:when>
-    <xsl:otherwise>
-      <xsl:text>&#8226;</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="id.warning">
-  <xsl:if test="$id.warnings != 0 and not(@id) and not(@xml:id) and parent::*">
-    <xsl:variable name="title">
-      <xsl:choose>
-        <xsl:when test="title">
-          <xsl:value-of select="title[1]"/>
-        </xsl:when>
-        <xsl:when test="substring(local-name(*[1]),                                   string-length(local-name(*[1])-3) = 'info')                         and *[1]/title">
-          <xsl:value-of select="*[1]/title[1]"/>
-        </xsl:when>
-        <xsl:when test="refmeta/refentrytitle">
-          <xsl:value-of select="refmeta/refentrytitle"/>
-        </xsl:when>
-        <xsl:when test="refnamediv/refname">
-          <xsl:value-of select="refnamediv/refname[1]"/>
-        </xsl:when>
-      </xsl:choose>
-    </xsl:variable>
-
-    <xsl:message>
-      <xsl:text>ID recommended on </xsl:text>
-      <xsl:value-of select="local-name(.)"/>
-      <xsl:if test="$title != ''">
-        <xsl:text>: </xsl:text>
-        <xsl:choose>
-          <xsl:when test="string-length($title) &gt; 40">
-            <xsl:value-of select="substring($title,1,40)"/>
-            <xsl:text>...</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$title"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:if>
-    </xsl:message>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="*" mode="class.attribute">
-  <xsl:param name="class" select="local-name(.)"/>
-  <!-- permit customization of class attributes -->
-  <!-- Use element name by default -->
-  <xsl:attribute name="class">
-    <xsl:apply-templates select="." mode="class.value">
-      <xsl:with-param name="class" select="$class"/>
-    </xsl:apply-templates>
-  </xsl:attribute>
-</xsl:template>
-
-<xsl:template match="*" mode="class.value">
-  <xsl:param name="class" select="local-name(.)"/>
-  <!-- permit customization of class value only -->
-  <!-- Use element name by default -->
-  <xsl:value-of select="$class"/>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/htmltbl.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/htmltbl.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,56 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="colgroup" mode="htmlTable">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates mode="htmlTable"/>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="col" mode="htmlTable">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="caption" mode="htmlTable">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-
-    <xsl:apply-templates select=".." mode="object.title.markup">
-      <xsl:with-param name="allow-anchors" select="1"/>
-    </xsl:apply-templates>
-
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="thead|tbody|tgroup|tr" mode="htmlTable">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates mode="htmlTable"/>
-  </xsl:copy>
-</xsl:template>
-
-<xsl:template match="th|td" mode="htmlTable">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates/> <!-- *not* mode=htmlTable -->
-  </xsl:copy>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/index.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/index.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,224 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="index">
-  <!-- some implementations use completely empty index tags to indicate -->
-  <!-- where an automatically generated index should be inserted. so -->
-  <!-- if the index is completely empty, skip it. Unless generate.index -->
-  <!-- is non-zero, in which case, this is where the automatically -->
-  <!-- generated index should go. -->
-
-  <xsl:call-template name="id.warning"/>
-
-  <xsl:if test="count(*)&gt;0 or $generate.index != '0'">
-    <div>
-      <xsl:apply-templates select="." mode="class.attribute"/>
-      <xsl:if test="$generate.id.attributes != 0">
-        <xsl:attribute name="id">
-          <xsl:call-template name="object.id"/>
-        </xsl:attribute>
-      </xsl:if>
-
-      <xsl:call-template name="index.titlepage"/>
-      <xsl:choose>
-	<xsl:when test="indexdiv">
-	  <xsl:apply-templates/>
-	</xsl:when>
-	<xsl:otherwise>
-	  <xsl:apply-templates select="*[not(self::indexentry)]"/>
-	  <!-- Because it's actually valid for Index to have neither any -->
-	  <!-- Indexdivs nor any Indexentries, we need to check and make -->
-	  <!-- sure that at least one Indexentry exists, and generate a -->
-	  <!-- wrapper dl if there is at least one; otherwise, do nothing. -->
-	  <xsl:if test="indexentry">
-	    <!-- The indexentry template assumes a parent dl wrapper has -->
-	    <!-- been generated; for Indexes that have Indexdivs, the dl -->
-	    <!-- wrapper is generated by the indexdiv template; however, -->
-	    <!-- for Indexes that lack Indexdivs, if we don't generate a -->
-	    <!-- dl here, HTML output will not be valid. -->
-	    <dl>
-	      <xsl:apply-templates select="indexentry"/>
-	    </dl>
-	  </xsl:if>
-	</xsl:otherwise>
-      </xsl:choose>
-
-      <xsl:if test="count(indexentry) = 0 and count(indexdiv) = 0">
-        <xsl:call-template name="generate-index">
-          <xsl:with-param name="scope" select="(ancestor::book|/)[last()]"/>
-        </xsl:call-template>
-      </xsl:if>
-
-      <xsl:if test="not(parent::article)">
-        <xsl:call-template name="process.footnotes"/>
-      </xsl:if>
-    </div>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="setindex">
-  <!-- some implementations use completely empty index tags to indicate -->
-  <!-- where an automatically generated index should be inserted. so -->
-  <!-- if the index is completely empty, skip it. Unless generate.index -->
-  <!-- is non-zero, in which case, this is where the automatically -->
-  <!-- generated index should go. -->
-
-  <xsl:call-template name="id.warning"/>
-
-  <xsl:if test="count(*)&gt;0 or $generate.index != '0'">
-    <div>
-      <xsl:apply-templates select="." mode="class.attribute"/>
-      <xsl:if test="$generate.id.attributes != 0">
-        <xsl:attribute name="id">
-          <xsl:call-template name="object.id"/>
-        </xsl:attribute>
-      </xsl:if>
-
-      <xsl:call-template name="setindex.titlepage"/>
-      <xsl:apply-templates/>
-
-      <xsl:if test="count(indexentry) = 0 and count(indexdiv) = 0">
-        <xsl:call-template name="generate-index">
-          <xsl:with-param name="scope" select="/"/>
-        </xsl:call-template>
-      </xsl:if>
-
-      <xsl:if test="not(parent::article)">
-        <xsl:call-template name="process.footnotes"/>
-      </xsl:if>
-    </div>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="index/indexinfo"/>
-<xsl:template match="index/info"/>
-<xsl:template match="index/title"/>
-<xsl:template match="index/subtitle"/>
-<xsl:template match="index/titleabbrev"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="indexdiv">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="$generate.id.attributes != 0">
-      <xsl:attribute name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates select="*[not(self::indexentry)]"/>
-    <dl>
-      <xsl:apply-templates select="indexentry"/>
-    </dl>
-  </div>
-</xsl:template>
-
-<xsl:template match="indexdiv/title">
-  <h3>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates/>
-  </h3>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="indexterm">
-  <!-- this one must have a name, even if it doesn't have an ID -->
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <a id="{$id}" class="indexterm"/>
-</xsl:template>
-
-<xsl:template match="primary|secondary|tertiary|see|seealso">
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="indexentry">
-  <xsl:apply-templates select="primaryie"/>
-</xsl:template>
-
-<xsl:template match="primaryie">
-  <dt>
-    <xsl:apply-templates/>
-  </dt>
-  <xsl:choose>
-    <xsl:when test="following-sibling::secondaryie">
-      <dd>
-        <dl>
-          <xsl:apply-templates select="following-sibling::secondaryie"/>
-        </dl>
-      </dd>
-    </xsl:when>
-    <xsl:when test="following-sibling::seeie                     |following-sibling::seealsoie">
-      <dd>
-        <dl>
-          <xsl:apply-templates select="following-sibling::seeie                                        |following-sibling::seealsoie"/>
-        </dl>
-      </dd>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="secondaryie">
-  <dt>
-    <xsl:apply-templates/>
-  </dt>
-  <xsl:choose>
-    <xsl:when test="following-sibling::tertiaryie">
-      <dd>
-        <dl>
-          <xsl:apply-templates select="following-sibling::tertiaryie"/>
-        </dl>
-      </dd>
-    </xsl:when>
-    <xsl:when test="following-sibling::seeie                     |following-sibling::seealsoie">
-      <dd>
-        <dl>
-          <xsl:apply-templates select="following-sibling::seeie                                        |following-sibling::seealsoie"/>
-        </dl>
-      </dd>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="tertiaryie">
-  <dt>
-    <xsl:apply-templates/>
-  </dt>
-  <xsl:if test="following-sibling::seeie                 |following-sibling::seealsoie">
-    <dd>
-      <dl>
-        <xsl:apply-templates select="following-sibling::seeie                                      |following-sibling::seealsoie"/>
-      </dl>
-    </dd>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="seeie|seealsoie">
-  <dt>
-    <xsl:apply-templates/>
-  </dt>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/info.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/info.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,44 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- These templates define the "default behavior" for info
-     elements.  Even if you don't process the *info wrappers,
-     some of these elements are needed because the elements are
-     processed from named templates that are called with modes.
-     Since modes aren't sticky, these rules apply. 
-     (TODO: clarify this comment) -->
-
-<!-- ==================================================================== -->
-<!-- called from named templates in a given mode -->
-
-<xsl:template match="corpauthor">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates/>
-  </span>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="jobtitle">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates/>
-  </span>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/inline.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/inline.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,1404 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:suwl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.UnwrapLinks" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="xlink suwl" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-<xsl:template name="simple.xlink">
-  <xsl:param name="node" select="."/>
-  <xsl:param name="content">
-    <xsl:apply-templates/>
-  </xsl:param>
-  <xsl:param name="a.target"/>
-  <xsl:param name="linkend" select="$node/@linkend"/>
-  <xsl:param name="xhref" select="$node/@xlink:href"/>
-
-  <xsl:variable name="link">
-    <xsl:choose>
-      <xsl:when test="$xhref and                        (not($node/@xlink:type) or                             $node/@xlink:type='simple')">
-
-        <!-- Is it a local idref or a uri? -->
-        <xsl:variable name="is.idref">
-          <xsl:choose>
-            <!-- if the href starts with # and does not contain an "(" -->
-            <!-- or if the href starts with #xpointer(id(, it's just an ID -->
-            <xsl:when test="starts-with($xhref,'#')                             and (not(contains($xhref,'('))                             or starts-with($xhref,                                        '#xpointer(id('))">1</xsl:when>
-            <xsl:otherwise>0</xsl:otherwise>
-          </xsl:choose>
-        </xsl:variable>
-
-        <!-- Is it an olink ? -->
-        <xsl:variable name="is.olink">
-          <xsl:choose>
-	    <!-- If xlink:role="http://docbook.org/xlink/role/olink" -->
-            <!-- and if the href contains # -->
-            <xsl:when test="contains($xhref,'#') and           @xlink:role = $xolink.role">1</xsl:when>
-            <xsl:otherwise>0</xsl:otherwise>
-          </xsl:choose>
-        </xsl:variable>
-
-        <xsl:choose>
-          <xsl:when test="$is.idref = 1">
-
-            <xsl:variable name="idref">
-              <xsl:call-template name="xpointer.idref">
-                <xsl:with-param name="xpointer" select="$xhref"/>
-              </xsl:call-template>
-            </xsl:variable>
-
-            <xsl:variable name="targets" select="key('id',$idref)"/>
-            <xsl:variable name="target" select="$targets[1]"/>
-
-            <xsl:call-template name="check.id.unique">
-              <xsl:with-param name="linkend" select="$idref"/>
-            </xsl:call-template>
-
-            <xsl:choose>
-              <xsl:when test="count($target) = 0">
-                <xsl:message>
-                  <xsl:text>XLink to nonexistent id: </xsl:text>
-                  <xsl:value-of select="$idref"/>
-                </xsl:message>
-                <xsl:copy-of select="$content"/>
-              </xsl:when>
-
-              <xsl:otherwise>
-                <a>
-                  <xsl:apply-templates select="." mode="class.attribute"/>
-
-                  <xsl:attribute name="href">
-                    <xsl:call-template name="href.target">
-                      <xsl:with-param name="object" select="$target"/>
-                    </xsl:call-template>
-                  </xsl:attribute>
-
-                  <xsl:choose>
-                    <xsl:when test="$node/@xlink:title">
-                      <xsl:attribute name="title">
-                        <xsl:value-of select="$node/@xlink:title"/>
-                      </xsl:attribute>
-                    </xsl:when>
-                    <xsl:otherwise>
-                      <xsl:apply-templates select="$target" mode="html.title.attribute"/>
-                    </xsl:otherwise>
-                  </xsl:choose>
-
-                  <xsl:if test="$a.target">
-                    <xsl:attribute name="target">
-                      <xsl:value-of select="$a.target"/>
-                    </xsl:attribute>
-                  </xsl:if>
-
-                  <xsl:copy-of select="$content"/>
-
-                </a>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:when>
-
-          <xsl:when test="$is.olink = 1">
-	    <xsl:call-template name="olink">
-	      <xsl:with-param name="content" select="$content"/>
-	    </xsl:call-template>
-          </xsl:when>
-
-          <!-- otherwise it's a URI -->
-          <xsl:otherwise>
-            <a>
-              <xsl:apply-templates select="." mode="class.attribute"/>
-              <xsl:attribute name="href">
-                <xsl:value-of select="$xhref"/>
-              </xsl:attribute>
-              <xsl:if test="$node/@xlink:title">
-                <xsl:attribute name="title">
-                  <xsl:value-of select="$node/@xlink:title"/>
-                </xsl:attribute>
-              </xsl:if>
-              <xsl:copy-of select="$content"/>
-            </a>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-
-      <xsl:when test="$linkend">
-        <xsl:variable name="targets" select="key('id',$linkend)"/>
-        <xsl:variable name="target" select="$targets[1]"/>
-
-        <xsl:call-template name="check.id.unique">
-          <xsl:with-param name="linkend" select="$linkend"/>
-        </xsl:call-template>
-
-        <a>
-          <xsl:apply-templates select="." mode="class.attribute"/>
-          <xsl:attribute name="href">
-            <xsl:call-template name="href.target">
-              <xsl:with-param name="object" select="$target"/>
-            </xsl:call-template>
-          </xsl:attribute>
-
-          <xsl:apply-templates select="$target" mode="html.title.attribute"/>
-
-          <xsl:copy-of select="$content"/>
-          
-        </a>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:copy-of select="$content"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="function-available('suwl:unwrapLinks')">
-      <xsl:copy-of select="suwl:unwrapLinks($link)"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$link"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="inline.charseq">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-  <!-- * if you want output from the inline.charseq template wrapped in -->
-  <!-- * something other than a Span, call the template with some value -->
-  <!-- * for the 'wrapper-name' param -->
-  <xsl:param name="wrapper-name">span</xsl:param>
-  <xsl:element name="{$wrapper-name}" namespace="http://www.w3.org/1999/xhtml">
-    <xsl:attribute name="class">
-      <xsl:value-of select="local-name(.)"/>
-    </xsl:attribute>
-    <xsl:call-template name="dir"/>
-    <xsl:call-template name="generate.html.title"/>
-    <xsl:copy-of select="$content"/>
-    <xsl:call-template name="apply-annotations"/>
-  </xsl:element>
-</xsl:template>
-
-<xsl:template name="inline.monoseq">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-  <code>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir"/>
-    <xsl:call-template name="generate.html.title"/>
-    <xsl:copy-of select="$content"/>
-    <xsl:call-template name="apply-annotations"/>
-  </code>
-</xsl:template>
-
-<xsl:template name="inline.boldseq">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="generate.html.title"/>
-    <xsl:call-template name="dir"/>
-
-    <!-- don't put <strong> inside figure, example, or table titles -->
-    <xsl:choose>
-      <xsl:when test="local-name(..) = 'title'                       and (local-name(../..) = 'figure'                       or local-name(../..) = 'example'                       or local-name(../..) = 'table')">
-        <xsl:copy-of select="$content"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <strong>
-          <xsl:copy-of select="$content"/>
-        </strong>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:call-template name="apply-annotations"/>
-  </span>
-</xsl:template>
-
-<xsl:template name="inline.italicseq">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-  <em>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="generate.html.title"/>
-    <xsl:call-template name="dir"/>
-    <xsl:copy-of select="$content"/>
-    <xsl:call-template name="apply-annotations"/>
-  </em>
-</xsl:template>
-
-<xsl:template name="inline.boldmonoseq">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-  <!-- don't put <strong> inside figure, example, or table titles -->
-  <!-- or other titles that may already be represented with <strong>'s. -->
-  <xsl:choose>
-    <xsl:when test="local-name(..) = 'title'                     and (local-name(../..) = 'figure'                          or local-name(../..) = 'example'                          or local-name(../..) = 'table'                          or local-name(../..) = 'formalpara')">
-      <code>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:call-template name="generate.html.title"/>
-        <xsl:call-template name="dir"/>
-        <xsl:copy-of select="$content"/>
-        <xsl:call-template name="apply-annotations"/>
-      </code>
-    </xsl:when>
-    <xsl:otherwise>
-      <strong>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <code>
-          <xsl:call-template name="generate.html.title"/>
-          <xsl:call-template name="dir"/>
-          <xsl:copy-of select="$content"/>
-        </code>
-        <xsl:call-template name="apply-annotations"/>
-      </strong>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="inline.italicmonoseq">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-  <em>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <code>
-      <xsl:call-template name="generate.html.title"/>
-      <xsl:call-template name="dir"/>
-      <xsl:copy-of select="$content"/>
-      <xsl:call-template name="apply-annotations"/>
-    </code>
-  </em>
-</xsl:template>
-
-<xsl:template name="inline.superscriptseq">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-  <sup>
-    <xsl:call-template name="generate.html.title"/>
-    <xsl:call-template name="dir"/>
-    <xsl:copy-of select="$content"/>
-    <xsl:call-template name="apply-annotations"/>
-  </sup>
-</xsl:template>
-
-<xsl:template name="inline.subscriptseq">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-  <sub>
-    <xsl:call-template name="generate.html.title"/>
-    <xsl:call-template name="dir"/>
-    <xsl:copy-of select="$content"/>
-    <xsl:call-template name="apply-annotations"/>
-  </sub>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<!-- some special cases -->
-
-<xsl:template match="author">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:call-template name="person.name"/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="apply-annotations"/>
-  </xsl:param>
-
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:copy-of select="$content"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="editor">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:call-template name="person.name"/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="apply-annotations"/>
-  </xsl:param>
-
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:copy-of select="$content"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="othercredit">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:call-template name="person.name"/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="apply-annotations"/>
-  </xsl:param>
-
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:copy-of select="$content"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="authorinitials">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="accel">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="action">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="application">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="classname">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="exceptionname">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="interfacename">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="methodname">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="command">
-  <xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="computeroutput">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="constant">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="database">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="date">
-  <!-- should this support locale-specific formatting? how? -->
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="errorcode">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="errorname">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="errortype">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="errortext">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="envar">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="filename">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="function">
-  <xsl:choose>
-    <xsl:when test="$function.parens != '0'                     and (parameter or function or replaceable)">
-      <xsl:variable name="nodes" select="text()|*"/>
-      <xsl:call-template name="inline.monoseq">
-        <xsl:with-param name="content">
-          <xsl:call-template name="simple.xlink">
-            <xsl:with-param name="content">
-              <xsl:apply-templates select="$nodes[1]"/>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:text>(</xsl:text>
-      <xsl:apply-templates select="$nodes[position()&gt;1]"/>
-      <xsl:text>)</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-     <xsl:call-template name="inline.monoseq"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="function/parameter" priority="2">
-  <xsl:call-template name="inline.italicmonoseq"/>
-  <xsl:if test="following-sibling::*">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="function/replaceable" priority="2">
-  <xsl:call-template name="inline.italicmonoseq"/>
-  <xsl:if test="following-sibling::*">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="guibutton">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="guiicon">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="guilabel">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="guimenu">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="guimenuitem">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="guisubmenu">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="hardware">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="interface">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="interfacedefinition">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="keycap">
-  <xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="keycode">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="keysym">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="literal">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="code">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="medialabel">
-  <xsl:call-template name="inline.italicseq"/>
-</xsl:template>
-
-<xsl:template match="shortcut">
-  <xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="mousebutton">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="option">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="package">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="parameter">
-  <xsl:call-template name="inline.italicmonoseq"/>
-</xsl:template>
-
-<xsl:template match="property">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="prompt">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="replaceable" priority="1">
-  <xsl:call-template name="inline.italicmonoseq"/>
-</xsl:template>
-
-<xsl:template match="returnvalue">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="structfield">
-  <xsl:call-template name="inline.italicmonoseq"/>
-</xsl:template>
-
-<xsl:template match="structname">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="symbol">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="systemitem">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="token">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="type">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="userinput">
-  <xsl:call-template name="inline.boldmonoseq"/>
-</xsl:template>
-
-<xsl:template match="abbrev">
-  <xsl:call-template name="inline.charseq">
-    <xsl:with-param name="wrapper-name">abbr</xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="acronym">
-  <xsl:call-template name="inline.charseq">
-    <xsl:with-param name="wrapper-name">acronym</xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="citerefentry">
-  <xsl:choose>
-    <xsl:when test="$citerefentry.link != '0'">
-      <a>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:attribute name="href">
-          <xsl:call-template name="generate.citerefentry.link"/>
-        </xsl:attribute>
-        <xsl:call-template name="inline.charseq"/>
-      </a>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="inline.charseq"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="generate.citerefentry.link">
-  <!-- nop -->
-</xsl:template>
-
-<xsl:template name="x.generate.citerefentry.link">
-  <xsl:text>http://example.com/cgi-bin/man.cgi?</xsl:text>
-  <xsl:value-of select="refentrytitle"/>
-  <xsl:text>(</xsl:text>
-  <xsl:value-of select="manvolnum"/>
-  <xsl:text>)</xsl:text>
-</xsl:template>
-
-<xsl:template match="citetitle">
-  <xsl:choose>
-    <xsl:when test="@pubwork = 'article'">
-      <xsl:call-template name="gentext.startquote"/>
-      <xsl:call-template name="inline.charseq"/>
-      <xsl:call-template name="gentext.endquote"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="inline.italicseq"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="emphasis">
-  <span>
-    <xsl:choose>
-      <xsl:when test="@role and $emphasis.propagates.style != 0">
-        <xsl:apply-templates select="." mode="class.attribute">
-          <xsl:with-param name="class" select="@role"/>
-        </xsl:apply-templates>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:call-template name="anchor"/>
-
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:choose>
-          <xsl:when test="@role = 'bold' or @role='strong'">
-            <!-- backwards compatibility: make bold into b elements, but -->
-            <!-- don't put bold inside figure, example, or table titles -->
-            <xsl:choose>
-              <xsl:when test="local-name(..) = 'title'                               and (local-name(../..) = 'figure'                               or local-name(../..) = 'example'                               or local-name(../..) = 'table')">
-                <xsl:apply-templates/>
-              </xsl:when>
-              <xsl:otherwise>
-                <strong><xsl:apply-templates/></strong>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:when>
-          <xsl:when test="@role and $emphasis.propagates.style != 0">
-            <xsl:apply-templates/>
-          </xsl:when>
-          <xsl:otherwise>
-            <em><xsl:apply-templates/></em>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:with-param>
-    </xsl:call-template>
-  </span>
-</xsl:template>
-
-<xsl:template match="foreignphrase">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="@lang or @xml:lang">
-      <xsl:call-template name="language.attribute"/>
-    </xsl:if>
-    <xsl:call-template name="inline.italicseq"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="markup">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="phrase">
-  <span>
-    <xsl:call-template name="generate.html.title"/>
-    <xsl:if test="@lang or @xml:lang">
-      <xsl:call-template name="language.attribute"/>
-    </xsl:if>
-    <xsl:if test="@role and $phrase.propagates.style != 0">
-      <xsl:apply-templates select="." mode="class.attribute">
-        <xsl:with-param name="class" select="@role"/>
-      </xsl:apply-templates>
-    </xsl:if>
-    <xsl:call-template name="dir"/>
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="apply-annotations"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="quote">
-  <xsl:variable name="depth">
-    <xsl:call-template name="dot.count">
-      <xsl:with-param name="string">
-        <xsl:number level="multiple"/>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:choose>
-    <xsl:when test="$depth mod 2 = 0">
-      <xsl:call-template name="gentext.startquote"/>
-      <xsl:call-template name="inline.charseq"/>
-      <xsl:call-template name="gentext.endquote"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="gentext.nestedstartquote"/>
-      <xsl:call-template name="inline.charseq"/>
-      <xsl:call-template name="gentext.nestedendquote"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="varname">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<xsl:template match="wordasword">
-  <xsl:call-template name="inline.italicseq"/>
-</xsl:template>
-
-<xsl:template match="lineannotation">
-  <em>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="inline.charseq"/>
-  </em>
-</xsl:template>
-
-<xsl:template match="superscript">
-  <xsl:call-template name="inline.superscriptseq"/>
-</xsl:template>
-
-<xsl:template match="subscript">
-  <xsl:call-template name="inline.subscriptseq"/>
-</xsl:template>
-
-<xsl:template match="trademark">
-  <xsl:call-template name="inline.charseq"/>
-  <xsl:choose>
-    <xsl:when test="@class = 'copyright'                     or @class = 'registered'">
-      <xsl:call-template name="dingbat">
-        <xsl:with-param name="dingbat" select="@class"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="@class = 'service'">
-      <sup>SM</sup>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="dingbat">
-        <xsl:with-param name="dingbat" select="'trademark'"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="firstterm">
-  <xsl:call-template name="glossterm">
-    <xsl:with-param name="firstterm" select="1"/>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="glossterm" name="glossterm">
-  <xsl:param name="firstterm" select="0"/>
-
-  <!-- To avoid extra <a name=""> anchor from inline.italicseq -->
-  <xsl:variable name="content">
-    <xsl:apply-templates/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="($firstterm.only.link = 0 or $firstterm = 1) and @linkend">
-      <xsl:variable name="targets" select="key('id',@linkend)"/>
-      <xsl:variable name="target" select="$targets[1]"/>
-
-      <xsl:call-template name="check.id.unique">
-        <xsl:with-param name="linkend" select="@linkend"/>
-      </xsl:call-template>
-
-      <xsl:choose>
-        <xsl:when test="$target">
-          <a>
-            <xsl:apply-templates select="." mode="class.attribute"/>
-            <xsl:if test="@id or @xml:id">
-              <xsl:attribute name="id">
-                <xsl:value-of select="(@id|@xml:id)[1]"/>
-              </xsl:attribute>
-            </xsl:if>
-
-            <xsl:attribute name="href">
-              <xsl:call-template name="href.target">
-                <xsl:with-param name="object" select="$target"/>
-              </xsl:call-template>
-            </xsl:attribute>
-
-            <xsl:call-template name="inline.italicseq">
-              <xsl:with-param name="content" select="$content"/>
-            </xsl:call-template>
-          </a>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="inline.italicseq">
-            <xsl:with-param name="content" select="$content"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:when test="not(@linkend)                     and ($firstterm.only.link = 0 or $firstterm = 1)                     and ($glossterm.auto.link != 0)                     and $glossary.collection != ''">
-      <xsl:variable name="term">
-        <xsl:choose>
-          <xsl:when test="@baseform"><xsl:value-of select="@baseform"/></xsl:when>
-          <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="cterm" select="(document($glossary.collection,.)//glossentry[glossterm=$term])[1]"/>
-
-      <!-- HACK HACK HACK! But it works... -->
-      <!-- You'd need to do more work if you wanted to chunk on glossdiv, though -->
-
-      <xsl:variable name="glossary" select="//glossary[@role='auto']"/>
-
-      <xsl:if test="count($glossary) != 1">
-        <xsl:message>
-          <xsl:text>Warning: glossary.collection specified, but there are </xsl:text>
-          <xsl:value-of select="count($glossary)"/>
-          <xsl:text> automatic glossaries</xsl:text>
-        </xsl:message>
-      </xsl:if>
-
-      <xsl:variable name="glosschunk">
-        <xsl:call-template name="href.target">
-          <xsl:with-param name="object" select="$glossary"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="chunkbase">
-        <xsl:choose>
-          <xsl:when test="contains($glosschunk, '#')">
-            <xsl:value-of select="substring-before($glosschunk, '#')"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$glosschunk"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="not($cterm)">
-          <xsl:message>
-            <xsl:text>There's no entry for </xsl:text>
-            <xsl:value-of select="$term"/>
-            <xsl:text> in </xsl:text>
-            <xsl:value-of select="$glossary.collection"/>
-          </xsl:message>
-          <xsl:call-template name="inline.italicseq"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:variable name="id">
-            <xsl:call-template name="object.id">
-              <xsl:with-param name="object" select="$cterm"/>
-            </xsl:call-template>
-          </xsl:variable>
-          <a href="{$chunkbase}#{$id}">
-            <xsl:apply-templates select="." mode="class.attribute"/>
-            <xsl:call-template name="inline.italicseq">
-              <xsl:with-param name="content" select="$content"/>
-            </xsl:call-template>
-          </a>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:when test="not(@linkend)                     and ($firstterm.only.link = 0 or $firstterm = 1)                     and $glossterm.auto.link != 0">
-      <xsl:variable name="term">
-        <xsl:choose>
-          <xsl:when test="@baseform">
-            <xsl:value-of select="normalize-space(@baseform)"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="normalize-space(.)"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-      <xsl:variable name="targets" select="//glossentry[normalize-space(glossterm)=$term                               or normalize-space(glossterm/@baseform)=$term]"/>
-      <xsl:variable name="target" select="$targets[1]"/>
-
-      <xsl:choose>
-        <xsl:when test="count($targets)=0">
-          <xsl:message>
-            <xsl:text>Error: no glossentry for glossterm: </xsl:text>
-            <xsl:value-of select="."/>
-            <xsl:text>.</xsl:text>
-          </xsl:message>
-          <xsl:call-template name="inline.italicseq"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <a>
-            <xsl:apply-templates select="." mode="class.attribute"/>
-            <xsl:if test="@id or @xml:id">
-              <xsl:attribute name="id">
-                <xsl:value-of select="(@id|@xml:id)[1]"/>
-              </xsl:attribute>
-            </xsl:if>
-
-            <xsl:attribute name="href">
-              <xsl:call-template name="href.target">
-                <xsl:with-param name="object" select="$target"/>
-              </xsl:call-template>
-            </xsl:attribute>
-
-            <xsl:call-template name="inline.italicseq">
-              <xsl:with-param name="content" select="$content"/>
-            </xsl:call-template>
-          </a>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:call-template name="inline.italicseq"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="termdef">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="generate.html.title"/>
-    <xsl:call-template name="gentext.template">
-      <xsl:with-param name="context" select="'termdef'"/>
-      <xsl:with-param name="name" select="'prefix'"/>
-    </xsl:call-template>
-    <xsl:apply-templates/>
-    <xsl:call-template name="gentext.template">
-      <xsl:with-param name="context" select="'termdef'"/>
-      <xsl:with-param name="name" select="'suffix'"/>
-    </xsl:call-template>
-  </span>
-</xsl:template>
-
-<xsl:template match="sgmltag|tag">
-  <xsl:call-template name="format.sgmltag"/>
-</xsl:template>
-
-<xsl:template name="format.sgmltag">
-  <xsl:param name="class">
-    <xsl:choose>
-      <xsl:when test="@class">
-        <xsl:value-of select="@class"/>
-      </xsl:when>
-      <xsl:otherwise>element</xsl:otherwise>
-    </xsl:choose>
-  </xsl:param>
-
-  <xsl:variable name="content">
-    <xsl:choose>
-      <xsl:when test="$class='attribute'">
-        <xsl:apply-templates/>
-      </xsl:when>
-      <xsl:when test="$class='attvalue'">
-        <xsl:apply-templates/>
-      </xsl:when>
-      <xsl:when test="$class='element'">
-        <xsl:apply-templates/>
-      </xsl:when>
-      <xsl:when test="$class='endtag'">
-        <xsl:text>&lt;/</xsl:text>
-        <xsl:apply-templates/>
-        <xsl:text>&gt;</xsl:text>
-      </xsl:when>
-      <xsl:when test="$class='genentity'">
-        <xsl:text>&amp;</xsl:text>
-        <xsl:apply-templates/>
-        <xsl:text>;</xsl:text>
-      </xsl:when>
-      <xsl:when test="$class='numcharref'">
-        <xsl:text>&amp;#</xsl:text>
-        <xsl:apply-templates/>
-        <xsl:text>;</xsl:text>
-      </xsl:when>
-      <xsl:when test="$class='paramentity'">
-        <xsl:text>%</xsl:text>
-        <xsl:apply-templates/>
-        <xsl:text>;</xsl:text>
-      </xsl:when>
-      <xsl:when test="$class='pi'">
-        <xsl:text>&lt;?</xsl:text>
-        <xsl:apply-templates/>
-        <xsl:text>&gt;</xsl:text>
-      </xsl:when>
-      <xsl:when test="$class='xmlpi'">
-        <xsl:text>&lt;?</xsl:text>
-        <xsl:apply-templates/>
-        <xsl:text>?&gt;</xsl:text>
-      </xsl:when>
-      <xsl:when test="$class='starttag'">
-        <xsl:text>&lt;</xsl:text>
-        <xsl:apply-templates/>
-        <xsl:text>&gt;</xsl:text>
-      </xsl:when>
-      <xsl:when test="$class='emptytag'">
-        <xsl:text>&lt;</xsl:text>
-        <xsl:apply-templates/>
-        <xsl:text>/&gt;</xsl:text>
-      </xsl:when>
-      <xsl:when test="$class='sgmlcomment' or $class='comment'">
-        <xsl:text>&lt;!--</xsl:text>
-        <xsl:apply-templates/>
-        <xsl:text>--&gt;</xsl:text>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <code>
-    <xsl:apply-templates select="." mode="class.attribute">
-      <xsl:with-param name="class" select="concat('sgmltag-', $class)"/>
-    </xsl:apply-templates>
-    <xsl:call-template name="generate.html.title"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content" select="$content"/>
-    </xsl:call-template>
-  </code>
-</xsl:template>
-
-<xsl:template match="email">
-  <xsl:call-template name="inline.monoseq">
-    <xsl:with-param name="content">
-      <xsl:if test="not($email.delimiters.enabled = 0)">
-        <xsl:text>&lt;</xsl:text>
-      </xsl:if>
-      <a>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:attribute name="href">
-          <xsl:text>mailto:</xsl:text>
-          <xsl:value-of select="."/>
-        </xsl:attribute>
-        <xsl:apply-templates/>
-      </a>
-      <xsl:if test="not($email.delimiters.enabled = 0)">
-        <xsl:text>&gt;</xsl:text>
-      </xsl:if>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="keycombo">
-  <xsl:variable name="action" select="@action"/>
-  <xsl:variable name="joinchar">
-    <xsl:choose>
-      <xsl:when test="$action='seq'"><xsl:text> </xsl:text></xsl:when>
-      <xsl:when test="$action='simul'">+</xsl:when>
-      <xsl:when test="$action='press'">-</xsl:when>
-      <xsl:when test="$action='click'">-</xsl:when>
-      <xsl:when test="$action='double-click'">-</xsl:when>
-      <xsl:when test="$action='other'"/>
-      <xsl:otherwise>+</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:for-each select="*">
-    <xsl:if test="position()&gt;1"><xsl:value-of select="$joinchar"/></xsl:if>
-    <xsl:apply-templates select="."/>
-  </xsl:for-each>
-</xsl:template>
-
-<xsl:template match="uri">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="menuchoice">
-  <xsl:variable name="shortcut" select="./shortcut"/>
-  <xsl:call-template name="process.menuchoice"/>
-  <xsl:if test="$shortcut">
-    <xsl:text> (</xsl:text>
-    <xsl:apply-templates select="$shortcut"/>
-    <xsl:text>)</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="process.menuchoice">
-  <xsl:param name="nodelist" select="guibutton|guiicon|guilabel|guimenu|guimenuitem|guisubmenu|interface"/><!-- not(shortcut) -->
-  <xsl:param name="count" select="1"/>
-
-  <xsl:choose>
-    <xsl:when test="$count&gt;count($nodelist)"/>
-    <xsl:when test="$count=1">
-      <xsl:apply-templates select="$nodelist[$count=position()]"/>
-      <xsl:call-template name="process.menuchoice">
-        <xsl:with-param name="nodelist" select="$nodelist"/>
-        <xsl:with-param name="count" select="$count+1"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="node" select="$nodelist[$count=position()]"/>
-      <xsl:choose>
-        <xsl:when test="local-name($node)='guimenuitem'                         or local-name($node)='guisubmenu'">
-          <xsl:value-of select="$menuchoice.menu.separator"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$menuchoice.separator"/>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="$node"/>
-      <xsl:call-template name="process.menuchoice">
-        <xsl:with-param name="nodelist" select="$nodelist"/>
-        <xsl:with-param name="count" select="$count+1"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="optional">
-  <xsl:value-of select="$arg.choice.opt.open.str"/>
-  <xsl:call-template name="inline.charseq"/>
-  <xsl:value-of select="$arg.choice.opt.close.str"/>
-</xsl:template>
-
-<xsl:template match="citation">
-  <!-- todo: integrate with bibliography collection -->
-  <xsl:variable name="targets" select="(//biblioentry | //bibliomixed)[abbrev = string(current())]"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-
-  <xsl:choose>
-    <!-- try automatic linking based on match to abbrev -->
-    <xsl:when test="$target and not(xref) and not(link)">
-
-      <xsl:text>[</xsl:text>
-      <a>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:attribute name="href">
-          <xsl:call-template name="href.target">
-            <xsl:with-param name="object" select="$target"/>
-          </xsl:call-template>
-        </xsl:attribute>
-
-	<xsl:choose>
-	  <xsl:when test="$bibliography.numbered != 0">
-	    <xsl:apply-templates select="$target" mode="citation"/>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <xsl:call-template name="inline.charseq"/>
-	  </xsl:otherwise>
-	</xsl:choose>
-
-      </a>
-      <xsl:text>]</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text>[</xsl:text>
-      <xsl:call-template name="inline.charseq"/>
-      <xsl:text>]</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="biblioentry|bibliomixed" mode="citation">
-  <xsl:number from="bibliography" count="biblioentry|bibliomixed" level="any" format="1"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="comment[parent::answer|parent::appendix|parent::article|parent::bibliodiv|parent::bibliography|parent::blockquote|parent::caution|parent::chapter|parent::glossary|parent::glossdiv|parent::important|parent::index|parent::indexdiv|parent::listitem|parent::note|parent::orderedlist|parent::partintro|parent::preface|parent::procedure|parent::qandadiv|parent::qandaset|parent::question|parent::refentry|parent::refnamediv|parent::refsect1|parent::refsect2|parent::refsect3|parent::refsection|parent::refsynopsisdiv|parent::sect1|parent::sect2|parent::sect3|parent::sect4|parent::sect5|parent::section|parent::setindex|parent::sidebar|parent::simplesect|parent::taskprerequisites|parent::taskrelated|parent::tasksummary|parent::warning]|remark[parent::answer|parent::appendix|parent::article|parent::bibliodiv|parent::bibliography|parent::blockquote|parent::caution|parent::chapter|parent::glossary|parent::glossdiv|parent::important|parent::index|parent::indexdiv|parent::listitem|parent::note|parent::orderedlist|parent::partintro|parent::preface|parent::procedure|parent::qandadiv|parent::qandaset|parent::question|parent::refentry|parent::refnamediv|parent::refsect1|parent::refsect2|parent::refsect3|parent::refsection|parent::refsynopsisdiv|parent::sect1|parent::sect2|parent::sect3|parent::sect4|parent::sect5|parent::section|parent::setindex|parent::sidebar|parent::simplesect|parent::taskprerequisites|parent::taskrelated|parent::tasksummary|parent::warning]">
-  <xsl:if test="$show.comments != 0">
-    <p class="remark"><i><xsl:call-template name="inline.charseq"/></i></p>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="comment|remark">
-  <xsl:if test="$show.comments != 0">
-    <em><xsl:call-template name="inline.charseq"/></em>
-  </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="productname">
-  <xsl:call-template name="inline.charseq"/>
-  <xsl:if test="@class">
-    <xsl:call-template name="dingbat">
-      <xsl:with-param name="dingbat" select="@class"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="productnumber">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="pob|street|city|state|postcode|country|otheraddr">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="phone|fax">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<!-- in Addresses, for example -->
-<xsl:template match="honorific|firstname|surname|lineage|othername">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="person">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates select="personname"/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="apply-annotations"/>
-  </xsl:param>
-
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:copy-of select="$content"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="personname">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:call-template name="person.name"/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="apply-annotations"/>
-  </xsl:param>
-
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:copy-of select="$content"/>
-  </span>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="org">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="apply-annotations"/>
-  </xsl:param>
-
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:copy-of select="$content"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="orgname">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="apply-annotations"/>
-  </xsl:param>
-
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:copy-of select="$content"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="orgdiv">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="apply-annotations"/>
-  </xsl:param>
-
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:copy-of select="$content"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="affiliation">
-  <xsl:param name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:call-template name="person.name"/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="apply-annotations"/>
-  </xsl:param>
-
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:copy-of select="$content"/>
-  </span>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="beginpage">
-  <!-- does nothing; this *is not* markup to force a page break. -->
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/keywords.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/keywords.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:template match="keywordset"/>
-<xsl:template match="subjectset"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="keywordset" mode="html.header">
-  <meta name="keywords">
-    <xsl:attribute name="content">
-      <xsl:apply-templates select="keyword" mode="html.header"/>
-    </xsl:attribute>
-  </meta>
-</xsl:template>
-
-<xsl:template match="keyword" mode="html.header">
-  <xsl:apply-templates/>
-  <xsl:if test="following-sibling::keyword">, </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/lists.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/lists.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,1045 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="itemizedlist">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor"/>
-    <xsl:if test="title">
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-
-    <!-- Preserve order of PIs and comments -->
-    <xsl:apply-templates select="*[not(self::listitem                   or self::title                   or self::titleabbrev)]                 |comment()[not(preceding-sibling::listitem)]                 |processing-instruction()[not(preceding-sibling::listitem)]"/>
-
-    <ul>
-      <xsl:if test="$css.decoration != 0">
-        <xsl:attribute name="type">
-          <xsl:call-template name="list.itemsymbol"/>
-        </xsl:attribute>
-      </xsl:if>
-
-      <xsl:if test="@spacing='compact'">
-        <xsl:attribute name="compact">
-          <xsl:value-of select="@spacing"/>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:apply-templates select="listitem                     |comment()[preceding-sibling::listitem]                     |processing-instruction()[preceding-sibling::listitem]"/>
-    </ul>
-  </div>
-</xsl:template>
-
-<xsl:template match="itemizedlist/title">
-  <!-- nop -->
-</xsl:template>
-
-<xsl:template match="itemizedlist/listitem">
-  <xsl:variable name="mark" select="../@mark"/>
-  <xsl:variable name="override" select="@override"/>
-
-  <xsl:variable name="usemark">
-    <xsl:choose>
-      <xsl:when test="$override != ''">
-        <xsl:value-of select="$override"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$mark"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="cssmark">
-    <xsl:choose>
-      <xsl:when test="$usemark = 'opencircle'">circle</xsl:when>
-      <xsl:when test="$usemark = 'bullet'">disc</xsl:when>
-      <xsl:when test="$usemark = 'box'">square</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$usemark"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <li>
-    <xsl:if test="$css.decoration = '1' and $cssmark != ''">
-      <xsl:attribute name="style">
-        <xsl:text>list-style-type: </xsl:text>
-        <xsl:value-of select="$cssmark"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <!-- we can't just drop the anchor in since some browsers (Opera)
-         get confused about line breaks if we do. So if the first child
-         is a para, assume the para will put in the anchor. Otherwise,
-         put the anchor in anyway. -->
-    <xsl:if test="local-name(child::*[1]) != 'para'">
-      <xsl:call-template name="anchor"/>
-    </xsl:if>
-
-    <xsl:choose>
-      <xsl:when test="$show.revisionflag != 0 and @revisionflag">
-        <div class="{@revisionflag}">
-          <xsl:apply-templates/>
-        </div>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </li>
-</xsl:template>
-
-<xsl:template match="orderedlist">
-  <xsl:variable name="start">
-    <xsl:call-template name="orderedlist-starting-number"/>
-  </xsl:variable>
-
-  <xsl:variable name="numeration">
-    <xsl:call-template name="list.numeration"/>
-  </xsl:variable>
-
-  <xsl:variable name="type">
-    <xsl:choose>
-      <xsl:when test="$numeration='arabic'">1</xsl:when>
-      <xsl:when test="$numeration='loweralpha'">a</xsl:when>
-      <xsl:when test="$numeration='lowerroman'">i</xsl:when>
-      <xsl:when test="$numeration='upperalpha'">A</xsl:when>
-      <xsl:when test="$numeration='upperroman'">I</xsl:when>
-      <!-- What!? This should never happen -->
-      <xsl:otherwise>
-        <xsl:message>
-          <xsl:text>Unexpected numeration: </xsl:text>
-          <xsl:value-of select="$numeration"/>
-        </xsl:message>
-        <xsl:value-of select="1"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor"/>
-
-    <xsl:if test="title">
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-
-    <!-- Preserve order of PIs and comments -->
-    <xsl:apply-templates select="*[not(self::listitem                   or self::title                   or self::titleabbrev)]                 |comment()[not(preceding-sibling::listitem)]                 |processing-instruction()[not(preceding-sibling::listitem)]"/>
-
-    <ol>
-      <xsl:if test="$start != '1'">
-        <xsl:attribute name="start">
-          <xsl:value-of select="$start"/>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:if test="$numeration != ''">
-        <xsl:attribute name="type">
-          <xsl:value-of select="$type"/>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:if test="@spacing='compact'">
-        <xsl:attribute name="compact">
-          <xsl:value-of select="@spacing"/>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:apply-templates select="listitem                     |comment()[preceding-sibling::listitem]                     |processing-instruction()[preceding-sibling::listitem]"/>
-    </ol>
-  </div>
-</xsl:template>
-
-<xsl:template match="orderedlist/title">
-  <!-- nop -->
-</xsl:template>
-
-<xsl:template match="orderedlist/listitem">
-  <li>
-    <xsl:if test="@override">
-      <xsl:attribute name="value">
-        <xsl:value-of select="@override"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <!-- we can't just drop the anchor in since some browsers (Opera)
-         get confused about line breaks if we do. So if the first child
-         is a para, assume the para will put in the anchor. Otherwise,
-         put the anchor in anyway. -->
-    <xsl:if test="local-name(child::*[1]) != 'para'">
-      <xsl:call-template name="anchor"/>
-    </xsl:if>
-
-    <xsl:choose>
-      <xsl:when test="$show.revisionflag != 0 and @revisionflag">
-        <div class="{@revisionflag}">
-          <xsl:apply-templates/>
-        </div>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </li>
-</xsl:template>
-
-<xsl:template match="variablelist">
-  <xsl:variable name="pi-presentation">
-    <xsl:call-template name="pi.dbhtml_list-presentation"/>
-  </xsl:variable>
-
-  <xsl:variable name="presentation">
-    <xsl:choose>
-      <xsl:when test="$pi-presentation != ''">
-        <xsl:value-of select="$pi-presentation"/>
-      </xsl:when>
-      <xsl:when test="$variablelist.as.table != 0">
-        <xsl:value-of select="'table'"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="'list'"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="list-width">
-    <xsl:call-template name="pi.dbhtml_list-width"/>
-  </xsl:variable>
-
-  <xsl:variable name="term-width">
-    <xsl:call-template name="pi.dbhtml_term-width"/>
-  </xsl:variable>
-
-  <xsl:variable name="table-summary">
-    <xsl:call-template name="pi.dbhtml_table-summary"/>
-  </xsl:variable>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor"/>
-    <xsl:if test="title">
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-
-    <xsl:choose>
-      <xsl:when test="$presentation = 'table'">
-        <!-- Preserve order of PIs and comments -->
-        <xsl:apply-templates select="*[not(self::varlistentry                     or self::title                     or self::titleabbrev)]                   |comment()[not(preceding-sibling::varlistentry)]                   |processing-instruction()[not(preceding-sibling::varlistentry)]"/>
-        <table border="0">
-          <xsl:if test="$list-width != ''">
-            <xsl:attribute name="width">
-              <xsl:value-of select="$list-width"/>
-            </xsl:attribute>
-          </xsl:if>
-          <xsl:if test="$table-summary != ''">
-            <xsl:attribute name="summary">
-              <xsl:value-of select="$table-summary"/>
-            </xsl:attribute>
-          </xsl:if>
-          <col align="left" valign="top">
-            <xsl:if test="$term-width != ''">
-              <xsl:attribute name="width">
-                <xsl:value-of select="$term-width"/>
-              </xsl:attribute>
-            </xsl:if>
-          </col>
-          <tbody>
-            <xsl:apply-templates mode="varlist-table" select="varlistentry                       |comment()[preceding-sibling::varlistentry]                       |processing-instruction()[preceding-sibling::varlistentry]"/>
-          </tbody>
-        </table>
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- Preserve order of PIs and comments -->
-        <xsl:apply-templates select="*[not(self::varlistentry                     or self::title                     or self::titleabbrev)]                   |comment()[not(preceding-sibling::varlistentry)]                   |processing-instruction()[not(preceding-sibling::varlistentry)]"/>
-        <dl>
-          <xsl:apply-templates select="varlistentry                       |comment()[preceding-sibling::varlistentry]                       |processing-instruction()[preceding-sibling::varlistentry]"/>
-        </dl>
-      </xsl:otherwise>
-    </xsl:choose>
-  </div>
-</xsl:template>
-
-<xsl:template match="variablelist/title">
-  <!-- nop -->
-</xsl:template>
-
-<xsl:template match="itemizedlist/titleabbrev|orderedlist/titleabbrev">
-  <!--nop-->
-</xsl:template>
-
-<xsl:template match="variablelist/titleabbrev">
-  <!--nop-->
-</xsl:template>
-
-<xsl:template match="listitem" mode="xref">
-  <xsl:number format="1"/>
-</xsl:template>
-
-<xsl:template match="listitem/simpara" priority="2">
-  <!-- If a listitem contains only a single simpara, don't output
-       the <p> wrapper; this has the effect of creating an li
-       with simple text content. -->
-  <xsl:choose>
-    <xsl:when test="not(preceding-sibling::*)                     and not (following-sibling::*)">
-      <xsl:call-template name="anchor"/>
-      <xsl:apply-templates/>
-    </xsl:when>
-    <xsl:otherwise>
-      <p>
-        <xsl:if test="@role and $para.propagates.style != 0">
-           <xsl:apply-templates select="." mode="class.attribute">
-             <xsl:with-param name="class" select="@role"/>
-           </xsl:apply-templates>
-        </xsl:if>
-
-        <xsl:call-template name="anchor"/>
-        <xsl:apply-templates/>
-      </p>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="varlistentry">
-  <dt>
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates select="term"/>
-  </dt>
-  <dd>
-    <xsl:apply-templates select="listitem"/>
-  </dd>
-</xsl:template>
-
-<xsl:template match="varlistentry" mode="varlist-table">
-  <xsl:variable name="presentation">
-    <xsl:call-template name="pi.dbhtml_term-presentation">
-      <xsl:with-param name="node" select=".."/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="separator">
-    <xsl:call-template name="pi.dbhtml_term-separator">
-      <xsl:with-param name="node" select=".."/>
-    </xsl:call-template>
-  </xsl:variable>
-  <tr>
-    <xsl:call-template name="tr.attributes">
-      <xsl:with-param name="rownum">
-        <xsl:number from="variablelist" count="varlistentry"/>
-      </xsl:with-param>
-    </xsl:call-template>
-
-    <td>
-      <p>
-      <xsl:call-template name="anchor"/>
-      <xsl:choose>
-        <xsl:when test="$presentation = 'bold'">
-          <b>
-            <xsl:apply-templates select="term"/>
-            <xsl:value-of select="$separator"/>
-          </b>
-        </xsl:when>
-        <xsl:when test="$presentation = 'italic'">
-          <i>
-            <xsl:apply-templates select="term"/>
-            <xsl:value-of select="$separator"/>
-          </i>
-        </xsl:when>
-        <xsl:when test="$presentation = 'bold-italic'">
-          <b>
-            <i>
-              <xsl:apply-templates select="term"/>
-              <xsl:value-of select="$separator"/>
-            </i>
-          </b>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="term"/>
-          <xsl:value-of select="$separator"/>
-        </xsl:otherwise>
-      </xsl:choose>
-      </p>
-    </td>
-    <td>
-      <xsl:apply-templates select="listitem"/>
-    </td>
-  </tr>
-</xsl:template>
-
-<xsl:template match="varlistentry/term">
-  <span class="term">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:choose>
-      <xsl:when test="position() = last()"/> <!-- do nothing -->
-      <xsl:otherwise>
-        <!-- * if we have multiple terms in the same varlistentry, generate -->
-        <!-- * a separator (", " by default) and/or an additional line -->
-        <!-- * break after each one except the last -->
-        <xsl:value-of select="$variablelist.term.separator"/>
-        <xsl:if test="not($variablelist.term.break.after = '0')">
-          <br/>
-        </xsl:if>
-      </xsl:otherwise>
-    </xsl:choose>
-  </span>
-</xsl:template>
-
-<xsl:template match="varlistentry/listitem">
-  <!-- we can't just drop the anchor in since some browsers (Opera)
-       get confused about line breaks if we do. So if the first child
-       is a para, assume the para will put in the anchor. Otherwise,
-       put the anchor in anyway. -->
-  <xsl:if test="local-name(child::*[1]) != 'para'">
-    <xsl:call-template name="anchor"/>
-  </xsl:if>
-
-  <xsl:choose>
-    <xsl:when test="$show.revisionflag != 0 and @revisionflag">
-      <div class="{@revisionflag}">
-        <xsl:apply-templates/>
-      </div>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="simplelist">
-  <!-- with no type specified, the default is 'vert' -->
-  <xsl:call-template name="anchor"/>
-  <table class="simplelist" border="0" summary="Simple list">
-    <xsl:call-template name="simplelist.vert">
-      <xsl:with-param name="cols">
-        <xsl:choose>
-          <xsl:when test="@columns">
-            <xsl:value-of select="@columns"/>
-          </xsl:when>
-          <xsl:otherwise>1</xsl:otherwise>
-        </xsl:choose>
-      </xsl:with-param>
-    </xsl:call-template>
-  </table>
-</xsl:template>
-
-<xsl:template match="simplelist[@type='inline']">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-  <!-- if dbchoice PI exists, use that to determine the choice separator -->
-  <!-- (that is, equivalent of "and" or "or" in current locale), or literal -->
-  <!-- value of "choice" otherwise -->
-  <xsl:variable name="localized-choice-separator">
-    <xsl:choose>
-      <xsl:when test="processing-instruction('dbchoice')">
-        <xsl:call-template name="select.choice.separator"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <!-- empty -->
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:for-each select="member">
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:choose>
-      <xsl:when test="position() = last()"/> <!-- do nothing -->
-      <xsl:otherwise>
-	<xsl:text>, </xsl:text>
-	<xsl:if test="position() = last() - 1">
-	  <xsl:if test="$localized-choice-separator != ''">
-	    <xsl:value-of select="$localized-choice-separator"/>
-	    <xsl:text> </xsl:text>
-	  </xsl:if>
-	</xsl:if>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:for-each>
-  </span>
-</xsl:template>
-
-<xsl:template match="simplelist[@type='horiz']">
-  <xsl:call-template name="anchor"/>
-  <table class="simplelist" border="0" summary="Simple list">
-    <xsl:call-template name="simplelist.horiz">
-      <xsl:with-param name="cols">
-        <xsl:choose>
-          <xsl:when test="@columns">
-            <xsl:value-of select="@columns"/>
-          </xsl:when>
-          <xsl:otherwise>1</xsl:otherwise>
-        </xsl:choose>
-      </xsl:with-param>
-    </xsl:call-template>
-  </table>
-</xsl:template>
-
-<xsl:template match="simplelist[@type='vert']">
-  <xsl:call-template name="anchor"/>
-  <table class="simplelist" border="0" summary="Simple list">
-    <xsl:call-template name="simplelist.vert">
-      <xsl:with-param name="cols">
-        <xsl:choose>
-          <xsl:when test="@columns">
-            <xsl:value-of select="@columns"/>
-          </xsl:when>
-          <xsl:otherwise>1</xsl:otherwise>
-        </xsl:choose>
-      </xsl:with-param>
-    </xsl:call-template>
-  </table>
-</xsl:template>
-
-<xsl:template name="simplelist.horiz">
-  <xsl:param name="cols">1</xsl:param>
-  <xsl:param name="cell">1</xsl:param>
-  <xsl:param name="members" select="./member"/>
-
-  <xsl:if test="$cell &lt;= count($members)">
-    <tr>
-      <xsl:call-template name="tr.attributes">
-        <xsl:with-param name="row" select="$members[1]"/>
-        <xsl:with-param name="rownum" select="(($cell - 1) div $cols) + 1"/>
-      </xsl:call-template>
-
-      <xsl:call-template name="simplelist.horiz.row">
-        <xsl:with-param name="cols" select="$cols"/>
-        <xsl:with-param name="cell" select="$cell"/>
-        <xsl:with-param name="members" select="$members"/>
-      </xsl:call-template>
-   </tr>
-    <xsl:call-template name="simplelist.horiz">
-      <xsl:with-param name="cols" select="$cols"/>
-      <xsl:with-param name="cell" select="$cell + $cols"/>
-      <xsl:with-param name="members" select="$members"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="simplelist.horiz.row">
-  <xsl:param name="cols">1</xsl:param>
-  <xsl:param name="cell">1</xsl:param>
-  <xsl:param name="members" select="./member"/>
-  <xsl:param name="curcol">1</xsl:param>
-
-  <xsl:if test="$curcol &lt;= $cols">
-    <td>
-      <xsl:choose>
-        <xsl:when test="$members[position()=$cell]">
-          <xsl:apply-templates select="$members[position()=$cell]"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>&#160;</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </td>
-    <xsl:call-template name="simplelist.horiz.row">
-      <xsl:with-param name="cols" select="$cols"/>
-      <xsl:with-param name="cell" select="$cell+1"/>
-      <xsl:with-param name="members" select="$members"/>
-      <xsl:with-param name="curcol" select="$curcol+1"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="simplelist.vert">
-  <xsl:param name="cols">1</xsl:param>
-  <xsl:param name="cell">1</xsl:param>
-  <xsl:param name="members" select="./member"/>
-  <xsl:param name="rows" select="floor((count($members)+$cols - 1) div $cols)"/>
-
-  <xsl:if test="$cell &lt;= $rows">
-    <tr>
-      <xsl:call-template name="tr.attributes">
-        <xsl:with-param name="row" select="$members[1]"/>
-        <xsl:with-param name="rownum" select="$cell"/>
-      </xsl:call-template>
-
-      <xsl:call-template name="simplelist.vert.row">
-        <xsl:with-param name="cols" select="$cols"/>
-        <xsl:with-param name="rows" select="$rows"/>
-        <xsl:with-param name="cell" select="$cell"/>
-        <xsl:with-param name="members" select="$members"/>
-      </xsl:call-template>
-    </tr>
-    <xsl:call-template name="simplelist.vert">
-      <xsl:with-param name="cols" select="$cols"/>
-      <xsl:with-param name="cell" select="$cell+1"/>
-      <xsl:with-param name="members" select="$members"/>
-      <xsl:with-param name="rows" select="$rows"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="simplelist.vert.row">
-  <xsl:param name="cols">1</xsl:param>
-  <xsl:param name="rows">1</xsl:param>
-  <xsl:param name="cell">1</xsl:param>
-  <xsl:param name="members" select="./member"/>
-  <xsl:param name="curcol">1</xsl:param>
-
-  <xsl:if test="$curcol &lt;= $cols">
-    <td>
-      <xsl:choose>
-        <xsl:when test="$members[position()=$cell]">
-          <xsl:apply-templates select="$members[position()=$cell]"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:text>&#160;</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </td>
-    <xsl:call-template name="simplelist.vert.row">
-      <xsl:with-param name="cols" select="$cols"/>
-      <xsl:with-param name="rows" select="$rows"/>
-      <xsl:with-param name="cell" select="$cell+$rows"/>
-      <xsl:with-param name="members" select="$members"/>
-      <xsl:with-param name="curcol" select="$curcol+1"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="member">
-  <xsl:call-template name="anchor"/>
-  <xsl:call-template name="simple.xlink">
-    <xsl:with-param name="content">
-      <xsl:apply-templates/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="procedure">
-  <xsl:variable name="param.placement" select="substring-after(normalize-space($formal.title.placement),                                         concat(local-name(.), ' '))"/>
-
-  <xsl:variable name="placement">
-    <xsl:choose>
-      <xsl:when test="contains($param.placement, ' ')">
-        <xsl:value-of select="substring-before($param.placement, ' ')"/>
-      </xsl:when>
-      <xsl:when test="$param.placement = ''">before</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$param.placement"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <!-- Preserve order of PIs and comments -->
-  <xsl:variable name="preamble" select="*[not(self::step                   or self::title                   or self::titleabbrev)]                 |comment()[not(preceding-sibling::step)]                 |processing-instruction()[not(preceding-sibling::step)]"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor">
-      <xsl:with-param name="conditional">
-        <xsl:choose>
-	  <xsl:when test="title">0</xsl:when>
-	  <xsl:otherwise>1</xsl:otherwise>
-	</xsl:choose>
-      </xsl:with-param>
-    </xsl:call-template>
-
-    <xsl:if test="title and $placement = 'before'">
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-
-    <xsl:apply-templates select="$preamble"/>
-
-    <xsl:choose>
-      <xsl:when test="count(step) = 1">
-        <ul>
-          <xsl:apply-templates select="step                     |comment()[preceding-sibling::step]                     |processing-instruction()[preceding-sibling::step]"/>
-        </ul>
-      </xsl:when>
-      <xsl:otherwise>
-        <ol>
-          <xsl:attribute name="type">
-            <xsl:value-of select="substring($procedure.step.numeration.formats,1,1)"/>
-          </xsl:attribute>
-          <xsl:apply-templates select="step                     |comment()[preceding-sibling::step]                     |processing-instruction()[preceding-sibling::step]"/>
-        </ol>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:if test="title and $placement != 'before'">
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-  </div>
-</xsl:template>
-
-<xsl:template match="procedure/title">
-  <!-- nop -->
-</xsl:template>
-
-<xsl:template match="substeps">
-  <xsl:variable name="numeration">
-    <xsl:call-template name="procedure.step.numeration"/>
-  </xsl:variable>
-
-  <xsl:call-template name="anchor"/>
-
-  <ol type="{$numeration}">
-    <xsl:apply-templates/>
-  </ol>
-</xsl:template>
-
-<xsl:template match="step">
-  <li>
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates/>
-  </li>
-</xsl:template>
-
-<xsl:template match="stepalternatives">
-  <xsl:call-template name="anchor"/>
-  <ul>
-    <xsl:apply-templates/>
-  </ul>
-</xsl:template>
-
-<xsl:template match="step/title">
-  <p class="title">
-    <b>
-      <xsl:apply-templates/>
-    </b>
-  </p>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="segmentedlist">
-  <xsl:variable name="presentation">
-    <xsl:call-template name="pi.dbhtml_list-presentation"/>
-  </xsl:variable>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor"/>
-
-    <xsl:choose>
-      <xsl:when test="$presentation = 'table'">
-        <xsl:apply-templates select="." mode="seglist-table"/>
-      </xsl:when>
-      <xsl:when test="$presentation = 'list'">
-        <xsl:apply-templates/>
-      </xsl:when>
-      <xsl:when test="$segmentedlist.as.table != 0">
-        <xsl:apply-templates select="." mode="seglist-table"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </div>
-</xsl:template>
-
-<xsl:template match="segmentedlist/title">
-  <div class="title">
-    <strong><span class="title"><xsl:apply-templates/></span></strong>
-  </div>
-</xsl:template>
-
-<xsl:template match="segtitle">
-</xsl:template>
-
-<xsl:template match="segtitle" mode="segtitle-in-seg">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="seglistitem">
-  <div class="seglistitem">
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates/>
-  </div>
-</xsl:template>
-
-<xsl:template match="seg">
-  <xsl:variable name="segnum" select="count(preceding-sibling::seg)+1"/>
-  <xsl:variable name="seglist" select="ancestor::segmentedlist"/>
-  <xsl:variable name="segtitles" select="$seglist/segtitle"/>
-
-  <!--
-     Note: segtitle is only going to be the right thing in a well formed
-     SegmentedList.  If there are too many Segs or too few SegTitles,
-     you'll get something odd...maybe an error
-  -->
-
-  <div class="seg">
-    <strong>
-      <span class="segtitle">
-        <xsl:apply-templates select="$segtitles[$segnum=position()]" mode="segtitle-in-seg"/>
-        <xsl:text>: </xsl:text>
-      </span>
-    </strong>
-    <xsl:apply-templates/>
-  </div>
-</xsl:template>
-
-<xsl:template match="segmentedlist" mode="seglist-table">
-  <xsl:variable name="table-summary">
-    <xsl:call-template name="pi.dbhtml_table-summary"/>
-  </xsl:variable>
-
-  <xsl:variable name="list-width">
-    <xsl:call-template name="pi.dbhtml_list-width"/>
-  </xsl:variable>
-
-  <xsl:apply-templates select="title"/>
-
-  <table border="0">
-    <xsl:if test="$list-width != ''">
-      <xsl:attribute name="width">
-        <xsl:value-of select="$list-width"/>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:if test="$table-summary != ''">
-      <xsl:attribute name="summary">
-        <xsl:value-of select="$table-summary"/>
-      </xsl:attribute>
-    </xsl:if>
-    <thead>
-      <tr class="segtitle">
-        <xsl:call-template name="tr.attributes">
-          <xsl:with-param name="row" select="segtitle[1]"/>
-          <xsl:with-param name="rownum" select="1"/>
-        </xsl:call-template>
-        <xsl:apply-templates select="segtitle" mode="seglist-table"/>
-      </tr>
-    </thead>
-    <tbody>
-      <xsl:apply-templates select="seglistitem" mode="seglist-table"/>
-    </tbody>
-  </table>
-</xsl:template>
-
-<xsl:template match="segtitle" mode="seglist-table">
-  <th><xsl:apply-templates/></th>
-</xsl:template>
-
-<xsl:template match="seglistitem" mode="seglist-table">
-  <xsl:variable name="seglinum">
-    <xsl:number from="segmentedlist" count="seglistitem"/>
-  </xsl:variable>
-
-  <tr class="seglistitem">
-    <xsl:call-template name="tr.attributes">
-      <xsl:with-param name="rownum" select="$seglinum + 1"/>
-    </xsl:call-template>
-    <xsl:apply-templates mode="seglist-table"/>
-  </tr>
-</xsl:template>
-
-<xsl:template match="seg" mode="seglist-table">
-  <td class="seg"><xsl:apply-templates/></td>
-</xsl:template>
-
-<xsl:template match="seg[1]" mode="seglist-table">
-  <td class="seg">
-    <xsl:call-template name="anchor">
-      <xsl:with-param name="node" select="ancestor::seglistitem"/>
-    </xsl:call-template>
-    <xsl:apply-templates/>
-  </td>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="calloutlist">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor"/>
-    <xsl:if test="title|info/title">
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-
-    <!-- Preserve order of PIs and comments -->
-    <xsl:apply-templates select="*[not(self::callout or self::title or self::titleabbrev)]                    |comment()[not(preceding-sibling::callout)]      |processing-instruction()[not(preceding-sibling::callout)]"/>
-
-    <xsl:choose>
-      <xsl:when test="$callout.list.table != 0">
-        <table border="0" summary="Callout list">
-	  <xsl:apply-templates select="callout            |comment()[preceding-sibling::callout]     |processing-instruction()[preceding-sibling::callout]"/>
-	</table>
-      </xsl:when>
-      <xsl:otherwise>
-	<dl compact="compact">
-	  <xsl:apply-templates select="callout            |comment()[preceding-sibling::callout]     |processing-instruction()[preceding-sibling::callout]"/>
-	</dl>
-      </xsl:otherwise>
-    </xsl:choose>
-  </div>
-</xsl:template>
-
-<xsl:template match="calloutlist/title">
-</xsl:template>
-
-<xsl:template match="callout">
-  <xsl:choose>
-    <xsl:when test="$callout.list.table != 0">
-      <tr>
-        <xsl:call-template name="tr.attributes">
-          <xsl:with-param name="rownum">
-            <xsl:number from="calloutlist" count="callout"/>
-          </xsl:with-param>
-        </xsl:call-template>
-
-        <td width="5%" valign="top" align="left">
-          <p>
-            <xsl:call-template name="anchor"/>
-            <xsl:call-template name="callout.arearefs">
-              <xsl:with-param name="arearefs" select="@arearefs"/>
-            </xsl:call-template>
-          </p>
-        </td>
-        <td valign="top" align="left">
-          <xsl:apply-templates/>
-        </td>
-      </tr>
-    </xsl:when>
-    <xsl:otherwise>
-      <dt>
-        <xsl:call-template name="anchor"/>
-        <xsl:call-template name="callout.arearefs">
-          <xsl:with-param name="arearefs" select="@arearefs"/>
-        </xsl:call-template>
-      </dt>
-      <dd><xsl:apply-templates/></dd>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="callout/simpara" priority="2">
-  <!-- If a callout contains only a single simpara, don't output
-       the <p> wrapper; this has the effect of creating an li
-       with simple text content. -->
-  <xsl:choose>
-    <xsl:when test="not(preceding-sibling::*)                     and not (following-sibling::*)">
-      <xsl:call-template name="anchor"/>
-      <xsl:apply-templates/>
-    </xsl:when>
-    <xsl:otherwise>
-      <p>
-        <xsl:if test="@role and $para.propagates.style != 0">
-          <xsl:apply-templates select="." mode="class.attribute">
-            <xsl:with-param name="class" select="@role"/>
-          </xsl:apply-templates>
-        </xsl:if>
-
-        <xsl:call-template name="anchor"/>
-        <xsl:apply-templates/>
-      </p>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="callout.arearefs">
-  <xsl:param name="arearefs"/>
-  <xsl:if test="$arearefs!=''">
-    <xsl:choose>
-      <xsl:when test="substring-before($arearefs,' ')=''">
-        <xsl:call-template name="callout.arearef">
-          <xsl:with-param name="arearef" select="$arearefs"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="callout.arearef">
-          <xsl:with-param name="arearef" select="substring-before($arearefs,' ')"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:call-template name="callout.arearefs">
-      <xsl:with-param name="arearefs" select="substring-after($arearefs,' ')"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="callout.arearef">
-  <xsl:param name="arearef"/>
-  <xsl:variable name="targets" select="key('id',$arearef)"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-
-  <xsl:call-template name="check.id.unique">
-    <xsl:with-param name="linkend" select="$arearef"/>
-  </xsl:call-template>
-
-  <xsl:choose>
-    <xsl:when test="count($target)=0">
-      <xsl:text>???</xsl:text>
-    </xsl:when>
-    <xsl:when test="local-name($target)='co'">
-      <a>
-        <xsl:attribute name="href">
-          <xsl:text>#</xsl:text>
-          <xsl:value-of select="$arearef"/>
-        </xsl:attribute>
-        <xsl:apply-templates select="$target" mode="callout-bug"/>
-      </a>
-      <xsl:text> </xsl:text>
-    </xsl:when>
-    <xsl:when test="local-name($target)='areaset'">
-      <xsl:call-template name="callout-bug">
-        <xsl:with-param name="conum">
-          <xsl:apply-templates select="$target" mode="conumber"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="local-name($target)='area'">
-      <xsl:choose>
-        <xsl:when test="$target/parent::areaset">
-          <xsl:call-template name="callout-bug">
-            <xsl:with-param name="conum">
-              <xsl:apply-templates select="$target/parent::areaset" mode="conumber"/>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="callout-bug">
-            <xsl:with-param name="conum">
-              <xsl:apply-templates select="$target" mode="conumber"/>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text>???</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="orderedlist-starting-number">
-  <xsl:param name="list" select="."/>
-  <xsl:variable name="pi-start">
-    <xsl:call-template name="pi.dbhtml_start">
-      <xsl:with-param name="node" select="$list"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:call-template name="output-orderedlist-starting-number">
-    <xsl:with-param name="list" select="$list"/>
-    <xsl:with-param name="pi-start" select="$pi-start"/>
-  </xsl:call-template>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/maketoc.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/maketoc.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,91 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="doc">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:import href="docbook.xsl"/>
-<xsl:import href="chunk.xsl"/>
-
-<xsl:output method="xml" indent="no" encoding="UTF-8" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
-
-<xsl:param name="toc.list.type" select="'tocentry'"/>
-
-<!-- refentry in autotoc.xsl does not use subtoc, so must
-     handle it explicitly here. -->
-<xsl:template match="refentry" mode="toc">
-  <xsl:param name="toc-context" select="."/>
-
-  <xsl:call-template name="subtoc">
-    <xsl:with-param name="toc-context" select="$toc-context"/>
-  </xsl:call-template>
-</xsl:template>
-
-
-<xsl:template name="subtoc">
-  <xsl:param name="nodes" select="NOT-AN-ELEMENT"/>
-  <xsl:variable name="filename">
-    <xsl:apply-templates select="." mode="chunk-filename"/>
-  </xsl:variable>
-
-  <xsl:variable name="chunk">
-    <xsl:call-template name="chunk"/>
-  </xsl:variable>
-
-  <xsl:if test="$chunk != 0">
-    <xsl:call-template name="indent-spaces"/>
-    <xsl:variable name="id">
-      <xsl:call-template name="object.id"/>
-    </xsl:variable>
-    <tocentry linkend="{$id}">
-      <xsl:processing-instruction name="dbhtml">
-        <xsl:text>filename="</xsl:text>
-        <xsl:value-of select="$filename"/>
-        <xsl:text>"</xsl:text>
-      </xsl:processing-instruction>
-      <xsl:text>
-</xsl:text>
-      <xsl:apply-templates mode="toc" select="$nodes"/>
-      <xsl:call-template name="indent-spaces"/>
-    </tocentry>
-    <xsl:text>
-</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="indent-spaces">
-  <xsl:param name="node" select="."/>
-  <xsl:text>  </xsl:text>
-  <xsl:if test="$node/parent::*">
-    <xsl:call-template name="indent-spaces">
-      <xsl:with-param name="node" select="$node/parent::*"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="/" priority="-1">
-  <xsl:text>
-</xsl:text>
-  <toc role="chunk-toc">
-    <xsl:text>
-</xsl:text>
-    <xsl:apply-templates select="/" mode="toc"/>
-  </toc>
-  <xsl:text>
-</xsl:text>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/manifest.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/manifest.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,22 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="doc">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-<!-- OBSOLETE. The templates from this file were moved to                 -->
-<!-- chunk-common.xsl and chunk-code.xsl.                                 -->
-<!-- ==================================================================== -->
-
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/math.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/math.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,284 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="mml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:template match="inlineequation">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="alt">
-</xsl:template>
-
-<xsl:template match="mathphrase">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates/>
-  </span>
-</xsl:template>
-
-<!-- "Support" for MathML -->
-
-<xsl:template match="mml:*">
-  <xsl:copy>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates/>
-  </xsl:copy>
-</xsl:template>
-
-<!-- Support for TeX math in alt -->
-
-<xsl:template match="*" mode="collect.tex.math">
-  <xsl:call-template name="write.text.chunk">
-    <xsl:with-param name="filename" select="$tex.math.file"/>
-    <xsl:with-param name="method" select="'text'"/>
-    <xsl:with-param name="content">
-      <xsl:choose>
-        <xsl:when test="$tex.math.in.alt = 'plain'">
-          <xsl:call-template name="tex.math.plain.head"/>
-          <xsl:apply-templates select="." mode="collect.tex.math.plain"/>
-          <xsl:call-template name="tex.math.plain.tail"/>
-        </xsl:when>
-        <xsl:when test="$tex.math.in.alt = 'latex'">
-          <xsl:call-template name="tex.math.latex.head"/>
-          <xsl:apply-templates select="." mode="collect.tex.math.latex"/>
-          <xsl:call-template name="tex.math.latex.tail"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            Unsupported TeX math notation: 
-            <xsl:value-of select="$tex.math.in.alt"/>
-          </xsl:message>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:with-param>
-    <xsl:with-param name="encoding" select="$chunker.output.encoding"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- PlainTeX -->
-
-<xsl:template name="tex.math.plain.head">
-  <xsl:text>\nopagenumbers 
-</xsl:text>
-</xsl:template>
-
-<xsl:template name="tex.math.plain.tail">
-  <xsl:text>\bye 
-</xsl:text>
-</xsl:template>
-
-<xsl:template match="inlineequation" mode="collect.tex.math.plain">
-  <xsl:variable name="filename">
-    <xsl:choose>
-      <xsl:when test="graphic">
-        <xsl:call-template name="mediaobject.filename">
-          <xsl:with-param name="object" select="graphic"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="select.mediaobject.filename">
-          <xsl:with-param name="olist" select="inlinemediaobject/*"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:variable name="output.delims">
-    <xsl:call-template name="tex.math.output.delims"/>
-  </xsl:variable>
-  <xsl:variable name="tex" select="alt[@role='tex'] | inlinemediaobject/textobject[@role='tex']"/>
-  <xsl:if test="$tex">
-    <xsl:text>\special{dvi2bitmap outputfile </xsl:text>
-    <xsl:value-of select="$filename"/>
-    <xsl:text>} 
-</xsl:text>
-    <xsl:if test="$output.delims != 0">
-      <xsl:text>$</xsl:text>
-    </xsl:if>
-    <xsl:value-of select="$tex"/>
-    <xsl:if test="$output.delims != 0">
-      <xsl:text>$ 
-</xsl:text>
-    </xsl:if>
-    <xsl:text>\vfill\eject 
-</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="equation|informalequation" mode="collect.tex.math.plain">
-  <xsl:variable name="filename">
-    <xsl:choose>
-      <xsl:when test="graphic">
-        <xsl:call-template name="mediaobject.filename">
-          <xsl:with-param name="object" select="graphic"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="select.mediaobject.filename">
-          <xsl:with-param name="olist" select="mediaobject/*"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:variable name="output.delims">
-    <xsl:call-template name="tex.math.output.delims"/>
-  </xsl:variable>
-  <xsl:variable name="tex" select="alt[@role='tex'] | mediaobject/textobject[@role='tex']"/>
-  <xsl:if test="$tex">
-    <xsl:text>\special{dvi2bitmap outputfile </xsl:text>
-    <xsl:value-of select="$filename"/>
-    <xsl:text>} 
-</xsl:text>
-    <xsl:if test="$output.delims != 0">
-      <xsl:text>$$</xsl:text>
-    </xsl:if>
-    <xsl:value-of select="$tex"/>
-    <xsl:if test="$output.delims != 0">
-      <xsl:text>$$ 
-</xsl:text>
-    </xsl:if>
-    <xsl:text>\vfill\eject 
-</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="text()" mode="collect.tex.math.plain"/>
-
-<!-- LaTeX -->
-
-<xsl:template name="tex.math.latex.head">
-  <xsl:text>\documentclass{article} 
-</xsl:text>
-  <xsl:text>\pagestyle{empty} 
-</xsl:text>
-  <xsl:text>\begin{document} 
-</xsl:text>
-</xsl:template>
-
-<xsl:template name="tex.math.latex.tail">
-  <xsl:text>\end{document} 
-</xsl:text>
-</xsl:template>
-
-<xsl:template match="inlineequation" mode="collect.tex.math.latex">
-  <xsl:variable name="filename">
-    <xsl:choose>
-      <xsl:when test="graphic">
-        <xsl:call-template name="mediaobject.filename">
-          <xsl:with-param name="object" select="graphic"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="select.mediaobject.filename">
-          <xsl:with-param name="olist" select="inlinemediaobject/*"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:variable name="output.delims">
-    <xsl:call-template name="tex.math.output.delims"/>
-  </xsl:variable>
-  <xsl:variable name="tex" select="alt[@role='tex'] | inlinemediaobject/textobject[@role='tex']"/>
-  <xsl:if test="$tex">
-    <xsl:text>\special{dvi2bitmap outputfile </xsl:text>
-    <xsl:value-of select="$filename"/>
-    <xsl:text>} 
-</xsl:text>
-    <xsl:if test="$output.delims != 0">  
-      <xsl:text>$</xsl:text>
-    </xsl:if>
-    <xsl:value-of select="$tex"/>
-    <xsl:if test="$output.delims != 0">  
-      <xsl:text>$ 
-</xsl:text>
-    </xsl:if>
-    <xsl:text>\newpage 
-</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="equation|informalequation" mode="collect.tex.math.latex">
-  <xsl:variable name="filename">
-    <xsl:choose>
-      <xsl:when test="graphic">
-        <xsl:call-template name="mediaobject.filename">
-          <xsl:with-param name="object" select="graphic"/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="select.mediaobject.filename">
-          <xsl:with-param name="olist" select="mediaobject/*"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:variable name="output.delims">
-    <xsl:call-template name="tex.math.output.delims"/>
-  </xsl:variable>
-  <xsl:variable name="tex" select="alt[@role='tex'] | mediaobject/textobject[@role='tex']"/>
-  <xsl:if test="$tex">
-    <xsl:text>\special{dvi2bitmap outputfile </xsl:text>
-    <xsl:value-of select="$filename"/>
-    <xsl:text>} 
-</xsl:text>
-    <xsl:if test="$output.delims != 0">
-      <xsl:text>$$</xsl:text>
-    </xsl:if>
-    <xsl:value-of select="$tex"/>
-    <xsl:if test="$output.delims != 0">
-      <xsl:text>$$ 
-</xsl:text>
-    </xsl:if>
-    <xsl:text>\newpage 
-</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="text()" mode="collect.tex.math.latex"/>
-
-<!-- Extracting image filename from mediaobject and graphic elements -->
-
-<xsl:template name="select.mediaobject.filename">
-  <xsl:param name="olist" select="imageobject|imageobjectco                      |videoobject|audioobject|textobject"/>
-
-  <xsl:variable name="mediaobject.index">
-    <xsl:call-template name="select.mediaobject.index">
-      <xsl:with-param name="olist" select="$olist"/>
-      <xsl:with-param name="count" select="1"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:if test="$mediaobject.index != ''">
-    <xsl:call-template name="mediaobject.filename">
-      <xsl:with-param name="object" select="$olist[position() = $mediaobject.index]"/>
-    </xsl:call-template>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template name="tex.math.output.delims">
-  <xsl:variable name="pi.delims">
-    <xsl:call-template name="pi.dbtex_delims">
-      <xsl:with-param name="node" select="descendant-or-self::*"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="result">
-    <xsl:choose>
-      <xsl:when test="$pi.delims = 'no'">0</xsl:when>
-      <xsl:when test="$pi.delims = '' and $tex.math.delims = 0">0</xsl:when>
-      <xsl:otherwise>1</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:value-of select="$result"/>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/oldchunker.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/oldchunker.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,176 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:saxon="http://icl.com/saxon" xmlns:lxslt="http://xml.apache.org/xslt" xmlns:redirect="http://xml.apache.org/xalan/redirect" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" version="1.1" exclude-result-prefixes="doc" extension-element-prefixes="saxon redirect lxslt">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!-- This stylesheet works with Saxon and Xalan; for XT use xtchunker.xsl -->
-
-<!-- ==================================================================== -->
-
-<xsl:param name="default.encoding" select="'ISO-8859-1'" doc:type="string"/>
-
-<doc:param xmlns="" name="default.encoding">
-<refpurpose xmlns="http://www.w3.org/1999/xhtml">Encoding used in generated HTML pages</refpurpose>
-<refdescription xmlns="http://www.w3.org/1999/xhtml">
-<para>This encoding is used in files generated by chunking stylesheet. Currently
-only Saxon is able to change output encoding.
-</para>
-</refdescription>
-</doc:param>
-
-<!-- ==================================================================== -->
-
-<xsl:param name="saxon.character.representation" select="'entity;decimal'" doc:type="string"/>
-
-<doc:param xmlns="" name="saxon.character.representation">
-<refpurpose xmlns="http://www.w3.org/1999/xhtml">Saxon character representation used in generated HTML pages</refpurpose>
-<refdescription xmlns="http://www.w3.org/1999/xhtml">
-<para>This character representation is used in files generated by chunking stylesheet. If
-you want to suppress entity references for characters with direct representation 
-in default.encoding, set this parameter to value <literal>native</literal>. 
-</para>
-</refdescription>
-</doc:param>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="make-relative-filename">
-  <xsl:param name="base.dir" select="'./'"/>
-  <xsl:param name="base.name" select="''"/>
-
-  <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($vendor, 'SAXON')">
-      <!-- Saxon doesn't make the chunks relative -->
-      <xsl:value-of select="concat($base.dir,$base.name)"/>
-    </xsl:when>
-    <xsl:when test="contains($vendor, 'Apache')">
-      <!-- Xalan doesn't make the chunks relative -->
-      <xsl:value-of select="concat($base.dir,$base.name)"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message terminate="yes">
-        <xsl:text>Chunking isn't supported with </xsl:text>
-        <xsl:value-of select="$vendor"/>
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="write.chunk">
-  <xsl:param name="filename" select="''"/>
-  <xsl:param name="method" select="'html'"/>
-  <xsl:param name="encoding" select="$default.encoding"/>
-  <xsl:param name="indent" select="'no'"/>
-  <xsl:param name="content" select="''"/>
-
-  <xsl:message>
-    <xsl:text>Writing </xsl:text>
-    <xsl:value-of select="$filename"/>
-    <xsl:if test="name(.) != ''">
-      <xsl:text> for </xsl:text>
-      <xsl:value-of select="name(.)"/>
-      <xsl:if test="@id">
-        <xsl:text>(</xsl:text>
-        <xsl:value-of select="@id"/>
-        <xsl:text>)</xsl:text>
-      </xsl:if>
-    </xsl:if>
-  </xsl:message>
-
-  <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($vendor, 'SAXON 6.2')">
-      <!-- Saxon 6.2.x uses xsl:document -->
-      <xsl:document href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" saxon:character-representation="{$saxon.character.representation}">
-        <xsl:copy-of select="$content"/>
-      </xsl:document>
-    </xsl:when>
-    <xsl:when test="contains($vendor, 'SAXON')">
-      <!-- Saxon uses saxon:output -->
-      <saxon:output file="{$filename}" href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" saxon:character-representation="{$saxon.character.representation}">
-        <xsl:copy-of select="$content"/>
-      </saxon:output>
-    </xsl:when>
-    <xsl:when test="contains($vendor, 'Apache')">
-      <!-- Xalan uses redirect -->
-      <redirect:write file="{$filename}">
-        <xsl:copy-of select="$content"/>
-      </redirect:write>
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- it doesn't matter since we won't be making chunks... -->
-      <xsl:message terminate="yes">
-        <xsl:text>Can't make chunks with </xsl:text>
-        <xsl:value-of select="$vendor"/>
-        <xsl:text>'s processor.</xsl:text>
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="write.chunk.with.doctype">
-  <xsl:param name="filename" select="''"/>
-  <xsl:param name="method" select="'html'"/>
-  <xsl:param name="encoding" select="$default.encoding"/>
-  <xsl:param name="indent" select="'no'"/>
-  <xsl:param name="doctype-public" select="''"/>
-  <xsl:param name="doctype-system" select="''"/>
-  <xsl:param name="content" select="''"/>
-
-  <xsl:message>
-    <xsl:text>Writing </xsl:text>
-    <xsl:value-of select="$filename"/>
-    <xsl:if test="name(.) != ''">
-      <xsl:text> for </xsl:text>
-      <xsl:value-of select="name(.)"/>
-    </xsl:if>
-  </xsl:message>
-
-  <xsl:variable name="vendor" select="system-property('xsl:vendor')"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($vendor, 'SAXON 6.2')">
-      <!-- Saxon 6.2.x uses xsl:document -->
-      <xsl:document href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" doctype-public="{$doctype-public}" doctype-system="{$doctype-system}" saxon:character-representation="{$saxon.character.representation}">
-        <xsl:copy-of select="$content"/>
-      </xsl:document>
-    </xsl:when>
-    <xsl:when test="contains($vendor, 'SAXON')">
-      <!-- Saxon uses saxon:output -->
-      <saxon:output file="{$filename}" href="{$filename}" method="{$method}" encoding="{$encoding}" indent="{$indent}" doctype-public="{$doctype-public}" doctype-system="{$doctype-system}" saxon:character-representation="{$saxon.character.representation}">
-        <xsl:copy-of select="$content"/>
-      </saxon:output>
-    </xsl:when>
-    <xsl:when test="contains($vendor, 'Apache')">
-      <!-- Xalan uses redirect -->
-      <redirect:write file="{$filename}">
-        <xsl:copy-of select="$content"/>
-      </redirect:write>
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- it doesn't matter since we won't be making chunks... -->
-      <xsl:message terminate="yes">
-        <xsl:text>Can't make chunks with </xsl:text>
-        <xsl:value-of select="$vendor"/>
-        <xsl:text>'s processor.</xsl:text>
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/onechunk.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/onechunk.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="doc">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:import href="chunk.xsl"/>
-
-<!-- Ok, using the onechunk parameter makes this all work again. -->
-<!-- It does have the disadvantage that it only works for documents that have -->
-<!-- a root element that is considered a chunk by the chunk.xsl stylesheet. -->
-<!-- Ideally, onechunk would let anything be a chunk. But not today. -->
-
-<xsl:param name="onechunk" select="1"/>
-<xsl:param name="suppress.navigation">1</xsl:param>
-
-<xsl:template name="href.target.uri">
-  <xsl:param name="object" select="."/>
-  <xsl:text>#</xsl:text>
-  <xsl:call-template name="object.id">
-    <xsl:with-param name="object" select="$object"/>
-  </xsl:call-template>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/param.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/param.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,414 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<!-- This file is generated from param.xweb -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:param name="admon.graphics.extension">.png</xsl:param>
-<xsl:param name="admon.graphics" select="0"/>
-<xsl:param name="admon.graphics.path">images/</xsl:param>
-<xsl:param name="admon.style">
-  <xsl:text>margin-left: 0.5in; margin-right: 0.5in;</xsl:text>
-</xsl:param>
-<xsl:param name="admon.textlabel" select="1"/>
-<xsl:param name="annotate.toc" select="1"/>
-<xsl:param name="annotation.css">
-/* ======================================================================
-   Annotations
-*/
-
-div.annotation-list  { visibility: hidden;
-                     }
-
-div.annotation-nocss { position: absolute;
-                       visibility: hidden;
-                     }
-
-div.annotation-popup { position: absolute;
-                       z-index: 4;
-                       visibility: hidden;
-                       padding: 0px;
-                       margin: 2px;
-                       border-style: solid;
-                       border-width: 1px;
-                       width: 200px;
-		       background-color: white;
-                     }
-
-div.annotation-title { padding: 1px;
-                       font-weight: bold;
-                       border-bottom-style: solid;
-                       border-bottom-width: 1px;
-		       color: white;
-		       background-color: black;
-                     }
-
-div.annotation-body  { padding: 2px;
-                     }
-
-div.annotation-body p { margin-top: 0px;
-                        padding-top: 0px;
-                      }
-
-div.annotation-close { position: absolute;
-                       top: 2px;
-                       right: 2px;
-                     }
-</xsl:param>
-
-<xsl:param name="annotation.js">
-<xsl:text>http://docbook.sourceforge.net/release/script/AnchorPosition.js http://docbook.sourceforge.net/release/script/PopupWindow.js</xsl:text></xsl:param>
-
-<xsl:param name="annotation.graphic.open">http://docbook.sourceforge.net/release/images/annot-open.png</xsl:param>
-<xsl:param name="annotation.graphic.close">
-http://docbook.sourceforge.net/release/images/annot-close.png</xsl:param>
-<xsl:param name="annotation.support" select="0"/>
-<xsl:param name="appendix.autolabel">A</xsl:param>
-<xsl:param name="author.othername.in.middle" select="1"/>
-<xsl:param name="autotoc.label.separator">. </xsl:param>
-<xsl:param name="autotoc.label.in.hyperlink" select="1"/>
-<xsl:param name="base.dir"/>
-<xsl:param name="biblioentry.item.separator">. </xsl:param>
-<xsl:param name="bibliography.collection">http://docbook.sourceforge.net/release/bibliography/bibliography.xml</xsl:param>
-
-<xsl:param name="bibliography.numbered" select="0"/>
-<xsl:param name="bibliography.style">normal</xsl:param>
-<xsl:param name="blurb.on.titlepage.enabled" select="0"/>
-<xsl:param name="bridgehead.in.toc" select="0"/>
-<xsl:param name="callout.defaultcolumn">60</xsl:param>
-<xsl:param name="callout.graphics.extension">.png</xsl:param>
-
-<xsl:param name="callout.graphics" select="1"/>
-<xsl:param name="callout.graphics.number.limit">15</xsl:param>
-
-<xsl:param name="callout.graphics.path">images/callouts/</xsl:param>
-<xsl:param name="callout.list.table" select="1"/>
-<xsl:param name="callout.unicode" select="0"/>
-<xsl:param name="callout.unicode.number.limit">10</xsl:param>
-<xsl:param name="callout.unicode.start.character">10102</xsl:param>
-<xsl:param name="callouts.extension" select="1"/>
-<xsl:param name="chapter.autolabel" select="1"/>
-<xsl:param name="chunk.append"/>
-<xsl:param name="chunk.first.sections" select="0"/>
-<xsl:param name="chunk.quietly" select="0"/>
-<xsl:param name="chunk.section.depth" select="1"/>
-<xsl:param name="chunk.toc"/>
-<xsl:param name="chunk.tocs.and.lots" select="0"/>
-<xsl:param name="chunk.tocs.and.lots.has.title" select="1"/>
-<xsl:param name="chunk.separate.lots" select="0"/>
-<xsl:param name="citerefentry.link" select="0"/>
-<xsl:param name="collect.xref.targets">no</xsl:param>
-<xsl:param name="component.label.includes.part.label" select="0"/>
-<xsl:param name="contrib.inline.enabled">1</xsl:param>
-<xsl:param name="css.decoration" select="1"/>
-<xsl:param name="current.docid"/>
-<xsl:param name="default.float.class">
-  <xsl:choose>
-    <xsl:when test="contains($stylesheet.result.type,'html')">left</xsl:when>
-    <xsl:otherwise>before</xsl:otherwise>
-  </xsl:choose>
-</xsl:param>
-<xsl:param name="default.image.width"/>
-<xsl:param name="default.table.width"/>
-<xsl:param name="default.table.frame">all</xsl:param>
-<xsl:param name="draft.mode">maybe</xsl:param>
-<xsl:param name="draft.watermark.image">http://docbook.sourceforge.net/release/images/draft.png</xsl:param>
-<xsl:param name="ebnf.table.bgcolor">#F5DCB3</xsl:param>
-<xsl:param name="ebnf.table.border" select="1"/>
-<xsl:param name="ebnf.assignment">
-<code>::=</code>
-</xsl:param>
-
-<xsl:param name="ebnf.statement.terminator"/>
-
-<xsl:param name="eclipse.autolabel" select="0"/>
-<xsl:param name="eclipse.plugin.name">DocBook Online Help Sample</xsl:param>
-<xsl:param name="eclipse.plugin.id">com.example.help</xsl:param>
-<xsl:param name="eclipse.plugin.provider">Example provider</xsl:param>
-<xsl:param name="editedby.enabled">1</xsl:param>
-<xsl:param name="email.delimiters.enabled" select="1"/>
-<xsl:param name="emphasis.propagates.style" select="1"/>
-<xsl:param name="entry.propagates.style" select="1"/>
-<xsl:param name="firstterm.only.link" select="0"/>
-<xsl:param name="footer.rule" select="1"/>
-<xsl:param name="footnote.number.format">1</xsl:param>
-<xsl:param name="footnote.number.symbols"/>
-<xsl:param name="formal.procedures" select="1"/>
-<xsl:param name="formal.title.placement">
-figure before
-example before
-equation before
-table before
-procedure before
-task before
-</xsl:param>
-<xsl:param name="funcsynopsis.decoration" select="1"/>
-<xsl:param name="funcsynopsis.style">kr</xsl:param>
-<xsl:param name="funcsynopsis.tabular.threshold">40</xsl:param>
-<xsl:param name="function.parens" select="0"/>
-<xsl:param name="generate.id.attributes" select="0"/>
-<xsl:param name="generate.index" select="1"/>
-<xsl:param name="generate.legalnotice.link" select="0"/>
-<xsl:param name="generate.revhistory.link" select="0"/>
-<xsl:param name="generate.manifest" select="0"/>
-<xsl:param name="generate.meta.abstract" select="1"/>
-<xsl:param name="generate.section.toc.level" select="0"/>
-<xsl:param name="generate.toc">
-appendix  toc,title
-article/appendix  nop
-article   toc,title
-book      toc,title,figure,table,example,equation
-chapter   toc,title
-part      toc,title
-preface   toc,title
-qandadiv  toc
-qandaset  toc
-reference toc,title
-sect1     toc
-sect2     toc
-sect3     toc
-sect4     toc
-sect5     toc
-section   toc
-set       toc,title
-</xsl:param>
-
-<xsl:param name="glossary.collection"/>
-<xsl:param name="glossary.sort" select="0"/>
-<xsl:param name="glossentry.show.acronym">no</xsl:param>
-<xsl:param name="glossterm.auto.link" select="0"/>
-<xsl:param name="graphic.default.extension"/>
-<xsl:param name="graphicsize.extension" select="1"/>
-<xsl:param name="graphicsize.use.img.src.path" select="0"/>
-<xsl:param name="header.rule" select="1"/>
-<xsl:param name="highlight.default.language"/>
-<xsl:param name="highlight.source" select="0"/>
-<xsl:param name="html.append"/>
-<xsl:param name="html.base"/>
-<xsl:param name="html.cellpadding"/>
-<xsl:param name="html.cellspacing"/>
-<xsl:param name="html.cleanup" select="1"/>
-<xsl:param name="html.ext">.html</xsl:param>
-<xsl:param name="html.extra.head.links" select="0"/>
-<xsl:param name="html.head.legalnotice.link.types">copyright</xsl:param>
-<xsl:param name="html.head.legalnotice.link.multiple" select="1"/>
-<xsl:param name="html.longdesc" select="1"/>
-<xsl:param name="html.longdesc.link" select="$html.longdesc"/>
-<xsl:param name="html.stylesheet"/>
-<xsl:param name="html.stylesheet.type">text/css</xsl:param>
-<xsl:param name="htmlhelp.alias.file">alias.h</xsl:param>
-<xsl:param name="htmlhelp.autolabel" select="0"/>
-<xsl:param name="htmlhelp.button.back" select="1"/>
-<xsl:param name="htmlhelp.button.forward" select="0"/>
-<xsl:param name="htmlhelp.button.hideshow" select="1"/>
-<xsl:param name="htmlhelp.button.home" select="0"/>
-<xsl:param name="htmlhelp.button.home.url"/>
-<xsl:param name="htmlhelp.button.jump1" select="0"/>
-<xsl:param name="htmlhelp.button.jump1.title">User1</xsl:param>
-<xsl:param name="htmlhelp.button.jump1.url"/>
-<xsl:param name="htmlhelp.button.jump2" select="0"/>
-<xsl:param name="htmlhelp.button.jump2.title">User2</xsl:param>
-<xsl:param name="htmlhelp.button.jump2.url"/>
-<xsl:param name="htmlhelp.button.locate" select="0"/>
-<xsl:param name="htmlhelp.button.next" select="1"/>
-<xsl:param name="htmlhelp.button.options" select="1"/>
-<xsl:param name="htmlhelp.button.prev" select="1"/>
-<xsl:param name="htmlhelp.button.print" select="1"/>
-<xsl:param name="htmlhelp.button.refresh" select="0"/>
-<xsl:param name="htmlhelp.button.stop" select="0"/>
-<xsl:param name="htmlhelp.button.zoom" select="0"/>
-<xsl:param name="htmlhelp.chm">htmlhelp.chm</xsl:param>
-<xsl:param name="htmlhelp.default.topic"/>
-<xsl:param name="htmlhelp.display.progress" select="1"/>
-<xsl:param name="htmlhelp.encoding">iso-8859-1</xsl:param>
-<xsl:param name="htmlhelp.enhanced.decompilation" select="0"/>
-<xsl:param name="htmlhelp.enumerate.images" select="0"/>
-<xsl:param name="htmlhelp.force.map.and.alias" select="0"/>
-<xsl:param name="htmlhelp.hhc.binary" select="1"/>
-<xsl:param name="htmlhelp.hhc.folders.instead.books" select="1"/>
-<xsl:param name="htmlhelp.hhc">toc.hhc</xsl:param>
-<xsl:param name="htmlhelp.hhc.section.depth">5</xsl:param>
-<xsl:param name="htmlhelp.hhc.show.root" select="1"/>
-<xsl:param name="htmlhelp.hhc.width"/>
-<xsl:param name="htmlhelp.hhk">index.hhk</xsl:param>
-<xsl:param name="htmlhelp.hhp">htmlhelp.hhp</xsl:param>
-<xsl:param name="htmlhelp.hhp.tail"/>
-<xsl:param name="htmlhelp.hhp.window">Main</xsl:param>
-<xsl:param name="htmlhelp.hhp.windows"/>
-<xsl:param name="htmlhelp.map.file">context.h</xsl:param>
-<xsl:param name="htmlhelp.only" select="0"/>
-<xsl:param name="htmlhelp.remember.window.position" select="0"/>
-<xsl:param name="htmlhelp.show.advanced.search" select="0"/>
-<xsl:param name="htmlhelp.show.favorities" select="0"/>
-<xsl:param name="htmlhelp.show.menu" select="0"/>
-<xsl:param name="htmlhelp.show.toolbar.text" select="1"/>
-<xsl:param name="htmlhelp.title"/>
-<xsl:param name="htmlhelp.use.hhk" select="0"/>
-<xsl:param name="htmlhelp.window.geometry"/>
-<xsl:param name="img.src.path"/>
-<xsl:param name="id.warnings" select="0"/>
-<xsl:param name="index.method">basic</xsl:param>
-<xsl:param name="index.on.role" select="0"/>
-<xsl:param name="index.on.type" select="0"/>
-<xsl:param name="index.number.separator"/>
-<xsl:param name="index.term.separator"/>
-<xsl:param name="index.range.separator"/>
-<xsl:param name="index.prefer.titleabbrev" select="0"/>
-<xsl:param name="ignore.image.scaling" select="0"/>
-<xsl:param name="inherit.keywords" select="1"/>
-<xsl:param name="insert.xref.page.number">no</xsl:param>
-<xsl:param name="javahelp.encoding">iso-8859-1</xsl:param>
-<xsl:param name="keep.relative.image.uris" select="1"/>
-
-<xsl:param name="l10n.gentext.default.language">en</xsl:param>
-<xsl:param name="l10n.gentext.language"/>
-<xsl:param name="l10n.gentext.use.xref.language" select="0"/>
-<xsl:param name="l10n.lang.value.rfc.compliant" select="1"/>
-<xsl:param name="label.from.part" select="0"/>
-<xsl:param name="linenumbering.everyNth">5</xsl:param>
-<xsl:param name="linenumbering.extension" select="1"/>
-<xsl:param name="linenumbering.separator"><xsl:text> </xsl:text></xsl:param>
-<xsl:param name="linenumbering.width">3</xsl:param>
-<xsl:param name="link.mailto.url"/>
-<xsl:param name="make.graphic.viewport" select="1"/>
-<xsl:param name="make.single.year.ranges" select="0"/>
-<xsl:param name="make.valid.html" select="1"/>
-<xsl:param name="make.year.ranges" select="0"/>
-    <xsl:param name="manifest">HTML.manifest</xsl:param>
-    
-<xsl:param name="manifest.in.base.dir" select="0"/>
-<xsl:param name="manual.toc"/>
-<xsl:param name="menuchoice.menu.separator"> &#8594; </xsl:param>
-<xsl:param name="menuchoice.separator">+</xsl:param>
-<xsl:param name="navig.graphics.extension">.gif</xsl:param>
-<xsl:param name="navig.graphics" select="0"/>
-<xsl:param name="navig.graphics.path">images/</xsl:param>
-<xsl:param name="navig.showtitles">1</xsl:param>
-<xsl:param name="nominal.image.depth" select="4 * $pixels.per.inch"/>
-<xsl:param name="nominal.image.width" select="6 * $pixels.per.inch"/>
-<xsl:param name="nominal.table.width">6in</xsl:param>
-<xsl:param name="olink.base.uri"/>
-<xsl:param name="olink.debug" select="0"/>
-<xsl:attribute-set name="olink.properties">
-  <xsl:attribute name="show-destination">replace</xsl:attribute>
-</xsl:attribute-set>
-<xsl:param name="insert.olink.page.number">no</xsl:param>
-<xsl:param name="insert.olink.pdf.frag" select="0"/>
-<xsl:param name="prefer.internal.olink" select="0"/>
-<xsl:param name="olink.lang.fallback.sequence"/>
-<xsl:param name="olink.doctitle">no</xsl:param> 
-<xsl:param name="olink.fragid">fragid=</xsl:param>
-<xsl:param name="olink.outline.ext">.olink</xsl:param>
-<xsl:param name="olink.pubid">pubid</xsl:param>
-  <xsl:param name="olink.resolver">/cgi-bin/olink</xsl:param>
-<xsl:param name="olink.sysid">sysid</xsl:param>
-<xsl:param name="abstract.notitle.enabled" select="0"/>
-<xsl:param name="othercredit.like.author.enabled">0</xsl:param>
-<xsl:param name="para.propagates.style" select="1"/>
-<xsl:param name="part.autolabel">I</xsl:param>
-<xsl:param name="phrase.propagates.style" select="1"/>
-<xsl:param name="pixels.per.inch">90</xsl:param>
-<xsl:param name="points.per.em">10</xsl:param>
-<xsl:param name="preface.autolabel" select="0"/>
-<xsl:param name="preferred.mediaobject.role"/>
-<xsl:param name="process.empty.source.toc" select="0"/>
-<xsl:param name="process.source.toc" select="0"/>
-<xsl:param name="profile.arch"/>
-<xsl:param name="profile.audience"/>
-<xsl:param name="profile.attribute"/>
-<xsl:param name="profile.condition"/>
-<xsl:param name="profile.conformance"/>
-<xsl:param name="profile.lang"/>
-<xsl:param name="profile.os"/>
-<xsl:param name="profile.revision"/>
-<xsl:param name="profile.revisionflag"/>
-<xsl:param name="profile.role"/>
-<xsl:param name="profile.security"/>
-<xsl:param name="profile.separator">;</xsl:param>
-<xsl:param name="profile.status"/>
-<xsl:param name="profile.userlevel"/>
-<xsl:param name="profile.value"/>
-<xsl:param name="profile.vendor"/>
-<xsl:param name="profile.wordsize"/>
-<xsl:param name="punct.honorific">.</xsl:param>
-<xsl:param name="qanda.defaultlabel">number</xsl:param>
-<xsl:param name="qanda.inherit.numeration" select="1"/>
-<xsl:param name="qanda.in.toc" select="0"/>
-<xsl:param name="qanda.nested.in.toc" select="0"/>
-<xsl:param name="qandadiv.autolabel" select="1"/>
-<xsl:param name="refentry.generate.name" select="1"/>
-<xsl:param name="refentry.generate.title" select="0"/>
-<xsl:param name="refentry.separator" select="1"/>
-<xsl:param name="refentry.xref.manvolnum" select="1"/>
-  <xsl:param name="reference.autolabel">I</xsl:param>
-<xsl:param name="refclass.suppress" select="0"/>
-<xsl:param name="root.filename">index</xsl:param>
-<xsl:param name="rootid"/>
-<xsl:param name="runinhead.default.title.end.punct">.</xsl:param>
-<xsl:param name="runinhead.title.end.punct">.!?:</xsl:param>
-<xsl:param name="section.autolabel" select="0"/>
-<xsl:param name="section.autolabel.max.depth">8</xsl:param>
-<xsl:param name="section.label.includes.component.label" select="0"/>
-<xsl:param name="segmentedlist.as.table" select="0"/>
-<xsl:param name="shade.verbatim" select="0"/>
-<xsl:attribute-set name="shade.verbatim.style">
-  <xsl:attribute name="border">0</xsl:attribute>
-  <xsl:attribute name="bgcolor">#E0E0E0</xsl:attribute>
-</xsl:attribute-set>
-
-<xsl:param name="show.comments" select="1"/>
-<xsl:param name="show.revisionflag" select="0"/>
-<xsl:param name="simplesect.in.toc" select="0"/>
-<xsl:param name="spacing.paras" select="0"/>
-<xsl:param name="suppress.footer.navigation">0</xsl:param>
-<xsl:param name="suppress.header.navigation" select="0"/>
-<xsl:param name="suppress.navigation" select="0"/>
-<xsl:param name="table.borders.with.css" select="0"/>
-<xsl:param name="table.cell.border.color"/>
-
-<xsl:param name="table.cell.border.style">solid</xsl:param>
-<xsl:param name="table.cell.border.thickness">0.5pt</xsl:param>
-<xsl:param name="table.footnote.number.format">a</xsl:param>
-<xsl:param name="table.footnote.number.symbols"/>
-<xsl:param name="table.frame.border.color"/>
-
-<xsl:param name="table.frame.border.style">solid</xsl:param>
-<xsl:param name="table.frame.border.thickness">0.5pt</xsl:param>
-<xsl:param name="tablecolumns.extension" select="1"/>
- <xsl:param name="target.database.document">olinkdb.xml</xsl:param>
-<xsl:param name="targets.filename">target.db</xsl:param>
-<xsl:param name="textdata.default.encoding"/>
-<xsl:param name="tex.math.delims" select="1"/>
-<xsl:param name="tex.math.file">tex-math-equations.tex</xsl:param>
-<xsl:param name="tex.math.in.alt"/>
-  <xsl:param name="textinsert.extension" select="1"/>
-<xsl:param name="toc.list.type">dl</xsl:param>
-<xsl:param name="toc.section.depth">2</xsl:param>
-<xsl:param name="toc.max.depth">8</xsl:param>
-<xsl:param name="ulink.target">_top</xsl:param>
-<xsl:param name="use.embed.for.svg" select="0"/>
-<xsl:param name="use.extensions" select="0"/>
-<xsl:param name="use.id.as.filename" select="0"/>
-<xsl:param name="use.local.olink.style" select="0"/> 
-<xsl:param name="use.role.as.xrefstyle" select="1"/>
-<xsl:param name="use.role.for.mediaobject" select="1"/>
-<xsl:param name="use.svg" select="1"/>
-<xsl:param name="variablelist.as.table" select="0"/>
-<xsl:param name="variablelist.term.separator">, </xsl:param>
-<xsl:param name="variablelist.term.break.after">0</xsl:param>
-<xsl:param name="xref.with.number.and.title" select="1"/>
-<xsl:param name="xref.label-title.separator">: </xsl:param>
-<xsl:param name="xref.label-page.separator"><xsl:text> </xsl:text></xsl:param>
-<xsl:param name="xref.title-page.separator"><xsl:text> </xsl:text></xsl:param>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/pi.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/pi.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,1182 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="doc" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<doc:reference xmlns=""><info xmlns="http://www.w3.org/1999/xhtml"><title>HTML Processing Instruction Reference</title>
-    <releaseinfo role="meta">
-      $Id$
-    </releaseinfo>
-  </info>
-  <partintro xmlns="http://www.w3.org/1999/xhtml" xml:id="partintro">
-    <title>Introduction</title>
-    <para>This is generated reference documentation for all
-      user-specifiable processing instructions (PIs) in the DocBook
-      XSL stylesheets for HTML output.
-      <note>
-        <para>You add these PIs at particular points in a document to
-          cause specific &#8220;exceptions&#8221; to formatting/output behavior. To
-          make global changes in formatting/output behavior across an
-          entire document, it&#8217;s better to do it by setting an
-          appropriate stylesheet parameter (if there is one).</para>
-      </note>
-    </para>
-  </partintro>
-</doc:reference>
-
-<!-- ==================================================================== -->
-
-<doc:pi xmlns="" name="dbhtml_background-color">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Sets background color for an image</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml background-color</tag> PI before or
-      after an image (<tag>graphic</tag>, <tag>inlinegraphic</tag>,
-      <tag>imagedata</tag>, or <tag>videodata</tag> element) as a
-      sibling to the element, to set a background color for the
-      image.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml background-color="<replaceable>color</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>background-color="<replaceable>color</replaceable>"</term>
-        <listitem>
-          <para>An HTML color value</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="BGcolor.html">Background color</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_background-color">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'background-color'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_bgcolor">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Sets background color on a table row or table cell</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml bgcolor</tag> PI as child of a table row
-      or cell to set a background color for that table row or cell.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml bgcolor="<replaceable>color</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>bgcolor="<replaceable>color</replaceable>"</term>
-        <listitem>
-          <para>An HTML color value</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="BGtableColor.html#CellBGColor">Cell background color</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_bgcolor">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'bgcolor'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_cellpadding">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies cellpadding in table or qandaset output</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml cellpadding</tag> PI as a child of a
-      <tag>table</tag> or <tag>qandaset</tag> to specify the value
-      for the HTML <literal>cellpadding</literal> attribute in the
-      output HTML table.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml cellpadding="<replaceable>number</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>cellpadding="<replaceable>number</replaceable>"</term>
-        <listitem>
-          <para>Specifies the cellpadding</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
-    <para><parameter>html.cellpadding</parameter></para>
-  </refsee>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="CellSpacing.html">Cell spacing and cell padding</link>,
-      <link role="tcg" xlink:href="QandAformat.html">Q and A formatting</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_cellpadding">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'cellpadding'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_cellspacing">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies cellspacing in table or qandaset output</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml cellspacing</tag> PI as a child of a
-      <tag>table</tag> or <tag>qandaset</tag> to specify the value
-      for the HTML <literal>cellspacing</literal> attribute in the
-      output HTML table.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml cellspacing="<replaceable>number</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>cellspacing="<replaceable>number</replaceable>"</term>
-        <listitem>
-          <para>Specifies the cellspacing</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
-    <para><parameter>html.cellspacing</parameter></para>
-  </refsee>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="CellSpacing.html">Cell spacing and cell padding</link>,
-      <link role="tcg" xlink:href="QandAformat.html">Q and A formatting</link></para>
-    </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_cellspacing">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'cellspacing'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_class">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Set value of the class attribute for a table row</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml class</tag> PI as a child of a
-      <tag>row</tag> to specify a <literal>class</literal>
-      attribute and value in the HTML output for that row.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml class="<replaceable>name</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>class="<replaceable>name</replaceable>"</term>
-        <listitem>
-          <para>Specifies the class name</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="CSSTableCells.html">Table styles in HTML output</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_class">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'class'"/>
-  </xsl:call-template>
-</xsl:template> 
-
-<doc:pi xmlns="" name="dbhtml_dir">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies a directory name in which to write files</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>When chunking output, use the <tag class="xmlpi">dbhtml dir</tag> PI
-      as a child of a chunk source to cause the output of that
-      chunk to be written to the specified directory; also, use it
-      as a child of a <tag>mediaobject</tag> to specify a
-      directory into which any long-description files for that
-      <tag>mediaobject</tag> will be written.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml dir="<replaceable>path</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>dir="<replaceable>path</replaceable>"</term>
-        <listitem>
-          <para>Specifies the pathname for the directory</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
-    <para><parameter>base.dir</parameter></para>
-  </refsee>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="Chunking.html#dbhtmlDirPI">dbhtml dir processing instruction</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_dir">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'dir'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_filename">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies a filename for a chunk</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>When chunking output, use the <tag class="xmlpi">dbhtml filename</tag>
-      PI as a child of a chunk source to specify a filename for
-      the output file for that chunk.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml filename="<replaceable>filename</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>filename="<replaceable>path</replaceable>"</term>
-        <listitem>
-          <para>Specifies the filename for the file</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
-    <para><parameter>use.id.as.filename</parameter></para>
-  </refsee>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="Chunking.html#DbhtmlFilenames">dbhtml filenames</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_filename">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'filename'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_funcsynopsis-style">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies presentation style for a funcsynopsis</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml funcsynopsis-style</tag> PI as a child of
-      a <tag>funcprototype</tag> or anywhere within a funcprototype
-      control the presentation style for the <tag>funcsynopsis</tag>
-      in output.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml funcsynopsis-style="kr"|"ansi"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>funcsynopsis-style="kr"</term>
-        <listitem>
-          <para>Displays the <tag>funcprototype</tag> in K&amp;R style</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>funcsynopsis-style="ansi"</term>
-        <listitem>
-          <para>Displays the <tag>funcprototype</tag> in ANSI style</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
-    <para><parameter>funcsynopsis.style</parameter></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_funcsynopsis-style">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'funcsynopsis-style'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_img.src.path">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies a path to the location of an image file</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml img.src.path</tag> PI before or
-      after an image (<tag>graphic</tag>,
-      <tag>inlinegraphic</tag>, <tag>imagedata</tag>, or
-      <tag>videodata</tag> element) as a sibling to the element,
-      to specify a path to the location of the image; in HTML
-      output, the value specified for the
-      <code>img.src.path</code> attribute is prepended to the
-      filename.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml img.src.path="<replaceable>path</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>img.src.path="<replaceable>path</replaceable>"</term>
-        <listitem>
-          <para>Specifies the pathname to prepend to the name of the image file</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
-    <para><parameter>img.src.path</parameter></para>
-  </refsee>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="GraphicsLocations.html#UsingFileref">Using fileref</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_img.src.path">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'img.src.path'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_label-width">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies the label width for a qandaset</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml label-width</tag> PI as a child of a
-      <tag>qandaset</tag> to specify the width of labels.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml label-width="<replaceable>width</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>label-width="<replaceable>width</replaceable>"</term>
-        <listitem>
-          <para>Specifies the label width (including units)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="QandAformat.html">Q and A formatting</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_label-width">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'label-width'"/>
-  </xsl:call-template>
-</xsl:template> 
-
-<doc:pi xmlns="" name="dbhtml_linenumbering.everyNth">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies interval for lines numbers in verbatims</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml linenumbering.everyNth</tag> PI as a child
-      of a &#8220;verbatim&#8221; element &#8211; <tag>programlisting</tag>,
-      <tag>screen</tag>, <tag>synopsis</tag> &#8212; to specify
-      the interval at which lines are numbered.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml linenumbering.everyNth="<replaceable>N</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>linenumbering.everyNth="<replaceable>N</replaceable>"</term>
-        <listitem>
-          <para>Specifies numbering interval; a number is output
-            before every <replaceable>N</replaceable>th line</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
-    <para><parameter>linenumbering.everyNth</parameter></para>
-  </refsee>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="AnnotateListing.html#LineNumbering">Line numbering</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_linenumbering.everyNth">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'linenumbering.everyNth'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_linenumbering.separator">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies separator text for line numbers in verbatims</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml linenumbering.separator</tag> PI as a child
-      of a &#8220;verbatim&#8221; element &#8211; <tag>programlisting</tag>,
-      <tag>screen</tag>, <tag>synopsis</tag> &#8212; to specify
-      the separator text output between the line numbers and content.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml linenumbering.separator="<replaceable>text</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>linenumbering.separator="<replaceable>text</replaceable>"</term>
-        <listitem>
-          <para>Specifies the text (zero or more characters)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
-    <para><parameter>linenumbering.separator</parameter></para>
-  </refsee>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="AnnotateListing.html#LineNumbering">Line numbering</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_linenumbering.separator">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'linenumbering.separator'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_linenumbering.width">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies width for line numbers in verbatims</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml linenumbering.width</tag> PI as a child
-      of a &#8220;verbatim&#8221; element &#8211; <tag>programlisting</tag>,
-      <tag>screen</tag>, <tag>synopsis</tag> &#8212; to specify
-      the width set aside for line numbers.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml linenumbering.width="<replaceable>width</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>linenumbering.width="<replaceable>width</replaceable>"</term>
-        <listitem>
-          <para>Specifies the width (inluding units)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
-    <para><parameter>linenumbering.width</parameter></para>
-  </refsee>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="AnnotateListing.html#LineNumbering">Line numbering</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_linenumbering.width">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'linenumbering.width'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_list-presentation">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies presentation style for a variablelist or
-    segmentedlist</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml list-presentation</tag> PI as a child of
-      a <tag>variablelist</tag> or <tag>segmentedlist</tag> to
-      control the presentation style for the list (to cause it, for
-      example, to be displayed as a table).</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml list-presentation="list"|"table"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>list-presentation="list"</term>
-        <listitem>
-          <para>Displays the list as a list</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>list-presentation="table"</term>
-        <listitem>
-          <para>Displays the list as a table</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
-    <itemizedlist>
-      <listitem>
-        <para><parameter>variablelist.as.table</parameter></para>
-      </listitem>
-      <listitem>
-        <para><parameter>segmentedlist.as.table</parameter></para>
-      </listitem>
-    </itemizedlist>
-  </refsee>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="Variablelists.html#VarListFormatting">Variable list formatting in HTML</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_list-presentation">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'list-presentation'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_list-width">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies the width of a variablelist or simplelist</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml list-width</tag> PI as a child of a
-      <tag>variablelist</tag> or a <tag>simplelist</tag> presented
-      as a table, to specify the output width.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml list-width="<replaceable>width</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>list-width="<replaceable>width</replaceable>"</term>
-        <listitem>
-          <para>Specifies the output width (including units)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="Variablelists.html#VarListFormatting">Variable list formatting in HTML</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_list-width">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'list-width'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_row-height">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies the height for a table row</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml row-height</tag> PI as a child of a
-      <tag>row</tag> to specify the height of the row.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml row-height="<replaceable>height</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>row-height="<replaceable>height</replaceable>"</term>
-        <listitem>
-          <para>Specifies the label height (including units)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="RowHeight.html">Row height</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_row-height">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'row-height'"/>
-  </xsl:call-template>
-</xsl:template> 
-
-<doc:pi xmlns="" name="dbhtml_start">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">(obsolete) Sets the starting number on an ordered list</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para><emphasis>This PI is obsolete</emphasis>. The intent of
-      this PI was to provide a means for setting a specific starting
-      number for an ordered list. Instead of this PI, set a value
-      for the <literal>override</literal> attribute on the first
-      <tag>listitem</tag> in the list; that will have the same
-      effect as what this PI was intended for.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml start="<replaceable>character</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>start="<replaceable>character</replaceable>"</term>
-        <listitem>
-          <para>Specifies the character to use as the starting
-            number; use 0-9, a-z, A-Z, or lowercase or uppercase
-            Roman numerals</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="Orderedlists.html#ListStartNum">List starting number</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_start">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="pi-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'start'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_table-summary">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies summary for table, variablelist, segmentedlist, or qandaset output</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml table-summary</tag> PI as a child of
-      a <tag>table</tag>, <tag>variablelist</tag>,
-      <tag>segmentedlist</tag>, or <tag>qandaset</tag> to specify
-      the text for the HTML <literal>summary</literal> attribute
-      in the output HTML table.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml table-summary="<replaceable>text</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>table-summary="<replaceable>text</replaceable>"</term>
-        <listitem>
-          <para>Specifies the summary text (zero or more characters)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="Variablelists.html#VarListFormatting">Variable list formatting in HTML</link>,
-      <link role="tcg" xlink:href="TableSummary.html">Table summary text</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_table-summary">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'table-summary'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_table-width">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies the width for a table</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml table-width</tag> PI as a child of a
-      <tag>table</tag> to specify the width of the table in
-      output.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml table-width="<replaceable>width</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>table-width="<replaceable>width</replaceable>"</term>
-        <listitem>
-          <para>Specifies the table width (including units or as a percentage)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
-    <para><parameter>default.table.width</parameter></para>
-  </refsee>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="Tables.html#TableWidth">Table width</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_table-width">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'table-width'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_term-presentation">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Sets character formatting for terms in a variablelist</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml term-presentation</tag> PI as a child
-      of a <tag>variablelist</tag> to set character formatting for
-      the <tag>term</tag> output of the list.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml term-presentation="bold"|"italic"|"bold-italic"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>term-presentation="<replaceable>bold</replaceable>"</term>
-        <listitem>
-          <para>Specifies that terms are displayed in bold</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>term-presentation="<replaceable>italic</replaceable>"</term>
-        <listitem>
-          <para>Specifies that terms are displayed in italic</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>term-presentation="<replaceable>bold-italic</replaceable>"</term>
-        <listitem>
-          <para>Specifies that terms are displayed in bold-italic</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="Variablelists.html#VarListFormatting">Variable list formatting in HTML</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_term-presentation">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'term-presentation'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_term-separator">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies separator text among terms in a varlistentry</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml term-separator</tag> PI as a child
-      of a <tag>variablelist</tag> to specify the separator text
-      among <tag>term</tag> instances.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml term-separator="<replaceable>text</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>term-separator="<replaceable>text</replaceable>"</term>
-        <listitem>
-          <para>Specifies the text (zero or more characters)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
-    <para><parameter>variablelist.term.separator</parameter></para>
-  </refsee>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="Variablelists.html#VarListFormatting">Variable list formatting in HTML</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_term-separator">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'term-separator'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_term-width">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies the term width for a variablelist</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml term-width</tag> PI as a child of a
-      <tag>variablelist</tag> to specify the width for
-      <tag>term</tag> output.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml term-width="<replaceable>width</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>term-width="<replaceable>width</replaceable>"</term>
-        <listitem>
-          <para>Specifies the term width (including units)</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="Variablelists.html#VarListFormatting">Variable list formatting in HTML</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_term-width">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'term-width'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml_toc">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Specifies whether a TOC should be generated for a qandaset</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml toc</tag> PI as a child of a
-      <tag>qandaset</tag> to specify whether a table of contents
-      (TOC) is generated for the <tag>qandaset</tag>.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml toc="0"|"1"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>toc="0"</term>
-        <listitem>
-          <para>If zero, no TOC is generated</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>toc="1"</term>
-        <listitem>
-          <para>If <code>1</code> (or any non-zero value),
-            a TOC is generated</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="QandAtoc.html">Q and A list of questions</link>,
-      <link role="tcg" xlink:href="QandAformat.html">Q and A formatting</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml_toc">
-  <xsl:param name="node" select="."/>
-  <xsl:call-template name="dbhtml-attribute">
-    <xsl:with-param name="pis" select="$node/processing-instruction('dbhtml')"/>
-    <xsl:with-param name="attribute" select="'toc'"/>
-  </xsl:call-template>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbcmdlist">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Generates a hyperlinked list of commands</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbcmdlist</tag> PI as the child of any
-      element (for example, <tag>refsynopsisdiv</tag>) containing multiple
-      <tag>cmdsynopsis</tag> instances; a hyperlinked navigational
-      &#8220;command list&#8221; will be generated at the top of output for that
-      element, enabling users to quickly jump
-      to each command synopsis.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbcmdlist</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <para>[No parameters]</para>
-  </refparameter>
-</doc:pi>
-<xsl:template name="pi.dbcmdlist">
-  <xsl:variable name="cmdsynopses" select="..//cmdsynopsis"/>
-  <xsl:if test="count($cmdsynopses)&lt;1">
-    <xsl:message><xsl:text>No cmdsynopsis elements matched dbcmdlist PI, perhaps it's nested too deep?</xsl:text>
-    </xsl:message>
-  </xsl:if>
-  <dl>
-    <xsl:call-template name="process.cmdsynopsis.list">
-      <xsl:with-param name="cmdsynopses" select="$cmdsynopses"/>
-    </xsl:call-template>
-  </dl>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbfunclist">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Generates a hyperlinked list of functions</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbfunclist</tag> PI as the child of any
-      element (for example, <tag>refsynopsisdiv</tag>) containing multiple
-      <tag>funcsynopsis</tag> instances; a hyperlinked
-      navigational &#8220;function list&#8221; will be generated at the top of
-      output for that element, enabling users to quickly
-      jump to to each function synopsis.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbfunclist</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <para>[No parameters]</para>
-  </refparameter>
-</doc:pi>
-<xsl:template name="pi.dbfunclist">
-  <xsl:variable name="funcsynopses" select="..//funcsynopsis"/>
-  <xsl:if test="count($funcsynopses)&lt;1">
-    <xsl:message><xsl:text>No funcsynopsis elements matched dbfunclist PI, perhaps it's nested too deep?</xsl:text>
-    </xsl:message>
-  </xsl:if>
-  <dl>
-    <xsl:call-template name="process.funcsynopsis.list">
-      <xsl:with-param name="funcsynopses" select="$funcsynopses"/>
-    </xsl:call-template>
-  </dl>
-</xsl:template>
-
-<doc:pi xmlns="" name="dbhtml-include_href">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Copies an external well-formed HTML/XML file into current doc</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhtml-include href</tag> PI anywhere in a
-      document to cause the contents of the file referenced by the
-      <code>href</code> pseudo-attribute to be copied/inserted &#8220;as
-      is&#8221; into your HTML output at the point in document order
-      where the PI occurs in the source.</para>
-    <note>
-      <para>The referenced file may contain plain text (as long as
-        it is &#8220;wrapped&#8221; in an <tag>html</tag> element &#8212; see the
-        note below) or markup in any arbitrary vocabulary,
-        including HTML &#8212; but it must conform to XML
-        well-formedness constraints (because the feature in XSLT
-        1.0 for opening external files, the
-        <function>document()</function> function, can only handle
-        files that meet XML well-formedness constraints).</para>
-      <para>Among other things, XML well-formedness constraints
-        require a document to have <emphasis>a single root
-          element</emphasis>. So if the content you want to
-        include is plain text or is markup that does
-        <emphasis>not</emphasis> have a single root element,
-        <emphasis role="strong">wrap the content in an
-          <tag>html</tag> element</emphasis>. The stylesheets will
-        strip out that surrounding <tag>html</tag> &#8220;wrapper&#8221; when
-        they find it, leaving just the content you want to
-        insert.</para>
-    </note>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhtml-include href="<replaceable>URI</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>href="<replaceable>URI</replaceable>"</term>
-        <listitem>
-          <para>Specifies the URI for the file to include; the URI
-            can be, for example, a remote <literal>http:</literal>
-            URI, or a local filesystem <literal>file:</literal>
-            URI</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="params">
-    <para><parameter>textinsert.extension</parameter></para>
-  </refsee>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="InsertExtHtml.html">Inserting external HTML code</link>,
-      <link xlink:href="ExternalCode.html">External code files</link></para>
-  </refsee>
-</doc:pi>
-<xsl:template name="pi.dbhtml-include">
-  <xsl:param name="href">
-    <xsl:call-template name="dbhtml-attribute">
-      <xsl:with-param name="pis" select="."/>
-      <xsl:with-param name="attribute">href</xsl:with-param>
-    </xsl:call-template>
-  </xsl:param>
-  <xsl:choose>
-    <xsl:when test="$href != ''">
-      <xsl:variable name="content" select="document($href,/)"/>
-      <xsl:choose>
-        <xsl:when test="$content/*">
-          <xsl:choose>
-            <xsl:when test="$content/*[1][self::html]">
-              <!-- include just the children of html wrapper -->
-              <xsl:copy-of select="$content/*[1]/node()"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:copy-of select="$content"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>ERROR: dbhtml-include processing instruction </xsl:text>
-            <xsl:text>href has no content.</xsl:text>
-          </xsl:message>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message>
-        <xsl:text>ERROR: dbhtml-include processing instruction has </xsl:text>
-        <xsl:text>missing or empty href value.</xsl:text>
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="dbhtml-attribute">
-  <!-- * dbhtml-attribute is an interal utility template for retrieving -->
-  <!-- * pseudo-attributes/parameters from PIs -->
-  <xsl:param name="pis" select="processing-instruction('dbhtml')"/>
-  <xsl:param name="attribute">filename</xsl:param>
-  <xsl:call-template name="pi-attribute">
-    <xsl:with-param name="pis" select="$pis"/>
-    <xsl:with-param name="attribute" select="$attribute"/>
-  </xsl:call-template>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="processing-instruction()">
-</xsl:template>
-
-<xsl:template match="processing-instruction('dbhtml')">
-  <!-- nop -->
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="processing-instruction('dbcmdlist')">
-  <xsl:call-template name="pi.dbcmdlist"/>
-</xsl:template>
-<xsl:template name="process.cmdsynopsis.list">
-  <xsl:param name="cmdsynopses"/><!-- empty node list by default -->
-  <xsl:param name="count" select="1"/>
-
-  <xsl:choose>
-    <xsl:when test="$count&gt;count($cmdsynopses)"/>
-    <xsl:otherwise>
-      <xsl:variable name="cmdsyn" select="$cmdsynopses[$count]"/>
-
-       <dt>
-       <a>
-         <xsl:attribute name="href">
-           <xsl:text>#</xsl:text>
-           <xsl:call-template name="object.id">
-             <xsl:with-param name="object" select="$cmdsyn"/>
-           </xsl:call-template>
-         </xsl:attribute>
-
-         <xsl:choose>
-           <xsl:when test="$cmdsyn/@xreflabel">
-             <xsl:call-template name="xref.xreflabel">
-               <xsl:with-param name="target" select="$cmdsyn"/>
-             </xsl:call-template>
-           </xsl:when>
-           <xsl:otherwise>
-             <xsl:apply-templates select="$cmdsyn" mode="xref-to">
-               <xsl:with-param name="target" select="$cmdsyn"/>
-             </xsl:apply-templates>
-           </xsl:otherwise>
-         </xsl:choose>
-       </a>
-       </dt>
-
-        <xsl:call-template name="process.cmdsynopsis.list">
-          <xsl:with-param name="cmdsynopses" select="$cmdsynopses"/>
-          <xsl:with-param name="count" select="$count+1"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="processing-instruction('dbfunclist')">
-  <xsl:call-template name="pi.dbfunclist"/>
-</xsl:template>
-<xsl:template name="process.funcsynopsis.list">
-  <xsl:param name="funcsynopses"/><!-- empty node list by default -->
-  <xsl:param name="count" select="1"/>
-
-  <xsl:choose>
-    <xsl:when test="$count&gt;count($funcsynopses)"/>
-    <xsl:otherwise>
-      <xsl:variable name="cmdsyn" select="$funcsynopses[$count]"/>
-
-       <dt>
-       <a>
-         <xsl:attribute name="href">
-           <xsl:text>#</xsl:text>
-           <xsl:call-template name="object.id">
-             <xsl:with-param name="object" select="$cmdsyn"/>
-           </xsl:call-template>
-         </xsl:attribute>
-
-         <xsl:choose>
-           <xsl:when test="$cmdsyn/@xreflabel">
-             <xsl:call-template name="xref.xreflabel">
-               <xsl:with-param name="target" select="$cmdsyn"/>
-             </xsl:call-template>
-           </xsl:when>
-           <xsl:otherwise>
-              <xsl:apply-templates select="$cmdsyn" mode="xref-to">
-                <xsl:with-param name="target" select="$cmdsyn"/>
-              </xsl:apply-templates>
-           </xsl:otherwise>
-         </xsl:choose>
-       </a>
-       </dt>
-
-        <xsl:call-template name="process.funcsynopsis.list">
-          <xsl:with-param name="funcsynopses" select="$funcsynopses"/>
-          <xsl:with-param name="count" select="$count+1"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="processing-instruction('dbhtml-include')">
-  <xsl:call-template name="pi.dbhtml-include"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="dbhtml-dir">
-  <xsl:param name="context" select="."/>
-  <!-- directories are now inherited from previous levels -->
-  <xsl:variable name="ppath">
-    <xsl:if test="$context/parent::*">
-      <xsl:call-template name="dbhtml-dir">
-        <xsl:with-param name="context" select="$context/parent::*"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:variable>
-  <xsl:variable name="path">
-    <xsl:call-template name="pi.dbhtml_dir">
-      <xsl:with-param name="node" select="$context"/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:choose>
-    <xsl:when test="$path = ''">
-      <xsl:if test="$ppath != ''">
-        <xsl:value-of select="$ppath"/>
-      </xsl:if>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:if test="$ppath != ''">
-        <xsl:value-of select="$ppath"/>
-        <xsl:if test="substring($ppath, string-length($ppath), 1) != '/'">
-          <xsl:text>/</xsl:text>
-        </xsl:if>
-      </xsl:if>
-      <xsl:value-of select="$path"/>
-      <xsl:text>/</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- There are two templates matching this PI in htmlhelp-common.xsl -->
-<doc:pi xmlns="" name="dbhh">
-  <refpurpose xmlns="http://www.w3.org/1999/xhtml">Sets topic name and topic id for context-sensitive HTML Help</refpurpose>
-  <refdescription xmlns="http://www.w3.org/1999/xhtml">
-    <para>Use the <tag class="xmlpi">dbhh</tag> PI as a child of components
-      that should be used as targets for context-sensitive help requests.</para>
-  </refdescription>
-  <refsynopsisdiv xmlns="http://www.w3.org/1999/xhtml">
-    <synopsis><tag class="xmlpi">dbhh topicname="<replaceable>name</replaceable>" topicid="<replaceable>id</replaceable>"</tag></synopsis>
-  </refsynopsisdiv>
-  <refparameter xmlns="http://www.w3.org/1999/xhtml">
-    <variablelist>
-      <varlistentry><term>topicname="<replaceable>name</replaceable>"</term>
-        <listitem>
-          <para>Specifies a unique string constant that identifies a help topic</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry><term>topicid="<replaceable>id</replaceable>"</term>
-        <listitem>
-          <para>Specifies a unique integer value for the <literal>topicname</literal> string</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refparameter>
-  <refsee xmlns="http://www.w3.org/1999/xhtml" role="tcg">
-    <para><link role="tcg" xlink:href="HtmlHelp.html#HHContextHelp">Context-sensitive help</link></para>
-  </refsee>
-</doc:pi>
-
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-chunk-code.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-chunk-code.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,611 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<!--This file was created automatically by xsl2profile-->
-<!--from the DocBook XSL stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns:cf="http://docbook.sourceforge.net/xmlns/chunkfast/1.0" xmlns:ng="http://docbook.org/docbook-ng" xmlns:db="http://docbook.org/ns/docbook" xmlns:exslt="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" exslt:dummy="dummy" ng:dummy="dummy" db:dummy="dummy" extension-element-prefixes="exslt" exclude-result-prefixes="exsl cf ng db exslt" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-
-<xsl:template match="*" mode="chunk-filename">
-  <!-- returns the filename of a chunk -->
-  <xsl:variable name="ischunk">
-    <xsl:call-template name="chunk"/>
-  </xsl:variable>
-
-  <xsl:variable name="fn">
-    <xsl:apply-templates select="." mode="recursive-chunk-filename"/>
-  </xsl:variable>
-
-  <!--
-  <xsl:message>
-    <xsl:value-of select="$ischunk"/>
-    <xsl:text> (</xsl:text>
-    <xsl:value-of select="local-name(.)"/>
-    <xsl:text>) </xsl:text>
-    <xsl:value-of select="$fn"/>
-    <xsl:text>, </xsl:text>
-    <xsl:call-template name="dbhtml-dir"/>
-  </xsl:message>
-  -->
-
-  <!-- 2003-11-25 by ndw:
-       The following test used to read test="$ischunk != 0 and $fn != ''"
-       I've removed the ischunk part of the test so that href.to.uri and
-       href.from.uri will be fully qualified even if the source or target
-       isn't a chunk. I *think* that if $fn != '' then it's appropriate
-       to put the directory on the front, even if the element isn't a
-       chunk. I could be wrong. -->
-
-  <xsl:if test="$fn != ''">
-    <xsl:call-template name="dbhtml-dir"/>
-  </xsl:if>
-
-  <xsl:value-of select="$fn"/>
-  <!-- You can't add the html.ext here because dbhtml filename= may already -->
-  <!-- have added it. It really does have to be handled in the recursive template -->
-</xsl:template>
-
-<xsl:template match="*" mode="recursive-chunk-filename">
-  <xsl:param name="recursive" select="false()"/>
-
-  <!-- returns the filename of a chunk -->
-  <xsl:variable name="ischunk">
-    <xsl:call-template name="chunk"/>
-  </xsl:variable>
-
-  <xsl:variable name="dbhtml-filename">
-    <xsl:call-template name="pi.dbhtml_filename"/>
-  </xsl:variable>
-
-  <xsl:variable name="filename">
-    <xsl:choose>
-      <xsl:when test="$dbhtml-filename != ''">
-        <xsl:value-of select="$dbhtml-filename"/>
-      </xsl:when>
-      <!-- if this is the root element, use the root.filename -->
-      <xsl:when test="not(parent::*) and $root.filename != ''">
-        <xsl:value-of select="$root.filename"/>
-        <xsl:value-of select="$html.ext"/>
-      </xsl:when>
-      <!-- Special case -->
-      <xsl:when test="self::legalnotice and not($generate.legalnotice.link = 0)">
-        <xsl:choose>
-          <xsl:when test="(@id or @xml:id) and not($use.id.as.filename = 0)">
-            <!-- * if this legalnotice has an ID, then go ahead and use -->
-            <!-- * just the value of that ID as the basename for the file -->
-            <!-- * (that is, without prepending an "ln-" too it) -->
-            <xsl:value-of select="(@id|@xml:id)[1]"/>
-            <xsl:value-of select="$html.ext"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <!-- * otherwise, if this legalnotice does not have an ID, -->
-            <!-- * then we generate an ID... -->
-            <xsl:variable name="id">
-              <xsl:call-template name="object.id"/>
-            </xsl:variable>
-            <!-- * ...and then we take that generated ID, prepend an -->
-            <!-- * "ln-" to it, and use that as the basename for the file -->
-            <xsl:value-of select="concat('ln-',$id,$html.ext)"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <!-- if there's no dbhtml filename, and if we're to use IDs as -->
-      <!-- filenames, then use the ID to generate the filename. -->
-      <xsl:when test="(@id or @xml:id) and $use.id.as.filename != 0">
-        <xsl:value-of select="(@id|@xml:id)[1]"/>
-        <xsl:value-of select="$html.ext"/>
-      </xsl:when>
-      <xsl:otherwise/>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$ischunk='0'">
-      <!-- if called on something that isn't a chunk, walk up... -->
-      <xsl:choose>
-        <xsl:when test="count(parent::*)&gt;0">
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="$recursive"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <!-- unless there is no up, in which case return "" -->
-        <xsl:otherwise/>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:when test="not($recursive) and $filename != ''">
-      <!-- if this chunk has an explicit name, use it -->
-      <xsl:value-of select="$filename"/>
-    </xsl:when>
-
-    <xsl:when test="self::set">
-      <xsl:value-of select="$root.filename"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::book">
-      <xsl:text>bk</xsl:text>
-      <xsl:number level="any" format="01"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::article">
-      <xsl:if test="/set">
-        <!-- in a set, make sure we inherit the right book info... -->
-        <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-          <xsl:with-param name="recursive" select="true()"/>
-        </xsl:apply-templates>
-      </xsl:if>
-
-      <xsl:text>ar</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::preface">
-      <xsl:if test="/set">
-        <!-- in a set, make sure we inherit the right book info... -->
-        <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-          <xsl:with-param name="recursive" select="true()"/>
-        </xsl:apply-templates>
-      </xsl:if>
-
-      <xsl:text>pr</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::chapter">
-      <xsl:if test="/set">
-        <!-- in a set, make sure we inherit the right book info... -->
-        <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-          <xsl:with-param name="recursive" select="true()"/>
-        </xsl:apply-templates>
-      </xsl:if>
-
-      <xsl:text>ch</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::appendix">
-      <xsl:if test="/set">
-        <!-- in a set, make sure we inherit the right book info... -->
-        <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-          <xsl:with-param name="recursive" select="true()"/>
-        </xsl:apply-templates>
-      </xsl:if>
-
-      <xsl:text>ap</xsl:text>
-      <xsl:number level="any" format="a" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::part">
-      <xsl:choose>
-        <xsl:when test="/set">
-          <!-- in a set, make sure we inherit the right book info... -->
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="true()"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-        </xsl:otherwise>
-      </xsl:choose>
-
-      <xsl:text>pt</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::reference">
-      <xsl:choose>
-        <xsl:when test="/set">
-          <!-- in a set, make sure we inherit the right book info... -->
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="true()"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-        </xsl:otherwise>
-      </xsl:choose>
-
-      <xsl:text>rn</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::refentry">
-      <xsl:choose>
-        <xsl:when test="parent::reference">
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="true()"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-        </xsl:otherwise>
-      </xsl:choose>
-
-      <xsl:text>re</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::colophon">
-      <xsl:choose>
-        <xsl:when test="/set">
-          <!-- in a set, make sure we inherit the right book info... -->
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="true()"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-        </xsl:otherwise>
-      </xsl:choose>
-
-      <xsl:text>co</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::sect1                     or self::sect2                     or self::sect3                     or self::sect4                     or self::sect5                     or self::section">
-      <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-        <xsl:with-param name="recursive" select="true()"/>
-      </xsl:apply-templates>
-      <xsl:text>s</xsl:text>
-      <xsl:number format="01"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::bibliography">
-      <xsl:choose>
-        <xsl:when test="/set">
-          <!-- in a set, make sure we inherit the right book info... -->
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="true()"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-        </xsl:otherwise>
-      </xsl:choose>
-
-      <xsl:text>bi</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::glossary">
-      <xsl:choose>
-        <xsl:when test="/set">
-          <!-- in a set, make sure we inherit the right book info... -->
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="true()"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-        </xsl:otherwise>
-      </xsl:choose>
-
-      <xsl:text>go</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::index">
-      <xsl:choose>
-        <xsl:when test="/set">
-          <!-- in a set, make sure we inherit the right book info... -->
-          <xsl:apply-templates mode="recursive-chunk-filename" select="parent::*">
-            <xsl:with-param name="recursive" select="true()"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-        </xsl:otherwise>
-      </xsl:choose>
-
-      <xsl:text>ix</xsl:text>
-      <xsl:number level="any" format="01" from="book"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:when test="self::setindex">
-      <xsl:text>si</xsl:text>
-      <xsl:number level="any" format="01" from="set"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:text>chunk-filename-error-</xsl:text>
-      <xsl:value-of select="name(.)"/>
-      <xsl:number level="any" format="01" from="set"/>
-      <xsl:if test="not($recursive)">
-        <xsl:value-of select="$html.ext"/>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-
-
-<xsl:template match="processing-instruction('dbhtml')">
-  <!-- nop -->
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-
-<xsl:template match="*" mode="find.chunks">
-  <xsl:variable name="chunk">
-    <xsl:call-template name="chunk"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$chunk != 0">
-      <cf:div id="{generate-id()}">
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:apply-templates select="*" mode="find.chunks"/>
-      </cf:div>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="*" mode="find.chunks"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xslo:include xmlns:xslo="http://www.w3.org/1999/XSL/Transform" href="../profiling/profile-mode.xsl"/><xslo:variable xmlns:xslo="http://www.w3.org/1999/XSL/Transform" name="profiled-content"><xslo:choose><xslo:when test="*/self::ng:* or */self::db:*"><xslo:message>Note: namesp. cut : stripped namespace before processing</xslo:message><xslo:variable name="stripped-content"><xslo:apply-templates select="/" mode="stripNS"/></xslo:variable><xslo:message>Note: namesp. cut : processing stripped document</xslo:message><xslo:apply-templates select="exslt:node-set($stripped-content)" mode="profile"/></xslo:when><xslo:otherwise><xslo:apply-templates select="/" mode="profile"/></xslo:otherwise></xslo:choose></xslo:variable><xslo:variable xmlns:xslo="http://www.w3.org/1999/XSL/Transform" name="profiled-nodes" select="exslt:node-set($profiled-content)"/><xsl:template match="/">
-  <!-- * Get a title for current doc so that we let the user -->
-  <!-- * know what document we are processing at this point. -->
-  <xsl:variable name="doc.title">
-    <xsl:call-template name="get.doc.title"/>
-  </xsl:variable>
-  <xsl:choose>
-    <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document,
-         toss the namespace and continue.  Use the docbook5 namespaced
-	 stylesheets for DocBook5 if you don't want to use this feature.-->
-    <!-- include extra test for Xalan quirk -->
-    <xsl:when test="false()"/>
-    <!-- Can't process unless namespace removed -->
-    <xsl:when test="false()"/>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$rootid != ''">
-          <xsl:choose>
-            <xsl:when test="count($profiled-nodes//*[@id=$rootid]) = 0">
-              <xsl:message terminate="yes">
-                <xsl:text>ID '</xsl:text>
-                <xsl:value-of select="$rootid"/>
-                <xsl:text>' not found in document.</xsl:text>
-              </xsl:message>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:if test="$collect.xref.targets = 'yes' or                             $collect.xref.targets = 'only'">
-                <xsl:apply-templates select="key('id', $rootid)" mode="collect.targets"/>
-              </xsl:if>
-              <xsl:if test="$collect.xref.targets != 'only'">
-                <xsl:apply-templates select="$profiled-nodes//*[@id=$rootid]" mode="process.root"/>
-                <xsl:if test="$tex.math.in.alt != ''">
-                  <xsl:apply-templates select="$profiled-nodes//*[@id=$rootid]" mode="collect.tex.math"/>
-                </xsl:if>
-                <xsl:if test="$generate.manifest != 0">
-                  <xsl:call-template name="generate.manifest">
-                    <xsl:with-param name="node" select="key('id',$rootid)"/>
-                  </xsl:call-template>
-                </xsl:if>
-              </xsl:if>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:if test="$collect.xref.targets = 'yes' or                         $collect.xref.targets = 'only'">
-            <xsl:apply-templates select="$profiled-nodes" mode="collect.targets"/>
-          </xsl:if>
-          <xsl:if test="$collect.xref.targets != 'only'">
-            <xsl:apply-templates select="$profiled-nodes" mode="process.root"/>
-            <xsl:if test="$tex.math.in.alt != ''">
-              <xsl:apply-templates select="$profiled-nodes" mode="collect.tex.math"/>
-            </xsl:if>
-            <xsl:if test="$generate.manifest != 0">
-              <xsl:call-template name="generate.manifest">
-                <xsl:with-param name="node" select="$profiled-nodes"/>
-              </xsl:call-template>
-            </xsl:if>
-          </xsl:if>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="process.root">
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<!-- ====================================================================== -->
-
-<xsl:template match="set|book|part|preface|chapter|appendix                      |article                      |reference|refentry                      |book/glossary|article/glossary|part/glossary                      |book/bibliography|article/bibliography|part/bibliography                      |colophon">
-  <xsl:choose>
-    <xsl:when test="$onechunk != 0 and parent::*">
-      <xsl:apply-imports/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="process-chunk-element"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="sect1|sect2|sect3|sect4|sect5|section">
-  <xsl:variable name="ischunk">
-    <xsl:call-template name="chunk"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="not(parent::*)">
-      <xsl:call-template name="process-chunk-element"/>
-    </xsl:when>
-    <xsl:when test="$ischunk = 0">
-      <xsl:apply-imports/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="process-chunk-element"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="setindex                      |book/index                      |article/index                      |part/index">
-  <!-- some implementations use completely empty index tags to indicate -->
-  <!-- where an automatically generated index should be inserted. so -->
-  <!-- if the index is completely empty, skip it. -->
-  <xsl:if test="count(*)&gt;0 or $generate.index != '0'">
-    <xsl:call-template name="process-chunk-element"/>
-  </xsl:if>
-</xsl:template>
-
-<!-- Resolve xml:base attributes -->
-<xsl:template match="@fileref">
-  <!-- need a check for absolute urls -->
-  <xsl:choose>
-    <xsl:when test="contains(., ':')">
-      <!-- it has a uri scheme so it is an absolute uri -->
-      <xsl:value-of select="."/>
-    </xsl:when>
-    <xsl:when test="$keep.relative.image.uris != 0">
-      <!-- leave it alone -->
-      <xsl:value-of select="."/>
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- its a relative uri -->
-      <xsl:call-template name="relative-uri">
-        <xsl:with-param name="destdir">
-          <xsl:call-template name="dbhtml-dir">
-            <xsl:with-param name="context" select=".."/>
-          </xsl:call-template>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-<xsl:template match="set|book|part|preface|chapter|appendix                      |article                      |reference|refentry                      |sect1|sect2|sect3|sect4|sect5                      |section                      |book/glossary|article/glossary|part/glossary                      |book/bibliography|article/bibliography|part/bibliography                      |colophon" mode="enumerate-files">
-  <xsl:variable name="ischunk"><xsl:call-template name="chunk"/></xsl:variable>
-  <xsl:if test="$ischunk='1'">
-    <xsl:call-template name="make-relative-filename">
-      <xsl:with-param name="base.dir">
-        <xsl:if test="$manifest.in.base.dir = 0">
-          <xsl:value-of select="$base.dir"/>
-        </xsl:if>
-      </xsl:with-param>
-      <xsl:with-param name="base.name">
-        <xsl:apply-templates mode="chunk-filename" select="."/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:text>
-</xsl:text>
-  </xsl:if>
-  <xsl:apply-templates select="*" mode="enumerate-files"/>
-</xsl:template>
-
-<xsl:template match="book/index|article/index|part/index" mode="enumerate-files">
-  <xsl:if test="$htmlhelp.output != 1">
-    <xsl:variable name="ischunk"><xsl:call-template name="chunk"/></xsl:variable>
-    <xsl:if test="$ischunk='1'">
-      <xsl:call-template name="make-relative-filename">
-        <xsl:with-param name="base.dir">
-          <xsl:if test="$manifest.in.base.dir = 0">
-            <xsl:value-of select="$base.dir"/>
-          </xsl:if>
-        </xsl:with-param>
-        <xsl:with-param name="base.name">
-          <xsl:apply-templates mode="chunk-filename" select="."/>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:text>
-</xsl:text>
-    </xsl:if>
-    <xsl:apply-templates select="*" mode="enumerate-files"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="enumerate-files">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-  <xsl:if test="$generate.legalnotice.link != 0">
-    <xsl:call-template name="make-relative-filename">
-      <xsl:with-param name="base.dir">
-        <xsl:if test="$manifest.in.base.dir = 0">
-          <xsl:value-of select="$base.dir"/>
-        </xsl:if>
-      </xsl:with-param>
-      <xsl:with-param name="base.name">
-        <xsl:apply-templates mode="chunk-filename" select="."/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <xsl:text>
-</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="mediaobject[imageobject] | inlinemediaobject[imageobject]" mode="enumerate-files">
-  <xsl:variable name="longdesc.uri">
-    <xsl:call-template name="longdesc.uri">
-      <xsl:with-param name="mediaobject" select="."/>
-    </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="mediaobject" select="."/>
-
-  <xsl:if test="$html.longdesc != 0 and $mediaobject/textobject[not(phrase)]">
-    <xsl:call-template name="longdesc.uri">
-      <xsl:with-param name="mediaobject" select="$mediaobject"/>
-    </xsl:call-template>
-    <xsl:text>
-</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="text()" mode="enumerate-files">
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-chunk.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-chunk.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!-- First import the non-chunking templates that format elements
-     within each chunk file. In a customization, you should
-     create a separate non-chunking customization layer such
-     as mydocbook.xsl that imports the original docbook.xsl and
-     customizes any presentation templates. Then your chunking
-     customization should import mydocbook.xsl instead of
-     docbook.xsl.  -->
-<xsl:import href="docbook.xsl"/>
-
-<!-- chunk-common.xsl contains all the named templates for chunking.
-     In a customization file, you import chunk-common.xsl, then
-     add any customized chunking templates of the same name. 
-     They will have import precedence over the original 
-     chunking templates in chunk-common.xsl. -->
-<xsl:import href="chunk-common.xsl"/>
-
-<!-- The manifest.xsl module is no longer imported because its
-     templates were moved into chunk-common and chunk-code -->
-
-<!-- chunk-code.xsl contains all the chunking templates that use
-     a match attribute.  In a customization it should be referenced
-     using <xsl:include> instead of <xsl:import>, and then add
-     any customized chunking templates with match attributes. But be sure
-     to add a priority="1" to such customized templates to resolve
-     its conflict with the original, since they have the
-     same import precedence.
-     
-     Using xsl:include prevents adding another layer
-     of import precedence, which would cause any
-     customizations that use xsl:apply-imports to wrongly
-     apply the chunking version instead of the original
-     non-chunking version to format an element.  -->
-<xsl:include href="profile-chunk-code.xsl"/>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-docbook.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-docbook.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,409 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<!--This file was created automatically by xsl2profile-->
-<!--from the DocBook XSL stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:ng="http://docbook.org/docbook-ng" xmlns:db="http://docbook.org/ns/docbook" xmlns:exsl="http://exslt.org/common" xmlns:exslt="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" exslt:dummy="dummy" ng:dummy="dummy" db:dummy="dummy" extension-element-prefixes="exslt" exclude-result-prefixes="db ng exsl exslt" version="1.0">
-
-<xsl:output method="xml" encoding="UTF-8" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:include href="../VERSION"/>
-<xsl:include href="param.xsl"/>
-<xsl:include href="../lib/lib.xsl"/>
-<xsl:include href="../common/l10n.xsl"/>
-<xsl:include href="../common/common.xsl"/>
-<xsl:include href="../common/utility.xsl"/>
-<xsl:include href="../common/labels.xsl"/>
-<xsl:include href="../common/titles.xsl"/>
-<xsl:include href="../common/subtitles.xsl"/>
-<xsl:include href="../common/gentext.xsl"/>
-<xsl:include href="../common/targets.xsl"/>
-<xsl:include href="../common/olink.xsl"/>
-<xsl:include href="../common/pi.xsl"/>
-<xsl:include href="autotoc.xsl"/>
-<xsl:include href="autoidx.xsl"/>
-<xsl:include href="lists.xsl"/>
-<xsl:include href="callout.xsl"/>
-<xsl:include href="verbatim.xsl"/>
-<xsl:include href="graphics.xsl"/>
-<xsl:include href="xref.xsl"/>
-<xsl:include href="formal.xsl"/>
-<xsl:include href="table.xsl"/>
-<xsl:include href="htmltbl.xsl"/>
-<xsl:include href="sections.xsl"/>
-<xsl:include href="inline.xsl"/>
-<xsl:include href="footnote.xsl"/>
-<xsl:include href="html.xsl"/>
-<xsl:include href="info.xsl"/>
-<xsl:include href="keywords.xsl"/>
-<xsl:include href="division.xsl"/>
-<xsl:include href="toc.xsl"/>
-<xsl:include href="index.xsl"/>
-<xsl:include href="refentry.xsl"/>
-<xsl:include href="math.xsl"/>
-<xsl:include href="admon.xsl"/>
-<xsl:include href="component.xsl"/>
-<xsl:include href="biblio.xsl"/>
-<xsl:include href="biblio-iso690.xsl"/>
-<xsl:include href="glossary.xsl"/>
-<xsl:include href="block.xsl"/>
-<xsl:include href="task.xsl"/>
-<xsl:include href="qandaset.xsl"/>
-<xsl:include href="synop.xsl"/>
-<xsl:include href="titlepage.xsl"/>
-<xsl:include href="titlepage.templates.xsl"/>
-<xsl:include href="pi.xsl"/>
-<xsl:include href="ebnf.xsl"/>
-<xsl:include href="chunker.xsl"/>
-<xsl:include href="html-rtf.xsl"/>
-<xsl:include href="annotations.xsl"/>
-<xsl:include href="../common/stripns.xsl"/>
-
-<xsl:param name="stylesheet.result.type" select="'xhtml'"/>
-<xsl:param name="htmlhelp.output" select="0"/>
-
-<!-- ==================================================================== -->
-
-<xsl:key name="id" match="*" use="@id|@xml:id"/>
-<xsl:key name="gid" match="*" use="generate-id()"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*">
-  <xsl:message>
-    <xsl:text>Element </xsl:text>
-    <xsl:value-of select="local-name(.)"/>
-    <xsl:text> in namespace '</xsl:text>
-    <xsl:value-of select="namespace-uri(.)"/>
-    <xsl:text>' encountered</xsl:text>
-    <xsl:if test="parent::*">
-      <xsl:text> in </xsl:text>
-      <xsl:value-of select="name(parent::*)"/>
-    </xsl:if>
-    <xsl:text>, but no template matches.</xsl:text>
-  </xsl:message>
-
-  <span style="color: red">
-    <xsl:text>&lt;</xsl:text>
-    <xsl:value-of select="name(.)"/>
-    <xsl:text>&gt;</xsl:text>
-    <xsl:apply-templates/>
-    <xsl:text>&lt;/</xsl:text>
-    <xsl:value-of select="name(.)"/>
-    <xsl:text>&gt;</xsl:text>
-  </span>
-</xsl:template>
-
-<xsl:template match="text()">
-  <xsl:value-of select="."/>
-</xsl:template>
-
-<xsl:template name="body.attributes">
-<!-- no apply-templates; make it empty -->
-</xsl:template>
-
-<xsl:template name="head.content">
-  <xsl:param name="node" select="."/>
-  <xsl:param name="title">
-    <xsl:apply-templates select="$node" mode="object.title.markup.textonly"/>
-  </xsl:param>
-
-  <title>
-    <xsl:copy-of select="$title"/>
-  </title>
-
-  <xsl:if test="$html.stylesheet != ''">
-    <xsl:call-template name="output.html.stylesheets">
-      <xsl:with-param name="stylesheets" select="normalize-space($html.stylesheet)"/>
-    </xsl:call-template>
-  </xsl:if>
-
-  <xsl:if test="$link.mailto.url != ''">
-    <link rev="made" href="{$link.mailto.url}"/>
-  </xsl:if>
-
-  <xsl:if test="$html.base != ''">
-    <base href="{$html.base}"/>
-  </xsl:if>
-
-  <meta name="generator" content="DocBook {$DistroTitle} V{$VERSION}"/>
-
-  <xsl:if test="$generate.meta.abstract != 0">
-    <xsl:variable name="info" select="(articleinfo                                       |bookinfo                                       |prefaceinfo                                       |chapterinfo                                       |appendixinfo                                       |sectioninfo                                       |sect1info                                       |sect2info                                       |sect3info                                       |sect4info                                       |sect5info                                       |referenceinfo                                       |refentryinfo                                       |partinfo                                       |info                                       |docinfo)[1]"/>
-    <xsl:if test="$info and $info/abstract">
-      <meta name="description">
-        <xsl:attribute name="content">
-          <xsl:for-each select="$info/abstract[1]/*">
-            <xsl:value-of select="normalize-space(.)"/>
-            <xsl:if test="position() &lt; last()">
-              <xsl:text> </xsl:text>
-            </xsl:if>
-          </xsl:for-each>
-        </xsl:attribute>
-      </meta>
-    </xsl:if>
-  </xsl:if>
-
-  <xsl:if test="($draft.mode = 'yes' or                 ($draft.mode = 'maybe' and                 ancestor-or-self::*[@status][1]/@status = 'draft'))                 and $draft.watermark.image != ''">
-    <style type="text/css"><xsl:text>
-body { background-image: url('</xsl:text>
-<xsl:value-of select="$draft.watermark.image"/><xsl:text>');
-       background-repeat: no-repeat;
-       background-position: top left;
-       /* The following properties make the watermark "fixed" on the page. */
-       /* I think that's just a bit too distracting for the reader... */
-       /* background-attachment: fixed; */
-       /* background-position: center center; */
-     }</xsl:text>
-    </style>
-  </xsl:if>
-  <xsl:apply-templates select="." mode="head.keywords.content"/>
-</xsl:template>
-
-<xsl:template name="output.html.stylesheets">
-  <xsl:param name="stylesheets" select="''"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($stylesheets, ' ')">
-      <link rel="stylesheet" href="{substring-before($stylesheets, ' ')}">
-        <xsl:if test="$html.stylesheet.type != ''">
-          <xsl:attribute name="type">
-            <xsl:value-of select="$html.stylesheet.type"/>
-          </xsl:attribute>
-        </xsl:if>
-      </link>
-      <xsl:call-template name="output.html.stylesheets">
-        <xsl:with-param name="stylesheets" select="substring-after($stylesheets, ' ')"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:when test="$stylesheets != ''">
-      <link rel="stylesheet" href="{$stylesheets}">
-        <xsl:if test="$html.stylesheet.type != ''">
-          <xsl:attribute name="type">
-            <xsl:value-of select="$html.stylesheet.type"/>
-          </xsl:attribute>
-        </xsl:if>
-      </link>
-    </xsl:when>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template match="*" mode="head.keywords.content">
-  <xsl:apply-templates select="chapterinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="appendixinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="prefaceinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="bookinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="setinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="articleinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="artheader/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="sect1info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="sect2info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="sect3info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="sect4info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="sect5info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="sectioninfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="refsect1info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="refsect2info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="refsect3info/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="bibliographyinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="glossaryinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="indexinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="refentryinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="partinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="referenceinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="docinfo/keywordset" mode="html.header"/>
-  <xsl:apply-templates select="info/keywordset" mode="html.header"/>
-
-  <xsl:if test="$inherit.keywords != 0                 and parent::*">
-    <xsl:apply-templates select="parent::*" mode="head.keywords.content"/>
-  </xsl:if>
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template name="system.head.content">
-  <xsl:param name="node" select="."/>
-
-  <!-- FIXME: When chunking, only the annotations actually used
-              in this chunk should be referenced. I don't think it
-              does any harm to reference them all, but it adds
-              unnecessary bloat to each chunk. -->
-  <xsl:if test="$annotation.support != 0 and //annotation">
-    <xsl:call-template name="add.annotation.links"/>
-    <script type="text/javascript">
-      <xsl:text>
-// Create PopupWindow objects</xsl:text>
-      <xsl:for-each select="//annotation">
-        <xsl:text>
-var popup_</xsl:text>
-        <xsl:value-of select="generate-id(.)"/>
-        <xsl:text> = new PopupWindow("popup-</xsl:text>
-        <xsl:value-of select="generate-id(.)"/>
-        <xsl:text>");
-</xsl:text>
-        <xsl:text>popup_</xsl:text>
-        <xsl:value-of select="generate-id(.)"/>
-        <xsl:text>.offsetY = 15;
-</xsl:text>
-        <xsl:text>popup_</xsl:text>
-        <xsl:value-of select="generate-id(.)"/>
-        <xsl:text>.autoHide();
-</xsl:text>
-      </xsl:for-each>
-    </script>
-
-    <style type="text/css">
-      <xsl:value-of select="$annotation.css"/>
-    </style>
-  </xsl:if>
-
-  <!-- system.head.content is like user.head.content, except that
-       it is called before head.content. This is important because it
-       means, for example, that <style> elements output by system.head.content
-       have a lower CSS precedence than the users stylesheet. -->
-</xsl:template>
-
-<!-- ============================================================ -->
-
-<xsl:template name="user.preroot">
-  <!-- Pre-root output, can be used to output comments and PIs. -->
-  <!-- This must not output any element content! -->
-</xsl:template>
-
-<xsl:template name="user.head.content">
-  <xsl:param name="node" select="."/>
-</xsl:template>
-
-<xsl:template name="user.header.navigation">
-  <xsl:param name="node" select="."/>
-</xsl:template>
-
-<xsl:template name="user.header.content">
-  <xsl:param name="node" select="."/>
-</xsl:template>
-
-<xsl:template name="user.footer.content">
-  <xsl:param name="node" select="."/>
-</xsl:template>
-
-<xsl:template name="user.footer.navigation">
-  <xsl:param name="node" select="."/>
-</xsl:template>
-
-<xslo:include xmlns:xslo="http://www.w3.org/1999/XSL/Transform" href="../profiling/profile-mode.xsl"/><xslo:variable xmlns:xslo="http://www.w3.org/1999/XSL/Transform" name="profiled-content"><xslo:choose><xslo:when test="*/self::ng:* or */self::db:*"><xslo:message>Note: namesp. cut : stripped namespace before processing</xslo:message><xslo:variable name="stripped-content"><xslo:apply-templates select="/" mode="stripNS"/></xslo:variable><xslo:message>Note: namesp. cut : processing stripped document</xslo:message><xslo:apply-templates select="exslt:node-set($stripped-content)" mode="profile"/></xslo:when><xslo:otherwise><xslo:apply-templates select="/" mode="profile"/></xslo:otherwise></xslo:choose></xslo:variable><xslo:variable xmlns:xslo="http://www.w3.org/1999/XSL/Transform" name="profiled-nodes" select="exslt:node-set($profiled-content)"/><xsl:template match="/">
-  <!-- * Get a title for current doc so that we let the user -->
-  <!-- * know what document we are processing at this point. -->
-  <xsl:variable name="doc.title">
-    <xsl:call-template name="get.doc.title"/>
-  </xsl:variable>
-  <xsl:choose>
-    <!-- Hack! If someone hands us a DocBook V5.x or DocBook NG document,
-         toss the namespace and continue.  Use the docbook5 namespaced
-         stylesheets for DocBook5 if you don't want to use this feature.-->
-    <!-- include extra test for Xalan quirk -->
-    <xsl:when test="false()"/>
-    <!-- Can't process unless namespace removed -->
-    <xsl:when test="false()"/>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$rootid != ''">
-          <xsl:choose>
-            <xsl:when test="count($profiled-nodes//*[@id=$rootid]) = 0">
-              <xsl:message terminate="yes">
-                <xsl:text>ID '</xsl:text>
-                <xsl:value-of select="$rootid"/>
-                <xsl:text>' not found in document.</xsl:text>
-              </xsl:message>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:if test="$collect.xref.targets = 'yes' or                             $collect.xref.targets = 'only'">
-                <xsl:apply-templates select="key('id', $rootid)" mode="collect.targets"/>
-              </xsl:if>
-              <xsl:if test="$collect.xref.targets != 'only'">
-                <xsl:apply-templates select="$profiled-nodes//*[@id=$rootid]" mode="process.root"/>
-                <xsl:if test="$tex.math.in.alt != ''">
-                  <xsl:apply-templates select="$profiled-nodes//*[@id=$rootid]" mode="collect.tex.math"/>
-                </xsl:if>
-              </xsl:if>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:if test="$collect.xref.targets = 'yes' or                         $collect.xref.targets = 'only'">
-            <xsl:apply-templates select="$profiled-nodes" mode="collect.targets"/>
-          </xsl:if>
-          <xsl:if test="$collect.xref.targets != 'only'">
-            <xsl:apply-templates select="$profiled-nodes" mode="process.root"/>
-            <xsl:if test="$tex.math.in.alt != ''">
-              <xsl:apply-templates select="$profiled-nodes" mode="collect.tex.math"/>
-            </xsl:if>
-          </xsl:if>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="process.root">
-  <xsl:variable name="doc" select="self::*"/>
-
-  <xsl:call-template name="user.preroot"/>
-  <xsl:call-template name="root.messages"/>
-
-  <html>
-    <head>
-      <xsl:call-template name="system.head.content">
-        <xsl:with-param name="node" select="$doc"/>
-      </xsl:call-template>
-      <xsl:call-template name="head.content">
-        <xsl:with-param name="node" select="$doc"/>
-      </xsl:call-template>
-      <xsl:call-template name="user.head.content">
-        <xsl:with-param name="node" select="$doc"/>
-      </xsl:call-template>
-    </head>
-    <body>
-      <xsl:call-template name="body.attributes"/>
-      <xsl:call-template name="user.header.content">
-        <xsl:with-param name="node" select="$doc"/>
-      </xsl:call-template>
-      <xsl:apply-templates select="."/>
-      <xsl:call-template name="user.footer.content">
-        <xsl:with-param name="node" select="$doc"/>
-      </xsl:call-template>
-    </body>
-  </html>
-  <xsl:value-of select="$html.append"/>
-</xsl:template>
-
-<xsl:template name="root.messages">
-  <!-- redefine this any way you'd like to output messages -->
-  <!-- DO NOT OUTPUT ANYTHING FROM THIS TEMPLATE -->
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="chunk">
-  <xsl:param name="node" select="."/>
-
-  <!-- The default is that we are not chunking... -->
-  <xsl:text>0</xsl:text>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-onechunk.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/profile-onechunk.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="doc">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:import href="profile-chunk.xsl"/>
-
-<!-- Ok, using the onechunk parameter makes this all work again. -->
-<!-- It does have the disadvantage that it only works for documents that have -->
-<!-- a root element that is considered a chunk by the chunk.xsl stylesheet. -->
-<!-- Ideally, onechunk would let anything be a chunk. But not today. -->
-
-<xsl:param name="onechunk" select="1"/>
-<xsl:param name="suppress.navigation">1</xsl:param>
-
-<xsl:template name="href.target.uri">
-  <xsl:param name="object" select="."/>
-  <xsl:text>#</xsl:text>
-  <xsl:call-template name="object.id">
-    <xsl:with-param name="object" select="$object"/>
-  </xsl:call-template>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/qandaset.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/qandaset.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,371 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="doc" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="qandaset">
-  <xsl:variable name="title" select="(blockinfo/title|info/title|title)[1]"/>
-  <xsl:variable name="preamble" select="*[local-name(.) != 'title'                                           and local-name(.) != 'titleabbrev'                                           and local-name(.) != 'qandadiv'                                           and local-name(.) != 'qandaentry']"/>
-  <xsl:variable name="toc">
-    <xsl:call-template name="pi.dbhtml_toc"/>
-  </xsl:variable>
-
-  <xsl:variable name="toc.params">
-    <xsl:call-template name="find.path.params">
-      <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates select="$title"/>
-    <xsl:if test="((contains($toc.params, 'toc') and $toc != '0') or $toc = '1')                   and not(ancestor::answer and not($qanda.nested.in.toc=0))">
-      <xsl:call-template name="process.qanda.toc"/>
-    </xsl:if>
-    <xsl:apply-templates select="$preamble"/>
-    <xsl:call-template name="process.qandaset"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="qandaset/blockinfo/title|                      qandaset/info/title|                      qandaset/title">
-  <xsl:variable name="qalevel">
-    <xsl:call-template name="qanda.section.level"/>
-  </xsl:variable>
-  <xsl:element name="h{string(number($qalevel)+1)}" namespace="http://www.w3.org/1999/xhtml">
-    <xsl:attribute name="class">
-      <xsl:value-of select="local-name(.)"/>
-    </xsl:attribute>
-    <xsl:call-template name="anchor">
-      <xsl:with-param name="node" select=".."/>
-      <xsl:with-param name="conditional" select="0"/>
-    </xsl:call-template>
-    <xsl:apply-templates/>
-  </xsl:element>
-</xsl:template>
-
-<xsl:template match="qandaset/blockinfo|qandaset/info">
-  <!-- what should this template really do? -->
-  <xsl:apply-templates select="legalnotice" mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="qandadiv">
-  <xsl:variable name="preamble" select="*[local-name(.) != 'title'                                           and local-name(.) != 'titleabbrev'                                           and local-name(.) != 'qandadiv'                                           and local-name(.) != 'qandaentry']"/>
-
-  <xsl:if test="blockinfo/title|info/title|title">
-    <tr class="qandadiv">
-      <td align="left" valign="top" colspan="2">
-        <xsl:apply-templates select="(blockinfo/title|info/title|title)[1]"/>
-      </td>
-    </tr>
-  </xsl:if>
-
-  <xsl:variable name="toc">
-    <xsl:call-template name="pi.dbhtml_toc"/>
-  </xsl:variable>
-
-  <xsl:variable name="toc.params">
-    <xsl:call-template name="find.path.params">
-      <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:if test="(contains($toc.params, 'toc') and $toc != '0') or $toc = '1'">
-    <tr class="toc">
-      <td align="left" valign="top" colspan="2">
-        <xsl:call-template name="process.qanda.toc"/>
-      </td>
-    </tr>
-  </xsl:if>
-  <xsl:if test="$preamble">
-    <tr class="toc">
-      <td align="left" valign="top" colspan="2">
-        <xsl:apply-templates select="$preamble"/>
-      </td>
-    </tr>
-  </xsl:if>
-  <xsl:apply-templates select="qandadiv|qandaentry"/>
-</xsl:template>
-
-<xsl:template match="qandadiv/blockinfo/title|                      qandadiv/info/title|                      qandadiv/title">
-  <xsl:variable name="qalevel">
-    <xsl:call-template name="qandadiv.section.level"/>
-  </xsl:variable>
-
-  <xsl:element name="h{string(number($qalevel)+1)}" namespace="http://www.w3.org/1999/xhtml">
-    <xsl:attribute name="class">
-      <xsl:value-of select="local-name(.)"/>
-    </xsl:attribute>
-    <xsl:call-template name="anchor">
-      <xsl:with-param name="node" select=".."/>
-      <xsl:with-param name="conditional" select="0"/>
-    </xsl:call-template>
-    <xsl:apply-templates select="parent::qandadiv" mode="label.markup"/>
-    <xsl:if test="$qandadiv.autolabel != 0">
-      <xsl:apply-templates select="." mode="intralabel.punctuation"/>
-      <xsl:text> </xsl:text>
-    </xsl:if>
-    <xsl:apply-templates/>
-  </xsl:element>
-</xsl:template>
-
-<xsl:template match="qandaentry">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="question">
-  <xsl:variable name="deflabel">
-    <xsl:choose>
-      <xsl:when test="ancestor-or-self::*[@defaultlabel]">
-        <xsl:value-of select="(ancestor-or-self::*[@defaultlabel])[last()]                               /@defaultlabel"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$qanda.defaultlabel"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <tr>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <td align="left" valign="top">
-      <xsl:call-template name="anchor">
-        <xsl:with-param name="node" select=".."/>
-        <xsl:with-param name="conditional" select="0"/>
-      </xsl:call-template>
-      <xsl:call-template name="anchor">
-        <xsl:with-param name="conditional" select="0"/>
-      </xsl:call-template>
-
-      <xsl:variable name="label.content">
-        <xsl:apply-templates select="." mode="label.markup"/>
-        <xsl:if test="$deflabel = 'number' and not(label)">
-          <xsl:apply-templates select="." mode="intralabel.punctuation"/>
-        </xsl:if>
-      </xsl:variable>
-
-      <xsl:if test="string-length($label.content) &gt; 0">
-        <p><b>
-          <xsl:copy-of select="$label.content"/>
-        </b></p>
-      </xsl:if>
-    </td>
-    <td align="left" valign="top">
-      <xsl:choose>
-        <xsl:when test="$deflabel = 'none' and not(label)">
-          <b><xsl:apply-templates select="*[local-name(.) != 'label']"/></b>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="*[local-name(.) != 'label']"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </td>
-  </tr>
-</xsl:template>
-
-<xsl:template match="answer">
-  <xsl:variable name="deflabel">
-    <xsl:choose>
-      <xsl:when test="ancestor-or-self::*[@defaultlabel]">
-        <xsl:value-of select="(ancestor-or-self::*[@defaultlabel])[last()]                               /@defaultlabel"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$qanda.defaultlabel"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <tr class="{local-name(.)}">
-    <td align="left" valign="top">
-      <xsl:call-template name="anchor"/>
-      <xsl:variable name="answer.label">
-        <xsl:apply-templates select="." mode="label.markup"/>
-      </xsl:variable>
-      <xsl:if test="string-length($answer.label) &gt; 0">
-        <p><b>
-          <xsl:copy-of select="$answer.label"/>
-        </b></p>
-      </xsl:if>
-    </td>
-    <td align="left" valign="top">
-      <xsl:apply-templates select="*[local-name(.) != 'label'         and local-name(.) != 'qandaentry']"/>
-      <!-- * handle nested answer/qandaentry instances -->
-      <!-- * (bug 1509043 from Daniel Leidert) -->
-      <xsl:if test="descendant::question">
-        <xsl:call-template name="process.qandaset"/>
-      </xsl:if>
-    </td>
-  </tr>
-</xsl:template>
-
-<xsl:template match="label">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="process.qanda.toc">
-  <!-- * if user wants nested qandaset and qandaentry in main Qandaset TOC, -->
-  <!-- * then don't also include the nested stuff in the sub TOCs -->
-  <dl>
-    <xsl:apply-templates select="qandadiv" mode="qandatoc.mode"/>
-    <xsl:apply-templates select="qandaset|qandaentry" mode="qandatoc.mode"/>
-  </dl>
-</xsl:template>
-
-<xsl:template match="qandadiv" mode="qandatoc.mode">
-  <dt><xsl:apply-templates select="title" mode="qandatoc.mode"/></dt>
-  <dd><xsl:call-template name="process.qanda.toc"/></dd>
-</xsl:template>
-
-<xsl:template match="qandadiv/blockinfo/title|                      qandadiv/info/title|                      qandadiv/title" mode="qandatoc.mode">
-  <xsl:variable name="qalevel">
-    <xsl:call-template name="qandadiv.section.level"/>
-  </xsl:variable>
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id">
-      <xsl:with-param name="object" select="parent::*"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:apply-templates select="parent::qandadiv" mode="label.markup"/>
-  <xsl:value-of select="$autotoc.label.separator"/>
-  <xsl:text> </xsl:text>
-  <a>
-    <xsl:attribute name="href">
-      <xsl:call-template name="href.target">
-        <xsl:with-param name="object" select="parent::*"/>
-      </xsl:call-template>
-    </xsl:attribute>
-    <xsl:apply-templates/>
-  </a>
-</xsl:template>
-
-<xsl:template match="qandaset" mode="qandatoc.mode">
-  <xsl:for-each select="qandaentry">
-    <xsl:apply-templates select="." mode="qandatoc.mode"/>
-  </xsl:for-each>
-</xsl:template>
-
-<xsl:template match="qandaentry" mode="qandatoc.mode">
-  <xsl:apply-templates select="question" mode="qandatoc.mode"/>
-</xsl:template>
-
-<xsl:template match="question" mode="qandatoc.mode">
-  <xsl:variable name="firstch">
-    <xsl:apply-templates select="(*[local-name(.)!='label'])[1]"/>
-  </xsl:variable>
-  <xsl:variable name="deflabel">
-    <xsl:choose>
-      <xsl:when test="ancestor-or-self::*[@defaultlabel]">
-        <xsl:value-of select="(ancestor-or-self::*[@defaultlabel])[last()]                               /@defaultlabel"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$qanda.defaultlabel"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <dt>
-    <xsl:apply-templates select="." mode="label.markup"/>
-    <xsl:if test="$deflabel = 'number' and not(label)">
-      <xsl:apply-templates select="." mode="intralabel.punctuation"/>
-    </xsl:if>
-    <xsl:text> </xsl:text>
-    <a>
-      <xsl:attribute name="href">
-        <xsl:call-template name="href.target">
-          <xsl:with-param name="object" select=".."/>
-        </xsl:call-template>
-      </xsl:attribute>
-      <xsl:value-of select="$firstch"/>
-    </a>
-  </dt>
-  <!-- * include nested qandaset/qandaentry in TOC if user wants it -->
-  <xsl:if test="not($qanda.nested.in.toc = 0)">
-    <xsl:apply-templates select="following-sibling::answer" mode="qandatoc.mode"/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="answer" mode="qandatoc.mode">
-  <xsl:if test="descendant::question">
-    <dd>
-      <xsl:call-template name="process.qanda.toc"/>
-    </dd>
-  </xsl:if>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="process.qandaset">
-
-  <xsl:variable name="label-width">
-    <xsl:call-template name="pi.dbhtml_label-width"/>
-  </xsl:variable>
-
-  <xsl:variable name="table-summary">
-    <xsl:call-template name="pi.dbhtml_table-summary"/>
-  </xsl:variable>
-
-  <xsl:variable name="cellpadding">
-    <xsl:call-template name="pi.dbhtml_cellpadding"/>
-  </xsl:variable>
-
-  <xsl:variable name="cellspacing">
-    <xsl:call-template name="pi.dbhtml_cellspacing"/>
-  </xsl:variable>
-
-  <table border="0" summary="Q and A Set">
-    <xsl:if test="$table-summary != ''">
-      <xsl:attribute name="summary">
-        <xsl:value-of select="$table-summary"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:if test="$cellpadding != ''">
-      <xsl:attribute name="cellpadding">
-        <xsl:value-of select="$cellpadding"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:if test="$cellspacing != ''">
-      <xsl:attribute name="cellspacing">
-        <xsl:value-of select="$cellspacing"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <col align="left">
-      <xsl:attribute name="width">
-        <xsl:choose>
-          <xsl:when test="$label-width != ''">
-            <xsl:value-of select="$label-width"/>
-          </xsl:when>
-          <xsl:otherwise>1%</xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-    </col>
-    <tbody>
-      <xsl:apply-templates select="qandaentry|qandadiv"/>
-    </tbody>
-  </table>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="no.wrapper.mode">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/refentry.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/refentry.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,309 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="reference">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-    <xsl:if test="$generate.id.attributes != 0">
-      <xsl:attribute name="id">
-        <xsl:call-template name="object.id"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:call-template name="reference.titlepage"/>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:if test="not(partintro) and contains($toc.params, 'toc')">
-      <xsl:call-template name="division.toc"/>
-    </xsl:if>
-    <xsl:apply-templates/>
-  </div>
-</xsl:template>
-
-<xsl:template match="reference" mode="division.number">
-  <xsl:number from="book" count="reference" format="I."/>
-</xsl:template>
-
-<xsl:template match="reference/docinfo"/>
-<xsl:template match="reference/referenceinfo"/>
-<xsl:template match="reference/title"/>
-<xsl:template match="reference/subtitle"/>
-<xsl:template match="reference/titleabbrev"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="refentry.title">
-  <xsl:param name="node" select="."/>
-  <xsl:variable name="refmeta" select="$node//refmeta"/>
-  <xsl:variable name="refentrytitle" select="$refmeta//refentrytitle"/>
-  <xsl:variable name="refnamediv" select="$node//refnamediv"/>
-  <xsl:variable name="refname" select="$refnamediv//refname"/>
-  <xsl:variable name="refdesc" select="$refnamediv//refdescriptor"/>
-  <xsl:variable name="title">
-    <xsl:choose>
-      <xsl:when test="$refentrytitle">
-        <xsl:apply-templates select="$refentrytitle[1]" mode="title"/>
-      </xsl:when>
-      <xsl:when test="$refdesc">
-	<xsl:apply-templates select="$refdesc[1]" mode="title"/>
-      </xsl:when>
-      <xsl:when test="$refname">
-        <xsl:apply-templates select="$refname[1]" mode="title"/>
-      </xsl:when>
-      <xsl:otherwise/>
-    </xsl:choose>
-  </xsl:variable>
-
-  <h1 class="title">
-    <xsl:copy-of select="$title"/>
-  </h1>
-</xsl:template>
-
-<xsl:template match="refentry">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-    <xsl:if test="$refentry.separator != 0 and preceding-sibling::refentry">
-      <div class="refentry.separator">
-        <hr/>
-      </div>
-    </xsl:if>
-    <xsl:call-template name="anchor">
-      <xsl:with-param name="conditional" select="0"/>
-    </xsl:call-template>
-    <xsl:call-template name="refentry.titlepage"/>
-    <xsl:apply-templates/>
-    <xsl:call-template name="process.footnotes"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="refentry/docinfo|refentry/refentryinfo"/>
-<xsl:template match="refentry/info"/>
-
-<xsl:template match="refentrytitle|refname|refdescriptor" mode="title">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="refmeta">
-</xsl:template>
-
-<xsl:template match="manvolnum">
-  <xsl:if test="$refentry.xref.manvolnum != 0">
-    <xsl:text>(</xsl:text>
-    <xsl:apply-templates/>
-    <xsl:text>)</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="refmiscinfo">
-</xsl:template>
-
-<xsl:template match="refentrytitle">
-  <xsl:call-template name="inline.charseq"/>
-</xsl:template>
-
-<xsl:template match="refnamediv">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="anchor"/>
-
-    <xsl:choose>
-      <xsl:when test="preceding-sibling::refnamediv">
-	<!-- no title on secondary refnamedivs! -->
-      </xsl:when>
-      <xsl:when test="$refentry.generate.name != 0">
-        <h2>
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'RefName'"/>
-          </xsl:call-template>
-        </h2>
-      </xsl:when>
-      <xsl:when test="$refentry.generate.title != 0">
-        <h2>
-          <xsl:choose>
-            <xsl:when test="../refmeta/refentrytitle">
-              <xsl:apply-templates select="../refmeta/refentrytitle"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates select="refname[1]"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </h2>
-      </xsl:when>
-    </xsl:choose>
-
-    <p>
-      <xsl:apply-templates/>
-    </p>
-  </div>
-</xsl:template>
-
-<xsl:template match="refname">
-  <xsl:if test="not(preceding-sibling::refdescriptor)">
-    <xsl:apply-templates/>
-    <xsl:if test="following-sibling::refname">
-      <xsl:text>, </xsl:text>
-    </xsl:if>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="refpurpose">
-  <xsl:if test="node()">
-    <xsl:text> </xsl:text>
-    <xsl:call-template name="dingbat">
-      <xsl:with-param name="dingbat">em-dash</xsl:with-param>
-    </xsl:call-template>
-    <xsl:text> </xsl:text>
-    <xsl:apply-templates/>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="refdescriptor">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="refclass">
-  <xsl:if test="$refclass.suppress = 0">
-  <p>
-    <b>
-      <xsl:if test="@role">
-        <xsl:value-of select="@role"/>
-        <xsl:text>: </xsl:text>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </b>
-  </p>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="refsynopsisdiv">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="anchor"/>
-    <h2>
-      <xsl:choose>
-        <xsl:when test="refsynopsisdiv/title|title">
-          <xsl:apply-templates select="(refsynopsisdiv/title|title)[1]" mode="titlepage.mode"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'RefSynopsisDiv'"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </h2>
-    <xsl:apply-templates/>
-  </div>
-</xsl:template>
-
-<xsl:template match="refsynopsisdivinfo"/>
-
-<xsl:template match="refsynopsisdiv/title">
-</xsl:template>
-
-<xsl:template match="refsynopsisdiv/title" mode="titlepage.mode">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="refsection|refsect1|refsect2|refsect3">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-    <xsl:call-template name="anchor">
-      <xsl:with-param name="conditional" select="0"/>
-    </xsl:call-template>
-    <!-- pick up info title -->
-    <xsl:apply-templates select="(title|info/title)[1]"/>
-    <xsl:apply-templates select="node()[not(self::title) and not(self::info)]"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="refsection/title|refsection/info/title">
-  <!-- the ID is output in the block.object call for refsect1 -->
-  <xsl:variable name="level" select="count(ancestor-or-self::refsection)"/>
-  <xsl:variable name="refsynopsisdiv">
-    <xsl:text>0</xsl:text>
-    <xsl:if test="ancestor::refsynopsisdiv">1</xsl:if>
-  </xsl:variable>
-  <xsl:variable name="hlevel">
-    <xsl:choose>
-      <xsl:when test="$level+$refsynopsisdiv &gt; 5">6</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$level+1+$refsynopsisdiv"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:element name="h{$hlevel}" namespace="http://www.w3.org/1999/xhtml">
-    <xsl:apply-templates/>
-  </xsl:element>
-</xsl:template>
-
-<xsl:template match="refsect1/title|refsect1/info/title">
-  <!-- the ID is output in the block.object call for refsect1 -->
-  <h2>
-    <xsl:apply-templates/>
-  </h2>
-</xsl:template>
-
-<xsl:template match="refsect2/title|refsect2/info/title">
-  <!-- the ID is output in the block.object call for refsect2 -->
-  <h3>
-    <xsl:apply-templates/>
-  </h3>
-</xsl:template>
-
-<xsl:template match="refsect3/title|refsect3/info/title">
-  <!-- the ID is output in the block.object call for refsect3 -->
-  <h4>
-    <xsl:apply-templates/>
-  </h4>
-</xsl:template>
-
-<xsl:template match="refsectioninfo|refsection/info"/>
-<xsl:template match="refsect1info|refsect1/info"/>
-<xsl:template match="refsect2info|refsect2/info"/>
-<xsl:template match="refsect3info|refsect3/info"/>
-
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/sections.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/sections.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,548 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="section">
-  <xsl:variable name="depth" select="count(ancestor::section)+1"/>
-
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-    <xsl:call-template name="section.titlepage"/>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:if test="contains($toc.params, 'toc')                   and $depth &lt;= $generate.section.toc.level">
-      <xsl:call-template name="section.toc">
-        <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
-      </xsl:call-template>
-      <xsl:call-template name="section.toc.separator"/>
-    </xsl:if>
-    <xsl:apply-templates/>
-    <xsl:call-template name="process.chunk.footnotes"/>
-  </div>
-</xsl:template>
-
-<xsl:template name="section.title">
-  <!-- the context node should be the title of a section when called -->
-  <xsl:variable name="section" select="(ancestor::section                                         |ancestor::simplesect                                         |ancestor::sect1                                         |ancestor::sect2                                         |ancestor::sect3                                         |ancestor::sect4                                         |ancestor::sect5)[last()]"/>
-
-  <xsl:variable name="renderas">
-    <xsl:choose>
-      <xsl:when test="$section/@renderas = 'sect1'">1</xsl:when>
-      <xsl:when test="$section/@renderas = 'sect2'">2</xsl:when>
-      <xsl:when test="$section/@renderas = 'sect3'">3</xsl:when>
-      <xsl:when test="$section/@renderas = 'sect4'">4</xsl:when>
-      <xsl:when test="$section/@renderas = 'sect5'">5</xsl:when>
-      <xsl:otherwise><xsl:value-of select="''"/></xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="level">
-    <xsl:choose>
-      <xsl:when test="$renderas != ''">
-        <xsl:value-of select="$renderas"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="section.level">
-          <xsl:with-param name="node" select="$section"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:call-template name="section.heading">
-    <xsl:with-param name="section" select="$section"/>
-    <xsl:with-param name="level" select="$level"/>
-    <xsl:with-param name="title">
-      <xsl:apply-templates select="$section" mode="object.title.markup">
-        <xsl:with-param name="allow-anchors" select="1"/>
-      </xsl:apply-templates>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="section/title                     |section/info/title                     |sectioninfo/title" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="section.title"/>
-</xsl:template>
-
-<xsl:template match="sect1">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-
-    <xsl:choose>
-      <xsl:when test="@renderas = 'sect2'">
-        <xsl:call-template name="sect2.titlepage"/>
-      </xsl:when>
-      <xsl:when test="@renderas = 'sect3'">
-        <xsl:call-template name="sect3.titlepage"/>
-      </xsl:when>
-      <xsl:when test="@renderas = 'sect4'">
-        <xsl:call-template name="sect4.titlepage"/>
-      </xsl:when>
-      <xsl:when test="@renderas = 'sect5'">
-        <xsl:call-template name="sect5.titlepage"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="sect1.titlepage"/>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:if test="contains($toc.params, 'toc')                   and $generate.section.toc.level &gt;= 1">
-      <xsl:call-template name="section.toc">
-        <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
-      </xsl:call-template>
-      <xsl:call-template name="section.toc.separator"/>
-    </xsl:if>
-    <xsl:apply-templates/>
-    <xsl:call-template name="process.chunk.footnotes"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="sect1/title                     |sect1/info/title                     |sect1info/title" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="section.title"/>
-</xsl:template>
-
-<xsl:template match="sect2">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-
-    <xsl:choose>
-      <xsl:when test="@renderas = 'sect1'">
-        <xsl:call-template name="sect1.titlepage"/>
-      </xsl:when>
-      <xsl:when test="@renderas = 'sect3'">
-        <xsl:call-template name="sect3.titlepage"/>
-      </xsl:when>
-      <xsl:when test="@renderas = 'sect4'">
-        <xsl:call-template name="sect4.titlepage"/>
-      </xsl:when>
-      <xsl:when test="@renderas = 'sect5'">
-        <xsl:call-template name="sect5.titlepage"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="sect2.titlepage"/>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:if test="contains($toc.params, 'toc')                   and $generate.section.toc.level &gt;= 2">
-      <xsl:call-template name="section.toc">
-        <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
-      </xsl:call-template>
-      <xsl:call-template name="section.toc.separator"/>
-    </xsl:if>
-    <xsl:apply-templates/>
-    <xsl:call-template name="process.chunk.footnotes"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="sect2/title                     |sect2/info/title                     |sect2info/title" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="section.title"/>
-</xsl:template>
-
-<xsl:template match="sect3">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-
-    <xsl:choose>
-      <xsl:when test="@renderas = 'sect1'">
-        <xsl:call-template name="sect1.titlepage"/>
-      </xsl:when>
-      <xsl:when test="@renderas = 'sect2'">
-        <xsl:call-template name="sect2.titlepage"/>
-      </xsl:when>
-      <xsl:when test="@renderas = 'sect4'">
-        <xsl:call-template name="sect4.titlepage"/>
-      </xsl:when>
-      <xsl:when test="@renderas = 'sect5'">
-        <xsl:call-template name="sect5.titlepage"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="sect3.titlepage"/>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:if test="contains($toc.params, 'toc')                   and $generate.section.toc.level &gt;= 3">
-      <xsl:call-template name="section.toc">
-        <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
-      </xsl:call-template>
-      <xsl:call-template name="section.toc.separator"/>
-    </xsl:if>
-    <xsl:apply-templates/>
-    <xsl:call-template name="process.chunk.footnotes"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="sect3/title                     |sect3/info/title                     |sect3info/title" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="section.title"/>
-</xsl:template>
-
-<xsl:template match="sect4">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-
-    <xsl:choose>
-      <xsl:when test="@renderas = 'sect1'">
-        <xsl:call-template name="sect1.titlepage"/>
-      </xsl:when>
-      <xsl:when test="@renderas = 'sect2'">
-        <xsl:call-template name="sect2.titlepage"/>
-      </xsl:when>
-      <xsl:when test="@renderas = 'sect3'">
-        <xsl:call-template name="sect3.titlepage"/>
-      </xsl:when>
-      <xsl:when test="@renderas = 'sect5'">
-        <xsl:call-template name="sect5.titlepage"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="sect4.titlepage"/>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:if test="contains($toc.params, 'toc')                   and $generate.section.toc.level &gt;= 4">
-      <xsl:call-template name="section.toc">
-        <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
-      </xsl:call-template>
-      <xsl:call-template name="section.toc.separator"/>
-    </xsl:if>
-    <xsl:apply-templates/>
-    <xsl:call-template name="process.chunk.footnotes"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="sect4/title                     |sect4/info/title                     |sect4info/title" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="section.title"/>
-</xsl:template>
-
-<xsl:template match="sect5">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-
-    <xsl:choose>
-      <xsl:when test="@renderas = 'sect1'">
-        <xsl:call-template name="sect1.titlepage"/>
-      </xsl:when>
-      <xsl:when test="@renderas = 'sect2'">
-        <xsl:call-template name="sect2.titlepage"/>
-      </xsl:when>
-      <xsl:when test="@renderas = 'sect3'">
-        <xsl:call-template name="sect3.titlepage"/>
-      </xsl:when>
-      <xsl:when test="@renderas = 'sect4'">
-        <xsl:call-template name="sect4.titlepage"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="sect5.titlepage"/>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:variable name="toc.params">
-      <xsl:call-template name="find.path.params">
-        <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:if test="contains($toc.params, 'toc')                   and $generate.section.toc.level &gt;= 5">
-      <xsl:call-template name="section.toc">
-        <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
-      </xsl:call-template>
-      <xsl:call-template name="section.toc.separator"/>
-    </xsl:if>
-    <xsl:apply-templates/>
-    <xsl:call-template name="process.chunk.footnotes"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="sect5/title                     |sect5/info/title                     |sect5info/title" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="section.title"/>
-</xsl:template>
-
-<xsl:template match="simplesect">
-  <xsl:call-template name="id.warning"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="dir">
-      <xsl:with-param name="inherit" select="1"/>
-    </xsl:call-template>
-    <xsl:call-template name="language.attribute"/>
-    <xsl:call-template name="simplesect.titlepage"/>
-    <xsl:apply-templates/>
-  </div>
-</xsl:template>
-
-<xsl:template match="simplesect/title|simplesect/info/title" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="section.title"/>
-</xsl:template>
-
-<xsl:template match="section/title"/>
-<xsl:template match="section/titleabbrev"/>
-<xsl:template match="section/subtitle"/>
-<xsl:template match="sectioninfo"/>
-<xsl:template match="section/info"/>
-
-<xsl:template match="sect1/title"/>
-<xsl:template match="sect1/titleabbrev"/>
-<xsl:template match="sect1/subtitle"/>
-<xsl:template match="sect1info"/>
-<xsl:template match="sect1/info"/>
-
-<xsl:template match="sect2/title"/>
-<xsl:template match="sect2/subtitle"/>
-<xsl:template match="sect2/titleabbrev"/>
-<xsl:template match="sect2info"/>
-<xsl:template match="sect2/info"/>
-
-<xsl:template match="sect3/title"/>
-<xsl:template match="sect3/subtitle"/>
-<xsl:template match="sect3/titleabbrev"/>
-<xsl:template match="sect3info"/>
-<xsl:template match="sect3/info"/>
-
-<xsl:template match="sect4/title"/>
-<xsl:template match="sect4/subtitle"/>
-<xsl:template match="sect4/titleabbrev"/>
-<xsl:template match="sect4info"/>
-<xsl:template match="sect4/info"/>
-
-<xsl:template match="sect5/title"/>
-<xsl:template match="sect5/subtitle"/>
-<xsl:template match="sect5/titleabbrev"/>
-<xsl:template match="sect5info"/>
-<xsl:template match="sect5/info"/>
-
-<xsl:template match="simplesect/title"/>
-<xsl:template match="simplesect/subtitle"/>
-<xsl:template match="simplesect/titleabbrev"/>
-<xsl:template match="simplesect/info"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="section.heading">
-  <xsl:param name="section" select="."/>
-  <xsl:param name="level" select="1"/>
-  <xsl:param name="allow-anchors" select="1"/>
-  <xsl:param name="title"/>
-  <xsl:param name="class" select="'title'"/>
-
-  <xsl:variable name="id">
-    <xsl:choose>
-      <!-- if title is in an *info wrapper, get the grandparent -->
-      <xsl:when test="contains(local-name(..), 'info')">
-        <xsl:call-template name="object.id">
-          <xsl:with-param name="object" select="../.."/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="object.id">
-          <xsl:with-param name="object" select=".."/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <!-- HTML H level is one higher than section level -->
-  <xsl:variable name="hlevel">
-    <xsl:choose>
-      <!-- highest valid HTML H level is H6; so anything nested deeper
-           than 5 levels down just becomes H6 -->
-      <xsl:when test="$level &gt; 5">6</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$level + 1"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-  <xsl:element name="h{$hlevel}" namespace="http://www.w3.org/1999/xhtml">
-    <xsl:attribute name="class"><xsl:value-of select="$class"/></xsl:attribute>
-    <xsl:if test="$css.decoration != '0'">
-      <xsl:if test="$hlevel&lt;3">
-        <xsl:attribute name="style">clear: both</xsl:attribute>
-      </xsl:if>
-    </xsl:if>
-    <xsl:if test="$allow-anchors != 0 and $generate.id.attributes = 0">
-      <xsl:call-template name="anchor">
-        <xsl:with-param name="node" select="$section"/>
-        <xsl:with-param name="conditional" select="0"/>
-      </xsl:call-template>
-    </xsl:if>
-    <xsl:if test="$generate.id.attributes != 0 and not(local-name(.) = 'appendix')">
-      <xsl:attribute name="id"><xsl:value-of select="$id"/></xsl:attribute>
-    </xsl:if>
-    <xsl:copy-of select="$title"/>
-  </xsl:element>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="bridgehead">
-  <xsl:variable name="container" select="(ancestor::appendix                         |ancestor::article                         |ancestor::bibliography                         |ancestor::chapter                         |ancestor::glossary                         |ancestor::glossdiv                         |ancestor::index                         |ancestor::partintro                         |ancestor::preface                         |ancestor::refsect1                         |ancestor::refsect2                         |ancestor::refsect3                         |ancestor::sect1                         |ancestor::sect2                         |ancestor::sect3                         |ancestor::sect4                         |ancestor::sect5                         |ancestor::section                         |ancestor::setindex                         |ancestor::simplesect)[last()]"/>
-
-  <xsl:variable name="clevel">
-    <xsl:choose>
-      <xsl:when test="local-name($container) = 'appendix'                       or local-name($container) = 'chapter'                       or local-name($container) = 'article'                       or local-name($container) = 'bibliography'                       or local-name($container) = 'glossary'                       or local-name($container) = 'index'                       or local-name($container) = 'partintro'                       or local-name($container) = 'preface'                       or local-name($container) = 'setindex'">1</xsl:when>
-      <xsl:when test="local-name($container) = 'glossdiv'">
-        <xsl:value-of select="count(ancestor::glossdiv)+1"/>
-      </xsl:when>
-      <xsl:when test="local-name($container) = 'sect1'                       or local-name($container) = 'sect2'                       or local-name($container) = 'sect3'                       or local-name($container) = 'sect4'                       or local-name($container) = 'sect5'                       or local-name($container) = 'refsect1'                       or local-name($container) = 'refsect2'                       or local-name($container) = 'refsect3'                       or local-name($container) = 'section'                       or local-name($container) = 'simplesect'">
-        <xsl:variable name="slevel">
-          <xsl:call-template name="section.level">
-            <xsl:with-param name="node" select="$container"/>
-          </xsl:call-template>
-        </xsl:variable>
-        <xsl:value-of select="$slevel + 1"/>
-      </xsl:when>
-      <xsl:otherwise>1</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <!-- HTML H level is one higher than section level -->
-  <xsl:variable name="hlevel">
-    <xsl:choose>
-      <xsl:when test="@renderas = 'sect1'">2</xsl:when>
-      <xsl:when test="@renderas = 'sect2'">3</xsl:when>
-      <xsl:when test="@renderas = 'sect3'">4</xsl:when>
-      <xsl:when test="@renderas = 'sect4'">5</xsl:when>
-      <xsl:when test="@renderas = 'sect5'">6</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$clevel + 1"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:element name="h{$hlevel}" namespace="http://www.w3.org/1999/xhtml">
-    <xsl:call-template name="anchor">
-      <xsl:with-param name="conditional" select="0"/>
-    </xsl:call-template>
-    <xsl:apply-templates/>
-  </xsl:element>
-</xsl:template>
-
-<xsl:template match="section/subtitle" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="section.subtitle"/>
-</xsl:template>
-
-<xsl:template match="simplesect/subtitle" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="section.subtitle"/>
-</xsl:template>
-
-<xsl:template match="sect1/subtitle" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="section.subtitle"/>
-</xsl:template>
-
-<xsl:template match="sect2/subtitle" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="section.subtitle"/>
-</xsl:template>
-
-<xsl:template match="sect3/subtitle" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="section.subtitle"/>
-</xsl:template>
-
-<xsl:template match="sect4/subtitle" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="section.subtitle"/>
-</xsl:template>
-
-<xsl:template match="sect5/subtitle" mode="titlepage.mode" priority="2">
-  <xsl:call-template name="section.subtitle"/>
-</xsl:template>
-
-<xsl:template name="section.subtitle">
-  <!-- the context node should be the subtitle of a section when called -->
-  <xsl:variable name="section" select="(ancestor::section                                         |ancestor::simplesect                                         |ancestor::sect1                                         |ancestor::sect2                                         |ancestor::sect3                                         |ancestor::sect4                                         |ancestor::sect5)[last()]"/>
-
-  <xsl:variable name="level">
-    <xsl:call-template name="section.level">
-      <xsl:with-param name="node" select="$section"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:call-template name="section.heading">
-    <xsl:with-param name="section" select=".."/>
-    <xsl:with-param name="allow-anchors" select="0"/>
-    <!-- subtitle heading level one higher than section level -->
-    <xsl:with-param name="level" select="$level + 1"/>
-    <xsl:with-param name="class" select="'subtitle'"/>
-    <xsl:with-param name="title">
-      <xsl:apply-templates select="$section" mode="object.subtitle.markup">
-        <xsl:with-param name="allow-anchors" select="0"/>
-      </xsl:apply-templates>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/synop.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/synop.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,1551 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<!-- synopsis is in verbatim -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="cmdsynopsis">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <p>
-      <xsl:if test="..//processing-instruction('dbcmdlist')">
-        <!-- * Placing a dbcmdlist PI as a child of a particular element -->
-        <!-- * creates a hyperlinked list of all cmdsynopsis instances -->
-        <!-- * that are descendants of that element; so for any -->
-        <!-- * cmdsynopsis that is a descendant of an element containing -->
-        <!-- * a dbcmdlist PI, we need to output an a@id instance so that -->
-        <!-- * we will have something to link to -->
-        <xsl:call-template name="anchor">
-          <xsl:with-param name="conditional" select="0"/>
-        </xsl:call-template>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </p>
-  </div>
-</xsl:template>
-
-<xsl:template match="cmdsynopsis/command">
-  <br/>
-  <xsl:call-template name="inline.monoseq"/>
-  <xsl:text> </xsl:text>
-</xsl:template>
-
-<xsl:template match="cmdsynopsis/command[1]" priority="2">
-  <xsl:call-template name="inline.monoseq"/>
-  <xsl:text> </xsl:text>
-</xsl:template>
-
-<xsl:template match="group|arg" name="group-or-arg">
-  <xsl:variable name="choice" select="@choice"/>
-  <xsl:variable name="rep" select="@rep"/>
-  <xsl:variable name="sepchar">
-    <xsl:choose>
-      <xsl:when test="ancestor-or-self::*/@sepchar">
-        <xsl:value-of select="ancestor-or-self::*/@sepchar"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:text> </xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:if test="preceding-sibling::*">
-    <xsl:value-of select="$sepchar"/>
-  </xsl:if>
-  <xsl:choose>
-    <xsl:when test="$choice='plain'">
-      <xsl:value-of select="$arg.choice.plain.open.str"/>
-    </xsl:when>
-    <xsl:when test="$choice='req'">
-      <xsl:value-of select="$arg.choice.req.open.str"/>
-    </xsl:when>
-    <xsl:when test="$choice='opt'">
-      <xsl:value-of select="$arg.choice.opt.open.str"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$arg.choice.def.open.str"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:apply-templates/>
-  <xsl:choose>
-    <xsl:when test="$rep='repeat'">
-      <xsl:value-of select="$arg.rep.repeat.str"/>
-    </xsl:when>
-    <xsl:when test="$rep='norepeat'">
-      <xsl:value-of select="$arg.rep.norepeat.str"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$arg.rep.def.str"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:choose>
-    <xsl:when test="$choice='plain'">
-      <xsl:value-of select="$arg.choice.plain.close.str"/>
-    </xsl:when>
-    <xsl:when test="$choice='req'">
-      <xsl:value-of select="$arg.choice.req.close.str"/>
-    </xsl:when>
-    <xsl:when test="$choice='opt'">
-      <xsl:value-of select="$arg.choice.opt.close.str"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$arg.choice.def.close.str"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="group/arg">
-  <xsl:variable name="choice" select="@choice"/>
-  <xsl:variable name="rep" select="@rep"/>
-  <xsl:if test="preceding-sibling::*">
-    <xsl:value-of select="$arg.or.sep"/>
-  </xsl:if>
-  <xsl:call-template name="group-or-arg"/>
-</xsl:template>
-
-<xsl:template match="sbr">
-  <br/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="synopfragmentref">
-  <xsl:variable name="target" select="key('id',@linkend)"/>
-  <xsl:variable name="snum">
-    <xsl:apply-templates select="$target" mode="synopfragment.number"/>
-  </xsl:variable>
-  <i>
-    <a href="#{@linkend}">
-      <xsl:text>(</xsl:text>
-      <xsl:value-of select="$snum"/>
-      <xsl:text>)</xsl:text>
-    </a>
-    <xsl:text>&#160;</xsl:text>
-    <xsl:apply-templates/>
-  </i>
-</xsl:template>
-
-<xsl:template match="synopfragment" mode="synopfragment.number">
-  <xsl:number format="1"/>
-</xsl:template>
-
-<xsl:template match="synopfragment">
-  <xsl:variable name="snum">
-    <xsl:apply-templates select="." mode="synopfragment.number"/>
-  </xsl:variable>
-  <p>
-    <xsl:variable name="id">
-      <xsl:call-template name="object.id"/>
-    </xsl:variable>
-    <a id="{$id}">
-      <xsl:text>(</xsl:text>
-      <xsl:value-of select="$snum"/>
-      <xsl:text>)</xsl:text>
-    </a>
-    <xsl:text> </xsl:text>
-    <xsl:apply-templates/>
-  </p>
-</xsl:template>
-
-<xsl:template match="funcsynopsis">
-  <xsl:if test="..//processing-instruction('dbfunclist')">
-    <!-- * Placing a dbfunclist PI as a child of a particular element -->
-    <!-- * creates a hyperlinked list of all funcsynopsis instances that -->
-    <!-- * are descendants of that element; so for any funcsynopsis that is -->
-    <!-- * a descendant of an element containing a dbfunclist PI, we need -->
-    <!-- * to output an a@id instance so that we will have something to -->
-    <!-- * link to -->
-    <xsl:call-template name="anchor">
-      <xsl:with-param name="conditional" select="0"/>
-    </xsl:call-template>
-  </xsl:if>
-  <xsl:call-template name="informal.object"/>
-</xsl:template>
-
-<xsl:template match="funcsynopsisinfo">
-  <pre>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates/>
-  </pre>
-</xsl:template>
-
-<!-- ====================================================================== -->
-<!-- funcprototype -->
-<!--
-
-funcprototype ::= (funcdef,
-                   (void|varargs|paramdef+))
-
-funcdef       ::= (#PCDATA|type|replaceable|function)*
-
-paramdef      ::= (#PCDATA|type|replaceable|parameter|funcparams)*
--->
-
-<xsl:template match="funcprototype">
-  <xsl:variable name="html-style">
-    <xsl:call-template name="pi.dbhtml_funcsynopsis-style">
-      <xsl:with-param name="node" select="ancestor::funcsynopsis/descendant-or-self::*"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="style">
-    <xsl:choose>
-      <xsl:when test="$html-style != ''">
-        <xsl:value-of select="$html-style"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$funcsynopsis.style"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-<!--
-  <xsl:variable name="tabular-p"
-                select="$funcsynopsis.tabular.threshold &gt; 0
-                        and string-length(.) &gt; $funcsynopsis.tabular.threshold"/>
--->
-
-  <xsl:variable name="tabular-p" select="true()"/>
-
-  <xsl:choose>
-    <xsl:when test="$style = 'kr' and $tabular-p">
-      <xsl:apply-templates select="." mode="kr-tabular"/>
-    </xsl:when>
-    <xsl:when test="$style = 'kr'">
-      <xsl:apply-templates select="." mode="kr-nontabular"/>
-    </xsl:when>
-    <xsl:when test="$style = 'ansi' and $tabular-p">
-      <xsl:apply-templates select="." mode="ansi-tabular"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="." mode="ansi-nontabular"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ====================================================================== -->
-<!-- funcprototype: kr, non-tabular -->
-
-<xsl:template match="funcprototype" mode="kr-nontabular">
-  <p>
-    <xsl:apply-templates mode="kr-nontabular"/>
-    <xsl:if test="paramdef">
-      <br/>
-      <xsl:apply-templates select="paramdef" mode="kr-funcsynopsis-mode"/>
-    </xsl:if>
-  </p>
-</xsl:template>
-
-<xsl:template match="funcdef" mode="kr-nontabular">
-  <code>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="kr-nontabular"/>
-    <xsl:text>(</xsl:text>
-  </code>
-</xsl:template>
-
-<xsl:template match="funcdef/function" mode="kr-nontabular">
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.decoration != 0">
-      <b class="fsfunc"><xsl:apply-templates mode="kr-nontabular"/></b>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="kr-nontabular"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="void" mode="kr-nontabular">
-  <code>)</code>
-  <xsl:text>;</xsl:text>
-</xsl:template>
-
-<xsl:template match="varargs" mode="kr-nontabular">
-  <xsl:text>...</xsl:text>
-  <code>)</code>
-  <xsl:text>;</xsl:text>
-</xsl:template>
-
-<xsl:template match="paramdef" mode="kr-nontabular">
-  <xsl:apply-templates select="parameter" mode="kr-nontabular"/>
-  <xsl:choose>
-    <xsl:when test="following-sibling::*">
-      <xsl:text>, </xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <code>)</code>
-      <xsl:text>;</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="paramdef/parameter" mode="kr-nontabular">
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.decoration != 0">
-      <var class="pdparam">
-        <xsl:apply-templates mode="kr-nontabular"/>
-      </var>
-    </xsl:when>
-    <xsl:otherwise>
-      <code>
-	<xsl:apply-templates mode="kr-nontabular"/>
-      </code>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="paramdef" mode="kr-funcsynopsis-mode">
-  <xsl:if test="preceding-sibling::paramdef"><br/></xsl:if>
-  <code>
-    <xsl:apply-templates mode="kr-funcsynopsis-mode"/>
-  </code>
-  <xsl:text>;</xsl:text>
-</xsl:template>
-
-<xsl:template match="paramdef/parameter" mode="kr-funcsynopsis-mode">
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.decoration != 0">
-      <var class="pdparam">
-        <xsl:apply-templates mode="kr-funcsynopsis-mode"/>
-      </var>
-    </xsl:when>
-    <xsl:otherwise>
-      <code>
-	<xsl:apply-templates mode="kr-funcsynopsis-mode"/>
-      </code>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="funcparams" mode="kr-funcsynopsis-mode">
-  <code>(</code>
-  <xsl:apply-templates mode="kr-funcsynopsis-mode"/>
-  <code>)</code>
-</xsl:template>
-
-<!-- ====================================================================== -->
-<!-- funcprototype: kr, tabular -->
-
-<xsl:template match="funcprototype" mode="kr-tabular">
-  <table border="0" summary="Function synopsis" cellspacing="0" cellpadding="0" style="padding-bottom: 1em">
-    <tr>
-      <td>
-        <xsl:apply-templates select="funcdef" mode="kr-tabular"/>
-      </td>
-      <xsl:apply-templates select="(void|varargs|paramdef)[1]" mode="kr-tabular"/>
-    </tr>
-    <xsl:for-each select="(void|varargs|paramdef)[preceding-sibling::*[not(self::funcdef)]]">
-      <tr>
-        <td>&#160;</td>
-        <xsl:apply-templates select="." mode="kr-tabular"/>
-      </tr>
-    </xsl:for-each>
-  </table>
-  <xsl:if test="paramdef">
-    <table border="0" summary="Function argument synopsis" cellspacing="0" cellpadding="0">
-      <xsl:if test="following-sibling::funcprototype">
-        <xsl:attribute name="style">padding-bottom: 1em</xsl:attribute>
-      </xsl:if>
-      <xsl:apply-templates select="paramdef" mode="kr-tabular-funcsynopsis-mode"/>
-    </table>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="funcdef" mode="kr-tabular">
-  <code>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="kr-tabular"/>
-    <xsl:text>(</xsl:text>
-  </code>
-</xsl:template>
-
-<xsl:template match="funcdef/function" mode="kr-tabular">
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.decoration != 0">
-      <b class="fsfunc"><xsl:apply-templates mode="kr-nontabular"/></b>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="kr-tabular"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="void" mode="kr-tabular">
-  <td>
-    <code>)</code>
-    <xsl:text>;</xsl:text>
-  </td>
-  <td>&#160;</td>
-</xsl:template>
-
-<xsl:template match="varargs" mode="kr-tabular">
-  <td>
-    <xsl:text>...</xsl:text>
-    <code>)</code>
-    <xsl:text>;</xsl:text>
-  </td>
-  <td>&#160;</td>
-</xsl:template>
-
-<xsl:template match="paramdef" mode="kr-tabular">
-  <td>
-    <xsl:apply-templates select="parameter" mode="kr-tabular"/>
-    <xsl:choose>
-      <xsl:when test="following-sibling::*">
-	<xsl:text>, </xsl:text>
-      </xsl:when>
-      <xsl:otherwise>
-	<code>)</code>
-	<xsl:text>;</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-  </td>
-  <td>&#160;</td>
-</xsl:template>
-
-<xsl:template match="paramdef/parameter" mode="kr-tabular">
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.decoration != 0">
-      <var class="pdparam">
-        <xsl:apply-templates mode="kr-tabular"/>
-      </var>
-    </xsl:when>
-    <xsl:otherwise>
-      <code>
-	<xsl:apply-templates mode="kr-tabular"/>
-      </code>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="paramdef" mode="kr-tabular-funcsynopsis-mode">
-  <xsl:variable name="type">
-    <xsl:choose>
-      <xsl:when test="type">
-	<xsl:apply-templates select="type" mode="kr-tabular-funcsynopsis-mode"/>
-      </xsl:when>
-      <xsl:when test="normalize-space(parameter/preceding-sibling::node()[not(self::parameter)]) != ''">
-	<xsl:copy-of select="parameter/preceding-sibling::node()[not(self::parameter)]"/>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:variable>
-
-  <tr>
-    <xsl:choose>
-      <xsl:when test="$type != '' and funcparams">
-        <td>
-	  <code>
-	    <xsl:copy-of select="$type"/>
-	  </code>
-          <xsl:text>&#160;</xsl:text>
-        </td>
-        <td>
-	  <code>
-	    <xsl:choose>
-	      <xsl:when test="type">
-		<xsl:apply-templates select="type/following-sibling::*" mode="kr-tabular-funcsynopsis-mode"/>
-	      </xsl:when>
-	      <xsl:otherwise>
-		<xsl:apply-templates select="*" mode="kr-tabular-funcsynopsis-mode"/>
-	      </xsl:otherwise>
-	    </xsl:choose>
-	  </code>
-        </td>
-      </xsl:when>
-
-      <xsl:when test="funcparams">
-        <td colspan="2">
-	  <code>
-	    <xsl:apply-templates mode="kr-tabular-funcsynopsis-mode"/>
-	  </code>
-        </td>
-      </xsl:when>
-
-      <xsl:otherwise>
-        <td>
-	  <code>
-	    <xsl:apply-templates select="parameter/preceding-sibling::node()[not(self::parameter)]" mode="kr-tabular-funcsynopsis-mode"/>
-	  </code>
-          <xsl:text>&#160;</xsl:text>
-        </td>
-        <td>
-	  <code>
-	    <xsl:apply-templates select="parameter" mode="kr-tabular"/>
-	    <xsl:apply-templates select="parameter/following-sibling::*[not(self::parameter)]" mode="kr-tabular-funcsynopsis-mode"/>
-	    <xsl:text>;</xsl:text>
-	  </code>
-        </td>
-      </xsl:otherwise>
-    </xsl:choose>
-  </tr>
-</xsl:template>
-
-<xsl:template match="paramdef/parameter" mode="kr-tabular-funcsynopsis-mode">
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.decoration != 0">
-      <var class="pdparam">
-        <xsl:apply-templates mode="kr-tabular-funcsynopsis-mode"/>
-      </var>
-    </xsl:when>
-    <xsl:otherwise>
-      <code>
-	<xsl:apply-templates mode="kr-tabular-funcsynopsis-mode"/>
-      </code>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="funcparams" mode="kr-tabular-funcsynopsis-mode">
-  <code>(</code>
-  <xsl:apply-templates mode="kr-tabular-funcsynopsis-mode"/>
-  <code>)</code>
-  <xsl:text>;</xsl:text>
-</xsl:template>
-
-<!-- ====================================================================== -->
-<!-- funcprototype: ansi, non-tabular -->
-
-<xsl:template match="funcprototype" mode="ansi-nontabular">
-  <p>
-    <xsl:apply-templates mode="ansi-nontabular"/>
-  </p>
-</xsl:template>
-
-<xsl:template match="funcdef" mode="ansi-nontabular">
-  <code>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="ansi-nontabular"/>
-    <xsl:text>(</xsl:text>
-  </code>
-</xsl:template>
-
-<xsl:template match="funcdef/function" mode="ansi-nontabular">
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.decoration != 0">
-      <b class="fsfunc"><xsl:apply-templates mode="ansi-nontabular"/></b>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="ansi-nontabular"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="void" mode="ansi-nontabular">
-  <code>void)</code>
-  <xsl:text>;</xsl:text>
-</xsl:template>
-
-<xsl:template match="varargs" mode="ansi-nontabular">
-  <xsl:text>...</xsl:text>
-  <code>)</code>
-  <xsl:text>;</xsl:text>
-</xsl:template>
-
-<xsl:template match="paramdef" mode="ansi-nontabular">
-  <xsl:apply-templates mode="ansi-nontabular"/>
-  <xsl:choose>
-    <xsl:when test="following-sibling::*">
-      <xsl:text>, </xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <code>)</code>
-      <xsl:text>;</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="paramdef/parameter" mode="ansi-nontabular">
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.decoration != 0">
-      <var class="pdparam">
-        <xsl:apply-templates mode="ansi-nontabular"/>
-      </var>
-    </xsl:when>
-    <xsl:otherwise>
-      <code>
-	<xsl:apply-templates mode="ansi-nontabular"/>
-      </code>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="funcparams" mode="ansi-nontabular">
-  <code>(</code>
-  <xsl:apply-templates mode="ansi-nontabular"/>
-  <code>)</code>
-</xsl:template>
-
-<!-- ====================================================================== -->
-<!-- funcprototype: ansi, tabular -->
-
-<xsl:template match="funcprototype" mode="ansi-tabular">
-  <table border="0" summary="Function synopsis" cellspacing="0" cellpadding="0">
-    <xsl:if test="following-sibling::funcprototype">
-      <xsl:attribute name="style">padding-bottom: 1em</xsl:attribute>
-    </xsl:if>
-    <tr>
-      <td>
-        <xsl:apply-templates select="funcdef" mode="ansi-tabular"/>
-      </td>
-      <xsl:apply-templates select="(void|varargs|paramdef)[1]" mode="ansi-tabular"/>
-    </tr>
-    <xsl:for-each select="(void|varargs|paramdef)[preceding-sibling::*[not(self::funcdef)]]">
-      <tr>
-        <td>&#160;</td>
-        <xsl:apply-templates select="." mode="ansi-tabular"/>
-      </tr>
-    </xsl:for-each>
-  </table>
-</xsl:template>
-
-<xsl:template match="funcdef" mode="ansi-tabular">
-  <code>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="ansi-tabular"/>
-    <xsl:text>(</xsl:text>
-  </code>
-</xsl:template>
-
-<xsl:template match="funcdef/function" mode="ansi-tabular">
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.decoration != 0">
-      <b class="fsfunc"><xsl:apply-templates mode="ansi-nontabular"/></b>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="kr-tabular"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="void" mode="ansi-tabular">
-  <td>
-    <code>void)</code>
-    <xsl:text>;</xsl:text>
-  </td>
-  <td>&#160;</td>
-</xsl:template>
-
-<xsl:template match="varargs" mode="ansi-tabular">
-  <td>
-    <xsl:text>...</xsl:text>
-    <code>)</code>
-    <xsl:text>;</xsl:text>
-  </td>
-  <td>&#160;</td>
-</xsl:template>
-
-<xsl:template match="paramdef" mode="ansi-tabular">
-  <xsl:variable name="type">
-    <xsl:choose>
-      <xsl:when test="type">
-	<xsl:apply-templates select="type" mode="ansi-tabular"/>
-      </xsl:when>
-      <xsl:when test="normalize-space(parameter/preceding-sibling::node()[not(self::parameter)]) != ''">
-	<xsl:copy-of select="parameter/preceding-sibling::node()[not(self::parameter)]"/>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$type != '' and funcparams">
-      <td>
-	<xsl:copy-of select="$type"/>
-        <xsl:text>&#160;</xsl:text>
-      </td>
-      <td>
-	<xsl:choose>
-	  <xsl:when test="type">
-	    <xsl:apply-templates select="type/following-sibling::*" mode="ansi-tabular"/>
-	  </xsl:when>
-	  <xsl:otherwise>
-	    <xsl:apply-templates select="*" mode="ansi-tabular"/>
-	  </xsl:otherwise>
-	</xsl:choose>
-        <xsl:choose>
-          <xsl:when test="following-sibling::*">
-            <xsl:text>, </xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <code>)</code>
-            <xsl:text>;</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </td>
-    </xsl:when>
-    <xsl:otherwise>
-      <td>
-        <xsl:apply-templates select="parameter/preceding-sibling::node()[not(self::parameter)]" mode="ansi-tabular"/>
-        <xsl:text>&#160;</xsl:text>
-      </td>
-      <td>
-        <xsl:apply-templates select="parameter" mode="ansi-tabular"/>
-        <xsl:apply-templates select="parameter/following-sibling::*[not(self::parameter)]" mode="ansi-tabular"/>
-        <xsl:choose>
-          <xsl:when test="following-sibling::*">
-            <xsl:text>, </xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <code>)</code>
-            <xsl:text>;</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </td>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="paramdef/parameter" mode="ansi-tabular">
-  <xsl:choose>
-    <xsl:when test="$funcsynopsis.decoration != 0">
-      <var class="pdparam">
-        <xsl:apply-templates mode="ansi-tabular"/>
-      </var>
-    </xsl:when>
-    <xsl:otherwise>
-      <code>
-	<xsl:apply-templates mode="ansi-tabular"/>
-      </code>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="funcparams" mode="ansi-tabular">
-  <code>(</code>
-  <xsl:apply-templates/>
-  <code>)</code>
-</xsl:template>
-
-<!-- ====================================================================== -->
-
-<xsl:variable name="default-classsynopsis-language">java</xsl:variable>
-
-<xsl:template match="classsynopsis                      |fieldsynopsis                      |methodsynopsis                      |constructorsynopsis                      |destructorsynopsis">
-  <xsl:param name="language">
-    <xsl:choose>
-      <xsl:when test="@language">
-	<xsl:value-of select="@language"/>
-      </xsl:when>
-      <xsl:otherwise>
-	<xsl:value-of select="$default-classsynopsis-language"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:param>
-
-  <xsl:choose>
-    <xsl:when test="$language='java' or $language='Java'">
-      <xsl:apply-templates select="." mode="java"/>
-    </xsl:when>
-    <xsl:when test="$language='perl' or $language='Perl'">
-      <xsl:apply-templates select="." mode="perl"/>
-    </xsl:when>
-    <xsl:when test="$language='idl' or $language='IDL'">
-      <xsl:apply-templates select="." mode="idl"/>
-    </xsl:when>
-    <xsl:when test="$language='cpp' or $language='c++' or $language='C++'">
-      <xsl:apply-templates select="." mode="cpp"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message>
-	<xsl:text>Unrecognized language on </xsl:text>
-        <xsl:value-of select="local-name(.)"/>
-        <xsl:text>: </xsl:text>
-	<xsl:value-of select="$language"/>
-      </xsl:message>
-      <xsl:apply-templates select=".">
-	<xsl:with-param name="language" select="$default-classsynopsis-language"/>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="synop-break">
-  <xsl:if test="parent::classsynopsis                 or (following-sibling::fieldsynopsis                     |following-sibling::methodsynopsis                     |following-sibling::constructorsynopsis                     |following-sibling::destructorsynopsis)">
-    <br/>
-  </xsl:if>
-</xsl:template>
-
-
-<!-- ===== Java ======================================================== -->
-
-<xsl:template match="classsynopsis" mode="java">
-  <pre>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates select="ooclass[1]" mode="java"/>
-    <xsl:if test="ooclass[preceding-sibling::*]">
-      <xsl:text> extends</xsl:text>
-      <xsl:apply-templates select="ooclass[preceding-sibling::*]" mode="java"/>
-      <xsl:if test="oointerface|ooexception">
-        <br/>
-	<xsl:text>&#160;&#160;&#160;&#160;</xsl:text>
-      </xsl:if>
-    </xsl:if>
-    <xsl:if test="oointerface">
-      <xsl:text>implements</xsl:text>
-      <xsl:apply-templates select="oointerface" mode="java"/>
-      <xsl:if test="ooexception">
-        <br/>
-	<xsl:text>&#160;&#160;&#160;&#160;</xsl:text>
-      </xsl:if>
-    </xsl:if>
-    <xsl:if test="ooexception">
-      <xsl:text>throws</xsl:text>
-      <xsl:apply-templates select="ooexception" mode="java"/>
-    </xsl:if>
-    <xsl:text>&#160;{</xsl:text>
-    <br/>
-    <xsl:apply-templates select="constructorsynopsis                                  |destructorsynopsis                                  |fieldsynopsis                                  |methodsynopsis                                  |classsynopsisinfo" mode="java"/>
-    <xsl:text>}</xsl:text>
-  </pre>
-</xsl:template>
-
-<xsl:template match="classsynopsisinfo" mode="java">
-  <xsl:apply-templates mode="java"/>
-</xsl:template>
-
-<xsl:template match="ooclass|oointerface|ooexception" mode="java">
-  <xsl:choose>
-    <xsl:when test="preceding-sibling::*">
-      <xsl:text>, </xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:text> </xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="java"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="modifier|package" mode="java">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="java"/>
-    <xsl:if test="following-sibling::*">
-      <xsl:text>&#160;</xsl:text>
-    </xsl:if>
-  </span>
-</xsl:template>
-
-<xsl:template match="classname" mode="java">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'classname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="java"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="interfacename" mode="java">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'interfacename'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="java"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="exceptionname" mode="java">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'exceptionname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="java"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="fieldsynopsis" mode="java">
-  <code>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="parent::classsynopsis">
-      <xsl:text>&#160;&#160;</xsl:text>
-    </xsl:if>
-    <xsl:apply-templates mode="java"/>
-    <xsl:text>;</xsl:text>
-  </code>
-  <xsl:call-template name="synop-break"/>
-</xsl:template>
-
-<xsl:template match="type" mode="java">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="java"/>
-    <xsl:text>&#160;</xsl:text>
-  </span>
-</xsl:template>
-
-<xsl:template match="varname" mode="java">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="java"/>
-    <xsl:text>&#160;</xsl:text>
-  </span>
-</xsl:template>
-
-<xsl:template match="initializer" mode="java">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:text>=&#160;</xsl:text>
-    <xsl:apply-templates mode="java"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="void" mode="java">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:text>void&#160;</xsl:text>
-  </span>
-</xsl:template>
-
-<xsl:template match="methodname" mode="java">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="java"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="methodparam" mode="java">
-  <xsl:param name="indent">0</xsl:param>
-  <xsl:if test="preceding-sibling::methodparam">
-    <xsl:text>,</xsl:text>
-    <br/>
-    <xsl:if test="$indent &gt; 0">
-      <xsl:call-template name="copy-string">
-	<xsl:with-param name="string">&#160;</xsl:with-param>
-	<xsl:with-param name="count" select="$indent + 1"/>
-      </xsl:call-template>
-    </xsl:if>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="java"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="parameter" mode="java">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="java"/>
-  </span>
-</xsl:template>
-
-<xsl:template mode="java" match="constructorsynopsis|destructorsynopsis|methodsynopsis">
-  <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[local-name(.) != 'modifier']]"/>
-  <xsl:variable name="notmod" select="*[local-name(.) != 'modifier']"/>
-  <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"/>
-  <xsl:variable name="decl">
-    <xsl:if test="parent::classsynopsis">
-      <xsl:text>&#160;&#160;</xsl:text>
-    </xsl:if>
-    <xsl:apply-templates select="$start-modifiers" mode="java"/>
-
-    <!-- type -->
-    <xsl:if test="local-name($notmod[1]) != 'methodname'">
-      <xsl:apply-templates select="$notmod[1]" mode="java"/>
-    </xsl:if>
-
-    <xsl:apply-templates select="methodname" mode="java"/>
-  </xsl:variable>
-
-  <code>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:copy-of select="$decl"/>
-    <xsl:text>(</xsl:text>
-    <xsl:apply-templates select="methodparam" mode="java">
-      <xsl:with-param name="indent" select="string-length($decl)"/>
-    </xsl:apply-templates>
-    <xsl:text>)</xsl:text>
-    <xsl:if test="exceptionname">
-      <br/>
-      <xsl:text>&#160;&#160;&#160;&#160;throws&#160;</xsl:text>
-      <xsl:apply-templates select="exceptionname" mode="java"/>
-    </xsl:if>
-    <xsl:if test="modifier[preceding-sibling::*[local-name(.) != 'modifier']]">
-      <xsl:text> </xsl:text>
-      <xsl:apply-templates select="$end-modifiers" mode="java"/>
-    </xsl:if>
-    <xsl:text>;</xsl:text>
-  </code>
-  <xsl:call-template name="synop-break"/>
-</xsl:template>
-
-<!-- ===== C++ ========================================================= -->
-
-<xsl:template match="classsynopsis" mode="cpp">
-  <pre>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates select="ooclass[1]" mode="cpp"/>
-    <xsl:if test="ooclass[preceding-sibling::*]">
-      <xsl:text>: </xsl:text>
-      <xsl:apply-templates select="ooclass[preceding-sibling::*]" mode="cpp"/>
-      <xsl:if test="oointerface|ooexception">
-        <br/>
-	<xsl:text>&#160;&#160;&#160;&#160;</xsl:text>
-      </xsl:if>
-    </xsl:if>
-    <xsl:if test="oointerface">
-      <xsl:text> implements</xsl:text>
-      <xsl:apply-templates select="oointerface" mode="cpp"/>
-      <xsl:if test="ooexception">
-        <br/>
-	<xsl:text>&#160;&#160;&#160;&#160;</xsl:text>
-      </xsl:if>
-    </xsl:if>
-    <xsl:if test="ooexception">
-      <xsl:text> throws</xsl:text>
-      <xsl:apply-templates select="ooexception" mode="cpp"/>
-    </xsl:if>
-    <xsl:text>&#160;{</xsl:text>
-    <br/>
-    <xsl:apply-templates select="constructorsynopsis                                  |destructorsynopsis                                  |fieldsynopsis                                  |methodsynopsis                                  |classsynopsisinfo" mode="cpp"/>
-    <xsl:text>}</xsl:text>
-  </pre>
-</xsl:template>
-
-<xsl:template match="classsynopsisinfo" mode="cpp">
-  <xsl:apply-templates mode="cpp"/>
-</xsl:template>
-
-<xsl:template match="ooclass|oointerface|ooexception" mode="cpp">
-  <xsl:if test="preceding-sibling::*">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="cpp"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="modifier|package" mode="cpp">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="cpp"/>
-    <xsl:if test="following-sibling::*">
-      <xsl:text>&#160;</xsl:text>
-    </xsl:if>
-  </span>
-</xsl:template>
-
-<xsl:template match="classname" mode="cpp">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'classname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="cpp"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="interfacename" mode="cpp">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'interfacename'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="cpp"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="exceptionname" mode="cpp">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'exceptionname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="cpp"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="fieldsynopsis" mode="cpp">
-  <code>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="parent::classsynopsis">
-      <xsl:text>&#160;&#160;</xsl:text>
-    </xsl:if>
-    <xsl:apply-templates mode="cpp"/>
-    <xsl:text>;</xsl:text>
-  </code>
-  <xsl:call-template name="synop-break"/>
-</xsl:template>
-
-<xsl:template match="type" mode="cpp">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="cpp"/>
-    <xsl:text>&#160;</xsl:text>
-  </span>
-</xsl:template>
-
-<xsl:template match="varname" mode="cpp">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="cpp"/>
-    <xsl:text>&#160;</xsl:text>
-  </span>
-</xsl:template>
-
-<xsl:template match="initializer" mode="cpp">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:text>=&#160;</xsl:text>
-    <xsl:apply-templates mode="cpp"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="void" mode="cpp">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:text>void&#160;</xsl:text>
-  </span>
-</xsl:template>
-
-<xsl:template match="methodname" mode="cpp">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="cpp"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="methodparam" mode="cpp">
-  <xsl:if test="preceding-sibling::methodparam">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="cpp"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="parameter" mode="cpp">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="cpp"/>
-  </span>
-</xsl:template>
-
-<xsl:template mode="cpp" match="constructorsynopsis|destructorsynopsis|methodsynopsis">
-  <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[local-name(.) != 'modifier']]"/>
-  <xsl:variable name="notmod" select="*[local-name(.) != 'modifier']"/>
-  <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"/>
-
-  <code>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="parent::classsynopsis">
-      <xsl:text>&#160;&#160;</xsl:text>
-    </xsl:if>
-    <xsl:apply-templates select="$start-modifiers" mode="cpp"/>
-
-    <!-- type -->
-    <xsl:if test="local-name($notmod[1]) != 'methodname'">
-      <xsl:apply-templates select="$notmod[1]" mode="cpp"/>
-    </xsl:if>
-
-    <xsl:apply-templates select="methodname" mode="cpp"/>
-    <xsl:text>(</xsl:text>
-    <xsl:apply-templates select="methodparam" mode="cpp"/>
-    <xsl:text>)</xsl:text>
-    <xsl:if test="exceptionname">
-      <br/>
-      <xsl:text>&#160;&#160;&#160;&#160;throws&#160;</xsl:text>
-      <xsl:apply-templates select="exceptionname" mode="cpp"/>
-    </xsl:if>
-    <xsl:if test="modifier[preceding-sibling::*[local-name(.) != 'modifier']]">
-      <xsl:text> </xsl:text>
-      <xsl:apply-templates select="$end-modifiers" mode="cpp"/>
-    </xsl:if>
-    <xsl:text>;</xsl:text>
-  </code>
-  <xsl:call-template name="synop-break"/>
-</xsl:template>
-
-<!-- ===== IDL ========================================================= -->
-
-<xsl:template match="classsynopsis" mode="idl">
-  <pre>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:text>interface </xsl:text>
-    <xsl:apply-templates select="ooclass[1]" mode="idl"/>
-    <xsl:if test="ooclass[preceding-sibling::*]">
-      <xsl:text>: </xsl:text>
-      <xsl:apply-templates select="ooclass[preceding-sibling::*]" mode="idl"/>
-      <xsl:if test="oointerface|ooexception">
-        <br/>
-	<xsl:text>&#160;&#160;&#160;&#160;</xsl:text>
-      </xsl:if>
-    </xsl:if>
-    <xsl:if test="oointerface">
-      <xsl:text> implements</xsl:text>
-      <xsl:apply-templates select="oointerface" mode="idl"/>
-      <xsl:if test="ooexception">
-        <br/>
-	<xsl:text>&#160;&#160;&#160;&#160;</xsl:text>
-      </xsl:if>
-    </xsl:if>
-    <xsl:if test="ooexception">
-      <xsl:text> throws</xsl:text>
-      <xsl:apply-templates select="ooexception" mode="idl"/>
-    </xsl:if>
-    <xsl:text>&#160;{</xsl:text>
-    <br/>
-    <xsl:apply-templates select="constructorsynopsis                                  |destructorsynopsis                                  |fieldsynopsis                                  |methodsynopsis                                  |classsynopsisinfo" mode="idl"/>
-    <xsl:text>}</xsl:text>
-  </pre>
-</xsl:template>
-
-<xsl:template match="classsynopsisinfo" mode="idl">
-  <xsl:apply-templates mode="idl"/>
-</xsl:template>
-
-<xsl:template match="ooclass|oointerface|ooexception" mode="idl">
-  <xsl:if test="preceding-sibling::*">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="idl"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="modifier|package" mode="idl">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="idl"/>
-    <xsl:if test="following-sibling::*">
-      <xsl:text>&#160;</xsl:text>
-    </xsl:if>
-  </span>
-</xsl:template>
-
-<xsl:template match="classname" mode="idl">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'classname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="idl"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="interfacename" mode="idl">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'interfacename'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="idl"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="exceptionname" mode="idl">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'exceptionname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="idl"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="fieldsynopsis" mode="idl">
-  <code>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="parent::classsynopsis">
-      <xsl:text>&#160;&#160;</xsl:text>
-    </xsl:if>
-    <xsl:apply-templates mode="idl"/>
-    <xsl:text>;</xsl:text>
-  </code>
-  <xsl:call-template name="synop-break"/>
-</xsl:template>
-
-<xsl:template match="type" mode="idl">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="idl"/>
-    <xsl:text>&#160;</xsl:text>
-  </span>
-</xsl:template>
-
-<xsl:template match="varname" mode="idl">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="idl"/>
-    <xsl:text>&#160;</xsl:text>
-  </span>
-</xsl:template>
-
-<xsl:template match="initializer" mode="idl">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:text>=&#160;</xsl:text>
-    <xsl:apply-templates mode="idl"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="void" mode="idl">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:text>void&#160;</xsl:text>
-  </span>
-</xsl:template>
-
-<xsl:template match="methodname" mode="idl">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="idl"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="methodparam" mode="idl">
-  <xsl:if test="preceding-sibling::methodparam">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="idl"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="parameter" mode="idl">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="idl"/>
-  </span>
-</xsl:template>
-
-<xsl:template mode="idl" match="constructorsynopsis|destructorsynopsis|methodsynopsis">
-  <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[local-name(.) != 'modifier']]"/>
-  <xsl:variable name="notmod" select="*[local-name(.) != 'modifier']"/>
-  <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"/>
-  <code>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="parent::classsynopsis">
-      <xsl:text>&#160;&#160;</xsl:text>
-    </xsl:if>
-    <xsl:apply-templates select="$start-modifiers" mode="idl"/>
-
-    <!-- type -->
-    <xsl:if test="local-name($notmod[1]) != 'methodname'">
-      <xsl:apply-templates select="$notmod[1]" mode="idl"/>
-    </xsl:if>
-
-    <xsl:apply-templates select="methodname" mode="idl"/>
-    <xsl:text>(</xsl:text>
-    <xsl:apply-templates select="methodparam" mode="idl"/>
-    <xsl:text>)</xsl:text>
-    <xsl:if test="exceptionname">
-      <br/>
-      <xsl:text>&#160;&#160;&#160;&#160;raises(</xsl:text>
-      <xsl:apply-templates select="exceptionname" mode="idl"/>
-      <xsl:text>)</xsl:text>
-    </xsl:if>
-    <xsl:if test="modifier[preceding-sibling::*[local-name(.) != 'modifier']]">
-      <xsl:text> </xsl:text>
-      <xsl:apply-templates select="$end-modifiers" mode="idl"/>
-    </xsl:if>
-    <xsl:text>;</xsl:text>
-  </code>
-  <xsl:call-template name="synop-break"/>
-</xsl:template>
-
-<!-- ===== Perl ======================================================== -->
-
-<xsl:template match="classsynopsis" mode="perl">
-  <pre>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:text>package </xsl:text>
-    <xsl:apply-templates select="ooclass[1]" mode="perl"/>
-    <xsl:text>;</xsl:text>
-    <br/>
-
-    <xsl:if test="ooclass[preceding-sibling::*]">
-      <xsl:text>@ISA = (</xsl:text>
-      <xsl:apply-templates select="ooclass[preceding-sibling::*]" mode="perl"/>
-      <xsl:text>);</xsl:text>
-      <br/>
-    </xsl:if>
-
-    <xsl:apply-templates select="constructorsynopsis                                  |destructorsynopsis                                  |fieldsynopsis                                  |methodsynopsis                                  |classsynopsisinfo" mode="perl"/>
-  </pre>
-</xsl:template>
-
-<xsl:template match="classsynopsisinfo" mode="perl">
-  <xsl:apply-templates mode="perl"/>
-</xsl:template>
-
-<xsl:template match="ooclass|oointerface|ooexception" mode="perl">
-  <xsl:if test="preceding-sibling::*">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="perl"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="modifier|package" mode="perl">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="perl"/>
-    <xsl:if test="following-sibling::*">
-      <xsl:text>&#160;</xsl:text>
-    </xsl:if>
-  </span>
-</xsl:template>
-
-<xsl:template match="classname" mode="perl">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'classname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="perl"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="interfacename" mode="perl">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'interfacename'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="perl"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="exceptionname" mode="perl">
-  <xsl:if test="local-name(preceding-sibling::*[1]) = 'exceptionname'">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="perl"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="fieldsynopsis" mode="perl">
-  <code>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="parent::classsynopsis">
-      <xsl:text>&#160;&#160;</xsl:text>
-    </xsl:if>
-    <xsl:apply-templates mode="perl"/>
-    <xsl:text>;</xsl:text>
-  </code>
-  <xsl:call-template name="synop-break"/>
-</xsl:template>
-
-<xsl:template match="type" mode="perl">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="perl"/>
-    <xsl:text>&#160;</xsl:text>
-  </span>
-</xsl:template>
-
-<xsl:template match="varname" mode="perl">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="perl"/>
-    <xsl:text>&#160;</xsl:text>
-  </span>
-</xsl:template>
-
-<xsl:template match="initializer" mode="perl">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:text>=&#160;</xsl:text>
-    <xsl:apply-templates mode="perl"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="void" mode="perl">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:text>void&#160;</xsl:text>
-  </span>
-</xsl:template>
-
-<xsl:template match="methodname" mode="perl">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="perl"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="methodparam" mode="perl">
-  <xsl:if test="preceding-sibling::methodparam">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="perl"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="parameter" mode="perl">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="perl"/>
-  </span>
-</xsl:template>
-
-<xsl:template mode="perl" match="constructorsynopsis|destructorsynopsis|methodsynopsis">
-  <xsl:variable name="start-modifiers" select="modifier[following-sibling::*[local-name(.) != 'modifier']]"/>
-  <xsl:variable name="notmod" select="*[local-name(.) != 'modifier']"/>
-  <xsl:variable name="end-modifiers" select="modifier[preceding-sibling::*[local-name(.) != 'modifier']]"/>
-
-  <code>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:text>sub </xsl:text>
-
-    <xsl:apply-templates select="methodname" mode="perl"/>
-    <xsl:text> { ... };</xsl:text>
-  </code>
-  <xsl:call-template name="synop-break"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- * DocBook 5 allows linking elements (link, olink, and xref) -->
-<!-- * within the OO *synopsis elements (classsynopsis, fieldsynopsis, -->
-<!-- * methodsynopsis, constructorsynopsis, destructorsynopsis) and -->
-<!-- * their children. So we need to have mode="java|cpp|idl|perl" -->
-<!-- * per-mode matches for those linking elements in order for them -->
-<!-- * to be processed as expected. -->
-
-<xsl:template match="link|olink|xref" mode="java">
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template match="link|olink|xref" mode="cpp">
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template match="link|olink|xref" mode="idl">
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template match="link|olink|xref" mode="perl">
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/table.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/table.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,1093 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" xmlns:stbl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Table" xmlns:xtbl="xalan://com.nwalsh.xalan.Table" xmlns:lxslt="http://xml.apache.org/xslt" xmlns:ptbl="http://nwalsh.com/xslt/ext/xsltproc/python/Table" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="doc stbl xtbl lxslt ptbl" version="1.0">
-
-<xsl:include href="../common/table.xsl"/>
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<lxslt:component prefix="xtbl" functions="adjustColumnWidths"/>
-
-<xsl:template name="empty.table.cell">
-  <xsl:param name="colnum" select="0"/>
-
-  <xsl:variable name="rowsep">
-    <xsl:choose>
-      <!-- If this is the last row, rowsep never applies. -->
-      <xsl:when test="not(ancestor-or-self::row[1]/following-sibling::row                           or ancestor-or-self::thead/following-sibling::tbody                           or ancestor-or-self::tbody/preceding-sibling::tfoot)">
-        <xsl:value-of select="0"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="inherited.table.attribute">
-          <xsl:with-param name="entry" select="NOT-AN-ELEMENT-NAME"/>
-          <xsl:with-param name="row" select="ancestor-or-self::row[1]"/>
-          <xsl:with-param name="colnum" select="$colnum"/>
-          <xsl:with-param name="attribute" select="'rowsep'"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="colsep">
-    <xsl:choose>
-      <!-- If this is the last column, colsep never applies. -->
-      <xsl:when test="number($colnum) &gt;= ancestor::tgroup/@cols">0</xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="inherited.table.attribute">
-          <xsl:with-param name="entry" select="NOT-AN-ELEMENT-NAME"/>
-          <xsl:with-param name="row" select="ancestor-or-self::row[1]"/>
-          <xsl:with-param name="colnum" select="$colnum"/>
-          <xsl:with-param name="attribute" select="'colsep'"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <td class="auto-generated">
-    <xsl:if test="$table.borders.with.css != 0">
-      <xsl:attribute name="style">
-        <xsl:if test="$colsep &gt; 0">
-          <xsl:call-template name="border">
-            <xsl:with-param name="side" select="'right'"/>
-          </xsl:call-template>
-        </xsl:if>
-        <xsl:if test="$rowsep &gt; 0">
-          <xsl:call-template name="border">
-            <xsl:with-param name="side" select="'bottom'"/>
-          </xsl:call-template>
-        </xsl:if>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:text>&#160;</xsl:text>
-  </td>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="border">
-  <xsl:param name="side" select="'left'"/>
-  <xsl:param name="padding" select="0"/>
-  <xsl:param name="style" select="$table.cell.border.style"/>
-  <xsl:param name="color" select="$table.cell.border.color"/>
-  <xsl:param name="thickness" select="$table.cell.border.thickness"/>
-
-  <!-- Note: Some browsers (mozilla) require at least a width and style. -->
-
-  <xsl:choose>
-    <xsl:when test="($thickness != ''                      and $style != ''                      and $color != '')                     or ($thickness != ''                         and $style != '')                     or ($thickness != '')">
-      <!-- use the compound property if we can: -->
-      <!-- it saves space and probably works more reliably -->
-      <xsl:text>border-</xsl:text>
-      <xsl:value-of select="$side"/>
-      <xsl:text>: </xsl:text>
-      <xsl:value-of select="$thickness"/>
-      <xsl:text> </xsl:text>
-      <xsl:value-of select="$style"/>
-      <xsl:text> </xsl:text>
-      <xsl:value-of select="$color"/>
-      <xsl:text>; </xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <!-- we need to specify the styles individually -->
-      <xsl:if test="$thickness != ''">
-        <xsl:text>border-</xsl:text>
-        <xsl:value-of select="$side"/>
-        <xsl:text>-width: </xsl:text>
-        <xsl:value-of select="$thickness"/>
-        <xsl:text>; </xsl:text>
-      </xsl:if>
-
-      <xsl:if test="$style != ''">
-        <xsl:text>border-</xsl:text>
-        <xsl:value-of select="$side"/>
-        <xsl:text>-style: </xsl:text>
-        <xsl:value-of select="$style"/>
-        <xsl:text>; </xsl:text>
-      </xsl:if>
-
-      <xsl:if test="$color != ''">
-        <xsl:text>border-</xsl:text>
-        <xsl:value-of select="$side"/>
-        <xsl:text>-color: </xsl:text>
-        <xsl:value-of select="$color"/>
-        <xsl:text>; </xsl:text>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="tgroup" name="tgroup">
-  <xsl:if test="not(@cols) or @cols = '' or string(number(@cols)) = 'NaN'">
-    <xsl:message terminate="yes">
-      <xsl:text>Error: CALS tables must specify the number of columns.</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:variable name="summary">
-    <xsl:call-template name="pi.dbhtml_table-summary"/>
-  </xsl:variable>
-
-  <xsl:variable name="cellspacing">
-    <xsl:call-template name="pi.dbhtml_cellspacing"/>
-  </xsl:variable>
-
-  <xsl:variable name="cellpadding">
-    <xsl:call-template name="pi.dbhtml_cellpadding"/>
-  </xsl:variable>
-
-  <table>
-    <xsl:choose>
-      <!-- If there's a textobject/phrase for the table summary, use it -->
-      <xsl:when test="../textobject/phrase">
-        <xsl:attribute name="summary">
-          <xsl:value-of select="../textobject/phrase"/>
-        </xsl:attribute>
-      </xsl:when>
-
-      <!-- If there's a <?dbhtml table-summary="foo"?> PI, use it for
-           the HTML table summary attribute -->
-      <xsl:when test="$summary != ''">
-        <xsl:attribute name="summary">
-          <xsl:value-of select="$summary"/>
-        </xsl:attribute>
-      </xsl:when>
-
-      <!-- Otherwise, if there's a title, use that -->
-      <xsl:when test="../title">
-        <xsl:attribute name="summary">
-          <xsl:value-of select="string(../title)"/>
-        </xsl:attribute>
-      </xsl:when>
-
-      <!-- Otherwise, forget the whole idea -->
-      <xsl:otherwise><!-- nevermind --></xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:if test="$cellspacing != '' or $html.cellspacing != ''">
-      <xsl:attribute name="cellspacing">
-        <xsl:choose>
-          <xsl:when test="$cellspacing != ''">
-            <xsl:value-of select="$cellspacing"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$html.cellspacing"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:if test="$cellpadding != '' or $html.cellpadding != ''">
-      <xsl:attribute name="cellpadding">
-        <xsl:choose>
-          <xsl:when test="$cellpadding != ''">
-            <xsl:value-of select="$cellpadding"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$html.cellpadding"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:if test="../@pgwide=1 or local-name(.) = 'entrytbl'">
-      <xsl:attribute name="width">100%</xsl:attribute>
-    </xsl:if>
-
-    <xsl:choose>
-      <xsl:when test="$table.borders.with.css != 0">
-        <xsl:choose>
-          <xsl:when test="../@frame='all' or (not(../@frame) and $default.table.frame='all')">
-            <xsl:attribute name="style">
-              <xsl:text>border-collapse: collapse;</xsl:text>
-              <xsl:call-template name="border">
-                <xsl:with-param name="side" select="'top'"/>
-                <xsl:with-param name="style" select="$table.frame.border.style"/>
-                <xsl:with-param name="color" select="$table.frame.border.color"/>
-                <xsl:with-param name="thickness" select="$table.frame.border.thickness"/>
-              </xsl:call-template>
-              <xsl:call-template name="border">
-                <xsl:with-param name="side" select="'bottom'"/>
-                <xsl:with-param name="style" select="$table.frame.border.style"/>
-                <xsl:with-param name="color" select="$table.frame.border.color"/>
-                <xsl:with-param name="thickness" select="$table.frame.border.thickness"/>
-              </xsl:call-template>
-              <xsl:call-template name="border">
-                <xsl:with-param name="side" select="'left'"/>
-                <xsl:with-param name="style" select="$table.frame.border.style"/>
-                <xsl:with-param name="color" select="$table.frame.border.color"/>
-                <xsl:with-param name="thickness" select="$table.frame.border.thickness"/>
-              </xsl:call-template>
-              <xsl:call-template name="border">
-                <xsl:with-param name="side" select="'right'"/>
-                <xsl:with-param name="style" select="$table.frame.border.style"/>
-                <xsl:with-param name="color" select="$table.frame.border.color"/>
-                <xsl:with-param name="thickness" select="$table.frame.border.thickness"/>
-              </xsl:call-template>
-            </xsl:attribute>
-          </xsl:when>
-          <xsl:when test="../@frame='topbot' or (not(../@frame) and $default.table.frame='topbot')">
-            <xsl:attribute name="style">
-              <xsl:text>border-collapse: collapse;</xsl:text>
-              <xsl:call-template name="border">
-                <xsl:with-param name="side" select="'top'"/>
-                <xsl:with-param name="style" select="$table.frame.border.style"/>
-                <xsl:with-param name="color" select="$table.frame.border.color"/>
-                <xsl:with-param name="thickness" select="$table.frame.border.thickness"/>
-              </xsl:call-template>
-              <xsl:call-template name="border">
-                <xsl:with-param name="side" select="'bottom'"/>
-                <xsl:with-param name="style" select="$table.frame.border.style"/>
-                <xsl:with-param name="color" select="$table.frame.border.color"/>
-                <xsl:with-param name="thickness" select="$table.frame.border.thickness"/>
-              </xsl:call-template>
-            </xsl:attribute>
-          </xsl:when>
-          <xsl:when test="../@frame='top' or (not(../@frame) and $default.table.frame='top')">
-            <xsl:attribute name="style">
-              <xsl:text>border-collapse: collapse;</xsl:text>
-              <xsl:call-template name="border">
-                <xsl:with-param name="side" select="'top'"/>
-                <xsl:with-param name="style" select="$table.frame.border.style"/>
-                <xsl:with-param name="color" select="$table.frame.border.color"/>
-                <xsl:with-param name="thickness" select="$table.frame.border.thickness"/>
-              </xsl:call-template>
-            </xsl:attribute>
-          </xsl:when>
-          <xsl:when test="../@frame='bottom' or (not(../@frame) and $default.table.frame='bottom')">
-            <xsl:attribute name="style">
-              <xsl:text>border-collapse: collapse;</xsl:text>
-              <xsl:call-template name="border">
-                <xsl:with-param name="side" select="'bottom'"/>
-                <xsl:with-param name="style" select="$table.frame.border.style"/>
-                <xsl:with-param name="color" select="$table.frame.border.color"/>
-                <xsl:with-param name="thickness" select="$table.frame.border.thickness"/>
-              </xsl:call-template>
-            </xsl:attribute>
-          </xsl:when>
-          <xsl:when test="../@frame='sides' or (not(../@frame) and $default.table.frame='sides')">
-            <xsl:attribute name="style">
-              <xsl:text>border-collapse: collapse;</xsl:text>
-              <xsl:call-template name="border">
-                <xsl:with-param name="side" select="'left'"/>
-                <xsl:with-param name="style" select="$table.frame.border.style"/>
-                <xsl:with-param name="color" select="$table.frame.border.color"/>
-                <xsl:with-param name="thickness" select="$table.frame.border.thickness"/>
-              </xsl:call-template>
-              <xsl:call-template name="border">
-                <xsl:with-param name="side" select="'right'"/>
-                <xsl:with-param name="style" select="$table.frame.border.style"/>
-                <xsl:with-param name="color" select="$table.frame.border.color"/>
-                <xsl:with-param name="thickness" select="$table.frame.border.thickness"/>
-              </xsl:call-template>
-            </xsl:attribute>
-          </xsl:when>
-	  <xsl:when test="../@frame='none'">
-	    <xsl:attribute name="style">
-	      <xsl:text>border: none;</xsl:text>
-	    </xsl:attribute>
-	  </xsl:when>
-          <xsl:otherwise>
-            <xsl:attribute name="style">
-              <xsl:text>border-collapse: collapse;</xsl:text>
-            </xsl:attribute>
-          </xsl:otherwise>
-        </xsl:choose>
-
-      </xsl:when>
-      <xsl:when test="../@frame='none' or (not(../@frame) and $default.table.frame='none') or local-name(.) = 'entrytbl'">
-        <xsl:attribute name="border">0</xsl:attribute>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute name="border">1</xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:variable name="colgroup">
-      <colgroup>
-        <xsl:call-template name="generate.colgroup">
-          <xsl:with-param name="cols" select="@cols"/>
-        </xsl:call-template>
-      </colgroup>
-    </xsl:variable>
-
-    <xsl:variable name="explicit.table.width">
-      <xsl:call-template name="pi.dbhtml_table-width">
-        <xsl:with-param name="node" select=".."/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:variable name="table.width">
-      <xsl:choose>
-        <xsl:when test="$explicit.table.width != ''">
-          <xsl:value-of select="$explicit.table.width"/>
-        </xsl:when>
-        <xsl:when test="$default.table.width = ''">
-          <xsl:text>100%</xsl:text>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="$default.table.width"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-
-    <xsl:if test="$default.table.width != ''                   or $explicit.table.width != ''">
-      <xsl:attribute name="width">
-        <xsl:choose>
-          <xsl:when test="contains($table.width, '%')">
-            <xsl:value-of select="$table.width"/>
-          </xsl:when>
-          <xsl:when test="$use.extensions != 0                           and $tablecolumns.extension != 0">
-            <xsl:choose>
-              <xsl:when test="function-available('stbl:convertLength')">
-                <xsl:value-of select="stbl:convertLength($table.width)"/>
-              </xsl:when>
-              <xsl:when test="function-available('xtbl:convertLength')">
-                <xsl:value-of select="xtbl:convertLength($table.width)"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:message terminate="yes">
-                  <xsl:text>No convertLength function available.</xsl:text>
-                </xsl:message>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$table.width"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:choose>
-      <xsl:when test="$use.extensions != 0                       and $tablecolumns.extension != 0">
-        <xsl:choose>
-          <xsl:when test="function-available('stbl:adjustColumnWidths')">
-            <xsl:copy-of select="stbl:adjustColumnWidths($colgroup)"/>
-          </xsl:when>
-          <xsl:when test="function-available('xtbl:adjustColumnWidths')">
-            <xsl:copy-of select="xtbl:adjustColumnWidths($colgroup)"/>
-          </xsl:when>
-          <xsl:when test="function-available('ptbl:adjustColumnWidths')">
-            <xsl:copy-of select="ptbl:adjustColumnWidths($colgroup)"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:message terminate="yes">
-              <xsl:text>No adjustColumnWidths function available.</xsl:text>
-            </xsl:message>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:copy-of select="$colgroup"/>
-      </xsl:otherwise>
-    </xsl:choose>
-
-    <xsl:apply-templates select="thead"/>
-    <xsl:apply-templates select="tfoot"/>
-    <xsl:apply-templates select="tbody"/>
-
-    <xsl:if test=".//footnote">
-      <tbody class="footnotes">
-        <tr>
-          <td colspan="{@cols}">
-            <xsl:apply-templates select=".//footnote" mode="table.footnote.mode"/>
-          </td>
-        </tr>
-      </tbody>
-    </xsl:if>
-  </table>
-</xsl:template>
-
-<xsl:template match="tgroup/processing-instruction('dbhtml')">
-  <xsl:variable name="summary">
-    <xsl:call-template name="pi.dbhtml_table-summary"/>
-  </xsl:variable>
-
-  <!-- Suppress the table-summary PI -->
-  <xsl:if test="$summary = ''">
-    <xsl:processing-instruction name="dbhtml">
-      <xsl:value-of select="."/>
-    </xsl:processing-instruction>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="colspec"/>
-
-<xsl:template match="spanspec"/>
-
-<xsl:template match="thead|tfoot">
-  <xsl:element name="{local-name(.)}" namespace="http://www.w3.org/1999/xhtml">
-    <xsl:if test="@align">
-      <xsl:attribute name="align">
-        <xsl:value-of select="@align"/>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:if test="@char">
-      <xsl:attribute name="char">
-        <xsl:value-of select="@char"/>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:if test="@charoff">
-      <xsl:attribute name="charoff">
-        <xsl:value-of select="@charoff"/>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:if test="@valign">
-      <xsl:attribute name="valign">
-        <xsl:value-of select="@valign"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:apply-templates select="row[1]">
-      <xsl:with-param name="spans">
-        <xsl:call-template name="blank.spans">
-          <xsl:with-param name="cols" select="../@cols"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:apply-templates>
-
-  </xsl:element>
-</xsl:template>
-
-<xsl:template match="tbody">
-  <tbody>
-    <xsl:if test="@align">
-      <xsl:attribute name="align">
-        <xsl:value-of select="@align"/>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:if test="@char">
-      <xsl:attribute name="char">
-        <xsl:value-of select="@char"/>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:if test="@charoff">
-      <xsl:attribute name="charoff">
-        <xsl:value-of select="@charoff"/>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:if test="@valign">
-      <xsl:attribute name="valign">
-        <xsl:value-of select="@valign"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:apply-templates select="row[1]">
-      <xsl:with-param name="spans">
-        <xsl:call-template name="blank.spans">
-          <xsl:with-param name="cols" select="../@cols"/>
-        </xsl:call-template>
-      </xsl:with-param>
-    </xsl:apply-templates>
-
-  </tbody>
-</xsl:template>
-
-<xsl:template match="row">
-  <xsl:param name="spans"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($spans, '0')">
-      <xsl:call-template name="normal-row">
-	<xsl:with-param name="spans" select="$spans"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <!--
-      <xsl:message>
-	<xsl:text>Ignoring row: </xsl:text>
-	<xsl:value-of select="$spans"/>
-	<xsl:text> = </xsl:text>
-	<xsl:call-template name="consume-row">
-	  <xsl:with-param name="spans" select="$spans"/>
-	</xsl:call-template>
-      </xsl:message>
-      -->
-
-      <xsl:if test="normalize-space(.//text()) != ''">
-	<xsl:message>Warning: overlapped row contains content!</xsl:message>
-      </xsl:if>
-
-      <tr><xsl:comment> This row intentionally left blank </xsl:comment></tr>
-
-      <xsl:apply-templates select="following-sibling::row[1]">
-	<xsl:with-param name="spans">
-	  <xsl:call-template name="consume-row">
-	    <xsl:with-param name="spans" select="$spans"/>
-	  </xsl:call-template>
-	</xsl:with-param>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="normal-row">
-  <xsl:param name="spans"/>
-
-  <xsl:variable name="row-height">
-    <xsl:if test="processing-instruction('dbhtml')">
-      <xsl:call-template name="pi.dbhtml_row-height"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="bgcolor">
-    <xsl:if test="processing-instruction('dbhtml')">
-      <xsl:call-template name="pi.dbhtml_bgcolor"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:variable name="class">
-    <xsl:if test="processing-instruction('dbhtml')">
-      <xsl:call-template name="pi.dbhtml_class"/>
-    </xsl:if>
-  </xsl:variable>
-
-  <tr>
-    <xsl:call-template name="tr.attributes">
-      <xsl:with-param name="rownum">
-        <xsl:number from="tgroup" count="row"/>
-      </xsl:with-param>
-    </xsl:call-template>
-
-    <xsl:if test="$row-height != ''">
-      <xsl:attribute name="height">
-        <xsl:value-of select="$row-height"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:if test="$bgcolor != ''">
-      <xsl:attribute name="bgcolor">
-        <xsl:value-of select="$bgcolor"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:if test="$class != ''">
-      <xsl:attribute name="class">
-        <xsl:value-of select="$class"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:if test="$table.borders.with.css != 0">
-      <xsl:if test="@rowsep = 1 and following-sibling::row">
-        <xsl:attribute name="style">
-          <xsl:call-template name="border">
-            <xsl:with-param name="side" select="'bottom'"/>
-          </xsl:call-template>
-        </xsl:attribute>
-      </xsl:if>
-    </xsl:if>
-
-    <xsl:if test="@align">
-      <xsl:attribute name="align">
-        <xsl:value-of select="@align"/>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:if test="@char">
-      <xsl:attribute name="char">
-        <xsl:value-of select="@char"/>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:if test="@charoff">
-      <xsl:attribute name="charoff">
-        <xsl:value-of select="@charoff"/>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:if test="@valign">
-      <xsl:attribute name="valign">
-        <xsl:value-of select="@valign"/>
-      </xsl:attribute>
-    </xsl:if>
-
-    <xsl:apply-templates select="(entry|entrytbl)[1]">
-      <xsl:with-param name="spans" select="$spans"/>
-    </xsl:apply-templates>
-  </tr>
-
-  <xsl:if test="following-sibling::row">
-    <xsl:variable name="nextspans">
-      <xsl:apply-templates select="(entry|entrytbl)[1]" mode="span">
-        <xsl:with-param name="spans" select="$spans"/>
-      </xsl:apply-templates>
-    </xsl:variable>
-
-    <xsl:apply-templates select="following-sibling::row[1]">
-      <xsl:with-param name="spans" select="$nextspans"/>
-    </xsl:apply-templates>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="entry|entrytbl" name="entry">
-  <xsl:param name="col" select="1"/>
-  <xsl:param name="spans"/>
-
-  <xsl:variable name="cellgi">
-    <xsl:choose>
-      <xsl:when test="ancestor::thead">th</xsl:when>
-      <xsl:when test="ancestor::tfoot">th</xsl:when>
-      <xsl:otherwise>td</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="empty.cell" select="count(node()) = 0"/>
-
-  <xsl:variable name="named.colnum">
-    <xsl:call-template name="entry.colnum"/>
-  </xsl:variable>
-
-  <xsl:variable name="entry.colnum">
-    <xsl:choose>
-      <xsl:when test="$named.colnum &gt; 0">
-        <xsl:value-of select="$named.colnum"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$col"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="entry.colspan">
-    <xsl:choose>
-      <xsl:when test="@spanname or @namest">
-        <xsl:call-template name="calculate.colspan"/>
-      </xsl:when>
-      <xsl:otherwise>1</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="following.spans">
-    <xsl:call-template name="calculate.following.spans">
-      <xsl:with-param name="colspan" select="$entry.colspan"/>
-      <xsl:with-param name="spans" select="$spans"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="rowsep">
-    <xsl:choose>
-      <!-- If this is the last row, rowsep never applies. -->
-      <xsl:when test="ancestor::entrytbl                       and not (ancestor-or-self::row[1]/following-sibling::row)">
-        <xsl:value-of select="0"/>
-      </xsl:when>
-      <xsl:when test="not(ancestor-or-self::row[1]/following-sibling::row                           or ancestor-or-self::thead/following-sibling::tbody                           or ancestor-or-self::tbody/preceding-sibling::tfoot)">
-        <xsl:value-of select="0"/>
-      </xsl:when>
-      <xsl:when test="@morerows and not(@morerows &lt;                   count(ancestor-or-self::row[1]/following-sibling::row))">
-        <xsl:value-of select="0"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="inherited.table.attribute">
-          <xsl:with-param name="entry" select="."/>
-          <xsl:with-param name="colnum" select="$entry.colnum"/>
-          <xsl:with-param name="attribute" select="'rowsep'"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="colsep">
-    <xsl:choose>
-      <!-- If this is the last column, colsep never applies. -->
-      <xsl:when test="$following.spans = ''">0</xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="inherited.table.attribute">
-          <xsl:with-param name="entry" select="."/>
-          <xsl:with-param name="colnum" select="$entry.colnum"/>
-          <xsl:with-param name="attribute" select="'colsep'"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="valign">
-    <xsl:call-template name="inherited.table.attribute">
-      <xsl:with-param name="entry" select="."/>
-      <xsl:with-param name="colnum" select="$entry.colnum"/>
-      <xsl:with-param name="attribute" select="'valign'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="align">
-    <xsl:call-template name="inherited.table.attribute">
-      <xsl:with-param name="entry" select="."/>
-      <xsl:with-param name="colnum" select="$entry.colnum"/>
-      <xsl:with-param name="attribute" select="'align'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="char">
-    <xsl:call-template name="inherited.table.attribute">
-      <xsl:with-param name="entry" select="."/>
-      <xsl:with-param name="colnum" select="$entry.colnum"/>
-      <xsl:with-param name="attribute" select="'char'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="charoff">
-    <xsl:call-template name="inherited.table.attribute">
-      <xsl:with-param name="entry" select="."/>
-      <xsl:with-param name="colnum" select="$entry.colnum"/>
-      <xsl:with-param name="attribute" select="'charoff'"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$spans != '' and not(starts-with($spans,'0:'))">
-      <xsl:call-template name="entry">
-        <xsl:with-param name="col" select="$col+1"/>
-        <xsl:with-param name="spans" select="substring-after($spans,':')"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:when test="number($entry.colnum) &gt; $col">
-      <xsl:call-template name="empty.table.cell"/>
-      <xsl:call-template name="entry">
-        <xsl:with-param name="col" select="$col+1"/>
-        <xsl:with-param name="spans" select="substring-after($spans,':')"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:variable name="bgcolor">
-        <xsl:if test="processing-instruction('dbhtml')">
-          <xsl:call-template name="pi.dbhtml_bgcolor"/>
-        </xsl:if>
-      </xsl:variable>
-
-      <xsl:element name="{$cellgi}" namespace="http://www.w3.org/1999/xhtml">
-        <xsl:if test="$bgcolor != ''">
-          <xsl:attribute name="bgcolor">
-            <xsl:value-of select="$bgcolor"/>
-          </xsl:attribute>
-        </xsl:if>
-
-        <xsl:if test="$entry.propagates.style != 0 and @role">
-          <xsl:apply-templates select="." mode="class.attribute">
-            <xsl:with-param name="class" select="@role"/>
-          </xsl:apply-templates>
-        </xsl:if>
-
-        <xsl:if test="$show.revisionflag and @revisionflag">
-          <xsl:attribute name="class">
-            <xsl:value-of select="@revisionflag"/>
-          </xsl:attribute>
-        </xsl:if>
-
-        <xsl:if test="$table.borders.with.css != 0">
-          <xsl:attribute name="style">
-            <xsl:if test="$colsep &gt; 0">
-              <xsl:call-template name="border">
-                <xsl:with-param name="side" select="'right'"/>
-              </xsl:call-template>
-            </xsl:if>
-            <xsl:if test="$rowsep &gt; 0">
-              <xsl:call-template name="border">
-                <xsl:with-param name="side" select="'bottom'"/>
-              </xsl:call-template>
-            </xsl:if>
-          </xsl:attribute>
-        </xsl:if>
-
-        <xsl:if test="@morerows &gt; 0">
-          <xsl:attribute name="rowspan">
-            <xsl:value-of select="1+@morerows"/>
-          </xsl:attribute>
-        </xsl:if>
-
-        <xsl:if test="$entry.colspan &gt; 1">
-          <xsl:attribute name="colspan">
-            <xsl:value-of select="$entry.colspan"/>
-          </xsl:attribute>
-        </xsl:if>
-
-        <xsl:if test="$align != ''">
-          <xsl:attribute name="align">
-            <xsl:value-of select="$align"/>
-          </xsl:attribute>
-        </xsl:if>
-
-        <xsl:if test="$valign != ''">
-          <xsl:attribute name="valign">
-            <xsl:value-of select="$valign"/>
-          </xsl:attribute>
-        </xsl:if>
-
-        <xsl:if test="$char != ''">
-          <xsl:attribute name="char">
-            <xsl:value-of select="$char"/>
-          </xsl:attribute>
-        </xsl:if>
-
-        <xsl:if test="$charoff != ''">
-          <xsl:attribute name="charoff">
-            <xsl:value-of select="$charoff"/>
-          </xsl:attribute>
-        </xsl:if>
-
-        <xsl:if test="not(preceding-sibling::*) and                      (ancestor::row[1]/@id or ancestor::row[1]/@xml:id)">
-          <xsl:call-template name="anchor">
-            <xsl:with-param name="node" select="ancestor::row[1]"/>
-          </xsl:call-template>
-        </xsl:if>
-
-        <xsl:call-template name="anchor"/>
-
-        <xsl:choose>
-          <xsl:when test="$empty.cell">
-            <xsl:text>&#160;</xsl:text>
-          </xsl:when>
-          <xsl:when test="self::entrytbl">
-            <xsl:call-template name="tgroup"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:element>
-
-      <xsl:choose>
-        <xsl:when test="following-sibling::entry|following-sibling::entrytbl">
-          <xsl:apply-templates select="(following-sibling::entry                                        |following-sibling::entrytbl)[1]">
-            <xsl:with-param name="col" select="$col+$entry.colspan"/>
-            <xsl:with-param name="spans" select="$following.spans"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="finaltd">
-            <xsl:with-param name="spans" select="$following.spans"/>
-            <xsl:with-param name="col" select="$col+$entry.colspan"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="entry|entrytbl" name="sentry" mode="span">
-  <xsl:param name="col" select="1"/>
-  <xsl:param name="spans"/>
-
-  <xsl:variable name="entry.colnum">
-    <xsl:call-template name="entry.colnum"/>
-  </xsl:variable>
-
-  <xsl:variable name="entry.colspan">
-    <xsl:choose>
-      <xsl:when test="@spanname or @namest">
-        <xsl:call-template name="calculate.colspan"/>
-      </xsl:when>
-      <xsl:otherwise>1</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="following.spans">
-    <xsl:call-template name="calculate.following.spans">
-      <xsl:with-param name="colspan" select="$entry.colspan"/>
-      <xsl:with-param name="spans" select="$spans"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$spans != '' and not(starts-with($spans,'0:'))">
-      <xsl:value-of select="substring-before($spans,':')-1"/>
-      <xsl:text>:</xsl:text>
-      <xsl:call-template name="sentry">
-        <xsl:with-param name="col" select="$col+1"/>
-        <xsl:with-param name="spans" select="substring-after($spans,':')"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:when test="number($entry.colnum) &gt; $col">
-      <xsl:text>0:</xsl:text>
-      <xsl:call-template name="sentry">
-        <xsl:with-param name="col" select="$col+$entry.colspan"/>
-        <xsl:with-param name="spans" select="$following.spans"/>
-      </xsl:call-template>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:call-template name="copy-string">
-        <xsl:with-param name="count" select="$entry.colspan"/>
-        <xsl:with-param name="string">
-          <xsl:choose>
-            <xsl:when test="@morerows">
-              <xsl:value-of select="@morerows"/>
-            </xsl:when>
-            <xsl:otherwise>0</xsl:otherwise>
-          </xsl:choose>
-          <xsl:text>:</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-
-      <xsl:choose>
-        <xsl:when test="following-sibling::entry|following-sibling::entrytbl">
-          <xsl:apply-templates select="(following-sibling::entry                                         |following-sibling::entrytbl)[1]" mode="span">
-            <xsl:with-param name="col" select="$col+$entry.colspan"/>
-            <xsl:with-param name="spans" select="$following.spans"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="sfinaltd">
-            <xsl:with-param name="spans" select="$following.spans"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="generate.colgroup">
-  <xsl:param name="cols" select="1"/>
-  <xsl:param name="count" select="1"/>
-  <xsl:choose>
-    <xsl:when test="$count &gt; $cols"/>
-    <xsl:otherwise>
-      <xsl:call-template name="generate.col">
-        <xsl:with-param name="countcol" select="$count"/>
-      </xsl:call-template>
-      <xsl:call-template name="generate.colgroup">
-        <xsl:with-param name="cols" select="$cols"/>
-        <xsl:with-param name="count" select="$count+1"/>
-      </xsl:call-template>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="generate.col">
-  <xsl:param name="countcol">1</xsl:param>
-  <xsl:param name="colspecs" select="./colspec"/>
-  <xsl:param name="count">1</xsl:param>
-  <xsl:param name="colnum">1</xsl:param>
-
-  <xsl:choose>
-    <xsl:when test="$count&gt;count($colspecs)">
-      <col/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:variable name="colspec" select="$colspecs[$count=position()]"/>
-      <xsl:variable name="colspec.colnum">
-        <xsl:choose>
-          <xsl:when test="$colspec/@colnum">
-            <xsl:value-of select="$colspec/@colnum"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$colnum"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="$colspec.colnum=$countcol">
-          <col>
-            <xsl:if test="$colspec/@colwidth                           and $use.extensions != 0                           and $tablecolumns.extension != 0">
-              <xsl:attribute name="width">
-	        <xsl:choose>
-		  <xsl:when test="normalize-space($colspec/@colwidth) = '*'">
-                    <xsl:value-of select="'1*'"/>
-		  </xsl:when>
-		  <xsl:otherwise>
-                    <xsl:value-of select="$colspec/@colwidth"/>
-		  </xsl:otherwise>
-		</xsl:choose>
-              </xsl:attribute>
-            </xsl:if>
-
-            <xsl:choose>
-              <xsl:when test="$colspec/@align">
-                <xsl:attribute name="align">
-                  <xsl:value-of select="$colspec/@align"/>
-                </xsl:attribute>
-              </xsl:when>
-              <!-- Suggested by Pavel ZAMPACH <zampach@nemcb.cz> -->
-              <xsl:when test="$colspecs/ancestor::tgroup/@align">
-                <xsl:attribute name="align">
-                  <xsl:value-of select="$colspecs/ancestor::tgroup/@align"/>
-                </xsl:attribute>
-              </xsl:when>
-            </xsl:choose>
-
-            <xsl:if test="$colspec/@char">
-              <xsl:attribute name="char">
-                <xsl:value-of select="$colspec/@char"/>
-              </xsl:attribute>
-            </xsl:if>
-            <xsl:if test="$colspec/@charoff">
-              <xsl:attribute name="charoff">
-                <xsl:value-of select="$colspec/@charoff"/>
-              </xsl:attribute>
-            </xsl:if>
-          </col>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="generate.col">
-            <xsl:with-param name="countcol" select="$countcol"/>
-            <xsl:with-param name="colspecs" select="$colspecs"/>
-            <xsl:with-param name="count" select="$count+1"/>
-            <xsl:with-param name="colnum">
-              <xsl:choose>
-                <xsl:when test="$colspec/@colnum">
-                  <xsl:value-of select="$colspec/@colnum + 1"/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:value-of select="$colnum + 1"/>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:with-param>
-           </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="colspec.colwidth">
-  <!-- when this macro is called, the current context must be an entry -->
-  <xsl:param name="colname"/>
-  <!-- .. = row, ../.. = thead|tbody, ../../.. = tgroup -->
-  <xsl:param name="colspecs" select="../../../../tgroup/colspec"/>
-  <xsl:param name="count">1</xsl:param>
-  <xsl:choose>
-    <xsl:when test="$count&gt;count($colspecs)"/>
-    <xsl:otherwise>
-      <xsl:variable name="colspec" select="$colspecs[$count=position()]"/>
-      <xsl:choose>
-        <xsl:when test="$colspec/@colname=$colname">
-          <xsl:value-of select="$colspec/@colwidth"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="colspec.colwidth">
-            <xsl:with-param name="colname" select="$colname"/>
-            <xsl:with-param name="colspecs" select="$colspecs"/>
-            <xsl:with-param name="count" select="$count+1"/>
-          </xsl:call-template>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ====================================================================== -->
-
-<xsl:template name="tr.attributes">
-  <xsl:param name="row" select="."/>
-  <xsl:param name="rownum" select="0"/>
-
-  <!-- by default, do nothing. But you might want to say:
-
-  <xsl:if test="$rownum mod 2 = 0">
-    <xsl:attribute name="class">oddrow</xsl:attribute>
-  </xsl:if>
-
-  -->
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/task.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/task.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,73 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="task">
-  <xsl:variable name="param.placement" select="substring-after(normalize-space($formal.title.placement),                                         concat(local-name(.), ' '))"/>
-
-  <xsl:variable name="placement">
-    <xsl:choose>
-      <xsl:when test="contains($param.placement, ' ')">
-        <xsl:value-of select="substring-before($param.placement, ' ')"/>
-      </xsl:when>
-      <xsl:when test="$param.placement = ''">before</xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$param.placement"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="preamble" select="*[not(self::title                               or self::titleabbrev)]"/>
-
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor"/>
-
-    <xsl:if test="title and $placement = 'before'">
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-
-    <xsl:apply-templates select="$preamble"/>
-
-    <xsl:if test="title and $placement != 'before'">
-      <xsl:call-template name="formal.object.heading"/>
-    </xsl:if>
-  </div>
-</xsl:template>
-
-<xsl:template match="task/title">
-  <!-- nop -->
-</xsl:template>
-
-<xsl:template match="tasksummary">
-  <xsl:call-template name="semiformal.object"/>
-</xsl:template>
-
-<xsl:template match="tasksummary/title"/>
-
-<xsl:template match="taskprerequisites">
-  <xsl:call-template name="semiformal.object"/>
-</xsl:template>
-
-<xsl:template match="taskprerequisites/title"/>
-
-<xsl:template match="taskrelated">
-  <xsl:call-template name="semiformal.object"/>
-</xsl:template>
-
-<xsl:template match="taskrelated/title"/>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/titlepage.templates.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/titlepage.templates.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,3622 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exsl="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" version="1.0" exclude-result-prefixes="exsl">
-
-<!-- This stylesheet was created by template/titlepage.xsl-->
-
-<xsl:template name="article.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="articleinfo/title">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/title"/>
-    </xsl:when>
-    <xsl:when test="artheader/title">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="articleinfo/subtitle">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="artheader/subtitle">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/corpauthor"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/corpauthor"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/authorgroup"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/authorgroup"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/author"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/author"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/othercredit"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/othercredit"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/releaseinfo"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/releaseinfo"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/copyright"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/copyright"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/legalnotice"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/legalnotice"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/pubdate"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/pubdate"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/revision"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/revision"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/revhistory"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/revhistory"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="articleinfo/abstract"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="artheader/abstract"/>
-  <xsl:apply-templates mode="article.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="article.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="article.titlepage.separator"><hr/>
-</xsl:template>
-
-<xsl:template name="article.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="article.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="article.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="article.titlepage.before.recto"/>
-      <xsl:call-template name="article.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="article.titlepage.before.verso"/>
-      <xsl:call-template name="article.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="article.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="article.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="article.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="article.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="article.titlepage.recto.style">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="article.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="article.titlepage.recto.style">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="article.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="article.titlepage.recto.style">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="article.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="article.titlepage.recto.style">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="article.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="article.titlepage.recto.style">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="article.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="article.titlepage.recto.style">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="article.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="article.titlepage.recto.style">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="article.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="article.titlepage.recto.style">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="article.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="article.titlepage.recto.style">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="article.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="article.titlepage.recto.style">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="article.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="article.titlepage.recto.style">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="article.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="article.titlepage.recto.style">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="article.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="article.titlepage.recto.style">
-<xsl:apply-templates select="." mode="article.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="set.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="setinfo/title">
-      <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="setinfo/subtitle">
-      <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/corpauthor"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/authorgroup"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/author"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/othercredit"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/releaseinfo"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/copyright"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/legalnotice"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/pubdate"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/revision"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/revhistory"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="setinfo/abstract"/>
-  <xsl:apply-templates mode="set.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="set.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="set.titlepage.separator"><hr/>
-</xsl:template>
-
-<xsl:template name="set.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="set.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="set.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="set.titlepage.before.recto"/>
-      <xsl:call-template name="set.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="set.titlepage.before.verso"/>
-      <xsl:call-template name="set.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="set.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="set.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="set.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="set.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="set.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="set.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="set.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="set.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="set.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="set.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="set.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="set.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="set.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="set.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="set.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="set.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="set.titlepage.recto.style">
-<xsl:apply-templates select="." mode="set.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="book.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="bookinfo/title">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="bookinfo/subtitle">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/corpauthor"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/authorgroup"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/author"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/othercredit"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/releaseinfo"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/copyright"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/legalnotice"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/pubdate"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/revision"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/revhistory"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="bookinfo/abstract"/>
-  <xsl:apply-templates mode="book.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="book.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="book.titlepage.separator"><hr/>
-</xsl:template>
-
-<xsl:template name="book.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="book.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="book.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="book.titlepage.before.recto"/>
-      <xsl:call-template name="book.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="book.titlepage.before.verso"/>
-      <xsl:call-template name="book.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="book.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="book.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="book.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="book.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="book.titlepage.recto.style">
-<xsl:apply-templates select="." mode="book.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="part.titlepage.recto">
-  <div xsl:use-attribute-sets="part.titlepage.recto.style">
-<xsl:call-template name="division.title">
-<xsl:with-param name="node" select="ancestor-or-self::part[1]"/>
-</xsl:call-template></div>
-  <xsl:choose>
-    <xsl:when test="partinfo/subtitle">
-      <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/corpauthor"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/authorgroup"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/author"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/author"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/othercredit"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/releaseinfo"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/copyright"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/copyright"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/legalnotice"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/pubdate"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/revision"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/revision"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/revhistory"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="partinfo/abstract"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="docinfo/abstract"/>
-  <xsl:apply-templates mode="part.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="part.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="part.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="part.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="part.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="part.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="part.titlepage.before.recto"/>
-      <xsl:call-template name="part.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="part.titlepage.before.verso"/>
-      <xsl:call-template name="part.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="part.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="part.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="part.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="part.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="part.titlepage.recto.style">
-<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="part.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="part.titlepage.recto.style">
-<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="part.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="part.titlepage.recto.style">
-<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="part.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="part.titlepage.recto.style">
-<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="part.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="part.titlepage.recto.style">
-<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="part.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="part.titlepage.recto.style">
-<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="part.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="part.titlepage.recto.style">
-<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="part.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="part.titlepage.recto.style">
-<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="part.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="part.titlepage.recto.style">
-<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="part.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="part.titlepage.recto.style">
-<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="part.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="part.titlepage.recto.style">
-<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="part.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="part.titlepage.recto.style">
-<xsl:apply-templates select="." mode="part.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="partintro.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="partintroinfo/title">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="partintroinfo/subtitle">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/corpauthor"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/authorgroup"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/author"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/author"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/othercredit"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/releaseinfo"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/copyright"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/copyright"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/legalnotice"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/pubdate"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/revision"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/revision"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/revhistory"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="partintroinfo/abstract"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="docinfo/abstract"/>
-  <xsl:apply-templates mode="partintro.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="partintro.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="partintro.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="partintro.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="partintro.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="partintro.titlepage">
-  <div>
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="partintro.titlepage.before.recto"/>
-      <xsl:call-template name="partintro.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="partintro.titlepage.before.verso"/>
-      <xsl:call-template name="partintro.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="partintro.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="partintro.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="partintro.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="partintro.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="partintro.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="partintro.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="partintro.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="partintro.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="partintro.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="partintro.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="partintro.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="partintro.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="partintro.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="partintro.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="partintro.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="partintro.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="partintro.titlepage.recto.style">
-<xsl:apply-templates select="." mode="partintro.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="reference.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="referenceinfo/title">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="referenceinfo/subtitle">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/corpauthor"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/authorgroup"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/author"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/author"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/othercredit"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/releaseinfo"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/copyright"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/copyright"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/legalnotice"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/pubdate"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/revision"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/revision"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/revhistory"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="referenceinfo/abstract"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="docinfo/abstract"/>
-  <xsl:apply-templates mode="reference.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="reference.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="reference.titlepage.separator"><hr/>
-</xsl:template>
-
-<xsl:template name="reference.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="reference.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="reference.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="reference.titlepage.before.recto"/>
-      <xsl:call-template name="reference.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="reference.titlepage.before.verso"/>
-      <xsl:call-template name="reference.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="reference.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="reference.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="reference.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="reference.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="reference.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="reference.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="reference.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="reference.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="reference.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="reference.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="reference.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="reference.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="reference.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="reference.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="reference.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="reference.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="reference.titlepage.recto.style">
-<xsl:apply-templates select="." mode="reference.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="refentry.titlepage.recto">
-</xsl:template>
-
-<xsl:template name="refentry.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="refentry.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="refentry.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="refentry.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="refentry.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="refentry.titlepage.before.recto"/>
-      <xsl:call-template name="refentry.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="refentry.titlepage.before.verso"/>
-      <xsl:call-template name="refentry.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="refentry.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="refentry.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="refentry.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template name="dedication.titlepage.recto">
-  <div xsl:use-attribute-sets="dedication.titlepage.recto.style">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::dedication[1]"/>
-</xsl:call-template></div>
-  <xsl:choose>
-    <xsl:when test="dedicationinfo/subtitle">
-      <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="dedicationinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="dedication.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="dedication.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="dedication.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="dedication.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="dedication.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="dedication.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="dedication.titlepage.before.recto"/>
-      <xsl:call-template name="dedication.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="dedication.titlepage.before.verso"/>
-      <xsl:call-template name="dedication.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="dedication.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="dedication.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="dedication.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="dedication.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="dedication.titlepage.recto.style">
-<xsl:apply-templates select="." mode="dedication.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="preface.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="prefaceinfo/title">
-      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="prefaceinfo/subtitle">
-      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/corpauthor"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/authorgroup"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/author"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/author"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/othercredit"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/releaseinfo"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/copyright"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/copyright"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/legalnotice"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/pubdate"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/revision"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/revision"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/revhistory"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="prefaceinfo/abstract"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="docinfo/abstract"/>
-  <xsl:apply-templates mode="preface.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="preface.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="preface.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="preface.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="preface.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="preface.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="preface.titlepage.before.recto"/>
-      <xsl:call-template name="preface.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="preface.titlepage.before.verso"/>
-      <xsl:call-template name="preface.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="preface.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="preface.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="preface.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="preface.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="preface.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="preface.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="preface.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="preface.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="preface.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="preface.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="preface.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="preface.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="preface.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="preface.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="preface.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="preface.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="preface.titlepage.recto.style">
-<xsl:apply-templates select="." mode="preface.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="chapter.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="chapterinfo/title">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="chapterinfo/subtitle">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/corpauthor"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/authorgroup"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/author"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/author"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/othercredit"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/releaseinfo"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/copyright"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/copyright"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/legalnotice"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/pubdate"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/revision"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/revision"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/revhistory"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="chapterinfo/abstract"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="docinfo/abstract"/>
-  <xsl:apply-templates mode="chapter.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="chapter.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="chapter.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="chapter.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="chapter.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="chapter.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="chapter.titlepage.before.recto"/>
-      <xsl:call-template name="chapter.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="chapter.titlepage.before.verso"/>
-      <xsl:call-template name="chapter.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="chapter.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="chapter.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="chapter.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="chapter.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="chapter.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="chapter.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="chapter.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="chapter.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="chapter.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="chapter.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="chapter.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="chapter.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="chapter.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="chapter.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="chapter.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="chapter.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="chapter.titlepage.recto.style">
-<xsl:apply-templates select="." mode="chapter.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="appendix.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="appendixinfo/title">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="appendixinfo/subtitle">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/corpauthor"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/authorgroup"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/author"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/author"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/othercredit"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/releaseinfo"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/copyright"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/copyright"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/legalnotice"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/pubdate"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/revision"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/revision"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/revhistory"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="appendixinfo/abstract"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="docinfo/abstract"/>
-  <xsl:apply-templates mode="appendix.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="appendix.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="appendix.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="appendix.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="appendix.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="appendix.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="appendix.titlepage.before.recto"/>
-      <xsl:call-template name="appendix.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="appendix.titlepage.before.verso"/>
-      <xsl:call-template name="appendix.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="appendix.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="appendix.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="appendix.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="appendix.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="appendix.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="appendix.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="appendix.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="appendix.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="appendix.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="appendix.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="appendix.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="appendix.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="appendix.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="appendix.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="appendix.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="appendix.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="appendix.titlepage.recto.style">
-<xsl:apply-templates select="." mode="appendix.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="section.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="sectioninfo/title">
-      <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="sectioninfo/subtitle">
-      <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/corpauthor"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/authorgroup"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/author"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/othercredit"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/releaseinfo"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/copyright"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/legalnotice"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/pubdate"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/revision"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/revhistory"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="sectioninfo/abstract"/>
-  <xsl:apply-templates mode="section.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="section.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="section.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
-</xsl:template>
-
-<xsl:template name="section.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="section.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="section.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="section.titlepage.before.recto"/>
-      <xsl:call-template name="section.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="section.titlepage.before.verso"/>
-      <xsl:call-template name="section.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="section.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="section.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="section.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="section.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="section.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="section.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="section.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="section.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="section.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="section.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="section.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="section.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="section.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="section.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="section.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="section.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="section.titlepage.recto.style">
-<xsl:apply-templates select="." mode="section.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="sect1.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="sect1info/title">
-      <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="sect1info/subtitle">
-      <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/corpauthor"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/authorgroup"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/author"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/othercredit"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/releaseinfo"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/copyright"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/legalnotice"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/pubdate"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/revision"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/revhistory"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="sect1info/abstract"/>
-  <xsl:apply-templates mode="sect1.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="sect1.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="sect1.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
-</xsl:template>
-
-<xsl:template name="sect1.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="sect1.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="sect1.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="sect1.titlepage.before.recto"/>
-      <xsl:call-template name="sect1.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="sect1.titlepage.before.verso"/>
-      <xsl:call-template name="sect1.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="sect1.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="sect1.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="sect1.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="sect1.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="sect1.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="sect1.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="sect1.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="sect1.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="sect1.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="sect1.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="sect1.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="sect1.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="sect1.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="sect1.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="sect1.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="sect1.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect1.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect1.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="sect2.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="sect2info/title">
-      <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="sect2info/subtitle">
-      <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/corpauthor"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/authorgroup"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/author"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/othercredit"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/releaseinfo"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/copyright"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/legalnotice"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/pubdate"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/revision"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/revhistory"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="sect2info/abstract"/>
-  <xsl:apply-templates mode="sect2.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="sect2.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="sect2.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
-</xsl:template>
-
-<xsl:template name="sect2.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="sect2.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="sect2.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="sect2.titlepage.before.recto"/>
-      <xsl:call-template name="sect2.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="sect2.titlepage.before.verso"/>
-      <xsl:call-template name="sect2.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="sect2.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="sect2.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="sect2.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="sect2.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="sect2.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="sect2.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="sect2.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="sect2.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="sect2.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="sect2.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="sect2.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="sect2.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="sect2.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="sect2.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="sect2.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="sect2.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect2.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect2.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="sect3.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="sect3info/title">
-      <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="sect3info/subtitle">
-      <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/corpauthor"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/authorgroup"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/author"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/othercredit"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/releaseinfo"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/copyright"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/legalnotice"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/pubdate"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/revision"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/revhistory"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="sect3info/abstract"/>
-  <xsl:apply-templates mode="sect3.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="sect3.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="sect3.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
-</xsl:template>
-
-<xsl:template name="sect3.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="sect3.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="sect3.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="sect3.titlepage.before.recto"/>
-      <xsl:call-template name="sect3.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="sect3.titlepage.before.verso"/>
-      <xsl:call-template name="sect3.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="sect3.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="sect3.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="sect3.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="sect3.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="sect3.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="sect3.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="sect3.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="sect3.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="sect3.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="sect3.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="sect3.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="sect3.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="sect3.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="sect3.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="sect3.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="sect3.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect3.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect3.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="sect4.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="sect4info/title">
-      <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="sect4info/subtitle">
-      <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/corpauthor"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/authorgroup"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/author"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/othercredit"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/releaseinfo"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/copyright"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/legalnotice"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/pubdate"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/revision"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/revhistory"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="sect4info/abstract"/>
-  <xsl:apply-templates mode="sect4.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="sect4.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="sect4.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
-</xsl:template>
-
-<xsl:template name="sect4.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="sect4.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="sect4.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="sect4.titlepage.before.recto"/>
-      <xsl:call-template name="sect4.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="sect4.titlepage.before.verso"/>
-      <xsl:call-template name="sect4.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="sect4.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="sect4.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="sect4.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="sect4.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="sect4.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="sect4.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="sect4.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="sect4.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="sect4.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="sect4.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="sect4.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="sect4.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="sect4.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="sect4.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="sect4.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="sect4.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect4.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect4.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="sect5.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="sect5info/title">
-      <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="sect5info/subtitle">
-      <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/corpauthor"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/authorgroup"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/author"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/othercredit"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/releaseinfo"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/copyright"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/legalnotice"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/pubdate"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/revision"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/revhistory"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="sect5info/abstract"/>
-  <xsl:apply-templates mode="sect5.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="sect5.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="sect5.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
-</xsl:template>
-
-<xsl:template name="sect5.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="sect5.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="sect5.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="sect5.titlepage.before.recto"/>
-      <xsl:call-template name="sect5.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="sect5.titlepage.before.verso"/>
-      <xsl:call-template name="sect5.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="sect5.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="sect5.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="sect5.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="sect5.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="sect5.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="sect5.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="sect5.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="sect5.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="sect5.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="sect5.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="sect5.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="sect5.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="sect5.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="sect5.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="sect5.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="sect5.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="sect5.titlepage.recto.style">
-<xsl:apply-templates select="." mode="sect5.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="simplesect.titlepage.recto">
-  <xsl:choose>
-    <xsl:when test="simplesectinfo/title">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/title"/>
-    </xsl:when>
-    <xsl:when test="docinfo/title">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/title"/>
-    </xsl:when>
-    <xsl:when test="info/title">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/title"/>
-    </xsl:when>
-    <xsl:when test="title">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="title"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:choose>
-    <xsl:when test="simplesectinfo/subtitle">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/corpauthor"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/corpauthor"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/corpauthor"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/authorgroup"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/authorgroup"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/authorgroup"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/author"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/author"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/author"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/othercredit"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/othercredit"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/othercredit"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/releaseinfo"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/releaseinfo"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/releaseinfo"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/copyright"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/copyright"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/copyright"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/legalnotice"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/legalnotice"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/legalnotice"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/pubdate"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/pubdate"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/pubdate"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/revision"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/revision"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/revision"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/revhistory"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/revhistory"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/revhistory"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="simplesectinfo/abstract"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="docinfo/abstract"/>
-  <xsl:apply-templates mode="simplesect.titlepage.recto.auto.mode" select="info/abstract"/>
-</xsl:template>
-
-<xsl:template name="simplesect.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="simplesect.titlepage.separator"><xsl:if test="count(parent::*)='0'"><hr/></xsl:if>
-</xsl:template>
-
-<xsl:template name="simplesect.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="simplesect.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="simplesect.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="simplesect.titlepage.before.recto"/>
-      <xsl:call-template name="simplesect.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="simplesect.titlepage.before.verso"/>
-      <xsl:call-template name="simplesect.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="simplesect.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="simplesect.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="simplesect.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="title" mode="simplesect.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="simplesect.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="simplesect.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="simplesect.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="author" mode="simplesect.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="simplesect.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="simplesect.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="copyright" mode="simplesect.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="simplesect.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="simplesect.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revision" mode="simplesect.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="simplesect.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template match="abstract" mode="simplesect.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="simplesect.titlepage.recto.style">
-<xsl:apply-templates select="." mode="simplesect.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="bibliography.titlepage.recto">
-  <div xsl:use-attribute-sets="bibliography.titlepage.recto.style">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::bibliography[1]"/>
-</xsl:call-template></div>
-  <xsl:choose>
-    <xsl:when test="bibliographyinfo/subtitle">
-      <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="bibliographyinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="bibliography.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="bibliography.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="bibliography.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="bibliography.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="bibliography.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="bibliography.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="bibliography.titlepage.before.recto"/>
-      <xsl:call-template name="bibliography.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="bibliography.titlepage.before.verso"/>
-      <xsl:call-template name="bibliography.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="bibliography.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="bibliography.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="bibliography.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="bibliography.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="bibliography.titlepage.recto.style">
-<xsl:apply-templates select="." mode="bibliography.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="glossary.titlepage.recto">
-  <div xsl:use-attribute-sets="glossary.titlepage.recto.style">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::glossary[1]"/>
-</xsl:call-template></div>
-  <xsl:choose>
-    <xsl:when test="glossaryinfo/subtitle">
-      <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="glossaryinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="glossary.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="glossary.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="glossary.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="glossary.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="glossary.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="glossary.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="glossary.titlepage.before.recto"/>
-      <xsl:call-template name="glossary.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="glossary.titlepage.before.verso"/>
-      <xsl:call-template name="glossary.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="glossary.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="glossary.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="glossary.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="glossary.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="glossary.titlepage.recto.style">
-<xsl:apply-templates select="." mode="glossary.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="index.titlepage.recto">
-  <div xsl:use-attribute-sets="index.titlepage.recto.style">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::index[1]"/>
-</xsl:call-template></div>
-  <xsl:choose>
-    <xsl:when test="indexinfo/subtitle">
-      <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="indexinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="index.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="index.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="index.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="index.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="index.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="index.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="index.titlepage.before.recto"/>
-      <xsl:call-template name="index.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="index.titlepage.before.verso"/>
-      <xsl:call-template name="index.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="index.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="index.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="index.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="index.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="index.titlepage.recto.style">
-<xsl:apply-templates select="." mode="index.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-<xsl:template name="setindex.titlepage.recto">
-  <div xsl:use-attribute-sets="setindex.titlepage.recto.style">
-<xsl:call-template name="component.title">
-<xsl:with-param name="node" select="ancestor-or-self::setindex[1]"/>
-</xsl:call-template></div>
-  <xsl:choose>
-    <xsl:when test="setindexinfo/subtitle">
-      <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="setindexinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="docinfo/subtitle">
-      <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="docinfo/subtitle"/>
-    </xsl:when>
-    <xsl:when test="info/subtitle">
-      <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="info/subtitle"/>
-    </xsl:when>
-    <xsl:when test="subtitle">
-      <xsl:apply-templates mode="setindex.titlepage.recto.auto.mode" select="subtitle"/>
-    </xsl:when>
-  </xsl:choose>
-
-</xsl:template>
-
-<xsl:template name="setindex.titlepage.verso">
-</xsl:template>
-
-<xsl:template name="setindex.titlepage.separator">
-</xsl:template>
-
-<xsl:template name="setindex.titlepage.before.recto">
-</xsl:template>
-
-<xsl:template name="setindex.titlepage.before.verso">
-</xsl:template>
-
-<xsl:template name="setindex.titlepage">
-  <div class="titlepage">
-    <xsl:variable name="recto.content">
-      <xsl:call-template name="setindex.titlepage.before.recto"/>
-      <xsl:call-template name="setindex.titlepage.recto"/>
-    </xsl:variable>
-    <xsl:variable name="recto.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($recto.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($recto.content) != '') or ($recto.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$recto.content"/></div>
-    </xsl:if>
-    <xsl:variable name="verso.content">
-      <xsl:call-template name="setindex.titlepage.before.verso"/>
-      <xsl:call-template name="setindex.titlepage.verso"/>
-    </xsl:variable>
-    <xsl:variable name="verso.elements.count">
-      <xsl:choose>
-        <xsl:when test="function-available('exsl:node-set')"><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:when test="contains(system-property('xsl:vendor'), 'Apache Software Foundation')">
-          <!--Xalan quirk--><xsl:value-of select="count(exsl:node-set($verso.content)/*)"/></xsl:when>
-        <xsl:otherwise>1</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:if test="(normalize-space($verso.content) != '') or ($verso.elements.count &gt; 0)">
-      <div><xsl:copy-of select="$verso.content"/></div>
-    </xsl:if>
-    <xsl:call-template name="setindex.titlepage.separator"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="*" mode="setindex.titlepage.recto.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="*" mode="setindex.titlepage.verso.mode">
-  <!-- if an element isn't found in this mode, -->
-  <!-- try the generic titlepage.mode -->
-  <xsl:apply-templates select="." mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="subtitle" mode="setindex.titlepage.recto.auto.mode">
-<div xsl:use-attribute-sets="setindex.titlepage.recto.style">
-<xsl:apply-templates select="." mode="setindex.titlepage.recto.mode"/>
-</div>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/titlepage.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/titlepage.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,960 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:attribute-set name="book.titlepage.recto.style"/>
-<xsl:attribute-set name="book.titlepage.verso.style"/>
-
-<xsl:attribute-set name="article.titlepage.recto.style"/>
-<xsl:attribute-set name="article.titlepage.verso.style"/>
-
-<xsl:attribute-set name="set.titlepage.recto.style"/>
-<xsl:attribute-set name="set.titlepage.verso.style"/>
-
-<xsl:attribute-set name="part.titlepage.recto.style"/>
-<xsl:attribute-set name="part.titlepage.verso.style"/>
-
-<xsl:attribute-set name="partintro.titlepage.recto.style"/>
-<xsl:attribute-set name="partintro.titlepage.verso.style"/>
-
-<xsl:attribute-set name="reference.titlepage.recto.style"/>
-<xsl:attribute-set name="reference.titlepage.verso.style"/>
-
-<xsl:attribute-set name="refentry.titlepage.recto.style"/>
-<xsl:attribute-set name="refentry.titlepage.verso.style"/>
-
-<xsl:attribute-set name="dedication.titlepage.recto.style"/>
-<xsl:attribute-set name="dedication.titlepage.verso.style"/>
-
-<xsl:attribute-set name="preface.titlepage.recto.style"/>
-<xsl:attribute-set name="preface.titlepage.verso.style"/>
-
-<xsl:attribute-set name="chapter.titlepage.recto.style"/>
-<xsl:attribute-set name="chapter.titlepage.verso.style"/>
-
-<xsl:attribute-set name="appendix.titlepage.recto.style"/>
-<xsl:attribute-set name="appendix.titlepage.verso.style"/>
-
-<xsl:attribute-set name="bibliography.titlepage.recto.style"/>
-<xsl:attribute-set name="bibliography.titlepage.verso.style"/>
-
-<xsl:attribute-set name="glossary.titlepage.recto.style"/>
-<xsl:attribute-set name="glossary.titlepage.verso.style"/>
-
-<xsl:attribute-set name="index.titlepage.recto.style"/>
-<xsl:attribute-set name="index.titlepage.verso.style"/>
-
-<xsl:attribute-set name="setindex.titlepage.recto.style"/>
-<xsl:attribute-set name="setindex.titlepage.verso.style"/>
-
-<xsl:attribute-set name="section.titlepage.recto.style"/>
-<xsl:attribute-set name="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="sect1.titlepage.recto.style" use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="sect1.titlepage.verso.style" use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="sect2.titlepage.recto.style" use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="sect2.titlepage.verso.style" use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="sect3.titlepage.recto.style" use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="sect3.titlepage.verso.style" use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="sect4.titlepage.recto.style" use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="sect4.titlepage.verso.style" use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="sect5.titlepage.recto.style" use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="sect5.titlepage.verso.style" use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="simplesect.titlepage.recto.style" use-attribute-sets="section.titlepage.recto.style"/>
-<xsl:attribute-set name="simplesect.titlepage.verso.style" use-attribute-sets="section.titlepage.verso.style"/>
-
-<xsl:attribute-set name="table.of.contents.titlepage.recto.style"/>
-<xsl:attribute-set name="table.of.contents.titlepage.verso.style"/>
-
-<xsl:attribute-set name="list.of.tables.titlepage.recto.style"/>
-<xsl:attribute-set name="list.of.tables.contents.titlepage.verso.style"/>
-
-<xsl:attribute-set name="list.of.figures.titlepage.recto.style"/>
-<xsl:attribute-set name="list.of.figures.contents.titlepage.verso.style"/>
-
-<xsl:attribute-set name="list.of.equations.titlepage.recto.style"/>
-<xsl:attribute-set name="list.of.equations.contents.titlepage.verso.style"/>
-
-<xsl:attribute-set name="list.of.examples.titlepage.recto.style"/>
-<xsl:attribute-set name="list.of.examples.contents.titlepage.verso.style"/>
-
-<xsl:attribute-set name="list.of.unknowns.titlepage.recto.style"/>
-<xsl:attribute-set name="list.of.unknowns.contents.titlepage.verso.style"/>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="titlepage.mode">
-  <!-- if an element isn't found in this mode, try the default mode -->
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template match="abbrev" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="abstract" mode="titlepage.mode">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor"/>
-    <xsl:if test="$abstract.notitle.enabled = 0">
-      <xsl:call-template name="formal.object.heading">
-        <xsl:with-param name="title">
-          <xsl:apply-templates select="." mode="title.markup"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:if>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <xsl:call-template name="process.footnotes"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="abstract/title" mode="titlepage.mode">
-</xsl:template>
-
-<xsl:template match="address" mode="titlepage.mode">
-  <xsl:param name="suppress-numbers" select="'0'"/>
-
-  <xsl:variable name="rtf">
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$suppress-numbers = '0'                     and @linenumbering = 'numbered'                     and $use.extensions != '0'                     and $linenumbering.extension != '0'">
-      <div>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:call-template name="paragraph">
-          <xsl:with-param name="content">
-            <xsl:call-template name="number.rtf.lines">
-              <xsl:with-param name="rtf" select="$rtf"/>
-            </xsl:call-template>
-          </xsl:with-param>
-        </xsl:call-template>
-      </div>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <div>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:call-template name="paragraph">
-          <xsl:with-param name="content">
-            <xsl:call-template name="make-verbatim">
-              <xsl:with-param name="rtf" select="$rtf"/>
-            </xsl:call-template>
-          </xsl:with-param>
-        </xsl:call-template>
-      </div>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="affiliation" mode="titlepage.mode">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="artpagenums" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="author|editor" mode="titlepage.mode">
-  <xsl:call-template name="credits.div"/>
-</xsl:template>
-
-<xsl:template name="credits.div">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="self::editor[position()=1] and not($editedby.enabled = 0)">
-      <h4 class="editedby"><xsl:call-template name="gentext.edited.by"/></h4>
-    </xsl:if>
-    <h3>
-      <xsl:apply-templates select="." mode="class.attribute"/>
-      <xsl:choose>
-        <xsl:when test="orgname">
-          <xsl:apply-templates/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="person.name"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </h3>
-    <xsl:if test="not($contrib.inline.enabled = 0)">
-      <xsl:apply-templates mode="titlepage.mode" select="contrib"/>
-    </xsl:if>
-    <xsl:apply-templates mode="titlepage.mode" select="affiliation"/>
-    <xsl:apply-templates mode="titlepage.mode" select="email"/>
-    <xsl:if test="not($blurb.on.titlepage.enabled = 0)">
-      <xsl:choose>
-        <xsl:when test="$contrib.inline.enabled = 0">
-          <xsl:apply-templates mode="titlepage.mode" select="contrib|authorblurb|personblurb"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates mode="titlepage.mode" select="authorblurb|personblurb"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-  </div>
-</xsl:template>
-
-<xsl:template match="authorblurb|personblurb" mode="titlepage.mode">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="titlepage.mode">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="anchor"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="authorinitials" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="bibliomisc" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="bibliomset" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="collab" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="collabname" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </span>
-</xsl:template>
-
-<xsl:template match="confgroup" mode="titlepage.mode">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="confdates" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="confsponsor" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="conftitle" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="confnum" mode="titlepage.mode">
-  <!-- suppress -->
-</xsl:template>
-
-<xsl:template match="contractnum" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="contractsponsor" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="contrib" mode="titlepage.mode">
-  <xsl:choose>
-    <xsl:when test="not($contrib.inline.enabled = 0)">
-      <span>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:apply-templates mode="titlepage.mode"/>
-      </span><xsl:text>&#160;</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>
-      <div>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <p><xsl:apply-templates mode="titlepage.mode"/></p>
-      </div>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="copyright" mode="titlepage.mode">
-  <p>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="'Copyright'"/>
-    </xsl:call-template>
-    <xsl:call-template name="gentext.space"/>
-    <xsl:call-template name="dingbat">
-      <xsl:with-param name="dingbat">copyright</xsl:with-param>
-    </xsl:call-template>
-    <xsl:call-template name="gentext.space"/>
-    <xsl:call-template name="copyright.years">
-      <xsl:with-param name="years" select="year"/>
-      <xsl:with-param name="print.ranges" select="$make.year.ranges"/>
-      <xsl:with-param name="single.year.ranges" select="$make.single.year.ranges"/>
-    </xsl:call-template>
-    <xsl:call-template name="gentext.space"/>
-    <xsl:apply-templates select="holder" mode="titlepage.mode"/>
-  </p>
-</xsl:template>
-
-<xsl:template match="year" mode="titlepage.mode">
-  <xsl:choose>
-    <xsl:when test="$show.revisionflag != 0 and @revisionflag">
-      <span class="{@revisionflag}">
-        <xsl:apply-templates mode="titlepage.mode"/>
-      </span>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="titlepage.mode"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="holder" mode="titlepage.mode">
-  <xsl:choose>
-    <xsl:when test="$show.revisionflag != 0 and @revisionflag">
-      <span class="{@revisionflag}">
-        <xsl:apply-templates mode="titlepage.mode"/>
-      </span>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates mode="titlepage.mode"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:if test="position() &lt; last()">
-    <xsl:text>, </xsl:text>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="corpauthor" mode="titlepage.mode">
-  <h3>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </h3>
-</xsl:template>
-
-<xsl:template match="corpcredit" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="corpname" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="date" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="edition" mode="titlepage.mode">
-  <p>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <xsl:call-template name="gentext.space"/>
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key" select="'Edition'"/>
-    </xsl:call-template>
-  </p>
-</xsl:template>
-
-<xsl:template match="email" mode="titlepage.mode">
-  <!-- use the normal e-mail handling code -->
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template match="firstname" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="graphic" mode="titlepage.mode">
-  <!-- use the normal graphic handling code -->
-  <xsl:apply-templates select="."/>
-</xsl:template>
-
-<xsl:template match="honorific" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="isbn" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="issn" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="biblioid" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="itermset" mode="titlepage.mode">
-</xsl:template>
-
-<xsl:template match="invpartnumber" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="issuenum" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="jobtitle" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="keywordset" mode="titlepage.mode">
-</xsl:template>
-
-<xsl:template match="legalnotice" mode="titlepage.mode">
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-  <xsl:choose>
-    <xsl:when test="$generate.legalnotice.link != 0">
-      <xsl:variable name="filename">
-        <xsl:call-template name="make-relative-filename">
-          <xsl:with-param name="base.dir" select="$base.dir"/>
-	  <xsl:with-param name="base.name" select="concat($id,$html.ext)"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="title">
-        <xsl:apply-templates select="." mode="title.markup"/>
-      </xsl:variable>
-
-      <xsl:variable name="href">
-        <xsl:apply-templates mode="chunk-filename" select="."/>
-      </xsl:variable>
-
-      <a href="{$href}">
-        <xsl:copy-of select="$title"/>
-      </a>
-
-      <xsl:call-template name="write.chunk">
-        <xsl:with-param name="filename" select="$filename"/>
-        <xsl:with-param name="quiet" select="$chunk.quietly"/>
-        <xsl:with-param name="content">
-        <xsl:call-template name="user.preroot"/>
-          <html>
-            <head>
-              <xsl:call-template name="system.head.content"/>
-              <xsl:call-template name="head.content"/>
-              <xsl:call-template name="user.head.content"/>
-            </head>
-            <body>
-              <xsl:call-template name="body.attributes"/>
-              <div>
-                <xsl:apply-templates select="." mode="class.attribute"/>
-                <xsl:apply-templates mode="titlepage.mode"/>
-              </div>
-            </body>
-          </html>
-          <xsl:value-of select="$chunk.append"/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <div>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <a id="{$id}"/>
-        <xsl:apply-templates mode="titlepage.mode"/>
-      </div>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="legalnotice/title" mode="titlepage.mode">
-  <p class="legalnotice-title"><b><xsl:apply-templates/></b></p>
-</xsl:template>
-
-<xsl:template match="lineage" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="modespec" mode="titlepage.mode">
-</xsl:template>
-
-<xsl:template match="orgdiv" mode="titlepage.mode">
-  <xsl:if test="preceding-sibling::*[1][self::orgname]">
-    <xsl:text> </xsl:text>
-  </xsl:if>
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="orgname" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="titlepage.mode">
-<xsl:choose>
-  <xsl:when test="not($othercredit.like.author.enabled = 0)">
-  <xsl:variable name="contrib" select="string(contrib)"/>
-  <xsl:choose>
-    <xsl:when test="contrib">
-      <xsl:if test="not(preceding-sibling::othercredit[string(contrib)=$contrib])">
-        <xsl:call-template name="paragraph">
-          <xsl:with-param name="class" select="local-name(.)"/>
-          <xsl:with-param name="content">
-            <xsl:apply-templates mode="titlepage.mode" select="contrib"/>
-            <xsl:text>: </xsl:text>
-            <xsl:call-template name="person.name"/>
-            <xsl:apply-templates mode="titlepage.mode" select="affiliation"/>
-            <xsl:apply-templates select="following-sibling::othercredit[string(contrib)=$contrib]" mode="titlepage.othercredits"/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:if>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:call-template name="paragraph">
-        <xsl:with-param name="class" select="local-name(.)"/>
-        <xsl:with-param name="content">
-          <xsl:call-template name="person.name"/>
-        </xsl:with-param>
-      </xsl:call-template>
-      <xsl:apply-templates mode="titlepage.mode" select="affiliation"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  </xsl:when>
-  <xsl:otherwise>
-    <xsl:call-template name="credits.div"/>
-  </xsl:otherwise>
-</xsl:choose>
-</xsl:template>
-
-<xsl:template match="othercredit" mode="titlepage.othercredits">
-  <xsl:text>, </xsl:text>
-  <xsl:call-template name="person.name"/>
-</xsl:template>
-
-<xsl:template match="othername" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="pagenums" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="printhistory" mode="titlepage.mode">
-  <div>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </div>
-</xsl:template>
-
-<xsl:template match="productname" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="productnumber" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="pubdate" mode="titlepage.mode">
-  <xsl:call-template name="paragraph">
-    <xsl:with-param name="class" select="local-name(.)"/>
-    <xsl:with-param name="content">
-      <xsl:apply-templates mode="titlepage.mode"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="publisher" mode="titlepage.mode">
-  <xsl:call-template name="paragraph">
-    <xsl:with-param name="class" select="local-name(.)"/>
-    <xsl:with-param name="content">
-      <xsl:apply-templates mode="titlepage.mode"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="publishername" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="pubsnumber" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="releaseinfo" mode="titlepage.mode">
-  <xsl:call-template name="paragraph">
-    <xsl:with-param name="class" select="local-name(.)"/>
-    <xsl:with-param name="content">
-      <xsl:apply-templates mode="titlepage.mode"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="revhistory" mode="titlepage.mode">
-  <xsl:variable name="numcols">
-    <xsl:choose>
-      <xsl:when test=".//authorinitials|.//author">3</xsl:when>
-      <xsl:otherwise>2</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-
-  <xsl:variable name="title">
-    <xsl:call-template name="gentext">
-      <xsl:with-param name="key">RevHistory</xsl:with-param>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="contents">
-    <div>
-      <xsl:apply-templates select="." mode="class.attribute"/>
-      <table border="1" width="100%" summary="Revision history">
-        <tr>
-          <th align="left" valign="top" colspan="{$numcols}">
-            <b>
-              <xsl:call-template name="gentext">
-                <xsl:with-param name="key" select="'RevHistory'"/>
-              </xsl:call-template>
-            </b>
-          </th>
-        </tr>
-        <xsl:apply-templates mode="titlepage.mode">
-          <xsl:with-param name="numcols" select="$numcols"/>
-        </xsl:apply-templates>
-      </table>
-    </div>
-  </xsl:variable>
-  
-  <xsl:choose>
-    <xsl:when test="$generate.revhistory.link != 0">
-      <xsl:variable name="filename">
-        <xsl:call-template name="make-relative-filename">
-          <xsl:with-param name="base.dir" select="$base.dir"/>
-          <xsl:with-param name="base.name" select="concat($id,$html.ext)"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <a href="{concat($id,$html.ext)}">
-        <xsl:copy-of select="$title"/>
-      </a>
-
-      <xsl:call-template name="write.chunk">
-        <xsl:with-param name="filename" select="$filename"/>
-        <xsl:with-param name="quiet" select="$chunk.quietly"/>
-        <xsl:with-param name="content">
-        <xsl:call-template name="user.preroot"/>
-          <html>
-            <head>
-              <xsl:call-template name="system.head.content"/>
-              <xsl:call-template name="head.content">
-                <xsl:with-param name="title">
-                    <xsl:value-of select="$title"/>
-                    <xsl:if test="../../title">
-                        <xsl:value-of select="concat(' (', ../../title, ')')"/>
-                    </xsl:if>
-                </xsl:with-param>
-              </xsl:call-template>
-              <xsl:call-template name="user.head.content"/>
-            </head>
-            <body>
-              <xsl:call-template name="body.attributes"/>
-              <xsl:copy-of select="$contents"/>
-            </body>
-          </html>
-          <xsl:text>
-</xsl:text>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$contents"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="revhistory/revision" mode="titlepage.mode">
-  <xsl:param name="numcols" select="'3'"/>
-  <xsl:variable name="revnumber" select="revnumber"/>
-  <xsl:variable name="revdate" select="date"/>
-  <xsl:variable name="revauthor" select="authorinitials|author"/>
-  <xsl:variable name="revremark" select="revremark|revdescription"/>
-  <tr>
-    <td align="left">
-      <xsl:if test="$revnumber">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'Revision'"/>
-        </xsl:call-template>
-        <xsl:call-template name="gentext.space"/>
-        <xsl:apply-templates select="$revnumber[1]" mode="titlepage.mode"/>
-      </xsl:if>
-    </td>
-    <td align="left">
-      <xsl:apply-templates select="$revdate[1]" mode="titlepage.mode"/>
-    </td>
-    <xsl:choose>
-      <xsl:when test="$revauthor">
-        <td align="left">
-          <xsl:for-each select="$revauthor">
-            <xsl:apply-templates select="." mode="titlepage.mode"/>
-            <xsl:if test="position() != last()">
-	      <xsl:text>, </xsl:text>
-	    </xsl:if>
-	  </xsl:for-each>
-        </td>
-      </xsl:when>
-      <xsl:when test="$numcols &gt; 2">
-        <td>&#160;</td>
-      </xsl:when>
-      <xsl:otherwise/>
-    </xsl:choose>
-  </tr>
-  <xsl:if test="$revremark">
-    <tr>
-      <td align="left" colspan="{$numcols}">
-        <xsl:apply-templates select="$revremark[1]" mode="titlepage.mode"/>
-      </td>
-    </tr>
-  </xsl:if>
-</xsl:template>
-
-<xsl:template match="revision/revnumber" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="revision/date" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="revision/authorinitials" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="revision/author" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="revision/revremark" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="revision/revdescription" mode="titlepage.mode">
-  <xsl:apply-templates mode="titlepage.mode"/>
-</xsl:template>
-
-<xsl:template match="seriesvolnums" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="shortaffil" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="subjectset" mode="titlepage.mode">
-</xsl:template>
-
-<xsl:template match="subtitle" mode="titlepage.mode">
-  <h2>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-  </h2>
-</xsl:template>
-
-<xsl:template match="surname" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<xsl:template match="title" mode="titlepage.mode">
-  <xsl:variable name="id">
-    <xsl:choose>
-      <!-- if title is in an *info wrapper, get the grandparent -->
-      <xsl:when test="contains(local-name(..), 'info')">
-        <xsl:call-template name="object.id">
-          <xsl:with-param name="object" select="../.."/>
-        </xsl:call-template>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:call-template name="object.id">
-          <xsl:with-param name="object" select=".."/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <h1>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:if test="$generate.id.attributes = 0">
-      <a id="{$id}"/>
-    </xsl:if>
-    <xsl:choose>
-      <xsl:when test="$show.revisionflag != 0 and @revisionflag">
-	<span class="{@revisionflag}">
-	  <xsl:apply-templates mode="titlepage.mode"/>
-	</span>
-      </xsl:when>
-      <xsl:otherwise>
-	<xsl:apply-templates mode="titlepage.mode"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </h1>
-</xsl:template>
-
-<xsl:template match="titleabbrev" mode="titlepage.mode">
-  <!-- nop; title abbreviations don't belong on the title page! -->
-</xsl:template>
-
-<xsl:template match="volumenum" mode="titlepage.mode">
-  <span>
-    <xsl:apply-templates select="." mode="class.attribute"/>
-    <xsl:apply-templates mode="titlepage.mode"/>
-    <br/>
-  </span>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/toc.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/toc.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,163 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns="http://www.w3.org/1999/xhtml" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- ==================================================================== -->
-
-<xsl:template match="toc">
-  <xsl:choose>
-    <xsl:when test="*">
-      <xsl:if test="$process.source.toc != 0">
-        <!-- if the toc isn't empty, process it -->
-        <xsl:element name="{$toc.list.type}" namespace="http://www.w3.org/1999/xhtml">
-          <xsl:apply-templates/>
-        </xsl:element>
-      </xsl:if>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:if test="$process.empty.source.toc != 0">
-        <xsl:choose>
-          <xsl:when test="parent::section                           or parent::sect1                           or parent::sect2                           or parent::sect3                           or parent::sect4                           or parent::sect5">
-            <xsl:apply-templates select="parent::*" mode="toc.for.section"/>
-          </xsl:when>
-          <xsl:when test="parent::article">
-            <xsl:apply-templates select="parent::*" mode="toc.for.component"/>
-          </xsl:when>
-          <xsl:when test="parent::book                           or parent::part">
-            <xsl:apply-templates select="parent::*" mode="toc.for.division"/>
-          </xsl:when>
-          <xsl:when test="parent::set">
-            <xsl:apply-templates select="parent::*" mode="toc.for.set"/>
-          </xsl:when>
-          <!-- there aren't any other contexts that allow toc -->
-          <xsl:otherwise>
-            <xsl:message>
-              <xsl:text>I don't know how to make a TOC in this context!</xsl:text>
-            </xsl:message>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="tocpart|tocchap                      |toclevel1|toclevel2|toclevel3|toclevel4|toclevel5">
-  <xsl:variable name="sub-toc">
-    <xsl:if test="tocchap|toclevel1|toclevel2|toclevel3|toclevel4|toclevel5">
-      <xsl:choose>
-        <xsl:when test="$toc.list.type = 'dl'">
-          <dd>
-            <xsl:element name="{$toc.list.type}" namespace="http://www.w3.org/1999/xhtml">
-              <xsl:apply-templates select="tocchap|toclevel1|toclevel2|toclevel3|toclevel4|toclevel5"/>
-            </xsl:element>
-          </dd>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:element name="{$toc.list.type}" namespace="http://www.w3.org/1999/xhtml">
-            <xsl:apply-templates select="tocchap|toclevel1|toclevel2|toclevel3|toclevel4|toclevel5"/>
-          </xsl:element>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:if>
-  </xsl:variable>
-
-  <xsl:apply-templates select="tocentry[position() != last()]"/>
-
-  <xsl:choose>
-    <xsl:when test="$toc.list.type = 'dl'">
-      <dt>
-        <xsl:apply-templates select="tocentry[position() = last()]"/>
-      </dt>
-      <xsl:copy-of select="$sub-toc"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <li>
-        <xsl:apply-templates select="tocentry[position() = last()]"/>
-        <xsl:copy-of select="$sub-toc"/>
-      </li>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="tocentry|tocfront|tocback">
-  <xsl:choose>
-    <xsl:when test="$toc.list.type = 'dl'">
-      <dt>
-        <xsl:call-template name="tocentry-content"/>
-      </dt>
-    </xsl:when>
-    <xsl:otherwise>
-      <li>
-        <xsl:call-template name="tocentry-content"/>
-      </li>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="tocentry[position() = last()]" priority="2">
-  <xsl:call-template name="tocentry-content"/>
-</xsl:template>
-
-<xsl:template name="tocentry-content">
-  <xsl:variable name="targets" select="key('id',@linkend)"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-
-  <xsl:choose>
-    <xsl:when test="@linkend">
-      <xsl:call-template name="check.id.unique">
-        <xsl:with-param name="linkend" select="@linkend"/>
-      </xsl:call-template>
-      <a>
-        <xsl:attribute name="href">
-          <xsl:call-template name="href.target">
-            <xsl:with-param name="object" select="$target"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:apply-templates/>
-      </a>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="toc.for.section">
-  <xsl:call-template name="section.toc"/>
-</xsl:template>
-
-<xsl:template match="*" mode="toc.for.component">
-  <xsl:call-template name="component.toc"/>
-</xsl:template>
-
-<xsl:template match="*" mode="toc.for.section">
-  <xsl:call-template name="section.toc"/>
-</xsl:template>
-
-<xsl:template match="*" mode="toc.for.division">
-  <xsl:call-template name="division.toc"/>
-</xsl:template>
-
-<xsl:template match="*" mode="toc.for.set">
-  <xsl:call-template name="set.toc"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="lot|lotentry">
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/verbatim.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/verbatim.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,354 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:sverb="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.Verbatim" xmlns:xverb="xalan://com.nwalsh.xalan.Verbatim" xmlns:lxslt="http://xml.apache.org/xslt" xmlns:exsl="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="sverb xverb lxslt exsl" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<xsl:include href="../highlighting/common.xsl"/>
-<xsl:include href="highlight.xsl"/>
-
-<lxslt:component prefix="xverb" functions="numberLines"/>
-
-<xsl:template match="programlisting|screen|synopsis">
-  <xsl:param name="suppress-numbers" select="'0'"/>
-  <xsl:variable name="id">
-    <xsl:call-template name="object.id"/>
-  </xsl:variable>
-
-  <xsl:call-template name="anchor"/>
-
-  <xsl:if test="$shade.verbatim != 0">
-    <xsl:message>
-      <xsl:text>The shade.verbatim parameter is deprecated. </xsl:text>
-      <xsl:text>Use CSS instead,</xsl:text>
-    </xsl:message>
-    <xsl:message>
-      <xsl:text>for example: pre.</xsl:text>
-      <xsl:value-of select="local-name(.)"/>
-      <xsl:text> { background-color: #E0E0E0; }</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:choose>
-    <xsl:when test="$suppress-numbers = '0'       and @linenumbering = 'numbered'       and $use.extensions != '0'       and $linenumbering.extension != '0'">
-      <xsl:variable name="rtf">
-	<xsl:call-template name="apply-highlighting"/>
-      </xsl:variable>
-      <pre>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-	<xsl:call-template name="number.rtf.lines">
-	  <xsl:with-param name="rtf" select="$rtf"/>
-	</xsl:call-template>
-      </pre>
-    </xsl:when>
-    <xsl:otherwise>
-      <pre>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-	<xsl:call-template name="apply-highlighting"/>
-      </pre>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="literallayout">
-  <xsl:param name="suppress-numbers" select="'0'"/>
-
-  <xsl:variable name="rtf">
-    <xsl:apply-templates/>
-  </xsl:variable>
-
-  <xsl:if test="$shade.verbatim != 0 and @class='monospaced'">
-    <xsl:message>
-      <xsl:text>The shade.verbatim parameter is deprecated. </xsl:text>
-      <xsl:text>Use CSS instead,</xsl:text>
-    </xsl:message>
-    <xsl:message>
-      <xsl:text>for example: pre.</xsl:text>
-      <xsl:value-of select="local-name(.)"/>
-      <xsl:text> { background-color: #E0E0E0; }</xsl:text>
-    </xsl:message>
-  </xsl:if>
-
-  <xsl:choose>
-    <xsl:when test="$suppress-numbers = '0'       and @linenumbering = 'numbered'       and $use.extensions != '0'       and $linenumbering.extension != '0'">
-      <xsl:choose>
-	<xsl:when test="@class='monospaced'">
-          <pre>
-            <xsl:apply-templates select="." mode="class.attribute"/>
-	    <xsl:call-template name="number.rtf.lines">
-	      <xsl:with-param name="rtf" select="$rtf"/>
-	    </xsl:call-template>
-	  </pre>
-	</xsl:when>
-	<xsl:otherwise>
-          <div>
-            <xsl:apply-templates select="." mode="class.attribute"/>
-	    <p>
-	      <xsl:call-template name="number.rtf.lines">
-		<xsl:with-param name="rtf" select="$rtf"/>
-	      </xsl:call-template>
-	    </p>
-	  </div>
-	</xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-	<xsl:when test="@class='monospaced'">
-          <pre>
-            <xsl:apply-templates select="." mode="class.attribute"/>
-	    <xsl:copy-of select="$rtf"/>
-	  </pre>
-	</xsl:when>
-	<xsl:otherwise>
-          <div>
-            <xsl:apply-templates select="." mode="class.attribute"/>
-	    <p>
-	      <xsl:call-template name="make-verbatim">
-		<xsl:with-param name="rtf" select="$rtf"/>
-	      </xsl:call-template>
-	    </p>
-	  </div>
-	</xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="address">
-  <xsl:param name="suppress-numbers" select="'0'"/>
-
-  <xsl:variable name="rtf">
-    <xsl:apply-templates/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$suppress-numbers = '0'                     and @linenumbering = 'numbered'                     and $use.extensions != '0'                     and $linenumbering.extension != '0'">
-      <div>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <p>
-          <xsl:call-template name="number.rtf.lines">
-            <xsl:with-param name="rtf" select="$rtf"/>
-          </xsl:call-template>
-        </p>
-      </div>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <div>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <p>
-          <xsl:call-template name="make-verbatim">
-            <xsl:with-param name="rtf" select="$rtf"/>
-          </xsl:call-template>
-        </p>
-      </div>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="number.rtf.lines">
-  <xsl:param name="rtf" select="''"/>
-  <xsl:param name="pi.context" select="."/>
-
-  <!-- Save the global values -->
-  <xsl:variable name="global.linenumbering.everyNth" select="$linenumbering.everyNth"/>
-
-  <xsl:variable name="global.linenumbering.separator" select="$linenumbering.separator"/>
-
-  <xsl:variable name="global.linenumbering.width" select="$linenumbering.width"/>
-
-  <!-- Extract the <?dbhtml linenumbering.*?> PI values -->
-  <xsl:variable name="pi.linenumbering.everyNth">
-    <xsl:call-template name="pi.dbhtml_linenumbering.everyNth">
-      <xsl:with-param name="node" select="$pi.context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="pi.linenumbering.separator">
-    <xsl:call-template name="pi.dbhtml_linenumbering.separator">
-      <xsl:with-param name="node" select="$pi.context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:variable name="pi.linenumbering.width">
-    <xsl:call-template name="pi.dbhtml_linenumbering.width">
-      <xsl:with-param name="node" select="$pi.context"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <!-- Construct the 'in-context' values -->
-  <xsl:variable name="linenumbering.everyNth">
-    <xsl:choose>
-      <xsl:when test="$pi.linenumbering.everyNth != ''">
-        <xsl:value-of select="$pi.linenumbering.everyNth"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$global.linenumbering.everyNth"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="linenumbering.separator">
-    <xsl:choose>
-      <xsl:when test="$pi.linenumbering.separator != ''">
-        <xsl:value-of select="$pi.linenumbering.separator"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$global.linenumbering.separator"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="linenumbering.width">
-    <xsl:choose>
-      <xsl:when test="$pi.linenumbering.width != ''">
-        <xsl:value-of select="$pi.linenumbering.width"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$global.linenumbering.width"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="linenumbering.startinglinenumber">
-    <xsl:choose>
-      <xsl:when test="$pi.context/@startinglinenumber">
-        <xsl:value-of select="$pi.context/@startinglinenumber"/>
-      </xsl:when>
-      <xsl:when test="$pi.context/@continuation='continues'">
-        <xsl:variable name="lastLine">
-          <xsl:choose>
-            <xsl:when test="$pi.context/self::programlisting">
-              <xsl:call-template name="lastLineNumber">
-                <xsl:with-param name="listings" select="preceding::programlisting[@linenumbering='numbered']"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$pi.context/self::screen">
-              <xsl:call-template name="lastLineNumber">
-                <xsl:with-param name="listings" select="preceding::screen[@linenumbering='numbered']"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$pi.context/self::literallayout">
-              <xsl:call-template name="lastLineNumber">
-                <xsl:with-param name="listings" select="preceding::literallayout[@linenumbering='numbered']"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$pi.context/self::address">
-              <xsl:call-template name="lastLineNumber">
-                <xsl:with-param name="listings" select="preceding::address[@linenumbering='numbered']"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$pi.context/self::synopsis">
-              <xsl:call-template name="lastLineNumber">
-                <xsl:with-param name="listings" select="preceding::synopsis[@linenumbering='numbered']"/>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:message>
-                <xsl:text>Unexpected verbatim environment: </xsl:text>
-                <xsl:value-of select="local-name($pi.context)"/>
-              </xsl:message>
-              <xsl:value-of select="0"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:variable>
-
-        <xsl:value-of select="$lastLine + 1"/>
-      </xsl:when>
-      <xsl:otherwise>1</xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="function-available('sverb:numberLines')">
-      <xsl:copy-of select="sverb:numberLines($rtf)"/>
-    </xsl:when>
-    <xsl:when test="function-available('xverb:numberLines')">
-      <xsl:copy-of select="xverb:numberLines($rtf)"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:message terminate="yes">
-        <xsl:text>No numberLines function available.</xsl:text>
-      </xsl:message>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="make-verbatim">
-  <xsl:param name="rtf"/>
-
-  <!-- I want to make this RTF verbatim. There are two possibilities: either
-       I have access to the exsl:node-set extension function and I can "do it right"
-       or I have to rely on CSS. -->
-
-  <xsl:choose>
-    <xsl:when test="function-available('exsl:node-set')">
-      <xsl:apply-templates select="exsl:node-set($rtf)" mode="make.verbatim.mode"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <span style="white-space: pre;">
-        <xsl:copy-of select="$rtf"/>
-      </span>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ======================================================================== -->
-
-<xsl:template name="lastLineNumber">
-  <xsl:param name="listings"/>
-  <xsl:param name="number" select="0"/>
-
-  <xsl:variable name="lines">
-    <xsl:call-template name="countLines">
-      <xsl:with-param name="listing" select="string($listings[1])"/>
-    </xsl:call-template>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="not($listings)">
-      <xsl:value-of select="$number"/>
-    </xsl:when>
-    <xsl:when test="$listings[1]/@startinglinenumber">
-      <xsl:value-of select="$number + $listings[1]/@startinglinenumber + $lines - 1"/>
-    </xsl:when>
-    <xsl:when test="$listings[1]/@continuation='continues'">
-      <xsl:call-template name="lastLineNumber">
-        <xsl:with-param name="listings" select="listings[position() &gt; 1]"/>
-        <xsl:with-param name="number" select="$number + $lines"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$lines"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="countLines">
-  <xsl:param name="listing"/>
-  <xsl:param name="count" select="1"/>
-
-  <xsl:choose>
-    <xsl:when test="contains($listing, '&#10;')">
-      <xsl:call-template name="countLines">
-        <xsl:with-param name="listing" select="substring-after($listing, '&#10;')"/>
-        <xsl:with-param name="count" select="$count + 1"/>
-      </xsl:call-template>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="$count"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/xref.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/docbook-xsl-snapshot/xhtml/xref.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,1288 +1,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--This file was created automatically by html2xhtml-->
-<!--from the HTML stylesheets.-->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:suwl="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.UnwrapLinks" xmlns:exsl="http://exslt.org/common" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="suwl exsl xlink" version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the XSL DocBook Stylesheet distribution.
-     See ../README or http://docbook.sf.net/release/xsl/current/ for
-     copyright and other information.
-
-     ******************************************************************** -->
-
-<!-- Use internal variable for olink xlink role for consistency -->
-<xsl:variable name="xolink.role">http://docbook.org/xlink/role/olink</xsl:variable>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="anchor">
-  <xsl:call-template name="anchor"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="xref" name="xref">
-  <xsl:param name="xhref" select="@xlink:href"/>
-  <!-- is the @xlink:href a local idref link? -->
-  <xsl:param name="xlink.idref">
-    <xsl:if test="starts-with($xhref,'#')                   and (not(contains($xhref,'('))                   or starts-with($xhref, '#xpointer(id('))">
-      <xsl:call-template name="xpointer.idref">
-        <xsl:with-param name="xpointer" select="$xhref"/>
-      </xsl:call-template>
-   </xsl:if>
-  </xsl:param>
-  <xsl:param name="xlink.targets" select="key('id',$xlink.idref)"/>
-  <xsl:param name="linkend.targets" select="key('id',@linkend)"/>
-  <xsl:param name="target" select="($xlink.targets | $linkend.targets)[1]"/>
-
-  <xsl:variable name="xrefstyle">
-    <xsl:choose>
-      <xsl:when test="@role and not(@xrefstyle)                        and $use.role.as.xrefstyle != 0">
-        <xsl:value-of select="@role"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="@xrefstyle"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:call-template name="anchor"/>
-
-  <xsl:variable name="content">
-    <xsl:choose>
-  
-      <xsl:when test="@endterm">
-        <xsl:variable name="etargets" select="key('id',@endterm)"/>
-        <xsl:variable name="etarget" select="$etargets[1]"/>
-        <xsl:choose>
-          <xsl:when test="count($etarget) = 0">
-            <xsl:message>
-              <xsl:value-of select="count($etargets)"/>
-              <xsl:text>Endterm points to nonexistent ID: </xsl:text>
-              <xsl:value-of select="@endterm"/>
-            </xsl:message>
-            <xsl:text>???</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates select="$etarget" mode="endterm"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-  
-      <xsl:when test="$target/@xreflabel">
-        <xsl:call-template name="xref.xreflabel">
-          <xsl:with-param name="target" select="$target"/>
-        </xsl:call-template>
-      </xsl:when>
-  
-      <xsl:when test="$target">
-        <xsl:if test="not(parent::citation)">
-          <xsl:apply-templates select="$target" mode="xref-to-prefix"/>
-        </xsl:if>
-  
-        <xsl:apply-templates select="$target" mode="xref-to">
-          <xsl:with-param name="referrer" select="."/>
-          <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-        </xsl:apply-templates>
-  
-        <xsl:if test="not(parent::citation)">
-          <xsl:apply-templates select="$target" mode="xref-to-suffix"/>
-        </xsl:if>
-      </xsl:when>
-
-      <xsl:otherwise>
-        <xsl:message>
-          <xsl:text>ERROR: xref linking to </xsl:text>
-          <xsl:value-of select="@linkend|@xlink:href"/>
-          <xsl:text> has no generated link text.</xsl:text>
-        </xsl:message>
-        <xsl:text>???</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:call-template name="simple.xlink">
-    <xsl:with-param name="content" select="$content"/>
-  </xsl:call-template>
-
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<!-- biblioref handled largely like an xref -->
-<!-- To be done: add support for begin, end, and units attributes -->
-<xsl:template match="biblioref">
-  <xsl:variable name="targets" select="key('id',@linkend)"/>
-  <xsl:variable name="target" select="$targets[1]"/>
-  <xsl:variable name="refelem" select="local-name($target)"/>
-
-  <xsl:call-template name="check.id.unique">
-    <xsl:with-param name="linkend" select="@linkend"/>
-  </xsl:call-template>
-
-  <xsl:call-template name="anchor"/>
-
-  <xsl:choose>
-    <xsl:when test="count($target) = 0">
-      <xsl:message>
-        <xsl:text>XRef to nonexistent id: </xsl:text>
-        <xsl:value-of select="@linkend"/>
-      </xsl:message>
-      <xsl:text>???</xsl:text>
-    </xsl:when>
-
-    <xsl:when test="@endterm">
-      <xsl:variable name="href">
-        <xsl:call-template name="href.target">
-          <xsl:with-param name="object" select="$target"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="etargets" select="key('id',@endterm)"/>
-      <xsl:variable name="etarget" select="$etargets[1]"/>
-      <xsl:choose>
-        <xsl:when test="count($etarget) = 0">
-          <xsl:message>
-            <xsl:value-of select="count($etargets)"/>
-            <xsl:text>Endterm points to nonexistent ID: </xsl:text>
-            <xsl:value-of select="@endterm"/>
-          </xsl:message>
-          <a href="{$href}">
-            <xsl:apply-templates select="." mode="class.attribute"/>
-            <xsl:text>???</xsl:text>
-          </a>
-        </xsl:when>
-        <xsl:otherwise>
-          <a href="{$href}">
-            <xsl:apply-templates select="." mode="class.attribute"/>
-            <xsl:apply-templates select="$etarget" mode="endterm"/>
-          </a>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
-    <xsl:when test="$target/@xreflabel">
-      <a>
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:attribute name="href">
-          <xsl:call-template name="href.target">
-            <xsl:with-param name="object" select="$target"/>
-          </xsl:call-template>
-        </xsl:attribute>
-        <xsl:call-template name="xref.xreflabel">
-          <xsl:with-param name="target" select="$target"/>
-        </xsl:call-template>
-      </a>
-    </xsl:when>
-
-    <xsl:otherwise>
-      <xsl:variable name="href">
-        <xsl:call-template name="href.target">
-          <xsl:with-param name="object" select="$target"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:if test="not(parent::citation)">
-        <xsl:apply-templates select="$target" mode="xref-to-prefix"/>
-      </xsl:if>
-
-      <a href="{$href}">
-        <xsl:apply-templates select="." mode="class.attribute"/>
-        <xsl:if test="$target/title or $target/*/title">
-          <xsl:attribute name="title">
-            <xsl:apply-templates select="$target" mode="xref-title"/>
-          </xsl:attribute>
-        </xsl:if>
-        <xsl:apply-templates select="$target" mode="xref-to">
-          <xsl:with-param name="referrer" select="."/>
-          <xsl:with-param name="xrefstyle">
-            <xsl:choose>
-              <xsl:when test="@role and not(@xrefstyle) and $use.role.as.xrefstyle != 0">
-                <xsl:value-of select="@role"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="@xrefstyle"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:with-param>
-        </xsl:apply-templates>
-      </a>
-
-      <xsl:if test="not(parent::citation)">
-        <xsl:apply-templates select="$target" mode="xref-to-suffix"/>
-      </xsl:if>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="endterm">
-  <!-- Process the children of the endterm element -->
-  <xsl:variable name="endterm">
-    <xsl:apply-templates select="child::node()"/>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="function-available('exsl:node-set')">
-      <xsl:apply-templates select="exsl:node-set($endterm)" mode="remove-ids"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$endterm"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="remove-ids">
-  <xsl:choose>
-    <!-- handle html or xhtml -->
-    <xsl:when test="local-name(.) = 'a'                     and (namespace-uri(.) = ''                          or namespace-uri(.) = 'http://www.w3.org/1999/xhtml')">
-      <xsl:choose>
-        <xsl:when test="(@name and count(@*) = 1)                         or (@id and count(@*) = 1)                         or (@xml:id and count(@*) = 1)                         or (@xml:id and @name and count(@*) = 2)                         or (@id and @name and count(@*) = 2)">
-          <xsl:message>suppress anchor</xsl:message>
-          <!-- suppress the whole thing -->
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:copy>
-            <xsl:for-each select="@*">
-              <xsl:choose>
-                <xsl:when test="local-name(.) != 'name' and local-name(.) != 'id'">
-                  <xsl:copy/>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:message>removing <xsl:value-of select="local-name(.)"/></xsl:message>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:for-each>
-          </xsl:copy>
-          <xsl:apply-templates mode="remove-ids"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy>
-        <xsl:for-each select="@*">
-          <xsl:choose>
-            <xsl:when test="local-name(.) != 'id'">
-              <xsl:copy/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:message>removing <xsl:value-of select="local-name(.)"/></xsl:message>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:for-each>
-        <xsl:apply-templates mode="remove-ids"/>
-      </xsl:copy>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="xref-to-prefix"/>
-<xsl:template match="*" mode="xref-to-suffix"/>
-
-<xsl:template match="*" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:if test="$verbose">
-    <xsl:message>
-      <xsl:text>Don't know what gentext to create for xref to: "</xsl:text>
-      <xsl:value-of select="name(.)"/>
-      <xsl:text>", ("</xsl:text>
-      <xsl:value-of select="(@id|@xml:id)[1]"/>
-      <xsl:text>")</xsl:text>
-    </xsl:message>
-  </xsl:if>
-  <xsl:text>???</xsl:text>
-</xsl:template>
-
-<xsl:template match="title" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <!-- if you xref to a title, xref to the parent... -->
-  <xsl:choose>
-    <!-- FIXME: how reliable is this? -->
-    <xsl:when test="contains(local-name(parent::*), 'info')">
-      <xsl:apply-templates select="parent::*[2]" mode="xref-to">
-        <xsl:with-param name="referrer" select="$referrer"/>
-        <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-        <xsl:with-param name="verbose" select="$verbose"/>
-      </xsl:apply-templates>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="parent::*" mode="xref-to">
-        <xsl:with-param name="referrer" select="$referrer"/>
-        <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-        <xsl:with-param name="verbose" select="$verbose"/>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="abstract|authorblurb|personblurb|bibliodiv|bibliomset                      |biblioset|blockquote|calloutlist|caution|colophon                      |constraintdef|formalpara|glossdiv|important|indexdiv                      |itemizedlist|legalnotice|lot|msg|msgexplan|msgmain                      |msgrel|msgset|msgsub|note|orderedlist|partintro                      |productionset|qandadiv|refsynopsisdiv|segmentedlist                      |set|setindex|sidebar|tip|toc|variablelist|warning" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <!-- catch-all for things with (possibly optional) titles -->
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="author|editor|othercredit|personname" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-
-  <xsl:call-template name="person.name"/>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-
-  <xsl:call-template name="person.name.list"/>
-</xsl:template>
-
-<xsl:template match="figure|example|table|equation" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="procedure" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="task" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="cmdsynopsis" mode="xref-to">
-  <xsl:apply-templates select="(.//command)[1]" mode="xref"/>
-</xsl:template>
-
-<xsl:template match="funcsynopsis" mode="xref-to">
-  <xsl:apply-templates select="(.//function)[1]" mode="xref"/>
-</xsl:template>
-
-<xsl:template match="dedication|preface|chapter|appendix|article" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="bibliography" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="biblioentry|bibliomixed" mode="xref-to-prefix">
-  <xsl:text>[</xsl:text>
-</xsl:template>
-
-<xsl:template match="biblioentry|bibliomixed" mode="xref-to-suffix">
-  <xsl:text>]</xsl:text>
-</xsl:template>
-
-<xsl:template match="biblioentry|bibliomixed" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <!-- handles both biblioentry and bibliomixed -->
-  <xsl:choose>
-    <xsl:when test="string(.) = ''">
-      <xsl:variable name="bib" select="document($bibliography.collection,.)"/>
-      <xsl:variable name="id" select="(@id|@xml:id)[1]"/>
-      <xsl:variable name="entry" select="$bib/bibliography/                                     *[@id=$id or @xml:id=$id][1]"/>
-      <xsl:choose>
-        <xsl:when test="$entry">
-          <xsl:choose>
-            <xsl:when test="$bibliography.numbered != 0">
-              <xsl:number from="bibliography" count="biblioentry|bibliomixed" level="any" format="1"/>
-            </xsl:when>
-            <xsl:when test="local-name($entry/*[1]) = 'abbrev'">
-              <xsl:apply-templates select="$entry/*[1]"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="(@id|@xml:id)[1]"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>No bibliography entry: </xsl:text>
-            <xsl:value-of select="$id"/>
-            <xsl:text> found in </xsl:text>
-            <xsl:value-of select="$bibliography.collection"/>
-          </xsl:message>
-          <xsl:value-of select="(@id|@xml:id)[1]"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:choose>
-        <xsl:when test="$bibliography.numbered != 0">
-          <xsl:number from="bibliography" count="biblioentry|bibliomixed" level="any" format="1"/>
-        </xsl:when>
-        <xsl:when test="local-name(*[1]) = 'abbrev'">
-          <xsl:apply-templates select="*[1]"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="(@id|@xml:id)[1]"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="glossary" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="glossentry" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-  <xsl:choose>
-    <xsl:when test="$glossentry.show.acronym = 'primary'">
-      <xsl:choose>
-        <xsl:when test="acronym|abbrev">
-          <xsl:apply-templates select="(acronym|abbrev)[1]"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="glossterm[1]" mode="xref-to">
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-            <xsl:with-param name="referrer" select="$referrer"/>
-            <xsl:with-param name="verbose" select="$verbose"/>
-          </xsl:apply-templates>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="glossterm[1]" mode="xref-to">
-        <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-        <xsl:with-param name="referrer" select="$referrer"/>
-        <xsl:with-param name="verbose" select="$verbose"/>
-      </xsl:apply-templates>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="glossterm" mode="xref-to">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="index" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="listitem" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="section|simplesect                      |sect1|sect2|sect3|sect4|sect5                      |refsect1|refsect2|refsect3|refsection" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-  <!-- FIXME: What about "in Chapter X"? -->
-</xsl:template>
-
-<xsl:template match="bridgehead" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-  <!-- FIXME: What about "in Chapter X"? -->
-</xsl:template>
-
-<xsl:template match="qandaset" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="qandadiv" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="qandaentry" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="question[1]" mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="question|answer" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="part|reference" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="refentry" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-
-  <xsl:choose>
-    <xsl:when test="refmeta/refentrytitle">
-      <xsl:apply-templates select="refmeta/refentrytitle"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:apply-templates select="refnamediv/refname[1]"/>
-    </xsl:otherwise>
-  </xsl:choose>
-  <xsl:apply-templates select="refmeta/manvolnum"/>
-</xsl:template>
-
-<xsl:template match="refnamediv" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="refname[1]" mode="xref-to">
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="refname" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates mode="xref-to"/>
-</xsl:template>
-
-<xsl:template match="step" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key" select="'Step'"/>
-  </xsl:call-template>
-  <xsl:text> </xsl:text>
-  <xsl:apply-templates select="." mode="number"/>
-</xsl:template>
-
-<xsl:template match="varlistentry" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="term[1]" mode="xref-to">
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="varlistentry/term" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-
-  <!-- to avoid the comma that will be generated if there are several terms -->
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="co" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-
-  <xsl:apply-templates select="." mode="callout-bug"/>
-</xsl:template>
-
-<xsl:template match="area|areaset" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-
-  <xsl:call-template name="callout-bug">
-    <xsl:with-param name="conum">
-      <xsl:apply-templates select="." mode="conumber"/>
-    </xsl:with-param>
-  </xsl:call-template>
-</xsl:template>
-
-<xsl:template match="book" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:apply-templates select="." mode="object.xref.markup">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<xsl:template match="para" mode="xref-to">
-  <xsl:param name="referrer"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="verbose" select="1"/>
-
-  <xsl:variable name="context" select="(ancestor::simplesect                                        |ancestor::section                                        |ancestor::sect1                                        |ancestor::sect2                                        |ancestor::sect3                                        |ancestor::sect4                                        |ancestor::sect5                                        |ancestor::refsection                                        |ancestor::refsect1                                        |ancestor::refsect2                                        |ancestor::refsect3                                        |ancestor::chapter                                        |ancestor::appendix                                        |ancestor::preface                                        |ancestor::partintro                                        |ancestor::dedication                                        |ancestor::colophon                                        |ancestor::bibliography                                        |ancestor::index                                        |ancestor::glossary                                        |ancestor::glossentry                                        |ancestor::listitem                                        |ancestor::varlistentry)[last()]"/>
-
-  <xsl:apply-templates select="$context" mode="xref-to">
-    <xsl:with-param name="purpose" select="'xref'"/>
-    <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-    <xsl:with-param name="referrer" select="$referrer"/>
-    <xsl:with-param name="verbose" select="$verbose"/>
-  </xsl:apply-templates>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="xref-title">
-  <xsl:variable name="title">
-    <xsl:apply-templates select="." mode="object.title.markup"/>
-  </xsl:variable>
-
-  <xsl:value-of select="$title"/>
-</xsl:template>
-
-<xsl:template match="author" mode="xref-title">
-  <xsl:variable name="title">
-    <xsl:call-template name="person.name"/>
-  </xsl:variable>
-
-  <xsl:value-of select="$title"/>
-</xsl:template>
-
-<xsl:template match="authorgroup" mode="xref-title">
-  <xsl:variable name="title">
-    <xsl:call-template name="person.name.list"/>
-  </xsl:variable>
-
-  <xsl:value-of select="$title"/>
-</xsl:template>
-
-<xsl:template match="cmdsynopsis" mode="xref-title">
-  <xsl:variable name="title">
-    <xsl:apply-templates select="(.//command)[1]" mode="xref"/>
-  </xsl:variable>
-
-  <xsl:value-of select="$title"/>
-</xsl:template>
-
-<xsl:template match="funcsynopsis" mode="xref-title">
-  <xsl:variable name="title">
-    <xsl:apply-templates select="(.//function)[1]" mode="xref"/>
-  </xsl:variable>
-
-  <xsl:value-of select="$title"/>
-</xsl:template>
-
-<xsl:template match="biblioentry|bibliomixed" mode="xref-title">
-  <!-- handles both biblioentry and bibliomixed -->
-  <xsl:variable name="title">
-    <xsl:text>[</xsl:text>
-    <xsl:choose>
-      <xsl:when test="local-name(*[1]) = 'abbrev'">
-        <xsl:apply-templates select="*[1]"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="(@id|@xml:id)[1]"/>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:text>]</xsl:text>
-  </xsl:variable>
-
-  <xsl:value-of select="$title"/>
-</xsl:template>
-
-<xsl:template match="step" mode="xref-title">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key" select="'Step'"/>
-  </xsl:call-template>
-  <xsl:text> </xsl:text>
-  <xsl:apply-templates select="." mode="number"/>
-</xsl:template>
-
-<xsl:template match="step[not(./title)]" mode="title.markup">
-  <xsl:call-template name="gentext">
-    <xsl:with-param name="key" select="'Step'"/>
-  </xsl:call-template>
-  <xsl:text> </xsl:text>
-  <xsl:apply-templates select="." mode="number"/>
-</xsl:template>
-
-<xsl:template match="co" mode="xref-title">
-  <xsl:variable name="title">
-    <xsl:apply-templates select="." mode="callout-bug"/>
-  </xsl:variable>
-
-  <xsl:value-of select="$title"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="link" name="link">
-  <xsl:param name="linkend" select="@linkend"/>
-  <xsl:param name="a.target"/>
-  <xsl:param name="xhref" select="@xlink:href"/>
-
-  <xsl:variable name="content">
-    <xsl:call-template name="anchor"/>
-    <xsl:choose>
-      <xsl:when test="count(child::node()) &gt; 0">
-        <!-- If it has content, use it -->
-        <xsl:apply-templates/>
-      </xsl:when>
-      <!-- else look for an endterm -->
-      <xsl:when test="@endterm">
-        <xsl:variable name="etargets" select="key('id',@endterm)"/>
-        <xsl:variable name="etarget" select="$etargets[1]"/>
-        <xsl:choose>
-          <xsl:when test="count($etarget) = 0">
-            <xsl:message>
-              <xsl:value-of select="count($etargets)"/>
-              <xsl:text>Endterm points to nonexistent ID: </xsl:text>
-              <xsl:value-of select="@endterm"/>
-            </xsl:message>
-            <xsl:text>???</xsl:text>
-          </xsl:when>
-          <xsl:otherwise>
-              <xsl:apply-templates select="$etarget" mode="endterm"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-      <!-- Use the xlink:href if no other text -->
-      <xsl:when test="@xlink:href">
-        <xsl:value-of select="@xlink:href"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:message>
-          <xsl:text>Link element has no content and no Endterm. </xsl:text>
-          <xsl:text>Nothing to show in the link to </xsl:text>
-          <xsl:value-of select="(@xlink:href|@linkend)[1]"/>
-        </xsl:message>
-        <xsl:text>???</xsl:text>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:call-template name="simple.xlink">
-    <xsl:with-param name="node" select="."/>
-    <xsl:with-param name="linkend" select="$linkend"/>
-    <xsl:with-param name="content" select="$content"/>
-    <xsl:with-param name="a.target" select="$a.target"/>
-    <xsl:with-param name="xhref" select="$xhref"/>
-  </xsl:call-template>
-
-</xsl:template>
-
-<xsl:template match="ulink" name="ulink">
-  <xsl:param name="url" select="@url"/>
-  <xsl:variable name="link">
-    <a>
-      <xsl:apply-templates select="." mode="class.attribute"/>
-      <xsl:if test="@id or @xml:id">
-        <xsl:attribute name="id">
-          <xsl:value-of select="(@id|@xml:id)[1]"/>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:attribute name="href"><xsl:value-of select="$url"/></xsl:attribute>
-      <xsl:if test="$ulink.target != ''">
-        <xsl:attribute name="target">
-          <xsl:value-of select="$ulink.target"/>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:choose>
-        <xsl:when test="count(child::node())=0">
-          <xsl:value-of select="$url"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </a>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="function-available('suwl:unwrapLinks')">
-      <xsl:copy-of select="suwl:unwrapLinks($link)"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$link"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="olink" name="olink">
-  <!-- olink content may be passed in from xlink olink -->
-  <xsl:param name="content" select="NOTANELEMENT"/>
-
-  <xsl:call-template name="anchor"/>
-
-  <xsl:variable name="localinfo" select="@localinfo"/>
-
-  <xsl:choose>
-    <!-- olinks resolved by stylesheet and target database -->
-    <xsl:when test="@targetdoc or @targetptr or                     (@xlink:role=$xolink.role and                      contains(@xlink:href, '#') )">
-
-      <xsl:variable name="targetdoc.att">
-        <xsl:choose>
-          <xsl:when test="@targetdoc != ''">
-            <xsl:value-of select="@targetdoc"/>
-          </xsl:when>
-          <xsl:when test="@xlink:role=$xolink.role and                        contains(@xlink:href, '#')">
-            <xsl:value-of select="substring-before(@xlink:href, '#')"/>
-          </xsl:when>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="targetptr.att">
-        <xsl:choose>
-          <xsl:when test="@targetptr != ''">
-            <xsl:value-of select="@targetptr"/>
-          </xsl:when>
-          <xsl:when test="@xlink:role=$xolink.role and                        contains(@xlink:href, '#')">
-            <xsl:value-of select="substring-after(@xlink:href, '#')"/>
-          </xsl:when>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="olink.lang">
-        <xsl:call-template name="l10n.language">
-          <xsl:with-param name="xref-context" select="true()"/>
-        </xsl:call-template>
-      </xsl:variable>
-    
-      <xsl:variable name="target.database.filename">
-        <xsl:call-template name="select.target.database">
-          <xsl:with-param name="targetdoc.att" select="$targetdoc.att"/>
-          <xsl:with-param name="targetptr.att" select="$targetptr.att"/>
-          <xsl:with-param name="olink.lang" select="$olink.lang"/>
-        </xsl:call-template>
-      </xsl:variable>
-    
-      <xsl:variable name="target.database" select="document($target.database.filename,/)"/>
-    
-      <xsl:if test="$olink.debug != 0">
-        <xsl:message>
-          <xsl:text>Olink debug: root element of target.database '</xsl:text>
-          <xsl:value-of select="$target.database.filename"/>
-          <xsl:text>' is '</xsl:text>
-          <xsl:value-of select="local-name($target.database/*[1])"/>
-          <xsl:text>'.</xsl:text>
-        </xsl:message>
-      </xsl:if>
-    
-      <xsl:variable name="olink.key">
-        <xsl:call-template name="select.olink.key">
-          <xsl:with-param name="targetdoc.att" select="$targetdoc.att"/>
-          <xsl:with-param name="targetptr.att" select="$targetptr.att"/>
-          <xsl:with-param name="olink.lang" select="$olink.lang"/>
-          <xsl:with-param name="target.database" select="$target.database"/>
-        </xsl:call-template>
-      </xsl:variable>
-    
-      <xsl:if test="string-length($olink.key) = 0">
-        <xsl:message>
-          <xsl:text>Error: unresolved olink: </xsl:text>
-          <xsl:text>targetdoc/targetptr = '</xsl:text>
-          <xsl:value-of select="$targetdoc.att"/>
-          <xsl:text>/</xsl:text>
-          <xsl:value-of select="$targetptr.att"/>
-          <xsl:text>'.</xsl:text>
-        </xsl:message>
-      </xsl:if>
-
-      <xsl:variable name="href">
-        <xsl:call-template name="make.olink.href">
-          <xsl:with-param name="olink.key" select="$olink.key"/>
-          <xsl:with-param name="target.database" select="$target.database"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="hottext">
-        <xsl:choose>
-          <xsl:when test="$content">
-            <xsl:copy-of select="$content"/>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:call-template name="olink.hottext">
-              <xsl:with-param name="olink.key" select="$olink.key"/>
-              <xsl:with-param name="olink.lang" select="$olink.lang"/>
-              <xsl:with-param name="target.database" select="$target.database"/>
-            </xsl:call-template>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-
-      <xsl:variable name="olink.docname.citation">
-        <xsl:call-template name="olink.document.citation">
-          <xsl:with-param name="olink.key" select="$olink.key"/>
-          <xsl:with-param name="target.database" select="$target.database"/>
-          <xsl:with-param name="olink.lang" select="$olink.lang"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:variable name="olink.page.citation">
-        <xsl:call-template name="olink.page.citation">
-          <xsl:with-param name="olink.key" select="$olink.key"/>
-          <xsl:with-param name="target.database" select="$target.database"/>
-          <xsl:with-param name="olink.lang" select="$olink.lang"/>
-        </xsl:call-template>
-      </xsl:variable>
-
-      <xsl:choose>
-        <xsl:when test="$href != ''">
-          <a href="{$href}">
-            <xsl:apply-templates select="." mode="class.attribute"/>
-            <xsl:copy-of select="$hottext"/>
-          </a>
-          <xsl:copy-of select="$olink.page.citation"/>
-          <xsl:copy-of select="$olink.docname.citation"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <span class="olink"><xsl:copy-of select="$hottext"/></span>
-          <xsl:copy-of select="$olink.page.citation"/>
-          <xsl:copy-of select="$olink.docname.citation"/>
-        </xsl:otherwise>
-      </xsl:choose>
-
-    </xsl:when>
-
-    <!-- Or use old olink mechanism -->
-    <xsl:otherwise>
-      <xsl:variable name="href">
-        <xsl:choose>
-          <xsl:when test="@linkmode">
-            <!-- use the linkmode to get the base URI, use localinfo as fragid -->
-            <xsl:variable name="modespec" select="key('id',@linkmode)"/>
-            <xsl:if test="count($modespec) != 1                           or local-name($modespec) != 'modespec'">
-              <xsl:message>Warning: olink linkmode pointer is wrong.</xsl:message>
-            </xsl:if>
-            <xsl:value-of select="$modespec"/>
-            <xsl:if test="@localinfo">
-              <xsl:text>#</xsl:text>
-              <xsl:value-of select="@localinfo"/>
-            </xsl:if>
-          </xsl:when>
-          <xsl:when test="@type = 'href'">
-            <xsl:call-template name="olink.outline">
-              <xsl:with-param name="outline.base.uri" select="unparsed-entity-uri(@targetdocent)"/>
-              <xsl:with-param name="localinfo" select="@localinfo"/>
-              <xsl:with-param name="return" select="'href'"/>
-            </xsl:call-template>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="$olink.resolver"/>
-            <xsl:text>?</xsl:text>
-            <xsl:value-of select="$olink.sysid"/>
-            <xsl:value-of select="unparsed-entity-uri(@targetdocent)"/>
-            <!-- XSL gives no access to the public identifier (grumble...) -->
-            <xsl:if test="@localinfo">
-              <xsl:text>&amp;</xsl:text>
-              <xsl:value-of select="$olink.fragid"/>
-              <xsl:value-of select="@localinfo"/>
-            </xsl:if>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:variable>
-    
-      <xsl:choose>
-        <xsl:when test="$href != ''">
-          <a href="{$href}">
-            <xsl:apply-templates select="." mode="class.attribute"/>
-            <xsl:call-template name="olink.hottext"/>
-          </a>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:call-template name="olink.hottext"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="pagenumber.markup">
-  <!-- no-op in HTML -->
-</xsl:template>
-
-
-<xsl:template name="olink.outline">
-  <xsl:param name="outline.base.uri"/>
-  <xsl:param name="localinfo"/>
-  <xsl:param name="return" select="href"/>
-
-  <xsl:variable name="outline-file" select="concat($outline.base.uri,                                $olink.outline.ext)"/>
-
-  <xsl:variable name="outline" select="document($outline-file,.)/div"/>
-
-  <xsl:variable name="node-href">
-    <xsl:choose>
-      <xsl:when test="$localinfo != ''">
-        <xsl:variable name="node" select="$outline//                                    *[@id=$localinfo or @xml:id=$localinfo]"/>
-        <xsl:value-of select="$node/@href"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$outline/@href"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:variable name="node-xref">
-    <xsl:choose>
-      <xsl:when test="$localinfo != ''">
-        <xsl:variable name="node" select="$outline//                                *[@id=$localinfo or @xml:id=$localinfo]"/>
-        <xsl:copy-of select="$node/xref"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:value-of select="$outline/xref"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:variable>
-
-  <xsl:choose>
-    <xsl:when test="$return = 'href'">
-      <xsl:value-of select="$node-href"/>
-    </xsl:when>
-    <xsl:when test="$return = 'xref'">
-      <xsl:value-of select="$node-xref"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$node-xref"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template name="xref.xreflabel">
-  <!-- called to process an xreflabel...you might use this to make  -->
-  <!-- xreflabels come out in the right font for different targets, -->
-  <!-- for example. -->
-  <xsl:param name="target" select="."/>
-  <xsl:value-of select="$target/@xreflabel"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="title" mode="xref">
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="command" mode="xref">
-  <xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="function" mode="xref">
-  <xsl:call-template name="inline.monoseq"/>
-</xsl:template>
-
-<!-- ==================================================================== -->
-
-<xsl:template match="*" mode="insert.title.markup">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="title"/>
-
-  <xsl:choose>
-    <!-- FIXME: what about the case where titleabbrev is inside the info? -->
-    <xsl:when test="$purpose = 'xref' and titleabbrev">
-      <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$title"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="chapter|appendix" mode="insert.title.markup">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="title"/>
-
-  <xsl:choose>
-    <xsl:when test="$purpose = 'xref'">
-      <i>
-        <xsl:copy-of select="$title"/>
-      </i>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:copy-of select="$title"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template match="*" mode="insert.subtitle.markup">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="subtitle"/>
-
-  <xsl:copy-of select="$subtitle"/>
-</xsl:template>
-
-<xsl:template match="*" mode="insert.label.markup">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="label"/>
-
-  <xsl:copy-of select="$label"/>
-</xsl:template>
-
-<xsl:template match="*" mode="insert.pagenumber.markup">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="pagenumber"/>
-
-  <xsl:copy-of select="$pagenumber"/>
-</xsl:template>
-
-<xsl:template match="*" mode="insert.direction.markup">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="direction"/>
-
-  <xsl:copy-of select="$direction"/>
-</xsl:template>
-
-<xsl:template match="*" mode="insert.olink.docname.markup">
-  <xsl:param name="purpose"/>
-  <xsl:param name="xrefstyle"/>
-  <xsl:param name="docname"/>
-
-  <span class="olinkdocname">
-    <xsl:copy-of select="$docname"/>
-  </span>
-
-</xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/lfs-l10n.xml
===================================================================
--- BOOK/stylesheets/lfs-xsl/lfs-l10n.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,75 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<l:i18n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0">
-
-    <!-- Template to add more languages -->
-  <l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"
-          language="xx" english-language-name="xxxxx">
-
-    <l:gentext key="description" text=""/>
-    <l:gentext key="Bootscripts" text=""/>
-    <l:gentext key="Configuration Files" text=""/>
-    <l:gentext key="Kernel Configuration" text=""/>
-    <l:gentext key="Libraries" text=""/>
-    <l:gentext key="Others" text=""/>
-    <l:gentext key="Packages" text=""/>
-    <l:gentext key="Programs" text=""/>
-    <l:gentext key="Scripts" text=""/>
-
-  </l:l10n>
-
-
-    <!-- English -->
-  <l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"
-          language="en" english-language-name="English">
-
-    <l:gentext key="description" text="description"/>
-    <l:gentext key="Bootscripts" text="Bootscripts"/>
-    <l:gentext key="Configuration Files" text="Configuration Files"/>
-    <l:gentext key="Kernel Configuration" text="Kernel Configuration"/>
-    <l:gentext key="Libraries" text="Libraries"/>
-    <l:gentext key="Others" text="Others"/>
-    <l:gentext key="Packages" text="Packages"/>
-    <l:gentext key="Programs" text="Programs"/>
-    <l:gentext key="Scripts" text="Scripts"/>
-
-  </l:l10n>
-
-    <!-- Italian -->
-  <l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"
-          language="it" english-language-name="Italian">
-
-    <l:gentext key="description" text="descrizione"/>
-    <l:gentext key="Bootscripts" text="Script di avvio"/>
-    <l:gentext key="Configuration Files" text="File di configurazione"/>
-    <l:gentext key="Kernel Configuration" text="Configurazione del kernel"/>
-    <l:gentext key="Libraries" text="Librerie"/>
-    <l:gentext key="Others" text="Altri"/>
-    <l:gentext key="Packages" text="Pacchetti"/>
-    <l:gentext key="Programs" text="Programmi"/>
-    <l:gentext key="Scripts" text="Script"/>
-
-  </l:l10n>
-
-    <!-- Spanish -->
-  <l:l10n xmlns:l="http://docbook.sourceforge.net/xmlns/l10n/1.0"
-          language="es" english-language-name="Spanish">
-
-    <l:gentext key="description" text="descripci&#243;n"/>
-    <l:gentext key="Bootscripts" text="Guiones de arranque"/>
-    <l:gentext key="Configuration Files" text="Ficheros de configuraci&#243;n"/>
-    <l:gentext key="Kernel Configuration" text="Configuraci&#243;n del n&#250;cleo"/>
-    <l:gentext key="Libraries" text="Librer&#237;as"/>
-    <l:gentext key="Others" text="Otros"/>
-    <l:gentext key="Packages" text="Paquetes"/>
-    <l:gentext key="Programs" text="Programas"/>
-    <l:gentext key="Scripts" text="Guiones"/>
-
-  </l:l10n>
-
-</l:i18n>
Index: OK/stylesheets/lfs-xsl/lfs-print.css
===================================================================
--- BOOK/stylesheets/lfs-xsl/lfs-print.css	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,9 +1,0 @@
-/*
-$LastChangedBy$
-$Date$
-*/
-@import url(lfs.css);
-
-.navfooter, .headerlinks {
-   display: none;
-}
Index: OK/stylesheets/lfs-xsl/lfs.css
===================================================================
--- BOOK/stylesheets/lfs-xsl/lfs.css	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,602 +1,0 @@
-/*
-$LastChangedBy$
-$Date$
-*/
-/* Global settings */
-body {
-  font-family: verdana, tahoma, helvetica, arial, sans-serif;
-  text-align: left;
-  background: #fff;
-  color: #222;
-  margin: 1em;
-  padding: 0;
-  font-size: 1em;
-  line-height: 1.2em
-}
-
-
-/* Links */
-a:link { color: #22b; }
-a.ulink:link { font-weight: bold; color: #55f; }
-a:visited { color: #7e4988 ! important; }
-a:hover, a:focus { color: #d30e08 ! important; }
-a:active { color: #6b77b1 ! important;}
-
-
-/* Book titlepage */
-.book .titlepage {
-  background: #f5f6f7;
-  margin: 0px auto;
-  padding: 0 1em;
-}
-
-.book hr {
-  background: #dbddec;
-  height: .3em;
-  border: 0px;
-  margin: 0 -1em;
-  padding: 0;
-}
-
-div.dedication {
-  padding-left: 1em;
-}
-
-
-/* Sections */
-div.sect1, div.appendix {
-  padding-left: .3em;
-}
-
-.package, .kernel, .installation, .commands, .testing, .configuration, .content {
-  padding: 0 .5em .2em 0;
-  margin: 0;
-}
-
-.lfs .package {
-  background: #f5f6f7;
-  border-bottom: 0.2em solid #dbddec;
-  padding-top: .1em;
-  margin-top: 0;
-}
-
-.lfs .configuration {
-  background:   #fefefe;
-  border-top: 0.2em solid #dbddec;
-}
-
-.lfs .content {
-  background: #f5f6f7;
-  border-top: 0.2em solid #dbddec;
-  padding-bottom: .1em;
-  margin-bottom: 0;
-}
-
-
-/* Headers */
-h1, h2, h3, h4, h5, h6, b, .strong {
-  color: #000;
-  font-weight: bold;
-  line-height: 1em;
-}
-
-h1 {
-  font-size: 173%;
-  text-align: center;
-}
-
-.book h1 {
-  margin: 0;
-  padding: 0.4em;
-}
-
-.preface h1, .part h1, .chapter h1, .appendix h1, .index h1, .sect1 h1 {
-  background: #f5f6f7;
-  border-bottom: .1em solid #dbddec;
-  margin-bottom: 1em;
-  margin-top: 0;
-  padding: .4em;
-}
-
-.sect1 h1, .appendix h1 {
-  margin-left: -.2em;
-}
-
-.wrap h1 {
-  background: #f5f6f7;
-  margin: 0;
-  padding: .4em;
-}
-
-h1.title sup {
-  font-size: small;
-}
-
-h2 {
-  font-size: 144%;
-}
-
-.book h2.subtitle {
-  text-align: center;
-  background: #dbddec;
-  margin: 0;
-  padding: 0.2em;
-}
-
-.appendix h2 {
-  font-size: 133%;
-  margin-top: .8em;
-  margin-bottom: 0.2em;
-}
-
-h3 {
-  font-size: 120%;
-}
-
-h4 {
-  font-size: 110%;
-}
-
-.package h4, h5, h6 {
-  font-size: 100%;
-  font-style: italic;
-}
-
-
-/* Navigation */
-div.navheader, div.navfooter {
-  background: #ecedef;
-  margin: 0;
-  padding: 0.1em .5em;
-}
-
-div.navheader {
-  border-bottom: 1px solid #dbddec;
-}
-
-div.navfooter {
-  border-top: 1px solid #dbddec;
-}
-
-div.navheader h4 {
-  margin-top: .4em;
-  margin-bottom: 0;
-  text-align: center;
-}
-
-div.navheader h3 {
-  margin-top: .2em;
-  margin-bottom: 0;
-  text-align: center;
-}
-
-div.navheader ul, div.navfooter ul {
-  padding: .2em .5em .5em 0;
-  margin: .5em 0;
-  position: relative;
-  background: #dbddec;
-}
-
-div.navheader ul li, div.navfooter ul li {
-  display: inline;
-  width: 40%;
-}
-
-div.navheader ul li.prev, div.navfooter ul li.prev {
-  position: absolute;
-  display: block;
-  left: 0;
-  text-align: left;
-  padding: 0.2em 1em;
-  margin-left: 6px;
-}
-
-div.navheader ul li.next, div.navfooter ul li.next {
-  position: absolute;
-  display: block;
-  text-align: right;
-  right: 5px;
-  padding: 0.2em 0.5em;
-  margin-right: 7px;
-}
-
-div.navheader ul li.prev p, div.navfooter ul li.prev p,
-div.navheader ul li.next p, div.navfooter ul li.next p {
-  padding: 0;
-  margin: 1px 0px;
-}
-
-div.navheader ul li.home, div.navheader ul li.up,
-div.navfooter ul li.home, div.navfooter ul li.up {
-  text-align: center;
-  padding: 0;
-  margin: 0px auto;
-  display: block;
-  color: #dbddec;
-}
-
-
-/* TOC */
-div.toc ul, div.index ul, div.navheader ul, div.navfooter ul {
-  list-style: none;
-}
-
-div.toc {
-  padding-left: 1em;
-}
-
-li.preface, .part li.appendix {
-  margin-left: 1em;
-}
-
-div.toc h3 {
-  margin: 1em 0 .3em 0;
-}
-
-li.appendix h3, li.glossary h3, li.index h3 {
-  margin: .5em
-}
-
-div.toc h4 {
-  margin: .6em 0 .2em 0;
-}
-
-li.chapter h4 a {
-  display: block;
-  margin-bottom: .4em
-}
-
-.dummy {
-  display: block;
-  font-weight: bold;
-  font-size: 110%;
-  margin: .6em 0 .2em 0;
-}
-
-
-/* Index */
-.item {
-    float: left;
-    margin-right: 1em
-}
-
-.secitem {
-    font-weight: normal;
-    float: left;
-    margin-right: 1em
-}
-
-.indexref {
-    display: block;
-}
-
-.item + .indexref {
-    margin-left: 20em;
-}
-
-.secitem + .indexref {
-    margin-left: 19em;
-}
-
-
-/* Admonitions */
-div.admon img {
-  padding: .3em;
-}
-
-div.admon h3 {
-  display: inline;
-  margin-left: 2em;
-}
-
-div.admon p {
-  margin-left: .5em;
-}
-
-div.admon pre {
-  margin: 0.5em 3em;
-}
-
-div.note, div.tip {
-  background-color: #fffff6;
-  border: 2px solid #dbddec;
-  width: 90%;
-  margin: .5em auto;
-}
-
-div.important, div.warning, div.caution {
-  background-color: #fffff6;
-  border: medium solid #400;
-  width: 90%;
-  margin: .5em auto;
-  color: #600;
-}
-
-div.important h3, div.warning h3, div.caution h3 {
-  color: #900;
-}
-
-div.important em, div.warning em, div.caution em {
-  color: #000;
-  font-weight: bold;
-}
-
-
-/* table */
-.table p.title {
-  text-align: center;
-  margin-top: 0;
-  margin-bottom: .3em;
-}
-
-.table table {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.table table th, .table table td {
-  padding: 0.2em 2em 0.2em 2em;
-  text-align: left;
-}
-
-.revhistory {
-  padding-left: 1em;
-}
-
-.revhistory th {
-  line-height: 2em;
-  text-align: left;
-}
-
-.revhistory td {
-  padding-right: 1em;
-}
-
-
-/* variablelist as table */
-.variablelist table {
-  width: auto;
-  margin: 0 1em 0 1em;
-}
-
-.variablelist td {
-  vertical-align: top;
-}
-
-.variablelist td span, td p {
-  margin: 0.25em;
-}
-
-
-/* variablelist as list */
-dl {
-  padding-left: 1em
-}
-
-dt {
-  font-weight: bold;
-  margin-left: 1em;
-}
-
-dd {
-  margin-bottom: .6em;
-  margin-left: 1em;
-}
-
-dd p {
-  margin-top: 0;
-  margin-bottom: 0;
-  padding-top: 0;
-  padding-bottom: 0;
-}
-
-div.materials dt {
-  display: list-item;
-}
-
-div.materials dd {
-  margin-left: 0;
-  padding-left: 0;
-}
-
-
-/* segmentedlist */
-.appendix .segmentedlist {
-  padding-left: 1em;
-}
-
-.package .seg {
-  margin-bottom: 0em;
-  margin-top: 0em;
-  clear: left;
-}
-
-.content .seg {
-  margin-bottom: .4em;
-  margin-top: .4em;
-  clear: left;
-}
-
-.segtitle {
-  float: left;
-}
-
-.package .segbody, .appendix .segbody {
-  display: block;
-  padding-left: 14em;
-}
-
-.content .segbody {
-  display: block;
-  padding-left: 12em;
-}
-
-
-/* itemizedlist */
-ul {
-  padding-left: 1em
-}
-
-.itemizedlist ul {
-  margin-left: 1em
-}
-
-.itemizedlist li ul {
-  margin-bottom: 1.2em;
-}
-
-.itemizedlist li ul li p {
-  margin-top: .5em;
-  margin-bottom: .5em;
-}
-
-.itemizedlist li ul li:first-child p:first-child {
-  margin-top: -.6em;
-}
-
-ul.compact {
-  list-style: none;
-}
-
-.blfs ul.compact {
-  list-style: disc;
-}
-
-ul.compact li {
-  margin: 0em;
-  padding: 0em;
-}
-
-ul.compact li p {
-  padding: 0.3em;
-  margin: 0em;
-}
-
-.blfs ul.compact li p {
-  background-color: #f0fff0;
-}
-
-/* orderedlist */
-ol {
-  list-style: decimal;
-}
-
-ol ol {
-  list-style: lower-alpha;
-}
-
-ol ol ol {
-  list-style: lower-roman;
-}
-
-ol.compact li {
-  margin: 0em;
-  padding: 0em;
-}
-
-ol.compact li p {
-  padding: 0.3em;
-  margin: 0em;
-}
-
-
-/* Indented blocks */
-p, blockquote {
-  padding-left: 1em;
-  padding-right: 1em;
-}
-
-
-/* Monospaced elements */
-tt, code, kbd, pre, .command {
-  font-family: monospace;
-}
-
-.systemitem {
-  font-style: italic;
-}
-
-pre {
-  background-color: #e5e5e5;
-  border: 1px solid #050505;
-  padding: .5em 1em;
-  margin: 0 2em .5em 2em;
-  font-weight: bold;
-}
-
-pre.userinput {
-  color: #101310;
-}
-
-pre.root {
-  color: #101310;
-  border: 1px solid #11a;
-}
-
-pre.screen {
-  color: #000;
-  background-color: #e9e9e9;
-  font-weight: normal;
-}
-
-.literal, .prompt {
-  font-weight: normal;
-}
-
-
-/* Mixed tags */
-p.usernotes {
-  margin-left: -1em;
-  font-size: small;
-  font-weight: bold;
-  font-style: italic;
-}
-
-.underlined {
-  text-decoration: underline;
-}
-
-
-/* Last edited info */
-p.updated {
-  font-size: small;
-  font-weight: bold;
-  font-style: italic;
-}
-
-
-/* Special colored blocks */
-  /* OrangeRed4 */
-.feature-ssp {
-  color: #8B2500;
-}
-
-  /* RoyalBlue3 */
-.feature-aslr {
-  color: #3A5FCD;
-}
-
-  /* NavyBlue */
-.feature-pax {
-  color: #000080;
-}
-
-  /* VioletRed */
-.feature-hardened_tmp {
-  color: #d02090;
-}
-
-  /* PaleTurquoise4 */
-.feature-warnings {
-  color: #668b8b;
-}
-
-  /* RosyBrown */
-.feature-misc {
-  color: #bc8f8f;
-}
-
-  /* Sienna*/
-.feature-blowfish {
-  color: #8E6B23
-}
Index: OK/stylesheets/lfs-xsl/nochunks.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/nochunks.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,639 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-   <!-- Stylesheet for non-chunked XHTML output
-        Replaces {docbook-xsl}/xhtml/profile-docbook.xsl -->
-
-    <!-- Upstream XHTML templates -->
-  <xsl:import href="docbook-xsl-snapshot/xhtml/docbook.xsl"/>
-
-    <!-- Fix encoding issues with default UTF-8 output of the xhtml stylesheet -->
-  <xsl:output method="html" encoding="ISO-8859-1" indent="no" />
-
-   <!-- Including our others customized templates -->
-  <xsl:include href="common.xsl"/>
-  <xsl:include href="xhtml/lfs-index.xsl"/>
-  <xsl:include href="xhtml/lfs-mixed.xsl"/>
-  <xsl:include href="xhtml/lfs-sections.xsl"/>
-  <xsl:include href="xhtml/lfs-toc.xsl"/>
-  <xsl:include href="xhtml/lfs-xref.xsl"/>
-
-    <!-- Control generation of ToCs and LoTs -->
-  <xsl:param name="generate.toc">
-    book      toc,title
-    preface   nop
-    part      nop
-    chapter   nop
-    appendix  nop
-    sect1     nop
-    sect2     nop
-    sect3     nop
-    sect4     nop
-    sect5     nop
-    section   nop
-  </xsl:param>
-
-    <!-- How deep should recursive sections appear in the TOC? -->
-  <xsl:param name="toc.section.depth">1</xsl:param>
-
-    <!-- How maximaly deep should be each TOC? -->
-  <xsl:param name="toc.max.depth">3</xsl:param>
-
-    <!-- Dropping some unwanted style attributes -->
-  <xsl:param name="ulink.target" select="''"></xsl:param>
-  <xsl:param name="css.decoration" select="0"></xsl:param>
-
-    <!-- Don't use graphics in admonitions -->
-  <xsl:param name="admon.graphics" select="0"/>
-
-    <!-- Changing the admonitions output tagging:
-           Removed $admon.style support
-           Hardcoded $admon.textlabel feature -->
-    <!-- The original template is in {docbook-xsl}/xhtml/admon.xsl -->
-  <xsl:template name="nongraphical.admonition">
-    <div class="admon {name(.)}">
-      <h3>
-        <xsl:apply-templates select="." mode="object.title.markup"/>
-      </h3>
-      <xsl:apply-templates/>
-    </div>
-  </xsl:template>
-
-    <!-- sect2.titlepage:
-           Removed a lot of unneeded code.
-           Skip empty titles.
-           No label in preface (actualy, skip the hardcoded dot). -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="sect2.titlepage">
-    <xsl:choose>
-      <xsl:when test="string-length(title) = 0"/>
-      <xsl:otherwise>
-        <h3 class="{name(.)}">
-          <xsl:if test="@id">
-            <a id="{@id}" name="{@id}"/>
-          </xsl:if>
-          <xsl:if test="not(ancestor::preface) and $section.autolabel != 0">
-            <xsl:apply-templates select="." mode="label.markup"/>
-            <xsl:text>. </xsl:text>
-          </xsl:if>
-          <xsl:value-of select="title"/>
-        </h3>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- The CSS Stylesheet:
-           Note: there is some diferences with lfs.css code releated
-                 to h* values, admonitions and no navigational code. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/docbook.xsl -->
-  <xsl:template name='user.head.content'>
-    <style type="text/css">
-      <xsl:text>
-/* Global settings */
-body {
-  font-family: verdana, tahoma, helvetica, arial, sans-serif;
-  text-align: left;
-  background: #fff;
-  color: #222;
-  margin: 1em;
-  padding: 0;
-  font-size: 1em;
-  line-height: 1.2em
-}
-
-
-/* Links */
-a:link { color: #22b; }
-a.ulink:link { font-weight: bold; color: #55f; }
-a:visited { color: #7e4988 ! important; }
-a:hover, a:focus { color: #d30e08 ! important; }
-a:active { color: #6b77b1 ! important;}
-
-
-/* Book titlepage */
-.book {
-  margin: 0px auto;
-  padding: 0 1em;
-}
-
-.book h1, .book .authorgroup, .book .copyright, .book .legalnotice .revhistory {
-  background: #f5f6f7;
-  margin: 0px auto;
-  padding: .1em 1em;
-}
-
-.book hr {
-  background: #dbddec;
-  height: .3em;
-  border: 0px;
-  margin: 0;
-  padding: 0;
-}
-
-div.dedication {
-  padding-left: 1em;
-}
-
-
-/* Sections */
-div.sect1, div.appendix {
-  padding-left: .3em;
-}
-
-.package, .kernel, .installation, .commands, .testing, .configuration, .content {
-  padding: 0 .5em .2em 0;
-  margin: 0;
-}
-
-.lfs .package {
-  background: #f5f6f7;
-  border-bottom: 0.2em solid #dbddec;
-  padding-top: .1em;
-  margin-top: 0;
-}
-
-.lfs .configuration {
-  background:   #fefefe;
-  border-top: 0.2em solid #dbddec;
-}
-
-.lfs .content {
-  background: #f5f6f7;
-  border-top: 0.2em solid #dbddec;
-  border-bottom: 0.2em solid #dbddec;
-  padding-bottom: .1em;
-  margin-bottom: 0;
-}
-
-
-/* Headers */
-h1, h2, h3, h4, h5, h6, b, .strong {
-  color: #000;
-  font-weight: bold;
-  line-height: 1em;
-}
-
-h1 {
-  font-size: 173%;
-  text-align: center;
-}
-
-.book h1 {
-  margin: 0;
-  padding: 0.4em;
-}
-
-h1.title sup {
-  font-size: small;
-}
-
-h2 {
-  font-size: 144%;
-}
-
-.preface h2, .part h1, .chapter h2, .appendix h2, .index h1, .sect1 h2 {
-  background: #f5f6f7;
-  border-top: .2em solid #dbddec;
-  border-bottom: .2em solid #dbddec;
-  margin-bottom: 1em;
-  margin-top: 1em;
-  padding: .4em;
-  text-align: center;
-}
-
-.sect1 h2, .appendix h2 {
-  margin-left: -.2em;
-}
-
-.wrap h2 {
-  background: #f5f6f7;
-  border-bottom: 0;
-  margin-top: 1em;
-  margin-bottom: 0;
-  padding-top: .4em;
-}
-
-.book h2.subtitle {
-  text-align: center;
-  background: #dbddec;
-  margin: 0;
-  padding: 0.2em;
-}
-
-h3 {
-  font-size: 120%;
-}
-
-.appendix h3 {
-  font-size: 133%;
-  margin-top: .8em;
-  margin-bottom: 0.2em;
-}
-
-h4 {
-  font-size: 110%;
-}
-
-.package h4, h5, h6 {
-  font-size: 100%;
-  font-style: italic;
-}
-
-
-/* TOC */
-div.toc ul, div.index ul, div.navheader ul, div.navfooter ul {
-  list-style: none;
-}
-
-div.toc {
-  padding-left: 1em;
-}
-
-li.preface, .part li.appendix {
-  margin-left: 1em;
-}
-
-div.toc h3 {
-  margin: 1em 0 .3em 0;
-}
-
-li.appendix h3, li.glossary h3, li.index h3 {
-  margin: .5em
-}
-
-div.toc h4 {
-  margin: .6em 0 .2em 0;
-}
-
-li.chapter h4 a {
-  display: block;
-  margin-bottom: .4em
-}
-
-.dummy {
-  display: block;
-  font-weight: bold;
-  font-size: 110%;
-  margin: .6em 0 .2em 0;
-}
-
-
-/* Index */
-.item {
-    float: left;
-    margin-right: 1em
-}
-
-.secitem {
-    font-weight: normal;
-    float: left;
-    margin-right: 1em
-}
-
-.indexref {
-    display: block;
-}
-
-.item + .indexref {
-    margin-left: 20em;
-}
-
-.secitem + .indexref {
-    margin-left: 19em;
-}
-
-
-/* Admonitions */
-div.admon h3 {
-  padding-left: 2.5em;
-  padding-top: 1em;
-}
-
-div.admon p {
-  margin-left: .5em;
-}
-
-div.admon pre {
-  margin: 0.5em 3em;
-}
-
-div.note, div.tip {
-  background-color: #fffff6;
-  border: 2px solid #dbddec;
-  width: 90%;
-  margin: .5em auto;
-}
-
-div.important, div.warning, div.caution {
-  background-color: #fffff6;
-  border: medium solid #400;
-  width: 90%;
-  margin: .5em auto;
-  color: #600;
-}
-
-div.important h3, div.warning h3, div.caution h3 {
-  color: #900;
-}
-
-div.important em, div.warning em, div.caution em {
-  color: #000;
-  font-weight: bold;
-}
-
-
-/* table */
-.table p.title {
-  text-align: center;
-  margin-top: 0;
-  margin-bottom: .3em;
-}
-
-.table table {
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.table table th, .table table td {
-  padding: 0.2em 2em 0.2em 2em;
-  text-align: left;
-}
-
-.revhistory {
-  padding-left: 1em;
-}
-
-.revhistory th {
-  line-height: 2em;
-  text-align: left;
-}
-
-.revhistory td {
-  padding-right: 1em;
-}
-
-
-/* variablelist as table */
-.variablelist table {
-  width: auto;
-  margin: 0 1em 0 1em;
-}
-
-.variablelist td {
-  vertical-align: top;
-}
-
-.variablelist td span, td p {
-  margin: 0.25em;
-}
-
-.variablelist td p {
-  margin-top: 0;
-}
-
-
-/* variablelist as list */
-dl {
-  padding-left: 1em
-}
-
-dt {
-  font-weight: bold;
-  margin-left: 1em;
-}
-
-dd {
-  margin-bottom: .6em;
-  margin-left: 1em;
-}
-
-dd p {
-  margin-top: 0;
-  margin-bottom: 0;
-  padding-top: 0;
-  padding-bottom: 0;
-}
-
-div.materials dt {
-  display: list-item;
-}
-
-div.materials dd {
-  margin-left: 0;
-  padding-left: 0;
-}
-
-
-/* segmentedlist */
-.appendix .segmentedlist {
-  padding-left: 1em;
-}
-
-.package .seg {
-  margin-bottom: 0em;
-  margin-top: 0em;
-  clear: left;
-}
-
-.content .seg {
-  margin-bottom: .4em;
-  margin-top: .4em;
-  clear: left;
-}
-
-.segtitle {
-  float: left;
-}
-
-.package .segbody, .appendix .segbody {
-  display: block;
-  padding-left: 14em;
-}
-
-.content .segbody {
-  display: block;
-  padding-left: 12em;
-}
-
-
-/* itemizedlist */
-ul {
-  padding-left: 1em
-}
-
-.itemizedlist ul {
-  margin-left: 1em
-}
-
-.itemizedlist li ul {
-  margin-bottom: 1.2em;
-}
-
-.itemizedlist li ul li p {
-  margin-top: .5em;
-  margin-bottom: .5em;
-}
-
-.itemizedlist li ul li:first-child p:first-child {
-  margin-top: -.6em;
-}
-
-ul.compact {
-  list-style: none;
-}
-
-.blfs ul.compact {
-  list-style: disc;
-}
-
-ul.compact li {
-  margin: 0em;
-  padding: 0em;
-}
-
-ul.compact li p {
-  padding: 0.3em;
-  margin: 0em;
-}
-
-.blfs ul.compact li p {
-  background-color: #f0fff0;
-}
-
-/* orderedlist */
-ol {
-  list-style: decimal;
-}
-
-ol ol {
-  list-style: lower-alpha;
-}
-
-ol ol ol {
-  list-style: lower-roman;
-}
-
-ol.compact li {
-  margin: 0em;
-  padding: 0em;
-}
-
-ol.compact li p {
-  padding: 0.3em;
-  margin: 0em;
-}
-
-
-/* Indented blocks */
-p, blockquote {
-  padding-left: 1em;
-  padding-right: 1em;
-}
-
-
-/* Monospaced elements */
-tt, code, kbd, pre, .command {
-  font-family: monospace;
-}
-
-.systemitem {
-  font-style: italic;
-}
-
-pre {
-  background-color: #e5e5e5;
-  border: 1px solid #050505;
-  padding: .5em 1em;
-  margin: 0 2em .5em 2em;
-  font-weight: bold;
-}
-
-pre.userinput {
-  color: #101310;
-}
-
-pre.root {
-  color: #101310;
-  border: 1px solid #11a;
-}
-
-pre.screen {
-  color: #000;
-  background-color: #e9e9e9;
-  font-weight: normal;
-}
-
-.literal, .prompt {
-  font-weight: normal;
-}
-
-
-/* Mixed tags */
-p.usernotes {
-  margin-left: -1em;
-  font-size: small;
-  font-weight: bold;
-  font-style: italic;
-}
-
-.underlined {
-  text-decoration: underline;
-}
-
-
-/* Last edited info */
-p.updated {
-  font-size: small;
-  font-weight: bold;
-  font-style: italic;
-}
-
-
-/* Special colored blocks */
-  /* OrangeRed4 */
-.feature-ssp {
-  color: #8B2500;
-}
-
-  /* RoyalBlue3 */
-.feature-aslr {
-  color: #3A5FCD;
-}
-
-  /* NavyBlue */
-.feature-pax {
-  color: #000080;
-}
-
-  /* VioletRed */
-.feature-hardened_tmp {
-  color: #d02090;
-}
-
-  /* PaleTurquoise4 */
-.feature-warnings {
-  color: #668b8b;
-}
-
-  /* RosyBrown */
-.feature-misc {
-  color: #bc8f8f;
-}
-
-  /* Sienna*/
-.feature-blowfish {
-  color: #8E6B23
-}
-      </xsl:text>
-    </style>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/pdf.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/pdf.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,108 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-   <!-- Stylesheet for FO output used to generate PDF
-        Sets global params and include customization stylesheets. -->
-
-    <!-- Upstream FO templates. Profiled version is not supported by
-         xsltproc, thus pofiling must be done in two steps (see Makefile) -->
-  <xsl:import href="docbook-xsl-snapshot/fo/docbook.xsl"/>
-
-    <!-- Uncomment the next for debugging the raw FO code.
-         Note that FOP will complaints about a lot of paragraph overflows
-         due that verbatim output is also indented.
-         Remember to comment the "rm $(BASEDIR)/lfs-pdf.fo" in
-         the Makefile. -->
-  <!--<xsl:output  encoding="UTF-8" indent="yes" />-->
-
-    <!-- Including our others customized templates. -->
-  <xsl:include href="common.xsl"/>
-  <xsl:include href="pdf/lfs-admon.xsl"/>
-  <xsl:include href="pdf/lfs-index.xsl"/>
-  <xsl:include href="pdf/lfs-lists.xsl"/>
-  <xsl:include href="pdf/lfs-mixed.xsl"/>
-  <xsl:include href="pdf/lfs-pagesetup.xsl"/>
-  <xsl:include href="pdf/lfs-xref.xsl"/>
-
-    <!-- Activating FOP-1 extensions. We use FOP-0.93 as the FO procesor. -->
-  <xsl:param name="fop1.extensions" select="1"/>
-
-    <!-- Desactivate draft mode at all. -->
-  <xsl:param name="draft.mode" select="'no'"/>
-
-   <!-- Paper size -->
-  <xsl:param name="paper.type" select="'USletter'"/>
-
-    <!-- Paper size required by the publisher
-  <xsl:param name="paper.type" select="'Customized'"/>
-  <xsl:param name="page.width">7.25in</xsl:param>
-  <xsl:param name="page.height">9.25in</xsl:param>
-    -->
-
-    <!-- Is the document to be printed double sided? 1 = yes, 0 = no -->
-    <!-- Change "double.sided" to "1" for published versions. -->
-  <xsl:param name="double.sided" select="0"/>
-
-    <!-- Hyphenate? -->
-  <xsl:param name="hyphenate">false</xsl:param>
-
-    <!-- Allow URLs to be automatically hyphenated.
-         We have expanded the support to several inline tags.
-         See pdf/lfs-mixed.xsl -->
-  <xsl:param name="ulink.hyphenate" select="'&#x200B;'"/>
-
-    <!-- List of characters to allow ulink URLs, and supported inline tags,
-         to be automatically hyphenated on.
-         Note: the / character is in the list but FOP-0.93 ignores it. -->
-  <xsl:param name="ulink.hyphenate.chars" select="'/._-'"/>
-
-    <!-- Specify the default text alignment. -->
-  <xsl:param name="alignment">justify</xsl:param>
-
-    <!-- Specifies the default point size for body text.
-         Used for titles size calculation. -->
-  <xsl:param name="body.font.master">9</xsl:param>
-
-    <!-- Specifies the default font size for body text. -->
-  <xsl:param name="body.font.size">12pt</xsl:param>
-
-    <!-- Control generation of ToCs and LoTs -->
-  <xsl:param name="generate.toc">
-    book      toc,title
-    part      nop
-  </xsl:param>
-
-    <!-- How deep should recursive sections appear in the TOC? -->
-  <xsl:param name="toc.section.depth">1</xsl:param>
-
-    <!-- Amount of indentation for TOC entries. -->
-  <xsl:param name="toc.indent.width" select="18"/>
-
-    <!-- Turns page numbers in xrefs on and off. -->
-  <xsl:param name="insert.xref.page.number">no</xsl:param>
-
-    <!-- Display URLs after ulinks? 1 = yes, 0 = no
-         Set to 0 to prevent duplicate e-mails in the Acknowledgments pages. -->
-  <xsl:param name="ulink.show" select="0"/>
-
-    <!-- Processing instruction for hard page breaks.
-         FOP-0.93 supports now @keep-*.*, @orphans, and @widows attributes,
-         that solves several page break issues.
-         It also supports the soft page break procesing instruction included
-         in the DocBook stylesheets.
-         But some times we may need hard page breaks for final book versions. -->
-    <!-- To know how to use all that page break features, see
-         http://www.sagehill.net/docbookxsl/PageBreaking.html -->
-  <xsl:template match="processing-instruction('hard-pagebreak')">
-    <fo:block break-before='page'/>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/pdf/lfs-admon.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/pdf/lfs-admon.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,81 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-  <!-- This stylesheet controls how admonitions are displayed -->
-
-    <!-- Use graphics in admonitions? 1 = yes, 0 = no -->
-  <xsl:param name="admon.graphics" select="1"/>
-
-    <!-- Path to admonition graphics relative to index.xml -->
-  <xsl:param name="admon.graphics.path" select="'images/'"/>
-
-    <!-- Global admonitions properties -->
-  <xsl:attribute-set name="graphical.admonition.properties">
-    <xsl:attribute name="keep-together.within-column">
-      <xsl:variable name="keep.together">
-        <xsl:call-template name="pi.dbfo_keep-together"/>
-      </xsl:variable>
-      <xsl:choose>
-        <xsl:when test="$keep.together != ''">
-          <xsl:value-of select="$keep.together"/>
-        </xsl:when>
-        <xsl:otherwise>always</xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-    <xsl:attribute name="space-before.optimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute>
-    <xsl:attribute name="space-after.optimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-after.minimum">0.4em</xsl:attribute>
-    <xsl:attribute name="space-after.maximum">0.8em</xsl:attribute>
-    <xsl:attribute name="padding-start">5pt</xsl:attribute>
-    <xsl:attribute name="padding-top">5pt</xsl:attribute>
-    <xsl:attribute name="padding-bottom">5pt</xsl:attribute>
-    <xsl:attribute name="border-style">solid</xsl:attribute>
-    <xsl:attribute name="border-width">0.5pt</xsl:attribute>
-    <xsl:attribute name="background-color">#FFFFE6</xsl:attribute>
-    <xsl:attribute name="border-color">
-      <xsl:choose>
-        <xsl:when test="self::note | self::tip">#E0E0E0</xsl:when>
-        <xsl:otherwise>#DCC</xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- Properties for admonitions titles -->
-  <xsl:attribute-set name="admonition.title.properties">
-    <xsl:attribute name="font-size">14pt</xsl:attribute>
-    <xsl:attribute name="font-weight">bold</xsl:attribute>
-    <xsl:attribute name="hyphenate">false</xsl:attribute>
-    <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-    <xsl:attribute name="color">
-      <xsl:choose>
-        <xsl:when test="ancestor-or-self::important | ancestor-or-self::warning
-                        | ancestor-or-self::caution">#500</xsl:when>
-        <xsl:otherwise>#000</xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- Properties for admonitions text -->
-  <xsl:attribute-set name="admonition.properties">
-    <xsl:attribute name="margin-right">5pt</xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- admon.graphic.width:
-           Making the graphic smaller. -->
-    <!-- The original template is in {docbook-xsl}/fo/admon.xsl -->
-  <xsl:template match="*" mode="admon.graphic.width">
-    <xsl:param name="node" select="."/>
-    <xsl:text>24pt</xsl:text>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/pdf/lfs-index.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/pdf/lfs-index.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,140 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<!DOCTYPE xsl:stylesheet [
-<!ENTITY lowercase "'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;'">
-<!ENTITY uppercase "'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ'">
-<!ENTITY primary   'normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))'>
-<!ENTITY scope     "count(ancestor::node()|$scope) = count(ancestor::node()) and ($role = @role or $type = @type or (string-length($role) = 0 and string-length($type) = 0))">
-]>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-  <!-- This stylesheet controls how the Index is generated.
-       Entities comes from {docbook-xsl}/common/entities.ent -->
-
-    <!-- Override for punctuation separating an index term from its list
-         of page references. -->
-  <xsl:param name="index.term.separator" select="': '"></xsl:param>
-
-    <!-- Divisions title properties. -->
-  <xsl:attribute-set name="index.div.title.properties">
-    <xsl:attribute name="margin-left">0pt</xsl:attribute>
-    <xsl:attribute name="font-size">14.4pt</xsl:attribute>
-    <xsl:attribute name="font-family">
-      <xsl:value-of select="$title.fontset"/>
-    </xsl:attribute>
-    <xsl:attribute name="font-weight">bold</xsl:attribute>
-    <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-    <xsl:attribute name="space-before.optimum">1em</xsl:attribute>
-    <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">1.2em</xsl:attribute>
-    <xsl:attribute name="space-after.optimum">0.5em</xsl:attribute>
-    <xsl:attribute name="space-after.minimum">0.3em</xsl:attribute>
-    <xsl:attribute name="space-after.maximum">0.7em</xsl:attribute>
-    <xsl:attribute name="start-indent">0pt</xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- Properties applied to the block containing entries in an Index. -->
-  <xsl:attribute-set name="index.entry.properties">
-    <xsl:attribute name="start-indent">0.5pc</xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- Divisions:
-          Translate alphabetical divisons titles to by-type titles. -->
-    <!-- The original template is in {docbook-xsl}/fo/autoidx.xsl -->
-  <xsl:template match="indexterm" mode="index-div-basic">
-    <xsl:param name="scope" select="."/>
-    <xsl:param name="role" select="''"/>
-    <xsl:param name="type" select="''"/>
-    <xsl:variable name="key"
-                  select="translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;)"/>
-    <xsl:variable name="divtitle" select="translate($key, &lowercase;, &uppercase;)"/>
-    <xsl:if test="key('letter', $key)[&scope;]
-                  [count(.|key('primary', &primary;)[&scope;][1]) = 1]">
-      <fo:block>
-        <xsl:if test="contains(concat(&lowercase;, &uppercase;), $key)">
-          <xsl:call-template name="indexdiv.title">
-            <xsl:with-param name="titlecontent">
-              <xsl:choose>
-                <xsl:when test="$divtitle = 'A'">
-                  <xsl:call-template name="gentext">
-                    <xsl:with-param name="key">Packages</xsl:with-param>
-                  </xsl:call-template>
-                </xsl:when>
-                <xsl:when test="$divtitle = 'B'">
-                  <xsl:call-template name="gentext">
-                    <xsl:with-param name="key">Programs</xsl:with-param>
-                  </xsl:call-template>
-                </xsl:when>
-                <xsl:when test="$divtitle = 'C'">
-                  <xsl:call-template name="gentext">
-                    <xsl:with-param name="key">Libraries</xsl:with-param>
-                  </xsl:call-template>
-                </xsl:when>
-                <xsl:when test="$divtitle = 'D'">
-                  <xsl:choose>
-                    <xsl:when test="$book-type = 'blfs'">
-                      <xsl:call-template name="gentext">
-                        <xsl:with-param name="key">Kernel Configuration</xsl:with-param>
-                      </xsl:call-template>
-                    </xsl:when>
-                    <xsl:otherwise>
-                      <xsl:call-template name="gentext">
-                        <xsl:with-param name="key">Scripts</xsl:with-param>
-                      </xsl:call-template>
-                    </xsl:otherwise>
-                  </xsl:choose>
-                </xsl:when>
-                <xsl:when test="$divtitle = 'E'">
-                  <xsl:choose>
-                    <xsl:when test="$book-type = 'blfs'">
-                      <xsl:call-template name="gentext">
-                        <xsl:with-param name="key">Configuration Files</xsl:with-param>
-                      </xsl:call-template>
-                    </xsl:when>
-                    <xsl:otherwise>
-                      <xsl:call-template name="gentext">
-                        <xsl:with-param name="key">Others</xsl:with-param>
-                      </xsl:call-template>
-                    </xsl:otherwise>
-                  </xsl:choose>
-                </xsl:when>
-                <xsl:when test="$divtitle = 'F'">
-                    <xsl:call-template name="gentext">
-                      <xsl:with-param name="key">Bootscripts</xsl:with-param>
-                    </xsl:call-template>
-                </xsl:when>
-                <xsl:when test="$divtitle = 'G'">
-                    <xsl:call-template name="gentext">
-                      <xsl:with-param name="key">Others</xsl:with-param>
-                    </xsl:call-template>
-                </xsl:when>
-                <xsl:otherwise>
-                  <xsl:value-of select="$divtitle"/>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:with-param>
-          </xsl:call-template>
-        </xsl:if>
-        <fo:block xsl:use-attribute-sets="index.entry.properties">
-          <xsl:apply-templates select="key('letter', $key)[&scope;]
-                                      [count(.|key('primary', &primary;)[&scope;][1])=1]"
-                              mode="index-primary">
-            <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/>
-            <xsl:with-param name="scope" select="$scope"/>
-            <xsl:with-param name="role" select="$role"/>
-            <xsl:with-param name="type" select="$type"/>
-          </xsl:apply-templates>
-        </fo:block>
-      </fo:block>
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/pdf/lfs-lists.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/pdf/lfs-lists.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,174 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-  <!-- This stylesheet controls how list are generated. -->
-
-    <!-- What spacing do you want before and after lists? -->
-  <xsl:attribute-set name="list.block.spacing">
-    <xsl:attribute name="space-before.optimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute>
-    <xsl:attribute name="space-after.optimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-after.minimum">0.4em</xsl:attribute>
-    <xsl:attribute name="space-after.maximum">0.8em</xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- What spacing do you want between list items? -->
-  <xsl:attribute-set name="list.item.spacing">
-    <xsl:attribute name="space-before.optimum">0.4em</xsl:attribute>
-    <xsl:attribute name="space-before.minimum">0.2em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">0.6em</xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- Properties that apply to each list-block generated by itemizedlist. -->
-  <xsl:attribute-set name="itemizedlist.properties"
-                     use-attribute-sets="list.block.properties">
-    <xsl:attribute name="text-align">left</xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- Format variablelists lists as blocks? 1 = yes, 0 = no
-           Default variablelist format. We override it when necesary
-           using the list-presentation processing instruction. -->
-  <xsl:param name="variablelist.as.blocks" select="1"/>
-
-    <!-- Specifies the longest term in variablelists.
-         Used when list-presentation = list -->
-  <xsl:param name="variablelist.max.termlength">35</xsl:param>
-
-    <!-- varlistentry mode block:
-           Addibg a bullet, left alignament, and @kepp-*.* attributes
-           for packages and paches list. -->
-    <!-- The original template is in {docbook-xsl}/fo/list.xsl -->
-  <xsl:template match="varlistentry" mode="vl.as.blocks">
-    <xsl:variable name="id"><xsl:call-template name="object.id"/></xsl:variable>
-    <xsl:choose>
-      <xsl:when test="ancestor::variablelist/@role = 'materials'">
-        <fo:block id="{$id}" xsl:use-attribute-sets="list.item.spacing"
-                  keep-together.within-column="always" font-weight="bold"
-                  keep-with-next.within-column="always" text-align="left">
-          <xsl:text>&#x2022;   </xsl:text>
-          <xsl:apply-templates select="term"/>
-        </fo:block>
-        <fo:block text-align="left"
-                  keep-together.within-column="always"
-                  keep-with-previous.within-column="always">
-          <xsl:apply-templates select="listitem"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:otherwise>
-        <fo:block id="{$id}" xsl:use-attribute-sets="list.item.spacing"
-                  keep-together.within-column="always"
-                  keep-with-next.within-column="always" margin-left="1em">
-          <xsl:apply-templates select="term"/>
-        </fo:block>
-        <fo:block margin-left="2em">
-          <xsl:apply-templates select="listitem"/>
-        </fo:block>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- segmentedlist:
-           Making it an actual FO list to can indent items.
-           Adjust vertical space. -->
-    <!-- The original template is in {docbook-xsl}/fo/list.xsl -->
-  <xsl:template match="segmentedlist">
-    <xsl:variable name="id">
-      <xsl:call-template name="object.id"/>
-    </xsl:variable>
-    <fo:list-block id="{$id}" provisional-distance-between-starts="12em"
-                   provisional-label-separation="1em"
-                   keep-together.within-column="always">
-      <xsl:choose>
-        <xsl:when test="ancestor::appendix[@id='appendixc']">
-          <xsl:attribute name="space-before.optimum">0.2em</xsl:attribute>
-          <xsl:attribute name="space-before.minimum">0em</xsl:attribute>
-          <xsl:attribute name="space-before.maximum">0.4em</xsl:attribute>
-          <xsl:attribute name="space-after.optimum">0.2em</xsl:attribute>
-          <xsl:attribute name="space-after.minimum">0em</xsl:attribute>
-          <xsl:attribute name="space-after.maximum">0.4em</xsl:attribute>
-          <xsl:attribute name="keep-with-previous.within-column">always</xsl:attribute>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:attribute name="space-before.optimum">0.4em</xsl:attribute>
-          <xsl:attribute name="space-before.minimum">0.2em</xsl:attribute>
-          <xsl:attribute name="space-before.maximum">0.6em</xsl:attribute>
-          <xsl:attribute name="space-after.optimum">0.4em</xsl:attribute>
-          <xsl:attribute name="space-after.minimum">0.2em</xsl:attribute>
-          <xsl:attribute name="space-after.maximum">0.6em</xsl:attribute>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:apply-templates select="seglistitem/seg"/>
-    </fo:list-block>
-  </xsl:template>
-
-    <!-- seg:
-           Self-made template based on the original seg template
-           found in {docbook-xsl}/fo/list.xsl
-           Making segmentedlist an actual FO list to can indent items. -->
-  <xsl:template match="seglistitem/seg">
-    <xsl:variable name="id">
-      <xsl:call-template name="object.id"/>
-    </xsl:variable>
-    <xsl:variable name="segnum" select="count(preceding-sibling::seg)+1"/>
-    <xsl:variable name="seglist" select="ancestor::segmentedlist"/>
-    <xsl:variable name="segtitles" select="$seglist/segtitle"/>
-    <fo:list-item xsl:use-attribute-sets="compact.list.item.spacing">
-      <fo:list-item-label end-indent="label-end()" text-align="start">
-        <fo:block>
-          <fo:inline font-weight="bold">
-            <xsl:apply-templates select="$segtitles[$segnum=position()]"
-                                 mode="segtitle-in-seg"/>
-            <xsl:text>:</xsl:text>
-          </fo:inline>
-        </fo:block>
-      </fo:list-item-label>
-      <fo:list-item-body start-indent="body-start()">
-        <fo:block id="{$id}">
-          <xsl:apply-templates/>
-        </fo:block>
-      </fo:list-item-body>
-    </fo:list-item>
-  </xsl:template>
-
-    <!-- simplelist:
-           Self-made template. Wrap it into a fo:block and process member childs.
-           If @type is specified, the original templates will be used.
-           NOTE: when using type='horiz' or type='vert', FOP-0.93 will complaints
-             about not supported table-layout="auto" -->
-  <xsl:template match="simplelist">
-    <fo:block xsl:use-attribute-sets="simplelist.properties">
-      <xsl:apply-templates mode="condensed"/>
-    </fo:block>
-  </xsl:template>
-
-    <!-- member:
-           Self-made template to wrap it into a fo:block using customized
-           properties. -->
-  <xsl:template match="member" mode="condensed">
-    <fo:block xsl:use-attribute-sets="simplelist.properties">
-      <xsl:call-template name="simple.xlink">
-        <xsl:with-param name="content">
-          <xsl:apply-templates/>
-        </xsl:with-param>
-      </xsl:call-template>
-    </fo:block>
-  </xsl:template>
-
-    <!-- Properties associated with our simplelist format. -->
-  <xsl:attribute-set name="simplelist.properties">
-    <xsl:attribute name="keep-with-previous.within-column">always</xsl:attribute>
-    <xsl:attribute name="space-before.optimum">0em</xsl:attribute>
-    <xsl:attribute name="space-before.minimum">0em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">0.2em</xsl:attribute>
-  </xsl:attribute-set>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/pdf/lfs-mixed.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/pdf/lfs-mixed.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,360 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-  <!-- This stylesheet contains misc params, attribute sets and templates
-       for output formating.
-       This file is for that templates that don't fit in other files. -->
-
-    <!-- What space do you want between normal paragraphs. -->
-  <xsl:attribute-set name="normal.para.spacing">
-    <xsl:attribute name="space-before.optimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute>
-    <xsl:attribute name="orphans">3</xsl:attribute>
-    <xsl:attribute name="widows">3</xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- Properties associated with verbatim text. -->
-  <xsl:attribute-set name="verbatim.properties">
-    <xsl:attribute name="keep-with-previous.within-column">always</xsl:attribute>
-    <xsl:attribute name="space-before.optimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-before.minimum">0.4em</xsl:attribute>
-    <xsl:attribute name="space-before.maximum">0.8em</xsl:attribute>
-    <xsl:attribute name="space-after.optimum">0.6em</xsl:attribute>
-    <xsl:attribute name="space-after.minimum">0.4em</xsl:attribute>
-    <xsl:attribute name="space-after.maximum">0.8em</xsl:attribute>
-    <xsl:attribute name="hyphenate">false</xsl:attribute>
-    <xsl:attribute name="wrap-option">no-wrap</xsl:attribute>
-    <xsl:attribute name="white-space-collapse">false</xsl:attribute>
-    <xsl:attribute name="white-space-treatment">preserve</xsl:attribute>
-    <xsl:attribute name="linefeed-treatment">preserve</xsl:attribute>
-    <xsl:attribute name="text-align">start</xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- Should verbatim environments be shaded? 1 =yes, 0 = no -->
-  <xsl:param name="shade.verbatim" select="1"/>
-
-    <!-- Properties that specify the style of shaded verbatim listings -->
-  <xsl:attribute-set name="shade.verbatim.style">
-    <xsl:attribute name="background-color">#E9E9E9</xsl:attribute>
-    <xsl:attribute name="border-style">solid</xsl:attribute>
-    <xsl:attribute name="border-width">0.5pt</xsl:attribute>
-    <xsl:attribute name="border-color">#888</xsl:attribute>
-    <xsl:attribute name="padding-start">5pt</xsl:attribute>
-    <xsl:attribute name="padding-top">2pt</xsl:attribute>
-    <xsl:attribute name="padding-bottom">2pt</xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- para:
-           Skip empty "Home page" in packages.xml.
-           Allow forced line breaks inside paragraphs emulating literallayout.
-           Removed vertical space in variablelist. -->
-    <!-- The original template is in {docbook-xsl}/fo/block.xsl -->
-  <xsl:template match="para">
-    <xsl:choose>
-      <xsl:when test="child::ulink[@url=' ']"/>
-      <xsl:when test="./@remap='verbatim'">
-        <fo:block xsl:use-attribute-sets="verbatim.properties">
-          <xsl:call-template name="anchor"/>
-          <xsl:apply-templates/>
-        </fo:block>
-      </xsl:when>
-      <xsl:when test="ancestor::variablelist">
-        <fo:block>
-          <xsl:attribute name="space-before.optimum">0.1em</xsl:attribute>
-          <xsl:attribute name="space-before.minimum">0em</xsl:attribute>
-          <xsl:attribute name="space-before.maximum">0.2em</xsl:attribute>
-          <xsl:call-template name="anchor"/>
-          <xsl:apply-templates/>
-        </fo:block>
-      </xsl:when>
-      <xsl:otherwise>
-        <fo:block xsl:use-attribute-sets="normal.para.spacing">
-          <xsl:call-template name="anchor"/>
-          <xsl:apply-templates/>
-        </fo:block>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- screen, literallayout:
-          Self-made template that creates a fo:block wrapper with keep-together
-          processing instruction support around the output generated by
-          original screen templates. -->
-  <xsl:template match="screen|literallayout">
-    <xsl:variable name="keep.together">
-      <xsl:call-template name="pi.dbfo_keep-together"/>
-    </xsl:variable>
-    <fo:block>
-      <xsl:attribute name="keep-together.within-column">
-        <xsl:choose>
-          <xsl:when test="$keep.together != ''">
-            <xsl:value-of select="$keep.together"/>
-          </xsl:when>
-          <xsl:otherwise>always</xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-      <xsl:apply-imports/>
-    </fo:block>
-  </xsl:template>
-
-    <!-- literal:
-           Be sure that literal will use allways normal font weight. -->
-    <!-- The original template is in {docbook-xsl}/fo/inline.xsl -->
-  <xsl:template match="literal">
-    <fo:inline  font-weight="normal">
-      <xsl:call-template name="inline.monoseq"/>
-    </fo:inline>
-  </xsl:template>
-
-    <!-- inline.monoseq:
-           Added hyphenate-url support to classname, exceptionname, interfacename,
-           methodname, computeroutput, constant, envar, filename, function, code,
-           literal, option, promt, systemitem, varname, sgmltag, tag, and uri -->
-    <!-- The original template is in {docbook-xsl}/fo/inline.xsl -->
-  <xsl:template name="inline.monoseq">
-    <xsl:param name="content">
-      <xsl:call-template name="simple.xlink">
-        <xsl:with-param name="content">
-          <xsl:choose>
-            <xsl:when test="ancestor::para and not(ancestor::screen)
-                            and not(descendant::ulink)">
-              <xsl:call-template name="hyphenate-url">
-                <xsl:with-param name="url">
-                  <xsl:apply-templates/>
-                </xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:param>
-    <fo:inline xsl:use-attribute-sets="monospace.properties">
-      <xsl:if test="@dir">
-        <xsl:attribute name="direction">
-          <xsl:choose>
-            <xsl:when test="@dir = 'ltr' or @dir = 'lro'">ltr</xsl:when>
-            <xsl:otherwise>rtl</xsl:otherwise>
-          </xsl:choose>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:copy-of select="$content"/>
-    </fo:inline>
-  </xsl:template>
-
-    <!-- inline.italicmonoseq:
-           Added hyphenate-url support to parameter, replaceable, structfield,
-           function/parameter, and function/replaceable -->
-    <!-- The original template is in {docbook-xsl}/fo/inline.xsl -->
-  <xsl:template name="inline.italicmonoseq">
-    <xsl:param name="content">
-      <xsl:call-template name="simple.xlink">
-        <xsl:with-param name="content">
-          <xsl:choose>
-            <xsl:when test="ancestor::para and not(ancestor::screen)
-                            and not(descendant::ulink)">
-              <xsl:call-template name="hyphenate-url">
-                <xsl:with-param name="url">
-                  <xsl:apply-templates/>
-                </xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:with-param>
-      </xsl:call-template>
-    </xsl:param>
-    <fo:inline font-style="italic" xsl:use-attribute-sets="monospace.properties">
-      <xsl:call-template name="anchor"/>
-      <xsl:if test="@dir">
-        <xsl:attribute name="direction">
-          <xsl:choose>
-            <xsl:when test="@dir = 'ltr' or @dir = 'lro'">ltr</xsl:when>
-            <xsl:otherwise>rtl</xsl:otherwise>
-          </xsl:choose>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:copy-of select="$content"/>
-    </fo:inline>
-  </xsl:template>
-
-    <!-- Show external URLs in italic font -->
-  <xsl:attribute-set name="xref.properties">
-    <xsl:attribute name="font-style">
-      <xsl:choose>
-        <xsl:when test="self::ulink">italic</xsl:when>
-        <xsl:otherwise>inherit</xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-  </xsl:attribute-set>
-
-   <!-- Center table title. -->
-  <xsl:attribute-set name="formal.title.properties">
-    <xsl:attribute name="text-align">
-      <xsl:choose>
-        <xsl:when test="local-name(.) = 'table'">center</xsl:when>
-        <xsl:otherwise>left</xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- table.layout:
-           We want all tables centered. Based on a hack posted
-           by Ellen Juhlin on docbook-apps mailing list. -->
-    <!-- The original template is in {docbook-xsl}/fo/table.xsl -->
-  <xsl:template name="table.layout">
-    <xsl:param name="table.content" select="NOTANODE"/>
-    <fo:table table-layout="fixed" width="100%">
-      <fo:table-column column-width ="proportional-column-width(1)"/>
-      <fo:table-column>
-        <!-- Set center column width equal to table width -->
-        <xsl:attribute name="column-width">
-          <xsl:call-template name="table.width"/>
-        </xsl:attribute>
-      </fo:table-column>
-      <fo:table-column column-width ="proportional-column-width(1)"/>
-      <fo:table-body>
-        <fo:table-row>
-          <fo:table-cell column-number="2">
-            <xsl:copy-of select="$table.content"/>
-          </fo:table-cell>
-        </fo:table-row>
-      </fo:table-body>
-    </fo:table>
-  </xsl:template>
-
-
-  <!-- Revision History -->
-
-    <!-- revhistory titlepage:
-           Self-made template to add missing support on bookinfo. -->
-  <xsl:template match="revhistory" mode="book.titlepage.verso.auto.mode">
-    <fo:block space-before.optimum="2em"
-              space-before.minimum="1.5em"
-              space-before.maximum="2.5em">
-      <xsl:apply-templates select="." mode="book.titlepage.verso.mode"/>
-    </fo:block>
-  </xsl:template>
-
-    <!-- revhitory title properties -->
-  <xsl:attribute-set name="revhistory.title.properties">
-    <xsl:attribute name="text-align">center</xsl:attribute>
-    <xsl:attribute name="font-weight">bold</xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- revhistory/revision mode titlepage.mode:
-           Removed authorinitials | author support placing
-           revremark | revdescription instead on that table-cell. -->
-    <!-- The original template is in {docbook-xsl}/fo/titlepage.xsl -->
-  <xsl:template match="revhistory/revision" mode="titlepage.mode">
-    <xsl:variable name="revnumber" select="revnumber"/>
-    <xsl:variable name="revdate"   select="date"/>
-    <xsl:variable name="revremark" select="revremark|revdescription"/>
-    <fo:table-row>
-      <fo:table-cell xsl:use-attribute-sets="revhistory.table.cell.properties">
-        <fo:block>
-          <xsl:if test="$revnumber">
-            <xsl:call-template name="gentext">
-              <xsl:with-param name="key" select="'Revision'"/>
-            </xsl:call-template>
-            <xsl:call-template name="gentext.space"/>
-            <xsl:apply-templates select="$revnumber[1]" mode="titlepage.mode"/>
-          </xsl:if>
-        </fo:block>
-      </fo:table-cell>
-      <fo:table-cell xsl:use-attribute-sets="revhistory.table.cell.properties">
-        <fo:block>
-          <xsl:apply-templates select="$revdate[1]"/>
-        </fo:block>
-      </fo:table-cell>
-      <fo:table-cell xsl:use-attribute-sets="revhistory.table.cell.properties">
-        <fo:block>
-          <xsl:apply-templates select="$revremark[1]"/>
-        </fo:block>
-      </fo:table-cell>
-    </fo:table-row>
-  </xsl:template>
-
-
-  <!-- Dummy sect1 -->
-
-    <!-- sect1:
-           Self-made template to skip dummy sect1 pages generation. -->
-  <xsl:template match="sect1">
-    <xsl:choose>
-      <xsl:when test="@role = 'dummy'"/>
-      <xsl:otherwise>
-        <xsl:apply-imports/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- sect1 mode fop1.outline:
-           Self-made template to skip dummy sect1 bookmarks generation. -->
-  <xsl:template match="sect1" mode="fop1.outline">
-    <xsl:choose>
-      <xsl:when test="@role = 'dummy'"/>
-      <xsl:otherwise>
-        <xsl:apply-imports/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- toc.line:
-           For dummy sect1 output only the title. -->
-    <!-- The original template is in {docbook-xsl}/fo/autotoc.xsl -->
-  <xsl:template name="toc.line">
-    <xsl:param name="toc-context" select="NOTANODE"/>
-    <xsl:variable name="id">
-      <xsl:call-template name="object.id"/>
-    </xsl:variable>
-    <xsl:variable name="label">
-      <xsl:apply-templates select="." mode="label.markup"/>
-    </xsl:variable>
-    <xsl:choose>
-      <xsl:when test="@role = 'dummy'">
-        <fo:block text-align="left">
-          <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-        </fo:block>
-      </xsl:when>
-      <xsl:otherwise>
-        <fo:block xsl:use-attribute-sets="toc.line.properties">
-          <fo:inline keep-with-next.within-line="always">
-            <fo:basic-link internal-destination="{$id}">
-              <xsl:if test="$label != ''">
-                <xsl:copy-of select="$label"/>
-                <xsl:value-of select="$autotoc.label.separator"/>
-              </xsl:if>
-              <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-            </fo:basic-link>
-          </fo:inline>
-          <fo:inline keep-together.within-line="always">
-            <xsl:text> </xsl:text>
-            <fo:leader leader-pattern="dots"
-                       leader-pattern-width="3pt"
-                       leader-alignment="reference-area"
-                       keep-with-next.within-line="always"/>
-            <xsl:text> </xsl:text>
-            <fo:basic-link internal-destination="{$id}">
-              <fo:page-number-citation ref-id="{$id}"/>
-            </fo:basic-link>
-          </fo:inline>
-        </fo:block>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/pdf/lfs-pagesetup.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,249 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                version="1.0">
-
-  <!-- This stylesheet controls page margins, sections page break,
-       header content and titles size. -->
-
-    <!-- The inner page margin. -->
-  <xsl:param name="page.margin.inner" select="'0.32in'"/>
-
-    <!-- The outer page margin. -->
-  <xsl:param name="page.margin.outer" select="'0.32in'"/>
-
-    <!-- The bottom margin of the page. -->
-  <xsl:param name="page.margin.bottom" select="'0.35in'"/>
-
-    <!-- The top margin of the page. -->
-  <xsl:param name="page.margin.top" select="'0.35in'"/>
-
-    <!-- The bottom margin of the body text. -->
-  <xsl:param name="body.margin.bottom" select="'0.4in'"/>
-
-    <!-- The top margin of the body text. -->
-  <xsl:param name="body.margin.top" select="'0.4in'"/>
-
-    <!-- Specifies the height of the header. -->
-  <xsl:param name="region.before.extent" select="'0.25in'"/>
-
-    <!-- Specifies the height of the footer. -->
-  <xsl:param name="region.after.extent" select="'0.25in'"/>
-
-    <!-- The start-indent for the body text. -->
-  <xsl:param name="body.start.indent" select="'0pc'"/>
-
-    <!-- Adjust the left margin for titles. -->
-  <xsl:param name="title.margin.left">-0.8pc</xsl:param>
-
-    <!-- Default table width on tables that do not specify an alternate
-         width using the dbfo processing instruction.
-         This value is used also on bookinfo/revhistory table. -->
-  <xsl:param name="default.table.width" select="'70%'"/>
-
-    <!-- Properties for component titles -->
-  <xsl:attribute-set name="component.title.properties">
-    <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
-    <xsl:attribute name="space-before.optimum">
-      <xsl:value-of select="concat($body.font.master, 'pt')"/>
-    </xsl:attribute>
-    <xsl:attribute name="space-before.minimum">
-      <xsl:value-of select="concat($body.font.master, 'pt * 0.8')"/>
-    </xsl:attribute>
-    <xsl:attribute name="space-before.maximum">
-      <xsl:value-of select="concat($body.font.master, 'pt * 1.2')"/>
-    </xsl:attribute>
-    <xsl:attribute name="hyphenate">false</xsl:attribute>
-    <xsl:attribute name="text-align">
-      <xsl:choose>
-        <xsl:when test="((parent::article | parent::articleinfo |
-                          parent::info/parent::article)
-                          and not(ancestor::book) and not(self::bibliography))
-                        or (parent::slides | parent::slidesinfo)
-                        or self::index">center</xsl:when>
-        <xsl:otherwise>left</xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-    <xsl:attribute name="start-indent">
-      <xsl:value-of select="$title.margin.left"/>
-    </xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- Rule under headers? 1 =yes, 0 = no -->
-  <xsl:param name="header.rule" select="0"/>
-
-    <!-- Rule over footers? 1 =yes, 0 = no -->
-  <xsl:param name="footer.rule" select="0"></xsl:param>
-
-    <!-- Control depth of sections shown in running headers or footers.
-         Be sure that no unneeded fo:marker are generated. -->
-  <xsl:param name="marker.section.level" select="-1"></xsl:param>
-
-     <!-- Force package's sect1 onto a new page -->
-  <xsl:attribute-set name="section.level1.properties">
-    <xsl:attribute name="break-before">
-      <xsl:choose>
-        <!--<xsl:when test="not(. = //*/sect1[1])">
-          <xsl:text>page</xsl:text>
-        </xsl:when>-->
-        <xsl:when test="preceding-sibling::sect1[position()=1]/sect2/@role='package'
-                        or self::sect1/sect2/@role='package'">page</xsl:when>
-        <xsl:otherwise>
-          <xsl:text>auto</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:attribute>
-  </xsl:attribute-set>
-
-    <!-- part/partintro:
-           Be sure that partintro is on a new page. -->
-    <!-- The original template is in {docbook-xsl}/fo/divisions.xsl -->
-  <xsl:template match="part/partintro">
-    <xsl:apply-templates select=".." mode="part.titlepage.mode">
-      <xsl:with-param name="additional.content">
-        <fo:block break-before="page"/>
-        <xsl:if test="title">
-          <xsl:call-template name="partintro.titlepage"/>
-        </xsl:if>
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:apply-templates>
-    <xsl:call-template name="generate.part.toc">
-      <xsl:with-param name="part" select=".."/>
-    </xsl:call-template>
-  </xsl:template>
-
-    <!-- book title:
-          Centered the title and removed unused code.
-          Removed book.titlepage.separator. -->
-    <!-- The original template is in {docbook-xsl}/fo/titlepage.templates.xsl -->
-  <xsl:template name="book.titlepage">
-    <fo:block margin-top="3in">
-      <fo:block>
-        <xsl:call-template name="book.titlepage.before.recto"/>
-        <xsl:call-template name="book.titlepage.recto"/>
-      </fo:block>
-      <fo:block>
-        <xsl:call-template name="book.titlepage.before.verso"/>
-        <xsl:call-template name="book.titlepage.verso"/>
-      </fo:block>
-    </fo:block>
-  </xsl:template>
-
-    <!-- book titlepage verso:
-           Added missing bibliosource and revhistory support.
-           Removed unused code. -->
-    <!-- The original template is in {docbook-xsl}/fo/titlepage.templates.xsl -->
-  <xsl:template name="book.titlepage.verso">
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/title"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/corpauthor"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/authorgroup"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/author"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/othercredit"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/releaseinfo"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/pubdate"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/copyright"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/bibliosource"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/abstract"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/revhistory"/>
-    <xsl:apply-templates mode="book.titlepage.verso.auto.mode" select="bookinfo/legalnotice"/>
-  </xsl:template>
-
-    <!-- bibliosource:
-           Self-made template to handle bibliosource when inside bookinfo. -->
-  <xsl:template match="bibliosource" mode="book.titlepage.verso.auto.mode">
-    <fo:block font-size="8pt">
-      <xsl:apply-templates/>
-    </fo:block>
-  </xsl:template>
-
-    <!-- part title:
-           Centered the title and removed unused code. -->
-    <!-- The original template is in {docbook-xsl}/fo/titlepage.templates.xsl -->
-  <xsl:template name="part.titlepage">
-    <fo:block>
-      <fo:block margin-top="3.5in">
-        <xsl:call-template name="part.titlepage.before.recto"/>
-        <xsl:call-template name="part.titlepage.recto"/>
-      </fo:block>
-      <fo:block>
-        <xsl:call-template name="part.titlepage.before.verso"/>
-        <xsl:call-template name="part.titlepage.verso"/>
-      </fo:block>
-      <xsl:call-template name="part.titlepage.separator"/>
-    </fo:block>
-  </xsl:template>
-
-    <!-- chapter title:
-           Small font size and left alignament. -->
-    <!-- The original template is in {docbook-xsl}/fo/titlepage.templates.xsl -->
-  <xsl:template match="title" mode="chapter.titlepage.recto.auto.mode">
-    <fo:block xsl:use-attribute-sets="chapter.titlepage.recto.style"
-              font-size="21pt" font-weight="bold" text-align="left">
-      <xsl:call-template name="component.title">
-        <xsl:with-param name="node" select="ancestor-or-self::chapter[1]"/>
-      </xsl:call-template>
-    </fo:block>
-  </xsl:template>
-
-    <!-- sect2 title:
-           Skip sect2.titlepage run when title is empty.
-           Removed unused code. -->
-    <!-- The original template is in {docbook-xsl}/fo/sections.xsl -->
-  <xsl:template match="sect2">
-    <xsl:variable name="id">
-      <xsl:call-template name="object.id"/>
-    </xsl:variable>
-    <fo:block xsl:use-attribute-sets="section.level2.properties">
-      <xsl:attribute name="id">
-        <xsl:value-of select="$id"/>
-      </xsl:attribute>
-      <xsl:if test="not(string-length(title)=0)">
-        <xsl:call-template name="sect2.titlepage"/>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </fo:block>
-  </xsl:template>
-
-   <!-- header.table:
-          Re-made template to not generate a fo:table in the header,
-          allowing a more simple header.content customization. -->
-    <!-- The original template is in {docbook-xsl}/fo/pagesetup.xsl -->
-  <xsl:template name="header.table">
-    <xsl:param name="sequence" select="''"/>
-    <xsl:param name="gentext-key" select="''"/>
-    <xsl:choose>
-      <xsl:when test="$gentext-key = 'book' or $sequence = 'blank'"/>
-      <xsl:otherwise>
-        <xsl:call-template name="header.content">
-          <xsl:with-param name="sequence" select="$sequence"/>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- header.content
-           Re-made template to show the book title and version on all pages. -->
-    <!-- The original template is in {docbook-xsl}/fo/pagesetup.xsl -->
-  <xsl:template name="header.content">
-    <xsl:param name="sequence" select="''"/>
-    <fo:block>
-      <xsl:attribute name="text-align">
-        <xsl:choose>
-          <xsl:when test="$sequence = 'first' or $sequence = 'odd'">right</xsl:when>
-          <xsl:otherwise>left</xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-      <xsl:value-of select="/book/bookinfo/title"/>
-      <xsl:text> - </xsl:text>
-      <xsl:value-of select="/book/bookinfo/subtitle"/>
-    </fo:block>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/pdf/lfs-xref.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/pdf/lfs-xref.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,169 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:xlink="http://www.w3.org/1999/xlink"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                exclude-result-prefixes="xlink"
-                version="1.0">
-
-
-  <!-- This stylesheet fixes English punctuation in xref links
-       (as was requested by the publisher) via adding @role propagation
-       in xref tags.
-       This hack may not work with xref flavours not used in the book.
-       For other languages, just remove the xref @role attributes
-       in the book XML sources and/or comment-out the inclusion of
-       this file in lfs-pdf.xsl -->
-
-     <!--  xref:
-           Added role variable and use it when calling mode xref-to.-->
-    <!-- The original template is in {docbook-xsl}/fo/xref.xsl -->
-  <xsl:template match="xref" name="xref">
-    <xsl:param name="xhref" select="@xlink:href"/>
-    <!-- is the @xlink:href a local idref link? -->
-    <xsl:param name="xlink.idref">
-      <xsl:if test="starts-with($xhref,'#')
-                    and (not(contains($xhref,'&#40;'))
-                    or starts-with($xhref, '#xpointer&#40;id&#40;'))">
-        <xsl:call-template name="xpointer.idref">
-          <xsl:with-param name="xpointer" select="$xhref"/>
-        </xsl:call-template>
-    </xsl:if>
-    </xsl:param>
-    <xsl:param name="xlink.targets" select="key('id',$xlink.idref)"/>
-    <xsl:param name="linkend.targets" select="key('id',@linkend)"/>
-    <xsl:param name="target" select="($xlink.targets | $linkend.targets)[1]"/>
-    <xsl:param name="refelem" select="local-name($target)"/>
-      <!-- Added role variable -->
-    <xsl:variable name="role" select="@role"/>
-    <xsl:variable name="xrefstyle">
-      <xsl:choose>
-        <xsl:when test="@role and not(@xrefstyle)
-                        and $use.role.as.xrefstyle != 0">
-          <xsl:value-of select="@role"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="@xrefstyle"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="content">
-      <fo:inline xsl:use-attribute-sets="xref.properties">
-        <xsl:choose>
-          <xsl:when test="@endterm">
-            <xsl:variable name="etargets" select="key('id',@endterm)"/>
-            <xsl:variable name="etarget" select="$etargets[1]"/>
-            <xsl:choose>
-              <xsl:when test="count($etarget) = 0">
-                <xsl:message>
-                  <xsl:value-of select="count($etargets)"/>
-                  <xsl:text>Endterm points to nonexistent ID: </xsl:text>
-                  <xsl:value-of select="@endterm"/>
-                </xsl:message>
-                <xsl:text>???</xsl:text>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:apply-templates select="$etarget" mode="endterm"/>
-              </xsl:otherwise>
-            </xsl:choose>
-          </xsl:when>
-          <xsl:when test="$target/@xreflabel">
-            <xsl:call-template name="xref.xreflabel">
-              <xsl:with-param name="target" select="$target"/>
-            </xsl:call-template>
-          </xsl:when>
-          <xsl:when test="$target">
-            <xsl:if test="not(parent::citation)">
-              <xsl:apply-templates select="$target" mode="xref-to-prefix"/>
-            </xsl:if>
-            <xsl:apply-templates select="$target" mode="xref-to">
-              <xsl:with-param name="referrer" select="."/>
-              <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-              <!-- Propagate role -->
-              <xsl:with-param name="role" select="$role"/>
-            </xsl:apply-templates>
-            <xsl:if test="not(parent::citation)">
-              <xsl:apply-templates select="$target" mode="xref-to-suffix"/>
-            </xsl:if>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:message>
-              <xsl:text>ERROR: xref linking to </xsl:text>
-              <xsl:value-of select="@linkend|@xlink:href"/>
-              <xsl:text> has no generated link text.</xsl:text>
-            </xsl:message>
-            <xsl:text>???</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </fo:inline>
-    </xsl:variable>
-    <!-- Convert it into an active link -->
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content" select="$content"/>
-    </xsl:call-template>
-    <!-- Add standard page reference? -->
-    <xsl:choose>
-      <xsl:when test="not($target)">
-        <!-- page numbers only for local targets -->
-      </xsl:when>
-      <xsl:when test="starts-with(normalize-space($xrefstyle), 'select:')
-                    and contains($xrefstyle, 'nopage')">
-        <!-- negative xrefstyle in instance turns it off -->
-      </xsl:when>
-      <!-- positive xrefstyle already handles it -->
-      <xsl:when test="not(starts-with(normalize-space($xrefstyle), 'select:')
-                    and (contains($xrefstyle, 'page')
-                        or contains($xrefstyle, 'Page')))
-                    and ( $insert.xref.page.number = 'yes'
-                      or $insert.xref.page.number = '1')
-                    or local-name($target) = 'para'">
-        <xsl:apply-templates select="$target" mode="page.citation">
-          <xsl:with-param name="id" select="$target/@id|$target/@xml:id"/>
-        </xsl:apply-templates>
-      </xsl:when>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- sect* mode xref-to:
-           Propagate role to mode object.xref.markup (see ../lfs-common.xsl) -->
-    <!-- The original template is in {docbook-xsl}/fo/xref.xsl -->
-  <xsl:template match="section|simplesect|sect1|sect2|sect3|sect4|sect5
-                      |refsect1|refsect2|refsect3|refsection" mode="xref-to">
-    <xsl:param name="referrer"/>
-    <xsl:param name="xrefstyle"/>
-    <xsl:param name="verbose" select="1"/>
-    <xsl:param name="role"/>
-    <xsl:apply-templates select="." mode="object.xref.markup">
-      <xsl:with-param name="purpose" select="'xref'"/>
-      <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-      <xsl:with-param name="referrer" select="$referrer"/>
-      <xsl:with-param name="verbose" select="$verbose"/>
-      <xsl:with-param name="role" select="$role"/>
-    </xsl:apply-templates>
-  </xsl:template>
-
-    <!-- insert.title.markup:
-           Apply the role value. -->
-    <!-- The original template is in {docbook-xsl}/fo/xref.xsl -->
-  <xsl:template match="*" mode="insert.title.markup">
-    <xsl:param name="purpose"/>
-    <xsl:param name="xrefstyle"/>
-    <xsl:param name="title"/>
-    <xsl:param name="role"/>
-    <xsl:choose>
-      <xsl:when test="$purpose = 'xref' and titleabbrev">
-        <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:copy-of select="$title"/>
-        <xsl:value-of select="$role"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/profile.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/profile.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,55 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-  <!-- Stylesheet to create profiled XML output.
-       Replaces {docbook-xsl}/profiling/profile.xsl -->
-
-  <!-- Include common profiling stylesheet -->
-  <xsl:import href="docbook-xsl-snapshot/profiling/profile-mode.xsl"/>
-
-    <!-- This file must be included, because profile-mode is using
-         templates from it -->
-  <xsl:import href="docbook-xsl-snapshot/common/stripns.xsl"/>
-
-    <!-- In the two pass processing there is no need for base URI fixup -->
-  <xsl:param name="profile.baseuri.fixup" select="false()"/>
-
-  <!-- Generate DocBook instance with correct DOCTYPE -->
-  <xsl:output method="xml"
-              doctype-public="-//OASIS//DTD DocBook XML V4.5//EN"
-              doctype-system="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"/>
-
-  <!-- Profiling parameters:
-         profile.separator changed from ";" to "," to let it work
-         at command line. -->
-  <xsl:param name="profile.arch" select="''"/>
-  <xsl:param name="profile.audience" select="''"/>
-  <xsl:param name="profile.condition" select="''"/>
-  <xsl:param name="profile.conformance" select="''"/>
-  <xsl:param name="profile.lang" select="''"/>
-  <xsl:param name="profile.os" select="''"/>
-  <xsl:param name="profile.revision" select="''"/>
-  <xsl:param name="profile.revisionflag" select="''"/>
-  <xsl:param name="profile.role" select="''"/>
-  <xsl:param name="profile.security" select="''"/>
-  <xsl:param name="profile.status" select="''"/>
-  <xsl:param name="profile.userlevel" select="''"/>
-  <xsl:param name="profile.vendor" select="''"/>
-  <xsl:param name="profile.wordsize" select="''"/>
-  <xsl:param name="profile.attribute" select="''"/>
-  <xsl:param name="profile.value" select="''"/>
-  <xsl:param name="profile.separator" select="','"/>
-
-  <!-- Call common profiling mode -->
-  <xsl:template match="/">
-    <xsl:apply-templates select="." mode="profile"/>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/xhtml/lfs-admon.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/xhtml/lfs-admon.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,59 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-  <!-- This stylesheet controls how admonitions are displayed -->
-
-    <!-- Use graphics in admonitions? 1 = yes, 0 = no -->
-  <xsl:param name="admon.graphics" select="1"/>
-
-    <!-- Relative path to images directory. We set here relative path
-    from sub-dirs HTML files. The path from top-level HTML files (index.html,
-    partX.html, etc) MUST be fixed via a sed in the Makefile. -->
-  <xsl:param name="admon.graphics.path">../images/</xsl:param>
-
-    <!-- The images files extension -->
-  <xsl:param name="admon.graphics.extension" select="'.png'"/>
-
-    <!-- Changing the output tagging:
-           Removed $admon.style support
-           Hardcoded $admon.textlabel feature
-           Changed the output format from table to nested divs -->
-    <!-- The original template is in {docbook-xsl}/xhtml/admon.xsl -->
-  <xsl:template name="graphical.admonition">
-    <xsl:variable name="admon.type">
-      <xsl:choose>
-        <xsl:when test="local-name(.)='note'">Note</xsl:when>
-        <xsl:when test="local-name(.)='warning'">Warning</xsl:when>
-        <xsl:when test="local-name(.)='caution'">Caution</xsl:when>
-        <xsl:when test="local-name(.)='tip'">Tip</xsl:when>
-        <xsl:when test="local-name(.)='important'">Important</xsl:when>
-        <xsl:otherwise>Note</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="alt">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="$admon.type"/>
-      </xsl:call-template>
-    </xsl:variable>
-    <div class="admon {name(.)}">
-      <img alt="[{$alt}]">
-        <xsl:attribute name="src">
-          <xsl:call-template name="admon.graphic"/>
-        </xsl:attribute>
-      </img>
-      <h3>
-        <xsl:apply-templates select="." mode="object.title.markup"/>
-      </h3>
-      <xsl:apply-templates/>
-    </div>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/xhtml/lfs-index.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/xhtml/lfs-index.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,268 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<!DOCTYPE xsl:stylesheet [
-<!ENTITY lowercase "'Aa&#192;&#224;&#193;&#225;&#194;&#226;&#195;&#227;&#196;&#228;&#197;&#229;&#256;&#257;&#258;&#259;&#260;&#261;&#461;&#462;&#478;&#479;&#480;&#481;&#506;&#507;&#512;&#513;&#514;&#515;&#550;&#551;&#7680;&#7681;&#7834;&#7840;&#7841;&#7842;&#7843;&#7844;&#7845;&#7846;&#7847;&#7848;&#7849;&#7850;&#7851;&#7852;&#7853;&#7854;&#7855;&#7856;&#7857;&#7858;&#7859;&#7860;&#7861;&#7862;&#7863;Bb&#384;&#385;&#595;&#386;&#387;&#7682;&#7683;&#7684;&#7685;&#7686;&#7687;Cc&#199;&#231;&#262;&#263;&#264;&#265;&#266;&#267;&#268;&#269;&#391;&#392;&#597;&#7688;&#7689;Dd&#270;&#271;&#272;&#273;&#394;&#599;&#395;&#396;&#453;&#498;&#545;&#598;&#7690;&#7691;&#7692;&#7693;&#7694;&#7695;&#7696;&#7697;&#7698;&#7699;Ee&#200;&#232;&#201;&#233;&#202;&#234;&#203;&#235;&#274;&#275;&#276;&#277;&#278;&#279;&#280;&#281;&#282;&#283;&#516;&#517;&#518;&#519;&#552;&#553;&#7700;&#7701;&#7702;&#7703;&#7704;&#7705;&#7706;&#7707;&#7708;&#7709;&#7864;&#7865;&#7866;&#7867;&#7868;&#7869;&#7870;&#7871;&#7872;&#7873;&#7874;&#7875;&#7876;&#7877;&#7878;&#7879;Ff&#401;&#402;&#7710;&#7711;Gg&#284;&#285;&#286;&#287;&#288;&#289;&#290;&#291;&#403;&#608;&#484;&#485;&#486;&#487;&#500;&#501;&#7712;&#7713;Hh&#292;&#293;&#294;&#295;&#542;&#543;&#614;&#7714;&#7715;&#7716;&#7717;&#7718;&#7719;&#7720;&#7721;&#7722;&#7723;&#7830;Ii&#204;&#236;&#205;&#237;&#206;&#238;&#207;&#239;&#296;&#297;&#298;&#299;&#300;&#301;&#302;&#303;&#304;&#407;&#616;&#463;&#464;&#520;&#521;&#522;&#523;&#7724;&#7725;&#7726;&#7727;&#7880;&#7881;&#7882;&#7883;Jj&#308;&#309;&#496;&#669;Kk&#310;&#311;&#408;&#409;&#488;&#489;&#7728;&#7729;&#7730;&#7731;&#7732;&#7733;Ll&#313;&#314;&#315;&#316;&#317;&#318;&#319;&#320;&#321;&#322;&#410;&#456;&#564;&#619;&#620;&#621;&#7734;&#7735;&#7736;&#7737;&#7738;&#7739;&#7740;&#7741;Mm&#625;&#7742;&#7743;&#7744;&#7745;&#7746;&#7747;Nn&#209;&#241;&#323;&#324;&#325;&#326;&#327;&#328;&#413;&#626;&#414;&#544;&#459;&#504;&#505;&#565;&#627;&#7748;&#7749;&#7750;&#7751;&#7752;&#7753;&#7754;&#7755;Oo&#210;&#242;&#211;&#243;&#212;&#244;&#213;&#245;&#214;&#246;&#216;&#248;&#332;&#333;&#334;&#335;&#336;&#337;&#415;&#416;&#417;&#465;&#466;&#490;&#491;&#492;&#493;&#510;&#511;&#524;&#525;&#526;&#527;&#554;&#555;&#556;&#557;&#558;&#559;&#560;&#561;&#7756;&#7757;&#7758;&#7759;&#7760;&#7761;&#7762;&#7763;&#7884;&#7885;&#7886;&#7887;&#7888;&#7889;&#7890;&#7891;&#7892;&#7893;&#7894;&#7895;&#7896;&#7897;&#7898;&#7899;&#7900;&#7901;&#7902;&#7903;&#7904;&#7905;&#7906;&#7907;Pp&#420;&#421;&#7764;&#7765;&#7766;&#7767;Qq&#672;Rr&#340;&#341;&#342;&#343;&#344;&#345;&#528;&#529;&#530;&#531;&#636;&#637;&#638;&#7768;&#7769;&#7770;&#7771;&#7772;&#7773;&#7774;&#7775;Ss&#346;&#347;&#348;&#349;&#350;&#351;&#352;&#353;&#536;&#537;&#642;&#7776;&#7777;&#7778;&#7779;&#7780;&#7781;&#7782;&#7783;&#7784;&#7785;Tt&#354;&#355;&#356;&#357;&#358;&#359;&#427;&#428;&#429;&#430;&#648;&#538;&#539;&#566;&#7786;&#7787;&#7788;&#7789;&#7790;&#7791;&#7792;&#7793;&#7831;Uu&#217;&#249;&#218;&#250;&#219;&#251;&#220;&#252;&#360;&#361;&#362;&#363;&#364;&#365;&#366;&#367;&#368;&#369;&#370;&#371;&#431;&#432;&#467;&#468;&#469;&#470;&#471;&#472;&#473;&#474;&#475;&#476;&#532;&#533;&#534;&#535;&#7794;&#7795;&#7796;&#7797;&#7798;&#7799;&#7800;&#7801;&#7802;&#7803;&#7908;&#7909;&#7910;&#7911;&#7912;&#7913;&#7914;&#7915;&#7916;&#7917;&#7918;&#7919;&#7920;&#7921;Vv&#434;&#651;&#7804;&#7805;&#7806;&#7807;Ww&#372;&#373;&#7808;&#7809;&#7810;&#7811;&#7812;&#7813;&#7814;&#7815;&#7816;&#7817;&#7832;Xx&#7818;&#7819;&#7820;&#7821;Yy&#221;&#253;&#255;&#376;&#374;&#375;&#435;&#436;&#562;&#563;&#7822;&#7823;&#7833;&#7922;&#7923;&#7924;&#7925;&#7926;&#7927;&#7928;&#7929;Zz&#377;&#378;&#379;&#380;&#381;&#382;&#437;&#438;&#548;&#549;&#656;&#657;&#7824;&#7825;&#7826;&#7827;&#7828;&#7829;&#7829;'">
-<!ENTITY uppercase "'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBCCCCCCCCCCCCCCCCCDDDDDDDDDDDDDDDDDDDDDDDDEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEFFFFFFGGGGGGGGGGGGGGGGGGGGHHHHHHHHHHHHHHHHHHHHIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIJJJJJJKKKKKKKKKKKKKKLLLLLLLLLLLLLLLLLLLLLLLLLLMMMMMMMMMNNNNNNNNNNNNNNNNNNNNNNNNNNNOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOPPPPPPPPQQQRRRRRRRRRRRRRRRRRRRRRRRSSSSSSSSSSSSSSSSSSSSSSSTTTTTTTTTTTTTTTTTTTTTTTTTUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUUVVVVVVVVWWWWWWWWWWWWWWWXXXXXXYYYYYYYYYYYYYYYYYYYYYYYZZZZZZZZZZZZZZZZZZZZZ'">
-<!ENTITY primary   'normalize-space(concat(primary/@sortas, primary[not(@sortas) or @sortas = ""]))'>
-<!ENTITY secondary 'normalize-space(concat(secondary/@sortas, secondary[not(@sortas) or @sortas = ""]))'>
-<!ENTITY scope     "count(ancestor::node()|$scope) = count(ancestor::node())">
-<!ENTITY section   "(ancestor-or-self::set |ancestor-or-self::book |ancestor-or-self::part |ancestor-or-self::reference |ancestor-or-self::partintro |ancestor-or-self::chapter |ancestor-or-self::appendix |ancestor-or-self::preface |ancestor-or-self::article |ancestor-or-self::section |ancestor-or-self::sect1 |ancestor-or-self::sect2 |ancestor-or-self::sect3 |ancestor-or-self::sect4 |ancestor-or-self::sect5 |ancestor-or-self::refentry |ancestor-or-self::refsect1 |ancestor-or-self::refsect2 |ancestor-or-self::refsect3 |ancestor-or-self::simplesect |ancestor-or-self::bibliography |ancestor-or-self::glossary |ancestor-or-self::index |ancestor-or-self::webpage)[last()]">
-<!ENTITY section.id "generate-id(&section;)">
-<!ENTITY sep '" "'>
-]>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-  <!-- This stylesheet controls how the Index is generated.
-       Due how they are created, the original XHTML stylesheets don't make
-       use of the entities from {docbook-xsl}/common/entities.ent.
-       We add the relevant ones in the DOCTYPE to have more readable templates.
-       Also, we remove support for @role and @type based Index due that it is
-       broken when used with @zone based cross-references. -->
-
-    <!-- The file name of the Index page.
-         There is no upstream template with match="index", only a global
-         match="*", thus the next template is enought to force the Index
-         filename. -->
-  <xsl:template match="index" mode="recursive-chunk-filename">
-    <xsl:text>longindex.html</xsl:text>
-  </xsl:template>
-
-    <!-- The Index title in the longindex.html page:
-           Removed a lot of code not useful for us.
-           Forced h1 title size. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="index.titlepage">
-    <h1 class="index">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key" select="$index-title"/>
-      </xsl:call-template>
-    </h1>
-  </xsl:template>
-
-    <!--Divisions:
-          Translate alphabetical divisons titles to by-type titles.
-          Added gentext support to divisions titles.
-          Using h2 for divisions titles.
-          Changed output from dl format to ul format. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/autoidx.xsl -->
-  <xsl:template match="indexterm" mode="index-div-basic">
-    <xsl:param name="scope" select="."/>
-    <xsl:variable name="key" select="translate(substring(&primary;, 1, 1),&lowercase;,&uppercase;)"/>
-    <xsl:variable name="divtitle" select="translate($key, &lowercase;, &uppercase;)"/>
-      <!-- Make sure that we don't generate a div if there are no terms in scope -->
-    <xsl:if test="key('letter', $key)[&scope;] [count(.|key('primary', &primary;)[&scope;][1]) = 1]">
-      <xsl:if test="contains(concat(&lowercase;, &uppercase;), $key)">
-        <h2>
-          <xsl:choose>
-            <xsl:when test="$divtitle = 'A'">
-              <a id="package-index" name="package-index"/>
-              <xsl:call-template name="gentext">
-                <xsl:with-param name="key">Packages</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$divtitle = 'B'">
-              <a id="program-index" name="program-index"/>
-              <xsl:call-template name="gentext">
-                <xsl:with-param name="key">Programs</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$divtitle = 'C'">
-              <a id="library-index" name="library-index"/>
-              <xsl:call-template name="gentext">
-                <xsl:with-param name="key">Libraries</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$divtitle = 'D'">
-              <xsl:choose>
-                <xsl:when test="$book-type = 'blfs'">
-                  <a id="kernel-config-index" name="kernel-config-index"/>
-                  <xsl:call-template name="gentext">
-                    <xsl:with-param name="key">Kernel Configuration</xsl:with-param>
-                  </xsl:call-template>
-                </xsl:when>
-                <xsl:otherwise>
-                  <a id="scripts-index" name="scripts-index"/>
-                  <xsl:call-template name="gentext">
-                    <xsl:with-param name="key">Scripts</xsl:with-param>
-                  </xsl:call-template>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:when>
-            <xsl:when test="$divtitle = 'E'">
-              <xsl:choose>
-                <xsl:when test="$book-type = 'blfs'">
-                  <a id="config-file-index" name="config-file-index"/>
-                  <xsl:call-template name="gentext">
-                    <xsl:with-param name="key">Configuration Files</xsl:with-param>
-                  </xsl:call-template>
-                </xsl:when>
-                <xsl:otherwise>
-                  <a id="other-index" name="other-index"/>
-                  <xsl:call-template name="gentext">
-                    <xsl:with-param name="key">Others</xsl:with-param>
-                  </xsl:call-template>
-                </xsl:otherwise>
-              </xsl:choose>
-            </xsl:when>
-            <xsl:when test="$divtitle = 'F'">
-                <a id="bootscript-index" name="bootscript-index"/>
-                <xsl:call-template name="gentext">
-                  <xsl:with-param name="key">Bootscripts</xsl:with-param>
-                </xsl:call-template>
-            </xsl:when>
-            <xsl:when test="$divtitle = 'G'">
-              <a id="other-index" name="other-index"/>
-              <xsl:call-template name="gentext">
-                <xsl:with-param name="key">Others</xsl:with-param>
-              </xsl:call-template>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="$divtitle"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </h2>
-      </xsl:if>
-      <ul>
-        <xsl:apply-templates select="key('letter', $key)[&scope;] [count(.|key('primary', &primary;)[&scope;][1])=1]"
-                              mode="index-primary">
-          <xsl:with-param name="scope" select="$scope"/>
-          <xsl:sort select="translate(&primary;, &lowercase;, &uppercase;)"/>
-        </xsl:apply-templates>
-      </ul>
-    </xsl:if>
-  </xsl:template>
-
-    <!-- Dropping $term.separator and $number.separator from here.
-         We add our customized ones in the output flow.
-         As all our indexterm have @zone attributes, removed a lot of
-         unused code. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/autoidx.xsl -->
-  <xsl:template match="indexterm" mode="reference">
-    <xsl:param name="scope" select="."/>
-    <xsl:call-template name="reference">
-      <xsl:with-param name="zones" select="normalize-space(@zone)"/>
-      <xsl:with-param name="scope" select="$scope"/>
-    </xsl:call-template>
-  </xsl:template>
-
-    <!-- Primary items:
-           Changed the output format from dl to ul.
-           Placed the term and separator into strong tags.
-           Placed the target links into a div.
-           Removed code for unused see and sealso childs. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/autoidx.xsl -->
-  <xsl:template match="indexterm" mode="index-primary">
-    <xsl:param name="scope" select="."/>
-    <xsl:variable name="key" select="&primary;"/>
-    <xsl:variable name="refs" select="key('primary', $key)[&scope;]"/>
-    <li>
-      <strong class="item">
-        <xsl:value-of select="primary"/>
-        <xsl:text>: </xsl:text>
-      </strong>
-      <span class='indexref'>
-        <xsl:for-each select="$refs[generate-id() = generate-id(key('primary-section',concat($key, &sep;, &section.id;))[&scope;][1])]">
-          <xsl:apply-templates select="." mode="reference">
-            <xsl:with-param name="scope" select="$scope"/>
-          </xsl:apply-templates>
-        </xsl:for-each>
-      </span>
-      <xsl:if test="$refs/secondary">
-        <ul>
-          <xsl:apply-templates select="$refs[secondary and count(.|key('secondary', concat($key, &sep;, &secondary;))[&scope;][1]) = 1]"
-                               mode="index-secondary">
-            <xsl:with-param name="scope" select="$scope"/>
-            <xsl:sort select="translate(&secondary;, &lowercase;, &uppercase;)"/>
-          </xsl:apply-templates>
-         </ul>
-      </xsl:if>
-    </li>
-  </xsl:template>
-
-    <!-- Secondary items:
-           Changed the output format from dl to ul.
-           Placed the term and separator into strong tags.
-           Placed the target links into a div.
-           Removed code for unused tertiary, see, and sealso childs. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/autoidx.xsl -->
-  <xsl:template match="indexterm" mode="index-secondary">
-    <xsl:param name="scope" select="."/>
-    <xsl:variable name="key" select="concat(&primary;, &sep;, &secondary;)"/>
-    <xsl:variable name="refs" select="key('secondary', $key)[&scope;]"/>
-    <li>
-      <strong class="secitem">
-        <xsl:value-of select="secondary"/>
-        <xsl:text>: </xsl:text>
-      </strong>
-      <span class='indexref'>
-        <xsl:for-each select="$refs[generate-id() = generate-id(key('secondary-section', concat($key, &sep;, &section.id;))[&scope;][1])]">
-          <xsl:apply-templates select="." mode="reference">
-            <xsl:with-param name="scope" select="$scope"/>
-          </xsl:apply-templates>
-        </xsl:for-each>
-      </span>
-    </li>
-  </xsl:template>
-
-    <!-- The target links:
-           Changed links separator.
-           On the second @zone link, we use a fixed string for the text
-           with gentext support.
-           Assume that there is no more than 2 @zone in a indexterm.
-           Use href.target.uri named template to resolve the links. It is faster
-           than the default href.target named template. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/autoidx.xsl -->
-  <xsl:template name="reference">
-    <xsl:param name="scope" select="."/>
-    <xsl:param name="zones"/>
-    <xsl:choose>
-      <xsl:when test="contains($zones, ' ')">
-        <xsl:variable name="zone" select="substring-before($zones, ' ')"/>
-        <xsl:variable name="zone2" select="substring-after($zones, ' ')"/>
-        <xsl:variable name="target" select="key('sections', $zone)[&scope;]"/>
-        <xsl:variable name="target2" select="key('sections', $zone2)[&scope;]"/>
-        <a>
-          <xsl:attribute name="href">
-            <xsl:call-template name="href.target.uri">
-              <xsl:with-param name="object" select="$target[1]"/>
-            </xsl:call-template>
-          </xsl:attribute>
-          <xsl:apply-templates select="$target[1]" mode="index-title-content"/>
-        </a>
-        <xsl:text> -- </xsl:text>
-        <a>
-          <xsl:attribute name="href">
-            <xsl:call-template name="href.target.uri">
-              <xsl:with-param name="object" select="$target2[1]"/>
-            </xsl:call-template>
-          </xsl:attribute>
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key">description</xsl:with-param>
-          </xsl:call-template>
-        </a>
-        <br/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:variable name="zone" select="$zones"/>
-        <xsl:variable name="target" select="key('sections', $zone)[&scope;]"/>
-        <a>
-          <xsl:attribute name="href">
-            <xsl:call-template name="href.target.uri">
-              <xsl:with-param name="object" select="$target[1]"/>
-            </xsl:call-template>
-          </xsl:attribute>
-          <xsl:apply-templates select="$target[1]" mode="index-title-content"/>
-        </a>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/xhtml/lfs-legalnotice.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/xhtml/lfs-legalnotice.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,82 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-  <!-- This stylesheet controls how legalnotice page is created -->
-
-    <!-- Generating the legalnotice page:
-           We are forcing separate legalnotice page generation.
-           Removed the default link to legalnotice page. We want it in Copyright.
-           Added footer navigational link to Home.  -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.xsl -->
-  <xsl:template match="legalnotice" mode="titlepage.mode">
-    <xsl:variable name="id">
-      <xsl:call-template name="object.id"/>
-    </xsl:variable>
-    <xsl:variable name="filename" select="concat($base.dir, 'legalnotice.html')"/>
-    <xsl:call-template name="write.chunk">
-      <xsl:with-param name="filename" select="$filename"/>
-      <xsl:with-param name="quiet" select="$chunk.quietly"/>
-      <xsl:with-param name="content">
-        <html>
-          <xsl:call-template name="html.head"/>
-          <body>
-            <xsl:call-template name="body.attributes"/>
-            <div class="{local-name(.)}">
-              <xsl:apply-templates mode="titlepage.mode"/>
-            </div>
-            <div class="navfooter">
-              <ul class="footerlinks">
-                <li class="home">
-                  <a accesskey="h" href="index.html">
-                    <xsl:attribute name="title">
-                      <xsl:value-of select="/book/bookinfo/title"/>
-                      <xsl:text> - </xsl:text>
-                      <xsl:value-of select="/book/bookinfo/subtitle"/>
-                    </xsl:attribute>
-                    <xsl:call-template name="navig.content">
-                      <xsl:with-param name="direction" select="'home'"/>
-                    </xsl:call-template>
-                  </a>
-                </li>
-              </ul>
-            </div>
-          </body>
-        </html>
-      </xsl:with-param>
-    </xsl:call-template>
-  </xsl:template>
-
-    <!-- Making the legalnotice link:
-         We make the "Copyright" word a link to legalnotice page. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.xsl -->
-  <xsl:template match="copyright" mode="titlepage.mode">
-    <p class="{name(.)}">
-      <a href="legalnotice.html">
-        <xsl:call-template name="gentext">
-          <xsl:with-param name="key" select="'Copyright'"/>
-        </xsl:call-template>
-      </a>
-      <xsl:call-template name="gentext.space"/>
-      <xsl:call-template name="dingbat">
-        <xsl:with-param name="dingbat">copyright</xsl:with-param>
-      </xsl:call-template>
-      <xsl:call-template name="gentext.space"/>
-      <xsl:call-template name="copyright.years">
-        <xsl:with-param name="years" select="year"/>
-        <xsl:with-param name="print.ranges" select="$make.year.ranges"/>
-        <xsl:with-param name="single.year.ranges" select="$make.single.year.ranges"/>
-      </xsl:call-template>
-      <xsl:call-template name="gentext.space"/>
-      <xsl:apply-templates select="holder" mode="titlepage.mode"/>
-    </p>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/xhtml/lfs-mixed.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/xhtml/lfs-mixed.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,312 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-  <!-- This stylesheet contains misc templates for output formating.
-       This file is for that templates that don't fit in other files
-       and that not afect the chunk algorithm. -->
-
-  <!-- Individual elements templates -->
-
-    <!-- para:
-           Added a choose to skip empty "Home page" in packages.xml.
-           Added an if for HLFS features. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/block.xsl -->
-  <xsl:template match="para">
-    <xsl:choose>
-      <xsl:when test="child::ulink[@url=' ']"/>
-      <xsl:otherwise>
-        <xsl:call-template name="paragraph">
-          <xsl:with-param name="class">
-            <xsl:if test="@role">
-              <xsl:if test="$book-type = 'hlfs'">
-                <xsl:if test="contains($hlfs-features,concat(',',@role,','))">
-                  <xsl:text>feature-</xsl:text>
-                </xsl:if>
-              </xsl:if>
-              <xsl:value-of select="@role"/>
-            </xsl:if>
-          </xsl:with-param>
-          <xsl:with-param name="content">
-            <xsl:if test="position() = 1 and parent::listitem">
-              <xsl:call-template name="anchor">
-                <xsl:with-param name="node" select="parent::listitem"/>
-              </xsl:call-template>
-            </xsl:if>
-            <xsl:call-template name="anchor"/>
-            <xsl:apply-templates/>
-          </xsl:with-param>
-        </xsl:call-template>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- screen:
-           Changed class attribute asignament to fit our look needs.
-           Removed unused line numbering support. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/verbatim.xsl
-         It match also programlisting and synopsis. The code for that tags
-         is unchanged. -->
-  <xsl:template match="screen">
-    <pre>
-      <xsl:attribute name="class">
-        <xsl:choose>
-          <xsl:when test="@role and not(@role = 'nodump')">
-            <xsl:if test="$book-type = 'hlfs'">
-              <xsl:if test="contains($hlfs-features,concat(',',@role,','))">
-                <xsl:text>feature-</xsl:text>
-              </xsl:if>
-            </xsl:if>
-            <xsl:value-of select="@role"/>
-          </xsl:when>
-          <xsl:when test="child::* = userinput">userinput</xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="name(.)"/>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:attribute>
-      <xsl:apply-templates/>
-    </pre>
-  </xsl:template>
-
-    <!-- userinput:
-           Using a customized output when inside screen.
-           In other cases, use the original template. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/inline.xsl -->
-  <xsl:template match="userinput">
-    <xsl:choose>
-      <xsl:when test="ancestor::screen">
-        <kbd class="command">
-          <xsl:apply-templates/>
-        </kbd>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-imports/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- itemizadlist:
-           @compact is not allowed in XHTML 1.0 Strict DTD. Changing it
-           to @class. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/lists.xsl -->
-  <xsl:template match="itemizedlist">
-    <div>
-      <xsl:apply-templates select="." mode="class.attribute"/>
-      <xsl:call-template name="anchor"/>
-      <xsl:if test="title">
-        <xsl:call-template name="formal.object.heading"/>
-      </xsl:if>
-      <xsl:apply-templates select="*[not(self::listitem or self::title
-                              or self::titleabbrev)]
-                              |comment()[not(preceding-sibling::listitem)]
-                              |processing-instruction()[not(preceding-sibling::listitem)]"/>
-      <ul>
-        <xsl:if test="@spacing='compact'">
-          <xsl:attribute name="class">
-            <xsl:value-of select="@spacing"/>
-          </xsl:attribute>
-        </xsl:if>
-        <xsl:apply-templates select="listitem |comment()[preceding-sibling::listitem]
-                                |processing-instruction()[preceding-sibling::listitem]"/>
-      </ul>
-    </div>
-  </xsl:template>
-
-    <!-- orderedlist:
-           @start, @type, and @compact sre not allowed in XHTML 1.0 Strict DTD.
-           @start and @type can be replaced by CSS code.
-           Changing @compact to @class. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/lists.xsl -->
-  <xsl:template match="orderedlist">
-    <div>
-      <xsl:apply-templates select="." mode="class.attribute"/>
-      <xsl:call-template name="anchor"/>
-      <xsl:if test="title">
-        <xsl:call-template name="formal.object.heading"/>
-      </xsl:if>
-      <xsl:apply-templates select="*[not(self::listitem or self::title
-                              or self::titleabbrev)]
-                              |comment()[not(preceding-sibling::listitem)]
-                              |processing-instruction()[not(preceding-sibling::listitem)]"/>
-       <ol>
-        <xsl:if test="@spacing='compact'">
-          <xsl:attribute name="class">
-            <xsl:value-of select="@spacing"/>
-          </xsl:attribute>
-        </xsl:if>
-        <xsl:apply-templates select="listitem |comment()[preceding-sibling::listitem]
-                                |processing-instruction()[preceding-sibling::listitem]"/>
-      </ol>
-    </div>
-  </xsl:template>
-
-    <!-- seg in segementedlist:
-           Added a span around seg text to can match it with CSS code. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/lists.xsl -->
-  <xsl:template match="seg">
-    <xsl:variable name="segnum" select="count(preceding-sibling::seg)+1"/>
-    <xsl:variable name="seglist" select="ancestor::segmentedlist"/>
-    <xsl:variable name="segtitles" select="$seglist/segtitle"/>
-      <!-- Note: segtitle is only going to be the right thing in a well formed
-      SegmentedList.  If there are too many Segs or too few SegTitles,
-      you'll get something odd...maybe an error -->
-    <div class="seg">
-      <strong class="segtitle">
-        <xsl:apply-templates select="$segtitles[$segnum=position()]"
-                              mode="segtitle-in-seg"/>
-        <xsl:text>: </xsl:text>
-      </strong>
-      <span class="segbody">
-        <xsl:if test="@id">
-          <a id="{@id}" name="{@id}"/>
-        </xsl:if>
-        <xsl:apply-templates/>
-      </span>
-    </div>
-  </xsl:template>
-
-    <!-- variablelist:
-           If it have a role attribute, wrap the default output into a div with
-           a class attribute matching that role attribute.
-           Apply the original template in all cases. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/lists.xsl -->
-  <xsl:template match="variablelist">
-    <xsl:choose>
-      <xsl:when test="@role">
-        <div class="{@role}">
-          <xsl:apply-imports/>
-        </div>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-imports/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- para/simplelist:
-           Self-made template. Add a line break and process the childs.
-           If @type is specified, the original templates should be used,
-           but not tested. -->
-  <xsl:template match="para/simplelist">
-    <br/>
-    <xsl:apply-templates mode="condensed"/>
-  </xsl:template>
-
-    <!-- member:
-           Self-made template to process it and add a line break. -->
-  <xsl:template match="member" mode="condensed">
-    <xsl:call-template name="anchor"/>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content">
-        <xsl:apply-templates/>
-      </xsl:with-param>
-    </xsl:call-template>
-    <br/>
-  </xsl:template>
-
-
-  <!-- Named formating templates -->
-
-    <!-- Body attributes:
-           Add to the body XHTML output tag a class attribute with the book type
-           and a id atribute with the book type and version. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/docbook.xsl -->
-  <xsl:template name="body.attributes">
-    <xsl:attribute name="class">
-      <xsl:value-of select="$book-type"/>
-    </xsl:attribute>
-    <xsl:attribute name="id">
-      <xsl:value-of select="$book-type"/>
-      <xsl:text>-</xsl:text>
-      <xsl:value-of select="substring-after(/book/bookinfo/subtitle, ' ')"/>
-    </xsl:attribute>
-  </xsl:template>
-
-  <!-- Revision History -->
-
-    <!-- revhistory mode titlepage.mode:
-           Removed hardcoded style attributes.
-           Removed support for separate revhistory file. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.xsl -->
-  <xsl:template match="revhistory" mode="titlepage.mode">
-    <xsl:variable name="numcols">
-      <xsl:choose>
-        <xsl:when test="//authorinitials">4</xsl:when>
-        <xsl:otherwise>3</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="title">
-      <xsl:call-template name="gentext">
-        <xsl:with-param name="key">RevHistory</xsl:with-param>
-      </xsl:call-template>
-    </xsl:variable>
-    <xsl:variable name="contents">
-      <table summary="{$title}" class="{name(.)}">
-        <tr>
-          <th colspan="{$numcols}">
-            <b>
-              <xsl:value-of select="$title"/>
-            </b>
-          </th>
-        </tr>
-        <xsl:apply-templates mode="titlepage.mode">
-          <xsl:with-param name="numcols" select="$numcols"/>
-        </xsl:apply-templates>
-      </table>
-    </xsl:variable>
-    <xsl:copy-of select="$contents"/>
-  </xsl:template>
-
-    <!-- revhistory/revision mode titlepage.mode:
-           Removed hardcoded style attributes. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.xsl -->
-  <xsl:template match="revhistory/revision" mode="titlepage.mode">
-    <xsl:param name="numcols" select="'3'"/>
-    <xsl:variable name="revnumber" select="revnumber"/>
-    <xsl:variable name="revdate" select="date"/>
-    <xsl:variable name="revauthor" select="authorinitials|author"/>
-    <xsl:variable name="revremark" select="revremark|revdescription"/>
-    <tr>
-      <td>
-        <xsl:if test="$revnumber">
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key" select="'Revision'"/>
-          </xsl:call-template>
-          <xsl:call-template name="gentext.space"/>
-          <xsl:apply-templates select="$revnumber[1]" mode="titlepage.mode"/>
-        </xsl:if>
-      </td>
-      <td>
-        <xsl:apply-templates select="$revdate[1]" mode="titlepage.mode"/>
-      </td>
-      <xsl:choose>
-        <xsl:when test="$revauthor">
-          <td>
-            <xsl:for-each select="$revauthor">
-              <xsl:apply-templates select="." mode="titlepage.mode"/>
-              <xsl:if test="position() != last()">
-                <xsl:text>, </xsl:text>
-              </xsl:if>
-            </xsl:for-each>
-          </td>
-        </xsl:when>
-        <xsl:when test="$numcols &gt; 3">
-          <td>&#160;</td>
-        </xsl:when>
-        <xsl:otherwise/>
-      </xsl:choose>
-      <td>
-        <xsl:apply-templates select="$revremark[1]" mode="titlepage.mode"/>
-      </td>
-    </tr>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/xhtml/lfs-navigational.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/xhtml/lfs-navigational.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,364 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-  <!-- This stylesheet controls how page header and navigational links
-       are generated. -->
-
-    <!-- html.head:
-           Drop all navigational links from inside head xhtml output. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/chunk-common.xsl -->
-  <xsl:template name="html.head">
-    <head>
-      <xsl:call-template name="system.head.content"/>
-      <xsl:call-template name="head.content"/>
-      <xsl:call-template name="user.head.content"/>
-    </head>
-  </xsl:template>
-
-    <!-- header.navigation:
-           Self-made template that full replaces the original one -->
-    <!-- The original template is in {docbook-xsl}/xhtml/chunk-common.xsl -->
-  <xsl:template name="header.navigation">
-    <xsl:param name="prev" select="/foo"/>
-    <xsl:param name="next" select="/foo"/>
-    <xsl:variable name="up" select="parent::*"/>
-    <xsl:variable name="home" select="/*[1]"/>
-      <!-- Don't generate the header in index.html -->
-    <xsl:if test="$home != .">
-      <div class="navheader">
-          <!-- Book title and version -->
-        <h4>
-          <xsl:apply-templates select="$home" mode="object.title.markup"/>
-          <xsl:text> - </xsl:text>
-          <xsl:apply-templates select="$home" mode="object.subtitle.markup"/>
-        </h4>
-          <!-- Except for preface, part, and index, add the title of the parent -->
-        <xsl:if test="$up != $home">
-          <h3>
-            <xsl:apply-templates select="$up" mode="object.title.markup"/>
-          </h3>
-        </xsl:if>
-          <!-- Create header navigational links -->
-        <xsl:call-template name="navigational.links">
-          <xsl:with-param name="prev" select="$prev"/>
-          <xsl:with-param name="next" select="$next"/>
-          <xsl:with-param name="up" select="$up"/>
-          <xsl:with-param name="home" select="$home"/>
-        </xsl:call-template>
-      </div>
-    </xsl:if>
-  </xsl:template>
-
-    <!-- footer.navigation:
-           Self-made template that full replaces the original one -->
-    <!-- The original template is in {docbook-xsl}/xhtml/chunk-common.xsl -->
-  <xsl:template name="footer.navigation">
-    <xsl:param name="prev" select="/foo"/>
-    <xsl:param name="next" select="/foo"/>
-    <xsl:variable name="up" select="parent::*"/>
-    <xsl:variable name="home" select="/*[1]"/>
-      <!-- Create footer navigational links -->
-    <div class="navfooter">
-      <xsl:call-template name="navigational.links">
-        <xsl:with-param name="prev" select="$prev"/>
-        <xsl:with-param name="next" select="$next"/>
-        <xsl:with-param name="up" select="$up"/>
-        <xsl:with-param name="home" select="$home"/>
-      </xsl:call-template>
-    </div>
-      <!-- In HLFS, add the features.js call -->
-    <xsl:if test="$book-type = 'hlfs'">
-      <script type="text/javascript">
-        <xsl:attribute name="src">
-          <xsl:choose>
-            <xsl:when test="local-name(.)='book' or local-name(.)='part' or
-                            local-name(.)='index'">../features.js</xsl:when>
-            <xsl:otherwise>../../features.js</xsl:otherwise>
-          </xsl:choose>
-        </xsl:attribute>
-      </script>
-    </xsl:if>
-  </xsl:template>
-
-    <!-- navigational.links:
-           Self-made template to generate navigational links.
-           Most of the code come from the original header.navigation and
-           footer.navigation templates, with this changes:
-             Changed the output format from table to ul.
-             Placed the same links on both header and footer.
-             Added a title attribute to the link containing the target title
-               (it content is displayed when placing the mouse over the link)
-             For "Prev" and "Next" links, added the target title under it.
-             When "Next" target is the Index, added gentext support for the
-               Index title.
-             Skip links to dummy sect1. -->
-  <xsl:template name="navigational.links">
-    <xsl:param name="prev"/>
-    <xsl:param name="next"/>
-    <xsl:param name="up"/>
-    <xsl:param name="home"/>
-    <ul>
-        <!-- No prev link when prev is home -->
-      <xsl:if test="count($prev)&gt;0 and $prev != $home">
-        <li class="prev">
-          <xsl:choose>
-
-              <!-- If prev is a dummy sect1 that is the first one in a chapter,
-                   links to the parent chapter.-->
-            <xsl:when test="$prev[@role='dummy'] and
-                            count(preceding-sibling::sect1)=1">
-              <a accesskey="p">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select=".."/>
-                  </xsl:call-template>
-                </xsl:attribute>
-                <xsl:attribute name="title">
-                  <xsl:value-of select="../title"/>
-                </xsl:attribute>
-                <xsl:call-template name="navig.content">
-                  <xsl:with-param name="direction" select="'prev'"/>
-                </xsl:call-template>
-              </a>
-              <p>
-                <xsl:value-of select="../title"/>
-              </p>
-            </xsl:when>
-
-              <!-- If prev is a dummy sect1 that is not the first one in a chapter,
-                   links to the previous sect1.-->
-            <xsl:when test="$prev[@role='dummy'] and
-                            count(preceding-sibling::sect1)&gt;1">
-              <a accesskey="p">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select="preceding-sibling::sect1[position()=2]"/>
-                  </xsl:call-template>
-                </xsl:attribute>
-                <xsl:attribute name="title">
-                  <xsl:value-of select="preceding-sibling::sect1[position()=2]/title"/>
-                </xsl:attribute>
-                <xsl:call-template name="navig.content">
-                  <xsl:with-param name="direction" select="'prev'"/>
-                </xsl:call-template>
-              </a>
-              <p>
-                <xsl:value-of select="preceding-sibling::sect1[position()=2]/title"/>
-              </p>
-            </xsl:when>
-
-              <!-- Code for the "To Boot or To Chroot" CLFS links jumps. -->
-            <xsl:when test="$prev[@id='ch-chroot-devices'] or $prev[@id='ch-boot-whatnext']">
-              <a accesskey="p">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select="//sect1[@id='ch-temp-system-choose']"/>
-                  </xsl:call-template>
-                </xsl:attribute>
-                <xsl:attribute name="title">
-                  <xsl:value-of select="//sect1[@id='ch-temp-system-choose']/title"/>
-                </xsl:attribute>
-                <xsl:call-template name="navig.content">
-                  <xsl:with-param name="direction" select="'prev'"/>
-                </xsl:call-template>
-              </a>
-              <p>
-                <xsl:value-of select="//sect1[@id='ch-temp-system-choose']/title"/>
-              </p>
-            </xsl:when>
-
-              <!-- Normal prev links -->
-            <xsl:otherwise>
-              <a accesskey="p">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select="$prev"/>
-                  </xsl:call-template>
-                </xsl:attribute>
-                <xsl:attribute name="title">
-                  <xsl:value-of select="$prev/title"/>
-                </xsl:attribute>
-                <xsl:call-template name="navig.content">
-                  <xsl:with-param name="direction" select="'prev'"/>
-                </xsl:call-template>
-              </a>
-              <p>
-                <xsl:value-of select="$prev/title"/>
-              </p>
-            </xsl:otherwise>
-          </xsl:choose>
-        </li>
-      </xsl:if>
-
-
-        <!-- Next link except in the last page and in the CLFS "choose" page -->
-      <xsl:if test="count($next)&gt;0 and (not(@id) or @id!='ch-temp-system-choose')">
-        <li class="next">
-          <xsl:choose>
-
-              <!-- Current page is sect1 a next is a dummy sect1, link to the next one -->
-            <xsl:when test="$next[@role='dummy'] and local-name(.) = 'sect1'">
-              <a accesskey="n">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select="following-sibling::sect1[position()=2]"/>
-                  </xsl:call-template>
-                </xsl:attribute>
-                <xsl:attribute name="title">
-                  <xsl:value-of select="following-sibling::sect1[position()=2]/title"/>
-                </xsl:attribute>
-                <xsl:call-template name="navig.content">
-                  <xsl:with-param name="direction" select="'next'"/>
-                </xsl:call-template>
-              </a>
-              <p>
-                <xsl:value-of select="following-sibling::sect1[position()=2]/title"/>
-              </p>
-            </xsl:when>
-
-              <!-- Current page is chapter and next is a dummy sect1, link to the next one -->
-            <xsl:when test="$next[@role='dummy'] and local-name(.) = 'chapter'">
-              <a accesskey="n">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select="descendant::sect1[position()=2]"/>
-                  </xsl:call-template>
-                </xsl:attribute>
-                <xsl:attribute name="title">
-                  <xsl:value-of select="descendant::sect1[position()=2]/title"/>
-                </xsl:attribute>
-                <xsl:call-template name="navig.content">
-                  <xsl:with-param name="direction" select="'next'"/>
-                </xsl:call-template>
-              </a>
-              <p>
-                <xsl:value-of select="descendant::sect1[position()=2]/title"/>
-              </p>
-            </xsl:when>
-
-              <!-- Code for the "To Boot or To Chroot" CLFS links jumps. -->
-            <xsl:when test="$next[@id='chapter-chroot'] or $next[@id='chapter-boot']">
-              <a accesskey="n">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select="//part[@id='part5']"/>
-                  </xsl:call-template>
-                </xsl:attribute>
-                <xsl:attribute name="title">
-                  <xsl:value-of select="//part[@id='part5']/title"/>
-                </xsl:attribute>
-                <xsl:call-template name="navig.content">
-                  <xsl:with-param name="direction" select="'next'"/>
-                </xsl:call-template>
-              </a>
-              <p>
-                <xsl:value-of select="//part[@id='part5']/title"/>
-              </p>
-            </xsl:when>
-
-              <!-- Normal next links. Take care of Index gentext support. -->
-            <xsl:otherwise>
-              <a accesskey="n">
-                <xsl:attribute name="href">
-                  <xsl:call-template name="href.target">
-                    <xsl:with-param name="object" select="$next"/>
-                  </xsl:call-template>
-                </xsl:attribute>
-                <xsl:attribute name="title">
-                  <xsl:choose>
-                    <xsl:when test="local-name($next)='index'">
-                      <xsl:call-template name="gentext">
-                        <xsl:with-param name="key">Index</xsl:with-param>
-                      </xsl:call-template>
-                    </xsl:when>
-                    <xsl:otherwise>
-                      <xsl:value-of select="$next/title"/>
-                    </xsl:otherwise>
-                  </xsl:choose>
-                </xsl:attribute>
-                <xsl:call-template name="navig.content">
-                  <xsl:with-param name="direction" select="'next'"/>
-                </xsl:call-template>
-              </a>
-              <p>
-                <xsl:choose>
-                  <xsl:when test="local-name($next)='index'">
-                    <xsl:call-template name="gentext">
-                      <xsl:with-param name="key">Index</xsl:with-param>
-                    </xsl:call-template>
-                  </xsl:when>
-                  <xsl:otherwise>
-                    <xsl:value-of select="$next/title"/>
-                  </xsl:otherwise>
-                </xsl:choose>
-              </p>
-            </xsl:otherwise>
-          </xsl:choose>
-        </li>
-      </xsl:if>
-
-
-      <li class="up">
-        <xsl:choose>
-            <!-- Up link except if up is home -->
-          <xsl:when test="count($up)&gt;0 and $up != $home">
-            <a accesskey="u">
-              <xsl:attribute name="href">
-                <xsl:call-template name="href.target">
-                  <xsl:with-param name="object" select="$up"/>
-                </xsl:call-template>
-              </xsl:attribute>
-              <xsl:attribute name="title">
-                <xsl:apply-templates select="$up" mode="object.title.markup"/>
-              </xsl:attribute>
-              <xsl:call-template name="navig.content">
-                <xsl:with-param name="direction" select="'up'"/>
-              </xsl:call-template>
-            </a>
-          </xsl:when>
-            <!-- Hack to let the CSS code do its work when there is no up link -->
-          <xsl:otherwise>
-            <xsl:text>.</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </li>
-
-
-      <li class="home">
-        <xsl:choose>
-            <!-- No home link in home page -->
-          <xsl:when test="$home != .">
-            <a accesskey="h">
-              <xsl:attribute name="href">
-                <xsl:call-template name="href.target">
-                  <xsl:with-param name="object" select="$home"/>
-                </xsl:call-template>
-              </xsl:attribute>
-              <xsl:attribute name="title">
-                <xsl:value-of select="$home/bookinfo/title"/>
-                <xsl:text> - </xsl:text>
-                <xsl:value-of select="$home/bookinfo/subtitle"/>
-              </xsl:attribute>
-              <xsl:call-template name="navig.content">
-                <xsl:with-param name="direction" select="'home'"/>
-              </xsl:call-template>
-            </a>
-          </xsl:when>
-            <!-- Hack to let the CSS code do its work when there is no home link -->
-          <xsl:otherwise>
-            <xsl:text>.</xsl:text>
-          </xsl:otherwise>
-        </xsl:choose>
-      </li>
-    </ul>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/xhtml/lfs-sections.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/xhtml/lfs-sections.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,165 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-  <!-- This stylesheet controls how preface, chapter, and sections are handled -->
-
-    <!-- Chunk the first top-level section? 1 = yes, 0 = no
-         If preface and chapters TOC are generated, this must be 1. -->
-  <xsl:param name="chunk.first.sections" select="1"/>
-
-    <!-- preface:
-           Output non sect1 child elements before the TOC -->
-    <!-- The original template is in {docbook-xsl}/xhtml/components.xsl -->
-  <xsl:template match="preface">
-    <xsl:call-template name="id.warning"/>
-    <div>
-      <xsl:apply-templates select="." mode="class.attribute"/>
-      <xsl:call-template name="dir">
-        <xsl:with-param name="inherit" select="1"/>
-      </xsl:call-template>
-      <xsl:call-template name="language.attribute"/>
-      <xsl:if test="$generate.id.attributes != 0">
-        <xsl:attribute name="id">
-          <xsl:call-template name="object.id"/>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:call-template name="component.separator"/>
-      <xsl:call-template name="preface.titlepage"/>
-      <xsl:apply-templates/>
-      <xsl:variable name="toc.params">
-        <xsl:call-template name="find.path.params">
-          <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:if test="contains($toc.params, 'toc')">
-        <xsl:call-template name="component.toc">
-          <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
-        </xsl:call-template>
-        <xsl:call-template name="component.toc.separator"/>
-      </xsl:if>
-      <xsl:call-template name="process.footnotes"/>
-    </div>
-  </xsl:template>
-
-    <!-- chapter:
-           Output non sect1 child elements before the TOC -->
-    <!-- The original template is in {docbook-xsl}/xhtml/components.xsl -->
-  <xsl:template match="chapter">
-    <xsl:call-template name="id.warning"/>
-    <div>
-      <xsl:apply-templates select="." mode="class.attribute"/>
-      <xsl:call-template name="dir">
-        <xsl:with-param name="inherit" select="1"/>
-      </xsl:call-template>
-      <xsl:call-template name="language.attribute"/>
-      <xsl:if test="$generate.id.attributes != 0">
-        <xsl:attribute name="id">
-          <xsl:call-template name="object.id"/>
-        </xsl:attribute>
-      </xsl:if>
-      <xsl:call-template name="component.separator"/>
-      <xsl:call-template name="chapter.titlepage"/>
-      <xsl:apply-templates/>
-      <xsl:variable name="toc.params">
-        <xsl:call-template name="find.path.params">
-          <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
-        </xsl:call-template>
-      </xsl:variable>
-      <xsl:if test="contains($toc.params, 'toc')">
-        <xsl:call-template name="component.toc">
-          <xsl:with-param name="toc.title.p" select="contains($toc.params, 'title')"/>
-        </xsl:call-template>
-        <xsl:call-template name="component.toc.separator"/>
-      </xsl:if>
-      <xsl:call-template name="process.footnotes"/>
-    </div>
-  </xsl:template>
-
-    <!-- sect1:
-           When there is a role attibute, use it as the class value.
-           Process the SVN keywords found in sect1info as a footnote.
-           Removed unused code. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/sections.xsl -->
-  <xsl:template match="sect1">
-    <div>
-      <xsl:choose>
-        <xsl:when test="@role">
-          <xsl:attribute name="class">
-            <xsl:value-of select="@role"/>
-          </xsl:attribute>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="." mode="class.attribute"/>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:call-template name="language.attribute"/>
-      <xsl:call-template name="sect1.titlepage"/>
-      <xsl:apply-templates/>
-      <xsl:apply-templates select="sect1info" mode="svn-keys"/>
-    </div>
-  </xsl:template>
-
-    <!-- sect2:
-           When there is a role attibute, use it as the class value.
-           Removed unused code. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/sections.xsl -->
-  <xsl:template match="sect2">
-    <div>
-      <xsl:choose>
-        <xsl:when test="@role">
-          <xsl:attribute name="class">
-            <xsl:value-of select="@role"/>
-          </xsl:attribute>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:attribute name="class">
-            <xsl:value-of select="name(.)"/>
-          </xsl:attribute>
-        </xsl:otherwise>
-      </xsl:choose>
-      <xsl:call-template name="language.attribute"/>
-      <xsl:call-template name="sect2.titlepage"/>
-      <xsl:apply-templates/>
-    </div>
-  </xsl:template>
-
-    <!-- sect1info mode svn-keys:
-           Self-made template to process SVN keywords found in sect1info. -->
-  <xsl:template match="sect1info" mode="svn-keys">
-    <p class="updated">Last updated <!-- by
-      <xsl:apply-templates select="othername" mode="svn-keys"/> -->
-      on
-      <xsl:apply-templates select="date" mode="svn-keys"/>
-    </p>
-  </xsl:template>
-
-    <!-- othername mode svn-keys:
-           Self-made template to process the $LastChangedBy SVN keyword. -->
-  <xsl:template match="othername" mode="svn-keys">
-    <xsl:variable name="author">
-      <xsl:value-of select="."/>
-    </xsl:variable>
-    <xsl:variable name="nameonly">
-      <xsl:value-of select="substring($author,16)"/>
-    </xsl:variable>
-    <xsl:value-of select="substring-before($nameonly,'$')"/>
-  </xsl:template>
-
-    <!-- date mode svn-keys:
-           Self-made template to process the $Date SVN keyword. -->
-  <xsl:template match="date" mode="svn-keys">
-    <xsl:variable name="date">
-      <xsl:value-of select="."/>
-    </xsl:variable>
-    <xsl:value-of select="substring($date,7,26)"/>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/xhtml/lfs-titles.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/xhtml/lfs-titles.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,197 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-  <!-- This stylesheet controls the h* xhtml tags used for several titles -->
-
-    <!-- preface.titlepage:
-           Uses h1 and removed a lot of unneeded code.
-           No label in preface. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="preface.titlepage">
-    <h1 class="{name(.)}">
-      <xsl:if test="@id">
-        <a id="{@id}" name="{@id}"/>
-      </xsl:if>
-      <xsl:value-of select="title"/>
-    </h1>
-  </xsl:template>
-
-    <!-- part.titlepage:
-           Uses h1 and removed a lot of unneeded code.
-           When sections are not labeled, we want the part label in TOC
-           but not in titlepage. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="part.titlepage">
-    <h1 class="{name(.)}">
-      <xsl:if test="@id">
-        <a id="{@id}" name="{@id}"/>
-      </xsl:if>
-      <xsl:if test="$section.autolabel != 0">
-        <xsl:apply-templates select="." mode="label.markup"/>
-        <xsl:text>. </xsl:text>
-      </xsl:if>
-      <xsl:value-of select="title"/>
-    </h1>
-  </xsl:template>
-
-    <!-- partintro.titlepage:
-           Uses h2 and removed a lot of unneeded code. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="partintro.titlepage">
-    <xsl:if test="title">
-      <h2 class="{name(.)}">
-        <xsl:if test="@id">
-          <a id="{@id}" name="{@id}"/>
-        </xsl:if>
-        <xsl:value-of select="title"/>
-      </h2>
-    </xsl:if>
-  </xsl:template>
-
-    <!-- appendix.titlepage:
-           Uses h1 and removed a lot of unneeded code.
-           When sections are not labeled, we want the appendix label in TOC
-           but not in titlepage. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="appendix.titlepage">
-    <h1 class="{name(.)}">
-      <xsl:if test="@id">
-        <a id="{@id}" name="{@id}"/>
-      </xsl:if>
-      <xsl:if test="$section.autolabel != 0">
-        <xsl:apply-templates select="." mode="label.markup"/>
-        <xsl:text>. </xsl:text>
-      </xsl:if>
-      <xsl:value-of select="title"/>
-    </h1>
-  </xsl:template>
-
-    <!-- chapter.titlepage:
-           Uses h1 and removed a lot of unneeded code.
-           When sections are not labeled, we want the chapter label in TOC
-           but not in titlepage. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="chapter.titlepage">
-    <h1 class="{name(.)}">
-      <xsl:if test="@id">
-        <a id="{@id}" name="{@id}"/>
-      </xsl:if>
-      <xsl:if test="$section.autolabel != 0">
-        <xsl:apply-templates select="." mode="label.markup"/>
-        <xsl:text>. </xsl:text>
-      </xsl:if>
-      <xsl:value-of select="title"/>
-    </h1>
-  </xsl:template>
-
-    <!-- sect1.titlepage:
-           Uses h1 and removed a lot of unneeded code. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="sect1.titlepage">
-    <h1 class="{name(.)}">
-      <xsl:if test="@id">
-        <a id="{@id}" name="{@id}"/>
-      </xsl:if>
-      <xsl:if test="$section.autolabel != 0">
-        <xsl:apply-templates select="." mode="label.markup"/>
-        <xsl:text>. </xsl:text>
-      </xsl:if>
-      <xsl:value-of select="title"/>
-    </h1>
-  </xsl:template>
-
-    <!-- sect2.titlepage:
-           Uses h2 and removed a lot of unneeded code.
-           Skip empty titles.
-           No label in preface. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="sect2.titlepage">
-    <xsl:choose>
-      <xsl:when test="string-length(title) = 0"/>
-      <xsl:otherwise>
-        <h2 class="{name(.)}">
-          <xsl:if test="@id">
-            <a id="{@id}" name="{@id}"/>
-          </xsl:if>
-          <xsl:if test="not(ancestor::preface) and $section.autolabel != 0">
-            <xsl:apply-templates select="." mode="label.markup"/>
-            <xsl:text>. </xsl:text>
-          </xsl:if>
-          <xsl:value-of select="title"/>
-        </h2>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- sect3.titlepage:
-           Uses h3 and removed a lot of unneeded code. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="sect3.titlepage">
-    <h3 class="{name(.)}">
-      <xsl:if test="@id">
-        <a id="{@id}" name="{@id}"/>
-      </xsl:if>
-      <xsl:if test="$section.autolabel != 0">
-        <xsl:apply-templates select="." mode="label.markup"/>
-        <xsl:text>. </xsl:text>
-      </xsl:if>
-      <xsl:value-of select="title"/>
-    </h3>
-  </xsl:template>
-
-    <!-- dedication.titlepage:
-           Uses h2 and removed a lot of unneeded code. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="dedication.titlepage">
-    <h2>
-      <xsl:value-of select="title"/>
-    </h2>
-  </xsl:template>
-
-    <!-- bridgehead:
-           We use always renderas attributes and want the output h* level
-           matching the defined sect* level.
-           Create the anchor only if there is an @id. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/sections.xsl -->
-  <xsl:template match="bridgehead">
-    <xsl:variable name="hlevel">
-      <xsl:choose>
-        <xsl:when test="@renderas = 'sect1'">1</xsl:when>
-        <xsl:when test="@renderas = 'sect2'">2</xsl:when>
-        <xsl:when test="@renderas = 'sect3'">3</xsl:when>
-        <xsl:when test="@renderas = 'sect4'">4</xsl:when>
-        <xsl:when test="@renderas = 'sect5'">5</xsl:when>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:element name="h{$hlevel}" namespace="http://www.w3.org/1999/xhtml">
-      <xsl:if test="@id">
-        <a id="{@id}" name="{@id}"/>
-      </xsl:if>
-      <xsl:apply-templates/>
-    </xsl:element>
-  </xsl:template>
-
-    <!-- book.titlepage.verso:
-           Process bookinfo/bibliosource from here. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/titlepage.templates.xsl -->
-  <xsl:template name="book.titlepage.verso">
-    <xsl:apply-templates select="bookinfo/bibliosource"/>
-  </xsl:template>
-
-    <!-- bookinfo/bibliosource:
-           Self-made template to handle bibliosource when inside bookinfo. -->
-  <xsl:template match="bookinfo/bibliosource">
-    <p class="copyright">
-      <xsl:apply-templates/>
-    </p>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/xhtml/lfs-toc.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/xhtml/lfs-toc.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,194 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-  <!-- This stylesheet controls how the TOC are generated -->
-
-    <!-- make.toc:
-           Using h3 for TOC title.
-           Using ul for TOC list style.
-           Removed code for $manual.toc and $qanda.in.toc -->
-    <!-- The original template is in {docbook-xsl}/xhtml/autotoc.xsl -->
-  <xsl:template name="make.toc">
-    <xsl:param name="toc-context" select="."/>
-    <xsl:param name="nodes" select="/NOT-AN-ELEMENT"/>
-    <xsl:if test="$nodes">
-      <div class="toc">
-        <h3>
-          <xsl:call-template name="gentext">
-            <xsl:with-param name="key">TableofContents</xsl:with-param>
-          </xsl:call-template>
-        </h3>
-        <ul>
-          <xsl:apply-templates select="$nodes" mode="toc">
-            <xsl:with-param name="toc-context" select="$toc-context"/>
-          </xsl:apply-templates>
-        </ul>
-      </div>
-    </xsl:if>
-  </xsl:template>
-
-    <!-- subtoc:
-           Using ul for TOC list style.
-           Removed code for $qanda.in.toc
-           Removed code for sect* others than sect1 -->
-    <!-- The original template is in {docbook-xsl}/xhtml/autotoc.xsl -->
-  <xsl:template name="subtoc">
-    <xsl:param name="toc-context" select="."/>
-    <xsl:param name="nodes" select="NOT-AN-ELEMENT"/>
-    <xsl:variable name="subtoc">
-      <ul>
-        <xsl:apply-templates mode="toc" select="$nodes">
-          <xsl:with-param name="toc-context" select="$toc-context"/>
-        </xsl:apply-templates>
-      </ul>
-    </xsl:variable>
-    <xsl:variable name="depth">
-      <xsl:choose>
-        <xsl:when test="local-name(.) = 'sect1'">1</xsl:when>
-        <xsl:otherwise>0</xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:variable name="depth.from.context"
-                  select="count(ancestor::*)-count($toc-context/ancestor::*)"/>
-    <li class="{name(.)}">
-      <xsl:call-template name="toc.line">
-        <xsl:with-param name="toc-context" select="$toc-context"/>
-      </xsl:call-template>
-      <xsl:if test="$toc.section.depth &gt; $depth and count($nodes)&gt;0
-                    and $toc.max.depth &gt; $depth.from.context">
-        <xsl:copy-of select="$subtoc"/>
-      </xsl:if>
-    </li>
-  </xsl:template>
-
-    <!-- toc.line:
-           Adding the h* tags and dropping unneded links.
-           This template is a full re-made version of the original one. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/autotoc.xsl -->
-  <xsl:template name="toc.line">
-    <xsl:param name="toc-context" select="."/>
-    <xsl:choose>
-        <!-- For non dummy sect1 targets, create a link. -->
-      <xsl:when test="local-name(.) = 'sect1'">
-        <xsl:choose>
-          <xsl:when test="@role='dummy'">
-            <span class="dummy">
-              <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-            </span>
-          </xsl:when>
-          <xsl:otherwise>
-            <a>
-              <xsl:attribute name="href">
-                <xsl:call-template name="href.target">
-                  <xsl:with-param name="context" select="$toc-context"/>
-                </xsl:call-template>
-              </xsl:attribute>
-              <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-            </a>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-        <!-- For part, preface, and chapter, use hX and add the label.
-             For BLFS, make it a link. -->
-      <xsl:when test="local-name(.) = 'part' or local-name(.) = 'preface'
-                      or local-name(.) = 'chapter'">
-        <xsl:choose>
-          <xsl:when test="$book-type = 'blfs'">
-            <xsl:apply-templates select="." mode="add.hX">
-              <xsl:with-param name="toc-context" select="$toc-context"/>
-              <xsl:with-param name="with-link" select="1"/>
-            </xsl:apply-templates>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates select="." mode="add.hX">
-              <xsl:with-param name="toc-context" select="$toc-context"/>
-              <xsl:with-param name="with-link" select="0"/>
-            </xsl:apply-templates>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-        <!-- For appendix , create a link and add the label.
-             For BLFS, use hX. -->
-      <xsl:when test="local-name(.) = 'appendix'">
-        <xsl:choose>
-          <xsl:when test="$book-type = 'blfs'">
-            <xsl:apply-templates select="." mode="add.hX">
-              <xsl:with-param name="toc-context" select="$toc-context"/>
-              <xsl:with-param name="with-link" select="1"/>
-            </xsl:apply-templates>
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:apply-templates select="." mode="add.link">
-              <xsl:with-param name="toc-context" select="$toc-context"/>
-            </xsl:apply-templates>
-          </xsl:otherwise>
-        </xsl:choose>
-      </xsl:when>
-        <!-- For other targets like Index, use hX, create a link, and label it. -->
-      <xsl:otherwise>
-        <xsl:apply-templates select="." mode="add.hX">
-          <xsl:with-param name="toc-context" select="$toc-context"/>
-          <xsl:with-param name="with-link" select="1"/>
-        </xsl:apply-templates>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-    <!-- Self-made template to add hX tags to toc lines. -->
-  <xsl:template match="*" mode="add.hX">
-    <xsl:param name="toc-context" select="."/>
-    <xsl:param name="with-link" select="0"/>
-    <xsl:param name="hlevel">
-      <xsl:choose>
-        <xsl:when test="local-name(.)='chapter' or local-name(.)='preface'">4</xsl:when>
-        <xsl:otherwise>3</xsl:otherwise>
-      </xsl:choose>
-    </xsl:param>
-    <xsl:element name="h{$hlevel}" namespace="http://www.w3.org/1999/xhtml">
-      <xsl:choose>
-        <xsl:when test="$with-link != 0">
-          <xsl:apply-templates select="." mode="add.link">
-            <xsl:with-param name="toc-context" select="$toc-context"/>
-          </xsl:apply-templates>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:apply-templates select="." mode="label.and.title"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:element>
-  </xsl:template>
-
-    <!-- Self-made template to made toc line a link. -->
-  <xsl:template match="*" mode="add.link">
-    <xsl:param name="toc-context" select="."/>
-    <a>
-      <xsl:attribute name="href">
-        <xsl:call-template name="href.target">
-          <xsl:with-param name="context" select="$toc-context"/>
-        </xsl:call-template>
-      </xsl:attribute>
-      <xsl:apply-templates select="." mode="label.and.title"/>
-    </a>
-  </xsl:template>
-
-    <!-- Self-made template to write the target title and label it. -->
-  <xsl:template match="*" mode="label.and.title">
-    <xsl:variable name="label">
-      <xsl:apply-templates select="." mode="label.markup"/>
-    </xsl:variable>
-    <xsl:copy-of select="$label"/>
-    <xsl:if test="$label != ''">
-      <xsl:value-of select="$autotoc.label.separator"/>
-    </xsl:if>
-    <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/lfs-xsl/xhtml/lfs-xref.xsl
===================================================================
--- BOOK/stylesheets/lfs-xsl/xhtml/lfs-xref.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,142 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<!--
-$LastChangedBy$
-$Date$
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:xlink="http://www.w3.org/1999/xlink"
-                xmlns="http://www.w3.org/1999/xhtml"
-                exclude-result-prefixes="xlink"
-                version="1.0">
-
-  <!-- This stylesheet fixes English punctuation in xref links
-       (as was requested by the publisher) via adding @role propagation
-       in xref tags.
-       This hack may not work with xref flavours not used in the book.
-       For other languages, just remove the xref @role attributes
-       in the book XML sources and/or comment-out the inclusion of
-       this file in lfs-chunked2.xsl -->
-
-    <!-- xref:
-           Added role variable and use it when calling mode xref-to.-->
-    <!-- The original template is in {docbook-xsl}/xhtml/xref.xsl -->
-  <xsl:template match="xref" name="xref">
-    <xsl:param name="xhref" select="@xlink:href"/>
-    <!-- is the @xlink:href a local idref link? -->
-    <xsl:param name="xlink.idref">
-      <xsl:if test="starts-with($xhref,'#') and (not(contains($xhref,'('))
-                    or starts-with($xhref, '#xpointer(id('))">
-        <xsl:call-template name="xpointer.idref">
-          <xsl:with-param name="xpointer" select="$xhref"/>
-        </xsl:call-template>
-      </xsl:if>
-    </xsl:param>
-    <xsl:param name="xlink.targets" select="key('id',$xlink.idref)"/>
-    <xsl:param name="linkend.targets" select="key('id',@linkend)"/>
-    <xsl:param name="target" select="($xlink.targets | $linkend.targets)[1]"/>
-      <!-- Added role variable -->
-    <xsl:variable name="role" select="@role"/>
-    <xsl:variable name="xrefstyle">
-      <xsl:choose>
-        <xsl:when test="@role and not(@xrefstyle) and $use.role.as.xrefstyle != 0">
-          <xsl:value-of select="@role"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="@xrefstyle"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:call-template name="anchor"/>
-    <xsl:variable name="content">
-      <xsl:choose>
-        <xsl:when test="@endterm">
-          <xsl:variable name="etargets" select="key('id',@endterm)"/>
-          <xsl:variable name="etarget" select="$etargets[1]"/>
-          <xsl:choose>
-            <xsl:when test="count($etarget) = 0">
-              <xsl:message>
-                <xsl:value-of select="count($etargets)"/>
-                <xsl:text>Endterm points to nonexistent ID: </xsl:text>
-                <xsl:value-of select="@endterm"/>
-              </xsl:message>
-              <xsl:text>???</xsl:text>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:apply-templates select="$etarget" mode="endterm"/>
-            </xsl:otherwise>
-          </xsl:choose>
-        </xsl:when>
-        <xsl:when test="$target/@xreflabel">
-          <xsl:call-template name="xref.xreflabel">
-            <xsl:with-param name="target" select="$target"/>
-          </xsl:call-template>
-        </xsl:when>
-        <xsl:when test="$target">
-          <xsl:if test="not(parent::citation)">
-            <xsl:apply-templates select="$target" mode="xref-to-prefix"/>
-          </xsl:if>
-          <xsl:apply-templates select="$target" mode="xref-to">
-            <xsl:with-param name="referrer" select="."/>
-            <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-             <!-- Propagate role -->
-            <xsl:with-param name="role" select="$role"/>
-          </xsl:apply-templates>
-          <xsl:if test="not(parent::citation)">
-            <xsl:apply-templates select="$target" mode="xref-to-suffix"/>
-          </xsl:if>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:message>
-            <xsl:text>ERROR: xref linking to </xsl:text>
-            <xsl:value-of select="@linkend|@xlink:href"/>
-            <xsl:text> has no generated link text.</xsl:text>
-          </xsl:message>
-          <xsl:text>???</xsl:text>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:variable>
-    <xsl:call-template name="simple.xlink">
-      <xsl:with-param name="content" select="$content"/>
-    </xsl:call-template>
-  </xsl:template>
-
-    <!-- sect* mode xref-to:
-           Propagate role to mode object.xref.markup (see ../lfs-common.xsl) -->
-    <!-- The original template is in {docbook-xsl}/xhtml/xref.xsl -->
-  <xsl:template match="section|simplesect|sect1|sect2|sect3|sect4|sect5|refsect1
-                       |refsect2|refsect3|refsection" mode="xref-to">
-    <xsl:param name="referrer"/>
-    <xsl:param name="xrefstyle"/>
-    <xsl:param name="verbose" select="1"/>
-    <xsl:param name="role"/>
-    <xsl:apply-templates select="." mode="object.xref.markup">
-      <xsl:with-param name="purpose" select="'xref'"/>
-      <xsl:with-param name="xrefstyle" select="$xrefstyle"/>
-      <xsl:with-param name="referrer" select="$referrer"/>
-      <xsl:with-param name="verbose" select="$verbose"/>
-      <xsl:with-param name="role" select="$role"/>
-    </xsl:apply-templates>
-  </xsl:template>
-
-    <!-- insert.title.markup:
-           Apply the role value. -->
-    <!-- The original template is in {docbook-xsl}/xhtml/xref.xsl -->
-  <xsl:template match="*" mode="insert.title.markup">
-    <xsl:param name="purpose"/>
-    <xsl:param name="xrefstyle"/>
-    <xsl:param name="title"/>
-    <xsl:param name="role"/>
-    <xsl:choose>
-      <xsl:when test="$purpose = 'xref' and titleabbrev">
-        <xsl:apply-templates select="." mode="titleabbrev.markup"/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:copy-of select="$title"/>
-        <xsl:value-of select="$role"/>
-      </xsl:otherwise>
-    </xsl:choose>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/patcheslist.xsl
===================================================================
--- BOOK/stylesheets/patcheslist.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!DOCTYPE xsl:stylesheet [
- <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                version="1.0">
-
-  <xsl:output method="text"/>
-
-    <!-- Allow select the dest dir at runtime -->
-  <xsl:param name="dest.dir">
-    <xsl:value-of select="concat('/home/httpd/', substring-after('&patches-root;', 'http://'))"/>
-  </xsl:param>
-
-  <xsl:template match="/">
-    <xsl:text>#! /bin/bash
-
-function copy
-{
-  cp $1 $2 >>copyerrs 2>&amp;1
-}
-
-umask 002 &#x0a;&#x0a;</xsl:text>
-
-      <!-- Create dest.dir if it don't exist -->
-    <xsl:text>install -d -m 775 -g lfswww </xsl:text>
-    <xsl:value-of select="$dest.dir"/>
-    <xsl:text> &amp;&amp;&#x0a;</xsl:text>
-    <xsl:text>cd </xsl:text>
-    <xsl:value-of select="$dest.dir"/>
-    <xsl:text> &amp;&amp;&#x0a;&#x0a;</xsl:text>
-      <!-- Remove old patches -->
-    <xsl:text>rm -f *.patch copyerrs &amp;&amp; &#x0a;&#x0a;</xsl:text>
-    <xsl:apply-templates/>
-      <!-- Ensure correct owneship -->
-    <xsl:text>&#x0a;chgrp lfswww *.patch &amp;&amp;&#x0a;</xsl:text>
-    <xsl:text>
-if [ `wc -l copyerrs | sed 's/ *//' | cut -f1 -d' '` -gt 0 ]; then
-  mail -s "Missing CLFS patches" cross-lfs-dev@linuxfromscratch.org &lt; copyerrs
-fi&#x0a;&#x0a;</xsl:text>
-
-    <xsl:text>exit&#x0a;</xsl:text>
-  </xsl:template>
-
-  <xsl:template match="//text()"/>
-
-  <xsl:template match="//ulink">
-      <!-- Match only local patches links and skip duplicated URLs splitted for PDF output-->
-    <xsl:if test="contains(@url, '.patch') and contains(@url, '&patches-root;')
-            and not(ancestor-or-self::*/@condition = 'pdf')">
-      <xsl:variable name="patch.name" select="substring-after(@url, '&patches-root;')"/>
-      <xsl:variable name="cut"
-              select="translate(substring-after($patch.name, '-'), '0123456789', '0000000000')"/>
-      <xsl:variable name="patch.name2">
-        <xsl:value-of select="substring-before($patch.name, '-')"/>
-        <xsl:text>-</xsl:text>
-        <xsl:value-of select="$cut"/>
-      </xsl:variable>
-      <xsl:text>copy /home/httpd/www.linuxfromscratch.org/patches/downloads/</xsl:text>
-          <xsl:value-of select="substring-before($patch.name2, '-0')"/>
-      <xsl:text>/</xsl:text>
-      <xsl:value-of select="$patch.name"/>
-      <xsl:text> . &#x0a;</xsl:text>
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/stylesheets/top-index.xsl
===================================================================
--- BOOK/stylesheets/top-index.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,265 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!DOCTYPE xsl:stylesheet [
- <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns="http://www.w3.org/1999/xhtml"
-                version="1.0">
-
-  <xsl:output method="html" encoding="iso-8859-1"/>
-
-  <xsl:template match="/">
-    <html>
-      <head>
-        <title>
-          Cross-Compiled Linux From Scratch
-        </title>
-        <style type="text/css">
-          <xsl:text>
-/* Global settings */
-body {
-  font-family: verdana, tahoma, helvetica, arial, sans-serif;
-  text-align: left;
-  background: #fff;
-  color: #222;
-  margin: 1em;
-  padding: 0;
-  font-size: 1em;
-  line-height: 1.2em
-}
-
-a:link { color: #22b; }
-a.ulink:link { font-weight: bold; color: #55f; }
-a:visited { color: #7e4988 ! important; }
-a:hover, a:focus { color: #d30e08 ! important; }
-a:active { color: #6b77b1 ! important;}
-
-h1, h2 h3, h4 {
-  color: #000;
-  font-weight: bold;
-  line-height: 1em;
-}
-
-h1 { font-size: 173%; text-align: center; }
-h2 { font-size: 144%; text-align: center; }
-h3 { font-size: 120%; }
-h4 { font-size: 110%; }
-
-.toc {
-  padding-left: 1em;
-}
-
-.toc ul li h3, .toc ul li h4 {
-  margin: .4em;
-}
-
-.book h1 {
-  background: #f5f6f7;
-  margin: 0px auto;
-  padding: 0.5em;
-}
-
-.book h2 {
-  background: #dbddec;
-  margin: 0px auto;
-  padding: 0.2em;
-}
-.author, .copyright {
-  background: #f5f6f7;
-  margin: 0px auto;
-  padding: 0.5em 1em;
-}
-
-hr {
-  background: #dbddec;
-  height: .3em;
-  border: 0px;
-  margin: 0px auto;
-  padding: 0;
-}
-          </xsl:text>
-        </style>
-      </head>
-      <body>
-        <xsl:apply-templates/>
-      </body>
-    </html>
-  </xsl:template>
-
-  <xsl:template match="bookinfo">
-    <div class="book">
-      <div class="titlepage">
-        <xsl:apply-templates/>
-        <hr/>
-      </div>
-      <div class="toc">
-        <h3>
-          <xsl:text>32 Bit Builds</xsl:text>
-        </h3>
-        <ul>
-	  <h3>
-	    <xsl:text>Working. Testers and comments welcomed.</xsl:text>
-          </h3>
-          <li>
-            <h4>
-              <a href="x86">
-                <xsl:text>Intel/AMD x86</xsl:text>
-              </a>
-            </h4>
-          </li>
-          <li>
-            <h4>
-              <a href="ppc">
-                <xsl:text>PowerPC</xsl:text>
-              </a>
-            </h4>
-          </li>
-<!--
-          <li>
-            <h4>
-              <a href="mips">
-                <xsl:text>MIPS</xsl:text>
-              </a>
-            </h4>
-          </li>
-          <li>
-            <h4>
-              <a href="sparc">
-                <xsl:text>Sparc v8</xsl:text>
-              </a>
-            </h4>
-          </li>
--->
-	</ul>
-        <h3>
-          <xsl:text>64 Bit Builds</xsl:text>
-        </h3>
-	<ul>
-          <h3>
-            <xsl:text>Working. Testers and comments welcomed.</xsl:text>
-          </h3>
-          <li>
-            <h4>
-              <a href="x86_64-64">
-                <xsl:text>x86_64</xsl:text>
-              </a>
-            </h4>
-          </li>
-<!--
-          <li>
-            <h4>
-              <a href="mips64-64">
-                <xsl:text>MIPS</xsl:text>
-              </a>
-            </h4>
-          </li>
--->
-          <li>
-            <h4>
-             <a href="sparc64-64">
-                <xsl:text>Sparc v9/Ultrasparc</xsl:text>
-             </a>
-            </h4>
-          </li>
-<!--
-          <li>
-            <h4>
-             <a href="alpha">
-                <xsl:text>Alpha</xsl:text>
-             </a>
-            </h4>
-          </li>
--->
-	</ul>
-        <h3>
-          <xsl:text>Multilib Builds</xsl:text>
-        </h3>
-	<ul>
-          <h3>
-             <xsl:text>Working. Testers and comments welcomed.</xsl:text>
-          </h3>
-          <li>
-            <h4>
-              <a href="x86_64">
-                <xsl:text>x86_64</xsl:text>
-              </a>
-            </h4>
-          </li>
-<!--
-          <li>
-            <h4>
-              <a href="mips64">
-                <xsl:text>MIPS</xsl:text>
-              </a>
-            </h4>
-          </li>
--->
-          <li>
-            <h4>
-             <a href="sparc64">
-                <xsl:text>Sparc v9/Ultrasparc</xsl:text>
-             </a>
-            </h4>
-          </li>
-          <li>
-            <h4>
-              <a href="ppc64">
-                <xsl:text>PowerPC64</xsl:text>
-              </a>
-            </h4>
-          </li>
-        </ul>
-      </div>
-    </div>
-  </xsl:template>
-
-  <xsl:template match="title">
-    <h1 class="title">
-      <xsl:value-of select="."/>
-    </h1>
-    <h2 class="subtitle">
-      <xsl:text>Version &version;</xsl:text>
-    </h2>
-  </xsl:template>
-
-  <xsl:template match="authorgroup">
-    <h3 class="author">
-      <xsl:value-of select="author[1]/firstname"/>
-      <xsl:text> </xsl:text>
-      <xsl:value-of select="author[1]/surname"/>
-    </h3>
-    <h3 class="author">
-      <xsl:value-of select="author[2]/firstname"/>
-      <xsl:text> </xsl:text>
-      <xsl:value-of select="author[2]/surname"/>
-    </h3>
-  </xsl:template>
-
-  <xsl:template match="copyright">
-    <p class="copyright">
-      <xsl:text>Copyright ©</xsl:text>
-      <xsl:apply-templates/>
-    </p>
-  </xsl:template>
-
-  <xsl:template match="year">
-    <xsl:value-of select="."/>
-  </xsl:template>
-
-  <xsl:template match="holder">
-    <xsl:value-of select="."/>
-  </xsl:template>
-
-  <xsl:template match="bibliosource">
-    <p class="copyright">
-      <em>
-        <xsl:apply-templates/>
-      </em>
-    </p>
-  </xsl:template>
-
-  <xsl:template match="subtitle|author|firstname|surname|legalnotice"/>
-
-</xsl:stylesheet>
Index: OK/stylesheets/wget.xsl
===================================================================
--- BOOK/stylesheets/wget.xsl	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!DOCTYPE xsl:stylesheet [
- <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<!--
-XSLT stylesheet to create wget scripts to download packages and patches.
-Only for Cross-LFS.
-
-Usage example:
-
-xsltproc -xinclude -output x86.wget stylesheets/wget.xsl x86-index.xml
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    version="1.0">
-
-  <xsl:output method="text"/>
-
-  <xsl:template match="/">
-    <xsl:apply-templates select="//ulink"/>
-  </xsl:template>
-
-  <xsl:template match="ulink">
-      <!-- Packages. If some package don't have the string ".tar." in their
-      name, the next test must be fixed to match it also. -->
-    <xsl:if test="contains(@url, '.tar.') or contains(@url, '.tgz')">
-      <xsl:value-of select="@url"/>
-      <xsl:text>&#x0a;</xsl:text>
-    </xsl:if>
-      <!-- Patches. Match only the patches and skip possible duplicated
-      URLs due that may be splitted for PDF output-->
-    <xsl:if test="contains(@url, '.patch') and contains(@url, '&patches-root;')
-            and not(ancestor-or-self::*/@condition = 'pdf')">
-      <xsl:value-of select="@url"/>
-      <xsl:text>&#x0a;</xsl:text>
-    </xsl:if>
-  </xsl:template>
-
-</xsl:stylesheet>
Index: OK/temp-system/64/binutils.xml
===================================================================
--- BOOK/temp-system/64/binutils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,89 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-binutils" role="wrap">
-  <?dbhtml filename="binutils.html"?>
-
-  <title>Binutils-&binutils-version;</title>
-
-  <indexterm zone="ch-temp-system-binutils">
-    <primary sortas="a-Binutils">Binutils</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/binutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Binutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='ba'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j"><userinput>CC="${CC} ${BUILD64}" \
-    ../binutils-&binutils-version;/configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-    --disable-nls --enable-shared --enable-64-bit-bfd \
-    --disable-multilib</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/binutils.xml"
-    xpointer="xpointer(//*[@os='ea'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-binutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/64/bzip2.xml
===================================================================
--- BOOK/temp-system/64/bzip2.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,57 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-bzip2" role="wrap">
-  <?dbhtml filename="bzip2.html"?>
-
-  <title>Bzip2-&bzip2-version;</title>
-
-  <indexterm zone="ch-temp-system-bzip2">
-    <primary sortas="a-Bzip2">Bzip2</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/bzip2.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bzip2</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='ca'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='cb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="cc"><userinput>make CC="${CC} ${BUILD64}" AR="${AR}" RANLIB="${RANLIB}"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='cd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='ce'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-bzip2" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/64/file.xml
===================================================================
--- BOOK/temp-system/64/file.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,57 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-file" role="wrap">
-  <?dbhtml filename="file.html"?>
-
-  <title>File-&file-version;</title>
-
-  <indexterm zone="ch-temp-system-file">
-    <primary sortas="a-File">File</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/file.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of File</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-file" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/64/ncurses.xml
===================================================================
--- BOOK/temp-system/64/ncurses.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,68 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-ncurses" role="wrap">
-  <?dbhtml filename="ncurses.html"?>
-
-  <title>Ncurses-&ncurses-version;</title>
-
-  <indexterm zone="ch-temp-system-ncurses">
-    <primary sortas="a-Ncurses">Ncurses</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/ncurses.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Ncurses</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-   ./configure --prefix=/tools --with-shared --build=${CLFS_HOST} \
-   --host=${CLFS_TARGET} --without-debug --without-ada \
-   --enable-overwrite --with-build-cc=gcc</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-ncurses" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/64/zlib.xml
===================================================================
--- BOOK/temp-system/64/zlib.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,58 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-zlib" role="wrap">
-  <?dbhtml filename="zlib.html"?>
-
-  <title>Zlib-&zlib-version;</title>
-
-  <indexterm zone="ch-temp-system-zlib">
-    <primary sortas="a-Zlib">Zlib</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/zlib.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Zlib</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" \
-   ./configure --prefix=/tools --shared</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-zlib" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/alpha-chapter.xml
===================================================================
--- BOOK/temp-system/alpha-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temp-system" xreflabel="Constructing a Temporary System">
-  <?dbhtml dir="temp-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary System</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="alpha/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
-
-</chapter>
Index: OK/temp-system/alpha/gcc.xml
===================================================================
--- BOOK/temp-system/alpha/gcc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,133 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-temp-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/alpha/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/alpha/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/alpha/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/alpha/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/alpha/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/alpha/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/alpha/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/alpha/gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='ce'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='ck'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cn'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='co'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cp'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/bash.xml
===================================================================
--- BOOK/temp-system/common/bash.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,108 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-bash" role="wrap">
-  <?dbhtml filename="bash.html"?>
-
-  <title>Bash-&bash-version;</title>
-
-  <indexterm zone="ch-temp-system-bash">
-    <primary sortas="a-Bash">Bash</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/bash.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bash</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/bash.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/bash.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <para os="c1">When bash is cross-compiled, it cannot test for the presence
-    of named pipes, amoung other things. If you used <command>su</command> to
-    become an unprivileged user, this combination will cause Bash to build
-    without <emphasis>process substitution</emphasis>, which will break one
-    of the c++ test scripts in <literal>glibc</literal>. The following prevents
-    future problems by skipping tests that can not run while cross-compiling
-    or that do not run properly:</para>
-
-<screen os="c2"><userinput>cat &gt; config.cache &lt;&lt; "EOF"
-ac_cv_func_mmap_fixed_mapped=yes
-ac_cv_func_strcoll_works=yes
-ac_cv_func_working_mktime=yes
-bash_cv_func_sigsetjmp=present
-bash_cv_getcwd_malloc=yes
-bash_cv_job_control_missing=present
-bash_cv_printf_a_format=yes
-bash_cv_sys_named_pipes=present
-bash_cv_ulimit_maxfds=yes
-bash_cv_under_sys_siglist=yes
-bash_cv_unusable_rtsigs=no
-gt_cv_int_divbyzero_sigfpe=yes
-EOF</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/bash.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --without-bash-malloc --cache-file=config.cache</userinput></screen>
-
-    <variablelist os="ad">
-      <title>The meaning of the configure option:</title>
-
-      <varlistentry>
-        <term><parameter>--without-bash-malloc</parameter></term>
-        <listitem>
-          <para>This option turns off the use of Bash's memory allocation
-          (malloc) function which is known to cause segmentation faults.
-          By turning this option off, Bash will use the malloc functions
-          from Glibc which are more stable.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/bash.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/bash.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/bash.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-<screen os="n"><userinput>make install</userinput></screen>
-
-    <para os="ae">Make a link for programs that use <command>sh</command> for
-    a shell:</para>
-
-<screen os="af"><userinput>ln -sv bash /tools/bin/sh</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-bash" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/binutils.xml
===================================================================
--- BOOK/temp-system/common/binutils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,83 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-binutils" role="wrap">
-  <?dbhtml filename="binutils.html"?>
-
-  <title>Binutils-&binutils-version;</title>
-
-  <indexterm zone="ch-temp-system-binutils">
-    <primary sortas="a-Binutils">Binutils</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/binutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Binutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/binutils.xml"
-    xpointer="xpointer(//*[@os='ba'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/binutils.xml"
-    xpointer="xpointer(//*[@os='bb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/binutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j"><userinput>../binutils-&binutils-version;/configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-    --disable-nls --enable-shared --disable-multilib</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/binutils.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/binutils.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/binutils.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/binutils.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-binutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/bzip2.xml
===================================================================
--- BOOK/temp-system/common/bzip2.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,52 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-bzip2" role="wrap">
-  <?dbhtml filename="bzip2.html"?>
-
-  <title>Bzip2-&bzip2-version;</title>
-
-  <indexterm zone="ch-temp-system-bzip2">
-    <primary sortas="a-Bzip2">Bzip2</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/bzip2.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bzip2</title>
-
-    <para os="ca">Bzip2's default Makefile target automatically runs
-    the testsuite as well. Disable the tests since they won't work on a
-    multi-architecture build:</para>
-
-<screen os="cb"><userinput>cp -v Makefile{,.orig}
-sed -e 's@^\(all:.*\) test@\1@g' Makefile.orig > Makefile</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/bzip2.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="cc"><userinput>make CC="${CC}" AR="${AR}" RANLIB="${RANLIB}"</userinput></screen>
-
-    <para os="cd">Install the package:</para>
-
-<screen os="ce"><userinput>make PREFIX=/tools install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-bzip2" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/choose.xml
===================================================================
--- BOOK/temp-system/common/choose.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,50 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-choose">
-  <?dbhtml filename="choose.html"?>
-
-  <title>To Boot or to Chroot?</title>
-
-  <para os="a"> There are two different ways you can proceed from this point
-  to build the final system. You can build a kernel, a bootloader, and
-  a few other utilities, boot into the temporary system, and build the
-  rest there. Alternatively, you can chroot into the temporary system.</para>
-
-  <para os="b">The boot method is needed when you are building on a different
-  architecture. For example, if you are building a PowerPC system from
-  an x86, you can't chroot. The chroot method is for when you are
-  building on the same architecture. If you are building on, and for,
-  an x86 system, you can simply chroot. The rule of thumb here is if
-  the architectures match and you are running the same series kernel
-  you can just chroot. If you aren't running the same series kernel, or are
-  wanting to run a different ABI, you will need to use the boot option.</para>
-
-  <para os="c">If you are in any doubt about this, you can try the following
- commands to see if you can chroot:</para>
-
-<screen ><userinput>/tools/lib/libc.so.6
-/tools/bin/gcc -v</userinput></screen>
-
-  <para>If either of these commands fail, you will have to follow the boot
-  method.</para>
-
-  <para>To chroot, you will also need a Linux Kernel-2.6.x (having been
-  compiled with GCC-3.0 or greater). The reason for the kernel version
-  requirement is that, without it, thread-local storage support in Binutils
-  will not be built and the Native POSIX Threading Library (NPTL) test suite
-  will segfault.</para>
-
-  <para>To check your kernel version, run <command>cat /proc/version</command>
-  - if it does not say that you are running a 2.6.2 or later Linux kernel,
-  compiled with GCC 3.0 or later, you cannot chroot.</para>
-
-  <para os="e">For the boot method, follow <xref linkend="chapter-boot"/>.</para>
-
-  <para os="f">For the chroot method, follow <xref linkend="chapter-chroot"/>.</para>
-
-</sect1>
Index: OK/temp-system/common/coreutils.xml
===================================================================
--- BOOK/temp-system/common/coreutils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,75 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-coreutils" role="wrap">
-  <?dbhtml filename="coreutils.html"?>
-
-  <title>Coreutils-&coreutils-version;</title>
-
-  <indexterm zone="ch-temp-system-coreutils">
-    <primary sortas="a-Coreutils">Coreutils</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/coreutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Coreutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/coreutils.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/coreutils.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <para os="ba">Configure can not properly determine how to get free space
-    when cross-compiling, Without putting the following entry into
-    <filename>config.cache</filename> the <command>df</command> program will
-    not be built.</para>
-
-<screen os="bb"><userinput>echo "fu_cv_sys_stat_statfs2_bsize=yes" &gt; config.cache</userinput></screen>
-
-    <para os="bd">Prepare Coreutils for compilation:</para>
-
-<screen os="be"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --cache-file=config.cache</userinput></screen>
-
-    <para os="m1">When we changed the futimens references, one of the files we
-    updated was touch.c. That change means the
-    <filename class="directory">man</filename> Makefile will try to
-    regenerate the man page for touch, by executing the compiled
-    <literal>touch</literal> program. If the target architecture cannot be
-    executed by the host system, the build will fail. The following command
-    fixes this by giving the man page a newer timestamp than its corresponding
-    source file:</para>
-
-<screen os="m2"><userinput>touch man/touch.1</userinput></screen>
-
-   <para os="bf">Compile the package:</para>
-
-<screen os="bg"><userinput>make</userinput></screen>
-
-    <para os="bh">Install the package:</para>
-
-<screen os="bi"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-coreutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/diffutils.xml
===================================================================
--- BOOK/temp-system/common/diffutils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-diffutils" role="wrap">
-  <?dbhtml filename="diffutils.html"?>
-
-  <title>Diffutils-&diffutils-version;</title>
-
-  <indexterm zone="ch-temp-system-diffutils">
-    <primary sortas="a-Diffutils">Diffutils</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/diffutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Diffutils</title>
-
-    <para os="a">Prepare Diffutils for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-diffutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/file.xml
===================================================================
--- BOOK/temp-system/common/file.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,47 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-file" role="wrap">
-  <?dbhtml filename="file.html"?>
-
-  <title>File-&file-version;</title>
-
-  <indexterm zone="ch-temp-system-file">
-    <primary sortas="a-File">File</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/file.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of File</title>
-
-    <para os="a">Prepare File for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="f">Install the package:</para>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-file" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/findutils.xml
===================================================================
--- BOOK/temp-system/common/findutils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,58 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-findutils" role="wrap">
-  <?dbhtml filename="findutils.html"?>
-
-  <title>Findutils-&findutils-version;</title>
-
-  <indexterm zone="ch-temp-system-findutils">
-    <primary sortas="a-Findutils">Findutils</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/findutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Findutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/findutils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="ac"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/findutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/findutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/findutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/findutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-findutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/gawk.xml
===================================================================
--- BOOK/temp-system/common/gawk.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gawk" role="wrap">
-  <?dbhtml filename="gawk.html"?>
-
-  <title>Gawk-&gawk-version;</title>
-
-  <indexterm zone="ch-temp-system-gawk">
-    <primary sortas="a-Gawk">Gawk</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gawk.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Gawk</title>
-
-    <para os="a">Prepare Gawk for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gawk" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/gcc.xml
===================================================================
--- BOOK/temp-system/common/gcc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,134 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-temp-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/common/gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <para os="cd">Now we will change <command>cpp</command>'s search path so it     won't look in <filename class="directory">/usr/include</filename>:</para>
-
-<screen os="ce"><userinput>cp -v gcc/cppdefault.c{,.orig}
-sed -e '/#define STANDARD_INCLUDE_DIR/s@"/usr/include"@0@g' \
-    gcc/cppdefault.c.orig > gcc/cppdefault.c</userinput></screen>
-
-    <para os="cf">Also, we need to set the directory searched by the fixincludes
-    process for system headers, so it won't look at the host's headers:</para>
-
-<screen os="cg"><userinput>cp -v gcc/Makefile.in{,.orig}
-sed -e 's@\(^NATIVE_SYSTEM_HEADER_DIR =\).*@\1 /tools/include@g' \
-    gcc/Makefile.in.orig > gcc/Makefile.in</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <para os="cj">Before starting to build GCC, remember to unset any environment
-    variables that override the default optimization flags.</para>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="ck"><userinput>../gcc-&gcc-version;/configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-    --with-local-prefix=/tools --enable-long-long --enable-c99 \
-    --enable-shared --enable-threads=posix --enable-__cxa_atexit \
-    --disable-nls --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
-
-    <variablelist os="cl">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry os="cl1">
-        <term><parameter>--disable-libstdcxx-pch</parameter></term>
-        <listitem>
-          <para>Do not build the pre-compiled header (PCH) for
-          <filename class="libraryfile">libstdc++</filename>. It takes
-          up a lot of space, and we have no use for it.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="cm">Compile the package:</para>
-
-<screen os="cn"><userinput>make AS_FOR_TARGET="${AS}" \
-    LD_FOR_TARGET="${LD}"</userinput></screen>
-
-    <para os="co">Install the package:</para>
-
-<screen os="cp"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/gettext.xml
===================================================================
--- BOOK/temp-system/common/gettext.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,74 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gettext" role="wrap">
-  <?dbhtml filename="gettext.html"?>
-
-  <title>Gettext-&gettext-version;</title>
-
-  <indexterm zone="ch-temp-system-gettext">
-    <primary sortas="a-Gettext">Gettext</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gettext.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Gettext</title>
-
-    <para os="a">Only the programs in the
-    <filename class="directory">gettext-tools</filename> directory need to be
-    installed for the temp-system:</para>
-
-<screen os="b"><userinput>cd gettext-tools</userinput></screen>
-
-    <para os="t1">When cross-compiling the Gettext configure script assumes we
-    don't have a working wcwidth when we do. The following will fix possible
-    compilation errors because of this assumption:</para>
-
-<screen os="t2"><userinput>echo "gl_cv_func_wcwidth_works=yes" > config.cache</userinput></screen>
-
-    <para os="c">Prepare Gettext for compilation:</para>
-
-<screen os="d"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --disable-shared --cache-file=config.cache</userinput></screen>
-
-    <variablelist os="e">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry os="e1">
-        <term><parameter>--disable-shared</parameter></term>
-        <listitem>
-          <para>This tells Gettext not to create a shared library.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="f">Compile the package:</para>
-
-<screen os="g"><userinput>make -C gnulib-lib
-make -C src msgfmt</userinput></screen>
-
-    <para os="h">Install the <command>msgfmt</command> binary:</para>
-
-<screen os="i"><userinput>cp -v src/msgfmt /tools/bin</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gettext" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/grep.xml
===================================================================
--- BOOK/temp-system/common/grep.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,74 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-grep" role="wrap">
-  <?dbhtml filename="grep.html"?>
-
-  <title>Grep-&grep-version;</title>
-
-  <indexterm zone="ch-temp-system-grep">
-    <primary sortas="a-Grep">Grep</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/grep.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Grep</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/grep.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="ca"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --disable-perl-regexp</userinput></screen>
-
-    <variablelist os="cb">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--disable-perl-regexp</parameter></term>
-        <listitem>
-          <para>This ensures that the <command>grep</command> program
-          does not get linked against a Perl Compatible Regular Expression
-          (PCRE) library that may be present on the host but will not be
-          available when building the final system.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/grep.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/grep.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/grep.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/grep.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-grep" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/gzip.xml
===================================================================
--- BOOK/temp-system/common/gzip.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,66 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gzip" role="wrap">
-  <?dbhtml filename="gzip.html"?>
-
-  <title>Gzip-&gzip-version;</title>
-
-  <indexterm zone="ch-temp-system-gzip">
-    <primary sortas="a-Gzip">Gzip</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gzip.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Gzip</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gzip.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gzip.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gzip.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gzip.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gzip.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gzip.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gzip.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gzip" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/introduction.xml
===================================================================
--- BOOK/temp-system/common/introduction.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,43 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-introduction">
-  <?dbhtml filename="introduction.html"?>
-
-  <title>Introduction</title>
-
-  <para>This chapter shows how to compile and install a minimal Linux
-  system. This system will contain just enough tools to start
-  constructing the final CLFS system in <xref
-  linkend="chapter-building-system"/> and allow a working environment
-  with more user convenience than a minimum environment would.</para>
-
-  <para>The tools in this chapter are cross-compiled using the toolchain in
-  <filename class="directory">/cross-tools</filename> and will be installed under the
-  <filename class="directory">${CLFS}/tools</filename> directory to keep
-  them separate from the files installed in <xref
-  linkend="chapter-building-system"/> and the host production directories.
-  Since the packages compiled here are temporary, we do not want them to
-  pollute the soon-to-be CLFS system.</para>
-
-  <para>Check one last time that the <envar>CLFS</envar> environment
-  variable is set up properly:</para>
-
-<screen><userinput>echo ${CLFS}</userinput></screen>
-
-  <para>Make sure the output shows the path to the CLFS partition's mount
-  point, which is <filename class="directory">/mnt/clfs</filename>, using
-  our example.</para>
-
-  <para>During this section of the build you will see several WARNING
-  messages like the one below. It is safe to ignore these messages.</para>
-
-<screen><computeroutput>configure: 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.</computeroutput></screen>
-
-
-</sect1>
Index: OK/temp-system/common/make.xml
===================================================================
--- BOOK/temp-system/common/make.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,58 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-make" role="wrap">
-  <?dbhtml filename="make.html"?>
-
-  <title>Make-&make-version;</title>
-
-  <indexterm zone="ch-temp-system-make">
-    <primary sortas="a-Make">Make</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/make.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Make</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="aa"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-make" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/ncurses.xml
===================================================================
--- BOOK/temp-system/common/ncurses.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,110 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-ncurses" role="wrap">
-  <?dbhtml filename="ncurses.html"?>
-
-  <title>Ncurses-&ncurses-version;</title>
-
-  <indexterm zone="ch-temp-system-ncurses">
-    <primary sortas="a-Ncurses">Ncurses</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/ncurses.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Ncurses</title>
-
-    <para os="p1">The following patch fixes an issue with some Bash versions:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&ncurses-bashfix-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/ncurses.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure --prefix=/tools --with-shared \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --without-debug --without-ada \
-    --enable-overwrite --with-build-cc=gcc</userinput></screen>
-
-    <variablelist os="c">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry>
-        <term><parameter>--with-shared</parameter></term>
-        <listitem>
-          <para>This tells Ncurses to create a shared library.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--without-debug</parameter></term>
-        <listitem>
-          <para>This tells Ncurses not to build with debug information.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--without-ada</parameter></term>
-        <listitem>
-          <para>This ensures that Ncurses does not build support for the
-          Ada compiler which may be present on the host but will not be
-          available when building the final system.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--enable-overwrite</parameter></term>
-        <listitem>
-          <para>This tells Ncurses to install its header files into
-          <filename class="directory">/tools/include</filename>, instead of
-          <filename class="directory">/tools/include/ncurses</filename>, to
-          ensure that other packages can find the Ncurses headers
-          successfully.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--with-build-cc=gcc</parameter></term>
-        <listitem>
-          <para>This tells Ncurses what type of compiler we are using.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/ncurses.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/ncurses.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/ncurses.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/ncurses.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-ncurses" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/patch.xml
===================================================================
--- BOOK/temp-system/common/patch.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-patch" role="wrap">
-  <?dbhtml filename="patch.html"?>
-
-  <title>Patch-&patch-version;</title>
-
-  <indexterm zone="ch-temp-system-patch">
-    <primary sortas="a-Patch">Patch</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/patch.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Patch</title>
-
-    <para os="a">Prepare Patch for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-patch" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/sed.xml
===================================================================
--- BOOK/temp-system/common/sed.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,48 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-sed" role="wrap">
-  <?dbhtml filename="sed.html"?>
-
-  <title>Sed-&sed-version;</title>
-
-  <indexterm zone="ch-temp-system-sed">
-    <primary sortas="a-Sed">Sed</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/sed.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Sed</title>
-
-    <para os="a">Prepare Sed for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-sed" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/tar.xml
===================================================================
--- BOOK/temp-system/common/tar.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,64 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-tar" role="wrap">
-  <?dbhtml filename="tar.html"?>
-
-  <title>Tar-&tar-version;</title>
-
-  <indexterm zone="ch-temp-system-tar">
-    <primary sortas="a-Tar">Tar</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/tar.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Tar</title>
-
-    <para os="c1">TAR utilizes UTF-8 capability, without the following
-    command the UTF-8 sections of the build will fail:</para>
-
-<screen os="c2"><userinput>echo "gl_cv_func_wcwidth_works=yes" &gt;&gt; config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/tar.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/tar.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/tar.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/tar.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/tar.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-tar" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/texinfo.xml
===================================================================
--- BOOK/temp-system/common/texinfo.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-texinfo" role="wrap">
-  <?dbhtml filename="texinfo.html"?>
-
-  <title>Texinfo-&texinfo-version;</title>
-
-  <indexterm zone="ch-temp-system-texinfo">
-    <primary sortas="a-Texinfo">Texinfo</primary>
-    <secondary>temporary tools</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/texinfo.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Texinfo</title>
-
-    <para os="p1">The following patch fixes a build error due to mbstate
-    being undefined:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&texinfo-mbstate_fix-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/texinfo.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/texinfo.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>make -C tools/gnulib/lib
-make -C tools
-make</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/texinfo.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/texinfo.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-texinfo" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/common/variables.xml
===================================================================
--- BOOK/temp-system/common/variables.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,35 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-variables">
-  <?dbhtml filename="variables.html"?>
-
-  <title>Build Variables</title>
-
-  <para>Setup target-specific variables for the compiler
-  and linkers:</para>
-
-<screen><userinput>export CC="${CLFS_TARGET}-gcc"
-export CXX="${CLFS_TARGET}-g++"
-export AR="${CLFS_TARGET}-ar"
-export AS="${CLFS_TARGET}-as"
-export RANLIB="${CLFS_TARGET}-ranlib"
-export LD="${CLFS_TARGET}-ld"
-export STRIP="${CLFS_TARGET}-strip"</userinput></screen>
-
-  <para>Then add the build variables to <filename>~/.bashrc</filename> to
-  prevent issues if you stop and come back later:</para>
-
-<screen><userinput>echo export CC=\""${CC}\"" &gt;&gt; ~/.bashrc
-echo export CXX=\""${CXX}\"" &gt;&gt; ~/.bashrc
-echo export AR=\""${AR}\"" &gt;&gt; ~/.bashrc
-echo export AS=\""${AS}\"" &gt;&gt; ~/.bashrc
-echo export RANLIB=\""${RANLIB}\"" &gt;&gt; ~/.bashrc
-echo export LD=\""${LD}\"" &gt;&gt; ~/.bashrc
-echo export STRIP=\""${STRIP}\"" &gt;&gt; ~/.bashrc</userinput></screen>
-
-</sect1>
Index: OK/temp-system/common/zlib.xml
===================================================================
--- BOOK/temp-system/common/zlib.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,67 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-zlib" role="wrap">
-  <?dbhtml filename="zlib.html"?>
-
-  <title>Zlib-&zlib-version;</title>
-
-  <indexterm zone="ch-temp-system-zlib">
-    <primary sortas="a-Zlib">Zlib</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/zlib.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Zlib</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/zlib.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>./configure --prefix=/tools --shared</userinput></screen>
-
-    <variablelist os="aa">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry os="aa1">
-        <term><parameter>--shared</parameter></term>
-        <listitem>
-          <para>Tells Zlib to build its shared library.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/zlib.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/zlib.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/zlib.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-<screen os="g"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-zlib" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/mips-chapter.xml
===================================================================
--- BOOK/temp-system/mips-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temp-system" xreflabel="Constructing a Temporary System">
-  <?dbhtml dir="temp-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary System</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
-
-</chapter>
Index: OK/temp-system/mips/gcc.xml
===================================================================
--- BOOK/temp-system/mips/gcc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,133 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-temp-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips/gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='ce'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='ck'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cn'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='co'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cp'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/mips64-64-chapter.xml
===================================================================
--- BOOK/temp-system/mips64-64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temp-system" xreflabel="Constructing a Temporary System">
-  <?dbhtml dir="temp-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary System</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64-64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
-
-</chapter>
Index: OK/temp-system/mips64-64/gcc.xml
===================================================================
--- BOOK/temp-system/mips64-64/gcc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,161 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-temp-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='ce'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="ck"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-    ../gcc-&gcc-version;/configure --prefix=/tools --disable-multilib \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-    --with-local-prefix=/tools --enable-long-long --with-abi=64 \
-    --enable-c99 --enable-shared --enable-threads=posix --disable-nls \
-    --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the new configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../x86_64/gcc.xml"
-      xpointer="xpointer(//*[@os='dd1'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/gcc.xml"
-      xpointer="xpointer(//*[@os='cl1'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cn'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='co'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cp'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/gcc.xml"
-    xpointer="xpointer(//*[@os='dp'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/gcc.xml"
-    xpointer="xpointer(//*[@os='dq'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/mips64-chapter.xml
===================================================================
--- BOOK/temp-system/mips64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temp-system" xreflabel="Constructing a Temporary System">
-  <?dbhtml dir="temp-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary System</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/choose.xml"/>
-
-</chapter>
Index: OK/temp-system/mips64/choose.xml
===================================================================
--- BOOK/temp-system/mips64/choose.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,42 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-choose">
-  <?dbhtml filename="choose.html"?>
-
-  <title>To Boot or to Chroot?</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen ><userinput>/tools/lib/libc.so.6
-/tools/lib32/libc.so.6
-/tools/lib64/libc.so.6
-/tools/bin/gcc -v</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../multilib/choose.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: OK/temp-system/mips64/gcc.xml
===================================================================
--- BOOK/temp-system/mips64/gcc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,144 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-temp-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/mips64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='ce'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="ck"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-    ../gcc-&gcc-version;/configure --prefix=/tools --libdir=/tools/lib64 \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-    --with-abi=64 --with-local-prefix=/tools --enable-long-long \
-    --enable-c99 --enable-shared --enable-threads=posix --disable-nls \
-    --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='dd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cn'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='co'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cp'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/bash.xml
===================================================================
--- BOOK/temp-system/multilib/bash.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,88 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-bash" role="wrap">
-  <?dbhtml filename="bash.html"?>
-
-  <title>Bash-&bash-version;</title>
-
-  <indexterm zone="ch-temp-system-bash">
-    <primary sortas="a-Bash">Bash</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/bash.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bash</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='c1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='c2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-<screen os="h"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-   ./configure --prefix=/tools \
-   --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-   --without-bash-malloc --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='m'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bash.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-bash" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/binutils.xml
===================================================================
--- BOOK/temp-system/multilib/binutils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,105 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-binutils" role="wrap">
-  <?dbhtml filename="binutils.html"?>
-
-  <title>Binutils-&binutils-version;</title>
-
-  <indexterm zone="ch-temp-system-binutils">
-    <primary sortas="a-Binutils">Binutils</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/binutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Binutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='ba'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/multilib/binutils.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/multilib/binutils.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j"><userinput>CC="${CC} ${BUILD64}" \
-    ../binutils-&binutils-version;/configure --prefix=/tools \
-    --libdir=/tools/lib64 --with-lib-path=/tools/lib \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-    --disable-nls --enable-shared --enable-64-bit-bfd</userinput></screen>
-
-    <variablelist os="ea">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry>
-        <term><parameter>CC="${CC} ${BUILD64}"</parameter></term>
-        <listitem>
-          <para>Tells the compiler to use our 64-bit build flags.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='be'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/binutils.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-binutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/bzip2.xml
===================================================================
--- BOOK/temp-system/multilib/bzip2.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,60 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-bzip2" role="wrap">
-  <?dbhtml filename="bzip2.html"?>
-
-  <title>Bzip2-&bzip2-version;</title>
-
-  <indexterm zone="ch-temp-system-bzip2">
-    <primary sortas="a-Bzip2">Bzip2</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/bzip2.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Bzip2</title>
-
-    <para os="m1">Bzip2's default Makefile target automatically runs the
-    testsuite as well. We need to remove the tests since they won't work on
-    a multi-architecture build, and change the default lib path
-    to <filename class="directory">lib64</filename>:</para>
-
-<screen os="m2"><userinput>cp -v Makefile{,.orig}
-sed -e 's@^\(all:.*\) test@\1@g' \
-    -e 's@/lib\(/\| \|$\)@/lib64\1@g' Makefile.orig > Makefile</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../64/bzip2.xml"
-    xpointer="xpointer(//*[@os='cc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='cd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/bzip2.xml"
-    xpointer="xpointer(//*[@os='ce'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-bzip2" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/choose.xml
===================================================================
--- BOOK/temp-system/multilib/choose.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,41 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-choose">
-  <?dbhtml filename="choose.html"?>
-
-  <title>To Boot or to Chroot?</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen ><userinput>/tools/lib/libc.so.6
-/tools/lib64/libc.so.6
-/tools/bin/gcc -v</userinput></screen>
-
-  <para os="d">If any of these commands fail, you will have to follow the boot
-  method.</para>
-
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: OK/temp-system/multilib/coreutils.xml
===================================================================
--- BOOK/temp-system/multilib/coreutils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,83 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-coreutils" role="wrap">
-  <?dbhtml filename="coreutils.html"?>
-
-  <title>Coreutils-&coreutils-version;</title>
-
-  <indexterm zone="ch-temp-system-coreutils">
-    <primary sortas="a-Coreutils">Coreutils</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/coreutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Coreutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/coreutils.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/coreutils.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='ba'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='bb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='bd'])"/>
-
-<screen os="be"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='bf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='bg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='bh'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/coreutils.xml"
-    xpointer="xpointer(//*[@os='bi'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-coreutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/diffutils.xml
===================================================================
--- BOOK/temp-system/multilib/diffutils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,58 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-diffutils" role="wrap">
-  <?dbhtml filename="diffutils.html"?>
-
-  <title>Diffutils-&diffutils-version;</title>
-
-  <indexterm zone="ch-temp-system-diffutils">
-    <primary sortas="a-Diffutils">Diffutils</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/diffutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Diffutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/diffutils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-  --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/diffutils.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/diffutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/diffutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/diffutils.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-diffutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/file.xml
===================================================================
--- BOOK/temp-system/multilib/file.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,57 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-file" role="wrap">
-  <?dbhtml filename="file.html"?>
-
-  <title>File-&file-version;</title>
-
-  <indexterm zone="ch-temp-system-file">
-    <primary sortas="a-File">File</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/file.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of File</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --libdir=/tools/lib64 --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/file.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-file" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/findutils.xml
===================================================================
--- BOOK/temp-system/multilib/findutils.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,58 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-findutils" role="wrap">
-  <?dbhtml filename="findutils.html"?>
-
-  <title>Findutils-&findutils-version;</title>
-
-  <indexterm zone="ch-temp-system-findutils">
-    <primary sortas="a-Findutils">Findutils</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/findutils.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Findutils</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="ac"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/findutils.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-findutils" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/gawk.xml
===================================================================
--- BOOK/temp-system/multilib/gawk.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,59 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gawk" role="wrap">
-  <?dbhtml filename="gawk.html"?>
-
-  <title>Gawk-&gawk-version;</title>
-
-  <indexterm zone="ch-temp-system-gawk">
-    <primary sortas="a-Gawk">Gawk</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gawk.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Gawk</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gawk.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" \
-   ./configure --prefix=/tools \
-   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gawk.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gawk.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gawk.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gawk.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gawk" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/gettext.xml
===================================================================
--- BOOK/temp-system/multilib/gettext.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,80 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gettext" role="wrap">
-  <?dbhtml filename="gettext.html"?>
-
-  <title>Gettext-&gettext-version;</title>
-
-  <indexterm zone="ch-temp-system-gettext">
-    <primary sortas="a-Gettext">Gettext</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gettext.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Gettext</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='t1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='t2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-    ./configure --prefix=/tools --disable-shared \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-    --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gettext.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gettext" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/grep.xml
===================================================================
--- BOOK/temp-system/multilib/grep.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,63 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-grep" role="wrap">
-  <?dbhtml filename="grep.html"?>
-
-  <title>Grep-&grep-version;</title>
-
-  <indexterm zone="ch-temp-system-grep">
-    <primary sortas="a-Grep">Grep</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/grep.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Grep</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="ca"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-   --disable-perl-regexp</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='cb'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/grep.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-  <para>Details on this package are located in <xref
-  linkend="contents-grep" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/gzip.xml
===================================================================
--- BOOK/temp-system/multilib/gzip.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,66 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gzip" role="wrap">
-  <?dbhtml filename="gzip.html"?>
-
-  <title>Gzip-&gzip-version;</title>
-
-  <indexterm zone="ch-temp-system-gzip">
-    <primary sortas="a-Gzip">Gzip</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gzip.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Gzip</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gzip.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gzip.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-  --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gzip.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gzip" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/make.xml
===================================================================
--- BOOK/temp-system/multilib/make.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,58 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-make" role="wrap">
-  <?dbhtml filename="make.html"?>
-
-  <title>Make-&make-version;</title>
-
-  <indexterm zone="ch-temp-system-make">
-    <primary sortas="a-Make">Make</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/make.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Make</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="aa"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/make.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-make" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/ncurses.xml
===================================================================
--- BOOK/temp-system/multilib/ncurses.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,70 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-ncurses" role="wrap">
-  <?dbhtml filename="ncurses.html"?>
-
-  <title>Ncurses-&ncurses-version;</title>
-
-  <indexterm zone="ch-temp-system-ncurses">
-    <primary sortas="a-Ncurses">Ncurses</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/ncurses.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Ncurses</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-   ./configure --prefix=/tools --with-shared \
-   --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-   --without-debug --without-ada \
-   --enable-overwrite --with-build-cc=gcc \
-   --libdir=/tools/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/ncurses.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-ncurses" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/patch.xml
===================================================================
--- BOOK/temp-system/multilib/patch.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,58 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-patch" role="wrap">
-  <?dbhtml filename="patch.html"?>
-
-  <title>Patch-&patch-version;</title>
-
-  <indexterm zone="ch-temp-system-patch">
-    <primary sortas="a-Patch">Patch</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/patch.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Patch</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/patch.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/patch.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/patch.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/patch.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/patch.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-patch" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/sed.xml
===================================================================
--- BOOK/temp-system/multilib/sed.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,58 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-sed" role="wrap">
-  <?dbhtml filename="sed.html"?>
-
-  <title>Sed-&sed-version;</title>
-
-  <indexterm zone="ch-temp-system-sed">
-    <primary sortas="a-Sed">Sed</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/sed.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Sed</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sed.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sed.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sed.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-	
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sed.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/sed.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-sed" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/tar.xml
===================================================================
--- BOOK/temp-system/multilib/tar.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,67 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-tar" role="wrap">
-  <?dbhtml filename="tar.html"?>
-
-  <title>Tar-&tar-version;</title>
-
-  <indexterm zone="ch-temp-system-tar">
-    <primary sortas="a-Tar">Tar</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/tar.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Tar</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='c1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='c2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --build=${CLFS_HOST} --host=${CLFS_TARGET} \
-   --cache-file=config.cache</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tar.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-tar" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/texinfo.xml
===================================================================
--- BOOK/temp-system/multilib/texinfo.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,66 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-texinfo" role="wrap">
-  <?dbhtml filename="texinfo.html"?>
-
-  <title>Texinfo-&texinfo-version;</title>
-
-  <indexterm zone="ch-temp-system-texinfo">
-    <primary sortas="a-Texinfo">Texinfo</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/texinfo.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Texinfo</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" ./configure --prefix=/tools \
-   --build=${CLFS_HOST} --host=${CLFS_TARGET}</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/texinfo.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-texinfo" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/multilib/zlib.xml
===================================================================
--- BOOK/temp-system/multilib/zlib.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,58 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-zlib" role="wrap">
-  <?dbhtml filename="zlib.html"?>
-
-  <title>Zlib-&zlib-version;</title>
-
-  <indexterm zone="ch-temp-system-zlib">
-    <primary sortas="a-Zlib">Zlib</primary>
-    <secondary>boot</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/zlib.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Zlib</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>CC="${CC} ${BUILD64}" \
-   ./configure --prefix=/tools --shared --libdir=/tools/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/zlib.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-zlib" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/ppc-chapter.xml
===================================================================
--- BOOK/temp-system/ppc-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temp-system" xreflabel="Constructing a Temporary System">
-  <?dbhtml dir="temp-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary System</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
-
-</chapter>
Index: OK/temp-system/ppc/gcc.xml
===================================================================
--- BOOK/temp-system/ppc/gcc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,133 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-temp-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/ppc/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/ppc/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/ppc/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/ppc/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/ppc/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/ppc/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/ppc/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/ppc/gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='ce'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='ck'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cl'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cn'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='co'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cp'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/ppc64-chapter.xml
===================================================================
--- BOOK/temp-system/ppc64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,36 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?> <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temp-system" xreflabel="Constructing a Temporary System">
-  <?dbhtml dir="temp-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary System</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ppc64/choose.xml"/>
-
-</chapter>
Index: OK/temp-system/ppc64/choose.xml
===================================================================
--- BOOK/temp-system/ppc64/choose.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,44 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-choose">
-  <?dbhtml filename="choose.html"?>
-
-  <title>To Boot or to Chroot?</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-  <para>Powerpc64 is slightly different from some of the other
-  architectures, because a 64-bit kernel running 32-bit userspace can
-  successfully chroot and execute 64-bit programs.  However, if the
-  kernel personality has been set to 32-bit by a utility such as
-  linux32, it will eventually fail when glibc thinks it is building
-  on a 32-bit system and tries to include incompatible assembler code
-  in the 64-bit glibc.</para>
-
-  <para>To see if you can successfully chroot to build the final powerpc64
-  system, enter the following command which tests if you are running a
-  64-bit Linux 2.6 kernel (with a 64-bit personality):</para>
-
-<screen><userinput>uname -a | grep '^Linux.*2\.6\..*ppc64' &amp;&amp; \
-    echo "ok to chroot" || echo "you must boot"</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/choose.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-</sect1>
Index: OK/temp-system/ppc64/gcc.xml
===================================================================
--- BOOK/temp-system/ppc64/gcc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,141 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-temp-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='ce'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='dd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cn'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='co'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cp'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/sparc-chapter.xml
===================================================================
--- BOOK/temp-system/sparc-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,35 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temp-system" xreflabel="Constructing a Temporary System">
-  <?dbhtml dir="temp-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary System</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
-
-</chapter>
Index: OK/temp-system/sparc/gcc.xml
===================================================================
--- BOOK/temp-system/sparc/gcc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,129 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-temp-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc/gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='ce'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='ck'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cn'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='co'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cp'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/sparc64-64-chapter.xml
===================================================================
--- BOOK/temp-system/sparc64-64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temp-system" xreflabel="Constructing a Temporary System">
-  <?dbhtml dir="temp-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary System</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64-64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
-
-</chapter>
Index: OK/temp-system/sparc64-64/gcc.xml
===================================================================
--- BOOK/temp-system/sparc64-64/gcc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,158 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-temp-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='ce'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/gcc.xml"
-    xpointer="xpointer(//*[@os='ck'])"/>
-
-    <variablelist>
-      <title>The meaning of the new configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../x86_64/gcc.xml"
-      xpointer="xpointer(//*[@os='dd1'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/gcc.xml"
-      xpointer="xpointer(//*[@os='cl1'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/gcc.xml"
-    xpointer="xpointer(//*[@os='cm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../sparc64/gcc.xml"
-    xpointer="xpointer(//*[@os='cn'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='co'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cp'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/gcc.xml"
-    xpointer="xpointer(//*[@os='dp'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64-64/gcc.xml"
-    xpointer="xpointer(//*[@os='dq'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/sparc64-chapter.xml
===================================================================
--- BOOK/temp-system/sparc64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temp-system" xreflabel="Constructing a Temporary System">
-  <?dbhtml dir="temp-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary System</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="sparc64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/choose.xml"/>
-
-</chapter>
Index: OK/temp-system/sparc64/gcc.xml
===================================================================
--- BOOK/temp-system/sparc64/gcc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,137 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-temp-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/sparc64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='ce'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='dc'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/gcc.xml"
-    xpointer="xpointer(//*[@os='cn'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='co'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cp'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/x86-chapter.xml
===================================================================
--- BOOK/temp-system/x86-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temp-system" xreflabel="Constructing a Temporary System">
-  <?dbhtml dir="temp-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary System</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
-
-</chapter>
Index: OK/temp-system/x86_64-64-chapter.xml
===================================================================
--- BOOK/temp-system/x86_64-64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temp-system" xreflabel="Constructing a Temporary System">
-  <?dbhtml dir="temp-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary System</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="64/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/choose.xml"/>
-
-</chapter>
Index: OK/temp-system/x86_64-64/gcc.xml
===================================================================
--- BOOK/temp-system/x86_64-64/gcc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,160 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-temp-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64-64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='ce'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cg'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='da'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../x86_64/gcc.xml"
-    xpointer="xpointer(//*[@os='db'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="ck"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-    ../gcc-&gcc-version;/configure --prefix=/tools --disable-multilib \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-    --libexecdir=/tools/lib --with-local-prefix=/tools --enable-long-long \
-    --enable-c99 --enable-shared --enable-threads=posix --disable-nls \
-    --enable-__cxa_atexit --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
-
-    <variablelist>
-      <title>The meaning of the new configure options:</title>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../x86_64/gcc.xml"
-      xpointer="xpointer(//*[@os='dd1'])"/>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/gcc.xml"
-      xpointer="xpointer(//*[@os='cl1'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cn'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='co'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cp'])"/>
-
-   <para os="dp">Now we copy the files that are placed in <filename class="directory">/tools/lib64
-   </filename> to <filename class="directory">/tools/lib</filename>.
-    We also delete the /tools/lib64 directory:</para>
-
-<screen os="dq"><userinput>cp -va /tools/lib64/* /tools/lib
-rm -rvf /tools/lib64</userinput></screen>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/temp-system/x86_64-chapter.xml
===================================================================
--- BOOK/temp-system/x86_64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,37 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-temp-system" xreflabel="Constructing a Temporary System">
-  <?dbhtml dir="temp-system"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing a Temporary System</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/variables.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/binutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/ncurses.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bash.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/bzip2.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/coreutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/diffutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/findutils.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/zlib.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/file.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gawk.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gettext.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/grep.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/gzip.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/make.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/patch.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/sed.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tar.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/texinfo.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/choose.xml"/>
-
-</chapter>
Index: OK/temp-system/x86_64/gcc.xml
===================================================================
--- BOOK/temp-system/x86_64/gcc.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,156 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-temp-system-gcc" role="wrap">
-  <?dbhtml filename="gcc.html"?>
-
-  <title>GCC-&gcc-version;</title>
-
-  <indexterm zone="ch-temp-system-gcc">
-    <primary sortas="a-GCC">GCC</primary>
-    <secondary>temporary system</secondary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../../final-system/common/gcc.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of GCC</title>
-
-<!--
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
--->
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p3'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='p4'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ac'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ad'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='ae'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../cross-tools/x86_64/gcc-static.xml"
-    xpointer="xpointer(//*[@os='af'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cd'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='ce'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cf'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cg'])"/>
-
-    <para os="da">When searching for the multilibs, force the build to use the
-    results of <option>--print-multi-lib</option> from our cross-compiler,
-    not the native compiler <command>gcc</command> builds now:</para>
-
-<screen os="db"><userinput>cp -v gcc/Makefile.in{,.orig2}
-sed -e "/MULTILIBS/s@\$(GCC_FOR_TARGET)@/cross-tools/bin/${CC}@g" \
-   gcc/Makefile.in.orig2 > gcc/Makefile.in</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cj'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../../final-system/common/gcc.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-<screen os="dc"><userinput>CC="${CC} ${BUILD64}" CXX="${CXX} ${BUILD64}" \
-    ../gcc-&gcc-version;/configure --prefix=/tools --libdir=/tools/lib64 \
-    --build=${CLFS_HOST} --host=${CLFS_TARGET} --target=${CLFS_TARGET} \
-    --with-local-prefix=/tools --enable-long-long --enable-c99 \
-    --enable-shared --enable-threads=posix --enable-__cxa_atexit \
-    --disable-nls --enable-languages=c,c++ --disable-libstdcxx-pch</userinput></screen>
-
-    <variablelist os="dd">
-      <title>The meaning of the new configure options:</title>
-
-      <varlistentry os="dd1">
-        <term><parameter>CXX="${CXX} ${BUILD64}"</parameter></term>
-        <listitem>
-          <para>This forces the C++ compiler to use our 64 Bit flags.</para>
-        </listitem>
-      </varlistentry>
-
-      <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-      href="../common/gcc.xml"
-      xpointer="xpointer(//*[@os='cl1'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cm'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cn'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='co'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/gcc.xml"
-    xpointer="xpointer(//*[@os='cp'])"/>
-
-  </sect2>
-
-  <sect2 role="content">
-    <title/>
-
-    <para>Details on this package are located in <xref
-    linkend="contents-gcc" role="."/></para>
-
-  </sect2>
-
-</sect1>
Index: OK/testsuite-tools/alpha-chapter.xml
===================================================================
--- BOOK/testsuite-tools/alpha-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
-  <?dbhtml dir="testsuite-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Testsuite Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
-
-</chapter>
Index: OK/testsuite-tools/common/dejagnu.xml
===================================================================
--- BOOK/testsuite-tools/common/dejagnu.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-testsuite-tools-dejagnu" role="wrap">
-  <?dbhtml filename="dejagnu.html"?>
-
-  <title>DejaGNU-&dejagnu-version;</title>
-
-  <indexterm zone="ch-testsuite-tools-dejagnu">
-    <primary sortas="a-DejaGNU">DejaGNU</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The DejaGNU package contains a framework for testing other
-    programs.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of DejaGNU</title>
-
-    <para os="a">Prepare DejaGNU for compilation:</para>
-
-<screen os="b"><userinput>./configure --prefix=/tools</userinput></screen>
-
-    <para os="c">Build and install the package:</para>
-
-<screen os="d"><userinput>make install</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-dejagnu" role="content">
-    <title>Contents of DejaGNU</title>
-
-    <segmentedlist>
-      <segtitle>Installed program</segtitle>
-
-      <seglistitem>
-        <seg>runtest</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="runtest">
-        <term><command>runtest</command></term>
-        <listitem>
-          <para>A wrapper script that locates the proper
-          <command>expect</command> shell and then runs DejaGNU</para>
-          <indexterm zone="ch-testsuite-tools-dejagnu runtest">
-            <primary sortas="b-runtest">runtest</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/testsuite-tools/common/expect.xml
===================================================================
--- BOOK/testsuite-tools/common/expect.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,133 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-testsuite-tools-expect" role="wrap">
-  <?dbhtml filename="expect.html"?>
-
-  <title>Expect-&expect-version;</title>
-
-  <indexterm zone="ch-testsuite-tools-expect">
-    <primary sortas="a-Expect">Expect</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Expect package contains a program for carrying out scripted
-    dialogues with other interactive programs.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Expect</title>
-
-    <para os="s1">The following sed tells <command>configure</command> to look
-    for libraries in ${libdir}, not just in /tools/lib:</para>
-
-<screen os="s2"><userinput>sed -i '/EXP_LIB_SPEC=/s@${exec_prefix}/lib@${libdir}@' configure</userinput></screen>
-
-    <para os="a">Fix a bug that can result in false failures during the GCC
-    test suite run:</para>
-
-<screen os="b"><userinput>patch -Np1 -i ../&expect-spawn-patch;</userinput></screen>
-
-    <para os="c">Now prepare Expect for compilation:</para>
-
-<screen os="d"><userinput>./configure --prefix=/tools --with-tcl=/tools/lib \
-    --with-tclinclude=/tools/include</userinput></screen>
-
-    <variablelist os="e">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry os="e1">
-        <term><parameter>--with-tcl=/tools/lib</parameter></term>
-        <listitem>
-          <para>This ensures that the configure script finds the Tcl
-          installation in the temporary testsuite-tools location.</para>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry os="e2">
-        <term><parameter>--with-tclinclude=/tools/include</parameter></term>
-        <listitem>
-          <para>This explicitly tells Expect where to find Tcl's internal headers.
-           Using this option avoids conditions
-          where <command>configure</command> fails because it cannot
-          automatically discover the location of the Tcl source directory.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-    <para os="f">Build the package:</para>
-
-<screen os="g"><userinput>make</userinput></screen>
-
-    <para os="i">Install the package:</para>
-
-<screen os="j"><userinput>make SCRIPTS="" install</userinput></screen>
-
-    <variablelist os="k">
-      <title>The meaning of the make parameter:</title>
-
-      <varlistentry>
-        <term><parameter>SCRIPTS=""</parameter></term>
-        <listitem>
-          <para>This prevents installation of the supplementary expect
-          scripts, which are not needed.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-  <sect2 id="contents-expect" role="content">
-    <title>Contents of Expect</title>
-
-    <segmentedlist>
-      <segtitle>Installed program</segtitle>
-      <segtitle>Installed library</segtitle>
-
-      <seglistitem>
-        <seg>expect</seg>
-        <seg>libexpect-&expect-lib-version;.a</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="expect">
-        <term><command>expect</command></term>
-        <listitem>
-          <para>Communicates with other interactive programs according
-          to a script</para>
-          <indexterm zone="ch-testsuite-tools-expect expect">
-            <primary sortas="b-expect">expect</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libexpect">
-        <term><filename class="libraryfile">libexpect-&expect-lib-version;.a</filename></term>
-        <listitem>
-          <para>Contains functions that allow Expect to be used as a Tcl
-          extension or to be used directly from C or C++ (without Tcl)</para>
-          <indexterm zone="ch-testsuite-tools-expect libexpect">
-            <primary sortas="c-libexpect-&expect-lib-version;">libexpect-&expect-lib-version;</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/testsuite-tools/common/introduction.xml
===================================================================
--- BOOK/testsuite-tools/common/introduction.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-testsuite-tools-introduction">
-  <?dbhtml filename="introduction.html"?>
-
-  <title>Introduction</title>
-
-  <para>This chapter builds the tools needed to run the tests
-  that the packages have. I.e., <command>make check</command>. Tcl, Expect,
-  and DejaGNU are needed for the GCC and Binutils testsuites, and Tree
-  is used by the Udev testsuite. Installing four packages for testing purposes
-  may seem excessive, but it is very reassuring, if not essential, to know
-  that the most important tools are working properly.</para>
-
-</sect1>
Index: OK/testsuite-tools/common/tcl.xml
===================================================================
--- BOOK/testsuite-tools/common/tcl.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,103 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-testsuite-tools-tcl" role="wrap">
-  <?dbhtml filename="tcl.html"?>
-
-  <title>Tcl-&tcl-version;</title>
-
-  <indexterm zone="ch-testsuite-tools-tcl">
-    <primary sortas="a-Tcl">Tcl</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Tcl package contains the Tool Command Language.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Tcl</title>
-
-    <para os="a">Prepare Tcl for compilation:</para>
-
-<screen><userinput>cd unix
-./configure --prefix=/tools</userinput></screen>
-
-    <para os="c">Build the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
-    <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make install</userinput></screen>
-
-    <para os="g">Tcl's private header files are needed for the next
-    package, Expect. Install them into /tools:</para>
-
-<screen os="h"><userinput>make install-private-headers</userinput></screen>
-
-    <para os="i">Now make a necessary symbolic link:</para>
-
-<screen os="j"><userinput>ln -sv tclsh8.4 /tools/bin/tclsh</userinput></screen>
-
-  </sect2>
-
-  <sect2 id="contents-tcl" role="content">
-    <title>Contents of Tcl</title>
-
-    <segmentedlist>
-      <segtitle>Installed programs</segtitle>
-      <segtitle>Installed library</segtitle>
-
-      <seglistitem>
-        <seg>tclsh (link to tclsh8.4) and tclsh8.4</seg>
-        <seg>libtcl8.4.so</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="tclsh8.4">
-        <term><command>tclsh8.4</command></term>
-        <listitem>
-          <para>The Tcl command shell</para>
-          <indexterm zone="ch-testsuite-tools-tcl tclsh8.4">
-            <primary sortas="b-tclsh8.4">tclsh8.4</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="tclsh">
-        <term><command>tclsh</command></term>
-        <listitem>
-          <para>A link to tclsh8.4</para>
-          <indexterm zone="ch-testsuite-tools-tcl tclsh">
-            <primary sortas="b-tclsh">tclsh</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libtcl8.4.so">
-        <term><filename class="libraryfile">libtcl8.4.so</filename></term>
-        <listitem>
-          <para>The Tcl library</para>
-          <indexterm zone="ch-testsuite-tools-tcl libtcl8.4.so">
-            <primary sortas="c-libtcl8.4.so">libtcl8.4.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/testsuite-tools/common/tree.xml
===================================================================
--- BOOK/testsuite-tools/common/tree.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,81 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-testsuite-tools-tree" role="wrap">
-  <?dbhtml filename="tree.html"?>
-
-  <title>Tree-&tree-version;</title>
-
-  <indexterm zone="ch-testsuite-tools-tree">
-    <primary sortas="a-Tree">Tree</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Tree package contains a program that lists the directory
-    structure in a graphical "tree" format. It is used by Udev for
-    failures in its testsuite.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Tree</title>
-
-    <para os="a">Compile the package:</para>
-
-<screen os="b"><userinput>make</userinput></screen>
-
-    <para os="c">Install the package:</para>
-
-<screen os="d"><userinput>make prefix=/tools install</userinput></screen>
-
-    <variablelist os="e">
-      <title>The meaning of the make parameters:</title>
-
-      <varlistentry os="e1">
-        <term><parameter>prefix=/tools</parameter></term>
-        <listitem>
-          <para>This overrides the default prefix of /usr in the Makefile.</para>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-  <sect2 id="contents-tree" role="content">
-    <title>Contents of Tree</title>
-
-    <segmentedlist>
-      <segtitle>Installed program</segtitle>
-
-      <seglistitem>
-        <seg>tree</seg>
-      </seglistitem>
-    </segmentedlist>
-
-    <variablelist>
-      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
-      <?dbfo list-presentation="list"?>
-      <?dbhtml list-presentation="table"?>
-
-      <varlistentry id="tree">
-        <term><command>tree</command></term>
-        <listitem>
-          <para>Tree will list contents of directories in a tree-like format.</para>
-          <indexterm zone="ch-testsuite-tools-tree tree">
-            <primary sortas="b-tree">tree</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-    </variablelist>
-
-  </sect2>
-
-</sect1>
Index: OK/testsuite-tools/mips-chapter.xml
===================================================================
--- BOOK/testsuite-tools/mips-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
-  <?dbhtml dir="testsuite"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Testsuite Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
-
-</chapter>
Index: OK/testsuite-tools/mips/expect.xml
===================================================================
--- BOOK/testsuite-tools/mips/expect.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,87 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-testsuite-tools-expect" role="wrap">
-  <?dbhtml filename="expect.html"?>
-
-  <title>Expect-&expect-version;</title>
-
-  <indexterm zone="ch-testsuite-tools-expect">
-    <primary sortas="a-Expect">Expect</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Expect package contains a program for carrying out scripted
-    dialogues with other interactive programs.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Expect</title>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <para os="p1">This patch updates <filename>config.guess</filename> and
-    <filename>config.sub</filename> for MIPS processors:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&expect-config_update-patch;</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='k'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/expect.xml"
-  xpointer="xpointer(id('contents-expect'))"/>
-
-</sect1>
Index: OK/testsuite-tools/mips64-64-chapter.xml
===================================================================
--- BOOK/testsuite-tools/mips64-64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
-  <?dbhtml dir="testsuite-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Testsuite Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
-
-</chapter>
Index: OK/testsuite-tools/mips64-chapter.xml
===================================================================
--- BOOK/testsuite-tools/mips64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
-  <?dbhtml dir="testsuite"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Testsuite Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips64/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tree.xml"/>
-
-</chapter>
Index: OK/testsuite-tools/mips64/expect.xml
===================================================================
--- BOOK/testsuite-tools/mips64/expect.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,95 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-testsuite-tools-expect" role="wrap">
-  <?dbhtml filename="expect.html"?>
-
-  <title>Expect-&expect-version;</title>
-
-  <indexterm zone="ch-testsuite-tools-expect">
-    <primary sortas="a-Expect">Expect</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/expect.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Expect</title>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/expect.xml"
-    xpointer="xpointer(//*[@os='p1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../mips/expect.xml"
-    xpointer="xpointer(//*[@os='p2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools \
-   --with-tcl=/tools/lib64 --with-tclinclude=/tools/include  \
-   --libdir=/tools/lib64</userinput></screen>
-
-    <variablelist os="e">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry os="e1">
-        <term><parameter>--with-tcl=/tools/lib64</parameter></term>
-        <listitem>
-          <para>This ensures that the configure script finds the Tcl
-          installation in the temporary tools location.</para>
-        </listitem>
-      </varlistentry>
-
-       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-        href="../common/expect.xml"
-        xpointer="xpointer(//*[@os='e2'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/expect.xml"
-  xpointer="xpointer(id('contents-expect'))"/>
-
-</sect1>
Index: OK/testsuite-tools/multilib/expect.xml
===================================================================
--- BOOK/testsuite-tools/multilib/expect.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,87 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-testsuite-tools-expect" role="wrap">
-  <?dbhtml filename="expect.html"?>
-
-  <title>Expect-&expect-version;</title>
-
-  <indexterm zone="ch-testsuite-tools-expect">
-    <primary sortas="a-Expect">Expect</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/expect.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Expect</title>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-<screen os="d"><userinput>CC="gcc ${BUILD64}" ./configure --prefix=/tools \
-   --with-tcl=/tools/lib64 --with-tclinclude=/tools/include  \
-   --libdir=/tools/lib64</userinput></screen>
-
-    <variablelist os="e">
-      <title>The meaning of the configure options:</title>
-
-      <varlistentry os="e1">
-        <term><parameter>--with-tcl=/tools/lib64</parameter></term>
-        <listitem>
-          <para>This ensures that the configure script finds the Tcl
-          installation in the temporary tools location.</para>
-        </listitem>
-      </varlistentry>
-
-       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-        href="../common/expect.xml"
-        xpointer="xpointer(//*[@os='e2'])"/>
-
-    </variablelist>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/expect.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/expect.xml"
-  xpointer="xpointer(id('contents-expect'))"/>
-
-</sect1>
Index: OK/testsuite-tools/multilib/tcl.xml
===================================================================
--- BOOK/testsuite-tools/multilib/tcl.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,69 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-testsuite-tools-tcl" role="wrap">
-  <?dbhtml filename="tcl.html"?>
-
-  <title>Tcl-&tcl-version;</title>
-
-  <indexterm zone="ch-testsuite-tools-tcl">
-    <primary sortas="a-Tcl">Tcl</primary>
-  </indexterm>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/tcl.xml"
-  xpointer="xpointer(//*[@role='package'])"/>
-
-  <sect2 role="installation">
-    <title>Installation of Tcl</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>cd unix
-CC="gcc ${BUILD64}" ./configure --prefix=/tools --libdir=/tools/lib64</userinput></screen>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='f'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='g'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='h'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='i'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tcl.xml"
-    xpointer="xpointer(//*[@os='j'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/tcl.xml"
-  xpointer="xpointer(id('contents-tcl'))"/>
-
-</sect1>
Index: OK/testsuite-tools/multilib/tree.xml
===================================================================
--- BOOK/testsuite-tools/multilib/tree.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,53 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-testsuite-tools-tree" role="wrap">
-  <?dbhtml filename="tree.html"?>
-
-  <title>Tree-&tree-version;</title>
-
-  <indexterm zone="ch-testsuite-tools-tree">
-    <primary sortas="a-Tree">Tree</primary>
-  </indexterm>
-
-  <sect2 role="package">
-    <title/>
-
-    <para>The Tree package contains a program that lists the directory
-    structure in a graphical "tree" format. It is used by Udev for
-    failures in its testsuite.</para>
-
-  </sect2>
-
-  <sect2 role="installation">
-    <title>Installation of Tree</title>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tree.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
-
-<screen os="b"><userinput>make CC="gcc ${BUILD64}"</userinput></screen>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tree.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tree.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
-
-   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-    href="../common/tree.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
-
-  </sect2>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
-  href="../common/tree.xml"
-  xpointer="xpointer(id('contents-tree'))"/>
-
-</sect1>
Index: OK/testsuite-tools/ppc-chapter.xml
===================================================================
--- BOOK/testsuite-tools/ppc-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
-  <?dbhtml dir="testsuite-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Testsuite Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
-
-</chapter>
Index: OK/testsuite-tools/ppc64-chapter.xml
===================================================================
--- BOOK/testsuite-tools/ppc64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
-  <?dbhtml dir="testsuite-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Testsuite Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tree.xml"/>
-
-</chapter>
Index: OK/testsuite-tools/sparc-chapter.xml
===================================================================
--- BOOK/testsuite-tools/sparc-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
-  <?dbhtml dir="testsuite-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Testsuite Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
-
-</chapter>
Index: OK/testsuite-tools/sparc64-64-chapter.xml
===================================================================
--- BOOK/testsuite-tools/sparc64-64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
-  <?dbhtml dir="testsuite-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Testsuite Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
-
-</chapter>
Index: OK/testsuite-tools/sparc64-chapter.xml
===================================================================
--- BOOK/testsuite-tools/sparc64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
-  <?dbhtml dir="testsuite-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Testsuite Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tree.xml"/>
-
-</chapter>
Index: OK/testsuite-tools/x86-chapter.xml
===================================================================
--- BOOK/testsuite-tools/x86-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
-  <?dbhtml dir="testsuite-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Testsuite Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
-
-</chapter>
Index: OK/testsuite-tools/x86_64-64-chapter.xml
===================================================================
--- BOOK/testsuite-tools/x86_64-64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
-  <?dbhtml dir="testsuite-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Testsuite Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/tree.xml"/>
-
-</chapter>
Index: OK/testsuite-tools/x86_64-chapter.xml
===================================================================
--- BOOK/testsuite-tools/x86_64-chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-testsuite-tools" xreflabel="Constructing Testsuite Tools">
-  <?dbhtml dir="testsuite-tools"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>Constructing Testsuite Tools</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tcl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/expect.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dejagnu.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="multilib/tree.xml"/>
-
-</chapter>
Index: OK/the-end/chapter.xml
===================================================================
--- BOOK/the-end/chapter.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,19 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<chapter id="chapter-finalizing" xreflabel="The End">
-  <?dbhtml dir="the-end"?>
-  <?dbhtml filename="chapter.html"?>
-
-  <title>The End</title>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="theend.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="getcounted.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="reboot.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="whatnow.xml"/>
-
-</chapter>
Index: OK/the-end/getcounted.xml
===================================================================
--- BOOK/the-end/getcounted.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,18 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-finish-getcounted">
-  <?dbhtml filename="getcounted.html"?>
-
-  <title>Get Counted</title>
-
-  <para>Now that you have finished the book, do you want to be counted
-  as a CLFS user? Head over to <ulink
-  url="&lfs-root;cgi-bin/lfscounter.cgi"/> and register as a CLFS user
-  by entering your name and the first CLFS version you have used.</para>
-
-</sect1>
Index: OK/the-end/reboot.xml
===================================================================
--- BOOK/the-end/reboot.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,66 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-finish-reboot">
-  <?dbhtml filename="reboot.html"?>
-
-  <title>Rebooting the System</title>
-
-  <para>If you built your final system using the boot method, just run
-  <command>shutdown -r now</command> to reboot again, using your newly-built
-  kernel instead of the miminal one currently in use. If you chrooted,
-  there are a few more steps.</para>
-
-  <para>The system you have created in this book is quite minimal, and most
-  likely will not have the functionality you would need to be able to
-  continue forward. By installing a few extra packages from the BLFS
-  book while still in our current chroot environment, you can leave
-  yourself in a much better position to continue on once you reboot
-  into your new CLFS installation. Installing a text mode web browser,
-  such as Lynx, you can easily view the BLFS book in one virtual terminal,
-  while building packages in another. The GPM package will also allow you
-  to perform copy/paste actions in your virtual terminals. Lastly, if you
-  are in a situation where static IP configuration does not meet your
-  networking requirements, installing packages such as Dhcpcd or PPP at
-  this point might also be useful.</para>
-
-  <para>Now that we have said that, lets move on to booting our shiny
-  new CLFS installation for the first time! First exit from the chroot
-  environment:</para>
-
-<screen><userinput>logout</userinput></screen>
-
-  <para>Then unmount the virtual file systems:</para>
-
-<screen><userinput>umount ${CLFS}/dev/pts
-umount ${CLFS}/dev/shm
-umount ${CLFS}/dev
-umount ${CLFS}/proc
-umount ${CLFS}/sys</userinput></screen>
-
-  <para>Unmount the CLFS file system itself:</para>
-
-<screen><userinput>umount ${CLFS}</userinput></screen>
-
-  <para>If multiple partitions were created, unmount the other
-  partitions before unmounting the main one, like this:</para>
-
-<screen><userinput>umount ${CLFS}/usr
-umount ${CLFS}/home
-umount ${CLFS}</userinput></screen>
-
-  <para>Now, reboot the system with:</para>
-
-<screen><userinput>shutdown -r now</userinput></screen>
-
-  <para>Assuming the boot loader was set up as outlined earlier,
-  <emphasis>CLFS &version;</emphasis> will boot automatically.</para>
-
-  <para>When the reboot is complete, the CLFS system is ready for use and
-  more software may be added to suit your needs.</para>
-
-</sect1>
Index: OK/the-end/theend.xml
===================================================================
--- BOOK/the-end/theend.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,28 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-finish-theend">
-  <?dbhtml filename="theend.html"?>
-
-  <title>The End</title>
-
-  <indexterm zone="ch-finish-theend">
-    <primary sortas="e-/etc/clfs-release">/etc/clfs-release</primary>
-  </indexterm>
-
-  <para>Well done! The new CLFS system is installed! We wish you much
-  success with your shiny new custom-built Linux system.</para>
-
-  <para>It may be a good idea to create an
-  <filename>/etc/clfs-release</filename> file. By having this file, it is
-  very easy for you (and for us if you need to ask for help at some
-  point) to find out which CLFS version is installed on the system.
-  Create this file by running:</para>
-
-<screen><userinput>echo &version; &gt; /etc/clfs-release</userinput></screen>
-
-</sect1>
Index: OK/the-end/whatnow.xml
===================================================================
--- BOOK/the-end/whatnow.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,103 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../general.ent">
-  %general-entities;
-]>
-
-<sect1 id="ch-finish-whatnow">
-  <?dbhtml filename="whatnow.html"?>
-
-  <title>What Now?</title>
-
-  <para>Thank you for reading this CLFS book. We hope that you have
-  found this book helpful and have learned more about the system
-  creation process.</para>
-
-  <para>Now that the CLFS system is installed, you may be wondering
-  <quote>What next?</quote> To answer that question, we have compiled
-  a list of resources for you.</para>
-
-  <itemizedlist>
-
-    <listitem>
-      <para>Maintenance</para>
-
-      <para>Bugs and security notices are reported regularly for all software.
-      Since a CLFS system is compiled from source, it is up to you to keep
-      abreast of such reports.  There are several online resources that track
-      such reports, some of which are shown below:</para>
-
-      <itemizedlist>
-
-        <listitem>
-          <para>Freshmeat.net (<ulink url="http://freshmeat.net/"/>)</para>
-
-          <para>Freshmeat can notify you (via email) of new versions of
-          packages installed on your system.</para>
-        </listitem>
-
-        <listitem>
-          <para><ulink url="http://www.cert.org/">CERT</ulink> (Computer
-          Emergency Response Team)</para>
-
-          <para>CERT has a mailing list that publishes security alerts
-          concerning various operating systems and applications.
-          Subscription information is available at <ulink
-          url="http://www.us-cert.gov/cas/signup.html"/>.</para>
-        </listitem>
-
-        <listitem>
-          <para>Bugtraq</para>
-
-          <para>Bugtraq is a full-disclosure computer security mailing list.
-          It publishes newly discovered security issues, and occasionally
-          potential fixes for them. Subscription information is available at
-          <ulink url="http://www.securityfocus.com/archive"/>.</para>
-        </listitem>
-
-      </itemizedlist>
-
-    </listitem>
-
-    <listitem>
-      <para>Community Driven Beyond Linux From Scratch</para>
-
-      <para>The Community Driven Beyond Linux From Scratch wiki covers installation
-      procedures for a wide range of software beyond the scope of the CLFS
-      Book. CBLFS is designed specifically to work with the CLFS book, and has all
-      the necessary information to continue the builds in the same manner that CLFS
-      uses. This is a community driven project, which means anyone can contribute and
-      provide updates. The CBLFS project is located at <ulink url="&cblfs-root;"/>.</para>
-    </listitem>
-
-    <listitem>
-      <para>CLFS Hints</para>
-
-      <para>The CLFS Hints are a collection of educational documents
-      submitted by volunteers in the CLFS community. The hints are available
-      at <ulink url="&hints-root;"/>.</para>
-    </listitem>
-
-    <listitem>
-      <para>Mailing lists</para>
-
-      <para>There are several CLFS mailing lists you may subscribe to if you
-      are in need of help, want to stay current with the latest developments,
-      want to contribute to the project, and more. See <xref
-      linkend="ch-intro-maillists"/> for more
-      information.</para>
-    </listitem>
-
-    <listitem>
-      <para>The Linux Documentation Project</para>
-
-      <para>The goal of The Linux Documentation Project (TLDP) is to
-      collaborate on all of the issues of Linux documentation. The TLDP features
-      a large collection of HOWTOs, guides, and man pages.  It is located at
-      <ulink url="http://www.tldp.org/"/>.</para>
-    </listitem>
-
-  </itemizedlist>
-
-</sect1>
Index: OK/tidy.conf
===================================================================
--- BOOK/tidy.conf	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,18 +1,0 @@
-indent-spaces: 2
-wrap: 78
-tab-size: 8
-input-encoding: latin1
-output-encoding: latin1
-newline: CRLF
-write-back: yes
-markup: yes
-indent: yes
-hide-endtags: no
-uppercase-tags: no
-logical-emphasis: no
-drop-font-tags: no
-tidy-mark: no
-numeric-entities: no
-show-warnings: no
-quiet: yes
-newline: LF
Index: OK/x86-index.xml
===================================================================
--- BOOK/x86-index.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,84 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "general.ent">
-  %general-entities;
-]>
-
-<book>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/x86/bookinfo.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/dedication.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/preface.xml"/>
-
-  <part id="part1">
-    <?dbhtml filename="part1.html"?>
-
-    <title>Introduction</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="introduction/x86-chapter.xml"/>
-
-  </part>
-
-  <part id="part2">
-    <?dbhtml filename="part2.html"?>
-
-    <title>Preparing for the Build</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="partitioning/x86-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="materials/x86-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-preps/chapter.xml"/>
-
-  </part>
-
-  <part id="part3">
-    <?dbhtml filename="part3.html"?>
-
-    <title>Make the Cross-Compile Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cross-tools/x86-chapter.xml"/>
-
-  </part>
-
-  <part id="part4">
-    <?dbhtml filename="part4.html"?>
-
-    <title>Building the Basic Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="temp-system/x86-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="boot/x86-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="chroot/x86-chapter.xml"/>
-
-  </part>
-
-  <part id="part5">
-    <?dbhtml filename="part5.html"?>
-
-    <title>Building the CLFS System</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/x86-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/x86-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/x86-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/x86-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>
-
-  </part>
-
-  <part id="part6">
-    <?dbhtml filename="part6.html"?>
-
-    <title>Appendices</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acknowledgments.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/x86.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/license.xml"/>
-
-  </part>
-
-  <index/>
-
-</book>
Index: OK/x86_64-64-index.xml
===================================================================
--- BOOK/x86_64-64-index.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,84 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "general.ent">
-  %general-entities;
-]>
-
-<book>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/x86_64-64/bookinfo.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/dedication.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/preface.xml"/>
-
-  <part id="part1">
-    <?dbhtml filename="part1.html"?>
-
-    <title>Introduction</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="introduction/x86_64-64-chapter.xml"/>
-
-  </part>
-
-  <part id="part2">
-    <?dbhtml filename="part2.html"?>
-
-    <title>Preparing for the Build</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="partitioning/x86-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="materials/x86_64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-preps/chapter.xml"/>
-
-  </part>
-
-  <part id="part3">
-    <?dbhtml filename="part3.html"?>
-
-    <title>Make the Cross-Compile Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cross-tools/x86_64-64-chapter.xml"/>
-
-  </part>
-
-  <part id="part4">
-    <?dbhtml filename="part4.html"?>
-
-    <title>Building the Basic Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="temp-system/x86_64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="boot/x86_64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="chroot/x86_64-64-chapter.xml"/>
-
-  </part>
-
-  <part id="part5">
-    <?dbhtml filename="part5.html"?>
-
-    <title>Building the CLFS System</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/x86_64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/x86_64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/x86_64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/x86_64-64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>
-
-  </part>
-
-  <part id="part6">
-    <?dbhtml filename="part6.html"?>
-
-    <title>Appendices</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acknowledgments.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/x86_64-64.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/license.xml"/>
-
-  </part>
-
-  <index/>
-
-</book>
Index: OK/x86_64-index.xml
===================================================================
--- BOOK/x86_64-index.xml	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,84 +1,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "general.ent">
-  %general-entities;
-]>
-
-<book>
-
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/x86_64/bookinfo.xml"/>
-  <!--
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/dedication.xml"/>
-  -->
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="prologue/preface.xml"/>
-
-  <part id="part1">
-    <?dbhtml filename="part1.html"?>
-
-    <title>Introduction</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="introduction/x86_64-chapter.xml"/>
-
-  </part>
-
-  <part id="part2">
-    <?dbhtml filename="part2.html"?>
-
-    <title>Preparing for the Build</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="partitioning/x86-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="materials/x86_64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-preps/chapter.xml"/>
-
-  </part>
-
-  <part id="part3">
-    <?dbhtml filename="part3.html"?>
-
-    <title>Make the Cross-Compile Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="cross-tools/x86_64-chapter.xml"/>
-
-  </part>
-
-  <part id="part4">
-    <?dbhtml filename="part4.html"?>
-
-    <title>Building the Basic Tools</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="temp-system/x86_64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="boot/x86_64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="chroot/x86_64-chapter.xml"/>
-
-  </part>
-
-  <part id="part5">
-    <?dbhtml filename="part5.html"?>
-
-    <title>Building the CLFS System</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="testsuite-tools/x86_64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/x86_64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/x86_64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/x86_64-chapter.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="the-end/chapter.xml"/>
-
-  </part>
-
-  <part id="part6">
-    <?dbhtml filename="part6.html"?>
-
-    <title>Appendices</title>
-
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acronymlist.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/acknowledgments.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/common.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/dependencies/x86.xml"/>
-    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="appendices/license.xml"/>
-
-  </part>
-
-  <index/>
-
-</book>
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ ChangeLog	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,4509 @@
+------------------------------------------------------------------------
+r409 | roliver | 2005-03-28 23:57:40 +1000 (Mon, 28 Mar 2005) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/blfs-packages
+
+Add blfs-packages symlink
+
+------------------------------------------------------------------------
+r408 | roliver | 2005-03-28 23:56:25 +1000 (Mon, 28 Mar 2005) | 7 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-linux-pam.sh
+   M /cross-lfs/trunk/scripts/build-blfs.sh
+
+Update build-blfs to use blfs-packages (instead of old blfs-config)
+
+Change linux-pam script to be a bash script
+Didn't have much luck with 0.78 which did not build... this will have to
+be looked at... 0.77 still works fine
+
+
+------------------------------------------------------------------------
+r407 | roliver | 2005-03-28 23:52:21 +1000 (Mon, 28 Mar 2005) | 4 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/libpng-1.2.8-link_to_proper_libs-1.patch
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-libpng.sh
+
+Update to handle newer libpng. Updated the "link_to_proper_libs" patch
+as the 1.2.7 one won't apply.
+
+
+------------------------------------------------------------------------
+r406 | roliver | 2005-03-28 23:50:23 +1000 (Mon, 28 Mar 2005) | 4 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/openssl-0.9.7f-32bit_x86_64.patch
+   A /cross-lfs/trunk/patches/openssl-0.9.7f-allow_lib64.patch
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-openssl.sh
+
+Long overdue update to openssl. Update patches for 32bit x86_64 support and
+support for setting libdir
+
+
+------------------------------------------------------------------------
+r405 | roliver | 2005-03-28 23:47:18 +1000 (Mon, 28 Mar 2005) | 3 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/patch.4.3.27.1
+   A /cross-lfs/trunk/patches/patch.4.3.27.2
+   A /cross-lfs/trunk/patches/patch.4.3.27.3
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-bdb.sh
+
+Update script to handle bdb 4.3.27, and include offical patches
+
+
+------------------------------------------------------------------------
+r404 | roliver | 2005-03-28 23:45:28 +1000 (Mon, 28 Mar 2005) | 4 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/plfs-configs/blfs-packages-20050328 (from /cross-lfs/trunk/scripts/plfs-configs/blfs-packages-20050312:402)
+
+Update blfs package versions to current, except for linux-pam which doesn't
+want to build for some reason... this to be investigated
+
+
+------------------------------------------------------------------------
+r403 | roliver | 2005-03-28 23:43:52 +1000 (Mon, 28 Mar 2005) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-mit-krb5.sh
+
+Comment cleanup
+
+------------------------------------------------------------------------
+r402 | roliver | 2005-03-28 14:51:19 +1000 (Mon, 28 Mar 2005) | 3 lines
+Changed paths:
+   D /cross-lfs/trunk/scripts/blfs-config
+   A /cross-lfs/trunk/scripts/plfs-configs/blfs-packages-20050312 (from /cross-lfs/trunk/scripts/blfs-config:400)
+
+Move blfs-config under plfs-configs dir as blfs-packages-XXXXXX
+
+
+------------------------------------------------------------------------
+r401 | roliver | 2005-03-28 14:49:46 +1000 (Mon, 28 Mar 2005) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/native-scripts/native-gettext.sh
+
+Actually remove PMFLAGS this time ;-)
+
+
+------------------------------------------------------------------------
+r400 | roliver | 2005-03-28 14:27:56 +1000 (Mon, 28 Mar 2005) | 11 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/native-scripts/native-e2fsprogs.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-e2fsprogs.sh
+
+Fix braindead error in the e2fsprogs tests for 1.37
+CFLAGS were not peing passed, hence no -I directives were in place for
+finding headers when doing tests in lib/e2p
+
+Error as below
+make[1]: Entering directory `/home/lfs/src/x86_64/e2fsprogs-1.37-build/lib/e2p'
+        LD tst_ostype
+In file included from ../../../e2fsprogs-1.37/lib/e2p/ostype.c:10:
+../../../e2fsprogs-1.37/lib/e2p/e2p.h:5:28: ext2fs/ext2_fs.h: No such file or directory
+
+
+------------------------------------------------------------------------
+r399 | roliver | 2005-03-28 09:15:59 +1000 (Mon, 28 Mar 2005) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/native-scripts/native-glibc.sh
+
+Minor cleanups
+
+
+------------------------------------------------------------------------
+r398 | roliver | 2005-03-28 09:13:51 +1000 (Mon, 28 Mar 2005) | 8 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-lfs-bootscripts.sh
+
+Updated for new lfs bootscripts package.
+Check if there is a make target for install-hotplug before attempting
+to install it, later lfs bootscripts install this by default
+
+A BIG TODO here, must take all of the network configuration out of this
+script and put it in a separate configuration file.
+
+
+------------------------------------------------------------------------
+r397 | roliver | 2005-03-28 05:57:22 +1000 (Mon, 28 Mar 2005) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/native-scripts/native-gettext.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-gettext.sh
+
+gettext-0.14.3 did not like parallel make, temporarily remove PMFLAGS
+
+
+------------------------------------------------------------------------
+r396 | roliver | 2005-03-28 05:54:04 +1000 (Mon, 28 Mar 2005) | 5 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/util-linux-2.12n-cross-lfs-fixes.patch (from /cross-lfs/trunk/patches/util-linux-2.12a-cross-lfs-fixes.patch:384)
+   M /cross-lfs/trunk/scripts/native-scripts/native-util-linux.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-util-linux.sh
+
+The util-linux-2.12a-cross-lfs-fixes.patch doesn't apply after 2.12n.
+Need to see if it is still required to add unistd.h to the list of headers
+for mount/swapon , for the moment this has been removed
+
+
+------------------------------------------------------------------------
+r395 | roliver | 2005-03-27 18:48:25 +1000 (Sun, 27 Mar 2005) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/plfs-configs/plfs-config-sparc64
+
+Fix braindead stupidity on my behalf with the sparc64 config
+
+
+------------------------------------------------------------------------
+r394 | roliver | 2005-03-27 18:45:20 +1000 (Sun, 27 Mar 2005) | 4 lines
+Changed paths:
+   A /cross-lfs/trunk/configs/kernel/linux-2.6.11-ac4-x86_64.config
+   A /cross-lfs/trunk/configs/kernel/linux-2.6.11-ac4-x86_64.config-K8VNXP
+
+Add new config for K8VNXP mobo's with 2.6.11-ac4
+-ac4 has support for GigaRAID, comes in properly as an IDE device
+
+
+------------------------------------------------------------------------
+r393 | roliver | 2005-03-27 18:35:37 +1000 (Sun, 27 Mar 2005) | 3 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-packages-20050325 (from /cross-lfs/trunk/scripts/plfs-configs/plfs-packages-20050314:384)
+   M /cross-lfs/trunk/scripts/plfs-packages
+
+Update package versions inline with current lfs testing
+
+
+------------------------------------------------------------------------
+r392 | roliver | 2005-03-27 18:28:17 +1000 (Sun, 27 Mar 2005) | 13 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/util-linux-2.12q-cramfs-1.patch
+   M /cross-lfs/trunk/scripts/native-scripts/native-util-linux.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-util-linux.sh
+
+Update util-linux scripts (haven't done so since 2.12a)
+Add patch for cramfs
+
+Submitted by: Jeremy Utley <jeremy@linuxfromscratch.org>
+Date: 2004-12-25
+Initial Package Version: 2.12p (should apply to versions back to at least k)
+Upstream Status: Not Submitted - Test Version
+Origin: Alexander Patrakov, adapted from debian build of cramfs utilities
+Description: Util-Linux fails in cramfs compilation due to changes in the
+linux-libc-headers package 2.6.9 and after.  This patch is a proper fix to the
+problem, but may in fact not be accepted upstream.
+
+
+------------------------------------------------------------------------
+r391 | roliver | 2005-03-27 18:23:58 +1000 (Sun, 27 Mar 2005) | 10 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/tar-1.15.1-sparse_fix-1.patch
+   M /cross-lfs/trunk/scripts/native-scripts/native-tar.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-tar.sh
+
+Update to keep in line with current lfs, add patch
+
+Submitted By: Jim Gifford (patches at jg555 dot com)
+Date: 2005-03-19
+Initial Package Version: 1.15.1
+Origin: Tar Bug Reports List
+Upstream Status: Applied
+Description: Fixes large file corruptions using option -S
+
+
+------------------------------------------------------------------------
+r390 | roliver | 2005-03-27 18:19:39 +1000 (Sun, 27 Mar 2005) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/native-scripts/native-gcc.sh
+
+fix braino, shouldn't supply the .patch when using apply_patch
+
+
+------------------------------------------------------------------------
+r389 | roliver | 2005-03-27 17:55:20 +1000 (Sun, 27 Mar 2005) | 12 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/shadow-4.0.7-fix_lastlog-1.patch
+   M /cross-lfs/trunk/scripts/native-scripts/native-shadow.sh
+
+Update shadow for 4.0.7 and add patch to fix lastlog
+
+Submitted By: Archaic <archaic at linuxfromscratch dot org>
+Date: 2005-03-22
+Initial Package Version: 4.0.7
+Origin: http://cvs.pld.org.pl/shadow/libmisc/log.c?r1=1.7&r2=1.8
+Upstream Status: Already in CVS
+Description: Shadow fails to update the time of last login as noted by lastlog
+when logging into a regular console. The Port (tty) column does get updated.
+Remote logins and xterm logins seem to be not be broken, just console.
+
+
+------------------------------------------------------------------------
+r388 | roliver | 2005-03-27 17:52:32 +1000 (Sun, 27 Mar 2005) | 3 lines
+Changed paths:
+   A /cross-lfs/trunk/configs/udev/udev-config-3.rules
+   M /cross-lfs/trunk/scripts/native-scripts/native-dev.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-dev.sh
+
+Update scripts to bring inline with lfs development
+
+
+------------------------------------------------------------------------
+r387 | roliver | 2005-03-25 23:06:05 +1100 (Fri, 25 Mar 2005) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/funcs/tarball-funcs.sh
+
+Fix unpack_tarball and check_tarballs to handle plain tar files
+Thanks to Matt Darcy for reporting the issue
+
+
+------------------------------------------------------------------------
+r385 | roliver | 2005-03-25 19:33:32 +1100 (Fri, 25 Mar 2005) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/ChangeLog
+   M /cross-lfs/trunk/README.cross-lfs
+   M /cross-lfs/trunk/svn_revision
+
+Update prior to tagging the 3.1.0 release
+
+
+------------------------------------------------------------------------
+r384 | roliver | 2005-03-25 19:07:57 +1100 (Fri, 25 Mar 2005) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/funcs/multiarch-funcs.sh
+
+Remove hard coded DERFAULTENV and LIBDIRENV from multiarch-funcs.sh
+These should be set in plfs-config
+
+
+------------------------------------------------------------------------
+r383 | roliver | 2005-03-25 19:04:12 +1100 (Fri, 25 Mar 2005) | 19 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/gcc-3.4.3-remove_standard_startfile_prefix_from_startfile_prefixes-1.patch
+   M /cross-lfs/trunk/scripts/native-scripts/native-gcc.sh
+
+Add a patch to solve libtool issues caused by gcc on multi-arch systems
+Probably should come up with a shorter name for the patch ;-)
+
+Submitted By: Ryan Oliver (ryan dot oliver at pha dot com dot au)
+Origin: Ryan Oliver
+Date: 2004-07-15
+Initial Package Version: 3.4.3
+Description: This patch is primarily here to fix issues with libtool when building
+        packages on a multi-arch/multilib system, as libtool effectively uses the
+        library search paths from gcc -print-search-dirs to locate .la files.
+        This poses a problem as by default gcc supplies
+                eg: /usr/lib64/gcc/x86_64-pc-linux-gnu/3.4.3/../../../
+        which following the example would cause libtool to use .la files under
+        /usr/lib64 instead of /usr/lib if building a package 32bit, and thus will
+        attempt to link in incompatible 64bit libraries.
+        Here we simply remove this path ( provided by standard_startfile_prefix )
+        from the library search order
+
+
+------------------------------------------------------------------------
+r382 | roliver | 2005-03-25 18:20:02 +1100 (Fri, 25 Mar 2005) | 2 lines
+Changed paths:
+   D /cross-lfs/trunk/scripts/plfs-configs/plfs-config-2.4.1
+   D /cross-lfs/trunk/scripts/plfs-configs/plfs-config-2.4.3-m68k
+   D /cross-lfs/trunk/scripts/plfs-configs/plfs-config-2.4.4-m68k
+   D /cross-lfs/trunk/scripts/plfs-configs/plfs-config-20040217-x86
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-config-sparc64 (from /cross-lfs/trunk/scripts/plfs-configs/plfs-config-sparc64-lfs-unstable:374)
+   D /cross-lfs/trunk/scripts/plfs-configs/plfs-config-sparc64-lfs-unstable
+   D /cross-lfs/trunk/scripts/plfs-configs/plfs-config-x86_64-lfs6.0test
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-packages-lfs-6.0 (from /cross-lfs/trunk/scripts/plfs-configs/plfs-config-x86_64-lfs6.0test:374)
+
+Finished cleanup of plfs-configs
+
+------------------------------------------------------------------------
+r381 | roliver | 2005-03-25 18:01:54 +1100 (Fri, 25 Mar 2005) | 3 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-config-hypersparc (from /cross-lfs/trunk/scripts/plfs-configs/plfs-config-sparc-solaris-sparc-linux:374)
+   D /cross-lfs/trunk/scripts/plfs-configs/plfs-config-m68k-2.4.26-RO
+   D /cross-lfs/trunk/scripts/plfs-configs/plfs-config-sparc-solaris-sparc-linux
+   D /cross-lfs/trunk/scripts/plfs-configs/plfs-config-x86_64-linux-sparc-linux
+
+More cleanups
+
+
+------------------------------------------------------------------------
+r380 | roliver | 2005-03-25 17:30:06 +1100 (Fri, 25 Mar 2005) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/plfs-configs/plfs-config-i686-lfs-5.1.1
+   M /cross-lfs/trunk/scripts/plfs-configs/plfs-config-m68k-lfs-5.1.1
+   M /cross-lfs/trunk/scripts/plfs-configs/plfs-config-powerpc64
+   M /cross-lfs/trunk/scripts/plfs-configs/plfs-config-ppc750
+   M /cross-lfs/trunk/scripts/plfs-configs/plfs-config-x86-native
+   M /cross-lfs/trunk/scripts/plfs-configs/plfs-config-x86_64-native
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-packages-lfs-5.1.1 (from /cross-lfs/trunk/scripts/plfs-configs/plfs-config-i686-lfs-5.1.1:374)
+
+Add LIBDIRENV and DEFAULTENV vars to plfs-config(s)
+Still cleaning up...
+
+
+------------------------------------------------------------------------
+r379 | roliver | 2005-03-24 01:00:25 +1100 (Thu, 24 Mar 2005) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-blfs.sh
+   M /cross-lfs/trunk/scripts/build-cross.sh
+   M /cross-lfs/trunk/scripts/build-host.sh
+   M /cross-lfs/trunk/scripts/build-native.sh
+   M /cross-lfs/trunk/scripts/build-target.sh
+   M /cross-lfs/trunk/scripts/plfs-config
+   A /cross-lfs/trunk/scripts/plfs-packages
+
+Source plfs-packages in all the wrapper scripts
+
+
+------------------------------------------------------------------------
+r378 | roliver | 2005-03-24 00:55:43 +1100 (Thu, 24 Mar 2005) | 3 lines
+Changed paths:
+   D /cross-lfs/trunk/scripts/plfs-configs/plfs-config-i686-20041101
+   D /cross-lfs/trunk/scripts/plfs-configs/plfs-config-x86_64-20040930
+   D /cross-lfs/trunk/scripts/plfs-configs/plfs-config-x86_64-native-20041021
+   D /cross-lfs/trunk/scripts/plfs-configs/plfs-config-x86_64-native-20050103
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-packages-20040930 (from /cross-lfs/trunk/scripts/plfs-configs/plfs-config-x86_64-20040930:374)
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-packages-20041021 (from /cross-lfs/trunk/scripts/plfs-configs/plfs-config-x86_64-native-20041021:374)
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-packages-20041101 (from /cross-lfs/trunk/scripts/plfs-configs/plfs-config-i686-20041101:374)
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-packages-20050103 (from /cross-lfs/trunk/scripts/plfs-configs/plfs-config-x86_64-native-20050103:374)
+
+Still splitting up the old plfs-configs...
+
+
+------------------------------------------------------------------------
+r377 | roliver | 2005-03-23 22:14:36 +1100 (Wed, 23 Mar 2005) | 3 lines
+Changed paths:
+   D /cross-lfs/trunk/scripts/plfs-configs/plfs-config-powerpc-lfs-unstable-20040620
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-config-powerpc64 (from /cross-lfs/trunk/scripts/plfs-configs/plfs-config-powerpc-lfs-unstable-20040620:374)
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-config-ppc750 (from /cross-lfs/trunk/scripts/plfs-configs/plfs-config-ppc750-20041223:374)
+   D /cross-lfs/trunk/scripts/plfs-configs/plfs-config-ppc750-20041223
+   D /cross-lfs/trunk/scripts/plfs-configs/plfs-config-x86_64-lfs-unstable-20040620
+   D /cross-lfs/trunk/scripts/plfs-configs/plfs-config-x86_64-lfs-unstable-20040801
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-packages-20041223 (from /cross-lfs/trunk/scripts/plfs-configs/plfs-config-ppc750-20041223:374)
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-packages-lfs-unstable-20040801 (from /cross-lfs/trunk/scripts/plfs-configs/plfs-config-x86_64-lfs-unstable-20040801:374)
+
+Still cleaning up configs...
+
+
+------------------------------------------------------------------------
+r376 | roliver | 2005-03-23 19:56:06 +1100 (Wed, 23 Mar 2005) | 3 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-packages-lfs-unstable-20040620 (from /cross-lfs/trunk/scripts/plfs-configs/plfs-config-x86_64-lfs-unstable-20040620:374)
+
+Split out lfs-unstable-20040620 pkgs
+
+
+------------------------------------------------------------------------
+r375 | roliver | 2005-03-22 21:33:37 +1100 (Tue, 22 Mar 2005) | 5 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-config-x86-native (from /cross-lfs/trunk/scripts/plfs-configs/plfs-config-20040217-x86:374)
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-packages-20040217 (from /cross-lfs/trunk/scripts/plfs-configs/plfs-config-20040217-x86:374)
+
+Still splitting old plfs-configs
+The plfs-packages-20040217 will be here for historic reasons, it probably wont work
+with the current scripts... but hey ;-)
+
+
+------------------------------------------------------------------------
+r374 | roliver | 2005-03-22 20:57:03 +1100 (Tue, 22 Mar 2005) | 8 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-config-x86_64-native (from /cross-lfs/trunk/scripts/plfs-configs/plfs-config-x86_64-native-20050314:372)
+   D /cross-lfs/trunk/scripts/plfs-configs/plfs-config-x86_64-native-20050314
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-packages-20050314 (from /cross-lfs/trunk/scripts/plfs-configs/plfs-config-x86_64-native-20050314:372)
+
+Initial work on splitting old plfs-config's into two files,
+one specifically for build options, the other specifically 
+for package versions (lfs ch5 + ch6).
+
+More work will need to be done with build-init etc to alter
+the used package list for lfs/blfs/other...
+
+
+------------------------------------------------------------------------
+r373 | roliver | 2005-03-22 01:37:16 +1100 (Tue, 22 Mar 2005) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/untested/kde-scripts/kde-arts.sh
+
+Update to handle new functions
+
+------------------------------------------------------------------------
+r372 | roliver | 2005-03-22 01:31:18 +1100 (Tue, 22 Mar 2005) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-libpng.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-mit-krb5.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-openssl.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-xorg.sh
+
+bug fixes from last update
+
+
+------------------------------------------------------------------------
+r371 | roliver | 2005-03-22 01:29:58 +1100 (Tue, 22 Mar 2005) | 6 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/native-scripts/native-coreutils.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-file.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-gawk.sh
+
+Missed some edits changing libdir to libdirname on prev commit.
+Also POSIX2_VERSION was not getting set with coreutils.
+May have to revert some changes with coreutils, check to see if the extra_env passing
+actually worked or not (if so, re-introduce and fix up target-coreutils too)
+
+
+------------------------------------------------------------------------
+r370 | roliver | 2005-03-22 01:26:16 +1100 (Tue, 22 Mar 2005) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/funcs/multiarch-funcs.sh
+   M /cross-lfs/trunk/scripts/funcs/stub_header-funcs.sh
+
+Minor fixups with argument checking, bug fixes
+
+------------------------------------------------------------------------
+r369 | roliver | 2005-03-21 00:09:10 +1100 (Mon, 21 Mar 2005) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-cracklib.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-linux-pam.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-tcl.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-tcp-wrappers.sh
+   M /cross-lfs/trunk/scripts/funcs/multiarch-funcs.sh
+   M /cross-lfs/trunk/scripts/funcs/stub_header-funcs.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-zlib.sh
+
+Numerous bugfixes
+Fix braino with creation of header stubs (${file} = stub header check)
+Temporarily add debugging to new funcs
+
+------------------------------------------------------------------------
+r368 | roliver | 2005-03-20 21:21:29 +1100 (Sun, 20 Mar 2005) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-bdb-32.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-cracklib-32.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-cyrus-sasl-32.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-expat-32.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-fontconfig-32.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-freetype2-32.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-libpng-32.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-linux-pam-32.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-mit-krb5-32.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-nssldap-32.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-openldap-32.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-openssl-32.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-tcl-32.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-tcp-wrappers-32.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-xorg-32.sh
+   M /cross-lfs/trunk/scripts/build-blfs.sh
+
+Update build-blfs.sh and add -32 symlinks
+
+------------------------------------------------------------------------
+r367 | roliver | 2005-03-20 21:14:02 +1100 (Sun, 20 Mar 2005) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-libpng.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-linux-pam.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-mit-krb5.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-nssldap.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-openldap.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-openssl.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-portmap.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-shadow-pam.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-tcl.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-tcp-wrappers.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-xorg.sh
+
+Update the remainder of the blfs-scripts ...
+Will need to pay attention to openssl though...
+
+
+------------------------------------------------------------------------
+r366 | roliver | 2005-03-20 19:17:49 +1100 (Sun, 20 Mar 2005) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-fontconfig.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-freetype2.sh
+
+Update to use the new multi-arch functions
+(including use of create_stub_hdrs and use_wrapper)
+
+------------------------------------------------------------------------
+r365 | roliver | 2005-03-20 19:12:24 +1100 (Sun, 20 Mar 2005) | 5 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/funcs/multiarch-funcs.sh
+
+Add 2 new functions, create_wrapper
+Sets up a wrapper script to handle the situations where we need to keep multiple
+versions of the same file (eg one for 32bit , one for 64bit , etc )
+
+
+------------------------------------------------------------------------
+r364 | roliver | 2005-03-20 16:47:34 +1100 (Sun, 20 Mar 2005) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-init.sh
+   A /cross-lfs/trunk/scripts/funcs/stub_header-funcs.sh
+
+Add functions for creating stub headers.
+
+------------------------------------------------------------------------
+r363 | roliver | 2005-03-20 16:42:06 +1100 (Sun, 20 Mar 2005) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-cracklib.sh
+   M /cross-lfs/trunk/scripts/funcs/multiarch-funcs.sh
+
+update blfs-cracklib to use multiarch funcs.
+add ARCH_LDFLAGS to setup_multiarch() (reqd by blfs-cracklib.sh)
+
+
+------------------------------------------------------------------------
+r362 | roliver | 2005-03-20 16:40:22 +1100 (Sun, 20 Mar 2005) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-bdb.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-cyrus-sasl.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-expat.sh
+
+Update to use multiarch funcs
+
+
+------------------------------------------------------------------------
+r361 | roliver | 2005-03-20 16:36:15 +1100 (Sun, 20 Mar 2005) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/native-scripts/native-flex.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-ncurses.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-shadow.sh
+
+Fix typoes
+
+
+------------------------------------------------------------------------
+r360 | roliver | 2005-03-19 23:29:41 +1100 (Sat, 19 Mar 2005) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/native-scripts/temp-binutils.sh
+
+fix type when calling set_libdirname
+
+
+------------------------------------------------------------------------
+r359 | roliver | 2005-03-15 19:14:04 +1100 (Tue, 15 Mar 2005) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/native-scripts/native-perl.sh
+   M /cross-lfs/trunk/scripts/native-scripts/temp-perl.sh
+
+Fix sed which was broken during last updates.
+Configure should now get edited correctly...
+
+------------------------------------------------------------------------
+r358 | roliver | 2005-03-15 18:47:59 +1100 (Tue, 15 Mar 2005) | 7 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/native-scripts/native-glibc.sh
+   M /cross-lfs/trunk/scripts/native-scripts/temp-tcl.sh
+
+Fix a couple of brainfarts
+
+1: typoed setup_multiarch in temp-tcl
+2: goofed and was setting --build during native glibc from ALT_ENV (unused)
+   instead of ALT_TGT (as provided by setup_multiarch).
+
+
+------------------------------------------------------------------------
+r357 | roliver | 2005-03-15 18:21:35 +1100 (Tue, 15 Mar 2005) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-native.sh
+
+Updated build-native.sh to match recent changes
+
+
+------------------------------------------------------------------------
+r356 | roliver | 2005-03-15 18:17:40 +1100 (Tue, 15 Mar 2005) | 3 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/native-scripts/native-bzip2-32.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-file-32.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-flex-32.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-gettext-32.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-glibc-32.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-libtool-32.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-ncurses-32.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-perl-32.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-procps-32.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-readline-32.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-shadow-32.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-zlib-32.sh
+   A /cross-lfs/trunk/scripts/native-scripts/temp-expect-32.sh
+   A /cross-lfs/trunk/scripts/native-scripts/temp-perl-32.sh
+   A /cross-lfs/trunk/scripts/native-scripts/temp-tcl-32.sh
+
+Add foo-32.sh -> foo.sh symlinks for native-scripts
+
+
+------------------------------------------------------------------------
+r355 | roliver | 2005-03-15 18:10:35 +1100 (Tue, 15 Mar 2005) | 6 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/native-scripts/native-bison.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-bzip2.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-e2fsprogs.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-file.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-gawk.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-groff.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-inetutils.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-iproute2.sh
+
+Finish off mods for native-scripts.
+
+Next is to go through all the scripts, setting CC w ARCH_CFLAGS for everything,
+so we do not have to rely on the compilers default output type.
+
+
+------------------------------------------------------------------------
+r354 | roliver | 2005-03-15 03:22:39 +1100 (Tue, 15 Mar 2005) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/native-scripts/native-binutils.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-findutils.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-flex.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-gcc.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-gettext.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-glibc.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-libtool.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-ncurses.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-perl.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-procps.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-readline.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-shadow.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-tar.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-zlib.sh
+   M /cross-lfs/trunk/scripts/native-scripts/temp-binutils.sh
+   M /cross-lfs/trunk/scripts/native-scripts/temp-expect.sh
+   M /cross-lfs/trunk/scripts/native-scripts/temp-perl.sh
+   M /cross-lfs/trunk/scripts/native-scripts/temp-tcl.sh
+
+Partial update of native-scripts to utilise multiarch-funcs
+(see recent changes in cross-scripts/target-scripts)
+
+------------------------------------------------------------------------
+r353 | roliver | 2005-03-14 23:04:49 +1100 (Mon, 14 Mar 2005) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-target.sh
+   A /cross-lfs/trunk/scripts/target-scripts/target-bzip2-32.sh
+   A /cross-lfs/trunk/scripts/target-scripts/target-gettext-32.sh
+   A /cross-lfs/trunk/scripts/target-scripts/target-ncurses-32.sh
+   A /cross-lfs/trunk/scripts/target-scripts/target-tcp-wrappers-32.sh
+   A /cross-lfs/trunk/scripts/target-scripts/target-zlib-32.sh
+
+create -32.sh symlinks for multi-arch builds in target-scripts.
+update build-target.sh
+
+
+------------------------------------------------------------------------
+r352 | roliver | 2005-03-14 22:56:13 +1100 (Mon, 14 Mar 2005) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-crtobjs.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-full.sh
+
+fix builddir naming when multi-arch
+
+
+------------------------------------------------------------------------
+r351 | roliver | 2005-03-14 22:53:41 +1100 (Mon, 14 Mar 2005) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-cross.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-crtobjs-32.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-full-32.sh
+
+when using set_buildenv in a script, you must have a 
+foo-${BUILDENV}.sh -> foo.sh symlink for said script.
+
+
+------------------------------------------------------------------------
+r350 | roliver | 2005-03-14 22:45:14 +1100 (Mon, 14 Mar 2005) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-hdrs.sh
+
+fix brainfart (not cd'ing into PKGDIR before unpacking linuxthreads etc
+
+------------------------------------------------------------------------
+r349 | roliver | 2005-03-14 22:41:05 +1100 (Mon, 14 Mar 2005) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-crtobjs.sh
+   M /cross-lfs/trunk/scripts/funcs/multiarch-funcs.sh
+
+Clear out debugging cruft , and stop setting extra_conf in set_libdirname
+
+------------------------------------------------------------------------
+r348 | roliver | 2005-03-14 22:36:51 +1100 (Mon, 14 Mar 2005) | 7 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-crtobjs.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-full.sh
+
+fix brainfart with setting of ALT_TGT before setup_multiarch was run.
+
+setup_multiarch clears this var when it is run, but it does not clobber
+TARGET, so we can set ALT_TGT to TARGET afterwards if ALT_TGT returns
+empty.
+
+
+------------------------------------------------------------------------
+r347 | roliver | 2005-03-14 22:32:41 +1100 (Mon, 14 Mar 2005) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-init.sh
+
+fix typo when sourcing kernel_stub_header-funcs.sh
+
+------------------------------------------------------------------------
+r346 | roliver | 2005-03-14 22:30:42 +1100 (Mon, 14 Mar 2005) | 5 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/plfs-config
+   M /cross-lfs/trunk/scripts/plfs-configs/plfs-config-x86_64-linux-sparc-linux
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-config-x86_64-native-20050314
+
+Add new x86_64 native plfs-config for testing new functions and
+repoint plfs-config symlink
+
+Update sed version in the x86_64-linux-sparc-linux plfs-config file
+
+------------------------------------------------------------------------
+r345 | roliver | 2005-03-14 18:59:00 +1100 (Mon, 14 Mar 2005) | 20 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-crtobjs.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-full.sh
+   M /cross-lfs/trunk/scripts/funcs/multiarch-funcs.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-binutils.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-bison.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-bzip2.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-e2fsprogs.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-flex.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-gcc.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-gettext.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-inetutils.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-iproute2.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-ncurses.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-procps.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-tcp-wrappers.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-zlib.sh
+
+Update cross-scripts and target-scripts to use the multiarch-funcs.
+
+This cleans up the individual scripts immeasurebly.
+Use set_buildenv only where there could be multiple symlinks to the file
+BUILDENV will default to DEFAULTENV unless the calling script was called as
+"foo-$SOMEENV.sh"
+
+set_libdirname sets the libdirname var depending if
+LIBDIRENV ( default env of the */lib dirs, set to 32/64/n32 etc )
+and BUILDENV (DEFAULTS to DEFAULTENV if not already set) match or not.
+If they match, libdirname="lib", if not a case statement is checked
+and libdirname set appropriately
+
+setup_multiarch sets up specific compiler options for multiarch builds
+
+LIBDIRENV and DEFAULTENV should ideally be set from a lookup function
+but be overridable via plfs-config, but for the moment are still hard-coded
+in funcs/multiarch-funcs.sh
+
+
+------------------------------------------------------------------------
+r344 | roliver | 2005-03-14 15:36:45 +1100 (Mon, 14 Mar 2005) | 6 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-binutils.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-final.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-shared.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-static.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-crtobjs.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-full.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-hdrs.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-kern-hdrs.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-san-kern-hdrs.sh
+
+Change BIARCH to MULTIARCH for all cross-scripts
+
+Call set_buildenv and setup_multiarch from glibc scripts
+and remove a pile of conditionals
+
+
+------------------------------------------------------------------------
+r343 | roliver | 2005-03-14 14:48:21 +1100 (Mon, 14 Mar 2005) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-init.sh
+   A /cross-lfs/trunk/scripts/funcs/multiarch-funcs.sh (from /cross-lfs/trunk/scripts/funcs/multilib-funcs.sh:342)
+   D /cross-lfs/trunk/scripts/funcs/multilib-funcs.sh
+
+Update build-init, and rename multilib-funcs.sh
+
+
+------------------------------------------------------------------------
+r342 | roliver | 2005-03-14 14:46:23 +1100 (Mon, 14 Mar 2005) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/funcs/multilib-funcs.sh
+
+Forgot to export the functions
+
+
+------------------------------------------------------------------------
+r341 | roliver | 2005-03-14 14:42:51 +1100 (Mon, 14 Mar 2005) | 9 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/funcs/multilib-funcs.sh
+
+Update multilib-funcs script
+
+BIARCh var has been replaced with MULTIARCH.
+libdir var has been replaced with libdirname.
+
+A new function, set_buildenv, will set BUILDENV depending on
+the suffix of the calling script
+
+
+------------------------------------------------------------------------
+r340 | roliver | 2005-03-14 13:26:09 +1100 (Mon, 14 Mar 2005) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/funcs/multilib-funcs.sh (from /cross-lfs/trunk/scripts/untested/blfs-scripts/funcs.sh:339)
+   D /cross-lfs/trunk/scripts/untested/blfs-scripts/funcs.sh
+
+Move multilib functions into the main area
+
+------------------------------------------------------------------------
+r339 | roliver | 2005-03-14 13:13:35 +1100 (Mon, 14 Mar 2005) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-cross.sh
+   M /cross-lfs/trunk/scripts/build-native.sh
+   M /cross-lfs/trunk/scripts/build-target.sh
+
+Add set +h to start of main wrapper scripts
+
+------------------------------------------------------------------------
+r338 | roliver | 2005-03-14 13:12:21 +1100 (Mon, 14 Mar 2005) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/host-scripts/host-coreutils-binaries.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-coreutils.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-coreutils.sh
+
+Remove POSIX_CONFORM option from coreutils build scripts
+All that remains is removing it from plfs-config*
+
+
+------------------------------------------------------------------------
+r337 | roliver | 2005-03-14 12:54:20 +1100 (Mon, 14 Mar 2005) | 5 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-init.sh
+   D /cross-lfs/trunk/scripts/funcs/build-init.sh
+
+Update build-init.sh script.
+
+This script is now just a wrapper to source functions from the 
+funcs/ directory
+
+------------------------------------------------------------------------
+r336 | roliver | 2005-03-14 12:42:36 +1100 (Mon, 14 Mar 2005) | 5 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/funcs/binutils-funcs.sh (from /cross-lfs/trunk/scripts/funcs/build-init.sh:335)
+   A /cross-lfs/trunk/scripts/funcs/kernel_stub_header-funcs.sh (from /cross-lfs/trunk/scripts/funcs/build-init.sh:335)
+   A /cross-lfs/trunk/scripts/funcs/log-funcs.sh (from /cross-lfs/trunk/scripts/funcs/build-init.sh:335)
+   A /cross-lfs/trunk/scripts/funcs/patching-funcs.sh (from /cross-lfs/trunk/scripts/funcs/build-init.sh:335)
+   A /cross-lfs/trunk/scripts/funcs/tarball-funcs.sh (from /cross-lfs/trunk/scripts/funcs/build-init.sh:335)
+
+Split out all build-init functions into separate scripts under funcs/
+
+posix2fixfile and posix2fixrecursive have been dropped.
+
+
+------------------------------------------------------------------------
+r335 | roliver | 2005-03-14 11:44:13 +1100 (Mon, 14 Mar 2005) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/funcs
+   A /cross-lfs/trunk/scripts/funcs/build-init.sh (from /cross-lfs/trunk/scripts/build-init.sh:329)
+
+Added funcs directory to split out all the functions from build-init.sh
+
+------------------------------------------------------------------------
+r334 | roliver | 2005-03-13 23:54:15 +1100 (Sun, 13 Mar 2005) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/plfs-config
+   M /cross-lfs/trunk/scripts/plfs-configs/plfs-config-sparc-solaris-sparc-linux
+
+Updates
+
+
+------------------------------------------------------------------------
+r333 | roliver | 2005-03-13 23:52:40 +1100 (Sun, 13 Mar 2005) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/host-scripts/host-autoconf.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-automake.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-binutils.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-bison.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-coreutils-binaries.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-flex.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-gawk.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-gcc.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-gettext.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-grep.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-libtool.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-m4.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-make.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-ncurses.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-patch.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-sed.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-tar.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-texinfo.sh
+
+Disable nls for host-scripts, had some issues on solaris9...
+Probably should look into building libiconv...
+
+
+------------------------------------------------------------------------
+r332 | roliver | 2005-03-13 00:55:31 +1100 (Sun, 13 Mar 2005) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/plfs-configs/plfs-config-sparc-solaris-sparc-linux
+   M /cross-lfs/trunk/scripts/plfs-configs/plfs-config-x86_64-linux-sparc-linux
+
+minor updates
+
+
+------------------------------------------------------------------------
+r331 | roliver | 2005-03-13 00:48:54 +1100 (Sun, 13 Mar 2005) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/plfs-configs/plfs-config-sparc-solaris-sparc-linux
+   M /cross-lfs/trunk/scripts/plfs-configs/plfs-config-x86_64-linux-sparc-linux
+
+updates
+
+
+------------------------------------------------------------------------
+r330 | roliver | 2005-03-13 00:35:02 +1100 (Sun, 13 Mar 2005) | 4 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-config-sparc-solaris-sparc-linux
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-config-x86_64-linux-sparc-linux
+
+two more plfs-configs, used for a solaris-linux cross-build on a SS20
+(using distcc)
+
+
+------------------------------------------------------------------------
+r329 | roliver | 2005-03-13 00:10:58 +1100 (Sun, 13 Mar 2005) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/plfs-config
+   D /cross-lfs/trunk/scripts/plfs-config-2.4.1
+   D /cross-lfs/trunk/scripts/plfs-config-2.4.3-m68k
+   D /cross-lfs/trunk/scripts/plfs-config-2.4.4-m68k
+   D /cross-lfs/trunk/scripts/plfs-config-20040217-x86
+   D /cross-lfs/trunk/scripts/plfs-config-i686-20041101
+   D /cross-lfs/trunk/scripts/plfs-config-i686-lfs-5.1.1
+   D /cross-lfs/trunk/scripts/plfs-config-m68k-2.4.26-RO
+   D /cross-lfs/trunk/scripts/plfs-config-m68k-lfs-5.1.1
+   D /cross-lfs/trunk/scripts/plfs-config-powerpc-lfs-unstable-20040620
+   D /cross-lfs/trunk/scripts/plfs-config-ppc750-20041223
+   D /cross-lfs/trunk/scripts/plfs-config-sparc64-lfs-unstable
+   D /cross-lfs/trunk/scripts/plfs-config-x86_64-20040930
+   D /cross-lfs/trunk/scripts/plfs-config-x86_64-lfs-unstable-20040620
+   D /cross-lfs/trunk/scripts/plfs-config-x86_64-lfs-unstable-20040801
+   D /cross-lfs/trunk/scripts/plfs-config-x86_64-lfs6.0test
+   D /cross-lfs/trunk/scripts/plfs-config-x86_64-native-20041021
+   D /cross-lfs/trunk/scripts/plfs-config-x86_64-native-20050103
+   A /cross-lfs/trunk/scripts/plfs-configs
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-config-2.4.1 (from /cross-lfs/trunk/scripts/plfs-config-2.4.1:328)
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-config-2.4.3-m68k (from /cross-lfs/trunk/scripts/plfs-config-2.4.3-m68k:328)
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-config-2.4.4-m68k (from /cross-lfs/trunk/scripts/plfs-config-2.4.4-m68k:328)
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-config-20040217-x86 (from /cross-lfs/trunk/scripts/plfs-config-20040217-x86:328)
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-config-i686-20041101 (from /cross-lfs/trunk/scripts/plfs-config-i686-20041101:328)
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-config-i686-lfs-5.1.1 (from /cross-lfs/trunk/scripts/plfs-config-i686-lfs-5.1.1:328)
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-config-m68k-2.4.26-RO (from /cross-lfs/trunk/scripts/plfs-config-m68k-2.4.26-RO:328)
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-config-m68k-lfs-5.1.1 (from /cross-lfs/trunk/scripts/plfs-config-m68k-lfs-5.1.1:328)
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-config-powerpc-lfs-unstable-20040620 (from /cross-lfs/trunk/scripts/plfs-config-powerpc-lfs-unstable-20040620:328)
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-config-ppc750-20041223 (from /cross-lfs/trunk/scripts/plfs-config-ppc750-20041223:328)
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-config-sparc64-lfs-unstable (from /cross-lfs/trunk/scripts/plfs-config-sparc64-lfs-unstable:328)
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-config-x86_64-20040930 (from /cross-lfs/trunk/scripts/plfs-config-x86_64-20040930:328)
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-config-x86_64-lfs-unstable-20040620 (from /cross-lfs/trunk/scripts/plfs-config-x86_64-lfs-unstable-20040620:328)
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-config-x86_64-lfs-unstable-20040801 (from /cross-lfs/trunk/scripts/plfs-config-x86_64-lfs-unstable-20040801:328)
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-config-x86_64-lfs6.0test (from /cross-lfs/trunk/scripts/plfs-config-x86_64-lfs6.0test:328)
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-config-x86_64-native-20041021 (from /cross-lfs/trunk/scripts/plfs-config-x86_64-native-20041021:328)
+   A /cross-lfs/trunk/scripts/plfs-configs/plfs-config-x86_64-native-20050103 (from /cross-lfs/trunk/scripts/plfs-config-x86_64-native-20050103:328)
+
+Move plfs-configs samples to a separate subdir
+
+
+------------------------------------------------------------------------
+r327 | roliver | 2005-03-12 23:44:05 +1100 (Sat, 12 Mar 2005) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/ChangeLog
+   M /cross-lfs/trunk/README.cross-lfs
+   A /cross-lfs/trunk/svn_revision
+
+Doco updates etc prior to tag
+
+------------------------------------------------------------------------
+r326 | roliver | 2005-03-12 23:33:15 +1100 (Sat, 12 Mar 2005) | 3 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/X11R6.8.1-IncludeSharedObjectInNormalLib-1.patch
+   A /cross-lfs/trunk/patches/X11R6.8.1-fix_shared_libXau_link-1.patch
+   A /cross-lfs/trunk/patches/procps-3.2.5-fix_mips-1.patch
+   A /cross-lfs/trunk/scripts/plfs-config
+
+Final merges
+
+
+------------------------------------------------------------------------
+r325 | roliver | 2005-03-12 20:15:23 +1100 (Sat, 12 Mar 2005) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/configs/kernel/linux-2.4.26-i686.config
+   A /cross-lfs/trunk/configs/kernel/linux-2.6.10-x86_64.config
+   A /cross-lfs/trunk/configs/kernel/linux-2.6.7-i686.config
+   A /cross-lfs/trunk/configs/kernel/linux-2.6.8.1-i686.config
+   A /cross-lfs/trunk/configs/kernel/linux-2.6.8.1-x86_64.config
+   A /cross-lfs/trunk/configs/kernel/linux-2.6.9-i686-admin.config
+   A /cross-lfs/trunk/configs/kernel/linux-2.6.9-i686.config
+   A /cross-lfs/trunk/configs/kernel/linux-2.6.9-x86_64.config
+
+Add symlinks
+
+------------------------------------------------------------------------
+r324 | roliver | 2005-03-12 20:06:32 +1100 (Sat, 12 Mar 2005) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-OpenEXR.sh
+
+Fix typo
+
+
+------------------------------------------------------------------------
+r323 | roliver | 2005-03-12 19:50:38 +1100 (Sat, 12 Mar 2005) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/untested/gnome-platform-scripts
+   A /cross-lfs/trunk/scripts/untested/gnome-platform-scripts/gnome-desktop-gtk-engines.sh
+   A /cross-lfs/trunk/scripts/untested/gnome-platform-scripts/gnome-desktop-scrollkeeper.sh
+   A /cross-lfs/trunk/scripts/untested/gnome-platform-scripts/gnome-platform-GConf.sh
+   A /cross-lfs/trunk/scripts/untested/gnome-platform-scripts/gnome-platform-ORBit2.sh
+   A /cross-lfs/trunk/scripts/untested/gnome-platform-scripts/gnome-platform-at-spi.sh
+   A /cross-lfs/trunk/scripts/untested/gnome-platform-scripts/gnome-platform-atk.sh
+   A /cross-lfs/trunk/scripts/untested/gnome-platform-scripts/gnome-platform-audiofile-64.sh
+   A /cross-lfs/trunk/scripts/untested/gnome-platform-scripts/gnome-platform-audiofile.sh
+   A /cross-lfs/trunk/scripts/untested/gnome-platform-scripts/gnome-platform-esoound-64.sh
+   A /cross-lfs/trunk/scripts/untested/gnome-platform-scripts/gnome-platform-esoound.sh
+   A /cross-lfs/trunk/scripts/untested/gnome-platform-scripts/gnome-platform-gail.sh
+   A /cross-lfs/trunk/scripts/untested/gnome-platform-scripts/gnome-platform-glib.sh
+   A /cross-lfs/trunk/scripts/untested/gnome-platform-scripts/gnome-platform-gnome-mime-data.sh
+   A /cross-lfs/trunk/scripts/untested/gnome-platform-scripts/gnome-platform-gtk-doc.sh
+   A /cross-lfs/trunk/scripts/untested/gnome-platform-scripts/gnome-platform-gtk2.sh
+   A /cross-lfs/trunk/scripts/untested/gnome-platform-scripts/gnome-platform-intltool.sh
+   A /cross-lfs/trunk/scripts/untested/gnome-platform-scripts/gnome-platform-libIDL.sh
+   A /cross-lfs/trunk/scripts/untested/gnome-platform-scripts/gnome-platform-libart_lgpl-64.sh
+   A /cross-lfs/trunk/scripts/untested/gnome-platform-scripts/gnome-platform-libart_lgpl.sh
+   A /cross-lfs/trunk/scripts/untested/gnome-platform-scripts/gnome-platform-libbonobo.sh
+   A /cross-lfs/trunk/scripts/untested/gnome-platform-scripts/gnome-platform-libglade.sh
+   A /cross-lfs/trunk/scripts/untested/gnome-platform-scripts/gnome-platform-libgnomecanvas.sh
+   A /cross-lfs/trunk/scripts/untested/gnome-platform-scripts/gnome-platform-libxml2-64.sh
+   A /cross-lfs/trunk/scripts/untested/gnome-platform-scripts/gnome-platform-libxml2.sh
+   A /cross-lfs/trunk/scripts/untested/gnome-platform-scripts/gnome-platform-libxslt-64.sh
+   A /cross-lfs/trunk/scripts/untested/gnome-platform-scripts/gnome-platform-libxslt.sh
+   A /cross-lfs/trunk/scripts/untested/gnome-platform-scripts/gnome-platform-pango.sh
+   A /cross-lfs/trunk/scripts/untested/gnome-platform-scripts/gnome-setup.sh
+   A /cross-lfs/trunk/scripts/untested/kde-scripts
+   A /cross-lfs/trunk/scripts/untested/kde-scripts/kde-arts.sh
+   A /cross-lfs/trunk/scripts/untested/kde-scripts/kde-kde-libs.sh
+   A /cross-lfs/trunk/scripts/untested/kde-scripts/kde-kdeb-base.sh
+   A /cross-lfs/trunk/scripts/untested/kde-scripts/kde-setup.sh
+
+import kde and gnome-platform scripts
+
+------------------------------------------------------------------------
+r322 | roliver | 2005-03-12 19:46:03 +1100 (Sat, 12 Mar 2005) | 3 lines
+Changed paths:
+   D /cross-lfs/trunk/scripts/untested/biarch-funcs.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-OpenEXR.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-a2ps.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-a52dec.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-alsa-lib.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-alsa-tools.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-alsa-utils.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-aspell.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-cdparanoia-III-64.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-cdparanoia-III.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-cups.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-dbus.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-desktop-file-utils.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-docbook-dssl.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-docbook-sgml.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-docbook-xml.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-docboox-xsl.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-doxygen.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-ed.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-enscript.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-espgs.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-fam.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-fftw.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-fftw3.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-fltk.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-foomatic.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-freeglut-64.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-freeglut.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-gamin.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-gd.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-gdbm-64.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-gdbm.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-gimp-print.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-glib12.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-graphviz.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-gtk12.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-hicolor-icon-theme.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-ijs.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-jadetex.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-jasper.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-lcms.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-lesstif.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-libidn.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-libjprg.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-libmad.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-libmikmod.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-libmpeg3.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-libogg.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-libraw1394.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-libvorbis.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-lm_sensors.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-mas.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-mtools.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-mysql.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-nas-64.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-nas.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-nasm.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-openjade.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-opensp.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-pcre.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-pkgconfig.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-pm-xml-parser.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-popt-64.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-popt.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-psutils.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-python-64.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-python.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-qt.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-samba.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/biarch-funcs.sh (from /cross-lfs/trunk/scripts/untested/biarch-funcs.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-OpenEXR.sh (from /cross-lfs/trunk/scripts/untested/blfs-OpenEXR.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-a2ps.sh (from /cross-lfs/trunk/scripts/untested/blfs-a2ps.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-a52dec.sh (from /cross-lfs/trunk/scripts/untested/blfs-a52dec.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-alsa-lib.sh (from /cross-lfs/trunk/scripts/untested/blfs-alsa-lib.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-alsa-tools.sh (from /cross-lfs/trunk/scripts/untested/blfs-alsa-tools.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-alsa-utils.sh (from /cross-lfs/trunk/scripts/untested/blfs-alsa-utils.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-aspell.sh (from /cross-lfs/trunk/scripts/untested/blfs-aspell.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-cdparanoia-III-64.sh (from /cross-lfs/trunk/scripts/untested/blfs-cdparanoia-III-64.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-cdparanoia-III.sh (from /cross-lfs/trunk/scripts/untested/blfs-cdparanoia-III.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-cups.sh (from /cross-lfs/trunk/scripts/untested/blfs-cups.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-dbus.sh (from /cross-lfs/trunk/scripts/untested/blfs-dbus.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-desktop-file-utils.sh (from /cross-lfs/trunk/scripts/untested/blfs-desktop-file-utils.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-docbook-dssl.sh (from /cross-lfs/trunk/scripts/untested/blfs-docbook-dssl.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-docbook-sgml.sh (from /cross-lfs/trunk/scripts/untested/blfs-docbook-sgml.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-docbook-xml.sh (from /cross-lfs/trunk/scripts/untested/blfs-docbook-xml.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-docboox-xsl.sh (from /cross-lfs/trunk/scripts/untested/blfs-docboox-xsl.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-doxygen.sh (from /cross-lfs/trunk/scripts/untested/blfs-doxygen.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-ed.sh (from /cross-lfs/trunk/scripts/untested/blfs-ed.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-enscript.sh (from /cross-lfs/trunk/scripts/untested/blfs-enscript.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-espgs.sh (from /cross-lfs/trunk/scripts/untested/blfs-espgs.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-fam.sh (from /cross-lfs/trunk/scripts/untested/blfs-fam.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-fftw.sh (from /cross-lfs/trunk/scripts/untested/blfs-fftw.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-fftw3.sh (from /cross-lfs/trunk/scripts/untested/blfs-fftw3.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-fltk.sh (from /cross-lfs/trunk/scripts/untested/blfs-fltk.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-foomatic.sh (from /cross-lfs/trunk/scripts/untested/blfs-foomatic.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-freeglut-64.sh (from /cross-lfs/trunk/scripts/untested/blfs-freeglut-64.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-freeglut.sh (from /cross-lfs/trunk/scripts/untested/blfs-freeglut.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-gamin.sh (from /cross-lfs/trunk/scripts/untested/blfs-gamin.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-gd.sh (from /cross-lfs/trunk/scripts/untested/blfs-gd.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-gdbm-64.sh (from /cross-lfs/trunk/scripts/untested/blfs-gdbm-64.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-gdbm.sh (from /cross-lfs/trunk/scripts/untested/blfs-gdbm.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-gimp-print.sh (from /cross-lfs/trunk/scripts/untested/blfs-gimp-print.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-glib12.sh (from /cross-lfs/trunk/scripts/untested/blfs-glib12.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-graphviz.sh (from /cross-lfs/trunk/scripts/untested/blfs-graphviz.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-gtk12.sh (from /cross-lfs/trunk/scripts/untested/blfs-gtk12.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-hicolor-icon-theme.sh (from /cross-lfs/trunk/scripts/untested/blfs-hicolor-icon-theme.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-ijs.sh (from /cross-lfs/trunk/scripts/untested/blfs-ijs.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-jadetex.sh (from /cross-lfs/trunk/scripts/untested/blfs-jadetex.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-jasper.sh (from /cross-lfs/trunk/scripts/untested/blfs-jasper.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-lcms.sh (from /cross-lfs/trunk/scripts/untested/blfs-lcms.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-lesstif.sh (from /cross-lfs/trunk/scripts/untested/blfs-lesstif.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-libidn.sh (from /cross-lfs/trunk/scripts/untested/blfs-libidn.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-libjprg.sh (from /cross-lfs/trunk/scripts/untested/blfs-libjprg.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-libmad.sh (from /cross-lfs/trunk/scripts/untested/blfs-libmad.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-libmikmod.sh (from /cross-lfs/trunk/scripts/untested/blfs-libmikmod.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-libmpeg3.sh (from /cross-lfs/trunk/scripts/untested/blfs-libmpeg3.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-libogg.sh (from /cross-lfs/trunk/scripts/untested/blfs-libogg.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-libraw1394.sh (from /cross-lfs/trunk/scripts/untested/blfs-libraw1394.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-libvorbis.sh (from /cross-lfs/trunk/scripts/untested/blfs-libvorbis.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-lm_sensors.sh (from /cross-lfs/trunk/scripts/untested/blfs-lm_sensors.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-mas.sh (from /cross-lfs/trunk/scripts/untested/blfs-mas.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-mtools.sh (from /cross-lfs/trunk/scripts/untested/blfs-mtools.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-mysql.sh (from /cross-lfs/trunk/scripts/untested/blfs-mysql.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-nas-64.sh (from /cross-lfs/trunk/scripts/untested/blfs-nas-64.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-nas.sh (from /cross-lfs/trunk/scripts/untested/blfs-nas.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-nasm.sh (from /cross-lfs/trunk/scripts/untested/blfs-nasm.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-openjade.sh (from /cross-lfs/trunk/scripts/untested/blfs-openjade.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-opensp.sh (from /cross-lfs/trunk/scripts/untested/blfs-opensp.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-pcre.sh (from /cross-lfs/trunk/scripts/untested/blfs-pcre.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-pkgconfig.sh (from /cross-lfs/trunk/scripts/untested/blfs-pkgconfig.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-pm-xml-parser.sh (from /cross-lfs/trunk/scripts/untested/blfs-pm-xml-parser.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-popt-64.sh (from /cross-lfs/trunk/scripts/untested/blfs-popt-64.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-popt.sh (from /cross-lfs/trunk/scripts/untested/blfs-popt.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-psutils.sh (from /cross-lfs/trunk/scripts/untested/blfs-psutils.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-python-64.sh (from /cross-lfs/trunk/scripts/untested/blfs-python-64.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-python.sh (from /cross-lfs/trunk/scripts/untested/blfs-python.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-qt.sh (from /cross-lfs/trunk/scripts/untested/blfs-qt.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-samba.sh (from /cross-lfs/trunk/scripts/untested/blfs-samba.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-sgml-common.sh (from /cross-lfs/trunk/scripts/untested/blfs-sgml-common.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-sgmlspm.sh (from /cross-lfs/trunk/scripts/untested/blfs-sgmlspm.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-shared-mime-info.sh (from /cross-lfs/trunk/scripts/untested/blfs-shared-mime-info.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-swig.sh (from /cross-lfs/trunk/scripts/untested/blfs-swig.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-tex.sh (from /cross-lfs/trunk/scripts/untested/blfs-tex.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-tiff-64.sh (from /cross-lfs/trunk/scripts/untested/blfs-tiff-64.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-tiff.sh (from /cross-lfs/trunk/scripts/untested/blfs-tiff.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-tk-64.sh (from /cross-lfs/trunk/scripts/untested/blfs-tk-64.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-tk.sh (from /cross-lfs/trunk/scripts/untested/blfs-tk.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-unzip.sh (from /cross-lfs/trunk/scripts/untested/blfs-unzip.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-which.sh (from /cross-lfs/trunk/scripts/untested/blfs-which.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/blfs-xmms.sh (from /cross-lfs/trunk/scripts/untested/blfs-xmms.sh:319)
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts/funcs.sh (from /cross-lfs/trunk/scripts/untested/funcs.sh:319)
+   D /cross-lfs/trunk/scripts/untested/blfs-sgml-common.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-sgmlspm.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-shared-mime-info.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-swig.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-tex.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-tiff-64.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-tiff.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-tk-64.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-tk.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-unzip.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-which.sh
+   D /cross-lfs/trunk/scripts/untested/blfs-xmms.sh
+   D /cross-lfs/trunk/scripts/untested/funcs.sh
+
+Move all the untested blfs scripts into blfs-scripts
+
+
+------------------------------------------------------------------------
+r321 | roliver | 2005-03-12 19:42:06 +1100 (Sat, 12 Mar 2005) | 3 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/untested/blfs-scripts
+
+add dir
+
+
+------------------------------------------------------------------------
+r320 | roliver | 2005-03-12 19:30:03 +1100 (Sat, 12 Mar 2005) | 3 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-bdb-64.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-cracklib-64.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-cyrus-sasl-64.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-expat-64.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-fontconfig-64.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-freetype2-64.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-libpng-64.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-linux-pam-64.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-mit-krb5-64.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-nssldap-64.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-openldap-64.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-openssl-64.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-tcl-64.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-tcp-wrappers-64.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-xorg-64.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-crtobjs-64.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-full-64.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-bzip2-64.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-file-64.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-flex-64.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-gettext-64.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-glibc-64.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-libtool-64.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-ncurses-64.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-perl-64.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-procps-64.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-readline-64.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-shadow-64.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-zlib-64.sh
+   A /cross-lfs/trunk/scripts/native-scripts/temp-expect-64.sh
+   A /cross-lfs/trunk/scripts/native-scripts/temp-perl-64.sh
+   A /cross-lfs/trunk/scripts/native-scripts/temp-tcl-64.sh
+   A /cross-lfs/trunk/scripts/target-scripts/target-bzip2-64.sh
+   A /cross-lfs/trunk/scripts/target-scripts/target-gettext-64.sh
+   A /cross-lfs/trunk/scripts/target-scripts/target-ncurses-64.sh
+   A /cross-lfs/trunk/scripts/target-scripts/target-tcp-wrappers-64.sh
+   A /cross-lfs/trunk/scripts/target-scripts/target-zlib-64.sh
+
+Add all the foo-64.sh -> foo.sh symlinks into the repo where reqd
+
+
+------------------------------------------------------------------------
+r319 | roliver | 2005-03-12 19:15:47 +1100 (Sat, 12 Mar 2005) | 8 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/untested
+   A /cross-lfs/trunk/scripts/untested/biarch-funcs.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-OpenEXR.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-a2ps.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-a52dec.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-alsa-lib.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-alsa-tools.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-alsa-utils.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-aspell.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-cdparanoia-III-64.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-cdparanoia-III.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-cups.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-dbus.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-desktop-file-utils.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-docbook-dssl.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-docbook-sgml.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-docbook-xml.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-docboox-xsl.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-doxygen.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-ed.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-enscript.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-espgs.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-fam.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-fftw.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-fftw3.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-fltk.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-foomatic.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-freeglut-64.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-freeglut.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-gamin.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-gd.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-gdbm-64.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-gdbm.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-gimp-print.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-glib12.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-graphviz.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-gtk12.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-hicolor-icon-theme.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-ijs.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-jadetex.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-jasper.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-lcms.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-lesstif.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-libidn.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-libjprg.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-libmad.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-libmikmod.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-libmpeg3.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-libogg.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-libraw1394.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-libvorbis.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-lm_sensors.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-mas.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-mtools.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-mysql.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-nas-64.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-nas.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-nasm.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-openjade.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-opensp.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-pcre.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-pkgconfig.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-pm-xml-parser.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-popt-64.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-popt.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-psutils.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-python-64.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-python.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-qt.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-samba.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-sgml-common.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-sgmlspm.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-shared-mime-info.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-swig.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-tex.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-tiff-64.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-tiff.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-tk-64.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-tk.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-unzip.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-which.sh
+   A /cross-lfs/trunk/scripts/untested/blfs-xmms.sh
+   A /cross-lfs/trunk/scripts/untested/funcs.sh
+
+Adding in a pile of new scripts, so far untested.
+
+These use functions from funcs.sh for the biarch handling.
+
+Still yet to do properly is creating header stubs, need to create a separate
+function to do this at some point...
+
+
+------------------------------------------------------------------------
+r318 | roliver | 2005-03-12 18:41:51 +1100 (Sat, 12 Mar 2005) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-init.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-kern-hdrs.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-san-kern-hdrs.sh
+
+change create_stubs function name
+
+
+------------------------------------------------------------------------
+r317 | roliver | 2005-03-12 18:22:52 +1100 (Sat, 12 Mar 2005) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-freetype2.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-mit-krb5.sh
+
+Fix biarch handling
+
+------------------------------------------------------------------------
+r316 | roliver | 2005-03-12 18:17:21 +1100 (Sat, 12 Mar 2005) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-libpng.sh
+
+fix biarch handling of -config file
+
+------------------------------------------------------------------------
+r315 | roliver | 2005-03-12 18:15:03 +1100 (Sat, 12 Mar 2005) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-xorg.sh
+
+Add wrapper for biarch handling, ensure static libs get built with -fPIC
+
+
+------------------------------------------------------------------------
+r314 | roliver | 2005-03-12 18:03:24 +1100 (Sat, 12 Mar 2005) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-gcc.sh
+
+Remove copying of tgt-tools headers/libs, this is redundant, and should
+have been removed long ago...
+
+
+------------------------------------------------------------------------
+r312 | roliver | 2005-03-12 17:26:53 +1100 (Sat, 12 Mar 2005) | 3 lines
+Changed paths:
+   A /cross-lfs/trunk/configs/kernel/linux-2.4.22-i686.config
+   A /cross-lfs/trunk/configs/kernel/linux-2.6.8.1-powerpc.config
+
+Add more sample kernel configs
+
+
+------------------------------------------------------------------------
+r311 | roliver | 2005-03-12 17:23:16 +1100 (Sat, 12 Mar 2005) | 3 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/plfs-config-ppc750-20041223
+   A /cross-lfs/trunk/scripts/plfs-config-x86_64-native-20050103
+
+Add more plfs-configs (should create a samples subdir)
+
+
+------------------------------------------------------------------------
+r310 | roliver | 2005-03-12 17:21:03 +1100 (Sat, 12 Mar 2005) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/blfs-config
+   M /cross-lfs/trunk/scripts/build-blfs.sh
+
+Update blfs stuff
+
+------------------------------------------------------------------------
+r309 | roliver | 2005-03-12 17:19:26 +1100 (Sat, 12 Mar 2005) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-target.sh
+
+Add portmap, tcp-wrappers and host-lilo
+
+
+------------------------------------------------------------------------
+r308 | roliver | 2005-03-12 17:17:36 +1100 (Sat, 12 Mar 2005) | 2 lines
+Changed paths:
+   D /cross-lfs/trunk/scripts/blfs-scripts/Makefile
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-bdb.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-cyrus-sasl.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-expat.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-fontconfig.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-freetype2.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-linux-pam.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-mit-krb5.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-nssldap.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-openldap.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-openssh.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-shadow-pam.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-tcl.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-xorg.sh
+
+add TGT_CFLAGS
+
+------------------------------------------------------------------------
+r307 | roliver | 2005-03-12 17:08:01 +1100 (Sat, 12 Mar 2005) | 4 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/target-scripts/host-lilo.sh
+   A /cross-lfs/trunk/scripts/target-scripts/target-portmap.sh
+   A /cross-lfs/trunk/scripts/target-scripts/target-tcp-wrappers.sh
+
+add portmap and tcpwrappers target scripts (to facillitate nfs support)
+Add a script to build lilo on the host (cant use target-lilo)
+
+
+------------------------------------------------------------------------
+r306 | roliver | 2005-03-12 17:03:47 +1100 (Sat, 12 Mar 2005) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/native-scripts/native-autoconf.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-automake.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-bash.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-bison.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-coreutils.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-diffutils.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-ed.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-file.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-findutils.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-flex.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-gawk.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-gcc.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-gettext.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-glibc.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-grep.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-groff.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-gzip.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-inetutils.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-less.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-libtool.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-m4.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-make.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-man.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-module-init-tools.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-patch.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-perl.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-procinfo.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-procps.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-psmisc.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-readline.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-sed.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-shadow.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-sysklogd.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-tar.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-texinfo.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-vim.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-zlib.sh
+   M /cross-lfs/trunk/scripts/native-scripts/temp-expect.sh
+   M /cross-lfs/trunk/scripts/native-scripts/temp-perl.sh
+   M /cross-lfs/trunk/scripts/native-scripts/temp-texinfo.sh
+   M /cross-lfs/trunk/scripts/native-scripts/temp-vim.sh
+
+Add TGT_CFLAGS to allow passing of target compiler flags. Use primarily for
+arch specific optimisations, ie: -march -mcpu etc
+
+
+------------------------------------------------------------------------
+r305 | roliver | 2005-03-12 17:00:36 +1100 (Sat, 12 Mar 2005) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-bash.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-binutils.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-bison.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-coreutils.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-dev.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-diffutils.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-e2fsprogs.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-findutils.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-flex.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-gawk.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-gcc.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-gettext.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-grep.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-gzip.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-inetutils.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-kernel.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-m4.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-make.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-module-init-tools.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-modutils.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-nfsutils.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-patch.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-procps.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-sed.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-strace.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-sysklogd.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-tar.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-zlib.sh
+
+Add TGT_CFLAGS to allow passing of target compiler flags. Use primarily for
+arch specific optimisations, ie: -march -mcpu etc
+
+
+------------------------------------------------------------------------
+r304 | roliver | 2005-03-12 16:53:52 +1100 (Sat, 12 Mar 2005) | 7 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-binutils.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-final.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-shared.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-static.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-crtobjs.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-full.sh
+
+When modifying triplet (when buildhost = target), modify the second part of 
+the triplet instead of the last
+
+ie x86_64-pcx-linux-gnu instead of
+   x86_64-pc-linux-gnux
+
+
+------------------------------------------------------------------------
+r303 | roliver | 2004-12-13 22:31:52 +1100 (Mon, 13 Dec 2004) | 12 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/readline-5.0-fixes-1.patch
+   M /cross-lfs/trunk/scripts/native-scripts/native-readline.sh
+
+Add readline patch
+
+Submitted By: Jim Gifford (patches at jg555 dot com)
+Date: 2004-09-29
+Initial Package Version: 5.0
+Origin: Various
+Upstream Status: Already Applied
+Description: This patch contains various fixes recommended
+             by the author Chet. The original patches are
+             avaiable at ftp://ftp.cwru.edu/pub/bash/readline-5.0-patches
+
+
+------------------------------------------------------------------------
+r302 | roliver | 2004-12-13 22:11:04 +1100 (Mon, 13 Dec 2004) | 10 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/binutils-2.15.94.0.1-fix_strip-1.patch
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-binutils.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-binutils.sh
+   M /cross-lfs/trunk/scripts/native-scripts/temp-binutils.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-binutils.sh
+
+Add fix for overzealous strip command with HJL binutils 2.15.94.0.1
+
+Submitted By: Jeremy Utley <jeremy@linuxfromscratch.org>
+Initial Package Version: 2.15.94.0.1
+Upstream Status: From Upstream
+Origin: ML Post by HJ Lu - http://sources.redhat.com/ml/binutils/2004-11/msg00332.html
+Description: With this version of binutils, TLS information is lost when
+stripping libc.a.  This patch fixes the problem.  Binutils bugzilla id 574.
+
+
+------------------------------------------------------------------------
+r301 | roliver | 2004-12-13 22:09:43 +1100 (Mon, 13 Dec 2004) | 3 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/gcc-3.4.3-linkonce-1.patch
+
+Actually add the patch this time ;-)
+
+
+------------------------------------------------------------------------
+r300 | roliver | 2004-12-13 21:49:12 +1100 (Mon, 13 Dec 2004) | 3 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-nssldap.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-ntp.sh
+
+Add some more blfs scripts...
+
+
+------------------------------------------------------------------------
+r299 | roliver | 2004-12-13 21:44:31 +1100 (Mon, 13 Dec 2004) | 11 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-final.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-shared.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-static.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-gcc.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-gcc.sh
+
+Add linkonce patch to all gcc builds.
+Should be fixed upstream gcc-3.4.4
+
+Submitted By: Jim Gifford (patches at jg555 dot com)
+Date: 2004-11-05
+Initial Package Version: 3.4.3
+Origin: Jim Gifford
+Upstream Status: Delayed till 3.4.4
+Description: Fixes linkone/comdat issue
+
+
+------------------------------------------------------------------------
+r298 | roliver | 2004-12-13 21:22:00 +1100 (Mon, 13 Dec 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-binutils.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-binutils.sh
+   M /cross-lfs/trunk/scripts/native-scripts/temp-binutils.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-binutils.sh
+
+Update binutils scripts so latest HJL binutils gets multilib patched
+
+
+------------------------------------------------------------------------
+r297 | roliver | 2004-12-07 22:45:01 +1100 (Tue, 07 Dec 2004) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/blfs-config
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-shadow-pam.sh
+   M /cross-lfs/trunk/scripts/build-blfs.sh
+
+Cleanups. 
+actually specify --with-pam when building shadow w pam (duh)
+
+
+------------------------------------------------------------------------
+r296 | roliver | 2004-12-01 00:37:42 +1100 (Wed, 01 Dec 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-final-prep.sh
+
+Fix up symlink creation and neaten it up some...
+
+
+------------------------------------------------------------------------
+r295 | roliver | 2004-12-01 00:31:28 +1100 (Wed, 01 Dec 2004) | 11 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-cyrus-sasl.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-openldap.sh
+
+updated cyrus-sasl build to explicitly define some mechs to use.
+For some (inexplicable) reason openldap when built against it didn't
+believe it had any supported sasl mechanisms...
+Also plugindir is now always set during configure to be /usr/${libdir}/sasl2
+(where libdir is "lib" by default, or "lib64" for 64bit during bi-arch builds)
+
+For openldap, --disable debug was removed from the configure options (to 
+facilitate error checking etc). -lpthread was also added to the LDFLAGS, 
+though this is more than likely unnecessary...
+
+
+------------------------------------------------------------------------
+r294 | roliver | 2004-12-01 00:26:32 +1100 (Wed, 01 Dec 2004) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-blfs.sh
+   M /cross-lfs/trunk/scripts/plfs-config-i686-20041101
+
+Cleanup build-blfs.sh
+Also set plfs-config-i686-20041101 to use glibc from LFS6.0
+                                                                               
+
+------------------------------------------------------------------------
+r293 | roliver | 2004-11-24 00:13:02 +1100 (Wed, 24 Nov 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-final-prep.sh
+
+bleh, had unneeded slashes :P
+
+------------------------------------------------------------------------
+r292 | roliver | 2004-11-24 00:10:44 +1100 (Wed, 24 Nov 2004) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-final-prep.sh
+
+Add a bunch of symlinks required for hotplug...
+Will need to investigate why hotplug doesn't use PATH from profile
+
+
+------------------------------------------------------------------------
+r291 | roliver | 2004-11-23 23:36:50 +1100 (Tue, 23 Nov 2004) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-kernel.sh
+
+Something weird broke in here, was bypassing the test for kernel config...
+Quick hack and slash, will NEED to be revisited...
+
+
+------------------------------------------------------------------------
+r290 | roliver | 2004-11-23 19:51:54 +1100 (Tue, 23 Nov 2004) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-openldap.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-openssh.sh
+
+Add wrapper scripts specifying KRB5_KTNAME.
+This will be turned into an option later...
+
+
+------------------------------------------------------------------------
+r289 | roliver | 2004-11-23 19:48:26 +1100 (Tue, 23 Nov 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/native-scripts/native-glibc.sh
+
+Copy across nscd.conf to /etc
+
+
+------------------------------------------------------------------------
+r288 | roliver | 2004-11-12 00:44:27 +1100 (Fri, 12 Nov 2004) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-target.sh
+   M /cross-lfs/trunk/scripts/plfs-config-i686-20041101
+   A /cross-lfs/trunk/scripts/target-scripts/target-hotplug.sh
+
+Add target-hotplug.sh script.
+Will install hotplug only if USE_HOTPLUG=Y
+
+
+------------------------------------------------------------------------
+r287 | roliver | 2004-11-12 00:02:36 +1100 (Fri, 12 Nov 2004) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/plfs-config-i686-20041101
+   M /cross-lfs/trunk/scripts/target-scripts/target-lfs-bootscripts.sh
+
+Updated to install hotplug bootscript if USE_HOTPLUG=Y (set in plfs-config).
+TODO: update all the supplied plfs-configs
+
+
+------------------------------------------------------------------------
+r286 | roliver | 2004-11-11 23:46:46 +1100 (Thu, 11 Nov 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/plfs-config-i686-20041101
+
+update lfs-bootscript version
+
+
+------------------------------------------------------------------------
+r285 | roliver | 2004-11-11 22:58:27 +1100 (Thu, 11 Nov 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-native.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-iproute2.sh
+
+bleh, forgot to include a native-iproute2 script ;-)
+
+
+------------------------------------------------------------------------
+r284 | roliver | 2004-11-09 23:43:40 +1100 (Tue, 09 Nov 2004) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/README.cross-lfs
+
+Update the README to reflect the new svn repo location
+(Special thanks to Jeremy Utley for the svn hosting)
+
+
+------------------------------------------------------------------------
+r282 | ryan | 2004-11-08 23:54:23 +1100 (Mon, 08 Nov 2004) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/plfs-config-i686-20041101
+   A /cross-lfs/trunk/scripts/plfs-config-x86_64-native-20041021
+
+Add more plfs-configs
+
+------------------------------------------------------------------------
+r281 | ryan | 2004-11-08 23:48:42 +1100 (Mon, 08 Nov 2004) | 6 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-kernel.sh
+
+Various cleanups of the kernel script.
+
+ARCH is now derived from TGT_ARCH (as is done in the cross-kern-headers
+script), config file looked for is still defined from TGT_ARCH.
+
+
+------------------------------------------------------------------------
+r280 | ryan | 2004-11-08 23:32:55 +1100 (Mon, 08 Nov 2004) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-kernel.sh
+
+Hack around issue w getting kernel config.
+Really should be fixed...
+
+
+------------------------------------------------------------------------
+r279 | ryan | 2004-11-08 23:29:25 +1100 (Mon, 08 Nov 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-blfs.sh
+
+Many fixups, added packages
+
+------------------------------------------------------------------------
+r278 | ryan | 2004-11-08 23:22:55 +1100 (Mon, 08 Nov 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/blfs-config
+
+Add more packages
+
+------------------------------------------------------------------------
+r277 | ryan | 2004-11-08 23:22:21 +1100 (Mon, 08 Nov 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-ncurses.sh
+
+Force xterm to always be colour
+from Alexander Patrakov, IRC
+
+------------------------------------------------------------------------
+r276 | ryan | 2004-11-08 20:43:04 +1100 (Mon, 08 Nov 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/native-scripts/native-perl.sh
+
+Fix perl build so correct library paths are searched
+
+------------------------------------------------------------------------
+r275 | ryan | 2004-11-08 20:41:01 +1100 (Mon, 08 Nov 2004) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-expat.sh
+
+Add expat script
+
+------------------------------------------------------------------------
+r274 | ryan | 2004-11-08 20:40:11 +1100 (Mon, 08 Nov 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-cracklib.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-fontconfig.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-freetype2.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-libpng.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-linux-pam.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-openldap.sh
+
+Add blfs packages
+
+------------------------------------------------------------------------
+r273 | ryan | 2004-11-08 20:37:59 +1100 (Mon, 08 Nov 2004) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/bash-3.0-avoid_WCONTINUED_if_invalid.patch
+   M /cross-lfs/trunk/patches/cyrus-sasl-2.1.20-set_plugindir_from_libdir.patch
+   M /cross-lfs/trunk/patches/db-4.2.52-libtool_fixes.patch
+   A /cross-lfs/trunk/patches/freetype-2.1.9-bytecode_interpreter-1.patch
+   A /cross-lfs/trunk/patches/libpng-1.2.7-fix_pc_for_biarch.patch
+   A /cross-lfs/trunk/patches/libpng-1.2.7-link_to_proper_libs-1.patch
+   M /cross-lfs/trunk/patches/openssl-0.9.7d-32bit_x86_64.patch
+   M /cross-lfs/trunk/patches/openssl-0.9.7d-allow_lib64.patch
+   M /cross-lfs/trunk/patches/openssl-0.9.7d-mit_krb5.patch
+
+Add new patches for blfs-packages
+
+------------------------------------------------------------------------
+r272 | ryan | 2004-11-08 20:32:51 +1100 (Mon, 08 Nov 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-mit-krb5.sh
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-nfs-utils.sh
+
+Script cleanups
+
+------------------------------------------------------------------------
+r271 | ryan | 2004-11-08 20:29:14 +1100 (Mon, 08 Nov 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/blfs-scripts/blfs-portmap.sh
+
+Cleanup errors
+
+------------------------------------------------------------------------
+r270 | ryan | 2004-10-26 16:22:54 +1000 (Tue, 26 Oct 2004) | 9 lines
+Changed paths:
+   A /cross-lfs/trunk/configs/cracklib
+   A /cross-lfs/trunk/configs/cracklib/cracklib_wordlist
+   A /cross-lfs/trunk/patches/Linux-PAM-0.77-linkage-3.patch
+   A /cross-lfs/trunk/patches/cracklib,2.7-blfs-1.patch
+   A /cross-lfs/trunk/patches/cyrus-sasl-2.1.20-set_plugindir_from_libdir-full.patch
+   A /cross-lfs/trunk/patches/cyrus-sasl-2.1.20-set_plugindir_from_libdir.patch
+   A /cross-lfs/trunk/patches/db-4.2.52-libtool_fixes.patch
+   A /cross-lfs/trunk/patches/openssl-0.9.7d-32bit_x86_64.patch
+   A /cross-lfs/trunk/patches/openssl-0.9.7d-allow_lib64.patch
+   A /cross-lfs/trunk/patches/openssl-0.9.7d-mit_krb5.patch
+   A /cross-lfs/trunk/patches/patch.4.2.52.1
+   A /cross-lfs/trunk/patches/patch.4.2.52.2
+   A /cross-lfs/trunk/patches/portmap-5beta-compilation_fixes-3.patch
+   A /cross-lfs/trunk/patches/portmap-5beta-glibc_errno_fix-1.patch
+   A /cross-lfs/trunk/patches/shadow-4.0.4.1-pam-1.patch
+   A /cross-lfs/trunk/patches/tcp_wrappers-7.6-gcc34-1.patch
+   A /cross-lfs/trunk/patches/tcp_wrappers-7.6-shared_lib_plus_plus-1.patch
+   A /cross-lfs/trunk/scripts/blfs-config
+   A /cross-lfs/trunk/scripts/blfs-scripts
+   A /cross-lfs/trunk/scripts/blfs-scripts/Makefile
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-bdb.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-cracklib.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-cyrus-sasl.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-linux-pam.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-mit-krb5.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-nfs-utils.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-openldap.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-openssh.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-openssl.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-portmap.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-shadow-pam.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-tcl.sh
+   A /cross-lfs/trunk/scripts/blfs-scripts/blfs-tcp-wrappers.sh
+   A /cross-lfs/trunk/scripts/build-blfs.sh
+
+Merge in scripts for building selected blfs packages.
+
+Various hackery had to be performed with bi-arch builds of openssl,
+cyrus-sasl, uncommented patches have been added to fix issues.
+
+This should be considered 'alpha' , if it works, YAY, if not
+please post patches ;-)
+
+
+------------------------------------------------------------------------
+r268 | ryan | 2004-10-26 15:38:32 +1000 (Tue, 26 Oct 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/plfs-config-x86_64-lfs-unstable-20040801
+
+Uncomment lilo
+
+
+------------------------------------------------------------------------
+r267 | ryan | 2004-10-26 15:33:23 +1000 (Tue, 26 Oct 2004) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-iproute2.sh
+
+Typo fixups.
+make install is now done as root
+
+
+------------------------------------------------------------------------
+r266 | ryan | 2004-10-26 15:31:14 +1000 (Tue, 26 Oct 2004) | 8 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-target.sh
+   A /cross-lfs/trunk/scripts/target-scripts/host-bin86.sh
+   A /cross-lfs/trunk/scripts/target-scripts/host-nasm.sh
+
+Added two new scripts for building nasm and bin86 into ${HST_TOOLS}
+for building target-lilo (we cannot run the cross-built bin86 and nasm)
+
+These are kept in target-scripts (for the moment anyway, they should
+belong under host-scripts and be run from build-host.sh).
+
+Will be revisited
+
+------------------------------------------------------------------------
+r265 | ryan | 2004-10-26 15:24:01 +1000 (Tue, 26 Oct 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/native-scripts/native-gcc.sh
+
+Fix brainfart with libgcc_s symlink creation
+
+
+------------------------------------------------------------------------
+r264 | ryan | 2004-10-26 15:22:31 +1000 (Tue, 26 Oct 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-module-init-tools.sh
+
+Add a bit more sanity to the invocation of make moveold
+
+
+------------------------------------------------------------------------
+r263 | ryan | 2004-10-26 14:53:26 +1000 (Tue, 26 Oct 2004) | 6 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-hdrs.sh
+
+No functionality changed
+
+Added some comments to remind myself to check which bits/wordsize.h gets
+installed during bi-arch builds... to be investigated
+
+
+------------------------------------------------------------------------
+r262 | ryan | 2004-10-26 14:51:01 +1000 (Tue, 26 Oct 2004) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/native-scripts/temp-binutils.sh
+
+Fix so genscripts multilib patch gets applied for HJL 2.15.92.* as well
+(missed this script when fixing the others)
+
+
+------------------------------------------------------------------------
+r261 | ryan | 2004-10-26 14:47:53 +1000 (Tue, 26 Oct 2004) | 14 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/bash-3.0-avoid_WCONTINUED-1.patch
+   A /cross-lfs/trunk/patches/bash-3.0-fixes-1.patch
+   M /cross-lfs/trunk/scripts/native-scripts/native-bash.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-bash.sh
+
+Fix issues with bash 3.0.
+Add bash-3.0 conglomeration patch
+                                                                                
+Submitted By: Jeremy Utley <jeremy@linuxfromscratch.org>
+Date: 2004-10-13
+Initial Package Version: 3.0
+Upstream Status: Submitted Upstream
+Origin: Originally created by Greg Schafer
+Description: Bash-3.0 has a execution problem with newer Glibc's.  This patch,
+submitted to bash-bugs by Tim Waugh, fixes the problem.  See:
+http://lists.gnu.org/archive/html/bug-bash/2004-09/msg00081.html
+Patch also contains a slight code change taken from Fedora SRPM.
+
+
+------------------------------------------------------------------------
+r260 | ryan | 2004-10-05 15:39:40 +1000 (Tue, 05 Oct 2004) | 3 lines
+Changed paths:
+   A /cross-lfs/trunk/configs/kernel/linux-2.6.8.1-x86_64.config-K8VNXP
+
+Add new kernel config for x86_64 on Gigabyte K8VNXP MB for 2.6.8.1
+
+
+------------------------------------------------------------------------
+r259 | ryan | 2004-10-05 15:37:19 +1000 (Tue, 05 Oct 2004) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/plfs-config-x86_64-20040930
+
+Updated plfs-config for x86_64
+
+------------------------------------------------------------------------
+r258 | ryan | 2004-10-05 15:15:46 +1000 (Tue, 05 Oct 2004) | 11 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/iproute2-2.6.8_040823-remove_db-1.patch
+
+Added iproute2-2.6.8_040823-remove_db-1.patch from LFS-6.0-testing to remove
+dependency on bdb (iproute2 will not build arpd)
+
+Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
+Date: 2004-07-02
+Initial Package Version: 2.6.8
+Origin: Jim Gifford
+Upstream Status: N/A
+Description: Removes DB for LFS Build
+
+
+------------------------------------------------------------------------
+r257 | ryan | 2004-10-05 15:11:36 +1000 (Tue, 05 Oct 2004) | 6 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/native-scripts/native-dev.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-dev.sh
+
+Updated to use udev-config-2.permissions .
+udev-config-2.permissions and udev-config-1.rules are now installed under
+/etc/udev/{rules.d,permissions.d} as 25-lfs.{rules,permissions}
+(as per LFS book 6.0 testing ch6)
+
+
+------------------------------------------------------------------------
+r256 | ryan | 2004-10-05 14:22:16 +1000 (Tue, 05 Oct 2004) | 8 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/target-scripts/target-iproute2.sh
+
+Add script for cross-building iproute2.
+
+This needs some more work. Currently it isn't referenced in build-target.sh,
+nor is there an IPROUTE2_VER variable in plfs-config.
+
+iproute2 is required by the lfs-bootscripts.
+
+
+------------------------------------------------------------------------
+r255 | ryan | 2004-10-05 14:16:30 +1000 (Tue, 05 Oct 2004) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-lfs-bootscripts.sh
+
+Update created ifconfig.ethX file to reflect current lfs bootscripts.
+(note: iproute2 is required, still testing cross-building of it)
+
+
+------------------------------------------------------------------------
+r254 | ryan | 2004-10-05 14:14:37 +1000 (Tue, 05 Oct 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-sysklogd.sh
+
+Fixup permissions issues during symlink creation (now done as root).
+
+------------------------------------------------------------------------
+r253 | ryan | 2004-10-05 14:12:22 +1000 (Tue, 05 Oct 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-final-prep.sh
+
+Neaten up symlink creation
+
+------------------------------------------------------------------------
+r252 | ryan | 2004-10-05 14:08:25 +1000 (Tue, 05 Oct 2004) | 10 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-crtobjs.sh
+
+Commented out copying of glibc's startfiles to under the cross-toolchains
+tree.
+
+This was done as a failsafe during development to absolutely ensure the 
+startfiles got picked up.
+
+As library search order is modified to search ${TGT_TOOLS}/{lib,lib64} in
+the toolchain this is redundant.
+
+
+------------------------------------------------------------------------
+r251 | ryan | 2004-10-05 14:05:08 +1000 (Tue, 05 Oct 2004) | 9 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-final.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-shared.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-static.sh
+
+Commented out the copying of ${TGT_TOOLS}/{lib,lib64,include} under
+the cross-tools lib/include search paths.
+
+This was here as a failsafe during development.
+
+As we adjust the default search locations for headers and libraries
+to point under ${TGT_TOOLS} in gcc and ld this is redundant.
+
+
+------------------------------------------------------------------------
+r250 | ryan | 2004-10-05 13:52:32 +1000 (Tue, 05 Oct 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-gcc.sh
+
+Fix brainfart with libgcc_s_32.so symlink creation (was creating libgcc_s.so
+twice... )
+
+------------------------------------------------------------------------
+r249 | ryan | 2004-09-30 17:42:57 +1000 (Thu, 30 Sep 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-hdrs.sh
+
+Set min kernel ver to 2.6.8 when using linux-2.6.8.1
+
+
+------------------------------------------------------------------------
+r248 | ryan | 2004-09-30 17:40:32 +1000 (Thu, 30 Sep 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-init.sh
+
+Minor cleanups
+
+
+------------------------------------------------------------------------
+r247 | ryan | 2004-09-30 17:39:35 +1000 (Thu, 30 Sep 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-binutils.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-binutils.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-binutils.sh
+
+Update so genscripts multilib patch is applied when using HJL binutils 2.15.92.* 
+
+
+------------------------------------------------------------------------
+r246 | ryan | 2004-09-29 18:43:00 +1000 (Wed, 29 Sep 2004) | 8 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-gcc.sh
+
+Some fixups to target-gcc.sh
+ o --libexecdir is now set to ${TGT_TOOLS}/${libdir} 
+   (where libdir is lib or lib64 ) as is done in native-gcc.sh
+ o Creation of libgcc_s symlinks required for native glibc builds
+   fixed up to cater for biarch
+   (this could do with some neatening up)
+
+
+------------------------------------------------------------------------
+r245 | ryan | 2004-09-28 18:33:16 +1000 (Tue, 28 Sep 2004) | 10 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/native-scripts/native-automake.sh
+
+Reported by Erik-Jan Post <ej.post@xs4all.nl> 20040924
+
+insthook test fails as insthook.test makefile uses a SCRIPTS variable
+and make is called with "-e".
+Therefore our SCRIPTS env var we use for specifying the location of our
+scripts clobbers the insthook.test's expected SCRIPTS
+
+Here we just unset it (only will affect this script)
+
+
+------------------------------------------------------------------------
+r244 | ryan | 2004-09-28 18:22:58 +1000 (Tue, 28 Sep 2004) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/plfs-config-i686-lfs-5.1.1
+
+Yet another plfs-config ;-)
+
+------------------------------------------------------------------------
+r243 | ryan | 2004-09-28 18:12:16 +1000 (Tue, 28 Sep 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-final.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-shared.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-static.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-gcc.sh
+
+Cleanup comments, barf out if TGT_ARCH isnt listed in the case statement
+
+------------------------------------------------------------------------
+r242 | ryan | 2004-09-28 17:33:20 +1000 (Tue, 28 Sep 2004) | 8 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-final-prep.sh
+
+Neatened up the sample fstab file
+
+Adjusted the default PATH so that standard binary locations
+( ie /bin /usr/bin /sbin etc ) are searched before our target tools.
+
+Ensures that we will always use the newer binaries when they are created
+during the native build
+
+------------------------------------------------------------------------
+r241 | ryan | 2004-09-28 17:30:40 +1000 (Tue, 28 Sep 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/native-scripts/native-gcc.sh
+
+Fixup brainfart with edits used to stop running fixincludes
+
+------------------------------------------------------------------------
+r240 | ryan | 2004-09-28 17:28:11 +1000 (Tue, 28 Sep 2004) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-binutils.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-coreutils.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-gawk.sh
+
+Updated to fix issues cross-building where build = target.
+BUILD will be modified so configure doesn't attempt to run checks it cant
+
+
+------------------------------------------------------------------------
+r239 | ryan | 2004-09-28 17:25:38 +1000 (Tue, 28 Sep 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-flex.sh
+
+Correct the comments in lex wrapper script
+
+------------------------------------------------------------------------
+r238 | ryan | 2004-09-28 17:23:32 +1000 (Tue, 28 Sep 2004) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-native.sh
+   A /cross-lfs/trunk/scripts/native-scripts/temp-texinfo.sh
+
+Added temp-texinfo.sh to create makeinfo etc (reqd for generating
+glibc documentation)
+Updated build-native.sh
+
+------------------------------------------------------------------------
+r237 | ryan | 2004-09-28 17:19:43 +1000 (Tue, 28 Sep 2004) | 15 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-final.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-shared.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-static.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-gcc.sh
+
+Fixed header modifications for gcc so only the files that require modifications
+get touched.
+
+For each architecture the header files to modify are explicitly set in the
+case statement
+
+dl_hfiles is used to list the files which require modification of the 
+dynamic linker location
+
+sf_hfiles is used to list the headers where we set the startfile_prefix_spec.
+
+In target-gcc.sh, restriction of the standard include search path is now
+performed by an edit of gcc/cppdefault.c directly
+
+
+------------------------------------------------------------------------
+r236 | ryan | 2004-09-28 14:43:33 +1000 (Tue, 28 Sep 2004) | 10 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-crtobjs.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-full.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-glibc.sh
+
+Fix issues caused by setting min kernel ver to 2.6.8.1 .
+If 2.6.8.1 kernel headers are used, min kernel ver will be 
+set to 2.6.8 instead.
+
+With the native build of glibc the tests have been moved after install.
+This is due to librt on occasion being rebuilt incorrectly during
+"make check". This will have to be revisited, problem may have been
+fixed by upstream regenerating the autotools stuff.
+
+
+------------------------------------------------------------------------
+r235 | ryan | 2004-09-06 16:58:07 +1000 (Mon, 06 Sep 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-hdrs.sh
+
+Fix up issues with x86_64 and ppc
+
+------------------------------------------------------------------------
+r234 | ryan | 2004-09-06 16:55:15 +1000 (Mon, 06 Sep 2004) | 3 lines
+Changed paths:
+   A /cross-lfs/trunk/configs/kernel/linux-2.6.1-i686-inspiron-8000
+
+Added
+
+
+------------------------------------------------------------------------
+r233 | ryan | 2004-09-06 16:52:27 +1000 (Mon, 06 Sep 2004) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/configs/kernel/linux-2.6.7-i686-inspiron-8000.config
+
+Added config, actually from 2.6.1 but hey ;-)
+
+------------------------------------------------------------------------
+r232 | ryan | 2004-09-06 16:47:22 +1000 (Mon, 06 Sep 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-native.sh
+
+Cleanup, add native-dev.sh
+
+------------------------------------------------------------------------
+r231 | ryan | 2004-09-06 16:45:40 +1000 (Mon, 06 Sep 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-cross.sh
+
+Add option for using distcc
+
+------------------------------------------------------------------------
+r230 | ryan | 2004-09-06 16:44:40 +1000 (Mon, 06 Sep 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-final-prep.sh
+
+Create /dev/shm during target final prep
+
+------------------------------------------------------------------------
+r229 | ryan | 2004-09-06 16:42:15 +1000 (Mon, 06 Sep 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/native-scripts/native-man.sh
+
+Update list ov versions requiring patching
+
+------------------------------------------------------------------------
+r228 | ryan | 2004-09-06 16:41:19 +1000 (Mon, 06 Sep 2004) | 6 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-kernel.sh
+
+Overide TGT_ARCH for i?86 so it is set to i386.
+
+This is an interim fix, we should provide a case statement as we do for
+gcc...
+
+
+------------------------------------------------------------------------
+r227 | ryan | 2004-09-06 16:38:34 +1000 (Mon, 06 Sep 2004) | 3 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/native-scripts/native-dev.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-dev.sh
+
+Add native-dev.sh
+
+
+------------------------------------------------------------------------
+r226 | ryan | 2004-09-06 16:29:51 +1000 (Mon, 06 Sep 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/native-scripts/temp-expect.sh
+
+libdir was not getting set in the event of a non-biarch build.
+Fixed
+
+------------------------------------------------------------------------
+r225 | ryan | 2004-09-06 16:28:04 +1000 (Mon, 06 Sep 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-coreutils.sh
+
+Install coreutils as root, else we do not install su
+
+------------------------------------------------------------------------
+r224 | ryan | 2004-09-06 16:26:49 +1000 (Mon, 06 Sep 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-kern-hdrs.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-san-kern-hdrs.sh
+
+Recursive copy was not performed during non-biarch builds due to oversight.
+Fixed here...
+
+------------------------------------------------------------------------
+r223 | ryan | 2004-09-06 16:24:22 +1000 (Mon, 06 Sep 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-binutils.sh
+
+Remove PMFLAGS from make for binutils.
+
+------------------------------------------------------------------------
+r222 | ryan | 2004-09-06 16:23:09 +1000 (Mon, 06 Sep 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-binutils.sh
+
+Remove PMFLAGS from make for binutils... have had issues building
+this parallel
+
+------------------------------------------------------------------------
+r221 | fthain | 2004-08-17 02:19:11 +1000 (Tue, 17 Aug 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-final-prep.sh
+
+Added /etc/shells, chmod & chown symlinks, and improved readability.
+
+------------------------------------------------------------------------
+r220 | fthain | 2004-08-15 00:01:45 +1000 (Sun, 15 Aug 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-bash.sh
+
+Added all the m68k results for configure tests that run native.
+
+------------------------------------------------------------------------
+r219 | fthain | 2004-08-11 19:40:34 +1000 (Wed, 11 Aug 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-kernel.sh
+
+Changed no to yes and changed make defconfig to make config for linux 2.4.
+
+------------------------------------------------------------------------
+r218 | fthain | 2004-08-07 16:36:33 +1000 (Sat, 07 Aug 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-sysklogd.sh
+
+Fixed permissions on ${LFS}/usr/sbin.
+
+------------------------------------------------------------------------
+r217 | fthain | 2004-08-07 16:36:08 +1000 (Sat, 07 Aug 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-target.sh
+
+Fixed typo preventing final prep from running.
+
+------------------------------------------------------------------------
+r216 | ryan | 2004-08-04 13:41:56 +1000 (Wed, 04 Aug 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-target.sh
+   M /cross-lfs/trunk/scripts/plfs-config-x86_64-lfs-unstable-20040801
+   D /cross-lfs/trunk/scripts/target-scripts/build-lilo.sh
+   A /cross-lfs/trunk/scripts/target-scripts/target-lilo.sh (from /cross-lfs/trunk/scripts/target-scripts/build-lilo.sh:214)
+
+Add lilo bootloader option
+( builds 32bit nasm, bin86 and lilo )
+
+------------------------------------------------------------------------
+r215 | ryan | 2004-08-04 13:05:07 +1000 (Wed, 04 Aug 2004) | 2 lines
+Changed paths:
+   D /cross-lfs/trunk/scripts/native-scripts/final-binutils.sh
+   D /cross-lfs/trunk/scripts/native-scripts/final-bison.sh
+   D /cross-lfs/trunk/scripts/native-scripts/final-coreutils.sh
+   D /cross-lfs/trunk/scripts/native-scripts/final-findutils.sh
+   D /cross-lfs/trunk/scripts/native-scripts/final-gawk.sh
+   D /cross-lfs/trunk/scripts/native-scripts/final-gcc.sh
+   D /cross-lfs/trunk/scripts/native-scripts/final-glibc.sh
+   D /cross-lfs/trunk/scripts/native-scripts/final-less.sh
+   D /cross-lfs/trunk/scripts/native-scripts/final-m4.sh
+   D /cross-lfs/trunk/scripts/native-scripts/final-ncurses.sh
+   D /cross-lfs/trunk/scripts/native-scripts/final-vim.sh
+   D /cross-lfs/trunk/scripts/native-scripts/final-zlib.sh
+
+Remove old files
+
+------------------------------------------------------------------------
+r214 | ryan | 2004-08-04 13:03:09 +1000 (Wed, 04 Aug 2004) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/native-scripts/native-procps.sh
+
+Fix native-procps.sh install (for version 3.2.2).
+Specify CC="gcc ${ARCH_CFLAGS}" during make install to avoid issues during 
+bi-arch builds
+
+------------------------------------------------------------------------
+r213 | ryan | 2004-08-04 12:59:44 +1000 (Wed, 04 Aug 2004) | 5 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-final-prep.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-sysklogd.sh
+
+Added additional symlinks int target-final-prep.sh to appease the
+LFS bootscripts (v2.1.2).
+
+Perform target-sysklogd.sh installation as root 
+
+------------------------------------------------------------------------
+r212 | ryan | 2004-08-03 15:10:48 +1000 (Tue, 03 Aug 2004) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/plfs-config-x86_64-lfs-unstable-20040801
+
+Updated plfs-config to reflect lfs-unstable from 20040801
+
+------------------------------------------------------------------------
+r211 | ryan | 2004-08-03 15:09:22 +1000 (Tue, 03 Aug 2004) | 10 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-native.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-shared.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/make_symlinks.sh
+   A /cross-lfs/trunk/scripts/native-scripts/make_symlinks.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-bash.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-readline.sh
+   A /cross-lfs/trunk/scripts/target-scripts/make_symlinks.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-bash.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-m4.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-procps.sh
+
+Add some scripts in the script directories to create required symlinks
+for bi-arch builds
+
+Add readline to target-native builds and modify bash instructions.
+(if USE_READLINE=Y in plfs-config)
+
+(bash instructions may need revisiting)
+
+Modify target-procps.sh to pass CC to make during make install
+
+------------------------------------------------------------------------
+r210 | ryan | 2004-08-02 16:40:32 +1000 (Mon, 02 Aug 2004) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/configs/udev/udev-config-2.permissions
+
+Import new udev config
+
+------------------------------------------------------------------------
+r209 | ryan | 2004-08-02 14:22:02 +1000 (Mon, 02 Aug 2004) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/configs/kernel/linux-2.6.7-x86_64.config-K8VNXP
+   A /cross-lfs/trunk/patches/kbd-1.12.patch
+   M /cross-lfs/trunk/scripts/build-native.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-e2fsprogs.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-gawk.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-grep.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-kbd.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-make.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-man.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-module-init-tools.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-patch.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-procinfo.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-procps.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-psmisc.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-shadow.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-sysklogd.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-sysvinit.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-tar.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-util-linux.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-final-prep.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-sysklogd.sh
+
+Merge in a pile of scripts from plfs (will need to be looked at)
+Fix up symlink creation (target-final-prep.sh,target-sysklogd) and installation locations
+(native-grep.sh,native-gawk.sh,native-e2fsprogs)
+
+------------------------------------------------------------------------
+r208 | ryan | 2004-07-30 15:58:22 +1000 (Fri, 30 Jul 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-native.sh
+
+Add svn:keywords properties
+
+------------------------------------------------------------------------
+r207 | ryan | 2004-07-30 15:34:57 +1000 (Fri, 30 Jul 2004) | 8 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/host-scripts/host-coreutils-binaries.sh
+
+Added creation of localedir.h in coreutils-2.5.1+ , or else the echo
+build barfs...
+
+Error reported by 
+   Peram's LFS user <lfs@peram.org>
+   Brian Beattie <beattie@beattie-home.net>
+
+
+------------------------------------------------------------------------
+r206 | ryan | 2004-07-30 13:34:15 +1000 (Fri, 30 Jul 2004) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/ed-0.2-mkstemp-1.patch
+   A /cross-lfs/trunk/patches/kbd-1.08.patch
+   M /cross-lfs/trunk/scripts/build-native.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-ed.sh
+
+add ed and kbd patches, update build-native
+
+------------------------------------------------------------------------
+r205 | ryan | 2004-07-30 12:57:38 +1000 (Fri, 30 Jul 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/README.cross-lfs
+
+Added mention of build-native.sh
+
+------------------------------------------------------------------------
+r204 | ryan | 2004-07-30 12:38:14 +1000 (Fri, 30 Jul 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/host-scripts/host-autoconf.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-automake.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-binutils.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-bison.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-coreutils-binaries.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-flex.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-gawk.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-gcc.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-gettext.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-grep.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-libtool.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-m4.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-make.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-ncurses.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-patch.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-sed.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-tar.sh
+   M /cross-lfs/trunk/scripts/host-scripts/host-texinfo.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-nfsutils.sh
+
+Script cleanups
+
+------------------------------------------------------------------------
+r203 | ryan | 2004-07-30 12:27:38 +1000 (Fri, 30 Jul 2004) | 2 lines
+Changed paths:
+   D /cross-lfs/trunk/scripts/build-final.sh
+   A /cross-lfs/trunk/scripts/build-native.sh (from /cross-lfs/trunk/scripts/build-final.sh:202)
+
+Name change
+
+------------------------------------------------------------------------
+r202 | ryan | 2004-07-30 12:27:16 +1000 (Fri, 30 Jul 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-final.sh
+
+Alter file to point at native-scripts/*
+
+------------------------------------------------------------------------
+r201 | ryan | 2004-07-30 12:19:48 +1000 (Fri, 30 Jul 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-final.sh
+   M /cross-lfs/trunk/scripts/build-host.sh
+
+Minor fixups
+
+------------------------------------------------------------------------
+r200 | ryan | 2004-07-30 12:14:08 +1000 (Fri, 30 Jul 2004) | 2 lines
+Changed paths:
+   D /cross-lfs/trunk/scripts/final-scripts
+   A /cross-lfs/trunk/scripts/native-scripts (from /cross-lfs/trunk/scripts/final-scripts:195)
+   A /cross-lfs/trunk/scripts/native-scripts/native-autoconf.sh (from /cross-lfs/trunk/scripts/final-scripts/native-autoconf.sh:199)
+   A /cross-lfs/trunk/scripts/native-scripts/native-automake.sh (from /cross-lfs/trunk/scripts/final-scripts/native-automake.sh:199)
+   A /cross-lfs/trunk/scripts/native-scripts/native-bash.sh (from /cross-lfs/trunk/scripts/final-scripts/native-bash.sh:199)
+   A /cross-lfs/trunk/scripts/native-scripts/native-binutils.sh (from /cross-lfs/trunk/scripts/final-scripts/native-binutils.sh:199)
+   A /cross-lfs/trunk/scripts/native-scripts/native-bison.sh (from /cross-lfs/trunk/scripts/final-scripts/native-bison.sh:199)
+   A /cross-lfs/trunk/scripts/native-scripts/native-bzip2.sh (from /cross-lfs/trunk/scripts/final-scripts/native-bzip2.sh:199)
+   A /cross-lfs/trunk/scripts/native-scripts/native-coreutils.sh (from /cross-lfs/trunk/scripts/final-scripts/native-coreutils.sh:199)
+   A /cross-lfs/trunk/scripts/native-scripts/native-diffutils.sh (from /cross-lfs/trunk/scripts/final-scripts/native-diffutils.sh:199)
+   A /cross-lfs/trunk/scripts/native-scripts/native-e2fsprogs.sh (from /cross-lfs/trunk/scripts/final-scripts/native-e2fsprogs.sh:199)
+   A /cross-lfs/trunk/scripts/native-scripts/native-ed.sh (from /cross-lfs/trunk/scripts/final-scripts/native-ed.sh:199)
+   A /cross-lfs/trunk/scripts/native-scripts/native-file.sh (from /cross-lfs/trunk/scripts/final-scripts/native-file.sh:199)
+   A /cross-lfs/trunk/scripts/native-scripts/native-findutils.sh (from /cross-lfs/trunk/scripts/final-scripts/native-findutils.sh:199)
+   A /cross-lfs/trunk/scripts/native-scripts/native-flex.sh (from /cross-lfs/trunk/scripts/final-scripts/native-flex.sh:199)
+   A /cross-lfs/trunk/scripts/native-scripts/native-gawk.sh (from /cross-lfs/trunk/scripts/final-scripts/native-gawk.sh:199)
+   A /cross-lfs/trunk/scripts/native-scripts/native-gcc.sh (from /cross-lfs/trunk/scripts/final-scripts/native-gcc.sh:199)
+   A /cross-lfs/trunk/scripts/native-scripts/native-gettext.sh (from /cross-lfs/trunk/scripts/final-scripts/native-gettext.sh:199)
+   A /cross-lfs/trunk/scripts/native-scripts/native-glibc.sh (from /cross-lfs/trunk/scripts/final-scripts/native-glibc.sh:199)
+   A /cross-lfs/trunk/scripts/native-scripts/native-grep.sh (from /cross-lfs/trunk/scripts/final-scripts/native-grep.sh:199)
+   A /cross-lfs/trunk/scripts/native-scripts/native-groff.sh (from /cross-lfs/trunk/scripts/final-scripts/native-groff.sh:199)
+   A /cross-lfs/trunk/scripts/native-scripts/native-gzip.sh (from /cross-lfs/trunk/scripts/final-scripts/native-gzip.sh:199)
+   A /cross-lfs/trunk/scripts/native-scripts/native-inetutils.sh (from /cross-lfs/trunk/scripts/final-scripts/native-inetutils.sh:199)
+   A /cross-lfs/trunk/scripts/native-scripts/native-kbd.sh (from /cross-lfs/trunk/scripts/final-scripts/native-kbd.sh:199)
+   A /cross-lfs/trunk/scripts/native-scripts/native-less.sh (from /cross-lfs/trunk/scripts/final-scripts/native-less.sh:199)
+   A /cross-lfs/trunk/scripts/native-scripts/native-libtool.sh (from /cross-lfs/trunk/scripts/final-scripts/native-libtool.sh:199)
+   A /cross-lfs/trunk/scripts/native-scripts/native-m4.sh (from /cross-lfs/trunk/scripts/final-scripts/native-m4.sh:199)
+   A /cross-lfs/trunk/scripts/native-scripts/native-ncurses.sh (from /cross-lfs/trunk/scripts/final-scripts/native-ncurses.sh:199)
+   A /cross-lfs/trunk/scripts/native-scripts/native-nettools.sh (from /cross-lfs/trunk/scripts/final-scripts/native-nettools.sh:199)
+   A /cross-lfs/trunk/scripts/native-scripts/native-perl.sh (from /cross-lfs/trunk/scripts/final-scripts/native-perl.sh:199)
+   A /cross-lfs/trunk/scripts/native-scripts/native-sed.sh (from /cross-lfs/trunk/scripts/final-scripts/native-sed.sh:199)
+   A /cross-lfs/trunk/scripts/native-scripts/native-texinfo.sh (from /cross-lfs/trunk/scripts/final-scripts/native-texinfo.sh:199)
+   A /cross-lfs/trunk/scripts/native-scripts/native-vim.sh (from /cross-lfs/trunk/scripts/final-scripts/native-vim.sh:199)
+   A /cross-lfs/trunk/scripts/native-scripts/native-zlib.sh (from /cross-lfs/trunk/scripts/final-scripts/native-zlib.sh:199)
+   R /cross-lfs/trunk/scripts/native-scripts/temp-dejagnu.sh (from /cross-lfs/trunk/scripts/final-scripts/temp-dejagnu.sh:198)
+   R /cross-lfs/trunk/scripts/native-scripts/temp-expect.sh (from /cross-lfs/trunk/scripts/final-scripts/temp-expect.sh:198)
+   R /cross-lfs/trunk/scripts/native-scripts/temp-tcl.sh (from /cross-lfs/trunk/scripts/final-scripts/temp-tcl.sh:198)
+   R /cross-lfs/trunk/scripts/native-scripts/temp-vim.sh (from /cross-lfs/trunk/scripts/final-scripts/temp-vim.sh:198)
+
+Move final-scripts to native-scripts
+
+------------------------------------------------------------------------
+r199 | ryan | 2004-07-30 12:04:10 +1000 (Fri, 30 Jul 2004) | 2 lines
+Changed paths:
+   D /cross-lfs/trunk/scripts/final-scripts/final-autoconf.sh
+   D /cross-lfs/trunk/scripts/final-scripts/final-automake.sh
+   D /cross-lfs/trunk/scripts/final-scripts/final-bash.sh
+   D /cross-lfs/trunk/scripts/final-scripts/final-binutils.sh
+   D /cross-lfs/trunk/scripts/final-scripts/final-bison.sh
+   D /cross-lfs/trunk/scripts/final-scripts/final-bzip2.sh
+   D /cross-lfs/trunk/scripts/final-scripts/final-coreutils.sh
+   D /cross-lfs/trunk/scripts/final-scripts/final-diffutils.sh
+   D /cross-lfs/trunk/scripts/final-scripts/final-e2fsprogs.sh
+   D /cross-lfs/trunk/scripts/final-scripts/final-ed.sh
+   D /cross-lfs/trunk/scripts/final-scripts/final-file.sh
+   D /cross-lfs/trunk/scripts/final-scripts/final-findutils.sh
+   D /cross-lfs/trunk/scripts/final-scripts/final-flex.sh
+   D /cross-lfs/trunk/scripts/final-scripts/final-gawk.sh
+   D /cross-lfs/trunk/scripts/final-scripts/final-gcc.sh
+   D /cross-lfs/trunk/scripts/final-scripts/final-gettext.sh
+   D /cross-lfs/trunk/scripts/final-scripts/final-glibc.sh
+   D /cross-lfs/trunk/scripts/final-scripts/final-grep.sh
+   D /cross-lfs/trunk/scripts/final-scripts/final-groff.sh
+   D /cross-lfs/trunk/scripts/final-scripts/final-gzip.sh
+   D /cross-lfs/trunk/scripts/final-scripts/final-inetutils.sh
+   D /cross-lfs/trunk/scripts/final-scripts/final-kbd.sh
+   D /cross-lfs/trunk/scripts/final-scripts/final-less.sh
+   D /cross-lfs/trunk/scripts/final-scripts/final-libtool.sh
+   D /cross-lfs/trunk/scripts/final-scripts/final-m4.sh
+   D /cross-lfs/trunk/scripts/final-scripts/final-ncurses.sh
+   D /cross-lfs/trunk/scripts/final-scripts/final-nettools.sh
+   D /cross-lfs/trunk/scripts/final-scripts/final-perl.sh
+   D /cross-lfs/trunk/scripts/final-scripts/final-sed.sh
+   D /cross-lfs/trunk/scripts/final-scripts/final-texinfo.sh
+   D /cross-lfs/trunk/scripts/final-scripts/final-vim.sh
+   D /cross-lfs/trunk/scripts/final-scripts/final-zlib.sh
+   A /cross-lfs/trunk/scripts/final-scripts/native-autoconf.sh (from /cross-lfs/trunk/scripts/final-scripts/final-autoconf.sh:198)
+   A /cross-lfs/trunk/scripts/final-scripts/native-automake.sh (from /cross-lfs/trunk/scripts/final-scripts/final-automake.sh:198)
+   A /cross-lfs/trunk/scripts/final-scripts/native-bash.sh (from /cross-lfs/trunk/scripts/final-scripts/final-bash.sh:198)
+   A /cross-lfs/trunk/scripts/final-scripts/native-binutils.sh (from /cross-lfs/trunk/scripts/final-scripts/final-binutils.sh:198)
+   A /cross-lfs/trunk/scripts/final-scripts/native-bison.sh (from /cross-lfs/trunk/scripts/final-scripts/final-bison.sh:198)
+   A /cross-lfs/trunk/scripts/final-scripts/native-bzip2.sh (from /cross-lfs/trunk/scripts/final-scripts/final-bzip2.sh:198)
+   A /cross-lfs/trunk/scripts/final-scripts/native-coreutils.sh (from /cross-lfs/trunk/scripts/final-scripts/final-coreutils.sh:198)
+   A /cross-lfs/trunk/scripts/final-scripts/native-diffutils.sh (from /cross-lfs/trunk/scripts/final-scripts/final-diffutils.sh:198)
+   A /cross-lfs/trunk/scripts/final-scripts/native-e2fsprogs.sh (from /cross-lfs/trunk/scripts/final-scripts/final-e2fsprogs.sh:198)
+   A /cross-lfs/trunk/scripts/final-scripts/native-ed.sh (from /cross-lfs/trunk/scripts/final-scripts/final-ed.sh:198)
+   A /cross-lfs/trunk/scripts/final-scripts/native-file.sh (from /cross-lfs/trunk/scripts/final-scripts/final-file.sh:198)
+   A /cross-lfs/trunk/scripts/final-scripts/native-findutils.sh (from /cross-lfs/trunk/scripts/final-scripts/final-findutils.sh:198)
+   A /cross-lfs/trunk/scripts/final-scripts/native-flex.sh (from /cross-lfs/trunk/scripts/final-scripts/final-flex.sh:198)
+   A /cross-lfs/trunk/scripts/final-scripts/native-gawk.sh (from /cross-lfs/trunk/scripts/final-scripts/final-gawk.sh:198)
+   A /cross-lfs/trunk/scripts/final-scripts/native-gcc.sh (from /cross-lfs/trunk/scripts/final-scripts/final-gcc.sh:198)
+   A /cross-lfs/trunk/scripts/final-scripts/native-gettext.sh (from /cross-lfs/trunk/scripts/final-scripts/final-gettext.sh:198)
+   A /cross-lfs/trunk/scripts/final-scripts/native-glibc.sh (from /cross-lfs/trunk/scripts/final-scripts/final-glibc.sh:198)
+   A /cross-lfs/trunk/scripts/final-scripts/native-grep.sh (from /cross-lfs/trunk/scripts/final-scripts/final-grep.sh:198)
+   A /cross-lfs/trunk/scripts/final-scripts/native-groff.sh (from /cross-lfs/trunk/scripts/final-scripts/final-groff.sh:198)
+   A /cross-lfs/trunk/scripts/final-scripts/native-gzip.sh (from /cross-lfs/trunk/scripts/final-scripts/final-gzip.sh:198)
+   A /cross-lfs/trunk/scripts/final-scripts/native-inetutils.sh (from /cross-lfs/trunk/scripts/final-scripts/final-inetutils.sh:198)
+   A /cross-lfs/trunk/scripts/final-scripts/native-kbd.sh (from /cross-lfs/trunk/scripts/final-scripts/final-kbd.sh:198)
+   A /cross-lfs/trunk/scripts/final-scripts/native-less.sh (from /cross-lfs/trunk/scripts/final-scripts/final-less.sh:198)
+   A /cross-lfs/trunk/scripts/final-scripts/native-libtool.sh (from /cross-lfs/trunk/scripts/final-scripts/final-libtool.sh:198)
+   A /cross-lfs/trunk/scripts/final-scripts/native-m4.sh (from /cross-lfs/trunk/scripts/final-scripts/final-m4.sh:198)
+   A /cross-lfs/trunk/scripts/final-scripts/native-ncurses.sh (from /cross-lfs/trunk/scripts/final-scripts/final-ncurses.sh:198)
+   A /cross-lfs/trunk/scripts/final-scripts/native-nettools.sh (from /cross-lfs/trunk/scripts/final-scripts/final-nettools.sh:198)
+   A /cross-lfs/trunk/scripts/final-scripts/native-perl.sh (from /cross-lfs/trunk/scripts/final-scripts/final-perl.sh:198)
+   A /cross-lfs/trunk/scripts/final-scripts/native-sed.sh (from /cross-lfs/trunk/scripts/final-scripts/final-sed.sh:198)
+   A /cross-lfs/trunk/scripts/final-scripts/native-texinfo.sh (from /cross-lfs/trunk/scripts/final-scripts/final-texinfo.sh:198)
+   A /cross-lfs/trunk/scripts/final-scripts/native-vim.sh (from /cross-lfs/trunk/scripts/final-scripts/final-vim.sh:198)
+   A /cross-lfs/trunk/scripts/final-scripts/native-zlib.sh (from /cross-lfs/trunk/scripts/final-scripts/final-zlib.sh:198)
+
+Rename all files from target-* to native-* (except temp-* files)
+
+------------------------------------------------------------------------
+r198 | ryan | 2004-07-30 11:55:01 +1000 (Fri, 30 Jul 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/final-scripts/final-autoconf.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-automake.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-bash.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-binutils.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-bison.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-bzip2.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-coreutils.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-diffutils.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-e2fsprogs.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-ed.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-file.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-findutils.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-flex.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-gawk.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-gcc.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-gettext.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-glibc.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-grep.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-groff.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-gzip.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-inetutils.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-kbd.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-less.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-libtool.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-m4.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-ncurses.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-nettools.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-perl.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-sed.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-texinfo.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-vim.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-zlib.sh
+   M /cross-lfs/trunk/scripts/final-scripts/temp-dejagnu.sh
+   M /cross-lfs/trunk/scripts/final-scripts/temp-expect.sh
+   M /cross-lfs/trunk/scripts/final-scripts/temp-tcl.sh
+   M /cross-lfs/trunk/scripts/final-scripts/temp-vim.sh
+
+Initial mods before changing names of all final- files to native-*
+
+------------------------------------------------------------------------
+r197 | ryan | 2004-07-30 11:40:46 +1000 (Fri, 30 Jul 2004) | 2 lines
+Changed paths:
+   D /cross-lfs/trunk/scripts/final-scripts/build-zlib.sh
+
+build-zlib doesn't belong here
+
+------------------------------------------------------------------------
+r196 | ryan | 2004-07-30 11:39:51 +1000 (Fri, 30 Jul 2004) | 3 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/final-scripts/build-zlib.sh
+   A /cross-lfs/trunk/scripts/final-scripts/final-autoconf.sh
+   A /cross-lfs/trunk/scripts/final-scripts/final-automake.sh
+   A /cross-lfs/trunk/scripts/final-scripts/final-bash.sh
+   A /cross-lfs/trunk/scripts/final-scripts/final-bzip2.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-coreutils.sh
+   A /cross-lfs/trunk/scripts/final-scripts/final-diffutils.sh
+   A /cross-lfs/trunk/scripts/final-scripts/final-e2fsprogs.sh
+   A /cross-lfs/trunk/scripts/final-scripts/final-ed.sh
+   A /cross-lfs/trunk/scripts/final-scripts/final-file.sh
+   A /cross-lfs/trunk/scripts/final-scripts/final-flex.sh
+   A /cross-lfs/trunk/scripts/final-scripts/final-gettext.sh
+   A /cross-lfs/trunk/scripts/final-scripts/final-grep.sh
+   A /cross-lfs/trunk/scripts/final-scripts/final-groff.sh
+   A /cross-lfs/trunk/scripts/final-scripts/final-gzip.sh
+   A /cross-lfs/trunk/scripts/final-scripts/final-inetutils.sh
+   A /cross-lfs/trunk/scripts/final-scripts/final-kbd.sh
+   A /cross-lfs/trunk/scripts/final-scripts/final-libtool.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-ncurses.sh
+   A /cross-lfs/trunk/scripts/final-scripts/final-nettools.sh
+   A /cross-lfs/trunk/scripts/final-scripts/final-perl.sh
+   A /cross-lfs/trunk/scripts/final-scripts/final-sed.sh
+   A /cross-lfs/trunk/scripts/final-scripts/final-texinfo.sh
+
+Added a pile of scripts for final target-native build.
+Most scripts from plfs...
+
+------------------------------------------------------------------------
+r195 | ryan | 2004-07-27 13:10:30 +1000 (Tue, 27 Jul 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/configs/kernel/linux-2.6.7-x86_64.config-K8VNXP
+   M /cross-lfs/trunk/configs/kernel/linux-2.6.7-x86_64.config-usbroot
+   A /cross-lfs/trunk/scripts/build-final.sh
+   A /cross-lfs/trunk/scripts/final-scripts/copy-kern-hdrs.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-binutils.sh
+   A /cross-lfs/trunk/scripts/final-scripts/final-bison.sh
+   A /cross-lfs/trunk/scripts/final-scripts/final-coreutils.sh
+   A /cross-lfs/trunk/scripts/final-scripts/final-findutils.sh
+   A /cross-lfs/trunk/scripts/final-scripts/final-gawk.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-gcc.sh
+   M /cross-lfs/trunk/scripts/final-scripts/final-glibc.sh
+   A /cross-lfs/trunk/scripts/final-scripts/final-less.sh
+   A /cross-lfs/trunk/scripts/final-scripts/final-m4.sh
+   A /cross-lfs/trunk/scripts/final-scripts/final-ncurses.sh
+   A /cross-lfs/trunk/scripts/final-scripts/final-vim.sh
+   A /cross-lfs/trunk/scripts/final-scripts/final-zlib.sh
+   M /cross-lfs/trunk/scripts/final-scripts/temp-binutils.sh
+   M /cross-lfs/trunk/scripts/final-scripts/temp-expect.sh
+   M /cross-lfs/trunk/scripts/final-scripts/temp-perl.sh
+   M /cross-lfs/trunk/scripts/final-scripts/temp-tcl.sh
+   A /cross-lfs/trunk/scripts/final-scripts/temp-vim.sh
+   M /cross-lfs/trunk/scripts/plfs-config-x86_64-lfs6.0test
+   M /cross-lfs/trunk/scripts/target-scripts/target-final-prep.sh
+
+Added a pile of scripts for the final  native build on the target.
+Scripts are updated versions of the plfs ch6 scripts.
+
+------------------------------------------------------------------------
+r194 | ryan | 2004-07-21 17:41:38 +1000 (Wed, 21 Jul 2004) | 3 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/final-scripts
+   A /cross-lfs/trunk/scripts/final-scripts/final-binutils.sh
+   A /cross-lfs/trunk/scripts/final-scripts/final-gcc.sh
+   A /cross-lfs/trunk/scripts/final-scripts/final-glibc.sh
+   A /cross-lfs/trunk/scripts/final-scripts/specs-mod.sh
+   A /cross-lfs/trunk/scripts/final-scripts/temp-binutils.sh
+   A /cross-lfs/trunk/scripts/final-scripts/temp-dejagnu.sh
+   A /cross-lfs/trunk/scripts/final-scripts/temp-expect.sh
+   A /cross-lfs/trunk/scripts/final-scripts/temp-perl.sh
+   A /cross-lfs/trunk/scripts/final-scripts/temp-tcl.sh
+
+Add scripts to run natively on target for final build.
+Methods have been tested, scripts have yet to be tested.
+
+------------------------------------------------------------------------
+r193 | ryan | 2004-07-21 16:26:01 +1000 (Wed, 21 Jul 2004) | 3 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/target-scripts/build-lilo.sh
+   A /cross-lfs/trunk/scripts/target-scripts/target-bin86.sh
+   A /cross-lfs/trunk/scripts/target-scripts/target-nasm.sh
+
+Add scripts required for building lilo.
+
+
+------------------------------------------------------------------------
+r192 | ryan | 2004-07-21 16:23:42 +1000 (Wed, 21 Jul 2004) | 3 lines
+Changed paths:
+   A /cross-lfs/trunk/configs/kernel/linux-2.6.7-x86_64.config-K8VNXP
+   A /cross-lfs/trunk/configs/kernel/linux-2.6.7-x86_64.config-usbroot
+
+More x86_64 configs, both for Gigabyte K8VNXP MB's,
+one to be used on a bootable usb disk
+
+------------------------------------------------------------------------
+r191 | ryan | 2004-07-21 16:19:10 +1000 (Wed, 21 Jul 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-init.sh
+
+cleanups
+
+------------------------------------------------------------------------
+r190 | ryan | 2004-07-15 14:07:42 +1000 (Thu, 15 Jul 2004) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/plfs-config-x86_64-lfs6.0test
+
+Updated plfs-config for lfs6.0 test packages on x86_64
+
+------------------------------------------------------------------------
+r189 | ryan | 2004-07-15 14:00:27 +1000 (Thu, 15 Jul 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/configs/kernel/linux-2.6.7-x86_64.config
+
+Updated x86_64 kernel config - specifically for a Gigabyte K8VNXP M/B
+
+------------------------------------------------------------------------
+r188 | ryan | 2004-07-15 13:58:50 +1000 (Thu, 15 Jul 2004) | 8 lines
+Changed paths:
+   M /cross-lfs/trunk/patches/gcc-3.4.1-fix_configure_for_target_native.patch
+   M /cross-lfs/trunk/scripts/target-scripts/target-gcc.sh
+
+Cleanups in target-gcc.sh (remove symlink hacks)
+
+gcc-3.4.1-fix_configure_for_target_native.patch has been updated so as to
+avoid finding target native binutils components during configure tests
+when cross-compiling a target native compiler.
+New fix is really only required if target native binutils were built before
+this target native gcc
+
+------------------------------------------------------------------------
+r187 | ryan | 2004-07-15 13:54:23 +1000 (Thu, 15 Jul 2004) | 10 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/binutils-2.15.91.0.1-genscripts-multilib.patch
+   A /cross-lfs/trunk/patches/binutils-2.15.91.0.1-genscripts-multilib_use_libpath.patch
+   A /cross-lfs/trunk/patches/binutils-2.15.91.0.1-genscripts-no_libdir.patch
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-binutils.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-binutils.sh
+
+Fix up the patch required for fixing library search paths generated
+by genscripts.sh. Three patches are supplied here, the genscripts-multilib
+patch comprises both the no_libdir and the miltilib_use_libpath patches.
+
+cross-binutils.sh and target-binutils.sh have been updated to use the new
+patch when building 2.15 series binutils.
+
+New patches will be required for the binutils-2.14 series...
+
+
+------------------------------------------------------------------------
+r186 | ryan | 2004-07-15 13:47:05 +1000 (Thu, 15 Jul 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-crtobjs.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-full.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-hdrs.sh
+
+General cleanup...
+
+------------------------------------------------------------------------
+r185 | ryan | 2004-07-14 19:45:12 +1000 (Wed, 14 Jul 2004) | 12 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-binutils.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-final.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-shared.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-static.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-crtobjs.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-full.sh
+
+Removed the symlink hackery used during the bi-arch toolchain build.
+Symlink hackery was not required as we can specify the desired
+target ( eg i686-pc-linux-gnu ) during glibc configure as long as we
+specify CC as well ( eg x86_64-pc-linux-gnu-gcc -m32 ) and the glibc
+build will not trip over headers.
+
+Neatens up things considerably...
+This change will possibly break bi-arch builds where the default
+emulation is 32bit... but hey... this wasn't implemented well before
+anyway
+
+
+------------------------------------------------------------------------
+r183 | ryan | 2004-07-13 19:25:45 +1000 (Tue, 13 Jul 2004) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/readline-4.3-gnu_fixes-1.patch
+   A /cross-lfs/trunk/patches/sysklogd-1.4.1-kernel_headers-1.patch
+   A /cross-lfs/trunk/patches/sysklogd-1.4.1-signal-1.patch
+
+Drag in current LFS patches for sysklogd and readline
+
+------------------------------------------------------------------------
+r182 | ryan | 2004-07-13 18:32:01 +1000 (Tue, 13 Jul 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/configs/kernel/linux-2.6.7-x86_64.config
+
+Update x86_64 kernel config
+( for GA-K8VNXP M/B )
+
+------------------------------------------------------------------------
+r181 | ryan | 2004-07-13 13:48:16 +1000 (Tue, 13 Jul 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/plfs-config-powerpc-lfs-unstable-20040620
+   M /cross-lfs/trunk/scripts/plfs-config-x86_64-lfs-unstable-20040620
+
+Minor updates
+
+------------------------------------------------------------------------
+r180 | ryan | 2004-07-13 13:45:30 +1000 (Tue, 13 Jul 2004) | 22 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/gcc-3.4.1-fix_configure_for_target_native.patch
+   M /cross-lfs/trunk/scripts/target-scripts/target-gcc.sh
+
+Fix issues with target-native compiler build where tls support is disabled
+due to gcc configure not correctly determining binutils features
+
+Added patch patches/gcc-3.4.1-fix_configure_for_target_native.patch
+
+Submitted By: Ryan Oliver (ryan dot oliver at pha dot com dot au)
+Origin: Ryan Oliver
+Date: 2004-04-19
+Initial Package Version: 3.4.1 (problem exists through 3.3 series)
+Description: There are issues with configure when attempting to cross-compile a
+native gcc for target. During the last stage of make configure-host, where
+host = target, the configury doesn't check if host != build.
+Therefore it assumes that the build is a native build and performs binutils
+feature checks using either
+a) what the native compiler we are building would normally use.
+   If a target-native binutils has already been built with the same prefix,
+   this is the binutils which is used which of course will not work on host
+b) the host os's assembler/linker/nm/as
+which leads to bogus results.
+This patch fixes this behaviour, so that if host = target and host != build
+the cross tools will be used for feature checks.
+
+------------------------------------------------------------------------
+r179 | ryan | 2004-07-13 12:22:52 +1000 (Tue, 13 Jul 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-full.sh
+
+Make some checks silent
+
+------------------------------------------------------------------------
+r178 | ryan | 2004-07-13 12:19:36 +1000 (Tue, 13 Jul 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-final.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-shared.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-static.sh
+
+Fix up brainfart in ARCH setup with x86_64 (arch should be i386 for header mods)
+
+------------------------------------------------------------------------
+r177 | ryan | 2004-07-08 18:17:30 +1000 (Thu, 08 Jul 2004) | 19 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/plfs-config-powerpc-lfs-unstable-20040620
+   M /cross-lfs/trunk/scripts/plfs-config-x86_64-lfs-unstable-20040620
+   M /cross-lfs/trunk/scripts/target-scripts/target-bash.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-binutils.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-dev.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-e2fsprogs.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-findutils.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-gcc.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-m4.sh
+
+Numerous fixups concerning recent changes.
+ - Add case statement to provide correct sizee of short,int,long etc
+   for ppc64 in e2fsprogs (e2fsprogs when cross compiling uses canned
+   defaults which may not be appropriate for the arch you are building on)
+ - target-binutils.sh and target-gcc updated in line with cross-scripts/
+   changes
+ - fix sed in target-bash.sh to hardcode ${TARGET}-size into the makefile
+   as opposed to using whatever was specified as $(MACHTYPE). Ensures no
+   ambiguities in the case of, say, using ppc-*-linux-gnu or 
+   powerpc-*-linux-gnu (in both cases MACHTYPE defaults to "powerpc" , which
+   wont help you if you've configured for target ppc-* )
+ - apply regex.c hack with target-m4.sh for powerpc.
+ - need to add a hack to target-findutils.sh so the configury recognises
+   powerpc64 as a valid target (requires hackery in config.sub)
+ - run su to create /dev/console and /dev/null during udev install in
+   target-dev.sh
+
+Possibly more ;-)
+
+------------------------------------------------------------------------
+r176 | ryan | 2004-07-08 18:04:07 +1000 (Thu, 08 Jul 2004) | 5 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-hdrs.sh
+
+With NPTL for s390 powerpc and sparc we require
+sysdeps/${ARCH}/${TYPE}/bits/wordsize.h
+( where arch would be sparc, type would be sparc32/sparc64 etc )
+to be copied into */include/bits as this header is included via pthreadtypes.h
+
+------------------------------------------------------------------------
+r175 | ryan | 2004-07-08 18:00:26 +1000 (Thu, 08 Jul 2004) | 13 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-cross.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-binutils.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-final.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-shared.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-static.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-crtobjs.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-full.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-kern-hdrs.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-san-kern-hdrs.sh
+
+Many changes...
+ - s390/s390x ppc/ppc64 should now be supported for bi-arch builds
+ - ${ARCH} is now generally determined where needed via a case statement.
+   This mainly affects kernel and gcc.
+ - sparc fixups for biarch. sparcv9 is now used as ALT_TARGET for sparc64
+   builds. 
+   NOTE: if building nptl enabled glibc on sparc the toolchain MUST be
+         configured as sparcv9-*-linux-gnu due to glibc's configury
+         setting itself up according to the target triple passed. Using
+         sparc-*-linux-gnu-gcc -mcpu=v9 ( or -mcpu=ultrasparc ) -Wa,Av9a
+         (even though this is correct) will not get glibc configured correctly.
+
+
+------------------------------------------------------------------------
+r174 | fthain | 2004-06-30 23:58:29 +1000 (Wed, 30 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-final-prep.sh
+
+Fixed root passwd in the absence of shadow.
+
+------------------------------------------------------------------------
+r173 | fthain | 2004-06-30 21:41:17 +1000 (Wed, 30 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-final-prep.sh
+
+Added echo "all done".
+
+------------------------------------------------------------------------
+r172 | fthain | 2004-06-30 21:40:48 +1000 (Wed, 30 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-kernel.sh
+
+Minor fixes.
+
+------------------------------------------------------------------------
+r171 | fthain | 2004-06-30 21:40:25 +1000 (Wed, 30 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/plfs-config-m68k-lfs-5.1.1
+
+Added CONFIGS variable.
+
+------------------------------------------------------------------------
+r170 | fthain | 2004-06-30 02:05:54 +1000 (Wed, 30 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-kernel.sh
+
+Clean up.
+
+------------------------------------------------------------------------
+r169 | ryan | 2004-06-29 22:07:57 +1000 (Tue, 29 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-init.sh
+
+Don't check for udev tarball unless UDEV is set
+
+------------------------------------------------------------------------
+r168 | ryan | 2004-06-29 22:03:28 +1000 (Tue, 29 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-util-linux.sh
+
+Add HAVE_SHADOW=no to make install as well so login gets installed
+
+------------------------------------------------------------------------
+r167 | ryan | 2004-06-29 21:46:46 +1000 (Tue, 29 Jun 2004) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-util-linux.sh
+
+Force util-linux to build login by passing
+HAVE_SHADOW=no to make (overrides MCONFIG).
+This needs to be done until I get around to cross-building shadow
+
+------------------------------------------------------------------------
+r166 | fthain | 2004-06-29 21:44:18 +1000 (Tue, 29 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-lfs-bootscripts.sh
+
+Remove $PATH from etc/rc.d/init.d/functions.
+
+------------------------------------------------------------------------
+r165 | fthain | 2004-06-29 21:09:32 +1000 (Tue, 29 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-iana-etc.sh
+
+Logging etc.
+
+------------------------------------------------------------------------
+r164 | fthain | 2004-06-29 21:08:56 +1000 (Tue, 29 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/plfs-config-m68k-lfs-5.1.1
+
+Added IANA etc.
+
+------------------------------------------------------------------------
+r163 | fthain | 2004-06-29 21:08:10 +1000 (Tue, 29 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-target.sh
+
+Added IANA etc for etc/protocols and etc/services needed for sysklogd.
+
+------------------------------------------------------------------------
+r162 | fthain | 2004-06-29 20:58:03 +1000 (Tue, 29 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-final-prep.sh
+
+Fixed PS1 setting.
+
+------------------------------------------------------------------------
+r161 | fthain | 2004-06-29 20:55:12 +1000 (Tue, 29 Jun 2004) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/target-scripts/target-iana-etc.sh
+
+Initial checkin.
+
+------------------------------------------------------------------------
+r160 | fthain | 2004-06-29 02:34:52 +1000 (Tue, 29 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-final-prep.sh
+
+Add some logging, fix fstab filename, some minor clean ups.
+
+------------------------------------------------------------------------
+r159 | fthain | 2004-06-29 02:33:09 +1000 (Tue, 29 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/target-scripts/target-final-prep-wrapper.sh
+
+Fixed path to final-prep script.
+
+------------------------------------------------------------------------
+r158 | ryan | 2004-06-29 00:25:47 +1000 (Tue, 29 Jun 2004) | 16 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/udev-027-permissions-1.patch
+   M /cross-lfs/trunk/scripts/plfs-config-x86_64-lfs-unstable-20040620
+   M /cross-lfs/trunk/scripts/target-scripts/target-dev.sh
+
+Add UDEV_VER env var to plfs-config
+Add patch to fix permissions handling of /dev by udev
+
+Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
+Date: 2004-06-21
+Initial Package Version: 027
+Origin: Jim Gifford and Zack Winkles
+Upstream Status: N/A
+Description: Reverts tweak node unlink handling
+        http://linuxusb.bkbits.net:8080/udev/cset@1.759?nav=index.html|tags|ChangeSet@..1.7601
+
+        Symptons of problem: When cron executes a bash script, /dev/null changes from the
+        permissions lists in udev.rules to 600. This patch seems to correct the issue,
+        I am submitting it as a temporary fix util a better fix can be found.
+
+
+------------------------------------------------------------------------
+r157 | ryan | 2004-06-28 23:26:57 +1000 (Mon, 28 Jun 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/plfs-config-x86_64-lfs-unstable-20040620
+
+Update plfs-config to reflect recent script changes.
+ - UDEV and DEVFS env vars added
+
+------------------------------------------------------------------------
+r156 | ryan | 2004-06-28 22:26:34 +1000 (Mon, 28 Jun 2004) | 13 lines
+Changed paths:
+   A /cross-lfs/trunk/configs
+   A /cross-lfs/trunk/configs/kernel
+   A /cross-lfs/trunk/configs/kernel/linux-2.4.26-m68k.config (from /cross-lfs/trunk/scripts/linux-2.4.26-m68k.config:155)
+   A /cross-lfs/trunk/configs/kernel/linux-2.6.2-rc2-alpha.config (from /cross-lfs/trunk/scripts/linux-2.6.2-rc2-alpha.config:155)
+   A /cross-lfs/trunk/configs/kernel/linux-2.6.3-x86_64.config (from /cross-lfs/trunk/scripts/linux-2.6.3-x86_64.config:155)
+   A /cross-lfs/trunk/configs/kernel/linux-2.6.6-m68k.config (from /cross-lfs/trunk/scripts/linux-2.6.6-m68k.config:155)
+   A /cross-lfs/trunk/configs/kernel/linux-2.6.7-x86_64.config (from /cross-lfs/trunk/scripts/linux-2.6.7-x86_64.config:155)
+   A /cross-lfs/trunk/configs/udev
+   A /cross-lfs/trunk/configs/udev/udev-config-1.permissions
+   A /cross-lfs/trunk/configs/udev/udev-config-1.rules
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-kern-hdrs.sh
+   D /cross-lfs/trunk/scripts/linux-2.4.26-m68k.config
+   D /cross-lfs/trunk/scripts/linux-2.6.2-rc2-alpha.config
+   D /cross-lfs/trunk/scripts/linux-2.6.3-x86_64.config
+   D /cross-lfs/trunk/scripts/linux-2.6.6-m68k.config
+   D /cross-lfs/trunk/scripts/linux-2.6.7-x86_64.config
+   M /cross-lfs/trunk/scripts/plfs-config-x86_64-lfs-unstable-20040620
+   M /cross-lfs/trunk/scripts/target-scripts/target-dev.sh
+   M /cross-lfs/trunk/scripts/target-scripts/target-kernel.sh
+
+A few updates
+
+ o Added udev option to scripts/target-scripts/target-dev
+ o created a configs directory to place 
+  - udev configs   ( configs/udev )
+  - kernel configs ( configs/kernel )
+ o Added a CONFIGS env var in plfs-config, points to base of configs
+ o Moved kernel configs out of scripts into configs/kernel, updated
+   scripts/cross-scripts/cross-kern-hdrs.sh and 
+   scripts/target-scripts/target-kernel.sh to look in ${CONFIGS}
+ 
+New env var for plfs-config - CONFIGS
+
+------------------------------------------------------------------------
+r155 | fthain | 2004-06-28 19:51:21 +1000 (Mon, 28 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-target.sh
+
+Unset CC and CXX.
+
+------------------------------------------------------------------------
+r154 | ryan | 2004-06-28 19:42:09 +1000 (Mon, 28 Jun 2004) | 2 lines
+Changed paths:
+   D /cross-lfs/trunk/scripts/host-scripts/native-autoconf.sh
+   D /cross-lfs/trunk/scripts/host-scripts/native-automake.sh
+   D /cross-lfs/trunk/scripts/host-scripts/native-binutils.sh
+   D /cross-lfs/trunk/scripts/host-scripts/native-bison.sh
+   D /cross-lfs/trunk/scripts/host-scripts/native-coreutils-binaries.sh
+   D /cross-lfs/trunk/scripts/host-scripts/native-flex.sh
+   D /cross-lfs/trunk/scripts/host-scripts/native-gawk.sh
+   D /cross-lfs/trunk/scripts/host-scripts/native-gcc.sh
+   D /cross-lfs/trunk/scripts/host-scripts/native-gettext.sh
+   D /cross-lfs/trunk/scripts/host-scripts/native-grep.sh
+   D /cross-lfs/trunk/scripts/host-scripts/native-libtool.sh
+   D /cross-lfs/trunk/scripts/host-scripts/native-m4.sh
+   D /cross-lfs/trunk/scripts/host-scripts/native-make.sh
+   D /cross-lfs/trunk/scripts/host-scripts/native-ncurses.sh
+   D /cross-lfs/trunk/scripts/host-scripts/native-patch.sh
+   D /cross-lfs/trunk/scripts/host-scripts/native-sed.sh
+   D /cross-lfs/trunk/scripts/host-scripts/native-tar.sh
+   D /cross-lfs/trunk/scripts/host-scripts/native-texinfo.sh
+
+Remove native-* scripts from host-scripts (oversight from previous shuffle around)
+
+------------------------------------------------------------------------
+r153 | ryan | 2004-06-28 19:28:16 +1000 (Mon, 28 Jun 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-target.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-bash.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-binutils.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-bison.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-bzip2.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-coreutils.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-dev.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-diffutils.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-e2fsprogs.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-final-prep-wrapper.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-final-prep.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-findutils.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-flex.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-gawk.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-gcc.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-gettext.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-grep.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-gzip.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-inetutils.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-kernel.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-lfs-bootscripts.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-m4.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-make.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-module-init-tools.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-modutils.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-ncurses.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-nettools.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-nfsutils.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-patch.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-procps.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-sed.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-strace.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-sysklogd.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-sysvinit.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-tar.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-util-linux.sh
+   D /cross-lfs/trunk/scripts/cross-scripts/target-zlib.sh
+   A /cross-lfs/trunk/scripts/target-scripts (from /cross-lfs/trunk/scripts/cross-scripts:151)
+   D /cross-lfs/trunk/scripts/target-scripts/cross-binutils.sh
+   D /cross-lfs/trunk/scripts/target-scripts/cross-gcc-final.sh
+   D /cross-lfs/trunk/scripts/target-scripts/cross-gcc-shared.sh
+   D /cross-lfs/trunk/scripts/target-scripts/cross-gcc-static.sh
+   D /cross-lfs/trunk/scripts/target-scripts/cross-glibc-crtobjs.sh
+   D /cross-lfs/trunk/scripts/target-scripts/cross-glibc-full.sh
+   D /cross-lfs/trunk/scripts/target-scripts/cross-glibc-hdrs.sh
+   D /cross-lfs/trunk/scripts/target-scripts/cross-kern-hdrs.sh
+   D /cross-lfs/trunk/scripts/target-scripts/cross-san-kern-hdrs.sh
+
+Moved all target scripts into new directory, target-scripts.
+updated build-target.sh to reflect change
+
+------------------------------------------------------------------------
+r152 | ryan | 2004-06-28 19:17:00 +1000 (Mon, 28 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/README.cross-lfs
+
+Update README to reflect recent changes
+
+------------------------------------------------------------------------
+r151 | ryan | 2004-06-28 19:07:07 +1000 (Mon, 28 Jun 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-host.sh
+   A /cross-lfs/trunk/scripts/host-scripts (from /cross-lfs/trunk/scripts/native-scripts:149)
+   A /cross-lfs/trunk/scripts/host-scripts/host-autoconf.sh (from /cross-lfs/trunk/scripts/native-scripts/host-autoconf.sh:150)
+   A /cross-lfs/trunk/scripts/host-scripts/host-automake.sh (from /cross-lfs/trunk/scripts/native-scripts/host-automake.sh:150)
+   A /cross-lfs/trunk/scripts/host-scripts/host-binutils.sh (from /cross-lfs/trunk/scripts/native-scripts/host-binutils.sh:150)
+   A /cross-lfs/trunk/scripts/host-scripts/host-bison.sh (from /cross-lfs/trunk/scripts/native-scripts/host-bison.sh:150)
+   A /cross-lfs/trunk/scripts/host-scripts/host-coreutils-binaries.sh (from /cross-lfs/trunk/scripts/native-scripts/host-coreutils-binaries.sh:150)
+   A /cross-lfs/trunk/scripts/host-scripts/host-flex.sh (from /cross-lfs/trunk/scripts/native-scripts/host-flex.sh:150)
+   A /cross-lfs/trunk/scripts/host-scripts/host-gawk.sh (from /cross-lfs/trunk/scripts/native-scripts/host-gawk.sh:150)
+   A /cross-lfs/trunk/scripts/host-scripts/host-gcc.sh (from /cross-lfs/trunk/scripts/native-scripts/host-gcc.sh:150)
+   A /cross-lfs/trunk/scripts/host-scripts/host-gettext.sh (from /cross-lfs/trunk/scripts/native-scripts/host-gettext.sh:150)
+   A /cross-lfs/trunk/scripts/host-scripts/host-grep.sh (from /cross-lfs/trunk/scripts/native-scripts/host-grep.sh:150)
+   A /cross-lfs/trunk/scripts/host-scripts/host-libtool.sh (from /cross-lfs/trunk/scripts/native-scripts/host-libtool.sh:150)
+   A /cross-lfs/trunk/scripts/host-scripts/host-m4.sh (from /cross-lfs/trunk/scripts/native-scripts/host-m4.sh:150)
+   A /cross-lfs/trunk/scripts/host-scripts/host-make.sh (from /cross-lfs/trunk/scripts/native-scripts/host-make.sh:150)
+   A /cross-lfs/trunk/scripts/host-scripts/host-ncurses.sh (from /cross-lfs/trunk/scripts/native-scripts/host-ncurses.sh:150)
+   A /cross-lfs/trunk/scripts/host-scripts/host-patch.sh (from /cross-lfs/trunk/scripts/native-scripts/host-patch.sh:150)
+   A /cross-lfs/trunk/scripts/host-scripts/host-sed.sh (from /cross-lfs/trunk/scripts/native-scripts/host-sed.sh:150)
+   A /cross-lfs/trunk/scripts/host-scripts/host-tar.sh (from /cross-lfs/trunk/scripts/native-scripts/host-tar.sh:150)
+   A /cross-lfs/trunk/scripts/host-scripts/host-texinfo.sh (from /cross-lfs/trunk/scripts/native-scripts/host-texinfo.sh:150)
+   D /cross-lfs/trunk/scripts/native-scripts
+
+Move native-scripts dir to be host-scripts.
+Update build-host.sh to reflect changes
+
+------------------------------------------------------------------------
+r150 | ryan | 2004-06-28 19:01:20 +1000 (Mon, 28 Jun 2004) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/native-scripts/host-autoconf.sh (from /cross-lfs/trunk/scripts/native-scripts/native-autoconf.sh:149)
+   A /cross-lfs/trunk/scripts/native-scripts/host-automake.sh (from /cross-lfs/trunk/scripts/native-scripts/native-automake.sh:149)
+   A /cross-lfs/trunk/scripts/native-scripts/host-binutils.sh (from /cross-lfs/trunk/scripts/native-scripts/native-binutils.sh:149)
+   A /cross-lfs/trunk/scripts/native-scripts/host-bison.sh (from /cross-lfs/trunk/scripts/native-scripts/native-bison.sh:149)
+   A /cross-lfs/trunk/scripts/native-scripts/host-coreutils-binaries.sh (from /cross-lfs/trunk/scripts/native-scripts/native-coreutils-binaries.sh:149)
+   A /cross-lfs/trunk/scripts/native-scripts/host-flex.sh (from /cross-lfs/trunk/scripts/native-scripts/native-flex.sh:149)
+   A /cross-lfs/trunk/scripts/native-scripts/host-gawk.sh (from /cross-lfs/trunk/scripts/native-scripts/native-gawk.sh:149)
+   A /cross-lfs/trunk/scripts/native-scripts/host-gcc.sh (from /cross-lfs/trunk/scripts/native-scripts/native-gcc.sh:149)
+   A /cross-lfs/trunk/scripts/native-scripts/host-gettext.sh (from /cross-lfs/trunk/scripts/native-scripts/native-gettext.sh:149)
+   A /cross-lfs/trunk/scripts/native-scripts/host-grep.sh (from /cross-lfs/trunk/scripts/native-scripts/native-grep.sh:149)
+   A /cross-lfs/trunk/scripts/native-scripts/host-libtool.sh (from /cross-lfs/trunk/scripts/native-scripts/native-libtool.sh:149)
+   A /cross-lfs/trunk/scripts/native-scripts/host-m4.sh (from /cross-lfs/trunk/scripts/native-scripts/native-m4.sh:149)
+   A /cross-lfs/trunk/scripts/native-scripts/host-make.sh (from /cross-lfs/trunk/scripts/native-scripts/native-make.sh:149)
+   A /cross-lfs/trunk/scripts/native-scripts/host-ncurses.sh (from /cross-lfs/trunk/scripts/native-scripts/native-ncurses.sh:149)
+   A /cross-lfs/trunk/scripts/native-scripts/host-patch.sh (from /cross-lfs/trunk/scripts/native-scripts/native-patch.sh:149)
+   A /cross-lfs/trunk/scripts/native-scripts/host-sed.sh (from /cross-lfs/trunk/scripts/native-scripts/native-sed.sh:149)
+   A /cross-lfs/trunk/scripts/native-scripts/host-tar.sh (from /cross-lfs/trunk/scripts/native-scripts/native-tar.sh:149)
+   A /cross-lfs/trunk/scripts/native-scripts/host-texinfo.sh (from /cross-lfs/trunk/scripts/native-scripts/native-texinfo.sh:149)
+   D /cross-lfs/trunk/scripts/native-scripts/native-autoconf.sh
+   D /cross-lfs/trunk/scripts/native-scripts/native-automake.sh
+   D /cross-lfs/trunk/scripts/native-scripts/native-binutils.sh
+   D /cross-lfs/trunk/scripts/native-scripts/native-bison.sh
+   D /cross-lfs/trunk/scripts/native-scripts/native-coreutils-binaries.sh
+   D /cross-lfs/trunk/scripts/native-scripts/native-flex.sh
+   D /cross-lfs/trunk/scripts/native-scripts/native-gawk.sh
+   D /cross-lfs/trunk/scripts/native-scripts/native-gcc.sh
+   D /cross-lfs/trunk/scripts/native-scripts/native-gettext.sh
+   D /cross-lfs/trunk/scripts/native-scripts/native-grep.sh
+   D /cross-lfs/trunk/scripts/native-scripts/native-libtool.sh
+   D /cross-lfs/trunk/scripts/native-scripts/native-m4.sh
+   D /cross-lfs/trunk/scripts/native-scripts/native-make.sh
+   D /cross-lfs/trunk/scripts/native-scripts/native-ncurses.sh
+   D /cross-lfs/trunk/scripts/native-scripts/native-patch.sh
+   D /cross-lfs/trunk/scripts/native-scripts/native-sed.sh
+   D /cross-lfs/trunk/scripts/native-scripts/native-tar.sh
+   D /cross-lfs/trunk/scripts/native-scripts/native-texinfo.sh
+
+Renamed all the files under native-scripts from native* to host*
+
+------------------------------------------------------------------------
+r149 | ryan | 2004-06-28 18:28:59 +1000 (Mon, 28 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-cross.sh
+   A /cross-lfs/trunk/scripts/build-target.sh (from /cross-lfs/trunk/scripts/build-cross.sh:147)
+
+Split out all the target native builds from build-cross.sh into new script, build-target.sh
+
+------------------------------------------------------------------------
+r148 | ryan | 2004-06-28 18:13:16 +1000 (Mon, 28 Jun 2004) | 3 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/build-host.sh (from /cross-lfs/trunk/scripts/build-native.sh:146)
+   D /cross-lfs/trunk/scripts/build-native.sh
+
+Renamed build-native.sh to build-host.sh
+Updated comments
+
+------------------------------------------------------------------------
+r147 | ryan | 2004-06-28 15:34:28 +1000 (Mon, 28 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-cross.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-binutils.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-final.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-shared.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-static.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-crtobjs.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-full.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/target-binutils.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/target-gcc.sh
+
+Merge in changes from biarch consolidation branch -r 109:146
+
+------------------------------------------------------------------------
+r146 | ryan | 2004-06-28 15:11:58 +1000 (Mon, 28 Jun 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-sysvinit.sh
+
+create required directories for sysvinit to install into.
+it doesn't create them itself
+
+------------------------------------------------------------------------
+r143 | ryan | 2004-06-28 14:02:41 +1000 (Mon, 28 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-procps.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/target-sysvinit.sh
+
+Fix install issues due to missing directories under ${LFS}
+
+------------------------------------------------------------------------
+r141 | ryan | 2004-06-28 13:39:01 +1000 (Mon, 28 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-e2fsprogs.sh
+
+Minor fixups
+
+------------------------------------------------------------------------
+r139 | ryan | 2004-06-28 13:12:43 +1000 (Mon, 28 Jun 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-e2fsprogs.sh
+
+Create ${LFS}/bin if it doesn't exist.
+Create symlinks instead of hard links. 
+
+------------------------------------------------------------------------
+r137 | fthain | 2004-06-28 01:22:09 +1000 (Mon, 28 Jun 2004) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/sysklogd-1.4.1-cross.patch
+   A /cross-lfs/trunk/scripts/cross-scripts/target-strace.sh
+
+Initial checkin.
+
+------------------------------------------------------------------------
+r136 | fthain | 2004-06-28 01:21:19 +1000 (Mon, 28 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-cross.sh
+   M /cross-lfs/trunk/scripts/plfs-config-m68k-lfs-5.1.1
+
+Added strace build.
+
+------------------------------------------------------------------------
+r132 | fthain | 2004-06-27 22:52:18 +1000 (Sun, 27 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-cross.sh
+
+Added sysklogd.
+
+------------------------------------------------------------------------
+r131 | fthain | 2004-06-27 22:48:29 +1000 (Sun, 27 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-kernel.sh
+
+Changed mkdir usr/lib/modules to lib/modules...
+
+------------------------------------------------------------------------
+r129 | fthain | 2004-06-27 21:48:38 +1000 (Sun, 27 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-final-prep.sh
+
+Added /usr/sbin to PATH.
+
+------------------------------------------------------------------------
+r127 | fthain | 2004-06-27 01:41:47 +1000 (Sun, 27 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-sysklogd.sh
+
+Forgot mkdir man8.
+
+------------------------------------------------------------------------
+r126 | fthain | 2004-06-27 01:36:32 +1000 (Sun, 27 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-sysklogd.sh
+
+New patch to avoid host strip, uses cross compiler, path fix.
+
+------------------------------------------------------------------------
+r125 | fthain | 2004-06-27 01:03:39 +1000 (Sun, 27 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-sysklogd.sh
+
+Install into TGT_TOOLS.
+
+------------------------------------------------------------------------
+r124 | ryan | 2004-06-27 01:00:35 +1000 (Sun, 27 Jun 2004) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/sysklogd-1.4.1.patch
+   A /cross-lfs/trunk/scripts/cross-scripts/target-sysklogd.sh
+
+import sysklogd script and patch from plfs-2.3.1b9.
+
+------------------------------------------------------------------------
+r122 | fthain | 2004-06-26 23:54:37 +1000 (Sat, 26 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-e2fsprogs.sh
+
+Moved install to TGT_TOOLS.
+
+------------------------------------------------------------------------
+r121 | fthain | 2004-06-26 23:54:08 +1000 (Sat, 26 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-procps.sh
+
+Moved install to TGT_TOOLS.
+
+------------------------------------------------------------------------
+r120 | fthain | 2004-06-26 23:51:04 +1000 (Sat, 26 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-final-prep.sh
+
+Added /etc/profile.
+
+------------------------------------------------------------------------
+r118 | fthain | 2004-06-25 02:29:36 +1000 (Fri, 25 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-final-prep.sh
+
+Added more psuedo file system fstab entries.
+
+------------------------------------------------------------------------
+r117 | fthain | 2004-06-24 15:29:42 +1000 (Thu, 24 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-kernel.sh
+
+Removed chown root since final-prep script does that now.
+
+------------------------------------------------------------------------
+r116 | fthain | 2004-06-24 15:29:10 +1000 (Thu, 24 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-final-prep.sh
+
+Fixed up file ownership and permissions.
+
+------------------------------------------------------------------------
+r108 | ryan | 2004-06-23 12:23:30 +1000 (Wed, 23 Jun 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-e2fsprogs.sh
+
+Fix some permissions issues when building the e2fsprogs 1.35 tarball
+as a normal user. Need to check if previous versions are affected
+
+------------------------------------------------------------------------
+r107 | ryan | 2004-06-23 12:16:52 +1000 (Wed, 23 Jun 2004) | 9 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/m4-1.4-regex_c-hack.patch
+   M /cross-lfs/trunk/scripts/cross-scripts/target-m4.sh
+
+Add a hack due to breakage (so far only with biarch x86_64, when building
+against glibc-2.3.3+ with gcc-3.4.0 and 3.4.1, buit this remains to be seen).
+
+In regex.c malloc and calloc included by stdlib.h, but get redefined by regex.c
+itself.
+
+Patch just forces regex.c to read stlib.h and removes the redefinitions.
+This hack is pretty awful and will need looking at...
+
+------------------------------------------------------------------------
+r106 | ryan | 2004-06-23 12:05:59 +1000 (Wed, 23 Jun 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-procps.sh
+
+Edit makefile so owner and group during install are set to the
+build users uid and gid. Allows us to install when not root.
+
+------------------------------------------------------------------------
+r105 | ryan | 2004-06-23 12:03:19 +1000 (Wed, 23 Jun 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-flex.sh
+
+Touch ./doc/flex.1 when applying the debian-fixes patch as the build
+breaks when attempting to regenerate the docs.
+
+------------------------------------------------------------------------
+r104 | ryan | 2004-06-23 11:52:19 +1000 (Wed, 23 Jun 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-final.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/target-gcc.sh
+
+Update comments
+Set startfile prefix in target-gcc.sh (as is done in cross-gcc-final)
+
+------------------------------------------------------------------------
+r103 | fthain | 2004-06-23 00:50:55 +1000 (Wed, 23 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-modutils.sh
+
+Don't ask install to strip because it can't deal with m68k binaries.
+
+------------------------------------------------------------------------
+r102 | fthain | 2004-06-23 00:49:43 +1000 (Wed, 23 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/plfs-config-m68k-lfs-5.1.1
+
+Revert to binutils 2.14 to stay with LFS 5.1.
+
+------------------------------------------------------------------------
+r101 | fthain | 2004-06-23 00:49:01 +1000 (Wed, 23 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-bash.sh
+
+New entry in config cache because configure can't cross compile for m68k.
+
+------------------------------------------------------------------------
+r100 | fthain | 2004-06-23 00:48:11 +1000 (Wed, 23 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-flex.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/target-patch.sh
+
+Set CC because configure never twigged that it is cross compiling.
+
+------------------------------------------------------------------------
+r99 | fthain | 2004-06-22 19:06:41 +1000 (Tue, 22 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-cross.sh
+   M /cross-lfs/trunk/scripts/build-init.sh
+   M /cross-lfs/trunk/scripts/build-native.sh
+
+Removed email address.
+
+------------------------------------------------------------------------
+r98 | ryan | 2004-06-22 17:46:51 +1000 (Tue, 22 Jun 2004) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/linux-2.6.7-x86_64.config
+
+Add linux-2.6.7 .config for x86_64
+
+------------------------------------------------------------------------
+r97 | ryan | 2004-06-22 17:45:32 +1000 (Tue, 22 Jun 2004) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/plfs-config-x86_64-lfs-unstable-20040620
+
+Add plfs-config sample for x86_64 biarch with lfs unstable packages from 20040620
+
+------------------------------------------------------------------------
+r96 | ryan | 2004-06-22 16:04:00 +1000 (Tue, 22 Jun 2004) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-san-kern-hdrs.sh
+
+fix cross-san-kern-hdrs to set permissions properly on the
+unpacked libc-linux-headers tarball.
+
+
+------------------------------------------------------------------------
+r95 | fthain | 2004-06-22 15:22:31 +1000 (Tue, 22 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/patches/linux-2.4.26-m68k-lfh.patch
+
+Updated to m68k kernel tree as at 20040621.
+
+------------------------------------------------------------------------
+r94 | fthain | 2004-06-22 15:12:15 +1000 (Tue, 22 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-cross.sh
+
+Fixed out-of-date comment.
+
+------------------------------------------------------------------------
+r93 | ryan | 2004-06-22 14:28:18 +1000 (Tue, 22 Jun 2004) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/plfs-config-m68k-2.4.26-RO
+
+commit plfs-config from previous build of m68k against 2.4.26 kernel
+
+------------------------------------------------------------------------
+r92 | ryan | 2004-06-22 14:06:41 +1000 (Tue, 22 Jun 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-binutils.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/target-binutils.sh
+
+Update binutils scripts to apply genscripts-multilib patch
+to HJL 2.15.91.0.* versions
+
+------------------------------------------------------------------------
+r91 | ryan | 2004-06-22 14:01:52 +1000 (Tue, 22 Jun 2004) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-util-linux.sh
+
+Rearrange target-util-linux script.
+Remove old util-linux 2.6 hdr fix patch
+
+
+------------------------------------------------------------------------
+r90 | ryan | 2004-06-22 13:57:36 +1000 (Tue, 22 Jun 2004) | 10 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/util-linux-2.12a-kernel_headers-1.patch
+   M /cross-lfs/trunk/scripts/cross-scripts/target-util-linux.sh
+
+Add some logic around the application of patches.
+Add patch for compiling util-linux-2.12* against 2.6 headers
+
+Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
+Date: 2004-01-30
+Initial Package Version: 2.12
+Origin: Gentoo
+Description: Fixes Compile Issues with the 2.6 Kernel
+
+
+------------------------------------------------------------------------
+r89 | ryan | 2004-06-22 13:55:29 +1000 (Tue, 22 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-sed.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-sed.sh
+
+Fix apply_patch invocation
+
+------------------------------------------------------------------------
+r88 | ryan | 2004-06-22 13:36:00 +1000 (Tue, 22 Jun 2004) | 3 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/bash-2.05b-gnu_fixes-2.patch
+   M /cross-lfs/trunk/scripts/cross-scripts/target-bash.sh
+
+Add conglomeration patch of all official bash-2.05b patches from gnu.
+
+
+------------------------------------------------------------------------
+r87 | ryan | 2004-06-22 13:19:07 +1000 (Tue, 22 Jun 2004) | 13 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/flex-2.5.31-debian_fixes-2.patch
+   M /cross-lfs/trunk/scripts/cross-scripts/target-flex.sh
+   M /cross-lfs/trunk/scripts/native-scripts/native-flex.sh
+
+Add fixes required for flex-2.5.31
+
+Submitted By: Zack Winkles <winkie@linuxfromscratch.org>
+Date: 2004-03-01
+Initial Package Version: 2.5.31
+Origin: Debian
+Description: This fixes a ton of things. I'm not entirely sure what, but
+        it's all stuff that Debian thought to be broken, and I trust them.
+        All the non-code changes have been stripped (otherwise it would
+        be gargantuan). I've been using this patch for a few months now
+        and it makes flex not suck anymore. That's a good thing.
+
+
+------------------------------------------------------------------------
+r86 | ryan | 2004-06-22 13:07:24 +1000 (Tue, 22 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/native-scripts/native-sed.sh
+
+Apply sed fix to native-sed script too
+
+------------------------------------------------------------------------
+r85 | ryan | 2004-06-22 13:04:03 +1000 (Tue, 22 Jun 2004) | 14 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/sed-4.1-permissions-1.patch
+   M /cross-lfs/trunk/scripts/cross-scripts/target-sed.sh
+
+Add patch for sed 4.1
+
+Submitted By:            Matthew Burgess
+Date:                    2004-06-17
+Initial Package Version: 4.1
+Upstream Status:         Submitted and accepted upstream
+Origin:                  Bruce Dubbs
+                         (http://www.linuxfromscratch.org/pipermail/lfs-dev/2004-June/046773.html)
+Description:             When using the in-place function, sed 4.1 changes
+                         permissions. Specifically, when using sed on a bash
+                         script with permissions 755, the updated file has
+                         permissions 600.
+
+
+------------------------------------------------------------------------
+r84 | ryan | 2004-06-22 12:55:00 +1000 (Tue, 22 Jun 2004) | 11 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/sysvinit-2.85-proclen-1.patch
+   M /cross-lfs/trunk/scripts/cross-scripts/target-sysvinit.sh
+
+Add patch from LFS unstable 20040620
+
+Submitted By: Alexander E. Patrakov (semzx at newmail dot ru)
+Origin: Alexander E. Patrakov
+Date: 2003-11-22
+Initial Package Version: 2.85
+Description: Without this patch, init sometimes clobbers environment variables
+set by kernel (such as TERM) when trying to change process title for ps
+due to out-of-bounds access to the command line arguments.
+
+
+------------------------------------------------------------------------
+r83 | fthain | 2004-06-21 01:44:57 +1000 (Mon, 21 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/patches/linux-2.4.26-m68k-lfh.patch
+
+Added mac related patches from m68k tree cvs as at 20040620.
+
+------------------------------------------------------------------------
+r82 | fthain | 2004-06-21 01:40:28 +1000 (Mon, 21 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-kernel.sh
+
+Removed extra prompt.
+
+------------------------------------------------------------------------
+r81 | fthain | 2004-06-21 01:37:00 +1000 (Mon, 21 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/plfs-config-m68k-lfs-5.1.1
+
+Binutils update to fix (?) binfmt problems.
+
+------------------------------------------------------------------------
+r80 | fthain | 2004-06-20 18:43:56 +1000 (Sun, 20 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-kernel.sh
+
+Fix install log variable name.
+
+------------------------------------------------------------------------
+r79 | fthain | 2004-06-20 18:29:33 +1000 (Sun, 20 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-kernel.sh
+
+Added patch to fix m68k kernel build.
+
+------------------------------------------------------------------------
+r78 | fthain | 2004-06-20 18:28:55 +1000 (Sun, 20 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/linux-2.4.26-m68k.config
+
+Remove IDE CDROM driver due to will-not-fix bug in gcc 3.3.3 (use gcc 3.4.0)
+
+------------------------------------------------------------------------
+r77 | fthain | 2004-06-20 18:28:03 +1000 (Sun, 20 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/plfs-config-m68k-lfs-5.1.1
+
+Path changes.
+
+------------------------------------------------------------------------
+r76 | fthain | 2004-06-20 17:46:53 +1000 (Sun, 20 Jun 2004) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/linux-2.4.26-m68k-lfh.patch
+
+Initial checkin.
+
+------------------------------------------------------------------------
+r75 | fthain | 2004-06-20 15:22:03 +1000 (Sun, 20 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/patches/linux-2.4-lfh-Makefile.patch
+
+Made to work with -p1.
+
+------------------------------------------------------------------------
+r74 | fthain | 2004-06-20 15:18:02 +1000 (Sun, 20 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-kernel.sh
+
+Added test for depmod install success.
+
+------------------------------------------------------------------------
+r73 | fthain | 2004-06-20 15:13:36 +1000 (Sun, 20 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-kernel.sh
+
+Made executable.
+
+------------------------------------------------------------------------
+r72 | fthain | 2004-06-20 15:06:06 +1000 (Sun, 20 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-cross.sh
+
+Removed extra ".
+
+------------------------------------------------------------------------
+r71 | fthain | 2004-06-20 15:04:42 +1000 (Sun, 20 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-kernel.sh
+
+Create usr/lib/modules.
+
+------------------------------------------------------------------------
+r70 | fthain | 2004-06-20 15:04:03 +1000 (Sun, 20 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-cross.sh
+
+Added target-kernel.sh script.
+
+------------------------------------------------------------------------
+r69 | fthain | 2004-06-20 14:38:40 +1000 (Sun, 20 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-kern-hdrs.sh
+
+Cleanups.
+
+------------------------------------------------------------------------
+r68 | fthain | 2004-06-20 14:38:29 +1000 (Sun, 20 Jun 2004) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/cross-scripts/target-kernel.sh
+
+Initial checkin.
+
+------------------------------------------------------------------------
+r67 | fthain | 2004-06-20 14:04:12 +1000 (Sun, 20 Jun 2004) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/linux-2.6-lfh-Makefile.patch
+
+Initial checkin.
+
+------------------------------------------------------------------------
+r66 | fthain | 2004-06-20 13:52:15 +1000 (Sun, 20 Jun 2004) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/depmod-pl-lfh-cross-compile.patch
+
+Initial checkin.
+
+------------------------------------------------------------------------
+r65 | fthain | 2004-06-20 13:29:58 +1000 (Sun, 20 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/linux-2.4.26-m68k.config
+
+Removed non-functional, non-compiling and non-linking drivers.
+
+------------------------------------------------------------------------
+r64 | fthain | 2004-06-20 13:22:25 +1000 (Sun, 20 Jun 2004) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/linux-2.4-lfh-Makefile.patch
+
+Initial checkin.
+
+------------------------------------------------------------------------
+r63 | ryan | 2004-06-20 00:46:54 +1000 (Sun, 20 Jun 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-inetutils.sh
+
+Fix man and info install directories
+also properly handle libexecdir during biarch builds
+
+------------------------------------------------------------------------
+r62 | ryan | 2004-06-20 00:28:24 +1000 (Sun, 20 Jun 2004) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/cross-scripts/target-final-prep-wrapper.sh
+
+Re added...
+
+------------------------------------------------------------------------
+r61 | ryan | 2004-06-20 00:27:41 +1000 (Sun, 20 Jun 2004) | 2 lines
+Changed paths:
+   D /cross-lfs/trunk/scripts/cross-scripts/target-final-prep-wrapper.sh
+
+Removed
+
+------------------------------------------------------------------------
+r60 | ryan | 2004-06-20 00:24:21 +1000 (Sun, 20 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-final-prep-wrapper.sh
+
+Add some comments, update perms
+
+------------------------------------------------------------------------
+r59 | ryan | 2004-06-20 00:21:18 +1000 (Sun, 20 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-cross.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-final-prep-wrapper.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/target-final-prep.sh
+
+Add a wrapper script so we can run target-final-prep.sh as root via su
+
+------------------------------------------------------------------------
+r58 | fthain | 2004-06-20 00:13:54 +1000 (Sun, 20 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-bash.sh
+
+Reinstate bash symlink.
+
+------------------------------------------------------------------------
+r57 | ryan | 2004-06-20 00:10:11 +1000 (Sun, 20 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-final-prep.sh
+
+update bash symlink creation
+
+------------------------------------------------------------------------
+r56 | ryan | 2004-06-20 00:06:53 +1000 (Sun, 20 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-final-prep.sh
+
+remove plfs stuff inappropriate for cross-lfs from target-final-prep
+
+------------------------------------------------------------------------
+r55 | ryan | 2004-06-19 23:30:13 +1000 (Sat, 19 Jun 2004) | 3 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/cross-scripts/target-final-prep.sh
+
+modify final-prep.sh from the plfs scripts and add it in here.
+This has to be run as root...
+
+------------------------------------------------------------------------
+r54 | fthain | 2004-06-19 23:15:18 +1000 (Sat, 19 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-bash.sh
+
+Added bin/bash symlink.
+
+------------------------------------------------------------------------
+r53 | ryan | 2004-06-19 23:11:04 +1000 (Sat, 19 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-dev.sh
+
+Wrap MAKEDEV with su -c
+
+------------------------------------------------------------------------
+r52 | ryan | 2004-06-19 23:04:03 +1000 (Sat, 19 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-dev.sh
+
+cleanup script of blatant stupidity
+
+------------------------------------------------------------------------
+r51 | ryan | 2004-06-19 23:02:28 +1000 (Sat, 19 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-lfs-bootscripts.sh
+
+Fix up logging
+
+------------------------------------------------------------------------
+r50 | ryan | 2004-06-19 22:59:28 +1000 (Sat, 19 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/plfs-config-m68k-lfs-5.1.1
+
+Add MAKEDEV_VER env var to plfs-config for m68k
+
+------------------------------------------------------------------------
+r49 | fthain | 2004-06-19 22:24:20 +1000 (Sat, 19 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-bash.sh
+
+Fix symlink.
+
+------------------------------------------------------------------------
+r48 | ryan | 2004-06-19 21:21:05 +1000 (Sat, 19 Jun 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-bison.sh
+
+Fix up brainfart with creation of ${TGT_TOOLS}/bin/yacc
+
+
+------------------------------------------------------------------------
+r47 | ryan | 2004-06-19 19:47:20 +1000 (Sat, 19 Jun 2004) | 4 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-cross.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-lfs-bootscripts.sh
+
+Added script to install and setup the lfs bootscripts package.
+More work to do, need to move network configuration vars to 
+plfs-config methinks...
+
+------------------------------------------------------------------------
+r46 | ryan | 2004-06-19 19:06:58 +1000 (Sat, 19 Jun 2004) | 6 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-cross.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/target-dev.sh
+
+Add do_makedev() to cross-scripts/target-dev.sh
+Add target-dev.sh into the scriptlist in build-cross.sh
+
+At some point will have to add do_udev() and do_devfs()
+
+
+------------------------------------------------------------------------
+r45 | fthain | 2004-06-19 17:15:13 +1000 (Sat, 19 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/plfs-config-m68k-lfs-5.1.1
+
+Changed home dir paths to $HOME, cleanups.
+
+------------------------------------------------------------------------
+r44 | ryan | 2004-06-19 16:26:59 +1000 (Sat, 19 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-cross.sh
+   M /cross-lfs/trunk/scripts/build-native.sh
+
+Add check if ${SRC} exists or not... if it doesn't it will be created
+
+------------------------------------------------------------------------
+r43 | fthain | 2004-06-19 16:16:20 +1000 (Sat, 19 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/plfs-config-m68k-lfs-5.1.1
+
+Rearranged paths.
+
+------------------------------------------------------------------------
+r42 | ryan | 2004-06-19 15:31:23 +1000 (Sat, 19 Jun 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/build-cross.sh
+   M /cross-lfs/trunk/scripts/build-native.sh
+
+Add sanity check for env vars supplied by plfs-config.
+Barf out if they do not exist
+
+------------------------------------------------------------------------
+r41 | fthain | 2004-06-19 15:29:06 +1000 (Sat, 19 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-final.sh
+   M /cross-lfs/trunk/scripts/cross-scripts/target-gcc.sh
+
+Comment out Solaris CONFIG_SHELL hack until a better fix is found.
+
+------------------------------------------------------------------------
+r40 | fthain | 2004-06-19 15:25:50 +1000 (Sat, 19 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-util-linux.sh
+
+Run make install as root.
+
+------------------------------------------------------------------------
+r39 | fthain | 2004-06-19 15:12:24 +1000 (Sat, 19 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-util-linux.sh
+
+Added patch for swapon and fdisk build failures.
+
+------------------------------------------------------------------------
+r38 | fthain | 2004-06-19 15:10:09 +1000 (Sat, 19 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-bash.sh
+
+Create missing /bin/sh.
+
+------------------------------------------------------------------------
+r37 | ryan | 2004-06-19 15:09:48 +1000 (Sat, 19 Jun 2004) | 4 lines
+Changed paths:
+   D /cross-lfs/trunk/scripts/plfs-config
+   A /cross-lfs/trunk/scripts/plfs-config-sparc64-lfs-unstable (from /cross-lfs/trunk/scripts/plfs-config:35)
+
+remove plfs-config from the repo... this should be copied from one of the
+samples and modified accordingly by the user. Otherwise this file is gonna
+be constantly updated...
+
+------------------------------------------------------------------------
+r36 | fthain | 2004-06-19 15:08:54 +1000 (Sat, 19 Jun 2004) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/plfs-config-m68k-lfs-5.1.1
+
+Initial checkin.
+
+------------------------------------------------------------------------
+r35 | fthain | 2004-06-19 14:53:39 +1000 (Sat, 19 Jun 2004) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/util-linux-2.12a-cross-lfs-fixes.patch
+
+Initial checkin.
+
+------------------------------------------------------------------------
+r34 | ryan | 2004-06-19 14:31:10 +1000 (Sat, 19 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-util-linux.sh
+
+fixed creation of /var/lib/hwclock so it is created under ${LFS}
+
+------------------------------------------------------------------------
+r33 | fthain | 2004-06-19 13:58:29 +1000 (Sat, 19 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-sysvinit.sh
+
+Run make install as root.
+
+------------------------------------------------------------------------
+r32 | fthain | 2004-06-19 12:35:12 +1000 (Sat, 19 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/target-coreutils.sh
+
+Remove debugging output.
+
+------------------------------------------------------------------------
+r31 | ryan | 2004-06-17 12:39:43 +1000 (Thu, 17 Jun 2004) | 3 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-full.sh
+
+changed application of m68k patch in scripts/cross-scripts/cross-glibc-full.sh
+to use apply_patch function instead of manually running patch
+
+------------------------------------------------------------------------
+r30 | fthain | 2004-06-16 23:46:13 +1000 (Wed, 16 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-full.sh
+
+Added m68k patches.
+
+------------------------------------------------------------------------
+r29 | fthain | 2004-06-16 22:24:44 +1000 (Wed, 16 Jun 2004) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/patches/glibc-2.3.3-lfh-m68k-no-precision-timers.patch
+
+Initial checkin.
+
+------------------------------------------------------------------------
+r28 | fthain | 2004-06-15 21:18:53 +1000 (Tue, 15 Jun 2004) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts/plfs-config-2.4.4-m68k
+
+Initial checkin.
+
+------------------------------------------------------------------------
+r27 | fthain | 2004-06-15 21:04:14 +1000 (Tue, 15 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/README.cross-lfs
+
+Added svn checkout command.
+
+------------------------------------------------------------------------
+r26 | ryan | 2004-06-13 23:00:50 +1000 (Sun, 13 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/README.cross-lfs
+
+Update README spiel
+
+------------------------------------------------------------------------
+r25 | ryan | 2004-06-13 22:53:01 +1000 (Sun, 13 Jun 2004) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/patches
+   A /cross-lfs/trunk/patches/bash-2.05b-gcc34-1.patch
+   A /cross-lfs/trunk/patches/binutils-2.14-genscripts-multilib.patch
+   A /cross-lfs/trunk/patches/binutils-2.14.90.0.8-genscripts-multilib.patch
+   A /cross-lfs/trunk/patches/binutils-2.15.90.0.1-genscripts-multilib.patch
+   A /cross-lfs/trunk/patches/e2fsprogs-1.34-2.6.0hdr-fix.patch
+   A /cross-lfs/trunk/patches/glibc-2.3.3-lfs-5.1-m68k_fix_fcntl.patch
+   A /cross-lfs/trunk/patches/linux-2.6.6-x86_64-unistd_h-fix.patch
+   A /cross-lfs/trunk/patches/module-init-tools-3.0-cross-moveold.patch
+   A /cross-lfs/trunk/patches/net-tools-1.60-gcc34-2.patch
+   A /cross-lfs/trunk/patches/net-tools-1.60-kernel-headers-1.patch
+   A /cross-lfs/trunk/patches/net-tools-1.60-miitool-gcc33-1.patch
+
+Adding Patches (missed these last commit ;-) )
+
+------------------------------------------------------------------------
+r24 | ryan | 2004-06-13 22:51:41 +1000 (Sun, 13 Jun 2004) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/scripts
+   A /cross-lfs/trunk/scripts/build-cross.sh
+   A /cross-lfs/trunk/scripts/build-init.sh
+   A /cross-lfs/trunk/scripts/build-native.sh
+   A /cross-lfs/trunk/scripts/cross-scripts
+   A /cross-lfs/trunk/scripts/cross-scripts/cross-binutils.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-final.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-shared.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/cross-gcc-static.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-crtobjs.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-full.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/cross-glibc-hdrs.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/cross-kern-hdrs.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/cross-san-kern-hdrs.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-bash.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-binutils.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-bison.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-bzip2.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-coreutils.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-dev.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-diffutils.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-e2fsprogs.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-findutils.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-flex.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-gawk.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-gcc.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-gettext.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-grep.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-gzip.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-inetutils.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-m4.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-make.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-module-init-tools.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-modutils.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-ncurses.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-nettools.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-nfsutils.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-patch.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-procps.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-sed.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-sysvinit.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-tar.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-util-linux.sh
+   A /cross-lfs/trunk/scripts/cross-scripts/target-zlib.sh
+   A /cross-lfs/trunk/scripts/linux-2.4.26-m68k.config
+   A /cross-lfs/trunk/scripts/linux-2.6.2-rc2-alpha.config
+   A /cross-lfs/trunk/scripts/linux-2.6.3-x86_64.config
+   A /cross-lfs/trunk/scripts/linux-2.6.6-m68k.config
+   A /cross-lfs/trunk/scripts/native-scripts
+   A /cross-lfs/trunk/scripts/native-scripts/native-autoconf.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-automake.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-binutils.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-bison.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-coreutils-binaries.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-flex.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-gawk.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-gcc.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-gettext.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-grep.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-libtool.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-m4.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-make.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-ncurses.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-patch.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-sed.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-tar.sh
+   A /cross-lfs/trunk/scripts/native-scripts/native-texinfo.sh
+   A /cross-lfs/trunk/scripts/plfs-config
+   A /cross-lfs/trunk/scripts/plfs-config-2.4.1
+   A /cross-lfs/trunk/scripts/plfs-config-2.4.3-m68k
+   A /cross-lfs/trunk/scripts/plfs-config-20040217-x86
+
+Initial import of cross-lfs scripts and patches
+
+------------------------------------------------------------------------
+r23 | ryan | 2004-06-13 20:31:06 +1000 (Sun, 13 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/README.cross-lfs
+
+reverted to rev 21
+
+------------------------------------------------------------------------
+r22 | ryan | 2004-06-13 19:50:56 +1000 (Sun, 13 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/README.cross-lfs
+
+pre revert to old version
+
+------------------------------------------------------------------------
+r21 | ryan | 2004-06-13 19:39:49 +1000 (Sun, 13 Jun 2004) | 2 lines
+Changed paths:
+   M /cross-lfs/trunk/README.cross-lfs
+
+testing
+
+------------------------------------------------------------------------
+r18 | ryan | 2004-06-13 19:25:13 +1000 (Sun, 13 Jun 2004) | 2 lines
+Changed paths:
+   A /cross-lfs/trunk/README.cross-lfs
+
+Adding README.cross-lfs to trunk
+
+------------------------------------------------------------------------
+r3 | (no author) | 2004-06-13 17:39:39 +1000 (Sun, 13 Jun 2004) | 2 lines
+Changed paths:
+   A /cross-lfs
+   A /cross-lfs/branches
+   A /cross-lfs/tags
+   A /cross-lfs/trunk
+   A /lfh
+   A /lfh/branches
+   A /lfh/tags
+   A /lfh/trunk
+
+empty directory structure.
+
+------------------------------------------------------------------------
Index: README.cross-lfs
===================================================================
--- README.cross-lfs	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ README.cross-lfs	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,46 @@
+$Id$
+
+Here are the cross-lfs scripts, finally under version control
+
+At some point I'll put some doco in here on how to drive everything,
+but for the moment you'll just have to read the scripts ;-)
+
+Firstly, select a sample plfs-config file from scripts/plfs-configs and create
+a symlink to it from the scripts directory.
+Here you set the build options, your directory layout etc.
+Edit it to suit your needs
+
+Secondly select a sample plfs-packages from scripts/plfs-configs and create
+a symlink to it from the scripts directory.
+Here you set all the package versions to use for the build.
+Edit it to suit your needs
+
+build-host.sh is for building a set of build-host native tools,
+which helps in the cases where host-os is not gnu, or you
+cannot trust the tools ;-)
+
+build-cross.sh builds the cross-compiler, cross binutils and target
+native glibc.
+
+build-target.sh builds all required target native packages.
+
+build-native.sh is to be used after booting on the target system to
+build the target-native packages
+
+build-blfs.sh (consider beta) builds some blfs packages.
+
+More scripts, which are not ready to run yet (more work required)
+exist under scripts/untested which detail kde/gnome packages.
+These will eventually be merged in.
+
+Anyhow, more later...
+
+Scripts et al are available via subversion via...
+
+svn co svn://be-linux.org/cross-lfs/cross-lfs/trunk cross-lfs
+(Thanks for repo access go to Jeremy Utley)
+
+Send abuse to ryan@pha.com.au
+
+Regards
+[R]
Index: configs/cracklib/cracklib_wordlist
===================================================================
--- configs/cracklib/cracklib_wordlist	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ configs/cracklib/cracklib_wordlist	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,151008 @@
+
+
+
+
+
+
+
+
+!
+!!
+"
+"verdach
+$
+%
+&
+'
+(
+)
+*
++
++-
+,
+-
+->
+.
+.,m
+.,mn
+.,mnb
+...
+/.,
+/.,m
+/.,mn
+/.,mnb
+/dev/nul
+/dev/null
+/etc/pas
+/etc/passwd
+/usr/gro
+/usr/group
+0
+00
+000
+0000
+00000
+000000
+0000000
+00000000
+00brucellosis
+00faa
+00kiribati
+00mag
+00murree
+00whitebait
+02an
+02diata
+02espe
+02le
+02nnsylvania
+02ovakia
+02ppajarvi
+02rdoo
+02schuk
+02y
+03
+03ddy
+03idex
+03ing
+03ke
+03per
+03ray
+03ssman
+03tch
+03times
+04bashing
+04er
+04hopper
+04ie
+04tead
+04ter
+05
+06er
+1
+10
+100
+1000
+1029
+10293
+102938
+10cc		
+10th
+11
+111
+1111
+11111
+111111
+1111111
+11111111
+12
+1209
+123
+123098
+1234
+12345
+123456
+1234567
+12345678
+123abc
+13
+14
+15
+16
+16stelli
+16stellige
+16stelliges
+17
+18
+1812over
+1812overture
+19
+1900
+1901
+1902
+1903
+1904
+1905
+1906
+1907
+1908
+1909
+1910
+1911
+1912
+1913
+1914
+1915
+1916
+1917
+1918
+1919
+1920
+1921
+1922
+1923
+1924
+1925
+1926
+1927
+1928
+1929
+1930
+1931
+1932
+1933
+1934
+1935
+1936
+1937
+1938
+1939
+1940
+1941
+1942
+1943
+1944
+1945
+1946
+1947
+1948
+1949
+1950
+1951
+1952
+1953
+1954
+1955
+1956
+1957
+1958
+1959
+1960
+1961
+1962
+1963
+1964
+1965
+1966
+1967
+1968
+1969
+1970
+1971
+1972
+1973
+1974
+1975
+1976
+1977
+1978
+1979
+1980
+1981
+1982
+1983
+1984
+1985
+1986
+1987
+1988
+1989
+1990
+1991
+1992
+1993
+1994
+1995
+1996
+1997
+1998
+1999
+1fish2fi
+1fish2fish
+1st
+2
+20
+2000
+2001
+2002
+2003
+2004
+2005
+2006
+2007
+2008
+2009
+2010
+21
+22
+222
+2222
+22222
+222222
+2222222
+22222222
+23
+24
+25
+25polig
+25polige
+25poligen
+26
+27
+28
+29
+2bon2b
+2nd
+2nnsyn
+2or
+2te
+2ten
+2tes
+2tternd
+3
+3.14
+3.141
+3.1415
+3.14159
+3.141592
+3.5
+30
+31
+32
+33
+333
+3333
+33333
+333333
+3333333
+33333333
+34
+35
+36
+37
+38
+386'er
+39
+3dots
+3f
+3linie
+3rd
+3star
+3wirtschaftskommission
+4
+4.0.3
+4.2bsd
+4.3bsd
+40
+4000ex
+4077mash
+41
+42
+42bsd
+43
+43bsd
+44
+444
+4444
+44444
+444444
+4444444
+44444444
+45
+46
+47
+48
+49
+49-ers
+49ers
+4en
+4es
+4f
+4fens
+4innen
+4n
+4oeffel
+4oermigkeit
+4poliger
+4sa7ya
+4st
+4stellig
+4stelligen
+4taeter
+4te
+4th
+4wasser
+4wuersten
+4x4fun
+4x4toy
+5
+50
+51
+52
+53
+54
+55
+555
+5555
+55555
+555555
+5555555
+55555555
+56
+57
+58
+59
+5garage
+5ig
+5meidbarkeit
+5n
+5postens
+5spiele
+5th
+6
+60
+61
+62
+63
+64
+65
+66
+666
+6666
+66666
+666666
+6666666
+66666666
+66larm
+67
+68
+68000
+68000er
+68020
+68030
+68040
+69
+6bau
+6e
+6ers
+6es
+6hund
+6ildjaegerei
+6ildn
+6ktionaer
+6n
+6nahme
+6nkel
+6or
+6sseln
+6th
+6ueche
+6uetter
+7
+70
+71
+72
+73
+74
+75
+76
+76ers
+77
+777
+7777
+77777
+777777
+7777777
+77777777
+78
+79
+7eldungen
+7emesters
+7irtschaftsminister
+7junktur
+7kette
+7kosten
+7msatz
+7neiden
+7reiben
+7riminalamt
+7serie
+7th
+7werte
+8
+80
+8088
+81
+82
+83
+84
+85
+86
+87
+88
+888
+8888
+88888
+888888
+8888888
+88888888
+89
+8bit
+8ge
+8gebadet
+8gem
+8ger
+8ges
+8heimkehrer
+8keit
+8mm
+8mus
+8stelle
+8ten
+8th
+8tobahnen
+9
+90
+91
+911sc
+911sctur
+911scturbo
+911turbo
+92
+93
+94
+95
+96
+97
+98
+99
+999
+9999
+99999
+999999
+9999999
+99999999
+9erklaerun:xamen
+9erklaerung
+9nzentrat
+9polig
+9poligen
+9th
+9uempfe
+:
+:e
+:en
+:usbau
+;e
+;en
+;gebiet
+;lk
+;lk;lk
+;lkasd
+;m
+<
+<-
+<=
+<>
+=
+=>
+=em
+=politik
+=s
+>
+>=
+>en
+>m
+>n
+?
+?e
+?es
+@
+@erin
+[
+[ngelhol
+[ngelholm
+\
+\a
+\a\a
+\a\o
+\a`\iga
+\a`\igo
+\acanina
+\acurutu`
+\afrar
+\agaza
+\ame
+\andu`
+\andubay
+\anduti`
+\angue`
+\apa
+\apanga
+\apango
+\apinda`
+\aque
+\arusa
+\aruso
+\ata
+\ato
+\eque
+\ipe
+\iqui\aque
+\ire
+\is\il
+\o
+\o\a
+\o\eri`a
+\o\ez
+\o\o
+\ocha
+\oclo
+\ora
+\orbo
+\oro
+\sterv}l
+\sterv}la
+\u
+\ublado
+\ublar
+\ublo
+\ublosa
+\ubloso
+\udillo
+\udo
+\udosa
+\udoso
+\uta
+\uto
+]
+]]
+]hus
+]ke
+]kersro
+^
+^^
+^v
+_
+________
+a
+a"hnlich
+a"hnliche
+a"hnlichen
+a"hnlicher
+a"hnliches
+a"lter
+a"ltere
+a"lteren
+a"lterer
+a"lteste
+a"nderba
+a"nderbar
+a"nderbaren
+a"nderbarer
+a"ndern
+a"ndernd
+a"ndernde
+a"ndernden
+a"ndert
+a"nderte
+a"nderten
+a"nderun
+a"nderung
+a"nderungen
+a"nderungsindex
+a"nderungsketten
+a"nderungsstand
+a"nderungstabelle
+a"nderungswu"nsche
+a"nderungswu"nschen
+a"nderungswunsch
+a"nderungszeichnungen
+a"quidis
+a"quidistanten
+a"quifun
+a"quifunktionalen
+a"quival
+a"quivalent
+a"quivalente
+a"rger
+a"sten
+a"stheti
+a"sthetischen
+a"ussere
+a"usseren
+a"usserer
+a"usseres
+a"usserl
+a"usserlich
+a"ussern
+a"ussers
+a"usserst
+a"ussersten
+a"ussert
+a"usserte
+a"usserten
+a"usseru
+a"usserung
+a"usserungen
+a&m
+a&p
+a'hearn
+a'jour
+a's
+a'tje
+a-al-tol
+a-al-tolletje
+a-bitore
+a-capell
+a-capella-koor
+a-capella-koren
+a-cha
+a-chi
+a-chisut
+a-kaibu
+a-ke-do
+a-ku
+a-lhi-bb
+a-lhi-bbn-01
+a-lhi-sr
+a-lhi-sri-03
+a-ru
+a-su
+a-texisu
+a-ti
+a-tisuto
+a-to
+a00
+a1
+a2
+a20
+a3
+a4
+a5
+a6
+a7
+a8
+a9
+a\a
+a\acal
+a\acalero
+a\acea
+a\acear
+a\ada
+a\adida
+a\adido
+a\adidura
+a\adimiento
+a\adir
+a\afea
+a\afil
+a\afilero
+a\agaza
+a\al
+a\alejo
+a\as
+a\ascar
+a\asco
+a\azme
+a\edir
+a\eja
+a\ejamiento
+a\ejar
+a\ejez
+a\ejo
+a\era
+a\ero
+a\icos
+a\idir
+a\il
+a\ilar
+a\ileri`a
+a\ina
+a\inero
+a\ino
+a\ir
+a\irar
+a\o
+a\oja
+a\ojal
+a\ojo
+a\oranza
+a\orar
+a\osa
+a\oso
+a\ublada
+a\ublado
+a\ublar
+a\ublo
+a\udador
+a\udadora
+a\udadura
+a\udamiento
+a\udar
+a\usgar
+a^cre
+a^cres
+a^crete'
+a^ge
+a^ge'
+a^ge'e
+a^ge'es
+a^ge's
+a^ges
+a^me
+a^mes
+a^ne
+a^nerie
+a^neries
+a^nes
+a^nesse
+a^nesses
+a^non
+a^nonna
+a^nonnai
+a^nonnaient
+a^nonnais
+a^nonnait
+a^nonnan
+a^nonnant
+a^nonne
+a^nonne'
+a^nonne'e
+a^nonne'es
+a^nonne's
+a^nonne`
+a^nonne`rent
+a^nonnem
+a^nonnement
+a^nonnen
+a^nonnent
+a^nonner
+a^nonnera
+a^nonnerai
+a^nonneraient
+a^nonnerais
+a^nonnerait
+a^nonneras
+a^nonnerez
+a^nonneriez
+a^nonnerions
+a^nonnerons
+a^nonneront
+a^nonnes
+a^nonnez
+a^nonnie
+a^nonniez
+a^nonnio
+a^nonnions
+a^nonnon
+a^nonnons
+a^nons
+a^pre
+a^premen
+a^prement
+a^pres
+a^prete'
+a^prete's
+a^tre
+a^tres
+a`
+a`-co^te
+a`-co^te'
+a`-co^te's
+a`-coup
+a`-coups
+a`-peu-p
+a`-peu-pre`s
+a`-pic
+a`-propo
+a`-propos
+a`-valoi
+a`-valoir
+a`-venir
+a`baco
+a`brego
+a`brigo
+a`bsida
+a`bside
+a`bsit
+a`cana
+a`caro
+a`cates
+a`cere
+a`cida
+a`cido
+a`cigos
+a`cimo
+a`coro
+a`crata
+a`cuea
+a`cueo
+a`cula
+a`faca
+a`fila
+a`filo
+a`fona
+a`fono
+a`frica
+a`frico
+a`gape
+a`gata
+a`gil
+a`gilmente
+a`gora
+a`guila
+a`l
+a`labe
+a`laga
+a`lamo
+a`lbum
+a`lcali
+a`lgebra
+a`lgica
+a`lgido
+a`lica
+a`liger
+a`limo
+a`loe
+a`lsine
+a`lveo
+a`mago
+a`mala
+a`malo
+a`mbar
+a`mbito
+a`mel
+a`nade
+a`ncora
+a`ndito
+a`nfora
+a`ngaro
+a`ngel
+a`ngela
+a`ngelus
+a`ngulo
+a`nima
+a`nimo
+a`nodo
+a`nsar
+a`ntrax
+a`nula
+a`nulo
+a`pex
+a`pice
+a`poca
+a`poda
+a`podo
+a`pside
+a`ptera
+a`ptero
+a`rabe
+a`rbitra
+a`rbitro
+a`rbol
+a`rbor
+a`rcade
+a`rctica
+a`rctico
+a`rdea
+a`rea
+a`rgana
+a`rganas
+a`rgano
+a`rgoma
+a`rgue\as
+a`rguenas
+a`rida
+a`rido
+a`rnica
+a`rtabra
+a`rtabro
+a`rtica
+a`rtico
+a`rula
+a`saro
+a`scar
+a`scari
+a`sciro
+a`spera
+a`spero
+a`spid
+a`spide
+a`staco
+a`tica
+a`tico
+a`tomo
+a`tona
+a`tono
+a`ulica
+a`ulico
+a`urea
+a`ureo
+a`urica
+a`urico
+a`vida
+a`vidamente
+a`vido
+a`zimo
+a`zoe
+aa
+aaa
+aaaa
+aaaaa
+aaaaaa
+aaaaaaa
+aaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaahhh
+aaaaaaaaaaaaaaaaaaaaaahhhhh
+aaaaaaaah
+aaaaaaau
+aaaaaaauugh
+aaaaaagh
+aaaaaahh
+aaaaaahhhhh
+aaaaaaug
+aaaaaaugh
+aaaaagh
+aaaaah
+aaaarthu
+aaaarthur
+aaaaw
+aaaeoe
+aaagghhh
+aaagghhhh
+aaah
+aaai
+aaas
+aaaugh
+aab
+aabaeka
+aabaeke
+aaberopa
+aabo
+aac
+aaccf
+aachen
+aacr
+aad
+aad-hq
+aada
+aader
+aadland
+aadolf
+aadra
+aadrig
+aaem
+aaf
+aag
+aagate
+aage
+aagh
+aagje
+aagjes
+aagt
+aagtappe
+aagtappel
+aagtappels
+aagten
+aah
+aahed
+aahing
+aahoera
+aahoerar
+aahoeraren
+aahoerarna
+aahs
+aahus
+aahz
+aai
+aaide
+aaiden
+aaien
+aaiing
+aaiingen
+aaimasa
+aait
+aaitje
+aaitjes
+aaiu
+aaiun
+aak
+aaka
+aakant
+aakare
+aakdon
+aake
+aaker
+aakeri
+aakermar
+aakermark
+aakersro
+aakhwe
+aakka
+aaklagar
+aaklagare
+aaklagarmyndigheten
+aakninge
+aakningen
+aaktur
+aal
+aala
+aalade
+aalaegga
+aalbes
+aalbesse
+aalbessen
+aalbessengelei
+aalbessenjam
+aalbessenjenever
+aalbessesap
+aalbessestruik
+aalborg
+aalder
+aalderdo
+aalderdom
+aaldern
+aalders
+aaldrar
+aaldras
+aale
+aaleira
+aalelger
+aalelgers
+aalen
+aalfuik
+aalfuike
+aalfuiken
+aalgeer
+aalgeren
+aali
+aaligger
+aalii
+aalkaar
+aalkaren
+aalkast
+aalkaste
+aalkasten
+aalkorf
+aalkorve
+aalkorven
+aalkuip
+aalkuipe
+aalkuipen
+aalkwab
+aalkwabb
+aalkwabbe
+aalkwabben
+aalmoes
+aalmoeze
+aalmoezen
+aalmoezenier
+aalmoezeniers
+aalmoezenierskamer
+aalmoezenierskamers
+aalnate
+aalpomp
+aalpompe
+aalpompen
+aalput
+aalputte
+aalputten
+aalreep
+aalreige
+aalreiger
+aalreigers
+aalrepen
+aals
+aalsax
+aalschaa
+aalschaar
+aalschar
+aalscharen
+aalschol
+aalscholver
+aalscholvers
+aalshuid
+aalshuiden
+aalskrui
+aalskruik
+aalskruiken
+aalstal
+aalstall
+aalstallen
+aalsteek
+aalsteke
+aalsteken
+aalsteker
+aalstekers
+aalsvel
+aalsvell
+aalsvellen
+aalt
+aaltje
+aaltjes
+aalto
+aalvork
+aalvorke
+aalvorken
+aalvormi
+aalvormig
+aalvormige
+aalvormiger
+aalvormigst
+aam
+aama
+aamade
+aambeeld
+aambeelden
+aambeeldsblok
+aambeeldsblokken
+aambeien
+aambeienkruid
+aamborst
+aamborstig
+aamborstige
+aamborstiger
+aamborstigheid
+aamborstigst
+aamers
+aames
+aamrl
+aamt
+aamu
+aan
+aana
+aanaard
+aanaardd
+aanaardde
+aanaardden
+aanaarde
+aanaarden
+aanaardi
+aanaarding
+aanaardingen
+aanaardp
+aanaardploeg
+aanaardploegen
+aanaardt
+aanbad
+aanbaden
+aanbak
+aanbakke
+aanbakken
+aanbakse
+aanbaksel
+aanbaksels
+aanbakt
+aanbakte
+aanbakten
+aanbeden
+aanbedene
+aanbedenen
+aanbeeld
+aanbeelden
+aanbeeldsblok
+aanbeeldsblokken
+aanbeen
+aanbeend
+aanbeende
+aanbeenden
+aanbeent
+aanbeet
+aanbehoo
+aanbehoor
+aanbehoord
+aanbehoorde
+aanbehoorden
+aanbehoort
+aanbehor
+aanbehoren
+aanbel
+aanbelan
+aanbeland
+aanbelandde
+aanbelandden
+aanbelande
+aanbelanden
+aanbelandt
+aanbelang
+aanbelangen
+aanbelangt
+aanbelde
+aanbelden
+aanbelle
+aanbellen
+aanbelt
+aanbenen
+aanberm
+aanbermd
+aanbermde
+aanbermden
+aanberme
+aanbermen
+aanbermi
+aanberming
+aanbermingen
+aanbermt
+aanbeste
+aanbesteden
+aanbesteding
+aanbestedingen
+aanbesteed
+aanbesteedde
+aanbesteedden
+aanbesteedt
+aanbesterf
+aanbesterft
+aanbesterven
+aanbesti
+aanbestierf
+aanbestierven
+aanbesto
+aanbestorven
+aanbestorvene
+aanbestorvenen
+aanbeten
+aanbeter
+aanbeterde
+aanbeterden
+aanbeteren
+aanbetert
+aanbeval
+aanbevalen
+aanbevee
+aanbeveel
+aanbeveelt
+aanbevel
+aanbevelen
+aanbevelenswaard
+aanbevelenswaarde
+aanbevelenswaarder
+aanbevelenswaardig
+aanbevelenswaardige
+aanbevelenswaardiger
+aanbevelenswaardigst
+aanbevelenswaardst
+aanbeveling
+aanbevelingen
+aanbevelingsbrief
+aanbevelingsbrieven
+aanbevol
+aanbevolen
+aanbevolene
+aanbevolenen
+aanbid
+aanbidde
+aanbiddelijk
+aanbiddelijke
+aanbiddelijker
+aanbiddelijkst
+aanbidden
+aanbiddenswaardig
+aanbiddenswaardige
+aanbiddenswaardiger
+aanbiddenswaardigst
+aanbidder
+aanbidders
+aanbiddi
+aanbidding
+aanbiddingen
+aanbidst
+aanbidster
+aanbidsters
+aanbidt
+aanbied
+aanbiede
+aanbieden
+aanbiedi
+aanbieding
+aanbiedingen
+aanbiedt
+aanbijt
+aanbijte
+aanbijten
+aanbik
+aanbikke
+aanbikken
+aanbikt
+aanbikte
+aanbikten
+aanbind
+aanbinde
+aanbinden
+aanbindt
+aanblaas
+aanblaast
+aanblaf
+aanblaff
+aanblaffen
+aanblaft
+aanblafte
+aanblaften
+aanblaze
+aanblazen
+aanblazi
+aanblazing
+aanbleef
+aanbleve
+aanbleven
+aanblies
+aanbliez
+aanbliezen
+aanblijf
+aanblijft
+aanblijv
+aanblijven
+aanblik
+aanblikk
+aanblikken
+aanblikt
+aanblikte
+aanblikten
+aanbod
+aanboden
+aanboek
+aanboeke
+aanboeken
+aanboekt
+aanboekte
+aanboekten
+aanbond
+aanbonde
+aanbonden
+aanbons
+aanbonsd
+aanbonsde
+aanbonsden
+aanbonst
+aanbonze
+aanbonzen
+aanbood
+aanboor
+aanboord
+aanboorde
+aanboorden
+aanboort
+aanboren
+aanbots
+aanbotse
+aanbotsen
+aanbotst
+aanbotste
+aanbotsten
+aanbouw
+aanbouwd
+aanbouwde
+aanbouwden
+aanbouwe
+aanbouwen
+aanbouwi
+aanbouwing
+aanbouwingen
+aanbouws
+aanbouwsel
+aanbouwsels
+aanbouwt
+aanbrach
+aanbracht
+aanbrachten
+aanbrak
+aanbrake
+aanbraken
+aanbrand
+aanbrandde
+aanbrandden
+aanbranden
+aanbrandt
+aanbras
+aanbrass
+aanbrassen
+aanbrast
+aanbraste
+aanbrasten
+aanbreek
+aanbreekt
+aanbrei
+aanbreid
+aanbreide
+aanbreiden
+aanbreie
+aanbreien
+aanbreis
+aanbreisel
+aanbreisels
+aanbreit
+aanbreke
+aanbreken
+aanbreng
+aanbrengen
+aanbrenger
+aanbrengers
+aanbrenging
+aanbrengpremie
+aanbrengpremies
+aanbrengst
+aanbrengsten
+aanbrengt
+aanbries
+aanbriesen
+aanbriest
+aanbrieste
+aanbriesten
+aanbrug
+aanbrugg
+aanbruggen
+aanbruis
+aanbruisen
+aanbruist
+aanbruiste
+aanbruisten
+aanbrul
+aanbruld
+aanbrulde
+aanbrulden
+aanbrull
+aanbrullen
+aanbrult
+aanbulde
+aanbulder
+aanbulderde
+aanbulderden
+aanbulderen
+aanbuldert
+aandacht
+aandachtig
+aandachtige
+aandachtiger
+aandachtigheid
+aandachtigst
+aandachtsstreep
+aandachtsstrepen
+aandachtsteken
+aandachtstekens
+aandak
+aandaken
+aandam
+aandamde
+aandamden
+aandamme
+aandammen
+aandammi
+aandamming
+aandammingen
+aandamt
+aandeden
+aandeed
+aandeel
+aandeelb
+aandeelbewijs
+aandeelbewijzen
+aandeelh
+aandeelhebber
+aandeelhebbers
+aandeelhouder
+aandeelhouders
+aandelen
+aandelenkapitaal
+aandelenkapitalen
+aandenke
+aandenken
+aandien
+aandiend
+aandiende
+aandienden
+aandiene
+aandienen
+aandient
+aandiep
+aandiepe
+aandiepen
+aandiept
+aandiepte
+aandiepten
+aandijk
+aandijke
+aandijken
+aandijki
+aandijking
+aandijkingen
+aandijkt
+aandijkte
+aandijkten
+aandik
+aandikke
+aandikken
+aandikt
+aandikte
+aandikten
+aandoe
+aandoen
+aandoeni
+aandoening
+aandoeningen
+aandoenl
+aandoenlijk
+aandoenlijke
+aandoenlijker
+aandoenlijkheid
+aandoenlijkst
+aandoet
+aandraaf
+aandraafde
+aandraafden
+aandraaft
+aandraag
+aandraagt
+aandraai
+aandraaide
+aandraaiden
+aandraaien
+aandraait
+aandrage
+aandragen
+aandrager
+aandragers
+aandrang
+aandrave
+aandraven
+aandreef
+aandrent
+aandrentel
+aandrentelde
+aandrentelden
+aandrentelen
+aandrentelt
+aandreve
+aandreven
+aandrift
+aandrijf
+aandrijft
+aandrijv
+aandrijven
+aandrijver
+aandrijvers
+aandrijving
+aandrijvingen
+aandring
+aandringen
+aandringt
+aandroeg
+aandroegen
+aandrong
+aandrongen
+aandruis
+aandruisen
+aandruist
+aandruiste
+aandruisten
+aandruk
+aandrukk
+aandrukken
+aandrukt
+aandrukte
+aandrukten
+aanduid
+aanduidd
+aanduidde
+aanduidden
+aanduide
+aanduiden
+aanduidi
+aanduiding
+aanduidingen
+aanduidt
+aandurf
+aandurfd
+aandurfde
+aandurfden
+aandurft
+aandurve
+aandurven
+aanduw
+aanduwde
+aanduwden
+aanduwen
+aanduwt
+aandweil
+aandweilde
+aandweilden
+aandweilen
+aandweilt
+aaneen
+aaneenbi
+aaneenbind
+aaneenbinden
+aaneenbindt
+aaneenbo
+aaneenbond
+aaneenbonden
+aaneenbr
+aaneenbracht
+aaneenbrachten
+aaneenbreng
+aaneenbrengen
+aaneenbrengt
+aaneendr
+aaneendrieg
+aaneendriegde
+aaneendriegden
+aaneendriegen
+aaneendriegt
+aaneenfl
+aaneenflans
+aaneenflansen
+aaneenflanst
+aaneenflanste
+aaneenflansten
+aaneenge
+aaneengebonden
+aaneengebondene
+aaneengebondenen
+aaneengeboren
+aaneengebracht
+aaneengebrachte
+aaneengebrachten
+aaneengedriegd
+aaneengedriegde
+aaneengedriegden
+aaneengeflanst
+aaneengeflanste
+aaneengeflansten
+aaneengegrensd
+aaneengegrensde
+aaneengegrensden
+aaneengegroeid
+aaneengegroeide
+aaneengegroeiden
+aaneengehaakt
+aaneengehaakte
+aaneengehaakten
+aaneengehangen
+aaneengehangene
+aaneengehangenen
+aaneengehecht
+aaneengehechte
+aaneengehechten
+aaneengehouden
+aaneengehoudene
+aaneengehoudenen
+aaneengeketend
+aaneengeketende
+aaneengeketenden
+aaneengekleefd
+aaneengekleefde
+aaneengekleefden
+aaneengeklonken
+aaneengeklonkene
+aaneengeklonkenen
+aaneengekluisterd
+aaneengekluisterde
+aaneengekluisterden
+aaneengeknoopt
+aaneengeknoopte
+aaneengeknoopten
+aaneengekoekt
+aaneengekoekte
+aaneengekoekten
+aaneengekoppeld
+aaneengekoppelde
+aaneengekoppelden
+aaneengelijmd
+aaneengelijmde
+aaneengelijmden
+aaneengenaaid
+aaneengenaaide
+aaneengenaaiden
+aaneengepast
+aaneengepaste
+aaneengepasten
+aaneengeplakt
+aaneengeplakte
+aaneengeplakten
+aaneengeregen
+aaneengeregene
+aaneengeregenen
+aaneengeschakeld
+aaneengeschakelde
+aaneengeschakelden
+aaneengeschreven
+aaneengeschrevene
+aaneengeschrevenen
+aaneengesloten
+aaneengeslotene
+aaneengeslotenen
+aaneengesmeed
+aaneengesmeede
+aaneengesmeeden
+aaneengespijkerd
+aaneengespijkerde
+aaneengespijkerden
+aaneengevoegd
+aaneengevoegde
+aaneengevoegden
+aaneengezet
+aaneengezeten
+aaneengezetene
+aaneengezetenen
+aaneengezette
+aaneengr
+aaneengrens
+aaneengrensde
+aaneengrensden
+aaneengrenst
+aaneengrenzen
+aaneengroei
+aaneengroeide
+aaneengroeiden
+aaneengroeien
+aaneengroeiing
+aaneengroeiingen
+aaneengroeit
+aaneenha
+aaneenhaak
+aaneenhaakt
+aaneenhaakte
+aaneenhaakten
+aaneenhaken
+aaneenhang
+aaneenhangen
+aaneenhangt
+aaneenhe
+aaneenhecht
+aaneenhechten
+aaneenhechtte
+aaneenhechtten
+aaneenhi
+aaneenhield
+aaneenhielden
+aaneenhing
+aaneenhingen
+aaneenho
+aaneenhoud
+aaneenhouden
+aaneenhoudt
+aaneenke
+aaneenketen
+aaneenketende
+aaneenketenden
+aaneenketenen
+aaneenketent
+aaneenkl
+aaneenkleef
+aaneenkleefde
+aaneenkleefden
+aaneenkleeft
+aaneenkleven
+aaneenklink
+aaneenklinken
+aaneenklinkt
+aaneenklonk
+aaneenklonken
+aaneenkluister
+aaneenkluisterde
+aaneenkluisterden
+aaneenkluisteren
+aaneenkluistert
+aaneenkn
+aaneenknoop
+aaneenknoopt
+aaneenknoopte
+aaneenknoopten
+aaneenknopen
+aaneenko
+aaneenkoek
+aaneenkoeken
+aaneenkoekt
+aaneenkoekte
+aaneenkoekten
+aaneenkoppel
+aaneenkoppelde
+aaneenkoppelden
+aaneenkoppelen
+aaneenkoppeling
+aaneenkoppelingen
+aaneenkoppelt
+aaneenli
+aaneenlijm
+aaneenlijmde
+aaneenlijmden
+aaneenlijmen
+aaneenlijmt
+aaneenna
+aaneennaai
+aaneennaaide
+aaneennaaiden
+aaneennaaien
+aaneennaait
+aaneenpa
+aaneenpas
+aaneenpassen
+aaneenpast
+aaneenpaste
+aaneenpasten
+aaneenpl
+aaneenplak
+aaneenplakken
+aaneenplakt
+aaneenplakte
+aaneenplakten
+aaneenre
+aaneenreeg
+aaneenregen
+aaneenri
+aaneenrijg
+aaneenrijgen
+aaneenrijgt
+aaneensc
+aaneenschakel
+aaneenschakelde
+aaneenschakelden
+aaneenschakelen
+aaneenschakeling
+aaneenschakelingen
+aaneenschakelt
+aaneenschreef
+aaneenschreven
+aaneenschrijf
+aaneenschrijft
+aaneenschrijven
+aaneensl
+aaneensloot
+aaneensloten
+aaneensluit
+aaneensluiten
+aaneensluiting
+aaneensm
+aaneensmeden
+aaneensmeed
+aaneensmeedde
+aaneensmeedden
+aaneensmeedt
+aaneensp
+aaneenspijker
+aaneenspijkerde
+aaneenspijkerden
+aaneenspijkeren
+aaneenspijkert
+aaneenvo
+aaneenvoeg
+aaneenvoegde
+aaneenvoegden
+aaneenvoegen
+aaneenvoeging
+aaneenvoegingen
+aaneenvoegt
+aaneenza
+aaneenzat
+aaneenzaten
+aaneenze
+aaneenzet
+aaneenzette
+aaneenzetten
+aaneenzi
+aaneenzit
+aaneenzitten
+aanerf
+aanerfde
+aanerfden
+aanerft
+aanerven
+aanfiets
+aanfietsen
+aanfietst
+aanfietste
+aanfietsten
+aanfloot
+aanflote
+aanfloten
+aanfluit
+aanfluiten
+aanfluiting
+aanfluitingen
+aanfok
+aanfokke
+aanfokken
+aanfokki
+aanfokking
+aanfokkingen
+aanfokt
+aanfokte
+aanfokten
+aanga
+aangaan
+aangaand
+aangaande
+aangaap
+aangaapt
+aangaapte
+aangaapten
+aangaat
+aangaf
+aangapen
+aangaven
+aangb}t
+aangeaar
+aangeaard
+aangeaarde
+aangeaarden
+aangebak
+aangebakken
+aangebakkene
+aangebakkenen
+aangebed
+aangebeden
+aangebedene
+aangebedenen
+aangebee
+aangebeend
+aangebeende
+aangebeenden
+aangebel
+aangebeld
+aangeber
+aangebermd
+aangebermde
+aangebermden
+aangebet
+aangebeten
+aangebetene
+aangebetenen
+aangebeterd
+aangebeterde
+aangebeterden
+aangebik
+aangebikt
+aangebikte
+aangebikten
+aangebla
+aangeblaft
+aangeblafte
+aangeblaften
+aangeblazen
+aangeblazene
+aangeblazenen
+aangeble
+aangebleven
+aangeblevene
+aangeblevenen
+aangebli
+aangeblikt
+aangeblikte
+aangeblikten
+aangebod
+aangeboden
+aangebodene
+aangebodenen
+aangeboe
+aangeboekt
+aangeboekte
+aangeboekten
+aangebon
+aangebonden
+aangebondene
+aangebondenen
+aangebonsd
+aangebonsde
+aangebonsden
+aangeboo
+aangeboord
+aangeboorde
+aangeboorden
+aangebor
+aangeboren
+aangebot
+aangebotst
+aangebou
+aangebouwd
+aangebouwde
+aangebouwden
+aangebra
+aangebracht
+aangebrachte
+aangebrachten
+aangebrand
+aangebrande
+aangebranden
+aangebrast
+aangebre
+aangebreid
+aangebreide
+aangebreiden
+aangebri
+aangebriest
+aangebrieste
+aangebriesten
+aangebro
+aangebroken
+aangebrokene
+aangebrokenen
+aangebru
+aangebruist
+aangebruld
+aangebrulde
+aangebrulden
+aangebul
+aangebulderd
+aangebulderde
+aangebulderden
+aangedaa
+aangedaan
+aangedam
+aangedamd
+aangedamde
+aangedamden
+aangedan
+aangedane
+aangedanen
+aangedie
+aangediend
+aangediende
+aangedienden
+aangediept
+aangediepte
+aangediepten
+aangedij
+aangedijkt
+aangedijkte
+aangedijkten
+aangedik
+aangedikt
+aangedikte
+aangedikten
+aangedra
+aangedraafd
+aangedraaid
+aangedraaide
+aangedraaiden
+aangedragen
+aangedragene
+aangedragenen
+aangedre
+aangedrenteld
+aangedreven
+aangedrevene
+aangedrevenen
+aangedro
+aangedrongen
+aangedrongene
+aangedrongenen
+aangedru
+aangedruist
+aangedruiste
+aangedruisten
+aangedrukt
+aangedrukte
+aangedrukten
+aangedui
+aangeduid
+aangeduide
+aangeduiden
+aangedur
+aangedurfd
+aangeduw
+aangeduwd
+aangeduwde
+aangeduwden
+aangedwe
+aangedweild
+aangedweilde
+aangedweilden
+aangeef
+aangeefs
+aangeefster
+aangeefsters
+aangeeft
+aangeerf
+aangeerfd
+aangeerfde
+aangefie
+aangefietst
+aangeflo
+aangefloten
+aangeflotene
+aangeflotenen
+aangefok
+aangefokt
+aangefokte
+aangefokten
+aangegaa
+aangegaan
+aangegaapt
+aangegaapte
+aangegaapten
+aangegan
+aangegane
+aangeges
+aangegespt
+aangegespte
+aangegespten
+aangegev
+aangegeven
+aangegevene
+aangegevenen
+aangegie
+aangegierd
+aangegierde
+aangegierden
+aangeglo
+aangegloeid
+aangeglommen
+aangeglu
+aangegluurd
+aangegluurde
+aangegluurden
+aangegol
+aangegolfd
+aangegolfde
+aangegolfden
+aangegor
+aangegord
+aangegorde
+aangegorden
+aangegot
+aangegoten
+aangegotene
+aangegotenen
+aangegra
+aangegrauwd
+aangegrauwde
+aangegrauwden
+aangegraven
+aangegravene
+aangegravenen
+aangegre
+aangegrepen
+aangegrepene
+aangegrepenen
+aangegri
+aangegrijnsd
+aangegrijnsde
+aangegrijnsden
+aangegrimd
+aangegrimde
+aangegrimden
+aangegrinnikt
+aangegrinnikte
+aangegrinnikten
+aangegro
+aangegroeid
+aangegroeide
+aangegroeiden
+aangegromd
+aangegromde
+aangegromden
+aangehaa
+aangehaakt
+aangehaakte
+aangehaakten
+aangehaald
+aangehaalde
+aangehaalden
+aangehad
+aangehan
+aangehangen
+aangehangene
+aangehangenen
+aangehar
+aangehard
+aangeharkt
+aangeharkte
+aangeharkten
+aangehec
+aangehecht
+aangehechte
+aangehechten
+aangehev
+aangeheven
+aangehevene
+aangehevenen
+aangehin
+aangehinkt
+aangehit
+aangehitst
+aangehitste
+aangehitsten
+aangehol
+aangehold
+aangehoo
+aangehoopt
+aangehoord
+aangehoorde
+aangehoorden
+aangehou
+aangehouden
+aangehoudene
+aangehoudenen
+aangehup
+aangehuppeld
+aangehuw
+aangehuwd
+aangehuwde
+aangejaa
+aangejaagd
+aangejaagde
+aangejaagden
+aangekal
+aangekalkt
+aangekan
+aangekant
+aangekap
+aangekapt
+aangekapte
+aangekapten
+aangekef
+aangekeft
+aangekefte
+aangekeften
+aangekek
+aangekeken
+aangekekene
+aangekekenen
+aangeker
+aangekerfd
+aangekla
+aangeklaagd
+aangeklaagde
+aangeklaagden
+aangeklampt
+aangeklampte
+aangeklampten
+aangekle
+aangeklede
+aangekleed
+aangekleefd
+aangekleefde
+aangekleefden
+aangeklemd
+aangeklemde
+aangeklemden
+aangeklo
+aangeklonken
+aangeklonkene
+aangeklonkenen
+aangeklopt
+aangeklost
+aangeklotst
+aangekni
+aangeknipt
+aangekno
+aangeknoopt
+aangeknoopte
+aangeknoopten
+aangekoc
+aangekocht
+aangekochte
+aangekochten
+aangekoe
+aangekoekt
+aangekoekte
+aangekoekten
+aangekom
+aangekomen
+aangekomene
+aangekomenen
+aangekon
+aangekondigd
+aangekondigde
+aangekondigden
+aangekoo
+aangekooid
+aangekooide
+aangekooiden
+aangekop
+aangekoppeld
+aangekoppelde
+aangekoppelden
+aangekor
+aangekorst
+aangekorven
+aangekorvene
+aangekorvenen
+aangekra
+aangekramd
+aangekramde
+aangekramden
+aangekre
+aangekregen
+aangekregene
+aangekregenen
+aangekru
+aangekruid
+aangekruide
+aangekruiden
+aangekun
+aangekund
+aangekwe
+aangekweekt
+aangekweekte
+aangekweekten
+aangelac
+aangelachen
+aangelachene
+aangelachenen
+aangelad
+aangeladen
+aangelan
+aangeland
+aangelande
+aangelanden
+aangelangd
+aangelangde
+aangelangden
+aangelap
+aangelapt
+aangelas
+aangelast
+aangelaste
+aangelasten
+aangelee
+aangeleerd
+aangeleerde
+aangeleerden
+aangeleg
+aangelegd
+aangelegde
+aangelegden
+aangelegen
+aangelegene
+aangelegenen
+aangelegenheden
+aangelegenheid
+aangelen
+aangelengd
+aangelengde
+aangelengden
+aangeleu
+aangeleund
+aangeleunde
+aangeleunden
+aangelev
+aangeleverd
+aangelic
+aangelicht
+aangelichte
+aangelichten
+aangelij
+aangelijkt
+aangelijkte
+aangelijkten
+aangelijmd
+aangelijmde
+aangelijmden
+aangelod
+aangelode
+aangeloe
+aangeloefd
+aangeloefde
+aangeloefden
+aangeloeid
+aangeloerd
+aangeloerde
+aangeloerden
+aangelok
+aangelokt
+aangelokte
+aangelokten
+aangelon
+aangelonkt
+aangelonkte
+aangelonkten
+aangeloo
+aangelood
+aangelop
+aangelopen
+aangelopene
+aangelopenen
+aangemaa
+aangemaakt
+aangemaakte
+aangemaakten
+aangemaand
+aangemaande
+aangemaanden
+aangemar
+aangemarcheerd
+aangemat
+aangematigd
+aangemee
+aangemeerd
+aangemeerde
+aangemeerden
+aangemel
+aangemeld
+aangemelde
+aangemelden
+aangemen
+aangemengd
+aangemengde
+aangemengden
+aangemer
+aangemerkt
+aangemerkte
+aangemerkten
+aangemet
+aangemeten
+aangemetene
+aangemetenen
+aangemoe
+aangemoedigd
+aangemoedigde
+aangemoedigden
+aangemon
+aangemonsterd
+aangemonsterde
+aangemonsterden
+aangemun
+aangemunt
+aangemunte
+aangenaa
+aangenaaid
+aangenaaide
+aangenaaiden
+aangenaam
+aangenaamst
+aangenag
+aangenageld
+aangenagelde
+aangenagelden
+aangenam
+aangename
+aangenamer
+aangenom
+aangenomen
+aangenomene
+aangenomenen
+aangepak
+aangepakt
+aangepakte
+aangepakten
+aangepap
+aangepapt
+aangepas
+aangepast
+aangepaste
+aangepasten
+aangeper
+aangeperst
+aangeperste
+aangepersten
+aangepla
+aangeplakt
+aangeplakte
+aangeplakten
+aangeplant
+aangeplante
+aangeple
+aangeplempt
+aangeplempte
+aangeplempten
+aangeplo
+aangeploegd
+aangeploegde
+aangeploegden
+aangepoo
+aangepoot
+aangepor
+aangepord
+aangeporde
+aangeporden
+aangepra
+aangepraat
+aangepre
+aangepreekt
+aangepreekte
+aangepreekten
+aangeprezen
+aangeprezene
+aangeprezenen
+aangepri
+aangeprikkeld
+aangeprikkelde
+aangeprikkelden
+aangeprikt
+aangeprikte
+aangeprikten
+aangepun
+aangepunt
+aangepunte
+aanger
+aangeraa
+aangeraakt
+aangeraakte
+aangeraakten
+aangeraasd
+aangeraasde
+aangeraasden
+aangerad
+aangeraden
+aangeradene
+aangeradenen
+aangeran
+aangerand
+aangerande
+aangeranden
+aangeraz
+aangerazeerd
+aangerazeerde
+aangerazeerden
+aangerec
+aangerecht
+aangerechte
+aangerechten
+aangered
+aangereden
+aangeredene
+aangeredenen
+aangereg
+aangeregen
+aangeregene
+aangeregenen
+aangerei
+aangereikt
+aangereikte
+aangereikten
+aangerek
+aangerekend
+aangerekende
+aangerekenden
+aangeren
+aangerend
+aangerende
+aangerenden
+aangeric
+aangericht
+aangerichte
+aangerij
+aangerijpt
+aangerijpte
+aangerijpten
+aangeris
+aangerist
+aangeriste
+aangeristen
+aangeroe
+aangeroeid
+aangeroeide
+aangeroeiden
+aangeroepen
+aangeroepene
+aangeroepenen
+aangeroerd
+aangeroerde
+aangeroerden
+aangeroest
+aangerol
+aangerold
+aangerolde
+aangerolden
+aangeroo
+aangerookt
+aangerookte
+aangerookten
+aangerui
+aangeruist
+aangeruiste
+aangeruisten
+aangeruk
+aangerukt
+aangerukte
+aangerukten
+aangesch
+aangeschaft
+aangeschafte
+aangeschaften
+aangeschakeld
+aangeschakelde
+aangeschakelden
+aangescharreld
+aangescharrelde
+aangescharrelden
+aangescheld
+aangeschelde
+aangeschelden
+aangescherpt
+aangescherpte
+aangescherpten
+aangeschikt
+aangeschikte
+aangeschikten
+aangeschoffeld
+aangeschoffelde
+aangeschoffelden
+aangeschoten
+aangeschotene
+aangeschotenen
+aangeschouwd
+aangeschouwde
+aangeschouwden
+aangeschoven
+aangeschovene
+aangeschovenen
+aangeschrapt
+aangeschrapte
+aangeschrapten
+aangeschreden
+aangeschredene
+aangeschredenen
+aangeschreven
+aangeschrevene
+aangeschrevenen
+aangeschroefd
+aangeschroefde
+aangeschroefden
+aangeschuind
+aangeschuinde
+aangeschuinden
+aangesjo
+aangesjokt
+aangesjord
+aangesjorde
+aangesjorden
+aangesjouwd
+aangesjouwde
+aangesjouwden
+aangesla
+aangeslagen
+aangeslagene
+aangeslagenen
+aangesle
+aangesleept
+aangesleepte
+aangesleepten
+aangeslenterd
+aangeslepen
+aangeslepene
+aangeslepenen
+aangesleurd
+aangesleurde
+aangesleurden
+aangesli
+aangeslibd
+aangeslibde
+aangeslibden
+aangeslijkt
+aangeslijkte
+aangeslijkten
+aangeslijmd
+aangeslijmde
+aangeslijmden
+aangeslo
+aangesloft
+aangeslopen
+aangesloten
+aangeslotene
+aangeslotenen
+aangesme
+aangesmeerd
+aangesmeerde
+aangesmeerden
+aangesmeten
+aangesmetene
+aangesmetenen
+aangesna
+aangesnauwd
+aangesnauwde
+aangesnauwden
+aangesne
+aangesneden
+aangesnedene
+aangesnedenen
+aangesneld
+aangesnelde
+aangesno
+aangesnoerd
+aangesnoerde
+aangesnoerden
+aangesnord
+aangesnorde
+aangesnorden
+aangesp
+aangespa
+aangespannen
+aangespannene
+aangespannenen
+aangespe
+aangespeeld
+aangespeelde
+aangespeelden
+aangespeet
+aangespeld
+aangespelde
+aangespelden
+aangespen
+aangespi
+aangespijkerd
+aangespijkerde
+aangespijkerden
+aangespo
+aangespoed
+aangespoede
+aangespoeden
+aangespoeld
+aangespoelde
+aangespoelden
+aangesponnen
+aangesponnene
+aangesponnenen
+aangespoord
+aangespoorde
+aangespoorden
+aangespr
+aangesproken
+aangesprokene
+aangesprokenen
+aangesprongen
+aangesprongene
+aangesprongenen
+aangespt
+aangespte
+aangespten
+aangest
+aangesta
+aangestaan
+aangestaard
+aangestaarde
+aangestaarden
+aangestampt
+aangestampte
+aangestampten
+aangestapt
+aangestapte
+aangestapten
+aangeste
+aangesteld
+aangestelde
+aangestelden
+aangesterkt
+aangesterkte
+aangesterkten
+aangesteven
+aangestevend
+aangestevene
+aangestevenen
+aangesti
+aangesticht
+aangestichte
+aangestijfd
+aangestijfde
+aangestijfden
+aangestikt
+aangestikte
+aangestikten
+aangestipt
+aangestipte
+aangestipten
+aangesto
+aangestoken
+aangestokene
+aangestokenen
+aangestookt
+aangestookte
+aangestookten
+aangestoomd
+aangestoomde
+aangestoomden
+aangestopt
+aangestopte
+aangestopten
+aangestormd
+aangestormde
+aangestormden
+aangestort
+aangestorte
+aangestorven
+aangestorvene
+aangestorvenen
+aangestoten
+aangestotene
+aangestotenen
+aangestouwd
+aangestouwde
+aangestouwden
+aangestoven
+aangestovene
+aangestovenen
+aangestr
+aangestrand
+aangestrande
+aangestranden
+aangestreept
+aangestreepte
+aangestreepten
+aangestreken
+aangestrekene
+aangestrekenen
+aangestrikt
+aangestrikte
+aangestrikten
+aangestrompeld
+aangestrompelde
+aangestrompelden
+aangestroomd
+aangestroomde
+aangestroomden
+aangestu
+aangestuurd
+aangestuurde
+aangestuurden
+aangestuwd
+aangestuwde
+aangestuwden
+aangesuk
+aangesukkeld
+aangetak
+aangetakeld
+aangetakelde
+aangetakelden
+aangetap
+aangetapt
+aangetapte
+aangetapten
+aangetas
+aangetast
+aangetaste
+aangetasten
+aangetee
+aangeteeld
+aangeteelde
+aangeteelden
+aangeteg
+aangetegen
+aangetegene
+aangetegenen
+aangetek
+aangetekend
+aangetekende
+aangetekenden
+aangetik
+aangetikt
+aangetikte
+aangetikten
+aangetim
+aangetimmerd
+aangetimmerde
+aangetimmerden
+aangetog
+aangetogen
+aangetoo
+aangetoond
+aangetoonde
+aangetoonden
+aangetra
+aangetrapt
+aangetrapte
+aangetrapten
+aangetre
+aangetreden
+aangetredene
+aangetredenen
+aangetri
+aangetrippeld
+aangetro
+aangetroffen
+aangetroffene
+aangetroffenen
+aangetrokken
+aangetrokkene
+aangetrokkenen
+aangetrouwd
+aangetrouwde
+aangetuu
+aangetuurd
+aangeval
+aangevallen
+aangevallene
+aangevallenen
+aangevan
+aangevangen
+aangevangene
+aangevangenen
+aangevar
+aangevaren
+aangevarene
+aangevarenen
+aangevat
+aangevee
+aangeveegd
+aangeveegde
+aangeveegden
+aangeven
+aangever
+aangevers
+aangeversnummer
+aangevet
+aangevez
+aangevezen
+aangevezene
+aangevezenen
+aangevij
+aangevijld
+aangevijlde
+aangevijlden
+aangevin
+aangeving
+aangevingen
+aangevla
+aangevlamd
+aangevlamde
+aangevlamden
+aangevlo
+aangevlochten
+aangevlochtene
+aangevlochtenen
+aangevloeid
+aangevlogen
+aangevlogene
+aangevlogenen
+aangevlot
+aangevoc
+aangevochten
+aangevochtene
+aangevochtenen
+aangevoe
+aangevoegd
+aangevoegde
+aangevoegden
+aangevoeld
+aangevoelde
+aangevoerd
+aangevra
+aangevraagd
+aangevraagde
+aangevraagden
+aangevre
+aangevreten
+aangevretene
+aangevretenen
+aangevul
+aangevuld
+aangevulde
+aangevulden
+aangevuu
+aangevuurd
+aangevuurde
+aangevuurden
+aangewaa
+aangewaaid
+aangewaaide
+aangewaaiden
+aangewag
+aangewaggeld
+aangewak
+aangewakkerd
+aangewakkerde
+aangewakkerden
+aangewan
+aangewandeld
+aangewas
+aangewassen
+aangewassene
+aangewassenen
+aangewen
+aangewend
+aangewende
+aangewenden
+aangewenteld
+aangewentelde
+aangewentelden
+aangewet
+aangewev
+aangeweven
+aangewevene
+aangewevenen
+aangewez
+aangewezen
+aangewezene
+aangewezenen
+aangewip
+aangewipt
+aangewoe
+aangewoekerd
+aangewon
+aangewonnen
+aangewonnene
+aangewonnenen
+aangewor
+aangeworpen
+aangeworpene
+aangeworpenen
+aangeworven
+aangeworvene
+aangeworvenen
+aangewre
+aangewreven
+aangewrevene
+aangewrevenen
+aangezaa
+aangezaaid
+aangezaaide
+aangezaaiden
+aangezak
+aangezakt
+aangezakte
+aangezakten
+aangezan
+aangezand
+aangezeg
+aangezegd
+aangezegde
+aangezegden
+aangezei
+aangezeild
+aangezet
+aangezeten
+aangezetene
+aangezetenen
+aangezeu
+aangezeuld
+aangezeulde
+aangezeulden
+aangezic
+aangezicht
+aangezichten
+aangezichtspijn
+aangezichtspijnen
+aangezie
+aangezien
+aangeziene
+aangezienen
+aangezoc
+aangezocht
+aangezochte
+aangezochten
+aangezoe
+aangezoet
+aangezoete
+aangezoeten
+aangezog
+aangezogen
+aangezogene
+aangezogenen
+aangezui
+aangezuiverd
+aangezuiverde
+aangezuiverden
+aangezwa
+aangezwaaid
+aangezwaaide
+aangezwaaiden
+aangezwe
+aangezweefd
+aangezweept
+aangezweepte
+aangezweepten
+aangezwo
+aangezwoegd
+aangezwollen
+aangezwollene
+aangezwollenen
+aangezwommen
+aangier
+aangierd
+aangierde
+aangierden
+aangiere
+aangieren
+aangiert
+aangiet
+aangiete
+aangieten
+aangietk
+aangietkleur
+aangietkleuren
+aangifte
+aangiftebehandeling
+aangiftebiljet
+aangiftebiljetten
+aangiften
+aangiftevolgnummer
+aanging
+aanginge
+aangingen
+aanglim
+aanglimm
+aanglimmen
+aanglimt
+aangloei
+aangloeide
+aangloeiden
+aangloeien
+aangloeit
+aanglom
+aanglomm
+aanglommen
+aanglure
+aangluren
+aangluur
+aangluurde
+aangluurden
+aangluurt
+aangolf
+aangolfd
+aangolfde
+aangolfden
+aangolft
+aangolve
+aangolven
+aangoot
+aangord
+aangordd
+aangordde
+aangordden
+aangorde
+aangorden
+aangordt
+aangoten
+aangra
+aangraaf
+aangraaft
+aangrauw
+aangrauwde
+aangrauwden
+aangrauwen
+aangrauwt
+aangrave
+aangraven
+aangravi
+aangraving
+aangravingen
+aangreep
+aangrenz
+aangrenzend
+aangrenzende
+aangrepe
+aangrepen
+aangrijn
+aangrijns
+aangrijnsde
+aangrijnsden
+aangrijnst
+aangrijnzen
+aangrijp
+aangrijpen
+aangrijpend
+aangrijpende
+aangrijpender
+aangrijpendst
+aangrijping
+aangrijpingspunt
+aangrijpingspunten
+aangrijpt
+aangrim
+aangrimd
+aangrimde
+aangrimden
+aangrimm
+aangrimmen
+aangrimt
+aangrinn
+aangrinnik
+aangrinniken
+aangrinnikt
+aangrinnikte
+aangrinnikten
+aangroef
+aangroei
+aangroeide
+aangroeiden
+aangroeien
+aangroeiing
+aangroeiingen
+aangroeit
+aangroev
+aangroeven
+aangrom
+aangromd
+aangromde
+aangromden
+aangromm
+aangrommen
+aangromt
+aanhaak
+aanhaakt
+aanhaakte
+aanhaakten
+aanhaal
+aanhaald
+aanhaalde
+aanhaalden
+aanhaalt
+aanhad
+aanhadde
+aanhadden
+aanhaken
+aanhalen
+aanhaler
+aanhalerig
+aanhalerige
+aanhaleriger
+aanhalerigheid
+aanhalerigst
+aanhalig
+aanhalige
+aanhaliger
+aanhaligheid
+aanhaligst
+aanhalin
+aanhaling
+aanhalingen
+aanhalingsteken
+aanhalingstekens
+aanhang
+aanhange
+aanhangeling
+aanhangelinge
+aanhangelingen
+aanhangen
+aanhanger
+aanhangers
+aanhangi
+aanhangig
+aanhangige
+aanhangs
+aanhangsel
+aanhangselen
+aanhangsels
+aanhangster
+aanhangsters
+aanhangt
+aanhangw
+aanhangwagen
+aanhangwagens
+aanhanke
+aanhankelijk
+aanhankelijke
+aanhankelijker
+aanhankelijkheid
+aanhankelijkst
+aanhard
+aanhardd
+aanhardde
+aanhardden
+aanharde
+aanharden
+aanhardi
+aanharding
+aanhardingen
+aanhardt
+aanhark
+aanharke
+aanharken
+aanharkt
+aanharkte
+aanharkten
+aanheb
+aanhebbe
+aanhebben
+aanhebt
+aanhecht
+aanhechten
+aanhechting
+aanhechtingen
+aanhechtingspunt
+aanhechtingspunten
+aanhechtsel
+aanhechtsels
+aanhechtte
+aanhechtten
+aanhef
+aanheffe
+aanheffen
+aanheffer
+aanheffers
+aanheffi
+aanheffing
+aanheffingen
+aanheft
+aanhief
+aanhield
+aanhielden
+aanhieve
+aanhieven
+aanhing
+aanhinge
+aanhingen
+aanhink
+aanhinke
+aanhinken
+aanhinkt
+aanhinkte
+aanhinkten
+aanhits
+aanhitse
+aanhitsen
+aanhitser
+aanhitsers
+aanhitsi
+aanhitsing
+aanhitsingen
+aanhitst
+aanhitste
+aanhitsten
+aanhol
+aanholde
+aanholden
+aanholle
+aanhollen
+aanholt
+aanhoop
+aanhoopt
+aanhoopte
+aanhoopten
+aanhoor
+aanhoord
+aanhoorde
+aanhoorden
+aanhoorder
+aanhoorders
+aanhoors
+aanhoorster
+aanhoorsters
+aanhoort
+aanhopen
+aanhopin
+aanhoping
+aanhopingen
+aanhoren
+aanhorig
+aanhorige
+aanhorigheden
+aanhorigheid
+aanhoud
+aanhoude
+aanhouden
+aanhoudend
+aanhoudende
+aanhoudender
+aanhoudendheid
+aanhoudendst
+aanhouder
+aanhouderij
+aanhouders
+aanhoudi
+aanhouding
+aanhoudingen
+aanhoudingspremie
+aanhoudingspremies
+aanhouds
+aanhoudster
+aanhoudsters
+aanhoudt
+aanhuppe
+aanhuppel
+aanhuppelde
+aanhuppelden
+aanhuppelen
+aanhuppelt
+aanhuwin
+aanhuwing
+aani
+aanjaag
+aanjaagd
+aanjaagde
+aanjaagden
+aanjaagt
+aanjagen
+aanjager
+aanjagers
+aanjoeg
+aanjoege
+aanjoegen
+aankalk
+aankalke
+aankalken
+aankalkt
+aankalkte
+aankalkten
+aankant
+aankante
+aankanten
+aankantt
+aankantte
+aankantten
+aankap
+aankappe
+aankappen
+aankapt
+aankapte
+aankapten
+aankeek
+aankef
+aankeffe
+aankeffen
+aankeft
+aankefte
+aankeften
+aankeken
+aankerf
+aankerfd
+aankerfde
+aankerfden
+aankerft
+aankerve
+aankerven
+aankijk
+aankijke
+aankijken
+aankijkt
+aanklaag
+aanklaagde
+aanklaagden
+aanklaagster
+aanklaagsters
+aanklaagt
+aanklach
+aanklacht
+aanklachten
+aanklage
+aanklagen
+aanklager
+aanklagers
+aanklamp
+aanklampen
+aanklamping
+aanklampt
+aanklampte
+aanklampten
+aanklede
+aankleden
+aankledi
+aankleding
+aankledingen
+aankleed
+aankleedde
+aankleedden
+aankleedt
+aankleef
+aankleefde
+aankleefden
+aankleeft
+aanklem
+aanklemd
+aanklemde
+aanklemden
+aanklemm
+aanklemmen
+aanklemt
+aankleve
+aankleven
+aanklevi
+aankleving
+aanklink
+aanklinken
+aanklinkt
+aanklonk
+aanklonken
+aanklop
+aanklopp
+aankloppen
+aanklopt
+aanklopte
+aanklopten
+aanklos
+aankloss
+aanklossen
+aanklost
+aankloste
+aanklosten
+aanklots
+aanklotsen
+aanklotst
+aanklotste
+aanklotsten
+aanknip
+aanknipp
+aanknippen
+aanknipt
+aanknipte
+aanknipten
+aanknoop
+aanknoopt
+aanknoopte
+aanknoopten
+aanknope
+aanknopen
+aanknopi
+aanknoping
+aanknopingen
+aanknopingspunt
+aanknopingspunten
+aankocht
+aankochten
+aankoek
+aankoeke
+aankoeken
+aankoekt
+aankoekte
+aankoekten
+aankomel
+aankomeling
+aankomelinge
+aankomelingen
+aankomelingschap
+aankomen
+aankomend
+aankomende
+aankomst
+aankon
+aankonde
+aankonden
+aankondi
+aankondig
+aankondigde
+aankondigden
+aankondigen
+aankondiger
+aankondigers
+aankondiging
+aankondigingen
+aankondigster
+aankondigsters
+aankondigt
+aankooi
+aankooid
+aankooide
+aankooiden
+aankooie
+aankooien
+aankooit
+aankoom
+aankoomt
+aankoop
+aankoopb
+aankoopbeleid
+aankoopp
+aankoopprocedures
+aankoopt
+aankopen
+aankoppe
+aankoppel
+aankoppelde
+aankoppelden
+aankoppelen
+aankoppeling
+aankoppelingen
+aankoppelt
+aankorf
+aankorst
+aankorsten
+aankorsting
+aankorstingen
+aankorstte
+aankorstten
+aankorve
+aankorven
+aankram
+aankramd
+aankramde
+aankramden
+aankramm
+aankrammen
+aankramt
+aankreeg
+aankrege
+aankregen
+aankrijg
+aankrijgen
+aankrijgt
+aankrui
+aankruid
+aankruide
+aankruiden
+aankruie
+aankruien
+aankruii
+aankruiing
+aankruiingen
+aankruis
+aankruisen
+aankruit
+aankun
+aankunne
+aankunnen
+aankunt
+aankwam
+aankwame
+aankwamen
+aankweek
+aankweekt
+aankweekte
+aankweekten
+aankweke
+aankweken
+aankweki
+aankweking
+aankwekingen
+aanlaad
+aanlaadd
+aanlaadde
+aanlaadden
+aanlaadt
+aanlach
+aanlache
+aanlachen
+aanlacht
+aanlachte
+aanlachten
+aanladen
+aanlag
+aanlagen
+aanland
+aanlandd
+aanlandde
+aanlandden
+aanlande
+aanlanden
+aanlandi
+aanlandig
+aanlandige
+aanlanding
+aanlandingen
+aanlandt
+aanlang
+aanlangd
+aanlangde
+aanlangden
+aanlange
+aanlangen
+aanlangt
+aanlap
+aanlappe
+aanlappen
+aanlapt
+aanlapte
+aanlapten
+aanlas
+aanlasse
+aanlassen
+aanlassi
+aanlassing
+aanlassingen
+aanlast
+aanlaste
+aanlasten
+aanleer
+aanleerd
+aanleerde
+aanleerden
+aanleert
+aanleg
+aanlegde
+aanlegden
+aanlegge
+aanleggen
+aanlegger
+aanleggers
+aanleggi
+aanlegging
+aanleggingen
+aanlegpl
+aanlegplaats
+aanlegplaatsen
+aanlegst
+aanlegsteiger
+aanlegsteigers
+aanlegster
+aanlegsters
+aanlegt
+aanleide
+aanleidend
+aanleidende
+aanleidi
+aanleiding
+aanleidingen
+aanleng
+aanlengd
+aanlengde
+aanlengden
+aanlenge
+aanlengen
+aanlengt
+aanleren
+aanleun
+aanleund
+aanleunde
+aanleunden
+aanleune
+aanleunen
+aanleuni
+aanleuning
+aanleuningen
+aanleuningspunt
+aanleuningspunten
+aanleunt
+aanlever
+aanleveren
+aanlicht
+aanlichten
+aanlichtte
+aanlichtten
+aanliep
+aanliepe
+aanliepen
+aanlig
+aanligge
+aanliggen
+aanliggend
+aanliggende
+aanligt
+aanlijk
+aanlijke
+aanlijken
+aanlijkt
+aanlijkte
+aanlijkten
+aanlijm
+aanlijmd
+aanlijmde
+aanlijmden
+aanlijme
+aanlijmen
+aanlijmt
+aanloden
+aanloef
+aanloefd
+aanloefde
+aanloefden
+aanloeft
+aanloei
+aanloeid
+aanloeide
+aanloeiden
+aanloeie
+aanloeien
+aanloeit
+aanloer
+aanloerd
+aanloerde
+aanloerden
+aanloere
+aanloeren
+aanloert
+aanloeve
+aanloeven
+aanlok
+aanlokke
+aanlokkelijk
+aanlokkelijke
+aanlokkelijker
+aanlokkelijkheden
+aanlokkelijkheid
+aanlokkelijkst
+aanlokken
+aanlokki
+aanlokking
+aanlokkingen
+aanlokse
+aanloksel
+aanlokselen
+aanloksels
+aanlokt
+aanlokte
+aanlokten
+aanlonk
+aanlonke
+aanlonken
+aanlonkt
+aanlonkte
+aanlonkten
+aanlood
+aanloodd
+aanloodde
+aanloodden
+aanloodt
+aanloop
+aanlooph
+aanloophaven
+aanloophavens
+aanloopk
+aanloopkleur
+aanloopkleuren
+aanloopt
+aanlooptijd
+aanlopen
+aanmaak
+aanmaakh
+aanmaakhout
+aanmaakt
+aanmaakte
+aanmaakten
+aanmaan
+aanmaand
+aanmaande
+aanmaanden
+aanmaant
+aanmaken
+aanmanen
+aanmanin
+aanmaning
+aanmaningen
+aanmaningenprocedure
+aanmaningensysteem
+aanmaningenverhaal
+aanmarch
+aanmarcheer
+aanmarcheerde
+aanmarcheerden
+aanmarcheert
+aanmarcheren
+aanmat
+aanmaten
+aanmatig
+aanmatigde
+aanmatigden
+aanmatigen
+aanmatigend
+aanmatigende
+aanmatigender
+aanmatigendst
+aanmatiging
+aanmatigingen
+aanmatigt
+aanmeer
+aanmeerd
+aanmeerde
+aanmeerden
+aanmeert
+aanmeet
+aanmeld
+aanmeldd
+aanmeldde
+aanmeldden
+aanmelde
+aanmelden
+aanmeldi
+aanmelding
+aanmeldingen
+aanmeldt
+aanmeng
+aanmengd
+aanmengde
+aanmengden
+aanmenge
+aanmengen
+aanmengi
+aanmenging
+aanmengingen
+aanmengt
+aanmeren
+aanmerk
+aanmerke
+aanmerkelijk
+aanmerkelijke
+aanmerkelijker
+aanmerkelijkst
+aanmerken
+aanmerki
+aanmerking
+aanmerkingen
+aanmerkt
+aanmerkte
+aanmerkten
+aanmeten
+aanminni
+aanminnig
+aanminnige
+aanminniger
+aanminnigheden
+aanminnigheid
+aanminnigst
+aanmoedi
+aanmoedig
+aanmoedigde
+aanmoedigden
+aanmoedigen
+aanmoediging
+aanmoedigingen
+aanmoedigt
+aanmondi
+aanmonding
+aanmondingen
+aanmonst
+aanmonster
+aanmonsterde
+aanmonsterden
+aanmonsteren
+aanmonstering
+aanmonsteringen
+aanmonstert
+aanmunt
+aanmunte
+aanmunten
+aanmunti
+aanmunting
+aanmuntingen
+aanmuntt
+aanmuntte
+aanmuntten
+aannaai
+aannaaid
+aannaaide
+aannaaiden
+aannaaie
+aannaaien
+aannaait
+aannagel
+aannagelde
+aannagelden
+aannagelen
+aannam
+aanname
+aannamen
+aannames
+aanneem
+aanneemb
+aanneembaar
+aanneembare
+aanneems
+aanneemsom
+aanneemsommen
+aanneemster
+aanneemsters
+aanneemt
+aannemel
+aannemelijk
+aannemelijke
+aannemelijker
+aannemelijkheid
+aannemelijkst
+aannemeling
+aannemelinge
+aannemelingen
+aannemen
+aannemer
+aannemers
+aannemersfirma
+aannemersfirma's
+aannemin
+aanneming
+aannemingen
+aannemingsbiljet
+aannemingsbiljetten
+aannemingssom
+aannemingssommen
+aanpak
+aanpakke
+aanpakken
+aanpakt
+aanpakte
+aanpakten
+aanpalen
+aanpalend
+aanpalende
+aanpap
+aanpappe
+aanpappen
+aanpapt
+aanpapte
+aanpapten
+aanpas
+aanpasse
+aanpassen
+aanpassi
+aanpassing
+aanpassingen
+aanpassingsvermogen
+aanpast
+aanpaste
+aanpasten
+aanpeil
+aanpers
+aanperse
+aanpersen
+aanpersi
+aanpersing
+aanperst
+aanperste
+aanpersten
+aanplak
+aanplakb
+aanplakbiljet
+aanplakbiljetten
+aanplakbord
+aanplakborden
+aanplakbrief
+aanplakbrieven
+aanplakk
+aanplakken
+aanplakker
+aanplakkers
+aanplakking
+aanplakkingen
+aanplakt
+aanplakte
+aanplakten
+aanplakz
+aanplakzuil
+aanplakzuilen
+aanplant
+aanplanten
+aanplanting
+aanplantingen
+aanplantte
+aanplantten
+aanplemp
+aanplempen
+aanplemping
+aanplempingen
+aanplempt
+aanplempte
+aanplempten
+aanploeg
+aanploegde
+aanploegden
+aanploegen
+aanploegt
+aanpoot
+aanpoott
+aanpootte
+aanpootten
+aanpor
+aanporde
+aanporden
+aanporre
+aanporren
+aanport
+aanpoten
+aanpotin
+aanpoting
+aanpotingen
+aanpraat
+aanpraatte
+aanpraatten
+aanprate
+aanpraten
+aanpreek
+aanpreekt
+aanpreekte
+aanpreekten
+aanprees
+aanpreke
+aanpreken
+aanpreze
+aanprezen
+aanprijs
+aanprijst
+aanprijz
+aanprijzen
+aanprijzer
+aanprijzers
+aanprijzing
+aanprijzingen
+aanprik
+aanprikk
+aanprikkelde
+aanprikkelden
+aanprikkelen
+aanprikkeling
+aanprikkelingen
+aanprikken
+aanprikt
+aanprikte
+aanprikten
+aanpunt
+aanpunte
+aanpunten
+aanpunter
+aanpunters
+aanpunti
+aanpunting
+aanpuntingen
+aanpuntt
+aanpuntte
+aanpuntten
+aanraad
+aanraadd
+aanraadde
+aanraadden
+aanraadt
+aanraak
+aanraakt
+aanraakte
+aanraakten
+aanraas
+aanraasd
+aanraasde
+aanraasden
+aanraast
+aanraden
+aanraken
+aanrakin
+aanraking
+aanrakingen
+aanrakingspunt
+aanrakingspunten
+aanrand
+aanrandd
+aanrandde
+aanrandden
+aanrande
+aanranden
+aanrander
+aanranders
+aanrandi
+aanranding
+aanrandingen
+aanrandt
+aanrazee
+aanrazeerde
+aanrazeerden
+aanrazen
+aanrazer
+aanrazeren
+aanrecht
+aanrechtbank
+aanrechtbanken
+aanrechten
+aanrechting
+aanrechtkeuken
+aanrechtkeukens
+aanrechttafel
+aanrechttafels
+aanrechtte
+aanrechtten
+aanreden
+aanreed
+aanreeg
+aanregen
+aanreik
+aanreike
+aanreiken
+aanreikt
+aanreikte
+aanreikten
+aanreken
+aanrekende
+aanrekenden
+aanrekenen
+aanren
+aanrende
+aanrenden
+aanrenne
+aanrennen
+aanrent
+aanricht
+aanrichten
+aanrichtte
+aanrichtten
+aanried
+aanriede
+aanrieden
+aanriep
+aanriepe
+aanriepen
+aanrijd
+aanrijde
+aanrijden
+aanrijdi
+aanrijding
+aanrijdingen
+aanrijdt
+aanrijg
+aanrijge
+aanrijgen
+aanrijgt
+aanrijp
+aanrijpe
+aanrijpen
+aanrijpt
+aanrijpte
+aanrijpten
+aanris
+aanrisse
+aanrissen
+aanrist
+aanriste
+aanristen
+aanristt
+aanristte
+aanristten
+aanroei
+aanroeid
+aanroeide
+aanroeiden
+aanroeie
+aanroeien
+aanroeit
+aanroep
+aanroepe
+aanroepen
+aanroeper
+aanroepi
+aanroeping
+aanroepingen
+aanroept
+aanroer
+aanroerd
+aanroerde
+aanroerden
+aanroere
+aanroeren
+aanroert
+aanroest
+aanroesten
+aanroestte
+aanroestten
+aanroken
+aanrol
+aanrolde
+aanrolden
+aanrolle
+aanrollen
+aanrolt
+aanrook
+aanrookt
+aanrookte
+aanrookten
+aanruis
+aanruise
+aanruisen
+aanruist
+aanruiste
+aanruisten
+aanruk
+aanrukke
+aanrukken
+aanrukt
+aanrukte
+aanrukten
+aanschaf
+aanschafbeleid
+aanschaffen
+aanschaffing
+aanschaffingen
+aanschafprocedures
+aanschaft
+aanschafte
+aanschaften
+aanschak
+aanschakelde
+aanschakelden
+aanschakelen
+aanschar
+aanscharrelde
+aanscharrelden
+aanscharrelen
+aanschel
+aanschelde
+aanschelden
+aanschellen
+aanschelt
+aanscher
+aanscherp
+aanscherpen
+aanscherping
+aanscherpt
+aanscherpte
+aanscherpten
+aanschie
+aanschiet
+aanschieten
+aanschij
+aanschijn
+aanschik
+aanschikken
+aanschikt
+aanschikte
+aanschikten
+aanschof
+aanschoffelde
+aanschoffelden
+aanschoffelen
+aanschoo
+aanschoof
+aanschoot
+aanschot
+aanschoten
+aanschou
+aanschouw
+aanschouwd
+aanschouwde
+aanschouwden
+aanschouwelijk
+aanschouwelijke
+aanschouwelijker
+aanschouwelijkheid
+aanschouwelijkst
+aanschouwen
+aanschouwing
+aanschouwingen
+aanschouwingsonderwijs
+aanschouwingsvermogen
+aanschouwt
+aanschov
+aanschoven
+aanschra
+aanschrap
+aanschrappen
+aanschrapt
+aanschrapte
+aanschrapten
+aanschre
+aanschreden
+aanschreed
+aanschreef
+aanschreven
+aanschri
+aanschrijd
+aanschrijden
+aanschrijdt
+aanschrijf
+aanschrijft
+aanschrijven
+aanschrijving
+aanschrijvingen
+aanschrijvingsbiljet
+aanschrijvingsbiljetten
+aanschro
+aanschroef
+aanschroefde
+aanschroefden
+aanschroeft
+aanschroeven
+aanschui
+aanschuif
+aanschuift
+aanschuin
+aanschuinde
+aanschuinden
+aanschuinen
+aanschuint
+aanschuiven
+aansjok
+aansjokk
+aansjokken
+aansjokt
+aansjokte
+aansjokten
+aansjor
+aansjord
+aansjorde
+aansjorden
+aansjorr
+aansjorren
+aansjorring
+aansjorringen
+aansjort
+aansjouw
+aansjouwde
+aansjouwden
+aansjouwen
+aansjouwt
+aansla
+aanslaan
+aanslaander
+aanslaanders
+aanslaat
+aanslag
+aanslagb
+aanslagbeitel
+aanslagbeitels
+aanslagbiljet
+aanslagbiljetten
+aanslage
+aanslagen
+aanslagh
+aanslaghouding
+aanslags
+aanslagsteen
+aanslagstenen
+aansleep
+aansleept
+aansleepte
+aansleepten
+aanslent
+aanslenterde
+aanslenterden
+aanslenteren
+aanslepe
+aanslepen
+aansleur
+aansleurde
+aansleurden
+aansleuren
+aansleurt
+aanslib
+aanslibb
+aanslibben
+aanslibbing
+aanslibbingen
+aanslibd
+aanslibde
+aanslibden
+aanslibs
+aanslibsel
+aanslibsels
+aanslibt
+aanslijk
+aanslijken
+aanslijking
+aanslijkingen
+aanslijkt
+aanslijkte
+aanslijkten
+aanslijm
+aanslijmde
+aanslijmden
+aanslijmen
+aanslijmt
+aanslijp
+aanslijpen
+aanslijpt
+aansloeg
+aansloegen
+aanslof
+aansloff
+aansloffen
+aansloft
+aanslofte
+aansloften
+aansloop
+aansloot
+aanslope
+aanslopen
+aanslote
+aansloten
+aansluip
+aansluipen
+aansluipt
+aansluit
+aansluitdozen
+aansluiten
+aansluiting
+aansluitingen
+aansluitingsplaats
+aansluitingsplaatsen
+aansluitingspunt
+aansluitingspunten
+aansluitsnoer
+aansmeer
+aansmeerde
+aansmeerden
+aansmeert
+aansmeet
+aansmere
+aansmeren
+aansmeri
+aansmering
+aansmete
+aansmeten
+aansmijt
+aansmijten
+aansnauw
+aansnauwde
+aansnauwden
+aansnauwen
+aansnauwt
+aansnede
+aansneden
+aansnee
+aansneed
+aansnel
+aansneld
+aansnelde
+aansnelden
+aansnell
+aansnellen
+aansnelt
+aansnijd
+aansnijden
+aansnijding
+aansnijdingen
+aansnijdt
+aansnoer
+aansnoerde
+aansnoerden
+aansnoeren
+aansnoert
+aansnor
+aansnord
+aansnorde
+aansnorden
+aansnorr
+aansnorren
+aansnort
+aanspan
+aanspand
+aanspande
+aanspanden
+aanspann
+aanspannen
+aanspanner
+aanspanners
+aanspanning
+aanspanningen
+aanspant
+aanspeel
+aanspeelde
+aanspeelden
+aanspeelt
+aanspeet
+aanspeette
+aanspeetten
+aanspeld
+aanspeldde
+aanspeldden
+aanspelden
+aanspeldt
+aanspele
+aanspelen
+aanspete
+aanspeten
+aanspijk
+aanspijkerde
+aanspijkerden
+aanspijkeren
+aanspin
+aanspinn
+aanspinnen
+aanspint
+aanspoed
+aanspoedde
+aanspoedden
+aanspoeden
+aanspoedt
+aanspoel
+aanspoelde
+aanspoelden
+aanspoelen
+aanspoeling
+aanspoelingen
+aanspoelsel
+aanspoelsels
+aanspoelt
+aanspon
+aansponn
+aansponnen
+aanspoor
+aanspoorde
+aanspoorden
+aanspoorder
+aanspoorders
+aanspoort
+aanspore
+aansporen
+aanspori
+aansporing
+aansporingen
+aanspraa
+aanspraak
+aansprak
+aansprakelijk
+aansprakelijke
+aansprakelijker
+aansprakelijkheid
+aansprakelijkst
+aanspraken
+aanspree
+aanspreek
+aanspreekt
+aanspreektitel
+aanspreektitels
+aanspreekvorm
+aanspreekvormen
+aansprek
+aanspreken
+aanspreker
+aansprekers
+aanspreking
+aansprekingen
+aansprin
+aanspring
+aanspringen
+aanspringt
+aanspron
+aansprong
+aansprongen
+aansta
+aanstaan
+aanstaand
+aanstaande
+aanstaanden
+aanstaar
+aanstaarde
+aanstaarden
+aanstaart
+aanstaat
+aanstak
+aanstake
+aanstaken
+aanstalt
+aanstalten
+aanstamp
+aanstampen
+aanstamper
+aanstampers
+aanstamping
+aanstampt
+aanstampte
+aanstampten
+aanstap
+aanstapp
+aanstappen
+aanstapt
+aanstapte
+aanstapten
+aanstare
+aanstaren
+aansteef
+aansteek
+aansteekt
+aansteekvlam
+aansteekvlammen
+aansteke
+aanstekelijk
+aanstekelijke
+aanstekelijker
+aanstekelijkheid
+aanstekelijkst
+aansteken
+aansteker
+aanstekers
+aansteki
+aansteking
+aanstel
+aansteld
+aanstelde
+aanstelden
+aanstell
+aanstellen
+aansteller
+aanstellerig
+aanstellerige
+aanstelleriger
+aanstellerigst
+aanstellerij
+aanstellers
+aanstelling
+aanstellingen
+aanstelt
+aansterf
+aansterft
+aansterk
+aansterken
+aansterkt
+aansterkte
+aansterkten
+aansterv
+aansterven
+aansteve
+aansteven
+aanstevende
+aanstevenden
+aanstevenen
+aanstich
+aansticht
+aanstichten
+aanstichter
+aanstichters
+aanstichting
+aanstichtster
+aanstichtsters
+aanstichtte
+aanstichtten
+aanstier
+aanstierf
+aanstierven
+aanstiet
+aanstieten
+aanstijf
+aanstijfde
+aanstijfden
+aanstijft
+aanstijv
+aanstijven
+aanstik
+aanstikk
+aanstikken
+aanstikt
+aanstikte
+aanstikten
+aanstip
+aanstipp
+aanstippen
+aanstipping
+aanstippingen
+aanstipt
+aanstipte
+aanstipten
+aanstoke
+aanstoken
+aanstoker
+aanstokers
+aanstome
+aanstomen
+aanstond
+aanstonden
+aanstonds
+aanstoof
+aanstook
+aanstookster
+aanstooksters
+aanstookt
+aanstookte
+aanstookten
+aanstoom
+aanstoomde
+aanstoomden
+aanstoomt
+aanstoot
+aanstootte
+aanstootten
+aanstop
+aanstopp
+aanstoppen
+aanstopt
+aanstopte
+aanstopten
+aanstorm
+aanstormde
+aanstormden
+aanstormen
+aanstormt
+aanstort
+aanstorten
+aanstorting
+aanstortte
+aanstortten
+aanstote
+aanstotelijk
+aanstotelijke
+aanstotelijker
+aanstotelijkheden
+aanstotelijkheid
+aanstotelijkst
+aanstoten
+aanstotend
+aanstotende
+aanstotender
+aanstotendst
+aanstoti
+aanstoting
+aanstotingen
+aanstouw
+aanstouwde
+aanstouwden
+aanstouwen
+aanstouwt
+aanstove
+aanstoven
+aanstran
+aanstrand
+aanstrandde
+aanstrandden
+aanstranden
+aanstrandt
+aanstree
+aanstreek
+aanstreep
+aanstreept
+aanstreepte
+aanstreepten
+aanstrek
+aanstreken
+aanstrep
+aanstrepen
+aanstreping
+aanstrepingen
+aanstrij
+aanstrijk
+aanstrijken
+aanstrijkt
+aanstrik
+aanstrikken
+aanstrikt
+aanstrikte
+aanstrikten
+aanstrom
+aanstromen
+aanstrompelde
+aanstrompelden
+aanstrompelen
+aanstroo
+aanstroom
+aanstroomde
+aanstroomden
+aanstroomt
+aanstuif
+aanstuift
+aanstuiv
+aanstuiven
+aanstuiving
+aanstuivingen
+aansture
+aansturen
+aanstuur
+aanstuurde
+aanstuurden
+aanstuurt
+aanstuwd
+aanstuwde
+aanstuwden
+aanstuwe
+aanstuwen
+aansukke
+aansukkelde
+aansukkelden
+aansukkelen
+aantakel
+aantakelde
+aantakelden
+aantakelen
+aantal
+aantalle
+aantallen
+aantap
+aantappe
+aantappen
+aantapt
+aantapte
+aantapten
+aantast
+aantaste
+aantasten
+aantasti
+aantasting
+aantastingen
+aantastt
+aantastte
+aantastten
+aanteeg
+aanteel
+aanteeld
+aanteelde
+aanteelden
+aanteelt
+aantegen
+aanteken
+aantekenaar
+aantekenaars
+aantekenboek
+aantekenboeken
+aantekende
+aantekenden
+aantekenen
+aantekengeld
+aantekengelden
+aantekening
+aantekeningen
+aantekeningspartij
+aantekeningspartijen
+aantekenkantoor
+aantekenkantoren
+aantekenpartij
+aantekenpartijen
+aantekenrecht
+aantelen
+aantelin
+aanteling
+aantijg
+aantijge
+aantijgen
+aantijger
+aantijgers
+aantijgi
+aantijging
+aantijgingen
+aantijgt
+aantik
+aantikke
+aantikken
+aantikt
+aantikte
+aantikten
+aantimme
+aantimmerde
+aantimmerden
+aantimmeren
+aantocht
+aantonen
+aantonend
+aantonende
+aantonin
+aantoning
+aantoon
+aantoonb
+aantoonbare
+aantoond
+aantoonde
+aantoonden
+aantoont
+aantrad
+aantrade
+aantraden
+aantrap
+aantrapp
+aantrappen
+aantrapt
+aantrapte
+aantrapten
+aantrede
+aantreden
+aantree
+aantreed
+aantreedt
+aantreep
+aantreeplaats
+aantreeplaatsen
+aantref
+aantreff
+aantreffen
+aantreft
+aantrek
+aantrekk
+aantrekkelijk
+aantrekkelijke
+aantrekkelijker
+aantrekkelijkheden
+aantrekkelijkheid
+aantrekkelijkst
+aantrekken
+aantrekkend
+aantrekker
+aantrekkers
+aantrekking
+aantrekkingskracht
+aantrekkingsvermogen
+aantrekt
+aantripp
+aantrippelde
+aantrippelden
+aantrippelen
+aantrof
+aantroff
+aantroffen
+aantrok
+aantrokk
+aantrokken
+aantrouw
+aantrouwing
+aanturen
+aantuur
+aantuurd
+aantuurde
+aantuurden
+aantuurt
+aanvaar
+aanvaard
+aanvaardbaar
+aanvaardbaarder
+aanvaardbaarheid
+aanvaardbaarst
+aanvaardbare
+aanvaardde
+aanvaardden
+aanvaarde
+aanvaarden
+aanvaarding
+aanvaardingen
+aanvaardt
+aanvaarp
+aanvaarpaal
+aanvaarpalen
+aanvaart
+aanval
+aanvalle
+aanvallen
+aanvallend
+aanvallende
+aanvallenderwijs
+aanvallenderwijze
+aanvaller
+aanvallers
+aanvalli
+aanvallig
+aanvallige
+aanvalliger
+aanvalligheden
+aanvalligheid
+aanvalligst
+aanvalsc
+aanvalscolonne
+aanvalscolonnes
+aanvalsf
+aanvalsfront
+aanvalsfronten
+aanvalsk
+aanvalskreet
+aanvalskreten
+aanvalso
+aanvalsoorlog
+aanvalsoorlogen
+aanvalsp
+aanvalsplan
+aanvalsplannen
+aanvalss
+aanvalssein
+aanvalsseinen
+aanvalst
+aanvalsteken
+aanvalstekens
+aanvalsw
+aanvalswapen
+aanvalswapenen
+aanvalswapens
+aanvalswijs
+aanvalswijze
+aanvalswijzen
+aanvalt
+aanvang
+aanvange
+aanvangen
+aanvanger
+aanvangers
+aanvangs
+aanvangspunt
+aanvangspunten
+aanvangssnelheden
+aanvangssnelheid
+aanvangsstadia
+aanvangsstadium
+aanvangsstadiums
+aanvangt
+aanvanke
+aanvankelijk
+aanvankelijke
+aanvaren
+aanvarin
+aanvaring
+aanvaringen
+aanvaringsschot
+aanvaringsschotten
+aanvat
+aanvatte
+aanvatten
+aanvatti
+aanvatting
+aanvecht
+aanvechtbaar
+aanvechtbaarder
+aanvechtbaarst
+aanvechtbare
+aanvechten
+aanvechting
+aanvechtingen
+aanveeg
+aanveegd
+aanveegde
+aanveegden
+aanveegt
+aanvees
+aanvegen
+aanverst
+aanverstorven
+aanverwa
+aanverwant
+aanverwante
+aanverwanten
+aanverwantschap
+aanvet
+aanvette
+aanvetten
+aanvezen
+aanviel
+aanviele
+aanvielen
+aanvijl
+aanvijld
+aanvijlde
+aanvijlden
+aanvijle
+aanvijlen
+aanvijls
+aanvijlsblok
+aanvijlsblokken
+aanvijlt
+aanvijs
+aanvijst
+aanvijze
+aanvijzen
+aanving
+aanvinge
+aanvingen
+aanvlam
+aanvlamd
+aanvlamde
+aanvlamden
+aanvlamm
+aanvlammen
+aanvlamt
+aanvlech
+aanvlecht
+aanvlechten
+aanvlieg
+aanvliegen
+aanvliegt
+aanvloch
+aanvlocht
+aanvlochten
+aanvloei
+aanvloeide
+aanvloeiden
+aanvloeien
+aanvloeit
+aanvloge
+aanvlogen
+aanvloog
+aanvlot
+aanvlott
+aanvlotte
+aanvlotten
+aanvocht
+aanvochten
+aanvoeg
+aanvoegd
+aanvoegde
+aanvoegden
+aanvoege
+aanvoegen
+aanvoegend
+aanvoegende
+aanvoegi
+aanvoeging
+aanvoegingen
+aanvoegs
+aanvoegsel
+aanvoegsels
+aanvoegt
+aanvoel
+aanvoeld
+aanvoelde
+aanvoelden
+aanvoele
+aanvoelen
+aanvoeli
+aanvoeling
+aanvoelt
+aanvoer
+aanvoerb
+aanvoerbuis
+aanvoerbuizen
+aanvoerd
+aanvoerde
+aanvoerden
+aanvoerder
+aanvoerders
+aanvoere
+aanvoeren
+aanvoeri
+aanvoering
+aanvoerp
+aanvoerpijp
+aanvoerpijpen
+aanvoerr
+aanvoerrol
+aanvoerrollen
+aanvoers
+aanvoerster
+aanvoersters
+aanvoert
+aanvraag
+aanvraagde
+aanvraagden
+aanvraagt
+aanvrage
+aanvragen
+aanvrat
+aanvrate
+aanvraten
+aanvreet
+aanvrete
+aanvreten
+aanvroeg
+aanvroegen
+aanvul
+aanvulde
+aanvulden
+aanvulle
+aanvullen
+aanvullende
+aanvulli
+aanvulling
+aanvullingen
+aanvullingsbegroting
+aanvullingsbegrotingen
+aanvullingsexamen
+aanvullingsexamens
+aanvullingskohier
+aanvullingskohieren
+aanvullingstroepen
+aanvulse
+aanvulsel
+aanvulsels
+aanvult
+aanvuren
+aanvurin
+aanvuring
+aanvuur
+aanvuurd
+aanvuurde
+aanvuurden
+aanvuurt
+aanwaai
+aanwaaid
+aanwaaide
+aanwaaiden
+aanwaaie
+aanwaaien
+aanwaait
+aanwagge
+aanwaggelde
+aanwaggelden
+aanwaggelen
+aanwakke
+aanwakkerde
+aanwakkerden
+aanwakkeren
+aanwande
+aanwandelde
+aanwandelden
+aanwandelen
+aanwas
+aanwasse
+aanwassen
+aanwassi
+aanwassing
+aanwassingen
+aanwast
+aanweef
+aanweefd
+aanweefde
+aanweefden
+aanweeft
+aanwees
+aanwen
+aanwend
+aanwendb
+aanwendbaar
+aanwendbaarder
+aanwendbaarst
+aanwendbare
+aanwendd
+aanwendde
+aanwendden
+aanwende
+aanwenden
+aanwendi
+aanwending
+aanwendingen
+aanwendt
+aanwenne
+aanwennen
+aanwenni
+aanwenning
+aanwense
+aanwensel
+aanwensels
+aanwent
+aanwente
+aanwentelde
+aanwentelden
+aanwentelen
+aanwerf
+aanwerft
+aanwerp
+aanwerpe
+aanwerpen
+aanwerpt
+aanwerve
+aanwerven
+aanwerver
+aanwervers
+aanwervi
+aanwerving
+aanwervingen
+aanwet
+aanwette
+aanwetten
+aanweven
+aanwezen
+aanwezend
+aanwezende
+aanwezig
+aanwezige
+aanwezigen
+aanwezigheid
+aanwezigheidslijst
+aanwezigheidslijsten
+aanwierf
+aanwierp
+aanwierpen
+aanwierv
+aanwierven
+aanwies
+aanwiese
+aanwiesen
+aanwijs
+aanwijsb
+aanwijsbaar
+aanwijsbare
+aanwijss
+aanwijsstok
+aanwijsstokken
+aanwijst
+aanwijze
+aanwijzen
+aanwijzend
+aanwijzende
+aanwijzer
+aanwijzers
+aanwijzi
+aanwijzing
+aanwijzingen
+aanwin
+aanwinne
+aanwinnen
+aanwinni
+aanwinning
+aanwinningen
+aanwinst
+aanwinsten
+aanwint
+aanwip
+aanwippe
+aanwippen
+aanwipt
+aanwipte
+aanwipten
+aanwoei
+aanwoeie
+aanwoeien
+aanwoeke
+aanwoekerde
+aanwoekerden
+aanwoekeren
+aanwon
+aanwonne
+aanwonnen
+aanwreef
+aanwreve
+aanwreven
+aanwrijf
+aanwrijft
+aanwrijv
+aanwrijven
+aanyo
+aanzaai
+aanzaaid
+aanzaaide
+aanzaaiden
+aanzaaie
+aanzaaien
+aanzaait
+aanzag
+aanzagen
+aanzak
+aanzakke
+aanzakken
+aanzakt
+aanzakte
+aanzakten
+aanzand
+aanzandd
+aanzandde
+aanzandden
+aanzande
+aanzanden
+aanzandt
+aanzat
+aanzaten
+aanzeg
+aanzegde
+aanzegden
+aanzegge
+aanzeggen
+aanzegger
+aanzeggers
+aanzeggi
+aanzegging
+aanzeggingen
+aanzegt
+aanzei
+aanzeide
+aanzeiden
+aanzeil
+aanzeild
+aanzeilde
+aanzeilden
+aanzeile
+aanzeilen
+aanzeili
+aanzeiling
+aanzeilingen
+aanzeilt
+aanzet
+aanzetha
+aanzethamer
+aanzethamers
+aanzetri
+aanzetriem
+aanzetriemen
+aanzetsc
+aanzetschroef
+aanzetschroeven
+aanzetse
+aanzetsel
+aanzetsels
+aanzetsl
+aanzetslinger
+aanzetslingers
+aanzetst
+aanzetstaal
+aanzetstalen
+aanzetsteen
+aanzetstenen
+aanzetstok
+aanzetstokken
+aanzetstuk
+aanzetstukken
+aanzette
+aanzetten
+aanzetter
+aanzetters
+aanzetti
+aanzetting
+aanzettingen
+aanzetvi
+aanzetvijl
+aanzetvijlen
+aanzeul
+aanzeuld
+aanzeulde
+aanzeulden
+aanzeule
+aanzeulen
+aanzeult
+aanzicht
+aanzichten
+aanzie
+aanzien
+aanziend
+aanziende
+aanzienl
+aanzienlijk
+aanzienlijke
+aanzienlijker
+aanzienlijkheid
+aanzienlijkst
+aanziet
+aanzijn
+aanzit
+aanzitte
+aanzitten
+aanzocht
+aanzochten
+aanzoek
+aanzoeke
+aanzoeken
+aanzoeker
+aanzoekers
+aanzoekt
+aanzoet
+aanzoete
+aanzoeten
+aanzoett
+aanzoette
+aanzoetten
+aanzogen
+aanzoog
+aanzuig
+aanzuige
+aanzuigen
+aanzuigi
+aanzuiging
+aanzuigt
+aanzuive
+aanzuiverde
+aanzuiverden
+aanzuiveren
+aanzuivering
+aanzuiveringen
+aanzwaai
+aanzwaaide
+aanzwaaiden
+aanzwaaien
+aanzwaait
+aanzweef
+aanzweefde
+aanzweefden
+aanzweeft
+aanzweep
+aanzweept
+aanzweepte
+aanzweepten
+aanzwel
+aanzwell
+aanzwellen
+aanzwellend
+aanzwellende
+aanzwelt
+aanzwem
+aanzwemm
+aanzwemmen
+aanzwemt
+aanzwepe
+aanzwepen
+aanzweve
+aanzweven
+aanzwoeg
+aanzwoegde
+aanzwoegden
+aanzwoegen
+aanzwoegt
+aanzwol
+aanzwoll
+aanzwollen
+aanzwom
+aanzwomm
+aanzwommen
+aao
+aap
+aapachti
+aapachtig
+aapachtige
+aapachtiger
+aapachtigst
+aapeli
+aapje
+aapjes
+aapjessn
+aapjessnuif
+aapjesze
+aapjeszeep
+aapmens
+aapmense
+aapmensen
+aapo
+aapostro
+aapostrophize
+aappo
+aapte
+aapten
+aar
+aara
+aarai
+aaran
+aarbusse
+aarbussel
+aarbussels
+aard
+aardacht
+aardachtig
+aardachtige
+aardachtiger
+aardachtigst
+aardaker
+aardakers
+aardaman
+aardamandel
+aardamandelen
+aardamandels
+aardappe
+aardappel
+aardappelboer
+aardappelboeren
+aardappelbuik
+aardappelbuiken
+aardappelcampagne
+aardappelcampagnes
+aardappelcroquet
+aardappelcroquetten
+aardappeldeeg
+aardappelen
+aardappelhakker
+aardappelhakkers
+aardappelmeel
+aardappelplant
+aardappelplanten
+aardappelpuree
+aardappels
+aardappelschiller
+aardappelschillers
+aardappelstijfsel
+aardappelstroop
+aardappelvlokken
+aardappelziekte
+aardappelziekten
+aardappelziektes
+aardas
+aardbaan
+aardbei
+aardbeib
+aardbeibomen
+aardbeiboom
+aardbeie
+aardbeien
+aardbeienbed
+aardbeienbedden
+aardbeiengelei
+aardbeienjam
+aardbeienteelt
+aardbeientijd
+aardbeil
+aardbeiloof
+aardbeip
+aardbeiplant
+aardbeiplanten
+aardbeis
+aardbeistruik
+aardbeistruiken
+aardberg
+aardberging
+aardbergingen
+aardbevi
+aardbeving
+aardbevingen
+aardbevingsgolf
+aardbevingsgolven
+aardbevingsmeter
+aardbevingsmeters
+aardbewo
+aardbewoner
+aardbewoners
+aardbode
+aardbodem
+aardboge
+aardbogen
+aardbol
+aardboll
+aardbollen
+aardboog
+aardboor
+aardbore
+aardboren
+aardbran
+aardbrand
+aardbranden
+aardde
+aardden
+aardduiv
+aardduivel
+aardduivels
+aarde
+aardebaa
+aardebaan
+aardeban
+aardebanen
+aardedon
+aardedonker
+aardedonkere
+aardegoe
+aardegoed
+aarden
+aardeweg
+aardewegen
+aardewer
+aardewerk
+aardewerker
+aardewerkers
+aardewerkfabriek
+aardewerkfabrieken
+aardewerkschuit
+aardewerkschuiten
+aardewerkwinkel
+aardewerkwinkels
+aardgas
+aardgees
+aardgeest
+aardgeesten
+aardgewa
+aardgewas
+aardgewassen
+aardglob
+aardglobe
+aardglobes
+aardgoed
+aardgord
+aardgordel
+aardgordels
+aardhars
+aardharsen
+aardhomm
+aardhommel
+aardhommels
+aardhoop
+aardhope
+aardhopen
+aardig
+aardige
+aardiger
+aardighe
+aardigheden
+aardigheid
+aardigje
+aardigjes
+aardigst
+aardkast
+aardkastanje
+aardkastanjes
+aardkern
+aardklom
+aardklomp
+aardklompen
+aardklon
+aardklont
+aardklonten
+aardkloo
+aardkloot
+aardklui
+aardkluit
+aardkluiten
+aardkors
+aardkorst
+aardkrek
+aardkrekel
+aardkrekels
+aardkuil
+aardkuilen
+aardkund
+aardkunde
+aardkundig
+aardkundige
+aardkundigen
+aardlaag
+aardlage
+aardlagen
+aardleid
+aardleiding
+aardleidingen
+aardleve
+aardlevering
+aardleveringen
+aardmagn
+aardmagnetisch
+aardmagnetische
+aardmagnetisme
+aardmann
+aardmannetje
+aardmannetjes
+aardmass
+aardmassa
+aardmassa's
+aardmeet
+aardmeetkunde
+aardmeetkunst
+aardmeti
+aardmeting
+aardmetingen
+aardmijt
+aardmijten
+aardmolm
+aardmuis
+aardmuiz
+aardmuizen
+aardnoot
+aardnote
+aardnoten
+aardnotenolie
+aardolie
+aardolien
+aardpeer
+aardpek
+aardpere
+aardperen
+aardploo
+aardplooi
+aardplooien
+aardrijk
+aardrijkskunde
+aardrijkskundeboek
+aardrijkskundeboeken
+aardrijkskundig
+aardrijkskundige
+aardrijkskundigen
+aardrol
+aardroll
+aardrollen
+aardrook
+aardrups
+aardrupsen
+aards
+aardscho
+aardschok
+aardschokken
+aardschors
+aardschu
+aardschudding
+aardschuddingen
+aardse
+aardser
+aardsgez
+aardsgezind
+aardsgezinde
+aardsgezinder
+aardsgezindheid
+aardsgezindst
+aardslak
+aardslakken
+aardslan
+aardslang
+aardslangen
+aardspin
+aardspinnen
+aardst
+aardster
+aardsterren
+aardstor
+aardstorting
+aardstortingen
+aardt
+aardtor
+aardtorr
+aardtorren
+aardvark
+aardvarken
+aardvarkens
+aardvarks
+aardvast
+aardvaste
+aardveil
+aardverf
+aardvers
+aardverschuiving
+aardverschuivingen
+aardverv
+aardverven
+aardvlo
+aardvloo
+aardvlooien
+aardvork
+aardvorken
+aardvruc
+aardvrucht
+aardvruchten
+aardwas
+aardwerk
+aardwerken
+aardwerker
+aardwerkers
+aardwete
+aardwetenschappen
+aardwind
+aardwinde
+aardwinden
+aardwindes
+aardwolf
+aardwolv
+aardwolven
+aardworm
+aardwormen
+aaren
+aarets
+aargau
+aargh
+aarg}ng
+aarg}nga
+aarg}ngar
+aarhundr
+aarhundrade
+aarhundradet
+aarhus
+aari
+aarika
+aaring
+aaringar
+aaringen
+aariya
+aarlig
+aarligen
+aarling
+aarlinge
+aarlingen
+aarne
+aarnet
+aarni
+aarno
+aaro
+aaro`nica
+aaro`nico
+aaron
+aaronic
+aaronica
+aaronical
+aaronite
+aaronites
+aaroniti
+aaronitic
+aarons
+aaronsbu
+aaronsburg
+aaronson
+aarre
+aars
+aarsarbe
+aarsarbetskraft
+aarsarbetskrafter
+aarsarbetstider
+aarsavgi
+aarsavgift
+aarsbeho
+aarsbehov
+aarsbera
+aarsberaettelser
+aarsdarm
+aarsdarmen
+aarsgat
+aarsgate
+aarsgaten
+aarshyra
+aarsinko
+aarsinkomst
+aarskoer
+aarskoerning
+aarskoerningen
+aarskost
+aarskostnad
+aarskurs
+aarsmode
+aarsmodell
+aarsmoet
+aarsmoete
+aarsperi
+aarsperioden
+aarspers
+aarsperspektiv
+aarsredo
+aarsredovisning
+aarsskif
+aarsskifte
+aarsskiftet
+aarsslut
+aarsstat
+aarsstatistiken
+aarstid
+aarstide
+aarstider
+aarsvin
+aarsvinn
+aarsvinnen
+aartag
+aartal
+aarthur
+aarti
+aartiond
+aartionde
+aartiondet
+aartjan
+aarto
+aartsbed
+aartsbedrieger
+aartsbedriegers
+aartsbedriegster
+aartsbedriegsters
+aartsbis
+aartsbisdom
+aartsbisdommen
+aartsbisschop
+aartsbisschoppelijk
+aartsbisschoppelijke
+aartsbisschoppen
+aartsboo
+aartsbooswicht
+aartsbooswichten
+aartsbro
+aartsbroederschap
+aartsbroederschappen
+aartsdeu
+aartsdeugniet
+aartsdeugnieten
+aartsdia
+aartsdiaken
+aartsdiakens
+aartsdiakenschap
+aartsdiakenschappen
+aartsdom
+aartsdomkop
+aartsdomkoppen
+aartsdomme
+aartseng
+aartsengel
+aartsengelen
+aartsher
+aartshertog
+aartshertogdom
+aartshertogdommen
+aartshertogelijk
+aartshertogelijke
+aartshertogen
+aartshertogin
+aartshertoginnen
+aartskan
+aartskanselier
+aartskanselieren
+aartskanseliers
+aartsket
+aartsketter
+aartsketters
+aartsleu
+aartsleugenaar
+aartsleugenaars
+aartslie
+aartsliefhebber
+aartsliefhebbers
+aartslui
+aartsluiaard
+aartsluiaards
+aartsluie
+aartsluier
+aartsluist
+aartspri
+aartspriester
+aartspriesters
+aartspriesterschap
+aartspriesterschappen
+aartssch
+aartsschelm
+aartsschelmen
+aartsvad
+aartsvader
+aartsvaderen
+aartsvaderlijk
+aartsvaderlijke
+aartsvaderlijker
+aartsvaderlijkst
+aartsvaders
+aartsver
+aartsverrader
+aartsverraders
+aartsvij
+aartsvijand
+aartsvijanden
+aartusen
+aartusende
+aaru
+aaryn
+aarzel
+aarzelde
+aarzelden
+aarzelen
+aarzelin
+aarzeling
+aarzelingen
+aarzen
+aas
+aasaetta
+aasaetts
+aasatts
+aasbloem
+aasbloemen
+aasde
+aasden
+aasdier
+aasdiere
+aasdieren
+aase
+aasen
+aases
+aasgeier
+aasgeiern
+aasgeiers
+aasgier
+aasgiere
+aasgieren
+aashite
+aasia
+aasido
+aasidosa
+aasidosaetta
+aasikt
+aasikter
+aasite
+aasjager
+aasjagers
+aasje
+aasjes
+aaska
+aaskam
+aaskby
+aaskever
+aaskevers
+aaskskyd
+aaskskydd
+aask}da
+aask}dar
+aask}dare
+aask}darplats
+aask}dli
+aask}dlig
+aasna
+aasnan
+aast
+aastad
+aastadko
+aastadkom
+aastadkomma
+aastadkommes
+aastadkommit
+aastor
+aastorre
+aastorren
+aastveit
+aasvlieg
+aasvliegen
+aasvogel
+aasvogels
+aasyfta
+aaszak
+aaszakke
+aaszakken
+aat
+aata
+aatagit
+aatal
+aatala
+aatami
+aater
+aaterfin
+aaterfinns
+aaterfja
+aaterfjaedrande
+aaterfoe
+aaterfoers
+aaterfoersaeljare
+aaterf}
+aaterge
+aatergiv
+aatergiven
+aatergivet
+aaterg}
+aaterg}n
+aaterg}ng
+aaterg}r
+aaterhop
+aaterhopp
+aaterige
+aaterigen
+aaterins
+aaterinsaetta
+aaterkom
+aaterkommande
+aaterkommer
+aaterkop
+aaterkoppling
+aaterkopplingen
+aaterlae
+aaterlaemnas
+aaterrap
+aaterrapportering
+aaterres
+aaterresa
+aatersae
+aatersaenda
+aatersaendes
+aatersaent
+aaterse
+aaterska
+aaterskapa
+aaterskr
+aaterskrivs
+aaterspe
+aaterspegla
+aatersta
+aaterstaella
+aaterstaelles
+aaterstart
+aatersto
+aaterstod
+aaterst}
+aaterst}ende
+aaterst}r
+aatertas
+aaterupp
+aateruppliva
+aatervae
+aatervaender
+aatervaendsgr{nder
+aatervin
+aatervinning
+aatfoelj
+aatfoelja
+aatfoeljd
+aatfoeljda
+aatfoeljes
+aatfoeljs
+aatfoeljt
+aatgaerd
+aatgaerda
+aatgaerder
+aatg}
+aatg}ng
+aatg}r
+aatje
+aatjes
+aatkomli
+aatkomlig
+aatkomliga
+aatkomligt
+aatkomst
+aatkomster
+aatkomstvidder
+aatminst
+aatminstone
+aatnjoet
+aatnjuta
+aatos
+aatra
+aatr}
+aatskild
+aatskilda
+aatskilj
+aatskill
+aatskillig
+aatskilliga
+aatskilligt
+aatta
+aattio
+aattiond
+aattionde
+aattiota
+aattiotal
+aatto
+aattonde
+aatu
+aau
+aaugh
+aavasaks
+aavasaksa
+aaw
+aaye
+aazq
+ab
+aba
+aba"nder
+aba"nderung
+aba\ador
+aba\adora
+aba\adura
+aba\ar
+aba^tard
+aba^tardir
+abab
+ababa
+ababdeh
+ababillarse
+ababol
+ababua
+abac
+abaca
+abaca`
+abacama
+abacate
+abacay
+abacera
+abaceri`a
+abacero
+abacha
+abachidz
+abachidze
+abaci
+abacial
+abacinat
+abacinate
+abacination
+abaciscu
+abaciscus
+abacist
+aback
+abaco
+abactina
+abactinal
+abactinally
+abaction
+abactis
+abactiss
+abactissen
+abactor
+abaculus
+abacus
+abacuses
+abad
+abada
+abadaba
+abadabdo
+abadabdoo
+abadah
+abadam
+abadan
+abaddon
+abadejo
+abadekh
+abadenga
+abadengo
+abadernar
+abadesa
+abadi
+abadi`
+abadi`a
+abadia
+abadiado
+abadiato
+abadie
+abadines
+abadite
+abadzex
+abaender
+abaenderlich
+abaenderlichem
+abaenderlichen
+abaenderlicher
+abaendern
+abaendernd
+abaenderndem
+abaenderndes
+abaenderte
+abaenderung
+abaenderungsantraege
+abaenderungsantraegen
+abaenderungsantrag
+abaenderungsvorschlag
+abaff
+abaft
+abaga
+abagael
+abagail
+abagtha
+abahri
+abai
+abaia
+abaiang
+abaisanc
+abaisance
+abaiser
+abaissa
+abaissai
+abaissaient
+abaissais
+abaissait
+abaissan
+abaissant
+abaisse
+abaisse'
+abaisse'e
+abaisse'es
+abaisse's
+abaisse`
+abaisse`rent
+abaissed
+abaissem
+abaissement
+abaissements
+abaissen
+abaissent
+abaisser
+abaissera
+abaisserai
+abaisseraient
+abaisserais
+abaisserait
+abaisseras
+abaisserez
+abaisseriez
+abaisserions
+abaisserons
+abaisseront
+abaisses
+abaissez
+abaissie
+abaissiez
+abaissio
+abaissions
+abaisson
+abaissons
+abajadero
+abajamiento
+abajar
+abaje\a
+abaje\o
+abajo
+abajor
+abajote
+abak
+abaka
+abakaka
+abakalik
+abakaliki
+abakan
+abakay
+abake
+abakents
+abakentshori
+abaketsh
+abaketshori
+abakida
+abaknon
+abakoum
+abakpa
+abakuks
+abakum
+abakus
+abakusen
+abakwari
+abakwariga
+abal
+abala
+abalada
+abalado
+abalakin
+abalakov
+abalakovo
+abalar
+abalardi
+abalaustrada
+abalaustrado
+abaldonadamente
+abaldonamiento
+abaldonar
+abaleador
+abaleadora
+abaleadura
+abalear
+abaleo
+abaletti
+abali
+abaliena
+abalienate
+abalienation
+abalizamiento
+abalizar
+abalkin
+aballar
+aballestar
+abalone
+abalones
+abalorio
+abaluartar
+abam
+abama
+abamet
+abampere
+abana
+abanar
+abancalar
+abandalizar
+abandera
+abanderada
+abanderado
+abanderamiento
+abanderar
+abanderi`a
+abanderizador
+abanderizadora
+abanderizar
+abandon
+abandona
+abandonable
+abandonada
+abandonado
+abandonamiento
+abandonar
+abandond
+abandone
+abandoned
+abandonedly
+abandonee
+abandoner
+abandoners
+abandoni
+abandoning
+abandonismo
+abandonista
+abandonm
+abandonment
+abandonments
+abandonn
+abandonna
+abandonnaient
+abandonnais
+abandonnait
+abandonnant
+abandonne
+abandonne'
+abandonne'e
+abandonne'es
+abandonne's
+abandonne`rent
+abandonneerde
+abandonneerden
+abandonnement
+abandonnent
+abandonner
+abandonnera
+abandonnerai
+abandonneraient
+abandonnerais
+abandonnerait
+abandonneras
+abandonneren
+abandonnerez
+abandonneriez
+abandonnerions
+abandonnerons
+abandonneront
+abandonnes
+abandonnez
+abandonniez
+abandonnions
+abandonnons
+abandono
+abandons
+abanear
+abanera
+abanero
+abangba
+abangyar
+abanic
+abanicar
+abanicazo
+abanico
+abanillo
+abanino
+abaniqueo
+abaniquera
+abaniqueri`a
+abaniquero
+abanliku
+abano
+abante
+abantes
+abanto
+abantyur
+abanyom
+abanyum
+abaptist
+abaptiston
+abar
+abara
+abara\ar
+abarabon
+abarambo
+abaratamiento
+abaratar
+abaraya
+abarbechar
+abarbeit
+abarbeiten
+abarbeitend
+abarbeitende
+abarbeitendem
+abarbeitender
+abarbeitendes
+abarbeitete
+abarbeitung
+abarca
+abarcada
+abarcado
+abarcador
+abarcadora
+abarcadura
+abarcamiento
+abarcar
+abarco`n
+abarcuzar
+abare
+abareda
+abaremak
+abaremaw
+abarenbo
+abarim
+abaris
+abaritonada
+abaritonado
+abarloar
+abarquera
+abarquero
+abarquillada
+abarquillado
+abarquillamiento
+abarquillar
+abarracar
+abarrada
+abarrado
+abarraganamiento
+abarraganarse
+abarrajar
+abarramiento
+abarrancadero
+abarrancamiento
+abarrancar
+abarrar
+abarraz
+abarredera
+abarrenar
+abarrer
+abarrisco
+abarrotar
+abarrote
+abarrotera
+abarrotero
+abarse
+abart
+abarten
+abarthro
+abarthrosis
+abarticu
+abarticular
+abarticulation
+abartige
+abartigem
+abartigen
+abartiges
+abas
+abasakur
+abasango
+abascal
+abase
+abased
+abasedly
+abasedne
+abasedness
+abasemen
+abasement
+abasements
+abaser
+abasers
+abases
+abasest
+abasgi
+abash
+abashed
+abashedl
+abashedly
+abashedn
+abashedness
+abashes
+abashing
+abashiri
+abashles
+abashless
+abashlessly
+abashmen
+abashment
+abashments
+abasht
+abasi`
+abasia
+abasic
+abasing
+abasiri
+abasiris
+abask
+abasolo
+abasourd
+abasourdi
+abasourdie
+abasourdies
+abasourdir
+abasourdira
+abasourdiraient
+abasourdirait
+abasourdirent
+abasourdiront
+abasourdis
+abasourdissaient
+abasourdissait
+abasourdissant
+abasourdissante
+abasourdissantes
+abasourdissants
+abasourdisse
+abasourdissent
+abasourdit
+abassin
+abastadamente
+abastamiento
+abastante
+abastanza
+abastar
+abastard
+abastardar
+abastardize
+abastecedor
+abastecedora
+abastecer
+abastecimiento
+abastero
+abastimiento
+abastionar
+abasto
+abastuma
+abastumani
+abat
+abat-jou
+abat-jour
+abat-jours
+abata
+abatable
+abatamoe
+abatanar
+abate
+abated
+abatemen
+abatement
+abatements
+abater
+abaters
+abates
+abath
+abathwa
+abati
+abati`
+abatida
+abatidamente
+abatidero
+abatido
+abatidura
+abatimiento
+abating
+abatir
+abatis
+abatised
+abatises
+abatismo
+abatjour
+abatojar
+abaton
+abator
+abats
+abatsa
+abattage
+abattages
+abattaie
+abattaient
+abattais
+abattait
+abattant
+abattants
+abatte
+abatteme
+abattement
+abattements
+abattent
+abattes
+abattez
+abattiez
+abattion
+abattions
+abattire
+abattirent
+abattis
+abattit
+abattoir
+abattoirs
+abattons
+abattra
+abattrai
+abattraient
+abattrais
+abattrait
+abattras
+abattre
+abattrez
+abattrie
+abattriez
+abattrio
+abattrions
+abattron
+abattrons
+abattront
+abattu
+abattue
+abattues
+abattus
+abatua
+abature
+abau
+abave
+abaw
+abaxial
+abaxile
+abaya
+abayada
+abayado
+abayo
+abayongo
+abaz
+abaza
+abazari
+abaze
+abazin
+abazints
+abazintsy
+abazo`n
+abazure
+abb
+abba
+abbacies
+abbacome
+abbacomes
+abbacy
+abbadabb
+abbadabba
+abbadide
+abbagli
+abbaglia
+abbagliai
+abbagliamo
+abbagliano
+abbagliare
+abbagliata
+abbagliate
+abbagliati
+abbagliato
+abbagliava
+abbagliavi
+abbagliavo
+abbaglie
+abbagliera
+abbagliero
+abbaglin
+abbaglino
+abbaglio
+abbai
+abbaia
+abbaiai
+abbaiamm
+abbaiammo
+abbaiamo
+abbaiand
+abbaiando
+abbaiano
+abbaiare
+abbaiaro
+abbaiarono
+abbaiass
+abbaiasse
+abbaiassi
+abbaiast
+abbaiaste
+abbaiasti
+abbaiata
+abbaiate
+abbaiati
+abbaiato
+abbaiava
+abbaiavamo
+abbaiavano
+abbaiavate
+abbaiavi
+abbaiavo
+abbaiera
+abbaierai
+abbaiere
+abbaierei
+abbaieremo
+abbaierete
+abbaiero
+abbaini
+abbaino
+abbaio
+abbana
+abbandon
+abbandona
+abbandonai
+abbandoni
+abbandono
+abbas
+abbasi
+abbass
+abbassa
+abbassai
+abbassam
+abbassammo
+abbassan
+abbassando
+abbassano
+abbassar
+abbassare
+abbassas
+abbassasse
+abbassassi
+abbassaste
+abbassasti
+abbassat
+abbassata
+abbassate
+abbassati
+abbassato
+abbassav
+abbassava
+abbassavi
+abbassavo
+abbasser
+abbassera
+abbasserai
+abbasserei
+abbassero
+abbassi
+abbassia
+abbassiamo
+abbassiate
+abbassid
+abbasside
+abbassin
+abbassino
+abbasso
+abbastan
+abbastanza
+abbatant
+abbatantuono
+abbate
+abbati
+abbatial
+abbatica
+abbatical
+abbatiel
+abbatiello
+abbatis
+abbatta
+abbattan
+abbattano
+abbatte
+abbattei
+abbattem
+abbattemmo
+abbatten
+abbattendo
+abbatter
+abbattera
+abbatterai
+abbattere
+abbatterei
+abbattero
+abbattes
+abbattesse
+abbattessi
+abbatteste
+abbattesti
+abbattet
+abbattete
+abbattette
+abbattetti
+abbattev
+abbatteva
+abbattevi
+abbattevo
+abbatti
+abbattia
+abbattiamo
+abbattiate
+abbatto
+abbatton
+abbattono
+abbattut
+abbattuta
+abbattute
+abbattuti
+abbattuto
+abbau
+abbauen
+abbauend
+abbauende
+abbauenden
+abbauender
+abbauendes
+abbaufor
+abbaufortschritt
+abbaufortschrittsmessung
+abbaufro
+abbaufront
+abbauger
+abbaugera"t
+abbaugera"usche
+abbaulei
+abbauleistung
+abbauleitzentrale
+abbauleitzentralen
+abbaumas
+abbaumaschine
+abbaumat
+abbaumaterial
+abbaumen
+abbaumenge
+abbaumoe
+abbaumoeglichkeit
+abbaumoeglichkeiten
+abbaus
+abbausit
+abbausituation
+abbausituationen
+abbausys
+abbausysteme
+abbaute
+abbauten
+abbauwer
+abbauwerkzeugs
+abbaye
+abbayes
+abbaz
+abbazia
+abbazie
+abbe
+abbe'
+abbe's
+abbed
+abbeden
+abbeder
+abbedi
+abbediet
+abbediss
+abbedisse
+abbeisse
+abbeissen
+abbeissende
+abbeissendem
+abbeissenden
+abbeissendes
+abbekomm
+abbekommen
+abbekommend
+abbekommendem
+abbekommenden
+abbekommender
+abbekommene
+abbekommenem
+abbekommenen
+abbekommenes
+abbellan
+abbellano
+abbellen
+abbellendo
+abbelli
+abbellia
+abbelliamo
+abbelliate
+abbellii
+abbellim
+abbellimmo
+abbellir
+abbellira
+abbellirai
+abbellire
+abbellirei
+abbelliro
+abbellis
+abbellisca
+abbellisce
+abbellisci
+abbellisco
+abbellisse
+abbellissi
+abbelliste
+abbellisti
+abbellit
+abbellita
+abbellite
+abbelliti
+abbellito
+abbelliv
+abbelliva
+abbellivi
+abbellivo
+abberdaa
+abberdaan
+abberufe
+abberufen
+abberufend
+abberufendem
+abberufenden
+abberufender
+abberufene
+abberufenem
+abberufenen
+abberufenes
+abberufu
+abberufungen
+abbes
+abbess
+abbesse
+abbesses
+abbestel
+abbestellen
+abbestellend
+abbestellendem
+abbestellenden
+abbestellender
+abbestellt
+abbestellte
+abbestelltem
+abbestellter
+abbestelltes
+abbestellung
+abbestellungen
+abbettel
+abbetteln
+abbettelnde
+abbettelndem
+abbettelnden
+abbettelndes
+abbettelt
+abbettelte
+abbevera
+abbeverai
+abbeverano
+abbeverare
+abbeverata
+abbeverate
+abbeverati
+abbeverato
+abbeverava
+abbeveravi
+abbeveravo
+abbevere
+abbeverera
+abbeverero
+abbeveri
+abbeverino
+abbevero
+abbevill
+abbeville
+abbey
+abbeys
+abbeyste
+abbeystede
+abbezahl
+abbezahlen
+abbezahlend
+abbezahlende
+abbezahlendes
+abbezahlt
+abbezahlte
+abbi
+abbia
+abbiamo
+abbiano
+abbiate
+abbie
+abbiegen
+abbiegend
+abbiegende
+abbiegenden
+abbiegender
+abbiegendes
+abbiente
+abbienti
+abbietta
+abbiette
+abbietti
+abbietto
+abbigli
+abbiglia
+abbigliai
+abbigliamo
+abbigliano
+abbigliare
+abbigliata
+abbigliate
+abbigliati
+abbigliato
+abbigliava
+abbigliavi
+abbigliavo
+abbiglie
+abbigliera
+abbigliero
+abbiglin
+abbiglino
+abbiglio
+abbild
+abbilden
+abbilder
+abbildern
+abbildes
+abbildun
+abbildung
+abbildungen
+abbina
+abbinai
+abbinamm
+abbinammo
+abbinand
+abbinando
+abbinano
+abbinare
+abbinaro
+abbinarono
+abbinass
+abbinasse
+abbinassi
+abbinast
+abbinaste
+abbinasti
+abbinata
+abbinate
+abbinati
+abbinato
+abbinava
+abbinavamo
+abbinavano
+abbinavate
+abbinavi
+abbinavo
+abbinden
+abbindend
+abbindendem
+abbindenden
+abbindender
+abbinera
+abbinerai
+abbinere
+abbinerei
+abbineremo
+abbinerete
+abbinero
+abbingto
+abbington
+abbini
+abbiniam
+abbiniamo
+abbiniat
+abbiniate
+abbinino
+abbino
+abbitte
+abbitten
+abbittens
+abblaett
+abblaettern
+abblaetternd
+abblaetterndem
+abblaetternden
+abblaetternder
+abblasen
+abblasend
+abblasende
+abblasenden
+abblasender
+abblasendes
+abblende
+abblendend
+abblendende
+abblendendem
+abblendender
+abblendendes
+abblendl
+abblendlichter
+abblendlichtern
+abblendlichtes
+abblends
+abblendschaltern
+abblendschalters
+abblitze
+abblitzen
+abblitzende
+abblitzendem
+abblitzenden
+abblitzendes
+abblitzt
+abblitzte
+abbo
+abbocca
+abboccai
+abboccam
+abboccammo
+abboccan
+abboccando
+abboccano
+abboccar
+abboccare
+abboccas
+abboccasse
+abboccassi
+abboccaste
+abboccasti
+abboccat
+abboccata
+abboccate
+abboccati
+abboccato
+abboccav
+abboccava
+abboccavi
+abboccavo
+abbocche
+abbocchera
+abbocchero
+abbocchi
+abbocchino
+abbocco
+abbona
+abbonai
+abbonamm
+abbonammo
+abbonand
+abbonando
+abbonano
+abbonare
+abbonaro
+abbonarono
+abbonass
+abbonasse
+abbonassi
+abbonast
+abbonaste
+abbonasti
+abbonata
+abbonate
+abbonati
+abbonato
+abbonava
+abbonavamo
+abbonavano
+abbonavate
+abbonavi
+abbonavo
+abbonda
+abbondai
+abbondam
+abbondammo
+abbondan
+abbondando
+abbondano
+abbondante
+abbondanti
+abbondar
+abbondare
+abbondas
+abbondasse
+abbondassi
+abbondaste
+abbondasti
+abbondat
+abbondata
+abbondate
+abbondati
+abbondato
+abbondav
+abbondava
+abbondavi
+abbondavo
+abbonder
+abbondera
+abbonderai
+abbonderei
+abbondero
+abbondi
+abbondia
+abbondiamo
+abbondiate
+abbondin
+abbondino
+abbondo
+abbonera
+abbonerai
+abbonere
+abbonerei
+abboneremo
+abbonerete
+abbonero
+abboni
+abboniam
+abboniamo
+abboniat
+abboniate
+abbonino
+abbono
+abbor
+abboren
+abbos
+abbot
+abbotcie
+abbotcies
+abbotcy
+abbotnul
+abbotnullius
+abbots
+abbotsfo
+abbotsford
+abbotshi
+abbotship
+abbotships
+abbott
+abbottst
+abbottstown
+abbotvil
+abbotvillage
+abbozza
+abbozzai
+abbozzam
+abbozzammo
+abbozzan
+abbozzando
+abbozzano
+abbozzar
+abbozzare
+abbozzas
+abbozzasse
+abbozzassi
+abbozzaste
+abbozzasti
+abbozzat
+abbozzata
+abbozzate
+abbozzati
+abbozzato
+abbozzav
+abbozzava
+abbozzavi
+abbozzavo
+abbozzer
+abbozzera
+abbozzerai
+abbozzerei
+abbozzero
+abbozzi
+abbozzia
+abbozziamo
+abbozziate
+abbozzin
+abbozzino
+abbozzo
+abbr
+abbracci
+abbraccia
+abbracciai
+abbraccino
+abbraccio
+abbrache
+abbrachen
+abbraend
+abbraende
+abbrause
+abbrausen
+abbrausend
+abbrausende
+abbrausenden
+abbrausender
+abbrausendes
+abbraust
+abbrauste
+abbrausten
+abbreche
+abbrechen
+abbrechende
+abbrechendem
+abbrechenden
+abbrechendes
+abbremse
+abbremsen
+abbremsend
+abbremsendem
+abbremsenden
+abbremsender
+abbremsg
+abbremsgeschwindigkeit
+abbremsv
+abbremsverhalten
+abbrenne
+abbrennen
+abbrennend
+abbrennende
+abbrennenden
+abbrennender
+abbrennendes
+abbrev
+abbrevi
+abbrevia
+abbreviai
+abbreviamo
+abbreviano
+abbreviare
+abbreviasjon
+abbreviata
+abbreviatable
+abbreviate
+abbreviated
+abbreviately
+abbreviates
+abbreviati
+abbreviatie
+abbreviaties
+abbreviating
+abbreviation
+abbreviations
+abbreviato
+abbreviator
+abbreviators
+abbreviatory
+abbreviature
+abbreviava
+abbreviavi
+abbreviavo
+abbrevie
+abbreviera
+abbreviero
+abbrevin
+abbrevino
+abbrevio
+abbrevs
+abbricht
+abbringe
+abbringend
+abbringende
+abbringendem
+abbringender
+abbringendes
+abbroeck
+abbroeckeln
+abbroeckelnd
+abbroeckelnde
+abbroeckelnden
+abbroeckelnder
+abbroeckelndes
+abbronza
+abbronzai
+abbronzano
+abbronzare
+abbronzata
+abbronzate
+abbronzati
+abbronzato
+abbronzava
+abbronzavi
+abbronzavo
+abbronze
+abbronzera
+abbronzero
+abbronzi
+abbronzino
+abbronzo
+abbruch
+abbrucha
+abbrucharbeit
+abbrucharbeiten
+abbruchb
+abbruchbedingung
+abbrucho
+abbruchobjekte
+abbruchobjektes
+abbruchr
+abbruchreif
+abbruchreifen
+abbruchreifer
+abbruchreifes
+abbruchs
+abbruchu
+abbruchunternehmens
+abbruchunternehmer
+abbruchunternehmers
+abbruna
+abbrunai
+abbrunam
+abbrunammo
+abbrunan
+abbrunando
+abbrunano
+abbrunar
+abbrunare
+abbrunas
+abbrunasse
+abbrunassi
+abbrunaste
+abbrunasti
+abbrunat
+abbrunata
+abbrunate
+abbrunati
+abbrunato
+abbrunav
+abbrunava
+abbrunavi
+abbrunavo
+abbruner
+abbrunera
+abbrunerai
+abbrunerei
+abbrunero
+abbruni
+abbrunia
+abbruniamo
+abbruniate
+abbrunin
+abbrunino
+abbruno
+abbrusto
+abbrustoli
+abbruzze
+abbruzzesi
+abbuchen
+abbuchend
+abbuchende
+abbuchendem
+abbuchender
+abbuchendes
+abbucht
+abbuchte
+abbuchten
+abbuchun
+abbuchungen
+abbuerst
+abbuerste
+abbuersten
+abbuerstende
+abbuerstendem
+abbuerstenden
+abbuerstendes
+abbuerstet
+abbuerstete
+abbuoni
+abbuono
+abby
+abbye
+abbyvill
+abbyville
+abc
+abc		
+abc's
+abc'tje
+abc'tjes
+abc-boek
+abc-boeken
+abc123
+abcd
+abcde
+abcdef
+abcdefab
+abcdefabcdef
+abcdefg
+abcdefgh
+abcdh
+abce'der
+abce`s
+abces
+abcessen
+abcfm
+abch
+abcissa
+abcoulom
+abcoulomb
+abd
+abda
+abdal
+abdala
+abdalimo
+abdalimov
+abdalla
+abdallah
+abdampfe
+abdampfen
+abdanken
+abdankend
+abdankendem
+abdankenden
+abdankender
+abdankte
+abdankten
+abdankun
+abdankung
+abdankungen
+abdat
+abdeckbl
+abdeckblech
+abdeckbleche
+abdecken
+abdeckende
+abdeckendem
+abdeckenden
+abdeckendes
+abdecker
+abdeckern
+abdeckers
+abdeckka
+abdeckkappe
+abdeckkappen
+abdeckkl
+abdeckklappe
+abdeckklappen
+abdeckma
+abdeckmaterial
+abdeckpl
+abdeckplane
+abdeckplatten
+abdeckra
+abdeckrahmen
+abdeckt
+abdeckte
+abdeckun
+abdeckung
+abdeckungen
+abdedal
+abdeel
+abdel
+abdel-az
+abdel-aziz
+abdel-ma
+abdel-madid
+abdel-ra
+abdel-rahim
+abdel-rahman
+abdel-rani
+abdel-sa
+abdel-salam
+abdel-sallam
+abdelazi
+abdelaziz
+abdelhak
+abdelhakim
+abdelham
+abdelhamid
+abdeljaw
+abdeljawad
+abdelkur
+abdelkuri
+abdellah
+abdellat
+abdellatif
+abdelmad
+abdelmadid
+abdelrah
+abdelrahim
+abdelrahman
+abdelran
+abdelrani
+abdelraz
+abdelrazek
+abdelsal
+abdelsalaam
+abdelsalam
+abdelsallam
+abdenace
+abdenage
+abdenour
+abderian
+abderitana
+abderitano
+abderite
+abderrah
+abderrahim
+abderrahmane
+abderrao
+abderraouf
+abderraz
+abderrazek
+abdeslam
+abdest
+abdi
+abdica
+abdicabl
+abdicable
+abdicacio`n
+abdicai
+abdicamm
+abdicammo
+abdicand
+abdicando
+abdicano
+abdicant
+abdicar
+abdicare
+abdicaro
+abdicarono
+abdicass
+abdicasse
+abdicassi
+abdicast
+abdicaste
+abdicasti
+abdicata
+abdicate
+abdicated
+abdicates
+abdicati
+abdicatie
+abdicaties
+abdicating
+abdication
+abdications
+abdicativa
+abdicativamente
+abdicative
+abdicativo
+abdicato
+abdicator
+abdicava
+abdicavamo
+abdicavano
+abdicavate
+abdicavi
+abdicavo
+abdiceer
+abdiceerde
+abdiceerden
+abdiceert
+abdicere
+abdiceren
+abdicering
+abdicher
+abdichera
+abdicherai
+abdicherei
+abdichero
+abdichi
+abdichia
+abdichiamo
+abdichiate
+abdichin
+abdichino
+abdichtb
+abdichtbar
+abdichte
+abdichten
+abdichtend
+abdichtende
+abdichtenden
+abdichtender
+abdichtendes
+abdichtete
+abdichteten
+abdichtf
+abdichtfugen
+abdichtu
+abdichtung
+abdico
+abdiel
+abdienen
+abdienende
+abdienenden
+abdienender
+abdient
+abdiente
+abdienten
+abdij
+abdijen
+abdijker
+abdijkerk
+abdijkerken
+abdikari
+abdikarim
+abdikasj
+abdikasjon
+abdikasjonen
+abdin
+abdiqua
+abdiquai
+abdiquaient
+abdiquais
+abdiquait
+abdiquan
+abdiquant
+abdique
+abdique'
+abdique'e
+abdique'es
+abdique's
+abdique`
+abdique`rent
+abdiquee
+abdiqueerde
+abdiqueerden
+abdiquen
+abdiquent
+abdiquer
+abdiquera
+abdiquerai
+abdiqueraient
+abdiquerais
+abdiquerait
+abdiqueras
+abdiqueren
+abdiquerez
+abdiqueriez
+abdiquerions
+abdiquerons
+abdiqueront
+abdiques
+abdiquez
+abdiquie
+abdiquiez
+abdiquio
+abdiquions
+abdiquon
+abdiquons
+abdis
+abdisere
+abdisert
+abdissen
+abditive
+abditory
+abdo
+abdol
+abdollah
+abdollahi
+abdolrah
+abdolrahim
+abdomen
+abdomens
+abdomina
+abdominal
+abdominale
+abdominales
+abdominalian
+abdominally
+abdominaux
+abdomino
+abdominoanterior
+abdominocardiac
+abdominocentesis
+abdominocystic
+abdominogenital
+abdominohysterectomy
+abdominohysterotomy
+abdominoposterior
+abdominoscope
+abdominoscopy
+abdominothoracic
+abdominous
+abdominovaginal
+abdominovesical
+abdon
+abdou
+abdoul
+abdoulay
+abdoulaye
+abdrani
+abdrehen
+abdrehend
+abdrehenden
+abdrehender
+abdrehendes
+abdrehte
+abdrehten
+abdrift
+abdrifte
+abdriften
+abdrifteten
+abdrosse
+abdrosseln
+abdrosselnd
+abdrosselnden
+abdrosselnder
+abdrosselndes
+abdrosselte
+abdrosselten
+abdruck
+abdrucke
+abdruckes
+abdrucks
+abdruckt
+abdruckte
+abdruckten
+abdrueck
+abdruecke
+abdrueckend
+abdrueckende
+abdrueckendem
+abdrueckender
+abdrueckendes
+abdrueckt
+abdrueckten
+abduccio`n
+abduce
+abducens
+abducent
+abduct
+abducted
+abductin
+abducting
+abductio
+abduction
+abductions
+abductiv
+abductive
+abductor
+abductors
+abducts
+abdul
+abdul-az
+abdul-aziz
+abdul-ma
+abdul-madid
+abdul-no
+abdul-nour
+abdul-ra
+abdul-rahim
+abdul-rahman
+abdul-rani
+abdul-sa
+abdul-salaam
+abdul-salam
+abdul-sallam
+abdulahi
+abdulazi
+abdulaziz
+abdulkaf
+abdulkal
+abdulkalek
+abdulkar
+abdulkarim
+abdulkha
+abdulkhalek
+abdulla
+abdullah
+abdulmad
+abdulmadid
+abdulov
+abdulrah
+abdulrahim
+abdulrahman
+abdulran
+abdulrani
+abdulsal
+abdulsalaam
+abdulsalam
+abdulsallam
+abdur
+abdushil
+abdushilov
+abe
+abe\ola
+abe^tir
+abe^tiss
+abe^tissement
+abe`\ula
+abe`s
+abe`stola
+abeam
+abear
+abearanc
+abearance
+abeayumi
+abebbend
+abebbende
+abebbender
+abebbendes
+abebe
+abebrar
+abec
+abece`
+abecedar
+abecedarian
+abecedarians
+abecedario
+abecedarium
+abecedary
+abeche
+abechiyo
+abed
+abedi
+abednego
+abedul
+abeel
+abeelbom
+abeelbomen
+abeelboo
+abeelboom
+abeeltje
+abeeltjes
+abefang
+abegakui
+abehitom
+abeigh
+abeille
+abeilles
+abeja
+abejar
+abejarro`n
+abejaruco
+abejera
+abejero
+abejinic
+abejinit
+abejo`n
+abejorreo
+abejorro
+abejuela
+abejuna
+abejuno
+abekawa
+abekensh
+abekku
+abekobe
+abel
+abelam
+abelard
+abelbeth
+abelbethmaachah
+abeldini
+abele
+abelen
+abelenla
+abelenlaan
+abelenlanen
+abelia
+abelian
+abelicea
+abelite
+abell
+abella
+abellacada
+abellacado
+abellacar
+abellar
+abellera
+abellero
+abello
+abellota
+abellotada
+abellotado
+abelmaim
+abelmeho
+abelmeholah
+abelmizr
+abelmizraim
+abelmosc
+abelmoschus
+abelmosco
+abelmosk
+abelonia
+abelonian
+abelow
+abelshit
+abelshittim
+abelson
+abeltree
+abemama
+abemaria
+abemichi
+abemitir
+abemoladamente
+abemolar
+aben
+abenago
+abenaki
+abenaqui
+abencerr
+abencerrages
+abencerraje
+abend
+abendand
+abendandachten
+abendanz
+abendanzuege
+abendanzug
+abendbla
+abendblatt
+abendblattes
+abendbro
+abendbrot
+abenddae
+abenddaemmerungen
+abende
+abenden
+abendess
+abendessens
+abendfue
+abendfuellende
+abendfuellenden
+abendfuellender
+abendgal
+abendgala
+abendgar
+abendgarderobe
+abendgeb
+abendgebete
+abendgebetes
+abendges
+abendgesellschaften
+abendgym
+abendgymnasien
+abendhim
+abendhimmel
+abendhimmels
+abendkle
+abendkleid
+abendkleidern
+abendkleides
+abendkur
+abendkurs
+abendkurses
+abendlae
+abendlaendisch
+abendlaendische
+abendlaendischem
+abendlaendischer
+abendlaendisches
+abendlan
+abendland
+abendlandes
+abendlic
+abendlich
+abendlichem
+abendlichen
+abendlicher
+abendluf
+abendluft
+abendmah
+abendmahls
+abendnac
+abendnachrichten
+abendpro
+abendprogramm
+abendprogrammes
+abendroe
+abendroete
+abendroetem
+abendrot
+abendrotes
+abends
+abendsch
+abendschau
+abendschuhe
+abendschulen
+abendson
+abendsonne
+abendsonnen
+abendspa
+abendspaziergang
+abendspazierganges
+abendste
+abendstern
+abendsternen
+abendsternes
+abendstu
+abendstudio
+abendunt
+abendunterhaltung
+abendunterricht
+abendvor
+abendvorstellung
+abendwin
+abendwind
+abendwinde
+abendzei
+abendzeitung
+abeng
+abengour
+abengourou
+abengya
+abenlen
+abeno
+abenoku
+abenomot
+abenosuz
+abenspaz
+abenspaziergaenge
+abental
+abenteri
+abenteric
+abenteue
+abenteuer
+abenteuerfilm
+abenteuerlich
+abenteuerliche
+abenteuerlichen
+abenteuerlicher
+abenteuerliches
+abenteuerlichsten
+abenteuerlichster
+abenteuerlust
+abenteuern
+abenteuernatur
+abenteuerreiche
+abenteuerreiches
+abenteuerreise
+abenteuerreisen
+abenteuerroman
+abenteuers
+abenteur
+abenteurer
+abenteurern
+abenteurernaturen
+abenteurers
+abenteurertyp
+abenunte
+abenunterhaltungen
+abenuz
+abenyu
+abepithy
+abepithymia
+aber
+aberaud
+abercomb
+abercombie
+abercrom
+abercrombie
+aberdeen
+aberdeen-ato
+aberdeen-meprs
+aberdeen2
+aberdeen2-mil-tac
+aberdeenprovingground
+aberdein
+aberdevi
+aberdevine
+aberdoni
+aberdonian
+abere-ji
+abereji
+aberenjenada
+aberenjenado
+aberet
+aberezi
+aberg
+abergave
+abergavenny
+abergla"
+abergla"ubischen
+aberglae
+aberglaeubisch
+aberglaeubischem
+aberglaeubischen
+aberglaeubischer
+aberglau
+aberglaube
+aberglauben
+aberia
+aberkann
+aberkannt
+aberkannte
+aberkanntem
+aberkannter
+aberkanntes
+aberkenn
+aberkennen
+aberkennung
+aberkennungen
+abermali
+abermalig
+abermalige
+abermaligem
+abermaliger
+abermaliges
+abermals
+abermud
+abernant
+abernath
+abernathy
+aberneth
+abernethy
+abernten
+aberntend
+aberntende
+aberntendem
+aberntender
+aberntendes
+aberopa
+aberracio`n
+aberranc
+aberrance
+aberrancies
+aberrancy
+aberrant
+aberrante
+aberrantes
+aberrantly
+aberrants
+aberrar
+aberrate
+aberrati
+aberratie
+aberraties
+aberration
+aberrational
+aberrations
+aberrato
+aberrator
+aberrome
+aberrometer
+aberrosc
+aberroscope
+aberson
+abertal
+abertaus
+abertausende
+aberto
+abertura
+aberu
+aberunca
+aberuncator
+aberwitz
+abesana
+abeshizu
+abesizue
+abeso`n
+abessen
+abessini
+abessinien
+abessinienkrieg
+abessinischen
+abestiada
+abestiado
+abestializada
+abestializado
+abestionar
+abet
+abetal
+abetar
+abete
+abeter
+abeti
+abetinote
+abetiyo
+abetment
+abeto
+abets
+abettal
+abettals
+abetted
+abetter
+abetters
+abetti
+abetting
+abettor
+abettors
+abetuna
+abetunada
+abetunado
+abetunar
+abeu
+abeurrea
+abeus
+abevacua
+abevacuation
+abewa
+abey
+abeyamak
+abeyance
+abeyances
+abeyanci
+abeyancies
+abeyancy
+abeyant
+abeyumik
+abez
+abf
+abfa"lle
+abfa"llen
+abfa"llt
+abfaelle
+abfaellen
+abfaelli
+abfaellig
+abfaelligem
+abfaelligen
+abfaelliger
+abfaelligerem
+abfaelligeren
+abfaelligerer
+abfaelliges
+abfaelligste
+abfaelligstem
+abfaelligster
+abfaelligstes
+abfaellt
+abfaerbe
+abfaerben
+abfaerbend
+abfaerbende
+abfaerbenden
+abfaerbender
+abfaerbendes
+abfahren
+abfahrend
+abfahrendem
+abfahrenden
+abfahrender
+abfahrt
+abfahrte
+abfahrten
+abfahrts
+abfahrtshang
+abfahrtslaeufer
+abfahrtslaeuferinnen
+abfahrtsrennen
+abfahrtsstelle
+abfahrtsstrecke
+abfall
+abfallau
+abfallaufbereitung
+abfallei
+abfalleimer
+abfalleimern
+abfallen
+abfallend
+abfallende
+abfallenden
+abfallender
+abfallendes
+abfallgr
+abfallgraben
+abfallku
+abfallkurve
+abfallpa
+abfallpapier
+abfallpr
+abfallprodukt
+abfallprodukten
+abfallproduktes
+abfalls
+abfallst
+abfallstoffe
+abfangen
+abfangend
+abfangende
+abfangendem
+abfangender
+abfangendes
+abfangja
+abfangjaeger
+abfangra
+abfangrakete
+abfarad
+abfassen
+abfassende
+abfassendem
+abfassenden
+abfassendes
+abfassun
+abfassung
+abfassungen
+abfaulen
+abfaulend
+abfaulendem
+abfaulenden
+abfaulender
+abfeilen
+abfeilend
+abfeilende
+abfeilenden
+abfeilender
+abfeilendes
+abfertig
+abfertigend
+abfertigende
+abfertigendem
+abfertigender
+abfertigendes
+abfertigung
+abfertigungen
+abfertigungsschalter
+abfertigungsstelle
+abfertigungsstellen
+abfeuern
+abfeuernde
+abfeuerndem
+abfeuernden
+abfeuerndes
+abfeuert
+abfff
+abfinden
+abfindun
+abfindungen
+abfing
+abflache
+abflachen
+abflachend
+abflachendem
+abflachenden
+abflachender
+abflacht
+abflachte
+abflachu
+abflachung
+abflachungen
+abflauen
+abflauend
+abflauendem
+abflauenden
+abflauender
+abfliege
+abfliegend
+abfliegende
+abfliegendem
+abfliegender
+abfliegendes
+abfliegt
+abfliess
+abfliessen
+abfliessend
+abfliessende
+abfliessenden
+abfliessender
+abfliessendes
+abfluege
+abfluegen
+abfluess
+abfluessen
+abflug
+abflugfl
+abflugflughafen
+abflugla
+abflugland
+abflugs
+abflusse
+abflusses
+abfm
+abfms
+abfo"rde
+abfo"rdermenge
+abfolge
+abforder
+abfordern
+abfordernde
+abforderndem
+abfordernden
+abforderndes
+abfotogr
+abfotografieren
+abfra"se
+abfra"sen
+abfragba
+abfragbar
+abfrage
+abfragen
+abfrages
+abfragesprache
+abfu"hre
+abfu"hren
+abfuehre
+abfuehrend
+abfuehrende
+abfuehrendem
+abfuehrender
+abfuehrendes
+abfuehrm
+abfuehrmittel
+abfuehrmitteln
+abfuehrt
+abfuehrten
+abfuehru
+abfuehrung
+abfuella
+abfuellanlage
+abfuellanlagen
+abfuelle
+abfuellend
+abfuellende
+abfuellendem
+abfuellender
+abfuellendes
+abfuellf
+abfuellfilialen
+abfuells
+abfuellstation
+abfuette
+abfuettern
+abfuetternde
+abfuetterndem
+abfuetternden
+abfuetterndes
+abfuhr
+abfuhren
+abg
+abgab
+abgabe
+abgabebe
+abgabebereitschaft
+abgabedr
+abgabedruck
+abgaben
+abgabeng
+abgabengesetze
+abgabenn
+abgabenneigung
+abgabepr
+abgabepreise
+abgabera
+abgaberaten
+abgabesa
+abgabesachen
+abgaenge
+abgang
+abgangs
+abgangsz
+abgangszeugnis
+abgangszeugnissen
+abgangszeugnisses
+abgas
+abgasen
+abgasent
+abgasentgiftung
+abgases
+abgata
+abgea"nd
+abgea"ndert
+abgea"nderte
+abgea"nderten
+abgeaend
+abgeaenderte
+abgeaendertem
+abgeaenderten
+abgeaendertes
+abgearbe
+abgearbeitet
+abgearbeitete
+abgearbeiteten
+abgearbeiteter
+abgearbeitetes
+abgebaut
+abgebaute
+abgebauten
+abgebauter
+abgebautes
+abgebbar
+abgebbaren
+abgeben
+abgebend
+abgebende
+abgebenden
+abgebender
+abgebendes
+abgebett
+abgebettelte
+abgebetteltem
+abgebettelten
+abgebetteltes
+abgebild
+abgebildet
+abgebildete
+abgebiss
+abgebissen
+abgebissene
+abgebissenem
+abgebissener
+abgebissenes
+abgeblae
+abgeblaettert
+abgeblaettertem
+abgeblaetterten
+abgeblaetterter
+abgeblas
+abgeblasen
+abgeblasene
+abgeblasenem
+abgeblasener
+abgeblasenes
+abgeblen
+abgeblendet
+abgeblendetem
+abgeblendeten
+abgeblendeter
+abgeblit
+abgeblitzt
+abgeblitzte
+abgeblitztem
+abgeblitzter
+abgeblitztes
+abgeboge
+abgebogen
+abgebogenem
+abgebogenen
+abgebogener
+abgebrac
+abgebracht
+abgebrachte
+abgebrachtem
+abgebrachter
+abgebrachtes
+abgebran
+abgebrannt
+abgebranntem
+abgebrannten
+abgebrannter
+abgebrau
+abgebraust
+abgebrauste
+abgebraustem
+abgebrauster
+abgebraustes
+abgebrem
+abgebremst
+abgebremstem
+abgebremsten
+abgebremster
+abgebroc
+abgebrochen
+abgebrochene
+abgebrochenem
+abgebrochener
+abgebrochenes
+abgebroe
+abgebroeckelt
+abgebroeckelte
+abgebroeckeltem
+abgebroeckelter
+abgebroeckeltes
+abgebrue
+abgebrueht
+abgebruehtem
+abgebruehten
+abgebruehter
+abgebuch
+abgebucht
+abgebuchtem
+abgebuchten
+abgebuchter
+abgebuer
+abgebuerstete
+abgebuerstetem
+abgebuersteten
+abgebuerstetes
+abgebund
+abgebunden
+abgebundene
+abgebundenem
+abgebundener
+abgebundenes
+abgedank
+abgedankt
+abgedanktem
+abgedankten
+abgedankter
+abgedeck
+abgedeckt
+abgedeckte
+abgedecktem
+abgedeckter
+abgedecktes
+abgedich
+abgedichtet
+abgedichtetem
+abgedichteten
+abgedichteter
+abgedien
+abgedient
+abgediente
+abgedientem
+abgedienter
+abgedientes
+abgedrae
+abgedraengt
+abgedreh
+abgedreht
+abgedrehte
+abgedrehten
+abgedrehter
+abgedrehtes
+abgedros
+abgedrosselt
+abgedrosselte
+abgedrosseltem
+abgedrosselter
+abgedrosseltes
+abgedruc
+abgedruckt
+abgedrucktem
+abgedruckten
+abgedruckter
+abgedrue
+abgedrueckte
+abgedruecktem
+abgedrueckten
+abgedruecktes
+abgeernt
+abgeerntet
+abgeerntete
+abgeerntetem
+abgeernteter
+abgeerntetes
+abgefaer
+abgefaerbt
+abgefaerbtem
+abgefaerbten
+abgefaerbter
+abgefahr
+abgefahrene
+abgefahrenem
+abgefahrenen
+abgefahrenes
+abgefall
+abgefallen
+abgefallene
+abgefallenen
+abgefallener
+abgefallenes
+abgefang
+abgefangen
+abgefangene
+abgefangenem
+abgefangenen
+abgefangenes
+abgefass
+abgefasst
+abgefasste
+abgefassten
+abgefasster
+abgefasstes
+abgefaul
+abgefault
+abgefaulte
+abgefaulten
+abgefaulter
+abgefaultes
+abgefeil
+abgefeilte
+abgefeiltem
+abgefeilten
+abgefeiltes
+abgefeim
+abgefeimt
+abgefeimten
+abgefert
+abgefertigte
+abgefertigtem
+abgefertigten
+abgefertigtes
+abgefeue
+abgefeuert
+abgefeuerte
+abgefeuerten
+abgefeuerter
+abgefeuertes
+abgeflac
+abgeflachtem
+abgeflachten
+abgeflachter
+abgeflau
+abgeflaut
+abgeflaute
+abgeflautem
+abgeflauter
+abgeflautes
+abgeflog
+abgeflogen
+abgeflogenem
+abgeflogenen
+abgeflogener
+abgeflos
+abgeflossen
+abgeflossene
+abgeflossenem
+abgeflossener
+abgeflossenes
+abgeford
+abgefordert
+abgefordertem
+abgeforderten
+abgeforderter
+abgefrag
+abgefragt
+abgefragten
+abgefueh
+abgefuehrt
+abgefuehrte
+abgefuehrtem
+abgefuehrter
+abgefuehrtes
+abgefuel
+abgefuellt
+abgefuelltem
+abgefuellten
+abgefuellter
+abgefuet
+abgefuetterte
+abgefuettertem
+abgefuetterten
+abgefuettertes
+abgefund
+abgefunden
+abgefundene
+abgefundenen
+abgefundener
+abgefundenes
+abgegang
+abgegangene
+abgegangenem
+abgegangenen
+abgegebe
+abgegeben
+abgegebene
+abgegebenem
+abgegebener
+abgegebenes
+abgeglit
+abgeglitten
+abgeglittenem
+abgeglittenen
+abgeglittener
+abgegolt
+abgegolten
+abgegoss
+abgegossen
+abgegossene
+abgegossenen
+abgegossener
+abgegossenes
+abgegrab
+abgegrabene
+abgegrabenem
+abgegrabenen
+abgegrabenes
+abgegras
+abgegrast
+abgegren
+abgegrenzt
+abgegrenztem
+abgegrenzten
+abgegrenzter
+abgegrif
+abgegriffen
+abgegriffene
+abgegriffenem
+abgegriffenen
+abgegriffener
+abgegriffenes
+abgeha"n
+abgeha"ngten
+abgehack
+abgehackt
+abgehackte
+abgehackten
+abgehackter
+abgehacktes
+abgehaen
+abgehaengt
+abgehaer
+abgehaermt
+abgehaertet
+abgehaertete
+abgehaerteten
+abgehaerteter
+abgehaertetes
+abgehalt
+abgehalten
+abgehaltene
+abgehaltenem
+abgehaltener
+abgehaltenes
+abgehand
+abgehandelt
+abgehaue
+abgehauene
+abgehauenem
+abgehauenen
+abgehauenes
+abgehe
+abgehebe
+abgehebelt
+abgeheil
+abgeheilt
+abgeheiltem
+abgeheilten
+abgeheilter
+abgehen
+abgehend
+abgehende
+abgehenden
+abgehender
+abgehendes
+abgehetz
+abgehetzte
+abgehetztem
+abgehetzten
+abgehetztes
+abgehobe
+abgehoben
+abgehobene
+abgehobenen
+abgehobener
+abgehobenes
+abgehoer
+abgehoerte
+abgehoertem
+abgehoerten
+abgehoertes
+abgeholt
+abgeholte
+abgeholtem
+abgeholter
+abgeholtes
+abgeholz
+abgeholzt
+abgehorc
+abgehorchte
+abgehorchtem
+abgehorchten
+abgehorchtes
+abgeht
+abgejagt
+abgejagtem
+abgejagten
+abgejagter
+abgekaem
+abgekaempft
+abgekaempfte
+abgekaempftem
+abgekaempfter
+abgekaempftes
+abgekart
+abgekartet
+abgekartetes
+abgekauf
+abgekauft
+abgekauftem
+abgekauften
+abgekaufter
+abgekehr
+abgekehrt
+abgekehrte
+abgekehrtem
+abgekehrter
+abgekehrtes
+abgekla"
+abgekla"rt
+abgeklae
+abgeklaert
+abgeklaertem
+abgeklaerten
+abgeklaerter
+abgeklap
+abgeklappert
+abgeklapperte
+abgeklappertem
+abgeklapperter
+abgeklappertes
+abgeklem
+abgeklemmt
+abgeklemmtem
+abgeklemmten
+abgeklemmter
+abgeklop
+abgeklopft
+abgeklopfte
+abgeklopftem
+abgeklopfter
+abgeklopftes
+abgeklun
+abgeklungen
+abgeklungenem
+abgeklungenen
+abgeklungener
+abgeknab
+abgeknabbert
+abgeknabberte
+abgeknabbertem
+abgeknabberter
+abgeknabbertes
+abgeknal
+abgeknallt
+abgeknalltem
+abgeknallten
+abgeknallter
+abgeknic
+abgeknickt
+abgeknickte
+abgeknicktem
+abgeknickter
+abgeknicktes
+abgekoch
+abgekocht
+abgekochtem
+abgekochten
+abgekochter
+abgekomm
+abgekommen
+abgekopp
+abgekoppelt
+abgekoppelte
+abgekoppelten
+abgekoppelter
+abgekoppeltes
+abgekrat
+abgekratzte
+abgekratztem
+abgekratzten
+abgekratztes
+abgekrie
+abgekriegt
+abgekriegte
+abgekriegten
+abgekriegter
+abgekriegtes
+abgeku"r
+abgeku"rzt
+abgekueh
+abgekuehlt
+abgekuehlte
+abgekuehltem
+abgekuehlter
+abgekuehltes
+abgekuer
+abgekuerzt
+abgekuerztem
+abgekuerzten
+abgekuerzter
+abgekues
+abgekuesst
+abgekuesstem
+abgekuessten
+abgekuesster
+abgelade
+abgeladene
+abgeladenem
+abgeladenen
+abgeladenes
+abgelage
+abgelagert
+abgelagerte
+abgelagerten
+abgelagerter
+abgelagertes
+abgelass
+abgelassene
+abgelassenem
+abgelassenen
+abgelassenes
+abgelauf
+abgelaufen
+abgelaufene
+abgelaufenen
+abgelaufener
+abgelaufenes
+abgeleck
+abgeleckt
+abgeleckte
+abgelecktem
+abgeleckter
+abgelecktes
+abgelege
+abgelegen
+abgelegenem
+abgelegenen
+abgelegener
+abgelegt
+abgelegte
+abgelegtem
+abgelegter
+abgelegtes
+abgelehn
+abgelehnt
+abgelehntem
+abgelehnten
+abgelehnter
+abgeleis
+abgeleistet
+abgeleistete
+abgeleistetem
+abgeleisteter
+abgeleistetes
+abgeleit
+abgeleitet
+abgeleitete
+abgeleitetem
+abgeleiteten
+abgeleiteter
+abgelenk
+abgelenkt
+abgelenkte
+abgelenktem
+abgelenkter
+abgelenktes
+abgelese
+abgelesen
+abgelesenem
+abgelesenen
+abgelesener
+abgeleug
+abgeleugnet
+abgeleugnete
+abgeleugnetem
+abgeleugneter
+abgeleugnetes
+abgelief
+abgeliefert
+abgeliefertem
+abgelieferten
+abgelieferter
+abgelo"s
+abgelo"scht
+abgelo"st
+abgeloes
+abgeloeschte
+abgeloeschtem
+abgeloeschten
+abgeloeschtes
+abgeloest
+abgeloeste
+abgeloesten
+abgeloester
+abgeloestes
+abgeltun
+abgeltung
+abgemach
+abgemacht
+abgemachtem
+abgemachten
+abgemachter
+abgemage
+abgemagert
+abgemagerte
+abgemagertem
+abgemagerter
+abgemagertes
+abgemeld
+abgemeldet
+abgemeldetem
+abgemeldeten
+abgemeldeter
+abgemess
+abgemessen
+abgemessene
+abgemessenem
+abgemessener
+abgemessenes
+abgemild
+abgemildert
+abgemildertem
+abgemilderten
+abgemilderter
+abgemueh
+abgemueht
+abgemuehte
+abgemuehtem
+abgemuehter
+abgemuehtes
+abgemust
+abgemustert
+abgemusterte
+abgemustertem
+abgemusterter
+abgemustertes
+abgenabe
+abgenabelt
+abgenagt
+abgenagte
+abgenagtem
+abgenagten
+abgenagtes
+abgeneig
+abgeneigt
+abgeneigtem
+abgeneigter
+abgeneigtes
+abgenoet
+abgenoetigt
+abgenoetigtem
+abgenoetigten
+abgenoetigter
+abgenomm
+abgenommen
+abgenommenem
+abgenommenen
+abgenommener
+abgenuet
+abgenuetzt
+abgenuetzte
+abgenuetztem
+abgenuetzter
+abgenuetztes
+abgenutz
+abgenutzt
+abgenutzten
+abgenutzter
+abgeordn
+abgeordnete
+abgeordnetem
+abgeordneten
+abgeordnetenausweis
+abgeordnetenbaenken
+abgeordnetengruppe
+abgeordnetenhaus
+abgeordnetenimmunitaet
+abgeordnetenmandat
+abgeordnetes
+abgepalg
+abgepalgt
+abgepass
+abgepasst
+abgepasste
+abgepassten
+abgepasster
+abgepasstes
+abgepfif
+abgepfiffen
+abgepfiffene
+abgepfiffenen
+abgepfiffener
+abgepfiffenes
+abgepflu
+abgepflueckte
+abgepfluecktem
+abgepflueckten
+abgepfluecktes
+abgeplag
+abgeplagte
+abgeplagtem
+abgeplagter
+abgeplagtes
+abgepral
+abgeprallt
+abgepralltem
+abgeprallten
+abgeprallter
+abgeprat
+abgepratzt
+abgeputz
+abgeputzt
+abgeputzte
+abgeputztem
+abgeputzter
+abgeputztes
+abgequae
+abgequaelt
+abgequaeltem
+abgequaelten
+abgequaelter
+abgequet
+abgequetscht
+abgequetschte
+abgequetschtem
+abgequetschter
+abgequetschtes
+abgerack
+abgerackert
+abgerackerte
+abgerackertem
+abgerackerter
+abgerackertes
+abgeraeu
+abgeraeumt
+abgeraeumtem
+abgeraeumten
+abgeraeumter
+abgerate
+abgeraten
+abgeratenem
+abgeratenen
+abgeratener
+abgerech
+abgerechnet
+abgerechnete
+abgerechnetem
+abgerechneter
+abgerechnetes
+abgereis
+abgereist
+abgereistem
+abgereisten
+abgereister
+abgerich
+abgerichtet
+abgerichtete
+abgerichtetem
+abgerichteter
+abgerichtetes
+abgerieb
+abgerieben
+abgeriebenem
+abgeriebenen
+abgeriebener
+abgerieg
+abgeriegelt
+abgeriegelte
+abgeriegeltem
+abgeriegelter
+abgeriegeltes
+abgeriss
+abgerissen
+abgerissenem
+abgerissenen
+abgerissener
+abgeroll
+abgerollt
+abgerollte
+abgerolltem
+abgerollter
+abgerolltes
+abgeruec
+abgerueckt
+abgerueckte
+abgeruecktem
+abgerueckter
+abgeruecktes
+abgerues
+abgeruestet
+abgeruestetem
+abgeruesteten
+abgeruesteter
+abgerufe
+abgerufen
+abgerund
+abgerundet
+abgerundete
+abgerundetem
+abgerundeten
+abgerundetere
+abgerundetes
+abgerung
+abgerungen
+abgeruts
+abgerutscht
+abgerutschte
+abgerutschtem
+abgerutschten
+abgerutschtes
+abgesack
+abgesackte
+abgesacktem
+abgesackten
+abgesacktes
+abgesaeg
+abgesaegt
+abgesaegte
+abgesaegten
+abgesaegter
+abgesaegtes
+abgesagt
+abgesagte
+abgesagten
+abgesagter
+abgesagtes
+abgesand
+abgesandte
+abgesandtem
+abgesandten
+abgesandtes
+abgesaug
+abgesaugt
+abgesaugte
+abgesaugten
+abgesaugter
+abgesaugtes
+abgescha
+abgescha"tzt
+abgeschabte
+abgeschabtem
+abgeschabten
+abgeschabtes
+abgeschaetzte
+abgeschaetztem
+abgeschaetzten
+abgeschaetztes
+abgeschafft
+abgeschaffte
+abgeschafften
+abgeschaffter
+abgeschafftes
+abgeschaltet
+abgeschaltete
+abgeschaltetem
+abgeschalteten
+abgeschalteter
+abgeschaltetes
+abgeschi
+abgeschickt
+abgeschickte
+abgeschickten
+abgeschickter
+abgeschicktes
+abgeschiedene
+abgeschiedenem
+abgeschiedenen
+abgeschiedenes
+abgeschiedenheit
+abgeschirmt
+abgeschirmte
+abgeschirmten
+abgeschirmter
+abgeschirmtes
+abgeschl
+abgeschlachtete
+abgeschlachtetem
+abgeschlachteten
+abgeschlachtetes
+abgeschlaffte
+abgeschlagen
+abgeschlagenem
+abgeschlagenen
+abgeschlagener
+abgeschleckt
+abgeschleppt
+abgeschleppte
+abgeschleppten
+abgeschleppter
+abgeschlepptes
+abgeschliffen
+abgeschliffene
+abgeschliffenem
+abgeschliffenen
+abgeschliffenes
+abgeschlossen
+abgeschlossene
+abgeschlossenem
+abgeschlossenen
+abgeschlossener
+abgeschlossenes
+abgeschlossenheit
+abgeschm
+abgeschmackt
+abgeschmacktem
+abgeschmackten
+abgeschmackter
+abgeschmettert
+abgeschmiert
+abgeschmierte
+abgeschmierten
+abgeschmierter
+abgeschmiertes
+abgeschminkte
+abgeschminkten
+abgeschminkter
+abgeschmolzen
+abgeschmolzene
+abgeschmolzenem
+abgeschmolzener
+abgeschmolzenes
+abgeschn
+abgeschnitten
+abgeschnittene
+abgeschnittenem
+abgeschnittener
+abgeschnittenes
+abgeschnuert
+abgeschnuertem
+abgeschnuerten
+abgeschnuerter
+abgescho
+abgeschoben
+abgeschobenem
+abgeschobenen
+abgeschobener
+abgeschoepft
+abgeschoepfte
+abgeschoepften
+abgeschoepfter
+abgeschoepftes
+abgeschossen
+abgeschossene
+abgeschossenem
+abgeschossener
+abgeschossenes
+abgeschr
+abgeschraegt
+abgeschraegtem
+abgeschraegten
+abgeschraegter
+abgeschraubt
+abgeschraubte
+abgeschraubtem
+abgeschraubter
+abgeschraubtes
+abgeschreckt
+abgeschrecktem
+abgeschreckten
+abgeschreckter
+abgeschreckteste
+abgeschrecktestem
+abgeschrecktesten
+abgeschrecktestes
+abgeschrieben
+abgeschriebenem
+abgeschriebener
+abgeschriebenes
+abgeschritten
+abgeschrittenem
+abgeschrittenen
+abgeschrittener
+abgeschu
+abgeschuerfte
+abgeschuerftem
+abgeschuerften
+abgeschuerftes
+abgeschuettelt
+abgeschuettelte
+abgeschuettelten
+abgeschuettelter
+abgeschuetteltes
+abgeschuftet
+abgeschuftete
+abgeschuftetem
+abgeschufteter
+abgeschuftetes
+abgeschw
+abgeschwa"cht
+abgeschwaecht
+abgeschwaechtem
+abgeschwaechten
+abgeschwaechter
+abgeschwaechtes
+abgeschweift
+abgeschweifte
+abgeschweiften
+abgeschweifter
+abgeschweiftes
+abgeschwenkte
+abgeschwenktem
+abgeschwenkten
+abgeschwenktes
+abgeschworen
+abgeschworene
+abgeschworenen
+abgeschworener
+abgeschworenes
+abgesege
+abgesegelte
+abgesegeltem
+abgesegelten
+abgesegn
+abgesegnet
+abgesehe
+abgesehen
+abgeseif
+abgeseift
+abgeseiftem
+abgeseiften
+abgeseifter
+abgeseil
+abgeseilt
+abgeseilte
+abgeseiltem
+abgeseilter
+abgeseiltes
+abgesend
+abgesendet
+abgesenk
+abgesenkt
+abgesenktem
+abgesess
+abgesessene
+abgesessenem
+abgesessenen
+abgesessenes
+abgesetz
+abgesetzt
+abgesetzte
+abgesetzten
+abgesetzter
+abgesetztes
+abgesich
+abgesichert
+abgesicherte
+abgesichertem
+abgesicherten
+abgesicherter
+abgesichertes
+abgesond
+abgesondert
+abgesonderte
+abgesonderten
+abgesonderter
+abgesondertere
+abgesonderteren
+abgesonderterer
+abgesonderteres
+abgesondertste
+abgesondertstem
+abgesondertsten
+abgesondertstes
+abgespal
+abgespaltene
+abgespaltenem
+abgespaltenen
+abgespaltenes
+abgespan
+abgespannt
+abgespannte
+abgespannten
+abgespannter
+abgespanntere
+abgespannteren
+abgespannterer
+abgespannteres
+abgespannteste
+abgespanntestem
+abgespanntesten
+abgespanntestes
+abgespanntheit
+abgespar
+abgespart
+abgesparte
+abgesparten
+abgesparter
+abgespartes
+abgespec
+abgespeckt
+abgespei
+abgespeichert
+abgespeicherten
+abgespeist
+abgesper
+abgesperrt
+abgesperrtem
+abgesperrten
+abgesperrter
+abgespie
+abgespiegelt
+abgespiegelte
+abgespiegeltem
+abgespiegelter
+abgespiegeltes
+abgespielt
+abgespieltem
+abgespielten
+abgespielter
+abgespiesen
+abgespiesene
+abgespiesenem
+abgespiesener
+abgespiesenes
+abgespli
+abgesplittert
+abgesplittertem
+abgesplitterten
+abgesplitterter
+abgespri
+abgespritzt
+abgespro
+abgesprochen
+abgesprochene
+abgesprochenen
+abgesprochener
+abgesprochenes
+abgespru
+abgesprungene
+abgespue
+abgespuelt
+abgespuelte
+abgespuelten
+abgespuelter
+abgespueltes
+abgestam
+abgestammt
+abgestammte
+abgestammten
+abgestammter
+abgestammtes
+abgestan
+abgestanden
+abgestandene
+abgestandenem
+abgestandenen
+abgestandenes
+abgestat
+abgestattet
+abgestattete
+abgestatteten
+abgestatteter
+abgestattetes
+abgestau
+abgestaubte
+abgestaubtem
+abgestaubten
+abgestaubtes
+abgestec
+abgesteckt
+abgesteckte
+abgesteckten
+abgesteckter
+abgestecktes
+abgestel
+abgestellt
+abgestellte
+abgestelltem
+abgestellten
+abgestelltes
+abgestem
+abgestempelt
+abgestempelte
+abgestempelten
+abgestempelter
+abgestempeltes
+abgestep
+abgesteppte
+abgestepptem
+abgesteppten
+abgestepptes
+abgestie
+abgestiegen
+abgestiegene
+abgestiegenen
+abgestiegener
+abgestiegenes
+abgestim
+abgestimmt
+abgestimmte
+abgestimmtem
+abgestimmten
+abgestimmtes
+abgestoc
+abgestochene
+abgestochenem
+abgestochenen
+abgestochenes
+abgestop
+abgestoppt
+abgestoppte
+abgestoppten
+abgestoppter
+abgestopptes
+abgestor
+abgestorbene
+abgestorbenem
+abgestorbenen
+abgestorbenes
+abgestos
+abgestossen
+abgestossene
+abgestossenen
+abgestossener
+abgestossenes
+abgestot
+abgestottert
+abgestra
+abgestrahlte
+abgestre
+abgestreifte
+abgestreiftem
+abgestreiften
+abgestreiftes
+abgestri
+abgestrichen
+abgestrichene
+abgestrichenen
+abgestrichener
+abgestrichenes
+abgestrittene
+abgestrittenem
+abgestrittenen
+abgestrittenes
+abgestue
+abgestuerzt
+abgestuerzte
+abgestuerzten
+abgestuerzter
+abgestuerztes
+abgestuetzte
+abgestuetztem
+abgestuetzten
+abgestuetztes
+abgestuf
+abgestuft
+abgestufte
+abgestuften
+abgestufter
+abgestuftes
+abgestum
+abgestumpfte
+abgestumpftem
+abgestumpften
+abgestumpftere
+abgestumpfterem
+abgestumpfteren
+abgestumpfteres
+abgestumpftes
+abgestumpfteste
+abgestumpftesten
+abgestumpftester
+abgestumpftestes
+abgesuch
+abgesuchte
+abgesuchtem
+abgesuchten
+abgesuchtes
+abgesunk
+abgesunken
+abgesunkenen
+abgetake
+abgetakelte
+abgetakelter
+abgetane
+abgetast
+abgetastet
+abgetastete
+abgetasteten
+abgetasteter
+abgetastetes
+abgeteil
+abgeteilte
+abgeteiltem
+abgeteilten
+abgeteiltes
+abgetoet
+abgetoetete
+abgetoetetem
+abgetoeteten
+abgetoetetes
+abgetrag
+abgetragen
+abgetragene
+abgetragenen
+abgetragener
+abgetragenes
+abgetren
+abgetrennt
+abgetrennte
+abgetrenntem
+abgetrennten
+abgetrenntes
+abgetret
+abgetreten
+abgetretene
+abgetretenen
+abgetretener
+abgetretenes
+abgetrie
+abgetrieben
+abgetriebene
+abgetriebenem
+abgetriebenen
+abgetriebenes
+abgetroc
+abgetrocknet
+abgetrocknete
+abgetrockneten
+abgetrockneter
+abgetrocknetes
+abgetrop
+abgetropfte
+abgetropftem
+abgetropften
+abgetropftes
+abgetupf
+abgetupft
+abgetupfte
+abgetupften
+abgetupfter
+abgetupftes
+abgeurte
+abgeurteilte
+abgeurteiltem
+abgeurteilten
+abgeurteiltes
+abgewaeh
+abgewaehlt
+abgewael
+abgewaelzt
+abgewaelztem
+abgewaelzten
+abgewaelzter
+abgewand
+abgewandelte
+abgewandeltem
+abgewandelten
+abgewandeltes
+abgewandert
+abgewanderte
+abgewanderten
+abgewanderter
+abgewandertes
+abgewandte
+abgewandtem
+abgewandten
+abgewandtes
+abgewart
+abgewartet
+abgewartete
+abgewarteten
+abgewarteter
+abgewartetes
+abgewasc
+abgewaschene
+abgewaschenem
+abgewaschenen
+abgewaschenes
+abgewech
+abgewechselt
+abgewechselte
+abgewechselten
+abgewechselter
+abgewechseltes
+abgewehr
+abgewehrte
+abgewehrtem
+abgewehrten
+abgewehrtes
+abgewend
+abgewendet
+abgewert
+abgewertet
+abgewertetem
+abgewerteten
+abgewerteter
+abgewetz
+abgewetzten
+abgewich
+abgewichen
+abgewichene
+abgewichenen
+abgewichener
+abgewichenes
+abgewick
+abgewickelt
+abgewickelte
+abgewickeltem
+abgewickelten
+abgewickeltes
+abgewies
+abgewiesen
+abgewiesene
+abgewiesenen
+abgewiesener
+abgewiesenes
+abgewink
+abgewinkt
+abgewinn
+abgewinnen
+abgewirt
+abgewirtschaftet
+abgewirtschaftetem
+abgewirtschafteten
+abgewirtschafteter
+abgewisc
+abgewischt
+abgewischte
+abgewischtem
+abgewischter
+abgewischtes
+abgewoeh
+abgewoehnen
+abgewoehnend
+abgewoehnende
+abgewoehnenden
+abgewoehnender
+abgewoehnendes
+abgewoehnte
+abgewoehntem
+abgewoehnten
+abgewoehntes
+abgewoge
+abgewogen
+abgewogenem
+abgewogenen
+abgewogener
+abgewonn
+abgewonnen
+abgewonnene
+abgewonnenem
+abgewonnener
+abgewonnenes
+abgeworf
+abgeworfen
+abgeworfenem
+abgeworfenen
+abgeworfener
+abgewu"r
+abgewu"rgt
+abgewuer
+abgewuergt
+abgewuergte
+abgewuergten
+abgewuergter
+abgewuergtes
+abgewunk
+abgewunken
+abgewunkene
+abgewunkenem
+abgewunkener
+abgewunkenes
+abgezaeh
+abgezaehlt
+abgezaehlten
+abgezaehlter
+abgezaehltes
+abgezaeu
+abgezaeunt
+abgezaeunte
+abgezaeuntem
+abgezaeunter
+abgezaeuntes
+abgezahl
+abgezahlt
+abgezahltem
+abgezahlten
+abgezahlter
+abgezapf
+abgezapft
+abgezapfte
+abgezapftem
+abgezapfter
+abgezapftes
+abgezehr
+abgezehrt
+abgezehrtem
+abgezehrten
+abgezehrter
+abgezeic
+abgezeichnet
+abgezeichnete
+abgezeichnetem
+abgezeichneter
+abgezeichnetes
+abgeziel
+abgezielt
+abgezielten
+abgezielter
+abgezieltes
+abgezins
+abgezinste
+abgezinsten
+abgezinster
+abgezoge
+abgezogen
+abgezogene
+abgezogenem
+abgezogenen
+abgezogenes
+abgezwei
+abgezweigt
+abgezweigte
+abgezweigten
+abgezweigter
+abgezweigtes
+abgezwic
+abgezwickte
+abgezwicktem
+abgezwickten
+abgezwicktes
+abgezwun
+abgezwungen
+abgibt
+abgiesse
+abgiessend
+abgiessende
+abgiessendem
+abgiessender
+abgiessendes
+abging
+abglanz
+abgleich
+abgleichen
+abgleicht
+abgleite
+abgleiten
+abgleitend
+abgleitendem
+abgleitenden
+abgleitender
+abgoette
+abgoetter
+abgoettern
+abgott
+abgotts
+abgrabe
+abgraben
+abgrabend
+abgrabendem
+abgrabenden
+abgrabender
+abgrasen
+abgrasend
+abgrasende
+abgrasenden
+abgrasender
+abgrasendes
+abgrenze
+abgrenzend
+abgrenzende
+abgrenzendem
+abgrenzender
+abgrenzendes
+abgrenzu
+abgrenzung
+abgrenzungen
+abgriff
+abgriffs
+abgriffspannungen
+abgruend
+abgruenden
+abgrund
+abgrunde
+abgrundes
+abgrundt
+abgrundtief
+abgrundtiefem
+abgrundtiefen
+abgrundtiefer
+abguesse
+abguss
+abh
+abha
+abha"nge
+abha"ngen
+abha"ngi
+abha"ngig
+abha"ngige
+abha"ngigen
+abha"ngigkeit
+abha"ngigkeiten
+abha"ngt
+abhacken
+abhackend
+abhackende
+abhackendem
+abhackender
+abhackendes
+abhaelt
+abhaenge
+abhaengen
+abhaengend
+abhaengendem
+abhaengenden
+abhaengender
+abhaengi
+abhaengig
+abhaengige
+abhaengigem
+abhaengiger
+abhaengiges
+abhaengigkeit
+abhaengigkeitsverhaeltnis
+abhaengigste
+abhaengt
+abhaertu
+abhaertung
+abhaken
+abhalten
+abhaltend
+abhaltende
+abhaltenden
+abhaltender
+abhaltendes
+abhanden
+abhandene
+abhandenem
+abhandener
+abhandenes
+abhandlu
+abhandlung
+abhandlungen
+abhangs
+abhart
+abhauen
+abhaut
+abhay
+abheben
+abhebend
+abhebende
+abhebendem
+abhebender
+abhebendes
+abhebt
+abhebung
+abheilen
+abheilend
+abheilende
+abheilenden
+abheilender
+abheilendes
+abhenry
+abhetzen
+abhielt
+abhijit
+abhilfe
+abhing
+abhiram
+abhiseka
+abhm
+abhoben
+abhoeren
+abhoerend
+abhoerende
+abhoerenden
+abhoerender
+abhoerendes
+abhoerge
+abhoergeraete
+abhold
+abhole
+abholen
+abholend
+abholende
+abholendem
+abholender
+abholendes
+abholt
+abholten
+abholung
+abholzen
+abhomina
+abhominable
+abhor
+abhorche
+abhorchen
+abhorchende
+abhorchendem
+abhorchenden
+abhorchendes
+abhorr
+abhorrd
+abhorre
+abhorred
+abhorren
+abhorrence
+abhorrences
+abhorrency
+abhorrent
+abhorrently
+abhorrer
+abhorrers
+abhorres
+abhorrest
+abhorret
+abhorreth
+abhorrib
+abhorrible
+abhorrin
+abhorring
+abhors
+abhorson
+abhunger
+abhungern
+abi
+abi-aad
+abi-mu
+abi^ma
+abi^maie
+abi^maient
+abi^mais
+abi^mait
+abi^mant
+abi^me
+abi^me'
+abi^me'e
+abi^me'es
+abi^me's
+abi^me`r
+abi^me`rent
+abi^ment
+abi^mer
+abi^mera
+abi^merai
+abi^meraient
+abi^merais
+abi^merait
+abi^meras
+abi^mere
+abi^merez
+abi^meri
+abi^meriez
+abi^merions
+abi^mero
+abi^merons
+abi^meront
+abi^mes
+abi^mez
+abi^miez
+abi^mion
+abi^mions
+abi^mons
+abia
+abiah
+abialang
+abialbon
+abiar
+abiasaph
+abiathar
+abib
+abibollo
+abico
+abicos
+abid
+abida
+abidah
+abidal
+abidan
+abidance
+abiddul
+abide
+abided
+abider
+abiders
+abides
+abideth
+abidi
+abidine
+abiding
+abidingl
+abidingly
+abidingn
+abidingness
+abidjan
+abidjana
+abidjananyama
+abidji
+abie
+abiel
+abieldar
+abiem
+abierta
+abiertamente
+abierto
+abies
+abieta`cea
+abieta`ceo
+abietate
+abiete
+abietene
+abieti`nea
+abieti`neo
+abietic
+abietin
+abietina
+abietine
+abietineae
+abietineous
+abietini
+abietinic
+abietino
+abiezer
+abiezrit
+abiezrite
+abiezrites
+abigael
+abigail
+abigails
+abigailship
+abigale
+abigar
+abigarrada
+abigarradamente
+abigarrado
+abigarramiento
+abigarrar
+abigeat
+abigeato
+abigeo
+abigero
+abigeus
+abighane
+abighanem
+abigira
+abigotada
+abigotado
+abihail
+abihu
+abihud
+abiibari
+abiibarik
+abijah
+abijam
+abiji
+abike
+abiki
+abiko
+abikocyo
+abikomiw
+abikorik
+abikoshi
+abikosi
+abikyouk
+abilao
+abile
+abilene
+abili
+abilita
+abilitai
+abilitam
+abilitammo
+abilitan
+abilitando
+abilitano
+abilitar
+abilitare
+abilitas
+abilitasse
+abilitassi
+abilitaste
+abilitasti
+abilitat
+abilitata
+abilitate
+abilitati
+abilitato
+abilitav
+abilitava
+abilitavi
+abilitavo
+abiliter
+abilitera
+abiliterai
+abiliterei
+abilitero
+abiliti
+abilitia
+abilitiamo
+abilitiate
+abilitie
+abilities
+abilitin
+abilitino
+abilito
+ability
+abilla
+abilo
+abim
+abimael
+abimelec
+abimelech
+abimu
+abinadab
+abineri
+abingdon
+abington
+abini
+abinoam
+abinsi
+abintest
+abintestate
+abintestato
+abiogene
+abiogenesis
+abiogenesist
+abiogenetic
+abiogenetical
+abiogenetically
+abiogeni
+abiogenist
+abiogeno
+abiogenous
+abiogeny
+abiologi
+abiological
+abiologically
+abiology
+abiosis
+abiotic
+abiotrop
+abiotrophic
+abiotrophy
+abipo`n
+abipon
+abipona
+abiquira
+abiquiu
+abir
+abira
+abiram
+abiri
+abirrita
+abirritant
+abirritate
+abirritation
+abirritative
+abiru
+abisagrar
+abisal
+abise
+abisekak
+abiselar
+abishag
+abishai
+abishalo
+abishalom
+abishira
+abishua
+abishur
+abisi
+abisinia
+abisinio
+abisma`tica
+abisma`tico
+abismada
+abismado
+abismal
+abismar
+abismo
+abismos
+abiso
+abissi
+abisso
+abiston
+abita
+abitabil
+abitabile
+abitabili
+abitadura
+abital
+abitante
+abitanti
+abitaque
+abitar
+abitaspr
+abitasprings
+abitazio
+abitazione
+abitazioni
+abiti
+abitibi
+abito
+abito`n
+abitoir
+abitore
+abitores
+abitua
+abituai
+abituale
+abituali
+abituamm
+abituammo
+abituand
+abituando
+abituano
+abituare
+abituaro
+abituarono
+abituass
+abituasse
+abituassi
+abituast
+abituaste
+abituasti
+abituata
+abituate
+abituati
+abituato
+abituava
+abituavamo
+abituavano
+abituavate
+abituavi
+abituavo
+abitub
+abitudin
+abitudine
+abitudini
+abituera
+abituerai
+abituere
+abituerei
+abitueremo
+abituerete
+abituero
+abitui
+abituiam
+abituiamo
+abituiat
+abituiate
+abituino
+abituo
+abiture
+abiturie
+abiturient
+abituriente
+abiturienten
+abiturientenzahlen
+abiturientin
+abiturientinnen
+abiu
+abiud
+abiura
+abiurai
+abiuramm
+abiurammo
+abiurand
+abiurando
+abiurano
+abiurare
+abiuraro
+abiurarono
+abiurass
+abiurasse
+abiurassi
+abiurast
+abiuraste
+abiurasti
+abiurata
+abiurate
+abiurati
+abiurato
+abiurava
+abiuravamo
+abiuravano
+abiuravate
+abiuravi
+abiuravo
+abiurera
+abiurerai
+abiurere
+abiurerei
+abiureremo
+abiurerete
+abiurero
+abiuret
+abiuri
+abiuriam
+abiuriamo
+abiuriat
+abiuriate
+abiurino
+abiuro
+abiyi
+abiyu
+abizcochada
+abizcochado
+abj
+abjagen
+abjagend
+abjagende
+abjagendem
+abjagenden
+abjagendes
+abject
+abjecte
+abjected
+abjectedness
+abjectes
+abjectio
+abjection
+abjections
+abjectiv
+abjective
+abjectly
+abjectne
+abjectness
+abjects
+abjoint
+abjudge
+abjudica
+abjudicate
+abjudication
+abjuncti
+abjunction
+abjunctive
+abjuracio`n
+abjurar
+abjurati
+abjuration
+abjurations
+abjurato
+abjuratory
+abjure
+abjured
+abjureme
+abjurement
+abjurer
+abjurers
+abjures
+abjuring
+abk
+abkam
+abkapsel
+abkapseln
+abkar
+abkari
+abkaufen
+abkaufend
+abkaufende
+abkaufendem
+abkaufender
+abkaufendes
+abkehr
+abkehren
+abkehrende
+abkehrendem
+abkehrenden
+abkehrendes
+abkhas
+abkhasia
+abkhasian
+abkhaz
+abkhazab
+abkhazabazin
+abkhazia
+abkla"ru
+abkla"rung
+abklaere
+abklaeren
+abklaerend
+abklaerendem
+abklaerenden
+abklaerender
+abklappe
+abklappen
+abklappern
+abklappernd
+abklappernde
+abklappernden
+abklappernder
+abklapperndes
+abkleben
+abklemme
+abklemmen
+abklemmend
+abklemmende
+abklemmenden
+abklemmendes
+abklinge
+abklingen
+abklingend
+abklingendem
+abklingenden
+abklingender
+abklingv
+abklingverhalten
+abklopfe
+abklopfen
+abknabbe
+abknabbern
+abknabbernd
+abknabbernde
+abknabberndem
+abknabbernder
+abknabberndes
+abknalle
+abknallen
+abknallende
+abknallendem
+abknallenden
+abknallendes
+abknallt
+abknappe
+abknappen
+abknicke
+abknicken
+abknickende
+abknickendem
+abknickenden
+abknickendes
+abknoepf
+abknoepft
+abknoepfte
+abkochen
+abkocher
+abkoemml
+abkoemmlich
+abkoemmliche
+abkoemmlichen
+abkoemmlicher
+abkoemmliches
+abkoemmling
+abkoemmlinge
+abkomman
+abkommandieren
+abkommandierende
+abkommandierendem
+abkommandierenden
+abkommandierendes
+abkommandiert
+abkommandierte
+abkommandierten
+abkommandierter
+abkommandiertes
+abkommen
+abkommend
+abkommende
+abkommendem
+abkommender
+abkommendes
+abkommens
+abkommenswidrigen
+abkoppel
+abkoppelnd
+abkoppelnde
+abkoppelndem
+abkoppelnder
+abkoppelndes
+abkratze
+abkratzen
+abkratzende
+abkratzendem
+abkratzenden
+abkratzendes
+abkriege
+abkriegen
+abkriegend
+abkriegendem
+abkriegenden
+abkriegender
+abku"hle
+abku"hlen
+abku"hlenden
+abku"ndi
+abku"ndigen
+abku"rzu
+abku"rzung
+abku"rzungen
+abkuehle
+abkuehlend
+abkuehlende
+abkuehlendem
+abkuehlender
+abkuehlendes
+abkuehlt
+abkuehlu
+abkuehlung
+abkuehlungspause
+abkuerze
+abkuerzend
+abkuerzende
+abkuerzendem
+abkuerzender
+abkuerzendes
+abkuerzu
+abkuerzung
+abkuerzungen
+abkuerzungszeichens
+abkuesse
+abkuessen
+abkuessende
+abkuessendem
+abkuessenden
+abkuessendes
+abkunft
+abl
+abla"ufe
+abla"ufen
+abla"uft
+ablach
+ablacio`n
+ablactat
+ablactate
+ablactation
+abladen
+abladend
+abladende
+abladenden
+abladender
+abladendes
+abladepl
+abladeplaetzen
+abladeplatz
+abladeplatzes
+abladers
+abladung
+abladungspreise
+ablaeufe
+ablaeufen
+ablaeuft
+ablage
+ablagen
+ablagera
+ablageraum
+ablagern
+ablagernd
+ablagernde
+ablagerndem
+ablagernder
+ablagerndes
+ablagert
+ablageru
+ablagerung
+ablagerungsplatz
+ablanca
+ablandabrevas
+ablandador
+ablandadora
+ablandadura
+ablandahi`gos
+ablandamiento
+ablandante
+ablandar
+ablandativa
+ablandativo
+ablandecer
+ablandir
+ablanedo
+ablano
+ablare
+ablass
+ablasse
+ablassen
+ablassend
+ablassendem
+ablassenden
+ablassender
+ablastem
+ablastemic
+ablastou
+ablastous
+ablate
+ablated
+ablater
+ablates
+ablatief
+ablatiev
+ablatieven
+ablatif
+ablatifs
+ablating
+ablation
+ablations
+ablatiti
+ablatitious
+ablativ
+ablativa
+ablatival
+ablative
+ablatively
+ablatives
+ablativo
+ablativs
+ablator
+ablauf
+ablaufdi
+ablaufdiagramme
+ablaufen
+ablaufend
+ablaufende
+ablaufenden
+ablaufender
+ablaufendes
+ablaufes
+ablauffo
+ablauffolge
+ablaufs
+ablaufst
+ablaufsteuerung
+ablaufsteuerungen
+ablaufsteuerwerk
+ablaufve
+ablaufverkehr
+ablaut
+ablaute
+ablauten
+ablautes
+ablaze
+able
+ablebodi
+ablebodied
+ablecken
+ableckend
+ableckende
+ableckenden
+ableckender
+ableckendes
+ableeze
+ablegado
+ablegate
+ablegen
+ablegend
+ablegende
+ablegendem
+ablegender
+ablegendes
+ableger
+ablegern
+ablegers
+ablegsal
+ablegsalegseg
+ablegt
+ableg|ye
+ableg|yer
+ablehnen
+ablehnend
+ablehnende
+ablehnenden
+ablehnender
+ablehnendes
+ablehnte
+ablehnun
+ablehnung
+ablehnungen
+ableiste
+ableisten
+ableistend
+ableistendem
+ableistenden
+ableistender
+ableisteten
+ableistu
+ableistung
+ableistungen
+ableiten
+ableitend
+ableitendem
+ableitenden
+ableitender
+ableitet
+ableitne
+ableitner
+ableitun
+ableitung
+ableitungskanaele
+ableitungskanaelen
+ableitungskanal
+ableness
+ablenken
+ablenkend
+ablenkendem
+ablenkenden
+ablenkender
+ablenkt
+ablenkun
+ablenkung
+ablenkungen
+ablenkungsmanoever
+ablenkungsmanoevers
+ablentador
+ablentar
+ablephar
+ablepharia
+ablepharon
+ablepharous
+ablepharus
+ablepsia
+ablepsy
+ableptic
+ableptical
+ableptically
+abler
+ables
+ablesbar
+ablesbaren
+ablesen
+ablesend
+ablesende
+ablesendem
+ablesender
+ablesendes
+ablesepe
+ableseperiode
+ablest
+ablesung
+ablette
+ablettes
+ableugne
+ableugnen
+ableugnende
+ableugnendem
+ableugnenden
+ableugnendes
+ablewhac
+ablewhackets
+ablichtu
+ablichtung
+ablichtungen
+abliefer
+abliefern
+abliefernd
+ablieferndem
+abliefernden
+abliefernder
+ablieferung
+ablieferungsgewicht
+abliegen
+abliegend
+abliegende
+abliegenden
+abliegender
+abliegendes
+ablings
+ablins
+ablo"ten
+abloesba
+abloesbar
+abloesbare
+abloesbaren
+abloesbarer
+abloesbares
+abloesch
+abloeschend
+abloeschende
+abloeschendem
+abloeschender
+abloeschendes
+abloesen
+abloesende
+abloesendem
+abloesenden
+abloesendes
+abloeses
+abloesesumme
+abloest
+abloeste
+abloesun
+abloesung
+abloesungskredit
+abloom
+ablow
+ablucio`n
+ablude
+ablue
+abluent
+ablulesc
+ablulescu
+ablusada
+ablusado
+ablush
+ablute
+abluted
+ablutie
+ablutien
+abluties
+ablution
+ablutionary
+ablutions
+abluvion
+abluzion
+abluzione
+abluzioni
+ably
+abm
+abmachen
+abmachende
+abmachendem
+abmachenden
+abmachendes
+abmachun
+abmachung
+abmachungen
+abmaersc
+abmaersche
+abmaerschen
+abmagern
+abmagernd
+abmagerndem
+abmagernden
+abmagernder
+abmageru
+abmagerung
+abmagerungen
+abmagerungskuren
+abmahner
+abmalt
+abmarsch
+abmarschieren
+abmarschierend
+abmarschierende
+abmarschierenden
+abmarschierender
+abmarschierendes
+abmarschierte
+abmarschiertem
+abmarschierten
+abmarschiertes
+abmelden
+abmeldend
+abmeldendem
+abmeldenden
+abmeldender
+abmeldet
+abmeldun
+abmeldung
+abmeldungen
+abmessen
+abmessend
+abmessendem
+abmessenden
+abmessender
+abmessun
+abmessung
+abmessungen
+abmho
+abmilder
+abmildern
+abmildernd
+abmildernde
+abmildernden
+abmildernder
+abmilderndes
+abmilderung
+abmontie
+abmontierend
+abmontierende
+abmontierendem
+abmontierender
+abmontierendes
+abmontiert
+abmontiertem
+abmontierten
+abmontierter
+abmu
+abmuehen
+abmuehend
+abmuehende
+abmuehendem
+abmuehender
+abmuehendes
+abmuster
+abmustern
+abmusternd
+abmusternde
+abmusternden
+abmusternder
+abmusterndes
+abn
+abnagen
+abnagend
+abnagende
+abnagendem
+abnagender
+abnagendes
+abnahm
+abnahme
+abnahmeb
+abnahmebescheinigung
+abnahmef
+abnahmefaehigen
+abnahmem
+abnahmemenge
+abnahmen
+abnahmep
+abnahmepreis
+abnahmeprotokoll
+abnahmes
+abnahmestu"ckzahl
+abnaki
+abnakipe
+abnakipenobscot
+abne'gat
+abne'gation
+abnegacio`n
+abnegada
+abnegadamente
+abnegado
+abnegar
+abnegate
+abnegated
+abnegates
+abnegati
+abnegating
+abnegation
+abnegations
+abnegative
+abnegato
+abnegator
+abnegators
+abnehmba
+abnehmbar
+abnehmbare
+abnehmbarem
+abnehmbarer
+abnehmbares
+abnehme
+abnehmen
+abnehmende
+abnehmendem
+abnehmenden
+abnehmendes
+abnehmer
+abnehmerkreis
+abnehmerkreise
+abnehmerkreisen
+abnehmers
+abnehmerschaft
+abneigun
+abneigung
+abner
+abnerval
+abnet
+abneural
+abnimmt
+abnoba
+abnoetig
+abnoetigende
+abnoetigendem
+abnoetigenden
+abnoetigendes
+abnorm
+abnormaa
+abnormaal
+abnormaalst
+abnormal
+abnormale
+abnormaler
+abnormalism
+abnormalist
+abnormaliteit
+abnormaliteiten
+abnormalities
+abnormality
+abnormalize
+abnormally
+abnormalness
+abnormals
+abnormem
+abnormen
+abnormer
+abnormit
+abnormitet
+abnormiteten
+abnormity
+abnormou
+abnormous
+abnormt
+abnuetze
+abnuetzen
+abnuetzend
+abnuetzendem
+abnuetzenden
+abnuetzender
+abnuetzu
+abnuetzung
+abnuetzungen
+abnumera
+abnumerable
+abnutzen
+abnutzun
+abnutzung
+abnutzungskosten
+abo
+aboa
+aboard
+abobada
+abobado
+abobamiento
+abobar
+abobra
+abocadear
+abocado
+abocamiento
+abocanar
+abocar
+abocardada
+abocardado
+abocardar
+abocardo
+abocelada
+abocelado
+abocetada
+abocetado
+abocetar
+abochornada
+abochornado
+abochornar
+abocinada
+abocinado
+abocinamiento
+abocinar
+abode
+aboded
+abodemen
+abodement
+abodes
+abodest
+aboding
+abodunde
+abody
+abofeteador
+abofeteadora
+abofetear
+abogaci`a
+abogada
+abogadesca
+abogadesco
+abogadil
+abogadismo
+abogado
+abogador
+abogadora
+abogamiento
+abogar
+aboh
+abohetada
+abohetado
+abohi
+abohm
+aboideau
+aboie
+aboiemen
+aboiement
+aboiements
+aboient
+aboiera
+aboierai
+aboieraient
+aboierait
+aboieron
+aboieront
+aboil
+abois
+aboisso
+aboiteau
+abolaga
+abolano
+abolendo
+abolengo
+aboli
+aboliamo
+aboliate
+abolicio`n
+abolicionismo
+abolicionista
+abolie
+abolies
+abolii
+abolimmo
+abolir
+abolira
+abolirai
+aboliraient
+abolirais
+abolirait
+aboliran
+aboliranno
+aboliras
+abolire
+abolireb
+abolirebbe
+abolirei
+abolirem
+aboliremmo
+aboliremo
+aboliren
+abolirent
+abolires
+abolireste
+aboliresti
+aboliret
+abolirete
+abolirez
+abolirie
+aboliriez
+abolirio
+abolirions
+aboliro
+aboliron
+abolirono
+abolirons
+aboliront
+abolis
+abolisca
+abolisce
+abolisci
+abolisco
+aboliscono
+abolish
+abolisha
+abolishable
+abolishe
+abolished
+abolisher
+abolishers
+abolishes
+abolishi
+abolishing
+abolishm
+abolishment
+abolishments
+abolisht
+abolissa
+abolissaient
+abolissais
+abolissait
+abolissant
+abolisse
+abolissent
+abolissero
+abolisses
+abolissez
+abolissi
+abolissiez
+abolissimo
+abolissions
+abolisso
+abolissons
+aboliste
+abolisti
+abolit
+abolita
+abolite
+aboliti
+abolitie
+abolitio
+abolition
+abolitionary
+abolitionism
+abolitionist
+abolitionisten
+abolitionists
+abolitionize
+abolitionnisme
+abolitionniste
+abolitionnistes
+abolito
+aboliva
+abolivam
+abolivamo
+abolivan
+abolivano
+abolivat
+abolivate
+abolivi
+abolivo
+abolizio
+abolizione
+abolizioni
+abolla
+abollada
+abollado
+abolladura
+abollar
+abollo`n
+abollonar
+abolongo
+abolorio
+abolsarse
+abom
+aboma
+abomasay
+abomaso
+abomasum
+abomasus
+abombar
+abominab
+abominabel
+abominabele
+abominabeler
+abominabelst
+abominable
+abominablement
+abominablemente
+abominableness
+abominables
+abominably
+abominacio`n
+abominar
+abominat
+abominate
+abominated
+abominates
+abominating
+abomination
+abominations
+abominator
+abominators
+abomine
+abominer
+abon
+abonable
+abonada
+abonado
+abonador
+abonadora
+abonamiento
+abonanza
+abonanzar
+abonar
+abonare`
+abonda
+abondada
+abondadamente
+abondado
+abondadura
+abondaie
+abondaient
+abondais
+abondait
+abondamiento
+abondamm
+abondamment
+abondanc
+abondance
+abondances
+abondant
+abondante
+abondantes
+abondants
+abondar
+abonde
+abonde'
+abonde`r
+abonde`rent
+abondent
+abonder
+abondera
+abonderai
+abonderaient
+abonderais
+abonderait
+abonderas
+abondere
+abonderez
+abonderi
+abonderiez
+abonderions
+abondero
+abonderons
+abonderont
+abondes
+abondez
+abondiez
+abondion
+abondions
+abondo
+abondolo
+abondons
+abondosa
+abondosamente
+abondoso
+abong
+abongmba
+abongmbang
+abongo
+abonna
+abonnaie
+abonnaient
+abonnais
+abonnait
+abonnant
+abonne
+abonne'
+abonne'e
+abonne'es
+abonne's
+abonne`r
+abonne`rent
+abonnee
+abonneer
+abonneerde
+abonneerden
+abonneert
+abonnees
+abonneet
+abonneetje
+abonneetjes
+abonnema
+abonnemang
+abonneme
+abonnement
+abonnemente
+abonnementen
+abonnementes
+abonnementet
+abonnements
+abonnementsabbestellungen
+abonnementsangebot
+abonnementsavdeling
+abonnementsfreien
+abonnementsgebuehren
+abonnementskaart
+abonnementskaarten
+abonnementskonsert
+abonnementskort
+abonnementspreis
+abonnementspreises
+abonnementsvoorstelling
+abonnementsvoorstellingen
+abonnementvorstellungen
+abonnent
+abonnenten
+abonnentene
+abonnenter
+abonnenttallet
+abonner
+abonnera
+abonnerai
+abonneraient
+abonnerais
+abonnerait
+abonneras
+abonnere
+abonneren
+abonnerez
+abonneri
+abonneriez
+abonnerions
+abonnero
+abonnerons
+abonneront
+abonnert
+abonnes
+abonnez
+abonnier
+abonniere
+abonnieren
+abonnierende
+abonnierendem
+abonnierenden
+abonnierendes
+abonnierst
+abonniert
+abonniertem
+abonnierten
+abonnierter
+abonniertest
+abonniertet
+abonniez
+abonnion
+abonnions
+abonnir
+abonnons
+abono
+abonu
+abonwa
+aboo
+aboon
+aboquillada
+aboquillado
+aboquillar
+abor
+aborad
+aboral
+aborally
+abord
+aborda
+abordabl
+abordable
+abordables
+abordador
+abordadora
+abordage
+abordages
+abordaie
+abordaient
+abordais
+abordait
+abordaje
+abordant
+abordar
+aborde
+aborde'
+aborde'e
+aborde'es
+aborde's
+aborde`r
+aborde`rent
+abordent
+aborder
+abordera
+aborderai
+aborderaient
+aborderais
+aborderait
+aborderas
+abordere
+aborderez
+aborderi
+aborderiez
+aborderions
+abordero
+aborderons
+aborderont
+abordes
+abordez
+abordiez
+abordion
+abordions
+abordnen
+abordnende
+abordnendem
+abordnenden
+abordnendes
+abordnun
+abordnung
+abordnungen
+abordo
+abordonar
+abordons
+abords
+aborigen
+aborigin
+aboriginal
+aboriginality
+aboriginally
+aboriginals
+aboriginary
+aborigine
+aborigines
+aborigon
+aborigones
+aborlan
+aborlonada
+aborlonado
+aborning
+aboro
+aborrachada
+aborrachado
+aborrajarse
+aborrascarse
+aborrecedera
+aborrecedero
+aborrecedor
+aborrecedora
+aborrecer
+aborrecible
+aborreciblemente
+aborrecida
+aborrecidamente
+aborrecido
+aborrecimiento
+aborregarse
+aborrencia
+aborrescencia
+aborri`o
+aborrible
+aborrir
+aborronar
+aborso
+abort
+abortadura
+abortamiento
+abortar
+aborted
+aborten
+aborter
+abortere
+aborteret
+aborters
+abortert
+abortes
+abortfra
+abortfrauen
+aborti
+aborti`n
+abortici
+aborticide
+abortien
+abortient
+abortifa
+abortifacient
+abortin
+aborting
+abortion
+abortional
+abortionist
+abortionists
+abortions
+abortiva
+abortive
+abortively
+abortiveness
+abortivi
+abortivity
+abortivo
+aborto
+aborto`n
+abortoge
+abortogenic
+abortpra
+abortpraksis
+aborts
+aborts|k
+aborts|knader
+abortus
+aborujar
+aboshi
+aboshiki
+abosi
+abosiki
+abosrbie
+abosrbierender
+abotagamiento
+abotagarse
+abotargarse
+abotee
+abotinada
+abotinado
+aboto
+abotonador
+abotonar
+abou
+abou-arr
+abou-arrage
+abou-ezz
+abou-ezze
+abouchem
+abouchement
+aboucher
+abouelat
+abouelata
+aboul-ma
+aboul-magd
+abouler
+abound
+abounded
+abounder
+aboundet
+aboundeth
+aboundin
+abounding
+aboundingly
+abounds
+aboure
+aboussou
+aboussouan
+about
+aboutelf
+aboutelfan
+abouter
+abouti
+aboutir
+aboutira
+aboutirai
+aboutiraient
+aboutirais
+aboutirait
+aboutiras
+aboutire
+aboutirent
+aboutirez
+aboutiri
+aboutiriez
+aboutirions
+aboutiro
+aboutirons
+aboutiront
+aboutis
+aboutiss
+aboutissaient
+aboutissais
+aboutissait
+aboutissant
+aboutissants
+aboutisse
+aboutissement
+aboutissements
+aboutissent
+aboutisses
+aboutissez
+aboutissiez
+aboutissions
+aboutissons
+aboutit
+abouts
+above
+aboveave
+aboveaverage
+abovebas
+abovebaseline
+aboveboa
+aboveboard
+abovedada
+abovedado
+abovedar
+abovedec
+abovedeck
+abovegro
+aboveground
+abovelev
+abovelevel
+abovemen
+abovementioned
+abovepro
+aboveproof
+aboves
+abovesai
+abovesaid
+abovesta
+abovestairs
+aboville
+abovyan
+abox
+aboya
+aboyada
+aboyado
+aboyaien
+aboyaient
+aboyait
+aboyant
+aboyar
+aboye'
+aboye'e
+aboye'es
+aboye's
+aboye`re
+aboye`rent
+aboyer
+abozalar
+abp
+abpassen
+abpassende
+abpassendem
+abpassenden
+abpassendes
+abpatrou
+abpatrouillieren
+abpfeife
+abpfeifen
+abpfeifend
+abpfeifendem
+abpfeifenden
+abpfeifender
+abpfiff
+abpfluec
+abpfluecken
+abpflueckend
+abpflueckende
+abpflueckenden
+abpflueckender
+abpflueckendes
+abplagen
+abplagend
+abplagende
+abplagenden
+abplagender
+abplagendes
+abplattu
+abplattung
+abpraell
+abpraellen
+abprall
+abpralle
+abprallend
+abprallende
+abprallendem
+abprallender
+abprallendes
+abpralls
+abpratzu
+abpratzung
+abpresse
+abpressen
+abpsa
+abputzen
+abputzend
+abputzendem
+abputzenden
+abputzender
+abq
+abquaele
+abquaelen
+abquaelend
+abquaelende
+abquaelenden
+abquaelender
+abquaelendes
+abquetsc
+abquetschen
+abquetschend
+abquetschende
+abquetschenden
+abquetschender
+abquetschendes
+abr
+abra
+abra"ume
+abra"umen
+abracada
+abracadabra
+abracadabrant
+abracadabrante
+abracadabrantes
+abracadabrants
+abracadaver
+abrachia
+abracijarse
+abracijo
+abracker
+abrackernd
+abrackernde
+abrackerndem
+abrackernder
+abrackerndes
+abrackert
+abradant
+abradants
+abrade
+abraded
+abradeil
+abradeilog
+abrader
+abraders
+abrades
+abrading
+abraeume
+abraeumen
+abraeumend
+abraeumende
+abraeumenden
+abraeumender
+abraeumendes
+abraeumt
+abraeumte
+abragam
+abraha`n
+abraham
+abrahami
+abrahamic
+abrahamidae
+abrahamite
+abrahamitic
+abrahams
+abrahan
+abrahim
+abrahonar
+abraid
+abrakada
+abrakadabra
+abrakadabraet
+abrako
+abram
+abramis
+abramo
+abramov
+abramowi
+abramowitz
+abrams
+abrams2
+abrams2-
+abrams2-mil-tac
+abramson
+abran
+abranchi
+abranchial
+abranchialism
+abranchian
+abranchiata
+abranchiate
+abranchious
+abrar
+abrasadamente
+abrasador
+abrasadora
+abrasamiento
+abrasante
+abrasar
+abrasax
+abrase
+abraser
+abrash
+abrasilada
+abrasilado
+abrasio`n
+abrasiom
+abrasiometer
+abrasion
+abrasione
+abrasioni
+abrasions
+abrasiva
+abrasive
+abrasively
+abrasiveness
+abrasives
+abrasivo
+abrastol
+abraten
+abratend
+abratende
+abratenden
+abratender
+abratendes
+abraum
+abravar
+abravecer
+abraxas
+abrazada
+abrazadera
+abrazado
+abrazador
+abrazadora
+abrazamiento
+abrazante
+abrazar
+abrazo
+abre'agi
+abre'agir
+abre'ge'
+abre'ge'e
+abre'ge'es
+abre'ge's
+abre'ge`
+abre'ge`rent
+abre'gea
+abre'geaient
+abre'geais
+abre'geait
+abre'geant
+abre'geo
+abre'geons
+abre'ger
+abre'gera
+abre'gerai
+abre'geraient
+abre'gerais
+abre'gerait
+abre'geras
+abre'gerez
+abre'geriez
+abre'gerions
+abre'gerons
+abre'geront
+abre'gez
+abre'gie
+abre'giez
+abre'gio
+abre'gions
+abre'via
+abre'viation
+abre'viations
+abre`ge
+abre`gem
+abre`gement
+abre`gen
+abre`gent
+abre`ges
+abreact
+abreacte
+abreacted
+abreacti
+abreacting
+abreaction
+abreactions
+abreacts
+abreagie
+abreagierend
+abreagierende
+abreagierendem
+abreagierender
+abreagierendes
+abreagiert
+abreagiertem
+abreagierten
+abreagierter
+abreast
+abrechne
+abrechnen
+abrechnend
+abrechnende
+abrechnenden
+abrechnender
+abrechnendes
+abrechnu
+abrechnung
+abrechnungen
+abrechnungsverfahren
+abrede
+abreden
+abregancias
+abrege
+abregen
+abreiben
+abreibend
+abreibendem
+abreibenden
+abreibender
+abreibun
+abreibungen
+abreise
+abreisen
+abreisend
+abreisende
+abreisenden
+abreisender
+abreisendes
+abreiset
+abreisetag
+abreisse
+abreissen
+abreissend
+abreissendem
+abreissenden
+abreissender
+abreissk
+abreisskante
+abreisst
+abreissv
+abreissvorrichtung
+abreitsp
+abreitsplatz
+abrelatas
+abrenoun
+abrenounce
+abrenunciar
+abrenuncio
+abreojos
+abreptio
+abreption
+abrepu\o
+abret
+abretonar
+abreuver
+abreuvoi
+abreuvoir
+abreuvoirs
+abrevadero
+abrevador
+abrevadora
+abrevar
+abreviacio`n
+abreviada
+abreviadamente
+abreviado
+abreviador
+abreviadora
+abreviaduri`a
+abreviamiento
+abreviar
+abreviatura
+abreviaturi`a
+abri
+abribonada
+abribonado
+abribonarse
+abrichte
+abrichten
+abrichtend
+abrichtendem
+abrichtenden
+abrichtender
+abrico
+abricot
+abricoti
+abricotier
+abricotiers
+abricots
+abridera
+abridero
+abridge
+abridgea
+abridgeable
+abridged
+abridgedly
+abridgem
+abridgement
+abridgements
+abridger
+abridgers
+abridges
+abridgin
+abridging
+abridgme
+abridgment
+abridgments
+abridor
+abridora
+abrieb
+abriegel
+abriegeln
+abriegelnd
+abriegelnde
+abriegelnden
+abriegelnder
+abriegelndes
+abriegelten
+abriegelung
+abrieten
+abriga\o
+abrigada
+abrigadero
+abrigado
+abrigador
+abrigadora
+abrigamiento
+abrigar
+abrigo
+abrikoos
+abrikos
+abrikosen
+abrikoser
+abrikosmarmelade
+abrikoso
+abrikosov
+abrikoss
+abrikossov
+abrikoze
+abrikozebomen
+abrikozeboom
+abrikozen
+abrikozengelei
+abrikozentaart
+abrikozentaarten
+abrikozepit
+abrikozepitten
+abrikozeschil
+abrikozeschillen
+abril
+abrile\a
+abrile\o
+abrillantador
+abrillantar
+abrim
+abrimiento
+abrin
+abringen
+abrir
+abris
+abriss
+abrisska
+abrisskante
+abristle
+abrita
+abritaie
+abritaient
+abritais
+abritait
+abritalo
+abritalodi
+abritant
+abrite
+abrite'
+abrite'e
+abrite'es
+abrite's
+abrite`r
+abrite`rent
+abritent
+abriter
+abritera
+abriterai
+abriteraient
+abriterais
+abriterait
+abriteras
+abritere
+abriterez
+abriteri
+abriteriez
+abriterions
+abritero
+abriterons
+abriteront
+abrites
+abritez
+abritiez
+abrition
+abritions
+abritons
+abro`tano
+abroach
+abroad
+abrochador
+abrochadura
+abrochamiento
+abrochar
+abrocoma
+abrocome
+abroga
+abrogabl
+abrogable
+abrogacio`n
+abrogai
+abrogamm
+abrogammo
+abrogand
+abrogando
+abrogano
+abrogar
+abrogare
+abrogaro
+abrogarono
+abrogass
+abrogasse
+abrogassi
+abrogast
+abrogaste
+abrogasti
+abrogata
+abrogate
+abrogated
+abrogates
+abrogati
+abrogating
+abrogation
+abrogations
+abrogative
+abrogato
+abrogator
+abrogators
+abrogava
+abrogavamo
+abrogavano
+abrogavate
+abrogavi
+abrogavo
+abroge
+abroge'
+abroge'e
+abroge'es
+abroge's
+abroge`r
+abroge`rent
+abrogea
+abrogeai
+abrogeaient
+abrogeais
+abrogeait
+abrogean
+abrogeant
+abrogent
+abrogeon
+abrogeons
+abroger
+abrogera
+abrogerai
+abrogeraient
+abrogerais
+abrogerait
+abrogeras
+abrogere
+abrogerez
+abrogeri
+abrogeriez
+abrogerions
+abrogero
+abrogerons
+abrogeront
+abroges
+abrogez
+abrogher
+abroghera
+abrogherai
+abrogherei
+abroghero
+abroghi
+abroghia
+abroghiamo
+abroghiate
+abroghin
+abroghino
+abrogiez
+abrogion
+abrogions
+abrogo
+abrojal
+abroji`n
+abrojo
+abrollen
+abrollend
+abrollende
+abrollender
+abrollendes
+abrollo
+abrollt
+abrollte
+abroma
+abromada
+abromado
+abromar
+abron
+abroncar
+abronia
+abrook
+abroquelada
+abroquelado
+abroquelar
+abrotanu
+abrotanum
+abrotine
+abroto\ar
+abrownia
+abrownian
+abruecke
+abruecken
+abrueckend
+abrueckendem
+abrueckenden
+abrueckender
+abrueste
+abruesten
+abruestend
+abruestende
+abruestenden
+abruestender
+abruestendes
+abruestu
+abruestung
+abruestungen
+abruestungs
+abruestungsbeteuerungen
+abruestungsdebatten
+abruestungsexperten
+abruestungsfrage
+abruestungsfragen
+abruestungsgespraech
+abruestungskommission
+abruestungskonferenz
+abruestungskonferenzen
+abruestungspolitik
+abruestungsproblem
+abruestungsrede
+abruestungsverhandlungen
+abruestungsvorschlaege
+abruestungsvorschlag
+abruf
+abrufauf
+abrufauftra"ge
+abrufbar
+abrufbare
+abrufbaren
+abrufber
+abrufbereit
+abrufe
+abrufen
+abrufs
+abruft
+abrufung
+abrumador
+abrumadora
+abrumadoramente
+abrumar
+abrumarse
+abrunden
+abrundend
+abrundende
+abrundenden
+abrundender
+abrundendes
+abrundet
+abrundete
+abrundun
+abrundung
+abrupt
+abrupta
+abruptamente
+abrupte
+abrupted
+abruptedly
+abruptem
+abruptement
+abrupten
+abrupter
+abruptere
+abrupteren
+abrupterer
+abrupteres
+abruptes
+abruptest
+abrupteste
+abruptestem
+abruptesten
+abruptestes
+abruptio
+abruption
+abruptly
+abruptne
+abruptness
+abrupto
+abrupts
+abruptst
+abrus
+abrutada
+abrutado
+abruti
+abrutie
+abruties
+abrutir
+abrutira
+abrutirai
+abrutiraient
+abrutirais
+abrutirait
+abrutiras
+abrutire
+abrutirent
+abrutirez
+abrutiri
+abrutiriez
+abrutirions
+abrutiro
+abrutirons
+abrutiront
+abrutis
+abrutiss
+abrutissaient
+abrutissais
+abrutissait
+abrutissant
+abrutissante
+abrutissantes
+abrutissants
+abrutisse
+abrutissement
+abrutissent
+abrutisses
+abrutissez
+abrutissiez
+abrutissions
+abrutissons
+abrutit
+abrutsch
+abrutschen
+abrutschend
+abrutschendem
+abrutschenden
+abrutschender
+abrutschte
+abruza
+abruzo
+abruzzes
+abruzzese
+abruzzi
+abs
+abs-alex
+absacken
+absackend
+absackende
+absackenden
+absackender
+absackendes
+absackte
+absaddr
+absaegen
+absaegend
+absaegendem
+absaegenden
+absaegender
+absaetze
+absaetzen
+absage
+absagen
+absagend
+absagendem
+absagenden
+absagender
+absagte
+absalom
+absalons
+absamper
+absampere
+absaraka
+absaroka
+absaroke
+absarokee
+absaroki
+absarokite
+absatz
+absatzau
+absatzaussichten
+absatzausweitung
+absatzei
+absatzeinbussen
+absatzen
+absatzende
+absatzenden
+absatzer
+absatzerfahrungen
+absatzes
+absatzfa
+absatzfaehig
+absatzfaehige
+absatzfaehigen
+absatzfaehiger
+absatzfaehiges
+absatzfi
+absatzfinanzierung
+absatzfl
+absatzflaute
+absatzfo
+absatzfoerdernd
+absatzfoerderungen
+absatzge
+absatzgebiete
+absatzgebieten
+absatzgebietes
+absatzko
+absatzkonjunktur
+absatzkosten
+absatzkr
+absatzkrise
+absatzla
+absatzlaendern
+absatzma
+absatzmaerkte
+absatzmaerkten
+absatzmarkt
+absatzmarktes
+absatzmo
+absatzmo"glichkeiten
+absatzmoeglichkeiten
+absatzor
+absatzorientierte
+absatzpr
+absatzprobleme
+absatzru
+absatzrueckgang
+absatzst
+absatzsteigerung
+absatzstockung
+absatzstockungen
+absatzve
+absatzverhaeltnisse
+absatzverluste
+absatzvo
+absatzvolumen
+absatzza
+absatzzahlen
+absatzzu
+absatzzuwachs
+absaugen
+absaugend
+absaugende
+absaugenden
+absaugender
+absaugendes
+abscam
+absceso
+abscess
+abscesse
+abscessed
+abscesses
+abscessi
+abscessing
+abscession
+abscessr
+abscessroot
+abscha"t
+abscha"tzung
+abscha"tzungen
+abschabe
+abschaben
+abschabend
+abschabendem
+abschabenden
+abschabender
+abschaet
+abschaetzend
+abschaetzende
+abschaetzendem
+abschaetzender
+abschaetzendes
+abschaetzig
+abschaetzigem
+abschaetzigen
+abschaetziger
+abschaetzt
+abschaetzung
+abschaff
+abschaffen
+abschaffend
+abschaffende
+abschaffenden
+abschaffender
+abschaffendes
+abschaffung
+abschalt
+abschaltbar
+abschalte
+abschalten
+abschaltend
+abschaltendem
+abschaltenden
+abschaltender
+abschaltet
+abschaltete
+abschaltgrenze
+abschaltkriterien
+abschaltrelais
+abschaltsystem
+abschaltung
+abschaltungen
+abschaltvorga"nge
+abschaltvorgang
+abschaltvorgangs
+abschaum
+abschaums
+abscheid
+abscheiden
+abscheu
+abscheul
+abscheulich
+abscheuliche
+abscheulichem
+abscheulichen
+abscheulicher
+abscheulicherem
+abscheulicheren
+abscheulicherer
+abscheuliches
+abscheulichkeit
+abscheulichkeiten
+abscheulichste
+abscheulichstem
+abscheulichster
+abscheulichstes
+abscheus
+abschick
+abschicken
+abschickende
+abschickendem
+abschickenden
+abschickendes
+abschieb
+abschieben
+abschiebend
+abschiebende
+abschiebenden
+abschiebender
+abschiebendes
+abschiebungen
+abschied
+abschiede
+abschieds
+abschiedsbesuch
+abschiedsbrief
+abschiedsbriefen
+abschiedsbriefes
+abschiedsempfang
+abschiedsfeier
+abschiedsfeiern
+abschiedsgeschenk
+abschiedsgesuche
+abschiedsgesuchen
+abschiedsgesuches
+abschiedskuesse
+abschiedskuessen
+abschiedskuss
+abschiedsparade
+abschiedsrede
+abschiedsreden
+abschiedsschmerz
+abschiedsschmerze
+abschiedsschmerzen
+abschiedsspiel
+abschiedstrank
+abschiedswort
+abschies
+abschiessen
+abschiessend
+abschiessendem
+abschiessenden
+abschiessender
+abschirm
+abschirmdienst
+abschirmend
+abschirmende
+abschirmendem
+abschirmender
+abschirmendes
+abschirmplatte
+abschirmt
+abschirmung
+abschirmungen
+abschirmzuleitungen
+abschlac
+abschlachten
+abschlachtend
+abschlachtende
+abschlachtenden
+abschlachtender
+abschlachtendes
+abschlae
+abschlaegig
+abschlag
+abschlagend
+abschlagende
+abschlagendem
+abschlagender
+abschlagendes
+abschlagszahlung
+abschlagszahlungen
+abschlagzahlung
+abschlagzahlungen
+abschlei
+abschleifen
+abschleifende
+abschleifendem
+abschleifenden
+abschleifendes
+abschlep
+abschleppdienst
+abschleppdienste
+abschleppdiensten
+abschleppen
+abschleppend
+abschleppendem
+abschleppenden
+abschleppender
+abschleppfahrer
+abschleppfirma
+abschleppgurt
+abschleppseile
+abschleppseilen
+abschleppseiles
+abschleppte
+abschleppwagens
+abschlie
+abschliesse
+abschliessen
+abschliessend
+abschliessende
+abschliessendem
+abschliessenden
+abschliessender
+abschliesslich
+abschliesst
+abschlos
+abschlossen
+abschlue
+abschluesse
+abschlus
+abschluss
+abschlussarbeiten
+abschlussbericht
+abschlussbesprechung
+abschlusseinheit
+abschlusses
+abschlussformel
+abschlussprotokoll
+abschlusspruefung
+abschlusspruefungen
+abschlussreferat
+abschlussschnitt
+abschlusssicher
+abschlussspringen
+abschlussstecker
+abschlusstaetigkeit
+abschlussteil
+abschlusstreffen
+abschlussuntersuchung
+abschlussverhandlungen
+abschlusswiderstand
+abschlusszahlung
+abschlusszeichen
+abschlusszeugnis
+abschlusszeugnisse
+abschlusszeugnissen
+abschlussziffer
+abschmel
+abschmelzend
+abschmelzende
+abschmelzendem
+abschmelzender
+abschmelzendes
+abschmie
+abschmieren
+abschmierende
+abschmierendem
+abschmierenden
+abschmierendes
+abschmiernippel
+abschmin
+abschminken
+abschminkend
+abschminkendem
+abschminkenden
+abschminkender
+abschminkte
+abschnal
+abschnallen
+abschnei
+abschneide
+abschneiden
+abschneider
+abschneidet
+abschneidevorrichtung
+abschneidvorrichtung
+abschnit
+abschnitt
+abschnitte
+abschnitten
+abschnitts
+abschnue
+abschnueren
+abschnuerend
+abschnuerendem
+abschnuerenden
+abschnuerender
+abschnuerung
+abschoep
+abschoepfen
+abschoepfend
+abschoepfendem
+abschoepfenden
+abschoepfender
+abschoepfung
+abschoepfungen
+abschoss
+abschott
+abschottklappen
+abschottung
+abschottzylinder
+abschrae
+abschraegen
+abschraegend
+abschraegendem
+abschraegenden
+abschraegender
+abschrau
+abschraubbarem
+abschrauben
+abschraubend
+abschraubende
+abschraubenden
+abschraubender
+abschraubendes
+abschrec
+abschreckend
+abschreckende
+abschreckendem
+abschreckender
+abschreckendes
+abschreckung
+abschreckungseffekt
+abschreckungserfolg
+abschreckungsmittel
+abschreckungsmitteln
+abschreckungsmittels
+abschreckungswaffen
+abschrei
+abschreibegrenze
+abschreiben
+abschreibende
+abschreibendem
+abschreibenden
+abschreibendes
+abschreiber
+abschreibers
+abschreibung
+abschreibungen
+abschreibungsdauer
+abschreibungserfordernisse
+abschreibungsgeschaeft
+abschreibungshotels
+abschreibungsmoeglichkeiten
+abschreibungsvolumen
+abschreiten
+abschreitend
+abschreitendem
+abschreitenden
+abschreitender
+abschrif
+abschrift
+abschriften
+abschuer
+abschuerfen
+abschuerfend
+abschuerfende
+abschuerfenden
+abschuerfender
+abschuerfendes
+abschuerfung
+abschues
+abschuesse
+abschuessen
+abschuessige
+abschuessigem
+abschuessigen
+abschuessiges
+abschuet
+abschuetteln
+abschuettelnd
+abschuettelndem
+abschuettelnden
+abschuettelnder
+abschuettelte
+abschuft
+abschuften
+abschuftend
+abschuftende
+abschuftender
+abschuftendes
+abschuss
+abschussbasis
+abschussrampe
+abschussvorrichtungen
+abschwae
+abschwaechen
+abschwaechende
+abschwaechendem
+abschwaechenden
+abschwaechendes
+abschwaecht
+abschwaechung
+abschwaechungen
+abschwei
+abschweifen
+abschweifend
+abschweifendem
+abschweifenden
+abschweifender
+abschwen
+abschwenken
+abschwenkend
+abschwenkende
+abschwenkenden
+abschwenkender
+abschwenkendes
+abschwoe
+abschwoeren
+abschwoerende
+abschwoerendem
+abschwoerenden
+abschwoerendes
+abscind
+abscis
+abscisa
+abscise
+abscised
+abscises
+abscisin
+abscising
+abscisio
+abscisio`n
+abscision
+absciss
+abscissa
+abscissae
+abscissan
+abscissas
+abscisse
+abscissen
+abscisses
+abscissi
+abscission
+abscissions
+absconce
+abscond
+absconde
+absconded
+abscondedly
+abscondence
+absconder
+absconders
+abscondi
+abscondidamente
+absconding
+absconds
+absconsa
+abscoulo
+abscoulomb
+abscura
+abscuro
+absecon
+absegeln
+absegelnd
+absegelnde
+absegelndem
+absegelnder
+absegelndes
+absehbar
+absehbarem
+absehbaren
+absehbarer
+absehe
+absehen
+absehend
+absehendem
+absehenden
+absehender
+abseifen
+abseifend
+abseifende
+abseifenden
+abseifender
+abseifendes
+abseilen
+abseilend
+abseilende
+abseilendem
+abseilender
+abseilendes
+abseits
+abseitsp
+abseitsposition
+abseitss
+abseitsstehen
+abseitsstellung
+absence
+absences
+absencia
+absenden
+absendend
+absendendem
+absendenden
+absendender
+absender
+absenders
+absendun
+absendung
+absenken
+absenkun
+absenkung
+absent
+absenta
+absentai
+absentaient
+absentais
+absentait
+absentan
+absentant
+absentarse
+absentat
+absentation
+absente
+absente'
+absente'e
+absente'es
+absente'isme
+absente'iste
+absente'istes
+absente's
+absente`
+absente`rent
+absented
+absentee
+absenteeism
+absentees
+absenteeship
+absentei
+absenteisme
+absenten
+absentent
+absenter
+absentera
+absenterai
+absenteraient
+absenterais
+absenterait
+absenteras
+absenterez
+absenteriez
+absenterions
+absenterons
+absenteront
+absenters
+absentes
+absentez
+absentia
+absentie
+absentielijst
+absentielijsten
+absenties
+absentiez
+absentin
+absenting
+absentio
+absentions
+absentismo
+absently
+absentme
+absentment
+absentmi
+absentminded
+absentmindedly
+absentmindedness
+absentne
+absentness
+absenton
+absentons
+absents
+absentst
+absetzba
+absetzbar
+absetzbare
+absetzbarem
+absetzbarer
+absetzbares
+absetzbe
+absetzbewegung
+absetzen
+absetzende
+absetzendem
+absetzenden
+absetzendes
+absetzt
+absetzte
+absetzug
+absetzun
+absetzung
+absetzungsantrag
+absfarad
+absharin
+abshenry
+absi
+absicher
+absichern
+absichernde
+absicherndem
+absichernden
+absicherndes
+absichert
+absicherung
+absicht
+absichte
+absichten
+absichtl
+absichtlich
+absichtlichem
+absichtlichen
+absichtlicher
+absichtlichkeit
+absichts
+absichtserkla"rung
+absichtserklaerungen
+absichtsvoll
+absid
+absidal
+abside
+absieht
+absingen
+absinken
+absinkenden
+absinkt
+absint
+absinten
+absinth
+absinthe
+absinthes
+absinthi
+absinthial
+absinthian
+absinthiate
+absinthic
+absinthin
+absinthine
+absinthism
+absinthismic
+absinthium
+absintho
+absinthol
+absinths
+absintio
+absit
+absitzen
+absitzend
+absitzende
+absitzendem
+absitzender
+absitzendes
+absmho
+absohm
+absolon
+absolu
+absolucio`n
+absolue
+absolues
+absolume
+absolument
+absolus
+absolusj
+absolusjon
+absolusjonen
+absolut
+absoluta
+absolutamente
+absolute
+absolutely
+absolutem
+absoluten
+absoluteness
+absoluter
+absolutes
+absolutest
+absoluteste
+absolutesten
+absoluti
+absolutie
+absolution
+absolutions
+absolutism
+absolutisme
+absolutismen
+absolutismes
+absolutismo
+absolutismus
+absolutist
+absolutista
+absolutisten
+absolutistic
+absolutistically
+absolutistischen
+absolutistiske
+absolutists
+absolutive
+absolutization
+absolutize
+absoluto
+absolutoria
+absolutorio
+absolutory
+absolutp
+absolutposition
+absolutt
+absolutte
+absolutter
+absoluttet
+absoluut
+absolv
+absolvab
+absolvable
+absolvat
+absolvatory
+absolve
+absolved
+absolvederas
+absolvedor
+absolvedora
+absolvee
+absolveer
+absolveerde
+absolveerden
+absolveert
+absolven
+absolvent
+absolvente
+absolventen
+absolventin
+absolver
+absolveren
+absolvers
+absolves
+absolvie
+absolviente
+absolvieren
+absolvierend
+absolvierende
+absolvierenden
+absolvierender
+absolvierendes
+absolviert
+absolvierte
+absolviertem
+absolvierter
+absolviertes
+absolviertest
+absolvierung
+absolvimiento
+absolvin
+absolving
+absolvit
+absolvitor
+absolvitory
+absonant
+absonder
+absonderlich
+absonderliche
+absonderlichem
+absonderlicher
+absonderlichere
+absonderlicherem
+absonderlicherer
+absonderlicheres
+absonderliches
+absonderlichstem
+absonderlichsten
+absonderlichster
+absondern
+absondernd
+absondernde
+absondernder
+absonderndes
+absonderte
+absonderungen
+absonous
+absorb
+absorba
+absorbab
+absorbability
+absorbable
+absorbai
+absorbaient
+absorbais
+absorbait
+absorban
+absorbant
+absorbante
+absorbantes
+absorbants
+absorbat
+absorbatex
+absorbe
+absorbe'
+absorbe'e
+absorbe'es
+absorbe's
+absorbe`
+absorbe`rent
+absorbed
+absorbedly
+absorbedness
+absorbee
+absorbeer
+absorbeerde
+absorbeerden
+absorbeert
+absorbef
+absorbefacient
+absorben
+absorbencia
+absorbencies
+absorbency
+absorbent
+absorbente
+absorbents
+absorber
+absorbera
+absorberai
+absorberaient
+absorberais
+absorberait
+absorberas
+absorbere
+absorberen
+absorberer
+absorberes
+absorberez
+absorberiez
+absorberions
+absorberons
+absorberont
+absorbers
+absorbert
+absorbes
+absorbez
+absorbible
+absorbie
+absorbiere
+absorbieren
+absorbierend
+absorbierendem
+absorbierenden
+absorbierendes
+absorbiert
+absorbierte
+absorbiertem
+absorbierter
+absorbiertes
+absorbiertest
+absorbiez
+absorbimiento
+absorbin
+absorbing
+absorbingly
+absorbio
+absorbions
+absorbit
+absorbition
+absorbon
+absorbons
+absorbs
+absorbti
+absorbtion
+absorcio`n
+absorpsj
+absorpsjon
+absorpsjonen
+absorpt
+absorpta
+absorptance
+absorpti
+absorptie
+absorptiometer
+absorptiometric
+absorption
+absorptions
+absorptive
+absorptively
+absorptiveness
+absorptivity
+absorta
+absortar
+absorto
+absoudre
+absoute
+abspalte
+abspaltend
+abspaltende
+abspaltendem
+abspaltender
+abspaltendes
+abspanne
+abspannen
+abspannw
+abspannwerke
+abspecke
+abspecken
+abspeich
+abspeichern
+abspeichert
+abspeise
+abspeisen
+abspeisende
+abspeisendem
+abspeisenden
+abspeisendes
+abspenst
+abspenstig
+abspenstige
+abspenstigen
+abspenstiger
+abspenstiges
+absperre
+absperren
+absperrend
+absperrende
+absperrenden
+absperrender
+absperrendes
+absperrm
+absperrmassnahmen
+absperru
+absperrung
+abspiege
+abspiegeln
+abspiegelnd
+abspiegelnde
+abspiegelnden
+abspiegelnder
+abspiegelndes
+abspiele
+abspielen
+abspielend
+abspielende
+abspielenden
+abspielender
+abspielendes
+abspielt
+abspielte
+abspielten
+absplitt
+absplittern
+absplitternde
+absplitterndem
+absplitternden
+absplitterndes
+absprach
+absprache
+absprachen
+absprang
+absprangen
+absprech
+absprechen
+absprechend
+absprechende
+absprechendem
+absprechender
+absprechendes
+abspreng
+absprengbaren
+absprich
+abspricht
+abspring
+abspringend
+abspringende
+abspringendem
+abspringender
+abspringendes
+abspruen
+abspruenge
+abspruengen
+absprung
+absprunghaefen
+absprungs
+abspuele
+abspuelen
+abspuelend
+abspuelende
+abspuelenden
+abspuelender
+abspuelendes
+absquatu
+absquatulate
+absta"nd
+absta"nde
+absta"nden
+abstaend
+abstaende
+abstain
+abstaine
+abstained
+abstainer
+abstainers
+abstaini
+abstaining
+abstainm
+abstainment
+abstains
+abstakte
+abstamme
+abstammen
+abstammende
+abstammendem
+abstammenden
+abstammendes
+abstammu
+abstammung
+abstammungslehre
+abstammungslehren
+abstand
+abstandh
+abstandhalter
+abstands
+abstandsberechnung
+abstandsbereich
+abstandsecho
+abstandsgrenzen
+abstandspla"ttchen
+abstandswerte
+abstatte
+abstatten
+abstattend
+abstattendem
+abstattenden
+abstattender
+abstattet
+abstattete
+abstaube
+abstauben
+abstaubende
+abstaubendem
+abstaubenden
+abstaubendes
+absteche
+abstechen
+abstechend
+abstechendem
+abstechenden
+abstechender
+abstecher
+abstechern
+abstechers
+abstecke
+abstecken
+absteckend
+absteckende
+absteckenden
+absteckender
+absteckendes
+abstehen
+abstehend
+abstehende
+abstehendem
+abstehender
+abstehendes
+absteige
+absteigen
+absteigende
+absteigendem
+absteigenden
+absteigendes
+absteigt
+abstelle
+abstellen
+abstellende
+abstellendem
+abstellenden
+abstellendes
+abstellf
+abstellflaechen
+abstellg
+abstellgleis
+abstellgleisen
+abstellgleises
+abstelli
+abstelliger
+abstellk
+abstellkammer
+abstellr
+abstellraum
+abstellt
+abstellu
+abstellung
+abstellz
+abstellzeit
+abstemia
+abstemio
+abstemious
+abstemiously
+abstemiousness
+abstempe
+abstempelnd
+abstempelnde
+abstempelndem
+abstempelnder
+abstempelndes
+abstenai
+abstenaient
+abstenais
+abstenait
+abstenan
+abstenant
+abstencio`n
+abstencionismo
+abstencionista
+abstener
+abstenez
+abstenie
+absteniez
+abstenio
+abstenions
+abstenir
+abstenon
+abstenons
+abstenti
+abstention
+abstentionism
+abstentionist
+abstentionnisme
+abstentionniste
+abstentionnistes
+abstentions
+abstentious
+abstenu
+abstenue
+abstenues
+abstenus
+absteppe
+absteppen
+absteppende
+absteppendem
+absteppenden
+absteppendes
+absterbe
+absterben
+absterbend
+absterbendem
+absterbenden
+absterbender
+absterge
+abstergent
+abstergente
+absterger
+abstersi
+abstersio`n
+abstersion
+abstersiva
+abstersive
+abstersiveness
+abstersivo
+absterti
+abstertion
+absticht
+abstiege
+abstiegen
+abstiegs
+abstiegsgefaehrdeten
+abstiegskampf
+abstiegskandidaten
+abstiegsreif
+abstiend
+abstiendra
+abstiendrai
+abstiendraient
+abstiendrais
+abstiendrait
+abstiendras
+abstiendrez
+abstiendriez
+abstiendrions
+abstiendrons
+abstiendront
+abstienn
+abstienne
+abstiennent
+abstiennes
+abstiens
+abstient
+abstimme
+abstimmend
+abstimmende
+abstimmendem
+abstimmender
+abstimmendes
+abstimmu
+abstimmung
+abstimmungen
+abstimmungsberechtigten
+abstimmungsergebnis
+abstimmungsfrage
+abstimmungsfragen
+abstimmungsmechanismus
+abstimmungsmodus
+abstimmungsniederlage
+abstimmungsu"bertragung
+abstimmungsunterschied
+abstimun
+abstimung
+abstinen
+abstinence
+abstinencia
+abstinency
+abstinens
+abstinent
+abstinente
+abstinentem
+abstinentemente
+abstinenten
+abstinenter
+abstinentes
+abstinential
+abstinentie
+abstinentiedag
+abstinentiedagen
+abstinently
+abstinents
+abstinentst
+abstinenz
+abstinre
+abstinrent
+abstint
+abstoppe
+abstoppen
+abstoppend
+abstoppende
+abstoppenden
+abstoppender
+abstoppendes
+abstosse
+abstossen
+abstossend
+abstossende
+abstossendem
+abstossender
+abstossendere
+abstossenderem
+abstossenderer
+abstossenderes
+abstossendes
+abstossendstem
+abstossendsten
+abstossendster
+abstosses
+abstossu
+abstossung
+abstraccio`n
+abstract
+abstracta
+abstracte
+abstracted
+abstractedly
+abstractedness
+abstracter
+abstracters
+abstractie
+abstractieniveau
+abstracties
+abstracting
+abstraction
+abstractional
+abstractionism
+abstractionist
+abstractionists
+abstractions
+abstractionsidered
+abstractitious
+abstractiva
+abstractivamente
+abstractive
+abstractively
+abstractiveness
+abstractivo
+abstractly
+abstractness
+abstracto
+abstractor
+abstractors
+abstracts
+abstractst
+abstraer
+abstrahe
+abstraheer
+abstraheerde
+abstraheerden
+abstraheert
+abstrahent
+abstrahere
+abstraheren
+abstraherte
+abstrahi
+abstrahieren
+abstrahierend
+abstrahierende
+abstrahierenden
+abstrahierender
+abstrahierendes
+abstrahiert
+abstrahierte
+abstrahiertem
+abstrahierter
+abstrahiertes
+abstrahiertest
+abstrahl
+abstrahlcharakteristik
+abstrahlen
+abstrahlwinkel
+abstrahlwinkels
+abstraie
+abstraient
+abstraies
+abstrair
+abstraira
+abstrairai
+abstrairaient
+abstrairais
+abstrairait
+abstrairas
+abstraire
+abstrairez
+abstrairiez
+abstrairions
+abstrairons
+abstrairont
+abstrais
+abstrait
+abstraite
+abstraitement
+abstraites
+abstraits
+abstraks
+abstraksjon
+abstraksjonen
+abstraksjoner
+abstrakt
+abstrakta
+abstrakte
+abstrakten
+abstrakter
+abstraktere
+abstrakteren
+abstraktet
+abstraktion
+abstraktionen
+abstraktions
+abstraktionsgrad
+abstraktionsniveau
+abstraya
+abstrayaient
+abstrayais
+abstrayait
+abstrayant
+abstraye
+abstrayez
+abstrayi
+abstrayiez
+abstrayions
+abstrayo
+abstrayons
+abstreic
+abstreichen
+abstreichend
+abstreichende
+abstreichenden
+abstreichender
+abstreichendes
+abstreif
+abstreifend
+abstreifende
+abstreifendem
+abstreifender
+abstreifendes
+abstreifer
+abstreifers
+abstreit
+abstreiten
+abstreitende
+abstreitendem
+abstreitenden
+abstreitendes
+abstrich
+abstriche
+abstrichen
+abstrict
+abstricted
+abstriction
+abstricts
+abstrus
+abstrusa
+abstruse
+abstrusely
+abstruseness
+abstruser
+abstrusest
+abstrusi
+abstrusion
+abstrusity
+abstruso
+abstu"rz
+abstu"rze
+abstu"rzen
+abstu"tz
+abstu"tzung
+abstuerz
+abstuerze
+abstuerzen
+abstuerzende
+abstuerzendem
+abstuerzenden
+abstuerzendes
+abstuerzte
+abstuetz
+abstuetzen
+abstuetzende
+abstuetzendem
+abstuetzenden
+abstuetzendes
+abstuetzung
+abstufen
+abstufende
+abstufendem
+abstufenden
+abstufendes
+abstufun
+abstufung
+abstufungen
+abstumpf
+abstumpfen
+absturz
+absturze
+absturzes
+absturzg
+absturzgebiet
+absturzo
+absturzort
+absturzu
+absturzursache
+absuchen
+absuchend
+absuchendem
+absuchenden
+absuchender
+absucht
+absuchte
+absuchten
+absud
+absuden
+absudes
+absuelta
+absuelto
+absume
+absumpti
+absumption
+absurd
+absurda
+absurde
+absurdem
+absurden
+absurder
+absurderem
+absurderen
+absurderer
+absurdes
+absurdest
+absurdeste
+absurdestem
+absurdester
+absurdestes
+absurdidad
+absurdis
+absurdist
+absurdisten
+absurdit
+absurditaet
+absurdite'
+absurdite's
+absurditeit
+absurditeiten
+absurditet
+absurdities
+absurdity
+absurdly
+absurdne
+absurdness
+absurdo
+absurds
+absurdst
+absurdum
+absurt
+absvolt
+absyrtus
+abszess
+abszesse
+abszessen
+abt
+abtasten
+abtastend
+abtastende
+abtastendem
+abtastender
+abtastendes
+abtastet
+abtastgr
+abtastgrenze
+abtasthe
+abtasthebels
+abtastra
+abtastrate
+abtastraten
+abtastun
+abtastung
+abtastungen
+abtbooks
+abtei
+abteien
+abteil
+abteilba
+abteilbar
+abteile
+abteilen
+abteilend
+abteilende
+abteilenden
+abteilender
+abteilendes
+abteilfe
+abteilfenster
+abteilun
+abteilung
+abteilungen
+abteilungn
+abteilungsleiter
+abteilungsleiterin
+abteilungsleitern
+abteilungsleiters
+abteilungsstufe
+abten
+abtermin
+abterminal
+abtes
+abteufen
+abthain
+abthainr
+abthainrie
+abthainry
+abthanag
+abthanage
+abtoeten
+abtoetend
+abtoetende
+abtoetenden
+abtoetender
+abtoetendes
+abtraegl
+abtraeglich
+abtraegliche
+abtraeglichen
+abtraeglicher
+abtraeglichere
+abtraeglicheren
+abtraeglicherer
+abtraeglicheres
+abtraeglichste
+abtraeglichstem
+abtraeglichsten
+abtraeglichstes
+abtragen
+abtragend
+abtragende
+abtragendem
+abtragender
+abtragendes
+abtransp
+abtransport
+abtransportierbarer
+abtrat
+abtreibe
+abtreiben
+abtreibend
+abtreibendem
+abtreibenden
+abtreibender
+abtreibu
+abtreibung
+abtreibungen
+abtreibungsparagraph
+abtreibungsparagraphen
+abtreibungspille
+abtrenne
+abtrennen
+abtrennend
+abtrennende
+abtrennenden
+abtrennender
+abtrennendes
+abtrennu
+abtrennungen
+abtreten
+abtretend
+abtretende
+abtretendem
+abtretender
+abtretendes
+abtreter
+abtretern
+abtretun
+abtretung
+abtretungen
+abtrieb
+abtritte
+abtritten
+abtritts
+abtrockn
+abtrocknen
+abtrocknende
+abtrocknendem
+abtrocknenden
+abtrocknendes
+abtropfe
+abtropfen
+abtropfend
+abtropfendem
+abtropfenden
+abtropfender
+abtruenn
+abtruennig
+abtruennige
+abtruennigen
+abtruenniger
+abtruenniges
+abtruennigkeit
+abtun
+abtupfen
+abtupfend
+abtupfendem
+abtupfenden
+abtupfender
+abu
+abu\olar
+abu\uelada
+abu\uelado
+abu\uelar
+abu`lica
+abu`lico
+abua
+abuan
+abuaodua
+abuaodual
+abubakar
+abubble
+abubilla
+abubo
+abubukar
+abucco
+abuchear
+abucheo
+abuel
+abuela
+abuelastra
+abuelastro
+abuelo
+abuhada
+abuhado
+abuhamiento
+abuhardillada
+abuhardillado
+abui
+abuildin
+abuilding
+abuis
+abuizen
+abuja
+abuje
+abujhmad
+abujhmadia
+abujhmar
+abujhmaria
+abujmari
+abujmaria
+abujmariya
+abuju
+abukeia
+abuku
+abukuma
+abukumak
+abukuzen
+abul
+abulaga
+abulagar
+abulas
+abuldugu
+abule
+abulela
+abulense
+abulia
+abulic
+abuloma
+abuloman
+abulomania
+abultada
+abultado
+abultamiento
+abultar
+abumanga
+abumatsu
+abumatu
+abumi
+abun
+abuna
+abunage
+abunagen
+abunai
+abunakka
+abunaku
+abundada
+abundadamente
+abundado
+abundamiento
+abundanc
+abundance
+abundances
+abundancia
+abundancial
+abundancy
+abundant
+abundante
+abundantemente
+abundanti`simamente
+abundantia
+abundantly
+abundar
+abundo
+abundosa
+abundosamente
+abundoso
+abung
+abunomar
+abur
+abura
+aburaage
+aburaase
+aburaboz
+aburabozu
+aburadai
+aburaden
+aburader
+aburae
+aburagam
+aburagi
+aburahi
+aburajim
+aburakas
+aburakaw
+aburake
+aburakko
+aburami
+aburamus
+aburana
+aburar
+aburasas
+aburasho
+aburatsu
+aburatu
+aburazak
+aburazem
+aburban
+abure
+aburelada
+aburelado
+aburguesamiento
+aburguesarse
+aburi
+aburida
+aburidas
+aburlin
+aburrada
+aburrado
+aburrarse
+aburricio`n
+aburrida
+aburridamente
+aburrido
+aburridor
+aburridora
+aburrimiento
+aburrir
+aburst
+aburteil
+aburteilen
+aburteilend
+aburteilende
+aburteilenden
+aburteilender
+aburteilendes
+aburteilung
+aburton
+aburujar
+abus
+abusa
+abusable
+abusador
+abusadora
+abusage
+abusai
+abusaien
+abusaient
+abusais
+abusait
+abusammo
+abusando
+abusano
+abusant
+abusante
+abusar
+abusare
+abusaron
+abusarono
+abusasse
+abusassero
+abusassi
+abusassimo
+abusaste
+abusasti
+abusata
+abusate
+abusati
+abusato
+abusava
+abusavam
+abusavamo
+abusavan
+abusavano
+abusavat
+abusavate
+abusavi
+abusavo
+abuse
+abuse'
+abuse'e
+abuse'es
+abuse's
+abuse`re
+abuse`rent
+abused
+abusedly
+abusee
+abuseful
+abusefully
+abusefulness
+abusent
+abuser
+abusera
+abuserai
+abuseraient
+abuserais
+abuserait
+abuseran
+abuseranno
+abuseras
+abusereb
+abuserebbe
+abuserei
+abuserem
+abuseremmo
+abuseremo
+abuseres
+abusereste
+abuseresti
+abuseret
+abuserete
+abuserez
+abuserie
+abuseriez
+abuserio
+abuserions
+abusero
+abuseron
+abuserons
+abuseront
+abusers
+abuses
+abusez
+abusi
+abusiamo
+abusiate
+abusief
+abusieve
+abusievelijk
+abusiez
+abusif
+abusifs
+abusing
+abusino
+abusio`n
+abusion
+abusionera
+abusionero
+abusions
+abusious
+abusiva
+abusivamente
+abusive
+abusivel
+abusively
+abusivem
+abusivement
+abusiven
+abusiveness
+abusives
+abusivi
+abusivo
+abuso
+abuso`n
+abusona
+abusons
+abusutor
+abut
+abuta
+abutilon
+abutment
+abutments
+abuts
+abuttal
+abuttals
+abutted
+abutter
+abutters
+abutting
+abuya
+abuzarse
+abuzz
+abv
+abverdie
+abverdienend
+abverdienende
+abverdienendem
+abverdienender
+abverdienendes
+abverdient
+abverdientem
+abverdienten
+abverdienter
+abverlan
+abverlangen
+abverlangend
+abverlangende
+abverlangenden
+abverlangender
+abverlangendes
+abverlangt
+abverlangte
+abverlangtem
+abverlangten
+abverlangtes
+abvolt
+abw
+abwa"rts
+abwa"rtsbewegung
+abwab
+abwaegen
+abwaegend
+abwaegendem
+abwaegenden
+abwaegender
+abwaegt
+abwaegun
+abwaegung
+abwaehlb
+abwaehlbar
+abwaelze
+abwaelzen
+abwaelzende
+abwaelzendem
+abwaelzenden
+abwaelzendes
+abwaelzu
+abwaelzung
+abwaerts
+abwaertsbewegung
+abwaertsrevision
+abwaertstrend
+abwaesse
+abwaessern
+abwandel
+abwandelbar
+abwandelbare
+abwandelbaren
+abwandelbarer
+abwandelbares
+abwandelnd
+abwandelnde
+abwandelndem
+abwandelnder
+abwandelndes
+abwander
+abwandern
+abwandernde
+abwanderndem
+abwandernden
+abwanderndes
+abwanderung
+abwanderungen
+abwandlu
+abwandlung
+abwandte
+abwarten
+abwartende
+abwartendem
+abwartenden
+abwartendes
+abwartenwollen
+abwartet
+abwarteten
+abwaschb
+abwaschbare
+abwaschbarem
+abwaschbaren
+abwaschbares
+abwaschbecken
+abwaschbeckens
+abwasche
+abwaschen
+abwaschend
+abwaschendem
+abwaschenden
+abwaschender
+abwasser
+abwassers
+abwassertechnik
+abwe
+abwechse
+abwechseln
+abwechselnd
+abwechselnde
+abwechselnden
+abwechselnder
+abwechselndes
+abwechselung
+abwechsl
+abwechslung
+abwechslungen
+abwechslungsreiche
+abwechslungsreichem
+abwechslungsreichen
+abwechslungsreichere
+abwechslungsreicherem
+abwechslungsreicheren
+abwechslungsreicheres
+abwechslungsreiches
+abwechslungsreichste
+abwechslungsreichsten
+abwechslungsreichster
+abwechslungsreichstes
+abwechslungsweisem
+abwechslungsweisen
+abwechslungsweiser
+abweg
+abwege
+abwegig
+abwegige
+abwegigem
+abwegiger
+abwegigere
+abwegigerem
+abwegigerer
+abwegigeres
+abwegiges
+abwegigs
+abwegigstem
+abwegigsten
+abwegigster
+abwegs
+abwehr
+abwehrau
+abwehraufgabe
+abwehrbe
+abwehrbereitschaft
+abwehrbu
+abwehrbuch
+abwehrch
+abwehrchef
+abwehrdi
+abwehrdienstes
+abwehrdienststellen
+abwehren
+abwehrend
+abwehrende
+abwehrenden
+abwehrender
+abwehrendes
+abwehrfe
+abwehrfehler
+abwehrka
+abwehrkaempfe
+abwehrkr
+abwehrkraefte
+abwehrma
+abwehrmauer
+abwehrmo
+abwehrmoeglichkeit
+abwehror
+abwehrorgan
+abwehrorganen
+abwehrpo
+abwehrpotential
+abwehrri
+abwehrriegel
+abwehrsc
+abwehrschlacht
+abwehrsp
+abwehrspielers
+abwehrst
+abwehrstelle
+abwehrstellen
+abwehrstoffe
+abwehrstoffen
+abwehrstoffes
+abwehrsy
+abwehrsystems
+abweiche
+abweichen
+abweichend
+abweichende
+abweichendem
+abweichender
+abweichendes
+abweicht
+abweichu
+abweichung
+abweichungen
+abweise
+abweisen
+abweisend
+abweisende
+abweisendem
+abweisender
+abweisendes
+abweisun
+abweisung
+abweisungen
+abwenden
+abwendende
+abwendendem
+abwendenden
+abwendendes
+abwendet
+abwendun
+abwendung
+abwendungen
+abwerben
+abwerbun
+abwerbung
+abwerfen
+abwerfend
+abwerfende
+abwerfendem
+abwerfender
+abwerfendes
+abwerte
+abwerten
+abwertende
+abwertendem
+abwertenden
+abwertendes
+abwertun
+abwertungen
+abwertungsanhaengern
+abwertungslaender
+abwertungsspanne
+abwesend
+abwesende
+abwesenden
+abwesender
+abwesendes
+abwesenh
+abwesenheit
+abwesenheiten
+abwetee
+abwickel
+abwickeln
+abwickelnd
+abwickelnde
+abwickelnden
+abwickelnder
+abwickelndes
+abwickelrichtung
+abwickelt
+abwickelung
+abwicklu
+abwicklung
+abwicklungen
+abwiegen
+abwiegend
+abwiegende
+abwiegenden
+abwiegender
+abwiegendes
+abwinken
+abwinkend
+abwinkende
+abwinkendem
+abwinkender
+abwinkendes
+abwinkte
+abwirtsc
+abwirtschaften
+abwirtschaftend
+abwirtschaftende
+abwirtschaftenden
+abwirtschaftender
+abwirtschaftendes
+abwische
+abwischend
+abwischende
+abwischendem
+abwischender
+abwischendes
+abwischt
+abwischte
+abwor
+abwrackg
+abwrackgelaende
+abwu"rge
+abwu"rgen
+abwuerfe
+abwuerfen
+abwuerge
+abwuergen
+abwuergende
+abwuergendem
+abwuergenden
+abwuergendes
+abwurf
+abwurfqu
+abwurfquote
+abx
+abxazo
+aby
+abyan
+abyar
+abyeccio`n
+abyecta
+abyecto
+abyes
+abysm
+abysmal
+abysmall
+abysmally
+abysms
+abyss
+abyssa
+abyssal
+abysse
+abysses
+abyssini
+abyssinia
+abyssinian
+abyssinians
+abyssobe
+abyssobenthonic
+abyssoli
+abyssolith
+abyssope
+abyssopelagic
+abz
+abza"hle
+abza"hlen
+abzaehle
+abzaehlen
+abzaehlend
+abzaehlende
+abzaehlenden
+abzaehlender
+abzaehlendes
+abzaeune
+abzaeunend
+abzaeunende
+abzaeunendem
+abzaeunender
+abzaeunendes
+abzahlen
+abzahlend
+abzahlende
+abzahlenden
+abzahlender
+abzahlendes
+abzahlun
+abzahlung
+abzahlungsgeschaeft
+abzahlungsgeschaefte
+abzahlungsgeschaeften
+abzahlungsgesetz
+abzahlungskaeufe
+abzahlungskaeufen
+abzahlungskaufes
+abzahlungsvertraege
+abzapfen
+abzapfend
+abzapfende
+abzapfenden
+abzapfender
+abzapfendes
+abzehrun
+abzehrung
+abzeiche
+abzeichen
+abzeichenaktion
+abzeichens
+abzeichn
+abzeichnen
+abzeichnend
+abzeichnende
+abzeichnenden
+abzeichnender
+abzeichnendes
+abzeichnete
+abzeichneten
+abzeihen
+abzeihenden
+abzgl
+abzhui
+abziehbi
+abziehbilder
+abziehbildern
+abziehbildes
+abziehe
+abziehen
+abziehende
+abziehendem
+abziehenden
+abzieht
+abzielen
+abzielend
+abzielendem
+abzielenden
+abzielender
+abzielt
+abzielte
+abzog
+abzu"gli
+abzu"glich
+abzua"nd
+abzua"ndern
+abzuaend
+abzuaendern
+abzuarbe
+abzuarbeiten
+abzubaue
+abzubauen
+abzubild
+abzubilden
+abzubloc
+abzublocken
+abzubrec
+abzubrechen
+abzubrin
+abzubringen
+abzudeck
+abzudecken
+abzudrae
+abzudraengen
+abzudreh
+abzudrehen
+abzuege
+abzuegen
+abzuegli
+abzueglich
+abzueglichem
+abzueglichen
+abzueglicher
+abzuerke
+abzuerkennen
+abzufang
+abzufangen
+abzufeie
+abzufeiern
+abzufeue
+abzufeuern
+abzufind
+abzufinden
+abzufrag
+abzufragen
+abzufu"h
+abzufu"hren
+abzufueh
+abzufuehren
+abzug
+abzugehe
+abzugehen
+abzuges
+abzugewi
+abzugewinnen
+abzugras
+abzugrasen
+abzugren
+abzugrenzen
+abzugs
+abzugsbu
+abzugsbuegel
+abzugsbuegels
+abzugsfa
+abzugsfaehig
+abzugsfaehige
+abzugsfaehigen
+abzugsfaehiger
+abzugsfaehiges
+abzugsfaehigkeit
+abzugsfe
+abzugsfenster
+abzugshe
+abzugshebel
+abzugsve
+abzugsverfahren
+abzuha"n
+abzuha"ngen
+abzuhalt
+abzuhalten
+abzuhebe
+abzuheben
+abzuhoer
+abzuhoeren
+abzuhole
+abzuholen
+abzujage
+abzujagen
+abzuklin
+abzuklingen
+abzuklop
+abzuklopfen
+abzuknab
+abzuknabbern
+abzuku"r
+abzuku"rzen
+abzukueh
+abzukuehlen
+abzulass
+abzulassen
+abzulauf
+abzulaufen
+abzulege
+abzulegen
+abzulehn
+abzulehnen
+abzuleit
+abzuleiten
+abzulenk
+abzulenken
+abzulese
+abzulesen
+abzulief
+abzuliefern
+abzuloes
+abzuloesen
+abzumild
+abzumildern
+abzunehm
+abzunehmen
+abzurate
+abzuraten
+abzurech
+abzurechnen
+abzureis
+abzureisen
+abzurieg
+abzuriegeln
+abzuring
+abzuringen
+abzuruec
+abzuruecken
+abzurund
+abzurunden
+abzusage
+abzusagen
+abzusahn
+abzusahnen
+abzuscha
+abzuscha"tzen
+abzuschaetzen
+abzuschaffen
+abzuschalten
+abzuschaltenden
+abzuschaltendes
+abzusche
+abzuscheiden
+abzuschi
+abzuschicken
+abzuschieben
+abzuschl
+abzuschlagen
+abzuschleifen
+abzuschliessen
+abzuschn
+abzuscho
+abzuschotten
+abzuschr
+abzuschreiben
+abzuschu
+abzuschu"tteln
+abzuschuetteln
+abzuschw
+abzuschwaechen
+abzuschwenken
+abzusehe
+abzusehen
+abzusehender
+abzusend
+abzusenden
+abzusetz
+abzusetzen
+abzusich
+abzusichern
+abzusink
+abzusinken
+abzusond
+abzusondern
+abzuspei
+abzuspeichern
+abzusper
+abzusperren
+abzuspre
+abzusprechen
+abzustat
+abzustatten
+abzusteh
+abzustehen
+abzustel
+abzustellen
+abzustim
+abzustimmen
+abzustimmenden
+abzustos
+abzustossen
+abzustre
+abzustreifen
+abzustum
+abzustumpfen
+abzutast
+abzutasten
+abzutoet
+abzutoeten
+abzutran
+abzutransportieren
+abzutren
+abzutrennen
+abzutret
+abzutreten
+abzutroc
+abzutrocknen
+abzutun
+abzuwaeg
+abzuwaegen
+abzuwael
+abzuwaelzen
+abzuwart
+abzuwarten
+abzuwehr
+abzuwehren
+abzuweic
+abzuweichen
+abzuwend
+abzuwenden
+abzuwendende
+abzuwerf
+abzuwerfen
+abzuwick
+abzuwickeln
+abzuwieg
+abzuwiegen
+abzuwirt
+abzuwirtschaften
+abzuzahl
+abzuzahlen
+abzuzeic
+abzuzeichnen
+abzuzieh
+abzuziehen
+abzweige
+abzweigen
+abzweigende
+abzweigendem
+abzweigenden
+abzweigendes
+abzweigt
+abzweigte
+abzweigu
+abzweigung
+abzwicke
+abzwicken
+abzwickende
+abzwickendem
+abzwickenden
+abzwickendes
+ac
+ac.
+ac/dc		
+ac1
+ac3
+ac4
+ac5
+ac6
+aca
+aca\averear
+aca\onear
+aca\utada
+aca\utado
+aca`
+acaba
+acaba\ar
+acabable
+acabada
+acabadamente
+acabado
+acabador
+acabadora
+acabalar
+acaballada
+acaballadero
+acaballado
+acaballar
+acaballerada
+acaballerado
+acaballerar
+acaballonar
+acabamiento
+acabar
+acabdar
+acabdellar
+acabdilladamente
+acabdillador
+acabdilladora
+acabdillamiento
+acabdillar
+acabellada
+acabellado
+acabestrillar
+acabijo
+acabildar
+acabit
+acabits
+acabo
+acabo`se
+acabronada
+acabronado
+acabtar
+acacatec
+acacatechin
+acacatechol
+acacetin
+acacharse
+acachetar
+acachetear
+acachorrar
+acacia
+acacia's
+acaciaat
+acaciaatje
+acaciaatjes
+acaciaho
+acaciahout
+acaciala
+acacialaan
+acacialanen
+acacian
+acacianos
+acacias
+acaciin
+acacin
+acad3
+acadamey
+acadamy
+acade'mi
+acade'micien
+acade'micienne
+acade'miciennes
+acade'miciens
+acade'mie
+acade'mies
+acade'mique
+acade'miques
+acade'misme
+acade`mica
+acade`micamente
+acade`mico
+academe
+academes
+academia
+academial
+academian
+academias
+academic
+academical
+academically
+academicals
+academici
+academician
+academicians
+academicianship
+academicism
+academicismo
+academics
+academicus
+academie
+academiegebouw
+academiegebouwen
+academiejaar
+academiejaren
+academien
+academies
+academiestad
+academiesteden
+academievergadering
+academievergaderingen
+academievriend
+academievrienden
+academio
+academis
+academisch
+academische
+academischer
+academischt
+academism
+academist
+academista
+academit
+academite
+academiz
+academization
+academize
+academus
+academy
+acadia
+acadiali
+acadialite
+acadian
+acadie
+acadien
+acaecedera
+acaecedero
+acaecer
+acaecimiento
+acaena
+acafresna
+acahual
+acahuayo
+acairelar
+acaiuba
+acajou
+acajous
+acajutla
+acal
+acalabrotar
+acalambrarse
+acaldar
+acalefo
+acalenturarse
+acaleph
+acalepha
+acalephae
+acalephan
+acalepho
+acalephoid
+acalia
+acallador
+acalladora
+acallantar
+acallar
+acalmar
+acalo\ar
+acaloradamente
+acaloramiento
+acalorar
+acaloro
+acalugar
+acalumniador
+acalumniadora
+acalumniar
+acalycal
+acalycin
+acalycine
+acalycinous
+acalycul
+acalyculate
+acalypha
+acalypte
+acalypterae
+acalyptr
+acalyptrata
+acalyptratae
+acalyptrate
+acamar
+acamaria
+acamarian
+acambrayada
+acambrayado
+acamellada
+acamellado
+acampak
+acampamento
+acampanada
+acampanado
+acampanar
+acampo
+acampsia
+acamuzada
+acamuzado
+acana
+acanaceo
+acanaceous
+acanalada
+acanalado
+acanalador
+acanaladura
+acanalar
+acanallada
+acanallado
+acanallar
+acandilada
+acandilado
+acanelada
+acanelado
+acanelonar
+acang
+acanillada
+acanillado
+acanilladura
+acanonic
+acanonical
+acanta`cea
+acanta`ceo
+acantalear
+acantarar
+acanth
+acantha
+acanthac
+acanthaceae
+acanthaceous
+acanthad
+acanthar
+acantharia
+acanthi
+acanthia
+acanthial
+acanthin
+acanthine
+acanthio
+acanthion
+acanthit
+acanthite
+acanthoc
+acanthocarpous
+acanthocephala
+acanthocephalan
+acanthocephali
+acanthocephalous
+acanthocereus
+acanthocladous
+acanthod
+acanthodea
+acanthodean
+acanthodei
+acanthodes
+acanthodian
+acanthodidae
+acanthodii
+acanthodini
+acanthoi
+acanthoid
+acanthol
+acantholimon
+acanthological
+acanthology
+acantholysis
+acanthom
+acanthoma
+acanthomeridae
+acanthon
+acanthop
+acanthopanax
+acanthophis
+acanthophorous
+acanthopod
+acanthopodous
+acanthopomatous
+acanthopore
+acanthopteran
+acanthopteri
+acanthopterous
+acanthopterygian
+acanthopterygii
+acanthos
+acanthosis
+acanthou
+acanthous
+acanthur
+acanthuridae
+acanthurus
+acanthus
+acanthuses
+acanthussen
+acantilada
+acantilado
+acantilar
+acantio
+acanto
+acantoce`falo
+acantonamiento
+acantonar
+acantopterigio
+acaparador
+acaparadora
+acaparamiento
+acaparar
+acaparrarse
+acaparrosada
+acaparrosado
+acapillar
+acapizarse
+acapnia
+acapnial
+acaponada
+acaponado
+acapsula
+acapsular
+acaptar
+acapu
+acapulco
+acapullarse
+acara
+acaracolada
+acaracolado
+acarambanada
+acarambanado
+acaramelar
+acarapis
+acarar
+acardenalar
+acardia
+acardiac
+acareamiento
+acarear
+acari
+acaria^t
+acaria^tre
+acaria^tres
+acarian
+acariasi
+acariasis
+acariciador
+acariciadora
+acariciante
+acariciar
+acaricid
+acaricidal
+acaricide
+acarid
+acarida
+acaridea
+acaridean
+acaridom
+acaridomatium
+acarifor
+acariform
+acarina
+acarine
+acarinos
+acarinosis
+acarnerada
+acarnerado
+acaro
+acarocec
+acarocecidium
+acaroder
+acarodermatitis
+acaroid
+acarol
+acarolog
+acarologist
+acarology
+acaronar
+acarophi
+acarophilous
+acaropho
+acarophobia
+acarotox
+acarotoxic
+acarpell
+acarpellous
+acarpelo
+acarpelous
+acarpous
+acarralar
+acarrarse
+acarrascada
+acarrascado
+acarrazarse
+acarreadiza
+acarreadizo
+acarreador
+acarreadora
+acarreadura
+acarreamiento
+acarrear
+acarreo
+acarretar
+acarreto
+acartonarse
+acarus
+acasamatada
+acasamatado
+acasarado
+acaserarse
+acaso
+acasta\ada
+acasta\ado
+acastillada
+acastillado
+acastorada
+acastorado
+acastus
+acata
+acatable
+acatadamente
+acatadura
+acatale`ctico
+acatalec
+acatalectic
+acatalecto
+acatalep
+acatalepsia
+acatalepsy
+acataleptic
+acatalla
+acatallactic
+acatamat
+acatamathesia
+acatamiento
+acatante
+acatapha
+acataphasia
+acatapos
+acataposis
+acatar
+acatarrar
+acatasta
+acatastasia
+acatastatic
+acate
+acate`chili
+acateco
+acategor
+acategorical
+acatenan
+acatenango
+acatepec
+acatery
+acates
+acathars
+acatharsia
+acatharsy
+acatholi
+acatholic
+acatla
+acato
+acaudal
+acaudalada
+acaudalado
+acaudalador
+acaudaladora
+acaudalar
+acaudate
+acaudele
+acaudelescent
+acaudillador
+acaudilladora
+acaudillamiento
+acaudillar
+acaule
+acaulesc
+acaulescent
+acauline
+acaulose
+acaulous
+acautelarse
+acawayo
+acaya
+acayaz
+acayo
+acb
+acbb
+acbd
+acbf
+acbg
+acbh
+acbl
+acbw
+acc
+acc-sb-u
+acc-sb-unix
+acca
+accabla
+accablai
+accablaient
+accablais
+accablait
+accablan
+accablant
+accablante
+accablantes
+accablants
+accable
+accable'
+accable'e
+accable'es
+accable's
+accable`
+accable`rent
+accablem
+accablement
+accablen
+accablent
+accabler
+accablera
+accablerai
+accableraient
+accablerais
+accablerait
+accableras
+accablerez
+accableriez
+accablerions
+accablerons
+accableront
+accables
+accablez
+accablie
+accabliez
+accablio
+accablions
+accablon
+accablons
+accad
+accada
+accadda
+accadde
+accadder
+accaddero
+accade
+accademi
+accademia
+accademico
+accademie
+accadere
+accadess
+accadesse
+accadeva
+accadi
+accado
+accadono
+accadra
+accadreb
+accadrebbe
+accaduta
+accadute
+accaduti
+accaduto
+accadutomi
+accalmie
+accalmies
+accalora
+accalorai
+accalorano
+accalorare
+accalorata
+accalorate
+accalorati
+accalorato
+accalorava
+accaloravi
+accaloravo
+accalore
+accalorera
+accalorero
+accalori
+accalorino
+accaloro
+accampa
+accampai
+accampam
+accampammo
+accampan
+accampando
+accampano
+accampar
+accampare
+accampas
+accampasse
+accampassi
+accampaste
+accampasti
+accampat
+accampata
+accampate
+accampati
+accampato
+accampav
+accampava
+accampavi
+accampavo
+accamper
+accampera
+accamperai
+accamperei
+accampero
+accampi
+accampia
+accampiamo
+accampiate
+accampin
+accampino
+accampo
+accanano
+accanend
+accanendo
+accani
+accaniam
+accaniamo
+accaniat
+accaniate
+accanii
+accanimm
+accanimmo
+accanira
+accanirai
+accanire
+accanirei
+accaniremo
+accanirete
+accaniro
+accanirono
+accanisc
+accanisca
+accanisce
+accanisci
+accanisco
+accaniss
+accanisse
+accanissi
+accanist
+accaniste
+accanisti
+accanita
+accanite
+accaniti
+accanito
+accaniva
+accanivamo
+accanivano
+accanivate
+accanivi
+accanivo
+accanto
+accapara
+accaparaient
+accaparais
+accaparait
+accaparant
+accapare
+accapare'
+accapare'e
+accapare'es
+accapare's
+accapare`rent
+accaparement
+accaparent
+accaparer
+accaparera
+accaparerai
+accapareraient
+accaparerais
+accaparerait
+accapareras
+accaparerez
+accapareriez
+accaparerions
+accaparerons
+accapareront
+accapares
+accapareur
+accapareurs
+accaparez
+accapari
+accapariez
+accaparions
+accaparo
+accaparons
+accarezz
+accarezza
+accarezzai
+accarezzi
+accarezzo
+accaron
+accasa
+accasai
+accasamm
+accasammo
+accasand
+accasando
+accasano
+accasare
+accasaro
+accasarono
+accasass
+accasasse
+accasassi
+accasast
+accasaste
+accasasti
+accasata
+accasate
+accasati
+accasato
+accasava
+accasavamo
+accasavano
+accasavate
+accasavi
+accasavo
+accascer
+accascera
+accascerai
+accascerei
+accascero
+accasci
+accascia
+accasciai
+accasciamo
+accasciano
+accasciare
+accasciata
+accasciate
+accasciati
+accasciato
+accasciava
+accasciavi
+accasciavo
+accascin
+accascino
+accascio
+accasera
+accaserai
+accasere
+accaserei
+accaseremo
+accaserete
+accasero
+accasi
+accasiam
+accasiamo
+accasiat
+accasiate
+accasino
+accaso
+accastil
+accastiller
+accatton
+accattone
+accattoni
+acce'da
+acce'dai
+acce'daient
+acce'dais
+acce'dait
+acce'dan
+acce'dant
+acce'de'
+acce'de`
+acce'de`rent
+acce'der
+acce'dera
+acce'derai
+acce'deraient
+acce'derais
+acce'derait
+acce'deras
+acce'derez
+acce'deriez
+acce'derions
+acce'derons
+acce'deront
+acce'dez
+acce'die
+acce'diez
+acce'dio
+acce'dions
+acce'don
+acce'dons
+acce'le'
+acce'le'ra
+acce'le'raient
+acce'le'rais
+acce'le'rait
+acce'le'rant
+acce'le'rateur
+acce'le'rateurs
+acce'le'ration
+acce'le'rations
+acce'le'ratrice
+acce'le'ratrices
+acce'le're'
+acce'le're'e
+acce'le're'es
+acce'le're's
+acce'le're`rent
+acce'le'rer
+acce'le'rera
+acce'le'rerai
+acce'le'reraient
+acce'le'rerais
+acce'le'rerait
+acce'le'reras
+acce'le'rerez
+acce'le'reriez
+acce'le'rerions
+acce'le'rerons
+acce'le'reront
+acce'le'rez
+acce'le'riez
+acce'le'rions
+acce'le'rons
+acce'le`
+acce'le`re
+acce'le`rent
+acce'le`res
+acce`de
+acce`den
+acce`dent
+acce`des
+acce`s
+acce`sit
+acceca
+accecai
+accecamm
+accecammo
+accecand
+accecando
+accecano
+accecare
+accecaro
+accecarono
+accecass
+accecasse
+accecassi
+accecast
+accecaste
+accecasti
+accecata
+accecate
+accecati
+accecato
+accecava
+accecavamo
+accecavano
+accecavate
+accecavi
+accecavo
+accecher
+accechera
+accecherai
+accecherei
+accechero
+accechi
+accechia
+accechiamo
+accechiate
+accechin
+accechino
+acceco
+accede
+acceded
+accedenc
+accedence
+accedente
+acceder
+accedera
+accedere
+acceders
+accederv
+accedervi
+accedes
+acceding
+accelera
+accelerable
+accelerai
+accelerando
+accelerano
+accelerant
+accelerare
+accelerata
+accelerate
+accelerated
+acceleratedly
+accelerates
+accelerati
+acceleratie
+acceleraties
+accelerating
+acceleration
+accelerationen
+accelerations
+accelerative
+accelerato
+accelerator
+acceleratorer
+accelerators
+acceleratory
+accelerava
+acceleravi
+acceleravo
+accelere
+accelerera
+accelererad
+accelerere
+accelereren
+accelerero
+acceleri
+accelerino
+accelero
+accelerograph
+accelerometer
+accelerometers
+accend
+accenda
+accende
+accender
+accendere
+accenderli
+accendersi
+accendet
+accendete
+accendev
+accendeva
+accendi
+accendib
+accendibility
+accendible
+accendin
+accendini
+accendino
+accendo
+accendon
+accendono
+accenna
+accennai
+accennam
+accennammo
+accennan
+accennando
+accennano
+accennar
+accennare
+accennas
+accennasse
+accennassi
+accennaste
+accennasti
+accennat
+accennata
+accennate
+accennati
+accennato
+accennav
+accennava
+accennavi
+accennavo
+accenner
+accennera
+accennerai
+accennerei
+accennero
+accenni
+accennia
+accenniamo
+accenniate
+accennin
+accennino
+accenno
+accensa
+accensio
+accension
+accensione
+accensioni
+accenso
+accensor
+accent
+accentat
+accentate
+accented
+accenten
+accenti
+accentin
+accenting
+accentle
+accentless
+accento
+accentor
+accentra
+accentrai
+accentrano
+accentrare
+accentrata
+accentrate
+accentrati
+accentrato
+accentrava
+accentravi
+accentravo
+accentre
+accentrera
+accentrero
+accentri
+accentrino
+accentro
+accents
+accentua
+accentuable
+accentuai
+accentuaient
+accentuais
+accentuait
+accentual
+accentuality
+accentually
+accentuando
+accentuano
+accentuant
+accentuare
+accentuata
+accentuate
+accentuated
+accentuates
+accentuati
+accentuatie
+accentuaties
+accentuating
+accentuation
+accentuations
+accentuato
+accentuator
+accentuava
+accentuavi
+accentuavo
+accentue
+accentue'
+accentue'e
+accentue'es
+accentue's
+accentue`rent
+accentueerde
+accentueerden
+accentuent
+accentuer
+accentuera
+accentuerai
+accentueraient
+accentuerais
+accentuerait
+accentueras
+accentueren
+accentuerez
+accentueriez
+accentuering
+accentuerions
+accentuero
+accentuerons
+accentueront
+accentues
+accentuez
+accentui
+accentuiez
+accentuino
+accentuions
+accentuo
+accentuons
+accentus
+accentve
+accentvers
+accentverzen
+accept
+accepta
+acceptab
+acceptabel
+acceptabele
+acceptabeler
+acceptabelst
+acceptabelt
+acceptability
+acceptabla
+acceptable
+acceptableness
+acceptables
+acceptably
+acceptai
+acceptaient
+acceptais
+acceptait
+acceptan
+acceptance
+acceptances
+acceptancy
+acceptant
+acceptanten
+acceptat
+acceptatie
+acceptaties
+acceptation
+acceptations
+accepte
+accepte'
+accepte'e
+accepte'es
+accepte's
+accepte`
+accepte`rent
+accepted
+acceptedly
+acceptee
+accepteer
+accepteerde
+accepteerden
+accepteert
+acceptees
+accepten
+acceptenboek
+acceptenboeken
+acceptent
+accepter
+acceptera
+accepterai
+accepteraient
+accepterais
+accepterait
+accepteras
+acceptere
+accepteren
+accepterer
+accepteres
+accepteret
+accepterez
+accepteriez
+accepterions
+accepterons
+accepteront
+accepters
+acceptes
+acceptest
+acceptet
+accepteth
+acceptez
+acceptie
+acceptiez
+acceptil
+acceptilate
+acceptilation
+acceptin
+accepting
+acceptio
+acception
+acceptions
+acceptiv
+acceptive
+acceptkr
+acceptkrediet
+acceptkriterier
+acceptkriterierne
+acceptkriteriet
+acceptkriterium
+accepton
+acceptons
+acceptor
+acceptors
+acceptre
+acceptress
+accepts
+accepttilstand
+accepttilstande
+accepttilstanden
+accerchi
+accerchia
+accerchiai
+accerchino
+accerchio
+accerse
+accersit
+accersition
+accersitor
+accerta
+accertai
+accertam
+accertammo
+accertan
+accertando
+accertano
+accertar
+accertare
+accertas
+accertasse
+accertassi
+accertaste
+accertasti
+accertat
+accertata
+accertate
+accertati
+accertato
+accertav
+accertava
+accertavi
+accertavo
+accerter
+accertera
+accerterai
+accerterei
+accertero
+accerti
+accertia
+accertiamo
+accertiate
+accertin
+accertino
+accerto
+acces
+accesa
+accese
+accesi
+accesibilidad
+accesible
+accesio`n
+accesional
+acceso
+accesoria
+accesoriamente
+accesorio
+access
+accessa
+accessab
+accessability
+accessable
+accessar
+accessaries
+accessarily
+accessariness
+accessary
+accessaryship
+accessed
+accessen
+accesses
+accessi
+accessib
+accessibile
+accessibili
+accessibility
+accessible
+accessibleness
+accessibles
+accessibly
+accessie
+accessies
+accessiet
+accessieten
+accessin
+accessing
+accessio
+accession
+accessional
+accessioner
+accessions
+accessit
+accessits
+accessiv
+accessive
+accessively
+accessle
+accessless
+accesso
+accessoi
+accessoire
+accessoirement
+accessoires
+accessoiriser
+accessoiriste
+accessoiristes
+accessor
+accessori
+accessorial
+accessorie
+accessories
+accessorily
+accessoriness
+accessorio
+accessorius
+accessors
+accessory
+accetta
+accettab
+accettabile
+accettabili
+accettai
+accettam
+accettammo
+accettan
+accettando
+accettano
+accettar
+accettare
+accettas
+accettasse
+accettassi
+accettaste
+accettasti
+accettat
+accettata
+accettate
+accettati
+accettato
+accettav
+accettava
+accettavi
+accettavo
+accetter
+accettera
+accetterai
+accetterei
+accettero
+accetti
+accettia
+accettiamo
+accettiate
+accettin
+accettino
+accetto
+acch
+acchaku
+acchami
+acchi
+acchion
+acchive
+accho
+acciacca
+acciaccatura
+acciacch
+acciacchi
+acciacco
+acciai
+acciaier
+acciaieria
+acciaierie
+acciaio
+accidenc
+accidence
+accidency
+accident
+accidentada
+accidentadamente
+accidentado
+accidental
+accidentalidad
+accidentalism
+accidentalist
+accidentality
+accidentally
+accidentalmente
+accidentalness
+accidentals
+accidentar
+accidentaria
+accidentariamente
+accidentario
+accidente
+accidente'
+accidente'e
+accidente'es
+accidente's
+accidented
+accidenteel
+accidentel
+accidentele
+accidentelle
+accidentellement
+accidentelles
+accidentels
+accidenten
+accidenter
+accidenti
+accidential
+accidentiality
+accidently
+accidents
+accidia
+accidie
+accidies
+accigli
+acciglia
+accigliai
+accigliamo
+accigliano
+accigliare
+accigliata
+accigliate
+accigliati
+accigliato
+accigliava
+accigliavi
+accigliavo
+acciglie
+accigliera
+accigliero
+acciglin
+acciglino
+acciglio
+accijns
+accijnsk
+accijnskantoor
+accijnskantoren
+accijnsr
+accijnsrechten
+accijnze
+accijnzen
+accinge
+accinger
+accingersi
+accio`n
+accionada
+accionado
+accionar
+accionista
+accipien
+accipient
+accipite
+accipiter
+accipitr
+accipitral
+accipitrary
+accipitres
+accipitrine
+accismus
+accitana
+accitano
+accite
+acciuga
+acciughe
+acclaim
+acclaima
+acclaimable
+acclaime
+acclaimed
+acclaimer
+acclaimers
+acclaimi
+acclaiming
+acclaims
+acclama
+acclamai
+acclamaient
+acclamais
+acclamait
+acclamam
+acclamammo
+acclaman
+acclamando
+acclamano
+acclamant
+acclamar
+acclamare
+acclamas
+acclamasse
+acclamassi
+acclamaste
+acclamasti
+acclamat
+acclamata
+acclamate
+acclamati
+acclamatie
+acclamaties
+acclamation
+acclamations
+acclamato
+acclamator
+acclamatory
+acclamav
+acclamava
+acclamavi
+acclamavo
+acclame
+acclame'
+acclame'e
+acclame'es
+acclame's
+acclame`
+acclame`rent
+acclamen
+acclament
+acclamer
+acclamera
+acclamerai
+acclameraient
+acclamerais
+acclamerait
+acclameras
+acclamerei
+acclamerez
+acclameriez
+acclamerions
+acclamero
+acclamerons
+acclameront
+acclames
+acclamez
+acclami
+acclamia
+acclamiamo
+acclamiate
+acclamie
+acclamiez
+acclamin
+acclamino
+acclamio
+acclamions
+acclamo
+acclamon
+acclamons
+acclimat
+acclimata
+acclimatable
+acclimataient
+acclimatais
+acclimatait
+acclimatant
+acclimatation
+acclimate
+acclimate'
+acclimate'e
+acclimate'es
+acclimate's
+acclimate`rent
+acclimated
+acclimatement
+acclimatent
+acclimater
+acclimatera
+acclimaterai
+acclimateraient
+acclimaterais
+acclimaterait
+acclimateras
+acclimaterez
+acclimateriez
+acclimaterions
+acclimaterons
+acclimateront
+acclimates
+acclimatez
+acclimatiez
+acclimating
+acclimation
+acclimations
+acclimatisatie
+acclimatisatiestation
+acclimatisatiestations
+acclimatisatietuin
+acclimatisatietuinen
+acclimatiseer
+acclimatiseerde
+acclimatiseerden
+acclimatiseert
+acclimatiseren
+acclimatizable
+acclimatization
+acclimatize
+acclimatized
+acclimatizer
+acclimatizes
+acclimatizing
+acclimatons
+acclimature
+acclinal
+acclinat
+acclinate
+acclivit
+acclivities
+acclivitous
+acclivity
+acclivou
+acclivous
+accloy
+accluso
+accm
+accoast
+accoda
+accodame
+accodamento
+accodare
+accodate
+accodato
+accoglie
+accogliere
+accoil
+accointa
+accointances
+accointe
+accointer
+accokeek
+accola
+accolade
+accoladed
+accolades
+accolaie
+accolaient
+accolais
+accolait
+accolan
+accolant
+accolate
+accolated
+accole
+accole'
+accole'e
+accole'es
+accole's
+accole`r
+accole`rent
+accolent
+accoler
+accolera
+accolerai
+accoleraient
+accolerais
+accolerait
+accoleras
+accolere
+accolerez
+accoleri
+accoleriez
+accolerions
+accolero
+accolerons
+accoleront
+accoles
+accolez
+accoliez
+accolion
+accolions
+accolle
+accolons
+accoltel
+accoltela
+accoltelai
+accolteli
+accoltelo
+accomac
+accombin
+accombination
+accomiat
+accomiata
+accomiatai
+accomiati
+accomiato
+accommod
+accommoda
+accommodable
+accommodableness
+accommodaient
+accommodais
+accommodait
+accommodant
+accommodante
+accommodantes
+accommodants
+accommodate
+accommodated
+accommodately
+accommodateness
+accommodates
+accommodatie
+accommodaties
+accommodatievermogen
+accommodating
+accommodatingly
+accommodation
+accommodational
+accommodations
+accommodative
+accommodatively
+accommodativeness
+accommodator
+accommodators
+accommode
+accommode'
+accommode'e
+accommode'es
+accommode's
+accommode`rent
+accommodeer
+accommodeerde
+accommodeerden
+accommodeert
+accommodement
+accommodements
+accommodent
+accommoder
+accommodera
+accommoderai
+accommoderaient
+accommoderais
+accommoderait
+accommoderas
+accommoderen
+accommoderez
+accommoderiez
+accommoderions
+accommoderons
+accommoderont
+accommodes
+accommodez
+accommodiez
+accommodions
+accommodons
+accomoda
+accomodai
+accomodano
+accomodare
+accomodata
+accomodate
+accomodati
+accomodatie
+accomodaties
+accomodato
+accomodava
+accomodavi
+accomodavo
+accomode
+accomodera
+accomodero
+accomodi
+accomodino
+accomodo
+accompag
+accompagna
+accompagnaient
+accompagnais
+accompagnait
+accompagnant
+accompagnateur
+accompagnateurs
+accompagnati
+accompagnatrice
+accompagnatrices
+accompagne
+accompagne'
+accompagne'e
+accompagne'es
+accompagne's
+accompagne`rent
+accompagneer
+accompagneerde
+accompagneerden
+accompagneert
+accompagnement
+accompagnements
+accompagnent
+accompagner
+accompagnera
+accompagnerai
+accompagneraient
+accompagnerais
+accompagnerait
+accompagneras
+accompagneren
+accompagnerez
+accompagneriez
+accompagnerions
+accompagnerons
+accompagneront
+accompagnes
+accompagnez
+accompagni
+accompagniez
+accompagnions
+accompagno
+accompagnons
+accompan
+accompani
+accompanied
+accompanier
+accompanies
+accompaniment
+accompanimental
+accompaniments
+accompanist
+accompanists
+accompany
+accompanying
+accompanyist
+accomple
+accompletive
+accompli
+accomplice
+accomplices
+accompliceship
+accomplicity
+accomplie
+accomplies
+accomplir
+accomplira
+accomplirai
+accompliraient
+accomplirais
+accomplirait
+accompliras
+accomplirent
+accomplirez
+accompliriez
+accomplirions
+accomplirons
+accompliront
+accomplis
+accomplish
+accomplishable
+accomplished
+accomplisher
+accomplishers
+accomplishes
+accomplishing
+accomplishment
+accomplishments
+accomplisht
+accomplissaient
+accomplissais
+accomplissait
+accomplissant
+accomplisse
+accomplissement
+accomplissements
+accomplissent
+accomplisses
+accomplissez
+accomplissiez
+accomplissions
+accomplissons
+accomplit
+accompt
+accompts
+acconten
+accontenta
+accontentarci
+accontenti
+accontento
+acconti
+acconto
+accoord
+accoppi
+accoppia
+accoppiai
+accoppiamo
+accoppiano
+accoppiare
+accoppiata
+accoppiate
+accoppiati
+accoppiato
+accoppiava
+accoppiavi
+accoppiavo
+accoppie
+accoppiera
+accoppiero
+accoppin
+accoppino
+accoppio
+accorata
+accorate
+accorati
+accorato
+accorcer
+accorcera
+accorcerai
+accorcerei
+accorcero
+accorci
+accorcia
+accorciai
+accorciamo
+accorciano
+accorciare
+accorciata
+accorciate
+accorciati
+accorciato
+accorciava
+accorciavi
+accorciavo
+accorcin
+accorcino
+accorcio
+accord
+accorda
+accordab
+accordable
+accordai
+accordaient
+accordais
+accordait
+accordam
+accordammo
+accordan
+accordance
+accordances
+accordancy
+accordando
+accordano
+accordant
+accordantly
+accordar
+accordare
+accordas
+accordasse
+accordassi
+accordaste
+accordasti
+accordat
+accordata
+accordate
+accordati
+accordato
+accordav
+accordava
+accordavi
+accordavo
+accorde
+accorde'
+accorde'e
+accorde'es
+accorde'on
+accorde'oniste
+accorde'onistes
+accorde'ons
+accorde's
+accorde`
+accorde`rent
+accorded
+accordee
+accordeer
+accordeerde
+accordeerden
+accordeert
+accorden
+accordent
+accordeo
+accordeon
+accordeonist
+accordeonisten
+accordeons
+accorder
+accordera
+accorderai
+accorderaient
+accorderais
+accorderait
+accorderas
+accorderei
+accorderen
+accorderez
+accorderiez
+accorderions
+accordero
+accorderons
+accorderont
+accorders
+accordes
+accordeu
+accordeur
+accordeurs
+accordez
+accordi
+accordia
+accordiamo
+accordian
+accordiate
+accordie
+accordiez
+accordin
+according
+accordingly
+accordino
+accordio
+accordion
+accordionist
+accordionists
+accordions
+accordo
+accordon
+accordons
+accords
+accorga
+accorge
+accorges
+accorgesse
+accorgim
+accorgimenti
+accorpor
+accorporate
+accorporation
+accortez
+accortezza
+accortezze
+accost
+accosta
+accostab
+accostable
+accostag
+accostage
+accostages
+accostai
+accostaient
+accostais
+accostait
+accostam
+accostammo
+accostan
+accostando
+accostano
+accostant
+accostar
+accostare
+accostas
+accostasse
+accostassi
+accostaste
+accostasti
+accostat
+accostata
+accostate
+accostati
+accostato
+accostav
+accostava
+accostavi
+accostavo
+accoste
+accoste'
+accoste'e
+accoste'es
+accoste's
+accoste`
+accoste`rent
+accosted
+accosten
+accostent
+accoster
+accostera
+accosterai
+accosteraient
+accosterais
+accosterait
+accosteras
+accosterei
+accosterez
+accosteriez
+accosterions
+accostero
+accosterons
+accosteront
+accostes
+accostez
+accosti
+accostia
+accostiamo
+accostiate
+accostie
+accostiez
+accostin
+accosting
+accostino
+accostio
+accostions
+accosto
+accoston
+accostons
+accosts
+accoteme
+accotement
+accotements
+accoter
+accoucha
+accouchaient
+accouchais
+accouchait
+accouchant
+accouche
+accouche'
+accouche'e
+accouche'es
+accouche's
+accouche`rent
+accouchement
+accouchements
+accouchent
+accoucher
+accouchera
+accoucherai
+accoucheraient
+accoucherais
+accoucherait
+accoucheras
+accoucherez
+accoucheriez
+accoucherions
+accoucherons
+accoucheront
+accouches
+accoucheur
+accoucheurs
+accoucheuse
+accoucheuses
+accouchez
+accouchi
+accouchiez
+accouchions
+accoucho
+accouchons
+accouda
+accoudai
+accoudaient
+accoudais
+accoudait
+accoudan
+accoudant
+accoude
+accoude'
+accoude'e
+accoude'es
+accoude's
+accoude`
+accoude`rent
+accouden
+accoudent
+accouder
+accoudera
+accouderai
+accouderaient
+accouderais
+accouderait
+accouderas
+accouderez
+accouderiez
+accouderions
+accouderons
+accouderont
+accoudes
+accoudez
+accoudie
+accoudiez
+accoudio
+accoudions
+accoudoi
+accoudoir
+accoudoirs
+accoudon
+accoudons
+accouer
+account
+accounta
+accountability
+accountable
+accountableness
+accountably
+accountancy
+accountant
+accountante
+accountantes
+accountants
+accountantsexamen
+accountantsexamens
+accountantship
+accountantsverslag
+accountantsverslagen
+accounte
+accounted
+accounter
+accounters
+accounti
+accounting
+accountm
+accountment
+accountr
+accountrement
+accounts
+accoupla
+accouplaient
+accouplais
+accouplait
+accouplant
+accouple
+accouple'
+accouple'e
+accouple'es
+accouple's
+accouple`rent
+accouplement
+accouplements
+accouplent
+accoupler
+accouplera
+accouplerai
+accoupleraient
+accouplerais
+accouplerait
+accoupleras
+accouplerez
+accoupleriez
+accouplerions
+accouplerons
+accoupleront
+accouples
+accouplez
+accoupli
+accoupliez
+accouplions
+accouplo
+accouplons
+accourai
+accouraient
+accourais
+accourait
+accouran
+accourant
+accourci
+accourcir
+accoure
+accouren
+accourent
+accoures
+accourez
+accourie
+accouriez
+accourio
+accourions
+accourir
+accouron
+accourons
+accourra
+accourrai
+accourraient
+accourrais
+accourrait
+accourras
+accourre
+accourrez
+accourri
+accourriez
+accourrions
+accourro
+accourrons
+accourront
+accours
+accourt
+accouru
+accourue
+accourues
+accourur
+accoururent
+accourus
+accourut
+accousch
+accousti
+accouter
+accoutered
+accoutering
+accouterment
+accouterments
+accouters
+accoutre
+accoutred
+accoutrement
+accoutrements
+accoutrer
+accoutres
+accoutri
+accoutring
+accoutum
+accoutuma
+accoutumaient
+accoutumais
+accoutumait
+accoutumance
+accoutumant
+accoutume
+accoutume'
+accoutume'e
+accoutume'es
+accoutume's
+accoutume`rent
+accoutument
+accoutumer
+accoutumera
+accoutumerai
+accoutumeraient
+accoutumerais
+accoutumerait
+accoutumeras
+accoutumerez
+accoutumeriez
+accoutumerions
+accoutumerons
+accoutumeront
+accoutumes
+accoutumez
+accoutumiez
+accoutumions
+accoutumons
+accovill
+accoville
+accoy
+accra
+accre'di
+accre'dita
+accre'ditaient
+accre'ditais
+accre'ditait
+accre'ditant
+accre'ditation
+accre'dite
+accre'dite'
+accre'dite'e
+accre'dite'es
+accre'dite's
+accre'dite`rent
+accre'ditent
+accre'diter
+accre'ditera
+accre'diterai
+accre'diteraient
+accre'diterais
+accre'diterait
+accre'diteras
+accre'diterez
+accre'diteriez
+accre'diterions
+accre'diterons
+accre'diteront
+accre'dites
+accre'diteur
+accre'diteurs
+accre'ditez
+accre'ditiez
+accre'ditif
+accre'ditifs
+accre'ditions
+accre'ditive
+accre'ditives
+accre'ditons
+accredit
+accredita
+accreditai
+accreditate
+accreditation
+accreditations
+accredited
+accreditee
+accrediteer
+accrediteerde
+accrediteerden
+accrediteert
+accrediteren
+accrediti
+accreditief
+accreditieven
+accrediting
+accreditment
+accredito
+accredits
+accremen
+accrementitial
+accrementition
+accres
+accresce
+accrescence
+accrescent
+accresse
+accressen
+accretal
+accrete
+accreted
+accretes
+accretin
+accreting
+accretio
+accretion
+accretionary
+accretions
+accretiv
+accretive
+accrimin
+accrimination
+accroach
+accroc
+accrocha
+accrochage
+accrochages
+accrochaient
+accrochais
+accrochait
+accrochant
+accroche
+accroche'
+accroche'e
+accroche'es
+accroche's
+accroche`rent
+accrochent
+accrocher
+accrochera
+accrocherai
+accrocheraient
+accrocherais
+accrocherait
+accrocheras
+accrocherez
+accrocheriez
+accrocherions
+accrocherons
+accrocheront
+accroches
+accrocheur
+accrocheurs
+accrocheuse
+accrocheuses
+accrochez
+accrochi
+accrochiez
+accrochions
+accrocho
+accrochons
+accrocs
+accroi^t
+accroi^tra
+accroi^trai
+accroi^traient
+accroi^trais
+accroi^trait
+accroi^tras
+accroi^tre
+accroi^trez
+accroi^triez
+accroi^trions
+accroi^trons
+accroi^tront
+accroide
+accroides
+accroire
+accrois
+accroiss
+accroissaient
+accroissais
+accroissait
+accroissant
+accroisse
+accroissement
+accroissements
+accroissent
+accroisses
+accroissez
+accroissiez
+accroissions
+accroissons
+accroupi
+accroupir
+accru
+accruabl
+accruable
+accrual
+accruals
+accrue
+accrued
+accrueme
+accruement
+accruer
+accrues
+accruing
+accruren
+accrurent
+accrus
+accrust
+accrut
+acct
+accts
+accu
+accu's
+accubati
+accubation
+accubitu
+accubitum
+accubitus
+accueil
+accueill
+accueillaient
+accueillais
+accueillait
+accueillant
+accueillante
+accueillantes
+accueillants
+accueille
+accueillent
+accueillera
+accueillerai
+accueilleraient
+accueillerais
+accueillerait
+accueilleras
+accueillerez
+accueilleriez
+accueillerions
+accueillerons
+accueilleront
+accueilles
+accueillez
+accueilli
+accueillie
+accueillies
+accueilliez
+accueillions
+accueillir
+accueillirent
+accueillis
+accueillit
+accueillons
+accueils
+accula
+acculaie
+acculaient
+acculais
+acculait
+acculant
+accule
+accule'
+accule'e
+accule'es
+accule's
+accule`r
+accule`rent
+acculent
+acculer
+acculera
+acculerai
+acculeraient
+acculerais
+acculerait
+acculeras
+acculere
+acculerez
+acculeri
+acculeriez
+acculerions
+acculero
+acculerons
+acculeront
+accules
+acculez
+acculiez
+acculion
+acculions
+acculons
+accultur
+accultural
+acculturate
+acculturated
+acculturates
+acculturating
+acculturation
+acculturational
+acculturative
+acculturer
+acculturize
+accumben
+accumbency
+accumbent
+accumber
+accumula
+accumulable
+accumulai
+accumulaient
+accumulais
+accumulait
+accumulano
+accumulant
+accumulare
+accumulata
+accumulate
+accumulated
+accumulates
+accumulateur
+accumulateurs
+accumulati
+accumulatie
+accumulaties
+accumulating
+accumulation
+accumulations
+accumulativ
+accumulative
+accumulatively
+accumulativeness
+accumulato
+accumulator
+accumulatoren
+accumulatorenbatterij
+accumulatorenbatterijen
+accumulators
+accumulava
+accumulavi
+accumulavo
+accumulazione
+accumule
+accumule'
+accumule'e
+accumule'es
+accumule's
+accumule`rent
+accumulent
+accumuler
+accumulera
+accumulerai
+accumuleraient
+accumulerais
+accumulerait
+accumuleras
+accumuleren
+accumulerez
+accumuleriez
+accumulerions
+accumulero
+accumulerons
+accumuleront
+accumules
+accumulez
+accumuli
+accumuliez
+accumulino
+accumulions
+accumulo
+accumulons
+accupy
+accuraat
+accuraatst
+accuraci
+accuracies
+accuracy
+accurata
+accuratamente
+accurate
+accurately
+accurateness
+accurater
+accuratesse
+accurati
+accurato
+accurse
+accursed
+accursedly
+accursedness
+accurst
+accus
+accusa
+accusabl
+accusable
+accusably
+accusai
+accusaie
+accusaient
+accusais
+accusait
+accusal
+accusals
+accusamm
+accusammo
+accusand
+accusando
+accusano
+accusant
+accusare
+accusaro
+accusarono
+accusass
+accusasse
+accusassi
+accusast
+accusaste
+accusasti
+accusata
+accusate
+accusateur
+accusateurs
+accusati
+accusatief
+accusatieven
+accusatif
+accusatifs
+accusation
+accusations
+accusatival
+accusative
+accusatively
+accusativeness
+accusatives
+accusato
+accusatore
+accusatori
+accusatorial
+accusatorially
+accusatory
+accusatr
+accusatrice
+accusatrices
+accusatrix
+accusatrixes
+accusava
+accusavamo
+accusavano
+accusavate
+accusavi
+accusavo
+accuse
+accuse'
+accuse'e
+accuse'es
+accuse's
+accuse`r
+accuse`rent
+accused
+accusent
+accuser
+accusera
+accuserai
+accuseraient
+accuserais
+accuserait
+accuseras
+accusere
+accuserei
+accuseremo
+accuserete
+accuserez
+accuseri
+accuseriez
+accuserions
+accusero
+accuserons
+accuseront
+accusers
+accuses
+accuseth
+accusez
+accusi
+accusiam
+accusiamo
+accusiat
+accusiate
+accusiez
+accusing
+accusingly
+accusino
+accusion
+accusions
+accusive
+accuso
+accusons
+accusor
+accustom
+accustomary
+accustomd
+accustomed
+accustomedly
+accustomedness
+accustoming
+accustoms
+accutest
+accuutje
+accuutjes
+accuvax
+acd
+ace
+ace're'
+ace're'e
+ace're'es
+ace're's
+ace'rer
+ace'tifi
+ace'tifier
+ace'tone
+ace\a
+ace\ero
+ace`fala
+ace`falo
+ace`mila
+ace`rrimamente
+ace`rrimo
+ace`tica
+ace`tico
+aceacena
+aceacenaphthene
+aceanthr
+aceanthrene
+aceanthrenequinone
+acebadamiento
+acebadar
+acebal
+acebeda
+acebedo
+acebes
+acebibe
+acebo
+acebollada
+acebollado
+acebolladura
+acebrada
+acebrado
+acebuchal
+acebuche
+acebuchena
+acebucheno
+acebuchina
+acecaffi
+acecaffine
+acechadera
+acechadero
+acechador
+acechadora
+acechamiento
+acechanza
+acechar
+aceche
+acecho
+acecho`n
+acechona
+acecido
+acecinador
+acecinamiento
+acecinar
+aceconit
+aceconitic
+aced
+aceda
+acedamente
+acedar
+acedera
+acederaque
+acederilla
+acedero`n
+acedi`a
+acedia
+acediami
+acediamine
+acediast
+acedo
+acedura
+acedy
+acefala
+acefale
+acefali
+acefali`a
+acefalismo
+acefalo
+aceguero
+aceh
+aceifa
+aceitada
+aceitar
+aceitazo
+aceite
+aceitera
+aceiteri`a
+aceitero
+aceito`n
+aceitosa
+aceitoso
+aceituna
+aceitunada
+aceitunado
+aceitunera
+aceitunero
+aceituni`
+aceitunil
+aceitunillo
+aceituno
+acelajada
+acelajado
+aceldama
+aceleracio`n
+acelerada
+aceleradamente
+acelerado
+acelerador
+aceleramiento
+acelerar
+aceleratriz
+acelga
+acelvari
+acemetae
+acemetic
+acemilada
+acemilado
+acemilar
+acemilera
+acemileri`a
+acemilero
+acemita
+acemite
+acenapht
+acenaphthene
+acenaphthenyl
+acenaphthylene
+acender
+acendrada
+acendrado
+acendramiento
+acendrar
+acenefa
+acenia
+acensar
+acensuada
+acensuado
+acensuador
+acensuar
+acento
+acentric
+acentrou
+acentrous
+acentuacio`n
+acentuadamente
+acentual
+acentuar
+aceologi
+aceologic
+aceology
+acepar
+acepcio`n
+acephal
+acephala
+acephalan
+acephali
+acephalia
+acephalina
+acephaline
+acephalism
+acephalist
+acephalite
+acephalo
+acephalocyst
+acephalous
+acephalu
+acephalus
+acepilladura
+acepillar
+acepta
+aceptabilidad
+aceptable
+aceptablemente
+aceptacio`n
+aceptadamente
+aceptador
+aceptadora
+aceptante
+aceptar
+acepto
+aceptor
+acequia
+acequiad
+acequiador
+acequiaje
+acequiam
+acequiamadre
+acequiar
+acequiero
+acer
+acera
+acera`cea
+acera`ceo
+aceracea
+aceraceae
+aceraceo
+aceraceous
+aceracio`n
+acerada
+acerado
+acerae
+acerar
+acerata
+acerate
+acerates
+acerathe
+acerathere
+aceratherium
+aceratio
+aceration
+aceratos
+aceratosis
+acerb
+acerba
+acerbamente
+acerbas
+acerbate
+acerbated
+acerbates
+acerbati
+acerbating
+acerbe
+acerber
+acerbes
+acerbest
+acerbi
+acerbi`simamente
+acerbic
+acerbidad
+acerbiti
+acerbities
+acerbity
+acerbityacerose
+acerbo
+acerca
+acercador
+acercadora
+acercamiento
+acercanza
+acercar
+acerdol
+aceri`a
+aceri`nea
+aceri`neo
+acerico
+acerillo
+acerin
+acerina
+acerino
+acernadar
+acero
+acerola
+acerolo
+acerosa
+acerose
+aceroso
+acerous
+acerra
+acerrador
+acerrar
+acerrojar
+acertada
+acertadamente
+acertado
+acertador
+acertadora
+acertajo
+acertajo`n
+acertajona
+acertamiento
+acertann
+acertannin
+acertar
+acertero
+acertijo
+aceruelo
+acervar
+acervate
+acervately
+acervati
+acervatim
+acervation
+acervative
+acervo
+acervose
+acervuli
+acervuline
+acervulu
+acervulus
+aces
+acescenc
+acescence
+acescencia
+acescency
+acescent
+acescente
+aceship
+acesodyn
+acesodyne
+acessibl
+acessible
+acestes
+aceta
+aceta`bulo
+acetabul
+acetabular
+acetabularia
+acetabuliferous
+acetabuliform
+acetabulous
+acetabulum
+acetacet
+acetacetic
+acetal
+acetalde
+acetaldehido
+acetaldehydase
+acetaldehyde
+acetaldehydrase
+acetaliz
+acetalization
+acetalize
+acetamid
+acetamide
+acetamidin
+acetamidine
+acetamido
+acetamin
+acetaminol
+acetaminophen
+acetanil
+acetanilid
+acetanilide
+acetanio
+acetanion
+acetanis
+acetaniside
+acetanisidide
+acetanni
+acetannin
+acetar
+acetario
+acetarious
+acetarso
+acetarsone
+acetate
+acetated
+acetates
+acetatio
+acetation
+acetato
+acetbrom
+acetbromamide
+acetenyl
+acethydr
+acethydrazide
+aceti
+aceti`metro
+aceti`n
+acetic
+acetific
+acetificacio`n
+acetificar
+acetification
+acetifie
+acetified
+acetifier
+acetifies
+acetify
+acetifyi
+acetifying
+acetileno
+acetilo
+acetimet
+acetimeter
+acetimetry
+acetin
+acetite
+acetize
+acetmeth
+acetmethylanilide
+acetnaph
+acetnaphthalide
+aceto
+acetoace
+acetoacetanilide
+acetoacetate
+acetoacetic
+acetoami
+acetoamidophenol
+acetoars
+acetoarsenite
+acetobac
+acetobacter
+acetoben
+acetobenzoic
+acetobro
+acetobromanilide
+acetochl
+acetochloral
+acetocin
+acetocinnamene
+acetoin
+acetol
+acetolys
+acetolysis
+acetolyt
+acetolytic
+acetomet
+acetometer
+acetometrical
+acetometrically
+acetometry
+acetomor
+acetomorphine
+aceton
+acetona
+acetonap
+acetonaphthone
+acetonat
+acetonate
+acetonation
+acetone
+acetonem
+acetonemia
+acetonemic
+acetones
+acetonic
+acetonit
+acetonitrile
+acetoniz
+acetonization
+acetonize
+acetonur
+acetonuria
+acetonurometer
+acetonyl
+acetonylacetone
+acetonylidene
+acetophe
+acetophenetide
+acetophenetidin
+acetophenin
+acetophenine
+acetophenone
+acetopip
+acetopiperone
+acetopyr
+acetopyrin
+acetosa
+acetosal
+acetosalicylic
+acetose
+acetosidad
+acetosilla
+acetosit
+acetosity
+acetoso
+acetosol
+acetosoluble
+acetothi
+acetothienone
+acetotol
+acetotoluide
+acetotoluidine
+acetous
+acetover
+acetoveratrone
+acetoxim
+acetoxime
+acetoxyl
+acetoxyp
+acetoxyphthalide
+acetphen
+acetphenetid
+acetphenetidin
+acetract
+acetre
+acetreri`a
+acetrero
+acetrinar
+acettolu
+acettoluide
+acetum
+aceturic
+acetyl
+acetylac
+acetylacetonates
+acetylacetone
+acetylam
+acetylamine
+acetylat
+acetylate
+acetylation
+acetylator
+acetylbe
+acetylbenzene
+acetylbenzoate
+acetylbenzoic
+acetylbi
+acetylbiuret
+acetylca
+acetylcarbazole
+acetylce
+acetylcellulose
+acetylch
+acetylcholine
+acetylcy
+acetylcyanide
+acetylee
+acetyleen
+acetyleengas
+acetyleenlantaarn
+acetyleenlantaarns
+acetyleenlantaren
+acetyleenlantarens
+acetylen
+acetylenation
+acetylene
+acetylenediurein
+acetylenet
+acetylenic
+acetylenyl
+acetylfl
+acetylfluoride
+acetylgl
+acetylglycine
+acetylhy
+acetylhydrazine
+acetylic
+acetylid
+acetylide
+acetylio
+acetyliodide
+acetyliz
+acetylizable
+acetylization
+acetylize
+acetylizer
+acetylme
+acetylmethylcarbinol
+acetylpe
+acetylperoxide
+acetylph
+acetylphenol
+acetylphenylhydrazine
+acetylro
+acetylrosaniline
+acetylsa
+acetylsalicylate
+acetylsalicylic
+acetylsalicylsyre
+acetylsalol
+acetylta
+acetyltannin
+acetylth
+acetylthymol
+acetyltr
+acetyltropeine
+acetylur
+acetylurea
+acevedo
+aceves
+acevilar
+acewaio
+acezar
+acezo
+acezosa
+acezoso
+acf1
+acf10
+acf11
+acf2
+acf3
+acf4
+acf5
+acf6
+acf7
+acf8
+acf9
+acfclust
+acfis
+acfp
+acfp-dev
+acfpatte
+acfpatterns
+acfplot
+acftu
+ach
+acha
+achabacanamiento
+achabacanar
+achacadiza
+achacadizo
+achacar
+achachay
+achacosa
+achacosamente
+achacoso
+achaean
+achaemen
+achaemenian
+achaemenid
+achaemenidae
+achaemenidian
+achaenod
+achaenodon
+achaeta
+achaetou
+achaetous
+achaflanar
+achage
+achagua
+achaia
+achaicus
+achajuanarse
+achakzai
+achal
+achaland
+achalandage
+achalande'
+achalande'e
+achalande'es
+achalande's
+achalander
+achalasi
+achalasia
+achalta
+achambergada
+achambergado
+achamma
+achamoth
+achampa\ada
+achampa\ado
+achampanada
+achampanado
+achan
+achang
+achango
+achantarse
+achanti
+achaparrada
+achaparrado
+achaparrarse
+achaque
+achaquero
+achaquienta
+achaquiento
+achar
+achard
+achares
+achariac
+achariaceae
+achariaceous
+acharn
+acharna
+acharnai
+acharnaient
+acharnais
+acharnait
+acharnan
+acharnant
+acharne
+acharne'
+acharne'e
+acharne'es
+acharne's
+acharne`
+acharne`rent
+acharnem
+acharnement
+acharnements
+acharnen
+acharnent
+acharner
+acharnera
+acharnerai
+acharneraient
+acharnerais
+acharnerait
+acharneras
+acharnerez
+acharneriez
+acharnerions
+acharnerons
+acharneront
+acharnes
+acharnez
+acharnie
+acharniez
+acharnio
+acharnions
+acharnon
+acharnons
+acharolada
+acharolado
+acharolar
+acharya
+acharyya
+achat
+achatamiento
+achatar
+achate
+achates
+achatina
+achatine
+achatinella
+achatini
+achatinidae
+achats
+achawa
+achaz
+achbor
+achcar
+ache
+ache`te
+ache`ten
+ache`tent
+ache`ter
+ache`tera
+ache`terai
+ache`teraient
+ache`terais
+ache`terait
+ache`teras
+ache`terez
+ache`teriez
+ache`terions
+ache`terons
+ache`teront
+ache`tes
+ache`ve
+ache`vem
+ache`vement
+ache`ven
+ache`vent
+ache`ver
+ache`vera
+ache`verai
+ache`veraient
+ache`verais
+ache`verait
+ache`veras
+ache`verez
+ache`veriez
+ache`verions
+ache`verons
+ache`veront
+ache`ves
+ached
+achehnes
+achehnese
+acheilia
+acheilou
+acheilous
+acheiria
+acheirou
+acheirous
+acheirus
+achelous
+achemina
+acheminaient
+acheminais
+acheminait
+acheminant
+achemine
+achemine'
+achemine'e
+achemine'es
+achemine's
+achemine`rent
+acheminement
+acheminent
+acheminer
+acheminera
+acheminerai
+achemineraient
+acheminerais
+acheminerait
+achemineras
+acheminerez
+achemineriez
+acheminerions
+acheminerons
+achemineront
+achemines
+acheminez
+achemini
+acheminiez
+acheminions
+achemino
+acheminons
+achen
+achene
+achenes
+achenial
+achenium
+achenoca
+achenocarp
+achenodi
+achenodium
+acher
+achernar
+acheron
+acheroni
+acheronian
+acheront
+acherontic
+acherontical
+aches
+acheson
+acheta
+achetabl
+achetable
+achetables
+achetaie
+achetaient
+achetais
+achetait
+achetant
+achete
+achete'
+achete'e
+achete'es
+achete's
+achete`r
+achete`rent
+acheter
+acheteur
+acheteurs
+acheteus
+acheteuse
+acheteuses
+achetez
+achetida
+achetidae
+achetiez
+achetion
+achetions
+achetons
+acheulea
+acheulean
+acheva
+achevaie
+achevaient
+achevais
+achevait
+achevant
+acheve'
+acheve'e
+acheve'es
+acheve's
+acheve`r
+acheve`rent
+achever
+achevez
+acheviez
+achevion
+achevions
+achevons
+acheweed
+achham
+achi
+achibume
+achicada
+achicado
+achicador
+achicadora
+achicadura
+achicamiento
+achicar
+achicharradero
+achicharrante
+achicharrar
+achichinque
+achick
+achicoria
+achier
+achieri
+achiest
+achiev
+achievab
+achievable
+achievd
+achieve
+achieved
+achievem
+achievement
+achievements
+achiever
+achievers
+achieves
+achievin
+achieving
+achigan
+achiguarse
+achik
+achikoch
+achikuru
+achilary
+achill
+achillas
+achille
+achillea
+achillean
+achillei
+achilleid
+achilleine
+achilles
+achillesferse
+achillespees
+achillespezen
+achillesverse
+achilleus
+achilliz
+achillize
+achillob
+achillobursitis
+achillod
+achillodynia
+achim
+achime
+achimene
+achimenes
+achinar
+achinelada
+achinelado
+achinese
+achinesechamic
+achiness
+aching
+achingly
+achiote
+achipa
+achipanc
+achipanchi
+achipawa
+achique
+achiquillada
+achiquillado
+achira
+achish
+achispar
+achisut
+achisuto
+achitabla
+achitoph
+achitophel
+achiwa
+achiyala
+achiyalabopa
+achkar
+achlamyd
+achlamydate
+achlamydeae
+achlamydeous
+achlis
+achlo
+achlorhy
+achlorhydria
+achlorop
+achlorophyllous
+achloropsia
+achmad
+achmed
+achmetha
+acho
+achocadura
+achocar
+achocharse
+achocolatada
+achocolatado
+achode
+acholada
+acholado
+acholar
+acholi
+acholia
+acholic
+acholoe
+acholous
+acholuri
+acholuria
+acholuric
+achomawi
+achondri
+achondrite
+achondritic
+achondro
+achondroplasia
+achondroplastic
+achoo
+achoppa
+achoppai
+achoppaient
+achoppais
+achoppait
+achoppan
+achoppant
+achoppe
+achoppe'
+achoppe`
+achoppe`rent
+achoppem
+achoppement
+achoppen
+achoppent
+achopper
+achoppera
+achopperai
+achopperaient
+achopperais
+achopperait
+achopperas
+achopperez
+achopperiez
+achopperions
+achopperons
+achopperont
+achoppes
+achoppez
+achoppie
+achoppiez
+achoppio
+achoppions
+achoppon
+achoppons
+achor
+achordal
+achordat
+achordata
+achordate
+achorion
+achote
+achras
+achree
+achroacy
+achroacyte
+achroant
+achroanthes
+achrodex
+achrodextrin
+achrodextrinase
+achroglo
+achroglobin
+achroioc
+achroiocythaemia
+achroiocythemia
+achroite
+achroma
+achromac
+achromacyte
+achromas
+achromasia
+achromat
+achromate
+achromatiaceae
+achromatic
+achromatically
+achromaticity
+achromatin
+achromatinic
+achromatisch
+achromatische
+achromatischer
+achromatischt
+achromatiser
+achromatism
+achromatium
+achromatizable
+achromatization
+achromatize
+achromatocyte
+achromatolysis
+achromatope
+achromatophile
+achromatopia
+achromatopsia
+achromatopsy
+achromatosis
+achromatous
+achromats
+achromaturia
+achromia
+achromic
+achromob
+achromobacter
+achromobacterieae
+achromod
+achromoderma
+achromop
+achromophilous
+achromot
+achromotrichia
+achromou
+achromous
+achronic
+achronical
+achroode
+achroodextrin
+achroodextrinase
+achroous
+achropsi
+achropsia
+achsa
+achsah
+achse
+achsel
+achselho
+achselhoehlen
+achseln
+achselzu
+achselzucken
+achselzuckend
+achselzuckenden
+achsen
+achsenma
+achsenmaechte
+achshaph
+achsigen
+achsmaec
+achsmaechte
+acht
+achtarm
+achtarme
+achtarmen
+achtarmi
+achtarmig
+achtarmige
+achtbaar
+achtbaarder
+achtbaarheid
+achtbaarst
+achtbar
+achtbare
+achtbarem
+achtbarer
+achtbares
+achtbark
+achtbarkeit
+achtbarkeiten
+achtbok
+achtbokk
+achtbokken
+achtdaag
+achtdaags
+achtdaagse
+achtduiz
+achtduizend
+achtduizendste
+achte
+achtecke
+achtecken
+achtecks
+achtehal
+achtehalber
+achteinh
+achteinhalbfache
+achtel
+achteln
+achteloo
+achteloos
+achteloosheden
+achteloosheid
+achteloost
+achteloz
+achteloze
+achtelozer
+achtels
+achtelth
+achtelthaler
+achtem
+achten
+achtend
+achtende
+achtendem
+achtenden
+achtender
+achtendertig
+achtendertigste
+achtens
+achtensw
+achtenswaard
+achtenswaarde
+achtenswaarder
+achtenswaardig
+achtenswaardige
+achtenswaardiger
+achtenswaardigheid
+achtenswaardigst
+achtenswaardst
+achtenswert
+achtenswerte
+achtenswerten
+achtenswerter
+achtenswertes
+achtentw
+achtentwintig
+achtentwintigduizend
+achtentwintigduizendste
+achtentwintigste
+achter
+achteraa
+achteraan
+achteraanbleef
+achteraanbleven
+achteraanblijf
+achteraanblijft
+achteraanblijven
+achteraangebleven
+achteraangeblevene
+achteraangeblevenen
+achteraangekomen
+achteraangekomene
+achteraangekomenen
+achteraankomen
+achteraankwam
+achteraankwamen
+achteraf
+achteras
+achterassen
+achterba
+achterbahnen
+achterbaks
+achterbakse
+achterbalk
+achterbalken
+achterbalkon
+achterbalkons
+achterban
+achterband
+achterbanden
+achterbank
+achterbanken
+achterbe
+achterbeen
+achterbenen
+achterbi
+achterbil
+achterbillen
+achterbl
+achterbleef
+achterbleven
+achterblijf
+achterblijfster
+achterblijfsters
+achterblijft
+achterblijven
+achterblijver
+achterblijvers
+achterbo
+achterbomen
+achterboom
+achterbu
+achterburen
+achterbuur
+achterbuurman
+achterbuurmannen
+achterbuurt
+achterbuurten
+achterbuurttaal
+achterbuurvrouw
+achterbuurvrouwen
+achterda
+achterdak
+achterdaken
+achterde
+achterdeel
+achterdek
+achterdekken
+achterdelen
+achterdenken
+achterdeur
+achterdeuren
+achterdi
+achterdijks
+achterdijkse
+achterdo
+achterdocht
+achterdochtig
+achterdochtige
+achterdochtiger
+achterdochtigheid
+achterdochtigst
+achterdoek
+achterdoeken
+achteree
+achtereen
+achtereenvolgend
+achtereenvolgende
+achtereenvolgens
+achterei
+achtereind
+achtereinde
+achtereinden
+achteren
+achterer
+achtererf
+achtererven
+achterga
+achtergaan
+achtergaat
+achtergalerij
+achtergalerijen
+achtergang
+achtergangen
+achterge
+achtergebleven
+achtergeblevene
+achtergeblevenen
+achtergebouw
+achtergebouwen
+achtergegaan
+achtergehouden
+achtergehoudene
+achtergehoudenen
+achtergelaten
+achtergelatene
+achtergelatenen
+achtergelegen
+achtergelegene
+achtergelegenen
+achtergelopen
+achtergelopene
+achtergelopenen
+achtergestaan
+achtergesteld
+achtergestelde
+achtergestelden
+achtergevel
+achtergevels
+achtergevoegd
+achtergevoegde
+achtergevoegden
+achtergezeild
+achtergezeilde
+achtergezeilden
+achtergi
+achterging
+achtergingen
+achtergr
+achtergracht
+achtergrachten
+achtergrond
+achtergronden
+achtergrondscherm
+achterha
+achterhaal
+achterhaald
+achterhaalde
+achterhaalden
+achterhaalt
+achterhalen
+achterhaling
+achterhand
+achterhanden
+achterhandsbeentje
+achterhandsbeentjes
+achterhe
+achterheen
+achterhesp
+achterhespen
+achterhi
+achterhield
+achterhielden
+achterho
+achterhoede
+achterhoeden
+achterhoedes
+achterhoek
+achterhoeken
+achterhoofd
+achterhoofden
+achterhoofdsbeen
+achterhoofdsbeenderen
+achterhoofdsbenen
+achterhoud
+achterhouden
+achterhoudend
+achterhoudende
+achterhoudender
+achterhoudendheid
+achterhoudendst
+achterhouding
+achterhoudt
+achterhout
+achterhouten
+achterhu
+achterhuis
+achterhuizen
+achterin
+achterka
+achterkamer
+achterkamers
+achterkant
+achterkanten
+achterkasteel
+achterkastelen
+achterke
+achterkeuken
+achterkeukens
+achterkl
+achterklap
+achterklappen
+achterklapt
+achterkleindochter
+achterkleindochters
+achterkleinkind
+achterkleinkinderen
+achterkleinzonen
+achterkleinzoon
+achterkleinzoons
+achterklinker
+achterklinkers
+achterkw
+achterkwartier
+achterkwartieren
+achterla
+achterlaat
+achterlader
+achterladers
+achterlag
+achterlagen
+achterland
+achterlanden
+achterlap
+achterlappen
+achterlast
+achterlasten
+achterlastig
+achterlastige
+achterlastiger
+achterlastigst
+achterlaten
+achterlating
+achterle
+achterleen
+achterleenheer
+achterleenheren
+achterleenman
+achterleenmannen
+achterlenen
+achterli
+achterlicht
+achterlichten
+achterliep
+achterliepen
+achterliet
+achterlieten
+achterlig
+achterliggen
+achterliggende
+achterligger
+achterliggers
+achterligt
+achterlijf
+achterlijk
+achterlijke
+achterlijker
+achterlijkheid
+achterlijkst
+achterlijven
+achterlo
+achterloop
+achterloops
+achterloopse
+achterloopt
+achterlopen
+achterloper
+achterlopers
+achterlu
+achterluik
+achterluiken
+achterma
+achterman
+achtermannen
+achtermi
+achtermiddag
+achtermiddagen
+achterna
+achternaad
+achternaam
+achternadeden
+achternadeed
+achternaden
+achternadoen
+achternaga
+achternagaan
+achternagedaan
+achternagegaan
+achternagelopen
+achternagelopene
+achternagelopenen
+achternagereden
+achternageredene
+achternageredenen
+achternagestuurd
+achternagestuurde
+achternagestuurden
+achternagezet
+achternagezeten
+achternagezetene
+achternagezetenen
+achternagezonden
+achternagezondene
+achternagezondenen
+achternaging
+achternagingen
+achternaliep
+achternaliepen
+achternaloop
+achternaloopt
+achternalopen
+achternamen
+achternamiddag
+achternamiddagen
+achternareden
+achternareed
+achternarijd
+achternarijden
+achternarijdt
+achternasturen
+achternastuur
+achternastuurde
+achternastuurden
+achternastuurt
+achternazat
+achternazaten
+achternazend
+achternazenden
+achternazendt
+achternazet
+achternazette
+achternazetten
+achternazit
+achternazitten
+achternazond
+achternazonden
+achternb
+achternbusch
+achterne
+achterneef
+achterneven
+achterni
+achternicht
+achternichten
+achterno
+achternoen
+achternoenen
+achterom
+achteromgelopen
+achteromgelopene
+achteromgelopenen
+achteromliep
+achteromliepen
+achteromloop
+achteromloopt
+achteromlopen
+achterommetje
+achterommetjes
+achteron
+achteronder
+achterop
+achteropgekomen
+achteropgekomene
+achteropgekomenen
+achteropgelopen
+achteropgelopene
+achteropgelopenen
+achteropgeraakt
+achteropgeraakte
+achteropgeraakten
+achteropkomen
+achteropkwam
+achteropkwamen
+achteropliep
+achteropliepen
+achteroploop
+achteroploopt
+achteroplopen
+achteropraak
+achteropraakt
+achteropraakte
+achteropraakten
+achteropraken
+achteros
+achterossen
+achterov
+achterover
+achteroverdruk
+achteroverdrukken
+achteroverdrukt
+achteroverdrukte
+achteroverdrukten
+achterovergedrukt
+achterovergedrukte
+achterovergedrukten
+achterovergelegen
+achterovergelegene
+achterovergelegenen
+achterovergevallen
+achterovergevallene
+achterovergevallenen
+achteroverlag
+achteroverlagen
+achteroverlig
+achteroverliggen
+achteroverligt
+achteroverval
+achterovervallen
+achterovervalt
+achteroverviel
+achterovervielen
+achterpa
+achterpaard
+achterpaarden
+achterpl
+achterplaats
+achterplaatsen
+achterplan
+achterplannen
+achterplecht
+achterplechten
+achterpo
+achterpoort
+achterpoorten
+achterpoot
+achterpoten
+achterru
+achterruit
+achterruiten
+achters
+achtersc
+achterschepen
+achterschip
+achtersp
+achterspeler
+achterspelers
+achterst
+achtersta
+achterstaan
+achterstaand
+achterstaande
+achterstal
+achterstallen
+achterstallig
+achterstallige
+achterstand
+achterstanden
+achterste
+achterstel
+achterstelde
+achterstelden
+achterstellen
+achterstelling
+achterstelt
+achtersten
+achterstes
+achtersteven
+achterstevens
+achterstond
+achterstonden
+achterstraat
+achterstraten
+achterstreng
+achterstrengen
+achterstuk
+achterstukken
+achterta
+achtertalie
+achtertalies
+achterui
+achteruit
+achteruitboer
+achteruitboerde
+achteruitboerden
+achteruitboeren
+achteruitboert
+achteruitdeins
+achteruitdeinsde
+achteruitdeinsden
+achteruitdeinst
+achteruitdeinzen
+achteruitga
+achteruitgaan
+achteruitgang
+achteruitgeboerd
+achteruitgeboerde
+achteruitgeboerden
+achteruitgedeinsd
+achteruitgedeinsde
+achteruitgedeinsden
+achteruitgegaan
+achteruitgekrabbeld
+achteruitgekrabbelde
+achteruitgekrabbelden
+achteruitgeleerd
+achteruitgeleerde
+achteruitgelopen
+achteruitgelopene
+achteruitgelopenen
+achteruitgeraakt
+achteruitgeraakte
+achteruitgeraakten
+achteruitgereden
+achteruitgeredene
+achteruitgeredenen
+achteruitgeschopt
+achteruitgeschopte
+achteruitgeschopten
+achteruitgeschoven
+achteruitgeschovene
+achteruitgeschovenen
+achteruitgeslagen
+achteruitgeslagene
+achteruitgeslagenen
+achteruitgevallen
+achteruitgevallene
+achteruitgevallenen
+achteruitgevlogen
+achteruitgevlogene
+achteruitgevlogenen
+achteruitgeweken
+achteruitgewekene
+achteruitgewekenen
+achteruitgewerkt
+achteruitgewerkte
+achteruitgewerkten
+achteruitgezet
+achteruitgezette
+achteruitgezetten
+achteruitging
+achteruitgingen
+achteruitkrabbelde
+achteruitkrabbelden
+achteruitkrabbelen
+achteruitleer
+achteruitleerde
+achteruitleerden
+achteruitleert
+achteruitleren
+achteruitliep
+achteruitliepen
+achteruitloop
+achteruitloopt
+achteruitlopen
+achteruitraak
+achteruitraakt
+achteruitraakte
+achteruitraakten
+achteruitraken
+achteruitreden
+achteruitreed
+achteruitrijd
+achteruitrijden
+achteruitrijdt
+achteruitschoof
+achteruitschop
+achteruitschoppen
+achteruitschopt
+achteruitschopte
+achteruitschopten
+achteruitschoven
+achteruitschuif
+achteruitschuift
+achteruitschuiven
+achteruitsla
+achteruitslaan
+achteruitsloeg
+achteruitsloegen
+achteruitval
+achteruitvallen
+achteruitvalt
+achteruitviel
+achteruitvielen
+achteruitvlieg
+achteruitvliegen
+achteruitvliegt
+achteruitvlogen
+achteruitvloog
+achteruitweek
+achteruitweken
+achteruitwerk
+achteruitwerken
+achteruitwerkt
+achteruitwerkte
+achteruitwerkten
+achteruitwijk
+achteruitwijken
+achteruitwijkt
+achteruitzet
+achteruitzette
+achteruitzetten
+achterve
+achtervertrek
+achtervertrekken
+achtervo
+achtervoeg
+achtervoegde
+achtervoegden
+achtervoegen
+achtervoeging
+achtervoegsel
+achtervoegsels
+achtervoegt
+achtervolg
+achtervolgd
+achtervolgde
+achtervolgden
+achtervolgen
+achtervolging
+achtervolgingen
+achtervolgt
+achterwa
+achterwaar
+achterwaard
+achterwaarde
+achterwaarden
+achterwaarster
+achterwaarsters
+achterwaart
+achterwaarts
+achterwaartse
+achterwacht
+achterwagen
+achterwagens
+achterwaren
+achterwe
+achterweg
+achterwege
+achterwegen
+achterwerk
+achterwerken
+achterwi
+achterwiel
+achterwielen
+achterza
+achterzak
+achterzakken
+achterze
+achterzeil
+achterzeilde
+achterzeilden
+achterzeilen
+achterzeilt
+achterzi
+achterzij
+achterzijde
+achterzijden
+achterzo
+achterzolder
+achterzolders
+achtes
+achtest
+achtet
+achteten
+achtfach
+achtfache
+achtfachen
+achtfacher
+achtfaches
+achtgebe
+achtgebend
+achtgebende
+achtgebendem
+achtgebender
+achtgebendes
+achtgege
+achtgegeben
+achthond
+achthonderd
+achthonderdduizend
+achthonderdduizendste
+achthonderdste
+achthund
+achthundert
+achthundertmal
+achthundertstel
+achting
+achtings
+achtingswaard
+achtingswaarde
+achtingswaarder
+achtingswaardig
+achtingswaardige
+achtingswaardiger
+achtingswaardigst
+achtingswaardst
+achtjaeh
+achtjaehrigen
+achtjaehriger
+achtjari
+achtjarig
+achtjarige
+achtkant
+achtkante
+achtkanten
+achtkantig
+achtkantige
+achtkoep
+achtkoepfige
+achtlos
+achtlose
+achtlosem
+achtlosen
+achtlosere
+achtloserem
+achtloseren
+achtloseres
+achtloses
+achtloseste
+achtlosesten
+achtlosester
+achtlosestes
+achtlosi
+achtlosigkeit
+achtmaan
+achtmaands
+achtmaandse
+achtman
+achtnemi
+achtneming
+achtpoti
+achtpotig
+achtpotige
+achtrege
+achtregelig
+achtregelige
+achtsam
+achtsame
+achtsamem
+achtsamer
+achtsames
+achtsamk
+achtsamkeit
+achtsamkeiten
+achtseit
+achtseitigen
+achtspal
+achtspaltig
+achtspaltigen
+achtspan
+achtspannen
+achtste
+achtsten
+achtstes
+achtstoe
+achtstoeckigen
+achtstra
+achtstrahlige
+achtstue
+achtstuendige
+achtstuendigem
+achtstuendigen
+achtstuendiges
+achtstun
+achtstundentag
+achtstundentagen
+achttaeg
+achttaegig
+achttaegigem
+achttaegigen
+achttaegiger
+achttal
+achttall
+achttallen
+achttaus
+achttausend
+achtte
+achtten
+achttien
+achttiende
+achttiende-eeuws
+achttiende-eeuwse
+achttienduizend
+achttienduizendste
+achttienhonderd
+achttienhonderdste
+achttienmaander
+achttienmaanders
+achtunds
+achtundsechzig
+achtundsiebzigjaehrige
+achtundv
+achtundvierzig
+achtundz
+achtundzwanzig
+achtung
+achtungs
+achtungsbeifall
+achtungsvoll
+achtungsvolle
+achtungsvollem
+achtungsvoller
+achtungsvollere
+achtungsvollerem
+achtungsvollerer
+achtungsvolleres
+achtungsvolles
+achtungsvollstem
+achtungsvollsten
+achtungsvollster
+achturem
+achturemis
+achturemissen
+achturen
+achturendag
+achturendagen
+achturig
+achturige
+achtvlak
+achtvlakken
+achtvlakkig
+achtvlakkige
+achtvoet
+achtvoetig
+achtvoetige
+achtvoud
+achtvouden
+achtvoudig
+achtvoudige
+achtwoec
+achtwoechige
+achtwoechigen
+achtzehn
+achtzehntaegige
+achtzehnte
+achtzehntem
+achtzehnter
+achtzehntes
+achtzig
+achtzigj
+achtzigjaehrig
+achtzigjaehrigem
+achtzigjaehrigen
+achtzigjaehriger
+achtzigs
+achtzigste
+achtzigstem
+achtzigsten
+achtzigstes
+achtzijd
+achtzijdig
+achtzijdige
+achtzyli
+achtzylinder
+achual
+achuale
+achuar
+achuara
+achuas
+achubascarse
+achuchar
+achucharrar
+achucho`n
+achucuyar
+achulada
+achulado
+achulaparse
+achularse
+achumawi
+achung
+achupalla
+achura
+achurador
+achurar
+achy
+achylia
+achylous
+achymia
+achymous
+achyrant
+achyranthes
+achyrode
+achyrodes
+achzib
+achzig
+achzigst
+achzigste
+aci
+aci`bar
+aci`dula
+aci`dulo
+aciaga
+aciago
+acial
+aciano
+acianos
+aciar
+acibarar
+acibarrar
+aciberar
+acicalada
+acicalado
+acicalador
+acicaladora
+acicaladura
+acicalamiento
+acicalar
+acicate
+acicatear
+aciche
+acichlor
+acichloride
+aciclo
+acicula
+acicular
+acicularly
+aciculat
+aciculate
+aciculated
+aciculum
+acid
+acida
+acidalia
+acidalio
+acidanth
+acidanthera
+acidaque
+acidaspi
+acidaspis
+acidblob
+acide
+acidemia
+acider
+acides
+acidez
+acidhead
+acidheads
+acidi
+acidi`metro
+acidia
+acidic
+acidifer
+acidiferous
+acidifia
+acidifiable
+acidifiant
+acidific
+acidificar
+acidification
+acidifie
+acidified
+acidifier
+acidifiers
+acidifies
+acidify
+acidifyi
+acidifying
+acidimet
+acidimeter
+acidimetri`a
+acidimetric
+acidimetrical
+acidimetrically
+acidimetry
+acidiosa
+acidioso
+acidita
+acidite
+acidite'
+acidite's
+aciditie
+acidities
+acidity
+acidize
+acidly
+acidness
+acido
+acidoid
+acidolog
+acidology
+acidomet
+acidometer
+acidometry
+acidophi
+acidophile
+acidophilic
+acidophilous
+acidophilus
+acidopro
+acidoproteolytic
+acidorresistente
+acidoses
+acidosis
+acidoste
+acidosteophyte
+acidotic
+acidproo
+acidproof
+acids
+acidular
+acidulat
+acidulate
+acidulated
+acidulates
+acidulating
+acidulation
+acidule'
+acidule'e
+acidule'es
+acidule's
+acidulen
+acidulent
+aciduler
+acidulou
+acidulous
+acidulously
+acidulousness
+acidum
+aciduric
+acidy
+acidyl
+acie'rer
+acie'rie
+acie'ries
+acier
+acierage
+acieral
+acierate
+acierati
+acieration
+aciers
+acierto
+aciform
+aciguatada
+aciguatado
+aciguatar
+aciguatarse
+acijada
+acijado
+acije
+acijosa
+acijoso
+aciliate
+aciliated
+acilio
+acilius
+acilowe
+acimboga
+acimentarse
+acimut
+acimutal
+acinaceo
+acinaceous
+acinaces
+acinacif
+acinacifolious
+acinaciform
+acinafor
+acinaform
+acinar
+acinario
+acinarious
+acinary
+acinesia
+acineta
+acinetae
+acinetan
+acinetar
+acinetaria
+acinetarian
+acinetic
+acinetif
+acinetiform
+acinetin
+acinetina
+acinetinan
+acing
+acinic
+acinifor
+aciniform
+acinose
+acinotub
+acinotubular
+acinous
+acinturar
+acinus
+acio`n
+acionera
+acionero
+acipada
+acipado
+acipense
+acipenser
+acipenseres
+acipenserid
+acipenseridae
+acipenserine
+acipenseroid
+acipenseroidei
+acipre`s
+acira
+acirate
+aciro`n
+acis
+acitara
+acito
+acitro`n
+aciurgy
+acivilar
+ack
+ackaouy
+ackbar
+ackel
+ackentho
+ackenthorpe
+acker
+ackerbau
+ackerbaubetrieb
+ackerbauer
+ackerbauers
+ackerbaus
+ackerbautreibende
+ackerbautreibendem
+ackerbautreibenden
+ackerbautreibendes
+ackerbod
+ackerboden
+ackerbody
+ackerfla
+ackerflaeche
+ackergae
+ackergaeule
+ackergaeulen
+ackergau
+ackergaules
+ackerger
+ackergeraete
+ackerhea
+ackerhead
+ackerhof
+ackeridg
+ackeridge
+ackerly
+ackerman
+ackermann
+ackermanville
+ackernum
+ackeropt
+ackeroptlev
+ackers
+ackersch
+ackerschlepperfabrik
+ackert
+ackertab
+ackertabbody
+ackertabhdr
+ackertabhead
+ackertabnum
+ackertop
+ackerwag
+ackerwagen
+ackey
+ackla
+ackland
+ackles
+ackley
+acklin
+acklins
+ackman
+acknak
+acknow
+acknowle
+acknowledg
+acknowledge
+acknowledgeable
+acknowledged
+acknowledgedly
+acknowledgement
+acknowledgements
+acknowledger
+acknowledgers
+acknowledges
+acknowledgeth
+acknowledging
+acknowledgment
+acknowledgments
+ackompan
+ackompanjera
+ackridge
+ackroyd
+ackumula
+ackumulativ
+ackumulativa
+ackumulator
+ackumulatorn
+ackumule
+ackumulera
+ackva
+ackwood
+ackworth
+acl
+aclamacio`n
+aclamador
+aclamadora
+aclamar
+acland
+aclaracio`n
+aclarada
+aclarado
+aclarador
+aclaradora
+aclarar
+aclaratoria
+aclaratorio
+aclarecer
+aclareo
+aclastic
+aclavelada
+aclavelado
+acle
+acleida
+acleidia
+acleidian
+acleido
+acleisto
+acleistous
+aclemon
+aclidian
+aclimatacio`n
+aclimatar
+aclinal
+aclinic
+aclm
+aclocar
+aclorhi`drica
+aclorhi`drico
+aclorhidria
+acloud
+aclu
+aclys
+acm
+acmaea
+acmaeida
+acmaeidae
+acmatic
+acme
+acme`
+acmes
+acmesthe
+acmesthesia
+acmetoni
+acmetonia
+acmic
+acmispon
+acmite
+acn
+acne
+acne`
+acned
+acneform
+acneifor
+acneiform
+acnemia
+acnes
+acnida
+acnodal
+acnode
+acns
+aco
+aco`lcetra
+aco`lito
+aco`nito
+acobardamiento
+acobardar
+acobdadura
+acobdar
+acobdiciar
+acobijar
+acobijo
+acobrada
+acobrado
+acocanth
+acocanthera
+acocantherin
+acocarse
+acoceador
+acoceadora
+acoceamiento
+acocear
+acocharse
+acochinar
+acocili
+acock
+acockbil
+acockbill
+acoclarse
+acocotar
+acocote
+acocotl
+acodada
+acodado
+acodadura
+acodalamiento
+acodalar
+acodar
+acoderamiento
+acoderar
+acodiciar
+acodillar
+acodo
+acoela
+acoeloma
+acoelomata
+acoelomate
+acoelomatous
+acoelomi
+acoelomo
+acoelomous
+acoelous
+acoemeta
+acoemetae
+acoemeti
+acoemetic
+acoff
+acogediza
+acogedizo
+acogedor
+acogedora
+acoger
+acogeta
+acogida
+acogido
+acogimiento
+acogollar
+acogombradura
+acogombrar
+acogotar
+acogullada
+acogullado
+acohombrar
+acoin
+acoine
+acoita
+acoitar
+acojinamiento
+acojinar
+acolada
+acolapis
+acolapissa
+acolar
+acolchada
+acolchado
+acolchar
+acolchonar
+acold
+acolgar
+acolhua
+acolhuan
+acoli
+acoliet
+acoliete
+acolieten
+acolitado
+acolitar
+acollador
+acollar
+acollarada
+acollarado
+acollarar
+acollido
+acollonar
+acolmillado
+acologic
+acology
+acolothy
+acolothyst
+acolous
+acoluthi
+acoluthic
+acolyte
+acolytes
+acolyth
+acolytha
+acolythate
+acoma
+acombar
+acome
+acomedida
+acomedido
+acomedirse
+acomendador
+acomendadora
+acomendamiento
+acomendante
+acomendar
+acometedor
+acometedora
+acometer
+acometida
+acometiente
+acometimiento
+acometividad
+acomia
+acomodable
+acomodacio`n
+acomodada
+acomodadamente
+acomodadiza
+acomodadizo
+acomodado
+acomodador
+acomodadora
+acomodamiento
+acomodar
+acomodaticia
+acomodaticio
+acomodo
+acomous
+acompa\ada
+acompa\ado
+acompa\ador
+acompa\adora
+acompa\amiento
+acompa\anta
+acompa\ante
+acompa\ar
+acompasada
+acompasadamente
+acompasado
+acompasar
+acomplexionada
+acomplexionado
+acompte
+acomptes
+acomunalar
+acomunarse
+acon
+aconativ
+aconative
+aconcagu
+aconcagua
+aconchabarse
+aconchadillo
+aconchar
+acondicionada
+acondicionado
+acondicionamiento
+acondicionar
+aconduchar
+acondylo
+acondylose
+acondylous
+acone
+acongojadamente
+acongojador
+acongojadora
+acongojante
+acongojar
+aconhortar
+aconic
+aconin
+aconine
+aconital
+aconite
+aconites
+aconitia
+aconitic
+aconitin
+aconitina
+aconitine
+aconitum
+aconsejable
+aconsejada
+aconsejado
+aconsejador
+aconsejadora
+aconsejar
+aconsonantar
+acontar
+acontecedera
+acontecedero
+acontecer
+acontecida
+acontecido
+acontecimiento
+acontentar
+acontiada
+acontiado
+acontias
+acontium
+acontius
+aconures
+aconuresis
+aconvido
+acooli
+acopada
+acopado
+acopar
+acopetada
+acopetado
+acopiador
+acopiadora
+acopiamiento
+acopiar
+acopic
+acopio
+acoplado
+acopladura
+acoplamiento
+acoplar
+acopon
+acopyrin
+acopyrine
+acoquinamiento
+acoquinar
+acoquine
+acoquiner
+acor
+acorar
+acorazada
+acorazado
+acorazamiento
+acorazar
+acorazonada
+acorazonado
+acorchada
+acorchado
+acorchamiento
+acorcharse
+acord
+acordablemente
+acordacio`n
+acordada
+acordadamente
+acordado
+acordamiento
+acordante
+acordantemente
+acordanza
+acordar
+acorde
+acordelar
+acordemente
+acordeo`n
+acordeonista
+acordonada
+acordonado
+acordonamiento
+acordonar
+acorea
+acores
+acoria
+acorn
+acornada
+acornado
+acornar
+acorneador
+acorneadora
+acornear
+acorned
+acorns
+acorralamiento
+acorralar
+acorredor
+acorredora
+acorrer
+acorrimiento
+acorro
+acorrucarse
+acortadizo
+acortamiento
+acortar
+acorullar
+acorus
+acorvar
+acorzar
+acosadamente
+acosador
+acosadora
+acosamiento
+acosar
+acosh
+acosijar
+acosmic
+acosmism
+acosmismo
+acosmist
+acosmistic
+acoso
+acosta
+acostada
+acostado
+acostamiento
+acostar
+acostumbradamente
+acostumbrar
+acotacio`n
+acotada
+acotamiento
+acotar
+acotiledo`n
+acotiledo`nea
+acotiledo`neo
+acotillo
+acotolar
+acotyled
+acotyledon
+acotyledonous
+acouasm
+acouchi
+acouchy
+acoumete
+acoumeter
+acoumetr
+acoumetry
+acouomet
+acouometer
+acouopho
+acouophonia
+acoupa
+acousmat
+acousmata
+acousmatic
+acoustic
+acoustical
+acoustically
+acoustician
+acousticolateral
+acousticon
+acoustics
+acoustiq
+acoustique
+acoustiques
+acoy
+acoyundar
+acoyuntar
+acoyuntero
+acp
+acqua
+acquaint
+acquaintance
+acquaintances
+acquaintanceship
+acquaintanceships
+acquaintancy
+acquaintant
+acquainted
+acquaintedness
+acquaintenace
+acquainting
+acquaints
+acquanet
+acquanetta
+acquari
+acquario
+acquaviv
+acquaviva
+acquavivacollecroce
+acque
+acque'ra
+acque'raient
+acque'rais
+acque'rait
+acque'rant
+acque're
+acque'reur
+acque'reurs
+acque'rez
+acque'ri
+acque'riez
+acque'rions
+acque'rir
+acque'ro
+acque'rons
+acque^t
+acque^ts
+acquedot
+acquedotti
+acquedotto
+acquerra
+acquerrai
+acquerraient
+acquerrais
+acquerrait
+acquerras
+acquerre
+acquerrez
+acquerri
+acquerriez
+acquerrions
+acquerro
+acquerrons
+acquerront
+acquest
+acquie`r
+acquie`re
+acquie`rent
+acquie`res
+acquiers
+acquiert
+acquiesc
+acquiesc/a
+acquiesc/aient
+acquiesc/ais
+acquiesc/ait
+acquiesc/ant
+acquiesc/ons
+acquiesce
+acquiesce'
+acquiesce`rent
+acquiesced
+acquiescement
+acquiescence
+acquiescency
+acquiescent
+acquiescently
+acquiescer
+acquiescera
+acquiescerai
+acquiesceraient
+acquiescerais
+acquiescerait
+acquiesceras
+acquiescerez
+acquiesceriez
+acquiescerions
+acquiescerons
+acquiesceront
+acquiesces
+acquiescez
+acquiesciez
+acquiescing
+acquiescingly
+acquiescions
+acquiese
+acquiesence
+acquieta
+acquietai
+acquietano
+acquietare
+acquietata
+acquietate
+acquietati
+acquietato
+acquietava
+acquietavi
+acquietavo
+acquiete
+acquietera
+acquietero
+acquieti
+acquietino
+acquieto
+acquirab
+acquirability
+acquirable
+acquire
+acquired
+acquirem
+acquirement
+acquirements
+acquiren
+acquirenda
+acquirent
+acquirente
+acquirenti
+acquirer
+acquirers
+acquires
+acquirin
+acquiring
+acquis
+acquise
+acquises
+acquisib
+acquisible
+acquisir
+acquisirete
+acquisit
+acquisite
+acquisited
+acquisitie
+acquisities
+acquisition
+acquisitions
+acquisitive
+acquisitively
+acquisitiveness
+acquisitor
+acquisitum
+acquist
+acquista
+acquistai
+acquistano
+acquistare
+acquistata
+acquistate
+acquistati
+acquistato
+acquistava
+acquistavi
+acquistavo
+acquiste
+acquistera
+acquistero
+acquisti
+acquistino
+acquisto
+acquit
+acquitme
+acquitment
+acquitri
+acquitrini
+acquitrino
+acquits
+acquitta
+acquittaient
+acquittais
+acquittait
+acquittal
+acquittals
+acquittance
+acquittant
+acquitte
+acquitte'
+acquitte'e
+acquitte'es
+acquitte's
+acquitte`rent
+acquitted
+acquitteer
+acquitteerde
+acquitteerden
+acquitteert
+acquittement
+acquittements
+acquittent
+acquitter
+acquittera
+acquitterai
+acquitteraient
+acquitterais
+acquitterait
+acquitteras
+acquitteren
+acquitterez
+acquitteriez
+acquitterions
+acquitterons
+acquitteront
+acquittes
+acquittez
+acquitti
+acquittiez
+acquitting
+acquittions
+acquitto
+acquittons
+acr
+acra
+acra`tica
+acra`tico
+acrab
+acracia
+acracy
+acraein
+acraeina
+acraeinae
+acraldeh
+acraldehyde
+acrania
+acranial
+acraniat
+acraniate
+acrasia
+acrasiac
+acrasiaceae
+acrasial
+acrasiales
+acrasida
+acrasiea
+acrasieae
+acrasped
+acraspeda
+acraspedote
+acratia
+acrature
+acraturesis
+acrawl
+acraze
+acre
+acreable
+acreage
+acreages
+acreak
+acream
+acrebite
+acrecencia
+acrecentador
+acrecentadora
+acrecentamiento
+acrecentante
+acrecentar
+acrecer
+acrecimiento
+acred
+acreditada
+acreditado
+acreditar
+acreditativa
+acreditativo
+acredula
+acree
+acreedor
+acreedora
+acreer
+acreman
+acremente
+acres
+acrescente
+acrestaf
+acrestaff
+acri`dido
+acrianzada
+acrianzado
+acrianzar
+acribador
+acribadora
+acribadura
+acribar
+acribie
+acribillar
+acrid
+acridan
+acrider
+acridest
+acridian
+acridic
+acridida
+acrididae
+acridiid
+acridiidae
+acridine
+acridini
+acridinic
+acridinium
+acriditi
+acridities
+acridity
+acridium
+acridly
+acridnes
+acridness
+acridone
+acridoni
+acridonium
+acridoph
+acridophagus
+acridyl
+acriflav
+acriflavin
+acriflavine
+acriminacio`n
+acriminador
+acriminadora
+acriminar
+acrimoni
+acrimonia
+acrimonie
+acrimonies
+acrimonious
+acrimoniously
+acrimoniousness
+acrimony
+acrindol
+acrindoline
+acrinyl
+acriollada
+acriollado
+acriollarse
+acrisia
+acrisius
+acrisoladamente
+acrisolador
+acrisoladora
+acrisolar
+acristianada
+acristianado
+acristianar
+acrita
+acritan
+acrite
+acritica
+acritical
+acritol
+acritud
+acritude
+acro`bata
+acro`nica
+acro`nico
+acro`polis
+acro`stica
+acro`stico
+acroa
+acroaest
+acroaesthesia
+acroama
+acroama`tica
+acroama`tico
+acroamat
+acroamatic
+acroamatical
+acroamatics
+acroanes
+acroanesthesia
+acroarth
+acroarthritis
+acroasph
+acroasphyxia
+acroatax
+acroataxia
+acroatic
+acroba`tica
+acroba`tico
+acrobaat
+acrobacia
+acrobacy
+acrobat
+acrobate
+acrobaten
+acrobatentoer
+acrobatentoeren
+acrobates
+acrobath
+acrobatholithic
+acrobati
+acrobatic
+acrobatical
+acrobatically
+acrobatics
+acrobatie
+acrobatieen
+acrobaties
+acrobatique
+acrobatiques
+acrobatisch
+acrobatische
+acrobatischer
+acrobatischt
+acrobatism
+acrobatismo
+acrobats
+acroblas
+acroblast
+acrobryo
+acrobryous
+acrobyst
+acrobystitis
+acrocarp
+acrocarpi
+acrocarpous
+acroceph
+acrocephalia
+acrocephalic
+acrocephalous
+acrocephaly
+acrocera
+acroceratidae
+acroceraunian
+acroceri
+acroceridae
+acrochor
+acrochordidae
+acrochordinae
+acrochordon
+acroclin
+acroclinium
+acrocomi
+acrocomia
+acroconi
+acroconidium
+acrocont
+acrocontracture
+acrocora
+acrocoracoid
+acrocyan
+acrocyanosis
+acrocyst
+acrodact
+acrodactylum
+acroderm
+acrodermatitis
+acrodont
+acrodontism
+acrodrom
+acrodrome
+acrodromous
+acrodus
+acrodyni
+acrodynia
+acroe
+acroesth
+acroesthesia
+acrofobia
+acrogamo
+acrogamous
+acrogamy
+acrogen
+acrogeni
+acrogenic
+acrogeno
+acrogenous
+acrogenously
+acrograp
+acrography
+acrogyna
+acrogynae
+acrogyno
+acrogynous
+acrolein
+acrolith
+acrolithan
+acrolithic
+acroliths
+acrologi
+acrologic
+acrologically
+acrologism
+acrologu
+acrologue
+acrology
+acroma`tica
+acroma`tico
+acromada
+acromado
+acromani
+acromania
+acromast
+acromastitis
+acromati
+acromatic
+acromatismo
+acromatizar
+acromatopsia
+acromega
+acromegalia
+acromegalic
+acromegalies
+acromegaly
+acromela
+acromelalgia
+acromete
+acrometer
+acromial
+acromiana
+acromiano
+acromicr
+acromicria
+acromio
+acromioc
+acromioclavicular
+acromiocoracoid
+acromiod
+acromiodeltoid
+acromioh
+acromiohumeral
+acromiohyoid
+acromion
+acromios
+acromioscapular
+acromiosternal
+acromiot
+acromiothoracic
+acromono
+acromonogrammatic
+acrompha
+acromphalus
+acromyod
+acromyodi
+acromyodian
+acromyodic
+acromyodous
+acromyot
+acromyotonia
+acromyotonus
+acron
+acronarc
+acronarcotic
+acroneur
+acroneurosis
+acronica
+acronical
+acronically
+acroniem
+acroniemen
+acronyc
+acronych
+acronyct
+acronycta
+acronyctous
+acronym
+acronymi
+acronymic
+acronymize
+acronymized
+acronymo
+acronymous
+acronyms
+acronyx
+acrook
+acropara
+acroparalysis
+acropare
+acroparesthesia
+acropath
+acropathology
+acropathy
+acropeta
+acropetal
+acropetally
+acrophob
+acrophobia
+acrophon
+acrophonetic
+acrophonic
+acrophony
+acropodi
+acropodium
+acropole
+acropoleis
+acropoli
+acropolis
+acropolises
+acropolitan
+acropora
+acrorhag
+acrorhagus
+acrorrhe
+acrorrheuma
+acrosarc
+acrosarcum
+acroscle
+acroscleriasis
+acroscleroderma
+acroscop
+acroscopic
+acrose
+acrosome
+acrospha
+acrosphacelus
+acrospir
+acrospire
+acrospor
+acrospore
+acrosporous
+across
+acrostic
+acrostical
+acrostically
+acrostichal
+acrosticheae
+acrostichic
+acrostichoid
+acrostichon
+acrostichons
+acrostichum
+acrosticism
+acrostics
+acrostol
+acrostolio
+acrostolion
+acrostolium
+acrotars
+acrotarsial
+acrotarsium
+acrotele
+acroteleutic
+acrotera
+acroteri
+acroteria
+acroterial
+acroteric
+acroterio
+acroterium
+acrothor
+acrothoracica
+acrotic
+acrotism
+acrotomo
+acrotomous
+acrotret
+acrotreta
+acrotretidae
+acrotrop
+acrotrophic
+acrotrophoneurosis
+acroy
+acrress
+acrux
+acrydium
+acryl
+acrylald
+acrylaldehyde
+acrylate
+acrylgla
+acrylglas
+acrylic
+acrylics
+acryliqu
+acrylique
+acryliques
+acryloni
+acrylonitrile
+acrylyl
+acrz
+acs
+acscsun
+acscvax
+acss
+act
+acta
+actabili
+actability
+actable
+actaea
+actaeace
+actaeaceae
+actaeon
+actaeoni
+actaeonidae
+actc
+acte
+actea
+acted
+acteer
+acteerde
+acteerden
+acteert
+acteren
+actes
+acteur
+acteurs
+acteursl
+acteursloopbaan
+acti
+acti`nica
+acti`nico
+actiad
+actian
+actie
+actief
+actiefst
+actiehan
+actiehandel
+actien
+actienge
+actiengesellschaft
+actiepla
+actieplan
+actierad
+actieradius
+acties
+actieve
+actiever
+actif
+actifica
+actification
+actifier
+actifs
+actify
+actin
+actinal
+actinall
+actinally
+actinaut
+actinautographic
+actinautography
+actine
+actinenc
+actinenchyma
+acting
+actings
+actinia
+actinian
+actiniar
+actiniaria
+actiniarian
+actinic
+actinica
+actinically
+actinide
+actinides
+actinidi
+actinidia
+actinidiaceae
+actinife
+actiniferous
+actinifo
+actiniform
+actinine
+actinio
+actinioc
+actiniochrome
+actinioh
+actiniohematin
+actiniom
+actiniomorpha
+actinisc
+actinisch
+actinische
+actinism
+actinismo
+actinist
+actinistia
+actinium
+actiniumet
+actiniums
+actino`grafo
+actino`metro
+actinoba
+actinobacillosis
+actinobacillus
+actinobl
+actinoblast
+actinobr
+actinobranch
+actinobranchia
+actinoca
+actinocarp
+actinocarpic
+actinocarpous
+actinoch
+actinochemistry
+actinocr
+actinocrinid
+actinocrinidae
+actinocrinite
+actinocrinus
+actinocu
+actinocutitis
+actinode
+actinodermatitis
+actinodi
+actinodielectric
+actinodr
+actinodrome
+actinodromous
+actinoel
+actinoelectric
+actinoelectrically
+actinoelectricity
+actinogo
+actinogonidiate
+actinogr
+actinogram
+actinograph
+actinography
+actinoid
+actinoida
+actinoidea
+actinoli
+actinolite
+actinolitic
+actinolo
+actinologous
+actinologue
+actinology
+actinome
+actinome`trica
+actinome`trico
+actinomere
+actinomeric
+actinometer
+actinometers
+actinometri`a
+actinometric
+actinometrical
+actinometry
+actinomices
+actinomicosis
+actinomo
+actinomorfa
+actinomorphic
+actinomorphous
+actinomorphy
+actinomy
+actinomyces
+actinomycetaceae
+actinomycetales
+actinomycete
+actinomycetous
+actinomycin
+actinomycoma
+actinomycosis
+actinomycotic
+actinomyxidia
+actinomyxidiida
+actinon
+actinone
+actinonema
+actinoneuritis
+actinoph
+actinophone
+actinophonic
+actinophore
+actinophorous
+actinophryan
+actinophrys
+actinopo
+actinopoda
+actinopr
+actinopraxis
+actinopt
+actinopteran
+actinopteri
+actinopterous
+actinopterygian
+actinopterygii
+actinopterygious
+actinosc
+actinoscopy
+actinoso
+actinosoma
+actinosome
+actinosp
+actinosphaerium
+actinost
+actinostereoscopy
+actinostomal
+actinostome
+actinota
+actinoth
+actinotherapeutic
+actinotherapeutics
+actinotherapy
+actinoto
+actinotoxemia
+actinotr
+actinotrichium
+actinotrocha
+actinour
+actinouranium
+actinozo
+actinozoa
+actinozoal
+actinozoan
+actinozoon
+actinula
+action
+actionab
+actionability
+actionable
+actionably
+actionai
+actionair
+actionairs
+actional
+actionar
+actionary
+actiondo
+actiondominated
+actioner
+actionfi
+actionfilm
+actioniz
+actionize
+actionle
+actionless
+actionna
+actionnaient
+actionnaire
+actionnaires
+actionnais
+actionnait
+actionnant
+actionnariat
+actionne
+actionne'
+actionne'e
+actionne'es
+actionne's
+actionne`rent
+actionnent
+actionner
+actionnera
+actionnerai
+actionneraient
+actionnerais
+actionnerait
+actionneras
+actionnerez
+actionneriez
+actionnerions
+actionnerons
+actionneront
+actionnes
+actionnez
+actionni
+actionniez
+actionnions
+actionno
+actionnons
+actions
+actionte
+actionteam
+actipyle
+actipylea
+actitar
+actitud
+actium
+activa
+activabl
+activable
+activaie
+activaient
+activais
+activait
+activamente
+activant
+activar
+activate
+activated
+activates
+activati
+activating
+activation
+activations
+activato
+activator
+activators
+active
+active'
+active'e
+active'es
+active's
+active`r
+active`rent
+activeer
+activeerde
+activeerden
+activeert
+activehi
+activehigh
+activelo
+activelow
+actively
+activeme
+activement
+activene
+activeness
+activent
+activer
+activera
+activerai
+activeraient
+activerais
+activerait
+activeras
+activere
+activeren
+activerez
+activeri
+activeriez
+activerions
+activero
+activerons
+activeront
+actives
+activez
+actividad
+activiez
+activin
+activion
+activions
+activism
+activisme
+activisms
+activist
+activiste
+activisten
+activistes
+activistic
+activists
+activita
+activital
+activite
+activite'
+activite's
+activiteit
+activiteiten
+activiteitencommissie
+activiteitstraktement
+activiteitstraktementen
+activites
+activiti
+activities
+activity
+activize
+activo
+activons
+actless
+actnm
+actomyos
+actomyosin
+acton
+actor
+actora
+actorish
+actors
+actorshi
+actorship
+actress
+actresse
+actresses
+actrice
+actrices
+actriz
+acts
+actu
+actuacio`n
+actuada
+actuado
+actuaire
+actuaires
+actual
+actualidad
+actualis
+actualisa
+actualisaient
+actualisais
+actualisait
+actualisant
+actualisation
+actualisations
+actualise
+actualise'
+actualise'e
+actualise'es
+actualise's
+actualise`rent
+actualisent
+actualiser
+actualisera
+actualiserai
+actualiseraient
+actualiserais
+actualiserait
+actualiseras
+actualiserez
+actualiseriez
+actualiserions
+actualiserons
+actualiseront
+actualises
+actualisez
+actualisiez
+actualisions
+actualism
+actualisme
+actualisons
+actualist
+actualistic
+actualit
+actualite'
+actualite's
+actualiteit
+actualiteiten
+actualities
+actuality
+actualiz
+actualizar
+actualization
+actualize
+actualized
+actualizes
+actualizing
+actually
+actualmente
+actualne
+actualness
+actuals
+actualva
+actualvalue
+actuante
+actuar
+actuaria
+actuarial
+actuarially
+actuarian
+actuariat
+actuarie
+actuarieel
+actuariel
+actuariele
+actuarielle
+actuarielles
+actuariels
+actuaries
+actuario
+actuaris
+actuarissen
+actuary
+actuarys
+actuaryship
+actuate
+actuated
+actuates
+actuatin
+actuating
+actuatio
+actuation
+actuator
+actuators
+actueel
+actueels
+actueelst
+actuel
+actuele
+actueler
+actuelle
+actuellement
+actuelles
+actuels
+actuosa
+actuosidad
+actuoso
+acture
+acturien
+acturience
+actutate
+acu
+acu\acio`n
+acu\ador
+acu\adora
+acu\ar
+acu`leo
+acu`stica
+acu`stico
+acua
+acua`tica
+acua`tico
+acua`til
+acuadrillar
+acuaesth
+acuaesthesia
+acuan
+acuantiar
+acuarela
+acuareli`stica
+acuareli`stico
+acuarelista
+acuario
+acuartar
+acuartelada
+acuartelado
+acuartelamiento
+acuartelar
+acuartillar
+acuate
+acuation
+acubada
+acubado
+acubens
+acubilar
+acucharada
+acucharado
+acuchillada
+acuchilladizo
+acuchillado
+acuchillador
+acuchilladora
+acuchillar
+acucia
+acuciadamente
+acuciador
+acuciadora
+acuciamiento
+acuciar
+acuciosa
+acuciosamente
+acuciosidad
+acucioso
+acuclillarse
+acuclosu
+acuclosure
+acudiciarse
+acudidero
+acudimiento
+acudir
+acuducto
+acuductor
+acueducto
+acuerdada
+acuerdado
+acuerdo
+acuesthe
+acuesthesia
+acuesto
+acuff
+acuidad
+acuidadarse
+acuitadamente
+acuitamiento
+acuitar
+acuite'
+acuities
+acuity
+aculada
+aculado
+acular
+aculea
+aculeata
+aculeate
+aculeated
+aculebrinada
+aculebrinado
+aculeifo
+aculeiform
+aculeola
+aculeolate
+aculeolu
+aculeolus
+aculeus
+aculla`
+aculo
+acumbrar
+acumen
+acumens
+acuminada
+acuminado
+acuminat
+acuminate
+acuminated
+acumination
+acuminos
+acuminosa
+acuminose
+acuminoso
+acuminou
+acuminous
+acuminul
+acuminulate
+acumulable
+acumulacio`n
+acumulador
+acumuladora
+acumulamiento
+acumular
+acumulativa
+acumulativamente
+acunar
+acuntir
+acuosa
+acuosidad
+acuoso
+acuponct
+acuponcteur
+acuponcteurs
+acuponctrice
+acuponctrices
+acuponcture
+acupress
+acupressure
+acupunct
+acupuncteur
+acupuncteurs
+acupunctrice
+acupunctrices
+acupunctuate
+acupunctuation
+acupuncturation
+acupuncturator
+acupuncture
+acupuncturist
+acupuncturists
+acupuntura
+acurada
+acuradamente
+acurado
+acurativ
+acurative
+acure
+acurrucarse
+acurrullar
+acusable
+acusacio`n
+acusada
+acusado
+acusador
+acusadora
+acusamiento
+acusante
+acusanza
+acusar
+acusativo
+acusatoria
+acusatorio
+acusd
+acuse
+acusetas
+acusete
+acushla
+acushnet
+acusica
+acuso
+acuso`n
+acusona
+acustica
+acustico
+acustisc
+acustisch
+acustische
+acuta
+acuta`ngulo
+acutangu
+acutangular
+acutate
+acute
+acutely
+acutenac
+acutenaculum
+acutenes
+acuteness
+acuter
+acutes
+acutest
+acuti
+acuti`
+acutiato
+acutiator
+acutifol
+acutifoliate
+acutilin
+acutilinguae
+acutilingual
+acutilob
+acutilobate
+acutipla
+acutiplantar
+acutish
+acuto
+acutogra
+acutograve
+acutonod
+acutonodose
+acutorsi
+acutorsion
+acuut
+acuutst
+acworth
+acy
+acyanobl
+acyanoblepsia
+acyanops
+acyanopsia
+acyclic
+acyclica
+acyclically
+acye
+acyesis
+acyetic
+acyl
+acylamid
+acylamido
+acylamidobenzene
+acylamin
+acylamino
+acylate
+acylatio
+acylation
+acylogen
+acyloin
+acyloxy
+acyloxym
+acyloxymethane
+acyrolog
+acyrological
+acyrology
+acystia
+aczel
+ad
+ada
+ada-vax
+ada`n
+ada`raga
+ada`rame
+ada`rgama
+adabana
+adabe
+adac
+adachi
+adachika
+adachiku
+adachimi
+adacilla
+adactyl
+adactyli
+adactylia
+adactylism
+adactylo
+adactylous
+adad
+adadah
+adaequat
+adaequater
+adafina
+adaga
+adage
+adagency
+adagera
+adagerai
+adagereb
+adagerebbe
+adagerei
+adagerem
+adageremmo
+adageremo
+adageres
+adagereste
+adageresti
+adageret
+adagerete
+adagero
+adages
+adagi
+adagia
+adagiai
+adagial
+adagiamm
+adagiammo
+adagiamo
+adagiand
+adagiando
+adagiano
+adagiare
+adagiaro
+adagiarono
+adagiass
+adagiasse
+adagiassi
+adagiast
+adagiaste
+adagiasti
+adagiata
+adagiate
+adagiati
+adagiato
+adagiava
+adagiavamo
+adagiavano
+adagiavate
+adagiavi
+adagiavo
+adagiett
+adagietto
+adagino
+adagio
+adagio's
+adagioen
+adagios
+adagium
+adaguar
+adah
+adahala
+adahm
+adai
+adaiah
+adair
+adairsvi
+adairsville
+adairvil
+adairville
+adaize
+adajyo
+adakkyuu
+adal
+adala
+adalat
+adalbert
+adalberta
+adalberto
+adalgisa
+adalia
+adalid
+adaline
+adam
+adama
+adamada
+adamadamente
+adamado
+adamadura
+adamah
+adamance
+adamances
+adamanci
+adamancies
+adamancy
+adamant
+adamante
+adamantean
+adamanti
+adamantina
+adamantine
+adamantino
+adamantinoma
+adamantl
+adamantly
+adamanto
+adamantoblast
+adamantoblastoma
+adamantoid
+adamantoma
+adamants
+adamaoua
+adamar
+adamarse
+adamas
+adamascada
+adamascado
+adamascar
+adamasco
+adamasto
+adamastor
+adamawa
+adamawae
+adamawaeastern
+adamawau
+adamawaubangi
+adamawaubangian
+adambula
+adambulacral
+adamczyk
+adamec
+adamek
+adamelli
+adamellite
+adamhood
+adami
+adamic
+adamical
+adamically
+adamidos
+adamine
+adamira
+adamismo
+adamita
+adamite
+adamitic
+adamitical
+adamitis
+adamitism
+adamkows
+adamkowski
+adamo
+adamorob
+adamorobe
+adamou
+adamovsk
+adamovska
+adamowic
+adamowicz
+adams
+adams-su
+adams-sun
+adamsapf
+adamsapfel
+adamsapp
+adamsappel
+adamsappels
+adamsbas
+adamsbasin
+adamsbur
+adamsburg
+adamscen
+adamscenter
+adamsepl
+adamseple
+adamseplet
+adamsia
+adamsite
+adamski
+adamskos
+adamskostuem
+adamskostuum
+adamsmil
+adamsmills
+adamson
+adamsrun
+adamss
+adamsson
+adamstow
+adamstown
+adamsvil
+adamsville
+adamsvor
+adamsvork
+adamsvorken
+adamu
+adamusu
+adamusus
+adamyk
+adan
+adana
+adance
+adang
+adangbe
+adangle
+adangme
+adani
+adanismo
+adansoni
+adansonia
+adanusa
+adap
+adapa
+adapchiv
+adapid
+adapis
+adaponer
+adapsjon
+adapsjonen
+adapt
+adapta
+adaptabi
+adaptabilidad
+adaptability
+adaptabl
+adaptable
+adaptableness
+adaptables
+adaptably
+adaptacio`n
+adaptadamente
+adaptador
+adaptadora
+adaptaie
+adaptaient
+adaptais
+adaptait
+adaptant
+adaptante
+adaptar
+adaptasj
+adaptasjon
+adaptasjonen
+adaptasjonsevne
+adaptate
+adaptateur
+adaptateurs
+adaptati
+adaptatie
+adaptaties
+adaptation
+adaptational
+adaptationally
+adaptations
+adaptative
+adaptatr
+adaptatrice
+adaptatrices
+adapte
+adapte'
+adapte'e
+adapte'es
+adapte's
+adapte`r
+adapte`rent
+adaptec
+adapted
+adaptedn
+adaptedness
+adapteer
+adapteerde
+adapteerden
+adapteert
+adaptent
+adapter
+adaptera
+adapterai
+adapteraient
+adapterais
+adapterait
+adapteras
+adaptere
+adapteren
+adapterez
+adapterg
+adaptergeha"use
+adapteri
+adapteriez
+adapterions
+adapterk
+adapterkabel
+adapterkabels
+adapterkarte
+adapterkarten
+adapterl
+adapterleiste
+adapterm
+adaptermodul
+adaptern
+adaptero
+adapterons
+adapteront
+adapterp
+adapterplatine
+adapterplatinen
+adapters
+adaptes
+adaptez
+adaptier
+adaptierbar
+adaptiert
+adaptierung
+adaptiez
+adapting
+adaption
+adaptional
+adaptionism
+adaptions
+adaptionsplatine
+adaptitu
+adaptitude
+adaptiv
+adaptive
+adaptively
+adaptiveness
+adaptome
+adaptometer
+adaptons
+adaptor
+adaptori
+adaptorial
+adaptors
+adapts
+adapuesta
+adapuesto
+adaputa
+adar
+adara
+adaraja
+adarawa
+adarce
+adardear
+adare
+adarene
+adarga
+adargar
+adarguero
+adarme
+adaru
+adaruto
+adarvar
+adarve
+adas
+adasen
+adashevs
+adashevsky
+adat
+adatar
+adati
+adatikao
+adatiku
+adatimik
+adatom
+adatrech
+adatrecht
+adatrechten
+adatta
+adattai
+adattamm
+adattammo
+adattand
+adattando
+adattano
+adattare
+adattaro
+adattarono
+adattass
+adattasse
+adattassi
+adattast
+adattaste
+adattasti
+adattata
+adattate
+adattati
+adattato
+adattava
+adattavamo
+adattavano
+adattavate
+adattavi
+adattavo
+adatte
+adattera
+adatterai
+adattere
+adatterei
+adatteremo
+adatterete
+adattero
+adatti
+adattiam
+adattiamo
+adattiat
+adattiate
+adattino
+adatto
+adauchi
+adaunt
+adaut
+adauti
+adaw
+adawe
+adawi
+adawlut
+adawn
+adaxial
+aday
+adays
+adaza
+adazyo
+adazzle
+adb
+adbeel
+adc
+adccp
+adclus
+adcock
+adcon
+adcons
+adcox
+adcraft
+add
+adda
+addabili
+addability
+addable
+addams
+addan
+addar
+addasen
+addax
+addb
+addd
+adde
+addebitt
+addebitta
+addebittai
+addebitti
+addebitto
+addebted
+added
+addedly
+addend
+addenda
+addenden
+addendi
+addends
+addendum
+addensa
+addensai
+addensam
+addensammo
+addensan
+addensando
+addensano
+addensar
+addensare
+addensas
+addensasse
+addensassi
+addensaste
+addensasti
+addensat
+addensata
+addensate
+addensati
+addensato
+addensav
+addensava
+addensavi
+addensavo
+addenser
+addensera
+addenserai
+addenserei
+addensero
+addensi
+addensia
+addensiamo
+addensiate
+addensin
+addensino
+addenso
+addenta
+addentai
+addentam
+addentammo
+addentan
+addentando
+addentano
+addentar
+addentare
+addentas
+addentasse
+addentassi
+addentaste
+addentasti
+addentat
+addentata
+addentate
+addentati
+addentato
+addentav
+addentava
+addentavi
+addentavo
+addenter
+addentera
+addenterai
+addenterei
+addentero
+addenti
+addentia
+addentiamo
+addentiate
+addentin
+addentino
+addento
+addentra
+addentrai
+addentrano
+addentrare
+addentrata
+addentrate
+addentrati
+addentrato
+addentrava
+addentravi
+addentravo
+addentre
+addentrera
+addentrero
+addentri
+addentrino
+addentro
+adder
+addera
+adderare
+adderbee
+adderbeet
+adderbet
+adderbeten
+adderbol
+adderbolt
+addere
+adderen
+addereng
+adderengebroed
+adderer
+adderes
+adderfis
+adderfish
+addergeb
+addergebroed
+addergif
+addergift
+adderkru
+adderkruid
+addernes
+addernest
+addernesten
+adders
+addersmouth
+adderspi
+adderspit
+addert
+adderton
+addertong
+addertongen
+addervar
+addervaren
+addervarens
+adderwor
+adderwort
+adderwortel
+adderwortels
+addestra
+addestrai
+addestrano
+addestrare
+addestrata
+addestrate
+addestrati
+addestrato
+addestrava
+addestravi
+addestravo
+addestre
+addestrera
+addestrero
+addestri
+addestrino
+addestro
+addeth
+addetia
+addetta
+addette
+addetti
+addetto
+addf
+addg
+addh
+addi
+addia
+addibili
+addibility
+addible
+addicent
+addict
+addicted
+addictedness
+addictin
+addicting
+addictio
+addiction
+addictions
+addictiv
+addictive
+addictively
+addictiveness
+addictives
+addicts
+addie
+addiere
+addieren
+addierend
+addierende
+addierenden
+addierender
+addierendes
+addiert
+addierte
+addiertem
+addierter
+addiertes
+addiertest
+addievil
+addieville
+addii
+addilog
+addiment
+adding
+addingto
+addington
+addinstr
+addinstruktion
+addio
+addis
+addisaba
+addisababa
+addisjon
+addisjonen
+addison
+addisoni
+addisonian
+addisoniana
+addisonw
+addisonwesley
+addita
+additai
+additame
+additament
+additamentary
+additamm
+additammo
+additand
+additando
+additano
+additare
+additaro
+additarono
+additass
+additasse
+additassi
+additast
+additaste
+additasti
+additata
+additate
+additati
+additato
+additava
+additavamo
+additavano
+additavate
+additavi
+additavo
+additera
+additerai
+additere
+additerei
+additeremo
+additerete
+additero
+additi
+additiam
+additiamo
+additiat
+additiate
+additie
+addities
+additiev
+additieve
+additif
+additifs
+additino
+addition
+additional
+additionally
+additionary
+additioneel
+additionele
+additionelle
+additionen
+additioner
+additionist
+additionna
+additionnaient
+additionnais
+additionnait
+additionnant
+additionne
+additionne'
+additionne'e
+additionne'es
+additionne's
+additionne`rent
+additionnel
+additionnelle
+additionnelles
+additionnels
+additionnent
+additionner
+additionnera
+additionnerai
+additionneraient
+additionnerais
+additionnerait
+additionneras
+additionnerez
+additionneriez
+additionnerions
+additionnerons
+additionneront
+additionnes
+additionnez
+additionniez
+additionnions
+additionnons
+additions
+addititi
+addititious
+additiv
+additive
+additively
+additiven
+additives
+additivesaturated
+additivi
+additivity
+addito
+additory
+additum
+addiu
+addizion
+addiziona
+addizionai
+addizione
+addizioni
+addiziono
+addl
+addle
+addlebra
+addlebrain
+addlebrained
+addlecom
+addlecombe
+addled
+addlehea
+addlehead
+addleheaded
+addleheadedly
+addleheadedness
+addlemen
+addlement
+addlenes
+addleness
+addlepat
+addlepate
+addlepated
+addlepatedness
+addleplo
+addleplot
+addles
+addling
+addlings
+addlins
+addo
+addobba
+addobbai
+addobbam
+addobbammo
+addobban
+addobbando
+addobbano
+addobbar
+addobbare
+addobbas
+addobbasse
+addobbassi
+addobbaste
+addobbasti
+addobbat
+addobbata
+addobbate
+addobbati
+addobbato
+addobbav
+addobbava
+addobbavi
+addobbavo
+addobber
+addobbera
+addobberai
+addobberei
+addobbero
+addobbi
+addobbia
+addobbiamo
+addobbiate
+addobbin
+addobbino
+addobbo
+addock
+addolora
+addolorai
+addolorano
+addolorare
+addolorata
+addolorate
+addolorati
+addolorato
+addolorava
+addoloravi
+addoloravo
+addolore
+addolorera
+addolorero
+addolori
+addolorino
+addoloro
+addome
+addomi
+addoms
+addon
+addona
+addons
+addormen
+addormenta
+addormentare
+addormenti
+addormento
+addorsed
+addossa
+addossai
+addossam
+addossammo
+addossan
+addossando
+addossano
+addossar
+addossare
+addossas
+addossasse
+addossassi
+addossaste
+addossasti
+addossat
+addossata
+addossate
+addossati
+addossato
+addossav
+addossava
+addossavi
+addossavo
+addosser
+addossera
+addosserai
+addosserei
+addossero
+addossi
+addossia
+addossiamo
+addossiate
+addossin
+addossino
+addosso
+addp
+addr
+addrbody
+address
+addressa
+addressability
+addressable
+addressaligned
+addressarithmetic
+addressb
+addressbook
+addressd
+addresse
+addressed
+addressee
+addressees
+addresser
+addressers
+addresses
+addressf
+addressful
+addressi
+addressierte
+addressing
+addresso
+addressograph
+addressor
+addrest
+addrmain
+addrmode
+addrsubj
+addrsum
+adds
+addsnwes
+addsnwesly
+addu
+adduce
+adduceab
+adduceable
+adduced
+adducent
+adducer
+adducers
+adduces
+adducibl
+adducible
+adducing
+adduct
+adducted
+adductin
+adducting
+adductio
+adduction
+adductions
+adductiv
+adductive
+adductor
+adductors
+adducts
+adduu
+addvax
+addw
+addy
+addyston
+ade
+ade'quat
+ade'quate
+ade'quatement
+ade'quates
+ade'quation
+ade'quations
+ade'quats
+ade`lfica
+ade`lfico
+adea
+adea-ftl
+adea-ftlewis
+adead
+adebar
+adebayo
+adecenamiento
+adecenar
+adecentar
+adecuacio`n
+adecuada
+adecuadamente
+adecuado
+adecuar
+adecuja
+adedunvo
+adeem
+adeep
+adeeyah
+adefaga
+adefagia
+adefago
+adefera
+adefesio
+adefina
+adefuera
+adega\a
+adega\o
+adegua
+adeguai
+adeguamm
+adeguammo
+adeguand
+adeguando
+adeguano
+adeguare
+adeguaro
+adeguarono
+adeguass
+adeguasse
+adeguassi
+adeguast
+adeguaste
+adeguasti
+adeguata
+adeguate
+adeguati
+adeguato
+adeguava
+adeguavamo
+adeguavano
+adeguavate
+adeguavi
+adeguavo
+adeguera
+adeguerai
+adeguere
+adeguerei
+adegueremo
+adeguerete
+adeguero
+adegui
+adeguiam
+adeguiamo
+adeguiat
+adeguiate
+adeguino
+adeguo
+adehala
+adehesamiento
+adehesar
+adejobi
+adekvat
+adekvate
+adel
+adel01
+adel03
+adela
+adelaar
+adelaars
+adelaarsblik
+adelaarsblikken
+adelaarshout
+adelaarsogen
+adelaarsoog
+adelaarssteen
+adelaarsstenen
+adelaarsvaren
+adelaarsvarens
+adelaarsvleugel
+adelaarsvleugelen
+adelaarsvleugels
+adelaarsvlucht
+adelaarsvluchten
+adelaida
+adelaide
+adelantada
+adelantadamente
+adelantado
+adelantador
+adelantadora
+adelantamiento
+adelantar
+adelante
+adelanto
+adelard
+adelaren
+adelarth
+adelarthra
+adelarthrosomata
+adelarthrosomatous
+adelbert
+adelbertrange
+adelbors
+adelborst
+adelborsten
+adelbrie
+adelbrief
+adelbrieven
+adelde
+adelden
+adeldom
+adele
+adelea
+adeleida
+adeleidae
+adelen
+adelens
+adelfa
+adelfal
+adelfilla
+adelfo
+adelgazador
+adelgazadora
+adelgazamiento
+adelgazar
+adelges
+adelgund
+adelgunde
+adelheid
+adeli
+adeli\ar
+adeli\o
+adelia
+adelice
+adelie
+adelig
+adelige
+adeligem
+adeligen
+adeliges
+adelin
+adelina
+adelind
+adelinda
+adeline
+adeling
+adelita
+adelite
+adeliza
+adell
+adella
+adelle
+adellijk
+adellijke
+adellijker
+adellijkst
+adelman
+adelmo
+adeln
+adelnd
+adelndem
+adelnden
+adelnder
+adelocer
+adelocerous
+adelocho
+adelochorda
+adelocod
+adelocodonic
+adelomor
+adelomorphic
+adelomorphous
+adelopod
+adelops
+adelphe
+adelphi
+adelphi-
+adelphi-amcld1
+adelphi-amcld11
+adelphi-amcld12
+adelphi-amcld13
+adelphi-amcld14
+adelphi-amcld15
+adelphi-amcld16
+adelphi-amcld2
+adelphi-amcld21
+adelphi-amcld22
+adelphi-amcld23
+adelphi-amcld24
+adelphi-amcld25
+adelphi-amcld26
+adelphi-amcld27
+adelphi-amcld3
+adelphi-ap
+adelphi-asce01
+adelphi-asce02
+adelphi-asce03
+adelphi-assd01
+adelphi-assd02
+adelphi-assd03
+adelphi-assd04
+adelphi-hdlmsb
+adelphi-hdlsig1
+adelphi-hdlsig2
+adelphi-ideas
+adelphi-im1
+adelphi-im2
+adelphi-im3
+adelphi-msc
+adelphi-reiems
+adelphi-saacons1
+adelphi-vlsi
+adelphia
+adelphian
+adelphog
+adelphogamy
+adelphoi
+adelphol
+adelpholite
+adelphop
+adelphophagy
+adels
+adelsfam
+adelsfamilier
+adelsges
+adelsgeschlecht
+adelsgodserne
+adelskap
+adelskapen
+adelskapet
+adelskroner
+adelsman
+adelsmand
+adelsmanden
+adelsmandens
+adelsmann
+adelsmannen
+adelsmen
+adelsmenn
+adelsm{nd
+adelsm{ndene
+adelsm{rke
+adelson
+adelspal
+adelspalaesten
+adelsper
+adelspersoner
+adelsskabet
+adelssl{gt
+adelssl{gter
+adelssta
+adelsstand
+adelsstandes
+adelstae
+adelstaenden
+adelstan
+adelstand
+adelstanden
+adelstit
+adelstitel
+adelsver
+adelsverschwoerung
+adelt
+adelte
+adeltest
+adeltrot
+adeltrots
+adelung
+adem
+adema
+adema`n
+adema`s
+ademador
+ademar
+ademario
+adembekl
+adembeklemmend
+adembeklemmende
+adembeklemmender
+adembeklemmendst
+adembene
+adembenemend
+adembenemende
+adembenemender
+adembenemendst
+ademde
+ademden
+ademe
+ademen
+ademgeha
+ademgehaald
+ademgehaalde
+ademhaal
+ademhaalde
+ademhaalden
+ademhaalt
+ademhale
+ademhalen
+ademhali
+ademhaling
+ademhalingen
+ademhalingsgymnastiek
+ademhalingsorgaan
+ademhalingsorganen
+ademhalingswerktuigen
+ademloos
+ademloost
+ademloze
+ademlozer
+ademonis
+ademonist
+adempauz
+adempauze
+adempauzen
+adempauzes
+adempribiar
+adempribio
+ademprio
+adempted
+ademptio
+ademption
+ademtoch
+ademtocht
+ademwort
+ademwortel
+ademwortelen
+ademwortels
+aden
+adena
+adenalgi
+adenalgia
+adenalgy
+adenanth
+adenanthera
+adenase
+adenasth
+adenasthenia
+adenauer
+adendric
+adendrit
+adendritic
+adenecto
+adenectomy
+adenectopia
+adenectopic
+adenemph
+adenemphractic
+adenemphraxis
+adeney
+adeni
+adenia
+adenifor
+adeniform
+adenine
+adenitis
+adeniyi
+adenizat
+adenization
+adenoaca
+adenoacanthoma
+adenobla
+adenoblast
+adenocan
+adenocancroid
+adenocar
+adenocarcinoma
+adenocarcinomatous
+adenocel
+adenocele
+adenocellulitis
+adenocho
+adenochondroma
+adenochondrosarcoma
+adenochr
+adenochrome
+adenocys
+adenocyst
+adenocystoma
+adenocystomatous
+adenoder
+adenodermia
+adenodia
+adenodiastasis
+adenodyn
+adenodynia
+adenofib
+adenofibroma
+adenofibrosis
+adenogen
+adenogenesis
+adenogenous
+adenogra
+adenographer
+adenographic
+adenographical
+adenography
+adenohyp
+adenohypersthenia
+adenoid
+adenoida
+adenoidal
+adenoide
+adenoidea
+adenoidectomy
+adenoideo
+adenoidi
+adenoidism
+adenoiditis
+adenoids
+adenolio
+adenoliomyofibroma
+adenolip
+adenolipoma
+adenolipomatosis
+adenolog
+adenologaditis
+adenologi`a
+adenological
+adenology
+adenolym
+adenolymphocele
+adenolymphoma
+adenoma
+adenomal
+adenomalacia
+adenomat
+adenomatome
+adenomatous
+adenomen
+adenomeningeal
+adenomet
+adenometritis
+adenomyc
+adenomycosis
+adenomyo
+adenomyofibroma
+adenomyoma
+adenomyx
+adenomyxoma
+adenomyxosarcoma
+adenoncu
+adenoncus
+adenoneu
+adenoneural
+adenoneure
+adenopat
+adenopathy
+adenopati`a
+adenopha
+adenopharyngeal
+adenopharyngitis
+adenophl
+adenophlegmon
+adenopho
+adenophora
+adenophore
+adenophorous
+adenopht
+adenophthalmia
+adenophy
+adenophyllous
+adenophyma
+adenopod
+adenopodous
+adenosa
+adenosar
+adenosarcoma
+adenoscl
+adenosclerosis
+adenose
+adenosin
+adenosine
+adenosis
+adenoso
+adenoste
+adenostemonous
+adenosto
+adenostoma
+adenotom
+adenotome
+adenotomic
+adenotomy
+adenotyp
+adenotyphoid
+adenotyphus
+adensar
+adentellar
+adento
+adentrarse
+adentro
+adenyl
+adenylic
+adeodatu
+adeodatus
+adeology
+adeona
+adephaga
+adephagan
+adephagi
+adephagia
+adephago
+adephagous
+adept
+adepta
+adepte
+adepten
+adepter
+adeptes
+adeptest
+adeptly
+adeptnes
+adeptness
+adepto
+adepts
+adeptshi
+adeptship
+adequaat
+adequaatst
+adequaci
+adequacies
+adequacy
+adequate
+adequately
+adequateness
+adequater
+adequati
+adequation
+adequative
+ader
+aderar
+aderbreu
+aderbreuk
+aderbreuken
+aderde
+aderden
+adere
+aderedo
+aderen
+aderente
+aderenti
+aderenza
+aderezada
+aderezado
+aderezamiento
+aderezar
+aderezo
+adergela
+adergelaten
+adergelatene
+adergelatenen
+adergezw
+adergezwel
+adergezwellen
+aderhold
+aderig
+aderige
+aderinya
+aderlaat
+aderlass
+aderlate
+aderlaten
+aderlati
+aderlating
+aderlatingen
+aderlijk
+aderlijke
+adermar
+adermia
+adermin
+adern
+aderonts
+aderontsteking
+aderontstekingen
+aderra
+aderredor
+aders
+aderspat
+aderspatten
+adertje
+adertjes
+aderverk
+aderverkalking
+ades
+adesione
+adesioni
+adesiva
+adesive
+adesivi
+adesivo
+adespoti
+adespotic
+adessena
+adessenarian
+adesso
+adeste
+adestrada
+adestrado
+adestrador
+adestradora
+adestramiento
+adestranza
+adestrar
+adestri`a
+adesugat
+adet
+adeudar
+adeudo
+adevaroh
+adevism
+adey
+adeyaka
+adfected
+adfix
+adfluxio
+adfluxion
+adf{rd
+adf{rden
+adf{rdsm|nster
+adf{rdsm|nsteret
+adg
+adgang
+adgangen
+adgangsb
+adgangsbegr{nsning
+adgangsbilletter
+adgangsk
+adgangskort
+adgangskrav
+adgangsrettigheder
+adgangsrettighederne
+adgangst
+adgangstegn
+adgangsvej
+adgangsvejen
+adgawan
+adger
+adgered
+adglutin
+adglutinate
+adh
+adha"sio
+adha"sionsbruch
+adhacker
+adhackery
+adhafera
+adhaka
+adham
+adhamant
+adhara
+adharma
+adhe'ra
+adhe'rai
+adhe'raient
+adhe'rais
+adhe'rait
+adhe'ran
+adhe'rant
+adhe're'
+adhe're`
+adhe're`rent
+adhe'ren
+adhe'rence
+adhe'rences
+adhe'rent
+adhe'rente
+adhe'rentes
+adhe'rents
+adhe'rer
+adhe'rera
+adhe'rerai
+adhe'reraient
+adhe'rerais
+adhe'rerait
+adhe'reras
+adhe'rerez
+adhe'reriez
+adhe'rerions
+adhe'rerons
+adhe'reront
+adhe'rez
+adhe'rie
+adhe'riez
+adhe'rio
+adhe'rions
+adhe'ron
+adhe'rons
+adhe'sif
+adhe'sifs
+adhe'sio
+adhe'sion
+adhe'sions
+adhe'siv
+adhe'sive
+adhe'sives
+adhe'sivite'
+adhe`re
+adhe`ren
+adhe`rent
+adhe`res
+adhem
+adhere
+adherecer
+adhered
+adherenc
+adherence
+adherences
+adherencia
+adherency
+adherent
+adherente
+adherenter
+adherently
+adherents
+adherentst
+adherer
+adherers
+adheres
+adheresc
+adherescence
+adherescent
+adhering
+adherir
+adhesie
+adhesieb
+adhesiebetuiging
+adhesiebetuigingen
+adhesio`n
+adhesion
+adhesional
+adhesions
+adhesiva
+adhesive
+adhesively
+adhesivemeter
+adhesiveness
+adhesives
+adhesividad
+adhesivo
+adhesjon
+adhesjonen
+adhiang
+adhibir
+adhibit
+adhibiti
+adhibition
+adhikari
+adhikary
+adhoc
+adhocity
+adhocker
+adhockery
+adhok
+adhola
+adhortar
+adhortat
+adhortation
+adhos
+adhvaryu
+adi
+adia
+adiabati
+adiabatic
+adiabatically
+adiabatiske
+adiabatk
+adiabatkonstanten
+adiaboli
+adiabolist
+adiacent
+adiacente
+adiacenti
+adiacenz
+adiacenza
+adiacenze
+adiactin
+adiactinic
+adiada
+adiado
+adiadoch
+adiadochokinesis
+adiafa
+adiafora
+adiaforesis
+adiagnos
+adiagnostic
+adiake
+adiamantada
+adiamantado
+adiamiento
+adiana
+adiangok
+adiano
+adiantif
+adiantiform
+adiantum
+adiaphan
+adiaphanous
+adiaphon
+adiaphonon
+adiaphor
+adiaphoral
+adiaphoresis
+adiaphoretic
+adiaphorism
+adiaphorist
+adiaphoristic
+adiaphorite
+adiaphoron
+adiaphorous
+adiar
+adiarte
+adiate
+adiather
+adiathermal
+adiathermancy
+adiathermanous
+adiathermic
+adiathet
+adiathetic
+adiation
+adib
+adiccio`n
+adicea
+adicio`n
+adicionador
+adicionadora
+adicional
+adicionar
+adicity
+adicta
+adicto
+adidas
+adie
+adiel
+adieso
+adiestrada
+adiestrado
+adiestrador
+adiestradora
+adiestramiento
+adiestrar
+adietar
+adieu
+adieus
+adieux
+adigalo
+adige
+adigei
+adighe
+adigrant
+adigranth
+adija
+adijaya
+adik
+adikimmu
+adil
+adilabad
+adile
+adim
+adimari
+adin
+adina
+adina`mica
+adina`mico
+adinamia
+adine
+adinerada
+adinerado
+adinerar
+adinida
+adinidan
+adino
+adinole
+adintelada
+adintelado
+adio
+adio`s
+adion
+adios
+adioukro
+adioukrou
+adipate
+adipesce
+adipescent
+adipeuse
+adipeuses
+adipeux
+adipic
+adipinic
+adipocel
+adipocele
+adipocellulose
+adipocer
+adipocere
+adipoceriform
+adipocerous
+adipocira
+adipocyt
+adipocyte
+adipofib
+adipofibroma
+adipogen
+adipogenic
+adipogenous
+adipoid
+adipolys
+adipolysis
+adipolyt
+adipolytic
+adipoma
+adipomat
+adipomatous
+adipomet
+adipometer
+adipopex
+adipopexia
+adipopexis
+adiposa
+adipose
+adiposen
+adiposeness
+adiposi
+adiposidad
+adiposis
+adiposit
+adiposities
+adiposity
+adiposo
+adiposog
+adiposogenital
+adiposur
+adiposuria
+adipous
+adipsia
+adipsic
+adipsous
+adipsy
+adipyl
+adir
+adira
+adirai
+adirammo
+adirando
+adirano
+adirare
+adiraron
+adirarono
+adirasse
+adirassero
+adirassi
+adirassimo
+adiraste
+adirasti
+adirata
+adirate
+adirati
+adirato
+adirava
+adiravam
+adiravamo
+adiravan
+adiravano
+adiravat
+adiravate
+adiravi
+adiravo
+adirera
+adirerai
+adireran
+adireranno
+adirereb
+adirerebbe
+adirerei
+adirerem
+adireremmo
+adireremo
+adireres
+adirereste
+adireresti
+adireret
+adirerete
+adirero
+adiri
+adiriamo
+adiriate
+adirino
+adiro
+adironda
+adirondack
+adis
+adit
+adital
+aditamento
+adithaim
+aditi
+aditicia
+aditicio
+adito
+adits
+aditus
+aditya
+adiutori
+adiva
+adivas
+adivasi
+adive
+adivina
+adivinacio`n
+adivinador
+adivinadora
+adivinaja
+adivinamiento
+adivinante
+adivinanza
+adivinar
+adivinatoria
+adivinatorio
+adivino
+adiwasi
+adix
+adiyaman
+adiyan
+adiye
+adj
+adj.esca
+adj.escaping
+adja
+adjacenc
+adjacency
+adjacent
+adjacente
+adjacentes
+adjacently
+adjacents
+adjag
+adjangba
+adjani
+adjar
+adject
+adjectie
+adjectief
+adjectieven
+adjectio
+adjection
+adjectional
+adjectit
+adjectitious
+adjectiv
+adjectival
+adjectivale
+adjectivales
+adjectivally
+adjectivaux
+adjective
+adjectively
+adjectiver
+adjectives
+adjectivisch
+adjectivische
+adjectivism
+adjectivitis
+adjei
+adjektiv
+adjektiven
+adjektivene
+adjektiver
+adjektivet
+adjektivisch
+adjektivische
+adjektivischen
+adjektivischer
+adjektivisches
+adjektivisk
+adjektivs
+adjer
+adjetiva
+adjetivacio`n
+adjetivadamente
+adjetival
+adjetivar
+adjetivo
+adjiga
+adjiger
+adjio
+adjo
+adjoe
+adjoigna
+adjoignaient
+adjoignais
+adjoignait
+adjoignant
+adjoigne
+adjoignent
+adjoignes
+adjoignez
+adjoigni
+adjoigniez
+adjoignions
+adjoignirent
+adjoignit
+adjoigno
+adjoignons
+adjoin
+adjoindr
+adjoindra
+adjoindrai
+adjoindraient
+adjoindrais
+adjoindrait
+adjoindras
+adjoindre
+adjoindrez
+adjoindriez
+adjoindrions
+adjoindrons
+adjoindront
+adjoined
+adjoinedly
+adjoinin
+adjoining
+adjoins
+adjoint
+adjointe
+adjointes
+adjoints
+adjoncti
+adjonction
+adjonctions
+adjora
+adjoria
+adjourn
+adjourna
+adjournal
+adjourne
+adjourned
+adjourni
+adjourning
+adjournm
+adjournment
+adjournments
+adjourns
+adjoynd
+adjr
+adjudant
+adjudant-onderofficier
+adjudant-onderofficieren
+adjudanten
+adjudants
+adjudg
+adjudge
+adjudgea
+adjudgeable
+adjudged
+adjudger
+adjudges
+adjudgin
+adjudging
+adjudgme
+adjudgment
+adjudica
+adjudicacio`n
+adjudicador
+adjudicadora
+adjudicar
+adjudicataria
+adjudicatario
+adjudicate
+adjudicated
+adjudicates
+adjudicating
+adjudication
+adjudications
+adjudicative
+adjudicator
+adjudicators
+adjudicatory
+adjudicature
+adjuge
+adjuge'
+adjuge'e
+adjuge'es
+adjuge's
+adjuge`r
+adjuge`rent
+adjugea
+adjugeai
+adjugeaient
+adjugeais
+adjugeait
+adjugean
+adjugeant
+adjugent
+adjugeon
+adjugeons
+adjuger
+adjugera
+adjugerai
+adjugeraient
+adjugerais
+adjugerait
+adjugeras
+adjugere
+adjugerez
+adjugeri
+adjugeriez
+adjugerions
+adjugero
+adjugerons
+adjugeront
+adjuges
+adjugez
+adjugiez
+adjugion
+adjugions
+adjukru
+adjumba
+adjuncio`n
+adjunct
+adjunct-
+adjunct-administrateur
+adjunct-administrateuren
+adjunct-administrateurs
+adjunct-commies
+adjunct-commiezen
+adjunct-commissaris
+adjunct-commissarissen
+adjunct-directeur
+adjunct-directeuren
+adjunct-directeurs
+adjuncte
+adjuncten
+adjuncti
+adjunction
+adjunctive
+adjunctively
+adjunctl
+adjunctly
+adjuncts
+adjunkdant
+adjunkt
+adjunkte
+adjunkten
+adjunta
+adjuntas
+adjunto
+adjura
+adjurable
+adjuracio`n
+adjurador
+adjuraie
+adjuraient
+adjurais
+adjurait
+adjurant
+adjurar
+adjurati
+adjuration
+adjurations
+adjurato
+adjuratory
+adjure
+adjure'
+adjure'e
+adjure'es
+adjure's
+adjure`r
+adjure`rent
+adjured
+adjurent
+adjurer
+adjurera
+adjurerai
+adjureraient
+adjurerais
+adjurerait
+adjureras
+adjurere
+adjurerez
+adjureri
+adjureriez
+adjurerions
+adjurero
+adjurerons
+adjureront
+adjurers
+adjures
+adjurez
+adjuriez
+adjuring
+adjurion
+adjurions
+adjurons
+adjuror
+adjurors
+adjust
+adjustab
+adjustable
+adjustably
+adjustag
+adjustage
+adjustat
+adjustation
+adjusted
+adjuster
+adjusters
+adjustin
+adjusting
+adjustiv
+adjustive
+adjustme
+adjustment
+adjustments
+adjustor
+adjustors
+adjusts
+adjutage
+adjutanc
+adjutancy
+adjutant
+adjutanten
+adjutants
+adjutantship
+adjutantstab
+adjutor
+adjutora
+adjutori
+adjutorio
+adjutorious
+adjutory
+adjutric
+adjutrice
+adjuvant
+adjuvante
+adjuvantes
+adjuvants
+adj|
+adke
+adkibba
+adkins
+adkinson
+adkuri
+adla
+adlai
+adlakha
+adlard
+adlay
+adle
+adle01
+adle02
+adle03
+adle04
+adler
+adlerhor
+adlerhorst
+adlerhorste
+adlerhorsten
+adlern
+adlernas
+adlernase
+adlernasen
+adless
+adlest
+adlet
+adlg01
+adlg02
+adlib
+adlig
+adliga
+adlige
+adligen
+adlin
+adlmsc
+adlon
+adls01
+adls02
+adls03
+adls04
+adls05
+adlt01
+adlt02
+adlt03
+adlt04
+adlt05
+adlt06
+adlt07
+adlt08
+adlt09
+adlt10
+adlt11
+adlt12
+adlt13
+adlt14
+adlt15
+adlu01
+adlu02
+adlu03
+adlu04
+adlu05
+adlu06
+adlu07
+adlu08
+adlumia
+adlumidi
+adlumidine
+adlumine
+adlv01
+adly
+adlyd
+adlyde
+adl|d
+adm
+admad
+admah
+adman
+admargin
+admarginate
+admatha
+admaxill
+admaxillary
+admeasur
+admeasure
+admeasurement
+admeasurer
+admedial
+admedian
+admen
+admensur
+admensuration
+admet
+admete
+admets
+admettai
+admettaient
+admettais
+admettait
+admettan
+admettant
+admette
+admetten
+admettent
+admettes
+admettez
+admettie
+admettiez
+admettio
+admettions
+admetton
+admettons
+admettra
+admettrai
+admettraient
+admettrais
+admettrait
+admettras
+admettre
+admettrez
+admettri
+admettriez
+admettrions
+admettro
+admettrons
+admettront
+admi
+admin
+admin-mt
+admin-mtv
+admini`culo
+adminicl
+adminicle
+adminicu
+adminicula
+adminicular
+adminiculary
+adminiculate
+adminiculation
+adminiculum
+administ
+administer
+administerd
+administered
+administerial
+administering
+administerings
+administers
+administra
+administrable
+administracio`n
+administrada
+administrado
+administrador
+administradora
+administradorcillo
+administraient
+administrais
+administrait
+administrant
+administrants
+administrar
+administrasjon
+administrasjonen
+administrasjonens
+administrasjonsapparatet
+administrasjonsapparatets
+administrasjonsbygg
+administrasjonsbygning
+administrasjonsfl|yen
+administrasjonshus
+administrasjonskomite
+administrasjonskontor
+administrasjonsmessig
+administrasjonsordningen
+administrasjonsskole
+administrasjonsutgiftene
+administrasjonsutgifter
+administrate
+administrated
+administrates
+administrateur
+administrateuren
+administrateurs
+administratie
+administratief
+administratiegebouw
+administratiegebouwen
+administratiekantoor
+administratiekantoren
+administratiekosten
+administraties
+administratieve
+administratif
+administratifs
+administrating
+administration
+administrational
+administrationen
+administrations
+administrationsdepartementet
+administrationskursus
+administrationsomkostninger
+administrationsprogram
+administrativ
+administrativa
+administrativamente
+administrative
+administratively
+administrativem
+administrativement
+administrativen
+administratives
+administrativo
+administrativt
+administratoer
+administrator
+administratoren
+administratorens
+administratorer
+administratorerne
+administratoria
+administratorio
+administrators
+administratorship
+administratress
+administratrice
+administratrices
+administratrix
+administrat|r
+administre
+administre'
+administre'e
+administre'es
+administre's
+administre`rent
+administreer
+administreerde
+administreerden
+administreert
+administrent
+administrer
+administrera
+administrerai
+administreraient
+administrerais
+administrerait
+administreras
+administrere
+administreren
+administrerende
+administrerer
+administreres
+administrerez
+administreriez
+administrering
+administrerions
+administrerons
+administreront
+administrert
+administres
+administrez
+administriez
+administrions
+administro
+administrons
+admins
+adminstr
+adminstration
+admir
+admira
+admiraal
+admiraal-generaal
+admiraals
+admiraals-generaal
+admiraalschap
+admiraalsschepen
+admiraalsschip
+admiraalsuniform
+admiraalsuniformen
+admiraalsvlag
+admiraalsvlaggen
+admiraalvlinder
+admiraalvlinders
+admiraalzeil
+admiraalzeilen
+admiraalzeilt
+admirabi
+admirabili`sima
+admirabili`simo
+admirability
+admirabl
+admirable
+admirablement
+admirablemente
+admirableness
+admirables
+admirably
+admiracio`n
+admirador
+admiradora
+admiraie
+admiraient
+admirais
+admirait
+admiral
+admirale
+admiralen
+admiralen-generaal
+admiraler
+admiralf
+admiralfahrer
+admirali
+admiralitaeten
+admiraliteit
+admiraliteiten
+admiraliteitscollege
+admiraliteitscolleges
+admiraliteitshof
+admiraliteitshoven
+admiralitet
+admirals
+admiralship
+admiralships
+admiralsmarsch
+admiralstab
+admiralstaben
+admiralstabes
+admiralstaeben
+admiralt
+admiralties
+admiralty
+admiranda
+admirando
+admirant
+admirante
+admirar
+admirate
+admirateur
+admirateurs
+admirati
+admiratif
+admiratifs
+admiration
+admirations
+admirativa
+admirativamente
+admirative
+admirativement
+admiratives
+admirativo
+admirato
+admirator
+admiratr
+admiratrice
+admiratrices
+admire
+admire'
+admire'e
+admire'es
+admire's
+admire`r
+admire`rent
+admired
+admiredl
+admiredly
+admirent
+admirer
+admirera
+admirerai
+admireraient
+admirerais
+admirerait
+admireras
+admirere
+admirerez
+admireri
+admireriez
+admirerions
+admirero
+admirerons
+admireront
+admirers
+admires
+admirez
+admiriez
+admiring
+admiringly
+admirion
+admirions
+admirons
+admis
+admise
+admises
+admisibilidad
+admisible
+admisio`n
+admissab
+admissability
+admissable
+admissib
+admissibilite'
+admissibilite's
+admissibility
+admissible
+admissibleness
+admissibles
+admissibly
+admissie
+admissie-examen
+admissie-examens
+admissio
+admission
+admissions
+admissiv
+admissive
+admissor
+admissory
+admit
+admitedl
+admitedly
+admitir
+admits
+admittab
+admittable
+admittan
+admittance
+admittances
+admitted
+admittedly
+admittee
+admitter
+admitters
+admittib
+admittible
+admittin
+admitting
+admix
+admixed
+admixes
+admixing
+admixt
+admixtio
+admixtio`n
+admixtion
+admixtur
+admixture
+admixtures
+admlrati
+admlration
+admon
+admonest
+admonestation
+admonestations
+admonester
+admonfay
+admonfaye
+admonicio`n
+admonish
+admonished
+admonisher
+admonishers
+admonishes
+admonishing
+admonishingly
+admonishment
+admonishments
+admonisht
+admoniti
+admonition
+admonitioner
+admonitionist
+admonitions
+admonitive
+admonitively
+admonito
+admonitor
+admonitorial
+admonitorily
+admonitory
+admonitr
+admonitrix
+admortiz
+admortization
+adn
+adna
+adnada
+adnado
+adnah
+adnan
+adnane
+adnascen
+adnascence
+adnascent
+adnata
+adnate
+adnation
+adnato
+adnephri
+adnephrine
+adnerval
+adneural
+adnex
+adnexal
+adnexed
+adnexiti
+adnexitis
+adnexope
+adnexopexy
+adnomina
+adnominal
+adnominally
+adnomination
+adnonitor
+adnoun
+ado
+ado`
+ado`nico
+adoba
+adobada
+adobado
+adobador
+adobadora
+adobaisu
+adobaiza
+adobansu
+adobante
+adobar
+adobarun
+adobasillas
+adobe
+adobench
+adobenty
+adobera
+adoberi`a
+adobes
+adobi`o
+adobo
+adocchi
+adocchia
+adocchiai
+adocchiamo
+adocchiano
+adocchiare
+adocchiata
+adocchiate
+adocchiati
+adocchiato
+adocchiava
+adocchiavi
+adocchiavo
+adocchie
+adocchiera
+adocchiero
+adocchin
+adocchino
+adocchio
+adocenada
+adocenado
+adocenar
+adocilar
+adocir
+adoctrinamiento
+adoctrinar
+adogawa
+adohokku
+adoin
+adoka
+adokena
+adolar
+adole
+adolecente
+adolecer
+adolesce
+adolescence
+adolescencia
+adolescency
+adolescent
+adolescente
+adolescenten
+adolescentes
+adolescentie
+adolescently
+adolescents
+adolf
+adolfie
+adolfine
+adolfo
+adolorada
+adolorado
+adolorida
+adolorido
+adolph
+adolphe
+adolpho
+adolphso
+adolphson
+adolphus
+adoma
+adombra
+adombrai
+adombram
+adombrammo
+adombran
+adombrando
+adombrano
+adombrar
+adombrare
+adombras
+adombrasse
+adombrassi
+adombraste
+adombrasti
+adombrat
+adombrata
+adombrate
+adombrati
+adombrato
+adombrav
+adombrava
+adombravi
+adombravo
+adombrer
+adombrera
+adombrerai
+adombrerei
+adombrero
+adombri
+adombria
+adombriamo
+adombriate
+adombrin
+adombrino
+adombro
+adomian
+adomiciliar
+adomissy
+adona
+adonada
+adonado
+adonai
+adonai`
+adonais
+adonara
+adonarse
+adonay
+adonde
+adondequiera
+adonean
+adonecer
+adong
+adonia
+adoniad
+adonian
+adonibez
+adonibezek
+adonic
+adonidin
+adonijah
+adonikam
+adonin
+adonio
+adoniram
+adonis
+adonisee
+adoniseer
+adoniseerde
+adoniseerden
+adoniseert
+adoniser
+adoniseren
+adonisse
+adonissen
+adonite
+adonitol
+adonizarse
+adonize
+adonized
+adonizedec
+adonna
+adonnaie
+adonnaient
+adonnais
+adonnait
+adonnant
+adonne
+adonne'
+adonne'e
+adonne'es
+adonne's
+adonne`r
+adonne`rent
+adonnent
+adonner
+adonnera
+adonnerai
+adonneraient
+adonnerais
+adonnerait
+adonneras
+adonnere
+adonnerez
+adonneri
+adonneriez
+adonnerions
+adonnero
+adonnerons
+adonneront
+adonnes
+adonnez
+adonniez
+adonnion
+adonnions
+adonnons
+adonta
+adontai
+adontamm
+adontammo
+adontand
+adontando
+adontano
+adontare
+adontaro
+adontarono
+adontass
+adontasse
+adontassi
+adontast
+adontaste
+adontasti
+adontata
+adontate
+adontati
+adontato
+adontava
+adontavamo
+adontavano
+adontavate
+adontavi
+adontavo
+adontera
+adonterai
+adontere
+adonterei
+adonteremo
+adonterete
+adontero
+adonti
+adontiam
+adontiamo
+adontiat
+adontiate
+adontino
+adonto
+adoon
+adoor
+adopcio`n
+adopcionismo
+adopcionista
+adopera
+adoperai
+adoperam
+adoperammo
+adoperan
+adoperando
+adoperano
+adoperar
+adoperare
+adoperas
+adoperasse
+adoperassi
+adoperaste
+adoperasti
+adoperat
+adoperata
+adoperate
+adoperati
+adoperation
+adoperato
+adoperav
+adoperava
+adoperavi
+adoperavo
+adoperer
+adoperera
+adopererai
+adopererei
+adoperero
+adoperi
+adoperia
+adoperiamo
+adoperiate
+adoperin
+adoperino
+adopero
+adopsjon
+adopsjonen
+adopt
+adopta
+adoptabi
+adoptabilities
+adoptability
+adoptabl
+adoptable
+adoptacio`n
+adoptador
+adoptadora
+adoptaie
+adoptaient
+adoptais
+adoptait
+adoptant
+adoptante
+adoptar
+adoptati
+adoptative
+adopte
+adopte'
+adopte'e
+adopte'es
+adopte's
+adopte`r
+adopte`rent
+adopted
+adoptedl
+adoptedly
+adoptee
+adopteer
+adopteerde
+adopteerden
+adopteert
+adoptees
+adoptent
+adopter
+adoptera
+adopterai
+adopteraient
+adopterais
+adopterait
+adopteras
+adoptere
+adopteren
+adopterez
+adopteri
+adopteriez
+adopterions
+adoptero
+adopterons
+adopteront
+adopters
+adoptert
+adoptes
+adoptez
+adoptian
+adoptianism
+adoptianist
+adoptie
+adoptief
+adoptier
+adoptiere
+adoptieren
+adoptierende
+adoptierendem
+adoptierenden
+adoptierendes
+adoptierst
+adoptiert
+adoptiertem
+adoptierten
+adoptierter
+adoptiertest
+adoptiertet
+adopties
+adoptiev
+adoptieve
+adoptiez
+adoptif
+adoptifs
+adopting
+adoption
+adoptional
+adoptionen
+adoptionism
+adoptionist
+adoptions
+adoptionsrecht
+adoptiou
+adoptious
+adoptiva
+adoptivb
+adoptivbarn
+adoptivbarnet
+adoptivd
+adoptivdatteren
+adoptive
+adoptiveltern
+adoptively
+adoptives
+adoptivo
+adoptivs|n
+adoptivt
+adoptivtochter
+adoptons
+adopts
+adoqui`n
+adoquier
+adoquiera
+adoquinada
+adoquinado
+adoquinar
+ador
+adora
+adorabel
+adorabele
+adorabeler
+adorabelst
+adorabil
+adorabile
+adorabili
+adorability
+adorable
+adorableness
+adorables
+adorably
+adoracio`n
+adorador
+adoradora
+adorai
+adoraien
+adoraient
+adoraim
+adorais
+adorait
+adoral
+adorally
+adoram
+adorammo
+adorando
+adorano
+adorant
+adorante
+adorantes
+adorar
+adorare
+adoraron
+adorarono
+adorasse
+adorassero
+adorassi
+adorassimo
+adoraste
+adorasti
+adorata
+adorate
+adorateu
+adorateur
+adorateurs
+adorati
+adoratie
+adoraties
+adoratio
+adoration
+adorato
+adorator
+adoratore
+adoratori
+adoratorio
+adoratory
+adoratri
+adoratrice
+adoratrices
+adoratriz
+adorava
+adoravam
+adoravamo
+adoravan
+adoravano
+adoravat
+adoravate
+adoravi
+adoravo
+adorazio
+adorazione
+adorazioni
+adore
+adore'
+adore'e
+adore'es
+adore's
+adore`re
+adore`rent
+adorea
+adored
+adoree
+adorenar
+adorenok
+adorent
+adorer
+adorera
+adorerai
+adoreraient
+adorerais
+adorerait
+adoreran
+adoreranno
+adoreras
+adorereb
+adorerebbe
+adorerei
+adorerem
+adoreremmo
+adoreremo
+adoreres
+adorereste
+adoreresti
+adoreret
+adorerete
+adorerez
+adorerie
+adoreriez
+adorerio
+adorerions
+adorero
+adoreron
+adorerons
+adoreront
+adorers
+adores
+adoressh
+adoressi
+adoresu
+adoretus
+adorez
+adorf
+adori
+adoriamo
+adoriate
+adoribu
+adoriez
+adoring
+adoringl
+adoringly
+adorino
+adorions
+adormecedor
+adormecedora
+adormecer
+adormecimiento
+adormentar
+adormidera
+adormilarse
+adormimiento
+adormir
+adormitarse
+adorn
+adorna
+adornacio`n
+adornador
+adornadora
+adornai
+adornamiento
+adornamm
+adornammo
+adornand
+adornando
+adornano
+adornante
+adornar
+adornare
+adornaro
+adornarono
+adornass
+adornasse
+adornassi
+adornast
+adornaste
+adornasti
+adornata
+adornate
+adornati
+adornato
+adornava
+adornavamo
+adornavano
+adornavate
+adornavi
+adornavo
+adornd
+adorne
+adorned
+adorner
+adornera
+adornerai
+adornere
+adornerei
+adorneremo
+adornerete
+adornero
+adorners
+adorneth
+adorni
+adorniam
+adorniamo
+adorniat
+adorniate
+adorning
+adorningly
+adornino
+adornista
+adornmen
+adornment
+adornments
+adorno
+adorns
+adoro
+adorons
+adort
+ados
+adosada
+adosado
+adosar
+adoscula
+adosculation
+adossa
+adossaie
+adossaient
+adossais
+adossait
+adossant
+adosse
+adosse'
+adosse'e
+adosse'es
+adosse's
+adosse`r
+adosse`rent
+adossed
+adosseme
+adossement
+adossent
+adosser
+adossera
+adosserai
+adosseraient
+adosserais
+adosserait
+adosseras
+adossere
+adosserez
+adosseri
+adosseriez
+adosserions
+adossero
+adosserons
+adosseront
+adosses
+adossez
+adossiez
+adossion
+adossions
+adossons
+adotrinar
+adotta
+adottai
+adottamm
+adottammo
+adottand
+adottando
+adottano
+adottare
+adottaro
+adottarono
+adottass
+adottasse
+adottassi
+adottast
+adottaste
+adottasti
+adottata
+adottate
+adottati
+adottato
+adottava
+adottavamo
+adottavano
+adottavate
+adottavi
+adottavo
+adottera
+adotterai
+adottere
+adotterei
+adotteremo
+adotterete
+adottero
+adotti
+adottiam
+adottiamo
+adottiat
+adottiate
+adottino
+adottiva
+adottive
+adottivi
+adottivo
+adotto
+adouber
+adouci
+adoucie
+adoucies
+adoucir
+adoucira
+adoucirai
+adouciraient
+adoucirais
+adoucirait
+adouciras
+adoucire
+adoucirent
+adoucirez
+adouciri
+adouciriez
+adoucirions
+adouciro
+adoucirons
+adouciront
+adoucis
+adouciss
+adoucissaient
+adoucissais
+adoucissait
+adoucissant
+adoucissante
+adoucissantes
+adoucissants
+adoucisse
+adoucissement
+adoucissements
+adoucissent
+adoucisses
+adoucisseur
+adoucisseurs
+adoucissez
+adoucissiez
+adoucissions
+adoucissons
+adoucit
+adoulaye
+adoulie
+adoum
+adouma
+adour
+adovelada
+adovelado
+adowen
+adown
+adoxa
+adoxacea
+adoxaceae
+adoxaceo
+adoxaceous
+adoxogra
+adoxography
+adoxy
+adoyo
+adoze
+adozione
+adozioni
+adp
+adpao
+adpositi
+adposition
+adpress
+adpromis
+adpromission
+adquirente
+adquirible
+adquiridor
+adquiridora
+adquiriente
+adquirir
+adquisicio`n
+adquisidor
+adquisidora
+adquisita
+adquisitiva
+adquisitivo
+adquisito
+adra
+adrada
+adradial
+adradially
+adradius
+adrado
+adragante
+adraganto
+adral
+adramele
+adramelec
+adramelech
+adrammel
+adrammelech
+adramytt
+adramyttium
+adranope
+adranopel
+adrar
+adraste
+adrastea
+adrastus
+adre
+adre'nal
+adre'naline
+adrea
+adread
+adream
+adreamed
+adreamt
+adrectal
+adreda\as
+adrede
+adredemente
+adrenal
+adrenale
+adrenalectomize
+adrenalectomy
+adrenali
+adrenalin
+adrenalina
+adrenaline
+adrenalinen
+adrenalize
+adrenalo
+adrenalone
+adrenals
+adrenerg
+adrenergic
+adrenin
+adrenine
+adrenne
+adreno
+adrenoch
+adrenochrome
+adrenoco
+adrenocortical
+adrenocorticotropic
+adrenoly
+adrenolysis
+adrenolytic
+adrenotr
+adrenotropic
+adres
+adresboe
+adresboek
+adresboeken
+adreskaa
+adreskaart
+adreskaarten
+adreskan
+adreskantoor
+adreskantoren
+adreslij
+adreslijst
+adreslijsten
+adresrui
+adresruimte
+adress
+adressa
+adressag
+adressage
+adressages
+adressai
+adressaient
+adressais
+adressait
+adressan
+adressant
+adressante
+adressanten
+adressat
+adressate
+adressaten
+adressater
+adressbe
+adressberechnungen
+adressbi
+adressbits
+adressbu
+adressbuch
+adressbuches
+adressbuechern
+adressbus
+adressbusses
+adressch
+adresschrijver
+adresschrijvers
+adressda
+adressdatei
+adressdateien
+adresse
+adresse'
+adresse'e
+adresse'es
+adresse's
+adresse`
+adresse`rent
+adressea
+adresseangivelse
+adresseavisen
+adresseavisens
+adresseberegning
+adressee
+adresseer
+adresseerde
+adresseerden
+adresseermachine
+adresseermachines
+adresseert
+adressef
+adresseforandringer
+adresseforskydning
+adresseforskydninger
+adressen
+adressenangabe
+adressenaustausch
+adressengenerierung
+adressenkatalog
+adressenlijst
+adressenlijsten
+adressenliste
+adressenlisten
+adressenschrijver
+adressenschrijvers
+adressent
+adresser
+adressera
+adresserai
+adresseraient
+adresserais
+adresserait
+adresseras
+adresserbar
+adressere
+adresserede
+adresseren
+adresseres
+adresseret
+adresserez
+adresseriez
+adressering
+adresserings
+adresseringsmaskin
+adresseringsmetode
+adresserions
+adresserne
+adresserons
+adresseront
+adressert
+adresserweiterung
+adresses
+adressez
+adressge
+adressgenerator
+adressgenerierung
+adressie
+adressierbar
+adressiere
+adressierend
+adressierende
+adressierendem
+adressierender
+adressierendes
+adressierst
+adressiert
+adressierte
+adressiertem
+adressierten
+adressiertes
+adressiertest
+adressiertet
+adressierung
+adressierungsart
+adressiez
+adressio
+adressions
+adressli
+adressliste
+adressof
+adressoffsets
+adresson
+adressons
+adressra
+adressraum
+adressraumerweiterung
+adresstr
+adresstroken
+adresstrook
+adressve
+adressverwaltung
+adrette
+adrettem
+adretten
+adretter
+adrettere
+adretterem
+adretteren
+adretteres
+adrettes
+adretteste
+adrettesten
+adrettester
+adrettestes
+adrezar
+adrezo
+adri
+adria
+adria`n
+adria`tica
+adria`tico
+adriaan
+adriaans
+adriaansen
+adriaens
+adrian
+adriana
+adriane
+adriani
+adrianna
+adrianne
+adriano
+adriatic
+adrie
+adriel
+adrien
+adriena
+adriene
+adrienne
+adrift
+adrig
+adrige
+adrigen
+adrims
+adrion
+adrip
+adrizamiento
+adrizar
+adroit
+adroite
+adroitem
+adroitement
+adroiter
+adroites
+adroitest
+adroitly
+adroitne
+adroitness
+adroits
+adroleps
+adrolepsy
+adrolla
+adrollero
+adroop
+adrop
+adrostra
+adrostral
+adrowse
+adrs
+adrubada
+adrubado
+adrue
+adry
+adr{t
+adr{tte
+ads
+adsawa
+adsbud
+adscende
+adscendent
+adscitit
+adscititious
+adscititiously
+adscribir
+adscripcio`n
+adscript
+adscripta
+adscripted
+adscription
+adscriptitious
+adscriptitius
+adscriptive
+adscripto
+adscrita
+adscrito
+adsessor
+adsheart
+adsignif
+adsignification
+adsignify
+adskil
+adskildes
+adskildt
+adskille
+adskillelse
+adskillelsen
+adskiller
+adskilles
+adskillige
+adskilt
+adskilte
+adsmith
+adsmithi
+adsmithing
+adso
+adsoa
+adsorb
+adsorbab
+adsorbable
+adsorbat
+adsorbate
+adsorbates
+adsorbed
+adsorben
+adsorbent
+adsorbents
+adsorber
+adsorbie
+adsorbieren
+adsorbierend
+adsorbierende
+adsorbierenden
+adsorbierender
+adsorbierendes
+adsorbiert
+adsorbierte
+adsorbiertem
+adsorbierter
+adsorbiertes
+adsorbiertest
+adsorbin
+adsorbing
+adsorbs
+adsorcio`n
+adsorpti
+adsorption
+adsorptive
+adsorptively
+adsorptiveness
+adspeak
+adspiran
+adspirant
+adspiranten
+adspurgt
+adstadig
+adstipul
+adstipulate
+adstipulation
+adstipulator
+adstriccio`n
+adstring
+adstringente
+adstringerend
+adstringerende
+adstringir
+adstruct
+adstructie
+adstruee
+adstrueerde
+adstrueerden
+adstruer
+adstrueren
+adtermin
+adterminal
+adtevac
+adtor
+adu
+adu`car
+adu`ltera
+adu`ltero
+aduana
+aduanar
+aduanera
+aduanero
+aduar
+aduccio`n
+aducha
+aduche
+aduchi
+aducho
+aducir
+aductor
+adue\arse
+aduendada
+aduendado
+adufa
+adufe
+adufera
+adufero
+adufre
+aduja
+adujar
+aduka
+adul
+adula
+adulacio`n
+adulador
+aduladora
+adulai
+adulammo
+adulando
+adulano
+adulante
+adular
+adulare
+adulares
+adularescence
+adularia
+adularon
+adularono
+adulasse
+adulassero
+adulassi
+adulassimo
+adulaste
+adulasti
+adulata
+adulate
+adulated
+adulates
+adulati
+adulatin
+adulating
+adulatio
+adulation
+adulato
+adulator
+adulatore
+adulatori
+adulatoria
+adulatorio
+adulators
+adulatory
+adulatre
+adulatress
+adulatri
+adulatrice
+adulatrici
+adulava
+adulavam
+adulavamo
+adulavan
+adulavano
+adulavat
+adulavate
+adulavi
+adulavo
+adulazio
+adulazione
+adulazioni
+adulcir
+adulear
+aduler
+adulera
+adulerai
+aduleran
+aduleranno
+adulereb
+adulerebbe
+adulerei
+adulerem
+aduleremmo
+aduleremo
+aduleres
+adulereste
+aduleresti
+aduleret
+adulerete
+adulero
+aduli
+aduliamo
+aduliate
+adulino
+adullam
+adullami
+adullamite
+adulo
+adulo`n
+adulona
+adult
+adulta
+adulte
+adulte'r
+adulte'rer
+adulte'rin
+adulte'rine
+adulte'rines
+adulte'rins
+adulte`r
+adulte`re
+adulte`res
+adulter
+adultera
+adulteracio`n
+adulterador
+adulteradora
+adulterai
+adulterano
+adulterant
+adulterante
+adulterants
+adulterar
+adulterare
+adulterata
+adulterate
+adulterated
+adulterately
+adulterateness
+adulterates
+adulterati
+adulterating
+adulteration
+adulterato
+adulterator
+adulterators
+adulterava
+adulteravi
+adulteravo
+adultere
+adulterer
+adulterera
+adulterero
+adulterers
+adulteress
+adulteresses
+adulteri
+adulterie
+adulteries
+adulterii
+adulterina
+adulterinamente
+adulterine
+adulterino
+adulterio
+adulterize
+adultero
+adulterous
+adulterously
+adulterousness
+adultery
+adultes
+adulthoo
+adulthood
+adulti
+adultici
+adulticidal
+adulticide
+adultism
+adultly
+adultnes
+adultness
+adulto
+adultoid
+adultres
+adultress
+adults
+adulyade
+adulyadej
+adulzar
+adulzorar
+aduma
+adumbracio`n
+adumbral
+adumbran
+adumbrant
+adumbrar
+adumbrat
+adumbrate
+adumbrated
+adumbrates
+adumbrating
+adumbration
+adumbrations
+adumbrative
+adumbratively
+adummim
+adun
+aduna
+adunacio`n
+adunai
+adunammo
+adunando
+adunano
+adunanza
+adunanze
+adunar
+adunare
+adunarea
+adunaron
+adunarono
+adunasse
+adunassero
+adunassi
+adunassimo
+adunaste
+adunasti
+adunata
+adunate
+adunati
+adunato
+adunava
+adunavam
+adunavamo
+adunavan
+adunavano
+adunavat
+adunavate
+adunavi
+adunavo
+adunc
+adunca
+aduncate
+aduncated
+aduncity
+adunco
+aduncous
+adunera
+adunerai
+aduneran
+aduneranno
+adunereb
+adunerebbe
+adunerei
+adunerem
+aduneremmo
+aduneremo
+aduneres
+adunereste
+aduneresti
+aduneret
+adunerete
+adunero
+aduni
+adunia
+aduniamo
+aduniate
+adunino
+aduno
+adunu
+adur
+adurar
+aduras
+adurir
+aduro
+adusa
+adusk
+adust
+adusta
+adusted
+adustez
+adustible
+adustio`n
+adustion
+adustios
+adustiosis
+adustiva
+adustivo
+adusto
+adutaque
+aduti
+adv
+advaita
+advanc
+advance
+advancea
+advanceable
+advanced
+advancedness
+advancem
+advancement
+advancements
+advancer
+advancers
+advances
+advancin
+advancing
+advancingly
+advanciv
+advancive
+advani
+advantag
+advantage
+advantaged
+advantageous
+advantageously
+advantageousness
+advantages
+advantageth
+advantaging
+advantagious
+advar
+advare
+advarend
+advarende
+advarer
+advares
+advaret
+advaring
+advaringa
+advaringen
+advarsel
+advarselen
+advarsle
+advarslene
+advarsler
+advarslerne
+advart
+advarte
+advectio
+advection
+advectit
+advectitious
+advectiv
+advective
+advehent
+advenait
+advenant
+advene
+advenediza
+advenedizo
+adveniat
+advenidera
+advenidero
+advenien
+advenience
+advenient
+advenimiento
+advenir
+advent
+adventajas
+adventen
+adventia
+advential
+adventicia
+adventicio
+adventis
+adventism
+adventismo
+adventist
+adventista
+adventisten
+adventists
+adventit
+adventitia
+adventitious
+adventitiously
+adventitiousness
+adventiv
+adventive
+advento
+adventpr
+adventpreek
+adventpreken
+adventro
+adventrous
+advents
+adventsk
+adventskalender
+adventskalenderen
+adventskrans
+adventskransen
+adventsp
+adventspreek
+adventspreken
+adventss
+adventsschmuck
+adventssonntag
+adventst
+adventstijd
+adventsz
+adventszeit
+adventti
+adventtijd
+adventua
+adventual
+adventur
+adventure
+adventured
+adventureful
+adventurement
+adventurer
+adventurers
+adventures
+adventureship
+adventuresome
+adventuresomely
+adventuresomeness
+adventuress
+adventuresses
+adventuring
+adventurish
+adventurous
+adventurously
+adventurousness
+adventzo
+adventzondag
+adventzondagen
+advenu
+advenue
+advenues
+advenus
+adveracio`n
+adverada
+adverado
+adverar
+adverb
+adverbe
+adverben
+adverbes
+adverbet
+adverbia
+adverbiaal
+adverbial
+adverbiale
+adverbialem
+adverbialer
+adverbiales
+adverbialet
+adverbiality
+adverbializar
+adverbialize
+adverbially
+adverbialmente
+adverbialt
+adverbiation
+adverbiaux
+adverbie
+adverbier
+adverbio
+adverbiu
+adverbium
+adverbs
+adversa
+adversador
+adversai
+adversaire
+adversaires
+adversamente
+adversan
+adversant
+adversar
+adversaria
+adversarial
+adversarie
+adversaries
+adversario
+adversarious
+adversary
+adversat
+adversativa
+adversative
+adversatively
+adversativo
+adverse
+adversel
+adversely
+adversen
+adverseness
+adverses
+adversidad
+adversif
+adversifoliate
+adversifolious
+adversio`n
+adversit
+adversite'
+adversities
+adversity
+adverso
+advert
+adverted
+advertee
+adverteer
+adverteerde
+adverteerden
+adverteerder
+adverteerders
+adverteert
+adverten
+advertence
+advertencia
+advertency
+advertent
+advertentie
+advertentieblad
+advertentiebladen
+advertentiebureau
+advertentiebureaus
+advertentiekosten
+advertentiepagina
+advertentiepagina's
+advertenties
+advertently
+adverter
+adverteren
+advertida
+advertidamente
+advertido
+advertimiento
+advertin
+adverting
+advertir
+advertis
+advertisable
+advertise
+advertised
+advertisee
+advertisement
+advertisements
+advertiser
+advertisers
+advertises
+advertising
+advertiz
+advertize
+advertized
+advertizement
+advertizer
+advertizes
+advertizing
+adverts
+advice
+advicefu
+adviceful
+advices
+adviendr
+adviendra
+adviendrait
+advienne
+advient
+adviento
+advies
+adviesbo
+adviesboot
+adviesboten
+adviesbr
+adviesbrief
+adviesbrieven
+adviesbu
+adviesbureau
+adviesbureaus
+adviesli
+advieslijst
+advieslijsten
+adviezen
+advint
+advis
+advisabi
+advisability
+advisabl
+advisable
+advisableness
+advisably
+advisal
+advisato
+advisatory
+advise
+advised
+advisedl
+advisedly
+advisedn
+advisedness
+advisee
+adviseer
+adviseerde
+adviseerden
+adviseert
+advisees
+adviseme
+advisemement
+advisement
+advisements
+advisen
+adviser
+advisere
+adviseren
+advisers
+advisership
+advisert
+advises
+adviseur
+adviseurs
+advising
+advisive
+advisiveness
+advisor
+advisori
+advisories
+advisorily
+advisors
+advisory
+advocaat
+advocaat-fiscaal
+advocaat-generaal
+advocaatje
+advocaatjes
+advocaci
+advocacies
+advocacio`n
+advocacy
+advocado
+advocar
+advocate
+advocated
+advocaten
+advocaten-fiscaal
+advocaten-generaal
+advocatenkamer
+advocatenkamers
+advocatenstreek
+advocatenstreken
+advocaterij
+advocates
+advocateship
+advocatess
+advocati
+advocating
+advocation
+advocato
+advocator
+advocatoria
+advocatorio
+advocatory
+advocatr
+advocatress
+advocatrice
+advocatrix
+advokat
+advokate
+advokaten
+advokatene
+advokatens
+advokater
+advokatf
+advokatfirma
+advokatfirmaet
+advokatforening
+advokatforretning
+advokatu
+advokatur
+advokaturen
+advokaty
+advokatyr
+advoluti
+advolution
+advoutre
+advoutress
+advoutry
+advowee
+advowson
+advp
+advt
+advthank
+advthanksance
+adw
+adware
+adwc
+ady
+adyacente
+adyaktye
+adygei
+adygey
+adyghe
+adynamia
+adynamic
+adynamy
+adyoukro
+adyoukrou
+adyta
+adyton
+adytum
+adyukru
+adyukuru
+adyumba
+adyuntiva
+adyuntivo
+adyutorio
+adyuvante
+adz
+adzaneni
+adze
+adzer
+adzera
+adzerma
+adzes
+adzhimus
+adzhimushkaj
+adzooks
+adzope
+adzrac
+ae
+ae'ra
+ae'raien
+ae'raient
+ae'rais
+ae'rait
+ae'rant
+ae'rateu
+ae'rateur
+ae'rateurs
+ae'ratio
+ae'ration
+ae're'
+ae're'e
+ae're'es
+ae're's
+ae're`re
+ae're`rent
+ae'rer
+ae'rera
+ae'rerai
+ae'reraient
+ae'rerais
+ae'rerait
+ae'reras
+ae'rerez
+ae'rerie
+ae'reriez
+ae'rerio
+ae'rerions
+ae'reron
+ae'rerons
+ae'reront
+ae'rez
+ae'rien
+ae'rienn
+ae'rienne
+ae'riennes
+ae'riens
+ae'riez
+ae'rions
+ae'ro-cl
+ae'ro-club
+ae'ro-clubs
+ae'rodro
+ae'rodrome
+ae'rodromes
+ae'rodyn
+ae'rodynamique
+ae'rodynamiques
+ae'rogar
+ae'rogare
+ae'rogares
+ae'rogli
+ae'roglisseur
+ae'roglisseurs
+ae'ronau
+ae'ronautique
+ae'ronautiques
+ae'ronav
+ae'ronaval
+ae'ronavale
+ae'ronavales
+ae'ronavals
+ae'ronef
+ae'ronefs
+ae'rons
+ae'ropha
+ae'rophagie
+ae'ropla
+ae'roplane
+ae'roplanes
+ae'ropor
+ae'roport
+ae'roporte'
+ae'roporte'e
+ae'roporte'es
+ae'roporte's
+ae'roports
+ae'rosol
+ae'rosols
+ae'rospa
+ae'rospatial
+ae'rospatiale
+ae'rospatiales
+ae'rospatiaux
+ae`re
+ae`rea
+ae`rent
+ae`reo
+ae`res
+aeacides
+aeacus
+aeaean
+aebeitsf
+aebeitsfeldes
+aebte
+aebten
+aebtissi
+aebtissin
+aec
+aechmoph
+aechmophorus
+aechten
+aechtend
+aechtende
+aechtendem
+aechtenden
+aechtendes
+aechtung
+aechtungen
+aechze
+aechzen
+aechzend
+aechzende
+aechzendem
+aechzenden
+aechzendes
+aechzest
+aechzete
+aechzeten
+aechzte
+aechztes
+aechztest
+aechztet
+aecial
+aecidiac
+aecidiaceae
+aecidial
+aecidiof
+aecidioform
+aecidiom
+aecidiomycetes
+aecidios
+aecidiospore
+aecidiostage
+aecidium
+aeciospo
+aeciospore
+aeciosta
+aeciostage
+aeciotel
+aecioteliospore
+aeciotelium
+aecium
+aeckel
+aecker
+aeckerle
+aeckla
+aecom
+aed
+aedeagus
+aedel
+aedelt
+aederche
+aederchen
+aedes
+aedf
+aedicula
+aedile
+aediles
+aedilesh
+aedileship
+aedilian
+aedilic
+aediliti
+aedilitian
+aedility
+aedma
+aedo
+aedoeagu
+aedoeagus
+aee
+aef
+aefald
+aefaldne
+aefaldness
+aefaldy
+aefauld
+aeffen
+aeffend
+aeffende
+aeffenden
+aeffender
+aeffendes
+aeffin
+aeffinne
+aeffinnen
+aefft
+aeffte
+aefftest
+aeg
+aega
+aegaean
+aegaeisc
+aegaeische
+aegagrop
+aegagropila
+aegagropile
+aegagrus
+aegande
+aegare
+aegarnam
+aegarnamnen
+aegarnas
+aegarska
+aegarskap
+aegd
+aegean
+aegeon
+aegerian
+aegeriid
+aegeriidae
+aegg
+aegialit
+aegialitis
+aegicran
+aegicrania
+aegide
+aegina
+aegineta
+aeginetan
+aegineti
+aeginetic
+aegipan
+aegirine
+aegirino
+aegirinolite
+aegirite
+aegis
+aegis-da
+aegis-dahlgren
+aegises
+aegisthu
+aegisthus
+aegithal
+aegithalos
+aegithog
+aegithognathae
+aegithognathism
+aegithognathous
+aegle
+aegna
+aego
+aegopodi
+aegopodium
+aegrotan
+aegrotant
+aegs
+aegypt
+aegypten
+aegypter
+aegypterin
+aegypterinnen
+aegypters
+aegyptia
+aegyptian
+aegyptie
+aegyptien
+aegyptil
+aegyptilla
+aegyptis
+aegyptisch
+aegyptische
+aegyptischem
+aegyptischer
+aegyptisches
+aegyrite
+aeh
+aehlita
+aehnele
+aehnelnd
+aehnelnde
+aehnelndem
+aehnelnder
+aehnelndes
+aehnelst
+aehnelte
+aehnelten
+aehneltest
+aehnle
+aehnlich
+aehnliche
+aehnlichen
+aehnlicher
+aehnlichere
+aehnlicheren
+aehnlicherer
+aehnlicheres
+aehnlichkeit
+aehnlichkeiten
+aehnlichste
+aehnlichsten
+aehnlichster
+aehnlichstes
+aehren
+aehrenkr
+aehrenkranz
+aeight
+aeinstei
+aeinstein
+aeiou
+aeiouyw
+aeiouzc
+aejauroh
+aek
+aeka
+aeke
+aekta
+aektensk
+aektenskap
+aektenskapet
+aekyom
+ael
+aeldre
+aeldst
+aeldsta
+aelg
+aelgko
+aelhswit
+aelhswith
+aeligatu
+aeligature
+aella
+aellas
+aelska
+aelskade
+aelst
+aelta
+aeltere
+aelterem
+aelteren
+aelteres
+aeltest
+aelteste
+aeltesten
+aeltestenrat
+aeltestenrates
+aeltester
+aeltestes
+aeltlich
+aeltliche
+aeltlichem
+aeltlichen
+aeltliches
+aeluroid
+aeluroidea
+aeluroph
+aelurophobe
+aelurophobia
+aeluropo
+aeluropodous
+aelv
+aelvar
+aem
+aembar
+aembete
+aembetet
+aemil
+aemila
+aemilia
+aemilius
+aemna
+aemne
+aemnen
+aemnena
+aemnet
+aemono
+aems
+aemter
+aemtern
+aemterve
+aemterverteilung
+aen
+aena
+aenach
+aenahu
+aenas
+aenda
+aendaa
+aendamaa
+aendamaal
+aendan
+aende
+aenden
+aendenbo
+aendenboom
+aenderba
+aenderbaren
+aendere
+aendern
+aendernd
+aendernde
+aenderndem
+aendernder
+aenderndes
+aenderst
+aenderte
+aenderten
+aendertest
+aenderun
+aenderungen
+aenderungsantraege
+aenderungsantrag
+aenderungsgesetz
+aenderungsgesetze
+aenderungsrichtlinie
+aenderungswuensche
+aendlig
+aendliga
+aendligt
+aendloes
+aendpunk
+aendpunkt
+aendpunkter
+aendra
+aendring
+aendringarna
+aendringsbesluten
+aendringsfoerslag
+aendringskarusell
+aendringsrutinen
+aendutru
+aendutrustning
+aendutrustningen
+aenean
+aeneas
+aeneid
+aeneolit
+aeneolithic
+aeneous
+aeng
+aengar
+aengel
+aengelho
+aengelholm
+aengslan
+aengslig
+aengste
+aengsten
+aengstig
+aengstige
+aengstigen
+aengstigend
+aengstigendem
+aengstigenden
+aengstigender
+aengstigest
+aengstigt
+aengstigte
+aengstigtest
+aengstli
+aengstlich
+aengstliche
+aengstlicher
+aengstlichere
+aengstlicherem
+aengstlicherer
+aengstlicheres
+aengstliches
+aengstlichkeiten
+aengstlichstem
+aengstlichsten
+aengstlichster
+aenigmat
+aenigmatite
+aenka
+aenkling
+aenklingen
+aenna
+aennchen
+aenne
+aennu
+aenon
+aentlige
+aentligen
+aentra
+aeolharm
+aeolharmonica
+aeolia
+aeolian
+aeolic
+aeolicis
+aeolicism
+aeolid
+aeolidae
+aeolidid
+aeolididae
+aeolina
+aeoline
+aeolipil
+aeolipile
+aeolis
+aeolism
+aeolist
+aeolisti
+aeolistic
+aeolodic
+aeolodicon
+aeolodio
+aeolodion
+aeolomel
+aeolomelodicon
+aeolopan
+aeolopantalon
+aeolotro
+aeolotropic
+aeolotropism
+aeolotropy
+aeolskla
+aeolsklavier
+aeolus
+aeon
+aeonial
+aeonian
+aeonic
+aeonist
+aeons
+aepfel
+aepfeln
+aepli
+aepple
+aepplen
+aepycero
+aepyceros
+aepyorni
+aepyornis
+aepyornithidae
+aepyornithiformes
+aequator
+aequatorialafrika
+aequatorialstroemung
+aequators
+aequi
+aequian
+aequicul
+aequiculi
+aequinoc
+aequinoctial
+aequipal
+aequipalpia
+aequival
+aequivalent
+aequo
+aequorea
+aequoreal
+aer
+aera
+aeracio`n
+aerage
+aeran
+aerarian
+aerarium
+aerate
+aerated
+aerates
+aerating
+aeration
+aerations
+aerator
+aerators
+aerbar
+aerea
+aereal
+aeree
+aerei
+aerenchy
+aerenchyma
+aerende
+aerendef
+aerendefilen
+aerendeh
+aerendehantering
+aerenden
+aerendena
+aerendenummer
+aerendes
+aerendestatistik
+aerendestatus
+aerendet
+aerendetexten
+aerenter
+aerenterectasia
+aereo
+aerevoer
+aerevoerdig
+aerftlig
+aerftliga
+aerg
+aerga
+aerger
+aergere
+aergerem
+aergerer
+aergeres
+aergerli
+aergerlich
+aergerlichem
+aergerlichen
+aergerlicher
+aergerlicherem
+aergerlicheren
+aergerlicherer
+aergerliches
+aergerlichste
+aergerlichstem
+aergerlichster
+aergerlichstes
+aergern
+aergernd
+aergernde
+aergernden
+aergernder
+aergerni
+aergernisse
+aergernisses
+aergers
+aergerst
+aergert
+aergerte
+aergertest
+aergertet
+aergste
+aergsten
+aergster
+aergstes
+aeri
+aeri`fera
+aeri`fero
+aeria
+aerial
+aerialis
+aerialist
+aerialists
+aerialit
+aeriality
+aerially
+aerialne
+aerialness
+aerials
+aeric
+aerical
+aerides
+aerie
+aeried
+aeriel
+aeriela
+aeriell
+aerier
+aeries
+aeriest
+aerifact
+aerifaction
+aerifero
+aeriferous
+aerifica
+aerification
+aerifict
+aerifiction
+aerified
+aerifies
+aeriform
+aeriforme
+aerify
+aerifyin
+aerifying
+aeril
+aerily
+aering
+aerlig
+aerm
+aermelka
+aermelkanal
+aermelkanals
+aermeln
+aermeltr
+aermeltricks
+aermer
+aermere
+aermerem
+aermerer
+aermeres
+aermlich
+aermste
+aermstem
+aermsten
+aermstes
+aero
+aero-mec
+aero1
+aero3
+aero`dromo
+aero`fora
+aero`foro
+aero`metro
+aero`stato
+aeroacou
+aeroacoustic
+aerobact
+aerobacter
+aerobate
+aerobati
+aerobatic
+aerobatics
+aerobe
+aerobes
+aerobia
+aerobian
+aerobic
+aerobica
+aerobically
+aerobics
+aerobio
+aerobiol
+aerobiologic
+aerobiological
+aerobiologically
+aerobiologist
+aerobiology
+aerobion
+aerobiont
+aerobios
+aerobioscope
+aerobiosis
+aerobiot
+aerobiotic
+aerobiotically
+aerobiou
+aerobious
+aerobium
+aeroboat
+aerobran
+aerobranchia
+aerobranchiate
+aerobus
+aerocame
+aerocamera
+aerocart
+aerocartograph
+aerochar
+aerocharidae
+aeroclub
+aeroclubs
+aerocolp
+aerocolpos
+aerocraf
+aerocraft
+aerocurv
+aerocurve
+aerocyst
+aeroderm
+aerodermectasia
+aerodina`mica
+aerodina`mico
+aerodone
+aerodonetic
+aerodonetics
+aerodrom
+aerodrome
+aerodromes
+aerodromics
+aerodyna
+aerodynamic
+aerodynamical
+aerodynamically
+aerodynamicist
+aerodynamics
+aerodynamiker
+aerodynamikk
+aerodynamikken
+aerodynamisk
+aerodyne
+aeroembo
+aeroembolism
+aeroente
+aeroenterectasia
+aerofagia
+aerofoil
+aerofoils
+aerofuro
+aerogel
+aerogels
+aerogen
+aerogene
+aerogenes
+aerogenesis
+aerogeni
+aerogenic
+aerogenically
+aerogeno
+aerogenous
+aerogeol
+aerogeologist
+aerogeology
+aerognos
+aerognosy
+aerogram
+aerogrammet
+aerograms
+aerograp
+aerograph
+aerographer
+aerographic
+aerographical
+aerographics
+aerography
+aerogun
+aerohydr
+aerohydrodynamic
+aerohydropathy
+aerohydroplane
+aerohydrotherapy
+aerohydrous
+aeroides
+aeroli`tica
+aeroli`tico
+aerolite
+aerolites
+aerolith
+aerolithology
+aeroliths
+aeroliti
+aerolitic
+aerolitics
+aerolito
+aerologi
+aerologic
+aerological
+aerologist
+aerologists
+aerology
+aeroma`ntica
+aeroma`ntico
+aeromaec
+aeromaechanic
+aeromanc
+aeromancer
+aeromancia
+aeromancy
+aeromant
+aeromantic
+aeromari
+aeromarine
+aeromech
+aeromechanical
+aeromechanics
+aeromete
+aerometeorograph
+aerometer
+aerometr
+aerometric
+aerometry
+aeromo`vil
+aeromoto
+aeromotor
+aerona`utica
+aerona`utico
+aeronat
+aeronata
+aeronati
+aeronatics
+aeronato
+aeronaut
+aeronauta
+aeronautic
+aeronautical
+aeronautically
+aeronautics
+aeronautik
+aeronautische
+aeronautism
+aeronauts
+aeronava
+aeronaval
+aeronave
+aeronef
+aeroneur
+aeroneurosis
+aeropath
+aeropathy
+aerope
+aeroperi
+aeroperitoneum
+aeroperitonia
+aerophag
+aerophagia
+aerophagist
+aerophagy
+aerophan
+aerophane
+aerophil
+aerophilatelic
+aerophilatelist
+aerophilately
+aerophile
+aerophilic
+aerophilous
+aerophob
+aerophobia
+aerophobic
+aerophon
+aerophone
+aerophor
+aerophore
+aerophot
+aerophotography
+aerophys
+aerophysical
+aerophysics
+aerophyt
+aerophyte
+aeroplan
+aeroplane
+aeroplaner
+aeroplanes
+aeroplani
+aeroplanist
+aeroplano
+aeropleu
+aeropleustic
+aeroporo
+aeroporotomy
+aeroport
+aeroporti
+aeroporto
+aeropostal
+aeropuerto
+aeroran
+aeroscep
+aeroscepsis
+aeroscepsy
+aeroscop
+aeroscope
+aeroscopic
+aeroscopically
+aeroscopy
+aerose
+aeroshel
+aeroshell
+aeroside
+aerosiderite
+aerosiderolite
+aerosmit
+aerosol
+aerosolb
+aerosolboks
+aerosolboksen
+aerosole
+aerosolen
+aerosolf
+aerosolforbundet
+aerosoli
+aerosolization
+aerosolize
+aerosolized
+aerosolizing
+aerosols
+aerospac
+aerospace
+aerospace-sced
+aerosphe
+aerosphere
+aerospor
+aerosporin
+aerosta`tica
+aerosta`tico
+aerostacio`n
+aerostat
+aerostatic
+aerostatica
+aerostatical
+aerostatics
+aerostatik
+aerostation
+aerostea
+aerosteam
+aerostero
+aerotact
+aerotactic
+aerotaxi
+aerotaxis
+aerote`cnica
+aerote`cnico
+aerotech
+aerotechnical
+aerotecnia
+aeroterapia
+aerother
+aerotherapeutics
+aerotherapy
+aerotono
+aerotonometer
+aerotonometric
+aerotonometry
+aerotrop
+aerotropic
+aerotropism
+aerovi`a
+aeroyach
+aeroyacht
+aerr
+aersche
+aert
+aerta
+aerugino
+aeruginous
+aerugo
+aerva
+aery
+aerzte
+aerztebe
+aerzteberuf
+aerztebesprechung
+aerztebl
+aerzteblatt
+aerztegr
+aerztegruppen
+aerzteho
+aerztehonorare
+aerzteka
+aerztekammer
+aerzten
+aerzteor
+aerzteorganisationen
+aerztero
+aerzteroman
+aerztest
+aerztestreik
+aerztestreiks
+aerzteta
+aerztetag
+aerztetr
+aerztetreffen
+aerztetreuhand
+aerzteve
+aerzteverbaende
+aerzteverband
+aerzteverbands
+aerztevereinigung
+aerztin
+aerztinn
+aerztinnen
+aerztlic
+aerztlich
+aerztliche
+aerztlichen
+aerztlicher
+aerztliches
+aes
+aeschine
+aeschines
+aeschyle
+aeschylean
+aeschylu
+aeschylus
+aeschyna
+aeschynanthus
+aeschyno
+aeschynomene
+aeschynomenous
+aesculac
+aesculaceae
+aesculaceous
+aesculap
+aesculapia
+aesculapian
+aesculapius
+aesculus
+aesend
+aesende
+aesendem
+aesender
+aesendes
+aeska
+aeson
+aesop
+aesopian
+aesopic
+aess
+aest
+aesta
+aestb
+aestc
+aestd
+aeste
+aestethi
+aestethic
+aesthesi
+aesthesia
+aesthet
+aesthete
+aestheten
+aesthetes
+aestheti
+aesthetic
+aesthetical
+aesthetically
+aesthetician
+aestheticism
+aestheticist
+aestheticize
+aesthetics
+aesthetik
+aesthetisch
+aesthetische
+aesthetischen
+aesthetisches
+aesthiol
+aesthiology
+aesthoph
+aesthophysiology
+aestii
+aestivat
+aestivate
+aestivated
+aestivates
+aestivating
+aestsc
+aet
+aeta
+aetare
+aete
+aetergiv
+aetergivning
+aeternae
+aeternit
+aeternitas
+aethalio
+aethalioid
+aethaliu
+aethalium
+aetheoga
+aetheogam
+aetheogamic
+aetheogamous
+aether
+aethered
+aetheric
+aetheris
+aetherischen
+aethers
+aethione
+aethionema
+aethiope
+aethioper
+aethiopi
+aethiopien
+aethiopisch
+aethiopischer
+aethiopisches
+aethogen
+aethra
+aethrios
+aethrioscope
+aethusa
+aethyl
+aetian
+aetiogen
+aetiogenic
+aetiolog
+aetiology
+aetiotro
+aetiotropic
+aetiotropically
+aetlig
+aetna
+aetobati
+aetobatidae
+aetobatu
+aetobatus
+aetolia
+aetolian
+aetolien
+aetomorp
+aetomorphae
+aetosaur
+aetosaurian
+aetosaurus
+aetsch
+aett
+aetzend
+aetzende
+aetzendem
+aetzender
+aetzendes
+aetzt
+aetzten
+aetzung
+aeugelch
+aeugelchen
+aeugen
+aeugte
+aeussere
+aeusserem
+aeusserer
+aeusseres
+aeusserl
+aeusserlich
+aeusserlichem
+aeusserlichen
+aeusserlicher
+aeusserlichkeit
+aeussern
+aeussernd
+aeussernde
+aeussernder
+aeusserndes
+aeussers
+aeusserst
+aeusserstem
+aeussersten
+aeusserster
+aeussert
+aeusserte
+aeusserten
+aeussertet
+aeusseru
+aeusserung
+aeusserungen
+aev
+aeven
+aeventyr
+aeventyra
+aevia
+aevlan
+aew
+aexing
+aexte
+aexten
+aextesch
+aexteschwingender
+af
+af-gdss
+afa
+afa\arse
+afa\o
+afa`n
+afa`sica
+afa`sico
+afabili`sima
+afabili`simo
+afabilidad
+afable
+afablemente
+afabulacio`n
+afabulador
+afaccionada
+afaccionado
+aface
+afaced
+afacer
+afacimiento
+afacing
+afade
+afadeh
+afafc
+afaicionada
+afaicionado
+afaint
+afak
+afakani
+afal
+afal-edw
+afal-edwards
+afalagar
+afalago
+afalc
+afalc-ii
+afalc-iis
+afamada
+afamado
+afamar
+afan
+afanada
+afanadamente
+afanado
+afanador
+afanadora
+afanar
+afanasev
+afanasy
+afanc
+afanci
+afande
+afango
+afani`ptero
+afanita
+afanosa
+afanosamente
+afanoso
+afao
+afaq
+afar
+afara
+afaraf
+afarallonada
+afarallonado
+afarolada
+afarolado
+afars
+afart
+afascalar
+afasia
+afasie
+afasifor
+afasiforening
+afat
+afatar
+afaten
+afatiker
+afatikerne
+afatime
+afawa
+afb
+afbaard
+afbaardd
+afbaardde
+afbaardden
+afbaarde
+afbaarden
+afbaardt
+afbad
+afbaden
+afbak
+afbakend
+afbakende
+afbakenden
+afbakene
+afbakenen
+afbakeni
+afbakening
+afbakeningen
+afbakken
+afbakt
+afbakte
+afbakten
+afbalancere
+afbalanceret
+afbarst
+afbarste
+afbarsten
+afbarstt
+afbarstte
+afbarstten
+afbedeld
+afbedelde
+afbedelden
+afbedele
+afbedelen
+afbeeld
+afbeeldd
+afbeeldde
+afbeeldden
+afbeelde
+afbeelden
+afbeeldi
+afbeelding
+afbeeldingen
+afbeeldinkje
+afbeeldinkjes
+afbeelds
+afbeeldsel
+afbeeldsels
+afbeeldt
+afbeen
+afbeende
+afbeenden
+afbeent
+afbeet
+afbeitel
+afbeitelde
+afbeitelden
+afbeitelen
+afbek
+afbekken
+afbekt
+afbekte
+afbekten
+afbel
+afbelde
+afbelden
+afbellen
+afbelt
+afbenen
+afberich
+afbericht
+afberichten
+afbestel
+afbesteld
+afbestelde
+afbestelden
+afbestellen
+afbestelling
+afbestellingen
+afbestelt
+afbet
+afbetaal
+afbetaald
+afbetaalde
+afbetaalden
+afbetaalt
+afbetale
+afbetalen
+afbetali
+afbetaling
+afbetalingen
+afbetalingskontrakt
+afbetalingsstelsel
+afbetalingsstelsels
+afbetalingssysteem
+afbetalingssystemen
+afbetalingstermijn
+afbetalingstermijnen
+afbeten
+afbette
+afbetten
+afbeul
+afbeulde
+afbeulden
+afbeulen
+afbeult
+afbf
+afbid
+afbidden
+afbiddin
+afbidding
+afbidt
+afbied
+afbieden
+afbiedt
+afbies
+afbiesde
+afbiesden
+afbiest
+afbiezen
+afbijt
+afbijten
+afbik
+afbikken
+afbikt
+afbikte
+afbikten
+afbilde
+afbildes
+afbildning
+afbiljoe
+afbiljoen
+afbiljoende
+afbiljoenden
+afbiljoenen
+afbiljoent
+afbind
+afbinden
+afbindt
+afblaad
+afblaadd
+afblaadde
+afblaadden
+afblaadt
+afblaar
+afblaard
+afblaarde
+afblaarden
+afblaart
+afblaas
+afblaast
+afbladde
+afbladderde
+afbladderden
+afbladderen
+afbladen
+afblader
+afbladerde
+afbladerden
+afbladeren
+afblaren
+afblazen
+afbleef
+afbleven
+afblies
+afblieze
+afbliezen
+afblijf
+afblijft
+afblijve
+afblijven
+afblikse
+afbliksemde
+afbliksemden
+afbliksemen
+afblok
+afblokke
+afblokken
+afblokt
+afblokte
+afblokten
+afblot
+afblotte
+afblotten
+afboden
+afboek
+afboeken
+afboekin
+afboeking
+afboekt
+afboekte
+afboekten
+afboen
+afboende
+afboenden
+afboenen
+afboent
+afboet
+afboeten
+afboette
+afboetten
+afbogen
+afbol
+afbolde
+afbolden
+afbollen
+afbolt
+afbomen
+afbond
+afbonden
+afbonk
+afbonken
+afbonkt
+afbonkte
+afbonkten
+afbons
+afbonsde
+afbonsden
+afbonst
+afbonzen
+afbood
+afboog
+afboom
+afboomde
+afboomden
+afboomt
+afborste
+afborstelde
+afborstelden
+afborstelen
+afborsteling
+afborstelingen
+afbottel
+afbottelde
+afbottelden
+afbottelen
+afbottelt
+afbraak
+afbraakm
+afbraakmateriaal
+afbracht
+afbrachten
+afbrak
+afbraken
+afbrand
+afbrandd
+afbrandde
+afbrandden
+afbrande
+afbranden
+afbrandi
+afbranding
+afbrandingen
+afbrands
+afbrandsel
+afbrandt
+afbras
+afbrasse
+afbrassen
+afbrast
+afbraste
+afbrasten
+afbreek
+afbreekf
+afbreekfout
+afbreekfouten
+afbreekt
+afbrei
+afbreide
+afbreiden
+afbreien
+afbreit
+afbreken
+afbreker
+afbrekers
+afbrekin
+afbreking
+afbrekingen
+afbrekingsteken
+afbrekingstekens
+afbreng
+afbrenge
+afbrengen
+afbrengt
+afbreuk
+afbrijn
+afbrijnd
+afbrijnde
+afbrijnden
+afbrijne
+afbrijnen
+afbrijnt
+afbrodde
+afbroddelde
+afbroddelden
+afbroddelen
+afbrokke
+afbrokkelde
+afbrokkelden
+afbrokkelen
+afbrokkeling
+afbrokkelingen
+afbrudt
+afbryd
+afbryde
+afbrydelse
+afbrydelsen
+afbrydelser
+afbrydelsesvektor
+afbrydelsesvektorer
+afbryder
+afbrydes
+afbrydning
+afbr{nd
+afbr{ndes
+afbr{ndt
+afbuig
+afbuigen
+afbuigt
+afbuitel
+afbuitelde
+afbuitelden
+afbuitelen
+afb|de
+afb|der
+afb|dning
+afb|j
+afb|je
+afb|jet
+afb|jning
+afc
+afcc
+afcc-oa1
+afcc-oa2
+afcomman
+afcommandeer
+afcommandeerde
+afcommandeerden
+afcommandeert
+afcommanderen
+afd
+afdaal
+afdaalde
+afdaalden
+afdaalt
+afdak
+afdaken
+afdalen
+afdaling
+afdalingen
+afdam
+afdamde
+afdamden
+afdammen
+afdammin
+afdamming
+afdammingen
+afdamt
+afdank
+afdanken
+afdankin
+afdanking
+afdankingen
+afdankt
+afdankte
+afdankten
+afdans
+afdansen
+afdanst
+afdanste
+afdansten
+afdb
+afdecho
+afdeden
+afdeed
+afdeel
+afdeelde
+afdeelden
+afdeelt
+afdeins
+afdeinsd
+afdeinsde
+afdeinsden
+afdeinst
+afdeinze
+afdeinzen
+afdek
+afdekken
+afdekkin
+afdekking
+afdekkingen
+afdekt
+afdekte
+afdekten
+afdelen
+afdeling
+afdelingen
+afdelinger
+afdelingsbibliotheek
+afdelingsbibliotheken
+afdelingschef
+afdelingschefs
+afdelingscomputere
+afdelingshoofd
+afdelingshoofden
+afdelingsleder
+afdelingsledere
+afdelingslederen
+afdelingslederne
+afdelingsnummer
+afdelingsonderzoek
+afdelink
+afdelinkje
+afdelinkjes
+afdief
+afdiefde
+afdiefden
+afdieft
+afdien
+afdiende
+afdienden
+afdienen
+afdient
+afdieven
+afdijk
+afdijken
+afdijkin
+afdijking
+afdijkingen
+afdijkt
+afdijkte
+afdijkten
+afding
+afdingen
+afdingt
+afdoen
+afdoend
+afdoende
+afdoendm
+afdoendmeer
+afdoendmeest
+afdoener
+afdoeners
+afdoenin
+afdoening
+afdoeningen
+afdok
+afdokken
+afdokt
+afdokte
+afdokten
+afdolen
+afdonder
+afdonderde
+afdonderden
+afdonderen
+afdong
+afdongen
+afdool
+afdoolde
+afdoolden
+afdoolt
+afdop
+afdoppen
+afdopt
+afdopte
+afdopten
+afdors
+afdorsen
+afdorst
+afdorste
+afdorsten
+afdraaf
+afdraafd
+afdraafde
+afdraafden
+afdraaft
+afdraag
+afdraagt
+afdraai
+afdraaid
+afdraaide
+afdraaiden
+afdraaie
+afdraaien
+afdraait
+afdracht
+afdrachten
+afdragen
+afdrager
+afdragers
+afdragertje
+afdragertjes
+afdragsordning
+afdraven
+afdreef
+afdreg
+afdregde
+afdregden
+afdregge
+afdreggen
+afdregt
+afdreig
+afdreigd
+afdreigde
+afdreigden
+afdreige
+afdreigen
+afdreigi
+afdreiging
+afdreigingen
+afdreigt
+afdrente
+afdrentelde
+afdrentelden
+afdrentelen
+afdreven
+afdrijf
+afdrijft
+afdrijve
+afdrijven
+afdrijvend
+afdrijvende
+afdrijvi
+afdrijving
+afdrijvingen
+afdring
+afdringe
+afdringen
+afdringt
+afdrink
+afdrinke
+afdrinken
+afdrinkt
+afdroeg
+afdroege
+afdroegen
+afdrogen
+afdrogin
+afdroging
+afdrogingen
+afdrong
+afdronge
+afdrongen
+afdronk
+afdronke
+afdronken
+afdroog
+afdroogd
+afdroogde
+afdroogden
+afdroogt
+afdroop
+afdropen
+afdroppe
+afdroppelde
+afdroppelden
+afdroppelen
+afdruip
+afdruipb
+afdruipbak
+afdruipbakken
+afdruipe
+afdruipen
+afdruipi
+afdruiping
+afdruipingen
+afdruipt
+afdruk
+afdrukfo
+afdrukformaat
+afdrukke
+afdrukken
+afdrukpa
+afdrukpapier
+afdrukse
+afdruksel
+afdruksels
+afdrukt
+afdrukte
+afdrukten
+afdrup
+afdruppe
+afdruppelde
+afdruppelden
+afdruppelen
+afdruppen
+afdrupt
+afdrupte
+afdrupten
+afduikel
+afduikelde
+afduikelden
+afduikelen
+afduwde
+afduwden
+afduwen
+afdwaal
+afdwaald
+afdwaalde
+afdwaalden
+afdwaalt
+afdwalen
+afdwalin
+afdwaling
+afdwalingen
+afdweil
+afdweild
+afdweilde
+afdweilden
+afdweile
+afdweilen
+afdweilt
+afdwing
+afdwinge
+afdwingen
+afdwingt
+afdwong
+afdwonge
+afdwongen
+afd{kket
+afd|d
+afd|de
+afe
+afe`
+afe`resis
+afeador
+afeadora
+afear
+afeard
+afeared
+afeblecerse
+afebrile
+afeccio`n
+afeccionar
+afecha
+afecho
+afecta
+afectacio`n
+afectada
+afectadamente
+afectado
+afectador
+afectadora
+afectar
+afecti`sima
+afecti`simo
+afectiva
+afectividad
+afectivo
+afecto
+afectuosa
+afectuosamente
+afectuosidad
+afectuoso
+afeet
+afeis
+afeisen
+afeist
+afeiste
+afeisten
+afeitada
+afeitadamente
+afeitadera
+afeitado
+afeitador
+afeitadora
+afeitamiento
+afeitar
+afeite
+afelio
+afelpada
+afelpado
+afelpar
+afem
+afeminacio`n
+afeminada
+afeminadamente
+afeminado
+afeminamiento
+afeminar
+afenil
+afenmai
+afer
+aferente
+aferidor
+aferidora
+aferike
+aferir
+afermosear
+afernan
+aferradamente
+aferrador
+aferradora
+aferramiento
+aferrar
+aferravelas
+aferrojar
+aferruzada
+aferruzado
+aferventar
+afervorar
+afervorizar
+afes
+afesd
+afestonada
+afestonado
+afetal
+afeten
+affa
+affabile
+affabili
+affabilita
+affabilite'
+affabilite's
+affability
+affable
+affablen
+affableness
+affables
+affably
+affabrou
+affabrous
+affabula
+affabulation
+affabule
+affabuler
+affaccer
+affaccera
+affaccerai
+affaccerei
+affaccero
+affacci
+affaccia
+affacciai
+affacciamo
+affacciano
+affacciare
+affacciata
+affacciate
+affacciati
+affacciato
+affacciava
+affacciavi
+affacciavo
+affaccin
+affaccino
+affaccio
+affactur
+affacturant
+affacture'
+affacture'e
+affacture'es
+affacture's
+affacturer
+affade
+affadir
+affaer
+affaeren
+affaerer
+affaf
+affaibli
+affaiblie
+affaiblies
+affaiblir
+affaiblira
+affaiblirai
+affaibliraient
+affaiblirais
+affaiblirait
+affaibliras
+affaiblirent
+affaiblirez
+affaibliriez
+affaiblirions
+affaiblirons
+affaibliront
+affaiblis
+affaiblissaient
+affaiblissais
+affaiblissait
+affaiblissant
+affaiblisse
+affaiblissement
+affaiblissent
+affaiblisses
+affaiblissez
+affaiblissiez
+affaiblissions
+affaiblissons
+affaiblit
+affair
+affaira
+affairai
+affairaient
+affairais
+affairait
+affairan
+affairant
+affaire
+affaire'
+affaire'e
+affaire'es
+affaire's
+affaire`
+affaire`rent
+affairem
+affairement
+affairen
+affairent
+affairer
+affairera
+affairerai
+affaireraient
+affairerais
+affairerait
+affaireras
+affairerez
+affaireriez
+affairerions
+affairerons
+affaireront
+affaires
+affairez
+affairie
+affairiez
+affairio
+affairions
+affairis
+affairisme
+affairiste
+affairistes
+affairon
+affairons
+affairs
+affaissa
+affaissaient
+affaissais
+affaissait
+affaissant
+affaisse
+affaisse'
+affaisse'e
+affaisse'es
+affaisse's
+affaisse`rent
+affaissement
+affaissements
+affaissent
+affaisser
+affaissera
+affaisserai
+affaisseraient
+affaisserais
+affaisserait
+affaisseras
+affaisserez
+affaisseriez
+affaisserions
+affaisserons
+affaisseront
+affaisses
+affaissez
+affaissi
+affaissiez
+affaissions
+affaisso
+affaissons
+affaite
+affaleme
+affalement
+affaler
+affama
+affamai
+affamaie
+affamaient
+affamais
+affamait
+affamamm
+affamammo
+affamand
+affamando
+affamano
+affamant
+affamare
+affamaro
+affamarono
+affamass
+affamasse
+affamassi
+affamast
+affamaste
+affamasti
+affamata
+affamate
+affamati
+affamato
+affamava
+affamavamo
+affamavano
+affamavate
+affamavi
+affamavo
+affame
+affame'
+affame'e
+affame'es
+affame's
+affame`r
+affame`rent
+affament
+affamer
+affamera
+affamerai
+affameraient
+affamerais
+affamerait
+affameras
+affamere
+affamerei
+affameremo
+affamerete
+affamerez
+affameri
+affameriez
+affamerions
+affamero
+affamerons
+affameront
+affames
+affameur
+affameurs
+affamez
+affami
+affamiam
+affamiamo
+affamiat
+affamiate
+affamiez
+affamino
+affamion
+affamions
+affamo
+affamons
+affanna
+affannai
+affannam
+affannammo
+affannan
+affannando
+affannano
+affannar
+affannare
+affannas
+affannasse
+affannassi
+affannaste
+affannasti
+affannat
+affannata
+affannate
+affannati
+affannato
+affannav
+affannava
+affannavi
+affannavo
+affanner
+affannera
+affannerai
+affannerei
+affannero
+affanni
+affannia
+affanniamo
+affanniate
+affannin
+affannino
+affanno
+affar
+affare
+affarer
+affari
+affarist
+affarista
+affariste
+affaristi
+affarve
+affarvning
+affascin
+affascina
+affascinai
+affascini
+affascino
+affatica
+affaticai
+affaticano
+affaticare
+affaticata
+affaticate
+affaticati
+affaticato
+affaticava
+affaticavi
+affaticavo
+affatich
+affatichi
+affatico
+affatto
+affe
+affe'age
+affe'ager
+affe'ren
+affe'rent
+affe'rente
+affe'rentes
+affe'rents
+affect
+affecta
+affectab
+affectable
+affectai
+affectaient
+affectais
+affectait
+affectan
+affectant
+affectat
+affectate
+affectatie
+affectaties
+affectation
+affectationist
+affectations
+affecte
+affecte'
+affecte'e
+affecte'es
+affecte's
+affecte`
+affecte`rent
+affected
+affectedly
+affectedness
+affecten
+affectent
+affecter
+affectera
+affecterai
+affecteraient
+affecterais
+affecterait
+affecteras
+affecterez
+affecteriez
+affecterions
+affecterons
+affecteront
+affecters
+affectes
+affectet
+affecteth
+affectez
+affectib
+affectibility
+affectible
+affectie
+affectief
+affectiefst
+affecties
+affectieve
+affectiever
+affectiez
+affectif
+affectifs
+affectin
+affecting
+affectingly
+affectio
+affection
+affectional
+affectionally
+affectionate
+affectionately
+affectionateness
+affectioned
+affectionless
+affectionna
+affectionnaient
+affectionnais
+affectionnait
+affectionnant
+affectionne
+affectionne'
+affectionne'e
+affectionne'es
+affectionne's
+affectionne`rent
+affectionnent
+affectionner
+affectionnera
+affectionnerai
+affectionneraient
+affectionnerais
+affectionnerait
+affectionneras
+affectionnerez
+affectionneriez
+affectionnerions
+affectionnerons
+affectionneront
+affectionnes
+affectionnez
+affectionniez
+affectionnions
+affectionnons
+affections
+affectious
+affectiv
+affective
+affectively
+affectives
+affectivite'
+affectivity
+affecton
+affectons
+affector
+affects
+affectue
+affectueuse
+affectueusement
+affectueuses
+affectueux
+affeer
+affeerer
+affeerme
+affeerment
+affeir
+affeksjo
+affeksjon
+affeksjonsverdi
+affeksjonsverdien
+affekt
+affektas
+affektasjon
+affektasjonen
+affekten
+affekter
+affektert
+affektes
+affektha
+affekthandlung
+affektie
+affektierte
+affektiertem
+affektierten
+affektierterem
+affektierteren
+affektierterer
+affektiertes
+affektierteste
+affektiertestem
+affektiertester
+affektiertestes
+affektiertheit
+affektiertheiten
+affektio
+affektionen
+affenaeh
+affenaehnlichen
+affenart
+affenartige
+affenartigem
+affenartigen
+affenartiges
+affenfle
+affenfleisch
+affengei
+affengeil
+affengeile
+affengeiles
+affenhau
+affenhaus
+affenkom
+affenkommentar
+affenlie
+affenliebe
+affenmen
+affenmensch
+affenpin
+affenpinscher
+affensch
+affenschande
+affenschanden
+affenspa
+affenspalte
+affenthe
+affentheatern
+affentheaters
+afferent
+afferently
+afferma
+affermag
+affermage
+affermages
+affermai
+affermam
+affermammo
+afferman
+affermando
+affermano
+affermar
+affermare
+affermas
+affermasse
+affermassi
+affermaste
+affermasti
+affermat
+affermata
+affermate
+affermati
+affermativa
+affermativo
+affermato
+affermav
+affermava
+affermavi
+affermavo
+affermer
+affermera
+affermerai
+affermerei
+affermero
+affermi
+affermia
+affermiamo
+affermiate
+affermie
+affermies
+affermin
+affermino
+affermir
+affermira
+affermirai
+affermiraient
+affermirais
+affermirait
+affermiras
+affermirent
+affermirez
+affermiriez
+affermirions
+affermirons
+affermiront
+affermis
+affermissaient
+affermissais
+affermissait
+affermissant
+affermisse
+affermissement
+affermissent
+affermisses
+affermissez
+affermissiez
+affermissions
+affermissons
+affermit
+affermo
+afferra
+afferrai
+afferram
+afferrammo
+afferran
+afferrando
+afferrano
+afferrar
+afferrare
+afferras
+afferrasse
+afferrassi
+afferraste
+afferrasti
+afferrat
+afferrata
+afferrate
+afferrati
+afferrato
+afferrav
+afferrava
+afferravi
+afferravo
+afferrer
+afferrera
+afferrerai
+afferrerei
+afferrero
+afferri
+afferria
+afferriamo
+afferriate
+afferrin
+afferrino
+afferro
+affery
+affes
+affetta
+affettai
+affettam
+affettammo
+affettan
+affettando
+affettano
+affettar
+affettare
+affettas
+affettasse
+affettassi
+affettaste
+affettasti
+affettat
+affettata
+affettate
+affettati
+affettato
+affettav
+affettava
+affettavi
+affettavo
+affetter
+affettera
+affetterai
+affetterei
+affettero
+affetti
+affettia
+affettiamo
+affettiate
+affettin
+affettino
+affetto
+affettuo
+affettuosa
+affettuose
+affettuosi
+affettuoso
+affezion
+affeziona
+affezionai
+affezioni
+affezioniamo
+affeziono
+affff
+affi
+affiance
+affianced
+affiancer
+affiances
+affianci
+affiancing
+affiant
+affiata
+affiatai
+affiatam
+affiatammo
+affiatan
+affiatando
+affiatano
+affiatar
+affiatare
+affiatas
+affiatasse
+affiatassi
+affiataste
+affiatasti
+affiatat
+affiatata
+affiatate
+affiatati
+affiatato
+affiatav
+affiatava
+affiatavi
+affiatavo
+affiater
+affiatera
+affiaterai
+affiaterei
+affiatero
+affiati
+affiatia
+affiatiamo
+affiatiate
+affiatin
+affiatino
+affiato
+affibbi
+affibbia
+affibbiai
+affibbiamo
+affibbiano
+affibbiare
+affibbiata
+affibbiate
+affibbiati
+affibbiato
+affibbiava
+affibbiavi
+affibbiavo
+affibbie
+affibbiera
+affibbiero
+affibbin
+affibbino
+affibbio
+afficha
+affichag
+affichage
+affichages
+affichai
+affichaient
+affichais
+affichait
+affichan
+affichant
+affiche
+affiche'
+affiche'e
+affiche'es
+affiche's
+affiche`
+affiche`rent
+affichee
+afficheer
+afficheerde
+afficheerden
+afficheert
+affichen
+affichent
+afficher
+affichera
+afficherai
+afficheraient
+afficherais
+afficherait
+afficheras
+afficheren
+afficherez
+afficheriez
+afficherions
+afficherons
+afficheront
+affiches
+affichet
+affichette
+affichettes
+afficheu
+afficheur
+afficheurs
+affichez
+affichie
+affichiez
+affichio
+affichions
+affichis
+affichiste
+affichistes
+affichon
+affichons
+affida
+affidai
+affidamm
+affidammo
+affidand
+affidando
+affidano
+affidare
+affidaro
+affidarono
+affidass
+affidasse
+affidassi
+affidast
+affidaste
+affidasti
+affidata
+affidate
+affidati
+affidation
+affidato
+affidava
+affidavamo
+affidavano
+affidavate
+affidavi
+affidavit
+affidavits
+affidavo
+affidavy
+affidera
+affiderai
+affidere
+affiderei
+affideremo
+affiderete
+affidero
+affidi
+affidiam
+affidiamo
+affidiat
+affidiate
+affidino
+affido
+affiets
+affietse
+affietsen
+affietst
+affietste
+affietsten
+affig
+affige
+affigen
+affiger
+affigere
+affigeren
+affigerer
+affigeres
+affigste
+affigsten
+affigster
+affila
+affilage
+affilai
+affilamm
+affilammo
+affiland
+affilando
+affilano
+affilare
+affilaro
+affilarono
+affilass
+affilasse
+affilassi
+affilast
+affilaste
+affilasti
+affilata
+affilate
+affilati
+affilato
+affilava
+affilavamo
+affilavano
+affilavate
+affilavi
+affilavo
+affile'e
+affiler
+affilera
+affilerai
+affilere
+affilerei
+affileremo
+affilerete
+affilero
+affili
+affilia
+affiliab
+affiliable
+affiliai
+affiliaient
+affiliais
+affiliait
+affiliam
+affiliammo
+affiliamo
+affilian
+affiliando
+affiliano
+affiliant
+affiliar
+affiliare
+affilias
+affiliasse
+affiliassi
+affiliaste
+affiliasti
+affiliat
+affiliata
+affiliate
+affiliated
+affiliates
+affiliati
+affiliatie
+affiliating
+affiliation
+affiliations
+affiliato
+affiliav
+affiliava
+affiliavi
+affiliavo
+affilie
+affilie'
+affilie'e
+affilie'es
+affilie's
+affilie`
+affilie`rent
+affiliee
+affilieerde
+affilieerden
+affilien
+affilient
+affilier
+affiliera
+affilierai
+affilieraient
+affilierais
+affilierait
+affilieras
+affilierei
+affilieren
+affilierez
+affilieriez
+affilierions
+affiliero
+affilierons
+affilieront
+affilies
+affiliez
+affiliie
+affiliiez
+affiliio
+affiliions
+affilino
+affilio
+affilion
+affilions
+affilo
+affin
+affina
+affinage
+affinaie
+affinaient
+affinais
+affinait
+affinal
+affinant
+affinati
+affination
+affinche
+affinche'
+affinde
+affine
+affine'
+affine'e
+affine'es
+affine's
+affine`r
+affine`rent
+affined
+affinely
+affineme
+affinement
+affinements
+affinent
+affiner
+affinera
+affinerai
+affineraient
+affinerais
+affinerait
+affineras
+affinere
+affinerez
+affineri
+affineriez
+affinerions
+affinero
+affinerons
+affineront
+affines
+affinesy
+affinesymmetry
+affinez
+affini
+affiniez
+affinion
+affinions
+affinita
+affinitaeten
+affinitative
+affinitatively
+affinite
+affinite'
+affinite's
+affiniteit
+affiniteiten
+affinitet
+affiniteten
+affinitetsakse
+affiniti
+affinities
+affinition
+affinitive
+affinity
+affinons
+affirm
+affirma
+affirmab
+affirmable
+affirmably
+affirmai
+affirmaient
+affirmais
+affirmait
+affirman
+affirmance
+affirmant
+affirmat
+affirmatif
+affirmatifs
+affirmation
+affirmations
+affirmativ
+affirmative
+affirmatively
+affirmativement
+affirmativeness
+affirmatives
+affirmatory
+affirme
+affirme'
+affirme'e
+affirme'es
+affirme's
+affirme`
+affirme`rent
+affirmed
+affirmen
+affirment
+affirmer
+affirmera
+affirmerai
+affirmeraient
+affirmerais
+affirmerait
+affirmeras
+affirmerez
+affirmeriez
+affirmerions
+affirmerons
+affirmeront
+affirmers
+affirmes
+affirmez
+affirmie
+affirmiez
+affirmin
+affirming
+affirmingly
+affirmio
+affirmions
+affirmon
+affirmons
+affirms
+affisch
+affische
+affischer
+affisere
+affiserer
+affisert
+affitta
+affittai
+affittam
+affittammo
+affittan
+affittando
+affittano
+affittar
+affittare
+affittas
+affittasse
+affittassi
+affittaste
+affittasti
+affittat
+affittata
+affittate
+affittati
+affittato
+affittav
+affittava
+affittavi
+affittavo
+affitter
+affittera
+affitterai
+affitterei
+affittero
+affitti
+affittia
+affittiamo
+affittiate
+affittin
+affittino
+affitto
+affittua
+affittuari
+affix
+affixal
+affixati
+affixation
+affixe
+affixed
+affixen
+affixer
+affixers
+affixes
+affixing
+affixion
+affixtur
+affixture
+afflatio
+afflation
+afflatus
+affleura
+affleuraient
+affleurait
+affleurant
+affleure
+affleure'
+affleure'e
+affleure'es
+affleure's
+affleure`rent
+affleurement
+affleurements
+affleurent
+affleurer
+affleurera
+affleureraient
+affleurerait
+affleureront
+afflick
+afflict
+afflicte
+afflicted
+afflictedness
+afflicter
+afflictest
+afflicti
+afflicting
+afflictingly
+affliction
+afflictionless
+afflictions
+afflictive
+afflictively
+afflicts
+afflige
+afflige'
+afflige'e
+afflige'es
+afflige's
+afflige`
+afflige`rent
+affligea
+affligeaient
+affligeais
+affligeait
+affligeant
+affligeante
+affligeantes
+affligeants
+affligen
+affligent
+affligeo
+affligeons
+affliger
+affligera
+affligerai
+affligeraient
+affligerais
+affligerait
+affligeras
+affligerez
+affligeriez
+affligerions
+affligerons
+affligeront
+affliges
+affligez
+affligge
+affliggere
+affligie
+affligiez
+affligio
+affligions
+afflitta
+afflitti
+afflitto
+afflizio
+afflizione
+afflizioni
+affloot
+afflosci
+affloscia
+afflosciai
+affloscino
+affloscio
+affloten
+afflouer
+afflua
+affluaie
+affluaient
+affluait
+affluant
+afflue
+afflue'
+afflue`r
+afflue`rent
+affluenc
+affluence
+affluences
+affluent
+affluente
+affluentes
+affluenti
+affluently
+affluentness
+affluents
+affluenz
+affluenza
+affluenze
+affluer
+affluera
+afflueraient
+affluerait
+affluero
+afflueront
+affluit
+affluite
+affluiten
+afflux
+affluxes
+affluxio
+affluxion
+affodil
+affodill
+affodille
+affodillen
+affoga
+affogai
+affogamm
+affogammo
+affogand
+affogando
+affogano
+affogare
+affogaro
+affogarono
+affogass
+affogasse
+affogassi
+affogast
+affogaste
+affogasti
+affogata
+affogate
+affogati
+affogato
+affogava
+affogavamo
+affogavano
+affogavate
+affogavi
+affogavo
+affogher
+affoghera
+affogherai
+affogherei
+affoghero
+affoghi
+affoghia
+affoghiamo
+affoghiate
+affoghin
+affoghino
+affogo
+affola
+affolaie
+affolaient
+affolais
+affolait
+affolant
+affolante
+affolantes
+affolants
+affole
+affole'
+affole'e
+affole'es
+affole's
+affole`r
+affole`rent
+affoleme
+affolement
+affolent
+affoler
+affolera
+affolerai
+affoleraient
+affolerais
+affolerait
+affoleras
+affolere
+affolerez
+affoleri
+affoleriez
+affolerions
+affolero
+affolerons
+affoleront
+affoles
+affolez
+affoliez
+affolion
+affolions
+affolkede
+affolons
+affolter
+affonda
+affondai
+affondam
+affondammo
+affondan
+affondando
+affondano
+affondar
+affondare
+affondas
+affondasse
+affondassi
+affondaste
+affondasti
+affondat
+affondata
+affondate
+affondati
+affondato
+affondav
+affondava
+affondavi
+affondavo
+affonder
+affondera
+affonderai
+affonderei
+affondero
+affondi
+affondia
+affondiamo
+affondiate
+affondin
+affondino
+affondo
+affonso
+afforce
+afforcem
+afforcement
+afford
+affordab
+affordability
+affordable
+afforded
+affordin
+affording
+affords
+afforest
+afforestable
+afforestation
+afforested
+afforesting
+afforestment
+afforests
+afformat
+afformative
+affouage
+affouager
+affouill
+affouiller
+affourag
+affourager
+affourch
+affourcher
+affraid
+affranca
+affrancai
+affrancano
+affrancare
+affrancata
+affrancate
+affrancati
+affrancato
+affrancava
+affrancavi
+affrancavo
+affranch
+affranchi
+affranchie
+affranchies
+affranchir
+affranchira
+affranchirai
+affranchiraient
+affranchirais
+affranchirait
+affranchiras
+affranchirent
+affranchirez
+affranchiriez
+affranchirions
+affranchirons
+affranchiront
+affranchis
+affranchise
+affranchisement
+affranchissaient
+affranchissais
+affranchissait
+affranchissant
+affranchisse
+affranchissement
+affranchissements
+affranchissent
+affranchisses
+affranchissez
+affranchissiez
+affranchissions
+affranchissons
+affranchit
+affranco
+affranta
+affrante
+affranti
+affranto
+affray
+affrayed
+affrayer
+affrayers
+affrayin
+affraying
+affrayme
+affrayment
+affrays
+affre'ta
+affre'taient
+affre'tais
+affre'tait
+affre'tant
+affre'te
+affre'te'
+affre'te'e
+affre'te'es
+affre'te's
+affre'te`rent
+affre'ter
+affre'tera
+affre'terai
+affre'teraient
+affre'terais
+affre'terait
+affre'teras
+affre'terez
+affre'teriez
+affre'terions
+affre'terons
+affre'teront
+affre'teur
+affre'teurs
+affre'tez
+affre'ti
+affre'tiez
+affre'tions
+affre'to
+affre'tons
+affre`te
+affre`tement
+affre`tements
+affre`tent
+affre`tes
+affreigh
+affreight
+affreighter
+affreightment
+affres
+affretta
+affrettai
+affrettano
+affrettare
+affrettata
+affrettate
+affrettati
+affrettato
+affrettava
+affrettavi
+affrettavo
+affrette
+affrettera
+affrettero
+affretti
+affrettino
+affretto
+affreus
+affreuse
+affreusement
+affreuses
+affreust
+affreux
+affreuze
+affreuzer
+affriand
+affriander
+affricat
+affricate
+affricated
+affricates
+affrication
+affricative
+affricti
+affriction
+affright
+affrighted
+affrightedly
+affrighter
+affrightful
+affrightfully
+affrightingly
+affrightment
+affrights
+affriole
+affrioler
+affris
+affront
+affronta
+affrontai
+affrontaient
+affrontais
+affrontait
+affrontano
+affrontant
+affrontare
+affrontarlo
+affrontata
+affrontate
+affrontati
+affrontato
+affrontava
+affrontavi
+affrontavo
+affronte
+affronte'
+affronte'e
+affronte'es
+affronte's
+affronte`rent
+affronted
+affrontedly
+affrontedness
+affronteer
+affronteerde
+affronteerden
+affronteert
+affrontement
+affrontements
+affronten
+affrontent
+affronter
+affrontera
+affronterai
+affronteraient
+affronterais
+affronterait
+affronteras
+affronteren
+affronterez
+affronteriez
+affronterions
+affrontero
+affronterons
+affronteront
+affrontes
+affrontez
+affronti
+affrontiez
+affronting
+affrontingly
+affrontingness
+affrontino
+affrontions
+affrontive
+affrontiveness
+affrontm
+affrontment
+affronto
+affrontons
+affronts
+affruite
+affruiter
+affu^t
+affu^tag
+affu^tage
+affu^tan
+affu^tant
+affu^te'
+affu^te'e
+affu^te'es
+affu^te's
+affu^ter
+affu^ts
+affublan
+affublant
+affuble'
+affuble'e
+affuble'es
+affuble's
+affubler
+affuit
+affuiten
+affumica
+affumicai
+affumicano
+affumicare
+affumicata
+affumicate
+affumicati
+affumicato
+affumicava
+affumicavi
+affumicavo
+affumich
+affumichi
+affumico
+affuse
+affusion
+affusions
+affutsel
+affutselde
+affutselden
+affutselen
+affy
+affyr
+affyre
+affyres
+affyret
+affyring
+aff{r
+aff{re
+aff{ren
+aff{rer
+afga
+afgaan
+afgaand
+afgaande
+afgaf
+afgana
+afganer
+afganere
+afganeren
+afgang
+afgangen
+afgano
+afgav
+afgaven
+afgebaar
+afgebaard
+afgebaarde
+afgebaarden
+afgebake
+afgebakend
+afgebakende
+afgebakenden
+afgebakk
+afgebakken
+afgebakkene
+afgebakkenen
+afgebars
+afgebarst
+afgebarste
+afgebarsten
+afgebede
+afgebedeld
+afgebedelde
+afgebedelden
+afgebeden
+afgebedene
+afgebedenen
+afgebeel
+afgebeeld
+afgebeelde
+afgebeelden
+afgebeen
+afgebeend
+afgebeende
+afgebeenden
+afgebeit
+afgebeiteld
+afgebeitelde
+afgebeitelden
+afgebekt
+afgebekte
+afgebekten
+afgebeld
+afgebelde
+afgebelden
+afgebet
+afgebete
+afgebeten
+afgebetene
+afgebetenen
+afgebeul
+afgebeuld
+afgebeulde
+afgebeulden
+afgebies
+afgebiesd
+afgebiesde
+afgebiesden
+afgebikt
+afgebikte
+afgebikten
+afgebilj
+afgebiljoend
+afgebiljoende
+afgebiljoenden
+afgeblaa
+afgeblaad
+afgeblaard
+afgeblaarde
+afgeblaarden
+afgeblad
+afgebladderd
+afgebladderde
+afgebladderden
+afgebladerd
+afgebladerde
+afgebladerden
+afgeblaz
+afgeblazen
+afgeblazene
+afgeblazenen
+afgeblev
+afgebleven
+afgeblevene
+afgeblevenen
+afgeblik
+afgebliksemd
+afgeblok
+afgeblokt
+afgeblokte
+afgeblokten
+afgeblot
+afgeblote
+afgebloten
+afgebode
+afgeboden
+afgebodene
+afgebodenen
+afgeboek
+afgeboekt
+afgeboekte
+afgeboekten
+afgeboen
+afgeboend
+afgeboende
+afgeboenden
+afgeboet
+afgeboge
+afgebogen
+afgebogene
+afgebogenen
+afgebold
+afgebolde
+afgebolden
+afgebond
+afgebonden
+afgebondene
+afgebondenen
+afgebonk
+afgebonkt
+afgebons
+afgebonsd
+afgeboom
+afgeboomd
+afgeboomde
+afgeboomden
+afgebors
+afgeborsteld
+afgeborstelde
+afgeborstelden
+afgebott
+afgebotteld
+afgebottelde
+afgebottelden
+afgebrac
+afgebracht
+afgebran
+afgebrand
+afgebrande
+afgebras
+afgebrast
+afgebraste
+afgebrasten
+afgebrei
+afgebreid
+afgebreide
+afgebrij
+afgebrijnd
+afgebrijnde
+afgebrijnden
+afgebrod
+afgebroddeld
+afgebroddelde
+afgebroddelden
+afgebrok
+afgebroken
+afgebrokene
+afgebrokenen
+afgebrokkeld
+afgebrokkelde
+afgebrokkelden
+afgebuit
+afgebuiteld
+afgecomm
+afgecommandeerd
+afgecommandeerde
+afgecommandeerden
+afgedaal
+afgedaald
+afgedaalde
+afgedaalden
+afgedaan
+afgedamd
+afgedamde
+afgedamden
+afgedane
+afgedank
+afgedankt
+afgedankte
+afgedankten
+afgedans
+afgedanst
+afgedeel
+afgedeeld
+afgedein
+afgedeinsd
+afgedeinsde
+afgedeinsden
+afgedekt
+afgedekte
+afgedekten
+afgedief
+afgediefd
+afgediefde
+afgediefden
+afgedien
+afgediend
+afgediende
+afgedienden
+afgedijk
+afgedijkt
+afgedijkte
+afgedijkten
+afgedokt
+afgedokte
+afgedokten
+afgedond
+afgedonderd
+afgedong
+afgedongen
+afgedool
+afgedoold
+afgedoolde
+afgedoolden
+afgedopt
+afgedopte
+afgedopten
+afgedors
+afgedorst
+afgedraa
+afgedraafd
+afgedraafde
+afgedraafden
+afgedraaid
+afgedraaide
+afgedraaiden
+afgedrag
+afgedragen
+afgedragene
+afgedragenen
+afgedreg
+afgedregd
+afgedregde
+afgedregden
+afgedrei
+afgedreigd
+afgedreigde
+afgedreigden
+afgedren
+afgedrenteld
+afgedrev
+afgedreven
+afgedrevene
+afgedrevenen
+afgedron
+afgedrongen
+afgedrongene
+afgedrongenen
+afgedronken
+afgedroo
+afgedroogd
+afgedroogde
+afgedroogden
+afgedrop
+afgedropen
+afgedropene
+afgedropenen
+afgedroppeld
+afgedroppelde
+afgedroppelden
+afgedruk
+afgedrukt
+afgedrukte
+afgedrukten
+afgedrup
+afgedruppeld
+afgedruppelde
+afgedruppelden
+afgedrupt
+afgedrupte
+afgedrupten
+afgeduik
+afgeduikeld
+afgeduikelde
+afgeduikelden
+afgeduwd
+afgeduwde
+afgeduwden
+afgedwaa
+afgedwaald
+afgedwaalde
+afgedwaalden
+afgedwei
+afgedweild
+afgedweilde
+afgedweilden
+afgedwon
+afgedwongen
+afgeef
+afgeeft
+afgeeist
+afgeer
+afgeerde
+afgeerden
+afgeert
+afgefiet
+afgefietst
+afgeflot
+afgefloten
+afgeflotene
+afgeflotenen
+afgefuts
+afgefutseld
+afgefutselde
+afgegaan
+afgegeer
+afgegeerd
+afgegeerde
+afgegeerden
+afgegete
+afgegeten
+afgegetene
+afgegeve
+afgegeven
+afgegevene
+afgegevenen
+afgegled
+afgegleden
+afgegledene
+afgegledenen
+afgeglip
+afgeglipt
+afgeglipte
+afgeglipten
+afgegluu
+afgegluurd
+afgegolf
+afgegolfd
+afgegooi
+afgegooid
+afgegord
+afgegorde
+afgegorden
+afgegote
+afgegoten
+afgegotene
+afgegotenen
+afgegraa
+afgegraasd
+afgegraasde
+afgegraasden
+afgegrau
+afgegrauwd
+afgegrauwde
+afgegrauwden
+afgegrav
+afgegraven
+afgegravene
+afgegravenen
+afgegrep
+afgegreppeld
+afgegreppelde
+afgegreppelden
+afgegris
+afgegrist
+afgegriste
+afgegristen
+afgehaak
+afgehaakt
+afgehaakte
+afgehaakten
+afgehaal
+afgehaald
+afgehaalde
+afgehaalden
+afgehaar
+afgehaard
+afgehaarde
+afgehaarden
+afgehakt
+afgehakte
+afgehakten
+afgehame
+afgehamerd
+afgehamerde
+afgehamerden
+afgehand
+afgehandeld
+afgehandelde
+afgehandelden
+afgehang
+afgehangen
+afgehangene
+afgehangenen
+afgehapt
+afgehapte
+afgehapten
+afgehark
+afgeharkt
+afgeharkte
+afgeharkten
+afgehasp
+afgehaspeld
+afgehaspelde
+afgehaspelden
+afgehech
+afgehecht
+afgehechte
+afgeheld
+afgehelde
+afgehelden
+afgeheng
+afgehengeld
+afgehengelde
+afgehengelden
+afgeheve
+afgeheven
+afgehevene
+afgehevenen
+afgehold
+afgeholp
+afgeholpen
+afgeholpene
+afgeholpenen
+afgehoog
+afgehoogd
+afgehoogde
+afgehoogden
+afgehoor
+afgehoord
+afgehoorde
+afgehoorden
+afgehoud
+afgehouden
+afgehoudene
+afgehoudenen
+afgehouw
+afgehouwen
+afgehouwene
+afgehouwenen
+afgehuur
+afgehuurd
+afgehuurde
+afgehuurden
+afgejaag
+afgejaagd
+afgejaagde
+afgejaagden
+afgejaap
+afgejaapt
+afgejaapte
+afgejaapten
+afgejakk
+afgejakkerd
+afgejakkerde
+afgejakkerden
+afgekaad
+afgekaap
+afgekaapt
+afgekaapte
+afgekaapten
+afgekaat
+afgekaatst
+afgekaatste
+afgekaatsten
+afgekabb
+afgekabbeld
+afgekabbelde
+afgekabbelden
+afgekade
+afgekaden
+afgekalf
+afgekalfd
+afgekalfde
+afgekalfden
+afgekalk
+afgekalkt
+afgekalkte
+afgekalkten
+afgekamd
+afgekamde
+afgekamden
+afgekant
+afgekante
+afgekanteld
+afgekantelde
+afgekantelden
+afgekapt
+afgekapte
+afgekapten
+afgekeer
+afgekeerd
+afgekeerde
+afgekeerden
+afgekeke
+afgekeken
+afgekekene
+afgekerf
+afgekerfd
+afgekerfde
+afgekerfden
+afgekets
+afgeketst
+afgeketste
+afgeketsten
+afgekeur
+afgekeurd
+afgekeurde
+afgekeurden
+afgekist
+afgekiste
+afgekisten
+afgeklaa
+afgeklaard
+afgeklaarde
+afgeklaarden
+afgeklad
+afgeklap
+afgeklapt
+afgekled
+afgeklede
+afgeklee
+afgekleed
+afgeklem
+afgeklemd
+afgeklemde
+afgeklemden
+afgeklet
+afgekletst
+afgeklom
+afgeklommen
+afgeklon
+afgeklonken
+afgeklop
+afgeklopt
+afgeklov
+afgekloven
+afgeklovene
+afgeklovenen
+afgeknaa
+afgeknaagd
+afgeknaagde
+afgeknaagden
+afgeknab
+afgeknabbeld
+afgeknabbelde
+afgeknabbelden
+afgeknak
+afgeknakt
+afgeknakte
+afgeknakten
+afgeknap
+afgeknapt
+afgeknapte
+afgeknapten
+afgeknau
+afgeknauwd
+afgeknauwde
+afgeknauwden
+afgeknel
+afgekneld
+afgeknelde
+afgeknelden
+afgeknep
+afgeknepen
+afgeknepene
+afgeknepenen
+afgeknev
+afgekneveld
+afgeknevelde
+afgeknevelden
+afgeknib
+afgeknibbeld
+afgeknibbelde
+afgeknibbelden
+afgeknip
+afgeknipt
+afgeknipte
+afgeknipten
+afgeknoe
+afgeknoeid
+afgeknoo
+afgeknoopt
+afgeknoopte
+afgeknoopten
+afgeknot
+afgeknotte
+afgeknup
+afgeknuppeld
+afgeknuppelde
+afgeknuppelden
+afgeknut
+afgeknutseld
+afgeknutselde
+afgeknutselden
+afgekoch
+afgekocht
+afgekochte
+afgekochten
+afgekoel
+afgekoeld
+afgekoelde
+afgekoelden
+afgekome
+afgekomen
+afgekomene
+afgekomenen
+afgekond
+afgekondigd
+afgekondigde
+afgekondigden
+afgekook
+afgekookt
+afgekookte
+afgekookten
+afgekopp
+afgekoppeld
+afgekoppelde
+afgekoppelden
+afgekors
+afgekorst
+afgekorste
+afgekorsten
+afgekort
+afgekorte
+afgekorten
+afgekorv
+afgekorven
+afgekorvene
+afgekorvenen
+afgekoze
+afgekozen
+afgekozene
+afgekozenen
+afgekrab
+afgekrabbeld
+afgekrabbelde
+afgekrabbelden
+afgekrabd
+afgekrabde
+afgekrabden
+afgekras
+afgekrast
+afgekraste
+afgekrasten
+afgekron
+afgekronkeld
+afgekrop
+afgekropen
+afgekropene
+afgekropenen
+afgekrui
+afgekruid
+afgekruide
+afgekruiden
+afgekruimeld
+afgekruimelde
+afgekruimelden
+afgekuie
+afgekuierd
+afgekuierde
+afgekuierden
+afgekuis
+afgekuist
+afgekuiste
+afgekuisten
+afgekund
+afgekust
+afgekuste
+afgekusten
+afgelach
+afgelachen
+afgelade
+afgeladen
+afgeladene
+afgeladenen
+afgelang
+afgelangd
+afgelangde
+afgelangden
+afgelapt
+afgelapte
+afgelapten
+afgelast
+afgelaste
+afgelasten
+afgelastte
+afgelastten
+afgelate
+afgelaten
+afgelatene
+afgelatenen
+afgelave
+afgelaveerd
+afgelaveerde
+afgelaveerden
+afgeleef
+afgeleefd
+afgeleefde
+afgeleefder
+afgeleefdst
+afgeleek
+afgeleekt
+afgeleekte
+afgeleekten
+afgeleer
+afgeleerd
+afgeleerde
+afgeleerden
+afgelegd
+afgelegde
+afgelegden
+afgelege
+afgelegen
+afgelegene
+afgelegenen
+afgelegener
+afgelegenheid
+afgelegenst
+afgeleid
+afgeleide
+afgeleiden
+afgelekt
+afgelekte
+afgelekten
+afgelens
+afgelensd
+afgelensde
+afgelensden
+afgeleve
+afgeleverd
+afgeleverde
+afgeleverden
+afgeleze
+afgelezen
+afgelezene
+afgelezenen
+afgelich
+afgelicht
+afgelichte
+afgelichten
+afgelijn
+afgelijnd
+afgelijnde
+afgelijnden
+afgelikt
+afgelikte
+afgelikten
+afgelode
+afgeloden
+afgeloer
+afgeloerd
+afgeloerde
+afgeloerden
+afgeloge
+afgelogen
+afgelokt
+afgelokte
+afgelokten
+afgelood
+afgeloog
+afgeloogd
+afgeloogde
+afgeloogden
+afgelope
+afgelopen
+afgelopene
+afgelopenen
+afgelost
+afgeloste
+afgelosten
+afgeluis
+afgeluisd
+afgeluisde
+afgeluisden
+afgeluisterd
+afgeluisterde
+afgeluisterden
+afgemaai
+afgemaaid
+afgemaaide
+afgemaaiden
+afgemaak
+afgemaakt
+afgemaakte
+afgemaakten
+afgemaal
+afgemaald
+afgemaalde
+afgemaalden
+afgemale
+afgemalen
+afgemalene
+afgemalenen
+afgemarc
+afgemarcheerd
+afgemarcheerde
+afgemarcheerden
+afgemart
+afgemarteld
+afgemartelde
+afgemartelden
+afgemat
+afgemats
+afgematst
+afgematt
+afgematte
+afgematten
+afgematter
+afgemete
+afgemeten
+afgemetene
+afgemetenen
+afgemetener
+afgemetenheid
+afgemetenst
+afgemets
+afgemetseld
+afgemetselde
+afgemetselden
+afgemetst
+afgemetste
+afgemetsten
+afgemijn
+afgemijnd
+afgemijnde
+afgemikt
+afgemikte
+afgemikten
+afgemolk
+afgemolken
+afgemolkene
+afgemolkenen
+afgemons
+afgemonsterd
+afgemonsterde
+afgemonsterden
+afgemoor
+afgemoord
+afgemoorde
+afgemoorden
+afgemunt
+afgemuur
+afgemuurd
+afgemuurde
+afgemuurden
+afgenaas
+afgenaast
+afgenaaste
+afgenaasten
+afgenepe
+afgenepen
+afgenepene
+afgenepenen
+afgeneus
+afgeneusd
+afgeneusde
+afgeneusden
+afgenome
+afgenomen
+afgenomene
+afgenomenen
+afgenumm
+afgenummerd
+afgenummerde
+afgenummerden
+afgeoogd
+afgeoogde
+afgeoogden
+afgeoogs
+afgeoogst
+afgeoogste
+afgeoogsten
+afgepaal
+afgepaald
+afgepaalde
+afgepaalden
+afgepakt
+afgepakte
+afgepakten
+afgepand
+afgepande
+afgepanden
+afgepast
+afgepaste
+afgepasten
+afgepedd
+afgepeddeld
+afgepeddelde
+afgepeddelden
+afgepeel
+afgepeeld
+afgepeelde
+afgepeelden
+afgepeil
+afgepeild
+afgepeilde
+afgepeilden
+afgepein
+afgepeinsd
+afgepeinsde
+afgepeinsden
+afgepend
+afgepende
+afgeperk
+afgeperkt
+afgeperkte
+afgeperkten
+afgepers
+afgeperst
+afgeperste
+afgepersten
+afgepeut
+afgepeuterd
+afgepeuterde
+afgepeuz
+afgepeuzeld
+afgepeuzelde
+afgepeuzelden
+afgepijn
+afgepijnd
+afgepijnde
+afgepijnden
+afgepijnigd
+afgepijnigde
+afgepijnigden
+afgepikt
+afgepikte
+afgepikten
+afgeping
+afgepingeld
+afgepingelde
+afgepingelden
+afgepits
+afgepitst
+afgepitste
+afgepitsten
+afgeplag
+afgeplagd
+afgeplagde
+afgeplagden
+afgeplat
+afgeplatst
+afgeplatte
+afgeplatten
+afgeplatter
+afgeplei
+afgepleit
+afgepleite
+afgeplek
+afgeplekt
+afgeplekte
+afgeplekten
+afgeplet
+afgeplette
+afgepletten
+afgeploe
+afgeploegd
+afgeploegde
+afgeploegden
+afgeplof
+afgeploft
+afgeplofte
+afgeploften
+afgeploo
+afgeplooid
+afgeplooide
+afgeplooiden
+afgeploz
+afgeplozen
+afgeplozene
+afgeplozenen
+afgeplui
+afgepluisd
+afgepluisde
+afgepluisden
+afgepluk
+afgeplukt
+afgeplukte
+afgeplukten
+afgeplun
+afgeplunderd
+afgeplunderde
+afgeplunderden
+afgepoei
+afgepoeierd
+afgepoeierde
+afgepoeierden
+afgepoet
+afgepoetst
+afgepoetste
+afgepoetsten
+afgepold
+afgepolderd
+afgepolderde
+afgepolderden
+afgepomp
+afgepompt
+afgepompte
+afgepompten
+afgepond
+afgeponde
+afgepraa
+afgepraamd
+afgepraamde
+afgepraamden
+afgepraat
+afgeprak
+afgeprakkezeerd
+afgeprakkezeerde
+afgeprakkezeerden
+afgeprat
+afgeprate
+afgepree
+afgepreekt
+afgepreekte
+afgepreekten
+afgeprev
+afgepreveld
+afgeprevelde
+afgeprevelden
+afgeprik
+afgeprikt
+afgeprikte
+afgeprikten
+afgepulk
+afgepulkt
+afgepulkte
+afgepulkten
+afgepunt
+afgepunte
+afgeraag
+afgeraagd
+afgeraagde
+afgeraagden
+afgeraak
+afgeraakt
+afgeraakte
+afgeraakten
+afgeraap
+afgeraapt
+afgeraapte
+afgeraapten
+afgerabb
+afgerabbeld
+afgerabbelde
+afgerabbelden
+afgerade
+afgeraden
+afgeradene
+afgeradenen
+afgerafe
+afgerafeld
+afgerafelde
+afgerafelden
+afgeraff
+afgeraffeld
+afgeraffelde
+afgeraffelden
+afgeramm
+afgerammeld
+afgerammelde
+afgerammelden
+afgerand
+afgerande
+afgeranden
+afgerans
+afgeranseld
+afgeranselde
+afgeranselden
+afgerasp
+afgeraspt
+afgeraspte
+afgeraspten
+afgerast
+afgerasterd
+afgerasterde
+afgerasterden
+afgerede
+afgereden
+afgeredene
+afgeredenen
+afgereed
+afgereep
+afgereept
+afgereepte
+afgereepten
+afgerege
+afgeregen
+afgeregend
+afgeregende
+afgeregenden
+afgeregene
+afgeregenen
+afgereik
+afgereikt
+afgereikte
+afgereikten
+afgereis
+afgereisd
+afgereisde
+afgereisden
+afgereke
+afgerekend
+afgerekende
+afgerekenden
+afgeren
+afgerend
+afgerende
+afgerenden
+afgerepe
+afgerepeld
+afgerepelde
+afgerepelden
+afgerete
+afgereten
+afgeretene
+afgeretenen
+afgereze
+afgerezen
+afgerezene
+afgerezenen
+afgerich
+afgericht
+afgerichte
+afgerichten
+afgerijz
+afgerijzeld
+afgerijzelde
+afgerijzelden
+afgerist
+afgeriste
+afgeristen
+afgerits
+afgeritst
+afgeritste
+afgeritsten
+afgeroei
+afgeroeid
+afgeroeide
+afgeroeiden
+afgeroep
+afgeroepen
+afgeroepene
+afgeroepenen
+afgeroes
+afgeroest
+afgeroeste
+afgeroesten
+afgeroff
+afgeroffeld
+afgeroffelde
+afgeroffelden
+afgerold
+afgerolde
+afgerolden
+afgerond
+afgeronde
+afgeronden
+afgerons
+afgeronseld
+afgeronselde
+afgeronselden
+afgeroof
+afgeroofd
+afgeroofde
+afgeroofden
+afgerooi
+afgerooid
+afgerooide
+afgerooiden
+afgerook
+afgerookt
+afgerookte
+afgerookten
+afgeroom
+afgeroomd
+afgeroomde
+afgeroomden
+afgerost
+afgeroste
+afgerosten
+afgerot
+afgerott
+afgerotte
+afgerotten
+afgeruid
+afgeruide
+afgeruiden
+afgeruil
+afgeruild
+afgeruilde
+afgeruilden
+afgeruim
+afgeruimd
+afgeruimde
+afgeruimden
+afgeruis
+afgeruist
+afgeruiste
+afgeruisten
+afgerukt
+afgerukte
+afgerukten
+afgesabb
+afgesabbeld
+afgesabbelde
+afgesabbelden
+afgesabberd
+afgesabberde
+afgesabberden
+afgesabe
+afgesabeld
+afgesabelde
+afgesabelden
+afgescha
+afgeschaafd
+afgeschaafde
+afgeschaafden
+afgeschaakt
+afgeschaakte
+afgeschaakten
+afgeschaald
+afgeschaalde
+afgeschaalden
+afgeschaduwd
+afgeschaduwde
+afgeschaduwden
+afgeschaft
+afgeschafte
+afgeschaften
+afgeschakeld
+afgeschakelde
+afgeschakelden
+afgeschampt
+afgeschampte
+afgeschampten
+afgeschanst
+afgeschanste
+afgeschansten
+afgeschard
+afgescharde
+afgescharden
+afgesche
+afgescheept
+afgescheepte
+afgescheepten
+afgescheiden
+afgescheidene
+afgescheidenen
+afgeschemerd
+afgeschemerde
+afgeschemerden
+afgeschenen
+afgeschenene
+afgeschenenen
+afgeschept
+afgeschepte
+afgeschepten
+afgescherfd
+afgescherfde
+afgescherfden
+afgeschermd
+afgeschermde
+afgeschermden
+afgeschetst
+afgeschetste
+afgeschetsten
+afgescheurd
+afgescheurde
+afgescheurden
+afgeschi
+afgeschild
+afgeschilde
+afgeschilden
+afgeschilderd
+afgeschilderde
+afgeschilderden
+afgeschilferd
+afgeschilferde
+afgeschilferden
+afgeschitterd
+afgeschitterde
+afgeschitterden
+afgescho
+afgeschoffeld
+afgeschoffelde
+afgeschoffelden
+afgeschokt
+afgeschokte
+afgeschokten
+afgeschonken
+afgeschonkene
+afgeschonkenen
+afgeschooid
+afgeschooide
+afgeschooiden
+afgeschopt
+afgeschopte
+afgeschopten
+afgeschoren
+afgeschorene
+afgeschorenen
+afgeschoten
+afgeschotene
+afgeschotenen
+afgeschoven
+afgeschovene
+afgeschovenen
+afgeschr
+afgeschraapt
+afgeschraapte
+afgeschraapten
+afgeschrabd
+afgeschrabde
+afgeschrabden
+afgeschrapt
+afgeschrapte
+afgeschrapten
+afgeschreeuwd
+afgeschreeuwde
+afgeschreeuwden
+afgeschreid
+afgeschreide
+afgeschreiden
+afgeschreven
+afgeschrevene
+afgeschrevenen
+afgeschrikt
+afgeschrikte
+afgeschrikten
+afgeschrobd
+afgeschrobde
+afgeschrobden
+afgeschroefd
+afgeschroefde
+afgeschroefden
+afgeschroeid
+afgeschroeide
+afgeschroeiden
+afgeschu
+afgeschubd
+afgeschubde
+afgeschubden
+afgeschud
+afgeschudde
+afgeschudden
+afgeschuierd
+afgeschuierde
+afgeschuierden
+afgeschuimd
+afgeschuimde
+afgeschuimden
+afgeschuind
+afgeschuinde
+afgeschuinden
+afgeschut
+afgeschutte
+afgeschutten
+afgeschuurd
+afgeschuurde
+afgeschuurden
+afgesein
+afgeseind
+afgeseinde
+afgeseinden
+afgesijp
+afgesijpeld
+afgesijpelde
+afgesijpelden
+afgesjac
+afgesjacherd
+afgesjacherde
+afgesjacherden
+afgesjok
+afgesjokt
+afgesjokte
+afgesjokten
+afgesjou
+afgesjouwd
+afgesjouwde
+afgesjouwden
+afgeslaa
+afgeslaafd
+afgeslaafde
+afgeslaafden
+afgeslag
+afgeslagen
+afgeslagene
+afgeslagenen
+afgeslec
+afgeslecht
+afgeslee
+afgesleept
+afgesleepte
+afgesleepten
+afgeslen
+afgeslenterd
+afgeslenterde
+afgeslenterden
+afgeslep
+afgeslepen
+afgeslepene
+afgeslepenen
+afgeslet
+afgesleten
+afgesletene
+afgesletenen
+afgesleu
+afgesleurd
+afgesleurde
+afgesleurden
+afgeslib
+afgeslibberd
+afgeslibberde
+afgeslibberden
+afgeslibd
+afgeslibde
+afgeslibden
+afgeslie
+afgeslierd
+afgeslierde
+afgeslierden
+afgeslin
+afgeslingerd
+afgeslingerde
+afgeslingerden
+afgeslip
+afgeslipt
+afgeslipte
+afgeslipten
+afgeslof
+afgesloft
+afgeslofte
+afgesloften
+afgeslon
+afgeslonsd
+afgeslonsde
+afgeslonsden
+afgesloo
+afgesloofd
+afgesloofde
+afgesloofden
+afgesloopt
+afgesloopte
+afgesloopten
+afgesloot
+afgeslop
+afgeslopen
+afgeslopene
+afgeslopenen
+afgeslor
+afgeslorpt
+afgeslorpte
+afgeslorpten
+afgeslot
+afgesloten
+afgeslotene
+afgeslotenen
+afgeslotener
+afgeslotenheid
+afgeslotenst
+afgeslur
+afgeslurpt
+afgeslurpte
+afgeslurpten
+afgesmak
+afgesmakt
+afgesmakte
+afgesmakten
+afgesmee
+afgesmeed
+afgesmeekt
+afgesmeekte
+afgesmeekten
+afgesmeerd
+afgesmeerde
+afgesmeerden
+afgesmet
+afgesmeten
+afgesmetene
+afgesmetenen
+afgesmette
+afgesmetten
+afgesmol
+afgesmolten
+afgesmoltene
+afgesmoltenen
+afgesnau
+afgesnauwd
+afgesnauwde
+afgesnauwden
+afgesned
+afgesneden
+afgesnedene
+afgesnedenen
+afgesnel
+afgesneld
+afgesnelde
+afgesnelden
+afgesnip
+afgesnipperd
+afgesnipperde
+afgesnipperden
+afgesnoe
+afgesnoeid
+afgesnoeide
+afgesnoeiden
+afgesnoept
+afgesnoepte
+afgesnoepten
+afgesnoerd
+afgesnoerde
+afgesnoerden
+afgesnor
+afgesnord
+afgesnorde
+afgesnorden
+afgesnot
+afgesnoten
+afgesnotene
+afgesnotenen
+afgesnuf
+afgesnuffeld
+afgesnuffelde
+afgesnuffelden
+afgesnui
+afgesnuit
+afgesold
+afgesolde
+afgesolden
+afgesopt
+afgesopte
+afgesopten
+afgespaa
+afgespaad
+afgespaand
+afgespaande
+afgespaanden
+afgespad
+afgespade
+afgespaden
+afgespan
+afgespannen
+afgespannene
+afgespannenen
+afgespat
+afgespatte
+afgespatten
+afgespee
+afgespeeld
+afgespeelde
+afgespeelden
+afgespeet
+afgespel
+afgespeld
+afgespelde
+afgespelden
+afgespet
+afgespete
+afgespeten
+afgespeu
+afgespeurd
+afgespeurde
+afgespeurden
+afgespie
+afgespied
+afgespiede
+afgespieden
+afgespiegeld
+afgespiegelde
+afgespiegelden
+afgespio
+afgespioneerd
+afgespioneerde
+afgespioneerden
+afgespit
+afgespitte
+afgespitten
+afgesple
+afgespleten
+afgespletene
+afgespletenen
+afgespli
+afgesplinterd
+afgesplinterde
+afgesplinterden
+afgesplitst
+afgesplitste
+afgesplitsten
+afgespoe
+afgespoeld
+afgespoelde
+afgespoelden
+afgespon
+afgesponnen
+afgesponnene
+afgesponnenen
+afgesponsd
+afgesponsde
+afgesponsden
+afgespoo
+afgespoord
+afgespoorde
+afgespoorden
+afgespot
+afgespoten
+afgespotene
+afgespotenen
+afgespro
+afgesproken
+afgesprokene
+afgesprokenen
+afgesprongen
+afgesprongene
+afgesprongenen
+afgesproten
+afgesprotene
+afgesprotenen
+afgestaa
+afgestaan
+afgestaard
+afgestaarde
+afgestaarden
+afgestam
+afgestamd
+afgestamde
+afgestamden
+afgestampt
+afgestampte
+afgestampten
+afgestan
+afgestane
+afgestanen
+afgestap
+afgestapt
+afgestapte
+afgestapten
+afgesteg
+afgestegen
+afgestegene
+afgestegenen
+afgestek
+afgestekt
+afgestekte
+afgestekten
+afgestel
+afgesteld
+afgestelde
+afgestelden
+afgestem
+afgestemd
+afgestemde
+afgestemden
+afgestempeld
+afgestempelde
+afgestempelden
+afgestev
+afgestevend
+afgestevende
+afgestevenden
+afgestik
+afgestikt
+afgestikte
+afgestikten
+afgestip
+afgestipt
+afgestipte
+afgestipten
+afgestof
+afgestoft
+afgestofte
+afgestoften
+afgestok
+afgestoken
+afgestokene
+afgestokenen
+afgestol
+afgestolen
+afgestolene
+afgestolenen
+afgestom
+afgestommeld
+afgestommelde
+afgestommelden
+afgestompt
+afgestompte
+afgestompten
+afgestoo
+afgestoofd
+afgestoofde
+afgestoofden
+afgestookt
+afgestookte
+afgestookten
+afgestoomd
+afgestoomde
+afgestoomden
+afgestop
+afgestopt
+afgestopte
+afgestopten
+afgestor
+afgestormd
+afgestormde
+afgestormden
+afgestort
+afgestorven
+afgestorvene
+afgestorvenen
+afgestot
+afgestoten
+afgestotene
+afgestotenen
+afgestov
+afgestoven
+afgestovene
+afgestovenen
+afgestra
+afgestraald
+afgestraalde
+afgestraalden
+afgestraft
+afgestrafte
+afgestraften
+afgestre
+afgestreden
+afgestredene
+afgestredenen
+afgestreken
+afgestrekene
+afgestrekenen
+afgestro
+afgestrompeld
+afgestrompelde
+afgestrompelden
+afgestroomd
+afgestroomde
+afgestroomden
+afgestroopt
+afgestroopte
+afgestroopten
+afgestud
+afgestudeerd
+afgestudeerde
+afgestudeerden
+afgestui
+afgestuit
+afgestuite
+afgestuu
+afgestuurd
+afgestuurde
+afgestuurden
+afgestuw
+afgestuwd
+afgestuwde
+afgestuwden
+afgesuft
+afgesufte
+afgesuften
+afgesukk
+afgesukkeld
+afgesukkelde
+afgesukkelden
+afgetake
+afgetakeld
+afgetakelde
+afgetakelden
+afgetakt
+afgetakte
+afgetakten
+afgetand
+afgetande
+afgetanden
+afgetapt
+afgetapte
+afgetapten
+afgetard
+afgetarde
+afgetarden
+afgetast
+afgetaste
+afgetasten
+afgeteer
+afgeteerd
+afgeteerde
+afgeteerden
+afgeteil
+afgeteild
+afgeteilde
+afgeteilden
+afgeteke
+afgetekend
+afgetekende
+afgetekenden
+afgeteld
+afgetelde
+afgetelden
+afgetele
+afgetelefoneerd
+afgetelefoneerde
+afgetelefoneerden
+afgetelegrafeerd
+afgetelegrafeerde
+afgetelegrafeerden
+afgetikt
+afgetikte
+afgetikten
+afgetild
+afgetilde
+afgetilden
+afgetimm
+afgetimmerd
+afgetimmerde
+afgetimmerden
+afgetipp
+afgetippeld
+afgetippelde
+afgetippelden
+afgetipt
+afgetipte
+afgetipten
+afgetobd
+afgetobde
+afgetobden
+afgetoff
+afgetoffeld
+afgetoffelde
+afgetoffelden
+afgetond
+afgetonde
+afgetonden
+afgetoom
+afgetoomd
+afgetoomde
+afgetoomden
+afgetopt
+afgetopte
+afgetopten
+afgetorn
+afgetornd
+afgetornde
+afgetornden
+afgetove
+afgetoverd
+afgetoverde
+afgetoverden
+afgetrap
+afgetrapt
+afgetrapte
+afgetrapten
+afgetred
+afgetreden
+afgetredene
+afgetredenen
+afgetroe
+afgetroefd
+afgetroefde
+afgetroefden
+afgetrog
+afgetroggeld
+afgetroggelde
+afgetroggelden
+afgetrok
+afgetrokken
+afgetrokkene
+afgetrokkenen
+afgetrokkenheid
+afgetrom
+afgetrommeld
+afgetrommelde
+afgetrommelden
+afgetrompet
+afgetrompette
+afgetroo
+afgetroond
+afgetroonde
+afgetroonden
+afgetuig
+afgetuigd
+afgetuigde
+afgetuigden
+afgetuim
+afgetuimeld
+afgetuimelde
+afgetuimelden
+afgetuin
+afgetuind
+afgetuinde
+afgetuinden
+afgeturf
+afgeturfd
+afgeturfde
+afgeturfden
+afgetuur
+afgetuurd
+afgetuurde
+afgetuurden
+afgetypt
+afgetypte
+afgetypten
+afgevaag
+afgevaagd
+afgevaagde
+afgevaagden
+afgevaar
+afgevaardigd
+afgevaardigde
+afgevaardigden
+afgevall
+afgevallen
+afgevallene
+afgevallenen
+afgevang
+afgevangen
+afgevangene
+afgevangenen
+afgevare
+afgevaren
+afgevarene
+afgevarenen
+afgevast
+afgevaste
+afgeveeg
+afgeveegd
+afgeveegde
+afgeveegden
+afgeveen
+afgeveend
+afgeveende
+afgeveenden
+afgeveld
+afgevelde
+afgevelden
+afgeven
+afgeverf
+afgeverfd
+afgeverfde
+afgeverfden
+afgeverg
+afgevergd
+afgevergde
+afgevergden
+afgeveze
+afgevezeld
+afgevezelde
+afgevezelden
+afgevezen
+afgevezene
+afgevezenen
+afgevijl
+afgevijld
+afgevijlde
+afgevijlden
+afgevild
+afgevilde
+afgevilden
+afgeving
+afgevist
+afgeviste
+afgevisten
+afgevlak
+afgevlakt
+afgevlakte
+afgevlakten
+afgevlei
+afgevleid
+afgevleide
+afgevleiden
+afgevlek
+afgevlekt
+afgevlekte
+afgevlekten
+afgevlod
+afgevloden
+afgevlodene
+afgevlodenen
+afgevloe
+afgevloeid
+afgevloeide
+afgevloeiden
+afgevlog
+afgevlogen
+afgevlogene
+afgevlogenen
+afgevlot
+afgevlotte
+afgevlotten
+afgevluc
+afgevlucht
+afgevluchte
+afgevoch
+afgevochten
+afgevochtene
+afgevochtenen
+afgevoer
+afgevoerd
+afgevoerde
+afgevoerden
+afgevord
+afgevorderd
+afgevorderde
+afgevorderden
+afgevorm
+afgevormd
+afgevormde
+afgevormden
+afgevraa
+afgevraagd
+afgevraagde
+afgevraagden
+afgevree
+afgevreeen
+afgevret
+afgevreten
+afgevretene
+afgevretenen
+afgevrij
+afgevrijd
+afgevrijde
+afgevrijden
+afgevror
+afgevroren
+afgevrorene
+afgevrorenen
+afgevroz
+afgevrozen
+afgevrozene
+afgevrozenen
+afgevuur
+afgevuurd
+afgevuurde
+afgevuurden
+afgewaai
+afgewaaid
+afgewaaide
+afgewaaiden
+afgewach
+afgewacht
+afgewachte
+afgewachten
+afgewagg
+afgewaggeld
+afgewaggelde
+afgewaggelden
+afgewand
+afgewandeld
+afgewandelde
+afgewandelden
+afgewass
+afgewassen
+afgewassene
+afgewassenen
+afgewate
+afgewaterd
+afgewaterde
+afgewaterden
+afgeweek
+afgeweekt
+afgeweekte
+afgeweekten
+afgeweer
+afgeweerd
+afgeweerde
+afgeweerden
+afgeweid
+afgeweide
+afgeweiden
+afgeweke
+afgeweken
+afgewekene
+afgewekenen
+afgewend
+afgewende
+afgewenden
+afgewenk
+afgewenkt
+afgewenkte
+afgewenkten
+afgewent
+afgewenteld
+afgewentelde
+afgewentelden
+afgewerk
+afgewerkt
+afgewerkte
+afgewerkten
+afgeweze
+afgewezen
+afgewezene
+afgewezenen
+afgewikk
+afgewikkeld
+afgewikkelde
+afgewikkelden
+afgewimp
+afgewimpeld
+afgewimpelde
+afgewimpelden
+afgewipt
+afgewipte
+afgewipten
+afgewiss
+afgewisseld
+afgewisselde
+afgewisselden
+afgewist
+afgewiste
+afgewisten
+afgewoel
+afgewoeld
+afgewoelde
+afgewoelden
+afgewoge
+afgewogen
+afgewogene
+afgewogenen
+afgewond
+afgewonden
+afgewondene
+afgewondenen
+afgewonn
+afgewonnen
+afgewonnene
+afgewonnenen
+afgewoon
+afgewoond
+afgewoonde
+afgewoonden
+afgeworp
+afgeworpen
+afgeworpene
+afgeworpenen
+afgewrev
+afgewreven
+afgewrevene
+afgewrevenen
+afgewrik
+afgewrikt
+afgewrikte
+afgewrikten
+afgewron
+afgewrongen
+afgewrongene
+afgewrongenen
+afgezaag
+afgezaagd
+afgezaagde
+afgezaagden
+afgezaan
+afgezaand
+afgezaande
+afgezaanden
+afgezabb
+afgezabbeld
+afgezabbelde
+afgezabbelden
+afgezabberd
+afgezabberde
+afgezabberden
+afgezade
+afgezadeld
+afgezadelde
+afgezadelden
+afgezakt
+afgezakte
+afgezakten
+afgezand
+afgezande
+afgezanden
+afgezant
+afgezante
+afgezanten
+afgezeef
+afgezeefd
+afgezeefde
+afgezeefden
+afgezeem
+afgezeemd
+afgezeemde
+afgezeemden
+afgezeep
+afgezeept
+afgezeepte
+afgezeepten
+afgezegd
+afgezegde
+afgezegden
+afgezege
+afgezegen
+afgezegene
+afgezegenen
+afgezeil
+afgezeild
+afgezeilde
+afgezeilden
+afgezeng
+afgezengd
+afgezengde
+afgezengden
+afgezet
+afgezete
+afgezeten
+afgezetene
+afgezetenen
+afgezett
+afgezette
+afgezetten
+afgezeul
+afgezeuld
+afgezeulde
+afgezeulden
+afgezich
+afgezicht
+afgezien
+afgeziene
+afgezienen
+afgezift
+afgezifte
+afgeziften
+afgezoch
+afgezocht
+afgezochte
+afgezochten
+afgezode
+afgezoden
+afgezoen
+afgezoend
+afgezoende
+afgezoenden
+afgezoge
+afgezogen
+afgezogene
+afgezogenen
+afgezond
+afgezonden
+afgezondene
+afgezondenen
+afgezonderd
+afgezonderde
+afgezonderden
+afgezonderder
+afgezonderdst
+afgezonk
+afgezonken
+afgezonkene
+afgezonkenen
+afgezood
+afgezoom
+afgezoomd
+afgezoomde
+afgezoomden
+afgezope
+afgezopen
+afgezopene
+afgezopenen
+afgezout
+afgezouten
+afgezoutene
+afgezoutenen
+afgezuch
+afgezucht
+afgezwaa
+afgezwaaid
+afgezwaaide
+afgezwaaiden
+afgezwak
+afgezwakt
+afgezwee
+afgezweefd
+afgezweefde
+afgezweefden
+afgezweept
+afgezweepte
+afgezweepten
+afgezwen
+afgezwenkt
+afgezwenkte
+afgezwenkten
+afgezwie
+afgezwierd
+afgezwierde
+afgezwierden
+afgezwoe
+afgezwoegd
+afgezwoegde
+afgezwoegden
+afgezwom
+afgezwommen
+afgezwommene
+afgezwommenen
+afgezwor
+afgezworen
+afgezworene
+afgezworenen
+afgezworven
+afgezworvene
+afgezworvenen
+afghan
+afghanay
+afghanayi
+afghaner
+afghani
+afghanis
+afghanischen
+afghanistan
+afghanpa
+afghanpakistan
+afghans
+afghansk
+afghants
+afghantsy
+afghanus
+afghanussr
+afgiet
+afgieten
+afgietse
+afgietsel
+afgietseldiertje
+afgietseldiertjes
+afgietsels
+afgift
+afgifte
+afgifter
+afgiftspolitik
+afging
+afgingen
+afgiv
+afgive
+afgivelser
+afgivende
+afgiver
+afgives
+afgivet
+afgjort
+afgjorte
+afgl
+afgl-mil
+afgl-mil-tac
+afgl-vax
+afgleden
+afgleed
+afglijd
+afglijde
+afglijden
+afglijdi
+afglijding
+afglijdingen
+afglijdt
+afglip
+afglippe
+afglippen
+afglipt
+afglipte
+afglipten
+afgluren
+afgluur
+afgluurd
+afgluurde
+afgluurden
+afgluurt
+afgod
+afgoden
+afgodend
+afgodendienaar
+afgodendienaars
+afgodendienaren
+afgodendienst
+afgodent
+afgodentempel
+afgodentempels
+afgoderi
+afgoderij
+afgoderijen
+afgodin
+afgodinn
+afgodinnen
+afgodisc
+afgodisch
+afgodische
+afgodischer
+afgodischt
+afgodsbe
+afgodsbeeld
+afgodsbeelden
+afgodsdi
+afgodsdienst
+afgodsla
+afgodslang
+afgodslangen
+afgodste
+afgodstempel
+afgodstempels
+afgolf
+afgolfde
+afgolfden
+afgolft
+afgolven
+afgooi
+afgooide
+afgooiden
+afgooien
+afgooit
+afgoot
+afgord
+afgordde
+afgordden
+afgorden
+afgordt
+afgoten
+afgraaf
+afgraaft
+afgraas
+afgraasd
+afgraasde
+afgraasden
+afgraast
+afgrauw
+afgrauwd
+afgrauwde
+afgrauwden
+afgrauwe
+afgrauwen
+afgrauwt
+afgraven
+afgravin
+afgraving
+afgravingen
+afgrazen
+afgreppe
+afgreppel
+afgreppelde
+afgreppelden
+afgreppelen
+afgreppelt
+afgrijse
+afgrijselijk
+afgrijselijke
+afgrijselijker
+afgrijselijkheden
+afgrijselijkheid
+afgrijselijkst
+afgrijsl
+afgrijslijk
+afgrijslijke
+afgrijslijker
+afgrijslijkheden
+afgrijslijkheid
+afgrijslijkst
+afgrijze
+afgrijzen
+afgrijzenwekkend
+afgrijzenwekkende
+afgrijzenwekkender
+afgrijzenwekkendst
+afgris
+afgrisse
+afgrissen
+afgrist
+afgriste
+afgristen
+afgroef
+afgroeve
+afgroeven
+afgrond
+afgronde
+afgronden
+afgr{ns
+afgr{nse
+afgr{nset
+afgr{nsning
+afgr{nsningen
+afgr{nsninger
+afgud
+afguder
+afgunst
+afgunsti
+afgunstig
+afgunstige
+afgunstiger
+afgunstigst
+afg|r
+afg|re
+afg|relse
+afg|relsen
+afg|relser
+afg|rende
+afg|rer
+afg|res
+afg}
+afg}et
+afhaak
+afhaakt
+afhaakte
+afhaakten
+afhaal
+afhaalde
+afhaalden
+afhaaldi
+afhaaldienst
+afhaaldiensten
+afhaalt
+afhaar
+afhaarde
+afhaarden
+afhaart
+afhak
+afhaken
+afhaker
+afhakers
+afhakken
+afhakt
+afhakte
+afhakten
+afhalen
+afhaler
+afhalers
+afhaling
+afhamer
+afhamerd
+afhamerde
+afhamerden
+afhamere
+afhameren
+afhamert
+afhandel
+afhandelde
+afhandelden
+afhandelen
+afhandeling
+afhandelt
+afhandig
+afhandling
+afhang
+afhangel
+afhangeling
+afhangelinge
+afhangelingen
+afhangen
+afhangende
+afhangt
+afhankel
+afhankelijk
+afhankelijke
+afhankelijker
+afhankelijkheden
+afhankelijkheid
+afhankelijkst
+afhap
+afhappen
+afhapt
+afhapte
+afhapten
+afharen
+afhark
+afharken
+afharkt
+afharkte
+afharkten
+afhaspel
+afhaspelde
+afhaspelden
+afhaspelen
+afhaspelt
+afhecht
+afhechte
+afhechten
+afhechtt
+afhechtte
+afhechtten
+afhef
+afheffen
+afheft
+afhel
+afhelde
+afhelden
+afhellen
+afhellin
+afhelling
+afhellingen
+afhelp
+afhelpen
+afhelpt
+afhelt
+afhengel
+afhengelde
+afhengelden
+afhengelen
+afhengelt
+afhief
+afhield
+afhielde
+afhielden
+afhielp
+afhielpe
+afhielpen
+afhieuw
+afhieuwe
+afhieuwen
+afhieven
+afhing
+afhingen
+afhjulpet
+afhj{lpe
+afhj{lpes
+afhj{lpning
+afhogen
+afhol
+afhold
+afholde
+afholdelse
+afholdelsen
+afholden
+afholder
+afholdes
+afholdt
+afholdte
+afholdtes
+afhollen
+afholt
+afhoog
+afhoogde
+afhoogden
+afhoogt
+afhoor
+afhoorde
+afhoorden
+afhoort
+afhoren
+afhoud
+afhouden
+afhoudin
+afhouding
+afhoudingen
+afhoudt
+afhouw
+afhouwen
+afhouwin
+afhouwing
+afhouwt
+afhugget
+afhugne
+afhuren
+afhuring
+afhuringen
+afhuur
+afhuurde
+afhuurden
+afhuurder
+afhuurders
+afhuurst
+afhuurster
+afhuursters
+afhuurt
+afh{nge
+afh{nger
+afh{ngig
+afh{ngige
+afh{ngighed
+afh{ngighedsdannende
+afh{ngighedsforhold
+afh{ngigt
+afh|rte
+afi
+afi`n
+afianzador
+afianzadora
+afianzamiento
+afianzar
+afiar
+afiblar
+aficar
+afice
+aficio`n
+aficiona
+aficionada
+aficionadamente
+aficionado
+aficionador
+aficionados
+aficionar
+afiebrarse
+afielar
+afield
+afif
+afifi
+afija
+afijacio`n
+afijada
+afijado
+afijadura
+afijamiento
+afijar
+afijo
+afikomen
+afikpo
+afiladera
+afilador
+afiladora
+afiladura
+afilamiento
+afilar
+afiliacio`n
+afiliar
+afiligranada
+afiligranado
+afiligranar
+afilo`n
+afilosofada
+afilosofado
+afin
+afinacio`n
+afinadamente
+afinador
+afinadora
+afinadura
+afinamiento
+afinar
+afincable
+afincada
+afincadamente
+afincado
+afincamiento
+afincar
+afinco
+afine
+afinidad
+afino
+afinojar
+afip
+afire
+afirmacio`n
+afirmada
+afirmadamente
+afirmado
+afirmador
+afirmadora
+afirmamiento
+afirmante
+afirmanza
+afirmar
+afirmativa
+afirmativamente
+afirmativo
+afisc
+afisc-01
+afistolar
+afistular
+afit
+afit-ab
+afitnet
+afitti
+afiuciar
+afive
+afizarek
+afjaag
+afjaagde
+afjaagden
+afjaagt
+afjaap
+afjaapt
+afjaapte
+afjaapten
+afjagen
+afjakker
+afjakkerde
+afjakkerden
+afjakkeren
+afjakkert
+afjapen
+afjoeg
+afjoegen
+afk
+afkaad
+afkaadde
+afkaadden
+afkaadt
+afkaap
+afkaapt
+afkaapte
+afkaapten
+afkaats
+afkaatse
+afkaatsen
+afkaatsi
+afkaatsing
+afkaatsingen
+afkaatst
+afkaatste
+afkaatsten
+afkabbel
+afkabbelde
+afkabbelden
+afkabbelen
+afkabbeling
+afkabbelingen
+afkabbelt
+afkabiye
+afkaden
+afkading
+afkadingen
+afkald
+afkalf
+afkalfde
+afkalfden
+afkalft
+afkalk
+afkalken
+afkalkin
+afkalking
+afkalkt
+afkalkte
+afkalkten
+afkalven
+afkalvin
+afkalving
+afkalvingen
+afkam
+afkamde
+afkamden
+afkammen
+afkammin
+afkamming
+afkammingen
+afkamt
+afkant
+afkantel
+afkantelde
+afkantelden
+afkantelen
+afkantelt
+afkanten
+afkantin
+afkanting
+afkantingen
+afkantte
+afkantten
+afkap
+afkapen
+afkappen
+afkappin
+afkapping
+afkappingen
+afkappingsteken
+afkappingstekens
+afkapt
+afkapte
+afkapten
+afkareti
+afke
+afkeek
+afkeer
+afkeerde
+afkeerden
+afkeert
+afkeken
+afkeren
+afkerf
+afkerfde
+afkerfden
+afkerft
+afkerig
+afkerige
+afkeriger
+afkerigh
+afkerigheid
+afkerigs
+afkerigst
+afkering
+afkeringen
+afkerven
+afkets
+afketsen
+afketst
+afketste
+afketsten
+afkeur
+afkeurde
+afkeurden
+afkeuren
+afkeurenswaard
+afkeurenswaarde
+afkeurenswaarder
+afkeurenswaardig
+afkeurenswaardige
+afkeurenswaardiger
+afkeurenswaardigst
+afkeurenswaardst
+afkeurin
+afkeuring
+afkeuringen
+afkeurt
+afkham
+afkham-e
+afkham-ebrahimi
+afkies
+afkiest
+afkiezen
+afkijk
+afkijken
+afkijker
+afkijkers
+afkijkst
+afkijkster
+afkijksters
+afkijkt
+afkist
+afkisten
+afkistte
+afkistten
+afklaar
+afklaard
+afklaarde
+afklaarden
+afklaart
+afklad
+afkladde
+afkladden
+afkladt
+afklap
+afklappe
+afklappen
+afklapt
+afklapte
+afklapten
+afklare
+afklaren
+afklarer
+afklaret
+afklaring
+afkleden
+afkleed
+afkleedd
+afkleedde
+afkleedden
+afkleedt
+afklem
+afklemde
+afklemden
+afklemme
+afklemmen
+afklemmi
+afklemming
+afklemt
+afklets
+afkletse
+afkletsen
+afkletst
+afkletste
+afkletsten
+afklim
+afklimme
+afklimmen
+afklimt
+afklink
+afklinke
+afklinken
+afklinkt
+afklom
+afklomme
+afklommen
+afklonk
+afklonke
+afklonken
+afkloof
+afklop
+afkloppe
+afkloppen
+afklopper
+afkloppers
+afkloppi
+afklopping
+afkloppingen
+afklopt
+afklopte
+afklopten
+afkloven
+afkluif
+afkluift
+afkluive
+afkluiven
+afknaag
+afknaagd
+afknaagde
+afknaagden
+afknaagt
+afknabbe
+afknabbel
+afknabbelde
+afknabbelden
+afknabbelen
+afknabbelt
+afknagen
+afknagin
+afknaging
+afknak
+afknakke
+afknakken
+afknakt
+afknakte
+afknakten
+afknap
+afknappe
+afknappen
+afknapt
+afknapte
+afknapten
+afknauw
+afknauwd
+afknauwde
+afknauwden
+afknauwe
+afknauwen
+afknauwt
+afkneep
+afknel
+afknelde
+afknelden
+afknelle
+afknellen
+afknelli
+afknelling
+afknelt
+afknepen
+afknevel
+afknevelde
+afknevelden
+afknevelen
+afknevelt
+afknibbe
+afknibbel
+afknibbelde
+afknibbelden
+afknibbelen
+afknibbelt
+afknijp
+afknijpe
+afknijpen
+afknijpi
+afknijping
+afknijpt
+afknip
+afknippe
+afknippen
+afknipse
+afknipsel
+afknipsels
+afknipt
+afknipte
+afknipten
+afknoei
+afknoeid
+afknoeide
+afknoeiden
+afknoeie
+afknoeien
+afknoeit
+afknoop
+afknoopt
+afknoopte
+afknoopten
+afknopen
+afknot
+afknotte
+afknotten
+afknotti
+afknotting
+afknottingen
+afknuppe
+afknuppel
+afknuppelde
+afknuppelden
+afknuppelen
+afknuppelt
+afknutse
+afknutsel
+afknutselde
+afknutselden
+afknutselen
+afknutselt
+afkocht
+afkochte
+afkochten
+afkode
+afkodede
+afkoder
+afkodes
+afkodet
+afkodning
+afkodningen
+afkoel
+afkoelde
+afkoelden
+afkoelen
+afkoelin
+afkoeling
+afkoelingsmetode
+afkoelingsmetoden
+afkoelingsmetodes
+afkoelt
+afkoken
+afkom
+afkomen
+afkomst
+afkomsti
+afkomstig
+afkomstige
+afkomt
+afkon
+afkonden
+afkondig
+afkondigde
+afkondigden
+afkondigen
+afkondiging
+afkondigingen
+afkondigt
+afkook
+afkookse
+afkooksel
+afkooksels
+afkookt
+afkookte
+afkookten
+afkoop
+afkoopba
+afkoopbaar
+afkoopbaarheid
+afkoopbaarstelling
+afkoopbaarstellingen
+afkoopbare
+afkoopso
+afkoopsom
+afkoopsommen
+afkoopt
+afkoos
+afkopen
+afkoping
+afkopingen
+afkoppel
+afkoppelde
+afkoppelden
+afkoppelen
+afkoppeling
+afkoppelt
+afkorf
+afkorst
+afkorste
+afkorsten
+afkorstt
+afkorstte
+afkorstten
+afkort
+afkorten
+afkortin
+afkorting
+afkortingen
+afkortingsteken
+afkortingstekens
+afkortning
+afkortte
+afkortten
+afkorven
+afkozen
+afkrab
+afkrabbe
+afkrabbel
+afkrabbelde
+afkrabbelden
+afkrabbelen
+afkrabbelt
+afkrabben
+afkrabber
+afkrabbers
+afkrabde
+afkrabden
+afkrabse
+afkrabsel
+afkrabt
+afkras
+afkrasse
+afkrassen
+afkrast
+afkraste
+afkrasten
+afkronke
+afkronkel
+afkronkelde
+afkronkelden
+afkronkelen
+afkronkelt
+afkroop
+afkropen
+afkrui
+afkruide
+afkruiden
+afkruien
+afkruime
+afkruimel
+afkruimelde
+afkruimelden
+afkruimelen
+afkruimelt
+afkruip
+afkruipe
+afkruipen
+afkruipt
+afkruit
+afkr{fte
+afkr{ftelse
+afkuier
+afkuierd
+afkuierde
+afkuierden
+afkuiere
+afkuieren
+afkuiert
+afkuis
+afkuisen
+afkuist
+afkuiste
+afkuisten
+afkun
+afkunnen
+afkunt
+afkus
+afkussen
+afkust
+afkuste
+afkusten
+afkwam
+afkwamen
+aflaad
+aflaadde
+aflaadden
+aflaadha
+aflaadhaven
+aflaadhavens
+aflaadpl
+aflaadplaats
+aflaadplaatsen
+aflaadt
+aflaat
+aflaatbr
+aflaatbrief
+aflaatbrieven
+aflaatha
+aflaathandel
+aflaatja
+aflaatjaar
+aflaatjaren
+aflaatsl
+aflaatsluis
+aflaatsluizen
+aflacar
+aflach
+aflachen
+aflacht
+aflachte
+aflachten
+aflade
+afladen
+aflader
+afladers
+aflading
+afladingen
+aflag
+aflagell
+aflagellar
+aflagen
+aflagt
+aflamar
+aflame
+aflandig
+aflandige
+aflandiger
+aflandigst
+aflang
+aflangde
+aflangden
+aflangen
+aflangt
+aflap
+aflappen
+aflapt
+aflapte
+aflapten
+aflaquecerse
+aflare
+aflas
+aflaste
+aflat
+aflaten
+aflating
+aflato
+aflatoxi
+aflatoxin
+aflaunt
+aflautada
+aflautado
+aflaveer
+aflaveerde
+aflaveerden
+aflaver
+aflavere
+aflaveren
+aflavert
+aflazen
+aflc
+aflc-oc-
+aflc-oc-aisg1
+aflc-oo-
+aflc-oo-aisg1
+aflc-oo-dmmis1-ma01
+aflc-sa-
+aflc-sa-aisg1
+aflc-sa-dmmis1-si01
+aflc-sm-
+aflc-sm-aisg1
+aflc-sm-dmmis1-si01
+aflc-wp-
+aflc-wp-aisg1
+aflc-wp-aisg2
+aflc-wp-cisco
+aflc-wp-rdb1
+aflc-wp-remis
+aflc-wp-scd1
+aflc-wr-
+aflc-wr-aisg1
+aflc2
+aflechada
+aflechado
+aflechate
+afled
+aflede
+afledede
+afleder
+afledes
+afledning
+afledningen
+afledninger
+afledningerne
+afledt
+afledtes
+afleek
+afleekt
+afleekte
+afleekten
+afleer
+afleerde
+afleerden
+afleert
+aflees
+afleest
+afleg
+aflegde
+aflegden
+afleggen
+aflegger
+afleggers
+afleggertje
+afleggertjes
+afleggin
+aflegging
+aflegt
+afleid
+afleidba
+afleidbaar
+afleidbare
+afleidde
+afleidden
+afleiden
+afleider
+afleiders
+afleidin
+afleiding
+afleidingen
+afleidingskanaal
+afleidingskanalen
+afleidingsmaneuver
+afleidingsmaneuvers
+afleidingsmanoeuvre
+afleidingsmanoeuvres
+afleidingsmiddel
+afleidingsmiddelen
+afleidingsuitgang
+afleidingsuitgangen
+afleidinkje
+afleidinkjes
+afleidku
+afleidkunde
+afleidkundig
+afleidkundige
+afleidse
+afleidsel
+afleidsels
+afleidt
+afleitar
+aflek
+afleken
+aflekken
+aflekt
+aflekte
+aflekten
+aflens
+aflensde
+aflensden
+aflenst
+aflenzen
+afleren
+afletamiento
+afletar
+aflever
+afleverd
+afleverde
+afleverden
+aflevere
+afleverede
+afleveren
+afleverer
+afleveres
+afleveret
+afleveri
+aflevering
+afleveringen
+afleveringstermijn
+afleveringstermijnen
+aflevert
+aflex
+aflezen
+aflezer
+aflezers
+aflezing
+aflezingen
+afliccio`n
+aflicht
+aflichte
+aflichten
+aflichtt
+aflichtte
+aflichtten
+aflicker
+aflicta
+aflictiva
+aflictivo
+aflicto
+aflieg
+afliegen
+afliegt
+afliep
+afliepen
+afliet
+aflieten
+aflig
+afligente
+afliggen
+aflight
+afligible
+afligidamente
+afligimiento
+afligir
+afligt
+aflijn
+aflijnde
+aflijnden
+aflijnen
+aflijnt
+aflik
+aflikken
+aflikt
+aflikte
+aflikten
+aflmc
+afloat
+afloden
+afloer
+afloerde
+afloerden
+afloeren
+afloert
+aflogen
+aflojadura
+aflojamiento
+aflojar
+aflok
+aflokken
+aflokkin
+aflokking
+aflokt
+aflokte
+aflokten
+aflood
+afloodde
+afloodden
+afloodt
+afloog
+afloogde
+afloogden
+afloogt
+afloop
+afloopt
+aflopen
+aflorada
+aflorado
+afloramiento
+aflorar
+aflos
+aflosbaa
+aflosbaar
+aflosbar
+aflosbare
+aflossen
+aflosser
+aflossers
+aflossin
+aflossing
+aflossingen
+aflossingsploeg
+aflossingsploegen
+aflossingstermijn
+aflossingstermijnen
+aflossingswedstrijd
+aflossingswedstrijden
+aflost
+afloste
+aflosten
+aflow
+aflower
+afluencia
+afluente
+afluentemente
+afluir
+afluis
+afluisde
+afluisden
+afluist
+afluiste
+afluister
+afluisterde
+afluisterden
+afluisteren
+afluistert
+afluizen
+aflujo
+afluking
+afluset
+aflush
+aflusning
+aflutter
+aflytning
+afl{ggelse
+afl{gger
+afl{ggere
+afl{ggeren
+afl{se
+afl{ser
+afl{ses
+afl{sning
+afl|b
+afl|bs
+afl|bshullet
+afl|bsprop
+afl|bsr|r
+afl|bsr|ret
+afl|nning
+afl|s
+afl|se
+afl|ser
+afl|ses
+afl|sning
+afl|sningsopgave
+afl|sningsopgaven
+afl|sningsopgaver
+afl|stes
+afmaai
+afmaaide
+afmaaiden
+afmaaien
+afmaaier
+afmaaiers
+afmaaiin
+afmaaiing
+afmaaiingen
+afmaait
+afmaak
+afmaakt
+afmaakte
+afmaakten
+afmaal
+afmaalde
+afmaalden
+afmaalt
+afmaken
+afmaker
+afmakers
+afmaking
+afmakingen
+afmalen
+afmarche
+afmarcheer
+afmarcheerde
+afmarcheerden
+afmarcheert
+afmarcheren
+afmars
+afmartel
+afmartelde
+afmartelden
+afmartelen
+afmarteling
+afmartelingen
+afmartelt
+afmat
+afmaten
+afmatte
+afmatten
+afmattend
+afmattende
+afmattender
+afmattendst
+afmattin
+afmatting
+afmattingen
+afmeet
+afmelden
+afmelk
+afmelken
+afmelkt
+afmelkte
+afmelkten
+afmeten
+afmeting
+afmetingen
+afmets
+afmetsel
+afmetselde
+afmetselden
+afmetselen
+afmetselt
+afmetsen
+afmetst
+afmetste
+afmetsten
+afmijn
+afmijnde
+afmijnden
+afmijnen
+afmijner
+afmijners
+afmijnin
+afmijning
+afmijnt
+afmik
+afmikken
+afmikt
+afmikte
+afmikten
+afmolk
+afmolken
+afmonste
+afmonster
+afmonsterde
+afmonsterden
+afmonsteren
+afmonstering
+afmonsteringen
+afmonstert
+afmonterer
+afmoord
+afmoordd
+afmoordde
+afmoordden
+afmoorde
+afmoorden
+afmoordt
+afmpc
+afmpc-1
+afmpc-10
+afmpc-11
+afmpc-2
+afmpc-l
+afmpc1
+afmpc3
+afmunt
+afmunten
+afmuntte
+afmuntten
+afmuren
+afmuring
+afmuur
+afmuurde
+afmuurden
+afmuurt
+afm{rket
+afm{rkning
+afn
+afnaast
+afnaaste
+afnaasten
+afnaastt
+afnaastte
+afnaastten
+afnam
+afnamen
+afneem
+afneemba
+afneembaar
+afneembare
+afneemdo
+afneemdoek
+afneemdoeken
+afneemst
+afneemster
+afneemsters
+afneemt
+afneep
+afnemen
+afnemend
+afnemende
+afnemer
+afnemers
+afneming
+afnemingen
+afnepen
+afneus
+afneusde
+afneusden
+afneust
+afneuzen
+afnijp
+afnijpen
+afnijpt
+afnummer
+afnummerde
+afnummerden
+afnummeren
+afnummering
+afnummert
+afo
+afo`nica
+afo`nico
+afoam
+afogamiento
+afogar
+afogarar
+afogen
+afogonadura
+afollada
+afollado
+afollador
+afollar
+afona
+afondable
+afondada
+afondado
+afondar
+afone
+afoni
+afoni`a
+afono
+afoog
+afoogde
+afoogden
+afoogst
+afoogste
+afoogsten
+afoogstt
+afoogstte
+afoogstten
+afoogt
+afoot
+aforada
+aforadar
+aforado
+aforador
+aforamiento
+aforar
+aforcar
+afore
+aforehan
+aforehand
+aforemen
+aforementioned
+aforenam
+aforenamed
+aforesai
+aforesaid
+aforetho
+aforethought
+aforetim
+aforetime
+aforetimes
+afori`stica
+afori`stico
+aforisma
+aforisme
+aforismen
+aforismo
+aforisti
+aforistisch
+aforistische
+aforistischer
+aforistischt
+aforit
+aformin
+afornecer
+aforo
+aforra
+aforrada
+aforrado
+aforrador
+aforradora
+aforradura
+aforramiento
+aforrar
+aforrecha
+aforrecho
+aforro
+afortalar
+afortior
+afortiori
+afortunada
+afortunadamente
+afortunado
+afortunar
+aforzarse
+afosa
+afosarse
+afoscarse
+afose
+afosi
+afoso
+afotec
+afotec-a
+afotec-ad
+afotec2
+afoul
+afour
+afoyar
+afpaal
+afpaalde
+afpaalden
+afpaalt
+afpak
+afpakken
+afpakkin
+afpakking
+afpakkingen
+afpakt
+afpakte
+afpakten
+afpalen
+afpaling
+afpalingen
+afpand
+afpandde
+afpandden
+afpanden
+afpandt
+afpas
+afpassen
+afpasset
+afpassin
+afpassing
+afpast
+afpaste
+afpasten
+afpeddel
+afpeddelde
+afpeddelden
+afpeddelen
+afpeddelt
+afpeel
+afpeelde
+afpeelden
+afpeelt
+afpeil
+afpeilde
+afpeilden
+afpeilen
+afpeilin
+afpeiling
+afpeilingen
+afpeilt
+afpeins
+afpeinsd
+afpeinsde
+afpeinsden
+afpeinst
+afpeinze
+afpeinzen
+afpelen
+afpen
+afpende
+afpenden
+afpennen
+afpent
+afperk
+afperken
+afperkin
+afperking
+afperkingen
+afperkt
+afperkte
+afperkten
+afpers
+afpersen
+afperser
+afpersers
+afpersin
+afpersing
+afpersingen
+afperst
+afperste
+afpersten
+afpeuter
+afpeuterde
+afpeuterden
+afpeuteren
+afpeutert
+afpeuzel
+afpeuzelde
+afpeuzelden
+afpeuzelen
+afpeuzelt
+afpijn
+afpijnde
+afpijnden
+afpijnen
+afpijnig
+afpijnigde
+afpijnigden
+afpijnigen
+afpijniging
+afpijnigt
+afpijnt
+afpik
+afpikken
+afpikt
+afpikte
+afpikten
+afpingel
+afpingelde
+afpingelden
+afpingelen
+afpingelt
+afpits
+afpitsen
+afpitst
+afpitste
+afpitsten
+afplag
+afplagde
+afplagden
+afplagge
+afplaggen
+afplagt
+afplat
+afplatte
+afplatten
+afplatti
+afplatting
+afplattingen
+afpleit
+afpleite
+afpleiten
+afpleitt
+afpleitte
+afpleitten
+afplek
+afplekke
+afplekken
+afplekt
+afplekte
+afplekten
+afplet
+afplette
+afpletten
+afploeg
+afploegd
+afploegde
+afploegden
+afploege
+afploegen
+afploegt
+afplof
+afploffe
+afploffen
+afploft
+afplofte
+afploften
+afplooi
+afplooid
+afplooide
+afplooiden
+afplooie
+afplooien
+afplooit
+afploos
+afplozen
+afpluis
+afpluisd
+afpluisde
+afpluisden
+afpluist
+afpluize
+afpluizen
+afpluizi
+afpluizing
+afpluk
+afplukke
+afplukken
+afplukt
+afplukte
+afplukten
+afplunde
+afplunder
+afplunderde
+afplunderden
+afplunderen
+afplundering
+afplundert
+afpoeier
+afpoeierde
+afpoeierden
+afpoeieren
+afpoeiering
+afpoeieringen
+afpoeiert
+afpoets
+afpoetse
+afpoetsen
+afpoetst
+afpoetste
+afpoetsten
+afpolder
+afpolderde
+afpolderden
+afpolderen
+afpoldering
+afpolderingen
+afpoldert
+afpomp
+afpompen
+afpompin
+afpomping
+afpompt
+afpompte
+afpompten
+afpond
+afpondde
+afpondden
+afponden
+afpondt
+afpraam
+afpraamd
+afpraamde
+afpraamden
+afpraamt
+afpraat
+afpraatt
+afpraatte
+afpraatten
+afprakke
+afprakkezeerde
+afprakkezeerden
+afprakkezer
+afprakkezeren
+afprakkezert
+afpramen
+afpraten
+afpreek
+afpreekt
+afpreekte
+afpreekten
+afpreken
+afprevel
+afprevelde
+afprevelden
+afprevelen
+afprevelt
+afprik
+afprikke
+afprikken
+afprikt
+afprikte
+afprikten
+afpr|v
+afpr|ve
+afpr|vede
+afpr|ver
+afpr|ves
+afpr|vet
+afpr|vne
+afpr|vning
+afpr|vningen
+afpr|vningens
+afpr|vninger
+afpr|vningernes
+afpr|vnings
+afpr|vningsfase
+afpr|vningsfaser
+afpr|vningsfaserne
+afpr|vningsk|rsler
+afpr|vningsmetode
+afpr|vningsmetoder
+afpr|vningsmetodernes
+afpr|vningsprocedure
+afpr|vningsstrategi
+afpr|vningsstrategien
+afpr|vningsstrategiens
+afpr|vningsstrategierne
+afpr|vningsstrategiernes
+afpr|vningss{t
+afpudsning
+afpulk
+afpulken
+afpulkt
+afpulkte
+afpulkten
+afpunt
+afpunten
+afpuntte
+afpuntten
+afr
+afra
+afraad
+afraadde
+afraadden
+afraadt
+afraag
+afraagde
+afraagden
+afraagt
+afraak
+afraakt
+afraakte
+afraakten
+afraap
+afraapt
+afraapte
+afraapten
+afrabbel
+afrabbelde
+afrabbelden
+afrabbelen
+afrabbelt
+afraden
+afrafel
+afrafeld
+afrafelde
+afrafelden
+afrafele
+afrafelen
+afrafeli
+afrafeling
+afrafelt
+afraffel
+afraffelde
+afraffelden
+afraffelen
+afraffelt
+afragen
+afraid
+afraidne
+afraidness
+afrailada
+afrailado
+afrailamiento
+afrailar
+afraken
+aframeri
+aframerican
+aframmel
+aframmelde
+aframmelden
+aframmelen
+aframmeling
+aframmelingen
+aframmelt
+afrancar
+afrancesada
+afrancesado
+afrancesamiento
+afrancesar
+afrand
+afrandde
+afrandden
+afranden
+afrandt
+afranjada
+afranjado
+afransel
+afranselde
+afranselden
+afranselen
+afranseling
+afranselingen
+afranselt
+afrapen
+afrasia
+afrasian
+afrasp
+afraspen
+afraspt
+afraspte
+afraspten
+afraster
+afrasterde
+afrasterden
+afrasterdraad
+afrasteren
+afrastering
+afrasteringen
+afrastert
+afrecharse
+afrecho
+afreden
+afreding
+afreed
+afreedde
+afreedden
+afreedt
+afreeg
+afreehek
+afreehekel
+afreehekels
+afreep
+afreept
+afreepte
+afreepten
+afrees
+afreet
+afreets
+afregen
+afregend
+afregende
+afregenden
+afregene
+afregenen
+afregent
+afreik
+afreiken
+afreikt
+afreikte
+afreikten
+afreis
+afreisde
+afreisden
+afreist
+afreizen
+afrejse
+afrejsende
+afrejst
+afreken
+afrekend
+afrekende
+afrekenden
+afrekene
+afrekenen
+afrekeni
+afrekening
+afrekeningen
+afrekent
+afremmen
+afren
+afrende
+afrenden
+afrenillar
+afrennen
+afrent
+afrenta
+afrentacio`n
+afrentadamente
+afrentador
+afrentadora
+afrentar
+afrentosa
+afrentosamente
+afrentoso
+afrepel
+afrepeld
+afrepelde
+afrepelden
+afrepele
+afrepelen
+afrepelt
+afrepen
+afresh
+afret
+afretada
+afretado
+afretar
+afreten
+afreza
+afrezen
+afriat
+afric
+africa
+africada
+africado
+africain
+africaine
+africaines
+africains
+african
+africana
+africanc
+africancaucasianindian
+africand
+africander
+africani
+africaniser
+africanism
+africanist
+africanista
+africanistes
+africanizar
+africanization
+africanize
+africano
+africanoid
+africans
+africant
+africanthropus
+africht
+africhte
+africhten
+africhter
+africhters
+africhti
+africhting
+africhts
+africhtster
+africhtsters
+africhtt
+africhtte
+africhtten
+afrid
+afridi
+afried
+afrieden
+afriep
+afriepen
+afrij
+afrijd
+afrijden
+afrijdt
+afrijen
+afrijg
+afrijgen
+afrijgt
+afrijs
+afrijst
+afrijt
+afrijten
+afrijzel
+afrijzelde
+afrijzelden
+afrijzelen
+afrijzelt
+afrijzen
+afrika
+afrika-k
+afrika-korps
+afrikaan
+afrikaander
+afrikaanders
+afrikaans
+afrikaanse
+afrikaanser
+afrikaanst
+afrikaantje
+afrikaantjes
+afrikaar
+afrikaarmee
+afrikafr
+afrikafront
+afrikan
+afrikand
+afrikander
+afrikanderdom
+afrikanderism
+afrikane
+afrikanen
+afrikaner
+afrikanere
+afrikaneren
+afrikanerin
+afrikanerinnen
+afrikanerne
+afrikanernes
+afrikaners
+afrikani
+afrikanisch
+afrikanischem
+afrikanischen
+afrikanischer
+afrikans
+afrikansk
+afrikanske
+afrikare
+afrikareferat
+afrikas
+afrike
+afrique
+afris
+afrisonada
+afrisonado
+afrissen
+afrist
+afriste
+afristen
+afristte
+afristten
+afrit
+afrits
+afritsen
+afritsin
+afritsing
+afritsingen
+afritst
+afritste
+afritsten
+afritten
+afro
+afroamer
+afroamerikanischer
+afroarab
+afroasia
+afroasian
+afroasiatic
+afroasiatischen
+afroasiatisk
+afrochin
+afrochinese
+afrodisiaca
+afrodisiaco
+afrodita
+afrodite
+afroeast
+afroei
+afroeide
+afroeiden
+afroeien
+afroeit
+afroep
+afroepen
+afroeper
+afroepers
+afroepin
+afroeping
+afroepingen
+afroept
+afroest
+afroeste
+afroesten
+afroestt
+afroestte
+afroestten
+afroeuro
+afroeuropean
+afroffel
+afroffelde
+afroffelden
+afroffelen
+afroffeling
+afroffelingen
+afroffelt
+afrogaea
+afrogaean
+afroken
+afrol
+afrolbaa
+afrolbaar
+afrolbar
+afrolbare
+afrolde
+afrolden
+afrollen
+afrolook
+afrolt
+afromala
+afromalagasy
+afromen
+afromer
+afromers
+afroming
+afrond
+afrondde
+afrondden
+afronden
+afrondfo
+afrondfout
+afrondfouten
+afrondin
+afronding
+afrondingen
+afrondingsvijl
+afrondingsvijlen
+afrondt
+afronitro
+afronsel
+afronselde
+afronselden
+afronselen
+afronselt
+afront
+afrontacio`n
+afrontada
+afrontadamente
+afrontado
+afrontador
+afrontadora
+afrontamiento
+afrontar
+afrontilar
+afroof
+afroofde
+afroofden
+afrooft
+afrooi
+afrooide
+afrooiden
+afrooien
+afrooit
+afrook
+afrookt
+afrookte
+afrookten
+afroom
+afroomde
+afroomden
+afroomt
+afros
+afrosemi
+afroseminole
+afrossen
+afrossin
+afrossing
+afrossingen
+afrost
+afroste
+afrosten
+afrot
+afrotte
+afrotten
+afrottin
+afrotting
+afroven
+afroving
+afrown
+afrpl
+afrpl-va
+afrpl-vax
+afrts
+afrts-vi
+afrts-vic
+afruenta
+afruento
+afrui
+afruide
+afruiden
+afruien
+afruil
+afruilde
+afruilden
+afruilen
+afruilt
+afruim
+afruimde
+afruimden
+afruimen
+afruimt
+afruis
+afruisen
+afruist
+afruiste
+afruisten
+afruit
+afruk
+afrukken
+afrukkin
+afrukking
+afrukt
+afrukte
+afrukten
+afrund
+afrunde
+afrunder
+afrundes
+afrunding
+afrundinger
+afrundingsfejl
+afs
+afsabbel
+afsabbelde
+afsabbelden
+afsabbelen
+afsabbelt
+afsabber
+afsabberde
+afsabberden
+afsabberen
+afsabbert
+afsabel
+afsabeld
+afsabelde
+afsabelden
+afsabele
+afsabelen
+afsabelt
+afsang
+afsar
+afsat
+afsats
+afsatser
+afsatte
+afsc
+afsc-ad
+afsc-ad-
+afsc-ad-mil-tac
+afsc-bmo
+afsc-fin
+afsc-fin1
+afsc-hq
+afsc-hq-
+afsc-hq-mil-tac
+afsc-sd
+afsc-sdx
+afsc02
+afschaaf
+afschaafde
+afschaafden
+afschaafsel
+afschaafsels
+afschaaft
+afschaak
+afschaakt
+afschaakte
+afschaakten
+afschaal
+afschaalde
+afschaalden
+afschaalt
+afschadu
+afschaduw
+afschaduwde
+afschaduwden
+afschaduwen
+afschaduwing
+afschaduwingen
+afschaduwt
+afschaf
+afschaff
+afschaffen
+afschaffer
+afschaffergenootschap
+afschaffergenootschappen
+afschaffers
+afschaffing
+afschaffingen
+afschafs
+afschafster
+afschafsters
+afschaft
+afschafte
+afschaften
+afschake
+afschakel
+afschakelde
+afschakelden
+afschakelen
+afschakelt
+afschaken
+afschale
+afschalen
+afschamp
+afschampen
+afschamper
+afschampers
+afschamping
+afschampt
+afschampte
+afschampten
+afschans
+afschansen
+afschanst
+afschanste
+afschansten
+afschar
+afschard
+afscharde
+afscharden
+afscharr
+afscharren
+afschart
+afschave
+afschaveling
+afschaven
+afscheen
+afscheep
+afscheephaven
+afscheephavens
+afscheept
+afscheepte
+afscheepten
+afscheer
+afscheerder
+afscheerders
+afscheert
+afscheid
+afscheidbaar
+afscheidbare
+afscheidde
+afscheidden
+afscheiden
+afscheider
+afscheiders
+afscheiding
+afscheidingen
+afscheidingslijn
+afscheidingslijnen
+afscheidingsmuren
+afscheidingsmuur
+afscheidingssloot
+afscheidingssloten
+afscheidsbezoek
+afscheidsbezoeken
+afscheidsbrief
+afscheidsbrieven
+afscheidsel
+afscheidsels
+afscheidsfeest
+afscheidsgroet
+afscheidsgroeten
+afscheidskus
+afscheidskussen
+afscheidspreek
+afscheidspreken
+afscheidsrede
+afscheidsredes
+afscheidsvoorstelling
+afscheidsvoorstellingen
+afscheidt
+afscheme
+afschemer
+afschemerde
+afschemerden
+afschemeren
+afschemering
+afschemert
+afschene
+afschenen
+afschenk
+afschenken
+afschenkt
+afschep
+afschepe
+afschepen
+afscheper
+afschepers
+afschepi
+afscheping
+afschepingen
+afschepp
+afscheppen
+afschept
+afschepte
+afschepten
+afschere
+afscheren
+afscherf
+afscherfde
+afscherfden
+afscherft
+afscheri
+afschering
+afscherm
+afschermde
+afschermden
+afschermen
+afscherming
+afschermt
+afscherv
+afscherven
+afscherving
+afschervingen
+afschets
+afschetsen
+afschetst
+afschetste
+afschetsten
+afscheur
+afscheurde
+afscheurden
+afscheuren
+afscheuring
+afscheuringen
+afscheurt
+afschiet
+afschieten
+afschijn
+afschijnen
+afschijnsel
+afschijnselen
+afschijnsels
+afschijnt
+afschil
+afschild
+afschilde
+afschilden
+afschilder
+afschilderde
+afschilderden
+afschilderen
+afschildering
+afschilderingen
+afschildert
+afschilf
+afschilfer
+afschilferde
+afschilferden
+afschilferen
+afschilfering
+afschilferingen
+afschilfert
+afschill
+afschillen
+afschilt
+afschitt
+afschitter
+afschitterde
+afschitterden
+afschitteren
+afschittert
+afschoff
+afschoffel
+afschoffelde
+afschoffelden
+afschoffelen
+afschoffelt
+afschok
+afschokk
+afschokken
+afschokt
+afschokte
+afschokten
+afschonk
+afschonken
+afschoof
+afschooi
+afschooide
+afschooiden
+afschooien
+afschooit
+afschoor
+afschoot
+afschop
+afschopp
+afschoppen
+afschopt
+afschopte
+afschopten
+afschore
+afschoren
+afschot
+afschote
+afschoten
+afschove
+afschoven
+afschraa
+afschraap
+afschraapschaar
+afschraapscharen
+afschraapsel
+afschraapsels
+afschraapt
+afschraapte
+afschraapten
+afschrab
+afschrabben
+afschrabber
+afschrabbers
+afschrabde
+afschrabden
+afschrabsel
+afschrabsels
+afschrabt
+afschrap
+afschrapen
+afschraper
+afschrapers
+afschrappen
+afschrapsel
+afschrapsels
+afschrapt
+afschrapte
+afschrapten
+afschree
+afschreef
+afschreeuw
+afschreeuwde
+afschreeuwden
+afschreeuwen
+afschreeuwt
+afschrei
+afschreide
+afschreiden
+afschreien
+afschreit
+afschrev
+afschreven
+afschrif
+afschrift
+afschriften
+afschriftenboek
+afschriftenboeken
+afschrij
+afschrijf
+afschrijflonen
+afschrijfloon
+afschrijfpunt
+afschrijfpunten
+afschrijfster
+afschrijfsters
+afschrijft
+afschrijven
+afschrijver
+afschrijvers
+afschrijving
+afschrijvingen
+afschrijvingsbank
+afschrijvingsbanken
+afschrik
+afschrikken
+afschrikt
+afschrikte
+afschrikten
+afschrikwekkend
+afschrikwekkende
+afschrikwekkender
+afschrikwekkendst
+afschrob
+afschrobben
+afschrobde
+afschrobden
+afschrobt
+afschroe
+afschroef
+afschroefde
+afschroefden
+afschroeft
+afschroei
+afschroeide
+afschroeiden
+afschroeien
+afschroeit
+afschroeven
+afschub
+afschubb
+afschubben
+afschubd
+afschubde
+afschubden
+afschubt
+afschud
+afschudd
+afschudde
+afschudden
+afschudt
+afschuie
+afschuier
+afschuierde
+afschuierden
+afschuieren
+afschuiert
+afschuif
+afschuift
+afschuim
+afschuimde
+afschuimden
+afschuimen
+afschuimer
+afschuimers
+afschuimlepel
+afschuimlepels
+afschuimt
+afschuin
+afschuinde
+afschuinden
+afschuinen
+afschuining
+afschuiningen
+afschuint
+afschuiv
+afschuiven
+afschuiving
+afschuivingen
+afschure
+afschuren
+afschuri
+afschuring
+afschut
+afschuts
+afschutsel
+afschutsels
+afschutt
+afschutte
+afschutten
+afschutting
+afschuttingen
+afschuur
+afschuurde
+afschuurden
+afschuursel
+afschuurt
+afschuw
+afschuwe
+afschuwelijk
+afschuwelijke
+afschuwelijker
+afschuwelijkheden
+afschuwelijkheid
+afschuwelijkst
+afschuww
+afschuwwekkend
+afschuwwekkende
+afschuwwekkender
+afschuwwekkendst
+afse
+afsein
+afseinde
+afseinden
+afseinen
+afseint
+afsejle
+afsend
+afsende
+afsendelse
+afsender
+afsenderen
+afsendt
+afsendte
+afshah
+afshar
+afshari
+afsides
+afsijpel
+afsijpelde
+afsijpelden
+afsijpelen
+afsijpeling
+afsijpelt
+afsjache
+afsjacher
+afsjacherde
+afsjacherden
+afsjacheren
+afsjachert
+afsjok
+afsjokke
+afsjokken
+afsjokt
+afsjokte
+afsjokten
+afsjouw
+afsjouwd
+afsjouwde
+afsjouwden
+afsjouwe
+afsjouwen
+afsjouwt
+afskaf
+afskaffelse
+afskaffet
+afskedige
+afskedigelsen
+afskedstale
+afskrev
+afskrift
+afskrive
+afskrives
+afskrivning
+afskrivninger
+afskrivningerne
+afskygning
+afskygninger
+afskyr
+afsk{re
+afsk{rer
+afsk{res
+afsk{ring
+afsk{ringen
+afsk{ringer
+afsk}ret
+afsla
+afslaaf
+afslaafd
+afslaafde
+afslaafden
+afslaaft
+afslaan
+afslaat
+afslag
+afslagen
+afslager
+afslagers
+afslappede
+afslappet
+afslaven
+afslecht
+afslechten
+afslechthamer
+afslechthamers
+afslechtte
+afslechtten
+afsleep
+afsleept
+afsleepte
+afsleepten
+afsleet
+afslente
+afslenter
+afslenterde
+afslenterden
+afslenteren
+afslentert
+afslepen
+afslepin
+afsleping
+afsleten
+afsleur
+afsleurd
+afsleurde
+afsleurden
+afsleure
+afsleuren
+afsleurt
+afslib
+afslibbe
+afslibben
+afslibber
+afslibberde
+afslibberden
+afslibberen
+afslibbert
+afslibde
+afslibden
+afslibt
+afslier
+afslierd
+afslierde
+afslierden
+afsliere
+afslieren
+afsliert
+afslijp
+afslijpe
+afslijpen
+afslijpi
+afslijping
+afslijps
+afslijpsel
+afslijpsels
+afslijpt
+afslijt
+afslijte
+afslijten
+afslijti
+afslijting
+afslinge
+afslinger
+afslingerde
+afslingerden
+afslingeren
+afslingert
+afslip
+afslippe
+afslippen
+afslipt
+afslipte
+afslipten
+afsloeg
+afsloege
+afsloegen
+afslof
+afsloffe
+afsloffen
+afsloft
+afslofte
+afsloften
+afslog
+afslons
+afslonsd
+afslonsde
+afslonsden
+afslonst
+afslonze
+afslonzen
+afsloof
+afsloofd
+afsloofde
+afsloofden
+afslooft
+afsloop
+afsloopt
+afsloopte
+afsloopten
+afsloot
+afsloott
+afslootte
+afslootten
+afslopen
+afslorp
+afslorpe
+afslorpen
+afslorpt
+afslorpte
+afslorpten
+afsloten
+afslotin
+afsloting
+afsloven
+afslovin
+afsloving
+afsluip
+afsluipe
+afsluipen
+afsluipt
+afsluit
+afsluitd
+afsluitdam
+afsluitdammen
+afsluitdijk
+afsluitdijken
+afsluite
+afsluiten
+afsluitend
+afsluiter
+afsluiters
+afsluiti
+afsluiting
+afsluitingen
+afsluitingsmuren
+afsluitingsmuur
+afsluitinkje
+afsluitinkjes
+afsluitk
+afsluitkraan
+afsluitkranen
+afsluitp
+afsluitpremie
+afsluitpremies
+afslurp
+afslurpe
+afslurpen
+afslurpt
+afslurpte
+afslurpten
+afslut
+afslutning
+afslutningsbem{rkning
+afslutningsfasen
+afslutningsvis
+afslutte
+afsluttedes
+afsluttende
+afslutter
+afsluttes
+afsluttet
+afsl|re
+afsl|rede
+afsl|rer
+afsl|res
+afsl|ret
+afsl|ringer
+afsl}
+afsl}et
+afsl}r
+afsmak
+afsmakke
+afsmakken
+afsmakt
+afsmakte
+afsmakten
+afsmeden
+afsmeed
+afsmeedd
+afsmeedde
+afsmeedden
+afsmeedt
+afsmeek
+afsmeekt
+afsmeekte
+afsmeekten
+afsmeer
+afsmeerd
+afsmeerde
+afsmeerden
+afsmeert
+afsmeet
+afsmeken
+afsmekin
+afsmeking
+afsmelt
+afsmelte
+afsmelten
+afsmeren
+afsmet
+afsmeten
+afsmette
+afsmetten
+afsmijt
+afsmijte
+afsmijten
+afsmolt
+afsmolte
+afsmolten
+afsnauw
+afsnauwd
+afsnauwde
+afsnauwden
+afsnauwe
+afsnauwen
+afsnauwi
+afsnauwing
+afsnauwingen
+afsnauwt
+afsneden
+afsneed
+afsnel
+afsnelde
+afsnelden
+afsnelle
+afsnellen
+afsnelt
+afsnijd
+afsnijde
+afsnijden
+afsnijdi
+afsnijding
+afsnijdingen
+afsnijds
+afsnijdsel
+afsnijdsels
+afsnijdt
+afsnijsc
+afsnijschaar
+afsnijscharen
+afsnijse
+afsnijsel
+afsnijsels
+afsnippe
+afsnipper
+afsnipperde
+afsnipperden
+afsnipperen
+afsnippert
+afsnit
+afsnittene
+afsnittet
+afsnoei
+afsnoeid
+afsnoeide
+afsnoeiden
+afsnoeie
+afsnoeien
+afsnoeii
+afsnoeiing
+afsnoeis
+afsnoeisel
+afsnoeisels
+afsnoeit
+afsnoep
+afsnoepe
+afsnoepen
+afsnoept
+afsnoepte
+afsnoepten
+afsnoer
+afsnoerd
+afsnoerde
+afsnoerden
+afsnoere
+afsnoeren
+afsnoert
+afsnoot
+afsnor
+afsnorde
+afsnorden
+afsnorre
+afsnorren
+afsnort
+afsnoten
+afsnuffe
+afsnuffel
+afsnuffelde
+afsnuffelden
+afsnuffelen
+afsnuffelt
+afsnuit
+afsnuite
+afsnuiten
+afsnuiti
+afsnuiting
+afsnuitingen
+afsnuitt
+afsnuitte
+afsnuitten
+afsol
+afsolde
+afsolden
+afsollen
+afsolt
+afsoomaa
+afsoomaali
+afsop
+afsoppen
+afsopt
+afsopte
+afsopten
+afspaad
+afspaadd
+afspaadde
+afspaadden
+afspaadt
+afspaan
+afspaand
+afspaande
+afspaanden
+afspaant
+afspaden
+afspan
+afspande
+afspanden
+afspanen
+afspanne
+afspannen
+afspanni
+afspanning
+afspanningen
+afspant
+afspat
+afspatte
+afspatten
+afspatti
+afspatting
+afspattingen
+afspeel
+afspeeld
+afspeelde
+afspeelden
+afspeelt
+afspeet
+afspeett
+afspeette
+afspeetten
+afspejle
+afspejler
+afspejles
+afspeld
+afspeldd
+afspeldde
+afspeldden
+afspelde
+afspelden
+afspeldt
+afspelen
+afspeten
+afspeur
+afspeurd
+afspeurde
+afspeurden
+afspeure
+afspeuren
+afspeurt
+afspied
+afspiedd
+afspiedde
+afspiedden
+afspiede
+afspieden
+afspiedt
+afspiege
+afspiegel
+afspiegelde
+afspiegelden
+afspiegelen
+afspiegeling
+afspiegelingen
+afspiegelt
+afspilles
+afspin
+afspinne
+afspinnen
+afspint
+afspione
+afspioneer
+afspioneerde
+afspioneerden
+afspioneert
+afspioneren
+afspit
+afspitte
+afspitten
+afspleet
+afsplete
+afspleten
+afsplijt
+afsplijten
+afsplint
+afsplinter
+afsplinterde
+afsplinterden
+afsplinteren
+afsplintert
+afsplits
+afsplitsen
+afsplitst
+afsplitste
+afsplitsten
+afspoel
+afspoeld
+afspoelde
+afspoelden
+afspoele
+afspoelen
+afspoeli
+afspoeling
+afspoelingen
+afspoels
+afspoelsel
+afspoelt
+afspon
+afsponne
+afsponnen
+afspons
+afsponsd
+afsponsde
+afsponsden
+afsponst
+afsponze
+afsponzen
+afspoor
+afspoord
+afspoorde
+afspoorden
+afspoort
+afspoot
+afsporen
+afspoten
+afspraak
+afsprak
+afsprake
+afspraken
+afspreek
+afspreekt
+afspreke
+afspreken
+afspring
+afspringen
+afspringt
+afsprong
+afsprongen
+afsproot
+afsprote
+afsproten
+afspruit
+afspruiten
+afspuit
+afspuite
+afspuiten
+afsta
+afstaan
+afstaand
+afstaande
+afstaar
+afstaard
+afstaarde
+afstaarden
+afstaart
+afstak
+afstaken
+afstakke
+afstakker
+afstakkes
+afstakket
+afstal
+afstalen
+afstam
+afstamde
+afstamden
+afstamme
+afstammeling
+afstammelinge
+afstammelingen
+afstammen
+afstammi
+afstamming
+afstammingsleer
+afstammingstheorie
+afstammingstheorieen
+afstamning
+afstamp
+afstampe
+afstampen
+afstampt
+afstampte
+afstampten
+afstamt
+afstand
+afstande
+afstanden
+afstandm
+afstandmeting
+afstandmetingen
+afstands
+afstandsbepaling
+afstandsbepalingen
+afstandsformel
+afstandsformlen
+afstandsforvr{ngning
+afstandspaal
+afstandspalen
+afstandsrit
+afstandsritten
+afstandssein
+afstandsseinen
+afstandssignaal
+afstandssignalen
+afstandstagen
+afstandswijzer
+afstandswijzers
+afstap
+afstappe
+afstappen
+afstapt
+afstapte
+afstapten
+afstaren
+afstat
+afsted
+afstedkom
+afstedkomme
+afstedkommet
+afsteeg
+afsteek
+afsteekb
+afsteekbeitel
+afsteekbeitels
+afsteeks
+afsteeksel
+afsteeksels
+afsteekt
+afsteel
+afsteelt
+afstegen
+afstek
+afsteken
+afsteker
+afstekers
+afstekin
+afsteking
+afstekingen
+afstekke
+afstekken
+afstekt
+afstekte
+afstekten
+afstel
+afstelde
+afstelden
+afstelen
+afstelle
+afstellen
+afstelli
+afstelling
+afstellingen
+afstelt
+afstem
+afstemde
+afstemden
+afstemme
+afstemmen
+afstemmi
+afstemming
+afstemmingen
+afstemning
+afstempe
+afstempel
+afstempelde
+afstempelden
+afstempelen
+afstempeling
+afstempelingen
+afstempelt
+afstemsc
+afstemschaal
+afstemschalen
+afstemt
+afsterf
+afsterft
+afsterve
+afsterven
+afstervi
+afsterving
+afsteven
+afstevende
+afstevenden
+afstevenen
+afstevent
+afstierf
+afstierv
+afstierven
+afstijg
+afstijge
+afstijgen
+afstijgt
+afstik
+afstikke
+afstikken
+afstikkende
+afstikker
+afstikt
+afstikte
+afstikten
+afstip
+afstippe
+afstippen
+afstipt
+afstipte
+afstipten
+afstive
+afstivning
+afstivningen
+afstivninger
+afstof
+afstoffe
+afstoffen
+afstoft
+afstofte
+afstoften
+afstoken
+afstomen
+afstomme
+afstommel
+afstommelde
+afstommelden
+afstommelen
+afstommelt
+afstomp
+afstompe
+afstompen
+afstompi
+afstomping
+afstompt
+afstompte
+afstompten
+afstond
+afstonde
+afstonden
+afstoof
+afstoofd
+afstoofde
+afstoofden
+afstooft
+afstook
+afstookt
+afstookte
+afstookten
+afstoom
+afstoomd
+afstoomde
+afstoomden
+afstoomt
+afstoot
+afstootb
+afstootbomen
+afstootboom
+afstooti
+afstootijzer
+afstootijzers
+afstoott
+afstootte
+afstootten
+afstop
+afstoppe
+afstoppen
+afstopt
+afstopte
+afstopten
+afstorm
+afstormd
+afstormde
+afstormden
+afstorme
+afstormen
+afstormt
+afstort
+afstorte
+afstorten
+afstorti
+afstorting
+afstortt
+afstortte
+afstortten
+afstoten
+afstotend
+afstotende
+afstotender
+afstotendst
+afstotin
+afstoting
+afstoven
+afstraal
+afstraalde
+afstraalden
+afstraalt
+afstraf
+afstraff
+afstraffe
+afstraffelse
+afstraffelsen
+afstraffelser
+afstraffen
+afstraffing
+afstraffingen
+afstraft
+afstrafte
+afstraften
+afstrale
+afstralen
+afstrali
+afstraling
+afstralingen
+afstrede
+afstreden
+afstreed
+afstreek
+afstreke
+afstreken
+afstresning
+afstresse
+afstribe
+afstribning
+afstrijd
+afstrijden
+afstrijdt
+afstrijk
+afstrijken
+afstrijker
+afstrijkers
+afstrijkt
+afstrome
+afstromen
+afstromi
+afstroming
+afstromp
+afstrompel
+afstrompelde
+afstrompelden
+afstrompelen
+afstrompelt
+afstroom
+afstroomde
+afstroomden
+afstroomt
+afstroop
+afstroopt
+afstroopte
+afstroopten
+afstrope
+afstropen
+afstudee
+afstudeer
+afstudeerde
+afstudeerden
+afstudeerders
+afstudeeropdracht
+afstudeerproject
+afstudeert
+afstudeerwerk
+afstuder
+afstuderen
+afstuif
+afstuift
+afstuit
+afstuite
+afstuiten
+afstuitt
+afstuitte
+afstuitten
+afstuive
+afstuiven
+afstuivi
+afstuiving
+afstuivingen
+afstumpet
+afstumpethed
+afstumpetheden
+afsturen
+afstuur
+afstuurd
+afstuurde
+afstuurden
+afstuurt
+afstuw
+afstuwde
+afstuwden
+afstuwen
+afstuwt
+afst|be
+afst|bning
+afst|bningen
+afst|bninger
+afst}
+afst}else
+afst}elsen
+afst}elser
+afsuf
+afsuffen
+afsuft
+afsufte
+afsuften
+afsukkel
+afsukkelde
+afsukkelden
+afsukkelen
+afsukkelt
+afsvale
+afsvalning
+afsvalningen
+afsvalninger
+afsved
+afsvedet
+afsvide
+afsvor
+afsv{kke
+afsv{kkelse
+afsv{kkelsen
+afsv{rge
+afsv{rgelse
+afsv{rger
+afsynge
+afsynger
+afsyre
+afsyrede
+afsyret
+afs{t
+afs{tning
+afs{tnings|konomi
+afs{tte
+afs{tter
+afs{ttes
+afs|ge
+afs|ger
+afs|gning
+afs|gningen
+afs|gninger
+aft
+afta
+aftaba
+aftac
+aftage
+aftagelig
+aftagende
+aftager
+aftak
+aftakdoo
+aftakdoos
+aftakdoz
+aftakdozen
+aftakel
+aftakeld
+aftakelde
+aftakelden
+aftakele
+aftakelen
+aftakeli
+aftakeling
+aftakelt
+aftakken
+aftakkin
+aftakking
+aftakkingen
+aftaklei
+aftakleiding
+aftakleidingen
+aftakstr
+aftakstroom
+aftakt
+aftakte
+aftakten
+aftal
+aftale
+aftalegrundlag
+aftalen
+aftaler
+aftalt
+aftalte
+aftand
+aftandde
+aftandden
+aftanden
+aftands
+aftandse
+aftandt
+aftap
+aftapkra
+aftapkraan
+aftapkranen
+aftapmes
+aftapmessen
+aftappe
+aftappen
+aftapper
+aftappers
+aftappin
+aftapping
+aftappingen
+aftapt
+aftapte
+aftapten
+aftar
+aftarde
+aftarden
+aftarren
+aftart
+aftast
+aftasten
+aftastte
+aftastten
+afteer
+afteerde
+afteerden
+afteert
+aftegne
+aftegning
+afteil
+afteilde
+afteilden
+afteilen
+afteilt
+afteken
+aftekena
+aftekenaar
+aftekenaars
+aftekend
+aftekende
+aftekenden
+aftekene
+aftekenen
+aftekeni
+aftekening
+aftekeningen
+aftekent
+aftel
+aftelde
+aftelden
+aftelefo
+aftelefoneer
+aftelefoneerde
+aftelefoneerden
+aftelefoneert
+aftelefoneren
+aftelegr
+aftelegrafeer
+aftelegrafeerde
+aftelegrafeerden
+aftelegrafeert
+aftelegraferen
+aftellen
+aftellie
+aftelliedje
+aftelliedjes
+aftellin
+aftelling
+aftellingen
+aftelrij
+aftelrijm
+aftelrijmen
+aftelt
+aftelver
+aftelvers
+aftelverzen
+aften
+aftenbla
+aftenblad
+aftenen
+aftenens
+aftener
+aftenkjo
+aftenkjoler
+aftenkon
+aftenkonsert
+aftenkur
+aftenkurs
+aftennum
+aftennummer
+aftenpos
+aftenposten
+aftenpostens
+aftens
+aftensam
+aftensammenkomsten
+aftensel
+aftenselskap
+aftenskole
+aftenskolen
+aftensma
+aftensmat
+aftensmaten
+aftensol
+aftensolens
+aftentur
+aftenutg
+aftenutgaven
+after
+after7	
+afteract
+afterage
+afterasm
+afteratt
+afterattack
+afterban
+afterband
+afterbea
+afterbeat
+afterbir
+afterbirth
+afterbirths
+afterblo
+afterblow
+afterbod
+afterbody
+afterbra
+afterbrain
+afterbre
+afterbreach
+afterbreast
+afterbur
+afterburden
+afterburn
+afterburner
+afterburners
+afterburning
+aftercar
+aftercare
+aftercareer
+aftercas
+aftercast
+aftercat
+aftercataract
+aftercau
+aftercause
+aftercha
+afterchance
+afterchr
+afterchrome
+afterchu
+afterchurch
+aftercla
+afterclap
+afterclause
+aftercom
+aftercome
+aftercomer
+aftercoming
+aftercoo
+aftercooler
+aftercos
+aftercost
+aftercou
+aftercourse
+aftercro
+aftercrop
+aftercur
+aftercure
+afterdam
+afterdamp
+afterdat
+afterdate
+afterday
+afterdays
+afterdec
+afterdeck
+afterdecks
+afterdin
+afterdinner
+afterdis
+afterdischarge
+afterdra
+afterdrain
+afterdro
+afterdrops
+aftereff
+aftereffect
+aftereffects
+afteren
+afterend
+afterent
+afterentry
+afterexp
+afterexpand
+aftereye
+afterfal
+afterfall
+afterfam
+afterfame
+afterfee
+afterfeed
+afterfer
+afterfermentation
+afterfor
+afterform
+afterfri
+afterfriend
+afterfru
+afterfruits
+afterfut
+afterfuture
+aftergam
+aftergame
+aftergas
+aftergli
+afterglide
+afterglo
+afterglow
+afterglows
+aftergo
+aftergoo
+aftergood
+aftergra
+aftergrass
+aftergrave
+aftergri
+aftergrief
+aftergrind
+aftergro
+aftergrowth
+aftergua
+afterguard
+aftergun
+afterguns
+afterhan
+afterhand
+afterhar
+afterharm
+afterhat
+afterhatch
+afterhel
+afterhelp
+afterhen
+afterhend
+afterhol
+afterhold
+afterhop
+afterhope
+afterhou
+afterhours
+afterima
+afterimage
+afterimages
+afterimp
+afterimpression
+aftering
+afterings
+afterkin
+afterking
+afterkno
+afterknowledge
+afterlif
+afterlife
+afterlifetime
+afterlig
+afterlight
+afterlin
+afterlinking
+afterliv
+afterlives
+afterlos
+afterloss
+afterlov
+afterlove
+aftermar
+aftermark
+aftermarket
+aftermarriage
+aftermas
+aftermass
+aftermast
+aftermat
+aftermath
+aftermaths
+aftermatter
+aftermea
+aftermeal
+aftermil
+aftermilk
+aftermos
+aftermost
+afternig
+afternight
+afternoo
+afternoon
+afternoons
+afternos
+afternose
+afternot
+afternote
+afteroar
+afterpai
+afterpain
+afterpar
+afterpart
+afterpas
+afterpast
+afterpea
+afterpeak
+afterpie
+afterpiece
+afterpla
+afterplanting
+afterplay
+afterpot
+afterpotential
+afterpre
+afterpressure
+afterpro
+afterproof
+afterrak
+afterrake
+afterrec
+afterreckoning
+afterreo
+afterreorg
+afterrid
+afterrider
+afterrip
+afterripening
+afterrol
+afterroll
+afters
+aftersal
+aftersale
+aftersch
+afterschool
+aftersen
+aftersend
+aftersensation
+aftersha
+aftershaft
+aftershafted
+aftershave
+aftershaves
+aftershi
+aftershine
+aftership
+aftersho
+aftershock
+aftershocks
+afterson
+aftersong
+aftersou
+aftersound
+afterspe
+afterspeech
+afterspr
+afterspring
+aftersta
+afterstain
+afterstate
+aftersto
+afterstorm
+afterstr
+afterstrain
+afterstretch
+afterstu
+afterstudy
+afterswa
+afterswarm
+afterswarming
+afterswe
+afterswell
+aftertan
+aftertas
+aftertask
+aftertaste
+aftertastes
+afterthi
+afterthinker
+aftertho
+afterthought
+afterthoughted
+afterthoughts
+afterthr
+afterthrift
+aftertim
+aftertime
+aftertimes
+aftertou
+aftertouch
+aftertre
+aftertreatment
+aftertri
+aftertrial
+aftertur
+afterturn
+aftervis
+aftervision
+afterwal
+afterwale
+afterwar
+afterward
+afterwards
+afterwas
+afterwash
+afterwhi
+afterwhile
+afterwis
+afterwisdom
+afterwise
+afterwit
+afterwitted
+afterwor
+afterword
+afterwork
+afterworking
+afterworld
+afterwra
+afterwrath
+afterwrd
+afterwri
+afterwrist
+afteste
+aftestet
+aftestning
+aftik
+aftikken
+aftikt
+aftikte
+aftikten
+aftil
+aftilde
+aftilden
+aftillen
+aftilt
+aftimmer
+aftimmerde
+aftimmerden
+aftimmeren
+aftimmert
+aftip
+aftippel
+aftippelde
+aftippelden
+aftippelen
+aftippelt
+aftippen
+aftipt
+aftipte
+aftipten
+aftjene
+aftjening
+aftjente
+aftmost
+aftnar
+aftob
+aftobben
+aftobde
+aftobden
+aftobt
+aftocht
+aftochte
+aftochten
+aftochts
+aftochtsein
+aftochtseinen
+aftochtt
+aftochtteken
+aftochttekens
+aftoffel
+aftoffelde
+aftoffelden
+aftoffelen
+aftoffelt
+aftomen
+afton
+aftonbla
+aftonbladet
+aftonde
+aftonden
+aftonian
+aftonnen
+aftonnin
+aftonning
+aftont
+aftoom
+aftoomde
+aftoomden
+aftoomt
+aftop
+aftoppen
+aftopt
+aftopte
+aftopten
+aftorn
+aftornde
+aftornden
+aftornen
+aftornt
+aftosa
+aftoso
+aftover
+aftoverd
+aftoverde
+aftoverden
+aftovere
+aftoveren
+aftovert
+aftrad
+aftraden
+aftrap
+aftrappe
+aftrappen
+aftrapper
+aftrapt
+aftrapte
+aftrapten
+aftred
+aftreden
+aftredend
+aftredende
+aftredin
+aftreding
+aftreed
+aftreedt
+aftrek
+aftrekke
+aftrekken
+aftrekker
+aftrekkers
+aftrekki
+aftrekking
+aftrekkingen
+aftrekro
+aftrekrol
+aftrekrollen
+aftrekse
+aftreksel
+aftreksels
+aftrekseltje
+aftrekseltjes
+aftrekso
+aftreksom
+aftreksommen
+aftrekt
+aftrekta
+aftrektal
+aftrektallen
+aftroef
+aftroefd
+aftroefde
+aftroefden
+aftroeft
+aftroeve
+aftroeven
+aftroever
+aftroevers
+aftroevi
+aftroeving
+aftroevingen
+aftrogge
+aftroggel
+aftroggelaar
+aftroggelaars
+aftroggelaarster
+aftroggelaarsters
+aftroggelarij
+aftroggelarijen
+aftroggelde
+aftroggelden
+aftroggelen
+aftroggeling
+aftroggelingen
+aftroggelt
+aftrok
+aftrokke
+aftrokken
+aftromme
+aftrommel
+aftrommelde
+aftrommelden
+aftrommelen
+aftrommelt
+aftrompe
+aftrompet
+aftrompette
+aftrompetten
+aftronen
+aftroon
+aftroond
+aftroonde
+aftroonden
+aftroont
+aftryk
+aftrykke
+aftr{de
+aftr{delsesv{relse
+aftr{delsesv{relser
+aftr{delsesv{relset
+aftr{k
+aftr{ksr|r
+aftuig
+aftuigde
+aftuigden
+aftuigen
+aftuigin
+aftuiging
+aftuigingen
+aftuigt
+aftuimel
+aftuimelde
+aftuimelden
+aftuimelen
+aftuimelt
+aftuin
+aftuinde
+aftuinden
+aftuinen
+aftuinin
+aftuining
+aftuiningen
+aftuint
+afturen
+afturf
+afturfde
+afturfden
+afturft
+afturven
+aftuur
+aftuurde
+aftuurden
+aftuurt
+aftward
+aftwards
+aftyp
+aftypen
+aftypt
+aftypte
+aftypten
+afu
+afuciada
+afuciado
+afuciar
+afuellun
+afuellung
+afuera
+afuero
+afufa
+afufar
+afufo`n
+afugan
+afuganis
+afughe
+afukoton
+afumada
+afumado
+afumar
+afun
+afunata
+afunctio
+afunction
+afunctional
+afure
+afurede
+afureko
+afurika
+afusada
+afusado
+afusare
+afusio`n
+afuste
+afuta
+afuta-
+afuta-ke
+afutake
+afutakea
+afutanun
+afutasab
+afutu
+afuyentar
+afvaag
+afvaagde
+afvaagden
+afvaagt
+afvaar
+afvaardi
+afvaardig
+afvaardigde
+afvaardigden
+afvaardigen
+afvaardiging
+afvaardigingen
+afvaardigt
+afvaart
+afvaarte
+afvaarten
+afvaarts
+afvaartsuren
+afvaartsuur
+afvagen
+afval
+afvalbak
+afvalbakken
+afvallen
+afvallig
+afvallige
+afvalligen
+afvalligheid
+afvalpla
+afvalplant
+afvalplanten
+afvalpro
+afvalprodukt
+afvalprodukten
+afvalt
+afvang
+afvangen
+afvangt
+afvaren
+afvecht
+afvechte
+afvechten
+afveeg
+afveegde
+afveegden
+afveegse
+afveegsel
+afveegt
+afveen
+afveende
+afveenden
+afveent
+afvees
+afvegen
+afvej
+afveje
+afvejer
+afvejning
+afvel
+afvelde
+afvelden
+afvellen
+afvelt
+afvenen
+afvening
+afveningen
+afvente
+afverf
+afverfde
+afverfden
+afverft
+afverg
+afvergde
+afvergden
+afvergen
+afvergt
+afverven
+afvezel
+afvezeld
+afvezelde
+afvezelden
+afvezele
+afvezelen
+afvezelt
+afvezen
+afviel
+afvielen
+afvige
+afvigelse
+afvigelsen
+afvigelser
+afvigende
+afviger
+afvijl
+afvijlde
+afvijlden
+afvijlen
+afvijlse
+afvijlsel
+afvijlsels
+afvijlt
+afvijs
+afvijst
+afvijzen
+afvikle
+afvikles
+afviklet
+afvikling
+afviklingen
+afviklinger
+afvil
+afvilde
+afvilden
+afvillen
+afvilt
+afving
+afvingen
+afvis
+afvise
+afvisende
+afviser
+afvises
+afvisning
+afvissen
+afvist
+afviste
+afvisten
+afvlak
+afvlakke
+afvlakken
+afvlakki
+afvlakking
+afvlakt
+afvlakte
+afvlakten
+afvlei
+afvleide
+afvleiden
+afvleien
+afvleit
+afvlek
+afvlekke
+afvlekken
+afvlekt
+afvlekte
+afvlekten
+afvlied
+afvliede
+afvlieden
+afvliedt
+afvlieg
+afvliege
+afvliegen
+afvliegt
+afvloden
+afvloei
+afvloeib
+afvloeibuis
+afvloeibuizen
+afvloeid
+afvloeide
+afvloeiden
+afvloeie
+afvloeien
+afvloeii
+afvloeiing
+afvloeip
+afvloeipijp
+afvloeipijpen
+afvloeit
+afvlogen
+afvlood
+afvloog
+afvlot
+afvlotte
+afvlotten
+afvlucht
+afvluchten
+afvluchtte
+afvluchtten
+afvocht
+afvochte
+afvochten
+afvoer
+afvoerbu
+afvoerbuis
+afvoerbuizen
+afvoerde
+afvoerden
+afvoerder
+afvoerders
+afvoeren
+afvoerin
+afvoering
+afvoerka
+afvoerkanaal
+afvoerkanalen
+afvoerpi
+afvoerpijp
+afvoerpijpen
+afvoerro
+afvoerrol
+afvoerrollen
+afvoert
+afvorder
+afvorderde
+afvorderden
+afvorderen
+afvordert
+afvorm
+afvormde
+afvormden
+afvormen
+afvormt
+afvr
+afvr-fw-
+afvr-fw-ig
+afvraag
+afvraagd
+afvraagde
+afvraagden
+afvraagt
+afvragen
+afvrat
+afvraten
+afvree
+afvreeen
+afvreet
+afvreten
+afvretin
+afvreting
+afvries
+afvriest
+afvrieze
+afvriezen
+afvriezi
+afvriezing
+afvrij
+afvrijde
+afvrijden
+afvrijen
+afvrijt
+afvroeg
+afvroege
+afvroegen
+afvroor
+afvroos
+afvroren
+afvrozen
+afvuren
+afvuring
+afvuur
+afvuurde
+afvuurden
+afvuurt
+afv{rg
+afv{rge
+afv{rgede
+afv{rgelsen
+afv{rger
+afv{rget
+afv{rgning
+afwaai
+afwaaide
+afwaaiden
+afwaaien
+afwaait
+afwaarts
+afwaartse
+afwacht
+afwachte
+afwachten
+afwachti
+afwachting
+afwachtt
+afwachtte
+afwachtten
+afwaggel
+afwaggelde
+afwaggelden
+afwaggelen
+afwaggelt
+afwal
+afwal-aa
+afwal-aaa
+afwandel
+afwandelde
+afwandelden
+afwandelen
+afwandelt
+afwas
+afwasbaa
+afwasbaar
+afwasbak
+afwasbakken
+afwasbar
+afwasbare
+afwaskom
+afwaskommen
+afwaskwa
+afwaskwast
+afwaskwasten
+afwassen
+afwassin
+afwassing
+afwassingen
+afwast
+afwaste
+afwasten
+afwater
+afwaterd
+afwaterde
+afwaterden
+afwatere
+afwateren
+afwateri
+afwatering
+afwateringen
+afwateringskanaal
+afwateringskanalen
+afwatert
+afweeg
+afweegt
+afweek
+afweekt
+afweekte
+afweekten
+afweer
+afweerba
+afweerbaar
+afweerbare
+afweerde
+afweerden
+afweerder
+afweerders
+afweerge
+afweergeschut
+afweerka
+afweerkanon
+afweerkanonnen
+afweert
+afweervu
+afweervuur
+afwees
+afweet
+afwegen
+afweging
+afweid
+afweidde
+afweidden
+afweiden
+afweidt
+afweken
+afweking
+afwen
+afwend
+afwendde
+afwendden
+afwende
+afwenden
+afwendin
+afwending
+afwendingen
+afwendt
+afwenk
+afwenken
+afwenkt
+afwenkte
+afwenkten
+afwennen
+afwennin
+afwenning
+afwent
+afwentel
+afwentelde
+afwentelden
+afwentelen
+afwentelt
+afweren
+afwering
+afwerk
+afwerken
+afwerker
+afwerkers
+afwerkin
+afwerking
+afwerkst
+afwerkster
+afwerksters
+afwerkt
+afwerkte
+afwerkten
+afwerp
+afwerpen
+afwerpin
+afwerping
+afwerpt
+afweten
+afwezen
+afwezend
+afwezende
+afwezendheid
+afwezig
+afwezige
+afwezigen
+afwezigh
+afwezigheid
+afwierp
+afwierpe
+afwierpen
+afwies
+afwiesen
+afwijk
+afwijken
+afwijkende
+afwijkin
+afwijking
+afwijkingen
+afwijkingscirkel
+afwijkingscirkels
+afwijkt
+afwijs
+afwijst
+afwijzen
+afwijzin
+afwijzing
+afwijzingen
+afwikkel
+afwikkelde
+afwikkelden
+afwikkelen
+afwikkeling
+afwikkelt
+afwillit
+afwillite
+afwimpel
+afwimpelde
+afwimpelden
+afwimpelen
+afwimpeling
+afwimpelt
+afwin
+afwind
+afwinden
+afwindin
+afwinding
+afwindt
+afwinnen
+afwint
+afwip
+afwippen
+afwipt
+afwipte
+afwipten
+afwis
+afwissel
+afwisselde
+afwisselden
+afwisselen
+afwisselend
+afwisselende
+afwisselender
+afwisselendst
+afwisseling
+afwisselingen
+afwisselt
+afwissen
+afwist
+afwiste
+afwisten
+afwl
+afwl-vax
+afwoei
+afwoeien
+afwoel
+afwoelde
+afwoelden
+afwoelen
+afwoelt
+afwogen
+afwon
+afwond
+afwonden
+afwonen
+afwonnen
+afwoog
+afwoon
+afwoonde
+afwoonden
+afwoont
+afwreef
+afwreven
+afwrijf
+afwrijft
+afwrijve
+afwrijven
+afwrijvi
+afwrijving
+afwrijvingen
+afwrik
+afwrikke
+afwrikken
+afwrikt
+afwrikte
+afwrikten
+afwring
+afwringe
+afwringen
+afwringt
+afwrong
+afwronge
+afwrongen
+afyon
+afz
+afzaag
+afzaagde
+afzaagden
+afzaagt
+afzaan
+afzaande
+afzaanden
+afzaant
+afzaat
+afzabbel
+afzabbelde
+afzabbelden
+afzabbelen
+afzabbelt
+afzabber
+afzabberde
+afzabberden
+afzabberen
+afzabbert
+afzadel
+afzadeld
+afzadelde
+afzadelden
+afzadele
+afzadelen
+afzadelt
+afzag
+afzagen
+afzaging
+afzak
+afzakken
+afzakker
+afzakkertje
+afzakkertjes
+afzakkin
+afzakking
+afzakt
+afzakte
+afzakten
+afzal
+afzand
+afzandde
+afzandden
+afzanden
+afzander
+afzanderij
+afzanderijen
+afzandin
+afzanding
+afzandingen
+afzandt
+afzanen
+afzat
+afzaten
+afzeef
+afzeefde
+afzeefden
+afzeeft
+afzeeg
+afzeem
+afzeemde
+afzeemden
+afzeemt
+afzeep
+afzeept
+afzeepte
+afzeepten
+afzeg
+afzegde
+afzegden
+afzegen
+afzeggen
+afzeggin
+afzegging
+afzegt
+afzei
+afzeiden
+afzeil
+afzeilde
+afzeilden
+afzeilen
+afzeilt
+afzelia
+afzemen
+afzend
+afzenden
+afzender
+afzenders
+afzendin
+afzending
+afzendingen
+afzendst
+afzendster
+afzendsters
+afzendt
+afzeng
+afzengde
+afzengden
+afzengen
+afzengt
+afzepen
+afzet
+afzetbaa
+afzetbaar
+afzetbaarder
+afzetbaarheid
+afzetbaarst
+afzetbar
+afzetbare
+afzetgeb
+afzetgebied
+afzetgebieden
+afzetmar
+afzetmarkt
+afzetmarkten
+afzetnet
+afzetnetten
+afzetsel
+afzetsels
+afzetseltje
+afzetseltjes
+afzetste
+afzetster
+afzetsters
+afzette
+afzetten
+afzetter
+afzetterij
+afzetterijen
+afzetters
+afzettin
+afzetting
+afzettingen
+afzettingsgesteente
+afzettingsgesteenten
+afzettingsgesteentes
+afzeul
+afzeulde
+afzeulden
+afzeulen
+afzeult
+afzeven
+afzicht
+afzichte
+afzichtelijk
+afzichtelijke
+afzichtelijker
+afzichtelijkheden
+afzichtelijkheid
+afzichtelijkst
+afzichten
+afzichtt
+afzichtte
+afzichtten
+afzie
+afzien
+afzienba
+afzienbaar
+afzienbaarder
+afzienbaarst
+afzienbare
+afziet
+afzift
+afziften
+afziftte
+afziftten
+afzijdig
+afzijdigheid
+afzijg
+afzijgen
+afzijgt
+afzijn
+afzink
+afzinken
+afzinkt
+afzit
+afzitten
+afzocht
+afzochte
+afzochten
+afzoden
+afzoek
+afzoeken
+afzoekt
+afzoen
+afzoende
+afzoenden
+afzoenen
+afzoent
+afzogen
+afzomen
+afzond
+afzonden
+afzonder
+afzonderde
+afzonderden
+afzonderen
+afzondering
+afzonderingsstal
+afzonderingsstallen
+afzonderlijk
+afzonderlijke
+afzonderlijker
+afzonderlijkst
+afzondert
+afzonk
+afzonken
+afzood
+afzoodde
+afzoodden
+afzoodt
+afzoog
+afzoom
+afzoomde
+afzoomden
+afzoomt
+afzoop
+afzopen
+afzout
+afzouten
+afzoutte
+afzoutten
+afzucht
+afzuchte
+afzuchten
+afzuchtt
+afzuchtte
+afzuchtten
+afzuig
+afzuigen
+afzuigin
+afzuiging
+afzuigt
+afzuip
+afzuipen
+afzuipt
+afzwaai
+afzwaaid
+afzwaaide
+afzwaaiden
+afzwaaie
+afzwaaien
+afzwaait
+afzwakke
+afzwakken
+afzweef
+afzweefd
+afzweefde
+afzweefden
+afzweeft
+afzweep
+afzweept
+afzweepte
+afzweepten
+afzweer
+afzweerd
+afzweerde
+afzweerden
+afzweerder
+afzweerders
+afzweert
+afzwem
+afzwemme
+afzwemmen
+afzwemt
+afzwenk
+afzwenke
+afzwenken
+afzwenkt
+afzwenkte
+afzwenkten
+afzwepen
+afzweren
+afzwerf
+afzwerft
+afzwerin
+afzwering
+afzweringen
+afzwerve
+afzwerven
+afzwervi
+afzwerving
+afzweven
+afzwier
+afzwierd
+afzwierde
+afzwierden
+afzwiere
+afzwieren
+afzwierf
+afzwiert
+afzwierv
+afzwierven
+afzwoeg
+afzwoegd
+afzwoegde
+afzwoegden
+afzwoege
+afzwoegen
+afzwoegt
+afzwoer
+afzwoere
+afzwoeren
+afzwom
+afzwomme
+afzwommen
+afzwoor
+afzworen
+ag
+aga
+aga`
+aga`loco
+aga`rico
+agaat
+agaatges
+agaatgesteente
+agaatkle
+agaatkleurig
+agaatkleurige
+agaatkleuriger
+agaatkleurigst
+agabachar
+agabanee
+agabus
+agac/a
+agac/aie
+agac/aient
+agac/ais
+agac/ait
+agac/ant
+agac/ante
+agac/antes
+agac/ants
+agac/ons
+agacante
+agace
+agace'
+agace'e
+agace'es
+agace's
+agace`
+agace`re
+agace`rent
+agacella
+agacemen
+agacement
+agacent
+agacer
+agacera
+agacerai
+agaceraient
+agacerais
+agacerait
+agaceras
+agacerez
+agacerie
+agaceries
+agaceriez
+agacerio
+agacerions
+agaceron
+agacerons
+agaceront
+agaces
+agacez
+agachadera
+agachadiza
+agachaparse
+agachar
+agachona
+agaciez
+agacions
+agade
+agadem
+agadez
+agadi
+agadir
+agado`n
+agafar
+agag
+agagite
+agaho
+agaielap
+agaielapai
+again
+againily
+against
+againsta
+againstand
+agajani
+agaki
+agal
+agala
+agalacti
+agalactia
+agalactic
+agalacto
+agalactous
+agalawoo
+agalawood
+agalaxia
+agalaxy
+agalbanada
+agalbanado
+agalega
+agalena
+agalenid
+agalenidae
+agalerar
+agalinis
+agalite
+agalla
+agallada
+agallado
+agalladura
+agallegada
+agallegado
+agallo
+agallo`n
+agalloch
+agallochium
+agallochum
+agallonada
+agallonado
+agallop
+agalluda
+agalludo
+agalluela
+agalma
+agalmato
+agalmatolite
+agalwood
+agam
+agama
+agamae
+agamas
+agame
+agamemno
+agamemnon
+agamete
+agami
+agami's
+agamian
+agamic
+agamical
+agamically
+agamid
+agamidae
+agamie
+agamist
+agamitar
+agamobiu
+agamobium
+agamogen
+agamogenesis
+agamogenetic
+agamogenetically
+agamogon
+agamogony
+agamoid
+agamont
+agamoru
+agamospo
+agamospore
+agamous
+agamuzada
+agamuzado
+agamy
+agana
+aganar
+agande
+aganglio
+aganglionic
+agangrenarse
+aganice
+aganipea
+aganipeo
+aganippe
+agano
+aganogaw
+agao
+agaoka
+agaonida
+agaonidae
+agapae
+agapanth
+agapanthus
+agape
+agapeic
+agapemon
+agapemone
+agapemonian
+agapemonist
+agapemonite
+agapen
+agapes
+agapetae
+agapeti
+agapetid
+agapetidae
+agapi
+agaporni
+agapornis
+agar
+agarabatada
+agarabatado
+agarabe
+agarabi
+agaraiwa
+agarbada
+agarbado
+agarbanzada
+agarbanzado
+agarbanzar
+agarbarse
+agarbillar
+agard
+agardamarse
+agardy
+agare
+agarena
+agareno
+agari
+agaric
+agaricac
+agaricaceae
+agaricaceous
+agarical
+agaricales
+agaricic
+agaricif
+agariciform
+agaricin
+agaricine
+agaricoi
+agaricoid
+agarics
+agaricus
+agariguc
+agarigut
+agariko
+agarimic
+agarimit
+agarisag
+agaristi
+agaristidae
+agarita
+agaritaa
+agariya
+agariyu
+agarnamn
+agarnamnen
+agarnas
+agarrada
+agarradero
+agarrado
+agarrador
+agarradora
+agarrafador
+agarrafadora
+agarrafar
+agarrama
+agarrante
+agarrar
+agarro
+agarro`n
+agarrochador
+agarrochar
+agarrochear
+agarrotar
+agarrotear
+agars
+agarskap
+agaru
+agarum
+agarwal
+agasajable
+agasajador
+agasajadora
+agasajar
+agasajo
+agasajosa
+agasajoso
+agasandy
+agasandyan
+agasp
+agassiz
+agast
+agastach
+agastache
+agastrea
+agastreae
+agastric
+agastron
+agastroneuria
+agat
+agata
+agate
+agaten
+agates
+agatewar
+agateware
+agatha
+agathaea
+agathaum
+agathaumas
+agathe
+agathin
+agathis
+agathism
+agathist
+agathoda
+agathodaemon
+agathodaemonic
+agathoka
+agathokakological
+agatholo
+agathology
+agathon
+agathosm
+agathosma
+agatifer
+agatiferous
+agatifor
+agatiform
+agatina
+agatine
+agatino
+agatizarse
+agatize
+agato
+agatoid
+agats
+agatsu
+agatsuma
+agatu
+agatuma
+agatumak
+agaty
+agau
+agauja
+agauss
+agavanza
+agavanzo
+agave
+agave'
+agave's
+agaven
+agaves
+agavillador
+agavilladora
+agavillar
+agavose
+agavotag
+agavotaguerra
+agavotok
+agavotokueng
+agaw
+agawa
+agawam
+agawasaw
+agawayas
+agay
+agaz
+agazapar
+agaze
+agazed
+agb
+agba
+agbaragb
+agbaragba
+agbarho
+agbawi
+agbayani
+agbeschr
+agbeschriebene
+agbiri
+agbo
+agbodome
+agbokum
+agbor
+agboro
+agbotand
+agbotandu
+agbovill
+agboville
+agc
+agd
+agder
+agders
+agdistis
+age
+age`rato
+ageabura
+ageadjus
+ageadjusted
+agean
+ageashi
+ageasi
+ageba
+agebuta
+aged
+agedepen
+agedependent
+agedly
+agedness
+agee
+ageer
+ageerde
+ageerden
+ageert
+ageing
+ageings
+ageir
+ageism
+ageist
+ageists
+ageita
+ageku
+agelacri
+agelacrinites
+agelacrinitidae
+agelaius
+agelaus
+ageless
+agelessl
+agelessly
+agelessn
+agelessness
+agelia
+agelong
+agel|yse
+agemaki
+agemaku
+agematsu
+agematu
+agemono
+agen
+agena
+agenc/a
+agenc/ai
+agenc/aient
+agenc/ais
+agenc/ait
+agenc/an
+agenc/ant
+agenc/on
+agenc/ons
+agence
+agence'
+agence'e
+agence'es
+agence's
+agence`r
+agence`rent
+agenceme
+agencement
+agencements
+agencent
+agencer
+agencera
+agencerai
+agenceraient
+agencerais
+agencerait
+agenceras
+agencere
+agencerez
+agenceri
+agenceriez
+agencerions
+agencero
+agencerons
+agenceront
+agences
+agencez
+agencia
+agenciar
+agencies
+agenciez
+agencion
+agencions
+agenciosa
+agencioso
+agency
+agenda
+agenda's
+agendaat
+agendaatje
+agendaatjes
+agendapu
+agendapunt
+agendapunten
+agendas
+agende
+agendeer
+agendeerde
+agendeerden
+agendeert
+agendere
+agenderen
+agendum
+agendums
+agenesia
+agenesic
+agenesis
+agenia
+agenneti
+agennetic
+agenor
+agenore
+agenouil
+agenouilla
+agenouillaient
+agenouillais
+agenouillait
+agenouillant
+agenouille
+agenouille'
+agenouille'e
+agenouille'es
+agenouille's
+agenouille`rent
+agenouillement
+agenouillent
+agenouiller
+agenouillera
+agenouillerai
+agenouilleraient
+agenouillerais
+agenouillerait
+agenouilleras
+agenouillerez
+agenouilleriez
+agenouillerions
+agenouillerons
+agenouilleront
+agenouilles
+agenouillez
+agenouilliez
+agenouillions
+agenouillons
+agens
+agensoe
+agent
+agente
+agenten
+agentena
+agentenabwehr
+agentenaustausch
+agentene
+agentenf
+agentenfilme
+agentenfluitje
+agentenfluitjes
+agentenj
+agentenjagd
+agentenl
+agentenliste
+agentenn
+agentennetz
+agenteno
+agentenorganisationen
+agentenr
+agentenringes
+agentens
+agentenstories
+agentent
+agententaetigkeit
+agenter
+agenterne
+agentes
+agentess
+agentessen
+agentgeneral
+agenti
+agentia
+agential
+agentin
+agentinn
+agentinnen
+agentiva
+agentival
+agentive
+agentry
+agents
+agentsch
+agentschap
+agentschappen
+agentshi
+agentship
+agentur
+agenture
+agenturen
+agenturene
+agenturet
+agenturf
+agenturfirma
+agenturforretning
+agenturm
+agenturmeldung
+agenturmeldungenen
+agenturv
+agenturvirksomhet
+agentuur
+agenzia
+agenzie
+ageo
+ageofons
+ageofonset
+ageold
+ageometr
+ageometrical
+ageorosh
+ageorosi
+ageoshi
+ageosi
+ageparit
+ageparityspecific
+ager
+agera
+agerasia
+ageratum
+ageratums
+agerbrug
+agere
+ageren
+agerlep
+agerloo
+agermanarse
+agers
+agert
+agerte
+ages
+ages/bro
+ages/brookside
+agesage
+ageselec
+ageselectivity
+ageshio
+agesio
+agespeci
+agespecific
+agestada
+agestado
+agestarse
+ageste
+agestio`n
+agestruc
+agestructured
+agete
+agetsura
+agetura
+ageusia
+ageusic
+ageustia
+agevole
+agevoli
+agewmidi
+agewmidir
+agezoko
+agf
+agfa
+agg
+aggancer
+aggancera
+aggancerai
+aggancerei
+aggancero
+agganci
+aggancia
+agganciai
+agganciamo
+agganciano
+agganciare
+agganciata
+agganciate
+agganciati
+agganciato
+agganciava
+agganciavi
+agganciavo
+aggancin
+aggancino
+aggancio
+aggarwal
+aggeggi
+agger
+aggerate
+aggerati
+aggeration
+aggerose
+agget
+aggettiv
+aggettivi
+aggettivo
+agghiacc
+agghiacci
+agghiaccia
+agghiaccio
+aggi
+aggie
+aggies
+aggioga
+aggiogai
+aggiogam
+aggiogammo
+aggiogan
+aggiogando
+aggiogano
+aggiogar
+aggiogare
+aggiogas
+aggiogasse
+aggiogassi
+aggiogaste
+aggiogasti
+aggiogat
+aggiogata
+aggiogate
+aggiogati
+aggiogato
+aggiogav
+aggiogava
+aggiogavi
+aggiogavo
+aggioghe
+aggioghera
+aggioghero
+aggioghi
+aggioghino
+aggiogo
+aggiorna
+aggiornai
+aggiornamenti
+aggiornamento
+aggiornano
+aggiornare
+aggiornata
+aggiornate
+aggiornati
+aggiornato
+aggiornava
+aggiornavi
+aggiornavo
+aggiorne
+aggiornera
+aggiornero
+aggiorni
+aggiornino
+aggiorno
+aggira
+aggirai
+aggiramm
+aggirammo
+aggirand
+aggirando
+aggirano
+aggirare
+aggiraro
+aggirarono
+aggirass
+aggirasse
+aggirassi
+aggirast
+aggiraste
+aggirasti
+aggirata
+aggirate
+aggirati
+aggirato
+aggirava
+aggiravamo
+aggiravano
+aggiravate
+aggiravi
+aggiravo
+aggirera
+aggirerai
+aggirere
+aggirerei
+aggireremo
+aggirerete
+aggirero
+aggiri
+aggiriam
+aggiriamo
+aggiriat
+aggiriate
+aggirino
+aggiro
+aggiudic
+aggiudica
+aggiudicai
+aggiudichi
+aggiudico
+aggiunge
+aggiungendo
+aggiungere
+aggiungero'
+aggiunse
+aggiunta
+aggiunte
+aggiunti
+aggiuntive
+aggiuntivi
+aggiunto
+aggiusta
+aggiustai
+aggiustano
+aggiustare
+aggiustata
+aggiustate
+aggiustati
+aggiustato
+aggiustava
+aggiustavi
+aggiustavo
+aggiuste
+aggiustera
+aggiustero
+aggiusti
+aggiustino
+aggiusto
+agglome'
+agglome'ra
+agglome'raient
+agglome'rais
+agglome'rait
+agglome'rant
+agglome'rants
+agglome'rat
+agglome'ration
+agglome'rations
+agglome'rats
+agglome're'
+agglome're'e
+agglome're'es
+agglome're's
+agglome're`rent
+agglome'rer
+agglome'rera
+agglome'rerai
+agglome'reraient
+agglome'rerais
+agglome'rerait
+agglome'reras
+agglome'rerez
+agglome'reriez
+agglome'rerions
+agglome'rerons
+agglome'reront
+agglome'rez
+agglome'riez
+agglome'rions
+agglome'rons
+agglome`
+agglome`re
+agglome`rent
+agglome`res
+agglomer
+agglomeraat
+agglomerant
+agglomerate
+agglomerated
+agglomeraten
+agglomerates
+agglomeratic
+agglomeratie
+agglomeraties
+agglomerating
+agglomeration
+agglomerations
+agglomerative
+agglomerator
+agglutin
+agglutina
+agglutinability
+agglutinable
+agglutinaient
+agglutinais
+agglutinait
+agglutinant
+agglutinate
+agglutinated
+agglutinates
+agglutinatie
+agglutinaties
+agglutinating
+agglutination
+agglutinationist
+agglutinations
+agglutinative
+agglutinatively
+agglutinator
+agglutine
+agglutine'
+agglutine'e
+agglutine'es
+agglutine's
+agglutine`rent
+agglutineer
+agglutineerde
+agglutineerden
+agglutineert
+agglutinent
+agglutiner
+agglutinera
+agglutinerai
+agglutineraient
+agglutinerais
+agglutinerait
+agglutineras
+agglutineren
+agglutinerez
+agglutineriez
+agglutinerions
+agglutinerons
+agglutineront
+agglutines
+agglutinez
+agglutiniez
+agglutinin
+agglutinins
+agglutinions
+agglutinize
+agglutinogen
+agglutinogenic
+agglutinoid
+agglutinons
+agglutinoscope
+agglutog
+agglutogenic
+aggradat
+aggradation
+aggradational
+aggrade
+aggrandi
+aggrandizable
+aggrandize
+aggrandized
+aggrandizement
+aggrandizements
+aggrandizer
+aggrandizers
+aggrandizes
+aggrandizing
+aggrappa
+aggrappai
+aggrappano
+aggrappare
+aggrappata
+aggrappate
+aggrappati
+aggrappato
+aggrappava
+aggrappavi
+aggrappavo
+aggrappe
+aggrappera
+aggrappero
+aggrappi
+aggrappino
+aggrappo
+aggrate
+aggrava
+aggravab
+aggravable
+aggravai
+aggravaient
+aggravais
+aggravait
+aggravam
+aggravammo
+aggravan
+aggravando
+aggravano
+aggravant
+aggravante
+aggravantes
+aggravants
+aggravar
+aggravare
+aggravas
+aggravasse
+aggravassi
+aggravaste
+aggravasti
+aggravat
+aggravata
+aggravate
+aggravated
+aggravates
+aggravati
+aggravating
+aggravatingly
+aggravation
+aggravations
+aggravative
+aggravato
+aggravator
+aggravav
+aggravava
+aggravavi
+aggravavo
+aggrave
+aggrave'
+aggrave'e
+aggrave'es
+aggrave's
+aggrave`
+aggrave`rent
+aggraven
+aggravent
+aggraver
+aggravera
+aggraverai
+aggraveraient
+aggraverais
+aggraverait
+aggraveras
+aggraverei
+aggraverez
+aggraveriez
+aggraverions
+aggravero
+aggraverons
+aggraveront
+aggraves
+aggravez
+aggravi
+aggravia
+aggraviamo
+aggraviate
+aggravie
+aggraviez
+aggravin
+aggravino
+aggravio
+aggravions
+aggravo
+aggravon
+aggravons
+aggrazia
+aggraziata
+aggraziate
+aggraziati
+aggraziato
+aggregaa
+aggregaat
+aggregab
+aggregable
+aggregan
+aggregant
+aggregat
+aggregata
+aggregatae
+aggregate
+aggregated
+aggregately
+aggregaten
+aggregateness
+aggregater
+aggregates
+aggregatet
+aggregatfunktion
+aggregatfunktionen
+aggregatfunktioner
+aggregatfunktionerne
+aggregatie
+aggregatietoestand
+aggregatietoestanden
+aggregating
+aggregation
+aggregational
+aggregations
+aggregative
+aggregator
+aggregatory
+aggregatszustaende
+aggregatzuestaenden
+aggregatzustand
+aggregatzustandes
+aggregee
+aggregeer
+aggregeerde
+aggregeerden
+aggregeert
+aggreger
+aggregeren
+aggresiv
+aggresjo
+aggresjon
+aggresjonen
+aggresjoner
+aggresjonsinstinkter
+aggresjonspolitikk
+aggress
+aggresse
+aggressed
+aggresses
+aggressi
+aggressin
+aggressing
+aggression
+aggressionist
+aggressions
+aggressionskontrolle
+aggressionspolitik
+aggressionstrieb
+aggressiv
+aggressive
+aggressively
+aggressivem
+aggressiveness
+aggressiver
+aggressivere
+aggressiverem
+aggressiverer
+aggressiveres
+aggressives
+aggressivitet
+aggressivstem
+aggressivsten
+aggressivster
+aggressivt
+aggresso
+aggressor
+aggressore
+aggressoren
+aggressori
+aggressors
+aggresssoren
+aggrieva
+aggrievance
+aggrieve
+aggrieved
+aggrievedly
+aggrievedness
+aggrievement
+aggrieves
+aggrievi
+aggrieving
+aggroup
+aggroupm
+aggroupment
+aggruppa
+aggruppai
+aggruppano
+aggruppare
+aggruppata
+aggruppate
+aggruppati
+aggruppato
+aggruppava
+aggruppavi
+aggruppavo
+aggruppe
+aggruppera
+aggruppero
+aggruppi
+aggruppino
+aggruppo
+aggry
+agguati
+agguato
+aggur
+aggy
+agh
+agha
+aghan
+aghanee
+agharia
+aghas
+aghast
+aghastne
+aghastness
+aghem
+aghi
+aghili
+aghlabit
+aghlabite
+aghorapa
+aghorapanthi
+aghori
+aghu
+aghul
+aghulshu
+aghulshuy
+aghumsa
+agi
+agi`libus
+agialid
+agiata
+agiate
+agiatezz
+agiatezza
+agiatezze
+agiati
+agiato
+agib
+agiba
+agibi`libus
+agible
+agiel
+agiere
+agieren
+agierend
+agierendem
+agierenden
+agierender
+agierst
+agiert
+agierte
+agierten
+agierter
+agiertes
+agiertet
+agigantada
+agigantado
+agigantar
+agigotar
+agil
+agilawoo
+agilawood
+agile
+agilely
+agilen
+agilenes
+agileness
+agiler
+agiles
+agili
+agilidad
+agilitar
+agilite'
+agilitie
+agilities
+agility
+agilizar
+agillawo
+agillawood
+agily
+agim
+agin
+aging
+agings
+agio
+agios
+agiota
+agiotador
+agiotage
+agiotaie
+agiotaient
+agiotais
+agiotait
+agiotaje
+agiotant
+agiote
+agiote'
+agiote`r
+agiote`rent
+agioteer
+agioteerde
+agioteerden
+agioteert
+agiotent
+agioter
+agiotera
+agioterai
+agioteraient
+agioterais
+agioterait
+agioteras
+agiotere
+agioteren
+agioterez
+agioteri
+agioteriez
+agioterions
+agiotero
+agioterons
+agioteront
+agiotes
+agioteur
+agioteurs
+agiotez
+agiotiez
+agiotion
+agiotions
+agiotista
+agiotons
+agir
+agira
+agirai
+agiraien
+agiraient
+agirais
+agirait
+agiras
+agire
+agirent
+agirez
+agiriez
+agirions
+agirons
+agiront
+agiryama
+agis
+agisa
+agisayur
+agisca
+agiscono
+agissaie
+agissaient
+agissais
+agissait
+agissant
+agissante
+agissantes
+agissants
+agisse
+agisseme
+agissements
+agissent
+agisses
+agissez
+agissiez
+agission
+agissions
+agissons
+agist
+agistato
+agistator
+agistmen
+agistment
+agistor
+agists
+agit
+agita
+agitable
+agitacio`n
+agitador
+agitadora
+agitai
+agitaien
+agitaient
+agitais
+agitait
+agitammo
+agitanada
+agitanado
+agitando
+agitano
+agitant
+agitante
+agitar
+agitare
+agitaron
+agitarono
+agitasjo
+agitasjon
+agitasjonen
+agitasjonskomiteene
+agitasse
+agitassero
+agitassi
+agitassimo
+agitaste
+agitasti
+agitata
+agitate
+agitated
+agitatedly
+agitates
+agitateu
+agitateur
+agitateurs
+agitati
+agitatie
+agitaties
+agitatin
+agitating
+agitatio
+agitation
+agitational
+agitationen
+agitationist
+agitations
+agitationskampagne
+agitationsmaterial
+agitativ
+agitative
+agitato
+agitator
+agitatoren
+agitatorial
+agitatorisch
+agitatorische
+agitatorischem
+agitatorischen
+agitatorischer
+agitatorisches
+agitatorischt
+agitators
+agitatri
+agitatrix
+agitava
+agitavam
+agitavamo
+agitavan
+agitavano
+agitavat
+agitavate
+agitavi
+agitavo
+agitazio
+agitazione
+agitazioni
+agite
+agite'
+agite'e
+agite'es
+agite's
+agite`re
+agite`rent
+agiteer
+agiteerd
+agiteerde
+agiteerden
+agiteert
+agitent
+agiter
+agitera
+agiterai
+agiteraient
+agiterais
+agiterait
+agiteran
+agiteranno
+agiteras
+agitere
+agitereb
+agiterebbe
+agiterei
+agiterem
+agiteremmo
+agiteremo
+agiteren
+agiteres
+agitereste
+agiteresti
+agiteret
+agiterete
+agiterez
+agiterie
+agiteriez
+agiterio
+agiterions
+agitero
+agiteron
+agiterons
+agiteront
+agitert
+agites
+agitez
+agiti
+agitiamo
+agitiate
+agitiere
+agitieren
+agitiert
+agitiez
+agitino
+agitions
+agito
+agitons
+agitprop
+agitprops
+agius
+agiyan
+agj
+agk
+agkistro
+agkistrodon
+agl
+agla
+aglaia
+aglaja
+aglance
+aglaonem
+aglaonema
+aglaos
+aglaozon
+aglaozonia
+aglare
+aglaspis
+aglauros
+aglayarse
+aglayo
+agleaf
+agleam
+aglee
+aglega
+aglet
+aglethea
+aglethead
+aglets
+agley
+agli
+aglimmer
+aglint
+aglio
+aglipaya
+aglipayan
+aglipayano
+aglitter
+aglobuli
+aglobulia
+aglomeracio`n
+aglomerada
+aglomerado
+aglomerar
+aglossa
+aglossal
+aglossat
+aglossate
+aglossia
+aglow
+aglucon
+aglutinacio`n
+aglutinante
+aglutinar
+aglutiti
+aglutition
+aglycosu
+aglycosuric
+aglypha
+aglyphod
+aglyphodont
+aglyphodonta
+aglyphodontia
+aglyphou
+aglyphous
+agm
+agmatine
+agmatolo
+agmatology
+agminate
+agminated
+agn
+agna
+agnacio`n
+agnada
+agnado
+agnagan
+agnail
+agname
+agnamed
+agnang
+agnano
+agnano-m
+agnano-mil-tac
+agnar
+agnastisk
+agnate
+agnatha
+agnathia
+agnathic
+agnathos
+agnathostomata
+agnathostomatous
+agnathou
+agnathous
+agnatic
+agnatica
+agnatically
+agnaticia
+agnaticio
+agnation
+agnatisk
+agneau
+agneaux
+agnel
+agneler
+agnella
+agnelli
+agnello
+agnes
+agnese
+agness
+agnesse
+agnet
+agneta
+agnew
+agni
+agnia
+agnicio`n
+agnieska
+agnieszk
+agnieszka
+agnifica
+agnification
+agnihotr
+agnihotri
+agnition
+agnize
+agnizing
+agno`stica
+agno`stico
+agnocasto
+agnoetae
+agnoete
+agnoetis
+agnoetism
+agnoiolo
+agnoiology
+agnoite
+agnola
+agnoll
+agnombre
+agnomen
+agnomento
+agnomica
+agnomical
+agnomina
+agnominacio`n
+agnominal
+agnomination
+agnosia
+agnosis
+agnostic
+agnostically
+agnostici
+agnosticism
+agnosticisme
+agnosticismo
+agnostics
+agnosticus
+agnostik
+agnostiker
+agnostis
+agnostisk
+agnostus
+agnosy
+agnotozo
+agnotozoic
+agnus
+agnus-de
+agnus-dei
+agnus-dei's
+agnusde`i
+ago
+ago`nica
+ago`nico
+agob
+agobiada
+agobiado
+agobiante
+agobiar
+agobio
+agog
+agoge
+agogi`a
+agogic
+agogics
+agoho
+agoi
+agoing
+agolar
+agolletar
+agolok
+agolpamiento
+agolpar
+agoma
+agomensi
+agomensin
+agomerar
+agomes
+agomphia
+agomphiasis
+agomphio
+agomphious
+agomphos
+agomphosis
+agon
+agona
+agonal
+agone
+agoni
+agoni`a
+agoni`stica
+agoni`stico
+agonia
+agoniada
+agoniadi
+agoniadin
+agoniati
+agoniatite
+agoniatites
+agonic
+agonie
+agonied
+agonies
+agoniosa
+agonioso
+agonir
+agonisa
+agonisai
+agonisaient
+agonisais
+agonisait
+agonisan
+agonisant
+agonisante
+agonisantes
+agonisants
+agonise
+agonise'
+agonise`
+agonise`rent
+agonised
+agonisen
+agonisent
+agoniser
+agonisera
+agoniserai
+agoniseraient
+agoniserais
+agoniserait
+agoniseras
+agoniserez
+agoniseriez
+agoniserions
+agoniserons
+agoniseront
+agonises
+agonisez
+agonisie
+agonisiez
+agonisio
+agonisions
+agonism
+agonison
+agonisons
+agonist
+agonista
+agonistarch
+agonisti
+agonistic
+agonistically
+agonistics
+agonists
+agonium
+agonizante
+agonizar
+agonize
+agonized
+agonizedly
+agonizer
+agonizes
+agonizin
+agonizing
+agonizingly
+agonizza
+agonizzai
+agonizzano
+agonizzare
+agonizzata
+agonizzate
+agonizzati
+agonizzato
+agonizzava
+agonizzavi
+agonizzavo
+agonizze
+agonizzera
+agonizzero
+agonizzi
+agonizzino
+agonizzo
+agonosto
+agonostomus
+agonothe
+agonothete
+agonothetic
+agons
+agony
+agora
+agorador
+agoradora
+agorae
+agorafobia
+agoranom
+agoranome
+agorapho
+agoraphobia
+agoraphobic
+agorar
+agoras
+agorera
+agoreri`a
+agorero
+agorgojarse
+agoria
+agorot
+agosa
+agoso
+agostada
+agostade
+agostadero
+agostado
+agostador
+agostamiento
+agostar
+agoste\a
+agoste\o
+agostera
+agostero
+agosti
+agosti`a
+agostina
+agostini
+agostino
+agostiza
+agostizo
+agosto
+agotable
+agotador
+agotadora
+agotamiento
+agotar
+agote
+agou
+agouara
+agouisir
+agouisiri
+agourahi
+agourahills
+agouta
+agouti
+agouties
+agoutis
+agouty
+agovi`a
+agozcada
+agozcado
+agp
+agpaite
+agpaitic
+agq
+agr
+agra
+agrace\a
+agrace\o
+agracejina
+agracejo
+agracera
+agracero
+agraciada
+agraciadamenta
+agraciado
+agraciar
+agracillo
+agradabili`sima
+agradabili`simo
+agradable
+agradablemente
+agradador
+agradadora
+agradamiento
+agradar
+agradecer
+agradecida
+agradecidamente
+agradecido
+agradecimiento
+agrado
+agrafa
+agrafaie
+agrafaient
+agrafais
+agrafait
+agrafant
+agrafe
+agrafe'
+agrafe'e
+agrafe'es
+agrafe's
+agrafe`r
+agrafe`rent
+agrafen
+agrafent
+agrafer
+agrafera
+agraferai
+agraferaient
+agraferais
+agraferait
+agraferas
+agrafere
+agraferez
+agraferi
+agraferiez
+agraferions
+agrafero
+agraferons
+agraferont
+agrafes
+agrafeus
+agrafeuse
+agrafeuses
+agrafez
+agraffee
+agrafia
+agrafiez
+agrafion
+agrafions
+agrafons
+agrah
+agrainer
+agraire
+agraires
+agrajes
+agral
+agramada
+agramadera
+agramado
+agramador
+agramadora
+agramante
+agramar
+agrame
+agramente
+agramilar
+agramiza
+agrammat
+agrammatical
+agrammatism
+agramonte`s
+agramontesa
+agrandar
+agrandi
+agrandie
+agrandies
+agrandir
+agrandira
+agrandirai
+agrandiraient
+agrandirais
+agrandirait
+agrandiras
+agrandirent
+agrandirez
+agrandiriez
+agrandirions
+agrandirons
+agrandiront
+agrandis
+agrandissaient
+agrandissais
+agrandissait
+agrandissant
+agrandisse
+agrandissement
+agrandissements
+agrandissent
+agrandisses
+agrandisseur
+agrandisseurs
+agrandissez
+agrandissiez
+agrandissions
+agrandissons
+agrandit
+agrania
+agranujada
+agranujado
+agranulo
+agranulocyte
+agranulocytosis
+agranuloplastic
+agrapha
+agraphia
+agraphic
+agraphie
+agrar
+agraraus
+agrarausfuhren
+agrarche
+agrarchemikalien
+agraren
+agrarerz
+agrarerzeugnisse
+agrarerzeugung
+agrarexp
+agrarexperten
+agrarexporte
+agrarfin
+agrarfinanzfragen
+agrarfinanzierungspolitik
+agrarfinanzverordnung
+agrarfon
+agrarfonds
+agrarfun
+agrarfunktionaeren
+agrargeb
+agrargebiet
+agrargebieten
+agrarges
+agrargesellschaft
+agrarhau
+agrarhaushalt
+agraria
+agrarian
+agrarianism
+agrarianize
+agrarianly
+agrarians
+agrarier
+agrariers
+agrarimp
+agrarimporte
+agrario
+agrarisc
+agrarisch
+agrarische
+agrarischer
+agrarischt
+agrarismo
+agrarkon
+agrarkonferenz
+agrarlan
+agrarland
+agrarmar
+agrarmarkt
+agrarmarktordnung
+agrarpar
+agrarpartei
+agrarparteiler
+agrarparteilerum
+agrarpol
+agrarpolitik
+agrarpre
+agrarpreisregelungen
+agrarpro
+agrarprodukten
+agrarref
+agrarreform
+agrarsek
+agrarsektor
+agrarsta
+agrarstaat
+agrarstaates
+agrarstr
+agrarstruktur
+agrarwir
+agrarwirtschaft
+agrauleu
+agrauleum
+agravacio`n
+agravador
+agravadora
+agravamento
+agravamiento
+agravante
+agravantemente
+agravar
+agravatoria
+agravatorio
+agravecer
+agraviada
+agraviadamente
+agraviado
+agraviador
+agraviadora
+agraviamiento
+agraviante
+agraviar
+agravio
+agraviosa
+agravioso
+agraz
+agrazada
+agrazar
+agrazo`n
+agre
+agre'a
+agre'abl
+agre'able
+agre'ablement
+agre'ables
+agre'aie
+agre'aient
+agre'ais
+agre'ait
+agre'ant
+agre'e
+agre'e'
+agre'e'e
+agre'e'es
+agre'e's
+agre'e`r
+agre'e`rent
+agre'ent
+agre'er
+agre'era
+agre'erai
+agre'eraient
+agre'erais
+agre'erait
+agre'eras
+agre'ere
+agre'erez
+agre'eri
+agre'eriez
+agre'erions
+agre'ero
+agre'erons
+agre'eront
+agre'es
+agre'ez
+agre'gat
+agre'gation
+agre'gats
+agre'ge'
+agre'ge'e
+agre'ge'es
+agre'ge's
+agre'ge`
+agre'ge`rent
+agre'gea
+agre'geaient
+agre'geais
+agre'geait
+agre'geant
+agre'geo
+agre'geons
+agre'ger
+agre'gera
+agre'gerai
+agre'geraient
+agre'gerais
+agre'gerait
+agre'geras
+agre'gerez
+agre'geriez
+agre'gerions
+agre'gerons
+agre'geront
+agre'gez
+agre'gie
+agre'giez
+agre'gio
+agre'gions
+agre'iez
+agre'ion
+agre'ions
+agre'men
+agre'ment
+agre'menta
+agre'mentaient
+agre'mentais
+agre'mentait
+agre'mentant
+agre'mente
+agre'mente'
+agre'mente'e
+agre'mente'es
+agre'mente's
+agre'mente`rent
+agre'mentent
+agre'menter
+agre'mentera
+agre'menterai
+agre'menteraient
+agre'menterais
+agre'menterait
+agre'menteras
+agre'menterez
+agre'menteriez
+agre'menterions
+agre'menterons
+agre'menteront
+agre'mentes
+agre'mentez
+agre'mentiez
+agre'mentions
+agre'mentons
+agre'ments
+agre'ons
+agre`ge
+agre`gen
+agre`gent
+agre`ges
+agre`s
+agrearse
+agrecillo
+agredida
+agredido
+agredir
+agree
+agreeabi
+agreeability
+agreeabl
+agreeable
+agreeableness
+agreeably
+agreed
+agreedup
+agreedupon
+agreeing
+agreeingly
+agreemen
+agreement
+agreements
+agreer
+agreers
+agrees
+agreeth
+agregacio`n
+agregada
+agregado
+agregar
+agregati
+agregation
+agregativa
+agregativo
+agrege
+agrema`n
+agremente
+agremiacio`n
+agremiar
+agren
+agreneno
+agrenenov
+agresio`n
+agresiva
+agresivamente
+agresividad
+agresivo
+agresor
+agresora
+agressa
+agressai
+agressaient
+agressais
+agressait
+agressan
+agressant
+agresse
+agresse'
+agresse'e
+agresse'es
+agresse's
+agresse`
+agresse`rent
+agressen
+agressent
+agresser
+agressera
+agresserai
+agresseraient
+agresserais
+agresserait
+agresseras
+agresserez
+agresseriez
+agresserions
+agresserons
+agresseront
+agresses
+agresseu
+agresseur
+agresseurs
+agressez
+agressie
+agressief
+agressiefst
+agressiepact
+agressiepacten
+agressies
+agressieve
+agressiever
+agressiez
+agressif
+agressifs
+agressio
+agression
+agressionen
+agressions
+agressionshemmend
+agressiv
+agressive
+agressives
+agressivitaet
+agressivite'
+agresson
+agressons
+agrestal
+agreste
+agrestes
+agresti
+agrestia
+agrestial
+agrestian
+agrestic
+agrestis
+agreta
+agrete
+agretha
+agreza
+agri
+agri`cola
+agria
+agriamente
+agriar
+agribusi
+agribusiness
+agribusinesses
+agric
+agricere
+agricola
+agricole
+agricoles
+agricoli
+agricolist
+agricolite
+agricolo
+agricolous
+agricult
+agriculteur
+agriculteurs
+agricultor
+agricultora
+agricultrice
+agricultrices
+agricultura
+agricultural
+agriculturalalists
+agriculturalist
+agriculturalists
+agriculturally
+agriculture
+agriculturer
+agricultures
+agriculturist
+agriculturists
+agridulce
+agridulcemente
+agrietamiento
+agrietar
+agrifada
+agriffer
+agrifolio
+agrihan
+agrija
+agrilla
+agrillarse
+agrilus
+agrimensor
+agrimensura
+agrimo\a
+agrimoni
+agrimonia
+agrimony
+agrimoto
+agrimotor
+agrin
+agrio
+agrio`n
+agriocho
+agriochoeridae
+agriochoerus
+agriolog
+agriological
+agriologist
+agriology
+agrionia
+agrionid
+agrionidae
+agriotes
+agriotyp
+agriotypidae
+agriotypus
+agripalma
+agrippa
+agrippai
+agrippaient
+agrippais
+agrippait
+agrippan
+agrippant
+agrippe
+agrippe'
+agrippe'e
+agrippe'es
+agrippe's
+agrippe`
+agrippe`rent
+agrippen
+agrippent
+agripper
+agrippera
+agripperai
+agripperaient
+agripperais
+agripperait
+agripperas
+agripperez
+agripperiez
+agripperions
+agripperons
+agripperont
+agrippes
+agrippez
+agrippie
+agrippiez
+agrippin
+agrippina
+agrippio
+agrippions
+agrippon
+agrippons
+agrisada
+agrisado
+agrise
+agrisetada
+agrisetado
+agrito
+agro
+agro-ali
+agro-alimentaire
+agro-alimentaires
+agro`nomo
+agroan
+agrobase
+agrobased
+agrobiol
+agrobiologic
+agrobiological
+agrobiologically
+agrobiologist
+agrobiology
+agrogeol
+agrogeological
+agrogeologically
+agrogeology
+agroindu
+agroindustries
+agrolo`gica
+agrolo`gico
+agrologi
+agrologi`a
+agrologic
+agrological
+agrologically
+agrology
+agrom
+agromyza
+agromyzi
+agromyzid
+agromyzidae
+agrono`mica
+agrono`mico
+agronom
+agronome
+agronomen
+agronomer
+agronomes
+agronomi
+agronomi`a
+agronomial
+agronomic
+agronomical
+agronomics
+agronomie
+agronomies
+agronomique
+agronomiques
+agronomist
+agronomists
+agronomu
+agronomutdanning
+agronomy
+agronoom
+agroof
+agrope
+agropecuaria
+agropecuario
+agroproc
+agroprocessing
+agropyro
+agropyron
+agror
+agrostem
+agrostemma
+agroster
+agrosteral
+agrostis
+agrostog
+agrostographer
+agrostographic
+agrostographical
+agrostography
+agrostol
+agrostologic
+agrostological
+agrostologist
+agrostology
+agrotech
+agrotechny
+agrotis
+aground
+agruador
+agrufe
+agruif
+agrumar
+agrume
+agrumes
+agrumi
+agrupable
+agrupacio`n
+agrupador
+agrupadora
+agrupamiento
+agrupar
+agrura
+agry
+agrypnia
+agrypnot
+agrypnotic
+ags
+agsam
+agsun
+agt
+agta
+agtbasic
+agtede
+agter
+agterber
+agterberg
+agtig
+agtigt
+agu
+agua
+agua\o`n
+aguacal
+aguacatal
+aguacate
+aguacateca
+aguacateco
+aguacatillo
+aguacella
+aguacero
+aguacha
+aguachar
+aguacharnar
+aguachas
+aguachenta
+aguachento
+aguachinar
+aguachirle
+aguacibera
+aguacil
+aguada
+aguadera
+aguadero
+aguadija
+aguadill
+aguadilla
+aguado
+aguador
+aguadora
+aguaduchar
+aguaducho
+aguadulc
+aguadulce
+aguadura
+aguafiestas
+aguafuerte
+aguafuertista
+aguagoma
+aguagriera
+aguagriero
+aguaitacaima`n
+aguaitador
+aguaitadora
+aguaitamiento
+aguaitar
+aguajaque
+aguaje
+aguaji`
+aguajinosa
+aguajinoso
+aguajun
+agualind
+agualinda
+aguallevado
+aguamala
+aguamanil
+aguamanos
+aguamar
+aguamarina
+aguamelada
+aguamelado
+aguamiel
+aguanafa
+aguanal
+aguane`s
+aguanesa
+aguanga
+aguanieve
+aguanieves
+aguano
+aguanosa
+aguanosidad
+aguanoso
+aguantable
+aguantaderas
+aguantar
+aguante
+aguanu
+aguapie`
+aguar
+aguara`
+aguaraiba`
+aguardada
+aguardadero
+aguardador
+aguardadora
+aguardamiento
+aguardar
+aguardentera
+aguardenteri`a
+aguardentero
+aguardentosa
+aguardentoso
+aguardie
+aguardiente
+aguardillada
+aguardillado
+aguardo
+aguaribay
+aguarico
+aguarra`s
+aguarrada
+aguaruna
+aguas
+aguasal
+aguasarse
+aguasbue
+aguasbuenas
+aguascal
+aguascalientes
+aguatero
+aguatocha
+aguatocho
+aguaturma
+aguaverde
+aguaviento
+aguavientos
+aguavilla
+aguavina
+aguay
+aguaytia
+aguaza
+aguazal
+aguazar
+aguazo
+aguazosa
+aguazoso
+aguazul
+aguazur
+agucia
+aguciar
+aguciosa
+aguciosamente
+agucioso
+aguda
+agudamente
+agudat
+agudez
+agudeza
+agudist
+agudizar
+agudo
+ague
+aguechee
+aguecheeck
+aguecheek
+aguedita
+agueev
+aguelike
+agueproo
+agueproof
+aguerri
+aguerrida
+aguerrido
+aguerrie
+aguerries
+aguerrir
+aguerrira
+aguerriraient
+aguerrirait
+aguerrirent
+aguerriront
+aguerris
+aguerrissaient
+aguerrissait
+aguerrissant
+aguerrisse
+aguerrissent
+aguerrit
+aguerro
+agues
+aguets
+agueweed
+aguey
+agufi
+aguglia
+agui
+agui`n
+aguiar
+aguicher
+aguie
+aguiero
+aguija
+aguijada
+aguijador
+aguijadora
+aguijadura
+aguijamiento
+aguijante
+aguijar
+aguijatoria
+aguijatorio
+aguije\a
+aguije\o
+aguijo`n
+aguijonada
+aguijonamiento
+aguijonar
+aguijonazo
+aguijoneador
+aguijoneadora
+aguijonear
+aguila
+aguilando
+aguilar
+aguilari
+aguilarite
+aguilawo
+aguilawood
+aguile\a
+aguile\o
+aguililla
+aguillar
+aguillon
+aguilo`n
+aguilonia
+aguilucho
+aguinald
+aguinaldo
+aguinsky
+aguirage
+aguirre
+aguisada
+aguisado
+aguisamiento
+aguisar
+aguiscar
+aguiser
+aguish
+aguishly
+aguishne
+aguishness
+aguistin
+aguizgar
+aguja
+agujadera
+agujal
+agujar
+agujazo
+agujerar
+agujerear
+agujero
+agujeruelo
+agujeta
+agujetera
+agujeteri`a
+agujetero
+agujo`n
+agujuela
+agul
+agulis
+aguly
+aguna
+agunaco
+agunah
+agunda
+agune
+agunesu
+agunesuc
+agunesur
+agung
+aguni
+aguntina
+aguosa
+aguosidad
+aguoso
+agur
+agura
+agural
+aguri
+agurial
+agurk
+agurkdyr
+agurkdyrkingen
+agurken
+agurkene
+agurker
+agurkpri
+agurkprisen
+aguro
+agusa
+agusan
+agusanamiento
+agusanarse
+agush
+agust
+agusta
+aguste
+agusti
+agusti`n
+agustin
+agustina
+agustinas
+agustiniana
+agustinianismo
+agustiniano
+agustino
+aguta
+agutaya
+agutayne
+agutaynen
+agutayno
+agutaynon
+aguti`
+agutter
+aguzada
+aguzadera
+aguzadero
+aguzado
+aguzador
+aguzadora
+aguzadura
+aguzamiento
+aguzanieves
+aguzar
+aguzonazo
+aguzza
+aguzzai
+aguzzamm
+aguzzammo
+aguzzand
+aguzzando
+aguzzano
+aguzzare
+aguzzaro
+aguzzarono
+aguzzass
+aguzzasse
+aguzzassi
+aguzzast
+aguzzaste
+aguzzasti
+aguzzata
+aguzzate
+aguzzati
+aguzzato
+aguzzava
+aguzzavamo
+aguzzavano
+aguzzavate
+aguzzavi
+aguzzavo
+aguzzera
+aguzzerai
+aguzzere
+aguzzerei
+aguzzeremo
+aguzzerete
+aguzzero
+aguzzi
+aguzziam
+aguzziamo
+aguzziat
+aguzziate
+aguzzina
+aguzzine
+aguzzini
+aguzzino
+aguzzo
+agu{ela
+agu{elo
+agu{era
+agu{erar
+agu{ero
+agu{etas
+agu{i`o
+agu{ista
+agv
+agvaliri
+agvalirichaganiktsumadaurukh
+agw
+agwaguna
+agwagwun
+agwagwune
+agwana
+agwara
+agwarra
+agwatash
+agwatashi
+agway
+agweagwa
+agwok
+agwolok
+agwot
+agx
+agy
+agyieus
+agynario
+agynarious
+agynary
+agynous
+agyrate
+agyria
+agyument
+agz
+ah
+ah1
+aha
+ahaaina
+ahab
+ahacado
+ahad
+ahadishi
+ahadisim
+ahafo
+ahaggare
+ahaggaren
+ahahaha
+ahahneli
+ahahnelin
+ahajar
+ahamb
+ahan
+ahaner
+ahankara
+ahanta
+ahantchu
+ahantchuyuk
+ahar
+aharah
+aharetom
+aharhel
+ahariola
+ahariolation
+aharon
+ahartala
+ahartalav
+ahasa
+ahasai
+ahasbai
+ahasueru
+ahasuerus
+ahaunch
+ahava
+ahaz
+ahaziah
+ahb
+ahban
+ahbeng
+ahchan
+ahchoo
+ahcienda
+ahdieh
+ahe
+ahe`
+ahead
+aheap
+ahearn
+ahearne
+aheave
+ahebrada
+ahebrado
+ahechadero
+ahechador
+ahechadora
+ahechadura
+ahechar
+ahecho
+aheima
+ahelear
+ahelgada
+ahelgado
+ahem
+ahembrada
+ahembrado
+ahems
+ahen
+ahenen
+ahenkro
+ahepatok
+ahepatokla
+aher
+aherir
+ahermanar
+ahern
+aherne
+aherrojamiento
+aherrojar
+aherrumbrar
+aherventar
+ahervoradamente
+ahervorarse
+ahet
+ahetrar
+ahev
+ahey
+ahgwahch
+ahgwahching
+ahh
+ahhhh
+ahi
+ahi`
+ahi`lo
+ahi`na
+ahi`nco
+ahi`ta
+ahi`to
+ahiah
+ahiam
+ahian
+ahidalgada
+ahidalgadamente
+ahidalgado
+ahidalgar
+ahidee
+ahiden
+ahiezer
+ahigadada
+ahigadado
+ahihud
+ahijada
+ahijadera
+ahijadero
+ahijado
+ahijador
+ahijah
+ahijamiento
+ahijar
+ahijuna
+ahikake
+ahikam
+ahilada
+ahilado
+ahilamiento
+ahilar
+ahilud
+ahimaaz
+ahiman
+ahimelec
+ahimelech
+ahimiten
+ahimoth
+ahimsa
+ahimsas
+ahinadab
+ahincada
+ahincadamente
+ahincado
+ahincamiento
+ahincanza
+ahincar
+ahind
+ahinoam
+ahinojar
+ahint
+ahio
+ahir
+ahira
+ahiram
+ahiramit
+ahiramites
+ahirani
+ahiri
+ahirmar
+ahiru
+ahiruyou
+ahisamac
+ahisamach
+ahisan
+ahishaha
+ahishahar
+ahishar
+ahitamiento
+ahitar
+ahitera
+ahithoph
+ahithophel
+ahitophe
+ahitophel
+ahitub
+ahizi
+ahka
+ahkali
+ahkcus
+ahl
+ahlab
+ahlai
+ahlberg
+ahle
+ahlehaqq
+ahlen
+ahlers
+ahlo
+ahlon
+ahlonbog
+ahlonbogo
+ahlstadt
+ahlsted
+ahlstedt
+ahluwali
+ahluwalia
+ahmad
+ahmadaba
+ahmadabad
+ahmadi
+ahmadiya
+ahmadu
+ahmadzai
+ahmar
+ahme
+ahmed
+ahmedaba
+ahmedabad
+ahmeek
+ahmen
+ahmet
+ahmt
+ahn
+ahna
+ahnde
+ahnden
+ahndende
+ahndendem
+ahndenden
+ahndendes
+ahndest
+ahndet
+ahndeten
+ahndetes
+ahndetest
+ahndetet
+ahndung
+ahnen
+ahnend
+ahnende
+ahnenden
+ahnender
+ahnendes
+ahnenfor
+ahnenforschung
+ahnenforschungen
+ahnenkul
+ahnenkult
+ahnentaf
+ahnentafeln
+ahnert
+ahnfelti
+ahnfeltia
+ahnfrau
+ahnfraue
+ahnfrauen
+ahnherre
+ahnherren
+ahnt
+ahnte
+ahnten
+ahntet
+ahnung
+ahnungen
+ahnungsl
+ahnungslos
+ahnungslose
+ahnungslosen
+ahnungsloser
+ahnungslosere
+ahnungsloseren
+ahnungsloserer
+ahnungsloseres
+ahnungsloses
+ahnungsloseste
+ahnungslosestem
+ahnungslosesten
+ahnungslosestes
+ahnungsv
+ahnungsvoll
+ahnungsvolle
+ahnungsvollen
+ahnungsvoller
+ahnungsvollere
+ahnungsvolleren
+ahnungsvollerer
+ahnungsvolleres
+ahnungsvollste
+ahnungsvollstem
+ahnungsvollsten
+ahnungsvollstes
+aho
+ahoada
+ahoah
+ahobachonada
+ahobachonado
+ahocicar
+ahocinarse
+ahogada
+ahogadera
+ahogadero
+ahogadiza
+ahogadizo
+ahogado
+ahogador
+ahogadora
+ahogamiento
+ahogante
+ahogar
+ahogaviejas
+ahogo
+ahogui`o
+ahoguijo
+ahohite
+ahoi
+ahojar
+aholah
+ahold
+aholiab
+aholibah
+aholibam
+aholibamah
+aholio
+ahom
+ahombrada
+ahombrado
+ahondamiento
+ahondar
+ahonde
+ahong
+ahonlan
+ahora
+ahoraren
+ahorarna
+ahorashi
+ahorasi
+ahorcable
+ahorcada
+ahorcadiza
+ahorcadizo
+ahorcado
+ahorcadora
+ahorcadura
+ahorcajarse
+ahorcaperros
+ahorcar
+ahorita
+ahormar
+ahorn
+ahornagamiento
+ahornagarse
+ahornar
+ahornbom
+ahornbomen
+ahornboo
+ahornboom
+ahornen
+ahornhou
+ahornhout
+ahornhouten
+ahorns
+ahorntje
+ahorntjes
+ahorquillada
+ahorquillado
+ahorquillar
+ahorrada
+ahorradamente
+ahorrado
+ahorrador
+ahorradora
+ahorramiento
+ahorrar
+ahorrativa
+ahorrativo
+ahorri`a
+ahorro
+ahorse
+ahorseba
+ahorseback
+ahoskie
+ahotada
+ahotado
+ahotas
+ahou
+ahoudori
+ahousaht
+ahoy
+ahoyador
+ahoyadura
+ahoyar
+ahr
+ahras
+ahrendah
+ahrendahronon
+ahrends
+ahrens
+ahrensa
+ahriman
+ahrimani
+ahrimanian
+ahrteeef
+ahrteeefaykyoo
+ahrteeefem
+ahrteeem
+ahrteeie
+ahs
+ahsahka
+ahsan
+ahsanull
+ahsanullah
+aht
+ahtena
+ahti
+ahtna
+ahto
+ahu
+ahuachap
+ahuachapan
+ahuajun
+ahuaruna
+ahuate
+ahuatemp
+ahuatempan
+ahuatle
+ahuchador
+ahuchadora
+ahuchar
+ahuciar
+ahuecador
+ahuecadora
+ahuecamiento
+ahuecar
+ahuehue`
+ahuehuet
+ahuehuete
+ahuesada
+ahuesado
+ahuevar
+ahuizote
+ahuizotl
+ahuja
+ahulada
+ahulado
+ahull
+ahum
+ahumada
+ahumado
+ahumai
+ahumar
+ahumear
+ahungere
+ahungered
+ahungry
+ahunt
+ahura
+ahuri
+ahurie
+ahuries
+ahurir
+ahurira
+ahurirai
+ahuriraient
+ahurirais
+ahurirait
+ahuriras
+ahuriren
+ahurirent
+ahurirez
+ahuririe
+ahuririez
+ahuririo
+ahuririons
+ahuriron
+ahurirons
+ahuriront
+ahuris
+ahurissa
+ahurissaient
+ahurissais
+ahurissait
+ahurissant
+ahurissante
+ahurissantes
+ahurissants
+ahurisse
+ahurissement
+ahurissent
+ahurisses
+ahurissez
+ahurissi
+ahurissiez
+ahurissions
+ahurisso
+ahurissons
+ahurit
+ahurragada
+ahurragado
+ahus
+ahusada
+ahusado
+ahusar
+ahush
+ahuyentador
+ahuyentadora
+ahuyentar
+ahuzam
+ahuzzath
+ahvenanm
+ahvenanmaa
+ahvo
+ahw
+ahwahnee
+ahwal
+ahypnia
+ai
+ai"eul
+ai"eule
+ai"eules
+ai"euls
+ai"eux
+ai"oli
+ai-mei
+ai-tsung
+ai^ne'
+ai^ne'e
+ai^ne'es
+ai^ne's
+ai^nesse
+ai`na
+ai`nas
+ai`nde
+aia
+aiadmk
+aiah
+aiai
+aiaigasa
+aialon
+aian
+aias
+aiath
+aiawong
+aib
+aiba
+aibajouh
+aiban
+aibanku
+aibara
+aibe
+aibetsu
+aibetsur
+aibetu
+aibeturi
+aibeya
+aibi
+aibi-emu
+aibiemu
+aibiki
+aibo
+aibonden
+aibondeni
+aibonito
+aibori
+aibou
+aibu
+aic
+aica
+aicha
+aichaku
+aicher
+aichi
+aichiika
+aichiken
+aichimit
+aichishu
+aichmoph
+aichmophobia
+aichou
+aichouba
+aicomple
+aicomplete
+aicyou
+aid
+aida
+aidable
+aidagara
+aidaho
+aidaient
+aidais
+aidait
+aidakeik
+aidamash
+aidamasi
+aidamiho
+aidamina
+aidamomo
+aidan
+aidance
+aidant
+aidarous
+aidashou
+aidasumi
+aidayuuk
+aide
+aide'
+aide'e
+aide'es
+aide's
+aide-me'
+aide-me'moire
+aide`ren
+aide`rent
+aidea
+aided
+aidedeca
+aidedecamp
+aideen
+aideia
+aiden
+aidenchi
+aidenn
+aident
+aidentex
+aidentit
+aider
+aidera
+aiderai
+aideraie
+aideraient
+aiderais
+aiderait
+aideras
+aiderez
+aideriez
+aiderion
+aiderions
+aiderons
+aideront
+aiders
+aides
+aideshi
+aidesi
+aideth
+aidexia
+aidez
+aidful
+aidia
+aidiez
+aiding
+aidions
+aidless
+aidman
+aidmanme
+aidmanmen
+aidmen
+aido
+aidoheve
+aidohevedo
+aidoku
+aidokush
+aidons
+aidoring
+aidoru
+aidoruga
+aidoruky
+aids
+aids-vir
+aids-viren
+aidu
+aiduarak
+aidubang
+aiduchi
+aidugamo
+aiduhino
+aiduhong
+aidukawa
+aiduki
+aidukiak
+aidukosu
+aidukoug
+aiduma
+aidumiya
+aidumizu
+aidunaga
+aidunaka
+aidunish
+aidunisi
+aiduoosh
+aiduoosi
+aidusaka
+aidushim
+aidushio
+aidusim
+aidusimo
+aidusio
+aidusioz
+aidutaji
+aidutaka
+aidutazi
+aidutets
+aidutetu
+aiduti
+aidutoyo
+aiduwaka
+aiduyana
+aiduyoko
+aie
+aiea
+aiel
+aiello
+aien
+aienka
+aienkien
+aient
+aierie
+aieruo-k
+aieruok
+aies
+aiesu
+aiewomba
+aiexpert
+aif
+aifuda
+aifuku
+aig
+aiga
+aiga-
+aigailet
+aigailetai
+aigamuch
+aigamuchas
+aigan
+aigandou
+aigang
+aigi
+aigialos
+aigialosaur
+aigialosauridae
+aigialosaurus
+aigin
+aigle
+aiglefin
+aiglefins
+aigles
+aiglet
+aiglets
+aiglon
+aiglons
+aiglos
+aigneis
+aigner
+aigo
+aigoma
+aigon
+aigre
+aigre-do
+aigre-douce
+aigre-doux
+aigrefin
+aigrefins
+aigrelet
+aigrelets
+aigrelette
+aigrelettes
+aigremen
+aigrement
+aigremor
+aigremore
+aigres
+aigres-d
+aigres-douces
+aigres-doux
+aigret
+aigrets
+aigrette
+aigrettes
+aigreur
+aigreurs
+aigri
+aigrie
+aigries
+aigrir
+aigrira
+aigrirai
+aigriraient
+aigrirais
+aigrirait
+aigriras
+aigriren
+aigrirent
+aigrirez
+aigririe
+aigririez
+aigririo
+aigririons
+aigriron
+aigrirons
+aigriront
+aigris
+aigrissa
+aigrissaient
+aigrissais
+aigrissait
+aigrissant
+aigrisse
+aigrissent
+aigrisses
+aigrissez
+aigrissi
+aigrissiez
+aigrissions
+aigrisso
+aigrissons
+aigrit
+aigu
+aigue"
+aigue"s
+aigue-ma
+aigue-marine
+aigues-m
+aigues-marines
+aiguilla
+aiguillage
+aiguillages
+aiguillaient
+aiguillais
+aiguillait
+aiguillant
+aiguille
+aiguille'
+aiguille'e
+aiguille'es
+aiguille's
+aiguille`rent
+aiguillent
+aiguiller
+aiguillera
+aiguillerai
+aiguilleraient
+aiguillerais
+aiguillerait
+aiguilleras
+aiguillerez
+aiguilleriez
+aiguillerions
+aiguillerons
+aiguilleront
+aiguilles
+aiguillesque
+aiguilleter
+aiguillette
+aiguilletted
+aiguilleur
+aiguilleurs
+aiguillez
+aiguilli
+aiguilliez
+aiguillions
+aiguillo
+aiguillon
+aiguillonna
+aiguillonnaient
+aiguillonnais
+aiguillonnait
+aiguillonnant
+aiguillonne
+aiguillonne'
+aiguillonne'e
+aiguillonne'es
+aiguillonne's
+aiguillonne`rent
+aiguillonnent
+aiguillonner
+aiguillonnera
+aiguillonnerai
+aiguillonneraient
+aiguillonnerais
+aiguillonnerait
+aiguillonneras
+aiguillonnerez
+aiguillonneriez
+aiguillonnerions
+aiguillonnerons
+aiguillonneront
+aiguillonnes
+aiguillonnez
+aiguillonniez
+aiguillonnions
+aiguillonnons
+aiguillons
+aiguisa
+aiguisag
+aiguisage
+aiguisai
+aiguisaient
+aiguisais
+aiguisait
+aiguisan
+aiguisant
+aiguise
+aiguise'
+aiguise'e
+aiguise'es
+aiguise's
+aiguise`
+aiguise`rent
+aiguisen
+aiguisent
+aiguiser
+aiguisera
+aiguiserai
+aiguiseraient
+aiguiserais
+aiguiserait
+aiguiseras
+aiguiserez
+aiguiseriez
+aiguiserions
+aiguiserons
+aiguiseront
+aiguises
+aiguisez
+aiguisie
+aiguisiez
+aiguisio
+aiguisions
+aiguison
+aiguisons
+aigulet
+aigus
+aihacker
+aihaka
+aihan
+aihans
+aihara
+aiharaku
+aiharato
+aiharayu
+aihsun
+aihua
+aihui
+aii
+aiichiro
+aiighhh
+aiiku
+aiin
+aiire
+aiirena
+aiiro
+aiitirou
+aiitona
+aija
+aijada
+aijalon
+aiji
+aijin
+aijou
+aijyou
+aik
+aika
+aikagi
+aikan
+aikana
+aikane
+aikappu
+aikata
+aikaw
+aikawa
+aikawaer
+aikawahi
+aikawar
+aikawara
+aikawash
+aikawasi
+aike
+aikei
+aiken
+aikewara
+aiki
+aikido
+aikidos
+aikidou
+aikinite
+aiko
+aikoa
+aikoku
+aikon
+aikotoba
+aikoton
+aikotona
+aikou
+aikoudai
+aikouka
+aikousha
+aiku
+aikuchi
+aikurush
+aikurusi
+aikuti
+aikwakai
+aikwe
+aikyaku
+aikyou
+ail
+aila
+ailab
+ailanter
+ailantery
+ailanthi
+ailanthic
+ailanthu
+ailanthus
+ailanthuses
+ailantin
+ailantine
+ailanto
+ailao
+ailbert
+aile
+aile'
+aile'e
+aile'es
+aile's
+ailed
+ailee
+aileen
+ailene
+aileron
+ailerons
+ailes
+aileth
+ailette
+ailettes
+aileu
+ailey
+aili
+ailie
+ailier
+ailiers
+ailina
+ailing
+ailis
+aille
+aillent
+ailler
+ailles
+ailleurs
+ailloli
+aillt
+ailment
+ailments
+ails
+ailsun
+ailsyte
+ailuaki
+ailurida
+ailuridae
+ailuro
+ailuroid
+ailuroidea
+ailuroph
+ailurophobe
+ailurophobia
+ailuropo
+ailuropoda
+ailuropu
+ailuropus
+ailurus
+ailweed
+ailyn
+aim
+aima
+aimable
+aimablem
+aimablement
+aimables
+aimag
+aimags
+aimai
+aimaient
+aimaimok
+aimais
+aimaisei
+aimait
+aimak
+aimaks
+aiman
+aimant
+aimantat
+aimantation
+aimante
+aimanter
+aimantes
+aimants
+aimaq
+aimara
+aimara`
+aimarsen
+aimatte
+aime
+aime'
+aime'e
+aime'es
+aime's
+aime`ren
+aime`rent
+aimed
+aimee
+aimei
+aimele
+aiment
+aimer
+aimera
+aimerai
+aimeraie
+aimeraient
+aimerais
+aimerait
+aimeras
+aimerez
+aimeriez
+aimerion
+aimerions
+aimerons
+aimeront
+aimers
+aimes
+aimez
+aimful
+aimfully
+aimi
+aimiez
+aimil
+aiming
+aimini
+aimions
+aimitaga
+aimless
+aimlessl
+aimlessly
+aimlessn
+aimlessness
+aimm
+aimo
+aimochi
+aimol
+aimoli
+aimone
+aimons
+aimore
+aimos
+aimoti
+aimoto
+aimotoku
+aims
+aims-eus
+aims-lee
+aimsley
+aimwell
+aimworth
+aimworthiness
+ain
+ain't
+aina
+ainakaba
+ainaleh
+ainaro
+ainbai
+aindama`is
+aindiada
+aindiado
+aindrea
+aine
+aines
+ainhum
+aini
+ainii
+ainiike
+ainiki
+ainikki
+ainiko
+ainiku
+ainley
+aino
+ainoi
+ainonai
+ainono
+ainori
+ainosato
+ainote
+ainoura
+ainsell
+ainsi
+ainslee
+ainsley
+ainslie
+ainswort
+ainsworth
+ainsyuta
+aint
+ainu
+ainus
+aio
+aiochiko
+aioec
+aioi
+aioiemi
+aioishi
+aioisi
+aiome
+aion
+aionial
+aiotikog
+aip
+aipu
+aiq
+air
+aira
+airable
+airada
+airadamente
+airado
+airain
+airaku
+airamiento
+airampo
+airan
+airando
+airani
+airar
+airashi
+airasi
+airbag
+airbags
+airbill
+airbills
+airboat
+airboats
+airborn
+airborne
+airbound
+airbrain
+airbrained
+airbrush
+airbrushed
+airbrushes
+airbrushing
+airbubbl
+airbubble
+airbuilt
+airburst
+airbursts
+airbus
+airbusse
+airbusses
+aircon
+aircraft
+aircraftman
+aircrafts
+aircraftsman
+aircraftswoman
+aircraftwoman
+aircrew
+aircrewm
+aircrewman
+aird
+airdock
+airdrome
+airdromes
+airdrop
+airdropp
+airdropped
+airdropping
+airdrops
+aire
+airear
+aired
+airedale
+airedales
+aireleme
+airelemental
+airelle
+airelles
+airen
+airer
+airers
+aires
+airest
+airey
+airfare
+airfares
+airfield
+airfields
+airflow
+airflows
+airfoil
+airfoils
+airforce
+airframe
+airframes
+airfreig
+airfreight
+airfreighter
+airglow
+airgraph
+airgraphics
+airhart
+airhead
+airheads
+airhole
+airi
+airi-n
+airie
+airier
+airiest
+airifero
+airiferous
+airified
+airily
+airiman
+airin
+airiness
+airing
+airings
+airish
+airisu
+airless
+airlessl
+airlessly
+airlessn
+airlessness
+airlift
+airlifte
+airlifted
+airlifti
+airlifting
+airlifts
+airlike
+airline
+airliner
+airliners
+airlines
+airlock
+airlocks
+airmail
+airmaile
+airmailed
+airmaili
+airmailing
+airmails
+airman
+airmansh
+airmanship
+airmark
+airmarke
+airmarker
+airmass
+airmati
+airmen
+airmics
+airmobil
+airmobile
+airmonge
+airmonger
+airmont
+airo
+airo`n
+airohydr
+airohydrogen
+airoldi
+airomete
+airometer
+airon
+airoran
+airosa
+airosamente
+airosidad
+airoso
+airpark
+airphobi
+airphobia
+airplane
+airplanes
+airplani
+airplanist
+airport
+airports
+airpost
+airproof
+airproofed
+airs
+airscape
+airscrew
+airscrews
+airship
+airships
+airsick
+airsickn
+airsickness
+airspace
+airspaces
+airspeed
+airspeeds
+airstrea
+airstream
+airstrip
+airstrips
+airt
+airtight
+airtightly
+airtightness
+airtje
+airtjes
+airurand
+airville
+airward
+airwards
+airwave
+airwaves
+airway
+airwayhe
+airwayheights
+airwayma
+airwayman
+airways
+airwind
+airwoman
+airwomen
+airworth
+airworthier
+airworthiest
+airworthiness
+airworthy
+airy
+airym
+ais
+aisai
+aisaika
+aisan
+aisance
+aisatsu
+aisatsug
+aisatsuj
+aisatu
+aisatuga
+aisatujo
+aisawa
+aischrol
+aischrolatreia
+aise
+aise'
+aise'e
+aise'es
+aise'men
+aise'ment
+aise's
+aiseki
+aisen
+aises
+aisetsu
+aisetu
+aiseweed
+aisgill
+aisha
+aishasei
+aishi
+aishia
+aishiae
+aishikat
+aishou
+aishuu
+aisi
+aisia
+aisiae
+aisikata
+aislacionismo
+aislacionista
+aislada
+aisladamente
+aislado
+aislador
+aisladora
+aislamiento
+aislar
+aisle
+aisled
+aisleen
+aisleles
+aisleless
+aisles
+aisling
+aiso
+aisoharu
+aisoku
+aisopuro
+aisor
+aisoresy
+aisoreta
+aisoto-p
+aisotop
+aisotopu
+aisou
+aisozaim
+aiss
+aissa
+aissaoua
+aisselle
+aisselles
+aissen
+aissor
+aissuari
+aisteoir
+aistopod
+aistopoda
+aistopodes
+aisu
+aisuban
+aisuhokk
+aisukuri
+aisumi
+aisun1
+aisurand
+aisusuke
+aisya
+aisyado
+aisyadou
+aisyo
+aisyou
+aisyuu
+ait
+aita
+aitai
+aitante
+aitanti
+aitape
+aitatsu
+aitatu
+aitawa
+aitch
+aitchbon
+aitchbone
+aitches
+aitchiso
+aitchison
+aitchles
+aitchless
+aitchpie
+aitchpiece
+aitd
+aite
+aitedo
+aitegata
+aitegawa
+aitekata
+aitekoku
+aitemu
+aiter
+aitesaki
+aitesis
+aitetaki
+aiteyaku
+aithochr
+aithochroi
+aiti
+aitiikad
+aitiken
+aitikens
+aitikent
+aitimito
+aition
+aitiotro
+aitiotropic
+aitishus
+aitken
+aitkenit
+aitkenite
+aitkin
+aitkins
+aitolia
+aitomona
+aitomura
+aitou
+aitsu
+aitsudo
+aitsugi
+aitsume
+aitsung
+aitsuu
+aitu
+aitudo
+aitugi
+aitume
+aitutaki
+aitutakian
+aituu
+aitvaras
+aityaku
+aiuchi
+aiuola
+aiuole
+aiura
+aiuta
+aiutai
+aiutami
+aiutammo
+aiutando
+aiutano
+aiutare
+aiutaron
+aiutarono
+aiutasse
+aiutassero
+aiutassi
+aiutassimo
+aiutaste
+aiutasti
+aiutata
+aiutate
+aiutati
+aiutato
+aiutava
+aiutavam
+aiutavamo
+aiutavan
+aiutavano
+aiutavat
+aiutavate
+aiutavi
+aiutavo
+aiutera
+aiuterai
+aiuteran
+aiuteranno
+aiutereb
+aiuterebbe
+aiuterei
+aiuterem
+aiuteremmo
+aiuteremo
+aiuteres
+aiutereste
+aiuteresti
+aiuteret
+aiuterete
+aiutero
+aiuti
+aiutiamo
+aiutiate
+aiutino
+aiuto
+aivax
+aiwa
+aiwan
+aiwanat
+aiwin
+aiwo
+aiword
+aix
+aix'
+aix1
+aix370
+aixpub
+aiya
+aiyado
+aiyama
+aiyappan
+aiye
+aiyegunl
+aiyegunle
+aiyoku
+aiyotsu
+aiyotu
+aiyou
+aiz
+aizaki
+aizakku
+aizan
+aizawa
+aizawaka
+aizawana
+aizawato
+aizawayu
+aizen
+aizi
+aizin
+aizirush
+aizirusi
+aizle
+aizoa`cea
+aizoa`ceo
+aizoacea
+aizoaceae
+aizoaceo
+aizoaceous
+aizome
+aizomeky
+aizoon
+aizou
+aizouban
+aizu
+aizuare
+aizumi
+aizyou
+aj
+aja
+aja`
+ajabeba
+ajaccio
+ajada
+ajado
+ajaekapa
+ajaekapad
+ajaezar
+ajagbe
+ajagua
+ajah
+ajai
+ajaja
+ajaja`
+ajak
+ajakkes
+ajakongu
+ajalon
+ajamaru
+ajami
+ajamiento
+ajamonarse
+ajandek
+ajangle
+ajanji
+ajaqueca
+ajaquecarse
+ajaquefa
+ajar
+ajaraca
+ajaracado
+ajarafe
+ajari
+ajaspajas
+ajasses
+ajatasat
+ajatasatru
+ajatolla
+ajatollah
+ajau
+ajava
+ajawa
+ajax
+ajay
+ajaye
+ajc
+ajdabiya
+aje
+ajea
+ajear
+ajebe
+ajedrea
+ajedreci`stica
+ajedreci`stico
+ajedrecista
+ajedrez
+ajedrezada
+ajedrezado
+ajee
+ajena
+ajenabe
+ajenable
+ajenabo
+ajenacio`n
+ajenador
+ajenadora
+ajenamiento
+ajenar
+ajengibre
+ajenjo
+ajeno
+ajenuz
+ajeo
+ajer
+ajera
+ajero
+ajersch
+ajete
+ajetrearse
+ajetreo
+ajeya
+ajg
+ajhar
+aji
+aji`
+ajia
+ajiaceite
+ajiaco
+ajiadai
+ajibba
+ajicera
+ajicero
+ajichiga
+ajicola
+ajicomino
+ajicuervo
+ajidas
+ajie
+ajifumei
+ajiga
+ajigasaw
+ajigawa
+ajihara
+ajikawa
+ajike
+ajikena
+ajikes
+ajilimo`jili
+ajilimoje
+ajimarin
+ajimez
+ajimi
+ajimu
+ajina
+ajinomot
+ajioka
+ajipuerro
+ajiri
+ajironar
+ajisai
+ajisaka
+ajisu
+ajit
+ajita
+ajitigai
+ajito
+ajitomi
+ajitsuke
+ajituke
+ajiva
+ajivika
+ajiw
+ajiwa
+ajiwae
+ajizal
+ajjer
+ajm
+ajmal
+ajman
+ajmeri
+ajo
+ajo`
+ajoarriero
+ajobar
+ajobera
+ajobero
+ajobilla
+ajobo
+ajofaina
+ajog
+ajoint
+ajokoot
+ajoli`n
+ajolio
+ajolote
+ajomang
+ajomate
+ajonc
+ajoncs
+ajong
+ajonje
+ajonjera
+ajonjero
+ajonjo
+ajonjoli`
+ajonuez
+ajoqueso
+ajorar
+ajorca
+ajordar
+ajornalar
+ajorrar
+ajorro
+ajote
+ajotrino
+ajour
+ajoure'
+ajoure'e
+ajoure'es
+ajoure's
+ajourer
+ajourfoe
+ajourfoera
+ajourfor
+ajourfora
+ajourf|r
+ajourf|ra
+ajourf|re
+ajourf|ring
+ajourf|ringen
+ajourf|rt
+ajourna
+ajournai
+ajournaient
+ajournais
+ajournait
+ajournan
+ajournant
+ajourne
+ajourne'
+ajourne'e
+ajourne'es
+ajourne's
+ajourne`
+ajourne`rent
+ajournem
+ajournement
+ajournements
+ajournen
+ajournent
+ajourner
+ajournera
+ajournerai
+ajourneraient
+ajournerais
+ajournerait
+ajourneras
+ajournerez
+ajourneriez
+ajournerions
+ajournerons
+ajourneront
+ajournes
+ajournez
+ajournie
+ajourniez
+ajournio
+ajournions
+ajournon
+ajournons
+ajourste
+ajoursteek
+ajoursteken
+ajout
+ajouta
+ajoutaie
+ajoutaient
+ajoutais
+ajoutait
+ajoutant
+ajoute
+ajoute'
+ajoute'e
+ajoute'es
+ajoute's
+ajoute`r
+ajoute`rent
+ajoutent
+ajouter
+ajoutera
+ajouterai
+ajouteraient
+ajouterais
+ajouterait
+ajouteras
+ajoutere
+ajouterez
+ajouteri
+ajouteriez
+ajouterions
+ajoutero
+ajouterons
+ajouteront
+ajoutes
+ajoutez
+ajoutiez
+ajoution
+ajoutions
+ajoutons
+ajouts
+ajowan
+ajowans
+ajoy
+ajpo
+ajt
+ajtay
+aju
+ajuagas
+ajuanetada
+ajuanetado
+ajuaneteada
+ajuaneteado
+ajuar
+ajudiada
+ajudiado
+ajuga
+ajuglarada
+ajuglarado
+ajuglarar
+ajuh
+ajuiciada
+ajuiciado
+ajuiciar
+ajuin
+ajuinach
+ajuinachtig
+ajuinachtige
+ajuinachtiger
+ajuinachtigst
+ajuinbol
+ajuinbollen
+ajuinen
+ajuintje
+ajuintjes
+ajuinzaa
+ajuinzaad
+ajujure
+ajukru
+ajumar
+ajumba
+ajuna
+ajuno
+ajuntadamente
+ajuntamiento
+ajuntanza
+ajuntar
+ajur
+ajuran
+ajure
+ajuru
+ajusta
+ajustada
+ajustadamente
+ajustado
+ajustador
+ajustadora
+ajustage
+ajustaie
+ajustaient
+ajustais
+ajustait
+ajustamiento
+ajustant
+ajustar
+ajuste
+ajuste'
+ajuste'e
+ajuste'es
+ajuste's
+ajuste`r
+ajuste`rent
+ajusteme
+ajustement
+ajustements
+ajustent
+ajuster
+ajustera
+ajusterai
+ajusteraient
+ajusterais
+ajusterait
+ajusteras
+ajustere
+ajusterez
+ajusteri
+ajusteriez
+ajusterions
+ajustero
+ajusterons
+ajusteront
+ajustes
+ajusteur
+ajusteurs
+ajustez
+ajusticiada
+ajusticiado
+ajusticiamiento
+ajusticiar
+ajustiez
+ajustion
+ajustions
+ajustons
+ajutage
+ajutment
+ajvaz
+ajyasuto
+ak
+aka
+akaaka
+akaakato
+akab
+akaba
+akababee
+akababiw
+akababiwach
+akabafa
+akabane
+akabaned
+akabanek
+akabanem
+akabanen
+akabea
+akabeada
+akabira
+akabiras
+akabo
+akabori
+akaboshi
+akabosi
+akabou
+akabuchi
+akabusi
+akabuti
+akacari
+akacha
+akachake
+akachan
+akad
+akademi
+akademi-
+akademie
+akademiemitglieder
+akademien
+akademiene
+akademieprofessor
+akademier
+akademiet
+akademieveranstaltung
+akademik
+akademiker
+akademikerbrev
+akademikere
+akademikeren
+akademikerin
+akademikerne
+akademikernes
+akademikers
+akademikerschaft
+akademikertochter
+akademikertype
+akademin
+akademis
+akademisch
+akademische
+akademischen
+akademischer
+akademischere
+akademischeren
+akademischerer
+akademisches
+akademischstem
+akademischsten
+akademischster
+akademisk
+akademiske
+akadenwa
+akadeth
+akadomar
+akaeda
+akafuda
+akafuku
+akagai
+akagami
+akagane
+akagawa
+akage
+akagi
+akagimar
+akagire
+akago
+akahada
+akahadak
+akahaji
+akahane
+akahani
+akahata
+akahazi
+akahiko
+akahira
+akahon
+akahori
+akahoriy
+akahsemu
+akahsemuka
+akai
+akaiba
+akaibu
+akaigawa
+akaike
+akaikes
+akairo
+akaishi
+akaisi
+akaiwa
+akaiwaek
+akaiwagu
+akajeru
+akaji
+akajigak
+akajihab
+akajikok
+akajisen
+akajo
+akajuk
+akaka
+akakage
+akakede
+akaki
+akakol
+akakora
+akakura
+akal
+akala
+akalak
+akali
+akalimba
+akama
+akamai
+akamatsu
+akamatu
+akame
+akami
+akamigak
+akamiso
+akamizu
+akamkpa
+akamkpae
+akamkpaejagham
+akamnik
+akamon
+akampka
+akamura
+akan
+akanbou
+akanda
+akane
+akaneiro
+akanekun
+akanekunik
+akangba
+akani
+akania
+akaniace
+akaniaceae
+akaninja
+akanko
+akant
+akantai
+akanten
+akantusr
+akantusranker
+akanuke
+akany
+akao
+akaoka
+akaoni
+akaosugi
+akaplass
+akapuruk
+akar
+akara
+akaragao
+akarajia
+akarame
+akarasam
+akarasen
+akaraseni
+akaratam
+akarbale
+akare
+akari
+akarkhel
+akarkus
+akarnani
+akarnania
+akaroa
+akarore
+akaru
+akarumi
+akaruru
+akasa
+akasaka
+akasakak
+akasakam
+akasakat
+akasakay
+akasaki
+akase
+akasegaw
+akasele
+akaselem
+akasen
+akashi
+akashia
+akashiba
+akashika
+akashina
+akashinb
+akashing
+akashio
+akashiro
+akashish
+akashiya
+akasi
+akasia
+akasiba
+akasie
+akasien
+akasika
+akasina
+akasinb
+akasinbu
+akasingo
+akasio
+akasiro
+akasisi
+akasiya
+akasiyak
+akaska
+akassa
+akataka
+akataki
+akatonbo
+akatsuch
+akatsuka
+akatsuki
+akatsuti
+akatsuts
+akatuchi
+akatuka
+akatuki
+akatuti
+akatutum
+akatyan
+akau
+akaunto
+akavet
+akawai
+akawaio
+akawati
+akayon
+akayu
+akaza
+akazawa
+akazga
+akazgine
+akazi
+akazu
+akb
+akbar
+akbas
+akbulut
+akc
+akca
+akcheh
+akd
+akdkiado
+akdon
+ake
+akeake
+akebakke
+akebakken
+akeban
+akebi
+akebia
+akebono
+akebou
+akebrett
+akechi
+aked
+akedo
+akee
+akegata
+akehama
+akehana
+akehanas
+akehara
+akei
+akeki
+akekure
+akel
+akela
+akela's
+akele
+akelei
+akeleien
+akeley
+akelig
+akelige
+akeliger
+akelighe
+akeligheden
+akeligheid
+akeligst
+akemashi
+akemasi
+akemasit
+akemi
+aken
+akenes
+akeno
+akenobei
+akenobeite
+akens
+akenureb
+akeo
+akepiro
+akeppana
+akeppara
+akeppiro
+aker
+akergrup
+akergruppen
+akeri
+akerite
+akermark
+akern
+akeroa
+akerre
+akers
+akersban
+akersbanen
+akerselv
+akerselven
+akersgat
+akersgata
+akersgaten
+akershus
+akersro
+akersten
+akert
+akertje
+akertjes
+akeshita
+akesita
+akesitat
+aketate
+aketi
+akevitt
+akevitte
+akevitten
+akewata
+akewatas
+akey
+akf
+akfm
+akfmr
+akg
+akh
+akha
+akhaia
+akhavan
+akhdar
+akheimar
+akhil
+akhissar
+akhlame
+akhmadul
+akhmadullina
+akhmarov
+akhmatov
+akhmatova
+akhmimic
+akhoe
+akhoond
+akhrot
+akhtangu
+akhtangul
+akhtar
+akhty
+akhu
+akhvakh
+akhyana
+aki
+akia
+akiachak
+akiaga
+akiak
+akiaki
+akiapmin
+akiba
+akibare
+akibasho
+akibasyo
+akibiyor
+akichi
+akichiem
+akidana
+akido
+akiduki
+akidukid
+akidukik
+akie
+akifumi
+akigawa
+akigawas
+akigoro
+akiguchi
+akiguti
+akih
+akihabar
+akihi
+akihide
+akihiko
+akihiro
+akihiroy
+akihisa
+akihito
+akihitom
+akiho
+akiimuro
+akikamey
+akikan
+akikawa
+akikawak
+akikawar
+akikawaz
+akikaz
+akikaze
+akikazen
+akikazu
+akikeiba
+akiki
+akiko
+akiku
+akil
+akilles
+akillesh
+akilleshael
+akilleshal
+akillesh{l
+akillesh{len
+akim
+akima
+akimakot
+akimaru
+akimasa
+akimatsu
+akimatur
+akimbo
+akime
+akimi
+akimitsu
+akimitu
+akimono
+akimoto
+akimotoc
+akimotok
+akimotom
+akimoton
+akimotor
+akimotot
+akimotoy
+akimov
+akin
+akina
+akinaga
+akinagat
+akinai
+akinakan
+akinaru
+akindle
+akindo
+akine
+akinesia
+akinesic
+akinesis
+akinete
+akinetic
+akinniyi
+akino
+akinomik
+akinori
+akinoshi
+akinosim
+akinotan
+akinoyou
+akins
+akio
+akiochi
+akioka
+akioti
+akippo
+akir
+akira
+akiraka
+akiram
+akirame
+akirashi
+akirasi
+akire
+akirehat
+akirekae
+akiresu
+akiresuk
+akis
+akisada
+akisaiza
+akisame
+akisamez
+akisato
+akisatoa
+akisawa
+akishi
+akishima
+akishino
+akisi
+akisima
+akisimam
+akisimas
+akisinod
+akisinon
+akiskemi
+akiskemikinik
+akisu
+akisue
+akit
+akita
+akitagin
+akitake
+akitakej
+akitaken
+akitame
+akitari
+akitarin
+akitashi
+akitasho
+akitasi
+akitasiy
+akitawa
+akitekut
+akiti
+akitiemi
+akito
+akitomo
+akitoshi
+akitosi
+akitsu
+akitsugu
+akitu
+akitugu
+akiu
+akium
+akiumpar
+akiumpare
+akiva
+akiya
+akiyaguc
+akiyagut
+akiyama
+akiyamae
+akiyamak
+akiyamam
+akiyamas
+akiyamay
+akiyasum
+akiyenik
+akiyo
+akiyoshi
+akiyosi
+akiyosid
+akiyosik
+akiyosim
+akiyosir
+akizawa
+akizawaj
+akizuki
+akj
+akjuet
+akk
+akka
+akkad
+akkadian
+akkadist
+akkan
+akkanjyo
+akkantan
+akkanzyo
+akkar
+akkaren
+akke
+akkefiet
+akkefietje
+akkefietjes
+akkena
+akker
+akkeraka
+akkerboo
+akkerboom
+akkerbou
+akkerbouw
+akkerde
+akkerden
+akkerdis
+akkerdistel
+akkerdistels
+akkeren
+akkerkoo
+akkerkool
+akkerlan
+akkerland
+akkerlanden
+akkerlee
+akkerleeuwerik
+akkerleeuweriken
+akkerlie
+akkerlieden
+akkerlui
+akkermaa
+akkermaal
+akkermaalsbos
+akkermaalsbossen
+akkermaalshout
+akkerman
+akkermannetje
+akkermannetjes
+akkermans
+akkers
+akkersle
+akkersleep
+akkerslepen
+akkert
+akkertje
+akkertjes
+akkervru
+akkervrucht
+akkervruchten
+akkerwin
+akkerwinde
+akkerwinden
+akkerwindes
+akkeshi
+akkesi
+akkeviet
+akkevietje
+akkevietjes
+akkhusha
+akki
+akkin
+akklamas
+akklamasjon
+akklamasjonen
+akklamat
+akklamation
+akklamationen
+akklimat
+akklimatisere
+akklimatiseringsperiode
+akklimatisert
+akklimatisiere
+akklimatisieren
+akklimatisierend
+akklimatisierendem
+akklimatisierenden
+akklimatisierender
+akklimatisierst
+akklimatisiert
+akklimatisierte
+akklimatisierten
+akklimatisierter
+akklimatisiertes
+akklimatisiertet
+akklimatisierung
+akkommod
+akkommodasjon
+akkommodasjonen
+akkommodere
+akkommodert
+akkompag
+akkompagnat|r
+akkompagnat|ren
+akkompagnat|rene
+akkompagnement
+akkompagnementet
+akkompagnere
+akkompagnerer
+akkompagneres
+akkompagneret
+akkompagnert
+akkompagnerte
+akkon
+akkoord
+akkoorde
+akkoorden
+akkord
+akkordab
+akkordabeider
+akkordar
+akkordarbeide
+akkordarbeit
+akkordarbeiten
+akkordarbeiterin
+akkordarbeiterinnen
+akkordarbeitern
+akkordav
+akkordavsavn
+akkordavtale
+akkorddo
+akkorddokumentene
+akkorde
+akkorden
+akkordeo
+akkordeon
+akkordeonen
+akkordeons
+akkorder
+akkordere
+akkordert
+akkordfo
+akkordforhandling
+akkordforhandlingene
+akkordforhandlinger
+akkordko
+akkordkommis{r
+akkordlo
+akkordloehne
+akkordlohn
+akkordlohns
+akkordl|
+akkordl|nn
+akkordl|nnede
+akkordmo
+akkordmodulationen
+akkordst
+akkordstyret
+akkordstyrets
+akkordti
+akkordtilbudet
+akkordwe
+akkordwesens
+akkou
+akkouzou
+akkredit
+akkreditere
+akkrediteringen
+akkreditert
+akkrediterte
+akkreditiere
+akkreditieren
+akkreditierende
+akkreditierendem
+akkreditierenden
+akkreditierendes
+akkreditierst
+akkreditiert
+akkreditiertem
+akkreditierten
+akkreditierter
+akkreditiertest
+akkreditiertet
+akkreditierungsschreiben
+akkreditiv
+akkreditiver
+akkreditivet
+akkreditivs
+akku
+akkub
+akkubetr
+akkubetrieb
+akkugepu
+akkugepuffert
+akkugepufferte
+akkugepuffertem
+akkugepufferter
+akkugepuffertes
+akkumula
+akkumulation
+akkumulator
+akkumulatoren
+akkumulatorenbatterie
+akkumulatorfahrzeug
+akkumule
+akkumulere
+akkumuleret
+akkumulering
+akkumulert
+akkumulerte
+akkumuli
+akkumulieren
+akkumuliert
+akkurat
+akkurate
+akkuratem
+akkurater
+akkurates
+akkuratesse
+akkuratessen
+akkus
+akkusati
+akkusativ
+akkusativen
+akkusativobjekt
+akkusativobjekten
+akkusativobjektes
+akkusativs
+akkvisis
+akkvisisjon
+akkvisisjonen
+akl
+aklagare
+aklagarm
+aklagarmyndigheten
+aklan
+aklano
+aklanon
+akli
+akm
+akmudar
+akmuddar
+akn
+akne
+aknee
+akningen
+ako
+akoasm
+akoasma
+akobo
+akodeion
+akoerio
+akoestie
+akoestiek
+akoestis
+akoestisch
+akoestische
+akogar
+akogare
+akogashi
+akogasi
+akogasim
+akogi
+akogieki
+akoiyang
+akoka
+akoko
+akokoedo
+akokolem
+akokolemu
+akola
+akolei
+akoleien
+akolet
+akoli
+akoluthi
+akoluthia
+akonge
+akoniet
+akoniete
+akonieten
+akono
+akonolin
+akonolinga
+akontae
+akonto
+akontoza
+akontozahlung
+akontozahlungen
+akoo
+akoon
+akoose
+akori
+akos
+akoseki
+akosi
+akosua
+akosuchi
+akosutik
+akou
+akoulali
+akoulalion
+akoupe
+akoushi
+akousi
+akov
+akoyi
+akp
+akpa
+akpafu
+akpafulo
+akpafulolobi
+akpafuod
+akpafuodomi
+akpafuto
+akpafutodzi
+akpambe
+akpanzhi
+akparabo
+akparabong
+akpayach
+akpayache
+akpe
+akpek
+akpes
+akpese
+akpet
+akpeteho
+akpetehom
+akpl
+akpml
+akposo
+akposso
+akpoto
+akpwakum
+akq
+akquisit
+akquisiteur
+akquisitorisch
+akr
+akra
+akrabatt
+akrabattine
+akrabbim
+akram
+akran
+akranes
+akrawi
+akrediti
+akreditiv
+akribie
+akribisc
+akribisches
+akritas
+akroasis
+akrobat
+akrobate
+akrobaten
+akrobatenkunststuecke
+akrobati
+akrobatik
+akrobatin
+akrobatisch
+akrobatische
+akrobatischen
+akrobatischer
+akrobatischere
+akrobatisk
+akrobats
+akrochor
+akrochordite
+akron
+akronvax
+akronym
+akronymer
+akropoli
+akropolis
+akroteri
+akroterion
+akrukay
+akryl
+akrylen
+aks
+aksana
+aksaray
+akse
+aksekors
+aksekorsets
+aksel
+akselavs
+akselavstand
+akselbla
+akselblad
+akselen
+akselera
+akselerasjon
+akselerasjonen
+akselerasjoner
+akselerasjonsretningen
+akselere
+akselerer
+akselerere
+akselererende
+akselerert
+akseli
+akselrer
+akselreres
+akseltry
+akseltrykk
+akseltrykkbestemmelsene
+akseltrykket
+aksemagter
+aksen
+aksene
+aksenov
+aksens
+aksent
+aksenten
+aksentue
+aksentuere
+aksentuering
+aksentueringer
+aksentuerte
+aksept
+akseptab
+akseptabel
+akseptabelt
+akseptable
+akseptan
+akseptant
+aksepten
+aksepter
+akseptere
+aksepterer
+aksepteres
+akseptering
+akseptert
+aksepterte
+akser
+akseretn
+akseretningene
+akset
+akshay
+aksial
+aksidens
+aksidenstrykkeri
+aksidenstrykkeriet
+aksiell
+aksielle
+aksiom
+aksiomet
+aksise
+aksisen
+aksje
+aksjeban
+aksjebanker
+aksjebes
+aksjebesittelse
+aksjebre
+aksjebrev
+aksjeeie
+aksjeeier
+aksjeeiere
+aksjeeierne
+aksjeeiernes
+aksjeemi
+aksjeemisjonen
+aksjeemisjoner
+aksjeful
+aksjefullmakter
+aksjeinn
+aksjeinnbydelse
+aksjeinnbydelser
+aksjekap
+aksjekapital
+aksjekapitalen
+aksjekapitalutvidelsen
+aksjekj|
+aksjekj|pet
+aksjekur
+aksjekurs
+aksjekursene
+aksjelei
+aksjeleilighet
+aksjelov
+aksjeloven
+aksjelovens
+aksjelover
+aksjemaj
+aksjemajoriteten
+aksjemar
+aksjemarkede
+aksjemarkedet
+aksjemas
+aksjemassen
+aksjemek
+aksjemekler
+aksjemeklerne
+aksjen
+aksjene
+aksjenes
+aksjenot
+aksjenoteringer
+aksjeoms
+aksjeomsetningen
+aksjepro
+aksjeprotokollen
+aksjer
+aksjesel
+aksjeselskap
+aksjeselskaper
+aksjeselskapet
+aksjesp|
+aksjesp|rsm}ler
+aksjeteg
+aksjetegning
+aksjeutb
+aksjeutbytte
+aksjeutbyttene
+aksjeutbyttet
+aksjeutv
+aksjeutvidelse
+aksjeutvidelsen
+aksjon
+aksjonen
+aksjonene
+aksjoner
+aksjonere
+aksjonert
+aksjonsb
+aksjonsberedskap
+aksjonsbevegelsen
+aksjonse
+aksjonsevne
+aksjonsg
+aksjonsgruppen
+aksjonsi
+aksjonsinnstillingen
+aksjonsk
+aksjonskomiteen
+aksjonsl
+aksjonsledelsen
+aksjonslinje
+aksjonslinjen
+aksjonsp
+aksjonsplan
+aksjonsr
+aksjonsradius
+aksjonsu
+aksjonsutvalg
+aksjon{r
+aksjon{ren
+aksjon{rene
+aksjon{rer
+aksjon{rgrupper
+aksjon{rregister
+akslen
+aksler
+aksnes
+akst
+aksten
+aksu
+akt
+akta
+akte
+akte-exa
+akte-examen
+akte-examens
+aktelse
+aktelsen
+akten
+aktenbae
+aktenbaenden
+aktenber
+aktenberg
+aktenberge
+aktendec
+aktendeckel
+aktendeckels
+aktenein
+akteneinsicht
+aktenfor
+aktenfot
+aktenfotokopien
+aktenkla
+aktenklammern
+aktenkof
+aktenkoffer
+aktenkofferformat
+aktenkun
+aktenkundig
+aktenkundige
+aktenkundigem
+aktenkundiger
+aktenkundiges
+aktenmae
+aktenmaessig
+aktenmaessigem
+aktenmaessigen
+aktenmaessiger
+aktenmap
+aktenmappen
+aktennac
+aktennachlass
+aktennot
+aktennotiz
+aktenord
+aktenordner
+aktenpak
+aktenpaket
+aktenreg
+aktenregister
+aktenregisters
+aktenska
+aktenskap
+aktenskapet
+aktenstu
+aktenstudium
+aktenstueck
+aktentas
+aktentasche
+aktentaschen
+aktentassen
+aktenver
+aktenvermerk
+aktenzei
+aktenzeichen
+akter
+akterdek
+akterdekk
+akterdekket
+akterkan
+akterkant
+akterove
+akterover
+akters
+akterut
+akteruts
+akterutseilt
+aktes
+aktet
+akteur
+akteure
+akteuren
+aktfigur
+aktfiguren
+aktgemae
+aktgemaelden
+aktie
+aktiebol
+aktiebolag
+aktiedeling
+aktief
+aktiekapital
+aktienan
+aktienanlage
+aktienau
+aktienauswahl
+aktienba
+aktienbank
+aktienbe
+aktienbesitz
+aktienbesitze
+aktienbesitzes
+aktienbestaende
+aktienbo
+aktienboerse
+aktienbr
+aktienbrauerei
+aktiener
+aktienertrag
+aktienex
+aktienexperten
+aktienfo
+aktienfonds
+aktienge
+aktiengeschaeft
+aktiengesellschaft
+aktiengesellschaften
+aktiengesetze
+aktiengewinne
+aktiengewinnen
+aktiengl
+aktienglueckstreffer
+aktienha
+aktienhandel
+aktienhausse
+aktienin
+aktienindexe
+aktienindexes
+aktienindizes
+aktieninhaberin
+aktieninhaberinnen
+aktieninhabern
+aktieninvestments
+aktienju
+aktienjuenger
+aktienka
+aktienkaeufe
+aktienkapital
+aktienkapitals
+aktienkauf
+aktienku
+aktienkurse
+aktienkursen
+aktienma
+aktienmaerkte
+aktienmarkt
+aktienmarktes
+aktienme
+aktienmehrheit
+aktienop
+aktienoptionen
+aktienpa
+aktienpakete
+aktienpaketen
+aktienpr
+aktienpreise
+aktienpreisen
+aktienpreises
+aktienre
+aktienrecht
+aktienrechte
+aktiense
+aktienselektion
+aktienum
+aktienumsaetze
+aktienumtausch
+aktienve
+aktienverhoekerer
+aktiepost
+aktier
+aktierne
+akties
+aktieselskab
+aktieselskabsoplysninger
+aktig
+aktigt
+aktion
+aktionae
+aktionaer
+aktionaerbrief
+aktionaere
+aktionaerin
+aktionaerinnen
+aktionaers
+aktionaerskreisen
+aktionaersrechte
+aktionaersregisterverwalter
+aktionaersvereinigungen
+aktionaersversammlung
+aktionaerszeitschrift
+aktionaervertreter
+aktionen
+aktioner
+aktionerne
+aktions
+aktionsa
+aktionsargument
+aktionsargumenter
+aktionsargumenters
+aktionsargumentet
+aktionsausschuss
+aktionsb
+aktionsbewegung
+aktionsdiagram
+aktionsg
+aktionsgemeinschaft
+aktionsgruppe
+aktionsgrupper
+aktionsh
+aktionshaus
+aktionsl
+aktionslos
+aktionsp
+aktionspartei
+aktionsplan
+aktionsr
+aktionsradius
+aktionss
+aktionssprog
+aktionssproget
+aktionsstrategie
+aktionst
+aktionstabel
+aktionstabellen
+aktionstid
+aktionstrupps
+aktistet
+aktistetae
+aktistete
+aktiv
+aktiva
+aktivbez
+aktivbezuege
+aktive
+aktivem
+aktiven
+aktiver
+aktivere
+aktiverede
+aktiverem
+aktiveren
+aktiverer
+aktiveres
+aktiveret
+aktivering
+aktiveringen
+aktiveringspost
+aktiveringsposten
+aktiveringspostens
+aktiveringsposter
+aktiveringsposterne
+aktiveringsposters
+aktiveringsposts
+aktivert
+aktives
+aktivges
+aktivgeschaeft
+aktivier
+aktiviere
+aktivieren
+aktivierend
+aktivierende
+aktivierenden
+aktivierender
+aktivierendes
+aktiviert
+aktivierte
+aktiviertem
+aktivierten
+aktivierter
+aktiviertes
+aktiviertest
+aktivierung
+aktivierungstendenzen
+aktivise
+aktivisere
+aktiviseres
+aktivisering
+aktiviseringen
+aktiviseringsgrupper
+aktivisert
+aktivism
+aktivismus
+aktivist
+aktivisten
+aktivistenbewegung
+aktivistgruppenen
+aktivistist
+aktivita
+aktivita"ten
+aktivita"tsschub
+aktivita"tssteigerung
+aktivitaeten
+aktivitaetsmessung
+aktivite
+aktiviteitencommissie
+aktivitet
+aktiviteten
+aktivitetene
+aktiviteter
+aktiviteterne
+aktivitetsbygg
+aktivitetsbygget
+aktivitetshus
+aktivitetshuset
+aktivitetslyse
+aktivitetsomr}de
+aktivitetsrolle
+aktivitetsuken
+aktivpos
+aktivrec
+aktivrechtsschutz
+aktivsal
+aktivsaldo
+aktivsei
+aktivsein
+aktivseite
+aktivste
+aktivstem
+aktivsten
+aktivstes
+aktivt
+aktivum
+aktivume
+aktivumet
+aktmodel
+akto
+aktoer
+aktolga
+aktor
+aktorat
+aktorate
+aktoratet
+aktorbef
+aktorbefehle
+aktoren
+aktorenr
+aktorenrechnern
+aktortyp
+aktortypen
+aktorzy
+aktp}giv
+aktp}givende
+aktp}givenhet
+aktp}givenheten
+aktris
+aktrise
+akts
+aktsom
+aktsomhe
+aktsomhetsbestemmelse
+aktsomt
+aktstudi
+aktstudien
+aktualis
+aktualisera
+aktualiserer
+aktualiseres
+aktualisering
+aktualisert
+aktualiserte
+aktualisieren
+aktualisiert
+aktualisierten
+aktualisierung
+aktualisierungen
+aktualit
+aktualita"t
+aktualitet
+aktualiteten
+aktualitetsrekke
+aktuar
+aktuaren
+aktuarer
+aktuator
+aktuatoren
+aktuatorrechner
+aktuel
+aktuell
+aktuella
+aktuelle
+aktuellem
+aktuellen
+aktueller
+aktuellere
+aktuelleren
+aktuellerer
+aktuelleres
+aktuelles
+aktuells
+aktuellste
+aktuellstem
+aktuellsten
+aktuellstes
+aktuellt
+aktuelt
+aktuelts
+aktueltsending
+aktur
+aktverdi
+aktverdig
+aktverdige
+akt|r
+akt|ren
+akt|rene
+akt|rer
+aku
+akuamari
+akuammin
+akuammine
+akuapem
+akuapim
+akuarang
+akuba
+akubi
+akubokut
+akubra
+akubun
+akubyou
+akuchibe
+akuchibi
+akuchibu
+akudama
+akudo
+akudou
+akue
+akueikyo
+akueki
+akuekise
+akuekish
+akuekisi
+akuen
+akufuhak
+akufuu
+akugi
+akugou
+akugyaku
+akugyou
+akuhatsu
+akuhatut
+akuhei
+akuheki
+akuhitsu
+akuhitu
+akuhou
+akuhyou
+akui
+akuin
+akuinakk
+akuinoko
+akuji
+akujiki
+akujo
+akujouke
+akujunka
+akujyo
+akujyouk
+akujyunk
+akukanjy
+akukanzy
+akuku
+akula
+akule
+akuliyo
+akum
+akuma
+akumade
+akumadem
+akumei
+akumeita
+akumi
+akumu
+akumyou
+akumyoud
+akunaki
+akunakun
+akunakuna
+akund
+akune
+akunen
+akunenhi
+akuneshi
+akunesi
+akunichi
+akunin
+akuninsy
+akuniti
+akunnu
+akupunkt
+akupunktur
+akura
+akurakur
+akurakura
+akuratsu
+akuratu
+akurei
+akureyri
+akuri
+akurijin
+akurijo
+akurio
+akuriru
+akuriyo
+akurmi
+akuro
+akurobat
+akuropor
+akuru
+akurumi
+akuryoku
+akuryou
+akusai
+akusei
+akuseido
+akuseiki
+akuseiko
+akuseino
+akuseise
+akuseish
+akuseisi
+akuseizo
+akuseku
+akusen
+akusenku
+akusento
+akuseput
+akuseru
+akusesar
+akusessh
+akusessi
+akusesu
+akusetar
+akusetsu
+akusetuo
+akusha
+akushide
+akushin
+akushits
+akushitu
+akusho
+akushon
+akushots
+akushotu
+akushu
+akushuka
+akushuke
+akushumi
+akushuu
+akusiden
+akusin
+akusitsu
+akusitu
+akusituk
+akusou
+akustik
+akustik-
+akustik-koppler
+akustikk
+akustikken
+akustiks
+akustiksensor
+akustisc
+akustisch
+akustische
+akustischen
+akustischer
+akustisches
+akustisk
+akustiska
+akustiske
+akustiskt
+akusyo
+akusyon
+akusyu
+akusyumi
+akusyuu
+akut
+akuta
+akutagaw
+akutagawa
+akutai
+akutan
+akutare
+akutareg
+akute
+akuteibu
+akutem
+akuten
+akutenko
+akutere
+akuterem
+akuteren
+akuteres
+akutes
+akuteste
+akutesten
+akutester
+akutestes
+akutibes
+akutibit
+akutibu
+akutoku
+akutou
+akutsu
+akutsuka
+akutt
+akutte
+akutu
+akutukao
+akuun
+akuwa
+akuwagel
+akuyaku
+akuyou
+akuyuu
+akuzei
+akuzi
+akuziki
+akuzisen
+akuzyo
+akuzyouk
+akuzyunk
+akv
+akvakult
+akvakultur
+akvakulturen
+akvaplan
+akvaplaning
+akvarel
+akvarell
+akvarellen
+akvareller
+akvarier
+akvariet
+akvarium
+akvavit
+akvavits
+akvedukt
+akvedukten
+akw
+akwa
+akwaala
+akwang
+akwanga
+akwapem
+akwapi
+akwapim
+akwawa
+akwaya
+akweto
+akweya
+akwo
+akx
+aky
+akyab
+akye
+akyem
+akyode
+akyumure
+akyurekl
+akyurekli
+akyuu
+akyuusei
+akz
+akzelera
+akzeleration
+akzent
+akzenten
+akzentes
+akzentfr
+akzentfreiem
+akzentlo
+akzentlos
+akzentse
+akzentsetzungen
+akzentui
+akzentuiere
+akzentuierend
+akzentuierende
+akzentuierendem
+akzentuierender
+akzentuierendes
+akzentuierst
+akzentuierte
+akzentuiertem
+akzentuierten
+akzentuiertes
+akzentuiertest
+akzentuiertet
+akzentve
+akzentverschiebungen
+akzept
+akzeptab
+akzeptabel
+akzeptable
+akzeptablen
+akzeptablere
+akzeptan
+akzeptanz
+akzepten
+akzeptes
+akzeptie
+akzeptiere
+akzeptieren
+akzeptierend
+akzeptierendem
+akzeptierenden
+akzeptierender
+akzeptierst
+akzeptiert
+akzeptierte
+akzeptierten
+akzeptierter
+akzeptiertes
+akzeptiertet
+akzeptkr
+akzeptkredite
+akzeptkreditvolumen
+akzeptta
+akzepttausch
+al
+al-basi
+al-tarab
+al-tarabichi
+al.
+ala
+ala`
+ala`mbar
+ala`n
+ala`rabe
+ala`rgama
+ala`rmega
+alaam
+alab
+alaba
+alabable
+alabada
+alabado
+alabador
+alabadora
+alabam
+alabama
+alabamac
+alabamacoushatta
+alabamak
+alabamakoasati
+alabaman
+alabamas
+alabamia
+alabamian
+alabamians
+alabamid
+alabamide
+alabamiento
+alabamin
+alabamine
+alabancera
+alabancero
+alabancia
+alabanciosa
+alabancioso
+alabandi
+alabandina
+alabandite
+alabanza
+alabar
+alabarch
+alabarda
+alabardada
+alabardado
+alabardazo
+alabardero
+alabaste
+alabaster
+alabasto
+alabastos
+alabastr
+alabastrada
+alabastrado
+alabastrian
+alabastrina
+alabastrine
+alabastrino
+alabastrita
+alabastrites
+alabastro
+alabastron
+alabastrum
+alabat
+alabeada
+alabeado
+alabear
+alabeo
+alabiada
+alabiado
+alabias
+alablast
+alablaster
+alacaluf
+alacalufan
+alacatla
+alacatlazala
+alacayo
+alacayuela
+alacena
+alacet
+alacha
+alache
+alachua
+alaciarse
+alack
+alackada
+alackaday
+alacon
+alacra`n
+alacran
+alacranada
+alacranado
+alacrancillo
+alacranera
+alacreat
+alacreatine
+alacreatinine
+alacridad
+alacrify
+alacriti
+alacritie
+alacrities
+alacrito
+alacritous
+alacrity
+alactaga
+alada
+aladagbe
+aladanga
+aladangady
+aladar
+aladdin
+aladdini
+aladdinize
+alade
+alademis
+alademischeres
+aladfar
+aladian
+aladierna
+aladierno
+aladin
+aladinis
+aladinist
+alado
+aladrada
+aladrar
+aladreri`a
+aladrero
+aladro
+aladroque
+aladule
+aladyan
+alafa
+alafia
+alagadiza
+alagadizo
+alagappa
+alagappan
+alagar
+alagartada
+alagartado
+alagartarse
+alagasta
+alagbako
+alagga
+alagi
+alagia
+alagian
+alago
+alagoas
+alagoteri`a
+alagrett
+alagretti
+alaguna
+alagwa
+alahi`lca
+alahmad
+alai
+alaihi
+alaimo
+alain
+alaine
+alaini
+alair
+alaite
+alajor
+alaju`
+alajuela
+alak
+alakaman
+alakanuk
+alakazam
+alakhdar
+alaki
+alakong
+alala
+alala`
+alalao
+alalapad
+alalapadu
+alalau
+alalimo`n
+alalite
+alalonga
+alalouf
+alalunga
+alalus
+alam
+alama
+alaman
+alamance
+alamanni
+alamannian
+alamannic
+alamar
+alamatu
+alambic
+alambicada
+alambicadamente
+alambicado
+alambicamiento
+alambicar
+alambics
+alambiqu
+alambique
+alambique'
+alambique'e
+alambique'es
+alambique's
+alamblak
+alambor
+alamborada
+alamborado
+alambrada
+alambrado
+alambrar
+alambre
+alambrear
+alambrera
+alambrilla
+alambuk
+alameda
+alameda-
+alameda-mil-tac
+alamedas
+alameth
+alamgir
+alami`n
+alamiert
+alamin
+alamina
+alaminadgo
+alaminazgo
+alamir
+alamirre`
+alammele
+alammelech
+alamo
+alamodal
+alamodality
+alamode
+alamodes
+alamogor
+alamogordo
+alamonti
+alamos
+alamosa
+alamosit
+alamosite
+alamota
+alamoth
+alampar
+alamud
+alan
+alana
+alanah
+alanazi
+alanceador
+alanceadora
+alancear
+alancel
+aland
+alandrearse
+alane
+alangan
+alangia`cea
+alangia`ceo
+alangiac
+alangiaceae
+alangiea
+alangieo
+alangin
+alangine
+alangium
+alangui
+alanguie
+alanguies
+alanguir
+alanguis
+alanguissement
+alani
+alanine
+alanis
+alaniz
+alanna
+alannah
+alano
+alanoly
+alanreed
+alans
+alanson
+alant
+alante
+alanten
+alantic
+alantika
+alantin
+alantoides
+alantol
+alantola
+alantolactone
+alantoli
+alantolic
+alantswi
+alantswijn
+alantswo
+alantswortel
+alantswortels
+alanturi
+alanturing
+alantz
+alanyl
+alanzar
+alapaha
+alaqueca
+alaqueque
+alaquine
+alaquines
+alar
+alara
+alarbe
+alarbus
+alarcon
+alarconiana
+alarconiano
+alard
+alarde
+alardear
+alardo
+alardosa
+alardoso
+alares
+alargadamente
+alargadera
+alargador
+alargadora
+alargamiento
+alargar
+alargas
+alarguez
+alari
+alaria
+alaric
+alarida
+alaridar
+alarido
+alarie
+alarifadgo
+alarifalgo
+alarifazgo
+alarife
+alarije
+alarm
+alarm		
+alarma
+alarmabl
+alarmable
+alarmador
+alarmadora
+alarmaie
+alarmaient
+alarmais
+alarmait
+alarmanl
+alarmanlagen
+alarmanlegg
+alarmant
+alarmante
+alarmantes
+alarmants
+alarmar
+alarmaus
+alarmausgang
+alarmber
+alarmbereite
+alarmbereitem
+alarmbereiten
+alarmbereites
+alarmbereitschaft
+alarmbereitschaften
+alarmbla
+alarmblazer
+alarmblazers
+alarmclo
+alarmclock
+alarme
+alarme'
+alarme'e
+alarme'es
+alarme's
+alarme`r
+alarme`rent
+alarmed
+alarmedl
+alarmedly
+alarmeer
+alarmeerde
+alarmeerden
+alarmeert
+alarmen
+alarment
+alarmer
+alarmera
+alarmerai
+alarmeraient
+alarmerais
+alarmerait
+alarmeras
+alarmere
+alarmeren
+alarmerende
+alarmerez
+alarmeri
+alarmeriez
+alarmerions
+alarmero
+alarmerons
+alarmeront
+alarmert
+alarmerte
+alarmes
+alarmez
+alarmflu
+alarmfluit
+alarmfluiten
+alarmglo
+alarmglocke
+alarmier
+alarmiere
+alarmieren
+alarmierende
+alarmierendem
+alarmierenden
+alarmierendes
+alarmierst
+alarmiert
+alarmierten
+alarmiertest
+alarmiertet
+alarmiez
+alarming
+alarmingly
+alarmion
+alarmions
+alarmism
+alarmisms
+alarmist
+alarmista
+alarmiste
+alarmisten
+alarmistes
+alarmists
+alarmket
+alarmkette
+alarmkli
+alarmklingeln
+alarmklo
+alarmklok
+alarmklokken
+alarmklokker
+alarmkno
+alarmknopf
+alarmkre
+alarmkreet
+alarmkreten
+alarmmel
+alarmmeldung
+alarmons
+alarmpei
+alarmpeil
+alarmruf
+alarmrufen
+alarms
+alarmsch
+alarmschel
+alarmschellen
+alarmsei
+alarmsein
+alarmseinen
+alarmsen
+alarmsendung
+alarmsig
+alarmsignaal
+alarmsignal
+alarmsignalen
+alarmson
+alarmsonderstab
+alarmsys
+alarmsystem
+alarmueb
+alarmuebung
+alarmur
+alarmvlo
+alarmvlotter
+alarmvlotters
+alarmzei
+alarmzeichen
+alarmzus
+alarmzustand
+alarodia
+alarodian
+alaroz
+alaroza
+alarse
+alarum
+alarumed
+alarumin
+alaruming
+alarums
+alary
+alas
+alasai
+alascan
+alasdair
+alaska
+alaskaca
+alaskacanada
+alaskait
+alaskaite
+alaskan
+alaskans
+alaskas
+alaskast
+alaskastrasse
+alaskite
+alasklue
+alaskluet
+alassad
+alastair
+alasteir
+alaster
+alastrar
+alastrim
+alasu
+alat
+alataghw
+alataghwa
+alatar
+alate
+alate`s
+alated
+alatenin
+alatening
+alatern
+alaterno
+alaternu
+alaternus
+alatesu
+alatil
+alatinada
+alatinadamente
+alatinado
+alatinin
+alatining
+alation
+alato`n
+alatonero
+alatorre
+alatro`n
+alattas
+alauagat
+alauda
+alaude
+alaudida
+alaudidae
+alaudine
+alaunian
+alavanco
+alave`s
+alavencina
+alavencino
+alavense
+alavesa
+alavi
+alawa
+alawi
+alawic
+alawite
+alaya
+alayaan
+alayne
+alaza`n
+alazana
+alazano
+alaziz
+alazo
+alazor
+alazreal
+alb
+alba
+alba\al
+alba\ar
+alba\ear
+alba\eri`a
+alba\i
+alba\i`
+alba\il
+alba\ila
+alba\ileri`a
+alba\ir
+alba^tre
+albacara
+albacea
+albaceazgo
+albacete\a
+albacete\o
+albacetense
+albach
+albacora
+albacore
+albacores
+albacoro`n
+albada
+albadena
+albahaca
+albahaquero
+albahaquilla
+albahi`o
+albaicin
+albaida
+albainn
+albaire
+albajara
+albala`
+albalaero
+albalak
+albalo
+alban
+albana
+albanada
+albanado
+albanais
+albanaise
+albanaises
+albanar
+albane
+albane`s
+albanecar
+albanees
+albanega
+albaneguero
+albanens
+albanenses
+albanensian
+albaner
+albanesa
+albanese
+albaneze
+albanezen
+albani`
+albania
+albanian
+albanianitalians
+albanians
+albanie
+albanien
+albaniens
+albanisc
+albanische
+albanite
+albano
+albanos
+albans
+albansk
+albany
+albanycs
+albaqui`a
+albar
+albara`n
+albarazada
+albarazado
+albarazo
+albarca
+albarco
+albarcoque
+albarcoquero
+albarda
+albarda`n
+albardada
+albardado
+albardanear
+albardaneri`a
+albardani`a
+albardar
+albardela
+albardera
+albarderi`a
+albardero
+albardi`n
+albardilla
+albardin
+albardinar
+albardine
+albardo`n
+albardoneri`a
+albardonero
+albarejo
+albarell
+albarello
+albareque
+albaret
+albarico
+albaricoque
+albaricoquero
+albarigo
+albarillo
+albarino
+albarium
+albariza
+albarizo
+albarra`n
+albarra`nea
+albarra`neo
+albarrad
+albarrada
+albarradas
+albarrana
+albarrani`a
+albarraniega
+albarraniego
+albarranilla
+albarraz
+albarrazada
+albarrazado
+albarsa
+albashir
+albasiny
+albaspid
+albaspidin
+albast
+albasten
+albastgl
+albastglas
+albastpa
+albastpapier
+albata
+albatoza
+albatros
+albatross
+albatrossen
+albatrosses
+albay
+albayaldada
+albayaldado
+albayalde
+albazana
+albazano
+albe
+albe`itar
+albe`ntola
+albe`rchiga
+albe`rchigo
+albea
+albear
+albedil
+albedill
+albedillen
+albedo
+albedo-v
+albedo-veraenderung
+albedogr
+albedograph
+albedos
+albedri`o
+albedriador
+albedriadora
+albedriar
+albedro
+albee
+albegar
+albegger
+albeggera
+albeggerai
+albeggerei
+albeggero
+albeggi
+albeggia
+albeggiai
+albeggiamo
+albeggiano
+albeggiare
+albeggiata
+albeggiate
+albeggiati
+albeggiato
+albeggiava
+albeggiavi
+albeggiavo
+albeggin
+albeggino
+albeggio
+albehoed
+albehoeder
+albeit
+albeiteri`a
+albeldadero
+albeldar
+albeldense
+albellanino
+albello`n
+albemarl
+albemarle
+alben
+albenda
+albendera
+albengala
+albeon
+alber
+albera
+alberca
+alberchigal
+alberchiguero
+albercoque
+albercoquero
+alberene
+albergada
+albergador
+albergadora
+albergadura
+albergar
+alberge
+albergero
+alberghe
+alberghetti
+alberghi
+albergo
+albergue
+alberguera
+albergueri`a
+alberguero
+alberi
+alberic
+alberich
+alberik
+albern
+alberne
+albernem
+albernen
+albernes
+albernhe
+albernheit
+albernheiten
+alberni
+albero
+alberque
+alberquera
+alberquero
+albers
+alberse
+albert
+alberta
+albertaz
+albertazzi
+albertci
+albertcity
+albertei
+alberteinstein
+alberti
+albertin
+albertina
+albertine
+albertini
+albertinian
+albertis
+albertist
+albertit
+albertite
+albertle
+albertlea
+alberto
+alberton
+alberts
+albertslund
+albertso
+albertson
+albertus
+albertustaler
+albertvi
+albertville
+alberty
+albertyp
+albertype
+albery
+albescen
+albescence
+albescent
+albeschi
+albeschik
+albeschikken
+albespin
+albespine
+albestuu
+albestuur
+albestuurder
+albetad
+albi
+albi`n
+albia
+albian
+albicans
+albicant
+albicante
+albicati
+albication
+albicocc
+albicocca
+albicocche
+albiculi
+albie
+albifica
+albification
+albificative
+albiflor
+albiflorous
+albify
+albigens
+albigense
+albigenses
+albigensian
+albigensianism
+albihar
+albilla
+albillo
+albin
+albina
+albinal
+albine
+albineri
+albiness
+albini
+albinic
+albinism
+albinisme
+albinismo
+albinisms
+albinist
+albinistic
+albino
+albino's
+albinoen
+albinois
+albinoism
+albinos
+albinoti
+albinotic
+albinuri
+albinuria
+albion
+albireo
+albiston
+albita
+albitana
+albite
+albitic
+albitite
+albitiza
+albitization
+albitoph
+albitophyre
+albitski
+albitskij
+albizzia
+albm
+albo
+albo`ndiga
+albo`rbola
+alboaire
+albocarb
+albocarbon
+albocine
+albocinereous
+albococc
+albococcus
+albocrac
+albocracy
+alboge
+albogele
+albogeledd
+albogeleddet
+albogen
+albogo`n
+albogue
+alboguear
+alboguera
+alboguero
+albohera
+alboheza
+albohol
+alboin
+albolga
+albolite
+albolith
+albollo`n
+albondiguilla
+albopann
+albopannin
+alboprui
+albopruinose
+alboquero`n
+albor
+alborada
+alborak
+alborani
+alboranite
+alborear
+alborecer
+alborg
+alborga
+alborn
+alborni`a
+alborno
+albornoz
+alborocera
+alboroni`a
+alboroque
+alborotada
+alborotadamente
+alborotadiza
+alborotadizo
+alborotado
+alborotador
+alborotadora
+alborotapueblos
+alborotar
+alborote
+alboroto
+alborozadamente
+alborozador
+alborozadora
+alborozamiento
+alborozar
+alborozo
+alborto
+alboti`n
+alboyna
+alboyo
+albrecht
+albricia
+albriciar
+albricias
+albright
+albrightsville
+albritto
+albritton
+albronze
+albrook
+albruna
+albs
+albtenta
+albtentac
+albu`mina
+albuca
+albudeca
+albue
+albue`rbola
+albueled
+albueleddet
+albuen
+albuerom
+albufera
+albugi`nea
+albugi`neo
+albugina
+albuginaceae
+albugine
+albuginea
+albugineous
+albugini
+albuginitis
+albugo
+albuhera
+albuin
+albulesc
+albulescu
+album
+albumbla
+albumblad
+albumbladen
+albumean
+albumen
+albumene
+albumeni
+albumenization
+albumenize
+albumenizer
+albumens
+albumet
+albumime
+albumimeter
+albumin
+albumina
+albuminada
+albuminado
+albuminar
+albuminate
+albuminaturia
+albumine
+albuminepapier
+albumini
+albuminiferous
+albuminiform
+albuminimeter
+albuminimetry
+albuminiparous
+albuminization
+albuminize
+albumino
+albumino`metro
+albuminocholia
+albuminofibrin
+albuminogenous
+albuminoid
+albuminoidal
+albuminoide
+albuminoidea
+albuminoideo
+albuminolysis
+albuminometer
+albuminometry
+albuminone
+albuminorrhea
+albuminosa
+albuminoscope
+albuminose
+albuminosis
+albuminoso
+albuminous
+albuminousness
+albumins
+albuminu
+albuminuria
+albuminuric
+albumoid
+albumosc
+albumoscope
+albumose
+albumosu
+albumosuria
+albums
+albumver
+albumvers
+albumverzen
+albuquer
+albuquerque
+albur
+albura
+alburaq
+alburente
+alburero
+alburg
+alburger
+alburn
+alburnet
+alburnett
+alburno
+alburnou
+alburnous
+alburnum
+alburom
+alburomm
+alburommet
+alburtis
+albury
+albus
+albutann
+albutannin
+alby
+albyl
+albyn
+alc
+alc-eds
+alca
+alca\izana
+alca\izano
+alca`ndara
+alca`ndor
+alca`ntara
+alca`zar
+alcaaba
+alcabala
+alcabalatoria
+alcabalatorio
+alcabalero
+alcabor
+alcabota
+alcabtea
+alcabuz
+alcace\a
+alcacel
+alcacer
+alcaceri`a
+alcachofa
+alcachofada
+alcachofado
+alcachofal
+alcachofar
+alcachofera
+alcachofero
+alcaci`
+alcacil
+alcadafe
+alcaduz
+alcae
+alcaeceri`a
+alcafar
+alcahaz
+alcahazada
+alcahazar
+alcahotar
+alcahoteri`a
+alcahueta
+alcahuetar
+alcahuetazgo
+alcahuete
+alcahuetear
+alcahueteri`a
+alcaic
+alcaiceri`a
+alcaico
+alcaid
+alcaide
+alcaidesa
+alcaidi`a
+alcaidiado
+alcairi`a
+alcairo
+alcala
+alcaladina
+alcaladino
+alcalae\a
+alcalae\o
+alcalaina
+alcalaino
+alcalare\a
+alcalare\o
+alcaldada
+alcalde
+alcaldes
+alcaldesa
+alcaldeship
+alcaldi`a
+alcaldi`o
+alcaldia
+alcalescencia
+alcali`metro
+alcalifa
+alcalifaje
+alcalige
+alcaligenes
+alcalin
+alcaline
+alcalines
+alcalini
+alcalinidad
+alcaliniser
+alcalins
+alcaliza
+alcalizacio`n
+alcalizar
+alcalizate
+alcall
+alcaller
+alcalleri`a
+alcalli`a
+alcaloide
+alcaloidea
+alcaloideo
+alcalosis
+alcalzar
+alcamar
+alcamine
+alcamiz
+alcamoni`as
+alcana
+alcana`
+alcance
+alcanci`a
+alcanciazo
+alcandi`a
+alcandial
+alcandiga
+alcandor
+alcandora
+alcaneri`a
+alcanfor
+alcanforada
+alcanforar
+alcanforero
+alcanir
+alcanna
+alcantar
+alcantara
+alcantaranon
+alcantarilla
+alcantarillada
+alcantarillado
+alcantarillar
+alcantarillero
+alcantarina
+alcantarines
+alcantarino
+alcanzada
+alcanzadiza
+alcanzadizo
+alcanzado
+alcanzador
+alcanzadora
+alcanzadura
+alcanzamiento
+alcanzante
+alcanzar
+alcaparra
+alcaparrada
+alcaparrado
+alcaparral
+alcaparrera
+alcaparro
+alcaparro`n
+alcaparrosa
+alcapone
+alcarace\a
+alcarace\o
+alcarava`n
+alcaravanero
+alcaravea
+alcaraz
+alcarce\a
+alcarce\al
+alcarchofa
+alcarchofada
+alcarchofado
+alcarchofar
+alcarcil
+alcari`a
+alcarracera
+alcarracero
+alcarraz
+alcarraza
+alcarre\a
+alcarre\o
+alcarria
+alcartaz
+alcatara
+alcatenes
+alcatifa
+alcatifar
+alcatife
+alcatifero
+alcatras
+alcatraz
+alcauci`
+alcaucil
+alcaudo`n
+alcavela
+alcavera
+alcayata
+alcayatar
+alcayde
+alcazaba
+alcazar
+alcazare\a
+alcazare\o
+alcazars
+alcazuz
+alce
+alcea
+alcedine
+alcedines
+alcedini
+alcedinidae
+alcedininae
+alcedo
+alcedo`n
+alcelaph
+alcelaphine
+alcelaphus
+alceo
+alcerro
+alces
+alcester
+alcestis
+alchemic
+alchemical
+alchemically
+alchemie
+alchemies
+alchemil
+alchemilla
+alchemis
+alchemist
+alchemisten
+alchemistic
+alchemistical
+alchemistry
+alchemists
+alchemiz
+alchemize
+alchemy
+alchera
+alcherin
+alcheringa
+alchimie
+alchimis
+alchimist
+alchimiste
+alchimisten
+alchimisterij
+alchimistes
+alchimy
+alchitra
+alchitran
+alchocho
+alchochoden
+alchorne
+alchornea
+alchoteri`a
+alchub
+alchymie
+alchymies
+alchymy
+alcibiad
+alcibiadean
+alcibiades
+alcicorn
+alcicornium
+alcidae
+alcide
+alcides
+alcidine
+alcindor
+alcine
+alcino
+alcinoe
+alcinous
+alcio`n
+alcionio
+alcionito
+alcippe
+alcira
+alcire\a
+alcire\o
+alcista
+alclad
+alcmena
+alco
+alco^ve
+alco^ves
+alcoa
+alcoate
+alcoba
+alcobilla
+alcocarra
+alcock
+alcofol
+alcofolar
+alcogel
+alcogene
+alcohate
+alcohela
+alcoho`lica
+alcoho`lico
+alcohol
+alcohola
+alcoholada
+alcoholado
+alcoholador
+alcoholadora
+alcoholar
+alcoholate
+alcoholato
+alcoholature
+alcoholaturo
+alcohold
+alcoholdom
+alcohole
+alcoholemia
+alcoholen
+alcoholera
+alcoholero
+alcoholg
+alcoholgebruik
+alcoholh
+alcoholhoudend
+alcoholhoudende
+alcoholhoudender
+alcoholhoudendst
+alcoholi
+alcoholi`metro
+alcoholic
+alcoholica
+alcoholically
+alcoholicity
+alcoholics
+alcoholimeter
+alcoholisch
+alcoholische
+alcoholischer
+alcoholischt
+alcoholiseer
+alcoholiseerde
+alcoholiseerden
+alcoholiseert
+alcoholiseren
+alcoholism
+alcoholisme
+alcoholismo
+alcoholist
+alcoholisten
+alcoholizable
+alcoholizacio`n
+alcoholizada
+alcoholizado
+alcoholizar
+alcoholization
+alcoholize
+alcoholized
+alcoholizing
+alcoholm
+alcoholmeter
+alcoholmetric
+alcoholmisbruik
+alcoholo
+alcoholomania
+alcoholometer
+alcoholometric
+alcoholometrical
+alcoholometry
+alcoholophilia
+alcohols
+alcoholu
+alcoholuria
+alcoholv
+alcoholvrij
+alcoholvrije
+alcoholvrijes
+alcoholy
+alcoholysis
+alcoholytic
+alcol
+alcoli
+alcolla
+alcolu
+alcomeni`as
+alcon
+alconbry
+alconbry-piv-2
+alconbur
+alconbury
+alconbury-am1
+alconcilla
+alcool
+alcoole'
+alcoole'mie
+alcooliq
+alcoolique
+alcooliques
+alcoolis
+alcoolisa
+alcoolisaient
+alcoolisait
+alcoolisant
+alcoolise
+alcoolise'
+alcoolise'e
+alcoolise'es
+alcoolise's
+alcoolise`rent
+alcoolisent
+alcooliser
+alcoolisera
+alcooliseraient
+alcooliserait
+alcooliseront
+alcoolisme
+alcools
+alcootes
+alcootest
+alcootests
+alcor
+alcora
+alcora`n
+alcora`nica
+alcora`nico
+alcoran
+alcorana
+alcorani
+alcoranic
+alcoranist
+alcoranista
+alcorano
+alcorce
+alcorci`
+alcoriza
+alcornoc
+alcornocal
+alcornoco
+alcornoq
+alcornoque
+alcornoque\a
+alcornoque\o
+alcorque
+alcorza
+alcorzada
+alcorzado
+alcorzar
+alcosol
+alcota`n
+alcotana
+alcotate
+alcoto`n
+alcotoni`a
+alcott
+alcova
+alcove
+alcoved
+alcover
+alcoves
+alcovino
+alcovinometer
+alcoyana
+alcoyano
+alcrebite
+alcribi`s
+alcribite
+alcroco
+alcu\a
+alcu\o
+alcubilla
+alcucera
+alcucero
+alcuinia
+alcuinian
+alcun
+alcuna
+alcune
+alcuni
+alcurnia
+alcutt
+alcuza
+alcuzada
+alcuzcucero
+alcuzcuz
+alcuzcuzu
+alcyon
+alcyonac
+alcyonacea
+alcyonacean
+alcyonar
+alcyonaria
+alcyonarian
+alcyone
+alcyones
+alcyoneu
+alcyoneus
+alcyonia
+alcyoniaceae
+alcyonic
+alcyonif
+alcyoniform
+alcyoniu
+alcyonium
+alcyonoi
+alcyonoid
+ald
+ald-gdss
+alda
+aldaar
+aldabada
+aldabazo
+aldabear
+aldabeo
+aldabi`a
+aldabilla
+aldabo`n
+aldabonazo
+aldabra
+aldama
+aldamine
+aldan
+aldane
+aldas
+aldazin
+aldazine
+aldea
+aldeamen
+aldeament
+aldeana
+aldeanamente
+aldeaniega
+aldeaniego
+aldeanismo
+aldeano
+aldeans
+aldebara
+aldebara`n
+aldebaran
+aldebaranium
+aldehi`do
+aldehol
+aldehuela
+aldehyda
+aldehydase
+aldehyde
+aldehydes
+aldehydi
+aldehydic
+aldehydine
+aldehydr
+aldehydrol
+aldeles
+alden
+aldena
+aldenvil
+aldenville
+aldeo`n
+aldeorrio
+aldeorro
+alder
+alderami
+alderamin
+aldercre
+aldercreek
+alderdic
+alderdice
+alderdom
+alderdommelig
+alderdommen
+alderdomsforsikring
+alderdomsforsker
+alderdomspensjon
+aldere
+alderen
+alderens
+alderfer
+alderman
+aldermanate
+aldermancy
+aldermaness
+aldermanic
+aldermanical
+aldermanity
+aldermanlike
+aldermanly
+aldermanry
+aldermanship
+aldermen
+aldern
+alderney
+alderpoi
+alderpoint
+alderredor
+alders
+aldersbo
+aldersboliger
+aldersfo
+aldersfordeling
+aldersfordelingen
+aldersforskjell
+aldersgr
+aldersgrense
+aldersgrensebestemmelsene
+aldersgrensen
+aldersgrenser
+aldersgruppe
+aldersgruppen
+aldersgrupper
+aldershe
+aldersheim
+aldersheimen
+aldersheimene
+aldershj
+aldershjem
+aldershjemmet
+alderskl
+aldersklasse
+aldersko
+alderskonstellasjon
+alderson
+alderspe
+alderspensjon
+alderspensjonen
+alderssa
+alderssammensetning
+aldersst
+aldersstegen
+aldersstegene
+aldersti
+alderstillegg
+alderstr
+alderstrinn
+alderstrygd
+alderstrygdede
+alderst|
+alderst|tte
+alderwom
+alderwoman
+alderwomen
+aldhafar
+aldhafara
+aldhafer
+aldhafera
+aldhizer
+aldie
+aldim
+aldime
+aldimine
+aldin
+aldina
+aldine
+aldinha
+aldino
+aldis
+aldiza
+aldncf
+aldo
+aldohept
+aldoheptose
+aldohexo
+aldohexose
+aldokete
+aldoketene
+aldol
+aldolfo
+aldoliza
+aldolization
+aldolize
+aldon
+aldonono
+aldononose
+aldoor
+aldoordr
+aldoordringend
+aldoordringende
+aldopent
+aldopentose
+aldor
+aldorta
+aldose
+aldoside
+aldous
+aldoxime
+aldra
+aldra`n
+aldrar
+aldras
+aldre
+aldredge
+aldren
+aldrende
+aldrene
+aldrer
+aldri
+aldric
+aldrich
+aldridge
+aldrig
+aldrin
+aldring
+aldringe
+aldringen
+aldrins
+aldrovan
+aldrovanda
+aldst
+aldsta
+aldu`car
+aldunx
+aldus
+aldwin
+aldyn
+ale
+ale'a
+ale'as
+ale'atoi
+ale'atoire
+ale'atoires
+ale'ser
+ale`n
+alea
+aleacio`n
+aleak
+alealum
+aleander
+aleandro
+alear
+aleatori
+aleatoria
+aleatorie
+aleatorii
+aleatorio
+aleatory
+alebench
+aleberry
+alebion
+alebrarse
+alebrastarse
+alebrestarse
+alebronarse
+alec
+aleccionador
+aleccionadora
+aleccionamiento
+aleccionar
+alece
+aleche
+alechigar
+alechugada
+alechugado
+alechugar
+alecia
+alecitha
+alecithal
+alecize
+aleck
+alecki
+aleconne
+aleconner
+alecos
+alecost
+alecri`n
+alecs
+alecto
+alectomancia
+alectori
+alectoria
+alectorides
+alectoridine
+alectorioid
+alectoris
+alectoro
+alectoromachy
+alectoromancy
+alectoromorphae
+alectoromorphous
+alectoropodes
+alectoropodous
+alectrio
+alectrion
+alectrionidae
+alectryo
+alectryomachy
+alectryomancy
+alectryon
+alecup
+aleda
+aleda\a
+aleda\o
+aledo
+aledore
+alee
+aleece
+aleen
+aleer
+alef
+alefangina
+alefnull
+alefriz
+alefs
+aleft
+alefzero
+alegacio`n
+alegamar
+aleganarse
+alegar
+alegato
+alege
+alegi
+alego`rica
+alego`ricamente
+alego`rico
+alegori`a
+alegorizar
+alegra
+alegrador
+alegradora
+alegradura
+alegrante
+alegranza
+alegrar
+alegre
+alegremente
+alegreta
+alegrete
+alegreto
+alegreza
+alegri`a
+alegro
+alegro`n
+alegrosa
+alegroso
+alehoof
+alehouse
+alehouses
+aleian
+aleine
+aleiniko
+aleinikov
+aleinste
+aleinstein
+aleja
+alejamiento
+alejandr
+alejandra
+alejandre
+alejandri`a
+alejandrina
+alejandrino
+alejandro
+alejar
+aleje
+alejija
+alejo
+alejoa
+alejor
+alejur
+alekano
+aleke
+alekhin
+aleknagi
+aleknagik
+aleko
+aleksa
+aleksand
+aleksandar
+aleksander
+aleksandr
+aleksandrov
+aleksandur
+aleksant
+aleksanteri
+alekseev
+aleksey
+aleksi
+aleksic
+aleksis
+alekto
+alelamiento
+alelar
+alelevi`
+aleli`
+aleluya
+alem
+alema
+alema`n
+alema`nica
+alema`nico
+aleman
+alemana
+alemanda
+alemane`s
+alemanesa
+alemanesca
+alemanesco
+alemanisca
+alemanisco
+alemanne
+alemannen
+alemanni
+alemannia
+alemannian
+alemannic
+alemannische
+alemannish
+alembic
+alembica
+alembicate
+alembics
+alembrarse
+alembrot
+alembroth
+alemeth
+alemite
+alemmal
+alemmane
+alemonge
+alemonger
+alemu
+alen
+alena
+alencon
+alende
+alene
+aleng
+alenguamiento
+alenguar
+alentada
+alentadamente
+alentado
+alentador
+alentadora
+alentar
+alentosa
+alentoso
+alentour
+alentours
+aleochar
+aleochara
+aleonada
+aleonado
+aleong
+alepa
+alepe
+aleph
+alephs
+alephzer
+alephzero
+alepi`n
+alepidot
+alepidote
+alepole
+alepot
+aleppine
+aleppo
+aler
+alera
+alerce
+alere
+alergia
+alerme
+alero
+alers
+alerse
+alert
+alerta
+alertaie
+alertaient
+alertais
+alertait
+alertamente
+alertant
+alertar
+alerte
+alerte'
+alerte'e
+alerte'es
+alerte's
+alerte`r
+alerte`rent
+alerted
+alertedl
+alertedly
+alerteme
+alertement
+alertent
+alerter
+alertera
+alerterai
+alerteraient
+alerterais
+alerterait
+alerteras
+alertere
+alerterez
+alerteri
+alerteriez
+alerterions
+alertero
+alerterons
+alerteront
+alerters
+alertes
+alertest
+alertez
+alertiez
+alerting
+alertion
+alertions
+alertly
+alertnes
+alertness
+alerto
+alertons
+alerts
+alerzal
+ales
+alesan
+alesana
+alese
+alesha
+aleshire
+aleshkya
+aleshkyavichene
+alesna
+alesnada
+alesnado
+alessand
+alessandra
+alessandro
+alestake
+aleta
+aletada
+aletap
+aletargamiento
+aletargar
+aletaste
+aletaster
+aletazo
+aletear
+aleteo
+aletha
+alethea
+aletheia
+alethiol
+alethiology
+alethopt
+alethopteis
+alethopteroid
+alethosc
+alethoscope
+aleto
+aletocyt
+aletocyte
+aletri`a
+aletris
+aletta
+alette
+aletter
+aleudar
+aleukemi
+aleukemic
+aleurite
+aleurites
+aleuriti
+aleuritic
+aleurobi
+aleurobius
+aleurode
+aleurodes
+aleurodi
+aleurodidae
+aleuroma
+aleuromancy
+aleurome
+aleurometer
+aleuron
+aleurona
+aleuronat
+aleurone
+aleuroni
+aleuronic
+aleurosc
+aleuroscope
+aleusera
+aleusero
+aleut
+aleutian
+aleutians
+aleutic
+aleutite
+aleuts
+alev
+alevantadiza
+alevantadizo
+alevantamiento
+alevantar
+aleve
+alevel
+alevemente
+alevi
+aleviar
+alevica
+alevilla
+alevin
+aleviner
+alevins
+alevo
+alevosa
+alevosamente
+alevosi`a
+alevoso
+alewife
+alewives
+alex
+alex-va-
+alex-va-wfo
+alexa
+alexan
+alexana
+alexande
+alexander
+alexandercity
+alexanderplatz
+alexanders
+alexanderschlacht
+alexandr
+alexandra
+alexandrakis
+alexandre
+alexandreid
+alexandria
+alexandria-emh1
+alexandria-emh2
+alexandria-emh3
+alexandria-emh4
+alexandria-emh5
+alexandria-ignet
+alexandria-mil80
+alexandria3
+alexandria3-tac
+alexandriabay
+alexandriacairo
+alexandrian
+alexandrianism
+alexandrians
+alexandridis
+alexandrijn
+alexandrijnen
+alexandrijns
+alexandrijnse
+alexandrina
+alexandrine
+alexandrines
+alexandrite
+alexandro
+alexandroff
+alexandros
+alexandrov
+alexandrova
+alexandrovna
+alexandrovsky
+alexandru
+alexas
+alexei
+alexej
+alexendr
+alexi
+alexia
+alexian
+alexic
+alexifa`rmaca
+alexifa`rmaco
+alexin
+alexina
+alexine
+alexinic
+alexio
+alexipha
+alexipharmacon
+alexipharmacum
+alexipharmic
+alexipharmical
+alexipyr
+alexipyretic
+alexis
+alexiter
+alexiteric
+alexiterical
+alexius
+alexix
+alexon
+alexson
+alexy
+aleya
+aleyard
+aleyniko
+aleynikova
+aleyrode
+aleyrodes
+aleyrodi
+aleyrodid
+aleyrodidae
+alezan
+alezane
+alezanes
+alezans
+alezna
+aleznada
+aleznado
+alezo
+alf
+alfa
+alfa`bega
+alfabe`tica
+alfabe`ticamente
+alfabe`tico
+alfabet
+alfabete
+alfabeter
+alfabetet
+alfabeti
+alfabeticamente
+alfabetiche
+alfabetico
+alfabetisch
+alfabetische
+alfabetiseer
+alfabetiseerde
+alfabetiseerden
+alfabetiseert
+alfabetisere
+alfabetiseren
+alfabetiserer
+alfabetiseres
+alfabetisering
+alfabetiseringen
+alfabetisert
+alfabetisk
+alfabetiske
+alfabetizar
+alfabeto
+alfabett
+alfabetten
+alfadi`a
+alfagras
+alfaguara
+alfahar
+alfahareri`a
+alfaharero
+alfaida
+alfaja
+alfaje
+alfajeme
+alfaji`a
+alfajor
+alfalfa
+alfalfal
+alfalfar
+alfalfas
+alfalfe
+alfalfez
+alfama
+alfamar
+alfamarada
+alfambra
+alfana
+alfandoque
+alfaneque
+alfanigue
+alfanjada
+alfanjado
+alfanjazo
+alfanje
+alfanjete
+alfano
+alfanume
+alfanumeriche
+alfanumerici
+alfanumerico
+alfanumerisk
+alfanumeriske
+alfaque
+alfaqueque
+alfaqui
+alfaqui`
+alfaqui`n
+alfaquin
+alfar
+alfaraz
+alfarda
+alfardar
+alfardaw
+alfardaws
+alfardero
+alfardilla
+alfardo`n
+alfareme
+alfarense
+alfareri`a
+alfarero
+alfargo
+alfarist
+alfarje
+alfarji`a
+alfarma
+alfarnate
+alfaro
+alfarrazar
+alfas
+alfaskop
+alfatern
+alfaterna
+alfaya
+alfayat
+alfayata
+alfayate
+alfayateri`a
+alfayo
+alfazaque
+alfe\a
+alfe\ar
+alfe\icarse
+alfe\ique
+alfe`izar
+alfe`rez
+alfefolket
+alfeiza
+alfendio
+alfenide
+alfer
+alferazgo
+alferce
+alfereci`a
+alferezado
+alferova
+alferraz
+alferus
+alferuss
+alferussen
+alfet
+alfi
+alficoz
+alfie
+alfie`rez
+alfier
+alfieri
+alfiero
+alfil
+alfilari
+alfilaria
+alfilel
+alfiler
+alfilerazo
+alfilerera
+alfileresca
+alfileresco
+alfileri
+alfileria
+alfilerilla
+alfilerillo
+alfiletero
+alfinde
+alfinge
+alfio
+alfiona
+alfirk
+alfitete
+alfiz
+alfo
+alfo`cigo
+alfo`ncigo
+alfo`ndega
+alfo`ndiga
+alfo`nsigo
+alfo`stiga
+alfo`stigo
+alfold
+alfoli`
+alfoliero
+alfolinero
+alfombra
+alfombrar
+alfombrera
+alfombrero
+alfombrilla
+alfombrista
+alfondeguero
+alfons
+alfonsario
+alfonse
+alfonsearse
+alfonsi
+alfonsi`
+alfonsin
+alfonsina
+alfonsino
+alfonsismo
+alfonso
+alfonsus
+alfonzo
+alford
+alforfo`n
+alfori`n
+alforiz
+alforja
+alforjera
+alforjero
+alforjo`n
+alforjuela
+alforre
+alforrochar
+alforrocho
+alforza
+alforzar
+alfoz
+alfrd
+alfre
+alfred
+alfreda
+alfredo
+alfredst
+alfredstation
+alfredte
+alfredtech
+alfresco
+alfridar
+alfridaric
+alfridary
+alfur
+alfurese
+alfuro
+alfven
+alfy
+alg
+alga
+algabe\a
+algabe\o
+algadara
+algae
+algaecid
+algaecide
+algaeolo
+algaeological
+algaeologist
+algaeology
+algaesth
+algaesthesia
+algaesthesis
+algafaca`n
+algaida
+algaido
+algal
+algalia
+algaliar
+algaliera
+algaliero
+algan
+algar
+algara
+algarabi`a
+algarabi`o
+algarabiada
+algarabiado
+algaracear
+algarada
+algarade
+algarades
+algarazo
+algareador
+algareadora
+algarear
+algarera
+algarero
+algariva
+algarivo
+algaroth
+algarrada
+algarrob
+algarroba
+algarrobal
+algarrobera
+algarrobero
+algarrobilla
+algarrobin
+algarrobo
+algarsif
+algarsife
+algarsyf
+algas
+algate
+algauw
+algavaro
+algazafa`n
+algazara
+algazul
+alge
+alge'bri
+alge'brique
+alge'briques
+alge'rie
+alge'rien
+alge'rienne
+alge'riennes
+alge'riens
+alge`bre
+alge`bres
+alge`brica
+alge`brico
+algebar
+algebra
+algebrae
+algebraen
+algebrai
+algebraic
+algebraica
+algebraical
+algebraically
+algebraico
+algebraisch
+algebraische
+algebraischem
+algebraischen
+algebraischer
+algebraisk
+algebraiske
+algebraist
+algebraisten
+algebraists
+algebraization
+algebraize
+algebras
+algebre
+algebric
+algebriche
+algebrico
+algebrista
+algecira
+algeciras
+algecire\a
+algecire\o
+algedi
+algedo
+algedoni
+algedonic
+algedonics
+algefaci
+algefacient
+algeheel
+algehele
+algelijk
+algemeen
+algemeenheden
+algemeenheid
+algemeenst
+algemene
+algemener
+algen
+algene
+algengar
+algengarten
+algenib
+algente
+alger
+algergar
+algergare
+algeria
+algerian
+algerians
+algerie
+algerien
+algerienpolitik
+algerier
+algerieren
+algeriet
+algeriets
+algerijn
+algerijnen
+algerijns
+algerijnse
+algerine
+algerisk
+algerna
+algernon
+algesia
+algesic
+algesis
+algesthe
+algesthesis
+algetic
+alghani
+algharbi
+alghe
+alghero
+algic
+algicide
+algicides
+algid
+algidez
+algidity
+algidnes
+algidness
+algie
+algieba
+algier
+algiers
+algific
+algimant
+algimantas
+algin
+algina
+alginat
+alginate
+alginater
+alginates
+alginats
+alginatsektorer
+alginatt
+alginattilsetning
+algine
+alginic
+algins
+alginure
+alginuresis
+algiomus
+algiomuscular
+algist
+algivoro
+algivorous
+algko
+algner
+algo
+algoa
+algocyan
+algodo`n
+algodon
+algodonal
+algodonar
+algodonc
+algodoncillo
+algodonera
+algodonero
+algodoni
+algodonite
+algodonosa
+algoed
+algoede
+algoedhe
+algoedheid
+algoesth
+algoesthesiometer
+algogeni
+algogenic
+algoid
+algol
+algolagn
+algolagnia
+algolagnic
+algolagnist
+algolagny
+algoldes
+algoldescended
+algologi
+algological
+algologist
+algology
+algoma
+algoman
+algomete
+algometer
+algometr
+algometric
+algometrical
+algometrically
+algometry
+algomian
+algomic
+algona
+algonac
+algonkia
+algonkian
+algonkin
+algonqui
+algonquian
+algonquians
+algonquin
+algonquins
+algood
+algophil
+algophilia
+algophilist
+algophob
+algophobia
+algor
+algora
+algorab
+algores
+algorfa
+algori`n
+algori`tmica
+algori`tmico
+algorism
+algorismic
+algorisms
+algorist
+algoristic
+algorith
+algorithm
+algorithme
+algorithmen
+algorithmes
+algorithmic
+algorithmically
+algorithmisch
+algorithmische
+algorithms
+algorithmus
+algoritm
+algoritme
+algoritmekald
+algoritmen
+algoritmens
+algoritmer
+algoritmerne
+algoritmernes
+algoritmes
+algoritmi
+algoritmia
+algoritmiche
+algoritmisk
+algoritmiske
+algoritmo
+algorza
+algosa
+algosis
+algoso
+algot
+algous
+algout
+algovite
+algraphi
+algraphic
+algraphy
+algren
+alguacil
+alguacila
+alguaciladgo
+alguacilazgo
+alguacilejo
+alguacileri`a
+alguacilesa
+alguacilesca
+alguacilesco
+alguacili`a
+alguandre
+alguanta
+alguanto
+alguaquida
+alguaquidera
+alguaquidero
+alguari`n
+alguarismo
+alguaza
+alguazil
+algue
+algues
+alguese
+alguien
+alguinio
+alguire
+algum
+alguna
+algunamente
+algund
+algunde
+alguno
+algunt
+algu{n
+algy
+alh
+alha`bega
+alha`mega
+alha`rgama
+alhacena
+alhadida
+alhagi
+alhaite
+alhaja
+alhajar
+alhajeme
+alhaji
+alhaju`
+alhajuela
+alhalim
+alhama
+alhamar
+alhambra
+alhambraic
+alhambre
+alhambresque
+alhamel
+alhami`
+alhandal
+alhani`a
+alhaqueque
+alhaqui`n
+alharaca
+alharaquienta
+alharaquiento
+alhareme
+alharma
+alhavara
+alhawa
+alhayat
+alhe\a
+alhe\ar
+alhed
+alheli`
+alhena
+alhenna
+alhiara
+alhidada
+alhier
+alhinde
+alho`cigo
+alho`ndiga
+alhoewel
+alholi`
+alholi`a
+alholva
+alholvar
+alhombra
+alhombrar
+alhombrero
+alhondigaje
+alhondiguero
+alhori`
+alhori`n
+alhorma
+alhorre
+alhorri`a
+alhorro
+alhorza
+alhousse
+alhousseyni
+alhoz
+alhuce\a
+alhucema
+alhucemas
+alhucemilla
+alhumajo
+alhurreca
+alhuss
+alhussai
+alhussaini
+ali
+ali\ada
+ali\ado
+ali\ador
+ali\adora
+ali\ar
+ali\o
+ali\osa
+ali\oso
+ali`cuota
+ali`fera
+ali`fero
+ali`peda
+ali`pede
+ali`pedo
+alia
+alia`cea
+alia`ceo
+aliab
+aliabierta
+aliabierto
+aliaca
+aliaca`n
+aliacanada
+aliacanado
+aliada
+aliadas
+aliado
+aliado`fila
+aliado`filo
+aliaga
+aliagar
+aliah
+alian
+alianza
+alianzarse
+aliap
+aliar
+aliara
+aliaria
+alias
+aliased
+aliases
+aliasing
+aliassen
+alibamu
+alibangb
+alibangbang
+alibert
+alibi
+alibi's
+alibied
+alibies
+alibiet
+alibiing
+alibilit
+alibility
+alibis
+alibisi
+alible
+alibut
+alic
+alica
+alica`ntara
+alicai`da
+alicai`do
+alicant
+alicante
+alicantina
+alicantino
+alicanto
+alicatada
+alicatado
+alicatar
+alicates
+alice
+alicea
+alicer
+alices
+alicevil
+aliceville
+alicha
+alichel
+alichino
+alicia
+aliciente
+alicionar
+alick
+alicoche
+alicortar
+alictisa
+alictisal
+alicuanta
+alicycli
+alicyclic
+alida
+alidada
+alidade
+alidia
+alidina
+alidona
+alids
+alie
+alie'na
+alie'nab
+alie'nable
+alie'nables
+alie'nai
+alie'naient
+alie'nais
+alie'nait
+alie'nan
+alie'nant
+alie'nante
+alie'nantes
+alie'nants
+alie'nat
+alie'nation
+alie'nations
+alie'ne'
+alie'ne'e
+alie'ne'es
+alie'ne's
+alie'ne`
+alie'ne`rent
+alie'ner
+alie'nera
+alie'nerai
+alie'neraient
+alie'nerais
+alie'nerait
+alie'neras
+alie'nerez
+alie'neriez
+alie'nerions
+alie'nerons
+alie'neront
+alie'nez
+alie'nie
+alie'niez
+alie'nio
+alie'nions
+alie'non
+alie'nons
+alie`ne
+alie`nen
+alie`nent
+alie`nes
+alief
+alien
+aliena
+alienabi
+alienabilities
+alienability
+alienabl
+alienable
+alienacio`n
+alienada
+alienado
+alienage
+alienages
+alienai
+alienamm
+alienammo
+alienand
+alienando
+alienano
+alienar
+alienare
+alienaro
+alienarono
+alienasj
+alienasjon
+alienasjonen
+alienass
+alienasse
+alienassi
+alienast
+alienaste
+alienasti
+alienata
+alienate
+alienated
+alienates
+alienati
+alienatie
+alienaties
+alienating
+alienation
+alienato
+alienator
+alienava
+alienavamo
+alienavano
+alienavate
+alienavi
+alienavo
+aliency
+aliende
+aliene
+aliened
+alienee
+alieneer
+alieneerde
+alieneerden
+alienees
+aliener
+alienera
+alienerai
+alienere
+alienerei
+alieneremo
+alieneren
+alienerete
+alienero
+alieners
+alieni
+alieniam
+alieniamo
+alieniat
+alieniate
+alienico
+alienicola
+alienige
+alienigena
+alienigenate
+alienigeno
+aliening
+alienino
+alienism
+alienisms
+alienist
+alienista
+alienists
+alienize
+alienly
+alieno
+alienor
+alienors
+aliens
+alienshi
+alienship
+aliento
+alier
+alieskin
+alieskine
+aliethmo
+aliethmoid
+aliethmoidal
+alif
+alifa
+alifafe
+alifar
+alifara
+aliferou
+aliferous
+aliff
+aliform
+aligacio`n
+aligamiento
+aligar
+aligarh
+aliger
+aligera
+aligeramiento
+aligerar
+aligero
+aligerou
+aligerous
+aligger
+alight
+alighted
+alightin
+alighting
+alights
+align
+aligna
+alignaie
+alignaient
+alignais
+alignait
+alignant
+aligne
+aligne'
+aligne'e
+aligne'es
+aligne's
+aligne`r
+aligne`rent
+aligned
+aligneer
+aligneerde
+aligneerden
+aligneert
+aligneme
+alignement
+alignementen
+alignements
+alignent
+aligner
+alignera
+alignerai
+aligneraient
+alignerais
+alignerait
+aligneras
+alignere
+aligneren
+alignerez
+aligneri
+aligneriez
+alignerions
+alignero
+alignerons
+aligneront
+aligners
+alignes
+alignez
+aligniez
+aligning
+alignion
+alignions
+alignmen
+alignment
+alignments
+alignons
+aligns
+aligonero
+aligreek
+aligustre
+alii
+aliipoe
+aliisa
+alijador
+alijadora
+alijar
+alijarar
+alijarero
+alijariega
+alijariego
+alijo
+alika
+alikas
+alikasse
+alikassen
+alike
+alikee
+alikenes
+alikeness
+alikewis
+alikewise
+alikhan
+aliki
+alikoski
+alikruik
+alikruiken
+alikuluf
+alikulufan
+alile
+alilongh
+alilonghi
+alim
+alima
+alima\a
+alimania
+alimanisca
+alimanisco
+alimara
+aliment
+alimenta
+alimentacio`n
+alimentador
+alimentadora
+alimentai
+alimentaient
+alimentaire
+alimentaires
+alimentais
+alimentait
+alimental
+alimentally
+alimentano
+alimentant
+alimentante
+alimentar
+alimentare
+alimentariness
+alimentario
+alimentary
+alimentata
+alimentate
+alimentati
+alimentatie
+alimentatieplicht
+alimentation
+alimentations
+alimentative
+alimentatively
+alimentativeness
+alimentato
+alimentava
+alimentavi
+alimentavo
+alimente
+alimente'
+alimente'e
+alimente'es
+alimente's
+alimente`rent
+alimented
+alimentent
+alimenter
+alimentera
+alimenterai
+alimenteraient
+alimenterais
+alimenterait
+alimenteras
+alimenterez
+alimenteriez
+alimenterions
+alimentero
+alimenterons
+alimenteront
+alimentes
+alimentez
+alimenti
+alimentic
+alimenticia
+alimenticio
+alimentiez
+alimenting
+alimentino
+alimentions
+alimentista
+alimentive
+alimentiveness
+alimento
+alimentons
+alimentosa
+alimentoso
+alimentotherapy
+aliments
+alimentu
+alimentum
+alimo`n
+alimoche
+alimonarse
+alimonie
+alimonied
+alimonies
+alimony
+alimosna
+alimpiador
+alimpiadora
+alimpiadura
+alimpiamiento
+alimpiar
+alin
+alina
+alinasal
+alinda
+alindada
+alindadamente
+alindado
+alindamiento
+alindar
+alinde
+alinder
+alindongarse
+aline
+aline'a
+aline'as
+alinea
+alinea's
+alineacio`n
+alinear
+alineati
+alineation
+alined
+alinedes
+alinemen
+alinement
+aliner
+aliners
+alines
+aling
+alinga
+alingar
+alining
+alink
+alintata
+alintatao
+aliocha
+aliofar
+alioj
+alioli
+alione
+alioni`n
+alioth
+alioto
+aliou
+alipata
+aliped
+aliphati
+aliphatic
+alipteri
+alipterion
+aliptes
+aliptic
+aliquant
+aliquebrada
+aliquebrado
+aliquebrar
+aliquipp
+aliquippa
+aliquot
+aliquota
+aliquote
+aliquots
+alireza
+aliro`n
+alirroja
+alirrojo
+alis
+alisa
+alisador
+alisadora
+alisadura
+alisal
+alisande
+alisander
+alisar
+alisary
+alise
+aliseda
+alisepta
+aliseptal
+alish
+alisha
+alisheng
+alisier
+alisik
+alisios
+alisma
+alisma`cea
+alisma`ceo
+alismace
+alismaceae
+alismaceous
+alismad
+alismal
+alismale
+alismales
+alismata
+alismata`cea
+alismata`ceo
+alismataceae
+alismoid
+aliso
+alison
+alisonit
+alisonite
+alisp
+alisphen
+alisphenoid
+alisphenoidal
+alissa
+alist
+alistada
+alistado
+alistador
+alistair
+alistamiento
+alistar
+alister
+alisun
+alit
+alitant
+alite
+alite'
+alite'e
+alite'es
+alite's
+aliter
+aliteracio`n
+aliterada
+aliterado
+alitero
+aliti
+alitierno
+alito
+alitrunk
+aliturgi
+aliturgic
+aliturgical
+aliunde
+aliutor
+alive
+alivefra
+aliveframe
+alivemel
+alivemeldungen
+alivenes
+aliveness
+aliviadero
+aliviador
+aliviadora
+aliviamiento
+alivianar
+aliviar
+alivincu
+alivincular
+alivio
+aliviosa
+alivioso
+aliwas
+alix
+alixe
+aliya
+aliyah
+aliyu
+aliza
+alizabet
+alizabeth
+alizace
+alizar
+alizarat
+alizarate
+alizari
+alizarin
+alizarina
+alizarine
+alizarine-inkt
+alizarins
+alize'
+alize's
+alj
+aljaba
+aljabibe
+aljabir
+aljafana
+aljama
+aljamel
+aljami`a
+aljamiada
+aljamiado
+aljaqueca
+aljarafe
+aljaraz
+aljarfa
+aljarfe
+aljebana
+aljebena
+aljeceri`a
+aljecero
+aljecire\a
+aljecire\o
+aljemifao
+aljerife
+aljerifero
+aljez
+aljezar
+aljezo`n
+aljibe
+aljibero
+aljimifrada
+aljimifrado
+aljo`far
+aljoba
+aljofaina
+aljofarar
+aljofifa
+aljofifar
+aljonje
+aljonjera
+aljonjero
+aljonjoli`
+aljor
+aljorca
+aljuba
+aljuma
+alk
+alka
+alkabo
+alkahest
+alkahestic
+alkahestica
+alkahestical
+alkaid
+alkalal
+alkalami
+alkalamide
+alkalay
+alkalemi
+alkalemia
+alkalesc
+alkalescence
+alkalescency
+alkalescent
+alkali
+alkalic
+alkalien
+alkalier
+alkalies
+alkalife
+alkaliferous
+alkalifi
+alkalifiable
+alkalify
+alkalige
+alkaligen
+alkaligenous
+alkalime
+alkalimetaal
+alkalimetalen
+alkalimeter
+alkalimetric
+alkalimetrical
+alkalimetrically
+alkalimetry
+alkalin
+alkaline
+alkalini
+alkalinities
+alkalinity
+alkalinization
+alkalinize
+alkalinized
+alkalinizes
+alkalinizing
+alkalinu
+alkalinuria
+alkalis
+alkalisc
+alkalisch
+alkalische
+alkalischem
+alkalischen
+alkalischer
+alkalischt
+alkalise
+alkaliseer
+alkaliseerde
+alkaliseerden
+alkaliseert
+alkaliseren
+alkalisk
+alkaliza
+alkalizable
+alkalizate
+alkalization
+alkalize
+alkalized
+alkalizer
+alkalizes
+alkalizi
+alkalizing
+alkaloid
+alkaloidal
+alkaloide
+alkaloiden
+alkaloids
+alkalome
+alkalometry
+alkalosi
+alkalosis
+alkalous
+alkaluro
+alkalurops
+alkamin
+alkamine
+alkane
+alkanes
+alkanet
+alkanna
+alkanna'
+alkanna's
+alkannin
+alkaphra
+alkaphrah
+alkapton
+alkaptonuria
+alkaptonuric
+alkargen
+alkarim
+alkarsin
+alkawari
+alke
+alkekeng
+alkekengi
+alken
+alkene
+alkenna
+alkenyl
+alker
+alkermes
+alkes
+alkeste
+alkhums
+alkide
+alkin
+alkine
+alkire
+alkis
+alkmene
+alkohol
+alkoholb
+alkoholbestandteil
+alkoholbruk
+alkohole
+alkoholeinwirkung
+alkoholen
+alkoholens
+alkoholf
+alkoholforbruk
+alkoholforskning
+alkoholfrei
+alkoholfreie
+alkoholfreiem
+alkoholfreier
+alkoholfreies
+alkoholfri
+alkoholfrit
+alkoholg
+alkoholgehalte
+alkoholgehalten
+alkoholgehaltes
+alkoholgenusses
+alkoholh
+alkoholhersteller
+alkoholherstellerinn
+alkoholholdig
+alkoholholdige
+alkoholi
+alkoholica
+alkoholiker
+alkoholikere
+alkoholikeren
+alkoholikerens
+alkoholikerklinikk
+alkoholikern
+alkoholikers
+alkoholindhold
+alkoholisch
+alkoholischem
+alkoholischen
+alkoholischer
+alkoholisk
+alkoholiske
+alkoholisme
+alkoholistomsorgen
+alkoholk
+alkoholklinikken
+alkoholkonsum
+alkoholl
+alkohollovgivningen
+alkoholm
+alkoholmisbruk
+alkoholmisbrukere
+alkoholmisbruket
+alkoholo
+alkoholomsetningen
+alkoholp
+alkoholp}virket
+alkoholr
+alkoholreklame
+alkoholreklamen
+alkoholrestriksjoner
+alkohols
+alkoholskadd
+alkoholskadde
+alkoholspiegel
+alkoholsteuern
+alkoholt
+alkoholtests
+alkoholtilvenning
+alkoholv
+alkoholvanskeligheter
+alkoholvergiftungen
+alkoholvertraeglichkeitstest
+alkoholvorrat
+alkoholz
+alkoholzusatz
+alkol
+alkoof
+alkool
+alkor
+alkoran
+alkorani
+alkoranic
+alkotest
+alkotesten
+alkov
+alkove
+alkoven
+alkoxide
+alkoxy
+alkoxyl
+alky
+alkyd
+alkydmal
+alkydmaling
+alkydmalinga
+alkydmalingen
+alkyds
+alkyl
+alkylami
+alkylamine
+alkylate
+alkylati
+alkylation
+alkylene
+alkylic
+alkylide
+alkylidene
+alkylize
+alkyloge
+alkylogen
+alkyloxy
+alkyls
+alkymi
+alkymien
+alkymist
+alkymisten
+alkymistv{rkt|j
+alkyne
+all
+alla
+alla`
+allaaba
+allabend
+allabendlich
+allabendliche
+allabendlichen
+allabendlicher
+allabendliches
+allabsor
+allabsorbing
+allabuta
+allaccer
+allaccera
+allaccero
+allacci
+allaccia
+allacciai
+allacciamo
+allacciano
+allacciare
+allacciata
+allacciate
+allacciati
+allacciato
+allacciava
+allacciavi
+allacciavo
+allaccin
+allaccino
+allaccio
+allactit
+allactite
+alladdin
+alladian
+alladin
+alladyan
+allaeant
+allaeanthus
+allaert
+allaga
+allagai
+allagamm
+allagammo
+allagand
+allagando
+allagano
+allagare
+allagaro
+allagarono
+allagass
+allagasse
+allagassi
+allagast
+allagaste
+allagasti
+allagata
+allagate
+allagati
+allagato
+allagava
+allagavamo
+allagavano
+allagavate
+allagavi
+allagavo
+allagher
+allaghera
+allagherai
+allagherei
+allaghero
+allaghi
+allaghia
+allaghiamo
+allaghiate
+allaghin
+allaghino
+allagir
+allagite
+allago
+allagoph
+allagophyllous
+allagost
+allagostemonous
+allah
+allah-di
+allahdin
+allahs
+allahsan
+allahyar
+allahyari
+allaient
+allain
+allais
+allait
+allaita
+allaitai
+allaitaient
+allaitais
+allaitait
+allaitan
+allaitant
+allaite
+allaite'
+allaite'e
+allaite'es
+allaite's
+allaite`
+allaite`rent
+allaitem
+allaitement
+allaiten
+allaitent
+allaiter
+allaitera
+allaiterai
+allaiteraient
+allaiterais
+allaiterait
+allaiteras
+allaiterez
+allaiteriez
+allaiterions
+allaiterons
+allaiteront
+allaites
+allaitez
+allaitie
+allaitiez
+allaitio
+allaitions
+allaiton
+allaitons
+allalini
+allalinite
+allam
+allaman
+allamand
+allamanda
+allameri
+allamerican
+allamott
+allamotti
+allamuch
+allamuchy
+allan
+allanabarrancos
+allanador
+allanadora
+allanadura
+allanahm
+allanamiento
+allanar
+alland
+allang
+allanite
+allaniti
+allanitic
+allant
+allante
+allantes
+allantia
+allantiasis
+allantoc
+allantochorion
+allantoi
+allantoic
+allantoid
+allantoidal
+allantoidea
+allantoidean
+allantoidian
+allantoin
+allantoinase
+allantoinuria
+allantois
+allantox
+allantoxaidin
+allants
+allantur
+allanturic
+allar
+allard
+allardic
+allardice
+allardt
+allardyc
+allardyce
+allarga
+allargai
+allargam
+allargammo
+allargan
+allargando
+allargano
+allargar
+allargare
+allargas
+allargasse
+allargassi
+allargaste
+allargasti
+allargat
+allargata
+allargate
+allargati
+allargato
+allargav
+allargava
+allargavi
+allargavo
+allarghe
+allarghera
+allarghero
+allarghi
+allarghino
+allargo
+allariz
+allarm
+allarma
+allarmai
+allarmam
+allarmammo
+allarman
+allarmando
+allarmano
+allarmar
+allarmare
+allarmas
+allarmasse
+allarmassi
+allarmaste
+allarmasti
+allarmat
+allarmata
+allarmate
+allarmatevi
+allarmati
+allarmato
+allarmav
+allarmava
+allarmavi
+allarmavo
+allarmd
+allarme
+allarmer
+allarmera
+allarmerai
+allarmerei
+allarmero
+allarmi
+allarmia
+allarmiamo
+allarmiate
+allarmin
+allarmino
+allarmo
+allasch
+allascii
+allasia
+allason
+allassot
+allassotonic
+allative
+allatrat
+allatrate
+allatta
+allattai
+allattam
+allattammo
+allattan
+allattando
+allattano
+allattar
+allattare
+allattas
+allattasse
+allattassi
+allattaste
+allattasti
+allattat
+allattata
+allattate
+allattati
+allattato
+allattav
+allattava
+allattavi
+allattavo
+allatter
+allattera
+allatterai
+allatterei
+allattero
+allatti
+allattia
+allattiamo
+allattiate
+allattin
+allattino
+allatto
+allaway
+allay
+allayd
+allaye-c
+allaye-chan
+allayed
+allayer
+allayers
+allaying
+allaylis
+allaymen
+allayment
+allayne
+allays
+allback
+allbekan
+allbekannte
+allbekanntem
+allbekannten
+allbekanntes
+allbone
+allbrech
+allbrecht
+allbritt
+allbritton
+allcapit
+allcapitalized
+allchina
+allchris
+allchristliche
+allcolum
+allcolumns
+alldeles
+alldestr
+alldestroying
+alldevou
+alldevouring
+alldredg
+alldredge
+alle
+alle'
+alle'cha
+alle'chaient
+alle'chais
+alle'chait
+alle'chant
+alle'chante
+alle'chantes
+alle'chants
+alle'che
+alle'che'
+alle'che'e
+alle'che'es
+alle'che's
+alle'che`rent
+alle'cher
+alle'chera
+alle'cherai
+alle'cheraient
+alle'cherais
+alle'cherait
+alle'cheras
+alle'cherez
+alle'cheriez
+alle'cherions
+alle'cherons
+alle'cheront
+alle'chez
+alle'chi
+alle'chiez
+alle'chions
+alle'cho
+alle'chons
+alle'e
+alle'es
+alle'gat
+alle'gation
+alle'gations
+alle'ge'
+alle'ge'e
+alle'ge'es
+alle'ge's
+alle'ge`
+alle'ge`rent
+alle'gea
+alle'geaient
+alle'geais
+alle'geait
+alle'geant
+alle'gem
+alle'gement
+alle'gements
+alle'geo
+alle'geons
+alle'ger
+alle'gera
+alle'gerai
+alle'geraient
+alle'gerais
+alle'gerait
+alle'geras
+alle'gerez
+alle'geriez
+alle'gerions
+alle'gerons
+alle'geront
+alle'gez
+alle'gie
+alle'giez
+alle'gio
+alle'gions
+alle'gor
+alle'gorie
+alle'gories
+alle'gorique
+alle'goriques
+alle'gre
+alle'gresse
+alle'gua
+alle'guaient
+alle'guais
+alle'guait
+alle'guant
+alle'gue
+alle'gue'
+alle'gue'e
+alle'gue'es
+alle'gue's
+alle'gue`rent
+alle'guer
+alle'guera
+alle'guerai
+alle'gueraient
+alle'guerais
+alle'guerait
+alle'gueras
+alle'guerez
+alle'gueriez
+alle'guerions
+alle'guerons
+alle'gueront
+alle'guez
+alle'gui
+alle'guiez
+alle'guions
+alle'guo
+alle'guons
+alle's
+alle`che
+alle`chent
+alle`ches
+alle`ge
+alle`gen
+alle`gent
+alle`ges
+alle`gre
+alle`grement
+alle`gres
+alle`gue
+alle`guent
+alle`gues
+alle`n
+alle`ren
+alle`rent
+alleanza
+alleanze
+alleata
+alleate
+alleati
+alleato
+allebei
+allebeid
+allebeide
+allec
+allecret
+allectat
+allectation
+allectiv
+allective
+allector
+allectory
+alledaag
+alledaags
+alledaagse
+alledaagser
+alledaagsheid
+alledaagst
+alledoni
+alledonia
+alledrie
+allee
+alleebau
+alleebaum
+alleen
+alleene
+alleenha
+alleenhandel
+alleenhe
+alleenheerschappij
+alleenheerser
+alleenheersers
+alleenli
+alleenlijk
+alleensp
+alleenspraak
+alleenspraken
+alleenst
+alleenstaand
+alleenstaande
+alleenwi
+alleenwijs
+alleenwijst
+alleenwijze
+alleenwijzer
+alleenza
+alleenzaligmakend
+alleenzaligmakende
+alleer
+alleg
+allega
+allegaar
+allegaartje
+allegaartjes
+allegada
+allegadera
+allegadero
+allegadiza
+allegadizo
+allegado
+allegador
+allegadora
+allegai
+allegamiento
+allegamm
+allegammo
+allegan
+allegancia
+allegand
+allegando
+allegano
+allegany
+alleganza
+allegar
+allegare
+allegaro
+allegarono
+allegass
+allegasse
+allegassi
+allegast
+allegaste
+allegasti
+allegata
+allegate
+allegati
+allegation
+allegations
+allegato
+allegator
+allegava
+allegavamo
+allegavano
+allegavate
+allegavi
+allegavo
+allege
+allegeab
+allegeable
+allegean
+allegeance
+alleged
+allegedl
+allegedly
+allegeme
+allegement
+alleger
+allegers
+alleges
+allegger
+alleggeri
+alleggerii
+alleghan
+alleghany
+alleghen
+alleghenia
+alleghenian
+allegheny
+allegher
+alleghera
+allegherai
+allegherei
+alleghero
+alleghi
+alleghia
+alleghiamo
+alleghiate
+alleghin
+alleghino
+allegian
+allegiance
+allegiances
+allegiancy
+allegiant
+allegiantly
+alleging
+allego
+allegori
+allegoria
+allegoric
+allegorical
+allegorically
+allegoricalness
+allegorie
+allegorieen
+allegorien
+allegories
+allegorisch
+allegorische
+allegorischen
+allegorischer
+allegorisk
+allegoriske
+allegorism
+allegorist
+allegorister
+allegoristic
+allegorists
+allegorization
+allegorize
+allegorized
+allegorizer
+allegorizing
+allegory
+allegra
+allegre
+allegres
+allegresse
+allegret
+allegretti
+allegretto
+allegretto's
+allegrettos
+allegri
+allegria
+allegrie
+allegro
+allegro'
+allegro's
+allegroe
+allegroen
+allegroene
+allegros
+allehand
+allehanda
+allehelg
+allehelgensdag
+alleh}nd
+alleh}nde
+alleh}nden
+allein
+alleinau
+alleinausschank
+alleinbe
+alleinbeauftragten
+alleinbeauftragter
+alleinbesitz
+alleinbesitzen
+alleinbesitzes
+alleine
+alleiner
+alleinerbe
+alleinerbes
+alleinerbin
+alleinerbinnen
+alleinfl
+alleinflug
+alleinga
+alleingaenge
+alleingaengen
+alleinge
+alleingestelltsein
+alleinhe
+alleinherren
+alleinherrschaft
+alleinherrscher
+alleinherrscherin
+alleinherrscherinnen
+alleinherrschers
+alleinhersteller
+alleinig
+alleinige
+alleinigen
+alleiniger
+alleiniges
+alleinim
+alleinimport
+alleinin
+alleininhaber
+alleininhaberin
+alleinre
+alleinrechten
+alleinse
+alleinsein
+alleinseins
+alleinseligmachende
+alleinst
+alleinstehend
+alleinstehende
+alleinstehenden
+alleinstehender
+alleinstehendes
+alleinve
+alleinverantwortliche
+alleinverkaeufen
+alleinverkauf
+alleinverkaufes
+alleinvertreter
+alleinvertretern
+alleinvertreters
+alleinvertretungsanbefugnis
+alleinvertretungsanberechtigte
+alleinvertretungsanspruch
+alleinvertrieb
+alleinvertriebe
+alleinvertrieben
+alleinvertriebes
+alleinze
+alleinzeichnungsberechtigten
+alleinzeichnungsberechtigter
+alleira
+allelbow
+allelbows
+allele
+alleles
+allelic
+allelism
+alleloca
+allelocatalytic
+allelomo
+allelomorph
+allelomorphic
+allelomorphism
+allelopa
+allelopathy
+allelotr
+allelotropic
+allelotropism
+allelotropy
+alleluia
+alleluias
+alleluiatic
+alleluja
+alleluja's
+allelujah
+allem
+allemaal
+allemach
+allemachtig
+allemachtige
+allemal
+alleman
+allemand
+allemande
+allemandes
+allemands
+allemandseje
+allemann
+allemannsarbeid
+allemannseie
+allemannseiet
+allemannsrett
+allemans
+allemansgading
+allemansgek
+allemansgekken
+allemansraetten
+allemansratten
+allemansr{tten
+allemansvriend
+allemansvrienden
+allemont
+allemontite
+allen
+allena
+allenai
+allenamm
+allenammo
+allenand
+allenando
+allenano
+allenare
+allenarl
+allenarly
+allenaro
+allenarono
+allenass
+allenasse
+allenassi
+allenast
+allenaste
+allenasti
+allenata
+allenate
+allenati
+allenato
+allenatore
+allenatori
+allenava
+allenavamo
+allenavano
+allenavate
+allenavi
+allenavo
+allenbur
+allenbury
+allenby
+allendal
+allendale
+allende
+allendor
+allendorf
+allene
+allenera
+allenerai
+allenere
+allenerei
+alleneremo
+allenerete
+allenero
+allenfal
+allenfalls
+allengs
+allengsk
+allengskens
+allengul
+allengulfing
+allenhur
+allenhurst
+alleni
+alleniam
+alleniamo
+alleniat
+alleniate
+allenino
+allenjun
+allenjunction
+alleno
+allenpar
+allenpark
+allenpor
+allenport
+allenspa
+allenspark
+allensvi
+allensville
+allent
+allenta
+allentai
+allentam
+allentammo
+allentan
+allentando
+allentano
+allentar
+allentare
+allentas
+allentasse
+allentassi
+allentaste
+allentasti
+allentat
+allentata
+allentate
+allentati
+allentato
+allentav
+allentava
+allentavi
+allentavo
+allenter
+allentera
+allenterai
+allenterei
+allentero
+allenti
+allentia
+allentiac
+allentiacan
+allentiamo
+allentiate
+allentin
+allentino
+allento
+allenton
+allentow
+allentown
+allentuc
+allentuck
+allenunw
+allenunwin
+allenwoo
+allenwood
+aller
+allerbes
+allerbest
+allerbeste
+allerbesten
+allerbester
+allerbestes
+allerby
+allerdin
+allerdings
+allerede
+allereer
+allereerst
+allereerste
+allerers
+allererste
+allerersten
+allererstes
+allerf|rst
+allergee
+allergeen
+allergen
+allergenen
+allergenialste
+allergenic
+allergenicity
+allergens
+allerger
+allergeringste
+allergi
+allergia
+allergic
+allergie
+allergieen
+allergiefoerdernden
+allergien
+allergies
+allergik
+allergiker
+allergikere
+allergikeren
+allergin
+allergiq
+allergique
+allergiques
+allergis
+allergisch
+allergische
+allergischem
+allergischer
+allergisches
+allergischt
+allergisk
+allergiske
+allergist
+allergists
+allergol
+allergology
+allergro
+allergroesste
+allergroessten
+allergy
+allerhan
+allerhand
+allerhande
+allerhei
+allerheiligen
+allerheiligendag
+allerheiligenfeest
+allerheiligst
+allerheiligste
+allerher
+allerherzlichsten
+allerhoe
+allerhoechste
+allerhoechstem
+allerhoechsten
+allerhoechstes
+allerhoo
+allerhoogst
+allerhoogste
+allerion
+allerkin
+allerkinderen
+allerkinderendag
+allerkinderenfeest
+allerkj{
+allerkj{reste
+allerkle
+allerkleinste
+allerlaa
+allerlaatst
+allerlaatste
+allerlei
+allerlet
+allerletzt
+allerletzte
+allerletzten
+allerletzter
+allerletztes
+allerlie
+allerliebste
+allerliebstem
+allerliebsten
+allerliebstes
+allerliefst
+allerliefste
+allermee
+allermeest
+allermeeste
+allermei
+allermeist
+allermeiste
+allermeisten
+allermeister
+allermeistes
+allermest
+allermin
+allermindst
+allerminst
+allerminste
+allernaa
+allernaast
+allernaaste
+allernae
+allernaechste
+allernaechstem
+allernaechsten
+allernaechstes
+allerneu
+allerneust
+allerneuste
+allerneusten
+allerneuster
+allerneustes
+allerort
+allerorten
+allers
+allersch
+allerschlechtesten
+allerschlimmste
+allerschwerste
+allersei
+allerseits
+allersenest
+allerson
+allerton
+alleruit
+alleruiterst
+alleruiterste
+allerwae
+allerwaerts
+allerweg
+allerwegen
+allerwel
+allerweltsgesicht
+allerwen
+allerwenigst
+allerwenigste
+allerwenigsten
+allerwenigster
+allerwenigstes
+allerwic
+allerwichtigste
+allerwichtigsten
+alleryderst
+allerzie
+allerzielen
+allerzielendag
+allerzielenfees
+aller|d
+alles
+alles	
+allesamm
+allesammans
+allesammen
+allesbeh
+allesbehalve
+allesete
+alleseter
+alleseters
+alleskoe
+alleskoennende
+allessio
+allested
+allesteds
+allestedsfra
+allestedsn{rv{rende
+allesthe
+allesthesia
+alleswet
+alleswetende
+alleszin
+alleszins
+alletta
+allettai
+allettam
+allettammo
+allettan
+allettando
+allettano
+allettar
+allettare
+allettas
+allettasse
+allettassi
+allettaste
+allettasti
+allettat
+allettata
+allettate
+allettati
+allettato
+allettav
+allettava
+allettavi
+allettavo
+alletter
+allettera
+alletterai
+alletterei
+allettero
+alletti
+allettia
+allettiamo
+allettiate
+allettin
+allettino
+alletto
+alleu
+alleva
+allevai
+allevamm
+allevammo
+allevand
+allevando
+allevano
+allevare
+allevaro
+allevarono
+allevass
+allevasse
+allevassi
+allevast
+allevaste
+allevasti
+allevata
+allevate
+allevati
+allevato
+allevava
+allevavamo
+allevavano
+allevavate
+allevavi
+allevavo
+allevera
+alleverai
+allevere
+alleverei
+alleveremo
+alleverete
+allevero
+allevi
+allevia
+alleviai
+alleviam
+alleviammo
+alleviamo
+allevian
+alleviando
+alleviano
+alleviar
+alleviare
+allevias
+alleviasse
+alleviassi
+alleviaste
+alleviasti
+alleviat
+alleviata
+alleviate
+alleviated
+alleviater
+alleviaters
+alleviates
+alleviati
+alleviating
+alleviatingly
+alleviation
+alleviations
+alleviative
+alleviato
+alleviator
+alleviators
+alleviatory
+alleviav
+alleviava
+alleviavi
+alleviavo
+allevier
+alleviera
+allevierai
+allevierei
+alleviero
+allevino
+allevio
+allevo
+alley
+alleyed
+alleyite
+alleyn
+alleyne
+alleys
+alleyway
+alleyways
+allez
+allezeit
+allfader
+allfaderen
+allfaell
+allfaellig
+allfaelligen
+allfaelliger
+allfarve
+allfarveg
+allfarvegen
+allfarvei
+allfours
+allg
+allgaeu
+allgegen
+allgegenwaertig
+allgegenwaertigem
+allgegenwaertigen
+allgegenwaertiger
+allgegenwart
+allgegenwarten
+allgemei
+allgemein
+allgemeinbildend
+allgemeinbildung
+allgemeinbildungen
+allgemeine
+allgemeinem
+allgemeinen
+allgemeiner
+allgemeinere
+allgemeinerem
+allgemeineren
+allgemeineres
+allgemeines
+allgemeingu"ltige
+allgemeingueltig
+allgemeingueltige
+allgemeingueltigen
+allgemeingueltiger
+allgemeingueltiges
+allgemeingut
+allgemeinheit
+allgemeininteresse
+allgemeinmedizin
+allgemeinpolitischen
+allgemeinste
+allgemeinstem
+allgemeinsten
+allgemeinster
+allgemeinstimmung
+allgemeintendenz
+allgemeinverfassung
+allgemeinverstaendlich
+allgemeinwirtschaftliche
+allgemeinwissen
+allgemeinzustand
+allgeris
+allgerisch
+allgewal
+allgewaltige
+allgewaltigem
+allgewaltigen
+allgewaltiges
+allgood
+allhallo
+allhallow
+allhallowmas
+allhallows
+allhallowtide
+allheal
+allheals
+allheilm
+allheilmittel
+allheilmittels
+allheime
+allheimen
+alli
+alli`
+allia
+alliable
+alliably
+alliacea
+alliaceae
+alliaceo
+alliaceous
+alliage
+alliages
+alliaien
+alliaient
+alliais
+alliait
+alliana
+alliance
+alliancer
+alliances
+allianor
+allianora
+allians
+allianse
+alliansefellesskap
+alliansefri
+alliansefrihet
+alliansefritt
+alliansen
+alliansene
+alliansenes
+alliansens
+alliansepartnere
+alliansepolitikk
+allianser
+alliant
+allianti
+alliantie
+allianties
+allianz
+allianze
+allianzen
+allianzs
+allianzsystem
+alliaria
+allibert
+allicamp
+allicampane
+allice
+allichol
+allicholly
+allicht
+allicien
+alliciency
+allicient
+allida
+allie
+allie'
+allie'e
+allie'es
+allie's
+allie`re
+allie`rent
+allied
+allient
+allier
+alliera
+allierai
+allieraient
+allierais
+allierait
+allieras
+alliere
+allierede
+allierez
+allierie
+allieriez
+allierio
+allierions
+allieron
+allierons
+allieront
+alliert
+allierte
+allierten
+alliertes
+allies
+allieva
+allieve
+allievi
+allievo
+alliez
+alligate
+alligati
+alligation
+alligations
+alligato
+alligator
+alligatored
+alligatoren
+alligators
+alligevel
+allignme
+allignment
+allihop
+alliiert
+alliiertem
+alliierten
+alliiez
+alliions
+allikeve
+allikevel
+allin
+allina
+allindia
+allineat
+allineate
+allineation
+allionia
+allioniaceae
+allions
+alliot
+allis
+allisan
+allision
+allison
+allisonp
+allisonpark
+allissa
+allister
+allistir
+allite'r
+allite'ration
+allite'rations
+allitera
+alliteral
+alliterate
+alliterated
+alliterates
+alliteratie
+alliteraties
+alliterating
+alliteration
+alliterational
+alliterationist
+alliterations
+alliterative
+alliteratively
+alliterativeness
+alliterator
+allitere
+allitereer
+allitereerde
+allitereerden
+allitereert
+allitereren
+allitter
+allitterasjon
+allitterasjonen
+allitteratie
+allitteraties
+allittereer
+allittereerde
+allittereerden
+allittereert
+allitterere
+allittereren
+allitterert
+allitul1
+allium
+alliums
+allivali
+allivalite
+allix
+alljaehr
+alljaehrlich
+alljaehrlichem
+alljaehrlichen
+alljaehrlicher
+allknowi
+allknowing
+alllower
+alllowercase
+allma"ch
+allma"chtigen
+allma"hl
+allma"hlich
+allmacht
+allmaech
+allmaechtig
+allmaechtige
+allmaechtigem
+allmaechtiger
+allmaechtiges
+allmaehl
+allmaehlich
+allmaehlichem
+allmaehlichen
+allmaehlicher
+allmaen
+allmaenn
+allmaenna
+allmaent
+allmakt
+allmakta
+allmakte
+allmakten
+allman
+allmann
+allmanna
+allmannam|te
+allmannam|tene
+allmannam|ter
+allmant
+allmekti
+allmektig
+allmektige
+allmenn
+allmennb
+allmennbelysning
+allmennbelysningen
+allmennd
+allmenndannelse
+allmenndannelsen
+allmenndannende
+allmenne
+allmenneuropeiske
+allmenng
+allmenngyldig
+allmenngyldige
+allmenngyldighet
+allmennh
+allmennhet
+allmennheten
+allmennhetens
+allmenni
+allmenning
+allmenningen
+allmennm
+allmennmedisin
+allmennmenneskelig
+allmennmenneskelige
+allmennp
+allmennpraksis
+allmennpraktiserende
+allmennpreventive
+allmenns
+allmennskole
+allmennt
+allmenntilstand
+allmennu
+allmennutdanning
+allmennv
+allmennvitenskapelige
+allmensk
+allmenskole
+allment
+allmenut
+allmenutdannelse
+allmoge
+allmonat
+allmonatlich
+allmonatlichen
+allmosor
+allmouth
+allmu
+allmue
+allmuen
+allmuge
+allm{n
+allm{nn
+allm{nna
+allm{nt
+allm|te
+allm|tet
+allnatio
+allnational
+allness
+allnight
+allnighter
+allnordi
+allnordischen
+allnut
+allo
+allo^
+allobrog
+allobroges
+alloc
+allocabi
+allocability
+allocabl
+allocable
+allocaff
+allocaffeine
+allocame
+allocamelus
+allocare
+allocarl
+allocarlo
+allocata
+allocatable
+allocataire
+allocataires
+allocate
+allocated
+allocatee
+allocates
+allocati
+allocatie
+allocating
+allocation
+allocations
+allocationstatistical
+allocative
+allocato
+allocator
+allocators
+allocazi
+allocazione
+allocazioni
+allochet
+allochetia
+allochetite
+allochez
+allochezia
+allochir
+allochiral
+allochirally
+allochiria
+allochlo
+allochlorophyll
+allochro
+allochroic
+allochroite
+allochromatic
+allochroous
+allochth
+allochthonous
+allocinn
+allocinnamic
+allock
+alloclas
+alloclase
+alloclasite
+allocldp
+allocldptr
+allococh
+allocochick
+allocrot
+allocrotonic
+allocryp
+allocryptic
+allocute
+allocuti
+allocutie
+allocuties
+allocution
+allocutions
+allocutive
+allocyan
+allocyanine
+allodelp
+allodelphite
+allodesm
+allodesmism
+allodia
+allodiaa
+allodiaal
+allodial
+allodiale
+allodium
+allodola
+allodole
+alloeosi
+alloeosis
+alloeost
+alloeostropha
+alloeoti
+alloeotic
+alloerot
+alloerotic
+alloerotism
+allogamo
+allogamous
+allogamy
+allogene
+allogeneity
+allogeneous
+allogeni
+allogenic
+allogenically
+allogger
+alloggera
+alloggerai
+alloggero
+alloggi
+alloggia
+alloggiai
+alloggiamo
+alloggiano
+alloggiare
+alloggiata
+alloggiate
+alloggiati
+alloggiato
+alloggiava
+alloggiavi
+alloggiavo
+alloggin
+alloggino
+alloggio
+allograp
+allograph
+alloioge
+alloiogenesis
+alloisom
+alloisomer
+alloisomeric
+alloisomerism
+allokera
+allokere
+allokeres
+allokeret
+allokeri
+allokering
+allokeringssynspunkt
+allokert
+allokine
+allokinesis
+allokinetic
+allokurt
+allokurtic
+allomeri
+allomerism
+allomero
+allomerous
+allometr
+allometric
+allometry
+allomo
+allomorp
+allomorph
+allomorphic
+allomorphism
+allomorphite
+allomuci
+allomucic
+allon
+allonbac
+allonbachuth
+allonge
+allonge'
+allonge'e
+allonge'es
+allonge's
+allonge`
+allonge`rent
+allongea
+allongeaient
+allongeais
+allongeait
+allongeant
+allongem
+allongement
+allongements
+allongen
+allongent
+allongeo
+allongeons
+allongep
+allongepruik
+allongepruiken
+allonger
+allongera
+allongerai
+allongeraient
+allongerais
+allongerait
+allongeras
+allongerez
+allongeriez
+allongerions
+allongerons
+allongeront
+allonges
+allongez
+allongie
+allongiez
+allongio
+allongions
+allonomo
+allonomous
+allons
+allonsy
+allontan
+allontana
+allontanai
+allontani
+allontano
+allonym
+allonymo
+allonymous
+allooi
+allopaat
+allopall
+allopalladium
+allopate
+allopaten
+allopath
+allopathetic
+allopathetically
+allopathic
+allopathically
+allopathie
+allopathies
+allopathisch
+allopathische
+allopathist
+allopaths
+allopathy
+allopatr
+allopatric
+allopatrically
+allopatry
+allopela
+allopelagic
+allophan
+allophanamide
+allophanates
+allophane
+allophanic
+allophon
+allophone
+allophones
+allophonic
+allophyl
+allophyle
+allophylian
+allophylic
+allophylus
+allophyt
+allophytoid
+alloplas
+alloplasm
+alloplasmatic
+alloplasmic
+alloplast
+alloplastic
+alloplasty
+alloploi
+alloploidy
+allopoly
+allopolyploid
+allopsyc
+allopsychic
+alloquia
+alloquial
+alloquialism
+alloquy
+allora
+allorhyt
+allorhythmia
+allori
+alloro
+allorrhy
+allorrhyhmia
+allorrhythmic
+allosaur
+allosaurus
+allose
+allosema
+allosematic
+allosome
+allosynd
+allosyndesis
+allosyndetic
+allot
+alloted
+allotee
+allotell
+allotelluric
+allothei
+allotheism
+allother
+allotheria
+allothig
+allothigene
+allothigenetic
+allothigenetically
+allothigenic
+allothigenous
+allothim
+allothimorph
+allothimorphic
+allothog
+allothogenic
+allothogenous
+allotmen
+allotment
+allotments
+allotrio
+allotriodontia
+allotriognathi
+allotriomorphic
+allotriophagia
+allotriophagy
+allotriu
+allotriuria
+allotrop
+allotrope
+allotropes
+allotrophic
+allotropic
+allotropical
+allotropically
+allotropicity
+allotropies
+allotropism
+allotropize
+allotropous
+allotropy
+allotryl
+allotrylic
+allots
+allottab
+allottable
+allotted
+allottee
+allottees
+allotter
+allotters
+allottin
+allotting
+allotype
+allotypes
+allotypi
+allotypic
+allotypical
+allotypically
+alloua
+allouaie
+allouaient
+allouais
+allouait
+allouant
+alloue
+alloue'
+alloue'e
+alloue'es
+alloue's
+alloue`r
+alloue`rent
+allouent
+allouer
+allouera
+allouerai
+alloueraient
+allouerais
+allouerait
+alloueras
+allouere
+allouerez
+alloueri
+alloueriez
+allouerions
+allouero
+allouerons
+alloueront
+alloues
+allouez
+allouiez
+allouion
+allouions
+allouons
+allover
+allovers
+allow
+allowabl
+allowable
+allowableness
+allowably
+allowanc
+allowance
+allowanced
+allowances
+allowancing
+alloway
+allowed
+allowedl
+allowedly
+allower
+alloweth
+allowing
+allows
+alloxan
+alloxana
+alloxanate
+alloxani
+alloxanic
+alloxant
+alloxantin
+alloxura
+alloxuraemia
+alloxure
+alloxuremia
+alloxuri
+alloxuric
+alloxypr
+alloxyproteic
+alloy
+alloyage
+alloyed
+alloying
+alloys
+alloza
+allozar
+allozo
+allozooi
+allozooid
+allport
+allpress
+allra
+allradki
+allradkipper
+allred
+allright
+allround
+allroundeinsatz
+allrounder
+allroundl|per
+allroundl|pere
+allroundl|peren
+alls
+allsang
+allseed
+allseein
+allseeing
+allseiti
+allseitig
+allseitigem
+allseitigen
+allseitiger
+allseits
+allshard
+allsidig
+allsidige
+allsidighet
+allsidigheten
+allsidigt
+allslags
+allsouls
+allspice
+allspices
+allstair
+allstairs
+allstate
+allst|tt
+allsun
+allswell
+allswellthatendswell
+allt
+allta"gl
+allta"glich
+alltaegl
+alltaeglich
+alltaegliche
+alltaeglichen
+alltaeglicher
+alltaegliches
+alltaeglichkeiten
+alltag
+alltages
+alltagsa
+alltagsablauf
+alltagsarbeit
+alltagsb
+alltagsbetrieb
+alltagsf
+alltagsfragen
+alltagsfreuden
+alltagsg
+alltagsgeschaeft
+alltagsm
+alltagsmanieren
+alltagsmenschen
+alltagsp
+alltagspelz
+alltagss
+alltagsschwaechen
+alltagst
+alltagstonart
+alltagsv
+alltagsverhalten
+alltech
+allthewo
+alltheworldsavax
+allthing
+allthorn
+alltid
+alltihop
+alltihopa
+allting
+alltinge
+alltinget
+alltoofr
+alltoofrequent
+alltsa
+alltsaa
+allts}
+alltud
+alluce
+alluci
+allude
+alluded
+alludel
+alludend
+alludendo
+alludere
+alludert
+alludes
+alluding
+alluma
+allumage
+allumages
+allumaie
+allumaient
+allumais
+allumait
+allumant
+allume
+allume'
+allume'e
+allume'es
+allume's
+allume-c
+allume-cigares
+allume-g
+allume-gaz
+allume`r
+allume`rent
+allument
+allumer
+allumera
+allumerai
+allumeraient
+allumerais
+allumerait
+allumeras
+allumere
+allumerez
+allumeri
+allumeriez
+allumerions
+allumero
+allumerons
+allumeront
+allumes
+allumett
+allumette
+allumettes
+allumez
+allumfas
+allumfassend
+allumfassende
+allumfassendem
+allumfassender
+allumfassendes
+allumiez
+allumini
+alluminio
+allumion
+allumions
+allumons
+allunga
+allungai
+allungam
+allungammo
+allungan
+allungando
+allungano
+allungar
+allungare
+allungas
+allungasse
+allungassi
+allungaste
+allungasti
+allungat
+allungata
+allungate
+allungati
+allungato
+allungav
+allungava
+allungavi
+allungavo
+allunghe
+allunghera
+allunghero
+allunghi
+allunghino
+allungo
+allunion
+allur
+allurd
+allure
+allured
+allureme
+allurement
+allurements
+allurer
+allurers
+allures
+alluring
+alluringly
+alluringness
+allusif
+allusifs
+allusion
+allusione
+allusioni
+allusions
+allusiva
+allusive
+allusively
+allusiveness
+allusives
+allusivi
+allusivo
+allusjon
+allusjonen
+alluvia
+alluviaa
+alluviaal
+alluvial
+alluviale
+alluvials
+alluviat
+alluviate
+alluviation
+alluvion
+alluvione
+alluvioni
+alluvionner
+alluvions
+alluviou
+alluvious
+alluvium
+alluviums
+alluvivi
+alluvivia
+alluviviums
+allvar
+allverde
+allverden
+allvis
+allvisst
+allvist
+allviten
+allvitende
+allvitenhet
+allweath
+allweather
+allwette
+allwetterjaeger
+allwhere
+allwhith
+allwhither
+allwin
+allwise
+allwisse
+allwissend
+allwissende
+allwissendem
+allwissender
+allwissendes
+allwissenheit
+allwissenheiten
+allwo
+allwoech
+allwoechentlich
+allwoechentlichem
+allwoechentlichen
+allwoechentlicher
+allwood
+allwork
+allworth
+allworthy
+allwyn
+allx
+ally
+allyce
+allying
+allyl
+allylami
+allylamine
+allylate
+allylati
+allylation
+allylene
+allylic
+allyls
+allylthi
+allylthiourea
+allyn
+allynbac
+allynbacon
+allys
+allyson
+allzu
+allzubal
+allzubald
+allzufru
+allzufrueh
+allzufruehen
+allzugen
+allzugenau
+allzuger
+allzugerne
+allzugro
+allzugrosse
+allzugrossen
+allzugrosser
+allzulan
+allzulange
+allzulanger
+allzumal
+allzumen
+allzumenschliches
+allzuoft
+allzuseh
+allzusehr
+allzuvie
+allzuviel
+allzuwei
+allzuweit
+allzuwen
+allzuwenig
+allzweck
+allzweckfahrzeuges
+alm
+alma
+alma`ciga
+alma`cigo
+alma`dana
+alma`dena
+alma`dina
+alma`gana
+alma`nguena
+alma`rtaga
+alma`rtega
+alma`rtiga
+alma`stec
+alma`stica
+alma`stiga
+alma`tica
+almaar
+almacabra
+almacaero
+almace`n
+almacena
+almacenada
+almacenado
+almacenaje
+almacenamiento
+almacenar
+almacenero
+almacenista
+almaceno
+almacent
+almacenter
+almaceri`a
+almach
+almacht
+almachti
+almachtig
+almachtige
+almaciga
+almacigar
+almacigo
+almaciguera
+almaciguero
+almada
+almadaneta
+almade`n
+almadearse
+almaden
+almadeneta
+almadi`a
+almadia
+almadiar
+almadie
+almadiero
+almadraba
+almadrabera
+almadrabero
+almadraque
+almadraqueja
+almadre\a
+almadre\ero
+almagace`n
+almaganeta
+almagest
+almagesto
+almagor
+almagra
+almagradura
+almagral
+almagrar
+almagre
+almagre\a
+almagre\o
+almagrera
+almagrero
+almahala
+almain
+almaizal
+almaizar
+almaizo
+almaja
+almajal
+almajaneque
+almajar
+almajara
+almaje
+almajo
+almalafa
+almalgam
+almalgamasjon
+alman
+almanac
+almanaca
+almanach
+almanachs
+almanack
+almanacka
+almanacs
+almanak
+almanakk
+almanakken
+almanaque
+almanaquera
+almanaquero
+almancebe
+almandin
+almandina
+almandine
+almandines
+almandino
+almandit
+almandite
+almansor
+almanta
+almarada
+almarbatar
+almarbate
+almarcha
+almarga
+almariete
+almario
+almarjal
+almarjete
+almarjo
+almaro
+almarra`
+almarraja
+almarraza
+almartigo`n
+almashat
+almassy
+almaste
+almastigada
+almastigado
+almasy
+almata
+almatrero
+almatriche
+almatroque
+almatson
+almaviva
+almayer
+almaz
+almazaque
+almazara
+almazarero
+almazarro`n
+alme
+almea
+almecer
+almecina
+almecino
+almeda
+almeddah
+almeddahim
+almede
+almee
+almeida
+almeidas
+almeidin
+almeidina
+almeja
+almejar
+almeji`
+almeji`a
+almelda
+almemar
+almen
+almena
+almenada
+almenado
+almenaje
+almenar
+almenara
+almendar
+almendarez
+almendra
+almendrada
+almendrado
+almendral
+almendrar
+almendrate
+almendrera
+almendrero
+almendrilla
+almendro
+almendro`n
+almendrolo`n
+almendruco
+almene
+almenilla
+almeno
+alment
+almente
+almeria
+almerian
+almeriense
+almeriit
+almeriite
+almerind
+almerinda
+almeta
+almete
+almeteen
+almeyda
+almez
+almeza
+almezo
+almgren
+almgrund
+almi`bar
+almiar
+almiarar
+almibarada
+almibarado
+almibarar
+almicantarat
+almida
+almido`n
+almidonada
+almidonado
+almidonar
+almidoneri`a
+almifor
+almifora
+almiforero
+almighti
+almightie
+almighties
+almightily
+almightiness
+almighty
+almijar
+almijara
+almijarero
+almilla
+almimbar
+alminar
+almindelig
+almindelige
+almindeligeste
+almindelighed
+almindeligt
+almindeligvis
+alminnel
+alminnelig
+alminnelige
+alminnelighet
+almique
+almiqui`
+almira
+almirah
+almiraj
+almiraje
+almiral
+almirant
+almiranta
+almirantadgo
+almirantazgo
+almirante
+almirantesa
+almiranti`a
+almire
+almirez
+almiro`n
+almissa
+almisse
+almissen
+almisser
+almizate
+almizcate
+almizclar
+almizcle
+almizcle\a
+almizcle\o
+almizclera
+almizclero
+almizque
+almizque\a
+almizque\o
+almizquera
+almizteca
+almmusik
+almner
+almners
+almo
+almo`far
+almo`ndiga
+almoace`n
+almoca`rabe
+almocade`n
+almocafre
+almocarbe
+almocati`
+almocatraci`a
+almoceda
+almocela
+almochod
+almochoden
+almocrebe
+almocri`
+almodad
+almodi`
+almodo`n
+almodovare\a
+almodovare\o
+almodrote
+almofalla
+almofariz
+almofi`a
+almofre
+almofrej
+almofrez
+almoga`var
+almogama
+almogavarear
+almogaveri`a
+almogend
+almogende
+almogendheid
+almohad
+almohada
+almohadada
+almohadado
+almohadazo
+almohade
+almohades
+almohadilla
+almohadillada
+almohadillado
+almohadillar
+almohado`n
+almoharrefa
+almohatre
+almohaza
+almohazador
+almohazar
+almoign
+almoja`bana
+almojama
+almojarifadgo
+almojarifalgo
+almojarifazgo
+almojarife
+almojatre
+almojaya
+almojerifazgo
+almojerife
+almolong
+almolonga
+almon
+almona
+almond
+almondib
+almondiblathaim
+almondiguilla
+almondli
+almondlike
+almonds
+almondy
+almoneda
+almonedar
+almonedear
+almoner
+almoners
+almonership
+almonry
+almont
+almora
+almora`vide
+almorabu`
+almoraduj
+almoradux
+almoravi
+almoravid
+almoravide
+almoravides
+almorejo
+almori`
+almoroni`a
+almorrana
+almorranienta
+almorraniento
+almorrefa
+almorro`n
+almorta
+almorzada
+almorzado
+almorzar
+almos
+almoseng
+almosengebens
+almosna
+almosnar
+almosnera
+almosnero
+almost
+almotace`n
+almotacenadgo
+almotacenalgo
+almotacenazgo
+almotaceni`a
+almotalafe
+almotazaf
+almotazani`a
+almous
+almoza`rabe
+almozada
+almozala
+almquist
+alms
+almsa
+almsa-1
+almsdeed
+almsdeeds
+almsfolk
+almsful
+almsgive
+almsgiver
+almsgivi
+almsgiving
+almshous
+almshouse
+almshouses
+almsman
+almsmen
+almswoma
+almswoman
+almu\a
+almucant
+almucantar
+almuce
+almucia
+almud
+almudada
+almude
+almudejo
+almudelio
+almudero
+almudi`
+almudi`n
+almue
+almue`dano
+almue`rdago
+almueci`n
+almuede`n
+almuertas
+almuerza
+almuerzo
+almueskole
+almuezada
+almug
+almuga`var
+almuna
+almunge
+almunia
+almuntas
+almuntasir
+almuredi
+almuredin
+almut
+almutace`n
+almutazaf
+almutelio
+almuten
+almwirt
+almyra
+aln
+alna
+alnabru
+alnada
+alnado
+alnafe
+alnage
+alnager
+alnagers
+alnagership
+alnahayy
+alnahayyan
+alnascha
+alnaschar
+alnascharism
+alnate
+alne
+alnedo
+alnein
+alner
+alnesgar
+alnesgard
+alnico
+alnicoes
+alnilam
+alniresi
+alniresinol
+alnitak
+alnitham
+alniviri
+alniviridol
+alno
+alnoite
+alnoor
+alnor
+alnuin
+alnus
+alnutt
+alnuwab
+alnuwwab
+alo
+alo`broge
+alo`brogo
+alo`n
+alo`pata
+aloa
+aloadae
+aloadai
+aloapam
+aloaria
+alobada
+alobadada
+alobadado
+alobado
+alobreguecer
+alobro`gica
+alobro`gico
+alobunada
+alobunado
+alocada
+alocadamente
+alocado
+alocar
+alocasia
+alochia
+alocucio`n
+alod
+alodial
+alodiali
+alodialism
+alodialist
+alodiality
+alodiall
+alodially
+alodian
+alodiary
+alodific
+alodification
+alodio
+alodium
+alody
+aloe
+aloe's
+aloe`s
+aloe`tica
+aloe`tico
+aloed
+aloekoe
+aloelike
+aloemodi
+aloemodin
+aloeroot
+aloes
+aloesol
+aloeswoo
+aloeswood
+aloeta
+aloetic
+aloetica
+aloetical
+aloewood
+alofi
+aloft
+alogador
+alogadora
+alogamiento
+alogar
+alogia
+alogian
+alogical
+alogically
+alogism
+aloguer
+aloguero
+alogy
+aloha
+alohas
+aloi
+aloid
+aloin
+alois
+aloise
+aloisia
+aloisiit
+aloisiite
+aloisio
+aloja
+alojada
+alojado
+alojamiento
+alojar
+alojera
+alojeri`a
+alojero
+alok
+alom
+aloma
+alomada
+alomado
+alomancy
+alomar
+alomari
+alombar
+alombra
+alomtege
+alomtegenwoordig
+alomtegenwoordige
+alomtegenwoordigheid
+alomvatt
+alomvattend
+alomvattende
+alomwe
+alon
+alondra
+alone
+alonenes
+aloneness
+along
+alongada
+alongadera
+alongadero
+alongado
+alongamiento
+alonganza
+alongar
+alongsho
+alongshore
+alongshoreman
+alongsid
+alongside
+alongst
+aloni
+alonso
+alonsoa
+alonzo
+aloof
+alooff
+aloofly
+aloofnes
+aloofness
+aloose
+alop
+alopa`tica
+alopa`tico
+alopati`a
+alopecia
+alopecias
+alopecic
+alopecis
+alopecist
+alopecoi
+alopecoid
+alopecur
+alopecuro
+alopecurus
+alopeke
+alopiada
+alopiado
+alopias
+alopiida
+alopiidae
+aloque
+aloquecerse
+aloqui`n
+alor
+alora
+alorese
+aloro
+alors
+alosa
+alosar
+alose
+alosna
+alot
+alotar
+alotau
+alotenan
+alotenango
+aloth
+alotro`pica
+alotro`pico
+alotropi`a
+alouatta
+alouatte
+aloud
+aloude
+alouette
+alouettes
+alourdi
+alourdie
+alourdies
+alourdir
+alourdira
+alourdirai
+alourdiraient
+alourdirais
+alourdirait
+alourdiras
+alourdirent
+alourdirez
+alourdiriez
+alourdirions
+alourdirons
+alourdiront
+alourdis
+alourdissaient
+alourdissais
+alourdissait
+alourdissant
+alourdisse
+alourdissement
+alourdissements
+alourdissent
+alourdisses
+alourdissez
+alourdissiez
+alourdissions
+alourdissons
+alourdit
+alow
+alowe
+aloxite
+aloya
+aloys
+aloyshin
+aloyshina
+aloysia
+aloysius
+alp
+alpa\ata
+alpaca
+alpaca's
+alpacas
+alpacawo
+alpacawol
+alpaga
+alpage
+alpages
+alpaguer
+alpakka
+alpakkae
+alpakkaen
+alpamato
+alpar
+alparcear
+alparcera
+alparceri`a
+alparcero
+alpargata
+alpargatada
+alpargatado
+alpargatar
+alpargate
+alpargatera
+alpargateri`a
+alpargatero
+alpargatilla
+alparsla
+alparslan
+alpartaz
+alpaslan
+alpasote
+alpasotes
+alpatana
+alpaugh
+alpax
+alpay
+alpdruck
+alpe
+alpe`rsico
+alpechi`n
+alpechinera
+alpeen
+alpelue
+alpeluer
+alpen
+alpena
+alpenbli
+alpenblick
+alpenblo
+alpenbloem
+alpenbloemen
+alpenclu
+alpenclub
+alpenclubs
+alpencup
+alpende
+alpendre
+alpene
+alpenfer
+alpenferien
+alpengeb
+alpengebiet
+alpenglo
+alpenglow
+alpenglu
+alpengluehen
+alpenhoo
+alpenhoorn
+alpenhoorns
+alpenhor
+alpenhoren
+alpenhorens
+alpenhorn
+alpenhorns
+alpenjae
+alpenjaeger
+alpenjag
+alpenjager
+alpenjagers
+alpenket
+alpenkette
+alpenlae
+alpenlaendern
+alpenlaendisches
+alpenlan
+alpenland
+alpenmil
+alpenmilch
+alpenpok
+alpenpokal
+alpenpokalspiel
+alpenroo
+alpenroos
+alpenros
+alpenrose
+alpenroz
+alpenrozen
+alpensto
+alpenstock
+alpenstocker
+alpenstocks
+alpenstok
+alpenstokken
+alpenstr
+alpenstrasse
+alpenstrassen
+alpenvei
+alpenveilchen
+alpenver
+alpenverein
+alpenvor
+alpenvorland
+alpenwel
+alpenwelt
+alper
+alperovi
+alperovich
+alpert
+alpes
+alpestra
+alpestral
+alpestre
+alpestri
+alpestrian
+alpestrine
+alpez
+alpg
+alpha
+alpha-bi
+alpha-bits
+alphabe'
+alphabe'tique
+alphabe'tiques
+alphabe'tisation
+alphabe'tiser
+alphabe'tisme
+alphabet
+alphabetarian
+alphabete
+alphabeted
+alphabeten
+alphabetic
+alphabetical
+alphabetically
+alphabetics
+alphabetiform
+alphabetisch
+alphabetische
+alphabetischen
+alphabetischer
+alphabetisches
+alphabetism
+alphabetist
+alphabetization
+alphabetize
+alphabetized
+alphabetizer
+alphabetizers
+alphabetizes
+alphabetizing
+alphabets
+alphaeus
+alphamer
+alphameric
+alphand
+alphanum
+alphanume'rique
+alphanume'riques
+alphanumeric
+alphanumerics
+alphanumerisch
+alphanumerische
+alphanumerischen
+alphanumerischer
+alphanumerisches
+alphard
+alpharet
+alpharetta
+alphas
+alphatol
+alphatoluic
+alphatow
+alphean
+alphecca
+alphen
+alphenic
+alpherat
+alpheratz
+alphitom
+alphitomancy
+alphitomorphous
+alphol
+alphonis
+alphonist
+alphonse
+alphonsi
+alphonsina
+alphonsine
+alphonsism
+alphonso
+alphonz
+alphorn
+alphorns
+alphos
+alphosis
+alphyl
+alphyn
+alpi
+alpian
+alpicoz
+alpid
+alpieu
+alpigene
+alpin
+alpina
+alpine
+alpinely
+alpinem
+alpinen
+alpinery
+alpines
+alpinesq
+alpinesque
+alpinia
+alpiniac
+alpiniaceae
+alpinism
+alpinisme
+alpinismo
+alpinisms
+alpinist
+alpinista
+alpiniste
+alpinisten
+alpinistes
+alpinisti
+alpinistinnen
+alpinists
+alpinklu
+alpinklubbene
+alpinklubber
+alpino
+alpino's
+alpinomu
+alpinomuts
+alpinomutsen
+alpins
+alpinsk
+alpinspo
+alpinsporten
+alpint
+alpist
+alpiste
+alpistela
+alpistera
+alpistero
+alpo
+alpoca
+alporcho`n
+alps
+alptraeu
+alptraeume
+alptraeumen
+alptraum
+alptraums
+alpuente
+alpujarr
+alpujarra
+alpujarre\a
+alpujarre\o
+alq
+alqadhaf
+alqadhafi
+alqosh
+alqueire
+alquequenje
+alqueri`a
+alquermes
+alquerque
+alquetifa
+alquez
+alquezar
+alqui`mica
+alqui`micamente
+alqui`mico
+alquibla
+alquicel
+alquicer
+alquier
+alquifol
+alquifou
+alquilable
+alquiladiza
+alquiladizo
+alquilador
+alquiladora
+alquilamiento
+alquilante
+alquilar
+alquilate
+alquile`
+alquiler
+alquilo`n
+alquilona
+alquimia
+alquimila
+alquimista
+alquinal
+alquist
+alquitara
+alquitarar
+alquitifa
+alquitira
+alquitra`n
+alquitrabe
+alquitranada
+alquitranado
+alquitranar
+alqusayb
+alqusaybi
+alr
+alras
+alraun
+alraune
+alreadie
+alreadin
+alreadiness
+already
+alred
+alrede
+alrededor
+alree
+alreeds
+alric
+alrick
+alright
+alrighty
+alroot
+alrot
+alrota
+alruin
+alruinen
+alruinma
+alruinmannetje
+alruinmannetjes
+alruinwo
+alruinwortel
+alruinwortels
+alruna
+alrune
+als
+alsaadi
+alsabah
+alsabahi
+alsace
+alsacelo
+alsacelorraine
+alsaciana
+alsaciano
+alsalala
+alsaleh
+alsalim
+alsatia
+alsatian
+alsax
+alsbachi
+alsbachite
+alsbald
+alsbaldi
+alsbaldigen
+alscal
+alschmit
+alschmitt
+alsdan
+alsdann
+alsea
+alsem
+alsemach
+alsemachtig
+alsemachtige
+alsemachtiger
+alsemachtigst
+alsembek
+alsembeker
+alsembekers
+alsemdra
+alsemdrank
+alsemdranken
+alsemkru
+alsemkruid
+alsemwij
+alsemwijn
+alsen
+alsertin
+alsertine
+alsey
+alshaab
+alshabou
+alshabout
+alshain
+alshanfa
+alshanfari
+alshihuh
+alshura
+alsikekl
+alsikekl|ver
+alsikekl|veren
+alsina
+alsinace
+alsinaceae
+alsinaceous
+alsine
+alsiyayl
+alsiyayli
+alsjebli
+alsjeblieft
+alska
+alskens
+alsmede
+alsnog
+alsnu
+also
+alsof
+alsogara
+alsogaray
+alsook
+alsoon
+alsop
+alsophil
+alsophila
+alsoran
+alspaugh
+alstad
+alstahau
+alstahaug
+alstead
+alstede
+alster
+alsterdo
+alsterdorf
+alsterna
+alsternaehe
+alsteruf
+alsterufer
+alstine
+alstoen
+alston
+alstonia
+alstonid
+alstonidine
+alstonin
+alstonine
+alstonit
+alstonite
+alstra
+alstroem
+alstroemeria
+alstrup
+alstubli
+alstublieft
+alstyne
+alsudan
+alsvid
+alsweill
+alswiti
+alt
+alt-proj
+alt-project-pc
+alta
+altaar
+altaardo
+altaardoek
+altaardoeken
+altaarge
+altaargeheim
+altaargeheimen
+altaarst
+altaarsteen
+altaarstenen
+altaarstuk
+altaarstukken
+altaarta
+altaartafel
+altaartafels
+altaartj
+altaartje
+altaartjes
+altabaca
+altabaque
+altabaquillo
+altadena
+altadonn
+altadonna
+altaf
+altafg|rende
+altagrac
+altagracia
+altai
+altai`r
+altaian
+altaic
+altaid
+altaikiz
+altaikizhi
+altair
+altaira
+altaite
+altaj
+altaktie
+altalena
+altalene
+altaloma
+altamaha
+altamahaw
+altamandri`a
+altament
+altamente
+altameri
+altamerikaner
+altami`a
+altamira
+altamirano
+altamisa
+altamont
+altamontesprings
+altan
+altana
+altanar
+altand|r
+altanen
+altanera
+altaneramente
+altaneri`a
+altanero
+altanez
+altanges
+altangesehene
+altano
+altanvin
+altanvindu
+altar
+altarage
+altarbil
+altarbild
+altare
+altared
+altarejo
+altaren
+altarero
+altargem
+altargemaelden
+altari
+altariba
+altarico`n
+altaricona
+altarist
+altarlet
+altarna
+altarpie
+altarpiece
+altarpieces
+altarreina
+altars
+altarwis
+altarwise
+altas
+altavist
+altavista
+altavoz
+altay
+altazimu
+altazimuth
+altbabyl
+altbabylonisches
+altbacke
+altbackenen
+altbaute
+altbauten
+altbauwo
+altbauwohnungen
+altbayer
+altbayern
+altbekan
+altbekannt
+altbekannte
+altbekannten
+altbekannter
+altbekanntes
+altbewa"
+altbewa"hrte
+altbewae
+altbewaehrt
+altbewaehrte
+altbewaehrtem
+altblokk
+altblokkfl|yte
+altblokkfl|ytens
+altbunde
+altbundespraesident
+altbundespraesidentugen
+altbundestrainer
+altdorf
+alte
+alte'ra
+alte'rai
+alte'raient
+alte'rais
+alte'rait
+alte'ran
+alte'rant
+alte'rat
+alte'ration
+alte'rations
+alte're'
+alte're'e
+alte're'es
+alte're's
+alte're`
+alte're`rent
+alte'rer
+alte'rera
+alte'rerai
+alte'reraient
+alte'rerais
+alte'rerait
+alte'reras
+alte'rerez
+alte'reriez
+alte'rerions
+alte'rerons
+alte'reront
+alte'rez
+alte'rie
+alte'riez
+alte'rio
+alte'rions
+alte'ron
+alte'rons
+alte`re
+alte`ren
+alte`rent
+alte`res
+altea
+altear
+alteen
+altegade
+altegader
+altehrwu
+altehrwuerdige
+altehrwuerdigen
+alteinge
+alteingefuehrte
+alteingesessene
+alteingesessenem
+alteingesessenen
+alteingesessenes
+altekar
+altem
+altemaal
+altemet
+altemets
+alten
+altenbur
+altenburg
+altenhau
+altenhaus
+altenhei
+altenheimen
+altenhil
+altenhilfe
+altenhol
+altenholz
+altenker
+altenkerken
+altenklu
+altenklub
+altenpen
+altenpension
+altenren
+altenrenten
+altentag
+altentagesstaette
+altentei
+altenteiler
+altenwer
+altenwerk
+altenwoh
+altenwohnsitz
+altenwohnstift
+alter
+altera
+alterabi
+alterabilidad
+alterability
+alterabl
+alterable
+alterableness
+alterably
+alteracio`n
+alterada
+alteradiza
+alteradizo
+alterado
+alterador
+alteradora
+alterai
+alteramm
+alterammo
+alterand
+alterando
+alterandone
+alterano
+alterant
+alterante
+alterants
+alterar
+alterare
+alterarl
+alterarlo
+alteraro
+alterarono
+alterasj
+alterasjon
+alterass
+alterasse
+alterassi
+alterast
+alteraste
+alterasti
+alterata
+alterate
+alterati
+alteratie
+alteraties
+alterating
+alteration
+alterations
+alterativa
+alterative
+alteratively
+alterativo
+alterato
+alterava
+alteravamo
+alteravano
+alteravate
+alteravi
+alteravo
+alterazi
+alterazione
+altercacio`n
+altercada
+altercado
+altercador
+altercadora
+altercante
+altercar
+altercat
+altercate
+altercated
+altercating
+altercation
+altercations
+altercative
+alterchi
+alterco
+alterd
+altere
+altered
+alterego
+alteregoism
+alteregoistic
+alterer
+alterera
+altererai
+alterere
+altererei
+altereremo
+altererete
+alterero
+alterers
+alterert
+alteret
+altereth
+altergan
+altergang
+altergangen
+alteri
+alteriam
+alteriamo
+alteriat
+alteriate
+altering
+alterino
+alterio
+alterity
+alterlos
+alterman
+altermann
+altermen
+altern
+alterna
+alternac
+alternacio`n
+alternacy
+alternada
+alternadamente
+alternado
+alternador
+alternai
+alternaient
+alternais
+alternait
+alternam
+alternammo
+alternan
+alternance
+alternances
+alternancia
+alternando
+alternano
+alternant
+alternante
+alternanthera
+alternar
+alternare
+alternaria
+alternariose
+alternas
+alternasse
+alternassi
+alternaste
+alternasti
+alternat
+alternata
+alternate
+alternated
+alternately
+alternateness
+alternates
+alternati
+alternatie
+alternatief
+alternaties
+alternatieve
+alternatieven
+alternatif
+alternatifs
+alternating
+alternatingly
+alternation
+alternationist
+alternations
+alternativ
+alternativa
+alternativamente
+alternative
+alternativeinstellung
+alternatively
+alternativement
+alternativen
+alternativene
+alternativeness
+alternativer
+alternativerne
+alternatives
+alternativet
+alternativets
+alternativfrage
+alternativfragenstellung
+alternativity
+alternativkandidat
+alternativloesungen
+alternativmethode
+alternativo
+alternativplan
+alternativt
+alternativvorschlag
+alternativwahl
+alternato
+alternator
+alternators
+alternav
+alternava
+alternavi
+alternavo
+alternd
+alternde
+alternden
+alternder
+alterndes
+alterne
+alterne'
+alterne'e
+alterne'es
+alterne's
+alterne`
+alterne`rent
+alternee
+alterneer
+alterneerde
+alterneerden
+alterneert
+alternen
+alternent
+alterner
+alternera
+alternerai
+alterneraient
+alternerais
+alternerait
+alternerar
+alterneras
+alternere
+alternerei
+alterneren
+alternerer
+alternerez
+alterneriez
+alternerions
+alternero
+alternerons
+alterneront
+alternert
+alternes
+alternez
+alterni
+alternia
+alterniamo
+alterniate
+alternie
+alterniez
+alternif
+alternifoliate
+alternin
+alternino
+alternio
+alternions
+alternip
+alternipetalous
+alternipinnate
+alternis
+alternisepalous
+alternit
+alternity
+alterniz
+alternize
+alterno
+alternon
+alternons
+altero
+alteroce
+alterocentric
+alterosa
+alteroso
+alterrin
+alterring
+alters
+altersau
+altersaufbau
+altersdu
+altersdunkle
+alterser
+alterserscheinungen
+altersfa
+altersfaktor
+altersfalten
+altersge
+altersgenosse
+altersgenossin
+altersgenossinnen
+altersgr
+altersgrenzen
+altersgruenden
+altersgruppe
+altersgruppen
+altershe
+altersheime
+altersheimen
+altersheimes
+altersher
+altershi
+altershilfe
+alterskl
+altersklasse
+alterskr
+alterskrankenhaeuser
+altersma
+altersmaessig
+altersmu
+altersmuedigkeit
+alterspe
+alterspension
+altersre
+altersrente
+altersrenten
+altersru
+altersruhegeld
+alterssc
+altersschichten
+altersschwach
+altersschwache
+altersschwachem
+altersschwacher
+altersschwaches
+altersschwaeche
+altersschwaechen
+alterssi
+alterssicherung
+alterssitz
+altersst
+altersstarrsinn
+altersstufen
+alterst
+altersun
+altersunterschied
+altersve
+altersversicherung
+altersversorgungen
+alterswe
+alterswert
+alterswo
+alterswohnsitz
+altert
+altertav
+altertavle
+alterte
+altertes
+altertest
+altertje
+altertjeneste
+altertue
+altertuemliche
+altertuemlichem
+altertuemlichen
+altertuemliches
+altertum
+altertums
+altertumsforscher
+altertumsforschers
+altertumskunde
+altertumskunden
+alterung
+alterungsprozess
+altervin
+altes
+altesse
+altesses
+altet
+altetend
+altetende
+alteza
+altezame
+altezamen
+altezza
+altezze
+altezzos
+altezzosa
+altezzose
+altezzosi
+altezzoso
+altfavnende
+altfor
+altgedie
+altgedienter
+altgera"
+altgera"te
+altgesel
+altgeselle
+altgewoh
+altgewohnten
+altgold
+altgutha
+altguthaben
+altha
+althaea
+althaein
+althans
+althaus
+althausb
+althausbesitzer
+althea
+althea's
+altheime
+altheimer
+althein
+altheine
+althene
+altherge
+althergebracht
+althergebrachte
+althergebrachtem
+althergebrachter
+althergebrachtes
+altherr
+altherre
+altherren
+altherrenschaft
+althin
+althing
+althioni
+althionic
+altho
+althochd
+althochdeutsch
+althochdeutsches
+althoff
+althoorn
+althoorns
+althoren
+althorens
+althorn
+althorns
+although
+alti
+alti`locua
+alti`locuo
+alti`metra
+alti`metro
+alti`sima
+alti`simo
+alti`sona
+alti`sono
+altibajo
+altica
+alticame
+alticamelus
+altid
+altie`re
+altie`res
+altier
+altiers
+altigrap
+altigraph
+altijd
+altijddu
+altijddurend
+altijddurende
+altijdgr
+altijdgroen
+altijdgroene
+altilik
+altillo
+altilocuencia
+altilocuente
+altiloqu
+altiloquence
+altiloquent
+altime`t
+altime`tre
+altime`tres
+altimete
+altimeter
+altimeters
+altimetr
+altimetri`a
+altimetrical
+altimetrically
+altimetry
+altimira
+altimirano
+altin
+altincar
+alting
+alting-m
+alting-mees
+altingia
+altingiaceae
+altingiaceous
+altings
+altininc
+altininck
+altion
+altipian
+altipiani
+altipiano
+altiplan
+altiplanicie
+altiplano
+altiscop
+altiscope
+altisona
+altisonancia
+altisonant
+altisonante
+altisonantemente
+altisono
+altisonous
+altissim
+altissimo
+altitonante
+altitud
+altitude
+altitudes
+altitudi
+altitudinal
+altitudinarian
+altiva
+altivamente
+altivar
+altivecer
+altivedad
+altivez
+altiveza
+altividad
+altivo
+altkanzl
+altkanzlers
+altklug
+altkluge
+altklugem
+altklugen
+altkluger
+altkoeni
+altkoenig
+altkommu
+altkommunist
+altkonse
+altkonservativer
+altkunde
+altkunden
+altlast
+altlaste
+altlasten
+altliber
+altliberalen
+altman
+altmann
+altmar
+altmark
+altmater
+altmaterial
+altmeist
+altmeister
+altmetal
+altmetalle
+altmetallen
+altmetalles
+altmode
+altmodea
+altmodealtmodecokebottle
+altmodis
+altmodisch
+altmodische
+altmodischem
+altmodischen
+altmodischer
+altmodischere
+altmodischerem
+altmodischerer
+altmodischeres
+altmodisches
+altmodischste
+altmodischstem
+altmodischsten
+altmodischstes
+altmuligmand
+alto
+alto"l
+altoadig
+altoadige
+altoeste
+altoesterreichischen
+altogehe
+altogeher
+altogeth
+altogether
+altogetherness
+altomete
+altometer
+altomfat
+altomfattende
+alton
+altona
+altonbay
+altoona
+altoos
+altoosdu
+altoosdurend
+altoosdurende
+altopass
+altoppsl
+altoppslukende
+altor
+altorili
+altorilievo
+altorivi
+altorivievo
+altos
+altos1
+altos2
+altoun
+altovers
+altoverskyggende
+altovice
+altovise
+altozano
+altpapie
+altpapier
+altpapiere
+altpapiers
+altparti
+altpartij
+altpartijen
+altphilo
+altphilologe
+altphilologen
+altphilologie
+altpreus
+altpreussischen
+altra
+altrae
+altramucera
+altramucero
+altramuz
+altre
+altrente
+altrenten
+altresi'
+altret
+altretta
+altrettante
+altri
+altrices
+altricht
+altrichter
+altricia
+altricial
+altrimen
+altrimenti
+altro
+altroemi
+altroemische
+altroemischen
+altronde
+altropat
+altropathy
+altrosa
+altrose
+altrove
+altrui
+altruism
+altruisme
+altruismen
+altruismi
+altruismo
+altruisms
+altruist
+altruista
+altruiste
+altruisten
+altruister
+altruistes
+altruistic
+altruistically
+altruistisch
+altruistische
+altruistischer
+altruistisches
+altruistischt
+altruistisk
+altruists
+altr{
+altsakso
+altsaksofon
+altsammen
+altsange
+altsangerinne
+altsangerinnen
+altschin
+altschul
+altschulden
+altseend
+altseende
+altsleut
+altsleutel
+altsleutels
+altspare
+altsparergesetz
+altsparg
+altsparguthaben
+altsprac
+altsprachlich
+altsprachliche
+altsprachlichen
+altsprachlicher
+altsprachliches
+altstadt
+altstadtsanierung
+altstadtsprueche
+altstadtwidersprueche
+altstem
+altstemm
+altstemmen
+alts}
+altti
+altun
+altuntas
+altura
+alturas
+alture
+alturing
+alturist
+altus
+altus-pi
+altus-piv
+altvertr
+altvertrauten
+altviole
+altviolen
+altviool
+altvorde
+altvorderen
+altwagen
+altwageneintausch
+altwaren
+altwarenhaendlern
+altwarenhaendlers
+altweibe
+altweibersommer
+altweibersommers
+altzange
+altzangeres
+altzangeressen
+alt|del{ggende
+alu
+alu`a
+alu`mina
+alua
+aluben
+alubia
+alubiar
+aluciar
+aluciedad
+alucinacio`n
+alucinadamente
+alucinador
+alucinadora
+alucinamiento
+alucinante
+alucinar
+aluco
+aluco`n
+aluconid
+aluconidae
+aluconin
+aluconinae
+alud
+aluda
+aludel
+aludir
+aludo
+aludra
+alue\ar
+alue\e
+alue`n
+alufelge
+alufelgen
+alufrar
+alugar
+alugeha"
+alugeha"use
+aluin
+aluinaar
+aluinaarde
+aluinde
+aluinden
+aluinen
+aluino
+aluinste
+aluinsteen
+aluinstenen
+aluint
+aluku
+alukuyan
+alukuyana
+alula
+alular
+alulet
+alulim
+alulu
+alum
+alumbank
+alumbis
+alumbloo
+alumbloom
+alumbra
+alumbrada
+alumbrado
+alumbrador
+alumbradora
+alumbramiento
+alumbrante
+alumbrar
+alumbre
+alumbrera
+alumbrid
+alumbridge
+alumbrosa
+alumbroso
+alumcree
+alumcreek
+alumel
+alumic
+alumifer
+alumiferous
+alumin
+alumina
+aluminada
+aluminado
+aluminap
+aluminaphone
+aluminar
+aluminas
+aluminat
+aluminate
+aluminato
+alumine
+aluminer
+alumines
+aluminic
+aluminid
+aluminide
+aluminif
+aluminiferous
+aluminiform
+aluminio
+aluminis
+aluminish
+aluminit
+aluminita
+aluminite
+aluminiu
+aluminium
+aluminiumblech
+aluminiumen
+aluminiumfluorid
+aluminiumfolie
+aluminiumfolien
+aluminiumforbruket
+aluminiumgeha"use
+aluminiumhalle
+aluminiumkonzern
+aluminiumproduzenten
+aluminiumpulver
+aluminiumrinnen
+aluminiums
+aluminiumsektoren
+aluminiumsfabrikk
+aluminiumsfolie
+aluminiumsindustri
+aluminiumsindustrien
+aluminiumslegering
+aluminiumsprodukter
+aluminiumsprofiler
+aluminiumsr|r
+aluminiumsverk
+aluminiumsverket
+aluminiumsvinduer
+aluminiumwerk
+aluminiz
+aluminize
+aluminized
+aluminizes
+aluminizing
+aluminof
+aluminoferric
+aluminog
+aluminographic
+aluminography
+aluminos
+aluminosa
+aluminose
+aluminosilicate
+aluminosis
+aluminosity
+aluminoso
+aluminot
+aluminothermic
+aluminothermics
+aluminothermy
+aluminotype
+aluminou
+aluminous
+alumins
+aluminum
+aluminums
+aluminyl
+alumish
+alumite
+alumium
+alumn
+alumna
+alumnae
+alumnal
+alumni
+alumniat
+alumniate
+alumno
+alumnol
+alumnus
+alumodel
+alumodell
+alumohyd
+alumohydrocalcite
+alumroot
+alumroots
+alums
+alun
+alunada
+alunado
+alunamiento
+alunarada
+alunarado
+alunarse
+alundum
+alune
+aluneb
+alunen
+aluner
+alunet
+alungir
+alunifer
+aluniferous
+alunir
+alunite
+alunna
+alunne
+alunni
+alunno
+alunogen
+alupag
+alupka
+alupla"t
+alupla"ttchen
+aluplatt
+aluplatte
+aluplatten
+aluquete
+alur
+alure
+alurgite
+alush
+alushtit
+alushtite
+alusio`n
+alusiva
+alusivo
+alustrar
+aluta
+alutaceo
+alutaceous
+alutor
+alutorsk
+alutorskij
+alutrada
+alutrado
+aluu
+aluvial
+aluvio`n
+alv
+alva
+alvada
+alvader
+alvadore
+alvah
+alvan
+alvand
+alvanley
+alvar
+alvarado
+alvardo
+alvarez
+alvaro
+alvarsso
+alvarsson
+alvast
+alvaton
+alvdal
+alve
+alve'ole
+alve'oles
+alvean
+alveare
+alveari
+alveario
+alveariu
+alvearium
+alveary
+alvedans
+alvedansen
+alveloz
+alven
+alveola
+alveolar
+alveolariform
+alveolars
+alveolary
+alveolat
+alveolate
+alveolated
+alveolation
+alveole
+alveolec
+alveolectomy
+alveoli
+alveolif
+alveoliform
+alveolit
+alveolite
+alveolites
+alveolitis
+alveolo
+alveoloc
+alveoloclasia
+alveolocondylean
+alveolod
+alveolodental
+alveolol
+alveololabial
+alveololingual
+alveolon
+alveolonasal
+alveolos
+alveolosubnasal
+alveolot
+alveolotomy
+alveolus
+alveopal
+alveopalatal
+alver
+alvera
+alverda
+alverdens
+alverja
+alverjana
+alverjo`n
+alvermog
+alvermogen
+alvermogend
+alvermogende
+alverna
+alvernie
+alvernielend
+alvernielende
+alvers
+alversli
+alverslindend
+alverslindende
+alverta
+alvertje
+alvertjes
+alverton
+alves
+alveus
+alvi
+alvidende
+alviduco
+alviducous
+alvie
+alvin
+alvina
+alvine
+alvinia
+alvino
+alvir
+alvira
+alvis
+alvise
+alviso
+alvissma
+alvissmal
+alvite
+alvleesk
+alvleesklier
+alvleesklieren
+alvleess
+alvleessap
+alvo
+alvor
+alvord
+alvordto
+alvordton
+alvorens
+alvoret
+alvorlig
+alvorlige
+alvorligere
+alvorligste
+alvorligt
+alvorsam
+alvorsamt
+alvorsfy
+alvorsfylte
+alvorsma
+alvorsmannen
+alvorsor
+alvorsord
+alvorstu
+alvorstung
+alvsborg
+alvsborgs
+alvus
+alvy
+alw
+alwa
+alwaar
+alwaies
+alwasy
+alway
+alwayes
+always
+alweder
+alweer
+alwetend
+alwetende
+alwetendheid
+alweter
+alweteri
+alweterij
+alweters
+alwijs
+alwijze
+alwin
+alwine
+alwis
+alwiyah
+alwood
+alworo
+alwy
+alwyn
+alx
+aly
+alya
+alyawarr
+alyawarra
+alyce
+alycia
+alycompa
+alycompaine
+alyda
+alyk
+alymer
+alymphia
+alymphop
+alymphopotent
+alyn
+alynn
+alyosha
+alypin
+alyque
+alyre
+alys
+alysa
+alyse
+alysia
+alyson
+alyss
+alyssa
+alysson
+alyssum
+alyssums
+alytarch
+alytes
+alyutor
+alz
+alza
+alzacuello
+alzada
+alzadamente
+alzadera
+alzadero
+alzadiza
+alzadizo
+alzado
+alzador
+alzadura
+alzafuelles
+alzai
+alzamiento
+alzammo
+alzamora
+alzando
+alzano
+alzapa\o
+alzapie`
+alzapo`n
+alzaprima
+alzaprimar
+alzapuertas
+alzar
+alzare
+alzarono
+alzasse
+alzasser
+alzassero
+alzassi
+alzassim
+alzassimo
+alzaste
+alzasti
+alzata
+alzate
+alzati
+alzato
+alzava
+alzavamo
+alzavano
+alzavate
+alzavi
+alzavo
+alzera
+alzerai
+alzerann
+alzeranno
+alzerebb
+alzerebbe
+alzerei
+alzeremm
+alzeremmo
+alzeremo
+alzerest
+alzereste
+alzeresti
+alzerete
+alzero
+alzey
+alzheime
+alzheimer
+alzi
+alziamo
+alziate
+alziend
+alziende
+alzijdig
+alzijdige
+alzijdigheid
+alzino
+alzo
+alzofon
+alzubayr
+alzucara
+alzucaray
+am
+am500
+ama
+ama\ar
+ama\o
+ama`n
+ama`raco
+amaai
+amaalia
+amaarro
+amaas
+amaashi
+amaasi
+amabe
+amabel
+amabelle
+amabi
+amabile
+amabili
+amabili`sima
+amabili`simo
+amabilidad
+amabilit
+amabilita
+amabilite'
+amabilite's
+amability
+amable
+amablemente
+amabusma
+amabusmana
+amaca
+amacacor
+amacacore
+amacayo
+amaccyor
+amacena
+amaceno
+amache
+amachetear
+amachi
+amachima
+amachinarse
+amachua
+amacigada
+amacigado
+amacio`n
+amacollar
+amacrati
+amacratic
+amacrina
+amacrinal
+amacrine
+amacuro
+amacyoro
+amad
+amada
+amadare
+amadarei
+amadato
+amadavat
+amade
+amadee
+amadelph
+amadelphous
+amadeo
+amadera
+amadeus
+amadi
+amadis
+amadiya
+amado
+amadoi
+amador
+amadora
+amadorci
+amadorcity
+amadou
+amadoua
+amadouai
+amadouaient
+amadouais
+amadouait
+amadouan
+amadouant
+amadoue
+amadoue'
+amadoue'e
+amadoue'es
+amadoue's
+amadoue`
+amadoue`rent
+amadouen
+amadouent
+amadouer
+amadouera
+amadouerai
+amadoueraient
+amadouerais
+amadouerait
+amadoueras
+amadouerez
+amadoueriez
+amadouerions
+amadouerons
+amadoueront
+amadoues
+amadouez
+amadouie
+amadouiez
+amadouio
+amadouions
+amadouon
+amadouons
+amadrigar
+amadrinamiento
+amadrinar
+amadro\ada
+amadro\ado
+amadu
+amae
+amaenbo
+amaenbou
+amaestrada
+amaestradamente
+amaestrado
+amaestrador
+amaestradora
+amaestradura
+amaestramiento
+amaestrar
+amaethon
+amafingo
+amaga
+amagadura
+amagaeru
+amagai
+amagake
+amagaki
+amaganse
+amagansett
+amagappa
+amagar
+amagasa
+amagasab
+amagasak
+amagase
+amagata
+amagatak
+amagatorio
+amagatsu
+amagatuj
+amagatuz
+amage
+amagi
+amagishi
+amagisi
+amagiyug
+amago
+amagoi
+amagon
+amagrecer
+amagu
+amaguaco
+amagues
+amagula
+amagumo
+amagumor
+amaguri
+amah
+amahai
+amaharas
+amaharin
+amaharinya
+amahei
+amahs
+amahuaca
+amai
+amaigri
+amaigrie
+amaigries
+amaigrir
+amaigris
+amaigrissant
+amaigrissante
+amaigrissantes
+amaigrissants
+amaigrissement
+amaikana
+amaimon
+amain
+amainador
+amainar
+amaine
+amairo
+amaister
+amaita
+amaitinar
+amaizuho
+amajadar
+amajanar
+amaje
+amajio
+amajo
+amajofe
+amajur
+amak
+amakake
+amakara
+amakawa
+amakaze
+amakebe
+amakere
+amakosa
+amakubo
+amakuchi
+amakuda
+amakudar
+amakusa
+amakuta
+amakuti
+amal
+amala
+amalaita
+amalaka
+amalar
+amalasun
+amalasuntha
+amalaswi
+amalaswintha
+amalchi
+amale
+amalea
+amalear
+amalecita
+amalee
+amalek
+amalekit
+amalekite
+amalekites
+amalequita
+amaleta
+amalfian
+amalfita
+amalfitan
+amalfitana
+amalfitano
+amalgaam
+amalgam
+amalgama
+amalgama's
+amalgamable
+amalgamacio`n
+amalgamador
+amalgamadora
+amalgamai
+amalgamaient
+amalgamais
+amalgamait
+amalgamamiento
+amalgamano
+amalgamant
+amalgamar
+amalgamare
+amalgamata
+amalgamate
+amalgamated
+amalgamates
+amalgamati
+amalgamating
+amalgamation
+amalgamationist
+amalgamations
+amalgamative
+amalgamatize
+amalgamato
+amalgamator
+amalgamators
+amalgamava
+amalgamavi
+amalgamavo
+amalgame
+amalgame'
+amalgame'e
+amalgame'es
+amalgame's
+amalgame`rent
+amalgameer
+amalgameerde
+amalgameerden
+amalgameert
+amalgamen
+amalgament
+amalgamer
+amalgamera
+amalgamerai
+amalgameraient
+amalgamerais
+amalgamerait
+amalgameras
+amalgameren
+amalgamerez
+amalgameriez
+amalgamerions
+amalgamero
+amalgamerons
+amalgameront
+amalgames
+amalgamet
+amalgamez
+amalgami
+amalgamiez
+amalgamino
+amalgamions
+amalgamist
+amalgamization
+amalgamize
+amalgamo
+amalgamons
+amalgams
+amalia
+amalie
+amalings
+amalita
+amalka
+amalladar
+amallarse
+amalle
+amalrici
+amalrician
+amaltas
+amalthea
+amalu
+amalumut
+amalumute
+amam
+amamantador
+amamantadora
+amamantamiento
+amamantar
+amamau
+amambay
+amami
+amamioki
+amamiokinawan
+amamioos
+amamiosh
+amamioshima
+amamiosi
+amamiosima
+amamiya
+amamiyat
+amamizu
+amammo
+amamori
+amamoto
+amamoyoi
+amamoyou
+amampa
+amampond
+amampondo
+aman
+amana
+amanab
+amanage
+amanaje
+amanal
+amanar
+amanatto
+amanatun
+amanavil
+amanaye
+amancay
+amancebamiento
+amancebarse
+amancillar
+amand
+amanda
+amandapa
+amandapark
+amande
+amandel
+amandela
+amandelachtig
+amandelachtige
+amandelachtiger
+amandelachtigst
+amandelb
+amandelbomen
+amandelboom
+amandelbroodje
+amandelbroodjes
+amandele
+amandelen
+amandelm
+amandelmelk
+amandelo
+amandelolie
+amandelp
+amandelpars
+amandelpas
+amandelpers
+amandels
+amandelt
+amandeltje
+amandeltjes
+amandelv
+amandelvormig
+amandelvormige
+amandelvormiger
+amandelvormigst
+amandelz
+amandelzeep
+amandes
+amandi
+amandie
+amandier
+amandiers
+amandin
+amandine
+amandip
+amando
+amands
+amandus
+amandy
+amanear
+amanecer
+amanecida
+amaneciente
+amaneku
+amanerada
+amaneradamente
+amanerado
+amaneramiento
+amanerarse
+amanfro
+amang
+amangbet
+amangbetu
+amani
+amania
+amaniatar
+amanist
+amanita
+amanitas
+amanitin
+amanitine
+amanitop
+amanitopsis
+amanji
+amankgqw
+amankgqwigqwi
+amann
+amano
+amanochi
+amanogaw
+amanohar
+amanohas
+amanoiwa
+amanojada
+amanojado
+amanojak
+amanojar
+amanojya
+amanonag
+amanori
+amanosat
+amanosay
+amanotie
+amanous
+amanoyuk
+amanoyuu
+amanozya
+amansada
+amansado
+amansador
+amansadora
+amansamiento
+amansar
+amansei
+amant
+amantado
+amantar
+amante
+amanti
+amantill
+amantillar
+amantillo
+amants
+amanuban
+amanubanamanatun
+amanubang
+amanuens
+amanuense
+amanuensen
+amanuenses
+amanuensis
+amanuensissen
+amanuma
+amanumay
+amanye
+amanzanamiento
+amanzanar
+amanzi
+amao
+amaomaki
+amaoto
+amap
+amapa
+amapari
+amapola
+amapolarse
+amapondo
+amar
+amara
+amara\ar
+amaracai
+amaracaire
+amaracina
+amaracino
+amarag
+amaragic
+amaraje
+amarakae
+amarakaeri
+amarakai
+amarakaire
+amaral
+amarant
+amaranta
+amaranta`cea
+amaranta`ceo
+amarantaceae
+amarantaceous
+amarante
+amaranten
+amaranth
+amaranthaceae
+amaranthaceous
+amaranthine
+amaranthoid
+amaranthout
+amaranths
+amaranthus
+amaranti
+amarantin
+amarantina
+amarantite
+amarantk
+amarantkleur
+amaranto
+amarantu
+amarantus
+amarar
+amarasi
+amarcocc
+amarcocche
+amare
+amarecer
+amareggi
+amareggia
+amareggiai
+amareggino
+amareggio
+amarelle
+amarena
+amarendr
+amarendra
+amarene
+amaretto
+amarettos
+amarevol
+amarevole
+amarezza
+amarezze
+amarga
+amargaleja
+amargamente
+amargar
+amargazo`n
+amargo
+amargo`n
+amargor
+amargosa
+amargosamente
+amargosavalley
+amargoso
+amarguera
+amarguero
+amarguillo
+amargura
+amari
+amariah
+amariba
+amaricada
+amaricado
+amarie
+amariko
+amaril
+amarilho
+amarilhout
+amarili`dea
+amarili`deo
+amarilida`cea
+amarilida`ceo
+amarilla
+amarillear
+amarillecer
+amarilleja
+amarillejo
+amarillenta
+amarillento
+amarilleo
+amarillez
+amarillo
+amarillor
+amarillura
+amarin
+amarinar
+amarine
+amariner
+amarini
+amarinya
+amariposada
+amariposado
+amariris
+amaritud
+amaritude
+amarity
+amarizar
+amarizarse
+amarizo
+amarjit
+amarna
+amaro
+amaroid
+amaroida
+amaroidal
+amarok
+amaromar
+amarono
+amarosa
+amarpree
+amarra
+amarraco
+amarrada
+amarradero
+amarrado
+amarradura
+amarrage
+amarraie
+amarraient
+amarrais
+amarrait
+amarraje
+amarrant
+amarrar
+amarrazo`n
+amarre
+amarre'
+amarre'e
+amarre'es
+amarre's
+amarre`r
+amarre`rent
+amarreco
+amarrent
+amarrequear
+amarrer
+amarrera
+amarrerai
+amarreraient
+amarrerais
+amarrerait
+amarreras
+amarrere
+amarrerez
+amarreri
+amarreriez
+amarrerions
+amarrero
+amarrerons
+amarreront
+amarres
+amarrez
+amarrida
+amarrido
+amarriez
+amarrion
+amarrions
+amarro
+amarrons
+amarsi
+amart
+amartelada
+amarteladamente
+amartelado
+amartelamiento
+amartelar
+amarth
+amarthri
+amarthritis
+amartillar
+amarube
+amarulencia
+amarume
+amaryll
+amarylli
+amaryllid
+amaryllidaceae
+amaryllidaceous
+amaryllideous
+amaryllis
+amaryllises
+amaryllissen
+amas
+amasa
+amasadera
+amasadero
+amasadijo
+amasador
+amasadora
+amasadura
+amasai
+amasamiento
+amasar
+amasesis
+amashai
+amasi
+amasia
+amasiah
+amasiato
+amasijo
+amasone
+amasova
+amass
+amassa
+amassabl
+amassable
+amassaie
+amassaient
+amassais
+amassait
+amassant
+amasse
+amasse'
+amasse'e
+amasse'es
+amasse's
+amasse`r
+amasse`rent
+amassed
+amassent
+amasser
+amassera
+amasserai
+amasseraient
+amasserais
+amasserait
+amasseras
+amassere
+amasserez
+amasseri
+amasseriez
+amasserions
+amassero
+amasserons
+amasseront
+amassers
+amasses
+amassez
+amassi
+amassiez
+amassimo
+amassing
+amassings
+amassion
+amassions
+amassmen
+amassment
+amassments
+amassons
+amasta
+amaste
+amasthen
+amasthenic
+amasti
+amastia
+amasty
+amasu
+amasugi
+amasya
+amat
+amata
+amatador
+amatadora
+amatan
+amatar
+amataru
+amate
+amatembu
+amatenan
+amatenango
+amateras
+amateria
+amaterialistic
+amateur
+amateur-
+amateur-fotograaf
+amateur-fotografen
+amateurb
+amateurband
+amateurboxen
+amateurboxmeisterschaft
+amateurd
+amateurdetektiv
+amateure
+amateuren
+amateurf
+amateurfotograf
+amateurfunk
+amateurfunkbetrieb
+amateurfunkdienst
+amateurfunkfrequenzen
+amateurfunkpruefung
+amateurfunks
+amateurfunkverba"nde
+amateurfussball
+amateurg
+amateurgrundsaetze
+amateurh
+amateurhaft
+amateuri
+amateurish
+amateurishly
+amateurishness
+amateurism
+amateurisme
+amateurk
+amateurklub
+amateurkraefte
+amateurl
+amateurligen
+amateurm
+amateurmannschaft
+amateurp
+amateurprinzipien
+amateurr
+amateurregeln
+amateurs
+amateurship
+amateursport
+amateurstehern
+amateurswerk
+amateurv
+amateurverteidiger
+amateurvorstellung
+amati
+amatimar
+amatir
+amatista
+amatiste
+amativa
+amative
+amativel
+amatively
+amativen
+amativeness
+amativo
+amatla
+amato
+amatoer
+amatol
+amator
+amatoria
+amatorial
+amatorially
+amatorian
+amatorio
+amatorious
+amatory
+amatou
+amatri
+amatrice
+amatsu
+amatsubo
+amatsubu
+amatsuka
+amatsuko
+amatsusa
+amattare
+amattaru
+amatu
+amatubo
+amatubu
+amatukaz
+amatukom
+amatungu
+amatungula
+amatusae
+amatyua
+amat|r
+amat|rbe
+amat|rbestemmelser
+amat|rdy
+amat|rdykkere
+amat|ren
+amat|rene
+amat|renes
+amat|rer
+amat|rfo
+amat|rfotografer
+amat|rka
+amat|rkarriere
+amat|rkj
+amat|rkj|rer
+amat|rko
+amat|rkonkurranse
+amat|rkorps
+amat|rkr
+amat|rkrefter
+amat|rla
+amat|rlag
+amat|rli
+amat|rliga
+amat|rmu
+amat|rmusiker
+amat|rop
+amat|ropptak
+amat|ror
+amat|rorkester
+amat|rorkestre
+amat|rpr
+amat|rpreget
+amat|rprinsipper
+amat|rradio
+amat|rre
+amat|rreglement
+amat|rreglene
+amat|rregler
+amat|rrevyer
+amat|rry
+amat|rrytteren
+amat|rsp
+amat|rspillere
+amat|rst
+amat|rstatus
+amat|rstevner
+amat|rte
+amat|rtearet
+amat|rvi
+amat|rvirksomhet
+amat|rvirksomheten
+amau
+amaurosi
+amaurosis
+amauroti
+amaurotic
+amauta
+amava
+amavamo
+amavano
+amavate
+amavi
+amavisca
+amavo
+amawa
+amawaca
+amawaka
+amawalk
+amax
+amay
+amayador
+amayaka
+amayoke
+amayorazgar
+amayuela
+amaz
+amaza
+amazacotada
+amazacotado
+amazake
+amazaras
+amaze
+amazed
+amazedly
+amazedne
+amazedness
+amazeful
+amazemen
+amazement
+amazer
+amazers
+amazes
+amazi
+amazia
+amaziah
+amazigh
+amazilia
+amazing
+amazingl
+amazingly
+amazio
+amazo`nica
+amazo`nico
+amazolada
+amazolado
+amazon
+amazona
+amazonas
+amazone
+amazonen
+amazonenkleed
+amazones
+amazonia
+amazonian
+amazonio
+amazonis
+amazonism
+amazonit
+amazonite
+amazons
+amazu
+amazulu
+amazuppa
+amb
+amb2
+amba
+ambabiko
+ambach
+ambacht
+ambachte
+ambachten
+ambachts
+ambachtsbaas
+ambachtsbazen
+ambachtsgild
+ambachtsgilde
+ambachtsgilden
+ambachtsheer
+ambachtsheerlijkheden
+ambachtsheerlijkheid
+ambachtsheren
+ambachtslieden
+ambachtslui
+ambachtsman
+ambachtsonderwijs
+ambachtsscholen
+ambachtsschool
+ambachtsvrouw
+ambachtsvrouwen
+ambae
+ambage
+ambages
+ambagios
+ambagiosa
+ambagiosity
+ambagioso
+ambagiou
+ambagious
+ambagiously
+ambagiousness
+ambagito
+ambagitory
+ambai
+ambaimen
+ambaimenawi
+ambala
+ambalam
+ambali
+ambambo
+amban
+ambang
+ambaquis
+ambaquista
+ambar
+ambarar
+ambaree
+ambarell
+ambarella
+ambaren
+ambari
+ambarina
+ambarino
+ambartsu
+ambartsumian
+ambary
+ambas
+ambascia
+ambasciata
+ambasciate
+ambash
+ambasi
+ambasila
+ambassad
+ambassade
+ambassadebolig
+ambassaden
+ambassadene
+ambassader
+ambassaders
+ambassader}d
+ambassader}der
+ambassades
+ambassadesekret{ren
+ambassadeur
+ambassadeuren
+ambassadeurs
+ambassadoer
+ambassador
+ambassadordesignate
+ambassadorial
+ambassadorially
+ambassadornominee
+ambassadors
+ambassadorship
+ambassadorships
+ambassadress
+ambassadrice
+ambassadrices
+ambassad|r
+ambassad|rboligen
+ambassad|ren
+ambassad|rens
+ambassad|rer
+ambassag
+ambassage
+ambassy
+ambatch
+ambato
+ambatoar
+ambatoarinite
+ambawang
+ambay
+ambeer
+ambelau
+ambele
+ambeng
+ambengat
+ambeno
+ambenos
+ambenu
+amber
+amberbak
+amberbaken
+ambercol
+ambercolored
+ambercro
+ambercrombie
+amberfis
+amberfish
+amberg
+ambergeu
+ambergeur
+ambergeuren
+ambergre
+ambergrease
+ambergri
+ambergrijs
+ambergris
+amberi
+amberiac
+amberiack
+amberife
+amberiferous
+amberina
+amberino
+amberite
+amberjac
+amberjack
+amberly
+amberoid
+amberous
+ambers
+ambersha
+ambersham
+amberson
+ambersons
+amberton
+ambery
+ambete
+ambetet
+ambhu
+ambia
+ambiance
+ambiances
+ambiant
+ambiante
+ambiantes
+ambiants
+ambiciar
+ambicio`n
+ambicionar
+ambicionear
+ambiciosa
+ambiciosamente
+ambicioso
+ambicolo
+ambicolorate
+ambicoloration
+ambidext
+ambidexter
+ambidexterities
+ambidexterity
+ambidextra
+ambidextral
+ambidextre
+ambidextres
+ambidextro
+ambidextrous
+ambidextrously
+ambidextrousness
+ambidos
+ambieerd
+ambieerde
+ambieerden
+ambience
+ambiences
+ambiency
+ambiens
+ambient
+ambiental
+ambientar
+ambiente
+ambienti
+ambients
+ambier
+ambieren
+ambigeno
+ambigenous
+ambigu
+ambigua
+ambiguamente
+ambigue
+ambigue"
+ambigue"s
+ambigui
+ambigui"
+ambigui"te'
+ambigui"te's
+ambiguit
+ambiguita
+ambiguities
+ambiguity
+ambiguo
+ambiguou
+ambiguous
+ambiguously
+ambiguousness
+ambigus
+ambigu{
+ambigu{edad
+ambilate
+ambilateral
+ambilateralaterally
+ambilaterality
+ambilevo
+ambilevous
+ambilian
+ambilogy
+ambiloqu
+ambiloquy
+ambimous
+ambimoustrous
+ambiopia
+ambiparo
+ambiparous
+ambisexu
+ambisexualities
+ambisexuality
+ambisini
+ambisinister
+ambisinistrous
+ambisi|s
+ambisi|st
+ambisjon
+ambisjonen
+ambisjonene
+ambisjoner
+ambispor
+ambisporangiate
+ambisyll
+ambisyllabic
+ambit
+ambital
+ambitend
+ambitendency
+ambitie
+ambities
+ambitieu
+ambitieus
+ambitieuse
+ambitieusement
+ambitieuses
+ambitieust
+ambitieux
+ambitieuze
+ambitieuzer
+ambitioe
+ambitioes
+ambitioesa
+ambitioesen
+ambitioest
+ambition
+ambitioned
+ambitionist
+ambitionless
+ambitionlessly
+ambitionna
+ambitionnaient
+ambitionnais
+ambitionnait
+ambitionnant
+ambitionne
+ambitionne'
+ambitionne'e
+ambitionne'es
+ambitionne's
+ambitionne`rent
+ambitionnent
+ambitionner
+ambitionnera
+ambitionnerai
+ambitionneraient
+ambitionnerais
+ambitionnerait
+ambitionneras
+ambitionnerez
+ambitionneriez
+ambitionnerions
+ambitionnerons
+ambitionneront
+ambitionnes
+ambitionnez
+ambitionniez
+ambitionnions
+ambitionnons
+ambitions
+ambitios
+ambitiosa
+ambitiost
+ambitiou
+ambitious
+ambitiously
+ambitiousness
+ambiti|s
+ambiti|sa
+ambiti|st
+ambito
+ambitty
+ambitus
+ambivale
+ambivalence
+ambivalencia
+ambivalency
+ambivalens
+ambivalent
+ambivalente
+ambivalently
+ambivalenz
+ambivalenzen
+ambivert
+ambiverts
+ambize
+ambizion
+ambizione
+ambizioni
+ambizios
+ambiziosa
+ambiziose
+ambiziosi
+ambizioso
+amblador
+ambladora
+ambladura
+amblar
+amblau
+amble
+ambled
+amblehuelo
+ambleo
+ambler
+amblers
+ambles
+ambligonio
+ambling
+amblingl
+amblingly
+ambliopi`a
+amblong
+amblotic
+amblyaco
+amblyacousia
+amblyaph
+amblyaphia
+amblycep
+amblycephalidae
+amblycephalus
+amblychr
+amblychromatic
+amblydac
+amblydactyla
+amblygeu
+amblygeusia
+amblygon
+amblygonal
+amblygonite
+amblyoca
+amblyocarpous
+amblyomm
+amblyomma
+amblyope
+amblyopi
+amblyopia
+amblyopic
+amblyops
+amblyopsidae
+amblyopsis
+amblyosc
+amblyoscope
+amblypod
+amblypoda
+amblypodous
+amblyrhy
+amblyrhynchus
+amblyste
+amblystegite
+amblysto
+amblystoma
+ambo
+ambo`n
+ambocept
+amboceptoid
+amboceptor
+ambocoel
+ambocoelia
+ambod
+ambodhi
+amboim
+amboina
+amboines
+amboinese
+amboise
+ambolt
+ambolten
+ambomall
+ambomalleal
+ambon
+ambonese
+ambonite
+ambonnay
+ambopasc
+ambopasco
+ambora
+amborse
+ambos
+ambosexo
+ambosexous
+ambosexu
+ambosexual
+ambosse
+ambossen
+ambosses
+amboy
+ambra
+ambraen
+ambrain
+ambrasoft
+ambre
+ambre'
+ambre'e
+ambre'es
+ambre's
+ambrein
+ambrer
+ambrette
+ambrica
+ambricou
+ambricourt
+ambridge
+ambriosi
+ambriosine
+ambrite
+ambroid
+ambroise
+ambrolla
+ambrollador
+ambrolladora
+ambrollar
+ambrolog
+ambrology
+ambros
+ambrose
+ambrosi
+ambrosi`a
+ambrosia
+ambrosiac
+ambrosiaceae
+ambrosiaceous
+ambrosial
+ambrosially
+ambrosian
+ambrosiana
+ambrosiano
+ambrosias
+ambrosiate
+ambrosin
+ambrosine
+ambrosio
+ambrosiu
+ambrosius
+ambrosse
+ambroste
+ambrosterol
+ambrotyp
+ambrotype
+ambrozij
+ambrozijn
+ambrus
+ambruste
+ambruster
+ambry
+ambrym
+ambsace
+ambt
+ambtelij
+ambtelijk
+ambtelijke
+ambtelijker
+ambtelijkst
+ambteloo
+ambteloos
+ambteloz
+ambteloze
+ambten
+ambtenaa
+ambtenaar
+ambtenaars
+ambtenaarsleven
+ambtenaarsloopbaan
+ambtenaarsloopbanen
+ambtenaarstraktement
+ambtenaarstraktementen
+ambtenaarswereld
+ambtenar
+ambtenaren
+ambtenarengerecht
+ambtenarenwet
+ambtenarenwetten
+ambtenares
+ambtenaressen
+ambtenarij
+ambtgeno
+ambtgenoot
+ambtgenote
+ambtgenoten
+ambtlied
+ambtlieden
+ambtman
+ambtmann
+ambtmannen
+ambtsaan
+ambtsaanvaarding
+ambtsbed
+ambtsbediening
+ambtsbedieningen
+ambtsbez
+ambtsbezigheden
+ambtsbezigheid
+ambtsbro
+ambtsbroeder
+ambtsbroeders
+ambtsede
+ambtseden
+ambtseed
+ambtsgeh
+ambtsgeheim
+ambtsgeheimen
+ambtsgew
+ambtsgewaad
+ambtsgewaden
+ambtshal
+ambtshalve
+ambtsket
+ambtsketen
+ambtsketens
+ambtskle
+ambtskledij
+ambtsmis
+ambtsmisbruik
+ambtsmisbruiken
+ambtspen
+ambtspenning
+ambtspenningen
+ambtspli
+ambtsplicht
+ambtsplichten
+ambtsver
+ambtsverrichting
+ambtsverrichtingen
+ambtsvervulling
+ambtsvoo
+ambtsvoorganger
+ambtsvoorgangers
+ambtswon
+ambtswoning
+ambtswoningen
+ambual
+ambuella
+ambuesta
+ambul
+ambulacio`n
+ambulacr
+ambulacral
+ambulacriform
+ambulacrum
+ambulanc
+ambulance
+ambulancedienst
+ambulancediensten
+ambulancen
+ambulancer
+ambulances
+ambulancetrein
+ambulancetreinen
+ambulancewagen
+ambulancewagens
+ambulancia
+ambulancier
+ambulanciers
+ambulans
+ambulanse
+ambulanseb}t
+ambulansefly
+ambulansen
+ambulanser
+ambulansereise
+ambulansetransport
+ambulant
+ambulante
+ambulantem
+ambulanter
+ambulantes
+ambulants
+ambulanz
+ambulanza
+ambulanze
+ambulanzen
+ambular
+ambulas
+ambulate
+ambulated
+ambulates
+ambulati
+ambulating
+ambulatio
+ambulation
+ambulativa
+ambulative
+ambulativo
+ambulato
+ambulator
+ambulatori
+ambulatoria
+ambulatorial
+ambulatories
+ambulatorium
+ambulators
+ambulatory
+ambulere
+ambulerende
+ambulerer
+ambulert
+ambuling
+ambuloma
+ambulomancy
+ambumi
+ambunti
+ambur
+amburbia
+amburbial
+amburgey
+ambury
+ambuscad
+ambuscade
+ambuscaded
+ambuscader
+ambuscades
+ambuscading
+ambush
+ambushed
+ambusher
+ambushers
+ambushes
+ambushin
+ambushing
+ambushme
+ambushment
+ambushments
+ambustio
+ambustion
+ambwela
+amby
+ambystom
+ambystoma
+ambystomidae
+amc
+amc-4
+amc-hq
+amceur
+amceur-1
+amceur-1-emh
+amchoor
+amchy
+amclpc
+amd
+amda
+amdahl
+amdo
+ame
+ame'lior
+ame'liora
+ame'liorable
+ame'liorables
+ame'lioraient
+ame'liorais
+ame'liorait
+ame'liorant
+ame'lioration
+ame'liorations
+ame'liore
+ame'liore'
+ame'liore'e
+ame'liore'es
+ame'liore's
+ame'liore`rent
+ame'liorent
+ame'liorer
+ame'liorera
+ame'liorerai
+ame'lioreraient
+ame'liorerais
+ame'liorerait
+ame'lioreras
+ame'liorerez
+ame'lioreriez
+ame'liorerions
+ame'liorerons
+ame'lioreront
+ame'liores
+ame'liorez
+ame'lioriez
+ame'liorions
+ame'liorons
+ame'nage
+ame'nage'
+ame'nage'e
+ame'nage'es
+ame'nage's
+ame'nage`rent
+ame'nagea
+ame'nageable
+ame'nageables
+ame'nageaient
+ame'nageais
+ame'nageait
+ame'nageant
+ame'nagement
+ame'nagements
+ame'nagent
+ame'nageons
+ame'nager
+ame'nagera
+ame'nagerai
+ame'nageraient
+ame'nagerais
+ame'nagerait
+ame'nageras
+ame'nagerez
+ame'nageriez
+ame'nagerions
+ame'nagerons
+ame'nageront
+ame'nages
+ame'nagez
+ame'nagi
+ame'nagiez
+ame'nagions
+ame'nite
+ame'nite'
+ame'nite's
+ame'rica
+ame'ricain
+ame'ricaine
+ame'ricaines
+ame'ricains
+ame'ricanisation
+ame'ricanise'
+ame'ricanise'e
+ame'ricanise'es
+ame'ricanise's
+ame'ricaniser
+ame'ricanisme
+ame'ricanismes
+ame'thys
+ame'thyste
+ame'thystes
+ame`n
+ame`ne
+ame`nent
+ame`nera
+ame`nerai
+ame`neraient
+ame`nerais
+ame`nerait
+ame`neras
+ame`nere
+ame`nerez
+ame`neri
+ame`neriez
+ame`nerions
+ame`nero
+ame`nerons
+ame`neront
+ame`nes
+ame`re
+ame`reme
+ame`rement
+ame`res
+ame`rica
+ame`rico
+ameagari
+ameagle
+amearare
+ameba
+amebae
+ameban
+amebas
+amebean
+amebeo
+amebic
+amebifor
+amebiform
+ameboid
+amecer
+amechar
+ameche
+amechtig
+amechtige
+amechtigheid
+amedebou
+amedeboue
+amedee
+amedeo
+amedrantar
+amedrentador
+amedrentadora
+amedrentante
+amedrentar
+amedzofe
+ameed
+ameen
+ameena
+ameer
+ameerate
+ameers
+amefur
+amefuri
+amegachi
+amegati
+amegi
+ameiro
+ameise
+ameisen
+ameisenb
+ameisenbaer
+ameisenbaere
+ameisenh
+ameisenhaufen
+ameisens
+ameisensaeure
+ameisensaeuren
+ameisenstaat
+ameiurid
+ameiuridae
+ameiurus
+ameiva
+amejisut
+amekaze
+amelanch
+amelanchier
+amelar
+amelcochar
+amelcorn
+ameldonk
+amele
+amelga
+amelgada
+amelgado
+amelgador
+amelgar
+ameli`a
+amelia
+ameliaco
+ameliacourthouse
+amelie
+amelific
+amelification
+amelina
+ameline
+amelio
+ameliora
+ameliorable
+ameliorableness
+ameliorant
+ameliorate
+ameliorated
+ameliorates
+ameliorating
+amelioration
+ameliorations
+ameliorativ
+ameliorative
+ameliorator
+amelita
+amelkar
+amelkore
+amelkoren
+amellus
+amelo
+amelobla
+ameloblast
+ameloblastic
+amelocotonada
+amelocotonado
+amelonada
+amelonado
+amelu
+amelus
+amem
+amema
+amembrillada
+amembrillado
+amemiya
+amemoyou
+amen
+amena
+amenabil
+amenability
+amenable
+amenableness
+amenably
+amenaien
+amenaient
+amenais
+amenait
+amenamente
+amenant
+amenaza
+amenazador
+amenazadora
+amenazadoramente
+amenazante
+amenazar
+amencia
+amend
+amenda
+amendabl
+amendable
+amendableness
+amendaie
+amendaient
+amendais
+amendait
+amendant
+amendato
+amendatory
+amende
+amende'
+amende'e
+amende'es
+amende's
+amende`r
+amende`rent
+amended
+amendeer
+amendeerde
+amendeerden
+amendeert
+amendeme
+amendement
+amendementen
+amendements
+amendent
+amender
+amendera
+amenderai
+amenderaient
+amenderais
+amenderait
+amenderas
+amendere
+amenderen
+amenderez
+amenderi
+amenderiez
+amenderions
+amendero
+amenderons
+amenderont
+amenders
+amendes
+amendez
+amendiez
+amending
+amendion
+amendions
+amendmen
+amendment
+amendments
+amendons
+amends
+amene
+amene'
+amene'e
+amene'es
+amene's
+amene`re
+amene`rent
+amener
+amenez
+amenfi
+amengi
+amenguac
+amenguaca
+amenguadamente
+amenguadera
+amenguadero
+amenguamiento
+amenguante
+amenguar
+ameni
+amenia
+amenidad
+ameniez
+amenions
+amenism
+amenita
+amenite
+amenitei
+amenitie
+amenities
+amenity
+amenizar
+ameno
+amenons
+amenorar
+amenorgar
+amenorrea
+amenorrh
+amenorrhea
+amenorrheal
+amenorrheic
+amenorrhoea
+amenosa
+amenoso
+amens
+ament
+amenta
+amenta`cea
+amenta`ceo
+amentace
+amentaceous
+amental
+amentar
+amente
+amentia
+amentife
+amentiferae
+amentiferous
+amentifo
+amentiform
+amento
+aments
+amentulu
+amentulum
+amentum
+amenuisa
+amenuisaient
+amenuisais
+amenuisait
+amenuisant
+amenuise
+amenuise'
+amenuise'e
+amenuise'es
+amenuise's
+amenuise`rent
+amenuisement
+amenuisent
+amenuiser
+amenuisera
+amenuiserai
+amenuiseraient
+amenuiserais
+amenuiserait
+amenuiseras
+amenuiserez
+amenuiseriez
+amenuiserions
+amenuiserons
+amenuiseront
+amenuises
+amenuisez
+amenuisi
+amenuisiez
+amenuisions
+amenuiso
+amenuisons
+ameos
+amer
+amera
+amerada
+amerai
+ameranno
+amerar
+amerasen
+amerasena
+amerc
+amerce
+amerceab
+amerceable
+amercearse
+amerced
+amerceme
+amercement
+amercements
+amercendeador
+amercendeadora
+amercendeamiento
+amercendeante
+amercendearse
+amercer
+amerces
+amerciam
+amerciament
+amercing
+amerebbe
+amerebbero
+amerei
+ameremmo
+ameremo
+amerengada
+amerengado
+amereste
+ameresti
+amerete
+america
+americai
+americain
+americaine
+american
+americana
+americanese
+americanfalls
+americanfork
+americanism
+americanismo
+americanisms
+americanist
+americanista
+americanistic
+americanitis
+americanization
+americanize
+americanized
+americanizer
+americanizes
+americanizing
+americanly
+americano
+americanoid
+americans
+americanstyle
+americanum
+americanumancestors
+americas
+americaw
+americaward
+americawards
+americiu
+americium
+americiumet
+americol
+americoliberian
+americoliberians
+americom
+americomania
+americop
+americophobe
+americus
+amerigo
+amerij
+amerijtj
+amerijtje
+amerijtjes
+amerika
+amerikaa
+amerikaan
+amerikaans
+amerikaanse
+amerikaf
+amerikafarere
+amerikah
+amerikahaus
+amerikan
+amerikanen
+amerikaner
+amerikanere
+amerikaneren
+amerikaneres
+amerikanerin
+amerikanerinne
+amerikanerinnen
+amerikanern
+amerikanerne
+amerikanernes
+amerikanertums
+amerikanisch
+amerikanische
+amerikanischem
+amerikanischen
+amerikanischer
+amerikanisches
+amerikaniseret
+amerikanisieren
+amerikanisierten
+amerikanisme
+amerikanismen
+amerikansiches
+amerikansk
+amerikanske
+amerikanskeide
+amerikanskt
+amerikap
+amerikaposten
+amerikar
+amerikareise
+amerikareisen
+amerikas
+amerimno
+amerimnon
+amerind
+amerindi
+amerindian
+amerindians
+amerindic
+amerinds
+amerism
+ameristi
+ameristic
+amerizo
+amerizo-
+amermath
+amermaths
+amero
+amerrir
+amerriss
+amerrissage
+amerrissages
+amers
+amershan
+amerson
+amertume
+amery
+ames
+ames-aer
+ames-aero
+ames-atl
+ames-atlas
+ames-cer
+ames-ceres
+ames-ear
+ames-earth
+ames-eur
+ames-europa
+ames-fre
+ames-fred
+ames-gai
+ames-gaia
+ames-hju
+ames-hjulian
+ames-io
+ames-jup
+ames-jupiter
+ames-nas
+ames-nasb
+ames-pio
+ames-pioneer
+ames-plu
+ames-pluto
+ames-pra
+ames-prandtl
+ames-sat
+ames-saturn
+ames-tit
+ames-titan
+ames-tur
+ames-turing
+amesbury
+ameshdes
+ameshdesh
+amesite
+ameslan
+amesnador
+amesnar
+amestizada
+amestizado
+amesurar
+amesvill
+amesville
+amesvm
+ametabol
+ametabola
+ametabole
+ametabolia
+ametabolian
+ametabolic
+ametabolism
+ametabolous
+ametaboly
+ametalada
+ametalado
+ametalar
+ametallo
+ametallous
+amethist
+amethisten
+amethodi
+amethodical
+amethodically
+amethyst
+amethystine
+amethysts
+ametista
+ametisto
+ametoeci
+ametoecious
+ametrall
+ametralladora
+ametrallar
+ametria
+ametrome
+ametrometer
+ametrope
+ametropi
+ametropia
+ametropic
+ametrous
+ametyst
+ametyste
+ametysten
+ametyster
+ameublem
+ameublement
+ameublementen
+ameublements
+ameublir
+ameuhaqu
+ameuhaque
+ameuta
+ameutaie
+ameutaient
+ameutais
+ameutait
+ameutant
+ameute
+ameute'
+ameute'e
+ameute'es
+ameute's
+ameute`r
+ameute`rent
+ameutent
+ameuter
+ameutera
+ameuterai
+ameuteraient
+ameuterais
+ameuterait
+ameuteras
+ameutere
+ameuterez
+ameuteri
+ameuteriez
+ameuterions
+ameutero
+ameuterons
+ameuteront
+ameutes
+ameutez
+ameutiez
+ameution
+ameutions
+ameutons
+amex
+ameyoko
+amezquindarse
+amf
+amfetami
+amfetamin
+amfetaminen
+amfetaminsaken
+amfetamintabele
+amfi
+amfibie
+amfibiee
+amfibieen
+amfibief
+amfibiefly
+amfibier
+amfibiet
+amfibietank
+amfibietanks
+amfibiev
+amfibievliegtuig
+amfibievliegtuigen
+amfibium
+amfibrac
+amfibrachen
+amfibrachys
+amfibrak
+amfibrakk
+amfioen
+amfioenk
+amfioenkit
+amfioenkitten
+amfiteat
+amfiteater
+amfiteateret
+amfiteatre
+amfiteatret
+amfithea
+amfitheater
+amfitheaters
+amfitheatersgewijs
+amfitheatersgewijze
+amflung
+amfm
+amfoan
+amfoanfa
+amfoanfatuleuamabi
+amfohare
+amfora
+amfora's
+amforaat
+amforaatje
+amforaatjes
+amfuang
+amg
+amgad
+amganad
+amgarn
+amh
+amhar
+amhara
+amharic
+amharica
+amharicargobba
+amharicb
+amharicbased
+amherst
+amherstd
+amherstdale
+amhersti
+amherstia
+amherstite
+amherstj
+amherstjunction
+amhran
+ami
+ami\amiento
+ami`gdala
+ami`lico
+ami`n
+amia
+amiabili
+amiability
+amiable
+amiablen
+amiableness
+amiables
+amiablie
+amiably
+amiage
+amiagegu
+amiamo
+amiangba
+amiangbw
+amiangbwa
+amianta
+amiante
+amianth
+amianthi
+amianthiform
+amianthine
+amianthium
+amiantho
+amianthoid
+amianthoidal
+amianthu
+amianthus
+amianto
+amias
+amiate
+amiba
+amibari
+amibe
+amibes
+amibo
+amibou
+amic
+amica
+amicaal
+amicaals
+amicaalst
+amicabil
+amicabilities
+amicability
+amicable
+amicableness
+amicably
+amical
+amicale
+amicalem
+amicalement
+amicaler
+amicales
+amicaux
+amice
+amiced
+amices
+amichand
+amiche
+amici
+amici`sima
+amici`simo
+amicicia
+amicicid
+amicicide
+amicitia
+amicizia
+amicizie
+amick
+amico
+amicrobi
+amicrobic
+amicron
+amicronu
+amicronucleate
+amict
+amicten
+amicus
+amid
+amida
+amidakuj
+amidana
+amidase
+amidate
+amidatio
+amidation
+amide
+amides
+amidic
+amidid
+amidide
+amidin
+amidine
+amidism
+amidist
+amido
+amidoace
+amidoacetal
+amidoacetic
+amidoacetophenone
+amidoald
+amidoaldehyde
+amidoazo
+amidoazobenzene
+amidoazobenzol
+amidocaf
+amidocaffeine
+amidocap
+amidocapric
+amidoflu
+amidofluorid
+amidofluoride
+amidogen
+amidogua
+amidoguaiacol
+amidohex
+amidohexose
+amidoket
+amidoketone
+amidol
+amidomye
+amidomyelin
+amidon
+amidonna
+amidonnage
+amidonnant
+amidonne
+amidonne'
+amidonne'e
+amidonne'es
+amidonne's
+amidonner
+amidons
+amidophe
+amidophenol
+amidopho
+amidophosphoric
+amidopla
+amidoplast
+amidoplastid
+amidopyr
+amidopyrine
+amidos
+amidosuc
+amidosuccinamic
+amidosul
+amidosulphonal
+amidothi
+amidothiazole
+amidou
+amidoxim
+amidoxime
+amidoxy
+amidoxyl
+amidrazo
+amidrazone
+amids
+amidship
+amidships
+amidst
+amidstre
+amidstream
+amidulin
+amie
+amie`sgado
+amiel
+amiens
+amiento
+amies
+amiespic
+amiespicard
+amiga
+amigabilidad
+amigable
+amigablemente
+amigados
+amigajada
+amigajado
+amiganza
+amigar
+amigas
+amigasa
+amigdala`cea
+amigdala`ceo
+amigdalina
+amigdalitis
+amigesch
+amigeschichte
+amigo
+amigo's
+amigos
+amigote
+amigui`sima
+amigui`simo
+amihama
+amihaman
+amii
+amiidae
+amikake
+amiki
+amiko
+amikoana
+amil
+amila`cea
+amila`ceo
+amilamia
+amilanamiento
+amilanar
+amilcar
+amilcare
+amiles
+amillaramiento
+amillarar
+amillonada
+amillonado
+amiloun
+amime
+amimia
+amimide
+amimono
+amimoto
+amin
+amina
+amina		
+aminaana
+aminadab
+aminata
+aminate
+aminatio
+amination
+aminci
+amincie
+amincies
+amincir
+amincira
+amincirai
+aminciraient
+amincirais
+amincirait
+aminciras
+amincire
+amincirent
+amincirez
+aminciri
+aminciriez
+amincirions
+aminciro
+amincirons
+aminciront
+amincis
+aminciss
+amincissaient
+amincissais
+amincissait
+amincissant
+amincissante
+amincissantes
+amincissants
+amincisse
+amincissement
+amincissent
+amincisses
+amincissez
+amincissiez
+amincissions
+amincissons
+amincit
+amindivi
+amine
+amines
+amini
+aminic
+aminity
+aminizat
+aminization
+aminize
+amino
+aminoace
+aminoacetal
+aminoacetanilide
+aminoacetic
+aminoacetone
+aminoacetophenetidine
+aminoacetophenone
+aminoaci
+aminoacidemia
+aminoaciduria
+aminoant
+aminoanthraquinone
+aminoazo
+aminoazobenzene
+aminobar
+aminobarbituric
+aminoben
+aminobenzaldehyde
+aminobenzamide
+aminobenzene
+aminobenzoic
+aminocap
+aminocaproic
+aminodip
+aminodiphenyl
+aminoeth
+aminoethionic
+aminoff
+aminofir
+aminofor
+aminoformic
+aminogen
+aminoglu
+aminoglutaric
+aminogua
+aminoguanidine
+aminoid
+aminoket
+aminoketone
+aminolip
+aminolipin
+aminolys
+aminolysis
+aminolyt
+aminolytic
+aminomal
+aminomalonic
+aminomye
+aminomyelin
+aminopep
+aminopeptidase
+aminophe
+aminophenol
+aminopir
+aminopla
+aminoplast
+aminoplastic
+aminopro
+aminopropionic
+aminopur
+aminopurine
+aminopyr
+aminopyrine
+aminoqui
+aminoquinoline
+aminoracio`n
+aminorar
+aminosae
+aminosaeure
+aminosan
+aminosis
+aminosuc
+aminosuccinamic
+aminosul
+aminosulphonic
+aminotan
+aminothi
+aminothiophen
+aminoval
+aminovaleric
+aminoxyl
+aminoxylol
+aminta
+amintor
+aminuddi
+aminuddin
+aminzade
+aminzadeh
+amioidei
+amiol
+amiot
+amir
+amira
+amiral
+amiranha
+amirante
+amirate
+amirates
+amiraute
+amiraute'
+amiraute's
+amiraux
+amiray
+amire
+amiret
+amiri`
+amiris
+amirs
+amirship
+amis
+amisarin
+amisdict
+amisdictionary
+amish
+amishgo
+amishima
+amisima
+amisio`n
+amiss
+amissibi
+amissibility
+amissibl
+amissible
+amissnes
+amissness
+amissvil
+amissville
+amistad
+amistanza
+amistar
+amistosa
+amistosamente
+amistoso
+amit
+amita
+amitabh
+amitabha
+amitaits
+amitaitu
+amitava
+amite
+amiti
+amitie
+amitie'
+amitie's
+amities
+amitigar
+amito
+amito`tica
+amito`tico
+amitopuc
+amitoput
+amitosis
+amitotic
+amitotically
+amittai
+amity
+amityvil
+amityville
+amiuchi
+amiuti
+amiwatar
+amixia
+amiy
+amiyaki
+amizilis
+amizima
+amjad
+amk
+amkwe
+amla
+amlame
+amlani
+amletto
+amli
+amlikar
+amlin
+amlong
+amm
+amma
+ammaca
+ammacai
+ammacamm
+ammacammo
+ammacand
+ammacando
+ammacano
+ammacare
+ammacaro
+ammacarono
+ammacass
+ammacasse
+ammacassi
+ammacast
+ammacaste
+ammacasti
+ammacata
+ammacate
+ammacati
+ammacato
+ammacava
+ammacavamo
+ammacavano
+ammacavate
+ammacavi
+ammacavo
+ammacher
+ammachera
+ammacherai
+ammacherei
+ammachero
+ammachi
+ammachia
+ammachiamo
+ammachiate
+ammachin
+ammachino
+ammaco
+ammah
+ammala
+ammalai
+ammalamm
+ammalammo
+ammaland
+ammalando
+ammalano
+ammalare
+ammalaro
+ammalarono
+ammalass
+ammalasse
+ammalassi
+ammalast
+ammalaste
+ammalasti
+ammalata
+ammalate
+ammalati
+ammalato
+ammalava
+ammalavamo
+ammalavano
+ammalavate
+ammalavi
+ammalavo
+ammalera
+ammalerai
+ammalere
+ammalerei
+ammaleremo
+ammalerete
+ammalero
+ammali
+ammalia
+ammaliai
+ammaliam
+ammaliammo
+ammaliamo
+ammalian
+ammaliando
+ammaliano
+ammaliar
+ammaliare
+ammalias
+ammaliasse
+ammaliassi
+ammaliaste
+ammaliasti
+ammaliat
+ammaliata
+ammaliate
+ammaliati
+ammaliato
+ammaliav
+ammaliava
+ammaliavi
+ammaliavo
+ammalier
+ammaliera
+ammalierai
+ammalierei
+ammaliero
+ammalino
+ammalio
+ammalo
+ammamari
+ammamaria
+amman
+ammanett
+ammanetta
+ammanettai
+ammanetti
+ammanetto
+ammanite
+ammann
+ammar
+ammassa
+ammassai
+ammassam
+ammassammo
+ammassan
+ammassando
+ammassano
+ammassar
+ammassare
+ammassas
+ammassasse
+ammassassi
+ammassaste
+ammassasti
+ammassat
+ammassata
+ammassate
+ammassati
+ammassato
+ammassav
+ammassava
+ammassavi
+ammassavo
+ammasser
+ammassera
+ammasserai
+ammasserei
+ammassero
+ammassi
+ammassia
+ammassiamo
+ammassiate
+ammassin
+ammassino
+ammasso
+ammazza
+ammazzai
+ammazzam
+ammazzammo
+ammazzan
+ammazzando
+ammazzano
+ammazzar
+ammazzare
+ammazzas
+ammazzasse
+ammazzassi
+ammazzaste
+ammazzasti
+ammazzat
+ammazzata
+ammazzate
+ammazzati
+ammazzato
+ammazzav
+ammazzava
+ammazzavi
+ammazzavo
+ammazzer
+ammazzera
+ammazzerai
+ammazzerei
+ammazzero
+ammazzi
+ammazzia
+ammazziamo
+ammazziate
+ammazzin
+ammazzino
+ammazzo
+amme
+ammelake
+ammelaken
+ammelakens
+ammelide
+ammelin
+ammeline
+ammelroo
+ammelrooy
+ammen
+ammenda
+ammende
+ammenmae
+ammenmaerchens
+ammer
+ammerman
+ammers
+ammerson
+ammessa
+ammesse
+ammessi
+ammesso
+ammet
+ammeter
+ammeters
+ammette
+ammetter
+ammettere
+ammettia
+ammettiamo
+ammetton
+ammettono
+ammi
+ammiacea
+ammiaceae
+ammiaceo
+ammiaceous
+ammiel
+ammihud
+amminada
+amminadab
+amminadi
+amminadib
+ammine
+amming
+amminist
+amministra
+amministri
+amministro
+ammino
+amminoch
+amminochloride
+amminoly
+amminolysis
+amminolytic
+ammiolit
+ammiolite
+ammira
+ammirai
+ammiral
+ammiramm
+ammirammo
+ammirand
+ammirando
+ammirano
+ammirare
+ammiraro
+ammirarono
+ammirass
+ammirasse
+ammirassi
+ammirast
+ammiraste
+ammirasti
+ammirata
+ammirate
+ammirati
+ammirato
+ammiratore
+ammiratori
+ammiratr
+ammiratrice
+ammirava
+ammiravamo
+ammiravano
+ammiravate
+ammiravi
+ammiravo
+ammirera
+ammirerai
+ammirere
+ammirerei
+ammireremo
+ammirerete
+ammirero
+ammiri
+ammiriam
+ammiriamo
+ammiriat
+ammiriate
+ammirino
+ammiro
+ammishad
+ammishaddai
+ammissib
+ammissibile
+ammissibili
+ammissio
+ammissione
+ammissioni
+ammizaba
+ammizabad
+ammo
+ammobium
+ammochae
+ammochaeta
+ammochry
+ammochryse
+ammocoet
+ammocoete
+ammocoetes
+ammocoetid
+ammocoetidae
+ammocoetiform
+ammocoetoid
+ammodyte
+ammodytes
+ammodyti
+ammodytidae
+ammodyto
+ammodytoid
+ammon
+ammonal
+ammonate
+ammonati
+ammonation
+ammonea
+ammonia
+ammoniac
+ammoniacal
+ammoniacs
+ammoniacum
+ammoniak
+ammoniakk
+ammoniakken
+ammoniakkgass
+ammoniakkholdig
+ammonian
+ammoniaq
+ammoniaque
+ammonias
+ammoniat
+ammoniate
+ammoniating
+ammoniation
+ammonic
+ammonica
+ammonical
+ammoniem
+ammoniemia
+ammonifi
+ammonification
+ammonifier
+ammonify
+ammonioj
+ammoniojarosite
+ammonion
+ammonionitrate
+ammonit
+ammonite
+ammonites
+ammonitess
+ammoniti
+ammonitic
+ammoniticone
+ammonitiferous
+ammonitish
+ammonito
+ammonitoid
+ammonitoidea
+ammonium
+ammoniums
+ammoniumsulfaat
+ammoniur
+ammoniuria
+ammoniza
+ammonization
+ammono
+ammonoba
+ammonobasic
+ammonoca
+ammonocarbonic
+ammonocarbonous
+ammonoid
+ammonoidea
+ammonoidean
+ammonoly
+ammonolysis
+ammonolytic
+ammonolyze
+ammonsho
+ammonshoorn
+ammonshoorns
+ammonshoren
+ammonshorens
+ammonta
+ammontai
+ammontam
+ammontammo
+ammontan
+ammontando
+ammontano
+ammontar
+ammontare
+ammontas
+ammontasse
+ammontassi
+ammontaste
+ammontasti
+ammontat
+ammontata
+ammontate
+ammontati
+ammontato
+ammontav
+ammontava
+ammontavi
+ammontavo
+ammonter
+ammontera
+ammonterai
+ammonterei
+ammontero
+ammonti
+ammontia
+ammontiamo
+ammontiate
+ammontin
+ammontino
+ammonto
+ammophil
+ammophila
+ammophilous
+ammoresi
+ammoresinol
+ammortiz
+ammortizza
+ammortizzi
+ammortizzo
+ammos
+ammother
+ammotherapy
+ammu
+ammucchi
+ammucchia
+ammucchiai
+ammucchino
+ammucchio
+ammunisj
+ammunisjon
+ammunisjonen
+ammunisjons
+ammunisjonsfabrikker
+ammunisjonslager
+ammuniti
+ammunitie
+ammunitiewagen
+ammunitiewagens
+ammunition
+ammus
+ammus-la
+ammus-laughlin-am1
+ammusnet
+ammusnet-fairchild
+ammusnet-fairchild1
+ammut
+ammutina
+ammutinai
+ammutinano
+ammutinare
+ammutinata
+ammutinate
+ammutinati
+ammutinato
+ammutinava
+ammutinavi
+ammutinavo
+ammutine
+ammutinera
+ammutinero
+ammutini
+ammutinino
+ammutino
+amn
+amna
+amne
+amne'sie
+amne'siq
+amne'sique
+amne'siques
+amnemoni
+amnemonic
+amnen
+amnena
+amneris
+amnesia
+amnesiac
+amnesiacs
+amnesias
+amnesic
+amnesics
+amnesie
+amnesti
+amnesti`a
+amnestia
+amnestic
+amnestie
+amnestied
+amnestieen
+amnestiegesetz
+amnestier
+amnestierung
+amnesties
+amnestiet
+amnestievorlage
+amnesty
+amnestyi
+amnestying
+amnet
+amniac
+amniape
+amniatic
+amnic
+amnigeni
+amnigenia
+amningsm
+amningsmerke
+amningsmerket
+amninia
+amninion
+amninions
+amnio`tica
+amnio`tico
+amnioall
+amnioallantoic
+amniocen
+amniocentesis
+amniocho
+amniochorial
+amniocle
+amnioclepsis
+amnioman
+amniomancy
+amnion
+amnionat
+amnionata
+amnionate
+amnionic
+amnions
+amniorrh
+amniorrhea
+amnios
+amniota
+amniote
+amniotes
+amniotic
+amniotit
+amniotitis
+amniotom
+amniotome
+amnish
+amnisti`a
+amnistia
+amnistiaient
+amnistiais
+amnistiait
+amnistiant
+amnistiar
+amnistie
+amnistie'
+amnistie'e
+amnistie'es
+amnistie's
+amnistie`rent
+amnistient
+amnistier
+amnistiera
+amnistierai
+amnistieraient
+amnistierais
+amnistierait
+amnistieras
+amnistierez
+amnistieriez
+amnistierions
+amnistierons
+amnistieront
+amnisties
+amnistiez
+amnistii
+amnistiiez
+amnistiions
+amnistio
+amnistions
+amnon
+amnuaypo
+amnuayporn
+amo
+amo`n
+amo`nica
+amo`nico
+amobarub
+amober
+amoblar
+amobyr
+amocher
+amochiguar
+amock
+amoco
+amodiati
+amodiation
+amodiations
+amodier
+amodita
+amodorrada
+amodorrado
+amodorramiento
+amodorrante
+amodorrarse
+amodorrecer
+amodorrida
+amodorrido
+amoeba
+amoebae
+amoebaea
+amoebaean
+amoebaeu
+amoebaeum
+amoebali
+amoebalike
+amoeban
+amoebas
+amoebe
+amoebean
+amoebeau
+amoebeaum
+amoebeei
+amoebeeic
+amoeben
+amoebian
+amoebias
+amoebiasis
+amoebic
+amoebici
+amoebicide
+amoebid
+amoebida
+amoebidae
+amoebifo
+amoebiform
+amoeboba
+amoebobacter
+amoebobacterieae
+amoebocy
+amoebocyte
+amoeboge
+amoebogeniae
+amoeboid
+amoeboidism
+amoebous
+amoebula
+amogotada
+amogotado
+amohecer
+amohinar
+amoi
+amoindri
+amoindrie
+amoindries
+amoindrir
+amoindrira
+amoindrirai
+amoindriraient
+amoindrirais
+amoindrirait
+amoindriras
+amoindrirent
+amoindrirez
+amoindririez
+amoindririons
+amoindrirons
+amoindriront
+amoindris
+amoindrissaient
+amoindrissais
+amoindrissait
+amoindrissant
+amoindrisse
+amoindrissement
+amoindrissent
+amoindrisses
+amoindrissez
+amoindrissiez
+amoindrissions
+amoindrissons
+amoindrit
+amoishe
+amojamamiento
+amojamar
+amojelar
+amojonador
+amojonamiento
+amojonar
+amok
+amoke
+amoklaeu
+amoklaeufer
+amoklaeufern
+amoklaeufers
+amokmake
+amokmaker
+amokmakers
+amoks
+amoku
+amol
+amoladera
+amolador
+amoladura
+amolar
+amoldable
+amoldador
+amoldadora
+amoldamiento
+amoldar
+amoldo
+amole
+amoles
+amolilla
+amollador
+amolladora
+amollante
+amollar
+amollecer
+amollentadura
+amollentar
+amollentativa
+amollentativo
+amolletada
+amolletado
+amolli
+amollie
+amollies
+amollir
+amollis
+amolliss
+amollissant
+amollissante
+amollissantes
+amollissants
+amollissement
+amolt
+amoltepe
+amoltepec
+amomal
+amomales
+amomis
+amomo
+amomum
+amon
+amonate
+amoncela
+amoncelaient
+amoncelais
+amoncelait
+amoncelant
+amoncele
+amoncele'
+amoncele'e
+amoncele'es
+amoncele's
+amoncele`rent
+amonceler
+amoncelez
+amonceli
+amonceliez
+amoncelions
+amoncell
+amoncelle
+amoncellement
+amoncellements
+amoncellent
+amoncellera
+amoncellerai
+amoncelleraient
+amoncellerais
+amoncellerait
+amoncelleras
+amoncellerez
+amoncelleriez
+amoncellerions
+amoncellerons
+amoncelleront
+amoncelles
+amoncelo
+amoncelons
+amondawa
+amondo
+amondongada
+amondongado
+amonedacio`n
+amonedada
+amonedado
+amonedar
+amonestacio`n
+amonestador
+amonestadora
+amonestamiento
+amonestante
+amonestar
+among
+amongst
+amonhem
+amoniaca
+amoniacal
+amoniaco
+amonio
+amonita
+amono
+amonra
+amonsul
+amont
+amontadgar
+amontar
+amontazgar
+amontill
+amontillado
+amontillados
+amontonadamente
+amontonador
+amontonadora
+amontonamiento
+amontonar
+amor
+amora
+amorado
+amoragar
+amoraic
+amoraim
+amoral
+amorale
+amorales
+amoralidad
+amoralis
+amoralischer
+amoralism
+amoralisme
+amoralismo
+amoralist
+amoralit
+amorality
+amoraliz
+amoralize
+amorally
+amoralsk
+amoratada
+amoratado
+amoratarse
+amoraux
+amorbar
+amorc/a
+amorc/ag
+amorc/age
+amorc/ai
+amorc/aient
+amorc/ais
+amorc/ait
+amorc/an
+amorc/ant
+amorc/on
+amorc/ons
+amorcar
+amorce
+amorce'
+amorce'e
+amorce'es
+amorce's
+amorce`r
+amorce`rent
+amorcent
+amorcer
+amorcera
+amorcerai
+amorceraient
+amorcerais
+amorcerait
+amorceras
+amorcere
+amorcerez
+amorceri
+amorceriez
+amorcerions
+amorcero
+amorcerons
+amorceront
+amorces
+amorcez
+amorciez
+amorcillo
+amorcion
+amorcions
+amordazador
+amordazadora
+amordazamiento
+amordazar
+amore
+amorecer
+amoreel
+amoreels
+amoreelst
+amoreggi
+amoreggia
+amoreggiai
+amoreggino
+amoreggio
+amorele
+amoreler
+amores
+amoret
+amorette
+amoretti
+amoretto
+amoreuxi
+amoreuxia
+amorevol
+amorevole
+amorevoli
+amorf
+amorfa
+amorfe
+amorfi
+amorfi`a
+amorfo
+amorgar
+amorgonar
+amori
+amori`o
+amoricones
+amorim
+amoriscada
+amoriscado
+amorism
+amorist
+amoristi
+amoristic
+amorists
+amorita
+amorite
+amorites
+amoritic
+amoritis
+amoritish
+amormada
+amormado
+amormi`o
+amoro
+amorosa
+amorosamente
+amorosit
+amorosity
+amoroso
+amorous
+amorousl
+amorously
+amorousn
+amorousness
+amorpha
+amorphe
+amorphen
+amorphes
+amorphia
+amorphic
+amorphin
+amorphinism
+amorphis
+amorphism
+amorphop
+amorphophallus
+amorphophyte
+amorphot
+amorphotae
+amorphou
+amorphous
+amorphously
+amorphousness
+amorphus
+amorphy
+amorrar
+amorrea
+amorreo
+amorrionada
+amorrionado
+amorronar
+amors
+amort
+amortajador
+amortajadora
+amortajamiento
+amortajar
+amortamiento
+amortar
+amortecer
+amortecimiento
+amorteri
+amortering
+amorteringar
+amorti
+amortie
+amorties
+amortiguacio`n
+amortiguador
+amortiguadora
+amortiguamiento
+amortiguar
+amortir
+amortira
+amortirai
+amortiraient
+amortirais
+amortirait
+amortiras
+amortire
+amortirent
+amortirez
+amortiri
+amortiriez
+amortirions
+amortiro
+amortirons
+amortiront
+amortis
+amortisa
+amortisasjon
+amortisasjonen
+amortisatie
+amortisatiefonds
+amortisatiefondsen
+amortisaties
+amortisation
+amortisationen
+amortise
+amortiseer
+amortiseerde
+amortiseerden
+amortiseert
+amortisere
+amortiseren
+amortiseres
+amortisering
+amortisert
+amortisi
+amortisierbar
+amortisierbare
+amortisierbaren
+amortisierbarer
+amortisierbares
+amortisieren
+amortisierend
+amortisierende
+amortisierenden
+amortisierender
+amortisierendes
+amortisiert
+amortisierte
+amortisiertem
+amortisierter
+amortisiertes
+amortisiertest
+amortiss
+amortissable
+amortissables
+amortissaient
+amortissais
+amortissait
+amortissant
+amortisse
+amortissement
+amortissements
+amortissent
+amortisses
+amortisseur
+amortisseurs
+amortissez
+amortissiez
+amortissions
+amortissons
+amortit
+amortiza
+amortizable
+amortizacio`n
+amortizar
+amortization
+amortize
+amortized
+amortizement
+amortizes
+amortizi
+amortizing
+amortova
+amorua
+amory
+amos
+amoscador
+amoscamiento
+amoscar
+amosi
+amoskeag
+amosov
+amosova
+amosquilada
+amosquilado
+amosquilarse
+amostachada
+amostachado
+amostazar
+amostramiento
+amostrar
+amota
+amotinada
+amotinado
+amotinador
+amotinadora
+amotinamiento
+amotinar
+amotion
+amott
+amotu
+amotus
+amotz
+amou
+amoukar
+amount
+amounted
+amounter
+amounters
+amountin
+amounting
+amounts
+amouoblo
+amour
+amour-pr
+amour-propre
+amourach
+amouracher
+amourett
+amourette
+amourettes
+amoureus
+amoureuse
+amoureuses
+amoureux
+amouroes
+amouroesen
+amourouy
+amours
+amouzgar
+amovabil
+amovability
+amovable
+amove
+amover
+amovible
+amovibles
+amovilidad
+amoy
+amoyan
+amoyese
+amoz
+amp
+ampah
+ampalaya
+ampale
+ampalea
+ampan
+ampana
+ampanang
+ampanate
+ampanatete
+ampangab
+ampangabeite
+ampara
+amparador
+amparadora
+amparai
+amparamiento
+amparanza
+amparar
+amparito
+amparo
+ampas
+ampasime
+ampasimenite
+ampat
+ampe`re
+ampe`res
+ampeeliw
+ampeeliwojokeso
+ampel
+ampele
+ampelen
+ampeli`dea
+ampeli`deo
+ampelida
+ampelidaceae
+ampelidaceous
+ampelidae
+ampelide
+ampelideous
+ampelis
+ampelita
+ampelite
+ampeliti
+ampelitic
+ampella
+ampeln
+ampelo`grafo
+ampelogr
+ampelogra`fico
+ampelogra`fo
+ampelografi`a
+ampelographist
+ampelography
+ampelops
+ampelopsidin
+ampelopsin
+ampelopsis
+ampelosi
+ampelosicyos
+ampeloth
+ampelotherapy
+amper
+amperage
+amperages
+ampere
+ampere-u
+ampere-uren
+ampere-uur
+ampereme
+amperemeter
+amperemeters
+amperen
+amperes
+amperese
+ampereseconde
+ampereseconden
+amperi`metro
+amperian
+amperio
+amperome
+amperometer
+ampersan
+ampersand
+ampersands
+ampert
+ampertje
+ampertjes
+ampery
+ampex
+ampeyi
+ampha
+amphanth
+amphanthium
+amphapar
+amphaparint
+amphecle
+ampheclexis
+ampherot
+ampherotokous
+ampherotoky
+amphetam
+amphetamine
+amphetamines
+amphi
+amphiart
+amphiarthrodial
+amphiarthrosis
+amphiast
+amphiaster
+amphibal
+amphibalus
+amphibia
+amphibial
+amphibian
+amphibians
+amphibic
+amphibichnite
+amphibie
+amphibien
+amphibienfahrzeuge
+amphibies
+amphibiety
+amphibio
+amphibiological
+amphibiology
+amphibion
+amphibiotic
+amphibiotica
+amphibious
+amphibiously
+amphibiousness
+amphibiu
+amphibium
+amphibla
+amphiblastic
+amphiblastula
+amphible
+amphiblestritis
+amphibol
+amphibola
+amphibole
+amphiboles
+amphibolia
+amphibolic
+amphiboliferous
+amphiboline
+amphibolite
+amphibolitic
+amphibological
+amphibologically
+amphibologism
+amphibology
+amphibolous
+amphiboly
+amphibra
+amphibrach
+amphibrachic
+amphibry
+amphibryous
+amphicar
+amphicarpa
+amphicarpaea
+amphicarpic
+amphicarpium
+amphicarpogenous
+amphicarpous
+amphicen
+amphicentric
+amphichr
+amphichroic
+amphichrom
+amphichromatic
+amphichrome
+amphicoe
+amphicoelian
+amphicoelous
+amphicon
+amphicondyla
+amphicondylous
+amphicra
+amphicrania
+amphicre
+amphicreatinine
+amphicri
+amphicribral
+amphicty
+amphictyon
+amphictyonian
+amphictyonic
+amphictyony
+amphicyo
+amphicyon
+amphicyonidae
+amphicyr
+amphicyrtic
+amphicyrtous
+amphicyt
+amphicytula
+amphid
+amphide
+amphides
+amphidesmous
+amphidet
+amphidetic
+amphidia
+amphidiarthrosis
+amphidip
+amphidiploid
+amphidiploidy
+amphidis
+amphidisc
+amphidiscophora
+amphidiscophoran
+amphiero
+amphierotic
+amphierotism
+amphigae
+amphigaea
+amphigam
+amphigamae
+amphigamous
+amphigas
+amphigastrium
+amphigastrula
+amphigea
+amphigean
+amphigen
+amphigene
+amphigenesis
+amphigenetic
+amphigenous
+amphigenously
+amphigon
+amphigonic
+amphigonium
+amphigonous
+amphigony
+amphigor
+amphigoric
+amphigory
+amphigou
+amphigouri
+amphikar
+amphikaryon
+amphilog
+amphilogism
+amphilogy
+amphimac
+amphimacer
+amphimic
+amphimictic
+amphimictical
+amphimictically
+amphimix
+amphimixis
+amphimor
+amphimorula
+amphines
+amphinesian
+amphineu
+amphineura
+amphineurous
+amphinuc
+amphinucleus
+amphion
+amphioni
+amphionic
+amphioxi
+amphioxidae
+amphioxides
+amphioxididae
+amphioxis
+amphioxu
+amphioxus
+amphipep
+amphipeptone
+amphiphl
+amphiphloic
+amphipla
+amphiplatyan
+amphiple
+amphipleura
+amphiplo
+amphiploid
+amphiploidy
+amphipne
+amphipneust
+amphipneusta
+amphipneustic
+amphipno
+amphipnous
+amphipod
+amphipoda
+amphipodal
+amphipodan
+amphipodiform
+amphipodous
+amphipol
+amphipolis
+amphipro
+amphiprostylar
+amphiprostyle
+amphiprotic
+amphipte
+amphiptere
+amphipyr
+amphipyrenin
+amphirhi
+amphirhina
+amphirhinal
+amphirhine
+amphis
+amphisar
+amphisarca
+amphisba
+amphisbaena
+amphisbaenian
+amphisbaenic
+amphisbaenidae
+amphisbaenoid
+amphisbaenous
+amphisci
+amphiscians
+amphiscii
+amphisil
+amphisile
+amphisilidae
+amphispe
+amphispermous
+amphispo
+amphisporangiate
+amphispore
+amphisto
+amphistoma
+amphistomatic
+amphistome
+amphistomoid
+amphistomous
+amphistomum
+amphisty
+amphistylar
+amphistylic
+amphistyly
+amphiten
+amphitene
+amphithe
+amphithe'a^tre
+amphithe'a^tres
+amphitheater
+amphitheatered
+amphitheaters
+amphitheatral
+amphitheatre
+amphitheatric
+amphitheatrical
+amphitheatrically
+amphithecial
+amphithecium
+amphithect
+amphithy
+amphithyron
+amphitok
+amphitokal
+amphitokous
+amphitoky
+amphitri
+amphitriaene
+amphitrichous
+amphitrite
+amphitro
+amphitropal
+amphitropous
+amphitru
+amphitruo
+amphitry
+amphitryon
+amphiuma
+amphiumi
+amphiumidae
+amphivas
+amphivasal
+amphivor
+amphivorous
+amphizoi
+amphizoidae
+amphlett
+amphodar
+amphodarch
+amphodel
+amphodelite
+amphodip
+amphodiplopia
+amphogen
+amphogenous
+ampholyt
+ampholyte
+amphopep
+amphopeptone
+amphophi
+amphophil
+amphophile
+amphophilic
+amphophilous
+amphora
+amphorae
+amphoral
+amphoras
+amphore
+amphoret
+amphorette
+amphoric
+amphoricity
+amphoril
+amphoriloquy
+amphorop
+amphorophony
+amphorou
+amphorous
+amphoter
+amphoteric
+amphoux
+amphrysi
+amphrysian
+ampi
+ampiamen
+ampiamente
+ampibabo
+ampicill
+ampicillin
+ampie
+ampiezza
+ampiezze
+ampika
+ampio
+ampithea
+ampitheater
+ampiyacu
+ampla
+amplamente
+amplas
+ample
+amplecta
+amplectant
+amplegiv
+amplegiving
+amplemen
+amplement
+amplenes
+ampleness
+ampler
+amples
+amplest
+ampleur
+amplexat
+amplexation
+amplexic
+amplexicaudate
+amplexicaul
+amplexicauline
+amplexif
+amplexifoliate
+amplexo
+amplexus
+ampli
+ampli-tu
+ampli-tuner
+ampli`sima
+ampli`simo
+amplia
+ampliable
+ampliacio`n
+ampliador
+ampliadora
+ampliai
+ampliamente
+ampliamm
+ampliammo
+ampliamo
+ampliand
+ampliando
+ampliano
+ampliar
+ampliare
+ampliaro
+ampliarono
+amplias
+ampliass
+ampliasse
+ampliassi
+ampliast
+ampliaste
+ampliasti
+ampliata
+ampliate
+ampliati
+ampliation
+ampliations
+ampliativa
+ampliative
+ampliativo
+ampliato
+ampliava
+ampliavamo
+ampliavano
+ampliavate
+ampliavi
+ampliavo
+amplicat
+amplicative
+amplidyn
+amplidyne
+amplier
+ampliera
+amplierai
+ampliere
+amplierei
+amplieremo
+amplierete
+ampliero
+amplifia
+amplifiable
+amplifiaient
+amplifiais
+amplifiait
+amplifiant
+amplific
+amplificacio`n
+amplificador
+amplificadora
+amplificante
+amplificar
+amplificateur
+amplificateurs
+amplificatie
+amplificaties
+amplification
+amplifications
+amplificativa
+amplificative
+amplificativo
+amplificator
+amplificatory
+amplificatrice
+amplificatrices
+amplifie
+amplifie'
+amplifie'e
+amplifie'es
+amplifie's
+amplifie`rent
+amplified
+amplifient
+amplifier
+amplifiera
+amplifierai
+amplifieraient
+amplifierais
+amplifierait
+amplifieras
+amplifierez
+amplifieriez
+amplifierions
+amplifierons
+amplifieront
+amplifiers
+amplifies
+amplifiez
+amplifii
+amplifiiez
+amplifiions
+amplifio
+amplifions
+amplify
+amplifyi
+amplifying
+amplino
+amplio
+amplis
+amplis-t
+amplis-tuners
+amplitud
+amplitude
+amplitudedependent
+amplitudemodulert
+amplituden
+amplitudenbereich
+amplitudenda"mpfung
+amplitudene
+amplitudenmodulation
+amplitudenmodulierte
+amplitudenmoduliertes
+amplitudenregelung
+amplitudenverteilung
+amplitudenwerte
+amplituder
+amplituderne
+amplitudes
+amplitudinous
+amplitudo
+amplitudo's
+amplo
+amply
+ampo
+ampo`n
+ampolla
+ampollar
+ampolleta
+ampollos
+ampollosa
+ampollose
+ampollosi
+ampollosity
+ampolloso
+ampolluela
+ampona
+ampongue
+ampoule
+ampoule'
+ampoule'e
+ampoule'es
+ampoule's
+ampoules
+amprar
+ampre
+amps
+ampul
+ampule
+ampules
+ampulla
+ampullac
+ampullaceous
+ampullar
+ampullaria
+ampullariidae
+ampullary
+ampullat
+ampullate
+ampullated
+ampulle
+ampullen
+ampullif
+ampulliform
+ampullit
+ampullitis
+ampullul
+ampullula
+ampulosa
+ampulosamente
+ampulosidad
+ampuloso
+ampuls
+ampurdane`s
+ampurdane`sa
+ampurdanesa
+amputa
+amputacio`n
+amputai
+amputaie
+amputaient
+amputais
+amputait
+amputamm
+amputammo
+amputand
+amputando
+amputano
+amputant
+amputar
+amputare
+amputaro
+amputarono
+amputasj
+amputasjon
+amputasjonen
+amputass
+amputasse
+amputassi
+amputast
+amputaste
+amputasti
+amputata
+amputate
+amputated
+amputates
+amputati
+amputatie
+amputaties
+amputating
+amputation
+amputational
+amputationen
+amputations
+amputative
+amputato
+amputator
+amputava
+amputavamo
+amputavano
+amputavate
+amputavi
+amputavo
+ampute
+ampute'
+ampute'e
+ampute'es
+ampute's
+ampute`r
+ampute`rent
+amputee
+amputeer
+amputeerde
+amputeerden
+amputeert
+amputees
+amputent
+amputer
+amputera
+amputerai
+amputeraient
+amputerais
+amputerait
+amputeras
+amputere
+amputerei
+amputeremo
+amputeren
+amputeret
+amputerete
+amputerez
+amputeri
+amputeriez
+amputerions
+amputero
+amputerons
+amputeront
+amputert
+amputes
+amputez
+amputi
+amputiam
+amputiamo
+amputiat
+amputiate
+amputier
+amputiere
+amputieren
+amputierend
+amputierendem
+amputierenden
+amputierender
+amputierst
+amputiert
+amputierte
+amputierten
+amputierter
+amputiertes
+amputiez
+amputino
+ampution
+amputions
+amputo
+amputons
+ampuyacu
+ampyx
+amq
+amr
+amra
+amrah
+amram
+amramite
+amramites
+amrams
+amrani
+amraphel
+amrath
+amravati
+amreeta
+amreetas
+amrf
+amri
+amrigon
+amrik
+amril
+amrish
+amrita
+amritas
+amritsar
+amroth
+amrum
+ams
+amsa
+amsaa
+amsaa-al
+amsaa-ally
+amsaa-se
+amsaa-seer
+amsaa-vm
+amsaa-vms
+amsaa-wa
+amsaa-wasp
+amsaa-zo
+amsaa-zoo1
+amsath
+amsden
+amsel
+amseln
+amsira
+amsler
+amsnet
+amsonia
+amsterda
+amsterdam
+amsterdamer
+amston
+amstr
+amstutz
+amt
+amtal
+amte
+amter
+amtes
+amtet
+amthor
+amtiere
+amtieren
+amtierende
+amtierendem
+amtierender
+amtierst
+amtiert
+amtierte
+amtiertest
+amtiertet
+amtikoer
+amtikoerper
+amtl
+amtlich
+amtliche
+amtlichem
+amtlichen
+amtlicher
+amtliches
+amtman
+amtmanden
+amtmann
+amto
+amtomusa
+amtomusan
+amtrac
+amtrack
+amtracks
+amtracs
+amtrak
+amtsaerz
+amtsaerzte
+amtsaerztlich
+amtsanma
+amtsanmassung
+amtsantr
+amtsantritt
+amtsantritte
+amtsantrittes
+amtsantritts
+amtsarzt
+amtsbefu
+amtsbefugnis
+amtsbefugnisse
+amtsbefugnissen
+amtsbere
+amtsbereich
+amtsbereiche
+amtsbereichen
+amtsbeze
+amtsbezeichnung
+amtsbezi
+amtsbezirk
+amtsbezirke
+amtsbezirkes
+amtsblae
+amtsblaetter
+amtsblaettern
+amtsblat
+amtsblatt
+amtsblattes
+amtsbrud
+amtsbruders
+amtsbrue
+amtsbrueder
+amtsbruedern
+amtschef
+amtschin
+amtschinesisch
+amtsdien
+amtsdiener
+amtsdienern
+amtsdieners
+amtseide
+amtseiden
+amtseides
+amtseinf
+amtseinfuehrung
+amtsenth
+amtsenthebungen
+amtsenthebungsverfahren
+amtsenthobene
+amtsfueh
+amtsfuehrung
+amtsgeba
+amtsgebaeude
+amtsgehe
+amtsgeheimnis
+amtsgeheimnisse
+amtsgeheimnisses
+amtsgeri
+amtsgericht
+amtsgerichte
+amtsgerichtes
+amtsgerichts
+amtsgerichtsgefaengnis
+amtsgesc
+amtsgeschaefte
+amtsgeschaeften
+amtsgewa
+amtsgewalt
+amtshand
+amtshandlungen
+amtshilf
+amtshilfe
+amtsinha
+amtsinhaber
+amtskoll
+amtskollegen
+amtsleit
+amtsleiter
+amtsmiss
+amtsmissbrauch
+amtsmona
+amtsmonate
+amtsmueh
+amtsmuehlen
+amtsnach
+amtsnachfolger
+amtsnied
+amtsniederlegungen
+amtsober
+amtsobersekretaer
+amtsperi
+amtsperiode
+amtspers
+amtsperson
+amtspersonen
+amtspfli
+amtspflichten
+amtsraum
+amtsraumes
+amtsrich
+amtsrichter
+amtsrichtern
+amtssitz
+amtssitzes
+amtsspra
+amtssprache
+amtsstel
+amtsstelle
+amtsstellung
+amtsstub
+amtsstuben
+amtsstun
+amtsstunden
+amtsterm
+amtstermin
+amtstrac
+amtstracht
+amtstrachten
+amtstrae
+amtstraeger
+amtstraegern
+amtsuebe
+amtsuebernahme
+amtsueberschreitung
+amtsueberschreitungen
+amtsunte
+amtsunterschlagung
+amtsverb
+amtsverbrechen
+amtsverl
+amtsverletzung
+amtsverletzungen
+amtsverw
+amtsverwaltung
+amtsvorg
+amtsvorgaenger
+amtsvorgaengern
+amtsvorm
+amtsvormund
+amtsvormundes
+amtsvors
+amtsvorstand
+amtsvorstehern
+amtsvorstehers
+amtswech
+amtswechsel
+amtswohn
+amtswohnsitz
+amtswohnung
+amtszeic
+amtszeichen
+amtszeit
+amtszeiten
+amtszimm
+amtszimmer
+amtul
+amu
+amu\ecada
+amu\ecado
+amuay
+amubreka
+amubrekatsi
+amuchachada
+amuchachado
+amuchco
+amuchiguar
+amuck
+amucks
+amueblar
+amueixa
+amuelar
+amuesant
+amuesante
+amuesanten
+amuesanter
+amuesantes
+amuese
+amueseme
+amuesement
+amuesha
+amuesier
+amuesieren
+amuesierend
+amuesierende
+amuesierenden
+amuesierender
+amuesierendes
+amuesierst
+amuesiert
+amuesierte
+amuesierten
+amuesierter
+amuesiertes
+amuesiertet
+amuetamo
+amueya
+amufar
+amugamiento
+amugen
+amugronador
+amugronadora
+amugronar
+amuguis
+amui"r
+amuitahi
+amuitahiraa
+amuje
+amujerada
+amujerado
+amujeramiento
+amukobol
+amukobole
+amul
+amula
+amular
+amulatada
+amulatado
+amulet
+amuleti
+amuletic
+amuleto
+amulets
+amulett
+amulette
+amuletten
+amuletter
+amulettes
+amulio
+amulla
+amulya
+amun
+amunam
+amundsen
+amundsenia
+amunesuc
+amunesut
+amung
+amungme
+amunicionar
+amur
+amura
+amurada
+amurag
+amurallada
+amurallado
+amurallar
+amurar
+amurca
+amurcar
+amurco
+amurcosi
+amurcosity
+amurcous
+amurer
+amuri
+amurri\arse
+amurru
+amuru
+amus
+amusa
+amusable
+amusaien
+amusaient
+amusais
+amusait
+amusant
+amusante
+amusanter
+amusantes
+amusants
+amusantst
+amusca
+amusco
+amuse
+amuse'
+amuse'e
+amuse'es
+amuse's
+amuse-gu
+amuse-gueule
+amuse-gueules
+amuse`re
+amuse`rent
+amused
+amusedly
+amusee
+amuseer
+amuseerd
+amuseerde
+amuseerden
+amuseert
+amusemen
+amusement
+amusementen
+amusements
+amusementsbedrijf
+amusementsbedrijven
+amusementsfilm
+amusementsfilms
+amusent
+amuser
+amusera
+amuserai
+amuseraient
+amuserais
+amuserait
+amuseras
+amuseren
+amuserez
+amuserie
+amuseriez
+amuserio
+amuserions
+amuseron
+amuserons
+amuseront
+amusers
+amusert
+amuses
+amusette
+amusettes
+amuseur
+amuseurs
+amusez
+amusgar
+amusgo
+amusia
+amusiez
+amusing
+amusingl
+amusingly
+amusingn
+amusingness
+amusions
+amusisch
+amusive
+amusivel
+amusively
+amusiven
+amusiveness
+amuso
+amusons
+amustiar
+amusuter
+amutoura
+amutter
+amuy
+amuyon
+amuyong
+amuze
+amuzgo
+amuzgoan
+amuzgos
+amv
+amvax
+amvis
+amw
+amwi
+amy
+amy514
+amyan
+amyclaea
+amyclaean
+amyclas
+amye
+amyelenc
+amyelencephalia
+amyelencephalic
+amyelencephalous
+amyelia
+amyelic
+amyelini
+amyelinic
+amyeloni
+amyelonic
+amyelous
+amygdal
+amygdala
+amygdalaceae
+amygdalaceous
+amygdalase
+amygdalate
+amygdale
+amygdalectomy
+amygdales
+amygdali
+amygdalic
+amygdaliferous
+amygdaliform
+amygdalin
+amygdaline
+amygdalinic
+amygdalitis
+amygdalo
+amygdaloid
+amygdaloidal
+amygdalolith
+amygdaloncus
+amygdalopathy
+amygdalothripsis
+amygdalotome
+amygdalotomy
+amygdalu
+amygdalus
+amygdoni
+amygdonitrile
+amygdoph
+amygdophenin
+amygdule
+amyl
+amylaceo
+amylaceous
+amylamin
+amylamine
+amylan
+amylase
+amylases
+amylate
+amylemia
+amylene
+amylenol
+amylic
+amyliden
+amylidene
+amylifer
+amyliferous
+amylin
+amylo
+amylocel
+amylocellulose
+amylocla
+amyloclastic
+amylocoa
+amylocoagulase
+amylodex
+amylodextrin
+amylodys
+amylodyspepsia
+amylogen
+amylogenesis
+amylogenic
+amylohyd
+amylohydrolysis
+amylohydrolytic
+amyloid
+amyloida
+amyloidal
+amyloido
+amyloidosis
+amyloleu
+amyloleucite
+amylolys
+amylolysis
+amylolyt
+amylolytic
+amylom
+amylomet
+amylometer
+amylon
+amylopec
+amylopectin
+amylopha
+amylophagia
+amylopho
+amylophosphate
+amylophosphoric
+amylopla
+amyloplast
+amyloplastic
+amyloplastid
+amylopsi
+amylopsin
+amylose
+amylosis
+amylosyn
+amylosynthesis
+amyls
+amylum
+amyluria
+amynodon
+amynodont
+amyosthe
+amyosthenia
+amyosthenic
+amyotaxi
+amyotaxia
+amyotoni
+amyotonia
+amyotrop
+amyotrophia
+amyotrophic
+amyotrophy
+amyous
+amyraldi
+amyraldism
+amyraldist
+amyridac
+amyridaceae
+amyrin
+amyris
+amyrol
+amyroot
+amytal
+amyuzume
+amyxorrh
+amyxorrhea
+amyxorrhoea
+amza
+amzi
+amzie
+am|be
+am|ben
+an
+an-bin
+an-jen
+an-son
+ana
+ana`fora
+ana`glifo
+ana`lisis
+ana`loga
+ana`logamente
+ana`logo
+ana`rquica
+ana`rquicamente
+ana`rquico
+ana`strofe
+anaal
+anaang
+anab
+anaba
+anabaena
+anabal
+anabanti
+anabantidae
+anabapti
+anabaptism
+anabaptisme
+anabaptismo
+anabaptist
+anabaptista
+anabaptisten
+anabaptistic
+anabaptistical
+anabaptistically
+anabaptistry
+anabaptists
+anabaptize
+anabar
+anabas
+anabasin
+anabasine
+anabasis
+anabasse
+anabata
+anabathm
+anabathmos
+anabatic
+anabatista
+anabel
+anabella
+anabelle
+anaberog
+anaberoga
+anabeze
+anabi`
+anabibaz
+anabibazon
+anabiosi
+anabiosis
+anabioti
+anabiotic
+anablepi
+anablepidae
+anableps
+anabo
+anabo`lica
+anabo`lico
+anabohit
+anabohitsite
+anabolic
+anabolin
+anabolis
+anabolism
+anabolismo
+anabolit
+anabolite
+anaboliz
+anabolize
+anabong
+anabranc
+anabranch
+anabrosi
+anabrosis
+anabroti
+anabrotic
+anabuki
+anacahui
+anacahuita
+anacahuite
+anacala
+anacalo
+anacalyp
+anacalypsis
+anacamps
+anacampsis
+anacampt
+anacamptic
+anacamptically
+anacamptics
+anacamptometer
+anacanth
+anacanthine
+anacanthini
+anacanthous
+anacanto
+anacara
+anacarada
+anacarado
+anacard
+anacardi
+anacardia`cea
+anacardia`ceo
+anacardiaceae
+anacardiaceous
+anacardic
+anacardina
+anacardino
+anacardium
+anacardo
+anacatad
+anacatadidymus
+anacatha
+anacatharsis
+anacathartic
+anacepha
+anacephalaeosis
+anacephalize
+anaces
+anach
+anachari
+anacharis
+anachore
+anachoreet
+anachoreten
+anachori
+anachorism
+anachrom
+anachromasis
+anachron
+anachronic
+anachronical
+anachronically
+anachronique
+anachroniques
+anachronism
+anachronismatical
+anachronisme
+anachronismen
+anachronismes
+anachronisms
+anachronismus
+anachronist
+anachronistic
+anachronistical
+anachronistically
+anachronistisch
+anachronistische
+anachronistischer
+anachronistischt
+anachronize
+anachronous
+anachronously
+anachuet
+anachueta
+anacid
+anacidit
+anacidity
+anaclasi
+anaclasis
+anaclast
+anaclastic
+anaclastics
+anaclete
+anacleti
+anacleticum
+anacleto
+anaclina
+anaclinal
+anaclisi
+anaclisis
+anacliti
+anaclitic
+anaco
+anacoco
+anacoeno
+anacoenosis
+anacolut
+anacoluthia
+anacoluthic
+anacoluthically
+anacoluthon
+anacoluto
+anaconda
+anacondas
+anacora
+anacore`tica
+anacore`tico
+anacoreta
+anacorita
+anacorte
+anacortes
+anacosti
+anacostia
+anacreo`ntica
+anacreo`ntico
+anacreon
+anacreontic
+anacreontically
+anacrisi
+anacrisis
+anacro`nica
+anacro`nicamente
+anacro`nico
+anacrogy
+anacrogynae
+anacrogynous
+anacromy
+anacromyodian
+anacronismo
+anacroti
+anacrotic
+anacrotism
+anacrusi
+anacrusis
+anacrust
+anacrustic
+anacrustically
+anacultu
+anaculture
+anacusia
+anacusic
+anacusis
+anacyclu
+anacyclus
+anad
+anad-hos
+anad-host1
+anadarko
+anadear
+anadeja
+anadem
+anadems
+anadenia
+anader
+anadicro
+anadicrotic
+anadicrotism
+anadidym
+anadidymus
+anadina
+anadino
+anadiplo
+anadiplosis
+anadipsi
+anadipsia
+anadipsic
+anado
+anado`n
+anadore
+anadori
+anadrom
+anadromo
+anadromous
+anadyome
+anadyomene
+anadyr
+anaemato
+anaematosis
+anaemia
+anaemias
+anaemic
+anaemisc
+anaemisch
+anaemische
+anaend
+anaender
+anaenderunsantrages
+anaereti
+anaeretic
+anaeroba
+anaerobation
+anaerobe
+anaerobes
+anaerobi
+anaerobia
+anaerobian
+anaerobic
+anaerobically
+anaerobies
+anaerobio
+anaerobion
+anaerobiont
+anaerobiosis
+anaerobiotic
+anaerobiotically
+anaerobious
+anaerobism
+anaerobium
+anaeroph
+anaerophyte
+anaeropl
+anaeroplastic
+anaeroplasty
+anaesthe
+anaesthesia
+anaesthesiant
+anaesthetic
+anaesthetically
+anaesthetist
+anaesthetization
+anaesthetize
+anaesthetized
+anaesthetizer
+anaesthetizing
+anaetiol
+anaetiological
+anafaga
+anafalla
+anafaya
+anafe
+anafejan
+anafejanzi
+anafilaxia
+anafilaxis
+anafirak
+anafo`rica
+anafo`rico
+anafre
+anafrodisia
+anafrodisiaca
+anafrodisiaco
+anafrodita
+anagachi
+anagalac
+anagalactic
+anagalli
+anagallis
+anagap
+anagara
+anagati
+anagawa
+anagenes
+anagenesis
+anagenet
+anagenetic
+anagep
+anagigno
+anagignoskomena
+anagli`fica
+anagli`fico
+anaglyph
+anaglyphic
+anaglyphical
+anaglyphics
+anaglyphoscope
+anaglyphy
+anaglypt
+anaglyptic
+anaglyptical
+anaglyptics
+anaglyptograph
+anaglyptographic
+anaglyptography
+anaglypton
+anagno`risis
+anagnori
+anagnorisis
+anagnos
+anagnost
+anago
+anago`gica
+anago`gicamente
+anago`gico
+anagoge
+anagogi`a
+anagogic
+anagogical
+anagogically
+anagogics
+anagogy
+anagonza
+anagonzaga
+anagrafe
+anagrafi
+anagram
+anagrama
+anagrama`tica
+anagrama`tico
+anagramatista
+anagramista
+anagramm
+anagramma
+anagrammatic
+anagrammatical
+anagrammatically
+anagrammatism
+anagrammatist
+anagrammatize
+anagramme
+anagrammed
+anagrammen
+anagrammene
+anagrammer
+anagrammes
+anagrammi
+anagrams
+anagraph
+anagua
+anagura
+anaguta
+anagyrin
+anagyrine
+anagyris
+anah
+anaharat
+anaharath
+anahau
+anaheim
+anahita
+anahola
+anahuac
+anai
+anaiah
+anaiboa
+anaife
+anais
+anaitis
+anaiyuuk
+anaizu
+anak
+anaka
+anakalan
+anakalangu
+anakes
+anakhwe
+anakims
+anakin
+anakines
+anakinesis
+anakinet
+anakinetic
+anakinetomer
+anakinetomeric
+anakola
+anakoloe
+anakoloet
+anakoloeten
+anakolut
+anakoluthia
+anakroni
+anakronisme
+anakronismen
+anakronismer
+anakronistisch
+anakronistische
+anakronistischer
+anakronistischt
+anakrous
+anakrousis
+anaktoro
+anaktoron
+anal
+analabos
+analagou
+analagous
+analav
+analcime
+analcimi
+analcimite
+analcite
+analciti
+analcitite
+anale
+anale`ptica
+anale`ptico
+analecta
+analectas
+analecte
+analecten
+analecti
+analectic
+analects
+analemma
+analemmas
+analemmatic
+analepsi
+analepsis
+analepsy
+analepti
+analeptic
+analeptical
+analeptisch
+analeptische
+analfabe
+analfabeet
+analfabet
+analfabeta
+analfabete
+analfabeten
+analfabetene
+analfabeter
+analfabeti
+analfabetisme
+analfabetismen
+analfabetismo
+analfabeto
+analfase
+analfasen
+analge's
+analge'sie
+analge'sique
+analge'siques
+analge`sica
+analge`sico
+analgen
+analgesi
+analgesia
+analgesic
+analgesics
+analgesidae
+analgesis
+analgesist
+analgeti
+analgetic
+analgia
+analgic
+analgize
+anali`stica
+anali`stico
+anali`tica
+anali`ticamente
+anali`tico
+analia
+analiese
+analise
+analisi
+analist
+analista
+analiste
+analisten
+anality
+analizable
+analizador
+analizadora
+analizar
+analizia
+analiziamo
+analizza
+analizzai
+analizzano
+analizzare
+analizzata
+analizzate
+analizzati
+analizzato
+analizzatore
+analizzava
+analizzavi
+analizzavo
+analizze
+analizzera
+analizzero
+analizzi
+analizziamo
+analizzino
+analizzo
+analkali
+analkalinity
+anallagm
+anallagmatic
+anallant
+anallantoic
+anallantoidea
+anallantoidean
+anallerg
+anallergic
+anallese
+anallise
+anally
+analo`gica
+analo`gicamente
+analo`gico
+analog
+analoga
+analogam
+analogamente
+analogau
+analogausga"nge
+analogausgabe
+analogausgang
+analogausganges
+analogausgangs
+analogbu
+analogbus
+analoge
+analogei
+analogeinga"nge
+analogeinga"ngen
+analogeingang
+analogem
+analogen
+analoger
+analoges
+analoghe
+analoghi
+analogi
+analogi`a
+analogia
+analogic
+analogical
+analogically
+analogicalness
+analogie
+analogieen
+analogieformatie
+analogieformaties
+analogien
+analogier
+analogies
+analogiewerking
+analogio
+analogion
+analogiq
+analogique
+analogiques
+analogis
+analogisch
+analogische
+analogiseer
+analogiseerde
+analogiseerden
+analogiseert
+analogiseren
+analogisk
+analogism
+analogist
+analogistic
+analogiz
+analogize
+analogized
+analogizes
+analogizing
+analogka
+analogkana"le
+analogkarten
+analogmu
+analogmultiplexer
+analogo
+analogon
+analogou
+analogous
+analogously
+analogousness
+analogs
+analogsc
+analogschalter
+analogsi
+analogsignal
+analogsignalen
+analogsp
+analogspannung
+analogspannungen
+analogspannungsspeicher
+analogt
+analogte
+analogteil
+analogteils
+analogto
+analogtor
+analogue
+analogues
+analogwa
+analogwandler
+analogwe
+analogwert
+analogwerte
+analogy
+analomin
+analomink
+analoog
+analoogs
+analopos
+analphab
+analphabe'tisme
+analphabe`te
+analphabe`tes
+analphabet
+analphabete
+analphabeten
+analphabetentum
+analphabetic
+analphabetical
+analphabetin
+analphabetinnen
+analphabetischen
+analphabetism
+analphabetismus
+analrete
+analretentive
+analys
+analysa
+analysab
+analysability
+analysable
+analysables
+analysai
+analysaient
+analysais
+analysait
+analysan
+analysand
+analysands
+analysant
+analysat
+analysation
+analysator
+analysatoren
+analysatorens
+analysatorer
+analysators
+analysatortabellen
+analyse
+analyse'
+analyse'e
+analyse'es
+analyse's
+analyse`
+analyse`rent
+analyseafsnit
+analyseafsnittet
+analysed
+analysee
+analyseer
+analyseerde
+analyseerden
+analyseert
+analysef
+analysefase
+analysefasen
+analyseg
+analysegera"te
+analyseh
+analysehilfsmittel
+analysekapitlet
+analysem
+analysemethode
+analysemetode
+analysemetoden
+analysemetoder
+analysemodel
+analysen
+analysene
+analysens
+analysent
+analyseperiode
+analyseperioden
+analyseperioder
+analysepunkter
+analysepunkterne
+analyser
+analysera
+analyserai
+analyseraient
+analyserais
+analyserait
+analyseras
+analysere
+analyserede
+analyseren
+analyserende
+analyserer
+analyseres
+analyseret
+analyserez
+analyseriez
+analyserions
+analyserons
+analyseront
+analysert
+analyses
+analyset
+analysetjeneste
+analyseu
+analyseur
+analyseurs
+analysez
+analysie
+analysierbares
+analysieren
+analysierend
+analysierende
+analysierenden
+analysierender
+analysierendes
+analysiert
+analysierte
+analysiertem
+analysierter
+analysiertes
+analysiertest
+analysiez
+analysin
+analysing
+analysio
+analysions
+analysis
+analysisof
+analyson
+analysons
+analyst
+analyste
+analysten
+analystes
+analysts
+analytic
+analytical
+analytically
+analyticities
+analyticity
+analytics
+analytik
+analytikern
+analytikers
+analytiq
+analytique
+analytiques
+analytis
+analytisch
+analytische
+analytischem
+analytischen
+analytischer
+analytisches
+analytisk
+analytiska
+analytiske
+analytiskt
+analyzab
+analyzability
+analyzable
+analyzat
+analyzation
+analyze
+analyzed
+analyzer
+analyzers
+analyzes
+analyzin
+analyzing
+anam
+anama
+anamagi
+anamary
+anambe
+anambra
+anamesit
+anamesite
+anametad
+anametadromous
+anamim
+anamirta
+anamirti
+anamirtin
+anamita
+anamite
+anamizu
+anamma
+anammele
+anammelech
+anammoni
+anammonid
+anammonide
+anamnese
+anamnesi
+anamnesis
+anamnest
+anamnestic
+anamnestically
+anamnia
+anamniat
+anamniata
+anamnion
+anamnionata
+anamnionic
+anamniot
+anamniota
+anamniote
+anamniotic
+anamoose
+anamorfosis
+anamorph
+anamorphic
+anamorphism
+anamorphoscope
+anamorphose
+anamorphosis
+anamorphote
+anamorphous
+anamosa
+anamu
+anamu`
+anamune
+anan
+anana
+anana`
+anana`s
+ananapla
+ananaplas
+ananaple
+ananaples
+ananas
+ananasdr
+ananasdrank
+ananasdranken
+ananasen
+ananasse
+ananassen
+anand
+ananda
+anandaro
+anandaroop
+anandrar
+anandrarious
+anandria
+anandrou
+anandrous
+ananepio
+ananepionic
+ananerai
+ananevsk
+ananevskii
+anang
+anangioi
+anangioid
+anangula
+anangular
+anani
+ananiah
+ananias
+ananieva
+ananism
+ananite
+ananjubi
+anankast
+anankastic
+ananke
+ananmala
+ananmalay
+ananshi
+anansi
+anant
+ananta
+ananth
+anantha
+ananther
+anantherate
+anantherous
+ananthou
+ananthous
+ananym
+ananyo
+anap
+anapaest
+anapaestic
+anapaestical
+anapaestically
+anapagan
+anapaganize
+anapaite
+anapanap
+anapanapa
+anape`stica
+anape`stico
+anapeira
+anapeiratic
+anapelo
+anapest
+anapeste
+anapesten
+anapesti
+anapestic
+anapesto
+anapests
+anaphala
+anaphalantiasis
+anaphali
+anaphalis
+anaphase
+anaphe
+anaphia
+anaphora
+anaphoral
+anaphori
+anaphoria
+anaphoric
+anaphorical
+anaphorically
+anaphrod
+anaphrodisia
+anaphrodisiac
+anaphroditic
+anaphroditous
+anaphyla
+anaphylactic
+anaphylactin
+anaphylactogen
+anaphylactogenic
+anaphylactoid
+anaphylatoxin
+anaphylaxis
+anaphyte
+anapia
+anaplasi
+anaplasia
+anaplasis
+anaplasm
+anaplasma
+anaplasmosis
+anaplast
+anaplastic
+anaplasty
+anaplero
+anaplerosis
+anaplerotic
+anapnea
+anapneic
+anapnoei
+anapnoeic
+anapnogr
+anapnograph
+anapnoic
+anapnome
+anapnometer
+anapodei
+anapodeictic
+anapophy
+anapophysial
+anapophysis
+anapsid
+anapsida
+anapsidan
+anaptery
+anapterygota
+anapterygote
+anapterygotism
+anapterygotous
+anaptomo
+anaptomorphidae
+anaptomorphus
+anaptoti
+anaptotic
+anaptych
+anaptychus
+anaptyct
+anaptyctic
+anaptyctical
+anaptyxi
+anaptyxis
+anaqua
+anaquel
+anaqueleri`a
+anar
+anara
+anaraiza
+anaranjada
+anaranjado
+anaranjear
+anarcest
+anarcestean
+anarcestes
+anarch
+anarchal
+anarchia
+anarchial
+anarchic
+anarchical
+anarchically
+anarchie
+anarchien
+anarchies
+anarchiq
+anarchique
+anarchiques
+anarchis
+anarchisch
+anarchism
+anarchisme
+anarchismus
+anarchist
+anarchiste
+anarchisten
+anarchistenkomplot
+anarchistenkomplotten
+anarchistes
+anarchistic
+anarchistin
+anarchistisch
+anarchistische
+anarchistischem
+anarchistischen
+anarchistischer
+anarchistischt
+anarchists
+anarchiz
+anarchize
+anarchoi
+anarchoindividualist
+anarchos
+anarchosocialist
+anarchosurrealist
+anarchosyndicalism
+anarchosyndicalist
+anarchosyndicism
+anarchov
+anarchoverbiage
+anarchs
+anarchy
+anarcoti
+anarcotin
+anareta
+anaretic
+anaretical
+anargyro
+anargyros
+anarion
+anarisut
+anarki
+anarkiet
+anarkism
+anarkisme
+anarkismen
+anarkist
+anarkisten
+anarkister
+anarkistisk
+anarkistiske
+anarogu
+anaroji
+anaroji-
+anarozi
+anarqui`a
+anarquismo
+anarquista
+anarquizante
+anarquizar
+anarthri
+anarthria
+anarthric
+anarthro
+anarthropod
+anarthropoda
+anarthropodous
+anarthrosis
+anarthrous
+anarthrously
+anarthrousness
+anartism
+anartismos
+anarvik
+anarya
+anaryan
+anas
+anasa
+anasai
+anasarca
+anasarco
+anasarcous
+anasazi
+anaschis
+anaschistic
+anasco
+anascote
+anaseism
+anaseismic
+anasitch
+anaskela
+anaskelades
+anaspadi
+anaspadias
+anaspali
+anaspalin
+anaspida
+anaspidacea
+anaspide
+anaspides
+anast
+anastaci
+anastacia
+anastals
+anastalsis
+anastalt
+anastaltic
+anastas
+anastasi
+anastasia
+anastasiadis
+anastasian
+anastasie
+anastasimon
+anastasimos
+anastasio
+anastasios
+anastasis
+anastasius
+anastass
+anastassia
+anastasy
+anastasya
+anastate
+anastati
+anastatic
+anastatica
+anastatisch
+anastatische
+anastatu
+anastatus
+anastigm
+anastigma`tica
+anastigma`tico
+anastigmat
+anastigmatic
+anastomizarse
+anastomo
+anastomosarse
+anastomose
+anastomoser
+anastomoses
+anastomosis
+anastomotic
+anastomu
+anastomus
+anastrop
+anastrophe
+anastrophia
+anastrophy
+anasuya
+anat
+anata
+anatada
+anatado
+anatagat
+anatase
+anatatac
+anatatat
+anatema
+anatematismo
+anatematizador
+anatematizadora
+anatematizar
+anatexis
+anath
+anathe'm
+anathe'matiser
+anathe`m
+anathe`me
+anathema
+anathema's
+anathemas
+anathemata
+anathematic
+anathematical
+anathematically
+anathematism
+anathematization
+anathematize
+anathematized
+anathematizer
+anathematizes
+anathematizing
+anatheme
+anathemi
+anathemize
+anatheru
+anatherum
+anathoth
+anatico
+anatidae
+anatifa
+anatifae
+anatifer
+anatiferous
+anatinac
+anatinacea
+anatinae
+anatine
+anatista
+anato`mica
+anato`micamente
+anato`mico
+anatocis
+anatocism
+anatol
+anatola
+anatole
+anatoli
+anatolia
+anatolian
+anatolic
+anatolie
+anatolien
+anatoliy
+anatoliya
+anatollo
+anatoly
+anatom
+anatomen
+anatomi
+anatomi`a
+anatomia
+anatomiano
+anatomic
+anatomical
+anatomically
+anatomicobiological
+anatomicochirurgical
+anatomicomedical
+anatomicopathologic
+anatomicopathological
+anatomicophysiologic
+anatomicophysiological
+anatomicosurgical
+anatomie
+anatomien
+anatomies
+anatomiq
+anatomique
+anatomiques
+anatomis
+anatomisch
+anatomische
+anatomischem
+anatomischen
+anatomisches
+anatomiseer
+anatomiseerde
+anatomiseerden
+anatomiseert
+anatomiser
+anatomiseren
+anatomisk
+anatomism
+anatomist
+anatomista
+anatomisten
+anatomists
+anatomiz
+anatomizar
+anatomization
+anatomize
+anatomized
+anatomizer
+anatomizes
+anatomizing
+anatomop
+anatomopathologic
+anatomopathological
+anatomy
+anatone
+anatoom
+anatopis
+anatopism
+anatou
+anatox
+anatoxin
+anatra
+anatre
+anatrept
+anatreptic
+anatri
+anatrips
+anatripsis
+anatripsology
+anatript
+anatriptic
+anatron
+anatropa
+anatropal
+anatropi
+anatropia
+anatropo
+anatropous
+anatto
+anattos
+anatum
+anaudia
+anauli
+anaum
+anauma
+anaume
+anaunico
+anaunsa
+anaunsa-
+anaunsu
+anaunta
+anaunter
+anaunters
+anavajada
+anavajado
+anavia
+anawalt
+anawla
+anax
+anaxagor
+anaxagorean
+anaxagorize
+anaxande
+anaxander
+anaxial
+anaximan
+anaximandrian
+anaxon
+anaxone
+anaxonia
+anay
+anaya
+anayama
+anaye
+anazotur
+anazoturia
+anb
+anba
+anbaende
+anbaendeln
+anbaendelnd
+anbaendelndem
+anbaendelnden
+anbaendelnder
+anbahalt
+anbahaltend
+anbahne
+anbahnen
+anbahnende
+anbahnendem
+anbahnenden
+anbahnendes
+anbahnt
+anbai
+anbar
+anbarans
+anbau
+anbauabs
+anbauabsichten
+anbauen
+anbauend
+anbauende
+anbauendem
+anbauenden
+anbauer
+anbaufla
+anbauflaechen
+anbaugeb
+anbaugebiete
+anbaugebieten
+anbaumet
+anbaumethoden
+anbaupla
+anbauplatte
+anbaus
+anbauten
+anbe
+anbefale
+anbefalelsesverdig
+anbefaler
+anbefales
+anbefalet
+anbefali
+anbefaling
+anbefalingen
+anbefalinger
+anbefalingsbrev
+anbefall
+anbefalla
+anbefalt
+anbefalte
+anbefohl
+anbefohlen
+anbehalt
+anbehalten
+anbehaltendem
+anbehaltenden
+anbehaltender
+anbehaltene
+anbehaltenem
+anbehaltenen
+anbehaltenes
+anbei
+anbeisse
+anbeissen
+anbeissend
+anbeissendem
+anbeissenden
+anbeissender
+anbeisst
+anbelang
+anbelangen
+anbelangende
+anbelangendem
+anbelangenden
+anbelangendes
+anbelangt
+anbelangte
+anbelangten
+anbelangter
+anbelangtes
+anbellen
+anbellend
+anbellende
+anbellendem
+anbellender
+anbellendes
+anbeten
+anbetend
+anbetende
+anbetendem
+anbetenden
+anbetendes
+anbeter
+anbeteri
+anbeterin
+anbeterinnen
+anbeters
+anbetrac
+anbetracht
+anbetrachts
+anbetref
+anbetreffen
+anbetreffend
+anbetreffendem
+anbetreffenden
+anbetreffender
+anbetrif
+anbetrifft
+anbetrof
+anbetroffen
+anbetroffene
+anbetroffenen
+anbetroffener
+anbetroffenes
+anbettel
+anbettelnd
+anbettelnde
+anbettelndem
+anbettelnder
+anbettelndes
+anbetung
+anbetungswuerdig
+anbetungswuerdigem
+anbetungswuerdigen
+anbetungswuerdiger
+anbi
+anbieder
+anbiedern
+anbiedernd
+anbiedernde
+anbiedernden
+anbiedernder
+anbiederndes
+anbiete
+anbieten
+anbietend
+anbietendem
+anbietenden
+anbietender
+anbieter
+anbietern
+anbieters
+anbietet
+anbin
+anbinden
+anbindend
+anbindendem
+anbindenden
+anbindender
+anbindun
+anbindung
+anblasen
+anblasend
+anblasende
+anblasenden
+anblasender
+anblasendes
+anblick
+anblicke
+anblicken
+anblickend
+anblickende
+anblickendem
+anblickender
+anblickendes
+anblicks
+anblickt
+anblinze
+anblinzelnd
+anblinzelnde
+anblinzelndem
+anblinzelnder
+anblinzelndes
+anblinzelte
+anbohren
+anbohrend
+anbohrende
+anbohrendem
+anbohrender
+anbohrendes
+anbordse
+anbordsetzen
+anborn
+anboten
+anbrach
+anbracht
+anbrachte
+anbragt
+anbrakt
+anbrakte
+anbraten
+anbratende
+anbratendem
+anbratenden
+anbratendes
+anbreche
+anbrechen
+anbrechend
+anbrechendem
+anbrechenden
+anbrechender
+anbrenne
+anbrennen
+anbrennend
+anbrennende
+anbrennenden
+anbrennender
+anbrennendes
+anbricht
+anbring
+anbringe
+anbringelse
+anbringen
+anbringend
+anbringende
+anbringenden
+anbringender
+anbringendes
+anbringer
+anbringes
+anbringt
+anbringu
+anbringung
+anbruch
+anbruchs
+anbruech
+anbrueche
+anbruell
+anbruellen
+anbruellend
+anbruellendem
+anbruellenden
+anbruellender
+anbu
+anbud
+anbudene
+anbudet
+anbudsar
+anbudsarbeider
+anbudsbe
+anbudsbefaring
+anbudsdi
+anbudsdiarium
+anbudsdo
+anbudsdokumenter
+anbudsfr
+anbudsfrist
+anbudsfristen
+anbudsin
+anbudsinnbydelse
+anbudsinnbydelsen
+anbudsoe
+anbudsoeppning
+anbudsop
+anbudsoppning
+anbuds|p
+anbuds|ppning
+anbun
+anbury
+anbyder
+anc
+anca
+ancada
+ancado
+ancalago
+ancalagon
+ancash
+ancd
+ance
+ance^tre
+ance^tres
+anceaux
+ancel
+ancell
+ancello
+ancerata
+ancestor
+ancestorial
+ancestorially
+ancestors
+ancestra
+ancestral
+ancestrale
+ancestrales
+ancestrally
+ancestraux
+ancestre
+ancestress
+ancestresses
+ancestri
+ancestrial
+ancestrian
+ancestries
+ancestry
+anch'
+ancha
+anchaku
+anchal
+anchamente
+anchana
+anchar
+ancharia
+anchat
+anche
+anches
+ancheta
+ancheza
+anchi
+anchia
+anchicorta
+anchicorto
+anchiete
+anchietea
+anchieti
+anchietin
+anchietine
+anchieut
+anchieutectic
+anchikku
+anchimon
+anchimonomineral
+anchisau
+anchisaurus
+anchises
+anchiste
+anchistea
+anchisto
+anchistopoda
+anchithe
+anchithere
+anchitherioid
+anchix
+ancho
+anchoa
+anchoar
+anchois
+anchoku
+anchokuk
+anchor
+anchorab
+anchorable
+anchorag
+anchorage
+anchorages
+anchorat
+anchorate
+anchored
+anchorer
+anchores
+anchoress
+anchoresses
+anchoret
+anchoretic
+anchoretical
+anchoretish
+anchoretism
+anchorho
+anchorhold
+anchorin
+anchoring
+anchorit
+anchorite
+anchorites
+anchoritess
+anchoritic
+anchoritical
+anchoritish
+anchoritism
+anchoriz
+anchorle
+anchorless
+anchorli
+anchorlike
+anchorma
+anchorman
+anchorpo
+anchorpoint
+anchors
+anchorvi
+anchorville
+anchorwi
+anchorwise
+anchova
+anchoveta
+anchovie
+anchovies
+anchovy
+anchther
+anchtherium
+anchuela
+anchuelo
+anchura
+anchurosa
+anchuroso
+anchusa
+anchusin
+anchusine
+anchuu
+anchuumo
+anchuusa
+anchylos
+anchylose
+anchylosis
+ancian
+anciana
+ancianamente
+anciani`a
+ancianidad
+ancianismo
+anciano
+ancien
+ancience
+anciency
+ancienne
+anciennement
+anciennes
+anciennete'
+ancienni
+ancienniteit
+anciennitet
+anciens
+ancient
+anciente
+ancienter
+ancientest
+ancienti
+ancientism
+ancientl
+anciently
+ancientn
+ancientness
+ancientr
+ancientry
+ancients
+ancienty
+ancile
+anciliar
+anciliarity
+ancilla
+ancillar
+ancillaries
+ancillarity
+ancillary
+ancipita
+ancipital
+ancipito
+ancipitous
+ancira
+ancistro
+ancistrocladaceae
+ancistrocladaceous
+ancistrocladus
+ancistroid
+ancla
+ancladero
+anclaje
+anclar
+anclear
+anclote
+anco
+anco`n
+ancolie
+ancolies
+ancon
+ancona
+anconad
+anconada
+anconagr
+anconagra
+anconal
+ancone
+anconeal
+anconeou
+anconeous
+anconeta
+anconetani
+anconeus
+anconina
+anconitana
+anconitano
+anconiti
+anconitis
+anconoid
+ancony
+ancora
+ancoraje
+ancoral
+ancorar
+ancorca
+ancore
+ancorel
+ancoreri`a
+ancorero
+ancorque
+ancova
+ancra
+ancrage
+ancrages
+ancraien
+ancraient
+ancrais
+ancrait
+ancram
+ancramda
+ancramdale
+ancrant
+ancre
+ancre'
+ancre'e
+ancre'es
+ancre's
+ancre`re
+ancre`rent
+ancrent
+ancrer
+ancrera
+ancrerai
+ancreraient
+ancrerais
+ancrerait
+ancreras
+ancrerez
+ancrerie
+ancreriez
+ancrerio
+ancrerions
+ancreron
+ancrerons
+ancreront
+ancres
+ancrez
+ancriez
+ancrimpb
+ancrimpbar
+ancrimpe
+ancrimpen
+ancrions
+ancrons
+anctil
+ancuda
+ancudo
+ancusa
+ancuvi\a
+ancux
+ancyloce
+ancyloceras
+ancylocl
+ancylocladus
+ancyloda
+ancylodactyla
+ancylopo
+ancylopod
+ancylopoda
+ancylost
+ancylostoma
+ancylostome
+ancylostomiasis
+ancylostomum
+ancylus
+ancyoko
+ancyoku
+ancyrean
+ancyrene
+and
+anda
+anda-
+anda`bata
+andabata
+andabatarian
+andaboba
+andachte
+andachten
+andachts
+andachtshalle
+andada
+andadera
+andaderas
+andadero
+andado
+andador
+andadora
+andadura
+andaecht
+andaechtig
+andaechtige
+andaechtigem
+andaechtiger
+andaechtiges
+andagari
+andagarinya
+andahalf
+andahuay
+andahuaylas
+andai
+andajes
+andaki
+andakt
+andakta
+andakter
+andaktse
+andaktsendinger
+andaktsf
+andaktsform
+andaktss
+andaktsstemning
+andalalg
+andalalgxdatl
+andale
+andali
+andalia
+andallo
+andalotera
+andalotero
+andalou
+andaluci
+andalucia
+andalucian
+andalucismo
+andalusi
+andalusia
+andalusian
+andalusien
+andalusischen
+andalusite
+andaluz
+andaluza
+andaluzada
+andamal
+andaman
+andamane
+andamanese
+andamiada
+andamiaje
+andamiento
+andamio
+andammo
+andan
+andana
+andanada
+andancia
+andancio
+andando
+andangti
+andani\o
+andante
+andante'
+andante's
+andantes
+andantesca
+andantesco
+andanti
+andantin
+andantino
+andantino's
+andantinos
+andanza
+andaqui
+andaquia
+andaquian
+andar
+andara
+andarain
+andaraje
+andarcen
+andarcene
+andarci
+andare
+andaree
+andargli
+andari`n
+andarica
+andariega
+andariego
+andarina
+andarivel
+andarko
+andarle
+andarlo
+andarmen
+andarmene
+andarmi
+andarono
+andarraya
+andarri`os
+andarsen
+andarsene
+andarten
+andartene
+andarum
+andarven
+andarvene
+andas
+andasa
+andason
+andasse
+andasser
+andassero
+andassi
+andaste
+andata
+andate
+andateci
+andatela
+andati
+andato
+andatura
+andature
+andauern
+andauernd
+andauernde
+andauernden
+andauernder
+andauerndes
+andauert
+andauerte
+andava
+andavamo
+andavano
+andavi
+andavo
+ande
+ande`n
+andean
+anded
+andedam
+andee
+andeee
+andegere
+andegerebenha
+andek
+andektig
+andel
+andelar
+andelen
+andeler
+andeline
+andelius
+andelman
+andelsbev{gelsen
+andelsla
+andelslag
+andelslaget
+andeme
+anden
+andendels
+andengradsligninger
+andenken
+andenkenlaeden
+andenkens
+andenkoordinat
+andenkoordinaten
+andenrangs
+ander
+anderdaa
+anderdaags
+anderdaagse
+anderdee
+anderdeels
+andere
+anderea
+anderem
+anderen
+anderend
+anderendaags
+anderenf
+anderenfalls
+andereno
+anderenorts
+anderer
+anderers
+andererseits
+anderes
+andergas
+andergast
+anderhal
+anderhalf
+anderhalve
+anderkar
+anderkaro
+anderkende
+anderkendt
+anderkendte
+anderkon
+anderkonten
+anderledes
+andermaa
+andermaal
+andermal
+anderman
+andern
+andernfa
+andernfalls
+andernor
+andernorts
+andernta
+anderntags
+andero
+anders
+andersar
+andersartig
+andersartige
+andersartigen
+andersartiger
+andersartiges
+andersde
+andersdenkend
+andersdenkende
+andersdenkendem
+andersdenkenden
+andersdenkendes
+andersei
+anderseits
+andersen
+andersen-am1
+andersen-am2
+andersen-mil-tac
+andersens
+andersge
+andersgeartet
+andersgeartetem
+andersgearteten
+andersgearteter
+andersgezind
+andersgezinde
+andersgl
+andersglaeubige
+andersglaeubigem
+andersglaeubigen
+andersglaeubiges
+andershe
+andersherum
+andersla
+anderslautender
+andersom
+anderson
+andersonisland
+andersons
+andersonville
+andersse
+anderssen
+andersso
+andersson
+andersto
+anderstorpsvaegen
+anderstorpsvagen
+anderstorpsv{gen
+anderswi
+anderswie
+anderswo
+anderswoher
+anderszi
+anderszins
+andertha
+anderthalb
+anderthalbe
+anderthalbem
+anderthalber
+anderthalbes
+anderthalbfach
+anderthalbfachem
+anderthalbfachen
+anderthalbfacher
+anderthalbjaehrig
+anderthalbjaehrige
+anderthalbjaehrigem
+anderthalbjaehriger
+anderthalbjaehriges
+anderthalbtausend
+anderton
+anderuse
+anderwei
+anderweitig
+anderweitige
+anderweitigem
+anderweitigen
+anderweitiger
+anderweitiges
+anderwer
+anderwerf
+anderzij
+anderzijds
+andes
+andesic
+andesina
+andesine
+andesini
+andesinite
+andesita
+andesite
+andesiti
+andesitic
+andesu
+andesyte
+andet
+andetsteds
+andeuten
+andeutende
+andeutendem
+andeutenden
+andeutendes
+andeutet
+andeutete
+andeutun
+andeutungen
+andeutungsweise
+andeva
+andevo
+andew
+andf|tte
+andf|ttes
+andh
+andha
+andhi
+andhra
+andi
+andiamo
+andiamoc
+andiamoci
+andian
+andiate
+andichte
+andichten
+andichtend
+andichtendem
+andichtenden
+andichtender
+andie
+andiente
+andienten
+andii
+andijvie
+andijviesla
+andiljan
+andiljangwa
+andilyau
+andilyaugwa
+andina
+andine
+anding
+andinismo
+andinista
+andino
+andinvar
+andinvariance
+andio
+andioo
+andira
+andirin
+andirine
+andiroba
+andiron
+andirons
+anditi
+andito
+andiy
+andiyono
+andkhoi
+andlet
+andletet
+andley
+andlife
+andlig
+andliga
+andligt
+andlos
+andmathe
+andmathematics
+ando
+ando`n
+andoa
+andoke
+andoku
+andokuri
+andola
+andolencia
+andolina
+andolini
+andom
+andon
+andona
+andone
+andoni
+andonia
+andonis
+andonni
+andonov
+andoorn
+andoorns
+andoptim
+andoptimality
+andoque
+andor
+andora
+andorai
+andoren
+andorens
+andorga
+andorina
+andorite
+andorobo
+andoroge
+andorome
+andorra
+andorran
+andorrana
+andorranen
+andorraner
+andorraneren
+andorranischen
+andorrano
+andorransk
+andorrera
+andorrero
+andosca
+andosco
+andou
+andoueri
+andouill
+andouille
+andouilles
+andouillet
+andouillette
+andouillettes
+andoukan
+andoumiw
+andoushi
+andousiz
+andoutam
+andouyuu
+andouzi
+andover
+andpersa
+andpersand
+andplane
+andpunkt
+andpunkter
+andpuste
+andpusten
+andpustn
+andpustne
+andr
+andr
+andra
+andra'
+andrada
+andrade
+andradit
+andradite
+andrado
+andraeng
+andraengen
+andragen
+andragende
+andragendet
+andrahus
+andrai
+andrajera
+andrajero
+andrajo
+andrajosa
+andrajosamente
+andrajoso
+andranat
+andranatomy
+andrang
+andrange
+andranges
+andranki
+andranking
+andranno
+andrarch
+andrarchy
+andras
+andrassy
+andre
+andre`s
+andrea
+andrea_d
+andrea_doria
+andreado
+andreadoria
+andreaea
+andreaeaceae
+andreaeales
+andreana
+andreani
+andreas
+andrease
+andreasen
+andreass
+andreassen
+andreassi
+andreato
+andreatos
+andrebbe
+andrebbero
+andrece
+andredie
+andredieudonne
+andree
+andreev
+andreevi
+andreevich
+andreevn
+andreevna
+andreguy
+andrehen
+andrehende
+andrehendem
+andrehenden
+andrehendes
+andreht
+andrehte
+andrehuela
+andrei
+andreia
+andreiev
+andreiis
+andreika
+andreina
+andrej
+andrejs
+andrel
+andrelat
+andrelated
+andremmo
+andremo
+andren
+andrena
+andrenid
+andrenidae
+andreny
+andreott
+andreotti
+andrer
+andrerse
+andrerseits
+andres
+andres_b
+andres_bello
+andresbe
+andresbello
+andresen
+andreson
+andress
+andreste
+andresti
+andrete
+andreu
+andreus
+andrew
+andrewar
+andrewartha
+andrewg
+andrews
+andrews-
+andrews-am1
+andrews-piv-1
+andrews-piv-2
+andrewsi
+andrewsite
+andrey
+andreyev
+andreyts
+andreytschenko
+andri
+andria
+andriama
+andriamanjato
+andriamo
+andriamorasata
+andrian
+andriana
+andriano
+andrias
+andric
+andrienn
+andrienne
+andries
+andriesk
+andrieskruis
+andrieskruisen
+andriett
+andriette
+andrik
+andriken
+andrina
+andring
+andringa
+andringarna
+andrings
+andringsbesluten
+andringsforslag
+andringskarusell
+andringsrutinen
+andrino
+andris
+andro
+andro`gina
+andro`gino
+andro`meda
+andro`mina
+androcen
+androcentric
+androceo
+androcep
+androcephalous
+androcephalum
+androcle
+androcles
+androcli
+androclinium
+androclu
+androclus
+androcon
+androconium
+androcra
+androcracy
+androcratic
+androcyt
+androcyte
+androdio
+androdioecious
+androdioecism
+androdyn
+androdynamous
+androeci
+androecial
+androecium
+androgam
+androgametangium
+androgametophore
+androgen
+androgenesis
+androgenetic
+androgenic
+androgenous
+androgens
+androgin
+androginous
+androgon
+androgone
+androgonia
+androgonial
+androgonidium
+androgonium
+androgra
+andrographis
+andrographolide
+androgyn
+androgynal
+androgynary
+androgyne
+androgyneity
+androgynia
+androgynies
+androgynism
+androgynous
+androgynus
+androgyny
+androhen
+androhende
+androhendem
+androhenden
+androhendes
+androht
+androhun
+androhung
+androhungen
+android
+androida
+androidal
+androide
+androiden
+androiderne
+androids
+androkin
+androkinin
+androl
+androlep
+androlepsia
+androlepsy
+andromac
+andromache
+androman
+andromania
+andromaq
+andromaque
+andromed
+andromeda
+andromeda-nebel
+andromedanebel
+andromede
+andromedotoxin
+andromon
+andromonoecious
+andromonoecism
+andromor
+andromorphous
+andron
+andronic
+andronicus
+andronit
+andronitis
+andropet
+andropetalar
+andropetalous
+andropha
+androphagous
+andropho
+androphobia
+androphonomania
+androphore
+androphorous
+androphorum
+androphy
+androphyll
+andropog
+andropogon
+andropol
+andropolis
+andror
+androren
+andros
+androsac
+androsace
+androsco
+androscoggin
+androsem
+androseme
+androsemo
+androsin
+androsky
+androsph
+androsphinx
+androspo
+androsporangium
+androspore
+androste
+androsterone
+androtau
+androtauric
+androtom
+androtomy
+androzzi
+andruckb
+andruckbu"gel
+andrucks
+andrukat
+andrus
+andrusia
+andrusiak
+andruzzi
+andrzej
+ands
+andsynes
+andtaepp
+andtaeppa
+andtappa
+andt{ppa
+anduin
+andujare\a
+andujare\o
+andulario
+andulencia
+andullo
+andunge
+andungen
+anduril
+andurrial
+andutrus
+andutrustning
+andutrustningen
+andy
+andycapp
+andyp
+and|vd
+and|vde
+and|ve
+and|ya
+ane
+ane'anti
+ane'antie
+ane'anties
+ane'antir
+ane'antira
+ane'antirai
+ane'antiraient
+ane'antirais
+ane'antirait
+ane'antiras
+ane'antirent
+ane'antirez
+ane'antiriez
+ane'antirions
+ane'antirons
+ane'antiront
+ane'antis
+ane'antissaient
+ane'antissais
+ane'antissait
+ane'antissant
+ane'antisse
+ane'antissement
+ane'antissent
+ane'antisses
+ane'antissez
+ane'antissiez
+ane'antissions
+ane'antissons
+ane'antit
+ane'mia
+ane'miai
+ane'miaient
+ane'miait
+ane'mian
+ane'miant
+ane'mie
+ane'mie'
+ane'mie'e
+ane'mie'es
+ane'mie's
+ane'mie`
+ane'mie`rent
+ane'mien
+ane'mient
+ane'mier
+ane'miera
+ane'mieraient
+ane'mierait
+ane'mieront
+ane'miqu
+ane'mique
+ane'miques
+ane'mone
+ane'mones
+ane'vris
+ane'vrisme
+ane'vrismes
+ane`cdota
+ane`lido
+ane`mica
+ane`mico
+ane`mona
+anea
+aneaje
+anear
+anearing
+aneas
+aneath
+anebetsu
+anebetu
+aneblar
+anecdo`tica
+anecdo`tico
+anecdota
+anecdotage
+anecdotal
+anecdotalism
+anecdotario
+anecdote
+anecdotes
+anecdoti
+anecdotic
+anecdotical
+anecdotically
+anecdotique
+anecdotiques
+anecdotist
+anecdotista
+anecdotists
+anecdysi
+anecdysis
+anechoic
+aneciarse
+aneckt
+anedes
+aneeta
+anegable
+anegacio`n
+anegada
+anegadiza
+anegadizo
+anegamiento
+anegar
+anegasak
+anego
+anegociada
+anegociado
+anegorom
+aneho
+anei
+aneignen
+aneignende
+aneignendem
+aneignenden
+aneignendes
+aneignet
+aneignete
+aneignun
+aneignungen
+aneinand
+aneinander
+aneinandergelagerten
+aneinandergereiht
+aneinandergereihten
+aneinanderklirren
+aneinanderreihen
+aneinanderreihten
+aneinanderschliessen
+aneiteum
+aneiteumese
+aneityum
+anej
+aneja
+anejar
+anejir
+anejo
+anejom
+anekdot
+anekdote
+anekdoten
+anekdotenhaft
+anekdotenhafte
+anekdotenhaftem
+anekdotenhafter
+anekdotenhaftes
+anekdotenjager
+anekdotenjagers
+anekdotes
+anekdoti
+anekdotisch
+anekdotische
+anekdotisk
+anekdotiske
+anekeln
+anekelnd
+anekelnde
+anekelndem
+anekelnden
+anekelndes
+aneko
+anekwat
+anekwe
+aneldo
+anele
+anelectr
+anelectric
+anelectrode
+anelectrotonic
+anelectrotonus
+aneliese
+anelli
+anello
+anelma
+anelse
+anelsen
+anelser
+anelytro
+anelytrous
+anem
+anematos
+anematosis
+aneme
+anemi
+anemia
+anemias
+anemic
+anemical
+anemically
+anemie
+anemiek
+anemieke
+anemieker
+anemieks
+anemiekst
+anemien
+anemisch
+anemische
+anemischer
+anemischt
+anemisk
+anemiske
+anemo`fila
+anemo`filo
+anemo`grafo
+anemo`metro
+anemobia
+anemobiagraph
+anemocho
+anemochord
+anemocla
+anemoclastic
+anemocordio
+anemogra
+anemogra`fica
+anemogra`fico
+anemografi`a
+anemogram
+anemograph
+anemographic
+anemographically
+anemography
+anemolog
+anemological
+anemology
+anemome`trica
+anemome`trico
+anemomet
+anemometer
+anemometers
+anemometri`a
+anemometric
+anemometrical
+anemometrically
+anemometrograph
+anemometrographic
+anemometrographically
+anemometry
+anemonal
+anemone
+anemonel
+anemonella
+anemonen
+anemones
+anemonin
+anemonol
+anemony
+anemoon
+anemopat
+anemopathy
+anemophi
+anemophile
+anemophilous
+anemophily
+anemopsi
+anemopsis
+anemoro
+anemosco
+anemoscope
+anemoscopio
+anemosis
+anemotac
+anemotactic
+anemotax
+anemotaxis
+anemotro
+anemotropic
+anemotropism
+anempfeh
+anempfehlung
+anempfoh
+anempfohlen
+anen
+anenceph
+anencephalia
+anencephalic
+anencephalotrophia
+anencephalous
+anencephalus
+anencephaly
+anend
+anenergi
+anenergia
+anenst
+anent
+anentero
+anenterous
+aneota
+anep
+anepia
+anepigra
+anepigra`fica
+anepigra`fico
+anepigraphic
+anepigraphous
+anepiplo
+anepiploic
+anepithy
+anepithymia
+anequi`n
+aner
+anerbiet
+anerbieten
+anerbietens
+anerethi
+anerethisia
+aneretic
+anergia
+anergic
+anergy
+aneric
+anerie
+anerkann
+anerkannt
+anerkanntem
+anerkannten
+anerkannter
+anerkanntes
+anerkende
+anerkender
+anerkendes
+anerkendt
+anerkendte
+anerkenn
+anerkennbar
+anerkennbare
+anerkennbaren
+anerkennbarer
+anerkennbares
+anerkennen
+anerkennend
+anerkennende
+anerkennenden
+anerkennender
+anerkennendes
+anerkennenswerte
+anerkennenswertem
+anerkennenswerten
+anerkennenswertes
+anerkennt
+anerkenntnis
+anerkennung
+anerkennungen
+anerkjen
+anerkjenne
+anerkjennelse
+anerkjennelsen
+anerkjennende
+anerkjenner
+anerkjennes
+anerkjent
+anerkjente
+anerly
+aneroid
+aneroide
+aneroido
+aneroidograph
+aneroids
+anerood
+anerotic
+anerythr
+anerythroplasia
+anerythroplastic
+anerzieh
+anerziehen
+anerziehende
+anerziehendem
+anerziehenden
+anerziehendes
+anerzoge
+anerzogen
+anerzogene
+anerzogenen
+anerzogener
+anerzogenes
+anes
+anesaki
+anesanka
+anesis
+anestass
+anestassia
+aneste`sica
+aneste`sico
+anestesi
+anestesia
+anestesiar
+anestesie
+anestesista
+anesthe'
+anesthe'sia
+anesthe'siaient
+anesthe'siait
+anesthe'siant
+anesthe'sie
+anesthe'sie'
+anesthe'sie'e
+anesthe'sie'es
+anesthe'sie's
+anesthe'sie`rent
+anesthe'sient
+anesthe'sier
+anesthe'siera
+anesthe'sieraient
+anesthe'sierait
+anesthe'sieront
+anesthe'sies
+anesthe'sique
+anesthe'siques
+anesthe'siste
+anesthe'sistes
+anesthes
+anesthesia
+anesthesiant
+anesthesie
+anesthesimeter
+anesthesiologies
+anesthesiologist
+anesthesiologists
+anesthesiology
+anesthesis
+anesthet
+anesthetic
+anesthetically
+anesthetics
+anesthetist
+anesthetists
+anesthetization
+anesthetize
+anesthetized
+anesthetizer
+anesthetizes
+anesthetizing
+anesthyl
+anesu
+anet
+aneta
+anetachi
+anetan
+anetati
+aneth
+anethole
+anethoth
+anethothite
+anethum
+anetiolo
+anetiological
+aneto
+anetothi
+anetothite
+anett
+anetta
+anettai
+anette
+aneuploi
+aneuploid
+aneuploidy
+aneuria
+aneuric
+aneurile
+aneurilemmic
+aneurin
+aneurism
+aneurisma
+aneurismally
+aneurisms
+aneurysm
+aneurysmal
+aneurysmally
+aneurysmatic
+aneurysms
+anew
+anewa
+anexa
+anexar
+anexidad
+anexio`n
+anexionar
+anexionismo
+anexionista
+anexitis
+anexo
+anezaki
+anezeh
+anf
+anfachen
+anfachend
+anfachendem
+anfachenden
+anfachender
+anfaelle
+anfaellen
+anfaelli
+anfaellig
+anfaellige
+anfaelligem
+anfaelliger
+anfaelliges
+anfaelligkeit
+anfaellt
+anfaenge
+anfaengen
+anfaenger
+anfaengerin
+anfaengern
+anfaengers
+anfaengl
+anfaengliche
+anfaenglichem
+anfaenglichen
+anfaengliches
+anfaengt
+anfahrba
+anfahrbar
+anfahren
+anfahrend
+anfahrende
+anfahrenden
+anfahrender
+anfahrendes
+anfahrt
+anfahrte
+anfahrten
+anfahrtermin
+anfahrts
+anfahrtsweg
+anfahrve
+anfahrverzo"gerung
+anfald
+anfall
+anfalla
+anfalle
+anfallen
+anfallend
+anfallende
+anfallendem
+anfallenden
+anfallender
+anfallendes
+anfaller
+anfallet
+anfalls
+anfalt
+anfang
+anfange
+anfangen
+anfangend
+anfangende
+anfangendem
+anfangender
+anfangendes
+anfangs
+anfangsb
+anfangsbedingung
+anfangsbestand
+anfangsbuchstabe
+anfangsbuchstaben
+anfangsd
+anfangsdrucks
+anfangse
+anfangserfolge
+anfangsg
+anfangsgehaelter
+anfangsgehaeltern
+anfangsgehaltes
+anfangsgehaltswuensche
+anfangsgewinn
+anfangsgruenden
+anfangsj
+anfangsjahre
+anfangsjahren
+anfangsk
+anfangskante
+anfangskapital
+anfangskapitales
+anfangskurs
+anfangskurse
+anfangsp
+anfangspassagen
+anfangsphase
+anfangsplanung
+anfangsproblemen
+anfangss
+anfangsschwierigkeiten
+anfangssituation
+anfangsstadien
+anfangsstadiums
+anfangst
+anfangstempo
+anfangstermins
+anfangstest
+anfangsu
+anfangsunterrichtes
+anfangsv
+anfangsverluste
+anfangsverlusten
+anfangsw
+anfangswert
+anfangsz
+anfangszeiten
+anfangszeitpunkt
+anfassen
+anfassend
+anfassende
+anfassendem
+anfassender
+anfassendes
+anfasst
+anfaulen
+anfaulende
+anfaulendem
+anfaulenden
+anfaulendes
+anfe
+anfechtb
+anfechtbar
+anfechtbare
+anfechtbaren
+anfechtbarer
+anfechtbares
+anfechte
+anfechtend
+anfechtende
+anfechtendem
+anfechtender
+anfechtendes
+anfechtu
+anfechtung
+anfechtungsklage
+anfeinde
+anfeinden
+anfeindende
+anfeindendem
+anfeindenden
+anfeindendes
+anfeindu
+anfeindung
+anfeindungen
+anfekte
+anfektel
+anfektelse
+anfektelsen
+anfertig
+anfertigen
+anfertigend
+anfertigendem
+anfertigenden
+anfertigender
+anfertigung
+anfertigungen
+anfesibena
+anfeucht
+anfeuchten
+anfeuchtend
+anfeuern
+anfeuernde
+anfeuerndem
+anfeuernden
+anfeuerndes
+anffaell
+anffaelligkeit
+anfi
+anfi`bol
+anfi`braco
+anfi`macro
+anfi`podo
+anfibi
+anfibia
+anfibio
+anfibolita
+anfibolo`gica
+anfibolo`gicamente
+anfibolo`gico
+anfibologi`a
+anfictio`n
+anfictio`nica
+anfictio`nico
+anfictionado
+anfictioni`a
+anfiel
+anfillo
+anfineuro
+anfing
+anfingen
+anfio`n
+anfipro`stilo
+anfisbena
+anfiscia
+anfiscio
+anfisibena
+anfiteatro
+anfitrio`n
+anflehen
+anflehend
+anflehendem
+anflehenden
+anflehender
+anfleht
+anfliege
+anfliegen
+anfliegend
+anfliegende
+anfliegenden
+anfliegender
+anfliegendes
+anfluege
+anflug
+anflugs
+anfoell
+anfoer
+anfoera
+anfoerda
+anfoll
+anfor
+anfora
+anforda
+anforder
+anfordern
+anfordernd
+anfordernde
+anfordernden
+anfordernder
+anforderndes
+anfordert
+anforderung
+anforderungen
+anforderungsdetails
+anforderungskatalog
+anforderungskataloge
+anforderungskataloges
+anforderungsliste
+anforderungsprofil
+anforderungsschreiben
+anfore
+anfractu
+anfractuosa
+anfractuose
+anfractuosidad
+anfractuosite'
+anfractuosite's
+anfractuosity
+anfractuoso
+anfractuous
+anfractuousness
+anfracture
+anfrage
+anfragen
+anfragende
+anfragenden
+anfragender
+anfragendes
+anfrass
+anfreund
+anfreunden
+anfreundend
+anfreundende
+anfreundenden
+anfreundender
+anfreundendes
+anfriere
+anfrierend
+anfrierende
+anfrierendem
+anfrierender
+anfrierendes
+anfrom
+anfu"gun
+anfu"gung
+anfu"hru
+anfu"hrung
+anfu"hrungszeichen
+anfuegen
+anfuegende
+anfuegendem
+anfuegenden
+anfuegendes
+anfuehre
+anfuehren
+anfuehrende
+anfuehrendem
+anfuehrenden
+anfuehrendes
+anfuehrer
+anfuehrerinnen
+anfuehrern
+anfuehrers
+anfuehrt
+anfuehrte
+anfuehru
+anfuehrungsstriche
+anfuehrungsstrichen
+anfuehrungszeichen
+anf|ll
+anf|r
+anf|ra
+anf|rda
+anf|re
+anf|rer
+anf|rere
+anf|reren
+anf|res
+anf|rsel
+anf|rselen
+anf|rselstegn
+anf|rselstegnet
+anf|rsle
+anf|rsler
+anf|rt
+anf|rte
+ang
+anga
+angaa
+angaar
+angaatih
+angaatiha
+angaatiy
+angaatiya
+angab
+angabe
+angaben
+angac
+angadi
+angaengi
+angaengig
+angaengigem
+angaengigen
+angaengiger
+angaffen
+angaffend
+angaffendem
+angaffenden
+angaffender
+angai
+angaite
+angal
+angalkew
+angalkewa
+angami
+angamis
+angan
+anganillas
+anganiwa
+anganiwai
+anganiwe
+anganiwei
+angar
+angara
+angarali
+angaralite
+angaria
+angaries
+angarillada
+angarillar
+angarillas
+angaripola
+angarola
+angary
+angas
+angataha
+angate
+angaua
+angav
+angave
+angazo
+angba
+angband
+angbanga
+angbat
+angbor
+angdisti
+angdistis
+ange
+ange'liq
+ange'lique
+ange'liques
+ange'lus
+ange`lica
+ange`lico
+angebahn
+angebahnt
+angebahnte
+angebahntem
+angebahnter
+angebahntes
+angebaut
+angebautem
+angebauten
+angebauter
+angebell
+angebellt
+angebellte
+angebelltem
+angebellter
+angebelltes
+angeben
+angebend
+angebende
+angebendem
+angebenden
+angebendes
+angeber
+angebere
+angeberei
+angeberi
+angeberinnen
+angeberisch
+angeberische
+angeberischen
+angeberischer
+angeberisches
+angebern
+angebers
+angebete
+angebetete
+angebetetem
+angebeteten
+angebetetes
+angebett
+angebettelt
+angebettelte
+angebettelten
+angebettelter
+angebetteltes
+angebied
+angebiederte
+angebiedertem
+angebiederten
+angebiedertes
+angebiss
+angebissen
+angebissene
+angebissenen
+angebissener
+angeblas
+angeblasen
+angeblasenem
+angeblasenen
+angeblasener
+angeblic
+angeblich
+angebliche
+angeblichem
+angeblichen
+angeblicher
+angebliches
+angeblickt
+angeblin
+angeblinzelte
+angeblinzeltem
+angeblinzelten
+angeblinzeltes
+angebohr
+angebohrt
+angebohrte
+angebohrten
+angebohrter
+angebohrtes
+angebore
+angeborene
+angeborenem
+angeborenen
+angeborenes
+angebot
+angebote
+angeboten
+angebotene
+angebotenem
+angebotenen
+angebotener
+angebotenes
+angebotes
+angebots
+angebotsbereiche
+angebotsliste
+angebotsmappe
+angebotspalette
+angebotspreis
+angebotspreise
+angebotsstand
+angebotssteigerung
+angebotsvoraussetzungen
+angebrac
+angebracht
+angebrachte
+angebrachtem
+angebrachten
+angebrachter
+angebrachtere
+angebrachtes
+angebran
+angebrannte
+angebranntem
+angebrannten
+angebranntes
+angebrat
+angebraten
+angebratene
+angebratenen
+angebratener
+angebratenes
+angebroc
+angebrochene
+angebrochenem
+angebrochenen
+angebrochenes
+angebrue
+angebruellt
+angebruelltem
+angebruellten
+angebruellter
+angebund
+angebunden
+angebundene
+angebundenen
+angebundener
+angebundenes
+angedeih
+angedeihen
+angedeihend
+angedeihende
+angedeihenden
+angedeihender
+angedeihendes
+angedeut
+angedeutet
+angedeutete
+angedeutetem
+angedeuteten
+angedeutetes
+angedich
+angedichtet
+angedichtete
+angedichteten
+angedichteter
+angedichtetes
+angedien
+angediente
+angedreh
+angedreht
+angedrehte
+angedrehten
+angedrehter
+angedrehtes
+angedroh
+angedrohte
+angedrohtem
+angedrohten
+angedrohtes
+angeeign
+angeeignet
+angeeignete
+angeeigneten
+angeeigneter
+angeeignetes
+angeekel
+angeekelte
+angeekeltem
+angeekelten
+angeekeltes
+angefach
+angefacht
+angefachte
+angefachten
+angefachter
+angefachtes
+angefahr
+angefahren
+angefahrene
+angefahrenem
+angefahrenen
+angefahrenes
+angefall
+angefallen
+angefallene
+angefallenen
+angefallener
+angefallenes
+angefang
+angefangen
+angefangenem
+angefangenen
+angefangener
+angefass
+angefasste
+angefasstem
+angefassten
+angefasstes
+angefaul
+angefault
+angefaulte
+angefaultem
+angefaulter
+angefaultes
+angefein
+angefeindet
+angefeindetem
+angefeindeten
+angefeindeter
+angefert
+angefertigt
+angefertigte
+angefertigtem
+angefertigter
+angefertigtes
+angefeuc
+angefeuchtet
+angefeuchtetem
+angefeuchteten
+angefeuchteter
+angefeue
+angefeuert
+angefeuerte
+angefeuertem
+angefeuerter
+angefeuertes
+angefleh
+angefleht
+angeflehtem
+angeflehten
+angeflehter
+angeflog
+angeflogen
+angeflogene
+angeflogenem
+angeflogener
+angeflogenes
+angefoch
+angefochten
+angefochtenem
+angefochtenen
+angefochtener
+angeford
+angefordert
+angeforderte
+angefordertem
+angeforderten
+angeforderter
+angefordertes
+angefrag
+angefragt
+angefragte
+angefragtem
+angefragten
+angefragter
+angefreu
+angefreundet
+angefreundete
+angefreundetem
+angefreundeter
+angefreundetes
+angefror
+angefroren
+angefrorenem
+angefrorenen
+angefrorener
+angefu"g
+angefu"gt
+angefu"h
+angefu"hrt
+angefu"hrten
+angefueg
+angefuegt
+angefuegte
+angefuegten
+angefuegter
+angefuegtes
+angefueh
+angefuehrte
+angefuehrtem
+angefuehrten
+angefuehrtes
+angefuel
+angefuellt
+angefuellten
+angegaff
+angegafft
+angegaffte
+angegafftem
+angegaffter
+angegafftes
+angegang
+angegangen
+angegangenen
+angegangener
+angegangenes
+angegebe
+angegeben
+angegebene
+angegebenem
+angegebenen
+angegebener
+angegebenes
+angeglic
+angeglichen
+angeglichene
+angeglichenen
+angeglichener
+angeglichenes
+angeglie
+angegliederte
+angegliedertem
+angegliederten
+angegliedertes
+angegoss
+angegossen
+angegossene
+angegossenen
+angegossener
+angegossenes
+angegren
+angegrenzte
+angegrenztem
+angegrenzten
+angegrenztes
+angegrif
+angegriffen
+angegriffene
+angegriffenen
+angegriffener
+angegriffenes
+angegrin
+angegrinste
+angegrinstem
+angegrinsten
+angegrinstes
+angeha"n
+angeha"ngt
+angeha"ngtem
+angehabt
+angehabtem
+angehabten
+angehabter
+angehaen
+angehaengt
+angehaengte
+angehaengten
+angehaengter
+angehaengtes
+angehaeu
+angehaeufte
+angehaeuftem
+angehaeuften
+angehaeuftes
+angehalt
+angehalten
+angehaltene
+angehaltenem
+angehaltener
+angehaltenes
+angehauc
+angehaucht
+angehauchtem
+angehauchten
+angehauchter
+angeheft
+angeheftet
+angeheftete
+angeheftetem
+angehefteter
+angeheftetes
+angeheir
+angeheiratet
+angeheiratetem
+angeheirateten
+angeheirateter
+angeheit
+angeheitert
+angeheiterte
+angeheitertem
+angeheiterter
+angeheitertes
+angeheiz
+angeheizt
+angehend
+angehende
+angehendem
+angehender
+angehendes
+angeheue
+angeheuert
+angehimm
+angehimmelte
+angehimmeltem
+angehimmelten
+angehimmeltes
+angeho"r
+angeho"rigen
+angehobe
+angehoben
+angehobene
+angehobenen
+angehobener
+angehobenes
+angehoer
+angehoere
+angehoeren
+angehoerende
+angehoerendem
+angehoerenden
+angehoerendes
+angehoerig
+angehoerigem
+angehoerigen
+angehoeriger
+angehoerigkeit
+angehoert
+angehoerte
+angehoertem
+angehoerter
+angehoertes
+angeht
+angekauf
+angekauft
+angekauftem
+angekauften
+angekaufter
+angekett
+angekettenem
+angekettet
+angekettete
+angeketteter
+angekettetes
+angeklag
+angeklagt
+angeklagten
+angeklagter
+angeklagtes
+angeklam
+angeklammert
+angeklammertem
+angeklammerten
+angeklammerter
+angekleb
+angeklebt
+angeklebte
+angeklebtem
+angeklebter
+angeklebtes
+angeklei
+angekleidet
+angekleidetem
+angekleideten
+angekleideter
+angeklem
+angeklemmt
+angeklin
+angeklingelt
+angeklop
+angeklopft
+angeklun
+angeklungen
+angeknac
+angeknackst
+angeknackste
+angeknip
+angeknipst
+angeknipste
+angeknipstem
+angeknipster
+angeknipstes
+angeknue
+angeknuepfte
+angeknuepftem
+angeknuepften
+angeknuepftes
+angekok
+angekomm
+angekommen
+angekommenem
+angekommenen
+angekommener
+angekopp
+angekoppelt
+angekoppeltem
+angekoppelten
+angekrae
+angekraenkelt
+angekrat
+angekratzt
+angekrei
+angekreidet
+angekreidetem
+angekreideten
+angekreideter
+angekreu
+angekreuzt
+angekreuzte
+angekreuztem
+angekreuzter
+angekreuztes
+angeku"n
+angeku"ndigt
+angeku"ndigten
+angekuen
+angekuendigt
+angekuendigte
+angekuendigtem
+angekuendigter
+angekuendigtes
+angekurb
+angekurbelt
+angekurbelte
+angekurbelten
+angekurbelter
+angekurbeltes
+angel
+angela
+angelach
+angelachte
+angelachtem
+angelachten
+angelachtes
+angelaec
+angelaechelte
+angelaecheltem
+angelaechelten
+angelaecheltes
+angelako
+angelakos
+angelang
+angelangt
+angelangte
+angelangten
+angelangter
+angelangtes
+angelass
+angelassene
+angelassenem
+angelassenen
+angelassenes
+angelast
+angelastet
+angelastete
+angelate
+angelauf
+angelaufen
+angelaufene
+angelaufenem
+angelaufenen
+angelaufenes
+angelca
+angeldom
+angeldra
+angeldragend
+angeldragende
+angele
+angelege
+angelegen
+angelegenheit
+angelegenheiten
+angelegt
+angelegte
+angelegtem
+angelegten
+angelegter
+angelehn
+angelehnt
+angelehnte
+angelehntem
+angelehnter
+angelehntes
+angelei
+angeleim
+angeleimt
+angeleimtem
+angeleimten
+angeleimter
+angeleit
+angeleitet
+angeleitete
+angeleitetem
+angeleiteter
+angeleitetes
+angelen
+angeleno
+angelern
+angelernt
+angelernte
+angelerntem
+angelernten
+angelernter
+angeles
+angelet
+angeleye
+angeleyes
+angelfac
+angelface
+angelfis
+angelfish
+angelfishes
+angelgel
+angelgelegenheit
+angelger
+angelgeraet
+angelgeraete
+angelgeraetes
+angelhak
+angelhaken
+angelhol
+angelholm
+angelhoo
+angelhood
+angeli
+angeli`n
+angelia
+angelic
+angelica
+angelical
+angelically
+angelicalmente
+angelicalness
+angelican
+angelicanism
+angelicas
+angelici
+angelicic
+angelicize
+angelico
+angelie
+angelief
+angeliefert
+angelieferte
+angeliefertem
+angelieferten
+angelieferter
+angeliefertes
+angeliek
+angeligu
+angeligue
+angelika
+angelikas
+angelikk
+angelill
+angelilli
+angelillo
+angelin
+angelina
+angelina-lan
+angeline
+angelini
+angelino
+angeliqu
+angelique
+angelis
+angelita
+angelito
+angelizar
+angelize
+angell
+angelle
+angelli
+angellik
+angellike
+angeln
+angelnd
+angelnde
+angelndem
+angelnden
+angelnder
+angelo
+angelo"t
+angelo"tet
+angelo"tetem
+angelo`n
+angelock
+angelockt
+angelockte
+angelocktem
+angelockten
+angelocktes
+angelocr
+angelocracy
+angeloet
+angeloetet
+angeloetete
+angeloeteten
+angeloeteter
+angeloetetes
+angeloge
+angelogen
+angelogene
+angelogenen
+angelogener
+angelogenes
+angelogr
+angelographer
+angelola
+angelolater
+angelolatry
+angelolo
+angelologi`a
+angelologic
+angelological
+angelology
+angeloma
+angelomachy
+angeloni
+angelonia
+angeloph
+angelophany
+angelot
+angelota
+angelote
+angelots
+angelov
+angelpun
+angelpunkt
+angelrut
+angelrute
+angelruten
+angels
+angelsac
+angelsachsen
+angelsae
+angelsaechsische
+angelsaechsischen
+angelsaechsischer
+angelsak
+angelsakserne
+angelsaksisch
+angelsaksische
+angelsaksischer
+angelsaksischt
+angelsaksisk
+angelsaksiske
+angelsca
+angelscamp
+angelsen
+angelshi
+angelship
+angelspi
+angelspits
+angelspitsen
+angelspo
+angelsport
+angelst
+angelste
+angelsteek
+angelsteken
+angelte
+angeltei
+angelteich
+angelten
+angeltes
+angeltest
+angeltje
+angeltjes
+angeltr|
+angeltr|a
+angelus
+angeluse
+angeluses
+angelusk
+angelusklokje
+angelusklokjes
+angeluso
+angelusoaks
+angelust
+angelustorentje
+angelustorentjes
+angelyn
+angemach
+angemacht
+angemachte
+angemachten
+angemachter
+angemachtes
+angemahn
+angemahnten
+angemalt
+angemalte
+angemaltem
+angemalten
+angemaltes
+angemass
+angemasst
+angemeld
+angemeldet
+angemeldete
+angemeldeten
+angemeldeter
+angemeldetes
+angemerk
+angemerkt
+angemerkte
+angemerktem
+angemerkten
+angemerktes
+angemess
+angemessen
+angemessene
+angemessenen
+angemessener
+angemessenere
+angemessenerem
+angemessenerer
+angemesseneres
+angemessenes
+angemessenheiten
+angemessenstem
+angemessensten
+angemessenster
+angemiet
+angemietete
+angemieteter
+angemust
+angemustert
+angen
+angenaeh
+angenaeht
+angenaehte
+angenaehtem
+angenaehter
+angenaehtes
+angenaem
+angenage
+angenagelt
+angenageltem
+angenagelten
+angenagelter
+angenam
+angenehm
+angenehme
+angenehmem
+angenehmen
+angenehmer
+angenehmere
+angenehmerem
+angenehmerer
+angenehmeres
+angenehmes
+angenehmstem
+angenehmsten
+angenehmster
+angenem
+angenomm
+angenommen
+angenommene
+angenommenem
+angenommenen
+angenommener
+angenommenes
+angen{m
+angeordn
+angeordnet
+angeordnete
+angeordnetem
+angeordneten
+angeordneter
+angepack
+angepackt
+angepacktem
+angepackten
+angepackter
+angepass
+angepasst
+angepasstem
+angepassten
+angepasster
+angepassterem
+angepassteren
+angepassterer
+angepasstes
+angepassteste
+angepasstestem
+angepasstester
+angepasstestes
+angepeil
+angepeilt
+angepeilte
+angepeiltem
+angepeilter
+angepeiltes
+angepfif
+angepfiffen
+angepfla
+angepflanzte
+angepflanztem
+angepflanzten
+angepflanztes
+angepoeb
+angepoebelt
+angepoebelte
+angepoebeltem
+angepoebelter
+angepoebeltes
+angepral
+angeprallt
+angeprallte
+angeprallten
+angeprallter
+angepralltes
+angeprie
+angepriesen
+angepriesene
+angepriesenem
+angepriesener
+angepriesenes
+angepump
+angepumpt
+angepumptem
+angepumpten
+angepumpter
+anger
+angerann
+angerannt
+angerannte
+angeranntem
+angerannter
+angeranntes
+angerate
+angeraten
+angeratenem
+angeratenen
+angeratener
+angerauc
+angerauchte
+angerech
+angerechnet
+angerechnete
+angerechneten
+angerechneter
+angerechnetes
+angered
+angerede
+angeredete
+angeredetem
+angeredeten
+angeredetes
+angeregt
+angeregte
+angeregten
+angeregter
+angeregtes
+angereic
+angereicherte
+angereichertem
+angereicherten
+angereichertes
+angereih
+angereiht
+angereihte
+angereihten
+angereihter
+angereihtes
+angereis
+angereiste
+angereistem
+angereisten
+angereistes
+angereiz
+angereizt
+angereizte
+angereizten
+angereizter
+angereiztes
+angeren
+angerer
+angerful
+angerfull
+angerhof
+angerhofer
+angerich
+angerichtet
+angerichtete
+angerichtetem
+angerichteter
+angerichtetes
+angerine
+angering
+angeriss
+angerissene
+angerly
+angermey
+angermeyr
+angerona
+angeronalia
+angers
+angeruec
+angerueckt
+angerueckte
+angeruecktem
+angerueckter
+angeruecktes
+angerueh
+angeruehrt
+angeruehrtem
+angeruehrten
+angeruehrter
+angerufe
+angerufen
+angerufene
+angerufenen
+angerwol
+angerwolf
+anges
+angesaeu
+angesaeuselt
+angesaeuseltem
+angesaeuselten
+angesaeuselter
+angesagt
+angesagte
+angesagtem
+angesagter
+angesagtes
+angesamm
+angesammelt
+angesammeltem
+angesammelten
+angesammelter
+angesaug
+angesaugt
+angesaugte
+angesaugtem
+angesaugter
+angesaugtes
+angescha
+angeschafft
+angeschafftem
+angeschafften
+angeschaffter
+angeschalgenem
+angeschalten
+angeschaltene
+angeschaltenen
+angeschaltener
+angeschaltenes
+angeschaut
+angeschaute
+angeschautem
+angeschauter
+angeschautes
+angeschi
+angeschichtet
+angeschichtetem
+angeschichteten
+angeschichteter
+angeschickt
+angeschickte
+angeschicktem
+angeschickter
+angeschicktes
+angeschl
+angeschlagen
+angeschlagenen
+angeschlagener
+angeschlagenes
+angeschlossen
+angeschlossene
+angeschlossenem
+angeschlossenen
+angeschlossenenen
+angeschlossenes
+angeschludigtem
+angeschm
+angeschmiegt
+angeschmiegtem
+angeschmiegten
+angeschmiegter
+angeschmiert
+angeschmierte
+angeschmiertem
+angeschmierter
+angeschmiertes
+angeschn
+angeschnallt
+angeschnalltem
+angeschnallten
+angeschnallter
+angeschnauzt
+angeschnauzte
+angeschnauztem
+angeschnauzter
+angeschnauztes
+angeschnitten
+angeschnittenem
+angeschnittenen
+angeschnittener
+angescho
+angeschossen
+angeschossene
+angeschossenem
+angeschossener
+angeschossenes
+angeschr
+angeschraubt
+angeschraubtem
+angeschraubten
+angeschraubter
+angeschrieben
+angeschriebene
+angeschriebenem
+angeschriebener
+angeschriebenes
+angeschrien
+angeschrienem
+angeschrienen
+angeschriener
+angeschu
+angeschuldigt
+angeschuldigte
+angeschuldigten
+angeschuldigtes
+angeschw
+angeschwaerzt
+angeschwaerzte
+angeschwaerzten
+angeschwaerzter
+angeschwaerztes
+angeschweisst
+angeschweisste
+angeschweisstem
+angeschweisster
+angeschweisstes
+angeschwemmt
+angeschwemmtem
+angeschwemmten
+angeschwemmter
+angeschwindelt
+angeschwindelte
+angeschwindeltem
+angeschwindelter
+angeschwindeltes
+angeschwollen
+angeschwollenem
+angeschwollenen
+angeschwollener
+angesehe
+angesehen
+angesehene
+angesehenem
+angesehener
+angesehenes
+angesehensten
+angeseil
+angeseilte
+angeseiltem
+angeseilten
+angeseiltes
+angeseng
+angesengte
+angesengten
+angesenk
+angesenkt
+angesetz
+angesetzt
+angesetzte
+angesetztem
+angesetzten
+angesetztes
+angesich
+angesicht
+angesichter
+angesichtern
+angesichts
+angesied
+angesiedelt
+angesiedelte
+angesiedelten
+angesiedelter
+angesiedeltes
+angespan
+angespannt
+angespannte
+angespannten
+angespannter
+angespanntere
+angespannteren
+angespannterer
+angespannteres
+angespannteste
+angespanntestem
+angespanntesten
+angespanntestes
+angespar
+angesparte
+angespei
+angespeit
+angespeitem
+angespeiten
+angespeiter
+angespie
+angespielt
+angespielte
+angespieltem
+angespielter
+angespieltes
+angespin
+angespinnt
+angespinntem
+angespinnten
+angespinnter
+angespit
+angespitzt
+angespitzte
+angespitztem
+angespitzter
+angespitztes
+angespor
+angespornt
+angesporntem
+angespornten
+angespornter
+angespri
+angespritzt
+angespritzte
+angespritztem
+angespritzter
+angespritztes
+angespro
+angesprochen
+angesprochene
+angesprochenem
+angesprochenen
+angesprochener
+angespru
+angesprungen
+angesprungene
+angesprungenem
+angesprungener
+angesprungenes
+angespuc
+angespuckt
+angespucktem
+angespuckten
+angespuckter
+angespue
+angespuelte
+angespueltem
+angespuelten
+angespueltes
+angest
+angestac
+angestachelt
+angestachelte
+angestachelten
+angestachelter
+angestacheltes
+angestam
+angestammte
+angestammtem
+angestammten
+angestammtes
+angestammtheit
+angestan
+angestanden
+angestar
+angestarrt
+angestarrtem
+angestarrten
+angestarrter
+angestau
+angestaute
+angestec
+angesteckt
+angesteckte
+angesteckten
+angesteckter
+angestecktes
+angestel
+angestellte
+angestelltem
+angestellten
+angestelltengehaelter
+angestelltenkrankenkasse
+angestelltenverhaeltnis
+angestellter
+angestelltes
+angesteu
+angesteuert
+angesteuertem
+angesteuerten
+angesteuerter
+angestie
+angestiegen
+angestiegende
+angestiegene
+angestiegenen
+angestiegener
+angestiegenes
+angestif
+angestiftete
+angestiftetem
+angestifteten
+angestiftetes
+angestim
+angestimmt
+angestimmte
+angestimmten
+angestimmter
+angestimmtes
+angestos
+angestossene
+angestossenem
+angestossenen
+angestossenes
+angestra
+angestrahlt
+angestrahlte
+angestrahlten
+angestrahlter
+angestrahltes
+angestre
+angestrebt
+angestrebte
+angestrebtem
+angestrebten
+angestrebtes
+angestrengt
+angestrengte
+angestrengten
+angestrengter
+angestrengtes
+angestri
+angestrichene
+angestrichenem
+angestrichenen
+angestrichenes
+angestue
+angestuermt
+angestuermte
+angestuermten
+angestuermtes
+angesuch
+angesucht
+angesuchte
+angesuchten
+angesuchter
+angesuchtes
+anget
+angetan
+angetane
+angetanem
+angetaner
+angetanes
+angetast
+angetastet
+angetastetem
+angetasteten
+angetasteter
+angetena
+angetenar
+angetrag
+angetragen
+angetragene
+angetragenem
+angetragener
+angetragenes
+angetrau
+angetrauten
+angetret
+angetretene
+angetretenem
+angetretenen
+angetretenes
+angetrie
+angetrieben
+angetriebene
+angetriebenen
+angetriebener
+angetriebenes
+angetrof
+angetroffene
+angetroffenem
+angetroffenen
+angetroffener
+angetroffenes
+angetrun
+angetrunken
+angetrunkene
+angetrunkenen
+angetrunkener
+angetrunkenes
+angett
+angevin
+angewa"h
+angewa"hlt
+angewa"hlte
+angewa"hlten
+angewach
+angewachsene
+angewachsenem
+angewachsenen
+angewachsenes
+angewaeh
+angewaehlte
+angewaehltes
+angewaer
+angewaermt
+angewand
+angewandt
+angewandte
+angewandten
+angewandter
+angewandtes
+angewend
+angewendet
+angewendete
+angewendetem
+angewendeten
+angewendetes
+angewide
+angewidert
+angewies
+angewiesen
+angewiesenem
+angewiesenen
+angewiesener
+angewoeh
+angewoehnt
+angewoehnte
+angewoehntem
+angewoehnter
+angewoehntes
+angewoehnung
+angewohn
+angewohnheit
+angewohnheiten
+angeworb
+angeworben
+angeworf
+angeworfen
+angewurz
+angewurzelt
+angeyok
+angezahl
+angezahlt
+angezahlte
+angezahltem
+angezahlter
+angezahltes
+angezapf
+angezapft
+angezapftem
+angezapften
+angezapfter
+angezeic
+angezeichnet
+angezeig
+angezeigt
+angezeigte
+angezeigten
+angezeigter
+angezeigtes
+angezett
+angezettelte
+angezetteltem
+angezettelten
+angezetteltes
+angezisc
+angezischt
+angezoge
+angezogen
+angezogenem
+angezogenen
+angezogener
+angezuen
+angezuendet
+angezuendetem
+angezuendeten
+angezuendeter
+angezwei
+angezweifelt
+angezweifelte
+angezweifeltem
+angezweifelter
+angezweifeltes
+anggor
+angguna
+angguruk
+anghaeng
+anghaengerschaft
+anghaengerschaften
+angharad
+anghel
+anghelov
+angi
+angiasth
+angiasthenia
+angibt
+angick
+angico
+angie
+angiecta
+angiectasis
+angiecto
+angiectopia
+angiemph
+angiemphraxis
+angier
+angiitis
+angika
+angikar
+angikk
+angil
+angild
+angili
+angin
+angina
+anginaen
+anginal
+anginas
+angine
+angines
+anginge
+angingen
+anginifo
+anginiform
+anginoid
+anginosa
+anginose
+anginoso
+anginous
+angioast
+angioasthenia
+angioata
+angioataxia
+angiobla
+angioblast
+angioblastic
+angiocar
+angiocarditis
+angiocarp
+angiocarpian
+angiocarpic
+angiocarpous
+angiocav
+angiocavernous
+angiocho
+angiocholecystitis
+angiocholitis
+angiochondroma
+angiocla
+angioclast
+angiocys
+angiocyst
+angioder
+angiodermatitis
+angiodia
+angiodiascopy
+angioele
+angioelephantiasis
+angiofib
+angiofibroma
+angiogen
+angiogenesis
+angiogenic
+angiogeny
+angiogli
+angioglioma
+angiogra
+angiogram
+angiograph
+angiography
+angiohya
+angiohyalinosis
+angiohyd
+angiohydrotomy
+angiohyp
+angiohypertonia
+angiohypotonia
+angioid
+angioker
+angiokeratoma
+angiokin
+angiokinesis
+angiokinetic
+angioleu
+angioleucitis
+angiolil
+angiolillo
+angiolin
+angiolina
+angiolip
+angiolipoma
+angiolit
+angiolith
+angiolog
+angiology
+angiolym
+angiolymphitis
+angiolymphoma
+angioma
+angiomal
+angiomalacia
+angiomat
+angiomatosis
+angiomatous
+angiomeg
+angiomegaly
+angiomet
+angiometer
+angiomyo
+angiomyocardiac
+angiomyoma
+angiomyosarcoma
+angioneo
+angioneoplasm
+angioneu
+angioneurosis
+angioneurotic
+angionom
+angionoma
+angionos
+angionosis
+angiopar
+angioparalysis
+angioparalytic
+angioparesis
+angiopat
+angiopathy
+angiopho
+angiophorous
+angiopla
+angioplany
+angioplasty
+angiople
+angioplerosis
+angiopoi
+angiopoietic
+angiopre
+angiopressure
+angiorrh
+angiorrhagia
+angiorrhaphy
+angiorrhea
+angiorrhexis
+angiosar
+angiosarcoma
+angioscl
+angiosclerosis
+angiosclerotic
+angiosco
+angioscope
+angiosis
+angiospa
+angiospasm
+angiospastic
+angiospe
+angiosperm
+angiosperma
+angiospermae
+angiospermal
+angiospermatous
+angiospermic
+angiospermo
+angiospermous
+angiosperms
+angiospo
+angiosporous
+angioste
+angiostegnosis
+angiostenosis
+angiosteosis
+angiosto
+angiostomize
+angiostomy
+angiostr
+angiostrophy
+angiosym
+angiosymphysis
+angiotas
+angiotasis
+angiotel
+angiotelectasia
+angioten
+angiothl
+angiothlipsis
+angiotom
+angiotome
+angiotomy
+angioton
+angiotonic
+angiotonin
+angiotri
+angiotribe
+angiotripsy
+angiotro
+angiotrophic
+angir
+angis
+angitt
+angitte
+angiv
+angiva
+angive
+angiveli
+angivelig
+angivelige
+angivels
+angivelse
+angivelsen
+angivelser
+angiven
+angivende
+angiver
+angivere
+angiveren
+angiveri
+angives
+angivet
+angivit
+angivne
+angivning
+angjelde
+angjeldende
+angka
+angkola
+angkor
+angku
+angkuic
+angla
+anglade
+anglais
+anglaise
+anglaiser
+anglaises
+anglat
+angle
+angleber
+angleberry
+anglebra
+anglebracket
+angled
+anglehoo
+anglehook
+angleich
+angleichend
+angleichende
+angleichendem
+angleichender
+angleichendes
+angleichungen
+angleinl
+angleinlet
+anglepod
+angler
+angleren
+anglergl
+anglerglueck
+anglern
+anglers
+anglerut
+anglerute
+angles
+anglesit
+anglesita
+anglesite
+anglesmi
+anglesmith
+angleton
+angletou
+angletouch
+angletwi
+angletwitch
+anglewin
+anglewing
+anglewis
+anglewise
+anglewor
+angleworm
+angleworms
+anglia
+anglian
+anglians
+anglic
+anglicaa
+anglicaan
+anglicaans
+anglicaanse
+anglicaanser
+anglicaanst
+anglican
+anglicana
+anglicane
+anglicanen
+anglicanes
+anglicanism
+anglicanisme
+anglicanismo
+anglicanizada
+anglicanizado
+anglicanize
+anglicanly
+anglicano
+anglicans
+anglicanum
+anglice
+anglicis
+anglicise'
+anglicise'e
+anglicise'es
+anglicise's
+angliciser
+anglicism
+anglicisme
+anglicismen
+anglicismes
+anglicismo
+anglicisms
+anglicist
+angliciste
+anglicistes
+angliciz
+anglicization
+anglicize
+anglicized
+anglicizes
+anglicizing
+angliede
+angliedern
+angliedernde
+angliederndem
+angliedernden
+angliederndes
+angliederungen
+anglific
+anglification
+anglify
+anglikan
+anglikaner
+anglikanisch
+anglikanische
+anglikanischen
+anglikanischer
+anglikanisches
+anglim
+angliman
+anglimaniac
+anglin
+angling
+anglings
+anglish
+anglist
+angliste
+anglisten
+anglisti
+anglistics
+anglistik
+anglo
+anglo-sa
+anglo-saxon
+anglo-saxonne
+anglo-saxonnes
+anglo-saxons
+anglo`mana
+anglo`mano
+angloame
+angloamerican
+angloamericana
+angloamericano
+angloamerikaner
+angloara
+angloaraber
+angloegy
+angloegyptian
+anglofie
+anglofiel
+anglofiele
+anglofieler
+anglofielst
+anglofob
+anglofobie
+anglogae
+anglogaea
+anglogaean
+angloid
+anglokan
+anglokanadiers
+anglomaa
+anglomaan
+angloman
+anglomane
+anglomanen
+anglomani`a
+anglomania
+anglomaniac
+anglomanie
+anglophi
+anglophile
+anglophiles
+anglophilia
+anglophilie
+anglopho
+anglophobe
+anglophobes
+anglophobia
+anglophobiac
+anglophobic
+anglophobist
+anglophone
+anglophones
+anglorom
+angloromani
+anglos
+anglosajo`n
+anglosajona
+anglosax
+anglosaxon
+anglotze
+anglotzen
+angmar
+ango
+angobald
+angobaldo
+angoissa
+angoissaient
+angoissais
+angoissait
+angoissant
+angoissante
+angoissantes
+angoissants
+angoisse
+angoisse'
+angoisse'e
+angoisse'es
+angoisse's
+angoisse`rent
+angoissent
+angoisser
+angoissera
+angoisserai
+angoisseraient
+angoisserais
+angoisserait
+angoisseras
+angoisserez
+angoisseriez
+angoisserions
+angoisserons
+angoisseront
+angoisses
+angoissez
+angoissi
+angoissiez
+angoissions
+angoisso
+angoissons
+angoja
+angojosa
+angojoso
+angola
+angola`n
+angolala
+angolalabor
+angolan
+angolane
+angolanen
+angolaner
+angolaneren
+angolani
+angolanischen
+angolans
+angolansk
+angolar
+angolare
+angolares
+angold
+angole
+angolese
+angoli
+angolo
+angom
+angomerr
+angomerry
+angoni
+angor
+angora
+angora's
+angorage
+angorageit
+angorageiten
+angoraka
+angorakat
+angorakatt
+angorakatten
+angoram
+angorapo
+angorapoulos
+angoras
+angorawo
+angorawol
+angorawolle
+angorra
+angosce
+angoscia
+angoscio
+angosciosa
+angosciose
+angosciosi
+angoscioso
+angosia
+angosta
+angostamente
+angostar
+angosto
+angostur
+angostura
+angosturas
+angotero
+angou
+angouka
+angoulem
+angouleme
+angoumia
+angoumian
+angoya
+angphang
+angra
+angraecu
+angraecum
+angraens
+angraensa
+angransa
+angre
+angreas
+angreb
+angrebene
+angrebet
+angrebsmetode
+angrebsm}de
+angrebsm}der
+angrebsstyrke
+angrebsv}ben
+angreifb
+angreifbar
+angreifbare
+angreifbaren
+angreifbarer
+angreifbares
+angreife
+angreifend
+angreifende
+angreifendem
+angreifender
+angreifendes
+angreifer
+angreiferin
+angreifern
+angreifers
+angreift
+angrelada
+angrelado
+angrende
+angrenos
+angrenost
+angrenze
+angrenzend
+angrenzende
+angrenzendem
+angrenzenden
+angrenzender
+angrenzendes
+angrep
+angrepen
+angrepene
+angrepet
+angrepp
+angrepsk
+angrepskrig
+angrepsl
+angrepslinje
+angrepsr
+angrepsrekke
+angrepsrekken
+angrepss
+angrepsspill
+angrepsspiller
+angrer
+angret
+angrib
+angribe
+angribende
+angriber
+angriberen
+angriberens
+angribes
+angrie
+angrier
+angriest
+angriff
+angriffe
+angriffen
+angriffs
+angriffsdrohung
+angriffsfla"che
+angriffsflaechen
+angriffsfluege
+angriffskriege
+angriffskriegen
+angriffslustig
+angriffslustigem
+angriffslustigen
+angriffslustiger
+angriffslustigerem
+angriffslustigeren
+angriffslustigerer
+angriffslustiges
+angriffslustigste
+angriffslustigstem
+angriffslustigster
+angriffslustigstes
+angriffspause
+angriffspunkt
+angriffsseite
+angriffsspiel
+angriffstaktik
+angriffsuebungen
+angriffswaffen
+angriffswirbel
+angrily
+angrines
+angriness
+angrinse
+angrinsen
+angrinsende
+angrinsendem
+angrinsenden
+angrinsendes
+angripa
+angripe
+angriper
+angripere
+angriperen
+angriperne
+angripes
+angrite
+angrolil
+angrolillo
+angry
+angr{nsa
+angslan
+angslig
+angst
+angstaus
+angstausloesenden
+angstbit
+angstbitere
+angstbli
+angstblick
+angstdio
+angstdioden
+angsten
+angstent
+angstentscheidung
+angster
+angsterr
+angsterregend
+angstgef
+angstgefuehl
+angstges
+angstgeschrei
+angstgev
+angstgevoel
+angsthas
+angsthase
+angsthasen
+angsthasens
+angstig
+angstige
+angstiger
+angstigs
+angstigst
+angstkre
+angstkreet
+angstkreten
+angstlic
+angstlichem
+angstmom
+angstmoment
+angstneu
+angstneurose
+angstneurosen
+angstrom
+angstroms
+angsts
+angstsch
+angstschweiss
+angstschweisses
+angstschwelle
+angstval
+angstvallig
+angstvallige
+angstvalliger
+angstvalligheid
+angstvalligst
+angstvol
+angstvoll
+angstvolle
+angstvollen
+angstvoller
+angstvollere
+angstvolleren
+angstvollerer
+angstvolleres
+angstvollste
+angstvollstem
+angstvollsten
+angstvollstes
+angstwek
+angstwekkend
+angstwekkende
+angstwekkender
+angstwekkendst
+angstzus
+angstzustaenden
+angstzwe
+angstzweet
+angszust
+angszustand
+angu
+anguarina
+angucken
+anguelos
+anguid
+anguidae
+anguifor
+anguiform
+anguila
+anguilazo
+anguilera
+anguilero
+anguill
+anguilla
+anguillan
+anguillaria
+anguille
+anguilles
+anguilli
+anguillidae
+anguilliform
+anguillo
+anguilloid
+anguillu
+anguillula
+anguillulidae
+anguilo
+anguimor
+anguimorpha
+anguina
+anguine
+anguinea
+anguineal
+anguineo
+anguineous
+anguinid
+anguinidae
+anguiped
+anguis
+anguish
+anguishe
+anguished
+anguishes
+anguishf
+anguishful
+anguishi
+anguishing
+anguisho
+anguishous
+anguishously
+anguita
+angula
+angulada
+angulado
+angulair
+angulaire
+angulaires
+angular
+angulare
+angulari
+angularities
+angularity
+angularization
+angularize
+angularl
+angularly
+angularmente
+angularn
+angularness
+angulate
+angulated
+angulately
+angulateness
+angulati
+angulating
+angulation
+angulato
+angulatogibbous
+angulatosinuous
+angulema
+anguleus
+anguleuse
+anguleuses
+anguleux
+angulife
+anguliferous
+anguline
+angulinerved
+angulo
+anguloa
+angulode
+angulodentate
+angulome
+angulometer
+angulosa
+angulosi
+angulosity
+anguloso
+angulosp
+angulosplenial
+angulous
+angungwe
+angungwel
+angura
+anguri
+anguria
+angurie
+angurosa
+angurria
+anguru
+angus
+anguses
+angusill
+angusilla
+angusta
+angustat
+angustation
+anguste
+angusti
+angustia
+angustiada
+angustiadamente
+angustiado
+angustiador
+angustiadora
+angustiar
+angustic
+angusticlave
+angustie
+angustif
+angustifoliate
+angustifolious
+angustiosa
+angustiosamente
+angustioso
+angustir
+angustirostrate
+angustis
+angustisellate
+angustiseptal
+angustiseptate
+angusto
+anguu
+angu{ejo
+angvall
+angwanti
+angwantibo
+angwin
+angy
+angya
+ang}
+ang}ende
+ang}r
+anh
+anha"nge
+anha"ngen
+anha"nger
+anha"ngs
+anha"ngsel
+anha"ufe
+anha"ufen
+anhaalla
+anhaben
+anhaelt
+anhaenga
+anhaengare
+anhaenge
+anhaengend
+anhaengende
+anhaengendem
+anhaengender
+anhaengendes
+anhaengerbau
+anhaengerfabrik
+anhaengerin
+anhaengern
+anhaengers
+anhaengerschaft
+anhaengerzahlen
+anhaengi
+anhaengig
+anhaengigem
+anhaengigen
+anhaengiger
+anhaengl
+anhaenglich
+anhaengliche
+anhaenglichem
+anhaenglicher
+anhaengliches
+anhaenglichkeit
+anhaenglichkeiten
+anhaengs
+anhaengseln
+anhaengsels
+anhaengt
+anhaeufe
+anhaeufend
+anhaeufende
+anhaeufendem
+anhaeufender
+anhaeufendes
+anhaeufu
+anhaeufung
+anhaften
+anhaftende
+anhaftenden
+anhalami
+anhalamine
+anhaline
+anhalla
+anhaloni
+anhalonine
+anhalonium
+anhaloui
+anhalouidine
+anhalt
+anhalte
+anhalten
+anhaltend
+anhaltendem
+anhaltenden
+anhaltender
+anhalter
+anhaltsp
+anhaltspunkt
+anhaltspunkte
+anhaltspunkten
+anhaltspunktes
+anhand
+anhang
+anhanga
+anhangar
+anhangare
+anhangs
+anhaqui
+anharmon
+anharmonic
+anhauche
+anhauchen
+anhauchend
+anhauchende
+anhauchenden
+anhauchender
+anhauchendes
+anhe'ler
+anhe`lito
+anheben
+anhebend
+anhebende
+anhebendem
+anhebender
+anhebendes
+anhebt
+anhebung
+anhedoni
+anhedonia
+anhedral
+anhedron
+anheften
+anheftend
+anheftende
+anheftendem
+anheftender
+anheftendes
+anheim
+anheisch
+anheischig
+anheizen
+anheizt
+anhelacio`n
+anhelante
+anhelar
+anhelati
+anhelation
+anhelo
+anhelosa
+anhelosamente
+anhelose
+anheloso
+anhelous
+anhemato
+anhematosis
+anhemoly
+anhemolytic
+anheuser
+anhi`drido
+anhidra
+anhidrita
+anhidro
+anhidros
+anhidrosis
+anhidrot
+anhidrotic
+anhieb
+anhielt
+anhielte
+anhielten
+anhima
+anhimae
+anhimida
+anhimidae
+anhimmel
+anhimmeln
+anhimmelnde
+anhimmelndem
+anhimmelnden
+anhimmelndes
+anhinga
+anhistic
+anhistou
+anhistous
+anho"he
+anhob
+anhoben
+anhoehe
+anhoehen
+anhoell
+anhoer
+anhoeren
+anhoerende
+anhoerendem
+anhoerenden
+anhoerendes
+anhoerig
+anhoert
+anhoerte
+anhoerun
+anhoerung
+anhoerungsrecht
+anhoerungsverfahren
+anholde
+anholdel
+anholdelse
+anholdelsen
+anholdelsene
+anholdt
+anholl
+anhopnin
+anhopningar
+anhor
+anhorig
+anhorn
+anhtuan
+anhui
+anhunger
+anhungered
+anhungry
+anhydrat
+anhydrate
+anhydration
+anhydrem
+anhydremia
+anhydremic
+anhydric
+anhydrid
+anhydride
+anhydrides
+anhydridization
+anhydridize
+anhydrit
+anhydrite
+anhydriz
+anhydrization
+anhydrize
+anhydrog
+anhydroglocose
+anhydrom
+anhydromyelia
+anhydrou
+anhydrous
+anhydrously
+anhydrox
+anhydroxime
+anhyster
+anhysteretic
+anh{ngar
+anh{ngare
+anh|ll
+anh|r
+anh|rig
+anh}lla
+ani
+ani-ta
+ani-taka
+ani\ada
+ani\adamente
+ani\ado
+ani\arse
+ani`mica
+ani`mico
+ani`s
+ania
+aniabl
+aniaga
+aniai
+aniak
+aniam
+aniba
+anibal
+anibare
+anibau
+anica
+anice
+anicee
+anicet
+anichkin
+anicon
+aniconic
+aniconis
+aniconism
+anicroch
+anicroche
+anicroches
+anicular
+anicut
+anidar
+anideshi
+anidesi
+anidian
+anidiar
+anidio
+anidioma
+anidiomatic
+anidiomatical
+anidrosi
+anidrosis
+anieblar
+aniego
+anieja
+aniejar
+aniejo
+aniellid
+aniellidae
+aniello
+aniemier
+aniemierte
+aniente
+anigh
+anight
+anights
+anigibi
+anigonus
+anihata
+anihilacio`n
+anihilamiento
+anihilar
+anii
+anijs
+anijsapp
+anijsappel
+anijsappelen
+anijsappels
+anijsmel
+anijsmelk
+anijszaa
+anijszaad
+anijszad
+anijszaden
+anika
+anikhwe
+aniki
+aniko
+anikwe
+anil
+anila
+anilao
+anilau
+anile
+anilenes
+anileness
+anilic
+anilid
+anilide
+anilidic
+anilidox
+anilidoxime
+anilin
+anilina
+aniline
+aniline-
+aniline-inkt
+anilinen
+anilinep
+anilinepotloden
+anilinepotlood
+anilines
+anilinis
+anilinism
+anilinop
+anilinophile
+anilinophilous
+anilins
+anilitie
+anilities
+anility
+anilla
+anillada
+anillado
+anillar
+anillejo
+anillete
+anillo
+anilopyr
+anilopyrin
+anilopyrine
+anils
+anim
+anima
+anima`lculo
+animaal
+animaals
+animaalst
+animabil
+animability
+animable
+animableness
+animacio`n
+animadamente
+animador
+animadora
+animadve
+animadversio`n
+animadversion
+animadversional
+animadversions
+animadversive
+animadversiveness
+animadvert
+animadverted
+animadvertencia
+animadverter
+animadverting
+animadverts
+animaeda
+animai
+animaien
+animaient
+animais
+animait
+animal
+animalada
+animalcu
+animalcula
+animalculae
+animalcular
+animalcule
+animalcules
+animalculine
+animalculism
+animalculist
+animalculous
+animalculum
+animale
+animalejo
+animaler
+animales
+animalho
+animalhood
+animalhouse
+animali
+animalia
+animalian
+animalias
+animalic
+animalidad
+animalie
+animalier
+animalis
+animalisch
+animalische
+animalischen
+animalischer
+animalisches
+animaliser
+animalish
+animalism
+animalist
+animalistic
+animalit
+animalite'
+animalities
+animality
+animaliv
+animalivora
+animalivore
+animalivorous
+animaliz
+animalizacio`n
+animalizar
+animalization
+animalize
+animalized
+animalizing
+animally
+animalne
+animalness
+animals
+animalsk
+animalucho
+animammo
+animando
+animano
+animant
+animante
+animar
+animare
+animaron
+animarono
+animaru
+animas
+animasse
+animassero
+animassi
+animassimo
+animaste
+animasti
+animastic
+animastical
+animata
+animatag
+animate
+animated
+animatedly
+animatel
+animately
+animaten
+animateness
+animater
+animaters
+animates
+animateu
+animateur
+animateurs
+animati
+animatin
+animating
+animatingly
+animatio
+animation
+animations
+animatis
+animatism
+animatistic
+animativ
+animative
+animato
+animatog
+animatograph
+animator
+animators
+animatri
+animatrice
+animatrices
+animaux
+animava
+animavam
+animavamo
+animavan
+animavano
+animavat
+animavate
+animavi
+animavo
+anime
+anime'
+anime'e
+anime'es
+anime's
+anime-sh
+anime`re
+anime`rent
+animeer
+animeerd
+animeerde
+animeerden
+animeert
+animent
+animer
+animera
+animerai
+animeraient
+animerais
+animerait
+animeran
+animeranno
+animeras
+animere
+animereb
+animerebbe
+animerei
+animerem
+animeremmo
+animeremo
+animeren
+animeres
+animereste
+animeresti
+animeret
+animerete
+animerez
+animerie
+animeriez
+animerio
+animerions
+animero
+animeron
+animerons
+animeront
+animert
+animes
+animesh
+animesyo
+animez
+animi
+animiamo
+animiate
+animiere
+animieren
+animierend
+animierendem
+animierenden
+animierender
+animiers
+animierst
+animiert
+animierten
+animiertet
+animieru
+animierung
+animiez
+animikea
+animikean
+animikit
+animikite
+animino
+animions
+animism
+animisme
+animismo
+animisms
+animist
+animisti
+animistic
+animists
+animize
+animized
+animo
+animons
+animosa
+animosamente
+animosidad
+animosit
+animosita
+animositaet
+animosite'
+animositeit
+animositet
+animositeten
+animosities
+animosity
+animoso
+animothe
+animotheism
+animous
+animus
+animuses
+anindily
+anindilyakwa
+anindita
+aning
+aninga
+aniniy
+anio`n
+aniocha
+anion
+anionen
+anionic
+anionica
+anionically
+anions
+aniquilable
+aniquilacio`n
+aniquilador
+aniquiladora
+aniquilamiento
+aniquilar
+anir
+anirago
+anirban
+aniridia
+anis
+anisada
+anisado
+anisal
+anisalco
+anisalcohol
+anisalde
+anisaldehyde
+anisaldo
+anisaldoxime
+anisamid
+anisamide
+anisandr
+anisandrous
+anisanil
+anisanilide
+anisar
+anisate
+anischur
+anischuria
+anise
+anise'
+anise's
+aniseed
+aniseeds
+aniseiko
+aniseikonia
+aniseikonic
+aniselik
+aniselike
+anisen
+aniser
+aniseroo
+aniseroot
+anises
+anisete
+anisette
+anisettes
+anisic
+anisidin
+anisidine
+anisil
+anisilic
+aniso`mero
+anisobra
+anisobranchiate
+anisocar
+anisocarpic
+anisocarpous
+anisocer
+anisocercal
+anisochr
+anisochromatic
+anisochromia
+anisocor
+anisocoria
+anisocot
+anisocotyledonous
+anisocotyly
+anisocra
+anisocratic
+anisocyc
+anisocycle
+anisocyt
+anisocytosis
+anisodac
+anisodactyl
+anisodactyla
+anisodactyli
+anisodactylic
+anisodactylous
+anisodon
+anisodont
+anisodonte
+anisofila
+anisofilo
+anisogam
+anisogamete
+anisogamous
+anisogamy
+anisogen
+anisogenous
+anisogeny
+anisogna
+anisognathism
+anisognathous
+anisogyn
+anisogynous
+anisoin
+anisole
+anisoleu
+anisoleucocytosis
+anisomel
+anisomeles
+anisomelia
+anisomelus
+anisomer
+anisomeric
+anisomerous
+anisomet
+anisometric
+anisometrope
+anisometropia
+anisometropic
+anisomya
+anisomyarian
+anisomyo
+anisomyodi
+anisomyodian
+anisomyodous
+anisope`tala
+anisopet
+anisopetalous
+anisophy
+anisophyllous
+anisophylly
+anisopia
+anisople
+anisopleural
+anisopleurous
+anisopod
+anisopoda
+anisopodal
+anisopodous
+anisopog
+anisopogonous
+anisopte
+anisoptera
+anisopterous
+anisosep
+anisosepalous
+anisospo
+anisospore
+anisosta
+anisostaminous
+anisoste
+anisostemonous
+anisosth
+anisosthenic
+anisosti
+anisostichous
+anisostichus
+anisosto
+anisostomous
+anisoton
+anisotonic
+anisotro
+anisotrop
+anisotropal
+anisotrope
+anisotropi
+anisotropic
+anisotropical
+anisotropically
+anisotropien
+anisotropies
+anisotropism
+anisotropous
+anisotropy
+anisoyl
+anissa
+anisum
+anisuria
+anisyl
+anisylid
+anisylidene
+anita
+anitabak
+anitachi
+anitaka
+anitati
+anitawor
+anither
+anitia
+anitinst
+anitinstitutionalism
+anito
+anitra
+anitroge
+anitrogenous
+anitsu
+anitta
+anitu
+aniue
+aniula
+anivelar
+aniversaria
+aniversario
+aniwa
+aniya
+aniyome
+anizizi
+anj
+anja
+anjali
+anjam
+anjaman
+anjan
+anjana
+anjanett
+anjanette
+anje
+anjela
+anjelica
+anjelier
+anjelieren
+anjen
+anjeo
+anjer
+anjers
+anji
+anjie
+anjiteki
+anjli
+anjou
+anjouan
+anjoushi
+anjousi
+anjunnou
+anjuski
+anjuu
+anjyou
+anjyuu
+ank
+anka
+anka"mpf
+anka"mpfen
+ankaeme
+ankaempf
+ankaempfen
+ankaeufe
+ankaeufen
+ankai
+ankam
+ankamen
+ankan
+ankantar
+ankanto
+ankara
+ankara-a
+ankara-am3
+ankara-e
+ankara-emh
+ankara-m
+ankara-mil-tac
+ankarami
+ankaramite
+ankaran
+ankaratr
+ankaratrite
+ankare
+ankaret
+ankassho
+ankauf
+ankaufen
+ankaufend
+ankaufende
+ankaufendem
+ankaufender
+ankaufendes
+ankaufge
+ankaufgeschaeften
+ankaufkr
+ankaufkredit
+ankaufku
+ankaufkurs
+ankaufsp
+ankaufspreis
+ankaufsw
+ankaufswoche
+ankave
+anke
+anke-to
+ankeborg
+ankedoms
+ankedomstol
+ankedomstolen
+ankee
+ankeinst
+ankeinstans
+ankel
+ankelen
+ankelska
+ankelskade
+ankem}l
+ankem}le
+ankem}let
+anken
+ankene
+ankenemn
+ankenemnd
+ankenemnda
+ankenes
+ankens
+ankeny
+ankepunk
+ankepunkt
+ankepunkter
+ankepunktet
+anker
+ankerboe
+ankerboei
+ankerboeien
+ankerboh
+ankerbohrmaschinen
+ankerbol
+ankerbolten
+ankerb|y
+ankerb|ye
+ankerde
+ankerden
+ankere
+ankeren
+ankeret
+ankergat
+ankergaten
+ankergro
+ankergrond
+ankergronden
+ankergru
+ankergruenden
+ankergrund
+ankergrunds
+ankerite
+ankerket
+ankerketten
+ankerketting
+ankerkettingen
+ankerkru
+ankerkruis
+ankerkruisen
+ankerkui
+ankerkuil
+ankerkuilen
+ankerman
+ankermann
+ankermanoever
+ankermas
+ankermast
+ankermasten
+ankern
+ankernd
+ankernde
+ankerndem
+ankernder
+ankerndes
+ankeroge
+ankerogen
+ankeroog
+ankerop
+ankerpfl
+ankerpflo"cke
+ankerpla
+ankerplaetze
+ankerplassen
+ankerplatz
+ankerplatzes
+ankers
+ankerst
+ankerste
+ankerstellung
+ankert
+ankerten
+ankertes
+ankertest
+ankertet
+ankertje
+ankertjes
+ankertro
+ankertros
+ankertrosse
+ankertrossen
+ankeruhr
+ankeruhren
+ankervin
+ankervinsj
+ankerwic
+ankerwicklung
+ankerwicklungen
+ankerwin
+ankerwinden
+ankesake
+ankesaken
+anket
+anketo
+anketten
+ankettend
+ankettende
+ankettendem
+ankettender
+ankettendes
+ankewich
+ankh
+ankhen
+ankhs
+anki
+ankick
+ankie
+ankikamo
+ankimono
+anklaege
+anklaeger
+anklaegerinnen
+anklaegerische
+anklaegern
+anklaegers
+anklaeng
+anklaengen
+anklaga
+anklage
+anklageb
+anklagebaenke
+anklagebehoerde
+anklaged
+anklagede
+anklagee
+anklageerhebung
+anklagem
+anklagematerial
+anklagen
+anklagende
+anklagendem
+anklagenden
+anklagendes
+anklagene
+anklagep
+anklagepunkt
+anklager
+anklagerede
+anklagerne
+anklages
+anklageschriften
+anklaget
+anklagev
+anklagevertreter
+anklagevertreters
+anklamme
+anklammern
+anklammernd
+anklammerndem
+anklammernden
+anklammernder
+anklang
+anklangs
+ankle
+ankleben
+anklebend
+anklebende
+anklebenden
+anklebender
+anklebendes
+anklebon
+anklebone
+anklebones
+ankleide
+ankleidend
+ankleidende
+ankleidendem
+ankleidender
+ankleidendes
+anklejac
+anklejack
+anklemme
+anklemmen
+anklemmu
+anklemmung
+ankler
+ankles
+anklet
+anklets
+ankling
+anklinge
+anklingeln
+anklingelnde
+anklingelndem
+anklingelnden
+anklingelndes
+anklingen
+anklong
+anklopfe
+anklopfen
+anklopfend
+anklopfendem
+anklopfenden
+anklopfender
+anklyosa
+anklyosaur
+anknackb
+anknackbaren
+anknipse
+anknipsen
+anknipsend
+anknipsendem
+anknipsenden
+anknipsender
+anknoet
+anknot
+anknuepf
+anknuepfen
+anknuepfend
+anknuepfende
+anknuepfenden
+anknuepfender
+anknuepfendes
+anknuepfung
+anknutet
+anknyt
+anknyta
+anknytit
+anknytni
+anknytningen
+ankn|t
+anko
+anko"mml
+anko"mmlinge
+anko-ru
+ankober
+ankobra
+ankodar
+ankoemml
+ankoemmling
+ankoemmlingen
+ankoemmlings
+ankoku
+ankokuga
+ankokuge
+ankokuji
+ankokuse
+ankole
+ankoli
+ankom
+ankomma
+ankomme
+ankommen
+ankommend
+ankommende
+ankommendem
+ankommenden
+ankommender
+ankommer
+ankommet
+ankommt
+ankomna
+ankomne
+ankomst
+ankomste
+ankomsten
+ankomstens
+ankomstm
+ankomstmeldingene
+ankomstr{kkef|lge
+ankomstt
+ankomsttid
+ankoppel
+ankoppeln
+ankoppelt
+ankoppelung
+ankopplu
+ankopplung
+ankori
+ankoromo
+ankoru
+ankotzt
+ankou
+ankova
+ankpa
+ankra
+ankre
+ankreide
+ankreiden
+ankreidende
+ankreidendem
+ankreidenden
+ankreidendes
+ankrene
+ankret
+ankreuze
+ankreuzen
+ankreuzend
+ankreuzendem
+ankreuzenden
+ankreuzender
+ankrovit
+ankrovith
+ankrum
+anku"ndi
+anku"ndigungen
+anku"ndigungstafel
+ankubeln
+ankubelnd
+ankuendi
+ankuendigend
+ankuendigende
+ankuendigendem
+ankuendigender
+ankuendigendes
+ankuendigt
+ankuendigten
+ankuendigung
+ankuenft
+ankuenfte
+ankuenften
+ankulu
+ankun
+ankunft
+ankunfts
+ankunftshalle
+ankunftszeit
+ankur
+ankurbel
+ankurbeln
+ankurbelnd
+ankurbelndem
+ankurbelnden
+ankurbelnder
+ankurbelung
+ankuru
+ankus
+ankuses
+ankusha
+ankwai
+ankwe
+anky
+ankylent
+ankylenteron
+ankylobl
+ankyloblepharon
+ankyloch
+ankylocheilia
+ankyloda
+ankylodactylia
+ankylodo
+ankylodontia
+ankylogl
+ankyloglossia
+ankylome
+ankylomele
+ankylomerism
+ankyloph
+ankylophobia
+ankylopo
+ankylopodia
+ankylopoietic
+ankylopr
+ankyloproctia
+ankylorr
+ankylorrhinia
+ankylosa
+ankylosaient
+ankylosait
+ankylosant
+ankylosaurus
+ankylose
+ankylose'
+ankylose'e
+ankylose'es
+ankylose's
+ankylose`rent
+ankylosent
+ankyloser
+ankylosera
+ankyloseraient
+ankyloserait
+ankyloseront
+ankylosi
+ankylosis
+ankylost
+ankylostoma
+ankyloti
+ankylotia
+ankylotic
+ankyloto
+ankylotome
+ankylotomy
+ankylure
+ankylurethria
+ankyo
+ankyohai
+ankyroid
+anl
+anl-mcs
+anla
+anla"ssl
+anla"sslich
+anla"uft
+anlace
+anlachen
+anlachende
+anlachendem
+anlachenden
+anlachendes
+anlade
+anlaeche
+anlaecheln
+anlaechelnde
+anlaechelndem
+anlaechelnden
+anlaechelndes
+anlaechelt
+anlaegga
+anlaeggn
+anlaeggning
+anlaeggningar
+anlaeggningen
+anlaenda
+anlaende
+anlaent
+anlaesse
+anlaessen
+anlaessl
+anlaesslich
+anlaeufe
+anlaeufen
+anlag
+anlagde
+anlage
+anlagebe
+anlagebedarf
+anlagebeduerfnis
+anlageberater
+anlageberatung
+anlagebeschreibungen
+anlagebetrag
+anlagebr
+anlagebriefen
+anlageda
+anlagedauer
+anlageem
+anlageempfehlung
+anlageen
+anlageentscheidungen
+anlageer
+anlageerfolg
+anlageerfolge
+anlagefo
+anlageform
+anlageformen
+anlagege
+anlagegeschaeft
+anlagegesellschaft
+anlagegu
+anlagegueter
+anlagein
+anlageinstrument
+anlageka
+anlagekaeufe
+anlagekapital
+anlagekapitalien
+anlagekl
+anlageklima
+anlageku
+anlagekunden
+anlagela
+anlagelandes
+anlagemi
+anlagemittel
+anlagen
+anlagena
+anlagenauslastung
+anlagenb
+anlagenbaues
+anlagenbereich
+anlageng
+anlagengeschaeft
+anlagenp
+anlagenplanung
+anlagens
+anlagensteuerung
+anlagent
+anlagenteile
+anlagenteilen
+anlagenz
+anlagenzugaenge
+anlageob
+anlageobjekt
+anlagepa
+anlagepapier
+anlageph
+anlagephilosophie
+anlagepo
+anlagepolitik
+anlagepr
+anlageprobleme
+anlagest
+anlagestrategie
+anlageta
+anlagetaetigkeit
+anlageti
+anlagetips
+anlagets
+anlageve
+anlageverkaeufe
+anlagevermittler
+anlagevermoegen
+anlagevermoegens
+anlagevo
+anlagevolk
+anlagevolkes
+anlagewe
+anlagewerte
+anlagezw
+anlagezwecke
+anlagezwecken
+anlagga
+anlaggni
+anlaggning
+anlaggningar
+anlaggningen
+anlagt
+anlagte
+anlanda
+anlande
+anlangen
+anlangend
+anlangendem
+anlangenden
+anlangender
+anlangt
+anlangte
+anlangten
+anlant
+anlass
+anlassen
+anlassend
+anlassende
+anlassendem
+anlassender
+anlassendes
+anlasser
+anlassern
+anlassers
+anlaufba
+anlaufbahnen
+anlaufen
+anlaufende
+anlaufendem
+anlaufenden
+anlaufendes
+anlaufge
+anlaufgeschuetzt
+anlaufha
+anlaufhaefen
+anlaufs
+anlaufsc
+anlaufschwierigkeiten
+anlaufst
+anlaufstelle
+anlaufstellen
+anlaufze
+anlaufzeit
+anlaut
+anlauten
+anlautes
+anlcv1
+anlednin
+anledning
+anledningar
+anledningen
+anledninger
+anlege
+anlegema
+anlegemanoever
+anlegen
+anlegend
+anlegendem
+anlegenden
+anlegender
+anlegepl
+anlegeplatz
+anlegeplatzes
+anleger
+anlegerg
+anlegergelder
+anlegergruppen
+anlegerm
+anlegermagazin
+anlegern
+anlegers
+anlegerscharen
+anlegerschutz
+anlegerv
+anlegerverhalten
+anlegervolks
+anlegest
+anlegestelle
+anlegestellen
+anlegg
+anlegge
+anleggel
+anleggelse
+anleggen
+anleggene
+anlegges
+anlegget
+anleggets
+anleggs
+anleggsa
+anleggsarbeide
+anleggsarbeidene
+anleggsarbeider
+anleggsarbeidet
+anleggsarbeidets
+anleggsavdelingen
+anleggsb
+anleggsbrakke
+anleggsbrakker
+anleggsbudsjett
+anleggsd
+anleggsdriften
+anleggsf
+anleggsfolk
+anleggsfolkene
+anleggsl
+anleggslager
+anleggsleder
+anleggso
+anleggsomkostningene
+anleggsoppgaver
+anleggsp
+anleggsperioden
+anleggsplass
+anleggsprisen
+anleggss
+anleggssektoren
+anleggsstaben
+anleggst
+anleggstiden
+anleggstransport
+anleggsu
+anleggsutgiftene
+anleggsv
+anleggsveien
+anleggsveier
+anleggsvirksomhet
+anlegt
+anlegte
+anlegten
+anlehnen
+anlehnend
+anlehnende
+anlehnenden
+anlehnender
+anlehnendes
+anlehnun
+anlehnung
+anlehnungen
+anleihe
+anleiheb
+anleihebedarf
+anleihee
+anleiheerloes
+anleihem
+anleihemarktes
+anleihen
+anleihep
+anleiheplaene
+anleihes
+anleiheschuld
+anleiheschulden
+anleimen
+anleimend
+anleimende
+anleimenden
+anleimender
+anleimendes
+anleiten
+anleitend
+anleitende
+anleitendem
+anleitender
+anleitendes
+anleitun
+anleitung
+anleitungen
+anlernen
+anlernende
+anlernendem
+anlernenden
+anlernendes
+anlernli
+anlernlinge
+anlief
+anliefer
+anliefern
+anliefernde
+anlieferndem
+anliefernden
+anlieferndes
+anliefert
+anlieferung
+anliegen
+anliegend
+anliegende
+anliegendem
+anliegenden
+anliegender
+anlieger
+anliegerstaaten
+anliegt
+anliggen
+anliggende
+anliggender
+anliggendet
+anlita
+anllo
+anllo"
+anlo
+anlo"ten
+anlocken
+anlockend
+anlockende
+anlockenden
+anlockender
+anlockendes
+anloeten
+anloetend
+anloetende
+anloetenden
+anloetender
+anloetendes
+anlour
+anluegen
+anluegend
+anluegende
+anluegendem
+anluegender
+anluegendes
+anlutur
+anlysis
+anl{g
+anl{gaktiver
+anl{gga
+anl{gge
+anl{ggene
+anl{gges
+anl{gget
+anl{ggets
+anl{ggni
+anl{ggning
+anl{ggningar
+anl{ggningen
+anl{gs
+anl{gsaktiver
+anl{gstjenesten
+anl{nda
+anl{nde
+anl{nt
+anl|ben
+anl|p
+anl|pe
+anl|pen
+anl|pene
+anl|per
+anl|pet
+anl|psha
+anl|pshavn
+anl|psst
+anl|pssteder
+anl|t
+anm
+anma
+anmachen
+anmachend
+anmachende
+anmachenden
+anmachender
+anmachendes
+anmaela
+anmaelan
+anmaeld
+anmaelda
+anmaelni
+anmaelning
+anmaelningar
+anmaelningsblankett
+anmaels
+anmaelt
+anmaerka
+anmaerkn
+anmaerkningar
+anmaerkningsv{rt
+anmaersc
+anmaerschen
+anmaku
+anmala
+anmalan
+anmald
+anmalda
+anmalen
+anmalend
+anmalende
+anmalenden
+anmalender
+anmalendes
+anmalnin
+anmalning
+anmalningar
+anmalningsblankett
+anmals
+anmalt
+anmari
+anmari-
+anmarka
+anmarkni
+anmarkningar
+anmarkningsvart
+anmarsch
+anmarsches
+anmarschierend
+anmarschierende
+anmarschierendem
+anmarschierender
+anmarschierendes
+anmarschiert
+anmarschiertem
+anmarschierten
+anmarschierter
+anmarsj
+anmarsje
+anmarsjen
+anmassen
+anmassend
+anmassende
+anmassendem
+anmassender
+anmassendes
+anmasst
+anmassun
+anmassung
+anmatjir
+anmatjirra
+anmeld
+anmelde
+anmeldef
+anmeldeformular
+anmeldeformularen
+anmeldeformulars
+anmeldefristen
+anmeldeg
+anmeldegebuehren
+anmeldel
+anmeldelse
+anmeldelsen
+anmeldelsene
+anmeldelsens
+anmeldelser
+anmeldelserne
+anmeldelsernes
+anmeldelses
+anmeldelsesfrist
+anmelden
+anmeldend
+anmeldende
+anmeldendem
+anmeldenden
+anmeldender
+anmeldep
+anmeldepflicht
+anmeldepflichtig
+anmeldepflichtige
+anmeldepflichtigem
+anmeldepflichtiger
+anmeldepflichtiges
+anmelder
+anmeldere
+anmelderen
+anmelderens
+anmelderi
+anmelderiet
+anmelderiets
+anmelderne
+anmeldernes
+anmelders
+anmeldes
+anmeldescheine
+anmeldescheinen
+anmeldescheines
+anmeldestellen
+anmeldet
+anmeldev
+anmeldevordrucke
+anmeldevorschriften
+anmeldt
+anmeldte
+anmeldun
+anmeldung
+anmeldungen
+anmerka
+anmerke
+anmerken
+anmerkend
+anmerkende
+anmerkenden
+anmerkender
+anmerkendes
+anmerket
+anmerkni
+anmerkning
+anmerkningen
+anmerkte
+anmerkun
+anmerkung
+anmerkungen
+anmessen
+anmessend
+anmessende
+anmessenden
+anmessender
+anmessendes
+anmietun
+anmietung
+anmin
+anmitsu
+anmitu
+anmochi
+anmoda
+anmodan
+anmode
+anmoder
+anmodes
+anmodet
+anmodnin
+anmodning
+anmodningen
+anmodninger
+anmodningsdatum
+anmoku
+anmonait
+anmonia
+anmonium
+anmoore
+anmoti
+anmut
+anmuten
+anmutend
+anmutende
+anmutendes
+anmutet
+anmutig
+anmutige
+anmutigem
+anmutigen
+anmutiger
+anmutigerem
+anmutigeren
+anmutigerer
+anmutiges
+anmutigs
+anmutigste
+anmutigstem
+anmutigster
+anmutigstes
+anmuts
+anm{la
+anm{lan
+anm{ld
+anm{lda
+anm{lnin
+anm{lning
+anm{lningar
+anm{lningsblankett
+anm{ls
+anm{lt
+anm{rka
+anm{rkni
+anm{rkningar
+anm{rkningsv{rt
+ann
+ann-hoon
+ann-lorr
+ann-lorrain
+ann-mari
+ann-marie
+anna
+anna"her
+anna"hernd
+anna"herung
+anna-dia
+anna-diana
+anna-diane
+anna-len
+anna-mar
+anna-maria
+anna-marie
+annaan
+annab
+annaba
+annabal
+annabana
+annabel
+annabela
+annabell
+annabella
+annabelle
+annaberg
+annabergite
+annabeth
+annable
+annacqua
+annacquai
+annacquano
+annacquare
+annacquata
+annacquate
+annacquati
+annacquato
+annacquava
+annacquavi
+annacquavo
+annacque
+annacquera
+annacquero
+annacqui
+annacquino
+annacquo
+annada
+annadian
+annadiana
+annadiane
+annado
+annadomi
+annaehen
+annaehende
+annaehendem
+annaehenden
+annaehendes
+annaeher
+annaehern
+annaehernd
+annaeherndem
+annaehernden
+annaehernder
+annaehert
+annaeherungen
+annaeherungspolitik
+annaeherungsversuch
+annaeherungsversuchen
+annaeherungsversuches
+annaeherungsweise
+annaehme
+annaehru
+annaehrung
+annafuu
+annageln
+annagelnd
+annagelnde
+annagelnden
+annagelnder
+annagelndes
+annagerm
+annagerman
+annahme
+annahmef
+annahmefrist
+annahmen
+annahmes
+annahmeschluss
+annahmestellen
+annahmev
+annahmeverweigerung
+annahmeverweigerungen
+annai
+annaiban
+annaibun
+annaichi
+annaiita
+annaijo
+annaijou
+annaijyo
+annaimou
+annainin
+annaisho
+annaisyo
+annaitiz
+annaizyo
+annajun
+annaka
+annakash
+annakasi
+annal
+annale
+annalea
+annalee
+annalen
+annalena
+annales
+annalfor
+annalforfatter
+annalie
+annalies
+annaliese
+annaline
+annalisa
+annalise
+annalism
+annalist
+annalistic
+annalists
+annalize
+annals
+annam
+annamari
+annamaria
+annamarie
+annamay
+annamese
+annamite
+annamiti
+annamitic
+annamito
+annamme
+annamono
+annan
+annandal
+annandale
+annandaleonhudson
+annanese
+annang
+annani
+annapavl
+annapavlova
+annapoli
+annapolis
+annapolisjunction
+annapurn
+annapurna
+annarbor
+annard
+annars
+annas
+annat
+annata
+annate
+annates
+annatto
+annattos
+annawan
+annazett
+annazette
+anne
+anne'e
+anne'es
+anne-cor
+anne-corinne
+anne-lis
+anne-lise
+anne-mar
+anne-marie
+anneal
+annealed
+annealer
+annealers
+annealin
+annealing
+anneals
+anneau
+anneaux
+annebbi
+annebbia
+annebbiai
+annebbiamo
+annebbiano
+annebbiare
+annebbiata
+annebbiate
+annebbiati
+annebbiato
+annebbiava
+annebbiavi
+annebbiavo
+annebbie
+annebbiera
+annebbiero
+annebbin
+annebbino
+annebbio
+annecori
+annecorinne
+annecten
+annectent
+annectio
+annection
+annega
+annegai
+annegamm
+annegammo
+annegand
+annegando
+annegano
+annegare
+annegaro
+annegarono
+annegass
+annegasse
+annegassi
+annegast
+annegaste
+annegasti
+annegata
+annegate
+annegati
+annegato
+annegava
+annegavamo
+annegavano
+annegavate
+annegavi
+annegavo
+annegher
+anneghera
+annegherai
+annegherei
+anneghero
+anneghi
+anneghia
+anneghiamo
+anneghiate
+anneghin
+anneghino
+annego
+annehmba
+annehmbar
+annehmbare
+annehmbaren
+annehmbarer
+annehmbares
+annehme
+annehmen
+annehmend
+annehmende
+annehmenden
+annehmender
+annehmendes
+annehmli
+annehmlichkeit
+annehmlichkeiten
+annei
+anneichi
+anneitit
+annekath
+annekathrin
+annekatr
+annekatrin
+anneke
+anneks
+anneksby
+anneksbygning
+annekser
+annekset
+anneksjo
+anneksjon
+anneksjonen
+annekter
+annektere
+annektert
+annekterte
+annektie
+annektieren
+annektierend
+annektierende
+annektierenden
+annektierender
+annektierendes
+annektiert
+annektierte
+annektiertem
+annektierter
+annektiertes
+annektiertest
+anneler
+anneli
+annelid
+annelida
+annelidan
+annelide
+annelides
+annelidi
+annelidian
+annelido
+annelidous
+annelids
+annelies
+anneliese
+annelise
+annelism
+annellat
+annellata
+anneloid
+annemani
+annemanie
+annemari
+annemarie
+annemarijke
+annemie
+annen
+annengra
+annengradsligning
+annengradslikning
+annenhve
+annenhver
+annenh}n
+annenh}nds
+annenman
+annenmann
+annenmas
+annenmaskinist
+annenpla
+annenplass
+annenplassen
+annenran
+annenrangs
+annens
+annenste
+annensteds
+annenstedsfra
+annensty
+annenstyrmann
+annenutg
+annenutgave
+annerled
+annerledes
+annerledestroende
+annerodi
+annerodite
+annes
+anneslia
+annessa
+annesse
+annessi
+annessio
+annessione
+annessioni
+annesso
+annet
+annethve
+annethvert
+annetlag
+annetlaget
+annetste
+annetsteds
+annetstedsfra
+annetta
+annette
+annex
+annex0
+annex1
+annex10
+annex11
+annex12
+annex13
+annex2
+annex3
+annex4
+annex5
+annex6
+annex7
+annex8
+annex9
+annexa
+annexabl
+annexable
+annexaie
+annexaient
+annexais
+annexait
+annexal
+annexant
+annexati
+annexatie
+annexatieplan
+annexatieplannen
+annexaties
+annexation
+annexational
+annexationist
+annexations
+annexe
+annexe'
+annexe'e
+annexe'es
+annexe's
+annexe`r
+annexe`rent
+annexed
+annexeer
+annexeerde
+annexeerden
+annexeert
+annexen
+annexent
+annexer
+annexera
+annexerai
+annexeraient
+annexerais
+annexerait
+annexeras
+annexere
+annexeren
+annexerez
+annexeri
+annexeriez
+annexerions
+annexero
+annexerons
+annexeront
+annexes
+annexez
+annexiez
+annexii
+annexing
+annexion
+annexionen
+annexionisme
+annexionist
+annexionisten
+annexionistisch
+annexionistische
+annexionnisme
+annexionniste
+annexionnistes
+annexions
+annexiti
+annexitis
+annexive
+annexmen
+annexment
+annexons
+annext
+annexure
+anni
+annibal
+annibale
+annice
+annick
+annida
+annidai
+annidali
+annidalin
+annidamm
+annidammo
+annidand
+annidando
+annidano
+annidare
+annidaro
+annidarono
+annidass
+annidasse
+annidassi
+annidast
+annidaste
+annidasti
+annidata
+annidate
+annidati
+annidato
+annidava
+annidavamo
+annidavano
+annidavate
+annidavi
+annidavo
+annidera
+anniderai
+annidere
+anniderei
+annideremo
+anniderete
+annidero
+annidi
+annidiam
+annidiamo
+annidiat
+annidiate
+annidino
+annido
+annie
+annielli
+anniellidae
+annienta
+annientai
+annientano
+annientare
+annientata
+annientate
+annientati
+annientato
+annientava
+annientavi
+annientavo
+anniente
+annientera
+annientero
+annienti
+annientino
+anniento
+annihila
+annihilability
+annihilable
+annihilaient
+annihilais
+annihilait
+annihilant
+annihilate
+annihilated
+annihilates
+annihilating
+annihilation
+annihilationism
+annihilationist
+annihilative
+annihilator
+annihilators
+annihilatory
+annihile
+annihile'
+annihile'e
+annihile'es
+annihile's
+annihile`rent
+annihilent
+annihiler
+annihilera
+annihilerai
+annihileraient
+annihilerais
+annihilerait
+annihileras
+annihilerez
+annihileriez
+annihilerions
+annihilerons
+annihileront
+annihiles
+annihilez
+annihili
+annihiliez
+annihilions
+annihilo
+annihilons
+annik
+annika
+annikki
+annimmt
+annina
+annis
+annis-mi
+annis-mil-tac
+annise
+annissa
+annist
+anniston
+anniston-asims
+anniston-emh1
+anniston-emh2
+anniston-emh3
+annita
+annite
+annivers
+anniversaire
+anniversaires
+anniversaries
+anniversarily
+anniversariness
+anniversary
+anniverse
+annleis
+annm
+annmaria
+annmarie
+annnora
+anno
+annobon
+annoda
+annodai
+annodamm
+annodammo
+annodand
+annodando
+annodano
+annodare
+annodaro
+annodarono
+annodass
+annodasse
+annodassi
+annodast
+annodaste
+annodasti
+annodata
+annodate
+annodated
+annodati
+annodato
+annodava
+annodavamo
+annodavano
+annodavate
+annodavi
+annodavo
+annodera
+annoderai
+annodere
+annoderei
+annoderemo
+annoderete
+annodero
+annodi
+annodiam
+annodiamo
+annodiat
+annodiate
+annodino
+annodo
+annoi
+annoia
+annoiai
+annoiamm
+annoiammo
+annoiamo
+annoiand
+annoiando
+annoiano
+annoiare
+annoiaro
+annoiarono
+annoiass
+annoiasse
+annoiassi
+annoiast
+annoiaste
+annoiasti
+annoiata
+annoiate
+annoiati
+annoiato
+annoiava
+annoiavamo
+annoiavano
+annoiavate
+annoiavi
+annoiavo
+annoiera
+annoierai
+annoiere
+annoierei
+annoieremo
+annoierete
+annoiero
+annoino
+annoio
+annojou
+annojyou
+annomich
+annomiti
+annon
+annona
+annonace
+annonaceae
+annonaceous
+annonc/a
+annonc/aient
+annonc/ais
+annonc/ait
+annonc/ant
+annonc/o
+annonc/ons
+annonce
+annonce'
+annonce'e
+annonce'es
+annonce's
+annonce`
+annonce`rent
+annoncee
+annonceer
+annonceerde
+annonceerden
+annonceert
+annoncen
+annoncenbuero
+annoncent
+annoncer
+annoncera
+annoncerai
+annonceraient
+annoncerais
+annoncerait
+annonceras
+annonceren
+annoncerez
+annonceriez
+annoncerions
+annoncerne
+annoncernes
+annoncerons
+annonceront
+annonces
+annonceu
+annonceur
+annonceurs
+annonceuse
+annonceuses
+annoncez
+annoncia
+annonciateur
+annonciateurs
+annonciation
+annonciatrice
+annonciatrices
+annoncie
+annonciere
+annoncieren
+annoncierende
+annoncierendem
+annoncierenden
+annoncierendes
+annoncierst
+annonciert
+annonciertem
+annoncierten
+annoncierter
+annonciertest
+annonciertet
+annonciez
+annoncio
+annoncions
+annons
+annonse
+annonsea
+annonseavis
+annonseb
+annonsebyr}
+annonsebyr}et
+annonsen
+annonseo
+annonseomkostningene
+annonsep
+annonseprisene
+annonser
+annonsera
+annonsere
+annonserer
+annonseres
+annonsering
+annonseringen
+annonsert
+annonserte
+annonses
+annonsesidene
+annonsoe
+annonsoererna
+annonsor
+annonsorerna
+annons|r
+annons|ren
+annons|rerna
+annora
+annorlun
+annorlunda
+annorsta
+annorstades
+annorstaedes
+annorst{
+annorst{des
+annota
+annotai
+annotaie
+annotaient
+annotais
+annotait
+annotamm
+annotammo
+annotand
+annotando
+annotano
+annotant
+annotare
+annotaro
+annotarono
+annotasj
+annotasjon
+annotass
+annotasse
+annotassi
+annotast
+annotaste
+annotasti
+annotata
+annotate
+annotated
+annotater
+annotates
+annotati
+annotatie
+annotaties
+annotating
+annotation
+annotations
+annotative
+annotatively
+annotativeness
+annotato
+annotator
+annotators
+annotatory
+annotava
+annotavamo
+annotavano
+annotavate
+annotavi
+annotavo
+annotazi
+annotazioni
+annote
+annote'
+annote'e
+annote'es
+annote's
+annote`r
+annote`rent
+annoteer
+annoteerde
+annoteerden
+annoteert
+annotent
+annoter
+annotera
+annoterai
+annoteraient
+annoterais
+annoterait
+annoteras
+annotere
+annoterei
+annoteremo
+annoteren
+annoterete
+annoterez
+annoteri
+annoteriez
+annoterions
+annotero
+annoterons
+annoteront
+annotes
+annotez
+annoti
+annotiam
+annotiamo
+annotiat
+annotiate
+annotiez
+annotine
+annotino
+annotinous
+annotion
+annotions
+annoto
+annotomo
+annotons
+annotto
+announce
+announceable
+announced
+announcement
+announcements
+announcer
+announcers
+announces
+announci
+announcing
+annovera
+annoverai
+annoverano
+annoverare
+annoverata
+annoverate
+annoverati
+annoverato
+annoverava
+annoveravi
+annoveravo
+annovere
+annoverera
+annoverero
+annoveri
+annoverino
+annovero
+annoy
+annoyanc
+annoyance
+annoyancer
+annoyances
+annoybot
+annoyed
+annoyer
+annoyers
+annoyful
+annoying
+annoyingly
+annoyingness
+annoymen
+annoyment
+annoys
+annozyou
+annsam
+annsamt
+annu
+annua
+annuaire
+annuaires
+annual
+annuale
+annuali
+annualis
+annualist
+annualit
+annualite'
+annualiz
+annualize
+annualized
+annually
+annuals
+annuary
+annuel
+annueler
+annuelle
+annuellement
+annuelles
+annuels
+annuent
+annuitai
+annuitaire
+annuitaires
+annuitan
+annuitant
+annuitants
+annuite'
+annuite's
+annuitei
+annuiteit
+annuiteiten
+annuitet
+annuiteten
+annuitie
+annuities
+annuity
+annukka
+annul
+annula
+annulaie
+annulaient
+annulair
+annulaire
+annulais
+annulait
+annulant
+annular
+annulari
+annularia
+annularity
+annularl
+annularly
+annulary
+annulata
+annulate
+annulated
+annulati
+annulation
+annulations
+annule
+annule'
+annule'e
+annule'es
+annule's
+annule`r
+annule`rent
+annuleer
+annuleerde
+annuleerden
+annuleert
+annulent
+annuler
+annulera
+annulerai
+annuleraient
+annulerais
+annulerait
+annuleras
+annulere
+annuleren
+annulerez
+annuleri
+annuleriez
+annulering
+annuleringen
+annulerions
+annulero
+annulerons
+annuleront
+annules
+annulet
+annulett
+annulettee
+annulez
+annuli
+annulier
+annulierte
+annuliez
+annulion
+annulions
+annulism
+annulla
+annullab
+annullable
+annullai
+annullam
+annullammo
+annullan
+annullando
+annullano
+annullar
+annullare
+annullas
+annullasse
+annullassi
+annullaste
+annullasti
+annullat
+annullata
+annullate
+annullati
+annullation
+annullato
+annullav
+annullava
+annullavi
+annullavo
+annulled
+annuller
+annullera
+annullerai
+annullere
+annullerei
+annullero
+annullert
+annulli
+annullia
+annulliamo
+annulliate
+annullie
+annullieren
+annullierend
+annullierende
+annullierenden
+annullierender
+annullierendes
+annulliert
+annullierte
+annulliertem
+annullierter
+annulliertes
+annulliertest
+annullierung
+annullin
+annulling
+annullino
+annullo
+annulmen
+annulment
+annulments
+annuloid
+annuloida
+annulons
+annulosa
+annulosan
+annulose
+annuls
+annulus
+annuluse
+annuluses
+annum
+annuncia
+annunciable
+annunciate
+annunciated
+annunciates
+annunciating
+annunciation
+annunciations
+annunciative
+annunciator
+annunciators
+annunciatory
+annunzi
+annunzia
+annunziai
+annunziamo
+annunziano
+annunziare
+annunziata
+annunziate
+annunziati
+annunziato
+annunziava
+annunziavi
+annunziavo
+annunzie
+annunziera
+annunziero
+annunzin
+annunzino
+annunzio
+annusa
+annusai
+annusamm
+annusammo
+annusand
+annusando
+annusano
+annusare
+annusaro
+annusarono
+annusass
+annusasse
+annusassi
+annusast
+annusaste
+annusasti
+annusata
+annusate
+annusati
+annusato
+annusava
+annusavamo
+annusavano
+annusavate
+annusavi
+annusavo
+annusera
+annuserai
+annusere
+annuserei
+annuseremo
+annuserete
+annusero
+annusi
+annusiam
+annusiamo
+annusiat
+annusiate
+annusino
+annuso
+annuziat
+annuziata
+annville
+annvinn
+annvint
+annwn
+anny
+annyui
+ano
+ano`mala
+ano`malo
+ano`n
+ano`nima
+ano`nimamente
+ano`nimo
+anoa
+anoas
+anobiida
+anobiidae
+anoblir
+anobliss
+anoblissement
+anoc1
+anocarpo
+anocarpous
+anochai
+anoche
+anochecedor
+anochecedora
+anochecer
+anochecida
+anochecido
+anociass
+anociassociation
+anococcy
+anococcygeal
+anod
+anodal
+anodally
+anode
+anoden
+anodendr
+anodendron
+anodes
+anodestr
+anodestroom
+anodic
+anodical
+anodically
+anodin
+anodina
+anodine
+anodines
+anodinia
+anodino
+anodins
+anodiser
+anodizat
+anodization
+anodize
+anodized
+anodizes
+anodizin
+anodizing
+anodo
+anodon
+anodonta
+anodonti
+anodontia
+anodos
+anodyne
+anodynes
+anodynia
+anodynic
+anodynou
+anodynous
+anoegene
+anoegenetic
+anoesia
+anoesis
+anoestro
+anoestrous
+anoestru
+anoestrum
+anoestrus
+anoetic
+anofeles
+anofelessen
+anofo
+anogenic
+anogenit
+anogenital
+anogra
+anohi
+anohito
+anoia
+anoicha
+anoil
+anoine
+anoint
+anointed
+anointedst
+anointer
+anointers
+anointes
+anointest
+anointin
+anointing
+anointme
+anointment
+anointments
+anoints
+anoka
+anokata
+anokoro
+anokoto
+anole
+anoles
+anoli
+anolian
+anolik
+anolis
+anolympi
+anolympiad
+anolyte
+anomal
+anomala
+anomalar
+anomalarem
+anomale
+anomalen
+anomaler
+anomalere
+anomalerer
+anomaleres
+anomales
+anomali
+anomali`a
+anomali`stico
+anomalia
+anomalidad
+anomalie
+anomalieen
+anomalien
+anomalies
+anomalif
+anomaliflorous
+anomalip
+anomaliped
+anomalis
+anomalism
+anomalist
+anomalistic
+anomalistical
+anomalistically
+anomaloc
+anomalocephalus
+anomalof
+anomaloflorous
+anomalog
+anomalogonatae
+anomalogonatous
+anomalon
+anomalonomy
+anomalop
+anomalopteryx
+anomalos
+anomaloscope
+anomalot
+anomalotrophy
+anomalou
+anomalous
+anomalously
+anomalousness
+anomalst
+anomalstem
+anomalsten
+anomalster
+anomalur
+anomalure
+anomaluridae
+anomalurus
+anomaly
+anomama
+anomathe
+anomatheca
+anomia
+anomiace
+anomiacea
+anomic
+anomie
+anomies
+anomiida
+anomiidae
+anomite
+anomocar
+anomocarpous
+anomodon
+anomodont
+anomodontia
+anomoean
+anomoeanism
+anomono
+anomophy
+anomophyllous
+anomorho
+anomorhomboid
+anomorhomboidal
+anomphal
+anomphalous
+anomura
+anomural
+anomuran
+anomuro
+anomurou
+anomurous
+anomy
+anon
+anona
+anona`cea
+anona`ceo
+anonadacio`n
+anonadamiento
+anonadar
+anonang
+anoncill
+anoncillo
+anoniem
+anonieme
+anoniemer
+anoniems
+anoniemst
+anonima
+anonime
+anonimi
+anonimia
+anonimit
+anonimiteit
+anonimo
+anonol
+anonychi
+anonychia
+anonym
+anonyma
+anonymat
+anonyme
+anonymem
+anonymement
+anonymer
+anonymes
+anonymi
+anonymit
+anonymitaet
+anonymitet
+anonymiteten
+anonymitetsprinsippet
+anonymities
+anonymity
+anonymou
+anonymous
+anonymously
+anonymousness
+anonyms
+anonymt
+anonymun
+anonymuncule
+anonymus
+anoong
+anoop
+anoopsia
+anoperin
+anoperineal
+anophe`l
+anophe`le
+anophe`les
+anophele
+anopheles
+anopheli
+anophelinae
+anopheline
+anophori
+anophoria
+anophtha
+anophthalmia
+anophthalmos
+anophthalmus
+anophyte
+anopia
+anopisth
+anopisthographic
+anopla
+anoplant
+anoplanthus
+anoploce
+anoplocephalic
+anoplone
+anoplonemertean
+anoplonemertini
+anoploth
+anoplothere
+anoplotheriidae
+anoplotherioid
+anoplotherium
+anoplotheroid
+anoplura
+anopluri
+anopluriform
+anopluro
+anopsia
+anopubic
+anor
+anorak
+anorake
+anoraken
+anorakk
+anorakke
+anorakken
+anorakkl
+anorakklommen
+anorakku
+anoraks
+anorchia
+anorchis
+anorchism
+anorchou
+anorchous
+anorchus
+anordir
+anordna
+anordnen
+anordnend
+anordnendem
+anordnenden
+anordnender
+anordner
+anordnet
+anordnete
+anordnin
+anordning
+anordninger
+anordnun
+anordnung
+anordnungen
+anordnungspla"ne
+anorecta
+anorectal
+anorecti
+anorectic
+anorecto
+anorectous
+anorexia
+anorexias
+anorexy
+anorgana
+anorgani
+anorganic
+anorganisch
+anorganische
+anorganischem
+anorganischen
+anorganischer
+anorganisk
+anorganism
+anorgano
+anorganology
+anoria
+anormal
+anormale
+anormalem
+anormalement
+anormaler
+anormales
+anormali
+anormalidad
+anormality
+anormalmente
+anormaux
+anorogen
+anorogenic
+anorth
+anorthic
+anorthit
+anorthite
+anorthitic
+anorthitite
+anorthoc
+anorthoclase
+anorthog
+anorthographic
+anorthographical
+anorthographically
+anorthography
+anorthop
+anorthophyre
+anorthopia
+anorthos
+anorthoscope
+anorthose
+anorthosite
+anorubun
+anorubuna
+anorza
+anosango
+anosangobari
+anoscope
+anoscopy
+anosia
+anosmati
+anosmatic
+anosmia
+anosmic
+anosphra
+anosphrasia
+anosphre
+anosphresia
+anospina
+anospinal
+anostosi
+anostosis
+anostrac
+anostraca
+anotacio`n
+anotador
+anotadora
+anotar
+anoterit
+anoterite
+another
+anothera
+anotherapplication
+anotherd
+anotherdowntoearth
+anotherk
+anotherkins
+anothers
+anotia
+anoto`mica
+anoto`mico
+anotoki
+anotokor
+anotomi`a
+anotropi
+anotropia
+anotta
+anotto
+anotus
+anou
+anough
+anouk
+anounou
+anour
+anous
+anousaki
+anoushir
+anoushiravan
+anoux
+anova
+anovelada
+anovelado
+anovesic
+anovesical
+anow
+anowake
+anowuru
+anoxemia
+anoxemic
+anoxia
+anoxias
+anoxic
+anoxidat
+anoxidative
+anoxybio
+anoxybiosis
+anoxybiotic
+anoxysco
+anoxyscope
+anoyo
+anoyou
+anp
+anpachi
+anpacken
+anpackend
+anpackende
+anpackenden
+anpackender
+anpackendes
+anpaia
+anpasnin
+anpasning
+anpassa
+anpassba
+anpassbar
+anpassbare
+anpasse
+anpassen
+anpassend
+anpassendem
+anpassenden
+anpassender
+anpassha
+anpasshardware
+anpassni
+anpassningar
+anpassningen
+anpassningstester
+anpassningsutrustning
+anpasst
+anpasste
+anpassun
+anpassung
+anpassungen
+anpassungsa"nderungen
+anpassungsbedingte
+anpassungsfa"higes
+anpassungsfaehig
+anpassungsfaehige
+anpassungsfaehigem
+anpassungsfaehiger
+anpassungsfaehigere
+anpassungsfaehigerem
+anpassungsfaehigerer
+anpassungsfaehigeres
+anpassungsfaehiges
+anpassungsfaehigkeit
+anpassungsfaehigkeiten
+anpassungsfaehigstem
+anpassungsfaehigsten
+anpassungsfaehigster
+anpassungsprogramm
+anpassungsprozess
+anpassungsprozesses
+anpassungsschwierigkeiten
+anpassungssumme
+anpassungsvermoegens
+anpatand
+anpati
+anpea
+anpeilen
+anpeilend
+anpeilende
+anpeilenden
+anpeilender
+anpeilendes
+anpeilte
+anpflanz
+anpflanzen
+anpflanzend
+anpflanzendem
+anpflanzenden
+anpflanzender
+anpflanzung
+anpflanzungen
+anphoux
+anpi
+anpika
+anpo
+anpoebel
+anpoebeln
+anpoebelnde
+anpoebelndem
+anpoebelnden
+anpoebelndes
+anpojouy
+anpou
+anpralle
+anprallen
+anprallend
+anprallende
+anprallenden
+anprallender
+anprallendes
+anpralls
+anprange
+anprangerte
+anprechv
+anprechverzo"gerung
+anpreise
+anpreisen
+anpreisend
+anpreisendem
+anpreisenden
+anpreisender
+anpreist
+anpreisu
+anpreisung
+anpreisungen
+anpressd
+anpressdruck
+anpresse
+anpressen
+anproben
+anprobie
+anprobieren
+anprobierend
+anprobierendem
+anprobierenden
+anprobierender
+anprobiert
+anprobierte
+anprobiertem
+anprobierter
+anprobiertes
+anpu
+anpumpen
+anpumpende
+anpumpendem
+anpumpenden
+anpumpendes
+anpuru
+anq
+anquear
+anqueta
+anquetin
+anquialmendrada
+anquialmendrado
+anquiboyuna
+anquiboyuno
+anquiderribada
+anquiderribado
+anquilosamiento
+anquilosarse
+anquilosis
+anquilostoma
+anquilostomiasis
+anquirredonda
+anquirredondo
+anquiseca
+anquiseco
+anr
+anrakki
+anrakki-
+anraku
+anrakujy
+anrakush
+anrakusi
+anrakuzy
+anraten
+anratend
+anratende
+anratenden
+anratender
+anratendes
+anre
+anrechne
+anrechnen
+anrechnend
+anrechnende
+anrechnenden
+anrechnender
+anrechnendes
+anrechnu
+anrechnung
+anrechnungen
+anrechnungsverfahren
+anrechnungsverordnung
+anrecht
+anrechte
+anrechten
+anrechts
+anrechtskarte
+anredend
+anredende
+anredendem
+anredender
+anredendes
+anredete
+anregen
+anregend
+anregende
+anregendem
+anregender
+anregendes
+anregt
+anregung
+anregungen
+anregungsenergie
+anregungsmitteln
+anregungsmittels
+anreiche
+anreichern
+anreichernd
+anreicherndem
+anreichernden
+anreichernder
+anreicherung
+anreihen
+anreihend
+anreihende
+anreihenden
+anreihender
+anreihendes
+anreise
+anreisen
+anreisend
+anreisende
+anreisendem
+anreisender
+anreisendes
+anreiset
+anreisetermin
+anreisetermine
+anreisetermins
+anreisse
+anreissen
+anreiz
+anreize
+anreizen
+anreizende
+anreizendem
+anreizenden
+anreizendes
+anrennen
+anrennend
+anrennendem
+anrennender
+anrennendes
+anretnin
+anretning
+anretningen
+anrette
+anretter
+anrettet
+anreus
+anri
+anrichte
+anrichten
+anrichtend
+anrichtendem
+anrichtender
+anrichtendes
+anrichtet
+anrief
+anriefen
+anrike
+anrimite
+anrollen
+anrollte
+anrop
+anropa
+anrope
+anropt
+anrpc
+anruechi
+anruechig
+anruechige
+anruechigen
+anruechiger
+anruechigere
+anruechigeren
+anruechigerer
+anruechigeres
+anruechigste
+anruechigstem
+anruechigsten
+anruechigstes
+anruecke
+anruecken
+anrueckend
+anrueckendem
+anrueckenden
+anrueckender
+anrueckt
+anrueckte
+anruehre
+anruehren
+anruehrend
+anruehrendem
+anruehrenden
+anruehrender
+anruf
+anrufbea
+anrufbeantworter
+anrufe
+anrufen
+anrufend
+anrufende
+anrufenden
+anrufender
+anrufendes
+anruft
+anrufung
+anrufungen
+anrui
+anruisu
+anryuu
+anr}ber
+ans
+ans-igne
+ans-ignet
+ansa
+ansa"ssi
+ansa"ssige
+ansa"ssigen
+ansa"tze
+ansaag
+ansaessi
+ansaessig
+ansaessige
+ansaessigem
+ansaessigen
+ansaessiger
+ansaessiges
+ansaetze
+ansaetzen
+ansag
+ansage
+ansagend
+ansagende
+ansagendem
+ansagender
+ansagendes
+ansager
+ansageri
+ansagerinnen
+ansagern
+ansagers
+ansah
+ansakara
+ansamle
+ansamlin
+ansamling
+ansamlingen
+ansamlinger
+ansammel
+ansammeln
+ansammelnd
+ansammelnde
+ansammelnden
+ansammelnder
+ansammelndes
+ansammelt
+ansammlu
+ansammlung
+ansammlungen
+ansanbur
+ansar
+ansara
+ansarera
+ansareri`a
+ansarero
+ansari
+ansarian
+ansarie
+ansarina
+ansarino
+ansaro`n
+ansars
+ansat
+ansate
+ansation
+ansats
+ansatser
+ansatsu
+ansatt
+ansatte
+ansattes
+ansatts
+ansatu
+ansatz
+ansatzpu
+ansatzpunkt
+ansatzpunkte
+ansatzpunkten
+ansatzst
+ansatzstueck
+ansatzstuecke
+ansatzstuecken
+ansaugen
+ansaugend
+ansaugende
+ansaugenden
+ansaugender
+ansaugendes
+ansbach
+ansbach-
+ansbach-emh1
+ansbach-ignet
+anschaff
+anschaffend
+anschaffende
+anschaffendem
+anschaffender
+anschaffendes
+anschafft
+anschaffung
+anschaffungen
+anschaffungsdarlehen
+anschaffungskosten
+anschaffungspreis
+anschaffungspreise
+anschaffungspreises
+anschaffungswert
+anschaffungswerte
+anschaffungswertes
+anschalt
+anschalten
+anschaltende
+anschaltendem
+anschaltenden
+anschaltendes
+anschaltete
+anschaue
+anschauen
+anschauende
+anschauendem
+anschauenden
+anschauendes
+anschaul
+anschaulich
+anschauliche
+anschaulichen
+anschaulicher
+anschaulichere
+anschaulicheren
+anschaulicherer
+anschaulicheres
+anschaulichkeit
+anschaulichste
+anschaulichstem
+anschaulichsten
+anschaulichstes
+anschaut
+anschaute
+anschauu
+anschauungen
+anschauungsformen
+anschauungsmaterial
+anschauungsmaterials
+anschauungsunterricht
+anschauungsunterrichtes
+anschauungsweisen
+anschein
+anscheinend
+anscheinende
+anscheinendem
+anscheinender
+anscheinendes
+anscheins
+anschich
+anschichten
+anschichtende
+anschichtendem
+anschichtenden
+anschichtendes
+anschick
+anschicken
+anschickend
+anschickendem
+anschickenden
+anschickender
+anschickt
+anschickte
+anschies
+anschiessen
+anschiessende
+anschiessendem
+anschiessenden
+anschiessendes
+anschlae
+anschlaege
+anschlaegen
+anschlaegt
+anschlag
+anschlagbrett
+anschlagbrettes
+anschlagen
+anschlagende
+anschlagendem
+anschlagenden
+anschlagendes
+anschlages
+anschlagkontrolle
+anschlagmaschine
+anschlagsaeule
+anschlagsaeulen
+anschlagzettel
+anschlagzetteln
+anschlagzettels
+anschlie
+anschliessbar
+anschliessbare
+anschliessbaren
+anschliessen
+anschliessend
+anschliessende
+anschliessender
+anschliesst
+anschlos
+anschloss
+anschlu"
+anschlu"sse
+anschlu"ssen
+anschlue
+anschluessen
+anschlug
+anschlus
+anschluss
+anschlussadapter
+anschlussarten
+anschlussbelegung
+anschlussblock
+anschlussbuchungen
+anschlussdaten
+anschlussdose
+anschlussdra"hte
+anschlussdra"hten
+anschlussersuchen
+anschlusses
+anschlussfehler
+anschlussforderung
+anschlussgleis
+anschlusskabel
+anschlusskabeln
+anschlusskabels
+anschlusskarte
+anschlussklemme
+anschlussleiste
+anschlussleitungen
+anschlusslinie
+anschlusslinien
+anschlussmo"glichkeit
+anschlussmo"glichkeiten
+anschlussmodus
+anschlussort
+anschlussplan
+anschlussplatine
+anschlussrohr
+anschlussschrank
+anschlussspannungen
+anschlussstation
+anschlussstationen
+anschlussstecker
+anschlusssteckers
+anschlussverbindungen
+anschlussvereinbarung
+anschlussverteilung
+anschlussvorschlag
+anschlusszeit
+anschlusszuege
+anschlusszug
+anschlusszuges
+anschmie
+anschmiegen
+anschmiegend
+anschmiegendem
+anschmiegenden
+anschmiegender
+anschmiegte
+anschmieren
+anschmierend
+anschmierendem
+anschmierenden
+anschmierender
+anschnal
+anschnallen
+anschnallend
+anschnallende
+anschnallenden
+anschnallender
+anschnallendes
+anschnallgurte
+anschnalzen
+anschnau
+anschnauzend
+anschnauzende
+anschnauzendem
+anschnauzender
+anschnauzendes
+anschnei
+anschneide
+anschneidend
+anschneidende
+anschneidendem
+anschneidender
+anschneidendes
+anschnel
+anschnellen
+anschnit
+anschnitt
+anschnitten
+anschnittes
+anschrau
+anschrauben
+anschraubende
+anschraubendem
+anschraubenden
+anschraubendes
+anschrei
+anschreibekredite
+anschreiben
+anschreibend
+anschreibendem
+anschreibenden
+anschreibender
+anschreibt
+anschreien
+anschreiend
+anschreiendem
+anschreienden
+anschreiender
+anschrif
+anschrift
+anschriften
+anschu
+anschuld
+anschuldigen
+anschuldigend
+anschuldigende
+anschuldigenden
+anschuldigender
+anschuldigendes
+anschuldigung
+anschuldigungen
+anschwae
+anschwaerzend
+anschwaerzende
+anschwaerzendem
+anschwaerzender
+anschwaerzendes
+anschwei
+anschweissen
+anschweissende
+anschweissendem
+anschweissenden
+anschweissendes
+anschwel
+anschwellen
+anschwellend
+anschwellendem
+anschwellenden
+anschwellender
+anschwem
+anschwemmen
+anschwemmend
+anschwemmende
+anschwemmenden
+anschwemmender
+anschwemmendes
+anschwin
+anschwindelnd
+anschwindelnde
+anschwindelndem
+anschwindelnder
+anschwindelndes
+anscombe
+anse
+ansea`tica
+ansea`tico
+ansee
+anseelig
+anseelige
+anseelse
+anseelsen
+ansees
+ansehe
+ansehen
+ansehend
+ansehende
+ansehendem
+ansehender
+ansehendes
+ansehnli
+ansehnlich
+ansehnlichem
+ansehnlichen
+ansehnlicher
+ansehnlicherem
+ansehnlicheren
+ansehnlicherer
+ansehnliches
+ansehnlichste
+ansehnlichstem
+ansehnlichster
+ansehnlichstes
+ansehung
+ansei
+anseiji
+anseilen
+anseilende
+anseilendem
+anseilenden
+anseilendes
+anseis
+ansel
+anselara
+anselaraye
+anself
+anselig
+anselige
+ansell
+anselm
+anselma
+anselme
+anselmi
+anselmia
+anselmian
+anselmo
+ansengen
+ansenlig
+anser
+anserate
+anserated
+anseres
+anserifo
+anseriformes
+anserina
+anserinae
+anserine
+anserma
+anserna
+anserous
+anses
+anset
+ansett
+ansette
+ansettel
+ansettelse
+ansettelsen
+ansettelsene
+ansettelser
+ansettelsespolitikk
+ansettelsesprosedyren
+ansettelsesvilk}r
+ansettelsesvilk}rene
+ansetter
+ansettes
+ansetzen
+ansetzende
+ansetzendem
+ansetzenden
+ansetzendes
+ansetzt
+ansetzte
+anshel
+anshin
+anshinka
+anshinku
+anshinri
+anshins
+anshinya
+anshisou
+anshitsu
+anshitu
+anshou
+anshouba
+anshoubu
+anshouka
+anshuenk
+anshuenkuan
+anshutsu
+anshutu
+ansi
+ansi`
+ansia
+ansiaansiadamente
+ansiadamente
+ansiar
+ansicht
+ansichte
+ansichten
+ansichts
+ansichtskarte
+ansichtskarten
+ansichtssache
+ansichtssendung
+ansichtssendungen
+ansie
+ansiedad
+ansiedel
+ansiedeln
+ansiedelnd
+ansiedelnde
+ansiedelnden
+ansiedelnder
+ansiedelndes
+ansiedle
+ansiedler
+ansiedlers
+ansiedlu
+ansiedlung
+ansiedlungen
+ansieht
+ansienni
+ansiennitet
+ansienniteten
+ansieta
+ansig
+ansigt
+ansigter
+ansigtet
+ansikt
+ansikte
+ansikter
+ansiktet
+ansikts
+ansiktsd
+ansiktsdrag
+ansiktsf
+ansiktsfarge
+ansiktsl
+ansiktsl|ftning
+ansiktsm
+ansiktsmaske
+ansiktst
+ansiktstrekk
+ansiktsu
+ansiktsuttrykket
+ansimesmo
+ansimismo
+ansin
+ansina
+ansinkan
+ansinkud
+ansinnen
+ansinrit
+ansins
+ansinyak
+ansio`n
+ansiosa
+ansiosam
+ansiosamente
+ansiose
+ansiosi
+ansiosidad
+ansioso
+ansisouc
+ansisout
+ansita
+ansitsu
+ansitu
+ansjos
+ansjosbo
+ansjosboks
+ansjosen
+ansjovis
+ansjovissen
+ansjovisvangst
+anskaffa
+anskaffe
+anskaffede
+anskaffelse
+anskaffelsen
+anskaffelsespris
+anskaffer
+anskaffes
+anskaffet
+anskaffn
+anskaffning
+anskaffningar
+anskreve
+anskreven
+anskrevet
+anskrevn
+anskrevne
+anskrik
+anskue
+anskueli
+anskuelig
+anskueliggjort
+anskueliggj|re
+anskueliggj|relse
+anskueligg|re
+anskueligg|res
+anskuels
+anskuelse
+anskuelsesundervisning
+anskuelsesundervisninga
+anskuer
+ansla
+anslaa
+anslaar
+anslag
+anslagen
+anslagene
+anslaget
+anslagit
+anslagsv
+anslagsvis
+anslagsvise
+anslar
+ansley
+anslo
+ansloet
+anslog
+anslot
+anslut
+ansluta
+anslutit
+anslutna
+anslutni
+anslutning
+anslutningarna
+anslutte
+ansluttet
+ansl|t
+ansl}
+ansl}et
+ansl}r
+ansl}s
+ansl}tt
+ansoeka
+ansoekan
+ansoekni
+ansoekning
+ansoekningar
+ansoka
+ansokan
+ansoknin
+ansokning
+ansokningar
+ansoku
+ansokubi
+ansokuni
+ansols
+anson
+ansonder
+ansonderndem
+ansonia
+ansonste
+ansonsten
+ansonvil
+ansonville
+ansorger
+ansorozi
+ansotana
+ansotano
+anspach
+anspanne
+anspannen
+anspannende
+anspannendem
+anspannenden
+anspannendes
+anspannu
+anspannung
+anspannungen
+anspeien
+anspeiend
+anspeiendem
+anspeienden
+anspeiender
+anspela
+anspelni
+anspelningar
+anspenne
+anspennelse
+anspent
+anspente
+anspessa
+anspessade
+anspiele
+anspielen
+anspielend
+anspielende
+anspielenden
+anspielender
+anspielendes
+anspielu
+anspielung
+anspinne
+anspinnen
+anspinnend
+anspinnende
+anspinnenden
+anspinnender
+anspinnendes
+anspitze
+anspitzend
+anspitzende
+anspitzendem
+anspitzender
+anspitzendes
+anspore
+ansporel
+ansporelse
+ansporet
+ansporn
+ansporne
+anspornen
+anspornende
+anspornendem
+anspornenden
+anspornendes
+ansporns
+anspornt
+anspraak
+ansprach
+ansprache
+ansprachen
+ansprak
+ansprech
+ansprechbar
+ansprechbarer
+ansprechen
+ansprechende
+ansprechendem
+ansprechenden
+ansprechendes
+ansprechendste
+ansprechho"he
+ansprechpartner
+ansprechzeit
+ansprich
+anspricht
+anspring
+anspringend
+anspringende
+anspringendem
+anspringender
+anspringendes
+anspringt
+anspritz
+anspritzend
+anspritzende
+anspritzendem
+anspritzender
+anspritzendes
+anspru"c
+anspru"che
+anspru"chen
+anspruch
+anspruchsberechtigt
+anspruchsberechtigtem
+anspruchsberechtigten
+anspruchsberechtigter
+anspruchsberechtigung
+anspruchslos
+anspruchslose
+anspruchslosem
+anspruchsloser
+anspruchslosere
+anspruchsloserem
+anspruchsloserer
+anspruchsloseres
+anspruchsloses
+anspruchslosestem
+anspruchslosesten
+anspruchslosester
+anspruchslosigkeit
+anspruchslosigkeiten
+anspruchsvoll
+anspruchsvolle
+anspruchsvollem
+anspruchsvoller
+anspruchsvollere
+anspruchsvollerem
+anspruchsvolleren
+anspruchsvollerer
+anspruchsvolleres
+anspruchsvolles
+anspruchsvollstem
+anspruchsvollsten
+anspruchsvollster
+anspruec
+ansprueche
+anspr}k
+anspucke
+anspucken
+anspuckend
+anspuckende
+anspuckenden
+anspuckender
+anspuckendes
+anspuele
+anspuelend
+anspuelende
+anspuelendem
+anspuelender
+anspuelendes
+anssi
+ansta
+anstaa
+anstache
+anstacheln
+anstachelnde
+anstachelndem
+anstachelnden
+anstachelndes
+anstachelt
+anstaell
+anstaella
+anstaelld
+anstaellda
+anstaellningsdatum
+anstaellningskategori
+anstaellningsnr
+anstaellningsnummer
+anstaellningsnumret
+anstaellningstyp
+anstaellt
+anstaend
+anstaendige
+anstaendigem
+anstaendigen
+anstaendigere
+anstaendigerem
+anstaendigeren
+anstaendigeres
+anstaendiges
+anstaendigste
+anstaendigsten
+anstaendigster
+anstaendigstes
+anstalla
+anstalld
+anstallda
+anstalln
+anstallningsdatum
+anstallningskategori
+anstallningsnr
+anstallningsnummer
+anstallningsnumret
+anstallningstyp
+anstallt
+anstalt
+anstalte
+anstalten
+anstalth
+anstalthusholdning
+anstaltm
+anstaltmakeri
+anstalts
+anstaltsinsassen
+anstand
+anstande
+anstanden
+anstands
+anstandsdame
+anstandslos
+anstandslose
+anstandslosen
+anstandsloser
+anstandsloses
+anstandsroecke
+anstandsunterricht
+anstarre
+anstarrend
+anstarrende
+anstarrendem
+anstarrender
+anstarrendes
+anstarrt
+anstatt
+anstead
+ansteckb
+ansteckbar
+anstecke
+anstecken
+ansteckend
+ansteckende
+ansteckenden
+ansteckender
+ansteckendes
+ansteckn
+anstecknadel
+ansteckt
+ansteckten
+anstecku
+ansteckung
+ansteckungen
+ansted
+anstehen
+anstehend
+anstehende
+anstehendem
+anstehenden
+anstehender
+ansteht
+ansteige
+ansteigen
+ansteigende
+ansteigendem
+ansteigenden
+ansteigendes
+ansteigt
+anstelle
+anstellen
+anstellend
+anstellende
+anstellendem
+anstellender
+anstellendes
+anstelli
+anstellig
+anstelligem
+anstelligen
+anstelligere
+anstelligeren
+anstelligerer
+anstelligeres
+anstellt
+anstellte
+anstellten
+anstellu
+anstellung
+anstellungen
+anstellungsbedingungen
+anstellungspruefung
+anstellungspruefungen
+anstellungsvertraegen
+anstellungsvertrag
+anstellungsvertrages
+anstendi
+anstendig
+anstendige
+anstendighet
+anstendigheten
+anstendighetens
+anstendigvis
+anstett
+ansteuer
+ansteuerbar
+ansteuerbare
+ansteuerbaren
+ansteuerboard
+ansteuerelektronik
+ansteuerelektroniken
+ansteuerkarte
+ansteuerleitung
+ansteuerlogik
+ansteuern
+ansteuernd
+ansteuernde
+ansteuerndem
+ansteuernder
+ansteuerndes
+ansteuerplatinen
+ansteuerspannung
+ansteuert
+ansteuerte
+ansteuerung
+ansteuerungsleitung
+ansteuerungszeit
+ansteuerversta"rker
+ansteuerzeit
+anstey
+anstice
+anstieg
+anstiege
+anstiegen
+anstiegs
+anstiegszeit
+anstifte
+anstiften
+anstiftend
+anstiftende
+anstiftenden
+anstiftender
+anstiftendes
+anstifterin
+anstifterinnen
+anstiftern
+anstiftu
+anstiftung
+anstiftungen
+anstille
+anstilt
+anstilte
+anstimme
+anstimmen
+anstimmend
+anstimmende
+anstimmenden
+anstimmender
+anstimmendes
+ansto"ss
+ansto"sst
+anstoess
+anstoesse
+anstoessen
+anstoessige
+anstoessigem
+anstoessigen
+anstoessigere
+anstoessigerem
+anstoessigeren
+anstoessigeres
+anstoessiges
+anstoessigste
+anstoessigsten
+anstoessigster
+anstoessigstes
+anstoss
+anstosse
+anstossen
+anstossend
+anstossende
+anstossenden
+anstossender
+anstossendes
+anstraen
+anstraeng
+anstraenga
+anstraengning
+anstraengningar
+anstrahl
+anstrahlen
+anstrahlend
+anstrahlende
+anstrahlenden
+anstrahlender
+anstrahlendes
+anstrang
+anstranga
+anstrangning
+anstrangningar
+anstrebe
+anstrebend
+anstrebende
+anstrebendem
+anstrebender
+anstrebendes
+anstrebt
+anstrebten
+anstreic
+anstreichen
+anstreichend
+anstreichendem
+anstreichenden
+anstreichender
+anstreicher
+anstreichern
+anstreichers
+anstreicht
+anstreng
+anstrenge
+anstrengelse
+anstrengelsen
+anstrengelsene
+anstrengelser
+anstrengen
+anstrengend
+anstrengende
+anstrengendem
+anstrengenden
+anstrengender
+anstrengendste
+anstrenger
+anstrengt
+anstrengte
+anstrengung
+anstrengungen
+anstrich
+anstriche
+anstrichs
+anstrude
+anstruder
+anstruth
+anstruther
+anstryke
+anstr{ng
+anstr{nga
+anstr{ngelser
+anstr{ngning
+anstr{ngningar
+anstr|g
+anstr|k
+anstr|ke
+anstr|ket
+anstuerm
+anstuerme
+anstuermen
+anstuermend
+anstuermende
+anstuermender
+anstuermendes
+ansturm
+ansturms
+ansty
+anst{lla
+anst{lld
+anst{llda
+anst{lln
+anst{llningsdatum
+anst{llningskategori
+anst{llningsnr
+anst{llningsnummer
+anst{llningsnumret
+anst{llningstyp
+anst{llt
+anst|t
+anst|tel
+anst|telig
+anst|tet
+anst|tss
+anst|tsstein
+anst|tssten
+anst}
+ansu
+ansuchen
+ansuchend
+ansuchendem
+ansuchenden
+ansuchender
+ansuini
+ansulate
+ansus
+ansusspe
+ansusspeaking
+ansvar
+ansvara
+ansvaret
+ansvarig
+ansvarige
+ansvarigt
+ansvarli
+ansvarlig
+ansvarlige
+ansvarlighet
+ansvarlighetsloven
+ansvarsb
+ansvarsbevisst
+ansvarsbevisste
+ansvarsf
+ansvarsforhold
+ansvarsforholdet
+ansvarsforsikring
+ansvarsfraskrivelse
+ansvarsfrihet
+ansvarsfuld
+ansvarsfulle
+ansvarsf|lelse
+ansvarsf|lelsen
+ansvarsh
+ansvarshavende
+ansvarsk
+ansvarskjensle
+ansvarsl
+ansvarslaus
+ansvarsl|s
+ansvarsl|shet
+ansvarsl|sheten
+ansvarsl|st
+ansvarsl|yse
+ansvarso
+ansvarsomr}de
+ansvarsomr}dene
+ansvarsomr}der
+answald
+answer
+answerab
+answerability
+answerable
+answerableness
+answerably
+answerd
+answered
+answeredst
+answerer
+answerers
+answeres
+answerest
+answeret
+answereth
+answerin
+answering
+answeringly
+answerle
+answerless
+answerlessly
+answers
+ansyoku
+ansyou
+ansys
+ansyutsu
+ansyutu
+ans{t
+ans{tte
+ans{ttelse
+ans{ttelsen
+ans{ttelsesaftale
+ans{ttelsesaftalen
+ans{ttelsesforholdet
+ans{ttelseskontrakten
+ans{ttelsesnummer
+ans{ttelsesomkostninger
+ans{ttelsesperiode
+ans{ttelsesplaner
+ans{ttelsestid
+ans{ttelsestiden
+ans{ttelsesvilk}r
+ans{ttelses}r
+ans{tter
+ans{ttes
+ans|ge
+ans|ger
+ans|gere
+ans|geren
+ans|gning
+ans|gninger
+ans|ka
+ans|kan
+ans|ke
+ans|ker
+ans|kerl
+ans|kerlandene
+ans|kerlandenes
+ans|kern
+ans|kernasjoner
+ans|knin
+ans|kning
+ans|kningar
+ans|kningen
+ans|kninger
+ans|kningsblankett
+ans|kningsformular
+ans|kt
+ans|kte
+ans}
+ans}g
+ans}s
+ant
+anta
+anta\ada
+anta\azo
+anta\o
+anta\o`n
+anta\ona
+anta`rctica
+anta`rctico
+anta`rtica
+anta`rtico
+antabus
+antacid
+antacids
+antacrid
+antadifo
+antadiform
+antaean
+antaeus
+antag
+antaga
+antagalla
+antagallar
+antage
+antagelig
+antageligt
+antagels
+antagelse
+antagelsen
+antagelsene
+antagelser
+antager
+antages
+antaget
+antagit
+antaglig
+antagligen
+antago`nica
+antago`nico
+antagoni
+antagonique
+antagoniques
+antagonism
+antagonisme
+antagonismes
+antagonismo
+antagonisms
+antagonist
+antagonista
+antagoniste
+antagonisten
+antagonistes
+antagonistic
+antagonistical
+antagonistically
+antagonistiske
+antagonists
+antagonization
+antagonize
+antagonized
+antagonizer
+antagonizes
+antagonizing
+antagony
+antai
+antaimer
+antaimerina
+antaimor
+antaimoro
+antainar
+antaios
+antaisak
+antaisaka
+antaiva
+antakari
+antakarinya
+antakeli
+antakelig
+antakels
+antakelse
+antakelsen
+antakelser
+antakuse
+antal
+antalges
+antalgesic
+antalgol
+antalkal
+antalkali
+antalkaline
+antall
+antallet
+antalote
+antalya
+antambah
+antambahoaka
+antambul
+antambulacral
+antamilla
+antan
+antana
+antanaca
+antanacathartic
+antanacl
+antanaclasis
+antanala
+antanana
+antananarivo
+antanand
+antanandro
+antanas
+antanemi
+antanemic
+antanina
+antanka
+antantar
+antanto
+antanzen
+antapex
+antaphro
+antaphrodisiac
+antaphroditic
+antapoch
+antapocha
+antapodo
+antapodosis
+antapolo
+antapology
+antapopl
+antapoplectic
+antar
+antara
+antarbed
+antarbedi
+antarchi
+antarchism
+antarchist
+antarchistic
+antarchistical
+antarchy
+antarcta
+antarctalia
+antarctalian
+antarcti
+antarctic
+antarctica
+antarctical
+antarctically
+antarctique
+antarctiques
+antarctisch
+antarctische
+antarcto
+antarctogaea
+antarctogaean
+antardro
+antardroy
+antares
+antarkti
+antarktik
+antarktis
+antarktisch
+antarktischen
+antarktisk
+antarktiske
+antaroma
+antarthr
+antarthritic
+antartic
+antartica
+antartid
+antartida
+antarved
+antarvedi
+antas
+antasphy
+antasphyctic
+antaste
+antastel
+antastelse
+antasten
+antastend
+antastendem
+antastenden
+antastender
+antastet
+antasthe
+antasthenic
+antasthm
+antasthmatic
+antat
+antatrop
+antatrophic
+antatsu
+antatt
+antatte
+antatu
+antdom
+ante
+ante'ce'
+ante'ce'dent
+ante'ce'dents
+ante'dil
+ante'diluvien
+ante'diluvienne
+ante'diluviennes
+ante'diluviens
+ante'pos
+ante'poser
+ante'rie
+ante'rieur
+ante'rieure
+ante'rieurement
+ante'rieures
+ante'rieurs
+ante'rio
+ante'riorite'
+anteact
+anteada
+anteado
+anteal
+antealtar
+anteambu
+anteambulate
+anteambulation
+anteanoche
+anteanteanoche
+anteanteayer
+anteantenoche
+anteantier
+anteapi
+anteater
+anteaters
+anteayer
+antebapt
+antebaptismal
+antebath
+antebell
+antebellum
+antebrac
+antebrachial
+antebrachium
+antebrazo
+antebrid
+antebridal
+anteca
+anteca`mara
+antecabi
+antecabinet
+antecaec
+antecaecal
+antecama
+antecapilla
+antecard
+antecardium
+antecave
+antecavern
+anteceda
+antecedaneous
+antecedaneously
+antecede
+anteceded
+antecedence
+antecedencia
+antecedency
+antecedens
+antecedent
+antecedental
+antecedente
+antecedentemente
+antecedenten
+antecedently
+antecedents
+anteceder
+antecedes
+antecedi
+anteceding
+antecesor
+antecesora
+antecess
+antecessor
+antecham
+antechamber
+antechambers
+antechap
+antechapel
+antechin
+antechinomys
+antechoi
+antechoir
+antechoirs
+antechur
+antechurch
+anteckna
+anteckni
+anteckning
+antecla`sica
+antecla`sico
+anteclas
+anteclassical
+anteclos
+antecloset
+anteco
+antecoger
+antecoli
+antecolic
+antecomm
+antecommunion
+antecons
+anteconsonantal
+antecorn
+antecornu
+antecoro
+antecour
+antecourt
+antecoxa
+antecoxal
+antecristo
+antecuarto
+antecubi
+antecubital
+antecurv
+antecurvature
+anted
+antedata
+antedatar
+antedate
+antedated
+antedateer
+antedateerde
+antedateerden
+antedateert
+antedatere
+antedateren
+antedatering
+antedatert
+antedates
+antedati
+antedating
+antedawn
+antedecir
+antedespacho
+antedi`a
+antedicha
+antedicho
+antedilu
+antediluviaal
+antediluviaans
+antediluviaanse
+antediluvial
+antediluviale
+antediluvially
+antediluvian
+antediluviana
+antediluviano
+antedon
+antedoni
+antedonin
+antedors
+antedorsal
+anteed
+antefebr
+antefebrile
+anteferir
+antefirma
+antefix
+antefixa
+antefixal
+anteflec
+anteflected
+anteflex
+anteflexed
+anteflexion
+antefoso
+antefurc
+antefurca
+antefurcal
+antefutu
+antefuture
+antegard
+antegarden
+antegne
+antegnel
+antegnelse
+antegnelsen
+antegnelser
+antegnet
+antegrad
+antegrade
+antehall
+antehist
+antehisto`rica
+antehisto`rico
+antehistoric
+antehuma
+antehuman
+antehypo
+antehypophysis
+antei
+anteido
+anteiglesia
+anteijou
+anteika
+anteikad
+anteikan
+anteiku
+anteikyo
+anteil
+anteile
+anteilen
+anteilig
+anteilige
+anteilma
+anteilmaessig
+anteilmaessige
+anteilmaessigen
+anteilmaessiger
+anteilmaessiges
+anteilna
+anteilnahme
+anteils
+anteilsc
+anteilscheine
+anteilscheinen
+anteilscheines
+anteilsi
+anteilsinhaber
+anteilsm
+anteilsmaessige
+anteilss
+anteilsscheine
+anteilsw
+anteilswert
+anteilum
+anteilumlauf
+anteilwe
+anteilwert
+anteilwertes
+anteing
+anteinit
+anteinitial
+anteisei
+anteisla`mica
+anteisla`mico
+anteiten
+anteizai
+antejent
+antejentacular
+antejo
+antejudi
+antejudiciary
+antejuicio
+antejura
+antejuramentum
+antelabi
+antelabium
+antelacio`n
+antelega
+antelegal
+anteloca
+antelocation
+antelope
+antelopes
+antelopi
+antelopian
+anteluca
+antelucan
+antelucana
+antelucano
+antelude
+antelumi
+anteluminary
+antemano
+antemarg
+antemarginal
+antemari
+antemarital
+antemedi
+antemedial
+antemens
+antemensale
+antemensalet
+antemeri
+antemeridian
+antemeridiana
+antemeridiano
+antemeta
+antemetallic
+antemeti
+antemetic
+antemill
+antemillennial
+anteming
+antemingent
+antemort
+antemortal
+antemortem
+antemostrar
+antemund
+antemundane
+antemura
+antemural
+antemuralla
+antemuro
+anten
+antena
+antenacida
+antenacido
+antenada
+antenado
+antenari
+antenarial
+antenata
+antenatal
+antenatalitial
+antenati
+antenato
+antenave
+antenna
+antennae
+antennal
+antennar
+antennaria
+antennariid
+antennariidae
+antennarius
+antennary
+antennas
+antennat
+antennata
+antennate
+antennba
+antennbar
+antenne
+antennel
+antennelig
+antennelse
+antennelsen
+antennem
+antennemast
+antennemasten
+antennen
+antennentraeger
+antenner
+antennes
+antennet
+antennetilkobling
+antennetr}d
+antenneu
+antenneuttak
+antennif
+antenniferous
+antenniform
+antennul
+antennula
+antennular
+antennulary
+antennule
+antenoche
+antenoda
+antenodal
+antenombre
+antenoon
+antenor
+antenotar
+antent
+antente
+antenumb
+antenumber
+antenupcial
+anteo`n
+anteoccu
+anteoccupation
+anteocul
+anteocular
+anteocupar
+anteojera
+anteojero
+anteojo
+anteoper
+anteopercle
+anteoperculum
+anteorbi
+anteorbital
+antepagar
+antepagm
+antepagmenta
+antepagments
+antepala
+antepalatal
+antepalco
+antepart
+antepartum
+antepasada
+antepasado
+antepasar
+antepasc
+antepaschal
+antepast
+antepatr
+antepatriarchal
+antepechada
+antepechado
+antepecho
+antepect
+antepectoral
+antepectus
+antepend
+antependium
+antepenu
+antepenu`ltima
+antepenu`ltimo
+antepenult
+antepenultima
+antepenultimate
+antepenults
+antephia
+antephialtic
+antepile
+antepileptic
+antepirr
+antepirrhema
+antepone
+anteponendo
+anteponer
+anteporc
+anteporch
+anteport
+anteporta
+anteportada
+anteportico
+anteposar
+anteposi
+anteposicio`n
+anteposition
+antepost
+anteposthumous
+anteposti
+antepran
+anteprandial
+antepred
+antepredicament
+antepredicamental
+antepret
+antepreterit
+antepretonic
+anteproh
+anteprohibition
+antepros
+anteprostate
+anteprostatic
+anteproyecto
+antepuerta
+antepuerto
+antepuesta
+antepuesto
+antepyre
+antepyretic
+antequal
+antequalm
+antequerana
+antequerano
+antequino
+antera
+anterefo
+antereformation
+antereformational
+anteresu
+anteresurrection
+antereth
+anterethic
+anterevo
+anterevolutional
+anterevolutionary
+anteriad
+anterior
+anteriore
+anteriori
+anterioridad
+anteriority
+anteriorly
+anteriormente
+anteriorness
+antero
+anterocl
+anteroclusion
+anterodo
+anterodorsal
+anteroex
+anteroexternal
+anterofi
+anterofixation
+anterofl
+anteroflexion
+anterofr
+anterofrontal
+anterogr
+anterograde
+anteroin
+anteroinferior
+anterointerior
+anterointernal
+anterola
+anterolateral
+anterolaterally
+anterome
+anteromedial
+anteromedian
+anteroom
+anterooms
+anteropa
+anteroparietal
+anteropo
+anteroposterior
+anteroposteriorly
+anteropy
+anteropygal
+anteros
+anterosp
+anterospinal
+anterosu
+anterosuperior
+anterove
+anteroventral
+anteroventrally
+antes
+antesacristi`a
+antesala
+antescri
+antescript
+antese\a
+antesfor
+antesfort
+antesign
+antesignanus
+antesipa
+antesipasjon
+antesipe
+antesipere
+antesipert
+antesiperte
+antespri
+antespring
+antestat
+antestatura
+antestature
+antester
+antesternal
+antesternum
+antesunr
+antesunrise
+antesupe
+antesuperior
+antetemp
+antetemple
+antetemplo
+antetype
+anteva
+antevedimiento
+anteveni
+antevenient
+antevenir
+antever
+antevers
+anteversion
+antevert
+antevi`spera
+antevisa
+anteviso
+antevista
+antevisto
+antevoca
+antevocalic
+antewar
+antfarm
+anthe
+anthea
+anthecol
+anthecological
+anthecologist
+anthecology
+antheia
+anthela
+anthelio
+anthelion
+anthelme
+anthelmi
+anthelmintic
+anthem
+anthema
+anthemed
+anthemen
+anthemene
+anthemia
+anthemid
+anthemideae
+anthemio
+anthemion
+anthemis
+anthems
+anthemwi
+anthemwise
+anthemy
+anther
+antherae
+antheraea
+antheral
+antheric
+anthericum
+antherid
+antheridial
+antheridiophore
+antheridium
+antherif
+antheriferous
+antheriform
+antherle
+antherless
+antherog
+antherogenous
+antheroi
+antheroid
+antheroz
+antherozoid
+antherozoidal
+antherozooid
+antherozooidal
+anthers
+anthesis
+antheste
+anthesteria
+anthesteriac
+anthesterin
+anthesterion
+anthesterol
+anthexim
+antheximeter
+anthia
+anthias
+anthiath
+anthiathia
+anthicid
+anthicidae
+anthidiu
+anthidium
+anthill
+anthills
+anthinae
+anthine
+anthobio
+anthobiology
+anthocar
+anthocarp
+anthocarpous
+anthocep
+anthocephalous
+anthocer
+anthoceros
+anthocerotaceae
+anthocerotales
+anthocerote
+anthochl
+anthochlor
+anthochlorine
+anthocli
+anthoclinium
+anthocya
+anthocyan
+anthocyanidin
+anthocyanin
+anthodiu
+anthodium
+anthoeco
+anthoecological
+anthoecologist
+anthoecology
+anthogen
+anthogenesis
+anthogenetic
+anthogenous
+anthogra
+anthography
+anthoid
+anthokya
+anthokyan
+antholit
+antholite
+antholog
+anthological
+anthologically
+anthologie
+anthologieen
+anthologies
+anthologion
+anthologist
+anthologists
+anthologize
+anthologized
+anthologizes
+anthologizing
+anthology
+antholys
+antholysis
+antholyz
+antholyza
+anthoman
+anthomania
+anthomaniac
+anthomed
+anthomedusae
+anthomedusan
+anthomyi
+anthomyia
+anthomyiid
+anthomyiidae
+anthon
+anthoni
+anthonin
+anthonis
+anthonissen
+anthonom
+anthonomus
+anthony
+anthood
+anthopha
+anthophagous
+anthophi
+anthophila
+anthophile
+anthophilian
+anthophilous
+anthopho
+anthophobia
+anthophora
+anthophore
+anthophoridae
+anthophorous
+anthophy
+anthophyllite
+anthophyllitic
+anthophyta
+anthophyte
+anthorin
+anthorine
+anthosid
+anthosiderite
+anthospe
+anthospermum
+anthotax
+anthotaxis
+anthotaxy
+anthotro
+anthotropic
+anthotropism
+anthoxan
+anthoxanthin
+anthoxanthum
+anthozoa
+anthozoan
+anthozoi
+anthozoic
+anthozoo
+anthozooid
+anthozoon
+anthrace
+anthracemia
+anthracene
+anthraceniferous
+anthraces
+anthrach
+anthrachrysone
+anthraci
+anthracia
+anthracic
+anthraciferous
+anthracin
+anthracite
+anthracites
+anthracitic
+anthracitiferous
+anthracitious
+anthracitism
+anthracitization
+anthracn
+anthracnose
+anthracnosis
+anthraco
+anthracocide
+anthracoid
+anthracolithic
+anthracomancy
+anthracomarti
+anthracomartian
+anthracomartus
+anthracometer
+anthracometric
+anthraconecrosis
+anthraconite
+anthracosaurus
+anthracosis
+anthracothere
+anthracotheriidae
+anthracotherium
+anthracotic
+anthracy
+anthracyl
+anthradi
+anthradiol
+anthradiquinone
+anthrafl
+anthraflavic
+anthraga
+anthragallol
+anthrahy
+anthrahydroquinone
+anthrali
+anthralin
+anthrami
+anthramine
+anthrani
+anthranil
+anthranilate
+anthranilic
+anthrano
+anthranol
+anthranone
+anthranoyl
+anthrany
+anthranyl
+anthraph
+anthraphenone
+anthrapu
+anthrapurpurin
+anthrapy
+anthrapyridine
+anthraqu
+anthraquinol
+anthraquinone
+anthraquinonyl
+anthraru
+anthrarufin
+anthrate
+anthratetrol
+anthrath
+anthrathiophene
+anthratr
+anthratriol
+anthrax
+anthraxo
+anthraxolite
+anthraxy
+anthraxylon
+anthrazi
+anthrazitfeinkohlen
+anthrenu
+anthrenus
+anthribi
+anthribid
+anthribidae
+anthrisc
+anthriscus
+anthroho
+anthrohopobiological
+anthroic
+anthrol
+anthrone
+anthrop
+anthropi
+anthropic
+anthropical
+anthropidae
+anthropo
+anthropobiologist
+anthropobiology
+anthropocentric
+anthropocentrism
+anthropoclimatologist
+anthropoclimatology
+anthropocosmic
+anthropodeoxycholic
+anthropodus
+anthropogenesis
+anthropogenetic
+anthropogenic
+anthropogenist
+anthropogenous
+anthropogeny
+anthropogeographer
+anthropogeographical
+anthropogeography
+anthropoglot
+anthropogony
+anthropography
+anthropoi"de
+anthropoi"des
+anthropoid
+anthropoidal
+anthropoidea
+anthropoidean
+anthropoiden
+anthropoids
+anthropolater
+anthropolatric
+anthropolatry
+anthropolite
+anthropolithic
+anthropolitic
+anthropologe
+anthropologic
+anthropological
+anthropologically
+anthropologie
+anthropologies
+anthropologique
+anthropologiques
+anthropologischen
+anthropologischer
+anthropologist
+anthropologists
+anthropologue
+anthropologues
+anthropology
+anthropomancy
+anthropomantic
+anthropomantist
+anthropome'trie
+anthropome'trique
+anthropome'triques
+anthropometer
+anthropometric
+anthropometrical
+anthropometrically
+anthropometrist
+anthropometry
+anthropomorph
+anthropomorpha
+anthropomorphic
+anthropomorphical
+anthropomorphically
+anthropomorphidae
+anthropomorphism
+anthropomorphisme
+anthropomorphisms
+anthropomorphist
+anthropomorphite
+anthropomorphitic
+anthropomorphitical
+anthropomorphitism
+anthropomorphization
+anthropomorphize
+anthropomorphological
+anthropomorphologically
+anthropomorphology
+anthropomorphosis
+anthropomorphotheist
+anthropomorphous
+anthropomorphously
+anthroponomical
+anthroponomics
+anthroponomist
+anthroponomy
+anthropopathia
+anthropopathic
+anthropopathically
+anthropopathism
+anthropopathite
+anthropopathy
+anthropophage
+anthropophages
+anthropophagi
+anthropophagic
+anthropophagical
+anthropophagie
+anthropophaginian
+anthropophagism
+anthropophagist
+anthropophagistic
+anthropophagite
+anthropophagize
+anthropophagous
+anthropophagously
+anthropophagus
+anthropophagy
+anthropophilous
+anthropophobia
+anthropophuism
+anthropophuistic
+anthropophysiography
+anthropophysite
+anthropopithecus
+anthropopsychic
+anthropopsychism
+anthropos
+anthroposcopy
+anthroposociologist
+anthroposociology
+anthroposomatology
+anthroposophen
+anthroposophical
+anthroposophist
+anthroposophy
+anthropoteleoclogy
+anthropoteleological
+anthropotheism
+anthropotomical
+anthropotomist
+anthropotomy
+anthropotoxin
+anthropozoic
+anthropu
+anthropurgic
+anthroro
+anthroropolith
+anthroxa
+anthroxan
+anthroxanic
+anthryl
+anthryle
+anthrylene
+anthuriu
+anthurium
+anthus
+anthylli
+anthyllis
+anthypop
+anthypophora
+anthypophoretic
+anti
+anti-dui
+anti-duits
+anti-duitse
+anti-duitser
+anti-duitst
+anti-eng
+anti-engels
+anti-engelse
+anti-engelser
+anti-engelst
+anti-fra
+anti-frans
+anti-franse
+anti-franser
+anti-franst
+anti-imp
+anti-impe'rialisme
+anti-impe'rialiste
+anti-impe'rialistes
+anti-inf
+anti-inflammatoire
+anti-inflammatoires
+anti-inflationniste
+anti-inflationnistes
+anti`doto
+anti`fona
+anti`frasis
+anti`gena
+anti`geno
+anti`lope
+anti`poca
+anti`poda
+anti`tesis
+anti`teto
+antia
+antia`cida
+antia`cido
+antiabol
+antiabolitionist
+antiabor
+antiabortion
+antiabra
+antiabrasion
+antiabri
+antiabrin
+antiabso
+antiabsolutist
+antiacid
+antiadia
+antiadiaphorist
+antiadit
+antiaditis
+antiadmi
+antiadministration
+antiae
+antiae'r
+antiae'rien
+antiae'rienne
+antiae'riennes
+antiae'riens
+antiae`rea
+antiae`reo
+antiaest
+antiaesthetic
+antiaforodisiaca
+antiaforodisiaco
+antiager
+antiaggl
+antiagglutinating
+antiagglutinin
+antiaggr
+antiaggression
+antiaggressionist
+antiaggressive
+antiairc
+antiaircraft
+antialbu
+antialbumid
+antialbumin
+antialbumose
+antialco
+antialcoho`lica
+antialcoho`lico
+antialcohol
+antialcoholic
+antialcoholism
+antialcoholist
+antialcoolique
+antialcooliques
+antialcoolisme
+antialdo
+antialdoxime
+antialex
+antialexin
+antialie
+antialien
+antialko
+antialkoholiker
+antialkoholikerinnen
+antialkoholikern
+antialkoholikers
+antiambo
+antiamboceptor
+antiamer
+antiamerikanisch
+antiamerikanische
+antiamerikanischen
+antiamerikansk
+antiamus
+antiamusement
+antiamyl
+antiamylase
+antianap
+antianaphylactogen
+antianaphylaxis
+antianar
+antianarchic
+antianarchist
+antiangu
+antiangular
+antianne
+antiannexation
+antiannexationist
+antianop
+antianopheline
+antianth
+antianthrax
+antianthropocentric
+antianthropomorphism
+antianti
+antiantibody
+antiantidote
+antiantienzyme
+antiantitoxin
+antiapar
+antiapartheid
+antiaphr
+antiaphrodisiac
+antiapht
+antiaphthic
+antiapop
+antiapoplectic
+antiapos
+antiapostle
+antiaqua
+antiaquatic
+antiar
+antiarch
+antiarcha
+antiarchi
+antiarin
+antiaris
+antiaristocrat
+antiarth
+antiarthritic
+antiasce
+antiascetic
+antiasth
+antiasthmatic
+antiastr
+antiastronomical
+antiates
+antiathe
+antiatheism
+antiatheist
+antiatom
+antiatomique
+antiatomiques
+antiaton
+antiatonement
+antiattr
+antiattrition
+antiauth
+antiauthoritarian
+antiauto
+antiautolysin
+antiautoritaeren
+antibaby
+antibabypille
+antibabypillen
+antibacc
+antibacchic
+antibacchius
+antibact
+antibacterial
+antibacteriolytic
+antiball
+antiballooner
+antibalm
+antibank
+antibaquio
+antibasi
+antibasilican
+antibenz
+antibenzaldoxime
+antiberi
+antiberiberin
+antibibl
+antibibliolatry
+antibigo
+antibigotry
+antibili
+antibilious
+antibio`tica
+antibio`tico
+antibion
+antibiont
+antibios
+antibiosis
+antibiot
+antibiotic
+antibiotics
+antibiotika
+antibiotikum
+antibiotikumet
+antibiotikums
+antibiotique
+antibiotiques
+antibish
+antibishop
+antiblas
+antiblastic
+antiblen
+antiblennorrhagic
+antibloc
+antiblock
+antiblue
+antibodi
+antibodies
+antibody
+antibols
+antibolschewistischen
+antiboxi
+antiboxing
+antibrea
+antibreakage
+antibrid
+antibridal
+antibrit
+antibritisch
+antibrom
+antibromic
+antibrou
+antibrouillard
+antibrui
+antibruit
+antibubo
+antibubonic
+antiburg
+antiburgher
+antibusi
+antibusing
+antic
+anticach
+anticachectic
+antical
+anticalc
+anticalcimine
+anticalculous
+anticall
+anticalligraphic
+anticame
+anticamera
+anticamere
+antican
+anticanc
+anticance'reuse
+anticance'reuses
+anticance'reux
+anticancer
+anticano`nica
+anticano`nico
+anticapi
+anticapital
+anticapitalism
+anticapitalist
+anticapitaliste
+anticapitalistes
+anticapitalists
+anticard
+anticardiac
+anticardium
+anticari
+anticariense
+anticarious
+anticarn
+anticarnivorous
+anticass
+anticasseurs
+anticast
+anticaste
+anticata
+anticatalase
+anticatalyst
+anticatalytic
+anticatalyzer
+anticatarrhal
+anticath
+anticathexis
+anticathode
+anticato`lica
+anticato`lico
+anticaus
+anticaustic
+anticeau
+anticeausescu
+anticens
+anticensorship
+anticent
+anticentralization
+anticeph
+anticephalalgic
+anticere
+anticeremonial
+anticeremonialism
+anticeremonialist
+anticham
+antichambre
+antichambreer
+antichambreerde
+antichambreerden
+antichambreert
+antichambreren
+antichambres
+antichar
+antichars
+antiche
+antichea
+anticheater
+antichi
+antichit
+antichita
+antichlo
+antichlor
+antichlorine
+antichloristic
+antichlorotic
+antichol
+anticholagogue
+anticholinergic
+antichor
+antichoromanic
+antichorus
+antichre
+antichresis
+antichretic
+antichri
+antichrist
+antichristian
+antichristianity
+antichristianly
+antichrists
+antichro
+antichrome
+antichronical
+antichronically
+antichronism
+antichth
+antichthon
+antichur
+antichurch
+antichurchian
+antichym
+antichymosin
+anticiclo`n
+anticipa
+anticipacio`n
+anticipada
+anticipadamente
+anticipador
+anticipadora
+anticipai
+anticipaient
+anticipais
+anticipait
+anticipamiento
+anticipano
+anticipant
+anticipante
+anticipar
+anticipare
+anticipata
+anticipatable
+anticipatamente
+anticipate
+anticipated
+anticipates
+anticipati
+anticipatie
+anticipaties
+anticipating
+anticipation
+anticipations
+anticipativamente
+anticipative
+anticipatively
+anticipato
+anticipator
+anticipatorily
+anticipators
+anticipatory
+anticipava
+anticipavi
+anticipavo
+anticipe
+anticipe'
+anticipe'e
+anticipe'es
+anticipe's
+anticipe`rent
+anticipeer
+anticipeerde
+anticipeerden
+anticipeert
+anticipent
+anticiper
+anticipera
+anticiperai
+anticiperaient
+anticiperais
+anticiperait
+anticiperas
+anticiperen
+anticiperez
+anticiperiez
+anticiperions
+anticipero
+anticiperons
+anticiperont
+anticipes
+anticipez
+anticipi
+anticipiez
+anticipino
+anticipions
+anticipo
+anticipons
+anticivi
+anticivic
+anticivism
+anticize
+anticked
+anticker
+antickin
+anticking
+anticlac
+anticlactic
+anticlas
+anticlassical
+anticlassicist
+anticle'
+anticle'rical
+anticle'ricale
+anticle'ricales
+anticle'ricalisme
+anticle'ricaux
+anticlea
+anticler
+anticlergy
+anticlerical
+anticlericalism
+anticlericalismo
+anticlim
+anticlimactic
+anticlimactically
+anticlimax
+anticlimaxen
+anticlimaxes
+anticlin
+anticlinal
+anticline
+anticlines
+anticlinorium
+anticloc
+anticlockwise
+anticlog
+anticlogging
+anticly
+anticnem
+anticnemion
+anticnes
+anticness
+antico
+anticoag
+anticoagulant
+anticoagulante
+anticoagulantes
+anticoagulants
+anticoagulating
+anticoagulation
+anticoagulative
+anticoagulin
+anticogi
+anticogitative
+anticoli
+anticolic
+anticolo
+anticolonialisme
+anticolonialiste
+anticolonialistes
+anticolonist
+anticomb
+anticombination
+anticome
+anticomet
+anticomm
+anticomment
+anticommercial
+anticommunism
+anticommunisme
+anticommunist
+anticommuniste
+anticommunistes
+anticommunists
+anticomp
+anticompetitive
+anticomplement
+anticomplementary
+anticomplex
+anticonc
+anticonceptionist
+anticonceptionnel
+anticonceptionnelle
+anticonceptionnelles
+anticonceptionnels
+anticond
+anticonductor
+anticonf
+anticonfederationist
+anticonformisme
+anticonformist
+anticonformiste
+anticonformistes
+anticons
+anticonscience
+anticonscription
+anticonscriptive
+anticonstitucional
+anticonstitutional
+anticonstitutionalist
+anticonstitutionally
+anticonstitutioneel
+anticonstitutionele
+anticonstitutionnel
+anticonstitutionnelle
+anticonstitutionnellement
+anticonstitutionnelles
+anticonstitutionnels
+anticont
+anticontagion
+anticontagionist
+anticontagious
+anticonv
+anticonventional
+anticonventionalism
+anticonvulsant
+anticonvulsive
+anticor
+anticorn
+anticorp
+anticorps
+anticorr
+anticorrosion
+anticorrosive
+anticorrosives
+anticors
+anticorset
+anticosi
+anticosine
+anticosm
+anticosmetic
+anticoun
+anticouncil
+anticour
+anticourt
+anticourtier
+anticous
+anticove
+anticovenanter
+anticovenanting
+anticre`tica
+anticre`tico
+anticrea
+anticreation
+anticreative
+anticreator
+anticree
+anticreep
+anticreeper
+anticreeping
+anticrep
+anticrepuscular
+anticrepuscule
+anticresis
+anticresista
+anticri`tico
+anticris
+anticrisis
+anticristiana
+anticristiano
+anticristo
+anticrit
+anticritic
+anticritique
+anticroc
+anticrochet
+anticrot
+anticrotalic
+anticryp
+anticryptic
+antics
+anticuada
+anticuado
+anticuar
+anticuario
+anticuerpo
+anticum
+anticycl
+anticyclic
+anticyclone
+anticyclonen
+anticyclones
+anticyclonic
+anticyclonically
+anticycloon
+anticyni
+anticynic
+anticyto
+anticytolysin
+anticytotoxin
+antida`ctilo
+antidact
+antidactyl
+antidanc
+antidancing
+antidata
+antidataient
+antidatais
+antidatait
+antidatant
+antidate
+antidate'
+antidate'e
+antidate'es
+antidate's
+antidate`rent
+antidateer
+antidateerde
+antidateerden
+antidateert
+antidatent
+antidater
+antidatera
+antidaterai
+antidateraient
+antidaterais
+antidaterait
+antidateras
+antidateren
+antidaterez
+antidateriez
+antidaterions
+antidaterons
+antidateront
+antidates
+antidatez
+antidati
+antidatiez
+antidations
+antidato
+antidatons
+antide'm
+antide'mocratique
+antide'mocratiques
+antide'p
+antide'presseur
+antide'presseurs
+antide'r
+antide'rapant
+antide'rapante
+antide'rapantes
+antide'rapants
+antideca
+antidecalogue
+antidefl
+antideflation
+antidemo
+antidemocrat
+antidemocratic
+antidemocratical
+antidemokratisch
+antidemokratische
+antidemokratiske
+antidemoniac
+antidemonstrasjoner
+antidepr
+antidepressant
+antidepressants
+antidepressive
+antideto
+antidetonant
+antidetonating
+antideut
+antideutsche
+antidiab
+antidiabetic
+antidias
+antidiastase
+antidico
+antidicomarian
+antidicomarianite
+antidict
+antidictionary
+antidiff
+antidiffuser
+antidina`stica
+antidina`stico
+antidini
+antidinic
+antidiph
+antidiphte'rique
+antidiphte'riques
+antidiphtheria
+antidiphtheric
+antidiphtherin
+antidiphtheritic
+antidisc
+antidisciplinarian
+antidise
+antidisestablishmentarian
+antidisestablishmentarianism
+antidivi
+antidivine
+antidivo
+antidivorce
+antidogm
+antidogmatic
+antidome
+antidomestic
+antidomi
+antidominican
+antidopa
+antidopage
+antidoral
+antidorc
+antidorcas
+antidoro
+antidoron
+antidota
+antidotal
+antidotally
+antidotario
+antidotary
+antidote
+antidotes
+antidoti
+antidotical
+antidotically
+antidotism
+antidotu
+antidotum
+antidraf
+antidraft
+antidrag
+antidrom
+antidromal
+antidromic
+antidromically
+antidromous
+antidromy
+antidrug
+antiduke
+antidump
+antidumping
+antidyna
+antidynamic
+antidynastic
+antidysc
+antidyscratic
+antidyse
+antidysenteric
+antidysu
+antidysuric
+antieccl
+antiecclesiastic
+antiecclesiastical
+antiedem
+antiedemic
+antieduc
+antieducation
+antieducational
+antiegot
+antiegotism
+antiejac
+antiejaculation
+antiek
+antieke
+antieken
+antieker
+antiekst
+antielec
+antielectron
+antielectrons
+antieme`tica
+antieme`tico
+antiemet
+antiemetic
+antiempe
+antiemperor
+antiempi
+antiempirical
+antiendo
+antiendotoxin
+antiendowment
+antiener
+antienergistic
+antienne
+antiennes
+antienth
+antienthusiastic
+antienvi
+antienvironmentalism
+antienvironmentalist
+antienvironmentalists
+antienzy
+antienzyme
+antienzymic
+antiepic
+antiepicenter
+antiepil
+antiepileptic
+antiepis
+antiepiscopal
+antiepiscopist
+antiepit
+antiepithelial
+antier
+antieros
+antierosion
+antierys
+antierysipelas
+antiescorbu`tica
+antiescorbu`tico
+antiespasmo`dica
+antiespasmo`dico
+antieste
+antieste`tica
+antieste`tico
+antiestetiche
+antietam
+antiethn
+antiethnic
+antieuge
+antieugenic
+antieuro
+antieuropaeischen
+antievan
+antievangelical
+antievol
+antievolution
+antievolutionist
+antiexpa
+antiexpansionist
+antiexpo
+antiexporting
+antiextr
+antiextreme
+antieyes
+antieyestrain
+antiface
+antifach
+antifachistisch
+antifact
+antifaction
+antifame
+antifana
+antifanatic
+antifasc
+antifaschismus
+antifaschisten
+antifascism
+antifascist
+antifascists
+antifat
+antifati
+antifatigue
+antifaz
+antifebr
+antifebrile
+antifede
+antifederal
+antifederalism
+antifederalist
+antifelo
+antifelon
+antifelony
+antifemi
+antifeminism
+antifeminist
+antiferm
+antiferment
+antifermentative
+antifernales
+antiferr
+antiferroelectric
+antifert
+antifertility
+antifertilizer
+antifeud
+antifeudal
+antifeudalism
+antifeudalistischen
+antifibr
+antifibrinolysin
+antifibrinolysis
+antifide
+antifideism
+antifire
+antiflas
+antiflash
+antiflat
+antiflattering
+antiflatulent
+antiflogi`stica
+antiflogi`stico
+antiflux
+antifoam
+antifoaming
+antifogm
+antifogmatic
+antifonal
+antifonario
+antifone
+antifonen
+antifonera
+antifonero
+antifoon
+antifore
+antiforeign
+antiforeignism
+antiform
+antiformant
+antiformin
+antifoul
+antifouler
+antifouling
+antifowl
+antifran
+antifranzoesisch
+antifranzoesische
+antifree
+antifreeze
+antifreezes
+antifreezing
+antifric
+antifriccio`n
+antifriction
+antifrictional
+antifros
+antifrost
+antifund
+antifundamentalist
+antifung
+antifungal
+antifungin
+antiga
+antigala
+antigalactagogue
+antigalactic
+antigamb
+antigambling
+antigang
+antigant
+antiganting
+antigel
+antigen
+antigene
+antigenet
+antigeni
+antigenic
+antigenically
+antigenicity
+antigens
+antighos
+antighostism
+antigigm
+antigigmanic
+antiglar
+antiglare
+antiglis
+antiglisse
+antiglyo
+antiglyoxalase
+antigo
+antigod
+antigone
+antigono
+antigonococcic
+antigonon
+antigonorrheic
+antigonu
+antigonus
+antigori
+antigorite
+antigouv
+antigouvernemental
+antigouvernementale
+antigouvernementales
+antigouvernementaux
+antigove
+antigovernment
+antigraf
+antigraft
+antigram
+antigramatical
+antigrammatical
+antigrap
+antigraph
+antigrav
+antigravitate
+antigravitational
+antigravity
+antigrop
+antigropelos
+antigrow
+antigrowth
+antigua
+antigualla
+antiguamente
+antiguamiento
+antiguan
+antiguar
+antigugg
+antiguggler
+antiguo
+antigu{edad
+antigyro
+antigyrous
+antihala
+antihalation
+antiharm
+antiharmonist
+antihaus
+antihausse
+antihe'r
+antihe'ros
+antihect
+antihectic
+antiheld
+antiheli
+antihelix
+antihelm
+antihelmi`ntica
+antihelmi`ntico
+antihelminthic
+antihelt
+antihelten
+antihema
+antihemagglutinin
+antihemi
+antihemisphere
+antihemo
+antihemoglobin
+antihemolysin
+antihemolytic
+antihemorrhagic
+antihemorrheidal
+antihero
+antiheroes
+antiheroic
+antiheroism
+antihete
+antiheterolysin
+antihidr
+antihidro`pica
+antihidro`pico
+antihidrotic
+antihier
+antihierarchical
+antihierarchist
+antihigie`nica
+antihigie`nico
+antihist
+antihistamine
+antihistamines
+antihistaminic
+antihiste`rica
+antihiste`rico
+antihistorical
+antiholi
+antiholiday
+antihorm
+antihormone
+antihuff
+antihum
+antihuma
+antihuman
+antihumanism
+antihumb
+antihumbuggist
+antihunt
+antihunting
+antihydr
+antihydrophobic
+antihydropic
+antihydropin
+antihygi
+antihygienic
+antihyli
+antihylist
+antihype
+antihypertensive
+antihypertensives
+antihypn
+antihypnotic
+antihypo
+antihypochondriac
+antihypophora
+antihyst
+antihysteric
+antiimpe
+antiimperialist
+antiinfl
+antiinflammatories
+antiinflammatory
+antiinflationaeren
+antiinflationspolitik
+antiinst
+antiinstitutionalist
+antiinstitutionalists
+antiinsu
+antiinsurrectionally
+antiinsurrectionists
+antijuri`dica
+antijuri`dico
+antik
+antikamn
+antikamnia
+antikani
+antikanien
+antikapi
+antikapitalistische
+antikath
+antikathode
+antike
+antikem
+antiken
+antikeno
+antikenotoxin
+antiker
+antiketo
+antiketogen
+antiketogenesis
+antiketogenic
+antikina
+antikinase
+antiking
+antikirc
+antikirchlicher
+antikk
+antikke
+antikken
+antikkens
+antikku
+antiklei
+antikleia
+antikler
+antiklerikaal
+antiklerikaalst
+antiklerikale
+antiklerikalen
+antiklerikaler
+antiklim
+antiklimaks
+antiklimaksen
+antiklimakset
+antiknoc
+antiknock
+antiknocks
+antikoag
+antikoaguleringsmiddel
+antikoer
+antikoerper
+antikomi
+antikomintern-pakt
+antikomm
+antikommunisme
+antikommunistisch
+antikommunistische
+antikommunistischer
+antikonf
+antikonformismus
+antikons
+antikonsepsjon
+antikonsepsjonsmidler
+antikonsepsjonspiller
+antikrie
+antikriegslyrik
+antikris
+antikrist
+antikristen
+antikrit
+antikritiek
+antikt
+antikva
+antikvae
+antikvaen
+antikvar
+antikvarbokhandler
+antikvarbokhandlerforening
+antikvarbokhandlerne
+antikvaren
+antikvariat
+antikvariatet
+antikvarisk
+antikvariske
+antikver
+antikveres
+antikvert
+antikvit
+antikvitet
+antikviteten
+antikviteter
+antikvitets
+antikvitetshandler
+antikvitetsmarked
+antikvitetsmarkedet
+antikwit
+antikwiteit
+antikwiteiten
+antilabo
+antilabor
+antilaborist
+antilacr
+antilacrosse
+antilacrosser
+antilact
+antilactase
+antiland
+antilandwirtschaftliche
+antilaps
+antilapsarian
+antileag
+antileague
+antileba
+antilebanon
+antilega
+antilegalist
+antilego
+antilegomena
+antilemi
+antilemic
+antilens
+antileps
+antilepsis
+antilept
+antileptic
+antileth
+antilethargic
+antileve
+antileveling
+antilia
+antilibe
+antiliberal
+antiliberals
+antilibr
+antilibration
+antilift
+antilipa
+antilipase
+antilipo
+antilipoid
+antiliqu
+antiliquor
+antilith
+antilithic
+antilitu
+antiliturgical
+antiliturgist
+antilla
+antillae
+antillaes
+antillana
+antillano
+antillea
+antillean
+antillen
+antillene
+antilleninsel
+antilles
+antillia
+antilo`gica
+antilo`gico
+antilobi
+antilobium
+antiloca
+antilocapra
+antilocapridae
+antiloch
+antilochus
+antiloem
+antiloemic
+antiloga
+antilogarithm
+antilogarithms
+antilogi
+antilogi`a
+antilogic
+antilogical
+antilogio
+antilogism
+antilogo
+antilogous
+antilogs
+antilogy
+antiloim
+antiloimic
+antilope
+antilopeachtig
+antilopeachtige
+antilopeachtiger
+antilopeachtigst
+antilopen
+antilopes
+antilopi
+antilopinae
+antilott
+antilottery
+antiluet
+antiluetin
+antilync
+antilynching
+antilysi
+antilysin
+antilysis
+antilyss
+antilyssic
+antilyti
+antilytic
+antimaca
+antimacassar
+antimacassars
+antimach
+antimachine
+antimachinery
+antimagi
+antimagistratical
+antimagn
+antimagnetic
+antimaka
+antimakassar
+antimakassars
+antimala
+antimalaria
+antimalarial
+antimall
+antimallein
+antimani
+antimaniac
+antimaniacal
+antimari
+antimarian
+antimark
+antimart
+antimartyr
+antimarx
+antimarxistische
+antimarxistiske
+antimask
+antimasker
+antimaso
+antimason
+antimasonic
+antimasonry
+antimasq
+antimasque
+antimasquer
+antimasquerade
+antimate
+antimaterialist
+antimaterialistic
+antimaterie
+antimatr
+antimatrimonial
+antimatrimonialist
+antimatt
+antimatter
+antimedi
+antimedical
+antimedieval
+antimela
+antimelancholic
+antimell
+antimellin
+antimeni
+antimeningococcic
+antimenn
+antimenneskelige
+antimens
+antimension
+antimensium
+antimeph
+antimephitic
+antimere
+antimerg
+antimerger
+antimeri
+antimeric
+antimerina
+antimerism
+antimeristem
+antimeta
+antimetabole
+antimetathesis
+antimetathetic
+antimete
+antimeter
+antimeth
+antimethod
+antimetr
+antimetrical
+antimetropia
+antimetropic
+antimias
+antimiasmatic
+antimicr
+antimicrobial
+antimicrobic
+antimili
+antimilitarism
+antimilitarisme
+antimilitarist
+antimilitarista
+antimilitariste
+antimilitaristen
+antimilitaristes
+antimilitaristic
+antimilitaristisch
+antimilitaristische
+antimilitaristischer
+antimilitaristischt
+antimilitary
+antimini
+antiministerial
+antiministerialist
+antimins
+antiminsion
+antimisc
+antimiscegenation
+antimiss
+antimissile
+antimission
+antimissionary
+antimissioner
+antimite
+antimites
+antimixi
+antimixing
+antimnem
+antimnemonic
+antimode
+antimodel
+antimodern
+antimon
+antimona
+antimonarchial
+antimonarchic
+antimonarchical
+antimonarchically
+antimonarchicalness
+antimonarchist
+antimonarchists
+antimonate
+antimone
+antimonet
+antimoni
+antimonial
+antimoniate
+antimoniated
+antimonic
+antimonid
+antimonide
+antimonies
+antimoniferous
+antimonio
+antimonious
+antimonite
+antimonium
+antimoniumerts
+antimoniumertsen
+antimoniuret
+antimoniureted
+antimoniuretted
+antimono
+antimonopolist
+antimonopolistic
+antimonopoly
+antimons
+antimonsoon
+antimony
+antimonyl
+antimora
+antimoral
+antimoralism
+antimoralist
+antimosq
+antimosquito
+antimusi
+antimusical
+antimyco
+antimycotic
+antimyth
+antimythic
+antimythical
+antin
+antinarc
+antinarcotic
+antinarcotics
+antinarr
+antinarrative
+antinati
+antinationaal
+antinationaalst
+antinational
+antinationale
+antinationaler
+antinationalist
+antinationalistic
+antinationalists
+antinatu
+antinatural
+antinazi
+antinegr
+antinegro
+antinegroism
+antineol
+antineologian
+antineop
+antineoplastic
+antineph
+antinephritic
+antinepo
+antinepotic
+antineur
+antineuralgic
+antineuritic
+antineurotoxin
+antineut
+antineutral
+antineutrino
+antineutrinos
+antineutron
+antineutrons
+anting
+antings
+antinial
+antinico
+antinicotine
+antinion
+antino`mica
+antino`mico
+antinode
+antinois
+antinoise
+antinome
+antinomi
+antinomia
+antinomian
+antinomianism
+antinomians
+antinomic
+antinomical
+antinomie
+antinomieen
+antinomies
+antinomique
+antinomiques
+antinomist
+antinomy
+antinori
+antinoriega
+antinorm
+antinormal
+antinosa
+antinosarian
+antinous
+antinove
+antinovel
+antinovels
+antinucc
+antinucci
+antinucl
+antinucle'aire
+antinucle'aires
+antinucleon
+antinucleons
+antioch
+antioche
+antiochene
+antiochi
+antiochian
+antiochianism
+antiochu
+antiochus
+antiodon
+antiodont
+antiodontalgic
+antionou
+antionous
+antiope
+antiopel
+antiopelmous
+antiopht
+antiophthalmic
+antiopiu
+antiopium
+antiopiumist
+antiopiumite
+antiopti
+antioptimist
+antioptionist
+antioque\a
+antioque\o
+antioquena
+antioqueno
+antioqui
+antioquia
+antiorga
+antiorgastic
+antiorth
+antiorthodox
+antioxid
+antioxidant
+antioxidants
+antioxidase
+antioxidizer
+antioxidizing
+antioxyg
+antioxygen
+antioxygenation
+antioxygenator
+antioxygenic
+antipa`tica
+antipa`tico
+antipaci
+antipacifist
+antipacifists
+antipalu`dica
+antipalu`dico
+antipapa
+antipapacy
+antipapado
+antipapal
+antipapalist
+antipapi
+antipapism
+antipapisme
+antipapist
+antipapista
+antipapisten
+antipapistical
+antipara
+antiparabema
+antiparagraphe
+antiparagraphic
+antiparallel
+antiparallelogram
+antiparalytic
+antiparalytical
+antiparasite
+antiparasiter
+antiparasites
+antiparasitic
+antiparasitt
+antiparastatitis
+antiparero
+antiparl
+antiparlamentaria
+antiparlamentario
+antiparlementarisme
+antiparliament
+antiparliamental
+antiparliamentarian
+antiparliamentarians
+antiparliamentarist
+antiparliamentary
+antiparras
+antipart
+antiparticle
+antiparticles
+antipas
+antipasc
+antipasch
+antipascha
+antipass
+antipast
+antipasti
+antipastic
+antipasto
+antipastos
+antipath
+antipatharia
+antipatharian
+antipathetic
+antipathetical
+antipathetically
+antipatheticalness
+antipathic
+antipathida
+antipathie
+antipathieen
+antipathiek
+antipathieke
+antipathieker
+antipathiekst
+antipathien
+antipathies
+antipathique
+antipathiques
+antipathist
+antipathize
+antipathogen
+antipathy
+antipati
+antipati`a
+antipatia
+antipatica
+antipatico
+antipatie
+antipatien
+antipatier
+antipatisk
+antipatr
+antipatriarch
+antipatriarchal
+antipatrio`tica
+antipatrio`tico
+antipatriot
+antipatriotic
+antipatriotism
+antipatris
+antipeda
+antipedago`gica
+antipedago`gico
+antipedal
+antipedo
+antipedobaptism
+antipedobaptist
+antipedu
+antipeduncular
+antipell
+antipellagric
+antipendio
+antipeps
+antipepsin
+antipept
+antipeptone
+antiperi
+antiperi`stasis
+antiperiodic
+antiperista`ltica
+antiperista`ltico
+antiperista`tica
+antiperista`tico
+antiperistalsis
+antiperistaltic
+antiperistasis
+antiperistatic
+antiperistatical
+antiperistatically
+antipers
+antipersonnel
+antiperspirant
+antiperspirants
+antipert
+antiperthite
+antipest
+antipestilential
+antipeta
+antipetalous
+antipewi
+antipewism
+antiphag
+antiphagocytic
+antiphar
+antipharisaic
+antipharmic
+antiphas
+antiphase
+antiphil
+antiphilosophic
+antiphilosophical
+antiphlo
+antiphlogistian
+antiphlogistic
+antiphol
+antipholus
+antiphon
+antiphonal
+antiphonally
+antiphonary
+antiphoner
+antiphonetic
+antiphonic
+antiphonical
+antiphonically
+antiphonies
+antiphonon
+antiphons
+antiphony
+antiphra
+antiphrase
+antiphrases
+antiphrasis
+antiphrastic
+antiphrastical
+antiphrastically
+antiphth
+antiphthisic
+antiphthisical
+antiphyl
+antiphylloxeric
+antiphys
+antiphysic
+antiphysical
+antiphysician
+antipire`tico
+antipirina
+antiplag
+antiplague
+antiplan
+antiplanet
+antiplas
+antiplastic
+antiplat
+antiplatelet
+antiplei
+antipleion
+antiplen
+antiplenist
+antiplet
+antiplethoric
+antipleu
+antipleuritic
+antiplur
+antipluralistisk
+antiplurality
+antipneu
+antipneumococcic
+antipocar
+antipod
+antipoda
+antipodagric
+antipodagron
+antipodal
+antipode
+antipodean
+antipodeans
+antipoden
+antipodes
+antipodi
+antipodia
+antipodic
+antipodio
+antipodism
+antipodist
+antipoe`tica
+antipoe`tico
+antipoet
+antipoetic
+antipoin
+antipoints
+antipois
+antipoison
+antipola
+antipolar
+antipole
+antipolemist
+antipoles
+antipoli
+antipoliomye'litique
+antipoliomye'litiques
+antipolitical
+antipoll
+antipollution
+antipoln
+antipolnischen
+antipolo
+antipoly
+antipolygamy
+antipolyneuritic
+antipontificado
+antipool
+antipooling
+antipope
+antipopery
+antipopes
+antipopu
+antipopular
+antipopulationist
+antiport
+antiportable
+antiposi
+antiposition
+antipove
+antipoverty
+antippp
+antiprag
+antipragmatic
+antipragmatist
+antiprec
+antiprecipitin
+antipred
+antipredeterminant
+antiprel
+antiprelate
+antiprelatic
+antiprelatist
+antiprep
+antipreparedness
+antipres
+antiprestidigitation
+antiprie
+antipriest
+antipriestcraft
+antiprim
+antiprime
+antiprimer
+antipriming
+antiprin
+antiprinciple
+antipris
+antiprism
+antiprod
+antiproductionist
+antiprof
+antiprofiteering
+antiproh
+antiprohibition
+antiprohibitionist
+antiproj
+antiprojectivity
+antiprop
+antiprophet
+antipros
+antiprosopon
+antiprostate
+antiprostatic
+antiprot
+antiprotease
+antiproteolysis
+antiproton
+antiprotons
+antiprotozoal
+antiprud
+antiprudential
+antiprur
+antipruritic
+antipsal
+antipsalmist
+antipsor
+antipsoric
+antiptos
+antiptosis
+antipu`trida
+antipu`trido
+antipudi
+antipudic
+antipuri
+antipuritan
+antiputr
+antiputrefaction
+antiputrefactive
+antiputrescent
+antiputrid
+antipyic
+antipyon
+antipyonin
+antipyre
+antipyresis
+antipyretic
+antipyretics
+antipyri
+antipyrine
+antipyro
+antipyrotic
+antipyry
+antipyryl
+antiqua
+antiquaa
+antiquaar
+antiquaars
+antiquai
+antiquaille
+antiquailles
+antiquair
+antiquaire
+antiquaires
+antiquairs
+antiquar
+antiquare
+antiquaren
+antiquari
+antiquariaat
+antiquarian
+antiquarianism
+antiquarianize
+antiquarianly
+antiquarians
+antiquariat
+antiquariate
+antiquariaten
+antiquariatskatalog
+antiquariatskataloge
+antiquariatslisten
+antiquaries
+antiquario
+antiquarisch
+antiquarische
+antiquarischen
+antiquarischer
+antiquarisches
+antiquarism
+antiquars
+antiquartan
+antiquary
+antiquat
+antiquate
+antiquated
+antiquatedness
+antiquates
+antiquating
+antiquation
+antique
+antiqued
+antiquel
+antiquely
+antiquen
+antiqueness
+antiquer
+antiquers
+antiques
+antiqui`sima
+antiqui`simo
+antiquie
+antiquierten
+antiquierter
+antiquin
+antiquing
+antiquis
+antiquismo
+antiquist
+antiquit
+antiquitaet
+antiquitaeten
+antiquitaetengeschaeft
+antiquitaetenhaendler
+antiquitaetenhaendlern
+antiquitaetenladen
+antiquitaetenladens
+antiquitaetenlaeden
+antiquitarian
+antiquite'
+antiquite's
+antiquiteit
+antiquiteiten
+antiquities
+antiquity
+antirabi
+antirabic
+antirabies
+antirace
+antiracemate
+antiracer
+antirach
+antirachitic
+antirachitically
+antirachitischer
+antiraci
+antiracing
+antiradi
+antiradiating
+antiradiation
+antiradical
+antiradicals
+antirail
+antirailwayist
+antirake
+antirakett
+antirakettforsvar
+antirati
+antirational
+antirationalism
+antirationalist
+antirationalistic
+antiratt
+antirattler
+antire'g
+antire'glementaire
+antire'glementaires
+antireac
+antireactive
+antireal
+antirealism
+antirealistic
+antireba
+antirebating
+antirecr
+antirecruiting
+antired
+antirede
+antiredeposition
+antiredu
+antireducer
+antirefo
+antireform
+antireformer
+antireforming
+antireformist
+antiregi
+antiregime
+antireli
+antireligieuse
+antireligieuses
+antireligieux
+antireligion
+antireligious
+antiremo
+antiremonstrant
+antirenn
+antirennet
+antirennin
+antirent
+antirenter
+antirentism
+antirepu
+antirepublican
+antirese
+antireservationist
+antireso
+antiresonance
+antiresonator
+antirest
+antirestoration
+antireti
+antireticular
+antirevi
+antirevisionist
+antirevo
+antirevolutionair
+antirevolutionairder
+antirevolutionaire
+antirevolutionairen
+antirevolutionairst
+antirevolutionaries
+antirevolutionary
+antirevolutionist
+antirheu
+antirheumatic
+antirici
+antiricin
+antirick
+antirickets
+antiride
+antirides
+antirigi
+antiriginya
+antiritu
+antiritual
+antiritualistic
+antirobi
+antirobin
+antiroma
+antiroman
+antiromance
+antiromantic
+antiromanticism
+antiroui
+antirouille
+antiroya
+antiroyal
+antiroyalist
+antirra`bica
+antirra`bico
+antirreglamentaria
+antirreglamentario
+antirreligiosa
+antirreligioso
+antirreuma`tica
+antirreuma`tico
+antirrhi
+antirrhinum
+antirumo
+antirumor
+antirun
+antirust
+antis
+antisace
+antisacerdotal
+antisacerdotalist
+antisalo
+antisaloon
+antisalooner
+antisate
+antisatellitenwaffen
+antisava
+antisavage
+antiscab
+antiscabious
+antiscal
+antiscale
+antischo
+antischolastic
+antischool
+antiscia
+antiscians
+antiscie
+antiscientific
+antiscio
+antiscion
+antiscol
+antiscolic
+antiscor
+antiscorbutic
+antiscorbutical
+antiscri
+antiscriptural
+antiscro
+antiscrofulous
+antise'm
+antise'mite
+antise'mites
+antise'mitisme
+antise`tica
+antise`tico
+antiseis
+antiseismic
+antisele
+antiselene
+antisemi
+antisemiet
+antisemieten
+antisemit
+antisemite
+antisemiten
+antisemitic
+antisemitisch
+antisemitische
+antisemitischen
+antisemitischer
+antisemitischt
+antisemitism
+antisemitisme
+antisemitismus
+antisemitsiches
+antisemitt
+antisemitten
+antisemittisk
+antisemittisme
+antisemittismen
+antisens
+antisensitizer
+antisensuous
+antisensuousness
+antisepa
+antisepalous
+antiseps
+antisepsia
+antisepsie
+antisepsin
+antisepsis
+antisept
+antiseptic
+antiseptical
+antiseptically
+antisepticism
+antisepticist
+antisepticize
+antisepticized
+antisepticizing
+antiseptics
+antiseption
+antiseptique
+antiseptiques
+antiseptisch
+antiseptische
+antiseptisk
+antiseptize
+antisera
+antiseru
+antiserum
+antiserums
+antiship
+antishipping
+antisi
+antisial
+antisialagogue
+antisialic
+antisicc
+antisiccative
+antiside
+antisideric
+antisifili`tica
+antisifili`tico
+antisilv
+antisilverite
+antisimo
+antisimoniacal
+antisine
+antisipe
+antisiperte
+antisiph
+antisiphon
+antisiphonal
+antiskep
+antiskeptical
+antiskid
+antiskidding
+antislav
+antislavery
+antislaveryism
+antislic
+antislickens
+antislip
+antismog
+antismok
+antismoking
+antisnap
+antisnapper
+antisoci
+antisocial
+antisociale
+antisociales
+antisocialist
+antisocialistic
+antisocialistically
+antisociality
+antisocially
+antisociaux
+antisola
+antisolar
+antisoph
+antisophist
+antisopo
+antisoporific
+antisovi
+antisoviet
+antisowj
+antisowjetische
+antisozi
+antisozialer
+antisozialistische
+antispac
+antispace
+antispad
+antispadix
+antispas
+antispasis
+antispasmodic
+antispasmodics
+antispast
+antispastic
+antispasto
+antispec
+antispectroscopic
+antisper
+antispermotoxin
+antispir
+antispiritual
+antispirochetic
+antispla
+antisplasher
+antisple
+antisplenetic
+antispli
+antisplitting
+antispre
+antispreader
+antispreading
+antisqua
+antisquama
+antisquatting
+antistad
+antistadholder
+antistadholderian
+antistal
+antistalling
+antistap
+antistaphylococcic
+antistar
+antistat
+antistatbehandling
+antistate
+antistatischem
+antistatisk
+antistatiske
+antistatism
+antistatist
+antistea
+antisteapsin
+antister
+antisterility
+antistes
+antistim
+antistimulant
+antistoc
+antistock
+antistof
+antistoff
+antistre
+antistreptococcal
+antistreptococcic
+antistreptococcin
+antistreptococcus
+antistri
+antistrike
+antistro
+antistrofa
+antistrophal
+antistrophe
+antistrophic
+antistrophically
+antistrophize
+antistrophon
+antistru
+antistrumatic
+antistrumous
+antisubm
+antisubmarine
+antisubs
+antisubstance
+antisudo
+antisudoral
+antisudorific
+antisuff
+antisuffrage
+antisuffragist
+antisun
+antisupe
+antisupernaturalism
+antisupernaturalist
+antisurp
+antisurplician
+antisymm
+antisymmetric
+antisymmetrical
+antisymmetry
+antisynd
+antisyndicalism
+antisyndicalist
+antisyno
+antisynod
+antisyph
+antisyphilitic
+antitabe
+antitabetic
+antitabl
+antitabloid
+antitang
+antitangent
+antitank
+antitanque
+antitarn
+antitarnish
+antitart
+antitartaric
+antitax
+antite`tica
+antite`tico
+antitech
+antitechnischen
+antiteet
+antiteetotalism
+antitegu
+antitegula
+antitemp
+antitemperance
+antitesi
+antiteta
+antitetanic
+antitetanolysin
+antithal
+antithalian
+antithe'
+antithe'tique
+antithe'tiques
+antithe`
+antithe`se
+antithe`ses
+antithef
+antitheft
+antithei
+antitheism
+antitheist
+antitheistic
+antitheistical
+antitheistically
+antithen
+antithenar
+antitheo
+antitheologian
+antitheological
+antither
+antithermic
+antithermin
+antithes
+antithese
+antithesen
+antitheses
+antithesis
+antithesism
+antithesize
+antithet
+antithetic
+antithetical
+antithetically
+antithetics
+antitheticvariates
+antithro
+antithrombic
+antithrombin
+antithyr
+antithyroid
+antitint
+antitintinnabularian
+antitoba
+antitobacco
+antitobacconal
+antitobacconist
+antitoni
+antitonic
+antitorp
+antitorpedo
+antitoxi
+antitoxic
+antitoxin
+antitoxina
+antitoxine
+antitoxinen
+antitoxins
+antitrad
+antitrade
+antitrades
+antitraditional
+antitrag
+antitragal
+antitragic
+antitragicus
+antitrago
+antitragus
+antitrinitaria
+antitrinitario
+antitris
+antitrismus
+antitroc
+antitrochanter
+antitrop
+antitropal
+antitrope
+antitropic
+antitropical
+antitropous
+antitropy
+antitrus
+antitrust
+antitrustlov
+antitryp
+antitrypsin
+antitryptic
+antitube
+antituberculeuse
+antituberculeuses
+antituberculeux
+antituberculin
+antituberculosa
+antituberculosis
+antituberculoso
+antituberculotic
+antituberculous
+antiturn
+antiturnpikeism
+antituss
+antitussive
+antitwil
+antitwilight
+antitypa
+antitypal
+antitype
+antityph
+antityphoid
+antitypi
+antitypic
+antitypical
+antitypically
+antitypy
+antityro
+antityrosinase
+antiuati
+antiuating
+antiunio
+antiunion
+antiunionist
+antiurat
+antiuratic
+antiurea
+antiurease
+antiusur
+antiusurious
+antiutil
+antiutilitarian
+antivacc
+antivaccination
+antivaccinationist
+antivaccinator
+antivaccinist
+antivari
+antivariolique
+antivarioliques
+antivariolous
+antivene
+antivene`rea
+antivene`reo
+antivenefic
+antivenereal
+antiveni
+antivenimeuse
+antivenimeuses
+antivenimeux
+antivenin
+antivenins
+antiveno
+antivenom
+antivenomous
+antiverm
+antivermicular
+antivibr
+antivibrating
+antivibrator
+antivibratory
+antivice
+antivira
+antiviral
+antiviru
+antivirus
+antivita
+antivitalist
+antivitalistic
+antivitamin
+antivivi
+antivivisection
+antivivisectionist
+antivivisectionists
+antivol
+antivoli
+antivolition
+antivols
+antiwar
+antiwarl
+antiwarlike
+antiwast
+antiwaste
+antiwedg
+antiwedge
+antiweed
+antiwit
+antixero
+antixerophthalmic
+antizeal
+antizealot
+antizipi
+antizipierend
+antizykl
+antizyklisch
+antizyklische
+antizymi
+antizymic
+antizymo
+antizymotic
+antje
+antkowia
+antkowiak
+antle
+antler
+antlered
+antlerit
+antlerite
+antlerle
+antlerless
+antlers
+antlia
+antliate
+antlid
+antligen
+antlike
+antling
+antlion
+antlions
+antlitz
+antlitze
+antlitzes
+antlueti
+antluetic
+antm
+anto`faga
+anto`fago
+anto`n
+anto`nima
+anto`nimo
+antociana
+antocianina
+antodont
+antodontalgic
+antoeci
+antoecia
+antoecian
+antoecians
+antoerne
+antoernen
+antofaga
+antofagasta
+antoft
+antog
+antoine
+antoine-
+antoine-marie
+antoinet
+antoinette
+antojada
+antojadiza
+antojadizamente
+antojadizo
+antojado
+antojamiento
+antojana
+antojanza
+antojarse
+antojera
+antojo
+antojuelo
+antok
+antoku
+antologi
+antologi`a
+antologia
+antologie
+antologien
+anton
+anton-ph
+anton-phuoc
+antonak
+antonapo
+antonapoulos
+antonare
+antonarelli
+antonchi
+antonchico
+antone
+antonell
+antonella
+antonelli
+antonett
+antonetta
+antoni
+antonia
+antoniana
+antoniano
+antonie
+antonies
+antonieskruid
+antoniet
+antonietta
+antonimia
+antonin
+antonina
+antonini
+antoniniana
+antoniniano
+antoninianus
+antonino
+antoninu
+antoninus
+antonio
+antonios
+antoniou
+antonis
+antonita
+antonito
+antoniu
+antonius
+antoniusbrood
+antoniuskruis
+antoniuskruisen
+antoniusvuur
+antonoma
+antonoma`stica
+antonoma`sticamente
+antonoma`stico
+antonomasia
+antonomastic
+antonomastical
+antonomastically
+antonomasy
+antonopo
+antonopoulos
+antonov
+antonovi
+antonovics
+antonown
+antonowna
+antons
+antonucc
+antonucci
+antonutt
+antonutti
+antony
+antonym
+antonyme
+antonymes
+antonymi
+antonymie
+antonymies
+antonymo
+antonymous
+antonyms
+antonymy
+antor
+antorani
+antorbit
+antorbital
+antorcha
+antorchar
+antorchera
+antorchero
+antori`a
+antosta
+antothij
+antothijah
+antothit
+antothite
+antou
+antoviar
+antowapu
+antozoo
+antproof
+antra
+antra"ge
+antracie
+antraciet
+antracita
+antracosis
+antraeff
+antraeffbar
+antraege
+antraegen
+antraf
+antraffb
+antraffbar
+antrag
+antragen
+antragend
+antragende
+antragendem
+antragender
+antragendes
+antrages
+antragsb
+antragsberechtigte
+antragsf
+antragsformular
+antragsformulare
+antragsformularen
+antragsfrist
+antragst
+antragsteller
+antragstellerin
+antragstellern
+antragstellers
+antragstellung
+antral
+antralgi
+antralgia
+antrasit
+antrasitt
+antraten
+antre
+antrecto
+antrectomy
+antreffe
+antreffen
+antreffend
+antreibe
+antreiben
+antreibend
+antreibende
+antreibendem
+antreibender
+antreibendes
+antreibt
+antrekk
+antrekke
+antrekket
+antrengelser
+antres
+antreten
+antretend
+antretende
+antretendem
+antretender
+antretendes
+antri
+antrieb
+antriebe
+antrieben
+antriebs
+antriebsgetriebe
+antriebsmittel
+antriebsmotoren
+antriebsmotors
+antriebsra"der
+antriebsrechner
+antriebsschlitten
+antriebsstoerungen
+antriebssystem
+antriebsu"berwachung
+antriebswelle
+antriebszylinder
+antrifft
+antrim
+antrin
+antritis
+antritt
+antritte
+antritten
+antritts
+antrittsball
+antrittsbesuch
+antrittsgepaeck
+antrittsreden
+antrittstermin
+antrittsvorstellung
+antro
+antrocel
+antrocele
+antronas
+antronasal
+antropho
+antrophore
+antrophose
+antropo`faga
+antropo`fago
+antropo`logo
+antropo`metra
+antropo`nimo
+antropoce`ntrica
+antropoce`ntrico
+antropocentrismo
+antropof
+antropofaag
+antropofagen
+antropofagia
+antropofobi
+antropogra`fica
+antropogra`fico
+antropografi`a
+antropoide
+antropoideo
+antropol
+antropolo`gica
+antropolo`gico
+antropolog
+antropologen
+antropologi
+antropologi`a
+antropologie
+antropologien
+antropologisch
+antropologische
+antropologisk
+antropoloog
+antropom
+antropome`trica
+antropome`trico
+antropometri`a
+antropometriska
+antropomo`rfica
+antropomo`rfico
+antropomorf
+antropomorfa
+antropomorfe
+antropomorfismo
+antropomorfita
+antropomorfo
+antroponi`mica
+antroponi`mico
+antroponimia
+antropos
+antroposof
+antroposofen
+antroposofi
+antroposofie
+antroposofien
+antroposofisk
+antrorse
+antrorsely
+antrosco
+antroscope
+antroscopy
+antrosto
+antrostomus
+antrotom
+antrotome
+antrotomy
+antrotym
+antrotympanic
+antrotympanitis
+antruejada
+antruejar
+antruejo
+antruido
+antrukke
+antrukken
+antrukket
+antrukne
+antrum
+antrums
+antrusti
+antrustion
+antrustionship
+antr{ffb
+antr{ffbar
+ants
+antsahav
+antsahavola
+antship
+antsiran
+antsiranana
+antsukh
+antti
+antto
+anttoni
+antu
+antuan
+antuerpiense
+antum
+antut
+antuviada
+antuviado
+antuviador
+antuviadora
+antuviar
+antuvio
+antuvio`n
+antuzano
+antwerp
+antwerpe
+antwerpen
+antwerpenapanage
+antwerpi
+antwerpia
+antwise
+antwoord
+antwoordcoupon
+antwoordcoupons
+antwoordde
+antwoordden
+antwoorden
+antwoordt
+antwort
+antwortb
+antwortbogen
+antworte
+antworten
+antwortend
+antwortendem
+antwortenden
+antwortender
+antwortet
+antwortete
+antworteten
+antworth
+antwortk
+antwortkarte
+antwortn
+antwortnote
+antworts
+antwortscheine
+antwortspiel
+antwortt
+antworttext
+antworttexte
+antyaku
+antyda
+antydan
+antyde
+antydelser
+antydend
+antydende
+antyder
+antydes
+antydet
+antydnin
+antydning
+antydningar
+antydningen
+antydninger
+antydningsvis
+antytts
+antyuu
+antyuuhi
+antyuumo
+ant{nde
+ant{nder
+ant{ndes
+anu
+anu`bada
+anu`teba
+anua
+anuak
+anual
+anualidad
+anualmente
+anuario
+anub
+anubada
+anubado
+anubarrada
+anubarrado
+anubing
+anubis
+anublada
+anublado
+anublar
+anublo
+anuchit
+anucleat
+anucleate
+anudador
+anudadora
+anudadura
+anudamiento
+anudar
+anuencia
+anuente
+anufo
+anukabie
+anukabiet
+anuki
+anukit
+anula
+anulable
+anulacio`n
+anulador
+anuladora
+anular
+anulativa
+anulativo
+anulete
+anulka
+anuloma
+anulosa
+anuloso
+anum
+anumber1
+anumbero
+anumberone
+anumeracio`n
+anumerar
+anun
+anuncia
+anunciacio`n
+anunciador
+anunciadora
+anunciamiento
+anunciante
+anunciar
+anuncio
+anung
+anunga
+anuo
+anup
+anupa
+anupam
+anupe
+anupecwa
+anupecwayi
+anuperi
+anuphon
+anura
+anuradha
+anuradhapura
+anurag
+anuran
+anurans
+anuresis
+anuretic
+anuria
+anuric
+anuro
+anurous
+anury
+anus
+anuses
+anusim
+anusvara
+anuta
+anutchit
+anutchitcharnchai
+anutrami
+anutraminosa
+anutsu
+anutu
+anv
+anvaend
+anvaenda
+anvaendar
+anvaendarbeskrivning
+anvaendardata
+anvaendardialog
+anvaendardokumentation
+anvaendarefoerening
+anvaendarerfarenheter
+anvaendarfoerening
+anvaendargrupp
+anvaendargrupper
+anvaendarhandbok
+anvaendaridentitet
+anvaendarkravspecifikation
+anvaendarmeny
+anvaendarnamn
+anvaendarsammanslutningar
+anvaendarterminalen
+anvaendarutbildning
+anvaendarutveckling
+anvaendarv{nliga
+anvaendarv{nlighet
+anvaendarv{nligt
+anvaendb
+anvaendbarhetsprognos
+anvaende
+anvaendes
+anvaendn
+anvaendningar
+anvaendningen
+anvaendningsomraade
+anvaendningsomraaden
+anvaendningsteknik
+anvaent
+anvand
+anvanda
+anvandar
+anvandarbeskrivning
+anvandardata
+anvandardialog
+anvandardokumentation
+anvandareforening
+anvandarerfarenheter
+anvandarforening
+anvandargrupp
+anvandargrupper
+anvandarhandbok
+anvandaridentitet
+anvandarkravspecifikation
+anvandarmeny
+anvandarnamn
+anvandarsammanslutningar
+anvandarterminalen
+anvandarutbildning
+anvandarutveckling
+anvandarvanliga
+anvandarvanlighet
+anvandarvanligt
+anvandba
+anvandbarhetsprognos
+anvande
+anvandes
+anvandni
+anvandningar
+anvandningen
+anvandningsomrade
+anvandningsomraden
+anvandningsteknik
+anvant
+anvasser
+anvend
+anvendba
+anvendbar
+anvendbarhet
+anvendbarheten
+anvende
+anvendel
+anvendelig
+anvendelige
+anvendelighed
+anvendeligheden
+anvendelighet
+anvendeligt
+anvendelse
+anvendelsen
+anvendelsens
+anvendelser
+anvendelsesform}l
+anvendelsesmulighed
+anvendelsesmuligheder
+anvendelsesmulighederne
+anvendelsesmulighedernes
+anvendelsesmuligheter
+anvendelsesomr}de
+anvendelsesomr}dene
+anvendelsesomr}der
+anvendelsesomr}derne
+anvendelsesradius
+anvendelsesstedet
+anvendelsestekst
+anvendelsesteksten
+anvendelsestekster
+anvendelsesteksters
+anvender
+anvendes
+anvendt
+anvendte
+anvendtes
+anver
+anvers
+anverso
+anvertra
+anvertrauen
+anvertrauend
+anvertrauende
+anvertrauenden
+anvertrauender
+anvertrauendes
+anvertraute
+anvertrautem
+anvertrauten
+anvertrautes
+anverwan
+anverwandlung
+anverwandte
+anverwandten
+anvik
+anvil
+anviled
+anviling
+anvilled
+anvillin
+anvilling
+anvils
+anvilsmi
+anvilsmith
+anviltop
+anviltops
+anvisa
+anvise
+anviser
+anvises
+anvisier
+anvisiert
+anvisierten
+anvisnin
+anvisning
+anvisningar
+anvisningarna
+anvisningen
+anvisningene
+anvisninger
+anvisningsretten
+anvist
+anvradha
+anvvisni
+anvvisning
+anv{nd
+anv{nda
+anv{ndar
+anv{ndarbeskrivning
+anv{ndardata
+anv{ndardialog
+anv{ndardokumentation
+anv{ndaref|rening
+anv{ndarerfarenheter
+anv{ndarf|rening
+anv{ndargrupp
+anv{ndargrupper
+anv{ndarhandbok
+anv{ndaridentitet
+anv{ndarkravspecifikation
+anv{ndarmeny
+anv{ndarnamn
+anv{ndarsammanslutningar
+anv{ndarterminalen
+anv{ndarutbildning
+anv{ndarutveckling
+anv{ndarv{nliga
+anv{ndarv{nlighet
+anv{ndarv{nligt
+anv{ndba
+anv{ndbarhetsprognos
+anv{nde
+anv{ndes
+anv{ndni
+anv{ndningar
+anv{ndningen
+anv{ndningsomr}de
+anv{ndningsomr}den
+anv{ndningsteknik
+anv{nt
+anw
+anwa"hlb
+anwa"hlbar
+anwa"hlbare
+anwa"hlbaren
+anwa"hle
+anwa"hlen
+anwachse
+anwachsen
+anwachsend
+anwachsendem
+anwachsenden
+anwachsender
+anwaechs
+anwaechst
+anwaehlt
+anwaelte
+anwaelten
+anwaerte
+anwaerter
+anwaerterin
+anwaerters
+anwahl
+anwain
+anwaltes
+anwalts
+anwaltsb
+anwaltsbuero
+anwaltse
+anwaltserfahrungen
+anwaltsg
+anwaltsgebuehren
+anwaltsk
+anwaltskammer
+anwaltskosten
+anwaltsp
+anwaltspraxis
+anwaltsr
+anwaltsrecht
+anwaltss
+anwaltsspiel
+anwaltst
+anwaltstochter
+anwaltsz
+anwaltszwang
+anwandlu
+anwandlung
+anwandlungen
+anwandte
+anwandten
+anwar
+anwarben
+anwarfen
+anwartsc
+anwartschaften
+anwednun
+anwednungsprogramm
+anweisen
+anweisend
+anweisende
+anweisendem
+anweisender
+anweisendes
+anweist
+anweisun
+anweisung
+anweisungen
+anwendba
+anwendbar
+anwendbare
+anwendbarem
+anwendbarer
+anwendbares
+anwendbarkeit
+anwendbarkeiten
+anwendbarkeitsbedingungen
+anwenden
+anwendende
+anwendendem
+anwendenden
+anwendendes
+anwender
+anwenderhinweis
+anwendern
+anwenderoberfla"che
+anwenderproblem
+anwenderprogramm
+anwenderprogramme
+anwenders
+anwenderseite
+anwendersoftware
+anwendet
+anwendug
+anwendugen
+anwendun
+anwendung
+anwendungen
+anwendungsbeispiel
+anwendungsbeispiele
+anwendungsbereich
+anwendungsbeziehung
+anwendungsexperten
+anwendungsfeld
+anwendungsfolie
+anwendungsfreundlichen
+anwendungsgebiete
+anwendungsgerecht
+anwendungshinweis
+anwendungshinweise
+anwendungsideen
+anwendungsmo"glichkeiten
+anwendungsmodule
+anwendungsorientierten
+anwendungspalette
+anwendungsprogramm
+anwendungsprogramme
+anwendungsprogrammierung
+anwendungssituationen
+anwendungssoftware
+anwendungsspektrum
+anwendungsspezifische
+anwendungssysteme
+anwendungstechniker
+anwendungstechnischen
+anwendungsunterstu"tzung
+anwerbes
+anwerbestopp
+anwerbun
+anwerbung
+anwesend
+anwesende
+anwesendem
+anwesenden
+anwesendes
+anwesenh
+anwesenheit
+anwesenheiten
+anwesenheitsliste
+anwesenheitspflicht
+anwesenheitsrecht
+anwesenheitstag
+anwesenheitszeit
+anwesenheitszeiten
+anwesens
+anwies
+anwinkel
+anwinkeln
+anwohner
+anwohnern
+anwohners
+anwuchs
+anwuerfe
+anx
+anxie'te
+anxie'te'
+anxietie
+anxieties
+anxietud
+anxietude
+anxiety
+anxieuse
+anxieusement
+anxieuses
+anxieux
+anxioge`
+anxioge`ne
+anxioge`nes
+anxious
+anxiousb
+anxiousbench
+anxiousl
+anxiously
+anxiousn
+anxiousness
+anxiouss
+anxiousseat
+any
+anya
+anyah
+anyaku
+anyama
+anyan
+anyang
+anyanga
+anyaran
+anybodie
+anybodies
+anybody
+anybody'
+anybody'd
+anybodyd
+anybodys
+anychia
+anyep
+anyhow
+anyi
+anyibaou
+anyibaoulechokosi
+anyima
+anyimere
+anyin
+anymore
+anyo
+anyone
+anyplace
+anys
+anystida
+anystidae
+anything
+anythingarian
+anythingarianism
+anythings
+anytime
+anyu
+anyuak
+anyula
+anywa
+anywaa
+anywak
+anyway
+anyways
+anywhen
+anywhere
+anywhereness
+anywheres
+anywhy
+anywise
+anywithe
+anywither
+anyx
+anz
+anza
+anzaas
+anzac
+anzahl
+anzahlen
+anzahlende
+anzahlendem
+anzahlenden
+anzahlendes
+anzahlun
+anzahlung
+anzahlungen
+anzahlungsrate
+anzai
+anzaimar
+anzaimim
+anzan
+anzangan
+anzanian
+anzapfen
+anzapfend
+anzapfendem
+anzapfenden
+anzapfender
+anzapfte
+anzapften
+anzarout
+anzarouth
+anzeiche
+anzeichen
+anzeichn
+anzeichnen
+anzeige
+anzeigea
+anzeigeaufgaben
+anzeigeb
+anzeigebalken
+anzeigebereich
+anzeigec
+anzeigecharakteristik
+anzeigee
+anzeigeeinheit
+anzeigeeinheiten
+anzeigeelemente
+anzeigef
+anzeigefeld
+anzeigefelder
+anzeigefeldes
+anzeigefunktionen
+anzeigeg
+anzeigegenauigkeit
+anzeigegera"ten
+anzeigem
+anzeigemo"glichkeit
+anzeigemonitor
+anzeigen
+anzeigenaufkommen
+anzeigenauftraege
+anzeigenblaetter
+anzeigenblaettern
+anzeigenblattes
+anzeigenbueros
+anzeigend
+anzeigendem
+anzeigenden
+anzeigender
+anzeigeneinnahmen
+anzeigenelemente
+anzeigenentziehung
+anzeigenfeld
+anzeigenfeldes
+anzeigengesellschaft
+anzeigengruppen
+anzeigeninhalte
+anzeigenkampagne
+anzeigenkunden
+anzeigenpreise
+anzeigenrubrik
+anzeigentechnische
+anzeigenteil
+anzeigentreiber
+anzeigenvolumen
+anzeigep
+anzeigepflicht
+anzeigeplatine
+anzeiges
+anzeigesoftware
+anzeigesystem
+anzeiget
+anzeigetafel
+anzeigeteil
+anzeigetreiber
+anzeigt
+anzeigte
+anzen
+anzenben
+anzenchi
+anzengaw
+anzenhos
+anzenjou
+anzenka
+anzenkak
+anzenki
+anzenkyo
+anzensak
+anzensei
+anzentai
+anzentar
+anzentit
+anzento
+anzenunt
+anzettel
+anzetteln
+anzettelnde
+anzettelndem
+anzettelnder
+anzettelndes
+anzettelte
+anzi
+anzianit
+anzianita
+anziche'
+anziehen
+anziehend
+anziehende
+anziehenden
+anziehender
+anziehendes
+anziehun
+anziehung
+anziehungen
+anziehungskraefte
+anziehungskraft
+anziehungspunkt
+anziehungspunkte
+anzoateg
+anzoategui
+anzog
+anzolar
+anzolero
+anzou
+anzu
+anzubahn
+anzubahnen
+anzubequ
+anzubequemen
+anzubiet
+anzubieten
+anzubrin
+anzubringen
+anzudeut
+anzudeuten
+anzudien
+anzudienen
+anzuegen
+anzuegli
+anzueglich
+anzuegliche
+anzueglichem
+anzueglicher
+anzueglichere
+anzueglicherem
+anzueglicherer
+anzueglicheres
+anzuegliches
+anzueglichkeit
+anzueglichkeiten
+anzueglichstem
+anzueglichsten
+anzueglichster
+anzuelo
+anzuende
+anzuenden
+anzuendend
+anzuendende
+anzuendenden
+anzuendender
+anzuendendes
+anzuendet
+anzuendeten
+anzuerke
+anzuerkennen
+anzuerkennenden
+anzufach
+anzufachen
+anzufahr
+anzufahren
+anzufahrende
+anzufall
+anzufallen
+anzufang
+anzufangen
+anzufech
+anzufechten
+anzufert
+anzufertigen
+anzufleh
+anzuflehen
+anzufrag
+anzufragen
+anzufueg
+anzufuegen
+anzug
+anzuge
+anzugebe
+anzugeben
+anzugehe
+anzugehen
+anzugeho
+anzugehoeren
+anzuges
+anzuglei
+anzugleichen
+anzuglie
+anzugliedern
+anzugrei
+anzugreifen
+anzugs
+anzuhalt
+anzuhalten
+anzuhebe
+anzuheben
+anzuho"r
+anzuho"ren
+anzuhoer
+anzuhoeren
+anzukauf
+anzukaufen
+anzuklag
+anzuklagen
+anzuknue
+anzuknuepfen
+anzukomm
+anzukommen
+anzukrei
+anzukreiden
+anzukuen
+anzukuendigen
+anzukupp
+anzukuppeln
+anzukurb
+anzukurbeln
+anzulauf
+anzulaufen
+anzulege
+anzulegen
+anzulegenden
+anzulehn
+anzulehnen
+anzuleie
+anzuleiern
+anzulern
+anzulernen
+anzulock
+anzulocken
+anzumeld
+anzumelden
+anzumerk
+anzumerken
+anzunaeh
+anzunaehern
+anzunehm
+anzunehmen
+anzuordn
+anzuordnen
+anzupack
+anzupacken
+anzupass
+anzupassen
+anzupassende
+anzupassenden
+anzupasst
+anzupeil
+anzupeilen
+anzuprei
+anzupreisen
+anzurate
+anzuraten
+anzurege
+anzuregen
+anzuremp
+anzurempeln
+anzures
+anzurich
+anzurichten
+anzus
+anzusage
+anzusagen
+anzusamm
+anzusammeln
+anzuscha
+anzuschaffen
+anzuschauen
+anzuschl
+anzuschlagende
+anzuschliessen
+anzuschliessende
+anzuschr
+anzusehe
+anzusehen
+anzusehenden
+anzusehn
+anzusetz
+anzusetzen
+anzuspan
+anzuspannen
+anzuspre
+anzusprechen
+anzusprechenden
+anzustel
+anzustellen
+anzusteu
+anzusteuern
+anzusteuernde
+anzusteuernden
+anzusteuernder
+anzustos
+anzustossen
+anzustre
+anzustreben
+anzustrengen
+anzutrag
+anzutragen
+anzutref
+anzutreffen
+anzutret
+anzutreten
+anzuvert
+anzuvertrauen
+anzuwa"h
+anzuwa"hlenden
+anzuwaeh
+anzuwaehlen
+anzuweis
+anzuweisen
+anzuwend
+anzuwenden
+anzuwendende
+anzuwendenden
+anzuwerb
+anzuwerben
+anzuzapf
+anzuzapfen
+anzuzeig
+anzuzeigen
+anzuzett
+anzuzetteln
+anzweife
+anzweifelbare
+anzweifeln
+anzweifelnd
+anzweifelnden
+anzweifelnder
+anzweifelndes
+anzyou
+anzyuu
+an{nd
+ao
+ao`nides
+ao`rtica
+ao`rtico
+aoao
+aoaqui
+aoba
+aobadai
+aobaku
+aobashou
+aobayama
+aobleq
+aoblss
+aobukure
+aoc
+aocar
+aocchiro
+aoctiro
+aod
+aodaisyo
+aodake
+aodatami
+aoe
+aof
+aog
+aogaki
+aogaku
+aogakuda
+aogashim
+aogasim
+aogasima
+aoge
+aogiri
+aoguro
+aoh
+aohara
+aoheng
+aohori
+aoi
+aoidake
+aoife
+aoiki
+aoikitoi
+aoiro
+aoiroshi
+aoirosin
+aoj
+aojador
+aojadora
+aojadura
+aojamiento
+aojar
+aojashin
+aojasin
+aoji
+aojiro
+aojiroi
+aojo
+aojyashi
+aojyasi
+aojyasin
+aok
+aokabi
+aoki
+aokiai
+aokikoto
+aokimai
+aokimami
+aokimayu
+aokimiek
+aokimiho
+aokinao
+aokinoe
+aokippu
+aokisaor
+aokiyuka
+aokiyuuk
+aokura
+aokusa
+aol
+aola
+aoluta
+aom
+aomi
+aomie
+aomigaka
+aomono
+aomori
+aomoriek
+aomoriik
+aomorike
+aomorish
+aomorisi
+aomu
+aomuke
+aomushi
+aomusi
+aon
+aona
+aonach
+aonchiga
+aonchigal
+aone
+aonia
+aonian
+aoniken
+aonio
+aonisai
+aono
+aonogaha
+aonogou
+aonoke
+aonoyama
+aonuma
+aoptarse
+aoq
+aor
+aorar
+aore
+aorist
+aoristic
+aoristically
+aoristo
+aorr
+aorta
+aorta's
+aortae
+aortaen
+aortal
+aortarct
+aortarctia
+aortas
+aorte
+aortecta
+aortectasia
+aortectasis
+aortes
+aortic
+aorticor
+aorticorenal
+aortism
+aortitis
+aortocla
+aortoclasia
+aortoclasis
+aortolit
+aortolith
+aortomal
+aortomalacia
+aortomalaxis
+aortopat
+aortopathy
+aortopto
+aortoptosia
+aortoptosis
+aortorrh
+aortorrhaphy
+aortoscl
+aortosclerosis
+aortoste
+aortostenosis
+aortotom
+aortotomy
+aos
+aosa
+aose
+aosg
+aoshedd
+aoshima
+aoshingo
+aosima
+aosingou
+aosmic
+aosn
+aosta
+aosuji
+aosuzi
+aota
+aotagai
+aotahiro
+aotakeik
+aotani
+aotanori
+aotasach
+aotasati
+aotea
+aotearoa
+aotenjou
+aotenjyo
+aotenzyo
+aotes
+aoto
+aotus
+aou^t
+aou^tat
+aou^tats
+aouad
+aouads
+aouda
+aoudad
+aoudads
+aoudan
+aoudansh
+aoudanyo
+aoudjila
+aoudu
+aouellim
+aouellimiden
+aoul
+aounabar
+aout
+aovada
+aovado
+aovar
+aovillarse
+aowin
+aoya
+aoyagi
+aoyama
+aoyamabo
+aoyamach
+aoyamaen
+aoyamaga
+aoyamaic
+aoyamami
+aoyamari
+aoyamati
+aozame
+aozasa
+aoziro
+aozora
+aozorach
+aozou
+aozyashi
+aozyasi
+aozyasin
+ap
+ap1.eeb.
+apa
+apa-to
+apa\acuencos
+apa\ada
+apa\ado
+apa\ador
+apa\adora
+apa\adura
+apa\amiento
+apa\ar
+apa\o
+apa\uscador
+apa\uscadora
+apa\uscar
+apa`tica
+apa`tico
+apa`trida
+apabhram
+apabhramsa
+apabilar
+apabullamiento
+apabullar
+apabullo
+apacar
+apace
+apacentadero
+apacentador
+apacentadora
+apacentamiento
+apacentar
+apacer
+apache
+apachean
+apacheju
+apachejunction
+apachen
+apachend
+apachendans
+apachendansen
+apaches
+apacheta
+apachett
+apachette
+apachism
+apachite
+apachurrar
+apacibili`sima
+apacibili`simo
+apacibilidad
+apacible
+apaciblemente
+apaciguador
+apaciguadora
+apaciguamiento
+apaciguar
+apacorral
+apadana
+apadrinador
+apadrinadora
+apadrinamiento
+apadrinar
+apaeaa
+apagable
+apagada
+apagadiza
+apagadizo
+apagado
+apagador
+apagadora
+apagamiento
+apagapenol
+apagar
+apagavelas
+apagibet
+apagibete
+apago`n
+apagoge
+apagogic
+apagogical
+apagogically
+apahapsi
+apahapsili
+apaid
+apainelado
+apaisa
+apaisada
+apaisado
+apaisaie
+apaisaient
+apaisais
+apaisait
+apaisant
+apaisante
+apaisantes
+apaisants
+apaise
+apaise'
+apaise'e
+apaise'es
+apaise's
+apaise`r
+apaise`rent
+apaiseme
+apaisement
+apaisements
+apaisent
+apaiser
+apaisera
+apaiserai
+apaiseraient
+apaiserais
+apaiserait
+apaiseras
+apaisere
+apaiserez
+apaiseri
+apaiseriez
+apaiserions
+apaisero
+apaiserons
+apaiseront
+apaises
+apaisez
+apaisiez
+apaision
+apaisions
+apaisons
+apaiwong
+apak
+apaka
+apakabet
+apakabeti
+apakibet
+apakibeti
+apal
+apalabrar
+apalache
+apalachee
+apalachi
+apalachicola
+apalachin
+apalai
+apalakir
+apalakiri
+apalambrar
+apalancamiento
+apalancar
+apalaqui
+apalaquiri
+apalay
+apaleador
+apaleadora
+apaleamiento
+apalear
+apalen
+apaleo
+apaliar
+apalit
+apalmada
+apalpar
+apama
+apambia
+apambol
+apanage
+apanalada
+apanalado
+apanasje
+apanasjen
+apancora
+apandar
+apandillar
+apandry
+apanhecr
+apanhecra
+apaniaguada
+apaniaguado
+apaniekr
+apaniekra
+apaniguada
+apaniguado
+apaniguar
+apanjekr
+apanjekra
+apanojada
+apanojado
+apantanar
+apantele
+apanteles
+apantesi
+apantesis
+apanthro
+apanthropia
+apanthropy
+apantuflada
+apantuflado
+apapagayada
+apapagayado
+apaporis
+apar
+apara
+aparachi
+aparador
+aparadora
+aparadura
+aparai
+aparamento
+aparaphy
+aparaphysate
+aparar
+aparasolada
+aparasolado
+aparatarse
+aparatera
+aparatero
+aparatia
+aparato
+aparatosa
+aparatoso
+aparcar
+aparcera
+aparceri`a
+aparcero
+aparcionera
+aparcionero
+apareamiento
+aparear
+aparecer
+aparecida
+aparecido
+aparecimiento
+aparejada
+aparejadamente
+aparejado
+aparejador
+aparejadora
+aparejamiento
+aparejar
+aparejo
+aparejuelo
+aparencia
+aparencial
+aparentador
+aparentadora
+aparentar
+aparente
+aparentemente
+apareru
+apargia
+apari
+aparicio
+aparicio`n
+apariencia
+aparir
+aparithm
+aparithmesis
+aparna
+aparrada
+aparrado
+aparragarse
+aparrar
+aparroquiada
+aparroquiado
+aparroquiar
+apart
+apartacio`n
+apartada
+apartadamente
+apartadero
+apartadijo
+apartadiza
+apartadizo
+apartado
+apartador
+apartadora
+apartamiento
+apartar
+aparte
+aparte'
+aparte's
+aparteid
+aparteidpolitikk
+apartem
+aparter
+apartere
+aparterem
+aparterer
+aparteres
+apartes
+apartest
+apartestem
+apartesten
+apartester
+aparthei
+apartheid
+apartheiden
+apartheidlover
+apartheidpolitikk
+apartheids
+aparthro
+aparthrosis
+apartidar
+apartijo
+apartje
+apartjes
+apartmen
+apartment
+apartmental
+apartmenthauses
+apartmenthotel
+apartments
+apartnes
+apartness
+apartst
+aparvadera
+aparvadero
+aparvador
+aparvar
+apasco
+apasionada
+apasionadamente
+apasionado
+apasionamiento
+apasionante
+apasionar
+apasje
+apasote
+apastar
+apaste
+apasto
+apastron
+apasturar
+apata`n
+apatan
+apatanada
+apatanado
+apatani
+apatela
+apatetic
+apatheti
+apathetic
+apathetical
+apathetically
+apathic
+apathie
+apathies
+apathiqu
+apathique
+apathiques
+apathisc
+apathisch
+apathische
+apathischem
+apathischer
+apathisches
+apathischt
+apathism
+apathist
+apathistical
+apathoge
+apathogenic
+apathus
+apathy
+apati
+apati`a
+apatia
+apatie
+apatien
+apatisk
+apatiske
+apatite
+apatites
+apatitt
+apatitte
+apatitten
+apato
+apatorni
+apatornis
+apatosau
+apatosaurus
+apatride
+apatrides
+apatrocinar
+apaturia
+apatusca
+apatusco
+apatya
+apaularse
+apaulett
+apaulette
+apaulillarse
+apaw
+apawar
+apayao
+apayasar
+apazguada
+apazguado
+apb
+apbm
+apc
+apc205mi
+apc205mis
+apcm
+apd
+apds
+apds-ii-
+apds-ii-os115
+ape
+ape'rite
+ape'riteur
+ape'riteurs
+ape'riti
+ape'ritif
+ape'ritifs
+ape'ritive
+ape'ritives
+ape\uscar
+ape`ndice
+ape`tala
+apea
+apeadero
+apeador
+apeadora
+apeak
+apealar
+apeamiento
+apear
+apebakke
+apebakkes
+apebakkesen
+apebes|k
+apebrood
+apebroodbomen
+apebroodboom
+apechar
+apechugar
+apectomy
+aped
+apedazar
+apede
+apedernalada
+apedernalado
+apedgar
+apedom
+apedrar
+apedrea
+apedreada
+apedreadero
+apedreado
+apedreador
+apedreadora
+apedreamiento
+apedrear
+apedreo
+apeek
+apefjes
+apegaap
+apegaapt
+apegadamente
+apegaderas
+apegadiza
+apegadizo
+apegadura
+apegamiento
+apegapen
+apegar
+apegezic
+apegezicht
+apegezichten
+apego
+apegostrar
+apegualar
+apehaar
+apehood
+apeiron
+apekatt
+apekatte
+apekatter
+apekool
+apekop
+apekoppe
+apekoppen
+apekuren
+apekuur
+apel
+apelable
+apelacio`n
+apelada
+apelado
+apelambrar
+apelante
+apelar
+apelativo
+apeldar
+apelde
+apelet
+apelgararse
+apeliefd
+apeliefde
+apeligrar
+apelike
+apeling
+apellar
+apellen
+apelles
+apellidador
+apellidadora
+apellidamiento
+apellidante
+apellidar
+apellidero
+apellido
+apello
+apellous
+apelmazada
+apelmazadamente
+apelmazado
+apelmazar
+apelotonar
+apem
+apeman
+apemantu
+apemantus
+apen
+apena
+apenamiento
+apenar
+apenas
+apencar
+apendencia
+apendicitis
+apendicular
+apengesl
+apengeslacht
+apenkooi
+apenkooien
+apennine
+apennines
+apenootj
+apenootje
+apenootjes
+apensionar
+apenspel
+apenspellen
+apenteri
+apenteric
+apentuin
+apentuinen
+apeo
+apeonar
+apepsia
+apepsini
+apepsinia
+apepsy
+apeptic
+aper
+aperada
+aperado
+aperador
+aperar
+aperc/oi
+aperc/ois
+aperc/oit
+aperc/oive
+aperc/oivent
+aperc/oives
+aperc/u
+aperc/ue
+aperc/ues
+aperc/ur
+aperc/urent
+aperc/us
+aperc/ut
+apercebimiento
+apercebir
+aperceva
+apercevaient
+apercevais
+apercevait
+apercevant
+aperceve
+apercevez
+apercevi
+aperceviez
+apercevions
+apercevo
+apercevoir
+apercevons
+apercevr
+apercevra
+apercevrai
+apercevraient
+apercevrais
+apercevrait
+apercevras
+apercevrez
+apercevriez
+apercevrions
+apercevrons
+apercevront
+aperch
+apercibimiento
+apercibir
+apercibo
+apercio`n
+apercollar
+apercu
+apercus
+aperdigar
+apere
+aperea
+aperea`
+apergaminada
+apergaminado
+apergaminarse
+apergu
+aperient
+aperies
+aperij
+aperijen
+aperiodi
+aperiodic
+aperiodically
+aperiodicity
+aperispe
+aperispermic
+aperista
+aperistalsis
+aperitie
+aperitief
+aperitieven
+aperitif
+aperitiff
+aperitiffen
+aperitifs
+aperitiv
+aperitiva
+aperitive
+aperitivo
+apernador
+apernadora
+apernar
+apero
+aperok
+aperokke
+aperokken
+aperreada
+aperreado
+aperreador
+aperreadora
+aperrear
+aperreo
+apers
+aperse
+apersero
+apersogar
+apersonada
+apersonado
+apersonamiento
+apersonarse
+apert
+aperta
+aperte
+aperti
+apertion
+apertly
+apertnes
+apertness
+aperto
+apertome
+apertometer
+apertura
+apertural
+aperture
+apertured
+apertures
+aperu
+apery
+apes
+apesadumbrar
+apesante
+apesanteur
+apesaradamente
+apesarar
+apesgamiento
+apesgar
+apestar
+apesthes
+apesthesia
+apesthet
+apesthetic
+apesthetize
+apestosa
+apestoso
+apestree
+apestreek
+apestrek
+apestreken
+apet
+apetalae
+apetaloi
+apetaloid
+apetalos
+apetalose
+apetalou
+apetalous
+apetalousness
+apetaly
+apetecedor
+apetecedora
+apetecer
+apetecible
+apetencia
+apetible
+apetite
+apetitiva
+apetitivo
+apetito
+apetitosa
+apetitoso
+apeure'
+apeure'e
+apeure'es
+apeure's
+apeurer
+apex
+apexed
+apexes
+apezonada
+apezonado
+apezu\ar
+apfel
+apfelbae
+apfelbaeumchen
+apfelbaeume
+apfelbaeumen
+apfelbau
+apfelbaumes
+apfelmos
+apfelmost
+apfelmus
+apfels
+apfelsch
+apfelschimmel
+apfelsin
+apfelsine
+apfelsinen
+apfeltor
+apfeltorte
+apfelwei
+apfelwein
+apfelweinkneipe
+apg
+apg-1
+apg-2
+apg-3
+apg-4
+apg-5
+apg-6
+apg-emh1
+apg-emh2
+apg-emh3
+apg-emh4
+apg-emh5
+apg-emh6
+apg-emh7
+apg-emh8
+apg-perd
+apg-perddims
+apgar
+apgea
+aphaeres
+aphaeresis
+aphaeret
+aphaeretic
+aphagia
+aphakia
+aphakial
+aphakic
+aphanapt
+aphanapteryx
+aphanes
+aphanesi
+aphanesite
+aphanipt
+aphaniptera
+aphanipterous
+aphanite
+aphanites
+aphaniti
+aphanitic
+aphanitism
+aphanomy
+aphanomyces
+aphanoph
+aphanophyre
+aphanozy
+aphanozygous
+apharsac
+apharsachites
+apharsat
+apharsathacites
+apharsathchites
+apharsit
+apharsites
+aphasia
+aphasiac
+aphasiacs
+aphasias
+aphasic
+aphasics
+aphasie
+aphasiqu
+aphasique
+aphasiques
+aphek
+aphekah
+apheland
+aphelandra
+aphelenc
+aphelenchus
+aphelia
+aphelian
+aphelili
+aphelilia
+aphelilions
+aphelinu
+aphelinus
+aphelion
+apheliot
+apheliotropic
+apheliotropically
+apheliotropism
+aphelops
+aphemia
+aphemic
+aphenges
+aphengescope
+aphengos
+aphengoscope
+aphenosc
+aphenoscope
+apheresi
+apheresis
+aphereti
+apheretic
+aphesis
+apheta
+aphetic
+aphetica
+aphetically
+aphetism
+aphetize
+aphiah
+aphicida
+aphicidal
+aphicide
+aphid
+aphides
+aphidian
+aphidici
+aphidicide
+aphidico
+aphidicolous
+aphidid
+aphidida
+aphididae
+aphidiin
+aphidiinae
+aphidiou
+aphidious
+aphidius
+aphidivo
+aphidivorous
+aphidoly
+aphidolysin
+aphidoph
+aphidophagous
+aphidoze
+aphidozer
+aphids
+aphik
+aphilant
+aphilanthropy
+aphis
+aphlasto
+aphlaston
+aphlebia
+aphlogis
+aphlogistic
+aphnolog
+aphnology
+aphodal
+aphodian
+aphodius
+aphodus
+aphone
+aphones
+aphonia
+aphonic
+aphonous
+aphony
+aphoria
+aphorise
+aphorism
+aphorismatic
+aphorisme
+aphorismer
+aphorismes
+aphorismic
+aphorismical
+aphorismos
+aphorisms
+aphorismus
+aphorist
+aphoristic
+aphoristically
+aphorists
+aphorize
+aphorized
+aphorizer
+aphorizes
+aphorizi
+aphorizing
+aphoruri
+aphoruridae
+aphotic
+aphotota
+aphototactic
+aphototaxis
+aphototr
+aphototropic
+aphototropism
+aphra
+aphrah
+aphrasia
+aphrite
+aphrizit
+aphrizite
+aphrodis
+aphrodisia
+aphrodisiac
+aphrodisiacal
+aphrodisiacs
+aphrodisian
+aphrodisiaque
+aphrodisiaques
+aphrodision
+aphrodistic
+aphrodit
+aphrodite
+aphroditeum
+aphroditic
+aphroditidae
+aphroditous
+aphrolit
+aphrolite
+aphronia
+aphrosid
+aphrosiderite
+aphses
+aphte
+aphtes
+aphteuse
+aphteuses
+aphtha
+aphthart
+aphthartodocetae
+aphthartodocetic
+aphthartodocetism
+aphthic
+aphthita
+aphthitalite
+aphthoid
+aphthong
+aphthongal
+aphthongia
+aphthous
+aphu
+aphus
+aphydrot
+aphydrotropic
+aphydrotropism
+aphyllos
+aphyllose
+aphyllou
+aphyllous
+aphylly
+aphyric
+api
+api-ecm
+api-ru
+api\ada
+api\ado
+api\adura
+api\amiento
+api\ar
+api\onada
+api\onado
+api`cola
+api`culo
+apia
+apiaca
+apiaceae
+apiaceou
+apiaceous
+apiadador
+apiadadora
+apiadar
+apiaka
+apiake
+apiales
+apian
+apianar
+apiapum
+apiaradero
+apiarari
+apiararies
+apiarian
+apiaries
+apiarist
+apiarists
+apiary
+apiastro
+apiator
+apiaweti
+apicad
+apical
+apicalls
+apically
+apicararse
+apice
+apicella
+apices
+apichart
+apici
+apician
+apicifix
+apicifixed
+apicilar
+apicilla
+apicillary
+apicitis
+apicius
+apickaba
+apickaback
+apicoect
+apicoectomy
+apicolys
+apicolysis
+apicula
+apicular
+apiculat
+apiculate
+apiculated
+apiculation
+apiculte
+apiculteur
+apiculteurs
+apicultor
+apicultora
+apicultu
+apicultura
+apicultural
+apiculture
+apiculturist
+apiculus
+apidae
+apidia
+apiece
+apieces
+apigenin
+apii
+apiin
+apikoros
+apilada
+apilador
+apiladora
+apilamiento
+apilar
+apilary
+apilevel
+apimpollarse
+apin
+apina
+apinae
+apinage
+apinaje
+apinapin
+apinaye
+apinch
+apindje
+apindji
+aping
+apinji
+apinnen
+apinoid
+apio
+apioceri
+apioceridae
+apioid
+apioidal
+apiojarse
+apiolar
+apiole
+apiolin
+apiologi
+apiologies
+apiologist
+apiology
+apionol
+apios
+apiose
+apiosoma
+apiparse
+apiphobi
+apiphobia
+apiquer
+apirat
+apire`tica
+apire`tico
+apirexia
+apirgu{inarse
+apiri
+apiru
+apiruksa
+apis
+apish
+apishamo
+apishamore
+apishly
+apishnes
+apishness
+apism
+apison
+apisonamiento
+apisonar
+apitar
+apito
+apitoie
+apitoiem
+apitoiement
+apitoiements
+apitoien
+apitoient
+apitoier
+apitoiera
+apitoierai
+apitoieraient
+apitoierais
+apitoierait
+apitoieras
+apitoierez
+apitoieriez
+apitoierions
+apitoierons
+apitoieront
+apitoies
+apitonada
+apitonado
+apitonamiento
+apitonar
+apitong
+apitoya
+apitoyai
+apitoyaient
+apitoyais
+apitoyait
+apitoyan
+apitoyant
+apitoye'
+apitoye'e
+apitoye'es
+apitoye's
+apitoye`
+apitoye`rent
+apitoyer
+apitoyez
+apitoyie
+apitoyiez
+apitoyio
+apitoyions
+apitoyon
+apitoyons
+apitpat
+apium
+apivorou
+apivorous
+apizarrada
+apizarrado
+apj
+apjohnit
+apjohnite
+apk
+apl
+apl2
+aplacable
+aplacacio`n
+aplacador
+aplacadora
+aplacamiento
+aplacar
+aplacent
+aplacental
+aplacentalia
+aplacentar
+aplacentaria
+aplacenteri`a
+aplacer
+aplacerada
+aplacerado
+aplacible
+aplaciente
+aplacimiento
+aplacoph
+aplacophora
+aplacophoran
+aplacophorous
+aplagar
+aplanacalles
+aplanadera
+aplanador
+aplanadora
+aplanamiento
+aplanar
+aplanat
+aplanati
+aplanatic
+aplanatically
+aplanatism
+aplanchada
+aplanchado
+aplanchador
+aplanchadora
+aplanchar
+aplane`tica
+aplane`tico
+aplani
+aplanie
+aplanies
+aplanir
+aplanira
+aplanirai
+aplaniraient
+aplanirais
+aplanirait
+aplaniras
+aplanire
+aplanirent
+aplanirez
+aplaniri
+aplaniriez
+aplanirions
+aplaniro
+aplanirons
+aplaniront
+aplanis
+aplaniss
+aplanissaient
+aplanissais
+aplanissait
+aplanissant
+aplanisse
+aplanissement
+aplanissent
+aplanisses
+aplanissez
+aplanissiez
+aplanissions
+aplanissons
+aplanit
+aplanoba
+aplanobacter
+aplanoga
+aplanogamete
+aplanosp
+aplanospore
+aplantillar
+aplasia
+aplastamiento
+aplastante
+aplastar
+aplastic
+aplati
+aplatie
+aplaties
+aplatir
+aplatira
+aplatirai
+aplatiraient
+aplatirais
+aplatirait
+aplatiras
+aplatire
+aplatirent
+aplatirez
+aplatiri
+aplatiriez
+aplatirions
+aplatiro
+aplatirons
+aplatiront
+aplatis
+aplatiss
+aplatissaient
+aplatissais
+aplatissait
+aplatissant
+aplatisse
+aplatissement
+aplatissent
+aplatisses
+aplatissez
+aplatissiez
+aplatissions
+aplatissons
+aplatit
+aplaudidor
+aplaudidora
+aplaudir
+aplauso
+aplayar
+aplazable
+aplazamiento
+aplazar
+aplcen
+aplcomm
+aplebeyar
+aplecon
+aplectru
+aplectrum
+aplegar
+aplenty
+aplicable
+aplicacio`n
+aplicada
+aplicadera
+aplicadero
+aplicado
+aplicar
+aplicativa
+aplicativo
+aplingto
+aplington
+aplite
+aplitic
+aplobasa
+aplobasalt
+aplodior
+aplodiorite
+aplodont
+aplodontia
+aplodontiidae
+aplomada
+aplomado
+aplomar
+aplomb
+aplomben
+aplombs
+aplome
+aplomo
+aplopapp
+aplopappus
+aploperi
+aploperistomatous
+aplostem
+aplostemonous
+aplotaxe
+aplotaxene
+aplotomy
+aplpy
+apls
+apluda
+aplustre
+aplvax
+aplvm
+aplysia
+apm
+apma
+apmisibi
+apmisibil
+apn
+apnea
+apneal
+apneap
+apneas
+apneic
+apneumat
+apneumatic
+apneumatosis
+apneumon
+apneumona
+apneumonous
+apneusti
+apneustic
+apnoea
+apo
+apo^tre
+apo^tres
+apo`cema
+apo`cima
+apo`copa
+apo`cope
+apo`crifa
+apo`crifamente
+apo`crifo
+apo`dosis
+apo`fige
+apo`fisis
+apo`grafo
+apo`loga
+apo`logo
+apo`sito
+apo`stata
+apo`stol
+apo`stolo
+apo`strofe
+apo`strofo
+apoaconi
+apoaconitine
+apoala
+apoastro
+apoatrop
+apoatropine
+apobioti
+apobiotic
+apoblast
+apocada
+apocadamente
+apocado
+apocador
+apocadora
+apocaffe
+apocaffeine
+apocali`ptica
+apocali`ptico
+apocalipsis
+apocalyp
+apocalyps
+apocalypse
+apocalypses
+apocalypst
+apocalypt
+apocalyptic
+apocalyptical
+apocalyptically
+apocalypticism
+apocalyptique
+apocalyptiques
+apocalyptisch
+apocalyptische
+apocalyptism
+apocalyptist
+apocamiento
+apocamph
+apocamphoric
+apocar
+apocarp
+apocarpo
+apocarpous
+apocarpy
+apocata`stasis
+apocatas
+apocatastasis
+apocatastatic
+apocatha
+apocatharsis
+apocente
+apocenter
+apocentr
+apocentric
+apocentricity
+apocha
+apocholi
+apocholic
+apochrom
+apochromat
+apochromatic
+apochromatism
+apocina`cea
+apocina`ceo
+apocinch
+apocinchonine
+apocodei
+apocodeine
+apocopar
+apocopat
+apocopate
+apocopated
+apocopation
+apocope
+apocope'
+apocope's
+apocopic
+apocreni
+apocrenic
+apocrief
+apocriefe
+apocrifa
+apocrife
+apocrifi
+apocrifo
+apocrisi
+apocrisiario
+apocrisiary
+apocrita
+apocroma`tica
+apocroma`tico
+apocrust
+apocrustic
+apocryph
+apocrypha
+apocryphal
+apocryphalist
+apocryphally
+apocryphalness
+apocryphate
+apocryphe
+apocryphes
+apocryphon
+apocynac
+apocynaceae
+apocynaceous
+apocyneo
+apocyneous
+apocynth
+apocynthion
+apocynthions
+apocynum
+apod
+apoda
+apodaca
+apodador
+apodadora
+apodal
+apodamiento
+apodan
+apodar
+apodeict
+apodeictic
+apodeictical
+apodeipn
+apodeipnon
+apodeixi
+apodeixis
+apodema
+apodemal
+apodemat
+apodematal
+apodeme
+apodencada
+apodencado
+apoderada
+apoderadamente
+apoderado
+apoderamiento
+apoderar
+apodes
+apodi`ctica
+apodi`ctico
+apodia
+apodicti
+apodictic
+apodictical
+apodictically
+apodictisch
+apodictische
+apodictive
+apodidae
+apodikti
+apodiktische
+apodixis
+apodo
+apodosis
+apodous
+apodyter
+apodyterium
+apoembry
+apoembryony
+apofench
+apofenchene
+apofoni`a
+apogaeic
+apogalac
+apogalacteum
+apogamic
+apogamically
+apogamou
+apogamous
+apogamously
+apogamy
+apoge'e
+apogeal
+apogean
+apogee
+apogees
+apogeic
+apogenou
+apogenous
+apogeny
+apogeo
+apogeotr
+apogeotropic
+apogeotropically
+apogeotropism
+apogon
+apogonid
+apogonidae
+apograph
+apographal
+apoharmi
+apoharmine
+apohyal
+apoi
+apoidea
+apointo
+apointom
+apoise
+apojove
+apokalyp
+apokalypse
+apokalyptischen
+apokalyptisk
+apokinsk
+apokinskij
+apokope
+apokopen
+apokrea
+apokreos
+apokryf
+apokryfi
+apokryfisk
+apokryft
+apolalyp
+apolalypse
+apolalypsen
+apolar
+apolarit
+apolarity
+apolaust
+apolaustic
+apolegam
+apolegamic
+apoli`nea
+apoli`neo
+apoli`tica
+apoli`tico
+apolilladura
+apolillamiento
+apolillar
+apolinar
+apolinarismo
+apolinarista
+apolista
+apolistan
+apolitic
+apolitical
+apolitically
+apolitiq
+apolitique
+apolitiques
+apolitis
+apolitisme
+apoll
+apollina
+apollinaire
+apollinarian
+apollinarianism
+apollinaris
+apolline
+apollo
+apollo1
+apollo2
+apollodo
+apollodorus
+apollogr
+apollogrp
+apollon
+apolloni
+apollonia
+apollonian
+apollonic
+apollonicon
+apollonistic
+apollos
+apollosh
+apolloship
+apollyon
+apolo
+apolo`gica
+apolo`gico
+apologal
+apologe`tica
+apologe`tico
+apologee
+apologeet
+apologet
+apologete
+apologeten
+apologetic
+apologetica
+apologetical
+apologetically
+apologetics
+apologetiek
+apologetisch
+apologetische
+apologi
+apologi`a
+apologia
+apologias
+apologie
+apologieen
+apologien
+apologies
+apologis
+apologist
+apologista
+apologiste
+apologistes
+apologists
+apologiz
+apologizar
+apologize
+apologized
+apologizer
+apologizers
+apologizes
+apologizing
+apologue
+apologues
+apology
+apolousi
+apolousis
+apoltronamiento
+apoltronarse
+apolune
+apolunes
+apolvillarse
+apolysin
+apolysis
+apolytik
+apolytikion
+apomazar
+apomecom
+apomecometer
+apomecometry
+apometab
+apometabolic
+apometabolism
+apometabolous
+apometaboly
+apomiami
+apomicti
+apomictic
+apomictical
+apomixis
+apomorph
+apomorphia
+apomorphine
+apon
+apone
+aponer
+aponeuro
+aponeuro`tica
+aponeuro`tico
+aponeurology
+aponeurorrhaphy
+aponeurosis
+aponeurositis
+aponeurotic
+aponeurotome
+aponeurotomy
+aponewyo
+aponewyork
+aponia
+aponic
+aponoget
+aponogeton
+aponogetonaceae
+aponogetonaceous
+aponte
+apontocar
+aponzo\ar
+apoop
+apop
+apopenpt
+apopenptic
+apopetal
+apopetalous
+apophant
+apophantic
+apophasi
+apophasis
+apophati
+apophatic
+apophis
+apophleg
+apophlegmatic
+apophoni
+apophonia
+apophony
+apophoro
+apophorometer
+apophthe
+apophthegm
+apophthegmatist
+apophyge
+apophyla
+apophylactic
+apophylaxis
+apophyll
+apophyllite
+apophyllous
+apophysa
+apophysary
+apophysate
+apophyse
+apophyseal
+apophysi
+apophysis
+apophysitis
+apopka
+apoplasm
+apoplasmodial
+apoplast
+apoplastogamous
+apople`tica
+apople`tico
+apoplect
+apoplectic
+apoplectical
+apoplectically
+apoplectiform
+apoplectique
+apoplectiques
+apoplectoid
+apopleji`a
+apopleks
+apopleksi
+apopleksien
+apoplekt
+apoplektisk
+apoplex
+apoplexi
+apoplexie
+apoplexies
+apoplexy
+apopokuv
+apopokuva
+apopyle
+apoquecer
+apoquina
+apoquinamine
+apoquinar
+apoquini
+apoquinine
+apor
+aporca
+aporcador
+aporcadora
+aporcadura
+aporcar
+aporetic
+aporetical
+aporhyol
+aporhyolite
+aporia
+aporisma
+aporismarse
+aporn
+aporo
+aporobra
+aporobranchia
+aporobranchian
+aporobranchiata
+aporocac
+aporocactus
+aporon
+aporosa
+aporose
+aporphin
+aporphine
+aporracear
+aporrar
+aporrarse
+aporreada
+aporreado
+aporreador
+aporreadora
+aporreadura
+aporreamiento
+aporreante
+aporrear
+aporreo
+aporretado
+aporrhai
+aporrhaidae
+aporrhais
+aporrhao
+aporrhaoid
+aporrheg
+aporrhegma
+aporrillarse
+aport
+aportacio`n
+aportadera
+aportadero
+aportar
+aporte
+aportellado
+aportillado
+aportillar
+aportois
+aportoise
+apos
+aposafra
+aposafranine
+aposanfr
+aposanfrancisco
+aposatur
+aposaturn
+aposaturnium
+aposeatt
+aposeattle
+aposemat
+aposematic
+aposematically
+aposentador
+aposentadora
+aposentaduri`a
+aposentamiento
+aposentar
+aposento
+aposepal
+aposepalous
+aposesionada
+aposesionado
+aposesionar
+aposhans
+aposhanskij
+aposia
+aposicio`n
+aposiope
+aposiopesis
+aposiopetic
+apositia
+apositic
+apositiva
+apositivo
+aposoro
+aposporo
+aposporogony
+aposporous
+apospory
+aposta
+apostaat
+apostaci
+apostacies
+apostacy
+apostadamente
+apostadero
+apostal
+apostamiento
+apostante
+apostar
+apostasi
+apostasi`a
+apostasie
+apostasier
+apostasies
+apostasis
+apostasy
+apostat
+apostata
+apostatar
+apostate
+apostaten
+apostates
+apostati
+apostatic
+apostatical
+apostatically
+apostatism
+apostatize
+apostatized
+apostatizes
+apostatizing
+apostaxi
+apostaxis
+apostel
+apostelar
+apostelb
+apostelbrief
+apostele
+apostelen
+apostelf
+apostelfuersten
+aposteln
+apostelp
+apostelpaarden
+apostels
+apostelt
+aposteltanne
+aposteltid
+aposteltiden
+apostelz
+apostelzalf
+apostema
+apostemacio`n
+apostemar
+apostemate
+apostematic
+apostemation
+apostematous
+aposteme
+apostemero
+apostemosa
+apostemoso
+aposter
+aposteri
+aposteriori
+aposthia
+apostil
+apostill
+apostilla
+apostillar
+apostillarse
+apostille
+apostillen
+apostiller
+apostilles
+apostis
+apostiza
+apostizo
+apostle
+apostlee
+apostleh
+apostlehood
+apostlen
+apostlene
+apostlenes
+apostler
+apostles
+apostleship
+apostleships
+aposto
+aposto`lica
+aposto`licamente
+aposto`lico
+aposto`liga
+aposto`ligo
+apostola
+apostolaat
+apostolada
+apostolado
+apostolat
+apostolate
+apostolats
+apostolazgo
+apostole
+apostoless
+apostoli
+apostolian
+apostolic
+apostolical
+apostolically
+apostolicalness
+apostolici
+apostolicism
+apostolicity
+apostolides
+apostoligal
+apostolique
+apostoliques
+apostolisch
+apostolische
+apostolischen
+apostolischer
+apostolisk
+apostolize
+apostolo
+apostolopoulos
+apostolos
+apostre
+apostrof
+apostrofar
+apostrofate
+apostrofen
+apostrofer
+apostrofere
+apostroffen
+apostroffer
+apostrofferne
+apostrofi
+apostrofo
+apostrofs
+apostrop
+apostroph
+apostrophal
+apostrophation
+apostrophe
+apostropher
+apostrophes
+apostrophic
+apostrophied
+apostrophize
+apostrophized
+apostrophizes
+apostrophizing
+apostrophs
+apostrophus
+apostura
+aposutor
+apotacti
+apotactic
+apotactici
+apoteca
+apotecario
+apotegma
+apotek
+apoteken
+apotekene
+apoteker
+apotekeren
+apotekermedhjelper
+apoteket
+apotekets
+apotekva
+apotekvakt
+apotekvare
+apoteles
+apotelesm
+apotelesmatic
+apotelesmatical
+apotema
+apoteo`sica
+apoteo`sico
+apoteo`tica
+apoteo`tico
+apoteosis
+apothe'o
+apothe'ose
+apothe'oses
+apotheca
+apothecal
+apothecarcaries
+apothecaries
+apothecary
+apothecaryship
+apothece
+apotheci
+apothecial
+apothecium
+apotheek
+apothegm
+apothegmatic
+apothegmatical
+apothegmatically
+apothegmatist
+apothegmatize
+apothegms
+apotheke
+apotheken
+apothekenbesitzers
+apothekenraeume
+apotheker
+apothekeres
+apothekeressen
+apothekerin
+apothekerinnen
+apothekern
+apothekerrezept
+apothekers
+apothekersassistent
+apothekersassistente
+apothekersassistenten
+apothekersexamen
+apothekersexamens
+apothekersflesje
+apothekersflesjes
+apothekersrekening
+apothekersrekeningen
+apothem
+apothema
+apothema's
+apothems
+apotheos
+apotheose
+apotheosen
+apotheoses
+apotheosis
+apotheosize
+apotheosized
+apotheosizing
+apothesi
+apothesine
+apothesis
+apothica
+apothicaire
+apothicaires
+apoticario
+apotome
+apotrach
+apotracheal
+apotre
+apotrerar
+apotropa
+apotropaic
+apotropaion
+apotropaism
+apotropo
+apotropous
+apoturme
+apoturmeric
+apotype
+apotypic
+apout
+apowasi
+apoxesis
+apoxyome
+apoxyomenos
+apoyadero
+apoyadura
+apoyar
+apoyatura
+apoyo
+apozarse
+apozem
+apozema
+apozemic
+apozemical
+apozymas
+apozymase
+app
+appa
+appa^t
+appa^ta
+appa^tai
+appa^taient
+appa^tais
+appa^tait
+appa^tan
+appa^tant
+appa^te
+appa^te'
+appa^te'e
+appa^te'es
+appa^te's
+appa^te`
+appa^te`rent
+appa^ten
+appa^tent
+appa^ter
+appa^tera
+appa^terai
+appa^teraient
+appa^terais
+appa^terait
+appa^teras
+appa^terez
+appa^teriez
+appa^terions
+appa^terons
+appa^teront
+appa^tes
+appa^tez
+appa^tie
+appa^tiez
+appa^tio
+appa^tions
+appa^ton
+appa^tons
+appa^ts
+appai
+appaia
+appaiai
+appaiamm
+appaiammo
+appaiamo
+appaiand
+appaiando
+appaiano
+appaiare
+appaiaro
+appaiarono
+appaiass
+appaiasse
+appaiassi
+appaiast
+appaiaste
+appaiasti
+appaiata
+appaiate
+appaiati
+appaiato
+appaiava
+appaiavamo
+appaiavano
+appaiavate
+appaiavi
+appaiavo
+appaid
+appaiera
+appaierai
+appaiere
+appaierei
+appaieremo
+appaierete
+appaiero
+appaim
+appaino
+appaio
+appaiono
+appairer
+appakatt
+appaku
+appakues
+appakuka
+appakuma
+appakuse
+appakush
+appal
+appalach
+appalachen
+appalachia
+appalachian
+appalachians
+appall
+appalled
+appallin
+appalling
+appallingly
+appallme
+appallment
+appalls
+appalmen
+appalment
+appaloos
+appaloosa
+appaloosas
+appals
+appalti
+appalto
+appanage
+appanages
+appanagi
+appanagist
+appanna
+appannai
+appannam
+appannammo
+appannan
+appannando
+appannano
+appannar
+appannare
+appannas
+appannasse
+appannassi
+appannaste
+appannasti
+appannat
+appannata
+appannate
+appannati
+appannato
+appannav
+appannava
+appannavi
+appannavo
+appanner
+appannera
+appannerai
+appannerei
+appannero
+appanni
+appannia
+appanniamo
+appanniate
+appannin
+appannino
+appanno
+apparaat
+apparaatjes
+apparai^
+apparai^t
+apparai^tra
+apparai^trai
+apparai^traient
+apparai^trais
+apparai^trait
+apparai^tras
+apparai^tre
+apparai^trez
+apparai^triez
+apparai^trions
+apparai^trons
+apparai^tront
+apparais
+apparaissaient
+apparaissais
+apparaissait
+apparaissant
+apparaisse
+apparaissent
+apparaisses
+apparaissez
+apparaissiez
+apparaissions
+apparaissons
+apparat
+apparate
+apparateglasblaeser
+apparaten
+apparatene
+apparater
+apparatet
+apparats
+apparatu
+apparatur
+apparaturen
+apparaturet
+apparatus
+apparatuses
+apparatuur
+appare
+appareil
+appareilla
+appareillage
+appareillages
+appareillaient
+appareillais
+appareillait
+appareillant
+appareille
+appareille'
+appareille'e
+appareille'es
+appareille's
+appareille`rent
+appareillent
+appareiller
+appareillera
+appareillerai
+appareilleraient
+appareillerais
+appareillerait
+appareilleras
+appareillerez
+appareilleriez
+appareillerions
+appareillerons
+appareilleront
+appareilles
+appareillez
+appareilliez
+appareillions
+appareillons
+appareils
+apparel
+apparele
+appareled
+appareli
+appareling
+apparell
+apparelled
+apparelling
+apparelm
+apparelment
+apparels
+apparemm
+apparemment
+apparenc
+apparence
+apparences
+apparency
+apparens
+apparent
+apparenta
+apparentaient
+apparentais
+apparentait
+apparentant
+apparente
+apparente'
+apparente'e
+apparente'es
+apparente's
+apparente`rent
+apparenteer
+apparenteerde
+apparenteerden
+apparenteert
+apparentement
+apparentent
+apparenter
+apparentera
+apparenterai
+apparenteraient
+apparenterais
+apparenterait
+apparenteras
+apparenteren
+apparenterez
+apparenteriez
+apparentering
+apparenterions
+apparenterons
+apparenteront
+apparentes
+apparentez
+apparenti
+apparentiez
+apparentions
+apparently
+apparentness
+apparentons
+apparents
+apparenz
+apparenza
+apparenze
+appari
+apparia
+appariai
+appariaient
+appariais
+appariait
+apparian
+appariant
+apparie
+apparie'
+apparie'e
+apparie'es
+apparie's
+apparie`
+apparie`rent
+appariem
+appariement
+appariements
+apparien
+apparient
+apparier
+appariera
+apparierai
+apparieraient
+apparierais
+apparierait
+apparieras
+apparierez
+apparieriez
+apparierions
+apparierons
+apparieront
+apparies
+appariez
+appariie
+appariiez
+appariio
+appariions
+apparion
+apparions
+apparir
+apparira
+apparira'
+appariranno
+apparire
+apparisj
+apparisjon
+apparisjonen
+apparite
+appariteur
+appariteurs
+appariti
+apparition
+apparitional
+apparitions
+apparito
+apparitor
+appariva
+apparivano
+apparsa
+apparse
+apparsi
+apparso
+appartem
+appartement
+appartemente
+appartementen
+appartementhaeusern
+appartements
+appartementshaeuser
+appartementstuere
+appartementwohnung
+apparten
+appartenaient
+appartenais
+appartenait
+appartenance
+appartenances
+appartenant
+appartenente
+appartenenti
+appartenenza
+appartenere
+appartenez
+appartengono
+apparteniez
+appartenions
+appartenir
+appartenons
+appartente
+appartenu
+appartenue
+appartenues
+appartenus
+appartie
+appartiendra
+appartiendrai
+appartiendraient
+appartiendrais
+appartiendrait
+appartiendras
+appartiendrez
+appartiendriez
+appartiendrions
+appartiendrons
+appartiendront
+appartiene
+appartienne
+appartiennent
+appartiennes
+appartiens
+appartient
+appartin
+appartinrent
+appartint
+apparu
+apparue
+apparues
+apparure
+apparurent
+apparus
+apparut
+apparve
+apparver
+apparvero
+appas
+appassio
+appassionata
+appassionato
+appauvri
+appauvrie
+appauvries
+appauvrir
+appauvrira
+appauvrirai
+appauvriraient
+appauvrirais
+appauvrirait
+appauvriras
+appauvrirent
+appauvrirez
+appauvririez
+appauvririons
+appauvrirons
+appauvriront
+appauvris
+appauvrissaient
+appauvrissais
+appauvrissait
+appauvrissant
+appauvrisse
+appauvrissement
+appauvrissent
+appauvrisses
+appauvrissez
+appauvrissiez
+appauvrissions
+appauvrissons
+appauvrit
+appay
+appc
+appe
+appe'tis
+appe'tissant
+appe'tissante
+appe'tissantes
+appe'tissants
+appe'tit
+appe'tits
+appeach
+appeachm
+appeachment
+appeal
+appealab
+appealability
+appealable
+appealed
+appealer
+appealers
+appealin
+appealing
+appealingly
+appealingness
+appeals
+appear
+appearan
+appearance
+appearanced
+appearances
+appeard
+appeared
+appearer
+appearers
+appearet
+appeareth
+appearin
+appearing
+appears
+appeas
+appeasab
+appeasable
+appeasableness
+appeasably
+appease
+appeased
+appeasem
+appeasement
+appeasements
+appeaser
+appeasers
+appeases
+appeaset
+appeaseth
+appeasin
+appeasing
+appeasingly
+appeasiv
+appeasive
+appeer
+appeeran
+appeerances
+appeerd
+appeerin
+appeering
+appeers
+appeha
+appel
+appela
+appelaar
+appelaars
+appelaartje
+appelaartjes
+appelach
+appelachian
+appelaie
+appelaient
+appelais
+appelait
+appelant
+appelati
+appelation
+appelative
+appelbau
+appelbaum
+appelbei
+appelbeignet
+appelbeignets
+appelblo
+appelbloesem
+appelbloesems
+appelbol
+appelbollen
+appelbom
+appelbomen
+appelboo
+appelboom
+appelboor
+appelbor
+appelboren
+appele'
+appele'e
+appele'es
+appele's
+appele`r
+appele`rent
+appelen
+appeler
+appelere
+appelerende
+appelerer
+appelez
+appelfla
+appelflap
+appelflappen
+appelflauwte
+appelflauwten
+appelflauwtes
+appelgra
+appelgrauw
+appelgrauwe
+appelida
+appelidage
+appelier
+appelierte
+appeliez
+appelion
+appelions
+appelkoe
+appelkoek
+appelkoeken
+appell
+appella
+appellab
+appellabel
+appellabele
+appellability
+appellable
+appellai
+appellam
+appellammo
+appellan
+appellancy
+appellando
+appellano
+appellant
+appellante
+appellanten
+appellants
+appellar
+appellare
+appellas
+appellasse
+appellassi
+appellaste
+appellasti
+appellat
+appellata
+appellate
+appellati
+appellation
+appellational
+appellations
+appellationsgericht
+appellativ
+appellative
+appellatived
+appellatively
+appellativeness
+appellato
+appellatory
+appellav
+appellava
+appellavi
+appellavo
+appelle
+appellee
+appelleer
+appelleerde
+appelleerden
+appelleert
+appellees
+appellen
+appellent
+appeller
+appellera
+appellerai
+appelleraient
+appellerais
+appellerait
+appelleras
+appellere
+appellerei
+appelleren
+appellerer
+appellerez
+appelleriez
+appellerions
+appellero
+appellerons
+appelleront
+appellert
+appellerte
+appelles
+appelli
+appellia
+appelliamo
+appelliate
+appellie
+appelliere
+appellieren
+appellierende
+appellierendem
+appellierenden
+appellierendes
+appellierst
+appelliert
+appellierten
+appelliertest
+appelliertet
+appellin
+appellino
+appellinstans
+appello
+appellor
+appellors
+appellre
+appellrett
+appellretten
+appelmoe
+appelmoes
+appelons
+appelpen
+appelpent
+appelret
+appelron
+appelrond
+appelronde
+appels
+appelsch
+appelschimmel
+appelschimmels
+appelsie
+appelsien
+appelsienebomen
+appelsieneboom
+appelsienen
+appelsienenhandelaar
+appelsienenhandelaars
+appelsienenhandelaren
+appelsienesap
+appelsieneschil
+appelsieneschillen
+appelsin
+appelsinen
+appelsiner
+appelsinmarmelade
+appelsinskall
+appelslo
+appelslof
+appelsloffen
+appelspi
+appelspijs
+appelstr
+appelstroop
+appeltaa
+appeltaart
+appeltaarten
+appeltje
+appeltjes
+appelwij
+appelwijf
+appelwijn
+appelwijven
+appena
+append
+appendag
+appendage
+appendaged
+appendages
+appendal
+appendalgia
+appendan
+appendance
+appendancy
+appendant
+appendec
+appendectomies
+appendectomy
+appended
+appender
+appendere
+appenders
+appendic
+appendical
+appendicalgia
+appendice
+appendicectasis
+appendicectomy
+appendices
+appendici
+appendicial
+appendicious
+appendicite
+appendicites
+appendicitis
+appendicitt
+appendicle
+appendicocaecostomy
+appendicostomy
+appendicular
+appendicularia
+appendicularian
+appendiculariidae
+appendiculata
+appendiculate
+appendiculated
+appendik
+appendiks
+appendiksen
+appendikset
+appendin
+appending
+appendit
+appenditious
+appendix
+appendixa
+appendixb
+appendixc
+appendixd
+appendixe
+appendixes
+appendor
+appendorontgenography
+appendot
+appendotome
+appendre
+appends
+appenine
+appenines
+appennin
+appenninene
+appentic
+appentice
+appentis
+appenzel
+appenzella
+appenzeller
+appercei
+apperceive
+apperceived
+apperceiving
+appercep
+apperceptie
+appercepties
+apperception
+apperceptionism
+apperceptionist
+apperceptionistic
+apperceptive
+apperceptively
+appercip
+appercipient
+appere
+apperenc
+apperence
+appersep
+appersepsjon
+appersip
+appersipere
+apperson
+appersonation
+appertai
+appertain
+appertaine
+appertained
+appertaineth
+appertaining
+appertainment
+appertains
+appertin
+appertinent
+appesant
+appesanti
+appesantie
+appesanties
+appesantir
+appesantira
+appesantirai
+appesantiraient
+appesantirais
+appesantirait
+appesantiras
+appesantirent
+appesantirez
+appesantiriez
+appesantirions
+appesantirons
+appesantiront
+appesantis
+appesantissaient
+appesantissais
+appesantissait
+appesantissant
+appesantisse
+appesantissement
+appesantissent
+appesantisses
+appesantissez
+appesantissiez
+appesantissions
+appesantissons
+appesantit
+appesta
+appestai
+appestam
+appestammo
+appestan
+appestando
+appestano
+appestar
+appestare
+appestas
+appestasse
+appestassi
+appestaste
+appestasti
+appestat
+appestata
+appestate
+appestati
+appestato
+appestats
+appestav
+appestava
+appestavi
+appestavo
+appester
+appestera
+appesterai
+appesterei
+appestero
+appesti
+appestia
+appestiamo
+appestiate
+appestin
+appestino
+appesto
+appet
+appete
+appetenc
+appetence
+appetencies
+appetency
+appetent
+appetently
+appetenz
+appetibi
+appetibility
+appetibl
+appetible
+appetibleness
+appetijt
+appetijtelijk
+appetijtelijke
+appetijtelijker
+appetijtelijkst
+appetit
+appetite
+appetites
+appetiti
+appetition
+appetitional
+appetitious
+appetitive
+appetitl
+appetitliche
+appetitlichem
+appetitlichen
+appetitlichere
+appetitlicherem
+appetitlicheren
+appetitlicheres
+appetitliches
+appetitlichstem
+appetitlichster
+appetitlichstes
+appetito
+appetits
+appetitt
+appetitten
+appetittlig
+appetittvekkende
+appetize
+appetizement
+appetizer
+appetizers
+appetizi
+appetizing
+appetizingly
+apphia
+appi
+appian
+appiana
+appianai
+appianam
+appianammo
+appianan
+appianando
+appianano
+appianar
+appianare
+appianas
+appianasse
+appianassi
+appianaste
+appianasti
+appianat
+appianata
+appianate
+appianati
+appianato
+appianav
+appianava
+appianavi
+appianavo
+appianer
+appianera
+appianerai
+appianerei
+appianero
+appiani
+appiania
+appianiamo
+appianiate
+appianin
+appianino
+appiano
+appiccic
+appiccica
+appiccicai
+appiccichi
+appiccico
+appigli
+appiglio
+appii
+appikoug
+appinite
+appiru
+appius
+applaad
+applad
+applanat
+applanate
+applanation
+applaud
+applauda
+applaudable
+applaudably
+applaude
+applauded
+applauder
+applaudere
+applauders
+applaudert
+applauderte
+applaudi
+applaudie
+applaudiere
+applaudierend
+applaudierende
+applaudierendem
+applaudierender
+applaudierendes
+applaudierst
+applaudierte
+applaudierten
+applaudiertest
+applaudies
+applauding
+applaudingly
+applaudir
+applaudira
+applaudirai
+applaudiraient
+applaudirais
+applaudirait
+applaudiras
+applaudirent
+applaudirez
+applaudiriez
+applaudirions
+applaudirons
+applaudiront
+applaudis
+applaudissaient
+applaudissais
+applaudissait
+applaudissant
+applaudisse
+applaudisseer
+applaudisseerde
+applaudisseerden
+applaudisseert
+applaudissement
+applaudissements
+applaudissent
+applaudisseren
+applaudisses
+applaudissez
+applaudissiez
+applaudissions
+applaudissons
+applaudit
+applauds
+applaus
+applause
+applausen
+applauses
+applausi
+applausive
+applausively
+applauso
+apple
+apple2
+applebau
+applebaum
+appleber
+appleberry
+appleblo
+appleblossom
+appleby
+applecar
+applecart
+applecre
+applecreek
+appledor
+appledore
+appledra
+appledrane
+applegar
+applegarth
+applegat
+applegate
+applegate2
+applegate3
+applegro
+applegrove
+applegrower
+appleii
+applejac
+applejack
+applejacks
+applejoh
+applejohn
+applemon
+applemonger
+applen
+applenut
+applepie
+applerin
+appleringy
+appleriv
+appleriver
+appleroo
+appleroot
+apples
+applesau
+applesauce
+applespr
+applesprings
+appleton
+appletoncity
+appleval
+applevalley
+applewif
+applewife
+applewom
+applewoman
+appleyar
+appleyard
+appli
+appliabl
+appliable
+appliableness
+appliably
+applianc
+appliance
+appliances
+appliant
+applica
+applicab
+applicabili
+applicabilities
+applicability
+applicable
+applicableness
+applicables
+applicably
+applicac
+applicai
+applicam
+applicammo
+applican
+applicancy
+applicando
+applicano
+applicant
+applicants
+applicar
+applicare
+applicas
+applicasse
+applicassi
+applicaste
+applicasti
+applicat
+applicata
+applicate
+applicateur
+applicateurs
+applicati
+applicatie
+applicatiedomein
+applicaties
+application
+applications
+applicationsoriented
+applicativa
+applicative
+applicatively
+applicato
+applicator
+applicatorily
+applicators
+applicatory
+applicav
+applicava
+applicavi
+applicavo
+applicaz
+applicazione
+applicazioni
+applicer
+applicera
+appliche
+applichera
+applichero
+applichi
+applichino
+applico
+applicon
+applied
+appliedl
+appliedly
+applier
+appliers
+applies
+applikas
+applikasjon
+applikasjonen
+applikat
+applikation
+applikationen
+applikationer
+applikationerne
+applikations
+applikationsberatung
+applikationsebene
+applikationsinterface
+applikationsniveauet
+applikationsprogram
+applikationsprogramm
+applikationsprogramme
+applikationsprogrammer
+applikationsprogrammerne
+applikationsprogrammet
+applikationsprogramm|rer
+applikationsprozess
+applikationssoftware
+applikationstechnologien
+applikationstilpasning
+applikationstype
+applikationstyper
+applikationsudviklere
+applikationsudvikling
+applikationsunterstu"tzung
+applikationsversion
+applikativ
+applikative
+applikativt
+appliker
+applikere
+applikert
+applikerte
+applin
+appling
+appliqua
+appliquaient
+appliquais
+appliquait
+appliquant
+applique
+applique'
+applique'e
+applique'es
+applique's
+applique`rent
+appliqued
+appliquee
+appliqueing
+appliquent
+appliquer
+appliquera
+appliquerai
+appliqueraient
+appliquerais
+appliquerait
+appliqueras
+appliquerez
+appliqueriez
+appliquerions
+appliquerons
+appliqueront
+appliques
+appliquez
+appliqui
+appliquiez
+appliquions
+appliquo
+appliquons
+appliser
+applisere
+applisert
+applizie
+applizierbares
+applosio
+applosion
+applosiv
+applosive
+applot
+applotme
+applotment
+apply
+applying
+applyingly
+applymen
+applyment
+appl}d
+appnum
+appogger
+appoggera
+appoggerai
+appoggerei
+appoggero
+appoggi
+appoggia
+appoggiai
+appoggiamo
+appoggiano
+appoggiare
+appoggiata
+appoggiate
+appoggiati
+appoggiato
+appoggiatura
+appoggiava
+appoggiavi
+appoggiavo
+appoggin
+appoggino
+appoggio
+appoint
+appointa
+appointable
+appointaient
+appointais
+appointait
+appointant
+appointe
+appointe'
+appointe'e
+appointe'es
+appointe's
+appointe`rent
+appointed
+appointee
+appointees
+appointements
+appointent
+appointer
+appointera
+appointerai
+appointeraient
+appointerais
+appointerait
+appointeras
+appointerez
+appointeriez
+appointerions
+appointerons
+appointeront
+appointers
+appointes
+appointeth
+appointez
+appointi
+appointiez
+appointing
+appointions
+appointive
+appointively
+appointm
+appointment
+appointments
+appointo
+appointons
+appointor
+appoints
+appollod
+appollodorus
+appollon
+appollonio
+appolo
+appoloni
+appolonia
+appolonius
+appomato
+appomatox
+appomatt
+appomattoc
+appomattox
+apponter
+appopolo
+appopolous
+apport
+apporta
+apportai
+apportaient
+apportais
+apportait
+apportan
+apportant
+apportar
+apportare
+apporte
+apporte'
+apporte'e
+apporte'es
+apporte's
+apporte`
+apporte`rent
+apportee
+apporteer
+apporteerde
+apporteerden
+apporteert
+apporten
+apportent
+apporter
+apportera
+apporterai
+apporteraient
+apporterais
+apporterait
+apporteras
+apportere
+apporteren
+apporterez
+apporteriez
+apporterions
+apporterons
+apporteront
+apportes
+apportez
+apportie
+apportiez
+apportio
+apportion
+apportionable
+apportioned
+apportioner
+apportioning
+apportionment
+apportionments
+apportions
+apporton
+apportons
+apports
+apport|r
+apposa
+apposabi
+apposability
+apposabl
+apposable
+apposaie
+apposaient
+apposais
+apposait
+apposant
+appose
+appose'
+appose'e
+appose'es
+appose's
+appose`r
+appose`rent
+apposed
+apposent
+apposer
+apposera
+apposerai
+apposeraient
+apposerais
+apposerait
+apposeras
+apposere
+apposerez
+apposeri
+apposeriez
+apposerions
+apposero
+apposerons
+apposeront
+apposes
+apposez
+apposiez
+apposing
+apposion
+apposions
+apposiop
+apposiopestic
+apposisj
+apposisjon
+apposisjonen
+apposita
+apposite
+appositely
+appositeness
+appositi
+appositie
+apposities
+apposition
+appositional
+appositionally
+appositioner
+appositions
+appositive
+appositively
+apposito
+apposons
+apposta
+appostai
+appostam
+appostammo
+appostan
+appostando
+appostano
+appostar
+appostare
+appostas
+appostasse
+appostassi
+appostaste
+appostasti
+appostat
+appostata
+appostate
+appostati
+appostato
+appostav
+appostava
+appostavi
+appostavo
+apposter
+appostera
+apposterai
+apposterei
+appostero
+apposti
+appostia
+appostiamo
+appostiate
+appostin
+appostino
+apposto
+apppare
+appplica
+appplication
+appprove
+appraisa
+appraisable
+appraisal
+appraisals
+appraise
+appraised
+appraisement
+appraiser
+appraisers
+appraises
+appraisi
+appraising
+appraisingly
+appraisive
+appre'ci
+appre'cia
+appre'ciable
+appre'ciables
+appre'ciaient
+appre'ciais
+appre'ciait
+appre'ciant
+appre'ciation
+appre'ciations
+appre'cie
+appre'cie'
+appre'cie'e
+appre'cie'es
+appre'cie's
+appre'cie`rent
+appre'cient
+appre'cier
+appre'ciera
+appre'cierai
+appre'cieraient
+appre'cierais
+appre'cierait
+appre'cieras
+appre'cierez
+appre'cieriez
+appre'cierions
+appre'cierons
+appre'cieront
+appre'cies
+appre'ciez
+appre'ciiez
+appre'ciions
+appre'cions
+appre'he
+appre'henda
+appre'hendaient
+appre'hendais
+appre'hendait
+appre'hendant
+appre'hende
+appre'hende'
+appre'hende'e
+appre'hende'es
+appre'hende's
+appre'hende`rent
+appre'hendent
+appre'hender
+appre'hendera
+appre'henderai
+appre'henderaient
+appre'henderais
+appre'henderait
+appre'henderas
+appre'henderez
+appre'henderiez
+appre'henderions
+appre'henderons
+appre'henderont
+appre'hendes
+appre'hendez
+appre'hendiez
+appre'hendions
+appre'hendons
+appre'hension
+appre'hensions
+appre^t
+appre^ta
+appre^taient
+appre^tais
+appre^tait
+appre^tant
+appre^te
+appre^te'
+appre^te'e
+appre^te'es
+appre^te's
+appre^te`rent
+appre^tent
+appre^ter
+appre^tera
+appre^terai
+appre^teraient
+appre^terais
+appre^terait
+appre^teras
+appre^terez
+appre^teriez
+appre^terions
+appre^terons
+appre^teront
+appre^tes
+appre^tez
+appre^ti
+appre^tiez
+appre^tions
+appre^to
+appre^tons
+appre^ts
+apprecia
+appreciable
+appreciably
+appreciant
+appreciate
+appreciated
+appreciates
+appreciatie
+appreciaties
+appreciating
+appreciatingly
+appreciation
+appreciational
+appreciations
+appreciativ
+appreciative
+appreciatively
+appreciativeness
+appreciator
+appreciatorily
+appreciators
+appreciatory
+apprecie
+apprecieerde
+apprecieerden
+apprecieren
+appredic
+appredicate
+apprehen
+apprehend
+apprehended
+apprehender
+apprehending
+apprehendingly
+apprehends
+apprehensibility
+apprehensible
+apprehensibly
+apprehension
+apprehensions
+apprehensive
+apprehensively
+apprehensiveness
+apprenai
+apprenaient
+apprenais
+apprenait
+apprenan
+apprenant
+apprend
+apprendi
+apprendimento
+apprendr
+apprendra
+apprendrai
+apprendraient
+apprendrais
+apprendrait
+apprendras
+apprendre
+apprendrez
+apprendriez
+apprendrions
+apprendrons
+apprendront
+apprends
+apprenez
+apprenie
+appreniez
+apprenio
+apprenions
+apprenne
+apprennent
+apprennes
+apprenon
+apprenons
+apprense
+apprenti
+apprentice
+apprenticed
+apprenticehood
+apprenticement
+apprentices
+apprenticeship
+apprenticeships
+apprenticing
+apprentie
+apprenties
+apprentis
+apprentissage
+apprentissages
+appresse
+appressed
+appresso
+appressor
+appressorial
+appressorium
+appresta
+appretee
+appreteer
+appreteerde
+appreteerden
+appreteert
+appreter
+appreteren
+appreteu
+appreteur
+appretur
+appreturen
+apprezza
+apprezzai
+apprezzano
+apprezzare
+apprezzata
+apprezzate
+apprezzati
+apprezzato
+apprezzava
+apprezzavi
+apprezzavo
+apprezze
+apprezzera
+apprezzero
+apprezzi
+apprezzino
+apprezzo
+appriren
+apprirent
+appris
+apprise
+apprised
+appriser
+apprisers
+apprises
+apprisin
+apprising
+apprit
+apprivoi
+apprivoisa
+apprivoisaient
+apprivoisais
+apprivoisait
+apprivoisant
+apprivoise
+apprivoise'
+apprivoise'e
+apprivoise'es
+apprivoise's
+apprivoise`rent
+apprivoisement
+apprivoisent
+apprivoiser
+apprivoisera
+apprivoiserai
+apprivoiseraient
+apprivoiserais
+apprivoiserait
+apprivoiseras
+apprivoiserez
+apprivoiseriez
+apprivoiserions
+apprivoiserons
+apprivoiseront
+apprivoises
+apprivoisez
+apprivoisiez
+apprivoisions
+apprivoisons
+apprize
+apprized
+apprizem
+apprizement
+apprizer
+apprizes
+apprizin
+apprizing
+approach
+approachability
+approachabl
+approachable
+approachableness
+approachd
+approached
+approacher
+approachers
+approaches
+approacheth
+approaching
+approachless
+approachment
+approacht
+approachto
+approbas
+approbasjon
+approbasjonen
+approbat
+approbate
+approbate[1]
+approbated
+approbateur
+approbateurs
+approbatie
+approbaties
+approbatif
+approbatifs
+approbating
+approbation
+approbations
+approbative
+approbativeness
+approbatives
+approbator
+approbatory
+approbatrice
+approbatrices
+approbatur
+approber
+approbere
+approbert
+approcci
+approccio
+approcha
+approchaient
+approchais
+approchait
+approchant
+approchante
+approchantes
+approchants
+approche
+approche'
+approche'e
+approche'es
+approche's
+approche`rent
+approchent
+approcher
+approchera
+approcherai
+approcheraient
+approcherais
+approcherait
+approcheras
+approcherez
+approcheriez
+approcherions
+approcherons
+approcheront
+approches
+approchez
+approchi
+approchiez
+approchions
+approcho
+approchons
+approda
+approdai
+approdam
+approdammo
+approdan
+approdando
+approdano
+approdar
+approdare
+approdas
+approdasse
+approdassi
+approdaste
+approdasti
+approdat
+approdata
+approdate
+approdati
+approdato
+approdav
+approdava
+approdavi
+approdavo
+approder
+approdera
+approderai
+approderei
+approdero
+approdi
+approdia
+approdiamo
+approdiate
+approdin
+approdino
+approdo
+approfit
+approfitta
+approfittando
+approfitti
+approfitto
+approfon
+approfondi
+approfondiamo
+approfondie
+approfondies
+approfondir
+approfondira
+approfondirai
+approfondiraient
+approfondirais
+approfondirait
+approfondiras
+approfondire
+approfondirent
+approfondirez
+approfondiriez
+approfondirions
+approfondirons
+approfondiront
+approfondis
+approfondissaient
+approfondissais
+approfondissait
+approfondissant
+approfondisse
+approfondissement
+approfondissements
+approfondissent
+approfondisses
+approfondissez
+approfondissiez
+approfondissions
+approfondissons
+approfondit
+approksi
+approksimasjon
+approksimasjonen
+approksimasjonene
+approksimasjoner
+approksimation
+approksimere
+approksimerede
+approksimerende
+approksimerer
+approksimeres
+approksimerte
+appronta
+approntai
+approntano
+approntare
+approntata
+approntate
+approntati
+approntato
+approntava
+approntavi
+approntavo
+appronte
+approntera
+approntero
+appronti
+approntino
+appronto
+approof
+appropie
+appropiere
+appropierte
+appropin
+appropinquate
+appropinquation
+appropinquity
+appropre
+appropri
+appropria
+appropriable
+appropriai
+appropriaient
+appropriais
+appropriait
+appropriant
+appropriasjon
+appropriasjonen
+appropriate
+appropriated
+appropriately
+appropriateness
+appropriates
+appropriating
+appropriation
+appropriations
+appropriative
+appropriativeness
+appropriato
+appropriator
+appropriators
+approprie
+approprie'
+approprie'e
+approprie'es
+approprie's
+approprie`rent
+approprient
+approprier
+appropriera
+approprierai
+approprieraient
+approprierais
+approprierait
+approprieras
+approprierez
+approprieriez
+approprierions
+approprierons
+approprieront
+appropries
+appropriez
+appropriiez
+appropriions
+approprino
+approprio
+approprions
+approssi
+approssima
+approssimi
+approssimo
+approuva
+approuvaient
+approuvais
+approuvait
+approuvant
+approuve
+approuve'
+approuve'e
+approuve'es
+approuve's
+approuve`rent
+approuvent
+approuver
+approuvera
+approuverai
+approuveraient
+approuverais
+approuverait
+approuveras
+approuverez
+approuveriez
+approuverions
+approuverons
+approuveront
+approuves
+approuvez
+approuvi
+approuviez
+approuvions
+approuvo
+approuvons
+approv
+approva
+approvab
+approvable
+approvableness
+approvai
+approval
+approvals
+approvam
+approvammo
+approvan
+approvance
+approvando
+approvano
+approvar
+approvare
+approvas
+approvasse
+approvassi
+approvaste
+approvasti
+approvat
+approvata
+approvate
+approvati
+approvato
+approvav
+approvava
+approvavi
+approvavo
+approve
+approved
+approvedly
+approvedness
+approvem
+approvement
+approver
+approvera
+approverai
+approverei
+approvero
+approvers
+approves
+approvest
+approvet
+approveth
+approvi
+approvia
+approviamo
+approviandeer
+approviandeerde
+approviandeerden
+approviandeert
+approvianderen
+approviate
+approvin
+approving
+approvingly
+approvino
+approvis
+approvisionna
+approvisionnaient
+approvisionnais
+approvisionnait
+approvisionnant
+approvisionne
+approvisionne'
+approvisionne'e
+approvisionne'es
+approvisionne's
+approvisionne`rent
+approvisionnement
+approvisionnements
+approvisionnent
+approvisionner
+approvisionnera
+approvisionnerai
+approvisionneraient
+approvisionnerais
+approvisionnerait
+approvisionneras
+approvisionnerez
+approvisionneriez
+approvisionnerions
+approvisionnerons
+approvisionneront
+approvisionnes
+approvisionnez
+approvisionniez
+approvisionnions
+approvisionnons
+approvo
+approx
+approxim
+approximable
+approximal
+approximant
+approximants
+approximate
+approximated
+approximately
+approximates
+approximatief
+approximatieve
+approximatif
+approximatifs
+approximating
+approximation
+approximations
+approximativa
+approximative
+approximatively
+approximativement
+approximativeness
+approximatives
+approximativt
+approximator
+approximierende
+apps
+appstate
+appu
+appuglie
+appugliese
+appui
+appui-br
+appui-bras
+appui-te
+appui-te^te
+appuie
+appuient
+appuiera
+appuierai
+appuieraient
+appuierais
+appuierait
+appuieras
+appuiere
+appuierez
+appuieri
+appuieriez
+appuierions
+appuiero
+appuierons
+appuieront
+appuies
+appuis
+appuis-b
+appuis-bras
+appuis-t
+appuis-te^te
+appuku
+appulse
+appulsio
+appulsion
+appulsiv
+appulsive
+appulsively
+appunta
+appuntai
+appuntam
+appuntammo
+appuntan
+appuntando
+appuntano
+appuntar
+appuntare
+appuntas
+appuntasse
+appuntassi
+appuntaste
+appuntasti
+appuntat
+appuntata
+appuntate
+appuntati
+appuntato
+appuntav
+appuntava
+appuntavi
+appuntavo
+appunter
+appuntera
+appunterai
+appunterei
+appuntero
+appunti
+appuntia
+appuntiamo
+appuntiate
+appuntin
+appuntino
+appunto
+appura
+appurai
+appuramm
+appurammo
+appurand
+appurando
+appurano
+appurare
+appuraro
+appurarono
+appurass
+appurasse
+appurassi
+appurast
+appuraste
+appurasti
+appurata
+appurate
+appurati
+appurato
+appurava
+appuravamo
+appuravano
+appuravate
+appuravi
+appuravo
+appurera
+appurerai
+appurere
+appurerei
+appureremo
+appurerete
+appurero
+appuri
+appuriam
+appuriamo
+appuriat
+appuriate
+appurike
+appurino
+appuro
+appurten
+appurtenance
+appurtenances
+appurtenant
+appuru
+apputoxu
+appuya
+appuyaie
+appuyaient
+appuyais
+appuyait
+appuyant
+appuye'
+appuye'e
+appuye'es
+appuye's
+appuye`r
+appuye`rent
+appuyer
+appuyez
+appuyiez
+appuyion
+appuyions
+appuyons
+apq
+apr
+apr.
+apra
+apractic
+apraxia
+apraxic
+apraxie
+apre
+apre`s
+apre`s-d
+apre`s-demain
+apre`s-g
+apre`s-guerre
+apre`s-guerres
+apre`s-m
+apre`s-midi
+apre`s-r
+apre`s-rasage
+apre`s-s
+apre`s-ski
+apre`s-skis
+apre`s-v
+apre`s-vente
+apre`stamo
+aprea
+apreciabilidad
+apreciable
+apreciacio`n
+apreciadamente
+apreciador
+apreciadora
+apreciadura
+apreciamiento
+apreciar
+apreciativa
+apreciativo
+aprecio
+aprehender
+aprehendiente
+aprehensa
+aprehensio`n
+aprehensiva
+aprehensivo
+aprehenso
+aprehensor
+aprehensora
+aprehensoria
+aprehensorio
+apremiadamente
+apremiador
+apremiadora
+apremiadura
+apremiamiento
+apremiante
+apremiantemente
+apremiar
+apremio
+apremir
+aprendedor
+aprendedora
+aprender
+aprendiente
+aprendiz
+aprendiza
+aprendizaje
+aprendo
+aprendol
+aprendola
+aprendos
+aprendosi
+aprensador
+aprensadora
+aprensadura
+aprensar
+aprensio`n
+aprensiva
+aprensivo
+apres
+apresa
+apresador
+apresadora
+apresamiento
+apresar
+apresivamente
+apreso
+aprestar
+apresto
+apresura
+apresuracio`n
+apresurada
+apresuradamente
+apresurado
+apresuramiento
+apresurar
+apresurosa
+apresuroso
+apretada
+apretadamente
+apretadera
+apretadero
+apretadiza
+apretadizo
+apretado
+apretador
+apretadora
+apretadura
+apretamiento
+apretante
+apretar
+apretativa
+apretativo
+apreto`n
+apretujar
+apretujo`n
+apretura
+aprevenir
+apri
+apriamo
+apricate
+apricati
+aprication
+aprickle
+apricot
+apricotc
+apricotcolored
+apricots
+apriel
+apriesa
+aprieto
+aprigli
+aprii
+aprikos
+aprikose
+aprikosen
+aprikoser
+april
+aprildag
+aprildagene
+aprildager
+aprile
+aprilesq
+aprilesque
+aprilett
+aprilette
+aprilgek
+aprilgekken
+aprilgra
+aprilgrap
+aprilgrappen
+aprili
+apriline
+aprilis
+aprill
+aprilmar
+aprilmarch
+aprilmop
+aprilmoppen
+aprilo
+aprils
+aprilsch
+aprilscherze
+aprilscherzen
+aprilscherzes
+aprilse
+aprilsna
+aprilsnarr
+aprilsp|
+aprilsp|k
+aprilsp|ken
+aprilvis
+aprilvissen
+aprilwee
+aprilweer
+aprilzaa
+aprilzaad
+aprimar
+apriori
+apriori`stica
+apriori`stico
+aprioris
+apriorischen
+apriorisk
+aprioriske
+apriorism
+apriorisme
+apriorismo
+apriorist
+aprioristic
+aprioristisch
+aprioristische
+apriorit
+apriority
+aprirann
+apriranno
+aprire
+aprirla
+aprirlo
+aprirmi
+aprirono
+aprirsi
+aprisa
+apriscadero
+apriscar
+aprisco
+aprisionadamente
+aprisionar
+aprisquero
+aprite
+apritevi
+apriva
+aprivano
+apro
+aproape
+aproar
+aprobacio`n
+aprobada
+aprobado
+aprobador
+aprobadora
+aprobante
+aprobanza
+aprobar
+aprobativa
+aprobativo
+aprobatoria
+aprobatoriamente
+aprobatorio
+aproches
+aprocta
+aproctia
+aproctou
+aproctous
+aprodar
+aprometer
+apron
+aproneer
+apronful
+aproning
+apronles
+apronless
+apronlik
+apronlike
+aprono
+aprons
+aprontamiento
+aprontar
+apropa
+apropaa
+apropiable
+apropiacio`n
+apropiada
+apropiadamente
+apropiado
+apropiador
+apropiadora
+apropiar
+apropincuacio`n
+apropincuarse
+apropo`sito
+apropos
+apropose
+aproposet
+apropros
+aprop}
+aprosexi
+aprosexia
+aprosopi
+aprosopia
+aprosopo
+aprosopous
+aprotero
+aproterodont
+aprotype
+aprovecer
+aprovechable
+aprovechada
+aprovechadamente
+aprovechado
+aprovechador
+aprovechadora
+aprovechamiento
+aprovechante
+aprovechar
+aprovecimiento
+aprovisionar
+aproximacio`n
+aproximada
+aproximadamente
+aproximado
+aproximar
+aproximativa
+aproximativo
+aproxis
+aprwe
+apryle
+aps
+apsara
+apsaras
+apsd
+apsd-ii-
+apsd-ii-os062
+apse
+apselaph
+apselaphesia
+apselaphesis
+apses
+apsidal
+apsidall
+apsidally
+apsides
+apsidiol
+apsidiole
+apsis
+apsissen
+apso
+apspel
+apsu
+apsychia
+apsychic
+apsychical
+apt
+apta
+aptal
+aptaleon
+aptamente
+aptar
+apte
+aptekman
+aptenody
+aptenodytes
+apter
+aptera
+apteral
+apteran
+apterial
+apterium
+apteroid
+apterous
+apteryge
+apteryges
+apterygi
+apterygial
+apterygidae
+apterygiformes
+apterygo
+apterygogenea
+apterygota
+apterygote
+apterygotous
+apteryx
+apteryxe
+apteryxes
+aptes
+aptest
+apteza
+aptian
+aptiana
+aptidon
+aptit
+aptitud
+aptitude
+aptitudes
+aptitudi
+aptitudinal
+aptitudinally
+aptly
+aptness
+aptnesse
+aptnesses
+apto
+aptos
+aptote
+aptotic
+aptyalia
+aptyalis
+aptyalism
+aptychus
+apu
+apu\adar
+apu\alada
+apu\alado
+apu\alar
+apu\ar
+apu\ear
+apu\etear
+apucikwa
+apucikwar
+apud
+apuesta
+apuestamente
+apuesto
+apuga
+apuga-
+apui
+apuk
+apukin
+apulgarar
+apulgararse
+apulia
+apulian
+apuliast
+apuliastation
+apulien
+apulmoni
+apulmonic
+apulse
+apulso
+apunarse
+apunchar
+apuntacio`n
+apuntada
+apuntadamente
+apuntado
+apuntador
+apuntadora
+apuntadura
+apuntalamiento
+apuntalar
+apuntamiento
+apuntar
+apunte
+apuntillar
+apuoth
+apura
+apuracabos
+apuracio`n
+apurada
+apuradamente
+apuradero
+apurado
+apurador
+apuradora
+apuradura
+apurahua
+apurahuano
+apuraien
+apuraient
+apurais
+apurait
+apuramiento
+apurant
+apurar
+apurativa
+apurativo
+apurba
+apure
+apure'
+apure'e
+apure'es
+apure's
+apure\a
+apure\o
+apure`re
+apure`rent
+apuremen
+apurement
+apurent
+apurer
+apurera
+apurerai
+apureraient
+apurerais
+apurerait
+apureras
+apurerez
+apurerie
+apureriez
+apurerio
+apurerions
+apureron
+apurerons
+apureront
+apures
+apurez
+apurezor
+apuri
+apuriez
+apurike
+apurike-
+apurikes
+apurimac
+apurina
+apurions
+apuro
+apuro-ch
+apuro-ti
+apuro`n
+apuroba
+apuroba-
+apuroch
+apurochi
+apurona
+apurons
+apuroti
+apurotin
+apurpose
+apurrir
+apurucay
+apurucayali
+apurve
+apus
+aput
+apw
+apwot
+apyonin
+apyrene
+apyretic
+apyrexia
+apyrexial
+apyrexy
+apyrotyp
+apyrotype
+apyrous
+apytare
+apz
+aq
+aqa
+aqaba
+aqabah
+aqalim
+aqatic
+aql
+aqm
+aqp
+aqsu
+aqua
+aquabell
+aquabelle
+aquabib
+aquacade
+aquacades
+aquacult
+aquacultural
+aquaculture
+aquaduct
+aquaducten
+aquae
+aquaeman
+aquaemanale
+aquafort
+aquafortist
+aquage
+aquagree
+aquagreen
+aqualung
+aquamari
+aquamarijn
+aquamarijnen
+aquamarine
+aquamarines
+aquamete
+aquameter
+aquanaut
+aquanauts
+aquaplan
+aquaplane
+aquaplaned
+aquaplanes
+aquaplaning
+aquapunc
+aquapuncture
+aquarel
+aquarell
+aquarelle
+aquarellen
+aquarelles
+aquarelletje
+aquarelletjes
+aquarellist
+aquarelliste
+aquarellisten
+aquarellistes
+aquarels
+aquarelstudie
+aquarelstudies
+aquaria
+aquarial
+aquarian
+aquarians
+aquarid
+aquarien
+aquarii
+aquariia
+aquariis
+aquariist
+aquariiu
+aquariiums
+aquarist
+aquarists
+aquarium
+aquariumplant
+aquariumplanten
+aquariums
+aquarius
+aquarter
+aquas
+aquasco
+aquascut
+aquascutum
+aquashic
+aquashicola
+aquatic
+aquatica
+aquatical
+aquatically
+aquatics
+aquatile
+aquating
+aquatint
+aquatinta
+aquatinted
+aquatinter
+aquatints
+aquation
+aquatiqu
+aquatique
+aquatiques
+aquative
+aquativeness
+aquatone
+aquatones
+aquavale
+aquavalent
+aquavit
+aquavits
+aquaviva
+aque`n
+aquea
+aquebogu
+aquebogue
+aquebrazarse
+aquedador
+aquedadora
+aquedar
+aqueduc
+aqueducs
+aqueduct
+aqueducts
+aquejadamente
+aquejador
+aquejadora
+aquejamiento
+aquejar
+aquejo
+aquejosa
+aquejosamente
+aquejoso
+aquel
+aquela
+aquelarre
+aquele
+aquella
+aquellar
+aquello
+aquellotrar
+aquelo
+aquende
+aquenio
+aqueo
+aqueogla
+aqueoglacial
+aqueoign
+aqueoigneous
+aqueomer
+aqueomercurial
+aqueous
+aqueousl
+aqueously
+aqueousn
+aqueousness
+aquerarse
+aquerenciada
+aquerenciado
+aquerenciarse
+aquesa
+aquese
+aqueso
+aquesta
+aquestar
+aqueste
+aquesto
+aqueta
+aqueuse
+aqueuses
+aqueux
+aqui`
+aquicolo
+aquicolous
+aquicult
+aquicultural
+aquiculture
+aquiculturist
+aquiescencia
+aquiescente
+aquietador
+aquietadora
+aquietadoramente
+aquietamiento
+aquietante
+aquietar
+aquifer
+aquifero
+aquiferous
+aquifers
+aquifoli
+aquifolia`cea
+aquifolia`ceo
+aquifoliaceae
+aquifoliaceous
+aquifolio
+aquiform
+aquila
+aquilari
+aquilaria
+aquilatamiento
+aquilatar
+aquilawo
+aquilawood
+aquile
+aquile\a
+aquile\o
+aquilea
+aquilege
+aquilegi
+aquilegia
+aquiles
+aquili`fero
+aquilian
+aquilid
+aquilin
+aquilina
+aquiline
+aquilino
+aquilins
+aquilla
+aquillada
+aquillado
+aquillotrar
+aquillotro
+aquilo`n
+aquilonal
+aquilonar
+aquilonaria
+aquilonario
+aquilone
+aquiloni
+aquin
+aquinas
+aquincub
+aquincubital
+aquincubitalism
+aquinist
+aquino
+aquintoc
+aquintocubital
+aquintocubitalism
+aquintralarse
+aquiparo
+aquiparous
+aquisite
+aquisiteur
+aquisiteure
+aquisiteuren
+aquisiti
+aquisition
+aquisitionen
+aquistador
+aquistadora
+aquistap
+aquistapace
+aquistar
+aquita`nica
+aquita`nico
+aquitain
+aquitaine
+aquitana
+aquitani
+aquitania
+aquitanian
+aquitanien
+aquitano
+aquiva
+aquiver
+aquivo
+aquo
+aquocaps
+aquocapsulitis
+aquocarb
+aquocarbonic
+aquocell
+aquocellolitis
+aquone
+aquopent
+aquopentamminecobaltic
+aquose
+aquosity
+aquotiza
+aquotization
+aquotize
+ar
+ar-mac1
+ara
+ara\a
+ara\ada
+ara\ador
+ara\adora
+ara\amiento
+ara\ar
+ara\azo
+ara\enta
+ara\ento
+ara\era
+ara\ero
+ara\il
+ara\o
+ara\o`n
+ara\uela
+ara\uelo
+ara`bica
+ara`bico
+ara`biga
+ara`bigo
+ara`cea
+ara`ceo
+ara`cnida
+ara`cnido
+ara`n
+ara`ndano
+araarash
+araarasi
+arab
+araba
+arabadji
+arabadjis
+arabah
+arabais
+arabakos
+araban
+arabana
+arabanic
+arabberb
+arabberber
+arabe
+arabel
+arabela
+arabele
+arabella
+arabelle
+araber
+arabere
+araberen
+araberens
+araberhe
+araberhest
+araberhestene
+araberhester
+araberin
+araberinnen
+araberla
+araberland
+araberli
+araberliga
+araberne
+arabers
+araberst
+araberstatene
+araberve
+araberverdenen
+arabes
+arabesca
+arabesco
+arabesk
+arabeske
+arabesken
+arabesker
+arabesks
+arabesqu
+arabesque
+arabesquely
+arabesquerie
+arabesques
+arabesuk
+arabi
+arabi`a
+arabia
+arabian
+arabiani
+arabianize
+arabianp
+arabians
+arabias
+arabic
+arabica
+arabicis
+arabicism
+arabiciz
+arabicize
+arabicized
+arabidop
+arabidopsis
+arabie
+arabien
+arabier
+arabiere
+arabieren
+arabilit
+arability
+arabin
+arabinic
+arabinos
+arabinose
+arabinosic
+arabinya
+arabio
+arabis
+arabisat
+arabisation
+arabisch
+arabische
+arabischem
+arabischen
+arabischer
+arabischt
+arabiser
+arabisk
+arabiske
+arabism
+arabismo
+arabisra
+arabisraeli
+arabist
+arabista
+arabiste
+arabisten
+arabit
+arabitol
+arabiyeh
+arabizacio`n
+arabizar
+arabizat
+arabization
+arabize
+arabized
+arabizin
+arabizing
+arabjabb
+arabjabbari
+arabkir
+arable
+arables
+arabo
+arabophi
+arabophil
+arabopho
+arabophone
+arabophones
+arabs
+arabsat
+arabshei
+arabsheibani
+arabswah
+arabswahili
+arabu
+araby
+araca
+aracana
+aracanga
+aracari
+araceae
+araceli
+araceous
+arachic
+arachide
+arachides
+arachido
+arachidonic
+arachin
+arachis
+arachnac
+arachnactis
+arachne
+arachnea
+arachnean
+arachnid
+arachnida
+arachnidan
+arachnidial
+arachnidism
+arachnidium
+arachnids
+arachnis
+arachnism
+arachnit
+arachnites
+arachnitis
+arachnoi
+arachnoid
+arachnoidal
+arachnoidea
+arachnoidean
+arachnoiditis
+arachnol
+arachnological
+arachnologist
+arachnology
+arachnom
+arachnomorphae
+arachnop
+arachnophagous
+arachnopia
+aracno`logo
+aracnoides
+aracnolo`gica
+aracnolo`gico
+aracnologi`a
+arad
+arada
+aradate
+aradhin
+aradidae
+aradigi
+arado
+arador
+aradora
+aradro
+aradukur
+aradura
+arae
+araeosty
+araeostyle
+araeosys
+araeosystyle
+arafat
+arafundi
+arafura
+araga
+aragakas
+aragallu
+aragallus
+aragane
+aragimo
+arago
+arago`n
+aragon
+aragonas
+aragone`s
+aragones
+aragonese
+aragonesismo
+aragonia
+aragonian
+aragonit
+aragonite
+aragonito
+aragorn
+aragosta
+aragoste
+aragoto
+aragu
+aragua
+araguaia
+araguato
+araguira`
+aragure
+aragwa
+aragyou
+arah
+arahama
+arai
+araiagar
+araiage
+araiakin
+araianto
+araiba
+araibari
+araida
+araidama
+araidas
+araidash
+araidasi
+araigami
+araigne'
+araigne'e
+araigne'es
+araihari
+araiharu
+araijunk
+araikaor
+araiko
+araimach
+araimati
+araimie
+araimiek
+araimiho
+araimono
+araimoto
+arain
+arainaga
+arainaom
+arainmen
+arainori
+arains
+araioto
+araiotos
+araishi
+araishou
+araisi
+araiso
+araisumi
+araitama
+araitate
+araiyouk
+araiyumi
+araizara
+arak
+araka
+arakabe
+arakajim
+arakan
+arakanes
+arakanese
+arakarut
+arakaseg
+arakata
+arakawa
+arakawai
+arakawaite
+arakawak
+arakawao
+arakazim
+arakchey
+arakcheyev
+arake
+araken
+arakezur
+arakh
+arakho
+araki
+arakimis
+arakino
+arakirin
+arakiyuk
+arakiyum
+arakizam
+araks
+araku
+arakure
+arakurem
+aral
+aral-see
+araldit
+araldo
+arales
+aralia
+aralia`cea
+aralia`ceo
+araliace
+araliaceae
+araliaceous
+araliad
+araliaep
+araliaephyllum
+aralie
+aralioph
+araliophyllum
+aralkyl
+aralkyla
+aralkylated
+aralle
+aralleta
+aralletabulahan
+aram
+arama
+aramachi
+aramaean
+aramaic
+aramaici
+aramaicize
+aramaism
+aramaki
+aramanik
+aramashi
+aramasi
+aramata
+aramati
+aramatsu
+aramatu
+aramaue
+aramayoi
+aramayoite
+aramba
+arambel
+arambre
+aramea
+arameeer
+arameeers
+arameer
+aramees
+arameese
+arameeser
+arameest
+arameisk
+arameiske
+arameo
+aramia
+aramic
+aramidae
+aramideh
+aramina
+araminta
+aramio
+aramis
+aramites
+aramitess
+arammo
+aramo
+aramodo
+aramono
+aramoto
+arampi
+aramu
+aramus
+aramusha
+aramusya
+aran
+arana
+aranadan
+aranami
+aranawa
+arance
+arancel
+arancelaria
+arancelario
+arancia
+aranda
+arandai
+arandanedo
+arandela
+arandelo
+arandelovic
+arandic
+arandillo
+arandina
+arandino
+arando
+arandui
+arane`s
+aranea
+araneae
+araneid
+araneida
+araneidan
+araneifo
+araneiform
+araneiformes
+araneiformia
+aranein
+araneina
+araneoid
+araneoidea
+araneolo
+araneologist
+araneology
+araneous
+aranera
+aranero
+aranesa
+aranga
+arangkaa
+arango
+arangonesa
+arangorri
+aranibar
+araniego
+arano
+aranosa
+aranoso
+aransasp
+aransaspass
+arantomo
+aranu
+aranuka
+aranuri
+aranya
+aranyaka
+aranzada
+arao
+araona
+araoshi
+araosi
+arap
+arapac
+arapahit
+arapahite
+arapaho
+arapahoe
+arapahos
+arapaima
+arapaso
+arapenne
+arapesh
+araphoro
+araphorostic
+arapium
+arapovic
+arappo
+arapunga
+araquaju
+arar
+arara
+araracan
+araracanga
+araracua
+araracuara
+ararage
+ararao
+ararapin
+ararapina
+ararasha
+ararashawanawa
+ararat
+ararauna
+ararawa
+arare
+arariba
+ararieki
+araroba
+ararono
+araryouz
+aras
+arasagas
+arasairi
+arasawa
+arase
+araser
+arash
+arashi
+arashiba
+arashifu
+arashigo
+arashima
+arashime
+arashio
+arashiya
+arasi
+arasiba
+arasifuk
+arasigot
+arasima
+arasimaw
+arasime
+arasio
+arasiyam
+araso
+arasocia
+arasocialist
+arasoe
+arasoena
+arasoi
+arasot
+arasou
+arasowar
+araspaso
+arasse
+arassero
+arassi
+arassimo
+araste
+arasti
+arasuji
+arasuka
+arasuzi
+arat
+arata
+arataka
+aratam
+aratama
+aratamay
+aratame
+aratamet
+aratamiy
+aratan
+aratani
+aratano
+arate
+arathon
+arati
+aration
+arato
+aratoon
+aratoria
+aratorio
+aratory
+aratri
+aratro
+aratsu
+aratu
+arau
+araua
+arauan
+arauca
+araucan
+araucana
+araucani
+araucania
+araucanian
+araucanista
+araucano
+araucari
+araucaria
+araucariaceae
+araucarian
+araucarioxylon
+arauine
+arauite
+arauja
+araujia
+araujo
+araumi
+arauna
+araunah
+araundo
+arava
+aravamo
+aravamud
+aravamudhan
+aravano
+aravate
+aravi
+aravia
+aravico
+aravo
+araw
+arawa
+arawak
+arawakan
+arawakia
+arawakian
+arawar
+araware
+arawas
+arawase
+arawaza
+arawe
+arawete
+arawum
+aray
+araya
+arayachi
+arayaday
+arayamae
+arayashi
+arayasi
+arayasin
+arayatik
+araying
+arayuru
+araz
+araza`
+arazaram
+arazu
+arb
+arba
+arbacia
+arbacin
+arbah
+arbais
+arbale`t
+arbale`te
+arbale`tes
+arbalest
+arbalester
+arbalestre
+arbalestrier
+arbalestrilla
+arbalests
+arbalist
+arbalister
+arbalo
+arbanasi
+arbanvil
+arbanville
+arbar
+arbathit
+arbathite
+arbatt
+arbec
+arbeid
+arbeida
+arbeidd
+arbeidde
+arbeidden
+arbeide
+arbeiden
+arbeidende
+arbeidene
+arbeider
+arbeideravis
+arbeiderbefolkningens
+arbeiderbevegelse
+arbeiderbevegelsen
+arbeiderbevegelsens
+arbeiderblad
+arbeiderbladet
+arbeiderbladets
+arbeiderblads
+arbeiderdemonstrasjon
+arbeidere
+arbeideren
+arbeideres
+arbeiderfamilie
+arbeiderfamilier
+arbeiderforbund
+arbeiderforening
+arbeiderforeningene
+arbeiderhjem
+arbeiderklasse
+arbeiderklassen
+arbeiderklassens
+arbeiderkomiteen
+arbeiderkonflikter
+arbeiderlag
+arbeiderlaget
+arbeidermakt
+arbeiderne
+arbeidernes
+arbeiderniv}
+arbeiderparti
+arbeiderpartiene
+arbeiderpartier
+arbeiderpartiet
+arbeiderpartiets
+arbeiderpartiregjering
+arbeiderpartis
+arbeiderpartivelgere
+arbeiders
+arbeidersamfunn
+arbeidersbevolking
+arbeidersbeweging
+arbeidersbewegingen
+arbeidersklas
+arbeidersklasse
+arbeiderspartij
+arbeiderspartijen
+arbeidersstand
+arbeiderstreiker
+arbeiderstrein
+arbeiderstreinen
+arbeiderswoning
+arbeiderswoningen
+arbeidervegelse
+arbeidervernlovens
+arbeides
+arbeidet
+arbeidets
+arbeids
+arbeidsb
+arbeidsbelastningen
+arbeidsbelysning
+arbeidsbemiddeling
+arbeidsbeurs
+arbeidsbeurzen
+arbeidsbordet
+arbeidsbrakke
+arbeidsbredde
+arbeidsbrillene
+arbeidsbureau
+arbeidsbureaus
+arbeidsbyrde
+arbeidsbyrden
+arbeidsc
+arbeidscontract
+arbeidscontractant
+arbeidscontractanten
+arbeidscontracten
+arbeidsd
+arbeidsdag
+arbeidsdagen
+arbeidsdagens
+arbeidsdager
+arbeidsdeling
+arbeidsdepartementet
+arbeidsdepartementets
+arbeidsdienst
+arbeidsdirektoratet
+arbeidsdirekt|r
+arbeidsdirekt|ren
+arbeidsduur
+arbeidse
+arbeidseffektivitet
+arbeidsenhetene
+arbeidsevne
+arbeidsf
+arbeidsfellesskap
+arbeidsfelt
+arbeidsfolk
+arbeidsfolkene
+arbeidsfordeling
+arbeidsforhold
+arbeidsforholdene
+arbeidsforkortelser
+arbeidsform
+arbeidsformann
+arbeidsformene
+arbeidsformer
+arbeidsformidlingen
+arbeidsfred
+arbeidsfysiologiske
+arbeidsf|r
+arbeidsf|re
+arbeidsf|rt
+arbeidsg
+arbeidsgeschil
+arbeidsgeschillen
+arbeidsgiver
+arbeidsgiveravgift
+arbeidsgivere
+arbeidsgiveren
+arbeidsgiverforening
+arbeidsgiverforeningen
+arbeidsgiverforeningens
+arbeidsgiverhold
+arbeidsgiverne
+arbeidsgivernes
+arbeidsgjeng
+arbeidsglad
+arbeidsglede
+arbeidsgrunnlag
+arbeidsgruppe
+arbeidsgruppen
+arbeidsgrupper
+arbeidsh
+arbeidshandelingen
+arbeidsherre
+arbeidsherres
+arbeidshesten
+arbeidshjelp
+arbeidshugen
+arbeidsi
+arbeidsinnsats
+arbeidsinnsatsen
+arbeidsinntekter
+arbeidsinspectie
+arbeidsinspecties
+arbeidsinspekt|r
+arbeidsk
+arbeidskamerat
+arbeidskameratene
+arbeidskamerater
+arbeidskapital
+arbeidskar
+arbeidskirke
+arbeidskirken
+arbeidskl{r
+arbeidskollegaer
+arbeidskolleger
+arbeidskonflikt
+arbeidskonflikter
+arbeidskonsulent
+arbeidskonsulenter
+arbeidskontor
+arbeidskontorene
+arbeidskontoret
+arbeidskracht
+arbeidskrachten
+arbeidskraft
+arbeidskraften
+arbeidskraftreserve
+arbeidskraftsituasjonen
+arbeidskrets
+arbeidskrevende
+arbeidskrok
+arbeidskvinne
+arbeidsl
+arbeidslag
+arbeidslager
+arbeidslageret
+arbeidslaget
+arbeidslamper
+arbeidsledelse
+arbeidsledelsen
+arbeidsledere
+arbeidslederforbundet
+arbeidsledig
+arbeidsledige
+arbeidsledighet
+arbeidsledigheten
+arbeidslinje
+arbeidsliv
+arbeidslivet
+arbeidslivets
+arbeidslonen
+arbeidsloon
+arbeidslunsj
+arbeidslys
+arbeidslyst
+arbeidslysten
+arbeidsl|se
+arbeidsl|shet
+arbeidsl|sheten
+arbeidsl|shetstrygd
+arbeidsl|shetstrygdens
+arbeidsl|yse
+arbeidsl|ysetrygd
+arbeidsm
+arbeidsmann
+arbeidsmannen
+arbeidsmarked
+arbeidsmarkedet
+arbeidsmarkeds
+arbeidsmarkt
+arbeidsmateriale
+arbeidsmaur
+arbeidsmenn
+arbeidsmessig
+arbeidsmessige
+arbeidsmetoder
+arbeidsmilj|
+arbeidsmilj|et
+arbeidsminister
+arbeidsmoral
+arbeidsmulighet
+arbeidsmulighetene
+arbeidsmuligheter
+arbeidsm}te
+arbeidsm}ter
+arbeidsn
+arbeidsnedleggelsen
+arbeidso
+arbeidsom
+arbeidsomhet
+arbeidsomheten
+arbeidsomkostninger
+arbeidsomme
+arbeidsomr}de
+arbeidsomr}der
+arbeidsomr}det
+arbeidsomt
+arbeidsoppgave
+arbeidsoppgaven
+arbeidsoppgavene
+arbeidsoppgavenes
+arbeidsoppgaver
+arbeidsopplegget
+arbeidsordning
+arbeidsorganisasjon
+arbeidsovereenkomst
+arbeidsovereenkomsten
+arbeidsp
+arbeidsplass
+arbeidsplassen
+arbeidsplassene
+arbeidsplasser
+arbeidsplassert
+arbeidsplicht
+arbeidsplichten
+arbeidspress
+arbeidspresset
+arbeidsprinsipp
+arbeidsproduktiviteten
+arbeidsprogram
+arbeidsprogrammet
+arbeidsprosess
+arbeidsr
+arbeidsraad
+arbeidsraden
+arbeidsredskap
+arbeidsreisene
+arbeidsressursene
+arbeidsretten
+arbeidsro
+arbeidsrom
+arbeidsrutinene
+arbeidsrytme
+arbeidsrytmen
+arbeidss
+arbeidssituasjon
+arbeidssituasjonen
+arbeidssky
+arbeidsslag
+arbeidsstans
+arbeidsstasjon
+arbeidsstasjoner
+arbeidsstedet
+arbeidsstillinger
+arbeidsstipend
+arbeidsstokk
+arbeidsstokken
+arbeidsstoler
+arbeidsstue
+arbeidsstuen
+arbeidsstuer
+arbeidsstyre
+arbeidsstyret
+arbeidsstyrken
+arbeidst
+arbeidstaker
+arbeidstakere
+arbeidstakeren
+arbeidstakerne
+arbeidstakernes
+arbeidstakerorganisasjonene
+arbeidstakers
+arbeidstakersiden
+arbeidsteamet
+arbeidstemperatur
+arbeidster
+arbeidsterapi
+arbeidsters
+arbeidstid
+arbeidstida
+arbeidstiden
+arbeidstidens
+arbeidstids
+arbeidstidsavtale
+arbeidstidsforkortelse
+arbeidstidsforkortelsen
+arbeidstidsforkortelser
+arbeidstidsnedsettelsen
+arbeidstilbud
+arbeidstilsynet
+arbeidstimer
+arbeidstittelen
+arbeidstrykket
+arbeidstvister
+arbeidsu
+arbeidsuke
+arbeidsulykke
+arbeidsulykker
+arbeidsutvalg
+arbeidsutvalget
+arbeidsut|veren
+arbeidsv
+arbeidsvanter
+arbeidsveg
+arbeidsvei
+arbeidsveld
+arbeidsverdeling
+arbeidsvermogen
+arbeidsverzekering
+arbeidsvilk}r
+arbeidsvillig
+arbeidsvillige
+arbeidsvognene
+arbeidsvoorwaarde
+arbeidsvoorwaarden
+arbeidsv{relse
+arbeidsw
+arbeidsweek
+arbeidsweken
+arbeidswet
+arbeidswetten
+arbeids}
+arbeids}r
+arbeids}ret
+arbeidt
+arbeidza
+arbeidzaam
+arbeidzaamheid
+arbeidzaamst
+arbeidzame
+arbeidzamer
+arbeit
+arbeite
+arbeiten
+arbeitend
+arbeitende
+arbeitendem
+arbeitenden
+arbeitender
+arbeitens
+arbeiter
+arbeiterbewegung
+arbeiterdemostration
+arbeiterfakultaet
+arbeiterfrage
+arbeiterfront
+arbeitergeberseite
+arbeiterheer
+arbeiterin
+arbeiterinnen
+arbeiterkammern
+arbeiterklasse
+arbeiterkonferenz
+arbeitern
+arbeiterparadies
+arbeiterparadiesen
+arbeiterparteien
+arbeiterpriestern
+arbeiterrat
+arbeiterrentenversicherung
+arbeiterrevolution
+arbeiters
+arbeiterschichten
+arbeiterschulung
+arbeitersiedlungen
+arbeitervereine
+arbeitervereinigung
+arbeitervertreter
+arbeiterwehr
+arbeiterwohlfahrt
+arbeiterwohnhaus
+arbeites
+arbeitest
+arbeitet
+arbeitete
+arbeiteten
+arbeitetest
+arbeitetet
+arbeitge
+arbeitgeber
+arbeitgeberbeisitzer
+arbeitgeberkreisen
+arbeitgebers
+arbeitgebertagung
+arbeitgeberverbaenden
+arbeitgebervereinigungen
+arbeitne
+arbeitnehmer
+arbeitnehmerbeisitzer
+arbeitnehmerfeindliches
+arbeitnehmerin
+arbeitnehmerkreise
+arbeitnehmern
+arbeitnehmerrechten
+arbeitnehmers
+arbeitnehmerschaft
+arbeitnehmervertreter
+arbeitnehmervertretung
+arbeitsa
+arbeitsablaeufe
+arbeitsablaeufen
+arbeitsablauf
+arbeitsaemter
+arbeitsame
+arbeitsamem
+arbeitsamen
+arbeitsamere
+arbeitsamerem
+arbeitsameren
+arbeitsameres
+arbeitsames
+arbeitsamkeit
+arbeitsamste
+arbeitsamsten
+arbeitsamster
+arbeitsamstes
+arbeitsamt
+arbeitsamtsbaenken
+arbeitsanweisung
+arbeitsanweisungen
+arbeitsanzuegen
+arbeitsanzug
+arbeitsanzuges
+arbeitsarray
+arbeitsatmospha"re
+arbeitsaufwand
+arbeitsausfall
+arbeitsausschuesse
+arbeitsb
+arbeitsbedingungen
+arbeitsbefreiung
+arbeitsbeginn
+arbeitsbelastung
+arbeitsbereich
+arbeitsbereiche
+arbeitsbeschaffung
+arbeitsbeschaffungen
+arbeitsbeschaffungsmassnahmen
+arbeitsbescheinigung
+arbeitsbescheinigungen
+arbeitsbeschreibung
+arbeitsbesuch
+arbeitsbesuche
+arbeitsbetrieb
+arbeitsbewaeltigung
+arbeitsboegen
+arbeitsbreite
+arbeitsbrigaden
+arbeitsd
+arbeitsdaten
+arbeitsdienst
+arbeitsdirectory
+arbeitse
+arbeitseifer
+arbeitseinheiten
+arbeitseinsatz
+arbeitseinstellungen
+arbeitsende
+arbeitsentgelte
+arbeitsentgeltung
+arbeitserlaubnis
+arbeitserleichterung
+arbeitserleichterungen
+arbeitsessen
+arbeitsessens
+arbeitsf
+arbeitsfa"higkeit
+arbeitsfaehig
+arbeitsfaehige
+arbeitsfanatiker
+arbeitsfeld
+arbeitsfelder
+arbeitsfla"che
+arbeitsflaeche
+arbeitsfoerderung
+arbeitsfolge
+arbeitsfragen
+arbeitsfrei
+arbeitsfreude
+arbeitsfreudige
+arbeitsfreudigem
+arbeitsfreudigen
+arbeitsfreudigere
+arbeitsfreudigerem
+arbeitsfreudigeren
+arbeitsfreudigeres
+arbeitsfreudiges
+arbeitsfreudigste
+arbeitsfreudigsten
+arbeitsfreudigster
+arbeitsfreudigstes
+arbeitsfrieden
+arbeitsfront
+arbeitsg
+arbeitsgaenge
+arbeitsgang
+arbeitsgebiete
+arbeitsgebieten
+arbeitsgemeinschaft
+arbeitsgericht
+arbeitsgerichten
+arbeitsgerichtes
+arbeitsgruppe
+arbeitsh
+arbeitshaeuser
+arbeitshilfe
+arbeitshypothese
+arbeitsi
+arbeitsinspektion
+arbeitsintensive
+arbeitsintensiven
+arbeitsintensiver
+arbeitsj
+arbeitsjahres
+arbeitsjubilaeum
+arbeitsk
+arbeitskaempfe
+arbeitskalender
+arbeitskameraden
+arbeitskampf
+arbeitskleidung
+arbeitskleidungen
+arbeitskollege
+arbeitskolonnen
+arbeitskommandos
+arbeitskonferenz
+arbeitskopie
+arbeitskra"fte
+arbeitskra"ften
+arbeitskraefte
+arbeitskraeften
+arbeitskraft
+arbeitskraftreserven
+arbeitskredit
+arbeitskreise
+arbeitsl
+arbeitslager
+arbeitslagern
+arbeitslast
+arbeitsleben
+arbeitslehre
+arbeitsleistungen
+arbeitsliste
+arbeitsloehne
+arbeitslogisgkeit
+arbeitslose
+arbeitslosem
+arbeitslosen
+arbeitslosenentwicklung
+arbeitslosengeld
+arbeitslosengelder
+arbeitslosengeldes
+arbeitslosenkurve
+arbeitslosenproblem
+arbeitslosenquote
+arbeitslosenstatistiken
+arbeitslosenunterstuetzung
+arbeitslosenunterstuetzungen
+arbeitslosenversicherung
+arbeitslosenversicherungen
+arbeitslosenversicherungsbeitr
+arbeitslosenziffer
+arbeitsloser
+arbeitsloses
+arbeitslosigkeit
+arbeitsm
+arbeitsmantel
+arbeitsmarkt
+arbeitsmaschinen
+arbeitsmaterial
+arbeitsmedizin
+arbeitsmethoden
+arbeitsministerien
+arbeitsmittel
+arbeitsmoeglichkeiten
+arbeitsmuetze
+arbeitsn
+arbeitsnorm
+arbeitso
+arbeitsordnung
+arbeitsorganisation
+arbeitsp
+arbeitspaedagogisch
+arbeitspapiere
+arbeitspausen
+arbeitspflicht
+arbeitsphase
+arbeitspla"tze
+arbeitspla"tzen
+arbeitsplaetze
+arbeitsplaetzen
+arbeitsplatz
+arbeitsplatzcomputer
+arbeitsplatzes
+arbeitsplatzwechsel
+arbeitsprogramm
+arbeitsprogramms
+arbeitsprotokoll
+arbeitsprozess
+arbeitspunkt
+arbeitspunkte
+arbeitsr
+arbeitsraeume
+arbeitsraeumen
+arbeitsraum
+arbeitsrecht
+arbeitsrechtliche
+arbeitsrechtlichen
+arbeitsrechts
+arbeitsreihenfolge
+arbeitsringes
+arbeitsruhe
+arbeitss
+arbeitsscheu
+arbeitsscheuem
+arbeitsscheuen
+arbeitsscheuer
+arbeitsschritt
+arbeitsschritte
+arbeitssitzung
+arbeitssparenden
+arbeitsspeicher
+arbeitsstab
+arbeitsstaette
+arbeitsstelle
+arbeitsstils
+arbeitsstoffen
+arbeitsstunde
+arbeitsstunden
+arbeitssuchender
+arbeitst
+arbeitstag
+arbeitstage
+arbeitstagen
+arbeitstakt
+arbeitsteams
+arbeitstechnisch
+arbeitsteilung
+arbeitstemperatur
+arbeitstexte
+arbeitstier
+arbeitstisch
+arbeitstreffen
+arbeitsu
+arbeitsuchenden
+arbeitsueberlastung
+arbeitsumsta"nde
+arbeitsunfaehige
+arbeitsunfaehigem
+arbeitsunfaehigen
+arbeitsunfaehiges
+arbeitsunfaelle
+arbeitsunfaellen
+arbeitsunfalls
+arbeitsunlust
+arbeitsunterbrechung
+arbeitsunterlage
+arbeitsv
+arbeitsventil
+arbeitsverhaeltnis
+arbeitsverhaeltnisse
+arbeitsverhaeltnisses
+arbeitsverteilung
+arbeitsvertra"gen
+arbeitsvertraege
+arbeitsvertraegen
+arbeitsvertrag
+arbeitsvertrags
+arbeitsverwaltung
+arbeitsvolumen
+arbeitsvorbereitung
+arbeitsvorgaben
+arbeitsvorgaenge
+arbeitsw
+arbeitsweise
+arbeitsweisen
+arbeitswiderstand
+arbeitswiderstandes
+arbeitswille
+arbeitswillen
+arbeitswilligen
+arbeitswochen
+arbeitsz
+arbeitszeit
+arbeitszeitaufwand
+arbeitszeiten
+arbeitszeitpolitik
+arbeitszeitregelung
+arbeitszimmern
+arbeitszimmers
+arbeitszwaenge
+arbeitszyklus
+arbejd
+arbejde
+arbejdede
+arbejder
+arbejderbev{gelse
+arbejderbev{gelsens
+arbejdere
+arbejderfamilie
+arbejderfamilien
+arbejderfamilier
+arbejderklassens
+arbejderkvinde
+arbejderne
+arbejdernes
+arbejderunger
+arbejdes
+arbejdet
+arbejdets
+arbejds
+arbejdsaftalen
+arbejdsaftaler
+arbejdsareal
+arbejdsarealet
+arbejdsbeskrivelse
+arbejdsbeskrivelsen
+arbejdsbord
+arbejdsborde
+arbejdsbordet
+arbejdsbyrden
+arbejdsdag
+arbejdsdage
+arbejdsdatabasen
+arbejdsdatabasens
+arbejdsdelingen
+arbejdsdirektoratet
+arbejdsdokumenter
+arbejdsfelter
+arbejdsforhold
+arbejdsforholdet
+arbejdsformer
+arbejdsgang
+arbejdsgangen
+arbejdsgangene
+arbejdsgiver
+arbejdsgivere
+arbejdsgiveren
+arbejdsgiverens
+arbejdsgrupper
+arbejdsindsats
+arbejdskatalog
+arbejdskataloget
+arbejdskraft
+arbejdskulier
+arbejdslager
+arbejdslageret
+arbejdsl|shed
+arbejdsl|sheden
+arbejdsmediciner
+arbejdsmetode
+arbejdsmetoder
+arbejdsmilj|instituttet
+arbejdsministeren
+arbejdsmoral
+arbejdsnarkoman
+arbejdsomr}de
+arbejdsomr}der
+arbejdsomr}det
+arbejdsopgave
+arbejdsopgaver
+arbejdsplads
+arbejdspladsen
+arbejdspladsens
+arbejdspladser
+arbejdsplan
+arbejdspligt
+arbejdspres
+arbejdsproces
+arbejdsprocesser
+arbejdsresultater
+arbejdsretten
+arbejdssituation
+arbejdsstandsning
+arbejdsstation
+arbejdsstationer
+arbejdsstationerne
+arbejdssted
+arbejdss|gningen
+arbejdstid
+arbejdstiden
+arbejdstimerne
+arbejdsudygtighedens
+arbejdsvilk}r
+arbel
+arbela
+arbelcora`n
+arbello`n
+arbenz
+arbequi`n
+arber
+arbesu
+arbeta
+arbetare
+arbetark
+arbetarkategori
+arbetarl
+arbetarloenestatistik
+arbetarlonestatistik
+arbetarl|nestatistik
+arbetars
+arbetarskydd
+arbetarstatistiken
+arbete
+arbeten
+arbetena
+arbetet
+arbets
+arbetsam
+arbetsamma
+arbetsbe
+arbetsbelastningen
+arbetsbesparande
+arbetsgi
+arbetsgivarefoereningen
+arbetsgivareforeningen
+arbetsgivaref|reningen
+arbetsla
+arbetslagets
+arbetsle
+arbetsledarpsykologi
+arbetslo
+arbetsloeshet
+arbetsloshet
+arbetsl|
+arbetsl|shet
+arbi
+arbil
+arbite
+arbiter
+arbiters
+arbitra
+arbitraa
+arbitraal
+arbitrab
+arbitrable
+arbitracio`n
+arbitradera
+arbitradero
+arbitrador
+arbitradora
+arbitrag
+arbitrage
+arbitrager
+arbitragers
+arbitrages
+arbitragist
+arbitragiste
+arbitragistes
+arbitrai
+arbitraient
+arbitrair
+arbitraire
+arbitrairement
+arbitraires
+arbitrais
+arbitrait
+arbitraje
+arbitral
+arbitrale
+arbitram
+arbitrament
+arbitramento
+arbitraments
+arbitramiento
+arbitran
+arbitrant
+arbitrante
+arbitrar
+arbitraria
+arbitrariamente
+arbitrarie
+arbitrariedad
+arbitrarily
+arbitrariness
+arbitrario
+arbitrary
+arbitrat
+arbitrate
+arbitrated
+arbitrates
+arbitrati
+arbitrating
+arbitration
+arbitrational
+arbitrationist
+arbitrations
+arbitrativa
+arbitrative
+arbitrativo
+arbitrato
+arbitrator
+arbitratoria
+arbitratorio
+arbitrators
+arbitratorship
+arbitratrix
+arbitre
+arbitre'
+arbitre'e
+arbitre'es
+arbitre's
+arbitre`
+arbitre`rent
+arbitree
+arbitreer
+arbitreerde
+arbitreerden
+arbitreert
+arbitrem
+arbitrement
+arbitren
+arbitrent
+arbitrer
+arbitrera
+arbitrerai
+arbitreraient
+arbitrerais
+arbitrerait
+arbitreras
+arbitreren
+arbitrerez
+arbitreriez
+arbitrerions
+arbitrero
+arbitrerons
+arbitreront
+arbitres
+arbitress
+arbitrez
+arbitri
+arbitriano
+arbitrie
+arbitriez
+arbitrii
+arbitrio
+arbitrions
+arbitrista
+arbitro
+arbitron
+arbitrons
+arbitr{r
+arbo
+arbo`rea
+arbo`reo
+arbogast
+arbolada
+arbolado
+arboladura
+arbolar
+arbolaria
+arbolario
+arbolecer
+arboleda
+arboledo
+arbolejo
+arboles
+arbolete
+arboli
+arbolillo
+arbolista
+arbollo`n
+arboloco
+arbon
+arbor
+arbora
+arborace
+arboraceous
+arborada
+arborado
+arboraie
+arboraient
+arborais
+arborait
+arboral
+arborant
+arborary
+arborato
+arborator
+arbore
+arbore'
+arbore'e
+arbore'es
+arbore's
+arbore`r
+arbore`rent
+arborea
+arboreal
+arboreally
+arborean
+arborecer
+arbored
+arborent
+arboreou
+arboreous
+arborer
+arborera
+arborerai
+arboreraient
+arborerais
+arborerait
+arboreras
+arborere
+arborerez
+arboreri
+arboreriez
+arborerions
+arborero
+arborerons
+arboreront
+arbores
+arboresc
+arborescence
+arborescencia
+arborescent
+arborescente
+arborescentes
+arborescently
+arborescents
+arboresq
+arboresque
+arboret
+arboreta
+arborete
+arboretet
+arborets
+arboretu
+arboretum
+arboretums
+arborez
+arborian
+arborica
+arborical
+arborico
+arboricole
+arboricoles
+arboricoline
+arboricolous
+arboricu
+arboriculteur
+arboriculteurs
+arboricultor
+arboricultrice
+arboricultrices
+arboricultura
+arboricultural
+arboriculture
+arboriculturist
+arboriez
+arborifo
+arboriform
+arboriforme
+arborion
+arborions
+arborist
+arborists
+arboriza
+arborization
+arborize
+arborized
+arborizes
+arborizi
+arborizing
+arboroid
+arborola
+arborolatry
+arborons
+arborous
+arbors
+arbortex
+arbortext
+arborvit
+arborvitae
+arborvitaes
+arborway
+arbotante
+arbour
+arboured
+arbours
+arbovale
+arbre
+arbres
+arbresh
+arbryt
+arbuck
+arbuckle
+arbus
+arbuscle
+arbuscul
+arbuscula
+arbuscular
+arbuscule
+arbuste
+arbuster
+arbusterol
+arbustes
+arbusti
+arbustiva
+arbustivo
+arbusto
+arbustum
+arbutase
+arbute
+arbutean
+arbuthno
+arbuthnot
+arbutin
+arbutina
+arbutinase
+arbutt
+arbutus
+arbutuse
+arbutuses
+arbyrd
+arc
+arc-bout
+arc-boutant
+arc-bouter
+arc-en-c
+arc-en-ciel
+arc-psn
+arc/on
+arc/onne
+arc/onner
+arc/ons
+arca
+arca`dica
+arca`dico
+arca`ngel
+arcabucear
+arcabuceri`a
+arcabucero
+arcabucete
+arcabuco
+arcabucosa
+arcabucoso
+arcabuezo
+arcabuz
+arcabuzal
+arcabuzazo
+arcacea
+arcacil
+arcada
+arcade
+arcaded
+arcaden
+arcades
+arcadia
+arcadia'
+arcadia's
+arcadian
+arcadianism
+arcadianly
+arcadians
+arcadias
+arcadic
+arcading
+arcadings
+arcadio
+arcadisc
+arcadisch
+arcadische
+arcadischer
+arcadischt
+arcador
+arcaduz
+arcaduzar
+arcady
+arcai`smo
+arcai`sta
+arcaica
+arcaici
+arcaico
+arcaizante
+arcaizar
+arcana
+arcanal
+arcanamente
+arcand
+arcane
+arcanes
+arcange`lica
+arcange`lico
+arcanidad
+arcanite
+arcano
+arcanum
+arcar
+arcata
+arcate
+arcati
+arcatura
+arcature
+arcaz
+arcazo`n
+arccos
+arccosin
+arccosine
+arce
+arce`n
+arcea
+arceau
+arceaux
+arced
+arcedianadgo
+arcedianato
+arcedianazgo
+arcediano
+arcedo
+arceer
+arceerde
+arceerden
+arceerli
+arceerlijn
+arceerlijnen
+arceert
+arcella
+arcense
+arceren
+arcering
+arceringen
+arceutho
+arceuthobium
+arch
+archa
+archabom
+archabomination
+archae
+archaecr
+archaecraniate
+archaelo
+archaelogists
+archaeoc
+archaeoceti
+archaeocyathidae
+archaeocyathus
+archaeog
+archaeogeology
+archaeographic
+archaeographical
+archaeography
+archaeol
+archaeolatry
+archaeolith
+archaeolithic
+archaeologe
+archaeologen
+archaeologer
+archaeologian
+archaeologic
+archaeological
+archaeologically
+archaeologie
+archaeologische
+archaeologischer
+archaeologist
+archaeologists
+archaeology
+archaeop
+archaeopithecus
+archaeopteris
+archaeopterygiformes
+archaeopteryx
+archaeor
+archaeornis
+archaeornithes
+archaeos
+archaeostoma
+archaeostomata
+archaeostomatous
+archagit
+archagitator
+archai"q
+archai"que
+archai"ques
+archai"s
+archai"sme
+archai"smes
+archaic
+archaica
+archaical
+archaically
+archaici
+archaicism
+archaicn
+archaicness
+archaimb
+archaimbaud
+archaisc
+archaisch
+archaische
+archaischen
+archaischer
+archaise
+archaiseerde
+archaiseerden
+archaiseren
+archaism
+archaisme
+archaismen
+archaisms
+archaist
+archaistic
+archaistisch
+archaistische
+archaistischer
+archaistischt
+archaists
+archaize
+archaized
+archaizer
+archaizes
+archaizi
+archaizing
+archamba
+archambault
+archambe
+archambeault
+archana
+archange
+archangel
+archangelic
+archangelica
+archangelical
+archangels
+archangelship
+archanges
+archanta
+archantagonist
+archanti
+archantiquary
+archapos
+archapostate
+archapostle
+archarch
+archarchitect
+archard
+archario
+archarios
+archarti
+archartist
+archbald
+archband
+archbeac
+archbeacon
+archbead
+archbeadle
+archbish
+archbishop
+archbishopess
+archbishopric
+archbishoprics
+archbishopry
+archbishops
+archbold
+archbotc
+archbotcher
+archbout
+archboutefeu
+archbuff
+archbuffoon
+archbuil
+archbuilder
+archcape
+archcham
+archchampion
+archchap
+archchaplain
+archchar
+archcharlatan
+archchea
+archcheater
+archchem
+archchemic
+archchie
+archchief
+archchro
+archchronicler
+archcity
+archconf
+archconfraternity
+archcons
+archconsoler
+archconspirator
+archcorr
+archcorrupter
+archcors
+archcorsair
+archcoun
+archcount
+archcoze
+archcozener
+archcrim
+archcriminal
+archcrit
+archcritic
+archcrow
+archcrown
+archcupb
+archcupbearer
+archdale
+archdapi
+archdapifer
+archdapifership
+archdeac
+archdeacon
+archdeaconate
+archdeaconess
+archdeaconries
+archdeaconry
+archdeacons
+archdeaconship
+archdean
+archdeanery
+archdece
+archdeceiver
+archdefe
+archdefender
+archdemo
+archdemon
+archdepr
+archdepredator
+archdesp
+archdespot
+archdete
+archdetective
+archdevi
+archdevil
+archdioc
+archdiocesan
+archdiocese
+archdioceses
+archdipl
+archdiplomatist
+archdiss
+archdissembler
+archdist
+archdisturber
+archdivi
+archdivine
+archdogm
+archdogmatist
+archdolt
+archdrui
+archdruid
+archduca
+archducal
+archduch
+archduchess
+archduchesses
+archduchies
+archduchy
+archduke
+archdukedom
+archdukes
+arche
+arche'ol
+arche'ologie
+arche'ologique
+arche'ologiques
+arche'ologue
+arche'ologues
+arche'ty
+arche'type
+arche'types
+archeal
+archean
+archearl
+archebio
+archebiosis
+archeccl
+archecclesiastic
+archecen
+archecentric
+arched
+archegen
+archegenesis
+archegon
+archegone
+archegonial
+archegoniata
+archegoniatae
+archegoniate
+archegoniophore
+archegonium
+archegony
+archegos
+archegosaurus
+archeion
+archelau
+archelaus
+archelen
+archelenis
+archelog
+archelogy
+archelon
+archempe
+archemperor
+archence
+archencephala
+archencephalic
+archenem
+archenemies
+archenemy
+archengi
+archengineer
+archenho
+archenholz
+archente
+archenteric
+archenteron
+archeocy
+archeocyte
+archeolo
+archeologa
+archeologen
+archeologi
+archeological
+archeologie
+archeologisch
+archeologische
+archeologist
+archeologo
+archeology
+archeoloog
+archeozo
+archeozoic
+archer
+archerci
+archercity
+archerd
+archeres
+archeress
+archerfi
+archerfish
+archerie
+archeries
+archero
+archers
+archersh
+archership
+archery
+arches
+archespo
+archespore
+archesporial
+archesporium
+archest
+archet
+archets
+archetyp
+archetypal
+archetypally
+archetype
+archetypes
+archetypic
+archetypical
+archetypically
+archetypist
+archeunu
+archeunuch
+archeus
+archeve^
+archeve^que
+archeve^ques
+archevit
+archevites
+archexor
+archexorcist
+archfelo
+archfelon
+archfien
+archfiend
+archfiends
+archfire
+archflam
+archflamen
+archflat
+archflatterer
+archfoe
+archfool
+archform
+archfoun
+archfounder
+archfrie
+archfriend
+archgene
+archgenethliac
+archgod
+archgome
+archgomeral
+archgove
+archgovernor
+archgunn
+archgunner
+archhack
+archhacker
+archhead
+archhear
+archheart
+archhere
+archheresy
+archheretic
+archhost
+archhous
+archhouse
+archhumb
+archhumbug
+archhypo
+archhypocrisy
+archhypocrite
+archi
+archi`
+archiann
+archiannelida
+archiate
+archiater
+archibal
+archibald
+archibaldo
+archiben
+archibenthal
+archibenthic
+archibenthos
+archibla
+archiblast
+archiblastic
+archiblastoma
+archiblastula
+archibol
+archibold
+archibribo`n
+archibribona
+archibruta
+archibruto
+archibut
+archibuteo
+archican
+archicantor
+archicar
+archicarp
+archicer
+archicerebrum
+archichl
+archichlamydeae
+archichlamydeous
+archicle
+archicleistogamous
+archicleistogamy
+archicoe
+archicoele
+archicofrade
+archicofradi`a
+archicon
+archicontinent
+archicyt
+archicyte
+archicytula
+archidam
+archidamus
+archidia
+archidia`cono
+archidiaceae
+archidiaconal
+archidiaconate
+archidid
+archididascalian
+archididascalos
+archidio`cesis
+archidis
+archidiskodon
+archidiu
+archidium
+archidom
+archidome
+archiducado
+archiducal
+archiduque
+archiduquesa
+archie
+archief
+archiefs
+archiefstuk
+archiefstukken
+archiefw
+archiefwezen
+archiepi
+archiepiscopacy
+archiepiscopal
+archiepiscopally
+archiepiscopate
+archiere
+archiereus
+archieve
+archieven
+archigas
+archigaster
+archigastrula
+archigen
+archigenesis
+archigon
+archigonic
+archigonocyte
+archigony
+archiher
+archiheretical
+archikar
+archikaryon
+archil
+archilau`d
+archilit
+archilithic
+archiloc
+archilochian
+archilow
+archilowe
+archimag
+archimage
+archimago
+archimagus
+archiman
+archimandriet
+archimandrieten
+archimandrita
+archimandrite
+archimandrites
+archimbe
+archimbeau
+archimed
+archimedean
+archimedes
+archimim
+archimime
+archimor
+archimorphic
+archimorula
+archimpe
+archimperial
+archimperialism
+archimperialist
+archimperialistic
+archimpr
+archimpressionist
+archimyc
+archimycetes
+archin
+archineu
+archineuron
+archinfa
+archinfamy
+archinfo
+archinformer
+arching
+archings
+archints
+archintsy
+archipa`mpano
+archipal
+archipallial
+archipallium
+archipeg
+archipegalo
+archipel
+archipelagian
+archipelagic
+archipelago
+archipelagoes
+archipelagos
+archipele
+archipels
+archipie
+archipie`lago
+archipielago
+archipin
+archipla
+archiplasm
+archiplasmic
+archiplata
+archippu
+archippus
+archipre
+archiprelatical
+archipresbyter
+archipte
+archipterygial
+archipterygium
+archispe
+archisperm
+archispermae
+archisph
+archisphere
+archispo
+archispore
+archist
+archisto
+archistome
+archisup
+archisupreme
+archisym
+archisymbolical
+archite
+architec
+architect
+architecte
+architecten
+architectes
+architective
+architectonic
+architectonica
+architectonically
+architectonics
+architectonisch
+architectonische
+architectress
+architects
+architectural
+architecturale
+architecturales
+architecturalist
+architecturally
+architecturaux
+architecture
+architecturedependent
+architecturen
+architecturer
+architectures
+architecturesque
+architectuur
+architecure
+architek
+architekt
+architekten
+architektenbuero
+architektengruppe
+architektes
+architektonik
+architektonisch
+architektonische
+architektonischen
+architektonischer
+architektonisches
+architektur
+architekturepoche
+architekturstudenten
+architet
+architettura
+architetturale
+architetturali
+architetture
+architeu
+architeuthis
+architis
+architra
+architraaf
+architraval
+architrave
+architraved
+architraven
+architraves
+architriclino
+archityp
+architypographer
+archiv
+archiva
+archivador
+archivadora
+archivag
+archivage
+archivai
+archivaient
+archivais
+archivait
+archival
+archivalia
+archivan
+archivant
+archivar
+archivaresse
+archivaressen
+archivaris
+archivarissen
+archivdi
+archivdisketten
+archive
+archive'
+archive'e
+archive'es
+archive's
+archive`
+archive`rent
+archived
+archiven
+archivent
+archiver
+archivera
+archiverai
+archiveraient
+archiverais
+archiverait
+archiveras
+archiverez
+archiveriez
+archiverions
+archivero
+archiverons
+archiveront
+archivers
+archives
+archivez
+archivge
+archivgebaeude
+archivi
+archivi`stica
+archivi`stico
+archivia
+archiviai
+archiviamo
+archiviano
+archiviare
+archiviata
+archiviate
+archiviati
+archiviato
+archiviatore
+archiviava
+archiviavi
+archiviavo
+archiviazione
+archivie
+archiviera
+archiviero
+archiviez
+archivin
+archiving
+archivino
+archivio
+archivions
+archivis
+archivist
+archivista
+archiviste
+archivistes
+archivists
+archivko
+archivkopien
+archivo
+archivol
+archivolt
+archivolta
+archivon
+archivons
+archivs
+archizoi
+archizoic
+archjock
+archjockey
+archking
+archknav
+archknave
+archlead
+archleader
+archlech
+archlecher
+archleve
+archleveler
+archlexi
+archlexicographer
+archliar
+archlute
+archly
+archmach
+archmachine
+archmagi
+archmagician
+archmagirist
+archmars
+archmarshal
+archmedi
+archmediocrity
+archmess
+archmessenger
+archmili
+archmilitarist
+archmime
+archmini
+archminister
+archmock
+archmocker
+archmockery
+archmona
+archmonarch
+archmonarchist
+archmonarchy
+archmugw
+archmugwump
+archmurd
+archmurderer
+archmyst
+archmystagogue
+archness
+archocel
+archocele
+archocys
+archocystosyrinx
+archolog
+archology
+archon
+archons
+archons1
+archons10
+archons11
+archons12
+archons13
+archons14
+archons15
+archons16
+archons17
+archons18
+archons19
+archons2
+archons20
+archons21
+archons22
+archons23
+archons3
+archons4
+archons5
+archons6
+archons7
+archons8
+archons9
+archonsh
+archonship
+archonships
+archont
+archonta
+archontate
+archonti
+archontia
+archontic
+archopla
+archoplasm
+archoplasmic
+archopto
+archoptoma
+archoptosis
+archorrh
+archorrhagia
+archorrhea
+archoste
+archostegnosis
+archostenosis
+archosyr
+archosyrinx
+archover
+archoverseer
+archpall
+archpapi
+archpapist
+archpast
+archpastor
+archpatr
+archpatriarch
+archpatron
+archphil
+archphilosopher
+archphyl
+archphylarch
+archpiec
+archpiece
+archpilf
+archpilferer
+archpill
+archpillar
+archpira
+archpirate
+archplag
+archplagiarist
+archplagiary
+archplay
+archplayer
+archplot
+archplotter
+archplun
+archplunderer
+archplut
+archplutocrat
+archpoet
+archpoli
+archpolitician
+archpont
+archpontiff
+archprac
+archpractice
+archprel
+archprelate
+archprelatic
+archprelatical
+archpres
+archpresbyter
+archpresbyterate
+archpresbytery
+archpret
+archpretender
+archprie
+archpriest
+archpriesthood
+archpriestship
+archprim
+archprimate
+archprin
+archprince
+archprop
+archprophet
+archprot
+archprotopope
+archprototype
+archpubl
+archpublican
+archpuri
+archpuritan
+archradi
+archradical
+archrasc
+archrascal
+archreac
+archreactionary
+archrebe
+archrebel
+archrege
+archregent
+archrepr
+archrepresentative
+archrobb
+archrobber
+archrogu
+archrogue
+archrule
+archruler
+archsacr
+archsacrificator
+archsacrificer
+archsain
+archsaint
+archsatr
+archsatrap
+archscou
+archscoundrel
+archsedu
+archseducer
+archsee
+archsewe
+archsewer
+archshep
+archshepherd
+archsin
+archsnob
+archspir
+archspirit
+archspy
+archstew
+archsteward
+archswin
+archswindler
+archsyna
+archsynagogue
+archt
+archtemp
+archtempter
+archthie
+archthief
+archtrai
+archtraitor
+archtrea
+archtreasurer
+archtreasurership
+archturn
+archturncoat
+archtyra
+archtyrant
+archulet
+archuletta
+archurge
+archurger
+archvaga
+archvagabond
+archvamp
+archvampire
+archvest
+archvestryman
+archvill
+archvillain
+archvillainy
+archvisi
+archvisitor
+archwag
+archway
+archways
+archwenc
+archwench
+archwise
+archwork
+archworker
+archworkmaster
+archy
+arcidaco
+arcidacono
+arcidae
+arcidriche
+arcifera
+arcifero
+arciferous
+arcifini
+arcifinia
+arcifinio
+arcifinious
+arciform
+arcigna
+arcigne
+arcigni
+arcigno
+arcilla
+arcillar
+arcillosa
+arcilloso
+arcing
+arcio`n
+arciprestado
+arciprestal
+arciprestazgo
+arcipreste
+arcite
+arcked
+arcking
+arclengt
+arclength
+arclike
+arco
+arco`n
+arcobale
+arcobaleni
+arcobaleno
+arcobricense
+arcocent
+arcocentrous
+arcocentrum
+arcograp
+arcograph
+arcola
+arcona
+arcontado
+arconte
+arconti
+arcos
+arcosa
+arcot
+arcouet
+arcs
+arcs-bou
+arcs-boutants
+arcs-en-
+arcs-en-ciel
+arcsin
+arcsine
+arctado
+arctalia
+arctalian
+arctamer
+arctamerican
+arctan
+arctange
+arctangent
+arctatio
+arctation
+arctia
+arctian
+arctic
+arctica
+arctical
+arctically
+arcticia
+arctician
+arcticiz
+arcticize
+arctics
+arcticwa
+arcticward
+arcticwards
+arctiid
+arctiida
+arctiidae
+arctique
+arctiques
+arctisca
+arctisch
+arctische
+arctium
+arctocep
+arctocephalus
+arctogae
+arctogaea
+arctogaeal
+arctogaean
+arctoid
+arctoide
+arctoidea
+arctoidean
+arctomys
+arctos
+arctosis
+arctosta
+arctostaphylos
+arcturia
+arcturus
+arcuacio`n
+arcuada
+arcuado
+arcual
+arcuale
+arcuate
+arcuated
+arcuatel
+arcuately
+arcuatio
+arcuation
+arcubali
+arcubalist
+arcubalister
+arcula
+arculite
+arcus
+arcy
+ard
+arda
+ardalear
+ardalion
+ardant
+ardara
+ardassin
+ardassine
+ardath
+ardavan
+arde
+ardea
+ardeae
+ardeb
+ardec
+ardec-1
+ardec-2
+ardec-3
+ardec-ac
+ardec-ac1
+ardec-ac3
+ardec-ac4
+ardec-ac5
+ardec-ac6
+ardec-bu
+ardec-bus1
+ardec-cc
+ardec-cc1
+ardec-cc2
+ardec-cc3
+ardec-cd
+ardec-cdbms
+ardec-im
+ardec-imd
+ardec-lc
+ardec-lcsec1
+ardec-lcss
+ardec-mi
+ardec-mil-tac
+ardec-rd
+ardec-rdte
+ardec-re
+ardec-retap
+ardec-sa
+ardec-satc
+ardec-satin
+ardec-si
+ardec-sing
+ardec-sit
+ardec-sl
+ardec-sleaf
+ardec-so
+ardec-sor
+ardec-sy
+ardec-syb
+ardec-te
+ardec-tew1
+ardec-ve
+ardec-ve825
+ardec-ve860
+ardec-vector
+ardeen
+ardeidae
+ardelia
+ardelis
+ardell
+ardella
+ardelle
+ardemmen
+ardemment
+arden
+ardencie
+ardencies
+ardency
+ardene
+ardenia
+ardenne
+ardennes
+ardennit
+ardennite
+ardent
+ardente
+ardentes
+ardenti`a
+ardenti`sima
+ardenti`simamente
+ardenti`simo
+ardently
+ardentne
+ardentness
+ardents
+ardenvoi
+ardenvoir
+arder
+ardera
+arderi
+ardero
+ardeur
+ardeurs
+ardeviejas
+ardhamag
+ardhamagadhi
+ardhanar
+ardhanari
+ardi`nculo
+ardicia
+ardid
+ardida
+ardidamente
+ardidez
+ardideza
+ardido
+ardidosa
+ardidosamente
+ardidoso
+ardie
+ardiel
+ardiente
+ardientemente
+ardiles
+ardilla
+ardimiento
+ardine
+ardionda
+ardiondo
+ardis
+ardish
+ardisia
+ardisiac
+ardisiaceae
+ardisj
+ardisson
+ardite
+ardites
+ardith
+arditi
+ardizone
+ardmore
+ardoch
+ardoin
+ardoise
+ardoises
+ardoisie
+ardoisie`re
+ardoisie`res
+ardon
+ardor
+ardorada
+ardore
+ardori
+ardorosa
+ardorosamente
+ardoroso
+ardors
+ardour
+ardours
+ardra
+ardri
+ardrian
+ards
+ardsley
+ardsleyo
+ardsleyonhudson
+ardt.
+ardu
+ardua
+arduamente
+ardue
+ardues
+ardui
+arduidad
+arduin
+arduina
+arduinen
+arduinit
+arduinite
+arduinst
+arduinsteen
+arduinstenen
+arduo
+arduous
+arduousl
+arduously
+arduousn
+arduousness
+ardura
+ardura`n
+ardurous
+ardus
+ardvax
+ardyce
+ardys
+ardyth
+are
+are'opag
+are'opage
+are'opages
+are^te
+are^tes
+are`ne
+are`nes
+are`vaca
+are`vaco
+area
+areaal
+areach
+aread
+areaempl
+areaemployment
+areal
+areala
+arealbeg
+arealbegrensning
+arealbegrensninger
+arealbeh
+arealbehovet
+arealdis
+arealdisponering
+arealen
+arealene
+arealer
+arealerne
+arealet
+arealforhold
+arealfra
+arealfraction
+arealgre
+arealgrensene
+arealgrenser
+arealinn
+arealinngrep
+areality
+arealpla
+arealplanlegging
+arealutn
+arealutnyttelse
+arean
+arear
+areare
+areas
+areasone
+areasoner
+areaway
+areaways
+areawide
+areca
+arecacea
+arecaceae
+arecaceo
+arecaceous
+arecaidi
+arecaidin
+arecaidine
+arecain
+arecaine
+arecales
+arecer
+arechi
+arecibo
+arecolid
+arecolidin
+arecolidine
+arecolin
+arecoline
+arecuna
+ared
+aredake
+aredale
+aree
+areek
+areel
+aref
+arefaccio`n
+arefact
+arefacti
+arefaction
+areg
+aregener
+aregenerative
+aregeneratory
+aregerek
+aregh
+areguro
+aregusuk
+aregusuku
+aregwe
+arehada
+arehodo
+arei
+areille
+areito
+arekara
+arekisan
+arekore
+arekuna
+arekuru
+arel
+arelar
+arelene
+areli
+areligio
+areligioeser
+arelites
+arell
+arellano
+arelsfor
+arelsford
+arem
+arema
+aren
+aren't
+arena
+arena's
+arena`cea
+arena`ceo
+arenaceo
+arenaceous
+arenacio`n
+arenae
+arenaen
+arenaene
+arenal
+arenalejo
+arenar
+arenaria
+arenariae
+arenario
+arenarious
+arenas
+arenasva
+arenasvalley
+arenata
+arenatio
+arenation
+arenaza
+arencar
+arenco`n
+arend
+arenda
+arendal
+arendali
+arendalite
+arendalitt
+arendbui
+arendbuizerd
+arendbuizerds
+arende
+arendefi
+arendefilen
+arendeha
+arendehantering
+arenden
+arendena
+arendenu
+arendenummer
+arendest
+arendestatistik
+arendestatus
+arendete
+arendetexten
+arendsbl
+arendsblik
+arendsblikken
+arendse
+arendsjo
+arendsjong
+arendsjongen
+arendskl
+arendsklauw
+arendsklauwen
+arendsne
+arendsnest
+arendsnesten
+arendsneus
+arendsneuzen
+arendsog
+arendsogen
+arendsoo
+arendsoog
+arendsvl
+arendsvleugel
+arendsvleugels
+arendsvlucht
+arendt
+arendtsv
+arendtsville
+arenen
+arenera
+arenero
+areng
+arenga
+arengador
+arengadora
+arengar
+arenicol
+arenicola
+arenicole
+arenicolite
+arenicolor
+arenicolous
+arenig
+arenilit
+arenilitic
+arenilla
+arenillero
+arenisca
+arenisco
+arenji
+areno
+arenoid
+arenosa
+arenose
+arenosit
+arenosity
+arenoso
+arenque
+arens
+arensen
+arent
+arenzata
+arenzi
+arenzvil
+arenzville
+areo`metro
+areo`pago
+areo`stilo
+areocent
+areocentric
+areograp
+areographer
+areographic
+areographical
+areographically
+areography
+areola
+areolae
+areolar
+areolas
+areolate
+areolated
+areolati
+areolation
+areole
+areoles
+areolet
+areologi
+areologic
+areological
+areologically
+areologist
+areology
+areomete
+areometer
+areometers
+areometr
+areometric
+areometrical
+areometry
+areop
+areopagi
+areopagist
+areopagita
+areopagite
+areopagitic
+areopagitica
+areopagu
+areopagus
+areopeno
+areopenop
+areosi`stilo
+areotect
+areotectonics
+arepa
+arepita
+areppo
+arequena
+arequipa
+arera
+arerai
+areranno
+arerano
+arerebbe
+arerebbero
+arerei
+areremmo
+areremo
+arereste
+areresti
+arerete
+arero
+arerosco
+areroscope
+arerugi
+arerugi-
+ares
+arescent
+aresco
+areshiki
+areshou
+aresiki
+aresta
+aresti`n
+arestil
+arestinada
+arestinado
+arestrup
+aresyou
+aret
+aretaics
+aretas
+arete
+aretes
+aretha
+arethafr
+arethusa
+arethuse
+areti
+aretina
+aretinia
+aretinian
+aretino
+aretolog
+aretology
+arets
+areu
+arevalo
+arevordi
+arevordig
+arewa
+arex
+areyakor
+arf
+arfada
+arfak
+arfar
+arfil
+arfinnss
+arfinnsson
+arftliga
+arfvedso
+arfvedsonite
+arg
+arga
+arga\a
+arga`n
+argadijo
+argadillo
+argado
+argal
+argala
+argali
+argalia
+argallera
+argals
+argamakm
+argamakmur
+argamandel
+argamandijo
+argamasa
+argamasar
+argamaso`n
+argamula
+argan
+argand
+argande\a
+argande\o
+arganel
+arganeo
+argang
+argangar
+argans
+argante
+argas
+argasid
+argasida
+argasidae
+argau
+argavieso
+argaya
+argayar
+argayo
+arge
+arge`n
+arge`ntea
+arge`nteo
+argean
+argeers
+argel
+argeland
+argelander
+argeleb
+argelina
+argelino
+argeloos
+argeloosheid
+argeloost
+argeloze
+argelozer
+argemi
+argemone
+argemony
+argen
+argenol
+argensol
+argensola
+argent
+argenta
+argentaa
+argentaan
+argentada
+argentado
+argentador
+argentadora
+argental
+argentam
+argentamid
+argentamide
+argentamin
+argentamine
+argentar
+argentario
+argentat
+argentate
+argentation
+argente
+argente'
+argente'e
+argente'es
+argente's
+argenteo
+argenteous
+argenter
+argenteri`a
+argenterie
+argentero
+argentes
+argentesi
+argenteu
+argenteum
+argenti
+argentia
+argentic
+argenticyanide
+argentid
+argentide
+argentie
+argentier
+argentiers
+argentif
+argentifera
+argentifero
+argentiferous
+argentij
+argentijn
+argentijnen
+argentijns
+argentijnse
+argentijnser
+argentijnst
+argentin
+argentina
+argentinas
+argentinauruguay
+argentine
+argentinean
+argentineans
+argentiner
+argentineren
+argentines
+argentini
+argentinian
+argentinidae
+argentinien
+argentinische
+argentinischen
+argentinisches
+argentinismo
+argentinitrate
+argentinize
+argentino
+argentinos
+argentins
+argentinsk
+argentinske
+argentio
+argention
+argentit
+argentite
+argento
+argentoj
+argentojarosite
+argentol
+argentom
+argentometric
+argentometrically
+argentometry
+argenton
+argentop
+argentoproteinum
+argentos
+argentosa
+argentose
+argentoso
+argentou
+argentous
+argentpel
+argents
+argentum
+argenzia
+argenziano
+arger
+arges
+argestes
+arget
+argh
+arghan
+arghel
+arghezi
+arghool
+argibay
+argid
+argil
+argila
+argile
+argiles
+argileus
+argileuse
+argileuses
+argileux
+argilla
+argillac
+argillaceous
+argille
+argillif
+argilliferous
+argillit
+argillite
+argillitic
+argilloa
+argilloarenaceous
+argilloc
+argillocalcareous
+argillocalcite
+argillof
+argilloferruginous
+argilloi
+argilloid
+argillom
+argillomagnesian
+argillou
+argillous
+argilosa
+argiloso
+argils
+argina
+arginai
+arginamm
+arginammo
+arginand
+arginando
+arginano
+arginare
+arginaro
+arginarono
+arginas
+arginass
+arginasse
+arginassi
+arginast
+arginaste
+arginasti
+arginata
+arginate
+arginati
+arginato
+arginava
+arginavamo
+arginavano
+arginavate
+arginavi
+arginavo
+argine
+arginera
+arginerai
+arginere
+arginerei
+argineremo
+arginerete
+arginero
+argini
+arginiam
+arginiamo
+arginiat
+arginiate
+arginine
+argininephosphoric
+arginino
+argino
+argiope
+argiopid
+argiopidae
+argiopoi
+argiopoidea
+argiva
+argive
+argivo
+argle
+argled
+argles
+arglist
+arglisti
+arglistig
+arglistige
+arglistigem
+arglistigen
+arglistiger
+arglistigheden
+arglistigheid
+arglistigst
+arglos
+arglose
+arglosig
+arglosigkeit
+arglosigkeiten
+argo
+argo-lan
+argo`lica
+argo`lico
+argo`n
+argoan
+argob
+argobba
+argobbin
+argobbinya
+argoeni
+argol
+argolet
+argolian
+argolic
+argolid
+argolis
+argolla
+argolleta
+argollo`n
+argols
+argomal
+argoment
+argomenti
+argomento
+argon
+argonath
+argonaut
+argonauta
+argonautic
+argonauts
+argonet
+argonia
+argonne
+argons
+argopelt
+argopelter
+argor
+argors
+argos
+argosies
+argosy
+argot
+argotic
+argotiqu
+argotique
+argotiques
+argots
+argovian
+args
+argskap
+argskape
+argskapen
+argt
+argu
+arguable
+arguably
+argucia
+argue
+arguebus
+argued
+arguellarse
+arguello
+arguenero
+arguer
+arguers
+argues
+arguette
+argufied
+argufier
+argufiers
+argufy
+argufyin
+argufying
+arguing
+argullo
+argullosa
+argulloso
+argulus
+argument
+argumenta
+argumentacio`n
+argumentador
+argumentadora
+argumentaient
+argumentaire
+argumentaires
+argumentais
+argumentait
+argumental
+argumentant
+argumentante
+argumentar
+argumentasjon
+argumentasjonen
+argumentasjoner
+argumentatie
+argumentaties
+argumentation
+argumentationen
+argumentationer
+argumentations
+argumentationsform
+argumentationshilfe
+argumentatious
+argumentativ
+argumentativa
+argumentative
+argumentatively
+argumentativeness
+argumentativo
+argumentator
+argumentatory
+argumentblok
+argumentblokke
+argumentblokken
+argumentdel
+argumente
+argumente'
+argumente'e
+argumente'es
+argumente's
+argumente`rent
+argumenteer
+argumenteerde
+argumenteerden
+argumenteert
+argumenten
+argumentene
+argumentent
+argumenter
+argumentera
+argumenterai
+argumenteraient
+argumenterais
+argumenterait
+argumenteras
+argumentere
+argumenterede
+argumenteren
+argumenterer
+argumenteres
+argumenterete
+argumenterez
+argumenteriez
+argumentering
+argumenterions
+argumenterne
+argumenterons
+argumenteront
+argumentert
+argumenterte
+argumentes
+argumentet
+argumentets
+argumentez
+argumentgruppen
+argumentieren
+argumentierend
+argumentierende
+argumentierenden
+argumentierender
+argumentierendes
+argumentiert
+argumentierte
+argumentierten
+argumentiertet
+argumentiez
+argumentions
+argumentista
+argumentive
+argumentkennzeichner
+argumentliste
+argumentlisten
+argumento
+argumentons
+argumentosa
+argumentoso
+arguments
+argumentspecifikation
+argumentwert
+argumentwerten
+argun
+arguni
+argunu
+argus
+argusaug
+argusaugen
+argusbli
+argusblikk
+arguses
+arguseye
+arguseyed
+argusfis
+argusfish
+argusian
+argusianus
+arguslik
+arguslike
+argusoge
+argusogen
+argussen
+argusvil
+argusville
+arguta
+argute
+argutely
+argutene
+arguteness
+arguti
+argutie
+arguties
+arguto
+arguyente
+arguzia
+arguzie
+argu{e
+argu{idor
+argu{idora
+argu{ir
+argu{itiva
+argu{itivo
+argv
+argwaan
+argwaand
+argwaande
+argwaanden
+argwaant
+argwanen
+argwanend
+argwanende
+argwanender
+argwanendheid
+argwanendst
+argwoehn
+argwoehnen
+argwoehnisch
+argwoehnischem
+argwoehnischen
+argwoehnischer
+argwoehnischerem
+argwoehnischeren
+argwoehnischerer
+argwoehnisches
+argwoehnischste
+argwoehnischstem
+argwoehnischster
+argwoehnischstes
+argwoehnt
+argwohns
+argyle
+argyles
+argyll
+argylls
+argynnis
+argyrant
+argyranthemous
+argyranthous
+argyrasp
+argyraspides
+argyria
+argyric
+argyriou
+argyrite
+argyroce
+argyrocephalous
+argyrodi
+argyrodite
+argyrol
+argyrone
+argyroneta
+argyrope
+argyropelecus
+argyrose
+argyrosi
+argyrosis
+argyroso
+argyrosomus
+argyryth
+argyrythrose
+arh
+arha
+arhangay
+arhar
+arhat
+arhats
+arhatshi
+arhatship
+arhauaco
+arher
+arhippa
+arho
+arhondis
+arhuaco
+arhundra
+arhundrade
+arhundradet
+arhus
+arhythmi
+arhythmic
+ari
+ari-hq1
+ari`ol
+ari`olo
+ari`saro
+aria
+aria's
+ariaal
+ariadna
+ariadne
+ariake
+ariakeka
+ariakeko
+ariakeno
+ariama
+ariamo
+arian
+ariana
+arianda
+ariane
+ariangul
+ariangulu
+arianism
+arianist
+arianistic
+arianistical
+arianists
+arianize
+arianizer
+arianrho
+arianrhod
+arianthe
+ariari
+arias
+ariate
+ariawase
+ariawiai
+aribai
+aribeda
+aribert
+ariberto
+aribindi
+aribine
+aric
+arica
+aricado
+aricapu
+aricar
+arichi
+arician
+aricine
+aricuna
+arid
+arida
+aridai
+aridaka
+aridashi
+aridasi
+aridatha
+aride
+aridecer
+arided
+arider
+arides
+aridest
+aridez
+aridge
+aridi
+aridian
+aridita
+aridite'
+ariditie
+aridities
+aridity
+aridly
+aridness
+arido
+arie
+ariegite
+arieh
+ariel
+ariela
+arieli
+ariella
+arielle
+arien
+ariena
+ariene
+arienes
+arienzo
+arier
+ariers
+arieru
+aries
+arieso
+arieta
+arietar
+arietaria
+arietario
+arietati
+arietation
+ariete
+arietid
+arietina
+arietino
+arietinous
+arietta
+arif
+arifama
+arifamam
+arifamaminiafia
+arifarzo
+arifure
+arifuret
+ariga
+arigachi
+arigane
+arigasat
+arigata
+arigatai
+arigatak
+arigatam
+arigati
+arigatou
+arigeta
+aright
+arightly
+arigibi
+arigidi
+arigue
+arihata
+arihini
+arii
+ariidae
+ariigawa
+ariikaku
+arija
+arije
+arijigok
+arijit
+arijo
+arik
+arika
+arikabe
+arikapu
+arikara
+arikata
+arikawa
+arikem
+arikinap
+arikinapi
+arikis
+arikitar
+arikun
+aril
+arilds
+ariled
+arillary
+arillate
+arillated
+arillifo
+arilliform
+arillo
+arillode
+arillodi
+arillodium
+arilloid
+arillus
+arilo
+arils
+arilvn
+arima
+arimabas
+arimabased
+arimagaw
+arimakin
+arimamod
+arimamodels
+arimasa
+arimasp
+arimaspe
+arimaspi
+arimaspian
+arimaspo
+arimata
+arimatha
+arimathaea
+arimathaean
+arimathe
+arimathea
+arimatsu
+arimatu
+arimayam
+arimez
+arimi
+arimo
+arimori
+arimorin
+arimoto
+arimoton
+arimura
+arimurak
+arimuram
+arin
+arina
+arinamin
+arinc
+arinc-gw
+arinc-ne
+arinc-net1
+arindam
+arine
+aring
+aringa
+aringar
+aringen
+arinko
+arino
+arinomam
+arinos
+arinua
+arinwa
+ario
+arioc
+ariocarp
+ariocarpus
+arioch
+arioi
+arioian
+arioka
+ariom
+arion
+ariosa
+ariose
+ariosi
+arioso
+ariosos
+ariot
+aripakts
+aripaktsa
+aripeka
+ariporo
+aripple
+arique
+aris
+arisa
+arisaema
+arisai
+arisaka
+arisakaa
+arisama
+arisard
+arisawa
+arisawah
+arisblanca
+arisblanco
+arisca
+ariscarse
+arisch
+arische
+arischer
+arischt
+arisco
+arise
+ariseach
+ariseachi
+arised
+arisen
+ariser
+arises
+ariseth
+arishaka
+arishi
+arishihi
+arishima
+arisi
+arisia
+arisihi
+arisima
+arising
+arisings
+arisk
+ariske
+arisme`tica
+arisme`tico
+arisnegra
+arisnegro
+arispe
+arisprieta
+arisprieto
+arist
+arista
+aristada
+aristado
+aristaeu
+aristaeus
+aristarc
+aristarch
+aristarchian
+aristarchus
+aristarchy
+aristarco
+aristate
+aristeas
+aristee
+aristeo
+aristes
+aristi`n
+aristid
+aristida
+aristide
+aristides
+aristine
+aristino
+aristipp
+aristippus
+aristo`crata
+aristobu
+aristobulus
+aristocr
+aristocra`tica
+aristocra`ticamente
+aristocra`tico
+aristocraat
+aristocracia
+aristocracies
+aristocracy
+aristocrat
+aristocrate
+aristocraten
+aristocrates
+aristocratic
+aristocratical
+aristocratically
+aristocraticalness
+aristocraticism
+aristocraticness
+aristocratie
+aristocratieen
+aristocraties
+aristocratique
+aristocratiques
+aristocratisch
+aristocratische
+aristocratischer
+aristocratischt
+aristocratism
+aristocrats
+aristode
+aristodemocracy
+aristodemocratical
+aristofa`nica
+aristofa`nico
+aristoge
+aristogenesis
+aristogenetic
+aristogenic
+aristogenics
+aristokr
+aristokrat
+aristokraten
+aristokratenes
+aristokratenfamilien
+aristokrater
+aristokrati
+aristokratie
+aristokratiet
+aristokratiets
+aristokratin
+aristokratisch
+aristokratische
+aristokratischen
+aristokratischer
+aristokratisches
+aristokratisk
+aristokratiske
+aristol
+aristolo
+aristolochia
+aristolochiaceae
+aristolochiaceous
+aristolochiales
+aristolochin
+aristolochine
+aristological
+aristologist
+aristology
+aristoloquia
+aristoloquia`cea
+aristoloquia`ceo
+aristomo
+aristomonarchy
+aristoph
+aristophanes
+aristophanic
+aristore
+aristorepublicanism
+aristosa
+aristoso
+aristote
+aristote`lica
+aristote`lico
+aristotelean
+aristoteles
+aristotelian
+aristotelianism
+aristotelic
+aristotelism
+aristotelismo
+aristotl
+aristotle
+aristoty
+aristotype
+aristula
+aristulate
+arisu
+arisugaw
+arisutot
+arita
+aritama
+aritao
+aritawa
+aritayak
+arite
+aritei
+arith
+arithme'
+arithme'tique
+arithme'tiques
+arithmet
+arithmetic
+arithmetical
+arithmetically
+arithmetician
+arithmeticians
+arithmetics
+arithmetik
+arithmetisch
+arithmetische
+arithmetischer
+arithmetization
+arithmetize
+arithmetized
+arithmetizes
+arithmic
+arithmoc
+arithmocracy
+arithmocratic
+arithmog
+arithmogram
+arithmograph
+arithmography
+arithmom
+arithmomania
+arithmometer
+ariti
+aritme`tica
+aritme`ticamente
+aritme`tico
+aritmeti
+aritmetica
+aritmetiche
+aritmetici
+aritmetico
+aritmetik
+aritmetikk
+aritmetikken
+aritmetisch
+aritmetische
+aritmetisk
+aritmetiska
+aritmetiske
+aritmetiskt
+aritmo`metro
+arito
+ariton
+aritou
+aritoumi
+aritsu
+aritsune
+arittake
+aritu
+aritune
+ariuru
+arius
+arivaca
+arivaipa
+ariwarun
+ariwaruna
+ariya
+ariyama
+ariyoshi
+ariyosi
+ariyou
+ariza
+arizjvax
+arizona
+arizonan
+arizonans
+arizonia
+arizonian
+arizonians
+arizonit
+arizonite
+arizono
+arizrvax
+arj
+arja
+arjas
+arjay
+arjeplog
+arjora`n
+arjun
+arjunasa
+ark
+arkab
+arkabutl
+arkabutla
+arkade
+arkadelp
+arkadelphia
+arkaden
+arkadenh
+arkadenhof
+arkadhia
+arkadin
+arkadius
+arkadiusz
+arkady
+arkaiser
+arkaisere
+arkaisert
+arkaisk
+arkaisme
+arkaismen
+arkanas
+arkansan
+arkansans
+arkansas
+arkansascity
+arkansaw
+arkansawyer
+arkansit
+arkansite
+arkdale
+arke
+arkell
+arken
+arkeolog
+arkeologen
+arkeologer
+arkeologi
+arkeologien
+arkeologisk
+arkeologiske
+arkestei
+arkesteijn
+arket
+arketyp
+arketypi
+arketypisk
+arkf|der
+arkf|dere
+arkhange
+arkhangelsk
+arkie
+arkim
+arkimedes
+arkimedi
+arkimedisk
+arkimediske
+arkin
+arkipel
+arkite
+arkitekt
+arkitekten
+arkitektene
+arkitektens
+arkitekter
+arkitektkontor
+arkitektonisk
+arkitektoniske
+arkitektskole
+arkitektskolens
+arkitektstudene
+arkitekttegninger
+arkitektur
+arkitekturen
+arkitekturer
+arkiv
+arkiva
+arkivali
+arkivalie
+arkivalier
+arkivar
+arkivare
+arkivaren
+arkivene
+arkiver
+arkivere
+arkiverer
+arkiveret
+arkivering
+arkiveringer
+arkivert
+arkivet
+arkivfil
+arkivfilen
+arkivfilm
+arkivopp
+arkivopptak
+arkivopptaket
+arkivsje
+arkivsjef
+arkles
+arknet
+arko
+arkoma
+arkose
+arkosic
+arkport
+arks
+arksikai
+arksikainen
+arksutit
+arksutite
+arktiklu
+arktikluft
+arktis
+arktisch
+arktischen
+arktisfo
+arktisforscher
+arktisk
+arktiske
+arktouro
+arktouros
+arkville
+ark{ologi
+arl
+arla
+arlan
+arlana
+arlanda
+arlar
+arle
+arledge
+arlee
+arleen
+arlen
+arlena
+arlene
+arleng
+arlequi`n
+arlequin
+arlequinada
+arlequinesca
+arlequinesco
+arlequins
+arles
+arless
+arleta
+arletta
+arlette
+arletty
+arley
+arleyne
+arli
+arlie
+arliene
+arlig
+arligen
+arlija
+arlin
+arlina
+arlinda
+arline
+arlingto
+arlington
+arlingtonheights
+arlirau
+arlis
+arliss
+arll
+arlo
+arlon
+arlong
+arlota
+arlote
+arloteri`a
+arloti`a
+arlt
+arluene
+arlut
+arlvs1
+arly
+arlyn
+arlyne
+arm
+arma
+armachse
+armacost
+armada
+armada's
+armadas
+armadera
+armadi
+armadi`a
+armadija
+armadijo
+armadill
+armadilla
+armadillididae
+armadillidium
+armadillo
+armadillos
+armadio
+armado
+armador
+armadora
+armadura
+armaerro
+armaerrors
+armagedd
+armageddon
+armageddonist
+armagh
+armagnac
+armahagy
+armahagyeman
+armai
+armaient
+armais
+armait
+armajal
+armajane
+armajo
+armamens
+armament
+armamentarium
+armamentary
+armamento
+armaments
+armamiento
+armammo
+arman
+armand
+armande
+armandha
+armandhammer
+armandijo
+armando
+armangit
+armangite
+armanni
+armano
+armant
+armantel
+armanza
+armar
+armare
+armario
+armariol
+armariolum
+armarium
+armarono
+armas
+armasse
+armasser
+armassero
+armassi
+armassim
+armassimo
+armaste
+armasti
+armata
+armate
+armateur
+armateurs
+armati
+armato
+armatole
+armatoles
+armatoli
+armatoste
+armatur
+armature
+armatured
+armaturen
+armaturenbranche
+armaturenbrett
+armaturenbrettern
+armaturenbretts
+armaturene
+armaturenfabrik
+armaturenfan
+armaturer
+armatures
+armatuur
+armava
+armavamo
+armavano
+armavate
+armavi
+armavo
+armax
+armazo`n
+armbaaga
+armbaagarna
+armbaend
+armbaender
+armbaendern
+armbagar
+armbagarna
+armband
+armbande
+armbanden
+armbandh
+armbandhorloge
+armbandhorloges
+armbands
+armbandsur
+armbandu
+armbanduhr
+armbanduhren
+armbestu
+armbesturen
+armbestuur
+armbev{gelser
+armbeweg
+armbeweging
+armbewegingen
+armbezoe
+armbezoek
+armbezoeken
+armbinde
+armbone
+armbruch
+armbruches
+armbruec
+armbruechen
+armbruk
+armbrust
+armbruster
+armbr|st
+armbr|stbolt
+armbr|stbolte
+armbr|ste
+armbr|sten
+armbr|stens
+armb}gar
+armb}garna
+armb}nd
+armb}nde
+armb}ndene
+armb}nds
+armb}ndsur
+armchair
+armchaired
+armchairs
+armco
+armd
+arme
+arme'
+arme'e
+arme'es
+arme's
+arme`nico
+arme`ren
+arme`rent
+armed
+armede
+armee
+armeebla
+armeeblatt
+armeeche
+armeechef
+armeefue
+armeefuehrung
+armeekos
+armeekosten
+armeemin
+armeeministerium
+armeen
+armeeoff
+armeeoffiziere
+armeeoffiziers
+armeerat
+armeesta
+armeestaerke
+armeetra
+armeetradition
+armeeuni
+armeeuniformen
+armel
+armelia
+armelijk
+armelijke
+armelijker
+armelijkst
+armella
+armelle
+armelluela
+armelui
+armeluis
+armeluiskind
+armeluiskinderen
+armem
+armement
+armements
+armen
+armenaki
+armenakis
+armenbel
+armenbelasting
+armenbelastingen
+armenbuu
+armenbuurt
+armenbuurten
+armendar
+armendariz
+armender
+armenderez
+armendok
+armendokter
+armendokters
+armene
+armenfon
+armenfonds
+armenfondsen
+armengau
+armengaud
+armengel
+armengeld
+armengelden
+armengol
+armenhae
+armenhaeuser
+armenhaeusern
+armenhau
+armenhauses
+armenhui
+armenhuis
+armenhuizen
+armenia
+armeniac
+armeniaceous
+armenian
+armenians
+armenic
+armenien
+armenier
+armenieren
+armeniers
+armeninr
+armeninrichting
+armeninrichtingen
+armenio
+armenisc
+armenische
+armenize
+armenkas
+armenkassen
+armenoid
+armenpra
+armenpraktijk
+armenraa
+armenraad
+armenrad
+armenraden
+armensch
+armenscholen
+armenschool
+arment
+armenta
+armento
+armentro
+armentrout
+armenver
+armenverzorger
+armenverzorgers
+armenverzorging
+armenvie
+armenvierteln
+armenwet
+armenwetten
+armenzak
+armenzakje
+armenzakjes
+armenzor
+armenzorg
+armer
+armera
+armerai
+armeraie
+armeraient
+armerais
+armerait
+armerann
+armeranno
+armeras
+armere
+armerebb
+armerebbe
+armerei
+armeremm
+armeremmo
+armeremo
+armerest
+armereste
+armeresti
+armerete
+armerez
+armeri`a
+armeria
+armeriac
+armeriaceae
+armeriez
+armerion
+armerions
+armero
+armerol
+armerons
+armeront
+armers
+armert
+armerte
+armes
+armet
+armetier
+armetierig
+armetierige
+armetieriger
+armetierigst
+armetta
+armey
+armez
+armezond
+armezondaarsgezicht
+armezondaarsgezichten
+armfeldt
+armflueg
+armfluegeln
+armful
+armfuls
+armgard
+armgaunt
+armhaltu
+armhaltung
+armhebel
+armhole
+armholes
+armhoop
+armhuis
+armhuize
+armhuizen
+armhule
+armi
+armi\ada
+armi\ado
+armi\ar
+armi\o
+armi`fera
+armi`fero
+armi`gera
+armi`gero
+armiamo
+armiane
+armiate
+armida
+armidale
+armido
+armie
+armied
+armiert
+armies
+armiez
+armifero
+armiferous
+armiger
+armigera
+armigeral
+armigere
+armigerent
+armigero
+armigerous
+armigers
+armijo
+armil
+armilar
+armilla
+armillar
+armillaria
+armillary
+armillat
+armillate
+armillated
+armin
+armina
+armine
+arming
+armingen
+armings
+armingto
+armington
+armini
+arminian
+arminianism
+arminianize
+arminianizer
+arminio
+armino
+arminta
+armions
+armipote
+armipotence
+armipotent
+armipotente
+armisona
+armisonant
+armisonante
+armisono
+armisonous
+armistea
+armistead
+armistic
+armistice
+armistices
+armisticia
+armisticio
+armistiz
+armistizio
+armit
+armitage
+armitraj
+armkettc
+armkettchen
+armlasti
+armlastig
+armlastige
+armlehne
+armlehnen
+armlengd
+armlengde
+armlenke
+armless
+armlessl
+armlessly
+armlessn
+armlessness
+armlet
+armlets
+armleuni
+armleuning
+armleuningen
+armlike
+armload
+armloads
+armlose
+armmeest
+armmeester
+armmeesters
+armne
+armo
+armo`n
+armo`nica
+armo`nicamente
+armo`nico
+armod
+armoda
+armoden
+armodens
+armodsdo
+armodsdom
+armodsdommen
+armodsli
+armodslig
+armoe
+armoede
+armoedig
+armoedige
+armoediger
+armoedigheid
+armoedigst
+armoedza
+armoedzaaier
+armoedzaaiers
+armoire
+armoires
+armoirie
+armoiries
+armolavi
+armolavicius
+armona
+armond
+armoni
+armoni`a
+armonia
+armoniaco
+armonica
+armonie
+armonio
+armoniosa
+armoniosamente
+armonioso
+armonista
+armonizable
+armonizacio`n
+armonizar
+armonk
+armons
+armopa
+armor
+armoraci
+armoracia
+armorcla
+armorclad
+armored
+armorel
+armorer
+armorers
+armoriaa
+armoriaal
+armorial
+armorialen
+armoric
+armorica
+armorican
+armoricana
+armoricano
+armorici
+armorician
+armorie
+armorie'
+armorie'e
+armorie'es
+armorie's
+armoried
+armorier
+armories
+armoring
+armorist
+armorpla
+armorplated
+armorpro
+armorproof
+armors
+armorwis
+armorwise
+armory
+armos
+armouchi
+armouchiquois
+armour
+armourbe
+armourbearer
+armoured
+armourer
+armourers
+armourie
+armouries
+armourin
+armouring
+armours
+armoury
+armozeen
+armpiece
+armpit
+armpitne
+armpitnet
+armpits
+armpje
+armpjes
+armplate
+armrack
+armreif
+armreife
+armreifen
+armrest
+armrests
+arms
+armscye
+armselig
+armselige
+armseligem
+armseligen
+armseligere
+armseligerem
+armseligeren
+armseligeres
+armseliges
+armseligkeit
+armseligste
+armseligsten
+armseligster
+armseligstes
+armsesse
+armsessel
+armsful
+armsgat
+armsgate
+armsgaten
+armslag
+armsleng
+armslengte
+armslengten
+armslengtes
+armst
+armstead
+armstell
+armstellung
+armstod
+armstoed
+armstoel
+armstoelen
+armstron
+armstrong
+armstrongcreek
+armst|d
+armst|tt
+armst|tter
+armtieri
+armtierig
+armtierige
+armtieriger
+armtierigst
+armuchee
+armud
+armuelle
+armure
+armureri
+armurerie
+armureries
+armures
+armurier
+armuriers
+armus
+armut
+armutsge
+armutsgebieten
+armutsze
+armutszeugnisse
+armutszeugnissen
+armutszeugnisses
+armverzo
+armverzorger
+armverzorgers
+armverzorging
+armvol
+armvolle
+armvollen
+armvoogd
+armvoogden
+armwezen
+army
+armytage
+armyworm
+armyworms
+armzalig
+armzalige
+armzaliger
+armzaligheid
+armzaligst
+arn
+arna
+arnab
+arnacho
+arnad
+arnadi`
+arnal
+arnaldo
+arnall
+arnan
+arnaquer
+arnardo
+arnasca
+arnason
+arnatt
+arnau`te
+arnaud
+arnaudvi
+arnaudville
+arnaudy
+arnauld
+arnaut
+arnav
+arnaz
+arnberry
+arnborg
+arnd
+arndt
+arne
+arne`s
+arneb
+arnebia
+arnee
+arneg
+arnegard
+arnella
+arnemann
+arnequi`n
+arneric
+arnese
+arneselv
+arneselvencoule
+arnesen
+arnesi
+arness
+arnessys
+arnessysla
+arnesteder
+arnett
+arney
+arnfried
+arngrim
+arnheim
+arnhelm
+arnhem
+arni
+arnica
+arnicas
+arnie
+arnillo
+arnim
+arnis
+arniya
+arniyo
+arno
+arnold
+arnolda
+arnoldaf
+arnoldafb
+arnoldi
+arnoldis
+arnoldist
+arnoldo
+arnolds
+arnoldsb
+arnoldsburg
+arnoldsp
+arnoldspark
+arnoldsv
+arnoldsville
+arnon
+arnone
+arnor
+arnoseri
+arnoseris
+arnost
+arnot
+arnott
+arnotta
+arnotto
+arnoud
+arnoul
+arnould
+arnoux
+arnov
+arnsprin
+arnspringer
+arnstadt
+arnstaed
+arnstaedt
+arnstedt
+arnstein
+arnstutz
+arnt
+arnuad
+arnulf
+arnulv
+arnusian
+arnut
+arny
+aro
+aro-emh1
+aro^me
+aro^mes
+aroar
+aroast
+aroba
+aroca
+arock
+arod
+aroda
+arodi
+arodites
+aroe
+aroeira
+aroer
+aroerite
+aroeste
+arogbo
+aroha
+arohasha
+aroian
+aroid
+aroidea
+aroideo
+aroideou
+aroideous
+aroides
+aroids
+aroint
+arointed
+arointin
+arointing
+aroints
+arokesyo
+aroketo
+arokku
+arokwa
+aroldo
+arolium
+arolla
+arom
+aroma
+aroma's
+aroma`tica
+aroma`tico
+aromacit
+aromacity
+aromaden
+aromadendrin
+aromaen
+aromapar
+aromapark
+aromar
+aromas
+aromate
+aromates
+aromatic
+aromatically
+aromaticidad
+aromaticness
+aromatics
+aromatiq
+aromatique
+aromatiques
+aromatis
+aromatisch
+aromatische
+aromatischem
+aromatischer
+aromatischere
+aromatischerem
+aromatischeres
+aromatisches
+aromatischste
+aromatischsten
+aromatischster
+aromatischstes
+aromatischt
+aromatise'
+aromatise'e
+aromatise'es
+aromatise's
+aromatiseer
+aromatiseerde
+aromatiseerden
+aromatiseert
+aromatiser
+aromatiseren
+aromatisk
+aromatit
+aromatite
+aromatites
+aromatiz
+aromatizacio`n
+aromatizante
+aromatizar
+aromatization
+aromatize
+aromatizer
+aromatop
+aromatophor
+aromatophore
+aromen
+aromi
+aromo
+aromosa
+aromoso
+aromunia
+aromunian
+aron
+arona
+aronia
+aronnax
+aronovic
+aronovich
+aronskel
+aronskelk
+aronskelken
+aronson
+aronsson
+aronstam
+aroom
+aroon
+arop
+arora
+arorae
+aroras
+arosa
+arosagun
+arosaguntacook
+arosario
+arose
+arosemen
+arosemena
+arosi
+around
+arounds
+arous
+arousal
+arousals
+arouse
+aroused
+arouseme
+arousement
+arouser
+arousers
+arouses
+arousing
+arove
+arow
+arowak
+aroxyl
+aroynt
+aroynts
+arozamen
+arozamena
+arp
+arpa
+arpa-gw
+arpa-mc
+arpa-png
+arpa-png11
+arpa1
+arpa1-mi
+arpa1-mil-tac
+arpa2
+arpa2-mi
+arpa2-mil-tac
+arpa3
+arpa3-ta
+arpa3-tac
+arpad
+arpada
+arpado
+arpador
+arpadura
+arpagrun
+arpagrunion
+arpanet
+arpanet-
+arpanet-mc
+arpar
+arpatroy
+arpatroy-gw
+arpe
+arpe'ger
+arpe`ge
+arpe`ges
+arpeggia
+arpeggiando
+arpeggiated
+arpeggiation
+arpeggio
+arpeggioed
+arpeggios
+arpegio
+arpella
+arpen
+arpende
+arpent
+arpenta
+arpentai
+arpentaient
+arpentais
+arpentait
+arpentan
+arpentant
+arpente
+arpente'
+arpente'e
+arpente'es
+arpente's
+arpente`
+arpente`rent
+arpenten
+arpentent
+arpenter
+arpentera
+arpenterai
+arpenteraient
+arpenterais
+arpenterait
+arpenteras
+arpenterez
+arpenteriez
+arpenterions
+arpenterons
+arpenteront
+arpentes
+arpenteu
+arpenteur
+arpenteurs
+arpentez
+arpentha
+arpenthaler
+arpentie
+arpentiez
+arpentio
+arpentions
+arpenton
+arpentons
+arpents
+arpeo
+arpercen
+arphad
+arphaxad
+arpi`a
+arpillador
+arpilladura
+arpillar
+arpillera
+arpin
+arpista
+arpita
+arpo`n
+arpola
+arponada
+arponado
+arponar
+arponero
+arpoundr
+arpoundren
+arq
+arqueada
+arqueador
+arqueaje
+arqueamiento
+arquear
+arquebus
+arquebusade
+arquebuses
+arqueo
+arqueo`logo
+arqueoli`tica
+arqueoli`tico
+arqueolo`gica
+arqueolo`gico
+arqueologi`a
+arquer
+arqueri`a
+arquerit
+arquerite
+arquero
+arqueta
+arqueti`pica
+arqueti`pico
+arquetipo
+arqueto`n
+arquette
+arqui`medes
+arqui`ptero
+arquibanco
+arquidio`cesis
+arquiepiscopal
+arquifou
+arquifoux
+arquimesa
+arquipel
+arquipelago
+arquisinagogo
+arquitecto
+arquitecto`nica
+arquitecto`nico
+arquitector
+arquitectura
+arquitectural
+arquitrabe
+arquivolta
+arr
+arra
+arra`ez
+arra`s
+arraba`
+arrabal
+arrabalde
+arrabalera
+arrabalero
+arrabbi
+arrabbia
+arrabbiai
+arrabbiamo
+arrabbiano
+arrabbiare
+arrabbiata
+arrabbiate
+arrabbiati
+arrabbiato
+arrabbiava
+arrabbiavi
+arrabbiavo
+arrabbie
+arrabbiera
+arrabbiero
+arrabbin
+arrabbino
+arrabbio
+arrabiadamente
+arrabio
+arracach
+arracacha
+arracacha`
+arracaci
+arracacia
+arracada
+arracha
+arrachag
+arrachage
+arrachai
+arrachaient
+arrachais
+arrachait
+arrachan
+arrachant
+arrache
+arrache'
+arrache'e
+arrache'es
+arrache's
+arrache-
+arrache-pied
+arrache`
+arrache`rent
+arrachem
+arrachement
+arrachements
+arrachen
+arrachent
+arracher
+arrachera
+arracherai
+arracheraient
+arracherais
+arracherait
+arracheras
+arracherez
+arracheriez
+arracherions
+arracherons
+arracheront
+arraches
+arracheu
+arracheur
+arracheurs
+arrachez
+arrachie
+arrachiez
+arrachio
+arrachions
+arrachon
+arrachons
+arracimada
+arracimado
+arracimarse
+arrack
+arracks
+arracla`n
+arraezar
+arrafiz
+arragon
+arrah
+arraigada
+arraigadamente
+arraigadas
+arraigado
+arraigadura
+arraigamiento
+arraigante
+arraigar
+arraign
+arraignd
+arraigne
+arraigned
+arraigner
+arraigni
+arraigning
+arraignm
+arraignment
+arraignments
+arraigns
+arraigo
+arraison
+arraisonna
+arraisonnaient
+arraisonnais
+arraisonnait
+arraisonnant
+arraisonne
+arraisonne'
+arraisonne'e
+arraisonne'es
+arraisonne's
+arraisonne`rent
+arraisonnement
+arraisonnements
+arraisonnent
+arraisonner
+arraisonnera
+arraisonnerai
+arraisonneraient
+arraisonnerais
+arraisonnerait
+arraisonneras
+arraisonnerez
+arraisonneriez
+arraisonnerions
+arraisonnerons
+arraisonneront
+arraisonnes
+arraisonnez
+arraisonniez
+arraisonnions
+arraisonnons
+arrak
+arrakh
+arrakis
+arralar
+arramblar
+arrame
+arrampic
+arrampica
+arrampicai
+arrampichi
+arrampico
+arramplar
+arrancada
+arrancadera
+arrancadero
+arrancado
+arrancador
+arrancadora
+arrancadura
+arrancamiento
+arrancapinos
+arrancar
+arrancasiega
+arranchar
+arrancharse
+arranciarse
+arrange
+arrange'
+arrange'e
+arrange'es
+arrange's
+arrange`
+arrange`rent
+arrangea
+arrangeable
+arrangeaient
+arrangeais
+arrangeait
+arrangeant
+arrangeante
+arrangeantes
+arrangeants
+arranged
+arrangee
+arrangeer
+arrangeerde
+arrangeerden
+arrangeert
+arrangem
+arrangemang
+arrangement
+arrangemente
+arrangementen
+arrangementene
+arrangementer
+arrangementet
+arrangements
+arrangementskomiteen
+arrangementskomiteens
+arrangen
+arrangent
+arrangeo
+arrangeons
+arranger
+arrangera
+arrangerai
+arrangeraient
+arrangerais
+arrangerait
+arrangeras
+arrangere
+arrangerede
+arrangerei
+arrangeren
+arrangerende
+arrangerer
+arrangeres
+arrangeret
+arrangerez
+arrangeriez
+arrangerions
+arrangero
+arrangerons
+arrangeront
+arrangers
+arrangert
+arrangerte
+arranges
+arrangez
+arrangi
+arrangia
+arrangiai
+arrangiamo
+arrangiano
+arrangiare
+arrangiata
+arrangiate
+arrangiati
+arrangiato
+arrangiava
+arrangiavi
+arrangiavo
+arrangie
+arrangieren
+arrangierend
+arrangierende
+arrangierenden
+arrangierender
+arrangierendes
+arrangiert
+arrangierte
+arrangiertem
+arrangierter
+arrangiertes
+arrangiertest
+arrangiez
+arrangin
+arranging
+arrangino
+arrangio
+arrangions
+arrang|r
+arrang|ren
+arrang|rene
+arrang|renes
+arrang|rer
+arrang|rerne
+arrang|rklubben
+arrang|rklubbens
+arranque
+arranquera
+arrant
+arrantly
+arrants
+arrapaho
+arrapahoe
+arrapar
+arrapiezo
+arrapo
+arraquive
+arras
+arrasada
+arrasado
+arrasadura
+arrasamiento
+arrasar
+arrascar
+arrased
+arrasene
+arrases
+arrastra
+arrastraculo
+arrastrada
+arrastradamente
+arrastradera
+arrastradero
+arrastradiza
+arrastradizo
+arrastrado
+arrastradura
+arrastramiento
+arrastrante
+arrastrapie`s
+arrastrar
+arrastre
+arrate
+arratel
+arratonada
+arratonado
+arrau
+array
+arraya`n
+arrayal
+arrayals
+arrayanal
+arrayaz
+arrayd
+arrayed
+arrayer
+arrayers
+arraying
+arraymen
+arrayment
+arrays
+arraz
+arre
+arre'rag
+arre'rage'
+arre'rage'e
+arre'rage'es
+arre'rage's
+arre'rageant
+arre'rager
+arre'rages
+arre^t
+arre^ta
+arre^tai
+arre^taient
+arre^tais
+arre^tait
+arre^tan
+arre^tant
+arre^te
+arre^te'
+arre^te'e
+arre^te'es
+arre^te's
+arre^te`
+arre^te`rent
+arre^ten
+arre^tent
+arre^ter
+arre^tera
+arre^terai
+arre^teraient
+arre^terais
+arre^terait
+arre^teras
+arre^terez
+arre^teriez
+arre^terions
+arre^terons
+arre^teront
+arre^tes
+arre^tez
+arre^tie
+arre^tiez
+arre^tio
+arre^tions
+arre^ton
+arre^tons
+arre^ts
+arreada
+arreador
+arreala
+arreamiento
+arrear
+arrearag
+arrearage
+arrearages
+arrears
+arreba\aderas
+arreba\ador
+arreba\adora
+arreba\adura
+arreba\ar
+arrebatacapas
+arrebatada
+arrebatadamente
+arrebatadiza
+arrebatadizo
+arrebatado
+arrebatador
+arrebatadora
+arrebatamiento
+arrebatapu\adas
+arrebatar
+arrebatarse
+arrebati\a
+arrebato
+arrebatosa
+arrebatoso
+arrebol
+arrebolada
+arrebolar
+arrebolera
+arrebollarse
+arrebozar
+arrebozo
+arrebujadamente
+arrebujar
+arrecadar
+arrecha
+arrecho
+arrechucho
+arreciar
+arrecifar
+arrecife
+arrecir
+arrect
+arrector
+arreda
+arredai
+arredamm
+arredammo
+arredand
+arredando
+arredano
+arredare
+arredaro
+arredarono
+arredass
+arredasse
+arredassi
+arredast
+arredaste
+arredasti
+arredata
+arredate
+arredati
+arredato
+arredava
+arredavamo
+arredavano
+arredavate
+arredavi
+arredavo
+arredera
+arrederai
+arredere
+arrederei
+arrederemo
+arrederete
+arredero
+arredi
+arrediam
+arrediamo
+arrediat
+arrediate
+arredilar
+arredino
+arredo
+arredomada
+arredomado
+arredomar
+arredondar
+arredondear
+arredor
+arredramiento
+arredrar
+arredro
+arreede
+arregazada
+arregazado
+arregazar
+arreglada
+arregladamente
+arreglado
+arreglador
+arregladora
+arreglamiento
+arreglar
+arreglo
+arregostarse
+arregosto
+arrejacar
+arrejaco
+arrejada
+arrejaque
+arrejerar
+arrejonada
+arrejonado
+arrela
+arrelde
+arrellanarse
+arremangada
+arremangado
+arremangar
+arremango
+arrematar
+arremedador
+arremedadora
+arremedar
+arremembrar
+arremetedero
+arremetedor
+arremetedora
+arremeter
+arremetida
+arremetimiento
+arremolinadamente
+arremolinarse
+arrempujar
+arremueco
+arremuesco
+arren
+arrena
+arrenai
+arrenamm
+arrenammo
+arrenand
+arrenando
+arrenano
+arrenare
+arrenaro
+arrenarono
+arrenass
+arrenasse
+arrenassi
+arrenast
+arrenaste
+arrenasti
+arrenata
+arrenate
+arrenati
+arrenato
+arrenava
+arrenavamo
+arrenavano
+arrenavate
+arrenavi
+arrenavo
+arrendable
+arrendacio`n
+arrendada
+arrendadero
+arrendado
+arrendador
+arrendadora
+arrendadorcillo
+arrendajo
+arrendamiento
+arrendante
+arrendar
+arrendat
+arrendataria
+arrendatario
+arrendaticia
+arrendaticio
+arrendation
+arrendator
+arrendatorn
+arrender
+arrendera
+arrenera
+arrenerai
+arrenere
+arrenerei
+arreneremo
+arrenerete
+arrenero
+arreni
+arreniam
+arreniamo
+arreniat
+arreniate
+arrenino
+arreno
+arrenoto
+arrenotokous
+arrenotoky
+arrent
+arrentab
+arrentable
+arrentada
+arrentado
+arrentat
+arrentation
+arreo
+arrepa`palo
+arrepanchigarse
+arrepasarse
+arrepentida
+arrepentimiento
+arrepentirse
+arrepier
+arrepiert
+arrepisa
+arrepiso
+arrepistar
+arrepisto
+arrepticia
+arrepticio
+arreptit
+arreptitious
+arrequesonarse
+arrequife
+arrequive
+arresled
+arreslede
+arresleden
+arreslee
+arresleeen
+arrest
+arresta
+arrestab
+arrestable
+arrestada
+arrestado
+arrestai
+arrestam
+arrestammo
+arrestan
+arrestando
+arrestano
+arrestant
+arrestante
+arrestanten
+arrestantene
+arrestantenhok
+arrestantenhokken
+arrestantenkamer
+arrestantenkamers
+arrestar
+arrestare
+arrestas
+arrestasjon
+arrestasjonen
+arrestasjonene
+arrestasjoner
+arrestasse
+arrestassi
+arrestaste
+arrestasti
+arrestat
+arrestata
+arrestate
+arrestati
+arrestatie
+arrestaties
+arrestation
+arrestations
+arrestato
+arrestav
+arrestava
+arrestavi
+arrestavo
+arreste
+arrested
+arrestee
+arresteer
+arresteerde
+arresteerden
+arresteert
+arrestees
+arresten
+arrester
+arrestera
+arresterai
+arrestere
+arresterei
+arresteren
+arresterer
+arresteres
+arrestero
+arresters
+arrestert
+arresterte
+arresti
+arrestia
+arrestiamo
+arrestiate
+arrestin
+arresting
+arrestingly
+arrestino
+arrestiv
+arrestive
+arrestlo
+arrestlokale
+arrestme
+arrestment
+arresto
+arrestor
+arrestordre
+arrestors
+arrests
+arret
+arrete
+arretez
+arreti`n
+arretier
+arretiere
+arretieren
+arretierende
+arretierendem
+arretierenden
+arretierendes
+arretierst
+arretierte
+arretierten
+arretierter
+arretiertes
+arretiertet
+arretine
+arretje
+arretjes
+arretranca
+arretrat
+arretrata
+arretrate
+arretrati
+arretrato
+arrevesada
+arrevesado
+arrevolvedor
+arrevolver
+arrey
+arrezafe
+arrezagar
+arrgh
+arrhenal
+arrhenat
+arrhenatherum
+arrheniu
+arrhenius
+arrhenoi
+arrhenoid
+arrhenot
+arrhenotokous
+arrhenotoky
+arrhes
+arrhinia
+arrhizal
+arrhizou
+arrhizous
+arrhythm
+arrhythmia
+arrhythmias
+arrhythmic
+arrhythmical
+arrhythmically
+arrhythmous
+arrhythmy
+arri
+arri\onada
+arri\onado
+arri`tmica
+arri`tmico
+arria
+arriada
+arriaga
+arriage
+arrial
+arriana
+arrianismo
+arriano
+arriar
+arriata
+arriate
+arriaz
+arriba
+arribada
+arribadas
+arribaje
+arribar
+arribas
+arribazo`n
+arribe\a
+arribe\o
+arribo
+arribota
+arriccer
+arriccera
+arriccerai
+arriccerei
+arriccero
+arricchi
+arricchire
+arricchiro
+arricchita
+arricci
+arriccia
+arricciai
+arricciamo
+arricciano
+arricciare
+arricciata
+arricciate
+arricciati
+arricciato
+arricciava
+arricciavi
+arricciavo
+arriccin
+arriccino
+arriccio
+arrice`s
+arricesa
+arricete
+arridar
+arride
+arridge
+arrido
+arrie
+arrie're
+arrie're'
+arrie're'e
+arrie're'es
+arrie're's
+arrie`re
+arrie`re-boutique
+arrie`re-boutiques
+arrie`re-cour
+arrie`re-cours
+arrie`re-garde
+arrie`re-gou^t
+arrie`re-grand-me`re
+arrie`re-grand-me`res
+arrie`re-grand-oncle
+arrie`re-grand-pe`re
+arrie`re-grand-tante
+arrie`re-grand-tantes
+arrie`re-grands-oncles
+arrie`re-grands-parents
+arrie`re-grands-pe`res
+arrie`re-pays
+arrie`re-pense'e
+arrie`re-pense'es
+arrie`re-petit-fils
+arrie`re-petite-fille
+arrie`re-petites-filles
+arrie`re-petits-enfants
+arrie`re-petits-fils
+arrie`re-plan
+arrie`re-plans
+arrie`re-saison
+arrie`re-saisons
+arrie`re-train
+arrie`re-trains
+arrie`res
+arriedro
+arriega
+arriendo
+arriere
+arrieri`a
+arrierito
+arriero
+arriesgada
+arriesgadamente
+arriesgado
+arriesgar
+arriesgo`n
+arriet
+arrieta
+arrig
+arrighet
+arrigirse
+arrigo
+arrima
+arrimadero
+arrimadillo
+arrimadiza
+arrimadizo
+arrimador
+arrimadura
+arrimage
+arrimages
+arrimaie
+arrimaient
+arrimais
+arrimait
+arrimant
+arrimar
+arrimby
+arrime
+arrime'
+arrime'e
+arrime'es
+arrime's
+arrime`r
+arrime`rent
+arriment
+arrimer
+arrimera
+arrimerai
+arrimeraient
+arrimerais
+arrimerait
+arrimeras
+arrimere
+arrimerez
+arrimeri
+arrimeriez
+arrimerions
+arrimero
+arrimerons
+arrimeront
+arrimes
+arrimez
+arrimiez
+arrimion
+arrimions
+arrimo
+arrimo`n
+arrimons
+arrin
+arrincada
+arrincar
+arrinconada
+arrinconado
+arrinconamiento
+arrinconar
+arrindel
+arrindell
+arringa
+arringai
+arringam
+arringammo
+arringan
+arringando
+arringano
+arringar
+arringare
+arringas
+arringasse
+arringassi
+arringaste
+arringasti
+arringat
+arringata
+arringate
+arringati
+arringato
+arringav
+arringava
+arringavi
+arringavo
+arringeu
+arringhe
+arringhera
+arringhero
+arringhi
+arringhino
+arringo
+arringto
+arrington
+arriostrar
+arris
+arriscada
+arriscadamente
+arriscado
+arriscador
+arriscadora
+arriscamiento
+arriscar
+arrischi
+arrischia
+arrischiai
+arrischino
+arrischio
+arrisco
+arrish
+arrisway
+arrisways
+arriswis
+arriswise
+arritmia
+arritranca
+arrius
+arriv
+arriva
+arrivage
+arrivages
+arrivai
+arrivaie
+arrivaient
+arrivais
+arrivait
+arrival
+arrivals
+arrivamm
+arrivammo
+arrivand
+arrivando
+arrivano
+arrivant
+arrivants
+arrivare
+arrivaro
+arrivarono
+arrivass
+arrivasse
+arrivassi
+arrivast
+arrivaste
+arrivasti
+arrivata
+arrivate
+arrivati
+arrivato
+arrivava
+arrivavamo
+arrivavano
+arrivavate
+arrivavi
+arrivavo
+arrive
+arrive'
+arrive'e
+arrive'es
+arrive's
+arrive`r
+arrive`rent
+arrived
+arrivede
+arrivederci
+arriveer
+arriveerde
+arriveerden
+arriveert
+arrivent
+arriver
+arrivera
+arriverai
+arriveraient
+arriverais
+arriverait
+arriveras
+arrivere
+arriverei
+arriveremo
+arriveren
+arriverete
+arriverez
+arriveri
+arriveriez
+arriverions
+arrivero
+arriverons
+arriveront
+arrivers
+arrivert
+arriverte
+arrives
+arrivez
+arrivi
+arriviam
+arriviamo
+arriviat
+arriviate
+arrivier
+arrivierten
+arriviez
+arriving
+arrivino
+arrivion
+arrivions
+arrivism
+arrivisme
+arrivist
+arriviste
+arrivisten
+arrivistes
+arrivo
+arrivons
+arrizar
+arro
+arroaz
+arroba
+arrobada
+arrobadera
+arrobadiza
+arrobadizo
+arrobado
+arrobador
+arrobadora
+arrobal
+arrobamiento
+arrobar
+arrobe\a
+arrobe\o
+arrobera
+arrobero
+arrobeta
+arrobi\ar
+arrobo
+arrocabe
+arrocada
+arrocado
+arrocera
+arrocero
+arrocinada
+arrocinado
+arrocinar
+arrodajarse
+arrodeamiento
+arrodear
+arrodeo
+arrodillada
+arrodilladura
+arrodillamiento
+arrodillar
+arrodrigar
+arrodrigonar
+arroga
+arrogacio`n
+arrogador
+arrogadora
+arrogai
+arrogamm
+arrogammo
+arroganc
+arrogance
+arrogancia
+arrogancy
+arrogand
+arrogando
+arrogano
+arroganp
+arroganpen
+arrogans
+arroganse
+arrogansen
+arrogant
+arrogante
+arrogantem
+arrogantemente
+arroganten
+arroganter
+arroganteren
+arroganterer
+arroganteres
+arrogantes
+arroganteste
+arrogantestem
+arrogantesten
+arrogantestes
+arroganti
+arrogantie
+arrogantly
+arrogantness
+arrogants
+arrogantst
+arroganz
+arroganza
+arroganze
+arrogar
+arrogare
+arrogaro
+arrogarono
+arrogass
+arrogasse
+arrogassi
+arrogast
+arrogaste
+arrogasti
+arrogata
+arrogate
+arrogated
+arrogates
+arrogati
+arrogating
+arrogatingly
+arrogation
+arrogations
+arrogative
+arrogato
+arrogator
+arrogava
+arrogavamo
+arrogavano
+arrogavate
+arrogavi
+arrogavo
+arroge
+arroge'
+arroge'e
+arroge'es
+arroge's
+arroge`r
+arroge`rent
+arrogea
+arrogeai
+arrogeaient
+arrogeais
+arrogeait
+arrogean
+arrogeant
+arrogent
+arrogeon
+arrogeons
+arroger
+arrogera
+arrogerai
+arrogeraient
+arrogerais
+arrogerait
+arrogeras
+arrogere
+arrogerez
+arrogeri
+arrogeriez
+arrogerions
+arrogero
+arrogerons
+arrogeront
+arroges
+arrogez
+arrogher
+arroghera
+arrogherai
+arrogherei
+arroghero
+arroghi
+arroghia
+arroghiamo
+arroghiate
+arroghin
+arroghino
+arrogiez
+arrogion
+arrogions
+arrogo
+arrojada
+arrojadamente
+arrojadi
+arrojadite
+arrojadiza
+arrojadizo
+arrojado
+arrojador
+arrojadora
+arrojamiento
+arrojar
+arroje
+arrojo
+arrollable
+arrollada
+arrollado
+arrollador
+arrolladora
+arrollamiento
+arrollar
+arromadizar
+arromanzar
+arromar
+arromper
+arrompida
+arrompido
+arrompimiento
+arron
+arrond.
+arronder
+arrondering
+arrondi
+arrondie
+arrondiert
+arrondierte
+arrondierung
+arrondies
+arrondir
+arrondira
+arrondirai
+arrondiraient
+arrondirais
+arrondirait
+arrondiras
+arrondirent
+arrondirez
+arrondiriez
+arrondirions
+arrondirons
+arrondiront
+arrondis
+arrondissaient
+arrondissais
+arrondissait
+arrondissant
+arrondisse
+arrondissement
+arrondissementen
+arrondissements
+arrondissementscommissaris
+arrondissementscommissarissen
+arrondissementsrechtbank
+arrondissementsrechtbanken
+arrondissementsschoolopziener
+arrondissementsschoolopzieners
+arrondissent
+arrondisses
+arrondissez
+arrondissiez
+arrondissions
+arrondissons
+arrondit
+arronjar
+arronquecer
+arronzar
+arropamiento
+arropar
+arrope
+arropea
+arropera
+arropi`a
+arropiera
+arropiero
+arrosa
+arrosage
+arrosaie
+arrosaient
+arrosais
+arrosait
+arrosant
+arroscar
+arrose
+arrose'
+arrose'e
+arrose'es
+arrose's
+arrose`r
+arrose`rent
+arrosent
+arroser
+arrosera
+arroserai
+arroseraient
+arroserais
+arroserait
+arroseras
+arrosere
+arroserez
+arroseri
+arroseriez
+arroserions
+arrosero
+arroserons
+arroseront
+arroses
+arroseur
+arroseurs
+arroseus
+arroseuse
+arroseuses
+arrosez
+arrosiez
+arrosion
+arrosions
+arrosive
+arrosoir
+arrosoirs
+arrosons
+arrosti
+arrosto
+arrostrada
+arrostrado
+arrostrar
+arrota
+arrotada
+arrotado
+arrotai
+arrotamm
+arrotammo
+arrotand
+arrotando
+arrotano
+arrotare
+arrotaro
+arrotarono
+arrotass
+arrotasse
+arrotassi
+arrotast
+arrotaste
+arrotasti
+arrotata
+arrotate
+arrotati
+arrotato
+arrotava
+arrotavamo
+arrotavano
+arrotavate
+arrotavi
+arrotavo
+arrotera
+arroterai
+arrotere
+arroterei
+arroteremo
+arroterete
+arrotero
+arroti
+arrotiam
+arrotiamo
+arrotiat
+arrotiate
+arrotino
+arroto
+arrotola
+arrotolai
+arrotolano
+arrotolare
+arrotolata
+arrotolate
+arrotolati
+arrotolato
+arrotolava
+arrotolavi
+arrotolavo
+arrotole
+arrotolera
+arrotolero
+arrotoli
+arrotolino
+arrotolo
+arrotura
+arrow
+arrowbus
+arrowbush
+arrowed
+arrowhea
+arrowhead
+arrowheaded
+arrowheads
+arrowing
+arrowlea
+arrowleaf
+arrowles
+arrowless
+arrowlet
+arrowlik
+arrowlike
+arrowpla
+arrowplate
+arrowroc
+arrowrock
+arrowroo
+arrowroot
+arrowroots
+arrows
+arrowsmi
+arrowsmith
+arrowsto
+arrowstone
+arrowwee
+arrowweed
+arrowwoo
+arrowwood
+arrowwor
+arrowworm
+arrowy
+arroyada
+arroyadero
+arroyar
+arroyarse
+arroyato
+arroyo
+arroyogr
+arroyogrande
+arroyoho
+arroyohondo
+arroyos
+arroyose
+arroyoseco
+arroyuela
+arroyuelo
+arroz
+arrozal
+arrr
+arrrgg
+arruague
+arruar
+arrufada
+arrufadi`a
+arrufado
+arrufadura
+arrufaldada
+arrufaldado
+arrufaldarse
+arrufar
+arrufianada
+arrufianado
+arrufo
+arruga
+arrugacio`n
+arrugamiento
+arrugar
+arrugia
+arruinador
+arruinadora
+arruinamiento
+arruinar
+arrullador
+arrulladora
+arrullar
+arrullo
+arrum
+arruma
+arrumaco
+arrumaje
+arrumar
+arrumazo`n
+arrumbacio`n
+arrumbada
+arrumbador
+arrumbadora
+arrumbamiento
+arrumbar
+arrumueco
+arrunflar
+arrurruz
+arry
+arryish
+ars
+arsa`fraga
+arsacid
+arsacida
+arsacidan
+arsalane
+arsania
+arsanili
+arsanilic
+arsarbet
+arsarbetskraft
+arsarbetskrafter
+arsarbetstider
+arsavgif
+arsavgift
+arsavir
+arsbehov
+arsberat
+arsberattelser
+arsca
+arscb
+arscc
+arscd
+arsce
+arsch
+arschgei
+arschgeige
+arschloc
+arschloch
+arschloe
+arschloecher
+arscsc
+arse
+arse`nico
+arsedine
+arseen
+arseenve
+arseenverbinding
+arseenverbindingen
+arsen
+arsena
+arsenaal
+arsenal
+arsenale
+arsenalen
+arsenalet
+arsenals
+arsenate
+arsenates
+arsenati
+arsenation
+arsenaul
+arsenault
+arsenaux
+arsene
+arseneau
+arsenet
+arsenete
+arseneted
+arsenett
+arsenetted
+arsenfas
+arsenfast
+arsenfer
+arsenferratose
+arsenhem
+arsenhemol
+arsenias
+arseniasis
+arseniat
+arseniate
+arseniato
+arsenic
+arsenica
+arsenical
+arsenicalism
+arsenicate
+arsenici
+arsenicism
+arsenicize
+arsenico
+arsenicophagy
+arsenics
+arsenicu
+arsenicum
+arsenicumvergiftiging
+arsenide
+arsenides
+arseniek
+arsenife
+arseniferous
+arsenije
+arsenikk
+arsenikken
+arsenill
+arsenillo
+arseniop
+arseniopleite
+arsenios
+arseniosiderite
+arsenioso
+arseniou
+arsenious
+arsenism
+arsenite
+arsenites
+arsenito
+arsenium
+arseniur
+arseniuret
+arseniureted
+arseniuro
+arseniza
+arsenization
+arseno
+arsenobe
+arsenobenzene
+arsenobenzol
+arsenobi
+arsenobismite
+arsenofe
+arsenoferratin
+arsenofu
+arsenofuran
+arsenohe
+arsenohemol
+arsenoli
+arsenolite
+arsenoph
+arsenophagy
+arsenophen
+arsenophenol
+arsenophenylglycin
+arsenopy
+arsenopyrite
+arsenost
+arsenostyracol
+arsenoth
+arsenotherapy
+arsenotu
+arsenotungstates
+arsenotungstic
+arsenous
+arsenoxi
+arsenoxide
+arsenyl
+arses
+arsesmar
+arsesmart
+arsh
+arshad
+arsheen
+arshin
+arshine
+arshyra
+arsi
+arsine
+arsinic
+arsinkom
+arsinkomst
+arsino
+arsinoe
+arsinoit
+arsinoitherium
+arsis
+arskorni
+arskorning
+arskorningen
+arskostn
+arskostnad
+arskurs
+arslan
+arsle
+arsmetri
+arsmetrik
+arsmetrike
+arsmodel
+arsmodell
+arsmote
+arsnicke
+arsnicker
+arso
+arsoite
+arsolla
+arson
+arsonate
+arsonati
+arsonation
+arsonic
+arsonist
+arsonists
+arsonite
+arsonium
+arsono
+arsonous
+arsons
+arsonval
+arsonvalization
+arsperio
+arsperioden
+arspersp
+arsperspektiv
+arsphena
+arsphenamine
+arsredov
+arsredovisning
+arsskift
+arsskifte
+arsskiftet
+arsslut
+arsstati
+arsstatistiken
+arstid
+arstider
+arsyl
+arsylene
+art
+arta
+artaba
+artabe
+artace
+artado
+artag
+artagnan
+artair
+artal
+artalejo
+artalete
+artalo
+artamida
+artamidae
+artamus
+artanica
+artanita
+artar
+artarine
+artas
+artasen
+artaud
+artaxerx
+artaxerxes
+artb
+artc
+artcole
+artcraft
+artd
+arte
+arte'rie
+arte'riel
+arte'rielle
+arte'rielles
+arte'riels
+arte'rio
+arte'rioscle'rose
+arte'rit
+arte'rite
+arte`re
+arte`res
+arte`tica
+arte`tico
+arteagen
+arteagenem
+artefact
+artefacto
+artefakt
+artefakte
+artefakten
+artefakter
+artega
+arteigen
+arteigene
+arteigener
+arteigenes
+artejo
+artek
+artel
+artelleri`a
+artemas
+artemia
+artemido
+artemidorus
+artemis
+artemisa
+artemise
+artemisi
+artemisia
+artemisic
+artemisin
+artemision
+artemisium
+artemus
+arten
+artene
+artens
+artentod
+artenver
+artenverarmung
+artenwan
+artenwandel
+arter
+artera
+arteramente
+arterhal
+arterhaltung
+arteri`a
+arteria
+arteriag
+arteriagra
+arterial
+arterialization
+arterialize
+arterially
+arterials
+arteriar
+arteriarctia
+arterias
+arteriasis
+arterie
+arteriec
+arteriectasia
+arteriectasis
+arteriectopia
+arterien
+arterienverkalkungen
+arteries
+arterin
+arterioa
+arterioarctia
+arterioc
+arteriocapillary
+arteriococcygeal
+arteriod
+arteriodialysis
+arteriodiastasis
+arteriof
+arteriofibrosis
+arteriog
+arteriogenesis
+arteriografi`a
+arteriogram
+arteriograph
+arteriography
+arteriol
+arteriola
+arteriolar
+arteriole
+arterioles
+arteriolith
+arteriologi`a
+arteriology
+arteriolosclerosis
+arteriom
+arteriomalacia
+arteriometer
+arteriomotor
+arterion
+arterionecrosis
+arteriop
+arteriopalmus
+arteriopathy
+arteriophlebotomy
+arterioplania
+arterioplasty
+arteriopressor
+arterior
+arteriorenal
+arteriorrhagia
+arteriorrhaphy
+arteriorrhexis
+arterios
+arteriosa
+arterioscleroses
+arteriosclerosis
+arteriosclerotic
+arteriosklerose
+arterioso
+arteriospasm
+arteriostenosis
+arteriostosis
+arteriostrepsis
+arteriosympathectomy
+arteriot
+arteriotome
+arteriotomy
+arteriotrepsis
+arteriou
+arterious
+arteriov
+arteriovenous
+arterioversion
+arterioverter
+arteriti
+arteritis
+arterne
+artero
+artery
+artes
+artesa
+artesana
+artesani`a
+artesano
+artesi
+artesia
+artesian
+artesiana
+artesiano
+artesilla
+artesisc
+artesisch
+artesische
+artesisk
+arteso`n
+artesonada
+artesonado
+artesuela
+artet
+artete
+artewg
+artf
+artfremd
+artfremde
+artfremdem
+artfremden
+artful
+artfully
+artfulne
+artfulness
+artgarfu
+artgenos
+artgenosse
+artgum
+artha
+arthare
+artharek
+artharekhesang
+arthel
+arthemis
+arther
+arthogra
+arthogram
+arthragr
+arthragra
+arthral
+arthralg
+arthralgia
+arthralgic
+arthrect
+arthrectomy
+arthrede
+arthredema
+arthremp
+arthrempyesis
+arthrest
+arthresthesia
+arthrite
+arthriti
+arthritic
+arthritical
+arthritically
+arthriticine
+arthritics
+arthritique
+arthritiques
+arthritis
+arthritism
+arthritisme
+arthroba
+arthrobacterium
+arthrobr
+arthrobranch
+arthrobranchia
+arthroca
+arthrocace
+arthrocarcinoma
+arthroce
+arthrocele
+arthroch
+arthrochondritis
+arthrocl
+arthroclasia
+arthrocleisis
+arthroclisis
+arthrode
+arthroderm
+arthrodesis
+arthrodi
+arthrodia
+arthrodial
+arthrodic
+arthrodira
+arthrodiran
+arthrodire
+arthrodirous
+arthrodo
+arthrodonteae
+arthrody
+arthrodynia
+arthrodynic
+arthroem
+arthroempyema
+arthroempyesis
+arthroen
+arthroendoscopy
+arthroga
+arthrogastra
+arthrogastran
+arthroge
+arthrogenous
+arthrogr
+arthrography
+arthrogryposis
+arthroli
+arthrolite
+arthrolith
+arthrolithiasis
+arthrolo
+arthrology
+arthrome
+arthromeningitis
+arthromere
+arthromeric
+arthrometer
+arthrometry
+arthronc
+arthroncus
+arthrone
+arthroneuralgia
+arthropa
+arthropathic
+arthropathology
+arthropathy
+arthroph
+arthrophlogosis
+arthrophyma
+arthropl
+arthroplastic
+arthroplasty
+arthropleura
+arthropleure
+arthropo
+arthropod
+arthropoda
+arthropodal
+arthropodan
+arthropodous
+arthropods
+arthropomata
+arthropomatous
+arthropt
+arthropterous
+arthropy
+arthropyosis
+arthrorh
+arthrorheumatism
+arthrorr
+arthrorrhagia
+arthrosc
+arthrosclerosis
+arthrose
+arthrosi
+arthrosia
+arthrosis
+arthrosp
+arthrospore
+arthrosporic
+arthrosporous
+arthrost
+arthrosteitis
+arthrosterigma
+arthrostome
+arthrostomy
+arthrostraca
+arthrosy
+arthrosynovitis
+arthrosyrinx
+arthroto
+arthrotome
+arthrotomy
+arthrotr
+arthrotrauma
+arthrotropic
+arthroty
+arthrotyphoid
+arthrous
+arthroxe
+arthroxerosis
+arthrozo
+arthrozoa
+arthrozoan
+arthrozoic
+arthur
+arthurci
+arthurcity
+arthurda
+arthurdale
+arthurde
+arthurdent
+arthuria
+arthurian
+arthuriana
+arthurs
+arthurtr
+arthurtrent
+arthus
+arti
+arti`culo
+arti`fica
+arti`fice
+arti`fico
+arti`stica
+arti`sticamente
+arti`stico
+artiad
+artianer
+artianere
+artianeren
+artianerne
+artiboni
+artibonite
+artica
+artichau
+artichaut
+artichauts
+artichok
+artichoke
+artichokes
+artick
+article
+articled
+articles
+articlin
+articling
+articoli
+articolo
+artics
+articula
+articulability
+articulable
+articulacio`n
+articulacy
+articulada
+articuladamente
+articulado
+articulador
+articuladora
+articulaient
+articulaire
+articulaires
+articulais
+articulait
+articulant
+articular
+articulare
+articularia
+articulario
+articularly
+articulary
+articulat
+articulata
+articulate
+articulated
+articulately
+articulateness
+articulates
+articulatie
+articulatiebasis
+articulaties
+articulating
+articulation
+articulationes
+articulationist
+articulations
+articulative
+articulatoire
+articulatoires
+articulator
+articulatoria
+articulatorio
+articulators
+articulatory
+articule
+articule'
+articule'e
+articule'es
+articule's
+articule`rent
+articuleer
+articuleerde
+articuleerden
+articuleert
+articulent
+articuler
+articulera
+articulerai
+articuleraient
+articulerais
+articulerait
+articuleras
+articuleren
+articulerez
+articuleriez
+articulerions
+articulerons
+articuleront
+articules
+articulez
+articuli
+articuliez
+articulions
+articulista
+articulite
+articulo
+articulons
+articulu
+articulus
+artie
+artier
+artiest
+artieste
+artiesten
+artiestenhaar
+artiestenhoed
+artiestenhoeden
+artiesterig
+artiesterige
+artiesteriger
+artiesterigst
+artiestes
+artifact
+artifactitious
+artifacts
+artifactually
+artifara
+artife
+artifero
+artifice
+artificer
+artificers
+artificership
+artifices
+artifici
+artificiada
+artificiado
+artificial
+artificiale
+artificialism
+artificialities
+artificiality
+artificialize
+artificially
+artificialmente
+artificialness
+artificiar
+artificieel
+artificieelst
+artificiel
+artificiele
+artificieler
+artificiell
+artificielle
+artificielles
+artificiels
+artificier
+artificiero
+artificiers
+artificieuse
+artificieuses
+artificieux
+artificio
+artificiosa
+artificiosamente
+artificioso
+artifisi
+artifisiell
+artig
+artiga
+artigar
+artigas
+artige
+artigen
+artighet
+artigian
+artigiana
+artigiane
+artigiani
+artigiano
+artigkei
+artigkeit
+artigli
+artiglio
+artikel
+artikele
+artikelen
+artikeln
+artikelnummer
+artikelnummers
+artikelr
+artikelreihe
+artikels
+artikelsamlinger
+artikelsgewijs
+artikelsgewijze
+artikelstamm
+artikelv
+artikelvis
+artikkel
+artikkelen
+artikkelforfatteren
+artikkelforfatterens
+artikkelform
+artikkelkonkurranse
+artikkelsamling
+artikkelskribenten
+artikkelskriving
+artiklar
+artiklarna
+artiklen
+artiklene
+artiklens
+artikler
+artiklerne
+artiklernes
+artikula
+artikulasjon
+artikulasjonen
+artikulation
+artikule
+artikulera
+artikulere
+artikulerer
+artikulering
+artikuleringens
+artikulert
+artikulerte
+artillada
+artillado
+artillar
+artiller
+artilleri
+artilleri`a
+artilleriduell
+artillerie
+artillerieangriff
+artilleriebeschuss
+artilleriedepot
+artilleriedepots
+artillerieeinheiten
+artilleriefeuer
+artilleriegevecht
+artilleriegevechten
+artillerieofficier
+artillerieofficieren
+artilleriepark
+artillerieparken
+artilleries
+artilleriet
+artillerietrein
+artillerietreinen
+artilleriets
+artillerievuur
+artillerist
+artilleristen
+artillerister
+artilleristilling
+artilleristisch
+artilleristische
+artillerists
+artillero
+artillery
+artilleryman
+artillerymen
+artilleryship
+artilleu
+artilleur
+artilleurs
+artilugio
+artily
+artima\a
+artimo`n
+artina
+artinell
+artinelli
+artiness
+artinite
+artinski
+artinskian
+artioda`ctilo
+artiodac
+artiodactyl
+artiodactyla
+artiodactylous
+artionde
+artiondet
+artiphyl
+artiphyllous
+artisan
+artisana
+artisanal
+artisanale
+artisanales
+artisanat
+artisanats
+artisanaux
+artisans
+artisanship
+artischo
+artischocken
+artisjok
+artisjokk
+artisjokken
+artisjokkhjerte
+artiskok
+artiskokk
+artiskokken
+artiskokkhjerte
+artisoft
+artist
+artista
+artistdo
+artistdom
+artiste
+artisten
+artistens
+artister
+artisteri
+artistes
+artisti
+artistic
+artistical
+artistically
+artisticiteit
+artistie
+artistiek
+artistieke
+artistieker
+artistiekst
+artistin
+artistinnen
+artistiq
+artistique
+artistiquement
+artistiques
+artistis
+artistische
+artistischen
+artistisk
+artistiske
+artistna
+artistnavn
+artistri
+artistries
+artistry
+artists
+artitect
+artithme
+artithmetik
+artium
+artiumen
+artiumsk
+artiumskarakteren
+artiumskull
+artiumso
+artiumsoppgave
+artiumsp
+artiumspoeng
+artiumss
+artiumssensuren
+artive
+artizada
+artizado
+artizar
+artless
+artlessl
+artlessly
+artlessn
+artlessness
+artlet
+artlike
+arto
+artoca`rpea
+artoca`rpeo
+artocarp
+artocarpa`cea
+artocarpa`ceo
+artocarpaceae
+artocarpad
+artocarpeous
+artocarpous
+artocarpus
+artoff
+artois
+artola
+artolas
+artolate
+artolater
+arton
+artoo
+artophag
+artophagous
+artophor
+artophorion
+artos
+artotype
+artotypy
+artotyri
+artotyrite
+artr/podo
+artri`tica
+artri`tico
+artriti`s
+artritismo
+artrografi`a
+artrologi`a
+artropati`a
+arts
+arts02
+artsbete
+artsbetegnelse
+artsen
+artsenij
+artsenijbereidkunde
+artsenijen
+artsexam
+artsexamen
+artsexamens
+artsfell
+artsfeller
+artspssa
+arttu
+artturi
+artu
+artu\a
+artur
+arturo
+artus
+artusend
+artusende
+artuso
+artuya
+artverwa
+artverwandte
+artvin
+artware
+artwick
+artwin
+artwork
+artworks
+arty
+artzer
+aru
+aru\ar
+aru\azo
+aru\o
+aru`spice
+arua
+aruac
+aruachi
+aruaco
+aruamu
+aruan
+aruba
+arubaito
+arubamu
+aruban
+arubas
+arubeki
+arubino
+aruboth
+arubumin
+arudehid
+arudosut
+aruek
+arufa
+arufabet
+arufajio
+arufe
+arufi
+arufi-
+arufua
+arufuabe
+arufuase
+aruga
+arugas
+arugon
+arugoriz
+aruhi
+aruhito
+arui
+aruiha
+arujeria
+aruji
+aruk
+arukari
+arukaris
+arukaro
+arukaro-
+arukaroi
+aruke
+aruki
+arukihaj
+arukikat
+arukimaw
+arukimed
+arukiru
+arukiruk
+arukitsu
+arukitud
+arukituk
+arukitum
+aruko-ru
+arukoru
+arukyuro
+arul
+arulo
+arum
+aruma
+arumaata
+arumah
+arumaito
+arumania
+arumanian
+arumazik
+arumazir
+arumches
+arumchessu
+arumen
+arumenia
+arumi
+arumin
+aruminiu
+arums
+arumugam
+arun
+aruna
+arunacha
+arunachal
+arunachalam
+arunava
+aruncus
+arundel
+arundense
+arundi`nea
+arundi`neo
+arundife
+arundiferous
+arundina
+arundinaceous
+arundinaria
+arundine
+arundineous
+arundo
+arundum
+arunee
+arung
+arungu
+arunta
+aruop
+arupa
+arupai
+arupen
+arupinis
+arupusu
+aruro
+arus
+arusa
+arusha
+arushuno
+arusi
+aruspex
+aruspice
+aruspicina
+arussi
+arustle
+arutani
+arutanis
+arutanisape
+aruterun
+aruth
+aruto
+arutoki
+arux01
+aruzasu
+aruzench
+aruzenti
+aruzi
+aruzie
+aruzieri
+aruzza
+arv
+arva
+arvad
+arvada
+arvadite
+arval
+arvan
+arvanite
+arvanites
+arvaniti
+arvanitic
+arvanitika
+arve
+arveberettigede
+arvedui
+arveegen
+arveegenskaper
+arvefien
+arvefienden
+arvef|lg
+arvef|lgen
+arveja
+arvejal
+arvejana
+arvejar
+arvejera
+arvejo
+arvejo`n
+arvejona
+arvejote
+arveklasse
+arveklasser
+arvel
+arvelate
+arvelater
+arvelateren
+arvelaus
+arvelig
+arvelige
+arveligh
+arvelighet
+arvelighetsforskere
+arveligt
+arvelov
+arveloven
+arvemonark
+arvem|ns
+arvem|nsteret
+arven
+arvense
+arveprin
+arveprins
+arver
+arveredo
+arveret
+arveretslige
+arveretten
+arverni
+arves
+arvesak
+arvesen
+arvet
+arvi
+arvicola
+arvicole
+arvicoli
+arvicolinae
+arvicoline
+arvicolo
+arvicolous
+arvicult
+arviculture
+arvid
+arvide
+arvidsja
+arvidsjaur
+arvidsso
+arvidsson
+arvie
+arvilla
+arvin
+arvind
+arving
+arvingen
+arvinger
+arvingerne
+arviragu
+arviragus
+arvo
+arvonia
+arvor
+arvsmass
+arvsmassan
+arvtaker
+arvtakere
+arvtakeren
+arvtakerne
+arvy
+arw
+arwakhi
+arwen
+arx
+ary
+arya
+aryan
+aryanah
+aryanism
+aryaniza
+aryanization
+aryanize
+aryans
+aryavong
+aryballo
+aryballoid
+aryballu
+aryballus
+arye
+aryepigl
+aryepiglottic
+aryl
+arylamin
+arylamine
+arylamino
+arylate
+aryls
+aryn
+aryon
+arytenoi
+arytenoid
+arytenoidal
+arythmia
+arythmic
+aryusyan
+aryuu
+aryuusan
+arz
+arza
+arzallus
+arzan
+arzava
+arzawa
+arzeno
+arzeu
+arzew
+arzilla
+arzille
+arzilli
+arzillo
+arznei
+arzneien
+arzneiko
+arzneikosten
+arzneimi
+arzneimittelgesetz
+arzneimittelhersteller
+arzneimittelindustrie
+arzneimitteln
+arzneimittelpreise
+arzneimittelpreiuefung
+arzneisc
+arzneischraenke
+arzneischraenken
+arzneischrank
+arzneiwa
+arzneiwaren
+arzo`n
+arzobispado
+arzobispal
+arzobispazgo
+arzobispo
+arzogiou
+arzoglou
+arzolla
+arzrunit
+arzrunite
+arzt
+arztberu
+arztberuf
+arztehep
+arztehepaar
+arztes
+arztfrau
+arztgesc
+arztgeschichten
+arzthelf
+arzthelferin
+arzthelferinnen
+arzthono
+arzthonorare
+arztprax
+arztpraxen
+arztpraxis
+arztroma
+arztroman
+arztsohn
+arzttoch
+arzttochter
+arztzimm
+arztzimmer
+arzu
+arzun
+as
+as1
+as104
+as105
+as106
+as107
+as108
+as109
+as11
+as110
+as111
+as112
+as113
+as114
+as115
+as116
+as117
+as118
+as119
+as120
+as121
+as122
+as123
+as124
+as125
+as126
+as127
+as128
+as129
+as130
+as131
+as132
+as133
+as134
+as135
+as136
+as137
+as138
+as139
+as140
+as141
+as142
+as143
+as144
+as145
+as146
+as147
+as148
+as149
+as150
+as151
+as152
+as153
+as154
+as155
+as156
+as157
+as158
+as159
+as160
+as161
+as162
+as163
+as164
+as165
+as166
+as167
+as168
+as169
+as170
+as171
+as172
+as173
+as174
+as175
+as176
+as177
+as178
+as179
+as18
+as181
+as182
+as183
+as184
+as185
+as19
+as23
+as25
+as27
+as28
+as29
+as30
+as31
+as32
+as33
+as34
+as35
+as36
+as37
+as38
+as39
+as4
+as40
+as41
+as42
+as43
+as44
+as45
+as46
+as47
+as48
+as50
+as51
+as52
+as53
+as54
+as55
+as57
+as58
+as59
+as60
+as61
+as62
+as63
+as64
+as65
+as66
+as67
+as68
+as69
+as70
+as71
+as72
+as73
+as74
+as75
+as76
+as77
+as78
+as79
+as80
+as81
+as82
+as83
+as84
+as85
+as86
+as87
+as88
+as89
+as90
+as91
+as92
+as93
+as94
+as95
+as96
+as97
+as98
+as99
+asa
+asa1
+asa\ar
+asa`
+asa`raca
+asaah
+asaba
+asaban
+asaborada
+asaborado
+asaborak
+asaborar
+asaborgar
+asaborir
+asabu
+asacador
+asacadora
+asacamiento
+asacar
+asacio`n
+asacristanada
+asacristanado
+asad
+asada
+asadaame
+asadabad
+asadachi
+asadaha
+asadahan
+asadajun
+asadamiy
+asadati
+asaddle
+asade
+asadera
+asadero
+asadi
+asadie
+asadifun
+asado
+asador
+asaduke
+asadura
+asaduri`a
+asaeda
+asaeteador
+asaeteadora
+asaetear
+asaetinada
+asaetinado
+asafe`tida
+asafetid
+asafetida
+asafoeti
+asafoetida
+asafuku
+asaga
+asagaer
+asagaeri
+asagai
+asagake
+asagami
+asagamiy
+asagao
+asagasum
+asagata
+asagawa
+asagaya
+asagayak
+asagayam
+asagi
+asagiri
+asagirik
+asagishi
+asagisi
+asago
+asaguro
+asahaka
+asahan
+asahara
+asaharae
+asahaya
+asahayai
+asahayak
+asahel
+asahi
+asahiah
+asahidak
+asahifuj
+asahigao
+asahigaw
+asahiham
+asahikas
+asahikaw
+asahikei
+asahiku
+asahina
+asahinaj
+asahinam
+asahinay
+asahisei
+asahishi
+asahisi
+asahisin
+asahiya
+asahiyam
+asahizat
+asahouso
+asahyue
+asai
+asaiah
+asaichi
+asaichib
+asaierik
+asaimuts
+asaimutu
+asainats
+asainatu
+asainetada
+asainetado
+asainetear
+asair
+asairie
+asaiti
+asaitiba
+asaito
+asaiyuuk
+asaji
+asajiyou
+asak
+asaka
+asakaami
+asakage
+asakamay
+asakamih
+asakanag
+asakashi
+asakasi
+asakawa
+asakawah
+asakayam
+asakayui
+asakayum
+asakaze
+asake
+asaki
+asakikun
+asakita
+asakitak
+asako
+asakuchi
+asakura
+asakuraa
+asakurak
+asakuram
+asakurar
+asakuray
+asakusa
+asakusab
+asakusae
+asakusas
+asakuti
+asal
+asalariada
+asalariado
+asalariar
+asale
+asalea
+asaleaen
+asalen
+asalir
+asalmerar
+asalmonada
+asalmonado
+asaltador
+asaltadora
+asaltante
+asaltar
+asalto
+asama
+asamajin
+asamanao
+asamashi
+asamasi
+asamayam
+asambe
+asamblea
+asamblei`sta
+asameshi
+asamesi
+asamesim
+asami
+asamidor
+asamiento
+asaminam
+asamirei
+asamirie
+asamirik
+asamiya
+asamiyac
+asamiyas
+asamiyat
+asamiyui
+asamoto
+asamotoc
+asamotot
+asamoya
+asamura
+asamushi
+asamusi
+asamusio
+asan
+asana
+asanachi
+asanachinda
+asanagi
+asanai
+asanami
+asanayuu
+asande
+asander
+asane
+asanebou
+asanga
+asankach
+asankati
+asano
+asanoaik
+asanoats
+asanoatu
+asanobu
+asanoeri
+asanokao
+asanoma
+asanomar
+asanomay
+asanomiy
+asanonat
+asanoshi
+asanosho
+asanosio
+asanova
+asanoyuk
+asanoyuu
+asante
+asanti
+asantitw
+asantitwi
+asanuma
+asanumay
+asao
+asaok
+asaoka
+asaokame
+asaokami
+asaoki
+asaoku
+asaorta
+asap
+asapa
+asaph
+asaphia
+asaphic
+asaphid
+asaphida
+asaphidae
+asaphus
+asappara
+asaprol
+asar
+asaraba`cara
+asarabac
+asarabacca
+asaracea
+asaraceae
+asardinada
+asardinado
+asareel
+asarelah
+asarero
+asargada
+asargado
+asarh
+asari
+asarina
+asarite
+asaro
+asaron
+asarone
+asarotum
+asarum
+asas
+asase
+asasen
+asashina
+asashiob
+asashiro
+asasina
+asasiob
+asasioba
+asasiro
+asasug
+asat
+asativa
+asativo
+asatms
+asatms-f
+asatms-ftknox
+asato
+asatonak
+asatoshi
+asatsuyu
+asatta
+asatte
+asatts
+asatuyu
+asawa
+asayake
+asayama
+asayamam
+asayar
+asayu
+asayuu
+asaz
+asazi
+asb
+asbak
+asbakin
+asbakje
+asbakjes
+asbakken
+asbelt
+asbelten
+asbest
+asbestdu
+asbestduk
+asbesten
+asbestfa
+asbestfasern
+asbestge
+asbestgewinnung
+asbestic
+asbestif
+asbestiform
+asbestin
+asbestina
+asbestine
+asbestinize
+asbestino
+asbesto
+asbestoi
+asbestoid
+asbestoidal
+asbestos
+asbestose
+asbestosen
+asbestosis
+asbestou
+asbestous
+asbestpa
+asbestpapier
+asbestpl
+asbestplaat
+asbestplaten
+asbestus
+asbestve
+asbestverarbeitung
+asbill
+asbjorn
+asbj|rg
+asbj|rn
+asblond
+asblonde
+asblonder
+asblonds
+asblondst
+asbolin
+asbolite
+asbury
+asburypa
+asburypark
+asc
+asca
+asca`ride
+ascabart
+ascalabo
+ascalabota
+ascalon
+ascalonia
+ascalonita
+ascan
+ascanian
+ascanius
+ascanse
+ascare
+ascarias
+ascariasis
+ascarici
+ascaricidal
+ascaricide
+ascarid
+ascarida
+ascaridae
+ascaride
+ascarides
+ascaridi
+ascaridia
+ascaridiasis
+ascarido
+ascaridole
+ascaris
+ascaron
+asce
+asce'tiq
+asce'tique
+asce'tiques
+asce'tis
+asce'tisme
+asce`se
+asce`ses
+asce`te
+asce`tes
+asce`tica
+asce`tico
+ascebc
+asceet
+ascella
+ascelle
+ascellus
+ascencio
+ascend
+ascendab
+ascendable
+ascendan
+ascendance
+ascendances
+ascendancy
+ascendant
+ascendante
+ascendantes
+ascendants
+ascended
+ascenden
+ascendence
+ascendencia
+ascendency
+ascendent
+ascendente
+ascendenten
+ascender
+ascenders
+ascendet
+ascendeth
+ascendib
+ascendible
+ascendiente
+ascendin
+ascending
+ascendingly
+ascends
+ascenseu
+ascenseur
+ascenseurs
+ascensio
+ascensio`n
+ascension
+ascensional
+ascensionist
+ascensionista
+ascensionnel
+ascensionnelle
+ascensionnelles
+ascensionnels
+ascensions
+ascensiontide
+ascensiv
+ascensive
+ascenso
+ascensor
+ascensore
+ascensori
+ascensorista
+ascent
+ascentio
+ascention
+ascents
+ascertai
+ascertain
+ascertainable
+ascertainableness
+ascertainably
+ascertained
+ascertainer
+ascertaining
+ascertainment
+ascertains
+ascescen
+ascescency
+ascescent
+ascese
+ascessi
+ascesso
+asceta
+asceten
+asceterio
+ascetic
+ascetica
+ascetical
+ascetically
+ascetici
+asceticism
+ascetics
+ascetisc
+ascetisch
+ascetische
+ascetischer
+ascetischt
+ascetism
+ascetisme
+ascetismo
+ascetta
+aschaffe
+aschaffenb
+aschaffenb-emh1
+aschaffi
+aschaffite
+ascham
+asche
+aschehou
+aschehoug
+aschehougs
+aschenba
+aschenbahn
+aschenbe
+aschenbecher
+aschenbechers
+aschenberg
+aschenbr
+aschenbroedel
+aschenst
+aschenstummel
+aschera
+aschermi
+aschermittwoche
+aschermittwochs
+aschfahl
+aschfahles
+aschisti
+aschistic
+asci
+asci`tica
+asci`tico
+ascia
+ascian
+ascidia
+ascidiac
+ascidiacea
+ascidiae
+ascidian
+ascidiat
+ascidiate
+ascidico
+ascidicolous
+ascidife
+ascidiferous
+ascidifo
+ascidiform
+ascidiia
+ascidioi
+ascidioid
+ascidioida
+ascidioidea
+ascidioz
+ascidiozoa
+ascidiozooid
+ascidium
+ascifero
+asciferous
+ascigero
+ascigerous
+ascii
+asciigra
+asciigraphics
+asciimon
+asciimonospace
+asciionl
+asciionly
+asciista
+asciistandard
+asciiz
+ascio
+ascioglu
+asciterio
+ascites
+ascitic
+ascitica
+ascitical
+ascitis
+ascititi
+ascititious
+asciuga
+asciugai
+asciugam
+asciugammo
+asciugan
+asciugando
+asciugano
+asciugar
+asciugare
+asciugas
+asciugasse
+asciugassi
+asciugaste
+asciugasti
+asciugat
+asciugata
+asciugate
+asciugati
+asciugato
+asciugav
+asciugava
+asciugavi
+asciugavo
+asciughe
+asciughera
+asciughero
+asciughi
+asciughino
+asciugo
+asciutta
+asciutte
+asciutti
+asciutto
+asciz
+asclent
+asclepia
+asclepiad
+asclepiada`cea
+asclepiada`ceo
+asclepiadaceae
+asclepiadaceous
+asclepiadae
+asclepiadea
+asclepiadean
+asclepiadeo
+asclepiadeous
+asclepiadic
+asclepian
+asclepias
+asclepid
+asclepidin
+asclepidoid
+asclepie
+asclepieion
+asclepin
+asclepiu
+asclepius
+asco
+ascocarp
+ascocarpous
+ascochyt
+ascochyta
+ascogeno
+ascogenous
+ascogone
+ascogoni
+ascogonial
+ascogonidium
+ascogonium
+ascolich
+ascolichen
+ascolichenes
+ascolta
+ascoltai
+ascoltam
+ascoltammo
+ascoltan
+ascoltando
+ascoltano
+ascoltar
+ascoltare
+ascoltas
+ascoltasse
+ascoltassi
+ascoltaste
+ascoltasti
+ascoltat
+ascoltata
+ascoltate
+ascoltati
+ascoltato
+ascoltav
+ascoltava
+ascoltavi
+ascoltavo
+ascolter
+ascoltera
+ascolterai
+ascolterei
+ascoltero
+ascolti
+ascoltia
+ascoltiamo
+ascoltiate
+ascoltin
+ascoltino
+ascolto
+ascoma
+ascomyce
+ascomycetal
+ascomycete
+ascomycetes
+ascomycetous
+ascon
+ascona
+asconder
+ascondidamente
+ascondido
+ascondimiento
+ascondredijo
+ascondrijo
+ascones
+ascophor
+ascophore
+ascophorous
+ascophyl
+ascophyllum
+ascorbat
+ascorbate
+ascorbic
+ascorbinsyre
+ascorosa
+ascoroso
+ascosa
+ascosidad
+ascoso
+ascospor
+ascospore
+ascosporic
+ascosporous
+ascot
+ascothor
+ascothoracica
+ascots
+ascott
+ascoyne
+ascrea
+ascreo
+ascribab
+ascribable
+ascribe
+ascribed
+ascribes
+ascribin
+ascribing
+ascript
+ascripti
+ascription
+ascriptions
+ascriptitii
+ascriptitious
+ascriptitius
+ascry
+ascua
+ascula
+ascupart
+ascus
+ascuso
+ascutney
+ascyphou
+ascyphous
+ascyrum
+asd
+asdag
+asdel
+asdf
+asdfg
+asdfgh
+asdfghj
+asdic
+asdicen
+asdirex
+asdlkj
+ase
+ase\orada
+ase\orado
+ase`pala
+ase`ptica
+ase`ptico
+asea
+aseada
+aseadamente
+aseado
+asean
+asear
+asearch
+aseb
+aseba
+asebi
+asechador
+asechadora
+asechamiento
+asechanza
+asechar
+asechire
+asecho
+asechosa
+asechoso
+asecreto
+asecretory
+asecucio`n
+ased
+asedaku
+asedar
+asediador
+asediadora
+asediar
+asedio
+aseethe
+aseglararse
+aseglarizar
+aseguir
+asegundar
+aseguracio`n
+asegurada
+aseguradamente
+asegurado
+asegurador
+aseguradora
+aseguramiento
+aseguranza
+asegurar
+asei
+aseidad
+aseismat
+aseismatic
+aseismic
+aseismicity
+aseity
+asekaki
+asekkaki
+asekusa
+aseladero
+aselador
+aselarse
+aselgeia
+asellate
+aselli
+asellida
+asellidae
+aselline
+asellus
+asem
+asemasia
+asemblar
+asemejar
+asemia
+asemidor
+asemillar
+asemizu
+asemizuk
+asemmer
+asemmers
+asemo
+asen
+asenath
+asenbura
+asenburi
+asenburu
+asencio
+asendereada
+asendereado
+asenderear
+asenet
+asengladura
+asengsen
+asengseng
+asenigir
+asenjo
+asenov
+asensio
+asenso
+asentacio`n
+asentada
+asentadamente
+asentaderas
+asentadillas
+asentado
+asentador
+asentadura
+asentamiento
+asentar
+asentimiento
+asentir
+asentista
+aseo
+asepses
+asepsia
+asepsie
+asepsis
+aseptate
+aseptic
+aseptica
+aseptically
+aseptici
+asepticism
+asepticize
+aseptify
+aseptiqu
+aseptique
+aseptiques
+aseptisa
+aseptisant
+aseptisc
+aseptisch
+aseptische
+aseptise
+aseptise'
+aseptise'e
+aseptise'es
+aseptise's
+aseptiser
+aseptisk
+aseptol
+aseptoli
+aseptolin
+asequent
+asequential
+asequi
+asequible
+aser
+asera
+aserbadjan
+asercio`n
+aserenar
+aseri
+aseriarse
+asermonada
+asermonado
+aserrada
+aserradero
+aserradiza
+aserradizo
+aserrado
+aserrador
+aserradora
+aserradura
+aserrar
+aserri`n
+aserruchar
+asertiva
+asertivamente
+asertivo
+aserto
+asertor
+asertora
+asertorio
+asesar
+asesina
+asesinar
+asesinato
+asesino
+asesor
+asesora
+asesoramiento
+asesorar
+asesori`a
+asestadero
+asestadura
+asestar
+asesumen
+aset
+asetazor
+asete
+aseteto
+asetiren
+aseton
+aseven
+aseveracio`n
+aseveradamente
+aseverancia
+aseverar
+aseverativa
+aseverativo
+asexual
+asexuali
+asexuality
+asexualization
+asexualize
+asexuall
+asexually
+asexuals
+asexue'
+asexue'e
+asexue'es
+asexue's
+asf
+asfa`ltica
+asfa`ltico
+asfaloth
+asfalt
+asfaltada
+asfaltado
+asfaltar
+asfaltba
+asfaltbane
+asfaltbaner
+asfaltbe
+asfaltbestrating
+asfaltbestratingen
+asfaltee
+asfalteer
+asfalteerde
+asfalteerden
+asfalteert
+asfalten
+asfalter
+asfaltera
+asfalteren
+asfaltering
+asfalteringen
+asfalteringsarbeider
+asfalteringsmaskinene
+asfaltert
+asfalti
+asfalto
+asfaltpa
+asfaltpapier
+asfaltve
+asfaltveg
+asfaltvei
+asfaltverk
+asfaltwe
+asfaltweg
+asfaltwegen
+asfazado
+asfazadour
+asfetida
+asfi`ctica
+asfi`ctico
+asfi`xica
+asfi`xico
+asfissia
+asfissie
+asfixia
+asfixiante
+asfixiar
+asfo`delo
+asg
+asgard
+asgat
+asgaten
+asgaut
+asgeir
+asgeirss
+asgeirsson
+asger
+asghar
+asgharza
+asgharzadeh
+asgo
+asgrauw
+asgrauwe
+ash
+asha
+ashagann
+ashaganna
+ashagre
+ashake
+ashalata
+ashame
+ashamed
+ashamedl
+ashamedly
+ashamedn
+ashamedness
+ashamnu
+ashan
+ashangos
+ashaninc
+ashaninca
+ashante
+ashantee
+ashanti
+ashar
+asharasi
+ashaway
+ashbea
+ashbee
+ashbel
+ashbelit
+ashbelites
+ashberry
+ashbey
+ashbrook
+ashburn
+ashburnh
+ashburnham
+ashburto
+ashburton
+ashby
+ashcake
+ashcamp
+ashcan
+ashcans
+ashchena
+ashchenaz
+ashcolor
+ashcolored
+ashcroft
+ashdod
+ashdodit
+ashdodites
+ashdothi
+ashdothites
+ashdothp
+ashdothpisgah
+ashdown
+ashe
+asheboro
+ashed
+asheley
+ashely
+ashen
+ashenden
+asheninc
+asheninca
+asher
+asherah
+asherite
+asherites
+asherson
+asherton
+ashery
+ashes
+ashet
+ashevill
+asheville
+ashfaq
+ashfield
+ashflat
+ashford
+ashfork
+ashgrove
+ashi
+ashia
+ashia		
+ashiato
+ashiba
+ashibaya
+ashibe
+ashibets
+ashibetu
+ashibi
+ashibiki
+ashibumi
+ashida
+ashidach
+ashidai
+ashidaju
+ashidaki
+ashidama
+ashidana
+ashidati
+ashidema
+ashido-s
+ashidome
+ashidor
+ashidori
+ashidos
+ashiduke
+ashielu
+ashien
+ashier
+ashiest
+ashigaka
+ashigara
+ashigaru
+ashigase
+ashigash
+ashigashia
+ashigata
+ashigawa
+ashige
+ashihara
+ashihei
+ashiiro
+ashik
+ashika
+ashikaga
+ashikake
+ashikara
+ashikari
+ashikase
+ashikawa
+ashikiri
+ashikita
+ashikkus
+ashikosh
+ashikubi
+ashikuse
+ashil
+ashily
+ashima
+ashimawa
+ashime
+ashimmer
+ashimofu
+ashimoji
+ashimori
+ashimoto
+ashimov
+ashina
+ashinaga
+ashinami
+ashinar
+ashinara
+ashine
+ashiness
+ashing
+ashingin
+ashinginai
+ashinink
+ashininka
+ashinoko
+ashinoma
+ashio
+ashioto
+ashiozan
+ashipboa
+ashipboard
+ashippun
+ashir
+ashira
+ashirat
+ashiro
+ashis
+ashisawa
+ashish
+ashishig
+ashisuta
+ashita
+ashitaka
+ashitha
+ashitsug
+ashitsuk
+ashitugi
+ashituki
+ashiura
+ashiver
+ashiwada
+ashiwara
+ashiwaza
+ashiya
+ashiyash
+ashiyasu
+ashiyoro
+ashiyowa
+ashiyubi
+ashizama
+ashizawa
+ashizuri
+ashkarau
+ashkaraua
+ashkelon
+ashkenaz
+ashkenazic
+ashkenazim
+ashkhari
+ashkharik
+ashkoko
+ashkum
+ashkun
+ashkund
+ashkuni
+ashl
+ashla
+ashlan
+ashland
+ashlandc
+ashlandcity
+ashlar
+ashlared
+ashlarin
+ashlaring
+ashlars
+ashlee
+ashleigh
+ashlen
+ashler
+ashlers
+ashless
+ashley
+ashleyfa
+ashleyfalls
+ashli
+ashlie
+ashlin
+ashling
+ashlushl
+ashlushlay
+ashlusla
+ashluslay
+ashly
+ashman
+ashmen
+ashmolea
+ashmolean
+ashmore
+ashnah
+asho
+ashochim
+ashochimi
+ashoistd
+ashoistdis
+ashoiste
+ashoistex
+ashoistexopt
+ashok
+ashoka
+asholio
+ashoop
+ashopen
+ashore
+ashoro
+ashour
+ashousan
+ashozush
+ashozushta
+ashp
+ashpan
+ashpenaz
+ashpit
+ashplant
+ashq
+ashrae
+ashraf
+ashraff
+ashrafi
+ashram
+ashrams
+ashree
+ashret
+ashreti
+ashriel
+ashruf
+ashshura
+ashtabul
+ashtabula
+ashtarot
+ashtaroth
+ashterat
+ashterathite
+ashterot
+ashteroth
+ashthroa
+ashthroat
+ashtiani
+ashtikul
+ashtikulin
+ashton
+ashtoret
+ashtoreth
+ashtray
+ashtrays
+ashu
+ashuelot
+ashuku
+ashur
+ashura
+ashurite
+ashurites
+ashurkof
+ashurkoff
+ashuruve
+ashuruveri
+ashutosh
+ashuwa
+ashvath
+ashville
+ashweed
+ashwin
+ashwood
+ashwood-
+ashwood-smith
+ashwort
+ashworth
+ashy
+asi
+asi`
+asi`n
+asi`ndeton
+asi`ntota
+asia
+asia		
+asia`tica
+asia`tico
+asiago
+asiak
+asialia
+asian
+asiana
+asianara
+asianic
+asianism
+asianmad
+asianmade
+asiano
+asians
+asiaoro
+asiarch
+asiarcha
+asiarchate
+asiat
+asiaten
+asiatene
+asiater
+asiatic
+asiatica
+asiatical
+asiatically
+asiatican
+asiatici
+asiaticism
+asiaticization
+asiaticize
+asiatin
+asiatinn
+asiatinnen
+asiatiqu
+asiatique
+asiatiques
+asiatisc
+asiatischen
+asiatisk
+asiatiske
+asiatize
+asiato
+asiayone
+asiba
+asibaya
+asibe
+asibetsu
+asibetu
+asibetus
+asibi
+asibikin
+asibilacio`n
+asibilar
+asibumi
+asid
+asida
+asidach
+asidachi
+asidai
+asidajun
+asidaki
+asidama
+asidamar
+asidanao
+asidati
+aside
+asidehan
+asidehand
+asidemat
+asidenes
+asideness
+asiderit
+asiderite
+asidero
+asides
+asideu
+asidilla
+asido
+asido-si
+asidome
+asidonense
+asidor
+asidori
+asidos
+asidosat
+asidosatta
+asidua
+asiduamente
+asiduidad
+asiduke
+asiduo
+asie
+asiel
+asielen
+asielrec
+asielrecht
+asien
+asienabt
+asienabteilung
+asienara
+asienbil
+asienbild
+asienexp
+asienexperte
+asienken
+asienkenntnisse
+asienkon
+asienkonferenz
+asienlit
+asienliteratur
+asiens
+asiento
+asienzon
+asienzone
+asif
+asif1
+asif2
+asiga
+asigakar
+asigara
+asigarae
+asigarak
+asigaras
+asigaru
+asigase
+asigata
+asigatam
+asigawa
+asige
+asignable
+asignacio`n
+asignada
+asignado
+asignar
+asignataria
+asignatorio
+asignatura
+asihara
+asiharab
+asihei
+asiiro
+asik
+asika
+asikaga
+asikagak
+asikagas
+asikake
+asikaraz
+asikari
+asikase
+asikawa
+asikawae
+asikaway
+asikiri
+asikita
+asikkusu
+asikosi
+asikt
+asikter
+asikubi
+asikuse
+asilada
+asilado
+asilar
+asile
+asiles
+asili
+asilid
+asilidae
+asilla
+asilo
+asilomar
+asilulu
+asilus
+asilvestrada
+asilvestrado
+asimanto
+asimanton
+asimawar
+asimawas
+asimbali
+asime
+asime`trica
+asime`trico
+asimen
+asimesmo
+asimetri`a
+asimiento
+asimilable
+asimilacio`n
+asimilar
+asimilativa
+asimilativo
+asimilista
+asimina
+asimismo
+asimmer
+asimofu
+asimojim
+asimori
+asimoto
+asimov
+asimplada
+asimplado
+asims
+asims-00
+asims-003
+asims-004
+asims-006
+asims-007
+asims-009
+asims-01
+asims-013
+asims-016
+asims-019
+asims-02
+asims-020
+asims-022
+asims-025
+asims-029
+asims-03
+asims-030
+asims-032
+asims-034
+asims-035
+asims-036
+asims-037
+asims-04
+asims-042
+asims-045
+asims-046
+asims-047
+asims-dp
+asims-dpcb1
+asims-dpish56
+asims-ft
+asims-ftcmpbll
+asims-ftzsmmns
+asims-ka
+asims-kaisrslautrn
+asims-ps
+asims-psf
+asims-rd
+asims-rdca1
+asims-rdck1
+asims-rdcw1
+asims-zw
+asims-zweibrucken
+asimsrdc
+asimsrdc-louisville
+asimsrdc-monterey
+asimut
+asimutal
+asimutale
+asina
+asinaga
+asinami
+asinar
+asinara
+asinaras
+asind
+asine
+asinego
+asinergia
+asing
+asinh
+asini
+asinina
+asinine
+asininel
+asininely
+asininit
+asininities
+asininity
+asinino
+asino
+asinoko
+asinoma
+asinomak
+asio
+asioto
+asiozan
+asiphona
+asiphonate
+asiphono
+asiphonogama
+asiq
+asir
+asira
+asiria
+asiriana
+asiriano
+asirio
+asirio`logo
+asiriologi`a
+asiro
+asis
+asisawa
+asisia
+asisig
+asisigek
+asistencia
+asistenta
+asistente
+asistimiento
+asistir
+asisto`lica
+asisto`lico
+asistolia
+asistore
+asistores
+asisutan
+asita
+asitaka
+asitia
+asitsugi
+asitsuki
+asitugi
+asituki
+asiura
+asiwada
+asiwara
+asiwaza
+asix
+asiya
+asiyasi
+asiyasu
+asiyoro
+asiyowa
+asiyubi
+asizama
+asizaman
+asizawa
+asizuri
+asizurim
+asj
+asjeet
+asjett
+asjetten
+asjundan
+asjundant
+ask
+ask-mac
+aska
+askable
+askada
+askadare
+askadarp
+askadarplats
+askadlig
+askam
+askance
+askania
+askant
+askar
+askari
+askarren
+askby
+aske
+askebege
+askebeger
+askeb{ger
+asked
+askee
+askeladd
+askeladden
+askelder
+askelders
+askelon
+asken
+asker
+askers
+askese
+askesen
+askeskuf
+askeskuffen
+askest
+asket
+asketen
+asketh
+asketisk
+asketiske
+askew
+askey
+askim
+askin
+asking
+askingly
+askings
+askins
+askip
+askira
+asklent
+asklepio
+asklepios
+askleur
+askleuri
+askleurig
+askleurige
+asko
+askold
+askorbin
+askorbinsyre
+askos
+askoti
+askov
+askr
+askruik
+askruike
+askruiken
+askruisj
+askruisje
+askruisjes
+askruk
+askrukke
+askrukken
+asks
+askskydd
+askt
+askwith
+ask|y
+asl
+aslak
+aslaksen
+aslan
+aslanide
+aslanides
+aslant
+aslantwi
+aslantwise
+aslar
+aslaug
+aslaver
+asle
+asleep
+asli
+aslian
+aslilla
+aslog
+aslop
+aslope
+aslumber
+asm
+asma
+asma`tica
+asma`tico
+asmack
+asmadai
+asmadamente
+asmadera
+asmadero
+asmadura
+asmalte
+asmamento
+asmamiento
+asman
+asmannen
+asmar
+asmara
+asmat
+asmatkam
+asmatkamoro
+asme
+asmear
+asmexpan
+asmexpand
+asmgrowt
+asmgrowth
+asmile
+asmo
+asmocode
+asmodeus
+asmoke
+asmolder
+asmosa
+asmoso
+asmrenam
+asmrename
+asmreorg
+asmund
+asmussen
+asn
+asna
+asnacho
+asnada
+asnado
+asnah
+asnal
+asnallo
+asnalmente
+asnam
+asnan
+asnapper
+asnat
+asnejo`n
+asner
+asneri`a
+asnerizo
+asnero
+asngat
+asni
+asnico
+asniffle
+asnilla
+asnillo
+asnina
+asnino
+asno
+asnort
+asnto
+asnuab
+asnuna
+asnuno
+aso
+asoak
+asob
+asoba
+asobarcar
+asobase
+asobe
+asobi
+asobiaki
+asobiaru
+asobiba
+asobigok
+asobihou
+asobikat
+asobimaw
+asobinarse
+asobse
+asocarronada
+asocarronado
+asociaal
+asociaalst
+asociable
+asociacio`n
+asociacionismo
+asociada
+asociado
+asocial
+asociale
+asocialer
+asociales
+asociamiento
+asociar
+asociaux
+asohora
+asok
+asoka
+asoko
+asokora
+asola
+asolacio`n
+asolador
+asoladora
+asoladura
+asolamiento
+asolanar
+asolapar
+asolar
+asolazar
+asoldadar
+asoldamiento
+asoldar
+asole
+asoleada
+asoleamiento
+asolear
+asolejar
+asoleo
+asolio
+asolvamiento
+asolvar
+asom
+asomada
+asomante
+asomar
+asomatop
+asomatophyte
+asomatou
+asomatous
+asombradiza
+asombradizo
+asombrador
+asombradora
+asombramiento
+asombrar
+asombro
+asombrosa
+asombrosamente
+asombroso
+asomiki
+asomo
+ason
+asona`ntico
+asonada
+asonadi`a
+asonancia
+asonant
+asonantar
+asonante
+asonar
+asondar
+asong
+asongori
+asonia
+asop
+asops
+asor
+asordante
+asordar
+asorocharse
+asosa
+asosan
+asosegadamento
+asosegar
+asosheit
+asoshie
+asoshie-
+asoshiei
+asoshies
+asoshimo
+asoshira
+asosial
+asosiale
+asosie
+asosie-s
+asosiei
+asosieit
+asosies
+asosiesy
+asosimo
+asosimod
+asosira
+asosirak
+asotanar
+asotilar
+asotin
+asou
+asoukasu
+asoukeik
+asoumami
+asoumido
+asoumio
+asounats
+asounatu
+asoureir
+asousayu
+asoushio
+asousior
+asouth
+asouyuki
+asouyumi
+asouyuuk
+asowi
+asowsche
+asowsches
+asozan
+asoziier
+asoziierte
+asp
+aspa
+aspa`lato
+aspac
+aspace
+aspada
+aspadera
+aspado
+aspador
+aspadora
+aspalath
+aspalathus
+aspalax
+aspalto
+aspar
+asparagi
+asparagic
+asparagine
+asparaginic
+asparaginous
+asparagu
+asparagus
+asparaguses
+asparagy
+asparagyl
+asparges
+aspargesen
+aspargessuppe
+asparkle
+aspartat
+aspartate
+aspartic
+aspartyl
+aspasia
+aspatha
+aspatia
+aspaventar
+aspaventera
+aspaventero
+aspaviento
+aspca
+aspe'rit
+aspe'rite'
+aspe'rite's
+aspe`rrima
+aspe`rrimo
+aspearse
+aspect
+aspectab
+aspectable
+aspectan
+aspectant
+aspecten
+aspectio
+aspection
+aspecto
+aspects
+aspectua
+aspectual
+aspegren
+aspekt
+aspekte
+aspekten
+aspektene
+aspekter
+aspektes
+aspektet
+aspen
+aspens
+asper
+asperamente
+asperarteria
+asperate
+asperati
+asperation
+asperear
+asperedumbre
+asperere
+asperete
+asperez
+aspereza
+aspergat
+aspergation
+asperge
+asperge'
+asperge'e
+asperge'es
+asperge's
+asperge`
+asperge`rent
+aspergea
+aspergeaient
+aspergeais
+aspergeait
+aspergeant
+aspergeb
+aspergebed
+aspergebedden
+aspergen
+aspergent
+aspergeo
+aspergeons
+asperger
+aspergera
+aspergerai
+aspergeraient
+aspergerais
+aspergerait
+aspergeras
+aspergerez
+aspergeriez
+aspergerions
+aspergerons
+aspergeront
+asperges
+asperget
+aspergetang
+aspergetangen
+aspergez
+aspergie
+aspergiez
+aspergil
+aspergill
+aspergillaceae
+aspergillales
+aspergilliform
+aspergillin
+aspergillosis
+aspergillum
+aspergillus
+aspergio
+aspergions
+asperidad
+asperiega
+asperiego
+asperifo
+asperifoliae
+asperifoliate
+asperifolious
+asperilla
+asperillo
+asperite
+asperiti
+asperities
+asperity
+asperjar
+aspermat
+aspermatic
+aspermatism
+aspermatous
+aspermia
+aspermic
+aspermon
+aspermont
+aspermou
+aspermous
+aspero`n
+asperous
+asperously
+aspers
+asperse
+aspersed
+asperser
+aspersers
+asperses
+aspersin
+aspersing
+aspersio
+aspersio`n
+aspersion
+aspersions
+aspersiv
+aspersive
+aspersively
+aspersor
+aspersorio
+aspersorium
+aspersors
+aspersory
+asperugo
+asperula
+asperulo
+asperuloside
+asperulous
+asperura
+aspetta
+aspettai
+aspettam
+aspettammo
+aspettan
+aspettando
+aspettano
+aspettar
+aspettare
+aspettas
+aspettasse
+aspettassi
+aspettaste
+aspettasti
+aspettat
+aspettata
+aspettate
+aspettati
+aspettato
+aspettav
+aspettava
+aspettavi
+aspettavo
+aspetter
+aspettera
+aspetterai
+aspetterei
+aspettero
+aspetti
+aspettia
+aspettiamo
+aspettiate
+aspettin
+aspettino
+aspetto
+asphalt
+asphalta
+asphaltage
+asphaltb
+asphaltbahnen
+asphalte
+asphalted
+asphaltene
+asphalter
+asphalti
+asphaltic
+asphaltick
+asphalting
+asphaltite
+asphaltn
+asphaltnacht
+asphalto
+asphalts
+asphaltschlangen
+asphaltstrasse
+asphaltu
+asphaltum
+asphaltus
+aspheric
+aspheter
+aspheterism
+aspheterize
+asphodel
+asphodelaceae
+asphodeline
+asphodels
+asphodelus
+asphycti
+asphyctic
+asphycto
+asphyctous
+asphyxia
+asphyxiaient
+asphyxiait
+asphyxial
+asphyxiant
+asphyxiante
+asphyxiantes
+asphyxiants
+asphyxiate
+asphyxiated
+asphyxiates
+asphyxiating
+asphyxiation
+asphyxiative
+asphyxiator
+asphyxie
+asphyxie'
+asphyxie'e
+asphyxie'es
+asphyxie's
+asphyxie`rent
+asphyxied
+asphyxient
+asphyxier
+asphyxiera
+asphyxieraient
+asphyxierait
+asphyxieront
+asphyxy
+aspic
+aspick
+aspics
+aspicula
+aspiculate
+aspiculo
+aspiculous
+aspidate
+aspidiar
+aspidiaria
+aspidino
+aspidinol
+aspidiot
+aspidiotus
+aspidisk
+aspidiske
+aspidist
+aspidistra
+aspidistras
+aspidium
+aspidobr
+aspidobranchia
+aspidobranchiata
+aspidobranchiate
+aspidoce
+aspidocephali
+aspidoch
+aspidochirota
+aspidoga
+aspidoganoidei
+aspidoma
+aspidomancy
+aspidosp
+aspidosperma
+aspidospermine
+aspik
+aspilla
+aspillador
+aspillar
+aspillera
+aspillerar
+aspin
+aspinwal
+aspinwall
+aspir
+aspira
+aspiracio`n
+aspirada
+aspirado
+aspirador
+aspiradora
+aspirai
+aspiraie
+aspiraient
+aspirais
+aspirait
+aspiramm
+aspirammo
+aspirand
+aspirando
+aspirano
+aspirant
+aspirant-controleur
+aspirant-controleurs
+aspirant-onderwijzer
+aspirant-onderwijzers
+aspirante
+aspiranten
+aspiranter
+aspirantes
+aspiranti
+aspirantl|nn
+aspirants
+aspiranttjeneste
+aspirar
+aspirare
+aspiraro
+aspirarono
+aspirasj
+aspirasjon
+aspirasjonen
+aspirass
+aspirasse
+aspirassi
+aspirast
+aspiraste
+aspirasti
+aspirata
+aspirate
+aspirated
+aspirates
+aspirateur
+aspirateurs
+aspirati
+aspiratie
+aspiraties
+aspirating
+aspiration
+aspirationen
+aspirations
+aspirato
+aspirator
+aspirators
+aspiratory
+aspirava
+aspiravamo
+aspiravano
+aspiravate
+aspiravi
+aspiravo
+aspire
+aspire'
+aspire'e
+aspire'es
+aspire's
+aspire`r
+aspire`rent
+aspired
+aspireer
+aspireerde
+aspireerden
+aspireert
+aspirent
+aspirer
+aspirera
+aspirerai
+aspireraient
+aspirerais
+aspirerait
+aspireras
+aspirere
+aspirerede
+aspirerei
+aspireremo
+aspireren
+aspirerer
+aspirerete
+aspirerez
+aspireri
+aspireriez
+aspirerions
+aspirero
+aspirerons
+aspireront
+aspirers
+aspirert
+aspirerte
+aspires
+aspirez
+aspiri
+aspiriam
+aspiriamo
+aspiriat
+aspiriate
+aspirien
+aspirientje
+aspirientjes
+aspiriez
+aspirin
+aspirina
+aspirine
+aspirines
+aspirinetablet
+aspirinetabletten
+aspiring
+aspiringly
+aspiringness
+aspirino
+aspirins
+aspirion
+aspirions
+aspiro
+aspirons
+aspish
+asplanch
+asplanchnic
+asplenie
+asplenieae
+asplenio
+asplenioid
+aspleniu
+asplenium
+asplinda
+asplund
+asporina
+asporoge
+asporogenic
+asporogenous
+asporous
+asport
+asportat
+asportation
+asporula
+asporulate
+aspot
+aspotten
+aspout
+aspra
+aspramon
+aspramont
+asprawl
+aspre
+aspread
+aspredin
+aspredinidae
+aspredo
+asprer
+aspri
+aspring
+aspro
+asprout
+asps
+aspsycho
+aspsychometrics
+aspunt
+aspunten
+asq
+asqar
+asqualcn
+asqualcntrl
+asquare
+asquat
+asqueal
+asquear
+asquerin
+asquerino
+asquerosa
+asquerosamente
+asquerosidad
+asqueroso
+asquin
+asquint
+asquirm
+asquith
+asr
+asrama
+asramas
+asrcmv
+asrcvx
+asregen
+asregens
+asri
+asriel
+asrielit
+asrielites
+asrit
+asrod
+ass
+assaad
+assabu
+assacu
+assad
+assael
+assaf
+assafoet
+assafoetida
+assagaai
+assagaaien
+assagai
+assagais
+assagger
+assaggera
+assaggerai
+assaggerei
+assaggero
+assaggi
+assaggia
+assaggiai
+assaggiamo
+assaggiano
+assaggiare
+assaggiata
+assaggiate
+assaggiati
+assaggiato
+assaggiava
+assaggiavi
+assaggiavo
+assaggin
+assaggino
+assaggio
+assagi
+assagie
+assagies
+assagir
+assagis
+assagiss
+assagissant
+assagissement
+assagori
+assai
+assaies
+assaikio
+assaiko
+assail
+assailab
+assailable
+assailableness
+assailan
+assailant
+assailants
+assaild
+assailed
+assailer
+assailers
+assailin
+assailing
+assailla
+assaillaient
+assaillais
+assaillait
+assaillant
+assaillante
+assaillantes
+assaillants
+assaille
+assaillent
+assailles
+assaillez
+assailli
+assaillie
+assaillies
+assailliez
+assaillions
+assaillir
+assaillira
+assaillirai
+assailliraient
+assaillirais
+assaillirait
+assailliras
+assaillirent
+assaillirez
+assailliriez
+assaillirions
+assaillirons
+assailliront
+assaillis
+assaillit
+assaillo
+assaillons
+assailme
+assailment
+assails
+assaini
+assainie
+assainies
+assainir
+assainira
+assainirai
+assainiraient
+assainirais
+assainirait
+assainiras
+assainirent
+assainirez
+assainiriez
+assainirions
+assainirons
+assainiront
+assainis
+assainissaient
+assainissais
+assainissait
+assainissant
+assainisse
+assainissement
+assainissent
+assainisses
+assainissez
+assainissiez
+assainissions
+assainissons
+assainit
+assaison
+assaisonnant
+assaisonne'
+assaisonne'e
+assaisonne'es
+assaisonne's
+assaisonnement
+assaisonner
+assaka
+assaku
+assalti
+assalto
+assam
+assama
+assamese
+assamite
+assamites
+assamour
+assamourai
+assamu
+assan
+assane
+assangor
+assangori
+assante
+assanti
+assapan
+assapani
+assapanic
+assar
+assari
+assaria
+assarion
+assarmen
+assarmenter
+assart
+assary
+assasin
+assassin
+assassina
+assassinai
+assassinaient
+assassinais
+assassinait
+assassinant
+assassinat
+assassinate
+assassinated
+assassinates
+assassinating
+assassination
+assassinations
+assassinative
+assassinator
+assassinatress
+assassinats
+assassine
+assassine'
+assassine'e
+assassine'es
+assassine's
+assassine`rent
+assassinent
+assassiner
+assassinera
+assassinerai
+assassineraient
+assassinerais
+assassinerait
+assassineras
+assassinerez
+assassineriez
+assassinerions
+assassinerons
+assassineront
+assassines
+assassinez
+assassini
+assassiniez
+assassinions
+assassinist
+assassino
+assassinons
+assassins
+assate
+assation
+assatsu
+assatu
+assault
+assaulta
+assaultable
+assaulte
+assaulted
+assaulter
+assaulters
+assaulti
+assaulting
+assaultive
+assaults
+assaut
+assauts
+assawath
+assawathep
+assawoma
+assawoman
+assay
+assayabl
+assayable
+assayd
+assayed
+assayer
+assayers
+assaying
+assays
+assbaa
+asse
+asse'cha
+asse'chaient
+asse'chais
+asse'chait
+asse'chant
+asse'che
+asse'che'
+asse'che'e
+asse'che'es
+asse'che's
+asse'che`rent
+asse'cher
+asse'chera
+asse'cherai
+asse'cheraient
+asse'cherais
+asse'cherait
+asse'cheras
+asse'cherez
+asse'cheriez
+asse'cherions
+asse'cherons
+asse'cheront
+asse'chez
+asse'chi
+asse'chiez
+asse'chions
+asse'cho
+asse'chons
+asse'na
+asse'nai
+asse'naient
+asse'nais
+asse'nait
+asse'nan
+asse'nant
+asse'ne'
+asse'ne'e
+asse'ne'es
+asse'ne's
+asse'ne`
+asse'ne`rent
+asse'ner
+asse'nera
+asse'nerai
+asse'neraient
+asse'nerais
+asse'nerait
+asse'neras
+asse'nerez
+asse'neriez
+asse'nerions
+asse'nerons
+asse'neront
+asse'nez
+asse'nie
+asse'niez
+asse'nio
+asse'nions
+asse'non
+asse'nons
+asse`che
+asse`chement
+asse`chent
+asse`ches
+asse`ne
+asse`nen
+asse`nent
+asse`nes
+assecond
+asseconda
+assecondai
+assecondi
+assecondo
+assecura
+assecuration
+assecurator
+assedati
+assedation
+assedi
+assedia
+assediai
+assediam
+assediammo
+assediamo
+assedian
+assediando
+assediano
+assediar
+assediare
+assedias
+assediasse
+assediassi
+assediaste
+assediasti
+assediat
+assediata
+assediate
+assediati
+assediato
+assediav
+assediava
+assediavi
+assediavo
+assedier
+assediera
+assedierai
+assedierei
+assediero
+assedino
+assedio
+assegaai
+assegaaien
+assegai
+assegais
+assegna
+assegnam
+assegnamento
+assegnan
+assegnando
+assegnar
+assegnare
+assegnat
+assegnata
+assegnate
+assegnato
+assegnaz
+assegnazione
+assegni
+assegno
+assei
+assekura
+assekuranz
+asself
+asselin
+assem
+assema
+assembl
+assembla
+assemblable
+assemblage
+assemblages
+assemblaient
+assemblais
+assemblait
+assemblant
+assemblatore
+assemble
+assemble'
+assemble'e
+assemble'es
+assemble's
+assemble`rent
+assemblea
+assembled
+assemblee
+assembleet
+assembleia
+assemblent
+assembler
+assemblera
+assemblerai
+assembleraient
+assemblerais
+assemblerait
+assembleras
+assembleren
+assemblerez
+assembleriez
+assemblerions
+assemblerlevel
+assemblern
+assemblerons
+assembleront
+assemblerprogram
+assemblerprogrammerfriendly
+assemblerprogrammering
+assemblerrutiner
+assemblers
+assembles
+assembleur
+assembleurs
+assemblez
+assembli
+assemblieren
+assembliert
+assemblies
+assembliez
+assembling
+assemblions
+assemblo
+assemblons
+assembly
+assemblykoda
+assemblyman
+assemblymen
+assemblyrader
+assemblyroom
+assemblywoman
+assemblywomen
+assement
+assen
+assena
+assenin
+assennat
+assennata
+assennate
+assennati
+assennato
+assenshu
+assensi
+assenso
+assent
+assentan
+assentaneous
+assentat
+assentation
+assentatious
+assentator
+assentatorily
+assentatory
+assente
+assented
+assenter
+assenters
+assenti
+assentie
+assentient
+assentim
+assentiment
+assentiments
+assentin
+assenting
+assentingly
+assentiv
+assentive
+assentiveness
+assentme
+assentment
+assentor
+assentors
+assents
+assenza
+assenze
+asseoir
+assepoes
+assepoesen
+assepoester
+assepoesters
+assermen
+assermente'
+assermente'e
+assermente'es
+assermente's
+assermenter
+assert
+assertab
+assertable
+assertat
+assertative
+asserted
+asserter
+asserters
+assertib
+assertible
+assertie
+assertin
+asserting
+assertio
+assertion
+assertional
+assertions
+assertiv
+assertive
+assertively
+assertiveness
+assertor
+assertorial
+assertorially
+assertoric
+assertorical
+assertorically
+assertorily
+assertors
+assertory
+assertre
+assertress
+assertri
+assertrix
+asserts
+assertum
+asservir
+asservis
+asservissement
+asservissements
+asservisseur
+asservisseurs
+asserzio
+asserzione
+asserzioni
+asses
+assess
+assessab
+assessable
+assessably
+assessed
+assessee
+assesses
+assesseu
+assesseur
+assesseurs
+assessin
+assessing
+assessio
+assession
+assessionary
+assessme
+assessment
+assessments
+assessor
+assessore
+assessoren
+assessori
+assessorial
+assessors
+assessorship
+assessory
+assest
+assesta
+assestai
+assestam
+assestammo
+assestan
+assestando
+assestano
+assestar
+assestare
+assestas
+assestasse
+assestassi
+assestaste
+assestasti
+assestat
+assestata
+assestate
+assestati
+assestato
+assestav
+assestava
+assestavi
+assestavo
+assester
+assestera
+assesterai
+assesterei
+assestero
+assesti
+assestia
+assestiamo
+assestiate
+assestin
+assestino
+assesto
+asset
+assetata
+assetate
+assetati
+assetato
+assets
+assetsu
+assetu
+assever
+assevera
+asseverate
+asseverated
+asseverates
+asseverating
+asseveratingly
+asseveration
+asseverations
+asseverative
+asseveratively
+asseveratory
+asseyaie
+asseyaient
+asseyais
+asseyait
+asseyant
+asseye
+asseyent
+asseyes
+asseyez
+asseyiez
+asseyion
+asseyions
+asseyons
+assez
+asshead
+asshi
+asshign
+asshignm
+asshin
+asshiria
+asshista
+asshole
+asshou
+asshuku
+asshukug
+asshukuk
+asshukur
+asshur
+asshurim
+assi
+assia
+assibila
+assibilate
+assibilation
+assicura
+assicurai
+assicurano
+assicurare
+assicurarsi
+assicurata
+assicurate
+assicurati
+assicurato
+assicurava
+assicuravi
+assicuravo
+assicure
+assicurera
+assicurero
+assicuri
+assicurino
+assicuro
+assidean
+assident
+assidera
+assiderai
+assiderano
+assiderare
+assiderata
+assiderate
+assiderati
+assiderato
+assiderava
+assideravi
+assideravo
+assidere
+assiderera
+assiderero
+assideri
+assiderino
+assidero
+assidu
+assidu^m
+assidu^ment
+assidua
+assidual
+assidually
+assidue
+assidues
+assidui
+assiduit
+assiduite'
+assiduite's
+assiduities
+assiduity
+assiduo
+assiduou
+assiduous
+assiduously
+assiduousness
+assidus
+assie'ge
+assie'ge'
+assie'ge'e
+assie'ge'es
+assie'ge's
+assie'ge`rent
+assie'gea
+assie'geaient
+assie'geais
+assie'geait
+assie'geant
+assie'geants
+assie'geons
+assie'ger
+assie'gera
+assie'gerai
+assie'geraient
+assie'gerais
+assie'gerait
+assie'geras
+assie'gerez
+assie'geriez
+assie'gerions
+assie'gerons
+assie'geront
+assie'gez
+assie'gi
+assie'giez
+assie'gions
+assie'ra
+assie'rai
+assie'raient
+assie'rais
+assie'rait
+assie'ras
+assie're
+assie'rez
+assie'ri
+assie'riez
+assie'rions
+assie'ro
+assie'rons
+assie'ront
+assie`ge
+assie`gent
+assie`ges
+assied
+assieds
+assieme
+assienti
+assientist
+assiento
+assiette
+assiette'e
+assiette'es
+assietter
+assiettes
+assify
+assig
+assign
+assigna
+assignaa
+assignaat
+assignab
+assignability
+assignable
+assignably
+assignai
+assignaient
+assignais
+assignait
+assignan
+assignant
+assignat
+assignaten
+assignatie
+assignaties
+assignation
+assignations
+assignd
+assigne
+assigne'
+assigne'e
+assigne'es
+assigne's
+assigne`
+assigne`rent
+assigned
+assignee
+assignees
+assigneeship
+assignen
+assignent
+assigner
+assignera
+assignerai
+assigneraient
+assignerais
+assignerait
+assigneras
+assignerez
+assigneriez
+assignerions
+assignerons
+assigneront
+assigners
+assignes
+assignez
+assignie
+assigniez
+assignin
+assigning
+assignio
+assignions
+assignme
+assignment
+assignments
+assignon
+assignons
+assignor
+assignors
+assigns
+assilag
+assilla
+assillai
+assillam
+assillammo
+assillan
+assillando
+assillano
+assillar
+assillare
+assillas
+assillasse
+assillassi
+assillaste
+assillasti
+assillat
+assillata
+assillate
+assillati
+assillato
+assillav
+assillava
+assillavi
+assillavo
+assiller
+assillera
+assillerai
+assillerei
+assillero
+assilli
+assillia
+assilliamo
+assilliate
+assillin
+assillino
+assillo
+assimer
+assimila
+assimilability
+assimilable
+assimilables
+assimilai
+assimilaient
+assimilais
+assimilait
+assimilano
+assimilant
+assimilare
+assimilasjon
+assimilasjonen
+assimilata
+assimilate
+assimilated
+assimilates
+assimilati
+assimilatie
+assimilaties
+assimilating
+assimilation
+assimilationist
+assimilations
+assimilative
+assimilativeness
+assimilato
+assimilator
+assimilatory
+assimilava
+assimilavi
+assimilavo
+assimile
+assimile'
+assimile'e
+assimile'es
+assimile's
+assimile`rent
+assimileer
+assimileerde
+assimileerden
+assimileert
+assimilent
+assimiler
+assimilera
+assimilerai
+assimileraient
+assimilerais
+assimilerait
+assimileras
+assimilere
+assimileren
+assimilerer
+assimilerez
+assimileriez
+assimilerions
+assimilero
+assimilerons
+assimileront
+assimilert
+assimiles
+assimilez
+assimili
+assimiliez
+assimilino
+assimilions
+assimilo
+assimilons
+assin
+assine
+assinibo
+assiniboin
+assiniboine
+assinie
+assir
+assirent
+assiria
+assiring
+assiringia
+assis
+assisan
+assise
+assisenh
+assisenhof
+assisenhoven
+assises
+assish
+assishly
+assishne
+assishness
+assisi
+assist
+assista
+assistai
+assistaient
+assistais
+assistait
+assistan
+assistance
+assistances
+assistans
+assistanse
+assistansen
+assistanser
+assistant
+assistante
+assistanted
+assistantes
+assistants
+assistantship
+assistantships
+assiste
+assiste'
+assiste'e
+assiste'es
+assiste's
+assiste`
+assiste`rent
+assisted
+assistee
+assisteer
+assisteerde
+assisteerden
+assisteert
+assisten
+assistency
+assistent
+assistent-apotheker
+assistent-apothekeres
+assistent-apothekeressen
+assistent-apothekers
+assistent-resident
+assistent-residenten
+assistente
+assistenten
+assistenter
+assistenti
+assistentie
+assistentinnen
+assistentlege
+assistentsaerzte
+assistentsaerzten
+assistentsarztes
+assistentuddannelsen
+assistenz
+assistenza
+assistenzaerzte
+assistenzarztes
+assistenzarztstelle
+assistenze
+assister
+assistera
+assisterad
+assisterai
+assisteraient
+assisterais
+assisterait
+assisteras
+assistere
+assisteren
+assisterende
+assisterez
+assisteriez
+assisterions
+assisterons
+assisteront
+assisters
+assistert
+assisterte
+assistervi
+assistes
+assistet
+assistette
+assistev
+assisteva
+assistez
+assistfu
+assistful
+assistie
+assistiez
+assistin
+assisting
+assistio
+assistions
+assistit
+assistito
+assistiv
+assistive
+assistle
+assistless
+assiston
+assistono
+assistons
+assistor
+assistors
+assists
+assit
+assize
+assizeme
+assizement
+assizer
+assizes
+asslike
+asslst
+assman
+assmanns
+assmannshauser
+assmansh
+assmanship
+assn
+asso
+assoc
+assocera
+assocerai
+assocere
+assocerei
+assoceremo
+assocerete
+assocero
+associ
+associa
+associab
+associability
+associable
+associableness
+associai
+associaient
+associais
+associait
+associal
+associam
+associammo
+associamo
+associan
+associando
+associano
+associant
+associar
+associare
+associarla
+associas
+associasse
+associassi
+associaste
+associasti
+associat
+associata
+associate
+associated
+associatedness
+associatedwith
+associates
+associateship
+associati
+associatie
+associaties
+associatif
+associatifs
+associating
+association
+associational
+associationalism
+associationalist
+associationen
+associationens
+associationer
+associationism
+associationist
+associationistic
+associations
+associationsteknik
+associativ
+associativa
+associative
+associatively
+associativeness
+associatives
+associativity
+associato
+associator
+associators
+associatory
+associav
+associava
+associavi
+associavo
+associaz
+associazione
+associe
+associe'
+associe'e
+associe'es
+associe's
+associe`
+associe`rent
+associee
+associeerde
+associeerden
+associen
+associent
+associer
+associera
+associerai
+associeraient
+associerais
+associerait
+associeras
+associeren
+associeret
+associerez
+associeriez
+associerions
+associerons
+associeront
+associes
+associez
+associie
+associiez
+associio
+associions
+associno
+associo
+associon
+associons
+assoda
+assodai
+assodamm
+assodammo
+assodand
+assodando
+assodano
+assodare
+assodaro
+assodarono
+assodass
+assodasse
+assodassi
+assodast
+assodaste
+assodasti
+assodata
+assodate
+assodati
+assodato
+assodava
+assodavamo
+assodavano
+assodavate
+assodavi
+assodavo
+assodera
+assoderai
+assodere
+assoderei
+assoderemo
+assoderete
+assodero
+assodi
+assodiam
+assodiamo
+assodiat
+assodiate
+assodino
+assodo
+assogget
+assoggetta
+assoggetti
+assoggetto
+assoie
+assoient
+assoies
+assoiffa
+assoiffant
+assoiffe
+assoiffe'
+assoiffe'e
+assoiffe'es
+assoiffe's
+assoiffer
+assoil
+assoilme
+assoilment
+assoilzi
+assoilzie
+assoira
+assoirai
+assoiraient
+assoirais
+assoirait
+assoiras
+assoirez
+assoirie
+assoiriez
+assoirio
+assoirions
+assoiron
+assoirons
+assoiront
+assois
+assoit
+assolata
+assolate
+assolati
+assolato
+assoleme
+assolement
+assoler
+assoli
+assolto
+assoluta
+assolute
+assoluti
+assoluto
+assolve
+assolver
+assolvere
+assolvo
+assombri
+assombrie
+assombries
+assombrir
+assombrira
+assombriraient
+assombrirait
+assombrirent
+assombriront
+assombris
+assombrissaient
+assombrissait
+assombrissant
+assombrisse
+assombrissement
+assombrissent
+assombrit
+assomigl
+assomigli
+assomiglia
+assomiglio
+assomma
+assommai
+assommaient
+assommais
+assommait
+assomman
+assommant
+assomme
+assomme'
+assomme'e
+assomme'es
+assomme's
+assomme`
+assomme`rent
+assommen
+assomment
+assommer
+assommera
+assommerai
+assommeraient
+assommerais
+assommerait
+assommeras
+assommerez
+assommeriez
+assommerions
+assommerons
+assommeront
+assommes
+assommez
+assommie
+assommiez
+assommio
+assommions
+assommon
+assommons
+assompti
+assomption
+assonanc
+assonance
+assonanced
+assonances
+assonans
+assonansen
+assonant
+assonantal
+assonantic
+assonantie
+assonanties
+assonantly
+assonants
+assonate
+assoneer
+assoneerde
+assoneerden
+assoneert
+assonere
+assoneren
+assonet
+assonia
+assonnat
+assonnata
+assonnate
+assonnati
+assonnato
+assorbe
+assorben
+assorbente
+assorbenti
+assorbir
+assorbire
+assorbit
+assorbita
+assorbito
+assorbiv
+assorbiva
+assorda
+assordai
+assordam
+assordammo
+assordan
+assordando
+assordano
+assordar
+assordare
+assordas
+assordasse
+assordassi
+assordaste
+assordasti
+assordat
+assordata
+assordate
+assordati
+assordato
+assordav
+assordava
+assordavi
+assordavo
+assorder
+assordera
+assorderai
+assorderei
+assordero
+assordi
+assordia
+assordiamo
+assordiate
+assordin
+assordino
+assordo
+assort
+assortat
+assortative
+assorted
+assortedness
+assortee
+assorteer
+assorteerde
+assorteerden
+assorteert
+assorter
+assortere
+assorteren
+assorters
+assortert
+assorterte
+assorti
+assortie
+assorties
+assortim
+assortiment
+assortimenten
+assortimentet
+assortiments
+assortin
+assorting
+assortir
+assortira
+assortirai
+assortiraient
+assortirais
+assortirait
+assortiras
+assortirent
+assortirez
+assortiriez
+assortirions
+assortirons
+assortiront
+assortis
+assortissaient
+assortissais
+assortissait
+assortissant
+assortisse
+assortissent
+assortisses
+assortissez
+assortissiez
+assortissions
+assortissons
+assortit
+assortiv
+assortive
+assortme
+assortment
+assortments
+assorts
+assos
+assosias
+assosiasjon
+assosiasjonen
+assosiasjonene
+assosiasjoner
+assosiasjonsrikdom
+assosiat
+assosiativ
+assosier
+assosiere
+assosiering
+assosieringen
+assosieringer
+assosiert
+assosierte
+assosiertes
+assottig
+assottigla
+assottigli
+assottiglo
+assoun
+assouna
+assoupi
+assoupie
+assoupies
+assoupir
+assoupira
+assoupirai
+assoupiraient
+assoupirais
+assoupirait
+assoupiras
+assoupirent
+assoupirez
+assoupiriez
+assoupirions
+assoupirons
+assoupiront
+assoupis
+assoupissaient
+assoupissais
+assoupissait
+assoupissant
+assoupisse
+assoupissement
+assoupissements
+assoupissent
+assoupisses
+assoupissez
+assoupissiez
+assoupissions
+assoupissons
+assoupit
+assoupli
+assouplie
+assouplies
+assouplir
+assouplira
+assouplirai
+assoupliraient
+assouplirais
+assouplirait
+assoupliras
+assouplirent
+assouplirez
+assoupliriez
+assouplirions
+assouplirons
+assoupliront
+assouplis
+assouplissaient
+assouplissais
+assouplissait
+assouplissant
+assouplisse
+assouplissement
+assouplissent
+assouplisses
+assouplissez
+assouplissiez
+assouplissions
+assouplissons
+assouplit
+assourdi
+assourdie
+assourdies
+assourdir
+assourdira
+assourdiraient
+assourdirait
+assourdirent
+assourdiront
+assourdis
+assourdissaient
+assourdissait
+assourdissant
+assourdissante
+assourdissantes
+assourdissants
+assourdisse
+assourdissement
+assourdissent
+assourdit
+assouvi
+assouvie
+assouvies
+assouvir
+assouvira
+assouvirai
+assouviraient
+assouvirais
+assouvirait
+assouviras
+assouvirent
+assouvirez
+assouviriez
+assouvirions
+assouvirons
+assouviront
+assouvis
+assouvissaient
+assouvissais
+assouvissait
+assouvissant
+assouvisse
+assouvissement
+assouvissent
+assouvisses
+assouvissez
+assouvissiez
+assouvissions
+assouvissons
+assouvit
+assoyaie
+assoyaient
+assoyais
+assoyait
+assoyant
+assoyez
+assoyiez
+assoyion
+assoyions
+assoyons
+assoziat
+assoziation
+assoziationslust
+assoziationsrat
+assoziationstechnik
+assoziativita"t
+assoziie
+assoziiert
+assoziierten
+assr
+asst
+assuade
+assuagab
+assuagable
+assuage
+assuaged
+assuagem
+assuagement
+assuagements
+assuager
+assuages
+assuagin
+assuaging
+assuanst
+assuanstaudamm
+assuasiv
+assuasive
+assubjug
+assubjugate
+assuefac
+assuefaction
+assuefat
+assuefatti
+assuetud
+assuetude
+assuit
+assujett
+assujetti
+assujettie
+assujetties
+assujettir
+assujettira
+assujettirai
+assujettiraient
+assujettirais
+assujettirait
+assujettiras
+assujettirent
+assujettirez
+assujettiriez
+assujettirions
+assujettirons
+assujettiront
+assujettis
+assujettissaient
+assujettissais
+assujettissait
+assujettissant
+assujettissante
+assujettissantes
+assujettissants
+assujettisse
+assujettissement
+assujettissements
+assujettissent
+assujettisses
+assujettissez
+assujettissiez
+assujettissions
+assujettissons
+assujettit
+assuma
+assumabl
+assumable
+assumably
+assumaie
+assumaient
+assumais
+assumait
+assumant
+assumbo
+assume
+assume'
+assume'e
+assume'es
+assume's
+assume`r
+assume`rent
+assumed
+assumedl
+assumedly
+assumedr
+assumedreachable
+assumend
+assumendo
+assument
+assumer
+assumera
+assumerai
+assumeraient
+assumerais
+assumerait
+assumeras
+assumere
+assumerez
+assumeri
+assumeriez
+assumerions
+assumerm
+assumermi
+assumero
+assumerons
+assumeront
+assumers
+assumersi
+assumes
+assumess
+assumesse
+assumez
+assumiez
+assumiin
+assumiing
+assuming
+assumingly
+assumingness
+assumion
+assumions
+assumono
+assumons
+assumpsi
+assumpsit
+assumpsj
+assumpsjon
+assumpti
+assumptie
+assumption
+assumptionist
+assumptionisten
+assumptions
+assumptious
+assumptiousness
+assumptive
+assumptively
+assumptiveness
+assunse
+assunta
+assunti
+assunto
+assunzio
+assunzione
+assunzioni
+assur
+assura
+assurabl
+assurable
+assurables
+assurade
+assuradeur
+assuradeuren
+assuradeurs
+assuraie
+assuraient
+assurais
+assurait
+assuranc
+assurance
+assurances
+assurand
+assurand|r
+assurand|ren
+assurand|rer
+assurans
+assuranse
+assuransen
+assuransesvik
+assuransesvindel
+assurant
+assurantie
+assurantiekantoor
+assurantiekantoren
+assurantiemaatschappij
+assurantiemaatschappijen
+assurantien
+assurantiepolis
+assurantiepolissen
+assuranties
+assurda
+assurde
+assurdi
+assurdo
+assure
+assure'
+assure'e
+assure'es
+assure'm
+assure'ment
+assure's
+assure`r
+assure`rent
+assured
+assuredl
+assuredly
+assuredn
+assuredness
+assureds
+assureer
+assureerde
+assureerden
+assureert
+assurent
+assurer
+assurera
+assurerai
+assureraient
+assurerais
+assurerait
+assureras
+assurere
+assureren
+assurerez
+assureri
+assureriez
+assurerions
+assurero
+assurerons
+assureront
+assurers
+assurert
+assures
+assureur
+assureurs
+assurez
+assurge
+assurgen
+assurgency
+assurgent
+assuriez
+assuring
+assuringly
+assurini
+assurion
+assurions
+assurons
+assuror
+assurors
+asswage
+asswaged
+assy
+assyntit
+assyntite
+assyou
+assyrer
+assyrere
+assyreren
+assyria
+assyrian
+assyrianize
+assyrians
+assyrien
+assyriol
+assyriological
+assyriologist
+assyriologue
+assyriology
+assyroid
+assythme
+assythment
+assyuku
+ast
+ast-vax
+asta
+asta`tica
+asta`tico
+astabata`n
+astacida
+astacidae
+astacus
+astad
+astada
+astadkom
+astadkomma
+astadkommes
+astadkommit
+astado
+astaire
+astakiwi
+astalk
+astalos
+astangov
+astapovi
+astapovich
+astar
+astarboa
+astarboard
+astare
+astarin
+astarito
+astaroth
+astart
+astarte
+astartia
+astartian
+astartid
+astartidae
+astasia
+astat
+astate
+astatet
+astatic
+astatica
+astatically
+astatici
+astaticism
+astatine
+astatines
+astatist
+astatistical
+astatize
+astatizer
+astatula
+astay
+aste'ris
+aste'risque
+aste'risques
+aste`nica
+aste`nico
+asteam
+asteatos
+asteatosis
+astec
+astedade
+astedader
+asteep
+asteer
+astei`smo
+asteism
+astelic
+astell
+astely
+asten
+astenia
+aster
+asterace
+asteraceae
+asteraceous
+asterale
+asterales
+asterblu
+asterbluete
+asterell
+asterella
+astereog
+astereognosis
+asteria
+asterial
+asterias
+asteriat
+asteriated
+asteriid
+asteriidae
+asteriko
+asterikos
+asterin
+asterina
+asterini
+asterinidae
+asterioi
+asterioid
+asterion
+asterionella
+asterisco
+asterisk
+asterisked
+asterisken
+asterisks
+asterism
+asterismal
+asterismo
+asterisms
+asterix
+astern
+asternal
+asternat
+asternata
+asternia
+astero
+asteroch
+asterochiton
+asteroid
+asteroidal
+asteroide
+asteroidea
+asteroidean
+asteroiden
+asteroidenguertel
+asteroids
+asterole
+asterolepidae
+asterolepis
+asterope
+asteroph
+asterophyllite
+asterophyllites
+asterosp
+asterospondyli
+asterospondylic
+asterospondylous
+asteroxy
+asteroxylaceae
+asteroxylon
+asterozo
+asterozoa
+asters
+astersen
+asterwor
+asterwort
+astes
+asthe'ni
+asthe'nie
+asthe'nique
+asthe'niques
+asthenia
+asthenic
+asthenical
+asthenob
+asthenobiosis
+asthenobiotic
+asthenol
+asthenolith
+asthenology
+asthenop
+asthenopia
+asthenopic
+asthenos
+asthenosphere
+astheny
+asther
+asthma
+asthmas
+asthmati
+asthmatic
+asthmatical
+asthmatically
+asthmatics
+asthmatique
+asthmatiques
+asthmato
+asthmatoid
+asthme
+asthmoge
+asthmogenic
+asthore
+asthorin
+asti
+astian
+astiani
+astichou
+astichous
+asticot
+asticote
+asticoter
+asticots
+astifino
+astigitana
+astigitano
+astigmat
+astigmate
+astigmates
+astigmatic
+astigmatical
+astigmatically
+astigmatiker
+astigmatisk
+astigmatism
+astigmatisme
+astigmatismo
+astigmatizer
+astigmatometer
+astigmatoscope
+astigmatoscopy
+astigmia
+astigmis
+astigmism
+astigmo`metro
+astigmom
+astigmometer
+astigmometry
+astil
+astilbe
+astilla
+astillar
+astillazo
+astillejos
+astillero
+astillo`n
+astillosa
+astilloso
+astin
+astint
+astipula
+astipulate
+astiquag
+astiquage
+astiquer
+astir
+astite
+astle
+astley
+astloech
+astloecher
+astm
+astma
+astma-aa
+astma-aanval
+astma-aanvallen
+astmaen
+astmalij
+astmalijder
+astmalijders
+astmasig
+astmasigaret
+astmasigaretten
+astmatis
+astmatisch
+astmatische
+astmatischer
+astmatischt
+astmatisk
+astmatiske
+asto
+astomata
+astomatal
+astomato
+astomatous
+astomia
+astomous
+aston
+astonied
+astonish
+astonished
+astonishedly
+astonisher
+astonishes
+astonishing
+astonishingly
+astonishingness
+astonishment
+astonishments
+astonisht
+astonnen
+astony
+astoop
+astor
+astoreth
+astorgana
+astorgano
+astori
+astoria
+astorino
+astound
+astounda
+astoundable
+astounde
+astounded
+astoundi
+astounding
+astoundingly
+astoundm
+astoundment
+astounds
+astra
+astra`galo
+astraal
+astraca`n
+astracan
+astracanada
+astracha
+astrachan
+astraddl
+astraddle
+astraea
+astraean
+astraeid
+astraeidae
+astraeif
+astraeiform
+astragal
+astragalar
+astragalectomy
+astragali
+astragalocalcaneal
+astragalocentral
+astragalomancy
+astragalonavicular
+astragaloscaphoid
+astragalotibial
+astragals
+astragalus
+astrago
+astrain
+astrakan
+astrakanite
+astrakans
+astrakha
+astrakhan
+astral
+astrale
+astrales
+astrally
+astrals
+astrand
+astrant
+astrante
+astranter
+astranti
+astrantia
+astrantigheid
+astrants
+astrantst
+astrapho
+astraphobia
+astrapop
+astrapophobia
+astratta
+astratte
+astratti
+astratto
+astraux
+astray
+astrazio
+astrazione
+astre
+astre\ir
+astrea
+astream
+astreign
+astreignaient
+astreignais
+astreignait
+astreignant
+astreignante
+astreignantes
+astreignants
+astreigne
+astreignent
+astreignes
+astreignez
+astreigniez
+astreignions
+astreignirent
+astreignit
+astreignons
+astreind
+astreindra
+astreindrai
+astreindraient
+astreindrais
+astreindrait
+astreindras
+astreindre
+astreindrez
+astreindriez
+astreindrions
+astreindrons
+astreindront
+astreins
+astreint
+astreinte
+astreintes
+astreints
+astrer
+astres
+astri
+astri\ir
+astri`fera
+astri`fero
+astriccio`n
+astrict
+astricta
+astricti
+astriction
+astrictiva
+astrictive
+astrictively
+astrictiveness
+astrictivo
+astricto
+astrid
+astride
+astrier
+astrifer
+astriferous
+astrild
+astringe
+astringed
+astringencia
+astringency
+astringent
+astringente
+astringentes
+astringently
+astringents
+astringer
+astringes
+astringi
+astringing
+astringir
+astrit
+astrix
+astro
+astro`grafo
+astro`loga
+astro`logo
+astro`nomo
+astroalc
+astroalchemist
+astrobio
+astrobiological
+astrobiologically
+astrobiologies
+astrobiologist
+astrobiologists
+astrobiology
+astrobla
+astroblast
+astrocar
+astrocaryum
+astroche
+astrochemist
+astrochemistry
+astrochr
+astrochronological
+astrocyt
+astrocyte
+astrocytoma
+astrocytomata
+astrodia
+astrodiagnosis
+astrodom
+astrodome
+astrodyn
+astrodynamic
+astrodynamics
+astroem
+astrofel
+astroff
+astrofi`sica
+astrofi`sico
+astrofys
+astrofysikk
+astrofysisk
+astrogen
+astrogeny
+astrogli
+astroglia
+astrogno
+astrognosy
+astrogon
+astrogonic
+astrogony
+astrogra
+astrogra`fica
+astrogra`fico
+astrograph
+astrographic
+astrography
+astroid
+astroite
+astrolab
+astrolabe
+astrolabes
+astrolabical
+astrolabio
+astrolat
+astrolater
+astrolatry
+astrolit
+astrolithology
+astrolito
+astrolo`gica
+astrolo`gico
+astrolog
+astrologal
+astrologar
+astrologaster
+astrologe
+astrologen
+astrologer
+astrologers
+astrologi
+astrologi`a
+astrologian
+astrologic
+astrological
+astrologically
+astrologie
+astrologien
+astrologique
+astrologiques
+astrologisch
+astrologische
+astrologisk
+astrologist
+astrologistic
+astrologists
+astrologize
+astrologous
+astrologue
+astrologues
+astrology
+astroloo
+astroloog
+astrom
+astroman
+astromancer
+astromancy
+astromantic
+astromet
+astrometeorological
+astrometeorologist
+astrometeorology
+astrometer
+astrometrical
+astrometry
+astronau
+astronaut
+astronaute
+astronauten
+astronautene
+astronautentraining
+astronauter
+astronautes
+astronautic
+astronautical
+astronautically
+astronautics
+astronautik
+astronautique
+astronauts
+astrono`mica
+astrono`micamente
+astrono`mico
+astronom
+astronome
+astronomen
+astronomene
+astronomer
+astronomero
+astronomers
+astronomes
+astronomi
+astronomi`a
+astronomia
+astronomia`tico
+astronomiano
+astronomic
+astronomical
+astronomically
+astronomics
+astronomie
+astronomien
+astronomique
+astronomiques
+astronomisch
+astronomische
+astronomischen
+astronomisk
+astronomiske
+astronomize
+astronomy
+astronoo
+astronoom
+astropec
+astropecten
+astropectinidae
+astrophi
+astrophil
+astropho
+astrophobia
+astrophotographic
+astrophotography
+astrophotometer
+astrophotometrical
+astrophotometry
+astrophy
+astrophyllite
+astrophysical
+astrophysicist
+astrophysicists
+astrophysics
+astrophyton
+astros
+astrosa
+astrosamente
+astrosco
+astroscope
+astroscopus
+astroscopy
+astroso
+astrospe
+astrospectral
+astrospectroscopic
+astrosph
+astrosphere
+astrothe
+astrotheology
+astrovax
+astruc
+astrup
+astrusa
+astruse
+astrusi
+astruso
+astrut
+asts
+astucci
+astuccio
+astuce
+astuces
+astucia
+astucieu
+astucieuse
+astucieusement
+astucieuses
+astucieux
+astuciosa
+astucioso
+astuciou
+astucious
+astuciously
+astucity
+astur
+asturian
+asturiana
+asturianismo
+asturiano
+asturias
+asturicense
+asturio`n
+astuta
+astutamente
+astute
+astutely
+astutene
+astuteness
+astuti
+astuto
+astuzia
+astuzie
+astyanax
+astylar
+astylosp
+astylospongia
+astylost
+astylosternus
+asu
+asua
+asuae
+asuardada
+asuardado
+asuati
+asubiadero
+asubiar
+asuckin
+asudden
+asuelo
+asueta
+asueto
+asufarut
+asufuaru
+asujuu
+asuka
+asukachi
+asukagum
+asukai
+asukatam
+asukatin
+asuke
+asuki
+asuki-
+asuko
+asukomu
+asulcar
+asumadamente
+asumar
+asumbo
+asumboa
+asumbuo
+asumir
+asumomae
+asuna
+asunaro
+asuncio
+asuncio`n
+asuncion
+asuncionista
+asunder
+asungore
+asunshio
+asunsio
+asunsion
+asunta
+asunto
+asupara
+asuparag
+asupekut
+asuperug
+asupirin
+asuppim
+asur
+asura
+asuramiento
+asurar
+asurbl}
+asurbl}t
+asurbl}tt
+asurcada
+asurcado
+asurcana
+asurcano
+asurcar
+asurechi
+asuretik
+asuri
+asurini
+asurn
+asurnen
+asurvey
+asuso
+asustadiza
+asustadizo
+asustar
+asutaris
+asutekku
+asutilar
+asutorin
+asutoro
+asuvax
+asuwa
+asuwan
+asv
+asvaal
+asvaalst
+asvaalt
+asvaalte
+asvaalten
+asvale
+asvaler
+asw
+aswail
+aswan
+aswanik
+aswarm
+asway
+asweat
+aswell
+aswentel
+aswenteling
+aswentelingen
+aswim
+aswing
+aswini
+aswirl
+aswoensd
+aswoensdag
+aswoon
+aswooned
+asx
+asy
+asya
+asychron
+asychronmotor
+asyfta
+asyl
+asyla
+asylante
+asylanten
+asylet
+asyllabi
+asyllabia
+asyllabic
+asyllabical
+asylrech
+asylrecht
+asylrechte
+asylrechten
+asylrett
+asyls
+asylum
+asylums
+asymbiot
+asymbiotic
+asymboli
+asymbolia
+asymbolic
+asymbolical
+asyme'tr
+asyme'trie
+asyme'tries
+asyme'trique
+asyme'triques
+asymmetr
+asymmetri
+asymmetric
+asymmetrical
+asymmetrically
+asymmetrie
+asymmetries
+asymmetrisch
+asymmetrische
+asymmetrischen
+asymmetrisches
+asymmetrisk
+asymmetron
+asymmetry
+asympoti
+asympotic
+asymptom
+asymptomatic
+asymptomatically
+asymptop
+asymptoptic
+asymptoptical
+asymptot
+asymptote
+asymptoter
+asymptotes
+asymptotic
+asymptotical
+asymptotically
+asymptoticefficiency
+asymptotics
+asymptotique
+asymptotiques
+asymptotische
+asymptotisk
+asymtote
+asymtotes
+asymtoti
+asymtotic
+asymtotically
+asynapsi
+asynapsis
+asynapti
+asynaptic
+asynarte
+asynartete
+asynartetic
+async
+asynchro
+asynchron
+asynchrone
+asynchronen
+asynchrones
+asynchronism
+asynchronisms
+asynchronous
+asynchronously
+asynchrony
+asyncrit
+asyncritus
+asyndese
+asyndesi
+asyndesis
+asyndeta
+asyndeti
+asyndetic
+asyndetically
+asyndeto
+asyndeton
+asynergi
+asynergia
+asynergy
+asyngami
+asyngamic
+asyngamy
+asynkron
+asynkrona
+asynkronmotor
+asynkronmotoren
+asynkront
+asyntact
+asyntactic
+asyntrop
+asyntrophy
+asyoro
+asystema
+asystematic
+asystole
+asystoli
+asystolic
+asystolism
+asyura
+asyut
+asyzyget
+asyzygetic
+asz
+at
+at&t
+at59
+at60
+at61
+at62
+at63
+at64
+at65
+at66
+at67
+at68
+at69
+at70
+at71
+at74
+at75
+ata
+ata\edera
+ata\edero
+ata\er
+ata`n
+ata`vica
+ata`vico
+ata`xica
+ata`xico
+ataba
+atabaca
+atabacada
+atabacado
+atabal
+atabalear
+atabalejo
+atabalero
+atabalete
+atabalip
+atabalipa
+ataban
+atabanada
+atabanado
+atabardillada
+atabardillado
+atabe
+atabeg
+atabek
+atabernado
+atabillar
+atabladera
+atablar
+atabrine
+atacable
+atacada
+atacadera
+atacado
+atacador
+atacadora
+atacadura
+atacama
+atacaman
+atacamen
+atacamenan
+atacamenian
+atacameno
+atacamiento
+atacamit
+atacamita
+atacamite
+atacante
+atacar
+atacchi
+atacchim
+atachonada
+atachonado
+atacir
+atacola
+atacora
+atacti
+atactic
+atactifo
+atactiform
+atactime
+atad
+atada
+ataderas
+atadero
+atadijo
+atado
+atador
+atadora
+atadura
+atae
+ataekata
+ataentsi
+ataentsic
+atafagar
+atafarra
+atafea
+atafetanada
+atafetanado
+atafter
+atafu
+atafuku
+atafuta
+ataga
+atagallar
+atagata
+atagaya
+ataghan
+atagit
+atago
+atagui`a
+ataguro
+ataha
+atahara
+ataharre
+atahi
+atahigaw
+atahikas
+atahikaw
+atahona
+atahonero
+atahorma
+atahu`lla
+atahuall
+atahuallpa
+atai
+ataichi
+ataifor
+ataigal
+ataihyou
+atairar
+atairat
+ataire
+ataitan
+ataiti
+ataiyal
+atajada
+atajadamente
+atajadero
+atajadizo
+atajador
+atajadora
+atajamiento
+atajante
+atajar
+atajea
+ataji`a
+atajo
+atajuelo
+atak
+ataka
+atakahas
+atakamo
+atakapa
+atakar
+atakat
+atakawa
+atakita
+atakku
+atako
+atakora
+atakpame
+ataku
+atakuchi
+atakura
+atakuta
+atakuti
+atal
+atala
+atalador
+ataladora
+ataladrar
+atalaero
+atalajar
+atalaje
+atalan
+atalanta
+atalantar
+atalante
+atalar
+atalaya
+atalayador
+atalayadora
+atalayamiento
+atalayar
+atalayero
+atalayuela
+atalear
+atalissa
+atalla
+atalov
+atalt
+ataludar
+ataluzar
+atalvina
+atam
+atama
+atamagak
+atamagon
+atamakab
+atamakaz
+atamakin
+ataman
+atamanu
+atamasco
+atamauch
+atamauti
+atamawar
+atambor
+atameshi
+atamesi
+atami
+atamiento
+ataminam
+atamishi
+atamisi
+atamisqu
+atamisqui
+atamor
+atamosco
+atan
+atanas
+atanasia
+atanasof
+atanasoff
+atanasso
+atanassova
+atancar
+atanco
+atandador
+atandt
+atangle
+atanh
+atano
+atanor
+atanqui`a
+atanuma
+atao
+ataouat
+atap
+atapapo
+atapar
+atapierna
+ataqatig
+ataqatigiit
+ataque
+ataquiza
+ataquizar
+atar
+atara
+ataracea
+ataracear
+ataracti
+ataractic
+atarah
+ataram
+atarantada
+atarantado
+atarantamiento
+atarantapayos
+atarantar
+ataras
+atarashi
+atarasi
+ataraxia
+ataraxic
+ataraxy
+atarazana
+atarazanal
+atarazar
+atardecer
+atare
+atarea
+atarear
+atarfe
+atargati
+atargatis
+atari
+atarichi
+ataridos
+atarimae
+ataripoe
+ataris
+atarisaw
+ataritir
+atarjea
+ataroth
+atarotha
+atarothadar
+atarothaddar
+atarquinar
+atarraga
+atarragar
+atarrajar
+atarraya
+ataru
+atarugamiento
+atarugar
+atas
+atasajada
+atasajado
+atasajar
+atascada
+atascade
+atascadero
+atascado
+atascamiento
+atascar
+atasco
+atascosa
+atashi
+atashika
+atashina
+atasi
+atasika
+atasina
+atasqueri`a
+atasshuk
+atassut
+atassyuk
+atatak
+atataka
+atatakam
+atatam
+atatama
+atatame
+atatigwa
+atatlahu
+atatlahuca
+atato
+atatschi
+atatschite
+atatte
+ataturk
+atau
+atau`d
+ataudada
+ataudado
+atauji`a
+ataujiada
+ataujiado
+ataul
+ataunt
+ataura
+ataurique
+atauro
+atauru
+atavi
+atavi`o
+ataviar
+atavic
+atavique
+ataviques
+atavism
+atavisme
+atavismen
+atavismes
+atavismo
+atavisms
+atavist
+atavisti
+atavistic
+atavistically
+atavistisch
+atavistische
+atavistisk
+atavists
+atavus
+atawa
+ataxapha
+ataxaphasia
+ataxia
+ataxiagr
+ataxiagram
+ataxiagraph
+ataxiame
+ataxiameter
+ataxiaph
+ataxiaphasia
+ataxic
+ataxinom
+ataxinomic
+ataxite
+ataxonom
+ataxonomic
+ataxophe
+ataxophemia
+ataxy
+atayake
+atayal
+atayalic
+atayuu
+atazi
+atazir
+atb
+atbalmin
+atbash
+atc
+atche
+atchely
+atcher
+atcheson
+atchiev
+atchievi
+atchieving
+atchin
+atchison
+atchley
+atcmds
+atco
+atd
+atdhvaan
+atdhvaannkcse
+ate
+ate`rmana
+ate`rmano
+atea
+atear
+ateba
+atebrin
+ateca
+atechnic
+atechnical
+atechny
+atediante
+atediar
+atedo
+ateeter
+atef
+atega
+atehama
+atehame
+atehamen
+atehazur
+atei`smo
+atei`sta
+ateisme
+ateismen
+ateismi
+ateismo
+ateist
+ateisten
+ateister
+ateistis
+ateistisk
+ateisuto
+ateita
+ateje
+ateji
+atekko
+ateko
+atekome
+atekosu
+atekosur
+atelaje
+atelana
+atelecta
+atelectasis
+atelectatic
+ateleolo
+ateleological
+ateles
+atelesti
+atelestite
+atelets
+atelier
+ateliere
+atelieret
+atelierf
+atelierfest
+atelierl
+atelierleiter
+atelierm
+ateliermeisje
+ateliermeisjes
+ateliers
+ateliosi
+ateliosis
+atelje
+atellan
+atelo
+atelocar
+atelocardia
+atelocep
+atelocephalous
+ateloglo
+ateloglossia
+atelogna
+atelognathia
+atelomit
+atelomitic
+atelomye
+atelomyelia
+atelopod
+atelopodia
+atelopro
+ateloprosopia
+atelorac
+atelorachidia
+atelosto
+atelostomia
+atem
+atembera
+atemberaubenden
+atemberaubender
+atembesc
+atembeschwerde
+atemble
+atemi
+atemidor
+atemidorus
+atemlos
+atemlosi
+atemlosigkeit
+atemnot
+atemorar
+atemorizar
+atempa
+atempaus
+atempause
+atempausen
+atemperacio`n
+atemperante
+atemperar
+atempero
+atemple
+atemplea
+atempleapris
+atempora
+atemporal
+atempore
+atemporel
+atemporelle
+atemporelles
+atemporels
+atemtech
+atemtechnik
+atemuebu
+atemuebungen
+atemvorr
+atemvorrat
+atemwege
+atemzueg
+atemzuegen
+atemzug
+atemzugs
+aten
+atena
+atenacear
+atenango
+atenazada
+atenazado
+atenazar
+atencio`n
+atendalar
+atendar
+atendedor
+atendedora
+atendencia
+atender
+atendible
+atendimiento
+atene
+atenea
+atenebrarse
+atenedor
+atenei`sta
+atenencia
+ateneo
+atener
+atenie`s
+ateniense
+ateniesa
+atenige
+atenism
+atenist
+atenorada
+atenorado
+atensk
+atensyon
+atenta
+atentacio`n
+atentada
+atentadamente
+atentado
+atentamente
+atentar
+atentatoria
+atentatorio
+atento
+atenuacio`n
+atenuante
+atenuar
+ateo
+atepec
+atepocate
+ater
+aterazaw
+atercianada
+atercianado
+aterciopelada
+aterciopelado
+aterecer
+aterecimiento
+aterfa
+aterfinn
+aterfinns
+aterfjad
+aterfjadrande
+aterfors
+aterforsaljare
+aterga
+atergang
+atergar
+aterge
+atergive
+atergiven
+atergivet
+atergivn
+atergivning
+aterhopp
+aterian
+atericia
+atericiarse
+aterigen
+aterimiento
+aterinsa
+aterinsatta
+aterir
+aterkomm
+aterkommande
+aterkommer
+aterkopp
+aterkoppling
+aterkopplingen
+aterlamn
+aterlamnas
+aterling
+aterlingen
+atermoie
+atermoiement
+atermoiements
+atermoient
+atermoiera
+atermoierai
+atermoieraient
+atermoierais
+atermoierait
+atermoieras
+atermoierez
+atermoieriez
+atermoierions
+atermoierons
+atermoieront
+atermoies
+atermoya
+atermoyaient
+atermoyais
+atermoyait
+atermoyant
+atermoye
+atermoye'
+atermoye`rent
+atermoyer
+atermoyez
+atermoyi
+atermoyiez
+atermoyions
+atermoyo
+atermoyons
+aternecer
+aterrador
+aterradora
+aterrajar
+aterraje
+aterramiento
+aterrapp
+aterrapportering
+aterrar
+aterrecer
+aterrerar
+aterresa
+aterrizaje
+aterrizar
+aterronar
+aterrorizar
+atersand
+atersanda
+atersandes
+atersant
+aterse
+aterskap
+aterskapa
+aterskri
+aterskrivs
+aterspeg
+aterspegla
+aterstae
+aterstaende
+aterstal
+aterstalla
+aterstalles
+aterstar
+aterstart
+aterstod
+atertas
+ateruppl
+ateruppliva
+atervand
+atervander
+atervandsgrander
+atervinn
+atervinning
+ates
+atesaki
+atesar
+atesho
+atesino
+ateso
+atesorar
+atest
+atestacio`n
+atestada
+atestado
+atestadura
+atestamiento
+atestar
+atestiguacio`n
+atestiguamiento
+atestiguar
+atestine
+atetada
+atetado
+atetaki
+atetar
+atetillar
+ateto-ze
+atetoze
+atetsu
+atetsuke
+atetu
+atetuke
+ateuchi
+ateuchus
+ateuma
+atexisu
+atezada
+atezado
+atezamiento
+atezar
+atezi
+atezuiry
+atezuppo
+atf
+atfalati
+atferd
+atferda
+atferden
+atferdsm
+atferdsm|nster
+atfolja
+atfoljd
+atfoljda
+atfoljes
+atfoljs
+atfoljt
+atg
+atga
+atgang
+atgar
+atgard
+atgarda
+atgarder
+atglen
+ath
+athabasc
+athabasca
+athabascan
+athach
+athaiah
+athalamo
+athalamous
+athalia
+athaliah
+athalie
+athallin
+athalline
+athamant
+athamantid
+athamantis
+athanasi
+athanasia
+athanasian
+athanasianism
+athanasianist
+athanasios
+athanass
+athanassiadis
+athanassios
+athanasy
+athanor
+athapasc
+athapascan
+athapask
+athapaskan
+athar
+atharvan
+athe'e
+athe'es
+athe'ism
+athe'isme
+athecae
+athecata
+athecate
+atheism
+atheisme
+atheisms
+atheismu
+atheismus
+atheist
+atheiste
+atheisten
+atheisti
+atheistic
+atheistical
+atheistically
+atheisticalness
+atheistin
+atheists
+atheize
+atheizer
+athelia
+atheling
+athelings
+athelny
+athelsta
+athelstane
+athelsto
+athelston
+athemati
+athematic
+athen
+athena
+athenaea
+athenaeu
+athenaeum
+athenaeums
+athene
+athenea
+athenee
+athenes
+atheneum
+atheneums
+athenian
+athenianly
+athenians
+athenor
+athens
+athenske
+athenspe
+athenspeiraeus
+atheolog
+atheological
+atheologically
+atheology
+atheous
+atherice
+athericera
+athericeran
+athericerous
+atherine
+atherini
+atherinidae
+atheriog
+atheriogaea
+atheriogaean
+atheris
+atherman
+athermancy
+athermanous
+athermic
+athermou
+athermous
+atheroma
+atheromasia
+atheromata
+atheromatosis
+atheromatous
+atherosc
+atheroscleroses
+atherosclerosis
+atherosclerotic
+atherosp
+atherosperma
+atherton
+atheruru
+atherurus
+athetesi
+athetesis
+athetic
+athetize
+athetoid
+athetosi
+athetosic
+athetosis
+athicorn
+athicorng
+athing
+athirst
+athlai
+athle'ti
+athle'tique
+athle'tiques
+athle'tisme
+athle`te
+athle`tes
+athlet
+athlete
+athleteh
+athletehood
+athleten
+athletenfigur
+athletes
+athletic
+athletical
+athletically
+athleticism
+athletics
+athletik
+athletin
+athletis
+athletism
+athletoc
+athletocracy
+athlets
+athlothe
+athlothete
+athlothetes
+athodyd
+athoic
+athol
+athole
+atholspr
+atholsprings
+athony
+athor
+athort
+athos
+athpare
+athree
+athrepsi
+athrepsia
+athrepti
+athreptic
+athrill
+athrive
+athrob
+athrocyt
+athrocyte
+athrocytosis
+athrogen
+athrogenic
+athrong
+athrough
+athu
+athwal
+athwart
+athwarth
+athwarthawse
+athwarts
+athwartship
+athwartships
+athwartw
+athwartwise
+athymia
+athymic
+athymy
+athyreos
+athyreosis
+athyria
+athyrid
+athyrida
+athyridae
+athyris
+athyrium
+athyroid
+athyroidism
+athyrosi
+athyrosis
+ati
+ati`ncar
+atiahu
+atibar
+atibiante
+atibiar
+atiborrar
+atibumen
+atica
+atica-2
+atichera
+aticherak
+aticismo
+aticum
+atie
+atienten
+atientendenz
+atienza
+atieri
+atierre
+atiesar
+atiesto
+atifle
+atigrada
+atigrado
+atihkame
+atihkamekw
+atijara
+atijarero
+atik
+atikamek
+atikamekw
+atikokan
+atikokania
+atikoti
+atikum
+atikuru
+atila
+atildada
+atildado
+atildadura
+atildamiento
+atildar
+atilt
+atimelan
+atimelang
+atimon
+atin
+atina
+atinadamente
+atinar
+atinconar
+atindra
+atinente
+atinga
+atinggol
+atinggola
+atingle
+atinkle
+atino
+atip
+atiplada
+atiplado
+atiplar
+atique
+atira
+atirantar
+atirelada
+atirelado
+atiri
+atiriciarse
+atis
+atisa
+atisbador
+atisbadora
+atisbadura
+atisbar
+atisbo
+atissa
+atisuada
+atisuado
+atisut
+atisuto
+atit
+atitla
+atiu
+atiwa
+atizacandiles
+atizadero
+atizador
+atizadora
+atizar
+atizonar
+atj
+atjeeer
+atjeeers
+atjees
+atjeese
+atjeh
+atjehnes
+atjehnese
+atk
+atka
+atkan
+atkey
+atkin
+atkine
+atkins
+atkinson
+atkomlig
+atkomliga
+atkomligt
+atkomst
+atkomste
+atkomsten
+atkomster
+atkomstf
+atkomstforhold
+atkomstm
+atkomstmuligheter
+atkomstp
+atkomstproblemer
+atkomstv
+atkomstveien
+atkomstvidder
+atl
+atl-sale
+atl-sales
+atla`ntica
+atla`ntico
+atla`ntidas
+atlant
+atlanta
+atlanta-
+atlanta-asims
+atlantad
+atlantal
+atlantan
+atlantar
+atlantas
+atlante
+atlantea
+atlantean
+atlanten
+atlanter
+atlanteren
+atlanterhav
+atlanterhavet
+atlantes
+atlanti
+atlantic
+atlantica
+atlanticbeach
+atlanticcity
+atlantichighlands
+atlantick
+atlanticmine
+atlantico
+atlantid
+atlantida
+atlantides
+atlantik
+atlantik-charta
+atlantika
+atlantikkonferenzen
+atlantikkueste
+atlantikpakt
+atlantiks
+atlantikwall
+atlantiq
+atlantique
+atlantiques
+atlantis
+atlantischen
+atlantisk
+atlantiske
+atlantit
+atlantite
+atlantoa
+atlantoaxial
+atlantod
+atlantodidymus
+atlantom
+atlantomastoid
+atlantoo
+atlantoodontoid
+atlantos
+atlantosaurus
+atlantpa
+atlantpakten
+atlas
+atlasbur
+atlasburg
+atlases
+atlaset
+atlasgeb
+atlasgebirge
+atlask
+atlasken
+atlaslik
+atlaslike
+atlassen
+atlasses
+atlasvli
+atlasvlinder
+atlasvlinders
+atlatl
+atlctyap
+atlctyapt
+atlctyapt-piv-rjet
+atle
+atle`tica
+atle`tico
+atlee
+atleet
+atlet
+atleta
+atlete
+atleten
+atleti
+atletiek
+atletiekbeoefening
+atletiekwedstrijd
+atletiekwedstrijden
+atletik
+atletisc
+atletisch
+atletische
+atletischer
+atletischt
+atletisk
+atletismo
+atli
+atlig
+atloaxoi
+atloaxoid
+atloid
+atloidea
+atloidean
+atloidoa
+atloidoaxoid
+atlu
+atm
+atma
+atman
+atmane
+atmans
+atmar
+atmas
+atmen
+atmet
+atmiatri
+atmiatrics
+atmiatry
+atmid
+atmidalb
+atmidalbumin
+atmidome
+atmidometer
+atmidometry
+atminsto
+atminstone
+atmo
+atmo`sfera
+atmocaus
+atmocausis
+atmocaut
+atmocautery
+atmoclas
+atmoclastic
+atmogeni
+atmogenic
+atmograp
+atmograph
+atmologi
+atmologic
+atmological
+atmologist
+atmology
+atmolysi
+atmolysis
+atmolyza
+atmolyzation
+atmolyze
+atmolyzer
+atmomete
+atmometer
+atmometr
+atmometric
+atmometry
+atmore
+atmos
+atmosfae
+atmosfaer
+atmosfar
+atmosfe`rica
+atmosfe`rico
+atmosfee
+atmosfeer
+atmosfer
+atmosfera
+atmosfere
+atmosferen
+atmosferisch
+atmosferische
+atmosf{r
+atmosf{re
+atmosf{ren
+atmosf{risk
+atmosf{riske
+atmospha
+atmospha"re
+atmospha"rischen
+atmosphaere
+atmosphe
+atmosphe'rique
+atmosphe'riques
+atmosphe`re
+atmosphe`res
+atmosphere
+atmosphereful
+atmosphereless
+atmospheres
+atmospheric
+atmospherical
+atmospherically
+atmospherics
+atmospherology
+atmostea
+atmosteal
+atmosteo
+atmosteon
+atmung
+atmungen
+atmungso
+atmungsorgan
+atmungsorganen
+atmungsorganes
+atmungst
+atmungstherapie
+atn
+atna
+atnah
+atnebar
+atnjot
+atnjuta
+ato
+ato`mica
+ato`mico
+ato`nica
+ato`nico
+ato`nita
+ato`nito
+atoaji
+atoar
+atoashi
+atoasi
+atoato
+atoazi
+atoba
+atobangu
+atobar
+atobarai
+atoc
+atocha
+atochada
+atochado
+atochal
+atochar
+atochera
+atochero
+atochi
+atocho`n
+atochuela
+atocia
+atocinada
+atocinado
+atocinar
+atod
+atogaki
+atogama
+atohwaim
+atoikko
+atoire
+atok
+atoka
+atokaigi
+atokal
+atokata
+atokatad
+atoke
+atokin
+atokous
+atoktou
+atokuchi
+atokusar
+atokuti
+atol
+atole
+atoleadas
+atolera
+atoleri`a
+atolero
+atolillo
+atoll
+atolladal
+atolladar
+atolladero
+atollar
+atolle
+atollen
+atolls
+atolo`n
+atolondrada
+atolondradamente
+atolondrado
+atolondramiento
+atolondrar
+atom
+atomabko
+atomabkommen
+atomair
+atomaire
+atomalde
+atomalderen
+atomantr
+atomantrieb
+atomar
+atomarbe
+atomarbeit
+atomare
+atomaren
+atomatic
+atomaufr
+atomaufruestung
+atomawas
+atombeho
+atombehoerde
+atombetr
+atombetrieb
+atombev{bnet
+atombewa
+atombewaffnung
+atombomb
+atombombe
+atombomben
+atombombenabwurf
+atombombenangriff
+atombombenproduktion
+atombombens
+atombombenversuch
+atombomber
+atombren
+atombrennstoff
+atomdrev
+atomdrevne
+atomdrif
+atomdrift
+atomd|de
+atomd|den
+atome
+atomecer
+atomecha
+atomechanics
+atomen
+atomener
+atomenergi
+atomenergiebehoerde
+atomenergiekommission
+atomenergien
+atomenergiens
+atomenergieprojekte
+atomer
+atomerg
+atomerne
+atomernes
+atomers
+atomes
+atomet
+atomets
+atomexpl
+atomexplosionen
+atomfell
+atomfellesskap
+atomflug
+atomflugzeugtraeger
+atomfors
+atomforscher
+atomforschers
+atomforschung
+atomforschungen
+atomforskning
+atomforskningen
+atomforskningens
+atomfrag
+atomfragen
+atomgeme
+atomgemeinschaft
+atomgese
+atomgesetz
+atomi
+atomi`stica
+atomi`stico
+atomic
+atomica
+atomical
+atomically
+atomicci
+atomiccity
+atomiche
+atomici
+atomicia
+atomician
+atomicis
+atomicism
+atomicit
+atomicity
+atomico
+atomics
+atomies
+atomifer
+atomiferous
+atomigak
+atomikku
+atomique
+atomiques
+atomir
+atomisa
+atomisai
+atomisaient
+atomisait
+atomisan
+atomisant
+atomisat
+atomisation
+atomisch
+atomische
+atomise
+atomise'
+atomise'e
+atomise'es
+atomise's
+atomise`
+atomise`rent
+atomised
+atomisen
+atomisent
+atomiser
+atomisera
+atomiseraient
+atomiserait
+atomisere
+atomiserende
+atomiseront
+atomisert
+atomises
+atomiseu
+atomiseur
+atomiseurs
+atomisin
+atomising
+atomism
+atomisme
+atomismo
+atomisms
+atomist
+atomista
+atomiste
+atomisten
+atomister
+atomisterne
+atomisternes
+atomistes
+atomisti
+atomistic
+atomistical
+atomistically
+atomistics
+atomistisch
+atomistische
+atomistiske
+atomists
+atomity
+atomium
+atomizacio`n
+atomizar
+atomizat
+atomization
+atomize
+atomized
+atomizer
+atomizers
+atomizes
+atomizin
+atomizing
+atomkerne
+atomkernen
+atomkernens
+atomkerner
+atomkernernes
+atomkomi
+atomkomitee
+atomkomitees
+atomkraf
+atomkraft
+atomkraften
+atomkraftverk
+atomkraftverket
+atomkraftverkstasjonen
+atomkraftv{rk
+atomkraftwerke
+atomkraftwerken
+atomkraftwerkes
+atomkrie
+atomkriegs
+atomkriegskatastrophe
+atomkrig
+atomkrigen
+atoml{ren
+atommaec
+atommaechte
+atommissil
+atommissiler
+atommode
+atommodell
+atommuni
+atommunition
+atomo
+atomodor
+atomolog
+atomology
+atomphys
+atomphysik
+atompilz
+atompoli
+atompolitik
+atompote
+atompotential
+atomrake
+atomraketen
+atomreak
+atomreaktor
+atomreaktors
+atoms
+atomschi
+atomschirm
+atomspaltning
+atomsper
+atomsperrvertrag
+atomspha
+atomsphaere
+atomspre
+atomsprengkoepfe
+atomsprengkopf
+atomsprengsatz
+atomstop
+atomstopp
+atomstra
+atomstrahlen
+atomstre
+atomstreitkraft
+atomteori
+atomteorien
+atomteoriens
+atomtest
+atomtests
+atomu
+atomub}d
+atomvekt
+atomvekta
+atomvers
+atomversuch
+atomversuchsuebungen
+atomvert
+atomvertrag
+atomv}ben
+atomv}pe
+atomv}pen
+atomv}pn
+atomv}pnene
+atomwaff
+atomwaffe
+atomwaffenbegrenzung
+atomwaffenherstellung
+atomwaffenversuche
+atomweta
+atomwiss
+atomwissenschaftler
+atomy
+atomzeit
+atomzeitalter
+atomzeitalters
+atomzers
+atomzerstruemmerung
+atona
+atonable
+atonal
+atonalidad
+atonalis
+atonalism
+atonalistic
+atonalit
+atonality
+atonally
+atonalt
+atondar
+atone
+atoneabl
+atoneable
+atoned
+atonemen
+atonement
+atonements
+atonenes
+atoneness
+atoner
+atoners
+atones
+atong
+atoni
+atoni`a
+atonia
+atonic
+atonicit
+atonicity
+atonics
+atonie
+atonies
+atoning
+atoningl
+atoningly
+atonomat
+atonori
+atontadamente
+atontamiento
+atontar
+atontecer
+atontolinar
+atony
+atooi
+atoom
+atoombom
+atoombommen
+atoomene
+atoomenergie
+atoomgew
+atoomgewicht
+atoomgewichten
+atoomker
+atoomkern
+atoomkernen
+atoompje
+atoompjes
+atoomspl
+atoomsplitsing
+atoomthe
+atoomtheorie
+atooshi
+atoosi
+atop
+atopadiza
+atopadizo
+atophan
+atopic
+atopile
+atopite
+atopy
+atoque
+atora
+atoradamente
+atorai
+atorakus
+atorakut
+atorakyu
+atoramiento
+atoranda
+atorante
+atorar
+atorasu
+atorcer
+atordecer
+atordecimiento
+atorgar
+atori
+atoribyu
+atorie
+atormecer
+atormecimiento
+atormentadamente
+atormentador
+atormentadora
+atormentante
+atormentar
+atornillador
+atornillar
+atoro
+atoropin
+atorozonarse
+atorra
+atorrante
+atorti
+atortolar
+atortorar
+atortujar
+atosaki
+atosaku
+atoshima
+atosigador
+atosigadora
+atosigamiento
+atosigar
+atosimat
+atossa
+atosukos
+atotaki
+atoti
+atotonil
+atotonilco
+atotori
+atotsugi
+atotugi
+atou
+atoui
+atouna
+atour
+atours
+atout
+atouts
+atoxic
+atoxicar
+atoxyl
+atoyaku
+atozan
+atozanki
+atozisar
+atozusa
+atozusar
+atp
+atpar
+atpco
+atpoints
+atprs
+atps
+atputhar
+atputharajah
+atq
+atr
+atra
+atra`s
+atrabajada
+atrabajado
+atrabajar
+atrabancar
+atrabanco
+atrabila
+atrabilaire
+atrabilaires
+atrabilarian
+atrabilarious
+atrabili
+atrabiliar
+atrabiliaria
+atrabiliario
+atrabiliarious
+atrabiliary
+atrabiliosa
+atrabilioso
+atrabilious
+atrabiliousness
+atrabilis
+atracada
+atracadero
+atracar
+atraccio`n
+atrachea
+atracheate
+atraco
+atraco`n
+atractas
+atractaspis
+atractiva
+atractivo
+atractriz
+atraer
+atrafagar
+atragantar
+atragene
+atragon
+atrai`ble
+atraicionar
+atraidorada
+atraidoradamente
+atraidorado
+atrail
+atraillar
+atraimiento
+atrament
+atramental
+atramentary
+atramento
+atramentosa
+atramentoso
+atramentous
+atrampar
+atramuz
+atrancar
+atranco
+atranque
+atrapamoscas
+atrapar
+atrasada
+atrasado
+atrasamiento
+atrasar
+atraso
+atrato
+atraumat
+atraumatic
+atravesa\o
+atravesada
+atravesado
+atravesador
+atravesadora
+atravesar
+atravesi`a
+atrayente
+atrazar
+atraznalar
+atrc
+atrebate
+atrebates
+atregar
+atreguada
+atreguadamente
+atreguado
+atreguar
+atreides
+atremata
+atremato
+atrematous
+atremble
+atrenzo
+atrepsy
+atreptic
+atresia
+atresic
+atresnalar
+atresy
+atretic
+atreudar
+atreus
+atrevencia
+atrever
+atrevida
+atrevidamente
+atrevido
+atreviente
+atrevimiento
+atreyu
+atri
+atri`peda
+atri`pedo
+atria
+atriaca
+atrial
+atriaquero
+atribucio`n
+atribuir
+atribulacio`n
+atribuladamente
+atribular
+atributar
+atributiva
+atributivo
+atributo
+atrichia
+atrichos
+atrichosis
+atrichou
+atrichous
+atricio`n
+atrickle
+atridean
+atriehus
+atriense
+atrienses
+atriensi
+atriensis
+atrier
+atrii
+atril
+atrilera
+atrincheramiento
+atrincherar
+atrio
+atriocoe
+atriocoelomic
+atriopor
+atrioporal
+atriopore
+atrios
+atrioven
+atrioventricular
+atrip
+atriplex
+atrirrostra
+atrirrostro
+atristar
+atrita
+atrito
+atrium
+atriumet
+atriumg}rd
+atriumhu
+atriumhus
+atriumhuset
+atriums
+atro
+atro`fica
+atro`fico
+atroahy
+atroai
+atroari
+atroce
+atroceme
+atrocement
+atroces
+atrocha
+atrochal
+atrochar
+atrochou
+atrochous
+atroci
+atrocidad
+atrociou
+atrocious
+atrociously
+atrociousness
+atrocita
+atrocite
+atrocite'
+atrocite's
+atrociti
+atrocities
+atrocity
+atrofi
+atrofia
+atrofiar
+atrofie
+atrofiee
+atrofieerde
+atrofieerden
+atrofien
+atrofier
+atrofieren
+atrojar
+atrolact
+atrolactic
+atrompetada
+atrompetado
+atronada
+atronadamente
+atronado
+atronador
+atronadora
+atronadura
+atronamiento
+atronante
+atronar
+atronerar
+atropa
+atropace
+atropaceous
+atropada
+atropado
+atropal
+atropami
+atropamine
+atropar
+atropellada
+atropelladamente
+atropellado
+atropellador
+atropelladora
+atropellamiento
+atropellar
+atropello
+atrophia
+atrophiaient
+atrophiais
+atrophiait
+atrophiant
+atrophiated
+atrophic
+atrophie
+atrophie'
+atrophie'e
+atrophie'es
+atrophie's
+atrophie`rent
+atrophied
+atrophient
+atrophier
+atrophiera
+atrophierai
+atrophieraient
+atrophierais
+atrophierait
+atrophieras
+atrophierez
+atrophieriez
+atrophierions
+atrophierons
+atrophieront
+atrophies
+atrophiez
+atrophii
+atrophiiez
+atrophiions
+atrophio
+atrophions
+atrophod
+atrophoderma
+atrophy
+atrophyi
+atrophying
+atropia
+atropic
+atropida
+atropidae
+atropina
+atropine
+atropini
+atropinism
+atropinization
+atropinize
+atropins
+atropism
+atropos
+atropous
+atrorube
+atrorubent
+atrosang
+atrosanguineous
+atroscin
+atroscine
+atroth
+atrous
+atrowari
+atroz
+atrozmente
+atrp
+atruahi
+atruchada
+atruchado
+atruendo
+atruhanada
+atruhanado
+atry
+atrypa
+ats
+atsahuac
+atsahuaca
+atsako
+atsam
+atsang
+atsangba
+atsangbangwa
+atscholi
+atse
+atsei
+atshe
+atshi
+atsi
+atsien
+atsilima
+atsimaru
+atsina
+atsipawa
+atsiri
+atsized
+atskilda
+atskilj
+atskille
+atskillelse
+atskillelsen
+atskiller
+atskilli
+atskillig
+atskilliga
+atskillige
+atskilligt
+atskilt
+atskilte
+atso
+atsor
+atspre
+atspredd
+atspredde
+atsprede
+atspredelse
+atspredelsen
+atspredt
+atspredte
+atstadig
+atstadige
+atstreib
+atstreibendes
+atsu
+atsuatsu
+atsubets
+atsubott
+atsude
+atsuden
+atsuen
+atsuga
+atsugami
+atsugawo
+atsugesh
+atsugesy
+atsugewi
+atsugi
+atsugiri
+atsugish
+atsugisi
+atsuguru
+atsuhiko
+atsuhiro
+atsui
+atsuji
+atsuk
+atsuka
+atsukae
+atsukai
+atsukaid
+atsukaik
+atsukais
+atsukama
+atsukan
+atsukao
+atsukat
+atsukau
+atsukaw
+atsukesh
+atsukesi
+atsukkur
+atsuko
+atsukuru
+atsum
+atsuma
+atsumare
+atsumari
+atsume
+atsumi
+atsumich
+atsumion
+atsumori
+atsumyak
+atsunai
+atsunaka
+atsunobu
+atsunor
+atsunyuu
+atsuo
+atsurae
+atsuraem
+atsureki
+atsuryok
+atsus
+atsusa
+atsusabu
+atsush
+atsushi
+atsushim
+atsushio
+atsusi
+atsusimo
+atsusio
+atsusiok
+atsuta
+atsutaku
+atsuyuki
+atsuzash
+atsuzi
+atsy
+att
+atta
+attablan
+attablant
+attable'
+attable'e
+attable'es
+attable's
+attabler
+attabu
+attacapa
+attacapan
+attacca
+attaccai
+attaccam
+attaccammo
+attaccan
+attaccando
+attaccano
+attaccar
+attaccare
+attaccas
+attaccasse
+attaccassi
+attaccaste
+attaccasti
+attaccat
+attaccata
+attaccate
+attaccati
+attaccato
+attaccav
+attaccava
+attaccavi
+attaccavo
+attacche
+attacchera
+attacchero
+attacchi
+attacchino
+attacco
+attach
+attach
+attacha
+attachab
+attachable
+attachableness
+attachai
+attachaient
+attachais
+attachait
+attachan
+attachant
+attachante
+attachantes
+attachants
+attache
+attache'
+attache'-case
+attache'e
+attache'es
+attache's
+attache's-cases
+attache`
+attache`rent
+attached
+attachedly
+attachee
+attacheen
+attachees
+attachem
+attachement
+attachements
+attachen
+attachent
+attacher
+attachera
+attacherai
+attacheraient
+attacherais
+attacherait
+attacheras
+attacherez
+attacheriez
+attacherions
+attacherons
+attacheront
+attachers
+attaches
+attacheship
+attachez
+attachie
+attachiez
+attachin
+attaching
+attachio
+attachions
+attachme
+attachment
+attachments
+attachon
+attachons
+attack
+attackab
+attackable
+attacke
+attacked
+attacken
+attacker
+attackers
+attackie
+attackierten
+attackin
+attacking
+attackingly
+attacks
+attacoli
+attacolite
+attacus
+attagen
+attaghan
+attaglia
+attai
+attaie
+attain
+attainab
+attainability
+attainable
+attainableness
+attainably
+attaind
+attainde
+attainder
+attainders
+attaine
+attained
+attainer
+attainers
+attaines
+attainin
+attaining
+attainme
+attainment
+attainments
+attains
+attaint
+attainte
+attainted
+attainti
+attainting
+attaintm
+attaintment
+attaints
+attaintu
+attainture
+attaka
+attakar
+attakk
+attakker
+attakkere
+attakkerte
+attakket
+attalea
+attaleh
+attalia
+attalid
+attalla
+attalus
+attama
+attame
+attanasi
+attanasio
+attapu
+attapulg
+attapulgus
+attaqua
+attaquai
+attaquaient
+attaquais
+attaquait
+attaquan
+attaquant
+attaquants
+attaque
+attaque'
+attaque'e
+attaque'es
+attaque's
+attaque`
+attaque`rent
+attaquen
+attaquent
+attaquer
+attaquera
+attaquerai
+attaqueraient
+attaquerais
+attaquerait
+attaqueras
+attaquerez
+attaqueriez
+attaquerions
+attaquerons
+attaqueront
+attaques
+attaquez
+attaquie
+attaquiez
+attaquio
+attaquions
+attaquon
+attaquons
+attar
+attarchi
+attard
+attarda
+attardai
+attardaient
+attardais
+attardait
+attardan
+attardant
+attarde
+attarde'
+attarde'e
+attarde'es
+attarde's
+attarde`
+attarde`rent
+attarden
+attardent
+attarder
+attardera
+attarderai
+attarderaient
+attarderais
+attarderait
+attarderas
+attarderez
+attarderiez
+attarderions
+attarderons
+attarderont
+attardes
+attardez
+attardie
+attardiez
+attardio
+attardions
+attardon
+attardons
+attarea
+attargul
+attari
+attarima
+attars
+attask
+attatche
+attatched
+attatches
+attatchi
+attatching
+attaturk
+attaway
+attaya
+attayal
+atte
+atte'nua
+atte'nuaient
+atte'nuais
+atte'nuait
+atte'nuant
+atte'nuante
+atte'nuantes
+atte'nuants
+atte'nuation
+atte'nuations
+atte'nue
+atte'nue'
+atte'nue'e
+atte'nue'es
+atte'nue's
+atte'nue`rent
+atte'nuent
+atte'nuer
+atte'nuera
+atte'nuerai
+atte'nueraient
+atte'nuerais
+atte'nuerait
+atte'nueras
+atte'nuerez
+atte'nueriez
+atte'nuerions
+atte'nuerons
+atte'nueront
+atte'nues
+atte'nuez
+atte'nui
+atte'nuiez
+atte'nuions
+atte'nuo
+atte'nuons
+attegger
+atteggera
+atteggerai
+atteggerei
+atteggero
+atteggi
+atteggia
+atteggiai
+atteggiamo
+atteggiano
+atteggiare
+atteggiata
+atteggiate
+atteggiati
+atteggiato
+atteggiava
+atteggiavi
+atteggiavo
+atteggin
+atteggino
+atteggio
+atteigna
+atteignaient
+atteignais
+atteignait
+atteignant
+atteigne
+atteignent
+atteignes
+atteignez
+atteigni
+atteigniez
+atteignions
+atteignirent
+atteignit
+atteigno
+atteignons
+atteindr
+atteindra
+atteindrai
+atteindraient
+atteindrais
+atteindrait
+atteindras
+atteindre
+atteindrez
+atteindriez
+atteindrions
+atteindrons
+atteindront
+atteins
+atteint
+atteinte
+atteintes
+atteints
+attelage
+attelages
+attelant
+attele'
+attele'e
+attele'es
+attele's
+atteler
+attelle
+attelles
+attempat
+attempata
+attempate
+attempati
+attempato
+attemper
+attemperament
+attemperance
+attemperate
+attemperately
+attemperation
+attemperator
+attempered
+attempt
+attempta
+attemptability
+attemptable
+attempte
+attempted
+attempter
+attempters
+attempti
+attempting
+attemptl
+attemptless
+attempts
+atten
+attenant
+attenante
+attenantes
+attenants
+attenbor
+attenborough
+attend
+attendai
+attendaient
+attendais
+attendait
+attendan
+attendance
+attendances
+attendancy
+attendant
+attendantly
+attendants
+attende
+attended
+attendee
+attendees
+attendel
+attendelen
+attenden
+attendent
+attender
+attendere
+attenderingslijsten
+attenders
+attendes
+attendez
+attendib
+attendibile
+attendie
+attendiez
+attendin
+attending
+attendingly
+attendio
+attendions
+attendir
+attendirent
+attendit
+attendme
+attendment
+attendo
+attendon
+attendons
+attendra
+attendrai
+attendraient
+attendrais
+attendrait
+attendras
+attendre
+attendress
+attendrez
+attendri
+attendrie
+attendries
+attendriez
+attendrions
+attendrir
+attendrira
+attendrirai
+attendriraient
+attendrirais
+attendrirait
+attendriras
+attendrirent
+attendrirez
+attendririez
+attendririons
+attendrirons
+attendriront
+attendris
+attendrissaient
+attendrissais
+attendrissait
+attendrissant
+attendrissante
+attendrissantes
+attendrissants
+attendrisse
+attendrissement
+attendrissements
+attendrissent
+attendrisses
+attendrisseur
+attendrisseurs
+attendrissez
+attendrissiez
+attendrissions
+attendrissons
+attendrit
+attendro
+attendrons
+attendront
+attends
+attendu
+attendue
+attendues
+attendus
+attensit
+attensity
+attent
+attenta
+attentae
+attentaeter
+attentaeters
+attentai
+attentaient
+attentais
+attentait
+attentam
+attentammo
+attentan
+attentando
+attentano
+attentant
+attentar
+attentare
+attentas
+attentasse
+attentassi
+attentaste
+attentasti
+attentat
+attentata
+attentate
+attentater
+attentatet
+attentati
+attentatmanden
+attentatmannen
+attentatmennene
+attentato
+attentatoire
+attentatoires
+attentats
+attentatsdrohungen
+attentatsopfer
+attentatsserie
+attentatsversuch
+attentattrusler
+attentav
+attentava
+attentavi
+attentavo
+attente
+attente'
+attente`
+attente`rent
+attenten
+attentent
+attenter
+attentera
+attenterai
+attenteraient
+attenterais
+attenterait
+attenteras
+attenterei
+attenterez
+attenteriez
+attenterions
+attentero
+attenterons
+attenteront
+attentes
+attentez
+attenti
+attentia
+attentiamo
+attentiate
+attentie
+attenties
+attentiez
+attentif
+attentifs
+attentin
+attentino
+attentio
+attention
+attentional
+attentionality
+attentionne'
+attentionne'e
+attentionne'es
+attentionne's
+attentions
+attentis
+attentisme
+attentiste
+attentistes
+attentiv
+attentive
+attentively
+attentivement
+attentiveness
+attentives
+attently
+attento
+attenton
+attentons
+attenuab
+attenuable
+attenuan
+attenuant
+attenuat
+attenuate
+attenuated
+attenuates
+attenuating
+attenuation
+attenuations
+attenuative
+attenuator
+attenuators
+attenzio
+attenzione
+attenzioni
+atten}ri
+atten}ring
+atter
+atterbur
+atterbury
+attercop
+attercro
+attercrop
+attergl|
+attergl|yma
+attergl|yme
+atterhal
+atterhald
+atterhaldet
+atteridg
+atteridge
+attermin
+atterminal
+attermine
+attermined
+atterminement
+attern
+atterra
+atterrag
+atterraggio
+atterrai
+atterraient
+atterrais
+atterrait
+atterram
+atterrammo
+atterran
+atterrando
+atterrano
+atterrant
+atterrante
+atterrantes
+atterrants
+atterrar
+atterrare
+atterras
+atterrasse
+atterrassi
+atterraste
+atterrasti
+atterrat
+atterrata
+atterrate
+atterrati
+atterrato
+atterrav
+atterrava
+atterravi
+atterravo
+atterre
+atterre'
+atterre'e
+atterre'es
+atterre's
+atterre`
+atterre`rent
+atterren
+atterrent
+atterrer
+atterrera
+atterrerai
+atterreraient
+atterrerais
+atterrerait
+atterreras
+atterrerei
+atterrerez
+atterreriez
+atterrerions
+atterrero
+atterrerons
+atterreront
+atterres
+atterrez
+atterri
+atterria
+atterriamo
+atterriate
+atterrie
+atterriez
+atterrin
+atterrino
+atterrio
+atterrions
+atterrir
+atterrira
+atterrirai
+atterriraient
+atterrirais
+atterrirait
+atterriras
+atterrirent
+atterrirez
+atterririez
+atterririons
+atterrirons
+atterriront
+atterris
+atterrissage
+atterrissages
+atterrissaient
+atterrissais
+atterrissait
+atterrissant
+atterrisse
+atterrissent
+atterrisses
+atterrissez
+atterrissiez
+atterrissions
+atterrissons
+atterrit
+atterro
+atterron
+atterrons
+attersyn
+attery
+attesa
+attese
+attesi
+attest
+attesta
+attestab
+attestable
+attestai
+attestaient
+attestais
+attestait
+attestan
+attestant
+attestas
+attestasjon
+attestasjonen
+attestat
+attestata
+attestate
+attestati
+attestatie
+attestaties
+attestation
+attestations
+attestative
+attestato
+attestator
+attestav
+attestavskrifter
+atteste
+atteste'
+atteste'e
+atteste'es
+atteste's
+atteste`
+atteste`rent
+attested
+attestee
+attesteer
+attesteerde
+attesteerden
+attesteert
+attesten
+attestent
+attester
+attestera
+attesterai
+attesteraient
+attesterais
+attesterait
+attesteras
+attestere
+attesteren
+attesterer
+attesterez
+attesteriez
+attesterions
+attesterons
+attesteront
+attesters
+attestert
+attesterte
+attestes
+attestez
+attestie
+attestiez
+attestin
+attesting
+attestio
+attestions
+attestiv
+attestive
+atteston
+attestons
+attestor
+attestors
+attests
+attfield
+attf|re
+attf|rin
+attf|ring
+attf|ringa
+attf|ringen
+attf|ringsapparat
+attf|ringsinstitusjoner
+attf|ringskonsulenten
+attf|ringssektoren
+attf|ringsutvalg
+attf|ron
+attf|rongstjenesten
+attf|rt
+atti
+attic
+attica
+attical
+atticion
+atticionic
+atticism
+atticist
+atticize
+atticoma
+atticomastoid
+attics
+atticus
+attid
+attidae
+attie
+attie'di
+attie'dir
+attifer
+attiger
+attigua
+attigue
+attigui
+attiguo
+attika
+attiki
+attila
+attili
+attilio
+attilla
+attillat
+attillata
+attillate
+attillati
+attillato
+attimewk
+attimi
+attimo
+attinent
+attinente
+attinenti
+attinge
+attingen
+attingence
+attingency
+attingent
+attinger
+attingere
+attino
+attio
+attionde
+attiotal
+attira
+attirai
+attiraie
+attiraient
+attirail
+attirails
+attirais
+attirait
+attiramm
+attirammo
+attiranc
+attirance
+attirand
+attirando
+attirano
+attirant
+attirante
+attirantes
+attirants
+attirare
+attiraro
+attirarono
+attirass
+attirasse
+attirassi
+attirast
+attiraste
+attirasti
+attirata
+attirate
+attirati
+attirato
+attirava
+attiravamo
+attiravano
+attiravate
+attiravi
+attiravo
+attire
+attire'
+attire'e
+attire'es
+attire's
+attire`r
+attire`rent
+attired
+attireme
+attirement
+attirent
+attirer
+attirera
+attirerai
+attireraient
+attirerais
+attirerait
+attireras
+attirere
+attirerei
+attireremo
+attirerete
+attirerez
+attireri
+attireriez
+attirerions
+attirero
+attirerons
+attireront
+attires
+attirez
+attiri
+attiriam
+attiriamo
+attiriat
+attiriate
+attiriez
+attiring
+attirino
+attirion
+attirions
+attiro
+attirons
+attisa
+attisaie
+attisaient
+attisais
+attisait
+attisant
+attise
+attise'
+attise'e
+attise'es
+attise's
+attise`r
+attise`rent
+attisent
+attiser
+attisera
+attiserai
+attiseraient
+attiserais
+attiserait
+attiseras
+attisere
+attiserez
+attiseri
+attiseriez
+attiserions
+attisero
+attiserons
+attiseront
+attises
+attisez
+attisiez
+attision
+attisions
+attisons
+attitigo
+attitigon
+attitre'
+attitre'e
+attitre'es
+attitre's
+attitude
+attituden
+attitudes
+attitudi
+attitudina
+attitudinal
+attitudinarian
+attitudinarianism
+attitudini
+attitudinize
+attitudinized
+attitudinizer
+attitudinizes
+attitudinizing
+attitudino
+attitued
+attituede
+attityd
+attityde
+attityden
+attityder
+attiva
+attivata
+attivate
+attivati
+attivato
+attivazi
+attivazione
+attivazioni
+attive
+attivi
+attivita
+attivo
+attiwend
+attiwendaronk
+attlebor
+attleboro
+attlege
+attles
+attmed
+attn
+attntrp
+atto
+attock
+attogram
+attoho-m
+attohom
+attohomu
+attoiuma
+attoko
+attollen
+attollent
+attom
+attonde
+attoneme
+attonement
+attopars
+attoparsec
+attopeu
+attore
+attori
+attorn
+attorney
+attorneydom
+attorneyism
+attorneys
+attorneyship
+attornin
+attorning
+attornme
+attornment
+attorno
+attou
+attouat
+attouche
+attouchement
+attouchements
+attoutek
+attover
+attp}
+attp}til
+attract
+attracta
+attractability
+attractable
+attractableness
+attractant
+attractants
+attracte
+attracted
+attracter
+attracteur
+attracteurs
+attracti
+attractie
+attractiepark
+attracties
+attractif
+attractifs
+attractile
+attracting
+attractingly
+attraction
+attractionally
+attractions
+attractive
+attractively
+attractiveness
+attractives
+attractivity
+attracto
+attractor
+attractors
+attracts
+attraent
+attraente
+attraenti
+attrahen
+attrahent
+attraher
+attrahera
+attrahere
+attrahert
+attrait
+attraits
+attraksj
+attraksjon
+attraksjonen
+attraksjonene
+attraksjoner
+attrakti
+attraktion
+attraktionen
+attraktiv
+attraktiva
+attraktive
+attraktiven
+attraktiver
+attraktivste
+attraktivt
+attrap
+attrapa
+attrapai
+attrapaient
+attrapais
+attrapait
+attrapan
+attrapant
+attrape
+attrape'
+attrape'e
+attrape'es
+attrape's
+attrape-
+attrape-nigaud
+attrape-nigauds
+attrape`
+attrape`rent
+attrapee
+attrapeer
+attrapeerde
+attrapeerden
+attrapeert
+attrapen
+attrapent
+attrapenversuche
+attraper
+attrapera
+attraperai
+attraperaient
+attraperais
+attraperait
+attraperas
+attraperen
+attraperez
+attraperiez
+attraperions
+attraperons
+attraperont
+attrapes
+attrapez
+attrapie
+attrapiez
+attrapio
+attrapions
+attrapon
+attrapons
+attrapp
+attrappe
+attrappere
+attratti
+attrattiva
+attrattive
+attraver
+attraversa
+attraversi
+attraverso
+attrayan
+attrayant
+attrayante
+attrayantes
+attrayants
+attrazio
+attrazione
+attrazioni
+attre
+attrempe
+attremper
+attrezza
+attrezzai
+attrezzano
+attrezzare
+attrezzata
+attrezzate
+attrezzati
+attrezzato
+attrezzava
+attrezzavi
+attrezzavo
+attrezze
+attrezzera
+attrezzero
+attrezzi
+attrezzino
+attrezzo
+attrib
+attribua
+attribuaient
+attribuais
+attribuait
+attribuant
+attribue
+attribue'
+attribue'e
+attribue'es
+attribue's
+attribue`rent
+attribuent
+attribuer
+attribuera
+attribuerai
+attribueraient
+attribuerais
+attribuerait
+attribueras
+attribuerez
+attribueriez
+attribuerions
+attribuerons
+attribueront
+attribues
+attribuez
+attribui
+attribuiez
+attribuions
+attribuire
+attribuito
+attribuo
+attribuons
+attribus
+attribusjon
+attribut
+attributable
+attributafh{ngighed
+attributafh{ngigheden
+attributal
+attribute
+attributebytreatment
+attributed
+attributen
+attributer
+attributes
+attributgrammatik
+attributgrammatikkens
+attributgrammatikker
+attributi
+attributief
+attributieve
+attributing
+attribution
+attributions
+attributiv
+attributive
+attributively
+attributiveness
+attributives
+attributivt
+attributlinien
+attributnavn
+attributnavne
+attributnavnene
+attributo
+attributoplysningerne
+attributs
+attributstak
+attributstakken
+attributsymbol
+attributsymboler
+attributt
+attributten
+attributter
+attributterne
+attributternes
+attributtet
+attributtets
+attributtildeling
+attributv{rdi
+attributv{rdier
+attributv{rdierne
+attributv{rditildeling
+attribuu
+attribuut
+attribuutgrammatika's
+attrice
+attrici
+attrist
+attrista
+attristaient
+attristais
+attristait
+attristant
+attristante
+attristantes
+attristants
+attriste
+attriste'
+attriste'e
+attriste'es
+attriste's
+attriste`rent
+attristent
+attrister
+attristera
+attristerai
+attristeraient
+attristerais
+attristerait
+attristeras
+attristerez
+attristeriez
+attristerions
+attristerons
+attristeront
+attristes
+attristez
+attristi
+attristiez
+attristions
+attristo
+attristons
+attrite
+attrited
+attriten
+attriteness
+attritio
+attrition
+attritional
+attritiv
+attritive
+attritus
+attroupa
+attroupaient
+attroupait
+attroupant
+attroupe
+attroupe'
+attroupe'e
+attroupe'es
+attroupe's
+attroupe`rent
+attroupement
+attroupements
+attroupent
+attrouper
+attroupera
+attrouperaient
+attrouperait
+attrouperont
+attr}
+attr}en
+attr}ver
+attr}verdig
+attsuu
+attu
+attua
+attuabil
+attuabile
+attuabili
+attuai
+attuale
+attuali
+attualit
+attualita
+attualiz
+attualizzazione
+attualme
+attualmente
+attuammo
+attuan
+attuando
+attuano
+attuare
+attuaron
+attuarono
+attuasse
+attuassero
+attuassi
+attuassimo
+attuaste
+attuasti
+attuata
+attuate
+attuati
+attuato
+attuava
+attuavam
+attuavamo
+attuavan
+attuavano
+attuavat
+attuavate
+attuavi
+attuavo
+attuera
+attuerai
+attueran
+attueranno
+attuereb
+attuerebbe
+attuerei
+attuerem
+attueremmo
+attueremo
+attueres
+attuereste
+attueresti
+attueret
+attuerete
+attuero
+attui
+attuiamo
+attuiate
+attuino
+attune
+attuned
+attunely
+attuneme
+attunement
+attunes
+attuning
+attuo
+attuu
+attved
+atty
+attyaku
+att}t
+att}tn{r
+att}tn{ring
+atu
+atu`n
+atua
+atuami
+atuan
+atuatu
+atubetu
+atubotta
+atude
+atuden
+atue
+atuen
+atuence
+atuendo
+atuentse
+atufada
+atufadamente
+atufado
+atufamiento
+atufar
+atufo
+atuga
+atugami
+atugawo
+atugesho
+atugesyo
+atugi
+atugiri
+atugishi
+atugishu
+atugisi
+atugisiz
+atugurus
+atuhiko
+atuhiro
+atui
+atuji
+atuk
+atuka
+atukae
+atukai
+atukaida
+atukaika
+atukaisy
+atukamas
+atukan
+atukao
+atukat
+atukau
+atukaw
+atukeshi
+atukesi
+atukkuru
+atuko
+atukurus
+atul
+atule
+atum
+atuma
+atumare
+atumari
+atumble
+atume
+atumecerse
+atumecimiento
+atumfuor
+atumfuorkasa
+atumi
+atumicho
+atumions
+atumno
+atumori
+atumultuar
+atumyaku
+atun
+atunai
+atunakat
+atunara
+atune
+atunera
+atunero
+atunobu
+atunor
+atunyuu
+atuo
+atuot
+atura
+aturada
+aturadamente
+aturador
+aturadora
+aturae
+aturaemu
+aturar
+aturbonada
+aturbonado
+aturdida
+aturdidamente
+aturdido
+aturdidor
+aturdidora
+aturdimiento
+aturdir
+ature
+atureki
+aturekio
+aturquesada
+aturquesado
+aturrar
+aturriar
+aturrullar
+aturu
+aturullamiento
+aturullar
+aturyoku
+atus
+atusa
+atusabu
+atusador
+atusadora
+atusar
+atush
+atushi
+atushimo
+atushio
+atushiok
+atusi
+atusimor
+atusio
+atusiok
+atusioka
+atuta
+atutaku
+atuti`a
+atuyuki
+atuzasho
+atuzi
+atv
+atw
+atwain
+atwater
+atweel
+atween
+atwell
+atwell-b
+atwell-byrne
+atwill
+atwin
+atwirl
+atwist
+atwitch
+atwitter
+atwixt
+atwo
+atwood
+atwot
+atx
+aty
+atyap
+atye
+atyoti
+atypic
+atypical
+atypically
+atypique
+atypiques
+atypisk
+atypy
+atzera
+atzi
+atzingo
+atzintec
+atzinteco
+au
+au-dedan
+au-dedans
+au-dehor
+au-dehors
+au-dela`
+au-desso
+au-dessous
+au-dessu
+au-dessus
+au-devan
+au-devant
+au-yang
+au-yeung
+au`llo
+au`pa
+aua
+auake
+auantic
+auaque
+auari
+auaris
+auaviwul
+auaviwulu
+aubade
+aubades
+aubaine
+aubaines
+auban
+aube
+aube'pin
+aube'pine
+aube'pines
+aubel
+aubepine
+auber
+auberge
+auberges
+aubergin
+aubergine
+aubergines
+aubergis
+aubergiste
+aubergistes
+auberjon
+auberjonois
+auberon
+auberry
+aubert
+auberta
+aubier
+aubiers
+aubin
+aubine
+aubree
+aubrette
+aubrey
+aubrie
+aubrieti
+aubrietia
+aubrite
+aubry
+aubuchon
+auburn
+auburnda
+auburndale
+auburns
+auburnto
+auburntown
+aubusson
+auc
+auca
+aucaans
+aucan
+aucaner
+aucanian
+aucayacu
+auccio`n
+aucctu
+auch
+auchenia
+aucheniu
+auchenium
+auchi
+auchlet
+auckland
+auclair
+aucoin
+aucte`ntica
+aucte`ntico
+auctie
+auctiepr
+auctieprijs
+auctieprijzen
+aucties
+auction
+auctiona
+auctionaris
+auctionarissen
+auctionary
+auctione
+auctioned
+auctioneer
+auctioneers
+auctioni
+auctioning
+auctions
+auctor
+auctoria
+auctorial
+auctoridad
+auctorizar
+auctors
+aucuba
+aucuba's
+aucun
+aucune
+aucuneme
+aucunement
+aucunes
+aucuns
+aucupate
+aud
+auda
+audace
+audaces
+audaci
+audacia
+audacieu
+audacieuse
+audacieusement
+audacieuses
+audacieux
+audaciou
+audacious
+audaciously
+audaciousness
+audaciti
+audacities
+audacity
+audad
+audads
+audaean
+audaz
+audazmente
+aude
+auder
+audessou
+audessous
+audet
+audette
+audeza
+audi
+audian
+audibert
+audibertia
+audibili
+audibility
+audible
+audiblen
+audibleness
+audibles
+audibly
+audichio
+audicio`n
+audidor
+audie
+audielt
+audience
+audiences
+audienci
+audiencia
+audiencier
+audienciero
+audiens
+audiense
+audiensen
+audienssalen
+audient
+audienti
+audientie
+audientieblad
+audientiebladen
+audienties
+audienz
+audienze
+audienzen
+audiero
+audile
+audio
+audiogen
+audiogenic
+audiogra
+audiogram
+audiograms
+audiolog
+audiologen
+audiological
+audiologies
+audiologisk
+audiologist
+audiologists
+audiology
+audiomet
+audiometer
+audiometers
+audiometric
+audiometries
+audiometrist
+audiometry
+audion
+audiophi
+audiophile
+audiophiles
+audios
+audiotap
+audiotape
+audiotapes
+audiovis
+audiovisual
+audiovisuals
+audiovisuel
+audiovisuell
+audiovisuelle
+audiovisuelles
+audiovisuels
+audiphon
+audiphone
+audit
+audited
+auditeur
+auditeur-militair
+auditeurs
+auditeurs-militair
+auditie
+auditief
+audities
+auditiev
+auditieve
+auditif
+auditifs
+auditing
+audition
+auditioned
+auditioning
+auditionna
+auditionnaient
+auditionnais
+auditionnait
+auditionnant
+auditionne
+auditionne'
+auditionne'e
+auditionne'es
+auditionne's
+auditionne`rent
+auditionnent
+auditionner
+auditionnera
+auditionnerai
+auditionneraient
+auditionnerais
+auditionnerait
+auditionneras
+auditionnerez
+auditionneriez
+auditionnerions
+auditionnerons
+auditionneront
+auditionnes
+auditionnez
+auditionniez
+auditionnions
+auditionnons
+auditions
+auditiv
+auditiva
+auditive
+auditives
+auditivo
+auditivt
+audito
+auditoir
+auditoire
+auditoires
+auditor
+auditori
+auditori`a
+auditoria
+auditorial
+auditorially
+auditorien
+auditorier
+auditories
+auditoriet
+auditorily
+auditorio
+auditorium
+auditoriums
+auditors
+auditorship
+auditory
+auditres
+auditress
+auditric
+auditrice
+auditrices
+audits
+auditual
+audivise
+audiviser
+audivisi
+audivision
+audivox
+audley
+audollen
+audollent
+audra
+audran
+audre
+audrean
+audret
+audrey
+audrie
+audrienn
+audrienne
+audry
+audrye
+audsynli
+audsynlig
+audu
+audubon
+auduboni
+audubonistic
+audy
+aue
+auen
+auer
+auerbach
+auerhaeh
+auerhaehne
+auerhahn
+auerhahns
+auerochs
+auerochse
+aueto
+auf
+aufaddie
+aufaddiert
+aufarbei
+aufarbeitung
+aufatmen
+aufatmend
+aufaure
+aufbau
+aufbaubl
+aufbaublech
+aufbauen
+aufbauend
+aufbaues
+aufbaufi
+aufbaufinanzierung
+aufbauge
+aufbaugesellschaft
+aufbauku
+aufbaukurs
+aufbauph
+aufbauphasen
+aufbaupl
+aufbauplaene
+aufbauplan
+aufbaupr
+aufbauprogramm
+aufbaus
+aufbausc
+aufbauschung
+aufbaust
+aufbaustudium
+aufbaut
+aufbaute
+aufbauten
+aufbautermin
+aufbauwe
+aufbauwerk
+aufbauze
+aufbauzeit
+aufberei
+aufbereiten
+aufbereitet
+aufbereitete
+aufbereitung
+aufbereitungen
+aufbereitungsanlage
+aufbewah
+aufbewahren
+aufbewahrt
+aufbewahrung
+aufbewahrungsort
+aufbewahrungsorte
+aufbewahrungsortes
+aufbiege
+aufbiegen
+aufbietu
+aufbietung
+aufbietungen
+aufbinde
+aufbinden
+aufblasb
+aufblasbaren
+aufblasbares
+aufbrach
+aufbrachte
+aufbring
+aufbringen
+aufbringt
+aufbruch
+aufbruec
+aufbrueche
+aufbruechen
+aufdraen
+aufdraengen
+aufdraengende
+aufdraengendem
+aufdraengenden
+aufdraengendes
+aufdraengt
+aufdring
+aufdringlich
+aufdringliche
+aufdringlichen
+aufdringlicher
+aufdringlichere
+aufdringlicheren
+aufdringlicherer
+aufdringlicheres
+aufdringlichkeit
+aufdringlichkeiten
+aufdringlichste
+aufdringlichstem
+aufdringlichsten
+aufdringlichstes
+aufdru"c
+aufdru"cken
+aufdruck
+aufdrucken
+aufdrucks
+aufdruec
+aufdruecke
+aufdruecken
+aufdrueckende
+aufdrueckendem
+aufdrueckenden
+aufdrueckendes
+aufeinan
+aufeinander
+aufeinanderfolge
+aufeinanderfolgen
+aufeinanderfolgend
+aufeinanderfolgende
+aufeinanderfolgendem
+aufeinanderfolgenden
+aufeinanderfolgender
+aufeinandergeprallt
+aufeinandergeprallte
+aufeinandergepralltem
+aufeinandergeprallter
+aufeinandergepralltes
+aufeinanderliegen
+aufeinanderprallend
+aufeinanderprallende
+aufeinanderprallendem
+aufeinanderprallender
+aufeinanderprallendes
+aufeinandertrafen
+aufeinen
+aufeinender
+aufentha
+aufenthalt
+aufenthalte
+aufenthalten
+aufenthaltes
+aufenthalts
+aufenthaltserlaubnis
+aufenthaltsfrist
+aufenthaltsgenehmigung
+aufenthaltsjahr
+aufenthaltsort
+aufenthaltspreise
+aufenthaltsraeumen
+aufenthaltsraum
+aufenthaltsraums
+aufenthaltsverbot
+aufenthaltsverla"ngerung
+auferleg
+auferlegen
+auferlegend
+auferlegende
+auferlegenden
+auferlegender
+auferlegendes
+auferlegte
+auferlegtem
+auferlegten
+auferlegtes
+aufersta
+auferstanden
+auferstandenem
+auferstandenen
+auferstandener
+auferste
+auferstehen
+auferstehend
+auferstehende
+auferstehenden
+auferstehender
+auferstehendes
+auferstehung
+auferstehungsfest
+auferstu
+auferstuende
+aufessen
+aufessend
+aufessende
+aufessenden
+aufessender
+aufessendes
+auffa"ch
+auffa"chern
+auffaell
+auffaellige
+auffaelligem
+auffaelligen
+auffaelligere
+auffaelligerem
+auffaelligeren
+auffaelligeres
+auffaelliges
+auffaelligste
+auffaelligsten
+auffaelligster
+auffaelligstes
+auffaeng
+auffaengt
+auffahre
+auffahren
+auffahrend
+auffahrende
+auffahrenden
+auffahrender
+auffahrendes
+auffahrt
+auffahrtsweg
+auffalle
+auffallen
+auffallend
+auffallende
+auffallendem
+auffallender
+auffallendes
+auffallendste
+auffangb
+auffangbecken
+auffange
+auffangen
+auffangend
+auffangende
+auffangenden
+auffangender
+auffangendes
+auffasse
+auffassend
+auffassende
+auffassendem
+auffassender
+auffassendes
+auffasst
+auffasste
+auffassu
+auffassung
+auffassungen
+auffassungsgabe
+auffassungsvermoegen
+auffassungsvermoegens
+auffiel
+auffindb
+auffindbar
+auffindbare
+auffindbarem
+auffindbarer
+auffindbares
+auffinde
+auffinden
+auffindende
+auffindendem
+auffindenden
+auffindendes
+auffing
+auffisch
+auffischen
+auffischende
+auffischendem
+auffischenden
+auffischendes
+aufflack
+aufflackern
+aufflamm
+aufflammen
+aufflammend
+aufflammende
+aufflammenden
+aufflammender
+aufflammendes
+aufflieg
+auffliegend
+auffliegende
+auffliegendem
+auffliegender
+auffliegendes
+auffliegt
+aufforde
+auffordere
+auffordern
+auffordernd
+aufforderndem
+auffordernden
+auffordernder
+auffordert
+aufforderte
+aufforderung
+aufforderungen
+aufforst
+aufforsten
+aufforstende
+aufforstendem
+aufforstenden
+aufforstendes
+auffrass
+auffrassen
+auffress
+auffressen
+auffressende
+auffressendem
+auffressenden
+auffressendes
+auffrisc
+auffrischen
+auffrischende
+auffrischendem
+auffrischenden
+auffrischendes
+auffrischung
+auffrisi
+auffrisiert
+auffriss
+auffrisst
+auffu"hr
+auffu"hren
+auffu"hrten
+auffu"ll
+auffu"llen
+auffuehr
+auffuehren
+auffuehrend
+auffuehrendem
+auffuehrenden
+auffuehrender
+auffuehrt
+auffuehrte
+auffuehrungen
+auffuehrungsstatistik
+auffuehrungsstils
+auffuell
+auffuellen
+auffuellende
+auffuellendem
+auffuellenden
+auffuellendes
+auffuellung
+auffuhr
+aufgab
+aufgabe
+aufgabeh
+aufgabehalber
+aufgaben
+aufgabenbereich
+aufgabenbeschreibung
+aufgabenheft
+aufgabenhefte
+aufgabenheften
+aufgabenkreis
+aufgabenkreise
+aufgabenkreisen
+aufgabenschein
+aufgabenscheine
+aufgabenscheinen
+aufgabenschwerpunkte
+aufgabenspezialisation
+aufgabenstellung
+aufgaeng
+aufgaenge
+aufgaengen
+aufgang
+aufgange
+aufganges
+aufgearb
+aufgearbeitet
+aufgearbeitete
+aufgearbeiteten
+aufgearbeiteter
+aufgearbeitetes
+aufgebae
+aufgebaeumt
+aufgebah
+aufgebahrt
+aufgebahrte
+aufgebahrtem
+aufgebahrter
+aufgebahrtes
+aufgebau
+aufgebauscht
+aufgebauschtem
+aufgebauschten
+aufgebauschter
+aufgebaut
+aufgebaute
+aufgebautem
+aufgebauter
+aufgebautes
+aufgebe
+aufgeben
+aufgebende
+aufgebendem
+aufgebenden
+aufgebendes
+aufgebes
+aufgebessert
+aufgebesserte
+aufgebesserten
+aufgebesserter
+aufgebessertes
+aufgebla
+aufgeblaehte
+aufgeblaehtem
+aufgeblaehten
+aufgeblaehtere
+aufgeblaehterem
+aufgeblaehteren
+aufgeblaehteres
+aufgeblaehtes
+aufgeblaehteste
+aufgeblaehtesten
+aufgeblaehtester
+aufgeblaehtestes
+aufgeblasen
+aufgeblasenem
+aufgeblasenen
+aufgeblasener
+aufgeblasenerem
+aufgeblaseneren
+aufgeblasenerer
+aufgeblasenes
+aufgeblasenste
+aufgeblasenstem
+aufgeblasenster
+aufgeblasenstes
+aufgeble
+aufgeblendet
+aufgeblendetem
+aufgeblendeten
+aufgeblendeter
+aufgebli
+aufgeblickt
+aufgeblieben
+aufgebliebene
+aufgebliebenen
+aufgebliebener
+aufgebliebenes
+aufgeblitzte
+aufgeblitztem
+aufgeblitzten
+aufgeblitztes
+aufgeblu
+aufgeblueht
+aufgebluehte
+aufgebluehtem
+aufgebluehter
+aufgebluehtes
+aufgeboc
+aufgebockt
+aufgebocktem
+aufgeboh
+aufgebohrter
+aufgebot
+aufgebote
+aufgebotene
+aufgebotenem
+aufgebotenen
+aufgebotenes
+aufgebots
+aufgebra
+aufgebracht
+aufgebrachte
+aufgebrachten
+aufgebrachter
+aufgebrachtes
+aufgebrauchte
+aufgebrauchtem
+aufgebrauchten
+aufgebrauchtes
+aufgebraust
+aufgebrauste
+aufgebrausten
+aufgebrauster
+aufgebraustes
+aufgebro
+aufgebrochen
+aufgebrochene
+aufgebrochenem
+aufgebrochenen
+aufgebrochenes
+aufgebue
+aufgebuegelt
+aufgebuegelte
+aufgebuegelten
+aufgebuegelter
+aufgebuegeltes
+aufgebun
+aufgebunden
+aufgebundene
+aufgebundenen
+aufgebundener
+aufgebundenes
+aufgedec
+aufgedeckt
+aufgedeckte
+aufgedecktem
+aufgedeckten
+aufgedecktes
+aufgedon
+aufgedonnert
+aufgedonnerte
+aufgedonnerten
+aufgedonnerter
+aufgedonnertes
+aufgedra
+aufgedraengte
+aufgedraengtem
+aufgedraengten
+aufgedraengtes
+aufgedre
+aufgedrehte
+aufgedrehtem
+aufgedrehten
+aufgedrehtes
+aufgedru
+aufgedruckt
+aufgedruckten
+aufgedrueckt
+aufgedrueckte
+aufgedrueckten
+aufgedrueckter
+aufgedruecktes
+aufgedun
+aufgedunsen
+aufgedunsenem
+aufgedunsenen
+aufgedunsener
+aufgefa"
+aufgefa"cherten
+aufgefah
+aufgefahren
+aufgefahrenem
+aufgefahrenen
+aufgefahrener
+aufgefal
+aufgefallen
+aufgefallene
+aufgefallenem
+aufgefallener
+aufgefallenes
+aufgefan
+aufgefangen
+aufgefangenem
+aufgefangenen
+aufgefangener
+aufgefas
+aufgefasst
+aufgefasste
+aufgefasstem
+aufgefasster
+aufgefasstes
+aufgefis
+aufgefischt
+aufgefischte
+aufgefischtem
+aufgefischter
+aufgefischtes
+aufgefla
+aufgeflammt
+aufgeflammtem
+aufgeflammten
+aufgeflammter
+aufgeflo
+aufgeflogen
+aufgeflogene
+aufgeflogenem
+aufgeflogener
+aufgeflogenes
+aufgefor
+aufgefordert
+aufgefordertem
+aufgeforderten
+aufgeforderter
+aufgeforstet
+aufgeforstete
+aufgeforstetem
+aufgeforsteter
+aufgeforstetes
+aufgefre
+aufgefressen
+aufgefressenem
+aufgefressenen
+aufgefressener
+aufgefri
+aufgefrischt
+aufgefrischte
+aufgefrischtem
+aufgefrischter
+aufgefrischtes
+aufgefu"
+aufgefu"hrt
+aufgefu"hrte
+aufgefu"hrtem
+aufgefu"hrten
+aufgefu"llt
+aufgefue
+aufgefuehrt
+aufgefuehrte
+aufgefuehrtem
+aufgefuehrter
+aufgefuehrtes
+aufgefuellt
+aufgefuelltem
+aufgefuellten
+aufgefuellter
+aufgefun
+aufgefunden
+aufgefundenem
+aufgefundenen
+aufgefundener
+aufgegan
+aufgegangen
+aufgegangene
+aufgegangenem
+aufgegangener
+aufgegangeres
+aufgegeb
+aufgegeben
+aufgegebenem
+aufgegebenen
+aufgegebener
+aufgeges
+aufgegessen
+aufgegessene
+aufgegessenem
+aufgegessener
+aufgegessenes
+aufgegli
+aufgegliedert
+aufgegliedertem
+aufgegliederten
+aufgegliederter
+aufgegos
+aufgegossen
+aufgegossene
+aufgegossenem
+aufgegossener
+aufgegossenes
+aufgegri
+aufgegriffen
+aufgegriffenem
+aufgegriffenen
+aufgegriffener
+aufgeha"
+aufgeha"ngtes
+aufgehab
+aufgehabt
+aufgehabte
+aufgehabten
+aufgehabter
+aufgehabtes
+aufgehac
+aufgehackte
+aufgehacktem
+aufgehackten
+aufgehacktes
+aufgehae
+aufgehaengt
+aufgehaengte
+aufgehaengtem
+aufgehaengter
+aufgehaengtes
+aufgehaeuft
+aufgehaeuftem
+aufgehaeuften
+aufgehaeufter
+aufgehal
+aufgehalten
+aufgehaltene
+aufgehaltenen
+aufgehaltener
+aufgehaltenes
+aufgehei
+aufgeheitert
+aufgeheiterte
+aufgeheitertem
+aufgeheiterten
+aufgeheitertes
+aufgeheizt
+aufgeheizte
+aufgehel
+aufgehellt
+aufgehelltem
+aufgehellten
+aufgehellter
+aufgehen
+aufgehend
+aufgehende
+aufgehenden
+aufgehender
+aufgehendes
+aufgehet
+aufgehetzte
+aufgehetztem
+aufgehetzten
+aufgehetztes
+aufgehob
+aufgehoben
+aufgehobene
+aufgehobenen
+aufgehobener
+aufgehobenes
+aufgehoe
+aufgehoert
+aufgehol
+aufgeholfene
+aufgeholfenem
+aufgeholfenen
+aufgeholfenes
+aufgeholt
+aufgeholte
+aufgeholten
+aufgeholter
+aufgeholtes
+aufgehor
+aufgehorchte
+aufgehorchtem
+aufgehorchten
+aufgehorchtes
+aufgeht
+aufgekau
+aufgekauft
+aufgekauftem
+aufgekauften
+aufgekaufter
+aufgekla
+aufgeklaert
+aufgeklaerte
+aufgeklaertem
+aufgeklaerter
+aufgeklaertes
+aufgeklaertheiten
+aufgeklappt
+aufgeklapptem
+aufgeklappten
+aufgeklappter
+aufgekle
+aufgeklebt
+aufgeklebte
+aufgeklebtem
+aufgeklebter
+aufgeklebtes
+aufgekno
+aufgeknoepft
+aufgeknoepftem
+aufgeknoepften
+aufgeknoepfter
+aufgekoc
+aufgekocht
+aufgekochte
+aufgekochtem
+aufgekochter
+aufgekochtes
+aufgekom
+aufgekommen
+aufgekommenem
+aufgekommenen
+aufgekommener
+aufgekra
+aufgekratzt
+aufgekratzte
+aufgekratztem
+aufgekratzter
+aufgekratztes
+aufgekre
+aufgekrempelt
+aufgekrempeltem
+aufgekrempelten
+aufgekrempelter
+aufgekreuzt
+aufgekreuzte
+aufgekreuztem
+aufgekreuzter
+aufgekreuztes
+aufgekri
+aufgekriegt
+aufgelac
+aufgelachte
+aufgelachtem
+aufgelachten
+aufgelachtes
+aufgelad
+aufgeladen
+aufgeladene
+aufgeladenen
+aufgeladener
+aufgeladenes
+aufgelas
+aufgelassene
+aufgelassenem
+aufgelassenen
+aufgelassenes
+aufgelau
+aufgelauert
+aufgelauerte
+aufgelauerten
+aufgelauerter
+aufgelauertes
+aufgelaufene
+aufgelaufenem
+aufgelaufenen
+aufgelaufenes
+aufgeld
+aufgeleb
+aufgelebt
+aufgelebte
+aufgelebten
+aufgelebter
+aufgelebtes
+aufgeleg
+aufgelegene
+aufgelegenem
+aufgelegenen
+aufgelegenes
+aufgelegt
+aufgelegte
+aufgelegten
+aufgelegter
+aufgelegtes
+aufgeleh
+aufgelehnte
+aufgelehntem
+aufgelehnten
+aufgelehntes
+aufgeles
+aufgelesen
+aufgelesene
+aufgelesenen
+aufgelesener
+aufgelesenes
+aufgeleu
+aufgeleuchtete
+aufgeleuchtetem
+aufgeleuchteten
+aufgeleuchtetes
+aufgelis
+aufgelistet
+aufgelisteten
+aufgelo"
+aufgelo"st
+aufgeloc
+aufgelockert
+aufgelockertem
+aufgelockerten
+aufgelockerter
+aufgelockerterem
+aufgelockerteren
+aufgelockerterer
+aufgelockertes
+aufgelockertste
+aufgelockertstem
+aufgelockertster
+aufgelockertstes
+aufgelod
+aufgelodert
+aufgelodertem
+aufgeloderten
+aufgeloderter
+aufgeloe
+aufgeloeste
+aufgeloestem
+aufgeloesten
+aufgeloestere
+aufgeloesterem
+aufgeloesteren
+aufgeloesteres
+aufgeloestes
+aufgeloesteste
+aufgeloestesten
+aufgeloestester
+aufgeloestestes
+aufgemac
+aufgemacht
+aufgemachte
+aufgemachten
+aufgemachter
+aufgemachtes
+aufgemal
+aufgemalten
+aufgemoe
+aufgemoebelt
+aufgemoebelte
+aufgemoebelten
+aufgemoebeltes
+aufgemot
+aufgemotzte
+aufgemotzten
+aufgemun
+aufgemuntert
+aufgemunterte
+aufgemuntertem
+aufgemunterter
+aufgemuntertes
+aufgenoe
+aufgenoetigte
+aufgenom
+aufgenommen
+aufgenommene
+aufgenommenem
+aufgenommenen
+aufgenommenes
+aufgentg
+aufgentgardistischen
+aufgeopf
+aufgeopfert
+aufgeopfertem
+aufgeopferten
+aufgeopferter
+aufgepae
+aufgepaeppelt
+aufgepas
+aufgepasst
+aufgepasste
+aufgepassten
+aufgepasster
+aufgepasstes
+aufgepin
+aufgepinselt
+aufgepla
+aufgeplatzt
+aufgeplatzte
+aufgeplatzten
+aufgeplatzter
+aufgeplatztes
+aufgepra
+aufgeprallt
+aufgeprallte
+aufgepralltem
+aufgeprallter
+aufgepralltes
+aufgepratzt
+aufgepre
+aufgepresst
+aufgepum
+aufgepumpte
+aufgepumptem
+aufgepumpten
+aufgepumptes
+aufgeput
+aufgeputzt
+aufgeputzte
+aufgeputzten
+aufgeputzter
+aufgeputztes
+aufgerae
+aufgeraeumt
+aufgeraeumte
+aufgeraeumtem
+aufgeraeumter
+aufgeraeumtes
+aufgeraf
+aufgerafft
+aufgeraffte
+aufgerafftem
+aufgeraffter
+aufgerafftes
+aufgerau
+aufgerauhten
+aufgerec
+aufgerechnete
+aufgerechnetem
+aufgerechneten
+aufgerechnetes
+aufgereckte
+aufgereg
+aufgeregt
+aufgeregte
+aufgeregtem
+aufgeregten
+aufgeregter
+aufgeregtesten
+aufgerei
+aufgereiht
+aufgeric
+aufgerichtet
+aufgerichtetem
+aufgerichteter
+aufgerichtetes
+aufgerie
+aufgerieben
+aufgeriebenem
+aufgeriebenen
+aufgeriebener
+aufgeris
+aufgerissen
+aufgerissene
+aufgerissenem
+aufgerissener
+aufgerissenes
+aufgerol
+aufgerollt
+aufgerolltem
+aufgerollten
+aufgerollter
+aufgerue
+aufgerueckt
+aufgeruecktem
+aufgerueckten
+aufgerueckter
+aufgeruehrt
+aufgeruestet
+aufgeruestete
+aufgeruesteten
+aufgeruesteter
+aufgeruestetes
+aufgeruf
+aufgerufen
+aufgerufene
+aufgerufenem
+aufgerufenen
+aufgerufener
+aufgerufenes
+aufgerun
+aufgerundet
+aufgerundetem
+aufgerundeten
+aufgerundeter
+aufgesag
+aufgesagt
+aufgesagte
+aufgesagtem
+aufgesagter
+aufgesagtes
+aufgesam
+aufgesammelt
+aufgesammeltem
+aufgesammelten
+aufgesammelter
+aufgesau
+aufgesaugt
+aufgesaugte
+aufgesaugtem
+aufgesaugter
+aufgesaugtes
+aufgesch
+aufgeschaut
+aufgescheucht
+aufgescheuchtem
+aufgescheuchten
+aufgescheuchter
+aufgeschichtet
+aufgeschichtete
+aufgeschichtetem
+aufgeschichteter
+aufgeschichtetes
+aufgeschlagene
+aufgeschlagenem
+aufgeschlagenen
+aufgeschlagenes
+aufgeschlitzt
+aufgeschlossen
+aufgeschlossenem
+aufgeschlossenen
+aufgeschlossener
+aufgeschlossenheit
+aufgeschlossennen
+aufgeschluesselt
+aufgeschmissen
+aufgeschmissene
+aufgeschmissenen
+aufgeschmissener
+aufgeschmissenes
+aufgeschnitten
+aufgeschnittene
+aufgeschnittenen
+aufgeschnittener
+aufgeschnittenes
+aufgeschnuerte
+aufgeschnuertem
+aufgeschnuerten
+aufgeschnuertes
+aufgeschobene
+aufgeschobenem
+aufgeschobenen
+aufgeschobenes
+aufgeschraubt
+aufgeschraubte
+aufgeschraubtem
+aufgeschraubter
+aufgeschraubtes
+aufgeschreckt
+aufgeschrecktem
+aufgeschreckten
+aufgeschreckter
+aufgeschrieben
+aufgeschriebene
+aufgeschriebenem
+aufgeschriebenes
+aufgeschrien
+aufgeschuerft
+aufgeschuerftem
+aufgeschuerften
+aufgeschuerfter
+aufgeschuettet
+aufgeschwatzt
+aufgeseh
+aufgesehene
+aufgesehenem
+aufgesehenen
+aufgesehenes
+aufgeses
+aufgesessen
+aufgesessenen
+aufgeset
+aufgesetzt
+aufgesetzte
+aufgesetztem
+aufgesetzter
+aufgesetztes
+aufgesog
+aufgesogen
+aufgespa
+aufgespannt
+aufgespanntem
+aufgespannten
+aufgespannter
+aufgespart
+aufgesparte
+aufgespartem
+aufgesparter
+aufgespartes
+aufgespe
+aufgesperrt
+aufgesperrtem
+aufgesperrten
+aufgesperrter
+aufgespi
+aufgespielt
+aufgespiessen
+aufgespiessene
+aufgespiessenem
+aufgespiessener
+aufgespiessenes
+aufgespr
+aufgesprungen
+aufgesprungene
+aufgesprungenem
+aufgesprungenen
+aufgesprungenes
+aufgespu
+aufgespuert
+aufgespuerte
+aufgespuertem
+aufgespuerter
+aufgespuertes
+aufgesta
+aufgesta"nderte
+aufgestachelt
+aufgestachelte
+aufgestachelten
+aufgestachelter
+aufgestacheltes
+aufgestanden
+aufgestandene
+aufgestandenem
+aufgestandener
+aufgestandenes
+aufgestapelt
+aufgestapeltem
+aufgestapelten
+aufgestapelter
+aufgestapeltes
+aufgestaut
+aufgestaute
+aufgestauten
+aufgeste
+aufgesteckt
+aufgesteckte
+aufgestecktem
+aufgesteckten
+aufgesteckter
+aufgestecktes
+aufgestellt
+aufgestelltem
+aufgestellten
+aufgestellter
+aufgesteppt
+aufgesti
+aufgestiegen
+aufgestiegene
+aufgestiegenen
+aufgestiegener
+aufgestiegenes
+aufgesto
+aufgestockt
+aufgestockten
+aufgestoebert
+aufgestoeberte
+aufgestoeberten
+aufgestoeberter
+aufgestoebertes
+aufgestossene
+aufgestossenem
+aufgestossenen
+aufgestossenes
+aufgestr
+aufgestrebte
+aufgestrebtem
+aufgestrebten
+aufgestrebtes
+aufgestrichen
+aufgestrichene
+aufgestrichenen
+aufgestrichener
+aufgestrichenes
+aufgestu
+aufgestuetzte
+aufgestuetztem
+aufgestuetzten
+aufgestuetztes
+aufgesuc
+aufgesuchte
+aufgesuchtem
+aufgesuchten
+aufgesuchtes
+aufgetan
+aufgetankt
+aufgetanktem
+aufgetankten
+aufgetankter
+aufgetau
+aufgetaucht
+aufgetauchte
+aufgetauchtem
+aufgetauchter
+aufgetauchtes
+aufgetaut
+aufgetautem
+aufgetauten
+aufgetauter
+aufgetei
+aufgeteilt
+aufgeteilte
+aufgeteiltem
+aufgeteilten
+aufgeteilter
+aufgeteiltes
+aufgetis
+aufgetischt
+aufgetischtem
+aufgetischten
+aufgetischter
+aufgetra
+aufgetragen
+aufgetragene
+aufgetragenem
+aufgetragener
+aufgetragenes
+aufgetre
+aufgetrennt
+aufgetrenntem
+aufgetrennten
+aufgetrennter
+aufgetreten
+aufgetretene
+aufgetretenem
+aufgetretenen
+aufgetretener
+aufgetretenes
+aufgetri
+aufgetrieben
+aufgetriebenem
+aufgetriebenen
+aufgetriebener
+aufgetro
+aufgetroffen
+aufgetroffene
+aufgetroffenem
+aufgetroffener
+aufgetroffenes
+aufgewac
+aufgewachsen
+aufgewachsenem
+aufgewachsenen
+aufgewachsener
+aufgewacht
+aufgewachte
+aufgewachtem
+aufgewachter
+aufgewachtes
+aufgewae
+aufgewaermt
+aufgewaermtem
+aufgewaermten
+aufgewaermter
+aufgewar
+aufgewartet
+aufgewarteten
+aufgewarteter
+aufgewartetes
+aufgewas
+aufgewaschene
+aufgewaschenem
+aufgewaschenen
+aufgewaschenes
+aufgewec
+aufgeweckt
+aufgeweckte
+aufgeweckten
+aufgeweckter
+aufgewecktere
+aufgeweckteren
+aufgeweckterer
+aufgeweckteres
+aufgeweckteste
+aufgewecktestem
+aufgewecktesten
+aufgewecktestes
+aufgewei
+aufgeweicht
+aufgeweichte
+aufgeweichten
+aufgeweichter
+aufgeweichtes
+aufgewen
+aufgewendet
+aufgewendete
+aufgewendetem
+aufgewendeten
+aufgewendetes
+aufgewer
+aufgewertet
+aufgewertete
+aufgewerteten
+aufgewerteter
+aufgewertetes
+aufgewic
+aufgewickelt
+aufgewickelte
+aufgewickeltem
+aufgewickelten
+aufgewickeltes
+aufgewie
+aufgewiegelt
+aufgewiegelte
+aufgewiegelten
+aufgewiegelter
+aufgewiegeltes
+aufgewiesene
+aufgewiesenem
+aufgewiesenen
+aufgewiesenes
+aufgewir
+aufgewirbelt
+aufgewirbelte
+aufgewirbelten
+aufgewirbelter
+aufgewirbeltes
+aufgewis
+aufgewischte
+aufgewischtem
+aufgewischten
+aufgewischtes
+aufgewog
+aufgewogen
+aufgewogene
+aufgewogenen
+aufgewogener
+aufgewogenes
+aufgewor
+aufgeworfene
+aufgeworfenen
+aufgeworfener
+aufgewue
+aufgewuehlt
+aufgewuehlten
+aufgezae
+aufgezaehlt
+aufgezaehlte
+aufgezaehltem
+aufgezaehlter
+aufgezaehltes
+aufgezaeumt
+aufgezei
+aufgezeichnet
+aufgezeichnete
+aufgezeichnetem
+aufgezeichneter
+aufgezeichnetes
+aufgezeigt
+aufgezeigtem
+aufgezeigten
+aufgezeigter
+aufgezog
+aufgezogen
+aufgezogene
+aufgezogenem
+aufgezogener
+aufgezogenes
+aufgezwu
+aufgezwungen
+aufgezwungenem
+aufgezwungenen
+aufgezwungener
+aufgibt
+aufgiess
+aufgiessen
+aufgiessend
+aufgiessendem
+aufgiessenden
+aufgiessender
+aufging
+aufginge
+aufgingen
+aufglied
+aufgliedern
+aufgliedernd
+aufgliedernde
+aufgliedernden
+aufgliedernder
+aufgliederndes
+aufglueh
+aufgluehenden
+aufgreif
+aufgreifen
+aufgreifend
+aufgreifende
+aufgreifendem
+aufgreifender
+aufgreifendes
+aufgreift
+aufgrund
+aufguess
+aufguessen
+aufguss
+aufgusse
+aufgusses
+aufha"lt
+aufha"ng
+aufha"ngung
+aufhaben
+aufhabend
+aufhabende
+aufhabendem
+aufhabender
+aufhabendes
+aufhacke
+aufhacken
+aufhackende
+aufhackendem
+aufhackenden
+aufhackendes
+aufhaelt
+aufhaeng
+aufhaengen
+aufhaengende
+aufhaengendem
+aufhaengenden
+aufhaengendes
+aufhaengern
+aufhaengers
+aufhaengt
+aufhaeuf
+aufhaeufen
+aufhaeufende
+aufhaeufendem
+aufhaeufenden
+aufhaeufendes
+aufhaeufung
+aufhalf
+aufhalte
+aufhalten
+aufhaltend
+aufhaltendem
+aufhaltenden
+aufhaltender
+aufhebba
+aufhebbar
+aufhebe
+aufheben
+aufhebende
+aufhebendem
+aufhebenden
+aufhebendes
+aufhebens
+aufhebt
+aufhebun
+aufhebung
+aufhebungen
+aufhebungsbeschluss
+aufheite
+aufheiternd
+aufheiternde
+aufheiterndem
+aufheiternder
+aufheiterndes
+aufheiterungen
+aufheize
+aufheizen
+aufheizu
+aufheizung
+aufhelfe
+aufhelfen
+aufhelfende
+aufhelfendem
+aufhelfenden
+aufhelfendes
+aufhelle
+aufhellen
+aufhellend
+aufhellendem
+aufhellenden
+aufhellender
+aufhellu
+aufhellung
+aufhetze
+aufhetzen
+aufhetzend
+aufhetzendem
+aufhetzender
+aufhetzendes
+aufhetzerin
+aufhetzerinnen
+aufhetzern
+aufhetzt
+aufhetztend
+aufhetzu
+aufhetzung
+aufhetzungen
+aufheule
+aufheulen
+aufheulend
+aufhielt
+aufhob
+aufhoere
+aufhoeren
+aufhoerend
+aufhoerendem
+aufhoerenden
+aufhoerender
+aufhoert
+aufhoerte
+aufhoerten
+aufholbe
+aufholbedarf
+aufholen
+aufholend
+aufholendem
+aufholenden
+aufholender
+aufholte
+aufholten
+aufhorch
+aufhorchen
+aufhorchend
+aufhorchendem
+aufhorchenden
+aufhorchender
+aufhorchte
+aufidius
+aufkaeuf
+aufkaeufen
+aufkaeufer
+aufkaeufern
+aufkauf
+aufkaufe
+aufkaufen
+aufkaufende
+aufkaufendem
+aufkaufenden
+aufkaufendes
+aufkaufes
+aufkeime
+aufkeimende
+aufkeimenden
+aufklaer
+aufklaeren
+aufklaerend
+aufklaerende
+aufklaerenden
+aufklaerender
+aufklaerendes
+aufklaerer
+aufklaererischem
+aufklaerern
+aufklaerten
+aufklaerung
+aufklaerungen
+aufklaerungfkampagne
+aufklaerungsauftrag
+aufklaerungsbeitrag
+aufklaerungsbuecher
+aufklaerungsflugzeug
+aufklaerungskampagne
+aufklaerungsmoeglichkeiten
+aufklaff
+aufklaffen
+aufklapp
+aufklappend
+aufklappt
+aufklare
+aufklarend
+aufklebe
+aufkleben
+aufklebend
+aufklebende
+aufklebendem
+aufklebender
+aufklebendes
+aufkleber
+aufknoep
+aufknoepfen
+aufknoepfende
+aufknoepfendem
+aufknoepfenden
+aufknoepfendes
+aufkoche
+aufkochen
+aufkochend
+aufkochendem
+aufkochenden
+aufkochender
+aufkomme
+aufkommen
+aufkommend
+aufkommende
+aufkommenden
+aufkommender
+aufkommendes
+aufkremp
+aufkrempeln
+aufkrempelnd
+aufkreuz
+aufkreuzen
+aufkreuzende
+aufkreuzendem
+aufkreuzenden
+aufkreuzendes
+aufkrieg
+aufkriegen
+aufkriegend
+aufkuend
+aufkuendigen
+auflache
+auflachend
+auflachende
+auflachendem
+auflachender
+auflachendes
+aufladen
+aufladende
+aufladendem
+aufladenden
+aufladendes
+auflader
+aufladern
+aufladers
+aufladev
+aufladevorgang
+aufladun
+aufladung
+aufladungen
+auflaeuf
+auflaeufe
+auflaeufen
+auflage
+auflagef
+auflagefla"che
+auflagen
+auflagenerhoehung
+auflagenstarke
+auflagenzahl
+auflagenziffer
+auflagez
+auflageziffer
+auflandi
+auflandig
+auflasse
+auflassend
+auflassende
+auflassendem
+auflassender
+auflassendes
+auflassu
+auflassung
+auflassungen
+auflauer
+auflauern
+auflauernde
+auflauerndem
+auflauernden
+auflauerndes
+auflauert
+auflauf
+auflaufe
+auflaufen
+auflaufende
+auflaufendem
+auflaufenden
+auflaufendes
+auflaufs
+aufleben
+auflebend
+auflebendem
+auflebenden
+auflebender
+auflebt
+auflegen
+auflegend
+auflegendem
+auflegenden
+auflegender
+auflegt
+auflegte
+auflehne
+auflehnen
+auflehnende
+auflehnendem
+auflehnenden
+auflehnendes
+auflehnu
+auflehnung
+auflehnungen
+auflesen
+auflesend
+auflesendem
+auflesenden
+auflesender
+aufleuch
+aufleuchten
+aufleuchtend
+aufleuchtende
+aufleuchtenden
+aufleuchtender
+aufleuchtendes
+aufleuchtet
+aufleuchtete
+aufliege
+aufliegen
+aufliegend
+aufliegendem
+aufliegenden
+aufliegender
+aufliegeschema
+aufliegt
+aufliste
+auflistet
+auflistu
+auflistung
+auflo"se
+auflo"sen
+auflo"send
+auflo"su
+auflo"sung
+auflocke
+auflockern
+auflockernde
+auflockerndem
+auflockernden
+auflockerndes
+auflockerungen
+auflockerungstendenzen
+aufloder
+auflodern
+auflodernd
+auflodernde
+auflodernden
+auflodernder
+aufloderndes
+aufloese
+aufloesend
+aufloesende
+aufloesendem
+aufloesender
+aufloesendes
+aufloest
+aufloesu
+aufloesungen
+aufloesungsbeschluss
+aufloesungserscheinungen
+aufmache
+aufmachend
+aufmachende
+aufmachendem
+aufmachender
+aufmachendes
+aufmacht
+aufmachu
+aufmachung
+aufmaers
+aufmaersche
+aufmarsc
+aufmarsch
+aufmarschbewegung
+aufmarsches
+aufmarschieren
+aufmarschiert
+aufmarschierten
+aufmerks
+aufmerksam
+aufmerksamem
+aufmerksamen
+aufmerksamere
+aufmerksamerem
+aufmerksameren
+aufmerksameres
+aufmerksames
+aufmerksamkeit
+aufmerksamkeiten
+aufmerksamste
+aufmerksamsten
+aufmerksamster
+aufmerksamstes
+aufmoebe
+aufmoebelnd
+aufmoebelnde
+aufmoebelndem
+aufmoebelnder
+aufmoebelndes
+aufmotzm
+aufmotzmotzte
+aufmuepf
+aufmuepfiger
+aufmunte
+aufmuntern
+aufmunternd
+aufmunterndem
+aufmunternden
+aufmunternder
+aufmunterungen
+aufnahm
+aufnahme
+aufnahmeantraegen
+aufnahmebedingungen
+aufnahmebeitrag
+aufnahmebereit
+aufnahmebereitschaft
+aufnahmefaehig
+aufnahmefaehigem
+aufnahmefaehigen
+aufnahmefaehiger
+aufnahmefaehigerem
+aufnahmefaehigeren
+aufnahmefaehigerer
+aufnahmefaehiges
+aufnahmefaehigkeit
+aufnahmefaehigkeiten
+aufnahmefaehigste
+aufnahmefaehigstem
+aufnahmefaehigster
+aufnahmefaehigstes
+aufnahmegebuehr
+aufnahmegeraet
+aufnahmegeraete
+aufnahmegeraeten
+aufnahmekopf
+aufnahmekraft
+aufnahmen
+aufnahmepruefung
+aufnahmepruefungen
+aufnahmevermoegen
+aufnehme
+aufnehmen
+aufnehmende
+aufnehmendem
+aufnehmenden
+aufnehmendes
+aufnehmer
+aufnehmern
+aufnimmt
+aufopfer
+aufopfern
+aufopfernde
+aufopferndem
+aufopfernden
+aufopferndes
+aufopferung
+aufopferungen
+aufpaepp
+aufpaeppeln
+aufpasse
+aufpassen
+aufpassende
+aufpassendem
+aufpassenden
+aufpassendes
+aufpasser
+aufpasserinnen
+aufpassern
+aufpassers
+aufpinse
+aufpinseln
+aufplaet
+aufplaetten
+aufplatz
+aufplatzend
+aufplatzende
+aufplatzendem
+aufplatzender
+aufplatzendes
+aufplatzten
+aufpolie
+aufpolierung
+aufprael
+aufpraelle
+aufprall
+aufprallen
+aufprallend
+aufprallende
+aufprallenden
+aufprallender
+aufprallendes
+aufpratz
+aufpratzen
+aufpratzens
+aufpreis
+aufpreise
+aufpreisen
+aufprobi
+aufprobierend
+aufprobierende
+aufprobierendem
+aufprobierender
+aufprobierendes
+aufprobiert
+aufprobiertem
+aufprobierten
+aufprobierter
+aufpumpe
+aufpumpen
+aufpumpend
+aufpumpende
+aufpumpenden
+aufpumpender
+aufpumpendes
+aufputsc
+aufputschmittel
+aufputz
+aufputze
+aufputzend
+aufputzende
+aufputzendem
+aufputzender
+aufputzendes
+aufputzes
+aufraeum
+aufraeumen
+aufraeumende
+aufraeumendem
+aufraeumenden
+aufraeumendes
+aufraffe
+aufraffen
+aufraffend
+aufraffendem
+aufraffenden
+aufraffender
+aufragen
+aufrechn
+aufrechne
+aufrechnen
+aufrechnende
+aufrechnendem
+aufrechnenden
+aufrechnendes
+aufrechnet
+aufrechnung
+aufrecht
+aufrechtem
+aufrechten
+aufrechter
+aufrechterhalten
+aufrechterhaltend
+aufrechterhaltende
+aufrechterhaltenden
+aufrechterhaltender
+aufrechterhaltendes
+aufrechterhaltenem
+aufrechterhaltenen
+aufrechterhaltener
+aufrechterhaltung
+aufrechterhaltungen
+aufrechtes
+aufrechtstehend
+aufrechtzuerhalten
+aufregen
+aufregend
+aufregende
+aufregendem
+aufregender
+aufregendere
+aufregenderem
+aufregenderer
+aufregenderes
+aufregendes
+aufregendstem
+aufregendsten
+aufregendster
+aufregte
+aufregun
+aufregung
+aufregungen
+aufreibe
+aufreiben
+aufreibend
+aufreibende
+aufreibenden
+aufreibender
+aufreibendes
+aufreihe
+aufreihen
+aufreiss
+aufreissen
+aufreissend
+aufreissendem
+aufreissenden
+aufreissender
+aufreize
+aufreizende
+aufreizendem
+aufreizenden
+aufreizendes
+aufricht
+aufrichten
+aufrichtend
+aufrichtendem
+aufrichtenden
+aufrichtender
+aufrichtete
+aufrichtig
+aufrichtige
+aufrichtigen
+aufrichtiger
+aufrichtigere
+aufrichtigeren
+aufrichtigerer
+aufrichtigeres
+aufrichtigkeit
+aufrichtigste
+aufrichtigstem
+aufrichtigsten
+aufrichtigstes
+aufrichtung
+aufrief
+aufriefe
+aufriefen
+aufriss
+aufrolle
+aufrollend
+aufrollende
+aufrollendem
+aufrollender
+aufrollendes
+aufru"hr
+aufru"hren
+aufru"st
+aufru"stbarer
+aufru"stung
+aufrueck
+aufruecken
+aufrueckend
+aufrueckendem
+aufrueckenden
+aufrueckender
+aufruehr
+aufruehren
+aufruehrerischen
+aufruehrerischer
+aufruest
+aufruestend
+aufruestende
+aufruestendem
+aufruestender
+aufruestendes
+aufruestete
+aufruestungen
+aufruestungsprogramm
+aufruett
+aufruettelnde
+aufruf
+aufrufba
+aufrufbar
+aufrufbaren
+aufrufe
+aufrufen
+aufrufend
+aufrufende
+aufrufendem
+aufrufender
+aufrufendes
+aufrufs
+aufruft
+aufruhr
+aufrunde
+aufrundend
+aufrundende
+aufrundendem
+aufrundender
+aufrundendes
+aufrundet
+aufs
+aufsaess
+aufsaessige
+aufsaessigem
+aufsaessigen
+aufsaessigere
+aufsaessigerem
+aufsaessigeren
+aufsaessigeres
+aufsaessiges
+aufsaessigste
+aufsaessigsten
+aufsaessigster
+aufsaessigstes
+aufsaetz
+aufsaetze
+aufsaetzen
+aufsagen
+aufsagend
+aufsagende
+aufsagenden
+aufsagender
+aufsagendes
+aufsamme
+aufsammeln
+aufsammelnd
+aufsammelnde
+aufsammelnden
+aufsammelnder
+aufsammelndes
+aufsatz
+aufsauge
+aufsaugend
+aufsaugende
+aufsaugendem
+aufsaugender
+aufsaugendes
+aufsaugt
+aufschau
+aufschauen
+aufschauend
+aufschauendem
+aufschauenden
+aufschauender
+aufschaukeln
+aufscheu
+aufscheuchen
+aufscheuchend
+aufscheuchende
+aufscheuchenden
+aufscheuchender
+aufscheuchendes
+aufschic
+aufschichtend
+aufschichtende
+aufschichtendem
+aufschichtender
+aufschichtendes
+aufschie
+aufschieben
+aufschiebende
+aufschiebendem
+aufschiebenden
+aufschiebendes
+aufschla
+aufschlaege
+aufschlag
+aufschlagbaelle
+aufschlageisen
+aufschlagen
+aufschlagend
+aufschlagendem
+aufschlagenden
+aufschlagender
+aufschlagspiel
+aufschlagstelle
+aufschlagzuender
+aufschli
+aufschliessen
+aufschliessend
+aufschliessende
+aufschliessenden
+aufschliessender
+aufschliessendes
+aufschlitzen
+aufschlu
+aufschluesse
+aufschluss
+aufschlussreiche
+aufschlussreichem
+aufschlussreichen
+aufschlussreichere
+aufschlussreicherem
+aufschlussreicheren
+aufschlussreicheres
+aufschlussreiches
+aufschlussreichste
+aufschlussreichsten
+aufschlussreichster
+aufschlussreichstes
+aufschna
+aufschnappen
+aufschne
+aufschneiden
+aufschneidend
+aufschneidende
+aufschneidenden
+aufschneidender
+aufschneidendes
+aufschneider
+aufschneiderei
+aufschneidereien
+aufschneiders
+aufschni
+aufschnitt
+aufschnitte
+aufschnittes
+aufschnu
+aufschnueren
+aufschnuerend
+aufschnuerende
+aufschnuerender
+aufschnuerendes
+aufschra
+aufschrauben
+aufschraubend
+aufschraubende
+aufschraubenden
+aufschraubendes
+aufschre
+aufschrecken
+aufschreckend
+aufschreckenden
+aufschreckender
+aufschreckendes
+aufschrei
+aufschreibend
+aufschreibende
+aufschreibenden
+aufschreibendes
+aufschreie
+aufschreien
+aufschreiend
+aufschreiendem
+aufschreienden
+aufschreiender
+aufschri
+aufschrien
+aufschrift
+aufschriften
+aufschu"
+aufschu"tteln
+aufschub
+aufschue
+aufschuebe
+aufschuerfend
+aufschuerfende
+aufschuerfenden
+aufschuerfendes
+aufschuettungsebene
+aufschwi
+aufschwingen
+aufschwu
+aufschwungs
+aufsehen
+aufsehend
+aufsehenden
+aufsehender
+aufsehendes
+aufsehenerregende
+aufsehenerregendem
+aufsehenerregenden
+aufsehenerregendere
+aufsehenerregenderem
+aufsehenerregenderen
+aufsehenerregenderes
+aufsehenerregendes
+aufsehenerregendste
+aufsehenerregendsten
+aufsehenerregendster
+aufsehenerregendstes
+aufsehens
+aufseher
+aufseherin
+aufseherinnen
+aufsehern
+aufsetze
+aufsetzen
+aufsetzend
+aufsetzende
+aufsetzenden
+aufsetzendes
+aufsetzt
+aufsetzte
+aufsetzten
+aufsicht
+aufsichten
+aufsichtratsmitglieder
+aufsichtsbehoerde
+aufsichtsbehoerden
+aufsichtsbehoerdenpruefung
+aufsichtsorgan
+aufsichtspersonal
+aufsichtspersonen
+aufsichtspflicht
+aufsichtsraeten
+aufsichtsrat
+aufsichtsrates
+aufsichtsratsgremien
+aufsichtsratsitze
+aufsichtsratsmitglied
+aufsichtsratsverguetung
+aufsichtsratvertreter
+aufsieht
+aufsitze
+aufsitzen
+aufspalt
+aufspalten
+aufspaltet
+aufspaltung
+aufspann
+aufspannen
+aufspannende
+aufspannendem
+aufspannenden
+aufspannendes
+aufspare
+aufsparen
+aufsparend
+aufsparendem
+aufsparenden
+aufsparender
+aufsperr
+aufsperren
+aufsperrend
+aufsperrende
+aufsperrenden
+aufsperrender
+aufsperrendes
+aufspiel
+aufspielende
+aufspies
+aufspiessen
+aufspiessend
+aufspiessende
+aufspiessenden
+aufspiessender
+aufspiessendes
+aufspran
+aufsprang
+aufsprin
+aufspringen
+aufspringende
+aufspringendem
+aufspringenden
+aufspringt
+aufspuer
+aufspueren
+aufspuerende
+aufspuerenden
+aufspuerender
+aufstach
+aufstacheln
+aufstachelnd
+aufstachelnde
+aufstachelnder
+aufstachelndes
+aufstaen
+aufstaende
+aufstaenden
+aufstaendisch
+aufstaendische
+aufstaendischen
+aufstaendischer
+aufstaendisches
+aufstamp
+aufstampfen
+aufstampfende
+aufstampfenden
+aufstampfender
+aufstand
+aufstands
+aufstandsbewegung
+aufstandsbewegungen
+aufstape
+aufstapeln
+aufstapelnd
+aufstapelnden
+aufstapelnder
+aufstapelndes
+aufsteck
+aufstecken
+aufsteckend
+aufsteckende
+aufsteckenden
+aufsteckendes
+aufstecknetzteil
+aufstehe
+aufstehen
+aufstehend
+aufstehende
+aufstehender
+aufstehendes
+aufsteht
+aufsteig
+aufsteigend
+aufsteigende
+aufsteigenden
+aufsteigender
+aufsteigendes
+aufsteiger
+aufsteigern
+aufsteigt
+aufstell
+aufstellbar
+aufstellen
+aufstellend
+aufstellende
+aufstellender
+aufstellendes
+aufstellort
+aufstellpla"ne
+aufstellplan
+aufstellt
+aufstellung
+aufstellungen
+aufstellungsplanung
+aufstieg
+aufstiegen
+aufstiegs
+aufstiegschancen
+aufstiegskandidaten
+aufsto"h
+aufsto"hnend
+aufstock
+aufstockmoeglichkeiten
+aufstockt
+aufstockungsfaehig
+aufstoeb
+aufstoebernd
+aufstoebernde
+aufstoeberndem
+aufstoebernder
+aufstoeberndes
+aufstoss
+aufstossen
+aufstossend
+aufstossende
+aufstossenden
+aufstossender
+aufstossendes
+aufstreb
+aufstreben
+aufstrebende
+aufstrebendem
+aufstrebenden
+aufstrebendes
+aufstrei
+aufstreichen
+aufstreichend
+aufstreichenden
+aufstreichender
+aufstreichendes
+aufstric
+aufstrich
+aufstrichen
+aufstrichs
+aufstuet
+aufstuetzen
+aufstuetzende
+aufstuetzenden
+aufstuetzender
+aufsuche
+aufsuchend
+aufsuchende
+aufsuchenden
+aufsuchendes
+aufsucht
+aufsuchte
+aufsuchu
+aufsuchung
+aufsummi
+aufsummieren
+aufsummiert
+auftanke
+auftanken
+auftankend
+auftankende
+auftankenden
+auftankender
+auftankendes
+auftat
+auftauch
+auftauchen
+auftauchend
+auftauchende
+auftauchenden
+auftauchender
+auftauchendes
+auftaucht
+auftauchten
+auftauen
+auftauend
+auftauendem
+auftauenden
+auftauender
+auftaut
+aufteilb
+aufteilbar
+aufteile
+aufteilen
+aufteilend
+aufteilendem
+aufteilenden
+aufteilender
+aufteilu
+aufteilung
+auftisch
+auftischen
+auftischend
+auftischende
+auftischender
+auftischendes
+auftra"g
+auftra"ge
+auftra"gen
+auftraeg
+auftraege
+auftraegt
+auftrag
+auftrage
+auftragen
+auftragend
+auftragende
+auftragenden
+auftragendes
+auftrages
+auftragg
+auftraggeber
+auftraggebern
+auftraggebers
+auftrags
+auftragsabschluss
+auftragsabwicklung
+auftragsangebot
+auftragsannahme
+auftragsausfall
+auftragsbearbeitung
+auftragsbesta"tigung
+auftragsbestaenden
+auftragsbestaetigung
+auftragsbestaetigungen
+auftragsbestandes
+auftragseingang
+auftragseinheit
+auftragsentwicklung
+auftragserga"nzung
+auftragserteilung
+auftragserteilungen
+auftragserweiterungen
+auftragsfernschreiber
+auftragsformular
+auftragsformulare
+auftragsformulars
+auftragsforschung
+auftragsgema"ss
+auftragsgemaess
+auftragsgemaesse
+auftragsgemaessen
+auftragsgemaesser
+auftragsgemaesses
+auftragsgro"sse
+auftragslage
+auftragsnummer
+auftragsordner
+auftragsphase
+auftragssperre
+auftragssumme
+auftragstrend
+auftragsvergabe
+auftragsverhandlungen
+auftragsvolumen
+auftragswerke
+auftragswert
+auftragswertes
+auftragswesen
+auftrate
+auftraten
+auftreff
+auftreffen
+auftreffend
+auftreffenden
+auftreffender
+auftreffendes
+auftreib
+auftreiben
+auftreibend
+auftreibende
+auftreibendem
+auftreibender
+auftreibendes
+auftrenn
+auftrennen
+auftrennende
+auftrennenden
+auftrennender
+auftrennung
+auftrete
+auftreten
+auftretend
+auftretende
+auftretendem
+auftretenden
+auftretender
+auftretens
+auftrieb
+auftriebe
+auftriebs
+auftriebskraefte
+auftriebskraft
+auftritt
+auftritte
+auftritten
+auftrittsverbot
+auftrump
+auftrumpfen
+auftrumpfende
+auftun
+auftut
+aufuelle
+aufuellend
+aufwa"rm
+aufwa"rmen
+aufwa"rmu"bungen
+aufwa"rt
+aufwa"rts
+aufwa"rtsbewegung
+aufwache
+aufwachen
+aufwachende
+aufwachenden
+aufwachender
+aufwachm
+aufwachmeldungen
+aufwachs
+aufwachsen
+aufwachsend
+aufwachsende
+aufwachsender
+aufwachsendes
+aufwacht
+aufwachten
+aufwaend
+aufwaende
+aufwaenden
+aufwaerm
+aufwaermen
+aufwaermend
+aufwaermenden
+aufwaermender
+aufwaermendes
+aufwaert
+aufwaertsentwicklung
+aufwaertsgeht
+aufwaertskorrektur
+aufwaertsspirale
+aufwaertstrend
+aufwaertstrends
+aufwaertswelle
+aufwalle
+aufwallen
+aufwallt
+aufwallu
+aufwallung
+aufwand
+aufwands
+aufwarte
+aufwartefrau
+aufwartefrauen
+aufwarten
+aufwartend
+aufwartende
+aufwartender
+aufwartendes
+aufwartet
+aufwartu
+aufwartung
+aufwasch
+aufwaschen
+aufwaschend
+aufwaschende
+aufwaschender
+aufwaschendes
+aufwecke
+aufwecken
+aufweckende
+aufweckenden
+aufweckender
+aufweich
+aufweichen
+aufweichend
+aufweichende
+aufweichender
+aufweichendes
+aufweichung
+aufweise
+aufweisen
+aufweisend
+aufweisende
+aufweisenden
+aufweisendes
+aufweist
+aufwende
+aufwenden
+aufwendende
+aufwendenden
+aufwendender
+aufwendet
+aufwendete
+aufwendeten
+aufwendi
+aufwendig
+aufwendige
+aufwendigem
+aufwendigen
+aufwendigere
+aufwendigerem
+aufwendigeren
+aufwendigeres
+aufwendiges
+aufwendigste
+aufwendigsten
+aufwendigster
+aufwendigstes
+aufwendu
+aufwendung
+aufwendungen
+aufwerfe
+aufwerfen
+aufwerfend
+aufwerfende
+aufwerfenden
+aufwerfendes
+aufwerte
+aufwerten
+aufwertend
+aufwertenden
+aufwertender
+aufwertendes
+aufwertu
+aufwertung
+aufwertungen
+aufwicke
+aufwickeln
+aufwickelnd
+aufwickelnde
+aufwickelnden
+aufwickelndes
+aufwickelrolle
+aufwickelvorrichtung
+aufwickelvorrichtungen
+aufwiege
+aufwiegeln
+aufwiegelnd
+aufwiegelnden
+aufwiegelnder
+aufwiegelndes
+aufwiegend
+aufwiegende
+aufwiegenden
+aufwiegendes
+aufwiegt
+aufwies
+aufwind
+aufwinde
+aufwindes
+aufwirbe
+aufwirbeln
+aufwirbelnd
+aufwirbelnde
+aufwirbelnder
+aufwirbelndes
+aufwirbelt
+aufwirbelte
+aufwisch
+aufwischen
+aufwischend
+aufwischende
+aufwischender
+aufwischendes
+aufwuehl
+aufwuehlen
+aufwurf
+aufza"hl
+aufza"hlung
+aufzaehl
+aufzaehlen
+aufzaehlende
+aufzaehlenden
+aufzaehlender
+aufzaehlt
+aufzaehlte
+aufzaehlung
+aufzehre
+aufzehren
+aufzeich
+aufzeichnen
+aufzeichnend
+aufzeichnende
+aufzeichnender
+aufzeichnendes
+aufzeichnet
+aufzeichnung
+aufzeichnungen
+aufzeichnungstra"ger
+aufzeige
+aufzeigen
+aufzeigend
+aufzeigende
+aufzeigendem
+aufzeigender
+aufzeigendes
+aufzeigt
+aufziehe
+aufziehen
+aufziehend
+aufziehende
+aufziehender
+aufziehendes
+aufzieht
+aufzubau
+aufzubauen
+aufzubes
+aufzubessern
+aufzubie
+aufzubieten
+aufzubin
+aufzubinden
+aufzubla
+aufzublasen
+aufzuboh
+aufzubohren
+aufzubre
+aufzubrechen
+aufzubri
+aufzubringen
+aufzubue
+aufzubuerden
+aufzudec
+aufzudecken
+aufzudre
+aufzudrehen
+aufzudru
+aufzudruecken
+aufzuech
+aufzuechte
+aufzuechten
+aufzuege
+aufzuerl
+aufzuerlegen
+aufzufal
+aufzufallen
+aufzufan
+aufzufangen
+aufzufin
+aufzufinden
+aufzufor
+aufzufordern
+aufzufri
+aufzufrischen
+aufzufue
+aufzufuehrenden
+aufzug
+aufzugan
+aufzuganlage
+aufzugeb
+aufzugeben
+aufzugli
+aufzugliedern
+aufzugre
+aufzugreifen
+aufzugs
+aufzuhae
+aufzuhaengen
+aufzuhal
+aufzuhalten
+aufzuheb
+aufzuheben
+aufzuhei
+aufzuheitern
+aufzuhel
+aufzuhelfen
+aufzuhol
+aufzuholen
+aufzukau
+aufzukaufen
+aufzukla
+aufzuklaeren
+aufzukom
+aufzukommen
+aufzulas
+aufzulasten
+aufzuleg
+aufzulegen
+aufzuleh
+aufzulehnen
+aufzules
+aufzulesen
+aufzulo"
+aufzulo"sen
+aufzuloc
+aufzulockern
+aufzuloe
+aufzuloesen
+aufzuneh
+aufzunehmen
+aufzunehmenden
+aufzuopf
+aufzuopfern
+aufzupol
+aufzupolieren
+aufzupra
+aufzupra"gen
+aufzurae
+aufzuraeumen
+aufzurec
+aufzurechnen
+aufzureg
+aufzuregen
+aufzurei
+aufzureissen
+aufzuric
+aufzurichten
+aufzurol
+aufzurollen
+aufzurue
+aufzuruecken
+aufzuruf
+aufzurufen
+aufzusch
+aufzuschieben
+aufzuschliessen
+aufzuschlu"sseln
+aufzuschnueren
+aufzuschreiben
+aufzuspa
+aufzuspalten
+aufzuspi
+aufzuspielen
+aufzuspu
+aufzuspueren
+aufzusta
+aufzustauen
+aufzuste
+aufzustehen
+aufzustellen
+aufzusto
+aufzustocken
+aufzustoebern
+aufzusuc
+aufzusuchen
+aufzutau
+aufzutauchen
+aufzutei
+aufzuteilen
+aufzutra
+aufzutragen
+aufzutre
+aufzutrennenden
+aufzutreten
+aufzutun
+aufzuwac
+aufzuwachsen
+aufzuwae
+aufzuwaermen
+aufzuwec
+aufzuwecken
+aufzuwei
+aufzuweisen
+aufzuweiten
+aufzuwer
+aufzuwerfen
+aufzuwie
+aufzuwiegeln
+aufzuwiegen
+aufzuzei
+aufzuzeichnen
+aufzuzeigen
+aufzuzie
+aufzuziehen
+aufzwang
+aufzwangen
+aufzwing
+aufzwingen
+aufzwingend
+aufzwingenden
+aufzwingender
+aufzwingendes
+aufzwingt
+aug
+auga
+auganite
+augapfel
+augapfels
+augar
+auge
+augean
+augelite
+augen
+augenaer
+augenaerzte
+augenaerzten
+augenarz
+augenarzt
+augenarztes
+augenauf
+augenaufschlag
+augenbli
+augenblick
+augenblicke
+augenblicken
+augenblicklich
+augenblickliche
+augenblicklichem
+augenblicklicher
+augenblickliches
+augenblicks
+augenbra
+augenbrauen
+augend
+augendec
+augendeckel
+augends
+augenfae
+augenfaellig
+augenfaelligen
+augenfaelliges
+augenfeh
+augenfehler
+augenfle
+augenfleck
+augenhei
+augenheilkunde
+augenho"
+augenho"he
+augenhoe
+augenhoehlen
+augenlic
+augenlicht
+augenlid
+augenlider
+augenlidern
+augenlos
+augenmas
+augenmass
+augenmer
+augenmerk
+augenope
+augenoperation
+augenpaa
+augenpaare
+augenpar
+augenpartie
+augensch
+augenschein
+augenscheinlich
+augenscheinliche
+augenscheinlichen
+augenschmerzen
+augenste
+augenstellung
+augentie
+augentierchens
+augenueb
+augenuebel
+augenwei
+augenweide
+augenwin
+augenwinkeln
+augenwis
+augenwischerei
+augenzeu
+augenzeuge
+augenzeugen
+augenzeugenberichten
+augenzwi
+augenzwinkern
+auger
+augerer
+augeri
+augers
+auges
+augh
+aughra
+aught
+aughtlin
+aughtlins
+aughts
+augiasst
+augiasstal
+augiasstall
+augiasstallen
+augie
+augila
+augilar
+augita
+augite
+augitic
+augitite
+augitoph
+augitophyre
+augment
+augmenta
+augmentable
+augmentacio`n
+augmentaient
+augmentais
+augmentait
+augmentant
+augmentar
+augmentation
+augmentationer
+augmentations
+augmentative
+augmentatively
+augmente
+augmente'
+augmente'e
+augmente'es
+augmente's
+augmente`rent
+augmented
+augmentedly
+augmentent
+augmenter
+augmentera
+augmenterai
+augmenteraient
+augmenterais
+augmenterait
+augmenteras
+augmenterez
+augmenteriez
+augmenterions
+augmenterons
+augmenteront
+augmenters
+augmentes
+augmentez
+augmenti
+augmentiez
+augmenting
+augmentions
+augmentive
+augmento
+augmentons
+augments
+augot
+augres
+augsburg
+augsburgske
+augu
+augur
+augura
+auguracio`n
+augurador
+auguradora
+augurai
+auguraie
+auguraient
+augurais
+augurait
+augural
+auguramm
+augurammo
+augurand
+augurando
+augurano
+augurant
+augurar
+augurare
+auguraro
+augurarono
+augurass
+augurasse
+augurassi
+augurast
+auguraste
+augurasti
+augurata
+augurate
+augurati
+auguration
+augurato
+augurava
+auguravamo
+auguravano
+auguravate
+auguravi
+auguravo
+augure
+augure'
+augure'e
+augure'es
+augure's
+augure`r
+augure`rent
+augured
+auguren
+augurenl
+augurenlach
+augurent
+augurer
+augurera
+augurerai
+augureraient
+augurerais
+augurerait
+augureras
+augurere
+augurerei
+augureremo
+augurerete
+augurerez
+augureri
+augureriez
+augurerions
+augurero
+augurerons
+augureront
+augurers
+augures
+augurez
+auguri
+augurial
+auguriam
+auguriamo
+auguriat
+auguriate
+auguries
+auguriez
+auguring
+augurino
+augurio
+augurion
+augurions
+augurk
+augurken
+auguro
+augurons
+augurous
+augurs
+augurshi
+augurship
+augury
+august
+augusta
+augustab
+augustabend
+augustal
+augustamente
+augustan
+augustas
+augustasprings
+auguste
+augustenborg
+auguster
+augustes
+augustest
+augusti
+augustia
+augustias
+augustij
+augustijn
+augustijnen
+augustijnenklooster
+augustijnenkloosters
+augustijner
+augustin
+augustina
+augustine
+augustinerstift
+augustinian
+augustinianism
+augustinism
+augustino
+augustly
+augustne
+augustness
+augusto
+augusts
+augustus
+augusubu
+auguta
+augy
+auh
+auhelawa
+auhuhu
+aui
+auiatara
+auiatarauwi
+auikiben
+auishiri
+auiti
+auj
+aujila
+aujourd'
+aujourd'hui
+auk
+auka
+aukaans
+auke
+auken
+auker
+aukin
+auklet
+auklets
+aukov
+aukra
+auks
+aukshtai
+aukshtaichiai
+aukshtaitish
+auksjon
+auksjona
+auksjonarius
+auksjonariusen
+auksjone
+auksjonen
+auksjoner
+auksjonere
+auksjonert
+aukte
+auktion
+auktione
+auktionen
+auktions
+auktionskosten
+auktionsverkauf
+auktorit
+auktoritaer
+auktoritaera
+auktoritar
+auktoritara
+auktoritativ
+auktoritet
+auktoriteter
+auktorit{r
+auktorit{ra
+aukuni
+aukusti
+aukwe
+aul
+aula
+aula's
+aula`quida
+aulacoca
+aulacocarpous
+aulacodu
+aulacodus
+aulacomn
+aulacomniaceae
+aulacomnium
+aulad
+aulae
+aulaen
+aulaga
+aulagar
+aulakh
+aulander
+aularian
+aulasale
+aulasalen
+aulaula
+auld
+aulder
+auldest
+auldfarr
+auldfarrantlike
+aulds
+aule
+auler
+auletai
+aulete
+auletes
+auletic
+auletrid
+auletrides
+auletris
+auli
+aulic
+aulicism
+aulikki
+aulis
+aulla
+aulladero
+aullador
+aulladora
+aullante
+aullar
+aullido
+auloi
+aulophyt
+aulophyte
+aulos
+aulostom
+aulostoma
+aulostomatidae
+aulostomi
+aulostomid
+aulostomidae
+aulostomus
+ault
+aultman
+aulu
+aulua
+aulupeko
+aulupekotofa
+aum
+aumaga
+aumail
+aumbry
+aumenta
+aumentable
+aumentacio`n
+aumentada
+aumentador
+aumentadora
+aumentai
+aumentam
+aumentammo
+aumentan
+aumentando
+aumentano
+aumentante
+aumentar
+aumentare
+aumentas
+aumentasse
+aumentassi
+aumentaste
+aumentasti
+aumentat
+aumentata
+aumentate
+aumentati
+aumentativa
+aumentativo
+aumentato
+aumentav
+aumentava
+aumentavi
+aumentavo
+aumenter
+aumentera
+aumenterai
+aumenterei
+aumentero
+aumenti
+aumentia
+aumentiamo
+aumentiate
+aumentin
+aumentino
+aumento
+aumerle
+aumery
+aumil
+aumildar
+aumo^ne
+aumo^ner
+aumo^nerie
+aumo^neries
+aumo^nes
+aumo^nie
+aumo^nier
+aumo^niers
+aumoine
+aumont
+aumous
+aumrie
+aumsvill
+aumsville
+aun
+auna
+aunaagar
+aunaagaraiwa
+aunalei
+aunamiento
+aunar
+auncel
+aundrea
+aune
+aunes
+aung
+aungar
+auni
+auniga
+aunjetit
+aunjetitz
+auno
+aunon
+aunque
+aunt
+aunthood
+aunthoods
+aunti
+auntie
+aunties
+auntish
+auntlies
+auntliest
+auntlike
+auntly
+aunts
+auntsary
+auntship
+aunty
+aunus
+aunuu
+auo
+aup
+aupaka
+aupar
+auparava
+auparavant
+aupre`s
+auquel
+auquidih
+auquidihogwa
+auquier
+aur
+aura
+aurae
+auraen
+auraer
+auraham
+aurai
+auraient
+aurais
+aurait
+aural
+aurally
+aurama
+auramine
+auran
+aurancia`cea
+aurancia`ceo
+aurantia
+aurantiaceae
+aurantiaceous
+aurantiu
+aurantium
+aurar
+auras
+aurate
+aurated
+auravict
+auravictrix
+auray
+aure
+aure'ole
+aure'ole'
+aure'ole'e
+aure'ole'es
+aure'ole's
+aure'oler
+aure'oles
+aurea
+aureate
+aureatel
+aureately
+aureaten
+aureateness
+aureatio
+aureation
+auree
+auregarn
+aurei
+aureity
+aurel
+aurele
+aurelea
+aurelia
+aurelian
+aurelianense
+aureliano
+aurelie
+aurelio
+aurelius
+aurelle
+auren
+aureo
+aureocas
+aureocasidium
+aureola
+aureolae
+aureolar
+aureolas
+aureole
+aureoled
+aureolen
+aureoles
+aureolin
+aureoline
+aureomyc
+aureomycin
+aureool
+aureoppd
+aureoppdrett
+aureous
+aureousl
+aureously
+aurer
+aurero
+aures
+auresca
+aurestan
+aurestang
+auret
+aureus
+aurevatn
+aurez
+aurgitana
+aurgitano
+auri
+auri`cula
+auri`fera
+auri`fero
+auri`vora
+auri`voro
+auria
+auribrom
+auribromide
+auric
+aurichal
+aurichalcite
+aurichalcum
+aurichlo
+aurichloride
+aurichlorohydric
+auricle
+auricled
+auricles
+auricomo
+auricomous
+auricula
+auriculae
+auriculaire
+auricular
+auriculare
+auriculares
+auricularia
+auriculariaceae
+auriculariae
+auriculariales
+auricularian
+auricularis
+auricularly
+auriculate
+auriculated
+auriculately
+auriculi
+auriculidae
+auriculo
+auriculocranial
+auriculoparietal
+auriculotemporal
+auriculoventricular
+auriculovertical
+auricyan
+auricyanhydric
+auricyanic
+auricyanide
+auride
+aurie
+auriense
+auriez
+aurifabrista
+aurife`r
+aurife`re
+aurife`res
+aurifero
+auriferous
+aurific
+aurifica
+aurification
+aurifier
+auriform
+aurify
+auriga
+aurigal
+aurigati
+aurigation
+aurigera
+aurigero
+aurigerous
+aurigid
+aurignac
+aurignacian
+aurikkel
+aurikkelen
+aurikler
+aurilave
+aurilia
+aurime
+aurin
+aurinasa
+aurinasal
+auriol
+aurions
+auriphon
+auriphone
+auriphry
+auriphrygia
+auriphrygiate
+auripunc
+auripuncture
+aurir
+auriscal
+auriscalp
+auriscalpia
+auriscalpium
+auriscop
+auriscope
+auriscopy
+aurist
+aurite
+aurivoro
+aurivorous
+aurland
+aurlendt
+aurlie
+aurness
+auro
+auroauri
+auroauric
+aurobrom
+aurobromide
+auroch
+aurochlo
+aurochloride
+aurochs
+aurochse
+aurochses
+aurocyan
+aurocyanide
+aurodiam
+aurodiamine
+auron
+auronal
+aurons
+auront
+auroora
+aurophob
+aurophobia
+aurophor
+aurophore
+aurora
+aurorae
+auroral
+aurorall
+aurorally
+auroras
+aurore
+aurorean
+aurorian
+aurorium
+aurotell
+aurotellurite
+aurothio
+aurothiosulphate
+aurothiosulphuric
+aurous
+aurragada
+aurragado
+aurrescu
+aurskog
+aurthur
+auru`spice
+aurukun
+aurulent
+aurum
+aurums
+aurure
+auryl
+aus
+ausablef
+ausableforks
+ausarbei
+ausarbeiten
+ausarbeitend
+ausarbeitende
+ausarbeitender
+ausarbeitendes
+ausarbeitete
+ausarbeitung
+ausarbeitungen
+ausarten
+ausartend
+ausartende
+ausartendem
+ausartender
+ausartendes
+ausartet
+ausartun
+ausartung
+ausatmen
+ausatmend
+ausatmende
+ausatmender
+ausatmendes
+ausbaden
+ausbadende
+ausbadenden
+ausbadender
+ausbalan
+ausbalancieren
+ausbalanciert
+ausbalancierte
+ausbau
+ausbauba
+ausbaubaren
+ausbauda
+ausbaudaches
+ausbauei
+ausbaueigene
+ausbaueinheit
+ausbauen
+ausbauend
+ausbauende
+ausbauender
+ausbauendes
+ausbaufa
+ausbaufaehig
+ausbaufaehigem
+ausbaufaehigen
+ausbaufaehiger
+ausbaufaehigerem
+ausbaufaehigeren
+ausbaufaehigerer
+ausbaufaehiges
+ausbaufaehigste
+ausbaufaehigstem
+ausbaufaehigster
+ausbaufaehigstes
+ausbaufu
+ausbaufunktionen
+ausbauge
+ausbaugera"t
+ausbaugestell
+ausbaugestelle
+ausbaugestellen
+ausbaugestelles
+ausbaugestells
+ausbaugr
+ausbaugruppen
+ausbauin
+ausbauingenieure
+ausbauinitiierung
+ausbaulo
+ausbaulokale
+ausbauma
+ausbaumassnahmen
+ausbaunu
+ausbaunummer
+ausbaupa
+ausbauparameter
+ausbaupl
+ausbauplaene
+ausbaus
+ausbausi
+ausbausimulator
+ausbausimulatoren
+ausbaust
+ausbaustellung
+ausbausteuergera"te
+ausbausteuerung
+ausbausteuerungen
+ausbausteuerungs
+ausbaustrecke
+ausbaustufe
+ausbaute
+ausbauten
+ausbesse
+ausbessern
+ausbessernde
+ausbessernden
+ausbessernder
+ausbesserungen
+ausbesserungsarbeiten
+ausbeute
+ausbeuten
+ausbeutend
+ausbeutende
+ausbeutender
+ausbeutendes
+ausbeuterisch
+ausbeutu
+ausbeutung
+ausbeutungen
+ausbeutungsmoeglichkeit
+ausbezah
+ausbezahlt
+ausbilde
+ausbilden
+ausbildend
+ausbildende
+ausbildender
+ausbildendes
+ausbilder
+ausbilderpruefungen
+ausbildet
+ausbildu
+ausbildung
+ausbildungsabschnitte
+ausbildungsbedingungen
+ausbildungsbeihilfe
+ausbildungsbetriebe
+ausbildungsdauer
+ausbildungsfoerderung
+ausbildungsjahr
+ausbildungslehrgaenge
+ausbildungslehrgaengen
+ausbildungslehrganges
+ausbildungsmandat
+ausbildungsmoeglichkeiten
+ausbildungsordnung
+ausbildungsplaetze
+ausbildungsplan
+ausbildungsprobleme
+ausbildungsprogramm
+ausbildungsstaetten
+ausbildungstaetigkeit
+ausbildungsteile
+ausbildungsunterlagen
+ausbildungswesen
+ausbildungszeit
+ausbildungszentrum
+ausbildungszulage
+ausbitte
+ausbitten
+ausbittend
+ausbittende
+ausbittenden
+ausbittender
+ausbittendes
+ausblase
+ausblasend
+ausblasende
+ausblasenden
+ausbleib
+ausbleiben
+ausbleibend
+ausbleibende
+ausbleibenden
+ausbleibender
+ausbleibendes
+ausbleibt
+ausbleic
+ausbleichen
+ausbleichend
+ausbleichende
+ausbleichender
+ausbleichendes
+ausblend
+ausblenden
+ausblick
+ausblicken
+ausblicks
+ausblieb
+ausblieben
+ausblute
+ausbluten
+ausblutend
+ausblutendem
+ausblutenden
+ausblutender
+ausbohre
+ausbohren
+ausboote
+ausbooten
+ausborge
+ausborgen
+ausborgend
+ausborgenden
+ausborgender
+ausborgendes
+ausbrach
+ausbrann
+ausbrannte
+ausbrech
+ausbrechen
+ausbrechend
+ausbrechende
+ausbrechenden
+ausbrechender
+ausbrechendes
+ausbrecher
+ausbrecherkoenig
+ausbreit
+ausbreiten
+ausbreitend
+ausbreitende
+ausbreitendem
+ausbreitender
+ausbreitendes
+ausbreitet
+ausbreitung
+ausbreitungen
+ausbreitungsbedingungen
+ausbreitungsflu"ssigkeit
+ausbreitungsmedium
+ausbreitungsvolumen
+ausbreitungsweg
+ausbreitunsmedium
+ausbrenn
+ausbrennen
+ausbrennend
+ausbrennende
+ausbrennenden
+ausbrennender
+ausbrennendes
+ausbring
+ausbringt
+ausbruch
+ausbruchsversuch
+ausbruec
+ausbrueche
+ausbruet
+ausbruetend
+ausbruetende
+ausbruetendem
+ausbruetender
+ausbruetendes
+ausbucht
+ausbuchtung
+ausbuchtungen
+ausbuerg
+ausbuergern
+ausbuergernde
+ausbuergernden
+ausbuergernder
+ausbuers
+ausbuersten
+ausbuerstend
+ausbuerstende
+ausbuerstender
+ausbuerstendes
+auschin
+auschlag
+auschlaggebend
+auschwit
+auschwitz
+auscult
+ausculta
+auscultacio`n
+auscultaient
+auscultais
+auscultait
+auscultant
+auscultar
+auscultascope
+auscultate
+auscultated
+auscultates
+auscultatie
+auscultating
+auscultation
+auscultations
+auscultative
+auscultator
+auscultatory
+ausculte
+ausculte'
+ausculte'e
+ausculte'es
+ausculte's
+ausculte`rent
+ausculteer
+ausculteerde
+ausculteerden
+ausculteert
+auscultent
+ausculter
+auscultera
+ausculterai
+ausculteraient
+ausculterais
+ausculterait
+ausculteras
+ausculteren
+ausculterez
+ausculteriez
+ausculterions
+ausculterons
+ausculteront
+auscultes
+auscultez
+ausculti
+auscultiez
+auscultions
+ausculto
+auscultons
+auscultoscope
+ausdacht
+ausdachte
+ausdauer
+ausdauernd
+ausdauernde
+ausdauerndem
+ausdauernder
+ausdauerndes
+ausdehen
+ausdehnb
+ausdehnbare
+ausdehnbarem
+ausdehnbaren
+ausdehnbarere
+ausdehnbarerem
+ausdehnbareren
+ausdehnbareres
+ausdehnbares
+ausdehnbarste
+ausdehnbarsten
+ausdehnbarster
+ausdehnbarstes
+ausdehne
+ausdehnend
+ausdehnende
+ausdehnenden
+ausdehnendes
+ausdehnt
+ausdehnte
+ausdehnu
+ausdehnung
+ausdehnungen
+ausdehnungsmoeglichkeit
+ausdehnungsvermoegens
+ausdenkb
+ausdenkbare
+ausdenkbarem
+ausdenkbaren
+ausdenkbares
+ausdenke
+ausdenken
+ausdenkend
+ausdenkenden
+ausdenkender
+ausdenkendes
+ausdisku
+ausdiskutiert
+ausdorre
+ausdorren
+ausdorrend
+ausdorrenden
+ausdorrender
+ausdorrendes
+ausdrehe
+ausdrehen
+ausdrehend
+ausdrehende
+ausdrehender
+ausdrehendes
+ausdru"c
+ausdru"cklich
+ausdru"cklichen
+ausdru"ckstift
+ausdru"ckt
+ausdruck
+ausdrucken
+ausdruckes
+ausdrucks
+ausdrucksbewegungn
+ausdrucksfaehig
+ausdrucksfaehigem
+ausdrucksfaehigen
+ausdrucksfaehiger
+ausdrucksfaehigerem
+ausdrucksfaehigeren
+ausdrucksfaehigerer
+ausdrucksfaehiges
+ausdrucksfaehigste
+ausdrucksfaehigstem
+ausdrucksfaehigster
+ausdrucksfaehigstes
+ausdrucksform
+ausdrucksfunktion
+ausdruckskraft
+ausdruckskunst
+ausdruckslos
+ausdruckslosem
+ausdruckslosen
+ausdrucksloser
+ausdrucksloserem
+ausdrucksloseren
+ausdrucksloserer
+ausdrucksloses
+ausdrucksloseste
+ausdruckslosestem
+ausdruckslosester
+ausdruckslosestes
+ausdrucksmittel
+ausdrucksmoeglichkeiten
+ausdrucksvoll
+ausdrucksvollem
+ausdrucksvollen
+ausdrucksvoller
+ausdrucksvollerem
+ausdrucksvolleren
+ausdrucksvollerer
+ausdrucksvolles
+ausdrucksvollste
+ausdrucksvollstem
+ausdrucksvollster
+ausdrucksvollstes
+ausdrucksweise
+ausdrucksweisen
+ausdruec
+ausdruecke
+ausdrueckend
+ausdrueckende
+ausdrueckenden
+ausdrueckendes
+ausdruecklich
+ausdrueckliche
+ausdruecklichen
+ausdruecklicher
+ausdruecklichere
+ausdruecklicheren
+ausdruecklicherer
+ausdruecklicheres
+ausdruecklichste
+ausdruecklichstem
+ausdruecklichsten
+ausdruecklichstes
+ausdrueckt
+ausdrueckte
+ausduens
+ausduenstung
+ausduenstungen
+ause
+auseinan
+auseinander
+auseinanderbrechen
+auseinanderbringen
+auseinanderbringend
+auseinanderbringende
+auseinanderbringender
+auseinanderbringendes
+auseinanderfaellt
+auseinanderfallend
+auseinanderfallende
+auseinanderfallendem
+auseinanderfallender
+auseinanderfallendes
+auseinandergebaut
+auseinandergebracht
+auseinandergebrachtem
+auseinandergebrachten
+auseinandergebrachter
+auseinandergebrochen
+auseinandergefallen
+auseinandergefallene
+auseinandergefallenen
+auseinandergefallenes
+auseinandergegangen
+auseinandergegangenem
+auseinandergegangenen
+auseinandergegangener
+auseinandergehalten
+auseinandergehaltene
+auseinandergehaltenem
+auseinandergehaltener
+auseinandergehaltenes
+auseinandergehen
+auseinandergehende
+auseinandergehendem
+auseinandergehenden
+auseinandergehendes
+auseinandergejagt
+auseinandergejagte
+auseinandergejagten
+auseinandergejagter
+auseinandergejagtes
+auseinandergelebte
+auseinandergelebtem
+auseinandergelebten
+auseinandergelebtes
+auseinandergenommen
+auseinandergenommene
+auseinandergenommenen
+auseinandergenommener
+auseinandergenommenes
+auseinandergerissene
+auseinandergerissenem
+auseinandergerissenen
+auseinandergerissenes
+auseinandergesetzt
+auseinandergesetzte
+auseinandergesetzten
+auseinandergesetzter
+auseinandergesetztes
+auseinandergetriebene
+auseinandergetriebenem
+auseinandergetriebenen
+auseinandergetriebenes
+auseinandergewuerfelten
+auseinandergezerrt
+auseinandergezogen
+auseinanderhalten
+auseinanderhaltend
+auseinanderhaltende
+auseinanderhaltender
+auseinanderhaltendes
+auseinanderjagen
+auseinanderjagende
+auseinanderjagendem
+auseinanderjagenden
+auseinanderjagendes
+auseinanderklaffen
+auseinanderklaffend
+auseinanderleben
+auseinanderlebende
+auseinanderlebendem
+auseinanderlebenden
+auseinanderlebendes
+auseinanderliegen
+auseinandernehmen
+auseinandernehmende
+auseinandernehmenden
+auseinandernehmender
+auseinandernimmt
+auseinanderreissen
+auseinanderreissende
+auseinanderreissenden
+auseinanderreissender
+auseinanderruecken
+auseinandersetung
+auseinandersetzen
+auseinandersetzend
+auseinandersetzende
+auseinandersetzender
+auseinandersetzendes
+auseinandersetzt
+auseinandersetzung
+auseinandersetzungen
+auseinandertreiben
+auseinandertreibend
+auseinandertreibende
+auseinandertreibender
+auseinandertreibendes
+auseinanderziehen
+auseinanderzugehen
+ausencia
+ausentada
+ausentado
+ausentar
+ausente
+auser
+auserkor
+auserkoren
+auserles
+auserlesen
+auserlesend
+auserlesenden
+auserlesender
+auserlesendes
+auserlesenem
+auserlesenen
+auserlesener
+auserlesenerem
+auserleseneren
+auserlesenerer
+auserlesenes
+auserlesenste
+auserlesenstem
+auserlesenster
+auserlesenstes
+auserseh
+ausersehen
+ausersehenen
+auserwae
+auserwaehlte
+auserwaehlten
+ausetana
+ausetano
+ausfa"ll
+ausfa"lle
+ausfa"llen
+ausfa"llt
+ausfaell
+ausfaelle
+ausfaellen
+ausfahre
+ausfahren
+ausfahrend
+ausfahrende
+ausfahrender
+ausfahrendes
+ausfahrt
+ausfahrten
+ausfall
+ausfallb
+ausfallberechnung
+ausfalle
+ausfallen
+ausfallende
+ausfallendem
+ausfallenden
+ausfallendes
+ausfallg
+ausfallgarantien
+ausfallm
+ausfallmuster
+ausfallq
+ausfallquote
+ausfallr
+ausfallrate
+ausfallraten
+ausfalls
+ausfallstrasse
+ausfallstrassen
+ausfallu
+ausfallursache
+ausfallz
+ausfallzeiten
+ausfat
+ausfecht
+ausfechten
+ausfechtend
+ausfechtenden
+ausfechtender
+ausfechtendes
+ausfegen
+ausfegend
+ausfegende
+ausfegenden
+ausfegendes
+ausfeile
+ausfeilen
+ausfeilende
+ausfeilender
+ausfeilendes
+ausferti
+ausfertigung
+ausfiel
+ausfiele
+ausfielen
+ausfinde
+ausfinden
+ausfindi
+ausfindig
+ausfindu
+ausfindungen
+ausflick
+ausflicken
+ausflickende
+ausflickenden
+ausflickendes
+ausflieg
+ausfliegen
+ausfliegend
+ausfliegende
+ausfliegenden
+ausfliegender
+ausfliegendes
+ausflies
+ausfliessen
+ausfliessend
+ausfliessendem
+ausfliessenden
+ausfliessender
+ausfluch
+ausflucht
+ausfluec
+ausfluechten
+ausflueg
+ausfluege
+ausfluegen
+ausflueglerinnen
+ausflueglern
+ausflues
+ausfluesse
+ausflug
+ausflugs
+ausflugsdampfer
+ausflugsfahrt
+ausflugsfahrten
+ausflugskarten
+ausflugslokal
+ausflugsmoeglichkeiten
+ausflugsort
+ausflugsorten
+ausflugspunkt
+ausflugsverkehr
+ausflugsziel
+ausfluss
+ausflusses
+ausflusshahn
+ausforme
+ausformen
+ausformu
+ausformung
+ausfrage
+ausfragend
+ausfragende
+ausfragenden
+ausfragendes
+ausfrans
+ausfransen
+ausfransend
+ausfransenden
+ausfransender
+ausfransendes
+ausfress
+ausfressend
+ausfressende
+ausfressenden
+ausfressendes
+ausfu"hr
+ausfu"hrbar
+ausfu"hrbare
+ausfu"hrbaren
+ausfu"hren
+ausfu"hrende
+ausfu"hrenden
+ausfu"hrlich
+ausfu"hrliche
+ausfu"hrlichen
+ausfu"hrlicher
+ausfu"hrliches
+ausfu"hrung
+ausfu"hrungen
+ausfu"hrungsform
+ausfu"ll
+ausfu"llen
+ausfu"llung
+ausfuehl
+ausfuehlrichen
+ausfuehr
+ausfuehrbar
+ausfuehrbare
+ausfuehrbaren
+ausfuehrbarer
+ausfuehrbares
+ausfuehrend
+ausfuehrende
+ausfuehrendem
+ausfuehrender
+ausfuehrendes
+ausfuehrlich
+ausfuehrliche
+ausfuehrlichem
+ausfuehrlichen
+ausfuehrlicher
+ausfuehrlicherem
+ausfuehrlicheren
+ausfuehrlicherer
+ausfuehrliches
+ausfuehrlichkeit
+ausfuehrlichste
+ausfuehrlichstem
+ausfuehrlichster
+ausfuehrlichstes
+ausfuehrt
+ausfuehrten
+ausfuehrungen
+ausfuehrungsbestimmungen
+ausfuell
+ausfuellanleitung
+ausfuellen
+ausfuellende
+ausfuellender
+ausfuellendes
+ausfuellt
+ausfuellung
+ausfuhr
+ausfuhrb
+ausfuhrbeschraenkung
+ausfuhrbestimmungen
+ausfuhre
+ausfuhrerfahrungen
+ausfuhrerloes
+ausfuhrg
+ausfuhrgenehmigung
+ausfuhrgeschaeft
+ausfuhri
+ausfuhrindustrie
+ausfuhrk
+ausfuhrkontraktes
+ausfuhrkredite
+ausfuhrl
+ausfuhrliste
+ausfuhrlizenzen
+ausfuhrm
+ausfuhrmoeglichkeiten
+ausfuhrq
+ausfuhrquote
+ausfuhrs
+ausfuhrsperre
+ausfuhrsperren
+ausfuhrv
+ausfuhrverbot
+ausfuhrverbote
+ausfuhrverboten
+ausfuhrw
+ausfuhrwert
+ausfuhrz
+ausfuhrzoelle
+ausfuhrzoellen
+ausfuhrzolls
+ausg
+ausga"ng
+ausga"nge
+ausga"ngen
+ausgab
+ausgabe
+ausgabeb
+ausgabebaugruppen
+ausgabebehandlung
+ausgabee
+ausgabeeinheit
+ausgabeeinheiten
+ausgabeermaechtigung
+ausgabef
+ausgabefunktion
+ausgabeg
+ausgabegeschwindigkeit
+ausgabek
+ausgabekana"le
+ausgabekanal
+ausgabekarte
+ausgabeknoten
+ausgabekommandos
+ausgabem
+ausgabemo"glichkeiten
+ausgabemodul
+ausgaben
+ausgabenansaetze
+ausgabenanstieg
+ausgabenposten
+ausgabenseite
+ausgabensenkung
+ausgabenverpflichtungen
+ausgabenvolumen
+ausgabenwirtschaft
+ausgaber
+ausgaberechner
+ausgabes
+ausgabespannung
+ausgabestelle
+ausgabestellen
+ausgabet
+ausgabetag
+ausgabetreiber
+ausgabez
+ausgabezahl
+ausgaeng
+ausgaenge
+ausgang
+ausgange
+ausganges
+ausgangs
+ausgangsbus
+ausgangsdruckes
+ausgangsfunktion
+ausgangsfunktionen
+ausgangshypothese
+ausgangsimpuls
+ausgangskana"le
+ausgangslage
+ausgangsleistung
+ausgangsmaterial
+ausgangspins
+ausgangsposition
+ausgangspositionen
+ausgangspunkt
+ausgangspunkte
+ausgangspunktes
+ausgangsregister
+ausgangsseite
+ausgangsseitig
+ausgangssignal
+ausgangssituation
+ausgangsspannung
+ausgangsspannungen
+ausgangsspannungsbereich
+ausgangsstellung
+ausgangsstromsta"rke
+ausgangstest
+ausgangstests
+ausgangstext
+ausgangstransistor
+ausgasun
+ausgasung
+ausgearb
+ausgearbeitet
+ausgearbeitete
+ausgearbeitetem
+ausgearbeiteter
+ausgearbeitetes
+ausgeart
+ausgeartet
+ausgeartetem
+ausgearteten
+ausgearteter
+ausgeatm
+ausgeatmet
+ausgeatmete
+ausgeatmetem
+ausgeatmeter
+ausgeatmetes
+ausgebac
+ausgebacken
+ausgebad
+ausgebadete
+ausgebag
+ausgebaggert
+ausgebau
+ausgebaut
+ausgebautem
+ausgebauten
+ausgebauter
+ausgebe
+ausgeben
+ausgebend
+ausgebende
+ausgebendem
+ausgebender
+ausgebendes
+ausgeber
+ausgebes
+ausgebessert
+ausgebessertem
+ausgebesserten
+ausgebesserter
+ausgebeu
+ausgebeult
+ausgebeulte
+ausgebeultem
+ausgebeulter
+ausgebeultes
+ausgebeutet
+ausgebeutetem
+ausgebeuteten
+ausgebeuteter
+ausgebil
+ausgebildet
+ausgebildete
+ausgebildetem
+ausgebildeter
+ausgebildetes
+ausgebla
+ausgeblasen
+ausgeblasenem
+ausgeblasenen
+ausgeblasener
+ausgeble
+ausgebleicht
+ausgebleichte
+ausgebleichtem
+ausgebleichter
+ausgebleichtes
+ausgeblendeten
+ausgebli
+ausgeblieben
+ausgebliebenem
+ausgebliebenen
+ausgebliebener
+ausgeblu
+ausgeblutet
+ausgeblutete
+ausgeblutetem
+ausgebluteter
+ausgeblutetes
+ausgebor
+ausgeborgt
+ausgeborgtem
+ausgeborgten
+ausgeborgter
+ausgebra
+ausgebrannt
+ausgebranntem
+ausgebrannten
+ausgebrannter
+ausgebre
+ausgebreitet
+ausgebreitete
+ausgebreitetem
+ausgebreiteter
+ausgebreitetes
+ausgebro
+ausgebrochen
+ausgebrochenem
+ausgebrochenen
+ausgebrochener
+ausgebru
+ausgebruetet
+ausgebruetete
+ausgebruetetem
+ausgebrueteter
+ausgebruetetes
+ausgebuc
+ausgebucht
+ausgebuchte
+ausgebuchtem
+ausgebuchter
+ausgebuchtes
+ausgebue
+ausgebuergert
+ausgebuergertem
+ausgebuergerten
+ausgebuergerter
+ausgebuerstet
+ausgebuerstete
+ausgebuerstetem
+ausgebuersteter
+ausgebuerstetes
+ausgedac
+ausgedacht
+ausgedachte
+ausgedachtem
+ausgedachter
+ausgedachtes
+ausgedau
+ausgedauert
+ausgedeh
+ausgedehnt
+ausgedehnte
+ausgedehntem
+ausgedehnten
+ausgedehntere
+ausgedehnterem
+ausgedehnteren
+ausgedehnteres
+ausgedehntes
+ausgedehnteste
+ausgedehntesten
+ausgedehntester
+ausgedehntestes
+ausgedie
+ausgediente
+ausgedienten
+ausgedo"
+ausgedo"rrt
+ausgedoe
+ausgedoerrt
+ausgedor
+ausgedorrt
+ausgedorrtem
+ausgedorrten
+ausgedorrter
+ausgedre
+ausgedreht
+ausgedrehtem
+ausgedrehten
+ausgedrehter
+ausgedru
+ausgedru"ckt
+ausgedruckt
+ausgedruckten
+ausgedrueckt
+ausgedrueckte
+ausgedruecktem
+ausgedrueckter
+ausgedruecktes
+ausgefah
+ausgefahren
+ausgefahrene
+ausgefahrenem
+ausgefahrenen
+ausgefahrener
+ausgefal
+ausgefallen
+ausgefallene
+ausgefallenem
+ausgefallenen
+ausgefallener
+ausgefallenere
+ausgefallenerem
+ausgefallenerer
+ausgefalleneres
+ausgefallenes
+ausgefallenstem
+ausgefallensten
+ausgefallenster
+ausgefec
+ausgefechtet
+ausgefechtete
+ausgefechtetem
+ausgefechteter
+ausgefechtetes
+ausgefeg
+ausgefegt
+ausgefegtem
+ausgefegten
+ausgefegter
+ausgefei
+ausgefeilt
+ausgefeilte
+ausgefeiltem
+ausgefeilter
+ausgefeiltes
+ausgefil
+ausgefilterten
+ausgefli
+ausgeflickte
+ausgeflicktem
+ausgeflickten
+ausgeflicktes
+ausgeflo
+ausgeflogen
+ausgeflogene
+ausgeflogenen
+ausgeflogener
+ausgeflogenes
+ausgeflossene
+ausgeflossenem
+ausgeflossenen
+ausgeflossenes
+ausgefoc
+ausgefochten
+ausgefor
+ausgeforscht
+ausgefra
+ausgefragte
+ausgefragtem
+ausgefragten
+ausgefragtes
+ausgefranst
+ausgefranste
+ausgefransten
+ausgefranster
+ausgefranstes
+ausgefre
+ausgefressene
+ausgefressenem
+ausgefressenen
+ausgefressenes
+ausgefu"
+ausgefu"hrt
+ausgefu"hrte
+ausgefu"hrten
+ausgefu"llt
+ausgefu"llte
+ausgefuc
+ausgefuchstes
+ausgefue
+ausgefuehrt
+ausgefuehrtem
+ausgefuehrten
+ausgefuehrter
+ausgefuellt
+ausgefuellte
+ausgefuelltem
+ausgefuellter
+ausgefuelltes
+ausgegan
+ausgegangen
+ausgegangenem
+ausgegangenen
+ausgegangener
+ausgegeb
+ausgegeben
+ausgegebene
+ausgegebenem
+ausgegebenen
+ausgegebener
+ausgegebenes
+ausgegli
+ausgeglichen
+ausgeglichenem
+ausgeglichenen
+ausgeglichener
+ausgeglichenerem
+ausgeglicheneren
+ausgeglichenerer
+ausgeglichenes
+ausgeglichenste
+ausgeglichenstem
+ausgeglichenster
+ausgeglichenstes
+ausgegliedert
+ausgeglitten
+ausgeglittene
+ausgeglittenem
+ausgeglittener
+ausgeglittenes
+ausgegos
+ausgegossen
+ausgegossenem
+ausgegossenen
+ausgegossener
+ausgegra
+ausgegraben
+ausgegrabene
+ausgegrabenem
+ausgegrabener
+ausgegrabenes
+ausgeha"
+ausgeha"rtet
+ausgehae
+ausgehaendigt
+ausgehaendigtem
+ausgehaendigten
+ausgehaendigter
+ausgehaengt
+ausgehaengte
+ausgehaengtem
+ausgehaengter
+ausgehaengtes
+ausgehal
+ausgehalten
+ausgehaltene
+ausgehaltenem
+ausgehaltenes
+ausgehan
+ausgehandelt
+ausgehandelte
+ausgehandelten
+ausgehandelter
+ausgehandeltes
+ausgehar
+ausgeharrte
+ausgeharrtem
+ausgeharrten
+ausgeharrtes
+ausgehe
+ausgehec
+ausgeheckt
+ausgehecktem
+ausgeheckten
+ausgeheckter
+ausgehei
+ausgeheilt
+ausgeheilte
+ausgeheiltem
+ausgeheilter
+ausgeheiltes
+ausgehen
+ausgehend
+ausgehende
+ausgehenden
+ausgehender
+ausgehob
+ausgehoben
+ausgehobene
+ausgehobenem
+ausgehobener
+ausgehobenes
+ausgehoe
+ausgehoehlt
+ausgehoehltem
+ausgehoehlten
+ausgehoehlter
+ausgehol
+ausgeholfen
+ausgeholfenem
+ausgeholfenen
+ausgeholfener
+ausgeholt
+ausgeholte
+ausgeholtem
+ausgeholter
+ausgeholtes
+ausgehor
+ausgehorcht
+ausgehorchtem
+ausgehorchten
+ausgehorchter
+ausgehsp
+ausgehsperre
+ausgeht
+ausgehve
+ausgehverbot
+ausgehverboten
+ausgehverbotes
+ausgekan
+ausgekannt
+ausgekeh
+ausgekehrte
+ausgekehrtem
+ausgekehrten
+ausgekehrtes
+ausgekla
+ausgeklammerte
+ausgeklammertem
+ausgeklammerten
+ausgeklammertes
+ausgekle
+ausgekleidet
+ausgekleidete
+ausgekleideten
+ausgekleideter
+ausgekleidetes
+ausgeklo
+ausgeklopft
+ausgeklopfte
+ausgeklopftem
+ausgeklopfter
+ausgeklopftes
+ausgeklu
+ausgekluegelt
+ausgekluegelte
+ausgekluegelten
+ausgekluegelter
+ausgekluegeltes
+ausgeklungen
+ausgeklungenem
+ausgeklungenen
+ausgeklungener
+ausgekno
+ausgeknobelten
+ausgekoc
+ausgekocht
+ausgekochte
+ausgekochten
+ausgekochter
+ausgekochtere
+ausgekochteren
+ausgekochterer
+ausgekochteres
+ausgekochteste
+ausgekochtestem
+ausgekochtesten
+ausgekochtestes
+ausgekoh
+ausgekohlt
+ausgekom
+ausgekommen
+ausgekos
+ausgekostete
+ausgekostetem
+ausgekosteten
+ausgekostetes
+ausgekra
+ausgekratzt
+ausgekratzte
+ausgekratzten
+ausgekratzter
+ausgekratztes
+ausgekue
+ausgekuehlt
+ausgekun
+ausgekundschaftete
+ausgekundschaftetem
+ausgekundschafteten
+ausgekundschaftetes
+ausgekup
+ausgekuppelt
+ausgekuppelte
+ausgekuppelten
+ausgekuppelter
+ausgekuppeltes
+ausgelac
+ausgelachte
+ausgelachtem
+ausgelachten
+ausgelachtes
+ausgelad
+ausgeladen
+ausgeladene
+ausgeladenen
+ausgeladener
+ausgeladenes
+ausgelas
+ausgelassen
+ausgelassene
+ausgelassenem
+ausgelassenen
+ausgelassenere
+ausgelassenerem
+ausgelasseneren
+ausgelasseneres
+ausgelassenes
+ausgelassenheiten
+ausgelassenste
+ausgelassensten
+ausgelassenster
+ausgelassenstes
+ausgelasteten
+ausgelasteter
+ausgelau
+ausgelaufen
+ausgelaufenem
+ausgelaufenen
+ausgelaufener
+ausgelaugt
+ausgelaugte
+ausgelaugten
+ausgeleb
+ausgelebt
+ausgelebte
+ausgelebtem
+ausgelebter
+ausgelebtes
+ausgelee
+ausgeleert
+ausgeleertem
+ausgeleerten
+ausgeleerter
+ausgeleg
+ausgelegt
+ausgelegte
+ausgelegtem
+ausgelegter
+ausgelegtes
+ausgelen
+ausgelenkte
+ausgelenktem
+ausgeles
+ausgelesen
+ausgelesene
+ausgelesenem
+ausgelesenen
+ausgelesener
+ausgelesenes
+ausgelie
+ausgeliefert
+ausgelieferte
+ausgeliefertem
+ausgelieferten
+ausgelieferter
+ausgeliefertes
+ausgeliehen
+ausgeliehenem
+ausgeliehenen
+ausgeliehener
+ausgelis
+ausgelistet
+ausgelit
+ausgelitten
+ausgelo"
+ausgelo"st
+ausgelo"ste
+ausgelo"sten
+ausgelo"tet
+ausgeloe
+ausgeloeffelte
+ausgeloeffeltem
+ausgeloeffelten
+ausgeloeffeltes
+ausgeloescht
+ausgeloeschte
+ausgeloeschten
+ausgeloeschter
+ausgeloeschtes
+ausgeloest
+ausgeloeste
+ausgeloestem
+ausgeloesten
+ausgeloestes
+ausgelos
+ausgelost
+ausgelostem
+ausgelosten
+ausgeloster
+ausgelot
+ausgelotet
+ausgelue
+ausgelueftet
+ausgelueftete
+ausgeluefteten
+ausgeluefteter
+ausgelueftetes
+ausgelut
+ausgelutscht
+ausgemac
+ausgemacht
+ausgemachtem
+ausgemachten
+ausgemachter
+ausgemal
+ausgemalt
+ausgemalte
+ausgemaltem
+ausgemalter
+ausgemaltes
+ausgemer
+ausgemergelten
+ausgemerzte
+ausgemerztem
+ausgemerzten
+ausgemerztes
+ausgemes
+ausgemessen
+ausgemessene
+ausgemessenen
+ausgemessener
+ausgemessenes
+ausgemis
+ausgemistete
+ausgemistetem
+ausgemisteten
+ausgemus
+ausgemustert
+ausgemusterte
+ausgemustertem
+ausgemusterter
+ausgemustertes
+ausgenom
+ausgenommen
+ausgenu"
+ausgenu"tzt
+ausgenue
+ausgenuechtert
+ausgenuetzte
+ausgenuetztem
+ausgenuetzten
+ausgenuetztes
+ausgenut
+ausgenutzt
+ausgenutzten
+ausgepac
+ausgepackt
+ausgepackte
+ausgepackten
+ausgepackter
+ausgepacktes
+ausgepei
+ausgepeitschte
+ausgepeitschtem
+ausgepeitschten
+ausgepeitschtes
+ausgepen
+ausgependelt
+ausgepfi
+ausgepfiffen
+ausgepfiffenem
+ausgepfiffenen
+ausgepfiffener
+ausgepic
+ausgepicht
+ausgepla
+ausgeplaudert
+ausgeplaudertem
+ausgeplauderten
+ausgeplauderter
+ausgeplu
+ausgepluendert
+ausgepra
+ausgepra"gten
+ausgepraegt
+ausgepraegte
+ausgepraegtem
+ausgepraegter
+ausgepraegtes
+ausgepre
+ausgepresst
+ausgepresstem
+ausgepressten
+ausgepresster
+ausgepum
+ausgepumpt
+ausgepumpte
+ausgeput
+ausgeputzt
+ausgeputzte
+ausgeputztem
+ausgeputzter
+ausgeputztes
+ausgeque
+ausgequetscht
+ausgequetschtem
+ausgequetschten
+ausgequetschter
+ausgera"
+ausgera"umt
+ausgerae
+ausgeraeuchert
+ausgeraeumt
+ausgeraeumte
+ausgeraeumten
+ausgeraeumter
+ausgeraeumtes
+ausgerau
+ausgeraubte
+ausgeraubtem
+ausgeraubten
+ausgeraubtes
+ausgerec
+ausgerechnet
+ausgerechnete
+ausgerechneten
+ausgerechneter
+ausgerechnetes
+ausgered
+ausgeredete
+ausgeredetem
+ausgeredeten
+ausgeredetes
+ausgereg
+ausgeregelt
+ausgerei
+ausgereicht
+ausgereichte
+ausgereichten
+ausgereichter
+ausgereichtes
+ausgereifte
+ausgereiften
+ausgereiftes
+ausgereiste
+ausgereistem
+ausgereisten
+ausgereistes
+ausgereizt
+ausgeren
+ausgerenkt
+ausgerenktem
+ausgerenkten
+ausgerenkter
+ausgerer
+ausgererechnet
+ausgeric
+ausgerichtet
+ausgerichtete
+ausgerichteten
+ausgerichteter
+ausgerichtetes
+ausgeris
+ausgerissene
+ausgerissenem
+ausgerissenen
+ausgerissenes
+ausgerit
+ausgeritten
+ausgerittene
+ausgerittenen
+ausgerittener
+ausgerittenes
+ausgerol
+ausgerollte
+ausgerolltem
+ausgerollten
+ausgerolltes
+ausgerot
+ausgerottet
+ausgerottete
+ausgerotteten
+ausgerottetes
+ausgeru"
+ausgeru"ckt
+ausgeru"ckte
+ausgeru"stet
+ausgerue
+ausgerueckte
+ausgeruecktem
+ausgerueckten
+ausgeruecktes
+ausgeruestet
+ausgeruestete
+ausgeruesteten
+ausgeruesteter
+ausgeruestetes
+ausgeruf
+ausgerufen
+ausgerufenem
+ausgerufenen
+ausgerufener
+ausgeruh
+ausgeruht
+ausgeruhte
+ausgeruhtem
+ausgeruhter
+ausgeruhtes
+ausgerut
+ausgerutscht
+ausgerutschtem
+ausgerutschten
+ausgerutschter
+ausgesae
+ausgesaet
+ausgesag
+ausgesagten
+ausgesan
+ausgesandt
+ausgesandte
+ausgesau
+ausgesaugte
+ausgesaugtem
+ausgesaugten
+ausgesaugtes
+ausgesch
+ausgeschaltet
+ausgeschaltetem
+ausgeschalteten
+ausgeschalteter
+ausgeschenkt
+ausgeschert
+ausgescherte
+ausgeschieden
+ausgeschiedenem
+ausgeschiedenen
+ausgeschiedener
+ausgeschildert
+ausgeschimpft
+ausgeschimpfte
+ausgeschimpften
+ausgeschimpfter
+ausgeschimpftes
+ausgeschlafene
+ausgeschlafenem
+ausgeschlafenen
+ausgeschlafenes
+ausgeschlagen
+ausgeschlagene
+ausgeschlagenen
+ausgeschlagener
+ausgeschlagenes
+ausgeschlossen
+ausgeschlossene
+ausgeschlossenem
+ausgeschlossenen
+ausgeschlossenes
+ausgeschmueckt
+ausgeschmueckte
+ausgeschmueckten
+ausgeschmueckter
+ausgeschmuecktere
+ausgeschmueckteren
+ausgeschmueckterer
+ausgeschmueckteres
+ausgeschmueckteste
+ausgeschmuecktestem
+ausgeschmuecktesten
+ausgeschmuecktestes
+ausgeschnitten
+ausgeschnittene
+ausgeschnittenem
+ausgeschnittenen
+ausgeschnittener
+ausgeschnittenes
+ausgeschoepft
+ausgeschrieben
+ausgeschriebene
+ausgeschriebenem
+ausgeschriebener
+ausgeschriebenes
+ausgeschritten
+ausgeschrittenen
+ausgeschrittener
+ausgeschrittenes
+ausgeschuettelt
+ausgeschuetteltem
+ausgeschuettelten
+ausgeschuettelter
+ausgeschuettet
+ausgeschuettete
+ausgeschuettetem
+ausgeschuetteter
+ausgeschuettetes
+ausgeschwenkt
+ausgeseh
+ausgesehene
+ausgesehenem
+ausgesehenen
+ausgesehenes
+ausgesen
+ausgesendet
+ausgesendete
+ausgesendeten
+ausgesendeter
+ausgesendetes
+ausgeset
+ausgesetzt
+ausgesetzte
+ausgesetztem
+ausgesetzten
+ausgesetztes
+ausgesoe
+ausgesoehnt
+ausgesoehnte
+ausgesoehnten
+ausgesoehnter
+ausgesoehntes
+ausgesor
+ausgesorgt
+ausgespa
+ausgespannt
+ausgespannte
+ausgespanntem
+ausgespannter
+ausgespanntes
+ausgespart
+ausgespe
+ausgesperrte
+ausgesperrtem
+ausgesperrten
+ausgesperrtes
+ausgespi
+ausgespielt
+ausgespielte
+ausgespielten
+ausgespielter
+ausgespieltes
+ausgespr
+ausgesprochen
+ausgesprochene
+ausgesprochenem
+ausgesprochenen
+ausgesprochenes
+ausgespu
+ausgespu"lt
+ausgespuckt
+ausgespuckte
+ausgespuckten
+ausgespuckter
+ausgespucktes
+ausgespuelt
+ausgespueltem
+ausgespuelten
+ausgespuelter
+ausgesta
+ausgestaltung
+ausgestandene
+ausgestandenem
+ausgestandenen
+ausgestandenes
+ausgestanzt
+ausgestattet
+ausgestattete
+ausgestatteten
+ausgestatteter
+ausgestattetes
+ausgeste
+ausgestellt
+ausgestellte
+ausgestelltem
+ausgestellter
+ausgestelltes
+ausgesti
+ausgestiegen
+ausgestiegene
+ausgestiegenen
+ausgestiegener
+ausgestiegenes
+ausgesto
+ausgestochen
+ausgestochene
+ausgestochenen
+ausgestochener
+ausgestochenes
+ausgestopfte
+ausgestopftem
+ausgestopften
+ausgestopftes
+ausgestorben
+ausgestorbene
+ausgestorbenen
+ausgestorbener
+ausgestorbenes
+ausgestossene
+ausgestossenem
+ausgestossenen
+ausgestossenes
+ausgestr
+ausgestrahlt
+ausgestrahlte
+ausgestrahlten
+ausgestrahlter
+ausgestrahltes
+ausgestreckte
+ausgestrecktem
+ausgestreckten
+ausgestrecktes
+ausgestreut
+ausgestreute
+ausgestreuten
+ausgestreuter
+ausgestreutes
+ausgestrichene
+ausgestrichenem
+ausgestrichenen
+ausgestrichenes
+ausgestroemte
+ausgestroemtem
+ausgestroemten
+ausgestroemtes
+ausgesuc
+ausgesucht
+ausgesuchte
+ausgesuchten
+ausgesuchter
+ausgesuchtere
+ausgesuchteren
+ausgesuchterer
+ausgesuchteres
+ausgesuchteste
+ausgesuchtestem
+ausgesuchtesten
+ausgesuchtestes
+ausgetau
+ausgetauscht
+ausgetauschte
+ausgetauschtem
+ausgetauschten
+ausgetauschtes
+ausgetei
+ausgeteilt
+ausgeteilte
+ausgeteilten
+ausgeteilter
+ausgeteiltes
+ausgetes
+ausgetestet
+ausgetra
+ausgetragen
+ausgetragene
+ausgetragenem
+ausgetragener
+ausgetragenes
+ausgetre
+ausgetreten
+ausgetretenem
+ausgetretenen
+ausgetretener
+ausgetri
+ausgetrieben
+ausgetriebene
+ausgetriebenem
+ausgetriebener
+ausgetriebenes
+ausgetro
+ausgetrocknet
+ausgetrocknete
+ausgetrocknetem
+ausgetrockneten
+ausgetrockneter
+ausgetru
+ausgetrunken
+ausgetrunkene
+ausgetrunkenem
+ausgetrunkener
+ausgetrunkenes
+ausgetue
+ausgetueftelt
+ausgetueftelten
+ausgeu"b
+ausgeu"bt
+ausgeueb
+ausgeuebt
+ausgeuebtem
+ausgeuebten
+ausgeuebter
+ausgewa"
+ausgewa"hlt
+ausgewa"hlte
+ausgewac
+ausgewachsen
+ausgewachsene
+ausgewachsenem
+ausgewachsener
+ausgewachsenes
+ausgewae
+ausgewaehlt
+ausgewaehltem
+ausgewaehlten
+ausgewaehlter
+ausgewan
+ausgewandert
+ausgewandertem
+ausgewanderten
+ausgewanderter
+ausgewas
+ausgewaschen
+ausgewaschene
+ausgewaschenem
+ausgewaschener
+ausgewaschenes
+ausgewec
+ausgewechselt
+ausgewechseltem
+ausgewechselten
+ausgewechselter
+ausgewei
+ausgeweint
+ausgeweitet
+ausgeweitete
+ausgeweiteten
+ausgeweiteter
+ausgeweitetes
+ausgewer
+ausgewertet
+ausgewertete
+ausgewertetem
+ausgewerteten
+ausgewertetes
+ausgewet
+ausgewetzt
+ausgewic
+ausgewichen
+ausgewichenem
+ausgewichenen
+ausgewichener
+ausgewickelt
+ausgewickelte
+ausgewickeltem
+ausgewickelter
+ausgewickeltes
+ausgewie
+ausgewiesen
+ausgewiesenem
+ausgewiesenen
+ausgewiesener
+ausgewis
+ausgewischt
+ausgewischte
+ausgewischtem
+ausgewischter
+ausgewischtes
+ausgewog
+ausgewogen
+ausgewogenem
+ausgewogenen
+ausgewogener
+ausgewogenheit
+ausgewor
+ausgeworfen
+ausgewru
+ausgewrungen
+ausgewrungene
+ausgewrungenen
+ausgewrungener
+ausgewrungenes
+ausgewuc
+ausgewuchteten
+ausgeza"
+ausgeza"hlt
+ausgezae
+ausgezaehlte
+ausgezaehltem
+ausgezaehlten
+ausgezaehltes
+ausgezah
+ausgezahlt
+ausgezahlte
+ausgezahlten
+ausgezahlter
+ausgezahltes
+ausgezei
+ausgezeichenten
+ausgezeichenter
+ausgezeichentes
+ausgezeichnet
+ausgezeichnete
+ausgezeichneten
+ausgezeichneter
+ausgezog
+ausgezogen
+ausgezogene
+ausgezogenem
+ausgezogener
+ausgezogenes
+ausgibt
+ausgiebi
+ausgiebig
+ausgiebige
+ausgiebigem
+ausgiebigen
+ausgiebigere
+ausgiebigerem
+ausgiebigeren
+ausgiebigeres
+ausgiebiges
+ausgiebigste
+ausgiebigsten
+ausgiebigster
+ausgiebigstes
+ausgiess
+ausgiessend
+ausgiessende
+ausgiessendem
+ausgiessender
+ausgiessendes
+ausgiesst
+ausginge
+ausgingen
+ausgleic
+ausgleiche
+ausgleichen
+ausgleichend
+ausgleichenden
+ausgleichender
+ausgleichendes
+ausgleichern
+ausgleichers
+ausgleichs
+ausgleichsanspruch
+ausgleichsbetrag
+ausgleichsfunktion
+ausgleichsposten
+ausgleichsregelung
+ausgleichsrente
+ausgleichstreffer
+ausgleichsvertrag
+ausgleichszahlung
+ausgleichszonen
+ausgleichung
+ausgleichungen
+ausgleit
+ausgleiten
+ausgleitend
+ausgleitende
+ausgleitenden
+ausgleitender
+ausgleitendes
+ausglied
+ausgliederung
+ausgrabe
+ausgraben
+ausgrabend
+ausgrabendem
+ausgrabenden
+ausgrabender
+ausgrabu
+ausgrabung
+ausgrabungen
+ausgraeb
+ausgraebt
+ausgreif
+ausgreifend
+ausgreifende
+ausguck
+ausguess
+ausguesse
+ausguss
+ausgusse
+ausgusses
+ausha"rt
+ausha"rten
+ausha"rtevorgang
+aushaelt
+aushaend
+aushaendigend
+aushaendigende
+aushaendigendem
+aushaendigender
+aushaendigendes
+aushaendigungen
+aushaeng
+aushaenge
+aushaengen
+aushaengende
+aushaengenden
+aushaengender
+aushaengeschild
+aushalte
+aushalten
+aushaltende
+aushaltenden
+aushaltender
+aushande
+aushandeln
+aushandelnd
+aushandelnde
+aushandelnder
+aushandelndes
+aushandl
+aushandlung
+aushangs
+aushar
+ausharre
+ausharren
+ausharrende
+ausharrenden
+ausharrender
+aushauch
+aushauchten
+ausheben
+aushebend
+aushebende
+aushebender
+aushebendes
+aushebun
+aushebung
+aushebungen
+aushecke
+aushecken
+ausheckende
+ausheckenden
+ausheckender
+ausheckt
+ausheckte
+ausheile
+ausheilen
+ausheilend
+ausheilenden
+ausheilender
+ausheilendes
+aushelfe
+aushelfend
+aushelfende
+aushelfenden
+aushelfendes
+aushi
+aushielt
+aushilfe
+aushilfen
+aushilfs
+aushilfskellner
+aushilfsweise
+aushiri
+aushoehl
+aushoehlen
+aushoehlend
+aushoehlende
+aushoehlender
+aushoehlendes
+aushoehlung
+aushoehlungen
+ausholen
+ausholend
+ausholende
+ausholender
+ausholendes
+aushorch
+aushorchen
+aushorchende
+aushorchenden
+aushorchender
+ausiliar
+ausiliaria
+ausiliarie
+ausiliarii
+ausiliario
+ausilio
+auskam
+auskar
+auskehre
+auskehren
+auskehrende
+auskehrenden
+auskehrender
+auskenne
+auskennen
+auskennend
+auskennende
+auskennender
+auskennendes
+auskennt
+ausklamm
+ausklammernd
+ausklammernde
+ausklammernden
+ausklammerndes
+ausklammert
+ausklammerung
+ausklapp
+ausklappbar
+ausklappten
+auskleid
+auskleiden
+auskleidende
+auskleidenden
+auskleidender
+auskling
+ausklingen
+ausklingend
+ausklingende
+ausklingender
+ausklingendes
+ausklink
+ausklinken
+ausklopf
+ausklopfen
+ausklopfende
+ausklopfenden
+ausklopfender
+auskoche
+auskochen
+auskochend
+auskochende
+auskochender
+auskochendes
+auskomme
+auskommen
+auskommende
+auskommenden
+auskommender
+auskommt
+auskoppe
+auskoppelung
+auskoste
+auskosten
+auskostend
+auskostenden
+auskostender
+auskostendes
+auskratz
+auskratzen
+auskratzend
+auskratzende
+auskratzender
+auskratzendes
+ausku"nf
+ausku"nfte
+auskuehl
+auskuehlen
+auskuenf
+auskuenfte
+auskuenften
+auskunds
+auskundschaften
+auskundschaftende
+auskundschaftenden
+auskundschaftender
+auskunft
+auskunftsbuero
+auskunftsbueros
+auskunftsdienst
+auskunftsersuchens
+auskunftserteilung
+auskunftsklausel
+auskunftspersonen
+auskunftspflichtigen
+auskunftsstelle
+auskunftsverfahrens
+auskunftsverkehr
+auskunftsverkehrs
+auskuppe
+auskuppeln
+auskuppelnd
+auskuppelnde
+auskuppelnder
+auskuppelndes
+auskurie
+auskurieren
+ausla"nd
+ausla"ndischen
+auslache
+auslachend
+auslachende
+auslachenden
+auslachendes
+auslacht
+auslachten
+ausladen
+ausladende
+ausladenden
+ausladender
+ausladun
+ausladung
+auslaend
+auslaender
+auslaendergesetz
+auslaenderguthaben
+auslaenderinnen
+auslaenderlager
+auslaendern
+auslaenders
+auslaendersperre
+auslaendisch
+auslaendische
+auslaendischem
+auslaendischer
+auslaendisches
+auslaeuf
+auslaeufen
+auslaeufer
+auslaeufern
+auslaeuft
+auslage
+auslagen
+ausland
+auslande
+auslandes
+auslandk
+auslandkorrespondenten
+auslands
+auslandsabnehmer
+auslandsabonnement
+auslandsaktien
+auslandsangebot
+auslandsanlagen
+auslandsarbeit
+auslandsaufenthalt
+auslandsaufenthalte
+auslandsbanken
+auslandsbasen
+auslandsbedarf
+auslandsbeteiligungen
+auslandsbetriebe
+auslandsbeziehungen
+auslandsbutter
+auslandschuld
+auslandsdeutscher
+auslandserfahrungen
+auslandsfahrer
+auslandsfakultaet
+auslandsfirmen
+auslandsgelder
+auslandsgeschaefte
+auslandsgesellschaften
+auslandsgespraeche
+auslandsgrundbesitz
+auslandsheimkehrer
+auslandshilfe
+auslandsimmobilien
+auslandsinvestitionen
+auslandsinvestoren
+auslandsjournal
+auslandskapital
+auslandskonzessionen
+auslandskorrespondent
+auslandskunden
+auslandsleser
+auslandslieferanten
+auslandsmaerkte
+auslandsmagazin
+auslandsmarkt
+auslandspapiere
+auslandspass
+auslandsplaetze
+auslandspresse
+auslandsprojekte
+auslandsreferat
+auslandsreise
+auslandsreisen
+auslandsscheck
+auslandsschulden
+auslandsschuldenlast
+auslandssender
+auslandsstudenten
+auslandstaetigkeit
+auslandstourneen
+auslandsunternehmen
+auslandsverkaeufe
+auslandsvermoegen
+auslandsvertreter
+auslandsvertretungen
+auslandswechsel
+auslandswerte
+auslandszahlung
+auslandszahlungen
+auslasse
+auslassen
+auslassend
+auslassenden
+auslassender
+auslassendes
+auslassu
+auslassung
+auslassungen
+auslassungszeichen
+auslastu
+auslastung
+auslauf
+auslaufe
+auslaufen
+auslaufend
+auslaufende
+auslaufenden
+auslaufendes
+auslaufes
+auslaut
+auslaute
+auslauten
+auslautend
+auslautenden
+auslautender
+auslautendes
+auslautes
+ausleben
+auslebend
+auslebende
+auslebenden
+auslebendes
+ausleere
+ausleeren
+ausleerend
+ausleerenden
+ausleerender
+ausleerendes
+ausleert
+ausleerte
+auslege
+auslegen
+auslegend
+auslegenden
+auslegender
+auslegendes
+ausleger
+auslegerarme
+auslegerbefestigung
+auslegerbewegungen
+auslegergeometrie
+auslegern
+auslegerneigungen
+auslegers
+auslegersteuerung
+auslegerteile
+auslegerzylindern
+ausleges
+auslegesteuerung
+auslegun
+auslegung
+ausleihe
+ausleihen
+ausleihend
+ausleihende
+ausleihender
+ausleihendes
+ausleihu
+ausleihung
+ausleihungen
+ausleihungsgeschaeft
+auslenku
+auslenkung
+auslesba
+auslesbar
+auslese
+auslesen
+auslesende
+auslesenden
+auslesender
+auslesep
+ausleseprozess
+auslesev
+ausleseverfahren
+auslesun
+auslesung
+ausleuch
+ausleuchtet
+ausley
+ausliefe
+auslieferer
+ausliefern
+ausliefernd
+ausliefernde
+ausliefernden
+auslieferndes
+ausliefert
+auslieferte
+auslieferung
+auslieferungen
+auslieferungsantrag
+auslieferungsfall
+auslieferungstermin
+auslieferungsvertraege
+auslieferungsvertraegen
+auslieferungsvertrag
+ausliess
+ausliste
+auslisten
+auslo"sc
+auslo"schung
+auslo"se
+auslo"sen
+auslo"st
+auslo"te
+auslo"ten
+ausloeff
+ausloeffelnd
+ausloeffelnde
+ausloeffelnden
+ausloeffelndes
+ausloesc
+ausloeschen
+ausloeschend
+ausloeschenden
+ausloeschender
+ausloeschendes
+ausloeschung
+ausloese
+ausloeseeffekt
+ausloesemechanismen
+ausloesen
+ausloesend
+ausloesenden
+ausloesender
+ausloesendes
+ausloesern
+ausloesers
+ausloest
+ausloesten
+ausloesu
+ausloesung
+ausloote
+auslooten
+auslosen
+auslosende
+auslosenden
+auslosender
+auslueft
+auslueften
+auslueftend
+auslueftenden
+auslueftender
+auslueftendes
+ausmache
+ausmachen
+ausmachend
+ausmachenden
+ausmachender
+ausmachendes
+ausmacht
+ausmachte
+ausmaers
+ausmaersche
+ausmaerschen
+ausmalen
+ausmalend
+ausmalenden
+ausmalender
+ausmalendes
+ausman
+ausmarsc
+ausmarsches
+ausmass
+ausmasse
+ausmassen
+ausmasses
+ausmerze
+ausmerzen
+ausmerzend
+ausmerzende
+ausmerzender
+ausmerzendes
+ausmerzu
+ausmerzung
+ausmesse
+ausmessen
+ausmessende
+ausmessendem
+ausmessenden
+ausmessendes
+ausmessu
+ausmessung
+ausmiste
+ausmisten
+ausmistend
+ausmistenden
+ausmistender
+ausmistendes
+ausmuend
+ausmuendung
+ausmuste
+ausmusternd
+ausmusternde
+ausmusternden
+ausmusterndes
+ausnahm
+ausnahme
+ausnahmebestimmung
+ausnahmebewilligung
+ausnahmeerscheinung
+ausnahmefa"lle
+ausnahmefaellen
+ausnahmefall
+ausnahmegenehmigung
+ausnahmeliste
+ausnahmen
+ausnahmepreise
+ausnahmesituationen
+ausnahmetarife
+ausnahmewuensche
+ausnahmezustaenden
+ausnahmezustand
+ausnahmezustandes
+ausnahms
+ausnahmslos
+ausnahmslose
+ausnahmslosem
+ausnahmslosen
+ausnahmsloses
+ausnahmsweise
+ausnehme
+ausnehmen
+ausnimmt
+ausnu"tz
+ausnu"tzung
+ausnuetz
+ausnuetzen
+ausnuetzung
+ausnutze
+ausnutzend
+ausnutzenden
+ausnutzender
+ausnutzendes
+ausnutzt
+ausnutzte
+ausnutzu
+ausnutzung
+ausnutzungen
+ausnutzungsgrad
+ausonense
+ausones
+ausonia
+ausonian
+ausonio
+auspacke
+auspacken
+auspackend
+auspackenden
+auspackender
+auspackendes
+auspackt
+auspackte
+auspackten
+auspeits
+auspeitschen
+auspeitschend
+auspeitschenden
+auspeitschender
+auspeitschendes
+auspex
+auspfeif
+auspfeifend
+auspfeifende
+auspfeifenden
+auspfeifendes
+auspfiff
+auspfiffen
+auspicat
+auspicate
+auspice
+auspices
+auspicia
+auspicial
+auspiciar
+auspicie
+auspicien
+auspicio
+auspicious
+auspiciously
+auspiciousness
+auspiciu
+auspicium
+auspicy
+auspisie
+auspisier
+auspisiet
+ausplaud
+ausplaudernd
+ausplaudernde
+ausplaudernden
+ausplauderndes
+auspluen
+auspluendern
+auspluenderung
+auspraeg
+auspraegen
+auspress
+auspressen
+auspressende
+auspressendem
+auspressenden
+auspressendes
+ausprobi
+ausprobieren
+ausprobierend
+ausprobierenden
+ausprobierender
+ausprobierendes
+ausprobiert
+ausprobierte
+ausprobiertem
+ausprobierten
+ausprobiertes
+auspueff
+auspueffe
+auspueffen
+auspuff
+auspuffe
+auspuffes
+auspuffg
+auspuffgase
+auspuffgases
+auspumpe
+auspumpen
+ausputze
+ausputzen
+ausputzend
+ausputzenden
+ausputzender
+ausputzendes
+ausquets
+ausquetschend
+ausquetschende
+ausquetschenden
+ausquetschendes
+ausquetscht
+ausquetschten
+ausradie
+ausradierend
+ausradierende
+ausradierenden
+ausradierendes
+ausradiert
+ausradierte
+ausradierten
+ausradierter
+ausradiertes
+ausraeum
+ausraeumend
+ausraeumende
+ausraeumenden
+ausraeumendes
+ausraeumte
+ausrangi
+ausrangierend
+ausrangierende
+ausrangierenden
+ausrangierendes
+ausrangiert
+ausrangierte
+ausrangierten
+ausrangierter
+ausrangiertes
+ausraube
+ausraubend
+ausraubende
+ausraubenden
+ausraubendes
+ausrechn
+ausrechne
+ausrechnen
+ausrechnende
+ausrechnenden
+ausrechnender
+ausrechnung
+ausrechnungen
+ausrede
+ausreden
+ausredend
+ausredende
+ausredenden
+ausredendes
+ausreich
+ausreichen
+ausreichend
+ausreichende
+ausreichendem
+ausreichenden
+ausreichender
+ausreichendes
+ausreicht
+ausreichten
+ausreife
+ausreifen
+ausreise
+ausreiseerlaubnisse
+ausreiseerlaubnisses
+ausreisegenehmigung
+ausreisen
+ausreisende
+ausreisenden
+ausreisender
+ausreisevisen
+ausreisevisum
+ausreisevisums
+ausreiss
+ausreissen
+ausreissend
+ausreissenden
+ausreissender
+ausreissendes
+ausreisser
+ausreisserin
+ausreissern
+ausreissers
+ausreite
+ausreiten
+ausreitend
+ausreitende
+ausreitender
+ausreitendes
+ausrenke
+ausrenken
+ausrenkende
+ausrenkenden
+ausrenkender
+ausricht
+ausrichten
+ausrichtend
+ausrichtende
+ausrichtender
+ausrichtendes
+ausrichtet
+ausrichtung
+ausriefe
+ausriefen
+ausritt
+ausritte
+ausrittes
+ausrolle
+ausrollen
+ausrollend
+ausrollenden
+ausrollender
+ausrollendes
+ausrotte
+ausrotten
+ausrottend
+ausrottende
+ausrottender
+ausrottendes
+ausrottu
+ausrottung
+ausru"st
+ausru"stbar
+ausru"sten
+ausru"stung
+ausru"stungsteile
+ausrueck
+ausruecken
+ausrueckende
+ausrueckenden
+ausrueckender
+ausruest
+ausruesten
+ausruestend
+ausruestende
+ausruestender
+ausruestendes
+ausruestet
+ausruestung
+ausruestungsgegenstaende
+ausruf
+ausrufe
+ausrufen
+ausrufende
+ausrufendem
+ausrufenden
+ausrufendes
+ausrufez
+ausrufezeichen
+ausruft
+ausrufun
+ausrufungszeichen
+ausrufungszeichens
+ausruhen
+ausruhende
+ausruhenden
+ausruhender
+ausrutsc
+ausrutschen
+ausrutschend
+ausrutschende
+ausrutschender
+ausrutschendes
+ausrutscher
+aussa
+aussaat
+aussaetz
+aussaetzigen
+aussage
+aussagef
+aussagefaehig
+aussagefaehige
+aussageg
+aussagegehalt
+aussagek
+aussagekra"ftig
+aussagekraft
+aussagen
+aussagend
+aussagende
+aussagenden
+aussagendes
+aussagt
+aussagte
+aussah
+aussahen
+aussat
+aussauge
+aussaugen
+aussaugend
+aussaugenden
+aussaugender
+aussaugendes
+ausschae
+ausschaenke
+ausschaenken
+ausschal
+ausschaltbar
+ausschalten
+ausschaltende
+ausschaltenden
+ausschaltender
+ausschalter
+ausschaltet
+ausschaltfunktion
+ausschaltungen
+ausschan
+ausschank
+ausschankes
+ausschau
+ausschauen
+ausschaut
+ausschei
+ausscheidend
+ausscheidende
+ausscheidenden
+ausscheidendes
+ausscheidet
+ausscheidung
+ausscheidungskaempfe
+ausscheidungskampf
+ausscheidungsspiel
+ausscheidungswettbewerbe
+ausscher
+ausscheren
+ausschie
+ausschied
+ausschim
+ausschimpfen
+ausschimpfend
+ausschimpfenden
+ausschimpfender
+ausschimpfendes
+ausschla
+ausschlachtbare
+ausschlaege
+ausschlafen
+ausschlafend
+ausschlafenden
+ausschlafender
+ausschlafendes
+ausschlag
+ausschlagend
+ausschlagende
+ausschlagenden
+ausschlagendes
+ausschlaggebend
+ausschlaggebende
+ausschlaggebenden
+ausschlaggebender
+ausschlaggebendere
+ausschlaggebenderen
+ausschlaggebenderer
+ausschlaggebenderes
+ausschlaggebendste
+ausschlaggebendstem
+ausschlaggebendsten
+ausschlaggebendstes
+ausschlags
+ausschli
+ausschliessen
+ausschliessend
+ausschliessenden
+ausschliessender
+ausschliessendes
+ausschliesslich
+ausschliessliche
+ausschliesslichem
+ausschliesslichen
+ausschliessliches
+ausschliesst
+ausschlu
+ausschluesse
+ausschluessen
+ausschluss
+ausschlusses
+ausschlussverfahren
+ausschmu
+ausschmuecken
+ausschmueckend
+ausschmueckende
+ausschmueckender
+ausschmueckendes
+ausschne
+ausschneiden
+ausschneidende
+ausschneidenden
+ausschneidender
+ausschni
+ausschnitt
+ausschnitte
+ausschnitten
+ausschnittes
+ausscho"
+ausscho"pfung
+ausschoe
+ausschoepfen
+ausschre
+ausschreiben
+ausschreibend
+ausschreibende
+ausschreibender
+ausschreibendes
+ausschreibung
+ausschreibungen
+ausschreiten
+ausschreitende
+ausschreitenden
+ausschreitender
+ausschreitung
+ausschreitungen
+ausschue
+ausschuesse
+ausschuetteln
+ausschuettelnd
+ausschuettelnde
+ausschuettelnder
+ausschuettelndes
+ausschuetten
+ausschuettende
+ausschuettenden
+ausschuettender
+ausschuettet
+ausschuettung
+ausschuettungen
+ausschus
+ausschussberatungen
+ausschussbericht
+ausschussmitglieder
+ausschussvorsitzende
+ausschussware
+ausschusswaren
+ausschwe
+ausschweifend
+ausschweifende
+ausschweifendem
+ausschweifender
+ausschweifendes
+ausschweifung
+ausschweifungen
+ausschweigt
+ausschwenken
+ausschwi
+ausschwingen
+aussehe
+aussehen
+aussehend
+aussehenden
+aussehender
+aussehendes
+ausseil
+ausseits
+aussen
+aussenab
+aussenabmessungen
+aussenam
+aussenamt
+aussenan
+aussenanlage
+aussenanlagen
+aussenansicht
+aussenansichten
+aussenba
+aussenbahn
+aussenbe
+aussenbeschichtung
+aussenbeschichtungen
+aussenbezirk
+aussenbezirke
+aussenbo
+aussenborder
+aussenbordmotor
+aussenbordmotore
+aussenbordmotors
+aussende
+aussenden
+aussendend
+aussendende
+aussendenden
+aussendendes
+aussendi
+aussendienst
+aussendienstes
+aussendienstmitarbeiterinnen
+aussendienstorganisation
+aussendr
+aussendruck
+aussenfa
+aussenfassade
+aussenfl
+aussenfla"che
+aussenfla"chen
+aussenge
+aussengeha"use
+aussengr
+aussengruppe
+aussenha
+aussenhandel
+aussenhandels
+aussenhandelsberater
+aussenhandelsbilanz
+aussenhandelsdirektor
+aussenhandelsgeschaefte
+aussenhandelsgeschellschaft
+aussenhandelsgesetz
+aussenhandelskammer
+aussenhandelsminister
+aussenhandelsministerium
+aussenhandelssituation
+aussenhandelsspezialist
+aussenhandelsstatistik
+aussenhandelsumsatz
+aussenhandelsunternehmen
+aussenhandelsverbaende
+aussenhandelszahlen
+aussenhaut
+aussenin
+ausseninstallation
+aussenka
+aussenkante
+aussenle
+aussenleiter
+aussenli
+aussenlinie
+aussenma
+aussenmasse
+aussenmi
+aussenminister
+aussenministerium
+aussenministeriums
+aussenministerkandidat
+aussenministerkonfernz
+aussenministern
+aussenministers
+aussenministertagung
+aussenpo
+aussenpolitik
+aussenpolitiker
+aussenposten
+aussenpr
+aussenpruefungen
+aussenra
+aussenraum
+aussenre
+aussenreihen
+aussense
+aussenseite
+aussenseiter
+aussenseiterin
+aussenseitern
+aussenseiters
+aussensp
+aussenspiegel
+aussenst
+aussenstaende
+aussenstecker
+aussenstellen
+aussenstuermer
+aussente
+aussentemperaturen
+aussentu
+aussentuer
+aussenve
+aussenverha"ltnis
+aussenverteidiger
+aussenvertretung
+aussenwa
+aussenwaende
+aussenwe
+aussenwelt
+aussenwi
+aussenwirtschaft
+aussenwirtschaftsverordnung
+ausser
+ausserac
+ausserachtlassung
+ausserbe
+ausserbetrieb
+ausserbetriebnahme
+ausserde
+ausserdem
+ausserge
+aussergewo"hnliche
+aussergewo"hnlichste
+aussergewoehnliche
+aussergewoehnlichen
+aussergewoehnliches
+ausserha
+ausserhalb
+ausserir
+ausserirdisch
+ausserod
+ausserodentlich
+ausseror
+ausserordentlich
+ausserordentliche
+ausserordentlichen
+ausserpl
+ausserplanmaessige
+ausserrh
+ausserrhoden
+aussertr
+aussertrittgeraten
+aussetze
+aussetzend
+aussetzende
+aussetzendem
+aussetzender
+aussetzendes
+aussetzt
+aussetzu
+aussetzungen
+aussey
+aussi
+aussichs
+aussichstlosere
+aussicht
+aussichten
+aussichtslagen
+aussichtslos
+aussichtslose
+aussichtslosen
+aussichtsloser
+aussichtsloserem
+aussichtsloserer
+aussichtsloseres
+aussichtsloses
+aussichtslosestem
+aussichtslosesten
+aussichtslosester
+aussichtslosigkeit
+aussichtspunkt
+aussichtspunkten
+aussichtspunktes
+aussichtsreiche
+aussichtsreichen
+aussichtsreichsten
+aussichtstuerme
+aussichtsturm
+aussichtsvolle
+aussichtsvollem
+aussichtsvollen
+aussichtsvollere
+aussichtsvollerem
+aussichtsvolleren
+aussichtsvolleres
+aussichtsvolles
+aussichtsvollste
+aussichtsvollsten
+aussichtsvollster
+aussichtsvollstes
+aussie
+aussiedl
+aussiedler
+aussiedlern
+aussieht
+aussies
+aussigny
+aussito^
+aussito^t
+aussnahm
+aussnahmeerscheinung
+aussoehn
+aussoehnend
+aussoehnende
+aussoehnenden
+aussoehnendes
+aussoehnung
+aussoehnungspartner
+aussonde
+aussondern
+aussonderungswege
+aussorit
+aussoriterten
+aussorti
+aussortieren
+aussortierend
+aussortierenden
+aussortierender
+aussortierendes
+aussortierte
+aussortiertem
+aussortierter
+ausspann
+ausspannen
+ausspannende
+ausspannenden
+ausspannender
+ausspannung
+ausspare
+aussparen
+aussparu
+aussparungen
+ausspeie
+ausspeien
+aussperr
+aussperren
+aussperrende
+aussperrenden
+aussperrender
+aussperrt
+ausspiel
+ausspielen
+ausspielend
+ausspielenden
+ausspielender
+ausspielendes
+ausspion
+ausspioniert
+aussprac
+aussprach
+aussprache
+aussprec
+ausspreche
+aussprechend
+aussprechende
+aussprechenden
+aussprechendes
+ausspric
+ausspricht
+ausspruc
+ausspruch
+ausspruchs
+aussprue
+aussprueche
+ausspruechen
+aussprun
+aussprung
+ausspuch
+ausspuchenden
+ausspuck
+ausspuckend
+ausspuckende
+ausspuckender
+ausspuckt
+ausspuckte
+ausspuel
+ausspuelen
+ausspuelend
+ausspuelende
+ausspuelender
+ausspuelendes
+ausstaen
+ausstaende
+ausstaff
+ausstaffieren
+ausstaffierend
+ausstaffierende
+ausstaffierender
+ausstaffierendes
+ausstaffiert
+ausstaffiertem
+ausstaffierten
+ausstaffierter
+ausstaffierung
+ausstand
+ausstanz
+ausstanzen
+ausstatt
+ausstatten
+ausstattend
+ausstattende
+ausstattender
+ausstattendes
+ausstatter
+ausstattung
+ausstattungen
+ausstattungschef
+ausstaus
+ausstauschbar
+ausstauschbaren
+ausstauschbarer
+ausstauschbares
+ausstauschstudent
+ausstauschstudenten
+ausstech
+ausstechen
+ausstechend
+ausstechende
+ausstechenden
+ausstechendes
+ausstehe
+ausstehen
+ausstehend
+ausstehende
+ausstehenden
+ausstehender
+ausstehendes
+aussteig
+aussteige
+aussteigen
+aussteigende
+aussteigenden
+aussteigender
+aussteigens
+aussteigermentalitaet
+aussteigerparadies
+aussteigewarnungen
+aussteigt
+ausstell
+ausstellen
+ausstellend
+ausstellenden
+ausstellender
+ausstellendes
+aussteller
+ausstellerfirmen
+ausstellergruppe
+ausstellerin
+ausstellern
+ausstellers
+ausstellfenster
+ausstellte
+ausstellung
+ausstellungen
+ausstellungsdatum
+ausstellungsflaeche
+ausstellungsgegenstaende
+ausstellungsgegesellschaft
+ausstellungshallen
+ausstellungslokal
+ausstellungsmoeglichkeit
+ausstellungsplakat
+ausstellungsspiegel
+ausstellungsstand
+ausstellungsstuecken
+ausstellungstage
+ausstellungstuecke
+ausstellungstuecken
+ausstellungstueckes
+aussterb
+aussterben
+aussterbend
+aussterbende
+aussterbender
+aussterbendes
+aussterbens
+aussteue
+aussteuern
+ausstieg
+ausstiege
+ausstiegsdaten
+ausstiegspunkt
+ausstiegssignal
+ausstiegssignale
+ausstiegswarnungen
+aussties
+ausstiess
+ausstopf
+ausstopfen
+ausstopfende
+ausstopfenden
+ausstopfender
+ausstoss
+ausstosse
+ausstossen
+ausstossend
+ausstossende
+ausstossender
+ausstossendes
+ausstossung
+ausstossungen
+ausstrah
+ausstrahlend
+ausstrahlende
+ausstrahlenden
+ausstrahlendes
+ausstrahlt
+ausstrahlte
+ausstrahlung
+ausstrahlungen
+ausstrahlungskraft
+ausstrec
+ausstreckend
+ausstreckende
+ausstreckenden
+ausstreckendes
+ausstreckte
+ausstrei
+ausstreichen
+ausstreichende
+ausstreichenden
+ausstreichender
+ausstreu
+ausstreuen
+ausstreuend
+ausstreuende
+ausstreuender
+ausstreuendes
+ausstroe
+ausstroemen
+ausstroemend
+ausstroemende
+ausstroemender
+ausstroemendes
+ausstroemt
+ausstroemung
+aussuche
+aussuchen
+aussuchende
+aussuchenden
+aussuchender
+aussucht
+aussuchte
+aust
+austafje
+austafjells
+austafjelsk
+austafor
+austafri
+austafrican
+austagde
+austagder
+austausc
+austausch
+austauschbar
+austauschbarkeit
+austauschen
+austauschend
+austauschende
+austauschender
+austauschendes
+austausches
+austauschfolie
+austauschgera"t
+austauschgera"te
+austauschkarten
+austauschmo"glichkeiten
+austauschplatinen
+austauschprogramm
+austauschprogramme
+austauschrechner
+austauschstudenten
+austauschte
+austauschteile
+austauschvertrag
+austavin
+austavind
+austavinden
+auste
+auste'ri
+auste'rite'
+auste`re
+auste`res
+austeer
+austeile
+austeilend
+austeilende
+austeilenden
+austeilendes
+austeilu
+austeilung
+austell
+austellu
+austellung
+austen
+austenit
+austenite
+austenitic
+auster
+austera
+austeramente
+austere
+austerel
+austerely
+austeren
+austereness
+austeres
+austerest
+austeri
+austeridad
+austerit
+austerita
+austerities
+austerity
+austerli
+austerlitz
+austern
+austero
+austerus
+austerve
+austerveg
+austevol
+austevoll
+austin
+austina
+austinbu
+austinburg
+austine
+austinvi
+austinville
+austland
+austlandsk
+austlend
+austlending
+austlendingen
+austlig
+austoben
+austobenden
+austragd
+austragdnd
+austrage
+austragen
+austragende
+austragender
+austragendes
+austragu
+austragung
+austragunsstaette
+austral
+australa
+australasia
+australasian
+australe
+australene
+australes
+australi
+australia
+australian
+australiana
+australianism
+australianize
+australiano
+australians
+australic
+australien
+australienflug
+australier
+australieren
+australierin
+australiern
+australiers
+australioid
+australis
+australisch
+australische
+australischem
+australischen
+australischer
+australischt
+australite
+australo
+australoid
+australopithecinae
+australopithecine
+australopithecus
+australorp
+australs
+australsk
+austramp
+austrampeln
+austrank
+austrankend
+austrasi
+austrasia
+austrasian
+austraux
+austrdib
+austrdibend
+austre
+austreib
+austreibdn
+austreibende
+austreibenden
+austreibung
+austreibungen
+austrete
+austretend
+austretende
+austretenden
+austretendes
+austria
+austriaca
+austriaco
+austrian
+austrianize
+austrians
+austric
+austrida
+austrina
+austrink
+austrinken
+austrinkende
+austrinkender
+austrinkendes
+austrino
+austritt
+austritten
+austrittes
+austrittsdu"sen
+austrittserklaerung
+austrium
+austro
+austroas
+austroasiatic
+austrocc
+austroccnen
+austrock
+austrocknende
+austrocknenden
+austrocknender
+austrocknet
+austroga
+austrogaea
+austrogaean
+austrohu
+austrohungarian
+austroma
+austromancy
+austrone
+austronesian
+austroph
+austrophil
+austrophile
+austrophilism
+austrori
+austroriparian
+austueft
+austuefteln
+austurba
+austurbardhastrandarsysla
+austurhu
+austurhunavatnssysla
+austursk
+austurskaftafellssysla
+austwell
+ausu
+ausu"ben
+ausu"bun
+ausu"bung
+ausubo
+ausueben
+ausuebt
+ausuebte
+ausuebun
+ausuebung
+ausuebungen
+ausufern
+ausufernden
+ausuferu
+ausuferungen
+ausverka
+ausverkaeufe
+ausverkaeufen
+ausverkauaufgerufenem
+ausverkaufs
+ausverkaufspreise
+ausverkaufspreisen
+ausverkauft
+auswa"hl
+auswa"hlen
+auswa"hlt
+auswaehl
+auswaehlen
+auswaert
+auswaertsspiel
+auswahl
+auswahlb
+auswahlband
+auswahlk
+auswahlkatalog
+auswahlkomitee
+auswahll
+auswahlliste
+auswahlm
+auswahlmenu"
+auswahlmo"glichkeiten
+auswahls
+auswahlsendung
+auswahlsendungen
+auswahlsignal
+auswahlspieler
+auswahlv
+auswahlverfahren
+auswande
+auswanderer
+auswandererberatungsstelle
+auswanderern
+auswanderers
+auswandern
+auswanderung
+auswanderungspolitik
+auswechs
+auswechselbar
+auswechseln
+auswechselung
+auswechslungen
+ausweg
+auswege
+auswegs
+ausweich
+ausweichmoeglichkeiten
+ausweichstelle
+ausweine
+ausweinen
+ausweis
+ausweise
+ausweisen
+ausweises
+ausweisi
+ausweisinhaber
+ausweisk
+ausweiskarten
+ausweiskontrolle
+ausweisp
+ausweispapiere
+ausweispflicht
+ausweist
+ausweisu
+ausweisung
+ausweisungen
+ausweisungsbefehle
+ausweisungsbefehlen
+ausweisungsbefehls
+ausweisungsbeschluss
+ausweisz
+ausweiszwang
+ausweite
+ausweiten
+ausweitu
+ausweitung
+auswendi
+auswendig
+auswerte
+auswerteeinheit
+auswerteelektronik
+auswertekarte
+auswerten
+auswerterechner
+auswertesoftware
+auswerteteil
+auswerteverfahren
+auswertezyklus
+auswertu
+auswertung
+auswertungen
+auswirke
+auswirken
+auswirkt
+auswirkten
+auswirku
+auswirkung
+auswirkungen
+auswisch
+auswischen
+auswuchs
+auswuchses
+auswuech
+auswuechse
+auswuechsen
+auszahlt
+auszahlte
+auszahlu
+auszahlung
+auszahlungen
+auszahlungsautomaten
+auszahlungsverfuegung
+auszehru
+auszehrung
+auszeich
+auszeichnen
+auszeichnet
+auszeichnung
+ausziehb
+ausziehbar
+auszu"ge
+auszuarb
+auszuarbeitenden
+auszuart
+auszuarten
+auszubau
+auszubauen
+auszubeu
+auszubeutenden
+auszubil
+auszubildende
+auszubre
+auszubrechen
+auszudeh
+auszudehnen
+auszuden
+auszudenken
+auszudes
+auszudesignen
+auszudru
+auszudru"cken
+auszudrucken
+auszudruckende
+auszuege
+auszuegen
+auszufu"
+auszufu"hren
+auszufu"hrende
+auszufu"llen
+auszufue
+auszufuehren
+auszufuellen
+auszug
+auszugeb
+auszugeben
+auszugebende
+auszugebenden
+auszugebender
+auszugeh
+auszugehen
+auszugle
+auszugleichen
+auszugss
+auszugsschiene
+auszugsschienen
+auszuhae
+auszuhaendigen
+auszuhal
+auszuhaltenden
+auszuhan
+auszuhandeln
+auszukot
+auszukotzen
+auszulas
+auszulassen
+auszulei
+auszuleihen
+auszules
+auszulesen
+auszulie
+auszuliefern
+auszuliefernden
+auszumal
+auszumalen
+auszumer
+auszumerzen
+auszumes
+auszumessen
+auszunut
+auszunutzen
+auszupol
+auszupolieren
+auszupro
+auszuprobieren
+auszuru"
+auszuru"sten
+auszurue
+auszuruesten
+auszusch
+auszuschalten
+auszuschlachten
+auszuschliessen
+auszuschliessender
+auszuschoepfen
+auszuson
+auszusondern
+auszuspr
+auszusprechen
+auszuspu
+auszuspucken
+auszusta
+auszustatten
+auszuste
+auszustellenden
+auszusuc
+auszusuchen
+auszutau
+auszutauschen
+auszutue
+auszutuefteln
+auszuueb
+auszuueben
+auszuwa"
+auszuwa"hlen
+auszuwec
+auszuwechselnde
+auszuwer
+auszuwerten
+auszuzah
+auszuzahlen
+aut
+auta`n
+auta`rquica
+auta`rquico
+autaar
+autaartj
+autaartje
+autaartjes
+autacoid
+autacoidal
+autallot
+autallotriomorphic
+autant
+autantit
+autantitypy
+autarch
+autarchi
+autarchic
+autarchical
+autarchie
+autarchieen
+autarchies
+autarcho
+autarchoglossa
+autarchy
+autarcie
+autarcies
+autarciq
+autarcique
+autarciques
+autaren
+autark
+autarken
+autarkic
+autarkical
+autarkie
+autarkis
+autarkisch
+autarkische
+autarkist
+autarky
+autarqui`a
+autaugav
+autaugaville
+aute
+aute`ntica
+aute`nticamente
+aute`ntico
+autechos
+autechoscope
+auteciou
+autecious
+auteciously
+auteciousness
+autecism
+autecolo
+autecologic
+autecological
+autecologically
+autecologist
+autecology
+autecy
+autel
+autels
+autem
+autentic
+autentica
+autenticacio`n
+autenticai
+autenticar
+autentichi
+autenticidad
+autenticitet
+autentico
+autentis
+autentisk
+autentiske
+auteuil
+auteur
+auteurs
+auteursc
+auteurschap
+auteurse
+auteursexemplaar
+auteursexemplaren
+auteursr
+auteursrecht
+auteursrechten
+auth
+authenre
+authenreith
+authenti
+authentic
+authentical
+authentically
+authenticalness
+authenticate
+authenticated
+authenticates
+authenticating
+authentication
+authentications
+authenticator
+authenticators
+authenticite'
+authenticiteit
+authenticities
+authenticity
+authenticly
+authenticness
+authenticsender
+authentiek
+authentieke
+authentieker
+authentiekst
+authentifia
+authentifiaient
+authentifiais
+authentifiait
+authentifiant
+authentification
+authentifie
+authentifie'
+authentifie'e
+authentifie'es
+authentifie's
+authentifie`rent
+authentifient
+authentifier
+authentifiera
+authentifierai
+authentifieraient
+authentifierais
+authentifierait
+authentifieras
+authentifierez
+authentifieriez
+authentifierions
+authentifierons
+authentifieront
+authentifies
+authentifiez
+authentifiiez
+authentifiions
+authentifions
+authentique
+authentiquement
+authentiquer
+authentiques
+authentischer
+authigen
+authigene
+authigenetic
+authigenic
+authigenous
+author
+authorcr
+authorcraft
+authored
+authores
+authoress
+authoresses
+authorho
+authorhood
+authoria
+authorial
+authorially
+authorin
+authoring
+authoris
+authorisatie
+authorish
+authorism
+authorit
+authoritarian
+authoritarianism
+authoritarianisms
+authoritarians
+authoritative
+authoritatively
+authoritativeness
+authoritie
+authorities
+authority
+authoriz
+authorizable
+authorization
+authorizations
+authorize
+authorized
+authorizer
+authorizers
+authorizes
+authorizing
+authorle
+authorless
+authorli
+authorling
+authorly
+authors
+authorsh
+authorship
+authotyp
+authotype
+authour
+auths
+autillo
+autin
+autism
+autisme
+autismen
+autisms
+autist
+autista
+autisti
+autistic
+autistis
+autistisk
+auto
+auto's
+auto-e'c
+auto-e'cole
+auto-e'coles
+auto-e'q
+auto-e'quilibrant
+auto-e'quilibrante
+auto-e'quilibrantes
+auto-e'quilibrants
+auto-ong
+auto-ongeluk
+auto-ongelukken
+auto-ongeval
+auto-ongevallen
+auto-sto
+auto-stop
+auto-stoppeur
+auto-stoppeurs
+auto-stoppeuse
+auto-stoppeuses
+auto`crata
+auto`ctona
+auto`ctono
+auto`gena
+auto`geno
+auto`grafa
+auto`grafo
+auto`mata
+auto`noma
+auto`nomo
+auto`psida
+auto`psido
+autoabst
+autoabstract
+autoacti
+autoactivation
+autoactive
+autoaddr
+autoaddress
+autoaggl
+autoagglutinating
+autoagglutination
+autoagglutinin
+autoalar
+autoalarm
+autoalky
+autoalkylation
+autoallo
+autoallogamous
+autoallogamy
+autoanal
+autoanalysis
+autoanalytic
+autoanti
+autoantibody
+autoanticomplement
+autoantitoxin
+autoasph
+autoasphyxiation
+autoaspi
+autoaspiration
+autoassi
+autoassimilation
+autoauss
+autoausstellung
+autobahn
+autobahnanschluesse
+autobahnauffahrt
+autobahnausfahrten
+autobahnbau
+autobahnbruecke
+autobahneinfahrten
+autobahnen
+autobahnfahrt
+autobahngebuehren
+autobahnkreuz
+autobahnparkplaetze
+autobahns
+autobahnsteuer
+autobahnstrecken
+autobahntote
+autobahnzubringer
+autobahnzubringern
+autobahnzubringers
+autoban
+autoband
+autobasi
+autobasidia
+autobasidiomycetes
+autobasidiomycetous
+autobasidium
+autobasisii
+autobatt
+autobatterie
+autobest
+autobestuurder
+autobestuurders
+autobike
+autobio`grafo
+autobiog
+autobiogra`fica
+autobiogra`fico
+autobiograaf
+autobiografen
+autobiografi`a
+autobiografie
+autobiografieen
+autobiografisch
+autobiografische
+autobiograpby
+autobiographal
+autobiographer
+autobiographers
+autobiographic
+autobiographical
+autobiographically
+autobiographie
+autobiographien
+autobiographies
+autobiographique
+autobiographiques
+autobiographist
+autobiography
+autobiol
+autobiology
+autoblas
+autoblast
+autoboat
+autoboating
+autobogo
+autobogotiphobia
+autoboli
+autobolide
+autobombo
+autobots
+autobotsing
+autobotsingen
+autobox
+autoboxe
+autoboxen
+autobrue
+autobruecke
+autobus
+autobusb
+autobusbahnhoefe
+autobusbahnhof
+autobusbahnhofs
+autobusd
+autobusdienst
+autobusdiensten
+autobuse
+autobuses
+autobush
+autobushalte
+autobushalten
+autobushaltes
+autobushaltestelle
+autobusl
+autobuslijn
+autobuslijnen
+autobuslinie
+autobusr
+autobusreifen
+autobusreisen
+autobuss
+autobusse
+autobussen
+autobusses
+autocab
+autocad
+autocade
+autocades
+autocall
+autocamio`n
+autocamp
+autocamper
+autocamping
+autocar
+autocari
+autocarist
+autocarp
+autocarpian
+autocarpic
+autocarpous
+autocarr
+autocarri
+autocarro
+autocars
+autocass
+autocassable
+autocassables
+autocata
+autocatalepsy
+autocatalysis
+autocatalytic
+autocatalytically
+autocatalyze
+autocath
+autocatheterism
+autocens
+autocensure
+autocensurer
+autoceph
+autocephalia
+autocephality
+autocephalous
+autocephaly
+autocept
+autoceptive
+autochem
+autochemical
+autochol
+autocholecystectomy
+autochro
+autochrome
+autochromy
+autochronograph
+autochth
+autochthon
+autochthonal
+autochthones
+autochthonic
+autochthonism
+autochthonous
+autochthonously
+autochthonousness
+autochthony
+autochto
+autochtone
+autochtonen
+autochtoner
+autochtones
+autochtoon
+autochtoonst
+autocide
+autocine
+autocinesis
+autoclas
+autoclasis
+autoclastic
+autoclav
+autoclave
+autoclaves
+autocoen
+autocoenobium
+autocohe
+autocoherer
+autocoid
+autocoll
+autocollant
+autocollante
+autocollantes
+autocollants
+autocollimate
+autocollimation
+autocollimator
+autocolo
+autocolonne
+autocolonnes
+autocolony
+autocomb
+autocombustible
+autocombustion
+autocomp
+autocomplexes
+autocond
+autocondensation
+autoconduction
+autoconv
+autoconvection
+autoconverter
+autocopi
+autocopist
+autocopista
+autocopr
+autocoprophagous
+autocorr
+autocorrelate
+autocorrelated
+autocorrelation
+autocorrelations
+autocorrosion
+autocova
+autocovariance
+autocovariances
+autocra`tica
+autocra`tico
+autocraa
+autocraat
+autocrac
+autocracia
+autocracies
+autocracy
+autocrat
+autocrate
+autocraten
+autocrates
+autocratic
+autocratical
+autocratically
+autocratie
+autocraties
+autocratique
+autocratiques
+autocratisch
+autocratische
+autocratischer
+autocratischt
+autocrator
+autocratoric
+autocratorical
+autocratrix
+autocrats
+autocratship
+autocrem
+autocremation
+autocri`tica
+autocrit
+autocriticism
+autocritique
+autoctoni`a
+autocuis
+autocuiseur
+autocuiseurs
+autocyst
+autocystoplasty
+autocyto
+autocytolysis
+autocytolytic
+autodaf
+autodafe
+autodafeen
+autode'f
+autode'fense
+autode't
+autode'termination
+autodeco
+autodecomposition
+autodecr
+autodecrement
+autodecremented
+autodecrements
+autodepo
+autodepolymerization
+autoderm
+autodermic
+autodest
+autodestructeur
+autodestructeurs
+autodestruction
+autodestructrice
+autodestructrices
+autodete
+autodetector
+autodiag
+autodiagnosis
+autodiagnostic
+autodiagrammatic
+autodial
+autodialed
+autodialer
+autodialers
+autodialing
+autodialled
+autodialling
+autodials
+autodida
+autodidact
+autodidacta
+autodidacte
+autodidactes
+autodidactic
+autodidacto
+autodidacts
+autodidakt
+autodidakten
+autodidaktik
+autodieb
+autodiebe
+autodiebstahl
+autodien
+autodienst
+autodiensten
+autodies
+autodiesel
+autodiff
+autodifferentiation
+autodiffusion
+autodige
+autodigestion
+autodigestive
+autodin
+autodisc
+autodiscipline
+autodrai
+autodrainage
+autodrom
+autodrome
+autodromes
+autodyna
+autodynamic
+autodyne
+autoecho
+autoecholalia
+autoecic
+autoecio
+autoecious
+autoeciously
+autoeciousness
+autoecis
+autoecism
+autoecou
+autoecous
+autoecy
+autoed
+autoeduc
+autoeducation
+autoeducative
+autoelec
+autoelectrolysis
+autoelectrolytic
+autoelectronic
+autoelev
+autoelevation
+autoepig
+autoepigraph
+autoepil
+autoepilation
+autoerot
+autoerotic
+autoerotically
+autoeroticism
+autoerotism
+autoespl
+autoesplicativa
+autoexci
+autoexcitation
+autoexec
+autofabr
+autofabrik
+autofabriken
+autofact
+autofaeh
+autofaehren
+autofahr
+autofahrern
+autofahrers
+autofahrt
+autofecu
+autofecundation
+autoferm
+autofermentation
+autofina
+autofinanc/a
+autofinanc/aient
+autofinanc/ais
+autofinanc/ait
+autofinanc/ant
+autofinanc/ons
+autofinance
+autofinance'
+autofinance'e
+autofinance'es
+autofinance's
+autofinance`rent
+autofinancement
+autofinancements
+autofinancent
+autofinancer
+autofinancera
+autofinancerai
+autofinanceraient
+autofinancerais
+autofinancerait
+autofinanceras
+autofinancerez
+autofinanceriez
+autofinancerions
+autofinancerons
+autofinanceront
+autofinances
+autofinancez
+autofinanciez
+autofinancions
+autofluo
+autofluorescence
+autoform
+autoformation
+autofret
+autofrettage
+autofrie
+autofriedhoefen
+autofriedhof
+autogami
+autogamic
+autogamo
+autogamous
+autogamy
+autogara
+autogarage
+autogarages
+autogaug
+autogauge
+autoge'r
+autoge're'
+autoge're'e
+autoge're'es
+autoge're's
+autogeen
+autogen
+autogene
+autogeneal
+autogeneses
+autogenesis
+autogenetic
+autogenetically
+autogeng
+autogengass
+autogeni
+autogenic
+autogeno
+autogenous
+autogenously
+autogens
+autogensveising
+autogensveisinga
+autogent
+autogeny
+autogere
+autogereden
+autogeredene
+autogeredenen
+autogesc
+autogeschaeft
+autogest
+autogestion
+autogestionnaire
+autogestionnaires
+autogiro
+autogiro's
+autogiros
+autognos
+autognosis
+autognostic
+autogra`fica
+autogra`fico
+autograa
+autograaf
+autograf
+autografen
+autografenverzamelaar
+autografenverzamelaars
+autografer
+autografi`a
+autografiar
+autografie
+autografieen
+autografisch
+autografische
+autograft
+autografting
+autogram
+autogramme
+autogrammen
+autogrammenjager
+autogrammenjagers
+autogrammjaeger
+autogramms
+autogrammsammlung
+autogrammstunde
+autograp
+autograph
+autographal
+autographe
+autographed
+autographer
+autographes
+autographic
+autographical
+autographically
+autographier
+autographing
+autographism
+autographist
+autographometer
+autographs
+autography
+autograv
+autogravure
+autoguid
+autoguidage
+autoguide'
+autoguide'e
+autoguide'es
+autoguide's
+autogyro
+autogyros
+autohaen
+autohaendler
+autohaendlern
+autohald
+autohalde
+autohand
+autohandel
+autoharp
+autohead
+autoheader
+autohemi
+autohemic
+autohemo
+autohemolysin
+autohemolysis
+autohemolytic
+autohemorrhage
+autohemotherapy
+autohers
+autohersteller
+autohete
+autoheterodyne
+autoheterosis
+autohexa
+autohexaploid
+autohilf
+autohilfen
+autohupe
+autohupen
+autohybr
+autohybridization
+autohypn
+autohypnosis
+autohypnotic
+autohypnotism
+autohypnotization
+autoicou
+autoicous
+autoigni
+autoignition
+autoimmu
+autoimmunities
+autoimmunity
+autoimmunization
+autoimmunize
+autoimmunized
+autoimmunizing
+autoimpo
+autoimport
+autoinc
+autoincr
+autoincrement
+autoincremented
+autoincrements
+autoinde
+autoindex
+autoindexing
+autoindu
+autoinduction
+autoinductive
+autoinfe
+autoinfection
+autoinfu
+autoinfusion
+autoing
+autoinhi
+autoinhibited
+autoinoc
+autoinoculable
+autoinoculation
+autoinsa
+autoinsasse
+autointe
+autointellectual
+autointo
+autointoxicacio`n
+autointoxicant
+autointoxication
+autoirri
+autoirrigation
+autoist
+autojigg
+autojigger
+autojugg
+autojuggernaut
+autokaro
+autokarosserien
+autokart
+autokarte
+autokauf
+autokine
+autokinesis
+autokinetic
+autokino
+autokinos
+autoknac
+autoknacker
+autokolo
+autokolonne
+autokonz
+autokonzern
+autokrat
+autokraten
+autokratisk
+autokratiske
+autokrator
+autokult
+autolack
+autolary
+autolaryngoscope
+autolaryngoscopic
+autolaryngoscopy
+autolate
+autolater
+autolatr
+autolatry
+autolava
+autolavage
+autolesi
+autolesion
+autolimn
+autolimnetic
+autolith
+autoload
+autoloading
+autologi
+autological
+autologist
+autologo
+autologous
+autology
+autolumi
+autoluminescence
+autoluminescent
+autolycu
+autolycus
+autolysa
+autolysate
+autolysi
+autolysin
+autolysis
+autolyti
+autolytic
+autolytu
+autolytus
+autolyza
+autolyzate
+autolyze
+automa
+automa`tica
+automa`ticamente
+automa`tico
+automaat
+automach
+automacy
+automaga
+automagazin
+automagi
+automagically
+automagisk
+automaki
+automakikbetrieb
+automani
+automaniac
+automanipulation
+automanipulative
+automanu
+automanual
+automark
+automarkt
+automasj
+automasjon
+automasjonen
+automat
+automata
+automate
+automated
+automaten
+automatenfreundlicher
+automatengeschaeft
+automatenhaendler
+automatenknacker
+automatentheorie
+automater
+automates
+automatg
+automatgear
+automati
+automatic
+automatica
+automatical
+automatically
+automaticamente
+automaticity
+automatico
+automatics
+automatik
+automatikabla"ufe
+automatikablauf
+automatikablaufs
+automatikbetrieb
+automatikdatei
+automatikdateien
+automatiken
+automatikfahrt
+automatikfahrten
+automatikfunktion
+automatikfunktionen
+automatikk
+automatikken
+automatikprogramm
+automatikprogrammierung
+automatikprogramms
+automatikregelungen
+automatikstart
+automatiktypen
+automatikzyklen
+automatikzyklus
+automatin
+automating
+automation
+automationen
+automations
+automatique
+automatiquement
+automatiques
+automatisa
+automatisaient
+automatisais
+automatisait
+automatisant
+automatisation
+automatisations
+automatisch
+automatische
+automatischem
+automatischen
+automatischer
+automatisches
+automatischt
+automatise
+automatise'
+automatise'e
+automatise'es
+automatise's
+automatise`rent
+automatisent
+automatiser
+automatisera
+automatiserai
+automatiseraient
+automatiserais
+automatiserait
+automatiseras
+automatisere
+automatiseren
+automatiseret
+automatiserez
+automatiseriez
+automatisering
+automatiseringa
+automatiseringen
+automatiseringssysteem
+automatiserions
+automatiserons
+automatiseront
+automatisert
+automatises
+automatisez
+automatisierenden
+automatisiert
+automatisierte
+automatisierten
+automatisierter
+automatisierung
+automatisierunganforderungen
+automatisierungen
+automatisierungsanforderungen
+automatisierungsstufen
+automatisiez
+automatisions
+automatisk
+automatiske
+automatism
+automatisme
+automatismes
+automatismo
+automatismus
+automatisons
+automatist
+automatization
+automatize
+automatized
+automatizes
+automatizing
+automato
+automatograph
+automaton
+automatonlike
+automatons
+automatonta
+automatontons
+automatous
+automats
+automatteori
+automech
+automechanical
+automechaniker
+automechanikers
+automedo
+automedon
+automedonte
+automelo
+automelon
+autometa
+autometamorphosis
+autometr
+autometric
+autometry
+automi
+automitr
+automitrailleuse
+automitrailleuses
+automnal
+automnale
+automnales
+automnau
+automnaux
+automne
+automnes
+automo`vil
+automobi
+automobiel
+automobielen
+automobil
+automobilabsatz
+automobilbau
+automobilbereich
+automobile
+automobilen
+automobiler
+automobiles
+automobilfabrik
+automobilfirma
+automobilfirmen
+automobilforbund
+automobilhandlung
+automobili
+automobilimporte
+automobilism
+automobilisme
+automobilist
+automobiliste
+automobilisten
+automobilistes
+automobilistic
+automobilists
+automobility
+automobilklubs
+automobilkonzern
+automobilkonzerne
+automobilproduzenten
+automobilrennen
+automobilrevue
+automobilunternehmen
+automobilverbaende
+automobilverkaeufer
+automobilwerk
+automobilwerke
+automobilwirtschaft
+automoli
+automolite
+automons
+automonstration
+automorp
+automorph
+automorphic
+automorphically
+automorphism
+automoti
+automotive
+automoto
+automotor
+automotora
+automotoren
+automotriz
+automovili`stica
+automovili`stico
+automovilismo
+automovilista
+automowe
+automower
+automtis
+automtisierbar
+automuse
+automuseum
+automyso
+automysophobia
+auton
+autoname
+autonamen
+autonavi
+autonavigator
+autonavigators
+autonega
+autonegation
+autoneph
+autonephrectomy
+autonephrotoxin
+autonett
+autonettoyant
+autonettoyante
+autonettoyantes
+autonettoyants
+autoneur
+autoneurotoxin
+autonitr
+autonitridation
+autono`mica
+autono`micamente
+autono`mico
+autonoet
+autonoetic
+autonom
+autonoma
+autonomas
+autonomasia
+autonomasy
+autonome
+autonomes
+autonomi
+autonomi`a
+autonomic
+autonomical
+autonomically
+autonomie
+autonomie-erklaerung
+autonomiebestrebungen
+autonomien
+autonomies
+autonomist
+autonomista
+autonomiste
+autonomisten
+autonomistes
+autonomize
+autonomn
+autonomna
+autonomne
+autonomo
+autonomous
+autonomously
+autonomt
+autonomy
+autonoom
+autonumm
+autonummer
+autonym
+autootje
+autootjes
+autopara
+autoparasitism
+autopark
+autoparken
+autopath
+autopathic
+autopathography
+autopathy
+autoped
+autopeds
+autopela
+autopelagic
+autopeps
+autopepsia
+autophag
+autophagi
+autophagia
+autophagous
+autophagy
+autophob
+autophobia
+autophoby
+autophon
+autophone
+autophonoscope
+autophonous
+autophony
+autophot
+autophotoelectric
+autophotograph
+autophotometry
+autophth
+autophthalmoscope
+autophyl
+autophyllogeny
+autophyt
+autophyte
+autophytic
+autophytically
+autophytograph
+autophytography
+autopilo
+autopilot
+autopilots
+autopista
+autoplag
+autoplagiarism
+autoplas
+autoplasmotherapy
+autoplast
+autoplastia
+autoplastic
+autoplasty
+autopneu
+autopneumatic
+autopoin
+autopoint
+autopois
+autopoisonous
+autopola
+autopolar
+autopolo
+autopoloist
+autopoly
+autopolyploid
+autopore
+autoport
+autoportrait
+autoportraits
+autoportraiture
+autoposi
+autopositive
+autopote
+autopotent
+autoprei
+autopreis
+autoprog
+autoprogressive
+autoprop
+autopropulse'
+autopropulse'e
+autopropulse'es
+autopropulse's
+autoprot
+autoproteolysis
+autoprothesis
+autopsi
+autopsia
+autopsic
+autopsical
+autopsie
+autopsied
+autopsien
+autopsier
+autopsies
+autopsy
+autopsyc
+autopsychic
+autopsychoanalysis
+autopsychology
+autopsychorhythmia
+autopsychosis
+autopsyi
+autopsying
+autoptic
+autoptical
+autoptically
+autopticity
+autoputt
+autopyot
+autopyotherapy
+autoquot
+autoquote
+autor
+autora
+autorace
+autoracemization
+autoradi
+autoradio
+autoradiograph
+autoradiographic
+autoradiography
+autoradios
+autoraeu
+autoraeuber
+autorail
+autorails
+autorain
+autorati
+autorativt
+autore
+autorede
+autoreden
+autoredu
+autoreduction
+autoreed
+autorefe
+autoreferenza
+autoreg
+autorege
+autoregenerator
+autoregr
+autoregression
+autoregressions
+autoregressive
+autoregressivemoving
+autoregu
+autoregulation
+autoregulative
+autoregulatory
+autorein
+autoreinfusion
+autoreis
+autoreise
+autoreisenden
+autorela
+autorelated
+autoren
+autorenn
+autorennplaene
+autorenr
+autorenrecht
+autorenrechte
+autorepa
+autoreparaturwerkstatt
+autoreta
+autoretardation
+autorhyt
+autorhythmic
+autorhythmus
+autori
+autori`a
+autoridad
+autorijd
+autorijden
+autorijder
+autorijders
+autorijdster
+autorijdsters
+autorijdt
+autorin
+autorinn
+autorinnen
+autorisa
+autorisaient
+autorisais
+autorisait
+autorisant
+autorisasjon
+autorisasjonen
+autorisatie
+autorisaties
+autorisation
+autorisations
+autorise
+autorise'
+autorise'e
+autorise'es
+autorise's
+autorise`rent
+autoriseer
+autoriseerde
+autoriseerden
+autoriseert
+autorisent
+autoriser
+autorisera
+autoriserai
+autoriseraient
+autoriserais
+autoriserait
+autoriseras
+autorisere
+autoriserede
+autoriseren
+autoriseret
+autoriserez
+autoriseriez
+autoriserions
+autoriserons
+autoriseront
+autorisert
+autoriserte
+autorises
+autorisez
+autorisi
+autorisierte
+autorisiez
+autorisions
+autoriso
+autorisons
+autorita
+autoritaet
+autoritaeten
+autoritaetsverlust
+autoritair
+autoritairder
+autoritaire
+autoritaires
+autoritairst
+autoritaria
+autoritariamente
+autoritario
+autoritarisme
+autoritarismo
+autoritativ
+autoritativa
+autoritative
+autoritativo
+autoritativt
+autorite
+autorite'
+autorite's
+autoriteit
+autoriteiten
+autoritet
+autoriteten
+autoritetene
+autoriteter
+autoriteternes
+autoriti
+autoritie
+autorit{
+autorit{r
+autorit{re
+autorit{rt
+autorizable
+autorizacio`n
+autorizada
+autorizadamente
+autorizado
+autorizador
+autorizadora
+autorizamiento
+autorizante
+autorizar
+autorizz
+autorizza
+autorizzai
+autorizzato
+autorizzazione
+autorizzi
+autorizzo
+autoro
+autorota
+autorotation
+autorout
+autoroute
+autoroutes
+autorouting
+autorretrato
+autorrha
+autorrhaphy
+autors
+autorsch
+autorschaft
+autos
+autos-co
+autos-couchettes
+autosaid
+autosati
+autosatisfaction
+autosaur
+autosauri
+autosauria
+autoscha
+autoschau
+autosche
+autoschediasm
+autoschediastic
+autoschediastical
+autoschediastically
+autoschediaze
+autoschl
+autoschlange
+autoschlangen
+autoschlu"ssel
+autoschluessel
+autoscie
+autoscience
+autoscoo
+autoscootern
+autoscop
+autoscope
+autoscopic
+autoscopy
+autosend
+autosender
+autosens
+autosensitization
+autosensitized
+autosept
+autosepticemia
+autosero
+autoserotherapy
+autoseru
+autoserum
+autosexi
+autosexing
+autosigh
+autosight
+autosign
+autosite
+autositi
+autositic
+autositz
+autositze
+autoskel
+autoskeleton
+autosled
+autoslip
+autosoma
+autosomal
+autosomatognosis
+autosomatognostic
+autosome
+autosote
+autosoteric
+autosoterism
+autospor
+autospore
+autosporic
+autosport
+autospra
+autospray
+autospui
+autospuit
+autospuiten
+autostab
+autostability
+autostag
+autostage
+autostan
+autostandardization
+autostar
+autostarter
+autostet
+autostethoscope
+autostim
+autostimulationsfunktion
+autostop
+autostopp
+autostra
+autostrad
+autostrad-2
+autostrad-bay
+autostrada
+autostrada's
+autostradaen
+autostradas
+autostrade
+autostrades
+autostrassen
+autostyl
+autostylic
+autostylism
+autostyly
+autosugestio`n
+autosugg
+autosuggestibility
+autosuggestible
+autosuggestie
+autosuggestion
+autosuggestionist
+autosuggestionner
+autosuggestions
+autosuggestive
+autosupp
+autosuppression
+autosymb
+autosymbiontic
+autosymbolic
+autosymbolical
+autosymbolically
+autosymn
+autosymnoia
+autosyn
+autosynd
+autosyndesis
+autotaid
+autotech
+autotechniek
+autoteil
+autoteile
+autotele
+autotelefon
+autotelegraph
+autoteli
+autotelic
+autotent
+autotentoonstelling
+autotentoonstellingen
+autotetr
+autotetraploid
+autotetraploidy
+autothau
+autothaumaturgist
+autothea
+autotheater
+autothei
+autotheism
+autotheist
+autother
+autotherapeutic
+autotherapy
+autothermy
+autotoch
+autotocht
+autotochten
+autotomi
+autotomic
+autotomize
+autotomo
+autotomous
+autotomy
+autotoxa
+autotoxaemia
+autotoxi
+autotoxic
+autotoxication
+autotoxicity
+autotoxicosis
+autotoxin
+autotoxis
+autotrac
+autotractor
+autotran
+autotransformer
+autotransfusion
+autotransplant
+autotransplantation
+autotrep
+autotrepanation
+autotrip
+autotriploid
+autotriploidy
+autotrop
+autotroph
+autotrophic
+autotrophy
+autotropic
+autotropically
+autotropism
+autotruc
+autotruck
+autotube
+autotuberculin
+autoturn
+autoturning
+autotype
+autotyph
+autotyphization
+autotypi
+autotypic
+autotypo
+autotypography
+autotypy
+autouhre
+autouhren
+autounfa
+autounfall
+autounfalles
+autour
+autourin
+autourine
+autovacc
+autovaccination
+autovaccine
+autovale
+autovalet
+autovalu
+autovalutazione
+autovalv
+autovalve
+autoverh
+autoverhuurder
+autoverhuurders
+autoverk
+autoverkaeufer
+autoverkeer
+autoverkehr
+autoverkehrs
+autoverl
+autoverleihe
+autoverleihen
+autoverleiher
+autoverm
+autovermietung
+autoverw
+autoverwertung
+autovete
+autoveteran
+autovivi
+autovivisection
+autowass
+autowasspullen
+autoweg
+autowege
+autowegen
+autowerk
+autowerkstaetten
+autowerkstatt
+autowrac
+autowracks
+autoxeny
+autoxida
+autoxidation
+autoxidator
+autoxidi
+autoxidizability
+autoxidizable
+autoxidize
+autoxidizer
+autozeit
+autozeitschrift
+autozent
+autozentrum
+autozooi
+autozooid
+autozube
+autozubehoere
+autozubehoeren
+autozubehoers
+autozusa
+autozusammenstoss
+autrain
+autre
+autrefoi
+autrefois
+autremen
+autrement
+autres
+autret
+autrichi
+autrichien
+autrichienne
+autrichiennes
+autrichiens
+autrigo`n
+autrigona
+autruche
+autruches
+autrui
+autry
+autryvil
+autryville
+autu
+autumal
+autumn
+autumnal
+autumnally
+autumnia
+autumnian
+autumnit
+autumnity
+autumns
+autunian
+autunite
+autunni
+autunno
+auu
+auvent
+auvents
+auvergna
+auvergnat
+auvergne
+auvo
+auw
+auwaka
+auwera
+auwje
+aux
+auxamyla
+auxamylase
+auxanogr
+auxanogram
+auxanolo
+auxanology
+auxanome
+auxanometer
+auxesis
+auxetic
+auxetica
+auxetical
+auxetically
+auxier
+auxiliador
+auxiliadora
+auxiliai
+auxiliaire
+auxiliaires
+auxiliante
+auxiliar
+auxiliari`a
+auxiliaries
+auxiliarly
+auxiliary
+auxiliat
+auxiliate
+auxiliation
+auxiliator
+auxiliatoria
+auxiliatorio
+auxiliatory
+auxilio
+auxilium
+auxillar
+auxillary
+auximone
+auxin
+auxinic
+auxinica
+auxinically
+auxins
+auxira
+auxoacti
+auxoaction
+auxoamyl
+auxoamylase
+auxoblas
+auxoblast
+auxobody
+auxocard
+auxocardia
+auxochro
+auxochrome
+auxochromic
+auxochromism
+auxochromous
+auxocyte
+auxoflor
+auxoflore
+auxofluo
+auxofluor
+auxograp
+auxograph
+auxographic
+auxohorm
+auxohormone
+auxology
+auxomete
+auxometer
+auxospor
+auxospore
+auxosubs
+auxosubstance
+auxotoni
+auxotonic
+auxotox
+auxquell
+auxquelles
+auxquels
+auxvasse
+auy
+auyakawa
+auyana
+auye
+auyeung
+auyokawa
+auyu
+auz
+av
+av.
+ava
+avacada
+avacado
+avacanoe
+avacanoeiro
+avachi
+avachie
+avachies
+avachir
+avachira
+avachiraient
+avachirait
+avachire
+avachirent
+avachiro
+avachiront
+avachis
+avachiss
+avachissaient
+avachissait
+avachissant
+avachisse
+avachissement
+avachissent
+avachit
+avadana
+avadar
+avadavat
+avadhi
+avadhuta
+avadi
+avahada
+avahado
+avahar
+avahi
+avaient
+avail
+availabi
+availabilities
+availability
+availabl
+available
+availableness
+availably
+availdev
+availe
+availed
+availer
+availers
+availes
+availeth
+availibl
+availible
+availing
+availingly
+availmen
+availment
+avails
+avais
+avait
+aval
+avala
+avalaien
+avalaient
+avalais
+avalait
+avalanch
+avalanche
+avalanched
+avalanches
+avalanching
+avalant
+avalar
+avaldsne
+avaldsnes
+avale
+avale'
+avale'e
+avale'es
+avale's
+avale`re
+avale`rent
+avaleer
+avaleerd
+avaleerde
+avaleerden
+avaleert
+avalen
+avalent
+avalentada
+avalentado
+avalentamiento
+avalentar
+avalentonada
+avalentonado
+avaler
+avalera
+avalerai
+avaleraient
+avalerais
+avalerait
+avaleras
+avaleren
+avalerez
+avalerie
+avaleriez
+avalerio
+avalerions
+avaleron
+avalerons
+avaleront
+avales
+avalez
+avali`o
+avaliar
+avaliez
+avalions
+avalisa
+avalisai
+avalisaient
+avalisais
+avalisait
+avalisan
+avalisant
+avalise
+avalise'
+avalise'e
+avalise'es
+avalise's
+avalise`
+avalise`rent
+avalisen
+avalisent
+avaliser
+avalisera
+avaliserai
+avaliseraient
+avaliserais
+avaliserait
+avaliseras
+avaliserez
+avaliseriez
+avaliserions
+avaliserons
+avaliseront
+avalises
+avalisez
+avalisie
+avalisiez
+avalisio
+avalisions
+avalison
+avalisons
+avalist
+avalista
+avaliste
+avalisten
+avalla
+avallai
+avallamm
+avallammo
+avalland
+avallando
+avallano
+avallar
+avallare
+avallaro
+avallarono
+avallass
+avallasse
+avallassi
+avallast
+avallaste
+avallasti
+avallata
+avallate
+avallati
+avallato
+avallava
+avallavamo
+avallavano
+avallavate
+avallavi
+avallavo
+avalle
+avallera
+avallerai
+avallere
+avallerei
+avalleremo
+avallerete
+avallero
+avalli
+avalliam
+avalliamo
+avalliat
+avalliate
+avallino
+avallo
+avalloke
+avallokeras
+avallone
+avalof
+avaloff
+avalon
+avalons
+avalorar
+avals
+avalu`o
+avaluacio`n
+avaluar
+avalutat
+avalutativo
+avalvula
+avalvular
+avam
+avambrazo
+avampie`s
+avanc
+avanc/a
+avanc/ai
+avanc/aient
+avanc/ais
+avanc/ait
+avanc/an
+avanc/ant
+avanc/on
+avanc/ons
+avancarga
+avance
+avance'
+avance'e
+avance'es
+avance's
+avance`r
+avance`rent
+avanceer
+avanceerde
+avanceerden
+avanceert
+avanceme
+avancement
+avancent
+avancer
+avancera
+avancerai
+avanceraient
+avancerais
+avancerait
+avanceras
+avancere
+avancerede
+avanceren
+avanceret
+avancerez
+avanceri
+avanceriez
+avancerions
+avancero
+avancerons
+avanceront
+avances
+avancez
+avancier
+avancieren
+avanciez
+avancion
+avancions
+avand
+avande
+avandicha
+avandicho
+avanecerse
+avanguar
+avanguarda
+avanguardia
+avanguardisti
+avania
+avanie
+avanies
+avanious
+avanki
+avankil
+avanse
+avansefo
+avanseforh|yelser
+avanseme
+avansement
+avansementet
+avansementsordning
+avansementsordningen
+avansementsstopp
+avansen
+avansere
+avanserer
+avansert
+avanserte
+avant
+avant-br
+avant-bras
+avant-ce
+avant-centre
+avant-co
+avant-coureur
+avant-coureurs
+avant-cr
+avant-creuset
+avant-creusets
+avant-de
+avant-dernie`re
+avant-dernie`res
+avant-dernier
+avant-derniers
+avant-ga
+avant-garde
+avant-gardefilm
+avant-gardefilms
+avant-gardes
+avant-gardetheater
+avant-gardetheaters
+avant-go
+avant-gou^t
+avant-gu
+avant-guerre
+avant-hi
+avant-hier
+avant-po
+avant-poste
+avant-postes
+avant-pr
+avant-premie`re
+avant-premie`res
+avant-projet
+avant-projets
+avant-propos
+avant-sc
+avant-sce`ne
+avant-scene
+avant-scenes
+avant-tr
+avant-train
+avant-trains
+avant-ve
+avant-veille
+avant-veilles
+avantage
+avantage'
+avantage'e
+avantage'es
+avantage's
+avantage`rent
+avantagea
+avantageaient
+avantageais
+avantageait
+avantageant
+avantagent
+avantageons
+avantager
+avantagera
+avantagerai
+avantageraient
+avantagerais
+avantagerait
+avantageras
+avantagerez
+avantageriez
+avantagerions
+avantagerons
+avantageront
+avantages
+avantageuse
+avantageusement
+avantageuses
+avantageux
+avantagez
+avantagi
+avantagiez
+avantagions
+avantal
+avantcou
+avantcoureur
+avantcourier
+avantcourrier
+avante
+avantgar
+avantgarde
+avantgardefilme
+avantgarden
+avantgardens
+avantgardistisches
+avantgardistisk
+avanti
+avantier
+avantieri
+avantpro
+avantpropos
+avantre`n
+avants
+avants-c
+avants-centres
+avanturi
+avanturine
+avanza
+avanzada
+avanzado
+avanzai
+avanzamm
+avanzammo
+avanzand
+avanzando
+avanzano
+avanzar
+avanzare
+avanzaro
+avanzarono
+avanzass
+avanzasse
+avanzassi
+avanzast
+avanzaste
+avanzasti
+avanzata
+avanzate
+avanzati
+avanzato
+avanzava
+avanzavamo
+avanzavano
+avanzavate
+avanzavi
+avanzavo
+avanzera
+avanzerai
+avanzere
+avanzerei
+avanzeremo
+avanzerete
+avanzero
+avanzi
+avanziam
+avanziamo
+avanziat
+avanziate
+avanzino
+avanzo
+avar
+avara
+avaradra
+avaradrano
+avaramente
+avard
+avare
+avaremot
+avaremotemo
+avares
+avari
+avaria
+avarian
+avariant
+avarice
+avarices
+avaricia
+avariciar
+avaricio
+avariciosa
+avariciosamente
+avaricioso
+avaricious
+avariciously
+avariciousness
+avarie
+avarie'
+avarie'e
+avarie'es
+avarie's
+avarienta
+avarientamente
+avarientez
+avariento
+avarier
+avaries
+avarish
+avarizia
+avarizie
+avaro
+avaroand
+avaroandi
+avaroandidido
+avars
+avart
+avarta
+avarten
+avarua
+avasallador
+avasalladora
+avasallamiento
+avascula
+avascular
+avasillar
+avaso
+avast
+avatar
+avatars
+avatime
+avatiu
+avau
+avaunt
+avaushi
+avawam
+avaz
+avb
+avbakeli
+avbakelig
+avbaklig
+avbalans
+avbalansere
+avbalansering
+avbalansert
+avbenytt
+avbenyttelse
+avbestil
+avbestille
+avbestilling
+avbestillinga
+avbestillingen
+avbestilt
+avbestilte
+avbetale
+avbetali
+avbetaling
+avbetalinga
+avbetalingen
+avbetalingskontrakt
+avbetalingsvilk}r
+avbetalt
+avbetalte
+avbikt
+avbikten
+avbilda
+avbilde
+avbildet
+avbildni
+avbildning
+avbildningar
+avbildningen
+avbildninger
+avblaend
+avblaendning
+avblandn
+avblandning
+avblomst
+avblomstre
+avblomstring
+avbl{ndn
+avbl{ndning
+avbl}se
+avbl}ses
+avbl}sin
+avbl}sing
+avbl}singa
+avbl}sni
+avbl}sning
+avbl}sningen
+avbl}st
+avboen
+avbon
+avbrekk
+avbrekke
+avbrekket
+avbrenni
+avbrenning
+avbroet
+avbrot
+avbrott
+avbrotte
+avbrottet
+avbrottets
+avbrudd
+avbrudds
+avbruddstid
+avbruddstiden
+avbrukke
+avbrukken
+avbrukket
+avbruten
+avbrutit
+avbrutt
+avbrutte
+avbryt
+avbryta
+avbryte
+avbrytel
+avbrytelse
+avbrytelsen
+avbrytelser
+avbryter
+avbrytes
+avbr|t
+avbud
+avbudet
+avb|n
+avb|te
+avb|tt
+avb|ynin
+avb|yning
+avdal
+avdalen
+avdanka
+avdanke
+avdanked
+avdankede
+avdanket
+avdankete
+avdekke
+avdekker
+avdekkes
+avdekket
+avdeknin
+avdekning
+avdela
+avdeling
+avdelinga
+avdelingen
+avdelingene
+avdelingens
+avdelinger
+avdelingers
+avdelings
+avdelingsbestyreren
+avdelingsdirekt|r
+avdelingsingeni|r
+avdelingskontor
+avdelingskontorer
+avdelingskontoret
+avdelingsleder
+avdelingsledere
+avdelingslederen
+avdelingsnavn
+avdelingssjef
+avdelingssjefene
+avdelnin
+avdelning
+avdelningar
+avdelningen
+avdempe
+avdempet
+avdjusko
+avdp
+avdra
+avdrag
+avdragen
+avdragene
+avdraget
+avdragsf
+avdragsfri
+avdragsfrihet
+avdragsfritt
+avdras
+avdrift
+avdrifta
+avdrog
+avdr}tt
+avdr}tte
+avdr}tten
+avduka
+avduke
+avduker
+avduket
+avduking
+avdukinga
+avdukingen
+avd|d
+avd|de
+avd|des
+avd|dt
+ave
+ave'ra
+ave'raie
+ave'raient
+ave'rait
+ave'rant
+ave're'
+ave're'e
+ave're'es
+ave're's
+ave're`r
+ave're`rent
+ave'rer
+ave'rera
+ave'reraient
+ave'rerait
+ave'rero
+ave'reront
+ave's
+ave-mari
+ave-maria
+ave-maria's
+ave`neme
+ave`nement
+ave`re
+ave`rent
+ave`s
+avec
+avechucho
+avecilla
+avecinar
+avecindamiento
+avecindar
+avedikia
+avedikian
+avedis
+avedon
+aveelzaa
+aveelzaad
+aveetje
+aveetjes
+avefri`a
+avegaar
+avegaars
+aveiro
+avejar
+avejentar
+avejigar
+aveke
+avekom
+avel
+avelar
+avelenar
+aveline
+avella
+avellan
+avellana
+avellanador
+avellanal
+avellanar
+avellanate
+avellane
+avellaneda
+avellanedo
+avellaneous
+avellanera
+avellanero
+avellano
+avelli
+avelonge
+aveloz
+avemari`a
+aven
+avena
+avenaceo
+avenaceous
+avenada
+avenado
+avenage
+avenal
+avenalin
+avenamiento
+avenant
+avenante
+avenantes
+avenants
+avenar
+avenate
+avendo
+avenediza
+avenedizo
+avenel
+avenenar
+avenencia
+avenenteza
+avener
+aveng
+avenge
+avengean
+avengeance
+avenged
+avengefu
+avengeful
+avengeme
+avengement
+avenger
+avengere
+avengeress
+avengers
+avenges
+avengeth
+avenging
+avengingly
+aveni`cea
+aveni`ceo
+avenible
+avenida
+avenidera
+avenidero
+avenidiza
+avenidizo
+avenido
+avenidor
+avenidora
+aveniente
+avenimiento
+avenin
+avenir
+avenolit
+avenolith
+avenous
+avens
+avenses
+avent
+aventada
+aventadero
+aventado
+aventador
+aventadora
+aventadura
+aventail
+aventaja
+aventajada
+aventajadamente
+aventajado
+aventajamiento
+aventajar
+aventamiento
+aventar
+avente
+aventear
+aventine
+aventura
+aventurada
+aventurado
+aventuraient
+aventurais
+aventurait
+aventurant
+aventurar
+aventure
+aventure'
+aventure'e
+aventure'es
+aventure's
+aventure`rent
+aventurent
+aventurer
+aventurera
+aventurerai
+aventureraient
+aventurerais
+aventurerait
+aventureramente
+aventureras
+aventurerez
+aventureriez
+aventurerions
+aventurero
+aventurerons
+aventureront
+aventures
+aventureuse
+aventureuses
+aventureux
+aventurez
+aventuri
+aventurie`re
+aventurie`res
+aventurier
+aventuriers
+aventuriez
+aventurine
+aventurions
+aventuro
+aventurons
+aventyr
+aventyra
+avenu
+avenue
+avenues
+avenus
+aveny
+avenyen
+aver
+avera
+average
+averaged
+averagel
+averagely
+averager
+averages
+averagin
+averaging
+averah
+averar
+averardo
+averbob|
+averbob|ying
+averbob|yinga
+averdugar
+avere
+averecht
+averechts
+averechtse
+averechtser
+averechtst
+averell
+averett
+averette
+avergele
+avergo\ar
+avergonzada
+avergonzadamente
+avergonzado
+avergonzamiento
+avergonzar
+averi
+averi`a
+averi`o
+averiarse
+averiguable
+averiguacio`n
+averiguadamente
+averiguador
+averiguadora
+averiguamiento
+averiguar
+averij
+averij-g
+averij-grosse
+averijen
+averijko
+averijkosten
+averil
+averill
+averillp
+averillpark
+averin
+averla
+averment
+averments
+averna
+avernal
+averno
+avernus
+averrabl
+averrable
+averral
+averred
+averrer
+averrhoa
+averring
+averroes
+averroi`smo
+averroi`sta
+averrois
+averroism
+averroist
+averroistic
+averrugada
+averrugado
+averrunc
+averruncate
+averruncation
+averruncator
+avers
+aversa
+aversant
+aversar
+aversaria
+aversario
+aversati
+aversation
+averse
+aversely
+aversene
+averseness
+averses
+aversio`n
+aversion
+aversions
+aversive
+aversjon
+aversjonen
+averso
+avert
+avertabl
+avertable
+averted
+avertedl
+avertedly
+averter
+avertere
+averteret
+avertering
+avertert
+averterte
+averti
+avertibl
+avertible
+avertie
+averties
+avertin
+averting
+avertir
+avertira
+avertirai
+avertiraient
+avertirais
+avertirait
+avertiras
+avertire
+avertirent
+avertirez
+avertiri
+avertiriez
+avertirions
+avertiro
+avertirons
+avertiront
+avertis
+avertiss
+avertissaient
+avertissais
+avertissait
+avertissant
+avertisse
+avertissement
+avertissementet
+avertissements
+avertissent
+avertisses
+avertisseur
+avertisseurs
+avertissez
+avertissiez
+avertissions
+avertissons
+avertit
+avertive
+averts
+averuit
+averunca
+averuncate
+avery
+averycor
+averycorn
+averyisl
+averyisland
+averyl
+aves
+avesse
+avessero
+avessi
+avessimo
+avesta
+avestan
+aveste
+avestruz
+avet
+aveta
+avetada
+avetado
+avetarda
+avete
+avetoro
+aveu
+aveugla
+aveuglai
+aveuglaient
+aveuglais
+aveuglait
+aveuglan
+aveuglant
+aveuglante
+aveuglantes
+aveuglants
+aveugle
+aveugle'
+aveugle'e
+aveugle'es
+aveugle'ment
+aveugle's
+aveugle`
+aveugle`rent
+aveuglem
+aveuglement
+aveuglen
+aveuglent
+aveugler
+aveuglera
+aveuglerai
+aveugleraient
+aveuglerais
+aveuglerait
+aveugleras
+aveuglerez
+aveugleriez
+aveuglerions
+aveuglerons
+aveugleront
+aveugles
+aveuglet
+aveuglette
+aveuglez
+aveuglie
+aveugliez
+aveuglio
+aveuglions
+aveuglon
+aveuglons
+aveuli
+aveulie
+aveulies
+aveulir
+aveulis
+aveuliss
+aveulissement
+aveux
+aveva
+avevamo
+avevano
+avevate
+avevi
+avevo
+avez
+aveza
+avezadura
+avezar
+avfaerda
+avfall
+avfallet
+avfallsp
+avfallsplassen
+avfallss
+avfallsstoff
+avfant
+avfarda
+avfatta
+avfatte
+avfattet
+avfeie
+avfeier
+avfeiet
+avfeldig
+avferdig
+avferdige
+avferdiget
+avfinne
+avfj{ret
+avfj{rin
+avfj{ringen
+avfoeras
+avfolke
+avfolkes
+avfolkin
+avfolking
+avfolkinga
+avfolkingen
+avfolkni
+avfolkning
+avfolkningen
+avforas
+avfotogr
+avfotografert
+avfyre
+avfyrt
+avfyrte
+avf{rda
+avf|ras
+avf|ring
+avf|ringa
+avg
+avga
+avgaa
+avgaang
+avgang
+avgangen
+avgangene
+avganger
+avgangs
+avgangse
+avgangseksamen
+avgangsk
+avgangsklassene
+avgangsklasser
+avgaser
+avgass
+avgassen
+avgassene
+avgasser
+avgassin
+avgassing
+avgav
+avge
+avger
+avgi
+avgick
+avgifer
+avgift
+avgifta
+avgiften
+avgiftene
+avgifter
+avgiftsf
+avgiftsfond
+avgiftsforh|yelsene
+avgiftsfritt
+avgiftsp
+avgiftspliktige
+avgiftspolitikk
+avgiftss
+avgiftssystem
+avgikk
+avgir
+avgitt
+avgitte
+avgiva
+avgivit
+avgjerd
+avgjerda
+avgjersl
+avgjersla
+avgjersle
+avgjorde
+avgjort
+avgjorte
+avgj|r
+avgj|re
+avgj|rel
+avgj|relse
+avgj|relsen
+avgj|relsene
+avgj|relser
+avgj|ren
+avgj|rende
+avgj|res
+avglans
+avglanse
+avglansen
+avglemt
+avgl|mt
+avgnagd
+avgoer
+avgoera
+avgor
+avgora
+avgousti
+avgoustidou
+avgraens
+avgraensa
+avgraensningar
+avgraensningen
+avgransa
+avgransn
+avgransningar
+avgransningen
+avgrensa
+avgrense
+avgrensede
+avgrensende
+avgrenser
+avgrenset
+avgrensete
+avgrensi
+avgrensing
+avgrensinger
+avgrensn
+avgrensning
+avgrunn
+avgrunne
+avgrunnen
+avgrunns
+avgrunnsdype
+avgr{nsa
+avgr{nsn
+avgr{nsningar
+avgr{nsningen
+avgud
+avguda
+avguden
+avgudsbi
+avgudsbilde
+avg|r
+avg|ra
+avg}
+avg}ng
+avg}r
+avg}tt
+avhaalla
+avhalla
+avhandla
+avhandlas
+avhandlat
+avhandli
+avhandling
+avhandlinga
+avhandlingen
+avhandlinger
+avhang
+avhenda
+avhende
+avhendet
+avhenge
+avhenger
+avhengig
+avhengige
+avhengighet
+avhengigheten
+avhengighetsforhold
+avhengighetsforholdet
+avhengih
+avhengihet
+avhengt
+avhente
+avhentin
+avhenting
+avhentinga
+avhentingen
+avhjaelp
+avhjaelpa
+avhjaelps
+avhjalpa
+avhjalps
+avhjelpe
+avhjelpes
+avhj{lpa
+avhj{lps
+avhoell
+avhold
+avholde
+avholdel
+avholdelse
+avholdelsen
+avholden
+avholdenhet
+avholder
+avholdes
+avholdet
+avholdsa
+avholdsak
+avholdsb
+avholdsbevegelsen
+avholdsf
+avholdsfolk
+avholdsforbund
+avholdsl
+avholdslag
+avholdso
+avholdsorganisasjonene
+avholdss
+avholdssak
+avholdssaka
+avholdt
+avholdte
+avholl
+avhopper
+avhopperen
+avhoppin
+avhopping
+avhugga
+avhuggen
+avhugget
+avh|ll
+avh|r
+avh|re
+avh|rene
+avh|res
+avh|ret
+avh|ring
+avh|rt
+avh|rte
+avh}lla
+avi
+avi-eds
+avi\one`s
+avi\onense
+avi\onesa
+avi`cola
+avi`o
+aviacio`n
+aviador
+aviadora
+aviajada
+aviajado
+avialble
+aviamiento
+avian
+aviana
+avianiza
+avianization
+avianize
+avianized
+avianizes
+aviano
+aviano-a
+aviano-am1
+aviano-m
+aviano-mil-tac
+aviano-p
+aviano-piv-2
+avians
+avianwu
+aviar
+aviarari
+aviararies
+aviaria
+aviaries
+aviario
+aviarist
+aviarists
+aviary
+aviate
+aviated
+aviates
+aviateur
+aviateurs
+aviatic
+aviatiek
+aviatik
+aviatike
+aviatiker
+aviating
+aviation
+aviations
+aviator
+aviatori
+aviatorial
+aviatoriality
+aviators
+aviatory
+aviatres
+aviatress
+aviatric
+aviatrice
+aviatrices
+aviatrix
+aviatrixes
+avica
+avice
+avicena
+avicenna
+avicenni
+avicennia
+avicenniaceae
+avicennism
+avichi
+aviciar
+avicide
+avick
+avicolou
+avicolous
+avictor
+avicula
+avicular
+avicularia
+avicularian
+aviculariidae
+avicularimorphae
+avicularium
+aviculid
+aviculidae
+aviculte
+aviculteur
+aviculteurs
+avicultor
+avicultora
+avicultr
+avicultrice
+avicultrices
+avicultu
+avicultura
+aviculture
+aviculturist
+avicultuur
+avid
+avida
+avidan
+avide
+avidemen
+avidement
+avides
+avidez
+avidi
+avidious
+avidiously
+avidita
+avidite'
+aviditie
+avidities
+avidity
+avidly
+avidness
+avido
+avidous
+avidya
+avie
+aviejar
+aviele
+avienta
+aviento
+aviesa
+aviesamente
+aviesas
+avieso
+aviez
+avifa
+avifauna
+avifaunal
+avig
+avigail
+avigate
+avigatio
+avigation
+avigator
+avigdor
+avignon
+avignone
+avignonese
+avigorar
+avigsido
+avigsidor
+avijja
+avikam
+avikom
+avila
+avilabea
+avilabeach
+avilantarse
+avilantez
+avilanteza
+avilar
+avildsen
+avile
+avile`s
+aviles
+avilesa
+avilesina
+avilesino
+avilez
+avili
+avilie
+avilies
+avilir
+avilira
+avilirai
+aviliraient
+avilirais
+avilirait
+aviliras
+aviliren
+avilirent
+avilirez
+avilirie
+aviliriez
+avilirio
+avilirions
+aviliron
+avilirons
+aviliront
+avilis
+avilissa
+avilissaient
+avilissais
+avilissait
+avilissant
+avilissante
+avilissantes
+avilissants
+avilisse
+avilissement
+avilissent
+avilisses
+avilissez
+avilissi
+avilissiez
+avilissions
+avilisso
+avilissons
+avilit
+avilla
+avillanada
+avillanado
+avillanamiento
+avillanar
+aviltacio`n
+aviltadamente
+aviltamiento
+aviltanza
+aviltar
+avim
+avims
+avin
+avinagrada
+avinagradamente
+avinagrado
+avinagrar
+avinash
+avind
+avinden
+avindsju
+avindsjuk
+avindsyk
+avindsykt
+avine
+avine'
+avine'e
+avine'es
+avine's
+avinenteza
+aviner
+avinger
+avio
+avio`n
+aviolite
+avion
+avioneta
+avionic
+avionics
+avioniqu
+avionique
+avions
+avior
+avirett
+aviris
+aviritu
+aviron
+avirons
+avirulen
+avirulence
+avirulent
+avirxiri
+avis
+avisa
+avisacio`n
+avisacoches
+avisada
+avisadamente
+avisado
+avisador
+avisadora
+avisaien
+avisaient
+avisais
+avisait
+avisamiento
+avisant
+avisar
+avisarti
+avisartikel
+avisartikkel
+avisartikler
+avise
+avise'
+avise'e
+avise'es
+avise's
+avise`re
+avise`rent
+aviseier
+aviseieren
+avisen
+avisene
+avisenes
+avisens
+avisent
+aviser
+avisera
+aviserai
+aviseraient
+aviserais
+aviserait
+aviseras
+aviserez
+aviserie
+aviseriez
+aviserin
+avisering
+aviserio
+aviserions
+aviserne
+avisernes
+aviseron
+aviserons
+aviseront
+avisers
+avises
+avisez
+avisiert
+avisiez
+avisinnl
+avisinnlegg
+avisions
+avisl{sning
+avismeld
+avismelding
+avismeldingen
+avismeldingene
+aviso
+aviso's
+aviso`n
+avisojac
+avisojacht
+avisons
+avisos
+avispa
+avispada
+avispado
+avispapi
+avispapir
+avispar
+avispedar
+avispero
+avispo`n
+avispostkontoret
+avisreda
+avisredaksjoner
+avisrefe
+avisreferater
+avisrepo
+avisreportasje
+avisside
+avissider
+avisspal
+avisspalter
+avistar
+aviston
+avistype
+avisudviklingen
+avisutkl
+avisutklipp
+avitaill
+avitailler
+avital
+avitamin
+avitaminose
+avitaminoses
+avitaminosis
+avitaminotic
+avitelada
+avitelado
+avites
+avith
+avitic
+avituallamiento
+avituallar
+aviv
+aviva
+avivadamente
+avivador
+avivadora
+avivah
+avivaien
+avivaient
+avivais
+avivait
+avivamiento
+avivant
+avivar
+avive
+avive'
+avive'e
+avive'es
+avive's
+avive`re
+avive`rent
+avivent
+aviver
+avivera
+aviverai
+aviveraient
+aviverais
+aviverait
+aviveras
+aviverez
+aviverie
+aviveriez
+aviverio
+aviverions
+aviveron
+aviverons
+aviveront
+avives
+avivez
+aviviez
+avivions
+avivons
+avizandu
+avizandum
+avizor
+avizorador
+avizoradora
+avizorante
+avizorar
+avkaenna
+avkaennare
+avkaenni
+avkaenning
+avkall
+avkallet
+avkanna
+avkannar
+avkannare
+avkannin
+avkanning
+avkasta
+avkastin
+avkasting
+avkastinga
+avkastni
+avkastning
+avkastningen
+avkj|le
+avkj|ler
+avkj|les
+avkj|let
+avkj|lin
+avkj|ling
+avkj|lt
+avkj|rin
+avkj|ring
+avkj|ringa
+avkj|ringen
+avkj|rse
+avkj|rsel
+avkj|rselen
+avklarad
+avklare
+avklaren
+avklarende
+avklarer
+avklarere
+avklarering
+avklareringa
+avklarert
+avklares
+avklaret
+avklarin
+avklaring
+avklaringa
+avklart
+avkledd
+avkledni
+avkledning
+avkledningen
+avkledningsrom
+avkledt
+avkles
+avklippt
+avklipte
+avkoblin
+avkobling
+avkoda
+avkodare
+avkodifi
+avkodifieras
+avkodnin
+avkodningskretsar
+avkok
+avkoket
+avkom
+avkomma
+avkommet
+avkoplin
+avkopling
+avkoppla
+avkopplande
+avkoppli
+avkoppling
+avkorte
+avkortin
+avkorting
+avkortinga
+avkortingen
+avkraeva
+avkraevs
+avkrava
+avkravs
+avkrefta
+avkrefte
+avkreftelse
+avkreftet
+avkreve
+avkrevet
+avkrok
+avkroken
+avkr{va
+avkr{vs
+avkutted
+avkuttede
+avkuttet
+avk{nna
+avk{nnar
+avk{nnare
+avk{nnin
+avk{nning
+avl
+avla
+avlab
+avlaegga
+avlaegse
+avlaegsen
+avlaegset
+avlaegsn
+avlaegsnat
+avlaemna
+avlaesa
+avlaesar
+avlaesare
+avlaeses
+avlaesni
+avlaesningshuvudena
+avlaesningshuvudet
+avlaesta
+avlagga
+avlagsen
+avlagset
+avlagsna
+avlagsnat
+avlagt
+avlagte
+avlamna
+avlan
+avlangt
+avlasa
+avlasare
+avlases
+avlasnin
+avlasningshuvudena
+avlasningshuvudet
+avlasta
+avlaste
+avlaster
+avlastes
+avlastet
+avlastni
+avlastning
+avlat
+avlaten
+avle
+avled
+avlede
+avledede
+avledend
+avledende
+avledes
+avledet
+avlednin
+avledning
+avledningen
+avlegge
+avlegger
+avleggerne
+avlegges
+avleggs
+avleide
+avleie
+avleiing
+avleiinga
+avleiingen
+avleira
+avleire
+avleiret
+avleirin
+avleiring
+avleiringa
+avleiringen
+avleiringer
+avlen
+avler
+avlese
+avleser
+avleses
+avlesing
+avlesinga
+avlesingen
+avlesnin
+avlesning
+avlesningen
+avlesninger
+avlet
+avlevere
+avleverer
+avleveri
+avlevering
+avleveringer
+avlevert
+avlida
+avling
+avlinga
+avlingen
+avlingens
+avlinger
+avlire
+avliva
+avlive
+avlivels
+avlivelse
+avlives
+avlivet
+avliving
+avloena
+avloesa
+avlokke
+avlona
+avlopp
+avlosa
+avlsdyr
+avlsdyre
+avlsdyrene
+avlshing
+avlshingst
+avlsokse
+avlsokser
+avlspurk
+avlspurker
+avlukke
+avlukken
+avlukkene
+avlukket
+avlukt
+avlure
+avlusa
+avlusare
+avluse
+avlusnin
+avlusning
+avlusningen
+avlut
+avlyd
+avlyden
+avlyse
+avlyses
+avlysing
+avlysinga
+avlysnin
+avlysning
+avlysningen
+avlysninger
+avlyssna
+avlyssni
+avlyssning
+avlyst
+avlyste
+avlyttes
+avlyttin
+avlytting
+avlyttinga
+avlyttingen
+avl{gga
+avl{gsen
+avl{gset
+avl{gsna
+avl{gsnat
+avl{mna
+avl{sa
+avl{sare
+avl{ses
+avl{snin
+avl{sningshuvudena
+avl{sningshuvudet
+avl{sta
+avl|na
+avl|nnes
+avl|nnet
+avl|nnin
+avl|nning
+avl|nninga
+avl|nningen
+avl|p
+avl|pet
+avl|pstu
+avl|pstunnel
+avl|psva
+avl|psvann
+avl|psvannet
+avl|psvatn
+avl|psvatnet
+avl|sa
+avl|se
+avl|ser
+avl|sere
+avl|seren
+avl|ses
+avl|sing
+avl|singa
+avl|singen
+avl|snin
+avl|sning
+avl|sningen
+avl|st
+avl|ste
+avl|yse
+avl|yser
+avl|yseren
+avl|ysin
+avl|ysing
+avl|ysinga
+avl|ysingen
+avl|yst
+avl}se
+avl}sing
+avl}singa
+avl}st
+avmagnet
+avmagnetisere
+avmagnetisert
+avmagrin
+avmagringen
+avmakt
+avmakta
+avmakten
+avmarsj
+avmarsje
+avmarsjere
+avmektig
+avmektige
+avmektiges
+avmerket
+avmerkt
+avmytolo
+avmytologisere
+avm|nstr
+avm|nstra
+avm|nstre
+avm|nstret
+avm|nstring
+avm}lt
+avnaemar
+avnaemare
+avnaemarsynpunkter
+avnamare
+avnamars
+avnamarsynpunkter
+avner
+avni
+avnjoet
+avnjot
+avnjuta
+avnj|t
+avnorske
+avn{mare
+avn{mars
+avn{marsynpunkter
+avo
+avoca
+avocacio`n
+avocado
+avocadodressing
+avocadoe
+avocadoen
+avocadoes
+avocadok|det
+avocados
+avocamiento
+avocar
+avocat
+avocate
+avocates
+avocatio
+avocation
+avocational
+avocations
+avocativ
+avocative
+avocator
+avocatory
+avocats
+avocet
+avoceta
+avocets
+avodire
+avogadri
+avogadrite
+avogadro
+avoghet
+avoid
+avoidabl
+avoidable
+avoidably
+avoidanc
+avoidance
+avoidances
+avoidant
+avoide
+avoided
+avoider
+avoiders
+avoiding
+avoidles
+avoidless
+avoidmen
+avoidment
+avoids
+avoine
+avoir
+avoirdup
+avoirdupois
+avoirs
+avoisina
+avoisinaient
+avoisinais
+avoisinait
+avoisinant
+avoisinante
+avoisinantes
+avoisinants
+avoisine
+avoisine'
+avoisine'e
+avoisine'es
+avoisine's
+avoisine`rent
+avoisinent
+avoisiner
+avoisinera
+avoisinerai
+avoisineraient
+avoisinerais
+avoisinerait
+avoisineras
+avoisinerez
+avoisineriez
+avoisinerions
+avoisinerons
+avoisineront
+avoisines
+avoisinez
+avoisini
+avoisiniez
+avoisinions
+avoisino
+avoisinons
+avokaya
+avol
+avolate
+avolatio
+avolation
+avolcanada
+avolcanado
+avoleza
+avolitio
+avolitional
+avoluntamiento
+avolvimiento
+avon
+avonbyth
+avonbythesea
+avond
+avondale
+avondale/goodyear
+avondaleestates
+avondapp
+avondappel
+avondappels
+avondbed
+avondbede
+avondbeden
+avondbee
+avondbez
+avondbezoek
+avondbezoeken
+avondbla
+avondblad
+avondbladen
+avondblo
+avondbloem
+avonddie
+avonddienst
+avonddiensten
+avonddui
+avondduister
+avonde
+avondedi
+avondeditie
+avondedities
+avonden
+avondete
+avondeten
+avondfee
+avondfeest
+avondfeesten
+avondgeb
+avondgebed
+avondgebeden
+avondgym
+avondgymnasia
+avondgymnasium
+avondgymnasiums
+avondjap
+avondjapon
+avondjaponnen
+avondje
+avondjes
+avondker
+avondkerk
+avondkle
+avondkledij
+avondkleding
+avondklo
+avondklok
+avondklokken
+avondlan
+avondland
+avondlic
+avondlicht
+avondlie
+avondlied
+avondliederen
+avondluc
+avondlucht
+avondmaa
+avondmaal
+avondmaalde
+avondmaalden
+avondmaalsbeker
+avondmaalsbekers
+avondmaalstafel
+avondmaalstafels
+avondmaalsviering
+avondmaalsvieringen
+avondmaalt
+avondmaaltijd
+avondmaaltijden
+avondmal
+avondmalen
+avondpos
+avondpost
+avondroo
+avondrood
+avonds
+avondsch
+avondschemer
+avondschemering
+avondscholen
+avondschool
+avondste
+avondster
+avondsto
+avondstond
+avondstonden
+avondtoi
+avondtoilet
+avondtoiletten
+avondure
+avonduren
+avondver
+avondvergadering
+avondvergaderingen
+avondvli
+avondvlinder
+avondvlinders
+avondzit
+avondzitting
+avondzittingen
+avondzon
+avonlake
+avonmore
+avonne
+avonpark
+avonpark-am1
+avons
+avonture
+avonturen
+avonturi
+avonturier
+avonturiers
+avonturierster
+avonturiersters
+avontuur
+avontuurde
+avontuurden
+avontuurlijk
+avontuurlijke
+avontuurlijker
+avontuurlijkst
+avontuurt
+avontuurtje
+avontuurtjes
+avonx
+avoob
+avorta
+avortaie
+avortaient
+avortais
+avortait
+avortant
+avorte
+avorte'
+avorte'e
+avorte'es
+avorte's
+avorte`r
+avorte`rent
+avorteme
+avortement
+avortements
+avortent
+avorter
+avortera
+avorterai
+avorteraient
+avorterais
+avorterait
+avorteras
+avortere
+avorterez
+avorteri
+avorteriez
+avorterions
+avortero
+avorterons
+avorteront
+avortes
+avortez
+avortiez
+avortion
+avortions
+avorton
+avortons
+avos
+avoua
+avouable
+avouables
+avouaien
+avouaient
+avouais
+avouait
+avouant
+avouch
+avouchab
+avouchable
+avouched
+avoucher
+avouchers
+avouches
+avouchin
+avouching
+avouchme
+avouchment
+avoue
+avoue'
+avoue'e
+avoue'es
+avoue's
+avoue`re
+avoue`rent
+avouent
+avouer
+avouera
+avouerai
+avoueraient
+avouerais
+avouerait
+avoueras
+avouerez
+avouerie
+avoueriez
+avouerio
+avouerions
+avoueron
+avouerons
+avoueront
+avoues
+avouez
+avouiez
+avouions
+avouons
+avourdup
+avourdupois
+avournee
+avourneen
+avout
+avow
+avowable
+avowableness
+avowably
+avowal
+avowals
+avowance
+avowant
+avowed
+avowedly
+avowedne
+avowedness
+avower
+avowers
+avowing
+avowry
+avows
+avoyelle
+avoyelles
+avoyer
+avoyersh
+avoyership
+avp
+avpanele
+avpanelt
+avparere
+avparert
+avpassa
+avpasse
+avpasser
+avpasset
+avpatrul
+avpatruljere
+avpatruljert
+avpelsin
+avpelsing
+avpelsinga
+avpoliti
+avpolitisert
+avr
+avr.
+avra
+avra'
+avraada
+avraadan
+avrada
+avradan
+avraekna
+avraeknas
+avraetta
+avraham
+avrai
+avrakna
+avraknas
+avram
+avrappor
+avrapportera
+avratta
+avreager
+avreagere
+avreagerer
+avreagering
+avreagert
+avreas
+avrebbe
+avrebber
+avrebbero
+avregist
+avregistrert
+avregne
+avregnin
+avregning
+avregninga
+avregningen
+avrei
+avreise
+avreisen
+avreknin
+avrekning
+avrekninga
+avrekningen
+avremmo
+avremo
+avresa
+avreseda
+avresedatum
+avreste
+avresti
+avretter
+avretteren
+avrettes
+avrettet
+avrettin
+avretting
+avriggin
+avrigging
+avrigginga
+avriggingen
+avril
+avrime
+avriming
+avriminga
+avrimingen
+avringin
+avringing
+avringinga
+avringingen
+avringni
+avringning
+avringningen
+avriss
+avrisset
+avrit
+avrive
+avriving
+avrivinga
+avrivingen
+avrivnin
+avrivning
+avrivningen
+avrom
+avron
+avrop
+avrunda
+avrunde
+avrundes
+avrundet
+avrundete
+avrundin
+avrunding
+avrustin
+avrusting
+avrustinga
+avrustingen
+avrustni
+avrustning
+avrustningen
+avrustninger
+avr{kna
+avr{knas
+avr{tta
+avr|ysti
+avr|ysting
+avr}da
+avr}dan
+avsa
+avsaag
+avsaend
+avsaenda
+avsaendaradresser
+avsaendaradresserna
+avsaendaren
+avsaendarens
+avsaendarkonto
+avsaendas
+avsaent
+avsaett
+avsaetta
+avsaettn
+avsaettning
+avsag
+avsaga
+avsagd
+avsaget
+avsagt
+avsaknad
+avsand
+avsandar
+avsandaradresser
+avsandaradresserna
+avsandaren
+avsandarens
+avsandarkonto
+avsandas
+avsanne
+avsannet
+avsant
+avsats
+avsatsen
+avsatsene
+avsatser
+avsatt
+avsatta
+avsatte
+avsattni
+avsattning
+avsavn
+avsavnet
+avscom
+avse
+avsedd
+avsedda
+avsender
+avsendere
+avsenderen
+avser
+avsetnin
+avsetning
+avsetningen
+avsetningsforhold
+avsetningsvansker
+avsett
+avsette
+avsettel
+avsettelse
+avsettelsen
+avsetter
+avsettes
+avsettin
+avsetting
+avshar
+avsi
+avsides
+avsidesl
+avsidesliggende
+avsier
+avsigels
+avsigelse
+avsigelsen
+avsikt
+avsindig
+avsindige
+avsittin
+avsitting
+avsivili
+avsivilisere
+avsjela
+avsjelet
+avsjelt
+avskaerm
+avskaerma
+avskaffa
+avskaffe
+avskaffelse
+avskaffelsen
+avskaffet
+avskalli
+avskalling
+avskallinga
+avskallingen
+avskallinger
+avskarma
+avsked
+avskeda
+avskild
+avskilja
+avskiljare
+avskilta
+avskilte
+avskiltet
+avskipin
+avskiping
+avskipinga
+avskipingen
+avskipni
+avskipning
+avskipningen
+avskjed
+avskjede
+avskjeden
+avskjedens
+avskjedi
+avskjediga
+avskjedige
+avskjediget
+avskjeds
+avskjedsforestilling
+avskjedshilsen
+avskjedshilsenen
+avskjedsord
+avskjedspresang
+avskjedss|knad
+avskjedss|knaden
+avskjedss|knadene
+avskjerm
+avskjerme
+avskjerming
+avskj{r
+avskj{re
+avskj{rende
+avskj{rer
+avskj{ret
+avskogin
+avskoging
+avskoginga
+avskogingen
+avskrack
+avskracka
+avskraec
+avskraecka
+avskrekk
+avskrekke
+avskrekkelses
+avskrekken
+avskrekkende
+avskrekkes
+avskrekket
+avskrev
+avskreve
+avskrevet
+avskrift
+avskrifta
+avskriften
+avskrifter
+avskriva
+avskrive
+avskriven
+avskrives
+avskrivet
+avskrivi
+avskriving
+avskrivinga
+avskrivingen
+avskrivits
+avskrivn
+avskrivning
+avskrivningar
+avskrivningen
+avskrivninger
+avskrivningsbyr}
+avskrivningstid
+avskrivningstider
+avskrivs
+avskrudd
+avskr{ck
+avskr{cka
+avskum
+avskumme
+avskummet
+avsky
+avskydd
+avskydde
+avskyeli
+avskyelig
+avskyelige
+avskyen
+avskygni
+avskygning
+avskygningen
+avskygninger
+avskytni
+avskytning
+avsk{rma
+avsk}ret
+avsla
+avslaa
+avslag
+avslagen
+avslagene
+avslaget
+avslapni
+avslapning
+avslappe
+avslappede
+avslappende
+avslappet
+avslo
+avsloeja
+avslog
+avsloja
+avslut
+avsluta
+avslutni
+avslutning
+avslutningen
+avslutningene
+avslutninger
+avslutningsfest
+avslutningsh|ytidelighet
+avslutningsseremonier
+avslutningsvis
+avslutt
+avslutta
+avslutte
+avsluttede
+avsluttende
+avslutter
+avsluttes
+avsluttet
+avsl|ja
+avsl|re
+avsl|ren
+avsl|rende
+avsl|rer
+avsl|res
+avsl|ret
+avsl|rin
+avsl|ring
+avsl|ringen
+avsl|ringene
+avsl|ringer
+avsl|rt
+avsl|rte
+avsl}
+avsl}r
+avsl}tt
+avsmak
+avsmaken
+avsminke
+avsminket
+avsnitt
+avsnitte
+avsnittene
+avsnittet
+avsoeka
+avsoekni
+avsoekningen
+avsoeks
+avsoka
+avsoknin
+avsokningen
+avsoks
+avsondre
+avsondret
+avsone
+avspaenn
+avspaenna
+avspanna
+avspark
+avspaser
+avspasere
+avspasering
+avspegla
+avspeglar
+avspeglas
+avspeile
+avspeiler
+avspeiles
+avspeilet
+avspenni
+avspenning
+avspenningen
+avspenningspolitikk
+avspille
+avspiller
+avspillerutstyr
+avspilli
+avspillingen
+avspiser
+avspist
+avspore
+avsporer
+avsporin
+avsporing
+avsp{nna
+avsta
+avstaa
+avstaand
+avstaar
+avstaemm
+avstaemmas
+avstaemn
+avstaemning
+avstaemningar
+avstaems
+avstaeng
+avstaengd
+avstamma
+avstammas
+avstamni
+avstamning
+avstamningar
+avstamningen
+avstamninger
+avstamp
+avstams
+avstand
+avstande
+avstanden
+avstandene
+avstander
+avstandt
+avstandtagen
+avstangd
+avstar
+avstava
+avstavni
+avstavning
+avstavningar
+avstedko
+avstedkomme
+avstedkommer
+avstedkommet
+avstemmi
+avstemming
+avstemmingen
+avstemni
+avstemning
+avstemningen
+avstemninger
+avstemningsresultatet
+avstemte
+avstengn
+avstengninger
+avstengt
+avstigin
+avstiging
+avstigni
+avstigning
+avstigninger
+avstikke
+avstikkende
+avstikkeren
+avstivet
+avstivni
+avstivning
+avstod
+avstraff
+avstraffelse
+avstress
+avstressende
+avstresset
+avstumpe
+avstumpende
+avstumpet
+avst{mma
+avst{mmas
+avst{mni
+avst{mning
+avst{mningar
+avst{ms
+avst{ngd
+avst|pin
+avst|ping
+avst|pni
+avst|pning
+avst}
+avst}els
+avst}else
+avst}nd
+avst}r
+avst}tt
+avsvekke
+avsvidde
+avsyna
+avsyning
+avs{nd
+avs{ndar
+avs{ndaradresser
+avs{ndaradresserna
+avs{ndaren
+avs{ndarens
+avs{ndarkonto
+avs{ndas
+avs{nt
+avs{tt
+avs{tta
+avs{ttni
+avs{ttning
+avs|ka
+avs|ke
+avs|knin
+avs|kning
+avs|kningen
+avs|ks
+avs}
+avs}g
+avt
+avta
+avtaga
+avtagend
+avtagende
+avtager
+avtagern
+avtagerne
+avtak
+avtakbar
+avtakend
+avtakende
+avtaker
+avtakere
+avtakeren
+avtakern
+avtakerne
+avtaket
+avtal
+avtala
+avtale
+avtalebe
+avtalebestemmelser
+avtalebestemte
+avtalefo
+avtaleforhandlinger
+avtaleformer
+avtaleforslagene
+avtalegr
+avtalegrunnlaget
+avtalen
+avtalene
+avtalens
+avtaler
+avtalets
+avtaleut
+avtaleutkast
+avtaleutkastet
+avtaleve
+avtaleverket
+avtalt
+avtalte
+avtappni
+avtappning
+avtar
+avtatt
+avteckna
+avtegner
+avtegnin
+avtegning
+avtjaena
+avtjana
+avtjenin
+avtjening
+avtjente
+avtj{na
+avtog
+avtok
+avtolkar
+avtolkare
+avtrappe
+avtrappi
+avtrapping
+avtrede
+avtreden
+avtredende
+avtrekk
+avtrekke
+avtrekker
+avtrekkeren
+avtrekket
+avtrekks
+avtrekkssystem
+avtrekkssystemet
+avtrykk
+avtrykke
+avtrykkene
+avtrykket
+avtvang
+avtvinge
+avtvinger
+avtvunge
+avtvunget
+avu
+avucasta
+avucastro
+avugo
+avugue`s
+avuguero
+avukaya
+avukka
+avulse
+avulsio`n
+avulsion
+avulsions
+avunatar
+avunatari
+avuncula
+avuncular
+avunculate
+avund
+avunda
+avundas
+avunde
+avunden
+avundet
+avundsju
+avundsjuk
+avundsjukt
+avutarda
+avutardada
+avutardado
+avuto
+avv
+avvaega
+avvaegni
+avvaegningar
+avvaerja
+avvaga
+avvagnin
+avvagningar
+avvakta
+avvaktan
+avvale
+avvalers
+avvalersi
+avvalse
+avvant
+avvarja
+avveckla
+avveg
+avvegen
+avvei
+avveid
+avveie
+avveien
+avveier
+avveies
+avveiet
+avveik
+avveinin
+avveining
+avveininger
+avvek
+avveksle
+avvekslende
+avveksli
+avveksling
+avvekslinga
+avvekslingen
+avvelena
+avvelenai
+avvelenano
+avvelenare
+avvelenata
+avvelenate
+avvelenati
+avvelenato
+avvelenava
+avvelenavi
+avvelenavo
+avvelene
+avvelenera
+avvelenero
+avveleni
+avvelenino
+avveleno
+avvende
+avvendel
+avvendelig
+avvendelighet
+avvendt
+avvendte
+avvengon
+avvengono
+avvenire
+avveniri
+avvenne
+avvent
+avventa
+avventat
+avventata
+avventate
+avventati
+avventato
+avvente
+avventen
+avventende
+avventer
+avventet
+avventur
+avventura
+avventure
+avvenuta
+avvenuto
+avvera
+avverai
+avveramm
+avverammo
+avverand
+avverando
+avverano
+avverare
+avveraro
+avverarono
+avverass
+avverasse
+avverassi
+avverast
+avveraste
+avverasti
+avverata
+avverate
+avverati
+avverato
+avverava
+avveravamo
+avveravano
+avveravate
+avveravi
+avveravo
+avverera
+avvererai
+avverere
+avvererei
+avvereremo
+avvererete
+avverero
+avverge
+avverget
+avveri
+avveriam
+avveriamo
+avveriat
+avveriate
+avverino
+avverje
+avverka
+avverkni
+avverkningar
+avvero
+avverra
+avverra'
+avversa
+avversar
+avversari
+avversaria
+avversarie
+avversario
+avverse
+avversi
+avversit
+avversita
+avverso
+avverta
+avvertan
+avvertano
+avverte
+avverten
+avvertenza
+avvertenze
+avverti
+avvertia
+avvertiamo
+avvertim
+avvertimento
+avvertir
+avvertira
+avvertirci
+avvertire
+avvertirla
+avvertirlo
+avvertirmi
+avvertirti
+avvertit
+avvertita
+avvertite
+avvertiti
+avvertito
+avvertiv
+avvertivo
+avverto
+avvia
+avviai
+avviammo
+avviamo
+avviando
+avviano
+avviare
+avviaron
+avviarono
+avviasse
+avviassero
+avviassi
+avviassimo
+avviaste
+avviasti
+avviata
+avviate
+avviati
+avviato
+avviava
+avviavam
+avviavamo
+avviavan
+avviavano
+avviavat
+avviavate
+avviavi
+avviavo
+avvicina
+avvicinai
+avvicinano
+avvicinare
+avvicinata
+avvicinate
+avvicinati
+avvicinato
+avvicinava
+avvicinavi
+avvicinavo
+avvicine
+avvicinera
+avvicinero
+avvicini
+avvicinino
+avvicino
+avviene
+avviera
+avvierai
+avvieran
+avvieranno
+avviereb
+avvierebbe
+avvierei
+avvierem
+avvieremmo
+avvieremo
+avvieres
+avviereste
+avvieresti
+avvieret
+avvierete
+avviero
+avvii
+avvik
+avvika
+avvike
+avvikels
+avvikelse
+avvikelsen
+avvikelsene
+avvikelser
+avvikend
+avvikende
+avviker
+avvikere
+avvikeren
+avvikern
+avvikerne
+avviket
+avvikla
+avvikle
+avvikles
+avviklet
+avviklin
+avvikling
+avviklingen
+avviklingsstyret
+avvino
+avvio
+avvirket
+avvirkni
+avvirkning
+avvisa
+avvisai
+avvisamm
+avvisammo
+avvisand
+avvisando
+avvisano
+avvisare
+avvisaro
+avvisarono
+avvisass
+avvisasse
+avvisassi
+avvisast
+avvisaste
+avvisasti
+avvisata
+avvisate
+avvisati
+avvisato
+avvisava
+avvisavamo
+avvisavano
+avvisavate
+avvisavi
+avvisavo
+avvise
+avvisend
+avvisende
+avviser
+avvisera
+avviserai
+avvisere
+avviserei
+avviseremo
+avviserete
+avvisero
+avvises
+avvisi
+avvisiam
+avvisiamo
+avvisiat
+avvisiate
+avvisino
+avvisnin
+avvisning
+avvisningen
+avviso
+avvist
+avviste
+avvita
+avvitai
+avvitamm
+avvitammo
+avvitand
+avvitando
+avvitano
+avvitare
+avvitaro
+avvitarono
+avvitass
+avvitasse
+avvitassi
+avvitast
+avvitaste
+avvitasti
+avvitata
+avvitate
+avvitati
+avvitato
+avvitava
+avvitavamo
+avvitavano
+avvitavate
+avvitavi
+avvitavo
+avvitera
+avviterai
+avvitere
+avviterei
+avviteremo
+avviterete
+avvitero
+avviti
+avvitiam
+avvitiamo
+avvitiat
+avvitiate
+avvitino
+avvito
+avvocati
+avvocato
+avvolgim
+avvolgimenti
+avvolgimento
+avv{ga
+avv{gnin
+avv{gningar
+avv{pna
+avv{pne
+avv{pnen
+avv{pnende
+avv{pnes
+avv{pnet
+avv{pnin
+avv{pning
+avv{rja
+avyttras
+avyttrin
+avyttring
+aw
+awa
+awa-
+awaaaay
+awaakais
+awaamats
+awaamatu
+awabakal
+awabako
+awabi
+awacs
+awad
+awada
+awadachi
+awadalla
+awadate
+awadati
+awadh
+awadhi
+awadia
+awadu
+awaduhar
+awaft
+awafukui
+awag
+awahanda
+awai
+awaiama
+awaikeda
+await
+awaited
+awaiter
+awaiters
+awaiting
+awaitlal
+awaitlala
+awaits
+awaji
+awajicho
+awajishi
+awajisim
+awak
+awakable
+awakaina
+awakamo
+awakamog
+awakatsu
+awakatuy
+awakawab
+awakawag
+awakawas
+awake
+awaked
+awaken
+awakenab
+awakenable
+awakened
+awakener
+awakeners
+awakenin
+awakening
+awakeningly
+awakenings
+awakenme
+awakenment
+awakens
+awaker
+awakes
+awakest
+awaketh
+awaking
+awakings
+awakomin
+awald
+awale
+awalia
+awalim
+awalt
+awami
+awamori
+awan
+awana
+awanakas
+awane
+awano
+awanting
+awaodor
+awaoomiy
+awaootan
+awapuhi
+awar
+awara
+awaraons
+award
+awardabl
+awardable
+awarded
+awardee
+awardees
+awarder
+awarders
+awarding
+awardmen
+awardment
+awards
+aware
+awaredom
+awarega
+awarege
+awaremi
+awarenes
+awareness
+awaruite
+awas
+awasa
+awasaka
+awase
+awasekag
+awaseme
+awasete
+awasewaz
+awash
+awashima
+awasima
+awasimau
+awaste
+awat
+awata
+awatachi
+awatadas
+awatatek
+awatatib
+awatch
+awate
+awatefut
+awater
+awatete
+awatomid
+awatsubu
+awatubu
+awau
+awave
+awawar
+away
+awaya
+awayamak
+awayness
+awayokub
+aways
+awayuki
+awaza
+awazi
+awazicyo
+awazishi
+awazisi
+awazisim
+awb
+awbari
+awber
+awd
+awe
+awearied
+aweary
+aweather
+aweband
+awed
+awedness
+awee
+aweek
+aweel
+aweer
+aweera
+aweigh
+aweikoma
+aweil
+aweing
+aweinspi
+aweinspiring
+aweless
+awellimi
+awellimiden
+awembak
+awembiak
+awendaw
+awera
+awes
+awesome
+awesomel
+awesomely
+awesomen
+awesomeness
+awest
+awestric
+awestricken
+awestruc
+awestruck
+awesum
+aweti
+aweto
+awfu
+awful
+awfuller
+awfulles
+awfullest
+awfully
+awfulnes
+awfulness
+awheel
+awheft
+awhet
+awhile
+awhir
+awhirl
+awi
+awiaka
+awide
+awiggle
+awikiwik
+awikiwiki
+awin
+awing
+awink
+awinpa
+awinpare
+awit
+awiwi
+awiya
+awiyaana
+awj
+awje
+awji
+awjilah
+awjilaso
+awjilasokna
+awju
+awk
+awkward
+awkwarde
+awkwarder
+awkwardest
+awkwardi
+awkwardish
+awkwardl
+awkwardly
+awkwardn
+awkwardness
+awkwardnesses
+awl
+awless
+awlessne
+awlessness
+awls
+awlshape
+awlshaped
+awlt
+awlwort
+awm
+awmous
+awn
+awned
+awner
+awngi
+awning
+awninged
+awnings
+awnless
+awnlike
+awns
+awny
+awo
+awok
+awoke
+awoken
+awol
+awolfe
+awols
+awon
+awori
+awork
+aworo
+awosumak
+awosumakuyu
+awr
+awraja
+awreck
+awrist
+awrong
+awry
+aws
+awsat
+awshar
+awt
+awtobohg
+awtobohgot
+awtohmaj
+awtohmajik
+awtohmajiklee
+awu
+awum
+awun
+awuna
+awutu
+aww
+awya
+awye
+awyi
+awyu
+awyudumu
+awyudumut
+ax
+axa
+axaient
+axais
+axait
+axal
+axamb
+axant
+axas
+axberg
+axboroug
+axborough
+axbreake
+axbreaker
+axe
+axe'
+axe'e
+axe'es
+axe's
+axe`rent
+axebreaker
+axed
+axel
+axelle
+axeln
+axelrod
+axels
+axelson
+axeman
+axemen
+axen
+axenic
+axent
+axer
+axera
+axerai
+axeraien
+axeraient
+axerais
+axerait
+axeras
+axerez
+axeriez
+axerions
+axerons
+axeront
+axers
+axes
+axez
+axfetch
+axg
+axhammer
+axhammered
+axhead
+axi
+axial
+axiality
+axially
+axiate
+axiation
+axiez
+axifera
+axiform
+axifugal
+axil
+axila
+axilar
+axile
+axilemma
+axilemmata
+axilla
+axillae
+axillant
+axillar
+axillari
+axillaries
+axillary
+axillas
+axils
+axim
+axine
+axing
+axinita
+axinite
+axinitt
+axinoman
+axinomancy
+axio`metro
+axiolite
+axioliti
+axiolitic
+axiologi
+axiological
+axiologically
+axiologist
+axiology
+axiom
+axioma
+axioma's
+axioma`tica
+axioma`tico
+axiomati
+axiomatic
+axiomatical
+axiomatically
+axiomatisatie
+axiomatiser
+axiomatization
+axiomatizations
+axiomatize
+axiomatized
+axiomatizes
+axiomatizing
+axiome
+axiomes
+axiomete
+axiometer
+axioms
+axion
+axions
+axiopist
+axiopisty
+axiotis
+axis
+axised
+axises
+axisymme
+axisymmetric
+axisymmetrical
+axite
+axla
+axlarna
+axle
+axled
+axles
+axlesmit
+axlesmith
+axletree
+axletrees
+axlike
+axluslay
+axmaker
+axmaking
+axman
+axmanshi
+axmanship
+axmaster
+axmen
+axminste
+axminster
+axo`n
+axodendr
+axodendrite
+axofugal
+axogamy
+axoid
+axoidea
+axoidean
+axoideo
+axolemma
+axolotl
+axolotls
+axolysis
+axometer
+axometri
+axometric
+axometry
+axon
+axonal
+axone
+axones
+axoneure
+axoneuro
+axoneuron
+axonia
+axonic
+axonolip
+axonolipa
+axonolipous
+axonomet
+axonometric
+axonometry
+axonopho
+axonophora
+axonophorous
+axonopus
+axonost
+axons
+axopetal
+axophyte
+axoplasm
+axopodia
+axopodiu
+axopodium
+axosperm
+axospermous
+axostyle
+axovar
+axplock
+axseed
+axson
+axstone
+axt
+axtel
+axtell
+axton
+axtree
+axumite
+axunge
+axvax
+axweed
+axwell
+axwise
+axwort
+ay
+aya
+ayabe
+ayabeshi
+ayabesi
+ayabu
+ayacahui
+ayacahuite
+ayachou
+ayacua`
+ayacucho
+ayafuya
+ayaginu
+ayah
+ayahs
+ayahuasa
+ayahuca
+ayak
+ayaka
+ayakami
+ayaki
+ayako
+ayala
+ayale`s
+ayalesa
+ayam
+ayama
+ayamac
+ayamachi
+ayamar
+ayamara
+ayamaras
+ayamare
+ayamari
+ayamarir
+ayamaru
+ayamat
+ayamati
+ayame
+ayameike
+ayami
+ayan
+ayana
+ayandeh
+ayangan
+ayano
+ayanomaj
+ayanomak
+ayanomiy
+ayant
+ayao
+ayaori
+ayapa
+ayaragi
+ayari
+ayars
+ayas
+ayase
+ayaseeki
+ayasehit
+ayasema
+ayasemar
+ayaseshi
+ayasesi
+ayashi
+ayashige
+ayasi
+ayasige
+ayat
+ayate
+ayathit
+ayatolla
+ayatollaen
+ayatollah
+ayatollahs
+ayatsu
+ayatsuji
+ayatsur
+ayatsure
+ayatsuri
+ayatsut
+ayatu
+ayatuji
+ayatur
+ayature
+ayaturin
+ayatut
+ayau
+ayauku
+ayauta
+ayawa
+ayaya
+ayaz
+ayb
+aybars
+ayc
+aych
+aychelel
+aychpee
+aychpuhk
+aychpuhks
+aychseee
+aychseeeff
+ayda
+ayden
+aydendro
+aydendron
+aydin
+aydlett
+aydogan
+aydz
+aye
+ayear
+ayeaye
+ayed
+ayegreen
+ayelp
+ayena
+ayenbite
+ayer
+ayere
+ayermar
+ayers
+ayes
+ayez
+ayg
+ayi
+ayiga
+ayikiben
+ayin
+ayip
+ayivi
+ayiwo
+ayizogbe
+aykroyd
+aykut
+ayla
+ayler
+ayles
+aylesbur
+aylesbury
+ayless
+ayleswor
+aylesworth
+aylet
+aylett
+ayllene
+ayllu
+aylmar
+aylmer
+aylwin
+aym
+aymag
+aymar
+aymara
+aymaran
+aymard
+aymasa
+ayme`
+aymellel
+aymer
+aymguud
+aymoro
+ayn
+aynallu
+ayneswor
+aynesworth
+aynor
+aynsley
+aynu
+ayo
+ayocote
+ayodele
+ayohess
+ayom
+ayond
+ayons
+ayont
+ayoquesc
+ayoquesco
+ayore
+ayoreo
+ayos
+ayoshida
+ayosida
+ayote
+ayotera
+ayotte
+ayotzint
+ayotzintepec
+ayoubzad
+ayoubzadeh
+ayoup
+ayous
+ayr
+ayrault
+ayre
+ayres
+ayrshire
+ays
+ayscue
+ayse
+aysen
+aysgarth
+ayt
+ayta
+aytac
+ayten
+aythya
+ayturgan
+ayu
+ayu`a
+ayub
+ayuba
+ayubite
+ayuca
+ayuchi
+ayuda
+ayudada
+ayudado
+ayudador
+ayudadora
+ayudamiento
+ayudante
+ayudanti`a
+ayudar
+ayudhaya
+ayudhya
+ayudorio
+ayuga
+ayukai
+ayukawa
+ayukawam
+ayum
+ayumi
+ayumihaj
+ayumiyo
+ayumiyor
+ayumu
+ayun
+ayuna
+ayunador
+ayunadora
+ayunante
+ayunar
+ayuno
+ayunque
+ayuntable
+ayuntablemente
+ayuntacio`n
+ayuntadamente
+ayuntador
+ayuntadora
+ayuntamiento
+ayuntante
+ayuntanza
+ayuntar
+ayunto
+ayuru
+ayuso
+ayustar
+ayuste
+ayuthaya
+ayuti
+ayutla
+ayutsuis
+ayutthay
+ayutthaya
+ayutuish
+ayutuisy
+aywie
+ayy
+ayyub
+ayyubid
+ayyuce
+ayz
+az
+aza
+aza`ndar
+azabachada
+azabachado
+azabache
+azabachero
+azabara
+azabu
+azabudai
+azabujyu
+azabuzyu
+azaca`n
+azacana
+azacanarse
+azacanear
+azacaneo
+azacaya
+azache
+azachiop
+azad
+azada
+azadada
+azadazo
+azadilla
+azado`n
+azadonada
+azadonazo
+azadonero
+azadrach
+azadrachta
+azae
+azael
+azafata
+azafate
+azafra`n
+azafranada
+azafranado
+azafranal
+azafranar
+azafranera
+azafranero
+azafrin
+azagadero
+azagador
+azagaya
+azaghvan
+azaghvana
+azagua`n
+azahar
+azahares
+azai
+azainadamente
+azais
+azake
+azakeri
+azal
+azala`
+azale'e
+azale'es
+azalea
+azalea's
+azaleas
+azalee
+azalia
+azaliah
+azalias
+azam
+azamboa
+azamboero
+azamboo
+azami
+azamino
+azamu
+azamui
+azamuke
+azana
+azanahoriate
+azanca
+azande
+azanefa
+azangori
+azanguri
+azaniah
+azanoria
+azanoriate
+azao
+azaque
+azaquefa
+azar
+azarael
+azarandar
+azarar
+azararse
+azarashi
+azarasi
+azarba
+azarbayj
+azarbayjane
+azarbe
+azarbeta
+azarco`n
+azarearse
+azareel
+azari
+azaria
+azariah
+azarja
+azarnefe
+azaro
+azarole
+azarolla
+azarollo
+azarosa
+azarosamente
+azaroso
+azarote
+azarshah
+azarshahi
+azatiopu
+azato
+azawara
+azaya
+azayak
+azayaka
+azaz
+azazel
+azaziah
+azbuk
+azcarrio
+azco`n
+azcona
+azconist
+azconista
+aze
+azedarac
+azedarach
+azekah
+azekura
+azel
+azelaic
+azelate
+azelfafa
+azelfafage
+azelle
+azem
+azema
+azemar
+azemat
+azemichi
+azemiti
+azen
+azenoria
+azentaru
+azenteki
+azento
+azeotrop
+azeotrope
+azeotropic
+azeotropism
+azeotropy
+azer
+azera
+azerbaij
+azerbaijan
+azerbaijanese
+azerbaijani
+azerbaijanian
+azerbaijanispeaking
+azerbajd
+azerbajdzhan
+azerbayd
+azerbaydzhani
+azeri
+azeria
+azetat
+azevado
+azevedo
+azg
+azgad
+azha
+azhar
+azi
+azia
+aziaat
+aziana
+aziaten
+aziatisc
+aziatisch
+aziatische
+aziatischer
+aziatischt
+azide
+azido
+aziel
+azienda
+aziende
+aziethan
+aziethane
+azigasaw
+azigataw
+azihara
+aziharah
+azijn
+azijnaal
+azijnaaltje
+azijnaaltjes
+azijnach
+azijnachtig
+azijnachtige
+azijnachtiger
+azijnachtigst
+azijnfle
+azijnfles
+azijnflessen
+azijngee
+azijngeest
+azijnhou
+azijnhout
+azijnspi
+azijnspiritus
+azijnste
+azijnstel
+azijnstellen
+azijnvat
+azijnvaten
+azijnzuu
+azijnzuur
+azikara
+azikata
+azikawag
+azike
+azikena
+aziki
+azilal
+azilian
+azilut
+azim
+azimech
+azimene
+azimethy
+azimethylene
+azimi
+azimide
+azimine
+azimino
+aziminob
+aziminobenzene
+azimu
+azimut
+azimutal
+azimuth
+azimutha
+azimuthal
+azimuthally
+azimuths
+azimuts
+azina
+azinakot
+azine
+azinge
+azinomot
+aziola
+azione
+azioni
+azionist
+azionista
+azionisti
+aziro
+azisai
+azisu
+azisuabe
+azitai
+azitaka
+azito
+azitomi
+azitsuke
+azituke
+aziwa
+aziwai
+aziz
+aziza
+azizi
+aziziyah
+azizuddi
+azizuddin
+azlacton
+azlactone
+azlan
+azle
+azm
+azmak
+azmaveth
+azmeena
+azmi
+azmina
+azmon
+aznacho
+aznallo
+aznar
+aznothta
+aznothtabor
+azo
+azo`far
+azoada
+azoado
+azoar
+azoato
+azobacte
+azobacter
+azobenze
+azobenzene
+azobenzi
+azobenzil
+azobenzo
+azobenzoic
+azobenzol
+azoblack
+azocar
+azoch
+azoche
+azocochi
+azocochineal
+azocoral
+azocoralline
+azocorin
+azocorinth
+azocyani
+azocyanide
+azocycli
+azocyclic
+azodicar
+azodicarboxylic
+azodiphe
+azodiphenyl
+azodisul
+azodisulphonic
+azoemia
+azoeosin
+azoeryth
+azoerythrin
+azofaifa
+azofaifo
+azofeifa
+azofeifo
+azoficat
+azofication
+azofier
+azoflavi
+azoflavine
+azoforma
+azoformamide
+azoformi
+azoformic
+azofra
+azofrar
+azofy
+azogadamente
+azogalle
+azogallein
+azogamiento
+azogar
+azogreen
+azogrena
+azogrenadine
+azogue
+azoguejo
+azogueri`a
+azoguero
+azohumic
+azoic
+azoico
+azoimide
+azoisobu
+azoisobutyronitrile
+azoku
+azola`cea
+azola`ceo
+azolar
+azole
+azolea
+azoleo
+azolitmi
+azolitmin
+azolla
+azolvamiento
+azolvar
+azolve
+azom
+azomamiento
+azomar
+azomethi
+azomethine
+azon
+azonal
+azonapht
+azonaphthalene
+azonic
+azonium
+azons
+azonyu
+azoosper
+azoospermia
+azoparaf
+azoparaffin
+azophen
+azophene
+azophenetole
+azopheni
+azophenine
+azopheno
+azophenol
+azopheny
+azophenyl
+azophenylene
+azophosp
+azophosphin
+azophosphore
+azoprote
+azoprotein
+azor
+azora
+azorafa
+azoramiento
+azorante
+azorar
+azorene
+azorero
+azores
+azorian
+azorisk
+azorite
+azorramiento
+azorrarse
+azorubin
+azorubine
+azosulph
+azosulphine
+azosulphonic
+azotable
+azotacalles
+azotada
+azotado
+azotador
+azotadora
+azotaina
+azotalenguas
+azotamiento
+azotar
+azotate
+azotazo
+azote
+azote'
+azote'e
+azote'es
+azote's
+azotea
+azoted
+azotemia
+azotenes
+azotenesis
+azotes
+azotetra
+azotetrazole
+azoth
+azothion
+azothionium
+azotic
+azotina
+azotine
+azotite
+azotize
+azotobac
+azotobacter
+azotobacterieae
+azotolue
+azotoluene
+azotomet
+azotometer
+azotorrh
+azotorrhoea
+azotous
+azoturia
+azotus
+azouno
+azov
+azoverni
+azovernine
+azox
+azoxazol
+azoxazole
+azoxime
+azoxine
+azoxoniu
+azoxonium
+azoxy
+azoxyani
+azoxyanisole
+azoxyben
+azoxybenzene
+azoxybenzoic
+azoxynap
+azoxynaphthalene
+azoxyphe
+azoxyphenetole
+azoxytol
+azoxytoluidine
+azr
+azra
+azre
+azriel
+azrikam
+azs
+aztec
+azteca
+azteca-gate
+aztecan
+aztecota
+aztecotanoan
+aztecs
+aztek
+azteken
+aztekenr
+aztekenreich
+azteker
+aztekere
+aztekeren
+aztekerne
+aztekisk
+aztenken
+aztenkenreich
+azthioni
+azthionium
+aztor
+azu`car
+azu`mbar
+azua
+azuay
+azubah
+azucarada
+azucarado
+azucarar
+azucarera
+azucareri`a
+azucarero
+azucari`
+azucarillo
+azucena
+azuche
+azuchi
+azud
+azuda
+azuela
+azufaifa
+azufaifo
+azufeifa
+azufeifo
+azufrada
+azufrado
+azufrador
+azufradora
+azuframiento
+azufrar
+azufre
+azufrera
+azufro`n
+azufrosa
+azufroso
+azuk
+azuka
+azukare
+azukari
+azukarik
+azukaris
+azuke
+azukeai
+azukeire
+azuki
+azukiyo
+azul
+azulada
+azulado
+azulaque
+azular
+azulear
+azuleja
+azulejar
+azulejeri`a
+azulejero
+azulejo
+azulenca
+azulenco
+azulene
+azulete
+azulina
+azulino
+azulite
+azulmic
+azulona
+azuma
+azumaasa
+azumachi
+azumagao
+azumakiy
+azumano
+azumaoto
+azumar
+azumarie
+azumater
+azumatid
+azumatom
+azumaya
+azumayuk
+azumazek
+azumbrada
+azumbrado
+azumbre
+azumeina
+azumi
+azumikut
+azumino
+azumioiw
+azumu
+azur
+azurblau
+azurblauen
+azure
+azure'
+azure'e
+azure'es
+azure's
+azurean
+azured
+azuren
+azureous
+azurer
+azures
+azurine
+azurita
+azurite
+azurites
+azurmala
+azurmalachite
+azurous
+azurronarse
+azury
+azusa
+azusabas
+azusagaw
+azusawa
+azut
+azuta
+azutagaw
+azutea
+azutero
+azuti
+azuur
+azuurbla
+azuurblauw
+azuurblauwe
+azuurste
+azuursteen
+azuurstenen
+azuz
+azuzador
+azuzadora
+azuzar
+azyasuto
+azygobra
+azygobranchia
+azygobranchiata
+azygobranchiate
+azygomat
+azygomatous
+azygos
+azygospe
+azygosperm
+azygospo
+azygospore
+azygous
+azyme
+azymes
+azymite
+azymous
+azz
+azzah
+azzan
+azzara
+azzarda
+azzardai
+azzardam
+azzardammo
+azzardan
+azzardando
+azzardano
+azzardar
+azzardare
+azzardas
+azzardasse
+azzardassi
+azzardaste
+azzardasti
+azzardat
+azzardata
+azzardate
+azzardati
+azzardato
+azzardav
+azzardava
+azzardavi
+azzardavo
+azzarder
+azzardera
+azzarderai
+azzarderei
+azzardero
+azzardi
+azzardia
+azzardiamo
+azzardiate
+azzardin
+azzardino
+azzardo
+azzecca
+azzeccai
+azzeccam
+azzeccammo
+azzeccan
+azzeccando
+azzeccano
+azzeccar
+azzeccare
+azzeccas
+azzeccasse
+azzeccassi
+azzeccaste
+azzeccasti
+azzeccat
+azzeccata
+azzeccate
+azzeccati
+azzeccato
+azzeccav
+azzeccava
+azzeccavi
+azzeccavo
+azzecche
+azzecchera
+azzecchero
+azzecchi
+azzecchino
+azzecco
+azzedine
+azzerati
+azzuffa
+azzuffai
+azzuffam
+azzuffammo
+azzuffan
+azzuffando
+azzuffano
+azzuffar
+azzuffare
+azzuffas
+azzuffasse
+azzuffassi
+azzuffaste
+azzuffasti
+azzuffat
+azzuffata
+azzuffate
+azzuffati
+azzuffato
+azzuffav
+azzuffava
+azzuffavi
+azzuffavo
+azzuffer
+azzuffera
+azzufferai
+azzufferei
+azzuffero
+azzuffi
+azzuffia
+azzuffiamo
+azzuffiate
+azzuffin
+azzuffino
+azzuffo
+azzuolo
+azzur
+azzurra
+azzurre
+azzurri
+azzurro
+b
+bvue
+b's
+b'tje
+b-52's	
+b-ball
+b-dur
+b-spline
+b.c
+b0
+b1
+b2
+b21
+b3
+b4
+b43
+b5
+b52's	
+b6
+b7
+b8
+b9
+ba
+ba"lde
+ba"nden
+ba"nder
+ba"nke
+ba"nken
+ba"ume
+ba-
+ba-bekyu
+ba-gen
+ba-jon
+ba-ningu
+ba\a
+ba\ada
+ba\adero
+ba\ado
+ba\ador
+ba\adora
+ba\ar
+ba\era
+ba\ero
+ba\ezana
+ba\ezano
+ba\il
+ba\ista
+ba\o
+ba\o`n
+ba\uelo
+ba^bord
+ba^chant
+ba^che
+ba^che'
+ba^che'e
+ba^che'es
+ba^che's
+ba^cher
+ba^ches
+ba^cla
+ba^clage
+ba^claie
+ba^claient
+ba^clais
+ba^clait
+ba^clant
+ba^cle
+ba^cle'
+ba^cle'e
+ba^cle'es
+ba^cle's
+ba^cle`r
+ba^cle`rent
+ba^clent
+ba^cler
+ba^clera
+ba^clerai
+ba^cleraient
+ba^clerais
+ba^clerait
+ba^cleras
+ba^clere
+ba^clerez
+ba^cleri
+ba^cleriez
+ba^clerions
+ba^clero
+ba^clerons
+ba^cleront
+ba^cles
+ba^clez
+ba^cliez
+ba^clion
+ba^clions
+ba^clons
+ba^frer
+ba^illa
+ba^illai
+ba^illaient
+ba^illais
+ba^illait
+ba^illan
+ba^illant
+ba^ille
+ba^ille'
+ba^ille`
+ba^ille`rent
+ba^illem
+ba^illement
+ba^illements
+ba^illen
+ba^illent
+ba^iller
+ba^illera
+ba^illerai
+ba^illeraient
+ba^illerais
+ba^illerait
+ba^illeras
+ba^illerez
+ba^illeriez
+ba^illerions
+ba^illerons
+ba^illeront
+ba^illes
+ba^illez
+ba^illie
+ba^illiez
+ba^illio
+ba^illions
+ba^illon
+ba^illonna
+ba^illonnaient
+ba^illonnais
+ba^illonnait
+ba^illonnant
+ba^illonne
+ba^illonne'
+ba^illonne'e
+ba^illonne'es
+ba^illonne's
+ba^illonne`rent
+ba^illonnement
+ba^illonnent
+ba^illonner
+ba^illonnera
+ba^illonnerai
+ba^illonneraient
+ba^illonnerais
+ba^illonnerait
+ba^illonneras
+ba^illonnerez
+ba^illonneriez
+ba^illonnerions
+ba^illonnerons
+ba^illonneront
+ba^illonnes
+ba^illonnez
+ba^illonniez
+ba^illonnions
+ba^illonnons
+ba^illons
+ba^t
+ba^tard
+ba^tarde
+ba^tardes
+ba^tards
+ba^te'
+ba^te'e
+ba^te'es
+ba^te's
+ba^ter
+ba^ti
+ba^tie
+ba^ties
+ba^timen
+ba^timent
+ba^timents
+ba^tir
+ba^tira
+ba^tirai
+ba^tiraient
+ba^tirais
+ba^tirait
+ba^tiras
+ba^tiren
+ba^tirent
+ba^tirez
+ba^tirie
+ba^tiriez
+ba^tirio
+ba^tirions
+ba^tiron
+ba^tirons
+ba^tiront
+ba^tis
+ba^tissa
+ba^tissaient
+ba^tissais
+ba^tissait
+ba^tissant
+ba^tisse
+ba^tissent
+ba^tisses
+ba^tisseur
+ba^tisseurs
+ba^tissez
+ba^tissi
+ba^tissiez
+ba^tissions
+ba^tisso
+ba^tissons
+ba^tit
+ba^ton
+ba^tonne
+ba^tonner
+ba^tonnet
+ba^tonnets
+ba^tonni
+ba^tonnier
+ba^tonniers
+ba^tons
+ba`cara
+ba`caris
+ba`ciga
+ba`culo
+ba`lago
+ba`lano
+ba`lsamo
+ba`lteo
+ba`ltica
+ba`ltico
+ba`quica
+ba`quico
+ba`quira
+ba`ratro
+ba`rbara
+ba`rbaramente
+ba`rbaro
+ba`rtulos
+ba`scula
+ba`sica
+ba`sico
+ba`tava
+ba`tavo
+ba`vara
+ba`varo
+baa
+baaa
+baaaaaaz
+baab
+baabdull
+baachan
+baad
+baada
+baadasss
+baadasssss
+baadde
+baadden
+baade
+baader
+baader-m
+baader-meinhof
+baaderme
+baadermeinhof
+baadi
+baadje
+baadjes
+baadster
+baadsters
+baadt
+baadu
+baaed
+baagandj
+baagandji
+baagar
+baagato
+baage
+baagminu
+baagminuter
+baahling
+baai
+baaien
+baaierd
+baainado
+baaing
+baaitaba
+baaitabak
+baaitje
+baaitjes
+baaivang
+baaivangen
+baaivanger
+baaivangers
+baaivangt
+baaiwak
+baaiwake
+baaizenj
+baak
+baaka
+baakgeld
+baakgelden
+baakmees
+baakmeester
+baakmeesters
+baakpe
+baakton
+baaktonn
+baaktonnen
+baal
+baalah
+baalath
+baalathb
+baalathbeer
+baalberi
+baalberith
+baaldoek
+baale
+baalgad
+baalgoed
+baalhamo
+baalhamon
+baalhana
+baalhanan
+baalhazo
+baalhazor
+baalherm
+baalhermon
+baali
+baalim
+baalis
+baalish
+baalism
+baalisms
+baalist
+baalita
+baalite
+baalitic
+baalitical
+baalize
+baalkato
+baalkatoen
+baalmeon
+baalpeor
+baalpera
+baalperazim
+baals
+baalshal
+baalshalisha
+baalshem
+baaltama
+baaltamar
+baaltje
+baaltjes
+baalzak
+baalzakk
+baalzakken
+baalzebu
+baalzebub
+baalzeph
+baalzephon
+baamang
+baan
+baana
+baanah
+baanbed
+baanbedd
+baanbedden
+baanbrek
+baanbrekend
+baanbrekende
+baanbrekender
+baanbrekendst
+baanbreker
+baanbrekers
+baande
+baanden
+baanderh
+baanderheer
+baanderheren
+baanging
+baangingi
+baanlope
+baanloper
+baanlopers
+baanmees
+baanmeester
+baanmeesters
+baanrots
+baanrotsen
+baanschu
+baanschuiver
+baanschuivers
+baanstro
+baanstroper
+baanstropers
+baant
+baantje
+baantjer
+baantjerijd
+baantjerijden
+baantjerijdt
+baantjes
+baantjesgast
+baantjesgasten
+baantjesjager
+baantjesjagers
+baanvak
+baanvakk
+baanvakken
+baanvege
+baanveger
+baanvegers
+baanwach
+baanwachter
+baanwachters
+baanwachtershuisje
+baanwachtershuisjes
+baanweds
+baanwedstrijd
+baanwedstrijden
+baao
+baar
+baara
+baard
+baardbra
+baardbrandertje
+baardbrandertjes
+baardde
+baardden
+baarde
+baardelo
+baardeloos
+baardeloze
+baarden
+baardgie
+baardgier
+baardgieren
+baardgra
+baardgras
+baardgro
+baardgroei
+baardig
+baardige
+baardiger
+baardigs
+baardigst
+baardman
+baardmannetje
+baardmannetjes
+baardsch
+baardscheerder
+baardscheerders
+baardschrapper
+baardschrappers
+baardue
+baardvin
+baardvinnen
+baardvis
+baardvissen
+baardvog
+baardvogel
+baardvogels
+baardwer
+baardwerk
+baardwerken
+baardzwi
+baardzwijn
+baardzwijnen
+baarkled
+baarkleden
+baarklee
+baarkleed
+baarlijk
+baarlijke
+baarmoed
+baarmoeder
+baarmoeders
+baarova
+baars
+baarse
+baarser
+baarst
+baart
+baartje
+baartjes
+baarzel
+baarzen
+baas
+baasacht
+baasachtig
+baasachtige
+baasachtiger
+baasachtigst
+baasan
+baasde
+baasden
+baaseiah
+baasha
+baasje
+baasjes
+baasscha
+baasschap
+baast
+baat
+baataega
+baataegarna
+baatari
+baate
+baati
+baato
+baatonun
+baatonunkwara
+baatsman
+baatte
+baatten
+baatziek
+baatzieke
+baatzieker
+baatziekst
+baatzuch
+baatzucht
+baatzuchtig
+baatzuchtige
+baatzuchtiger
+baatzuchtigheid
+baatzuchtigst
+baay
+baaya
+bab
+baba
+babaa
+bababunm
+bababunmi
+babacoot
+babacoote
+babada
+babadero
+babadji
+babadjou
+babador
+babaga
+babagaru
+babagarupu
+babaguin
+babaguina
+babai
+babajout
+babak
+babakazu
+babal
+babalatc
+babalatchi
+babalia
+babalola
+babaluga
+babalugats
+babana
+babanca
+babangid
+babangida
+babango
+babanki
+babanren
+babar
+babara
+babari
+babaroa
+babas
+babasaki
+babasayu
+babasco
+babashit
+babasi
+babasit
+babasita
+babassu
+babasu
+babata
+babataka
+babatana
+babatel
+babatund
+babatunde
+babaylan
+babaza
+babazhi
+babazorra
+babazorro
+babb
+babbage
+babbages
+babbaluc
+babbaluche
+babbel
+babbelaa
+babbelaar
+babbelaars
+babbelaarster
+babbelaarsters
+babbelaarstertje
+babbelaarstertjes
+babbelaartje
+babbelaartjes
+babbelac
+babbelachtig
+babbelachtige
+babbelachtiger
+babbelachtigst
+babbelar
+babbelarij
+babbelarijen
+babbelde
+babbelden
+babbelen
+babbelet
+babbelgu
+babbelguigje
+babbelguigjes
+babbelko
+babbelkous
+babbelkousen
+babbelpr
+babbelpraatje
+babbelpraatjes
+babbels
+babbelt
+babbeltj
+babbeltje
+babbeltjes
+babbelzi
+babbelziek
+babbelzieke
+babbelzieker
+babbelziekst
+babbelzu
+babbelzucht
+babberle
+babberley
+babberly
+babbette
+babbi
+babbidge
+babbie
+babbingt
+babbington
+babbitt
+babbitte
+babbitter
+babbittess
+babbitti
+babbittian
+babbitting
+babbittism
+babbittr
+babbittry
+babblati
+babblative
+babble
+babbled
+babbleme
+babblement
+babbler
+babblers
+babbles
+babbleso
+babblesome
+babbling
+babblingly
+babblings
+babblish
+babblishly
+babbly
+babbo
+babbs
+babbuini
+babbuino
+babby
+babcock
+babe
+babe`lica
+babe`lico
+babear
+babeddin
+babehood
+babeka
+babekyu
+babel
+babeldom
+babelet
+babelic
+babelike
+babelish
+babelism
+babelize
+babels
+babelsk
+babelthu
+babelthuap
+babenco
+babenhau
+babenhausen
+babeo
+baber
+babera
+babero
+baberol
+baberu
+babery
+babes
+babeship
+babesia
+babesias
+babesiasis
+babessi
+babete
+babette
+babhaidh
+babhaidhomba
+babhan
+babhogal
+babhogala
+babhogom
+babhogombe
+babi
+babi's
+babia
+babiana
+babiano
+babich
+babiche
+babieca
+babied
+babies
+babiism
+babil
+babilar
+babilee
+babilla
+babillag
+babillage
+babillages
+babillar
+babillard
+babiller
+babilo`nica
+babilo`nico
+babilon
+babilonia
+babilonio
+babils
+babin
+babine
+babineau
+babineca
+babinecarrier
+babines
+babinga
+babingto
+babingtonite
+babinsky
+babiole
+babioles
+babione
+babir
+babirous
+babirousa
+babiroussa
+babirusa
+babiruss
+babirussa
+babiruwa
+babish
+babished
+babishin
+babishly
+babishne
+babishness
+babisink
+babism
+babismo
+babisoki
+babist
+babita
+babite
+babka
+babkas
+babl
+bablah
+bable
+babler
+bablet
+babloh
+baboaf
+baboe
+baboen
+baboes
+babok
+babokken
+babon
+babong
+babongo
+baboo
+baboodom
+babooism
+baboon
+babooner
+baboonery
+baboonis
+baboonish
+baboonro
+baboonroot
+baboons
+baboos
+baboot
+baboquiv
+baboquivari
+babor
+babord
+baboriga
+baborigame
+babosa
+babosear
+baboseo
+babosilla
+baboso
+babosuela
+babosuelo
+babouche
+babouches
+babouin
+babouins
+baboute
+babouvis
+babouvism
+babouvist
+babri
+babroot
+babrua
+babruwa
+babs
+babson
+babsonpa
+babsonpark
+babsy
+babtist
+babu
+babua
+babucha
+babuche
+babuchera
+babuchero
+babudom
+babue
+babuina
+babuism
+babul
+babuls
+babuma
+babunger
+babungera
+babungo
+babur
+baburiwa
+baburu
+baburuga
+babus
+babusa
+babushka
+babushkas
+babute
+babuyan
+babuza
+babwa
+baby
+baby's
+baby'tje
+baby'tjes
+baby-foo
+baby-foot
+baby-sit
+baby-sitter
+baby-sitters
+babyak
+babyboom
+babybox
+babyboxe
+babyboxen
+babydom
+babyen
+babyene
+babyface
+babyfied
+babyhood
+babyhoods
+babyhous
+babyhouse
+babying
+babyish
+babyishl
+babyishly
+babyishn
+babyishness
+babyism
+babyjahr
+babykled
+babykleding
+babylike
+babylon
+babyloni
+babylonia
+babylonian
+babylonians
+babylonic
+babylonier
+babylonieren
+babylonische
+babylonish
+babylonism
+babylonite
+babylonize
+babynahr
+babynahrung
+babyolat
+babyolatry
+babypfle
+babypflege
+babypill
+babypillen
+babys
+babysach
+babysachen
+babysat
+babyship
+babysit
+babysitt
+babysitter
+babysitting
+babysock
+babysocken
+babystol
+babystoler
+bac
+baca
+bacaba
+bacach
+bacada
+bacadin
+bacairi
+bacalada
+bacaladera
+bacaladero
+bacalao
+bacall
+bacallao
+bacallar
+bacama
+bacan
+bacanal
+bacanese
+bacante
+bacao
+bacau
+bacbakir
+bacbakiri
+bacca
+baccaceo
+baccaceous
+baccae
+baccala
+baccalau
+baccalaure'at
+baccalaure'ats
+baccalaureaat
+baccalaurean
+baccalaureat
+baccalaureate
+baccalaureates
+baccalaurei
+baccalaureus
+baccalon
+baccaloni
+baccalor
+baccalori
+baccani
+baccano
+baccara
+baccarat
+baccarats
+baccaratspeler
+baccaratspelers
+baccardi
+baccari
+baccate
+baccated
+bacchae
+bacchal
+bacchana
+bacchanaal
+bacchanal
+bacchanalen
+bacchanalia
+bacchanalian
+bacchanalianism
+bacchanalianly
+bacchanalias
+bacchanalism
+bacchanalization
+bacchanalize
+bacchanals
+bacchant
+bacchante
+bacchanten
+bacchantes
+bacchantic
+bacchantisch
+bacchantische
+bacchantischer
+bacchantischt
+bacchants
+bacchar
+bacchari
+baccharis
+baccharo
+baccharoid
+baccheio
+baccheion
+bacchett
+bacchetta
+bacchette
+bacchi
+bacchiac
+bacchian
+bacchic
+bacchica
+bacchical
+bacchide
+bacchides
+bacchii
+bacchioc
+bacchiochi
+bacchiri
+bacchius
+bacchus
+bacchusl
+bacchuslike
+bacciagl
+bacciaglia
+baccifer
+bacciferous
+baccifor
+bacciform
+baccioch
+bacciochi
+baccivor
+baccivorous
+baccus
+bacelar
+bacenga
+bacera
+bacerai
+bacerann
+baceranno
+bacerebb
+bacerebbe
+bacerei
+baceremm
+baceremmo
+baceremo
+bacerest
+bacereste
+baceresti
+bacerete
+bacero
+baceta
+bach
+bacha
+bachadi
+bachajo
+bachajon
+bachama
+bacharac
+bacharach
+bache
+bachear
+bachecon
+bachecongi
+bachel
+bachelie
+bachelie`re
+bachelie`res
+bachelier
+bacheliers
+bachelor
+bachelordom
+bachelorhood
+bachelorism
+bachelorize
+bachelorlike
+bachelorly
+bachelors
+bachelorship
+bachelorwise
+bachelry
+bachelu
+bacheo
+baches
+bacheve
+bachewic
+bachewich
+bachi
+bachiata
+bachichi
+bachigai
+bachikan
+bachiller
+bachillera
+bachilleradgo
+bachilleramiento
+bachillerar
+bachillerato
+bachillerear
+bachillereja
+bachillerejo
+bachilleri`a
+bachingo
+bachingou
+bachinsk
+bachinski
+bachir
+bachit
+bachitga
+bachitgashish
+bachitta
+bachittar
+bachler
+bachmann
+bachner
+bachot
+bachotag
+bachotage
+bachoter
+bachots
+bachrach
+bachrite
+bachrites
+bachs
+bachufer
+bachuma
+bachus
+bachuu
+bachynsk
+bachynski
+baci
+baci`a
+baci`n
+bacia
+baciai
+baciaman
+baciamani
+baciamano
+baciammo
+baciamo
+baciando
+baciano
+baciare
+baciaron
+baciarono
+baciasse
+baciassero
+baciassi
+baciassimo
+baciaste
+baciasti
+baciata
+baciate
+baciati
+baciato
+baciava
+baciavam
+baciavamo
+baciavan
+baciavano
+baciavat
+baciavate
+baciavi
+baciavo
+bacigalu
+bacigalupi
+bacil
+bacilar
+bacilary
+bacillac
+bacillaceae
+bacillar
+bacillariaceae
+bacillariaceous
+bacillariales
+bacillarieae
+bacillariophyta
+bacillary
+bacille
+bacillem
+bacillemia
+bacillen
+bacillendrager
+bacillendragers
+bacilles
+bacilli
+bacillia
+bacillian
+bacillic
+bacillicidal
+bacillicide
+bacillicidic
+bacilliculture
+bacillif
+bacilliform
+bacillig
+bacilligenic
+bacillip
+bacilliparous
+bacillit
+bacillite
+bacillo
+bacillog
+bacillogenic
+bacillogenous
+bacillop
+bacillophobia
+bacillos
+bacillosis
+bacillur
+bacilluria
+bacillus
+bacilo
+bacina
+bacinada
+bacinador
+bacinejo
+bacinell
+bacinella
+bacinelle
+bacinera
+bacinero
+bacineta
+bacinete
+bacini
+bacinica
+bacinilla
+bacino
+bacio
+bacis
+bacisco
+bacitrac
+bacitracin
+back
+backa
+backache
+backaches
+backachi
+backaching
+backachy
+backage
+backapos
+backapostrophe
+backarro
+backarrow
+backarrows
+backband
+backbear
+backbearing
+backbenc
+backbencher
+backbenchers
+backbend
+backbends
+backbit
+backbite
+backbiter
+backbiters
+backbites
+backbiteth
+backbiti
+backbiting
+backbitingly
+backbitings
+backbitt
+backbitten
+backblec
+backbleche
+backblechen
+backblechs
+backblocks
+backblow
+backboar
+backboard
+backboards
+backbone
+backboned
+backboneless
+backbonelessness
+backbones
+backbran
+backbrand
+backbrea
+backbreaker
+backbreaking
+backburn
+backcap
+backcast
+backchai
+backchain
+backchat
+backcoun
+backcountry
+backcour
+backcourt
+backcros
+backcross
+backcrossing
+backdate
+backdated
+backdates
+backdati
+backdating
+backdoor
+backdown
+backdrop
+backdrops
+backe
+backed
+backen
+backenba
+backenbaerte
+backenbaerten
+backenbart
+backend
+backende
+backendem
+backender
+backendes
+backene
+backenkn
+backenknochen
+backenza
+backenzaehne
+backenzaehnen
+backenzahns
+backer
+backers
+backes
+backet
+backett
+backfall
+backfatt
+backfatter
+backfiel
+backfield
+backfields
+backfill
+backfilled
+backfiller
+backfilling
+backfills
+backfire
+backfired
+backfires
+backfiri
+backfiring
+backfisc
+backfisch
+backfische
+backflap
+backflas
+backflash
+backflow
+backfold
+backform
+backformation
+backfram
+backframe
+backfrie
+backfriend
+backfurr
+backfurrow
+backgame
+backgamm
+backgammon
+backgrou
+background
+backgrounds
+backhan
+backhand
+backhanded
+backhandedly
+backhandedness
+backhanden
+backhander
+backhanding
+backhands
+backhatc
+backhatch
+backheel
+backhoe
+backhoes
+backhook
+backhooker
+backhous
+backhouse
+backhuhn
+backie
+backiebi
+backiebird
+backing
+backings
+backjaw
+backjoin
+backjoint
+backkjed
+backkjeden
+backland
+backlands
+backlash
+backlashed
+backlashes
+backlashing
+backless
+backlet
+backlidi
+backliding
+backlin
+backling
+backlings
+backlini
+backlinie
+backlist
+backlists
+backlit
+backlog
+backlogg
+backlogged
+backlogging
+backlogs
+backlott
+backlotter
+backlund
+backlunda
+backman
+backmirr
+backmost
+backnumb
+backnut
+backoefe
+backoefen
+backofen
+backofens
+backoff
+backorde
+backorder
+backpack
+backpacked
+backpacker
+backpackers
+backpacking
+backpacks
+backpeda
+backpedal
+backpedaled
+backpedaling
+backpiec
+backpiece
+backplan
+backplane
+backplanes
+backplas
+backplass
+backplassen
+backplat
+backplate
+backpoin
+backpointer
+backpointers
+backprim
+backprime
+backprop
+backpulv
+backpulvers
+backquot
+backquote
+backrekk
+backrekken
+backrest
+backrests
+backrope
+backrub
+backrun
+backs
+backsaw
+backsaws
+backscat
+backscatter
+backscattered
+backscattering
+backscatters
+backscra
+backscraper
+backseat
+backseats
+backset
+backsett
+backsetting
+backsettler
+backshal
+backshall
+backshee
+backsheesh
+backshif
+backshift
+backshis
+backshish
+backside
+backsides
+backsigh
+backsight
+backsite
+backslan
+backslant
+backslap
+backslapper
+backslappers
+backslapping
+backslaps
+backslas
+backslash
+backslashes
+backslat
+backslid
+backslidden
+backslide
+backslider
+backsliders
+backslides
+backsliding
+backslidingness
+backslidings
+backspac
+backspace
+backspaced
+backspacefile
+backspacer
+backspaces
+backspacing
+backspan
+backspang
+backspar
+backspark
+backspie
+backspier
+backspierer
+backspil
+backspill
+backspin
+backspins
+backspre
+backspread
+backspri
+backspringing
+backst
+backstaf
+backstaff
+backstag
+backstage
+backstai
+backstair
+backstairs
+backstam
+backstamp
+backstay
+backstei
+backstein
+backsteine
+backster
+backstic
+backstick
+backstit
+backstitch
+backstitched
+backstitches
+backstitching
+backston
+backstone
+backstop
+backstops
+backstra
+backstrap
+backstre
+backstretch
+backstretches
+backstri
+backstring
+backstrip
+backstro
+backstroke
+backstroked
+backstrokes
+backstroking
+backstromite
+backstub
+backstube
+backstug
+backstugepiga
+backswep
+backswept
+backswin
+backswing
+backswor
+backsword
+backswording
+backswordman
+backswordsman
+backtack
+backte
+backten
+backtend
+backtender
+backtent
+backtenter
+backteri
+backterienkultur
+backtest
+backtrac
+backtrace
+backtrack
+backtracked
+backtracker
+backtrackers
+backtracking
+backtracks
+backtric
+backtrick
+backup
+backup'en
+backup's
+backup0
+backup1
+backupfil
+backupfilen
+backups
+backus
+backusna
+backusnaur
+backuss
+backveld
+backvelder
+backwall
+backward
+backwardation
+backwardcompatibility
+backwardcompatible
+backwardly
+backwardness
+backwards
+backware
+backwaren
+backwarenindustrie
+backwash
+backwasher
+backwashes
+backwashing
+backwate
+backwater
+backwatered
+backwaters
+backway
+backwhac
+backwhack
+backwood
+backwoods
+backwoodsiness
+backwoodsman
+backwoodsmen
+backwoodsy
+backword
+backworm
+backwort
+backy
+backyard
+backyarder
+backyards
+backzeit
+baclanov
+baclanova
+baclawsk
+baclawski
+bacliff
+baclin
+baco
+bacolod
+bacon
+baconer
+baconian
+baconiana
+baconianism
+baconiano
+baconic
+baconism
+baconist
+baconize
+bacons
+baconton
+baconwee
+baconweed
+bacony
+bacopa
+bacova
+bacove
+bacoven
+bacovenc
+bacovencultuur
+bacri
+bacs
+bacskal
+bacskisk
+bacskiskun
+bacte'ri
+bacte'ricide
+bacte'ricides
+bacte'rie
+bacte'rien
+bacte'rienne
+bacte'riennes
+bacte'riens
+bacte'ries
+bacte'riologie
+bacte'riologique
+bacte'riologiques
+bacte'riologiste
+bacte'riologistes
+bacterem
+bacteremia
+bacteria
+bacteriaceae
+bacteriaceous
+bacterial
+bacterially
+bacterian
+bacteriana
+bacteriano
+bacteric
+bactericholia
+bactericida
+bactericidal
+bactericidally
+bactericide
+bactericides
+bactericidin
+bacterid
+bacterie
+bacteriemia
+bacterien
+bacterienvrees
+bacterievrij
+bacterievrije
+bacterievrijes
+bacterif
+bacteriform
+bacterin
+bacterio
+bacterio`logo
+bacterioagglutinin
+bacterioblast
+bacteriocidal
+bacteriocyte
+bacteriodiagnosis
+bacteriofaag
+bacteriofagen
+bacteriofluorescin
+bacteriogenic
+bacteriogenous
+bacteriohemolysin
+bacterioid
+bacterioidal
+bacteriolo`gica
+bacteriolo`gico
+bacteriologen
+bacteriologi`a
+bacteriologic
+bacteriological
+bacteriologically
+bacteriologie
+bacteriologies
+bacteriologisch
+bacteriologische
+bacteriologist
+bacteriologists
+bacteriology
+bacterioloog
+bacteriolysin
+bacteriolysis
+bacteriolytic
+bacteriolyze
+bacteriopathology
+bacteriophage
+bacteriophages
+bacteriophagia
+bacteriophagic
+bacteriophagous
+bacteriophagy
+bacteriophobia
+bacterioprecipitin
+bacterioprotein
+bacteriopsonic
+bacteriopsonin
+bacteriopurpurin
+bacterioscopic
+bacterioscopical
+bacterioscopically
+bacterioscopist
+bacterioscopy
+bacteriosis
+bacteriosolvent
+bacteriostasis
+bacteriostat
+bacteriostatic
+bacteriotherapeutic
+bacteriotherapy
+bacteriotoxic
+bacteriotoxin
+bacteriotropic
+bacteriotropin
+bacteriotrypsin
+bacterious
+bacterir
+bacteririum
+bacterit
+bacteritic
+bacteriu
+bacterium
+bacteriuria
+bacteriz
+bacterization
+bacterize
+bacteroi
+bacteroid
+bacteroidal
+bacteroideae
+bacteroides
+bacti
+bactiri
+bactrian
+bactriana
+bactriano
+bactris
+bactrite
+bactrites
+bactriti
+bactriticone
+bactrito
+bactritoid
+bacuisso
+bacula
+bacule
+baculi
+baculife
+baculiferous
+baculifo
+baculiform
+baculine
+baculite
+baculites
+baculiti
+baculitic
+baculiticone
+baculoid
+baculum
+baculus
+bacury
+bad
+bad-kreu
+bad-kreuzn-ignet
+bada
+bada`n
+badag
+badaga
+badagry
+badagu
+badai
+badajada
+badajazo
+badajear
+badajo
+badajocense
+badajsky
+badajuelo
+badak
+badakhsh
+badakhshan
+badakhshani
+badakhshi
+badaksha
+badakshan
+badal
+badalame
+badalamenti
+badallar
+badalone`s
+badalonesa
+badammo
+badan
+badana
+badanada
+badanado
+badanchi
+badando
+badang
+badano
+badaplas
+badaplass
+badara
+badare
+badarian
+badarono
+badarrah
+badashkh
+badashkhan
+badass
+badasse
+badasser
+badassero
+badassi
+badassim
+badassimo
+badaste
+badasti
+badata
+badate
+badati
+badato
+badaud
+badauds
+badava
+badavamo
+badavano
+badavate
+badavi
+badavo
+badawa
+badawi
+badaxe
+badaza
+badboy
+badbroes
+badbroez
+badbroezen
+badcel
+badcelle
+badcellen
+badcode
+badcompa
+badd
+badda
+badde
+baddeley
+baddeleyite
+badderlo
+badderlocks
+baddie
+baddies
+badding
+baddings
+baddish
+baddishl
+baddishly
+baddishn
+baddishness
+baddock
+baddy
+bade
+badea
+badeanla
+badeanlagen
+badeanst
+badeanstalt
+badeanstalten
+badeanzu
+badeanzuegen
+badeanzug
+badeanzuges
+badebass
+badebasseng
+badebatt
+badebatterier
+badecki
+badedrak
+badedrakt
+badedrakten
+badedrakter
+badeeinr
+badeeinrichtung
+badeerle
+badeerlebnis
+badegaes
+badegaeste
+badegast
+badegastes
+badegele
+badegelegenheit
+badegjes
+badegjester
+badehaus
+badehett
+badehetter
+badehose
+badehosen
+badekado
+badekapp
+badekappen
+badekar
+badekare
+badekaret
+badekarrets
+badekost
+badekostuem
+badekott
+badekur
+badel
+badelico
+badelov
+badelt
+bademaen
+bademaentel
+bademaenteln
+bademant
+bademantel
+bademeis
+bademeister
+bademeistern
+bademeisters
+bademuli
+bademuligheter
+baden
+baden-ba
+baden-baden
+baden-wu
+baden-wuertenberg
+baden-wuerttemberg
+badend
+badendem
+badenden
+badender
+badene
+badengli
+badenia
+badeniche
+badenite
+badenoch
+badenwur
+badenwurttemberg
+badeoert
+badeoerter
+badeort
+badeorte
+badeortes
+badeplas
+badeplassene
+badeplasser
+bader
+badera
+baderai
+baderann
+baderanno
+baderebb
+baderebbe
+baderei
+baderemm
+baderemmo
+baderemo
+baderest
+badereste
+baderesti
+baderete
+baderna
+baderne
+badernes
+badero
+baderom
+baderomm
+baderommene
+baderommet
+baders
+baderum
+baderwal
+baderwali
+bades
+badesais
+badesaison
+badeseso
+badesesongen
+badeshi
+badeshor
+badeshorts
+badest
+badested
+badesteder
+badestra
+badestraende
+badestrand
+badestranden
+badestrandes
+badet
+badete
+badetest
+badetet
+badetuch
+badetuches
+badetuec
+badetuecher
+badevann
+badevannet
+badev{re
+badev{relse
+badev{relser
+badev{relset
+badewann
+badewanne
+badewarj
+badewarji
+badewass
+badewasser
+badezimm
+badezimmer
+badezimmern
+badezimmerwand
+badgast
+badgaste
+badgasten
+badge
+badged
+badgeles
+badgeless
+badgeman
+badger
+badger*
+badgerbr
+badgerbrush
+badgered
+badgerer
+badgerin
+badgering
+badgeringly
+badgerli
+badgerlike
+badgerly
+badgers
+badgerwe
+badgerweed
+badges
+badghis
+badging
+badham
+badhandd
+badhanddoek
+badhanddoeken
+badhani
+badhe
+badhotel
+badhotels
+badhuis
+badhuize
+badhuizen
+badhus
+badi
+badia
+badia`n
+badiaga
+badiamo
+badian
+badiana
+badiate
+badie
+badigeon
+badigeonna
+badigeonnage
+badigeonnages
+badigeonnaient
+badigeonnais
+badigeonnait
+badigeonnant
+badigeonne
+badigeonne'
+badigeonne'e
+badigeonne'es
+badigeonne's
+badigeonne`rent
+badigeonnent
+badigeonner
+badigeonnera
+badigeonnerai
+badigeonneraient
+badigeonnerais
+badigeonnerait
+badigeonneras
+badigeonnerez
+badigeonneriez
+badigeonnerions
+badigeonnerons
+badigeonneront
+badigeonnes
+badigeonnez
+badigeonniez
+badigeonnions
+badigeonnons
+badigeons
+badil
+badila
+badilazo
+badile
+badilejo
+badili
+badin
+badina
+badinage
+badinaged
+badinages
+badinagi
+badinaging
+badine
+badiner
+badineri
+badinerie
+badines
+bading
+badino
+badinric
+badinrichting
+badinrichtingen
+badins
+badious
+badische
+badittu
+badja
+badjande
+badjao
+badjari
+badjas
+badjasse
+badjassen
+badjava
+badjaw
+badjia
+badjiri
+badjo
+badjoue
+badkamer
+badkamers
+badknech
+badknecht
+badknechten
+badknechts
+badkoets
+badkoetsen
+badkostu
+badkostuum
+badkostuums
+badkuip
+badkuipe
+badkuipen
+badkuren
+badkuur
+badland
+badlands
+badli
+badly
+badman
+badmante
+badmantel
+badmantels
+badmeest
+badmeester
+badmeesters
+badmen
+badmingt
+badmington
+badminti
+badmintion
+badminto
+badminton
+badmintonbane
+badmintonen
+badmouth
+badmouthed
+badmouthing
+badmouths
+badmuts
+badmutse
+badmutsen
+badness
+badnesse
+badnesses
+badning
+bado
+badob
+badolati
+badomi`a
+badomint
+badon
+badort
+badou
+badowski
+badpak
+badpakke
+badpakken
+badplaat
+badplaats
+badplaatsen
+badr
+badragel
+badran
+badri
+badrohi
+bads
+badseizo
+badseizoen
+badseizoenen
+badstoel
+badstoelen
+badstuba
+badstubad
+badstubadet
+badstue
+badstuen
+badstuer
+badstuov
+badstuovn
+badstuovnen
+badstuve
+badstuved
+badtempe
+badtempered
+badtherm
+badthermometer
+badthermometers
+badtimes
+badtoelz
+badtoelz-emh1
+badu
+badugu
+baduhenn
+baduhenna
+badui
+badulaque
+badulla
+badvrouw
+badvrouwen
+badwater
+badyara
+badyaran
+badyaranke
+badza
+badzeep
+badzout
+badzoute
+badzouten
+badzumbo
+bae
+baebi
+baebunta
+baeche
+baechen
+baecher
+baechlei
+baechlein
+baeck
+baeckere
+baeckerei
+baeckereien
+baeckerg
+baeckergehilfe
+baeckergesellen
+baeckerj
+baeckerjunge
+baeckerl
+baeckerlehre
+baeckerm
+baeckermeister
+baeckern
+baeckers
+baedd
+baedda
+baedeker
+baedekerian
+baedekers
+baedern
+baegge
+baeggu
+baegu
+baegwa
+baele
+baelelea
+baelle
+baellen
+baelt
+baelta
+baelte
+baen
+baena
+baende
+baenden
+baender
+baendern
+baendige
+baendigen
+baendigende
+baendigendem
+baendigenden
+baendigendes
+baendigs
+baendigst
+baendigt
+baendigten
+baendigtest
+baendigtet
+baendigu
+baendigung
+baenera
+baenero
+baenk
+baenkar
+baenke
+baenker
+baenkers
+baenzige
+baenziger
+baeotic
+baer
+baera
+baerare
+baerbar
+baerbel
+baeren
+baerendr
+baerendreck
+baerenkr
+baerenkraefte
+baerenmu
+baerenmuetzen
+baerenst
+baerenstarke
+baerg
+baerga
+baeria
+baerig
+baerighe
+baerighet
+baerin
+baerinne
+baerinnen
+baerten
+baertig
+baertige
+baertigen
+baertiger
+baertiges
+baerwald
+baesse
+baest
+baesta
+baeste
+baetora
+baets
+baetsle
+baettra
+baettre
+baetuli
+baetulus
+baetyl
+baetylic
+baetylus
+baetzner
+baeuche
+baeuerin
+baeuerinnen
+baeuerli
+baeuerlich
+baeuerliche
+baeuerlichem
+baeuerlicher
+baeuerliches
+baeume
+baeumt
+baever
+baez
+baeza
+baezana
+baezano
+baf
+bafang
+bafangi
+bafanji
+bafanyi
+bafaro
+bafata
+bafaw
+bafawbal
+bafawbalong
+bafb
+bafb-ddn
+bafb-ddnvax
+bafear
+bafeuk
+baff
+baffa
+baffeta
+baffi
+baffico
+baffin
+baffinla
+baffinland
+baffins
+baffle
+baffled
+baffleme
+bafflement
+bafflements
+baffler
+bafflers
+baffles
+baffling
+bafflingly
+bafflingness
+baffo
+baffy
+bafia
+bafilo
+bafing
+bafmen
+bafmeng
+bafo
+bafodia
+bafoeg
+bafou
+bafoua
+bafouaie
+bafouaient
+bafouais
+bafouait
+bafouant
+bafoue
+bafoue'
+bafoue'e
+bafoue'es
+bafoue's
+bafoue`r
+bafoue`rent
+bafouent
+bafouer
+bafouera
+bafouerai
+bafoueraient
+bafouerais
+bafouerait
+bafoueras
+bafouere
+bafouerez
+bafoueri
+bafoueriez
+bafouerions
+bafouero
+bafouerons
+bafoueront
+bafoues
+bafouez
+bafouiez
+bafouill
+bafouilla
+bafouillage
+bafouillages
+bafouillaient
+bafouillais
+bafouillait
+bafouillant
+bafouille
+bafouille'
+bafouille'e
+bafouille'es
+bafouille's
+bafouille`rent
+bafouillent
+bafouiller
+bafouillera
+bafouillerai
+bafouilleraient
+bafouillerais
+bafouillerait
+bafouilleras
+bafouillerez
+bafouilleriez
+bafouillerions
+bafouillerons
+bafouilleront
+bafouilles
+bafouilleur
+bafouilleurs
+bafouilleuse
+bafouilleuses
+bafouillez
+bafouilliez
+bafouillions
+bafouillons
+bafouion
+bafouions
+bafoulab
+bafoulabe
+bafoumen
+bafoumeng
+bafouons
+bafoussa
+bafoussam
+bafowu
+bafq
+bafreng
+baft
+bafta
+bafuchu
+bafumen
+bafun
+bafut
+bafwagad
+bafwagada
+bafwakay
+bafwakayi
+bafwasen
+bafwasende
+bafwesen
+bafwesende
+bafyot
+bag
+baga
+baga`
+bagabag
+bagacera
+bagage
+bagagebu
+bagagebureau
+bagagebureaus
+bagagedr
+bagagedrager
+bagagedragers
+bagagene
+bagagenet
+bagagenetten
+bagagere
+bagagerecu
+bagagerecu's
+bagageru
+bagageruim
+bagageruimen
+bagages
+bagagetr
+bagagetrein
+bagagetreinen
+bagagewa
+bagagewagen
+bagagewagens
+bagagist
+bagagiste
+bagagistes
+bagagli
+bagaglio
+bagahak
+bagaje
+bagajero
+bagale
+bagam
+bagamery
+bagamoyo
+baganamb
+baganambia
+baganda
+bagandji
+bagando
+bagandou
+bagangte
+bagangu
+bagani
+bagantou
+bagar
+bagari
+bagarino
+bagarmi
+bagarra
+bagarrai
+bagarraient
+bagarrais
+bagarrait
+bagarran
+bagarrant
+bagarre
+bagarre'
+bagarre'e
+bagarre'es
+bagarre's
+bagarre`
+bagarre`rent
+bagarren
+bagarrent
+bagarrer
+bagarrera
+bagarrerai
+bagarreraient
+bagarrerais
+bagarrerait
+bagarreras
+bagarrerez
+bagarreriez
+bagarrerions
+bagarrerons
+bagarreront
+bagarres
+bagarreu
+bagarreur
+bagarreurs
+bagarreuse
+bagarreuses
+bagarrez
+bagarrie
+bagarriez
+bagarrio
+bagarrions
+bagarron
+bagarrons
+bagasa
+bagashvi
+bagashvili
+bagasin
+bagasje
+bagasjeg
+bagasjegrind
+bagasjen
+bagasjep
+bagasjeplass
+bagasjer
+bagasjerom
+bagasjerommet
+bagasse
+bagat
+bagata
+bagatawa
+bagataway
+bagatel
+bagatela
+bagatell
+bagatelle
+bagatellen
+bagateller
+bagatelles
+bagatelletje
+bagatelletjes
+bagatelliseer
+bagatelliseerde
+bagatelliseerden
+bagatelliseert
+bagatellisere
+bagatelliseren
+bagatelliserer
+bagatellisering
+bagatellisert
+bagatelliserte
+bagatellisieren
+bagatellmessig
+bagatellmessige
+bagatine
+bagattin
+bagattini
+bagattino
+bagaudae
+bagazal
+bagazo
+bagba
+bagbiet
+bagbiter
+bagbitin
+bagbiting
+bagbord
+bagbot
+bagbundet
+bagby
+bagdad
+bagdads
+bagdasar
+bagdasarian
+bagdi
+bage
+bageform
+bagefter
+bagel
+bagelkha
+bagelkhandi
+bagels
+bagen
+bagend
+bageopskrift
+bageopskriften
+bageopskrifter
+bageopskrifternes
+bageopskrifters
+bagepulver
+bager
+bagerhat
+bageri
+bagest
+bageste
+bagetako
+bagetakos
+bageto
+bagfra
+bagful
+bagfuls
+bagg
+baggage
+baggagem
+baggageman
+baggagemaster
+baggager
+baggages
+baggala
+bagganet
+baggara
+bagge
+bagged
+baggelaa
+baggelaar
+baggelaars
+bagger
+baggerar
+baggerarbeit
+baggerarbeiten
+baggerarm
+baggerarme
+baggerarmes
+baggerarms
+baggerbe
+baggerbetrieb
+baggerbeugel
+baggerbeugels
+baggerde
+baggerden
+baggere
+baggerem
+baggeremmer
+baggeremmers
+baggeren
+baggerfa
+baggerfahrer
+baggerge
+baggergeraete
+baggerla
+baggerlaars
+baggerlaarzen
+baggerli
+baggerlieden
+baggerlo
+baggerlo"ffel
+baggerlo"ffels
+baggerlu
+baggerlui
+baggerma
+baggermachine
+baggermachines
+baggerman
+baggerman-webster
+baggermaschinen
+baggermo
+baggermolen
+baggermolens
+baggern
+baggernd
+baggernde
+baggerndem
+baggernden
+baggerndes
+baggerob
+baggerobjekte
+baggerpo
+baggerposition
+baggerre
+baggerreichweite
+baggers
+baggersc
+baggerschaufel
+baggerschuit
+baggerschuiten
+baggerse
+baggersee
+baggerst
+baggerstandort
+baggersteuerung
+baggert
+baggerte
+baggerten
+baggertest
+baggertet
+baggertu
+baggerturf
+baggett
+baggie
+baggier
+baggies
+baggiest
+baggily
+baggines
+bagginess
+bagging
+baggings
+baggins
+baggit
+baggot
+baggott
+baggrund
+baggrunde
+baggrunden
+baggrundsfarve
+baggrundsfarven
+baggrundsjob
+baggrundslager
+baggrundslageret
+baggrundslagerets
+baggrundslagre
+baggrundsprocesser
+baggrundsviden
+baggs
+baggu
+baggy
+bagha
+baghap
+baghati
+baghaven
+baghavens
+baghdad
+baghdadi
+bagheli
+baghi
+baghirmi
+baghlan
+baghold
+baghouse
+bagi
+baginda
+bagirmi
+bagis
+bagiserw
+bagiserwar
+baglady
+bagleave
+bagleaves
+bagler
+bagleren
+bagley
+baglike
+baglione
+bagliore
+bagliori
+bagl{ns
+bagl}s
+bagmaker
+bagmakin
+bagmaking
+bagman
+bagmati
+bagmen
+bagminut
+bagminuter
+bagna
+bagnai
+bagnammo
+bagnando
+bagnano
+bagnard
+bagnards
+bagnare
+bagnaron
+bagnarono
+bagnasse
+bagnassero
+bagnassi
+bagnassimo
+bagnaste
+bagnasti
+bagnata
+bagnate
+bagnati
+bagnato
+bagnava
+bagnavam
+bagnavamo
+bagnavan
+bagnavano
+bagnavat
+bagnavate
+bagnavi
+bagnavo
+bagne
+bagnera
+bagnerai
+bagneran
+bagneranno
+bagnereb
+bagnerebbe
+bagnerei
+bagnerem
+bagneremmo
+bagneremo
+bagneres
+bagnereste
+bagneresti
+bagneret
+bagnerete
+bagneris
+bagnero
+bagnes
+bagni
+bagniamo
+bagniate
+bagnini
+bagnino
+bagnio
+bagnios
+bagno
+bagno's
+bagnoun
+bagnut
+bago
+bagobo
+bagoi
+bagom
+bagonet
+bagot
+bagou
+bagout
+bagover
+bagozzi
+bagpipe
+bagpiper
+bagpipers
+bagpipes
+bagplant
+bagram
+bagratio
+bagration
+bagrationite
+bagre
+bagreef
+bagri
+bagria
+bagrimma
+bagris
+bagroom
+bags
+bagsful
+bagshaw
+bagshot
+bagside
+bagsiden
+bagsidens
+bagslag
+bagtale
+bagtanke
+bagtil
+bagtrappe
+bagtrop
+bagt{ppe
+bagu
+baguage
+bagual
+baguala
+bagualada
+baguari`
+bagudadd
+bague
+bague'
+bague'e
+bague'es
+bague's
+baguenau
+baguenauder
+baguer
+bagues
+baguet
+baguets
+baguette
+baguettes
+baguio
+baguirme
+baguirmi
+bagulal
+bagun
+bagundji
+bagupi
+bagusa
+bagvalin
+bagvaske
+bagvaskelse
+bagved
+bagvedliggende
+bagvendt
+bagvendte
+bagvogn
+bagvogne
+bagvogner
+bagv{g
+bagv{ggen
+bagv{rk
+bagwa
+bagwama
+bagwell
+bagwig
+bagwigge
+bagwigged
+bagwigs
+bagwoman
+bagworm
+bagworms
+bagwyn
+bagyele
+bagyuuki
+bah
+baha
+bahaa
+bahadir
+bahadur
+bahadure
+bahadurefficiency
+bahadurs
+bahah
+bahai
+bahaism
+bahaisme
+bahaist
+baham
+bahama
+bahama-i
+bahama-inseln
+bahaman
+bahamane
+bahamanen
+bahamaner
+bahamaneren
+bahamans
+bahamansk
+bahamas
+bahamian
+bahamians
+bahan
+bahandla
+bahar
+bahari`
+baharlu
+baharumi
+baharumite
+bahasa
+bahau
+bahaulla
+bahaullah
+bahawalp
+bahawalpur
+bahawalpuri
+bahawder
+bahay
+bahbiau
+bahe
+bahelia
+bahera
+baheya
+bahgat
+bahgri
+bahha
+bahi
+bahi`a
+bahia
+bahiaite
+bahima
+bahinemo
+bahing
+bahirah
+bahisti
+bahitsu
+bahitu
+bahl
+bahman
+bahmani
+bahmanid
+bahn
+bahnange
+bahnangestellter
+bahnanle
+bahnanleihe
+bahnar
+bahnarbe
+bahnarbeiter
+bahnaric
+bahnarre
+bahnarrengao
+bahnbeam
+bahnbeamte
+bahnbeamten
+bahnbeamter
+bahnbrec
+bahnbrechende
+bahnbrechendem
+bahnbrechenden
+bahnbrechendes
+bahnbrecher
+bahndaem
+bahndaemme
+bahndaemmen
+bahndamm
+bahndammes
+bahneige
+bahneigenem
+bahnen
+bahner
+bahnexpr
+bahnexpress
+bahnfahr
+bahnfahrt
+bahnfrac
+bahnfracht
+bahnfrachten
+bahngebi
+bahngebiet
+bahnglei
+bahngleis
+bahngleisanschluss
+bahnho"f
+bahnho"fe
+bahnhoef
+bahnhoefe
+bahnhof
+bahnhofs
+bahnhofsanlagen
+bahnhofskiosk
+bahnhofskioske
+bahnhofskommission
+bahnhofspennern
+bahnhofsplatz
+bahnhofstrasse
+bahnhofswartesaal
+bahnhofswirtschaft
+bahnidi
+bahnknot
+bahnknotenpunkt
+bahnkurv
+bahnkurve
+bahnkurven
+bahnlast
+bahnlasten
+bahnlini
+bahnlinie
+bahnlinien
+bahnreis
+bahnreise
+bahnreisen
+bahnreko
+bahnrekord
+bahnserv
+bahnservice
+bahnstei
+bahnsteig
+bahnsteigen
+bahnsteiges
+bahnsteigkante
+bahnstoe
+bahnstoerungen
+bahnstre
+bahnstrecken
+bahntari
+bahntarife
+bahntarifen
+bahnte
+bahnuebe
+bahnuebergaenge
+bahnuebergang
+bahnueberganges
+bahnung
+bahnverw
+bahnverwaltung
+bahnverwaltungen
+bahnwaer
+bahnwaerter
+bahnweg
+bahnwerk
+bahnwerke
+baho
+bahoe
+bahomia
+bahoo
+bahoric
+bahorrina
+bahr
+bahrain
+bahraine
+bahrainer
+bahraineren
+bahraini
+bahrains
+bahrainsk
+bahram
+bahre
+bahrein
+bahrelgh
+bahrelghazal
+bahri
+bahrs
+bahru
+baht
+bahts
+bahu`na
+bahu`no
+bahuma
+bahumono
+bahur
+bahurim
+bahurrero
+bahut
+bahuts
+bahutsam
+bahutsamstem
+bahutu
+bahuvrih
+bahuvrihi
+bai
+bai"onne
+bai"onnette
+bai"onnettes
+baia
+baianism
+baiao
+baiap
+baiasu
+baiasuro
+baiawa
+baiaya
+baibai
+baibaiip
+baibaiko
+baibara
+baiben
+baibokou
+baibokoum
+baibun
+baibure
+baibure-
+baibures
+baiburet
+baiburu
+baichi
+baichika
+baichoo
+baichou
+baicit
+baidai
+baidarka
+baidoku
+baidokus
+baidya
+baidyla
+baie
+baien
+baiera
+baieru
+baierun
+baies
+baifuuka
+baiga
+baigaku
+baigana
+baigani
+baigent
+baiginet
+baigna
+baignade
+baignades
+baignaie
+baignaient
+baignais
+baignait
+baignant
+baigne
+baigne'
+baigne'e
+baigne'es
+baigne's
+baigne`r
+baigne`rent
+baignent
+baigner
+baignera
+baignerai
+baigneraient
+baignerais
+baignerait
+baigneras
+baignere
+baignerez
+baigneri
+baigneriez
+baignerions
+baignero
+baignerons
+baigneront
+baignes
+baignet
+baigneur
+baigneurs
+baigneus
+baigneuse
+baigneuses
+baignez
+baigniez
+baignion
+baignions
+baignoir
+baignoire
+baignoires
+baignons
+baigo
+baigou
+baihin
+baiijou
+baiijoub
+baiin
+baiinai
+baijin
+baijou
+baijuu
+baijyou
+baijyuu
+baika
+baikai
+baikaida
+baikaite
+baikaiyu
+baikaku
+baikal
+baikalit
+baikalite
+baikan
+baiken
+baikenu
+baikerin
+baikerinite
+baikerit
+baikerite
+baiketsu
+baiketu
+baiketus
+baikie
+baikin
+baikingu
+baikoku
+baikokud
+baikonur
+baiku
+baikurai
+baikurir
+baikyaku
+baikyuu
+bail
+baila
+bailable
+bailadera
+bailadero
+bailador
+bailadora
+bailage
+bailala
+bailante
+bailar
+bailari`n
+bailarina
+baildon
+baile
+bailebot
+bailebotavenei
+bailed
+bailee
+bailer
+bailers
+bailete
+bailetti
+bailey
+baileybr
+baileybrug
+baileybruggen
+baileyis
+baileyisland
+baileys
+baileysh
+baileysharbor
+baileyss
+baileysswitch
+baileyto
+baileyton
+baileyvi
+baileyville
+bailez
+baili`a
+baili`o
+bailiaje
+bailiazgo
+bailie
+bailiery
+bailies
+bailiesh
+bailieship
+bailiff
+bailiffr
+bailiffry
+bailiffs
+bailiffship
+bailing
+bailinista
+bailista
+bailitt
+bailiwic
+bailiwick
+bailiwicks
+bailko
+baillarg
+baillargeon
+baillaud
+baillauda
+baillere
+bailleresse
+bailleresses
+bailleur
+bailleurs
+bailliag
+bailliage
+baillie
+baillone
+baillonella
+baillou
+bailloux
+bailly
+bailment
+bailo`n
+bailor
+bailors
+bailotear
+bailoteo
+bailout
+bailouts
+bailpiec
+bailpiece
+bails
+bailsman
+bailsmen
+bailwood
+baily
+baimak
+baiman
+baimei
+baimuri
+baimuru
+bain
+bain-mar
+bain-marie
+bainan
+bainapi
+bainari
+bainbrid
+bainbridge
+bainda
+baindo
+bainer
+baines
+baing
+bainge
+bainie
+bainin
+baining
+bainingt
+bainingtaulil
+bainite
+bainouk
+bains
+bains-ma
+bains-marie
+bainter
+bainton
+bainuk
+bainvill
+bainville
+baio
+baioc
+baiocchi
+baiocco
+baion
+baiorens
+baiorett
+baiorin
+baiot
+baiote
+baipasu
+bair
+bairagi
+bairam
+bairbre
+baird
+bairdfor
+bairdford
+bairdi
+bairin
+bairisch
+bairitsu
+bairitu
+bairn
+bairnie
+bairnish
+bairnishness
+bairnlin
+bairnliness
+bairnly
+bairns
+bairntea
+bairnteam
+bairntim
+bairntime
+bairnwor
+bairnwort
+bairoil
+bairu
+bairyou
+bais
+baisaika
+baisakh
+baisbroo
+baisbrook
+baisden
+baisei
+baiseido
+baiseki
+baisekis
+baisemai
+baisemain
+baisemains
+baisen
+baisenza
+baiser
+baisers
+baishaku
+baishin
+baishins
+baishits
+baishitu
+baisho
+baishoku
+baishou
+baishoug
+baishouk
+baishouy
+baishun
+baishunb
+baishuu
+baishuug
+baisin
+baisinse
+baisitsu
+baisitu
+baiso
+baisoku
+baison
+baisonki
+baisoter
+baissa
+baissaie
+baissaient
+baissais
+baissait
+baissant
+baisse
+baisse'
+baisse'e
+baisse'es
+baisse's
+baisse`r
+baisse`rent
+baissede
+baissedeckungen
+baisseen
+baisseme
+baissemeldungen
+baissen
+baissent
+baisser
+baissera
+baisserai
+baisseraient
+baisserais
+baisserait
+baisseras
+baissere
+baisserez
+baisseri
+baisseriez
+baisserions
+baissero
+baisserons
+baisseront
+baisses
+baissez
+baissier
+baissiers
+baissiez
+baission
+baissions
+baissons
+baister
+baisuu
+baisuuta
+baiswari
+baisyaku
+baisyoku
+baisyou
+baisyun
+baisyunf
+baisyuu
+bait
+baita
+baitadi
+baitai
+baitaifu
+baitarit
+baite
+baited
+baitedo
+baiten
+baiter
+baiters
+baith
+baiti
+baitikai
+baitikak
+baiting
+baito
+baits
+baitsi
+baittle
+baitylos
+baitz
+baiu
+baiuikou
+baiuki
+baiukoro
+baivel
+baiviri
+baiya
+baiyaku
+baiyakuz
+baiyer
+baiyou
+baiyouek
+baiyuu
+baiza
+baizai
+baize
+baizes
+baizin
+baizitsu
+baizituh
+baizou
+baizyou
+baizyuu
+baj
+baja
+baja`
+bajada
+bajadere
+bajaderes
+bajadero
+bajads
+bajah
+bajahama
+bajalani
+bajalato
+bajama
+bajamanero
+bajamano
+bajamar
+bajamente
+bajamiento
+bajan
+bajania
+bajao
+bajar
+bajardo
+bajareque
+bajariga
+bajarigar
+bajas
+bajasen
+bajat
+bajau
+bajaw
+bajaygul
+bajazze
+bajedad
+bajel
+bajelan
+bajelero
+bajeli
+bajema
+bajer
+bajera
+bajero
+bajersk
+bajes
+bajete
+bajez
+bajeza
+bajhangi
+baji`a
+baji`o
+bajial
+bajic
+bajidouf
+bajillo
+bajista
+bajith
+bajitouf
+bajji
+bajo
+bajo`n
+bajoca
+bajocar
+bajocian
+bajon
+bajonado
+bajonazo
+bajoncillo
+bajonet
+bajoneta
+bajonetaanval
+bajonetaanvallen
+bajonets
+bajonetschede
+bajonetscheden
+bajonetscherm
+bajonetschermen
+bajonetschermt
+bajonetsluiting
+bajonetsluitingen
+bajonett
+bajonette
+bajonetten
+bajonetter
+bajonettflansch
+bajonista
+bajoran
+bajorans
+bajotraer
+bajou
+bajoue
+bajoues
+bajpeyi
+bajpuri
+bajra
+bajree
+bajri
+baju
+bajuela
+bajuelo
+bajun
+bajuna
+bajuni
+bajuno
+bajura
+bajurali
+bajury
+bajutsu
+bajutu
+bajuwari
+bajuwarisch
+bajwee
+bajwo
+bajyon
+bajyou
+bajyutsu
+bajyutu
+bak
+baka
+bakaat
+bakabaka
+bakabana
+bakadika
+bakadura
+bakafor
+bakage
+bakagui
+bakagund
+bakagundi
+bakah
+bakairi
+bakaka
+bakaksel
+bakakselen
+bakal
+bakalai
+bakalang
+bakalei
+bakalyan
+bakamono
+bakango
+bakanike
+bakansu
+bakappay
+bakar
+bakarash
+bakarasi
+bakari
+bakary
+bakasawa
+bakase
+bakasyou
+bakat
+bakatan
+bakatiq
+bakawali
+bakawara
+bakay
+bakayaro
+bakayob
+bakazu
+bakbakka
+bakbakkar
+bakbeest
+bakbeesten
+bakbein
+bakbeine
+bakbeinet
+bakboord
+bakboordlicht
+bakboordlichten
+bakboordwacht
+bakboordwachten
+bakboordzij
+bakboordzijde
+bakbuk
+bakbukia
+bakbukiah
+bakbundn
+bakbundne
+bakchich
+bakchichs
+bakd|ren
+bake
+bakebe
+bakeboar
+bakeboard
+baked
+bakedi
+bakedpot
+bakedpotatoe
+bakehous
+bakehouse
+bakel
+bakele
+bakeliet
+bakelieten
+bakelit
+bakelite
+bakelitt
+bakelitten
+bakelize
+bakelse
+bakelsen
+bakely
+bakem
+bakemeat
+bakemeats
+bakemono
+baken
+bakende
+bakenden
+bakenen
+bakenfor
+bakenforliggende
+bakengel
+bakengeld
+bakengelden
+bakenhat
+bakenmee
+bakenmeester
+bakenmeesters
+bakenoka
+bakens
+bakent
+bakentek
+bakenton
+bakentonnen
+bakeoven
+bakepan
+baker
+baker-gr
+baker-gregory
+bakerde
+bakerden
+bakerdom
+bakeren
+bakeress
+bakerhil
+bakerhill
+bakeri
+bakerien
+bakeriene
+bakerier
+bakeries
+bakerite
+bakerkin
+bakerkind
+bakerkinderen
+bakerlau
+bakerlauget
+bakerles
+bakerless
+bakerly
+bakerman
+bakermand
+bakermanden
+bakermat
+bakermes
+bakermester
+bakernaa
+bakernaam
+bakernam
+bakernamen
+bakerpra
+bakerpraatje
+bakerpraatjes
+bakerrij
+bakerrijm
+bakerrijmen
+bakers
+bakersfi
+bakersfield
+bakershi
+bakership
+bakersmi
+bakersmills
+bakerspe
+bakerspeld
+bakerspelden
+bakerspr
+bakersprookje
+bakersprookjes
+bakerssu
+bakerssummit
+bakerst
+bakerste
+bakersto
+bakerstoel
+bakerstoelen
+bakerstown
+bakersvi
+bakersville
+bakert
+bakerton
+bakery
+bakes
+bakeshop
+bakeshops
+bakeston
+bakestone
+bakesyon
+baketh
+baketsu
+baketter
+baketu
+bakevje
+bakevjen
+bakewell
+bakewells
+bakey
+bakfiets
+bakfietsen
+bakfra
+bakgear
+bakgrunn
+bakgrunnen
+bakgrunnshandling
+bakgrunnshandlingen
+bakgrunnsmateriale
+bakgrunnsmaterialet
+bakgrunnsmusikk
+bakgrunnsopplysninger
+bakg}rd
+bakg}rde
+bakg}rden
+bakha
+bakhach
+bakhand
+bakhanda
+bakhchis
+bakhchisaraj
+bakhjul
+bakhjule
+bakhjulene
+bakhjuls
+bakhjulsopphenget
+bakhodet
+bakhold
+bakholde
+bakholdet
+bakhshi
+bakhtara
+bakhtaran
+bakhtari
+bakhtiar
+bakhtiari
+bakhuis
+bakhuize
+bakhuizen
+bakhun
+bakhunen
+bakh}nde
+bakh}nden
+baki
+bakidi
+bakie
+baking
+bakingly
+bakings
+bakise
+bakitan
+bakje
+bakjo
+bakk
+bakka
+bakkai
+bakkaku
+bakkan
+bakkanal
+bakkanalet
+bakkansa
+bakkanso
+bakkant
+bakkari
+bakke
+bakkebaa
+bakkebaard
+bakkebaarden
+bakkehel
+bakkehell
+bakkehellet
+bakkekon
+bakkekontakt
+bakkekontrollen
+bakkelei
+bakkeleide
+bakkeleiden
+bakkeleien
+bakkeleit
+bakkels
+bakkelse
+bakkelsen
+bakkem}l
+bakkem}linger
+bakken
+bakkenbart
+bakkene
+bakkeniv
+bakkeniv}
+bakkepla
+bakkeplanering
+bakker
+bakkerij
+bakkerijen
+bakkerijtje
+bakkerijtjes
+bakkerin
+bakkerinnen
+bakkerinnetje
+bakkerinnetjes
+bakkerne
+bakkers
+bakkersb
+bakkersbedrijf
+bakkersbedrijven
+bakkersbenen
+bakkersbond
+bakkersbonden
+bakkersg
+bakkersgezel
+bakkersgezellen
+bakkersk
+bakkerskar
+bakkerskarren
+bakkersknecht
+bakkersknechten
+bakkersknechts
+bakkerskolen
+bakkerso
+bakkersoven
+bakkersovens
+bakkerss
+bakkersschop
+bakkersschoppen
+bakkerst
+bakkerstor
+bakkerstorren
+bakkerstrog
+bakkerstroggen
+bakkersw
+bakkerswagen
+bakkerswagens
+bakkerswinkel
+bakkerswinkels
+bakkes
+bakkesen
+bakkesta
+bakkestasjon
+bakkestasjonen
+bakkestasjoner
+bakket
+bakkete
+bakketop
+bakketoppen
+bakke|
+bakkin
+bakkinga
+bakkingu
+bakkinto
+bakko
+bakku
+bakkuapp
+bakkum
+bakkumir
+bakkuru
+bakkus
+bakkusdy
+bakkusdyrker
+bakkusdyrkeren
+bakkusu
+bakkutor
+bakkyo
+baklaas
+baklamp
+baklampe
+baklampen
+baklas
+baklava
+baklavas
+baklekse
+baklengs
+bakli
+baklomme
+baklommen
+bakl}s
+bakmeel
+bakmeis
+bakmeisa
+bakmeise
+bakmeisen
+bakmonte
+bakmontert
+bako
+bakoa
+bakoi
+bakoko
+bakola
+bakole
+bakolle
+bakom
+bakombe
+bakon
+bakong
+bakongo
+bakoni
+bakool
+bakoroka
+bakos
+bakosh
+bakossi
+bakota
+bakoti
+bakoua
+bakoury
+bakoven
+bakovens
+bakover
+bakoverl
+bakoverliggende
+bakoverv
+bakovervendt
+bakovi
+bakpan
+bakpanne
+bakpannen
+bakpart
+bakpinka
+bakpoede
+bakpoeder
+bakpoeie
+bakpoeier
+bakpwe
+bakr
+bakre
+bakri
+bakrus
+bakrusen
+bakrusens
+bakruten
+baks
+baksa
+baksalar
+baksalary
+baksan
+bakschis
+bakschisch
+bakse
+baksel
+baksels
+bakseltj
+bakseltje
+bakseltjes
+bakset
+baksete
+baksetet
+baksh
+bakshais
+bakshaish
+bakshees
+baksheesh
+baksheeshes
+bakshi
+bakshish
+bakside
+baksiden
+baksidens
+baksider
+bakskott
+bakskotten
+bakskut
+bakskute
+bakskuten
+baksmaat
+baksmaats
+baksmell
+baksmellen
+baksmeller
+bakspeil
+bakspeilet
+bakspejl
+bakspel
+bakspell
+bakspellen
+bakst
+bakstafe
+bakstafel
+bakstafels
+bakste
+baksteen
+baksteenconstructie
+baksteenconstructies
+bakstehe
+bakstehelle
+bakstekj
+bakstekjerring
+baksten
+bakstene
+bakstenen
+bakster
+bakstill
+bakstilling
+bakstrev
+bakstrevet
+bakt
+bakta
+baktafel
+baktafels
+baktale
+baktanke
+baktapur
+bakte
+bakten
+bakteppe
+bakteppet
+bakteric
+baktericid
+baktericidet
+bakterie
+bakterieangrep
+bakteriefri
+bakterieinfeksjoner
+bakterielle
+bakterien
+bakterientraeger
+bakterier
+bakterio
+bakteriolog
+bakteriologe
+bakteriologen
+bakteriologi
+bakteriologien
+bakteriologisk
+bakti
+baktrien
+baktrienschen
+baktrog
+baktrogg
+baktroggen
+baktun
+baktus
+baku
+bakuba
+bakubaku
+bakuchi
+bakuchik
+bakuchin
+bakuchiu
+bakudadd
+bakudai
+bakudan
+bakudanh
+bakuei
+bakufu
+bakufu-
+bakufu-s
+bakufun
+bakufus
+bakufuu
+bakuga
+bakugato
+bakugeki
+bakugyak
+bakuha
+bakuhats
+bakuhatu
+bakuise
+bakujoui
+bakula
+bakuli
+bakulu
+bakulung
+bakum
+bakumats
+bakumatu
+bakumbar
+bakumbari
+bakumpai
+bakunda
+bakundi
+bakundu
+bakundub
+bakundubalue
+bakundum
+bakundumu
+bakung
+bakunini
+bakuninism
+bakuninist
+bakunkib
+bakunkibungan
+bakuon
+bakupari
+bakurai
+bakurdi
+bakure
+bakurei
+bakurets
+bakuretu
+bakuro
+bakurocy
+bakuron
+bakurore
+bakurou
+bakuroum
+bakurut
+bakuryou
+bakuryuu
+bakusai
+bakusei
+bakushi
+bakushin
+bakushou
+bakushuu
+bakusi
+bakusin
+bakusinc
+bakusint
+bakusou
+bakusui
+bakusyo
+bakusyou
+bakusyuu
+bakut
+bakutaru
+bakutens
+bakuteri
+bakuti
+bakutiku
+bakutin
+bakutiut
+bakuto
+bakutu
+bakuxxid
+bakuyaku
+bakuzen
+bakuzent
+bakvaska
+bakvaske
+bakvaskelser
+bakvasket
+bakveien
+bakvendt
+bakvendte
+bakverk
+bakvis
+bakvisse
+bakvissen
+bakvissentaal
+bakw
+bakwa
+bakwagen
+bakwagens
+bakwe
+bakwedi
+bakwele
+bakweri
+bakwil
+bakwiri
+bakwisso
+bakyaku
+bakyumu
+bakzeil
+bakzeilg
+bakzeilgehaald
+bakzeilgehaalde
+bakzeilgehaalden
+bakzeilh
+bakzeilhaal
+bakzeilhaalde
+bakzeilhaalden
+bakzeilhaalt
+bakzeilhalen
+bak}t
+bal
+bala
+bala/cyn
+bala/cynwyd
+balaabe
+balaaben
+balaam
+balaamit
+balaamite
+balaamitical
+balabac
+balaban
+balabani
+balabanian
+balabio
+balac
+balachan
+balachander
+balachon
+balachong
+balaclav
+balaclava
+balada
+baladan
+balade
+baladema
+balademas
+balader
+balades
+baladeus
+baladeuse
+baladeuses
+baladi`
+baladin
+baladine
+baladins
+baladiya
+baladiyah
+baladiyat
+balador
+baladora
+baladrar
+baladre
+baladrear
+baladrera
+baladrero
+baladro
+baladro`n
+baladrona
+baladronada
+baladronear
+balaena
+balaenic
+balaenicipites
+balaenid
+balaenidae
+balaenoi
+balaenoid
+balaenoidea
+balaenoidean
+balaenop
+balaenoptera
+balaenopteridae
+balaeric
+balaesan
+balaesang
+balafi
+balafo
+balafre
+balafre'
+balafre'e
+balafre'es
+balafre's
+balafrer
+balafres
+balagan
+balagar
+balagariense
+balaghat
+balagnin
+balagnini
+balagre
+balaguer
+balaguero
+balah
+balahaim
+balai
+balai-br
+balai-brosse
+balaiber
+balaiberkuwak
+balaic
+balaie
+balaient
+balaiera
+balaierai
+balaieraient
+balaierais
+balaierait
+balaieras
+balaiere
+balaierez
+balaieri
+balaieriez
+balaierions
+balaiero
+balaierons
+balaieront
+balaies
+balaikar
+balaikarangan
+balais
+balais-b
+balais-brosses
+balaisan
+balaisang
+balait
+balaj
+balaje
+balaji
+balak
+balaklav
+balaklava
+balakot
+balakris
+balakrishna
+balakrishnan
+balalaica
+balalaik
+balalaika
+balalaikaen
+balalaikas
+balalajka
+balali
+balam
+balambu
+balamir
+balan
+balanc/a
+balanc/aient
+balanc/ais
+balanc/ait
+balanc/ant
+balanc/o
+balanc/oire
+balanc/oires
+balanc/ons
+balance
+balance'
+balance'e
+balance'es
+balance's
+balance`
+balance`rent
+balancea
+balanceable
+balanceador
+balanceadora
+balanceakt
+balanceante
+balancear
+balanced
+balancedness
+balancee
+balanceer
+balanceerde
+balanceerden
+balanceerlijn
+balanceerlijnen
+balanceerstok
+balanceerstokken
+balanceert
+balancegang
+balancel
+balancelle
+balancem
+balanceman
+balancement
+balancements
+balancen
+balancent
+balanceo
+balanceofpayments
+balancer
+balancera
+balancerai
+balanceraient
+balancerais
+balancerait
+balanceras
+balancerede
+balanceren
+balancerez
+balanceriez
+balancerions
+balancero
+balancerons
+balanceront
+balancers
+balances
+balancew
+balanceweighing
+balancewise
+balancez
+balanci`n
+balancie
+balancier
+balanciere
+balancieren
+balancierend
+balancierende
+balancierenden
+balancierender
+balancierendes
+balanciers
+balanciert
+balancierte
+balanciertem
+balancierter
+balanciertes
+balanciertest
+balanciez
+balancin
+balancing
+balancings
+balancio
+balancions
+balanda
+balander
+balandra
+balandra`n
+balandrana
+balandrista
+balandro
+balaneut
+balaneutics
+balangan
+balangao
+balangaw
+balangay
+balanger
+balanghe
+balanghein
+balangin
+balangingi
+balangur
+balanguru
+balanian
+balanic
+balanid
+balanida
+balanidae
+balanife
+balaniferous
+balanini
+balanipa
+balanism
+balanite
+balanites
+balaniti
+balanitis
+balanka
+balanobl
+balanoblennorrhea
+balanoce
+balanocele
+balanogl
+balanoglossida
+balanoglossus
+balanoid
+balanoph
+balanophora
+balanophoraceae
+balanophoraceous
+balanophore
+balanophorin
+balanopl
+balanoplasty
+balanopo
+balanoposthitis
+balanopr
+balanopreputial
+balanops
+balanopsidaceae
+balanopsidales
+balanorr
+balanorrhagia
+balans
+balansbo
+balansboek
+balansboeken
+balanse
+balanseg
+balansegang
+balansek
+balansekonto
+balansekunstner
+balansen
+balanser
+balansere
+balanserer
+balanseres
+balansert
+balanserte
+balansge
+balansgesprek
+balansgesprekken
+balansop
+balansopruiming
+balansopruimingen
+balansre
+balansrekening
+balansrekeningen
+balanswa
+balanswaarde
+balanswaarden
+balant
+balanta
+balantak
+balante
+balantga
+balantganja
+balantia
+balantian
+balantiang
+balantid
+balantidial
+balantidiasis
+balantidic
+balantidiosis
+balantidium
+balanus
+balanza
+balanzar
+balanzario
+balanzo
+balanzo`n
+balao
+balar
+balarama
+balarrasa
+balas
+balasa
+balascak
+balasing
+balasingam
+balaski
+balasko
+balasore
+balastar
+balasto
+balasubr
+balat
+balata
+balatchi
+balate
+balaton
+balatong
+balatron
+balatronic
+balatum
+balau
+balaure
+balausta
+balausti
+balaustine
+balaustr
+balaustra
+balaustrada
+balaustrado
+balaustral
+balaustre
+balaustreri`a
+balaustriada
+balaustriado
+balavu
+balawa
+balawaia
+balawan
+balawu
+balay
+balaya
+balayage
+balayaie
+balayaient
+balayais
+balayait
+balayant
+balaye
+balaye'
+balaye'e
+balaye'es
+balaye's
+balaye`r
+balaye`rent
+balayent
+balayer
+balayera
+balayerai
+balayeraient
+balayerais
+balayerait
+balayeras
+balayere
+balayerez
+balayeri
+balayeriez
+balayerions
+balayero
+balayerons
+balayeront
+balayes
+balayett
+balayette
+balayettes
+balayeur
+balayeurs
+balayeus
+balayeuse
+balayeuses
+balayez
+balayiez
+balayion
+balayions
+balayons
+balazo
+balazs
+balbalas
+balbalasang
+balbetta
+balbettai
+balbettano
+balbettare
+balbettata
+balbettate
+balbettati
+balbettato
+balbettava
+balbettavi
+balbettavo
+balbette
+balbettera
+balbettero
+balbetti
+balbettino
+balbetto
+balbir
+balbo
+balboa
+balboas
+balboekj
+balboekje
+balboekjes
+balbrick
+balbricker
+balbrigg
+balbriggan
+balbucear
+balbucencia
+balbuceo
+balbuciente
+balbucin
+balbucinate
+balbucir
+balbusardo
+balbutia
+balbutiaient
+balbutiais
+balbutiait
+balbutiant
+balbutiante
+balbutiantes
+balbutiants
+balbutiate
+balbutie
+balbutie'
+balbutie'e
+balbutie'es
+balbutie's
+balbutie`rent
+balbutiement
+balbutiements
+balbutient
+balbutier
+balbutiera
+balbutierai
+balbutieraient
+balbutierais
+balbutierait
+balbutieras
+balbutierez
+balbutieriez
+balbutierions
+balbutierons
+balbutieront
+balbuties
+balbutiez
+balbutii
+balbutiiez
+balbutiions
+balbutio
+balbutions
+balbuzia
+balbuzie
+balca`nica
+balca`nico
+balcarrotas
+balcerza
+balcerzak
+balch
+balchimo
+balchows
+balchowsky
+balck
+balco`n
+balcom
+balcombe
+balcon
+balconada
+balconaje
+balconcillo
+balcone
+balconeri`a
+balconet
+balconi
+balconie
+balconied
+balconies
+balcons
+balcony
+balcostu
+balcostume
+balczo
+bald
+balda
+baldacch
+baldacchino
+baldacci
+baldaccini
+baldachi
+baldachin
+baldachined
+baldachini
+baldachino
+baldachins
+baldada
+baldadig
+baldadige
+baldadiger
+baldadigheden
+baldadigheid
+baldadigst
+baldado
+baldadura
+baldakij
+baldakijn
+baldakijnen
+baldakijns
+baldakin
+baldam
+baldamiento
+baldamu
+baldanza
+baldanze
+baldanzo
+baldanzosa
+baldanzose
+baldanzosi
+baldanzoso
+baldaqui
+baldaquin
+baldaquino
+baldar
+baldaro
+baldassa
+baldassare
+baldavin
+baldberr
+baldberry
+baldcrow
+baldcrown
+balde
+balde`s
+baldear
+balded
+balden
+baldeo
+balder
+baldera
+balderbr
+balderbr}
+balderbr}a
+balderbr}en
+balderda
+balderdash
+balderde
+balderden
+balderen
+baldero
+balderst
+balderston
+baldessa
+baldessari
+baldest
+baldev
+baldface
+baldfaced
+baldhead
+baldheads
+baldi`a
+baldi`amente
+baldi`o
+baldicoo
+baldicoot
+baldie
+baldieri
+baldig
+baldige
+baldigen
+baldiger
+baldiges
+baldin
+balding
+baldini
+baldish
+baldknob
+baldling
+baldly
+baldmo"g
+baldmo"glichen
+baldmo"glichst
+baldmoeg
+baldmoeglichen
+baldmoeglichsten
+baldmone
+baldmoney
+baldness
+baldo
+baldo`n
+baldock
+baldona
+baldonada
+baldonadamente
+baldonado
+baldonador
+baldonadora
+baldonamiento
+baldonar
+baldonear
+baldono
+baldor
+baldoria
+baldorie
+baldosa
+baldosador
+baldosar
+baldosi`n
+baldoso`n
+baldpate
+baldpates
+baldragas
+baldre`s
+baldrib
+baldric
+baldrick
+baldricked
+baldricks
+baldrics
+baldricw
+baldricwise
+baldridg
+baldridge
+baldry
+balds
+balducci
+balductu
+balductum
+balduin
+balduinu
+balduinus
+balduque
+baldur
+baldvin
+baldwin
+baldwinc
+baldwincity
+baldwinp
+baldwinpark
+baldwinplace
+baldwins
+baldwinsville
+baldwinv
+baldwinville
+baldwyn
+baldy
+baldyre
+bale
+bale's
+bale-bal
+bale-bale
+bale-bale's
+bale`nido
+balea
+balea`rica
+balea`rico
+balear
+balearen
+baleares
+balearia
+balearian
+balearic
+balearica
+baleario
+baled
+baleen
+baleens
+balefire
+balefires
+baleful
+balefull
+balefully
+balefuln
+balefulness
+balegete
+baleh
+balei
+balein
+baleine
+baleinea
+baleineau
+baleineaux
+baleinen
+baleines
+baleinie
+baleinie`re
+baleinie`res
+baleinier
+baleiniers
+baleintj
+baleintje
+baleintjes
+baleise
+baleje
+baleless
+balen
+balena
+balenai
+balenamm
+balenammo
+balenand
+balenando
+balenano
+balenare
+balenaro
+balenarono
+balenass
+balenasse
+balenassi
+balenast
+balenaste
+balenasti
+balenata
+balenate
+balenati
+balenato
+balenava
+balenavamo
+balenavano
+balenavate
+balenavi
+balenavo
+balenda
+balendru
+balene
+balenera
+balenerai
+balenere
+balenerei
+baleneremo
+balenerete
+balenero
+balengou
+baleni
+baleniam
+baleniamo
+baleniat
+baleniate
+balenino
+baleno
+baleo
+balep
+balepa
+baler
+baleri`a
+baleri`o
+balerie
+balero
+balers
+bales
+balese
+balessin
+balessing
+balestra
+balestrand
+balestre
+balestrero
+balet
+baleta
+balete
+baletha
+balethi
+balett
+balevana
+balford
+balfour
+balg
+balgalvi
+balgalvis
+balgen
+balgo
+balgobin
+balgu
+balhoofd
+balhoofden
+balhurria
+bali
+bali`n
+bali`stica
+bali`stico
+balia
+baliba
+balibago
+balibunt
+balibuntal
+balibuntl
+balido
+balie
+baliede
+balieden
+balieff
+balieklu
+baliekluiver
+baliekluivers
+baliem
+balieman
+baliemand
+baliemanden
+baliemed
+baliemedewerkers
+baliemol
+baliemolen
+baliemolens
+balies
+baliet
+baliewel
+baliewelsprekendheid
+balif
+baligam
+baligans
+baligansin
+baligash
+baligashu
+balignin
+balignini
+balija
+balije
+balijen
+balijes
+balikato
+balikatoriko
+balikesi
+balikesir
+balikpap
+balikpapan
+balikumb
+balikumbat
+balilla
+balimbi`n
+balimo
+balin
+baline
+balinees
+balineest
+balinese
+balineser
+balineze
+balinezen
+baling
+balinger
+balingha
+balinghasay
+balingia
+balingian
+balinski
+balint
+balintan
+balintang
+balios
+balisa
+balisage
+balisages
+balisaie
+balisaient
+balisais
+balisait
+balisant
+balisasa
+balisasak
+balisaur
+balisch
+balische
+balischer
+balischt
+balise
+balise'
+balise'e
+balise'es
+balise's
+balise`r
+balise`rent
+balisent
+baliser
+balisera
+baliserai
+baliseraient
+baliserais
+baliserait
+baliseras
+balisere
+baliserez
+baliseri
+baliseriez
+baliserions
+balisero
+baliserons
+baliseront
+balises
+balisez
+balisiez
+balision
+balisions
+balisons
+balista
+balistan
+balistar
+balistarius
+balister
+balistes
+balistid
+balistidae
+balistiq
+balistique
+balistiques
+balistra
+balistraria
+balita
+balitadera
+balitar
+balitear
+baliveau
+baliveaux
+balivern
+baliverne
+balivernes
+balivitu
+baliwon
+baliza
+balizamiento
+balizar
+baljapon
+baljaponnen
+balje
+baljen
+baljinde
+baljinder
+baljuw
+baljuws
+baljuwsc
+baljuwschap
+baljuwschappen
+balk
+balkan
+balkanic
+balkanis
+balkaniser
+balkaniz
+balkanization
+balkanize
+balkanized
+balkanizing
+balkanke
+balkanker
+balkankers
+balkankr
+balkankrieg
+balkanla
+balkanlaender
+balkanlandene
+balkanpa
+balkanpakt
+balkans
+balkar
+balkarts
+balkartsalakan
+balked
+balken
+balkenan
+balkenanzeige
+balkenbr
+balkenbrij
+balkenda
+balkendarstellung
+balkenfo
+balkenform
+balkenho
+balkenhol
+balkenle
+balkenlettern
+balkennu
+balkennumerierung
+balkens
+balkenwa
+balkenwaage
+balkenzo
+balkenzoldering
+balkenzolderingen
+balker
+balkers
+balkh
+balkier
+balkiest
+balkijze
+balkijzer
+balkijzers
+balkily
+balkin
+balkines
+balkiness
+balking
+balkingl
+balkingly
+balkis
+balkisso
+balkissoon
+balklaag
+balklage
+balklagen
+balkleed
+balklere
+balkleren
+balkline
+balko
+balkon
+balkonen
+balkonfe
+balkonfenster
+balkong
+balkonge
+balkongen
+balkonger
+balkonka
+balkonkamer
+balkonkamers
+balkonne
+balkonnetje
+balkonnetjes
+balkons
+balkostu
+balkostuum
+balkostuums
+balkrish
+balkrishna
+balks
+balkt
+balkte
+balkten
+balky
+ball
+ball-tra
+ball-trap
+ball-traps
+balla
+ballabil
+ballabile
+ballabili
+ballacio`n
+ballad
+ballade
+balladee
+balladeer
+balladeers
+balladen
+balladendichter
+balladendichters
+ballader
+balladeroyal
+ballades
+balladev
+balladevorm
+balladevormen
+balladic
+balladical
+balladie
+balladier
+balladis
+balladism
+balladist
+balladiz
+balladize
+balladli
+balladlike
+balladling
+balladmo
+balladmonger
+balladmongering
+balladri
+balladries
+balladry
+ballads
+balladwi
+balladwise
+ballahoo
+ballai
+ballam
+ballammo
+ballan
+ballanc
+ballance
+ballando
+ballanna
+ballannahme
+ballano
+ballant
+ballante
+ballantes
+ballanti
+ballantine
+ballants
+ballar
+ballarat
+ballard
+ballare
+ballarin
+ballarina
+ballaron
+ballarono
+ballarte
+ballarti
+ballartisten
+ballasko
+ballasse
+ballassero
+ballassi
+ballassimo
+ballast
+ballasta
+ballastage
+ballastb
+ballastbed
+ballastbedden
+ballaste
+ballasted
+ballasten
+ballaster
+ballastes
+ballasti
+ballastie`re
+ballastie`res
+ballasting
+ballastr
+ballastreis
+ballastreizen
+ballasts
+ballastschepen
+ballastschip
+ballastt
+ballasttank
+ballastte
+ballastten
+ballata
+ballate
+ballati
+ballato
+ballatoo
+ballatoon
+ballator
+ballatore
+ballava
+ballavam
+ballavamo
+ballavan
+ballavano
+ballavat
+ballavate
+ballavi
+ballavo
+ballbesu
+ballbesucher
+ballblom
+ballblommen
+balldame
+balldom
+ballduel
+ballduelle
+balle
+balled
+ballefoy
+ballen
+ballena
+ballenato
+ballene
+ballener
+ballenera
+ballenero
+ballenge
+ballengee
+ballenger
+ballens
+ballenti
+ballentine
+balleny
+baller
+ballera
+ballerai
+balleran
+balleranno
+ballereb
+ballerebbe
+ballerei
+ballerem
+balleremmo
+balleremo
+balleres
+ballereste
+balleresti
+balleret
+ballerete
+ballerin
+ballerina
+ballerina's
+ballerinas
+ballerine
+ballerinen
+ballerines
+ballerini
+ballerino
+ballero
+ballers
+ballert
+ballerup
+balles
+ballesta
+ballestada
+ballestazo
+balleste
+ballesteador
+ballestear
+ballester
+ballestera
+ballesteri`a
+ballestero
+ballestilla
+ballesto`n
+ballestrinque
+ballet
+balletda
+balletdanser
+balletdanseres
+balletdanseressen
+balletdansers
+balletic
+balletje
+balletjes
+balletme
+balletmeester
+balletmeesters
+balletmu
+balletmuziek
+balletom
+balletomane
+balletomanes
+ballets
+ballett
+balletta
+ballettabende
+ballettaenzerin
+ballettaenzerinnen
+ballettaenzern
+ballettc
+ballettchef
+ballettd
+ballettdirektoren
+ballette
+balletten
+ballettene
+ballettes
+ballettf
+ballettfilmen
+ballettl
+ballettleistungen
+ballettleiter
+ballettm
+ballettmaessig
+ballettmeister
+ballettmusik
+ballettp
+ballettpartituren
+ballettr
+ballettratten
+ballettromantik
+ballettroppen
+ballettw
+ballettwettbewerb
+ballew
+ballfiel
+ballfield
+ballgese
+ballgesellschaft
+ballgown
+ballgowns
+ballgrou
+ballground
+ballhaus
+ballhausplatz
+balli
+balliamo
+balliate
+ballico
+ballier
+ballin
+balling
+ballinge
+ballingen
+ballinger
+ballings
+ballingschap
+ballini
+ballino
+balliol
+ballios
+ballist
+ballista
+ballistae
+ballisti
+ballistic
+ballistically
+ballistician
+ballisticians
+ballistics
+ballistiek
+ballistik
+ballistische
+ballistite
+ballisto
+ballistocardiograph
+ballium
+balljung
+balljungen
+ballklei
+ballkleider
+ballkleidern
+ballkleides
+ballklub
+ballklubben
+ballmine
+ballnach
+ballnacht
+ballnaec
+ballnaechte
+ballo
+balloche
+ballochet
+balloene
+balloenen
+ballogan
+ballon
+ballon-s
+ballon-sonde
+ballonba
+ballonband
+ballonbanden
+ballonet
+ballonfa
+ballonfahrerin
+ballonfl
+ballonflug
+ballong
+ballonge
+ballongen
+ballongf
+ballongferd
+ballongfoersaeljare
+ballongforsaljare
+ballongf|rs{ljare
+ballonmu
+ballonmuetze
+ballonne
+ballonne'
+ballonne'e
+ballonne'es
+ballonne's
+ballonnement
+ballonnements
+ballonner
+ballonnet
+ballonnetje
+ballonnetjes
+ballonnets
+ballonpr|ve
+ballons
+ballons-
+ballons-sondes
+ballonsa
+ballonsatellit
+balloon
+balloona
+balloonation
+balloone
+ballooned
+ballooner
+ballooners
+balloonery
+balloonet
+balloonf
+balloonfish
+balloonflower
+balloonful
+ballooni
+ballooning
+balloonish
+balloonist
+balloonl
+balloonlike
+balloons
+ballopti
+balloptikon
+balloptikonet
+ballot
+ballota
+ballotad
+ballotade
+ballotag
+ballotage
+ballotages
+balloted
+ballotee
+balloteer
+balloteerde
+balloteerden
+balloteert
+balloter
+balloteren
+balloters
+ballotin
+balloting
+ballotis
+ballotist
+ballots
+ballotta
+ballottable
+ballottage
+ballottages
+ballottaient
+ballottais
+ballottait
+ballottant
+ballotte
+ballotte'
+ballotte'e
+ballotte'es
+ballotte's
+ballotte`rent
+ballottement
+ballottements
+ballottent
+ballotter
+ballottera
+ballotterai
+ballotteraient
+ballotterais
+ballotterait
+ballotteras
+ballotterez
+ballotteriez
+ballotterions
+ballotterons
+ballotteront
+ballottes
+ballottez
+ballotti
+ballottiez
+ballottions
+ballotto
+ballottons
+ballou
+ballouvi
+ballouville
+ballow
+ballpark
+ballparks
+ballpass
+ballpassagen
+ballplat
+ballplatz
+ballplay
+ballplayer
+ballplayers
+ballpoin
+ballpoint
+ballpoints
+ballproo
+ballproof
+ballroom
+ballrooms
+balls
+ballsaal
+ballsaales
+ballsael
+ballsaele
+ballsal
+ballsale
+ballsalene
+ballsbri
+ballsbridge
+ballspie
+ballspiele
+ballspielen
+ballspielplatz
+ballstoc
+ballstock
+ballston
+ballstonlake
+ballstonspa
+ballt
+ballte
+ballten
+ballucho
+balluchon
+balluchons
+ballueca
+balluff
+ballung
+ballungs
+ballungsgebiete
+ballungsraeume
+ballungszentrum
+ballup
+ballute
+ballutes
+ballvirt
+ballvirtuosen
+ballwech
+ballwechsel
+ballweed
+ballwin
+ballwurf
+ballwurfmaschinen
+bally
+ballyhac
+ballyhack
+ballyhoo
+ballyhooed
+ballyhooer
+ballyhooing
+ballyhoos
+ballyk
+ballymen
+ballymena
+ballymon
+ballymoney
+ballynoy
+ballyrag
+ballywac
+ballywack
+ballywra
+ballywrack
+balm
+balmacaa
+balmacaan
+balmarco
+balmarcodes
+balmased
+balmaseda
+balmasqu
+balmasque
+balmat
+balmawha
+balmawhapple
+balme
+balmer
+balmie
+balmier
+balmiest
+balmiki
+balmily
+balmines
+balminess
+balmlike
+balmony
+balmoral
+balmorals
+balmorhe
+balmorhea
+balms
+balmvill
+balmville
+balmy
+balne'ai
+balne'aire
+balne'aires
+balneal
+balnearia
+balneario
+balneary
+balneati
+balneation
+balneato
+balneatory
+balneogr
+balneographer
+balneography
+balneolo
+balneologic
+balneological
+balneologist
+balneology
+balneoph
+balneophysiology
+balneote
+balneotechnics
+balneoterapia
+balneoth
+balneotherapeutics
+balneotherapia
+balneotherapy
+balnet
+balnette
+balnetten
+balnibar
+balnibarbi
+balo`n
+balobo
+balocchi
+balocco
+baloch
+balochi
+balochis
+balochistan
+baloci
+balog
+baloga
+balogh
+baloghia
+baloh
+baloi
+baloki
+balolo
+balom
+balon
+baloncesto
+balondo
+balonea
+baloney
+baloneys
+balong
+balonne
+baloo
+baloptic
+balopticon
+balor
+balorda
+balorde
+balordi
+balordo
+balorig
+balorige
+baloriger
+balorigh
+balorigheid
+balorigs
+balorigst
+baloskio
+baloskion
+baloskionaceae
+balota
+balotada
+balotar
+baloum
+balourd
+balourdi
+balourdise
+balourds
+balow
+balpacic
+balpetre
+balqa
+balr
+balraj
+balrog
+balroos
+balrozen
+bals
+balsa
+balsa`mica
+balsa`mico
+balsadera
+balsadero
+balsalik
+balsalike
+balsam
+balsamar
+balsamat
+balsamation
+balsame
+balsamea
+balsameaceae
+balsameaceous
+balsamed
+balsamen
+balsamer
+balsamera
+balsamere
+balsamerede
+balsameret
+balsamering
+balsamerita
+balsamert
+balsamerte
+balsamgr
+balsamgrove
+balsami`a
+balsamic
+balsamical
+balsamically
+balsamie
+balsamiek
+balsamieke
+balsamieker
+balsamiekst
+balsamif
+balsamiferous
+balsamin
+balsamina
+balsamina`cea
+balsamina`ceo
+balsaminaceae
+balsaminaceous
+balsamine
+balsaminen
+balsaming
+balsamisk
+balsamit
+balsamita
+balsamitic
+balsamiticness
+balsamiz
+balsamize
+balsamla
+balsamlake
+balsamo
+balsamod
+balsamodendron
+balsamor
+balsamorrhiza
+balsamou
+balsamous
+balsamro
+balsamroot
+balsams
+balsamum
+balsamwe
+balsamweed
+balsamy
+balsan
+balsapue
+balsapuertino
+balsar
+balsas
+balsawoo
+balsawood
+balschoe
+balschoen
+balschoenen
+balsear
+balsem
+balsemac
+balsemachtig
+balsemachtige
+balsemachtiger
+balsemachtigst
+balsembo
+balsembomen
+balsemboom
+balsemde
+balsemden
+balsemen
+balsemge
+balsemgeur
+balsemgeuren
+balsemie
+balsemiek
+balsemieke
+balsemieker
+balsemiekst
+balsemien
+balsemienen
+balsemin
+balseming
+balsemingen
+balsems
+balsemt
+balser
+balsero
+balsete
+balso
+balsopeto
+balspel
+balspele
+balspelen
+balster
+balsturi
+balsturig
+balsturige
+balsturiger
+balsturigheid
+balsturigst
+balstyri
+balstyrig
+balstyrisk
+balstyriske
+balt
+balta
+baltagi
+baltap
+baltapla
+baltaplalin
+baltasar
+baltazar
+balte
+baltegn
+baltei
+balten
+balter
+baltes
+balteus
+balthasa
+balthasar
+balthaza
+balthazar
+balti
+baltic
+balticum
+baltikum
+baltimor
+baltimore
+baltimorean
+baltimorite
+baltis
+baltisch
+baltischen
+baltisk
+baltiske
+baltista
+baltistan
+baltistani
+balto
+baltodan
+baltodano
+baltofin
+baltofinnic
+baltra
+baltus
+baltz
+balu
+baluan
+baluanpa
+baluanpam
+baluardi
+baluardo
+baluarte
+baluba
+baluch
+baluches
+baluchestan
+baluchi
+baluchis
+baluchistan
+baluchit
+baluchithere
+baluchitheria
+baluchitherium
+baluchon
+baluchons
+baluci
+balud
+balue
+baluga
+balui
+baluma
+balumba
+balumbo
+balume
+balunda
+balundu
+balundub
+balundubima
+balung
+baluombi
+baluombila
+balurbi
+balushai
+baluster
+balustered
+balusters
+balustra
+balustrade
+balustraded
+balustraden
+balustrader
+balustrades
+balustrading
+balut
+balutin
+balutis
+balvinde
+balvinder
+balwa
+balwarra
+balwinde
+balwinder
+balxarca
+balxarcalakan
+balygu
+balza
+balzaal
+balzac
+balzacia
+balzacian
+balzai
+balzak
+balzakke
+balzakken
+balzalen
+balzammo
+balzando
+balzano
+balzare
+balzarin
+balzarine
+balzaron
+balzarono
+balzasse
+balzassero
+balzassi
+balzassimo
+balzaste
+balzasti
+balzata
+balzate
+balzati
+balzato
+balzava
+balzavam
+balzavamo
+balzavan
+balzavano
+balzavat
+balzavate
+balzavi
+balzavo
+balze
+balzer
+balzera
+balzerai
+balzeran
+balzeranno
+balzereb
+balzerebbe
+balzerei
+balzerem
+balzeremmo
+balzeremo
+balzeres
+balzereste
+balzeresti
+balzeret
+balzerete
+balzero
+balzers
+balzi
+balziamo
+balziate
+balzino
+balzo
+balzverh
+balzverhalten
+bam
+bam*
+bama
+bamachak
+bamachaka
+bamaga
+bamah
+bamaha
+bamaipa
+bamako
+bamali
+bamalip
+bamambu
+bamana
+bamanaka
+bamanakan
+bamangwa
+bamangwato
+bamassa
+bamattre
+bamba
+bambaama
+bambacel
+bambacelli
+bambach
+bambala
+bambalan
+bambalang
+bambalear
+bambalina
+bambalino`n
+bambama
+bambami
+bamban
+bambanear
+bambang
+bambani
+bambara
+bambaro
+bambarria
+bambarrio`n
+bambeiro
+bambele
+bamberg
+bamberg-
+bamberg-emh1
+bamberga
+bamberge
+bamberger
+bambesa
+bambeshi
+bambi
+bambie
+bambili
+bambin
+bambina
+bambine
+bambini
+bambino
+bambinos
+bambins
+bamble
+bambo
+bambocci
+bambocciade
+bambochada
+bamboche
+bambocher
+bamboe
+bamboeri
+bamboeriet
+bamboes
+bamboest
+bamboestengel
+bamboestengels
+bamboestoel
+bamboestoelen
+bamboestok
+bamboestokken
+bamboeze
+bamboezen
+bamboko
+bambola
+bambolan
+bambolang
+bambole
+bambolear
+bamboleo
+bambolla
+bambollera
+bambollero
+bamboma
+bambonear
+bamboneo
+bamboo
+bamboos
+bamboozl
+bamboozle
+bamboozled
+bamboozlement
+bamboozler
+bamboozlers
+bamboozles
+bamboozling
+bambos
+bambou
+bamboula
+bambous
+bamboute
+bambouto
+bamboutos
+bamboy
+bambu`
+bambuba
+bambuc
+bambuco
+bambui
+bambuka
+bambuku
+bambuluw
+bambuluwe
+bambur
+bamburo
+bambus
+bambusa
+bambusea
+bambuseae
+bambusen
+bambusm}tte
+bambusr|r
+bambusskud
+bambusst
+bambusstav
+bambusstaven
+bambusstenger
+bambute
+bambutu
+bamby
+bame
+bamechom
+bamei
+bameka
+bamekon
+bamen
+bamena
+bamenda
+bamendji
+bamendjin
+bamendjina
+bamendjinda
+bamendjing
+bamendjo
+bamendjou
+bamenkou
+bamenkoumbit
+bamennyu
+bamenyam
+bamenyan
+bamessin
+bamessing
+bamessingue
+bamesso
+bameta
+bamete
+bamf
+bamfo
+bamford
+bamfylde
+bami
+bamian
+bamianka
+bamiankaw
+bamiga
+bamileke
+bamilekemedumba
+bamingam
+baminge
+bamingui
+baminguibangoran
+bamis
+bamispac
+bamispacht
+bamispru
+bamispruim
+bamispruimen
+bamiswee
+bamisweer
+bamitaba
+bamnyo
+bamoko
+bamongo
+bamota
+bamoth
+bamothba
+bamothbaal
+bamougou
+bamougoumbamenjou
+bamoukou
+bamoukoumbit
+bamoum
+bamoun
+bamoungo
+bamoungong
+bamps
+bamschab
+bamschabl
+bamse
+bamsen
+bamtooth
+bamu
+bamukumb
+bamukumbit
+bamum
+bamumbo
+bamumbu
+bamun
+bamundum
+bamunka
+bamunkum
+bamunkun
+bamusso
+bamustu
+bamvele
+bamvuba
+bamwe
+bamyili
+bamyuda
+ban
+ban[japa
+ban[japanese]
+bana
+banaadir
+banaal
+banaalst
+banaan
+banaanbo
+banaanbomen
+banaanboom
+banaantj
+banaantje
+banaantjes
+banaat
+banaba
+banach
+banachie
+banachiewicza
+banadan
+banaei
+banafo
+banag
+banagere
+banago
+banahel
+banai
+banak
+banaka
+banakite
+banakiya
+banal
+banala
+banale
+banalem
+banalen
+banaler
+banales
+banali
+banalia
+banalisa
+banalisaient
+banalisais
+banalisait
+banalisant
+banalise
+banalise'
+banalise'e
+banalise'es
+banalise's
+banalise`rent
+banalisent
+banaliser
+banalisera
+banaliserai
+banaliseraient
+banaliserais
+banaliserait
+banaliseras
+banalisere
+banaliserez
+banaliseriez
+banaliserions
+banaliserons
+banaliseront
+banaliserte
+banalises
+banalisez
+banalisi
+banalisiez
+banalisions
+banaliso
+banalisons
+banalita
+banalitaet
+banalitaeten
+banalite
+banalite'
+banalite's
+banaliteit
+banaliteiten
+banalitet
+banaliteten
+banaliteter
+banaliti
+banalities
+banality
+banally
+banals
+banalt
+banamba
+banan
+banana
+bananal
+bananala
+bananaland
+bananalander
+bananana
+bananananananana
+bananar
+bananas
+bananash
+bananashaped
+banande
+banane
+bananebo
+bananebomen
+bananeboom
+bananen
+bananenl
+bananenladung
+bananenm
+bananenmeel
+bananenp
+bananenparadiese
+bananenr
+bananenrepublik
+bananenrepublikanische
+bananer
+bananera
+bananeraie
+bananeraies
+bananero
+bananes
+bananesc
+bananeschil
+bananeschillen
+banang
+bananier
+bananiers
+bananist
+bananivo
+bananivorous
+bananna
+banano
+bananstik
+banao
+banapari
+banaphar
+banaphari
+banar
+banara
+banaran
+banare
+banaro
+banas
+banashi
+banasi
+banasta
+banastera
+banastero
+banasto
+banaszak
+banat
+banate
+banaten
+banatite
+banaua
+banaue
+banaule
+banausen
+banausentum
+banausic
+banava
+banavosa
+banawa
+banba
+banbaken
+banban
+banbana
+banbanza
+banbeskr
+banbeskrivning
+banbeskrivningen
+banbetsu
+banbetu
+banbliks
+banbliksem
+banbliksems
+banbreuk
+banbreuken
+banbridg
+banbridge
+banbryta
+banbrytande
+banbrytare
+banbrytaren
+banbu
+banbury
+banbutsu
+banbutu
+banbutur
+banc
+banca
+bancable
+bancables
+bancada
+bancaire
+bancaires
+bancal
+bancale
+bancalero
+bancales
+bancals
+bancari
+bancaria
+bancarie
+bancario
+bancarot
+bancarotta
+bancarotte
+bancarrota
+bance
+bancha
+banchamo
+banche
+banchell
+banchelli
+bancher
+banchett
+banchetti
+banchetto
+banchi
+banchina
+banchine
+banchmar
+banchmark
+banchong
+banchou
+bancilho
+bancilhon
+banco
+bancocracia
+banconot
+banconota
+banconote
+bancos
+bancroft
+bancrost
+bancs
+bancus
+bancyou
+band
+band		
+banda
+bandaban
+bandabanda
+bandada
+bandado
+bandaela
+bandaelat
+bandaeli
+bandage
+bandaged
+bandagen
+bandager
+bandagers
+bandages
+bandagie
+bandagiere
+bandagieren
+bandagierende
+bandagierendem
+bandagierenden
+bandagierendes
+bandagierst
+bandagiert
+bandagiertem
+bandagierten
+bandagierter
+bandagiertest
+bandagiertet
+bandagin
+bandaging
+bandagis
+bandagist
+bandagisten
+bandai
+bandaiat
+bandaid
+bandaifu
+bandaihi
+bandaima
+bandaisa
+bandaite
+bandaka
+bandakay
+bandakaya
+bandakpa
+bandakpaya
+bandal
+bandala
+bandalor
+bandalore
+bandama
+bandana
+bandanas
+bandande
+bandandele
+bandanla
+bandanlage
+bandanlagen
+bandanna
+bandannaed
+bandannas
+bandano
+bandanos
+bandar
+bandaran
+bandaranaike
+bandarba
+bandarban
+bandare
+bandarlo
+bandarlog
+bandarria
+bandas
+bandasje
+bandasjen
+bandasjere
+bandasjert
+bandasjerte
+bandasji
+bandasjist
+bandasjisten
+bandaufn
+bandaufnahme
+bandawa
+bandawam
+bandawaminda
+bandawe
+bandazo
+bandbox
+bandboxe
+bandboxes
+bandboxi
+bandboxical
+bandboxy
+bandbred
+bandbredde
+bandbrei
+bandbreite
+bandbreiten
+bandbulle
+bandcase
+bandcutt
+bandcutter
+bande
+bandeada
+bandeado
+bandear
+bandeau
+bandeaus
+bandeaux
+banded
+bandeenh
+bandeenheid
+bandeja
+bandejador
+bandejadora
+bandejar
+bandel
+bandelet
+bandelette
+bandelettes
+bandelie
+bandelier
+bandelieren
+bandeliers
+bandello
+bandeloo
+bandeloos
+bandeloosheid
+bandeloost
+bandeloz
+bandeloze
+bandelozer
+bandem
+bandema
+bandemba
+bandemer
+banden
+bandench
+bandenchef
+bandendo
+bandene
+bandeng
+bandenmi
+bandenmitglieder
+bandens
+bandensy
+bandensystem
+bandepec
+bandepech
+bander
+bandera
+banderado
+bandereta
+banderi`a
+banderi`n
+banderil
+banderilla
+banderilla's
+banderillazo
+banderille
+banderillear
+banderillero
+banderillero's
+banderilles
+banderiza
+banderizamente
+banderizar
+banderizo
+banderma
+bandero
+banderol
+banderola
+banderole
+banderoles
+banderolleer
+banderolleerde
+banderolleerden
+banderolleert
+banderollen
+banderolleren
+banders
+bandersn
+bandersnatch
+bandes
+bandet
+bandfabr
+bandfabrik
+bandfish
+bandfo"r
+bandfo"rderer
+bandfo"rderers
+bandfoer
+bandfoerderer
+bandgap
+bandgeda
+bandgedaante
+bandhava
+bandhond
+bandhonden
+bandhook
+bandhor
+bandhu
+bandi
+bandi`n
+bandiaga
+bandiagara
+bandial
+bandiamo
+bandiate
+bandicoo
+bandicoot
+bandicoots
+bandicoy
+bandida
+bandidaje
+bandido
+bandie
+bandied
+bandiera
+bandiere
+bandies
+bandiet
+bandiete
+bandieten
+bandietenbende
+bandietenbenden
+bandietenbendes
+bandietenstreek
+bandietenstreken
+bandietentroep
+bandietentroepen
+bandii
+bandijk
+bandijke
+bandijken
+bandijze
+bandijzer
+bandikai
+bandimmo
+bandines
+bandiness
+banding
+bandini
+bandir
+bandira
+bandirai
+bandiran
+bandiranno
+bandire
+bandireb
+bandirebbe
+bandirei
+bandirem
+bandiremmo
+bandiremo
+bandires
+bandireste
+bandiresti
+bandiret
+bandirete
+bandiro
+bandiron
+bandirono
+bandisca
+bandisce
+bandisci
+bandisco
+bandiscono
+bandisse
+bandissero
+bandissi
+bandissimo
+bandiste
+bandisti
+bandit
+bandita
+bandite
+banditen
+banditeninsel
+banditi
+banditis
+banditism
+banditisme
+bandito
+banditri
+banditries
+banditry
+bandits
+banditt
+banditte
+banditten
+banditter
+banditti
+bandiva
+bandivam
+bandivamo
+bandivan
+bandivano
+bandivat
+bandivate
+bandivi
+bandivo
+bandiya
+bandjaba
+bandjababountou
+bandjabi
+bandjala
+bandjalang
+bandjare
+bandjarese
+bandje
+bandjela
+bandjelang
+bandjes
+bandjir
+bandjirs
+bandjoun
+bandkera
+bandkeramik
+bandle
+bandlead
+bandleader
+bandless
+bandlessly
+bandlessness
+bandlet
+bandlimi
+bandlimit
+bandlimited
+bandlimiting
+bandlimits
+bandlyse
+bandlysning
+bandman
+bandmast
+bandmaster
+bandmasters
+bandning
+bando
+bandobo
+bandobra
+bandobras
+bandog
+bandokor
+bandola
+bandolee
+bandoleer
+bandoleers
+bandoler
+bandolera
+bandolerismo
+bandolero
+bandoli`n
+bandolie
+bandolier
+bandoliered
+bandolin
+bandolina
+bandoline
+bandolinista
+bandolo`n
+bandolonista
+bandol{r
+bandol{ret
+bandon
+bandonio
+bandonion
+bandontw
+bandontwerp
+bandontwerpen
+bandopna
+bandopname
+bandor
+bandore
+bandoru
+bandosidad
+bandou
+bandougo
+bandougou
+bandouli
+bandoulie`re
+bandoum
+bandoume
+bandpass
+bandrefa
+bandrefam
+bandrem
+bandremm
+bandremmen
+bandries
+bandrol
+bands
+bandsat
+bandsche
+bandscheiben
+bandscheiben-schwaeche
+bandscor
+bandsman
+bandsmen
+bandspei
+bandspeicherung
+bandstah
+bandstahlwerkzeug
+bandstan
+bandstand
+bandstands
+bandster
+bandstop
+bandstri
+bandstring
+bandt
+bandteke
+bandtekening
+bandtekeningen
+banducci
+bandujo
+banduke
+bandullo
+bandundu
+bandurri
+bandurria
+bandursk
+bandurski
+bandusia
+bandusian
+bandvers
+bandversiering
+bandversieringen
+bandwago
+bandwagon
+bandwagons
+bandweve
+bandweverij
+bandweverijen
+bandwidt
+bandwidth
+bandwidths
+bandwink
+bandwinkel
+bandwinkels
+bandwork
+bandy
+bandybal
+bandyball
+bandybandy
+bandyen
+bandying
+bandykin
+bandyleg
+bandylegged
+bandyman
+bandyopa
+bandyopadhyay
+bandytow
+bandytown
+bandzabi
+bandzhog
+bandzhogi
+bandzogi
+bane
+baneberr
+baneberries
+baneberry
+banebil
+banebryde
+banebrydende
+banebryt
+banebrytende
+banebryter
+baned
+banedekk
+banedekke
+banedekket
+baneforh
+baneforhold
+baneforholdene
+baneful
+banefull
+banefully
+banefuln
+banefulness
+baneg}rd
+banehalv
+banehalvdel
+baneinsp
+baneinspekt|r
+baneka
+banekrau
+banekrausell
+banelegeme
+baneleie
+baneleien
+banemand
+banemo
+banen
+banend
+banene
+banenes
+banens
+banepakke
+baner
+banerd
+banereko
+banerekord
+baneritt
+banerittet
+banerjee
+banes
+banespil
+banespill
+banespillet
+banespor
+banesport
+banes}r
+banes}re
+banes}ret
+banet
+banetsus
+banetusa
+banewort
+banez
+banfalvi
+banff
+banffy
+banfield
+banfora
+banforas
+banforasienena
+bang
+banga
+bangabha
+bangabhasa
+bangad
+bangag
+bangai
+bangaich
+bangaihe
+bangaiko
+bangaiti
+bangaku
+bangala
+bangalan
+bangalay
+bangalee
+bangalem
+bangalema
+bangali
+bangall
+bangalor
+bangaloremadras
+bangalow
+bangam
+bangamel
+bangamelo
+bangan
+bangando
+bangandou
+bangandu
+bangang
+bangangt
+bangangte
+bangante
+banganto
+bangantou
+bangapel
+bangapela
+bangaro
+bangaru
+bangasa
+bangash
+bangata
+bangato
+bangawa
+bangay
+bangba
+bangbang
+bangbind
+bangbinda
+bangboar
+bangboard
+bange
+bangebuks
+banged
+bangedo
+bangela
+bangelij
+bangelijk
+bangem
+bangemae
+bangemaenner
+bangen
+bangend
+bangende
+bangenden
+bangender
+bangendes
+banger
+bangerd
+bangerds
+bangerik
+bangeriken
+bangers
+bangert
+banges
+banggai
+banggi
+banghart
+banghazi
+bangheid
+banghy
+bangi
+bangia
+bangiace
+bangiaceae
+bangiaceous
+bangiale
+bangiales
+bangighe
+bangigheid
+bangin
+banginda
+banging
+bangingi
+banginto
+bangintomba
+bangka
+bangkok
+bangkoks
+bangkuru
+bangkurung
+bangla
+banglabh
+banglabhasa
+banglade
+bangladesh
+bangladesher
+bangladesheren
+bangladeshi
+bangladeshindia
+bangladeshisk
+bangle
+bangled
+bangles
+bangling
+banglori
+bangmake
+bangmaker
+bangmakerij
+bangmakerijen
+bangmakers
+bangni
+bango
+bangoban
+bangobango
+bangohan
+bangolan
+bangoli
+bangolo
+bangom
+bangomo
+bangon
+bangor
+bangoro
+bangou
+bangouan
+bangoudu
+bangouju
+bangoya
+bangpath
+bangperb
+bangperbuck
+bangri
+bangru
+bangs
+bangst
+bangster
+bangt
+bangtail
+bangtails
+bangten
+bangtest
+bangtet
+banguban
+bangubangu
+banguell
+banguells
+bangui
+bangumi
+bangumic
+bangumid
+bangumih
+bangumij
+bangumik
+bangumim
+bangumir
+bangumiz
+bangunji
+bangurad
+bangwa
+bangwake
+bangwaketsi
+bangwe
+bangweul
+bangweulu
+bangwi
+bangwinj
+bangwinji
+bangyika
+bangyikang
+banh
+banham
+banhum
+bani
+banian
+baniano
+baniata
+baniba
+banida
+banido
+banier
+banierdr
+banierdrager
+banierdragers
+banieren
+baniertj
+baniertje
+baniertjes
+banig
+banigan
+banik
+baniku
+banilad
+baninge
+baningu
+banion
+banira
+banis
+banish
+banished
+banisher
+banishers
+banishes
+banishin
+banishing
+banishme
+banishment
+banishments
+banisht
+banister
+banisters
+baniua
+baniuk
+baniva
+baniwa
+baniya
+baniyas
+banja
+banjak
+banjaku
+banjangi
+banjar
+banjara
+banjares
+banjarese
+banjer
+banjerd{k
+banjerhe
+banjerheer
+banjerheren
+banjerma
+banjermasin
+banjers
+banji
+banjikyu
+banjin
+banjir
+banjirs
+banjo
+banjo's
+banjoen
+banjoes
+banjogi
+banjoist
+banjoists
+banjomuz
+banjomuziek
+banjong
+banjore
+banjori
+banjorin
+banjorine
+banjos
+banjou
+banjouki
+banjouko
+banjounb
+banjounbaham
+banjuke
+banjuku
+banjul
+banjun
+banjur
+banjuri
+banjwade
+banjyaku
+banjyou
+banjyuku
+bank
+banka
+bankaanw
+bankaanwijzing
+bankaanwijzingen
+bankable
+bankai
+bankaksj
+bankaksje
+bankaksjene
+bankakti
+bankaktivitaeten
+bankal
+bankala
+bankalac
+bankalachi
+bankan
+bankange
+bankangestellten
+bankangestellter
+bankanwe
+bankanweisung
+bankar
+bankara
+bankarbe
+bankarbeitstag
+bankassi
+bankassistent
+bankatin
+bankaufs
+bankaufsichtsbehoerde
+bankausk
+bankauskunft
+bankbeam
+bankbeamte
+bankbeamten
+bankbedi
+bankbediende
+bankbedienden
+bankbediendes
+bankbesc
+bankbescheinigungen
+bankbest
+bankbestaetigtem
+bankbestaetigten
+bankbestyrer
+bankbilj
+bankbiljet
+bankbiljetten
+bankbiljettencirculatie
+bankbok
+bankbook
+bankbooks
+bankboss
+bankbosse
+bankbreu
+bankbreuk
+bankbreuken
+bankbreukig
+bankbreukige
+bankbrie
+bankbriefje
+bankbriefjes
+bankbuch
+bankbuer
+bankbuergschaften
+bankbutt
+bankcomp
+bankcomputer
+bankdarl
+bankdarlehen
+bankdate
+bankdaten
+bankdepo
+bankdeposito
+bankdeposito's
+bankdire
+bankdirecteur
+bankdirecteuren
+bankdirecteurs
+bankdireksjonen
+bankdirektoren
+bankdirektors
+bankdirekt|r
+bankdisc
+bankdisconto
+bankdisconto's
+bankdivi
+bankdividende
+banke
+banked
+bankefis
+bankefisk
+bankei
+bankeinl
+bankeinlagen
+bankekai
+bankekailali
+banken
+bankenap
+bankenapparat
+bankenau
+bankenaufsichtsbehoerde
+bankenausschuss
+bankenautomation
+bankenbe
+bankenbeteiligung
+bankene
+bankenes
+bankenfa
+bankenfachpresse
+bankenga
+bankengagements
+bankenge
+bankengelder
+bankengemeinschaft
+bankengeschaeft
+bankengewerbe
+bankengr
+bankengruppe
+bankenha
+bankenhandel
+bankenko
+bankenkonsortium
+bankenkr
+bankenkrach
+bankenkrise
+bankenma
+bankenmarkt
+bankenme
+bankenmentalitaet
+bankenpr
+bankenprobleme
+bankenpu
+bankenpublikums
+bankens
+bankenso
+bankensoftware
+bankenst
+bankenstory
+bankensy
+bankensystems
+bankenta
+bankentage
+bankenve
+bankenverstaatlichung
+bankenvo
+bankenvorstaende
+bankenwe
+bankenwelt
+bankenwesen
+bankenzu
+bankenzusammenbruch
+bankenzusammenbruchs
+bankenzusammenbrueche
+banker
+bankera
+bankerdo
+bankerdom
+bankeres
+bankeress
+bankerfa
+bankerfahrung
+bankerot
+bankerott
+bankerotten
+bankers
+bankes
+banket
+banketba
+banketbakker
+banketbakkerij
+banketbakkerijen
+banketbakkers
+banketbakkersknecht
+banketbakkersknechten
+banketbakkersknechts
+banketha
+bankethammetje
+bankethammetjes
+banketle
+banketletter
+banketletters
+bankett
+bankette
+banketteer
+banketteerde
+banketteerden
+banketteerder
+banketteerders
+banketteert
+banketten
+bankettene
+banketter
+banketteren
+banketts
+bankfach
+bankfaeh
+bankfaehige
+bankfaehigem
+bankfaehigen
+bankfaehiges
+bankfeie
+bankfeiertag
+bankfeiertage
+bankfili
+bankfiliale
+bankfirm
+bankfirmen
+bankfisk
+bankfiske
+bankforb
+bankforbindelse
+bankforbindelser
+bankfuldm{gtig
+bankfull
+bankfunk
+bankfunksjon{r
+bankfunksjon{rers
+bankfunktion{r
+bankgara
+bankgarantie
+bankgarantien
+bankgebu
+bankgebuehren
+bankgefu
+bankgefuege
+bankgege
+bankgegevens
+bankgehe
+bankgeheim
+bankgeheimen
+bankgeheimnis
+bankgeheimnissen
+bankgeheimnisses
+bankgeld
+bankgelden
+bankgesc
+bankgeschaeft
+bankgeschaeften
+bankgese
+bankgesellschaft
+bankgesellschaften
+bankgewe
+bankgewerbe
+bankgiro
+bankgirot
+bankgrup
+bankgruppen
+bankguth
+bankguthaben
+bankhall
+bankhallen
+bankhalt
+bankhalter
+bankhaltern
+bankhaus
+bankhead
+bankhold
+bankhoud
+bankhouder
+bankhouders
+bankhvel
+bankhvelvene
+banki
+bankier
+bankiere
+bankieren
+bankiers
+bankiershuis
+bankiershuizen
+bankierskantoor
+bankierskantoren
+bankikuu
+bankim
+bankin
+banking
+bankings
+bankingu
+bankinns
+bankinnskudd
+bankinsp
+bankinspeksjon
+bankinst
+bankinstelling
+bankinstellingen
+bankinstitut
+bankinte
+bankinternen
+bankinya
+bankir
+bankizan
+bankje
+bankjes
+bankkart
+bankkarten
+bankkass
+bankkasserer
+bankkauf
+bankkaufmann
+bankkont
+bankkonten
+bankkonti
+bankkontiene
+bankkonto
+bankkontos
+bankkred
+bankkredite
+bankkreditt
+bankkrei
+bankkreisen
+bankkris
+bankkrise
+bankkund
+bankkunde
+bankkunden
+bankkurs
+banklede
+bankledelsen
+bankleit
+bankleiter
+banklize
+banklizenz
+banklope
+bankloper
+banklopers
+bankl}n
+bankmaes
+bankmaessiger
+bankman
+bankmana
+bankmanager
+bankmann
+bankmess
+bankmessige
+banknoot
+banknote
+banknoten
+banknotendeckung
+banknotenkurse
+banknotenumlauf
+banknotes
+banko
+bankoctr
+bankoctrooi
+bankoctrooien
+bankofue
+bankokki
+bankoku
+bankokuc
+bankokuh
+bankokuk
+bankokuy
+bankole
+bankon
+bankonsa
+bankospil
+bankoti
+bankotsu
+bankotu
+bankou
+bankoute
+bankover
+bankoverval
+bankovervallen
+bankpapi
+bankpapier
+bankplei
+bankpleite
+bankpleitenwelle
+bankprae
+bankpraesident
+bankprak
+bankpraktiker
+bankprof
+bankprofis
+bankpush
+bankraeu
+bankraeuber
+bankraeubers
+bankran
+bankrane
+bankranere
+bankranerne
+bankranet
+bankrefe
+bankreferenzen
+bankrege
+bankregel
+bankregn
+bankregnskapene
+bankregnskaper
+bankreke
+bankrekening
+bankrekeningen
+bankrepo
+bankreport
+bankride
+bankrider
+bankroet
+bankroete
+bankroeten
+bankroetier
+bankroetiers
+bankroll
+bankrolled
+bankrolling
+bankrolls
+bankrott
+bankrotte
+bankrottem
+bankrotten
+bankrotterklaerung
+bankrotterklaerungen
+bankrottes
+bankrupc
+bankrupcy
+bankrupt
+bankruptcies
+bankruptcy
+bankrupted
+bankrupting
+bankruptism
+bankruptlike
+bankruptly
+bankrupts
+bankruptship
+bankrupture
+banks
+banksama
+banksamarbeid
+banksamm
+banksammenslutninger
+bankscha
+bankschaetzwert
+bankschalter
+bankschl
+bankschliessungen
+bankschr
+bankschroef
+bankschroeven
+bankshal
+bankshall
+banksia
+banksian
+bankside
+banksides
+banksjef
+banksjefene
+banksjefens
+banksjefer
+bankskol
+bankskole
+banksman
+banksond
+banksonderkonto
+bankspar
+banksparere
+banksparingen
+bankspes
+bankspesen
+bankstaa
+bankstaat
+bankstat
+bankstaten
+bankstel
+bankstelle
+bankston
+bankt
+bankte
+banktech
+banktechnischen
+bankten
+banktite
+banktitel
+banktran
+banktransaktionen
+banktres
+banktresor
+banku
+bankuba
+bankuebe
+bankueberfaelle
+bankueberweisung
+bankuebl
+bankueblicher
+bankunte
+bankunternehmen
+bankuruw
+bankutu
+bankverb
+bankverbindung
+bankverk
+bankverkehr
+bankvese
+bankvesen
+bankvesenet
+bankvesenets
+bankvirk
+bankvirksomhet
+bankweed
+bankwelt
+bankwerk
+bankwerker
+bankwerkers
+bankwese
+bankwesen
+bankwesens
+bankwet
+bankwett
+bankwetten
+bankweze
+bankwezen
+banky
+bankzaak
+bankzake
+bankzaken
+bankzins
+bankzinsen
+bankzusa
+bankzusammenbruch
+bank|r
+banlaeng
+banlaengd
+banlalay
+banlalaysan
+banlangd
+banlieue
+banlieues
+banlieus
+banlieusard
+banlieusards
+banlol
+banl{ngd
+banme
+banmen
+banmeshi
+banmesi
+banmethu
+banmethuot
+banmin
+bann
+banna
+bannai
+bannan
+bannard
+bannbull
+bannbulle
+bannbullen
+bannbulletinen
+banne
+banned
+bannelin
+banneling
+bannelinge
+bannelingen
+bannen
+banneord
+banneordet
+banner
+bannera
+bannerd
+bannere
+bannered
+bannerel
+bannerelk
+bannerer
+banneret
+bannerfi
+bannerfish
+bannerf|
+bannerf|rer
+bannerf|rere
+bannerje
+bannerjee
+bannerle
+bannerless
+bannerli
+bannerlike
+bannerma
+bannerman
+bannern
+bannerol
+banners
+bannertr
+bannertraeger
+bannerwi
+bannerwise
+bannet
+banni
+bannie
+bannie`r
+bannie`re
+bannie`res
+banniere
+bannies
+bannikov
+bannin
+banning
+banninga
+banninge
+banningen
+bannion
+bannir
+bannira
+bannirai
+banniraient
+bannirais
+bannirait
+banniras
+banniren
+bannirent
+bannirez
+bannirie
+banniriez
+bannirio
+bannirions
+banniron
+bannirons
+banniront
+bannis
+bannissa
+bannissaient
+bannissais
+bannissait
+bannissant
+bannisse
+bannissement
+bannissent
+bannisses
+bannissez
+bannissi
+bannissiez
+bannissions
+bannisso
+bannissons
+banniste
+bannister
+bannit
+bannlyse
+bannlyses
+bannlyst
+bannlyste
+banno
+bannochi
+bannock
+bannockb
+bannockburn
+bannocks
+bannon
+bannor
+bannou
+bannouga
+bannouki
+bannouse
+bannouya
+banns
+bannskap
+bannskapen
+bannstra
+bannstrahl
+bannt
+bannten
+bannu
+bannumme
+bannummer
+bannung
+bannut
+bano
+banoho
+banoko
+banoni
+banoo
+banos
+banovina
+banpa
+banpaal
+banpaku
+banpalen
+banpan
+banpara
+banpatsu
+banpatu
+banpei
+banpou
+banpu
+banpufut
+banpuku
+banpuu
+banque
+banquell
+banquells
+banquer
+banquera
+banquero
+banqueroute
+banqueroutes
+banques
+banquet
+banqueta
+banquete
+banquetear
+banqueted
+banqueteer
+banqueteering
+banqueter
+banqueters
+banqueti
+banqueting
+banquetings
+banquets
+banquett
+banquette
+banquettes
+banquier
+banquiers
+banquillo
+banquise
+banquises
+banquo
+banrai
+banretsu
+banretu
+banri
+banridou
+banryoku
+bans
+bansa
+bansagi
+bansaku
+bansal
+bansalag
+bansalague
+bansan
+bansaw
+bansbali
+bansefue
+bansei
+banseikk
+bansen
+bansetsu
+bansetu
+banshaku
+banshee
+banshees
+banshek
+banshi
+banshie
+banshies
+banshiis
+bansho
+banshoku
+banshou
+banshoua
+banshun
+banshuu
+bansi
+bansiis
+bansiiss
+bansler
+banso
+bansoa
+bansotsu
+bansotu
+bansou
+bansouko
+banstick
+banstickle
+bansui
+bansyaku
+bansyari
+bansyoku
+bansyou
+bansyun
+bansyuu
+bansyuua
+bant
+banta
+bantad
+bantaeng
+bantai
+bantakpa
+bantalan
+bantalang
+bantalvi
+bantam
+bantamco
+bantamcock
+bantamge
+bantamgewichtsmeister
+bantamiz
+bantamize
+bantams
+bantamve
+bantamvekter
+bantamv{gt
+bantamwe
+bantamweight
+bantamweights
+bantan
+bantar
+bantaura
+bantaurang
+bantawa
+bantay
+bantayan
+bante
+banteay
+banten
+banteng
+banter
+bantered
+banterer
+banterers
+banterin
+bantering
+banteringly
+banters
+bantery
+banti
+bantian
+bantik
+banting
+bantingi
+bantingism
+bantingize
+bantling
+bantning
+banto
+bantoano
+bantoanon
+bantoid
+banton
+bantou
+bantoue
+bantoues
+bantous
+bantry
+bantu
+bantuano
+bantuanon
+bantus
+banty
+bantya
+bantyp
+banu
+banuah
+banuu
+banuwang
+banuyo
+banville
+banvloek
+banvloeken
+banvonni
+banvonnis
+banvonnissen
+banwari
+banwuri
+banxring
+banya
+banyai
+banyan
+banyang
+banyangi
+banyans
+banyo
+banyok
+banyoro
+banyousa
+banyuk
+banyuls
+banyum
+banyun
+banyung
+banyuq
+banyuu
+banyuuin
+banyuwan
+banyuwangi
+banza
+banzai
+banzai[j
+banzai[japanese]
+banzais
+banzan
+banzart
+banzen
+banzer
+banzi
+banzie
+banzin
+banziri
+banznond
+banznondugl
+banzo
+banzoku
+banzyaku
+banzyou
+banzyuku
+bao
+baoa
+baobab
+baobabs
+baokan
+baol
+baolan
+baolo
+baominh
+baonan
+baori
+baoria
+baorias
+baoruco
+baotiste
+baoule
+bap
+bapa
+bapai
+bapakomb
+bapakombe
+bapakum
+bapara
+bape
+baphia
+baphomet
+baphometic
+bapinyi
+bapo
+bapokara
+bapounou
+bappai
+bappon
+bapponso
+bapponte
+bappou
+baptanod
+baptanodon
+bapte^me
+bapte^mes
+baptisa
+baptisai
+baptisaient
+baptisait
+baptisan
+baptisant
+baptise
+baptise'
+baptise'e
+baptise'es
+baptise's
+baptise`
+baptise`rent
+baptised
+baptisem
+baptiseme
+baptisen
+baptisent
+baptiser
+baptisera
+baptiseraient
+baptiserait
+baptiseront
+baptises
+baptisia
+baptisin
+baptising
+baptism
+baptisma
+baptismal
+baptismally
+baptisme
+baptismo
+baptisms
+baptist
+baptista
+baptiste
+baptisten
+baptisteries
+baptisterio
+baptisterium
+baptistery
+baptisti
+baptistic
+baptistina
+baptistine
+baptistisk
+baptistk
+baptistkirken
+baptistkirkens
+baptisto
+baptistown
+baptistr
+baptistries
+baptistry
+baptists
+baptiz
+baptizab
+baptizable
+baptizador
+baptizante
+baptizar
+baptize
+baptized
+baptizee
+baptizem
+baptizement
+baptizer
+baptizers
+baptizes
+baptizest
+baptizet
+baptizeth
+baptizin
+baptizing
+baptizo
+baptorni
+baptornis
+bapu
+bapuku
+bapuu
+baq
+baque
+baqueana
+baqueano
+baquear
+baquero
+baquet
+baqueta
+baquetazo
+baqueteada
+baqueteado
+baquetear
+baqueteo
+baqueto`n
+baquets
+baqui`a
+baquiana
+baquiano
+baquio
+bar
+bar-butt
+bar-button
+bara
+bara\o
+baraa
+baraamu
+baraan
+baraba
+barabaig
+barabaik
+barabara
+barabare
+barabas
+barabash
+barabashov
+barabba
+barabbas
+barabdui
+barabduin
+barabee
+baraboo
+barabora
+barabra
+barabrey
+baraca
+baracaka
+baracakay
+baracca
+baracche
+barachel
+barachia
+barachias
+barachko
+barachkov
+barachoi
+barachois
+baracke
+baracken
+barackenlager
+barad
+baraddur
+baradia
+barado
+baradur
+baraetei
+baraetex
+barafunda
+baraga
+baragar
+baragaun
+baragaunle
+baragnos
+baragnosis
+baragone
+baragoui
+baragouin
+baragouiner
+baragouinish
+baraguyu
+barah
+baraha`
+barahir
+barahona
+barahu`nda
+barahustar
+barai
+baraic
+barain
+barairo
+baraitha
+baraithas
+baraja
+barajada
+barajador
+barajadora
+barajadura
+barajar
+baraje
+barajida
+barajill
+barajillo
+barajo`n
+barajustar
+barak
+baraka
+barakai
+barakat
+barake
+baraki
+barakiba
+barakibarak
+barakke
+barakken
+barakku
+baraks
+baral
+barala
+baralipt
+baralipton
+baram
+barama
+baramagy
+baramagyi
+baramata
+barambo
+barambop
+barambopambia
+barambu
+baramika
+barammo
+baramon
+baramtin
+baramtinjar
+baran
+baranci
+baranda
+barandado
+barandaje
+barandal
+barandilla
+barando
+barandos
+barang
+barangan
+barangay
+barangaya`n
+barangba
+barangbarang
+barani
+barano
+baranor
+baranov
+baranovi
+baranovich
+baranovs
+baranovskaya
+baranow
+baranows
+baranowska
+baranski
+baransu
+baranya
+baranzah
+baranzahlung
+baraog
+barapasi
+baraque
+baraquem
+baraquement
+baraquements
+baraquer
+baraques
+barare
+bararono
+bararuny
+bararunyeretse
+baras
+barasana
+barasano
+barasen
+barash
+barashin
+barasin
+barasing
+barasingha
+barasse
+barasser
+barassero
+barassi
+barassim
+barassimo
+baraste
+barasti
+barat
+barata
+baratador
+baratadora
+baratamente
+baratar
+baratari
+barataria
+barate
+baratear
+baratera
+barateri`a
+baratero
+barath
+barathea
+barathra
+barathru
+barathrum
+barati
+barati`a
+baratija
+baratillera
+baratillero
+baratillo
+baratin
+baratine
+baratiner
+baratista
+barato
+barato`n
+baratona
+baratri
+baratro
+baratsu
+baratta
+barattai
+barattam
+barattammo
+barattan
+barattando
+barattano
+barattar
+barattare
+barattas
+barattasse
+barattassi
+barattaste
+barattasti
+barattat
+barattata
+barattate
+barattati
+barattato
+barattav
+barattava
+barattavi
+barattavo
+baratte
+barattee
+baratteer
+baratteerde
+baratteerden
+baratteert
+baratter
+barattera
+baratterai
+baratterei
+baratteren
+baratterie
+baratterieen
+barattero
+barattes
+baratti
+barattia
+barattiamo
+barattiate
+barattin
+barattino
+baratto
+barattol
+barattoli
+barattolo
+baratu
+baratura
+barau
+barau`nda
+barauana
+barauna
+baraussc
+barausschuettung
+baraustada
+baraustado
+baraustador
+baraustar
+barauste
+barausza
+barauszahlungen
+barava
+baravamo
+baravano
+baravate
+baravi
+baravo
+barawa
+barawahi
+barawahing
+barawana
+baraza
+barb
+barba
+barba`rica
+barba`ricamente
+barba`rico
+barbaar
+barbaars
+barbaarse
+barbaarser
+barbaarsheden
+barbaarsheid
+barbaarst
+barbabas
+barbabra
+barbacan
+barbacana
+barbacci
+barbacin
+barbacini
+barback
+barbacoa
+barbacoan
+barbacoas
+barbacou
+barbacua`
+barbada
+barbadamente
+barbadia
+barbadian
+barbadie
+barbadieren
+barbadis
+barbadisk
+barbado
+barbados
+barbaig
+barbaja
+barbaja`n
+barbajuelas
+barbal
+barbalin
+barbaloi
+barbaloin
+barban
+barbar
+barbara
+barbara-
+barbara-anne
+barbaraa
+barbaraanne
+barbarak
+barbarakruid
+barbaral
+barbaralalia
+barbare
+barbarea
+barbarel
+barbarella
+barbaren
+barbarentrupps
+barbarer
+barbareri`a
+barbares
+barbaresca
+barbaresco
+barbaresque
+barbari
+barbaria
+barbarian
+barbarianism
+barbarianize
+barbarians
+barbaric
+barbarical
+barbarically
+barbaridad
+barbarie
+barbaries
+barbariet
+barbario
+barbarious
+barbariousness
+barbaris
+barbarisch
+barbarischen
+barbarisches
+barbarisere
+barbarisk
+barbariske
+barbarism
+barbarisme
+barbarismen
+barbarismes
+barbarismo
+barbarisms
+barbarit
+barbarities
+barbarity
+barbariz
+barbarizante
+barbarizar
+barbarization
+barbarize
+barbarized
+barbarizes
+barbarizing
+barbaro
+barbaros
+barbarosa
+barbarossa
+barbarossas
+barbarot
+barbarota
+barbarote
+barbarotti
+barbarou
+barbarous
+barbarously
+barbarousness
+barbarri
+barbarrigo
+barbary
+barbas
+barbasco
+barbaste
+barbastel
+barbastrense
+barbastrina
+barbastrino
+barbate
+barbated
+barbatim
+barbatimao
+barbato
+barbay
+barbaza
+barbd
+barbe
+barbear
+barbeau
+barbeaux
+barbechada
+barbechar
+barbechera
+barbecho
+barbecue
+barbecued
+barbecueing
+barbecuen
+barbecues
+barbecui
+barbecuing
+barbed
+barbedde
+barbeddevil
+barbedwire
+barbee
+barbeel
+barbeint
+barbeiro
+barbel
+barbele
+barbele'
+barbele'e
+barbele'es
+barbele's
+barbelen
+barbell
+barbella
+barbellate
+barbells
+barbellu
+barbellula
+barbellulate
+barbels
+barbenet
+barbent
+barbeque
+barbequed
+barber
+barbera
+barbere
+barbered
+barberen
+barberena
+barberer
+barbereren
+barberes
+barberess
+barberfi
+barberfish
+barberi`a
+barberil
+barberin
+barbering
+barberini
+barberis
+barberish
+barberma
+barbermaskin
+barbero
+barberol
+barberri
+barberries
+barberry
+barbers
+barbersh
+barbershop
+barbershops
+barberto
+barberton
+barbervi
+barberville
+barbery
+barbes
+barbesit
+barbesitzerin
+barbesta
+barbestaende
+barbestaenden
+barbestandes
+barbet
+barbeta
+barbetra
+barbetrag
+barbetri
+barbetrieb
+barbets
+barbette
+barbey
+barbeyac
+barbeyaceae
+barbezie
+barbezier
+barbi
+barbia`n
+barbiana
+barbiblanca
+barbiblanco
+barbicacho
+barbican
+barbicana
+barbicano
+barbicans
+barbicasta\a
+barbicasta\o
+barbicel
+barbiche
+barbiches
+barbie
+barbie-p
+barbie-puppe
+barbier
+barbierd
+barbierde
+barbierden
+barbiere
+barbieren
+barbieri
+barbiers
+barbiersjongen
+barbiersjongens
+barbiersvak
+barbierswinkel
+barbierswinkels
+barbierszaak
+barbiert
+barbiesj
+barbiesjes
+barbiespesa
+barbiespeso
+barbifie
+barbifier
+barbiger
+barbigerous
+barbihecho
+barbijo
+barbilampi\o
+barbilindo
+barbilla
+barbillera
+barbilucio
+barbiluenga
+barbiluengo
+barbimorena
+barbimoreno
+barbinegra
+barbinegro
+barbing
+barbio
+barbion
+barbiponiente
+barbipugente
+barbiquejo
+barbirrapada
+barbirroja
+barbirrojo
+barbirrubia
+barbirrubio
+barbirrucia
+barbirrucio
+barbitahe\a
+barbitahe\o
+barbital
+barbitalism
+barbite\ida
+barbite\ido
+barbiton
+barbitone
+barbitonta
+barbitonto
+barbitos
+barbitu`rico
+barbitur
+barbiturat
+barbiturate
+barbiturates
+barbituric
+barbiturique
+barbituriques
+barbizon
+barbless
+barblet
+barbo
+barbo`n
+barbon
+barbone
+barbons
+barboo
+barboquejo
+barbotag
+barbotage
+barbotar
+barbote
+barboteadura
+barbotear
+barboteo
+barboter
+barboteu
+barboteuse
+barboteuses
+barbotin
+barbotine
+barbouil
+barbouilla
+barbouillage
+barbouillages
+barbouillaient
+barbouillais
+barbouillait
+barbouillant
+barbouille
+barbouille'
+barbouille'e
+barbouille'es
+barbouille's
+barbouille`rent
+barbouillent
+barbouiller
+barbouillera
+barbouillerai
+barbouilleraient
+barbouillerais
+barbouillerait
+barbouilleras
+barbouillerez
+barbouilleriez
+barbouillerions
+barbouillerons
+barbouilleront
+barbouilles
+barbouilleur
+barbouilleurs
+barbouillez
+barbouilliez
+barbouillions
+barbouillons
+barbour
+barboura
+barbours
+barboursville
+barbourv
+barbourville
+barbox
+barbra
+barbro
+barbs
+barbu
+barbucha
+barbuda
+barbudo
+barbue
+barbues
+barbula
+barbulat
+barbulate
+barbule
+barbulee
+barbulla
+barbullar
+barbullido
+barbullo`n
+barbullona
+barbulyi
+barbulyie
+barbuquejo
+barburao
+barburr
+barbus
+barbusano
+barbwire
+barbwires
+barby
+barc
+barca
+barcada
+barcaiol
+barcaioli
+barcaiolo
+barcaje
+barcal
+barcamen
+barcamena
+barcamenai
+barcameni
+barcameno
+barcan
+barcarol
+barcarola
+barcarole
+barcaroles
+barcarolle
+barcarolles
+barcaza
+barcella
+barcello
+barcellos
+barcelon
+barcelona
+barcelone`s
+barcelonesa
+barceloneta
+barcena
+barceno
+barceo
+barchan
+barche
+barchevi
+barchevin
+barchilla
+barchilo`n
+barchilona
+barcia
+barcina
+barcinador
+barcinar
+barcino
+barclay
+barclays
+barclayv
+barclayville
+barco
+barco`n
+barcode
+barcodes
+barcolla
+barcollai
+barcollano
+barcollare
+barcollata
+barcollate
+barcollati
+barcollato
+barcollava
+barcollavi
+barcollavo
+barcolle
+barcollera
+barcollero
+barcolli
+barcollino
+barcollo
+barcolongo
+barcoluengo
+barcombe
+barcoo
+barcote
+barcraft
+barcroff
+barcroft
+barcza
+barczy
+bard
+barda
+bardada
+bardado
+bardaguera
+bardaien
+bardaient
+bardais
+bardait
+bardaja
+bardaje
+bardal
+bardame
+bardamen
+bardana
+bardane
+bardant
+bardanza
+bardar
+bardas
+bardash
+bardcraf
+bardcraft
+barde
+barde'
+barde'e
+barde'es
+barde's
+barde`re
+barde`rent
+barded
+bardehva
+bardehval
+bardehvalen
+bardel
+bardeman
+barden
+bardent
+bardenza
+bardenzang
+bardenzangen
+barder
+bardera
+barderai
+barderaient
+barderais
+barderait
+barderas
+barderez
+barderie
+barderiez
+barderio
+barderions
+barderon
+barderons
+barderont
+bardes
+bardesan
+bardesanism
+bardesanist
+bardesanite
+bardeska
+bardeskari
+bardess
+bardette
+bardeux
+bardez
+bardi
+bardia
+bardic
+bardie
+bardiez
+bardigli
+bardiglio
+bardily
+bardines
+bardiness
+bardinet
+barding
+bardions
+bardiota
+bardisch
+bardischewski
+bardish
+bardisk
+bardiske
+bardisken
+bardism
+bardiza
+bardlet
+bardlike
+bardling
+bardo
+bardolat
+bardolater
+bardolatry
+bardolph
+bardolphian
+bardoma
+bardomera
+bardoni
+bardonia
+bardons
+bardot
+bardour
+bards
+bardship
+bardsley
+bardstow
+bardstown
+bardu
+bardufos
+bardufoss
+bardulph
+bardun
+bardunen
+barduner
+bardunere
+bardus
+bardwell
+bardy
+bare
+bare-
+bare-bo-
+bare`me
+bare`mes
+barea
+bareacre
+bareacres
+bareback
+barebacked
+barebo
+bareboat
+barebone
+bareboned
+barebones
+bareboru
+bareca
+bared
+baredji
+baree
+bareel
+bareeltj
+bareeltje
+bareeltjes
+bareelwa
+bareelwachter
+bareelwachters
+bareface
+barefaced
+barefacedly
+barefacedness
+barefit
+barefoot
+barefooted
+barege
+bareham
+barehand
+barehanded
+barehead
+bareheaded
+bareheadedness
+barei
+bareilly
+barein
+bareinna
+bareinnahme
+bareinnahmen
+bareinza
+bareinzahlung
+bareisho
+bareiss
+bareisyo
+bareji
+bareke
+barekeva
+barekevangunu
+bareko
+barel
+barelegg
+barelegged
+barelen
+bareli
+barella
+barelle
+barelli
+barely
+baremeta
+baremetal
+baremo
+baren
+bareneck
+barenecked
+bareness
+barenie
+barenshi
+barensi
+barensia
+barensno
+barensnood
+barenste
+barensteel
+barenstelen
+barenswe
+barensweeen
+barent
+barentai
+barents
+barentsb
+barentsburg
+barentse
+barentsen
+barentsh
+barentshavet
+barentss
+barentssee
+barentu
+barer
+barera
+barerai
+barerann
+bareranno
+barere
+barerebb
+barerebbe
+barerei
+bareremm
+bareremmo
+bareremo
+barerest
+barereste
+bareresti
+barerete
+bareri-n
+barerin
+barero
+bareru
+barerusu
+bares
+baresark
+bareshe
+baresma
+barest
+baret
+barett
+baretta
+baretten
+baretto
+barezews
+barezewska
+barf
+barfed
+barfer
+barff
+barfield
+barfing
+barfish
+barflies
+barfly
+barfodet
+barfrost
+barfrosten
+barfs
+barfucio
+barfucious
+barfuess
+barfuessig
+barfuessige
+barfuessigen
+barfuessiger
+barfuessiges
+barful
+barfulat
+barfulation
+barfulou
+barfulous
+barf|tt
+barg
+barga
+bargain
+bargaina
+bargainable
+bargaine
+bargained
+bargainee
+bargainer
+bargainers
+bargaini
+bargaining
+bargaino
+bargainor
+bargains
+bargainw
+bargainwise
+bargam
+bargande
+bargander
+bargaria
+bargarian
+barge
+bargeboa
+bargeboard
+barged
+bargee
+bargeer
+bargees
+bargeese
+bargehou
+bargehouse
+bargeld
+bargeldb
+bargeldbestaende
+bargeldbestand
+bargelde
+bargelder
+bargeldern
+bargeldes
+bargeldl
+bargeldlos
+bargeldlose
+bargeldlosen
+bargeldloser
+bargeldloses
+bargeldm
+bargeldmenge
+bargeldt
+bargeldtransaktionen
+bargeldu
+bargeldumlaufs
+bargelik
+bargelike
+bargeloa
+bargeload
+bargeman
+bargemas
+bargemaster
+bargemen
+barger
+bargersv
+bargersville
+barges
+bargh
+bargham
+barghest
+barging
+bargista
+bargmann
+bargoens
+bargoense
+bargoose
+bargraph
+bargraphs
+bargu
+bargue\a
+bargue\o
+barguign
+barguigner
+barguzin
+bargvest
+bargy
+barhaeup
+barhaeuptige
+barham
+barhamsv
+barhamsville
+barhamu
+barharbo
+barharbor
+barheid
+barhille
+barhillel
+barhoda
+barhodet
+barhop
+barhoppe
+barhopped
+barhoppi
+barhopping
+barhops
+barhumit
+barhumite
+bari
+bari`
+bari`a
+bari`tono
+baria
+bariah
+bariai
+bariaing
+bariaingero
+bariamo
+bariate
+bariatin
+bariatinski
+bariatri
+bariatrician
+bariba
+baribari
+baribeau
+baribu
+baric
+barid
+baridhar
+baridhara
+barie
+barie-sh
+barier
+bariesh
+bariesyo
+bariet
+barig
+barighet
+bariji
+barik
+barikan
+barike-d
+bariked
+barikedo
+bariki
+baril
+barile
+barilhau
+barilhaus
+barili
+barilla
+barillar
+barillaro
+barillet
+barillets
+barilogo
+barils
+barim
+barimawa
+barimawaini
+barin
+barinas
+baring
+baringen
+baringha
+baringhaus
+baringo
+baringto
+barington
+barino
+bario
+bariolag
+bariolage
+bariolages
+bariolan
+bariolant
+bariole'
+bariole'e
+bariole'es
+bariole's
+barioler
+barios
+baris
+barisal
+barisan
+barisfera
+barish
+barit
+barita
+barite
+baritel
+barites
+bariti
+baritina
+barito
+bariton
+baritone
+baritones
+baritons
+baritonz
+baritonzanger
+baritonzangers
+barium
+bariumet
+bariums
+bariumsp
+bariumsprings
+bariumu
+barizoug
+barjac
+barjesus
+barjon
+barjona
+barjuleta
+bark
+barka
+barkaeuf
+barkaeufe
+barkaeufen
+barkan
+barkanti
+barkantine
+barkarby
+barkarol
+barkarole
+barkas
+barkass
+barkasse
+barkassen
+barkat
+barkauf
+barkbill
+barkbille
+barkboun
+barkbound
+barkcutt
+barkcutter
+barke
+barked
+barkeep
+barkeepe
+barkeeper
+barkeepers
+barkeeps
+barken
+barkenti
+barkentine
+barkentines
+barker
+barkers
+barkery
+barket
+barkete
+barkevik
+barkevikite
+barkevikitic
+barkey
+barkeyvi
+barkeyville
+barkhan
+barkhas
+barkhous
+barkhouse
+barkier
+barkin
+barking
+barkingl
+barkingly
+barkinji
+barkins
+barkis
+barkle
+barkless
+barkley
+barkleys
+barkly
+barklyit
+barklyite
+barko
+barkomet
+barkometer
+barkos
+barkound
+barkoundouba
+barkow
+barkpeel
+barkpeeler
+barkpeeling
+barkrive
+barkriver
+barkruk
+barkrukk
+barkrukken
+barks
+barksdal
+barksdale
+barksdale-am1
+barksdale-mil-tac
+barksdale-piv-1
+barksome
+barkstan
+barkstane
+barkstyk
+barkstykke
+barkunia
+barkunian
+barkved
+barkwill
+barkwort
+barkworth
+barky
+barlafum
+barlafumble
+barlafummil
+barlas
+barleist
+barleistung
+barless
+barley
+barleybi
+barleybird
+barleybr
+barleybreak
+barleyco
+barleycorn
+barleyho
+barleyhood
+barleymo
+barleymow
+barleys
+barleysi
+barleysick
+barlig
+barlind
+barlinda
+barlinde
+barlinden
+barling
+barliqui
+barliquiditaet
+barloa
+barloar
+barlock
+barloventear
+barlovento
+barlow
+barlowe
+barlows
+barm
+barma
+barmag
+barmaid
+barmaids
+barman
+barmanne
+barmannen
+barmans
+barmaste
+barmaster
+barmbrac
+barmbrack
+barmclot
+barmcloth
+barmecid
+barmecidal
+barmecide
+barmeid
+barmeide
+barmeiden
+barmeli
+barmen
+barmfagr
+barmfagre
+barmhaer
+barmhaertig
+barmhaertiga
+barmhart
+barmhartig
+barmhartiga
+barmhartige
+barmhartiger
+barmhartigheden
+barmhartigheid
+barmhartigst
+barmherz
+barmherzig
+barmherzige
+barmherzigen
+barmherziger
+barmherziges
+barmherzigkeit
+barmherzigkeiten
+barmhjer
+barmhjertig
+barmhjertige
+barmhjertighed
+barmhjertighet
+barmhjertigheten
+barmhjertighetens
+barmh{rt
+barmh{rtig
+barmh{rtiga
+barmie
+barmier
+barmiest
+barmills
+barmitte
+barmittel
+barmkin
+barmote
+barmskin
+barmy
+barmybra
+barmybrained
+barn
+barna
+barnaba
+barnabas
+barnabe
+barnabei
+barnabit
+barnabita
+barnabite
+barnaby
+barnac
+barnacla
+barnacle
+barnacled
+barnacles
+barnadin
+barnadine
+barnagtig
+barnagtighed
+barnakti
+barnaktig
+barnard
+barnardi
+barnardiana
+barnardine
+barnardo
+barnards
+barnardsville
+barnas
+barnato
+barnbrac
+barnbrack
+barnburn
+barnburner
+barnde
+barnden
+barndoll
+barndollar
+barndom
+barndomm
+barndommen
+barndommens
+barndoms
+barndomsheim
+barndomshjem
+barndomshjemmet
+barndomshjemmets
+barndorf
+barndorffnielsen
+barne
+barnearb
+barnearbeidet
+barneavd
+barneavdelingen
+barneavdelingens
+barnebar
+barnebarn
+barnebarnet
+barnebas
+barnebok
+barneboka
+barneboken
+barneb|k
+barneb|ker
+barned}p
+barned}pen
+barnefam
+barnefamiliene
+barnefamilier
+barnefar
+barnefaren
+barneflo
+barneflokk
+barnefor
+barnefortellinger
+barnegat
+barnegatlight
+barnehag
+barnehage
+barnehageassistent
+barnehagel{rere
+barnehagel{rerne
+barnehagene
+barnehageplass
+barnehager
+barnehei
+barneheim
+barneheimen
+barnehje
+barnehjelp
+barnehjelpen
+barnehjem
+barnehjemmet
+barnehod
+barnehode
+barneins
+barneinstitusjon
+barnekjo
+barnekjoler
+barnekj{
+barnekj{r
+barneklu
+barneklubb
+barnekor
+barnelei
+barneleiker
+barnelit
+barnelitteratur
+barnelitteraturen
+barnelitteraturens
+barnell
+barnen
+barneopp
+barneoppdragelse
+barneoppdragelsen
+barnepar
+barnepark
+barneparker
+barneparkering
+barnepas
+barnepass
+barneple
+barnepleierske
+barnepro
+barneprogrammene
+barneprogrammer
+barnepsy
+barnepsykologen
+barnepsykologien
+barnerim
+barnerimet
+barnes
+barnesbo
+barnesboro
+barnesci
+barnescity
+barneser
+barneserier
+barneset
+barnesete
+barnesin
+barnesinn
+barnesko
+barneskole
+barneskolen
+barneskoler
+barneskoles
+barness
+barnesto
+barnestol
+barneston
+barnesty
+barnestykket
+barnesvi
+barnesville
+barnesyk
+barnesykdom
+barnesykdommene
+barnesykdommer
+barnesykehus
+barnesykler
+barnet
+barnetal
+barnetallet
+barnetea
+barneteater
+barneteateret
+barnetil
+barnetilvekst
+barnetim
+barnetime
+barnetimen
+barnetimer
+barnetry
+barnetrygd
+barnetrygden
+barnets
+barnett
+barnevel
+barneveld
+barneven
+barnevennlig
+barnever
+barnevern
+barnevernet
+barnevernsarbeid
+barnevernsnemnd
+barnevernsnemnda
+barnevis
+barneviser
+barnevog
+barnevogn
+barnevogner
+barnev{r
+barnev{relse
+barnev{relsene
+barnev{relser
+barnev{relset
+barney
+barne}r
+barne}re
+barne}rene
+barnfloo
+barnfloor
+barnful
+barng
+barnhard
+barnhardt
+barnhardtite
+barnhart
+barnhill
+barnhous
+barnhouse
+barnicke
+barnickel
+barnie
+barnier
+barnim
+barniz
+barnizador
+barnizadora
+barnizar
+barnlig
+barnlige
+barnligt
+barnl|se
+barnman
+barns
+barnsbei
+barnsbein
+barnsby
+barnsdal
+barnsdall
+barnsley
+barnslig
+barnslige
+barnsoms
+barnsomshjem
+barnstab
+barnstable
+barnstal
+barnstall
+barnstap
+barnstaple
+barnstea
+barnstead
+barnstee
+barnsteen
+barnsteenkracht
+barnsten
+barnstenen
+barnstor
+barnstorm
+barnstormed
+barnstormer
+barnstormers
+barnstorming
+barnstorms
+barnswel
+barnswell
+barnt
+barnum
+barnumis
+barnumism
+barnumiz
+barnumize
+barnwell
+barny
+barnyard
+barnyards
+barn}l
+barn}la
+barn}len
+baro
+baro`grafo
+baro`metro
+baro`n
+barock
+barockor
+barockorchester
+barockst
+barockstadt
+baroco
+barocycl
+barocyclonometer
+baroda
+barodyna
+barodynamic
+barodynamics
+baroghil
+barognos
+barognosis
+barograa
+barograaf
+barograf
+barografen
+barogram
+barograms
+barograp
+barograph
+barographic
+barographs
+baroi
+barok
+barokk
+barokkaf
+barokkaften
+barokke
+barokken
+barokkens
+barokker
+barokkmu
+barokkmusikk
+barokkti
+barokktidens
+barokku
+barokkun
+barokkunst
+baroksch
+barokschilder
+barokschilders
+barokst
+baroksti
+barokstijl
+barokt
+baroktij
+baroktijd
+barolet
+barolo
+barology
+barolong
+barombi
+barombik
+barombikoto
+barombim
+barombimbo
+barome't
+barome'trique
+barome'triques
+barome-t
+barome`t
+barome`tre
+barome`tres
+barome`trica
+barome`trico
+baromet
+barometa
+baromete
+barometer
+barometeret
+barometers
+barometerstaende
+barometerstand
+barometerstanden
+barometerstandes
+barometr
+barometri
+barometric
+barometrical
+barometrically
+barometrisch
+barometrische
+barometriske
+barometro
+barometrograph
+barometrography
+barometry
+barometz
+baromoto
+baromotor
+baron
+baronage
+baronages
+baroncel
+baroncello
+barondo
+barone
+baronen
+baronens
+baroner
+baronerne
+baronernes
+barones
+baronesa
+baroness
+baronesse
+baronessen
+baronesses
+baronet
+baroneta
+baronetage
+baronetc
+baronetcies
+baronetcy
+baroneth
+baronethood
+baroneti
+baronetical
+baronets
+baronetship
+baronetter
+barong
+baronga
+barongag
+barongagunay
+baronhar
+baronharkonnen
+baroni
+baroni`a
+baronial
+baronie
+baroniee
+baronieen
+baronier
+baronierne
+baronies
+baroniet
+baronin
+baronize
+baronne
+baronnen
+baronnentitel
+baronnentitels
+baronnes
+baronnet
+baronry
+barons
+baronshi
+baronship
+baronstanden
+barony
+baropasi
+baroque
+baroquen
+baroqueness
+baroques
+baroscoo
+baroscoop
+baroscop
+baroscope
+baroscopen
+baroscopic
+baroscopical
+barosma
+barosmin
+barosu
+barotac
+barotact
+barotactic
+barotaxi
+barotaxis
+barotaxy
+barother
+barothermograph
+barothermohygrograph
+baroto
+barotrop
+barotropirelasjon
+barotropirelasjonen
+barotropt
+barotse
+barotsel
+barotseland
+barouch
+barouche
+barouches
+barouchet
+barouchetten
+baroudi
+barouh
+barouni
+baroux
+barovell
+barovelli
+barovic
+baroxyto
+baroxyton
+barpirrapado
+barpost
+barquant
+barquantine
+barque
+barquear
+barquent
+barquentine
+barqueo
+barquera
+barquero
+barques
+barqueta
+barquete
+barquett
+barquette
+barquettes
+barqui`a
+barqui`n
+barquichuelo
+barquilla
+barquillera
+barquillero
+barquillo
+barquinazo
+barquinera
+barquino
+barr
+barra
+barraba`s
+barrabasada
+barrabee
+barrabel
+barrabki
+barrabkie
+barrable
+barrabor
+barrabora
+barraca
+barracan
+barrachel
+barrack
+barracke
+barracked
+barracker
+barracki
+barracking
+barracks
+barrackv
+barrackville
+barracla
+barraclade
+barraclo
+barraclough
+barraco`n
+barracoo
+barracoon
+barracou
+barracouta
+barracud
+barracuda
+barracudas
+barrad
+barrada
+barrado
+barraga`n
+barragan
+barragana
+barraganada
+barraganeri`a
+barraganete
+barragani`a
+barrage
+barraged
+barrages
+barragin
+barraging
+barragon
+barrah
+barraien
+barraient
+barrais
+barrait
+barral
+barramun
+barramunda
+barramundi
+barranca
+barrancal
+barranco
+barrancosa
+barrancoso
+barrandi
+barrandite
+barranqu
+barranquera
+barranquilla
+barranquitas
+barrant
+barrante
+barrantes
+barraque
+barraquera
+barraquero
+barraquillo
+barrar
+barrard
+barras
+barrass
+barrat
+barrater
+barrativ
+barrative
+barrator
+barratro
+barratrous
+barratrously
+barratry
+barratt
+barraud
+barrault
+barrawa
+barray
+barrd
+barre
+barre'
+barre'e
+barre'es
+barre's
+barre\a
+barre\o
+barre`re
+barre`rent
+barreal
+barrear
+barrearse
+barreau
+barreaux
+barred
+barreda
+barredera
+barredero
+barredor
+barredora
+barredou
+barredout
+barreduela
+barredura
+barree
+barrel
+barrelag
+barrelage
+barreled
+barreler
+barrelet
+barrelfu
+barrelful
+barrelhe
+barrelhead
+barrelin
+barreling
+barrell
+barrelle
+barrelled
+barrelli
+barrelling
+barrelma
+barrelmaker
+barrelmaking
+barrels
+barrelwi
+barrelwise
+barren
+barrena
+barrenar
+barrendera
+barrendero
+barrener
+barrenero
+barrenes
+barrenest
+barrenillo
+barrenly
+barrenne
+barrenness
+barreno
+barrens
+barrensp
+barrensprings
+barrent
+barrenwo
+barrenwort
+barrer
+barrera
+barrerai
+barreraient
+barrerais
+barrerait
+barreras
+barrerez
+barrerie
+barreriez
+barrerio
+barrerions
+barrero
+barreron
+barrerons
+barreront
+barres
+barreser
+barreserve
+barreserven
+barret
+barreta
+barrete
+barretear
+barretero
+barretina
+barreto
+barrets
+barrett
+barrettc
+barrettconnor
+barrette
+barretter
+barrettes
+barretts
+barreur
+barreurs
+barreuse
+barreuses
+barrevoe
+barrevoeter
+barrevoeters
+barrevoets
+barreyre
+barrez
+barri
+barriada
+barriaer
+barriaerer
+barrial
+barriar
+barriare
+barriarer
+barrica
+barricad
+barricada
+barricadaient
+barricadais
+barricadait
+barricadant
+barricade
+barricade'
+barricade'e
+barricade'es
+barricade's
+barricade`rent
+barricaded
+barricadeer
+barricadeerde
+barricadeerden
+barricadeert
+barricadegevecht
+barricadegevechten
+barricaden
+barricadenoorlog
+barricadenoorlogen
+barricadent
+barricader
+barricadera
+barricaderai
+barricaderaient
+barricaderais
+barricaderait
+barricaderas
+barricaderen
+barricaderez
+barricaderiez
+barricaderions
+barricaderons
+barricaderont
+barricaders
+barricades
+barricadez
+barricadiez
+barricading
+barricadions
+barricado
+barricadons
+barrico
+barrida
+barrido
+barrie
+barrie`r
+barrie`re
+barrie`res
+barrient
+barrientos
+barrier
+barriera
+barriere
+barriere-riff
+barrieren
+barrierer
+barrieres
+barriers
+barries
+barriez
+barriga
+barrigo`n
+barrigona
+barrigud
+barriguda
+barrigudo
+barriguera
+barrikad
+barrikade
+barrikaden
+barrikadene
+barrikader
+barrikadere
+barrikadert
+barrikaderte
+barrikin
+barril
+barrila
+barrilaje
+barrilamen
+barrilejo
+barrileri`a
+barrilero
+barrilete
+barrilla
+barrillar
+barrillera
+barrillero
+barrillo
+barrines
+barriness
+barring
+barringe
+barringer
+barringt
+barrington
+barringtonia
+barrio
+barrions
+barrios
+barriosa
+barrioso
+barrique
+barriques
+barrir
+barris
+barriscar
+barrisco
+barrisse
+barrissement
+barrissements
+barriste
+barrister
+barristerial
+barristers
+barristership
+barristr
+barristress
+barrito
+barritt
+barrizal
+barri{r
+barri{re
+barri{rer
+barro
+barro`n
+barroca
+barrocho
+barroco
+barrodal
+barrodale
+barron
+barronet
+barronett
+barrons
+barroom
+barrooms
+barroquismo
+barrosa
+barroso
+barrote
+barrow
+barrowbl
+barrowblade
+barrowcl
+barrowclough
+barrowfu
+barrowful
+barrowin
+barrowinfurness
+barrowis
+barrowist
+barrowma
+barrowman
+barrows
+barrowwi
+barrowwight
+barrs
+barru
+barrueco
+barrueto
+barrulee
+barrulet
+barrulety
+barruly
+barrumbada
+barrunta
+barruntador
+barruntadora
+barruntamiento
+barruntar
+barrunte
+barrunto
+barry
+barryman
+barrymor
+barrymore
+barryn
+barryton
+barrytow
+barrytown
+barryvil
+barryville
+bars
+barsabas
+barsac
+barsad
+barsalog
+barsalogo
+barsange
+barsanges
+barsch
+barscha
+barschaf
+barschaft
+barschaften
+barse
+barsel
+barselet
+barselpe
+barselpengene
+barselpenger
+barsels
+barselse
+barselseng
+barselsenga
+barselsengen
+barselsorlov
+barser
+barsha
+barshee
+barsheid
+barsine
+barsk
+barskap
+barskape
+barskapet
+barske
+barsking
+barskinger
+barskog
+barskoge
+barskogen
+barskt
+barsky
+barsler
+barslet
+barsoe
+barsom
+barsony
+barst
+barsten
+barstet
+barstool
+barstools
+barstow
+barstte
+barstten
+barszcze
+barszczewski
+bart
+barta
+bartang
+bartangi
+bartel
+bartell
+bartels
+bartelso
+barten
+bartend
+bartende
+bartended
+bartender
+bartenderen
+bartenders
+bartendi
+bartending
+bartends
+bartenie
+bartenieff
+barter
+bartered
+barterer
+barterers
+barterin
+bartering
+barterra
+barterrasse
+barters
+bartes
+barth
+bartha
+barthel
+barthele
+barthelemy
+barthelm
+barthelmes
+barthelmess
+barthite
+barthold
+barthole
+bartholemew
+bartholemy
+bartholi
+bartholinitis
+bartholo
+bartholomean
+bartholomeo
+bartholomeus
+bartholomew
+bartholomewtide
+bartholomite
+bartholonie
+bartie
+bartimae
+bartimaeus
+bartisan
+bartisans
+bartizan
+bartizaned
+bartizans
+bartkows
+bartkowska
+bartl
+bartle
+bartlemu
+bartlemud
+bartlemuds
+bartlemy
+bartlesv
+bartlesville
+bartlet
+bartlett
+bartletts
+bartley
+bartlmuh
+bartlmuhd
+bartlow
+bartly
+bartman
+barto
+bartoffs
+bartoffski
+bartok
+bartola
+bartold
+bartolem
+bartolemo
+bartoli
+bartolillo
+bartolina
+bartolme
+bartolo
+bartolom
+bartolome
+bartolomeo
+bartoluc
+bartolucci
+barton
+bartonci
+bartoncity
+bartonel
+bartonella
+bartonia
+bartonsv
+bartonsville
+bartosze
+bartoszewicz
+bartoszy
+bartoszyski
+bartow
+bartowna
+bartra
+bartram
+bartrami
+bartramia
+bartramiaceae
+bartramian
+bartschi
+bartsia
+barttrae
+barttraeger
+bartulear
+bartuleo
+bartush
+bartwuch
+bartwuchs
+barty
+bartz
+baru
+baru-n
+barua
+baruah
+barubado
+barubita
+barubits
+barubitu
+barubu
+baruca
+barucci
+baruch
+barue
+barueber
+barueberschuss
+baruffa
+baruffe
+baruga
+baruh
+baruk
+barukan
+barukoni
+baruku
+barullera
+barullero
+barullo
+barun
+barundi
+barunga
+baruria
+barusaru
+barusero
+baruya
+barvel
+barverdi
+barverdienst
+barverka
+barverkaeufe
+barverkaeufen
+barverkauf
+barverkaufspreis
+barverlu
+barverlust
+barverluste
+barverlustes
+barwal
+barware
+barwares
+barway
+barways
+barwick
+barwikow
+barwikowski
+barwin
+barwise
+barwon
+barwood
+barwyn
+bary
+barya
+baryachr
+baryachre
+barycent
+barycenter
+barycentric
+barye
+baryecoi
+baryecoia
+baryglos
+baryglossia
+barylali
+barylalia
+barylite
+baryon
+baryonic
+baryons
+baryphon
+baryphonia
+baryphonic
+baryphony
+baryram
+baryshni
+baryshnikov
+barysili
+barysilite
+barysphe
+barysphere
+baryta
+barytes
+barythym
+barythymia
+barytic
+barytine
+barytoca
+barytocalcite
+barytoce
+barytocelestine
+barytocelestite
+baryton
+barytone
+barytonen
+barytons
+barytonsangeren
+barytoph
+barytophyllite
+barytost
+barytostrontianite
+barytosu
+barytosulphate
+baryu
+barza
+barzahlu
+barzahlung
+barzahlungen
+barzal
+barzan
+barzell
+barzelli
+barzilla
+barzillai
+barzini
+barzo`n
+barzonear
+barzyk
+bas
+bas-aria
+bas-aria's
+bas-bleu
+bas-bleus
+bas-co^t
+bas-co^te'
+bas-co^te's
+bas-fond
+bas-fonds
+bas-reli
+bas-relief
+bas-reliefs
+bas-vent
+bas-ventre
+basa
+basa`ltica
+basa`ltico
+basa`ride
+basaa
+basabara
+basada
+basadae
+basai
+basaient
+basais
+basait
+basak
+basal
+basala
+basale
+basalia
+basally
+basalt
+basaltbl
+basaltblok
+basaltblokken
+basalten
+basaltes
+basaltic
+basaltif
+basaltiform
+basaltin
+basaltine
+basalto
+basaltoi
+basaltoid
+basaltpl
+basaltplateau
+basalts
+basamento
+basammo
+basan
+basando
+basane
+basane'
+basane'e
+basane'es
+basane's
+basaner
+basang
+basanga
+basanita
+basanite
+basano
+basant
+basap
+basar
+basaraba
+basarado
+basare
+basaree
+basaren
+basari
+basarinn
+basarinnslag
+basarono
+basars
+basarwa
+basashi
+basasi
+basasse
+basasser
+basassero
+basassi
+basassim
+basassimo
+basaste
+basasti
+basat
+basata
+basate
+basati
+basato
+basauri
+basava
+basavamo
+basavano
+basavate
+basavi
+basavo
+basawa
+basay
+basaya
+basbleu
+basca
+bascar
+basch
+basco
+bascolog
+bascology
+bascom
+bascomb
+bascombe
+bascopol
+bascopolus
+bascosa
+bascosidad
+bascoso
+bascot
+bascu\ana
+bascula
+basculai
+basculaient
+basculais
+basculait
+basculan
+basculant
+basculante
+basculantes
+basculants
+bascule
+bascule'
+bascule'e
+bascule'es
+bascule's
+bascule`
+bascule`rent
+basculeb
+basculebrug
+basculebruggen
+basculen
+basculent
+basculer
+basculera
+basculerai
+basculeraient
+basculerais
+basculerait
+basculeras
+basculerez
+basculeriez
+basculerions
+basculerons
+basculeront
+bascules
+basculesluiting
+basculesluitingen
+basculez
+basculie
+basculiez
+basculio
+basculions
+basculon
+basculons
+basdeo
+base
+base'
+base'e
+base'es
+base's
+base-bal
+base-ball
+base`ren
+base`rent
+baseball
+baseballdom
+baseballer
+baseballs
+baseballsaison
+baseband
+baseboar
+baseboard
+baseboards
+baseborn
+basebred
+baseca
+based
+basedon
+basedow
+baseer
+baseerde
+baseerden
+baseert
+basehart
+basehear
+basehearted
+baseheartedness
+basehor
+basei
+basel
+basela`cea
+basela`ceo
+baselard
+baseless
+baselessly
+baselessness
+baselike
+baseline
+baseliner
+baselines
+basella
+basellac
+basellaceae
+basellaceous
+basellan
+basellandschaft
+baselsta
+baselstadt
+basely
+baseman
+basemen
+basement
+basements
+basementward
+basemind
+baseminded
+basen
+basename
+basene
+baseness
+basenji
+basens
+basent
+baseomr}
+baseomr}det
+baseplat
+baseplate
+basepoin
+basepoint
+basepoli
+basepolitikk
+baser
+basera
+baserai
+baseraie
+baseraient
+baserais
+baserait
+baserann
+baseranno
+baseras
+basere
+baserebb
+baserebbe
+baserede
+baseregi
+baseregister
+baserei
+baseremm
+baseremmo
+baseremo
+baseren
+baserer
+baseres
+baserest
+basereste
+baseresti
+baseret
+baserete
+baserez
+baseriez
+baserion
+baserions
+basero
+baserons
+baseront
+basert
+baserte
+bases
+basest
+basetta
+basette
+basez
+basf
+basgitaa
+basgitaar
+basgitar
+basgitarist
+bash
+basha
+bashai
+bashamma
+bashan
+bashanha
+bashanhavothjair
+bashar
+basharaw
+basharawa
+bashaw
+bashawdo
+bashawdom
+bashawis
+bashawism
+bashawsh
+bashawship
+bashbazo
+bashbazouk
+bashed
+basheer
+bashemat
+bashemath
+basher
+bashers
+bashes
+bashful
+bashfull
+bashfully
+bashfuln
+bashfulness
+bashgal
+bashgali
+bashgari
+bashghar
+bashgharik
+bashi
+bashia	
+bashiatz
+bashic
+bashich
+bashiic
+bashiicc
+bashiiccentral
+bashilan
+bashilange
+bashilel
+bashilele
+bashin
+bashing
+bashir
+bashira
+bashiri
+bashis
+bashkard
+bashkardi
+bashkari
+bashkarik
+bashkir
+bashkiri
+bashkiria
+bashlyk
+bashmuri
+bashmuric
+basho
+bashogar
+bashomit
+bashou
+bashqala
+bashton
+bashu
+bashyam
+basi
+basi`lica
+basi`licas
+basia
+basia		
+basial
+basialve
+basialveolar
+basiamo
+basiarac
+basiarachnitis
+basiarachnoiditis
+basiate
+basiatio
+basiation
+basiatzs
+basibla
+basibrac
+basibracteolate
+basibran
+basibranchial
+basibranchiate
+basibreg
+basibregmatic
+basic
+basicall
+basically
+basichro
+basichromatic
+basichromatin
+basichromatinic
+basichromiole
+basicity
+basiclik
+basiclike
+basicpro
+basicprogramm
+basicran
+basicranial
+basics
+basicyto
+basicytoparaplastin
+basidia
+basidial
+basidigi
+basidigital
+basidigitale
+basidiog
+basidiogenetic
+basidiol
+basidiolichen
+basidiolichenes
+basidiom
+basidiomycete
+basidiomycetes
+basidiomycetous
+basidiop
+basidiophore
+basidios
+basidiospore
+basidiosporous
+basidium
+basidors
+basidorsal
+basie
+basier
+basieren
+basierend
+basierende
+basierenden
+basierender
+basierendes
+basiert
+basierte
+basierten
+basiertes
+basiez
+basifaci
+basifacial
+basifica
+basification
+basified
+basifier
+basifiers
+basifies
+basifixe
+basifixed
+basifuga
+basifugal
+basify
+basifyin
+basifying
+basigamo
+basigamous
+basigamy
+basigeni
+basigenic
+basigeno
+basigenous
+basiglan
+basiglandular
+basigyni
+basigynium
+basihyal
+basihyoi
+basihyoid
+basij
+basik
+basil
+basila
+basilaki
+basilan
+basilar
+basilarc
+basilarchia
+basilari
+basilary
+basilate
+basilateral
+basile
+basilea
+basileense
+basilemm
+basilemma
+basilense
+basileo
+basileus
+basilevs
+basilevsky
+basili
+basilia
+basilian
+basilic
+basilica
+basilicae
+basilical
+basilican
+basilicas
+basilicata
+basilicate
+basilich
+basiliche
+basilico
+basilico`n
+basilicon
+basilics
+basilidi
+basilidian
+basilidianism
+basiliek
+basilieken
+basiliekstijl
+basiliense
+basilika
+basilikum
+basilinn
+basilinna
+basilio
+basiliqu
+basilique
+basiliques
+basilisc
+basiliscan
+basiliscine
+basilisco
+basiliscus
+basilisk
+basilisken
+basilisks
+basiliss
+basilissa
+basilius
+basill
+basillen
+basiller
+basilosa
+basilosauridae
+basilosaurus
+basils
+basilwee
+basilweed
+basilysi
+basilysis
+basilyst
+basim
+basima
+basimeso
+basimesostasis
+basin
+basinasa
+basinasal
+basinasi
+basinasial
+basined
+basinerv
+basinerved
+basinet
+basinets
+basing
+basinger
+basinlik
+basinlike
+basino
+basins
+basinstr
+basinstrument
+basinstrumenten
+basiocci
+basioccipital
+basion
+basions
+basiophi
+basiophitic
+basiopht
+basiophthalmite
+basiophthalmous
+basiotri
+basiotribe
+basiotripsy
+basipara
+basiparachromatin
+basiparaplastin
+basipeta
+basipetal
+basiphob
+basiphobia
+basipodi
+basipodite
+basipoditic
+basipter
+basipterygial
+basipterygium
+basipterygoid
+basiq
+basique
+basiques
+basira
+basiradi
+basiradial
+basirhin
+basirhinal
+basiri
+basirost
+basirostral
+basis
+basisadr
+basisadresse
+basisarb
+basisarbeit
+basisbau
+basisbaustein
+basisch
+basische
+basischen
+basischer
+basisches
+basischt
+basiscop
+basiscopic
+basisdat
+basisdaten
+basisen
+basisert
+basisertrag
+basisexc
+basisexchange
+basisfir
+basisfirmware
+basisgro
+basisgro"ssen
+basishan
+basishandelingen
+basisjah
+basisjahr
+basisjahre
+basisk
+basiskam
+basiskamp
+basisken
+basiskennis
+basislag
+basislager
+basismat
+basismaterial
+basismis
+basismischung
+basisord
+basisordlister
+basispak
+basispaket
+basisphe
+basisphenoid
+basisphenoidal
+basispre
+basispreis
+basispreise
+basisprogrammel
+basisrat
+basisrate
+basissen
+basissof
+basissoftware
+basisstr
+basisstrecke
+basistar
+basistarief
+basistec
+basistechnik
+basisvaa
+basisvaardigheden
+basisvec
+basisvector
+basisviden
+basiswae
+basiswaehrung
+basiswis
+basiswissen
+basiszin
+basiszinsen
+basitemp
+basitemporal
+basittin
+basitting
+basivent
+basiventral
+basivert
+basivertebral
+bask
+baska
+baskale
+baskar
+baskaran
+baskatta
+baskcomb
+baskcombe
+baske
+basked
+basken
+baskenla
+baskenlandes
+baskenmu
+baskenmuetze
+baskenya
+baskenyang
+basker
+baskervi
+baskerville
+baskervilles
+basket
+basket-b
+basket-ball
+basketak
+basketaket
+basketba
+basketball
+basketballer
+basketballkaempfe
+basketballs
+basketballspillere
+basketfu
+basketful
+basketfuls
+basketin
+basketing
+basketli
+basketlike
+basketma
+basketmaker
+basketmaking
+basketo
+basketri
+basketries
+basketry
+baskets
+baskett
+baskette
+basketteur
+basketteurs
+basketteuse
+basketteuses
+basketto
+basketwa
+basketware
+basketwe
+basketweaving
+basketwo
+basketwoman
+basketwood
+basketwork
+basketworm
+baskin
+basking
+baskingr
+baskingridge
+baskir
+baskish
+baskoniz
+baskonize
+basks
+baskules
+baskuul
+baskuulb
+baskuulbrug
+baskuulbruggen
+baskuuls
+baskuulsluiting
+baskuulsluitingen
+basl
+basladyn
+basladynski
+basler
+baslern
+basmadji
+basmadjian
+basmath
+basna
+basner
+basnett
+baso
+basoche
+basoga
+basoid
+basoko
+basom
+basommat
+basommatophora
+basommatophorous
+bason
+basongo
+basons
+basoo
+basophil
+basophile
+basophilia
+basophilic
+basophilous
+basophob
+basophobia
+basopure
+basos
+basosi
+basossi
+basote
+basotho
+basparti
+baspartij
+baspartijen
+basque
+basquear
+basqued
+basques
+basquett
+basquette
+basqui\a
+basquilla
+basquine
+basquort
+basrah
+basrhin
+basria
+basrur
+bass
+bassa
+bassaeng
+bassai
+bassakad
+bassakaduna
+bassakom
+bassakomo
+bassakon
+bassakontagora
+bassakwo
+bassakwomu
+bassalia
+bassalian
+bassam
+bassan
+bassanel
+bassanello
+bassang
+bassanio
+bassanit
+bassanite
+bassanle
+bassanlegg
+bassano
+bassar
+bassara
+bassari
+bassarid
+bassaris
+bassariscus
+bassarisk
+bassas
+bassatsu
+bassatu
+basse
+basse-co
+basse-cour
+bassein
+basseino
+basseki
+bassekot
+bassekotto
+bassem
+bassemen
+bassement
+bassen
+bassenav
+bassenavarre
+basseng
+bassenge
+bassengene
+bassenger
+bassenget
+bassenor
+bassenormandie
+basser
+basseri
+basserma
+basserman
+bassermann
+basses
+basses-c
+basses-cours
+bassesse
+bassesses
+basset
+basseted
+basseter
+basseterre
+bassetho
+bassethoorn
+bassethoorns
+bassethoren
+bassethorens
+bassetit
+bassetite
+bassets
+bassett
+bassetta
+bassetti
+bassetting
+bassfiel
+bassfield
+bassfigu
+bassfigur
+bassgeig
+bassgeige
+bassgeigen
+bassgita
+bassgitarist
+bassharb
+bassharbor
+basshi
+basshist
+bassi
+bassia
+bassianu
+bassianus
+bassie
+bassigna
+bassignana
+bassil
+bassila
+bassin
+bassine
+bassiner
+bassines
+bassinet
+bassinets
+bassingw
+bassingwell
+bassinro
+bassinrose
+bassins
+bassist
+bassiste
+bassisten
+bassistes
+bassists
+basslake
+bassler
+bassleut
+bassleutel
+bassleutels
+bassly
+bassness
+basso
+bassoku
+basson
+bassons
+bassoon
+bassooni
+bassoonist
+bassoonists
+bassoons
+bassoril
+bassorilievo
+bassorin
+bassos
+bassossi
+bassou
+basspele
+basspeler
+basspelers
+bassschl
+bassschluessel
+bassschluesseln
+bassschluessels
+bassstim
+bassstimmen
+basstem
+basstemm
+basstemmen
+bassui
+bassuiow
+bassus
+basswood
+basswoods
+bassy
+bass{ng
+bast
+basta
+basta's
+bastaard
+bastaardeer
+bastaardeerde
+bastaardeerden
+bastaardeert
+bastaarden
+bastaarderen
+bastaardering
+bastaardij
+bastaardkind
+bastaardkinderen
+bastaardnachtegaal
+bastaardnachtegalen
+bastaards
+bastaardspin
+bastaardspinnen
+bastaardsuiker
+bastaardtaal
+bastaardtalen
+bastaarduitgang
+bastaarduitgangen
+bastaardvloek
+bastaardvloeken
+bastaardvorm
+bastaardvormen
+bastaardwoord
+bastaardwoorden
+bastaardzonen
+bastaardzoon
+bastaardzoons
+bastacht
+bastachtig
+bastachtige
+bastachtiger
+bastachtigst
+bastadamente
+bastai
+bastaje
+bastamente
+bastammo
+bastando
+bastani
+bastano
+bastant
+bastante
+bastantear
+bastantemente
+bastanteo
+bastantero
+bastar
+bastarac
+bastarache
+bastard
+bastarda
+bastarde
+bastardear
+bastardelo
+bastarden
+bastarderi`a
+bastardes
+bastardi
+bastardi`a
+bastardies
+bastardilla
+bastardillo
+bastardism
+bastardization
+bastardizations
+bastardize
+bastardized
+bastardizes
+bastardizing
+bastardl
+bastardliness
+bastardly
+bastardo
+bastardry
+bastards
+bastardy
+bastare
+bastari
+bastaron
+bastarono
+bastasse
+bastassero
+bastassi
+bastassimo
+bastaste
+bastasti
+bastata
+bastate
+bastati
+bastato
+bastava
+bastavam
+bastavamo
+bastavan
+bastavano
+bastavat
+bastavate
+bastavi
+bastavo
+baste
+bastear
+bastecedor
+bastecedora
+bastecimiento
+basted
+bastedad
+bastegor
+bastelei
+basteln
+bastelnd
+bastelnde
+bastelnden
+bastelnder
+bastelndes
+bastelst
+bastelstube
+bastelstunde
+bastelt
+bastelte
+bastelten
+basteltet
+basten
+baster
+bastera
+basterai
+basteran
+basteranno
+basterd
+basterde
+basterden
+basterdk
+basterdkind
+basterdkinderen
+basterdn
+basterdnachtegaal
+basterdnachtegalen
+basterds
+basterdspin
+basterdspinnen
+basterdsuiker
+basterdt
+basterdtaal
+basterdtalen
+basterdu
+basterduitgang
+basterduitgangen
+basterdv
+basterdvloek
+basterdvloeken
+basterdvorm
+basterdvormen
+basterdw
+basterdwoord
+basterdwoorden
+basterdz
+basterdzonen
+basterdzoon
+basterdzoons
+bastereb
+basterebbe
+basterei
+basterem
+basteremmo
+basteremo
+basteres
+bastereste
+basteresti
+basteret
+basterete
+basterna
+bastero
+basters
+bastes
+bastet
+bastetana
+bastetano
+basteza
+bastholm
+basti
+bastia
+bastiamo
+bastian
+bastiani
+bastiate
+bastida
+bastide
+bastidor
+bastien
+bastile
+bastiles
+bastilla
+bastille
+bastilles
+bastimen
+bastimentar
+bastimentero
+bastimenti
+bastimento
+bastin
+bastinad
+bastinade
+bastinado
+bastinadoes
+basting
+bastinga
+bastingage
+bastings
+bastino
+bastio`n
+bastion
+bastiona
+bastionary
+bastione
+bastioned
+bastionen
+bastionet
+bastions
+bastir
+bastitana
+bastitano
+bastite
+bastkeve
+bastkever
+bastkevers
+bastle
+bastnasi
+bastnasite
+basto
+basto`n
+baston
+bastona
+bastonada
+bastonai
+bastonam
+bastonammo
+bastonan
+bastonando
+bastonano
+bastonar
+bastonare
+bastonas
+bastonasse
+bastonassi
+bastonaste
+bastonasti
+bastonat
+bastonata
+bastonate
+bastonati
+bastonato
+bastonav
+bastonava
+bastonavi
+bastonavo
+bastonazo
+bastoncillo
+bastone
+bastonear
+bastoner
+bastonera
+bastonerai
+bastonerei
+bastonero
+bastoni
+bastonia
+bastoniamo
+bastoniate
+bastonin
+bastonino
+bastonna
+bastonnade
+bastonnades
+bastono
+bastos
+bastring
+bastringue
+bastringues
+bastrop
+basts
+bastu
+basu
+basua
+basue
+basuele
+basukett
+basuki
+basuku
+basulto
+basun
+basunen
+basuner
+basura
+basural
+basurale
+basurefu
+basurero
+basutei
+basuto
+basutola
+basutoland
+basviole
+basviolen
+basviool
+basya
+basye
+basyo
+basyogar
+basyou
+baszaire
+baszange
+baszanger
+baszangers
+baszi
+bat
+bat-flan
+bat-flanc
+bata
+bata-
+bata`n
+bataaf
+bataafs
+bataafse
+bataan
+bataat
+bataba
+batabata
+batacazo
+bataclan
+batad
+batadji
+batafura
+batagarn
+batagarna
+batagude
+batahola
+batai
+bataijuu
+bataille
+batailler
+batailles
+batailleur
+batailleurs
+batailleuse
+batailleuses
+bataillo
+bataillon
+bataillone
+bataillonen
+bataillons
+bataillonsstaerke
+batain
+batak
+batakan
+batake
+bataklik
+bataleur
+batalj
+batalje
+bataljen
+bataljon
+bataljonen
+bataljoner
+bataljons
+bataljonscommandant
+bataljonscommandanten
+bataljonssjef
+batalla
+batallador
+batalladora
+batallante
+batallar
+batallarosa
+batallaroso
+batallo`n
+batallola
+batallona
+batallosa
+batalloso
+batalov
+batammar
+batammaraba
+batan
+batanar
+batandee
+batandeewe
+batanear
+batanero
+batanes
+batang
+batanga
+batangab
+batangabakoko
+batangan
+batangas
+batanide
+batanides
+batanta
+bataola
+batara
+bataraki
+batasuke
+batata
+batatas
+bataten
+batati`n
+batatill
+batatilla
+batatsu
+batatu
+batau
+batauga
+bataven
+batavi
+batavia
+batavian
+batawana
+bataxan
+batayola
+batboy
+batboys
+batcave
+batch
+batcha
+batcham
+batched
+batcheff
+batcheld
+batchelder
+batchelo
+batchelor
+batcheng
+batchenga
+batcher
+batchers
+batches
+batching
+batchjob
+batchjobbet
+batchjobs
+batchkommandoen
+batchk|rsler
+batchor
+batchoun
+batchtow
+batchtown
+batcompu
+batcomputer
+batdamba
+batdambang
+bate
+batea
+batear
+bateau
+bateau-c
+bateau-citerne
+bateau-m
+bateau-mouche
+bateau-p
+bateau-pompe
+bateaux
+bateaux-
+bateaux-citernes
+bateaux-mouches
+bateaux-pompes
+bated
+bateg
+batehuela
+batei
+bateijin
+bateikei
+batek
+bateke
+batekes
+batel
+batelejo
+bateler
+batelera
+batelero
+bateleur
+bateleurs
+batelier
+bateliers
+bateller
+batellerie
+bateman
+batement
+baten
+bateo
+bateq
+bater
+batera
+bateren
+bateri`a
+batero
+bates
+batesbur
+batesburg
+batescit
+batescity
+bateslan
+batesland
+bateson
+batesson
+batest
+batesvil
+batesville
+batet
+batetang
+batetanga
+batetela
+batey
+batfish
+batfowl
+batfowle
+batfowler
+batfowli
+batfowling
+bath
+batha
+bathala
+bathazar
+bathbric
+bathbrick
+bathe
+batheabl
+batheable
+bathed
+bather
+bathers
+bathes
+bathetic
+bathetically
+bathflow
+bathflower
+bathgate
+bathhous
+bathhouse
+bathhouses
+bathhurs
+bathhurst
+bathi
+bathic
+bathilde
+bathing
+bathist
+bathists
+bathless
+bathman
+bathmat
+bathmic
+bathmism
+bathmotr
+bathmotropic
+bathmotropism
+bathochr
+bathochromatic
+bathochromatism
+bathochrome
+bathochromic
+bathochromy
+bathoflo
+bathoflore
+bathofloric
+batholit
+batholite
+batholith
+batholithic
+batholiths
+batholitic
+batholom
+batholomew
+bathomet
+bathometer
+bathonia
+bathonian
+bathopho
+bathophobia
+bathorse
+bathos
+bathoses
+bathrabb
+bathrabbim
+bathrick
+bathrobe
+bathrobes
+bathroom
+bathroomed
+bathrooms
+bathroot
+baths
+bathseba
+bathsheb
+bathsheba
+bathshua
+bathspri
+bathsprings
+bathtub
+bathtubs
+bathtubshaped
+bathudi
+bathukol
+bathukolpian
+bathukolpic
+bathurst
+bathvill
+bathvillite
+bathwort
+bathyal
+bathyane
+bathyanesthesia
+bathybia
+bathybian
+bathybic
+bathybiu
+bathybius
+bathycen
+bathycentesis
+bathychr
+bathychrome
+bathycol
+bathycolpian
+bathycolpic
+bathycur
+bathycurrent
+bathyest
+bathyesthesia
+bathygra
+bathygraphic
+bathyhyp
+bathyhyperesthesia
+bathyhypesthesia
+bathylim
+bathylimnetic
+bathylit
+bathylite
+bathylith
+bathylithic
+bathylitic
+bathymet
+bathymeter
+bathymetric
+bathymetrical
+bathymetrically
+bathymetry
+bathyoro
+bathyorographical
+bathypel
+bathypelagic
+bathypla
+bathyplankton
+bathysca
+bathyscaph
+bathyscaphe
+bathyscaphes
+bathysei
+bathyseism
+bathysma
+bathysmal
+bathysop
+bathysophic
+bathysophical
+bathysph
+bathysphere
+bathyspheres
+bathythe
+bathythermograph
+bati
+bati`n
+batiatar
+batiatus
+batibo
+batiborrillo
+batiburrillo
+baticabeza
+baticola
+baticor
+baticulo
+batida
+batidace
+batidaceae
+batidaceous
+batidera
+batidero
+batido
+batidor
+batidora
+batie
+batiente
+batifole
+batifoler
+batifulla
+batig
+batigai
+batigi
+batihoja
+batik
+batikan
+batike
+batiken
+batiker
+batiki
+batikk
+batikken
+batiks
+batikt
+batikte
+batikten
+batikuli
+batikulin
+batikuling
+batima`n
+batime`trica
+batime`trico
+batimento
+batimetri`a
+batimiento
+bating
+batinkof
+batinkoff
+batino
+batinti`n
+batiportar
+batiporte
+batir
+batis
+batist
+batista
+batiste
+batisten
+batisterio
+batistes
+batitina
+batitinan
+batiwai
+batjan
+batlan
+batlike
+batliner
+batling
+batlle
+batlon
+batlux
+batman
+batmen
+batmobil
+batmobile
+batna
+batnam
+batne
+batnet
+bato
+bato`metro
+batobrin
+batobrina
+batocrin
+batocrinidae
+batocrinus
+batodend
+batodendron
+batoid
+batoidei
+batojar
+batok
+batoka
+batologi`a
+batombu
+batomo
+baton
+batong
+batonga
+batongen
+batongto
+batongtou
+batonist
+batonistic
+batonne
+batonnum
+batonrou
+batonrouge
+batons
+batontac
+batonu
+batophob
+batophobia
+bator
+batory
+batou
+batoufam
+batougo
+batouri
+batousei
+batouyou
+batrachi
+batrachia
+batrachian
+batrachians
+batrachiate
+batrachidae
+batrachium
+batracho
+batrachoid
+batrachoididae
+batrachophagous
+batrachophidia
+batrachophobia
+batrachoplasty
+batrachospermum
+batracie
+batracien
+batraciens
+batracio
+bats
+batsaw
+batsbi
+batsbiit
+batsbiitsy
+batsheva
+batsi
+batsingo
+batsman
+batsmans
+batsmanship
+batsmen
+batson
+batster
+batsu
+batsubok
+batsubyo
+batsugun
+batsujir
+batsujou
+batsutai
+batsuzan
+batsuzok
+batsuzui
+batswana
+batswing
+batt
+batta
+batta-
+battage
+battagli
+battaglia
+battaglie
+battaien
+battaient
+battailo
+battailous
+battais
+battait
+battak
+battakhi
+battakhin
+battalia
+battalio
+battalion
+battalions
+battano
+battant
+battante
+battantes
+battants
+battari
+battaris
+battarism
+battarismus
+batte
+batteau
+batteaux
+batted
+battei
+batteing
+batteki
+battel
+batteler
+battelle
+battelli
+battello
+battels
+battemen
+battement
+battements
+battemmo
+batten
+battendo
+battened
+battener
+batteners
+battenin
+battening
+battens
+battent
+battente
+battenti
+batter
+battera
+batterab
+batterable
+batterai
+batteran
+batteranno
+batterca
+battercake
+batterdo
+batterdock
+battere
+battereb
+batterebbe
+battered
+batterei
+batterem
+batteremmo
+batteremo
+batterer
+batteres
+battereste
+batteresti
+batteret
+batterete
+batterfa
+batterfang
+batteri
+batteri-
+batteria
+batterid
+batteridrevet
+batterie
+batterieanschlu"sse
+batterieanschlu"ssen
+batteriebetriebenen
+batteried
+batterieen
+batteriegepuffert
+batteriegepuffertem
+batteriegepufferter
+batteriegepuffertes
+batterien
+batteriene
+batteries
+batteriesaeure
+batteriespannung
+batteriestromversorgung
+batteriet
+batterieversorgung
+batteriewechsel
+batterij
+batterijen
+batterijgeschut
+batterijtje
+batterijtjes
+batterin
+battering
+batteris
+batterisjef
+batterma
+batterman
+battero
+batteron
+batterono
+batters
+battersb
+battersby
+battersh
+battershill
+batterso
+batterson
+battery
+batterym
+batteryman
+batteryp
+batterypark
+battes
+battesim
+battesimi
+battesimo
+battesse
+battessero
+battessi
+battessimo
+batteste
+battesti
+battete
+battette
+battettero
+battetti
+batteur
+batteurs
+batteuse
+batteuses
+batteva
+battevam
+battevamo
+battevan
+battevano
+battevat
+battevate
+battevi
+battevo
+battexin
+battez
+battezza
+battezzai
+battezzano
+battezzare
+battezzata
+battezzate
+battezzati
+battezzato
+battezzava
+battezzavi
+battezzavo
+battezze
+battezzera
+battezzero
+battezzi
+battezzino
+battezzo
+batti
+battiamo
+battiate
+battical
+batticaloa
+batticuo
+batticuore
+batticuori
+battier
+battiest
+battiez
+battigah
+battik
+battiks
+battiman
+battimani
+battimano
+battines
+battiness
+batting
+battings
+battions
+battiren
+battirent
+battish
+battiste
+battisteri
+battistero
+battisto
+battiston
+battistr
+battistrada
+battit
+battiti
+battito
+battitur
+battitura
+battle
+battle-d
+battle-dress
+battle-dressen
+battle-dresses
+battleax
+battleaxe
+battlebo
+battleboro
+battlecr
+battlecreek
+battlecry
+battled
+battledo
+battledore
+battledores
+battledr
+battledress
+battlefi
+battlefield
+battlefields
+battlefr
+battlefront
+battlefronts
+battlefu
+battleful
+battlegr
+battleground
+battlegrounds
+battlela
+battlelake
+battleme
+battlement
+battlemented
+battlementmesa
+battlements
+battlemo
+battlemountain
+battlepl
+battleplane
+battler
+battlers
+battles
+battlesh
+battleship
+battleships
+battleso
+battlesome
+battlest
+battlestead
+battleto
+battletown
+battlevi
+battleview
+battlewa
+battlewagon
+battleward
+battlewi
+battlewise
+battling
+batto
+battolog
+battological
+battologist
+battologize
+battology
+battono
+battons
+battou
+battra
+battrai
+battraie
+battraient
+battrais
+battrait
+battras
+battre
+battrez
+battriez
+battrion
+battrions
+battrons
+battront
+batts
+battu
+battue
+battues
+battus
+battuta
+battute
+battuti
+battuto
+batty
+batu
+batua
+batuan
+batuboku
+batubyou
+batucar
+batuda
+batudo
+batueca
+batuecas
+batueco
+batuffol
+batuffoli
+batuffolo
+batugun
+batui
+batuiolo
+batuiolong
+batujiru
+batujou
+batukite
+batula
+batulapp
+batulappa
+batule
+batuley
+batuquear
+batura
+baturaja
+baturra
+baturrada
+baturrillo
+baturro
+batussi
+batuta
+batutai
+batuzang
+batuzoku
+batuzuih
+batwa
+batwing
+batwoman
+batwomen
+batya
+batyaru
+batyarut
+batyphon
+batyphone
+batz
+batzen
+bau
+bau`l
+bauabfae
+bauabfaelle
+bauabsch
+bauabschnitte
+bauabschnitts
+bauabtei
+bauabteilung
+bauaemte
+bauaemter
+bauaemtern
+bauamt
+bauan
+bauanlei
+bauanleitung
+bauantra
+bauantraege
+bauantraegen
+bauarbei
+bauarbeiter
+bauarbeitern
+bauarbeiters
+bauart
+bauarten
+bauaufla
+bauauflage
+bauauflagen
+bauausga
+bauausgaben
+baubau
+baubegin
+baubeginn
+bauberat
+bauberatung
+bauberei
+baubereich
+bauberuf
+baubesch
+baubeschraenkung
+baubesta
+baubestandteile
+bauble
+baublery
+baubles
+baubling
+baubo
+bauboom
+baubreit
+baubreite
+baubu"ro
+baubuero
+bauch
+bauchard
+bauchau
+bauchdec
+bauchdecke
+bauches
+bauchgri
+bauchgrimmen
+bauchi
+bauchlan
+bauchlandung
+bauchlandungen
+bauchle
+bauchmus
+bauchmuskeln
+bauchred
+bauchreden
+bauchredner
+bauchrednern
+bauchsch
+bauchschmerzen
+bauchspe
+bauchspeicheldru"se
+bauchspeicheldruese
+bauchta"
+bauchta"nzerin
+bauchweh
+bauci
+baucis
+bauckie
+bauckieb
+bauckiebird
+baucus
+baud
+baudais
+baudaran
+baudaranaike
+baudarle
+baudarlehen
+baudekin
+baudelai
+baudelaire
+baudenkm
+baudenkmaeler
+baudet
+baudets
+baudette
+baudi
+baudirek
+baudirektor
+baudji
+baudo
+baudoin
+baudouin
+baudrate
+baudratebestimmung
+baudraten
+baudrier
+baudriers
+baudroie
+baudroies
+baudrons
+baudruch
+baudruche
+baudruches
+bauds
+baudzi
+baue
+baueleme
+bauelemente
+bauelementen
+bauen
+bauend
+bauendem
+bauenden
+bauender
+bauer
+bauera
+bauern
+bauernau
+bauernaufstand
+bauernbe
+bauernbefeiung
+bauerndo
+bauerndorf
+bauerner
+bauernerhebungen
+bauernfa
+bauernfaengerei
+bauernfamilien
+bauernfr
+bauernfrau
+bauernfrauen
+bauernfu
+bauernfuehrer
+bauerngu
+bauerngut
+bauernha
+bauernhaeuser
+bauernhaeusern
+bauernhaus
+bauernhauses
+bauernho
+bauernhoefen
+bauernhof
+bauernhofes
+bauernju
+bauernjunge
+bauernko
+bauernkonkurse
+bauernku
+bauernkunst
+bauernla
+bauernland
+bauernpa
+bauernparadies
+bauernpartei
+bauernpr
+bauernpraesident
+bauernre
+bauernrevolte
+bauernsc
+bauernschaft
+bauernschlauen
+bauernschrank
+bauernso
+bauernsoehne
+bauernst
+bauernstaat
+bauernstuehle
+bauerntr
+bauerntrampel
+bauerntu
+bauerntum
+bauernve
+bauernverband
+bauernwi
+bauernwirtschaft
+bauers
+bauersfe
+bauersfelda
+bauersfr
+bauersfrau
+baufachm
+baufachmann
+baufachs
+baufachschule
+baufaell
+baufaellig
+baufaellige
+baufaelligen
+baufaelliger
+baufaelliges
+baufil
+baufila
+baufilen
+baufirma
+baufirme
+baufirmen
+bauflaec
+bauflaeche
+bauform
+bauforts
+baufortschritt
+baufu
+baufuehr
+baufuehrung
+baug
+bauge
+baugebie
+baugebiete
+baugelae
+baugelaende
+baugelaendes
+baugen
+baugeneh
+baugenehmigung
+baugenehmigungen
+baugerae
+baugeraeten
+baugeru"
+baugeru"ste
+baugerue
+baugeruest
+baugerueste
+baugeruestes
+bauges
+baugesch
+baugeschaefte
+baugeschaefts
+baugewer
+baugewerbe
+baugewerbes
+baugh
+baughan
+baughman
+baugnon
+baugroes
+baugroessen
+baugrube
+baugruen
+baugruenden
+baugrund
+baugrundstu"ck
+baugrundstueck
+baugrupe
+baugrupen
+baugrupp
+baugruppe
+baugruppen
+baugruppenlieferant
+baugruppentra"ger
+baugspry
+baugspryd
+baugsprydet
+baugtau
+baugtros
+baugtrosse
+bauhandw
+bauhandwerker
+bauhandwerkern
+bauhandwerkers
+bauhaus
+bauherr
+bauherre
+bauherren
+bauherri
+bauherrin
+bauhinia
+bauholz
+bauholze
+bauholzes
+bauhuett
+bauhuette
+bauingen
+bauingenieur
+bauingenieuren
+bauingenieurs
+bauingenieurwesen
+baujagoi
+baujahr
+baujahre
+baujahren
+baukaest
+baukaesten
+baukan
+baukaste
+baukasten
+baukastensystem
+baukaufm
+baukaufmann
+baukeram
+baukeramik
+baukoerp
+baukoerper
+baukolon
+baukolonnen
+baukompl
+baukomplex
+baukonju
+baukonjunktur
+baukonto
+baukontr
+baukontrolleur
+baukredi
+baukreditbank
+bauksitt
+bauksitten
+baukunst
+baul
+bauland
+baulandm
+baulandmangel
+baulast
+baulch
+baule
+bauleah
+bauleist
+bauleistungen
+baulero
+bauli
+bauliche
+baulichem
+baulichen
+bauling
+baulk
+baulked
+baulkier
+baulkies
+baulkiest
+baulking
+baulks
+baulky
+bauloewe
+baum
+bauman
+baumann
+baumans
+baumasch
+baumaschinen
+baumaschinenfabrik
+baumaschinenfertigung
+baumassn
+baumassnahme
+baumassnahmen
+baumater
+baumaterialien
+baumberg
+baumberger
+baume
+baumeia
+baumeist
+baumeister
+baumeisters
+baumeln
+baumelnd
+baumelnde
+baumelndem
+baumelnden
+baumelnder
+baumelndes
+baumelst
+baumelt
+baumelte
+baumelten
+baumeltest
+baumer
+baumert
+baumes
+baumetho
+baumethoden
+baumgart
+baumgarten
+baumgartner
+baumgrup
+baumgruppen
+baumhaue
+baumhauerite
+baumhoeh
+baumhoehle
+baumhoehlen
+bauminis
+bauminister
+bauministerium
+baumkatz
+baumkatzread
+baumkron
+baumkronen
+baumle
+baumon
+baums
+baumsche
+baumschere
+baumschu
+baumschule
+baumschulen
+baumspit
+baumspitzen
+baumsta"
+baumsta"mme
+baumstae
+baumstaemmen
+baumstam
+baumstamm
+baumstar
+baumstark
+baumstarke
+baumstarken
+baumstarker
+baumstarkes
+baumstru
+baumstru"nke
+baumstue
+baumstuempfe
+baumstum
+baumstumpf
+baumuste
+baumuster
+baumusterpru"fungen
+baumwipf
+baumwipfel
+baumwoll
+baumwollartikel
+baumwollbekleidung
+baumwollbranche
+baumwollenes
+baumwollernte
+baumwollerzeugnisse
+baumwollexport
+baumwollfarmer
+baumwollfelder
+baumwollgewebe
+baumwollproduktion
+baumwollsituation
+baumwollverarbeiter
+baumwollvorraete
+baumwollware
+baumwollwaren
+baumwollweisswaren
+baumzapf
+baumzapfen
+baun
+baundo
+baunen
+baungshe
+bauno
+bauordnu
+bauordnungsrecht
+bauparze
+bauparzelle
+bauparzellen
+bauplaen
+bauplaene
+bauplaet
+bauplaetze
+bauplaetzen
+bauplan
+bauplane
+bauplanes
+bauplans
+bauplanu
+bauplanung
+bauplatz
+bauplatzes
+baupoliz
+baupolizei
+baupre`s
+baupreis
+baupreisen
+baupreiserhoehung
+baupreissituation
+bauproje
+bauprojekt
+bauprojekts
+baur
+baurac
+baure
+baurecht
+baurechtliche
+baureife
+baureihe
+baurel
+bauri
+bauria
+baurisik
+baurisiko
+bauro
+bauruine
+bauruinen
+baus
+bausa"tz
+bausa"tzen
+bausa`n
+bausag
+bausaga
+bausana
+bausch
+bausche
+bauschen
+bauschend
+bauschendem
+bauschenden
+bauschender
+bauschig
+bauschige
+bauschigem
+bauschiger
+bauschiges
+bauschlo
+bauschlosser
+bauschlossern
+bauschlossers
+bauschst
+bauschte
+bauschten
+bauschtest
+bauschul
+bauschulte
+bausekto
+bausektor
+bausen
+bausetti
+baushi
+bauskizz
+bauskizzen
+bausman
+bauson
+bausond
+bauspard
+bauspardarlehen
+bauspare
+bauspareinlagen
+bausparern
+bauspark
+bausparkasse
+bausparkassen
+bausparkassenkatastrophe
+bausparkassenkrise
+bausparkassensicherungsfonds
+bausparp
+bausparpraemie
+bauspars
+bausparsumme
+bausparsummen
+bausparv
+bausparvertraegen
+bausparvertrag
+bausparvertrages
+bausparw
+bausparwesen
+bausperr
+bausperren
+baussy
+baust
+baustadt
+baustadtrat
+baustein
+bausteine
+bausteinen
+bausteines
+bausteins
+baustell
+baustelle
+baustellen
+baustellenbesetzung
+baustellenbesuchs
+baustil
+baustile
+baustilen
+baustiles
+baustoff
+baustoffe
+baustoffhandlung
+baustoffindustrie
+baustoffirma
+baustufe
+bausumme
+baut
+bauta
+bautaeti
+bautaetigkeit
+bautahar
+bautahari
+bautane
+bautaste
+bautastein
+bautasteinen
+baute
+bautechn
+bautechniker
+bautechnischem
+bauteil
+bauteile
+bauteilekosten
+bauteilen
+bauteilenamen
+bauteileseite
+bauteils
+bauteilseite
+bauten
+bautest
+bautet
+bauting
+bautinga
+bautinge
+bautingen
+bautismal
+bautismo
+bautista
+bautisterio
+bautizada
+bautizado
+bautizante
+bautizar
+bautizo
+bautraeg
+bautraeger
+bautraegerakrobaten
+bautraegergesellschaften
+bautraegerpleiten
+bautzen
+bauunion
+bauunter
+bauunternehmen
+bauunternehmern
+bauunternehmers
+bauverla
+bauverlag
+bauvorha
+bauvorhaben
+bauvorhabens
+bauvorsc
+bauvorschriften
+bauw
+bauwaki
+bauwde
+bauwden
+bauweise
+bauweisen
+bauwelt
+bauwen
+bauwerk
+bauwerke
+bauwerken
+bauwerkes
+bauwerte
+bauwt
+baux
+bauxiet
+bauxit
+bauxite
+bauxites
+bauxitit
+bauxitite
+bauxitt
+bauxitte
+bauxitten
+bauyu`a
+bauza
+bauzado
+bauzador
+bauzadora
+bauzeit
+bauzeite
+bauzeiten
+bauzi
+bauzo`n
+bauzusch
+bauzuschuesse
+bauzusta
+bauzustand
+bav
+bava
+bavadra
+bavagli
+bavaglio
+bavai
+bavaient
+bavais
+bavait
+bavani
+bavant
+bavard
+bavarda
+bavardag
+bavardage
+bavardages
+bavardai
+bavardaient
+bavardais
+bavardait
+bavardan
+bavardant
+bavarde
+bavarde'
+bavarde`
+bavarde`rent
+bavarden
+bavardent
+bavarder
+bavardera
+bavarderai
+bavarderaient
+bavarderais
+bavarderait
+bavarderas
+bavarderez
+bavarderiez
+bavarderions
+bavarderons
+bavarderont
+bavardes
+bavardez
+bavardie
+bavardiez
+bavardio
+bavardions
+bavardon
+bavardons
+bavards
+bavaria
+bavarian
+bavaroy
+bavary
+bavasser
+bave
+bave'
+bave'e
+bave'es
+bave's
+bave`ren
+bave`rent
+bavenite
+bavent
+baver
+bavera
+baverai
+baveraie
+baveraient
+baverais
+baverait
+baveras
+baverdag
+baverdage
+baverez
+baveri
+baveriez
+baverion
+baverions
+bavero
+baverons
+baveront
+baves
+bavet
+bavette
+bavetten
+bavettes
+baveuse
+baveuses
+baveux
+bavez
+baviaan
+baviaant
+baviaantje
+baviaantjes
+bavian
+bavianeg
+bavianegezicht
+bavianegezichten
+bavianen
+bavier
+baviere
+baviez
+bavin
+bavions
+bavius
+bavl
+bavle
+bavocher
+bavoir
+bavoirs
+bavon
+bavons
+bavoso
+bavure
+bavures
+baw
+bawa
+bawah
+bawaki
+bawan
+bawang
+bawarchi
+bawarchikhana
+bawari
+bawbee
+bawcock
+bawd
+bawdier
+bawdies
+bawdiest
+bawdily
+bawdines
+bawdiness
+bawdon
+bawdric
+bawdrics
+bawdries
+bawdry
+bawds
+bawdship
+bawdy
+bawdyhou
+bawdyhouse
+bawean
+bawek
+bawera
+bawku
+bawl
+bawlakhe
+bawled
+bawler
+bawlers
+bawley
+bawling
+bawls
+bawm
+bawn
+bawng
+bawo
+bawom
+bawra
+bawtie
+bawu
+bawule
+bawuli
+bax
+baxa
+baxevano
+baxevanos
+baxie
+baxley
+baxter
+baxteria
+baxterian
+baxterianism
+baxtersp
+baxtersprings
+baxtone
+baxy
+bay
+baya
+bayad
+bayade`r
+bayade`re
+bayade`res
+bayadera
+bayadere
+bayadh
+bayadi
+bayag
+bayai
+bayaka
+bayal
+bayali
+bayame`s
+bayamesa
+bayamo
+bayamon
+bayan
+bayana
+bayanga
+bayangi
+bayanhon
+bayanhongor
+bayano
+bayanolg
+bayanolgiy
+bayard
+bayardly
+bayarea
+bayari
+bayarte
+bayash
+bayat
+bayawan
+bayberri
+bayberries
+bayberry
+baybolt
+bayboro
+bayburt
+baybush
+baycente
+baycenter
+baycentr
+baycentral
+baycity
+baycuru
+bayda
+baye
+bayed
+bayer
+bayerin
+bayerinn
+bayerinnen
+bayerisc
+bayerisch
+bayerischen
+bayerisches
+bayerkoh
+bayerkohler
+bayern
+bayerske
+bayer|l
+bayer|le
+bayer|let
+bayes
+bayesian
+bayeta
+bayeto`n
+bayeux
+bayfield
+baygall
+baygo
+bayhead
+bayi
+baying
+bayino
+bayish
+bayit
+bayldon
+bayldoni
+bayldonite
+bayle
+bayles
+bayless
+baylet
+bayley
+baylike
+baylis
+bayliss
+baylonis
+baylonische
+baylor
+bayly
+bayman
+baymer
+bayminet
+bayminette
+baymuna
+baymunan
+baymunana
+baynawa
+bayne
+baynes
+bayness
+bayninan
+bayno
+bayo
+bayo`n
+bayobiri
+bayoco
+bayogoul
+bayogoula
+bayok
+bayola
+bayolje
+bayombe
+bayombon
+bayombong
+bayona
+bayone`s
+bayonense
+bayonesa
+bayonet
+bayoneta
+bayonetazo
+bayonete
+bayoneted
+bayoneteer
+bayoneti
+bayoneting
+bayonets
+bayonett
+bayonetted
+bayonetting
+bayong
+bayonne
+bayonnes
+bayonneskinke
+bayono
+bayoque
+bayosa
+bayot
+bayotte
+bayou
+bayougou
+bayougoula
+bayoulab
+bayoulabatre
+bayous
+bayouv
+baypines
+bayport
+bayrakta
+bayraktar
+bayreuth
+bayrisch
+bayrische
+bayrischem
+bayrischen
+bayrischer
+bayrut
+bays
+baysaint
+baysaintlouis
+bayshore
+bayside
+bayso
+baysprin
+baysprings
+baystate
+bayt
+baytown
+bayu`
+bayu`a
+bayuca
+bayview
+bayville
+baywood
+baywoods
+bayyu
+baz
+baza
+bazaar
+bazaars
+bazaartj
+bazaartje
+bazaartjes
+bazaine
+bazak
+bazan
+bazar
+bazarder
+bazarjan
+bazarjani
+bazars
+bazaru
+baze
+bazega
+bazel
+bazelde
+bazelden
+bazelen
+bazelt
+bazemore
+bazen
+bazenda
+bazerghi
+bazerman
+bazhi
+bazig
+baziga
+bazigar
+bazige
+baziger
+bazigst
+bazik
+bazillen
+bazin
+bazine
+bazinet
+bazinia
+bazinnen
+bazinnet
+bazinnetje
+bazinnetjes
+bazitouf
+baziuk
+bazlen
+bazlith
+bazluth
+bazo
+bazofia
+bazoku
+bazoo
+bazooka
+bazookas
+bazooki
+bazou
+bazouki
+bazucar
+bazuin
+bazuinbl
+bazuinblazer
+bazuinblazers
+bazuinde
+bazuinden
+bazuinen
+bazuinge
+bazuingeschal
+bazuintj
+bazuintje
+bazuintjes
+bazuquear
+bazuqueo
+bazyon
+bazyou
+bazyutsu
+bazyutu
+bazza
+bazzecol
+bazzecola
+bazzecole
+bazzi
+bazzite
+bb
+bb1
+bb2
+bb3
+bb4
+bba
+bbadha
+bbaggins
+bbakkin
+bbaledha
+bball
+bbb
+bbbb
+bbbbb
+bbbbbb
+bbbbbbb
+bbbbbbbb
+bbbbe
+bbbbut
+bbbppsll
+bbc
+bbcc
+bbcci
+bbcs
+bbd
+bbe
+bbf
+bbfff
+bbg
+bbh
+bbi
+bbj
+bbk
+bbl
+bbm
+bbn
+bbn-admi
+bbn-admin
+bbn-arpa
+bbn-arpa-tac
+bbn-cvax
+bbn-demo
+bbn-edno
+bbn-ednoc
+bbn-guav
+bbn-guava
+bbn-ment
+bbn-mentor
+bbn-mil-
+bbn-mil-tac
+bbn-papa
+bbn-papaya
+bbn-pine
+bbn-pineapple
+bbn-pr-g
+bbn-pr-gw
+bbn-psat
+bbn-psat-ig
+bbn-stra
+bbn-strawberry
+bbn-van-
+bbn-van-gw
+bbn-vulc
+bbn-vulcan
+bbn-x25-
+bbn-x25-gw
+bbn-x25-test3
+bbn-x25-test4
+bbncc
+bbncc-co
+bbncc-columbia
+bbncc-eu
+bbncc-eur
+bbncc-wa
+bbncc-washington
+bbncca
+bbnccb
+bbnccc
+bbnccd
+bbncce
+bbnccf
+bbnccg
+bbncci
+bbnccla
+bbnccq
+bbnccu
+bbnccx
+bbnccy
+bbnj
+bbnlisp
+bbnnet2
+bbnnet2-
+bbnnet2-arpanet-gw
+bbnz
+bbo
+bboard
+bboards
+bboards1
+bbokka
+bbotsugo
+bbp
+bbq
+bbr
+bbroyg
+bbroygbv
+bbroygbvgw
+bbs
+bbsc
+bbses
+bbss
+bbssi
+bbt
+bbu
+bbv
+bbw
+bbx
+bby
+bbz
+bc
+bc1
+bc2
+bc3
+bca
+bcallaha
+bcb
+bcc
+bcd
+bce
+bce1
+bce2
+bcf
+bcg
+bcgunt
+bch
+bci
+bcie
+bcj
+bck
+bcl
+bcm
+bcms
+bcn
+bcnu
+bco
+bco-mult
+bco-multics
+bcp
+bcpl
+bcplbody
+bcplci
+bcplcp
+bcplhead
+bcplheadline
+bcpllb
+bcplmain
+bcplnum
+bcpltail
+bcq
+bcr
+bcs
+bcspatch
+bct
+bcu
+bcv
+bcx
+bcy
+bcz
+bd
+bda
+bdb
+bdc
+bdd
+bde
+bdellid
+bdellida
+bdellidae
+bdellium
+bdelloid
+bdelloida
+bdellost
+bdellostoma
+bdellostomatidae
+bdellostomidae
+bdelloto
+bdellotomy
+bdellour
+bdelloura
+bdellouridae
+bdf
+bdffe
+bdg
+bdh
+bdi
+bdj
+bdk
+bdl
+bdm
+bdmsc
+bdmsc-hu
+bdmsc-hunt
+bdn
+bdo
+bdp
+bdq
+bdr
+bdrm
+bds
+bdt
+bdu
+bdv
+bdw
+bdx
+bdy
+bdz
+be
+be'ant
+be'ante
+be'antes
+be'ants
+be'at
+be'ate
+be'ateme
+be'atement
+be'ates
+be'atifi
+be'atification
+be'atifier
+be'atitu
+be'atitude
+be'atitudes
+be'ats
+be'be'
+be'be's
+be'cane
+be'canes
+be'carre
+be'carres
+be'casse
+be'casses
+be'cassi
+be'cassine
+be'cassines
+be'chame
+be'chamel
+be'coter
+be'e
+be'er
+be'es
+be'gaie
+be'gaiem
+be'gaiement
+be'gaiements
+be'gaien
+be'gaient
+be'gaier
+be'gaiera
+be'gaierai
+be'gaieraient
+be'gaierais
+be'gaierait
+be'gaieras
+be'gaierez
+be'gaieriez
+be'gaierions
+be'gaierons
+be'gaieront
+be'gaies
+be'gaya
+be'gayai
+be'gayaient
+be'gayais
+be'gayait
+be'gayan
+be'gayant
+be'gaye
+be'gaye'
+be'gaye'e
+be'gaye'es
+be'gaye's
+be'gaye`
+be'gaye`rent
+be'gayen
+be'gayent
+be'gayer
+be'gayera
+be'gayerai
+be'gayeraient
+be'gayerais
+be'gayerait
+be'gayeras
+be'gayerez
+be'gayeriez
+be'gayerions
+be'gayerons
+be'gayeront
+be'gayes
+be'gayez
+be'gayie
+be'gayiez
+be'gayio
+be'gayions
+be'gayon
+be'gayons
+be'gonia
+be'gonias
+be'guete
+be'gueter
+be'gueul
+be'gueule
+be'gueules
+be'guin
+be'lie`r
+be'lie`re
+be'lie`res
+be'lier
+be'liers
+be'louga
+be'lougas
+be'luga
+be'lugas
+be'mol
+be'molis
+be'moliser
+be'mols
+be'ne'di
+be'ne'dictin
+be'ne'dictine
+be'ne'dictines
+be'ne'dictins
+be'ne'diction
+be'ne'dictions
+be'ne'fi
+be'ne'fice
+be'ne'fices
+be'ne'ficia
+be'ne'ficiaient
+be'ne'ficiaire
+be'ne'ficiaires
+be'ne'ficiais
+be'ne'ficiait
+be'ne'ficiant
+be'ne'ficie
+be'ne'ficie'
+be'ne'ficie`rent
+be'ne'ficient
+be'ne'ficier
+be'ne'ficiera
+be'ne'ficierai
+be'ne'ficieraient
+be'ne'ficierais
+be'ne'ficierait
+be'ne'ficieras
+be'ne'ficierez
+be'ne'ficieriez
+be'ne'ficierions
+be'ne'ficierons
+be'ne'ficieront
+be'ne'ficies
+be'ne'ficiez
+be'ne'ficiiez
+be'ne'ficiions
+be'ne'ficions
+be'ne'fique
+be'ne'fiques
+be'ne'vo
+be'ne'volat
+be'ne'vole
+be'ne'volement
+be'ne'voles
+be'ni
+be'nie
+be'nies
+be'nigne
+be'nignes
+be'nin
+be'nins
+be'nir
+be'nira
+be'nirai
+be'niraient
+be'nirais
+be'nirait
+be'niras
+be'niren
+be'nirent
+be'nirez
+be'nirie
+be'niriez
+be'nirio
+be'nirions
+be'niron
+be'nirons
+be'niront
+be'nis
+be'nissa
+be'nissaient
+be'nissais
+be'nissait
+be'nissant
+be'nisse
+be'nissent
+be'nisses
+be'nissez
+be'nissi
+be'nissiez
+be'nissions
+be'nisso
+be'nissons
+be'nit
+be'nite
+be'nites
+be'nitie
+be'nitier
+be'nitiers
+be'nits
+be'otien
+be'otienne
+be'otiennes
+be'otiens
+be'quete
+be'queter
+be'quill
+be'quille
+be'quiller
+be'quilles
+be'ret
+be'rets
+be'ribe'
+be'ribe'ri
+be'tail
+be'taill
+be'taille`re
+be'taille`res
+be'tails
+be'ton
+be'tonna
+be'tonnage
+be'tonnaient
+be'tonnais
+be'tonnait
+be'tonnant
+be'tonne
+be'tonne'
+be'tonne'e
+be'tonne'es
+be'tonne's
+be'tonne`rent
+be'tonnent
+be'tonner
+be'tonnera
+be'tonnerai
+be'tonneraient
+be'tonnerais
+be'tonnerait
+be'tonneras
+be'tonnerez
+be'tonneriez
+be'tonnerions
+be'tonnerons
+be'tonneront
+be'tonnes
+be'tonneuse
+be'tonneuses
+be'tonnez
+be'tonni
+be'tonniez
+be'tonnions
+be'tonno
+be'tonnons
+be'vue
+be'vues
+be-bop
+be-kon
+be-ringu
+be-ru
+be-su
+be-ta
+be^cha
+be^chaie
+be^chaient
+be^chais
+be^chait
+be^chant
+be^che
+be^che'
+be^che'e
+be^che'es
+be^che's
+be^che`r
+be^che`rent
+be^chent
+be^cher
+be^chera
+be^cherai
+be^cheraient
+be^cherais
+be^cherait
+be^cheras
+be^chere
+be^cherez
+be^cheri
+be^cheriez
+be^cherions
+be^chero
+be^cherons
+be^cheront
+be^ches
+be^cheve
+be^cheveter
+be^chez
+be^chiez
+be^chion
+be^chions
+be^chons
+be^lant
+be^lante
+be^lantes
+be^lants
+be^lemen
+be^lement
+be^lements
+be^ler
+be^te
+be^temen
+be^tement
+be^tes
+be^tifie
+be^tifier
+be^tise
+be^tises
+be`beda
+be`bedo
+be`gue
+be`gues
+be`lgica
+be`lgico
+be`lica
+be`lico
+be`rbero
+be`rberos
+be`stola
+be`tica
+be`tico
+bea
+beaamd
+beaamde
+beaamden
+beaardin
+beaarding
+beaban
+beabsich
+beabsichtegende
+beabsichtigen
+beabsichtigend
+beabsichtigendem
+beabsichtigender
+beabsichtigendes
+beabsichtigst
+beabsichtigt
+beabsichtigte
+beabsichtigtem
+beabsichtigten
+beabsichtigter
+beabsichtigtes
+beabsichtigtest
+beabsichtigtet
+beach
+beacham
+beachboy
+beachboys
+beachcit
+beachcity
+beachcom
+beachcomb
+beachcomber
+beachcombers
+beachcombing
+beached
+beaches
+beachhav
+beachhaven
+beachhea
+beachhead
+beachheads
+beachie
+beachier
+beachies
+beachiest
+beaching
+beachlak
+beachlake
+beachlam
+beachlamar
+beachles
+beachless
+beachman
+beachmas
+beachmaster
+beachte
+beachten
+beachtend
+beachtende
+beachtenden
+beachtender
+beachtendes
+beachtenswerte
+beachtenswertem
+beachtenswerten
+beachtenswertere
+beachtenswerterem
+beachtenswerteren
+beachtenswerteres
+beachtenswertes
+beachtenswerteste
+beachtenswertesten
+beachtenswertester
+beachtenswertestes
+beachtet
+beachtete
+beachtetem
+beachteter
+beachtetes
+beachtetest
+beachtli
+beachtlich
+beachtliche
+beachtlichem
+beachtlicher
+beachtlichere
+beachtlicherem
+beachtlicherer
+beachtlicheres
+beachtliches
+beachtlichstem
+beachtlichsten
+beachtlichster
+beachtun
+beachtung
+beachwar
+beachward
+beachwoo
+beachwood
+beachy
+beaciense
+beacon
+beaconag
+beaconage
+beaconed
+beaconfa
+beaconfalls
+beaconin
+beaconing
+beaconle
+beaconless
+beacons
+beaconsf
+beaconsfield
+beaconwi
+beaconwise
+bead
+beada
+beaded
+beadell
+beadem
+beademd
+beademde
+beademden
+beademen
+beademt
+beader
+beadflus
+beadflush
+beadhous
+beadhouse
+beadier
+beadiest
+beadily
+beadines
+beadiness
+beading
+beadings
+beadle
+beadledo
+beadledom
+beadleho
+beadlehood
+beadleis
+beadleism
+beadlery
+beadles
+beadlesh
+beadleship
+beadlet
+beadley
+beadlike
+beadling
+beadman
+beadmen
+beadroll
+beadrolls
+beadrow
+beads
+beadsman
+beadsmen
+beadswom
+beadswoman
+beadwork
+beadworks
+beady
+beaengst
+beaengstige
+beaengstigen
+beaengstigend
+beaengstigendem
+beaengstigenden
+beaengstigender
+beaengstigst
+beaengstigt
+beaengstigte
+beaengstigten
+beaengstigter
+beaengstigtes
+beaengstigtet
+beaeugen
+beafada
+beagell
+beagle
+beagles
+beagley
+beagling
+beah
+beainy
+beak
+beak*
+beaked
+beaker
+beakerfu
+beakerful
+beakerma
+beakerman
+beakerme
+beakermen
+beakers
+beakful
+beakhead
+beakier
+beakiest
+beakins
+beakiron
+beakless
+beaklike
+beaks
+beakta
+beakte
+beaky
+beal
+beala
+beale
+beale-am
+beale-am1
+beale-pi
+beale-piv-1
+bealeton
+bealiah
+bealing
+beall
+beallach
+bealle
+beallsvi
+beallsville
+bealoth
+beals
+bealtare
+bealtared
+bealtine
+bealtuin
+bealtuinn
+beam
+beamage
+beaman
+beambird
+beambte
+beambten
+beamed
+beamen
+beamer
+beamers
+beames
+beamfill
+beamfilling
+beamful
+beamhous
+beamhouse
+beami
+beamier
+beamily
+beamines
+beaminess
+beaming
+beamingl
+beamingly
+beamish
+beamless
+beamlet
+beamlike
+beamman
+beammeup
+beamonte`s
+beamontesa
+beams
+beamsman
+beamster
+beamte
+beamten
+beamtena
+beamtenabbau
+beamtenadel
+beamtenapparate
+beamtenb
+beamtenbeleidigung
+beamtenbesoldung
+beamtenbundes
+beamtene
+beamteneid
+beamtenerfahrungen
+beamteng
+beamtengehaelter
+beamtengesetz
+beamtengruppe
+beamteno
+beamtenordnung
+beamtenr
+beamtenrechtliche
+beamtenrechtlicher
+beamtens
+beamtenschaft
+beamtenstellen
+beamter
+beamtin
+beamtinn
+beamtinnen
+beamwork
+beamy
+bean
+bean-hol
+bean-hollow
+beana
+beanbag
+beanbags
+beanball
+beanballs
+beanchar
+beanchard
+beancod
+beaned
+beaner
+beanerie
+beaneries
+beaners
+beanery
+beanfeas
+beanfeast
+beanfeaster
+beanfiel
+beanfield
+beangst
+beangste
+beangster
+beangsti
+beangstig
+beangstigd
+beangstigde
+beangstigden
+beangstigen
+beangstiging
+beangstigt
+beangstm
+beangstmeest
+beanholl
+beanhollow
+beanie
+beanies
+beaning
+beanlike
+beano
+beanpole
+beanpoles
+beans
+beansett
+beansetter
+beanshoo
+beanshooter
+beanspru
+beanspruchen
+beanspruchend
+beanspruchende
+beanspruchenden
+beanspruchender
+beanspruchendes
+beansprucht
+beanspruchte
+beanspruchtem
+beanspruchten
+beanspruchter
+beanspruchtes
+beanspruchtest
+beanspruchungen
+beanstal
+beanstalk
+beanstalks
+beanstan
+beanstandbaren
+beanstande
+beanstanden
+beanstandende
+beanstandendem
+beanstandenden
+beanstandendes
+beanstandest
+beanstandet
+beanstandete
+beanstandetem
+beanstandeten
+beanstandeter
+beanstandetest
+beanstandetet
+beanstandung
+beanstandungen
+beanstat
+beanstation
+beant
+beantrae
+beantraegst
+beantrag
+beantragen
+beantragend
+beantragende
+beantragendem
+beantragender
+beantragendes
+beantragt
+beantragtem
+beantragten
+beantragter
+beantragtest
+beantragtet
+beantwoo
+beantwoord
+beantwoordde
+beantwoordden
+beantwoorde
+beantwoorden
+beantwoording
+beantwoordt
+beantwor
+beantworte
+beantworten
+beantwortende
+beantwortendem
+beantwortenden
+beantwortendes
+beantwortest
+beantwortet
+beantwortetem
+beantworteten
+beantworteter
+beantwortetest
+beantwortetet
+beantwortung
+beanweed
+beany
+beaprone
+beaproned
+bear
+bearable
+bearableness
+bearably
+bearance
+bearbait
+bearbaiter
+bearbaiting
+bearbane
+bearbeid
+bearbeidde
+bearbeidden
+bearbeide
+bearbeidelse
+bearbeidelser
+bearbeiden
+bearbeider
+bearbeides
+bearbeidet
+bearbeiding
+bearbeidingen
+bearbeidt
+bearbeit
+bearbeite
+bearbeiten
+bearbeitend
+bearbeitende
+bearbeitendem
+bearbeitenden
+bearbeitender
+bearbeitendes
+bearbeitest
+bearbeitet
+bearbeitete
+bearbeitetem
+bearbeiteten
+bearbeitetes
+bearbeitetest
+bearbeitetet
+bearbeitung
+bearbeitungen
+bearbejd
+bearbejde
+bearbejdes
+bearbejdning
+bearbejdningen
+bearberr
+bearberries
+bearberry
+bearbeta
+bearbetn
+bearbetning
+bearbetningar
+bearbetningen
+bearbetningsbeskrivning
+bearbetningsmix
+bearbind
+bearbine
+bearbran
+bearbranch
+bearcat
+bearcats
+bearcoot
+bearcree
+bearcreek
+beard
+bearded
+bearden
+bearder
+beardie
+bearding
+beardles
+beardless
+beardlessness
+beardmor
+beardmore
+beardom
+beards
+beardsfo
+beardsfork
+beardsle
+beardsley
+beardsto
+beardstown
+beardton
+beardtongue
+beardy
+beare
+beared
+bearer
+bearers
+beares
+bearess
+bearest
+beareth
+bearfoot
+beargume
+beargumenteer
+bearherd
+bearhide
+bearhoun
+bearhound
+bearing
+bearings
+bearingu
+bearish
+bearishl
+bearishly
+bearishn
+bearishness
+bearlake
+bearlet
+bearlike
+bearm
+bearman
+bearmoun
+bearmountain
+bearnard
+bearne`s
+bearnes
+bearnesa
+bearpaw
+bearrive
+bearrivercity
+bears
+bearse
+bearship
+bearskin
+bearskins
+bearst
+bearsvil
+bearsville
+bearth
+beartong
+beartongue
+beartoot
+beartooth
+bearward
+bearwood
+bearwort
+beas
+beaschie
+beasely
+beasem
+beasemd
+beasemde
+beasemden
+beasemen
+beasemt
+beasley
+beason
+beast
+beastban
+beastbane
+beastdom
+beasthoo
+beasthood
+beastie
+beastieb
+beasties
+beastily
+beastish
+beastishness
+beastlie
+beastlier
+beastliest
+beastlik
+beastlike
+beastlil
+beastlily
+beastlin
+beastliness
+beastling
+beastlings
+beastly
+beastman
+beasts
+beastshi
+beastship
+beat
+beat*
+beata
+beatable
+beatably
+beatae
+beate
+beatee
+beaten
+beatenon
+beater
+beateri`a
+beaterio
+beaterma
+beaterman
+beaters
+beatest
+beateth
+beatfan
+beatgrup
+beatgruppe
+beatgruppen
+beath
+beathbdp
+beati
+beati`fica
+beati`ficamente
+beati`fico
+beati`simo
+beatic
+beatie
+beatific
+beatificacio`n
+beatifical
+beatifically
+beatificante
+beatificar
+beatificate
+beatificatie
+beatificaties
+beatification
+beatifie
+beatified
+beatifies
+beatify
+beatifyi
+beatifying
+beatilla
+beatines
+beatinest
+beating
+beatings
+beatit
+beatitid
+beatitide
+beatitud
+beatitude
+beatitudes
+beatles
+beatloka
+beatlokal
+beatmet
+beatmung
+beatmusi
+beatmusik
+beatnik
+beatniks
+beato
+beaton
+beatplat
+beatplatte
+beatrice
+beatrice_tinsley
+beatricetinsley
+beatrisa
+beatrise
+beatrisen
+beatrix
+beatriz
+beats
+beatster
+beattie
+beattie-
+beattie-hillier
+beattie1
+beattie2
+beatty
+beattyvi
+beattyville
+beatuca
+beatuco
+beatus
+beaty
+beau
+beau-fil
+beau-fils
+beau-fre
+beau-fre`re
+beau-pe`
+beau-pe`re
+beaubien
+beaucair
+beaucaire
+beaucatc
+beaucatcher
+beauchai
+beauchaine
+beaucham
+beauchamp
+beauchan
+beauchanps
+beauchem
+beauchemin
+beaucler
+beauclerc
+beauclere
+beaucoup
+beaudet
+beaudett
+beaudette
+beaudin
+beaudine
+beaudoin
+beaudray
+beaudric
+beaudricourt
+beaudry
+beaufin
+beauford
+beaufort
+beauforthavet
+beaufortskala
+beaufsch
+beaufschlagen
+beaufschlagt
+beaufschlagter
+beaufschlagungen
+beaufsic
+beaufsichtige
+beaufsichtigend
+beaufsichtigende
+beaufsichtigendem
+beaufsichtigender
+beaufsichtigendes
+beaufsichtigst
+beaufsichtigte
+beaufsichtigtem
+beaufsichtigten
+beaufsichtigtes
+beaufsichtigtest
+beaufsichtigtet
+beaufsichtigung
+beaufsichtigungen
+beauftra
+beauftrage
+beauftragen
+beauftragend
+beauftragendem
+beauftragenden
+beauftragender
+beauftragt
+beauftragte
+beauftragtem
+beauftragtes
+beauftragtest
+beauftragtet
+beaugard
+beaugarde
+beauharn
+beauharnais
+beauish
+beauism
+beaujola
+beaujolais
+beaule
+beaulieu
+beaumier
+beaumont
+beaumontia
+beaune
+beaupere
+beaupert
+beauperthuis
+beaupre
+beaupre'
+beaurega
+beauregard
+beaus
+beausean
+beauseant
+beausejo
+beausejour
+beauship
+beaut
+beaute
+beaute'
+beaute's
+beauteou
+beauteous
+beauteously
+beauteousness
+beauti
+beautici
+beautician
+beauticians
+beautie
+beautied
+beauties
+beautifi
+beautification
+beautifications
+beautified
+beautifier
+beautifiers
+beautifies
+beautifu
+beautiful
+beautifully
+beautifulness
+beautify
+beautifying
+beautiho
+beautihood
+beautile
+beautiless
+beauts
+beauty
+beauty-c
+beauty-center
+beautyba
+beautybag
+beautybo
+beautyboks
+beautydo
+beautydom
+beautysh
+beautyship
+beauvais
+beauvois
+beauvoisin
+beauvy
+beaux
+beaux-ar
+beaux-arts
+beaux-fi
+beaux-fils
+beaux-fr
+beaux-fre`res
+beaux-pa
+beaux-parents
+beaux-pe
+beaux-pe`res
+beavan
+beaver
+beaverba
+beaverbay
+beaverbo
+beaverboard
+beaverbr
+beaverbrook
+beaverci
+beavercity
+beavercr
+beavercreek
+beavercrossing
+beaverda
+beaverdale
+beaverdam
+beaverdams
+beavered
+beaveret
+beaverette
+beaverfa
+beaverfalls
+beaverin
+beavering
+beaveris
+beaverish
+beaverism
+beaverit
+beaverite
+beaveriz
+beaverize
+beaverki
+beaverkill
+beaverkin
+beaverle
+beaverlett
+beaverli
+beaverlike
+beaverme
+beavermeadows
+beaverpe
+beaverpelt
+beaverro
+beaverroot
+beavers
+beaverse
+beaversekani
+beaversp
+beaversprings
+beaverte
+beaverteen
+beaverto
+beaverton
+beavertown
+beavervi
+beaverville
+beaverwo
+beaverwood
+beavery
+beavie
+beavingt
+beavington
+beavis
+beavon
+beaya
+beb
+beba
+bebaada
+bebabefa
+bebabefang
+beback
+bebada
+bebadji
+bebai
+bebait
+bebaken
+bebakend
+bebakende
+bebakenden
+bebakene
+bebakenen
+bebakeni
+bebakening
+bebakeningen
+bebakent
+beballed
+beban
+bebang
+bebanner
+bebannered
+bebar
+bebaroe
+bebaron
+bebaste
+bebat
+bebathe
+bebatter
+bebauen
+bebauend
+bebauende
+bebauenden
+bebauender
+bebauendes
+bebaut
+bebaute
+bebautem
+bebauter
+bebautes
+bebautest
+bebauung
+bebauungsplan
+bebay
+bebayaga
+bebayaka
+bebber
+bebda
+bebdar
+bebdez
+bebdo
+bebe
+bebeast
+bebed
+bebedera
+bebedero
+bebediza
+bebedizo
+bebedor
+bebedora
+bebee
+bebeerin
+bebeerine
+bebeeru
+bebei
+bebel
+bebele
+bebeli
+bebelted
+beben
+bebend
+bebende
+bebenden
+bebender
+bebendes
+bebeng
+bebent
+beber
+beberi`a
+beberro`n
+beberrona
+bebert
+bebestible
+bebetura
+bebi
+bebi-
+bebi-zu
+bebible
+bebida
+bebido
+bebienda
+bebiente
+bebilya
+bebind
+bebinden
+bebindt
+bebistrajo
+bebite
+bebizati
+bebization
+bebizu
+beblaard
+beblaarde
+beblader
+bebladerd
+bebladerde
+beblain
+beblear
+bebled
+bebless
+bebliste
+beblister
+bebloed
+bebloede
+beblood
+bebloom
+beblotch
+beblubbe
+beblubber
+bebo
+bebodd
+bebodde
+beboede
+beboedes
+beboelig
+beboelse
+beboelses
+beboelseshus
+beboer
+beboerd
+beboerde
+beboerden
+beboere
+beboeren
+beboerne
+beboert
+beboet
+beboete
+beboeten
+beboette
+beboetten
+bebog
+beboid
+bebond
+bebonden
+bebondene
+bebondenen
+beboomd
+beboomde
+bebop
+bebopper
+beboppers
+bebops
+bebor
+beborrotear
+bebos
+beboss
+bebossen
+bebossin
+bebossing
+bebossingen
+bebost
+beboste
+bebosten
+bebotch
+beboteke
+bebother
+bebothered
+beboulde
+bebouldered
+bebouw
+bebouwba
+bebouwbaar
+bebouwbaarder
+bebouwbaarst
+bebouwbare
+bebouwd
+bebouwde
+bebouwden
+bebouwen
+bebouwer
+bebouwers
+bebouwin
+bebouwing
+bebouwingen
+bebouwt
+bebrave
+bebreech
+bebreida
+bebreide
+bebreidelse
+bebreidelsen
+bebreidelser
+bebreider
+bebreides
+bebreidet
+bebrilla
+bebrille
+bebrillet
+bebrine
+bebroed
+bebroedd
+bebroedde
+bebroedden
+bebroede
+bebroeden
+bebroedt
+bebrothe
+bebrother
+bebrush
+bebte
+bebten
+bebude
+bebudet
+bebump
+bebusy
+bebutton
+bebuttoned
+bebygd
+bebygde
+bebygga
+bebygged
+bebyggede
+bebyggel
+bebyggelse
+bebyggelsen
+bebyggelsens
+bebygges
+bebygget
+bebyrdet
+beb}da
+bec
+bec-de-l
+bec-de-lie`vre
+beca
+becacina
+becada
+becafigo
+becall
+becalm
+becalmed
+becalmin
+becalming
+becalmme
+becalmment
+becalms
+becam
+became
+becamest
+becan
+becap
+becard
+becardo`n
+becaria
+becario
+becarpet
+becarve
+becassoc
+becassocked
+becater
+because
+becc
+becca
+beccafic
+beccafico
+beccaria
+beccarie
+becchaku
+becchi
+becchin
+becchuu
+becco
+becense
+becerra
+becerrada
+becerrero
+becerril
+becerrilla
+becerrillo
+becerro
+bech
+bech-pc
+bechaine
+bechained
+bechalk
+bechamel
+bechamels
+bechance
+bechar
+bechara
+becharm
+bechase
+bechati
+bechatte
+bechatter
+bechauff
+bechauffeur
+becheck
+becher
+bechere
+bechern
+bechers
+becheve
+bechhofe
+bechhofer
+bechhoferkiefersobel
+bechigno
+bechignoned
+bechirp
+bechmann
+bechner
+bechorat
+bechorath
+bechsgaard
+bechtel
+bechtels
+bechtelsville
+bechtler
+bechuana
+bechuanaland
+becifring
+becifringer
+becijfer
+becijferd
+becijferde
+becijferden
+becijferen
+becijfering
+becijferingen
+becijfert
+becircle
+becircled
+becivet
+beck
+becka
+becke
+becked
+beckel
+beckelit
+beckelite
+beckemey
+beckemeyer
+becken
+beckens
+beckenst
+beckenstein
+becker
+beckerat
+beckerath
+beckerma
+beckerman
+beckers
+beckerst
+beckersted
+becket
+beckett
+beckham
+beckhaus
+beckhurs
+beckhurst
+becki
+beckie
+becking
+beckinsa
+beckinsale
+beckiron
+beckles
+beckley
+beckman
+beckmann
+beckner
+beckon
+beckoned
+beckoner
+beckoners
+beckonin
+beckoning
+beckoningly
+beckons
+becks
+beckstea
+beckstead
+beckstei
+beckstein
+beckstro
+beckstrom
+beckum
+beckvill
+beckville
+beckwith
+beckwort
+beckworth
+becky
+beclad
+beclamor
+beclamou
+beclamour
+beclang
+beclart
+beclasp
+beclatte
+beclatter
+beclaw
+becloak
+beclog
+beclothe
+becloud
+becloude
+beclouded
+becloudi
+beclouding
+beclouds
+beclout
+beclown
+becluste
+becluster
+becobweb
+becoiffe
+becoiffed
+becollie
+becollier
+becolme
+becolor
+becom
+becombed
+become
+becomes
+becometh
+becoming
+becomingly
+becomingness
+becomings
+becomma
+becompas
+becompass
+becompli
+becompliment
+becon
+becon3
+beconovi
+beconovich
+becoom
+becoqui`n
+becoquino
+becoresh
+becorit
+becost
+becousin
+becousined
+becovet
+becoward
+becquart
+becque
+becque'e
+becque'es
+becquere
+becquerel
+becquerelite
+becqueriana
+becquete
+becqueter
+becram
+becramp
+becrampo
+becrampon
+becrawl
+becreep
+becrime
+becrimso
+becrimson
+becrinol
+becrinolined
+becrippl
+becripple
+becroak
+becross
+becrowd
+becrown
+becrush
+becrust
+becry
+becs
+becter
+bectin
+becu
+becuadrado
+becuadro
+becudgel
+becuffed
+becuiba
+becumber
+becuna
+becurl
+becurry
+becurse
+becurst
+becurtai
+becurtained
+becus
+becushio
+becushioned
+becut
+becwar
+bed
+beda
+beda"mpf
+beda"mpft
+beda"mpfter
+bedaagd
+bedaagde
+bedaagder
+bedaagds
+bedaagdst
+bedaan
+bedaar
+bedaard
+bedaarde
+bedaarden
+bedaarder
+bedaardh
+bedaardheid
+bedaards
+bedaardst
+bedaart
+bedabble
+bedacht
+bedachte
+bedachtem
+bedachten
+bedachtes
+bedachtest
+bedachts
+bedachtsam
+bedachtsame
+bedachtsamem
+bedachtsamer
+bedachtsames
+bedachtsamkeit
+bedachtz
+bedachtzaam
+bedachtzaamheid
+bedachtzaamst
+bedachtzame
+bedachtzamer
+bedad
+bedaecht
+bedaechtige
+bedaechtigem
+bedaechtigen
+bedaechtiges
+bedage
+bedageli
+bedagelig
+bedaget
+bedagger
+bedaggered
+bedaking
+bedakingen
+bedall
+bedam
+bedamd
+bedamde
+bedamden
+bedamini
+bedammen
+bedamn
+bedamned
+bedamns
+bedamp
+bedampen
+bedampt
+bedampte
+bedampten
+bedamt
+bedamuni
+bedan
+bedane
+bedanen
+bedanga
+bedangle
+bedangled
+bedank
+bedankbr
+bedankbrief
+bedankbrieven
+bedanke
+bedanken
+bedankend
+bedankende
+bedankendem
+bedankender
+bedankin
+bedanking
+bedankingen
+bedankje
+bedankjes
+bedankst
+bedankt
+bedankte
+bedankten
+bedanktest
+bedanktet
+bedard
+bedare
+bedaren
+bedarf
+bedarfs
+bedarfsa
+bedarfsa"usserung
+bedarfsartikel
+bedarfsartikels
+bedarfsf
+bedarfsfall
+bedarfsi
+bedarfsidentitaet
+bedarfss
+bedarfssituationen
+bedark
+bedarken
+bedash
+bedaub
+bedaubed
+bedaubin
+bedaubing
+bedaubs
+bedauere
+bedauerl
+bedauerlich
+bedauerliche
+bedauerlichen
+bedauerlicher
+bedauerlicherweise
+bedauern
+bedauernswert
+bedauernswerte
+bedauernswerten
+bedauernswerter
+bedauernswertere
+bedauernswerteren
+bedauernswerterer
+bedauernswerteres
+bedauernswertes
+bedauernswerteste
+bedauernswertestem
+bedauernswertesten
+bedauernswertestes
+bedauert
+bedauerte
+bedaure
+bedauw
+bedauwd
+bedauwde
+bedauwden
+bedauwen
+bedauwt
+bedauye
+bedawie
+bedawiye
+bedawn
+beday
+bedaze
+bedazeme
+bedazement
+bedazzle
+bedazzled
+bedazzlement
+bedazzles
+bedazzli
+bedazzling
+bedazzlingly
+bedboard
+bedbug
+bedbugs
+bedcap
+bedcase
+bedchair
+bedchairs
+bedchamb
+bedchamber
+bedcloth
+bedclothes
+bedcord
+bedcover
+bedcovers
+bedda
+beddable
+bedde
+beddebak
+beddebakken
+bedded
+beddedek
+beddedeken
+beddedekens
+beddegoe
+beddegoed
+beddekru
+beddekruik
+beddekruiken
+beddekus
+beddekussen
+beddekussens
+beddekwa
+beddekwast
+beddekwasten
+beddelak
+beddelaken
+beddelakens
+beddelin
+beddelinnen
+bedden
+beddene
+beddenwi
+beddenwinkel
+beddenwinkels
+beddepan
+beddepannen
+beddepla
+beddeplank
+beddeplanken
+bedder
+bedders
+beddespr
+beddesprei
+beddespreien
+beddetij
+beddetijk
+beddetijken
+beddewar
+beddewarmer
+beddewarmers
+beddezak
+beddezakken
+bedding
+beddinga
+beddinge
+beddingen
+beddings
+beddini
+beddo
+beddoe
+beddosuu
+beddotau
+beddows
+bede
+bedea
+bedead
+bedeaf
+bedeafen
+bedeau
+bedeaux
+bedebt
+bedeck
+bedecke
+bedecked
+bedecken
+bedeckend
+bedeckin
+bedecking
+bedecks
+bedeckst
+bedeckt
+bedeckte
+bedecktem
+bedeckten
+bedecktes
+bedecktest
+bedecktet
+bedecora
+bedecorate
+bededag
+bededage
+bededagen
+bededen
+bedeed
+bedeel
+bedeeld
+bedeelde
+bedeelden
+bedeelt
+bedeesd
+bedeesde
+bedeesder
+bedeesdh
+bedeesdheid
+bedeesdm
+bedeesdmeest
+bedeguar
+bedehuis
+bedehuiz
+bedehuizen
+bedehus
+bedehuse
+bedehusene
+bedehuset
+bedeiah
+bedek
+bedekken
+bedekkes
+bedekket
+bedekkin
+bedekking
+bedekkingen
+bedeknin
+bedekning
+bedekt
+bedekte
+bedektel
+bedektelijk
+bedekten
+bedektza
+bedektzadig
+bedektzadige
+bedel
+bedelaar
+bedelaars
+bedelaarsgesticht
+bedelaarsgestichten
+bedelaarskolonie
+bedelaarskolonies
+bedelaarster
+bedelaarsters
+bedelaartje
+bedelaartjes
+bedelach
+bedelachtig
+bedelachtige
+bedelachtiger
+bedelachtigst
+bedelare
+bedelares
+bedelaressen
+bedelari
+bedelarij
+bedelbri
+bedelbrief
+bedelbrieven
+bedelbro
+bedelbroeder
+bedelbroeders
+bedelbrok
+bedelbrokken
+bedelbrood
+bedelde
+bedelden
+bedelen
+bedelf
+bedelft
+bedeli`a
+bedelia
+bedeling
+bedelingen
+bedelio
+bedelkin
+bedelkind
+bedelkinderen
+bedell
+bedelmon
+bedelmonnik
+bedelmonniken
+bedelord
+bedelorde
+bedelorden
+bedelordes
+bedelpar
+bedelpartij
+bedelpartijen
+bedelsta
+bedelstaf
+bedelven
+bedelzak
+bedelzakken
+beden
+bedende
+bedene
+bedenes
+bedenhei
+bedenheim
+bedenk
+bedenkda
+bedenkdag
+bedenkdagen
+bedenkel
+bedenkelijk
+bedenkelijke
+bedenkelijker
+bedenkelijkheid
+bedenkelijkst
+bedenken
+bedenkend
+bedenkende
+bedenkenden
+bedenkendes
+bedenkenlos
+bedenkenlose
+bedenkenlosen
+bedenkin
+bedenking
+bedenkingen
+bedenkli
+bedenkliche
+bedenklichem
+bedenklichen
+bedenkliches
+bedenklichste
+bedenkse
+bedenksel
+bedenksels
+bedenkst
+bedenkt
+bedenkti
+bedenktijd
+bedenkze
+bedenkzeit
+bedenkzeiten
+bedeplaa
+bedeplaats
+bedeplaatsen
+beder
+bedere
+bederf
+bederfel
+bederfelijk
+bederfelijke
+bederfelijker
+bederfelijkheid
+bederfelijkst
+bederft
+bederfwe
+bederfwerend
+bederfwerende
+bederfwerender
+bederfwerendst
+bederre
+bederva
+bederve
+bederven
+bederver
+bedervers
+bedervet
+bedes
+bedesman
+bedet
+bedeute
+bedeuten
+bedeutend
+bedeutendem
+bedeutenden
+bedeutender
+bedeutenderen
+bedeutendes
+bedeutendste
+bedeutes
+bedeutest
+bedeutet
+bedeutete
+bedeutetest
+bedeutetet
+bedeutsa
+bedeutsam
+bedeutsamem
+bedeutsamen
+bedeutsamer
+bedeutsamste
+bedeutsamsten
+bedeutsamstes
+bedeutun
+bedeutung
+bedeutungen
+bedeutungserweiterung
+bedeutungslose
+bedeutungslosem
+bedeutungslosen
+bedeutungslosere
+bedeutungsloserem
+bedeutungsloseren
+bedeutungsloseres
+bedeutungsloses
+bedeutungslosigkeit
+bedeutungsloste
+bedeutungslosten
+bedeutungsloster
+bedeutungslostes
+bedeutungsvoll
+bedeutungsvolle
+bedeutungsvollem
+bedeutungsvollen
+bedeutungsvollere
+bedeutungsvollerem
+bedeutungsvolleren
+bedeutungsvolleres
+bedeutungsvolles
+bedeutungsvollste
+bedeutungsvollsten
+bedeutungsvollster
+bedeutungsvollstes
+bedevaar
+bedevaarder
+bedevaarders
+bedevaarster
+bedevaarsters
+bedevaart
+bedevaarten
+bedevaartganger
+bedevaartgangers
+bedevaartgangster
+bedevaartgangsters
+bedevaartplaats
+bedevaartplaatsen
+bedevere
+bedevil
+bedevile
+bedeviled
+bedevili
+bedeviling
+bedevill
+bedevilled
+bedevilling
+bedevilm
+bedevilment
+bedevils
+bedew
+bedewed
+bedewer
+bedewing
+bedewoma
+bedewoman
+bedews
+bedfast
+bedfello
+bedfellow
+bedfellows
+bedfellowship
+bedflowe
+bedflower
+bedfola
+bedfoot
+bedford
+bedfordh
+bedfordhills
+bedframe
+bedframes
+bedgenoo
+bedgenoot
+bedgenot
+bedgenote
+bedgenoten
+bedgery
+bedgoer
+bedgordi
+bedgordijn
+bedgordijnen
+bedgown
+bedgowns
+bedi
+bedia
+bediadem
+bediademed
+bediamon
+bediamonded
+bediaper
+bedias
+bedido
+bedien
+bedienaa
+bedienaar
+bedienaars
+bedienan
+bedienanleitung
+bedienanleitungen
+bedienar
+bedienaren
+bedienba
+bedienbar
+bedienbaren
+bedienbarkeit
+bediend
+bediende
+bedienden
+bediendenbelasting
+bediendenbelastingen
+bediendenkamer
+bediendenkamers
+bediendes
+bediene
+bedieneb
+bedienebene
+bedienei
+bedieneinheit
+bedieneinrichtungen
+bedienel
+bedienelemente
+bedienelementen
+bedienen
+bedienende
+bedienendem
+bedienenden
+bedienendes
+bediener
+bedienerfreundlich
+bedieneroberfla"che
+bedieners
+bedienfe
+bedienfeld
+bedienfelds
+bedienfo
+bedienfolie
+bedienfu
+bedienfunktion
+bedienin
+bediening
+bedieningen
+bedieningspaneel
+bedienko
+bedienkomfort
+bedienma
+bedienmannschaft
+bedienmo
+bedienmo"glichkeiten
+bedienob
+bedienoberfla"che
+bedienoberflache
+bedienpe
+bedienperson
+bedienpersonal
+bedienpu
+bedienpult
+bedienst
+bediensteten
+bedient
+bedienta
+bedientastatur
+bedientasten
+bediente
+bedientem
+bedienten
+bedientes
+bedientest
+bedientet
+bedienun
+bedienung
+bedienungen
+bedienungsanleitung
+bedienungseinrichtungen
+bedienungselemente
+bedienungselementen
+bedienungstechnisch
+bedienungsweise
+bedienwu
+bedienwu"nsche
+bedierf
+bedierve
+bedierven
+bedight
+bedighte
+bedighted
+bedijk
+bedijken
+bedijker
+bedijkers
+bedijkin
+bedijking
+bedijkingen
+bedijkt
+bedijkte
+bedijkten
+bedik
+bedikah
+bedil
+bedilal
+bedilall
+bedilallen
+bedild
+bedilde
+bedilden
+bedillen
+bediller
+bedillerig
+bedillerige
+bedilleriger
+bedillerigst
+bedillers
+bedilste
+bedilster
+bedilsters
+bedilt
+bedilzie
+bedilziek
+bedilzieke
+bedilzieker
+bedilziekst
+bedilzuc
+bedilzucht
+bedim
+bedimmed
+bedimmin
+bedimming
+bedimple
+bedims
+bedin
+beding
+bedinge
+bedingen
+bedingt
+bedingte
+bedingtem
+bedingten
+bedingter
+bedingun
+bedingung
+bedingungen
+bedingungslos
+bedingungslose
+bedingungslosem
+bedingungsloser
+bedingungslosere
+bedingungsloserem
+bedingungsloserer
+bedingungsloseres
+bedingungsloses
+bedingungslosestem
+bedingungslosesten
+bedingungslosester
+bediondo
+bedip
+bedirt
+bedirter
+bedirty
+bediscus
+bediscussieerd
+bediscussieerde
+bediscussieerden
+bediscussieren
+bedismal
+bedissel
+bedisseld
+bedisselde
+bedisselden
+bedisselen
+bedisselt
+bediya
+bedizen
+bedizene
+bedizened
+bedizeni
+bedizening
+bedizenm
+bedizenment
+bedizens
+bedja
+bedkey
+bedlam
+bedlamer
+bedlamic
+bedlamis
+bedlamism
+bedlamit
+bedlamite
+bedlamitish
+bedlamiz
+bedlamize
+bedlamp
+bedlamps
+bedlams
+bedlar
+bedleger
+bedlegerig
+bedlegerige
+bedlegerigheid
+bedless
+bedlids
+bedlight
+bedlingt
+bedlington
+bedmaker
+bedmakers
+bedmakin
+bedmaking
+bedman
+bedmate
+bedmates
+bedminst
+bedminster
+bednar
+bednarsk
+bednarski
+bednight
+bednighted
+bednights
+bedoanas
+bedoctor
+bedoeien
+bedoeienen
+bedoeienentent
+bedoeienententen
+bedoel
+bedoeld
+bedoelde
+bedoelden
+bedoelen
+bedoelin
+bedoeling
+bedoelingen
+bedoelt
+bedoema
+bedoemar
+bedoemare
+bedoemd
+bedoemes
+bedoemni
+bedoemningar
+bedoemningarna
+bedoemningen
+bedoems
+bedoen
+bedoenin
+bedoening
+bedoeningen
+bedoeva
+bedog
+bedoin
+bedolf
+bedolt
+bedolven
+bedolvene
+bedolvenen
+bedoma
+bedomare
+bedomd
+bedomes
+bedomnin
+bedomningar
+bedomningarna
+bedomningen
+bedompt
+bedompte
+bedompter
+bedompth
+bedomptheid
+bedompts
+bedomptst
+bedoms
+bedonder
+bedonderd
+bedonderde
+bedonderden
+bedonderder
+bedonderdst
+bedonderen
+bedondert
+bedong
+bedongen
+bedongene
+bedongenen
+bedonnan
+bedonnant
+bedonnante
+bedonnantes
+bedonnants
+bedonner
+bedorven
+bedorvene
+bedorvenen
+bedorvener
+bedorvenst
+bedos
+bedot
+bedote
+bedotte
+bedotten
+bedotter
+bedotters
+bedouin
+bedouine
+bedouini
+bedouinism
+bedouins
+bedouse
+bedova
+bedown
+bedoya
+bedoyo
+bedpan
+bedpanne
+bedpannen
+bedpans
+bedplate
+bedplates
+bedpost
+bedposts
+bedquilt
+bedquilts
+bedra
+bedraag
+bedraagt
+bedrabbl
+bedrabble
+bedradd
+bedraege
+bedraegeri
+bedraeng
+bedraenge
+bedraengen
+bedraengend
+bedraengendem
+bedraengenden
+bedraengender
+bedraengnis
+bedraengnisse
+bedraengnisses
+bedraengst
+bedraengt
+bedraengte
+bedraengten
+bedraengter
+bedraengtes
+bedraengtet
+bedrag
+bedragar
+bedragare
+bedrage
+bedragen
+bedragene
+bedragenen
+bedrager
+bedrageren
+bedrageri
+bedragerier
+bedrageriet
+bedragerisk
+bedragersk
+bedraget
+bedraggl
+bedraggle
+bedraggled
+bedragglement
+bedraggles
+bedraggling
+bedrail
+bedrails
+bedral
+bedrape
+bedrar
+bedratt
+bedratte
+bedravel
+bedre
+bedrede
+bedreef
+bedreig
+bedreigd
+bedreigde
+bedreigden
+bedreige
+bedreigen
+bedreigi
+bedreiging
+bedreigingen
+bedreigt
+bedreman
+bedremannsbarn
+bedremme
+bedremmeld
+bedremmelde
+bedrench
+bedrer
+bedres
+bedress
+bedret
+bedrete
+bedrev
+bedreven
+bedrevene
+bedrevenen
+bedrevenheid
+bedribbl
+bedribble
+bedrich
+bedrid
+bedridde
+bedridden
+bedriddenness
+bedrieg
+bedriege
+bedriegen
+bedrieger
+bedriegerij
+bedriegerijen
+bedriegers
+bedriegl
+bedrieglijk
+bedrieglijke
+bedrieglijkheid
+bedriegs
+bedriegster
+bedriegsters
+bedriegt
+bedrift
+bedrifte
+bedriften
+bedriftene
+bedriftenes
+bedriftens
+bedrifter
+bedrifters
+bedrifts
+bedriftsandakter
+bedriftsblad
+bedriftsbladet
+bedriftsdemokrati
+bedriftsdemokratiet
+bedriftsdemokratiets
+bedriftseier
+bedriftsforsamling
+bedriftsforsamlingen
+bedriftsforsamlinger
+bedriftsfotball
+bedriftsfotballen
+bedriftsfotballens
+bedriftsidrett
+bedriftsklassen
+bedriftsklubb
+bedriftsklubben
+bedriftslag
+bedriftsledelse
+bedriftsledelsen
+bedriftsledere
+bedriftslege
+bedriftslivet
+bedriftsmilj|
+bedriftsorgan
+bedriftsutvalget
+bedrifts|konomi
+bedrifts|konomisk
+bedrifts|konomiske
+bedright
+bedriift
+bedriiftene
+bedrijf
+bedrijfa
+bedrijfal
+bedrijfallen
+bedrijfs
+bedrijfsbelasting
+bedrijfsbelastingen
+bedrijfsgroep
+bedrijfsgroepen
+bedrijfshuishoudkunde
+bedrijfshygiene
+bedrijfsinformatie
+bedrijfskapitaal
+bedrijfskapitalen
+bedrijfskosten
+bedrijfsleer
+bedrijfsleider
+bedrijfsleiders
+bedrijfsorganisatie
+bedrijfsorganisaties
+bedrijfsraad
+bedrijfsraden
+bedrijfsresultaat
+bedrijfsresultaten
+bedrijfssysteem
+bedrijfssystemen
+bedrijfsverzekering
+bedrijfsverzekeringen
+bedrijfswetenschappen
+bedrijft
+bedrijve
+bedrijven
+bedrijvend
+bedrijvende
+bedrijver
+bedrijvers
+bedrijvi
+bedrijvig
+bedrijvige
+bedrijviger
+bedrijvigheid
+bedrijvigst
+bedring
+bedringa
+bedringe
+bedringen
+bedringer
+bedrink
+bedrinke
+bedrinken
+bedrinkt
+bedrip
+bedriva
+bedrivel
+bedriver
+bedrives
+bedrivit
+bedrizzl
+bedrizzle
+bedro
+bedrock
+bedrocks
+bedroef
+bedroefd
+bedroefde
+bedroefden
+bedroefder
+bedroefdheid
+bedroefdst
+bedroeft
+bedroeg
+bedroege
+bedroegen
+bedroeve
+bedroeven
+bedroevend
+bedroevende
+bedroevender
+bedroevendst
+bedroevl
+bedroevlig
+bedrog
+bedrogen
+bedrogene
+bedrogenen
+bedrohe
+bedrohen
+bedrohende
+bedrohendem
+bedrohenden
+bedrohendes
+bedrohli
+bedrohlich
+bedrohliche
+bedrohlichen
+bedrohlicher
+bedrohlichere
+bedrohlicheren
+bedrohlicherer
+bedrohlicheres
+bedrohlichste
+bedrohlichstem
+bedrohlichsten
+bedrohlichstes
+bedrohst
+bedroht
+bedrohte
+bedrohtem
+bedrohten
+bedrohter
+bedrohtest
+bedrohtet
+bedrohun
+bedrohung
+bedrohungen
+bedrohungsaengsten
+bedroll
+bedrolls
+bedronk
+bedronke
+bedronken
+bedronkene
+bedronkenen
+bedroog
+bedroom
+bedrooms
+bedroop
+bedrop
+bedropen
+bedropene
+bedropenen
+bedroppe
+bedroppel
+bedroppeld
+bedroppelde
+bedroppelden
+bedroppelen
+bedroppelt
+bedropt
+bedrosia
+bedrosian
+bedrovli
+bedrovlig
+bedrown
+bedrowse
+bedruckb
+bedruckbare
+bedrucke
+bedrucken
+bedruckt
+bedruckte
+bedrucktem
+bedruckter
+bedrucktes
+bedrueck
+bedruecken
+bedrueckend
+bedrueckenden
+bedrueckender
+bedrueckendes
+bedrueckte
+bedrueckung
+bedrug
+bedruill
+bedruille
+bedruip
+bedruipe
+bedruipen
+bedruipt
+bedruk
+bedrukke
+bedrukken
+bedrukki
+bedrukking
+bedrukt
+bedrukte
+bedrukten
+bedrukter
+bedrukth
+bedruktheid
+bedrukts
+bedruktst
+bedrup
+bedruppe
+bedruppel
+bedruppeld
+bedruppelde
+bedruppelden
+bedruppelen
+bedruppelt
+bedruppen
+bedrupt
+bedrupte
+bedrupten
+bedr{ger
+bedr{geri
+bedr|va
+bedr|ve
+bedr|vel
+bedr|velig
+bedr|veligt
+bedr|vet
+bedr|vli
+bedr|vlig
+beds
+bedschak
+bedschakelaar
+bedschakelaars
+bedscrew
+bedsermo
+bedsermoen
+bedsermoenen
+bedsheet
+bedsheets
+bedsick
+bedside
+bedsides
+bedsite
+bedsock
+bedsoe
+bedsore
+bedsores
+bedspira
+bedspiralen
+bedspond
+bedsponde
+bedsponden
+bedsprea
+bedspread
+bedspreads
+bedsprei
+bedspreien
+bedsprin
+bedspring
+bedsprings
+bedst
+bedstaff
+bedstand
+bedstands
+bedstave
+bedstaves
+bedste
+bedstead
+bedsteads
+bedstede
+bedsteden
+bedstee
+bedsteet
+bedsteetje
+bedsteetjes
+bedstefar
+bedstefor{ldre
+bedstefor{ldrene
+bedstemoder
+bedstemor
+bedstock
+bedstraw
+bedstraws
+bedstrin
+bedstring
+bedstro
+bedt
+bedtafel
+bedtafels
+bedtick
+bedticki
+bedticking
+bedtijd
+bedtime
+bedtimes
+bedu
+bedu"rfe
+bedu"rfen
+bedu"rfn
+bedu"rfnisse
+beduanda
+bedub
+beduches
+beduchess
+beducht
+beduchte
+beduchth
+beduchtheid
+beduck
+beduerfe
+beduerfen
+beduerfi
+beduerfitgstes
+beduerfn
+beduerfnis
+beduerfnisanstalt
+beduerfnislose
+beduerfnislosem
+beduerfnislosen
+beduerfnislosere
+beduerfnisloserem
+beduerfnisloseren
+beduerfnisloseres
+beduerfnisloses
+beduerfnisloseste
+beduerfnislosesten
+beduerfnislosester
+beduerfnislosestes
+beduerfnisse
+beduerfnissen
+beduerfnisses
+beduerft
+beduerftige
+beduerftigem
+beduerftigen
+beduerftigere
+beduerftigerem
+beduerftigeren
+beduerftigeres
+beduerftiges
+beduerftigste
+beduerftigsten
+beduerftigster
+beduerftikeiten
+bedugga
+bedugged
+beduggede
+bedugget
+beduid
+beduidde
+beduidden
+beduiden
+beduidt
+beduimel
+beduimeld
+beduimelde
+beduimelden
+beduimelen
+beduimelt
+beduin
+beduina
+beduino
+beduins
+beduke
+bedull
+bedumb
+bedumbs
+bedunce
+bedunch
+bedung
+bedunken
+bedur
+bedurft
+beduro
+bedusk
+bedust
+beduusd
+beduusde
+beduusder
+beduusdh
+beduusdheid
+beduusdm
+beduusdmeest
+beduvel
+beduveld
+beduvelde
+beduvelden
+beduvele
+beduvelen
+beduvelt
+bedwang
+bedward
+bedwarf
+bedwarfs
+bedwarme
+bedwarmer
+bedwarmers
+bedwater
+bedwateren
+bedwatert
+bedway
+bedways
+bedwell
+bedwelm
+bedwelmd
+bedwelmde
+bedwelmden
+bedwelmdheid
+bedwelme
+bedwelmen
+bedwelmi
+bedwelming
+bedwelmt
+bedwin
+bedwing
+bedwingb
+bedwingbaar
+bedwingbare
+bedwinge
+bedwingen
+bedwinger
+bedwingers
+bedwingt
+bedwong
+bedwonge
+bedwongen
+bedwongene
+bedwongenen
+bedye
+bedyre
+bedyrer
+bedyret
+bed{kke
+bed|ma
+bed|mare
+bed|md
+bed|mes
+bed|mme
+bed|mmel
+bed|mmelse
+bed|mmelsen
+bed|mmer
+bed|mmertimer
+bed|mmes
+bed|mnin
+bed|mningar
+bed|mningarna
+bed|mningen
+bed|ms
+bed|mt
+bed|mte
+bed|va
+bed|ve
+bed|vels
+bed|velse
+bed|vend
+bed|vende
+bed|vet
+bed}ra
+bed}re
+bed}rer
+bed}ret
+bee
+beearn
+beebe
+beebee
+beebees
+beebepla
+beebeplain
+beeberiv
+beeberiver
+beeblebr
+beeblebrox
+beebo
+beebord
+beebranc
+beebranch
+beebread
+beebreads
+beeby
+beech
+beecham
+beechblu
+beechbluff
+beechbon
+beechbone
+beechbot
+beechbottom
+beechcli
+beechcliff
+beechcre
+beechcreek
+beechdro
+beechdrops
+beechen
+beecher
+beecherc
+beechercity
+beecherf
+beecherfalls
+beeches
+beechgro
+beechgrove
+beechier
+beechies
+beechiest
+beechisl
+beechisland
+beechmon
+beechmont
+beechnut
+beechnuts
+beechwoo
+beechwood
+beechwoods
+beechy
+beecker
+beecroft
+beeder
+beedevil
+beedeville
+beedged
+beedigd
+beedigde
+beedigden
+beedigen
+beedigin
+beediging
+beedigingen
+beedle
+beedles
+beedom
+beeeen
+beeenef
+beeessde
+beeessdee
+beef
+beefburg
+beefburger
+beefburgers
+beefcake
+beefcakes
+beefde
+beefdead
+beefden
+beefeate
+beefeater
+beefeaters
+beefed
+beefer
+beefers
+beefhead
+beefheaded
+beefier
+beefiest
+beefily
+beefin
+beefines
+beefiness
+beefing
+beefish
+beefishn
+beefishness
+beefless
+beeflowe
+beeflower
+beefs
+beefstea
+beefsteak
+beefsteaks
+beeft
+beeftong
+beeftongue
+beefwood
+beefy
+beege
+beegerit
+beegerite
+beehead
+beeheade
+beeheaded
+beeherd
+beehive
+beehives
+beehler
+beehouse
+beehre
+beehren
+beehrend
+beehrende
+beehrendem
+beehrenden
+beehrendes
+beehrst
+beehrt
+beehrtem
+beehrten
+beehrter
+beehrtes
+beehrtest
+beehrtet
+beeiflus
+beeiflussbare
+beeilen
+beeilend
+beeilende
+beeilender
+beeilendes
+beeilst
+beeilte
+beeilten
+beeiltes
+beeiltest
+beeindig
+beeindigd
+beeindigde
+beeindigden
+beeindigen
+beeindigt
+beeindru
+beeindrucke
+beeindrucken
+beeindruckende
+beeindruckenden
+beeindruckender
+beeindruckendes
+beeindruckst
+beeindruckt
+beeindruckte
+beeindruckten
+beeindruckter
+beeindrucktes
+beeindrucktet
+beeinflu
+beeinflussbar
+beeinflussbare
+beeinflussbn
+beeinflussbnde
+beeinflussbndem
+beeinflussbnden
+beeinflussbndes
+beeinflussbst
+beeinflussen
+beeinflussende
+beeinflusst
+beeinflusste
+beeinflusstem
+beeinflusster
+beeinflusstes
+beeinflusstest
+beeinflussung
+beeinflussungen
+beeinflussungsfaehigkeit
+beeinflussungsmittel
+beeintra
+beeintra"chtigen
+beeintra"chtigt
+beeintraechtige
+beeintraechtigend
+beeintraechtigende
+beeintraechtigendem
+beeintraechtigender
+beeintraechtigendes
+beeintraechtigst
+beeintraechtigte
+beeintraechtigtem
+beeintraechtigten
+beeintraechtigtes
+beeintraechtigtest
+beeintraechtigtet
+beeintraechtigung
+beeintraechtigungen
+beeish
+beeishne
+beeishness
+beejay
+beek
+beekbezi
+beekbezinking
+beekbezinkingen
+beeke
+beekeepe
+beekeeper
+beekeepers
+beekeepi
+beekeeping
+beekite
+beekman
+beekmant
+beekmantown
+beeks
+beekuru
+beekyooe
+beekyooess
+beelbow
+beeld
+beeldde
+beeldden
+beelden
+beeldena
+beeldenaar
+beeldenaars
+beeldend
+beeldende
+beeldendienaar
+beeldendienaars
+beeldendienaren
+beeldendienst
+beeldeng
+beeldengalerij
+beeldengalerijen
+beeldengroep
+beeldengroepen
+beeldenk
+beeldenkraam
+beeldenkramen
+beeldenr
+beeldenrijkdom
+beeldens
+beeldenstorm
+beeldenstormer
+beeldenstormers
+beeldenstrijd
+beelderi
+beelderig
+beelderige
+beeldgie
+beeldgieter
+beeldgieters
+beeldhou
+beeldhouw
+beeldhouwde
+beeldhouwden
+beeldhouwen
+beeldhouwer
+beeldhouwerij
+beeldhouwerijen
+beeldhouwers
+beeldhouwkunst
+beeldhouwt
+beeldhouwwerk
+beeldhouwwerken
+beeldig
+beeldige
+beeldje
+beeldjes
+beeldjeskoop
+beeldjeskopen
+beeldmoo
+beeldmooi
+beeldmooie
+beeldmooier
+beeldmooist
+beeldmot
+beeldmotieven
+beeldpun
+beeldpunten
+beeldrij
+beeldrijk
+beeldrijke
+beeldrijker
+beeldrijkheid
+beeldrijkst
+beeldrui
+beeldruimte
+beeldsch
+beeldscherm
+beeldschermbesturing
+beeldschermen
+beeldschilder
+beeldschilders
+beeldschone
+beeldschoner
+beeldschoon
+beeldschoonst
+beeldschrift
+beeldsni
+beeldsnijd
+beeldsnijden
+beeldsnijdt
+beeldsnijkunst
+beeldspr
+beeldspraak
+beeldsto
+beeldstormer
+beeldstormerij
+beeldstormerijen
+beeldstormers
+beeldvla
+beeldvlak
+beeldzij
+beeldzijde
+beeler
+beeliada
+beelike
+beeline
+beelines
+beelol
+beelteni
+beeltenis
+beeltenissen
+beelzebu
+beelzebub
+beelzebubian
+beelzebul
+beeman
+beemaste
+beemaster
+beembe
+beemd
+beemden
+beemdgra
+beemdgras
+beemer
+beemish
+been
+beenacht
+beenachtig
+beenachtige
+beenachtiger
+beenachtigst
+beenbesc
+beenbeschermer
+beenbeschermers
+beenblok
+beenblokken
+beenbreu
+beenbreuk
+beenbreuken
+beenbrui
+beenbruin
+beende
+beenden
+beendend
+beendende
+beendenden
+beendender
+beendendes
+beendera
+beenderas
+beendere
+beenderen
+beenderengrot
+beenderengrotten
+beenderg
+beendergestel
+beenderh
+beenderhuis
+beenderhuizen
+beenderl
+beenderlijm
+beenderm
+beendermeel
+beenders
+beendersoep
+beendert
+beendertjes
+beendertjess
+beendet
+beendete
+beendetem
+beendeter
+beendetes
+beendetest
+beendige
+beendigen
+beendigt
+beendigu
+beendigung
+beendigungen
+beendor
+beendorr
+beendorre
+beendrog
+beendroge
+beendroo
+beendroog
+beeneter
+beeneters
+beengewr
+beengewricht
+beengewrichten
+beenhouw
+beenhouwer
+beenhouwerij
+beenhouwerijen
+beenhouwers
+beenhouwersgast
+beenhouwersgasten
+beenhouwersmes
+beenhouwersmessen
+beenkap
+beenkapp
+beenkappen
+beenloos
+beenloze
+beenmerg
+beennut
+beenspal
+beenspalk
+beenspalken
+beenstoc
+beenstock
+beenstuk
+beenstukken
+beent
+beentje
+beentjes
+beenvis
+beenviss
+beenvissen
+beenvlie
+beenvlies
+beenvliezen
+beenwind
+beenwindsel
+beenwindsels
+beenzwar
+beenzwart
+beep
+beeped
+beeper
+beepers
+beeping
+beeps
+beer
+beera
+beerage
+beerah
+beerbach
+beerbachite
+beerbibb
+beerbibber
+beerbohm
+beerde
+beerden
+beerdige
+beerdigs
+beerdigst
+beerdigt
+beerdigte
+beerdigten
+beerdigter
+beerdigtes
+beerdigtet
+beerdigu
+beerdigung
+beerdigungen
+beerdigungsinstitute
+beerdigungsinstituten
+beerdigungsinstitutes
+beere
+beerelim
+beeren
+beerenbe
+beerenberg
+beerfd
+beerfde
+beerfden
+beerhous
+beerhouse
+beeri
+beerier
+beeriest
+beerily
+beerines
+beeriness
+beerish
+beerishl
+beerishly
+beerkar
+beerkarr
+beerkarren
+beerken
+beerkens
+beerlaha
+beerlahairoi
+beermake
+beermaker
+beermaki
+beermaking
+beermann
+beermong
+beermonger
+beerocra
+beerocracy
+beeroth
+beerothi
+beerothite
+beerothites
+beerpull
+beerput
+beerputt
+beerputten
+beers
+beersaba
+beersheb
+beersheba
+beershebasprings
+beerstof
+beerstoffen
+beert
+beertema
+beertje
+beertjes
+beerup
+beerven
+beerving
+beerwage
+beerwagen
+beerwagens
+beery
+bees
+beesfrom
+beeshter
+beeshterah
+beesley
+beeson
+beesprin
+beespring
+beest
+beestach
+beestachtig
+beestachtige
+beestachtiger
+beestachtigheden
+beestachtigheid
+beestachtigst
+beesten
+beestenb
+beestenboel
+beestend
+beestendokter
+beestendokters
+beestenk
+beestenkooplieden
+beestenkooplui
+beestenkoopman
+beestenkoper
+beestenkopers
+beestenm
+beestenmarkt
+beestenmarkten
+beestens
+beestenspel
+beestenspellen
+beestenstal
+beestenstallen
+beestenw
+beestenwagen
+beestenwagens
+beestig
+beestige
+beestiger
+beestigh
+beestigheden
+beestigheid
+beestigs
+beestigst
+beesting
+beestings
+beestje
+beestjes
+beeston
+beeswax
+beeswaxe
+beeswaxes
+beeswing
+beeswinged
+beeswings
+beet
+beeten
+beetes
+beetgeha
+beetgehad
+beetgeno
+beetgenomen
+beetgenomene
+beetgenomenen
+beetgepa
+beetgepakt
+beetgepakte
+beetgepakten
+beeth
+beethad
+beethadd
+beethadden
+beetheb
+beethebb
+beethebben
+beethebt
+beethove
+beethoven
+beethovenian
+beethovenish
+beethovens
+beethovi
+beethovian
+beetie
+beetje
+beetjes
+beetjuan
+beetjuans
+beetle
+beetleba
+beetlebailey
+beetled
+beetledr
+beetledrive
+beetlehe
+beetlehead
+beetleheaded
+beetler
+beetles
+beetlest
+beetlestock
+beetlestone
+beetlewe
+beetleweed
+beetling
+beetmist
+beetmister
+beetnam
+beetname
+beetnamen
+beetneem
+beetneemt
+beetneme
+beetnemen
+beeton
+beetown
+beetpak
+beetpakk
+beetpakken
+beetpakt
+beetpakte
+beetpakten
+beetrave
+beetroot
+beetroots
+beetrooty
+beets
+beetsuik
+beetsuiker
+beetwort
+beetwortel
+beetwortelen
+beetwortels
+beetwortelsuiker
+beetwortelsuikerfabriek
+beetwortelsuikerfabrieken
+beety
+beeuh
+beevaart
+beevaarten
+beeve
+beeves
+beeville
+beevish
+beeware
+beeway
+beeweed
+beeweg
+beewegen
+beewise
+beewort
+beezen
+beezy
+bef
+befa
+befa"hig
+befa"higen
+befaamd
+befaamde
+befaamder
+befaamdh
+befaamdheid
+befaamdm
+befaamdmeest
+befabemi`
+befaehig
+befaehigt
+befaehigung
+befaehigungen
+befaehrs
+befaehrst
+befael
+befaellt
+befaesta
+befahl
+befahlen
+befahlst
+befahrba
+befahrbar
+befahrbare
+befahrbarem
+befahrbarer
+befahrbares
+befahre
+befahren
+befahrend
+befahrende
+befahrendem
+befahrender
+befahrendes
+befahrene
+befahrenen
+befahrener
+befahrenes
+befal
+befale
+befalede
+befaler
+befalet
+befalets
+befaling
+befalinga
+befalingen
+befalingsmann
+befalingsmenn
+befall
+befallen
+befallene
+befallenem
+befallenen
+befallenes
+befallet
+befalleth
+befallin
+befalling
+befalln
+befalls
+befalsla
+befalslag
+befalslagets
+befalsme
+befalsmesse
+befalsmessen
+befalsop
+befalsoppl{ring
+befalsor
+befalsordning
+befalssk
+befalsskole
+befalsskolen
+befalsyr
+befalsyrket
+befalt
+befalte
+befame
+befamili
+befamilied
+befamine
+befan
+befancy
+befand
+befanden
+befandet
+befandt
+befang
+befangen
+befangene
+befangenen
+befangener
+befangenes
+befanis
+befann
+befanned
+befant
+befar
+befara
+befares
+befaring
+befaringa
+befaringen
+befaringer
+befasse
+befassen
+befassend
+befassende
+befassender
+befassendes
+befasses
+befassest
+befasst
+befasste
+befassten
+befasstest
+befasta
+befated
+befather
+befathered
+befatnin
+befatning
+befatningen
+befatta
+befatte
+befatter
+befattni
+befattningar
+befattningen
+befattningsbeskrivning
+befattningshavare
+befattningsnivaan
+befattningsnivan
+befattningsniv}n
+befavor
+befavour
+befe
+befeathe
+befeather
+befedad
+befehl
+befehle
+befehlen
+befehlende
+befehlenden
+befehlender
+befehlendes
+befehles
+befehlsa
+befehlsangebot
+befehlsausfuehrung
+befehlsc
+befehlscode
+befehlscodes
+befehlse
+befehlseinga"nge
+befehlsf
+befehlsfolgen
+befehlsform
+befehlsformen
+befehlsg
+befehlsgera"ten
+befehlsh
+befehlshaber
+befehlshaberisch
+befehlshaberischem
+befehlshaberischen
+befehlshaberischer
+befehlshabers
+befehlsl
+befehlsliste
+befehlsm
+befehlsmodus
+befehlss
+befehlssatz
+befehlssequenzen
+befehlsstrukturen
+befehlst
+befehlston
+befehlsv
+befehlsvorrat
+befehlsw
+befehlswoerter
+befehlswoertern
+befehlsworte
+befehlsz
+befehlszeile
+befel
+befell
+befengt
+beferda
+beferde
+beferded
+beferdede
+beferdet
+beferned
+befeste
+befestes
+befestet
+befestig
+befestige
+befestigen
+befestigende
+befestigendem
+befestigenden
+befestigendes
+befestigst
+befestigt
+befestigte
+befestigtem
+befestigten
+befestigter
+befestigtest
+befestigtet
+befestigung
+befestigungen
+befestigungsbleche
+befestigungsgewinde
+befestigungslo"cher
+befestigungsschraube
+befestigungsteil
+befestigungswand
+befetish
+befetished
+befetter
+befeucht
+befeuchte
+befeuchtest
+befeuchtet
+befeuchtete
+befeuchteten
+befeuchteter
+befeuchtetes
+befeuchtetet
+befezzed
+beffa
+beffe
+beffen
+beffert
+beffroi
+beffrois
+befi
+befiddle
+befiehls
+befiehlst
+befiehlt
+befilch
+befile
+befillet
+befilleted
+befilmed
+befilth
+befinde
+befinden
+befindend
+befindenden
+befindender
+befindendes
+befinder
+befindet
+befindli
+befindlich
+befindliche
+befindlichen
+befindlicher
+befindliches
+befinger
+befinna
+befinne
+befinnen
+befinnende
+befinner
+befintli
+befintlig
+befintliga
+befintligt
+befire
+befist
+befit
+befits
+befitted
+befittin
+befitting
+befittingly
+befittingness
+befkraag
+befkrage
+befkragen
+beflag
+beflags
+beflanne
+beflannel
+beflap
+beflatte
+beflatter
+beflea
+befleck
+beflecke
+beflecken
+beflecks
+befleckst
+befleckt
+befleckte
+beflecktem
+befleckten
+beflecktes
+beflecktest
+beflecktet
+beflijst
+beflijster
+beflijsters
+beflippe
+beflippelse
+beflisse
+beflissene
+beflissenem
+beflissenen
+beflitte
+beflittet
+befloers
+befloersen
+befloerst
+befloerste
+befloersten
+beflounc
+beflounce
+beflour
+beflout
+beflower
+befluege
+befluegeln
+beflum
+befluste
+befluster
+beflyves
+befo
+befo"rde
+befo"rdert
+befoam
+befoerde
+befoerdere
+befoerdern
+befoerdernde
+befoerderndem
+befoerdernden
+befoerderndes
+befoerderst
+befoerdert
+befoerdertem
+befoerderten
+befoerderter
+befoerdertest
+befoerderung
+befoerderungszahl
+befoerdetet
+befog
+befogad
+befogat
+befogenh
+befogenhet
+befogenheter
+befogged
+befoggin
+befogging
+befogs
+befohlen
+befohlene
+befohlenem
+befohlenen
+befohlenes
+befolge
+befolgen
+befolgende
+befolgendem
+befolgenden
+befolgendes
+befolger
+befolgst
+befolgt
+befolgte
+befolgtem
+befolgten
+befolgter
+befolgtest
+befolgtet
+befolgun
+befolgung
+befolka
+befolked
+befolkede
+befolker
+befolket
+befolkni
+befolkning
+befolkningen
+befolkningens
+befolknings
+befolkningsgruppe
+befolkningsgrupper
+befolkningskonsentrasjon
+befolkningslag
+befolkningstal
+befolkningsuderlag
+befolkningsvekst
+befolknings|kning
+befon
+befool
+befooled
+befoolin
+befooling
+befoolme
+befoolment
+befools
+befop
+befordra
+befordre
+befordrene
+befordrer
+befordri
+befordring
+befordringa
+befordringen
+befordringsmiddel
+befordringsmidler
+before
+beforeas
+beforeasm
+beforeex
+beforeexpand
+beforeha
+beforehand
+beforeli
+beforelinking
+beforeme
+beforementioned
+beforene
+beforeness
+beforere
+beforereorg
+beforest
+beforested
+beforeti
+beforetime
+beforetimes
+befortun
+befortune
+befoul
+befouled
+befouler
+befoulie
+befoulier
+befoulin
+befouling
+befoulme
+befoulment
+befouls
+befounta
+befountained
+befrackt
+befraemj
+befraemja
+befragen
+befragenden
+befrager
+befragt
+befragte
+befragten
+befragun
+befragungsaktion
+befragungsgruppe
+befragungstag
+befrakte
+befrakter
+befraktere
+befrakterne
+befraktn
+befraktningsavtale
+befraktningssjef
+beframja
+befraugh
+befraught
+befre
+befreckl
+befreckle
+befreeze
+befreie
+befreien
+befreiend
+befreiende
+befreiendem
+befreiender
+befreiendes
+befreier
+befreiern
+befreiers
+befreigh
+befreight
+befreist
+befreit
+befreite
+befreiten
+befreiter
+befreitest
+befreitet
+befreiun
+befreiung
+befreiungsantrag
+befreiungsarmee
+befreiungsbewegung
+befreiungsfeier
+befreiungsfront
+befreiungskomitee
+befreiungsorganisation
+befreiungsschlag
+befremde
+befremdender
+befremdest
+befremdet
+befremdetem
+befremdeten
+befremdeter
+befremdetest
+befremdetet
+befremdl
+befremdlich
+befremdlichem
+befremdlichen
+befremdlicher
+befret
+befreund
+befreunde
+befreunden
+befreundest
+befreundete
+befreundetem
+befreundeten
+befreundetes
+befreundetest
+befreundetet
+befri
+befria
+befridd
+befriede
+befriedi
+befriedigen
+befriedigend
+befriedigende
+befriedigendem
+befriedigenden
+befriedigender
+befriedigendes
+befriedigt
+befriedigte
+befriedigtem
+befriedigter
+befriedigtes
+befriedigtest
+befriedigung
+befriedu
+befriedung
+befriels
+befrielse
+befrielsen
+befrielser
+befrielses
+befriend
+befriende
+befriended
+befriender
+befriending
+befriendment
+befriends
+befriere
+befrieren
+befrill
+befringe
+befringed
+befrir
+befriste
+befristen
+befristet
+befristeten
+befriz
+befrocke
+befrocked
+befrogge
+befrogged
+befrounc
+befrounce
+befrucht
+befruchten
+befruchtende
+befruchtenden
+befruchtet
+befruchtete
+befruchtetem.fertilized
+befruchteter
+befruchtetes
+befruchtetest
+befruchtung
+befruchtungen
+befrukta
+befrukte
+befrukter
+befruktet
+befruktn
+befruktningen
+befrumpl
+befrumple
+befr{mja
+befuddle
+befuddled
+befuddlement
+befuddlements
+befuddler
+befuddlers
+befuddles
+befuddli
+befuddling
+befuecht
+befuechten
+befuehle
+befuehlen
+befuehlend
+befuehlende
+befuehlenden
+befuehlender
+befuehlendes
+befuehlt
+befuehlte
+befuehlten
+befuehltet
+befuehrw
+befuehrwortend
+befuehrwortende
+befuehrwortenden
+befuehrwortender
+befuehrwortendes
+befuehrworter
+befuerch
+befuerchten
+befuerchtend
+befuerchtende
+befuerchtenden
+befuerchtender
+befuerchtendes
+befuerchtet
+befuerchtete
+befuerchtetem
+befuerchteter
+befuerchtetes
+befuerchtetest
+befuerchtung
+befuerwo
+befuerworte
+befuerworten
+befuerworter
+befuerworterin
+befuerworterinnen
+befuerworters
+befuerwortest
+befuerwortete
+befuerwortetem
+befuerworteten
+befuerwortetes
+befuerwortetest
+befuerwortetet
+befuerwortung
+befuerwortungen
+befugnis
+befugnisse
+befugnissen
+befugnisses
+befugt
+befugte
+befugtem
+befugter
+befugtes
+befuhr
+befuhrst
+befuhrt
+befuktni
+befuktning
+befume
+befun
+befunde
+befunden
+befundenen
+befundes
+befunnet
+befunnit
+befurbel
+befurbelowed
+befurred
+bef{l
+bef{sta
+bef{stet
+bef{stning
+bef{stninger
+bef|jelser
+bef|le
+bef|ler
+bef|lte
+bef|yels
+bef|yelse
+bef|yelser
+bef|yet
+beg
+bega
+begaa
+begaafd
+begaafde
+begaafder
+begaafdh
+begaafdheden
+begaafdheid
+begaafds
+begaafdst
+begaan
+begaanba
+begaanbaar
+begaanbaarheid
+begaanbare
+begaange
+begaangen
+begaap
+begaapt
+begaapte
+begaapten
+begaat
+begaava
+begaben
+begabled
+begabt
+begabte
+begabten
+begabtenfoerderung
+begabter
+begabtere
+begabteren
+begabterer
+begabteres
+begabtes
+begabteste
+begabtestem
+begabtesten
+begabtestes
+begabung
+begabungen
+begacker
+begackert
+begad
+begaer
+begaera
+begaeran
+begaerda
+begaeres
+begaert
+begaf
+begagna
+begahak
+begahbar
+begahbaren
+begak
+begall
+began
+begane
+begangen
+begangene
+begangenem
+begangener
+begangenes
+begani
+beganken
+begankenis
+begankenissen
+begann
+begannen
+begannst
+begannt
+begapen
+begar
+begara
+begaran
+begarda
+begardo
+begares
+begari
+begarlan
+begarlanded
+begarnis
+begarnish
+begart
+begarter
+begartered
+begash
+begasin
+begastrense
+begat
+begaud
+begaudy
+begav
+begava
+begavede
+begavels
+begavelse
+begavelsen
+begavelser
+begaven
+begavet
+begawan
+begawd
+begay
+begaze
+bege
+begeben
+begebenh
+begebenheit
+begebenheiten
+begeck
+begeef
+begeefst
+begeefster
+begeefsters
+begeeft
+begeer
+begeerba
+begeerbaar
+begeerbaarder
+begeerbaarst
+begeerbare
+begeerd
+begeerde
+begeerden
+begeerli
+begeerlijk
+begeerlijke
+begeerlijker
+begeerlijkheden
+begeerlijkheid
+begeerlijkst
+begeert
+begeerte
+begeerten
+begegne
+begegnen
+begegnend
+begegnendem
+begegnenden
+begegnender
+begegnes
+begegnest
+begegnet
+begegnete
+begegneten
+begegneter
+begegnetes
+begegnetet
+begegnun
+begegnung
+begegnungen
+begehbar
+begehbare
+begehe
+begehen
+begehend
+begehenden
+begehender
+begehendes
+begehren
+begehrend
+begehrende
+begehrenden
+begehrender
+begehrendes
+begehrenswerte
+begehrenswertem
+begehrenswerten
+begehrenswertere
+begehrenswerterem
+begehrenswerteren
+begehrenswerteres
+begehrenswertes
+begehrenswerteste
+begehrenswertesten
+begehrenswertester
+begehrenswertestes
+begehrli
+begehrliche
+begehrlichem
+begehrlichen
+begehrlichere
+begehrlicherem
+begehrlicheren
+begehrlicheres
+begehrliches
+begehrlichkeit
+begehrlichkeiten
+begehrlichste
+begehrlichsten
+begehrlichster
+begehrlichstes
+begehrt
+begehrte
+begehrtem
+begehrter
+begehrtest
+begehrteste
+begehrtet
+begehrth
+begehrtheit
+begehst
+begeht
+begeiste
+begeistern
+begeisternd
+begeisternde
+begeisternden
+begeisternder
+begeisterndes
+begeistert
+begeisterte
+begeistertem
+begeisterter
+begeistertes
+begeistertest
+begeisterung
+begeisterungsrufen
+begeistr
+begeistra
+begeistre
+begeistrede
+begeistret
+begeistring
+begeistringa
+begeistringen
+begeleid
+begeleidde
+begeleidden
+begeleide
+begeleiden
+begeleider
+begeleiders
+begeleiding
+begeleidingen
+begeleidster
+begeleidsters
+begeleidt
+begem
+begenadi
+begenadig
+begenadigd
+begenadigde
+begenadigden
+begenadigen
+begenadiging
+begenadigingen
+begenadigt
+beger
+begeren
+begeret
+begerig
+begerige
+begeriger
+begerigh
+begerigheid
+begerigs
+begerigst
+begersvi
+begersvinger
+beget
+begets
+begettal
+begetter
+begetters
+begettes
+begettest
+begettet
+begetteth
+begettin
+begetting
+begeven
+begevene
+begevenen
+begever
+begevers
+begeving
+begevingsrecht
+begg
+beggable
+beggar
+beggardo
+beggardom
+beggared
+beggarer
+beggares
+beggaress
+beggarho
+beggarhood
+beggarie
+beggaries
+beggarin
+beggaring
+beggaris
+beggarism
+beggarli
+beggarlike
+beggarliness
+beggarly
+beggarma
+beggarman
+beggarmy
+beggarmyneighbor
+beggars
+beggarwe
+beggarweed
+beggarwi
+beggarwise
+beggarwo
+beggarwoman
+beggary
+begge
+begged
+begges
+beggiato
+beggiatoa
+beggiatoaceae
+beggiatoaceous
+begging
+beggingl
+beggingly
+beggingw
+beggingwise
+beggs
+beghard
+beghi
+begi
+begibt
+begick
+begierde
+begierden
+begierig
+begierige
+begierigen
+begieriger
+begieriges
+begiesse
+begiessen
+begiesst
+begiet
+begieten
+begift
+begiftig
+begiftigd
+begiftigde
+begiftigden
+begiftigen
+begiftiger
+begiftigers
+begiftiging
+begiftigingen
+begiftigster
+begiftigsters
+begiftigt
+begiggle
+begijn
+begijnen
+begijnenkoek
+begijnenkoeken
+begijnenrijst
+begijnho
+begijnhof
+begijnhoven
+begik
+begikk
+begild
+begilt
+begimao
+begin
+beginc
+beging
+begingen
+beginger
+begingst
+beginibu
+beginibum
+beginjar
+beginjaren
+beginkla
+beginklank
+beginklanken
+beginlet
+beginletter
+beginletters
+beginn
+beginne
+beginnel
+beginneling
+beginnelinge
+beginnelingen
+beginnen
+beginnend
+beginnende
+beginnenden
+beginnender
+beginnendes
+beginner
+beginners
+beginnes
+beginnest
+beginnin
+beginning
+beginnings
+beginnt
+beginper
+beginperiode
+beginpun
+beginpunt
+beginpunten
+beginreg
+beginregel
+beginregels
+beginrij
+beginrijm
+beginrijmen
+begins
+beginsel
+beginselen
+beginselkwestie
+beginselkwesties
+beginselloos
+beginselloosheid
+beginselloost
+beginselloze
+beginsellozer
+beginsels
+beginselvast
+beginselvaste
+beginselvaster
+beginselvastheid
+beginselvastmeest
+beginselverklaring
+beginselverklaringen
+beginsne
+beginsnelheden
+beginsnelheid
+begint
+beginvoo
+beginvoorwaarden
+begir
+begird
+begirded
+begirdin
+begirding
+begirdle
+begirt
+begive
+begivenh
+begivenhed
+begivenheden
+begivenheder
+begivenhederne
+begivenhet
+begivenheten
+begivenhetene
+begivenhetens
+begivenheter
+begivenhetslaus
+begivenhetsl|st
+begivenhetsrike
+begiver
+begj{r
+begj{re
+begj{res
+begj{ret
+begj{rin
+begj{ring
+begj{ringen
+begj{rli
+begj{rlige
+begj{rlighet
+begj{rt
+begj{rte
+beglad
+beglamou
+beglamour
+beglare
+beglaubi
+beglaubige
+beglaubigst
+beglaubigt
+beglaubigte
+beglaubigten
+beglaubigter
+beglaubigtes
+beglaubigtet
+beglaubigung
+beglaubigungen
+beglaubigungsschreibens
+begleich
+begleiche
+begleichen
+begleichende
+begleichendem
+begleichenden
+begleichendes
+begleichst
+begleicht
+begleichung
+begleichungen
+begleitb
+begleitbrief
+begleitbriefe
+begleitbriefen
+begleitbriefes
+begleite
+begleiten
+begleitend
+begleitende
+begleitender
+begleitendes
+begleitergruppe
+begleiterin
+begleiterinnen
+begleiters
+begleiterscheinung
+begleiterscheinungen
+begleitest
+begleitet
+begleitete
+begleitetem
+begleiteten
+begleitetes
+begleitetest
+begleitetet
+begleith
+begleitheft
+begleitm
+begleitmusik
+begleitn
+begleitnote
+begleitp
+begleitperson
+begleitpersonal
+begleits
+begleitschiff
+begleitschreibens
+begleitu
+begleitumstaende
+begleitumstaenden
+begleitumstandes
+begleitung
+begleitungen
+beglerbe
+beglerbeg
+beglerbeglic
+beglerbegluc
+beglerbegship
+beglerbey
+begley
+beglic
+begliche
+beglichen
+beglichene
+beglichenem
+beglichener
+beglichenes
+beglichest
+beglide
+beglitte
+beglitter
+beglo
+beglobed
+beglodd
+begloom
+begloze
+begluc
+beglue
+beglueck
+begluecken
+beglueckend
+beglueckender
+beglueckt
+beglueckte
+beglueckwuenschen
+beglueckwuenschest
+beglueckwuenscht
+beglueckwuenschtem
+beglueckwuenschten
+beglueckwuenschter
+beglueckwuenschtest
+beglueckwuenschtet
+beglueckwuenschung
+begluren
+begluur
+begluurd
+begluurde
+begluurden
+begluurt
+begnadet
+begnadetem
+begnadeten
+begnadetes
+begnadig
+begnadigen
+begnadigst
+begnadigt
+begnadigtem
+begnadigten
+begnadigter
+begnadigtest
+begnadigtet
+begnadigung
+begnadigungen
+begnadigungsaktion
+begnaw
+begnu"ge
+begnu"gen
+begnuege
+begnuegen
+begnuegend
+begnuegendem
+begnuegenden
+begnuegender
+begnuegs
+begnuegst
+begnuegt
+begnuegte
+begnuegtest
+begnuegtet
+bego
+begob
+begobs
+begoggle
+begoggled
+begohm
+begon
+begona
+begone
+begonia
+begonia'
+begonia's
+begonia`cea
+begonia`ceo
+begoniac
+begoniaceae
+begoniaceous
+begoniae
+begoniaen
+begoniaer
+begonial
+begoniales
+begonias
+begonie
+begonien
+begonienweg
+begonnen
+begonnene
+begonnenem
+begonnenen
+begonnenes
+begooche
+begoochel
+begoochelaar
+begoochelaars
+begoocheld
+begoochelde
+begoochelden
+begoochelen
+begoocheling
+begoochelingen
+begoochelt
+begoot
+begorah
+begorra
+begorrah
+begorry
+begoss
+begossen
+begossene
+begossenen
+begossener
+begossenes
+begosset
+begot
+begoten
+begotene
+begotenen
+begotten
+begottenness
+begoud
+begovich
+begowk
+begowned
+begra
+begraaf
+begraafp
+begraafplaats
+begraafplaatsen
+begraaft
+begraas
+begraasd
+begraasde
+begraasden
+begraast
+begrabe
+begraben
+begrabene
+begrabenen
+begrabener
+begrabenes
+begrace
+begradig
+begradigt
+begradigung
+begraebn
+begraebnis
+begraebnissen
+begraebnisses
+begraebs
+begraebst
+begraebt
+begraens
+begraensa
+begraensningar
+begraensningen
+begrafen
+begrafenis
+begrafenisfonds
+begrafenisfondsen
+begrafenisgezicht
+begrafenisgezichten
+begrafeniskosten
+begrafenisonderneming
+begrafenisondernemingen
+begrafenisplechtigheden
+begrafenisplechtigheid
+begrafenisrecht
+begrafenisrechten
+begrafenissen
+begrafenisstoet
+begrafenisstoeten
+begrain
+begransa
+begransn
+begransningar
+begransningen
+begrava
+begravd
+begravde
+begrave
+begravel
+begravelse
+begravelsen
+begravelser
+begravelsesbyr}
+begravelsesbyr}enes
+begravelsesdagen
+begravelsesform
+begravelsesh|gtidelighet
+begravelseskapel
+begraven
+begravene
+begravenen
+begraver
+begraves
+begravet
+begravin
+begraving
+begravingen
+begravit
+begravni
+begravningsbok
+begray
+begrazen
+begre
+begrease
+begreb
+begreber
+begreberne
+begrebers
+begrebet
+begrebsdannelser
+begrebsramme
+begrebsrammer
+begredel
+begredelig
+begreen
+begreep
+begreife
+begreifen
+begreifende
+begreifendem
+begreifenden
+begreifendes
+begreifl
+begreiflich
+begreifliche
+begreiflichen
+begreiflicher
+begreiflicherweise
+begreifs
+begreifst
+begreift
+begreip
+begrenin
+begrening
+begrens
+begrensa
+begrensd
+begrensde
+begrensden
+begrensder
+begrensdheid
+begrensdmeest
+begrense
+begrensede
+begrenser
+begrenses
+begrenset
+begrensete
+begrensi
+begrensing
+begrensn
+begrensning
+begrensningen
+begrensninger
+begrensningsflate
+begrensningsflaten
+begrensningsflatene
+begrensningsflater
+begrensningskurve
+begrenst
+begrenze
+begrenzen
+begrenzend
+begrenzende
+begrenzendem
+begrenzender
+begrenzendes
+begrenzermodul
+begrenzest
+begrenzi
+begrenzing
+begrenzingen
+begrenzt
+begrenzte
+begrenztem
+begrenzten
+begrenzter
+begrenztes
+begrenztest
+begrenztet
+begrenztheit
+begrenzu
+begrenzug
+begrenzung
+begrenzungen
+begrenzungslinie
+begrenzungsmauer
+begrenzungswarnung
+begrep
+begrepen
+begrepene
+begrepenen
+begreper
+begrepet
+begrepp
+begrepsd
+begrepsdannelsen
+begrepsf
+begrepsforvirring
+begret
+begrett
+begribe
+begribeligt
+begriff
+begriffe
+begriffen
+begriffene
+begriffenem
+begriffener
+begriffenes
+begriffes
+begriffet
+begriffl
+begriffliche
+begrifflichen
+begriffs
+begriffsbestimmungen
+begriffsebenen
+begriffsstutzig
+begriffsstutzige
+begriffsstutzigen
+begriffsstutziger
+begriffsstutziges
+begriffstbestimmungen
+begriffsvermoegen
+begriffsverwirrung
+begriffsverwirrungen
+begriffswoerterbuch
+begrifft
+begrijp
+begrijpe
+begrijpelijk
+begrijpelijke
+begrijpelijker
+begrijpelijkst
+begrijpen
+begrijpt
+begrim
+begrime
+begrimed
+begrimer
+begrimes
+begrimin
+begriming
+begrimme
+begrimmed
+begrind
+begrindd
+begrindde
+begrindden
+begrinde
+begrinden
+begrindi
+begrinding
+begrindt
+begrint
+begrinte
+begrinten
+begrinti
+begrinting
+begrintt
+begrintte
+begrintten
+begrip
+begripa
+begripe
+begripel
+begripelig
+begriper
+begripli
+begriplig
+begripliga
+begripligt
+begrippe
+begrippen
+begripsa
+begripsassociatie
+begripsassociaties
+begripsb
+begripsbepaling
+begripsbepalingen
+begripsl
+begripsleer
+begripsv
+begripsvermogen
+begripsverwarring
+begripsverwarringen
+begripsw
+begripswoord
+begripswoorden
+begroan
+begroef
+begroei
+begroeid
+begroeide
+begroeiden
+begroeie
+begroeien
+begroeii
+begroeiing
+begroeiingen
+begroeit
+begroesd
+begroesde
+begroesder
+begroesdmeest
+begroet
+begroete
+begroeten
+begroeti
+begroeting
+begroetingen
+begroett
+begroette
+begroetten
+begroeve
+begroeven
+begrom
+begromd
+begromde
+begromden
+begromme
+begrommen
+begromt
+begroot
+begroott
+begrootte
+begrootten
+begrote
+begrotel
+begrotelijk
+begrotelijke
+begrotelijker
+begrotelijkst
+begroten
+begrotin
+begroting
+begrotingen
+begrotingscijfer
+begrotingscijfers
+begrotingsdebat
+begrotingsdebatten
+begrotingsjaar
+begrotingsjaren
+begrotingsontwerp
+begrotingsontwerpen
+begrotingstekort
+begrotingstekorten
+begrotingswet
+begrotingswetten
+begrov
+begrown
+begru"nd
+begru"ndbar
+begru"nden
+begru"ndet
+begru"ndung
+begru"ss
+begru"ssen
+begru"sst
+begru"ssungspalaver
+begrub
+begruben
+begrubte
+begrubtet
+begrudge
+begrudged
+begrudges
+begrudgi
+begrudging
+begrudgingly
+begruend
+begruendbar
+begruenden
+begruendend
+begruendende
+begruendenden
+begruendender
+begruendendes
+begruender
+begruenderinnen
+begruendern
+begruenders
+begruendet
+begruendete
+begruendetem
+begruendeter
+begruendetes
+begruendetest
+begruendungen
+begruess
+begruessen
+begruessend
+begruessende
+begruessenden
+begruessender
+begruessendes
+begruessenswerte
+begruessest
+begruesst
+begruesstem
+begruessten
+begruesster
+begruesstest
+begruesstet
+begruessung
+begruessungsansprache
+begruessungsempfang
+begruessungsfeierlichkeiten
+begruessungskanon
+begruessungsworte
+begruis
+begruisd
+begruisde
+begruisden
+begruist
+begruize
+begruizen
+begrunda
+begrunde
+begrundede
+begrundelse
+begrundelsen
+begrundelser
+begrunder
+begrundes
+begrundet
+begrunne
+begrunnede
+begrunnelse
+begrunnelsen
+begrunnelsene
+begrunnelser
+begrunner
+begrunnes
+begrunnet
+begrunnete
+begruntl
+begruntle
+begrutch
+begrutte
+begrutten
+begr{nsa
+begr{nse
+begr{nsede
+begr{nser
+begr{nses
+begr{nset
+begr{nsn
+begr{nsning
+begr{nsningar
+begr{nsningen
+begr{nsninger
+begr{nsningerne
+begs
+begua
+beguard
+begudry
+beguenst
+beguenstige
+beguenstigen
+beguenstigend
+beguenstigendem
+beguenstigenden
+beguenstigender
+beguenstigst
+beguenstigt
+beguenstigte
+beguenstigten
+beguenstigter
+beguenstigtes
+beguenstigtet
+beguenstigung
+beguess
+begueter
+begueterten
+beguetig
+beguetigt
+beguil
+beguile
+beguiled
+beguilef
+beguileful
+beguilem
+beguilement
+beguilements
+beguiler
+beguilers
+beguiles
+beguilin
+beguiling
+beguilingly
+beguin
+beguina
+beguine
+beguines
+beguino
+begulf
+begum
+begums
+begun
+begunk
+begunsti
+begunstig
+begunstigd
+begunstigde
+begunstigden
+begunstige
+begunstigelse
+begunstigen
+begunstiger
+begunstigers
+begunstiget
+begunstiging
+begunstigster
+begunstigsters
+begunstigt
+begut
+begutach
+begutachtbare
+begutachte
+begutachtend
+begutachtende
+begutachtendem
+begutachtender
+begutachtendes
+begutachtest
+begutachtete
+begutachtetem
+begutachteten
+begutachtetes
+begutachtetest
+begutachtetet
+begynd
+begynde
+begyndelse
+begyndelsen
+begyndelses
+begyndelsesbogstav
+begyndelsesfase
+begyndelsespunkt
+begyndelsespunkter
+begyndelsespunkterne
+begyndelsesv{rdi
+begyndende
+begynder
+begyndere
+begynderundervisning
+begyndes
+begyndt
+begyndte
+begynna
+begynne
+begynnel
+begynnelse
+begynnelsebokstav
+begynnelsen
+begynnen
+begynnende
+begynner
+begynnerfeil
+begynnerkurset
+begynnerl|nn
+begynnernes
+begynneroppl{ring
+begynnerskole
+begynt
+begynte
+beg{r
+beg{ra
+beg{ran
+beg{rda
+beg{re
+beg{rer
+beg{res
+beg{ring
+beg{rlig
+beg{rt
+beg}
+beg}ngen
+beg}r
+beg}s
+beg}tt
+beg}tte
+beg}va
+beh
+beha"lt
+beha"lte
+beha"lter
+beha"ngt
+beha"ngte
+behaag
+behaagd
+behaagde
+behaagden
+behaagli
+behaaglijk
+behaaglijke
+behaaglijker
+behaaglijkheid
+behaaglijkst
+behaagt
+behaagzi
+behaagziek
+behaagzieke
+behaagzieker
+behaagziekst
+behaagzu
+behaagzucht
+behaal
+behaald
+behaalde
+behaalden
+behaall
+behaalla
+behaalle
+behaalles
+behaalt
+behaar
+behaard
+behaarde
+behaarden
+behaarder
+behaardh
+behaardheid
+behaards
+behaardst
+behaart
+behaarte
+behaarten
+behaarter
+behaartes
+behaebig
+behaebige
+behaebigem
+behaebigen
+behaebiges
+behaebigkeit
+behaefta
+behaelt
+behaelte
+behaelter
+behaelterbau
+behaelters
+behaelts
+behaeltst
+behaendi
+behaendig
+behaenge
+behaengt
+behaersk
+behaerska
+behafta
+behaftet
+behag
+behaga
+behage
+behageli
+behagelig
+behagelige
+behageligere
+behagelighed
+behagelighet
+behageligt
+behagen
+behagend
+behagendem
+behagenden
+behagender
+behaget
+behaglic
+behaglich
+behagliche
+behaglichem
+behaglicher
+behagliches
+behaglichkeit
+behagst
+behagte
+behagten
+behagtes
+behagtest
+behai`smo
+behak
+behakken
+behakt
+behakte
+behakten
+behal
+behale
+behalen
+behalf
+behalfen
+behalfes
+behalfest
+behall
+behalla
+behalles
+behallow
+behalte
+behalten
+behaltend
+behaltendem
+behaltenden
+behaltender
+behaltene
+behaltenem
+behaltenen
+behaltenes
+behalve
+behamer
+behamerd
+behamerde
+behamerden
+behamere
+behameren
+behamert
+behammer
+behand
+behandel
+behandeld
+behandelde
+behandelden
+behandele
+behandelen
+behandeling
+behandelingen
+behandelingsmethode
+behandelingsmethoden
+behandelingswijze
+behandeln
+behandelnde
+behandelndem
+behandelnden
+behandelndes
+behandelst
+behandelt
+behandelte
+behandeltem
+behandelten
+behandelter
+behandeltest
+behandeltet
+behandig
+behandla
+behandlad
+behandlare
+behandle
+behandlede
+behandler
+behandles
+behandlet
+behandli
+behandling
+behandlinga
+behandlingen
+behandlinger
+behandlings
+behandlingsgaang
+behandlingsgang
+behandlingsg}ng
+behandlingsheim
+behandlingshjem
+behandlingsklar
+behandlingsmetode
+behandlingsmetoden
+behandlingsmetodens
+behandlingsmetoder
+behandlingsmetoderne
+behandlingsmetodernes
+behandlingsm}de
+behandlingsm}te
+behandlingsm}ten
+behandlingsprogram
+behandlingsresultater
+behandlingssystemet
+behandlingstiden
+behandlingstilbud
+behandlu
+behandlung
+behandlungen
+behandlungserfolge
+behandlungsgeraet
+behandlungsmethode
+behandlungsmethoden
+behandsc
+behandschuht
+behang
+behangen
+behangene
+behangenen
+behanger
+behangers
+behangerskwast
+behangerskwasten
+behanges
+behanget
+behangetje
+behangetjes
+behangpa
+behangpapier
+behangpapieren
+behangse
+behangsel
+behangsellinnen
+behangselpapier
+behangselpapieren
+behangsels
+behangt
+behap
+behar
+beharen
+behari
+beharre
+beharren
+beharrend
+beharrende
+beharrendem
+beharrender
+beharrendes
+beharrli
+beharrlich
+beharrlichem
+beharrlichen
+beharrlicher
+beharrlichkeit
+beharrst
+beharrt
+beharrte
+beharrtest
+beharrtet
+beharska
+behartig
+behartigd
+behartigde
+behartigden
+behartigen
+behartigenswaard
+behartigenswaarde
+behartigenswaarder
+behartigenswaardig
+behartigenswaardige
+behartigenswaardiger
+behartigenswaardigst
+behartigenswaardst
+behartiging
+behartigt
+behatted
+behaue
+behaupte
+behaupten
+behauptend
+behauptendem
+behauptenden
+behauptender
+behauptest
+behauptet
+behauptete
+behaupteten
+behaupteter
+behauptetes
+behauptetet
+behauptu
+behauptung
+behauptungen
+behausen
+behaust
+behausun
+behausung
+behaute
+behautem
+behauten
+behautes
+behautest
+behautet
+behav
+behave
+behaved
+behaver
+behavers
+behaves
+behaveth
+behaving
+behavior
+behavioral
+behaviorally
+behaviored
+behaviorism
+behaviorisme
+behaviorist
+behavioristic
+behavioristically
+behavioristisk
+behaviorists
+behaviors
+behaviou
+behaviour
+behavioural
+behaviourally
+behaviourist
+behaviouristen
+behaviours
+behcet
+behdad
+behe
+behead
+beheadal
+beheaded
+beheader
+beheadin
+beheading
+beheadli
+beheadlined
+beheads
+behear
+behears
+behearse
+behebbar
+behebe
+beheben
+behebst
+behebt
+behebung
+behebungsversuche
+behedge
+behee
+beheer
+beheerd
+beheerde
+beheerden
+beheerder
+beheerders
+beheerra
+beheerraad
+beheerraden
+beheers
+beheerse
+beheersen
+beheerser
+beheerseres
+beheerseresen
+beheerseressen
+beheersers
+beheersi
+beheersing
+beheersm
+beheersmatige
+beheerst
+beheerste
+beheersten
+beheerster
+beheersters
+beheerstheid
+beheert
+behefte
+behefted
+beheftede
+beheftel
+beheftelse
+beheftet
+beheimat
+beheimatet
+beheimatete
+beheimatetem
+beheimateter
+beheimatetes
+beheizba
+beheizbare
+beheizt
+beheizte
+beheiztem
+beheiztes
+beheizun
+beheizung
+beheks
+beheksen
+behekst
+behekste
+beheksten
+beheld
+beheldst
+behelf
+behelfen
+behelfend
+behelfende
+behelfenden
+behelfender
+behelfendes
+behelfs
+behelfsm
+behelfsmaessige
+behelfsmaessigen
+behelfsmaessiges
+behellig
+behellige
+behelligen
+behelligend
+behelligendem
+behelligenden
+behelligender
+behelligst
+behelligt
+behelligte
+behelligten
+behelligter
+behelligtes
+behelligtet
+behelligung
+behelligungen
+behelp
+behelpen
+behelpt
+behels
+behelsd
+behelsde
+behelsden
+behelst
+behelzen
+behemoth
+behemoths
+behen
+behenate
+behend
+behende
+behenden
+behender
+behendes
+behendig
+behendige
+behendiger
+behendigheden
+behendigheid
+behendigheidswedstrijd
+behendigheidswedstrijden
+behendighet
+behendigheten
+behendigkeit
+behendigst
+behenic
+behept
+behepte
+beherber
+beherbergen
+beherbergend
+beherbergende
+beherbergenden
+beherbergender
+beherbergendes
+beherbergt
+beherbergte
+beherbergtem
+beherbergter
+beherbergtes
+beherbergtest
+beheren
+beherend
+beherende
+beherrsc
+beherrschbar
+beherrschbares
+beherrsche
+beherrschen
+beherrschend
+beherrschendem
+beherrschenden
+beherrschender
+beherrscher
+beherrschest
+beherrschst
+beherrscht
+beherrschte
+beherrschtem
+beherrschten
+beherrschter
+beherrschtest
+beherrschtet
+beherrschung
+beherska
+beherske
+beherskede
+beherskelse
+beherskelsen
+behersker
+behersket
+beherzig
+beherzigen
+beherzigt
+beherzt
+beherzte
+beherzten
+beherzter
+beherztes
+beherzth
+beherztheit
+beheshti
+behest
+behests
+behetri`a
+behets
+behext
+behie
+behiehlt
+behiehlten
+behiehltet
+behiehltst
+behield
+behielde
+behielden
+behielp
+behielpe
+behielpen
+behielte
+behielten
+behieuw
+behieuwe
+behieuwen
+behilfli
+behilflich
+behilft
+behind
+behinde
+behinder
+behindere
+behindern
+behindernde
+behinderndem
+behindernden
+behinderst
+behindert
+behinderte
+behinderten
+behindertenwerkstatt
+behinderter
+behindertes
+behindertet
+behinderung
+behindha
+behindhand
+behinds
+behindsi
+behindsight
+behindth
+behindthescenes
+behing
+behingen
+behint
+behjelpe
+behjelpelig
+behjelpelighet
+behjerta
+behjerte
+behjertet
+behj{lpelig
+behlefsm
+behlefsmaessiger
+behlen
+behler
+behli
+behling
+behm
+behma
+behmer
+behn
+behnam
+behnan
+beho"rde
+beho"rdl
+beho"rdlichen
+behoa
+behob
+behoben
+behobene
+behobenem
+behobenen
+behobenes
+behobest
+behobet
+behoed
+behoedde
+behoedden
+behoede
+behoeden
+behoeder
+behoeders
+behoedmi
+behoedmiddel
+behoedmiddelen
+behoedst
+behoedster
+behoedsters
+behoedt
+behoedza
+behoedzaam
+behoedzaamheid
+behoedzaamst
+behoedzame
+behoedzamer
+behoef
+behoefd
+behoefde
+behoefden
+behoeft
+behoefte
+behoeften
+behoefti
+behoeftig
+behoeftige
+behoeftiger
+behoeftigheid
+behoeftigst
+behoell
+behoerde
+behoerdenauftraege
+behoerdenbauten
+behoerdendeutsch
+behoerdenfehler
+behoerdengeschaeft
+behoerdeninterner
+behoerdenleiter
+behoerdenstellen
+behoerdenwillkuer
+behoerdl
+behoerdlich
+behoerdlichem
+behoerdlichen
+behoerdlicher
+behoerig
+behoeriga
+behoerigen
+behoerighet
+behoerighetsindelningar
+behoerigt
+behoeva
+behoeve
+behoeven
+behoevli
+behoevlig
+behoevliga
+behoevligt
+behoevs
+behoevt
+behold
+beholdab
+beholdable
+beholde
+beholden
+beholder
+beholdere
+beholderen
+beholders
+beholdes
+beholdest
+beholdet
+beholdeth
+beholdin
+beholding
+beholdingness
+beholdni
+beholdning
+beholdningen
+beholdningene
+beholds
+beholdt
+beholfen
+beholl
+beholpen
+beholpene
+beholpenen
+behoney
+behoof
+behooped
+behoor
+behoord
+behoorde
+behoorden
+behoorli
+behoorlijk
+behoorlijke
+behoorlijker
+behoorlijkst
+behoort
+behoot
+behoove
+behooved
+behoovef
+behooveful
+behoovefully
+behoovefulness
+behooves
+behoovin
+behooving
+behoovingly
+behorche
+behorchen
+behorchs
+behorchst
+behorcht
+behorchte
+behorchtem
+behorchten
+behorchtes
+behorchtest
+behorchtet
+behoren
+behorend
+behorende
+behoriga
+behorige
+behorigen
+behorigh
+behorighet
+behorighetsindelningar
+behorigt
+behorn
+behorror
+behoud
+behouden
+behoudend
+behoudende
+behoudender
+behoudendst
+behoudene
+behoudenen
+behoudenis
+behoudens
+behouder
+behouders
+behoudsl
+behoudslieden
+behoudsm
+behoudsman
+behoudt
+behoudzu
+behoudzucht
+behouw
+behouwen
+behouwene
+behouwenen
+behouwt
+behov
+behova
+behove
+behoved
+behovene
+behoves
+behovet
+behovets
+behovlig
+behovliga
+behovligt
+behovs
+behovsan
+behovsanalyse
+behovspr
+behovspr|ve
+behovspr|ving
+behovspr|vingen
+behovstilfredsstillelse
+behovstilfredsstillende
+behovstilpasset
+behovt
+behowl
+behr
+behrain
+behran
+behrens
+behrensf
+behrensfisher
+behring
+behrmann
+behroozi
+behrouz
+behrs
+behruz
+behsud
+behuete
+behueten
+behuetend
+behuetendem
+behuetenden
+behuetender
+behuetes
+behuetest
+behuetet
+behuetete
+behueteten
+behueteter
+behuetetes
+behuetetet
+behuild
+behuilde
+behuisd
+behuisde
+behuizin
+behuizing
+behuizingen
+behulp
+behulpza
+behulpzaam
+behulpzaamheid
+behulpzaamst
+behulpzame
+behulpzamer
+behung
+behusban
+behusband
+behutsam
+behutsame
+behutsamem
+behutsamen
+behutsamere
+behutsamerem
+behutsameren
+behutsameres
+behutsames
+behutsamkeit
+behutsamste
+behutsamster
+behutsamstes
+behuw
+behuwd
+behuwdbr
+behuwdbroeder
+behuwdbroeders
+behuwddo
+behuwddochter
+behuwddochters
+behuwde
+behuwden
+behuwdmo
+behuwdmoeder
+behuwdmoeders
+behuwdoo
+behuwdoom
+behuwdooms
+behuwdta
+behuwdtante
+behuwdtantes
+behuwdva
+behuwdvader
+behuwdvaders
+behuwdzo
+behuwdzonen
+behuwdzoon
+behuwdzoons
+behuwdzu
+behuwdzuster
+behuwdzusters
+behuwen
+behuwt
+behymn
+behypocr
+behypocrite
+behzad
+beh{fta
+beh{ftet
+beh{ndig
+beh{ndige
+beh{ndighed
+beh{ndigheden
+beh{ndigt
+beh{ngt
+beh{rska
+beh|ll
+beh|rig
+beh|riga
+beh|rige
+beh|rigen
+beh|righ
+beh|righet
+beh|righetsindelningar
+beh|rigt
+beh|va
+beh|vd
+beh|vde
+beh|vdes
+beh|ve
+beh|vede
+beh|ver
+beh|ves
+beh|vlig
+beh|vliga
+beh|vligt
+beh|vs
+beh|vt
+beh}
+beh}en
+beh}ll
+beh}lla
+beh}lles
+beh}ra
+beh}ret
+bei
+beiaard
+beiaardc
+beiaardconcert
+beiaardconcerten
+beiaardd
+beiaardde
+beiaardden
+beiaarde
+beiaarden
+beiaardi
+beiaardier
+beiaardiers
+beiaards
+beiaardspel
+beiaardt
+beiander
+beianderliegende
+beibaku
+beibeha"
+beibeha"lt
+beibehae
+beibehaelt
+beibehal
+beibehalten
+beibehaltend
+beibehaltende
+beibehaltendem
+beibehaltender
+beibehaltendes
+beibehaltene
+beibehaltener
+beibehaltenes
+beibehaltung
+beibehie
+beibehielt
+beibi-zu
+beibizu
+beibring
+beibringen
+beibringend
+beibringende
+beibringenden
+beibringender
+beibringendes
+beibu
+beic
+beice
+beicher
+beichte
+beichten
+beichtend
+beichtendem
+beichtenden
+beichtender
+beichtes
+beichtest
+beichtet
+beichtete
+beichtetest
+beichtetet
+beichtge
+beichtgeheimnisse
+beichtgeheimnissen
+beichtgeheimnisses
+beichtki
+beichtkinder
+beichtkindern
+beichtkindes
+beichtst
+beichtstu"hlen
+beichtstuehlen
+beichtstuhl
+beichtstuhles
+beichtva
+beichtvaetern
+beichtvater
+beichtvaters
+beichuu
+beicyou
+beid
+beida
+beidde
+beidden
+beide
+beiden
+beider
+beiderha
+beiderhande
+beiderle
+beiderlei
+beiderse
+beiderseitigen
+beiderseitiger
+beiderseitiges
+beiderseits
+beiderzi
+beiderzijds
+beides
+beidjes
+beidseit
+beidseitig
+beidseitige
+beidt
+beiei
+beieinan
+beieinander
+beieinanderliegen
+beieinanderstanden
+beieintr
+beieintraechtigung
+beien
+beiennos
+beier
+beierde
+beierden
+beieren
+beierle
+beiers
+beiersdo
+beiersdorf
+beierse
+beiert
+beifaell
+beifaellig
+beifaelligem
+beifaelligen
+beifaelliger
+beifahre
+beifahrer
+beifahrerin
+beifahrern
+beifahrersitz
+beifall
+beifalls
+beifallsruf
+beifallsrufe
+beifallsrufen
+beifallsstuerme
+beifallsstuermen
+beifallssturm
+beifolge
+beifolgend
+beifolgende
+beifolgendem
+beifolgender
+beifolgendes
+beifu"ge
+beifu"gen
+beifuege
+beifuegen
+beifuegend
+beifuegende
+beifuegenden
+beifuegender
+beifuegendes
+beifuegu
+beifuegung
+beigawa
+beige
+beigeben
+beigebra
+beigebracht
+beigebrachte
+beigebrachten
+beigebrachter
+beigebrachtes
+beigefar
+beigefarbenen
+beigefu"
+beigefu"gt
+beigefu"gten
+beigefu"gter
+beigefue
+beigefuegt
+beigefuegtem
+beigefuegten
+beigefuegter
+beigegeb
+beigegeben
+beigegebene
+beigegebenen
+beigeleg
+beigelegene
+beigelegenem
+beigelegenen
+beigelegenes
+beigelegt
+beigelegte
+beigelegten
+beigelegter
+beigelegtes
+beigemen
+beigemengte
+beigemengtem
+beigemengten
+beigemengtes
+beigemes
+beigemessen
+beigemessene
+beigemessenen
+beigemessener
+beigemessenes
+beigemis
+beigemischte
+beigemischtem
+beigemischten
+beigemischtes
+beigeord
+beigeordnet
+beigeordnete
+beigepfl
+beigepflichtet
+beigepflichtete
+beigepflichtetem
+beigepflichteter
+beigepflichtetes
+beiger
+beiges
+beigesch
+beigeschmack
+beigeschmackes
+beigeset
+beigesetzt
+beigesetztem
+beigesetzten
+beigesetzter
+beigespr
+beigesprungen
+beigesprungene
+beigesprungenem
+beigesprungener
+beigesprungenes
+beigesta
+beigestanden
+beigestandenem
+beigestandenen
+beigestandener
+beigeste
+beigestellt
+beigestellten
+beigesteuert
+beigesteuerte
+beigesteuertem
+beigesteuerter
+beigesteuertes
+beigetra
+beigetragen
+beigetragenem
+beigetragenen
+beigetragener
+beigetre
+beigetreten
+beigetretene
+beigetretenem
+beigetretener
+beigetretenes
+beigewoh
+beigewohnt
+beignet
+beignets
+beigo
+beigoma
+beigun
+beigy
+beihanky
+beihilfe
+beihilfen
+beijing
+beiju
+beijver
+beijverd
+beijverde
+beijverden
+beijvere
+beijveren
+beijvert
+beijyu
+beijzeld
+beijzelde
+beik
+beika
+beikoku
+beikokub
+beikokud
+beikokug
+beikokuj
+beikokun
+beikokuy
+beikokuz
+beikuubo
+beil
+beila"uf
+beila"ufig
+beilaeuf
+beilaeufig
+beilaeufige
+beilaeufigem
+beilaeufiger
+beilaeufiges
+beilage
+beilagen
+beilagena"nderung
+beilagena"nderungen
+beilagsc
+beilagscheiben
+beile
+beilegen
+beilegende
+beilegendem
+beilegenden
+beilegendes
+beilegte
+beilegun
+beilegung
+beileibe
+beileid
+beileids
+beileidsbesuche
+beileidsbrief
+beileidsbriefe
+beileidsbriefes
+beileidskundgebungen
+beileidstelegramme
+beilenso
+beilenson
+beiles
+beili
+beiliege
+beiliegen
+beiliegend
+beiliegende
+beiliegendem
+beiliegenden
+beiliegender
+beiliegendes
+beilin
+beilul
+beim
+beimenge
+beimengen
+beimengend
+beimengendem
+beimengenden
+beimengender
+beimengu
+beimengungen
+beimesse
+beimessen
+beimessend
+beimessendem
+beimessenden
+beimessender
+beimisch
+beimischen
+beimischend
+beimischendem
+beimischenden
+beimischender
+beimischten
+beimischungszwecke
+beimisst
+beimler
+bein
+beina
+beinah
+beinahe
+beinamen
+beinamens
+beinarbe
+beinarbeit
+beinbrot
+beinbrott
+beinbrottet
+beinbruc
+beinbruch
+beinbrud
+beinbrudd
+beinbruddet
+beinbrue
+beinbrueche
+beinbruechen
+beinbygn
+beinbygning
+beinchen
+beine
+beinen
+beines
+beinet
+beinete
+beinfly
+being
+beingles
+beingless
+beingnes
+beingness
+beings
+beinhalt
+beinhalten
+beinhaltend
+beinhaltende
+beinhaltenden
+beinhaltender
+beinhaltendes
+beinhaltet
+beinhaltete
+beinhaltetem
+beinhalteter
+beinhaltetes
+beinhaltetest
+beinhard
+beinhardt
+beinhart
+beinharte
+beinhaus
+beinke
+beinked
+beinket
+beinkl{r
+beinkl|y
+beinkl|yvd
+beinlaus
+beinlaust
+beinl|s
+beinl|st
+beinmusk
+beinmuskeln
+beinoeff
+beinoeffungen
+beinpaar
+beinpara
+beinparade
+beinprot
+beinprothesen
+beinrad
+beinrang
+beinrangel
+beinrangelet
+beins
+beinsam
+beinsmer
+beinsmerter
+beinsom
+beinstoc
+beinstock
+beint
+beintfra
+beintfram
+beinveg
+beinvege
+beinvegen
+beinveges
+beinvei
+beinverl
+beinverletzungen
+beinvev
+beinvloe
+beinvloed
+beinvloedde
+beinvloedden
+beinvloeden
+beinvloeding
+beipflic
+beipflichten
+beipflichtend
+beipflichtende
+beipflichtenden
+beipflichtender
+beipflichtendes
+beipflichtung
+beipflichtungen
+beique
+beir
+beira
+beiraete
+beiraeten
+beirat
+beirates
+beirne
+beirre
+beirren
+beirrend
+beirrendem
+beirrenden
+beirrender
+beirrst
+beirrt
+beirrte
+beirrtes
+beirrtest
+beirrtet
+beiru-to
+beirut
+beiruto
+beiryuu
+beiryuud
+beiryuus
+beis
+beisa
+beisaku
+beisamme
+beisammen
+beisammensein
+beisan
+beischla
+beischlaefer
+beischlaf
+beise
+beisein
+beiseins
+beiseite
+beiseitelegen
+beisel
+beisen
+beiser
+beiset
+beisetze
+beisetzen
+beisetzend
+beisetzendem
+beisetzenden
+beisetzender
+beisetzu
+beisetzung
+beisheno
+beishenova
+beishi
+beishiki
+beishoku
+beishun
+beisi
+beisiki
+beising
+beisitze
+beisitzer
+beisitzr
+beisitzrecht
+beisk
+beiskne
+beiskt
+beiso
+beispiel
+beispiele
+beispielen
+beispielgebende
+beispielgebenden
+beispielhaft
+beispielhaftem
+beispielhaften
+beispielhafter
+beispielhafterem
+beispielhafteren
+beispielhafterer
+beispielhaftes
+beispielhafteste
+beispielhaftestem
+beispielhaftester
+beispielhaftestes
+beispiellos
+beispiellosem
+beispiellosen
+beispielloser
+beispielloserem
+beispielloseren
+beispielloserer
+beispielloses
+beispiellosigkeit
+beispiellosigkeiten
+beispielloste
+beispiellostem
+beispielloster
+beispiellostes
+beispielprogramm
+beispielprogramme
+beispiels
+beispielsfall
+beispielsweise
+beisprin
+beispringend
+beispringende
+beispringendem
+beispringendes
+beissart
+beisse
+beissend
+beissende
+beissendem
+beissender
+beissendes
+beissest
+beist
+beistand
+beistanderklaerung
+beistandpakt
+beistandsbemuehungen
+beistandserklaerung
+beistandskredit
+beistandspakt
+beistandsvertraege
+beiste
+beistehe
+beistehen
+beistehend
+beistehendem
+beistehenden
+beistehender
+beistell
+beistellen
+beistellnetzteil
+beistellung
+beistet
+beisteue
+beisteuern
+beisteuernd
+beisteuernde
+beisteuernden
+beisteuernder
+beisteuerndes
+beisyoku
+beit
+beita
+beitaku
+beite
+beitei
+beitel
+beitelde
+beitelden
+beitelen
+beitels
+beitelt
+beiteltj
+beiteltje
+beiteltjes
+beitelvo
+beitelvormig
+beitelvormige
+beitelvormiger
+beitelvormigst
+beitemar
+beitemark
+beitene
+beiter
+beitet
+beiting
+beitinge
+beitingen
+beitinja
+beitinjaneh
+beitlene
+beitra"g
+beitra"gen
+beitraeg
+beitraege
+beitraegen
+beitraegt
+beitrag
+beitrage
+beitragen
+beitragende
+beitragendem
+beitragenden
+beitragendes
+beitrags
+beitragsaufkommen
+beitragseinnahme
+beitragserhoehungen
+beitragsfreien
+beitragshoehe
+beitragspflicht
+beitragspflichtig
+beitragspflichtigem
+beitragspflichtigen
+beitragspflichtiger
+beitragsrueckerstattung
+beitragsrueckerstattungen
+beitragsrueckverguetung
+beitragsuebertraege
+beitragszahlung
+beitragszahlungen
+beitragszuwachs
+beitrat
+beitreib
+beitreibbar
+beitrete
+beitreten
+beitretende
+beitretendem
+beitretenden
+beitretendes
+beitris
+beitritt
+beitritte
+beitritten
+beitrittsantrag
+beitrittsbedingungen
+beitrittsgebuehr
+beitrueg
+beitruege
+beitrug
+beitruge
+beitrugen
+beits
+beitsen
+beitst
+beitste
+beitsten
+beiwagen
+beiwagens
+beiwohne
+beiwohnen
+beiwohnt
+beiwohnte
+beiwort
+beizeite
+beizeiten
+beizubeh
+beizubehalten
+beizubri
+beizubringen
+beizufue
+beizufuegen
+beizukom
+beizukommen
+beizumes
+beizumessen
+beizumis
+beizumischen
+beizuste
+beizustehen
+beizustellenden
+beizutra
+beizutragen
+beizutre
+beizutreten
+beizuwoh
+beizuwohen
+beizyu
+bej
+beja
+bejaag
+bejaagd
+bejaagde
+bejaagden
+bejaagt
+bejaard
+bejaarde
+bejaardencentrum
+bejabers
+bejac
+bejade
+bejae
+bejaet
+bejag
+bejagen
+bejahe
+bejahen
+bejahend
+bejahendem
+bejahenden
+bejahender
+bejahrt
+bejahrte
+bejahrtem
+bejahrter
+bejahrtes
+bejahst
+bejahte
+bejahten
+bejahtes
+bejahtest
+bejahung
+bejahungen
+bejaia
+bejaing
+bejali
+bejammer
+bejammerd
+bejammerde
+bejammerden
+bejammeren
+bejammerenswaard
+bejammerenswaarde
+bejammerenswaarder
+bejammerenswaardig
+bejammerenswaardige
+bejammerenswaardiger
+bejammerenswaardigst
+bejammerenswaardst
+bejammert
+bejan
+bejant
+bejar
+bejarana
+bejarano
+bejart
+bejaundi
+bejaundice
+bejazz
+bejegen
+bejegend
+bejegende
+bejegenden
+bejegene
+bejegenen
+bejegeni
+bejegening
+bejegeningen
+bejegent
+bejel
+bejerana
+bejerano
+bejewel
+bejewele
+bejeweled
+bejeweli
+bejeweling
+bejewell
+bejewelled
+bejewelling
+bejewels
+bejezebe
+bejezebel
+beji`n
+bejig
+bejina
+bejinero
+bejoeg
+bejoegen
+bejou
+bejubel
+bejubeld
+bejubelde
+bejubelden
+bejubele
+bejubelen
+bejubeln
+bejubelt
+bejubelten
+bejucal
+bejuco
+bejuggle
+bejumble
+bejuquear
+bejuqueda
+bejuquillo
+bejyu
+bek
+beka
+bekaa
+bekaad
+bekaadde
+bekaadden
+bekaadt
+bekaaid
+bekaam
+bekaamd
+bekaamde
+bekaamden
+bekaamt
+bekade
+bekaden
+bekading
+bekadingen
+bekaeme
+bekaempa
+bekaempf
+bekaempfe
+bekaempfen
+bekaempfend
+bekaempfendem
+bekaempfenden
+bekaempfender
+bekaempfst
+bekaempft
+bekaempfte
+bekaempften
+bekaempfter
+bekaempftes
+bekaempftet
+bekaempfung
+bekaemst
+bekaenna
+bekaf
+bekah
+bekak
+bekakken
+bekakt
+bekakte
+bekakten
+bekaktig
+bekalk
+bekalken
+bekalkt
+bekalkte
+bekalkten
+bekam
+bekamen
+bekamp
+bekampa
+bekampen
+bekampin
+bekamping
+bekampt
+bekampte
+bekampten
+bekamst
+bekamt
+bekanna
+bekannge
+bekanngegeben
+bekannt
+bekannte
+bekanntem
+bekannten
+bekanntenkreis
+bekannter
+bekannterem
+bekannteren
+bekannterer
+bekanntermassen
+bekanntes
+bekanntest
+bekanntestem
+bekanntesten
+bekanntester
+bekanntet
+bekanntg
+bekanntgabe
+bekanntgeben
+bekanntgebend
+bekanntgebendem
+bekanntgebenden
+bekanntgebender
+bekanntgegeben
+bekanntgegebene
+bekanntgegebenem
+bekanntgegebener
+bekanntgegebenes
+bekanntgemacht
+bekanntgemachtem
+bekanntgemachten
+bekanntgemachter
+bekanntgewordene
+bekanntgewordenen
+bekanntgibt
+bekannth
+bekanntheit
+bekanntheitsgrad
+bekanntl
+bekanntlich
+bekanntliche
+bekanntlichen
+bekanntlicher
+bekanntm
+bekanntmachen
+bekanntmachend
+bekanntmachende
+bekanntmachenden
+bekanntmachender
+bekanntmachendes
+bekanntmachung
+bekannts
+bekanntschaft
+bekanntschaften
+bekanntw
+bekanntwerden
+bekanntz
+bekanntzumachen
+bekant
+bekanta
+bekap
+bekappen
+bekappin
+bekapping
+bekappingen
+bekapt
+bekapte
+bekapten
+bekassy
+bekati
+bekattni
+bekattning
+beke
+bekeef
+bekeek
+bekeer
+bekeerd
+bekeerde
+bekeerden
+bekeerder
+bekeerders
+bekeerli
+bekeerling
+bekeerlinge
+bekeerlingen
+bekeert
+bekehre
+bekehren
+bekehrende
+bekehrendem
+bekehrenden
+bekehrendes
+bekehrst
+bekehrt
+bekehrte
+bekehrten
+bekehrter
+bekehrtes
+bekehrtet
+bekehrun
+bekehrung
+bekeken
+bekekene
+bekekenen
+beken
+bekend
+bekende
+bekenden
+bekender
+bekendge
+bekendgemaakt
+bekendgemaakte
+bekendgemaakten
+bekendhe
+bekendheid
+bekendma
+bekendmaak
+bekendmaakt
+bekendmaakte
+bekendmaakten
+bekendmaken
+bekendmaking
+bekendmakingen
+bekendst
+bekendt
+bekendte
+bekendtg|relse
+bekendtg|relser
+bekendtskab
+bekendtskaber
+bekendwo
+bekendwording
+bekeni
+bekenne
+bekennen
+bekennende
+bekennendem
+bekennenden
+bekennendes
+bekenner
+bekennertum
+bekennst
+bekennt
+bekenntn
+bekenntnis
+bekenntnisfreiheit
+bekenntnissen
+bekenntnisses
+bekent
+bekenten
+bekentenis
+bekentenissen
+beker
+bekerchi
+bekerchief
+bekeren
+bekergla
+bekerglas
+bekerglazen
+bekering
+bekeringen
+bekeringsijver
+bekeringswerk
+bekermos
+bekermossen
+bekerpla
+bekerplant
+bekerplanten
+bekers
+bekertje
+bekertjes
+bekervor
+bekervormig
+bekervormige
+bekerwed
+bekerwedstrijd
+bekerwedstrijden
+bekes
+beket
+beketan
+bekete
+bekeur
+bekeurd
+bekeurde
+bekeurden
+bekeuren
+bekeurin
+bekeuring
+bekeuringen
+bekeurt
+bekeven
+bekevene
+bekevenen
+bekgryta
+bekgryte
+bekgryten
+beki
+bekiau
+bekick
+bekijf
+bekijft
+bekijk
+bekijken
+bekijkt
+bekijou
+bekijven
+bekijyou
+bekilted
+beking
+bekingup
+bekinkin
+bekinkinite
+bekirech
+bekireche
+bekiss
+bekist
+bekiste
+bekisten
+bekistin
+bekisting
+bekistingen
+bekistte
+bekistten
+bekizyou
+bekjempa
+bekjempe
+bekjempelse
+bekjempelsen
+bekjemper
+bekjempes
+bekjempet
+bekjempn
+bekjempningen
+bekjenne
+bekjennelse
+bekjennelsen
+bekjennelsens
+bekjennelser
+bekjennelsestro
+bekjenner
+bekjent
+bekjente
+bekjentg
+bekjentgjort
+bekjentgj|relse
+bekjentgj|relsen
+bekjentgj|res
+bekjenth
+bekjenthet
+bekjents
+bekjentskap
+bekjentskaper
+bekjentskapet
+bekk
+bekka
+bekkai
+bekkaku
+bekkan
+bekkasin
+bekkasinen
+bekkaure
+bekke
+bekkedam
+bekkefar
+bekkefaret
+bekkei
+bekkelag
+bekkelaget
+bekken
+bekkenbe
+bekkenbein
+bekkenee
+bekkeneel
+bekkenel
+bekkenelen
+bekkenet
+bekkenis
+bekkenist
+bekkenisten
+bekkens
+bekkensl
+bekkenslag
+bekkenslagen
+bekkenslager
+bekkenslagers
+bekkenta
+bekkentj
+bekkentje
+bekkentjes
+bekker
+bekkesni
+bekkesnijd
+bekkesnijden
+bekkesnijder
+bekkesnijders
+bekkesnijdt
+bekki
+bekkig
+bekkige
+bekkiger
+bekkigst
+bekko
+bekkon
+bekkou
+bekkouch
+bekkouche
+bekkr|ye
+bekkr|yr
+bekkyo
+beklaag
+beklaagd
+beklaagde
+beklaagden
+beklaagdenbank
+beklaagdenbanken
+beklaagl
+beklaaglijk
+beklaaglijke
+beklaaglijker
+beklaaglijkst
+beklaagt
+beklad
+bekladde
+bekladden
+bekladder
+bekladders
+bekladt
+beklaemm
+beklaemmande
+beklag
+beklaga
+beklage
+beklagel
+beklagelig
+beklagelige
+beklageligvis
+beklagelse
+beklagelsen
+beklagelser
+beklagen
+beklagend
+beklagende
+beklagenden
+beklagender
+beklagendes
+beklagenswaard
+beklagenswaarde
+beklagenswaarder
+beklagenswaardig
+beklagenswaardige
+beklagenswaardiger
+beklagenswaardigst
+beklagenswaardst
+beklagenswerten
+beklager
+beklaget
+beklagli
+beklagligtvis
+beklagst
+beklagt
+beklagte
+beklagtem
+beklagten
+beklagtenpartei
+beklagtes
+beklagtest
+beklagtet
+beklamma
+beklammande
+beklamp
+beklampe
+beklampen
+beklampi
+beklamping
+beklampingen
+beklampt
+beklampte
+beklampten
+beklant
+beklante
+beklanter
+beklants
+beklantst
+beklap
+beklappe
+beklappen
+beklapper
+beklappers
+beklapst
+beklapster
+beklapsters
+beklapt
+beklapte
+beklapten
+beklauen
+beklaute
+beklauter
+beklauterd
+beklauterde
+beklauterden
+beklauteren
+beklautert
+bekle
+beklebe
+bekleben
+beklebende
+beklebendem
+beklebenden
+beklebendes
+beklebst
+beklebt
+beklebte
+beklebtem
+beklebten
+beklebter
+beklebtest
+beklebtet
+beklecks
+beklecksen
+bekledd
+bekledde
+beklede
+bekleden
+bekleder
+bekleders
+bekledin
+bekleding
+bekledingen
+bekledingsmuren
+bekledingsmuur
+bekledingssteen
+bekledingsstenen
+bekledingsstof
+bekledni
+bekledning
+bekledningen
+bekledningsindustrien
+bekledningsvarer
+bekleed
+bekleedd
+bekleedde
+bekleedden
+bekleeds
+bekleedsel
+bekleedsels
+bekleedt
+bekleide
+bekleiden
+bekleidend
+bekleidende
+bekleidenden
+bekleidender
+bekleidendes
+bekleidet
+bekleidete
+bekleidetem
+bekleideter
+bekleidetes
+bekleidetest
+bekleidu
+bekleidungen
+bekleidungsbranche
+bekleidungsindustrie
+bekleidungskonjunktur
+bekleidungspreise
+bekleidungsproduktion
+bekleidungstextilien
+bekleidungsvorschriften
+bekleidungswerk
+bekleidungswerkes
+beklem
+beklemd
+beklemde
+beklemden
+beklemder
+beklemdh
+beklemdheid
+beklemds
+beklemdst
+beklemme
+beklemmen
+beklemmende
+beklemmenden
+beklemmender
+beklemmi
+beklemming
+beklemmt
+beklemmu
+beklemmung
+beklemmungen
+beklemre
+beklemrecht
+beklemt
+beklemth
+beklemthet
+beklemto
+beklemtonen
+beklemtoon
+beklemtoond
+beklemtoonde
+beklemtoonden
+beklemtoont
+beklets
+bekletse
+bekletsen
+bekletst
+bekletste
+bekletsten
+beklgtes
+beklgtest
+beklijf
+beklijfd
+beklijfde
+beklijfden
+beklijft
+beklijve
+beklijven
+beklim
+beklimme
+beklimmen
+beklimmi
+beklimming
+beklimmingen
+beklimt
+beklink
+beklinke
+beklinken
+beklinkt
+beklippe
+beklom
+beklomme
+beklommen
+beklommene
+beklommenen
+beklonk
+beklonke
+beklonken
+beklonkene
+beklonte
+beklonter
+beklonterd
+beklonterde
+beklonterden
+beklonteren
+beklontert
+beklop
+bekloppe
+bekloppen
+beklopt
+beklopte
+beklopten
+bekl{der
+bekl{dning
+bekl{dningsdel
+bekl{dt
+bekl{dte
+bekl{dtes
+bekl{mma
+bekl{mmande
+bekm|rk
+bekm|rkt
+beknaag
+beknaagd
+beknaagde
+beknaagden
+beknaagt
+beknabbe
+beknabbel
+beknabbeld
+beknabbelde
+beknabbelden
+beknabbelen
+beknabbelt
+beknackt
+beknackte
+beknagen
+beknave
+bekneb
+bekneep
+beknel
+bekneld
+beknelde
+beknelden
+beknelle
+beknellen
+beknelt
+beknepen
+beknepene
+beknepenen
+beknibbe
+beknibbel
+beknibbelaar
+beknibbelaars
+beknibbelaarster
+beknibbelaarsters
+beknibbeld
+beknibbelde
+beknibbelden
+beknibbelen
+beknibbeling
+beknibbelt
+beknight
+beknighted
+beknijp
+beknijpe
+beknijpen
+beknijpt
+beknip
+beknit
+beknived
+beknopt
+beknopte
+beknopter
+beknopth
+beknoptheid
+beknopts
+beknoptst
+beknor
+beknord
+beknorde
+beknorden
+beknorre
+beknorren
+beknort
+beknot
+beknotte
+beknotted
+beknottedly
+beknottedness
+beknotten
+beknow
+beknown
+beko
+bekocht
+bekochte
+bekochten
+bekoe
+bekoel
+bekoeld
+bekoelde
+bekoelden
+bekoelen
+bekoelin
+bekoeling
+bekoelt
+bekoemml
+bekoemmlich
+bekoemmlichem
+bekoemmlichen
+bekoemmlicher
+bekoemmlicherem
+bekoemmlicheren
+bekoemmlicherer
+bekoemmliches
+bekoemmlichkeit
+bekoemmlichste
+bekoemmlichstem
+bekoemmlichster
+bekoemmlichstes
+bekoesti
+bekoestigung
+bekogel
+bekogeld
+bekogelde
+bekogelden
+bekogele
+bekogelen
+bekogelt
+bekoksto
+bekokstoof
+bekokstoofd
+bekokstoofde
+bekokstoofden
+bekokstooft
+bekokstoven
+bekom
+bekombo
+bekomen
+bekomene
+bekomenen
+bekomme
+bekommen
+bekommende
+bekommendem
+bekommenden
+bekommendes
+bekommer
+bekommerd
+bekommerde
+bekommerden
+bekommerder
+bekommerdheid
+bekommerdst
+bekommeren
+bekommering
+bekommeringen
+bekommernis
+bekommernissen
+bekommert
+bekommst
+bekommt
+bekomst
+bekomt
+bekon
+bekonkel
+bekonkeld
+bekonkelde
+bekonkelden
+bekonkelen
+bekonkelt
+bekoop
+bekoopt
+bekoor
+bekoord
+bekoorde
+bekoorden
+bekoorder
+bekoorders
+bekoorli
+bekoorlijk
+bekoorlijke
+bekoorlijker
+bekoorlijkheden
+bekoorlijkheid
+bekoorlijkst
+bekoort
+bekoose
+bekopen
+bekoren
+bekoring
+bekoringen
+bekorst
+bekorste
+bekorsten
+bekorstt
+bekorstte
+bekorstten
+bekort
+bekorte
+bekorten
+bekortin
+bekorting
+bekortingen
+bekortte
+bekortten
+bekosta
+bekoste
+bekoster
+bekostes
+bekostet
+bekostig
+bekostigd
+bekostigde
+bekostigden
+bekostigen
+bekostiging
+bekostigt
+bekostna
+bekostnad
+bekostni
+bekostning
+bekpak
+bekrab
+bekrabbe
+bekrabbel
+bekrabbeld
+bekrabbelde
+bekrabbelden
+bekrabbelen
+bekrabbelt
+bekrabben
+bekrabd
+bekrabde
+bekrabden
+bekrabt
+bekracht
+bekrachtig
+bekrachtigd
+bekrachtigde
+bekrachtigden
+bekrachtigen
+bekrachtiging
+bekrachtigt
+bekraeft
+bekraefta
+bekraeftigen
+bekraeftigend
+bekraeftigende
+bekraeftigenden
+bekraeftigender
+bekraeftigendes
+bekraeftigt
+bekraeftigte
+bekraeftigtem
+bekraeftigter
+bekraeftigtes
+bekraeftigtest
+bekraeftigung
+bekraeftigungen
+bekraenz
+bekraenzt
+bekraenzte
+bekraenzten
+bekrafta
+bekram
+bekramd
+bekramde
+bekramden
+bekramme
+bekrammen
+bekrammi
+bekramming
+bekrammingen
+bekramt
+bekrans
+bekranse
+bekransen
+bekransn
+bekransning
+bekranst
+bekranste
+bekransten
+bekras
+bekrasse
+bekrassen
+bekrast
+bekraste
+bekrasten
+bekre
+bekrefte
+bekreftede
+bekreftelse
+bekreftende
+bekrefter
+bekreftes
+bekreftet
+bekren
+bekreten
+bekreun
+bekreund
+bekreunde
+bekreunden
+bekreune
+bekreunen
+bekreunt
+bekrib
+bekribbe
+bekribben
+bekribbi
+bekribbing
+bekribbingen
+bekribd
+bekribde
+bekribden
+bekribt
+bekriege
+bekriegen
+bekrimp
+bekrimpe
+bekrimpen
+bekrimpi
+bekrimping
+bekrimpingen
+bekrimpt
+bekritis
+bekritiseer
+bekritiseerd
+bekritiseerde
+bekritiseerden
+bekritiseert
+bekritiseren
+bekritte
+bekritteln
+bekromp
+bekrompe
+bekrompen
+bekrompene
+bekrompenen
+bekrompener
+bekrompenheid
+bekrompenst
+bekrone
+bekronen
+bekronin
+bekroning
+bekroningen
+bekroon
+bekroond
+bekroonde
+bekroonden
+bekroont
+bekroop
+bekropen
+bekropene
+bekropenen
+bekruip
+bekruipe
+bekruipen
+bekruipt
+bekruis
+bekruise
+bekruisen
+bekruist
+bekruiste
+bekruisten
+bekr{ft
+bekr{fta
+bekr{fte
+bekr{ftede
+bekr{ftelse
+bekr{ftende
+bekr{fter
+bekr{ftes
+bekr{ftet
+bekr{ftigelse
+beksel
+bekselet
+beksle
+beksler
+bekslet
+beks|m
+beks|mme
+beks|mmen
+beks|mst
+beks|mst|vler
+bekt
+bektas
+bekte
+bekten
+beku
+bekuemme
+bekuemmere
+bekuemmernd
+bekuemmernde
+bekuemmerndem
+bekuemmernder
+bekuemmerndes
+bekuemmernis
+bekuemmernissen
+bekuemmernisses
+bekuemmerst
+bekuemmerte
+bekuemmertem
+bekuemmerten
+bekuemmertes
+bekuemmertest
+bekuemmertet
+bekuhai
+bekuip
+bekuipen
+bekuipin
+bekuiping
+bekuipt
+bekuipte
+bekuipten
+bekulau
+bekuma
+bekunde
+bekunden
+bekundend
+bekundende
+bekundendem
+bekundender
+bekundendes
+bekundes
+bekundest
+bekundet
+bekundete
+bekundetem
+bekundeten
+bekundetes
+bekundetest
+bekundetet
+bekundun
+bekundung
+bekurait
+bekuroni
+bekuta
+bekutoru
+bekvaem
+bekvaema
+bekvaemt
+bekvam
+bekvama
+bekvamt
+bekvecht
+bekvechten
+bekvechter
+bekvechters
+bekvem
+bekvemme
+bekvemmelige
+bekvemmelighed
+bekvemmelighet
+bekvemmeligheter
+bekvemt
+bekv{m
+bekv{ma
+bekv{mt
+bekwa
+bekwaam
+bekwaamd
+bekwaamde
+bekwaamden
+bekwaamh
+bekwaamheden
+bekwaamheid
+bekwaams
+bekwaamst
+bekwaamt
+bekwam
+bekwame
+bekwamen
+bekwamer
+bekwarra
+bekwijl
+bekwijld
+bekwijlde
+bekwijlden
+bekwijle
+bekwijlen
+bekwijlt
+bekwil
+bekwiri
+bekworra
+bekymmer
+bekymra
+bekymre
+bekymrede
+bekymrer
+bekymret
+bekymrin
+bekymring
+bekymringa
+bekymringen
+bekymringene
+bekymringer
+bekymringsfull
+bekymringsfulle
+bekymringsfullt
+bekymringslaus
+bekymringsl|s
+bek{mpa
+bek{mpe
+bek{mper
+bek{nna
+bel
+bel-etag
+bel-etage
+bel-etages
+bela
+bela"uft
+belaad
+belaadde
+belaadden
+belaadt
+belaag
+belaagd
+belaagde
+belaagden
+belaagst
+belaagster
+belaagsters
+belaagt
+belaanin
+belaaning
+belaaten
+belabber
+belabberd
+belabberde
+belabberder
+belabberdst
+belabern
+belabo
+belabor
+belabore
+belabored
+belabori
+belaboring
+belabors
+belabour
+belaboured
+belabours
+belaced
+belachel
+belachelijk
+belachelijke
+belachelijker
+belachelijkst
+belack
+belacka
+belade
+beladen
+beladend
+beladende
+beladenden
+beladender
+beladendes
+beladene
+beladenem
+beladenen
+beladener
+beladest
+beladet
+beladeze
+beladezentrum
+beladle
+belady
+belaeche
+belaecheln
+belaechelt
+belaege
+belaegen
+belaeget
+belaegg
+belaegga
+belaegra
+belaenge
+belaesti
+belaestige
+belaestigend
+belaestigende
+belaestigendem
+belaestigender
+belaestigendes
+belaestigst
+belaestigte
+belaestigtem
+belaestigten
+belaestigtes
+belaestigtest
+belaestigtet
+belaestigung
+belaestigungen
+belaete
+belafont
+belafonte
+belag
+belaga
+belagar
+belagd
+belagde
+belage
+belagen
+belager
+belagere
+belagerer
+belagerern
+belagern
+belagernd
+belagernde
+belagerndem
+belagernder
+belagerndes
+belagers
+belagerst
+belagert
+belagerte
+belagertem
+belagerten
+belagertes
+belagertest
+belagertet
+belageru
+belagerung
+belagerungen
+belagerungsherr
+belagerungszustaenden
+belagerungszustand
+belagerungszustandes
+belaget
+belagg
+belagga
+belaging
+belagra
+belagt
+belah
+belaieff
+belaieva
+belair
+belaire
+belait
+belaites
+belak
+belala
+belalton
+belam
+belamcan
+belamcanda
+belamra
+belana
+belanas
+belanau
+beland
+belanda
+belandas
+belandde
+belandden
+belande
+belanden
+belandt
+belang
+belanga
+belangao
+belangd
+belangde
+belangden
+belangel
+belangeloos
+belangeloosheid
+belangeloost
+belangeloze
+belangelozer
+belangen
+belangengemeenschap
+belangengemeenschappen
+belangensfeer
+belangensferen
+belanger
+belanget
+belangetje
+belangetjes
+belanghe
+belanghebbend
+belanghebbende
+belanghebbenden
+belanglo
+belanglos
+belanglose
+belanglosem
+belanglosen
+belanglosere
+belangloserem
+belangloseren
+belangloseres
+belangloses
+belangloseste
+belanglosesten
+belanglosester
+belanglosestes
+belanglosigkeit
+belangri
+belangrijk
+belangrijke
+belangrijker
+belangrijkheid
+belangrijkst
+belangrijkste
+belangs
+belangst
+belangstellend
+belangstellende
+belangstellenden
+belangstellender
+belangstellendst
+belangstelling
+belangt
+belangvo
+belangvolles
+belangwe
+belangwekkend
+belangwekkende
+belangwekkender
+belangwekkendst
+belaning
+belante
+belanya
+belar
+belard
+belarius
+belas
+belasco
+belash
+belasnin
+belasningssjukdom
+belasse
+belassen
+belast
+belasta
+belastba
+belastbaar
+belastbaarheid
+belastbar
+belastbare
+belastbarkeit
+belaste
+belasted
+belastede
+belasten
+belastend
+belastende
+belastendem
+belastender
+belastendes
+belaster
+belasterd
+belasterde
+belasterden
+belasteren
+belastering
+belasteringen
+belastert
+belastes
+belastest
+belastet
+belastete
+belastetem
+belasteten
+belastetes
+belastetest
+belastetet
+belastin
+belasting
+belastingbetaler
+belastingbetalers
+belastingbiljet
+belastingbiljetten
+belastingconsulent
+belastingconsulenten
+belastingdruk
+belastingen
+belastingkantoor
+belastingkantoren
+belastingontduiking
+belastingontwerp
+belastingontwerpen
+belastingpenning
+belastingpenningen
+belastingplichtig
+belastingplichtige
+belastingplichtigen
+belastingschroef
+belastingschuldige
+belastingschuldigen
+belastingstelsel
+belastingstelsels
+belastingvlucht
+belastingwet
+belastingwetten
+belastni
+belastning
+belastningar
+belastningen
+belastninger
+belastningssykdom
+belastte
+belastten
+belastun
+belastung
+belastungen
+belastungsanzeige
+belastungsfrei
+belastungsgrad
+belastungsgrenze
+belastungsprobe
+belastungsproben
+belastungstests
+belastungsunterlagen
+belastungszeugen
+belat
+belate
+belated
+belatedl
+belatedly
+belatedn
+belatedness
+belaten
+belatte
+belatten
+belattic
+belatticed
+belau
+belaubt
+belaud
+belauder
+belauern
+belaufen
+belaunde
+belausch
+belausche
+belauschen
+belauschende
+belauschendem
+belauschenden
+belauschendes
+belauschest
+belauschst
+belauschte
+belauschtem
+belauschten
+belauschtes
+belauschtest
+belauschtet
+belavend
+belavendered
+belaver
+belay
+belayan
+belayed
+belayer
+belaying
+belays
+belazen
+belazer
+belazerd
+belazerde
+belazerden
+belazere
+belazeren
+belazert
+belazi
+belbin
+belboei
+belboeie
+belboeien
+belboul
+belcamp
+belch
+belched
+belcher
+belchers
+belchert
+belchertown
+belches
+belchev
+belching
+belcho
+belcht
+belcourt
+beld
+beldad
+beldam
+beldame
+beldames
+beldams
+beldamsh
+beldamship
+beldar
+belde
+belden
+beldenvi
+beldenville
+belderro
+belderroot
+belding
+beldon
+belduque
+bele
+bele\o
+bele`n
+bele`rico
+beleaf
+beleague
+beleaguer
+beleaguered
+beleaguerer
+beleaguering
+beleaguerment
+beleaguers
+beleap
+beleaps
+beleapt
+beleave
+belebele
+beleben
+belebend
+belebende
+belebenden
+belebender
+belebendes
+belebt
+belebte
+belebtem
+belebter
+belebtes
+belebtest
+belebtet
+belebung
+belebungsmassnahmen
+belectur
+belecture
+beleden
+beledene
+beledenen
+beledger
+beledgered
+beledig
+beledigd
+beledigde
+beledigden
+beledige
+beledigen
+belediger
+beledigers
+beledigi
+belediging
+beledigingen
+beledigt
+beledsag
+beledsagas
+belee
+beleed
+beleef
+beleefd
+beleefde
+beleefdelijk
+beleefden
+beleefder
+beleefdh
+beleefdheden
+beleefdheid
+beleefdheidsbezoek
+beleefdheidsbezoeken
+beleefdheidsformule
+beleefdheidsformules
+beleefdheidshalve
+beleefdheidsvorm
+beleefdheidsvormen
+beleefds
+beleefdst
+beleefe
+beleeft
+beleen
+beleenba
+beleenbaar
+beleenbank
+beleenbanken
+beleenbare
+beleend
+beleende
+beleenden
+beleent
+belees
+beleest
+beleeve
+beleever
+beleevers
+belefere
+beleg
+belegaus
+belegausdruck
+belegbar
+belegbaren
+belegd
+belegde
+belegden
+belege
+belegen
+belegend
+belegende
+belegendem
+belegender
+belegendes
+belegene
+belegener
+belegens
+belegenst
+beleger
+belegera
+belegeraar
+belegeraars
+belegerd
+belegerde
+belegerden
+belegere
+belegeren
+belegeri
+belegering
+belegeringen
+belegeringsgeschut
+belegeringskunst
+belegeringsspel
+belegeringsspellen
+belegert
+beleges
+belegete
+belegg
+belegge
+beleggen
+belegger
+beleggers
+belegget
+beleggin
+belegging
+beleggingen
+beleggingfondsen
+beleggsf
+beleggsfaktor
+beleghou
+beleghout
+beleghouten
+beleglat
+beleglatten
+belegnum
+belegnummer
+belegs
+belegsch
+belegschaft
+belegschaften
+belegschaftsmitglieder
+belegschaftsvertreter
+belegschaftszunahme
+belegschein
+belegscheinen
+belegscheines
+belegsel
+belegsels
+belegseltje
+belegseltjes
+belegst
+belegste
+belegstelle
+belegstu
+belegstuk
+belegstukken
+belegt
+belegte
+belegten
+belegter
+belegtes
+belegtet
+belegung
+belegungsliste
+belehre
+belehren
+belehrende
+belehrendem
+belehrenden
+belehrendes
+belehrendste
+belehrst
+belehrte
+belehrtem
+belehrten
+belehrtes
+belehrtest
+belehrtet
+belehrun
+belehrung
+belehrungen
+beleibte
+beleibtem
+beleibten
+beleibtes
+beleid
+beleidig
+beleidige
+beleidigen
+beleidigende
+beleidigendem
+beleidigenden
+beleidigendes
+beleidigst
+beleidigt
+beleidigtem
+beleidigten
+beleidigter
+beleidigtest
+beleidigtet
+beleidigung
+beleidigungen
+beleidigungsverfahren
+beleidsk
+beleidskeuze
+beleidskwestie
+beleidsm
+beleidsmatig
+beleidvo
+beleidvol
+beleidvolle
+beleidvoller
+beleidvolst
+beleihba
+beleihbar
+beleihe
+beleihen
+beleihend
+beleihendem
+beleihenden
+beleihender
+beleihst
+beleiht
+beleihte
+beleihter
+beleihtes
+beleihtest
+beleihun
+beleihung
+beleihungen
+beleihungsfaehigeres
+beleihungsfaehigkeit
+beleihungsgrenze
+beleihungsgrenzen
+beleihungsmassstaebe
+beleihungsrichtlinien
+beleilig
+beleire
+beleired
+beleirede
+beleirer
+beleirerne
+beleiret
+beleirin
+beleiringen
+beleive
+beleivst
+belejligt
+belejre
+belejring
+belejringen
+belejringer
+belel
+belem
+belemmer
+belemmerd
+belemmerde
+belemmerden
+belemmeren
+belemmering
+belemmeringen
+belemmert
+belemnid
+belemnie
+belemniet
+belemnieten
+belemnit
+belemnita
+belemnite
+belemnites
+belemnitic
+belemnitidae
+belemnoi
+belemnoid
+belemnoidea
+belemre
+belemret
+belen
+belend
+belendde
+belendden
+belende
+belenden
+belendin
+belending
+belendingen
+belendt
+belenen
+belener
+beleners
+beleni
+belening
+beleningen
+beleningsbank
+beleningsbanken
+beleningsrente
+beleningsschuld
+beleningsschulden
+belep
+belesa
+belesen
+belesene
+belesenen
+belesener
+belesenes
+belesenh
+belesenheit
+belesse
+belesset
+beleste
+belet
+beletsel
+beletselen
+beletsels
+beletselteken
+beletseltekens
+beletseltje
+beletseltjes
+belette
+beletten
+beletter
+belettes
+beleucht
+beleuchten
+beleuchtend
+beleuchtende
+beleuchtenden
+beleuchtender
+beleuchtendes
+beleuchtet
+beleuchtete
+beleuchtetem
+beleuchteten
+beleuchteter
+beleuchtetes
+beleuchtetest
+beleuchtigungen
+beleuchtung
+beleuchtungen
+beleuchtungskoerper
+beleuchtungstechnik
+beleven
+beleveni
+belevenis
+belevenissen
+beleving
+belevingen
+belew
+belewscr
+belewscreek
+belez
+belezen
+belezene
+belezenen
+belezener
+belezenh
+belezenheid
+belezens
+belezenst
+belezer
+belezers
+belezing
+belezingen
+belezo
+belfa
+belfair
+belfast
+belfield
+belfo
+belford
+belfort
+belforte
+belforten
+belfrage
+belfried
+belfries
+belfry
+belg
+belga
+belgae
+belgare
+belge
+belgen
+belges
+belgia
+belgian
+belgians
+belgic
+belgica
+belgicis
+belgicisme
+belgicismen
+belgicismes
+belgien
+belgiens
+belgier
+belgiere
+belgieren
+belgieri
+belgierinnen
+belgiern
+belgierne
+belgiers
+belgisch
+belgische
+belgischem
+belgischer
+belgisches
+belgischt
+belgisk
+belgiske
+belgium
+belgiuml
+belgiumluxembourg
+belgm|rk
+belgm|rkt
+belgoody
+belgophi
+belgophile
+belgrade
+belgradelakes
+belgrader
+belgrave
+belgravi
+belgravia
+belgravian
+belgy
+belhamel
+belhamels
+belhaven
+belhedro
+belhedron
+belhez
+beli
+beli`gera
+beli`gero
+beli`sona
+beli`sono
+belia
+belial
+belialic
+belialis
+belialist
+belibel
+belibi
+belich
+belichaa
+belichaam
+belichaamd
+belichaamde
+belichaamden
+belichaamt
+belicham
+belichamen
+belichaming
+belicht
+belichte
+belichten
+belichtend
+belichtende
+belichtenden
+belichtender
+belichtendes
+belichtet
+belichtete
+belichtetem
+belichteter
+belichtetes
+belichtetest
+belichti
+belichting
+belichtingen
+belichtingstijd
+belichtingstijden
+belichtt
+belichtte
+belichtten
+belichtu
+belichtung
+belichtungen
+belichtungsdauer
+belichtungsmesser
+belichtungsmessern
+belichtungsmessers
+belichtungstabellen
+belichtungszeit
+belichtungszeiten
+belicia
+belick
+belicosa
+belicosidad
+belicoso
+belida
+belide
+belido
+belie
+beliebe
+belieben
+beliebende
+beliebenden
+beliebender
+beliebig
+beliebige
+beliebigem
+beliebigen
+beliebiger
+beliebiges
+beliebst
+beliebte
+beliebtem
+beliebten
+beliebtere
+beliebterem
+beliebteren
+beliebteres
+beliebtes
+beliebtest
+beliebtestem
+beliebtesten
+beliebtester
+beliebtet
+beliebth
+beliebtheit
+beliebtheitsgrad
+belied
+belief
+beliefd
+beliefde
+beliefden
+beliefer
+beliefere
+beliefern
+beliefernd
+beliefernde
+belieferndem
+beliefernder
+belieferndes
+belieferst
+beliefert
+belieferte
+beliefertem
+belieferten
+beliefertes
+beliefertest
+beliefertet
+belieferung
+belieffu
+beliefful
+belieffulness
+beliefla
+belieflanguage
+beliefle
+beliefless
+beliefs
+belieft
+beliefte
+belieg
+beliegen
+beliegende
+belieger
+beliegers
+beliegt
+beliehen
+beliehene
+beliehenem
+beliehener
+beliehenes
+beliehst
+beliep
+beliepen
+belier
+beliers
+belies
+beliess
+believab
+believability
+believable
+believableness
+believably
+believe
+believed
+believen
+believer
+believers
+believes
+believest
+believet
+believeth
+believin
+believing
+believingly
+beligan
+beligerancia
+beligerante
+beliggen
+beliggende
+beliggenhed
+beliggenhet
+beliggenheten
+belight
+belijd
+belijden
+belijdenis
+belijdenisgeschenk
+belijdenisgeschenken
+belijdenissen
+belijder
+belijderes
+belijderessen
+belijders
+belijdst
+belijdster
+belijdsters
+belijdt
+belijm
+belijmd
+belijmde
+belijmden
+belijmen
+belijmt
+belijn
+belijnd
+belijnde
+belijnden
+belijnen
+belijnt
+belik
+belike
+beliked
+belikken
+belikt
+belikte
+belikten
+belila
+belili
+belimous
+belimousined
+belinda
+belindez
+belinfan
+belinfante
+belingo
+belingto
+belington
+belinha
+belinski
+belinskij
+belinuri
+belinuridae
+belinuru
+belinurus
+belinyu
+belio
+belion
+belip
+beliquor
+belir
+belis
+belisana
+belisar
+belisle
+belissa
+belita
+belitang
+belite
+belitre
+belitrero
+belitter
+belittle
+belittled
+belittlement
+belittler
+belittlers
+belittles
+belittli
+belittling
+belitung
+beliva
+belive
+beliveau
+belivet
+beliye
+belizair
+belizaire
+belize
+belizean
+belja
+beljawsk
+beljawskya
+belje
+beljet
+beljeve
+beljuga
+belk
+belka
+belknap
+belknop
+belknopp
+belknoppen
+belkoord
+belkoorden
+bell
+bella
+bella^tr
+bella^tre
+bella^tres
+bellabel
+bellabella
+bellaca
+bellacada
+bellacamente
+bellach
+bellaco
+bellacoo
+bellacoola
+bellacre
+bellacres
+bellacuela
+bellacuelo
+belladon
+belladona
+belladone
+belladonna
+bellah
+bellaire
+bellamente
+bellamy
+bellanca
+bellane
+bellanti
+bellaquear
+bellaqueri`a
+bellari
+bellarmi
+bellarmine
+bellarth
+bellarthur
+bellas
+bellasombra
+bellasto
+bellaston
+bellatri
+bellatrix
+bellaver
+bellavis
+bellavista
+bellbind
+bellbird
+bellbivd
+bellbott
+bellbottle
+bellboy
+bellboys
+bellbroo
+bellbrook
+bellbuck
+bellbuckle
+bellcity
+bellcore
+bellcurv
+bellcurve
+belldoks
+belldoksum
+belle
+belle-fa
+belle-famille
+belle-fi
+belle-fille
+belle-me
+belle-me`re
+belle-so
+belle-soeur
+belleau
+bellecen
+bellecenter
+bellecha
+bellechasse
+belled
+belledom
+belleek
+bellefeu
+bellefeuille
+bellefle
+bellefleur
+bellefleuren
+bellefleurs
+bellefleurtje
+bellefleurtjes
+bellefon
+bellefontaine
+bellefonte
+bellefor
+bellefort
+bellefou
+bellefourche
+bellegla
+belleglade
+bellegui`n
+belleh
+bellehav
+bellehaven
+bellehoo
+bellehood
+bellehum
+bellehumeur
+bellem
+belleman
+bellemannen
+bellemea
+bellemead
+bellemin
+bellemina
+bellen
+bellenba
+bellenbaan
+bellenbanen
+bellend
+bellende
+bellendem
+bellenden
+bellender
+bellepla
+belleplaine
+beller
+belleric
+bellerife
+belleriv
+bellerive
+bellerop
+bellerophon
+bellerophontidae
+belleros
+bellerose
+belles
+belles-f
+belles-filles
+belles-l
+belles-lettres
+belles-m
+belles-me`res
+belles-s
+belles-soeurs
+belletje
+belletjes
+belletri
+belletrist
+belletristic
+belletristik
+belletristische
+belletristischen
+belletrists
+bellettr
+bellettrie
+bellettrist
+bellettristen
+bellettristisch
+bellettristische
+belleval
+bellevalley
+bellever
+bellevernon
+bellevie
+belleview
+bellevil
+belleville
+bellevue
+bellew
+belley
+belleza
+bellezza
+bellezze
+bellflow
+bellflower
+bellguis
+bellguist
+bellhang
+bellhanger
+bellhanging
+bellhop
+bellhops
+bellhous
+bellhouse
+belli
+bellicec
+bellicis
+bellicism
+bellicisme
+bellicos
+bellicosa
+bellicose
+bellicosely
+bellicoseness
+bellicosi
+bellicosities
+bellicosity
+bellicoso
+bellida
+bellido
+bellied
+bellies
+bellifer
+belliferous
+bellige'
+bellige'rance
+bellige'rant
+bellige'rante
+bellige'rantes
+bellige'rants
+belliger
+belligerant
+belligerence
+belligerencies
+belligerency
+belligerent
+belligerente
+belligerenten
+belligerently
+belligerents
+bellin
+bellina
+bellindi
+bellindia
+belling
+bellinge
+bellingen
+bellinger
+bellingh
+bellingham
+bellinghausen
+bellings
+bellingshausen
+bellingt
+bellington
+bellini
+bellipot
+bellipotent
+bellique
+belliqueuse
+belliqueuses
+belliqueux
+bellis
+bellissi
+bellissima
+bellissimo
+bellista
+bellit
+bellite
+bellken
+belllabs
+belllabsism
+bellmake
+bellmaker
+bellmaki
+bellmaking
+bellman
+bellmanh
+bellmanharris
+bellmann
+bellmans
+bellmanship
+bellmare
+bellmast
+bellmaster
+bellmawr
+bellmen
+bellmont
+bellmore
+bellmoun
+bellmount
+bellmout
+bellmouth
+bellmouthed
+bellnop
+bello
+belloc
+belloch
+belloise
+bellon
+bellona
+bellonia
+bellonian
+bellonio
+bellonion
+bellop
+belloq
+bellosa
+bellota
+bellote
+bellotear
+bellotera
+bellotero
+bellotillo
+belloto
+bellovac
+bellovaci
+bellow
+bellowed
+bellower
+bellowers
+bellowin
+bellowing
+bellows
+bellowsf
+bellowsfalls
+bellowsful
+bellowsl
+bellowslike
+bellowsm
+bellowsmaker
+bellowsmaking
+bellowsman
+bellpepp
+bellpepper
+bellport
+bellpull
+bellpulls
+bells
+bellshap
+bellshaped
+bellst
+belltail
+bellte
+bellten
+belltest
+belltopp
+belltopper
+belltopperdom
+belluci
+bellugi
+bellum
+belluno
+bellus
+bellvale
+bellview
+bellvill
+bellville
+bellvue
+bellware
+bellwave
+bellwaver
+bellweat
+bellweather
+bellweed
+bellweth
+bellwether
+bellwethers
+bellwind
+bellwine
+bellwood
+bellwort
+bellworts
+belly
+bellyach
+bellyache
+bellyached
+bellyacher
+bellyaches
+bellyaching
+bellyban
+bellyband
+bellybut
+bellybutton
+bellybuttons
+bellydan
+bellydancer
+bellyer
+bellyfis
+bellyfish
+bellyfla
+bellyflaught
+bellyflo
+bellyflop
+bellyful
+bellyfull
+bellyfulls
+bellyfuls
+bellying
+bellylan
+bellyland
+bellylik
+bellylike
+bellyman
+bellypie
+bellypiece
+bellypin
+bellypinch
+belma
+belmar
+belmardu
+belmarduk
+belme
+belment
+belmer
+belmet
+belminst
+belminster
+belmond
+belmondo
+belmont
+belmonte
+belmopan
+belmore
+belnap
+belney
+belnika
+beloam
+belobigt
+belobigte
+belobigu
+belobigungen
+beloeili
+beloeilite
+beloena
+beloepa
+beloepte
+beloer
+beloerd
+beloerde
+beloerden
+beloeren
+beloert
+belofte
+beloften
+belog
+belogen
+belogene
+belogenem
+belogenen
+belogener
+belogst
+belogt
+beloh
+belohne
+belohnen
+belohnend
+belohnende
+belohnendem
+belohnender
+belohnendes
+belohnst
+belohnte
+belohntem
+belohnten
+belohntes
+belohntest
+belohntet
+belohnun
+belohnung
+belohnungen
+belohoub
+belohoubek
+beloid
+beloit
+beloken
+belom
+belomanc
+belomancy
+belommer
+belommerd
+belommerde
+belommerden
+belommeren
+belommering
+belommert
+belon
+belona
+belone
+belonen
+beloner
+beloners
+belonesi
+belonesite
+belong
+belongd
+belonged
+belonger
+belonges
+belongest
+belonget
+belongeth
+belongin
+belonging
+belongings
+belongs
+belonid
+belonida
+belonidae
+beloning
+beloningen
+belonink
+beloninkje
+beloninkjes
+belonite
+belonk
+belonken
+belonkt
+belonkte
+belonkten
+belonoid
+belonosp
+belonosphaerite
+belons
+beloof
+beloofd
+beloofde
+beloofden
+belooft
+beloog
+beloon
+beloond
+beloonde
+beloonden
+beloont
+beloop
+beloopt
+belopa
+belopen
+belopene
+belopenen
+belopols
+belopolskya
+belopp
+belopte
+belord
+belorta
+beloruss
+belorussia
+belorussian
+belostom
+belostoma
+belostomatidae
+belostomidae
+belote
+belotes
+belout
+belov
+belove
+beloved
+beloveds
+beloven
+below
+belowbas
+belowbaseline
+belows
+belowsta
+belowstairs
+beloyann
+beloyannis
+belozeng
+belozenged
+belpre
+belrango
+belroos
+belrow
+belsano
+belshazz
+belshazzar
+belshazzaresque
+belsire
+belsize
+belski
+belsley
+belson
+belsprin
+belspring
+belt
+beltane
+belte
+beltebil
+beltebilen
+beltebiler
+belted
+beltedek
+beltedekk
+belten
+beltene
+belter
+beltesha
+belteshazzar
+beltestr
+beltestropper
+beltet
+beltian
+beltie
+beltine
+belting
+beltings
+beltir
+beltis
+beltless
+beltline
+beltlines
+beltmake
+beltmaker
+beltmaki
+beltmaking
+beltman
+belton
+beltra`n
+beltram
+beltrami
+beltran
+beltrova
+beltrovata
+belts
+beltsvil
+beltsville
+beltway
+beltwayb
+beltwaybandit
+beltways
+beltwise
+belu
+belua
+belubn
+beluchi
+belucki
+belud
+beluden
+beludest
+beludet
+beludji
+beludzhi
+beludzni
+beluege
+beluegen
+beluegend
+beluegendem
+beluegenden
+beluegender
+beluegst
+beluegt
+beluga
+belugas
+belugite
+belui
+beluid
+beluidde
+beluidden
+beluide
+beluiden
+beluidt
+beluien
+beluik
+beluiken
+beluiste
+beluister
+beluisterd
+beluisterde
+beluisterden
+beluisteren
+beluistert
+beluit
+beluji
+beluntan
+beluntanks
+belur
+beluran
+belure
+belus
+belushi
+belust
+beluste
+belusthe
+belustheid
+belustig
+belustige
+belustigen
+belustigend
+belustigendem
+belustigenden
+belustigender
+belustigst
+belustigt
+belustigte
+belustigten
+belustigter
+belustigtes
+belustigtet
+belustigungen
+belute
+belva
+belvaux
+belve
+belve'de
+belve'de`re
+belve'de`res
+belveder
+belvedere
+belvedere/tiburon
+belvederes
+belverdi
+belverdian
+belvia
+belvider
+belvidere
+belviderecenter
+belview
+belvin
+belvoir
+belvoir-
+belvoir-ato
+belvoir-cpo1
+belvoir-emh2
+belvoir-emh3
+belvoir-emh4
+belvoir-emh5
+belvoir-emh6
+belvoir-emh7
+belvoir-emh8
+belvoir-emh9
+belvoir-hdl
+belvoir-ibmrd
+belvoir-ignet
+belvoir-ignet2
+belvoir-mail1
+belvoir-mail2
+belvoir-mil-tac
+belvoir-prime1
+belvoir-relay1
+belvoir-sperry2
+belvoir-tcaccis
+belvoir-tdss
+belvue
+belwa
+bely
+belyaev
+belyavsk
+belyavsky
+belying
+belyingl
+belyingly
+belysa
+belyse
+belyser
+belyses
+belysnin
+belysning
+belysningen
+belysningsstyrke
+belysningsstyrken
+belysningsteknikk
+belysningsutstyr
+belyst
+belyste
+belz
+belzanor
+belzebut
+belzebuth
+belzile
+belzoni
+bel{gen
+bel{get
+bel{gg
+bel{gga
+bel{gning
+bel{gra
+bel{re
+bel{rend
+bel{rende
+bel{rer
+bel{ring
+bel{rte
+bel{te
+bel|b
+bel|bet
+bel|bsfelter
+bel|bsfelterne
+bel|bsfeltet
+bel|na
+bel|nna
+bel|nne
+bel|nnes
+bel|nnet
+bel|nnin
+bel|nning
+bel|nningen
+bel|p
+bel|pa
+bel|pe
+bel|pene
+bel|per
+bel|pet
+bel|pte
+bel}ner
+bel}ning
+bel}ningen
+bel}nte
+bel}ten
+bem
+bema
+bema"nge
+bema"ngelt
+bema"ngelte
+bemaal
+bemaald
+bemaalde
+bemaalden
+bemaalt
+bemachti
+bemachtig
+bemachtigd
+bemachtigde
+bemachtigden
+bemachtigen
+bemachtiging
+bemachtigt
+bemad
+bemadam
+bemadden
+bemaddening
+bemaecht
+bemaechtige
+bemaechtigen
+bemaechtigende
+bemaechtigendem
+bemaechtigenden
+bemaechtigendes
+bemaechtigst
+bemaechtigt
+bemaechtigtem
+bemaechtigten
+bemaechtigter
+bemaechtigtest
+bemaechtigtet
+bemaekel
+bemaekelt
+bemaenge
+bemaengelnd
+bemaengelnde
+bemaengelndem
+bemaengelnder
+bemaengelndes
+bemaengelst
+bemaengelte
+bemaengeltem
+bemaengelten
+bemaengeltes
+bemaengeltest
+bemaengeltet
+bemaerka
+bemaestr
+bemaestra
+bemail
+bemaim
+bemajest
+bemajesty
+bemal
+bemale
+bemalen
+bemalend
+bemalende
+bemalendem
+bemalenden
+bemalendes
+bemalene
+bemalenen
+bemaling
+bemalingen
+bemalst
+bemalt
+bemaltem
+bemalten
+bemalter
+bemaltes
+bemaltest
+bemaltet
+beman
+bemand
+bemande
+bemanden
+bemandet
+bemangle
+bemanna
+bemanne
+bemannen
+bemannet
+bemannin
+bemanning
+bemanningen
+bemanningsliste
+bemanningssituasjon
+bemannt
+bemannte
+bemanntes
+bemant
+bemantel
+bemanteld
+bemantelde
+bemantelden
+bemantelen
+bemantelt
+bemantle
+bemar
+bemarka
+bemartyr
+bemas
+bemask
+bemass
+bemassen
+bemasset
+bemast
+bemaste
+bemasten
+bemaster
+bemastra
+bemastte
+bemastten
+bemat
+bemata
+bematte
+bematten
+bemaul
+bemazed
+bemba
+bembala
+bembe
+bembecid
+bembecidae
+bembex
+bembi
+bembo
+bembo`n
+bembol
+bembona
+bemeal
+bemean
+bemedale
+bemedaled
+bemedall
+bemedalled
+bemektig
+bemektiget
+bement
+bementit
+bementite
+bemercy
+bemerk
+bemerka
+bemerkba
+bemerkbar
+bemerkbare
+bemerkbaren
+bemerkbarer
+bemerkbareren
+bemerkbareres
+bemerkbares
+bemerkbarste
+bemerkbarster
+bemerkbarstes
+bemerke
+bemerkel
+bemerkelsesverdig
+bemerkelsesverdige
+bemerken
+bemerkend
+bemerkende
+bemerkendem
+bemerkender
+bemerkendes
+bemerkenswert
+bemerkenswertem
+bemerkenswerten
+bemerkenswerter
+bemerkenswerterem
+bemerkenswerteren
+bemerkenswerterer
+bemerkenswerterweise
+bemerkenswertes
+bemerkenswerteste
+bemerkenswertesten
+bemerkenswertester
+bemerkenswertestes
+bemerker
+bemerkes
+bemerket
+bemerkni
+bemerkning
+bemerkningen
+bemerkninger
+bemerkst
+bemerkt
+bemerkte
+bemerkten
+bemerkter
+bemerktes
+bemerktet
+bemerkun
+bemerkung
+bemerkungen
+bemesse
+bemessen
+bemessende
+bemessendem
+bemessenden
+bemessendes
+bemessene
+bemessenem
+bemessener
+bemessenes
+bemest
+bemesten
+bemestin
+bemesting
+bemestingen
+bemestingsleer
+bemestte
+bemestten
+bemeubel
+bemeubeld
+bemeubelde
+bemeubelden
+bemeubelen
+bemeubelt
+bemiddel
+bemiddelaar
+bemiddelaars
+bemiddelaarster
+bemiddelaarsters
+bemiddelares
+bemiddelaressen
+bemiddeld
+bemiddelde
+bemiddelden
+bemiddelder
+bemiddeldheid
+bemiddeldst
+bemiddelen
+bemiddeling
+bemiddelingsbureau
+bemiddelingsbureaus
+bemiddelingsvoorstel
+bemiddelingsvoorstellen
+bemiddelt
+bemidji
+bemidlet
+bemili
+bemiller
+bemin
+bemina
+bemind
+beminde
+beminden
+beminder
+bemindst
+beminger
+bemingle
+beminnaa
+beminnaar
+beminnaars
+beminnel
+beminnelijk
+beminnelijke
+beminnelijker
+beminnelijkheid
+beminnelijkst
+beminnen
+beminnenswaard
+beminnenswaarde
+beminnenswaarder
+beminnenswaardig
+beminnenswaardige
+beminnenswaardiger
+beminnenswaardigheid
+beminnenswaardigst
+beminnenswaardst
+beminstr
+beminstrel
+bemint
+bemire
+bemired
+bemireme
+bemirement
+bemires
+bemiring
+bemirror
+bemirrorment
+bemis
+bemisst
+bemist
+bemistre
+bemistress
+bemitere
+bemitered
+bemitlei
+bemitleide
+bemitleiden
+bemitleidend
+bemitleidendem
+bemitleidenden
+bemitleidender
+bemitleidenswert
+bemitleidenswerte
+bemitleidenswertem
+bemitleidenswerter
+bemitleidenswertere
+bemitleidenswerterem
+bemitleidenswerterer
+bemitleidenswerteres
+bemitleidenswertes
+bemitleidenswertestem
+bemitleidenswertesten
+bemitleidenswertester
+bemitleidest
+bemitleidet
+bemitleidete
+bemitleideten
+bemitleideter
+bemitleidetes
+bemitleidetet
+bemitred
+bemittel
+bemittelt
+bemittelte
+bemittelten
+bemittelter
+bemitteltes
+bemix
+bemoan
+bemoanab
+bemoanable
+bemoaned
+bemoaner
+bemoanin
+bemoaning
+bemoaningly
+bemoans
+bemoat
+bemock
+bemoda
+bemodder
+bemodderd
+bemodderde
+bemodderden
+bemodderen
+bemoddert
+bemoeda
+bemoedig
+bemoedigd
+bemoedigde
+bemoedigden
+bemoedigen
+bemoedigend
+bemoediging
+bemoedigingen
+bemoedigt
+bemoei
+bemoeial
+bemoeiallen
+bemoeid
+bemoeide
+bemoeiden
+bemoeien
+bemoeienis
+bemoeienissen
+bemoeiin
+bemoeiing
+bemoeiingen
+bemoeili
+bemoeilijk
+bemoeilijken
+bemoeilijking
+bemoeilijkingen
+bemoeilijkt
+bemoeilijkte
+bemoeilijkten
+bemoeit
+bemoeizi
+bemoeiziek
+bemoeizieke
+bemoeizieker
+bemoeiziekst
+bemoeizu
+bemoeizucht
+bemoeta
+bemoil
+bemoiste
+bemoisten
+bemol
+bemolada
+bemolado
+bemole
+bemolt
+bemonste
+bemonster
+bemonsterd
+bemonsterde
+bemonsterden
+bemonsteren
+bemonstert
+bemoon
+bemors
+bemorsen
+bemorst
+bemorste
+bemorsten
+bemost
+bemoste
+bemoster
+bemostme
+bemostmeest
+bemota
+bemotto
+bemoult
+bemouth
+bemu"hen
+bemu"ht
+bemu"hun
+bemu"hungen
+bemuck
+bemud
+bemuddle
+bemuddlement
+bemuddy
+bemuehe
+bemuehen
+bemuehend
+bemuehendem
+bemuehenden
+bemuehender
+bemuehst
+bemueht
+bemuehte
+bemuehten
+bemuehter
+bemuehtes
+bemuehtet
+bemuehun
+bemuehung
+bemuehungen
+bemuffle
+bemun
+bemuren
+bemuring
+bemuringen
+bemurmur
+bemuse
+bemused
+bemusedl
+bemusedly
+bemuseme
+bemusement
+bemuses
+bemusing
+bemusk
+bemuslin
+bemuslined
+bemuspoi
+bemuspoint
+bemutter
+bemuttern
+bemutternd
+bemutternde
+bemutternden
+bemutternder
+bemutterndes
+bemuttert
+bemutterte
+bemuttertem
+bemutterter
+bemuttertes
+bemuttertest
+bemuur
+bemuurd
+bemuurde
+bemuurden
+bemuurt
+bemuzzle
+bemyndig
+bemyndiga
+bemyndigede
+bemyndigelse
+bem{gtiget
+bem{rk
+bem{rka
+bem{rke
+bem{rkede
+bem{rkelsesv{rdigt
+bem{rker
+bem{rkes
+bem{rket
+bem{rkning
+bem{rkningen
+bem{rkninger
+bem{rkningerne
+bem{stra
+bem|da
+bem|ta
+ben
+ben-eds
+ben-harr
+ben-harris-emh2
+ben-harris-jacs1
+ben-harris-jacs2
+ben-harris-jacs3
+ben-harris-pbas
+ben-harris-perddims
+ben-harris-tdss
+ben-isha
+ben-ishai
+ben_maye
+ben_mayer
+bena
+benaadir
+benaarst
+benaarstig
+benaarstigd
+benaarstigde
+benaarstigden
+benaarstigen
+benaarstigt
+benab
+benabdal
+benabdallah
+benabdi
+benabena
+benac
+benachba
+benachbart
+benachbarte
+benachbartem
+benachbarten
+benachbarter
+benachri
+benachrichtige
+benachrichtigen
+benachrichtigend
+benachrichtigendem
+benachrichtigenden
+benachrichtigender
+benachrichtigest
+benachrichtigst
+benachrichtigt
+benachrichtigtem
+benachrichtigten
+benachrichtigter
+benachrichtigtest
+benachrichtigtet
+benachrichtigungen
+benachte
+benachteilige
+benachteiligend
+benachteiligende
+benachteiligendem
+benachteiligender
+benachteiligendes
+benachteiligst
+benachteiligte
+benachteiligtem
+benachteiligten
+benachteiligtes
+benachteiligtest
+benachteiligtet
+benachteiligung
+benachteiligungen
+benacus
+benadar
+benadeel
+benadeeld
+benadeelde
+benadeelden
+benadeelt
+benadele
+benadelen
+benadeli
+benadeling
+benadelingen
+benader
+benaderd
+benaderde
+benaderden
+benadere
+benaderen
+benaderet
+benaderi
+benadering
+benaderingen
+benaderingsformules
+benaderingsfout
+benaderingsfouten
+benaderingsgetal
+benaderingsgetallen
+benaderingsmethode
+benaderingsproces
+benaderingstechniek
+benaderingstheorie
+benadert
+benadruk
+benadrukt
+benaegen
+benaemn
+benaemna
+benaemnd
+benaemni
+benaemning
+benaemnt
+benagel
+benageld
+benagelde
+benagelden
+benagele
+benagelen
+benagelt
+benagen
+benahmen
+benaiah
+benaissa
+benaking
+benakinga
+benakuma
+benam
+bename
+benamen
+benami
+benamida
+benamidar
+benaming
+benamingen
+benammi
+benamn
+benamna
+benamnd
+benamnin
+benamning
+benamnt
+benamst
+benannt
+benannte
+benannten
+benannter
+benanntes
+benanntet
+benarbejde
+benard
+benarde
+benarder
+benardhe
+benardheid
+benardst
+benaresu
+benarnol
+benarnold
+benarsi
+benassi
+benasso
+benasty
+benato
+benaule
+benauw
+benauwd
+benauwde
+benauwden
+benauwder
+benauwdh
+benauwdheden
+benauwdheid
+benauwds
+benauwdst
+benauwel
+benauwelijk
+benauwen
+benauwend
+benauwende
+benauwender
+benauwendst
+benauwin
+benauwing
+benauwingen
+benauwt
+benavent
+benavente
+benavide
+benavides
+benavidez
+benavon
+benavwnt
+benavwnte
+benay
+benaya
+benazir
+benbaku
+benbassa
+benbassat
+benben
+benbetsu
+benbetu
+benbova
+benbow
+benby
+bence
+benceno
+bench
+bencha
+bencha-
+benchaal
+benchaalal
+benchboa
+benchboard
+benched
+bencher
+benchers
+benchership
+benches
+benchfel
+benchfellow
+benchful
+benchi
+benchieh
+benchika
+benchima
+benchimo
+benchimol
+benching
+benchire
+benchlan
+benchland
+benchlet
+benchley
+benchman
+benchmar
+benchmark
+benchmarked
+benchmarking
+benchmarks
+bencho
+benchpre
+benchpress
+benchuu
+benchwor
+benchwork
+benchy
+bencia
+bencie
+bencina
+bencite
+bencoole
+bencoolen
+benczak
+bencze
+bend
+benda
+bendabil
+bendability
+bendable
+bendai
+bendammo
+bendando
+bendano
+bendare
+bendaron
+bendarono
+bendasse
+bendassero
+bendassi
+bendassimo
+bendaste
+bendasti
+bendat
+bendata
+bendate
+bendati
+bendato
+bendava
+bendavam
+bendavamo
+bendavan
+bendavano
+bendavat
+bendavate
+bendavi
+bendavis
+bendavo
+bendayan
+bende
+bendecidor
+bendecidora
+bendecir
+bended
+bendee
+bendeghe
+bendehoo
+bendehoofd
+bendehoofden
+bendel
+bendelde
+bendelden
+bendelen
+bendelga
+bendelgaren
+bendell
+benden
+bendena
+bender
+bendera
+benderai
+benderan
+benderanno
+bendereb
+benderebbe
+benderei
+benderem
+benderemmo
+benderemo
+benderes
+bendereste
+benderesti
+benderet
+benderete
+bendero
+benders
+bendersv
+bendersville
+bendes
+bendet
+bendeth
+bendex
+bendi
+bendiamo
+bendiate
+bendibod
+bendibodyi
+bendiboi
+bendibok
+bendibokyi
+bendicera
+bendicha
+bendicho
+bendiciente
+bendicio`n
+bendicir
+bendick
+bendicty
+bendigo
+bending
+bendingl
+bendingly
+bendino
+bendiobu
+bendiobudu
+bendita
+benditch
+bendite
+benditera
+bendito
+bendix
+bendix-s
+bendix-sd
+bendixse
+bendixsen
+bendjedi
+bendjedid
+bendler
+bendlet
+bendo
+bendor
+bendorod
+bendoroda
+bendorsa
+bendorsamuel
+bendov
+bendow
+bends
+bendsel
+bendsele
+bendselet
+bendsle
+bendsler
+bendslet
+bendsome
+benducha
+bendwise
+bendy
+bene
+bene^t
+bene^ts
+bene`fica
+bene`fico
+bene`vola
+bene`volamente
+bene`volo
+beneaped
+beneath
+beneatha
+beneathe
+benebeln
+benebelnd
+benebelndem
+benebelnden
+benebelnder
+benebels
+benebelst
+benebelt
+benebelte
+benebelten
+benebelter
+benebeltes
+benebeltet
+benebera
+beneberak
+beneble
+benecept
+beneception
+beneceptive
+beneceptor
+benechia
+beneda
+benedeck
+benedek
+beneden
+benedenb
+benedenbewoner
+benedenbewoners
+benedenburen
+benedenbuur
+benedend
+benedendijks
+benedene
+benedeneind
+benedeneinde
+benedeneinden
+benedenh
+benedenhuis
+benedenhuizen
+benedenk
+benedenkamer
+benedenkamers
+benedenkant
+benedenkanten
+benedenl
+benedenloop
+benedenlopen
+benedenr
+benedenrivier
+benedenrivieren
+benedens
+benedenst
+benedenstad
+benedenste
+benedenv
+benedenverdieping
+benedenverdiepingen
+benedenw
+benedenwaarts
+benedenwinds
+benedenz
+benedenzaal
+benedenzalen
+benedett
+benedetta
+benedetti
+benedetto
+benedi`cite
+benedici
+benedicite
+benedick
+benedict
+benedicta
+benedicte
+benedictie
+benedictien
+benedicties
+benedictijn
+benedictijnen
+benedictijnenklooster
+benedictijnenkloosters
+benedictijnenorde
+benedictijner
+benedictijns
+benedictijnse
+benedictina
+benedictine
+benedictines
+benedictinessen
+benedictinism
+benedictino
+benediction
+benedictional
+benedictionary
+benedictions
+benedictive
+benedictively
+benedicto
+benedictory
+benedicts
+benedictus
+benedigh
+benedight
+benediks
+benediksjon
+benedikt
+benedikta
+benediktiner
+benediktinerabtei
+benediktinerin
+benediktinermoenche
+benediktinern
+benediktiners
+beneem
+beneemt
+benefact
+benefaction
+benefactions
+benefactive
+benefactor
+benefactora
+benefactori`a
+benefactors
+benefactorship
+benefactory
+benefactress
+benefactresses
+benefactri`a
+benefactrices
+benefactrix
+benefactrixes
+benefic
+benefice
+beneficed
+beneficeless
+beneficen
+beneficence
+beneficences
+beneficencia
+beneficent
+beneficenti`sima
+beneficenti`simo
+beneficential
+beneficently
+benefices
+beneficevoorstelling
+beneficevoorstellingen
+benefici
+beneficia
+beneficiacio`n
+beneficiada
+beneficiado
+beneficiador
+beneficiadora
+beneficiair
+beneficiaire
+beneficial
+beneficially
+beneficialness
+beneficiant
+beneficianten
+beneficiar
+beneficiaria
+beneficiaries
+beneficiario
+beneficiary
+beneficiaryship
+beneficiate
+beneficiated
+beneficiating
+beneficiation
+beneficie
+beneficien
+beneficies
+beneficing
+beneficio
+beneficiosa
+beneficioso
+beneficium
+beneficiums
+benefiel
+benefield
+benefiet
+benefieten
+benefise
+benefisert
+benefit
+benefitc
+benefitcost
+benefite
+benefited
+benefiter
+benefiti
+benefiting
+benefits
+benefitt
+benefitted
+benefitting
+benehes
+benehmen
+benehmens
+beneiden
+beneidend
+beneidende
+beneidenden
+beneidender
+beneidendes
+beneidenswerte
+beneidenswertem
+beneidenswerten
+beneidenswertere
+beneidenswerterem
+beneidenswerteren
+beneidenswerteres
+beneidenswertes
+beneidenswerteste
+beneidenswertesten
+beneidenswertester
+beneidenswertestes
+beneidet
+beneidete
+beneidetem
+beneideter
+beneidetes
+beneidetet
+beneighb
+beneighbored
+beneina
+benejaak
+benejaakan
+benek
+beneki
+benekta
+benekte
+benektel
+benektelse
+benekten
+benektende
+benekter
+benektes
+benektet
+benelux
+benelux-
+benelux-laender
+beneluxh
+beneluxhaefen
+beneluxs
+beneluxstaaten
+beneme`rita
+beneme`rito
+benemen
+benemerencia
+beneming
+benempt
+benempte
+benempted
+benen
+benene
+benenne
+benennen
+benennend
+benennendem
+benennenden
+benennender
+benennne
+benennst
+benennt
+benennun
+benennung
+benennungen
+benepen
+benepenh
+benepenheid
+benepla`cito
+beneplac
+beneplacito
+beneraf
+benes
+benesch
+benesh
+benesho
+benesser
+benessere
+benesseri
+benestan
+benestante
+benestanti
+benestar
+benestare
+benestari
+benet
+benetar
+beneteau
+benetia
+benetlak
+benetlake
+benetnas
+benetnasch
+benetta
+benette
+benettle
+benetton
+benetzen
+benetzend
+benetzende
+benetzenden
+benetzender
+benetzendes
+benetzet
+benetzt
+benetzte
+benetzten
+benetzter
+benetztes
+benetztet
+benevel
+beneveld
+benevelde
+benevelden
+benevele
+benevelen
+beneveli
+beneveling
+benevelt
+benevens
+benevent
+beneventan
+beneventana
+benevnel
+benevnelse
+benevnelsen
+benevner
+benevnes
+benevnin
+benevningen
+benevnt
+benevole
+benevolence
+benevolencia
+benevolent
+benevolenti`sima
+benevolenti`simo
+benevolently
+benevolentness
+benevoli
+benevolist
+beneyton
+benez
+benezett
+benezuer
+benfatto
+benfer
+benfield
+benfrank
+benfranklin
+beng
+benga
+bengaals
+bengaalse
+bengaku
+bengal
+bengala
+bengales
+bengalese
+bengali
+bengali`
+bengalia
+bengaliassamese
+bengalic
+bengalin
+bengaline
+bengalis
+bengalische
+bengalischen
+bengals
+bengaru
+bengazi
+benge
+bengebaa
+bengebaati
+bengel
+bengelde
+bengelden
+bengelen
+bengell
+bengello
+bengelloun
+bengeln
+bengels
+bengelt
+bengeltj
+bengeltje
+bengeltjes
+benggaul
+benggaulu
+benggoi
+benghazi
+bengi
+bengijou
+bengijyo
+bengisai
+bengisos
+bengitek
+bengizyo
+bengkare
+bengkareng
+bengkaya
+bengkayang
+bengkulu
+bengler
+benglia
+benglong
+bengo
+bengoi
+bengola
+bengonin
+bengoshi
+bengosi
+bengosih
+bengosik
+bengosit
+bengsch
+bengston
+bengt
+bengt-ar
+bengtson
+benguela
+benguell
+benguella
+benguet
+bengueti
+benguetigorot
+benhadad
+benhail
+benham
+benhanan
+benharri
+benharrison
+benharrison-mil-tac
+benheisa
+benhur
+beni
+beniaami
+beniaamir
+beniades
+beniamer
+beniamin
+beniamino
+beniaminov
+beniamir
+benibana
+benicia
+benicole
+benicolet
+benie
+benieuw
+benieuwd
+benieuwde
+benieuwden
+benieuwder
+benieuwdst
+benieuwe
+benieuwen
+benieuwt
+benig
+benige
+beniger
+benight
+benighte
+benighted
+benightedly
+benightedness
+benighten
+benighter
+benightm
+benightmare
+benightment
+benign
+benigna
+benignamente
+benignan
+benignancies
+benignancy
+benignant
+benignantly
+benigne
+benigni
+benignidad
+benignit
+benignities
+benignity
+benignly
+benigno
+benigst
+benii
+beniiro
+benijake
+benijd
+benijdba
+benijdbaar
+benijdbaarder
+benijdbaarst
+benijdbare
+benijdde
+benijdden
+benijden
+benijdenswaard
+benijdenswaarde
+benijdenswaarder
+benijdenswaardig
+benijdenswaardige
+benijdenswaardiger
+benijdenswaardigst
+benijdenswaardst
+benijder
+benijders
+benijdst
+benijdster
+benijdsters
+benijdt
+benimeri`n
+benin
+benina
+benincas
+benincasa
+beninese
+beninger
+benino
+benintog
+benintogo
+beninu
+benish
+benishak
+benishou
+benison
+benisons
+benita
+benitez
+benito
+benitoit
+benitoite
+beniya
+benj
+benjamen
+benjami`n
+benjamin
+benjamina
+benjamine
+benjamines
+benjaminite
+benjamins
+benjamit
+benjamita
+benjamite
+benjamites
+benjatik
+benjatikul
+benjavan
+benjawan
+benjes
+benji
+benjie
+benjin
+benjina
+benjo
+benjoin
+benjou
+benjouso
+benjui`
+benjy
+benjyo
+benk
+benka
+benkai
+benke
+benkefor
+benkeforslag
+benkei
+benkeise
+benkelma
+benkelman
+benken
+benkene
+benker
+benkerad
+benkeraden
+benkeradene
+benkerader
+benket
+benkhoff
+benki
+benkl{r
+benko
+benkoela
+benkonjo
+benkou
+benkulan
+benkulen
+benkulu
+benkyou
+benkyoub
+benkyouc
+benkyouk
+benkyous
+benld
+benlomon
+benlomond
+benmaku
+benmakus
+benmayer
+benmei
+benmost
+benmou
+benmouch
+benmukan
+benn
+bennatt
+benne
+bennefel
+bennefeld
+bennel
+bennell
+bennen
+bennent
+benner
+bennes
+bennesa
+bennet
+bennetje
+bennetjes
+bennets
+bennett
+bennetti
+bennettitaceae
+bennettitaceous
+bennettitales
+bennettites
+bennetts
+bennettsville
+bennetwe
+bennetweed
+benni
+bennie
+bennies
+benning
+benning-
+benning-asims
+benning-ato
+benning-jacs5074
+benning-meprs
+benning-mil-tac
+benning-perddims
+benning-tcaccis
+bennings
+benningt
+bennington
+bennison
+benno
+bennu
+benny
+beno
+beno"tig
+beno"tigen
+beno"tigt
+beno"tigte
+beno"tigten
+benodigd
+benodigde
+benodigder
+benodigdheden
+benodigdst
+benoem
+benoemba
+benoembaar
+benoembaarheid
+benoembare
+benoemd
+benoemde
+benoemden
+benoemen
+benoemin
+benoeming
+benoemingen
+benoemingsbesluit
+benoemingsbesluiten
+benoemingsbrief
+benoemingsbrieven
+benoemt
+benoetig
+benoetige
+benoetigen
+benoetigend
+benoetigendem
+benoetigenden
+benoetigender
+benoetigst
+benoetigt
+benoetigte
+benoetigten
+benoetigter
+benoetigtes
+benoetigtet
+benoi^t
+benoi^te
+benoi^tes
+benoi^ts
+benoit
+benoite
+benokish
+benokisi
+benolin
+benomen
+benomene
+benomenen
+benommen
+benommene
+benommenen
+benommener
+benommenes
+benommenheit
+benommenheiten
+benoni
+benoorde
+benoorden
+benorth
+benote
+benotung
+benoue
+benpatsu
+benpatu
+benpi
+benpou
+benquerencia
+benran
+benrei
+benri
+benrinho
+benrishi
+benrisi
+benriya
+benroeta
+benron
+benronit
+benronko
+benronno
+benronsh
+benrota
+benrud
+benr|ta
+bens
+bensai
+bensaiki
+bensaino
+bensalem
+bensasso
+bensasson
+benschen
+benschop
+bensel
+bensen
+bensenvi
+bensenville
+bensh
+benshea
+benshee
+benshi
+benshie
+benshou
+benshouh
+benshoum
+benshuts
+benshutu
+bensi
+bensid
+bensin
+bensinbl
+bensinblanding
+bensinbo
+bensinbombe
+bensinbomber
+bensinda
+bensindamp
+bensindr
+bensindrevne
+bensinen
+bensinfo
+bensinforbruk
+bensinforbruket
+bensinge
+bensinger
+bensinka
+bensinkanne
+bensinma
+bensinmangel
+bensinmo
+bensinmotor
+bensinpu
+bensinpumpa
+bensinpumpen
+bensinpumpene
+bensinsl
+bensinslangen
+bensinst
+bensinstasjon
+bensinstasjonen
+bensinstasjonens
+bensinstasjoner
+bensinta
+bensintanken
+bensintankene
+benski
+benskin
+bensmill
+bensmiller
+benson
+bensrun
+bensun
+bensyou
+bensyouh
+bent
+bentai
+bentang
+bentatsu
+bentatu
+bente
+benten
+bentenan
+bentenba
+bentency
+bentendo
+bentenji
+bentenzi
+benter
+bentfrem
+bentgeno
+bentgenoot
+bentgenoten
+bentgras
+bentgrass
+bentgrassen
+benthal
+bentham
+benthami
+benthamic
+benthamism
+benthamite
+benthem
+benthic
+benthin
+benthon
+benthoni
+benthonic
+benthope
+benthopelagic
+benthos
+benti
+bentian
+bentikan
+bentimak
+bentinck
+bentincks
+bentines
+bentiness
+benting
+bentire-
+bentivog
+bentivoglio
+bentlee
+bentler
+bentley
+bentleyv
+bentleyville
+bently
+bentmoun
+bentmountain
+bento
+bento`nica
+bento`nico
+bentoeni
+benton
+bentonci
+bentoncity
+bentong
+bentonha
+bentonharbor
+bentonia
+bentonit
+bentonite
+bentonitic
+bentonri
+bentonridge
+bentonvi
+bentonville
+bentos
+bentou
+bentouba
+bentoury
+bentree
+bents
+bentsen
+bentstar
+bentsu
+bentsuu
+bentu
+bentuni
+bentuu
+bentwate
+bentwaters
+bentwaters-am1
+bentwaters-piv-2
+bentwood
+bentwoods
+benty
+bentya
+bentzen
+benu
+benu"tzt
+benua
+benucci
+benue
+benuecon
+benuecongo
+benuecpn
+benuecpngo
+benuepla
+benueplateau
+benuetzb
+benuetzbarkeit
+benuetze
+benuetzen
+benuetzende
+benuetzendem
+benuetzenden
+benuetzendes
+benuetzer
+benuetzest
+benuetzt
+benuetztem
+benuetzten
+benuetzter
+benuetztest
+benuetztet
+benul
+benumb
+benumbed
+benumbedness
+benumbin
+benumbing
+benumbingly
+benumbme
+benumbment
+benumbs
+benumm
+benumme
+benut
+benutte
+benutten
+benutzba
+benutzbare
+benutze
+benutzen
+benutzer
+benutzerebenen
+benutzerfont
+benutzerfreundliche
+benutzerhaeufigkeit
+benutzerinterface
+benutzerkomfort
+benutzern
+benutzernummer
+benutzeroberfla"che
+benutzt
+benutzte
+benutzten
+benutzun
+benutzung
+benutzungen
+benutzungsmoeglichkeit
+benveg
+benvegen
+benvei
+benveien
+benvenut
+benvenuti
+benvenuto
+benvenutti
+benvolio
+benward
+benwatt
+benweed
+benwell
+benwheel
+benwheeler
+benwood
+beny
+benyadu
+benyakle
+benyaklef
+benyamin
+benyamin-seeyar
+benyamini
+benyi
+benyon
+benyt
+benytt
+benytte
+benytted
+benyttede
+benyttel
+benyttelse
+benyttelsen
+benytter
+benyttes
+benyttet
+benyu-ra
+benyura
+benz
+benza
+benzacri
+benzacridine
+benzaite
+benzal
+benzalac
+benzalacetone
+benzalacetophenone
+benzalan
+benzalaniline
+benzalaz
+benzalazine
+benzalco
+benzalcohol
+benzalcy
+benzalcyanhydrin
+benzalde
+benzaldehyde
+benzaldi
+benzaldiphenyl
+benzaldo
+benzaldoxime
+benzalet
+benzalethylamine
+benzalhy
+benzalhydrazine
+benzali
+benzalph
+benzalphenylhydrazone
+benzalphthalide
+benzamid
+benzamide
+benzamido
+benzamin
+benzamine
+benzaminic
+benzamino
+benzan
+benzanal
+benzanalgen
+benzanil
+benzanilide
+benzanth
+benzanthrone
+benzanti
+benzantialdoxime
+benzaruk
+benzazid
+benzazide
+benzazim
+benzazimide
+benzazin
+benzazine
+benzazol
+benzazole
+benzbitr
+benzbitriazole
+benzdiaz
+benzdiazine
+benzdifu
+benzdifuran
+benzdiox
+benzdioxazine
+benzdioxdiazine
+benzdioxtriazine
+benze`ne
+benzecri
+benzedri
+benzedrine
+benzein
+benzen
+benzene
+benzened
+benzenediazonium
+benzenes
+benzenet
+benzenoi
+benzenoid
+benzenyl
+benzeton
+benzetsu
+benzetu
+benzhydr
+benzhydrol
+benzhydroxamic
+benzi
+benzick
+benzidin
+benzidine
+benzidino
+benzie
+benzil
+benzilic
+benzimid
+benzimidazole
+benzimin
+benziminazole
+benzin
+benzina
+benzinda
+benzindaempfe
+benzindi
+benzindiebe
+benzindu
+benzinduline
+benzine
+benzined
+benzinedamp
+benzinedampen
+benzineh
+benzinehouder
+benzinehouders
+benzinem
+benzinemeter
+benzinemeters
+benzinemotor
+benzinemotoren
+benzinemotors
+benzinen
+benzinep
+benzinepomp
+benzinepompen
+benziner
+benzinereservoir
+benzinereservoirs
+benzines
+benzinfa
+benzinfass
+benzinfl
+benzinflecken
+benzingu
+benzingutscheine
+benzini
+benzinka
+benzinkanister
+benzinkanistern
+benzinko
+benzinkosten
+benzinma
+benzinmarken
+benzinmarkt
+benzinmo
+benzinmotoren
+benzinmotors
+benzinpr
+benzinpreis
+benzins
+benzinsy
+benzinsynthese
+benzinta
+benzintaenke
+benzintaenken
+benzintankes
+benzinuh
+benzinuhr
+benzinuhren
+benzinve
+benzinverbrauchs
+benzinzu
+benzinzufuhr
+benzo
+benzoate
+benzoated
+benzoates
+benzoazu
+benzoazurine
+benzobis
+benzocai
+benzocaine
+benzocou
+benzocoumaran
+benzodia
+benzodiazepines
+benzodiazine
+benzodiazole
+benzoe
+benzoebl
+benzoebloemen
+benzoebo
+benzoebomen
+benzoeboom
+benzoeha
+benzoehars
+benzofla
+benzoflavine
+benzoflu
+benzofluorene
+benzoful
+benzofulvene
+benzofur
+benzofuran
+benzofuroquinoxaline
+benzofuryl
+benzogly
+benzoglycolic
+benzoglyoxaline
+benzohet
+benzoheth
+benzohyd
+benzohydrol
+benzoic
+benzoica
+benzoico
+benzoid
+benzoin
+benzoina
+benzoinated
+benzoins
+benzoiod
+benzoiodohydrin
+benzojia
+benzol
+benzolat
+benzolate
+benzole
+benzoliz
+benzolize
+benzomor
+benzomorpholine
+benzonap
+benzonaphthol
+benzonia
+benzonit
+benzonitrile
+benzonitrol
+benzoper
+benzoperoxide
+benzophe
+benzophenanthrazine
+benzophenanthroline
+benzophenazine
+benzophenol
+benzophenone
+benzophenothiazine
+benzophenoxazine
+benzophl
+benzophloroglucinol
+benzopho
+benzophosphinic
+benzopht
+benzophthalazine
+benzopin
+benzopinacone
+benzopyr
+benzopyran
+benzopyranyl
+benzopyrazolone
+benzopyrylium
+benzoqui
+benzoquinoline
+benzoquinone
+benzoquinoxaline
+benzosul
+benzosulphimide
+benzotet
+benzotetrazine
+benzotetrazole
+benzothi
+benzothiazine
+benzothiazole
+benzothiazoline
+benzothiodiazole
+benzothiofuran
+benzothiophene
+benzothiopyran
+benzotol
+benzotoluide
+benzotri
+benzotriazine
+benzotriazole
+benzotrichloride
+benzotrifuran
+benzoxat
+benzoxate
+benzoxy
+benzoxya
+benzoxyacetic
+benzoxyc
+benzoxycamphor
+benzoxyp
+benzoxyphenanthrene
+benzoyl
+benzoyla
+benzoylate
+benzoylation
+benzoylf
+benzoylformic
+benzoylg
+benzoylglycine
+benzpina
+benzpinacone
+benzthio
+benzthiophen
+benztrio
+benztrioxazine
+benzyl
+benzylam
+benzylamine
+benzylic
+benzylid
+benzylidene
+benzylpe
+benzylpenicillin
+benzyo
+ben{gen
+ben{gte
+ben{gtede
+ben{gter
+ben{mn
+ben{mna
+ben{mnd
+ben{mnin
+ben{mning
+ben{mnt
+ben{vne
+ben{vnelser
+ben{vnes
+ben{vnt
+ben{vnte
+ben}da
+ben}de
+ben}det
+ben}dnin
+ben}dning
+ben}dninger
+beo
+beo's
+beobacht
+beobachtbar
+beobachtbaren
+beobachtbarer
+beobachte
+beobachten
+beobachtende
+beobachtendem
+beobachtenden
+beobachtendes
+beobachtenten
+beobachter
+beobachterin
+beobachterinnen
+beobachtern
+beobachtertruppe
+beobachtest
+beobachtet
+beobachtete
+beobachtetem
+beobachteten
+beobachtetes
+beobachtetest
+beobachtetet
+beobachtung
+beobachtungen
+beobachtungsgabe
+beobachtungsgaben
+beobachtungsgruppen
+beobachtungsplatz
+beobachtungsposten
+beobachtungspostens
+beobachtungsstationen
+beobachtungstuerme
+beobachtungsturmes
+beocia
+beocio
+beoda
+beode
+beodera
+beodez
+beodo
+beoefen
+beoefena
+beoefenaar
+beoefenaars
+beoefenaren
+beoefend
+beoefende
+beoefenden
+beoefene
+beoefenen
+beoefeni
+beoefening
+beoefent
+beogen
+beograd
+beolied
+beoliede
+beolieden
+beolien
+beom-sah
+beom-sahng
+beomsahn
+beomsahng
+beon
+beone
+beoni
+beoog
+beoogd
+beoogde
+beoogden
+beoogt
+beoordee
+beoordeel
+beoordeeld
+beoordeelde
+beoordeelden
+beoordeelt
+beoordel
+beoordelaar
+beoordelaars
+beoordelaarster
+beoordelaarsters
+beoordelaren
+beoordelen
+beoordeling
+beoordelingen
+beoorlog
+beoorlogen
+beoorloo
+beoorloog
+beoorloogd
+beoorloogde
+beoorloogden
+beoorloogt
+beoosten
+beor
+beordert
+beorderte
+beordra
+beordran
+beordre
+beordres
+beordret
+beordrin
+beordring
+beori`
+beorn
+beorning
+beornings
+beos
+beothuk
+beothuka
+beothukan
+beotier
+beotiers
+beotisk
+beoumi
+beowawe
+beowulf
+bep
+bepaal
+bepaald
+bepaalde
+bepaaldelijk
+bepaalden
+bepaaldh
+bepaaldheid
+bepaalt
+bepacke
+bepacken
+bepackt
+bepackte
+bepackten
+bepacktes
+bepacktest
+bepacktet
+bepaid
+bepaint
+bepak
+bepakken
+bepakkin
+bepakking
+bepakkingen
+bepakt
+bepakte
+bepakten
+bepale
+bepalen
+bepalend
+bepalende
+bepalender
+bepalendst
+bepaling
+bepalingaankondigend
+bepalingaankondigende
+bepalingen
+bepantse
+bepantser
+bepantserd
+bepantserde
+bepantserden
+bepantseren
+bepantsert
+bepaper
+beparch
+beparel
+bepareld
+beparelde
+beparelden
+beparele
+beparelen
+beparelt
+beparody
+beparse
+bepart
+bepaste
+bepastur
+bepastured
+bepat
+bepatche
+bepatched
+bepaw
+bepearl
+bepeins
+bepeinsd
+bepeinsde
+bepeinsden
+bepeinst
+bepeinze
+bepeinzen
+bepek
+bepekken
+bepekt
+bepekte
+bepekten
+bepelt
+bepen
+bepepper
+beperiwi
+beperiwigged
+beperk
+beperken
+beperkin
+beperking
+beperkingen
+beperkt
+beperkte
+beperkten
+beperkter
+beperkth
+beperktheid
+beperkts
+beperktst
+bepester
+bepewed
+bepflanz
+bepflanzen
+bepflanzend
+bepflanzende
+bepflanzenden
+bepflanzender
+bepflanzendes
+bepflanzt
+bepflanzte
+bepflanztem
+bepflanzter
+bepflanztes
+bepflanztest
+bepflanzung
+bepflanzungen
+bephilte
+bephilter
+bephrase
+bepictur
+bepicture
+bepiece
+bepierce
+bepik
+bepikken
+bepikt
+bepikte
+bepikten
+bepile
+bepill
+bepillar
+bepillared
+bepimple
+bepinch
+bepistol
+bepistoled
+bepity
+beplague
+beplaide
+beplaided
+beplak
+beplakke
+beplakken
+beplakt
+beplakte
+beplakten
+beplank
+beplanke
+beplanken
+beplanki
+beplanking
+beplankingen
+beplankt
+beplankte
+beplankten
+beplanku
+beplankung
+beplant
+beplante
+beplanten
+beplantet
+beplanti
+beplanting
+beplantingen
+beplantn
+beplantning
+beplantninger
+beplantt
+beplantte
+beplantten
+beplaste
+beplaster
+bepleist
+bepleister
+bepleisterd
+bepleisterde
+bepleisterden
+bepleisteren
+bepleistering
+bepleisteringen
+bepleistert
+bepleit
+bepleite
+bepleiten
+bepleitt
+bepleitte
+bepleitten
+beploeg
+beploegd
+beploegde
+beploegden
+beploege
+beploegen
+beploegt
+bepluisd
+bepluisde
+bepluisder
+bepluisdmeest
+beplumed
+bepoeder
+bepoederd
+bepoederde
+bepoederden
+bepoederen
+bepoedert
+bepoeier
+bepoeierd
+bepoeierde
+bepoeierden
+bepoeieren
+bepoeiert
+bepolder
+bepolderd
+bepolderde
+bepolderden
+bepolderen
+bepoldering
+bepolderingen
+bepoldert
+bepommel
+bepoot
+bepootte
+bepootten
+bepote
+bepotel
+bepoteld
+bepotelde
+bepotelden
+bepotele
+bepotelen
+bepotelt
+bepoten
+bepoting
+bepotingen
+bepour
+bepowder
+beppa
+beppai
+beppe
+beppi
+beppie
+beppin
+beppo
+beppou
+beppu
+beppudai
+beppushi
+beppusi
+beppuu
+beppyou
+bepraat
+bepraatt
+bepraatte
+bepraatten
+bepraise
+bepraisement
+bepraiser
+beprank
+beprate
+bepraten
+bepray
+bepreach
+bepreek
+bepreekt
+bepreekte
+bepreekten
+bepreken
+bepress
+bepretty
+bepride
+beproef
+beproefd
+beproefde
+beproefden
+beproeft
+beproeva
+beproevat
+beproeve
+beproeven
+beproevi
+beproeving
+beproevingen
+beprose
+beprovat
+bepr|vat
+bepuddle
+bepuff
+bepun
+bepurple
+bepuzzle
+bepuzzlement
+beq
+beql
+beqlu
+beqrel
+bequalm
+bequatsc
+bequatschen
+beque
+bequeath
+bequeathable
+bequeathal
+bequeathed
+bequeather
+bequeathing
+bequeathment
+bequeaths
+bequem
+bequeme
+bequemen
+bequemer
+bequemere
+bequemeren
+bequemerer
+bequemeres
+bequemli
+bequemlichkeit
+bequemlichkeiten
+bequemlichkeitsdepot
+bequemlichkeitsdepots
+bequemlichkeitsgruenden
+bequemst
+bequemste
+bequemstem
+bequemsten
+bequemstes
+bequemt
+bequemte
+bequeriana
+bequest
+bequests
+bequirtl
+bequirtle
+bequote
+beqz
+ber
+ber-asim
+ber-asims
+ber-igne
+ber-ignet
+bera
+bera"t
+beraad
+beraadde
+beraadden
+beraadsl
+beraadslaag
+beraadslaagd
+beraadslaagde
+beraadslaagden
+beraadslaagt
+beraadslagen
+beraadslaging
+beraadslagingen
+beraadt
+beraam
+beraamd
+beraamde
+beraamden
+beraamt
+beraap
+beraapt
+beraapte
+beraapten
+beraber
+berabera
+berabou
+beracha
+berachah
+berachia
+berachiah
+berad
+beraden
+beradene
+beradenen
+beradener
+beradenh
+beradenheid
+beradens
+beradenst
+beradino
+beraekna
+beraekni
+beraekning
+beraetst
+beraetta
+beraetti
+beraettiga
+beragon
+beraiah
+berain
+berairou
+berakah
+berake
+berakna
+beraknin
+berakning
+berakoth
+berama
+beramen
+beraming
+beramingen
+beramma
+beramme
+berammer
+berammes
+berammet
+beran
+beranda
+beranek
+berang
+beranger
+berangere
+berapami
+berapen
+berappen
+berapt
+berar
+berardin
+berardino
+berari
+berascal
+berat
+berate
+berated
+beraten
+beratend
+beratende
+beratendem
+beratenden
+beratendes
+beratene
+beratenem
+beratener
+beratenes
+beraterh
+beraterhonorar
+beratern
+beraters
+beraterv
+beraterverhaeltnis
+beratervertrag
+berates
+beratest
+berating
+beratsch
+beratschlage
+beratschlagen
+beratschlagend
+beratschlagendem
+beratschlagenden
+beratschlagender
+beratschlager
+beratschlagers
+beratschlagst
+beratschlagt
+beratschlagte
+beratschlagten
+beratschlagter
+beratschlagtes
+beratschlagtet
+beratschlagungsstelle
+beratschlagungsstellen
+beratta
+berattig
+berattiga
+berattle
+beratung
+beratungen
+beratungsaufgaben
+beratungsbuero
+beratungsgegenstaende
+beratungsgegenstand
+beratungsgesellschaft
+beratungslehrer
+beratungsnotwendigkeit
+beratungsphase
+beratungspunkte
+beratungsraum
+beratungsstelle
+beratungstaetigkeit
+beratungstisch
+beratungsverfahren
+berau
+beraube
+berauben
+beraubende
+beraubendem
+beraubenden
+beraubendes
+beraubst
+beraubt
+beraubte
+beraubtem
+beraubten
+beraubter
+beraubtest
+beraubtet
+beraubun
+beraubung
+beraubungen
+beraunit
+beraunite
+beraur
+berausch
+berausche
+berauschend
+berauschende
+berauschendem
+berauschender
+berauschendes
+berauschst
+berauschte
+berauschtem
+berauschten
+berauschtes
+berauschtest
+berauschtet
+berauschtheit
+berauschung
+berawan
+beray
+berba
+berbamin
+berbamine
+berbe`n
+berbe`re
+berbe`res
+berbee
+berber
+berbera
+berberecho
+berberi
+berberi`
+berberi`dea
+berberi`deo
+berberi`s
+berberia
+berberian
+berberic
+berbericia
+berberid
+berberida`cea
+berberida`ceo
+berberidaceae
+berberidaceous
+berberin
+berberine
+berberis
+berberisca
+berberisco
+berberisen
+berberiss
+berberissen
+berberissestruik
+berberissestruiken
+berberissewortel
+berberissewortels
+berberisstruik
+berberisstruiken
+berberiswortel
+berberiswortels
+berberry
+berbers
+berbi`
+berbice
+berbicec
+berbicecorentyne
+berbiqui`
+berbling
+berblinger
+berc/a
+berc/aie
+berc/aient
+berc/ais
+berc/ait
+berc/ant
+berc/ons
+bercail
+berce
+berce'
+berce'e
+berce'es
+berce's
+berce`re
+berce`rent
+berceau
+berceaus
+berceaux
+bercek
+bercemen
+bercement
+bercent
+berceo
+bercer
+bercera
+bercerai
+berceraient
+bercerais
+bercerait
+berceras
+bercerez
+berceri`a
+bercerie
+berceriez
+bercerio
+bercerions
+bercero
+berceron
+bercerons
+berceront
+berces
+berceur
+berceurs
+berceuse
+berceuses
+bercez
+berchemi
+berchemia
+berchot
+berchta
+berchtol
+berchtold
+berci
+bercial
+berciana
+berciano
+berciez
+bercions
+berclair
+bercovi
+bercovic
+bercovici
+berd
+berdache
+berdama
+berden
+berderen
+berdine
+berdoff
+bere
+bere`ber
+berea
+berean
+bereason
+bereav
+bereavd
+bereave
+bereaved
+bereavem
+bereavement
+bereavements
+bereaven
+bereaver
+bereavers
+bereaves
+bereavet
+bereaveth
+bereavin
+bereaving
+berebere
+berebijt
+bereby
+berechen
+berechenbare
+berechenbaren
+berechenbarer
+berechia
+berechiah
+berechne
+berechnen
+berechnend
+berechnende
+berechnenden
+berechnender
+berechnendes
+berechnet
+berechnete
+berechnetem
+berechneten
+berechneter
+berechnetes
+berechnetest
+berechnu
+berechnung
+berechnungen
+berechnungs
+berechnungsfa"lle
+berechnungsgrundlage
+berechnungsmaterial
+berechnungsmethode
+berechnungspreise
+berechnungsunterlagen
+berechnungsvorschriften
+berecht
+berechte
+berechten
+berechti
+berechtige
+berechtigen
+berechtigend
+berechtigendem
+berechtigenden
+berechtigender
+berechtigst
+berechtigt
+berechtigte
+berechtigten
+berechtigter
+berechtigtes
+berechtigtet
+berechtigung
+berechtigungen
+berechtigungsgrundlagen
+berechtigungsscheine
+berechtigungsscheinen
+berechtigungsscheines
+berechting
+berechtingen
+berechtt
+berechtte
+berechtten
+bered
+bereda
+beredd
+beredda
+beredder
+beredderd
+beredderde
+beredderden
+beredderen
+bereddering
+bereddert
+berede
+bereden
+beredend
+beredende
+beredendem
+beredenden
+beredendes
+beredene
+beredeneer
+beredeneerd
+beredeneerde
+beredeneerden
+beredeneerder
+beredeneerdst
+beredeneert
+beredenen
+beredeneren
+bereder
+beredest
+beredet
+beredete
+beredetem
+beredeten
+beredeter
+beredetest
+beredetet
+beredne
+berednin
+beredning
+beredningen
+bereds
+beredsam
+beredsamkeiten
+beredska
+beredskap
+beredskapslager
+beredskapslagre
+beredskapsmateriell
+beredskapsordningen
+beredskapsvakt
+beredt
+beredte
+beredtem
+beredter
+beredteres
+beredtes
+beredvil
+beredvillig
+bereed
+bereft
+beregado
+beregadougoutoumousseni
+beregen
+beregend
+beregende
+beregenden
+beregene
+beregenen
+beregent
+beregi
+beregn
+beregne
+beregned
+beregnede
+beregnen
+beregnende
+beregner
+beregnes
+beregnet
+beregnin
+beregning
+beregningen
+beregningene
+beregninger
+beregningerne
+beregnings
+beregningsarbeidet
+beregningsgrunnlaget
+beregningskrevende
+beregningsmessige
+beregningsmetode
+beregningsmetoden
+beregningsmetoder
+beregningsmodul
+beregningsnett
+beregningsnettet
+beregningsoppgave
+beregningsprocessen
+beregningspunktet
+beregningsteknisk
+beregningstid
+beregningstiden
+beregningsudstyr
+beregningsudtryk
+beregningsudtrykket
+beregond
+bereho
+berehof
+berehol
+berehole
+bereholen
+berehuid
+berehuiden
+bereich
+bereiche
+bereichen
+bereichern
+bereichernd
+bereichernde
+bereichernden
+bereichernder
+bereicherndes
+bereichert
+bereicherte
+bereichertem
+bereicherter
+bereichertes
+bereichertest
+bereicherung
+bereicherungen
+bereiches
+bereichs
+bereichsbegrenzung
+bereichsgrenzen
+bereichsmaximum
+bereichsminimum
+bereichsmitte
+bereichsu"berschreitung
+bereid
+bereidde
+bereidden
+bereide
+bereiden
+bereider
+bereidhe
+bereidheid
+bereidin
+bereiding
+bereidingen
+bereidingswijze
+bereidingswijzen
+bereids
+bereidst
+bereidt
+bereidva
+bereidvaardig
+bereidvaardige
+bereidvaardiger
+bereidvaardigheid
+bereidvaardigst
+bereidve
+bereidverklaring
+bereidverklaringen
+bereidwi
+bereidwillig
+bereidwillige
+bereidwilliger
+bereidwilligheid
+bereidwilligst
+bereifun
+bereifung
+bereifungen
+bereik
+bereikba
+bereikbaar
+bereikbare
+bereiken
+bereikin
+bereiking
+bereikt
+bereikte
+bereikten
+bereina
+bereinig
+bereinige
+bereinigen
+bereinigend
+bereinigendem
+bereinigenden
+bereinigender
+bereinigst
+bereinigt
+bereinigte
+bereinigten
+bereinigter
+bereinigtes
+bereinigtet
+bereinigung
+bereinigungsprozess
+bereis
+bereisd
+bereisde
+bereisden
+bereisder
+bereisdm
+bereisdmeest
+bereist
+bereiste
+bereisten
+bereit
+bereiten
+bereitend
+bereitende
+bereitenden
+bereitender
+bereitendes
+bereiter
+bereiterklaert
+bereites
+bereitest
+bereitet
+bereitetem
+bereiteten
+bereiteter
+bereitetest
+bereitetet
+bereitfi
+bereitfinden
+bereitge
+bereitgehalten
+bereitgehaltene
+bereitgehaltenem
+bereitgehaltener
+bereitgehaltenes
+bereitgelegt
+bereitgestellte
+bereitgestelltem
+bereitgestellten
+bereitgestelltes
+bereitha
+bereithaelt
+bereithalten
+bereithaltende
+bereithaltendem
+bereithaltenden
+bereithaltendes
+bereithaltung
+bereithi
+bereithielten
+bereitli
+bereitliegen
+bereits
+bereitsc
+bereitschaft
+bereitschaften
+bereitschaftsdienste
+bereitschaftsdiensten
+bereitschaftsdienstes
+bereitschaftsleiter
+bereitschaftsmassnahme
+bereitschaftsmeldungen
+bereitschaftspolizist
+bereitst
+bereitstand
+bereitstehen
+bereitstehende
+bereitstehenden
+bereitstellen
+bereitstellende
+bereitstellendem
+bereitstellenden
+bereitstellendes
+bereitstellt
+bereitstellung
+bereitstellungen
+bereitstellungsraeume
+bereitstuenden
+bereitun
+bereitungen
+bereitwi
+bereitwillig
+bereitwilligem
+bereitwilligen
+bereitwilliger
+bereitwilligerem
+bereitwilligeren
+bereitwilligerer
+bereitwilliges
+bereitwilligkeit
+bereitwilligkeiten
+bereitwilligste
+bereitwilligstem
+bereitwilligster
+bereitwilligstes
+bereitzu
+bereitzufinden
+bereitzustellen
+bereizen
+berejong
+berejongen
+berek
+bereken
+berekenb
+berekenbaar
+berekenbare
+berekend
+berekende
+berekenden
+berekender
+berekendst
+berekene
+berekenen
+berekeni
+berekening
+berekeningen
+berekeningsmethode
+berekeningswijzen
+berekent
+bereklau
+bereklauw
+bereklauwen
+berekne
+berekner
+bereknin
+berekning
+berekningsgrunnlag
+berekuil
+berekuilen
+berel
+bereleid
+bereleider
+bereleiders
+berembun
+beremuts
+beremutsen
+beren
+berenbac
+berenbach
+berend
+berende
+berenden
+berendey
+berendeya
+berengar
+berengaria
+berengarian
+berengarianism
+berengario
+berengel
+berengelite
+berenger
+berenice
+berenices
+berenike
+berenjena
+berenjenada
+berenjenado
+berenjenal
+berenjeni`n
+berennen
+berens
+berenson
+berent
+berenten
+berentte
+berentten
+berenz
+bereoor
+bereoren
+berepo
+beresa
+beresfor
+beresford
+bereshit
+bereshith
+beresite
+beresnik
+beresnikow
+berest
+beret
+beretnin
+beretning
+beretningen
+beretningene
+beretninger
+beretnings}ret
+berets
+beretta
+berettas
+berette
+beretter
+berettes
+berettet
+berettig
+berettiga
+berettige
+berettigede
+berettigelse
+berettigelsen
+berettiger
+berettiget
+bereue
+bereuen
+bereuend
+bereuendem
+bereuenden
+bereuender
+bereust
+bereut
+bereute
+bereuten
+bereuter
+bereutes
+bereutet
+berevang
+berevangst
+berevel
+berevell
+berevellen
+berewick
+bereya
+bereza
+berezovo
+berezovs
+berezovsky
+berg
+berga
+bergab
+bergacht
+bergachtig
+bergachtige
+bergachtiger
+bergachtigst
+bergada`n
+bergadana
+bergadano
+bergado
+bergaf
+bergafwa
+bergafwaarts
+bergalit
+bergalith
+bergama
+bergamas
+bergamasca
+bergamasco
+bergamask
+bergamio
+bergamiol
+bergamo
+bergamot
+bergamota
+bergamote
+bergamoto
+bergamotpeer
+bergamotperen
+bergamots
+bergamotten
+bergamt
+bergan
+bergande
+bergander
+bergante
+berganti`n
+bergantinejo
+bergapte
+bergaptene
+bergarbe
+bergarbeiter
+bergarbeiterdorf
+bergarbeiters
+bergarbeiterschaft
+bergarbeiterstreik
+bergart
+bergarte
+bergarten
+bergarter
+bergarti
+bergartillerie
+bergauf
+bergbach
+bergbad
+bergbahn
+bergbau
+bergbaua
+bergbauaktien
+bergbauanwendung
+bergbauausfu"hrung
+bergbauausru"stungen
+bergbaub
+bergbaubereich
+bergbaue
+bergbaueinsatz
+bergbauelektronik
+bergbauergebnis
+bergbauf
+bergbauforschung
+bergbaug
+bergbaugebiet
+bergbaugeha"use
+bergbaugerecht
+bergbaugesellschaft
+bergbaugesellschaften
+bergbauk
+bergbaukomponenten
+bergbaul
+bergbaulichem
+bergbaulichen
+bergbaum
+bergbaumeinung
+bergbaun
+bergbaunachwuchs
+bergbaup
+bergbaupraemien
+bergbauprodukte
+bergbaus
+bergbauspezifischer
+bergbaustecker
+bergbaut
+bergbautarife
+bergbautaugliche
+bergbautauglichen
+bergbautauglicher
+bergbautechnik
+bergbautechnisch
+bergbautechnischen
+bergbautechnologie
+bergbauten
+bergbauv
+bergbauversion
+bergbauz
+bergbauzulieferer
+bergbauzwecke
+bergbeho
+bergbeho"rde
+bergbekl
+bergbeklimming
+bergbeklimmingen
+bergbest
+bergbesteigung
+bergbesteigungen
+bergbewo
+bergbewohner
+bergbewohnerinnen
+bergbewohnern
+bergbewohners
+bergbewoner
+bergbewoners
+bergblau
+bergblauw
+bergcult
+bergculture
+bergcultures
+bergdama
+bergdamara
+bergdorf
+berge
+berge`re
+berge`res
+bergebra
+bergebragd
+bergeend
+bergeenden
+bergelmi
+bergelmir
+bergel|n
+bergel|nn
+bergel|nna
+bergel|nnen
+bergen
+bergende
+bergenfi
+bergenfield
+bergengt
+bergengte
+bergengten
+bergengtes
+bergens
+bergensb
+bergensbanen
+bergensbanens
+bergense
+bergenser
+bergenseren
+bergenserinne
+bergenserne
+bergensh
+bergenshallen
+bergenshalv|ens
+bergensk
+bergenske
+bergensr
+bergensregionen
+berger
+bergerac
+bergere
+bergeres
+bergerie
+bergeries
+bergeron
+bergeronnette
+bergeronnettes
+bergers
+berges
+bergese
+bergeson
+berget
+bergewei
+bergeweise
+bergfeld
+bergflet
+bergflette
+bergfolk
+bergfru
+bergfrue
+bergfueh
+bergfuehrer
+bergfuehrern
+bergfuehrers
+berggast
+berggasthof
+berggees
+berggeest
+berggeesten
+berggeit
+berggeiten
+berggela
+berggelaende
+berggeld
+berggelden
+berggesc
+berggeschut
+berggewe
+berggewerkschaft
+berggezi
+berggezicht
+berggezichten
+berggipf
+berggipfel
+berggren
+berggroe
+berggroen
+berggylt
+berggylte
+bergh
+berghaan
+berghe
+bergheim
+berghell
+berghelling
+berghellingen
+berghof
+bergholz
+berghote
+berghotel
+berghout
+berghouten
+berghuet
+berghuette
+bergians
+bergianska
+bergigen
+bergijs
+bergil
+bergin
+berging
+berginga
+berginge
+bergingen
+bergingeni|r
+bergings
+bergingsbedrijf
+bergingsbedrijven
+bergingsb}ten
+bergingsfart|y
+bergingsfart|ys
+bergingsl|nn
+bergingsl|nnen
+bergingsmaatschappij
+bergingsmaatschappijen
+bergingsvaartuig
+bergingsvaartuigen
+berginiz
+berginization
+berginize
+bergisch
+bergischen
+bergish
+bergit
+bergitta
+bergius
+bergjage
+bergjager
+bergjagers
+bergkalk
+bergkam
+bergkamm
+bergkammen
+bergkete
+bergketel
+bergketels
+bergketen
+bergketens
+bergkett
+bergkette
+bergketten
+bergklim
+bergklimaat
+bergkloo
+bergkloof
+bergklov
+bergkloven
+bergknoo
+bergknoop
+bergknop
+bergknopen
+bergkran
+bergkrankheit
+bergkris
+bergkristal
+bergkristall
+bergkristalle
+bergkristallen
+bergkrys
+bergkrystall
+bergland
+berglend
+berglendt
+bergler
+berglet
+bergleut
+bergleute
+bergleuten
+berglift
+berglone
+berglonen
+bergloon
+bergluch
+berglucht
+berglund
+bergmaen
+bergmaenner
+bergmaennern
+bergman
+bergmann
+bergmannpohl
+bergmannsbetreuung
+bergmannsglueck
+bergmannsloehne
+bergmans
+bergmar
+bergmass
+bergmassief
+bergmassieven
+bergmeer
+bergmere
+bergmeren
+bergnebb
+bergnebbe
+bergner
+bergneus
+bergneustadt
+bergnimf
+bergnimfen
+bergnot
+bergoo
+bergop
+bergopwa
+bergopwaarts
+bergot
+bergpad
+bergpade
+bergpaden
+bergpas
+bergpass
+bergpassen
+bergpens
+bergpension
+bergplaa
+bergplaats
+bergplaatsen
+bergpred
+bergpredigten
+bergprek
+bergprekenen
+bergquam
+bergquis
+bergquist
+bergrett
+bergrettungsaktion
+bergrettungsdienst
+bergrivi
+bergrivier
+bergrivieren
+bergrug
+bergrugg
+bergruggen
+bergruim
+bergruimte
+bergruimten
+bergruimtes
+bergruts
+bergrutsch
+bergrutsche
+bergrutschen
+bergrygg
+bergs
+bergscho
+bergschoen
+bergschoenen
+bergschr
+bergschrund
+bergschu
+bergschuh
+bergschuhe
+bergschuhen
+bergschule
+bergschuren
+bergschuur
+bergsma
+bergson
+bergsoni
+bergsonian
+bergsonism
+bergspit
+bergspitze
+bergspoo
+bergspoor
+bergspoorweg
+bergspoorwegen
+bergspor
+bergsporen
+bergsport
+bergstae
+bergstaemme
+bergstat
+bergstationen
+bergstei
+bergsteigerdrama
+bergsteigerei
+bergsteigerin
+bergsteigern
+bergsteigers
+bergsten
+bergstok
+bergstokken
+bergstor
+bergstorting
+bergstortingen
+bergstre
+bergstreek
+bergstreken
+bergstrm
+bergstrm-am1
+bergstro
+bergstroem
+bergstrom
+bergstromen
+bergstroom
+bergstur
+bergsturz
+bergsugg
+bergsugge
+bergt
+bergton
+bergtop
+bergtopp
+bergtoppen
+bergunge
+bergungen
+bergungs
+bergungsaktion
+bergungsaktionen
+bergungsarbeiten
+bergungsexperten
+bergungsflotte
+bergungskapitaen
+bergungskommando
+bergungsmanoever
+bergungsschiff
+bergungsversuch
+bergungsversuche
+bergut
+bergverk
+bergverket
+bergverks
+bergwach
+bergwacht
+bergwael
+bergwaelder
+bergwall
+bergwand
+bergwanden
+bergwanderung
+bergweid
+bergweide
+bergweiden
+bergwerf
+bergwerff
+bergwerk
+bergwerke
+bergwerken
+bergwerksbesitz
+bergwerksbetriebe
+bergwerksgerechte
+bergwerksgesellschaft
+bergwerksleitung
+bergwerksmesse
+bergwerksunglueck
+bergwerksunternehmen
+bergwerksverein
+bergwind
+bergwinden
+bergy
+bergylt
+bergziek
+bergziekte
+bergzout
+berhane
+berhanu
+berhaus
+berhyme
+berhymed
+berhymes
+beri
+beri-zu
+beriaa
+beriah
+beriault
+beriband
+beribanded
+beribbon
+beribboned
+beriberi
+beriberic
+beriberilijder
+beriberilijders
+beriberis
+bericht
+berichte
+berichten
+berichtend
+berichtendem
+berichtenden
+berichtender
+berichtendienst
+berichterstattern
+berichterstatters
+berichterstattung
+berichtes
+berichtest
+berichtet
+berichtete
+berichteten
+berichteter
+berichtetes
+berichtetet
+berichtg
+berichtgeefster
+berichtgeefsters
+berichtgever
+berichtgevers
+berichtgeving
+berichti
+berichtige
+berichtigen
+berichtigende
+berichtigendem
+berichtigenden
+berichtigendes
+berichtigst
+berichtigt
+berichtigte
+berichtigtem
+berichtigten
+berichtigter
+berichtigtest
+berichtigtet
+berichtigung
+berichtigungen
+berichtigungsbuchungen
+berichtigungsfaehige
+berichts
+berichtsbaende
+berichtsheft
+berichtskritik
+berichtszeitraum
+berichtt
+berichtte
+berichtten
+berick
+beridder
+beridderd
+beridderde
+beridderden
+beridderen
+beriddert
+beride
+beried
+berieden
+beriefen
+beriefet
+beriefst
+beriemun
+beriemung
+beriep
+beriepen
+beriesel
+berieselt
+berieselung
+beriet
+berieten
+berietet
+berigora
+beriites
+berijd
+berijdba
+berijdbaar
+berijdbare
+berijden
+berijder
+berijders
+berijdst
+berijdster
+berijdsters
+berijdt
+berijm
+berijmd
+berijmde
+berijmden
+berijmen
+berijmer
+berijmers
+berijmin
+berijming
+berijmingen
+berijmt
+berijpt
+berijpte
+berik
+berika
+berike
+berikels
+berikelse
+beriker
+beriket
+beriktig
+beriktige
+beriktiget
+beril
+berilio
+berillen
+berilo
+berin
+bering
+beringd
+beringde
+beringden
+beringed
+beringen
+beringer
+beringit
+beringite
+beringle
+beringleted
+beringov
+beringst
+beringstrasse
+beringstredet
+beringt
+beringu
+berinnen
+berinse
+berisp
+berispel
+berispelijk
+berispelijke
+berispelijker
+berispelijkst
+berispen
+berispin
+berisping
+berispingen
+berispt
+berispte
+berispten
+berit
+beritense
+berites
+berith
+beritten
+berittene
+berittener
+beriya
+berizu
+berjaya
+berk
+berka
+berke
+berkebas
+berkebast
+berkebla
+berkeblad
+berkebladeren
+berkeblaren
+berkebom
+berkebomen
+berkeboo
+berkeboom
+berkehou
+berkehout
+berkehouten
+berkel
+berkelei
+berkeleian
+berkeleianism
+berkeley
+berkeleyheights
+berkeleyism
+berkeleyite
+berkeleysprings
+berkeliu
+berkelium
+berkeliumet
+berkeloo
+berkeloof
+berkemei
+berkemeier
+berkemeiers
+berken
+berkenbo
+berkenbos
+berkenbossen
+berkerij
+berkerijs
+berkerijzen
+berkerley
+berkes
+berketee
+berketeer
+berkevli
+berkevlinder
+berkevlinders
+berkewat
+berkewater
+berkewij
+berkewijn
+berkey
+berkezwa
+berkezwam
+berkezwammen
+berkhart
+berkie
+berkley
+berkliks
+berklix
+berkly
+berkner
+berknet
+berkoen
+berkoene
+berkoenen
+berkoff
+berkovet
+berkovets
+berkow
+berkowit
+berkowitz
+berkshir
+berkshire
+berkson
+berksons
+berktay
+berky
+berlandina
+berlands
+berlandson
+berlanga
+berle
+berlean
+berleand
+berley
+berlin
+berlin	
+berlin-a
+berlin-asims
+berlin-b
+berlin-blockade
+berlin-i
+berlin-ignet
+berlin-k
+berlin-klausel
+berlin-m
+berlin-mil-tac
+berlina
+berlince
+berlincenter
+berline
+berline`s
+berliner
+berlinerin
+berlinern
+berlinerne
+berliners
+berlines
+berlinesa
+berlinese
+berlinfo
+berlinfoerderungsgesetz
+berling
+berlinga
+berlingar
+berlinge
+berlinger
+berlingh
+berlingheri
+berlingo
+berlingot
+berlingots
+berlingske
+berlinhe
+berlinheights
+berlinis
+berlinische
+berlinit
+berlinite
+berliniz
+berlinize
+berlins
+berlinsk
+berlinski
+berlinsky
+berlinve
+berlinverhandlungen
+berlinwa
+berlinwall
+berlios
+berlioz
+berlitz
+berlitzm
+berlitzmethode
+berlitzs
+berlitzscholen
+berlitzschool
+berlo
+berloque
+berlue
+berm
+berma
+berman
+bermde
+bermden
+berme
+bermeja
+bermejal
+bermejear
+bermejecer
+bermejenca
+bermejenco
+bermejez
+bermeji`a
+bermejiza
+bermejizo
+bermejo
+bermejo`n
+bermejona
+bermejor
+bermejuela
+bermejuelo
+bermejura
+bermel
+bermello`n
+bermen
+bermingh
+bermingham
+bermlamp
+bermlampen
+berms
+bermsloo
+bermsloot
+bermslot
+bermsloten
+bermuda
+bermuda-
+bermuda-konferenz
+bermudas
+bermudashorts
+bermudez
+bermudia
+bermudian
+bermudians
+bermudina
+bermudit
+bermudite
+bern
+berna
+bernaard
+bernabe
+bernaden
+bernadene
+bernadet
+bernadette
+bernadin
+bernadina
+bernadine
+bernadot
+bernadotte
+bernaido
+bernaien
+bernaient
+bernais
+bernaise
+bernait
+bernajou
+bernajoux
+bernalil
+bernalillo
+bernall
+bernant
+bernard
+bernard-
+bernard-l'ermite
+bernarda
+bernarde
+bernardi
+bernardijn
+bernardijnen
+bernardin
+bernardina
+bernardine
+bernardino
+bernardo
+bernards
+bernardshond
+bernardshonden
+bernardston
+bernardsville
+bernarr
+bernart
+bernasco
+bernasconi
+bernath
+bernay
+bernbeil
+bernd
+berndle
+berndt
+berne
+berne'
+berne'e
+berne'es
+berne's
+berne`re
+berne`rent
+berne`s
+berneche
+bernegal
+bernelle
+bernent
+berner
+bernera
+bernerai
+berneraient
+bernerais
+bernerait
+berneras
+bernerd
+bernerez
+bernerie
+berneriez
+bernerio
+bernerions
+bernerna
+bernernabe
+berneron
+bernerons
+berneront
+bernes
+bernesa
+bernesde
+bernesdell
+bernese
+bernet
+berneta
+bernete
+bernetta
+bernette
+bernez
+bernhard
+bernhardiner
+bernhardsbay
+bernhardsen
+bernhardt
+bernhardy
+bernheim
+bernholt
+bernholtz
+berni
+bernia
+bernice
+bernicia
+bernick
+bernicle
+bernie
+berniece
+bernier
+berniez
+bernines
+berninesque
+berning
+bernini
+bernio
+bernions
+bernique
+berniques
+bernita
+berniz
+bernle
+bernly
+berno
+bernofsk
+bernofsky
+bernons
+bernosky
+bernoull
+bernoulli
+bernoullian
+bernoullis
+berns
+bernsen
+bernstei
+bernstein
+bernt
+bernth
+bernvill
+bernville
+berny
+bero
+berobed
+berobero
+berodach
+berodachbaladan
+berodde
+beroe
+beroem
+beroemd
+beroemda
+beroemde
+beroemden
+beroemder
+beroemdh
+beroemdheden
+beroemdheid
+beroemds
+beroemdst
+beroemen
+beroemma
+beroemt
+beroende
+beroep
+beroepen
+beroepene
+beroepenen
+beroepin
+beroeping
+beroepingen
+beroepsb
+beroepsbezigheden
+beroepsbezigheid
+beroepsbrief
+beroepsbrieven
+beroepsd
+beroepsdanser
+beroepsdanseres
+beroepsdanseressen
+beroepsdansers
+beroepsg
+beroepsgeheim
+beroepsgeheimen
+beroepsh
+beroepshalve
+beroepshof
+beroepshoven
+beroepsk
+beroepskeuze
+beroepskleding
+beroepsl
+beroepsleger
+beroepslegers
+beroepsm
+beroepsmisdadiger
+beroepsmisdadigers
+beroepso
+beroepsofficier
+beroepsofficieren
+beroepsonderwijs
+beroepsorganisatie
+beroepsorganisaties
+beroepsp
+beroepsplicht
+beroepsplichten
+beroepsr
+beroepsraad
+beroepsraden
+beroepsrenner
+beroepsrenners
+beroepsrijder
+beroepsrijders
+beroepss
+beroepsscholen
+beroepsschool
+beroepsspeler
+beroepsspelers
+beroepsv
+beroepsvorming
+beroepsw
+beroepswerkeloze
+beroepswerkelozen
+beroepswerkloze
+beroepswerklozen
+beroepswerkzaamheden
+beroepswerkzaamheid
+beroepsz
+beroepszanger
+beroepszangeres
+beroepszangeressen
+beroepszangers
+beroepsziekte
+beroepsziekten
+beroepsziektes
+beroept
+beroer
+beroera
+beroerd
+beroerda
+beroerde
+beroerden
+beroerder
+beroerdh
+beroerdheden
+beroerdheid
+beroerdi
+beroerdigheden
+beroerdigheid
+beroerds
+beroerdst
+beroeren
+beroerin
+beroering
+beroeringen
+beroerli
+beroerling
+beroerlingen
+beroert
+beroerte
+beroerten
+beroertes
+beroida
+beroidae
+beroken
+berokene
+berokenen
+berokken
+berokkend
+berokkende
+berokkenden
+berokkenen
+berokkent
+beroliga
+berolige
+beroligende
+beroliger
+beroliget
+berolina
+beroll
+berom
+beromd
+beromda
+beromma
+berommig
+berommigili
+beronk
+beroof
+beroofd
+beroofde
+beroofden
+berooft
+berooid
+berooide
+berooider
+berooidh
+berooidheid
+berooids
+berooidst
+berook
+berookt
+berookte
+berookten
+berooriz
+beror
+berora
+berord
+berorda
+berossos
+berothah
+berothai
+berothit
+berothite
+berott
+berouged
+beroun
+beround
+berouw
+berouwd
+berouwde
+berouwden
+berouwen
+berouwhe
+berouwhebbend
+berouwhebbende
+berouwt
+berouwvo
+berouwvol
+berouwvolle
+berouwvoller
+berouwvolst
+berova
+beroven
+beroving
+berovingen
+berozo
+berpe
+berquist
+berr
+berra
+berra\a
+berraza
+berrbein
+berrbeint
+berrear
+berrell
+berrenchi`n
+berrenda
+berrendearse
+berrendo
+berreo`n
+berreona
+berrera
+berresfo
+berresford
+berret
+berretta
+berrettas
+berretti
+berretto
+berretty
+berreyes
+berreyesa
+berrf|tt
+berri
+berri`n
+berriam
+berrichi
+berricho
+berrichon
+berridge
+berrido
+berrie
+berried
+berrienc
+berriencenter
+berriens
+berriensprings
+berrier
+berries
+berrigan
+berrik
+berrin
+berrinche
+berringe
+berringen
+berringt
+berrington
+berrios
+berrisfo
+berrisford
+berro
+berrocal
+berroque\a
+berrueco
+berrugat
+berrugate
+berrutti
+berry
+berrybus
+berrybush
+berrycre
+berrycreek
+berryess
+berryesseen
+berryhil
+berryhill
+berrying
+berryles
+berryless
+berrylik
+berrylike
+berryman
+berrypic
+berrypicker
+berrypicking
+berrysbu
+berrysburg
+berryton
+berryvil
+berryville
+berrywhi
+berrywhiff
+bersa
+bersaa
+bersagli
+bersagliere
+bersaglio
+bersatu
+berseem
+berserk
+berserke
+berserken
+berserker
+berserkerwizard
+berserki
+berserking
+berserko
+berserkosurrealist
+berserks
+berserksgangen
+bersi
+bersiami
+bersiamite
+bersil
+berson
+bersonin
+berst
+berste
+bersten
+berstend
+berstendem
+berstenden
+berstender
+berstest
+berstet
+berstete
+bersteter
+berstetes
+berstetest
+berstte
+berstten
+bers{rker
+bers{rkere
+bers{rkeren
+bers{rkergang
+bers}
+bert
+berta
+bertalan
+bertani
+bertat
+berte
+berteau
+bertelsm
+bertelsmann
+bertensh
+bertenshaw
+berteroa
+berth
+bertha
+berthage
+berthale
+berthalet
+berthas
+berthe
+bertheau
+berthed
+berthele
+berthelet
+berthelo
+bertheloot
+berthelot
+berthels
+berther
+berthier
+berthierite
+berthing
+bertho
+berthoin
+berthold
+bertholda
+bertholl
+bertholletia
+bertholt
+berthoud
+berths
+berti
+bertie
+bertier
+bertigno
+bertignoll
+bertil
+bertille
+bertin
+bertina
+bertinck
+bertine
+bertini
+bertino
+bertish
+bertley
+berto
+bertoldo
+bertolin
+bertolini
+bertolon
+bertolonia
+berton
+bertone
+bertoni
+bertoua
+bertram
+bertran
+bertrand
+bertrande
+bertrandite
+bertrando
+bertril
+bertrum
+berty
+beru
+beru"cks
+beru"cksichtigen
+beru"cksichtigt
+beru"cksichtigung
+beru"cksichtung
+beru"hre
+beru"hren
+beru"hrt
+beru"hru
+beru"hrung
+beru"hrungspunkte
+berube
+berubett
+berucht
+beruchte
+beruchter
+beruchth
+beruchtheid
+beruchts
+beruchtst
+beruechs
+beruechsichtigtes
+beruecht
+beruechtigste
+beruechtigsten
+beruechtigster
+beruechtigstes
+beruechtigte
+beruechtigtem
+beruechtigten
+beruechtigtere
+beruechtigterem
+beruechtigteren
+beruechtigteres
+beruechtigtes
+beruechtigtste
+beruechtigtster
+beruechtigtstes
+beruecks
+beruecksichtige
+beruecksichtigend
+beruecksichtigende
+beruecksichtigendem
+beruecksichtigender
+beruecksichtigendes
+beruecksichtigst
+beruecksichtigte
+beruecksichtigtem
+beruecksichtigten
+beruecksichtigtest
+beruecksichtigtet
+beruecksichtigung
+beruecksichtigungen
+beruehmt
+beruehmtem
+beruehmten
+beruehmter
+beruehmterem
+beruehmteren
+beruehmterer
+beruehmtes
+beruehmteste
+beruehmtestem
+beruehmtester
+beruehmtestes
+beruehmtheit
+beruehre
+beruehrend
+beruehrende
+beruehrendem
+beruehrender
+beruehrendes
+beruehrs
+beruehrst
+beruehrt
+beruehrte
+beruehrtem
+beruehrten
+beruehrtes
+beruehrtest
+beruehrtet
+beruehru
+beruehrung
+beruehrungen
+beruehrungsflaechen
+beruehrungslinie
+beruehrungslinien
+beruehrungspunkte
+beruehrungspunkten
+beruehrungspunktes
+beruf
+berufber
+berufberatungen
+berufbil
+berufbildungszentrum
+berufen
+berufend
+berufende
+berufenden
+berufender
+berufendes
+berufene
+berufenem
+berufenen
+berufener
+berufera
+beruferaten
+berufes
+beruffed
+beruffle
+beruffled
+beruflic
+beruflich
+berufliche
+beruflichem
+beruflichen
+berufliches
+berufoff
+berufoffiziere
+berufsan
+berufsanfaenger
+berufsangabe
+berufsau
+berufsausbildungen
+berufsausuebung
+berufsbe
+berufsbegleitend
+berufsbegleitenden
+berufsbekleidung
+berufsbekleidungen
+berufsberater
+berufsberaterin
+berufsberatung
+berufsbezogenen
+berufsbi
+berufsbild
+berufsbildung
+berufsbildungsgesetz
+berufsbo
+berufsboxen
+berufsboxern
+berufsboxers
+berufser
+berufserfahrenen
+berufserfolg
+berufsfa
+berufsfachschule
+berufsfahrer
+berufsfl
+berufsflugzeugfuehrer
+berufsfo
+berufsforschung
+berufsfortbildung
+berufsfr
+berufsfremd
+berufsge
+berufsgeheimnis
+berufsgenossenschaft
+berufsgr
+berufsgruenden
+berufsgrundbildungsjahr
+berufsgruppe
+berufsgruppen
+berufsin
+berufsinstanz
+berufsja
+berufsjahre
+berufsju
+berufsjubilaeum
+berufskl
+berufskleidung
+berufskr
+berufskrankheit
+berufskrankheiten
+berufsku
+berufskunde
+berufsla
+berufslaufbahn
+berufsle
+berufsleben
+berufsli
+berufsliste
+berufslo
+berufslos
+berufsmu
+berufsmusikern
+berufsno
+berufsnotwendigen
+berufsof
+berufsoffizier
+berufsoffiziers
+berufsor
+berufsordnung
+berufsorganisation
+berufspr
+berufspraktikum
+berufsra
+berufsradfahrer
+berufsre
+berufsreife
+berufsri
+berufsrisiko
+berufssc
+berufsschichten
+berufsschule
+berufssp
+berufsspieler
+berufsspielern
+berufsspielers
+berufssportlers
+berufsst
+berufsstand
+berufst
+berufsta
+berufstaetig
+berufstaetigem
+berufstaetigen
+berufstaetiger
+berufste
+berufstechnische
+berufstennis
+berufsun
+berufsunfaehigkeit
+berufsunfaelle
+berufsve
+berufsverbaende
+berufsverband
+berufsverbot
+berufsvereinigungen
+berufsverkehr
+berufsverkehrs
+berufsvertretungen
+berufsvo
+berufsvorschulen
+berufswa
+berufswahl
+berufswe
+berufswelt
+berufsze
+berufszeichen
+berufszi
+berufsziel
+berufszw
+berufszweiges
+beruft
+berufuas
+berufung
+berufungen
+berufungsgerichte
+berufungsgerichten
+berufungsgerichtes
+berufungsinstanzen
+berufungslisten
+berufungspraktiken
+berufungsrecht
+berufungsrechte
+berufungsrechten
+berufungsverfahren
+berufungsvorschlaege
+berugen
+berugi
+beruhen
+beruhend
+beruhende
+beruhenden
+beruhender
+beruhendes
+beruhige
+beruhigen
+beruhigend
+beruhigende
+beruhigenden
+beruhigender
+beruhigendes
+beruhigt
+beruhigte
+beruhigtem
+beruhigter
+beruhigtes
+beruhigtest
+beruhigu
+beruhigung
+beruhigungsmittel
+beruhigungsmitteln
+beruhigungsmittels
+beruhigungspillen
+beruhigungstabletten
+beruhst
+beruht
+beruhte
+beruhten
+beruhter
+beruhtes
+beruhtet
+beruik
+beruiken
+beruikt
+beruit
+berum
+berumbit
+berumbita
+berun
+berurin
+berusaiy
+beruse
+berusede
+berusend
+berusende
+beruset
+berust
+beruste
+berusten
+berustin
+berusting
+berustte
+berustten
+beruthie
+beruthiel
+beruto
+berval
+bervete
+bervie
+bervil
+berwick
+berwin
+berwind
+berwyn
+bery
+berycid
+berycida
+berycidae
+berycifo
+beryciform
+berycine
+berycoid
+berycoidea
+berycoidean
+berycoidei
+berycomo
+berycomorphi
+berykta
+beryktad
+berykted
+beryktede
+beryktet
+beryl
+berylate
+beryle
+beryline
+beryll
+beryllen
+beryllia
+beryllin
+berylline
+beryllio
+berylliosis
+berylliu
+beryllium
+berylliumet
+berylloi
+berylloid
+beryllon
+beryllonate
+beryllonite
+beryllos
+beryllosis
+beryls
+berylune
+berytida
+berytidae
+beryx
+berza
+berzal
+berzelia
+berzelianite
+berzelii
+berzeliite
+berzerke
+berzerkeley
+ber{kna
+ber{knin
+ber{kning
+ber{tta
+ber{ttig
+ber{ttiga
+ber|m
+ber|md
+ber|mda
+ber|mma
+ber|mme
+ber|mmel
+ber|mmelig
+ber|mmelige
+ber|mmelse
+ber|mmelsens
+ber|mmer
+ber|mmes
+ber|mmet
+ber|mt
+ber|mte
+ber|mthe
+ber|mthet
+ber|r
+ber|ra
+ber|rd
+ber|rda
+ber|re
+ber|rer
+ber|res
+ber|ring
+ber|ringsassosiasjon
+ber|ringsflader
+ber|ringsflater
+ber|ringspunkt
+ber|ringspunkter
+ber|ringspunktet
+ber|rt
+ber|rte
+ber|rtes
+ber|ve
+ber|vels
+ber|velse
+ber|ves
+ber|vet
+ber}
+ber}d
+ber}dde
+bes
+besa
+besace
+besaces
+besad
+besaenft
+besaenftigen
+besaenftigend
+besaenftigende
+besaenftigenden
+besaenftigender
+besaenftigendes
+besaenftigt
+besaenftigte
+besaenftigtem
+besaenftigter
+besaenftigtes
+besaenftigtest
+besaenftigungen
+besaesse
+besaessen
+besaetta
+besaetts
+besaetze
+besaetzen
+besaeufs
+besaeufst
+besaeuft
+besagen
+besagend
+besagende
+besagenden
+besagender
+besagendes
+besagne
+besagt
+besagte
+besagtem
+besagten
+besagter
+besagtes
+besagtest
+besah
+besai
+besaiel
+besaint
+besaite
+besaiten
+besaitende
+besaitenden
+besaitender
+besaites
+besaitest
+besaitet
+besaitete
+besaiteten
+besaiteter
+besaitetes
+besalamano
+besali
+besamanos
+besamela
+besan
+besana
+besancti
+besanctify
+besann
+besant
+besante
+besar
+besass
+besassen
+besasses
+besassest
+besasset
+besatt
+besatta
+besatte
+besatts
+besatzer
+besatzes
+besatzun
+besatzung
+besatzungsangehoerigen
+besatzungsbehoerden
+besatzungsetat
+besatzungsfremden
+besatzungsma"chte
+besatzungsmacht
+besatzungsmaechte
+besatzungsmaechten
+besatzungspersonal
+besatzungsrecht
+besatzungssoldat
+besatzungstruppen
+besatzungszeit
+besatzungszone
+besauce
+besaufe
+besaufen
+besaufend
+besaufende
+besaufendem
+besaufender
+besaufendes
+besaught
+besaus
+besausen
+besaust
+besauste
+besausten
+besaya
+besbas
+bescab
+bescarf
+bescatte
+bescatter
+bescbeis
+bescbeischlaf
+bescent
+besch
+bescha"d
+bescha"digt
+bescha"digte
+bescha"digten
+bescha"digter
+bescha"digung
+bescha"digungen
+bescha"f
+bescha"ftige
+bescha"ftigen
+bescha"ftigt
+bescha"ftigte
+bescha"ftigung
+bescha"ftigungszahl
+beschaaf
+beschaafd
+beschaafde
+beschaafden
+beschaafder
+beschaafdheid
+beschaafdst
+beschaaft
+beschaam
+beschaamd
+beschaamde
+beschaamden
+beschaamder
+beschaamdheid
+beschaamdst
+beschaamt
+beschadi
+beschadig
+beschadigd
+beschadigde
+beschadigden
+beschadigen
+beschadiging
+beschadigingen
+beschadigt
+beschadu
+beschaduw
+beschaduwd
+beschaduwde
+beschaduwden
+beschaduwen
+beschaduwt
+beschaed
+beschaedigen
+beschaedigend
+beschaedigende
+beschaedigenden
+beschaedigender
+beschaedigendes
+beschaedigt
+beschaedigte
+beschaedigtem
+beschaedigter
+beschaedigtes
+beschaedigtest
+beschaedigung
+beschaedigungen
+beschaef
+beschaeftige
+beschaeftigen
+beschaeftigend
+beschaeftigendem
+beschaeftigenden
+beschaeftigender
+beschaeftigst
+beschaeftigt
+beschaeftigte
+beschaeftigtem
+beschaeftigtes
+beschaeftigtest
+beschaeftigtet
+beschaeftigung
+beschaeftigungen
+beschaeftigungsdauer
+beschaeftigungslose
+beschaeftigungslosem
+beschaeftigungslosen
+beschaeftigungsloses
+beschaeftigungslosigkeit
+beschaeftigungsmoeglichkeiten
+beschaeftigungsniveau
+beschaeftigungsprogrammen
+beschaeftigungsquote
+beschaeftigungsrueckgang
+beschaeftigungszahlen
+beschaem
+beschaeme
+beschaemen
+beschaemende
+beschaemendem
+beschaemenden
+beschaemendes
+beschaemst
+beschaemt
+beschaemtem
+beschaemten
+beschaemter
+beschaemtest
+beschaemtet
+beschaemung
+beschaemungen
+beschaff
+beschaffbar
+beschaffe
+beschaffen
+beschaffend
+beschaffende
+beschaffendem
+beschaffender
+beschaffendes
+beschaffene
+beschaffenen
+beschaffener
+beschaffenes
+beschaffenheit
+beschafft
+beschaffte
+beschafften
+beschafftet
+beschaffung
+beschaffungen
+beschaffungsprogramm
+beschaffungsstelle
+beschaffungsverfahrens
+beschall
+beschalltest
+beschalt
+beschalten
+beschaltet
+beschaltete
+beschalteten
+beschaltung
+beschame
+beschamen
+beschami
+beschaming
+beschans
+beschansen
+beschanst
+beschanste
+beschansten
+beschatt
+beschatte
+beschatten
+beschattende
+beschattendem
+beschattenden
+beschattendes
+beschattest
+beschattet
+beschattetem
+beschatteten
+beschatteter
+beschattetest
+beschattetet
+beschattung
+beschattungen
+beschaue
+beschauend
+beschauende
+beschauendem
+beschauender
+beschauendes
+beschaul
+beschaulich
+beschaulichem
+beschaulichen
+beschaulicher
+beschaulicherem
+beschaulicheren
+beschaulicherer
+beschauliches
+beschaulichkeit
+beschaulichkeiten
+beschaulichste
+beschaulichstem
+beschaulichster
+beschaulichstes
+beschaus
+beschaust
+beschaut
+beschaute
+beschautem
+beschauten
+beschautes
+beschautest
+beschautet
+beschave
+beschaven
+beschavi
+beschaving
+beschavingen
+beschavingsgeschiedenis
+beschavingspeil
+bescheen
+bescheet
+bescheid
+bescheidde
+bescheidden
+bescheiden
+bescheidene
+bescheidenem
+bescheidenen
+bescheidener
+bescheidenere
+bescheidenerem
+bescheideneren
+bescheideneres
+bescheidenes
+bescheidenheid
+bescheidenheit
+bescheidenlijk
+bescheidenst
+bescheidenste
+bescheidensten
+bescheidenster
+bescheidenstes
+bescheides
+bescheidt
+bescheidung
+beschein
+bescheinigen
+bescheinigend
+bescheinigende
+bescheinigenden
+bescheinigender
+bescheinigendes
+bescheinigt
+bescheinigte
+bescheinigtem
+bescheinigter
+bescheinigtes
+bescheinigtest
+bescheinigungen
+bescheint
+beschene
+beschenen
+beschenene
+beschenenen
+beschenk
+beschenke
+beschenken
+beschenkende
+beschenkenden
+beschenkender
+beschenkst
+beschenkt
+beschenkte
+beschenkten
+beschenkter
+beschenktes
+beschenktet
+beschere
+bescheren
+bescherende
+bescherendem
+bescherenden
+bescherendes
+bescherm
+beschermbeeld
+beschermbeelden
+beschermd
+beschermde
+beschermden
+beschermeling
+beschermelinge
+beschermelingen
+beschermen
+beschermengel
+beschermengelen
+beschermer
+beschermers
+beschermgeest
+beschermgeesten
+beschermgod
+beschermgoden
+beschermgodin
+beschermgodinnen
+beschermheer
+beschermheilige
+beschermheiligen
+beschermheren
+bescherming
+beschermingen
+beschermster
+beschermsters
+beschermt
+beschermvrouw
+beschermvrouwe
+beschermvrouwen
+beschers
+bescherst
+beschert
+beschertem
+bescherten
+bescherter
+beschertest
+beschertet
+bescheru
+bescherung
+beschete
+bescheten
+beschetene
+beschetenen
+bescheue
+bescheuert
+beschich
+beschichtete
+beschichteten
+beschichtung
+beschichtungen
+beschied
+beschieden
+beschiedene
+beschies
+beschiesse
+beschiessend
+beschiessende
+beschiessendem
+beschiessender
+beschiessendes
+beschiessest
+beschiessung
+beschiessungen
+beschiet
+beschieten
+beschieting
+beschietingen
+beschijn
+beschijnen
+beschijnt
+beschijt
+beschijten
+beschik
+beschika
+beschikal
+beschikallen
+beschikb
+beschikbaar
+beschikbaarheid
+beschikbare
+beschikk
+beschikken
+beschikker
+beschikkers
+beschikking
+beschikkingen
+beschikkingsrecht
+beschikt
+beschikte
+beschikten
+beschild
+beschilder
+beschilderd
+beschilderde
+beschilderden
+beschilderen
+beschildering
+beschilderingen
+beschildert
+beschimm
+beschimmel
+beschimmeld
+beschimmelde
+beschimmelden
+beschimmelen
+beschimmelt
+beschimp
+beschimpen
+beschimpfe
+beschimpfen
+beschimpfend
+beschimpfendem
+beschimpfenden
+beschimpfender
+beschimpfst
+beschimpft
+beschimpfte
+beschimpftest
+beschimpftet
+beschimpfung
+beschimpfungen
+beschimping
+beschimpingen
+beschimpt
+beschimpte
+beschimpten
+beschirm
+beschirmte
+beschiss
+beschissen
+beschissene
+beschissenes
+beschlae
+beschlaege
+beschlaegst
+beschlag
+beschlage
+beschlagen
+beschlagende
+beschlagendem
+beschlagenden
+beschlagendes
+beschlagene
+beschlagenem
+beschlagener
+beschlagenes
+beschlagenheit
+beschlages
+beschlagnahme
+beschlagnahmend
+beschlagnahmende
+beschlagnahmendem
+beschlagnahmender
+beschlagnahmendes
+beschlagnahmst
+beschlagnahmte
+beschlagnahmtem
+beschlagnahmten
+beschlagnahmtes
+beschlagnahmtest
+beschlagnahmtet
+beschlei
+beschleichen
+beschleu
+beschleunige
+beschleunigen
+beschleunigend
+beschleunigendem
+beschleunigenden
+beschleunigender
+beschleunigst
+beschleunigt
+beschleunigte
+beschleunigten
+beschleunigter
+beschleunigtes
+beschleunigtet
+beschleunigung
+beschleunigungen
+beschleunigungsaufnehmern
+beschleunigungskra"ften
+beschleunigungsmessung
+beschleunigungsvektoren
+beschleunigungsversuch
+beschleunigungswerte
+beschlie
+beschliesse
+beschliessen
+beschliessende
+beschliessendem
+beschliessenden
+beschliessendes
+beschliesst
+beschlos
+beschloss
+beschlossen
+beschlossene
+beschlossenem
+beschlossener
+beschlossenes
+beschlossest
+beschlue
+beschluesse
+beschluessen
+beschlug
+beschlugen
+beschlugst
+beschlus
+beschluss
+beschlussfa"higkeit
+beschlussfaehige
+beschlussfaehigen
+beschlussfaehiger
+beschlussfaehiges
+beschlussfaehigkeiten
+beschlussfassung
+beschlussfassungen
+beschmie
+beschmiere
+beschmieren
+beschmierende
+beschmierendem
+beschmierenden
+beschmierendes
+beschmierst
+beschmiert
+beschmiertem
+beschmierten
+beschmierter
+beschmiertest
+beschmiertet
+beschmut
+beschmutze
+beschmutzend
+beschmutzende
+beschmutzendem
+beschmutzender
+beschmutzendes
+beschmutzest
+beschmutzte
+beschmutztem
+beschmutzten
+beschmutztes
+beschmutztet
+beschnei
+beschneide
+beschneiden
+beschneidend
+beschneidende
+beschneidendem
+beschneidender
+beschneidendes
+beschneidest
+beschneidung
+beschneidungen
+beschnit
+beschnitt
+beschnitten
+beschnittene
+beschnittenen
+beschnittener
+beschnittenes
+beschnittet
+beschoei
+beschoeid
+beschoeide
+beschoeiden
+beschoeien
+beschoeiing
+beschoeiingen
+beschoeit
+beschoen
+beschoenige
+beschoenigend
+beschoenigende
+beschoenigendem
+beschoenigender
+beschoenigendes
+beschoenigst
+beschoenigte
+beschoenigtem
+beschoenigten
+beschoenigtes
+beschoenigtest
+beschoenigtet
+beschoenigungen
+beschonk
+beschonken
+beschonkene
+beschonkenen
+beschonkener
+beschonkenheid
+beschonkenst
+beschoot
+beschore
+beschoren
+beschoss
+beschossene
+beschossenem
+beschossenen
+beschossenes
+beschosset
+beschosst
+beschot
+beschote
+beschoten
+beschotene
+beschotenen
+beschott
+beschotten
+beschouw
+beschouwd
+beschouwde
+beschouwden
+beschouwelijk
+beschouwelijke
+beschouwelijker
+beschouwelijkst
+beschouwen
+beschouwer
+beschouwers
+beschouwing
+beschouwingen
+beschouwt
+beschra"
+beschra"nken
+beschra"nkt
+beschra"nkter
+beschra"nkung
+beschra"nkungen
+beschrae
+beschraenke
+beschraenken
+beschraenkend
+beschraenkende
+beschraenkendem
+beschraenkender
+beschraenkendes
+beschraenkst
+beschraenkte
+beschraenktem
+beschraenkten
+beschraenktere
+beschraenkterem
+beschraenkteren
+beschraenkteres
+beschraenktes
+beschraenktest
+beschraenktestem
+beschraenktesten
+beschraenktester
+beschraenktet
+beschraenktheiten
+beschraenkung
+beschraenkungen
+beschred
+beschreden
+beschredene
+beschredenen
+beschree
+beschreed
+beschreef
+beschreeuw
+beschreeuwd
+beschreeuwde
+beschreeuwden
+beschreeuwen
+beschreeuwt
+beschrei
+beschreibe
+beschreiben
+beschreibende
+beschreibenden
+beschreibender
+beschreibst
+beschreibt
+beschreibung
+beschreibungen
+beschreibungstext
+beschreid
+beschreide
+beschreiden
+beschreien
+beschreit
+beschreiten
+beschreitet
+beschrev
+beschreven
+beschrevene
+beschrevenen
+beschrie
+beschrieb
+beschrieben
+beschriebene
+beschriebenem
+beschriebenen
+beschriebenes
+beschriebet
+beschriebst
+beschrif
+beschriftbar
+beschriften
+beschriftet
+beschrifteten
+beschriftung
+beschriftungen
+beschriftungsmo"glichkeit
+beschrij
+beschrijd
+beschrijden
+beschrijdt
+beschrijf
+beschrijft
+beschrijftechnisch
+beschrijftechnische
+beschrijven
+beschrijvend
+beschrijvende
+beschrijver
+beschrijvers
+beschrijving
+beschrijvingen
+beschrijvingsbiljet
+beschrijvingsbiljetten
+beschrijvingsbrief
+beschrijvingsbrieven
+beschrit
+beschritten
+beschroo
+beschroomd
+beschroomde
+beschroomder
+beschroomdheid
+beschroomdst
+beschuet
+beschuetzer
+beschuetzerin
+beschuetzern
+beschuetzers
+beschuetzt
+beschuff
+beschuffen
+beschuffet
+beschuffst
+beschuit
+beschuitbakker
+beschuitbakkers
+beschuitbus
+beschuitbussen
+beschuiten
+beschuittrommel
+beschuittrommels
+beschuld
+beschuldig
+beschuldigd
+beschuldigde
+beschuldigden
+beschuldigen
+beschuldiger
+beschuldigers
+beschuldiging
+beschuldigingen
+beschuldigster
+beschuldigsters
+beschuldigt
+beschuldigte
+beschuldigten
+beschuldigung
+beschuldigungen
+beschump
+beschumpfene
+beschumpfenem
+beschumpfenen
+beschumpfenes
+beschut
+beschuts
+beschutsel
+beschutsels
+beschutt
+beschutte
+beschutten
+beschutting
+beschuttingen
+beschuttingsmiddel
+beschuttingsmiddelen
+beschwer
+beschwerde
+beschwerdebriefe
+beschwerdefreies
+beschwerderecht
+beschwerdeverfahren
+beschweren
+beschwerend
+beschwerende
+beschwerenden
+beschwerender
+beschwerendes
+beschwerliche
+beschwerlichem
+beschwerlichen
+beschwerlichere
+beschwerlicherem
+beschwerlicheren
+beschwerlicheres
+beschwerliches
+beschwerlichste
+beschwerlichsten
+beschwerlichster
+beschwerlichstes
+beschwert
+beschwerte
+beschwertem
+beschwerter
+beschwertes
+beschwertest
+beschwerung
+beschwic
+beschwichtige
+beschwichtigen
+beschwichtigend
+beschwichtigendem
+beschwichtigenden
+beschwichtigender
+beschwichtigst
+beschwichtigt
+beschwichtigte
+beschwichtigten
+beschwichtigter
+beschwichtigtes
+beschwichtigtet
+beschwichtigungen
+beschwichtigungspolitik
+beschwin
+beschwindelte
+beschwingt
+beschwingten
+beschwip
+beschwipst
+beschwoe
+beschwoere
+beschwoeren
+beschwoerende
+beschwoerendem
+beschwoerenden
+beschwoerendes
+beschwoerst
+beschwoert
+beschwoertem
+beschwoerten
+beschwoerter
+beschwoertest
+beschwoertet
+beschwoerung
+beschwoerungsformeln
+beschwor
+beschworene
+beschworenen
+bescorch
+bescorn
+bescound
+bescoundrel
+bescour
+bescourg
+bescourge
+bescramb
+bescramble
+bescrape
+bescratc
+bescratch
+bescrawl
+bescreen
+bescribb
+bescribble
+bescurf
+bescurvy
+bescutch
+bescutcheon
+bese
+beseam
+besee
+beseech
+beseeche
+beseeched
+beseecher
+beseechers
+beseeches
+beseechi
+beseeching
+beseechingly
+beseechingness
+beseechm
+beseechment
+beseelt
+beseelte
+beseeltem
+beseelten
+beseelter
+beseem
+beseemed
+beseemin
+beseeming
+beseemingly
+beseemingness
+beseemli
+beseemliness
+beseemly
+beseems
+beseen
+besees
+besef
+beseffen
+beseft
+besefte
+beseften
+besegla
+besegle
+beseglet
+besegra
+besehen
+beseire
+beseiret
+beseitig
+beseitige
+beseitigen
+beseitigende
+beseitigendem
+beseitigenden
+beseitigendes
+beseitigst
+beseitigt
+beseitigtem
+beseitigten
+beseitigter
+beseitigtest
+beseitigtet
+beseitigung
+besejre
+besema
+besemah
+besemme
+besen
+besena
+besenona
+besens
+besensti
+besenstiel
+besenstielen
+besenstiels
+besep
+beserk
+beses
+besessen
+besessene
+besessenen
+besessener
+besessenes
+besessenheiten
+beset
+besetmen
+besetment
+besetnin
+besetning
+besetningen
+besetningene
+besetningens
+besetninger
+besets
+besette
+besettel
+besettelse
+besettelsen
+besetten
+besettende
+besetter
+besetters
+besettin
+besetting
+besetzen
+besetzend
+besetzende
+besetzenden
+besetzender
+besetzendes
+besetzt
+besetzte
+besetztem
+besetzten
+besetzter
+besetztes
+besetztest
+besetzth
+besetzthalten
+besetztz
+besetztzeichen
+besetztzeichens
+besetzun
+besetzungen
+besetzungsaktion
+besetzungsliste
+besh
+besha
+beshackl
+beshackle
+beshada
+beshade
+beshadow
+beshag
+beshai
+beshake
+besham
+beshame
+besharah
+beshawle
+beshawled
+beshear
+beshell
+besheshl
+besheshler
+beshi
+beshield
+beshikku
+beshikob
+beshine
+beshir
+beshiver
+beshlik
+beshod
+beshout
+beshow
+beshower
+beshrew
+beshrewe
+beshrewed
+beshrews
+beshriek
+beshrive
+beshrivel
+beshroud
+besi
+besichti
+besichtige
+besichtigen
+besichtigende
+besichtigendem
+besichtigenden
+besichtigendes
+besichtigst
+besichtigt
+besichtigtem
+besichtigten
+besichtigter
+besichtigtest
+besichtigtet
+besichtigung
+besichtigungen
+besichtigungsfahrten
+besichtigungsflug
+besichtigungsreise
+besichtigungsreisen
+besichtigungsrunde
+besichtigungstermine
+besiclom
+besiclometer
+besico
+besidde
+besiddelse
+besiddelser
+besidder
+besiddernes
+besiddet
+beside
+besides
+besiedel
+besiedeln
+besiedelnde
+besiedelndem
+besiedelnden
+besiedelndes
+besiedelst
+besiedelt
+besiedeltem
+besiedelten
+besiedelter
+besiedeltest
+besiedeltet
+besiedle
+besiedlu
+besiedlung
+besiedlungen
+besiege
+besieged
+besiegel
+besiegelt
+besiegelte
+besiegelten
+besiegem
+besiegement
+besiegen
+besiegend
+besiegende
+besiegendem
+besiegender
+besiegendes
+besieger
+besiegers
+besieges
+besiegin
+besieging
+besiegingly
+besiegst
+besiegt
+besiegte
+besiegtem
+besiegten
+besiegtes
+besiegtest
+besiegtet
+besiegun
+besiegung
+besiegungen
+besifra
+besifre
+besifret
+besifrin
+besifring
+besigh
+besigtige
+besikku
+besikobi
+besikta
+besikte
+besiktel
+besiktelsene
+besiktelser
+besiktet
+besiktig
+besiktiga
+besiktige
+besiktigelse
+besiktigelsen
+besiktiget
+besilver
+besime
+besin
+besindig
+besindighet
+besindigheten
+besing
+besingen
+besinna
+besinne
+besinnel
+besinnelse
+besinnelsen
+besinnen
+besinnet
+besinnli
+besinnliche
+besinnt
+besinnun
+besinnung
+besinnungen
+besinnungsfrage
+besinnungslos
+besinnungslose
+besinnungslosen
+besinnungsloser
+besinnungsloses
+besinnungslosigkeit
+besique
+besiren
+besisi
+besit
+besitta
+besitte
+besittel
+besittelse
+besittelsen
+besittelsene
+besitter
+besittet
+besitz
+besitzan
+besitzanzeigende
+besitzanzeigendem
+besitzanzeigenden
+besitzanzeigendes
+besitze
+besitzen
+besitzende
+besitzendem
+besitzenden
+besitzendes
+besitzer
+besitzergreifung
+besitzergreifungen
+besitzerinnen
+besitzern
+besitzerrechten
+besitzers
+besitzes
+besitzest
+besitzfi
+besitzfirma
+besitzlo
+besitzlose
+besitzlosem
+besitzlosen
+besitzloses
+besitzlosigkeit
+besitzna
+besitznachweis
+besitznahmen
+besitzst
+besitzstand
+besitzsteuern
+besitzt
+besitzti
+besitztitel
+besitztu
+besitztum
+besitztums
+besitzun
+besitzungen
+besitzwe
+besitzwechsel
+besje
+besjelet
+besjes
+besjeshu
+besjeshuis
+besjeshuizen
+besj{lede
+besj{ling
+besk
+beskaada
+beskada
+beskadig
+beskadiga
+beskadige
+beskadigelse
+beskadiget
+beskaeft
+beskaeftig
+beskaera
+beskaffa
+beskaffad
+beskaffat
+beskaffe
+beskaffen
+beskaffenhet
+beskafti
+beskaftig
+beskar
+beskara
+beskatni
+beskatning
+beskatningen
+beskatta
+beskatte
+beskattes
+beskattet
+beskatti
+beskatting
+beskattn
+beskattning
+beskattningsvaerden
+beskattningsvarden
+beskattningsv{rden
+beske
+besked
+beskeden
+beskedenhed
+beskedent
+beskedne
+beskedudveksling
+beskhet
+beskickn
+beskickning
+beskikka
+beskikke
+beskikkede
+beskikkelse
+beskikkelsen
+beskikker
+beskikkes
+beskikket
+beskitt
+beskjed
+beskjede
+beskjeden
+beskjedenhet
+beskjedenheten
+beskjedent
+beskjedn
+beskjedne
+beskjednere
+beskjeft
+beskjeftige
+beskjeftigede
+beskjeftigelse
+beskjeftigelsen
+beskjeftiger
+beskjeftiget
+beskjemm
+beskjemmende
+beskjenk
+beskjenke
+beskjenking
+beskj{re
+beskj{res
+beskj{ri
+beskj{ring
+beskj{ringen
+beskj|t
+beskne
+beskow
+beskrev
+beskreve
+beskrevet
+beskrevn
+beskrevne
+beskriv
+beskrive
+beskrivelse
+beskrivelsen
+beskrivelser
+beskrivelserne
+beskrivelsesfil
+beskrivelsesfilen
+beskrivelsesfiler
+beskrivelsesramme
+beskrivelsesv{rkt|j
+beskrivende
+beskriver
+beskrives
+beskrivi
+beskrivit
+beskrivn
+beskrivna
+beskrivning
+beskrivningarna
+beskt
+beskue
+beskuer
+beskuet
+beskutt
+beskydd
+beskylde
+beskylder
+beskyldes
+beskyldn
+beskyldning
+beskyldningen
+beskyldningene
+beskyldninger
+beskyldt
+beskyldte
+beskylla
+beskyte
+beskytin
+beskyting
+beskytta
+beskytte
+beskyttede
+beskyttelse
+beskyttelsen
+beskyttelses
+beskyttelsesprogram
+beskyttelsesrom
+beskyttende
+beskytter
+beskyttere
+beskytterinstinkt
+beskyttes
+beskyttet
+besk{fti
+besk{ftig
+besk{ftige
+besk{ftigede
+besk{ftigelse
+besk{ftigelsesudsigterne
+besk{ftiger
+besk{ftiges
+besk{ftiget
+besk{ra
+besk{ring
+besk|yt
+besk|yte
+besk|yten
+besk}da
+besk}ret
+besla
+beslaa
+beslaan
+beslaap
+beslaapt
+beslaat
+beslab
+beslaekt
+beslaektad
+beslag
+beslagen
+beslagene
+beslagenen
+beslaget
+beslagha
+beslaghamer
+beslaghamers
+beslagla
+beslaglagt
+beslagle
+beslaglegge
+beslagleggelse
+beslaglegger
+beslagleggers
+beslaglegges
+beslaglegging
+beslagleggingen
+beslagma
+beslagmaker
+beslagmakers
+beslagwe
+beslagwerk
+beslakta
+beslaktad
+beslap
+beslapen
+beslapene
+beslapenen
+beslash
+beslave
+beslaver
+beslecht
+beslechte
+beslechten
+beslechting
+beslechtte
+beslechtten
+besleeve
+beslekta
+beslekte
+beslektede
+beslektet
+beslenei
+beslenej
+besleri
+besliep
+besliepe
+besliepen
+beslijkt
+beslijkte
+beslijkter
+beslijktst
+beslikt
+beslikte
+beslikter
+beslikts
+besliktst
+beslime
+beslimer
+beslings
+beslippe
+beslipper
+beslis
+beslisse
+beslissen
+beslissend
+beslissende
+beslissender
+beslissendst
+beslissi
+beslissing
+beslissingen
+beslissingswedstrijd
+beslissingswedstrijden
+beslist
+besliste
+beslisten
+beslister
+beslisth
+beslistheid
+beslistm
+beslistmeest
+beslo
+beslobbe
+beslobber
+besloeg
+besloege
+besloegen
+besloet
+beslomme
+beslommerd
+beslommerde
+beslommerder
+beslommerdst
+beslommering
+beslommeringen
+besloop
+besloot
+beslopen
+beslopene
+beslopenen
+beslot
+besloten
+beslotene
+beslotenen
+beslotenheid
+beslow
+beslubbe
+beslubber
+besluip
+besluipe
+besluipen
+besluipt
+besluit
+besluite
+besluiteloos
+besluiteloosheid
+besluiteloost
+besluiteloze
+besluitelozer
+besluiten
+besluitv
+besluitvaardig
+besluitvaardige
+besluitvaardiger
+besluitvaardigheid
+besluitvaardigst
+besluitvorming
+beslur
+beslushe
+beslushed
+beslut
+besluta
+beslutet
+beslutets
+beslutit
+beslutni
+beslutning
+beslutningen
+beslutningene
+beslutninger
+beslutnings
+beslutningsprosess
+beslutningsprosessen
+beslutningstakeren
+beslutningsteori
+beslutsf
+beslutsfattningen
+beslutsm
+beslutsmaessighet
+beslutsmassighet
+beslutsm{ssighet
+beslutta
+beslutte
+besluttede
+besluttende
+beslutter
+besluttes
+besluttet
+beslutts
+besluttsom
+besluttsomhet
+besluttsomheten
+besluttsomme
+besluttsomt
+besl{gtede
+besl{gtet
+besl{kta
+besl{ktad
+besl|t
+besl}
+besl}et
+besl}tt
+besme
+besmear
+besmeard
+besmeare
+besmeared
+besmearer
+besmeari
+besmearing
+besmears
+besmeer
+besmeerd
+besmeerde
+besmeerden
+besmeert
+besmell
+besmeren
+besmet
+besmette
+besmettelijk
+besmettelijke
+besmettelijker
+besmettelijkheid
+besmettelijkst
+besmetten
+besmetti
+besmetting
+besmettingsgevaar
+besmettingshaard
+besmettingshaarden
+besmetve
+besmetverklaring
+besmetverklaringen
+besmeur
+besmeurd
+besmeurde
+besmeurden
+besmeure
+besmeuren
+besmeurt
+besmile
+besmirch
+besmirched
+besmircher
+besmirchers
+besmirches
+besmirching
+besmirchment
+besmitte
+besmittelse
+besmittelsen
+besmittet
+besmoke
+besmooth
+besmothe
+besmother
+besmouch
+besmudge
+besmut
+besmutch
+besmuts
+besmykke
+besmykki
+besmykking
+besna
+besnaar
+besnaard
+besnaarde
+besnaarden
+besnaart
+besnaden
+besnadene
+besnare
+besnaren
+besne
+besneden
+besnedene
+besnedenen
+besneed
+besneer
+besneeuw
+besneeuwd
+besneeuwde
+besneeuwden
+besneeuwen
+besneeuwt
+besnehar
+besnehard
+besnet
+besnier
+besnijd
+besnijde
+besnijden
+besnijdenis
+besnijdt
+besnivel
+besnoei
+besnoeid
+besnoeide
+besnoeiden
+besnoeie
+besnoeien
+besnoeii
+besnoeiing
+besnoeiingen
+besnoeit
+besnow
+besnows
+besnuff
+besnuffe
+besnuffel
+besnuffeld
+besnuffelde
+besnuffelden
+besnuffelen
+besnuffelt
+besnuse
+besn{re
+besn{ren
+besn{rende
+beso
+besoa
+besodden
+besodeia
+besodeiah
+besodere
+besoderen
+besoek
+besoeka
+besoekt
+besoekte
+besoffen
+besoffene
+besoffenem
+besoffener
+besoffenes
+besoffet
+besofft
+besogne
+besogner
+besognes
+besogneu
+besogneuse
+besogneuses
+besogneux
+besognie
+besognier
+besohle
+besohlen
+besohlend
+besohlendem
+besohlenden
+besohlender
+besohlst
+besohlt
+besohlte
+besohlten
+besohlter
+besohltes
+besohltet
+besoil
+besoin
+besoins
+besoiu
+besok
+besoka
+besokt
+besokte
+besolde
+besolden
+besoldende
+besoldendem
+besoldenden
+besoldendes
+besoldes
+besoldest
+besoldet
+besoldetem
+besoldeten
+besoldeter
+besoldetest
+besoldetet
+besoldun
+besoldungen
+besoldungserhoehung
+besoldungsgesetz
+besoldungsgruppe
+besoldungsmaessige
+besoldungsordnung
+besoldungsproblem
+besoldungsunterschiede
+besom
+besomd
+besomde
+besomden
+besomer
+besommen
+besommin
+besomming
+besommingen
+besoms
+besomt
+besonder
+besondere
+besonderem
+besonderen
+besonderes
+besonderheit
+besonderheiten
+besondern
+besonders
+besonnen
+besonnene
+besonnenem
+besonnenen
+besonnenere
+besonnenerem
+besonneneren
+besonneneres
+besonnenes
+besonnenheit
+besonnenheiten
+besonnenste
+besonnensten
+besonnenster
+besonnenstes
+besonnet
+besoot
+besoothe
+besoothement
+besor
+besorgen
+besorgend
+besorgende
+besorgendem
+besorgender
+besorgendes
+besorgni
+besorgniserregend
+besorgniserregendem
+besorgniserregenden
+besorgniserregender
+besorgniserregenderem
+besorgniserregenderen
+besorgniserregenderer
+besorgniserregendes
+besorgniserregendste
+besorgniserregendstem
+besorgniserregendster
+besorgniserregendstes
+besorgnisse
+besorgnissen
+besorgnisses
+besorgst
+besorgt
+besorgte
+besorgtem
+besorgten
+besorgtere
+besorgterem
+besorgteren
+besorgteres
+besorgtes
+besorgtest
+besorgtestem
+besorgtesten
+besorgtester
+besorgtet
+besorgun
+besorgungen
+besot
+besotmen
+besotment
+besots
+besotted
+besottedly
+besottedness
+besotter
+besottin
+besotting
+besottingly
+besought
+besoul
+besour
+besove
+besozzi
+bespaar
+bespaard
+bespaarde
+bespaarden
+bespaart
+bespake
+bespan
+bespande
+bespanden
+bespangl
+bespangle
+bespangled
+bespangles
+bespangling
+bespanne
+bespannen
+bespannende
+bespannendem
+bespannenden
+bespannendes
+bespannene
+bespannenen
+bespanni
+bespanning
+bespanningen
+bespanns
+bespannst
+bespannt
+bespanntem
+bespannten
+bespannter
+bespanntest
+bespanntet
+bespannu
+bespannung
+bespannungen
+bespant
+bespare
+besparel
+besparelse
+besparelser
+besparen
+besparin
+besparing
+besparingar
+besparingen
+bespat
+bespate
+bespatte
+bespatten
+bespatter
+bespattered
+bespatterer
+bespattering
+bespatterment
+bespatters
+bespawl
+bespc
+bespeak
+bespeaka
+bespeakable
+bespeake
+bespeaker
+bespeaki
+bespeaking
+bespeaks
+bespecke
+bespecked
+bespeckl
+bespeckle
+bespecklement
+bespecta
+bespectacled
+besped
+bespeech
+bespeed
+bespeel
+bespeeld
+bespeelde
+bespeelden
+bespeelt
+bespelen
+bespelin
+bespeling
+bespell
+bespelle
+bespelled
+bespend
+bespete
+bespeur
+bespeurd
+bespeurde
+bespeurden
+bespeure
+bespeuren
+bespeurt
+bespew
+bespice
+bespickt
+bespied
+bespiedd
+bespiedde
+bespiedden
+bespiede
+bespieden
+bespieder
+bespieders
+bespiedi
+bespieding
+bespiedt
+bespiege
+bespiegel
+bespiegeld
+bespiegelde
+bespiegelden
+bespiegelen
+bespiegeling
+bespiegelingen
+bespiegelt
+bespielb
+bespielbar
+bespiele
+bespielen
+bespijke
+bespijker
+bespijkerd
+bespijkerde
+bespijkerden
+bespijkeren
+bespijkert
+bespikke
+bespikkel
+bespikkeld
+bespikkelde
+bespikkelden
+bespikkelen
+bespikkelt
+bespill
+bespin
+bespione
+bespioneer
+bespioneerd
+bespioneerde
+bespioneerden
+bespioneert
+bespioneren
+bespirit
+bespise
+bespisni
+bespisning
+bespit
+bespitte
+bespitten
+besplash
+besplatt
+besplatter
+besplit
+bespoedi
+bespoedigen
+bespoke
+bespoken
+bespoot
+bespot
+bespoten
+bespotene
+bespotenen
+bespotte
+bespottedness
+bespottelig
+bespottelse
+bespotten
+bespotter
+bespotters
+bespottet
+bespotti
+bespotting
+bespouse
+bespout
+bespraak
+bespraakt
+bespraakte
+bespraaktheid
+besprach
+besprachen
+besprachst
+bespracht
+besprak
+besprake
+bespraken
+bespray
+bespread
+bespreading
+bespreads
+besprech
+besprechen
+besprechend
+besprechende
+besprechenden
+besprechender
+besprechendes
+besprechnungen
+besprechung
+besprechungen
+besprechungsgegenstand
+besprechungsnotiz
+besprechungsprotokoll
+besprechungsprotokolls
+bespreek
+bespreekbureau
+bespreekbureaus
+bespreekt
+besprek
+bespreke
+bespreken
+bespreki
+bespreking
+besprekingen
+bespreng
+besprengd
+besprengde
+besprengden
+besprengen
+besprengt
+besprenk
+besprenkel
+besprenkeld
+besprenkelde
+besprenkelden
+besprenkelen
+besprenkelt
+besprent
+besprich
+besprichst
+bespricht
+besprink
+besprinkle
+besprinkled
+besprinkler
+besprinkles
+besprinkling
+bespritz
+bespritzen
+bespritzend
+bespritzende
+bespritzenden
+bespritzender
+bespritzendes
+bespritzt
+bespritzte
+bespritztem
+bespritzter
+bespritztes
+bespritztest
+besproch
+besprochen
+besprochene
+besprochenem
+besprochenen
+besprochener
+besprochenes
+besproei
+besproeid
+besproeide
+besproeiden
+besproeien
+besproeier
+besproeiers
+besproeiing
+besproeiingen
+besproeiingswagen
+besproeiingswagens
+besproeit
+besproke
+besproken
+besprokene
+besprokenen
+besprueh
+bespruehte
+bespucke
+bespucken
+bespuit
+bespuite
+bespuiten
+bespuiti
+bespuiting
+bespuitingen
+bespurre
+bespurred
+besputte
+besputter
+bespuw
+bespuwd
+bespuwde
+bespuwden
+bespuwen
+bespuwt
+bespy
+besqueez
+besqueeze
+besquib
+besra
+besr{nset
+bess
+bessarab
+bessarabia
+bessarabian
+bessatsu
+bessatu
+besse
+bessebom
+bessebomen
+besseboo
+besseboom
+bessei
+bessekai
+besseki
+bessel
+besselia
+besselian
+bessell
+besselma
+besselman
+bessemer
+bessemercity
+bessemerize
+bessemerjern
+bessemerjernet
+bessemermetode
+bessemermetoden
+bessemerpeer
+bessemerperen
+bessemerproces
+bessemerprosessen
+bessemerstaal
+bessen
+bessenge
+bessengelei
+bessenje
+bessenjenever
+bessentr
+bessentros
+bessentrossen
+bessenvl
+bessenvla
+bessenvla's
+bessenvlaas
+bessenwi
+bessenwijn
+bessenye
+bessenyei
+besser
+bessera
+bessere
+besserem
+besseren
+besserer
+besseres
+bessern
+bessernd
+bessernde
+besserndem
+bessernden
+besserndes
+besserst
+bessert
+besserte
+besserten
+bessertest
+bessertet
+besserun
+besserung
+besserungsanstalt
+besserungsanstalten
+besserungshoffnungen
+besserwi
+besserwissern
+besserwissers
+bessesap
+bessestr
+bessestruik
+bessestruiken
+bessette
+bessey
+besshi
+besshite
+besshits
+besshitu
+besshiya
+bessho
+besshou
+besshu
+bessi
+bessie
+bessinge
+bessinger
+bessite
+bessitsu
+bessitu
+bessiya
+bessiyam
+bessler
+bessmert
+bessmertnova
+bessmertnykh
+bessner
+besso
+bessoiu
+bessokin
+besson
+bessong
+bessonga
+bessongabang
+bessonok
+bessou
+bessouch
+bessouti
+bessuill
+bessuille
+bessy
+bessyo
+bessyona
+bessyou
+bessyu
+best
+best-sel
+best-seller
+best-sellers
+besta
+besta"nd
+besta"nde
+besta"ndig
+besta"ndigkeit
+besta"ti
+besta"tige
+besta"tigen
+besta"tigt
+besta"tigte
+besta"tigung
+besta"tigungsanforderung
+besta"tigungsvermerk
+bestaa
+bestaan
+bestaanb
+bestaanbaar
+bestaanbaarheid
+bestaanbare
+bestaand
+bestaande
+bestaans
+bestaansmiddel
+bestaansmiddelen
+bestaansminimum
+bestaansmogelijkheden
+bestaansmogelijkheid
+bestaar
+bestaat
+bestaatt
+bestab
+bestach
+bestache
+bestachen
+bestachs
+bestachst
+bestaell
+bestaella
+bestaellare
+bestaellarnamn
+bestaelld
+bestaellda
+bestaelles
+bestaellningar
+bestaellningarna
+bestaellningen
+bestaellningskladd
+bestaellt
+bestaem
+bestaemd
+bestaemda
+bestaemde
+bestaemdes
+bestaemm
+bestaemma
+bestaemmes
+bestaemn
+bestaemning
+bestaemt
+bestaend
+bestaende
+bestaendig
+bestaendige
+bestaendigem
+bestaendiger
+bestaendigere
+bestaendigerem
+bestaendigerer
+bestaendigeres
+bestaendiges
+bestaendigkeit
+bestaendigkeiten
+bestaendigstem
+bestaendigsten
+bestaendigster
+bestaerk
+bestaerke
+bestaerken
+bestaerkend
+bestaerkendem
+bestaerkenden
+bestaerkender
+bestaerkst
+bestaerkt
+bestaerkte
+bestaerkten
+bestaerkter
+bestaerktes
+bestaerktet
+bestaeti
+bestaetige
+bestaetigen
+bestaetigende
+bestaetigendem
+bestaetigenden
+bestaetigendes
+bestaetigst
+bestaetigt
+bestaetigtem
+bestaetigten
+bestaetigter
+bestaetigtest
+bestaetigtet
+bestaetigung
+bestahl
+bestahle
+bestahlen
+bestahlt
+bestain
+bestak
+bestaken
+bestakk
+bestal
+bestalen
+bestalla
+bestallare
+bestallarnamn
+bestalld
+bestallda
+bestalle
+bestalles
+bestalln
+bestallningar
+bestallningarna
+bestallningen
+bestallningskladd
+bestallt
+bestam
+bestamd
+bestamda
+bestamde
+bestamdes
+bestamma
+bestamme
+bestammes
+bestamni
+bestamning
+bestamp
+bestamt
+bestand
+bestandd
+bestanddeel
+bestanddel
+bestanddele
+bestanddelen
+bestanddeler
+bestande
+bestanden
+bestandene
+bestandenem
+bestandener
+bestandenes
+bestander
+bestandest
+bestandh
+bestandheid
+bestandi
+bestandig
+bestandigt
+bestands
+bestandsaenderungen
+bestandsaufnahme
+bestandsaufnahmen
+bestandserhoehung
+bestandsliste
+bestandsnaam
+bestandsnamen
+bestandsrenten
+bestandssicherung
+bestandst
+bestandsu"berblick
+bestandsveraenderungen
+bestandsverminderung
+bestandt
+bestandteil
+bestandteile
+bestane
+bestar
+bestare
+bestarve
+bestatt
+bestatte
+bestatten
+bestattend
+bestattendem
+bestattenden
+bestattender
+bestattest
+bestattet
+bestattete
+bestatteten
+bestatteter
+bestattetes
+bestattetet
+bestattu
+bestattung
+bestattungen
+bestattungsamt
+bestattungsinstitut
+bestattungsinstitute
+bestattungsinstituten
+bestattungsvorsorge
+bestatue
+bestatued
+bestaune
+bestaunen
+bestaunt
+bestauntes
+bestausg
+bestausgebauten
+bestavro
+bestavros
+bestay
+bestayed
+bestbesu
+bestbesuchten
+bestbeze
+bestbezeugten
+beste
+bestead
+bestebor
+besteborgere
+besteborgerlige
+besteborgerskap
+besteche
+bestechen
+bestechende
+bestechendem
+bestechenden
+bestechendes
+bestechl
+bestechlich
+bestechliche
+bestechlichen
+bestechlicher
+bestechlichere
+bestechlicheren
+bestechlicherer
+bestechlicheres
+bestechlichkeit
+bestechlichkeiten
+bestechlichste
+bestechlichstem
+bestechlichsten
+bestechlichstes
+bestecht
+bestechu
+bestechungen
+bestechungsgeld
+bestechungsgelder
+bestechungsgeldes
+bestechungsprozess
+besteck
+bestecke
+bestecken
+besteckes
+bestecki
+besteckindustrie
+bested
+bestede
+bestedel
+bestedeling
+bestedelinge
+bestedelingen
+bestedelingenhuis
+bestedelingenhuizen
+besteden
+besteed
+besteedd
+besteedde
+besteedden
+besteeds
+besteedster
+besteedsters
+besteedt
+besteeg
+besteek
+besteekt
+besteel
+besteelt
+besteer
+bestefar
+bestefaren
+bestefars
+bestefor
+besteforeldre
+bestegen
+bestegene
+bestegenen
+bestehe
+bestehen
+bestehenbleibe
+bestehend
+bestehende
+bestehendem
+bestehenden
+bestehender
+bestehendes
+bestehens
+bestehle
+bestehlen
+bestehlend
+bestehlende
+bestehlenden
+bestehlender
+bestehlendes
+besteht
+besteige
+besteigen
+besteigende
+besteigendem
+besteigenden
+besteigendes
+besteigs
+besteigst
+besteigt
+besteigu
+besteigung
+besteigungen
+besteing
+besteingefuehrten
+besteingerichtete
+bestek
+bestekam
+bestekamer
+bestekamers
+besteken
+bestekho
+bestekhout
+bestekke
+bestekken
+bestel
+bestelad
+besteladministratie
+bestelag
+bestelaget
+bestelau
+bestelauto
+bestelauto's
+bestelbi
+bestelbiljet
+bestelbiljetten
+bestelbr
+bestelbrief
+bestelbrieven
+besteld
+bestelde
+bestelden
+besteldi
+besteldienst
+bestelen
+bestelfi
+bestelfiets
+bestelfietsen
+bestelgo
+bestelgoed
+bestelgoederen
+bestelhu
+bestelhuis
+bestelhuizen
+bestelka
+bestelkaart
+bestelkaarten
+bestelkantoor
+bestelkantoren
+bestella
+bestella"nderung
+bestellb
+bestellbedingungen
+bestellbezeichnung
+bestellbezeichnungen
+bestellbuch
+bestellbuecher
+bestellbuechern
+bestelle
+bestelleingang
+bestellen
+bestellend
+bestellende
+bestellendem
+bestellenden
+bestellender
+bestellendes
+besteller
+bestellern
+bestellers
+bestellf
+bestellformulare
+bestelli
+bestelling
+bestellingen
+bestellingenboek
+bestellingenboeken
+bestellinkje
+bestellinkjes
+bestelln
+bestellnr
+bestellnummer
+bestellnummern
+bestello
+bestelloon
+bestells
+bestellschein
+bestellscheine
+bestellscheinen
+bestellst
+bestellt
+bestellte
+bestelltem
+bestellten
+bestelltes
+bestelltest
+bestelltet
+bestelltexten
+bestellu
+bestellumfa"ngen
+bestellung
+bestellungen
+bestellz
+bestellzettel
+bestellzetteln
+bestellzettels
+bestelt
+bestelwa
+bestelwagen
+bestelwagens
+bestem
+bestemaa
+bestemaat
+bestemaats
+besteman
+bestemann
+bestemanns
+bestemannspremie
+bestemannspremien
+bestemannspremier
+bestemd
+bestemde
+bestemden
+bestemme
+bestemmeler
+bestemmeling
+bestemmelinge
+bestemmelingen
+bestemmelse
+bestemmelsen
+bestemmelsene
+bestemmelser
+bestemmelserne
+bestemmelsesrett
+bestemmelsessted
+bestemmelsesstedet
+bestemmen
+bestemmende
+bestemmer
+bestemmes
+bestemmi
+bestemmia
+bestemmiai
+bestemmie
+bestemming
+bestemmingen
+bestemmingsadres
+bestemmino
+bestemmio
+bestemoe
+bestemoer
+bestemoers
+bestemor
+bestemora
+bestemoren
+bestemors
+bestempe
+bestempel
+bestempeld
+bestempelde
+bestempelden
+bestempelen
+bestempeling
+bestempelt
+bestempf
+bestempfohlene
+bestemt
+bestemte
+bestemteste
+besten
+bestench
+bestendi
+bestendig
+bestendigd
+bestendigde
+bestendigden
+bestendige
+bestendigen
+bestendiger
+bestendigheid
+bestendiging
+bestendigst
+bestendigt
+bestenfa
+bestenfalls
+bestenot
+bestenotering
+bestenoteringen
+bester
+besterf
+besterft
+besterha
+besterhaltene
+besterve
+besterven
+bestes
+bestet
+bestetid
+besteuer
+besteuernd
+besteuernde
+besteuerndem
+besteuernder
+besteuerndes
+besteuerst
+besteuerte
+besteuertem
+besteuerten
+besteuertes
+besteuertet
+besteuerung
+besteuerungen
+besteuerungsinteresse
+besteuerungspraktiken
+besteuerungsrechte
+besteuerungsverfahren
+besteuerungsverfahrens
+besteure
+bestevaa
+bestevaar
+bestevaars
+besteven
+bestevennen
+bestezuela
+bestgefu
+bestgefuehrt
+bestgehu
+bestgehuetetes
+bestgele
+bestgelegenes
+bestia
+bestiaal
+bestiaalst
+bestiair
+bestiaire
+bestiaires
+bestiaje
+bestial
+bestiale
+bestialer
+bestiales
+bestiali
+bestialidad
+bestialisch
+bestialische
+bestialischem
+bestialischen
+bestialischer
+bestialisches
+bestialism
+bestialist
+bestialite'
+bestialiteit
+bestialiteiten
+bestialities
+bestiality
+bestializarse
+bestialize
+bestialized
+bestializes
+bestializing
+bestiall
+bestially
+bestialmente
+bestials
+bestialsk
+bestialskt
+bestiame
+bestiami
+bestiari
+bestiarian
+bestiarianism
+bestiaries
+bestiario
+bestiary
+bestiaux
+bestichs
+bestichst
+bestick
+bestickt
+bestickten
+bestie
+bestiedad
+bestieg
+bestiege
+bestiegene
+bestiegenem
+bestiegenen
+bestiegenes
+bestiegs
+bestiegst
+bestiegt
+bestiehl
+bestiehlt
+bestier
+bestierd
+bestierde
+bestierden
+bestierder
+bestierders
+bestiere
+bestieren
+bestierf
+bestieri
+bestiering
+bestiert
+bestierv
+bestierven
+bestig
+bestige
+bestiges
+bestihuela
+bestijg
+bestijge
+bestijgen
+bestijgi
+bestijging
+bestijgingen
+bestijgt
+bestik
+bestikk
+bestikke
+bestikkelse
+bestikkelsen
+bestikkelser
+bestikken
+bestikket
+bestikt
+bestikte
+bestikten
+bestil
+bestill
+bestille
+bestiller
+bestilles
+bestilli
+bestilling
+bestillingen
+bestillingene
+bestillinger
+bestillingsverk
+bestilt
+bestilte
+bestimmb
+bestimmbar
+bestimmbaren
+bestimme
+bestimmen
+bestimmend
+bestimmende
+bestimmendem
+bestimmenden
+bestimmender
+bestimmendes
+bestimmm
+bestimmmten
+bestimms
+bestimmst
+bestimmt
+bestimmte
+bestimmtem
+bestimmten
+bestimmter
+bestimmtes
+bestimmtest
+bestimmtet
+bestimmtheit
+bestimmtheiten
+bestimmu
+bestimmung
+bestimmungen
+bestimmungsbuch
+bestimmungsgruende
+bestimmungshafen
+bestimmungslaendern
+bestimmungsland
+bestimmungslandes
+bestimmungsorte
+bestimmungsorten
+bestimmungsortes
+besting
+bestink
+bestio`n
+bestiole
+bestioles
+bestip
+bestippe
+bestippel
+bestippeld
+bestippelde
+bestippelden
+bestippelen
+bestippelt
+bestippen
+bestipt
+bestipte
+bestipten
+bestir
+bestirre
+bestirred
+bestirri
+bestirring
+bestirs
+bestizuela
+bestjal
+bestjele
+bestj}le
+bestj}let
+bestknow
+bestknown
+bestleis
+bestleistung
+bestleistungen
+bestmo"g
+bestmo"glichen
+bestmoeg
+bestmoegliche
+bestmoeglichem
+bestmoeglichen
+bestmoegliches
+bestness
+bestnr
+besto
+bestoche
+bestochen
+bestochene
+bestochenen
+bestochener
+bestochenes
+bestock
+bestod
+bestoel
+bestoeld
+bestoelde
+bestoelden
+bestoele
+bestoelen
+bestoelt
+bestoer
+bestoert
+bestoertning
+bestohle
+bestohlene
+bestohlenem
+bestohlenen
+bestohlenes
+bestoken
+bestokene
+bestokenen
+bestolen
+bestolene
+bestolenen
+bestond
+bestonde
+bestonden
+bestoof
+bestook
+bestookt
+bestookte
+bestookten
+bestop
+bestoppe
+bestoppen
+bestopt
+bestopte
+bestopten
+bestor
+bestore
+bestorga
+bestorganisierte
+bestorie
+bestorientierte
+bestorm
+bestormd
+bestormde
+bestormden
+bestorme
+bestormen
+bestormi
+bestorming
+bestormingen
+bestormt
+bestort
+bestorte
+bestorten
+bestorti
+bestorting
+bestortingen
+bestortn
+bestortning
+bestortt
+bestortte
+bestortten
+bestorve
+bestorven
+bestorvene
+bestorvenen
+bestove
+bestoven
+bestovene
+bestovenen
+bestow
+bestowab
+bestowable
+bestowag
+bestowage
+bestowal
+bestowals
+bestowd
+bestowed
+bestower
+bestowin
+bestowing
+bestowme
+bestowment
+bestows
+bestraal
+bestraald
+bestraalde
+bestraalden
+bestraalt
+bestraat
+bestraatte
+bestraatten
+bestradd
+bestraddle
+bestraf
+bestrafe
+bestrafen
+bestrafend
+bestrafendem
+bestrafenden
+bestrafender
+bestraff
+bestraffen
+bestraffing
+bestraffingen
+bestrafs
+bestrafst
+bestraft
+bestrafte
+bestraften
+bestrafter
+bestraftes
+bestraftet
+bestrafu
+bestrafung
+bestrahl
+bestrahle
+bestrahlen
+bestrahlende
+bestrahlendem
+bestrahlenden
+bestrahlendes
+bestrahlst
+bestrahlt
+bestrahltem
+bestrahlten
+bestrahlter
+bestrahltest
+bestrahltet
+bestrahlung
+bestrahlungen
+bestrahlungsgeraet
+bestrale
+bestralen
+bestrali
+bestraling
+bestralingen
+bestram
+bestrapp
+bestrapped
+bestrate
+bestraten
+bestrati
+bestrating
+bestraug
+bestraught
+bestraw
+bestreak
+bestream
+bestreba
+bestrebe
+bestrebelse
+bestrebelsene
+bestrebelser
+bestrebend
+bestrebende
+bestrebendem
+bestrebender
+bestrebendes
+bestreber
+bestrebet
+bestrebs
+bestrebst
+bestrebt
+bestrebte
+bestrebtem
+bestrebten
+bestrebtes
+bestrebtest
+bestrebtet
+bestrebu
+bestrebung
+bestrebungen
+bestred
+bestrede
+bestreden
+bestredene
+bestredenen
+bestreed
+bestreek
+bestreic
+bestreichen
+bestreichend
+bestreichende
+bestreichenden
+bestreichender
+bestreichendes
+bestreicht
+bestreichte
+bestreichtem
+bestreichter
+bestreichtes
+bestreichtest
+bestreit
+bestreitbar
+bestreitbare
+bestreitbaren
+bestreitbarer
+bestreitbares
+bestreiten
+bestreitend
+bestreitende
+bestreitenden
+bestreitender
+bestreitendes
+bestreitet
+bestreke
+bestreken
+bestrekene
+bestrekenen
+bestreue
+bestreuen
+bestreuende
+bestreuendem
+bestreuenden
+bestreuendes
+bestreus
+bestreust
+bestreut
+bestreutem
+bestreuten
+bestreuter
+bestreutest
+bestreutet
+bestrew
+bestrewe
+bestrewed
+bestrewi
+bestrewing
+bestrewm
+bestrewment
+bestrewn
+bestrews
+bestrich
+bestrichen
+bestrick
+bestrickende
+bestrida
+bestridd
+bestridden
+bestride
+bestrides
+bestridi
+bestriding
+bestrijd
+bestrijden
+bestrijder
+bestrijders
+bestrijding
+bestrijdt
+bestrijk
+bestrijken
+bestrijkt
+bestripe
+bestritt
+bestritten
+bestrittenem
+bestrittenen
+bestrittener
+bestrittest
+bestrittet
+bestrode
+bestrooi
+bestrooid
+bestrooide
+bestrooiden
+bestrooien
+bestrooisel
+bestrooit
+bestrown
+bestrowne
+bestr{belser
+bestr}le
+bestr}li
+bestr}ling
+bestr}lt
+bestr}lte
+bests
+bestselg
+bestselger
+bestselgeren
+bestsell
+bestseller
+bestsellers
+bestselling
+bestten
+bestu"ck
+bestu"ckbar
+bestu"cken
+bestu"ckt
+bestu"ckten
+bestu"ckung
+bestu"ckungsoption
+bestu"ckungspla"ne
+bestu"ckungsplan
+bestu"ckungsvarianten
+bestu"ckungsversionen
+bestu"nd
+bestu"nde
+bestubbl
+bestubble
+bestubbled
+bestuck
+bestud
+bestudee
+bestudeer
+bestudeerd
+bestudeerde
+bestudeerden
+bestudeert
+bestuder
+bestuderen
+bestudering
+bestueck
+bestueckt
+bestueckten
+bestueckung
+bestuerm
+bestuerme
+bestuermen
+bestuermende
+bestuermendem
+bestuermenden
+bestuermendes
+bestuermst
+bestuermt
+bestuermtem
+bestuermten
+bestuermter
+bestuermtest
+bestuermtet
+bestuermung
+bestuermungen
+bestuerz
+bestuerzen
+bestuerzenden
+bestuerzender
+bestuerzt
+bestuerztem
+bestuerzten
+bestuerzter
+bestuerzungen
+bestuhlu
+bestuhlung
+bestuif
+bestuift
+bestuive
+bestuiven
+bestuivi
+bestuiving
+bestuivingen
+bestulna
+besturen
+besturin
+besturing
+besturingskarakters
+besturingssysteem
+bestuur
+bestuurb
+bestuurbaar
+bestuurbaarheid
+bestuurbare
+bestuurd
+bestuurde
+bestuurden
+bestuurder
+bestuurders
+bestuurderscabine
+bestuurderscabines
+bestuurl
+bestuurlijk
+bestuurlijke
+bestuurs
+bestuursambtenaar
+bestuursambtenaars
+bestuursambtenaren
+bestuursapparaat
+bestuursassistent
+bestuursassistenten
+bestuurscollege
+bestuurscolleges
+bestuurscomite
+bestuurscomites
+bestuursfuncties
+bestuurskamer
+bestuurskamers
+bestuursleden
+bestuurslichaam
+bestuurslichamen
+bestuurslid
+bestuurstafel
+bestuurstafels
+bestuurster
+bestuursters
+bestuursvergadering
+bestuursvergaderingen
+bestuursvorm
+bestuursvormen
+bestuurszaken
+bestuurt
+bestwil
+bestycka
+bestyckat
+bestykke
+bestykni
+bestykning
+bestyr
+bestyre
+bestyrel
+bestyrelse
+bestyrelsen
+bestyrer
+bestyrere
+bestyreren
+bestyrerens
+bestyrerinne
+bestyrerinnen
+bestyrerinner
+bestyret
+bestyrt
+bestyrte
+bestyrtelse
+bestzeit
+best{lla
+best{llare
+best{llarnamn
+best{lld
+best{llda
+best{lle
+best{lles
+best{lln
+best{llningar
+best{llningarna
+best{llningen
+best{llningskladd
+best{llt
+best{m
+best{md
+best{mda
+best{mde
+best{mdes
+best{mma
+best{mme
+best{mmes
+best{mni
+best{mning
+best{mt
+best{ndi
+best{ndig
+best|r
+best|rtn
+best|rtning
+best|vin
+best|ving
+best|vni
+best|vning
+best|vningen
+best}
+best}ede
+best}elseskrav
+best}elseskravet
+best}elseskriteriet
+best}elseskriteriets
+best}elseskriterium
+best}en
+best}end
+best}ende
+best}et
+best}nd
+best}r
+best}tt
+besu
+besuappu
+besucador
+besucadora
+besucar
+besuch
+besuche
+besuchen
+besuchende
+besuchendem
+besuchenden
+besuchendes
+besucher
+besucherin
+besucherinnen
+besuchern
+besuchers
+besucherstamm
+besucherstrom
+besucherzahlen
+besucherziffern
+besuches
+besuchs
+besuchsb
+besuchsbericht
+besuchsf
+besuchsfahrten
+besuchsg
+besuchsgenehmigungen
+besuchsp
+besuchsperiode
+besuchsprogramms
+besuchsprotokoll
+besuchsr
+besuchsregelung
+besuchsregelungen
+besuchst
+besuchstage
+besuchstermin
+besuchsv
+besuchsverbote
+besuchsz
+besuchszeit
+besuchszeiten
+besuchsziel
+besucht
+besuchte
+besuchtem
+besuchten
+besuchter
+besuchtest
+besuchtet
+besuco`n
+besuco`na
+besudeln
+besugada
+besugar
+besugo
+besuguera
+besuguero
+besuguete
+besuiker
+besuikerd
+besuikerde
+besuikerden
+besuikeren
+besuikert
+besuit
+besully
+besungen
+besuqueador
+besuqueadora
+besuquear
+besuqueo
+besuto
+besutode
+besutose
+besutote
+besuttit
+besvaer
+besvaera
+besvangr
+besvangret
+besvar
+besvara
+besvare
+besvarelse
+besvarelsen
+besvarelsestiden
+besvarer
+besvares
+besvaret
+besvart
+besvarte
+besverge
+besverger
+besvikel
+besvikelse
+besviken
+besvime
+besvimel
+besvimelse
+besvimelsen
+besvimer
+besvimt
+besvimte
+besv{r
+besv{ra
+besv{ret
+besv{rli
+besv{rlig
+besv{rlige
+besv{rligg|res
+besv{rlighed
+besv{rligheder
+besv{rligt
+beswarm
+besweate
+besweatered
+besweete
+besweeten
+beswelte
+beswelter
+beswick
+beswim
+beswinge
+beswitch
+besynder
+besynderlig
+besynderlige
+besynderligeste
+besynderligste
+besynderligt
+besynner
+besynnerlig
+besyv
+bes{tningen
+bes{tningsmedlem
+bes{tta
+bes{tte
+bes{ttelse
+bes{ttelseh{r
+bes{ttelsestid
+bes{ttelsestyrker
+bes{tter
+bes{ttes
+bes{tts
+bes|g
+bes|ge
+bes|gende
+bes|gene
+bes|get
+bes|gte
+bes|k
+bes|ka
+bes|ke
+bes|kend
+bes|kende
+bes|kene
+bes|ker
+bes|kes
+bes|ket
+bes|ksda
+bes|ksdager
+bes|ksti
+bes|kstid
+bes|kt
+bes|kte
+bes|rga
+bes|rge
+bes|rger
+bes|rges
+bes|rget
+bet
+beta
+beta"tig
+beta"tige
+beta"tigen
+beta"tigt
+beta"tigte
+beta"tigten
+beta"tigung
+beta"tigungskolben
+beta"tigungsschritten
+beta-
+beta-tei
+beta-teilchen
+beta1
+beta11
+beta12
+beta13
+beta14
+beta2
+beta3
+beta4
+beta5
+beta6
+beta7
+beta8
+beta9
+betaal
+betaalba
+betaalbaar
+betaalbaarstelling
+betaalbare
+betaalbr
+betaalbriefje
+betaalbriefjes
+betaald
+betaalda
+betaaldag
+betaaldagen
+betaalde
+betaalden
+betaalka
+betaalkantoor
+betaalkantoren
+betaalme
+betaalmeester
+betaalmeesters
+betaalmi
+betaalmiddel
+betaalmiddelen
+betaalsr
+betaalsrol
+betaalsrollen
+betaalst
+betaalstaat
+betaalstaten
+betaalt
+betaam
+betaamd
+betaamde
+betaamden
+betaamt
+betabeta
+betabino
+betabinomial
+betabome
+betacism
+betacismus
+betackni
+betackning
+betadist
+betadistributed
+betaeckn
+betaeckning
+betaenka
+betaenke
+betaenketid
+betaenkl
+betaenklighet
+betaenks
+betaenksam
+betaetig
+betaetige
+betaetigen
+betaetigende
+betaetigendem
+betaetigenden
+betaetigendes
+betaetigst
+betaetigt
+betaetigtem
+betaetigten
+betaetigter
+betaetigtest
+betaetigtet
+betaetigungsfeld
+betaetigungsfelds
+betaeube
+betaeubend
+betaeubende
+betaeubendem
+betaeubender
+betaeubendes
+betaeubs
+betaeubst
+betaeubt
+betaeubte
+betaeubtem
+betaeubten
+betaeubtes
+betaeubtest
+betaeubtet
+betaeubu
+betaeubung
+betaeubungsmittel
+betaeubungsmitteln
+betaeubungsmittels
+betaf
+betafite
+betag
+betagaki
+betagend
+betagende
+betagte
+betagten
+betagter
+betah
+betail
+betailor
+betaine
+betainog
+betainogen
+betake
+betaken
+betakend
+betakende
+betakes
+betaking
+betakke
+betakker
+betal
+betala
+betalas
+betald
+betalda
+betale
+betalen
+betalend
+betalende
+betaler
+betalere
+betalers
+betales
+betaling
+betalinga
+betalingen
+betalingene
+betalinger
+betalingsbalans
+betalingsbalanse
+betalingsbalansen
+betalingsbetingelser
+betalingsform
+betalingskort
+betalingsmiddel
+betalingsordning
+betalingssystem
+betalingssystemet
+betalingstermijn
+betalingstermijnen
+betalingsunderskudd
+betalingsvorm
+betalk
+betalkod
+betallow
+betalnin
+betalning
+betalningar
+betalningen
+betalningsavier
+betalningsbevakningen
+betalningsmottagare
+betalningsmottagaren
+betalt
+betalte
+betameli
+betamelijk
+betamelijke
+betamelijker
+betamelijkheid
+betamelijkst
+betamen
+betangle
+betanglement
+betanka
+betanket
+betanketid
+betankli
+betanklighet
+betanksa
+betanksam
+betankt
+betareoy
+betareoya
+betarraga
+betarrata
+betas
+betask
+betassel
+betast
+betaste
+betasten
+betastende
+betastendem
+betastenden
+betastendes
+betastes
+betastest
+betastet
+betastetem
+betasteten
+betasteter
+betastetest
+betastetet
+betastte
+betastten
+betasupp
+betasuppe
+betatest
+betatron
+betatrons
+betatsch
+betatschen
+betatsu
+betatt
+betatter
+betattered
+betatu
+betau
+betawi
+betaxed
+betaya
+betazed
+betazoid
+betchamu
+betchamup
+betcher
+bete
+betear
+betebend
+betebendi
+beteckna
+beteckni
+beteckning
+beteel
+beteela
+beteeld
+beteelde
+beteelden
+beteelt
+beteem
+beteende
+beteendevetenskapliga
+beteerd
+beteerde
+beteerden
+betef
+beteg
+betegel
+betegeld
+betegelde
+betegelden
+betegele
+betegelen
+betegelt
+betegna
+betegne
+betegnede
+betegnel
+betegnelse
+betegnelsen
+betegnelser
+betegnelserne
+betegnen
+betegnende
+betegner
+betegnes
+betegnet
+beteilig
+beteilige
+beteiligen
+beteiligend
+beteiligendem
+beteiligenden
+beteiligender
+beteiligst
+beteiligt
+beteiligte
+beteiligtem
+beteiligten
+beteiligter
+beteiligtes
+beteiligtet
+beteiligung
+beteiligungen
+beteiligungsangebot
+beteiligungsangebotes
+beteiligungsbesitz
+beteiligungsertrag
+beteiligungsfirma
+beteiligungsformen
+beteiligungskapital
+beteiligungsmoeglichkeiten
+beteiligungspolitik
+beteiligungsquote
+beteiligungsrechte
+beteiligungstitel
+beteken
+betekend
+betekende
+betekenden
+betekene
+betekenen
+betekeni
+betekening
+betekenis
+betekenisleer
+betekenissen
+betekeniswijziging
+betekeniswijzigingen
+betekent
+betel
+betelen
+betelgeu
+betelgeuse
+betelkau
+betelkauw
+betelkauwen
+betelkauwt
+betelnoo
+betelnoot
+betelnot
+betelnoten
+betelnut
+betelnuts
+betelpal
+betelpalm
+betelpalmen
+betels
+beten
+betend
+betendem
+betenden
+betender
+betenk
+betenke
+betenkel
+betenkelig
+betenkelige
+betenkelighetene
+betenkeligheter
+betenkni
+betenkning
+betenkningen
+betenkningstid
+betenkningstida
+betenkningstiden
+betenkso
+betenksom
+betenksomt
+betenkt
+betenkte
+betennel
+betennelse
+betennelsen
+betent
+beter
+beteran
+beterde
+beterden
+betere
+beteren
+beterhan
+beterhand
+betering
+beterkoo
+beterkoop
+beterkop
+beterkope
+betersch
+beterschap
+betert
+betes
+betest
+betet
+betete
+betetest
+betetet
+beteuern
+beteuernde
+beteuerndem
+beteuernden
+beteuerndes
+beteuers
+beteuerst
+beteuert
+beteuertem
+beteuerten
+beteuerter
+beteuertest
+beteuertet
+beteueru
+beteuerung
+beteuerungen
+beteugel
+beteugeld
+beteugelde
+beteugelden
+beteugelen
+beteugeling
+beteugelt
+beteure
+beteuter
+beteuterd
+beteuterde
+beteuterder
+beteuterdheid
+beteuterdst
+betexi-b
+betexib
+beth
+bethabar
+bethabara
+bethalto
+bethanat
+bethanath
+bethania
+bethanie
+bethanien
+bethanki
+bethankit
+bethanna
+bethanne
+bethanot
+bethanoth
+bethany
+bethanyb
+bethanybeach
+betharab
+betharabah
+betharam
+betharbe
+betharbel
+bethaven
+bethayre
+bethayres
+bethazma
+bethazmaveth
+bethbaal
+bethbaalmeon
+bethbara
+bethbarah
+bethbire
+bethbirei
+bethcar
+bethdago
+bethdagon
+bethdibl
+bethdiblathaim
+bethel
+bethelez
+bethelezi
+bethelis
+bethelisland
+bethelit
+bethelite
+bethelks
+bethelpa
+bethelpark
+bethelri
+bethelridge
+bethels
+bethelsp
+bethelsprings
+bethemek
+bethen
+bethena
+bether
+bethera
+bethesda
+bethezel
+bethflow
+bethflower
+bethgade
+bethgader
+bethgamu
+bethgamul
+bethgea
+bethhacc
+bethhaccerem
+bethhara
+bethharan
+bethhogl
+bethhogla
+bethhoglah
+bethhoro
+bethhoron
+bethina
+bethink
+bethinki
+bethinking
+bethinks
+bethjesh
+bethjeshimoth
+bethjesi
+bethjesimoth
+bethke
+bethleba
+bethlebaoth
+bethlehe
+bethlehem
+bethlehemite
+bethlehemjudah
+bethmaac
+bethmaachah
+bethmarc
+bethmarcaboth
+bethmeon
+bethnimr
+bethnimrah
+bethough
+bethought
+bethpage
+bethpale
+bethpalet
+bethpazz
+bethpazzez
+bethpeor
+bethphag
+bethphage
+bethphel
+bethphelet
+bethral(
+bethral(l)
+bethrall
+bethraph
+bethrapha
+bethreat
+bethreaten
+bethreho
+bethrehob
+bethroot
+beths
+bethsaid
+bethsaida
+bethshan
+bethshea
+bethshean
+bethshem
+bethshemesh
+bethshemite
+bethshit
+bethshittah
+bethtapp
+bethtappuah
+bethuel
+bethul
+bethulia
+bethumb
+bethump
+bethunde
+bethunder
+bethune
+bethwack
+bethylid
+bethylidae
+bethzur
+beti
+betibe
+beticht
+betichte
+betichten
+betichti
+betichting
+betichtingen
+betichtt
+betichtte
+betichtten
+betide
+betided
+betides
+betiding
+betids
+betij
+betijen
+betijo
+betijt
+betimber
+betime
+betimeli
+betimelig
+betimes
+betimmer
+betimmerd
+betimmerde
+betimmerden
+betimmeren
+betimmering
+betimmeringen
+betimmert
+beting
+betinga
+betinge
+betinged
+betingede
+betingedes
+betingel
+betingeld
+beting
Index: configs/kernel/linux-2.4.22-i686.config
===================================================================
--- configs/kernel/linux-2.4.22-i686.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ configs/kernel/linux-2.4.22-i686.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1940 @@
+#
+# Automatically generated by make menuconfig: don't edit
+#
+CONFIG_X86=y
+# CONFIG_SBUS is not set
+CONFIG_UID16=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODVERSIONS=y
+CONFIG_KMOD=y
+
+#
+# Processor type and features
+#
+# CONFIG_M386 is not set
+# CONFIG_M486 is not set
+# CONFIG_M586 is not set
+# CONFIG_M586TSC is not set
+# CONFIG_M586MMX is not set
+CONFIG_M686=y
+# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
+# CONFIG_MELAN is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MWINCHIPC6 is not set
+# CONFIG_MWINCHIP2 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MCYRIXIII is not set
+# CONFIG_MVIAC3_2 is not set
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_INVLPG=y
+CONFIG_X86_CMPXCHG=y
+CONFIG_X86_XADD=y
+CONFIG_X86_BSWAP=y
+CONFIG_X86_POPAD_OK=y
+# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_X86_L1_CACHE_SHIFT=5
+CONFIG_X86_HAS_TSC=y
+CONFIG_X86_GOOD_APIC=y
+# CONFIG_X86_PGE is not set
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_X86_PPRO_FENCE=y
+CONFIG_X86_F00F_WORKS_OK=y
+CONFIG_X86_MCE=y
+CONFIG_TOSHIBA=m
+CONFIG_I8K=m
+CONFIG_MICROCODE=m
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
+CONFIG_NOHIGHMEM=y
+# CONFIG_HIGHMEM4G is not set
+# CONFIG_HIGHMEM64G is not set
+# CONFIG_HIGHMEM is not set
+# CONFIG_MATH_EMULATION is not set
+CONFIG_MTRR=y
+# CONFIG_SMP is not set
+CONFIG_X86_UP_APIC=y
+CONFIG_X86_UP_IOAPIC=y
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+# CONFIG_X86_TSC_DISABLE is not set
+CONFIG_X86_TSC=y
+
+#
+# General setup
+#
+CONFIG_NET=y
+CONFIG_PCI=y
+# CONFIG_PCI_GOBIOS is not set
+# CONFIG_PCI_GODIRECT is not set
+CONFIG_PCI_GOANY=y
+CONFIG_PCI_BIOS=y
+CONFIG_PCI_DIRECT=y
+CONFIG_ISA=y
+CONFIG_PCI_NAMES=y
+CONFIG_EISA=y
+# CONFIG_MCA is not set
+CONFIG_HOTPLUG=y
+
+#
+# PCMCIA/CardBus support
+#
+CONFIG_PCMCIA=m
+CONFIG_CARDBUS=y
+CONFIG_TCIC=y
+CONFIG_I82092=y
+CONFIG_I82365=y
+
+#
+# PCI Hotplug Support
+#
+CONFIG_HOTPLUG_PCI=m
+CONFIG_HOTPLUG_PCI_COMPAQ=m
+# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
+CONFIG_HOTPLUG_PCI_IBM=m
+CONFIG_HOTPLUG_PCI_ACPI=m
+CONFIG_SYSVIPC=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_SYSCTL=y
+CONFIG_KCORE_ELF=y
+# CONFIG_KCORE_AOUT is not set
+CONFIG_BINFMT_AOUT=m
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_MISC=m
+CONFIG_PM=y
+CONFIG_APM=y
+# CONFIG_APM_IGNORE_USER_SUSPEND is not set
+CONFIG_APM_DO_ENABLE=y
+CONFIG_APM_CPU_IDLE=y
+# CONFIG_APM_DISPLAY_BLANK is not set
+CONFIG_APM_RTC_IS_GMT=y
+# CONFIG_APM_ALLOW_INTS is not set
+# CONFIG_APM_REAL_MODE_POWER_OFF is not set
+
+#
+# ACPI Support
+#
+CONFIG_ACPI=y
+# CONFIG_ACPI_HT_ONLY is not set
+CONFIG_ACPI_BOOT=y
+CONFIG_ACPI_BUS=y
+CONFIG_ACPI_INTERPRETER=y
+CONFIG_ACPI_EC=y
+CONFIG_ACPI_POWER=y
+CONFIG_ACPI_PCI=y
+CONFIG_ACPI_SLEEP=y
+CONFIG_ACPI_SYSTEM=y
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_THERMAL=m
+# CONFIG_ACPI_ASUS is not set
+CONFIG_ACPI_TOSHIBA=m
+# CONFIG_ACPI_DEBUG is not set
+# CONFIG_ACPI_RELAXED_AML is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+CONFIG_MTD=m
+# CONFIG_MTD_DEBUG is not set
+CONFIG_MTD_PARTITIONS=m
+CONFIG_MTD_CONCAT=m
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_CMDLINE_PARTS=m
+CONFIG_MTD_CHAR=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+CONFIG_FTL=m
+CONFIG_NFTL=m
+# CONFIG_NFTL_RW is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_GEN_PROBE=m
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+CONFIG_MTD_ABSENT=m
+# CONFIG_MTD_OBSOLETE_CHIPS is not set
+# CONFIG_MTD_AMDSTD is not set
+# CONFIG_MTD_SHARP is not set
+# CONFIG_MTD_JEDEC is not set
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_PHYSMAP=m
+CONFIG_MTD_PHYSMAP_START=8000000
+CONFIG_MTD_PHYSMAP_LEN=4000000
+CONFIG_MTD_PHYSMAP_BUSWIDTH=2
+CONFIG_MTD_PNC2000=m
+CONFIG_MTD_SC520CDP=m
+CONFIG_MTD_NETSC520=m
+CONFIG_MTD_SBC_GXX=m
+CONFIG_MTD_ELAN_104NC=m
+CONFIG_MTD_DILNETPC=m
+CONFIG_MTD_DILNETPC_BOOTSIZE=80000
+# CONFIG_MTD_MIXMEM is not set
+# CONFIG_MTD_OCTAGON is not set
+# CONFIG_MTD_VMAX is not set
+CONFIG_MTD_SCx200_DOCFLASH=m
+# CONFIG_MTD_L440GX is not set
+CONFIG_MTD_AMD76XROM=m
+CONFIG_MTD_ICH2ROM=m
+CONFIG_MTD_NETtel=m
+CONFIG_MTD_SCB2_FLASH=m
+CONFIG_MTD_PCI=m
+CONFIG_MTD_PCMCIA=m
+
+#
+# Self-contained MTD device drivers
+#
+CONFIG_MTD_PMC551=m
+# CONFIG_MTD_PMC551_BUGFIX is not set
+# CONFIG_MTD_PMC551_DEBUG is not set
+CONFIG_MTD_SLRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLKMTD=m
+CONFIG_MTD_DOC1000=m
+CONFIG_MTD_DOC2000=m
+CONFIG_MTD_DOC2001=m
+CONFIG_MTD_DOCPROBE=m
+CONFIG_MTD_DOCPROBE_ADVANCED=y
+CONFIG_MTD_DOCPROBE_ADDRESS=0000
+CONFIG_MTD_DOCPROBE_HIGH=y
+CONFIG_MTD_DOCPROBE_55AA=y
+
+#
+# NAND Flash Device Drivers
+#
+CONFIG_MTD_NAND=m
+# CONFIG_MTD_NAND_VERIFY_WRITE is not set
+CONFIG_MTD_NAND_IDS=m
+
+#
+# Parallel port support
+#
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_PC_CML1=m
+CONFIG_PARPORT_SERIAL=m
+CONFIG_PARPORT_PC_FIFO=y
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_PC_PCMCIA=m
+# CONFIG_PARPORT_AMIGA is not set
+# CONFIG_PARPORT_MFC3 is not set
+# CONFIG_PARPORT_ATARI is not set
+# CONFIG_PARPORT_GSC is not set
+# CONFIG_PARPORT_SUNBPP is not set
+CONFIG_PARPORT_OTHER=y
+CONFIG_PARPORT_1284=y
+
+#
+# Plug and Play configuration
+#
+CONFIG_PNP=y
+CONFIG_ISAPNP=y
+
+#
+# Block devices
+#
+CONFIG_BLK_DEV_FD=m
+CONFIG_BLK_DEV_XD=m
+CONFIG_PARIDE=m
+CONFIG_PARIDE_PARPORT=m
+CONFIG_PARIDE_PD=m
+CONFIG_PARIDE_PCD=m
+CONFIG_PARIDE_PF=m
+CONFIG_PARIDE_PT=m
+CONFIG_PARIDE_PG=m
+CONFIG_PARIDE_ATEN=m
+CONFIG_PARIDE_BPCK=m
+CONFIG_PARIDE_BPCK6=m
+CONFIG_PARIDE_COMM=m
+CONFIG_PARIDE_DSTR=m
+CONFIG_PARIDE_FIT2=m
+CONFIG_PARIDE_FIT3=m
+CONFIG_PARIDE_EPAT=m
+CONFIG_PARIDE_EPATC8=y
+CONFIG_PARIDE_EPIA=m
+CONFIG_PARIDE_FRIQ=m
+CONFIG_PARIDE_FRPW=m
+CONFIG_PARIDE_KBIC=m
+CONFIG_PARIDE_KTTI=m
+CONFIG_PARIDE_ON20=m
+CONFIG_PARIDE_ON26=m
+CONFIG_BLK_CPQ_DA=m
+CONFIG_BLK_CPQ_CISS_DA=m
+CONFIG_CISS_SCSI_TAPE=y
+CONFIG_BLK_DEV_DAC960=m
+CONFIG_BLK_DEV_UMEM=m
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=32000
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_BLK_STATS=y
+
+#
+# Multi-device support (RAID and LVM)
+#
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID5=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_BLK_DEV_LVM=m
+
+#
+# Networking options
+#
+CONFIG_PACKET=m
+CONFIG_PACKET_MMAP=y
+CONFIG_NETLINK_DEV=m
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_FILTER=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_FWMARK=y
+CONFIG_IP_ROUTE_NAT=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_TOS=y
+CONFIG_IP_ROUTE_VERBOSE=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+# CONFIG_ARPD is not set
+CONFIG_INET_ECN=y
+CONFIG_SYN_COOKIES=y
+
+#
+#   IP: Netfilter Configuration
+#
+CONFIG_IP_NF_CONNTRACK=m
+CONFIG_IP_NF_FTP=m
+# CONFIG_IP_NF_AMANDA is not set
+# CONFIG_IP_NF_TFTP is not set
+CONFIG_IP_NF_IRC=m
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_LIMIT=m
+CONFIG_IP_NF_MATCH_MAC=m
+CONFIG_IP_NF_MATCH_PKTTYPE=m
+CONFIG_IP_NF_MATCH_MARK=m
+CONFIG_IP_NF_MATCH_MULTIPORT=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_DSCP=m
+CONFIG_IP_NF_MATCH_AH_ESP=m
+CONFIG_IP_NF_MATCH_LENGTH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_TCPMSS=m
+CONFIG_IP_NF_MATCH_HELPER=m
+CONFIG_IP_NF_MATCH_STATE=m
+CONFIG_IP_NF_MATCH_CONNTRACK=m
+CONFIG_IP_NF_MATCH_UNCLEAN=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_MIRROR=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_NAT_LOCAL=y
+CONFIG_IP_NF_NAT_SNMP_BASIC=m
+CONFIG_IP_NF_NAT_IRC=m
+CONFIG_IP_NF_NAT_FTP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_DSCP=m
+CONFIG_IP_NF_TARGET_MARK=m
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_TARGET_TCPMSS=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+# CONFIG_IP_NF_ARP_MANGLE is not set
+CONFIG_IP_NF_COMPAT_IPCHAINS=m
+CONFIG_IP_NF_NAT_NEEDED=y
+CONFIG_IP_NF_COMPAT_IPFWADM=m
+CONFIG_IP_NF_NAT_NEEDED=y
+CONFIG_IPV6=m
+
+#
+#   IPv6: Netfilter Configuration
+#
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_LIMIT=m
+CONFIG_IP6_NF_MATCH_MAC=m
+# CONFIG_IP6_NF_MATCH_RT is not set
+# CONFIG_IP6_NF_MATCH_OPTS is not set
+# CONFIG_IP6_NF_MATCH_FRAG is not set
+# CONFIG_IP6_NF_MATCH_HL is not set
+CONFIG_IP6_NF_MATCH_MULTIPORT=m
+CONFIG_IP6_NF_MATCH_OWNER=m
+CONFIG_IP6_NF_MATCH_MARK=m
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+# CONFIG_IP6_NF_MATCH_AHESP is not set
+CONFIG_IP6_NF_MATCH_LENGTH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_TARGET_MARK=m
+CONFIG_KHTTPD=m
+CONFIG_ATM=y
+CONFIG_ATM_CLIP=y
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+CONFIG_ATM_BR2684_IPFILTER=y
+CONFIG_VLAN_8021Q=m
+CONFIG_IPX=m
+# CONFIG_IPX_INTERN is not set
+CONFIG_ATALK=m
+
+#
+# Appletalk devices
+#
+CONFIG_DEV_APPLETALK=y
+CONFIG_LTPC=m
+CONFIG_COPS=m
+CONFIG_COPS_DAYNA=y
+CONFIG_COPS_TANGENT=y
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_IPDDP_DECAP=y
+CONFIG_DECNET=m
+# CONFIG_DECNET_SIOCGIFCONF is not set
+# CONFIG_DECNET_ROUTER is not set
+CONFIG_BRIDGE=m
+CONFIG_X25=m
+CONFIG_LAPB=m
+# CONFIG_LLC is not set
+# CONFIG_NET_DIVERT is not set
+CONFIG_ECONET=m
+CONFIG_ECONET_AUNUDP=y
+CONFIG_ECONET_NATIVE=y
+CONFIG_WAN_ROUTER=m
+# CONFIG_NET_FASTROUTE is not set
+# CONFIG_NET_HW_FLOWCONTROL is not set
+
+#
+# QoS and/or fair queueing
+#
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_CSZ=m
+# CONFIG_NET_SCH_ATM is not set
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_QOS=y
+CONFIG_NET_ESTIMATOR=y
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_ROUTE=y
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_POLICE=y
+
+#
+# Network testing
+#
+CONFIG_NET_PKTGEN=m
+CONFIG_IPSEC=m
+CONFIG_IPSEC_IPIP=y
+CONFIG_IPSEC_AH=y
+CONFIG_IPSEC_AUTH_HMAC_MD5=y
+CONFIG_IPSEC_AUTH_HMAC_SHA1=y
+CONFIG_IPSEC_ESP=y
+CONFIG_IPSEC_ENC_3DES=y
+CONFIG_IPSEC_ALG=y
+# CONFIG_IPSEC_ALG_MD5 is not set
+# CONFIG_IPSEC_ALG_SHA1 is not set
+# CONFIG_IPSEC_ALG_SHA2 is not set
+CONFIG_IPSEC_ALG_3DES=m
+CONFIG_IPSEC_ALG_AES=m
+CONFIG_IPSEC_ALG_BLOWFISH=m
+# CONFIG_IPSEC_ALG_TWOFISH is not set
+# CONFIG_IPSEC_ALG_SERPENT is not set
+# CONFIG_IPSEC_ALG_CAST is not set
+# CONFIG_IPSEC_ALG_NULL is not set
+# CONFIG_IPSEC_ALG_CRYPTOAPI is not set
+# CONFIG_IPSEC_ALG_1DES is not set
+CONFIG_IPSEC_IPCOMP=y
+CONFIG_IPSEC_DEBUG=y
+CONFIG_IPSEC_NAT_TRAVERSAL=y
+
+#
+# Telephony Support
+#
+CONFIG_PHONE=m
+CONFIG_PHONE_IXJ=m
+CONFIG_PHONE_IXJ_PCMCIA=m
+
+#
+# ATA/IDE/MFM/RLL support
+#
+CONFIG_IDE=y
+
+#
+# IDE, ATA and ATAPI Block devices
+#
+CONFIG_BLK_DEV_IDE=y
+# CONFIG_BLK_DEV_HD_IDE is not set
+# CONFIG_BLK_DEV_HD is not set
+CONFIG_BLK_DEV_IDEDISK=y
+CONFIG_IDEDISK_MULTI_MODE=y
+# CONFIG_IDEDISK_STROKE is not set
+CONFIG_BLK_DEV_IDECS=m
+CONFIG_BLK_DEV_IDECD=m
+CONFIG_BLK_DEV_IDETAPE=m
+CONFIG_BLK_DEV_IDEFLOPPY=m
+CONFIG_BLK_DEV_IDESCSI=m
+CONFIG_IDE_TASK_IOCTL=y
+CONFIG_BLK_DEV_CMD640=y
+# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
+CONFIG_BLK_DEV_ISAPNP=y
+CONFIG_BLK_DEV_IDEPCI=y
+CONFIG_BLK_DEV_GENERIC=y
+CONFIG_IDEPCI_SHARE_IRQ=y
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+CONFIG_BLK_DEV_OFFBOARD=y
+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
+CONFIG_IDEDMA_PCI_AUTO=y
+# CONFIG_IDEDMA_ONLYDISK is not set
+CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDEDMA_PCI_WIP is not set
+# CONFIG_BLK_DEV_ADMA100 is not set
+CONFIG_BLK_DEV_AEC62XX=m
+CONFIG_BLK_DEV_ALI15X3=y
+# CONFIG_WDC_ALI15X3 is not set
+CONFIG_BLK_DEV_AMD74XX=y
+# CONFIG_AMD74XX_OVERRIDE is not set
+CONFIG_BLK_DEV_CMD64X=y
+CONFIG_BLK_DEV_TRIFLEX=m
+# CONFIG_BLK_DEV_CY82C693 is not set
+CONFIG_BLK_DEV_CS5530=m
+CONFIG_BLK_DEV_HPT34X=y
+# CONFIG_HPT34X_AUTODMA is not set
+CONFIG_BLK_DEV_HPT366=y
+CONFIG_BLK_DEV_PIIX=y
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_OPTI621 is not set
+CONFIG_BLK_DEV_PDC202XX_OLD=y
+# CONFIG_PDC202XX_BURST is not set
+CONFIG_BLK_DEV_PDC202XX_NEW=y
+# CONFIG_PDC202XX_FORCE is not set
+CONFIG_BLK_DEV_RZ1000=m
+CONFIG_BLK_DEV_SC1200=m
+CONFIG_BLK_DEV_SVWKS=y
+CONFIG_BLK_DEV_SIIMAGE=y
+CONFIG_BLK_DEV_SIS5513=y
+CONFIG_BLK_DEV_SLC90E66=m
+CONFIG_BLK_DEV_TRM290=m
+CONFIG_BLK_DEV_VIA82CXXX=y
+# CONFIG_IDE_CHIPSETS is not set
+CONFIG_IDEDMA_AUTO=y
+# CONFIG_IDEDMA_IVB is not set
+# CONFIG_DMA_NONPCI is not set
+CONFIG_BLK_DEV_PDC202XX=y
+CONFIG_BLK_DEV_IDE_MODES=y
+CONFIG_BLK_DEV_ATARAID=m
+CONFIG_BLK_DEV_ATARAID_PDC=m
+CONFIG_BLK_DEV_ATARAID_HPT=m
+CONFIG_BLK_DEV_ATARAID_SII=m
+
+#
+# SCSI support
+#
+CONFIG_SCSI=m
+CONFIG_BLK_DEV_SD=m
+CONFIG_SD_EXTRA_DEVS=40
+CONFIG_CHR_DEV_ST=m
+CONFIG_CHR_DEV_OSST=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_SR_EXTRA_DEVS=2
+CONFIG_CHR_DEV_SG=m
+# CONFIG_SCSI_DEBUG_QUEUES is not set
+# CONFIG_SCSI_MULTI_LUN is not set
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+
+#
+# SCSI low-level drivers
+#
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_7000FASST=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AHA152X=m
+CONFIG_SCSI_AHA1542=m
+CONFIG_SCSI_AHA1740=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=253
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+CONFIG_AIC7XXX_PROBE_EISA_VL=y
+# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
+# CONFIG_SCSI_AIC79XX is not set
+CONFIG_SCSI_AIC7XXX_OLD=m
+CONFIG_AIC7XXX_OLD_TCQ_ON_BY_DEFAULT=y
+CONFIG_AIC7XXX_OLD_CMDS_PER_DEVICE=32
+CONFIG_AIC7XXX_OLD_PROC_STATS=y
+CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_IN2000=m
+CONFIG_SCSI_AM53C974=m
+CONFIG_SCSI_MEGARAID=m
+CONFIG_SCSI_BUSLOGIC=m
+# CONFIG_SCSI_OMIT_FLASHPOINT is not set
+CONFIG_SCSI_CPQFCTS=m
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_DTC3280=m
+CONFIG_SCSI_EATA=m
+CONFIG_SCSI_EATA_TAGGED_QUEUE=y
+# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
+CONFIG_SCSI_EATA_MAX_TAGS=16
+CONFIG_SCSI_EATA_DMA=m
+CONFIG_SCSI_EATA_PIO=m
+CONFIG_SCSI_FUTURE_DOMAIN=m
+CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_GENERIC_NCR5380=m
+CONFIG_SCSI_GENERIC_NCR53C400=y
+CONFIG_SCSI_G_NCR5380_PORT=y
+# CONFIG_SCSI_G_NCR5380_MEM is not set
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_NCR53C406A=m
+CONFIG_SCSI_NCR53C7xx=m
+# CONFIG_SCSI_NCR53C7xx_sync is not set
+CONFIG_SCSI_NCR53C7xx_FAST=y
+CONFIG_SCSI_NCR53C7xx_DISCONNECT=y
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
+# CONFIG_SCSI_NCR53C8XX is not set
+# CONFIG_SCSI_SYM53C8XX is not set
+CONFIG_SCSI_PAS16=m
+CONFIG_SCSI_PCI2000=m
+CONFIG_SCSI_PCI2220I=m
+CONFIG_SCSI_PSI240I=m
+CONFIG_SCSI_QLOGIC_FAS=m
+CONFIG_SCSI_QLOGIC_ISP=m
+CONFIG_SCSI_QLOGIC_FC=m
+# CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_SEAGATE=m
+CONFIG_SCSI_SIM710=m
+CONFIG_SCSI_SYM53C416=m
+CONFIG_SCSI_DC390T=m
+# CONFIG_SCSI_DC390T_NOGENSUPP is not set
+CONFIG_SCSI_T128=m
+CONFIG_SCSI_U14_34F=m
+CONFIG_SCSI_U14_34F_LINKED_COMMANDS=y
+CONFIG_SCSI_U14_34F_MAX_TAGS=8
+CONFIG_SCSI_ULTRASTOR=m
+CONFIG_SCSI_NSP32=m
+CONFIG_SCSI_DEBUG=m
+
+#
+# PCMCIA SCSI adapter support
+#
+CONFIG_SCSI_PCMCIA=y
+CONFIG_PCMCIA_AHA152X=m
+CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_PCMCIA_NINJA_SCSI=m
+CONFIG_PCMCIA_QLOGIC=m
+
+#
+# Fusion MPT device support
+#
+CONFIG_FUSION=m
+# CONFIG_FUSION_BOOT is not set
+CONFIG_FUSION_MAX_SGE=40
+CONFIG_FUSION_ISENSE=m
+CONFIG_FUSION_CTL=m
+CONFIG_FUSION_LAN=m
+CONFIG_NET_FC=y
+
+#
+# IEEE 1394 (FireWire) support (EXPERIMENTAL)
+#
+CONFIG_IEEE1394=m
+CONFIG_IEEE1394_PCILYNX=m
+CONFIG_IEEE1394_OHCI1394=m
+CONFIG_IEEE1394_VIDEO1394=m
+CONFIG_IEEE1394_SBP2=m
+# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
+CONFIG_IEEE1394_ETH1394=m
+CONFIG_IEEE1394_DV1394=m
+CONFIG_IEEE1394_RAWIO=m
+CONFIG_IEEE1394_CMP=m
+CONFIG_IEEE1394_AMDTP=m
+# CONFIG_IEEE1394_VERBOSEDEBUG is not set
+# CONFIG_IEEE1394_OUI_DB is not set
+
+#
+# I2O device support
+#
+CONFIG_I2O=m
+CONFIG_I2O_PCI=m
+CONFIG_I2O_BLOCK=m
+CONFIG_I2O_LAN=m
+CONFIG_I2O_SCSI=m
+CONFIG_I2O_PROC=m
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+
+#
+# ARCnet devices
+#
+CONFIG_ARCNET=m
+CONFIG_ARCNET_1201=m
+CONFIG_ARCNET_1051=m
+CONFIG_ARCNET_RAW=m
+CONFIG_ARCNET_COM90xx=m
+CONFIG_ARCNET_COM90xxIO=m
+CONFIG_ARCNET_RIM_I=m
+CONFIG_ARCNET_COM20020=m
+CONFIG_ARCNET_COM20020_ISA=m
+CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_DUMMY=m
+CONFIG_BONDING=m
+CONFIG_EQUALIZER=m
+CONFIG_TUN=m
+CONFIG_ETHERTAP=m
+CONFIG_NET_SB1000=m
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+# CONFIG_SUNLANCE is not set
+CONFIG_HAPPYMEAL=m
+# CONFIG_SUNBMAC is not set
+# CONFIG_SUNQE is not set
+CONFIG_SUNGEM=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_EL1=m
+CONFIG_EL2=m
+CONFIG_ELPLUS=m
+CONFIG_EL16=m
+CONFIG_EL3=m
+CONFIG_3C515=m
+# CONFIG_ELMC is not set
+# CONFIG_ELMC_II is not set
+CONFIG_VORTEX=m
+# CONFIG_TYPHOON is not set
+CONFIG_LANCE=m
+CONFIG_NET_VENDOR_SMC=y
+CONFIG_WD80x3=m
+# CONFIG_ULTRAMCA is not set
+CONFIG_ULTRA=m
+CONFIG_ULTRA32=m
+CONFIG_SMC9194=m
+CONFIG_NET_VENDOR_RACAL=y
+CONFIG_NI5010=m
+CONFIG_NI52=m
+CONFIG_NI65=m
+CONFIG_AT1700=m
+CONFIG_DEPCA=m
+CONFIG_HP100=m
+CONFIG_NET_ISA=y
+CONFIG_E2100=m
+CONFIG_EWRK3=m
+CONFIG_EEXPRESS=m
+CONFIG_EEXPRESS_PRO=m
+CONFIG_HPLAN_PLUS=m
+CONFIG_HPLAN=m
+CONFIG_LP486E=m
+CONFIG_ETH16I=m
+CONFIG_NE2000=m
+CONFIG_NET_PCI=y
+CONFIG_PCNET32=m
+# CONFIG_AMD8111_ETH is not set
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_AC3200=m
+CONFIG_APRICOT=m
+# CONFIG_B44 is not set
+CONFIG_CS89x0=m
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+CONFIG_DE4X5=m
+CONFIG_DGRS=m
+CONFIG_DM9102=m
+CONFIG_EEPRO100=m
+# CONFIG_EEPRO100_PIO is not set
+CONFIG_E100=m
+CONFIG_LNE390=m
+CONFIG_FEALNX=m
+CONFIG_NATSEMI=m
+CONFIG_NE2K_PCI=m
+CONFIG_NE3210=m
+CONFIG_ES3210=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_SIS900=m
+CONFIG_EPIC100=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_TLAN=m
+CONFIG_VIA_RHINE=m
+# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_WINBOND_840=m
+CONFIG_NET_POCKET=y
+CONFIG_ATP=m
+CONFIG_DE600=m
+CONFIG_DE620=m
+
+#
+# Ethernet (1000 Mbit)
+#
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_DL2K=m
+CONFIG_E1000=m
+# CONFIG_E1000_NAPI is not set
+# CONFIG_MYRI_SBUS is not set
+CONFIG_NS83820=m
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_R8169=m
+CONFIG_SK98LIN=m
+CONFIG_TIGON3=m
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+CONFIG_SKFP=m
+# CONFIG_HIPPI is not set
+CONFIG_PLIP=m
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPPOE=m
+CONFIG_PPPOATM=m
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+
+#
+# Wireless LAN (non-hamradio)
+#
+CONFIG_NET_RADIO=y
+CONFIG_STRIP=m
+CONFIG_WAVELAN=m
+CONFIG_ARLAN=m
+CONFIG_AIRONET4500=m
+CONFIG_AIRONET4500_NONCS=m
+CONFIG_AIRONET4500_PNP=y
+CONFIG_AIRONET4500_PCI=y
+# CONFIG_AIRONET4500_ISA is not set
+# CONFIG_AIRONET4500_I365 is not set
+CONFIG_AIRONET4500_PROC=m
+CONFIG_AIRO=m
+CONFIG_HERMES=m
+CONFIG_PLX_HERMES=m
+CONFIG_PCI_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_AIRO_CS=m
+CONFIG_NET_WIRELESS=y
+
+#
+# Token Ring devices
+#
+CONFIG_TR=y
+CONFIG_IBMTR=m
+CONFIG_IBMOL=m
+CONFIG_IBMLS=m
+CONFIG_3C359=m
+CONFIG_TMS380TR=m
+CONFIG_TMSPCI=m
+CONFIG_TMSISA=m
+CONFIG_ABYSS=m
+# CONFIG_MADGEMC is not set
+CONFIG_SMCTR=m
+CONFIG_NET_FC=y
+CONFIG_IPHASE5526=m
+CONFIG_RCPCI=m
+CONFIG_SHAPER=m
+
+#
+# Wan interfaces
+#
+CONFIG_WAN=y
+CONFIG_HOSTESS_SV11=m
+CONFIG_COSA=m
+# CONFIG_COMX is not set
+# CONFIG_DSCC4 is not set
+# CONFIG_LANMEDIA is not set
+CONFIG_ATI_XX20=m
+CONFIG_SEALEVEL_4021=m
+# CONFIG_SYNCLINK_SYNCPPP is not set
+CONFIG_HDLC=m
+CONFIG_HDLC_RAW=y
+CONFIG_HDLC_CISCO=y
+CONFIG_HDLC_FR=y
+CONFIG_HDLC_PPP=y
+CONFIG_HDLC_X25=y
+CONFIG_N2=m
+CONFIG_C101=m
+CONFIG_FARSYNC=m
+# CONFIG_HDLC_DEBUG_PKT is not set
+# CONFIG_HDLC_DEBUG_HARD_HEADER is not set
+# CONFIG_HDLC_DEBUG_ECN is not set
+# CONFIG_HDLC_DEBUG_RINGS is not set
+CONFIG_DLCI=m
+CONFIG_DLCI_COUNT=24
+CONFIG_DLCI_MAX=8
+CONFIG_SDLA=m
+CONFIG_WAN_ROUTER_DRIVERS=y
+CONFIG_VENDOR_SANGOMA=m
+CONFIG_WANPIPE_CHDLC=y
+CONFIG_WANPIPE_FR=y
+CONFIG_WANPIPE_X25=y
+CONFIG_WANPIPE_PPP=y
+CONFIG_WANPIPE_MULTPPP=y
+CONFIG_CYCLADES_SYNC=m
+CONFIG_CYCLOMX_X25=y
+# CONFIG_LAPBETHER is not set
+# CONFIG_X25_ASY is not set
+CONFIG_SBNI=m
+CONFIG_SBNI_MULTILINE=y
+
+#
+# PCMCIA network device support
+#
+CONFIG_NET_PCMCIA=y
+CONFIG_PCMCIA_3C589=m
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_PCMCIA_AXNET=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_ARCNET_COM20020_CS=m
+CONFIG_PCMCIA_IBMTR=m
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_PCMCIA_XIRTULIP=m
+CONFIG_NET_PCMCIA_RADIO=y
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_PCMCIA_NETWAVE=m
+CONFIG_PCMCIA_WAVELAN=m
+CONFIG_AIRONET4500_CS=m
+
+#
+# ATM drivers
+#
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_ZATM_EXACT_TS=y
+CONFIG_ATM_NICSTAR=m
+CONFIG_ATM_NICSTAR_USE_SUNI=y
+CONFIG_ATM_NICSTAR_USE_IDT77105=y
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E_MAYBE=m
+CONFIG_ATM_FORE200E_PCA=y
+CONFIG_ATM_FORE200E_PCA_DEFAULT_FW=y
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_HE is not set
+
+#
+# Amateur Radio support
+#
+CONFIG_HAMRADIO=y
+CONFIG_AX25=m
+CONFIG_AX25_DAMA_SLAVE=y
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+#
+# AX.25 network device drivers
+#
+CONFIG_MKISS=m
+CONFIG_6PACK=m
+CONFIG_BPQETHER=m
+CONFIG_DMASCC=m
+CONFIG_SCC=m
+# CONFIG_SCC_DELAY is not set
+# CONFIG_SCC_TRXECHO is not set
+CONFIG_BAYCOM_SER_FDX=m
+CONFIG_BAYCOM_SER_HDX=m
+CONFIG_BAYCOM_PAR=m
+CONFIG_BAYCOM_EPP=m
+CONFIG_SOUNDMODEM=m
+CONFIG_SOUNDMODEM_SBC=y
+CONFIG_SOUNDMODEM_WSS=y
+CONFIG_SOUNDMODEM_AFSK1200=y
+CONFIG_SOUNDMODEM_AFSK2400_7=y
+CONFIG_SOUNDMODEM_AFSK2400_8=y
+CONFIG_SOUNDMODEM_AFSK2666=y
+CONFIG_SOUNDMODEM_HAPN4800=y
+CONFIG_SOUNDMODEM_PSK4800=y
+CONFIG_SOUNDMODEM_FSK9600=y
+CONFIG_YAM=m
+
+#
+# IrDA (infrared) support
+#
+CONFIG_IRDA=m
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+CONFIG_IRDA_ULTRA=y
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+CONFIG_IRTTY_SIR=m
+CONFIG_IRPORT_SIR=m
+CONFIG_DONGLE=y
+CONFIG_ESI_DONGLE=m
+CONFIG_ACTISYS_DONGLE=m
+CONFIG_TEKRAM_DONGLE=m
+CONFIG_GIRBIL_DONGLE=m
+CONFIG_LITELINK_DONGLE=m
+CONFIG_MCP2120_DONGLE=m
+CONFIG_OLD_BELKIN_DONGLE=m
+CONFIG_ACT200L_DONGLE=m
+CONFIG_MA600_DONGLE=m
+CONFIG_USB_IRDA=m
+CONFIG_NSC_FIR=m
+CONFIG_WINBOND_FIR=m
+CONFIG_TOSHIBA_OLD=m
+CONFIG_TOSHIBA_FIR=m
+CONFIG_SMC_IRCC_FIR=m
+CONFIG_ALI_FIR=m
+CONFIG_VLSI_FIR=m
+
+#
+# ISDN subsystem
+#
+CONFIG_ISDN=m
+CONFIG_ISDN_BOOL=y
+CONFIG_ISDN_PPP=y
+# CONFIG_IPPP_FILTER is not set
+CONFIG_ISDN_PPP_VJ=y
+CONFIG_ISDN_MPP=y
+CONFIG_ISDN_PPP_BSDCOMP=m
+CONFIG_ISDN_AUDIO=y
+CONFIG_ISDN_TTY_FAX=y
+CONFIG_ISDN_X25=y
+
+#
+# ISDN feature submodules
+#
+CONFIG_ISDN_DRV_LOOP=m
+CONFIG_ISDN_DIVERSION=m
+
+#
+# Passive ISDN cards
+#
+CONFIG_ISDN_DRV_HISAX=m
+CONFIG_ISDN_HISAX=y
+CONFIG_HISAX_EURO=y
+CONFIG_DE_AOC=y
+# CONFIG_HISAX_NO_SENDCOMPLETE is not set
+# CONFIG_HISAX_NO_LLC is not set
+# CONFIG_HISAX_NO_KEYPAD is not set
+CONFIG_HISAX_1TR6=y
+CONFIG_HISAX_NI1=y
+CONFIG_HISAX_MAX_CARDS=8
+CONFIG_HISAX_16_0=y
+CONFIG_HISAX_16_3=y
+CONFIG_HISAX_AVM_A1=y
+CONFIG_HISAX_IX1MICROR2=y
+CONFIG_HISAX_ASUSCOM=y
+CONFIG_HISAX_TELEINT=y
+CONFIG_HISAX_HFCS=y
+CONFIG_HISAX_SPORTSTER=y
+CONFIG_HISAX_MIC=y
+CONFIG_HISAX_ISURF=y
+CONFIG_HISAX_HSTSAPHIR=y
+CONFIG_HISAX_TELESPCI=y
+CONFIG_HISAX_S0BOX=y
+CONFIG_HISAX_FRITZPCI=y
+CONFIG_HISAX_AVM_A1_PCMCIA=y
+CONFIG_HISAX_ELSA=y
+CONFIG_HISAX_DIEHLDIVA=y
+CONFIG_HISAX_SEDLBAUER=y
+CONFIG_HISAX_NETJET=y
+CONFIG_HISAX_NETJET_U=y
+CONFIG_HISAX_NICCY=y
+CONFIG_HISAX_BKM_A4T=y
+CONFIG_HISAX_SCT_QUADRO=y
+CONFIG_HISAX_GAZEL=y
+CONFIG_HISAX_HFC_PCI=y
+CONFIG_HISAX_W6692=y
+CONFIG_HISAX_HFC_SX=y
+CONFIG_HISAX_ENTERNOW_PCI=y
+CONFIG_HISAX_DEBUG=y
+CONFIG_HISAX_SEDLBAUER_CS=m
+CONFIG_HISAX_ELSA_CS=m
+CONFIG_HISAX_AVM_A1_CS=m
+CONFIG_HISAX_ST5481=m
+CONFIG_HISAX_FRITZ_PCIPNP=m
+CONFIG_USB_AUERISDN=m
+
+#
+# Active ISDN cards
+#
+CONFIG_ISDN_DRV_ICN=m
+CONFIG_ISDN_DRV_PCBIT=m
+CONFIG_ISDN_DRV_SC=m
+CONFIG_ISDN_DRV_ACT2000=m
+CONFIG_ISDN_DRV_EICON=y
+CONFIG_ISDN_DRV_EICON_DIVAS=m
+CONFIG_ISDN_DRV_EICON_OLD=m
+CONFIG_ISDN_DRV_EICON_PCI=y
+CONFIG_ISDN_DRV_EICON_ISA=y
+CONFIG_ISDN_DRV_TPAM=m
+CONFIG_ISDN_CAPI=m
+CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+CONFIG_ISDN_CAPI_CAPIFS=m
+CONFIG_ISDN_CAPI_CAPIDRV=m
+CONFIG_ISDN_DRV_AVMB1_B1ISA=m
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_T1ISA=m
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+
+#
+# Old CD-ROM drivers (not SCSI, not IDE)
+#
+CONFIG_CD_NO_IDESCSI=y
+CONFIG_AZTCD=m
+CONFIG_GSCD=m
+CONFIG_SBPCD=m
+CONFIG_MCD=m
+CONFIG_MCD_IRQ=11
+CONFIG_MCD_BASE=300
+CONFIG_MCDX=m
+CONFIG_OPTCD=m
+CONFIG_CM206=m
+CONFIG_SJCD=m
+CONFIG_ISP16_CDI=m
+CONFIG_CDU31A=m
+CONFIG_CDU535=m
+
+#
+# Input core support
+#
+CONFIG_INPUT=m
+CONFIG_INPUT_KEYBDEV=m
+CONFIG_INPUT_MOUSEDEV=m
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=m
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_SERIAL=y
+CONFIG_SERIAL_CONSOLE=y
+CONFIG_SERIAL_EXTENDED=y
+CONFIG_SERIAL_MANY_PORTS=y
+CONFIG_SERIAL_SHARE_IRQ=y
+# CONFIG_SERIAL_DETECT_IRQ is not set
+CONFIG_SERIAL_MULTIPORT=y
+CONFIG_HUB6=y
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_COMPUTONE=m
+CONFIG_ROCKETPORT=m
+CONFIG_CYCLADES=m
+# CONFIG_CYZ_INTR is not set
+CONFIG_DIGIEPCA=m
+CONFIG_ESPSERIAL=m
+CONFIG_MOXA_INTELLIO=m
+CONFIG_MOXA_SMARTIO=m
+CONFIG_ISI=m
+CONFIG_SYNCLINK=m
+CONFIG_SYNCLINKMP=m
+CONFIG_N_HDLC=m
+CONFIG_RISCOM8=m
+CONFIG_SPECIALIX=m
+# CONFIG_SPECIALIX_RTSCTS is not set
+CONFIG_SX=m
+CONFIG_RIO=m
+# CONFIG_RIO_OLDPCI is not set
+CONFIG_STALDRV=y
+CONFIG_STALLION=m
+CONFIG_ISTALLION=m
+CONFIG_UNIX98_PTYS=y
+CONFIG_UNIX98_PTY_COUNT=256
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+CONFIG_PPDEV=m
+CONFIG_TIPAR=m
+
+#
+# I2C support
+#
+CONFIG_I2C=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_PHILIPSPAR=m
+CONFIG_I2C_ELV=m
+CONFIG_I2C_VELLEMAN=m
+CONFIG_SCx200_I2C=m
+CONFIG_SCx200_I2C_SCL=12
+CONFIG_SCx200_I2C_SDA=13
+CONFIG_SCx200_ACB=m
+CONFIG_I2C_ALGOPCF=m
+CONFIG_I2C_ELEKTOR=m
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_PROC=m
+
+#
+# Mice
+#
+CONFIG_BUSMOUSE=m
+CONFIG_ATIXL_BUSMOUSE=m
+CONFIG_LOGIBUSMOUSE=m
+CONFIG_MS_BUSMOUSE=m
+CONFIG_MOUSE=m
+CONFIG_PSMOUSE=y
+CONFIG_82C710_MOUSE=m
+CONFIG_PC110_PAD=m
+CONFIG_MK712_MOUSE=m
+
+#
+# Joysticks
+#
+CONFIG_INPUT_GAMEPORT=m
+CONFIG_INPUT_NS558=m
+CONFIG_INPUT_LIGHTNING=m
+CONFIG_INPUT_PCIGAME=m
+CONFIG_INPUT_CS461X=m
+CONFIG_INPUT_EMU10K1=m
+CONFIG_INPUT_SERIO=m
+CONFIG_INPUT_SERPORT=m
+CONFIG_INPUT_ANALOG=m
+CONFIG_INPUT_A3D=m
+CONFIG_INPUT_ADI=m
+CONFIG_INPUT_COBRA=m
+CONFIG_INPUT_GF2K=m
+CONFIG_INPUT_GRIP=m
+CONFIG_INPUT_INTERACT=m
+CONFIG_INPUT_TMDC=m
+CONFIG_INPUT_SIDEWINDER=m
+CONFIG_INPUT_IFORCE_USB=m
+CONFIG_INPUT_IFORCE_232=m
+CONFIG_INPUT_WARRIOR=m
+CONFIG_INPUT_MAGELLAN=m
+CONFIG_INPUT_SPACEORB=m
+CONFIG_INPUT_SPACEBALL=m
+CONFIG_INPUT_STINGER=m
+CONFIG_INPUT_DB9=m
+CONFIG_INPUT_GAMECON=m
+CONFIG_INPUT_TURBOGRAFX=m
+CONFIG_QIC02_TAPE=m
+CONFIG_QIC02_DYNCONF=y
+# CONFIG_IPMI_HANDLER is not set
+# CONFIG_IPMI_PANIC_EVENT is not set
+# CONFIG_IPMI_DEVICE_INTERFACE is not set
+# CONFIG_IPMI_KCS is not set
+# CONFIG_IPMI_WATCHDOG is not set
+
+#
+# Watchdog Cards
+#
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+# CONFIG_ALIM1535_WDT is not set
+CONFIG_ALIM7101_WDT=m
+CONFIG_SC520_WDT=m
+CONFIG_PCWATCHDOG=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_WAFER_WDT=m
+CONFIG_I810_TCO=m
+CONFIG_MIXCOMWD=m
+CONFIG_60XX_WDT=m
+CONFIG_SC1200_WDT=m
+CONFIG_SCx200_WDT=m
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_W83877F_WDT=m
+CONFIG_WDT=m
+CONFIG_WDTPCI=m
+CONFIG_WDT_501=y
+CONFIG_WDT_501_FAN=y
+CONFIG_MACHZ_WDT=m
+CONFIG_AMD7XX_TCO=m
+CONFIG_SCx200_GPIO=m
+CONFIG_AMD_RNG=m
+CONFIG_INTEL_RNG=m
+CONFIG_AMD_PM768=m
+CONFIG_NVRAM=m
+CONFIG_RTC=m
+CONFIG_DTLK=m
+CONFIG_R3964=m
+CONFIG_APPLICOM=m
+CONFIG_SONYPI=m
+
+#
+# Ftape, the floppy tape device driver
+#
+CONFIG_FTAPE=m
+CONFIG_ZFTAPE=m
+CONFIG_ZFT_DFLT_BLK_SZ=10240
+CONFIG_ZFT_COMPRESSOR=m
+CONFIG_FT_NR_BUFFERS=3
+CONFIG_FT_PROC_FS=y
+CONFIG_FT_NORMAL_DEBUG=y
+# CONFIG_FT_FULL_DEBUG is not set
+# CONFIG_FT_NO_TRACE is not set
+# CONFIG_FT_NO_TRACE_AT_ALL is not set
+CONFIG_FT_STD_FDC=y
+# CONFIG_FT_MACH2 is not set
+# CONFIG_FT_PROBE_FC10 is not set
+# CONFIG_FT_ALT_FDC is not set
+CONFIG_FT_FDC_THR=8
+CONFIG_FT_FDC_MAX_RATE=2000
+CONFIG_FT_ALPHA_CLOCK=0
+CONFIG_AGP=m
+CONFIG_AGP_INTEL=y
+CONFIG_AGP_I810=y
+CONFIG_AGP_VIA=y
+CONFIG_AGP_AMD=y
+# CONFIG_AGP_AMD_8151 is not set
+CONFIG_AGP_SIS=y
+CONFIG_AGP_ALI=y
+CONFIG_AGP_SWORKS=y
+# CONFIG_AGP_NVIDIA is not set
+CONFIG_DRM=y
+# CONFIG_DRM_OLD is not set
+CONFIG_DRM_NEW=y
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_I810=m
+# CONFIG_DRM_I810_XFREE_41 is not set
+CONFIG_DRM_I830=m
+CONFIG_DRM_MGA=m
+# CONFIG_DRM_SIS is not set
+
+#
+# PCMCIA character devices
+#
+CONFIG_PCMCIA_SERIAL_CS=m
+CONFIG_SYNCLINK_CS=m
+CONFIG_MWAVE=m
+
+#
+# Multimedia devices
+#
+CONFIG_VIDEO_DEV=m
+
+#
+# Video For Linux
+#
+CONFIG_VIDEO_PROC_FS=y
+CONFIG_I2C_PARPORT=m
+CONFIG_VIDEO_BT848=m
+CONFIG_VIDEO_PMS=m
+CONFIG_VIDEO_BWQCAM=m
+CONFIG_VIDEO_CQCAM=m
+CONFIG_VIDEO_W9966=m
+CONFIG_VIDEO_CPIA=m
+CONFIG_VIDEO_CPIA_PP=m
+CONFIG_VIDEO_CPIA_USB=m
+CONFIG_VIDEO_SAA5249=m
+CONFIG_TUNER_3036=m
+CONFIG_VIDEO_STRADIS=m
+CONFIG_VIDEO_ZORAN=m
+CONFIG_VIDEO_ZORAN_BUZ=m
+CONFIG_VIDEO_ZORAN_DC10=m
+CONFIG_VIDEO_ZORAN_LML33=m
+CONFIG_VIDEO_ZR36120=m
+CONFIG_VIDEO_MEYE=m
+
+#
+# Radio Adapters
+#
+CONFIG_RADIO_CADET=m
+CONFIG_RADIO_RTRACK=m
+CONFIG_RADIO_RTRACK2=m
+CONFIG_RADIO_AZTECH=m
+CONFIG_RADIO_GEMTEK=m
+CONFIG_RADIO_GEMTEK_PCI=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_MAESTRO=m
+CONFIG_RADIO_MIROPCM20=m
+CONFIG_RADIO_MIROPCM20_RDS=m
+CONFIG_RADIO_SF16FMI=m
+CONFIG_RADIO_SF16FMR2=m
+CONFIG_RADIO_TERRATEC=m
+CONFIG_RADIO_TRUST=m
+CONFIG_RADIO_TYPHOON=m
+CONFIG_RADIO_TYPHOON_PROC_FS=y
+CONFIG_RADIO_ZOLTRIX=m
+
+#
+# File systems
+#
+CONFIG_QUOTA=y
+CONFIG_QFMT_V2=y
+# CONFIG_AUTOFS_FS is not set
+CONFIG_AUTOFS4_FS=m
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+CONFIG_REISERFS_PROC_INFO=y
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+CONFIG_HFS_FS=m
+# CONFIG_HFSPLUS_FS is not set
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EXT3_FS=m
+CONFIG_JBD=m
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_UMSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_EFS_FS=m
+CONFIG_JFFS_FS=m
+CONFIG_JFFS_FS_VERBOSE=0
+# CONFIG_JFFS_PROC_FS is not set
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_CRAMFS=m
+CONFIG_TMPFS=y
+CONFIG_RAMFS=y
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_JFS_FS=m
+# CONFIG_JFS_DEBUG is not set
+CONFIG_JFS_STATISTICS=y
+CONFIG_MINIX_FS=m
+CONFIG_VXFS_FS=m
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_RW is not set
+CONFIG_HPFS_FS=m
+CONFIG_PROC_FS=y
+CONFIG_DEVFS_FS=y
+# CONFIG_DEVFS_MOUNT is not set
+# CONFIG_DEVFS_DEBUG is not set
+CONFIG_DEVPTS_FS=y
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_QNX4FS_RW is not set
+CONFIG_ROMFS_FS=m
+CONFIG_EXT2_FS=y
+CONFIG_SYSV_FS=m
+CONFIG_UDF_FS=m
+# CONFIG_UDF_RW is not set
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+
+#
+# Network File Systems
+#
+CONFIG_CODA_FS=m
+CONFIG_INTERMEZZO_FS=m
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_DIRECTIO is not set
+# CONFIG_ROOT_NFS is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_TCP=y
+CONFIG_SUNRPC=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_SMB_FS=m
+CONFIG_SMB_NLS_DEFAULT=y
+CONFIG_SMB_NLS_REMOTE="cp437"
+CONFIG_NCP_FS=m
+CONFIG_NCPFS_PACKET_SIGNING=y
+# CONFIG_NCPFS_IOCTL_LOCKING is not set
+CONFIG_NCPFS_STRONG=y
+CONFIG_NCPFS_NFS_NS=y
+CONFIG_NCPFS_OS2_NS=y
+CONFIG_NCPFS_SMALLDOS=y
+CONFIG_NCPFS_NLS=y
+CONFIG_NCPFS_EXTRAS=y
+CONFIG_ZISOFS_FS=m
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+# CONFIG_MINIX_SUBPARTITION is not set
+CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_UNIXWARE_DISKLABEL=y
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
+CONFIG_SGI_PARTITION=y
+# CONFIG_ULTRIX_PARTITION is not set
+CONFIG_SUN_PARTITION=y
+CONFIG_EFI_PARTITION=y
+CONFIG_SMB_NLS=y
+CONFIG_NLS=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=m
+
+#
+# Console drivers
+#
+CONFIG_VGA_CONSOLE=y
+CONFIG_VIDEO_SELECT=y
+CONFIG_MDA_CONSOLE=m
+
+#
+# Frame-buffer support
+#
+CONFIG_FB=y
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FB_RIVA=m
+CONFIG_FB_CLGEN=m
+CONFIG_FB_PM2=m
+CONFIG_FB_PM2_FIFO_DISCONNECT=y
+CONFIG_FB_PM2_PCI=y
+CONFIG_FB_PM3=m
+CONFIG_FB_CYBER2000=m
+CONFIG_FB_VESA=y
+CONFIG_FB_VGA16=m
+CONFIG_FB_HGA=m
+CONFIG_VIDEO_SELECT=y
+CONFIG_FB_MATROX=m
+CONFIG_FB_MATROX_MILLENIUM=y
+CONFIG_FB_MATROX_MYSTIQUE=y
+CONFIG_FB_MATROX_G450=m
+CONFIG_FB_MATROX_I2C=m
+# CONFIG_FB_MATROX_PROC is not set
+CONFIG_FB_MATROX_MULTIHEAD=y
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_RADEON=m
+CONFIG_FB_ATY128=m
+# CONFIG_FB_INTEL is not set
+CONFIG_FB_SIS=m
+CONFIG_FB_SIS_300=y
+CONFIG_FB_SIS_315=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_3DFX=m
+CONFIG_FB_VOODOO1=m
+CONFIG_FB_TRIDENT=m
+# CONFIG_FB_VIRTUAL is not set
+# CONFIG_FBCON_ADVANCED is not set
+CONFIG_FBCON_MFB=m
+CONFIG_FBCON_CFB8=y
+CONFIG_FBCON_CFB16=y
+CONFIG_FBCON_CFB24=y
+CONFIG_FBCON_CFB32=y
+CONFIG_FBCON_VGA_PLANES=m
+CONFIG_FBCON_HGA=m
+# CONFIG_FBCON_FONTWIDTH8_ONLY is not set
+# CONFIG_FBCON_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+
+#
+# Sound
+#
+CONFIG_SOUND=m
+CONFIG_SOUND_ALI5455=m
+CONFIG_SOUND_BT878=m
+CONFIG_SOUND_CMPCI=m
+CONFIG_SOUND_CMPCI_FM=y
+CONFIG_SOUND_CMPCI_FMIO=388
+CONFIG_SOUND_CMPCI_FMIO=388
+# CONFIG_SOUND_CMPCI_MIDI is not set
+CONFIG_SOUND_CMPCI_JOYSTICK=y
+CONFIG_SOUND_CMPCI_CM8738=y
+# CONFIG_SOUND_CMPCI_SPDIFINVERSE is not set
+CONFIG_SOUND_CMPCI_SPDIFLOOP=y
+CONFIG_SOUND_CMPCI_SPEAKERS=2
+CONFIG_SOUND_EMU10K1=m
+CONFIG_MIDI_EMU10K1=y
+CONFIG_SOUND_FUSION=m
+CONFIG_SOUND_CS4281=m
+CONFIG_SOUND_ES1370=m
+CONFIG_SOUND_ES1371=m
+CONFIG_SOUND_ESSSOLO1=m
+CONFIG_SOUND_MAESTRO=m
+CONFIG_SOUND_MAESTRO3=m
+CONFIG_SOUND_FORTE=m
+CONFIG_SOUND_ICH=m
+CONFIG_SOUND_RME96XX=m
+CONFIG_SOUND_SONICVIBES=m
+CONFIG_SOUND_TRIDENT=m
+CONFIG_SOUND_MSNDCLAS=m
+# CONFIG_MSNDCLAS_HAVE_BOOT is not set
+CONFIG_MSNDCLAS_INIT_FILE="/etc/sound/msndinit.bin"
+CONFIG_MSNDCLAS_PERM_FILE="/etc/sound/msndperm.bin"
+CONFIG_SOUND_MSNDPIN=m
+# CONFIG_MSNDPIN_HAVE_BOOT is not set
+CONFIG_MSNDPIN_INIT_FILE="/etc/sound/pndspini.bin"
+CONFIG_MSNDPIN_PERM_FILE="/etc/sound/pndsperm.bin"
+CONFIG_SOUND_VIA82CXXX=m
+CONFIG_MIDI_VIA82CXXX=y
+CONFIG_SOUND_OSS=m
+# CONFIG_SOUND_TRACEINIT is not set
+CONFIG_SOUND_DMAP=y
+CONFIG_SOUND_AD1816=m
+CONFIG_SOUND_AD1889=m
+CONFIG_SOUND_SGALAXY=m
+CONFIG_SOUND_ADLIB=m
+CONFIG_SOUND_ACI_MIXER=m
+CONFIG_SOUND_CS4232=m
+CONFIG_SOUND_SSCAPE=m
+CONFIG_SOUND_GUS=m
+CONFIG_SOUND_GUS16=y
+CONFIG_SOUND_GUSMAX=y
+CONFIG_SOUND_VMIDI=m
+CONFIG_SOUND_TRIX=m
+CONFIG_SOUND_MSS=m
+CONFIG_SOUND_MPU401=m
+CONFIG_SOUND_NM256=m
+CONFIG_SOUND_MAD16=m
+CONFIG_MAD16_OLDCARD=y
+CONFIG_SOUND_PAS=m
+# CONFIG_PAS_JOYSTICK is not set
+CONFIG_SOUND_PSS=m
+CONFIG_PSS_MIXER=y
+# CONFIG_PSS_HAVE_BOOT is not set
+CONFIG_SOUND_SB=m
+CONFIG_SOUND_AWE32_SYNTH=m
+# CONFIG_SOUND_KAHLUA is not set
+CONFIG_SOUND_WAVEFRONT=m
+CONFIG_SOUND_MAUI=m
+CONFIG_SOUND_YM3812=m
+CONFIG_SOUND_OPL3SA1=m
+CONFIG_SOUND_OPL3SA2=m
+CONFIG_SOUND_YMFPCI=m
+CONFIG_SOUND_YMFPCI_LEGACY=y
+CONFIG_SOUND_UART6850=m
+CONFIG_SOUND_AEDSP16=m
+CONFIG_SC6600=y
+CONFIG_SC6600_JOY=y
+CONFIG_SC6600_CDROM=4
+CONFIG_SC6600_CDROMBASE=0
+CONFIG_AEDSP16_SBPRO=y
+CONFIG_AEDSP16_MPU401=y
+CONFIG_SOUND_TVMIXER=m
+
+#
+# USB support
+#
+CONFIG_USB=m
+# CONFIG_USB_DEBUG is not set
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_BANDWIDTH is not set
+CONFIG_USB_EHCI_HCD=m
+CONFIG_USB_UHCI=m
+CONFIG_USB_UHCI_ALT=m
+CONFIG_USB_OHCI=m
+CONFIG_USB_AUDIO=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_MIDI=m
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_DATAFAB=y
+CONFIG_USB_STORAGE_FREECOM=y
+CONFIG_USB_STORAGE_ISD200=y
+CONFIG_USB_STORAGE_DPCM=y
+CONFIG_USB_STORAGE_HP8200e=y
+CONFIG_USB_STORAGE_SDDR09=y
+CONFIG_USB_STORAGE_SDDR55=y
+CONFIG_USB_STORAGE_JUMPSHOT=y
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_HID=m
+CONFIG_USB_HIDINPUT=y
+CONFIG_USB_HIDDEV=y
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+CONFIG_USB_AIPTEK=m
+CONFIG_USB_WACOM=m
+# CONFIG_USB_KBTAB is not set
+CONFIG_USB_POWERMATE=m
+CONFIG_USB_DC2XX=m
+CONFIG_USB_MDC800=m
+CONFIG_USB_SCANNER=m
+CONFIG_USB_MICROTEK=m
+CONFIG_USB_HPUSBSCSI=m
+CONFIG_USB_IBMCAM=m
+CONFIG_USB_KONICAWC=m
+CONFIG_USB_OV511=m
+CONFIG_USB_PWC=m
+CONFIG_USB_SE401=m
+CONFIG_USB_STV680=m
+CONFIG_USB_VICAM=m
+CONFIG_USB_DSBR=m
+CONFIG_USB_DABUSB=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_CATC=m
+# CONFIG_USB_AX8817X is not set
+CONFIG_USB_CDCETHER=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_USS720=m
+
+#
+# USB Serial Converter support
+#
+CONFIG_USB_SERIAL=m
+# CONFIG_USB_SERIAL_DEBUG is not set
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KEYSPAN_USA28=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
+CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19=y
+CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
+CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
+# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set
+CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
+# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_RIO500=m
+CONFIG_USB_AUERSWALD=m
+CONFIG_USB_TIGL=m
+CONFIG_USB_BRLVGER=m
+CONFIG_USB_LCD=m
+# CONFIG_USB_SPEEDTOUCH is not set
+
+#
+# Bluetooth support
+#
+CONFIG_BLUEZ=m
+CONFIG_BLUEZ_L2CAP=m
+CONFIG_BLUEZ_SCO=m
+CONFIG_BLUEZ_RFCOMM=m
+CONFIG_BLUEZ_RFCOMM_TTY=y
+CONFIG_BLUEZ_BNEP=m
+CONFIG_BLUEZ_BNEP_MC_FILTER=y
+CONFIG_BLUEZ_BNEP_PROTO_FILTER=y
+# CONFIG_BLUEZ_CMTP is not set
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BLUEZ_HCIUSB=m
+# CONFIG_BLUEZ_USB_SCO is not set
+# CONFIG_BLUEZ_USB_ZERO_PACKET is not set
+CONFIG_BLUEZ_HCIUART=m
+CONFIG_BLUEZ_HCIUART_H4=y
+CONFIG_BLUEZ_HCIUART_BCSP=y
+CONFIG_BLUEZ_HCIUART_BCSP_TXCRC=y
+# CONFIG_BLUEZ_HCIBFUSB is not set
+CONFIG_BLUEZ_HCIDTL1=m
+CONFIG_BLUEZ_HCIBT3C=m
+CONFIG_BLUEZ_HCIBLUECARD=m
+CONFIG_BLUEZ_HCIBTUART=m
+CONFIG_BLUEZ_HCIVHCI=m
+
+#
+# Kernel hacking
+#
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_HIGHMEM is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_IOVIRT is not set
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_DEBUG_SPINLOCK is not set
+CONFIG_FRAME_POINTER=y
+
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_TEST=m
+
+#
+# Library routines
+#
+# CONFIG_CRC32 is not set
+CONFIG_ZLIB_INFLATE=m
+CONFIG_ZLIB_DEFLATE=m
Index: configs/kernel/linux-2.4.26-i686.config
===================================================================
--- configs/kernel/linux-2.4.26-i686.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ configs/kernel/linux-2.4.26-i686.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+linux-2.4.22-i686.config
Index: configs/kernel/linux-2.4.26-m68k.config
===================================================================
--- configs/kernel/linux-2.4.26-m68k.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ configs/kernel/linux-2.4.26-m68k.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,487 @@
+#
+# Automatically generated make config: don't edit
+#
+CONFIG_UID16=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+# CONFIG_MODVERSIONS is not set
+CONFIG_KMOD=y
+
+#
+# Platform dependent setup
+#
+# CONFIG_EISA is not set
+# CONFIG_MCA is not set
+# CONFIG_PCMCIA is not set
+# CONFIG_AMIGA is not set
+# CONFIG_ATARI is not set
+# CONFIG_HADES is not set
+# CONFIG_PCI is not set
+CONFIG_MAC=y
+CONFIG_NUBUS=y
+CONFIG_M68K_L2_CACHE=y
+# CONFIG_APOLLO is not set
+# CONFIG_VME is not set
+# CONFIG_HP300 is not set
+# CONFIG_SUN3X is not set
+# CONFIG_SUN3 is not set
+# CONFIG_TEKXP is not set
+# CONFIG_Q40 is not set
+
+#
+# Processor type
+#
+CONFIG_M68020=y
+CONFIG_M68030=y
+CONFIG_M68040=y
+# CONFIG_M68060 is not set
+# CONFIG_M68KFPU_EMU is not set
+# CONFIG_ADVANCED is not set
+
+#
+# General setup
+#
+CONFIG_NET=y
+CONFIG_SYSVIPC=y
+# CONFIG_BSD_PROCESS_ACCT is not set
+CONFIG_SYSCTL=y
+CONFIG_KCORE_ELF=y
+# CONFIG_KCORE_AOUT is not set
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+# CONFIG_HEARTBEAT is not set
+CONFIG_PROC_HARDWARE=y
+# CONFIG_PARPORT is not set
+# CONFIG_PRINTER is not set
+# CONFIG_ISA is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_FD is not set
+CONFIG_BLK_DEV_SWIM_IOP=y
+# CONFIG_BLK_DEV_XD is not set
+# CONFIG_PARIDE is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_CISS_SCSI_TAPE is not set
+# CONFIG_CISS_MONITOR_THREAD is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_NBD is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_BLK_STATS is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+# CONFIG_BLK_DEV_MD is not set
+# CONFIG_MD_LINEAR is not set
+# CONFIG_MD_RAID0 is not set
+# CONFIG_MD_RAID1 is not set
+# CONFIG_MD_RAID5 is not set
+# CONFIG_MD_MULTIPATH is not set
+# CONFIG_BLK_DEV_LVM is not set
+
+#
+# Networking options
+#
+# CONFIG_PACKET is not set
+# CONFIG_NETLINK_DEV is not set
+# CONFIG_NETFILTER is not set
+# CONFIG_FILTER is not set
+CONFIG_UNIX=y
+# CONFIG_INET is not set
+# CONFIG_ATM is not set
+# CONFIG_VLAN_8021Q is not set
+
+#
+#  
+#
+# CONFIG_IPX is not set
+CONFIG_ATALK=m
+
+#
+# Appletalk devices
+#
+CONFIG_DEV_APPLETALK=y
+CONFIG_COPS_DAYNA=y
+CONFIG_COPS_TANGENT=y
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_IPDDP_DECAP=y
+# CONFIG_DECNET is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_LLC is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_FASTROUTE is not set
+# CONFIG_NET_HW_FLOWCONTROL is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+
+#
+# Input core support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_KEYBDEV=y
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_UINPUT is not set
+
+#
+# ATA/IDE/MFM/RLL support
+#
+CONFIG_IDE=y
+
+#
+# IDE, ATA and ATAPI Block devices
+#
+CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_HD_IDE is not set
+# CONFIG_BLK_DEV_HD is not set
+# CONFIG_BLK_DEV_IDEDISK is not set
+# CONFIG_IDEDISK_MULTI_MODE is not set
+# CONFIG_IDEDISK_STROKE is not set
+# CONFIG_BLK_DEV_IDECS is not set
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+# CONFIG_BLK_DEV_IDESCSI is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+
+#
+# IDE chipset support/bugfixes
+#
+# CONFIG_BLK_DEV_CMD640 is not set
+# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
+# CONFIG_BLK_DEV_ISAPNP is not set
+CONFIG_BLK_DEV_MAC_IDE=y
+# CONFIG_IDE_CHIPSETS is not set
+# CONFIG_IDEDMA_AUTO is not set
+# CONFIG_DMA_NONPCI is not set
+# CONFIG_BLK_DEV_ATARAID is not set
+# CONFIG_BLK_DEV_ATARAID_PDC is not set
+# CONFIG_BLK_DEV_ATARAID_HPT is not set
+# CONFIG_BLK_DEV_ATARAID_MEDLEY is not set
+# CONFIG_BLK_DEV_ATARAID_SII is not set
+
+#
+# SCSI support
+#
+CONFIG_SCSI=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+CONFIG_SD_EXTRA_DEVS=40
+CONFIG_CHR_DEV_ST=y
+CONFIG_ST_EXTRA_DEVS=2
+CONFIG_BLK_DEV_SR=y
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_SR_EXTRA_DEVS=2
+CONFIG_CHR_DEV_SG=y
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+
+#
+# SCSI low-level drivers
+#
+CONFIG_MAC_SCSI=y
+CONFIG_SCSI_MAC_ESP=y
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_SLIP is not set
+# CONFIG_PPP is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_MAC8390=y
+# CONFIG_MACSONIC is not set
+# CONFIG_SMC9194 is not set
+CONFIG_MAC89x0=y
+CONFIG_MACMACE=y
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_MAC_SCC=y
+CONFIG_ADB=y
+CONFIG_ADB_MACII=y
+CONFIG_ADB_MACIISI=y
+CONFIG_ADB_CUDA=y
+CONFIG_ADB_IOP=y
+CONFIG_ADB_PMU68K=y
+CONFIG_INPUT_ADBHID=y
+CONFIG_MAC_HID=y
+# CONFIG_MAC_ADBKEYCODES is not set
+CONFIG_MAC_EMUMOUSEBTN=y
+# CONFIG_SUN3X_ZS is not set
+# CONFIG_SUN_KEYBOARD is not set
+# CONFIG_SUN_MOUSE is not set
+# CONFIG_SBUS is not set
+CONFIG_SERIAL_CONSOLE=y
+# CONFIG_USERIAL is not set
+# CONFIG_WATCHDOG is not set
+CONFIG_GEN_RTC=y
+CONFIG_GEN_RTC_X=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_UNIX98_PTY_COUNT=256
+
+#
+# Sound support
+#
+# CONFIG_SOUND is not set
+
+#
+# File systems
+#
+# CONFIG_QUOTA is not set
+# CONFIG_QFMT_V2 is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_ADFS_FS is not set
+# CONFIG_ADFS_FS_RW is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_ASFS_FS is not set
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+# CONFIG_BEFS_FS is not set
+# CONFIG_BEFS_DEBUG is not set
+# CONFIG_BFS_FS is not set
+CONFIG_EXT3_FS=y
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+# CONFIG_FAT_FS is not set
+# CONFIG_MSDOS_FS is not set
+# CONFIG_UMSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS_FS is not set
+# CONFIG_JFFS2_FS is not set
+# CONFIG_CRAMFS is not set
+CONFIG_TMPFS=y
+CONFIG_RAMFS=y
+CONFIG_ISO9660_FS=y
+CONFIG_JOLIET=y
+# CONFIG_ZISOFS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_NTFS_FS is not set
+# CONFIG_NTFS_RW is not set
+# CONFIG_HPFS_FS is not set
+CONFIG_PROC_FS=y
+# CONFIG_DEVFS_FS is not set
+# CONFIG_DEVFS_MOUNT is not set
+# CONFIG_DEVFS_DEBUG is not set
+CONFIG_DEVPTS_FS=y
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_QNX4FS_RW is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_EXT2_FS=y
+# CONFIG_SYSV_FS is not set
+# CONFIG_UDF_FS is not set
+# CONFIG_UDF_RW is not set
+# CONFIG_UFS_FS is not set
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_XFS_QUOTA is not set
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_TRACE is not set
+# CONFIG_XFS_DEBUG is not set
+
+#
+# Network File Systems
+#
+# CONFIG_CODA_FS is not set
+# CONFIG_INTERMEZZO_FS is not set
+# CONFIG_NFS_FS is not set
+# CONFIG_NFS_V3 is not set
+# CONFIG_NFS_DIRECTIO is not set
+# CONFIG_ROOT_NFS is not set
+# CONFIG_NFSD is not set
+# CONFIG_NFSD_V3 is not set
+# CONFIG_NFSD_TCP is not set
+# CONFIG_SUNRPC is not set
+# CONFIG_LOCKD is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_NCPFS_NLS is not set
+# CONFIG_ZISOFS_FS is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+# CONFIG_SMB_NLS is not set
+CONFIG_NLS=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=y
+
+#
+# Console drivers
+#
+
+#
+# Frame-buffer support
+#
+CONFIG_FB=y
+CONFIG_DUMMY_CONSOLE=y
+# CONFIG_FB_CYBER2000 is not set
+CONFIG_FB_MAC=y
+CONFIG_FB_VALKYRIE=y
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_FBCON_ADVANCED=y
+CONFIG_FBCON_MFB=y
+CONFIG_FBCON_CFB2=y
+CONFIG_FBCON_CFB4=y
+CONFIG_FBCON_CFB8=y
+CONFIG_FBCON_CFB16=y
+CONFIG_FBCON_CFB24=y
+CONFIG_FBCON_CFB32=y
+# CONFIG_FBCON_AFB is not set
+# CONFIG_FBCON_ILBM is not set
+# CONFIG_FBCON_IPLAN2P2 is not set
+# CONFIG_FBCON_IPLAN2P4 is not set
+# CONFIG_FBCON_IPLAN2P8 is not set
+CONFIG_FBCON_MAC=y
+# CONFIG_FBCON_VGA_PLANES is not set
+# CONFIG_FBCON_VGA is not set
+# CONFIG_FBCON_HGA is not set
+# CONFIG_FBCON_FONTWIDTH8_ONLY is not set
+CONFIG_FBCON_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+CONFIG_FONT_SUN8x16=y
+CONFIG_FONT_SUN12x22=y
+CONFIG_FONT_6x11=y
+CONFIG_FONT_PEARL_8x8=y
+CONFIG_FONT_ACORN_8x8=y
+
+#
+# Kernel hacking
+#
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_LOG_BUF_SHIFT=0
+
+#
+# Cryptographic options
+#
+# CONFIG_CRYPTO is not set
+
+#
+# Library routines
+#
+# CONFIG_CRC32 is not set
+# CONFIG_ZLIB_INFLATE is not set
+# CONFIG_ZLIB_DEFLATE is not set
Index: configs/kernel/linux-2.6.1-i686-inspiron-8000
===================================================================
--- configs/kernel/linux-2.6.1-i686-inspiron-8000	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ configs/kernel/linux-2.6.1-i686-inspiron-8000	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1377 @@
+#
+# Automatically generated make config: don't edit
+#
+CONFIG_X86=y
+CONFIG_MMU=y
+CONFIG_UID16=y
+CONFIG_GENERIC_ISA_DMA=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_CLEAN_COMPILE=y
+CONFIG_STANDALONE=y
+
+#
+# General setup
+#
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_SYSCTL=y
+CONFIG_LOG_BUF_SHIFT=15
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+# CONFIG_EMBEDDED is not set
+CONFIG_KALLSYMS=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_OBSOLETE_MODPARM=y
+CONFIG_MODVERSIONS=y
+CONFIG_KMOD=y
+
+#
+# Processor type and features
+#
+CONFIG_X86_PC=y
+# CONFIG_X86_VOYAGER is not set
+# CONFIG_X86_NUMAQ is not set
+# CONFIG_X86_SUMMIT is not set
+# CONFIG_X86_BIGSMP is not set
+# CONFIG_X86_VISWS is not set
+# CONFIG_X86_GENERICARCH is not set
+# CONFIG_X86_ES7000 is not set
+# CONFIG_M386 is not set
+# CONFIG_M486 is not set
+# CONFIG_M586 is not set
+# CONFIG_M586TSC is not set
+# CONFIG_M586MMX is not set
+# CONFIG_M686 is not set
+# CONFIG_MPENTIUMII is not set
+CONFIG_MPENTIUMIII=y
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
+# CONFIG_MELAN is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MWINCHIPC6 is not set
+# CONFIG_MWINCHIP2 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MCYRIXIII is not set
+# CONFIG_MVIAC3_2 is not set
+# CONFIG_X86_GENERIC is not set
+CONFIG_X86_CMPXCHG=y
+CONFIG_X86_XADD=y
+CONFIG_X86_L1_CACHE_SHIFT=5
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_INVLPG=y
+CONFIG_X86_BSWAP=y
+CONFIG_X86_POPAD_OK=y
+CONFIG_X86_GOOD_APIC=y
+CONFIG_X86_INTEL_USERCOPY=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_SMP=y
+CONFIG_NR_CPUS=32
+CONFIG_PREEMPT=y
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_TSC=y
+CONFIG_X86_MCE=y
+# CONFIG_X86_MCE_NONFATAL is not set
+# CONFIG_X86_MCE_P4THERMAL is not set
+# CONFIG_TOSHIBA is not set
+# CONFIG_I8K is not set
+# CONFIG_MICROCODE is not set
+# CONFIG_X86_MSR is not set
+# CONFIG_X86_CPUID is not set
+CONFIG_EDD=y
+CONFIG_NOHIGHMEM=y
+# CONFIG_HIGHMEM4G is not set
+# CONFIG_HIGHMEM64G is not set
+# CONFIG_MATH_EMULATION is not set
+CONFIG_MTRR=y
+# CONFIG_EFI is not set
+CONFIG_HAVE_DEC_LOCK=y
+
+#
+# Power management options (ACPI, APM)
+#
+CONFIG_PM=y
+# CONFIG_SOFTWARE_SUSPEND is not set
+# CONFIG_PM_DISK is not set
+
+#
+# ACPI (Advanced Configuration and Power Interface) Support
+#
+CONFIG_ACPI=y
+CONFIG_ACPI_BOOT=y
+CONFIG_ACPI_INTERPRETER=y
+# CONFIG_ACPI_SLEEP is not set
+# CONFIG_ACPI_AC is not set
+# CONFIG_ACPI_BATTERY is not set
+CONFIG_ACPI_BUTTON=y
+CONFIG_ACPI_FAN=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_THERMAL=y
+# CONFIG_ACPI_ASUS is not set
+# CONFIG_ACPI_TOSHIBA is not set
+CONFIG_ACPI_DEBUG=y
+CONFIG_ACPI_BUS=y
+CONFIG_ACPI_EC=y
+CONFIG_ACPI_POWER=y
+CONFIG_ACPI_PCI=y
+CONFIG_ACPI_SYSTEM=y
+# CONFIG_ACPI_RELAXED_AML is not set
+
+#
+# APM (Advanced Power Management) BIOS Support
+#
+# CONFIG_APM is not set
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
+#
+CONFIG_PCI=y
+# CONFIG_PCI_GOBIOS is not set
+# CONFIG_PCI_GODIRECT is not set
+CONFIG_PCI_GOANY=y
+CONFIG_PCI_BIOS=y
+CONFIG_PCI_DIRECT=y
+# CONFIG_PCI_USE_VECTOR is not set
+# CONFIG_PCI_LEGACY_PROC is not set
+CONFIG_PCI_NAMES=y
+CONFIG_ISA=y
+# CONFIG_EISA is not set
+# CONFIG_MCA is not set
+# CONFIG_SCx200 is not set
+CONFIG_HOTPLUG=y
+
+#
+# PCMCIA/CardBus support
+#
+CONFIG_PCMCIA=m
+CONFIG_YENTA=m
+CONFIG_CARDBUS=y
+# CONFIG_I82092 is not set
+# CONFIG_I82365 is not set
+# CONFIG_TCIC is not set
+CONFIG_PCMCIA_PROBE=y
+
+#
+# PCI Hotplug Support
+#
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_AOUT=m
+CONFIG_BINFMT_MISC=y
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+# CONFIG_FW_LOADER is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Parallel port support
+#
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_PC_CML1=m
+# CONFIG_PARPORT_SERIAL is not set
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
+# CONFIG_PARPORT_PC_PCMCIA is not set
+# CONFIG_PARPORT_OTHER is not set
+CONFIG_PARPORT_1284=y
+
+#
+# Plug and Play support
+#
+CONFIG_PNP=y
+CONFIG_PNP_DEBUG=y
+
+#
+# Protocols
+#
+CONFIG_ISAPNP=y
+CONFIG_PNPBIOS=y
+
+#
+# Block devices
+#
+CONFIG_BLK_DEV_FD=y
+# CONFIG_BLK_DEV_XD is not set
+# CONFIG_PARIDE is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_RAM is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_LBD=y
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_HD_IDE is not set
+CONFIG_BLK_DEV_IDEDISK=y
+CONFIG_IDEDISK_MULTI_MODE=y
+# CONFIG_IDEDISK_STROKE is not set
+# CONFIG_BLK_DEV_IDECS is not set
+CONFIG_BLK_DEV_IDECD=y
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+CONFIG_BLK_DEV_IDESCSI=m
+# CONFIG_IDE_TASK_IOCTL is not set
+# CONFIG_IDE_TASKFILE_IO is not set
+
+#
+# IDE chipset support/bugfixes
+#
+# CONFIG_BLK_DEV_CMD640 is not set
+# CONFIG_BLK_DEV_IDEPNP is not set
+CONFIG_BLK_DEV_IDEPCI=y
+CONFIG_IDEPCI_SHARE_IRQ=y
+# CONFIG_BLK_DEV_OFFBOARD is not set
+CONFIG_BLK_DEV_GENERIC=y
+# CONFIG_BLK_DEV_OPTI621 is not set
+# CONFIG_BLK_DEV_RZ1000 is not set
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
+CONFIG_IDEDMA_PCI_AUTO=y
+# CONFIG_IDEDMA_ONLYDISK is not set
+# CONFIG_IDEDMA_PCI_WIP is not set
+CONFIG_BLK_DEV_ADMA=y
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_HPT34X is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+CONFIG_BLK_DEV_PIIX=y
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SIS5513 is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+# CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_IDE_CHIPSETS is not set
+CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDEDMA_IVB is not set
+CONFIG_IDEDMA_AUTO=y
+# CONFIG_DMA_NONPCI is not set
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI=m
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+CONFIG_SCSI_REPORT_LUNS=y
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_7000FASST is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AHA152X is not set
+# CONFIG_SCSI_AHA1542 is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_IN2000 is not set
+# CONFIG_SCSI_MEGARAID is not set
+# CONFIG_SCSI_SATA is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_CPQFCTS is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_DTC3280 is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_EATA_PIO is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_GENERIC_NCR5380 is not set
+# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_PPA is not set
+# CONFIG_SCSI_IMM is not set
+# CONFIG_SCSI_NCR53C406A is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_PAS16 is not set
+# CONFIG_SCSI_PSI240I is not set
+# CONFIG_SCSI_QLOGIC_FAS is not set
+# CONFIG_SCSI_QLOGIC_ISP is not set
+# CONFIG_SCSI_QLOGIC_FC is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+# CONFIG_SCSI_SYM53C416 is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_T128 is not set
+# CONFIG_SCSI_U14_34F is not set
+# CONFIG_SCSI_ULTRASTOR is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# PCMCIA SCSI adapter support
+#
+# CONFIG_PCMCIA_AHA152X is not set
+# CONFIG_PCMCIA_FDOMAIN is not set
+# CONFIG_PCMCIA_NINJA_SCSI is not set
+# CONFIG_PCMCIA_QLOGIC is not set
+
+#
+# Old CD-ROM drivers (not SCSI, not IDE)
+#
+# CONFIG_CD_NO_IDESCSI is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_LINEAR=y
+CONFIG_MD_RAID0=y
+CONFIG_MD_RAID1=y
+CONFIG_MD_RAID5=y
+CONFIG_MD_MULTIPATH=y
+# CONFIG_BLK_DEV_DM is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support (EXPERIMENTAL)
+#
+CONFIG_IEEE1394=m
+
+#
+# Subsystem Options
+#
+# CONFIG_IEEE1394_VERBOSEDEBUG is not set
+# CONFIG_IEEE1394_OUI_DB is not set
+
+#
+# Device Drivers
+#
+
+#
+# Texas Instruments PCILynx requires I2C bit-banging
+#
+CONFIG_IEEE1394_OHCI1394=m
+
+#
+# Protocol Drivers
+#
+CONFIG_IEEE1394_VIDEO1394=m
+CONFIG_IEEE1394_SBP2=m
+CONFIG_IEEE1394_SBP2_PHYS_DMA=y
+CONFIG_IEEE1394_ETH1394=m
+CONFIG_IEEE1394_DV1394=m
+CONFIG_IEEE1394_RAWIO=m
+CONFIG_IEEE1394_CMP=m
+CONFIG_IEEE1394_AMDTP=m
+
+#
+# I2O device support
+#
+CONFIG_I2O=y
+CONFIG_I2O_PCI=y
+CONFIG_I2O_BLOCK=m
+CONFIG_I2O_SCSI=m
+CONFIG_I2O_PROC=y
+
+#
+# Networking support
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+# CONFIG_NETLINK_DEV is not set
+CONFIG_UNIX=y
+CONFIG_NET_KEY=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_FWMARK=y
+CONFIG_IP_ROUTE_NAT=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_TOS=y
+CONFIG_IP_ROUTE_VERBOSE=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+# CONFIG_IP_PIMSM_V2 is not set
+# CONFIG_ARPD is not set
+CONFIG_INET_ECN=y
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=y
+CONFIG_INET_ESP=y
+CONFIG_INET_IPCOMP=y
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
+CONFIG_IPV6=y
+CONFIG_IPV6_PRIVACY=y
+CONFIG_INET6_AH=y
+CONFIG_INET6_ESP=y
+CONFIG_INET6_IPCOMP=y
+CONFIG_IPV6_TUNNEL=m
+# CONFIG_DECNET is not set
+CONFIG_BRIDGE=y
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# IP: Netfilter Configuration
+#
+# CONFIG_IP_NF_CONNTRACK is not set
+# CONFIG_IP_NF_QUEUE is not set
+# CONFIG_IP_NF_IPTABLES is not set
+# CONFIG_IP_NF_ARPTABLES is not set
+# CONFIG_IP_NF_COMPAT_IPCHAINS is not set
+# CONFIG_IP_NF_COMPAT_IPFWADM is not set
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_IP6_NF_QUEUE is not set
+# CONFIG_IP6_NF_IPTABLES is not set
+
+#
+# Bridge: Netfilter Configuration
+#
+# CONFIG_BRIDGE_NF_EBTABLES is not set
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=y
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+CONFIG_IPV6_SCTP__=y
+# CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_FASTROUTE is not set
+# CONFIG_NET_HW_FLOWCONTROL is not set
+
+#
+# QoS and/or fair queueing
+#
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+# CONFIG_NET_SCH_CSZ is not set
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_INGRESS=y
+CONFIG_NET_QOS=y
+CONFIG_NET_ESTIMATOR=y
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_ROUTE=y
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_POLICE=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+CONFIG_NETDEVICES=y
+
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+CONFIG_DUMMY=m
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=m
+# CONFIG_NET_SB1000 is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+CONFIG_NET_VENDOR_3COM=y
+# CONFIG_EL1 is not set
+# CONFIG_EL2 is not set
+# CONFIG_ELPLUS is not set
+# CONFIG_EL16 is not set
+# CONFIG_EL3 is not set
+# CONFIG_3C515 is not set
+CONFIG_VORTEX=y
+# CONFIG_TYPHOON is not set
+# CONFIG_LANCE is not set
+# CONFIG_NET_VENDOR_SMC is not set
+# CONFIG_NET_VENDOR_RACAL is not set
+
+#
+# Tulip family network device support
+#
+# CONFIG_NET_TULIP is not set
+# CONFIG_AT1700 is not set
+# CONFIG_DEPCA is not set
+# CONFIG_HP100 is not set
+# CONFIG_NET_ISA is not set
+CONFIG_NET_PCI=y
+# CONFIG_PCNET32 is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_AC3200 is not set
+# CONFIG_APRICOT is not set
+# CONFIG_B44 is not set
+# CONFIG_CS89x0 is not set
+# CONFIG_DGRS is not set
+# CONFIG_EEPRO100 is not set
+CONFIG_E100=m
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_8139CP is not set
+# CONFIG_8139TOO is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_TLAN is not set
+# CONFIG_VIA_RHINE is not set
+# CONFIG_NET_POCKET is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SK98LIN is not set
+# CONFIG_TIGON3 is not set
+
+#
+# Ethernet (10000 Mbit)
+#
+# CONFIG_IXGB is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PLIP is not set
+CONFIG_PPP=m
+# CONFIG_PPP_MULTILINK is not set
+# CONFIG_PPP_FILTER is not set
+CONFIG_PPP_ASYNC=m
+# CONFIG_PPP_SYNC_TTY is not set
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPPOE=m
+# CONFIG_SLIP is not set
+
+#
+# Wireless LAN (non-hamradio)
+#
+CONFIG_NET_RADIO=y
+
+#
+# Obsolete Wireless cards support (pre-802.11)
+#
+# CONFIG_STRIP is not set
+# CONFIG_ARLAN is not set
+# CONFIG_WAVELAN is not set
+# CONFIG_PCMCIA_WAVELAN is not set
+# CONFIG_PCMCIA_NETWAVE is not set
+
+#
+# Wireless 802.11 Frequency Hopping cards support
+#
+# CONFIG_PCMCIA_RAYCS is not set
+
+#
+# Wireless 802.11b ISA/PCI cards support
+#
+# CONFIG_AIRO is not set
+# CONFIG_HERMES is not set
+
+#
+# Wireless 802.11b Pcmcia/Cardbus cards support
+#
+CONFIG_AIRO_CS=m
+# CONFIG_PCMCIA_ATMEL is not set
+# CONFIG_PCMCIA_WL3501 is not set
+CONFIG_NET_WIRELESS=y
+
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+# CONFIG_NET_FC is not set
+# CONFIG_RCPCI is not set
+# CONFIG_SHAPER is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+
+#
+# PCMCIA network device support
+#
+CONFIG_NET_PCMCIA=y
+CONFIG_PCMCIA_3C589=m
+# CONFIG_PCMCIA_3C574 is not set
+# CONFIG_PCMCIA_FMVJ18X is not set
+# CONFIG_PCMCIA_PCNET is not set
+# CONFIG_PCMCIA_NMCLAN is not set
+# CONFIG_PCMCIA_SMC91C92 is not set
+# CONFIG_PCMCIA_XIRC2PS is not set
+# CONFIG_PCMCIA_AXNET is not set
+
+#
+# Amateur Radio support
+#
+# CONFIG_HAMRADIO is not set
+
+#
+# IrDA (infrared) support
+#
+# CONFIG_IRDA is not set
+
+#
+# Bluetooth support
+#
+# CONFIG_BT is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN_BOOL is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input I/O drivers
+#
+CONFIG_GAMEPORT=m
+CONFIG_SOUND_GAMEPORT=m
+# CONFIG_GAMEPORT_NS558 is not set
+# CONFIG_GAMEPORT_L4 is not set
+# CONFIG_GAMEPORT_EMU10K1 is not set
+# CONFIG_GAMEPORT_VORTEX is not set
+# CONFIG_GAMEPORT_FM801 is not set
+# CONFIG_GAMEPORT_CS461x is not set
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_CT82C710 is not set
+# CONFIG_SERIO_PARKBD is not set
+# CONFIG_SERIO_PCIPS2 is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_INPORT is not set
+# CONFIG_MOUSE_LOGIBM is not set
+# CONFIG_MOUSE_PC110PAD is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_PCSPKR=y
+CONFIG_INPUT_UINPUT=m
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_CONSOLE is not set
+# CONFIG_SERIAL_8250_CS is not set
+# CONFIG_SERIAL_8250_ACPI is not set
+CONFIG_SERIAL_8250_NR_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_UNIX98_PTY_COUNT=256
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+# CONFIG_PPDEV is not set
+# CONFIG_TIPAR is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# I2C Algorithms
+#
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# I2C Hardware Sensors Chip support
+#
+# CONFIG_I2C_SENSOR is not set
+
+#
+# Mice
+#
+CONFIG_BUSMOUSE=m
+# CONFIG_QIC02_TAPE is not set
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_NVRAM is not set
+CONFIG_RTC=y
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_SONYPI is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+CONFIG_AGP=y
+# CONFIG_AGP_ALI is not set
+# CONFIG_AGP_ATI is not set
+# CONFIG_AGP_AMD is not set
+# CONFIG_AGP_AMD64 is not set
+CONFIG_AGP_INTEL=y
+# CONFIG_AGP_NVIDIA is not set
+# CONFIG_AGP_SIS is not set
+# CONFIG_AGP_SWORKS is not set
+# CONFIG_AGP_VIA is not set
+CONFIG_DRM=y
+# CONFIG_DRM_TDFX is not set
+# CONFIG_DRM_GAMMA is not set
+CONFIG_DRM_R128=m
+# CONFIG_DRM_RADEON is not set
+# CONFIG_DRM_I810 is not set
+# CONFIG_DRM_I830 is not set
+# CONFIG_DRM_MGA is not set
+# CONFIG_DRM_SIS is not set
+
+#
+# PCMCIA character devices
+#
+# CONFIG_SYNCLINK_CS is not set
+# CONFIG_MWAVE is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_HANGCHECK_TIMER is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+CONFIG_FB=y
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_VGA16 is not set
+CONFIG_FB_VESA=y
+CONFIG_VIDEO_SELECT=y
+# CONFIG_FB_HGA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_I810 is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+CONFIG_FB_ATY128=m
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_TRIDENT is not set
+CONFIG_FB_VIRTUAL=m
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_MDA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_PCI_CONSOLE=y
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+
+#
+# Logo configuration
+#
+CONFIG_LOGO=y
+CONFIG_LOGO_LINUX_MONO=y
+CONFIG_LOGO_LINUX_VGA16=y
+CONFIG_LOGO_LINUX_CLUT224=y
+
+#
+# Sound
+#
+CONFIG_SOUND=m
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=m
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_SEQUENCER_OSS=y
+CONFIG_SND_RTCTIMER=m
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+CONFIG_SND_DUMMY=m
+CONFIG_SND_VIRMIDI=m
+# CONFIG_SND_MTPAV is not set
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+
+#
+# ISA devices
+#
+# CONFIG_SND_AD1816A is not set
+# CONFIG_SND_AD1848 is not set
+# CONFIG_SND_CS4231 is not set
+# CONFIG_SND_CS4232 is not set
+# CONFIG_SND_CS4236 is not set
+# CONFIG_SND_ES968 is not set
+# CONFIG_SND_ES1688 is not set
+# CONFIG_SND_ES18XX is not set
+# CONFIG_SND_GUSCLASSIC is not set
+# CONFIG_SND_GUSEXTREME is not set
+# CONFIG_SND_GUSMAX is not set
+# CONFIG_SND_INTERWAVE is not set
+# CONFIG_SND_INTERWAVE_STB is not set
+# CONFIG_SND_OPTI92X_AD1848 is not set
+# CONFIG_SND_OPTI92X_CS4231 is not set
+# CONFIG_SND_OPTI93X is not set
+CONFIG_SND_SB8=m
+CONFIG_SND_SB16=m
+CONFIG_SND_SBAWE=m
+CONFIG_SND_SB16_CSP=y
+# CONFIG_SND_WAVEFRONT is not set
+# CONFIG_SND_ALS100 is not set
+# CONFIG_SND_AZT2320 is not set
+# CONFIG_SND_CMI8330 is not set
+# CONFIG_SND_DT019X is not set
+CONFIG_SND_OPL3SA2=m
+# CONFIG_SND_SGALAXY is not set
+# CONFIG_SND_SSCAPE is not set
+
+#
+# PCI devices
+#
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_YMFPCI is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+CONFIG_SND_MAESTRO3=m
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+CONFIG_SND_INTEL8X0=m
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VX222 is not set
+
+#
+# ALSA USB devices
+#
+# CONFIG_SND_USB_AUDIO is not set
+
+#
+# PCMCIA devices
+#
+# CONFIG_SND_VXPOCKET is not set
+# CONFIG_SND_VXP440 is not set
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+
+#
+# USB support
+#
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_BANDWIDTH=y
+CONFIG_USB_DYNAMIC_MINORS=y
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_EHCI_HCD is not set
+# CONFIG_USB_OHCI_HCD is not set
+CONFIG_USB_UHCI_HCD=y
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_AUDIO is not set
+# CONFIG_USB_BLUETOOTH_TTY is not set
+# CONFIG_USB_MIDI is not set
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_HP8200e is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+
+#
+# USB Human Interface Devices (HID)
+#
+CONFIG_USB_HID=y
+CONFIG_USB_HIDINPUT=y
+# CONFIG_HID_FF is not set
+CONFIG_USB_HIDDEV=y
+# CONFIG_USB_AIPTEK is not set
+CONFIG_USB_WACOM=m
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_XPAD is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_SCANNER is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_HPUSBSCSI is not set
+
+#
+# USB Multimedia devices
+#
+# CONFIG_USB_DABUSB is not set
+
+#
+# Video4Linux support is needed for USB Multimedia device support
+#
+
+#
+# USB Network adaptors
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+
+#
+# USB port drivers
+#
+# CONFIG_USB_USS720 is not set
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_TIGL is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_BRLVGER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_TEST is not set
+# CONFIG_USB_GADGET is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+# CONFIG_EXT2_FS_POSIX_ACL is not set
+# CONFIG_EXT2_FS_SECURITY is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+CONFIG_JBD=y
+CONFIG_JBD_DEBUG=y
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=y
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+CONFIG_AUTOFS4_FS=y
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=y
+CONFIG_JOLIET=y
+# CONFIG_ZISOFS is not set
+CONFIG_UDF_FS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_NTFS_FS=y
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+# CONFIG_DEVFS_FS is not set
+CONFIG_DEVPTS_FS=y
+# CONFIG_DEVPTS_FS_XATTR is not set
+CONFIG_TMPFS=y
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD=y
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V4 is not set
+CONFIG_NFSD_TCP=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=y
+CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_GSS is not set
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_INTERMEZZO_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_DEBUG_SPINLOCK_SLEEP=y
+CONFIG_FRAME_POINTER=y
+CONFIG_X86_EXTRA_IRQS=y
+CONFIG_X86_FIND_SMP_CONFIG=y
+CONFIG_X86_MPPARSE=y
+
+#
+# Security options
+#
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_BLOWFISH=y
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRYPTO_SERPENT=y
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_CAST5=y
+CONFIG_CRYPTO_CAST6=y
+CONFIG_CRYPTO_DEFLATE=y
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Library routines
+#
+CONFIG_CRC32=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_X86_SMP=y
+CONFIG_X86_HT=y
+CONFIG_X86_BIOS_REBOOT=y
+CONFIG_X86_TRAMPOLINE=y
+CONFIG_PC=y
Index: configs/kernel/linux-2.6.10-x86_64.config
===================================================================
--- configs/kernel/linux-2.6.10-x86_64.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ configs/kernel/linux-2.6.10-x86_64.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+linux-2.6.8.1-x86_64.config-K8VNXP
Index: configs/kernel/linux-2.6.11-ac4-mips64el.config
===================================================================
--- configs/kernel/linux-2.6.11-ac4-mips64el.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ configs/kernel/linux-2.6.11-ac4-mips64el.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,833 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.11.6-jg-2
+# Fri Apr  1 12:28:37 2005
+#
+CONFIG_MIPS=y
+CONFIG_MIPS64=y
+CONFIG_64BIT=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_CLEAN_COMPILE=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+# CONFIG_BSD_PROCESS_ACCT is not set
+CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_HOTPLUG=y
+CONFIG_KOBJECT_UEVENT=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+CONFIG_EMBEDDED=y
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_ALL=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SHMEM=y
+CONFIG_CC_ALIGN_FUNCTIONS=0
+CONFIG_CC_ALIGN_LABELS=0
+CONFIG_CC_ALIGN_LOOPS=0
+CONFIG_CC_ALIGN_JUMPS=0
+# CONFIG_TINY_SHMEM is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_OBSOLETE_MODPARM=y
+# CONFIG_MODVERSIONS is not set
+CONFIG_MODULE_SRCVERSION_ALL=y
+CONFIG_KMOD=y
+
+#
+# Machine selection
+#
+# CONFIG_MACH_JAZZ is not set
+# CONFIG_MACH_VR41XX is not set
+CONFIG_MIPS_COBALT=y
+# CONFIG_MACH_DECSTATION is not set
+# CONFIG_MIPS_EV64120 is not set
+# CONFIG_MIPS_EV96100 is not set
+# CONFIG_MIPS_IVR is not set
+# CONFIG_LASAT is not set
+# CONFIG_MIPS_ITE8172 is not set
+# CONFIG_MIPS_ATLAS is not set
+# CONFIG_MIPS_MALTA is not set
+# CONFIG_MIPS_SEAD is not set
+# CONFIG_MOMENCO_OCELOT is not set
+# CONFIG_MOMENCO_OCELOT_G is not set
+# CONFIG_MOMENCO_OCELOT_C is not set
+# CONFIG_MOMENCO_OCELOT_3 is not set
+# CONFIG_MOMENCO_JAGUAR_ATX is not set
+# CONFIG_PMC_YOSEMITE is not set
+# CONFIG_DDB5074 is not set
+# CONFIG_DDB5476 is not set
+# CONFIG_DDB5477 is not set
+# CONFIG_NEC_OSPREY is not set
+# CONFIG_SGI_IP22 is not set
+# CONFIG_SGI_IP27 is not set
+# CONFIG_SGI_IP32 is not set
+# CONFIG_SIBYTE_SB1xxx_SOC is not set
+# CONFIG_SNI_RM200_PCI is not set
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_HAVE_DEC_LOCK=y
+CONFIG_DMA_NONCOHERENT=y
+CONFIG_I8259=y
+CONFIG_CPU_LITTLE_ENDIAN=y
+CONFIG_IRQ_CPU=y
+CONFIG_MIPS_GT64111=y
+CONFIG_MIPS_L1_CACHE_SHIFT=5
+# CONFIG_FB is not set
+
+#
+# CPU selection
+#
+# CONFIG_CPU_MIPS32 is not set
+# CONFIG_CPU_MIPS64 is not set
+# CONFIG_CPU_R3000 is not set
+# CONFIG_CPU_TX39XX is not set
+# CONFIG_CPU_VR41XX is not set
+# CONFIG_CPU_R4300 is not set
+# CONFIG_CPU_R4X00 is not set
+# CONFIG_CPU_TX49XX is not set
+# CONFIG_CPU_R5000 is not set
+# CONFIG_CPU_R5432 is not set
+# CONFIG_CPU_R6000 is not set
+CONFIG_CPU_NEVADA=y
+# CONFIG_CPU_R8000 is not set
+# CONFIG_CPU_R10000 is not set
+# CONFIG_CPU_RM7000 is not set
+# CONFIG_CPU_RM9000 is not set
+# CONFIG_CPU_SB1 is not set
+CONFIG_PAGE_SIZE_4KB=y
+# CONFIG_PAGE_SIZE_8KB is not set
+# CONFIG_PAGE_SIZE_16KB is not set
+# CONFIG_PAGE_SIZE_64KB is not set
+CONFIG_CPU_HAS_SYNC=y
+CONFIG_PREEMPT=y
+
+#
+# Bus options (PCI, PCMCIA, EISA, ISA, TC)
+#
+CONFIG_HW_HAS_PCI=y
+CONFIG_PCI=y
+# CONFIG_PCI_LEGACY_PROC is not set
+CONFIG_PCI_NAMES=y
+CONFIG_MMU=y
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# PC-card bridges
+#
+
+#
+# PCI Hotplug Support
+#
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_MISC=m
+CONFIG_BUILD_ELF64=y
+CONFIG_MIPS32_COMPAT=y
+CONFIG_COMPAT=y
+CONFIG_MIPS32_O32=y
+CONFIG_MIPS32_N32=y
+CONFIG_BINFMT_ELF32=y
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=m
+# CONFIG_DEBUG_DRIVER is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_INITRAMFS_SOURCE=""
+# CONFIG_CDROM_PKTCDVD is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_IDEDISK=y
+# CONFIG_IDEDISK_MULTI_MODE is not set
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+# CONFIG_BLK_DEV_IDESCSI is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=y
+CONFIG_BLK_DEV_IDEPCI=y
+CONFIG_IDEPCI_SHARE_IRQ=y
+# CONFIG_BLK_DEV_OFFBOARD is not set
+# CONFIG_BLK_DEV_GENERIC is not set
+# CONFIG_BLK_DEV_OPTI621 is not set
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
+# CONFIG_IDEDMA_PCI_AUTO is not set
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_HPT34X is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+CONFIG_BLK_DEV_VIA82CXXX=y
+# CONFIG_IDE_ARM is not set
+CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDEDMA_IVB is not set
+# CONFIG_IDEDMA_AUTO is not set
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI=m
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=m
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+# CONFIG_CHR_DEV_SG is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+
+#
+# SCSI Transport Attributes
+#
+CONFIG_SCSI_SPI_ATTRS=m
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_SCSI_SATA is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_EATA_PIO is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_ISP is not set
+# CONFIG_SCSI_QLOGIC_FC is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+CONFIG_SCSI_QLA2XXX=m
+# CONFIG_SCSI_QLA21XX is not set
+# CONFIG_SCSI_QLA22XX is not set
+# CONFIG_SCSI_QLA2300 is not set
+# CONFIG_SCSI_QLA2322 is not set
+# CONFIG_SCSI_QLA6312 is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_IEEE1394 is not set
+
+#
+# I2O device support
+#
+# CONFIG_I2O is not set
+
+#
+# Networking support
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=m
+# CONFIG_PACKET_MMAP is not set
+CONFIG_NETLINK_DEV=m
+CONFIG_UNIX=m
+CONFIG_NET_KEY=m
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+# CONFIG_IP_PNP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_IP_TCPDIAG=y
+# CONFIG_IP_TCPDIAG_IPV6 is not set
+# CONFIG_IPV6 is not set
+# CONFIG_NETFILTER is not set
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+# CONFIG_NET_CLS_ROUTE is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_ETHERTAP is not set
+
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+# CONFIG_MII is not set
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_NET_VENDOR_3COM is not set
+
+#
+# Tulip family network device support
+#
+CONFIG_NET_TULIP=y
+# CONFIG_DE2104X is not set
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+# CONFIG_TULIP_NAPI is not set
+# CONFIG_DE4X5 is not set
+# CONFIG_WINBOND_840 is not set
+# CONFIG_DM9102 is not set
+# CONFIG_HP100 is not set
+# CONFIG_NET_PCI is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SK98LIN is not set
+# CONFIG_TIGON3 is not set
+
+#
+# Ethernet (10000 Mbit)
+#
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+# CONFIG_INPUT is not set
+
+#
+# Userland interfaces
+#
+
+#
+# Input I/O drivers
+#
+# CONFIG_GAMEPORT is not set
+CONFIG_SOUND_GAMEPORT=y
+# CONFIG_SERIO is not set
+# CONFIG_SERIO_I8042 is not set
+
+#
+# Input Device Drivers
+#
+
+#
+# Character devices
+#
+# CONFIG_VT is not set
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+CONFIG_RTC=m
+# CONFIG_GEN_RTC is not set
+CONFIG_COBALT_LCD=y
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_DRM is not set
+# CONFIG_RAW_DRIVER is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Misc devices
+#
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# USB support
+#
+# CONFIG_USB is not set
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# InfiniBand support
+#
+# CONFIG_INFINIBAND is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+
+#
+# XFS support
+#
+# CONFIG_XFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_ZISOFS_FS=m
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_SYSFS=y
+# CONFIG_DEVFS_FS is not set
+CONFIG_DEVPTS_FS_XATTR=y
+CONFIG_DEVPTS_FS_SECURITY=y
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_XATTR is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=m
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V4 is not set
+CONFIG_NFSD_TCP=y
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_SUNRPC=m
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS=m
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=m
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=m
+
+#
+# Kernel hacking
+#
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_SCHEDSTATS is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_PREEMPT is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_DEBUG_KOBJECT is not set
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_FS is not set
+CONFIG_CROSSCOMPILE=y
+CONFIG_CMDLINE="console=ttyS0,115200 root=/dev/hda2 ide1=noprobe"
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_KGDB is not set
+# CONFIG_RUNTIME_DEBUG is not set
+# CONFIG_MIPS_UNCACHED is not set
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+# CONFIG_CRYPTO is not set
+
+#
+# Hardware crypto devices
+#
+
+#
+# Library routines
+#
+# CONFIG_CRC_CCITT is not set
+CONFIG_CRC32=m
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=m
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
Index: configs/kernel/linux-2.6.11-ac4-x86_64.config
===================================================================
--- configs/kernel/linux-2.6.11-ac4-x86_64.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ configs/kernel/linux-2.6.11-ac4-x86_64.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+linux-2.6.11-ac4-x86_64.config-K8VNXP
Index: configs/kernel/linux-2.6.11-ac4-x86_64.config-K8VNXP
===================================================================
--- configs/kernel/linux-2.6.11-ac4-x86_64.config-K8VNXP	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ configs/kernel/linux-2.6.11-ac4-x86_64.config-K8VNXP	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1585 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.11ac4
+# Sun Mar 20 12:59:21 2005
+#
+CONFIG_X86_64=y
+CONFIG_64BIT=y
+CONFIG_X86=y
+CONFIG_MMU=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_X86_CMPXCHG=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_IOMAP=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+# CONFIG_CLEAN_COMPILE is not set
+CONFIG_BROKEN=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_LOCK_KERNEL=y
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_BSD_PROCESS_ACCT=y
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_HOTPLUG=y
+CONFIG_KOBJECT_UEVENT=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+# CONFIG_EMBEDDED is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SHMEM=y
+CONFIG_CC_ALIGN_FUNCTIONS=0
+CONFIG_CC_ALIGN_LABELS=0
+CONFIG_CC_ALIGN_LOOPS=0
+CONFIG_CC_ALIGN_JUMPS=0
+# CONFIG_TINY_SHMEM is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_OBSOLETE_MODPARM=y
+# CONFIG_MODVERSIONS is not set
+# CONFIG_MODULE_SRCVERSION_ALL is not set
+CONFIG_KMOD=y
+
+#
+# Processor type and features
+#
+CONFIG_MK8=y
+# CONFIG_MPSC is not set
+# CONFIG_GENERIC_CPU is not set
+CONFIG_X86_L1_CACHE_BYTES=64
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_TSC=y
+CONFIG_X86_GOOD_APIC=y
+# CONFIG_MICROCODE is not set
+# CONFIG_X86_MSR is not set
+# CONFIG_X86_CPUID is not set
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_MTRR=y
+# CONFIG_SMP is not set
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_BKL=y
+# CONFIG_NUMA is not set
+CONFIG_GART_IOMMU=y
+CONFIG_SWIOTLB=y
+CONFIG_X86_MCE=y
+CONFIG_X86_MCE_INTEL=y
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+
+#
+# Power management options
+#
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+# CONFIG_SOFTWARE_SUSPEND is not set
+
+#
+# ACPI (Advanced Configuration and Power Interface) Support
+#
+CONFIG_ACPI=y
+CONFIG_ACPI_BOOT=y
+CONFIG_ACPI_INTERPRETER=y
+# CONFIG_ACPI_SLEEP is not set
+# CONFIG_ACPI_AC is not set
+# CONFIG_ACPI_BATTERY is not set
+CONFIG_ACPI_BUTTON=y
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_THERMAL=y
+# CONFIG_ACPI_ASUS is not set
+CONFIG_ACPI_IBM=m
+# CONFIG_ACPI_TOSHIBA is not set
+CONFIG_ACPI_BLACKLIST_YEAR=0
+CONFIG_ACPI_DEBUG=y
+CONFIG_ACPI_BUS=y
+CONFIG_ACPI_EC=y
+CONFIG_ACPI_POWER=y
+CONFIG_ACPI_PCI=y
+CONFIG_ACPI_SYSTEM=y
+# CONFIG_ACPI_CONTAINER is not set
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+# CONFIG_UNORDERED_IO is not set
+# CONFIG_PCI_MSI is not set
+# CONFIG_PCI_LEGACY_PROC is not set
+CONFIG_PCI_NAMES=y
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# PC-card bridges
+#
+
+#
+# PCI Hotplug Support
+#
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# Executable file formats / Emulations
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_MISC=m
+CONFIG_IA32_EMULATION=y
+CONFIG_IA32_AOUT=y
+CONFIG_COMPAT=y
+CONFIG_SYSVIPC_COMPAT=y
+CONFIG_UID16=y
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=m
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Parallel port support
+#
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_PC_CML1=m
+# CONFIG_PARPORT_SERIAL is not set
+CONFIG_PARPORT_PC_FIFO=y
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_OTHER=y
+CONFIG_PARPORT_1284=y
+
+#
+# Plug and Play support
+#
+# CONFIG_PNP is not set
+
+#
+# Block devices
+#
+CONFIG_BLK_DEV_FD=y
+# CONFIG_PARIDE is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_NBD=m
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_LBD=y
+# CONFIG_CDROM_PKTCDVD is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+# CONFIG_BLK_DEV_HD_IDE is not set
+CONFIG_BLK_DEV_IDEDISK=y
+CONFIG_IDEDISK_MULTI_MODE=y
+CONFIG_BLK_DEV_IDECD=y
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+CONFIG_BLK_DEV_IDESCSI=m
+# CONFIG_IDE_TASK_IOCTL is not set
+
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=y
+# CONFIG_BLK_DEV_CMD640 is not set
+CONFIG_BLK_DEV_IDEPCI=y
+CONFIG_IDEPCI_SHARE_IRQ=y
+# CONFIG_BLK_DEV_OFFBOARD is not set
+CONFIG_BLK_DEV_GENERIC=y
+# CONFIG_BLK_DEV_OPTI621 is not set
+# CONFIG_BLK_DEV_RZ1000 is not set
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
+CONFIG_IDEDMA_PCI_AUTO=y
+# CONFIG_IDEDMA_ONLYDISK is not set
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_ATIIXP is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_HPT34X is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_PIIX is not set
+CONFIG_BLK_DEV_IT821X=y
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SIS5513 is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+CONFIG_BLK_DEV_VIA82CXXX=y
+# CONFIG_IDE_ARM is not set
+CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDEDMA_IVB is not set
+CONFIG_IDEDMA_AUTO=y
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI=m
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+
+#
+# SCSI Transport Attributes
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+CONFIG_SCSI_SATA=y
+# CONFIG_SCSI_SATA_AHCI is not set
+# CONFIG_SCSI_SATA_SVW is not set
+# CONFIG_SCSI_ATA_PIIX is not set
+# CONFIG_SCSI_SATA_NV is not set
+# CONFIG_SCSI_SATA_PROMISE is not set
+# CONFIG_SCSI_SATA_QSTOR is not set
+# CONFIG_SCSI_SATA_SX4 is not set
+# CONFIG_SCSI_SATA_SIL is not set
+# CONFIG_SCSI_SATA_SIS is not set
+# CONFIG_SCSI_SATA_ULI is not set
+CONFIG_SCSI_SATA_VIA=m
+# CONFIG_SCSI_SATA_VITESSE is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_CPQFCTS is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_EATA_PIO is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_PPA is not set
+# CONFIG_SCSI_IMM is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_PCI2000 is not set
+# CONFIG_SCSI_PCI2220I is not set
+# CONFIG_SCSI_QLOGIC_ISP is not set
+# CONFIG_SCSI_QLOGIC_FC is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+CONFIG_SCSI_QLA2XXX=m
+# CONFIG_SCSI_QLA21XX is not set
+# CONFIG_SCSI_QLA22XX is not set
+# CONFIG_SCSI_QLA2300 is not set
+# CONFIG_SCSI_QLA2322 is not set
+# CONFIG_SCSI_QLA6312 is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_LINEAR=y
+CONFIG_MD_RAID0=y
+CONFIG_MD_RAID1=y
+# CONFIG_MD_RAID10 is not set
+CONFIG_MD_RAID5=y
+# CONFIG_MD_RAID6 is not set
+CONFIG_MD_MULTIPATH=y
+# CONFIG_MD_FAULTY is not set
+CONFIG_BLK_DEV_DM=y
+CONFIG_DM_CRYPT=m
+# CONFIG_DM_SNAPSHOT is not set
+# CONFIG_DM_MIRROR is not set
+# CONFIG_DM_ZERO is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_IEEE1394=m
+
+#
+# Subsystem Options
+#
+# CONFIG_IEEE1394_VERBOSEDEBUG is not set
+# CONFIG_IEEE1394_OUI_DB is not set
+CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
+CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
+
+#
+# Device Drivers
+#
+# CONFIG_IEEE1394_PCILYNX is not set
+CONFIG_IEEE1394_OHCI1394=m
+
+#
+# Protocol Drivers
+#
+CONFIG_IEEE1394_VIDEO1394=m
+CONFIG_IEEE1394_SBP2=m
+CONFIG_IEEE1394_SBP2_PHYS_DMA=y
+CONFIG_IEEE1394_ETH1394=m
+CONFIG_IEEE1394_DV1394=m
+CONFIG_IEEE1394_RAWIO=m
+CONFIG_IEEE1394_CMP=m
+CONFIG_IEEE1394_AMDTP=m
+
+#
+# I2O device support
+#
+# CONFIG_I2O is not set
+
+#
+# Networking support
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+# CONFIG_NETLINK_DEV is not set
+CONFIG_UNIX=y
+CONFIG_NET_KEY=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=y
+CONFIG_INET_ESP=y
+CONFIG_INET_IPCOMP=y
+CONFIG_INET_TUNNEL=y
+CONFIG_IP_TCPDIAG=y
+# CONFIG_IP_TCPDIAG_IPV6 is not set
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
+# CONFIG_IPV6 is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_CONNTRACK=y
+# CONFIG_IP_NF_CT_ACCT is not set
+# CONFIG_IP_NF_CONNTRACK_MARK is not set
+# CONFIG_IP_NF_CT_PROTO_SCTP is not set
+CONFIG_IP_NF_FTP=m
+CONFIG_IP_NF_IRC=m
+CONFIG_IP_NF_TFTP=m
+# CONFIG_IP_NF_AMANDA is not set
+# CONFIG_IP_NF_QUEUE is not set
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_MATCH_LIMIT=m
+CONFIG_IP_NF_MATCH_IPRANGE=y
+CONFIG_IP_NF_MATCH_MAC=m
+CONFIG_IP_NF_MATCH_PKTTYPE=m
+CONFIG_IP_NF_MATCH_MARK=m
+CONFIG_IP_NF_MATCH_MULTIPORT=y
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_DSCP=m
+CONFIG_IP_NF_MATCH_AH_ESP=y
+CONFIG_IP_NF_MATCH_LENGTH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_TCPMSS=m
+CONFIG_IP_NF_MATCH_HELPER=m
+CONFIG_IP_NF_MATCH_STATE=m
+CONFIG_IP_NF_MATCH_CONNTRACK=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_PHYSDEV=m
+# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
+# CONFIG_IP_NF_MATCH_REALM is not set
+# CONFIG_IP_NF_MATCH_SCTP is not set
+# CONFIG_IP_NF_MATCH_COMMENT is not set
+# CONFIG_IP_NF_MATCH_HASHLIMIT is not set
+CONFIG_IP_NF_FILTER=y
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_LOG=y
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_TARGET_TCPMSS=m
+CONFIG_IP_NF_NAT=y
+CONFIG_IP_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_SAME=m
+# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
+CONFIG_IP_NF_NAT_IRC=m
+CONFIG_IP_NF_NAT_FTP=m
+CONFIG_IP_NF_NAT_TFTP=m
+CONFIG_IP_NF_MANGLE=y
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_DSCP=m
+CONFIG_IP_NF_TARGET_MARK=m
+CONFIG_IP_NF_TARGET_CLASSIFY=m
+# CONFIG_IP_NF_RAW is not set
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+
+#
+# Bridge: Netfilter Configuration
+#
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+# CONFIG_BRIDGE_EBT_ULOG is not set
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=y
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
+CONFIG_BRIDGE=m
+CONFIG_VLAN_8021Q=m
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+# CONFIG_NET_CLS_ROUTE is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_HAMRADIO is not set
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+CONFIG_IRDA_ULTRA=y
+
+#
+# IrDA options
+#
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+CONFIG_IRDA_DEBUG=y
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+# CONFIG_IRTTY_SIR is not set
+
+#
+# Dongle support
+#
+
+#
+# Old SIR device drivers
+#
+# CONFIG_IRPORT_SIR is not set
+
+#
+# Old Serial dongle support
+#
+
+#
+# FIR device drivers
+#
+CONFIG_USB_IRDA=m
+# CONFIG_SIGMATEL_FIR is not set
+# CONFIG_VLSI_FIR is not set
+# CONFIG_BT is not set
+CONFIG_NETDEVICES=y
+CONFIG_DUMMY=m
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=m
+
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_NET_VENDOR_3COM is not set
+
+#
+# Tulip family network device support
+#
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+CONFIG_NET_PCI=y
+# CONFIG_PCNET32 is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_DGRS is not set
+# CONFIG_EEPRO100 is not set
+# CONFIG_E100 is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_8139CP is not set
+# CONFIG_8139TOO is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SUNDANCE is not set
+CONFIG_VIA_RHINE=m
+# CONFIG_VIA_RHINE_MMIO is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+CONFIG_R8169=m
+# CONFIG_R8169_NAPI is not set
+# CONFIG_R8169_VLAN is not set
+# CONFIG_SK98LIN is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_TIGON3 is not set
+
+#
+# Ethernet (10000 Mbit)
+#
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PLIP is not set
+CONFIG_PPP=m
+# CONFIG_PPP_MULTILINK is not set
+# CONFIG_PPP_FILTER is not set
+CONFIG_PPP_ASYNC=m
+# CONFIG_PPP_SYNC_TTY is not set
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPPOE=m
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input I/O drivers
+#
+# CONFIG_GAMEPORT is not set
+CONFIG_SOUND_GAMEPORT=y
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_CT82C710 is not set
+# CONFIG_SERIO_PARKBD is not set
+# CONFIG_SERIO_PCIPS2 is not set
+CONFIG_SERIO_LIBPS2=y
+# CONFIG_SERIO_RAW is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_PCSPKR=y
+CONFIG_INPUT_UINPUT=m
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_CONSOLE is not set
+# CONFIG_SERIAL_8250_ACPI is not set
+CONFIG_SERIAL_8250_NR_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+# CONFIG_PPDEV is not set
+# CONFIG_TIPAR is not set
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_NVRAM is not set
+CONFIG_RTC=y
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_FTAPE is not set
+CONFIG_AGP=y
+CONFIG_AGP_AMD64=y
+# CONFIG_AGP_INTEL_MCH is not set
+# CONFIG_DRM is not set
+# CONFIG_MWAVE is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_HPET is not set
+# CONFIG_HANGCHECK_TIMER is not set
+
+#
+# I2C support
+#
+CONFIG_I2C=m
+CONFIG_I2C_CHARDEV=m
+
+#
+# I2C Algorithms
+#
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCF=m
+# CONFIG_I2C_ALGOPCA is not set
+
+#
+# I2C Hardware Bus support
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+# CONFIG_I2C_AMD756_S4882 is not set
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_I810=m
+CONFIG_I2C_ISA=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_PROSAVAGE=m
+CONFIG_I2C_SAVAGE4=m
+CONFIG_SCx200_ACB=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+# CONFIG_I2C_STUB is not set
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+CONFIG_I2C_VOODOO3=m
+# CONFIG_I2C_PCA_ISA is not set
+
+#
+# Hardware Sensors Chip support
+#
+CONFIG_I2C_SENSOR=m
+CONFIG_SENSORS_ADM1021=m
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_FSCHER=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_IT87=m
+# CONFIG_SENSORS_LM63 is not set
+CONFIG_SENSORS_LM75=m
+# CONFIG_SENSORS_LM77 is not set
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+# CONFIG_SENSORS_LM87 is not set
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_MAX1619=m
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83627HF=m
+
+#
+# Other I2C Chip support
+#
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_RTC8564 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Misc devices
+#
+# CONFIG_IBM_ASM is not set
+
+#
+# Multimedia devices
+#
+CONFIG_VIDEO_DEV=m
+
+#
+# Video For Linux
+#
+
+#
+# Video Adapters
+#
+CONFIG_VIDEO_BT848=m
+# CONFIG_VIDEO_BWQCAM is not set
+# CONFIG_VIDEO_CQCAM is not set
+# CONFIG_VIDEO_W9966 is not set
+# CONFIG_VIDEO_CPIA is not set
+# CONFIG_VIDEO_SAA5246A is not set
+# CONFIG_VIDEO_SAA5249 is not set
+# CONFIG_TUNER_3036 is not set
+# CONFIG_VIDEO_STRADIS is not set
+# CONFIG_VIDEO_ZORAN is not set
+# CONFIG_VIDEO_ZR36120 is not set
+# CONFIG_VIDEO_SAA7134 is not set
+# CONFIG_VIDEO_MXB is not set
+# CONFIG_VIDEO_DPC is not set
+# CONFIG_VIDEO_HEXIUM_ORION is not set
+# CONFIG_VIDEO_HEXIUM_GEMINI is not set
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_DVB=m
+# CONFIG_VIDEO_OVCAMCHIP is not set
+
+#
+# Radio Adapters
+#
+# CONFIG_RADIO_GEMTEK_PCI is not set
+# CONFIG_RADIO_MAXIRADIO is not set
+# CONFIG_RADIO_MAESTRO is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+CONFIG_DVB=y
+CONFIG_DVB_CORE=m
+
+#
+# Supported SAA7146 based PCI Adapters
+#
+# CONFIG_DVB_AV7110 is not set
+# CONFIG_DVB_BUDGET is not set
+# CONFIG_DVB_BUDGET_CI is not set
+# CONFIG_DVB_BUDGET_AV is not set
+
+#
+# Supported USB Adapters
+#
+# CONFIG_DVB_TTUSB_BUDGET is not set
+# CONFIG_DVB_TTUSB_DEC is not set
+# CONFIG_DVB_DIBUSB is not set
+# CONFIG_DVB_CINERGYT2 is not set
+
+#
+# Supported FlexCopII (B2C2) Adapters
+#
+# CONFIG_DVB_B2C2_SKYSTAR is not set
+# CONFIG_DVB_B2C2_USB is not set
+
+#
+# Supported BT878 Adapters
+#
+CONFIG_DVB_BT8XX=m
+
+#
+# Supported DVB Frontends
+#
+
+#
+# Customise DVB Frontends
+#
+
+#
+# DVB-S (satellite) frontends
+#
+# CONFIG_DVB_STV0299 is not set
+CONFIG_DVB_CX24110=m
+# CONFIG_DVB_TDA8083 is not set
+# CONFIG_DVB_TDA80XX is not set
+# CONFIG_DVB_MT312 is not set
+# CONFIG_DVB_VES1X93 is not set
+
+#
+# DVB-T (terrestrial) frontends
+#
+# CONFIG_DVB_SP8870 is not set
+CONFIG_DVB_SP887X=m
+# CONFIG_DVB_CX22700 is not set
+# CONFIG_DVB_CX22702 is not set
+# CONFIG_DVB_L64781 is not set
+# CONFIG_DVB_TDA1004X is not set
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+# CONFIG_DVB_DIB3000MB is not set
+# CONFIG_DVB_DIB3000MC is not set
+
+#
+# DVB-C (cable) frontends
+#
+# CONFIG_DVB_ATMEL_AT76C651 is not set
+# CONFIG_DVB_VES1820 is not set
+# CONFIG_DVB_TDA10021 is not set
+# CONFIG_DVB_STV0297 is not set
+
+#
+# ATSC (North American/Korean Terresterial DTV) frontends
+#
+# CONFIG_DVB_NXT2002 is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_VIDEO_BUF=m
+CONFIG_VIDEO_BUF_DVB=m
+CONFIG_VIDEO_BTCX=m
+CONFIG_VIDEO_IR=m
+CONFIG_VIDEO_TVEEPROM=m
+
+#
+# Graphics support
+#
+CONFIG_FB=y
+# CONFIG_FB_MODE_HELPERS is not set
+# CONFIG_FB_TILEBLITTING is not set
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+CONFIG_FB_VGA16=y
+CONFIG_FB_VESA=y
+CONFIG_VIDEO_SELECT=y
+# CONFIG_FB_HGA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON_OLD is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_VIRTUAL is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+CONFIG_FONT_MINI_4x6=y
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+
+#
+# Logo configuration
+#
+CONFIG_LOGO=y
+CONFIG_LOGO_LINUX_MONO=y
+CONFIG_LOGO_LINUX_VGA16=y
+CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
+
+#
+# Sound
+#
+CONFIG_SOUND=y
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_SEQUENCER_OSS=y
+CONFIG_SND_BIT32_EMUL=m
+CONFIG_SND_RTCTIMER=m
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+CONFIG_SND_MPU401_UART=m
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_VIRMIDI is not set
+# CONFIG_SND_MTPAV is not set
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+
+#
+# PCI devices
+#
+CONFIG_SND_AC97_CODEC=m
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_EMU10K1X is not set
+# CONFIG_SND_CA0106 is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_YMFPCI is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_SONICVIBES is not set
+CONFIG_SND_VIA82XX=m
+# CONFIG_SND_VIA82XX_MODEM is not set
+# CONFIG_SND_VX222 is not set
+
+#
+# USB devices
+#
+# CONFIG_SND_USB_AUDIO is not set
+# CONFIG_SND_USB_USX2Y is not set
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+
+#
+# USB support
+#
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_BANDWIDTH=y
+CONFIG_USB_DYNAMIC_MINORS=y
+# CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_OTG is not set
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD=y
+# CONFIG_USB_EHCI_SPLIT_ISO is not set
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+# CONFIG_USB_OHCI_HCD is not set
+CONFIG_USB_UHCI_HCD=y
+# CONFIG_USB_SL811_HCD is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_AUDIO is not set
+# CONFIG_USB_BLUETOOTH_TTY is not set
+# CONFIG_USB_MIDI is not set
+# CONFIG_USB_ACM is not set
+CONFIG_USB_PRINTER=m
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_RW_DETECT is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_HP8200e is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=y
+CONFIG_USB_HIDINPUT=y
+# CONFIG_HID_FF is not set
+CONFIG_USB_HIDDEV=y
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_MTOUCH is not set
+# CONFIG_USB_EGALAX is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_ATI_REMOTE is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_HPUSBSCSI is not set
+
+#
+# USB Multimedia devices
+#
+# CONFIG_USB_DABUSB is not set
+# CONFIG_USB_VICAM is not set
+# CONFIG_USB_DSBR is not set
+# CONFIG_USB_IBMCAM is not set
+# CONFIG_USB_KONICAWC is not set
+# CONFIG_USB_OV511 is not set
+# CONFIG_USB_SE401 is not set
+# CONFIG_USB_SN9C102 is not set
+# CONFIG_USB_STV680 is not set
+# CONFIG_USB_PWC is not set
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+
+#
+# USB port drivers
+#
+# CONFIG_USB_USS720 is not set
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGETKIT is not set
+# CONFIG_USB_PHIDGETSERVO is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_TEST is not set
+
+#
+# USB ATM/DSL drivers
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# InfiniBand support
+#
+# CONFIG_INFINIBAND is not set
+
+#
+# Firmware Drivers
+#
+# CONFIG_EDD is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+# CONFIG_EXT2_FS_POSIX_ACL is not set
+# CONFIG_EXT2_FS_SECURITY is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=y
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+# CONFIG_JFS_FS is not set
+
+#
+# XFS support
+#
+# CONFIG_XFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_QUOTA is not set
+CONFIG_DNOTIFY=y
+# CONFIG_AUTOFS_FS is not set
+CONFIG_AUTOFS4_FS=y
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=y
+CONFIG_JOLIET=y
+# CONFIG_ZISOFS is not set
+CONFIG_UDF_FS=y
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_SYSFS=y
+# CONFIG_DEVFS_FS is not set
+CONFIG_DEVPTS_FS_XATTR=y
+# CONFIG_DEVPTS_FS_SECURITY is not set
+CONFIG_TMPFS=y
+# CONFIG_TMPFS_XATTR is not set
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD=y
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V4 is not set
+CONFIG_NFSD_TCP=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=y
+CONFIG_SUNRPC=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+CONFIG_CIFS=y
+# CONFIG_CIFS_STATS is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CIFS_EXPERIMENTAL is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_DEBUG_PREEMPT=y
+
+#
+# Security options
+#
+# CONFIG_KEYS is not set
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+# CONFIG_CRYPTO_WP512 is not set
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_BLOWFISH=y
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRYPTO_SERPENT=y
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_CAST5=y
+CONFIG_CRYPTO_CAST6=y
+# CONFIG_CRYPTO_TEA is not set
+CONFIG_CRYPTO_ARC4=y
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_ANUBIS is not set
+CONFIG_CRYPTO_DEFLATE=y
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_CRC32C=m
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Hardware crypto devices
+#
+
+#
+# Library routines
+#
+CONFIG_CRC_CCITT=m
+CONFIG_CRC32=y
+CONFIG_LIBCRC32C=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
Index: configs/kernel/linux-2.6.11.7-arm.config
===================================================================
--- configs/kernel/linux-2.6.11.7-arm.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ configs/kernel/linux-2.6.11.7-arm.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,945 @@
+#
+# Automatically generated make config: don't edit
+#
+CONFIG_ARM=y
+CONFIG_MMU=y
+CONFIG_UID16=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_CLEAN_COMPILE=y
+CONFIG_BROKEN_ON_SMP=y
+
+#
+# General setup
+#
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
+CONFIG_LOG_BUF_SHIFT=14
+# CONFIG_HOTPLUG is not set
+# CONFIG_IKCONFIG is not set
+# CONFIG_EMBEDDED is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_ALL is not set
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+
+#
+# Loadable module support
+#
+# CONFIG_MODULES is not set
+
+#
+# System Type
+#
+# CONFIG_ARCH_CLPS7500 is not set
+# CONFIG_ARCH_CLPS711X is not set
+# CONFIG_ARCH_CO285 is not set
+# CONFIG_ARCH_EBSA110 is not set
+# CONFIG_ARCH_CAMELOT is not set
+CONFIG_ARCH_FOOTBRIDGE=y
+# CONFIG_ARCH_INTEGRATOR is not set
+# CONFIG_ARCH_IOP3XX is not set
+# CONFIG_ARCH_IXP4XX is not set
+# CONFIG_ARCH_L7200 is not set
+# CONFIG_ARCH_PXA is not set
+# CONFIG_ARCH_RPC is not set
+# CONFIG_ARCH_SA1100 is not set
+# CONFIG_ARCH_S3C2410 is not set
+# CONFIG_ARCH_SHARK is not set
+# CONFIG_ARCH_LH7A40X is not set
+# CONFIG_ARCH_OMAP is not set
+# CONFIG_ARCH_VERSATILE_PB is not set
+
+#
+# Footbridge Implementations
+#
+# CONFIG_ARCH_CATS is not set
+# CONFIG_ARCH_PERSONAL_SERVER is not set
+# CONFIG_ARCH_EBSA285_ADDIN is not set
+# CONFIG_ARCH_EBSA285_HOST is not set
+CONFIG_ARCH_NETWINDER=y
+CONFIG_FOOTBRIDGE=y
+CONFIG_FOOTBRIDGE_HOST=y
+
+#
+# Processor Type
+#
+CONFIG_CPU_32=y
+CONFIG_CPU_SA110=y
+CONFIG_CPU_32v4=y
+CONFIG_CPU_ABRT_EV4=y
+CONFIG_CPU_CACHE_V4WB=y
+CONFIG_CPU_COPY_V4WB=y
+CONFIG_CPU_TLB_V4WB=y
+
+#
+# Processor Features
+#
+
+#
+# General setup
+#
+CONFIG_PCI=y
+CONFIG_ISA=y
+CONFIG_ISA_DMA=y
+# CONFIG_ZBOOT_ROM is not set
+CONFIG_ZBOOT_ROM_TEXT=0x0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_PCI_LEGACY_PROC=y
+CONFIG_PCI_NAMES=y
+
+#
+# At least one math emulation must be selected
+#
+CONFIG_FPE_NWFPE=y
+# CONFIG_FPE_NWFPE_XP is not set
+# CONFIG_FPE_FASTFPE is not set
+# CONFIG_VFP is not set
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_AOUT=y
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_PM is not set
+# CONFIG_PREEMPT is not set
+# CONFIG_ARTHUR is not set
+CONFIG_CMDLINE="root=0x301"
+CONFIG_LEDS=y
+# CONFIG_LEDS_TIMER is not set
+CONFIG_LEDS_CPU=y
+CONFIG_ALIGNMENT_TRAP=y
+
+#
+# Parallel port support
+#
+CONFIG_PARPORT=y
+CONFIG_PARPORT_PC=y
+CONFIG_PARPORT_PC_CML1=y
+# CONFIG_PARPORT_SERIAL is not set
+# CONFIG_PARPORT_PC_FIFO is not set
+CONFIG_PARPORT_PC_SUPERIO=y
+# CONFIG_PARPORT_ARC is not set
+# CONFIG_PARPORT_OTHER is not set
+# CONFIG_PARPORT_1284 is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Plug and Play support
+#
+# CONFIG_PNP is not set
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_DEV_XD is not set
+# CONFIG_PARIDE is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_RAM is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Networking support
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_NETLINK_DEV=y
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+CONFIG_IP_PNP_RARP=y
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
+# CONFIG_IPV6 is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_CONNTRACK=y
+CONFIG_IP_NF_FTP=y
+# CONFIG_IP_NF_IRC is not set
+# CONFIG_IP_NF_TFTP is not set
+# CONFIG_IP_NF_AMANDA is not set
+CONFIG_IP_NF_QUEUE=y
+CONFIG_IP_NF_IPTABLES=y
+# CONFIG_IP_NF_MATCH_LIMIT is not set
+# CONFIG_IP_NF_MATCH_IPRANGE is not set
+# CONFIG_IP_NF_MATCH_MAC is not set
+# CONFIG_IP_NF_MATCH_PKTTYPE is not set
+# CONFIG_IP_NF_MATCH_MARK is not set
+# CONFIG_IP_NF_MATCH_MULTIPORT is not set
+# CONFIG_IP_NF_MATCH_TOS is not set
+# CONFIG_IP_NF_MATCH_RECENT is not set
+# CONFIG_IP_NF_MATCH_ECN is not set
+# CONFIG_IP_NF_MATCH_DSCP is not set
+# CONFIG_IP_NF_MATCH_AH_ESP is not set
+# CONFIG_IP_NF_MATCH_LENGTH is not set
+# CONFIG_IP_NF_MATCH_TTL is not set
+# CONFIG_IP_NF_MATCH_TCPMSS is not set
+# CONFIG_IP_NF_MATCH_HELPER is not set
+# CONFIG_IP_NF_MATCH_STATE is not set
+# CONFIG_IP_NF_MATCH_CONNTRACK is not set
+# CONFIG_IP_NF_MATCH_OWNER is not set
+# CONFIG_IP_NF_FILTER is not set
+# CONFIG_IP_NF_NAT is not set
+# CONFIG_IP_NF_MANGLE is not set
+# CONFIG_IP_NF_TARGET_LOG is not set
+# CONFIG_IP_NF_TARGET_ULOG is not set
+# CONFIG_IP_NF_TARGET_TCPMSS is not set
+# CONFIG_IP_NF_ARPTABLES is not set
+# CONFIG_IP_NF_RAW is not set
+# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
+# CONFIG_IP_NF_MATCH_REALM is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_HW_FLOWCONTROL is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+# CONFIG_NET_CLS_ROUTE is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+CONFIG_NETDEVICES=y
+# CONFIG_DUMMY is not set
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_ETHERTAP is not set
+
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_LANCE is not set
+# CONFIG_NET_VENDOR_SMC is not set
+# CONFIG_SMC91X is not set
+# CONFIG_NET_VENDOR_RACAL is not set
+
+#
+# Tulip family network device support
+#
+CONFIG_NET_TULIP=y
+# CONFIG_DE2104X is not set
+CONFIG_TULIP=y
+# CONFIG_TULIP_MWI is not set
+CONFIG_TULIP_MMIO=y
+# CONFIG_TULIP_NAPI is not set
+# CONFIG_DE4X5 is not set
+# CONFIG_WINBOND_840 is not set
+# CONFIG_DM9102 is not set
+# CONFIG_AT1700 is not set
+# CONFIG_DEPCA is not set
+# CONFIG_HP100 is not set
+# CONFIG_NET_ISA is not set
+CONFIG_NET_PCI=y
+# CONFIG_PCNET32 is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_AC3200 is not set
+# CONFIG_APRICOT is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_CS89x0 is not set
+# CONFIG_DGRS is not set
+# CONFIG_EEPRO100 is not set
+# CONFIG_E100 is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+CONFIG_NE2K_PCI=y
+# CONFIG_8139CP is not set
+# CONFIG_8139TOO is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_TLAN is not set
+# CONFIG_VIA_RHINE is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_NET_POCKET is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SK98LIN is not set
+# CONFIG_TIGON3 is not set
+
+#
+# Ethernet (10000 Mbit)
+#
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PLIP is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_IDEDISK=y
+CONFIG_IDEDISK_MULTI_MODE=y
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+# CONFIG_IDE_TASKFILE_IO is not set
+
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=y
+CONFIG_BLK_DEV_IDEPCI=y
+# CONFIG_IDEPCI_SHARE_IRQ is not set
+# CONFIG_BLK_DEV_OFFBOARD is not set
+# CONFIG_BLK_DEV_GENERIC is not set
+# CONFIG_BLK_DEV_OPTI621 is not set
+CONFIG_BLK_DEV_SL82C105=y
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
+CONFIG_IDEDMA_PCI_AUTO=y
+# CONFIG_IDEDMA_ONLYDISK is not set
+CONFIG_BLK_DEV_ADMA=y
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_HPT34X is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+# CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_IDE_ARM is not set
+# CONFIG_IDE_CHIPSETS is not set
+CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDEDMA_IVB is not set
+CONFIG_IDEDMA_AUTO=y
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+# CONFIG_SCSI is not set
+
+#
+# Fusion MPT device support
+#
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_IEEE1394 is not set
+
+#
+# I2O device support
+#
+# CONFIG_I2O is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input I/O drivers
+#
+# CONFIG_GAMEPORT is not set
+CONFIG_SOUND_GAMEPORT=y
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_CT82C710 is not set
+# CONFIG_SERIO_PARKBD is not set
+# CONFIG_SERIO_PCIPS2 is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_SERIAL=y
+# CONFIG_MOUSE_INPORT is not set
+# CONFIG_MOUSE_LOGIBM is not set
+# CONFIG_MOUSE_PC110PAD is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=y
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_21285 is not set
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_PRINTER=y
+# CONFIG_LP_CONSOLE is not set
+# CONFIG_PPDEV is not set
+# CONFIG_TIPAR is not set
+# CONFIG_QIC02_TAPE is not set
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+CONFIG_WATCHDOG=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+
+#
+# Watchdog Device Drivers
+#
+# CONFIG_SOFT_WATCHDOG is not set
+# CONFIG_21285_WATCHDOG is not set
+# CONFIG_977_WATCHDOG is not set
+
+#
+# ISA-based Watchdog Cards
+#
+# CONFIG_PCWATCHDOG is not set
+# CONFIG_MIXCOMWD is not set
+# CONFIG_WDT is not set
+
+#
+# PCI-based Watchdog Cards
+#
+# CONFIG_PCIPCWATCHDOG is not set
+# CONFIG_WDTPCI is not set
+CONFIG_DS1620=y
+CONFIG_NWBUTTON=y
+CONFIG_NWBUTTON_REBOOT=y
+CONFIG_NWFLASH=y
+# CONFIG_NVRAM is not set
+CONFIG_RTC=y
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+# CONFIG_RAW_DRIVER is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_JBD is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_QUOTA is not set
+CONFIG_AUTOFS_FS=y
+# CONFIG_AUTOFS4_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=y
+CONFIG_JOLIET=y
+# CONFIG_ZISOFS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_SYSFS=y
+# CONFIG_DEVFS_FS is not set
+# CONFIG_DEVPTS_FS_XATTR is not set
+CONFIG_TMPFS=y
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+CONFIG_NFS_V4=y
+# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD=y
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V4 is not set
+# CONFIG_NFSD_TCP is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
+CONFIG_RPCSEC_GSS_KRB5=y
+CONFIG_SMB_FS=y
+# CONFIG_SMB_NLS_DEFAULT is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+# CONFIG_MAC_PARTITION is not set
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+CONFIG_NLS_CODEPAGE_850=y
+CONFIG_NLS_CODEPAGE_852=y
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=y
+CONFIG_NLS_ISO8859_2=y
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+CONFIG_NLS_ISO8859_15=y
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=y
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Graphics support
+#
+CONFIG_FB=y
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+CONFIG_FB_CYBER2000=y
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON_OLD is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_VIRTUAL is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_MDA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+
+#
+# Logo configuration
+#
+CONFIG_LOGO=y
+CONFIG_LOGO_LINUX_MONO=y
+CONFIG_LOGO_LINUX_VGA16=y
+CONFIG_LOGO_LINUX_CLUT224=y
+
+#
+# Sound
+#
+CONFIG_SOUND=y
+
+#
+# Advanced Linux Sound Architecture
+#
+# CONFIG_SND is not set
+
+#
+# Open Sound System
+#
+CONFIG_SOUND_PRIME=y
+# CONFIG_SOUND_BT878 is not set
+# CONFIG_SOUND_CMPCI is not set
+# CONFIG_SOUND_EMU10K1 is not set
+# CONFIG_SOUND_FUSION is not set
+# CONFIG_SOUND_CS4281 is not set
+# CONFIG_SOUND_ES1370 is not set
+# CONFIG_SOUND_ES1371 is not set
+# CONFIG_SOUND_ESSSOLO1 is not set
+# CONFIG_SOUND_MAESTRO is not set
+# CONFIG_SOUND_MAESTRO3 is not set
+# CONFIG_SOUND_ICH is not set
+# CONFIG_SOUND_SONICVIBES is not set
+# CONFIG_SOUND_TRIDENT is not set
+# CONFIG_SOUND_VIA82CXXX is not set
+CONFIG_SOUND_OSS=y
+CONFIG_SOUND_TRACEINIT=y
+CONFIG_SOUND_DMAP=y
+# CONFIG_SOUND_AD1816 is not set
+# CONFIG_SOUND_AD1889 is not set
+# CONFIG_SOUND_SGALAXY is not set
+# CONFIG_SOUND_ADLIB is not set
+# CONFIG_SOUND_ACI_MIXER is not set
+# CONFIG_SOUND_CS4232 is not set
+# CONFIG_SOUND_SSCAPE is not set
+# CONFIG_SOUND_GUS is not set
+# CONFIG_SOUND_VMIDI is not set
+# CONFIG_SOUND_TRIX is not set
+# CONFIG_SOUND_MSS is not set
+# CONFIG_SOUND_MPU401 is not set
+# CONFIG_SOUND_NM256 is not set
+# CONFIG_SOUND_MAD16 is not set
+# CONFIG_SOUND_PAS is not set
+# CONFIG_SOUND_PSS is not set
+# CONFIG_SOUND_SB is not set
+# CONFIG_SOUND_AWE32_SYNTH is not set
+# CONFIG_SOUND_MAUI is not set
+CONFIG_SOUND_YM3812=y
+# CONFIG_SOUND_OPL3SA1 is not set
+# CONFIG_SOUND_OPL3SA2 is not set
+# CONFIG_SOUND_YMFPCI is not set
+# CONFIG_SOUND_UART6850 is not set
+# CONFIG_SOUND_AEDSP16 is not set
+CONFIG_SOUND_WAVEARTIST=y
+# CONFIG_SOUND_ALI5455 is not set
+# CONFIG_SOUND_FORTE is not set
+# CONFIG_SOUND_RME96XX is not set
+# CONFIG_SOUND_AD1980 is not set
+
+#
+# Misc devices
+#
+
+#
+# USB support
+#
+# CONFIG_USB is not set
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# Kernel hacking
+#
+CONFIG_FRAME_POINTER=y
+CONFIG_DEBUG_USER=y
+# CONFIG_DEBUG_INFO is not set
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_SLAB is not set
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_WAITQ is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_DEBUG_ERRORS is not set
+# CONFIG_DEBUG_LL is not set
+
+#
+# Security options
+#
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO=y
+# CONFIG_CRYPTO_HMAC is not set
+# CONFIG_CRYPTO_NULL is not set
+# CONFIG_CRYPTO_MD4 is not set
+CONFIG_CRYPTO_MD5=y
+# CONFIG_CRYPTO_SHA1 is not set
+# CONFIG_CRYPTO_SHA256 is not set
+# CONFIG_CRYPTO_SHA512 is not set
+CONFIG_CRYPTO_DES=y
+# CONFIG_CRYPTO_BLOWFISH is not set
+# CONFIG_CRYPTO_TWOFISH is not set
+# CONFIG_CRYPTO_SERPENT is not set
+# CONFIG_CRYPTO_AES is not set
+# CONFIG_CRYPTO_CAST5 is not set
+# CONFIG_CRYPTO_CAST6 is not set
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+# CONFIG_CRYPTO_DEFLATE is not set
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Library routines
+#
+# CONFIG_CRC_CCITT is not set
+CONFIG_CRC32=y
+# CONFIG_LIBCRC32C is not set
Index: configs/kernel/linux-2.6.2-rc2-alpha.config
===================================================================
--- configs/kernel/linux-2.6.2-rc2-alpha.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ configs/kernel/linux-2.6.2-rc2-alpha.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,939 @@
+#
+# Automatically generated make config: don't edit
+#
+CONFIG_X86=y
+CONFIG_MMU=y
+CONFIG_UID16=y
+CONFIG_GENERIC_ISA_DMA=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_CLEAN_COMPILE=y
+CONFIG_STANDALONE=y
+CONFIG_BROKEN_ON_SMP=y
+
+#
+# General setup
+#
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_BSD_PROCESS_ACCT is not set
+CONFIG_SYSCTL=y
+CONFIG_LOG_BUF_SHIFT=16
+# CONFIG_IKCONFIG is not set
+# CONFIG_EMBEDDED is not set
+CONFIG_KALLSYMS=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+# CONFIG_MODULE_UNLOAD is not set
+CONFIG_OBSOLETE_MODPARM=y
+# CONFIG_MODVERSIONS is not set
+CONFIG_KMOD=y
+
+#
+# Processor type and features
+#
+CONFIG_X86_PC=y
+# CONFIG_X86_VOYAGER is not set
+# CONFIG_X86_NUMAQ is not set
+# CONFIG_X86_SUMMIT is not set
+# CONFIG_X86_BIGSMP is not set
+# CONFIG_X86_VISWS is not set
+# CONFIG_X86_GENERICARCH is not set
+# CONFIG_X86_ES7000 is not set
+# CONFIG_M386 is not set
+# CONFIG_M486 is not set
+# CONFIG_M586 is not set
+# CONFIG_M586TSC is not set
+# CONFIG_M586MMX is not set
+CONFIG_M686=y
+# CONFIG_MPENTIUMII is not set
+# CONFIG_MPENTIUMIII is not set
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
+# CONFIG_MELAN is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MWINCHIPC6 is not set
+# CONFIG_MWINCHIP2 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MCYRIXIII is not set
+# CONFIG_MVIAC3_2 is not set
+# CONFIG_X86_GENERIC is not set
+CONFIG_X86_CMPXCHG=y
+CONFIG_X86_XADD=y
+CONFIG_X86_L1_CACHE_SHIFT=5
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_X86_PPRO_FENCE=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_INVLPG=y
+CONFIG_X86_BSWAP=y
+CONFIG_X86_POPAD_OK=y
+CONFIG_X86_GOOD_APIC=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+# CONFIG_HPET_TIMER is not set
+# CONFIG_HPET_EMULATE_RTC is not set
+# CONFIG_SMP is not set
+# CONFIG_PREEMPT is not set
+# CONFIG_X86_UP_APIC is not set
+CONFIG_X86_TSC=y
+# CONFIG_X86_MCE is not set
+# CONFIG_TOSHIBA is not set
+# CONFIG_I8K is not set
+# CONFIG_MICROCODE is not set
+# CONFIG_X86_MSR is not set
+# CONFIG_X86_CPUID is not set
+# CONFIG_EDD is not set
+CONFIG_NOHIGHMEM=y
+# CONFIG_HIGHMEM4G is not set
+# CONFIG_HIGHMEM64G is not set
+# CONFIG_MATH_EMULATION is not set
+# CONFIG_MTRR is not set
+# CONFIG_EFI is not set
+
+#
+# Power management options (ACPI, APM)
+#
+# CONFIG_PM is not set
+
+#
+# ACPI (Advanced Configuration and Power Interface) Support
+#
+CONFIG_ACPI=y
+CONFIG_ACPI_BOOT=y
+CONFIG_ACPI_INTERPRETER=y
+CONFIG_ACPI_AC=m
+CONFIG_ACPI_BATTERY=m
+CONFIG_ACPI_BUTTON=m
+CONFIG_ACPI_FAN=m
+CONFIG_ACPI_PROCESSOR=m
+CONFIG_ACPI_THERMAL=m
+CONFIG_ACPI_ASUS=m
+CONFIG_ACPI_TOSHIBA=m
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_BUS=y
+CONFIG_ACPI_EC=y
+CONFIG_ACPI_POWER=y
+CONFIG_ACPI_PCI=y
+CONFIG_ACPI_SYSTEM=y
+# CONFIG_ACPI_RELAXED_AML is not set
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
+#
+CONFIG_PCI=y
+# CONFIG_PCI_GOBIOS is not set
+# CONFIG_PCI_GODIRECT is not set
+CONFIG_PCI_GOANY=y
+CONFIG_PCI_BIOS=y
+CONFIG_PCI_DIRECT=y
+# CONFIG_PCI_LEGACY_PROC is not set
+CONFIG_PCI_NAMES=y
+CONFIG_ISA=y
+CONFIG_EISA=y
+# CONFIG_EISA_VLB_PRIMING is not set
+CONFIG_EISA_PCI_EISA=y
+CONFIG_EISA_VIRTUAL_ROOT=y
+CONFIG_EISA_NAMES=y
+# CONFIG_MCA is not set
+# CONFIG_SCx200 is not set
+# CONFIG_HOTPLUG is not set
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_AOUT is not set
+# CONFIG_BINFMT_MISC is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Parallel port support
+#
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
+# CONFIG_PARPORT_OTHER is not set
+CONFIG_PARPORT_1284=y
+
+#
+# Plug and Play support
+#
+# CONFIG_PNP is not set
+
+#
+# Block devices
+#
+CONFIG_BLK_DEV_FD=y
+# CONFIG_BLK_DEV_XD is not set
+# CONFIG_PARIDE is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+CONFIG_BLK_DEV_LOOP=m
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_RAM is not set
+# CONFIG_BLK_DEV_INITRD is not set
+# CONFIG_LBD is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=m
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=y
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=y
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+CONFIG_SCSI_REPORT_LUNS=y
+CONFIG_SCSI_CONSTANTS=y
+# CONFIG_SCSI_LOGGING is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_7000FASST is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AHA152X is not set
+# CONFIG_SCSI_AHA1542 is not set
+# CONFIG_SCSI_AHA1740 is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_IN2000 is not set
+# CONFIG_SCSI_MEGARAID is not set
+# CONFIG_SCSI_SATA is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_CPQFCTS is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_DTC3280 is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_EATA_PIO is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_GENERIC_NCR5380 is not set
+# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_PPA is not set
+# CONFIG_SCSI_IMM is not set
+# CONFIG_SCSI_NCR53C406A is not set
+CONFIG_SCSI_SYM53C8XX_2=y
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
+# CONFIG_SCSI_PAS16 is not set
+# CONFIG_SCSI_PSI240I is not set
+# CONFIG_SCSI_QLOGIC_FAS is not set
+# CONFIG_SCSI_QLOGIC_ISP is not set
+# CONFIG_SCSI_QLOGIC_FC is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+CONFIG_SCSI_QLA2XXX=y
+# CONFIG_SCSI_QLA21XX is not set
+# CONFIG_SCSI_QLA22XX is not set
+# CONFIG_SCSI_QLA2300 is not set
+# CONFIG_SCSI_QLA2322 is not set
+# CONFIG_SCSI_QLA6312 is not set
+# CONFIG_SCSI_QLA6322 is not set
+# CONFIG_SCSI_SIM710 is not set
+# CONFIG_SCSI_SYM53C416 is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_T128 is not set
+# CONFIG_SCSI_U14_34F is not set
+# CONFIG_SCSI_ULTRASTOR is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# Old CD-ROM drivers (not SCSI, not IDE)
+#
+# CONFIG_CD_NO_IDESCSI is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support (EXPERIMENTAL)
+#
+# CONFIG_IEEE1394 is not set
+
+#
+# I2O device support
+#
+# CONFIG_I2O is not set
+
+#
+# Macintosh device drivers
+#
+
+#
+# Networking support
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+# CONFIG_NETLINK_DEV is not set
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+# CONFIG_IP_PNP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+# CONFIG_INET_ECN is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
+# CONFIG_IPV6 is not set
+# CONFIG_DECNET is not set
+# CONFIG_BRIDGE is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_CONNTRACK=m
+CONFIG_IP_NF_FTP=m
+CONFIG_IP_NF_IRC=m
+# CONFIG_IP_NF_TFTP is not set
+# CONFIG_IP_NF_AMANDA is not set
+# CONFIG_IP_NF_QUEUE is not set
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_LIMIT=m
+# CONFIG_IP_NF_MATCH_IPRANGE is not set
+CONFIG_IP_NF_MATCH_MAC=m
+# CONFIG_IP_NF_MATCH_PKTTYPE is not set
+# CONFIG_IP_NF_MATCH_MARK is not set
+CONFIG_IP_NF_MATCH_MULTIPORT=m
+# CONFIG_IP_NF_MATCH_TOS is not set
+# CONFIG_IP_NF_MATCH_RECENT is not set
+# CONFIG_IP_NF_MATCH_ECN is not set
+# CONFIG_IP_NF_MATCH_DSCP is not set
+# CONFIG_IP_NF_MATCH_AH_ESP is not set
+# CONFIG_IP_NF_MATCH_LENGTH is not set
+# CONFIG_IP_NF_MATCH_TTL is not set
+# CONFIG_IP_NF_MATCH_TCPMSS is not set
+CONFIG_IP_NF_MATCH_HELPER=m
+CONFIG_IP_NF_MATCH_STATE=m
+CONFIG_IP_NF_MATCH_CONNTRACK=m
+# CONFIG_IP_NF_MATCH_OWNER is not set
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+# CONFIG_IP_NF_TARGET_NETMAP is not set
+# CONFIG_IP_NF_TARGET_SAME is not set
+# CONFIG_IP_NF_NAT_LOCAL is not set
+# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
+CONFIG_IP_NF_NAT_IRC=m
+CONFIG_IP_NF_NAT_FTP=m
+# CONFIG_IP_NF_MANGLE is not set
+CONFIG_IP_NF_TARGET_LOG=m
+# CONFIG_IP_NF_TARGET_ULOG is not set
+# CONFIG_IP_NF_TARGET_TCPMSS is not set
+# CONFIG_IP_NF_ARPTABLES is not set
+# CONFIG_IP_NF_COMPAT_IPCHAINS is not set
+# CONFIG_IP_NF_COMPAT_IPFWADM is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+CONFIG_IPV6_SCTP__=y
+# CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
+# CONFIG_VLAN_8021Q is not set
+CONFIG_LLC=m
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=y
+# CONFIG_LTPC is not set
+# CONFIG_COPS is not set
+CONFIG_IPDDP=m
+# CONFIG_IPDDP_ENCAP is not set
+CONFIG_IPDDP_DECAP=y
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_FASTROUTE is not set
+# CONFIG_NET_HW_FLOWCONTROL is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+CONFIG_NETDEVICES=y
+
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+CONFIG_DUMMY=m
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_NET_VENDOR_3COM is not set
+# CONFIG_LANCE is not set
+# CONFIG_NET_VENDOR_SMC is not set
+# CONFIG_NET_VENDOR_RACAL is not set
+
+#
+# Tulip family network device support
+#
+# CONFIG_NET_TULIP is not set
+# CONFIG_AT1700 is not set
+# CONFIG_DEPCA is not set
+# CONFIG_HP100 is not set
+# CONFIG_NET_ISA is not set
+CONFIG_NET_PCI=y
+# CONFIG_PCNET32 is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_AC3200 is not set
+# CONFIG_APRICOT is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_CS89x0 is not set
+# CONFIG_DGRS is not set
+# CONFIG_EEPRO100 is not set
+# CONFIG_E100 is not set
+# CONFIG_LNE390 is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_NE3210 is not set
+# CONFIG_ES3210 is not set
+# CONFIG_8139CP is not set
+# CONFIG_8139TOO is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_TLAN is not set
+CONFIG_VIA_RHINE=y
+# CONFIG_VIA_RHINE_MMIO is not set
+# CONFIG_NET_POCKET is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SK98LIN is not set
+# CONFIG_TIGON3 is not set
+
+#
+# Ethernet (10000 Mbit)
+#
+# CONFIG_IXGB is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PLIP is not set
+CONFIG_PPP=m
+# CONFIG_PPP_MULTILINK is not set
+# CONFIG_PPP_FILTER is not set
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPPOE=m
+# CONFIG_SLIP is not set
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+# CONFIG_NET_FC is not set
+# CONFIG_RCPCI is not set
+# CONFIG_SHAPER is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+
+#
+# Amateur Radio support
+#
+# CONFIG_HAMRADIO is not set
+
+#
+# IrDA (infrared) support
+#
+# CONFIG_IRDA is not set
+
+#
+# Bluetooth support
+#
+# CONFIG_BT is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN_BOOL is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input I/O drivers
+#
+# CONFIG_GAMEPORT is not set
+CONFIG_SOUND_GAMEPORT=y
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_CT82C710 is not set
+# CONFIG_SERIO_PARKBD is not set
+# CONFIG_SERIO_PCIPS2 is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_INPORT is not set
+# CONFIG_MOUSE_LOGIBM is not set
+# CONFIG_MOUSE_PC110PAD is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_UNIX98_PTYS=y
+CONFIG_UNIX98_PTY_COUNT=256
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+# CONFIG_PPDEV is not set
+# CONFIG_TIPAR is not set
+
+#
+# Mice
+#
+# CONFIG_BUSMOUSE is not set
+# CONFIG_QIC02_TAPE is not set
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_NVRAM is not set
+CONFIG_RTC=y
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_SONYPI is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_FTAPE is not set
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+# CONFIG_MWAVE is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_HANGCHECK_TIMER is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+CONFIG_FB=y
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_VESA is not set
+CONFIG_VIDEO_SELECT=y
+# CONFIG_FB_HGA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON_OLD is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_VIRTUAL is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_MDA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+# CONFIG_FRAMEBUFFER_CONSOLE is not set
+
+#
+# Logo configuration
+#
+# CONFIG_LOGO is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# USB support
+#
+# CONFIG_USB is not set
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_JBD is not set
+CONFIG_REISERFS_FS=y
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+CONFIG_AUTOFS4_FS=m
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+# CONFIG_ZISOFS is not set
+CONFIG_UDF_FS=m
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_DEVFS_FS=y
+CONFIG_DEVFS_MOUNT=y
+# CONFIG_DEVFS_DEBUG is not set
+# CONFIG_DEVPTS_FS is not set
+CONFIG_TMPFS=y
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+CONFIG_HFS_FS=m
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD=y
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V4 is not set
+# CONFIG_NFSD_TCP is not set
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=y
+CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_GSS is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_INTERMEZZO_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+CONFIG_OSF_PARTITION=y
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+# CONFIG_MINIX_SUBPARTITION is not set
+CONFIG_SOLARIS_X86_PARTITION=y
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_NEC98_PARTITION is not set
+CONFIG_SGI_PARTITION=y
+CONFIG_ULTRIX_PARTITION=y
+CONFIG_SUN_PARTITION=y
+# CONFIG_EFI_PARTITION is not set
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=m
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+CONFIG_DEBUG_KERNEL=y
+# CONFIG_DEBUG_STACKOVERFLOW is not set
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_IOVIRT is not set
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_DEBUG_INFO is not set
+# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
+# CONFIG_FRAME_POINTER is not set
+
+#
+# Security options
+#
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+# CONFIG_CRYPTO is not set
+
+#
+# Library routines
+#
+CONFIG_CRC32=y
+CONFIG_ZLIB_INFLATE=m
+CONFIG_ZLIB_DEFLATE=m
+CONFIG_X86_BIOS_REBOOT=y
+CONFIG_PC=y
Index: configs/kernel/linux-2.6.3-x86_64.config
===================================================================
--- configs/kernel/linux-2.6.3-x86_64.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ configs/kernel/linux-2.6.3-x86_64.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1017 @@
+#
+# Automatically generated make config: don't edit
+#
+CONFIG_X86_64=y
+CONFIG_64BIT=y
+CONFIG_X86=y
+CONFIG_MMU=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_X86_CMPXCHG=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_GENERIC_ISA_DMA=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_CLEAN_COMPILE=y
+CONFIG_STANDALONE=y
+
+#
+# General setup
+#
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_SYSCTL=y
+CONFIG_LOG_BUF_SHIFT=15
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+# CONFIG_EMBEDDED is not set
+CONFIG_KALLSYMS=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_OBSOLETE_MODPARM=y
+# CONFIG_MODVERSIONS is not set
+CONFIG_KMOD=y
+
+#
+# Processor type and features
+#
+CONFIG_MK8=y
+# CONFIG_GENERIC_CPU is not set
+CONFIG_X86_L1_CACHE_BYTES=64
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_TSC=y
+CONFIG_X86_GOOD_APIC=y
+# CONFIG_X86_MSR is not set
+# CONFIG_X86_CPUID is not set
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_MTRR=y
+CONFIG_SMP=y
+CONFIG_PREEMPT=y
+# CONFIG_K8_NUMA is not set
+CONFIG_HAVE_DEC_LOCK=y
+CONFIG_NR_CPUS=2
+# CONFIG_GART_IOMMU is not set
+CONFIG_DUMMY_IOMMU=y
+CONFIG_X86_MCE=y
+
+#
+# Power management options
+#
+CONFIG_PM=y
+# CONFIG_SOFTWARE_SUSPEND is not set
+# CONFIG_PM_DISK is not set
+
+#
+# ACPI (Advanced Configuration and Power Interface) Support
+#
+CONFIG_ACPI=y
+CONFIG_ACPI_BOOT=y
+CONFIG_ACPI_INTERPRETER=y
+# CONFIG_ACPI_SLEEP is not set
+# CONFIG_ACPI_AC is not set
+# CONFIG_ACPI_BATTERY is not set
+CONFIG_ACPI_BUTTON=y
+CONFIG_ACPI_FAN=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_THERMAL=y
+# CONFIG_ACPI_ASUS is not set
+# CONFIG_ACPI_TOSHIBA is not set
+CONFIG_ACPI_DEBUG=y
+CONFIG_ACPI_BUS=y
+CONFIG_ACPI_EC=y
+CONFIG_ACPI_POWER=y
+CONFIG_ACPI_PCI=y
+CONFIG_ACPI_SYSTEM=y
+# CONFIG_ACPI_RELAXED_AML is not set
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI=y
+CONFIG_PCI_DIRECT=y
+# CONFIG_PCI_LEGACY_PROC is not set
+CONFIG_PCI_NAMES=y
+CONFIG_HOTPLUG=y
+
+#
+# PCMCIA/CardBus support
+#
+# CONFIG_PCMCIA is not set
+
+#
+# PCI Hotplug Support
+#
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# Executable file formats / Emulations
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_MISC=m
+CONFIG_IA32_EMULATION=y
+CONFIG_IA32_AOUT=y
+CONFIG_COMPAT=y
+CONFIG_UID16=y
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+# CONFIG_FW_LOADER is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Parallel port support
+#
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_PC_CML1=m
+# CONFIG_PARPORT_SERIAL is not set
+CONFIG_PARPORT_PC_FIFO=y
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_OTHER=y
+CONFIG_PARPORT_1284=y
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+CONFIG_BLK_DEV_FD=y
+# CONFIG_PARIDE is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_LBD=y
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_HD_IDE is not set
+CONFIG_BLK_DEV_IDEDISK=y
+CONFIG_IDEDISK_MULTI_MODE=y
+# CONFIG_IDEDISK_STROKE is not set
+CONFIG_BLK_DEV_IDECD=y
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+CONFIG_BLK_DEV_IDESCSI=m
+# CONFIG_IDE_TASK_IOCTL is not set
+# CONFIG_IDE_TASKFILE_IO is not set
+
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=y
+# CONFIG_BLK_DEV_CMD640 is not set
+CONFIG_BLK_DEV_IDEPCI=y
+CONFIG_IDEPCI_SHARE_IRQ=y
+# CONFIG_BLK_DEV_OFFBOARD is not set
+CONFIG_BLK_DEV_GENERIC=y
+# CONFIG_BLK_DEV_OPTI621 is not set
+# CONFIG_BLK_DEV_RZ1000 is not set
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
+CONFIG_IDEDMA_PCI_AUTO=y
+# CONFIG_IDEDMA_ONLYDISK is not set
+CONFIG_BLK_DEV_ADMA=y
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+CONFIG_BLK_DEV_AMD74XX=y
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_HPT34X is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SIS5513 is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+CONFIG_BLK_DEV_VIA82CXXX=y
+CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDEDMA_IVB is not set
+CONFIG_IDEDMA_AUTO=y
+# CONFIG_DMA_NONPCI is not set
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=m
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+CONFIG_SCSI_REPORT_LUNS=y
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_MEGARAID is not set
+CONFIG_SCSI_SATA=y
+# CONFIG_SCSI_SATA_SVW is not set
+# CONFIG_SCSI_ATA_PIIX is not set
+CONFIG_SCSI_SATA_PROMISE=m
+CONFIG_SCSI_SATA_VIA=m
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_CPQFCTS is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_EATA_PIO is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_PPA is not set
+# CONFIG_SCSI_IMM is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_QLOGIC_ISP is not set
+# CONFIG_SCSI_QLOGIC_FC is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+CONFIG_SCSI_QLA2XXX=y
+# CONFIG_SCSI_QLA21XX is not set
+# CONFIG_SCSI_QLA22XX is not set
+# CONFIG_SCSI_QLA2300 is not set
+# CONFIG_SCSI_QLA2322 is not set
+# CONFIG_SCSI_QLA6312 is not set
+# CONFIG_SCSI_QLA6322 is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_LINEAR=y
+CONFIG_MD_RAID0=y
+CONFIG_MD_RAID1=y
+CONFIG_MD_RAID5=y
+# CONFIG_MD_RAID6 is not set
+CONFIG_MD_MULTIPATH=y
+CONFIG_BLK_DEV_DM=y
+CONFIG_DM_IOCTL_V4=y
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support (EXPERIMENTAL)
+#
+CONFIG_IEEE1394=m
+
+#
+# Subsystem Options
+#
+# CONFIG_IEEE1394_VERBOSEDEBUG is not set
+# CONFIG_IEEE1394_OUI_DB is not set
+
+#
+# Device Drivers
+#
+
+#
+# Texas Instruments PCILynx requires I2C
+#
+CONFIG_IEEE1394_OHCI1394=m
+
+#
+# Protocol Drivers
+#
+CONFIG_IEEE1394_VIDEO1394=m
+CONFIG_IEEE1394_SBP2=m
+CONFIG_IEEE1394_SBP2_PHYS_DMA=y
+CONFIG_IEEE1394_ETH1394=m
+CONFIG_IEEE1394_DV1394=m
+CONFIG_IEEE1394_RAWIO=m
+CONFIG_IEEE1394_CMP=m
+CONFIG_IEEE1394_AMDTP=m
+
+#
+# I2O device support
+#
+
+#
+# Macintosh device drivers
+#
+
+#
+# Networking support
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+# CONFIG_NETLINK_DEV is not set
+CONFIG_UNIX=y
+CONFIG_NET_KEY=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+# CONFIG_INET_ECN is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=y
+CONFIG_INET_ESP=y
+CONFIG_INET_IPCOMP=y
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
+CONFIG_IPV6=y
+CONFIG_IPV6_PRIVACY=y
+CONFIG_INET6_AH=y
+CONFIG_INET6_ESP=y
+CONFIG_INET6_IPCOMP=y
+CONFIG_IPV6_TUNNEL=m
+# CONFIG_DECNET is not set
+# CONFIG_BRIDGE is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+
+#
+# IP: Netfilter Configuration
+#
+# CONFIG_IP_NF_CONNTRACK is not set
+# CONFIG_IP_NF_QUEUE is not set
+# CONFIG_IP_NF_IPTABLES is not set
+# CONFIG_IP_NF_ARPTABLES is not set
+# CONFIG_IP_NF_COMPAT_IPCHAINS is not set
+# CONFIG_IP_NF_COMPAT_IPFWADM is not set
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_IP6_NF_QUEUE is not set
+# CONFIG_IP6_NF_IPTABLES is not set
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=y
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+CONFIG_IPV6_SCTP__=y
+# CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_FASTROUTE is not set
+# CONFIG_NET_HW_FLOWCONTROL is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+CONFIG_NETDEVICES=y
+
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+CONFIG_DUMMY=m
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=m
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_VORTEX=m
+# CONFIG_TYPHOON is not set
+
+#
+# Tulip family network device support
+#
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+CONFIG_NET_PCI=y
+# CONFIG_PCNET32 is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_DGRS is not set
+# CONFIG_EEPRO100 is not set
+CONFIG_E100=m
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_8139CP is not set
+# CONFIG_8139TOO is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_VIA_RHINE is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+CONFIG_E1000=m
+# CONFIG_E1000_NAPI is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SK98LIN is not set
+# CONFIG_TIGON3 is not set
+
+#
+# Ethernet (10000 Mbit)
+#
+# CONFIG_IXGB is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PLIP is not set
+CONFIG_PPP=m
+# CONFIG_PPP_MULTILINK is not set
+# CONFIG_PPP_FILTER is not set
+CONFIG_PPP_ASYNC=m
+# CONFIG_PPP_SYNC_TTY is not set
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPPOE=m
+# CONFIG_SLIP is not set
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+# CONFIG_NET_FC is not set
+# CONFIG_SHAPER is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+
+#
+# Amateur Radio support
+#
+# CONFIG_HAMRADIO is not set
+
+#
+# IrDA (infrared) support
+#
+# CONFIG_IRDA is not set
+
+#
+# Bluetooth support
+#
+# CONFIG_BT is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN_BOOL is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input I/O drivers
+#
+# CONFIG_GAMEPORT is not set
+CONFIG_SOUND_GAMEPORT=y
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_CT82C710 is not set
+# CONFIG_SERIO_PARKBD is not set
+# CONFIG_SERIO_PCIPS2 is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_PCSPKR=y
+CONFIG_INPUT_UINPUT=m
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_CONSOLE is not set
+# CONFIG_SERIAL_8250_ACPI is not set
+CONFIG_SERIAL_8250_NR_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_UNIX98_PTY_COUNT=256
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+# CONFIG_PPDEV is not set
+# CONFIG_TIPAR is not set
+
+#
+# Mice
+#
+CONFIG_BUSMOUSE=m
+# CONFIG_QIC02_TAPE is not set
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_NVRAM is not set
+CONFIG_RTC=y
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+CONFIG_AGP=y
+CONFIG_AGP_AMD64=y
+# CONFIG_DRM is not set
+# CONFIG_MWAVE is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_HANGCHECK_TIMER is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+# CONFIG_FB is not set
+# CONFIG_VIDEO_SELECT is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_MDA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# USB support
+#
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_BANDWIDTH=y
+CONFIG_USB_DYNAMIC_MINORS=y
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_EHCI_HCD is not set
+# CONFIG_USB_OHCI_HCD is not set
+CONFIG_USB_UHCI_HCD=y
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_BLUETOOTH_TTY is not set
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_HP8200e is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+
+#
+# USB Human Interface Devices (HID)
+#
+CONFIG_USB_HID=y
+CONFIG_USB_HIDINPUT=y
+# CONFIG_HID_FF is not set
+CONFIG_USB_HIDDEV=y
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_XPAD is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_HPUSBSCSI is not set
+
+#
+# USB Multimedia devices
+#
+# CONFIG_USB_DABUSB is not set
+
+#
+# Video4Linux support is needed for USB Multimedia device support
+#
+
+#
+# USB Network adaptors
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+
+#
+# USB port drivers
+#
+# CONFIG_USB_USS720 is not set
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_TIGL is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_BRLVGER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_TEST is not set
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+# CONFIG_EXT2_FS_POSIX_ACL is not set
+# CONFIG_EXT2_FS_SECURITY is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=y
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+CONFIG_AUTOFS4_FS=y
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=y
+CONFIG_JOLIET=y
+# CONFIG_ZISOFS is not set
+CONFIG_UDF_FS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_NTFS_FS=y
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+# CONFIG_DEVFS_FS is not set
+CONFIG_DEVPTS_FS=y
+# CONFIG_DEVPTS_FS_XATTR is not set
+CONFIG_TMPFS=y
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD=y
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V4 is not set
+CONFIG_NFSD_TCP=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=y
+CONFIG_SUNRPC=y
+# CONFIG_SUNRPC_GSS is not set
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_INTERMEZZO_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_DEBUG_KERNEL is not set
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_FRAME_POINTER is not set
+
+#
+# Security options
+#
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_BLOWFISH=y
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRYPTO_SERPENT=y
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_CAST5=y
+CONFIG_CRYPTO_CAST6=y
+CONFIG_CRYPTO_DEFLATE=y
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Library routines
+#
+CONFIG_CRC32=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
Index: configs/kernel/linux-2.6.6-m68k.config
===================================================================
--- configs/kernel/linux-2.6.6-m68k.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ configs/kernel/linux-2.6.6-m68k.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1019 @@
+#
+# Automatically generated make config: don't edit
+#
+CONFIG_M68K=y
+CONFIG_MMU=y
+CONFIG_UID16=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_CLEAN_COMPILE=y
+CONFIG_STANDALONE=y
+CONFIG_BROKEN_ON_SMP=y
+
+#
+# General setup
+#
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_POSIX_MQUEUE is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_HOTPLUG=y
+# CONFIG_IKCONFIG is not set
+# CONFIG_EMBEDDED is not set
+CONFIG_KALLSYMS=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_OBSOLETE_MODPARM=y
+CONFIG_MODVERSIONS=y
+CONFIG_KMOD=y
+
+#
+# Platform dependent setup
+#
+# CONFIG_SUN3 is not set
+# CONFIG_AMIGA is not set
+# CONFIG_ATARI is not set
+CONFIG_MAC=y
+CONFIG_NUBUS=y
+CONFIG_M68K_L2_CACHE=y
+# CONFIG_APOLLO is not set
+# CONFIG_VME is not set
+# CONFIG_HP300 is not set
+# CONFIG_SUN3X is not set
+# CONFIG_Q40 is not set
+
+#
+# Processor type
+#
+# CONFIG_M68020 is not set
+# CONFIG_M68030 is not set
+CONFIG_M68040=y
+# CONFIG_M68060 is not set
+CONFIG_MMU_MOTOROLA=y
+# CONFIG_M68KFPU_EMU is not set
+CONFIG_ADVANCED=y
+# CONFIG_RMW_INSNS is not set
+# CONFIG_SINGLE_MEMORY_CHUNK is not set
+
+#
+# General setup
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_AOUT=m
+CONFIG_BINFMT_MISC=m
+# CONFIG_HEARTBEAT is not set
+CONFIG_PROC_HARDWARE=y
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+# CONFIG_FW_LOADER is not set
+# CONFIG_DEBUG_DRIVER is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Parallel port support
+#
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_PC_FIFO=y
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_OTHER=y
+CONFIG_PARPORT_1284=y
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_PARIDE is not set
+CONFIG_BLK_DEV_LOOP=y
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_RAM is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+CONFIG_IDE=m
+# CONFIG_BLK_DEV_IDE is not set
+# CONFIG_BLK_DEV_HD_ONLY is not set
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+CONFIG_SCSI_REPORT_LUNS=y
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+
+#
+# SCSI Transport Attributes
+#
+CONFIG_SCSI_SPI_ATTRS=m
+# CONFIG_SCSI_FC_ATTRS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_SATA is not set
+# CONFIG_SCSI_EATA_PIO is not set
+# CONFIG_SCSI_PPA is not set
+# CONFIG_SCSI_IMM is not set
+# CONFIG_SCSI_DEBUG is not set
+# CONFIG_MAC_SCSI is not set
+CONFIG_SCSI_MAC_ESP=y
+
+#
+# Multi-device support (RAID and LVM)
+#
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID5=m
+# CONFIG_MD_RAID6 is not set
+CONFIG_MD_MULTIPATH=m
+# CONFIG_BLK_DEV_DM is not set
+
+#
+# Fusion MPT device support
+#
+
+#
+# IEEE 1394 (FireWire) support
+#
+# CONFIG_IEEE1394 is not set
+
+#
+# I2O device support
+#
+
+#
+# Macintosh device drivers
+#
+CONFIG_ADB=y
+# CONFIG_ADB_MACII is not set
+# CONFIG_ADB_MACIISI is not set
+CONFIG_ADB_IOP=y
+# CONFIG_ADB_PMU68K is not set
+CONFIG_ADB_CUDA=y
+CONFIG_INPUT_ADBHID=y
+CONFIG_MAC_EMUMOUSEBTN=y
+
+#
+# Networking support
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=m
+CONFIG_PACKET_MMAP=y
+CONFIG_NETLINK_DEV=m
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_FWMARK=y
+CONFIG_IP_ROUTE_NAT=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_TOS=y
+CONFIG_IP_ROUTE_VERBOSE=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+
+#
+# IP: Virtual Server Configuration
+#
+CONFIG_IP_VS=m
+CONFIG_IP_VS_DEBUG=y
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+# CONFIG_IP_VS_PROTO_TCP is not set
+# CONFIG_IP_VS_PROTO_UDP is not set
+# CONFIG_IP_VS_PROTO_ESP is not set
+# CONFIG_IP_VS_PROTO_AH is not set
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+# CONFIG_IP_VS_SED is not set
+# CONFIG_IP_VS_NQ is not set
+
+#
+# IPVS application helper
+#
+CONFIG_IPV6=m
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_TUNNEL is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_CONNTRACK=m
+CONFIG_IP_NF_FTP=m
+CONFIG_IP_NF_IRC=m
+# CONFIG_IP_NF_TFTP is not set
+# CONFIG_IP_NF_AMANDA is not set
+CONFIG_IP_NF_QUEUE=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_LIMIT=m
+# CONFIG_IP_NF_MATCH_IPRANGE is not set
+CONFIG_IP_NF_MATCH_MAC=m
+CONFIG_IP_NF_MATCH_PKTTYPE=m
+CONFIG_IP_NF_MATCH_MARK=m
+CONFIG_IP_NF_MATCH_MULTIPORT=m
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_DSCP=m
+CONFIG_IP_NF_MATCH_AH_ESP=m
+CONFIG_IP_NF_MATCH_LENGTH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_TCPMSS=m
+CONFIG_IP_NF_MATCH_HELPER=m
+CONFIG_IP_NF_MATCH_STATE=m
+CONFIG_IP_NF_MATCH_CONNTRACK=m
+CONFIG_IP_NF_MATCH_OWNER=m
+# CONFIG_IP_NF_MATCH_PHYSDEV is not set
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+# CONFIG_IP_NF_TARGET_NETMAP is not set
+# CONFIG_IP_NF_TARGET_SAME is not set
+CONFIG_IP_NF_NAT_LOCAL=y
+CONFIG_IP_NF_NAT_SNMP_BASIC=m
+CONFIG_IP_NF_NAT_IRC=m
+CONFIG_IP_NF_NAT_FTP=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_DSCP=m
+CONFIG_IP_NF_TARGET_MARK=m
+# CONFIG_IP_NF_TARGET_CLASSIFY is not set
+CONFIG_IP_NF_TARGET_LOG=m
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_TARGET_TCPMSS=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+# CONFIG_IP_NF_ARP_MANGLE is not set
+CONFIG_IP_NF_COMPAT_IPCHAINS=m
+CONFIG_IP_NF_COMPAT_IPFWADM=m
+# CONFIG_IP_NF_RAW is not set
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_IP6_NF_QUEUE=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_LIMIT=m
+CONFIG_IP6_NF_MATCH_MAC=m
+# CONFIG_IP6_NF_MATCH_RT is not set
+# CONFIG_IP6_NF_MATCH_OPTS is not set
+# CONFIG_IP6_NF_MATCH_FRAG is not set
+# CONFIG_IP6_NF_MATCH_HL is not set
+CONFIG_IP6_NF_MATCH_MULTIPORT=m
+CONFIG_IP6_NF_MATCH_OWNER=m
+CONFIG_IP6_NF_MATCH_MARK=m
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
+# CONFIG_IP6_NF_MATCH_AHESP is not set
+CONFIG_IP6_NF_MATCH_LENGTH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_LOG=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_TARGET_MARK=m
+# CONFIG_IP6_NF_RAW is not set
+
+#
+# DECnet: Netfilter Configuration
+#
+# CONFIG_DECNET_NF_GRABULATOR is not set
+
+#
+# Bridge: Netfilter Configuration
+#
+# CONFIG_BRIDGE_NF_EBTABLES is not set
+CONFIG_XFRM=y
+# CONFIG_XFRM_USER is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+CONFIG_ATM=y
+CONFIG_ATM_CLIP=y
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+CONFIG_ATM_BR2684_IPFILTER=y
+CONFIG_BRIDGE=m
+CONFIG_VLAN_8021Q=m
+CONFIG_DECNET=m
+# CONFIG_DECNET_SIOCGIFCONF is not set
+# CONFIG_DECNET_ROUTER is not set
+CONFIG_LLC=m
+# CONFIG_LLC2 is not set
+CONFIG_IPX=m
+# CONFIG_IPX_INTERN is not set
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=y
+CONFIG_IPDDP=m
+CONFIG_IPDDP_ENCAP=y
+CONFIG_IPDDP_DECAP=y
+CONFIG_X25=m
+CONFIG_LAPB=m
+# CONFIG_NET_DIVERT is not set
+CONFIG_ECONET=m
+CONFIG_ECONET_AUNUDP=y
+CONFIG_ECONET_NATIVE=y
+CONFIG_WAN_ROUTER=m
+# CONFIG_NET_FASTROUTE is not set
+# CONFIG_NET_HW_FLOWCONTROL is not set
+
+#
+# QoS and/or fair queueing
+#
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+# CONFIG_NET_SCH_HFSC is not set
+CONFIG_NET_SCH_CSZ=m
+# CONFIG_NET_SCH_ATM is not set
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+# CONFIG_NET_SCH_DELAY is not set
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_QOS=y
+CONFIG_NET_ESTIMATOR=y
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_ROUTE=y
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_POLICE=y
+
+#
+# Network testing
+#
+CONFIG_NET_PKTGEN=m
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+CONFIG_HAMRADIO=y
+
+#
+# Packet Radio protocols
+#
+CONFIG_AX25=m
+CONFIG_AX25_DAMA_SLAVE=y
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+#
+# AX.25 network device drivers
+#
+CONFIG_MKISS=m
+CONFIG_6PACK=m
+CONFIG_BPQETHER=m
+CONFIG_BAYCOM_SER_FDX=m
+CONFIG_BAYCOM_SER_HDX=m
+CONFIG_BAYCOM_PAR=m
+CONFIG_BAYCOM_EPP=m
+CONFIG_YAM=m
+CONFIG_IRDA=m
+
+#
+# IrDA protocols
+#
+CONFIG_IRLAN=m
+CONFIG_IRNET=m
+CONFIG_IRCOMM=m
+CONFIG_IRDA_ULTRA=y
+
+#
+# IrDA options
+#
+CONFIG_IRDA_CACHE_LAST_LSAP=y
+CONFIG_IRDA_FAST_RR=y
+# CONFIG_IRDA_DEBUG is not set
+
+#
+# Infrared-port device drivers
+#
+
+#
+# SIR device drivers
+#
+CONFIG_IRTTY_SIR=m
+
+#
+# Dongle support
+#
+CONFIG_DONGLE=y
+CONFIG_ESI_DONGLE=m
+CONFIG_ACTISYS_DONGLE=m
+CONFIG_TEKRAM_DONGLE=m
+CONFIG_LITELINK_DONGLE=m
+CONFIG_MA600_DONGLE=m
+CONFIG_GIRBIL_DONGLE=m
+CONFIG_MCP2120_DONGLE=m
+CONFIG_OLD_BELKIN_DONGLE=m
+CONFIG_ACT200L_DONGLE=m
+
+#
+# Old SIR device drivers
+#
+CONFIG_IRPORT_SIR=m
+
+#
+# Old Serial dongle support
+#
+# CONFIG_DONGLE_OLD is not set
+
+#
+# FIR device drivers
+#
+CONFIG_TOSHIBA_FIR=m
+# CONFIG_BT is not set
+CONFIG_NETDEVICES=y
+CONFIG_DUMMY=m
+CONFIG_BONDING=m
+CONFIG_EQUALIZER=m
+CONFIG_TUN=m
+CONFIG_ETHERTAP=m
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+# CONFIG_MII is not set
+# CONFIG_MAC8390 is not set
+CONFIG_MACSONIC=y
+# CONFIG_MACMACE is not set
+# CONFIG_NET_VENDOR_SMC is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+
+#
+# Ethernet (10000 Mbit)
+#
+
+#
+# Token Ring devices
+#
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+
+#
+# ATM drivers
+#
+CONFIG_ATM_TCP=m
+CONFIG_PLIP=m
+CONFIG_PPP=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPPOE=m
+CONFIG_PPPOATM=m
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+CONFIG_SHAPER=m
+# CONFIG_NETCONSOLE is not set
+
+#
+# ISDN subsystem
+#
+CONFIG_ISDN=m
+
+#
+# Old ISDN4Linux
+#
+# CONFIG_ISDN_I4L is not set
+
+#
+# CAPI subsystem
+#
+CONFIG_ISDN_CAPI=m
+CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+CONFIG_ISDN_CAPI_CAPIFS=m
+
+#
+# CAPI hardware drivers
+#
+
+#
+# Active AVM cards
+#
+# CONFIG_CAPI_AVM is not set
+
+#
+# Active Eicon DIVA Server cards
+#
+# CONFIG_CAPI_EICON is not set
+
+#
+# Telephony Support
+#
+CONFIG_PHONE=m
+CONFIG_PHONE_IXJ=m
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+# CONFIG_INPUT_TSDEV is not set
+CONFIG_INPUT_EVDEV=m
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input I/O drivers
+#
+# CONFIG_GAMEPORT is not set
+CONFIG_SOUND_GAMEPORT=y
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_CT82C710 is not set
+# CONFIG_SERIO_PARKBD is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+CONFIG_PPDEV=m
+# CONFIG_TIPAR is not set
+# CONFIG_QIC02_TAPE is not set
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+CONFIG_GEN_RTC=m
+CONFIG_GEN_RTC_X=y
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+CONFIG_FTAPE=m
+CONFIG_ZFTAPE=m
+CONFIG_ZFT_DFLT_BLK_SZ=10240
+
+#
+# The compressor will be built as a module only!
+#
+CONFIG_ZFT_COMPRESSOR=m
+CONFIG_FT_NR_BUFFERS=3
+CONFIG_FT_PROC_FS=y
+CONFIG_FT_NORMAL_DEBUG=y
+# CONFIG_FT_FULL_DEBUG is not set
+# CONFIG_FT_NO_TRACE is not set
+# CONFIG_FT_NO_TRACE_AT_ALL is not set
+
+#
+# Hardware configuration
+#
+CONFIG_FT_STD_FDC=y
+# CONFIG_FT_MACH2 is not set
+# CONFIG_FT_PROBE_FC10 is not set
+# CONFIG_FT_ALT_FDC is not set
+CONFIG_FT_FDC_THR=8
+CONFIG_FT_FDC_MAX_RATE=2000
+CONFIG_FT_ALPHA_CLOCK=0
+# CONFIG_DRM is not set
+# CONFIG_RAW_DRIVER is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# Misc devices
+#
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+CONFIG_FB=y
+# CONFIG_FB_VALKYRIE is not set
+CONFIG_FB_MAC=y
+# CONFIG_FB_VIRTUAL is not set
+
+#
+# Console display driver support
+#
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_PCI_CONSOLE=y
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+# CONFIG_FONT_8x16 is not set
+CONFIG_FONT_6x11=y
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+
+#
+# Logo configuration
+#
+CONFIG_LOGO=y
+CONFIG_LOGO_LINUX_MONO=y
+CONFIG_LOGO_LINUX_VGA16=y
+CONFIG_LOGO_LINUX_CLUT224=y
+CONFIG_LOGO_MAC_CLUT224=y
+
+#
+# Sound
+#
+CONFIG_SOUND=m
+
+#
+# USB support
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# Character devices
+#
+CONFIG_MAC_SCC=y
+CONFIG_MAC_HID=y
+CONFIG_MAC_ADBKEYCODES=y
+# CONFIG_SERIAL_CONSOLE is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+CONFIG_EXT3_FS=m
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+CONFIG_JBD=m
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+CONFIG_REISERFS_PROC_INFO=y
+# CONFIG_JFS_FS is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_QUOTA=y
+# CONFIG_QFMT_V1 is not set
+CONFIG_QFMT_V2=y
+CONFIG_QUOTACTL=y
+# CONFIG_AUTOFS_FS is not set
+CONFIG_AUTOFS4_FS=m
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_ZISOFS_FS=m
+CONFIG_UDF_FS=m
+
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_FAT_FS is not set
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_SYSFS=y
+# CONFIG_DEVFS_FS is not set
+CONFIG_DEVPTS_FS_XATTR=y
+# CONFIG_DEVPTS_FS_SECURITY is not set
+CONFIG_TMPFS=y
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+CONFIG_HFS_FS=m
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V4 is not set
+CONFIG_NFSD_TCP=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_SUNRPC=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+CONFIG_SMB_FS=m
+CONFIG_SMB_NLS_DEFAULT=y
+CONFIG_SMB_NLS_REMOTE="cp437"
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_INTERMEZZO_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+# CONFIG_AMIGA_PARTITION is not set
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+# CONFIG_MSDOS_PARTITION is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_NEC98_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=m
+
+#
+# Kernel hacking
+#
+CONFIG_DEBUG_KERNEL=y
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_DEBUG_SLAB is not set
+# CONFIG_DEBUG_BUGVERBOSE is not set
+# CONFIG_DEBUG_INFO is not set
+
+#
+# Security options
+#
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_NULL=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=m
+CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA256=m
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_TEST=m
+
+#
+# Library routines
+#
+CONFIG_CRC32=m
+CONFIG_LIBCRC32C=m
+CONFIG_ZLIB_INFLATE=m
+CONFIG_ZLIB_DEFLATE=m
Index: configs/kernel/linux-2.6.7-i686-inspiron-8000.config
===================================================================
--- configs/kernel/linux-2.6.7-i686-inspiron-8000.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ configs/kernel/linux-2.6.7-i686-inspiron-8000.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1435 @@
+#
+# Automatically generated make config: don't edit
+#
+CONFIG_X86=y
+CONFIG_MMU=y
+CONFIG_UID16=y
+CONFIG_GENERIC_ISA_DMA=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_CLEAN_COMPILE=y
+CONFIG_STANDALONE=y
+
+#
+# General setup
+#
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
+CONFIG_LOG_BUF_SHIFT=15
+CONFIG_HOTPLUG=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+# CONFIG_EMBEDDED is not set
+CONFIG_KALLSYMS=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_OBSOLETE_MODPARM=y
+CONFIG_MODVERSIONS=y
+CONFIG_KMOD=y
+CONFIG_STOP_MACHINE=y
+
+#
+# Processor type and features
+#
+CONFIG_X86_PC=y
+# CONFIG_X86_ELAN is not set
+# CONFIG_X86_VOYAGER is not set
+# CONFIG_X86_NUMAQ is not set
+# CONFIG_X86_SUMMIT is not set
+# CONFIG_X86_BIGSMP is not set
+# CONFIG_X86_VISWS is not set
+# CONFIG_X86_GENERICARCH is not set
+# CONFIG_X86_ES7000 is not set
+# CONFIG_M386 is not set
+# CONFIG_M486 is not set
+# CONFIG_M586 is not set
+# CONFIG_M586TSC is not set
+# CONFIG_M586MMX is not set
+# CONFIG_M686 is not set
+# CONFIG_MPENTIUMII is not set
+CONFIG_MPENTIUMIII=y
+# CONFIG_MPENTIUMM is not set
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MWINCHIPC6 is not set
+# CONFIG_MWINCHIP2 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MCYRIXIII is not set
+# CONFIG_MVIAC3_2 is not set
+# CONFIG_X86_GENERIC is not set
+CONFIG_X86_CMPXCHG=y
+CONFIG_X86_XADD=y
+CONFIG_X86_L1_CACHE_SHIFT=5
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_INVLPG=y
+CONFIG_X86_BSWAP=y
+CONFIG_X86_POPAD_OK=y
+CONFIG_X86_GOOD_APIC=y
+CONFIG_X86_INTEL_USERCOPY=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_SMP=y
+CONFIG_NR_CPUS=32
+# CONFIG_SCHED_SMT is not set
+CONFIG_PREEMPT=y
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_TSC=y
+CONFIG_X86_MCE=y
+# CONFIG_X86_MCE_NONFATAL is not set
+# CONFIG_X86_MCE_P4THERMAL is not set
+# CONFIG_TOSHIBA is not set
+# CONFIG_I8K is not set
+# CONFIG_MICROCODE is not set
+# CONFIG_X86_MSR is not set
+# CONFIG_X86_CPUID is not set
+
+#
+# Firmware Drivers
+#
+CONFIG_EDD=y
+CONFIG_NOHIGHMEM=y
+# CONFIG_HIGHMEM4G is not set
+# CONFIG_HIGHMEM64G is not set
+# CONFIG_MATH_EMULATION is not set
+CONFIG_MTRR=y
+# CONFIG_EFI is not set
+CONFIG_IRQBALANCE=y
+CONFIG_HAVE_DEC_LOCK=y
+# CONFIG_REGPARM is not set
+
+#
+# Power management options (ACPI, APM)
+#
+CONFIG_PM=y
+# CONFIG_SOFTWARE_SUSPEND is not set
+# CONFIG_PM_DISK is not set
+
+#
+# ACPI (Advanced Configuration and Power Interface) Support
+#
+CONFIG_ACPI=y
+CONFIG_ACPI_BOOT=y
+CONFIG_ACPI_INTERPRETER=y
+# CONFIG_ACPI_SLEEP is not set
+# CONFIG_ACPI_AC is not set
+# CONFIG_ACPI_BATTERY is not set
+CONFIG_ACPI_BUTTON=y
+CONFIG_ACPI_FAN=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_THERMAL=y
+# CONFIG_ACPI_ASUS is not set
+# CONFIG_ACPI_TOSHIBA is not set
+CONFIG_ACPI_DEBUG=y
+CONFIG_ACPI_BUS=y
+CONFIG_ACPI_EC=y
+CONFIG_ACPI_POWER=y
+CONFIG_ACPI_PCI=y
+CONFIG_ACPI_SYSTEM=y
+# CONFIG_X86_PM_TIMER is not set
+
+#
+# APM (Advanced Power Management) BIOS Support
+#
+# CONFIG_APM is not set
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
+#
+CONFIG_PCI=y
+# CONFIG_PCI_GOBIOS is not set
+# CONFIG_PCI_GOMMCONFIG is not set
+# CONFIG_PCI_GODIRECT is not set
+CONFIG_PCI_GOANY=y
+CONFIG_PCI_BIOS=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+# CONFIG_PCI_USE_VECTOR is not set
+# CONFIG_PCI_LEGACY_PROC is not set
+CONFIG_PCI_NAMES=y
+CONFIG_ISA=y
+# CONFIG_EISA is not set
+# CONFIG_MCA is not set
+# CONFIG_SCx200 is not set
+
+#
+# PCMCIA/CardBus support
+#
+CONFIG_PCMCIA=m
+# CONFIG_PCMCIA_DEBUG is not set
+CONFIG_YENTA=m
+CONFIG_CARDBUS=y
+# CONFIG_I82092 is not set
+# CONFIG_I82365 is not set
+# CONFIG_TCIC is not set
+CONFIG_PCMCIA_PROBE=y
+
+#
+# PCI Hotplug Support
+#
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_AOUT=m
+CONFIG_BINFMT_MISC=y
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+# CONFIG_FW_LOADER is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Parallel port support
+#
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_PC_CML1=m
+# CONFIG_PARPORT_SERIAL is not set
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
+# CONFIG_PARPORT_PC_PCMCIA is not set
+# CONFIG_PARPORT_OTHER is not set
+CONFIG_PARPORT_1284=y
+
+#
+# Plug and Play support
+#
+CONFIG_PNP=y
+CONFIG_PNP_DEBUG=y
+
+#
+# Protocols
+#
+CONFIG_ISAPNP=y
+CONFIG_PNPBIOS=y
+# CONFIG_PNPBIOS_PROC_FS is not set
+
+#
+# Block devices
+#
+CONFIG_BLK_DEV_FD=y
+# CONFIG_BLK_DEV_XD is not set
+# CONFIG_PARIDE is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_CARMEL is not set
+# CONFIG_BLK_DEV_RAM is not set
+CONFIG_LBD=y
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_HD_IDE is not set
+CONFIG_BLK_DEV_IDEDISK=y
+CONFIG_IDEDISK_MULTI_MODE=y
+# CONFIG_BLK_DEV_IDECS is not set
+CONFIG_BLK_DEV_IDECD=y
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+CONFIG_BLK_DEV_IDESCSI=m
+# CONFIG_IDE_TASK_IOCTL is not set
+# CONFIG_IDE_TASKFILE_IO is not set
+
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=y
+# CONFIG_BLK_DEV_CMD640 is not set
+# CONFIG_BLK_DEV_IDEPNP is not set
+CONFIG_BLK_DEV_IDEPCI=y
+CONFIG_IDEPCI_SHARE_IRQ=y
+# CONFIG_BLK_DEV_OFFBOARD is not set
+CONFIG_BLK_DEV_GENERIC=y
+# CONFIG_BLK_DEV_OPTI621 is not set
+# CONFIG_BLK_DEV_RZ1000 is not set
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
+CONFIG_IDEDMA_PCI_AUTO=y
+# CONFIG_IDEDMA_ONLYDISK is not set
+CONFIG_BLK_DEV_ADMA=y
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_ATIIXP is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_HPT34X is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+CONFIG_BLK_DEV_PIIX=y
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SIS5513 is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+# CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_IDE_ARM is not set
+# CONFIG_IDE_CHIPSETS is not set
+CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDEDMA_IVB is not set
+CONFIG_IDEDMA_AUTO=y
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI=m
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+
+#
+# SCSI Transport Attributes
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_7000FASST is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AHA152X is not set
+# CONFIG_SCSI_AHA1542 is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_IN2000 is not set
+# CONFIG_SCSI_MEGARAID is not set
+# CONFIG_SCSI_SATA is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_DTC3280 is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_EATA_PIO is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_GENERIC_NCR5380 is not set
+# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_PPA is not set
+# CONFIG_SCSI_IMM is not set
+# CONFIG_SCSI_NCR53C406A is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_PAS16 is not set
+# CONFIG_SCSI_PSI240I is not set
+# CONFIG_SCSI_QLOGIC_FAS is not set
+# CONFIG_SCSI_QLOGIC_ISP is not set
+# CONFIG_SCSI_QLOGIC_FC is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+CONFIG_SCSI_QLA2XXX=m
+# CONFIG_SCSI_QLA21XX is not set
+# CONFIG_SCSI_QLA22XX is not set
+# CONFIG_SCSI_QLA2300 is not set
+# CONFIG_SCSI_QLA2322 is not set
+# CONFIG_SCSI_QLA6312 is not set
+# CONFIG_SCSI_QLA6322 is not set
+# CONFIG_SCSI_SYM53C416 is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_T128 is not set
+# CONFIG_SCSI_U14_34F is not set
+# CONFIG_SCSI_ULTRASTOR is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# PCMCIA SCSI adapter support
+#
+# CONFIG_PCMCIA_AHA152X is not set
+# CONFIG_PCMCIA_FDOMAIN is not set
+# CONFIG_PCMCIA_NINJA_SCSI is not set
+# CONFIG_PCMCIA_QLOGIC is not set
+# CONFIG_PCMCIA_SYM53C500 is not set
+
+#
+# Old CD-ROM drivers (not SCSI, not IDE)
+#
+# CONFIG_CD_NO_IDESCSI is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_LINEAR=y
+CONFIG_MD_RAID0=y
+CONFIG_MD_RAID1=y
+CONFIG_MD_RAID5=y
+# CONFIG_MD_RAID6 is not set
+CONFIG_MD_MULTIPATH=y
+# CONFIG_BLK_DEV_DM is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_IEEE1394=m
+
+#
+# Subsystem Options
+#
+# CONFIG_IEEE1394_VERBOSEDEBUG is not set
+# CONFIG_IEEE1394_OUI_DB is not set
+CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
+CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
+
+#
+# Device Drivers
+#
+
+#
+# Texas Instruments PCILynx requires I2C
+#
+CONFIG_IEEE1394_OHCI1394=m
+
+#
+# Protocol Drivers
+#
+CONFIG_IEEE1394_VIDEO1394=m
+CONFIG_IEEE1394_SBP2=m
+CONFIG_IEEE1394_SBP2_PHYS_DMA=y
+CONFIG_IEEE1394_ETH1394=m
+CONFIG_IEEE1394_DV1394=m
+CONFIG_IEEE1394_RAWIO=m
+CONFIG_IEEE1394_CMP=m
+CONFIG_IEEE1394_AMDTP=m
+
+#
+# I2O device support
+#
+CONFIG_I2O=y
+# CONFIG_I2O_CONFIG is not set
+CONFIG_I2O_BLOCK=m
+CONFIG_I2O_SCSI=m
+CONFIG_I2O_PROC=y
+
+#
+# Networking support
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+# CONFIG_NETLINK_DEV is not set
+CONFIG_UNIX=y
+CONFIG_NET_KEY=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_FWMARK=y
+CONFIG_IP_ROUTE_NAT=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_TOS=y
+CONFIG_IP_ROUTE_VERBOSE=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+# CONFIG_IP_PIMSM_V2 is not set
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=y
+CONFIG_INET_ESP=y
+CONFIG_INET_IPCOMP=y
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
+CONFIG_IPV6=y
+CONFIG_IPV6_PRIVACY=y
+CONFIG_INET6_AH=y
+CONFIG_INET6_ESP=y
+CONFIG_INET6_IPCOMP=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# IP: Netfilter Configuration
+#
+# CONFIG_IP_NF_CONNTRACK is not set
+# CONFIG_IP_NF_QUEUE is not set
+# CONFIG_IP_NF_IPTABLES is not set
+# CONFIG_IP_NF_ARPTABLES is not set
+# CONFIG_IP_NF_COMPAT_IPCHAINS is not set
+# CONFIG_IP_NF_COMPAT_IPFWADM is not set
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_IP6_NF_QUEUE is not set
+# CONFIG_IP6_NF_IPTABLES is not set
+
+#
+# Bridge: Netfilter Configuration
+#
+# CONFIG_BRIDGE_NF_EBTABLES is not set
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=y
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
+CONFIG_BRIDGE=y
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_FASTROUTE is not set
+# CONFIG_NET_HW_FLOWCONTROL is not set
+
+#
+# QoS and/or fair queueing
+#
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+# CONFIG_NET_SCH_HFSC is not set
+# CONFIG_NET_SCH_CSZ is not set
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+# CONFIG_NET_SCH_DELAY is not set
+CONFIG_NET_SCH_INGRESS=y
+CONFIG_NET_QOS=y
+CONFIG_NET_ESTIMATOR=y
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_ROUTE=y
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_POLICE=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+CONFIG_NETDEVICES=y
+CONFIG_DUMMY=m
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=m
+# CONFIG_NET_SB1000 is not set
+
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+CONFIG_NET_VENDOR_3COM=y
+# CONFIG_EL1 is not set
+# CONFIG_EL2 is not set
+# CONFIG_ELPLUS is not set
+# CONFIG_EL16 is not set
+# CONFIG_EL3 is not set
+# CONFIG_3C515 is not set
+CONFIG_VORTEX=y
+# CONFIG_TYPHOON is not set
+# CONFIG_LANCE is not set
+# CONFIG_NET_VENDOR_SMC is not set
+# CONFIG_NET_VENDOR_RACAL is not set
+
+#
+# Tulip family network device support
+#
+# CONFIG_NET_TULIP is not set
+# CONFIG_AT1700 is not set
+# CONFIG_DEPCA is not set
+# CONFIG_HP100 is not set
+# CONFIG_NET_ISA is not set
+CONFIG_NET_PCI=y
+# CONFIG_PCNET32 is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_AC3200 is not set
+# CONFIG_APRICOT is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_CS89x0 is not set
+# CONFIG_DGRS is not set
+# CONFIG_EEPRO100 is not set
+CONFIG_E100=m
+# CONFIG_E100_NAPI is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_8139CP is not set
+# CONFIG_8139TOO is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_TLAN is not set
+# CONFIG_VIA_RHINE is not set
+# CONFIG_NET_POCKET is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SK98LIN is not set
+# CONFIG_TIGON3 is not set
+
+#
+# Ethernet (10000 Mbit)
+#
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+
+#
+# Wireless LAN (non-hamradio)
+#
+CONFIG_NET_RADIO=y
+
+#
+# Obsolete Wireless cards support (pre-802.11)
+#
+# CONFIG_STRIP is not set
+# CONFIG_ARLAN is not set
+# CONFIG_WAVELAN is not set
+# CONFIG_PCMCIA_WAVELAN is not set
+# CONFIG_PCMCIA_NETWAVE is not set
+
+#
+# Wireless 802.11 Frequency Hopping cards support
+#
+# CONFIG_PCMCIA_RAYCS is not set
+
+#
+# Wireless 802.11b ISA/PCI cards support
+#
+CONFIG_AIRO=y
+# CONFIG_HERMES is not set
+# CONFIG_ATMEL is not set
+
+#
+# Wireless 802.11b Pcmcia/Cardbus cards support
+#
+CONFIG_AIRO_CS=m
+# CONFIG_PCMCIA_WL3501 is not set
+
+#
+# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
+#
+# CONFIG_PRISM54 is not set
+CONFIG_NET_WIRELESS=y
+
+#
+# PCMCIA network device support
+#
+CONFIG_NET_PCMCIA=y
+CONFIG_PCMCIA_3C589=m
+# CONFIG_PCMCIA_3C574 is not set
+# CONFIG_PCMCIA_FMVJ18X is not set
+# CONFIG_PCMCIA_PCNET is not set
+# CONFIG_PCMCIA_NMCLAN is not set
+# CONFIG_PCMCIA_SMC91C92 is not set
+# CONFIG_PCMCIA_XIRC2PS is not set
+# CONFIG_PCMCIA_AXNET is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PLIP is not set
+CONFIG_PPP=m
+# CONFIG_PPP_MULTILINK is not set
+# CONFIG_PPP_FILTER is not set
+CONFIG_PPP_ASYNC=m
+# CONFIG_PPP_SYNC_TTY is not set
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPPOE=m
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input I/O drivers
+#
+CONFIG_GAMEPORT=m
+CONFIG_SOUND_GAMEPORT=m
+# CONFIG_GAMEPORT_NS558 is not set
+# CONFIG_GAMEPORT_L4 is not set
+# CONFIG_GAMEPORT_EMU10K1 is not set
+# CONFIG_GAMEPORT_VORTEX is not set
+# CONFIG_GAMEPORT_FM801 is not set
+# CONFIG_GAMEPORT_CS461x is not set
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_CT82C710 is not set
+# CONFIG_SERIO_PARKBD is not set
+# CONFIG_SERIO_PCIPS2 is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_INPORT is not set
+# CONFIG_MOUSE_LOGIBM is not set
+# CONFIG_MOUSE_PC110PAD is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_PCSPKR=y
+CONFIG_INPUT_UINPUT=m
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_CONSOLE is not set
+# CONFIG_SERIAL_8250_CS is not set
+# CONFIG_SERIAL_8250_ACPI is not set
+CONFIG_SERIAL_8250_NR_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+# CONFIG_PPDEV is not set
+# CONFIG_TIPAR is not set
+# CONFIG_QIC02_TAPE is not set
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_NVRAM is not set
+CONFIG_RTC=y
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_SONYPI is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+CONFIG_AGP=y
+# CONFIG_AGP_ALI is not set
+# CONFIG_AGP_ATI is not set
+# CONFIG_AGP_AMD is not set
+# CONFIG_AGP_AMD64 is not set
+CONFIG_AGP_INTEL=y
+# CONFIG_AGP_INTEL_MCH is not set
+# CONFIG_AGP_NVIDIA is not set
+# CONFIG_AGP_SIS is not set
+# CONFIG_AGP_SWORKS is not set
+# CONFIG_AGP_VIA is not set
+# CONFIG_AGP_EFFICEON is not set
+CONFIG_DRM=y
+# CONFIG_DRM_TDFX is not set
+# CONFIG_DRM_GAMMA is not set
+CONFIG_DRM_R128=m
+# CONFIG_DRM_RADEON is not set
+# CONFIG_DRM_I810 is not set
+# CONFIG_DRM_I830 is not set
+# CONFIG_DRM_MGA is not set
+# CONFIG_DRM_SIS is not set
+
+#
+# PCMCIA character devices
+#
+# CONFIG_SYNCLINK_CS is not set
+# CONFIG_MWAVE is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_HANGCHECK_TIMER is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# Misc devices
+#
+# CONFIG_IBM_ASM is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+CONFIG_FB=y
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_VGA16 is not set
+CONFIG_FB_VESA=y
+CONFIG_VIDEO_SELECT=y
+# CONFIG_FB_HGA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_I810 is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON_OLD is not set
+# CONFIG_FB_RADEON is not set
+CONFIG_FB_ATY128=m
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_TRIDENT is not set
+CONFIG_FB_VIRTUAL=m
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_MDA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_PCI_CONSOLE=y
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+
+#
+# Logo configuration
+#
+CONFIG_LOGO=y
+CONFIG_LOGO_LINUX_MONO=y
+CONFIG_LOGO_LINUX_VGA16=y
+CONFIG_LOGO_LINUX_CLUT224=y
+
+#
+# Sound
+#
+CONFIG_SOUND=m
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_SEQUENCER_OSS=y
+CONFIG_SND_RTCTIMER=m
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_DUMMY=m
+CONFIG_SND_VIRMIDI=m
+# CONFIG_SND_MTPAV is not set
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+
+#
+# ISA devices
+#
+# CONFIG_SND_AD1816A is not set
+# CONFIG_SND_AD1848 is not set
+# CONFIG_SND_CS4231 is not set
+# CONFIG_SND_CS4232 is not set
+# CONFIG_SND_CS4236 is not set
+# CONFIG_SND_ES968 is not set
+# CONFIG_SND_ES1688 is not set
+# CONFIG_SND_ES18XX is not set
+# CONFIG_SND_GUSCLASSIC is not set
+# CONFIG_SND_GUSEXTREME is not set
+# CONFIG_SND_GUSMAX is not set
+# CONFIG_SND_INTERWAVE is not set
+# CONFIG_SND_INTERWAVE_STB is not set
+# CONFIG_SND_OPTI92X_AD1848 is not set
+# CONFIG_SND_OPTI92X_CS4231 is not set
+# CONFIG_SND_OPTI93X is not set
+CONFIG_SND_SB8=m
+CONFIG_SND_SB16=m
+CONFIG_SND_SBAWE=m
+CONFIG_SND_SB16_CSP=y
+# CONFIG_SND_WAVEFRONT is not set
+# CONFIG_SND_ALS100 is not set
+# CONFIG_SND_AZT2320 is not set
+# CONFIG_SND_CMI8330 is not set
+# CONFIG_SND_DT019X is not set
+CONFIG_SND_OPL3SA2=m
+# CONFIG_SND_SGALAXY is not set
+# CONFIG_SND_SSCAPE is not set
+
+#
+# PCI devices
+#
+CONFIG_SND_AC97_CODEC=m
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_YMFPCI is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+CONFIG_SND_MAESTRO3=m
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+CONFIG_SND_INTEL8X0=m
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VX222 is not set
+
+#
+# ALSA USB devices
+#
+# CONFIG_SND_USB_AUDIO is not set
+
+#
+# PCMCIA devices
+#
+# CONFIG_SND_VXPOCKET is not set
+# CONFIG_SND_VXP440 is not set
+# CONFIG_SND_PDAUDIOCF is not set
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+
+#
+# USB support
+#
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_BANDWIDTH=y
+CONFIG_USB_DYNAMIC_MINORS=y
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_EHCI_HCD is not set
+# CONFIG_USB_OHCI_HCD is not set
+CONFIG_USB_UHCI_HCD=y
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_AUDIO is not set
+# CONFIG_USB_BLUETOOTH_TTY is not set
+# CONFIG_USB_MIDI is not set
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_HP8200e is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+
+#
+# USB Human Interface Devices (HID)
+#
+CONFIG_USB_HID=y
+CONFIG_USB_HIDINPUT=y
+# CONFIG_HID_FF is not set
+CONFIG_USB_HIDDEV=y
+# CONFIG_USB_AIPTEK is not set
+CONFIG_USB_WACOM=m
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_MTOUCH is not set
+# CONFIG_USB_EGALAX is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_ATI_REMOTE is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_HPUSBSCSI is not set
+
+#
+# USB Multimedia devices
+#
+# CONFIG_USB_DABUSB is not set
+
+#
+# Video4Linux support is needed for USB Multimedia device support
+#
+
+#
+# USB Network adaptors
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+
+#
+# USB port drivers
+#
+# CONFIG_USB_USS720 is not set
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_TIGL is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGETSERVO is not set
+# CONFIG_USB_TEST is not set
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+# CONFIG_EXT2_FS_POSIX_ACL is not set
+# CONFIG_EXT2_FS_SECURITY is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+CONFIG_JBD=y
+CONFIG_JBD_DEBUG=y
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=y
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+CONFIG_AUTOFS4_FS=y
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=y
+CONFIG_JOLIET=y
+# CONFIG_ZISOFS is not set
+CONFIG_UDF_FS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_NTFS_FS=y
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_SYSFS=y
+# CONFIG_DEVFS_FS is not set
+# CONFIG_DEVPTS_FS_XATTR is not set
+CONFIG_TMPFS=y
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD=y
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V4 is not set
+CONFIG_NFSD_TCP=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=y
+CONFIG_SUNRPC=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_EARLY_PRINTK=y
+CONFIG_DEBUG_SPINLOCK_SLEEP=y
+CONFIG_FRAME_POINTER=y
+# CONFIG_4KSTACKS is not set
+CONFIG_X86_FIND_SMP_CONFIG=y
+CONFIG_X86_MPPARSE=y
+
+#
+# Security options
+#
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_BLOWFISH=y
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRYPTO_SERPENT=y
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_CAST5=y
+CONFIG_CRYPTO_CAST6=y
+# CONFIG_CRYPTO_ARC4 is not set
+CONFIG_CRYPTO_DEFLATE=y
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Library routines
+#
+CONFIG_CRC32=m
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_X86_SMP=y
+CONFIG_X86_HT=y
+CONFIG_X86_BIOS_REBOOT=y
+CONFIG_X86_TRAMPOLINE=y
+CONFIG_X86_STD_RESOURCES=y
+CONFIG_PC=y
Index: configs/kernel/linux-2.6.7-i686.config
===================================================================
--- configs/kernel/linux-2.6.7-i686.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ configs/kernel/linux-2.6.7-i686.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+linux-2.6.1-i686-inspiron-8000
Index: configs/kernel/linux-2.6.7-x86_64.config
===================================================================
--- configs/kernel/linux-2.6.7-x86_64.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ configs/kernel/linux-2.6.7-x86_64.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1277 @@
+#
+# Automatically generated make config: don't edit
+#
+CONFIG_X86_64=y
+CONFIG_64BIT=y
+CONFIG_X86=y
+CONFIG_MMU=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_X86_CMPXCHG=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_GENERIC_ISA_DMA=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_CLEAN_COMPILE=y
+CONFIG_STANDALONE=y
+CONFIG_BROKEN_ON_SMP=y
+
+#
+# General setup
+#
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_HOTPLUG=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+# CONFIG_EMBEDDED is not set
+CONFIG_KALLSYMS=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_OBSOLETE_MODPARM=y
+# CONFIG_MODVERSIONS is not set
+CONFIG_KMOD=y
+
+#
+# Processor type and features
+#
+CONFIG_MK8=y
+# CONFIG_MPSC is not set
+# CONFIG_GENERIC_CPU is not set
+CONFIG_X86_L1_CACHE_BYTES=64
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_TSC=y
+CONFIG_X86_GOOD_APIC=y
+# CONFIG_MICROCODE is not set
+# CONFIG_X86_MSR is not set
+# CONFIG_X86_CPUID is not set
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_MTRR=y
+# CONFIG_SMP is not set
+CONFIG_PREEMPT=y
+CONFIG_GART_IOMMU=y
+CONFIG_SWIOTLB=y
+CONFIG_X86_MCE=y
+
+#
+# Power management options
+#
+CONFIG_PM=y
+# CONFIG_SOFTWARE_SUSPEND is not set
+
+#
+# ACPI (Advanced Configuration and Power Interface) Support
+#
+CONFIG_ACPI=y
+CONFIG_ACPI_BOOT=y
+CONFIG_ACPI_INTERPRETER=y
+# CONFIG_ACPI_SLEEP is not set
+# CONFIG_ACPI_AC is not set
+# CONFIG_ACPI_BATTERY is not set
+CONFIG_ACPI_BUTTON=y
+CONFIG_ACPI_FAN=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_THERMAL=y
+# CONFIG_ACPI_ASUS is not set
+# CONFIG_ACPI_TOSHIBA is not set
+CONFIG_ACPI_DEBUG=y
+CONFIG_ACPI_BUS=y
+CONFIG_ACPI_EC=y
+CONFIG_ACPI_POWER=y
+CONFIG_ACPI_PCI=y
+CONFIG_ACPI_SYSTEM=y
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+# CONFIG_PCI_LEGACY_PROC is not set
+CONFIG_PCI_NAMES=y
+
+#
+# PCMCIA/CardBus support
+#
+# CONFIG_PCMCIA is not set
+
+#
+# PCI Hotplug Support
+#
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# Executable file formats / Emulations
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_MISC=m
+CONFIG_IA32_EMULATION=y
+CONFIG_IA32_AOUT=y
+CONFIG_COMPAT=y
+CONFIG_SYSVIPC_COMPAT=y
+CONFIG_UID16=y
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_FW_LOADER=m
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Parallel port support
+#
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_PC_CML1=m
+# CONFIG_PARPORT_SERIAL is not set
+CONFIG_PARPORT_PC_FIFO=y
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_OTHER=y
+CONFIG_PARPORT_1284=y
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+CONFIG_BLK_DEV_FD=y
+# CONFIG_PARIDE is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_NBD=m
+# CONFIG_BLK_DEV_CARMEL is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_LBD=y
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_HD_IDE is not set
+CONFIG_BLK_DEV_IDEDISK=y
+CONFIG_IDEDISK_MULTI_MODE=y
+CONFIG_BLK_DEV_IDECD=y
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+CONFIG_BLK_DEV_IDESCSI=m
+# CONFIG_IDE_TASK_IOCTL is not set
+# CONFIG_IDE_TASKFILE_IO is not set
+
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=y
+# CONFIG_BLK_DEV_CMD640 is not set
+CONFIG_BLK_DEV_IDEPCI=y
+CONFIG_IDEPCI_SHARE_IRQ=y
+# CONFIG_BLK_DEV_OFFBOARD is not set
+CONFIG_BLK_DEV_GENERIC=y
+# CONFIG_BLK_DEV_OPTI621 is not set
+# CONFIG_BLK_DEV_RZ1000 is not set
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
+CONFIG_IDEDMA_PCI_AUTO=y
+# CONFIG_IDEDMA_ONLYDISK is not set
+CONFIG_BLK_DEV_ADMA=y
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_ATIIXP is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_HPT34X is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SIS5513 is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+CONFIG_BLK_DEV_VIA82CXXX=y
+# CONFIG_IDE_ARM is not set
+CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDEDMA_IVB is not set
+CONFIG_IDEDMA_AUTO=y
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI=m
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+
+#
+# SCSI Transport Attributes
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_MEGARAID is not set
+CONFIG_SCSI_SATA=y
+# CONFIG_SCSI_SATA_SVW is not set
+# CONFIG_SCSI_ATA_PIIX is not set
+# CONFIG_SCSI_SATA_PROMISE is not set
+# CONFIG_SCSI_SATA_SX4 is not set
+# CONFIG_SCSI_SATA_SIL is not set
+# CONFIG_SCSI_SATA_SIS is not set
+CONFIG_SCSI_SATA_VIA=m
+# CONFIG_SCSI_SATA_VITESSE is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_EATA_PIO is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_PPA is not set
+# CONFIG_SCSI_IMM is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_ISP is not set
+# CONFIG_SCSI_QLOGIC_FC is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+CONFIG_SCSI_QLA2XXX=m
+# CONFIG_SCSI_QLA21XX is not set
+# CONFIG_SCSI_QLA22XX is not set
+# CONFIG_SCSI_QLA2300 is not set
+# CONFIG_SCSI_QLA2322 is not set
+# CONFIG_SCSI_QLA6312 is not set
+# CONFIG_SCSI_QLA6322 is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_LINEAR=y
+CONFIG_MD_RAID0=y
+CONFIG_MD_RAID1=y
+CONFIG_MD_RAID5=y
+# CONFIG_MD_RAID6 is not set
+CONFIG_MD_MULTIPATH=y
+CONFIG_BLK_DEV_DM=y
+CONFIG_DM_CRYPT=m
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_IEEE1394=m
+
+#
+# Subsystem Options
+#
+# CONFIG_IEEE1394_VERBOSEDEBUG is not set
+# CONFIG_IEEE1394_OUI_DB is not set
+CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
+CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
+
+#
+# Device Drivers
+#
+# CONFIG_IEEE1394_PCILYNX is not set
+CONFIG_IEEE1394_OHCI1394=m
+
+#
+# Protocol Drivers
+#
+CONFIG_IEEE1394_VIDEO1394=m
+CONFIG_IEEE1394_SBP2=m
+CONFIG_IEEE1394_SBP2_PHYS_DMA=y
+CONFIG_IEEE1394_ETH1394=m
+CONFIG_IEEE1394_DV1394=m
+CONFIG_IEEE1394_RAWIO=m
+CONFIG_IEEE1394_CMP=m
+CONFIG_IEEE1394_AMDTP=m
+
+#
+# I2O device support
+#
+# CONFIG_I2O is not set
+
+#
+# Networking support
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+# CONFIG_NETLINK_DEV is not set
+CONFIG_UNIX=y
+CONFIG_NET_KEY=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=y
+CONFIG_INET_ESP=y
+CONFIG_INET_IPCOMP=y
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
+# CONFIG_IPV6 is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_CONNTRACK=y
+CONFIG_IP_NF_FTP=m
+CONFIG_IP_NF_IRC=m
+CONFIG_IP_NF_TFTP=m
+# CONFIG_IP_NF_AMANDA is not set
+# CONFIG_IP_NF_QUEUE is not set
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_MATCH_LIMIT=m
+CONFIG_IP_NF_MATCH_IPRANGE=y
+CONFIG_IP_NF_MATCH_MAC=m
+CONFIG_IP_NF_MATCH_PKTTYPE=m
+CONFIG_IP_NF_MATCH_MARK=m
+CONFIG_IP_NF_MATCH_MULTIPORT=y
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_DSCP=m
+CONFIG_IP_NF_MATCH_AH_ESP=y
+CONFIG_IP_NF_MATCH_LENGTH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_TCPMSS=m
+CONFIG_IP_NF_MATCH_HELPER=m
+CONFIG_IP_NF_MATCH_STATE=m
+CONFIG_IP_NF_MATCH_CONNTRACK=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_PHYSDEV=m
+CONFIG_IP_NF_FILTER=y
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_NAT=y
+CONFIG_IP_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_SAME=m
+CONFIG_IP_NF_NAT_LOCAL=y
+# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
+CONFIG_IP_NF_NAT_IRC=m
+CONFIG_IP_NF_NAT_FTP=m
+CONFIG_IP_NF_NAT_TFTP=m
+CONFIG_IP_NF_MANGLE=y
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_DSCP=m
+CONFIG_IP_NF_TARGET_MARK=m
+CONFIG_IP_NF_TARGET_CLASSIFY=m
+CONFIG_IP_NF_TARGET_LOG=y
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_TARGET_TCPMSS=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+# CONFIG_IP_NF_RAW is not set
+
+#
+# Bridge: Netfilter Configuration
+#
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=y
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
+CONFIG_BRIDGE=m
+CONFIG_VLAN_8021Q=m
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_FASTROUTE is not set
+# CONFIG_NET_HW_FLOWCONTROL is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+CONFIG_NETDEVICES=y
+CONFIG_DUMMY=m
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=m
+
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_NET_VENDOR_3COM is not set
+
+#
+# Tulip family network device support
+#
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+CONFIG_NET_PCI=y
+# CONFIG_PCNET32 is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_DGRS is not set
+# CONFIG_EEPRO100 is not set
+# CONFIG_E100 is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_8139CP is not set
+CONFIG_8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+# CONFIG_8139TOO_8129 is not set
+# CONFIG_8139_OLD_RX_RESET is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_VIA_RHINE is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+CONFIG_R8169=m
+# CONFIG_SK98LIN is not set
+# CONFIG_TIGON3 is not set
+
+#
+# Ethernet (10000 Mbit)
+#
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PLIP is not set
+CONFIG_PPP=m
+# CONFIG_PPP_MULTILINK is not set
+# CONFIG_PPP_FILTER is not set
+CONFIG_PPP_ASYNC=m
+# CONFIG_PPP_SYNC_TTY is not set
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPPOE=m
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input I/O drivers
+#
+# CONFIG_GAMEPORT is not set
+CONFIG_SOUND_GAMEPORT=y
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_CT82C710 is not set
+# CONFIG_SERIO_PARKBD is not set
+# CONFIG_SERIO_PCIPS2 is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_PCSPKR=y
+CONFIG_INPUT_UINPUT=m
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_CONSOLE is not set
+# CONFIG_SERIAL_8250_ACPI is not set
+CONFIG_SERIAL_8250_NR_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+# CONFIG_PPDEV is not set
+# CONFIG_TIPAR is not set
+# CONFIG_QIC02_TAPE is not set
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_NVRAM is not set
+CONFIG_RTC=y
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_FTAPE is not set
+CONFIG_AGP=y
+CONFIG_AGP_AMD64=y
+# CONFIG_AGP_INTEL_MCH is not set
+# CONFIG_DRM is not set
+# CONFIG_MWAVE is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_HANGCHECK_TIMER is not set
+
+#
+# I2C support
+#
+CONFIG_I2C=m
+CONFIG_I2C_CHARDEV=m
+
+#
+# I2C Algorithms
+#
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCF=m
+
+#
+# I2C Hardware Bus support
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_I810=m
+CONFIG_I2C_ISA=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_PROSAVAGE=m
+CONFIG_I2C_SAVAGE4=m
+CONFIG_SCx200_ACB=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+CONFIG_I2C_VOODOO3=m
+
+#
+# Hardware Sensors Chip support
+#
+CONFIG_I2C_SENSOR=m
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_FSCHER=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83627HF=m
+
+#
+# Other I2C Chip support
+#
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_RTC8564 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+
+#
+# Misc devices
+#
+# CONFIG_IBM_ASM is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+CONFIG_FB=y
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+CONFIG_FB_VGA16=y
+CONFIG_FB_VESA=y
+CONFIG_VIDEO_SELECT=y
+# CONFIG_FB_HGA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON_OLD is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_VIRTUAL is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_MDA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_PCI_CONSOLE=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+CONFIG_FONT_MINI_4x6=y
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+
+#
+# Logo configuration
+#
+CONFIG_LOGO=y
+CONFIG_LOGO_LINUX_MONO=y
+CONFIG_LOGO_LINUX_VGA16=y
+CONFIG_LOGO_LINUX_CLUT224=y
+
+#
+# Sound
+#
+CONFIG_SOUND=y
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_SEQUENCER_OSS=y
+CONFIG_SND_BIT32_EMUL=m
+CONFIG_SND_RTCTIMER=m
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+CONFIG_SND_MPU401_UART=m
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_VIRMIDI is not set
+# CONFIG_SND_MTPAV is not set
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+
+#
+# PCI devices
+#
+CONFIG_SND_AC97_CODEC=m
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_YMFPCI is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_SONICVIBES is not set
+CONFIG_SND_VIA82XX=m
+# CONFIG_SND_VX222 is not set
+
+#
+# ALSA USB devices
+#
+# CONFIG_SND_USB_AUDIO is not set
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+
+#
+# USB support
+#
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_BANDWIDTH=y
+CONFIG_USB_DYNAMIC_MINORS=y
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD=y
+# CONFIG_USB_EHCI_SPLIT_ISO is not set
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+# CONFIG_USB_OHCI_HCD is not set
+CONFIG_USB_UHCI_HCD=y
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_AUDIO is not set
+# CONFIG_USB_BLUETOOTH_TTY is not set
+# CONFIG_USB_MIDI is not set
+# CONFIG_USB_ACM is not set
+CONFIG_USB_PRINTER=m
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_HP8200e is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+
+#
+# USB Human Interface Devices (HID)
+#
+CONFIG_USB_HID=y
+CONFIG_USB_HIDINPUT=y
+# CONFIG_HID_FF is not set
+CONFIG_USB_HIDDEV=y
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_MTOUCH is not set
+# CONFIG_USB_EGALAX is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_ATI_REMOTE is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_HPUSBSCSI is not set
+
+#
+# USB Multimedia devices
+#
+# CONFIG_USB_DABUSB is not set
+
+#
+# Video4Linux support is needed for USB Multimedia device support
+#
+
+#
+# USB Network adaptors
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+
+#
+# USB port drivers
+#
+# CONFIG_USB_USS720 is not set
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_TIGL is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGETSERVO is not set
+# CONFIG_USB_TEST is not set
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# Firmware Drivers
+#
+# CONFIG_EDD is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+# CONFIG_EXT2_FS_POSIX_ACL is not set
+# CONFIG_EXT2_FS_SECURITY is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=y
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+CONFIG_AUTOFS4_FS=y
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=y
+CONFIG_JOLIET=y
+# CONFIG_ZISOFS is not set
+CONFIG_UDF_FS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_SYSFS=y
+# CONFIG_DEVFS_FS is not set
+CONFIG_DEVPTS_FS_XATTR=y
+# CONFIG_DEVPTS_FS_SECURITY is not set
+CONFIG_TMPFS=y
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD=y
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V4 is not set
+CONFIG_NFSD_TCP=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=y
+CONFIG_SUNRPC=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+CONFIG_CIFS=y
+# CONFIG_CIFS_STATS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_DEBUG_KERNEL is not set
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_FRAME_POINTER is not set
+
+#
+# Security options
+#
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_BLOWFISH=y
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRYPTO_SERPENT=y
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_CAST5=y
+CONFIG_CRYPTO_CAST6=y
+CONFIG_CRYPTO_ARC4=y
+CONFIG_CRYPTO_DEFLATE=y
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_CRC32C=m
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Library routines
+#
+CONFIG_CRC32=m
+CONFIG_LIBCRC32C=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
Index: configs/kernel/linux-2.6.7-x86_64.config-K8VNXP
===================================================================
--- configs/kernel/linux-2.6.7-x86_64.config-K8VNXP	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ configs/kernel/linux-2.6.7-x86_64.config-K8VNXP	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1274 @@
+#
+# Automatically generated make config: don't edit
+#
+CONFIG_X86_64=y
+CONFIG_64BIT=y
+CONFIG_X86=y
+CONFIG_MMU=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_X86_CMPXCHG=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_GENERIC_ISA_DMA=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_CLEAN_COMPILE=y
+CONFIG_STANDALONE=y
+CONFIG_BROKEN_ON_SMP=y
+
+#
+# General setup
+#
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_HOTPLUG=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+# CONFIG_EMBEDDED is not set
+CONFIG_KALLSYMS=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_OBSOLETE_MODPARM=y
+# CONFIG_MODVERSIONS is not set
+CONFIG_KMOD=y
+
+#
+# Processor type and features
+#
+CONFIG_MK8=y
+# CONFIG_MPSC is not set
+# CONFIG_GENERIC_CPU is not set
+CONFIG_X86_L1_CACHE_BYTES=64
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_TSC=y
+CONFIG_X86_GOOD_APIC=y
+# CONFIG_MICROCODE is not set
+# CONFIG_X86_MSR is not set
+# CONFIG_X86_CPUID is not set
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_MTRR=y
+# CONFIG_SMP is not set
+CONFIG_PREEMPT=y
+CONFIG_GART_IOMMU=y
+CONFIG_SWIOTLB=y
+CONFIG_X86_MCE=y
+
+#
+# Power management options
+#
+CONFIG_PM=y
+# CONFIG_SOFTWARE_SUSPEND is not set
+
+#
+# ACPI (Advanced Configuration and Power Interface) Support
+#
+CONFIG_ACPI=y
+CONFIG_ACPI_BOOT=y
+CONFIG_ACPI_INTERPRETER=y
+# CONFIG_ACPI_SLEEP is not set
+# CONFIG_ACPI_AC is not set
+# CONFIG_ACPI_BATTERY is not set
+CONFIG_ACPI_BUTTON=y
+CONFIG_ACPI_FAN=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_THERMAL=y
+# CONFIG_ACPI_ASUS is not set
+# CONFIG_ACPI_TOSHIBA is not set
+CONFIG_ACPI_DEBUG=y
+CONFIG_ACPI_BUS=y
+CONFIG_ACPI_EC=y
+CONFIG_ACPI_POWER=y
+CONFIG_ACPI_PCI=y
+CONFIG_ACPI_SYSTEM=y
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+# CONFIG_PCI_LEGACY_PROC is not set
+CONFIG_PCI_NAMES=y
+
+#
+# PCMCIA/CardBus support
+#
+# CONFIG_PCMCIA is not set
+
+#
+# PCI Hotplug Support
+#
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# Executable file formats / Emulations
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_MISC=m
+CONFIG_IA32_EMULATION=y
+CONFIG_IA32_AOUT=y
+CONFIG_COMPAT=y
+CONFIG_SYSVIPC_COMPAT=y
+CONFIG_UID16=y
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_FW_LOADER=m
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Parallel port support
+#
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_PC_CML1=m
+# CONFIG_PARPORT_SERIAL is not set
+CONFIG_PARPORT_PC_FIFO=y
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_OTHER=y
+CONFIG_PARPORT_1284=y
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+CONFIG_BLK_DEV_FD=y
+# CONFIG_PARIDE is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_NBD=m
+# CONFIG_BLK_DEV_CARMEL is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_LBD=y
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_HD_IDE is not set
+CONFIG_BLK_DEV_IDEDISK=y
+CONFIG_IDEDISK_MULTI_MODE=y
+CONFIG_BLK_DEV_IDECD=y
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+CONFIG_BLK_DEV_IDESCSI=m
+# CONFIG_IDE_TASK_IOCTL is not set
+# CONFIG_IDE_TASKFILE_IO is not set
+
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=y
+# CONFIG_BLK_DEV_CMD640 is not set
+CONFIG_BLK_DEV_IDEPCI=y
+CONFIG_IDEPCI_SHARE_IRQ=y
+# CONFIG_BLK_DEV_OFFBOARD is not set
+CONFIG_BLK_DEV_GENERIC=y
+# CONFIG_BLK_DEV_OPTI621 is not set
+# CONFIG_BLK_DEV_RZ1000 is not set
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
+CONFIG_IDEDMA_PCI_AUTO=y
+# CONFIG_IDEDMA_ONLYDISK is not set
+CONFIG_BLK_DEV_ADMA=y
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_ATIIXP is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_HPT34X is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SIS5513 is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+CONFIG_BLK_DEV_VIA82CXXX=y
+# CONFIG_IDE_ARM is not set
+CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDEDMA_IVB is not set
+CONFIG_IDEDMA_AUTO=y
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI=m
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+
+#
+# SCSI Transport Attributes
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_MEGARAID is not set
+CONFIG_SCSI_SATA=y
+# CONFIG_SCSI_SATA_SVW is not set
+# CONFIG_SCSI_ATA_PIIX is not set
+# CONFIG_SCSI_SATA_PROMISE is not set
+# CONFIG_SCSI_SATA_SX4 is not set
+# CONFIG_SCSI_SATA_SIL is not set
+# CONFIG_SCSI_SATA_SIS is not set
+CONFIG_SCSI_SATA_VIA=m
+# CONFIG_SCSI_SATA_VITESSE is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_EATA_PIO is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_PPA is not set
+# CONFIG_SCSI_IMM is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_ISP is not set
+# CONFIG_SCSI_QLOGIC_FC is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+CONFIG_SCSI_QLA2XXX=m
+# CONFIG_SCSI_QLA21XX is not set
+# CONFIG_SCSI_QLA22XX is not set
+# CONFIG_SCSI_QLA2300 is not set
+# CONFIG_SCSI_QLA2322 is not set
+# CONFIG_SCSI_QLA6312 is not set
+# CONFIG_SCSI_QLA6322 is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_LINEAR=y
+CONFIG_MD_RAID0=y
+CONFIG_MD_RAID1=y
+CONFIG_MD_RAID5=y
+# CONFIG_MD_RAID6 is not set
+CONFIG_MD_MULTIPATH=y
+CONFIG_BLK_DEV_DM=y
+CONFIG_DM_CRYPT=m
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_IEEE1394=m
+
+#
+# Subsystem Options
+#
+# CONFIG_IEEE1394_VERBOSEDEBUG is not set
+# CONFIG_IEEE1394_OUI_DB is not set
+CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
+CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
+
+#
+# Device Drivers
+#
+# CONFIG_IEEE1394_PCILYNX is not set
+CONFIG_IEEE1394_OHCI1394=m
+
+#
+# Protocol Drivers
+#
+CONFIG_IEEE1394_VIDEO1394=m
+CONFIG_IEEE1394_SBP2=m
+CONFIG_IEEE1394_SBP2_PHYS_DMA=y
+CONFIG_IEEE1394_ETH1394=m
+CONFIG_IEEE1394_DV1394=m
+CONFIG_IEEE1394_RAWIO=m
+CONFIG_IEEE1394_CMP=m
+CONFIG_IEEE1394_AMDTP=m
+
+#
+# I2O device support
+#
+# CONFIG_I2O is not set
+
+#
+# Networking support
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+# CONFIG_NETLINK_DEV is not set
+CONFIG_UNIX=y
+CONFIG_NET_KEY=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=y
+CONFIG_INET_ESP=y
+CONFIG_INET_IPCOMP=y
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
+# CONFIG_IPV6 is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_CONNTRACK=y
+CONFIG_IP_NF_FTP=m
+CONFIG_IP_NF_IRC=m
+CONFIG_IP_NF_TFTP=m
+# CONFIG_IP_NF_AMANDA is not set
+# CONFIG_IP_NF_QUEUE is not set
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_MATCH_LIMIT=m
+CONFIG_IP_NF_MATCH_IPRANGE=y
+CONFIG_IP_NF_MATCH_MAC=m
+CONFIG_IP_NF_MATCH_PKTTYPE=m
+CONFIG_IP_NF_MATCH_MARK=m
+CONFIG_IP_NF_MATCH_MULTIPORT=y
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_DSCP=m
+CONFIG_IP_NF_MATCH_AH_ESP=y
+CONFIG_IP_NF_MATCH_LENGTH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_TCPMSS=m
+CONFIG_IP_NF_MATCH_HELPER=m
+CONFIG_IP_NF_MATCH_STATE=m
+CONFIG_IP_NF_MATCH_CONNTRACK=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_PHYSDEV=m
+CONFIG_IP_NF_FILTER=y
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_NAT=y
+CONFIG_IP_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_SAME=m
+CONFIG_IP_NF_NAT_LOCAL=y
+# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
+CONFIG_IP_NF_NAT_IRC=m
+CONFIG_IP_NF_NAT_FTP=m
+CONFIG_IP_NF_NAT_TFTP=m
+CONFIG_IP_NF_MANGLE=y
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_DSCP=m
+CONFIG_IP_NF_TARGET_MARK=m
+CONFIG_IP_NF_TARGET_CLASSIFY=m
+CONFIG_IP_NF_TARGET_LOG=y
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_TARGET_TCPMSS=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+# CONFIG_IP_NF_RAW is not set
+
+#
+# Bridge: Netfilter Configuration
+#
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=y
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
+CONFIG_BRIDGE=m
+CONFIG_VLAN_8021Q=m
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_FASTROUTE is not set
+# CONFIG_NET_HW_FLOWCONTROL is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+CONFIG_NETDEVICES=y
+CONFIG_DUMMY=m
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=m
+
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_NET_VENDOR_3COM is not set
+
+#
+# Tulip family network device support
+#
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+CONFIG_NET_PCI=y
+# CONFIG_PCNET32 is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_DGRS is not set
+# CONFIG_EEPRO100 is not set
+# CONFIG_E100 is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_8139CP is not set
+# CONFIG_8139TOO is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SUNDANCE is not set
+CONFIG_VIA_RHINE=m
+# CONFIG_VIA_RHINE_MMIO is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+CONFIG_R8169=m
+# CONFIG_SK98LIN is not set
+# CONFIG_TIGON3 is not set
+
+#
+# Ethernet (10000 Mbit)
+#
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PLIP is not set
+CONFIG_PPP=m
+# CONFIG_PPP_MULTILINK is not set
+# CONFIG_PPP_FILTER is not set
+CONFIG_PPP_ASYNC=m
+# CONFIG_PPP_SYNC_TTY is not set
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPPOE=m
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input I/O drivers
+#
+# CONFIG_GAMEPORT is not set
+CONFIG_SOUND_GAMEPORT=y
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_CT82C710 is not set
+# CONFIG_SERIO_PARKBD is not set
+# CONFIG_SERIO_PCIPS2 is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_PCSPKR=y
+CONFIG_INPUT_UINPUT=m
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_CONSOLE is not set
+# CONFIG_SERIAL_8250_ACPI is not set
+CONFIG_SERIAL_8250_NR_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+# CONFIG_PPDEV is not set
+# CONFIG_TIPAR is not set
+# CONFIG_QIC02_TAPE is not set
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_NVRAM is not set
+CONFIG_RTC=y
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_FTAPE is not set
+CONFIG_AGP=y
+CONFIG_AGP_AMD64=y
+# CONFIG_AGP_INTEL_MCH is not set
+# CONFIG_DRM is not set
+# CONFIG_MWAVE is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_HANGCHECK_TIMER is not set
+
+#
+# I2C support
+#
+CONFIG_I2C=m
+CONFIG_I2C_CHARDEV=m
+
+#
+# I2C Algorithms
+#
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCF=m
+
+#
+# I2C Hardware Bus support
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_I810=m
+CONFIG_I2C_ISA=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_PROSAVAGE=m
+CONFIG_I2C_SAVAGE4=m
+CONFIG_SCx200_ACB=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+CONFIG_I2C_VOODOO3=m
+
+#
+# Hardware Sensors Chip support
+#
+CONFIG_I2C_SENSOR=m
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_FSCHER=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83627HF=m
+
+#
+# Other I2C Chip support
+#
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_RTC8564 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+
+#
+# Misc devices
+#
+# CONFIG_IBM_ASM is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+CONFIG_FB=y
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+CONFIG_FB_VGA16=y
+CONFIG_FB_VESA=y
+CONFIG_VIDEO_SELECT=y
+# CONFIG_FB_HGA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON_OLD is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_VIRTUAL is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_MDA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_PCI_CONSOLE=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+CONFIG_FONT_MINI_4x6=y
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+
+#
+# Logo configuration
+#
+CONFIG_LOGO=y
+CONFIG_LOGO_LINUX_MONO=y
+CONFIG_LOGO_LINUX_VGA16=y
+CONFIG_LOGO_LINUX_CLUT224=y
+
+#
+# Sound
+#
+CONFIG_SOUND=y
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_SEQUENCER_OSS=y
+CONFIG_SND_BIT32_EMUL=m
+CONFIG_SND_RTCTIMER=m
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+CONFIG_SND_MPU401_UART=m
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_VIRMIDI is not set
+# CONFIG_SND_MTPAV is not set
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+
+#
+# PCI devices
+#
+CONFIG_SND_AC97_CODEC=m
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_YMFPCI is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_SONICVIBES is not set
+CONFIG_SND_VIA82XX=m
+# CONFIG_SND_VX222 is not set
+
+#
+# ALSA USB devices
+#
+# CONFIG_SND_USB_AUDIO is not set
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+
+#
+# USB support
+#
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_BANDWIDTH=y
+CONFIG_USB_DYNAMIC_MINORS=y
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD=y
+# CONFIG_USB_EHCI_SPLIT_ISO is not set
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+# CONFIG_USB_OHCI_HCD is not set
+CONFIG_USB_UHCI_HCD=y
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_AUDIO is not set
+# CONFIG_USB_BLUETOOTH_TTY is not set
+# CONFIG_USB_MIDI is not set
+# CONFIG_USB_ACM is not set
+CONFIG_USB_PRINTER=m
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_HP8200e is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+
+#
+# USB Human Interface Devices (HID)
+#
+CONFIG_USB_HID=y
+CONFIG_USB_HIDINPUT=y
+# CONFIG_HID_FF is not set
+CONFIG_USB_HIDDEV=y
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_MTOUCH is not set
+# CONFIG_USB_EGALAX is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_ATI_REMOTE is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_HPUSBSCSI is not set
+
+#
+# USB Multimedia devices
+#
+# CONFIG_USB_DABUSB is not set
+
+#
+# Video4Linux support is needed for USB Multimedia device support
+#
+
+#
+# USB Network adaptors
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+
+#
+# USB port drivers
+#
+# CONFIG_USB_USS720 is not set
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_TIGL is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGETSERVO is not set
+# CONFIG_USB_TEST is not set
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# Firmware Drivers
+#
+# CONFIG_EDD is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+# CONFIG_EXT2_FS_POSIX_ACL is not set
+# CONFIG_EXT2_FS_SECURITY is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=y
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+CONFIG_AUTOFS4_FS=y
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=y
+CONFIG_JOLIET=y
+# CONFIG_ZISOFS is not set
+CONFIG_UDF_FS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_SYSFS=y
+# CONFIG_DEVFS_FS is not set
+CONFIG_DEVPTS_FS_XATTR=y
+# CONFIG_DEVPTS_FS_SECURITY is not set
+CONFIG_TMPFS=y
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD=y
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V4 is not set
+CONFIG_NFSD_TCP=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=y
+CONFIG_SUNRPC=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+CONFIG_CIFS=y
+# CONFIG_CIFS_STATS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_DEBUG_KERNEL is not set
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_FRAME_POINTER is not set
+
+#
+# Security options
+#
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_BLOWFISH=y
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRYPTO_SERPENT=y
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_CAST5=y
+CONFIG_CRYPTO_CAST6=y
+CONFIG_CRYPTO_ARC4=y
+CONFIG_CRYPTO_DEFLATE=y
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_CRC32C=m
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Library routines
+#
+CONFIG_CRC32=y
+CONFIG_LIBCRC32C=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
Index: configs/kernel/linux-2.6.7-x86_64.config-usbroot
===================================================================
--- configs/kernel/linux-2.6.7-x86_64.config-usbroot	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ configs/kernel/linux-2.6.7-x86_64.config-usbroot	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1273 @@
+#
+# Automatically generated make config: don't edit
+#
+CONFIG_X86_64=y
+CONFIG_64BIT=y
+CONFIG_X86=y
+CONFIG_MMU=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_X86_CMPXCHG=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_GENERIC_ISA_DMA=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_CLEAN_COMPILE=y
+CONFIG_STANDALONE=y
+CONFIG_BROKEN_ON_SMP=y
+
+#
+# General setup
+#
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_HOTPLUG=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+# CONFIG_EMBEDDED is not set
+CONFIG_KALLSYMS=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_OBSOLETE_MODPARM=y
+# CONFIG_MODVERSIONS is not set
+CONFIG_KMOD=y
+
+#
+# Processor type and features
+#
+CONFIG_MK8=y
+# CONFIG_MPSC is not set
+# CONFIG_GENERIC_CPU is not set
+CONFIG_X86_L1_CACHE_BYTES=64
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_TSC=y
+CONFIG_X86_GOOD_APIC=y
+# CONFIG_MICROCODE is not set
+# CONFIG_X86_MSR is not set
+# CONFIG_X86_CPUID is not set
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_MTRR=y
+# CONFIG_SMP is not set
+CONFIG_PREEMPT=y
+CONFIG_GART_IOMMU=y
+CONFIG_SWIOTLB=y
+CONFIG_X86_MCE=y
+
+#
+# Power management options
+#
+CONFIG_PM=y
+# CONFIG_SOFTWARE_SUSPEND is not set
+
+#
+# ACPI (Advanced Configuration and Power Interface) Support
+#
+CONFIG_ACPI=y
+CONFIG_ACPI_BOOT=y
+CONFIG_ACPI_INTERPRETER=y
+# CONFIG_ACPI_SLEEP is not set
+# CONFIG_ACPI_AC is not set
+# CONFIG_ACPI_BATTERY is not set
+CONFIG_ACPI_BUTTON=y
+CONFIG_ACPI_FAN=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_THERMAL=y
+# CONFIG_ACPI_ASUS is not set
+# CONFIG_ACPI_TOSHIBA is not set
+CONFIG_ACPI_DEBUG=y
+CONFIG_ACPI_BUS=y
+CONFIG_ACPI_EC=y
+CONFIG_ACPI_POWER=y
+CONFIG_ACPI_PCI=y
+CONFIG_ACPI_SYSTEM=y
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+# CONFIG_PCI_LEGACY_PROC is not set
+CONFIG_PCI_NAMES=y
+
+#
+# PCMCIA/CardBus support
+#
+# CONFIG_PCMCIA is not set
+
+#
+# PCI Hotplug Support
+#
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# Executable file formats / Emulations
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_MISC=m
+CONFIG_IA32_EMULATION=y
+CONFIG_IA32_AOUT=y
+CONFIG_COMPAT=y
+CONFIG_SYSVIPC_COMPAT=y
+CONFIG_UID16=y
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_FW_LOADER=m
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Parallel port support
+#
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_PC_CML1=m
+# CONFIG_PARPORT_SERIAL is not set
+CONFIG_PARPORT_PC_FIFO=y
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_OTHER=y
+CONFIG_PARPORT_1284=y
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+CONFIG_BLK_DEV_FD=y
+# CONFIG_PARIDE is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_NBD=m
+# CONFIG_BLK_DEV_CARMEL is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_LBD=y
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_HD_IDE is not set
+CONFIG_BLK_DEV_IDEDISK=y
+CONFIG_IDEDISK_MULTI_MODE=y
+CONFIG_BLK_DEV_IDECD=y
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+CONFIG_BLK_DEV_IDESCSI=m
+# CONFIG_IDE_TASK_IOCTL is not set
+# CONFIG_IDE_TASKFILE_IO is not set
+
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=y
+# CONFIG_BLK_DEV_CMD640 is not set
+CONFIG_BLK_DEV_IDEPCI=y
+CONFIG_IDEPCI_SHARE_IRQ=y
+# CONFIG_BLK_DEV_OFFBOARD is not set
+CONFIG_BLK_DEV_GENERIC=y
+# CONFIG_BLK_DEV_OPTI621 is not set
+# CONFIG_BLK_DEV_RZ1000 is not set
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
+CONFIG_IDEDMA_PCI_AUTO=y
+# CONFIG_IDEDMA_ONLYDISK is not set
+CONFIG_BLK_DEV_ADMA=y
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_ATIIXP is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_HPT34X is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SIS5513 is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+CONFIG_BLK_DEV_VIA82CXXX=y
+# CONFIG_IDE_ARM is not set
+CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDEDMA_IVB is not set
+CONFIG_IDEDMA_AUTO=y
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=m
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=y
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+
+#
+# SCSI Transport Attributes
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_ADVANSYS is not set
+# CONFIG_SCSI_MEGARAID is not set
+CONFIG_SCSI_SATA=y
+# CONFIG_SCSI_SATA_SVW is not set
+# CONFIG_SCSI_ATA_PIIX is not set
+# CONFIG_SCSI_SATA_PROMISE is not set
+# CONFIG_SCSI_SATA_SX4 is not set
+# CONFIG_SCSI_SATA_SIL is not set
+# CONFIG_SCSI_SATA_SIS is not set
+CONFIG_SCSI_SATA_VIA=m
+# CONFIG_SCSI_SATA_VITESSE is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_EATA_PIO is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_PPA is not set
+# CONFIG_SCSI_IMM is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_ISP is not set
+# CONFIG_SCSI_QLOGIC_FC is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+CONFIG_SCSI_QLA2XXX=y
+# CONFIG_SCSI_QLA21XX is not set
+# CONFIG_SCSI_QLA22XX is not set
+# CONFIG_SCSI_QLA2300 is not set
+# CONFIG_SCSI_QLA2322 is not set
+# CONFIG_SCSI_QLA6312 is not set
+# CONFIG_SCSI_QLA6322 is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_LINEAR=y
+CONFIG_MD_RAID0=y
+CONFIG_MD_RAID1=y
+CONFIG_MD_RAID5=y
+# CONFIG_MD_RAID6 is not set
+CONFIG_MD_MULTIPATH=y
+CONFIG_BLK_DEV_DM=y
+CONFIG_DM_CRYPT=m
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_IEEE1394=m
+
+#
+# Subsystem Options
+#
+# CONFIG_IEEE1394_VERBOSEDEBUG is not set
+# CONFIG_IEEE1394_OUI_DB is not set
+CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
+CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
+
+#
+# Device Drivers
+#
+# CONFIG_IEEE1394_PCILYNX is not set
+CONFIG_IEEE1394_OHCI1394=m
+
+#
+# Protocol Drivers
+#
+CONFIG_IEEE1394_VIDEO1394=m
+CONFIG_IEEE1394_SBP2=m
+CONFIG_IEEE1394_SBP2_PHYS_DMA=y
+CONFIG_IEEE1394_ETH1394=m
+CONFIG_IEEE1394_DV1394=m
+CONFIG_IEEE1394_RAWIO=m
+CONFIG_IEEE1394_CMP=m
+CONFIG_IEEE1394_AMDTP=m
+
+#
+# I2O device support
+#
+# CONFIG_I2O is not set
+
+#
+# Networking support
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+# CONFIG_NETLINK_DEV is not set
+CONFIG_UNIX=y
+CONFIG_NET_KEY=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=y
+CONFIG_INET_ESP=y
+CONFIG_INET_IPCOMP=y
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
+# CONFIG_IPV6 is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_CONNTRACK=y
+CONFIG_IP_NF_FTP=m
+CONFIG_IP_NF_IRC=m
+CONFIG_IP_NF_TFTP=m
+# CONFIG_IP_NF_AMANDA is not set
+# CONFIG_IP_NF_QUEUE is not set
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_MATCH_LIMIT=m
+CONFIG_IP_NF_MATCH_IPRANGE=y
+CONFIG_IP_NF_MATCH_MAC=m
+CONFIG_IP_NF_MATCH_PKTTYPE=m
+CONFIG_IP_NF_MATCH_MARK=m
+CONFIG_IP_NF_MATCH_MULTIPORT=y
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_DSCP=m
+CONFIG_IP_NF_MATCH_AH_ESP=y
+CONFIG_IP_NF_MATCH_LENGTH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_TCPMSS=m
+CONFIG_IP_NF_MATCH_HELPER=m
+CONFIG_IP_NF_MATCH_STATE=m
+CONFIG_IP_NF_MATCH_CONNTRACK=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_PHYSDEV=m
+CONFIG_IP_NF_FILTER=y
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_NAT=y
+CONFIG_IP_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_SAME=m
+CONFIG_IP_NF_NAT_LOCAL=y
+# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
+CONFIG_IP_NF_NAT_IRC=m
+CONFIG_IP_NF_NAT_FTP=m
+CONFIG_IP_NF_NAT_TFTP=m
+CONFIG_IP_NF_MANGLE=y
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_DSCP=m
+CONFIG_IP_NF_TARGET_MARK=m
+CONFIG_IP_NF_TARGET_CLASSIFY=m
+CONFIG_IP_NF_TARGET_LOG=y
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_TARGET_TCPMSS=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+# CONFIG_IP_NF_RAW is not set
+
+#
+# Bridge: Netfilter Configuration
+#
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=y
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
+CONFIG_BRIDGE=m
+CONFIG_VLAN_8021Q=m
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_FASTROUTE is not set
+# CONFIG_NET_HW_FLOWCONTROL is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+CONFIG_NETDEVICES=y
+CONFIG_DUMMY=m
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=m
+
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_NET_VENDOR_3COM is not set
+
+#
+# Tulip family network device support
+#
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+CONFIG_NET_PCI=y
+# CONFIG_PCNET32 is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_DGRS is not set
+# CONFIG_EEPRO100 is not set
+# CONFIG_E100 is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_8139CP is not set
+# CONFIG_8139TOO is not set
+CONFIG_SIS900=m
+# CONFIG_EPIC100 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_VIA_RHINE is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+CONFIG_R8169=m
+# CONFIG_SK98LIN is not set
+# CONFIG_TIGON3 is not set
+
+#
+# Ethernet (10000 Mbit)
+#
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PLIP is not set
+CONFIG_PPP=m
+# CONFIG_PPP_MULTILINK is not set
+# CONFIG_PPP_FILTER is not set
+CONFIG_PPP_ASYNC=m
+# CONFIG_PPP_SYNC_TTY is not set
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPPOE=m
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input I/O drivers
+#
+# CONFIG_GAMEPORT is not set
+CONFIG_SOUND_GAMEPORT=y
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_CT82C710 is not set
+# CONFIG_SERIO_PARKBD is not set
+# CONFIG_SERIO_PCIPS2 is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_PCSPKR=y
+CONFIG_INPUT_UINPUT=m
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_CONSOLE is not set
+# CONFIG_SERIAL_8250_ACPI is not set
+CONFIG_SERIAL_8250_NR_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+# CONFIG_PPDEV is not set
+# CONFIG_TIPAR is not set
+# CONFIG_QIC02_TAPE is not set
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_NVRAM is not set
+CONFIG_RTC=y
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_FTAPE is not set
+CONFIG_AGP=y
+CONFIG_AGP_AMD64=y
+# CONFIG_AGP_INTEL_MCH is not set
+# CONFIG_DRM is not set
+# CONFIG_MWAVE is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_HANGCHECK_TIMER is not set
+
+#
+# I2C support
+#
+CONFIG_I2C=m
+CONFIG_I2C_CHARDEV=m
+
+#
+# I2C Algorithms
+#
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCF=m
+
+#
+# I2C Hardware Bus support
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_I810=m
+CONFIG_I2C_ISA=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_PROSAVAGE=m
+CONFIG_I2C_SAVAGE4=m
+CONFIG_SCx200_ACB=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+CONFIG_I2C_VOODOO3=m
+
+#
+# Hardware Sensors Chip support
+#
+CONFIG_I2C_SENSOR=m
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_FSCHER=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83627HF=m
+
+#
+# Other I2C Chip support
+#
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_RTC8564 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+
+#
+# Misc devices
+#
+# CONFIG_IBM_ASM is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+CONFIG_FB=y
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+CONFIG_FB_VGA16=y
+CONFIG_FB_VESA=y
+CONFIG_VIDEO_SELECT=y
+# CONFIG_FB_HGA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON_OLD is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_VIRTUAL is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_MDA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_PCI_CONSOLE=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+CONFIG_FONT_MINI_4x6=y
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+
+#
+# Logo configuration
+#
+CONFIG_LOGO=y
+CONFIG_LOGO_LINUX_MONO=y
+CONFIG_LOGO_LINUX_VGA16=y
+CONFIG_LOGO_LINUX_CLUT224=y
+
+#
+# Sound
+#
+CONFIG_SOUND=y
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_SEQUENCER_OSS=y
+CONFIG_SND_BIT32_EMUL=m
+CONFIG_SND_RTCTIMER=m
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+CONFIG_SND_MPU401_UART=m
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_VIRMIDI is not set
+# CONFIG_SND_MTPAV is not set
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+
+#
+# PCI devices
+#
+CONFIG_SND_AC97_CODEC=m
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_YMFPCI is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_SONICVIBES is not set
+CONFIG_SND_VIA82XX=m
+# CONFIG_SND_VX222 is not set
+
+#
+# ALSA USB devices
+#
+# CONFIG_SND_USB_AUDIO is not set
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+
+#
+# USB support
+#
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_BANDWIDTH=y
+CONFIG_USB_DYNAMIC_MINORS=y
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD=y
+# CONFIG_USB_EHCI_SPLIT_ISO is not set
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+# CONFIG_USB_OHCI_HCD is not set
+CONFIG_USB_UHCI_HCD=y
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_AUDIO is not set
+# CONFIG_USB_BLUETOOTH_TTY is not set
+# CONFIG_USB_MIDI is not set
+# CONFIG_USB_ACM is not set
+CONFIG_USB_PRINTER=m
+CONFIG_USB_STORAGE=y
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_HP8200e is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+
+#
+# USB Human Interface Devices (HID)
+#
+CONFIG_USB_HID=y
+CONFIG_USB_HIDINPUT=y
+# CONFIG_HID_FF is not set
+CONFIG_USB_HIDDEV=y
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_MTOUCH is not set
+# CONFIG_USB_EGALAX is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_ATI_REMOTE is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_HPUSBSCSI is not set
+
+#
+# USB Multimedia devices
+#
+# CONFIG_USB_DABUSB is not set
+
+#
+# Video4Linux support is needed for USB Multimedia device support
+#
+
+#
+# USB Network adaptors
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+
+#
+# USB port drivers
+#
+# CONFIG_USB_USS720 is not set
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_TIGL is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGETSERVO is not set
+# CONFIG_USB_TEST is not set
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# Firmware Drivers
+#
+# CONFIG_EDD is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+# CONFIG_EXT2_FS_POSIX_ACL is not set
+# CONFIG_EXT2_FS_SECURITY is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=y
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+CONFIG_AUTOFS4_FS=y
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=y
+CONFIG_JOLIET=y
+# CONFIG_ZISOFS is not set
+CONFIG_UDF_FS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_SYSFS=y
+# CONFIG_DEVFS_FS is not set
+CONFIG_DEVPTS_FS_XATTR=y
+# CONFIG_DEVPTS_FS_SECURITY is not set
+CONFIG_TMPFS=y
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD=y
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V4 is not set
+CONFIG_NFSD_TCP=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=y
+CONFIG_SUNRPC=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+CONFIG_CIFS=y
+# CONFIG_CIFS_STATS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_DEBUG_KERNEL is not set
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_FRAME_POINTER is not set
+
+#
+# Security options
+#
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_BLOWFISH=y
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRYPTO_SERPENT=y
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_CAST5=y
+CONFIG_CRYPTO_CAST6=y
+CONFIG_CRYPTO_ARC4=y
+CONFIG_CRYPTO_DEFLATE=y
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_CRC32C=m
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Library routines
+#
+CONFIG_CRC32=m
+CONFIG_LIBCRC32C=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
Index: configs/kernel/linux-2.6.8.1-i686.config
===================================================================
--- configs/kernel/linux-2.6.8.1-i686.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ configs/kernel/linux-2.6.8.1-i686.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+linux-2.6.1-i686-inspiron-8000
Index: configs/kernel/linux-2.6.8.1-powerpc.config
===================================================================
--- configs/kernel/linux-2.6.8.1-powerpc.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ configs/kernel/linux-2.6.8.1-powerpc.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1199 @@
+#
+# Automatically generated make config: don't edit
+#
+CONFIG_MMU=y
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_HAVE_DEC_LOCK=y
+CONFIG_PPC=y
+CONFIG_PPC32=y
+CONFIG_GENERIC_NVRAM=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_CLEAN_COMPILE=y
+CONFIG_BROKEN_ON_SMP=y
+
+#
+# General setup
+#
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_HOTPLUG=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+# CONFIG_EMBEDDED is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_OBSOLETE_MODPARM=y
+CONFIG_MODVERSIONS=y
+CONFIG_KMOD=y
+
+#
+# Processor
+#
+CONFIG_6xx=y
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+# CONFIG_POWER3 is not set
+# CONFIG_POWER4 is not set
+# CONFIG_8xx is not set
+# CONFIG_E500 is not set
+CONFIG_ALTIVEC=y
+# CONFIG_TAU is not set
+# CONFIG_CPU_FREQ is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_PPC601_SYNC_FIX is not set
+CONFIG_PM=y
+CONFIG_PPC_STD_MMU=y
+
+#
+# Platform options
+#
+CONFIG_PPC_MULTIPLATFORM=y
+# CONFIG_APUS is not set
+# CONFIG_WILLOW is not set
+# CONFIG_PCORE is not set
+# CONFIG_POWERPMC250 is not set
+# CONFIG_EV64260 is not set
+# CONFIG_SPRUCE is not set
+# CONFIG_LOPEC is not set
+# CONFIG_MCPN765 is not set
+# CONFIG_MVME5100 is not set
+# CONFIG_PPLUS is not set
+# CONFIG_PRPMC750 is not set
+# CONFIG_PRPMC800 is not set
+# CONFIG_SANDPOINT is not set
+# CONFIG_ADIR is not set
+# CONFIG_K2 is not set
+# CONFIG_PAL4 is not set
+# CONFIG_GEMINI is not set
+# CONFIG_EST8260 is not set
+# CONFIG_SBC82xx is not set
+# CONFIG_SBS8260 is not set
+# CONFIG_RPX8260 is not set
+# CONFIG_TQM8260 is not set
+# CONFIG_ADS8272 is not set
+# CONFIG_LITE5200 is not set
+CONFIG_PPC_CHRP=y
+CONFIG_PPC_PMAC=y
+CONFIG_PPC_PREP=y
+CONFIG_PPC_OF=y
+CONFIG_PPCBUG_NVRAM=y
+# CONFIG_SMP is not set
+# CONFIG_PREEMPT is not set
+# CONFIG_HIGHMEM is not set
+CONFIG_KERNEL_ELF=y
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+CONFIG_PROC_DEVICETREE=y
+# CONFIG_PREP_RESIDUAL is not set
+# CONFIG_CMDLINE_BOOL is not set
+
+#
+# Bus options
+#
+# CONFIG_ISA is not set
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+# CONFIG_PCI_LEGACY_PROC is not set
+CONFIG_PCI_NAMES=y
+
+#
+# PCMCIA/CardBus support
+#
+# CONFIG_PCMCIA is not set
+
+#
+# Advanced setup
+#
+# CONFIG_ADVANCED_OPTIONS is not set
+
+#
+# Default settings for advanced configuration options are used
+#
+CONFIG_HIGHMEM_START=0xfe000000
+CONFIG_LOWMEM_SIZE=0x30000000
+CONFIG_KERNEL_START=0xc0000000
+CONFIG_TASK_SIZE=0x80000000
+CONFIG_BOOT_LOAD=0x00800000
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=m
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Parallel port support
+#
+CONFIG_PARPORT=m
+# CONFIG_PARPORT_PC is not set
+# CONFIG_PARPORT_OTHER is not set
+CONFIG_PARPORT_1284=y
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_FD is not set
+CONFIG_MAC_FLOPPY=y
+# CONFIG_PARIDE is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+CONFIG_BLK_DEV_LOOP=m
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM_SIZE=4096
+# CONFIG_LBD is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_IDEDISK=y
+# CONFIG_IDEDISK_MULTI_MODE is not set
+CONFIG_BLK_DEV_IDECD=y
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+CONFIG_BLK_DEV_IDESCSI=m
+# CONFIG_IDE_TASK_IOCTL is not set
+CONFIG_IDE_TASKFILE_IO=y
+
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=y
+CONFIG_BLK_DEV_IDEPCI=y
+CONFIG_IDEPCI_SHARE_IRQ=y
+# CONFIG_BLK_DEV_OFFBOARD is not set
+CONFIG_BLK_DEV_GENERIC=y
+# CONFIG_BLK_DEV_OPTI621 is not set
+# CONFIG_BLK_DEV_SL82C105 is not set
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
+CONFIG_IDEDMA_PCI_AUTO=y
+# CONFIG_IDEDMA_ONLYDISK is not set
+CONFIG_BLK_DEV_ADMA=y
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_HPT34X is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+CONFIG_BLK_DEV_SVWKS=y
+CONFIG_BLK_DEV_SIIMAGE=y
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+# CONFIG_BLK_DEV_VIA82CXXX is not set
+CONFIG_BLK_DEV_IDE_PMAC=y
+CONFIG_BLK_DEV_IDE_PMAC_ATA100FIRST=y
+CONFIG_BLK_DEV_IDEDMA_PMAC=y
+# CONFIG_BLK_DEV_IDE_PMAC_BLINK is not set
+CONFIG_BLK_DEV_IDEDMA_PMAC_AUTO=y
+# CONFIG_IDE_ARM is not set
+CONFIG_BLK_DEV_IDEDMA=y
+CONFIG_IDEDMA_IVB=y
+CONFIG_IDEDMA_AUTO=y
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI=y
+# CONFIG_SCSI_PROC_FS is not set
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=y
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_CHR_DEV_SG=m
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+
+#
+# SCSI Transport Attributes
+#
+CONFIG_SCSI_SPI_ATTRS=y
+# CONFIG_SCSI_FC_ATTRS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
+CONFIG_AIC7XXX_RESET_DELAY_MS=15000
+# CONFIG_AIC7XXX_BUILD_FIRMWARE is not set
+CONFIG_AIC7XXX_DEBUG_ENABLE=y
+CONFIG_AIC7XXX_DEBUG_MASK=0
+CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=32
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+# CONFIG_AIC79XX_BUILD_FIRMWARE is not set
+# CONFIG_AIC79XX_ENABLE_RD_STRM is not set
+CONFIG_AIC79XX_DEBUG_ENABLE=y
+CONFIG_AIC79XX_DEBUG_MASK=0
+CONFIG_AIC79XX_REG_PRETTY_PRINT=y
+# CONFIG_SCSI_DPT_I2O is not set
+CONFIG_SCSI_MEGARAID=m
+CONFIG_SCSI_SATA=y
+CONFIG_SCSI_SATA_SVW=y
+# CONFIG_SCSI_ATA_PIIX is not set
+# CONFIG_SCSI_SATA_NV is not set
+# CONFIG_SCSI_SATA_PROMISE is not set
+# CONFIG_SCSI_SATA_SX4 is not set
+CONFIG_SCSI_SATA_SIL=y
+# CONFIG_SCSI_SATA_SIS is not set
+# CONFIG_SCSI_SATA_VIA is not set
+CONFIG_SCSI_SATA_VITESSE=m
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_EATA_PIO is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_PPA is not set
+# CONFIG_SCSI_IMM is not set
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+# CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
+CONFIG_SCSI_IPR=m
+# CONFIG_SCSI_IPR_TRACE is not set
+# CONFIG_SCSI_IPR_DUMP is not set
+# CONFIG_SCSI_QLOGIC_ISP is not set
+# CONFIG_SCSI_QLOGIC_FC is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+CONFIG_SCSI_QLA2XXX=y
+# CONFIG_SCSI_QLA21XX is not set
+# CONFIG_SCSI_QLA22XX is not set
+# CONFIG_SCSI_QLA2300 is not set
+# CONFIG_SCSI_QLA2322 is not set
+# CONFIG_SCSI_QLA6312 is not set
+# CONFIG_SCSI_QLA6322 is not set
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_DC390T=m
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+CONFIG_SCSI_MESH=y
+CONFIG_SCSI_MESH_SYNC_RATE=5
+CONFIG_SCSI_MESH_RESET_DELAY_MS=4000
+CONFIG_SCSI_MAC53C94=m
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_IEEE1394=m
+
+#
+# Subsystem Options
+#
+# CONFIG_IEEE1394_VERBOSEDEBUG is not set
+CONFIG_IEEE1394_OUI_DB=y
+CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
+CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
+
+#
+# Device Drivers
+#
+# CONFIG_IEEE1394_PCILYNX is not set
+CONFIG_IEEE1394_OHCI1394=m
+
+#
+# Protocol Drivers
+#
+# CONFIG_IEEE1394_VIDEO1394 is not set
+CONFIG_IEEE1394_SBP2=m
+CONFIG_IEEE1394_SBP2_PHYS_DMA=y
+CONFIG_IEEE1394_ETH1394=m
+# CONFIG_IEEE1394_DV1394 is not set
+CONFIG_IEEE1394_RAWIO=m
+CONFIG_IEEE1394_CMP=m
+# CONFIG_IEEE1394_AMDTP is not set
+
+#
+# I2O device support
+#
+# CONFIG_I2O is not set
+
+#
+# Macintosh device drivers
+#
+CONFIG_ADB=y
+CONFIG_ADB_CUDA=y
+CONFIG_ADB_PMU=y
+CONFIG_PMAC_PBOOK=y
+# CONFIG_PMAC_APM_EMU is not set
+# CONFIG_PMAC_BACKLIGHT is not set
+CONFIG_ADB_MACIO=y
+CONFIG_INPUT_ADBHID=y
+CONFIG_MAC_EMUMOUSEBTN=y
+# CONFIG_THERM_WINDTUNNEL is not set
+# CONFIG_THERM_ADT746X is not set
+CONFIG_ANSLCD=y
+
+#
+# Networking support
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_NETLINK_DEV=y
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+# CONFIG_IP_PNP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+CONFIG_IPV6=y
+# CONFIG_IPV6_PRIVACY is not set
+# CONFIG_INET6_AH is not set
+# CONFIG_INET6_ESP is not set
+# CONFIG_INET6_IPCOMP is not set
+# CONFIG_IPV6_TUNNEL is not set
+# CONFIG_NETFILTER is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_HW_FLOWCONTROL is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+# CONFIG_NET_CLS_ROUTE is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+CONFIG_NETDEVICES=y
+CONFIG_DUMMY=m
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+# CONFIG_ETHERTAP is not set
+
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+CONFIG_MACE=m
+# CONFIG_MACE_AAUI_PORT is not set
+CONFIG_BMAC=m
+# CONFIG_HAPPYMEAL is not set
+CONFIG_SUNGEM=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_VORTEX=m
+# CONFIG_TYPHOON is not set
+
+#
+# Tulip family network device support
+#
+CONFIG_NET_TULIP=y
+# CONFIG_DE2104X is not set
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+CONFIG_TULIP_MMIO=y
+# CONFIG_TULIP_NAPI is not set
+# CONFIG_DE4X5 is not set
+# CONFIG_WINBOND_840 is not set
+# CONFIG_DM9102 is not set
+# CONFIG_HP100 is not set
+CONFIG_NET_PCI=y
+# CONFIG_PCNET32 is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_DGRS is not set
+# CONFIG_EEPRO100 is not set
+CONFIG_E100=m
+# CONFIG_E100_NAPI is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+CONFIG_NE2K_PCI=m
+# CONFIG_8139CP is not set
+CONFIG_8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+# CONFIG_8139TOO_8129 is not set
+# CONFIG_8139_OLD_RX_RESET is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_TLAN is not set
+CONFIG_VIA_RHINE=m
+CONFIG_VIA_RHINE_MMIO=y
+# CONFIG_VIA_VELOCITY is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+CONFIG_NS83820=m
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+CONFIG_R8169=m
+CONFIG_SK98LIN=m
+CONFIG_TIGON3=m
+
+#
+# Ethernet (10000 Mbit)
+#
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+
+#
+# Wireless LAN (non-hamradio)
+#
+CONFIG_NET_RADIO=y
+
+#
+# Obsolete Wireless cards support (pre-802.11)
+#
+# CONFIG_STRIP is not set
+
+#
+# Wireless 802.11b ISA/PCI cards support
+#
+CONFIG_HERMES=m
+CONFIG_APPLE_AIRPORT=m
+# CONFIG_PLX_HERMES is not set
+# CONFIG_TMD_HERMES is not set
+# CONFIG_PCI_HERMES is not set
+CONFIG_ATMEL=m
+# CONFIG_PCI_ATMEL is not set
+
+#
+# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
+#
+# CONFIG_PRISM54 is not set
+CONFIG_NET_WIRELESS=y
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PLIP is not set
+CONFIG_PPP=m
+# CONFIG_PPP_MULTILINK is not set
+# CONFIG_PPP_FILTER is not set
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPPOE=m
+CONFIG_SLIP=m
+CONFIG_SLIP_COMPRESSED=y
+# CONFIG_SLIP_SMART is not set
+# CONFIG_SLIP_MODE_SLIP6 is not set
+# CONFIG_NET_FC is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+
+#
+# ISDN subsystem
+#
+CONFIG_ISDN=m
+
+#
+# Old ISDN4Linux
+#
+# CONFIG_ISDN_I4L is not set
+
+#
+# CAPI subsystem
+#
+CONFIG_ISDN_CAPI=m
+# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
+CONFIG_ISDN_CAPI_CAPIFS=m
+
+#
+# CAPI hardware drivers
+#
+
+#
+# Active AVM cards
+#
+# CONFIG_CAPI_AVM is not set
+
+#
+# Active Eicon DIVA Server cards
+#
+# CONFIG_CAPI_EICON is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input I/O drivers
+#
+# CONFIG_GAMEPORT is not set
+CONFIG_SOUND_GAMEPORT=y
+# CONFIG_SERIO is not set
+# CONFIG_SERIO_I8042 is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=m
+CONFIG_SERIAL_8250_NR_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=m
+CONFIG_SERIAL_PMACZILOG=m
+CONFIG_UNIX98_PTYS=y
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_PRINTER is not set
+# CONFIG_PPDEV is not set
+# CONFIG_TIPAR is not set
+# CONFIG_QIC02_TAPE is not set
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+CONFIG_NVRAM=y
+CONFIG_GEN_RTC=y
+CONFIG_GEN_RTC_X=y
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_AGP is not set
+# CONFIG_DRM is not set
+# CONFIG_RAW_DRIVER is not set
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
+
+#
+# I2C Algorithms
+#
+CONFIG_I2C_ALGOBIT=y
+CONFIG_I2C_ALGOPCF=m
+
+#
+# I2C Hardware Bus support
+#
+# CONFIG_I2C_ALI1535 is not set
+# CONFIG_I2C_ALI1563 is not set
+# CONFIG_I2C_ALI15X3 is not set
+# CONFIG_I2C_AMD756 is not set
+# CONFIG_I2C_AMD8111 is not set
+CONFIG_I2C_HYDRA=m
+# CONFIG_I2C_I801 is not set
+# CONFIG_I2C_I810 is not set
+# CONFIG_I2C_ISA is not set
+CONFIG_I2C_KEYWEST=y
+# CONFIG_I2C_NFORCE2 is not set
+# CONFIG_I2C_PARPORT is not set
+# CONFIG_I2C_PARPORT_LIGHT is not set
+# CONFIG_I2C_PIIX4 is not set
+# CONFIG_I2C_PROSAVAGE is not set
+# CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_SCx200_ACB is not set
+# CONFIG_I2C_SIS5595 is not set
+# CONFIG_I2C_SIS630 is not set
+# CONFIG_I2C_SIS96X is not set
+# CONFIG_I2C_VIA is not set
+# CONFIG_I2C_VIAPRO is not set
+# CONFIG_I2C_VOODOO3 is not set
+
+#
+# Hardware Sensors Chip support
+#
+# CONFIG_I2C_SENSOR is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_VIA686A is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83627HF is not set
+
+#
+# Other I2C Chip support
+#
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_RTC8564 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Misc devices
+#
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+CONFIG_FB=y
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+CONFIG_FB_OF=y
+# CONFIG_FB_CONTROL is not set
+# CONFIG_FB_PLATINUM is not set
+# CONFIG_FB_VALKYRIE is not set
+# CONFIG_FB_CT65550 is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON_OLD is not set
+CONFIG_FB_RADEON=y
+CONFIG_FB_RADEON_I2C=y
+# CONFIG_FB_RADEON_DEBUG is not set
+CONFIG_FB_ATY128=y
+CONFIG_FB_ATY=y
+CONFIG_FB_ATY_CT=y
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_XL_INIT=y
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_VIRTUAL is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_MDA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+
+#
+# Logo configuration
+#
+# CONFIG_LOGO is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# USB support
+#
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+# CONFIG_USB_BANDWIDTH is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD=m
+# CONFIG_USB_EHCI_SPLIT_ISO is not set
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+CONFIG_USB_OHCI_HCD=y
+# CONFIG_USB_UHCI_HCD is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_BLUETOOTH_TTY is not set
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_RW_DETECT is not set
+CONFIG_USB_STORAGE_DATAFAB=y
+CONFIG_USB_STORAGE_FREECOM=y
+CONFIG_USB_STORAGE_ISD200=y
+CONFIG_USB_STORAGE_DPCM=y
+# CONFIG_USB_STORAGE_HP8200e is not set
+CONFIG_USB_STORAGE_SDDR09=y
+CONFIG_USB_STORAGE_SDDR55=y
+CONFIG_USB_STORAGE_JUMPSHOT=y
+
+#
+# USB Human Interface Devices (HID)
+#
+CONFIG_USB_HID=y
+CONFIG_USB_HIDINPUT=y
+# CONFIG_HID_FF is not set
+CONFIG_USB_HIDDEV=y
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_MTOUCH is not set
+# CONFIG_USB_EGALAX is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_ATI_REMOTE is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_HPUSBSCSI is not set
+
+#
+# USB Multimedia devices
+#
+# CONFIG_USB_DABUSB is not set
+
+#
+# Video4Linux support is needed for USB Multimedia device support
+#
+
+#
+# USB Network adaptors
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+
+#
+# USB port drivers
+#
+# CONFIG_USB_USS720 is not set
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_TIGL is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGETSERVO is not set
+# CONFIG_USB_TEST is not set
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+CONFIG_EXT3_FS=y
+# CONFIG_EXT3_FS_XATTR is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_REISERFS_FS=y
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+CONFIG_JFS_FS=y
+# CONFIG_JFS_POSIX_ACL is not set
+# CONFIG_JFS_DEBUG is not set
+# CONFIG_JFS_STATISTICS is not set
+CONFIG_XFS_FS=y
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_QUOTA is not set
+# CONFIG_XFS_SECURITY is not set
+# CONFIG_XFS_POSIX_ACL is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+# CONFIG_AUTOFS4_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=y
+CONFIG_JOLIET=y
+# CONFIG_ZISOFS is not set
+CONFIG_UDF_FS=y
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+# CONFIG_MSDOS_FS is not set
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_SYSFS=y
+CONFIG_DEVFS_FS=y
+CONFIG_DEVFS_MOUNT=y
+# CONFIG_DEVFS_DEBUG is not set
+# CONFIG_DEVPTS_FS_XATTR is not set
+CONFIG_TMPFS=y
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+CONFIG_AFFS_FS=m
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=m
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD=m
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V4 is not set
+# CONFIG_NFSD_TCP is not set
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=m
+CONFIG_SUNRPC=m
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_OSF_PARTITION is not set
+CONFIG_AMIGA_PARTITION=y
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+# CONFIG_BSD_DISKLABEL is not set
+# CONFIG_MINIX_SUBPARTITION is not set
+# CONFIG_SOLARIS_X86_PARTITION is not set
+# CONFIG_UNIXWARE_DISKLABEL is not set
+# CONFIG_LDM_PARTITION is not set
+# CONFIG_SGI_PARTITION is not set
+# CONFIG_ULTRIX_PARTITION is not set
+# CONFIG_SUN_PARTITION is not set
+# CONFIG_EFI_PARTITION is not set
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-15"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+CONFIG_NLS_CODEPAGE_850=y
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+CONFIG_NLS_ISO8859_15=y
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+CONFIG_NLS_UTF8=y
+
+#
+# Library routines
+#
+CONFIG_CRC_CCITT=m
+CONFIG_CRC32=m
+CONFIG_LIBCRC32C=m
+CONFIG_ZLIB_INFLATE=m
+CONFIG_ZLIB_DEFLATE=m
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_DEBUG_KERNEL is not set
+# CONFIG_BOOTX_TEXT is not set
+
+#
+# Security options
+#
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+# CONFIG_CRYPTO is not set
Index: configs/kernel/linux-2.6.8.1-x86_64.config
===================================================================
--- configs/kernel/linux-2.6.8.1-x86_64.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ configs/kernel/linux-2.6.8.1-x86_64.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+linux-2.6.8.1-x86_64.config-K8VNXP
Index: configs/kernel/linux-2.6.8.1-x86_64.config-K8VNXP
===================================================================
--- configs/kernel/linux-2.6.8.1-x86_64.config-K8VNXP	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ configs/kernel/linux-2.6.8.1-x86_64.config-K8VNXP	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1305 @@
+#
+# Automatically generated make config: don't edit
+#
+CONFIG_X86_64=y
+CONFIG_64BIT=y
+CONFIG_X86=y
+CONFIG_MMU=y
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_X86_CMPXCHG=y
+CONFIG_EARLY_PRINTK=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_GENERIC_ISA_DMA=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_CLEAN_COMPILE=y
+CONFIG_BROKEN_ON_SMP=y
+
+#
+# General setup
+#
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_BSD_PROCESS_ACCT=y
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_HOTPLUG=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+# CONFIG_EMBEDDED is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_OBSOLETE_MODPARM=y
+# CONFIG_MODVERSIONS is not set
+CONFIG_KMOD=y
+
+#
+# Processor type and features
+#
+CONFIG_MK8=y
+# CONFIG_MPSC is not set
+# CONFIG_GENERIC_CPU is not set
+CONFIG_X86_L1_CACHE_BYTES=64
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_TSC=y
+CONFIG_X86_GOOD_APIC=y
+# CONFIG_MICROCODE is not set
+# CONFIG_X86_MSR is not set
+# CONFIG_X86_CPUID is not set
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_MTRR=y
+# CONFIG_SMP is not set
+CONFIG_PREEMPT=y
+CONFIG_GART_IOMMU=y
+CONFIG_SWIOTLB=y
+CONFIG_X86_MCE=y
+
+#
+# Power management options
+#
+CONFIG_PM=y
+# CONFIG_SOFTWARE_SUSPEND is not set
+
+#
+# ACPI (Advanced Configuration and Power Interface) Support
+#
+CONFIG_ACPI=y
+CONFIG_ACPI_BOOT=y
+CONFIG_ACPI_INTERPRETER=y
+# CONFIG_ACPI_SLEEP is not set
+# CONFIG_ACPI_AC is not set
+# CONFIG_ACPI_BATTERY is not set
+CONFIG_ACPI_BUTTON=y
+CONFIG_ACPI_FAN=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_THERMAL=y
+# CONFIG_ACPI_ASUS is not set
+# CONFIG_ACPI_TOSHIBA is not set
+CONFIG_ACPI_DEBUG=y
+CONFIG_ACPI_BUS=y
+CONFIG_ACPI_EC=y
+CONFIG_ACPI_POWER=y
+CONFIG_ACPI_PCI=y
+CONFIG_ACPI_SYSTEM=y
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+# CONFIG_PCI_MSI is not set
+# CONFIG_PCI_LEGACY_PROC is not set
+CONFIG_PCI_NAMES=y
+
+#
+# PCMCIA/CardBus support
+#
+# CONFIG_PCMCIA is not set
+
+#
+# PCI Hotplug Support
+#
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# Executable file formats / Emulations
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_MISC=m
+CONFIG_IA32_EMULATION=y
+CONFIG_IA32_AOUT=y
+CONFIG_COMPAT=y
+CONFIG_SYSVIPC_COMPAT=y
+CONFIG_UID16=y
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+CONFIG_FW_LOADER=m
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Parallel port support
+#
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_PC_CML1=m
+# CONFIG_PARPORT_SERIAL is not set
+CONFIG_PARPORT_PC_FIFO=y
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_OTHER=y
+CONFIG_PARPORT_1284=y
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+CONFIG_BLK_DEV_FD=y
+# CONFIG_PARIDE is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_NBD=m
+# CONFIG_BLK_DEV_SX8 is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_LBD=y
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+# CONFIG_BLK_DEV_HD_IDE is not set
+CONFIG_BLK_DEV_IDEDISK=y
+CONFIG_IDEDISK_MULTI_MODE=y
+CONFIG_BLK_DEV_IDECD=y
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+CONFIG_BLK_DEV_IDESCSI=m
+# CONFIG_IDE_TASK_IOCTL is not set
+# CONFIG_IDE_TASKFILE_IO is not set
+
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=y
+# CONFIG_BLK_DEV_CMD640 is not set
+CONFIG_BLK_DEV_IDEPCI=y
+CONFIG_IDEPCI_SHARE_IRQ=y
+# CONFIG_BLK_DEV_OFFBOARD is not set
+CONFIG_BLK_DEV_GENERIC=y
+# CONFIG_BLK_DEV_OPTI621 is not set
+# CONFIG_BLK_DEV_RZ1000 is not set
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
+CONFIG_IDEDMA_PCI_AUTO=y
+# CONFIG_IDEDMA_ONLYDISK is not set
+CONFIG_BLK_DEV_ADMA=y
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_ATIIXP is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_HPT34X is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SIS5513 is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+CONFIG_BLK_DEV_VIA82CXXX=y
+# CONFIG_IDE_ARM is not set
+CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDEDMA_IVB is not set
+CONFIG_IDEDMA_AUTO=y
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI=m
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+
+#
+# SCSI Transport Attributes
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_MEGARAID is not set
+CONFIG_SCSI_SATA=y
+# CONFIG_SCSI_SATA_SVW is not set
+# CONFIG_SCSI_ATA_PIIX is not set
+# CONFIG_SCSI_SATA_NV is not set
+# CONFIG_SCSI_SATA_PROMISE is not set
+# CONFIG_SCSI_SATA_SX4 is not set
+# CONFIG_SCSI_SATA_SIL is not set
+# CONFIG_SCSI_SATA_SIS is not set
+CONFIG_SCSI_SATA_VIA=m
+# CONFIG_SCSI_SATA_VITESSE is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_EATA_PIO is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_PPA is not set
+# CONFIG_SCSI_IMM is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_ISP is not set
+# CONFIG_SCSI_QLOGIC_FC is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+CONFIG_SCSI_QLA2XXX=m
+# CONFIG_SCSI_QLA21XX is not set
+# CONFIG_SCSI_QLA22XX is not set
+# CONFIG_SCSI_QLA2300 is not set
+# CONFIG_SCSI_QLA2322 is not set
+# CONFIG_SCSI_QLA6312 is not set
+# CONFIG_SCSI_QLA6322 is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_LINEAR=y
+CONFIG_MD_RAID0=y
+CONFIG_MD_RAID1=y
+CONFIG_MD_RAID5=y
+# CONFIG_MD_RAID6 is not set
+CONFIG_MD_MULTIPATH=y
+CONFIG_BLK_DEV_DM=y
+CONFIG_DM_CRYPT=m
+# CONFIG_DM_SNAPSHOT is not set
+# CONFIG_DM_MIRROR is not set
+# CONFIG_DM_ZERO is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_IEEE1394=m
+
+#
+# Subsystem Options
+#
+# CONFIG_IEEE1394_VERBOSEDEBUG is not set
+# CONFIG_IEEE1394_OUI_DB is not set
+CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
+CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
+
+#
+# Device Drivers
+#
+# CONFIG_IEEE1394_PCILYNX is not set
+CONFIG_IEEE1394_OHCI1394=m
+
+#
+# Protocol Drivers
+#
+CONFIG_IEEE1394_VIDEO1394=m
+CONFIG_IEEE1394_SBP2=m
+CONFIG_IEEE1394_SBP2_PHYS_DMA=y
+CONFIG_IEEE1394_ETH1394=m
+CONFIG_IEEE1394_DV1394=m
+CONFIG_IEEE1394_RAWIO=m
+CONFIG_IEEE1394_CMP=m
+CONFIG_IEEE1394_AMDTP=m
+
+#
+# I2O device support
+#
+# CONFIG_I2O is not set
+
+#
+# Networking support
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+# CONFIG_NETLINK_DEV is not set
+CONFIG_UNIX=y
+CONFIG_NET_KEY=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+# CONFIG_IP_ADVANCED_ROUTER is not set
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+# CONFIG_NET_IPGRE is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=y
+CONFIG_INET_ESP=y
+CONFIG_INET_IPCOMP=y
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
+# CONFIG_IPV6 is not set
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_IP_NF_CONNTRACK=y
+CONFIG_IP_NF_FTP=m
+CONFIG_IP_NF_IRC=m
+CONFIG_IP_NF_TFTP=m
+# CONFIG_IP_NF_AMANDA is not set
+# CONFIG_IP_NF_QUEUE is not set
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_MATCH_LIMIT=m
+CONFIG_IP_NF_MATCH_IPRANGE=y
+CONFIG_IP_NF_MATCH_MAC=m
+CONFIG_IP_NF_MATCH_PKTTYPE=m
+CONFIG_IP_NF_MATCH_MARK=m
+CONFIG_IP_NF_MATCH_MULTIPORT=y
+CONFIG_IP_NF_MATCH_TOS=m
+CONFIG_IP_NF_MATCH_RECENT=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_DSCP=m
+CONFIG_IP_NF_MATCH_AH_ESP=y
+CONFIG_IP_NF_MATCH_LENGTH=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_MATCH_TCPMSS=m
+CONFIG_IP_NF_MATCH_HELPER=m
+CONFIG_IP_NF_MATCH_STATE=m
+CONFIG_IP_NF_MATCH_CONNTRACK=m
+CONFIG_IP_NF_MATCH_OWNER=m
+CONFIG_IP_NF_MATCH_PHYSDEV=m
+CONFIG_IP_NF_FILTER=y
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_NAT=y
+CONFIG_IP_NF_NAT_NEEDED=y
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_SAME=m
+CONFIG_IP_NF_NAT_LOCAL=y
+# CONFIG_IP_NF_NAT_SNMP_BASIC is not set
+CONFIG_IP_NF_NAT_IRC=m
+CONFIG_IP_NF_NAT_FTP=m
+CONFIG_IP_NF_NAT_TFTP=m
+CONFIG_IP_NF_MANGLE=y
+CONFIG_IP_NF_TARGET_TOS=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_DSCP=m
+CONFIG_IP_NF_TARGET_MARK=m
+CONFIG_IP_NF_TARGET_CLASSIFY=m
+CONFIG_IP_NF_TARGET_LOG=y
+CONFIG_IP_NF_TARGET_ULOG=m
+CONFIG_IP_NF_TARGET_TCPMSS=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+# CONFIG_IP_NF_RAW is not set
+# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
+# CONFIG_IP_NF_MATCH_REALM is not set
+
+#
+# Bridge: Netfilter Configuration
+#
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=y
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
+CONFIG_BRIDGE=m
+CONFIG_VLAN_8021Q=m
+# CONFIG_DECNET is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_HW_FLOWCONTROL is not set
+
+#
+# QoS and/or fair queueing
+#
+# CONFIG_NET_SCHED is not set
+# CONFIG_NET_CLS_ROUTE is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+CONFIG_NETDEVICES=y
+CONFIG_DUMMY=m
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=m
+
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_NET_VENDOR_3COM is not set
+
+#
+# Tulip family network device support
+#
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+CONFIG_NET_PCI=y
+# CONFIG_PCNET32 is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_DGRS is not set
+# CONFIG_EEPRO100 is not set
+# CONFIG_E100 is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_8139CP is not set
+# CONFIG_8139TOO is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SUNDANCE is not set
+CONFIG_VIA_RHINE=m
+# CONFIG_VIA_RHINE_MMIO is not set
+# CONFIG_VIA_VELOCITY is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+CONFIG_R8169=m
+# CONFIG_SK98LIN is not set
+# CONFIG_TIGON3 is not set
+
+#
+# Ethernet (10000 Mbit)
+#
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PLIP is not set
+CONFIG_PPP=m
+# CONFIG_PPP_MULTILINK is not set
+# CONFIG_PPP_FILTER is not set
+CONFIG_PPP_ASYNC=m
+# CONFIG_PPP_SYNC_TTY is not set
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPPOE=m
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input I/O drivers
+#
+# CONFIG_GAMEPORT is not set
+CONFIG_SOUND_GAMEPORT=y
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_CT82C710 is not set
+# CONFIG_SERIO_PARKBD is not set
+# CONFIG_SERIO_PCIPS2 is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_PCSPKR=y
+CONFIG_INPUT_UINPUT=m
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_CONSOLE is not set
+# CONFIG_SERIAL_8250_ACPI is not set
+CONFIG_SERIAL_8250_NR_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+# CONFIG_PPDEV is not set
+# CONFIG_TIPAR is not set
+# CONFIG_QIC02_TAPE is not set
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_NVRAM is not set
+CONFIG_RTC=y
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_FTAPE is not set
+CONFIG_AGP=y
+CONFIG_AGP_AMD64=y
+# CONFIG_AGP_INTEL_MCH is not set
+# CONFIG_DRM is not set
+# CONFIG_MWAVE is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_HPET is not set
+# CONFIG_HANGCHECK_TIMER is not set
+
+#
+# I2C support
+#
+CONFIG_I2C=m
+CONFIG_I2C_CHARDEV=m
+
+#
+# I2C Algorithms
+#
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCF=m
+
+#
+# I2C Hardware Bus support
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_I810=m
+CONFIG_I2C_ISA=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_PROSAVAGE=m
+CONFIG_I2C_SAVAGE4=m
+CONFIG_SCx200_ACB=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+CONFIG_I2C_VOODOO3=m
+
+#
+# Hardware Sensors Chip support
+#
+CONFIG_I2C_SENSOR=m
+CONFIG_SENSORS_ADM1021=m
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_FSCHER=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_LM75=m
+# CONFIG_SENSORS_LM77 is not set
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83627HF=m
+
+#
+# Other I2C Chip support
+#
+# CONFIG_SENSORS_EEPROM is not set
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_RTC8564 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Misc devices
+#
+# CONFIG_IBM_ASM is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+CONFIG_FB=y
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+CONFIG_FB_VGA16=y
+CONFIG_FB_VESA=y
+CONFIG_VIDEO_SELECT=y
+# CONFIG_FB_HGA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON_OLD is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_VIRTUAL is not set
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_MDA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+CONFIG_FONT_MINI_4x6=y
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+
+#
+# Logo configuration
+#
+CONFIG_LOGO=y
+CONFIG_LOGO_LINUX_MONO=y
+CONFIG_LOGO_LINUX_VGA16=y
+CONFIG_LOGO_LINUX_CLUT224=y
+
+#
+# Sound
+#
+CONFIG_SOUND=y
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_SEQUENCER_OSS=y
+CONFIG_SND_BIT32_EMUL=m
+CONFIG_SND_RTCTIMER=m
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+CONFIG_SND_MPU401_UART=m
+# CONFIG_SND_DUMMY is not set
+# CONFIG_SND_VIRMIDI is not set
+# CONFIG_SND_MTPAV is not set
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+
+#
+# PCI devices
+#
+CONFIG_SND_AC97_CODEC=m
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_YMFPCI is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+# CONFIG_SND_MAESTRO3 is not set
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+# CONFIG_SND_INTEL8X0 is not set
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_SONICVIBES is not set
+CONFIG_SND_VIA82XX=m
+# CONFIG_SND_VX222 is not set
+
+#
+# ALSA USB devices
+#
+# CONFIG_SND_USB_AUDIO is not set
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+
+#
+# USB support
+#
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_BANDWIDTH=y
+CONFIG_USB_DYNAMIC_MINORS=y
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD=y
+# CONFIG_USB_EHCI_SPLIT_ISO is not set
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+# CONFIG_USB_OHCI_HCD is not set
+CONFIG_USB_UHCI_HCD=y
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_AUDIO is not set
+# CONFIG_USB_BLUETOOTH_TTY is not set
+# CONFIG_USB_MIDI is not set
+# CONFIG_USB_ACM is not set
+CONFIG_USB_PRINTER=m
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_RW_DETECT is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_HP8200e is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+
+#
+# USB Human Interface Devices (HID)
+#
+CONFIG_USB_HID=y
+CONFIG_USB_HIDINPUT=y
+# CONFIG_HID_FF is not set
+CONFIG_USB_HIDDEV=y
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_MTOUCH is not set
+# CONFIG_USB_EGALAX is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_ATI_REMOTE is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_HPUSBSCSI is not set
+
+#
+# USB Multimedia devices
+#
+# CONFIG_USB_DABUSB is not set
+
+#
+# Video4Linux support is needed for USB Multimedia device support
+#
+
+#
+# USB Network adaptors
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+
+#
+# USB port drivers
+#
+# CONFIG_USB_USS720 is not set
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_TIGL is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGETSERVO is not set
+# CONFIG_USB_TEST is not set
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# Firmware Drivers
+#
+# CONFIG_EDD is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+# CONFIG_EXT2_FS_POSIX_ACL is not set
+# CONFIG_EXT2_FS_SECURITY is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+CONFIG_JBD=y
+# CONFIG_JBD_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=y
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+CONFIG_AUTOFS4_FS=y
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=y
+CONFIG_JOLIET=y
+# CONFIG_ZISOFS is not set
+CONFIG_UDF_FS=y
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_SYSFS=y
+# CONFIG_DEVFS_FS is not set
+CONFIG_DEVPTS_FS_XATTR=y
+# CONFIG_DEVPTS_FS_SECURITY is not set
+CONFIG_TMPFS=y
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD=y
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V4 is not set
+CONFIG_NFSD_TCP=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=y
+CONFIG_SUNRPC=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+CONFIG_CIFS=y
+# CONFIG_CIFS_STATS is not set
+# CONFIG_CIFS_XATTR is not set
+# CONFIG_CIFS_POSIX is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_DEBUG_KERNEL is not set
+# CONFIG_MAGIC_SYSRQ is not set
+# CONFIG_FRAME_POINTER is not set
+
+#
+# Security options
+#
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_BLOWFISH=y
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRYPTO_SERPENT=y
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_CAST5=y
+CONFIG_CRYPTO_CAST6=y
+# CONFIG_CRYPTO_TEA is not set
+CONFIG_CRYPTO_ARC4=y
+# CONFIG_CRYPTO_KHAZAD is not set
+CONFIG_CRYPTO_DEFLATE=y
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+CONFIG_CRYPTO_CRC32C=m
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Library routines
+#
+CONFIG_CRC_CCITT=m
+CONFIG_CRC32=y
+CONFIG_LIBCRC32C=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
Index: configs/kernel/linux-2.6.9-i686-admin.config
===================================================================
--- configs/kernel/linux-2.6.9-i686-admin.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ configs/kernel/linux-2.6.9-i686-admin.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1473 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.9
+# Tue Nov 23 23:17:25 2004
+#
+CONFIG_X86=y
+CONFIG_MMU=y
+CONFIG_UID16=y
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_IOMAP=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_CLEAN_COMPILE=y
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_POSIX_MQUEUE is not set
+CONFIG_BSD_PROCESS_ACCT=y
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
+CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
+CONFIG_LOG_BUF_SHIFT=15
+CONFIG_HOTPLUG=y
+CONFIG_IKCONFIG=y
+CONFIG_IKCONFIG_PROC=y
+# CONFIG_EMBEDDED is not set
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SHMEM=y
+# CONFIG_TINY_SHMEM is not set
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_OBSOLETE_MODPARM=y
+CONFIG_MODVERSIONS=y
+CONFIG_KMOD=y
+CONFIG_STOP_MACHINE=y
+
+#
+# Processor type and features
+#
+CONFIG_X86_PC=y
+# CONFIG_X86_ELAN is not set
+# CONFIG_X86_VOYAGER is not set
+# CONFIG_X86_NUMAQ is not set
+# CONFIG_X86_SUMMIT is not set
+# CONFIG_X86_BIGSMP is not set
+# CONFIG_X86_VISWS is not set
+# CONFIG_X86_GENERICARCH is not set
+# CONFIG_X86_ES7000 is not set
+# CONFIG_M386 is not set
+# CONFIG_M486 is not set
+# CONFIG_M586 is not set
+# CONFIG_M586TSC is not set
+# CONFIG_M586MMX is not set
+# CONFIG_M686 is not set
+# CONFIG_MPENTIUMII is not set
+CONFIG_MPENTIUMIII=y
+# CONFIG_MPENTIUMM is not set
+# CONFIG_MPENTIUM4 is not set
+# CONFIG_MK6 is not set
+# CONFIG_MK7 is not set
+# CONFIG_MK8 is not set
+# CONFIG_MCRUSOE is not set
+# CONFIG_MWINCHIPC6 is not set
+# CONFIG_MWINCHIP2 is not set
+# CONFIG_MWINCHIP3D is not set
+# CONFIG_MCYRIXIII is not set
+# CONFIG_MVIAC3_2 is not set
+# CONFIG_X86_GENERIC is not set
+CONFIG_X86_CMPXCHG=y
+CONFIG_X86_XADD=y
+CONFIG_X86_L1_CACHE_SHIFT=5
+CONFIG_RWSEM_XCHGADD_ALGORITHM=y
+CONFIG_X86_WP_WORKS_OK=y
+CONFIG_X86_INVLPG=y
+CONFIG_X86_BSWAP=y
+CONFIG_X86_POPAD_OK=y
+CONFIG_X86_GOOD_APIC=y
+CONFIG_X86_INTEL_USERCOPY=y
+CONFIG_X86_USE_PPRO_CHECKSUM=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_SMP=y
+CONFIG_NR_CPUS=32
+# CONFIG_SCHED_SMT is not set
+CONFIG_PREEMPT=y
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_TSC=y
+CONFIG_X86_MCE=y
+# CONFIG_X86_MCE_NONFATAL is not set
+# CONFIG_X86_MCE_P4THERMAL is not set
+# CONFIG_TOSHIBA is not set
+# CONFIG_I8K is not set
+# CONFIG_MICROCODE is not set
+# CONFIG_X86_MSR is not set
+# CONFIG_X86_CPUID is not set
+
+#
+# Firmware Drivers
+#
+CONFIG_EDD=y
+CONFIG_NOHIGHMEM=y
+# CONFIG_HIGHMEM4G is not set
+# CONFIG_HIGHMEM64G is not set
+# CONFIG_MATH_EMULATION is not set
+CONFIG_MTRR=y
+# CONFIG_EFI is not set
+CONFIG_IRQBALANCE=y
+CONFIG_HAVE_DEC_LOCK=y
+# CONFIG_REGPARM is not set
+
+#
+# Power management options (ACPI, APM)
+#
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+# CONFIG_SOFTWARE_SUSPEND is not set
+
+#
+# ACPI (Advanced Configuration and Power Interface) Support
+#
+CONFIG_ACPI=y
+CONFIG_ACPI_BOOT=y
+CONFIG_ACPI_INTERPRETER=y
+# CONFIG_ACPI_SLEEP is not set
+# CONFIG_ACPI_AC is not set
+# CONFIG_ACPI_BATTERY is not set
+CONFIG_ACPI_BUTTON=y
+CONFIG_ACPI_FAN=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_THERMAL=y
+# CONFIG_ACPI_ASUS is not set
+# CONFIG_ACPI_TOSHIBA is not set
+CONFIG_ACPI_BLACKLIST_YEAR=0
+CONFIG_ACPI_DEBUG=y
+CONFIG_ACPI_BUS=y
+CONFIG_ACPI_EC=y
+CONFIG_ACPI_POWER=y
+CONFIG_ACPI_PCI=y
+CONFIG_ACPI_SYSTEM=y
+# CONFIG_X86_PM_TIMER is not set
+
+#
+# APM (Advanced Power Management) BIOS Support
+#
+# CONFIG_APM is not set
+
+#
+# CPU Frequency scaling
+#
+# CONFIG_CPU_FREQ is not set
+
+#
+# Bus options (PCI, PCMCIA, EISA, MCA, ISA)
+#
+CONFIG_PCI=y
+# CONFIG_PCI_GOBIOS is not set
+# CONFIG_PCI_GOMMCONFIG is not set
+# CONFIG_PCI_GODIRECT is not set
+CONFIG_PCI_GOANY=y
+CONFIG_PCI_BIOS=y
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+# CONFIG_PCI_MSI is not set
+# CONFIG_PCI_LEGACY_PROC is not set
+CONFIG_PCI_NAMES=y
+CONFIG_ISA=y
+# CONFIG_EISA is not set
+# CONFIG_MCA is not set
+# CONFIG_SCx200 is not set
+
+#
+# PCMCIA/CardBus support
+#
+CONFIG_PCMCIA=m
+# CONFIG_PCMCIA_DEBUG is not set
+CONFIG_YENTA=m
+CONFIG_CARDBUS=y
+# CONFIG_PD6729 is not set
+# CONFIG_I82092 is not set
+# CONFIG_I82365 is not set
+# CONFIG_TCIC is not set
+CONFIG_PCMCIA_PROBE=y
+
+#
+# PCI Hotplug Support
+#
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_AOUT=m
+CONFIG_BINFMT_MISC=y
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Parallel port support
+#
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_PC_CML1=m
+# CONFIG_PARPORT_SERIAL is not set
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
+# CONFIG_PARPORT_PC_PCMCIA is not set
+# CONFIG_PARPORT_OTHER is not set
+CONFIG_PARPORT_1284=y
+
+#
+# Plug and Play support
+#
+CONFIG_PNP=y
+CONFIG_PNP_DEBUG=y
+
+#
+# Protocols
+#
+CONFIG_ISAPNP=y
+CONFIG_PNPBIOS=y
+# CONFIG_PNPBIOS_PROC_FS is not set
+
+#
+# Block devices
+#
+CONFIG_BLK_DEV_FD=y
+# CONFIG_BLK_DEV_XD is not set
+# CONFIG_PARIDE is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+# CONFIG_BLK_DEV_NBD is not set
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
+# CONFIG_BLK_DEV_RAM is not set
+CONFIG_LBD=y
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+# CONFIG_BLK_DEV_HD_IDE is not set
+CONFIG_BLK_DEV_IDEDISK=y
+CONFIG_IDEDISK_MULTI_MODE=y
+# CONFIG_BLK_DEV_IDECS is not set
+CONFIG_BLK_DEV_IDECD=y
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+CONFIG_BLK_DEV_IDESCSI=m
+# CONFIG_IDE_TASK_IOCTL is not set
+# CONFIG_IDE_TASKFILE_IO is not set
+
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=y
+# CONFIG_BLK_DEV_CMD640 is not set
+# CONFIG_BLK_DEV_IDEPNP is not set
+CONFIG_BLK_DEV_IDEPCI=y
+CONFIG_IDEPCI_SHARE_IRQ=y
+# CONFIG_BLK_DEV_OFFBOARD is not set
+CONFIG_BLK_DEV_GENERIC=y
+# CONFIG_BLK_DEV_OPTI621 is not set
+# CONFIG_BLK_DEV_RZ1000 is not set
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
+CONFIG_IDEDMA_PCI_AUTO=y
+# CONFIG_IDEDMA_ONLYDISK is not set
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_ATIIXP is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_HPT34X is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+CONFIG_BLK_DEV_PIIX=y
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+# CONFIG_BLK_DEV_SIIMAGE is not set
+# CONFIG_BLK_DEV_SIS5513 is not set
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+# CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_IDE_ARM is not set
+# CONFIG_IDE_CHIPSETS is not set
+CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDEDMA_IVB is not set
+CONFIG_IDEDMA_AUTO=y
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI=m
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+# CONFIG_CHR_DEV_OSST is not set
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+
+#
+# SCSI Transport Attributes
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_7000FASST is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AHA152X is not set
+# CONFIG_SCSI_AHA1542 is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_SCSI_IN2000 is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_SCSI_SATA is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_DTC3280 is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_EATA_PIO is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_GENERIC_NCR5380 is not set
+# CONFIG_SCSI_GENERIC_NCR5380_MMIO is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_PPA is not set
+# CONFIG_SCSI_IMM is not set
+# CONFIG_SCSI_NCR53C406A is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_PAS16 is not set
+# CONFIG_SCSI_PSI240I is not set
+# CONFIG_SCSI_QLOGIC_FAS is not set
+# CONFIG_SCSI_QLOGIC_ISP is not set
+# CONFIG_SCSI_QLOGIC_FC is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+CONFIG_SCSI_QLA2XXX=m
+# CONFIG_SCSI_QLA21XX is not set
+# CONFIG_SCSI_QLA22XX is not set
+# CONFIG_SCSI_QLA2300 is not set
+# CONFIG_SCSI_QLA2322 is not set
+# CONFIG_SCSI_QLA6312 is not set
+# CONFIG_SCSI_QLA6322 is not set
+# CONFIG_SCSI_SYM53C416 is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_T128 is not set
+# CONFIG_SCSI_U14_34F is not set
+# CONFIG_SCSI_ULTRASTOR is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# PCMCIA SCSI adapter support
+#
+# CONFIG_PCMCIA_AHA152X is not set
+# CONFIG_PCMCIA_FDOMAIN is not set
+# CONFIG_PCMCIA_NINJA_SCSI is not set
+# CONFIG_PCMCIA_QLOGIC is not set
+# CONFIG_PCMCIA_SYM53C500 is not set
+
+#
+# Old CD-ROM drivers (not SCSI, not IDE)
+#
+# CONFIG_CD_NO_IDESCSI is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_LINEAR=y
+CONFIG_MD_RAID0=y
+CONFIG_MD_RAID1=y
+# CONFIG_MD_RAID10 is not set
+CONFIG_MD_RAID5=y
+# CONFIG_MD_RAID6 is not set
+CONFIG_MD_MULTIPATH=y
+# CONFIG_BLK_DEV_DM is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_IEEE1394=m
+
+#
+# Subsystem Options
+#
+# CONFIG_IEEE1394_VERBOSEDEBUG is not set
+# CONFIG_IEEE1394_OUI_DB is not set
+CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
+CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
+
+#
+# Device Drivers
+#
+
+#
+# Texas Instruments PCILynx requires I2C
+#
+CONFIG_IEEE1394_OHCI1394=m
+
+#
+# Protocol Drivers
+#
+CONFIG_IEEE1394_VIDEO1394=m
+CONFIG_IEEE1394_SBP2=m
+CONFIG_IEEE1394_SBP2_PHYS_DMA=y
+CONFIG_IEEE1394_ETH1394=m
+CONFIG_IEEE1394_DV1394=m
+CONFIG_IEEE1394_RAWIO=m
+CONFIG_IEEE1394_CMP=m
+CONFIG_IEEE1394_AMDTP=m
+
+#
+# I2O device support
+#
+CONFIG_I2O=y
+# CONFIG_I2O_CONFIG is not set
+CONFIG_I2O_BLOCK=m
+CONFIG_I2O_SCSI=m
+CONFIG_I2O_PROC=y
+
+#
+# Networking support
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+# CONFIG_NETLINK_DEV is not set
+CONFIG_UNIX=y
+CONFIG_NET_KEY=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_FWMARK=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_PIMSM_V1=y
+# CONFIG_IP_PIMSM_V2 is not set
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+CONFIG_INET_AH=y
+CONFIG_INET_ESP=y
+CONFIG_INET_IPCOMP=y
+CONFIG_INET_TUNNEL=y
+
+#
+# IP: Virtual Server Configuration
+#
+# CONFIG_IP_VS is not set
+CONFIG_IPV6=y
+CONFIG_IPV6_PRIVACY=y
+CONFIG_INET6_AH=y
+CONFIG_INET6_ESP=y
+CONFIG_INET6_IPCOMP=y
+CONFIG_INET6_TUNNEL=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_NETFILTER=y
+# CONFIG_NETFILTER_DEBUG is not set
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# IP: Netfilter Configuration
+#
+# CONFIG_IP_NF_CONNTRACK is not set
+# CONFIG_IP_NF_QUEUE is not set
+# CONFIG_IP_NF_IPTABLES is not set
+# CONFIG_IP_NF_ARPTABLES is not set
+# CONFIG_IP_NF_COMPAT_IPCHAINS is not set
+# CONFIG_IP_NF_COMPAT_IPFWADM is not set
+
+#
+# IPv6: Netfilter Configuration
+#
+# CONFIG_IP6_NF_QUEUE is not set
+# CONFIG_IP6_NF_IPTABLES is not set
+
+#
+# Bridge: Netfilter Configuration
+#
+# CONFIG_BRIDGE_NF_EBTABLES is not set
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=y
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
+CONFIG_BRIDGE=y
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_HW_FLOWCONTROL is not set
+
+#
+# QoS and/or fair queueing
+#
+CONFIG_NET_SCHED=y
+CONFIG_NET_SCH_CLK_JIFFIES=y
+# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
+# CONFIG_NET_SCH_CLK_CPU is not set
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+# CONFIG_NET_SCH_HFSC is not set
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+# CONFIG_NET_SCH_NETEM is not set
+CONFIG_NET_SCH_INGRESS=y
+CONFIG_NET_QOS=y
+CONFIG_NET_ESTIMATOR=y
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_ROUTE=y
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+# CONFIG_NET_CLS_IND is not set
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+# CONFIG_NET_CLS_ACT is not set
+CONFIG_NET_CLS_POLICE=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+CONFIG_NETDEVICES=y
+CONFIG_DUMMY=m
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+CONFIG_TUN=m
+# CONFIG_NET_SB1000 is not set
+
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+CONFIG_NET_VENDOR_3COM=y
+# CONFIG_EL1 is not set
+# CONFIG_EL2 is not set
+# CONFIG_ELPLUS is not set
+# CONFIG_EL16 is not set
+# CONFIG_EL3 is not set
+# CONFIG_3C515 is not set
+CONFIG_VORTEX=y
+# CONFIG_TYPHOON is not set
+# CONFIG_LANCE is not set
+# CONFIG_NET_VENDOR_SMC is not set
+# CONFIG_NET_VENDOR_RACAL is not set
+
+#
+# Tulip family network device support
+#
+# CONFIG_NET_TULIP is not set
+# CONFIG_AT1700 is not set
+# CONFIG_DEPCA is not set
+# CONFIG_HP100 is not set
+# CONFIG_NET_ISA is not set
+CONFIG_NET_PCI=y
+# CONFIG_PCNET32 is not set
+# CONFIG_AMD8111_ETH is not set
+# CONFIG_ADAPTEC_STARFIRE is not set
+# CONFIG_AC3200 is not set
+# CONFIG_APRICOT is not set
+# CONFIG_B44 is not set
+# CONFIG_FORCEDETH is not set
+# CONFIG_CS89x0 is not set
+# CONFIG_DGRS is not set
+# CONFIG_EEPRO100 is not set
+CONFIG_E100=m
+# CONFIG_E100_NAPI is not set
+# CONFIG_FEALNX is not set
+# CONFIG_NATSEMI is not set
+# CONFIG_NE2K_PCI is not set
+# CONFIG_8139CP is not set
+# CONFIG_8139TOO is not set
+# CONFIG_SIS900 is not set
+# CONFIG_EPIC100 is not set
+# CONFIG_SUNDANCE is not set
+# CONFIG_TLAN is not set
+# CONFIG_VIA_RHINE is not set
+# CONFIG_VIA_VELOCITY is not set
+# CONFIG_NET_POCKET is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+# CONFIG_R8169 is not set
+# CONFIG_SK98LIN is not set
+# CONFIG_TIGON3 is not set
+
+#
+# Ethernet (10000 Mbit)
+#
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+
+#
+# Wireless LAN (non-hamradio)
+#
+CONFIG_NET_RADIO=y
+
+#
+# Obsolete Wireless cards support (pre-802.11)
+#
+# CONFIG_STRIP is not set
+# CONFIG_ARLAN is not set
+# CONFIG_WAVELAN is not set
+# CONFIG_PCMCIA_WAVELAN is not set
+# CONFIG_PCMCIA_NETWAVE is not set
+
+#
+# Wireless 802.11 Frequency Hopping cards support
+#
+# CONFIG_PCMCIA_RAYCS is not set
+
+#
+# Wireless 802.11b ISA/PCI cards support
+#
+# CONFIG_AIRO is not set
+# CONFIG_HERMES is not set
+# CONFIG_ATMEL is not set
+
+#
+# Wireless 802.11b Pcmcia/Cardbus cards support
+#
+CONFIG_AIRO_CS=m
+# CONFIG_PCMCIA_WL3501 is not set
+
+#
+# Prism GT/Duette 802.11(a/b/g) PCI/Cardbus support
+#
+# CONFIG_PRISM54 is not set
+CONFIG_NET_WIRELESS=y
+
+#
+# PCMCIA network device support
+#
+CONFIG_NET_PCMCIA=y
+CONFIG_PCMCIA_3C589=m
+# CONFIG_PCMCIA_3C574 is not set
+# CONFIG_PCMCIA_FMVJ18X is not set
+# CONFIG_PCMCIA_PCNET is not set
+# CONFIG_PCMCIA_NMCLAN is not set
+# CONFIG_PCMCIA_SMC91C92 is not set
+# CONFIG_PCMCIA_XIRC2PS is not set
+# CONFIG_PCMCIA_AXNET is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PLIP is not set
+CONFIG_PPP=m
+# CONFIG_PPP_MULTILINK is not set
+# CONFIG_PPP_FILTER is not set
+CONFIG_PPP_ASYNC=m
+# CONFIG_PPP_SYNC_TTY is not set
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPPOE=m
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input I/O drivers
+#
+CONFIG_GAMEPORT=m
+CONFIG_SOUND_GAMEPORT=m
+# CONFIG_GAMEPORT_NS558 is not set
+# CONFIG_GAMEPORT_L4 is not set
+# CONFIG_GAMEPORT_EMU10K1 is not set
+# CONFIG_GAMEPORT_VORTEX is not set
+# CONFIG_GAMEPORT_FM801 is not set
+# CONFIG_GAMEPORT_CS461x is not set
+CONFIG_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=y
+# CONFIG_SERIO_CT82C710 is not set
+# CONFIG_SERIO_PARKBD is not set
+# CONFIG_SERIO_PCIPS2 is not set
+# CONFIG_SERIO_RAW is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+# CONFIG_MOUSE_SERIAL is not set
+# CONFIG_MOUSE_INPORT is not set
+# CONFIG_MOUSE_LOGIBM is not set
+# CONFIG_MOUSE_PC110PAD is not set
+# CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_PCSPKR=y
+CONFIG_INPUT_UINPUT=m
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_CONSOLE is not set
+# CONFIG_SERIAL_8250_CS is not set
+# CONFIG_SERIAL_8250_ACPI is not set
+CONFIG_SERIAL_8250_NR_UARTS=4
+# CONFIG_SERIAL_8250_EXTENDED is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+# CONFIG_PPDEV is not set
+# CONFIG_TIPAR is not set
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_HW_RANDOM is not set
+# CONFIG_NVRAM is not set
+CONFIG_RTC=y
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_SONYPI is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+CONFIG_AGP=y
+# CONFIG_AGP_ALI is not set
+# CONFIG_AGP_ATI is not set
+# CONFIG_AGP_AMD is not set
+# CONFIG_AGP_AMD64 is not set
+CONFIG_AGP_INTEL=y
+# CONFIG_AGP_INTEL_MCH is not set
+# CONFIG_AGP_NVIDIA is not set
+# CONFIG_AGP_SIS is not set
+# CONFIG_AGP_SWORKS is not set
+# CONFIG_AGP_VIA is not set
+# CONFIG_AGP_EFFICEON is not set
+CONFIG_DRM=y
+# CONFIG_DRM_TDFX is not set
+CONFIG_DRM_R128=m
+# CONFIG_DRM_RADEON is not set
+# CONFIG_DRM_I810 is not set
+# CONFIG_DRM_I830 is not set
+# CONFIG_DRM_I915 is not set
+# CONFIG_DRM_MGA is not set
+# CONFIG_DRM_SIS is not set
+
+#
+# PCMCIA character devices
+#
+# CONFIG_SYNCLINK_CS is not set
+# CONFIG_MWAVE is not set
+# CONFIG_RAW_DRIVER is not set
+# CONFIG_HPET is not set
+# CONFIG_HANGCHECK_TIMER is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Misc devices
+#
+# CONFIG_IBM_ASM is not set
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+CONFIG_FB=y
+CONFIG_FB_MODE_HELPERS=y
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_VGA16 is not set
+CONFIG_FB_VESA=y
+CONFIG_VIDEO_SELECT=y
+# CONFIG_FB_HGA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_I810 is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON_OLD is not set
+# CONFIG_FB_RADEON is not set
+CONFIG_FB_ATY128=m
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_TRIDENT is not set
+CONFIG_FB_VIRTUAL=m
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_MDA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FONTS=y
+# CONFIG_FONT_8x8 is not set
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FONT_MINI_4x6 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+
+#
+# Logo configuration
+#
+CONFIG_LOGO=y
+CONFIG_LOGO_LINUX_MONO=y
+CONFIG_LOGO_LINUX_VGA16=y
+CONFIG_LOGO_LINUX_CLUT224=y
+
+#
+# Sound
+#
+CONFIG_SOUND=m
+
+#
+# Advanced Linux Sound Architecture
+#
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_SEQUENCER_OSS=y
+CONFIG_SND_RTCTIMER=m
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+
+#
+# Generic devices
+#
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_DUMMY=m
+CONFIG_SND_VIRMIDI=m
+# CONFIG_SND_MTPAV is not set
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+
+#
+# ISA devices
+#
+# CONFIG_SND_AD1816A is not set
+# CONFIG_SND_AD1848 is not set
+# CONFIG_SND_CS4231 is not set
+# CONFIG_SND_CS4232 is not set
+# CONFIG_SND_CS4236 is not set
+# CONFIG_SND_ES968 is not set
+# CONFIG_SND_ES1688 is not set
+# CONFIG_SND_ES18XX is not set
+# CONFIG_SND_GUSCLASSIC is not set
+# CONFIG_SND_GUSEXTREME is not set
+# CONFIG_SND_GUSMAX is not set
+# CONFIG_SND_INTERWAVE is not set
+# CONFIG_SND_INTERWAVE_STB is not set
+# CONFIG_SND_OPTI92X_AD1848 is not set
+# CONFIG_SND_OPTI92X_CS4231 is not set
+# CONFIG_SND_OPTI93X is not set
+CONFIG_SND_SB8=m
+CONFIG_SND_SB16=m
+CONFIG_SND_SBAWE=m
+CONFIG_SND_SB16_CSP=y
+# CONFIG_SND_WAVEFRONT is not set
+# CONFIG_SND_ALS100 is not set
+# CONFIG_SND_AZT2320 is not set
+# CONFIG_SND_CMI8330 is not set
+# CONFIG_SND_DT019X is not set
+CONFIG_SND_OPL3SA2=m
+# CONFIG_SND_SGALAXY is not set
+# CONFIG_SND_SSCAPE is not set
+
+#
+# PCI devices
+#
+CONFIG_SND_AC97_CODEC=m
+# CONFIG_SND_ALI5451 is not set
+# CONFIG_SND_ATIIXP is not set
+# CONFIG_SND_ATIIXP_MODEM is not set
+# CONFIG_SND_AU8810 is not set
+# CONFIG_SND_AU8820 is not set
+# CONFIG_SND_AU8830 is not set
+# CONFIG_SND_AZT3328 is not set
+# CONFIG_SND_BT87X is not set
+# CONFIG_SND_CS46XX is not set
+# CONFIG_SND_CS4281 is not set
+# CONFIG_SND_EMU10K1 is not set
+# CONFIG_SND_KORG1212 is not set
+# CONFIG_SND_MIXART is not set
+# CONFIG_SND_NM256 is not set
+# CONFIG_SND_RME32 is not set
+# CONFIG_SND_RME96 is not set
+# CONFIG_SND_RME9652 is not set
+# CONFIG_SND_HDSP is not set
+# CONFIG_SND_TRIDENT is not set
+# CONFIG_SND_YMFPCI is not set
+# CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_CMIPCI is not set
+# CONFIG_SND_ENS1370 is not set
+# CONFIG_SND_ENS1371 is not set
+# CONFIG_SND_ES1938 is not set
+# CONFIG_SND_ES1968 is not set
+CONFIG_SND_MAESTRO3=m
+# CONFIG_SND_FM801 is not set
+# CONFIG_SND_ICE1712 is not set
+# CONFIG_SND_ICE1724 is not set
+CONFIG_SND_INTEL8X0=m
+# CONFIG_SND_INTEL8X0M is not set
+# CONFIG_SND_SONICVIBES is not set
+# CONFIG_SND_VIA82XX is not set
+# CONFIG_SND_VX222 is not set
+
+#
+# ALSA USB devices
+#
+# CONFIG_SND_USB_AUDIO is not set
+# CONFIG_SND_USB_USX2Y is not set
+
+#
+# PCMCIA devices
+#
+# CONFIG_SND_VXPOCKET is not set
+# CONFIG_SND_VXP440 is not set
+# CONFIG_SND_PDAUDIOCF is not set
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+
+#
+# USB support
+#
+CONFIG_USB=y
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEVICEFS=y
+CONFIG_USB_BANDWIDTH=y
+CONFIG_USB_DYNAMIC_MINORS=y
+# CONFIG_USB_SUSPEND is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+# CONFIG_USB_EHCI_HCD is not set
+# CONFIG_USB_OHCI_HCD is not set
+CONFIG_USB_UHCI_HCD=y
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_AUDIO is not set
+# CONFIG_USB_BLUETOOTH_TTY is not set
+# CONFIG_USB_MIDI is not set
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_RW_DETECT is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_HP8200e is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+
+#
+# USB Human Interface Devices (HID)
+#
+CONFIG_USB_HID=y
+CONFIG_USB_HIDINPUT=y
+# CONFIG_HID_FF is not set
+CONFIG_USB_HIDDEV=y
+# CONFIG_USB_AIPTEK is not set
+CONFIG_USB_WACOM=m
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_MTOUCH is not set
+# CONFIG_USB_EGALAX is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_ATI_REMOTE is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+# CONFIG_USB_HPUSBSCSI is not set
+
+#
+# USB Multimedia devices
+#
+# CONFIG_USB_DABUSB is not set
+
+#
+# Video4Linux support is needed for USB Multimedia device support
+#
+
+#
+# USB Network adaptors
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+
+#
+# USB port drivers
+#
+# CONFIG_USB_USS720 is not set
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_TIGL is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_PHIDGETSERVO is not set
+# CONFIG_USB_TEST is not set
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS_XATTR=y
+# CONFIG_EXT2_FS_POSIX_ACL is not set
+# CONFIG_EXT2_FS_SECURITY is not set
+CONFIG_EXT3_FS=y
+CONFIG_EXT3_FS_XATTR=y
+# CONFIG_EXT3_FS_POSIX_ACL is not set
+# CONFIG_EXT3_FS_SECURITY is not set
+CONFIG_JBD=y
+CONFIG_JBD_DEBUG=y
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=y
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+# CONFIG_REISERFS_FS_XATTR is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_XFS_FS is not set
+# CONFIG_MINIX_FS is not set
+# CONFIG_ROMFS_FS is not set
+# CONFIG_QUOTA is not set
+# CONFIG_AUTOFS_FS is not set
+CONFIG_AUTOFS4_FS=y
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=y
+CONFIG_JOLIET=y
+# CONFIG_ZISOFS is not set
+CONFIG_UDF_FS=y
+CONFIG_UDF_NLS=y
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+CONFIG_NTFS_FS=y
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_SYSFS=y
+# CONFIG_DEVFS_FS is not set
+# CONFIG_DEVPTS_FS_XATTR is not set
+CONFIG_TMPFS=y
+# CONFIG_HUGETLBFS is not set
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_CRAMFS is not set
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+CONFIG_NFSD=y
+CONFIG_NFSD_V3=y
+# CONFIG_NFSD_V4 is not set
+CONFIG_NFSD_TCP=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_EXPORTFS=y
+CONFIG_SUNRPC=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+CONFIG_SMB_FS=m
+# CONFIG_SMB_NLS_DEFAULT is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="iso8859-1"
+CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_737 is not set
+# CONFIG_NLS_CODEPAGE_775 is not set
+# CONFIG_NLS_CODEPAGE_850 is not set
+# CONFIG_NLS_CODEPAGE_852 is not set
+# CONFIG_NLS_CODEPAGE_855 is not set
+# CONFIG_NLS_CODEPAGE_857 is not set
+# CONFIG_NLS_CODEPAGE_860 is not set
+# CONFIG_NLS_CODEPAGE_861 is not set
+# CONFIG_NLS_CODEPAGE_862 is not set
+# CONFIG_NLS_CODEPAGE_863 is not set
+# CONFIG_NLS_CODEPAGE_864 is not set
+# CONFIG_NLS_CODEPAGE_865 is not set
+# CONFIG_NLS_CODEPAGE_866 is not set
+# CONFIG_NLS_CODEPAGE_869 is not set
+# CONFIG_NLS_CODEPAGE_936 is not set
+# CONFIG_NLS_CODEPAGE_950 is not set
+# CONFIG_NLS_CODEPAGE_932 is not set
+# CONFIG_NLS_CODEPAGE_949 is not set
+# CONFIG_NLS_CODEPAGE_874 is not set
+# CONFIG_NLS_ISO8859_8 is not set
+# CONFIG_NLS_CODEPAGE_1250 is not set
+# CONFIG_NLS_CODEPAGE_1251 is not set
+# CONFIG_NLS_ASCII is not set
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_NLS_ISO8859_2 is not set
+# CONFIG_NLS_ISO8859_3 is not set
+# CONFIG_NLS_ISO8859_4 is not set
+# CONFIG_NLS_ISO8859_5 is not set
+# CONFIG_NLS_ISO8859_6 is not set
+# CONFIG_NLS_ISO8859_7 is not set
+# CONFIG_NLS_ISO8859_9 is not set
+# CONFIG_NLS_ISO8859_13 is not set
+# CONFIG_NLS_ISO8859_14 is not set
+# CONFIG_NLS_ISO8859_15 is not set
+# CONFIG_NLS_KOI8_R is not set
+# CONFIG_NLS_KOI8_U is not set
+# CONFIG_NLS_UTF8 is not set
+
+#
+# Profiling support
+#
+# CONFIG_PROFILING is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_FRAME_POINTER=y
+CONFIG_EARLY_PRINTK=y
+# CONFIG_4KSTACKS is not set
+CONFIG_X86_FIND_SMP_CONFIG=y
+CONFIG_X86_MPPARSE=y
+
+#
+# Security options
+#
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+CONFIG_CRYPTO=y
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_MD4=y
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+# CONFIG_CRYPTO_WP512 is not set
+CONFIG_CRYPTO_DES=y
+CONFIG_CRYPTO_BLOWFISH=y
+CONFIG_CRYPTO_TWOFISH=y
+CONFIG_CRYPTO_SERPENT=y
+# CONFIG_CRYPTO_AES_586 is not set
+CONFIG_CRYPTO_CAST5=y
+CONFIG_CRYPTO_CAST6=y
+# CONFIG_CRYPTO_TEA is not set
+# CONFIG_CRYPTO_ARC4 is not set
+# CONFIG_CRYPTO_KHAZAD is not set
+CONFIG_CRYPTO_DEFLATE=y
+# CONFIG_CRYPTO_MICHAEL_MIC is not set
+# CONFIG_CRYPTO_CRC32C is not set
+# CONFIG_CRYPTO_TEST is not set
+
+#
+# Library routines
+#
+CONFIG_CRC_CCITT=m
+CONFIG_CRC32=m
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_X86_SMP=y
+CONFIG_X86_HT=y
+CONFIG_X86_BIOS_REBOOT=y
+CONFIG_X86_TRAMPOLINE=y
+CONFIG_PC=y
Index: configs/kernel/linux-2.6.9-i686.config
===================================================================
--- configs/kernel/linux-2.6.9-i686.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ configs/kernel/linux-2.6.9-i686.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+linux-2.6.1-i686-inspiron-8000
Index: configs/kernel/linux-2.6.9-x86_64.config
===================================================================
--- configs/kernel/linux-2.6.9-x86_64.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ configs/kernel/linux-2.6.9-x86_64.config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+linux-2.6.8.1-x86_64.config-K8VNXP
Index: configs/udev/udev-config-1.permissions
===================================================================
--- configs/udev/udev-config-1.permissions	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ configs/udev/udev-config-1.permissions	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,108 @@
+# /etc/udev/permissions.d/00-lfs.permissions: Permission definitions for LFS.
+# Syntax:
+#  <device>:<uid>:<gid>:<mode>
+
+# Character devices.
+
+ptmx:root:tty:0666
+random:root:root:0444
+urandom:root:root:0444
+kmem:root:kmem:0640
+mem:root:kmem:0640
+port:root:kmem:0640
+null:root:root:0666
+zero:root:root:0666
+full:root:root:0666
+aio:root:root:0444
+kmsg:root:root:0600
+
+rtc:root:root:0660
+
+ttyS[0-9]*:root:dialout:0660
+ttyUSB[0-9]*:root:dialout:0660
+rfcomm[0-9]*:root:dialout:0660
+tty[BCDEFHILMPRSTUVWX][0-9]*:root:dialout:0660
+ttyS[ACIR][0-9]*:root:dialout:0660
+ttyUSB[0-9]*:root:dialout:0660
+ttyACM[0-9]*:root:dialout:0660
+ippp[0-9]*:root:dialout:0660
+isdn[0-9]*:root:dialout:0660
+isdnctrl[0-9]*:root:dialout:0660
+capi[0-9.]*:root:dialout:0660
+dcbri[0-9]*:root:dialout:0660
+ircomm[0-9]*:root:dialout:0660
+
+tty:root:tty:0666
+tty[0-9]*:root:tty:0666
+vcs*:root:root:0600
+console:root:tty:0622
+
+snd/*:root:audio:0660
+admmidi*:root:audio:0660
+adsp*:root:audio:0660
+aload*:root:audio:0660
+amidi*:root:audio:0660
+amixer*:root:audio:0660
+audio*:root:audio:0660
+dmfm*:root:audio:0660
+dmmidi*:root:audio:0660
+dsp*:root:audio:0660
+midi*:root:audio:0660
+mixer*:root:audio:0660
+music:root:audio:0660
+sequencer*:root:audio:0660
+
+usb/lp[0-9]*:root:lp:0660
+lp[0-9]*:root:lp:0660
+parport[0-9]*:root:lp:0660
+irlpt[0-9]*:root:lp:0660
+usblp[0-9]*:root:lp:0660
+
+input/*:root:root:0644
+psaux:root:root0644
+js:root:root:0644
+djs:root:root:0644
+
+dri/card[0-9]*:root:video:0660
+fb[0-9]*:root:video:0620
+agpgart:root:video:0660
+
+video[0-9]*:root:video:0660
+radio[0-9]*:root:video:0660
+vbi[0-9]*:root:video:0660
+vtx[0-9]*:root:video:0660
+
+# Block devices.
+
+fd[0-9]*:root:floppy:0660
+
+ram[0-9]*:root:disk:0660
+raw[0-9]*:root:disk:0660
+
+hd*:root:disk:0660
+
+sd[a-z]:root:disk:0660
+sd[a-z][0-9]*:root:disk:0660
+sd[a-i][a-z]:root:disk:0660
+sd[a-i][a-z][0-9]*:root:disk:0660
+s[grt][0-9]*:root:disk:0660
+scd[0-9]*:root:cdrom:0660
+
+dasd[0-9]*:root:disk:0660
+ataraid[0-9]*:root:disk:0660
+
+loop[0-9]*:root:disk:0660
+md[0-9]*:root:disk:0660
+dm-*:root:disk:0640
+
+ht[0-9]*:root:tape:0660
+nht[0-9]*:root:tape:0660
+pt[0-9]*:root:tape:0660
+npt[0-9]*:root:tape:0660
+st[0-9]*:root:tape:0660
+nst[0-9]*:root:tape:0660
+
+sgi_fetchop:root:root:666
+iseries/vcd*:root:disk:660
+iseries/vd*:root:disk:660
+
Index: configs/udev/udev-config-1.rules
===================================================================
--- configs/udev/udev-config-1.rules	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ configs/udev/udev-config-1.rules	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,39 @@
+# /etc/udev/rules.d/00-lfs.rules: Rule definitions for LFS.
+
+# Create the /dev/cdrom symlink.
+BUS="ide", KERNEL="*[!0-9]", PROGRAM="/bin/cat /proc/ide/%k/media", RESULT="cdrom", NAME="%k", SYMLINK="cdrom"
+
+# DRI devices always go into a subdirectory (as per the LSB spec).
+KERNEL="card*",		NAME="dri/card%n"
+
+# ALSA devices get into /dev/snd/.
+KERNEL="controlC[0-9]*",NAME="snd/%k"
+KERNEL="hw[CD0-9]*",	NAME="snd/%k"
+KERNEL="pcm[CD0-9cp]*",	NAME="snd/%k"
+KERNEL="midiC[D0-9]*",	NAME="snd/%k"
+KERNEL="timer",		NAME="snd/%k"
+KERNEL="seq",		NAME="snd/%k"
+
+# Input core devices go into /dev/input/.
+KERNEL="mice",		NAME="input/%k"
+KERNEL="mouse*",	NAME="input/%k"
+KERNEL="event*",	NAME="input/%k"
+KERNEL="js*",		NAME="input/%k"
+KERNEL="ts*",		NAME="input/%k"
+
+# Assorted USB devices get a subdir as well.
+KERNEL="hiddev*",	NAME="usb/%k"
+KERNEL="auer*",		NAME="usb/%k"
+KERNEL="legousbtower*",	NAME="usb/%k"
+KERNEL="dabusb*",	NAME="usb/%k"
+BUS="usb", KERNEL="lp[0-9]*",	NAME="usb/%k"
+
+# CAPI devices
+KERNEL="capi",		NAME="capi20", SYMLINK="isdn/capi20"
+KERNEL="capi*",		NAME="capi/%n"
+
+# Network devices
+KERNEL="tun",		NAME="net/%k"
+
+# raw devices
+KERNEL="raw[0-9]*",	NAME="raw/%k" 
Index: configs/udev/udev-config-2.permissions
===================================================================
--- configs/udev/udev-config-2.permissions	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ configs/udev/udev-config-2.permissions	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,109 @@
+# /etc/udev/permissions.d/00-lfs.permissions: Permission definitions for LFS.
+# Syntax:
+#  <device>:<uid>:<gid>:<mode>
+
+# Character devices.
+
+ptmx:root:tty:0666
+random:root:root:0444
+urandom:root:root:0444
+kmem:root:kmem:0640
+mem:root:kmem:0640
+port:root:kmem:0640
+null:root:root:0666
+zero:root:root:0666
+full:root:root:0666
+aio:root:root:0444
+kmsg:root:root:0600
+
+rtc:root:root:0660
+
+ttyS[0-9]*:root:dialout:0660
+ttyUSB[0-9]*:root:dialout:0660
+rfcomm[0-9]*:root:dialout:0660
+tty[BCDEFHILMPRSTUVWX][0-9]*:root:dialout:0660
+ttyS[ACIR][0-9]*:root:dialout:0660
+ttyUSB[0-9]*:root:dialout:0660
+ttyACM[0-9]*:root:dialout:0660
+ippp[0-9]*:root:dialout:0660
+isdn[0-9]*:root:dialout:0660
+isdnctrl[0-9]*:root:dialout:0660
+capi[0-9.]*:root:dialout:0660
+dcbri[0-9]*:root:dialout:0660
+ircomm[0-9]*:root:dialout:0660
+
+tty:root:tty:0666
+tty[0-9]*:root:tty:0666
+vcs*:root:root:0600
+console:root:tty:0622
+
+snd/*:root:audio:0660
+admmidi*:root:audio:0660
+adsp*:root:audio:0660
+aload*:root:audio:0660
+amidi*:root:audio:0660
+amixer*:root:audio:0660
+audio*:root:audio:0660
+dmfm*:root:audio:0660
+dmmidi*:root:audio:0660
+dsp*:root:audio:0660
+midi*:root:audio:0660
+mixer*:root:audio:0660
+music:root:audio:0660
+sequencer*:root:audio:0660
+
+usb/lp[0-9]*:root:lp:0660
+lp[0-9]*:root:lp:0660
+parport[0-9]*:root:lp:0660
+irlpt[0-9]*:root:lp:0660
+
+input/*:root:root:0644
+psaux:root:root0644
+js:root:root:0644
+djs:root:root:0644
+
+dri/card[0-9]*:root:video:0660
+fb[0-9]*:root:video:0620
+agpgart:root:video:0660
+nvidia[0-9]*:root:video:0660
+nvidiactl:root:video:0660
+
+video[0-9]*:root:video:0660
+radio[0-9]*:root:video:0660
+vbi[0-9]*:root:video:0660
+vtx[0-9]*:root:video:0660
+
+# Block devices.
+
+fd[0-9]*:root:floppy:0660
+
+ram[0-9]*:root:disk:0660
+raw[0-9]*:root:disk:0660
+
+hd*:root:disk:0660
+
+sd[a-z]:root:disk:0660
+sd[a-z][0-9]*:root:disk:0660
+sd[a-i][a-z]:root:disk:0660
+sd[a-i][a-z][0-9]*:root:disk:0660
+s[grt][0-9]*:root:disk:0660
+scd[0-9]*:root:cdrom:0660
+
+dasd[0-9]*:root:disk:0660
+ataraid[0-9]*:root:disk:0660
+
+loop[0-9]*:root:disk:0660
+md[0-9]*:root:disk:0660
+dm-*:root:disk:0640
+
+ht[0-9]*:root:tape:0660
+nht[0-9]*:root:tape:0660
+pt[0-9]*:root:tape:0660
+npt[0-9]*:root:tape:0660
+st[0-9]*:root:tape:0660
+nst[0-9]*:root:tape:0660
+
+sgi_fetchop:root:root:666
+iseries/vcd*:root:disk:660
+iseries/vd*:root:disk:660
+
Index: configs/udev/udev-config-3.rules
===================================================================
--- configs/udev/udev-config-3.rules	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ configs/udev/udev-config-3.rules	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,140 @@
+# /etc/udev/rules.d/25-lfs.rules: Rule definitions for LFS.
+
+# Create the /dev/cdrom symlink.
+
+BUS="ide", KERNEL="*[!0-9]", PROGRAM="/bin/cat /proc/ide/%k/media", RESULT="cdrom", NAME="%k", SYMLINK="cdrom"
+
+# Core kernel devices
+
+KERNEL="ptmx",    GROUP="tty",  MODE="0666"
+KERNEL="random",                MODE="0444"
+KERNEL="urandom",               MODE="0444"
+KERNEL="kmem",    GROUP="kmem", MODE="0640"
+KERNEL="mem",     GROUP="kmem", MODE="0640"
+KERNEL="port",    GROUP="kmem", MODE="0640"
+KERNEL="null",                  MODE="0666"
+KERNEL="zero",                  MODE="0666"
+KERNEL="full",                  MODE="0666"
+KERNEL="aio",                   MODE="0444"
+KERNEL="kmsg",                  MODE="0600"
+KERNEL="rtc",                   MODE="0666"
+
+# Comms devices
+
+KERNEL="ttyS[0-9]*",                   GROUP="dialout"
+KERNEL="ttyUSB[0-9]*",                 GROUP="dialout"
+KERNEL="rfcomm[0-9]*",                 GROUP="dialout"
+KERNEL="tty[BCDEFHILMPRSTUVWX][0-9]*", GROUP="dialout"
+KERNEL="ttyS[ACIR][0-9]*",             GROUP="dialout"
+KERNEL="ttyUSB[0-9]*",                 GROUP="dialout"
+KERNEL="ttyACM[0-9]*",                 GROUP="dialout"
+KERNEL="ippp[0-9]*",                   GROUP="dialout"
+KERNEL="isdn[0-9]*",                   GROUP="dialout"
+KERNEL="isdnctrl[0-9]*",               GROUP="dialout"
+KERNEL="capi",         NAME="capi20",  SYMLINK="isdn/capi20"
+KERNEL="capi*",        NAME="capi/%n", GROUP="dialout"
+KERNEL="dcbri[0-9]*",                  GROUP="dialout"
+KERNEL="ircomm[0-9]*",                 GROUP="dialout"
+
+# TTY's
+
+KERNEL="tty",       GROUP="tty", MODE="0666"
+KERNEL="tty[0-9]*", GROUP="tty", MODE="0666"
+KERNEL="vcs*",                   MODE="0600"
+KERNEL="console",   GROUP="tty", MODE="0622"
+
+# ALSA devices go in their own subdirectory
+
+KERNEL="controlC[0-9]*", NAME="snd/%k", GROUP="audio"
+KERNEL="hw[CD0-9]*",	 NAME="snd/%k", GROUP="audio"
+KERNEL="pcm[CD0-9cp]*",  NAME="snd/%k", GROUP="audio"
+KERNEL="midiC[D0-9]*",	 NAME="snd/%k", GROUP="audio"
+KERNEL="timer",		     NAME="snd/%k", GROUP="audio"
+KERNEL="seq",		     NAME="snd/%k", GROUP="audio"
+
+# Sound devices
+
+KERNEL="admmidi*",                      GROUP="audio"
+KERNEL="adsp*",                         GROUP="audio"
+KERNEL="aload*",                        GROUP="audio"
+KERNEL="amidi*",                        GROUP="audio"
+KERNEL="amixer*",                       GROUP="audio"
+KERNEL="audio*",                        GROUP="audio"
+KERNEL="dmfm*",                         GROUP="audio"
+KERNEL="dmmidi*",                       GROUP="audio"
+KERNEL="dsp*",                          GROUP="audio"
+KERNEL="midi*",                         GROUP="audio"
+KERNEL="mixer*",                        GROUP="audio"
+KERNEL="music",                         GROUP="audio"
+KERNEL="sequencer*",                    GROUP="audio"
+
+# Printing devices
+
+KERNEL="lp[0-9]*",      GROUP="lp"
+KERNEL="parport[0-9]*", GROUP="lp"
+KERNEL="irlpt[0-9]*",   GROUP="lp"
+
+# Input devices go in their own subdirectory
+
+KERNEL="mice",		NAME="input/%k", MODE="0644"
+KERNEL="mouse*",	NAME="input/%k", MODE="0644", SYMLINK="mouse"
+KERNEL="event*",	NAME="input/%k", MODE="0644"
+KERNEL="js*",		NAME="input/%k", MODE="0644"
+KERNEL="ts*",		NAME="input/%k", MODE="0644"
+
+KERNEL="psaux",                      MODE="0644"
+KERNEL="js",                         MODE="0644"
+KERNEL="djs",                        MODE="0644"
+
+# USB devices go in their own subdirectory
+
+KERNEL="hiddev*",       NAME="usb/%k"
+KERNEL="auer*",		    NAME="usb/%k"
+KERNEL="legousbtower*", NAME="usb/%k"
+KERNEL="dabusb*",       NAME="usb/%k"
+BUS="usb", KERNEL="lp[0-9]*", NAME="usb/%k", GROUP="lp"
+
+# DRI devices go in their own subdirectory for FHS compliance
+
+KERNEL="card*",          NAME="dri/card%n", GROUP="video"
+
+# Video devices
+
+KERNEL="fb[0-9]*",     GROUP="video", MODE="0620"
+KERNEL="agpgart",      GROUP="video"
+KERNEL="nvidia[0-9]*", GROUP="video"
+KERNEL="nvidiactl",    GROUP="video"
+KERNEL="video[0-9]*",  GROUP="video"
+KERNEL="radio[0-9]*",  GROUP="video"
+KERNEL="vbi[0-9]*",    GROUP="video"
+KERNEL="vtx[0-9]*",    GROUP="video"
+
+# Storage/memory devices
+
+KERNEL="fd[0-9]*",                 GROUP="floppy"
+KERNEL="ram[0-9]*",                GROUP="disk"
+KERNEL="raw[0-9]*", NAME="raw/%k", GROUP="disk"
+KERNEL="hd*",                      GROUP="disk"
+KERNEL="sd[a-z]",                  GROUP="disk"
+KERNEL="sd[a-z][0-9]*",            GROUP="disk"
+KERNEL="sd[a-i][a-z]",             GROUP="disk"
+KERNEL="sd[a-i][a-z][0-9]*",       GROUP="disk"
+KERNEL="s[grt][0-9]*",             GROUP="disk"
+KERNEL="scd[0-9]*",                GROUP="cdrom"
+KERNEL="dasd[0-9]*",               GROUP="disk"
+KERNEL="ataraid[0-9]*",            GROUP="disk"
+KERNEL="loop[0-9]*",               GROUP="disk"
+KERNEL="md[0-9]*",                 GROUP="disk"
+KERNEL="dm-*",                     GROUP="disk",   MODE="0640"
+KERNEL="ht[0-9]*",                 GROUP="tape"
+KERNEL="nht[0-9]*",                GROUP="tape"
+KERNEL="pt[0-9]*",                 GROUP="tape"
+KERNEL="npt[0-9]*",                GROUP="tape"
+KERNEL="st[0-9]*",                 GROUP="tape"
+KERNEL="nst[0-9]*",                GROUP="tape"
+KERNEL="iseries/vcd*",             GROUP="disk"
+KERNEL="iseries/vd*",              GROUP="disk"
+
+# Network devices
+
+KERNEL="tun", NAME="net/%k"
Index: patches/Linux-PAM-0.77-linkage-3.patch
===================================================================
--- patches/Linux-PAM-0.77-linkage-3.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/Linux-PAM-0.77-linkage-3.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,56 @@
+Submitted By: DJ Lucas (dj_AT_lucasit_DOT_com)
+Date: 2004-05-03
+Initial Package Version: 0.77
+Origin: Mandrake CVS (Jim Gifford) + cracklib source
+Description: Fixes linking on PAM and updates cracklib check
+
+$LastChangedBy: bdubbs $
+$Date: 2004-08-07 18:56:30 -0600 (Sat, 07 Aug 2004) $
+
+diff -Naur Linux-PAM-0.77-orig/configure.in Linux-PAM-0.77/configure.in
+--- Linux-PAM-0.77-orig/configure.in	2002-07-09 01:17:13.000000000 -0500
++++ Linux-PAM-0.77/configure.in	2004-04-30 17:06:17.000000000 -0500
+@@ -257,7 +257,7 @@
+ 
+ dnl Look for cracklib dictionary
+ AC_MSG_CHECKING(path to cracklib dictionary)
+-DICT_DIR_CANDIDATES="/usr/lib /usr/share/dict /usr/share/lib \
++DICT_DIR_CANDIDATES="/lib /usr/lib /usr/share/dict /usr/share/lib \
+   /usr/local/lib /usr/local/share/lib"
+ DICT_FILE_CANDIDATES="pw_dict cracklib_dict"
+ CRACKLIB_DICTPATH=""
+diff -Naur Linux-PAM-0.77-orig/libpam_misc/Makefile Linux-PAM-0.77/libpam_misc/Makefile
+--- Linux-PAM-0.77-orig/libpam_misc/Makefile	2002-06-26 23:04:54.000000000 -0500
++++ Linux-PAM-0.77/libpam_misc/Makefile	2004-04-30 17:02:54.000000000 -0500
+@@ -38,6 +38,8 @@
+ SLIBOBJECTS = $(addprefix static/,$(LIBOBJECTS))
+ endif
+ 
++LINKLIBS += -L../libpam -lpam
++
+ # ---------------------------------------------
+ ## rules
+ 
+diff -Naur Linux-PAM-0.77-orig/modules/pam_cracklib/pam_cracklib.c Linux-PAM-0.77/modules/pam_cracklib/pam_cracklib.c
+--- Linux-PAM-0.77-orig/modules/pam_cracklib/pam_cracklib.c	2001-11-27 00:09:48.000000000 -0600
++++ Linux-PAM-0.77/modules/pam_cracklib/pam_cracklib.c	2004-04-30 17:04:05.000000000 -0500
+@@ -49,8 +49,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <ctype.h>
+-
+-extern char *FascistCheck(char *pw, const char *dictpath);
++#include <crack.h>
+ 
+ #ifndef CRACKLIB_DICTPATH
+ #define CRACKLIB_DICTPATH "/usr/share/dict/cracklib_dict"
+diff -Naur Linux-PAM-0.77-orig/modules/pam_lastlog/Makefile Linux-PAM-0.77/modules/pam_lastlog/Makefile
+--- Linux-PAM-0.77-orig/modules/pam_lastlog/Makefile	2001-02-10 16:33:10.000000000 -0600
++++ Linux-PAM-0.77/modules/pam_lastlog/Makefile	2004-04-30 17:02:54.000000000 -0500
+@@ -15,5 +15,6 @@
+ endif
+ 
+ TITLE=pam_lastlog
++MODULE_SIMPLE_EXTRALIBS=-lutil
+ 
+ include ../Simple.Rules
Index: patches/X11R6.8.1-IncludeSharedObjectInNormalLib-1.patch
===================================================================
--- patches/X11R6.8.1-IncludeSharedObjectInNormalLib-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/X11R6.8.1-IncludeSharedObjectInNormalLib-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,57 @@
+Submitted By: Ryan Oliver <ryan.oliver@pha.com.au
+Date: 2005-01-23
+Initial Package Version: XFree 4.2.99
+Upstream Status: Unknown
+Origin: Gentoo 
+Description: Ensures objects archived in static libs get built with -fPIC 
+	A notable barf is when building libaudio (NAS) linking against
+	libXau.a
+
+--- xc/lib/Xau/Imakefile.IncludeSharedObjectInNormalLib	2001-01-17 14:42:24.000000000 -0500
++++ xc/lib/Xau/Imakefile	2003-01-29 02:25:49.000000000 -0500
+@@ -37,6 +37,8 @@
+ OBJS =	AuDispose.o AuFileName.o AuGetAddr.o AuGetBest.o AuLock.o \
+ 	AuRead.o AuUnlock.o AuWrite.o $(K5ENCOBJ)
+ 
++#define IncludeSharedObjectInNormalLib
++
+ #include <Library.tmpl>
+ 
+ DependTarget()
+--- xc/lib/xkbfile/Imakefile.IncludeSharedObjectInNormalLib	2001-08-27 13:40:59.000000000 -0400
++++ xc/lib/xkbfile/Imakefile	2003-01-29 02:25:49.000000000 -0500
+@@ -34,6 +34,8 @@
+ 
+ ROOT_DEFINES = -DDFLT_XKB_CONFIG_ROOT=\"$(LIBDIR)/xkb\"
+ 
++#define IncludeSharedObjectInNormalLib
++
+ #include <Library.tmpl>
+ 
+ DependTarget()
+--- xc/lib/xkbui/Imakefile.IncludeSharedObjectInNormalLib	1999-03-13 22:21:21.000000000 -0500
++++ xc/lib/xkbui/Imakefile	2003-01-29 02:25:49.000000000 -0500
+@@ -15,6 +15,8 @@
+          HEADERS = XKBui.h
+         INCLUDES = -I. -I$(EXTINCSRC) -I../xkbfile
+ 
++#define IncludeSharedObjectInNormalLib
++
+ #include <Library.tmpl>
+ 
+ DependTarget()
+--- xc/programs/Xserver/hw/xfree86/parser/Imakefile.IncludeSharedObjectInNormalLib	2003-01-29 02:41:13.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/parser/Imakefile	2003-01-29 02:41:53.000000000 -0500
+@@ -36,9 +36,11 @@
+ 		 -DXCONFIGFILE=\"$(XCONFIGFILE)\" \
+ 		 -DXVERSION="$(XVERS)"
+ 
++#define IncludeSharedObjectInNormalLib
++
+ #include <Library.tmpl>
+ 
+-SpecialCObjectRule(scan,NullParameter,$(CONFIG_DEFINES) $(MODULEDEFINES) $(EXT_DEFINES))
++SpecialCObjectRule(scan,NullParameter,$(CONFIG_DEFINES) $(MODULEDEFINES) $(EXT_DEFINES) $(PICFLAGS))
+ 
+ NormalProgramTarget(cpconfig,cpconfig.o $(OBJS),NullParameter,$(LOCAL_LIBRARIES),NullParameter)
+ 
Index: patches/X11R6.8.1-fix_shared_libXau_link-1.patch
===================================================================
--- patches/X11R6.8.1-fix_shared_libXau_link-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/X11R6.8.1-fix_shared_libXau_link-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,27 @@
+Submitted By: Ryan Oliver <ryan.oliver@pha.com.au>
+Date: 2005-01-23
+Initial Package Version: XFree 4.2.1
+Upstream Status: Unknown
+Origin: Gentoo
+Description: If building servers and SharedLibXau is defined, 
+	always build libXau by adding it to EXTRASYSLIBS
+
+--- xc/programs/Xserver/Imakefile.orig	2002-12-01 19:07:44.000000000 +0200
++++ xc/programs/Xserver/Imakefile	2002-12-01 19:10:26.000000000 +0200
+@@ -276,8 +276,16 @@
+             USB = UsbHidLib
+ #endif
+ #endif
+ #ifdef ServerExtraSysLibs
++# if SharedLibXau
++   EXTRASYSLIBS = ServerExtraSysLibs $(XAUTHLIB)
++# else
+    EXTRASYSLIBS = ServerExtraSysLibs
++# endif
++#else
++# if SharedLibXau
++   EXTRASYSLIBS = $(XAUTHLIB)
++# endif
+ #endif
+ #if HasPam && HasPamMisc
+         PAMLIBS = PamLibraries PamMiscLibraries
Index: tches/aboot-0.9b-fixes-5.patch
===================================================================
--- patches/aboot-0.9b-fixes-5.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,5611 +1,0 @@
-Submitted By: Joe Ciccone <jciccone@gmail.com>
-Date: 2007-01-01
-Initial Package Version: 0.9b
-Upstream Status: NONE
-Origin: Joe Ciccone
-Description: This patch fixes compilation issues with by creating a basic set
-             of kernel headers as well as a few changes that needed to be made
-             to the code so that it compiles with more modern compilers. A
-             common makefile with variables was also added.
-
-diff -Naur aboot-0.9b.orig/Makefile aboot-0.9b/Makefile
---- aboot-0.9b.orig/Makefile	2002-09-18 15:48:21.000000000 -0400
-+++ aboot-0.9b/Makefile	2008-01-02 13:54:25.000000000 -0500
-@@ -8,10 +8,7 @@
- # Copyright (c) 1995, 1996 by David Mosberger (davidm@cs.arizona.edu)
- #
- 
--# location of linux kernel sources (must be absolute path):
--KSRC		= /usr/src/linux
--VMLINUX		= $(KSRC)/vmlinux
--VMLINUXGZ	= $(KSRC)/arch/alpha/boot/vmlinux.gz
-+include Makefile.inc
- 
- # for userspace testing
- #TESTING	= yes
-@@ -19,12 +16,6 @@
- # for boot testing
- #CFGDEFS       	= -DDEBUG_ISO -DDEBUG_ROCK -DDEBUG
- 
--# root, aka prefix
--root		=
--bindir		= $(root)/sbin
--bootdir		= $(root)/boot
--mandir		= /usr/man
--
- #
- # There shouldn't be any need to change anything below this line.
- #
-@@ -32,13 +23,12 @@
- 
- ABOOT_LDFLAGS = -static -N -Taboot.lds
- 
--CC		= gcc
- TOP		= $(shell pwd)
- ifeq ($(TESTING),)
--CPPFLAGS	= $(CFGDEFS) -I$(TOP)/include -I$(KSRC)/include
-+CPPFLAGS	= $(CFGDEFS) -I$(TOP)/include
- CFLAGS		= $(CPPFLAGS) -D__KERNEL__ -mcpu=ev4 -Os -Wall -fno-builtin -mno-fp-regs -ffixed-8
- else
--CPPFLAGS	= -DTESTING $(CFGDEFS) -I$(TOP)/include -I$(KSRC)/include
-+CPPFLAGS	= -DTESTING $(CFGDEFS)
- CFLAGS		= $(CPPFLAGS) -O -g3 -Wall -D__KERNEL__ -ffixed-8
- endif
- ASFLAGS		= $(CPPFLAGS)
-@@ -66,35 +56,34 @@
- endif
- LIBS	= lib/libaboot.a
- 
-+all: tools/all sdisklabel/all lib/libaboot.a all-local
-+
- ifeq ($(TESTING),)
--all:	diskboot
-+all-local: diskboot
- else
--all:	aboot
-+all-local: aboot
- endif
- 
- diskboot:	bootlx sdisklabel/sdisklabel sdisklabel/swriteboot \
- 		tools/e2writeboot tools/isomarkboot tools/abootconf \
- 		tools/elfencap
- 
--netboot: vmlinux.bootp
--
- bootlx:	aboot tools/objstrip
- 	tools/objstrip -vb aboot bootlx
- 
- install-man: 
--	make -C doc/man install
-+	$(MAKE) -C doc/man install
- 
- install-man-gz:
--	make -C doc/man install-gz
-+	$(MAKE) -C doc/man install-gz
- 
--install: tools/abootconf tools/e2writeboot tools/isomarkboot \
--	sdisklabel/swriteboot install-man
--	install -d $(bindir) $(bootdir)
--	install -c -s tools/abootconf $(bindir)
--	install -c -s tools/e2writeboot $(bindir)
--	install -c -s tools/isomarkboot $(bindir)
--	install -c -s sdisklabel/swriteboot $(bindir)
--	install -c bootlx $(bootdir)
-+install: tools/abootconf tools/e2writeboot tools/isomarkboot sdisklabel/swriteboot install-man
-+	install -d $(DESTDIR)$(BINDIR) $(DESTDIR)$(BOOTDIR)
-+	install -c tools/abootconf $(DESTDIR)$(BINDIR)
-+	install -c tools/e2writeboot $(DESTDIR)$(BINDIR)
-+	install -c tools/isomarkboot $(DESTDIR)$(BINDIR)
-+	install -c sdisklabel/swriteboot $(DESTDIR)$(BINDIR)
-+	install -c bootlx $(DESTDIR)$(BOOTDIR)
- 
- installondisk:	bootlx sdisklabel/swriteboot
- 	sdisklabel/swriteboot -vf0 /dev/sda bootlx vmlinux.gz
-@@ -107,9 +96,6 @@
- 	$(CC) $(ABOOT_OBJS) $(DISK_OBJS) -o $@ $(LIBS)
- endif
- 
--vmlinux.bootp: net_aboot.nh $(VMLINUXGZ) net_pad
--	cat net_aboot.nh $(VMLINUXGZ) net_pad > $@
--
- net_aboot.nh: net_aboot tools/objstrip
- 	tools/objstrip -vb net_aboot $@
- 
-@@ -120,26 +106,19 @@
- 	dd if=/dev/zero of=$@ bs=512 count=1
- 
- clean:	sdisklabel/clean tools/clean lib/clean
--	rm -f aboot abootconf net_aboot net_aboot.nh net_pad vmlinux.bootp \
--		$(ABOOT_OBJS) $(DISK_OBJS) $(NET_OBJS) bootlx \
--		include/ksize.h vmlinux.nh
-+	rm -f aboot abootconf net_aboot net_aboot.nh net_pad \
-+		$(ABOOT_OBJS) $(DISK_OBJS) $(NET_OBJS) bootlx
- 
- distclean: clean
- 	find . -name \*~ | xargs rm -f
- 
- lib/%:
--	make -C lib $* CPPFLAGS="$(CPPFLAGS)" TESTING="$(TESTING)"
-+	$(MAKE) -C lib $* CPPFLAGS="$(CPPFLAGS)" TESTING="$(TESTING)"
- 
- tools/%:
--	make -C tools $* CPPFLAGS="$(CPPFLAGS)"
-+	$(MAKE) -C tools $* CPPFLAGS="$(CPPFLAGS)"
- 
- sdisklabel/%:
--	make -C sdisklabel $* CPPFLAGS="$(CPPFLAGS)"
--
--vmlinux.nh: $(VMLINUX) tools/objstrip
--	tools/objstrip -vb $(VMLINUX) vmlinux.nh
--
--include/ksize.h: vmlinux.nh
--	echo "#define KERNEL_SIZE `ls -l vmlinux.nh | awk '{print $$5}'` > $@
-+	$(MAKE) -C sdisklabel $* CPPFLAGS="$(CPPFLAGS)"
- 
- dep:
-diff -Naur aboot-0.9b.orig/Makefile.inc aboot-0.9b/Makefile.inc
---- aboot-0.9b.orig/Makefile.inc	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/Makefile.inc	2008-01-02 13:55:10.000000000 -0500
-@@ -0,0 +1,16 @@
-+DESTDIR		=
-+PREFIX		= /usr
-+EXEC_PREFIX	= $(PREFIX)
-+BINDIR		= /sbin
-+BOOTDIR		= /boot
-+MANDIR		= $(PREFIX)/man
-+MAN5		= $(MANDIR)/man5
-+MAN8		= $(MANDIR)/man8
-+
-+CROSS_COMPILE	= 
-+
-+HOST_CC		= gcc
-+CC		= $(CROSS_COMPILE)gcc
-+AS		= $(CROSS_COMPILE)as
-+LD		= $(CROSS_COMPILE)ld
-+AR		= $(CROSS_COMPILE)ar
-diff -Naur aboot-0.9b.orig/aboot.c aboot-0.9b/aboot.c
---- aboot-0.9b.orig/aboot.c	2001-10-12 02:04:06.000000000 -0400
-+++ aboot-0.9b/aboot.c	2008-01-02 13:53:15.000000000 -0500
-@@ -90,7 +90,7 @@
- 	elf  = (struct elfhdr *) buf;
- 	
- 	if (elf->e_ident[0] == 0x7f
--	    && strncmp(elf->e_ident + 1, "ELF", 3) == 0)
-+	    && strncmp((char *)elf->e_ident + 1, "ELF", 3) == 0)
- 	{
- 		int i;
- 		/* looks like an ELF binary: */
-diff -Naur aboot-0.9b.orig/cons.c aboot-0.9b/cons.c
---- aboot-0.9b.orig/cons.c	2001-10-08 19:03:50.000000000 -0400
-+++ aboot-0.9b/cons.c	2008-01-02 13:53:15.000000000 -0500
-@@ -12,7 +12,7 @@
- #include <utils.h>
- 
- long cons_dev;			/* console device */
--extern long int dispatch();	/* Need the full 64 bit return here...*/
-+//extern long int dispatch();	/* Need the full 64 bit return here...*/
- 
- long
- cons_puts(const char *str, long len)
-diff -Naur aboot-0.9b.orig/disk.c aboot-0.9b/disk.c
---- aboot-0.9b.orig/disk.c	2001-10-09 16:45:57.000000000 -0400
-+++ aboot-0.9b/disk.c	2008-01-02 13:53:15.000000000 -0500
-@@ -121,7 +121,7 @@
- 	buf = malloc(bfs->blocksize);
- 
- 	/* read ELF headers: */
--	nread = (*bfs->bread)(fd, 0, 1, buf);
-+	nread = (*bfs->bread)(fd, 0, 1, (char *)buf);
- 	if (nread != bfs->blocksize) {
- 		printf("aboot: read returned %ld instead of %ld bytes\n",
- 		       nread, sizeof(buf));
-@@ -142,7 +142,7 @@
- 		}
- 	}
- #endif
--	if (first_block(buf, bfs->blocksize) < 0) {
-+	if (first_block((char *)buf, bfs->blocksize) < 0) {
- 		return -1;
- 	}
- 
-@@ -481,8 +481,6 @@
- 					*d++ = *p;
- 				}
- 				break;
--
--			      default:
- 			}
- 			p++;
- 		}
-diff -Naur aboot-0.9b.orig/doc/man/Makefile aboot-0.9b/doc/man/Makefile
---- aboot-0.9b.orig/doc/man/Makefile	2003-01-14 15:12:14.000000000 -0500
-+++ aboot-0.9b/doc/man/Makefile	2008-01-02 13:53:15.000000000 -0500
-@@ -5,22 +5,16 @@
- # if this is a recursive make, and mandir was set in the top-level Makefile,
- # use that value. Otherwise default to /usr/man.
- 
--ifeq ($(mandir),)
--MANDIR=/usr/man
--else
--MANDIR=$(mandir)
--endif
--MAN5=$(MANDIR)/man5
--MAN8=$(MANDIR)/man8
-+include ../../Makefile.inc
- 
--default: 
-+all:
- 
- install: 
--	install -d $(MAN5) $(MAN8)
--	install -c aboot.conf.5 $(MAN5)
--	install -c aboot.8 abootconf.8 e2writeboot.8 swriteboot.8 $(MAN8)	
--install-gz: install
--	gzip -f9 $(MAN5)/aboot.conf.5
--	gzip -f9 $(MAN8)/aboot.8 $(MAN8)/abootconf.8 $(MAN8)/e2writeboot.8 \
--		 $(MAN8)/swriteboot.8
--install-gzip: install-gz
-+	install -d $(DESTDIR)$(MAN5) $(DESTDIR)$(MAN8)
-+	install -c aboot.conf.5 $(DESTDIR)$(MAN5)
-+	install -c aboot.8 abootconf.8 e2writeboot.8 swriteboot.8 $(DESTDIR)$(MAN8)	
-+
-+install-gz install-gzip: install
-+	gzip -f9 $(DESTDIR)$(MAN5)/aboot.conf.5
-+	gzip -f9 $(DESTDIR)$(MAN8)/aboot.8 $(DESTDIR)$(MAN8)/abootconf.8 $(DESTDIR)$(MAN8)/e2writeboot.8 \
-+		 $(DESTDIR)$(MAN8)/swriteboot.8
-diff -Naur aboot-0.9b.orig/fs/ufs.c aboot-0.9b/fs/ufs.c
---- aboot-0.9b.orig/fs/ufs.c	2001-10-08 19:03:52.000000000 -0400
-+++ aboot-0.9b/fs/ufs.c	2008-01-02 13:53:15.000000000 -0500
-@@ -361,7 +361,7 @@
- 		return -1;
- 	}
- 
--	component = strtok(namebuf, "/");
-+	component = strtok((char *)namebuf, "/");
- 	while (component) {
- 		/* verify that current node is a directory: */
- 		if ((fp->i_mode & IFMT) != IFDIR) {
-diff -Naur aboot-0.9b.orig/head.S aboot-0.9b/head.S
---- aboot-0.9b.orig/head.S	2001-10-08 19:03:51.000000000 -0400
-+++ aboot-0.9b/head.S	2008-01-02 13:53:15.000000000 -0500
-@@ -170,4 +170,5 @@
- 	mov	$16,$27
- 	mov	$17,$30
- 	jmp	$31,($27)
--	.end run_kernel
-\ No newline at end of file
-+	.end run_kernel
-+
-diff -Naur aboot-0.9b.orig/include/asm/a.out.h aboot-0.9b/include/asm/a.out.h
---- aboot-0.9b.orig/include/asm/a.out.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/asm/a.out.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,92 @@
-+#ifndef __ALPHA_A_OUT_H__
-+#define __ALPHA_A_OUT_H__
-+
-+#include <linux/types.h>
-+
-+/*
-+ * OSF/1 ECOFF header structs.  ECOFF files consist of:
-+ * 	- a file header (struct filehdr),
-+ *	- an a.out header (struct aouthdr),
-+ *	- one or more section headers (struct scnhdr). 
-+ *	  The filhdr's "f_nscns" field contains the
-+ *	  number of section headers.
-+ */
-+
-+struct filehdr
-+{
-+	/* OSF/1 "file" header */
-+	__u16 f_magic, f_nscns;
-+	__u32 f_timdat;
-+	__u64 f_symptr;
-+	__u32 f_nsyms;
-+	__u16 f_opthdr, f_flags;
-+};
-+
-+struct aouthdr
-+{
-+	__u64 info;		/* after that it looks quite normal.. */
-+	__u64 tsize;
-+	__u64 dsize;
-+	__u64 bsize;
-+	__u64 entry;
-+	__u64 text_start;	/* with a few additions that actually make sense */
-+	__u64 data_start;
-+	__u64 bss_start;
-+	__u32 gprmask, fprmask;	/* bitmask of general & floating point regs used in binary */
-+	__u64 gpvalue;
-+};
-+
-+struct scnhdr
-+{
-+	char	s_name[8];
-+	__u64	s_paddr;
-+	__u64	s_vaddr;
-+	__u64	s_size;
-+	__u64	s_scnptr;
-+	__u64	s_relptr;
-+	__u64	s_lnnoptr;
-+	__u16	s_nreloc;
-+	__u16	s_nlnno;
-+	__u32	s_flags;
-+};
-+
-+struct exec
-+{
-+	/* OSF/1 "file" header */
-+	struct filehdr		fh;
-+	struct aouthdr		ah;
-+};
-+
-+/*
-+ * Define's so that the kernel exec code can access the a.out header
-+ * fields...
-+ */
-+#define	a_info		ah.info
-+#define	a_text		ah.tsize
-+#define a_data		ah.dsize
-+#define a_bss		ah.bsize
-+#define a_entry		ah.entry
-+#define a_textstart	ah.text_start
-+#define	a_datastart	ah.data_start
-+#define	a_bssstart	ah.bss_start
-+#define	a_gprmask	ah.gprmask
-+#define a_fprmask	ah.fprmask
-+#define a_gpvalue	ah.gpvalue
-+
-+#define N_TXTADDR(x) ((x).a_textstart)
-+#define N_DATADDR(x) ((x).a_datastart)
-+#define N_BSSADDR(x) ((x).a_bssstart)
-+#define N_DRSIZE(x) 0
-+#define N_TRSIZE(x) 0
-+#define N_SYMSIZE(x) 0
-+
-+#define AOUTHSZ		sizeof(struct aouthdr)
-+#define SCNHSZ		sizeof(struct scnhdr)
-+#define SCNROUND	16
-+
-+#define N_TXTOFF(x) \
-+  ((long) N_MAGIC(x) == ZMAGIC ? 0 : \
-+   (sizeof(struct exec) + (x).fh.f_nscns*SCNHSZ + SCNROUND - 1) & ~(SCNROUND - 1))
-+
-+
-+#endif /* __A_OUT_GNU_H__ */
-diff -Naur aboot-0.9b.orig/include/asm/auxvec.h aboot-0.9b/include/asm/auxvec.h
---- aboot-0.9b.orig/include/asm/auxvec.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/asm/auxvec.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,24 @@
-+#ifndef __ASM_ALPHA_AUXVEC_H
-+#define __ASM_ALPHA_AUXVEC_H
-+
-+/* Reserve these numbers for any future use of a VDSO.  */
-+#if 0
-+#define AT_SYSINFO		32
-+#define AT_SYSINFO_EHDR		33
-+#endif
-+
-+/* More complete cache descriptions than AT_[DIU]CACHEBSIZE.  If the
-+   value is -1, then the cache doesn't exist.  Otherwise:
-+
-+      bit 0-3:	  Cache set-associativity; 0 means fully associative.
-+      bit 4-7:	  Log2 of cacheline size.
-+      bit 8-31:	  Size of the entire cache >> 8.
-+      bit 32-63:  Reserved.
-+*/
-+
-+#define AT_L1I_CACHESHAPE	34
-+#define AT_L1D_CACHESHAPE	35
-+#define AT_L2_CACHESHAPE	36
-+#define AT_L3_CACHESHAPE	37
-+
-+#endif /* __ASM_ALPHA_AUXVEC_H */
-diff -Naur aboot-0.9b.orig/include/asm/console.h aboot-0.9b/include/asm/console.h
---- aboot-0.9b.orig/include/asm/console.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/asm/console.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,50 @@
-+#ifndef __AXP_CONSOLE_H
-+#define __AXP_CONSOLE_H
-+
-+/*
-+ * Console callback routine numbers
-+ */
-+#define CCB_GETC		0x01
-+#define CCB_PUTS		0x02
-+#define CCB_RESET_TERM		0x03
-+#define CCB_SET_TERM_INT	0x04
-+#define CCB_SET_TERM_CTL	0x05
-+#define CCB_PROCESS_KEYCODE	0x06
-+#define CCB_OPEN_CONSOLE	0x07
-+#define CCB_CLOSE_CONSOLE	0x08
-+
-+#define CCB_OPEN		0x10
-+#define CCB_CLOSE		0x11
-+#define CCB_IOCTL		0x12
-+#define CCB_READ		0x13
-+#define CCB_WRITE		0x14
-+
-+#define CCB_SET_ENV		0x20
-+#define CCB_RESET_ENV		0x21
-+#define CCB_GET_ENV		0x22
-+#define CCB_SAVE_ENV		0x23
-+
-+#define CCB_PSWITCH		0x30
-+#define CCB_BIOS_EMUL		0x32
-+
-+/*
-+ * Environment variable numbers
-+ */
-+#define ENV_AUTO_ACTION		0x01
-+#define ENV_BOOT_DEV		0x02
-+#define ENV_BOOTDEF_DEV		0x03
-+#define ENV_BOOTED_DEV		0x04
-+#define ENV_BOOT_FILE		0x05
-+#define ENV_BOOTED_FILE		0x06
-+#define ENV_BOOT_OSFLAGS	0x07
-+#define ENV_BOOTED_OSFLAGS	0x08
-+#define ENV_BOOT_RESET		0x09
-+#define ENV_DUMP_DEV		0x0A
-+#define ENV_ENABLE_AUDIT	0x0B
-+#define ENV_LICENSE		0x0C
-+#define ENV_CHAR_SET		0x0D
-+#define ENV_LANGUAGE		0x0E
-+#define ENV_TTY_DEV		0x0F
-+
-+
-+#endif /* __AXP_CONSOLE_H */
-diff -Naur aboot-0.9b.orig/include/asm/elf.h aboot-0.9b/include/asm/elf.h
---- aboot-0.9b.orig/include/asm/elf.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/asm/elf.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,167 @@
-+#ifndef __ASM_ALPHA_ELF_H
-+#define __ASM_ALPHA_ELF_H
-+
-+#include <asm/auxvec.h>
-+
-+/* Special values for the st_other field in the symbol table.  */
-+
-+#define STO_ALPHA_NOPV		0x80
-+#define STO_ALPHA_STD_GPLOAD	0x88
-+
-+/*
-+ * Alpha ELF relocation types
-+ */
-+#define R_ALPHA_NONE            0       /* No reloc */
-+#define R_ALPHA_REFLONG         1       /* Direct 32 bit */
-+#define R_ALPHA_REFQUAD         2       /* Direct 64 bit */
-+#define R_ALPHA_GPREL32         3       /* GP relative 32 bit */
-+#define R_ALPHA_LITERAL         4       /* GP relative 16 bit w/optimization */
-+#define R_ALPHA_LITUSE          5       /* Optimization hint for LITERAL */
-+#define R_ALPHA_GPDISP          6       /* Add displacement to GP */
-+#define R_ALPHA_BRADDR          7       /* PC+4 relative 23 bit shifted */
-+#define R_ALPHA_HINT            8       /* PC+4 relative 16 bit shifted */
-+#define R_ALPHA_SREL16          9       /* PC relative 16 bit */
-+#define R_ALPHA_SREL32          10      /* PC relative 32 bit */
-+#define R_ALPHA_SREL64          11      /* PC relative 64 bit */
-+#define R_ALPHA_GPRELHIGH       17      /* GP relative 32 bit, high 16 bits */
-+#define R_ALPHA_GPRELLOW        18      /* GP relative 32 bit, low 16 bits */
-+#define R_ALPHA_GPREL16         19      /* GP relative 16 bit */
-+#define R_ALPHA_COPY            24      /* Copy symbol at runtime */
-+#define R_ALPHA_GLOB_DAT        25      /* Create GOT entry */
-+#define R_ALPHA_JMP_SLOT        26      /* Create PLT entry */
-+#define R_ALPHA_RELATIVE        27      /* Adjust by program base */
-+#define R_ALPHA_BRSGP		28
-+#define R_ALPHA_TLSGD           29
-+#define R_ALPHA_TLS_LDM         30
-+#define R_ALPHA_DTPMOD64        31
-+#define R_ALPHA_GOTDTPREL       32
-+#define R_ALPHA_DTPREL64        33
-+#define R_ALPHA_DTPRELHI        34
-+#define R_ALPHA_DTPRELLO        35
-+#define R_ALPHA_DTPREL16        36
-+#define R_ALPHA_GOTTPREL        37
-+#define R_ALPHA_TPREL64         38
-+#define R_ALPHA_TPRELHI         39
-+#define R_ALPHA_TPRELLO         40
-+#define R_ALPHA_TPREL16         41
-+
-+#define SHF_ALPHA_GPREL		0x10000000
-+
-+/* Legal values for e_flags field of Elf64_Ehdr.  */
-+
-+#define EF_ALPHA_32BIT		1	/* All addresses are below 2GB */
-+
-+/*
-+ * ELF register definitions..
-+ */
-+
-+/*
-+ * The OSF/1 version of <sys/procfs.h> makes gregset_t 46 entries long.
-+ * I have no idea why that is so.  For now, we just leave it at 33
-+ * (32 general regs + processor status word). 
-+ */
-+#define ELF_NGREG	33
-+#define ELF_NFPREG	32
-+
-+typedef unsigned long elf_greg_t;
-+typedef elf_greg_t elf_gregset_t[ELF_NGREG];
-+
-+typedef double elf_fpreg_t;
-+typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
-+
-+/*
-+ * This is used to ensure we don't load something for the wrong architecture.
-+ */
-+#define elf_check_arch(x) ((x)->e_machine == EM_ALPHA)
-+
-+/*
-+ * These are used to set parameters in the core dumps.
-+ */
-+#define ELF_CLASS	ELFCLASS64
-+#define ELF_DATA	ELFDATA2LSB
-+#define ELF_ARCH	EM_ALPHA
-+
-+#define USE_ELF_CORE_DUMP
-+#define ELF_EXEC_PAGESIZE	8192
-+
-+/* This is the location that an ET_DYN program is loaded if exec'ed.  Typical
-+   use of this is to invoke "./ld.so someprog" to test out a new version of
-+   the loader.  We need to make sure that it is out of the way of the program
-+   that it will "exec", and that there is sufficient room for the brk.  */
-+
-+#define ELF_ET_DYN_BASE		(TASK_UNMAPPED_BASE + 0x1000000)
-+
-+/* $0 is set by ld.so to a pointer to a function which might be 
-+   registered using atexit.  This provides a mean for the dynamic
-+   linker to call DT_FINI functions for shared libraries that have
-+   been loaded before the code runs.
-+
-+   So that we can use the same startup file with static executables,
-+   we start programs with a value of 0 to indicate that there is no
-+   such function.  */
-+
-+#define ELF_PLAT_INIT(_r, load_addr)	_r->r0 = 0
-+
-+/* The registers are layed out in pt_regs for PAL and syscall
-+   convenience.  Re-order them for the linear elf_gregset_t.  */
-+
-+struct pt_regs;
-+struct thread_info;
-+struct task_struct;
-+extern void dump_elf_thread(elf_greg_t *dest, struct pt_regs *pt,
-+			    struct thread_info *ti);
-+#define ELF_CORE_COPY_REGS(DEST, REGS) \
-+	dump_elf_thread(DEST, REGS, current_thread_info());
-+
-+/* Similar, but for a thread other than current.  */
-+
-+extern int dump_elf_task(elf_greg_t *dest, struct task_struct *task);
-+#define ELF_CORE_COPY_TASK_REGS(TASK, DEST) \
-+	dump_elf_task(*(DEST), TASK)
-+
-+/* Similar, but for the FP registers.  */
-+
-+extern int dump_elf_task_fp(elf_fpreg_t *dest, struct task_struct *task);
-+#define ELF_CORE_COPY_FPREGS(TASK, DEST) \
-+	dump_elf_task_fp(*(DEST), TASK)
-+
-+/* This yields a mask that user programs can use to figure out what
-+   instruction set this CPU supports.  This is trivial on Alpha, 
-+   but not so on other machines. */
-+
-+#define ELF_HWCAP  (~amask(-1))
-+
-+/* This yields a string that ld.so will use to load implementation
-+   specific libraries for optimization.  This is more specific in
-+   intent than poking at uname or /proc/cpuinfo.  */
-+
-+#define ELF_PLATFORM				\
-+({						\
-+	enum implver_enum i_ = implver();	\
-+	( i_ == IMPLVER_EV4 ? "ev4"		\
-+	: i_ == IMPLVER_EV5			\
-+	  ? (amask(AMASK_BWX) ? "ev5" : "ev56")	\
-+	: amask (AMASK_CIX) ? "ev6" : "ev67");	\
-+})
-+
-+#ifdef __KERNEL__
-+
-+#define SET_PERSONALITY(EX, IBCS2)				\
-+	set_personality(((EX).e_flags & EF_ALPHA_32BIT)		\
-+	   ? PER_LINUX_32BIT : (IBCS2) ? PER_SVR4 : PER_LINUX)
-+
-+extern int alpha_l1i_cacheshape;
-+extern int alpha_l1d_cacheshape;
-+extern int alpha_l2_cacheshape;
-+extern int alpha_l3_cacheshape;
-+
-+#define ARCH_DLINFO						\
-+  do {								\
-+    NEW_AUX_ENT(AT_L1I_CACHESHAPE, alpha_l1i_cacheshape);	\
-+    NEW_AUX_ENT(AT_L1D_CACHESHAPE, alpha_l1d_cacheshape);	\
-+    NEW_AUX_ENT(AT_L2_CACHESHAPE, alpha_l2_cacheshape);		\
-+    NEW_AUX_ENT(AT_L3_CACHESHAPE, alpha_l3_cacheshape);		\
-+  } while (0)
-+
-+#endif /* __KERNEL__ */
-+#endif /* __ASM_ALPHA_ELF_H */
-diff -Naur aboot-0.9b.orig/include/asm/hwrpb.h aboot-0.9b/include/asm/hwrpb.h
---- aboot-0.9b.orig/include/asm/hwrpb.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/asm/hwrpb.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,220 @@
-+#ifndef __ALPHA_HWRPB_H
-+#define __ALPHA_HWRPB_H
-+
-+#define INIT_HWRPB ((struct hwrpb_struct *) 0x10000000)
-+
-+/*
-+ * DEC processor types for Alpha systems.  Found in HWRPB.
-+ * These values are architected.
-+ */
-+
-+#define EV3_CPU                 1       /* EV3                  */
-+#define EV4_CPU                 2       /* EV4 (21064)          */
-+#define LCA4_CPU                4       /* LCA4 (21066/21068)   */
-+#define EV5_CPU                 5       /* EV5 (21164)          */
-+#define EV45_CPU                6       /* EV4.5 (21064/xxx)    */
-+#define EV56_CPU		7	/* EV5.6 (21164)	*/
-+#define EV6_CPU			8	/* EV6 (21264)		*/
-+#define PCA56_CPU		9	/* PCA56 (21164PC)	*/
-+#define PCA57_CPU		10	/* PCA57 (notyet)	*/
-+#define EV67_CPU		11	/* EV67 (21264A)	*/
-+#define EV68CB_CPU		12	/* EV68CB (21264C)	*/
-+#define EV68AL_CPU		13	/* EV68AL (21264B)	*/
-+#define EV68CX_CPU		14	/* EV68CX (21264D)	*/
-+#define EV7_CPU			15	/* EV7 (21364)		*/
-+#define EV79_CPU		16	/* EV79 (21364??)	*/
-+#define EV69_CPU		17	/* EV69 (21264/EV69A)	*/
-+
-+/*
-+ * DEC system types for Alpha systems.  Found in HWRPB.
-+ * These values are architected.
-+ */
-+
-+#define ST_ADU			  1	/* Alpha ADU systype	*/
-+#define ST_DEC_4000		  2	/* Cobra systype	*/
-+#define ST_DEC_7000		  3	/* Ruby systype		*/
-+#define ST_DEC_3000_500		  4	/* Flamingo systype	*/
-+#define ST_DEC_2000_300		  6	/* Jensen systype	*/
-+#define ST_DEC_3000_300		  7	/* Pelican systype	*/
-+#define ST_DEC_2100_A500	  9	/* Sable systype	*/
-+#define ST_DEC_AXPVME_64	 10	/* AXPvme system type	*/
-+#define ST_DEC_AXPPCI_33	 11	/* NoName system type	*/
-+#define ST_DEC_TLASER		 12	/* Turbolaser systype	*/
-+#define ST_DEC_2100_A50		 13	/* Avanti systype	*/
-+#define ST_DEC_MUSTANG		 14	/* Mustang systype	*/
-+#define ST_DEC_ALCOR		 15	/* Alcor (EV5) systype	*/
-+#define ST_DEC_1000		 17	/* Mikasa systype	*/
-+#define ST_DEC_EB64		 18	/* EB64 systype		*/
-+#define ST_DEC_EB66		 19	/* EB66 systype		*/
-+#define ST_DEC_EB64P		 20	/* EB64+ systype	*/
-+#define ST_DEC_BURNS		 21	/* laptop systype	*/
-+#define ST_DEC_RAWHIDE		 22	/* Rawhide systype	*/
-+#define ST_DEC_K2		 23	/* K2 systype		*/
-+#define ST_DEC_LYNX		 24	/* Lynx systype		*/
-+#define ST_DEC_XL		 25	/* Alpha XL systype	*/
-+#define ST_DEC_EB164		 26	/* EB164 systype	*/
-+#define ST_DEC_NORITAKE		 27	/* Noritake systype	*/
-+#define ST_DEC_CORTEX		 28	/* Cortex systype	*/
-+#define ST_DEC_MIATA		 30	/* Miata systype        */
-+#define ST_DEC_XXM		 31	/* XXM systype		*/
-+#define ST_DEC_TAKARA		 32	/* Takara systype	*/
-+#define ST_DEC_YUKON		 33	/* Yukon systype	*/
-+#define ST_DEC_TSUNAMI		 34	/* Tsunami systype	*/
-+#define ST_DEC_WILDFIRE		 35	/* Wildfire systype	*/
-+#define ST_DEC_CUSCO		 36	/* CUSCO systype	*/
-+#define ST_DEC_EIGER		 37	/* Eiger systype	*/
-+#define ST_DEC_TITAN		 38	/* Titan systype	*/
-+#define ST_DEC_MARVEL		 39	/* Marvel systype	*/
-+
-+/* UNOFFICIAL!!! */
-+#define ST_UNOFFICIAL_BIAS	100
-+#define ST_DTI_RUFFIAN		101	/* RUFFIAN systype	*/
-+
-+/* Alpha Processor, Inc. systems */
-+#define ST_API_BIAS		200
-+#define ST_API_NAUTILUS		201	/* UP1000 systype	*/
-+
-+struct pcb_struct {
-+	unsigned long ksp;
-+	unsigned long usp;
-+	unsigned long ptbr;
-+	unsigned int pcc;
-+	unsigned int asn;
-+	unsigned long unique;
-+	unsigned long flags;
-+	unsigned long res1, res2;
-+};
-+
-+struct percpu_struct {
-+	unsigned long hwpcb[16];
-+	unsigned long flags;
-+	unsigned long pal_mem_size;
-+	unsigned long pal_scratch_size;
-+	unsigned long pal_mem_pa;
-+	unsigned long pal_scratch_pa;
-+	unsigned long pal_revision;
-+	unsigned long type;
-+	unsigned long variation;
-+	unsigned long revision;
-+	unsigned long serial_no[2];
-+	unsigned long logout_area_pa;
-+	unsigned long logout_area_len;
-+	unsigned long halt_PCBB;
-+	unsigned long halt_PC;
-+	unsigned long halt_PS;
-+	unsigned long halt_arg;
-+	unsigned long halt_ra;
-+	unsigned long halt_pv;
-+	unsigned long halt_reason;
-+	unsigned long res;
-+	unsigned long ipc_buffer[21];
-+	unsigned long palcode_avail[16];
-+	unsigned long compatibility;
-+	unsigned long console_data_log_pa;
-+	unsigned long console_data_log_length;
-+	unsigned long bcache_info;
-+};
-+
-+struct procdesc_struct {
-+	unsigned long weird_vms_stuff;
-+	unsigned long address;
-+};
-+
-+struct vf_map_struct {
-+	unsigned long va;
-+	unsigned long pa;
-+	unsigned long count;
-+};
-+
-+struct crb_struct {
-+	struct procdesc_struct * dispatch_va;
-+	struct procdesc_struct * dispatch_pa;
-+	struct procdesc_struct * fixup_va;
-+	struct procdesc_struct * fixup_pa;
-+	/* virtual->physical map */
-+	unsigned long map_entries;
-+	unsigned long map_pages;
-+	struct vf_map_struct map[1];
-+};
-+
-+struct memclust_struct {
-+	unsigned long start_pfn;
-+	unsigned long numpages;
-+	unsigned long numtested;
-+	unsigned long bitmap_va;
-+	unsigned long bitmap_pa;
-+	unsigned long bitmap_chksum;
-+	unsigned long usage;
-+};
-+
-+struct memdesc_struct {
-+	unsigned long chksum;
-+	unsigned long optional_pa;
-+	unsigned long numclusters;
-+	struct memclust_struct cluster[0];
-+};
-+
-+struct dsr_struct {
-+	long smm;			/* SMM nubber used by LMF       */
-+	unsigned long  lurt_off;	/* offset to LURT table         */
-+	unsigned long  sysname_off;	/* offset to sysname char count */
-+};
-+
-+struct hwrpb_struct {
-+	unsigned long phys_addr;	/* check: physical address of the hwrpb */
-+	unsigned long id;		/* check: "HWRPB\0\0\0" */
-+	unsigned long revision;	
-+	unsigned long size;		/* size of hwrpb */
-+	unsigned long cpuid;
-+	unsigned long pagesize;		/* 8192, I hope */
-+	unsigned long pa_bits;		/* number of physical address bits */
-+	unsigned long max_asn;
-+	unsigned char ssn[16];		/* system serial number: big bother is watching */
-+	unsigned long sys_type;
-+	unsigned long sys_variation;
-+	unsigned long sys_revision;
-+	unsigned long intr_freq;	/* interval clock frequency * 4096 */
-+	unsigned long cycle_freq;	/* cycle counter frequency */
-+	unsigned long vptb;		/* Virtual Page Table Base address */
-+	unsigned long res1;
-+	unsigned long tbhb_offset;	/* Translation Buffer Hint Block */
-+	unsigned long nr_processors;
-+	unsigned long processor_size;
-+	unsigned long processor_offset;
-+	unsigned long ctb_nr;
-+	unsigned long ctb_size;		/* console terminal block size */
-+	unsigned long ctbt_offset;	/* console terminal block table offset */
-+	unsigned long crb_offset;	/* console callback routine block */
-+	unsigned long mddt_offset;	/* memory data descriptor table */
-+	unsigned long cdb_offset;	/* configuration data block (or NULL) */
-+	unsigned long frut_offset;	/* FRU table (or NULL) */
-+	void (*save_terminal)(unsigned long);
-+	unsigned long save_terminal_data;
-+	void (*restore_terminal)(unsigned long);
-+	unsigned long restore_terminal_data;
-+	void (*CPU_restart)(unsigned long);
-+	unsigned long CPU_restart_data;
-+	unsigned long res2;
-+	unsigned long res3;
-+	unsigned long chksum;
-+	unsigned long rxrdy;
-+	unsigned long txrdy;
-+	unsigned long dsr_offset;	/* "Dynamic System Recognition Data Block Table" */
-+};
-+
-+#ifdef __KERNEL__
-+
-+extern struct hwrpb_struct *hwrpb;
-+
-+static inline void
-+hwrpb_update_checksum(struct hwrpb_struct *h)
-+{
-+	unsigned long sum = 0, *l;
-+        for (l = (unsigned long *) h; l < (unsigned long *) &h->chksum; ++l)
-+                sum += *l;
-+        h->chksum = sum;
-+}
-+
-+#endif /* __KERNEL__ */
-+
-+#endif /* __ALPHA_HWRPB_H */
-diff -Naur aboot-0.9b.orig/include/asm/ioctl.h aboot-0.9b/include/asm/ioctl.h
---- aboot-0.9b.orig/include/asm/ioctl.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/asm/ioctl.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,66 @@
-+#ifndef _ALPHA_IOCTL_H
-+#define _ALPHA_IOCTL_H
-+
-+/*
-+ * The original linux ioctl numbering scheme was just a general
-+ * "anything goes" setup, where more or less random numbers were
-+ * assigned.  Sorry, I was clueless when I started out on this.
-+ *
-+ * On the alpha, we'll try to clean it up a bit, using a more sane
-+ * ioctl numbering, and also trying to be compatible with OSF/1 in
-+ * the process. I'd like to clean it up for the i386 as well, but
-+ * it's so painful recognizing both the new and the old numbers..
-+ */
-+
-+#define _IOC_NRBITS	8
-+#define _IOC_TYPEBITS	8
-+#define _IOC_SIZEBITS	13
-+#define _IOC_DIRBITS	3
-+
-+#define _IOC_NRMASK	((1 << _IOC_NRBITS)-1)
-+#define _IOC_TYPEMASK	((1 << _IOC_TYPEBITS)-1)
-+#define _IOC_SIZEMASK	((1 << _IOC_SIZEBITS)-1)
-+#define _IOC_DIRMASK	((1 << _IOC_DIRBITS)-1)
-+
-+#define _IOC_NRSHIFT	0
-+#define _IOC_TYPESHIFT	(_IOC_NRSHIFT+_IOC_NRBITS)
-+#define _IOC_SIZESHIFT	(_IOC_TYPESHIFT+_IOC_TYPEBITS)
-+#define _IOC_DIRSHIFT	(_IOC_SIZESHIFT+_IOC_SIZEBITS)
-+
-+/*
-+ * Direction bits _IOC_NONE could be 0, but OSF/1 gives it a bit.
-+ * And this turns out useful to catch old ioctl numbers in header
-+ * files for us.
-+ */
-+#define _IOC_NONE	1U
-+#define _IOC_READ	2U
-+#define _IOC_WRITE	4U
-+
-+#define _IOC(dir,type,nr,size)			\
-+	((unsigned int)				\
-+	 (((dir)  << _IOC_DIRSHIFT) |		\
-+	  ((type) << _IOC_TYPESHIFT) |		\
-+	  ((nr)   << _IOC_NRSHIFT) |		\
-+	  ((size) << _IOC_SIZESHIFT)))
-+
-+/* used to create numbers */
-+#define _IO(type,nr)		_IOC(_IOC_NONE,(type),(nr),0)
-+#define _IOR(type,nr,size)	_IOC(_IOC_READ,(type),(nr),sizeof(size))
-+#define _IOW(type,nr,size)	_IOC(_IOC_WRITE,(type),(nr),sizeof(size))
-+#define _IOWR(type,nr,size)	_IOC(_IOC_READ|_IOC_WRITE,(type),(nr),sizeof(size))
-+
-+/* used to decode them.. */
-+#define _IOC_DIR(nr)		(((nr) >> _IOC_DIRSHIFT) & _IOC_DIRMASK)
-+#define _IOC_TYPE(nr)		(((nr) >> _IOC_TYPESHIFT) & _IOC_TYPEMASK)
-+#define _IOC_NR(nr)		(((nr) >> _IOC_NRSHIFT) & _IOC_NRMASK)
-+#define _IOC_SIZE(nr)		(((nr) >> _IOC_SIZESHIFT) & _IOC_SIZEMASK)
-+
-+/* ...and for the drivers/sound files... */
-+
-+#define IOC_IN		(_IOC_WRITE << _IOC_DIRSHIFT)
-+#define IOC_OUT		(_IOC_READ << _IOC_DIRSHIFT)
-+#define IOC_INOUT	((_IOC_WRITE|_IOC_READ) << _IOC_DIRSHIFT)
-+#define IOCSIZE_MASK	(_IOC_SIZEMASK << _IOC_SIZESHIFT)
-+#define IOCSIZE_SHIFT	(_IOC_SIZESHIFT)
-+
-+#endif /* _ALPHA_IOCTL_H */
-diff -Naur aboot-0.9b.orig/include/asm/page.h aboot-0.9b/include/asm/page.h
---- aboot-0.9b.orig/include/asm/page.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/asm/page.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,101 @@
-+#ifndef _ALPHA_PAGE_H
-+#define _ALPHA_PAGE_H
-+
-+/* PAGE_SHIFT determines the page size */
-+#define PAGE_SHIFT      13
-+#define PAGE_SIZE       (1UL << PAGE_SHIFT)
-+#define PAGE_MASK       (~(PAGE_SIZE-1))
-+
-+#ifdef __KERNEL__
-+
-+#include <asm/pal.h>
-+
-+#ifndef __ASSEMBLY__
-+
-+#define STRICT_MM_TYPECHECKS
-+
-+extern void clear_page(void *page);
-+#define clear_user_page(page, vaddr, pg)	clear_page(page)
-+
-+#define __alloc_zeroed_user_highpage(movableflags, vma, vaddr) \
-+	alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vmaddr)
-+#define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE
-+
-+extern void copy_page(void * _to, void * _from);
-+#define copy_user_page(to, from, vaddr, pg)	copy_page(to, from)
-+
-+#ifdef STRICT_MM_TYPECHECKS
-+/*
-+ * These are used to make use of C type-checking..
-+ */
-+typedef struct { unsigned long pte; } pte_t;
-+typedef struct { unsigned long pmd; } pmd_t;
-+typedef struct { unsigned long pgd; } pgd_t;
-+typedef struct { unsigned long pgprot; } pgprot_t;
-+
-+#define pte_val(x)	((x).pte)
-+#define pmd_val(x)	((x).pmd)
-+#define pgd_val(x)	((x).pgd)
-+#define pgprot_val(x)	((x).pgprot)
-+
-+#define __pte(x)	((pte_t) { (x) } )
-+#define __pmd(x)	((pmd_t) { (x) } )
-+#define __pgd(x)	((pgd_t) { (x) } )
-+#define __pgprot(x)	((pgprot_t) { (x) } )
-+
-+#else
-+/*
-+ * .. while these make it easier on the compiler
-+ */
-+typedef unsigned long pte_t;
-+typedef unsigned long pmd_t;
-+typedef unsigned long pgd_t;
-+typedef unsigned long pgprot_t;
-+
-+#define pte_val(x)	(x)
-+#define pmd_val(x)	(x)
-+#define pgd_val(x)	(x)
-+#define pgprot_val(x)	(x)
-+
-+#define __pte(x)	(x)
-+#define __pgd(x)	(x)
-+#define __pgprot(x)	(x)
-+
-+#endif /* STRICT_MM_TYPECHECKS */
-+
-+#ifdef USE_48_BIT_KSEG
-+#define PAGE_OFFSET		0xffff800000000000UL
-+#else
-+#define PAGE_OFFSET		0xfffffc0000000000UL
-+#endif
-+
-+#else
-+
-+#ifdef USE_48_BIT_KSEG
-+#define PAGE_OFFSET		0xffff800000000000
-+#else
-+#define PAGE_OFFSET		0xfffffc0000000000
-+#endif
-+
-+#endif /* !__ASSEMBLY__ */
-+
-+/* to align the pointer to the (next) page boundary */
-+#define PAGE_ALIGN(addr)	(((addr)+PAGE_SIZE-1)&PAGE_MASK)
-+
-+#define __pa(x)			((unsigned long) (x) - PAGE_OFFSET)
-+#define __va(x)			((void *)((unsigned long) (x) + PAGE_OFFSET))
-+#ifndef CONFIG_DISCONTIGMEM
-+#define virt_to_page(kaddr)	pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
-+
-+#define pfn_valid(pfn)		((pfn) < max_mapnr)
-+#define virt_addr_valid(kaddr)	pfn_valid(__pa(kaddr) >> PAGE_SHIFT)
-+#endif /* CONFIG_DISCONTIGMEM */
-+
-+#define VM_DATA_DEFAULT_FLAGS		(VM_READ | VM_WRITE | VM_EXEC | \
-+					 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-+
-+#include <asm-generic/memory_model.h>
-+#include <asm-generic/page.h>
-+
-+#endif /* __KERNEL__ */
-+#endif /* _ALPHA_PAGE_H */
-diff -Naur aboot-0.9b.orig/include/asm/pal.h aboot-0.9b/include/asm/pal.h
---- aboot-0.9b.orig/include/asm/pal.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/asm/pal.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,51 @@
-+#ifndef __ALPHA_PAL_H
-+#define __ALPHA_PAL_H
-+
-+/*
-+ * Common PAL-code
-+ */
-+#define PAL_halt	  0
-+#define PAL_cflush	  1
-+#define PAL_draina	  2
-+#define PAL_bpt		128
-+#define PAL_bugchk	129
-+#define PAL_chmk	131
-+#define PAL_callsys	131
-+#define PAL_imb		134
-+#define PAL_rduniq	158
-+#define PAL_wruniq	159
-+#define PAL_gentrap	170
-+#define PAL_nphalt	190
-+
-+/*
-+ * VMS specific PAL-code
-+ */
-+#define PAL_swppal	10
-+#define PAL_mfpr_vptb	41
-+
-+/*
-+ * OSF specific PAL-code
-+ */
-+#define PAL_cserve	 9
-+#define PAL_wripir	13
-+#define PAL_rdmces	16
-+#define PAL_wrmces	17
-+#define PAL_wrfen	43
-+#define PAL_wrvptptr	45
-+#define PAL_jtopal	46
-+#define PAL_swpctx	48
-+#define PAL_wrval	49
-+#define PAL_rdval	50
-+#define PAL_tbi		51
-+#define PAL_wrent	52
-+#define PAL_swpipl	53
-+#define PAL_rdps	54
-+#define PAL_wrkgp	55
-+#define PAL_wrusp	56
-+#define PAL_wrperfmon	57
-+#define PAL_rdusp	58
-+#define PAL_whami	60
-+#define PAL_retsys	61
-+#define PAL_rti		63
-+
-+#endif /* __ALPHA_PAL_H */
-diff -Naur aboot-0.9b.orig/include/asm/param.h aboot-0.9b/include/asm/param.h
---- aboot-0.9b.orig/include/asm/param.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/asm/param.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,28 @@
-+#ifndef _ASM_ALPHA_PARAM_H
-+#define _ASM_ALPHA_PARAM_H
-+
-+/* ??? Gross.  I don't want to parameterize this, and supposedly the
-+   hardware ignores reprogramming.  We also need userland buy-in to the 
-+   change in HZ, since this is visible in the wait4 resources etc.  */
-+
-+
-+#ifndef HZ
-+# ifndef CONFIG_ALPHA_RAWHIDE
-+#  define HZ	1024
-+# else
-+#  define HZ	1200
-+# endif
-+#endif
-+
-+#define USER_HZ		HZ
-+
-+#define EXEC_PAGESIZE	8192
-+
-+#ifndef NOGROUP
-+#define NOGROUP		(-1)
-+#endif
-+
-+#define MAXHOSTNAMELEN	64	/* max length of hostname */
-+
-+
-+#endif /* _ASM_ALPHA_PARAM_H */
-diff -Naur aboot-0.9b.orig/include/asm/posix_types.h aboot-0.9b/include/asm/posix_types.h
---- aboot-0.9b.orig/include/asm/posix_types.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/asm/posix_types.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,45 @@
-+#ifndef _ALPHA_POSIX_TYPES_H
-+#define _ALPHA_POSIX_TYPES_H
-+
-+/*
-+ * This file is generally used by user-level software, so you need to
-+ * be a little careful about namespace pollution etc.  Also, we cannot
-+ * assume GCC is being used.
-+ */
-+
-+typedef unsigned int	__kernel_ino_t;
-+typedef unsigned int	__kernel_mode_t;
-+typedef unsigned int	__kernel_nlink_t;
-+typedef long		__kernel_off_t;
-+typedef long long	__kernel_loff_t;
-+typedef int		__kernel_pid_t;
-+typedef int		__kernel_ipc_pid_t;
-+typedef unsigned int	__kernel_uid_t;
-+typedef unsigned int	__kernel_gid_t;
-+typedef unsigned long	__kernel_size_t;
-+typedef long		__kernel_ssize_t;
-+typedef long		__kernel_ptrdiff_t;
-+typedef long		__kernel_time_t;
-+typedef long		__kernel_suseconds_t;
-+typedef long		__kernel_clock_t;
-+typedef int		__kernel_daddr_t;
-+typedef char *		__kernel_caddr_t;
-+typedef unsigned long	__kernel_sigset_t;	/* at least 32 bits */
-+typedef unsigned short	__kernel_uid16_t;
-+typedef unsigned short	__kernel_gid16_t;
-+typedef int		__kernel_clockid_t;
-+typedef int		__kernel_timer_t;
-+
-+typedef struct {
-+	int	val[2];
-+} __kernel_fsid_t;
-+
-+typedef __kernel_uid_t __kernel_old_uid_t;
-+typedef __kernel_gid_t __kernel_old_gid_t;
-+typedef __kernel_uid_t __kernel_uid32_t;
-+typedef __kernel_gid_t __kernel_gid32_t;
-+
-+typedef unsigned int	__kernel_old_dev_t;
-+
-+
-+#endif /* _ALPHA_POSIX_TYPES_H */
-diff -Naur aboot-0.9b.orig/include/asm/stat.h aboot-0.9b/include/asm/stat.h
---- aboot-0.9b.orig/include/asm/stat.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/asm/stat.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,48 @@
-+#ifndef _ALPHA_STAT_H
-+#define _ALPHA_STAT_H
-+
-+struct stat {
-+	unsigned int	st_dev;
-+	unsigned int	st_ino;
-+	unsigned int	st_mode;
-+	unsigned int	st_nlink;
-+	unsigned int	st_uid;
-+	unsigned int	st_gid;
-+	unsigned int	st_rdev;
-+	long		st_size;
-+	unsigned long	st_atime;
-+	unsigned long	st_mtime;
-+	unsigned long	st_ctime;
-+	unsigned int	st_blksize;
-+	unsigned int	st_blocks;
-+	unsigned int	st_flags;
-+	unsigned int	st_gen;
-+};
-+
-+/* The stat64 structure increases the size of dev_t, blkcnt_t, adds
-+   nanosecond resolution times, and padding for expansion.  */
-+
-+struct stat64 {
-+	unsigned long	st_dev;
-+	unsigned long	st_ino;
-+	unsigned long	st_rdev;
-+	long		st_size;
-+	unsigned long	st_blocks;
-+
-+	unsigned int	st_mode;
-+	unsigned int	st_uid;
-+	unsigned int	st_gid;
-+	unsigned int	st_blksize;
-+	unsigned int	st_nlink;
-+	unsigned int	__pad0;
-+
-+	unsigned long	st_atime;
-+	unsigned long 	st_atime_nsec; 
-+	unsigned long	st_mtime;
-+	unsigned long	st_mtime_nsec;
-+	unsigned long	st_ctime;
-+	unsigned long   st_ctime_nsec;
-+  	long		__unused[3];
-+};
-+
-+#endif
-diff -Naur aboot-0.9b.orig/include/asm/system.h aboot-0.9b/include/asm/system.h
---- aboot-0.9b.orig/include/asm/system.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/asm/system.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,816 @@
-+#ifndef __ALPHA_SYSTEM_H
-+#define __ALPHA_SYSTEM_H
-+
-+#include <asm/pal.h>
-+#include <asm/page.h>
-+
-+/*
-+ * System defines.. Note that this is included both from .c and .S
-+ * files, so it does only defines, not any C code.
-+ */
-+
-+/*
-+ * We leave one page for the initial stack page, and one page for
-+ * the initial process structure. Also, the console eats 3 MB for
-+ * the initial bootloader (one of which we can reclaim later).
-+ */
-+#define BOOT_PCB	0x20000000
-+#define BOOT_ADDR	0x20000000
-+/* Remove when official MILO sources have ELF support: */
-+#define BOOT_SIZE	(16*1024)
-+
-+#ifdef CONFIG_ALPHA_LEGACY_START_ADDRESS
-+#define KERNEL_START_PHYS	0x300000 /* Old bootloaders hardcoded this.  */
-+#else
-+#define KERNEL_START_PHYS	0x1000000 /* required: Wildfire/Titan/Marvel */
-+#endif
-+
-+#define KERNEL_START	(PAGE_OFFSET+KERNEL_START_PHYS)
-+#define SWAPPER_PGD	KERNEL_START
-+#define INIT_STACK	(PAGE_OFFSET+KERNEL_START_PHYS+0x02000)
-+#define EMPTY_PGT	(PAGE_OFFSET+KERNEL_START_PHYS+0x04000)
-+#define EMPTY_PGE	(PAGE_OFFSET+KERNEL_START_PHYS+0x08000)
-+#define ZERO_PGE	(PAGE_OFFSET+KERNEL_START_PHYS+0x0A000)
-+
-+#define START_ADDR	(PAGE_OFFSET+KERNEL_START_PHYS+0x10000)
-+
-+/*
-+ * This is setup by the secondary bootstrap loader.  Because
-+ * the zero page is zeroed out as soon as the vm system is
-+ * initialized, we need to copy things out into a more permanent
-+ * place.
-+ */
-+#define PARAM			ZERO_PGE
-+#define COMMAND_LINE		((char*)(PARAM + 0x0000))
-+#define INITRD_START		(*(unsigned long *) (PARAM+0x100))
-+#define INITRD_SIZE		(*(unsigned long *) (PARAM+0x108))
-+
-+#ifndef __ASSEMBLY__
-+#include <linux/kernel.h>
-+
-+/*
-+ * This is the logout header that should be common to all platforms
-+ * (assuming they are running OSF/1 PALcode, I guess).
-+ */
-+struct el_common {
-+	unsigned int	size;		/* size in bytes of logout area */
-+	unsigned int	sbz1	: 30;	/* should be zero */
-+	unsigned int	err2	:  1;	/* second error */
-+	unsigned int	retry	:  1;	/* retry flag */
-+	unsigned int	proc_offset;	/* processor-specific offset */
-+	unsigned int	sys_offset;	/* system-specific offset */
-+	unsigned int	code;		/* machine check code */
-+	unsigned int	frame_rev;	/* frame revision */
-+};
-+
-+/* Machine Check Frame for uncorrectable errors (Large format)
-+ *      --- This is used to log uncorrectable errors such as
-+ *          double bit ECC errors.
-+ *      --- These errors are detected by both processor and systems.
-+ */
-+struct el_common_EV5_uncorrectable_mcheck {
-+        unsigned long   shadow[8];        /* Shadow reg. 8-14, 25           */
-+        unsigned long   paltemp[24];      /* PAL TEMP REGS.                 */
-+        unsigned long   exc_addr;         /* Address of excepting instruction*/
-+        unsigned long   exc_sum;          /* Summary of arithmetic traps.   */
-+        unsigned long   exc_mask;         /* Exception mask (from exc_sum). */
-+        unsigned long   pal_base;         /* Base address for PALcode.      */
-+        unsigned long   isr;              /* Interrupt Status Reg.          */
-+        unsigned long   icsr;             /* CURRENT SETUP OF EV5 IBOX      */
-+        unsigned long   ic_perr_stat;     /* I-CACHE Reg. <11> set Data parity
-+                                                         <12> set TAG parity*/
-+        unsigned long   dc_perr_stat;     /* D-CACHE error Reg. Bits set to 1:
-+                                                     <2> Data error in bank 0
-+                                                     <3> Data error in bank 1
-+                                                     <4> Tag error in bank 0
-+                                                     <5> Tag error in bank 1 */
-+        unsigned long   va;               /* Effective VA of fault or miss. */
-+        unsigned long   mm_stat;          /* Holds the reason for D-stream 
-+                                             fault or D-cache parity errors */
-+        unsigned long   sc_addr;          /* Address that was being accessed
-+                                             when EV5 detected Secondary cache
-+                                             failure.                 */
-+        unsigned long   sc_stat;          /* Helps determine if the error was
-+                                             TAG/Data parity(Secondary Cache)*/
-+        unsigned long   bc_tag_addr;      /* Contents of EV5 BC_TAG_ADDR    */
-+        unsigned long   ei_addr;          /* Physical address of any transfer
-+                                             that is logged in EV5 EI_STAT */
-+        unsigned long   fill_syndrome;    /* For correcting ECC errors.     */
-+        unsigned long   ei_stat;          /* Helps identify reason of any 
-+                                             processor uncorrectable error
-+                                             at its external interface.     */
-+        unsigned long   ld_lock;          /* Contents of EV5 LD_LOCK register*/
-+};
-+
-+struct el_common_EV6_mcheck {
-+	unsigned int FrameSize;		/* Bytes, including this field */
-+	unsigned int FrameFlags;	/* <31> = Retry, <30> = Second Error */
-+	unsigned int CpuOffset;		/* Offset to CPU-specific info */
-+	unsigned int SystemOffset;	/* Offset to system-specific info */
-+	unsigned int MCHK_Code;
-+	unsigned int MCHK_Frame_Rev;
-+	unsigned long I_STAT;		/* EV6 Internal Processor Registers */
-+	unsigned long DC_STAT;		/* (See the 21264 Spec) */
-+	unsigned long C_ADDR;
-+	unsigned long DC1_SYNDROME;
-+	unsigned long DC0_SYNDROME;
-+	unsigned long C_STAT;
-+	unsigned long C_STS;
-+	unsigned long MM_STAT;
-+	unsigned long EXC_ADDR;
-+	unsigned long IER_CM;
-+	unsigned long ISUM;
-+	unsigned long RESERVED0;
-+	unsigned long PAL_BASE;
-+	unsigned long I_CTL;
-+	unsigned long PCTX;
-+};
-+
-+extern void halt(void) __attribute__((noreturn));
-+#define __halt() __asm__ __volatile__ ("call_pal %0 #halt" : : "i" (PAL_halt))
-+
-+#define switch_to(P,N,L)						 \
-+  do {									 \
-+    (L) = alpha_switch_to(virt_to_phys(&task_thread_info(N)->pcb), (P)); \
-+    check_mmu_context();						 \
-+  } while (0)
-+
-+struct task_struct;
-+extern struct task_struct *alpha_switch_to(unsigned long, struct task_struct*);
-+
-+#define imb() \
-+__asm__ __volatile__ ("call_pal %0 #imb" : : "i" (PAL_imb) : "memory")
-+
-+#define draina() \
-+__asm__ __volatile__ ("call_pal %0 #draina" : : "i" (PAL_draina) : "memory")
-+
-+enum implver_enum {
-+	IMPLVER_EV4,
-+	IMPLVER_EV5,
-+	IMPLVER_EV6
-+};
-+
-+#ifdef CONFIG_ALPHA_GENERIC
-+#define implver()				\
-+({ unsigned long __implver;			\
-+   __asm__ ("implver %0" : "=r"(__implver));	\
-+   (enum implver_enum) __implver; })
-+#else
-+/* Try to eliminate some dead code.  */
-+#ifdef CONFIG_ALPHA_EV4
-+#define implver() IMPLVER_EV4
-+#endif
-+#ifdef CONFIG_ALPHA_EV5
-+#define implver() IMPLVER_EV5
-+#endif
-+#if defined(CONFIG_ALPHA_EV6)
-+#define implver() IMPLVER_EV6
-+#endif
-+#endif
-+
-+enum amask_enum {
-+	AMASK_BWX = (1UL << 0),
-+	AMASK_FIX = (1UL << 1),
-+	AMASK_CIX = (1UL << 2),
-+	AMASK_MAX = (1UL << 8),
-+	AMASK_PRECISE_TRAP = (1UL << 9),
-+};
-+
-+#define amask(mask)						\
-+({ unsigned long __amask, __input = (mask);			\
-+   __asm__ ("amask %1,%0" : "=r"(__amask) : "rI"(__input));	\
-+   __amask; })
-+
-+#define __CALL_PAL_R0(NAME, TYPE)				\
-+static inline TYPE NAME(void)					\
-+{								\
-+	register TYPE __r0 __asm__("$0");			\
-+	__asm__ __volatile__(					\
-+		"call_pal %1 # " #NAME				\
-+		:"=r" (__r0)					\
-+		:"i" (PAL_ ## NAME)				\
-+		:"$1", "$16", "$22", "$23", "$24", "$25");	\
-+	return __r0;						\
-+}
-+
-+#define __CALL_PAL_W1(NAME, TYPE0)				\
-+static inline void NAME(TYPE0 arg0)				\
-+{								\
-+	register TYPE0 __r16 __asm__("$16") = arg0;		\
-+	__asm__ __volatile__(					\
-+		"call_pal %1 # "#NAME				\
-+		: "=r"(__r16)					\
-+		: "i"(PAL_ ## NAME), "0"(__r16)			\
-+		: "$1", "$22", "$23", "$24", "$25");		\
-+}
-+
-+#define __CALL_PAL_W2(NAME, TYPE0, TYPE1)			\
-+static inline void NAME(TYPE0 arg0, TYPE1 arg1)			\
-+{								\
-+	register TYPE0 __r16 __asm__("$16") = arg0;		\
-+	register TYPE1 __r17 __asm__("$17") = arg1;		\
-+	__asm__ __volatile__(					\
-+		"call_pal %2 # "#NAME				\
-+		: "=r"(__r16), "=r"(__r17)			\
-+		: "i"(PAL_ ## NAME), "0"(__r16), "1"(__r17)	\
-+		: "$1", "$22", "$23", "$24", "$25");		\
-+}
-+
-+#define __CALL_PAL_RW1(NAME, RTYPE, TYPE0)			\
-+static inline RTYPE NAME(TYPE0 arg0)				\
-+{								\
-+	register RTYPE __r0 __asm__("$0");			\
-+	register TYPE0 __r16 __asm__("$16") = arg0;		\
-+	__asm__ __volatile__(					\
-+		"call_pal %2 # "#NAME				\
-+		: "=r"(__r16), "=r"(__r0)			\
-+		: "i"(PAL_ ## NAME), "0"(__r16)			\
-+		: "$1", "$22", "$23", "$24", "$25");		\
-+	return __r0;						\
-+}
-+
-+#define __CALL_PAL_RW2(NAME, RTYPE, TYPE0, TYPE1)		\
-+static inline RTYPE NAME(TYPE0 arg0, TYPE1 arg1)		\
-+{								\
-+	register RTYPE __r0 __asm__("$0");			\
-+	register TYPE0 __r16 __asm__("$16") = arg0;		\
-+	register TYPE1 __r17 __asm__("$17") = arg1;		\
-+	__asm__ __volatile__(					\
-+		"call_pal %3 # "#NAME				\
-+		: "=r"(__r16), "=r"(__r17), "=r"(__r0)		\
-+		: "i"(PAL_ ## NAME), "0"(__r16), "1"(__r17)	\
-+		: "$1", "$22", "$23", "$24", "$25");		\
-+	return __r0;						\
-+}
-+
-+__CALL_PAL_W1(cflush, unsigned long);
-+__CALL_PAL_R0(rdmces, unsigned long);
-+__CALL_PAL_R0(rdps, unsigned long);
-+__CALL_PAL_R0(rdusp, unsigned long);
-+__CALL_PAL_RW1(swpipl, unsigned long, unsigned long);
-+__CALL_PAL_R0(whami, unsigned long);
-+__CALL_PAL_W2(wrent, void*, unsigned long);
-+__CALL_PAL_W1(wripir, unsigned long);
-+__CALL_PAL_W1(wrkgp, unsigned long);
-+__CALL_PAL_W1(wrmces, unsigned long);
-+__CALL_PAL_RW2(wrperfmon, unsigned long, unsigned long, unsigned long);
-+__CALL_PAL_W1(wrusp, unsigned long);
-+__CALL_PAL_W1(wrvptptr, unsigned long);
-+
-+#define IPL_MIN		0
-+#define IPL_SW0		1
-+#define IPL_SW1		2
-+#define IPL_DEV0	3
-+#define IPL_DEV1	4
-+#define IPL_TIMER	5
-+#define IPL_PERF	6
-+#define IPL_POWERFAIL	6
-+#define IPL_MCHECK	7
-+#define IPL_MAX		7
-+
-+#ifdef CONFIG_ALPHA_BROKEN_IRQ_MASK
-+#undef IPL_MIN
-+#define IPL_MIN		__min_ipl
-+extern int __min_ipl;
-+#endif
-+
-+#define getipl()		(rdps() & 7)
-+#define setipl(ipl)		((void) swpipl(ipl))
-+
-+#define local_irq_disable()			do { setipl(IPL_MAX); barrier(); } while(0)
-+#define local_irq_enable()			do { barrier(); setipl(IPL_MIN); } while(0)
-+#define local_save_flags(flags)	((flags) = rdps())
-+#define local_irq_save(flags)	do { (flags) = swpipl(IPL_MAX); barrier(); } while(0)
-+#define local_irq_restore(flags)	do { barrier(); setipl(flags); barrier(); } while(0)
-+
-+#define irqs_disabled()	(getipl() == IPL_MAX)
-+
-+/*
-+ * TB routines..
-+ */
-+#define __tbi(nr,arg,arg1...)					\
-+({								\
-+	register unsigned long __r16 __asm__("$16") = (nr);	\
-+	register unsigned long __r17 __asm__("$17"); arg;	\
-+	__asm__ __volatile__(					\
-+		"call_pal %3 #__tbi"				\
-+		:"=r" (__r16),"=r" (__r17)			\
-+		:"0" (__r16),"i" (PAL_tbi) ,##arg1		\
-+		:"$0", "$1", "$22", "$23", "$24", "$25");	\
-+})
-+
-+#define tbi(x,y)	__tbi(x,__r17=(y),"1" (__r17))
-+#define tbisi(x)	__tbi(1,__r17=(x),"1" (__r17))
-+#define tbisd(x)	__tbi(2,__r17=(x),"1" (__r17))
-+#define tbis(x)		__tbi(3,__r17=(x),"1" (__r17))
-+#define tbiap()		__tbi(-1, /* no second argument */)
-+#define tbia()		__tbi(-2, /* no second argument */)
-+
-+/*
-+ * Atomic exchange.
-+ * Since it can be used to implement critical sections
-+ * it must clobber "memory" (also for interrupts in UP).
-+ */
-+
-+static inline unsigned long
-+__xchg_u8(volatile char *m, unsigned long val)
-+{
-+	unsigned long ret, tmp, addr64;
-+
-+	__asm__ __volatile__(
-+	"	andnot	%4,7,%3\n"
-+	"	insbl	%1,%4,%1\n"
-+	"1:	ldq_l	%2,0(%3)\n"
-+	"	extbl	%2,%4,%0\n"
-+	"	mskbl	%2,%4,%2\n"
-+	"	or	%1,%2,%2\n"
-+	"	stq_c	%2,0(%3)\n"
-+	"	beq	%2,2f\n"
-+#ifdef CONFIG_SMP
-+	"	mb\n"
-+#endif
-+	".subsection 2\n"
-+	"2:	br	1b\n"
-+	".previous"
-+	: "=&r" (ret), "=&r" (val), "=&r" (tmp), "=&r" (addr64)
-+	: "r" ((long)m), "1" (val) : "memory");
-+
-+	return ret;
-+}
-+
-+static inline unsigned long
-+__xchg_u16(volatile short *m, unsigned long val)
-+{
-+	unsigned long ret, tmp, addr64;
-+
-+	__asm__ __volatile__(
-+	"	andnot	%4,7,%3\n"
-+	"	inswl	%1,%4,%1\n"
-+	"1:	ldq_l	%2,0(%3)\n"
-+	"	extwl	%2,%4,%0\n"
-+	"	mskwl	%2,%4,%2\n"
-+	"	or	%1,%2,%2\n"
-+	"	stq_c	%2,0(%3)\n"
-+	"	beq	%2,2f\n"
-+#ifdef CONFIG_SMP
-+	"	mb\n"
-+#endif
-+	".subsection 2\n"
-+	"2:	br	1b\n"
-+	".previous"
-+	: "=&r" (ret), "=&r" (val), "=&r" (tmp), "=&r" (addr64)
-+	: "r" ((long)m), "1" (val) : "memory");
-+
-+	return ret;
-+}
-+
-+static inline unsigned long
-+__xchg_u32(volatile int *m, unsigned long val)
-+{
-+	unsigned long dummy;
-+
-+	__asm__ __volatile__(
-+	"1:	ldl_l %0,%4\n"
-+	"	bis $31,%3,%1\n"
-+	"	stl_c %1,%2\n"
-+	"	beq %1,2f\n"
-+#ifdef CONFIG_SMP
-+	"	mb\n"
-+#endif
-+	".subsection 2\n"
-+	"2:	br 1b\n"
-+	".previous"
-+	: "=&r" (val), "=&r" (dummy), "=m" (*m)
-+	: "rI" (val), "m" (*m) : "memory");
-+
-+	return val;
-+}
-+
-+static inline unsigned long
-+__xchg_u64(volatile long *m, unsigned long val)
-+{
-+	unsigned long dummy;
-+
-+	__asm__ __volatile__(
-+	"1:	ldq_l %0,%4\n"
-+	"	bis $31,%3,%1\n"
-+	"	stq_c %1,%2\n"
-+	"	beq %1,2f\n"
-+#ifdef CONFIG_SMP
-+	"	mb\n"
-+#endif
-+	".subsection 2\n"
-+	"2:	br 1b\n"
-+	".previous"
-+	: "=&r" (val), "=&r" (dummy), "=m" (*m)
-+	: "rI" (val), "m" (*m) : "memory");
-+
-+	return val;
-+}
-+
-+/* This function doesn't exist, so you'll get a linker error
-+   if something tries to do an invalid xchg().  */
-+extern void __xchg_called_with_bad_pointer(void);
-+
-+#define __xchg(ptr, x, size) \
-+({ \
-+	unsigned long __xchg__res; \
-+	volatile void *__xchg__ptr = (ptr); \
-+	switch (size) { \
-+		case 1: __xchg__res = __xchg_u8(__xchg__ptr, x); break; \
-+		case 2: __xchg__res = __xchg_u16(__xchg__ptr, x); break; \
-+		case 4: __xchg__res = __xchg_u32(__xchg__ptr, x); break; \
-+		case 8: __xchg__res = __xchg_u64(__xchg__ptr, x); break; \
-+		default: __xchg_called_with_bad_pointer(); __xchg__res = x; \
-+	} \
-+	__xchg__res; \
-+})
-+
-+#define xchg(ptr,x)							     \
-+  ({									     \
-+     __typeof__(*(ptr)) _x_ = (x);					     \
-+     (__typeof__(*(ptr))) __xchg((ptr), (unsigned long)_x_, sizeof(*(ptr))); \
-+  })
-+
-+static inline unsigned long
-+__xchg_u8_local(volatile char *m, unsigned long val)
-+{
-+	unsigned long ret, tmp, addr64;
-+
-+	__asm__ __volatile__(
-+	"	andnot	%4,7,%3\n"
-+	"	insbl	%1,%4,%1\n"
-+	"1:	ldq_l	%2,0(%3)\n"
-+	"	extbl	%2,%4,%0\n"
-+	"	mskbl	%2,%4,%2\n"
-+	"	or	%1,%2,%2\n"
-+	"	stq_c	%2,0(%3)\n"
-+	"	beq	%2,2f\n"
-+	".subsection 2\n"
-+	"2:	br	1b\n"
-+	".previous"
-+	: "=&r" (ret), "=&r" (val), "=&r" (tmp), "=&r" (addr64)
-+	: "r" ((long)m), "1" (val) : "memory");
-+
-+	return ret;
-+}
-+
-+static inline unsigned long
-+__xchg_u16_local(volatile short *m, unsigned long val)
-+{
-+	unsigned long ret, tmp, addr64;
-+
-+	__asm__ __volatile__(
-+	"	andnot	%4,7,%3\n"
-+	"	inswl	%1,%4,%1\n"
-+	"1:	ldq_l	%2,0(%3)\n"
-+	"	extwl	%2,%4,%0\n"
-+	"	mskwl	%2,%4,%2\n"
-+	"	or	%1,%2,%2\n"
-+	"	stq_c	%2,0(%3)\n"
-+	"	beq	%2,2f\n"
-+	".subsection 2\n"
-+	"2:	br	1b\n"
-+	".previous"
-+	: "=&r" (ret), "=&r" (val), "=&r" (tmp), "=&r" (addr64)
-+	: "r" ((long)m), "1" (val) : "memory");
-+
-+	return ret;
-+}
-+
-+static inline unsigned long
-+__xchg_u32_local(volatile int *m, unsigned long val)
-+{
-+	unsigned long dummy;
-+
-+	__asm__ __volatile__(
-+	"1:	ldl_l %0,%4\n"
-+	"	bis $31,%3,%1\n"
-+	"	stl_c %1,%2\n"
-+	"	beq %1,2f\n"
-+	".subsection 2\n"
-+	"2:	br 1b\n"
-+	".previous"
-+	: "=&r" (val), "=&r" (dummy), "=m" (*m)
-+	: "rI" (val), "m" (*m) : "memory");
-+
-+	return val;
-+}
-+
-+static inline unsigned long
-+__xchg_u64_local(volatile long *m, unsigned long val)
-+{
-+	unsigned long dummy;
-+
-+	__asm__ __volatile__(
-+	"1:	ldq_l %0,%4\n"
-+	"	bis $31,%3,%1\n"
-+	"	stq_c %1,%2\n"
-+	"	beq %1,2f\n"
-+	".subsection 2\n"
-+	"2:	br 1b\n"
-+	".previous"
-+	: "=&r" (val), "=&r" (dummy), "=m" (*m)
-+	: "rI" (val), "m" (*m) : "memory");
-+
-+	return val;
-+}
-+
-+#define __xchg_local(ptr, x, size) \
-+({ \
-+	unsigned long __xchg__res; \
-+	volatile void *__xchg__ptr = (ptr); \
-+	switch (size) { \
-+		case 1: __xchg__res = __xchg_u8_local(__xchg__ptr, x); break; \
-+		case 2: __xchg__res = __xchg_u16_local(__xchg__ptr, x); break; \
-+		case 4: __xchg__res = __xchg_u32_local(__xchg__ptr, x); break; \
-+		case 8: __xchg__res = __xchg_u64_local(__xchg__ptr, x); break; \
-+		default: __xchg_called_with_bad_pointer(); __xchg__res = x; \
-+	} \
-+	__xchg__res; \
-+})
-+
-+#define xchg_local(ptr,x)						     \
-+  ({									     \
-+     __typeof__(*(ptr)) _x_ = (x);					     \
-+     (__typeof__(*(ptr))) __xchg_local((ptr), (unsigned long)_x_,	     \
-+     		sizeof(*(ptr))); \
-+  })
-+
-+/* 
-+ * Atomic compare and exchange.  Compare OLD with MEM, if identical,
-+ * store NEW in MEM.  Return the initial value in MEM.  Success is
-+ * indicated by comparing RETURN with OLD.
-+ *
-+ * The memory barrier should be placed in SMP only when we actually
-+ * make the change. If we don't change anything (so if the returned
-+ * prev is equal to old) then we aren't acquiring anything new and
-+ * we don't need any memory barrier as far I can tell.
-+ */
-+
-+#define __HAVE_ARCH_CMPXCHG 1
-+
-+static inline unsigned long
-+__cmpxchg_u8(volatile char *m, long old, long new)
-+{
-+	unsigned long prev, tmp, cmp, addr64;
-+
-+	__asm__ __volatile__(
-+	"	andnot	%5,7,%4\n"
-+	"	insbl	%1,%5,%1\n"
-+	"1:	ldq_l	%2,0(%4)\n"
-+	"	extbl	%2,%5,%0\n"
-+	"	cmpeq	%0,%6,%3\n"
-+	"	beq	%3,2f\n"
-+	"	mskbl	%2,%5,%2\n"
-+	"	or	%1,%2,%2\n"
-+	"	stq_c	%2,0(%4)\n"
-+	"	beq	%2,3f\n"
-+#ifdef CONFIG_SMP
-+	"	mb\n"
-+#endif
-+	"2:\n"
-+	".subsection 2\n"
-+	"3:	br	1b\n"
-+	".previous"
-+	: "=&r" (prev), "=&r" (new), "=&r" (tmp), "=&r" (cmp), "=&r" (addr64)
-+	: "r" ((long)m), "Ir" (old), "1" (new) : "memory");
-+
-+	return prev;
-+}
-+
-+static inline unsigned long
-+__cmpxchg_u16(volatile short *m, long old, long new)
-+{
-+	unsigned long prev, tmp, cmp, addr64;
-+
-+	__asm__ __volatile__(
-+	"	andnot	%5,7,%4\n"
-+	"	inswl	%1,%5,%1\n"
-+	"1:	ldq_l	%2,0(%4)\n"
-+	"	extwl	%2,%5,%0\n"
-+	"	cmpeq	%0,%6,%3\n"
-+	"	beq	%3,2f\n"
-+	"	mskwl	%2,%5,%2\n"
-+	"	or	%1,%2,%2\n"
-+	"	stq_c	%2,0(%4)\n"
-+	"	beq	%2,3f\n"
-+#ifdef CONFIG_SMP
-+	"	mb\n"
-+#endif
-+	"2:\n"
-+	".subsection 2\n"
-+	"3:	br	1b\n"
-+	".previous"
-+	: "=&r" (prev), "=&r" (new), "=&r" (tmp), "=&r" (cmp), "=&r" (addr64)
-+	: "r" ((long)m), "Ir" (old), "1" (new) : "memory");
-+
-+	return prev;
-+}
-+
-+static inline unsigned long
-+__cmpxchg_u32(volatile int *m, int old, int new)
-+{
-+	unsigned long prev, cmp;
-+
-+	__asm__ __volatile__(
-+	"1:	ldl_l %0,%5\n"
-+	"	cmpeq %0,%3,%1\n"
-+	"	beq %1,2f\n"
-+	"	mov %4,%1\n"
-+	"	stl_c %1,%2\n"
-+	"	beq %1,3f\n"
-+#ifdef CONFIG_SMP
-+	"	mb\n"
-+#endif
-+	"2:\n"
-+	".subsection 2\n"
-+	"3:	br 1b\n"
-+	".previous"
-+	: "=&r"(prev), "=&r"(cmp), "=m"(*m)
-+	: "r"((long) old), "r"(new), "m"(*m) : "memory");
-+
-+	return prev;
-+}
-+
-+static inline unsigned long
-+__cmpxchg_u64(volatile long *m, unsigned long old, unsigned long new)
-+{
-+	unsigned long prev, cmp;
-+
-+	__asm__ __volatile__(
-+	"1:	ldq_l %0,%5\n"
-+	"	cmpeq %0,%3,%1\n"
-+	"	beq %1,2f\n"
-+	"	mov %4,%1\n"
-+	"	stq_c %1,%2\n"
-+	"	beq %1,3f\n"
-+#ifdef CONFIG_SMP
-+	"	mb\n"
-+#endif
-+	"2:\n"
-+	".subsection 2\n"
-+	"3:	br 1b\n"
-+	".previous"
-+	: "=&r"(prev), "=&r"(cmp), "=m"(*m)
-+	: "r"((long) old), "r"(new), "m"(*m) : "memory");
-+
-+	return prev;
-+}
-+
-+/* This function doesn't exist, so you'll get a linker error
-+   if something tries to do an invalid cmpxchg().  */
-+extern void __cmpxchg_called_with_bad_pointer(void);
-+
-+static __always_inline unsigned long
-+__cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size)
-+{
-+	switch (size) {
-+		case 1:
-+			return __cmpxchg_u8(ptr, old, new);
-+		case 2:
-+			return __cmpxchg_u16(ptr, old, new);
-+		case 4:
-+			return __cmpxchg_u32(ptr, old, new);
-+		case 8:
-+			return __cmpxchg_u64(ptr, old, new);
-+	}
-+	__cmpxchg_called_with_bad_pointer();
-+	return old;
-+}
-+
-+#define cmpxchg(ptr,o,n)						 \
-+  ({									 \
-+     __typeof__(*(ptr)) _o_ = (o);					 \
-+     __typeof__(*(ptr)) _n_ = (n);					 \
-+     (__typeof__(*(ptr))) __cmpxchg((ptr), (unsigned long)_o_,		 \
-+				    (unsigned long)_n_, sizeof(*(ptr))); \
-+  })
-+
-+static inline unsigned long
-+__cmpxchg_u8_local(volatile char *m, long old, long new)
-+{
-+	unsigned long prev, tmp, cmp, addr64;
-+
-+	__asm__ __volatile__(
-+	"	andnot	%5,7,%4\n"
-+	"	insbl	%1,%5,%1\n"
-+	"1:	ldq_l	%2,0(%4)\n"
-+	"	extbl	%2,%5,%0\n"
-+	"	cmpeq	%0,%6,%3\n"
-+	"	beq	%3,2f\n"
-+	"	mskbl	%2,%5,%2\n"
-+	"	or	%1,%2,%2\n"
-+	"	stq_c	%2,0(%4)\n"
-+	"	beq	%2,3f\n"
-+	"2:\n"
-+	".subsection 2\n"
-+	"3:	br	1b\n"
-+	".previous"
-+	: "=&r" (prev), "=&r" (new), "=&r" (tmp), "=&r" (cmp), "=&r" (addr64)
-+	: "r" ((long)m), "Ir" (old), "1" (new) : "memory");
-+
-+	return prev;
-+}
-+
-+static inline unsigned long
-+__cmpxchg_u16_local(volatile short *m, long old, long new)
-+{
-+	unsigned long prev, tmp, cmp, addr64;
-+
-+	__asm__ __volatile__(
-+	"	andnot	%5,7,%4\n"
-+	"	inswl	%1,%5,%1\n"
-+	"1:	ldq_l	%2,0(%4)\n"
-+	"	extwl	%2,%5,%0\n"
-+	"	cmpeq	%0,%6,%3\n"
-+	"	beq	%3,2f\n"
-+	"	mskwl	%2,%5,%2\n"
-+	"	or	%1,%2,%2\n"
-+	"	stq_c	%2,0(%4)\n"
-+	"	beq	%2,3f\n"
-+	"2:\n"
-+	".subsection 2\n"
-+	"3:	br	1b\n"
-+	".previous"
-+	: "=&r" (prev), "=&r" (new), "=&r" (tmp), "=&r" (cmp), "=&r" (addr64)
-+	: "r" ((long)m), "Ir" (old), "1" (new) : "memory");
-+
-+	return prev;
-+}
-+
-+static inline unsigned long
-+__cmpxchg_u32_local(volatile int *m, int old, int new)
-+{
-+	unsigned long prev, cmp;
-+
-+	__asm__ __volatile__(
-+	"1:	ldl_l %0,%5\n"
-+	"	cmpeq %0,%3,%1\n"
-+	"	beq %1,2f\n"
-+	"	mov %4,%1\n"
-+	"	stl_c %1,%2\n"
-+	"	beq %1,3f\n"
-+	"2:\n"
-+	".subsection 2\n"
-+	"3:	br 1b\n"
-+	".previous"
-+	: "=&r"(prev), "=&r"(cmp), "=m"(*m)
-+	: "r"((long) old), "r"(new), "m"(*m) : "memory");
-+
-+	return prev;
-+}
-+
-+static inline unsigned long
-+__cmpxchg_u64_local(volatile long *m, unsigned long old, unsigned long new)
-+{
-+	unsigned long prev, cmp;
-+
-+	__asm__ __volatile__(
-+	"1:	ldq_l %0,%5\n"
-+	"	cmpeq %0,%3,%1\n"
-+	"	beq %1,2f\n"
-+	"	mov %4,%1\n"
-+	"	stq_c %1,%2\n"
-+	"	beq %1,3f\n"
-+	"2:\n"
-+	".subsection 2\n"
-+	"3:	br 1b\n"
-+	".previous"
-+	: "=&r"(prev), "=&r"(cmp), "=m"(*m)
-+	: "r"((long) old), "r"(new), "m"(*m) : "memory");
-+
-+	return prev;
-+}
-+
-+static __always_inline unsigned long
-+__cmpxchg_local(volatile void *ptr, unsigned long old, unsigned long new,
-+		int size)
-+{
-+	switch (size) {
-+		case 1:
-+			return __cmpxchg_u8_local(ptr, old, new);
-+		case 2:
-+			return __cmpxchg_u16_local(ptr, old, new);
-+		case 4:
-+			return __cmpxchg_u32_local(ptr, old, new);
-+		case 8:
-+			return __cmpxchg_u64_local(ptr, old, new);
-+	}
-+	__cmpxchg_called_with_bad_pointer();
-+	return old;
-+}
-+
-+#define cmpxchg_local(ptr,o,n)						 \
-+  ({									 \
-+     __typeof__(*(ptr)) _o_ = (o);					 \
-+     __typeof__(*(ptr)) _n_ = (n);					 \
-+     (__typeof__(*(ptr))) __cmpxchg_local((ptr), (unsigned long)_o_,	 \
-+				    (unsigned long)_n_, sizeof(*(ptr))); \
-+  })
-+
-+#endif /* __ASSEMBLY__ */
-+
-+#define arch_align_stack(x) (x)
-+
-+#endif
-diff -Naur aboot-0.9b.orig/include/asm/types.h aboot-0.9b/include/asm/types.h
---- aboot-0.9b.orig/include/asm/types.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/asm/types.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,38 @@
-+#ifndef _ALPHA_TYPES_H
-+#define _ALPHA_TYPES_H
-+
-+/*
-+ * This file is never included by application software unless
-+ * explicitly requested (e.g., via linux/types.h) in which case the
-+ * application is Linux specific so (user-) name space pollution is
-+ * not a major issue.  However, for interoperability, libraries still
-+ * need to be careful to avoid a name clashes.
-+ */
-+
-+#ifndef __ASSEMBLY__
-+
-+typedef unsigned int umode_t;
-+
-+/*
-+ * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
-+ * header files exported to user space
-+ */
-+
-+typedef __signed__ char __s8;
-+typedef unsigned char __u8;
-+
-+typedef __signed__ short __s16;
-+typedef unsigned short __u16;
-+
-+typedef __signed__ int __s32;
-+typedef unsigned int __u32;
-+
-+typedef __signed__ long __s64;
-+typedef unsigned long __u64;
-+
-+#endif /* __ASSEMBLY__ */
-+
-+/*
-+ * These aren't exported outside the kernel to avoid name space clashes
-+ */
-+#endif /* _ALPHA_TYPES_H */
-diff -Naur aboot-0.9b.orig/include/asm-generic/memory_model.h aboot-0.9b/include/asm-generic/memory_model.h
---- aboot-0.9b.orig/include/asm-generic/memory_model.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/asm-generic/memory_model.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,80 @@
-+#ifndef __ASM_MEMORY_MODEL_H
-+#define __ASM_MEMORY_MODEL_H
-+
-+#ifdef __KERNEL__
-+#ifndef __ASSEMBLY__
-+
-+#if defined(CONFIG_FLATMEM)
-+
-+#ifndef ARCH_PFN_OFFSET
-+#define ARCH_PFN_OFFSET		(0UL)
-+#endif
-+
-+#elif defined(CONFIG_DISCONTIGMEM)
-+
-+#ifndef arch_pfn_to_nid
-+#define arch_pfn_to_nid(pfn)	pfn_to_nid(pfn)
-+#endif
-+
-+#ifndef arch_local_page_offset
-+#define arch_local_page_offset(pfn, nid)	\
-+	((pfn) - NODE_DATA(nid)->node_start_pfn)
-+#endif
-+
-+#endif /* CONFIG_DISCONTIGMEM */
-+
-+/*
-+ * supports 3 memory models.
-+ */
-+#if defined(CONFIG_FLATMEM)
-+
-+#define __pfn_to_page(pfn)	(mem_map + ((pfn) - ARCH_PFN_OFFSET))
-+#define __page_to_pfn(page)	((unsigned long)((page) - mem_map) + \
-+				 ARCH_PFN_OFFSET)
-+#elif defined(CONFIG_DISCONTIGMEM)
-+
-+#define __pfn_to_page(pfn)			\
-+({	unsigned long __pfn = (pfn);		\
-+	unsigned long __nid = arch_pfn_to_nid(pfn);  \
-+	NODE_DATA(__nid)->node_mem_map + arch_local_page_offset(__pfn, __nid);\
-+})
-+
-+#define __page_to_pfn(pg)						\
-+({	struct page *__pg = (pg);					\
-+	struct pglist_data *__pgdat = NODE_DATA(page_to_nid(__pg));	\
-+	(unsigned long)(__pg - __pgdat->node_mem_map) +			\
-+	 __pgdat->node_start_pfn;					\
-+})
-+
-+#elif defined(CONFIG_SPARSEMEM)
-+/*
-+ * Note: section's mem_map is encorded to reflect its start_pfn.
-+ * section[i].section_mem_map == mem_map's address - start_pfn;
-+ */
-+#define __page_to_pfn(pg)					\
-+({	struct page *__pg = (pg);				\
-+	int __sec = page_to_section(__pg);			\
-+	(unsigned long)(__pg - __section_mem_map_addr(__nr_to_section(__sec)));	\
-+})
-+
-+#define __pfn_to_page(pfn)				\
-+({	unsigned long __pfn = (pfn);			\
-+	struct mem_section *__sec = __pfn_to_section(__pfn);	\
-+	__section_mem_map_addr(__sec) + __pfn;		\
-+})
-+#endif /* CONFIG_FLATMEM/DISCONTIGMEM/SPARSEMEM */
-+
-+#ifdef CONFIG_OUT_OF_LINE_PFN_TO_PAGE
-+struct page;
-+/* this is useful when inlined pfn_to_page is too big */
-+extern struct page *pfn_to_page(unsigned long pfn);
-+extern unsigned long page_to_pfn(struct page *page);
-+#else
-+#define page_to_pfn __page_to_pfn
-+#define pfn_to_page __pfn_to_page
-+#endif /* CONFIG_OUT_OF_LINE_PFN_TO_PAGE */
-+
-+#endif /* __ASSEMBLY__ */
-+#endif /* __KERNEL__ */
-+
-+#endif
-diff -Naur aboot-0.9b.orig/include/asm-generic/page.h aboot-0.9b/include/asm-generic/page.h
---- aboot-0.9b.orig/include/asm-generic/page.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/asm-generic/page.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,26 @@
-+#ifndef _ASM_GENERIC_PAGE_H
-+#define _ASM_GENERIC_PAGE_H
-+
-+#ifdef __KERNEL__
-+#ifndef __ASSEMBLY__
-+
-+#include <linux/compiler.h>
-+
-+/* Pure 2^n version of get_order */
-+static __inline__ __attribute_const__ int get_order(unsigned long size)
-+{
-+	int order;
-+
-+	size = (size - 1) >> (PAGE_SHIFT - 1);
-+	order = -1;
-+	do {
-+		size >>= 1;
-+		order++;
-+	} while (size);
-+	return order;
-+}
-+
-+#endif	/* __ASSEMBLY__ */
-+#endif	/* __KERNEL__ */
-+
-+#endif	/* _ASM_GENERIC_PAGE_H */
-diff -Naur aboot-0.9b.orig/include/linux/a.out.h aboot-0.9b/include/linux/a.out.h
---- aboot-0.9b.orig/include/linux/a.out.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/linux/a.out.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,268 @@
-+#ifndef __A_OUT_GNU_H__
-+#define __A_OUT_GNU_H__
-+
-+#define __GNU_EXEC_MACROS__
-+
-+#ifndef __STRUCT_EXEC_OVERRIDE__
-+
-+#include <asm/a.out.h>
-+
-+#endif /* __STRUCT_EXEC_OVERRIDE__ */
-+
-+/* these go in the N_MACHTYPE field */
-+enum machine_type {
-+#if defined (M_OLDSUN2)
-+  M__OLDSUN2 = M_OLDSUN2,
-+#else
-+  M_OLDSUN2 = 0,
-+#endif
-+#if defined (M_68010)
-+  M__68010 = M_68010,
-+#else
-+  M_68010 = 1,
-+#endif
-+#if defined (M_68020)
-+  M__68020 = M_68020,
-+#else
-+  M_68020 = 2,
-+#endif
-+#if defined (M_SPARC)
-+  M__SPARC = M_SPARC,
-+#else
-+  M_SPARC = 3,
-+#endif
-+  /* skip a bunch so we don't run into any of sun's numbers */
-+  M_386 = 100,
-+  M_MIPS1 = 151,	/* MIPS R3000/R3000 binary */
-+  M_MIPS2 = 152		/* MIPS R6000/R4000 binary */
-+};
-+
-+#if !defined (N_MAGIC)
-+#define N_MAGIC(exec) ((exec).a_info & 0xffff)
-+#endif
-+#define N_MACHTYPE(exec) ((enum machine_type)(((exec).a_info >> 16) & 0xff))
-+#define N_FLAGS(exec) (((exec).a_info >> 24) & 0xff)
-+#define N_SET_INFO(exec, magic, type, flags) \
-+	((exec).a_info = ((magic) & 0xffff) \
-+	 | (((int)(type) & 0xff) << 16) \
-+	 | (((flags) & 0xff) << 24))
-+#define N_SET_MAGIC(exec, magic) \
-+	((exec).a_info = (((exec).a_info & 0xffff0000) | ((magic) & 0xffff)))
-+
-+#define N_SET_MACHTYPE(exec, machtype) \
-+	((exec).a_info = \
-+	 ((exec).a_info&0xff00ffff) | ((((int)(machtype))&0xff) << 16))
-+
-+#define N_SET_FLAGS(exec, flags) \
-+	((exec).a_info = \
-+	 ((exec).a_info&0x00ffffff) | (((flags) & 0xff) << 24))
-+
-+/* Code indicating object file or impure executable.  */
-+#define OMAGIC 0407
-+/* Code indicating pure executable.  */
-+#define NMAGIC 0410
-+/* Code indicating demand-paged executable.  */
-+#define ZMAGIC 0413
-+/* This indicates a demand-paged executable with the header in the text. 
-+   The first page is unmapped to help trap NULL pointer references */
-+#define QMAGIC 0314
-+
-+/* Code indicating core file.  */
-+#define CMAGIC 0421
-+
-+#if !defined (N_BADMAG)
-+#define N_BADMAG(x)	  (N_MAGIC(x) != OMAGIC		\
-+			&& N_MAGIC(x) != NMAGIC		\
-+  			&& N_MAGIC(x) != ZMAGIC \
-+		        && N_MAGIC(x) != QMAGIC)
-+#endif
-+
-+#define _N_HDROFF(x) (1024 - sizeof (struct exec))
-+
-+#if !defined (N_TXTOFF)
-+#define N_TXTOFF(x) \
-+ (N_MAGIC(x) == ZMAGIC ? _N_HDROFF((x)) + sizeof (struct exec) : \
-+  (N_MAGIC(x) == QMAGIC ? 0 : sizeof (struct exec)))
-+#endif
-+
-+#if !defined (N_DATOFF)
-+#define N_DATOFF(x) (N_TXTOFF(x) + (x).a_text)
-+#endif
-+
-+#if !defined (N_TRELOFF)
-+#define N_TRELOFF(x) (N_DATOFF(x) + (x).a_data)
-+#endif
-+
-+#if !defined (N_DRELOFF)
-+#define N_DRELOFF(x) (N_TRELOFF(x) + N_TRSIZE(x))
-+#endif
-+
-+#if !defined (N_SYMOFF)
-+#define N_SYMOFF(x) (N_DRELOFF(x) + N_DRSIZE(x))
-+#endif
-+
-+#if !defined (N_STROFF)
-+#define N_STROFF(x) (N_SYMOFF(x) + N_SYMSIZE(x))
-+#endif
-+
-+/* Address of text segment in memory after it is loaded.  */
-+#if !defined (N_TXTADDR)
-+#define N_TXTADDR(x) (N_MAGIC(x) == QMAGIC ? PAGE_SIZE : 0)
-+#endif
-+
-+/* Address of data segment in memory after it is loaded.
-+   Note that it is up to you to define SEGMENT_SIZE
-+   on machines not listed here.  */
-+#if defined(vax) || defined(hp300) || defined(pyr)
-+#define SEGMENT_SIZE page_size
-+#endif
-+#ifdef	sony
-+#define	SEGMENT_SIZE	0x2000
-+#endif	/* Sony.  */
-+#ifdef is68k
-+#define SEGMENT_SIZE 0x20000
-+#endif
-+#if defined(m68k) && defined(PORTAR)
-+#define PAGE_SIZE 0x400
-+#define SEGMENT_SIZE PAGE_SIZE
-+#endif
-+
-+#ifdef linux
-+#include <asm/page.h>
-+#if defined(__i386__) || defined(__mc68000__)
-+#define SEGMENT_SIZE	1024
-+#else
-+#ifndef SEGMENT_SIZE
-+#define SEGMENT_SIZE	PAGE_SIZE
-+#endif
-+#endif
-+#endif
-+
-+#define _N_SEGMENT_ROUND(x) ALIGN(x, SEGMENT_SIZE)
-+
-+#define _N_TXTENDADDR(x) (N_TXTADDR(x)+(x).a_text)
-+
-+#ifndef N_DATADDR
-+#define N_DATADDR(x) \
-+    (N_MAGIC(x)==OMAGIC? (_N_TXTENDADDR(x)) \
-+     : (_N_SEGMENT_ROUND (_N_TXTENDADDR(x))))
-+#endif
-+
-+/* Address of bss segment in memory after it is loaded.  */
-+#if !defined (N_BSSADDR)
-+#define N_BSSADDR(x) (N_DATADDR(x) + (x).a_data)
-+#endif
-+
-
-+#if !defined (N_NLIST_DECLARED)
-+struct nlist {
-+  union {
-+    char *n_name;
-+    struct nlist *n_next;
-+    long n_strx;
-+  } n_un;
-+  unsigned char n_type;
-+  char n_other;
-+  short n_desc;
-+  unsigned long n_value;
-+};
-+#endif /* no N_NLIST_DECLARED.  */
-+
-+#if !defined (N_UNDF)
-+#define N_UNDF 0
-+#endif
-+#if !defined (N_ABS)
-+#define N_ABS 2
-+#endif
-+#if !defined (N_TEXT)
-+#define N_TEXT 4
-+#endif
-+#if !defined (N_DATA)
-+#define N_DATA 6
-+#endif
-+#if !defined (N_BSS)
-+#define N_BSS 8
-+#endif
-+#if !defined (N_FN)
-+#define N_FN 15
-+#endif
-+
-+#if !defined (N_EXT)
-+#define N_EXT 1
-+#endif
-+#if !defined (N_TYPE)
-+#define N_TYPE 036
-+#endif
-+#if !defined (N_STAB)
-+#define N_STAB 0340
-+#endif
-+
-+/* The following type indicates the definition of a symbol as being
-+   an indirect reference to another symbol.  The other symbol
-+   appears as an undefined reference, immediately following this symbol.
-+
-+   Indirection is asymmetrical.  The other symbol's value will be used
-+   to satisfy requests for the indirect symbol, but not vice versa.
-+   If the other symbol does not have a definition, libraries will
-+   be searched to find a definition.  */
-+#define N_INDR 0xa
-+
-+/* The following symbols refer to set elements.
-+   All the N_SET[ATDB] symbols with the same name form one set.
-+   Space is allocated for the set in the text section, and each set
-+   element's value is stored into one word of the space.
-+   The first word of the space is the length of the set (number of elements).
-+
-+   The address of the set is made into an N_SETV symbol
-+   whose name is the same as the name of the set.
-+   This symbol acts like a N_DATA global symbol
-+   in that it can satisfy undefined external references.  */
-+
-+/* These appear as input to LD, in a .o file.  */
-+#define	N_SETA	0x14		/* Absolute set element symbol */
-+#define	N_SETT	0x16		/* Text set element symbol */
-+#define	N_SETD	0x18		/* Data set element symbol */
-+#define	N_SETB	0x1A		/* Bss set element symbol */
-+
-+/* This is output from LD.  */
-+#define N_SETV	0x1C		/* Pointer to set vector in data area.  */
-+
-
-+#if !defined (N_RELOCATION_INFO_DECLARED)
-+/* This structure describes a single relocation to be performed.
-+   The text-relocation section of the file is a vector of these structures,
-+   all of which apply to the text section.
-+   Likewise, the data-relocation section applies to the data section.  */
-+
-+struct relocation_info
-+{
-+  /* Address (within segment) to be relocated.  */
-+  int r_address;
-+  /* The meaning of r_symbolnum depends on r_extern.  */
-+  unsigned int r_symbolnum:24;
-+  /* Nonzero means value is a pc-relative offset
-+     and it should be relocated for changes in its own address
-+     as well as for changes in the symbol or section specified.  */
-+  unsigned int r_pcrel:1;
-+  /* Length (as exponent of 2) of the field to be relocated.
-+     Thus, a value of 2 indicates 1<<2 bytes.  */
-+  unsigned int r_length:2;
-+  /* 1 => relocate with value of symbol.
-+          r_symbolnum is the index of the symbol
-+	  in file's the symbol table.
-+     0 => relocate with the address of a segment.
-+          r_symbolnum is N_TEXT, N_DATA, N_BSS or N_ABS
-+	  (the N_EXT bit may be set also, but signifies nothing).  */
-+  unsigned int r_extern:1;
-+  /* Four bits that aren't used, but when writing an object file
-+     it is desirable to clear them.  */
-+#ifdef NS32K
-+  unsigned r_bsr:1;
-+  unsigned r_disp:1;
-+  unsigned r_pad:2;
-+#else
-+  unsigned int r_pad:4;
-+#endif
-+};
-+#endif /* no N_RELOCATION_INFO_DECLARED.  */
-+
-+
-+#endif /* __A_OUT_GNU_H__ */
-diff -Naur aboot-0.9b.orig/include/linux/auxvec.h aboot-0.9b/include/linux/auxvec.h
---- aboot-0.9b.orig/include/linux/auxvec.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/linux/auxvec.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,31 @@
-+#ifndef _LINUX_AUXVEC_H
-+#define _LINUX_AUXVEC_H
-+
-+#include <asm/auxvec.h>
-+
-+/* Symbolic values for the entries in the auxiliary table
-+   put on the initial stack */
-+#define AT_NULL   0	/* end of vector */
-+#define AT_IGNORE 1	/* entry should be ignored */
-+#define AT_EXECFD 2	/* file descriptor of program */
-+#define AT_PHDR   3	/* program headers for program */
-+#define AT_PHENT  4	/* size of program header entry */
-+#define AT_PHNUM  5	/* number of program headers */
-+#define AT_PAGESZ 6	/* system page size */
-+#define AT_BASE   7	/* base address of interpreter */
-+#define AT_FLAGS  8	/* flags */
-+#define AT_ENTRY  9	/* entry point of program */
-+#define AT_NOTELF 10	/* program is not ELF */
-+#define AT_UID    11	/* real uid */
-+#define AT_EUID   12	/* effective uid */
-+#define AT_GID    13	/* real gid */
-+#define AT_EGID   14	/* effective gid */
-+#define AT_PLATFORM 15  /* string identifying CPU for optimizations */
-+#define AT_HWCAP  16    /* arch dependent hints at CPU capabilities */
-+#define AT_CLKTCK 17	/* frequency at which times() increments */
-+
-+#define AT_SECURE 23   /* secure mode boolean */
-+
-+#define AT_VECTOR_SIZE  44 /* Size of auxiliary table.  */
-+
-+#endif /* _LINUX_AUXVEC_H */
-diff -Naur aboot-0.9b.orig/include/linux/coff.h aboot-0.9b/include/linux/coff.h
---- aboot-0.9b.orig/include/linux/coff.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/linux/coff.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,351 @@
-+/* This file is derived from the GAS 2.1.4 assembler control file.
-+   The GAS product is under the GNU General Public License, version 2 or later.
-+   As such, this file is also under that license.
-+
-+   If the file format changes in the COFF object, this file should be
-+   subsequently updated to reflect the changes.
-+
-+   The actual loader module only uses a few of these structures. The full
-+   set is documented here because I received the full set. If you wish
-+   more information about COFF, then O'Reilly has a very excellent book.
-+*/
-+
-+#define  E_SYMNMLEN  8   /* Number of characters in a symbol name         */
-+#define  E_FILNMLEN 14   /* Number of characters in a file name           */
-+#define  E_DIMNUM    4   /* Number of array dimensions in auxiliary entry */
-+
-+/*
-+ * These defines are byte order independent. There is no alignment of fields
-+ * permitted in the structures. Therefore they are declared as characters
-+ * and the values loaded from the character positions. It also makes it
-+ * nice to have it "endian" independent.
-+ */
-+ 
-+/* Load a short int from the following tables with little-endian formats */
-+#define COFF_SHORT_L(ps) ((short)(((unsigned short)((unsigned char)ps[1])<<8)|\
-+				  ((unsigned short)((unsigned char)ps[0]))))
-+
-+/* Load a long int from the following tables with little-endian formats */
-+#define COFF_LONG_L(ps) (((long)(((unsigned long)((unsigned char)ps[3])<<24) |\
-+				 ((unsigned long)((unsigned char)ps[2])<<16) |\
-+				 ((unsigned long)((unsigned char)ps[1])<<8)  |\
-+				 ((unsigned long)((unsigned char)ps[0])))))
-+ 
-+/* Load a short int from the following tables with big-endian formats */
-+#define COFF_SHORT_H(ps) ((short)(((unsigned short)((unsigned char)ps[0])<<8)|\
-+				  ((unsigned short)((unsigned char)ps[1]))))
-+
-+/* Load a long int from the following tables with big-endian formats */
-+#define COFF_LONG_H(ps) (((long)(((unsigned long)((unsigned char)ps[0])<<24) |\
-+				 ((unsigned long)((unsigned char)ps[1])<<16) |\
-+				 ((unsigned long)((unsigned char)ps[2])<<8)  |\
-+				 ((unsigned long)((unsigned char)ps[3])))))
-+
-+/* These may be overridden later by brain dead implementations which generate
-+   a big-endian header with little-endian data. In that case, generate a
-+   replacement macro which tests a flag and uses either of the two above
-+   as appropriate. */
-+
-+#define COFF_LONG(v)   COFF_LONG_L(v)
-+#define COFF_SHORT(v)  COFF_SHORT_L(v)
-+
-+/*** coff information for Intel 386/486.  */
-+
-+/********************** FILE HEADER **********************/
-+
-+struct COFF_filehdr {
-+	char f_magic[2];	/* magic number			*/
-+	char f_nscns[2];	/* number of sections		*/
-+	char f_timdat[4];	/* time & date stamp		*/
-+	char f_symptr[4];	/* file pointer to symtab	*/
-+	char f_nsyms[4];	/* number of symtab entries	*/
-+	char f_opthdr[2];	/* sizeof(optional hdr)		*/
-+	char f_flags[2];	/* flags			*/
-+};
-+
-+/*
-+ *   Bits for f_flags:
-+ *
-+ *	F_RELFLG	relocation info stripped from file
-+ *	F_EXEC		file is executable  (i.e. no unresolved external
-+ *			references)
-+ *	F_LNNO		line numbers stripped from file
-+ *	F_LSYMS		local symbols stripped from file
-+ *	F_MINMAL	this is a minimal object file (".m") output of fextract
-+ *	F_UPDATE	this is a fully bound update file, output of ogen
-+ *	F_SWABD		this file has had its bytes swabbed (in names)
-+ *	F_AR16WR	this file has the byte ordering of an AR16WR
-+ *			(e.g. 11/70) machine
-+ *	F_AR32WR	this file has the byte ordering of an AR32WR machine
-+ *			(e.g. vax and iNTEL 386)
-+ *	F_AR32W		this file has the byte ordering of an AR32W machine
-+ *			(e.g. 3b,maxi)
-+ *	F_PATCH		file contains "patch" list in optional header
-+ *	F_NODF		(minimal file only) no decision functions for
-+ *			replaced functions
-+ */
-+
-+#define  COFF_F_RELFLG		0000001
-+#define  COFF_F_EXEC		0000002
-+#define  COFF_F_LNNO		0000004
-+#define  COFF_F_LSYMS		0000010
-+#define  COFF_F_MINMAL		0000020
-+#define  COFF_F_UPDATE		0000040
-+#define  COFF_F_SWABD		0000100
-+#define  COFF_F_AR16WR		0000200
-+#define  COFF_F_AR32WR		0000400
-+#define  COFF_F_AR32W		0001000
-+#define  COFF_F_PATCH		0002000
-+#define  COFF_F_NODF		0002000
-+
-+#define	COFF_I386MAGIC	        0x14c   /* Linux's system    */
-+
-+#if 0   /* Perhaps, someday, these formats may be used.      */
-+#define COFF_I386PTXMAGIC	0x154
-+#define COFF_I386AIXMAGIC	0x175   /* IBM's AIX system  */
-+#define COFF_I386BADMAG(x) ((COFF_SHORT((x).f_magic) != COFF_I386MAGIC) \
-+			  && COFF_SHORT((x).f_magic) != COFF_I386PTXMAGIC \
-+			  && COFF_SHORT((x).f_magic) != COFF_I386AIXMAGIC)
-+#else
-+#define COFF_I386BADMAG(x) (COFF_SHORT((x).f_magic) != COFF_I386MAGIC)
-+#endif
-+
-+#define	COFF_FILHDR	struct COFF_filehdr
-+#define	COFF_FILHSZ	sizeof(COFF_FILHDR)
-+
-+/********************** AOUT "OPTIONAL HEADER" **********************/
-+
-+/* Linux COFF must have this "optional" header. Standard COFF has no entry
-+   location for the "entry" point. They normally would start with the first
-+   location of the .text section. This is not a good idea for linux. So,
-+   the use of this "optional" header is not optional. It is required.
-+
-+   Do not be tempted to assume that the size of the optional header is
-+   a constant and simply index the next byte by the size of this structure.
-+   Use the 'f_opthdr' field in the main coff header for the size of the
-+   structure actually written to the file!!
-+*/
-+
-+typedef struct 
-+{
-+  char 	magic[2];		/* type of file				 */
-+  char	vstamp[2];		/* version stamp			 */
-+  char	tsize[4];		/* text size in bytes, padded to FW bdry */
-+  char	dsize[4];		/* initialized   data "   "		 */
-+  char	bsize[4];		/* uninitialized data "   "		 */
-+  char	entry[4];		/* entry pt.				 */
-+  char 	text_start[4];		/* base of text used for this file       */
-+  char 	data_start[4];		/* base of data used for this file       */
-+}
-+COFF_AOUTHDR;
-+
-+#define COFF_AOUTSZ (sizeof(COFF_AOUTHDR))
-+
-+#define COFF_STMAGIC	0401
-+#define COFF_OMAGIC     0404
-+#define COFF_JMAGIC     0407    /* dirty text and data image, can't share  */
-+#define COFF_DMAGIC     0410    /* dirty text segment, data aligned        */
-+#define COFF_ZMAGIC     0413    /* The proper magic number for executables  */
-+#define COFF_SHMAGIC	0443	/* shared library header                   */
-+
-+/********************** SECTION HEADER **********************/
-+
-+struct COFF_scnhdr {
-+  char		s_name[8];	/* section name			    */
-+  char		s_paddr[4];	/* physical address, aliased s_nlib */
-+  char		s_vaddr[4];	/* virtual address		    */
-+  char		s_size[4];	/* section size			    */
-+  char		s_scnptr[4];	/* file ptr to raw data for section */
-+  char		s_relptr[4];	/* file ptr to relocation	    */
-+  char		s_lnnoptr[4];	/* file ptr to line numbers	    */
-+  char		s_nreloc[2];	/* number of relocation entries	    */
-+  char		s_nlnno[2];	/* number of line number entries    */
-+  char		s_flags[4];	/* flags			    */
-+};
-+
-+#define	COFF_SCNHDR	struct COFF_scnhdr
-+#define	COFF_SCNHSZ	sizeof(COFF_SCNHDR)
-+
-+/*
-+ * names of "special" sections
-+ */
-+
-+#define COFF_TEXT	".text"
-+#define COFF_DATA	".data"
-+#define COFF_BSS	".bss"
-+#define COFF_COMMENT    ".comment"
-+#define COFF_LIB        ".lib"
-+
-+#define COFF_SECT_TEXT  0      /* Section for instruction code             */
-+#define COFF_SECT_DATA  1      /* Section for initialized globals          */
-+#define COFF_SECT_BSS   2      /* Section for un-initialized globals       */
-+#define COFF_SECT_REQD  3      /* Minimum number of sections for good file */
-+
-+#define COFF_STYP_REG     0x00 /* regular segment                          */
-+#define COFF_STYP_DSECT   0x01 /* dummy segment                            */
-+#define COFF_STYP_NOLOAD  0x02 /* no-load segment                          */
-+#define COFF_STYP_GROUP   0x04 /* group segment                            */
-+#define COFF_STYP_PAD     0x08 /* .pad segment                             */
-+#define COFF_STYP_COPY    0x10 /* copy section                             */
-+#define COFF_STYP_TEXT    0x20 /* .text segment                            */
-+#define COFF_STYP_DATA    0x40 /* .data segment                            */
-+#define COFF_STYP_BSS     0x80 /* .bss segment                             */
-+#define COFF_STYP_INFO   0x200 /* .comment section                         */
-+#define COFF_STYP_OVER   0x400 /* overlay section                          */
-+#define COFF_STYP_LIB    0x800 /* library section                          */
-+
-+/*
-+ * Shared libraries have the following section header in the data field for
-+ * each library.
-+ */
-+
-+struct COFF_slib {
-+  char		sl_entsz[4];	/* Size of this entry               */
-+  char		sl_pathndx[4];	/* size of the header field         */
-+};
-+
-+#define	COFF_SLIBHD	struct COFF_slib
-+#define	COFF_SLIBSZ	sizeof(COFF_SLIBHD)
-+
-+/********************** LINE NUMBERS **********************/
-+
-+/* 1 line number entry for every "breakpointable" source line in a section.
-+ * Line numbers are grouped on a per function basis; first entry in a function
-+ * grouping will have l_lnno = 0 and in place of physical address will be the
-+ * symbol table index of the function name.
-+ */
-+
-+struct COFF_lineno {
-+  union {
-+    char l_symndx[4];	/* function name symbol index, iff l_lnno == 0*/
-+    char l_paddr[4];	/* (physical) address of line number	*/
-+  } l_addr;
-+  char l_lnno[2];	/* line number		*/
-+};
-+
-+#define	COFF_LINENO	struct COFF_lineno
-+#define	COFF_LINESZ	6
-+
-+/********************** SYMBOLS **********************/
-+
-+#define COFF_E_SYMNMLEN	 8	/* # characters in a short symbol name	*/
-+#define COFF_E_FILNMLEN	14	/* # characters in a file name		*/
-+#define COFF_E_DIMNUM	 4	/* # array dimensions in auxiliary entry */
-+
-+/*
-+ *  All symbols and sections have the following definition
-+ */
-+
-+struct COFF_syment 
-+{
-+  union {
-+    char e_name[E_SYMNMLEN];    /* Symbol name (first 8 characters) */
-+    struct {
-+      char e_zeroes[4];         /* Leading zeros */
-+      char e_offset[4];         /* Offset if this is a header section */
-+    } e;
-+  } e;
-+
-+  char e_value[4];              /* Value (address) of the segment */
-+  char e_scnum[2];              /* Section number */
-+  char e_type[2];               /* Type of section */
-+  char e_sclass[1];             /* Loader class */
-+  char e_numaux[1];             /* Number of auxiliary entries which follow */
-+};
-+
-+#define COFF_N_BTMASK	(0xf)   /* Mask for important class bits */
-+#define COFF_N_TMASK	(0x30)  /* Mask for important type bits  */
-+#define COFF_N_BTSHFT	(4)     /* # bits to shift class field   */
-+#define COFF_N_TSHIFT	(2)     /* # bits to shift type field    */
-+
-+/*
-+ *  Auxiliary entries because the main table is too limiting.
-+ */
-+  
-+union COFF_auxent {
-+
-+/*
-+ *  Debugger information
-+ */
-+
-+  struct {
-+    char x_tagndx[4];	        /* str, un, or enum tag indx */
-+    union {
-+      struct {
-+	char  x_lnno[2];        /* declaration line number */
-+	char  x_size[2];        /* str/union/array size */
-+      } x_lnsz;
-+      char x_fsize[4];	        /* size of function */
-+    } x_misc;
-+
-+    union {
-+      struct {		        /* if ISFCN, tag, or .bb */
-+	char x_lnnoptr[4];	/* ptr to fcn line # */
-+	char x_endndx[4];	/* entry ndx past block end */
-+      } x_fcn;
-+
-+      struct {		        /* if ISARY, up to 4 dimen. */
-+	char x_dimen[E_DIMNUM][2];
-+      } x_ary;
-+    } x_fcnary;
-+
-+    char x_tvndx[2];	/* tv index */
-+  } x_sym;
-+
-+/*
-+ *   Source file names (debugger information)
-+ */
-+
-+  union {
-+    char x_fname[E_FILNMLEN];
-+    struct {
-+      char x_zeroes[4];
-+      char x_offset[4];
-+    } x_n;
-+  } x_file;
-+
-+/*
-+ *   Section information
-+ */
-+
-+  struct {
-+    char x_scnlen[4];	/* section length */
-+    char x_nreloc[2];	/* # relocation entries */
-+    char x_nlinno[2];	/* # line numbers */
-+  } x_scn;
-+
-+/*
-+ *   Transfer vector (branch table)
-+ */
-+  
-+  struct {
-+    char x_tvfill[4];	/* tv fill value */
-+    char x_tvlen[2];	/* length of .tv */
-+    char x_tvran[2][2];	/* tv range */
-+  } x_tv;		/* info about .tv section (in auxent of symbol .tv)) */
-+};
-+
-+#define	COFF_SYMENT	struct COFF_syment
-+#define	COFF_SYMESZ	18	
-+#define	COFF_AUXENT	union COFF_auxent
-+#define	COFF_AUXESZ	18
-+
-+#define COFF_ETEXT	"etext"
-+
-+/********************** RELOCATION DIRECTIVES **********************/
-+
-+struct COFF_reloc {
-+  char r_vaddr[4];        /* Virtual address of item    */
-+  char r_symndx[4];       /* Symbol index in the symtab */
-+  char r_type[2];         /* Relocation type            */
-+};
-+
-+#define COFF_RELOC struct COFF_reloc
-+#define COFF_RELSZ 10
-+
-+#define COFF_DEF_DATA_SECTION_ALIGNMENT  4
-+#define COFF_DEF_BSS_SECTION_ALIGNMENT   4
-+#define COFF_DEF_TEXT_SECTION_ALIGNMENT  4
-+
-+/* For new sections we haven't heard of before */
-+#define COFF_DEF_SECTION_ALIGNMENT       4
-diff -Naur aboot-0.9b.orig/include/linux/compiler.h aboot-0.9b/include/linux/compiler.h
---- aboot-0.9b.orig/include/linux/compiler.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/linux/compiler.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,11 @@
-+#ifndef __inline__
-+# define __inline__ inline
-+#endif
-+
-+#ifndef __attribute_const__
-+# define __attribute_const__    /* unimplemented */
-+#endif
-+
-+#ifndef __always_inline
-+# define __always_inline inline
-+#endif
-diff -Naur aboot-0.9b.orig/include/linux/elf-em.h aboot-0.9b/include/linux/elf-em.h
---- aboot-0.9b.orig/include/linux/elf-em.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/linux/elf-em.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,52 @@
-+#ifndef _LINUX_ELF_EM_H
-+#define _LINUX_ELF_EM_H
-+
-+/* These constants define the various ELF target machines */
-+#define EM_NONE		0
-+#define EM_M32		1
-+#define EM_SPARC	2
-+#define EM_386		3
-+#define EM_68K		4
-+#define EM_88K		5
-+#define EM_486		6	/* Perhaps disused */
-+#define EM_860		7
-+#define EM_MIPS		8	/* MIPS R3000 (officially, big-endian only) */
-+				/* Next two are historical and binaries and
-+				   modules of these types will be rejected by
-+				   Linux.  */
-+#define EM_MIPS_RS3_LE	10	/* MIPS R3000 little-endian */
-+#define EM_MIPS_RS4_BE	10	/* MIPS R4000 big-endian */
-+
-+#define EM_PARISC	15	/* HPPA */
-+#define EM_SPARC32PLUS	18	/* Sun's "v8plus" */
-+#define EM_PPC		20	/* PowerPC */
-+#define EM_PPC64	21	 /* PowerPC64 */
-+#define EM_SPU		23	/* Cell BE SPU */
-+#define EM_SH		42	/* SuperH */
-+#define EM_SPARCV9	43	/* SPARC v9 64-bit */
-+#define EM_IA_64	50	/* HP/Intel IA-64 */
-+#define EM_X86_64	62	/* AMD x86-64 */
-+#define EM_S390		22	/* IBM S/390 */
-+#define EM_CRIS		76	/* Axis Communications 32-bit embedded processor */
-+#define EM_V850		87	/* NEC v850 */
-+#define EM_M32R		88	/* Renesas M32R */
-+#define EM_H8_300	46	/* Renesas H8/300,300H,H8S */
-+#define EM_BLACKFIN     106     /* ADI Blackfin Processor */
-+#define EM_FRV		0x5441	/* Fujitsu FR-V */
-+#define EM_AVR32	0x18ad	/* Atmel AVR32 */
-+
-+/*
-+ * This is an interim value that we will use until the committee comes
-+ * up with a final number.
-+ */
-+#define EM_ALPHA	0x9026
-+
-+/* Bogus old v850 magic number, used by old tools. */
-+#define EM_CYGNUS_V850	0x9080
-+/* Bogus old m32r magic number, used by old tools. */
-+#define EM_CYGNUS_M32R	0x9041
-+/* This is the old interim value for S/390 architecture */
-+#define EM_S390_OLD	0xA390
-+
-+
-+#endif /* _LINUX_ELF_EM_H */
-diff -Naur aboot-0.9b.orig/include/linux/elf.h aboot-0.9b/include/linux/elf.h
---- aboot-0.9b.orig/include/linux/elf.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/linux/elf.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,400 @@
-+#ifndef _LINUX_ELF_H
-+#define _LINUX_ELF_H
-+
-+#include <linux/types.h>
-+#include <linux/auxvec.h>
-+#include <linux/elf-em.h>
-+#include <asm/elf.h>
-+
-+struct file;
-+
-+#ifndef elf_read_implies_exec
-+  /* Executables for which elf_read_implies_exec() returns TRUE will
-+     have the READ_IMPLIES_EXEC personality flag set automatically.
-+     Override in asm/elf.h as needed.  */
-+# define elf_read_implies_exec(ex, have_pt_gnu_stack)	0
-+#endif
-+
-+/* 32-bit ELF base types. */
-+typedef __u32	Elf32_Addr;
-+typedef __u16	Elf32_Half;
-+typedef __u32	Elf32_Off;
-+typedef __s32	Elf32_Sword;
-+typedef __u32	Elf32_Word;
-+
-+/* 64-bit ELF base types. */
-+typedef __u64	Elf64_Addr;
-+typedef __u16	Elf64_Half;
-+typedef __s16	Elf64_SHalf;
-+typedef __u64	Elf64_Off;
-+typedef __s32	Elf64_Sword;
-+typedef __u32	Elf64_Word;
-+typedef __u64	Elf64_Xword;
-+typedef __s64	Elf64_Sxword;
-+
-+/* These constants are for the segment types stored in the image headers */
-+#define PT_NULL    0
-+#define PT_LOAD    1
-+#define PT_DYNAMIC 2
-+#define PT_INTERP  3
-+#define PT_NOTE    4
-+#define PT_SHLIB   5
-+#define PT_PHDR    6
-+#define PT_TLS     7               /* Thread local storage segment */
-+#define PT_LOOS    0x60000000      /* OS-specific */
-+#define PT_HIOS    0x6fffffff      /* OS-specific */
-+#define PT_LOPROC  0x70000000
-+#define PT_HIPROC  0x7fffffff
-+#define PT_GNU_EH_FRAME		0x6474e550
-+
-+#define PT_GNU_STACK	(PT_LOOS + 0x474e551)
-+
-+/* These constants define the different elf file types */
-+#define ET_NONE   0
-+#define ET_REL    1
-+#define ET_EXEC   2
-+#define ET_DYN    3
-+#define ET_CORE   4
-+#define ET_LOPROC 0xff00
-+#define ET_HIPROC 0xffff
-+
-+/* This is the info that is needed to parse the dynamic section of the file */
-+#define DT_NULL		0
-+#define DT_NEEDED	1
-+#define DT_PLTRELSZ	2
-+#define DT_PLTGOT	3
-+#define DT_HASH		4
-+#define DT_STRTAB	5
-+#define DT_SYMTAB	6
-+#define DT_RELA		7
-+#define DT_RELASZ	8
-+#define DT_RELAENT	9
-+#define DT_STRSZ	10
-+#define DT_SYMENT	11
-+#define DT_INIT		12
-+#define DT_FINI		13
-+#define DT_SONAME	14
-+#define DT_RPATH 	15
-+#define DT_SYMBOLIC	16
-+#define DT_REL	        17
-+#define DT_RELSZ	18
-+#define DT_RELENT	19
-+#define DT_PLTREL	20
-+#define DT_DEBUG	21
-+#define DT_TEXTREL	22
-+#define DT_JMPREL	23
-+#define DT_ENCODING	32
-+#define OLD_DT_LOOS	0x60000000
-+#define DT_LOOS		0x6000000d
-+#define DT_HIOS		0x6ffff000
-+#define DT_VALRNGLO	0x6ffffd00
-+#define DT_VALRNGHI	0x6ffffdff
-+#define DT_ADDRRNGLO	0x6ffffe00
-+#define DT_ADDRRNGHI	0x6ffffeff
-+#define DT_VERSYM	0x6ffffff0
-+#define DT_RELACOUNT	0x6ffffff9
-+#define DT_RELCOUNT	0x6ffffffa
-+#define DT_FLAGS_1	0x6ffffffb
-+#define DT_VERDEF	0x6ffffffc
-+#define	DT_VERDEFNUM	0x6ffffffd
-+#define DT_VERNEED	0x6ffffffe
-+#define	DT_VERNEEDNUM	0x6fffffff
-+#define OLD_DT_HIOS     0x6fffffff
-+#define DT_LOPROC	0x70000000
-+#define DT_HIPROC	0x7fffffff
-+
-+/* This info is needed when parsing the symbol table */
-+#define STB_LOCAL  0
-+#define STB_GLOBAL 1
-+#define STB_WEAK   2
-+
-+#define STT_NOTYPE  0
-+#define STT_OBJECT  1
-+#define STT_FUNC    2
-+#define STT_SECTION 3
-+#define STT_FILE    4
-+#define STT_COMMON  5
-+#define STT_TLS     6
-+
-+#define ELF_ST_BIND(x)		((x) >> 4)
-+#define ELF_ST_TYPE(x)		(((unsigned int) x) & 0xf)
-+#define ELF32_ST_BIND(x)	ELF_ST_BIND(x)
-+#define ELF32_ST_TYPE(x)	ELF_ST_TYPE(x)
-+#define ELF64_ST_BIND(x)	ELF_ST_BIND(x)
-+#define ELF64_ST_TYPE(x)	ELF_ST_TYPE(x)
-+
-+typedef struct dynamic{
-+  Elf32_Sword d_tag;
-+  union{
-+    Elf32_Sword	d_val;
-+    Elf32_Addr	d_ptr;
-+  } d_un;
-+} Elf32_Dyn;
-+
-+typedef struct {
-+  Elf64_Sxword d_tag;		/* entry tag value */
-+  union {
-+    Elf64_Xword d_val;
-+    Elf64_Addr d_ptr;
-+  } d_un;
-+} Elf64_Dyn;
-+
-+/* The following are used with relocations */
-+#define ELF32_R_SYM(x) ((x) >> 8)
-+#define ELF32_R_TYPE(x) ((x) & 0xff)
-+
-+#define ELF64_R_SYM(i)			((i) >> 32)
-+#define ELF64_R_TYPE(i)			((i) & 0xffffffff)
-+
-+typedef struct elf32_rel {
-+  Elf32_Addr	r_offset;
-+  Elf32_Word	r_info;
-+} Elf32_Rel;
-+
-+typedef struct elf64_rel {
-+  Elf64_Addr r_offset;	/* Location at which to apply the action */
-+  Elf64_Xword r_info;	/* index and type of relocation */
-+} Elf64_Rel;
-+
-+typedef struct elf32_rela{
-+  Elf32_Addr	r_offset;
-+  Elf32_Word	r_info;
-+  Elf32_Sword	r_addend;
-+} Elf32_Rela;
-+
-+typedef struct elf64_rela {
-+  Elf64_Addr r_offset;	/* Location at which to apply the action */
-+  Elf64_Xword r_info;	/* index and type of relocation */
-+  Elf64_Sxword r_addend;	/* Constant addend used to compute value */
-+} Elf64_Rela;
-+
-+typedef struct elf32_sym{
-+  Elf32_Word	st_name;
-+  Elf32_Addr	st_value;
-+  Elf32_Word	st_size;
-+  unsigned char	st_info;
-+  unsigned char	st_other;
-+  Elf32_Half	st_shndx;
-+} Elf32_Sym;
-+
-+typedef struct elf64_sym {
-+  Elf64_Word st_name;		/* Symbol name, index in string tbl */
-+  unsigned char	st_info;	/* Type and binding attributes */
-+  unsigned char	st_other;	/* No defined meaning, 0 */
-+  Elf64_Half st_shndx;		/* Associated section index */
-+  Elf64_Addr st_value;		/* Value of the symbol */
-+  Elf64_Xword st_size;		/* Associated symbol size */
-+} Elf64_Sym;
-+
-+
-+#define EI_NIDENT	16
-+
-+typedef struct elf32_hdr{
-+  unsigned char	e_ident[EI_NIDENT];
-+  Elf32_Half	e_type;
-+  Elf32_Half	e_machine;
-+  Elf32_Word	e_version;
-+  Elf32_Addr	e_entry;  /* Entry point */
-+  Elf32_Off	e_phoff;
-+  Elf32_Off	e_shoff;
-+  Elf32_Word	e_flags;
-+  Elf32_Half	e_ehsize;
-+  Elf32_Half	e_phentsize;
-+  Elf32_Half	e_phnum;
-+  Elf32_Half	e_shentsize;
-+  Elf32_Half	e_shnum;
-+  Elf32_Half	e_shstrndx;
-+} Elf32_Ehdr;
-+
-+typedef struct elf64_hdr {
-+  unsigned char	e_ident[16];		/* ELF "magic number" */
-+  Elf64_Half e_type;
-+  Elf64_Half e_machine;
-+  Elf64_Word e_version;
-+  Elf64_Addr e_entry;		/* Entry point virtual address */
-+  Elf64_Off e_phoff;		/* Program header table file offset */
-+  Elf64_Off e_shoff;		/* Section header table file offset */
-+  Elf64_Word e_flags;
-+  Elf64_Half e_ehsize;
-+  Elf64_Half e_phentsize;
-+  Elf64_Half e_phnum;
-+  Elf64_Half e_shentsize;
-+  Elf64_Half e_shnum;
-+  Elf64_Half e_shstrndx;
-+} Elf64_Ehdr;
-+
-+/* These constants define the permissions on sections in the program
-+   header, p_flags. */
-+#define PF_R		0x4
-+#define PF_W		0x2
-+#define PF_X		0x1
-+
-+typedef struct elf32_phdr{
-+  Elf32_Word	p_type;
-+  Elf32_Off	p_offset;
-+  Elf32_Addr	p_vaddr;
-+  Elf32_Addr	p_paddr;
-+  Elf32_Word	p_filesz;
-+  Elf32_Word	p_memsz;
-+  Elf32_Word	p_flags;
-+  Elf32_Word	p_align;
-+} Elf32_Phdr;
-+
-+typedef struct elf64_phdr {
-+  Elf64_Word p_type;
-+  Elf64_Word p_flags;
-+  Elf64_Off p_offset;		/* Segment file offset */
-+  Elf64_Addr p_vaddr;		/* Segment virtual address */
-+  Elf64_Addr p_paddr;		/* Segment physical address */
-+  Elf64_Xword p_filesz;		/* Segment size in file */
-+  Elf64_Xword p_memsz;		/* Segment size in memory */
-+  Elf64_Xword p_align;		/* Segment alignment, file & memory */
-+} Elf64_Phdr;
-+
-+/* sh_type */
-+#define SHT_NULL	0
-+#define SHT_PROGBITS	1
-+#define SHT_SYMTAB	2
-+#define SHT_STRTAB	3
-+#define SHT_RELA	4
-+#define SHT_HASH	5
-+#define SHT_DYNAMIC	6
-+#define SHT_NOTE	7
-+#define SHT_NOBITS	8
-+#define SHT_REL		9
-+#define SHT_SHLIB	10
-+#define SHT_DYNSYM	11
-+#define SHT_NUM		12
-+#define SHT_LOPROC	0x70000000
-+#define SHT_HIPROC	0x7fffffff
-+#define SHT_LOUSER	0x80000000
-+#define SHT_HIUSER	0xffffffff
-+
-+/* sh_flags */
-+#define SHF_WRITE	0x1
-+#define SHF_ALLOC	0x2
-+#define SHF_EXECINSTR	0x4
-+#define SHF_MASKPROC	0xf0000000
-+
-+/* special section indexes */
-+#define SHN_UNDEF	0
-+#define SHN_LORESERVE	0xff00
-+#define SHN_LOPROC	0xff00
-+#define SHN_HIPROC	0xff1f
-+#define SHN_ABS		0xfff1
-+#define SHN_COMMON	0xfff2
-+#define SHN_HIRESERVE	0xffff
-+ 
-+typedef struct {
-+  Elf32_Word	sh_name;
-+  Elf32_Word	sh_type;
-+  Elf32_Word	sh_flags;
-+  Elf32_Addr	sh_addr;
-+  Elf32_Off	sh_offset;
-+  Elf32_Word	sh_size;
-+  Elf32_Word	sh_link;
-+  Elf32_Word	sh_info;
-+  Elf32_Word	sh_addralign;
-+  Elf32_Word	sh_entsize;
-+} Elf32_Shdr;
-+
-+typedef struct elf64_shdr {
-+  Elf64_Word sh_name;		/* Section name, index in string tbl */
-+  Elf64_Word sh_type;		/* Type of section */
-+  Elf64_Xword sh_flags;		/* Miscellaneous section attributes */
-+  Elf64_Addr sh_addr;		/* Section virtual addr at execution */
-+  Elf64_Off sh_offset;		/* Section file offset */
-+  Elf64_Xword sh_size;		/* Size of section in bytes */
-+  Elf64_Word sh_link;		/* Index of another section */
-+  Elf64_Word sh_info;		/* Additional section information */
-+  Elf64_Xword sh_addralign;	/* Section alignment */
-+  Elf64_Xword sh_entsize;	/* Entry size if section holds table */
-+} Elf64_Shdr;
-+
-+#define	EI_MAG0		0		/* e_ident[] indexes */
-+#define	EI_MAG1		1
-+#define	EI_MAG2		2
-+#define	EI_MAG3		3
-+#define	EI_CLASS	4
-+#define	EI_DATA		5
-+#define	EI_VERSION	6
-+#define	EI_OSABI	7
-+#define	EI_PAD		8
-+
-+#define	ELFMAG0		0x7f		/* EI_MAG */
-+#define	ELFMAG1		'E'
-+#define	ELFMAG2		'L'
-+#define	ELFMAG3		'F'
-+#define	ELFMAG		"\177ELF"
-+#define	SELFMAG		4
-+
-+#define	ELFCLASSNONE	0		/* EI_CLASS */
-+#define	ELFCLASS32	1
-+#define	ELFCLASS64	2
-+#define	ELFCLASSNUM	3
-+
-+#define ELFDATANONE	0		/* e_ident[EI_DATA] */
-+#define ELFDATA2LSB	1
-+#define ELFDATA2MSB	2
-+
-+#define EV_NONE		0		/* e_version, EI_VERSION */
-+#define EV_CURRENT	1
-+#define EV_NUM		2
-+
-+#define ELFOSABI_NONE	0
-+#define ELFOSABI_LINUX	3
-+
-+#ifndef ELF_OSABI
-+#define ELF_OSABI ELFOSABI_NONE
-+#endif
-+
-+/* Notes used in ET_CORE */
-+#define NT_PRSTATUS	1
-+#define NT_PRFPREG	2
-+#define NT_PRPSINFO	3
-+#define NT_TASKSTRUCT	4
-+#define NT_AUXV		6
-+#define NT_PRXFPREG     0x46e62b7f      /* copied from gdb5.1/include/elf/common.h */
-+
-+
-+/* Note header in a PT_NOTE section */
-+typedef struct elf32_note {
-+  Elf32_Word	n_namesz;	/* Name size */
-+  Elf32_Word	n_descsz;	/* Content size */
-+  Elf32_Word	n_type;		/* Content type */
-+} Elf32_Nhdr;
-+
-+/* Note header in a PT_NOTE section */
-+typedef struct elf64_note {
-+  Elf64_Word n_namesz;	/* Name size */
-+  Elf64_Word n_descsz;	/* Content size */
-+  Elf64_Word n_type;	/* Content type */
-+} Elf64_Nhdr;
-+
-+#if ELF_CLASS == ELFCLASS32
-+
-+extern Elf32_Dyn _DYNAMIC [];
-+#define elfhdr		elf32_hdr
-+#define elf_phdr	elf32_phdr
-+#define elf_note	elf32_note
-+#define elf_addr_t	Elf32_Off
-+
-+#else
-+
-+extern Elf64_Dyn _DYNAMIC [];
-+#define elfhdr		elf64_hdr
-+#define elf_phdr	elf64_phdr
-+#define elf_note	elf64_note
-+#define elf_addr_t	Elf64_Off
-+
-+#endif
-+
-+#ifndef ARCH_HAVE_EXTRA_ELF_NOTES
-+static __inline__ int arch_notes_size(void) { return 0; }
-+static __inline__ void arch_write_notes(struct file *file) { }
-+
-+#define ELF_CORE_EXTRA_NOTES_SIZE arch_notes_size()
-+#define ELF_CORE_WRITE_EXTRA_NOTES arch_write_notes(file)
-+#endif /* ARCH_HAVE_EXTRA_ELF_NOTES */
-+
-+#endif /* _LINUX_ELF_H */
-diff -Naur aboot-0.9b.orig/include/linux/ext2_fs.h aboot-0.9b/include/linux/ext2_fs.h
---- aboot-0.9b.orig/include/linux/ext2_fs.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/linux/ext2_fs.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,527 @@
-+/*
-+ *  linux/include/linux/ext2_fs.h
-+ *
-+ * Copyright (C) 1992, 1993, 1994, 1995
-+ * Remy Card (card@masi.ibp.fr)
-+ * Laboratoire MASI - Institut Blaise Pascal
-+ * Universite Pierre et Marie Curie (Paris VI)
-+ *
-+ *  from
-+ *
-+ *  linux/include/linux/minix_fs.h
-+ *
-+ *  Copyright (C) 1991, 1992  Linus Torvalds
-+ */
-+
-+#ifndef _LINUX_EXT2_FS_H
-+#define _LINUX_EXT2_FS_H
-+
-+#include <linux/types.h>
-+#include <linux/magic.h>
-+
-+/*
-+ * The second extended filesystem constants/structures
-+ */
-+
-+/*
-+ * Define EXT2FS_DEBUG to produce debug messages
-+ */
-+#undef EXT2FS_DEBUG
-+
-+/*
-+ * Define EXT2_PREALLOCATE to preallocate data blocks for expanding files
-+ */
-+#define EXT2_PREALLOCATE
-+#define EXT2_DEFAULT_PREALLOC_BLOCKS	8
-+
-+/*
-+ * The second extended file system version
-+ */
-+#define EXT2FS_DATE		"95/08/09"
-+#define EXT2FS_VERSION		"0.5b"
-+
-+/*
-+ * Debug code
-+ */
-+#ifdef EXT2FS_DEBUG
-+#	define ext2_debug(f, a...)	{ \
-+					printk ("EXT2-fs DEBUG (%s, %d): %s:", \
-+						__FILE__, __LINE__, __FUNCTION__); \
-+				  	printk (f, ## a); \
-+					}
-+#else
-+#	define ext2_debug(f, a...)	/**/
-+#endif
-+
-+/*
-+ * Special inode numbers
-+ */
-+#define	EXT2_BAD_INO		 1	/* Bad blocks inode */
-+#define EXT2_ROOT_INO		 2	/* Root inode */
-+#define EXT2_BOOT_LOADER_INO	 5	/* Boot loader inode */
-+#define EXT2_UNDEL_DIR_INO	 6	/* Undelete directory inode */
-+
-+/* First non-reserved inode for old ext2 filesystems */
-+#define EXT2_GOOD_OLD_FIRST_INO	11
-+
-+/* Assume that user mode programs are passing in an ext2fs superblock, not
-+ * a kernel struct super_block.  This will allow us to call the feature-test
-+ * macros from user land. */
-+#define EXT2_SB(sb)	(sb)
-+
-+/*
-+ * Maximal count of links to a file
-+ */
-+#define EXT2_LINK_MAX		32000
-+
-+/*
-+ * Macro-instructions used to manage several block sizes
-+ */
-+#define EXT2_MIN_BLOCK_SIZE		1024
-+#define	EXT2_MAX_BLOCK_SIZE		4096
-+#define EXT2_MIN_BLOCK_LOG_SIZE		  10
-+# define EXT2_BLOCK_SIZE(s)		(EXT2_MIN_BLOCK_SIZE << (s)->s_log_block_size)
-+#define	EXT2_ADDR_PER_BLOCK(s)		(EXT2_BLOCK_SIZE(s) / sizeof (__u32))
-+# define EXT2_BLOCK_SIZE_BITS(s)	((s)->s_log_block_size + 10)
-+#define EXT2_INODE_SIZE(s)	(((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \
-+				 EXT2_GOOD_OLD_INODE_SIZE : \
-+				 (s)->s_inode_size)
-+#define EXT2_FIRST_INO(s)	(((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \
-+				 EXT2_GOOD_OLD_FIRST_INO : \
-+				 (s)->s_first_ino)
-+
-+/*
-+ * Macro-instructions used to manage fragments
-+ */
-+#define EXT2_MIN_FRAG_SIZE		1024
-+#define	EXT2_MAX_FRAG_SIZE		4096
-+#define EXT2_MIN_FRAG_LOG_SIZE		  10
-+# define EXT2_FRAG_SIZE(s)		(EXT2_MIN_FRAG_SIZE << (s)->s_log_frag_size)
-+# define EXT2_FRAGS_PER_BLOCK(s)	(EXT2_BLOCK_SIZE(s) / EXT2_FRAG_SIZE(s))
-+
-+/*
-+ * Structure of a blocks group descriptor
-+ */
-+struct ext2_group_desc
-+{
-+	__le32	bg_block_bitmap;		/* Blocks bitmap block */
-+	__le32	bg_inode_bitmap;		/* Inodes bitmap block */
-+	__le32	bg_inode_table;		/* Inodes table block */
-+	__le16	bg_free_blocks_count;	/* Free blocks count */
-+	__le16	bg_free_inodes_count;	/* Free inodes count */
-+	__le16	bg_used_dirs_count;	/* Directories count */
-+	__le16	bg_pad;
-+	__le32	bg_reserved[3];
-+};
-+
-+/*
-+ * Macro-instructions used to manage group descriptors
-+ */
-+# define EXT2_BLOCKS_PER_GROUP(s)	((s)->s_blocks_per_group)
-+# define EXT2_DESC_PER_BLOCK(s)		(EXT2_BLOCK_SIZE(s) / sizeof (struct ext2_group_desc))
-+# define EXT2_INODES_PER_GROUP(s)	((s)->s_inodes_per_group)
-+
-+/*
-+ * Constants relative to the data blocks
-+ */
-+#define	EXT2_NDIR_BLOCKS		12
-+#define	EXT2_IND_BLOCK			EXT2_NDIR_BLOCKS
-+#define	EXT2_DIND_BLOCK			(EXT2_IND_BLOCK + 1)
-+#define	EXT2_TIND_BLOCK			(EXT2_DIND_BLOCK + 1)
-+#define	EXT2_N_BLOCKS			(EXT2_TIND_BLOCK + 1)
-+
-+/*
-+ * Inode flags (GETFLAGS/SETFLAGS)
-+ */
-+#define	EXT2_SECRM_FL			FS_SECRM_FL	/* Secure deletion */
-+#define	EXT2_UNRM_FL			FS_UNRM_FL	/* Undelete */
-+#define	EXT2_COMPR_FL			FS_COMPR_FL	/* Compress file */
-+#define EXT2_SYNC_FL			FS_SYNC_FL	/* Synchronous updates */
-+#define EXT2_IMMUTABLE_FL		FS_IMMUTABLE_FL	/* Immutable file */
-+#define EXT2_APPEND_FL			FS_APPEND_FL	/* writes to file may only append */
-+#define EXT2_NODUMP_FL			FS_NODUMP_FL	/* do not dump file */
-+#define EXT2_NOATIME_FL			FS_NOATIME_FL	/* do not update atime */
-+/* Reserved for compression usage... */
-+#define EXT2_DIRTY_FL			FS_DIRTY_FL
-+#define EXT2_COMPRBLK_FL		FS_COMPRBLK_FL	/* One or more compressed clusters */
-+#define EXT2_NOCOMP_FL			FS_NOCOMP_FL	/* Don't compress */
-+#define EXT2_ECOMPR_FL			FS_ECOMPR_FL	/* Compression error */
-+/* End compression flags --- maybe not all used */	
-+#define EXT2_BTREE_FL			FS_BTREE_FL	/* btree format dir */
-+#define EXT2_INDEX_FL			FS_INDEX_FL	/* hash-indexed directory */
-+#define EXT2_IMAGIC_FL			FS_IMAGIC_FL	/* AFS directory */
-+#define EXT2_JOURNAL_DATA_FL		FS_JOURNAL_DATA_FL /* Reserved for ext3 */
-+#define EXT2_NOTAIL_FL			FS_NOTAIL_FL	/* file tail should not be merged */
-+#define EXT2_DIRSYNC_FL			FS_DIRSYNC_FL	/* dirsync behaviour (directories only) */
-+#define EXT2_TOPDIR_FL			FS_TOPDIR_FL	/* Top of directory hierarchies*/
-+#define EXT2_RESERVED_FL		FS_RESERVED_FL	/* reserved for ext2 lib */
-+
-+#define EXT2_FL_USER_VISIBLE		FS_FL_USER_VISIBLE	/* User visible flags */
-+#define EXT2_FL_USER_MODIFIABLE		FS_FL_USER_MODIFIABLE	/* User modifiable flags */
-+
-+/*
-+ * ioctl commands
-+ */
-+#define	EXT2_IOC_GETFLAGS		FS_IOC_GETFLAGS
-+#define	EXT2_IOC_SETFLAGS		FS_IOC_SETFLAGS
-+#define	EXT2_IOC_GETVERSION		FS_IOC_GETVERSION
-+#define	EXT2_IOC_SETVERSION		FS_IOC_SETVERSION
-+
-+/*
-+ * ioctl commands in 32 bit emulation
-+ */
-+#define EXT2_IOC32_GETFLAGS		FS_IOC32_GETFLAGS
-+#define EXT2_IOC32_SETFLAGS		FS_IOC32_SETFLAGS
-+#define EXT2_IOC32_GETVERSION		FS_IOC32_GETVERSION
-+#define EXT2_IOC32_SETVERSION		FS_IOC32_SETVERSION
-+
-+/*
-+ * Structure of an inode on the disk
-+ */
-+struct ext2_inode {
-+	__le16	i_mode;		/* File mode */
-+	__le16	i_uid;		/* Low 16 bits of Owner Uid */
-+	__le32	i_size;		/* Size in bytes */
-+	__le32	i_atime;	/* Access time */
-+	__le32	i_ctime;	/* Creation time */
-+	__le32	i_mtime;	/* Modification time */
-+	__le32	i_dtime;	/* Deletion Time */
-+	__le16	i_gid;		/* Low 16 bits of Group Id */
-+	__le16	i_links_count;	/* Links count */
-+	__le32	i_blocks;	/* Blocks count */
-+	__le32	i_flags;	/* File flags */
-+	union {
-+		struct {
-+			__le32  l_i_reserved1;
-+		} linux1;
-+		struct {
-+			__le32  h_i_translator;
-+		} hurd1;
-+		struct {
-+			__le32  m_i_reserved1;
-+		} masix1;
-+	} osd1;				/* OS dependent 1 */
-+	__le32	i_block[EXT2_N_BLOCKS];/* Pointers to blocks */
-+	__le32	i_generation;	/* File version (for NFS) */
-+	__le32	i_file_acl;	/* File ACL */
-+	__le32	i_dir_acl;	/* Directory ACL */
-+	__le32	i_faddr;	/* Fragment address */
-+	union {
-+		struct {
-+			__u8	l_i_frag;	/* Fragment number */
-+			__u8	l_i_fsize;	/* Fragment size */
-+			__u16	i_pad1;
-+			__le16	l_i_uid_high;	/* these 2 fields    */
-+			__le16	l_i_gid_high;	/* were reserved2[0] */
-+			__u32	l_i_reserved2;
-+		} linux2;
-+		struct {
-+			__u8	h_i_frag;	/* Fragment number */
-+			__u8	h_i_fsize;	/* Fragment size */
-+			__le16	h_i_mode_high;
-+			__le16	h_i_uid_high;
-+			__le16	h_i_gid_high;
-+			__le32	h_i_author;
-+		} hurd2;
-+		struct {
-+			__u8	m_i_frag;	/* Fragment number */
-+			__u8	m_i_fsize;	/* Fragment size */
-+			__u16	m_pad1;
-+			__u32	m_i_reserved2[2];
-+		} masix2;
-+	} osd2;				/* OS dependent 2 */
-+};
-+
-+#define i_size_high	i_dir_acl
-+
-+#if defined(__KERNEL__) || defined(__linux__)
-+#define i_reserved1	osd1.linux1.l_i_reserved1
-+#define i_frag		osd2.linux2.l_i_frag
-+#define i_fsize		osd2.linux2.l_i_fsize
-+#define i_uid_low	i_uid
-+#define i_gid_low	i_gid
-+#define i_uid_high	osd2.linux2.l_i_uid_high
-+#define i_gid_high	osd2.linux2.l_i_gid_high
-+#define i_reserved2	osd2.linux2.l_i_reserved2
-+#endif
-+
-+#ifdef	__hurd__
-+#define i_translator	osd1.hurd1.h_i_translator
-+#define i_frag		osd2.hurd2.h_i_frag;
-+#define i_fsize		osd2.hurd2.h_i_fsize;
-+#define i_uid_high	osd2.hurd2.h_i_uid_high
-+#define i_gid_high	osd2.hurd2.h_i_gid_high
-+#define i_author	osd2.hurd2.h_i_author
-+#endif
-+
-+#ifdef	__masix__
-+#define i_reserved1	osd1.masix1.m_i_reserved1
-+#define i_frag		osd2.masix2.m_i_frag
-+#define i_fsize		osd2.masix2.m_i_fsize
-+#define i_reserved2	osd2.masix2.m_i_reserved2
-+#endif
-+
-+/*
-+ * File system states
-+ */
-+#define	EXT2_VALID_FS			0x0001	/* Unmounted cleanly */
-+#define	EXT2_ERROR_FS			0x0002	/* Errors detected */
-+
-+/*
-+ * Mount flags
-+ */
-+#define EXT2_MOUNT_CHECK		0x000001  /* Do mount-time checks */
-+#define EXT2_MOUNT_OLDALLOC		0x000002  /* Don't use the new Orlov allocator */
-+#define EXT2_MOUNT_GRPID		0x000004  /* Create files with directory's group */
-+#define EXT2_MOUNT_DEBUG		0x000008  /* Some debugging messages */
-+#define EXT2_MOUNT_ERRORS_CONT		0x000010  /* Continue on errors */
-+#define EXT2_MOUNT_ERRORS_RO		0x000020  /* Remount fs ro on errors */
-+#define EXT2_MOUNT_ERRORS_PANIC		0x000040  /* Panic on errors */
-+#define EXT2_MOUNT_MINIX_DF		0x000080  /* Mimics the Minix statfs */
-+#define EXT2_MOUNT_NOBH			0x000100  /* No buffer_heads */
-+#define EXT2_MOUNT_NO_UID32		0x000200  /* Disable 32-bit UIDs */
-+#define EXT2_MOUNT_XATTR_USER		0x004000  /* Extended user attributes */
-+#define EXT2_MOUNT_POSIX_ACL		0x008000  /* POSIX Access Control Lists */
-+#define EXT2_MOUNT_XIP			0x010000  /* Execute in place */
-+#define EXT2_MOUNT_USRQUOTA		0x020000 /* user quota */
-+#define EXT2_MOUNT_GRPQUOTA		0x040000 /* group quota */
-+
-+
-+#define clear_opt(o, opt)		o &= ~EXT2_MOUNT_##opt
-+#define set_opt(o, opt)			o |= EXT2_MOUNT_##opt
-+#define test_opt(sb, opt)		(EXT2_SB(sb)->s_mount_opt & \
-+					 EXT2_MOUNT_##opt)
-+/*
-+ * Maximal mount counts between two filesystem checks
-+ */
-+#define EXT2_DFL_MAX_MNT_COUNT		20	/* Allow 20 mounts */
-+#define EXT2_DFL_CHECKINTERVAL		0	/* Don't use interval check */
-+
-+/*
-+ * Behaviour when detecting errors
-+ */
-+#define EXT2_ERRORS_CONTINUE		1	/* Continue execution */
-+#define EXT2_ERRORS_RO			2	/* Remount fs read-only */
-+#define EXT2_ERRORS_PANIC		3	/* Panic */
-+#define EXT2_ERRORS_DEFAULT		EXT2_ERRORS_CONTINUE
-+
-+/*
-+ * Structure of the super block
-+ */
-+struct ext2_super_block {
-+	__le32	s_inodes_count;		/* Inodes count */
-+	__le32	s_blocks_count;		/* Blocks count */
-+	__le32	s_r_blocks_count;	/* Reserved blocks count */
-+	__le32	s_free_blocks_count;	/* Free blocks count */
-+	__le32	s_free_inodes_count;	/* Free inodes count */
-+	__le32	s_first_data_block;	/* First Data Block */
-+	__le32	s_log_block_size;	/* Block size */
-+	__le32	s_log_frag_size;	/* Fragment size */
-+	__le32	s_blocks_per_group;	/* # Blocks per group */
-+	__le32	s_frags_per_group;	/* # Fragments per group */
-+	__le32	s_inodes_per_group;	/* # Inodes per group */
-+	__le32	s_mtime;		/* Mount time */
-+	__le32	s_wtime;		/* Write time */
-+	__le16	s_mnt_count;		/* Mount count */
-+	__le16	s_max_mnt_count;	/* Maximal mount count */
-+	__le16	s_magic;		/* Magic signature */
-+	__le16	s_state;		/* File system state */
-+	__le16	s_errors;		/* Behaviour when detecting errors */
-+	__le16	s_minor_rev_level; 	/* minor revision level */
-+	__le32	s_lastcheck;		/* time of last check */
-+	__le32	s_checkinterval;	/* max. time between checks */
-+	__le32	s_creator_os;		/* OS */
-+	__le32	s_rev_level;		/* Revision level */
-+	__le16	s_def_resuid;		/* Default uid for reserved blocks */
-+	__le16	s_def_resgid;		/* Default gid for reserved blocks */
-+	/*
-+	 * These fields are for EXT2_DYNAMIC_REV superblocks only.
-+	 *
-+	 * Note: the difference between the compatible feature set and
-+	 * the incompatible feature set is that if there is a bit set
-+	 * in the incompatible feature set that the kernel doesn't
-+	 * know about, it should refuse to mount the filesystem.
-+	 * 
-+	 * e2fsck's requirements are more strict; if it doesn't know
-+	 * about a feature in either the compatible or incompatible
-+	 * feature set, it must abort and not try to meddle with
-+	 * things it doesn't understand...
-+	 */
-+	__le32	s_first_ino; 		/* First non-reserved inode */
-+	__le16   s_inode_size; 		/* size of inode structure */
-+	__le16	s_block_group_nr; 	/* block group # of this superblock */
-+	__le32	s_feature_compat; 	/* compatible feature set */
-+	__le32	s_feature_incompat; 	/* incompatible feature set */
-+	__le32	s_feature_ro_compat; 	/* readonly-compatible feature set */
-+	__u8	s_uuid[16];		/* 128-bit uuid for volume */
-+	char	s_volume_name[16]; 	/* volume name */
-+	char	s_last_mounted[64]; 	/* directory where last mounted */
-+	__le32	s_algorithm_usage_bitmap; /* For compression */
-+	/*
-+	 * Performance hints.  Directory preallocation should only
-+	 * happen if the EXT2_COMPAT_PREALLOC flag is on.
-+	 */
-+	__u8	s_prealloc_blocks;	/* Nr of blocks to try to preallocate*/
-+	__u8	s_prealloc_dir_blocks;	/* Nr to preallocate for dirs */
-+	__u16	s_padding1;
-+	/*
-+	 * Journaling support valid if EXT3_FEATURE_COMPAT_HAS_JOURNAL set.
-+	 */
-+	__u8	s_journal_uuid[16];	/* uuid of journal superblock */
-+	__u32	s_journal_inum;		/* inode number of journal file */
-+	__u32	s_journal_dev;		/* device number of journal file */
-+	__u32	s_last_orphan;		/* start of list of inodes to delete */
-+	__u32	s_hash_seed[4];		/* HTREE hash seed */
-+	__u8	s_def_hash_version;	/* Default hash version to use */
-+	__u8	s_reserved_char_pad;
-+	__u16	s_reserved_word_pad;
-+	__le32	s_default_mount_opts;
-+ 	__le32	s_first_meta_bg; 	/* First metablock block group */
-+	__u32	s_reserved[190];	/* Padding to the end of the block */
-+};
-+
-+/*
-+ * Codes for operating systems
-+ */
-+#define EXT2_OS_LINUX		0
-+#define EXT2_OS_HURD		1
-+#define EXT2_OS_MASIX		2
-+#define EXT2_OS_FREEBSD		3
-+#define EXT2_OS_LITES		4
-+
-+/*
-+ * Revision levels
-+ */
-+#define EXT2_GOOD_OLD_REV	0	/* The good old (original) format */
-+#define EXT2_DYNAMIC_REV	1 	/* V2 format w/ dynamic inode sizes */
-+
-+#define EXT2_CURRENT_REV	EXT2_GOOD_OLD_REV
-+#define EXT2_MAX_SUPP_REV	EXT2_DYNAMIC_REV
-+
-+#define EXT2_GOOD_OLD_INODE_SIZE 128
-+
-+/*
-+ * Feature set definitions
-+ */
-+
-+#define EXT2_HAS_COMPAT_FEATURE(sb,mask)			\
-+	( EXT2_SB(sb)->s_es->s_feature_compat & cpu_to_le32(mask) )
-+#define EXT2_HAS_RO_COMPAT_FEATURE(sb,mask)			\
-+	( EXT2_SB(sb)->s_es->s_feature_ro_compat & cpu_to_le32(mask) )
-+#define EXT2_HAS_INCOMPAT_FEATURE(sb,mask)			\
-+	( EXT2_SB(sb)->s_es->s_feature_incompat & cpu_to_le32(mask) )
-+#define EXT2_SET_COMPAT_FEATURE(sb,mask)			\
-+	EXT2_SB(sb)->s_es->s_feature_compat |= cpu_to_le32(mask)
-+#define EXT2_SET_RO_COMPAT_FEATURE(sb,mask)			\
-+	EXT2_SB(sb)->s_es->s_feature_ro_compat |= cpu_to_le32(mask)
-+#define EXT2_SET_INCOMPAT_FEATURE(sb,mask)			\
-+	EXT2_SB(sb)->s_es->s_feature_incompat |= cpu_to_le32(mask)
-+#define EXT2_CLEAR_COMPAT_FEATURE(sb,mask)			\
-+	EXT2_SB(sb)->s_es->s_feature_compat &= ~cpu_to_le32(mask)
-+#define EXT2_CLEAR_RO_COMPAT_FEATURE(sb,mask)			\
-+	EXT2_SB(sb)->s_es->s_feature_ro_compat &= ~cpu_to_le32(mask)
-+#define EXT2_CLEAR_INCOMPAT_FEATURE(sb,mask)			\
-+	EXT2_SB(sb)->s_es->s_feature_incompat &= ~cpu_to_le32(mask)
-+
-+#define EXT2_FEATURE_COMPAT_DIR_PREALLOC	0x0001
-+#define EXT2_FEATURE_COMPAT_IMAGIC_INODES	0x0002
-+#define EXT3_FEATURE_COMPAT_HAS_JOURNAL		0x0004
-+#define EXT2_FEATURE_COMPAT_EXT_ATTR		0x0008
-+#define EXT2_FEATURE_COMPAT_RESIZE_INO		0x0010
-+#define EXT2_FEATURE_COMPAT_DIR_INDEX		0x0020
-+#define EXT2_FEATURE_COMPAT_ANY			0xffffffff
-+
-+#define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER	0x0001
-+#define EXT2_FEATURE_RO_COMPAT_LARGE_FILE	0x0002
-+#define EXT2_FEATURE_RO_COMPAT_BTREE_DIR	0x0004
-+#define EXT2_FEATURE_RO_COMPAT_ANY		0xffffffff
-+
-+#define EXT2_FEATURE_INCOMPAT_COMPRESSION	0x0001
-+#define EXT2_FEATURE_INCOMPAT_FILETYPE		0x0002
-+#define EXT3_FEATURE_INCOMPAT_RECOVER		0x0004
-+#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV	0x0008
-+#define EXT2_FEATURE_INCOMPAT_META_BG		0x0010
-+#define EXT2_FEATURE_INCOMPAT_ANY		0xffffffff
-+
-+#define EXT2_FEATURE_COMPAT_SUPP	EXT2_FEATURE_COMPAT_EXT_ATTR
-+#define EXT2_FEATURE_INCOMPAT_SUPP	(EXT2_FEATURE_INCOMPAT_FILETYPE| \
-+					 EXT2_FEATURE_INCOMPAT_META_BG)
-+#define EXT2_FEATURE_RO_COMPAT_SUPP	(EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \
-+					 EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
-+					 EXT2_FEATURE_RO_COMPAT_BTREE_DIR)
-+#define EXT2_FEATURE_RO_COMPAT_UNSUPPORTED	~EXT2_FEATURE_RO_COMPAT_SUPP
-+#define EXT2_FEATURE_INCOMPAT_UNSUPPORTED	~EXT2_FEATURE_INCOMPAT_SUPP
-+
-+/*
-+ * Default values for user and/or group using reserved blocks
-+ */
-+#define	EXT2_DEF_RESUID		0
-+#define	EXT2_DEF_RESGID		0
-+
-+/*
-+ * Default mount options
-+ */
-+#define EXT2_DEFM_DEBUG		0x0001
-+#define EXT2_DEFM_BSDGROUPS	0x0002
-+#define EXT2_DEFM_XATTR_USER	0x0004
-+#define EXT2_DEFM_ACL		0x0008
-+#define EXT2_DEFM_UID16		0x0010
-+    /* Not used by ext2, but reserved for use by ext3 */
-+#define EXT3_DEFM_JMODE		0x0060 
-+#define EXT3_DEFM_JMODE_DATA	0x0020
-+#define EXT3_DEFM_JMODE_ORDERED	0x0040
-+#define EXT3_DEFM_JMODE_WBACK	0x0060
-+
-+/*
-+ * Structure of a directory entry
-+ */
-+#define EXT2_NAME_LEN 255
-+
-+struct ext2_dir_entry {
-+	__le32	inode;			/* Inode number */
-+	__le16	rec_len;		/* Directory entry length */
-+	__le16	name_len;		/* Name length */
-+	char	name[EXT2_NAME_LEN];	/* File name */
-+};
-+
-+/*
-+ * The new version of the directory entry.  Since EXT2 structures are
-+ * stored in intel byte order, and the name_len field could never be
-+ * bigger than 255 chars, it's safe to reclaim the extra byte for the
-+ * file_type field.
-+ */
-+struct ext2_dir_entry_2 {
-+	__le32	inode;			/* Inode number */
-+	__le16	rec_len;		/* Directory entry length */
-+	__u8	name_len;		/* Name length */
-+	__u8	file_type;
-+	char	name[EXT2_NAME_LEN];	/* File name */
-+};
-+
-+/*
-+ * Ext2 directory file types.  Only the low 3 bits are used.  The
-+ * other bits are reserved for now.
-+ */
-+enum {
-+	EXT2_FT_UNKNOWN,
-+	EXT2_FT_REG_FILE,
-+	EXT2_FT_DIR,
-+	EXT2_FT_CHRDEV,
-+	EXT2_FT_BLKDEV,
-+	EXT2_FT_FIFO,
-+	EXT2_FT_SOCK,
-+	EXT2_FT_SYMLINK,
-+	EXT2_FT_MAX
-+};
-+
-+/*
-+ * EXT2_DIR_PAD defines the directory entries boundaries
-+ *
-+ * NOTE: It must be a multiple of 4
-+ */
-+#define EXT2_DIR_PAD		 	4
-+#define EXT2_DIR_ROUND 			(EXT2_DIR_PAD - 1)
-+#define EXT2_DIR_REC_LEN(name_len)	(((name_len) + 8 + EXT2_DIR_ROUND) & \
-+					 ~EXT2_DIR_ROUND)
-+
-+#endif	/* _LINUX_EXT2_FS_H */
-diff -Naur aboot-0.9b.orig/include/linux/fs.h aboot-0.9b/include/linux/fs.h
---- aboot-0.9b.orig/include/linux/fs.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/linux/fs.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,269 @@
-+#ifndef _LINUX_FS_H
-+#define _LINUX_FS_H
-+
-+/*
-+ * This file has definitions for some important file table
-+ * structures etc.
-+ */
-+
-+#include <linux/limits.h>
-+#include <linux/ioctl.h>
-+
-+/*
-+ * It's silly to have NR_OPEN bigger than NR_FILE, but you can change
-+ * the file limit at runtime and only root can increase the per-process
-+ * nr_file rlimit, so it's safe to set up a ridiculously high absolute
-+ * upper limit on files-per-process.
-+ *
-+ * Some programs (notably those using select()) may have to be 
-+ * recompiled to take full advantage of the new limits..  
-+ */
-+
-+/* Fixed constants first: */
-+#undef NR_OPEN
-+#define NR_OPEN (1024*1024)	/* Absolute upper limit on fd num */
-+#define INR_OPEN 1024		/* Initial setting for nfile rlimits */
-+
-+#define BLOCK_SIZE_BITS 10
-+#define BLOCK_SIZE (1<<BLOCK_SIZE_BITS)
-+
-+#define SEEK_SET	0	/* seek relative to beginning of file */
-+#define SEEK_CUR	1	/* seek relative to current file position */
-+#define SEEK_END	2	/* seek relative to end of file */
-+#define SEEK_MAX	SEEK_END
-+
-+/* And dynamically-tunable limits and defaults: */
-+struct files_stat_struct {
-+	int nr_files;		/* read only */
-+	int nr_free_files;	/* read only */
-+	int max_files;		/* tunable */
-+};
-+extern struct files_stat_struct files_stat;
-+extern int get_max_files(void);
-+
-+struct inodes_stat_t {
-+	int nr_inodes;
-+	int nr_unused;
-+	int dummy[5];		/* padding for sysctl ABI compatibility */
-+};
-+extern struct inodes_stat_t inodes_stat;
-+
-+extern int leases_enable, lease_break_time;
-+
-+#ifdef CONFIG_DNOTIFY
-+extern int dir_notify_enable;
-+#endif
-+
-+#define NR_FILE  8192	/* this can well be larger on a larger system */
-+
-+#define MAY_EXEC 1
-+#define MAY_WRITE 2
-+#define MAY_READ 4
-+#define MAY_APPEND 8
-+
-+#define FMODE_READ 1
-+#define FMODE_WRITE 2
-+
-+/* Internal kernel extensions */
-+#define FMODE_LSEEK	4
-+#define FMODE_PREAD	8
-+#define FMODE_PWRITE	FMODE_PREAD	/* These go hand in hand */
-+
-+/* File is being opened for execution. Primary users of this flag are
-+   distributed filesystems that can use it to achieve correct ETXTBUSY
-+   behavior for cross-node execution/opening_for_writing of files */
-+#define FMODE_EXEC	16
-+
-+#define RW_MASK		1
-+#define RWA_MASK	2
-+#define READ 0
-+#define WRITE 1
-+#define READA 2		/* read-ahead  - don't block if no resources */
-+#define SWRITE 3	/* for ll_rw_block() - wait for buffer lock */
-+#define READ_SYNC	(READ | (1 << BIO_RW_SYNC))
-+#define READ_META	(READ | (1 << BIO_RW_META))
-+#define WRITE_SYNC	(WRITE | (1 << BIO_RW_SYNC))
-+#define WRITE_BARRIER	((1 << BIO_RW) | (1 << BIO_RW_BARRIER))
-+
-+#define SEL_IN		1
-+#define SEL_OUT		2
-+#define SEL_EX		4
-+
-+/* public flags for file_system_type */
-+#define FS_REQUIRES_DEV 1 
-+#define FS_BINARY_MOUNTDATA 2
-+#define FS_HAS_SUBTYPE 4
-+#define FS_REVAL_DOT	16384	/* Check the paths ".", ".." for staleness */
-+#define FS_RENAME_DOES_D_MOVE	32768	/* FS will handle d_move()
-+					 * during rename() internally.
-+					 */
-+
-+/*
-+ * These are the fs-independent mount-flags: up to 32 flags are supported
-+ */
-+#define MS_RDONLY	 1	/* Mount read-only */
-+#define MS_NOSUID	 2	/* Ignore suid and sgid bits */
-+#define MS_NODEV	 4	/* Disallow access to device special files */
-+#define MS_NOEXEC	 8	/* Disallow program execution */
-+#define MS_SYNCHRONOUS	16	/* Writes are synced at once */
-+#define MS_REMOUNT	32	/* Alter flags of a mounted FS */
-+#define MS_MANDLOCK	64	/* Allow mandatory locks on an FS */
-+#define MS_DIRSYNC	128	/* Directory modifications are synchronous */
-+#define MS_NOATIME	1024	/* Do not update access times. */
-+#define MS_NODIRATIME	2048	/* Do not update directory access times */
-+#define MS_BIND		4096
-+#define MS_MOVE		8192
-+#define MS_REC		16384
-+#define MS_VERBOSE	32768	/* War is peace. Verbosity is silence.
-+				   MS_VERBOSE is deprecated. */
-+#define MS_SILENT	32768
-+#define MS_POSIXACL	(1<<16)	/* VFS does not apply the umask */
-+#define MS_UNBINDABLE	(1<<17)	/* change to unbindable */
-+#define MS_PRIVATE	(1<<18)	/* change to private */
-+#define MS_SLAVE	(1<<19)	/* change to slave */
-+#define MS_SHARED	(1<<20)	/* change to shared */
-+#define MS_RELATIME	(1<<21)	/* Update atime relative to mtime/ctime. */
-+#define MS_ACTIVE	(1<<30)
-+#define MS_NOUSER	(1<<31)
-+
-+/*
-+ * Superblock flags that can be altered by MS_REMOUNT
-+ */
-+#define MS_RMT_MASK	(MS_RDONLY|MS_SYNCHRONOUS|MS_MANDLOCK)
-+
-+/*
-+ * Old magic mount flag and mask
-+ */
-+#define MS_MGC_VAL 0xC0ED0000
-+#define MS_MGC_MSK 0xffff0000
-+
-+/* Inode flags - they have nothing to superblock flags now */
-+
-+#define S_SYNC		1	/* Writes are synced at once */
-+#define S_NOATIME	2	/* Do not update access times */
-+#define S_APPEND	4	/* Append-only file */
-+#define S_IMMUTABLE	8	/* Immutable file */
-+#define S_DEAD		16	/* removed, but still open directory */
-+#define S_NOQUOTA	32	/* Inode is not counted to quota */
-+#define S_DIRSYNC	64	/* Directory modifications are synchronous */
-+#define S_NOCMTIME	128	/* Do not update file c/mtime */
-+#define S_SWAPFILE	256	/* Do not truncate: swapon got its bmaps */
-+#define S_PRIVATE	512	/* Inode is fs-internal */
-+
-+/*
-+ * Note that nosuid etc flags are inode-specific: setting some file-system
-+ * flags just means all the inodes inherit those flags by default. It might be
-+ * possible to override it selectively if you really wanted to with some
-+ * ioctl() that is not currently implemented.
-+ *
-+ * Exception: MS_RDONLY is always applied to the entire file system.
-+ *
-+ * Unfortunately, it is possible to change a filesystems flags with it mounted
-+ * with files in use.  This means that all of the inodes will not have their
-+ * i_flags updated.  Hence, i_flags no longer inherit the superblock mount
-+ * flags, so these have to be checked separately. -- rmk@arm.uk.linux.org
-+ */
-+#define __IS_FLG(inode,flg) ((inode)->i_sb->s_flags & (flg))
-+
-+#define IS_RDONLY(inode) ((inode)->i_sb->s_flags & MS_RDONLY)
-+#define IS_SYNC(inode)		(__IS_FLG(inode, MS_SYNCHRONOUS) || \
-+					((inode)->i_flags & S_SYNC))
-+#define IS_DIRSYNC(inode)	(__IS_FLG(inode, MS_SYNCHRONOUS|MS_DIRSYNC) || \
-+					((inode)->i_flags & (S_SYNC|S_DIRSYNC)))
-+#define IS_MANDLOCK(inode)	__IS_FLG(inode, MS_MANDLOCK)
-+#define IS_NOATIME(inode)   __IS_FLG(inode, MS_RDONLY|MS_NOATIME)
-+
-+#define IS_NOQUOTA(inode)	((inode)->i_flags & S_NOQUOTA)
-+#define IS_APPEND(inode)	((inode)->i_flags & S_APPEND)
-+#define IS_IMMUTABLE(inode)	((inode)->i_flags & S_IMMUTABLE)
-+#define IS_POSIXACL(inode)	__IS_FLG(inode, MS_POSIXACL)
-+
-+#define IS_DEADDIR(inode)	((inode)->i_flags & S_DEAD)
-+#define IS_NOCMTIME(inode)	((inode)->i_flags & S_NOCMTIME)
-+#define IS_SWAPFILE(inode)	((inode)->i_flags & S_SWAPFILE)
-+#define IS_PRIVATE(inode)	((inode)->i_flags & S_PRIVATE)
-+
-+/* the read-only stuff doesn't really belong here, but any other place is
-+   probably as bad and I don't want to create yet another include file. */
-+
-+#define BLKROSET   _IO(0x12,93)	/* set device read-only (0 = read-write) */
-+#define BLKROGET   _IO(0x12,94)	/* get read-only status (0 = read_write) */
-+#define BLKRRPART  _IO(0x12,95)	/* re-read partition table */
-+#define BLKGETSIZE _IO(0x12,96)	/* return device size /512 (long *arg) */
-+#define BLKFLSBUF  _IO(0x12,97)	/* flush buffer cache */
-+#define BLKRASET   _IO(0x12,98)	/* set read ahead for block device */
-+#define BLKRAGET   _IO(0x12,99)	/* get current read ahead setting */
-+#define BLKFRASET  _IO(0x12,100)/* set filesystem (mm/filemap.c) read-ahead */
-+#define BLKFRAGET  _IO(0x12,101)/* get filesystem (mm/filemap.c) read-ahead */
-+#define BLKSECTSET _IO(0x12,102)/* set max sectors per request (ll_rw_blk.c) */
-+#define BLKSECTGET _IO(0x12,103)/* get max sectors per request (ll_rw_blk.c) */
-+#define BLKSSZGET  _IO(0x12,104)/* get block device sector size */
-+#if 0
-+#define BLKPG      _IO(0x12,105)/* See blkpg.h */
-+
-+/* Some people are morons.  Do not use sizeof! */
-+
-+#define BLKELVGET  _IOR(0x12,106,size_t)/* elevator get */
-+#define BLKELVSET  _IOW(0x12,107,size_t)/* elevator set */
-+/* This was here just to show that the number is taken -
-+   probably all these _IO(0x12,*) ioctls should be moved to blkpg.h. */
-+#endif
-+/* A jump here: 108-111 have been used for various private purposes. */
-+#define BLKBSZGET  _IOR(0x12,112,size_t)
-+#define BLKBSZSET  _IOW(0x12,113,size_t)
-+#define BLKGETSIZE64 _IOR(0x12,114,size_t)	/* return device size in bytes (u64 *arg) */
-+#define BLKTRACESETUP _IOWR(0x12,115,struct blk_user_trace_setup)
-+#define BLKTRACESTART _IO(0x12,116)
-+#define BLKTRACESTOP _IO(0x12,117)
-+#define BLKTRACETEARDOWN _IO(0x12,118)
-+
-+#define BMAP_IOCTL 1		/* obsolete - kept for compatibility */
-+#define FIBMAP	   _IO(0x00,1)	/* bmap access */
-+#define FIGETBSZ   _IO(0x00,2)	/* get the block size used for bmap */
-+
-+#define	FS_IOC_GETFLAGS			_IOR('f', 1, long)
-+#define	FS_IOC_SETFLAGS			_IOW('f', 2, long)
-+#define	FS_IOC_GETVERSION		_IOR('v', 1, long)
-+#define	FS_IOC_SETVERSION		_IOW('v', 2, long)
-+#define FS_IOC32_GETFLAGS		_IOR('f', 1, int)
-+#define FS_IOC32_SETFLAGS		_IOW('f', 2, int)
-+#define FS_IOC32_GETVERSION		_IOR('v', 1, int)
-+#define FS_IOC32_SETVERSION		_IOW('v', 2, int)
-+
-+/*
-+ * Inode flags (FS_IOC_GETFLAGS / FS_IOC_SETFLAGS)
-+ */
-+#define	FS_SECRM_FL			0x00000001 /* Secure deletion */
-+#define	FS_UNRM_FL			0x00000002 /* Undelete */
-+#define	FS_COMPR_FL			0x00000004 /* Compress file */
-+#define FS_SYNC_FL			0x00000008 /* Synchronous updates */
-+#define FS_IMMUTABLE_FL			0x00000010 /* Immutable file */
-+#define FS_APPEND_FL			0x00000020 /* writes to file may only append */
-+#define FS_NODUMP_FL			0x00000040 /* do not dump file */
-+#define FS_NOATIME_FL			0x00000080 /* do not update atime */
-+/* Reserved for compression usage... */
-+#define FS_DIRTY_FL			0x00000100
-+#define FS_COMPRBLK_FL			0x00000200 /* One or more compressed clusters */
-+#define FS_NOCOMP_FL			0x00000400 /* Don't compress */
-+#define FS_ECOMPR_FL			0x00000800 /* Compression error */
-+/* End compression flags --- maybe not all used */
-+#define FS_BTREE_FL			0x00001000 /* btree format dir */
-+#define FS_INDEX_FL			0x00001000 /* hash-indexed directory */
-+#define FS_IMAGIC_FL			0x00002000 /* AFS directory */
-+#define FS_JOURNAL_DATA_FL		0x00004000 /* Reserved for ext3 */
-+#define FS_NOTAIL_FL			0x00008000 /* file tail should not be merged */
-+#define FS_DIRSYNC_FL			0x00010000 /* dirsync behaviour (directories only) */
-+#define FS_TOPDIR_FL			0x00020000 /* Top of directory hierarchies*/
-+#define FS_EXTENT_FL			0x00080000 /* Extents */
-+#define FS_DIRECTIO_FL			0x00100000 /* Use direct i/o */
-+#define FS_RESERVED_FL			0x80000000 /* reserved for ext2 lib */
-+
-+#define FS_FL_USER_VISIBLE		0x0003DFFF /* User visible flags */
-+#define FS_FL_USER_MODIFIABLE		0x000380FF /* User modifiable flags */
-+
-+
-+#define SYNC_FILE_RANGE_WAIT_BEFORE	1
-+#define SYNC_FILE_RANGE_WRITE		2
-+#define SYNC_FILE_RANGE_WAIT_AFTER	4
-+
-+#endif /* _LINUX_FS_H */
-diff -Naur aboot-0.9b.orig/include/linux/hdreg.h aboot-0.9b/include/linux/hdreg.h
---- aboot-0.9b.orig/include/linux/hdreg.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/linux/hdreg.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,647 @@
-+#ifndef _LINUX_HDREG_H
-+#define _LINUX_HDREG_H
-+
-+
-+#include <linux/types.h>
-+
-+/*
-+ * Command Header sizes for IOCTL commands
-+ */
-+
-+#define HDIO_DRIVE_CMD_HDR_SIZE		(4 * sizeof(__u8))
-+#define HDIO_DRIVE_HOB_HDR_SIZE		(8 * sizeof(__u8))
-+#define HDIO_DRIVE_TASK_HDR_SIZE	(8 * sizeof(__u8))
-+
-+#define IDE_DRIVE_TASK_INVALID		-1
-+#define IDE_DRIVE_TASK_NO_DATA		0
-+#define IDE_DRIVE_TASK_SET_XFER		1
-+
-+#define IDE_DRIVE_TASK_IN		2
-+
-+#define IDE_DRIVE_TASK_OUT		3
-+#define IDE_DRIVE_TASK_RAW_WRITE	4
-+
-+/*
-+ * Define standard taskfile in/out register
-+ */
-+#define IDE_TASKFILE_STD_IN_FLAGS	0xFE
-+#define IDE_HOB_STD_IN_FLAGS		0x3C
-+#define IDE_TASKFILE_STD_OUT_FLAGS	0xFE
-+#define IDE_HOB_STD_OUT_FLAGS		0x3C
-+
-+typedef unsigned char task_ioreg_t;
-+typedef unsigned long sata_ioreg_t;
-+
-+typedef union ide_reg_valid_s {
-+	unsigned all				: 16;
-+	struct {
-+		unsigned data			: 1;
-+		unsigned error_feature		: 1;
-+		unsigned sector			: 1;
-+		unsigned nsector		: 1;
-+		unsigned lcyl			: 1;
-+		unsigned hcyl			: 1;
-+		unsigned select			: 1;
-+		unsigned status_command		: 1;
-+
-+		unsigned data_hob		: 1;
-+		unsigned error_feature_hob	: 1;
-+		unsigned sector_hob		: 1;
-+		unsigned nsector_hob		: 1;
-+		unsigned lcyl_hob		: 1;
-+		unsigned hcyl_hob		: 1;
-+		unsigned select_hob		: 1;
-+		unsigned control_hob		: 1;
-+	} b;
-+} ide_reg_valid_t;
-+
-+typedef struct ide_task_request_s {
-+	task_ioreg_t	io_ports[8];
-+	task_ioreg_t	hob_ports[8];
-+	ide_reg_valid_t	out_flags;
-+	ide_reg_valid_t	in_flags;
-+	int		data_phase;
-+	int		req_cmd;
-+	unsigned long	out_size;
-+	unsigned long	in_size;
-+} ide_task_request_t;
-+
-+typedef struct ide_ioctl_request_s {
-+	ide_task_request_t	*task_request;
-+	unsigned char		*out_buffer;
-+	unsigned char		*in_buffer;
-+} ide_ioctl_request_t;
-+
-+struct hd_drive_cmd_hdr {
-+	task_ioreg_t command;
-+	task_ioreg_t sector_number;
-+	task_ioreg_t feature;
-+	task_ioreg_t sector_count;
-+};
-+
-+typedef struct hd_drive_task_hdr {
-+	task_ioreg_t data;
-+	task_ioreg_t feature;
-+	task_ioreg_t sector_count;
-+	task_ioreg_t sector_number;
-+	task_ioreg_t low_cylinder;
-+	task_ioreg_t high_cylinder;
-+	task_ioreg_t device_head;
-+	task_ioreg_t command;
-+} task_struct_t;
-+
-+typedef struct hd_drive_hob_hdr {
-+	task_ioreg_t data;
-+	task_ioreg_t feature;
-+	task_ioreg_t sector_count;
-+	task_ioreg_t sector_number;
-+	task_ioreg_t low_cylinder;
-+	task_ioreg_t high_cylinder;
-+	task_ioreg_t device_head;
-+	task_ioreg_t control;
-+} hob_struct_t;
-+
-+#define TASKFILE_INVALID		0x7fff
-+#define TASKFILE_48			0x8000
-+
-+#define TASKFILE_NO_DATA		0x0000
-+
-+#define TASKFILE_IN			0x0001
-+#define TASKFILE_MULTI_IN		0x0002
-+
-+#define TASKFILE_OUT			0x0004
-+#define TASKFILE_MULTI_OUT		0x0008
-+#define TASKFILE_IN_OUT			0x0010
-+
-+#define TASKFILE_IN_DMA			0x0020
-+#define TASKFILE_OUT_DMA		0x0040
-+#define TASKFILE_IN_DMAQ		0x0080
-+#define TASKFILE_OUT_DMAQ		0x0100
-+
-+#define TASKFILE_P_IN			0x0200
-+#define TASKFILE_P_OUT			0x0400
-+#define TASKFILE_P_IN_DMA		0x0800
-+#define TASKFILE_P_OUT_DMA		0x1000
-+#define TASKFILE_P_IN_DMAQ		0x2000
-+#define TASKFILE_P_OUT_DMAQ		0x4000
-+
-+/* ATA/ATAPI Commands pre T13 Spec */
-+#define WIN_NOP				0x00
-+/*
-+ *	0x01->0x02 Reserved
-+ */
-+#define CFA_REQ_EXT_ERROR_CODE		0x03 /* CFA Request Extended Error Code */
-+/*
-+ *	0x04->0x07 Reserved
-+ */
-+#define WIN_SRST			0x08 /* ATAPI soft reset command */
-+#define WIN_DEVICE_RESET		0x08
-+/*
-+ *	0x09->0x0F Reserved
-+ */
-+#define WIN_RECAL			0x10
-+#define WIN_RESTORE			WIN_RECAL
-+/*
-+ *	0x10->0x1F Reserved
-+ */
-+#define WIN_READ			0x20 /* 28-Bit */
-+#define WIN_READ_ONCE			0x21 /* 28-Bit without retries */
-+#define WIN_READ_LONG			0x22 /* 28-Bit */
-+#define WIN_READ_LONG_ONCE		0x23 /* 28-Bit without retries */
-+#define WIN_READ_EXT			0x24 /* 48-Bit */
-+#define WIN_READDMA_EXT			0x25 /* 48-Bit */
-+#define WIN_READDMA_QUEUED_EXT		0x26 /* 48-Bit */
-+#define WIN_READ_NATIVE_MAX_EXT		0x27 /* 48-Bit */
-+/*
-+ *	0x28
-+ */
-+#define WIN_MULTREAD_EXT		0x29 /* 48-Bit */
-+/*
-+ *	0x2A->0x2F Reserved
-+ */
-+#define WIN_WRITE			0x30 /* 28-Bit */
-+#define WIN_WRITE_ONCE			0x31 /* 28-Bit without retries */
-+#define WIN_WRITE_LONG			0x32 /* 28-Bit */
-+#define WIN_WRITE_LONG_ONCE		0x33 /* 28-Bit without retries */
-+#define WIN_WRITE_EXT			0x34 /* 48-Bit */
-+#define WIN_WRITEDMA_EXT		0x35 /* 48-Bit */
-+#define WIN_WRITEDMA_QUEUED_EXT		0x36 /* 48-Bit */
-+#define WIN_SET_MAX_EXT			0x37 /* 48-Bit */
-+#define CFA_WRITE_SECT_WO_ERASE		0x38 /* CFA Write Sectors without erase */
-+#define WIN_MULTWRITE_EXT		0x39 /* 48-Bit */
-+/*
-+ *	0x3A->0x3B Reserved
-+ */
-+#define WIN_WRITE_VERIFY		0x3C /* 28-Bit */
-+/*
-+ *	0x3D->0x3F Reserved
-+ */
-+#define WIN_VERIFY			0x40 /* 28-Bit - Read Verify Sectors */
-+#define WIN_VERIFY_ONCE			0x41 /* 28-Bit - without retries */
-+#define WIN_VERIFY_EXT			0x42 /* 48-Bit */
-+/*
-+ *	0x43->0x4F Reserved
-+ */
-+#define WIN_FORMAT			0x50
-+/*
-+ *	0x51->0x5F Reserved
-+ */
-+#define WIN_INIT			0x60
-+/*
-+ *	0x61->0x5F Reserved
-+ */
-+#define WIN_SEEK			0x70 /* 0x70-0x7F Reserved */
-+
-+#define CFA_TRANSLATE_SECTOR		0x87 /* CFA Translate Sector */
-+#define WIN_DIAGNOSE			0x90
-+#define WIN_SPECIFY			0x91 /* set drive geometry translation */
-+#define WIN_DOWNLOAD_MICROCODE		0x92
-+#define WIN_STANDBYNOW2			0x94
-+#define WIN_STANDBY2			0x96
-+#define WIN_SETIDLE2			0x97
-+#define WIN_CHECKPOWERMODE2		0x98
-+#define WIN_SLEEPNOW2			0x99
-+/*
-+ *	0x9A VENDOR
-+ */
-+#define WIN_PACKETCMD			0xA0 /* Send a packet command. */
-+#define WIN_PIDENTIFY			0xA1 /* identify ATAPI device	*/
-+#define WIN_QUEUED_SERVICE		0xA2
-+#define WIN_SMART			0xB0 /* self-monitoring and reporting */
-+#define CFA_ERASE_SECTORS		0xC0
-+#define WIN_MULTREAD			0xC4 /* read sectors using multiple mode*/
-+#define WIN_MULTWRITE			0xC5 /* write sectors using multiple mode */
-+#define WIN_SETMULT			0xC6 /* enable/disable multiple mode */
-+#define WIN_READDMA_QUEUED		0xC7 /* read sectors using Queued DMA transfers */
-+#define WIN_READDMA			0xC8 /* read sectors using DMA transfers */
-+#define WIN_READDMA_ONCE		0xC9 /* 28-Bit - without retries */
-+#define WIN_WRITEDMA			0xCA /* write sectors using DMA transfers */
-+#define WIN_WRITEDMA_ONCE		0xCB /* 28-Bit - without retries */
-+#define WIN_WRITEDMA_QUEUED		0xCC /* write sectors using Queued DMA transfers */
-+#define CFA_WRITE_MULTI_WO_ERASE	0xCD /* CFA Write multiple without erase */
-+#define WIN_GETMEDIASTATUS		0xDA
-+#define WIN_ACKMEDIACHANGE		0xDB /* ATA-1, ATA-2 vendor */
-+#define WIN_POSTBOOT			0xDC
-+#define WIN_PREBOOT 			0xDD
-+#define WIN_DOORLOCK			0xDE /* lock door on removable drives */
-+#define WIN_DOORUNLOCK			0xDF /* unlock door on removable drives */
-+#define WIN_STANDBYNOW1			0xE0
-+#define WIN_IDLEIMMEDIATE		0xE1 /* force drive to become "ready" */
-+#define WIN_STANDBY			0xE2 /* Set device in Standby Mode */
-+#define WIN_SETIDLE1			0xE3
-+#define WIN_READ_BUFFER			0xE4 /* force read only 1 sector */
-+#define WIN_CHECKPOWERMODE1		0xE5
-+#define WIN_SLEEPNOW1			0xE6
-+#define WIN_FLUSH_CACHE			0xE7
-+#define WIN_WRITE_BUFFER		0xE8 /* force write only 1 sector */
-+#define WIN_WRITE_SAME			0xE9 /* read ata-2 to use */
-+	/* SET_FEATURES 0x22 or 0xDD */
-+#define WIN_FLUSH_CACHE_EXT		0xEA /* 48-Bit */
-+#define WIN_IDENTIFY			0xEC /* ask drive to identify itself	*/
-+#define WIN_MEDIAEJECT			0xED
-+#define WIN_IDENTIFY_DMA		0xEE /* same as WIN_IDENTIFY, but DMA */
-+#define WIN_SETFEATURES			0xEF /* set special drive features */
-+#define EXABYTE_ENABLE_NEST		0xF0
-+#define WIN_SECURITY_SET_PASS		0xF1
-+#define WIN_SECURITY_UNLOCK		0xF2
-+#define WIN_SECURITY_ERASE_PREPARE	0xF3
-+#define WIN_SECURITY_ERASE_UNIT		0xF4
-+#define WIN_SECURITY_FREEZE_LOCK	0xF5
-+#define WIN_SECURITY_DISABLE		0xF6
-+#define WIN_READ_NATIVE_MAX		0xF8 /* return the native maximum address */
-+#define WIN_SET_MAX			0xF9
-+#define DISABLE_SEAGATE			0xFB
-+
-+/* WIN_SMART sub-commands */
-+
-+#define SMART_READ_VALUES		0xD0
-+#define SMART_READ_THRESHOLDS		0xD1
-+#define SMART_AUTOSAVE			0xD2
-+#define SMART_SAVE			0xD3
-+#define SMART_IMMEDIATE_OFFLINE		0xD4
-+#define SMART_READ_LOG_SECTOR		0xD5
-+#define SMART_WRITE_LOG_SECTOR		0xD6
-+#define SMART_WRITE_THRESHOLDS		0xD7
-+#define SMART_ENABLE			0xD8
-+#define SMART_DISABLE			0xD9
-+#define SMART_STATUS			0xDA
-+#define SMART_AUTO_OFFLINE		0xDB
-+
-+/* Password used in TF4 & TF5 executing SMART commands */
-+
-+#define SMART_LCYL_PASS			0x4F
-+#define SMART_HCYL_PASS			0xC2
-+
-+/* WIN_SETFEATURES sub-commands */
-+#define SETFEATURES_EN_8BIT	0x01	/* Enable 8-Bit Transfers */
-+#define SETFEATURES_EN_WCACHE	0x02	/* Enable write cache */
-+#define SETFEATURES_DIS_DEFECT	0x04	/* Disable Defect Management */
-+#define SETFEATURES_EN_APM	0x05	/* Enable advanced power management */
-+#define SETFEATURES_EN_SAME_R	0x22	/* for a region ATA-1 */
-+#define SETFEATURES_DIS_MSN	0x31	/* Disable Media Status Notification */
-+#define SETFEATURES_DIS_RETRY	0x33	/* Disable Retry */
-+#define SETFEATURES_EN_AAM	0x42	/* Enable Automatic Acoustic Management */
-+#define SETFEATURES_RW_LONG	0x44	/* Set Length of VS bytes */
-+#define SETFEATURES_SET_CACHE	0x54	/* Set Cache segments to SC Reg. Val */
-+#define SETFEATURES_DIS_RLA	0x55	/* Disable read look-ahead feature */
-+#define SETFEATURES_EN_RI	0x5D	/* Enable release interrupt */
-+#define SETFEATURES_EN_SI	0x5E	/* Enable SERVICE interrupt */
-+#define SETFEATURES_DIS_RPOD	0x66	/* Disable reverting to power on defaults */
-+#define SETFEATURES_DIS_ECC	0x77	/* Disable ECC byte count */
-+#define SETFEATURES_DIS_8BIT	0x81	/* Disable 8-Bit Transfers */
-+#define SETFEATURES_DIS_WCACHE	0x82	/* Disable write cache */
-+#define SETFEATURES_EN_DEFECT	0x84	/* Enable Defect Management */
-+#define SETFEATURES_DIS_APM	0x85	/* Disable advanced power management */
-+#define SETFEATURES_EN_ECC	0x88	/* Enable ECC byte count */
-+#define SETFEATURES_EN_MSN	0x95	/* Enable Media Status Notification */
-+#define SETFEATURES_EN_RETRY	0x99	/* Enable Retry */
-+#define SETFEATURES_EN_RLA	0xAA	/* Enable read look-ahead feature */
-+#define SETFEATURES_PREFETCH	0xAB	/* Sets drive prefetch value */
-+#define SETFEATURES_EN_REST	0xAC	/* ATA-1 */
-+#define SETFEATURES_4B_RW_LONG	0xBB	/* Set Lenght of 4 bytes */
-+#define SETFEATURES_DIS_AAM	0xC2	/* Disable Automatic Acoustic Management */
-+#define SETFEATURES_EN_RPOD	0xCC	/* Enable reverting to power on defaults */
-+#define SETFEATURES_DIS_RI	0xDD	/* Disable release interrupt ATAPI */
-+#define SETFEATURES_EN_SAME_M	0xDD	/* for a entire device ATA-1 */
-+#define SETFEATURES_DIS_SI	0xDE	/* Disable SERVICE interrupt ATAPI */
-+
-+/* WIN_SECURITY sub-commands */
-+
-+#define SECURITY_SET_PASSWORD		0xBA
-+#define SECURITY_UNLOCK			0xBB
-+#define SECURITY_ERASE_PREPARE		0xBC
-+#define SECURITY_ERASE_UNIT		0xBD
-+#define SECURITY_FREEZE_LOCK		0xBE
-+#define SECURITY_DISABLE_PASSWORD	0xBF
-+
-+struct hd_geometry {
-+      unsigned char heads;
-+      unsigned char sectors;
-+      unsigned short cylinders;
-+      unsigned long start;
-+};
-+
-+/* hd/ide ctl's that pass (arg) ptrs to user space are numbered 0x030n/0x031n */
-+#define HDIO_GETGEO		0x0301	/* get device geometry */
-+#define HDIO_GET_UNMASKINTR	0x0302	/* get current unmask setting */
-+#define HDIO_GET_MULTCOUNT	0x0304	/* get current IDE blockmode setting */
-+#define HDIO_GET_QDMA		0x0305	/* get use-qdma flag */
-+
-+#define HDIO_SET_XFER		0x0306  /* set transfer rate via proc */
-+
-+#define HDIO_OBSOLETE_IDENTITY	0x0307	/* OBSOLETE, DO NOT USE: returns 142 bytes */
-+#define HDIO_GET_KEEPSETTINGS	0x0308	/* get keep-settings-on-reset flag */
-+#define HDIO_GET_32BIT		0x0309	/* get current io_32bit setting */
-+#define HDIO_GET_NOWERR		0x030a	/* get ignore-write-error flag */
-+#define HDIO_GET_DMA		0x030b	/* get use-dma flag */
-+#define HDIO_GET_NICE		0x030c	/* get nice flags */
-+#define HDIO_GET_IDENTITY	0x030d	/* get IDE identification info */
-+#define HDIO_GET_WCACHE		0x030e	/* get write cache mode on|off */
-+#define HDIO_GET_ACOUSTIC	0x030f	/* get acoustic value */
-+#define	HDIO_GET_ADDRESS	0x0310	/* */
-+
-+#define HDIO_GET_BUSSTATE	0x031a	/* get the bus state of the hwif */
-+#define HDIO_TRISTATE_HWIF	0x031b	/* execute a channel tristate */
-+#define HDIO_DRIVE_RESET	0x031c	/* execute a device reset */
-+#define HDIO_DRIVE_TASKFILE	0x031d	/* execute raw taskfile */
-+#define HDIO_DRIVE_TASK		0x031e	/* execute task and special drive command */
-+#define HDIO_DRIVE_CMD		0x031f	/* execute a special drive command */
-+#define HDIO_DRIVE_CMD_AEB	HDIO_DRIVE_TASK
-+
-+/* hd/ide ctl's that pass (arg) non-ptr values are numbered 0x032n/0x033n */
-+#define HDIO_SET_MULTCOUNT	0x0321	/* change IDE blockmode */
-+#define HDIO_SET_UNMASKINTR	0x0322	/* permit other irqs during I/O */
-+#define HDIO_SET_KEEPSETTINGS	0x0323	/* keep ioctl settings on reset */
-+#define HDIO_SET_32BIT		0x0324	/* change io_32bit flags */
-+#define HDIO_SET_NOWERR		0x0325	/* change ignore-write-error flag */
-+#define HDIO_SET_DMA		0x0326	/* change use-dma flag */
-+#define HDIO_SET_PIO_MODE	0x0327	/* reconfig interface to new speed */
-+#define HDIO_SCAN_HWIF		0x0328	/* register and (re)scan interface */
-+#define HDIO_SET_NICE		0x0329	/* set nice flags */
-+#define HDIO_UNREGISTER_HWIF	0x032a  /* unregister interface */
-+#define HDIO_SET_WCACHE		0x032b	/* change write cache enable-disable */
-+#define HDIO_SET_ACOUSTIC	0x032c	/* change acoustic behavior */
-+#define HDIO_SET_BUSSTATE	0x032d	/* set the bus state of the hwif */
-+#define HDIO_SET_QDMA		0x032e	/* change use-qdma flag */
-+#define HDIO_SET_ADDRESS	0x032f	/* change lba addressing modes */
-+
-+/* bus states */
-+enum {
-+	BUSSTATE_OFF = 0,
-+	BUSSTATE_ON,
-+	BUSSTATE_TRISTATE
-+};
-+
-+/* hd/ide ctl's that pass (arg) ptrs to user space are numbered 0x033n/0x033n */
-+/* 0x330 is reserved - used to be HDIO_GETGEO_BIG */
-+/* 0x331 is reserved - used to be HDIO_GETGEO_BIG_RAW */
-+/* 0x338 is reserved - used to be HDIO_SET_IDE_SCSI */
-+/* 0x339 is reserved - used to be HDIO_SET_SCSI_IDE */
-+
-+#define __NEW_HD_DRIVE_ID
-+
-+/*
-+ * Structure returned by HDIO_GET_IDENTITY, as per ANSI NCITS ATA6 rev.1b spec.
-+ *
-+ * If you change something here, please remember to update fix_driveid() in
-+ * ide/probe.c.
-+ */
-+struct hd_driveid {
-+	unsigned short	config;		/* lots of obsolete bit flags */
-+	unsigned short	cyls;		/* Obsolete, "physical" cyls */
-+	unsigned short	reserved2;	/* reserved (word 2) */
-+	unsigned short	heads;		/* Obsolete, "physical" heads */
-+	unsigned short	track_bytes;	/* unformatted bytes per track */
-+	unsigned short	sector_bytes;	/* unformatted bytes per sector */
-+	unsigned short	sectors;	/* Obsolete, "physical" sectors per track */
-+	unsigned short	vendor0;	/* vendor unique */
-+	unsigned short	vendor1;	/* vendor unique */
-+	unsigned short	vendor2;	/* Retired vendor unique */
-+	unsigned char	serial_no[20];	/* 0 = not_specified */
-+	unsigned short	buf_type;	/* Retired */
-+	unsigned short	buf_size;	/* Retired, 512 byte increments
-+					 * 0 = not_specified
-+					 */
-+	unsigned short	ecc_bytes;	/* for r/w long cmds; 0 = not_specified */
-+	unsigned char	fw_rev[8];	/* 0 = not_specified */
-+	unsigned char	model[40];	/* 0 = not_specified */
-+	unsigned char	max_multsect;	/* 0=not_implemented */
-+	unsigned char	vendor3;	/* vendor unique */
-+	unsigned short	dword_io;	/* 0=not_implemented; 1=implemented */
-+	unsigned char	vendor4;	/* vendor unique */
-+	unsigned char	capability;	/* (upper byte of word 49)
-+					 *  3:	IORDYsup
-+					 *  2:	IORDYsw
-+					 *  1:	LBA
-+					 *  0:	DMA
-+					 */
-+	unsigned short	reserved50;	/* reserved (word 50) */
-+	unsigned char	vendor5;	/* Obsolete, vendor unique */
-+	unsigned char	tPIO;		/* Obsolete, 0=slow, 1=medium, 2=fast */
-+	unsigned char	vendor6;	/* Obsolete, vendor unique */
-+	unsigned char	tDMA;		/* Obsolete, 0=slow, 1=medium, 2=fast */
-+	unsigned short	field_valid;	/* (word 53)
-+					 *  2:	ultra_ok	word  88
-+					 *  1:	eide_ok		words 64-70
-+					 *  0:	cur_ok		words 54-58
-+					 */
-+	unsigned short	cur_cyls;	/* Obsolete, logical cylinders */
-+	unsigned short	cur_heads;	/* Obsolete, l heads */
-+	unsigned short	cur_sectors;	/* Obsolete, l sectors per track */
-+	unsigned short	cur_capacity0;	/* Obsolete, l total sectors on drive */
-+	unsigned short	cur_capacity1;	/* Obsolete, (2 words, misaligned int)     */
-+	unsigned char	multsect;	/* current multiple sector count */
-+	unsigned char	multsect_valid;	/* when (bit0==1) multsect is ok */
-+	unsigned int	lba_capacity;	/* Obsolete, total number of sectors */
-+	unsigned short	dma_1word;	/* Obsolete, single-word dma info */
-+	unsigned short	dma_mword;	/* multiple-word dma info */
-+	unsigned short  eide_pio_modes; /* bits 0:mode3 1:mode4 */
-+	unsigned short  eide_dma_min;	/* min mword dma cycle time (ns) */
-+	unsigned short  eide_dma_time;	/* recommended mword dma cycle time (ns) */
-+	unsigned short  eide_pio;       /* min cycle time (ns), no IORDY  */
-+	unsigned short  eide_pio_iordy; /* min cycle time (ns), with IORDY */
-+	unsigned short	words69_70[2];	/* reserved words 69-70
-+					 * future command overlap and queuing
-+					 */
-+	/* HDIO_GET_IDENTITY currently returns only words 0 through 70 */
-+	unsigned short	words71_74[4];	/* reserved words 71-74
-+					 * for IDENTIFY PACKET DEVICE command
-+					 */
-+	unsigned short  queue_depth;	/* (word 75)
-+					 * 15:5	reserved
-+					 *  4:0	Maximum queue depth -1
-+					 */
-+	unsigned short  words76_79[4];	/* reserved words 76-79 */
-+	unsigned short  major_rev_num;	/* (word 80) */
-+	unsigned short  minor_rev_num;	/* (word 81) */
-+	unsigned short  command_set_1;	/* (word 82) supported
-+					 * 15:	Obsolete
-+					 * 14:	NOP command
-+					 * 13:	READ_BUFFER
-+					 * 12:	WRITE_BUFFER
-+					 * 11:	Obsolete
-+					 * 10:	Host Protected Area
-+					 *  9:	DEVICE Reset
-+					 *  8:	SERVICE Interrupt
-+					 *  7:	Release Interrupt
-+					 *  6:	look-ahead
-+					 *  5:	write cache
-+					 *  4:	PACKET Command
-+					 *  3:	Power Management Feature Set
-+					 *  2:	Removable Feature Set
-+					 *  1:	Security Feature Set
-+					 *  0:	SMART Feature Set
-+					 */
-+	unsigned short  command_set_2;	/* (word 83)
-+					 * 15:	Shall be ZERO
-+					 * 14:	Shall be ONE
-+					 * 13:	FLUSH CACHE EXT
-+					 * 12:	FLUSH CACHE
-+					 * 11:	Device Configuration Overlay
-+					 * 10:	48-bit Address Feature Set
-+					 *  9:	Automatic Acoustic Management
-+					 *  8:	SET MAX security
-+					 *  7:	reserved 1407DT PARTIES
-+					 *  6:	SetF sub-command Power-Up
-+					 *  5:	Power-Up in Standby Feature Set
-+					 *  4:	Removable Media Notification
-+					 *  3:	APM Feature Set
-+					 *  2:	CFA Feature Set
-+					 *  1:	READ/WRITE DMA QUEUED
-+					 *  0:	Download MicroCode
-+					 */
-+	unsigned short  cfsse;		/* (word 84)
-+					 * cmd set-feature supported extensions
-+					 * 15:	Shall be ZERO
-+					 * 14:	Shall be ONE
-+					 * 13:6	reserved
-+					 *  5:	General Purpose Logging
-+					 *  4:	Streaming Feature Set
-+					 *  3:	Media Card Pass Through
-+					 *  2:	Media Serial Number Valid
-+					 *  1:	SMART selt-test supported
-+					 *  0:	SMART error logging
-+					 */
-+	unsigned short  cfs_enable_1;	/* (word 85)
-+					 * command set-feature enabled
-+					 * 15:	Obsolete
-+					 * 14:	NOP command
-+					 * 13:	READ_BUFFER
-+					 * 12:	WRITE_BUFFER
-+					 * 11:	Obsolete
-+					 * 10:	Host Protected Area
-+					 *  9:	DEVICE Reset
-+					 *  8:	SERVICE Interrupt
-+					 *  7:	Release Interrupt
-+					 *  6:	look-ahead
-+					 *  5:	write cache
-+					 *  4:	PACKET Command
-+					 *  3:	Power Management Feature Set
-+					 *  2:	Removable Feature Set
-+					 *  1:	Security Feature Set
-+					 *  0:	SMART Feature Set
-+					 */
-+	unsigned short  cfs_enable_2;	/* (word 86)
-+					 * command set-feature enabled
-+					 * 15:	Shall be ZERO
-+					 * 14:	Shall be ONE
-+					 * 13:	FLUSH CACHE EXT
-+					 * 12:	FLUSH CACHE
-+					 * 11:	Device Configuration Overlay
-+					 * 10:	48-bit Address Feature Set
-+					 *  9:	Automatic Acoustic Management
-+					 *  8:	SET MAX security
-+					 *  7:	reserved 1407DT PARTIES
-+					 *  6:	SetF sub-command Power-Up
-+					 *  5:	Power-Up in Standby Feature Set
-+					 *  4:	Removable Media Notification
-+					 *  3:	APM Feature Set
-+					 *  2:	CFA Feature Set
-+					 *  1:	READ/WRITE DMA QUEUED
-+					 *  0:	Download MicroCode
-+					 */
-+	unsigned short  csf_default;	/* (word 87)
-+					 * command set-feature default
-+					 * 15:	Shall be ZERO
-+					 * 14:	Shall be ONE
-+					 * 13:6	reserved
-+					 *  5:	General Purpose Logging enabled
-+					 *  4:	Valid CONFIGURE STREAM executed
-+					 *  3:	Media Card Pass Through enabled
-+					 *  2:	Media Serial Number Valid
-+					 *  1:	SMART selt-test supported
-+					 *  0:	SMART error logging
-+					 */
-+	unsigned short  dma_ultra;	/* (word 88) */
-+	unsigned short	trseuc;		/* time required for security erase */
-+	unsigned short	trsEuc;		/* time required for enhanced erase */
-+	unsigned short	CurAPMvalues;	/* current APM values */
-+	unsigned short	mprc;		/* master password revision code */
-+	unsigned short	hw_config;	/* hardware config (word 93)
-+					 * 15:	Shall be ZERO
-+					 * 14:	Shall be ONE
-+					 * 13:
-+					 * 12:
-+					 * 11:
-+					 * 10:
-+					 *  9:
-+					 *  8:
-+					 *  7:
-+					 *  6:
-+					 *  5:
-+					 *  4:
-+					 *  3:
-+					 *  2:
-+					 *  1:
-+					 *  0:	Shall be ONE
-+					 */
-+	unsigned short	acoustic;	/* (word 94)
-+					 * 15:8	Vendor's recommended value
-+					 *  7:0	current value
-+					 */
-+	unsigned short	msrqs;		/* min stream request size */
-+	unsigned short	sxfert;		/* stream transfer time */
-+	unsigned short	sal;		/* stream access latency */
-+	unsigned int	spg;		/* stream performance granularity */
-+	unsigned long long lba_capacity_2;/* 48-bit total number of sectors */
-+	unsigned short	words104_125[22];/* reserved words 104-125 */
-+	unsigned short	last_lun;	/* (word 126) */
-+	unsigned short	word127;	/* (word 127) Feature Set
-+					 * Removable Media Notification
-+					 * 15:2	reserved
-+					 *  1:0	00 = not supported
-+					 *	01 = supported
-+					 *	10 = reserved
-+					 *	11 = reserved
-+					 */
-+	unsigned short	dlf;		/* (word 128)
-+					 * device lock function
-+					 * 15:9	reserved
-+					 *  8	security level 1:max 0:high
-+					 *  7:6	reserved
-+					 *  5	enhanced erase
-+					 *  4	expire
-+					 *  3	frozen
-+					 *  2	locked
-+					 *  1	en/disabled
-+					 *  0	capability
-+					 */
-+	unsigned short  csfo;		/*  (word 129)
-+					 * current set features options
-+					 * 15:4	reserved
-+					 *  3:	auto reassign
-+					 *  2:	reverting
-+					 *  1:	read-look-ahead
-+					 *  0:	write cache
-+					 */
-+	unsigned short	words130_155[26];/* reserved vendor words 130-155 */
-+	unsigned short	word156;	/* reserved vendor word 156 */
-+	unsigned short	words157_159[3];/* reserved vendor words 157-159 */
-+	unsigned short	cfa_power;	/* (word 160) CFA Power Mode
-+					 * 15 word 160 supported
-+					 * 14 reserved
-+					 * 13
-+					 * 12
-+					 * 11:0
-+					 */
-+	unsigned short	words161_175[15];/* Reserved for CFA */
-+	unsigned short	words176_205[30];/* Current Media Serial Number */
-+	unsigned short	words206_254[49];/* reserved words 206-254 */
-+	unsigned short	integrity_word;	/* (word 255)
-+					 * 15:8 Checksum
-+					 *  7:0 Signature
-+					 */
-+};
-+
-+/*
-+ * IDE "nice" flags. These are used on a per drive basis to determine
-+ * when to be nice and give more bandwidth to the other devices which
-+ * share the same IDE bus.
-+ */
-+#define IDE_NICE_DSC_OVERLAP	(0)	/* per the DSC overlap protocol */
-+#define IDE_NICE_ATAPI_OVERLAP	(1)	/* not supported yet */
-+#define IDE_NICE_0		(2)	/* when sure that it won't affect us */
-+#define IDE_NICE_1		(3)	/* when probably won't affect us much */
-+#define IDE_NICE_2		(4)	/* when we know it's on our expense */
-+
-+#endif	/* _LINUX_HDREG_H */
-diff -Naur aboot-0.9b.orig/include/linux/ioctl.h aboot-0.9b/include/linux/ioctl.h
---- aboot-0.9b.orig/include/linux/ioctl.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/linux/ioctl.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,7 @@
-+#ifndef _LINUX_IOCTL_H
-+#define _LINUX_IOCTL_H
-+
-+#include <asm/ioctl.h>
-+
-+#endif /* _LINUX_IOCTL_H */
-+
-diff -Naur aboot-0.9b.orig/include/linux/kdev_t.h aboot-0.9b/include/linux/kdev_t.h
---- aboot-0.9b.orig/include/linux/kdev_t.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/linux/kdev_t.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,11 @@
-+#ifndef _LINUX_KDEV_T_H
-+#define _LINUX_KDEV_T_H
-+
-+/*
-+Some programs want their definitions of MAJOR and MINOR and MKDEV
-+from the kernel sources. These must be the externally visible ones.
-+*/
-+#define MAJOR(dev)	((dev)>>8)
-+#define MINOR(dev)	((dev) & 0xff)
-+#define MKDEV(ma,mi)	((ma)<<8 | (mi))
-+#endif
-diff -Naur aboot-0.9b.orig/include/linux/kernel.h aboot-0.9b/include/linux/kernel.h
---- aboot-0.9b.orig/include/linux/kernel.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/linux/kernel.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,46 @@
-+#ifndef _LINUX_KERNEL_H
-+#define _LINUX_KERNEL_H
-+
-+/*
-+ * 'kernel.h' contains some often-used function prototypes etc
-+ */
-+
-+
-+#define SI_LOAD_SHIFT	16
-+struct sysinfo {
-+	long uptime;			/* Seconds since boot */
-+	unsigned long loads[3];		/* 1, 5, and 15 minute load averages */
-+	unsigned long totalram;		/* Total usable main memory size */
-+	unsigned long freeram;		/* Available memory size */
-+	unsigned long sharedram;	/* Amount of shared memory */
-+	unsigned long bufferram;	/* Memory used by buffers */
-+	unsigned long totalswap;	/* Total swap space size */
-+	unsigned long freeswap;		/* swap space still available */
-+	unsigned short procs;		/* Number of current processes */
-+	unsigned short pad;		/* explicit padding for m68k */
-+	unsigned long totalhigh;	/* Total high memory size */
-+	unsigned long freehigh;		/* Available high memory size */
-+	unsigned int mem_unit;		/* Memory unit size in bytes */
-+	char _f[20-2*sizeof(long)-sizeof(int)];	/* Padding: libc5 uses this.. */
-+};
-+
-+/* Force a compilation error if condition is true */
-+#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
-+
-+/* Force a compilation error if condition is true, but also produce a
-+   result (of value 0 and type size_t), so the expression can be used
-+   e.g. in a structure initializer (or where-ever else comma expressions
-+   aren't permitted). */
-+#define BUILD_BUG_ON_ZERO(e) (sizeof(char[1 - 2 * !!(e)]) - 1)
-+
-+/* Trap pasters of __FUNCTION__ at compile-time */
-+#define __FUNCTION__ (__func__)
-+
-+/* This helps us to avoid #ifdef CONFIG_NUMA */
-+#ifdef CONFIG_NUMA
-+#define NUMA_BUILD 1
-+#else
-+#define NUMA_BUILD 0
-+#endif
-+
-+#endif
-diff -Naur aboot-0.9b.orig/include/linux/limits.h aboot-0.9b/include/linux/limits.h
---- aboot-0.9b.orig/include/linux/limits.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/linux/limits.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,20 @@
-+#ifndef _LINUX_LIMITS_H
-+#define _LINUX_LIMITS_H
-+
-+#define NR_OPEN	        1024
-+
-+#define NGROUPS_MAX    65536	/* supplemental group IDs are available */
-+#define ARG_MAX       131072	/* # bytes of args + environ for exec() */
-+#define LINK_MAX         127	/* # links a file may have */
-+#define MAX_CANON        255	/* size of the canonical input queue */
-+#define MAX_INPUT        255	/* size of the type-ahead buffer */
-+#define NAME_MAX         255	/* # chars in a file name */
-+#define PATH_MAX        4096	/* # chars in a path name including nul */
-+#define PIPE_BUF        4096	/* # bytes in atomic write to a pipe */
-+#define XATTR_NAME_MAX   255	/* # chars in an extended attribute name */
-+#define XATTR_SIZE_MAX 65536	/* size of an extended attribute value (64k) */
-+#define XATTR_LIST_MAX 65536	/* size of extended attribute namelist (64k) */
-+
-+#define RTSIG_MAX	  32
-+
-+#endif
-diff -Naur aboot-0.9b.orig/include/linux/magic.h aboot-0.9b/include/linux/magic.h
---- aboot-0.9b.orig/include/linux/magic.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/linux/magic.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,41 @@
-+#ifndef __LINUX_MAGIC_H__
-+#define __LINUX_MAGIC_H__
-+
-+#define ADFS_SUPER_MAGIC	0xadf5
-+#define AFFS_SUPER_MAGIC	0xadff
-+#define AFS_SUPER_MAGIC                0x5346414F
-+#define AUTOFS_SUPER_MAGIC	0x0187
-+#define CODA_SUPER_MAGIC	0x73757245
-+#define EFS_SUPER_MAGIC		0x414A53
-+#define EXT2_SUPER_MAGIC	0xEF53
-+#define EXT3_SUPER_MAGIC	0xEF53
-+#define EXT4_SUPER_MAGIC	0xEF53
-+#define HPFS_SUPER_MAGIC	0xf995e849
-+#define ISOFS_SUPER_MAGIC	0x9660
-+#define JFFS2_SUPER_MAGIC	0x72b6
-+#define ANON_INODE_FS_MAGIC	0x09041934
-+
-+#define MINIX_SUPER_MAGIC	0x137F		/* original minix fs */
-+#define MINIX_SUPER_MAGIC2	0x138F		/* minix fs, 30 char names */
-+#define MINIX2_SUPER_MAGIC	0x2468		/* minix V2 fs */
-+#define MINIX2_SUPER_MAGIC2	0x2478		/* minix V2 fs, 30 char names */
-+#define MINIX3_SUPER_MAGIC	0x4d5a		/* minix V3 fs */
-+
-+#define MSDOS_SUPER_MAGIC	0x4d44		/* MD */
-+#define NCP_SUPER_MAGIC		0x564c		/* Guess, what 0x564c is :-) */
-+#define NFS_SUPER_MAGIC		0x6969
-+#define OPENPROM_SUPER_MAGIC	0x9fa1
-+#define PROC_SUPER_MAGIC	0x9fa0
-+#define QNX4_SUPER_MAGIC	0x002f		/* qnx4 fs detection */
-+
-+#define REISERFS_SUPER_MAGIC	0x52654973	/* used by gcc */
-+					/* used by file system utilities that
-+	                                   look at the superblock, etc.  */
-+#define REISERFS_SUPER_MAGIC_STRING	"ReIsErFs"
-+#define REISER2FS_SUPER_MAGIC_STRING	"ReIsEr2Fs"
-+#define REISER2FS_JR_SUPER_MAGIC_STRING	"ReIsEr3Fs"
-+
-+#define SMB_SUPER_MAGIC		0x517B
-+#define USBDEVICE_SUPER_MAGIC	0x9fa2
-+
-+#endif /* __LINUX_MAGIC_H__ */
-diff -Naur aboot-0.9b.orig/include/linux/param.h aboot-0.9b/include/linux/param.h
---- aboot-0.9b.orig/include/linux/param.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/linux/param.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,6 @@
-+#ifndef _LINUX_PARAM_H
-+#define _LINUX_PARAM_H
-+
-+#include <asm/param.h>
-+
-+#endif
-diff -Naur aboot-0.9b.orig/include/linux/posix_types.h aboot-0.9b/include/linux/posix_types.h
---- aboot-0.9b.orig/include/linux/posix_types.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/linux/posix_types.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,49 @@
-+#ifndef _LINUX_POSIX_TYPES_H
-+#define _LINUX_POSIX_TYPES_H
-+
-+#include <linux/stddef.h>
-+
-+/*
-+ * This allows for 1024 file descriptors: if NR_OPEN is ever grown
-+ * beyond that you'll have to change this too. But 1024 fd's seem to be
-+ * enough even for such "real" unices like OSF/1, so hopefully this is
-+ * one limit that doesn't have to be changed [again].
-+ *
-+ * Note that POSIX wants the FD_CLEAR(fd,fdsetp) defines to be in
-+ * <sys/time.h> (and thus <linux/time.h>) - but this is a more logical
-+ * place for them. Solved by having dummy defines in <sys/time.h>.
-+ */
-+
-+/*
-+ * Those macros may have been defined in <gnu/types.h>. But we always
-+ * use the ones here. 
-+ */
-+#undef __NFDBITS
-+#define __NFDBITS	(8 * sizeof(unsigned long))
-+
-+#undef __FD_SETSIZE
-+#define __FD_SETSIZE	1024
-+
-+#undef __FDSET_LONGS
-+#define __FDSET_LONGS	(__FD_SETSIZE/__NFDBITS)
-+
-+#undef __FDELT
-+#define	__FDELT(d)	((d) / __NFDBITS)
-+
-+#undef __FDMASK
-+#define	__FDMASK(d)	(1UL << ((d) % __NFDBITS))
-+
-+typedef struct {
-+	unsigned long fds_bits [__FDSET_LONGS];
-+} __kernel_fd_set;
-+
-+/* Type of a signal handler.  */
-+typedef void (*__kernel_sighandler_t)(int);
-+
-+/* Type of a SYSV IPC key.  */
-+typedef int __kernel_key_t;
-+typedef int __kernel_mqd_t;
-+
-+#include <asm/posix_types.h>
-+
-+#endif /* _LINUX_POSIX_TYPES_H */
-diff -Naur aboot-0.9b.orig/include/linux/stat.h aboot-0.9b/include/linux/stat.h
---- aboot-0.9b.orig/include/linux/stat.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/linux/stat.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,45 @@
-+#ifndef _LINUX_STAT_H
-+#define _LINUX_STAT_H
-+
-+
-+#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
-+
-+#define S_IFMT  00170000
-+#define S_IFSOCK 0140000
-+#define S_IFLNK	 0120000
-+#define S_IFREG  0100000
-+#define S_IFBLK  0060000
-+#define S_IFDIR  0040000
-+#define S_IFCHR  0020000
-+#define S_IFIFO  0010000
-+#define S_ISUID  0004000
-+#define S_ISGID  0002000
-+#define S_ISVTX  0001000
-+
-+#define S_ISLNK(m)	(((m) & S_IFMT) == S_IFLNK)
-+#define S_ISREG(m)	(((m) & S_IFMT) == S_IFREG)
-+#define S_ISDIR(m)	(((m) & S_IFMT) == S_IFDIR)
-+#define S_ISCHR(m)	(((m) & S_IFMT) == S_IFCHR)
-+#define S_ISBLK(m)	(((m) & S_IFMT) == S_IFBLK)
-+#define S_ISFIFO(m)	(((m) & S_IFMT) == S_IFIFO)
-+#define S_ISSOCK(m)	(((m) & S_IFMT) == S_IFSOCK)
-+
-+#define S_IRWXU 00700
-+#define S_IRUSR 00400
-+#define S_IWUSR 00200
-+#define S_IXUSR 00100
-+
-+#define S_IRWXG 00070
-+#define S_IRGRP 00040
-+#define S_IWGRP 00020
-+#define S_IXGRP 00010
-+
-+#define S_IRWXO 00007
-+#define S_IROTH 00004
-+#define S_IWOTH 00002
-+#define S_IXOTH 00001
-+
-+#endif
-+
-+
-+#endif
-diff -Naur aboot-0.9b.orig/include/linux/stddef.h aboot-0.9b/include/linux/stddef.h
---- aboot-0.9b.orig/include/linux/stddef.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/linux/stddef.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,13 @@
-+#ifndef _LINUX_STDDEF_H
-+#define _LINUX_STDDEF_H
-+
-+
-+#undef NULL
-+#if defined(__cplusplus)
-+#define NULL 0
-+#else
-+#define NULL ((void *)0)
-+#endif
-+
-+
-+#endif
-diff -Naur aboot-0.9b.orig/include/linux/string.h aboot-0.9b/include/linux/string.h
---- aboot-0.9b.orig/include/linux/string.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/linux/string.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,113 @@
-+#ifndef _LINUX_STRING_H_
-+#define _LINUX_STRING_H_
-+
-+/* We don't want strings.h stuff being user by user stuff by accident */
-+
-+#ifdef __KERNEL__
-+
-+#include <linux/types.h>	/* for size_t */
-+#include <linux/stddef.h>	/* for NULL */
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+//extern char *strndup_user(const char __user *, long);
-+
-+#ifndef __HAVE_ARCH_STRCPY
-+extern char * strcpy(char *,const char *);
-+#endif
-+#ifndef __HAVE_ARCH_STRNCPY
-+extern char * strncpy(char *,const char *, __kernel_size_t);
-+#endif
-+#ifndef __HAVE_ARCH_STRLCPY
-+size_t strlcpy(char *, const char *, size_t);
-+#endif
-+#ifndef __HAVE_ARCH_STRCAT
-+extern char * strcat(char *, const char *);
-+#endif
-+#ifndef __HAVE_ARCH_STRNCAT
-+extern char * strncat(char *, const char *, __kernel_size_t);
-+#endif
-+#ifndef __HAVE_ARCH_STRLCAT
-+extern size_t strlcat(char *, const char *, __kernel_size_t);
-+#endif
-+#ifndef __HAVE_ARCH_STRCMP
-+extern int strcmp(const char *,const char *);
-+#endif
-+#ifndef __HAVE_ARCH_STRNCMP
-+extern int strncmp(const char *,const char *,__kernel_size_t);
-+#endif
-+#ifndef __HAVE_ARCH_STRNICMP
-+extern int strnicmp(const char *, const char *, __kernel_size_t);
-+#endif
-+#ifndef __HAVE_ARCH_STRCASECMP
-+extern int strcasecmp(const char *s1, const char *s2);
-+#endif
-+#ifndef __HAVE_ARCH_STRNCASECMP
-+extern int strncasecmp(const char *s1, const char *s2, size_t n);
-+#endif
-+#ifndef __HAVE_ARCH_STRCHR
-+extern char * strchr(const char *,int);
-+#endif
-+#ifndef __HAVE_ARCH_STRNCHR
-+extern char * strnchr(const char *, size_t, int);
-+#endif
-+#ifndef __HAVE_ARCH_STRRCHR
-+extern char * strrchr(const char *,int);
-+#endif
-+extern char * strstrip(char *);
-+#ifndef __HAVE_ARCH_STRSTR
-+extern char * strstr(const char *,const char *);
-+#endif
-+#ifndef __HAVE_ARCH_STRLEN
-+extern __kernel_size_t strlen(const char *);
-+#endif
-+#ifndef __HAVE_ARCH_STRNLEN
-+extern __kernel_size_t strnlen(const char *,__kernel_size_t);
-+#endif
-+#ifndef __HAVE_ARCH_STRPBRK
-+extern char * strpbrk(const char *,const char *);
-+#endif
-+#ifndef __HAVE_ARCH_STRSEP
-+extern char * strsep(char **,const char *);
-+#endif
-+#ifndef __HAVE_ARCH_STRSPN
-+extern __kernel_size_t strspn(const char *,const char *);
-+#endif
-+#ifndef __HAVE_ARCH_STRCSPN
-+extern __kernel_size_t strcspn(const char *,const char *);
-+#endif
-+
-+#ifndef __HAVE_ARCH_MEMSET
-+extern void * memset(void *,int,__kernel_size_t);
-+#endif
-+#ifndef __HAVE_ARCH_MEMCPY
-+extern void * memcpy(void *,const void *,__kernel_size_t);
-+#endif
-+#ifndef __HAVE_ARCH_MEMMOVE
-+extern void * memmove(void *,const void *,__kernel_size_t);
-+#endif
-+#ifndef __HAVE_ARCH_MEMSCAN
-+extern void * memscan(void *,int,__kernel_size_t);
-+#endif
-+#ifndef __HAVE_ARCH_MEMCMP
-+extern int memcmp(const void *,const void *,__kernel_size_t);
-+#endif
-+#ifndef __HAVE_ARCH_MEMCHR
-+extern void * memchr(const void *,int,__kernel_size_t);
-+#endif
-+
-+//extern char *kstrdup(const char *s, gfp_t gfp);
-+//extern char *kstrndup(const char *s, size_t len, gfp_t gfp);
-+//extern void *kmemdup(const void *src, size_t len, gfp_t gfp);
-+
-+//extern char **argv_split(gfp_t gfp, const char *str, int *argcp);
-+//extern void argv_free(char **argv);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif
-+#endif /* _LINUX_STRING_H_ */
-diff -Naur aboot-0.9b.orig/include/linux/types.h aboot-0.9b/include/linux/types.h
---- aboot-0.9b.orig/include/linux/types.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/linux/types.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,172 @@
-+#ifndef _LINUX_TYPES_H
-+#define _LINUX_TYPES_H
-+
-+
-+#include <linux/posix_types.h>
-+#include <asm/types.h>
-+
-+#ifndef __KERNEL_STRICT_NAMES
-+
-+typedef __u32 __kernel_dev_t;
-+
-+typedef __kernel_fd_set		fd_set;
-+typedef __kernel_dev_t		dev_t;
-+typedef __kernel_ino_t		ino_t;
-+typedef __kernel_mode_t		mode_t;
-+typedef __kernel_nlink_t	nlink_t;
-+typedef __kernel_off_t		off_t;
-+typedef __kernel_pid_t		pid_t;
-+typedef __kernel_daddr_t	daddr_t;
-+typedef __kernel_key_t		key_t;
-+typedef __kernel_suseconds_t	suseconds_t;
-+typedef __kernel_timer_t	timer_t;
-+typedef __kernel_clockid_t	clockid_t;
-+typedef __kernel_mqd_t		mqd_t;
-+
-+typedef __kernel_uid_t		uid_t;
-+typedef __kernel_gid_t		gid_t;
-+
-+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-+typedef __kernel_loff_t		loff_t;
-+#endif
-+
-+/*
-+ * The following typedefs are also protected by individual ifdefs for
-+ * historical reasons:
-+ */
-+#ifndef _SIZE_T
-+#define _SIZE_T
-+typedef __kernel_size_t		size_t;
-+#endif
-+
-+#ifndef _SSIZE_T
-+#define _SSIZE_T
-+typedef __kernel_ssize_t	ssize_t;
-+#endif
-+
-+#ifndef _PTRDIFF_T
-+#define _PTRDIFF_T
-+typedef __kernel_ptrdiff_t	ptrdiff_t;
-+#endif
-+
-+#ifndef _TIME_T
-+#define _TIME_T
-+typedef __kernel_time_t		time_t;
-+#endif
-+
-+#ifndef _CLOCK_T
-+#define _CLOCK_T
-+typedef __kernel_clock_t	clock_t;
-+#endif
-+
-+#ifndef _CADDR_T
-+#define _CADDR_T
-+typedef __kernel_caddr_t	caddr_t;
-+#endif
-+
-+/* bsd */
-+typedef unsigned char		u_char;
-+typedef unsigned short		u_short;
-+typedef unsigned int		u_int;
-+typedef unsigned long		u_long;
-+
-+/* sysv */
-+typedef unsigned char		unchar;
-+typedef unsigned short		ushort;
-+typedef unsigned int		uint;
-+typedef unsigned long		ulong;
-+
-+#ifndef __BIT_TYPES_DEFINED__
-+#define __BIT_TYPES_DEFINED__
-+
-+typedef		__u8		u_int8_t;
-+typedef		__s8		int8_t;
-+typedef		__u16		u_int16_t;
-+typedef		__s16		int16_t;
-+typedef		__u32		u_int32_t;
-+typedef		__s32		int32_t;
-+
-+#endif /* !(__BIT_TYPES_DEFINED__) */
-+
-+typedef		__u8		uint8_t;
-+typedef		__u16		uint16_t;
-+typedef		__u32		uint32_t;
-+
-+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-+typedef		__u64		uint64_t;
-+typedef		__u64		u_int64_t;
-+typedef		__s64		int64_t;
-+#endif
-+
-+/* this is a special 64bit data type that is 8-byte aligned */
-+#define aligned_u64 unsigned long long __attribute__((aligned(8)))
-+#define aligned_be64 __be64 __attribute__((aligned(8)))
-+#define aligned_le64 __le64 __attribute__((aligned(8)))
-+
-+/**
-+ * The type used for indexing onto a disc or disc partition.
-+ *
-+ * Linux always considers sectors to be 512 bytes long independently
-+ * of the devices real block size.
-+ */
-+#ifdef CONFIG_LBD
-+typedef u64 sector_t;
-+#else
-+typedef unsigned long sector_t;
-+#endif
-+
-+/*
-+ * The type of the inode's block count.
-+ */
-+#ifdef CONFIG_LSF
-+typedef u64 blkcnt_t;
-+#else
-+typedef unsigned long blkcnt_t;
-+#endif
-+
-+/*
-+ * The type of an index into the pagecache.  Use a #define so asm/types.h
-+ * can override it.
-+ */
-+#ifndef pgoff_t
-+#define pgoff_t unsigned long
-+#endif
-+
-+#endif /* __KERNEL_STRICT_NAMES */
-+
-+/*
-+ * Below are truly Linux-specific types that should never collide with
-+ * any application/library that wants linux/types.h.
-+ */
-+
-+#ifdef __CHECKER__
-+#define __bitwise__ __attribute__((bitwise))
-+#else
-+#define __bitwise__
-+#endif
-+#ifdef __CHECK_ENDIAN__
-+#define __bitwise __bitwise__
-+#else
-+#define __bitwise
-+#endif
-+
-+typedef __u16 __bitwise __le16;
-+typedef __u16 __bitwise __be16;
-+typedef __u32 __bitwise __le32;
-+typedef __u32 __bitwise __be32;
-+#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
-+typedef __u64 __bitwise __le64;
-+typedef __u64 __bitwise __be64;
-+#endif
-+typedef __u16 __bitwise __sum16;
-+typedef __u32 __bitwise __wsum;
-+
-+
-+struct ustat {
-+	__kernel_daddr_t	f_tfree;
-+	__kernel_ino_t		f_tinode;
-+	char			f_fname[6];
-+	char			f_fpack[6];
-+};
-+
-+#endif /* _LINUX_TYPES_H */
-diff -Naur aboot-0.9b.orig/include/linux/version.h aboot-0.9b/include/linux/version.h
---- aboot-0.9b.orig/include/linux/version.h	1969-12-31 19:00:00.000000000 -0500
-+++ aboot-0.9b/include/linux/version.h	2008-01-02 13:53:15.000000000 -0500
-@@ -0,0 +1,2 @@
-+#define LINUX_VERSION_CODE 132631
-+#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-diff -Naur aboot-0.9b.orig/include/utils.h aboot-0.9b/include/utils.h
---- aboot-0.9b.orig/include/utils.h	2001-10-08 19:03:52.000000000 -0400
-+++ aboot-0.9b/include/utils.h	2008-01-02 13:53:15.000000000 -0500
-@@ -15,6 +15,10 @@
- extern void		getline (char *buf, int maxlen);
- #endif
- 
-+unsigned long simple_strtoul(const char *cp, char **endp, unsigned int base);
-+size_t strnlen(const char * s, size_t count);
-+char * strtok(char * s,const char * ct);
-+
- extern unsigned long	memory_end(void);
- extern unsigned long	free_mem_ptr;
- 
-diff -Naur aboot-0.9b.orig/lib/Makefile aboot-0.9b/lib/Makefile
---- aboot-0.9b.orig/lib/Makefile	2002-09-18 15:48:22.000000000 -0400
-+++ aboot-0.9b/lib/Makefile	2008-01-02 13:53:15.000000000 -0500
-@@ -1,4 +1,5 @@
--CC	= gcc
-+include ../Makefile.inc
-+
- CPPFLAGS +=  -D__KERNEL__ -I../include
- ifeq ($(TESTING),)
- CFLAGS	= -Os -Wall -mno-fp-regs -fno-builtin
-@@ -11,10 +12,10 @@
- libaboot.a: vsprintf.o memcpy.o memset.o string.o _setjmp.o \
- 	_longjmp.o isolib.o __divqu.o __remqu.o __divlu.o \
- 	__remlu.o
--	ar cru $@ $?
-+	$(AR) cru $@ $?
- else
- libaboot.a: isolib.o
--	ar cru $@ $?
-+	$(AR) cru $@ $?
- endif
- 
- clean:
-diff -Naur aboot-0.9b.orig/lib/isolib.c aboot-0.9b/lib/isolib.c
---- aboot-0.9b.orig/lib/isolib.c	2001-10-08 19:03:53.000000000 -0400
-+++ aboot-0.9b/lib/isolib.c	2008-01-02 13:53:15.000000000 -0500
-@@ -6,16 +6,14 @@
-  * functionality to the Linux bootstrapper.  All we can do is
-  * open and read files... but that's all we need 8-)
-  */
--#ifndef TESTING
--#  include <linux/string.h>
--#endif
- #include <linux/kernel.h>
--#include <linux/config.h>
- #include <linux/types.h>
- #include <linux/stat.h>
- #include <linux/kdev_t.h>
- #include <asm/page.h>
- 
-+#include <string.h>
-+
- #include <iso.h>
- #include <isolib.h>
- #include <utils.h>
-@@ -488,7 +486,7 @@
- 		  if (dlen) {
- 		    strcpy(de->name, retname);
- 		  } else {
--		    dlen = isonum_711(de->name_len);
-+		    dlen = isonum_711((char *)de->name_len);
- 		    if(sb.s_mapping == 'n') {
- 		      for (i = 0; i < dlen; i++) {
- 			c = de->name[i];
-@@ -1035,7 +1033,7 @@
- 	 * Everything's cool, let's get the filename. 
- 	 * First we need to figure out the length. 
- 	 */
--	name_len = isonum_711(dirent->name_len);
-+	name_len = isonum_711((char *)dirent->name_len);
- #ifdef DEBUG_ISO
- 	if (name_len==0) printf("dirent->name_len = 0, skipping.\n");
- #endif
-@@ -1177,7 +1175,7 @@
-   if (!sb.s_rock) return 0;
-   *retname = '\0';
- 
--  len = sizeof(struct iso_directory_record) + isonum_711(de->name_len);
-+  len = sizeof(struct iso_directory_record) + isonum_711((char *)de->name_len);
-   if (len & 1) len++;
-   chr = ((unsigned char *) de) + len;
-   len = *((unsigned char *) de) - len;
-@@ -1520,6 +1518,7 @@
- #ifdef DEBUG_ROCK
- 	   printf("Symlink component flag not implemented (%d)\n",slen);
- #endif
-+	   break;
- 	 };
- 	 slen -= slp->len + 2;
- 	 oldslp = slp;
-diff -Naur aboot-0.9b.orig/lib/vsprintf.c aboot-0.9b/lib/vsprintf.c
---- aboot-0.9b.orig/lib/vsprintf.c	2001-10-08 19:03:53.000000000 -0400
-+++ aboot-0.9b/lib/vsprintf.c	2008-01-02 13:53:15.000000000 -0500
-@@ -11,7 +11,8 @@
- 
- #include <stdarg.h>
- #include <linux/types.h>
--#include <linux/string.h>
-+
-+#include <utils.h>
- 
- /* we use this so that we can do without the ctype library */
- #define is_digit(c)	((c) >= '0' && (c) <= '9')
-diff -Naur aboot-0.9b.orig/sdisklabel/Makefile aboot-0.9b/sdisklabel/Makefile
---- aboot-0.9b.orig/sdisklabel/Makefile	2001-10-08 19:03:53.000000000 -0400
-+++ aboot-0.9b/sdisklabel/Makefile	2008-01-02 13:53:15.000000000 -0500
-@@ -1,13 +1,17 @@
--CC = gcc -O2
--CFLAGS= -I../include $(CPPFLAGS) -Wall
-+include ../Makefile.inc
-+
-+CFLAGS= -O2 -I../include $(CPPFLAGS) -Wall
- 
- all:	sdisklabel swriteboot
- 
-+%.o: %.c
-+	$(HOST_CC) $(CFLAGS) -c $< -o $@
-+
- sdisklabel: sdisklabel.o library.o
--	$(CC) $(LDFLAGS) sdisklabel.o library.o -o sdisklabel
-+	$(HOST_CC) $(LDFLAGS) sdisklabel.o library.o -o sdisklabel
- 
- swriteboot: swriteboot.o library.o
--	$(CC) $(LDFLAGS) swriteboot.o library.o -o swriteboot
-+	$(HOST_CC) $(LDFLAGS) swriteboot.o library.o -o swriteboot
- 
- clean:
- 	rm -f sdisklabel swriteboot *.o
-diff -Naur aboot-0.9b.orig/sdisklabel/sdisklabel.c aboot-0.9b/sdisklabel/sdisklabel.c
---- aboot-0.9b.orig/sdisklabel/sdisklabel.c	2001-11-14 19:06:30.000000000 -0500
-+++ aboot-0.9b/sdisklabel/sdisklabel.c	2008-01-02 13:53:15.000000000 -0500
-@@ -36,7 +36,7 @@
- 	d->d_magic2=DISKLABELMAGIC;
- 	d->d_type=DTYPE_SCSI;
- 	d->d_secsize=512;
--	strcpy(d->d_typename,"SCSI");
-+	strcpy((char *)d->d_typename,"SCSI");
- }
- 
- void
-diff -Naur aboot-0.9b.orig/sdisklabel/swriteboot.c aboot-0.9b/sdisklabel/swriteboot.c
---- aboot-0.9b.orig/sdisklabel/swriteboot.c	2001-10-08 19:03:53.000000000 -0400
-+++ aboot-0.9b/sdisklabel/swriteboot.c	2008-01-02 13:53:15.000000000 -0500
-@@ -6,7 +6,6 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- 
--#include <asm/system.h>
- #include <disklabel.h>
- #include <config.h>
- #include "library.h"
-diff -Naur aboot-0.9b.orig/tools/Makefile aboot-0.9b/tools/Makefile
---- aboot-0.9b.orig/tools/Makefile	2001-10-08 19:03:53.000000000 -0400
-+++ aboot-0.9b/tools/Makefile	2008-01-02 13:53:15.000000000 -0500
-@@ -1,20 +1,31 @@
--CC	= gcc
-+
-+include ../Makefile.inc
-+
- CFLAGS	= -g -O2 -Wall -I. -I../include $(CPPFLAGS)
- LDFLAGS	= -g
- PGMS	= e2writeboot isomarkboot abootconf elfencap objstrip
- 
--EXEC_PREFIX = /usr
--
--all:	$(PGMS)
-+all: $(PGMS)
- 
--install:	$(PGMS)
--	install -s -c -o root -g root -m 755 $(PGMS) $(EXEC_PREFIX)/bin
-+.c.o:
-+	$(HOST_CC) $(CFLAGS) -c $< -o $@
- 
--clean:
--	rm -f *~ *.o *.a core $(PGMS)
-+$(PGMS):
-+	$(HOST_CC) $(LDFLAGS) $^ -o $@
- 
--isomarkboot:	isomarkboot.o ../lib/isolib.o
--e2writeboot:	e2writeboot.o e2lib.o bio.o
-+abootconf: abootconf.o
-+objstrip: objstrip.o
-+elfencap: elfencap.o
-+isomarkboot: isomarkboot.o isolib.o
-+e2writeboot: e2writeboot.o e2lib.o bio.o
- 
--e2writeboot.o:	e2lib.h
-+e2writeboot.o:  e2lib.h
- e2lib.o: e2lib.h
-+isolib.o: ../lib/isolib.c
-+	$(HOST_CC) $(CFLAGS) -c $< -o $@
-+
-+install: $(PGMS)
-+	install -s -c -o root -g root -m 755 $(PGMS) $(DESTDIR)$(EXEC_PREFIX)/bin
-+
-+clean:
-+	rm -f *~ *.o *.a core $(PGMS)
-diff -Naur aboot-0.9b.orig/tools/elfencap.c aboot-0.9b/tools/elfencap.c
---- aboot-0.9b.orig/tools/elfencap.c	2001-10-08 19:03:53.000000000 -0400
-+++ aboot-0.9b/tools/elfencap.c	2008-01-02 13:53:15.000000000 -0500
-@@ -34,7 +34,7 @@
-     memset(&h, 0, sizeof(h));
- 
-     h.ehdr.e_ident[0] = 0x7f;
--    strcpy(h.ehdr.e_ident + 1, "ELF");
-+    strcpy((char *)h.ehdr.e_ident + 1, "ELF");
-     h.ehdr.e_ident[EI_CLASS]	= ELF_CLASS;
-     h.ehdr.e_ident[EI_DATA]	= ELF_DATA;
-     h.ehdr.e_ident[EI_VERSION]	= EV_CURRENT;
-diff -Naur aboot-0.9b.orig/tools/objstrip.c aboot-0.9b/tools/objstrip.c
---- aboot-0.9b.orig/tools/objstrip.c	2002-09-18 15:48:22.000000000 -0400
-+++ aboot-0.9b/tools/objstrip.c	2008-01-02 13:53:15.000000000 -0500
-@@ -152,7 +152,7 @@
- #ifdef __ELF__
-     elf = (struct elfhdr *) buf;
- 
--    if (elf->e_ident[0] == 0x7f && strncmp(elf->e_ident + 1, "ELF", 3) == 0) {
-+    if (elf->e_ident[0] == 0x7f && strncmp((char *)elf->e_ident + 1, "ELF", 3) == 0) {
- 	if (elf->e_type != ET_EXEC) {
- 	    fprintf(stderr, "%s: %s is not an ELF executable\n",
- 		    prog_name, inname);
-diff -Naur aboot-0.9b.orig/zip/misc.c aboot-0.9b/zip/misc.c
---- aboot-0.9b.orig/zip/misc.c	2001-10-08 19:03:54.000000000 -0400
-+++ aboot-0.9b/zip/misc.c	2008-01-02 13:53:15.000000000 -0500
-@@ -189,7 +189,7 @@
- 	}
- 
- 	nblocks = INBUFSIZ / bfs->blocksize;
--	nread = (*bfs->bread)(input_fd, block_number, nblocks, inbuf);
-+	nread = (*bfs->bread)(input_fd, block_number, nblocks, (char *)inbuf);
- #ifdef DEBUG
- 	printf("read %ld blocks of %d, got %ld\n", nblocks, bfs->blocksize,
- 	       nread);
-@@ -230,14 +230,14 @@
- 	updcrc(window, outcnt);
- 
- 	if (!bytes_out) /* first block - look for headers */
--		if (first_block(window, outcnt) < 0)
-+		if (first_block((char *)window, outcnt) < 0)
- 			unzip_error("invalid exec header"); /* does a longjmp() */
- 
- 	bytes_out += outcnt;
- 	while (chunk < nchunks) {
- 		/* position within the current segment */
- 		ssize_t chunk_offset = file_offset - chunks[chunk].offset;
--		unsigned char *dest = (char *) chunks[chunk].addr + chunk_offset;
-+		unsigned char *dest = (unsigned char *) chunks[chunk].addr + chunk_offset;
- 		ssize_t to_copy;
- 		unsigned char *src = window;
- 
Index: patches/bash-2.05b-gcc34-1.patch
===================================================================
--- patches/bash-2.05b-gcc34-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/bash-2.05b-gcc34-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,34 @@
+Submitted By: Zack Winkles <winkie AT linuxfromscratch DOT org>
+Date: 2004-04-06
+Initial Package Version: 2.05b
+Origin: N/A
+Description: Fix some occurrences of syntax that GCC 3.4.0 doesn't like.
+
+--- bash-2.05b/lib/malloc/malloc.c.orig	2002-06-21 21:16:49.000000000 +0200
++++ bash-2.05b/lib/malloc/malloc.c	2004-03-01 10:07:19.749437536 +0100
+@@ -236,7 +236,7 @@
+ 	8192UL, 16384UL, 32768UL, 65536UL, 131072UL, 262144UL, 524288UL,
+ 	1048576UL, 2097152UL, 4194304UL, 8388608UL, 16777216UL, 33554432UL,
+ 	67108864UL, 134217728UL, 268435456UL, 536870912UL, 1073741824UL,
+-	2147483648UL, 4294967296UL-1
++	2147483648UL, 4294967295UL
+ };
+ 
+ /* binsizes[x] == (1 << ((x) + 3)) */
+@@ -290,7 +290,7 @@
+ 
+ #if !defined (botch)
+ static void
+-botch (s, file, line)
++botch (const char *s, const char *file, int line)
+ {
+   fprintf (stderr, "malloc: failed assertion: %s\n", s);
+   (void)fflush (stderr);
+@@ -879,6 +879,7 @@
+   busy[nunits] = 0;
+ 
+ free_return:
++  ((void)0);
+ 
+ #ifdef MALLOC_STATS
+   _mstats.nmalloc[nunits]--;
Index: patches/bash-2.05b-gnu_fixes-2.patch
===================================================================
--- patches/bash-2.05b-gnu_fixes-2.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/bash-2.05b-gnu_fixes-2.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,225 @@
+Submitted By: Jeremy Utley <jeremy@linuxfromscratch.org>
+Date: 2003-08-28
+Initial Package Version: 2.05b
+Origin: ftp://ftp.gnu.org/gnu/bash
+Description: Integrates all 7 published bash-2.05b patches into a single
+             patch file for LFS use.
+
+diff -Naur bash-2.05b/bashline.c bash-2.05b-new/bashline.c
+--- bash-2.05b/bashline.c	2002-05-07 15:52:42.000000000 -0400
++++ bash-2.05b-new/bashline.c	2003-08-28 13:29:37.000000000 -0400
+@@ -1044,7 +1044,10 @@
+ 	}
+       else
+ 	{
++#define CMD_IS_DIR(x)	(absolute_pathname(x) == 0 && *(x) != '~' && test_for_directory (x))
++
+ 	  matches = rl_completion_matches (text, command_word_completion_function);
++
+ 	  /* If we are attempting command completion and nothing matches, we
+ 	     do not want readline to perform filename completion for us.  We
+ 	     still want to be able to complete partial pathnames, so set the
+@@ -1052,7 +1055,7 @@
+ 	     filenames and leave directories in the match list. */
+ 	  if (matches == (char **)NULL)
+ 	    rl_ignore_some_completions_function = bash_ignore_filenames;
+-	  else if (matches[1] == 0 && *matches[0] != '/')
++	  else if (matches[1] == 0 && CMD_IS_DIR(matches[0]))
+ 	    /* Turn off rl_filename_completion_desired so readline doesn't
+ 	       append a slash if there is a directory with the same name
+ 	       in the current directory, or other filename-specific things.
+@@ -1061,7 +1064,7 @@
+ 	       looking in the current directory anyway, so there's no
+ 	       conflict. */
+ 	    rl_filename_completion_desired = 0;
+-	  else if (matches[0] && matches[1] && STREQ (matches[0], matches[1]) && *matches[0] != '/')
++	  else if (matches[0] && matches[1] && STREQ (matches[0], matches[1]) && CMD_IS_DIR (matches[0]))
+ 	    /* There are multiple instances of the same match (duplicate
+ 	       completions haven't yet been removed).  In this case, all of
+ 	       the matches will be the same, and the duplicate removal code
+diff -Naur bash-2.05b/lib/readline/bind.c bash-2.05b-new/lib/readline/bind.c
+--- bash-2.05b/lib/readline/bind.c	2002-01-24 11:15:52.000000000 -0500
++++ bash-2.05b-new/lib/readline/bind.c	2003-08-28 13:29:37.000000000 -0400
+@@ -311,7 +311,7 @@
+ 	     mapped to something, `abc' to be mapped to something else,
+ 	     and the function bound  to `a' to be executed when the user
+ 	     types `abx', leaving `bx' in the input queue. */
+-	  if (k.function /* && k.type == ISFUNC */)
++	  if (k.function && ((k.type == ISFUNC && k.function != rl_do_lowercase_version) || k.type == ISMACR))
+ 	    {
+ 	      map[ANYOTHERKEY] = k;
+ 	      k.function = 0;
+diff -Naur bash-2.05b/lib/readline/display.c bash-2.05b-new/lib/readline/display.c
+--- bash-2.05b/lib/readline/display.c	2002-06-04 10:54:47.000000000 -0400
++++ bash-2.05b-new/lib/readline/display.c	2003-08-28 13:29:37.000000000 -0400
+@@ -70,7 +70,7 @@
+ static void cr PARAMS((void));
+ 
+ #if defined (HANDLE_MULTIBYTE)
+-static int _rl_col_width PARAMS((char *, int, int));
++static int _rl_col_width PARAMS((const char *, int, int));
+ static int *_rl_wrapped_line;
+ #else
+ #  define _rl_col_width(l, s, e)	(((e) <= (s)) ? 0 : (e) - (s))
+@@ -1348,9 +1348,9 @@
+ 	    {
+ 	      _rl_output_some_chars (nfd + lendiff, temp - lendiff);
+ #if 0
+-	      _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-lendiff) - col_lendiff;
+-#else
+ 	      _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-col_lendiff);
++#else
++	      _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-lendiff);
+ #endif
+ 	    }
+ 	}
+@@ -1510,8 +1510,15 @@
+ #if defined (HANDLE_MULTIBYTE)
+   /* If we have multibyte characters, NEW is indexed by the buffer point in
+      a multibyte string, but _rl_last_c_pos is the display position.  In
+-     this case, NEW's display position is not obvious. */
+-  if ((MB_CUR_MAX == 1 || rl_byte_oriented ) && _rl_last_c_pos == new) return;
++     this case, NEW's display position is not obvious and must be
++     calculated. */
++  if (MB_CUR_MAX == 1 || rl_byte_oriented)
++    {
++      if (_rl_last_c_pos == new)
++	return;
++    }
++  else if (_rl_last_c_pos == _rl_col_width (data, 0, new))
++    return;
+ #else
+   if (_rl_last_c_pos == new) return;
+ #endif
+@@ -1594,11 +1601,7 @@
+ #endif
+     {
+       if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+-	{
+-	  tputs (_rl_term_cr, 1, _rl_output_character_function);
+-	  for (i = 0; i < new; i++)
+-	    putc (data[i], rl_outstream);
+-	}
++	_rl_backspace (_rl_last_c_pos - _rl_col_width (data, 0, new));
+       else
+ 	_rl_backspace (_rl_last_c_pos - new);
+     }
+@@ -2117,7 +2120,7 @@
+    scan from the beginning of the string to take the state into account. */
+ static int
+ _rl_col_width (str, start, end)
+-     char *str;
++     const char *str;
+      int start, end;
+ {
+   wchar_t wc;
+@@ -2193,4 +2196,3 @@
+   return width;
+ }
+ #endif /* HANDLE_MULTIBYTE */
+-	  
+diff -Naur bash-2.05b/lib/readline/mbutil.c bash-2.05b-new/lib/readline/mbutil.c
+--- bash-2.05b/lib/readline/mbutil.c	2002-06-04 11:54:29.000000000 -0400
++++ bash-2.05b-new/lib/readline/mbutil.c	2003-08-28 13:29:37.000000000 -0400
+@@ -205,14 +205,16 @@
+   if (tmp == (size_t)(-2))
+     {
+       /* shorted to compose multibyte char */
+-      memset (ps, 0, sizeof(mbstate_t));
++      if (ps)
++	memset (ps, 0, sizeof(mbstate_t));
+       return -2;
+     }
+   else if (tmp == (size_t)(-1))
+     {
+       /* invalid to compose multibyte char */
+       /* initialize the conversion state */
+-      memset (ps, 0, sizeof(mbstate_t));
++      if (ps)
++	memset (ps, 0, sizeof(mbstate_t));
+       return -1;
+     }
+   else if (tmp == (size_t)0)
+@@ -225,9 +227,12 @@
+    return 1. Otherwise return 0. */
+ int
+ _rl_compare_chars (buf1, pos1, ps1, buf2, pos2, ps2)
+-     char *buf1, *buf2;
+-     mbstate_t *ps1, *ps2;
+-     int pos1, pos2;
++     char *buf1;
++     int pos1;
++     mbstate_t *ps1;
++     char *buf2;
++     int pos2;
++     mbstate_t *ps2;
+ {
+   int i, w1, w2;
+ 
+@@ -276,8 +281,11 @@
+ 	  pos++;
+ 	  /* clear the state of the byte sequence, because
+ 	     in this case effect of mbstate is undefined  */
+-	  memset (ps, 0, sizeof (mbstate_t));
++	  if (ps)
++	    memset (ps, 0, sizeof (mbstate_t));
+ 	}
++      else if (tmp == 0)
++	pos++;
+       else
+ 	pos += tmp;
+     }
+diff -Naur bash-2.05b/lib/readline/readline.c bash-2.05b-new/lib/readline/readline.c
+--- bash-2.05b/lib/readline/readline.c	2002-03-13 17:10:46.000000000 -0500
++++ bash-2.05b-new/lib/readline/readline.c	2003-08-28 13:29:37.000000000 -0400
+@@ -684,6 +684,7 @@
+     }
+ #if defined (VI_MODE)
+   if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&
++      key != ANYOTHERKEY &&
+       _rl_vi_textmod_command (key))
+     _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
+ #endif
+diff -Naur bash-2.05b/lib/readline/vi_mode.c bash-2.05b-new/lib/readline/vi_mode.c
+--- bash-2.05b/lib/readline/vi_mode.c	2002-05-23 13:27:58.000000000 -0400
++++ bash-2.05b-new/lib/readline/vi_mode.c	2003-08-28 13:29:37.000000000 -0400
+@@ -680,7 +680,8 @@
+      int count;
+ {
+   wchar_t wc;
+-  char mb[MB_LEN_MAX];
++  char mb[MB_LEN_MAX+1];
++  int mblen;
+   mbstate_t ps;
+ 
+   memset (&ps, 0, sizeof (mbstate_t));
+@@ -703,7 +704,9 @@
+       /* Vi is kind of strange here. */
+       if (wc)
+ 	{
+-	  wctomb (mb, wc);
++	  mblen = wctomb (mb, wc);
++	  if (mblen >= 0)
++	    mb[mblen] = '\0';
+ 	  rl_begin_undo_group ();
+ 	  rl_delete (1, 0);
+ 	  rl_insert_text (mb);
+diff -Naur bash-2.05b/subst.c bash-2.05b-new/subst.c
+--- bash-2.05b/subst.c	2002-06-24 07:59:45.000000000 -0400
++++ bash-2.05b-new/subst.c	2003-08-28 13:29:37.000000000 -0400
+@@ -1638,11 +1638,10 @@
+ 
+ /* This performs word splitting and quoted null character removal on
+    STRING. */
+-#if 0
+-#define issep(c)	((separators)[1] ? (member ((c), separators)) : (c) == (separators)[0])
+-#else
+-#define issep(c)	((separators)[1] ? isifs(c) : (c) == (separators)[0])
+-#endif
++#define issep(c) \
++	(((separators)[0]) ? ((separators)[1] ? isifs(c) \
++					      : (c) == (separators)[0]) \
++			   : 0)
+ 
+ WORD_LIST *
+ list_string (string, separators, quoted)
Index: patches/bash-3.0-avoid_WCONTINUED-1.patch
===================================================================
--- patches/bash-3.0-avoid_WCONTINUED-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/bash-3.0-avoid_WCONTINUED-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,38 @@
+Submitted By: Jeremy Utley <jeremy@linuxfromscratch.org>
+Date: 2004-10-13
+Initial Package Version: 3.0
+Upstream Status: Submitted Upstream
+Origin: Originally created by Greg Schafer
+Description: Bash-3.0 has a execution problem with newer Glibc's.  This patch,
+submitted to bash-bugs by Tim Waugh, fixes the problem.  See:
+http://lists.gnu.org/archive/html/bug-bash/2004-09/msg00081.html
+Patch also contains a slight code change taken from Fedora SRPM.
+
+
+diff -Naur bash-3.0.orig/jobs.c bash-3.0/jobs.c
+--- bash-3.0.orig/jobs.c	2004-10-12 08:50:11.643481280 +0000
++++ bash-3.0/jobs.c	2004-10-12 08:51:35.110792320 +0000
+@@ -2476,6 +2476,7 @@
+   PROCESS *child;
+   pid_t pid;
+   int call_set_current, last_stopped_job, job, children_exited, waitpid_flags;
++  static int wcontinued_not_supported = 0;
+ 
+   call_set_current = children_exited = 0;
+   last_stopped_job = NO_JOB;
+@@ -2489,7 +2490,15 @@
+ 			: 0;
+       if (sigchld || block == 0)
+ 	waitpid_flags |= WNOHANG;
++    retry:
++      if (wcontinued_not_supported)
++	waitpid_flags &= ~WCONTINUED;
+       pid = WAITPID (-1, &status, waitpid_flags);
++      if (pid == -1 && errno == EINVAL)
++	{
++	  wcontinued_not_supported = 1;
++	  goto retry;
++	}
+ 
+       /* The check for WNOHANG is to make sure we decrement sigchld only
+ 	 if it was non-zero before we called waitpid. */
Index: patches/bash-3.0-avoid_WCONTINUED_if_invalid.patch
===================================================================
--- patches/bash-3.0-avoid_WCONTINUED_if_invalid.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/bash-3.0-avoid_WCONTINUED_if_invalid.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,36 @@
+Reported on bug-bash by Tim Waugh <twaugh@redhat.com>
+http://lists.gnu.org/archive/html/bug-bash/2004-09/msg00081.html
+
+GNU libc defines WCONTINUED, but (at least on Linux 2.4.x kernels)
+waitpid() returns -1 with errno set to EINVAL if WCONTINUED is
+supplied in options.
+
+Here is a patch to retry without WCONTINUED set in that case.
+
+--- bash-3.0/jobs.c.jobs	2004-09-08 16:07:25.081427747 +0100
++++ bash-3.0/jobs.c	2004-09-08 16:18:06.698604033 +0100
+@@ -2475,6 +2475,7 @@
+@@ -2471,6 +2471,7 @@
+   PROCESS *child;
+   pid_t pid;
+   int call_set_current, last_stopped_job, job, children_exited, waitpid_flags;
++  static int wcontinued_not_supported = 0;
+ 
+   call_set_current = children_exited = 0;
+   last_stopped_job = NO_JOB;
+@@ -2484,7 +2485,15 @@
+ 			: 0;
+       if (sigchld || block == 0)
+ 	waitpid_flags |= WNOHANG;
++    retry:
++      if (wcontinued_not_supported)
++	waitpid_flags &= ~WCONTINUED;
+       pid = WAITPID (-1, &status, waitpid_flags);
++      if (errno == EINVAL)
++	{
++	  wcontinued_not_supported = 1;
++	  goto retry;
++	}
+ 
+       /* The check for WNOHANG is to make sure we decrement sigchld only
+ 	 if it was non-zero before we called waitpid. */
Index: patches/bash-3.0-fixes-1.patch
===================================================================
--- patches/bash-3.0-fixes-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/bash-3.0-fixes-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,663 @@
+Submitted By: Jim Gifford (patches at jg555 dot com)
+Date: 2004-09-29
+Initial Package Version: 3.0
+Origin: Various
+Upstream Status: Already Applied
+Description: This is all the patches that were release by
+	     Chet for Bash 3.0. These will appear in the
+	     next release. The original patches are at
+	     ftp://ftp.cwru.edu/pub/bash/bash-3.0-patches
+
+ 
+diff -Naur bash-3.0.orig/array.c bash-3.0/array.c
+--- bash-3.0.orig/array.c	2004-05-06 12:24:13.000000000 +0000
++++ bash-3.0/array.c	2004-09-29 16:37:42.025614472 +0000
+@@ -451,7 +451,7 @@
+ 			 */
+ 			array_dispose_element(new);
+ 			free(element_value(ae));
+-			ae->value = savestring(v);
++			ae->value = v ? savestring(v) : (char *)NULL;
+ 			return(0);
+ 		} else if (element_index(ae) > i) {
+ 			ADD_BEFORE(ae, new);
+diff -Naur bash-3.0.orig/arrayfunc.c bash-3.0/arrayfunc.c
+--- bash-3.0.orig/arrayfunc.c	2003-12-19 05:03:09.000000000 +0000
++++ bash-3.0/arrayfunc.c	2004-09-29 16:37:41.925629672 +0000
+@@ -611,7 +611,7 @@
+   var = find_variable (t);
+ 
+   free (t);
+-  return var;
++  return (var == 0 || invisible_p (var)) ? (SHELL_VAR *)0 : var;
+ }
+ 
+ /* Return a string containing the elements in the array and subscript
+diff -Naur bash-3.0.orig/bashline.c bash-3.0/bashline.c
+--- bash-3.0.orig/bashline.c	2004-07-06 03:22:12.000000000 +0000
++++ bash-3.0/bashline.c	2004-09-29 16:38:00.851752464 +0000
+@@ -100,6 +100,7 @@
+ #endif
+ 
+ /* Helper functions for Readline. */
++static int bash_directory_expansion __P((char **));
+ static int bash_directory_completion_hook __P((char **));
+ static int filename_completion_ignore __P((char **));
+ static int bash_push_line __P((void));
+@@ -292,7 +293,7 @@
+       /* See if we have anything to do. */
+       at = strchr (rl_completer_word_break_characters, '@');
+       if ((at == 0 && on_or_off == 0) || (at != 0 && on_or_off != 0))
+-        return;
++        return old_value;
+ 
+       /* We have something to do.  Do it. */
+       nval = (char *)xmalloc (strlen (rl_completer_word_break_characters) + 1 + on_or_off);
+@@ -1406,10 +1407,19 @@
+ 	     filename. */
+ 	  if (*hint_text == '~')
+ 	    {
+-	      int l, tl, vl;
++	      int l, tl, vl, dl;
++	      char *rd;
+ 	      vl = strlen (val);
+ 	      tl = strlen (hint_text);
++#if 0
+ 	      l = vl - hint_len;	/* # of chars added */
++#else
++	      rd = savestring (filename_hint);
++	      bash_directory_expansion (&rd);
++	      dl = strlen (rd);
++	      l = vl - dl;		/* # of chars added */
++	      free (rd);
++#endif
+ 	      temp = (char *)xmalloc (l + 2 + tl);
+ 	      strcpy (temp, hint_text);
+ 	      strcpy (temp + tl, val + vl - l);
+@@ -2187,6 +2197,27 @@
+   return 0;
+ }
+ 
++/* Simulate the expansions that will be performed by
++   rl_filename_completion_function.  This must be called with the address of
++   a pointer to malloc'd memory. */
++static int
++bash_directory_expansion (dirname)
++     char **dirname;
++{
++  char *d;
++
++  d = savestring (*dirname);
++
++  if (rl_directory_rewrite_hook)
++    (*rl_directory_rewrite_hook) (&d);
++
++  if (rl_directory_completion_hook && (*rl_directory_completion_hook) (&d))
++    {
++      free (*dirname);
++      *dirname = d;
++    }
++}
++  
+ /* Handle symbolic link references and other directory name
+    expansions while hacking completion. */
+ static int
+@@ -2513,7 +2544,7 @@
+   static char **matches = (char **)NULL;
+   static int ind;
+   int glen;
+-  char *ret;
++  char *ret, *ttext;
+ 
+   if (state == 0)
+     {
+@@ -2523,17 +2554,22 @@
+ 	FREE (globorig);
+       FREE (globtext);
+ 
++      ttext = bash_tilde_expand (text, 0);
++
+       if (rl_explicit_arg)
+ 	{
+-	  globorig = savestring (text);
+-	  glen = strlen (text);
++	  globorig = savestring (ttext);
++	  glen = strlen (ttext);
+ 	  globtext = (char *)xmalloc (glen + 2);
+-	  strcpy (globtext, text);
++	  strcpy (globtext, ttext);
+ 	  globtext[glen] = '*';
+ 	  globtext[glen+1] = '\0';
+ 	}
+       else
+-        globtext = globorig = savestring (text);
++        globtext = globorig = savestring (ttext);
++
++      if (ttext != text)
++	free (ttext);
+ 
+       matches = shell_glob_filename (globtext);
+       if (GLOB_FAILED (matches))
+diff -Naur bash-3.0.orig/braces.c bash-3.0/braces.c
+--- bash-3.0.orig/braces.c	2003-12-04 16:09:52.000000000 +0000
++++ bash-3.0/braces.c	2004-09-29 16:37:49.259514752 +0000
+@@ -340,8 +340,8 @@
+   
+   if (lhs_t == ST_CHAR)
+     {
+-      lhs_v = lhs[0];
+-      rhs_v = rhs[0];
++      lhs_v = (unsigned char)lhs[0];
++      rhs_v = (unsigned char)rhs[0];
+     }
+   else
+     {
+@@ -402,6 +402,7 @@
+ 	{
+ 	  pass_next = 1;
+ 	  i++;
++	  level++;
+ 	  continue;
+ 	}
+ #endif
+diff -Naur bash-3.0.orig/builtins/trap.def bash-3.0/builtins/trap.def
+--- bash-3.0.orig/builtins/trap.def	2004-05-28 02:26:19.000000000 +0000
++++ bash-3.0/builtins/trap.def	2004-09-29 16:37:44.468243136 +0000
+@@ -23,7 +23,7 @@
+ 
+ $BUILTIN trap
+ $FUNCTION trap_builtin
+-$SHORT_DOC trap [-lp] [[arg] signal_spec ...]
++$SHORT_DOC trap [-lp] [arg signal_spec ...]
+ The command ARG is to be read and executed when the shell receives
+ signal(s) SIGNAL_SPEC.  If ARG is absent (and a single SIGNAL_SPEC
+ is supplied) or `-', each specified signal is reset to its original
+@@ -87,7 +87,7 @@
+ trap_builtin (list)
+      WORD_LIST *list;
+ {
+-  int list_signal_names, display, result, opt;
++  int list_signal_names, display, result, opt, first_signal;
+ 
+   list_signal_names = display = 0;
+   result = EXECUTION_SUCCESS;
+@@ -118,14 +118,19 @@
+   else
+     {
+       char *first_arg;
+-      int operation, sig;
++      int operation, sig, first_signal;
+ 
+       operation = SET;
+       first_arg = list->word->word;
++      first_signal = first_arg && *first_arg && all_digits (first_arg) && signal_object_p (first_arg, opt);
++
++      /* Backwards compatibility */
++      if (first_signal)
++	operation = REVERT;
+       /* When in posix mode, the historical behavior of looking for a
+ 	 missing first argument is disabled.  To revert to the original
+ 	 signal handling disposition, use `-' as the first argument. */
+-      if (posixly_correct == 0 && first_arg && *first_arg &&
++      else if (posixly_correct == 0 && first_arg && *first_arg &&
+ 		(*first_arg != '-' || first_arg[1]) &&
+ 		signal_object_p (first_arg, opt) && list->next == 0)
+ 	operation = REVERT;
+diff -Naur bash-3.0.orig/doc/bashref.texi bash-3.0/doc/bashref.texi
+--- bash-3.0.orig/doc/bashref.texi	2004-06-26 18:26:07.000000000 +0000
++++ bash-3.0/doc/bashref.texi	2004-09-29 16:37:44.521235080 +0000
+@@ -5953,7 +5953,8 @@
+ @item
+ The @code{trap} builtin doesn't check the first argument for a possible
+ signal specification and revert the signal handling to the original
+-disposition if it is.  If users want to reset the handler for a given
++disposition if it is, unless that argument consists solely of digits and
++is a valid signal number.  If users want to reset the handler for a given
+ signal to the original disposition, they should use @samp{-} as the
+ first argument.
+ 
+diff -Naur bash-3.0.orig/include/shmbutil.h bash-3.0/include/shmbutil.h
+--- bash-3.0.orig/include/shmbutil.h	2004-04-19 13:59:42.000000000 +0000
++++ bash-3.0/include/shmbutil.h	2004-09-29 16:37:45.498086576 +0000
+@@ -31,6 +31,8 @@
+ extern size_t xmbsrtowcs __P((wchar_t *, const char **, size_t, mbstate_t *));
+ extern size_t xdupmbstowcs __P((wchar_t **, char ***, const char *));
+ 
++extern size_t mbstrlen __P((const char *));
++
+ extern char *xstrchr __P((const char *, int));
+ 
+ #ifndef MB_INVALIDCH
+@@ -38,6 +40,9 @@
+ #define MB_NULLWCH(x)		((x) == 0)
+ #endif
+ 
++#define MBSLEN(s)	(((s) && (s)[0]) ? ((s)[1] ? mbstrlen (s) : 1) : 0)
++#define MB_STRLEN(s)	((MB_CUR_MAX > 1) ? MBSLEN (s) : STRLEN (s))
++
+ #else /* !HANDLE_MULTIBYTE */
+ 
+ #undef MB_LEN_MAX
+@@ -54,6 +59,8 @@
+ #define MB_NULLWCH(x)		(0)
+ #endif
+ 
++#define MB_STRLEN(s)		(STRLEN(s))
++
+ #endif /* !HANDLE_MULTIBYTE */
+ 
+ /* Declare and initialize a multibyte state.  Call must be terminated
+diff -Naur bash-3.0.orig/jobs.c bash-3.0/jobs.c
+--- bash-3.0.orig/jobs.c	2004-04-23 20:28:25.000000000 +0000
++++ bash-3.0/jobs.c	2004-09-29 16:37:59.332983352 +0000
+@@ -1778,8 +1778,13 @@
+   if (pipefail_opt)
+     {
+       fail = 0;
+-      for (p = jobs[job]->pipe; p->next != jobs[job]->pipe; p = p->next)
+-        if (p->status != EXECUTION_SUCCESS) fail = p->status;
++      p = jobs[job]->pipe;
++      do
++	{
++	  if (p->status != EXECUTION_SUCCESS) fail = p->status;
++	  p = p->next;
++	}
++      while (p != jobs[job]->pipe);
+       return fail;
+     }
+ 
+diff -Naur bash-3.0.orig/lib/readline/display.c bash-3.0/lib/readline/display.c
+--- bash-3.0.orig/lib/readline/display.c	2004-05-28 02:57:51.000000000 +0000
++++ bash-3.0/lib/readline/display.c	2004-09-29 16:37:47.413795344 +0000
+@@ -201,7 +201,7 @@
+      int *lp, *lip, *niflp, *vlp;
+ {
+   char *r, *ret, *p;
+-  int l, rl, last, ignoring, ninvis, invfl, ind, pind, physchars;
++  int l, rl, last, ignoring, ninvis, invfl, invflset, ind, pind, physchars;
+ 
+   /* Short-circuit if we can. */
+   if ((MB_CUR_MAX <= 1 || rl_byte_oriented) && strchr (pmt, RL_PROMPT_START_IGNORE) == 0)
+@@ -222,6 +222,7 @@
+   r = ret = (char *)xmalloc (l + 1);
+ 
+   invfl = 0;	/* invisible chars in first line of prompt */
++  invflset = 0;	/* we only want to set invfl once */
+ 
+   for (rl = ignoring = last = ninvis = physchars = 0, p = pmt; p && *p; p++)
+     {
+@@ -249,7 +250,10 @@
+ 	      while (l--)
+ 	        *r++ = *p++;
+ 	      if (!ignoring)
+-		rl += ind - pind;
++		{
++		  rl += ind - pind;
++		  physchars += _rl_col_width (pmt, pind, ind);
++		}
+ 	      else
+ 		ninvis += ind - pind;
+ 	      p--;			/* compensate for later increment */
+@@ -259,16 +263,19 @@
+ 	    {
+ 	      *r++ = *p;
+ 	      if (!ignoring)
+-		rl++;			/* visible length byte counter */
++		{
++		  rl++;			/* visible length byte counter */
++		  physchars++;
++		}
+ 	      else
+ 		ninvis++;		/* invisible chars byte counter */
+ 	    }
+ 
+-	  if (rl >= _rl_screenwidth)
+-	    invfl = ninvis;
+-
+-	  if (ignoring == 0)
+-	    physchars++;
++	  if (invflset == 0 && rl >= _rl_screenwidth)
++	    {
++	      invfl = ninvis;
++	      invflset = 1;
++	    }
+ 	}
+     }
+ 
+@@ -351,14 +358,14 @@
+       local_prompt = expand_prompt (p, &prompt_visible_length,
+ 				       &prompt_last_invisible,
+ 				       (int *)NULL,
+-				       (int *)NULL);
++				       &prompt_physical_chars);
+       c = *t; *t = '\0';
+       /* The portion of the prompt string up to and including the
+ 	 final newline is now null-terminated. */
+       local_prompt_prefix = expand_prompt (prompt, &prompt_prefix_length,
+ 						   (int *)NULL,
+ 						   &prompt_invis_chars_first_line,
+-						   &prompt_physical_chars);
++						   (int *)NULL);
+       *t = c;
+       return (prompt_prefix_length);
+     }
+@@ -417,7 +424,7 @@
+   register int in, out, c, linenum, cursor_linenum;
+   register char *line;
+   int c_pos, inv_botlin, lb_botlin, lb_linenum;
+-  int newlines, lpos, temp, modmark;
++  int newlines, lpos, temp, modmark, n0, num;
+   char *prompt_this_line;
+ #if defined (HANDLE_MULTIBYTE)
+   wchar_t wc;
+@@ -573,6 +580,7 @@
+ 
+ #if defined (HANDLE_MULTIBYTE)
+   memset (_rl_wrapped_line, 0, vis_lbsize);
++  num = 0;
+ #endif
+ 
+   /* prompt_invis_chars_first_line is the number of invisible characters in
+@@ -591,13 +599,32 @@
+          probably too much work for the benefit gained.  How many people have
+          prompts that exceed two physical lines?
+          Additional logic fix from Edward Catmur <ed@catmur.co.uk> */
++#if defined (HANDLE_MULTIBYTE)
++      n0 = num;
++      temp = local_prompt ? strlen (local_prompt) : 0;
++      while (num < temp)
++	{
++	  if (_rl_col_width  (local_prompt, n0, num) > _rl_screenwidth)
++	    {
++	      num = _rl_find_prev_mbchar (local_prompt, num, MB_FIND_ANY);
++	      break;
++	    }
++	  num++;
++	}
++      temp = num +
++#else
+       temp = ((newlines + 1) * _rl_screenwidth) +
++#endif /* !HANDLE_MULTIBYTE */
+              ((local_prompt_prefix == 0) ? ((newlines == 0) ? prompt_invis_chars_first_line
+ 							    : ((newlines == 1) ? wrap_offset : 0))
+ 					 : ((newlines == 0) ? wrap_offset :0));
+              
+       inv_lbreaks[++newlines] = temp;
++#if defined (HANDLE_MULTIBYTE)
++      lpos -= _rl_col_width (local_prompt, n0, num);
++#else
+       lpos -= _rl_screenwidth;
++#endif
+     }
+ 
+   prompt_last_screen_line = newlines;
+diff -Naur bash-3.0.orig/lib/readline/mbutil.c bash-3.0/lib/readline/mbutil.c
+--- bash-3.0.orig/lib/readline/mbutil.c	2004-01-14 14:44:52.000000000 +0000
++++ bash-3.0/lib/readline/mbutil.c	2004-09-29 16:37:57.838210592 +0000
+@@ -126,11 +126,11 @@
+   if (find_non_zero)
+     {
+       tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps);
+-      while (wcwidth (wc) == 0)
++      while (tmp > 0 && wcwidth (wc) == 0)
+ 	{
+ 	  point += tmp;
+ 	  tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps);
+-	  if (tmp == (size_t)(0) || tmp == (size_t)(-1) || tmp == (size_t)(-2))
++	  if (MB_NULLWCH (tmp) || MB_INVALIDCH (tmp))
+ 	    break;
+ 	}
+     }
+diff -Naur bash-3.0.orig/lib/readline/misc.c bash-3.0/lib/readline/misc.c
+--- bash-3.0.orig/lib/readline/misc.c	2004-07-07 12:56:32.000000000 +0000
++++ bash-3.0/lib/readline/misc.c	2004-09-29 16:37:46.397949776 +0000
+@@ -276,12 +276,6 @@
+       _rl_saved_line_for_history->line = savestring (rl_line_buffer);
+       _rl_saved_line_for_history->data = (char *)rl_undo_list;
+     }
+-  else if (STREQ (rl_line_buffer, _rl_saved_line_for_history->line) == 0)
+-    {
+-      free (_rl_saved_line_for_history->line);
+-      _rl_saved_line_for_history->line = savestring (rl_line_buffer);
+-      _rl_saved_line_for_history->data = (char *)rl_undo_list;	/* XXX possible memleak */
+-    }
+ 
+   return 0;
+ }
+diff -Naur bash-3.0.orig/lib/readline/vi_mode.c bash-3.0/lib/readline/vi_mode.c
+--- bash-3.0.orig/lib/readline/vi_mode.c	2004-07-13 18:08:27.000000000 +0000
++++ bash-3.0/lib/readline/vi_mode.c	2004-09-29 16:37:54.073782872 +0000
+@@ -272,10 +272,12 @@
+   switch (key)
+     {
+     case '?':
++      _rl_free_saved_history_line ();
+       rl_noninc_forward_search (count, key);
+       break;
+ 
+     case '/':
++      _rl_free_saved_history_line ();
+       rl_noninc_reverse_search (count, key);
+       break;
+ 
+@@ -690,7 +692,7 @@
+ {
+   wchar_t wc;
+   char mb[MB_LEN_MAX+1];
+-  int mblen;
++  int mblen, p;
+   mbstate_t ps;
+ 
+   memset (&ps, 0, sizeof (mbstate_t));
+@@ -713,11 +715,14 @@
+       /* Vi is kind of strange here. */
+       if (wc)
+ 	{
++	  p = rl_point;
+ 	  mblen = wcrtomb (mb, wc, &ps);
+ 	  if (mblen >= 0)
+ 	    mb[mblen] = '\0';
+ 	  rl_begin_undo_group ();
+-	  rl_delete (1, 0);
++	  rl_vi_delete (1, 0);
++	  if (rl_point < p)	/* Did we retreat at EOL? */
++	    rl_point++;	/* XXX - should we advance more than 1 for mbchar? */
+ 	  rl_insert_text (mb);
+ 	  rl_end_undo_group ();
+ 	  rl_vi_check ();
+@@ -1310,12 +1315,16 @@
+       rl_vi_delete (1, c);
+ #if defined (HANDLE_MULTIBYTE)
+       if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+-	while (_rl_insert_char (1, c))
+-	  {
+-	    RL_SETSTATE (RL_STATE_MOREINPUT);
+-	    c = rl_read_key ();
+-	    RL_UNSETSTATE (RL_STATE_MOREINPUT);
+-	  }
++	{
++	  if (rl_point < p)		/* Did we retreat at EOL? */
++	    rl_point++;
++	  while (_rl_insert_char (1, c))
++	    {
++	      RL_SETSTATE (RL_STATE_MOREINPUT);
++	      c = rl_read_key ();
++	      RL_UNSETSTATE (RL_STATE_MOREINPUT);
++	    }
++	}
+       else
+ #endif
+ 	{
+diff -Naur bash-3.0.orig/patchlevel.h bash-3.0/patchlevel.h
+--- bash-3.0.orig/patchlevel.h	2001-08-22 12:05:39.000000000 +0000
++++ bash-3.0/patchlevel.h	2004-09-29 16:38:00.855751856 +0000
+@@ -25,6 +25,6 @@
+    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
+    looks for to find the patch level (for the sccs version string). */
+ 
+-#define PATCHLEVEL 0
++#define PATCHLEVEL 13
+ 
+ #endif /* _PATCHLEVEL_H_ */
+diff -Naur bash-3.0.orig/pcomplete.c bash-3.0/pcomplete.c
+--- bash-3.0.orig/pcomplete.c	2004-01-08 15:36:17.000000000 +0000
++++ bash-3.0/pcomplete.c	2004-09-29 16:37:42.019615384 +0000
+@@ -863,6 +863,8 @@
+   if (array_p (v) == 0)
+     v = convert_var_to_array (v);
+   v = assign_array_var_from_word_list (v, lwords);
++
++  VUNSETATTR (v, att_invisible);
+   return v;
+ }
+ #endif /* ARRAY_VARS */
+@@ -1022,6 +1024,8 @@
+   if (array_p (v) == 0)
+     v = convert_var_to_array (v);
+ 
++  VUNSETATTR (v, att_invisible);
++
+   a = array_cell (v);
+   if (a == 0 || array_empty (a))
+     sl = (STRINGLIST *)NULL;
+diff -Naur bash-3.0.orig/subst.c bash-3.0/subst.c
+--- bash-3.0.orig/subst.c	2004-07-04 17:56:13.000000000 +0000
++++ bash-3.0/subst.c	2004-09-29 16:37:51.904112712 +0000
+@@ -4691,6 +4691,26 @@
+ 	  legal_identifier (name + 1));				/* ${#PS1} */
+ }
+ 
++#if defined (HANDLE_MULTIBYTE)
++size_t
++mbstrlen (s)
++     const char *s;
++{
++  size_t clen, nc;
++  mbstate_t mbs;
++
++  nc = 0;
++  memset (&mbs, 0, sizeof (mbs));
++  while ((clen = mbrlen(s, MB_CUR_MAX, &mbs)) != 0 && (MB_INVALIDCH(clen) == 0))
++    {
++      s += clen;
++      nc++;
++    }
++  return nc;
++}
++#endif
++      
++
+ /* Handle the parameter brace expansion that requires us to return the
+    length of a parameter. */
+ static intmax_t
+@@ -4746,14 +4766,14 @@
+       if (legal_number (name + 1, &arg_index))		/* ${#1} */
+ 	{
+ 	  t = get_dollar_var_value (arg_index);
+-	  number = STRLEN (t);
++	  number = MB_STRLEN (t);
+ 	  FREE (t);
+ 	}
+ #if defined (ARRAY_VARS)
+-      else if ((var = find_variable (name + 1)) && array_p (var))
++      else if ((var = find_variable (name + 1)) && (invisible_p (var) == 0) && array_p (var))
+ 	{
+ 	  t = array_reference (array_cell (var), 0);
+-	  number = STRLEN (t);
++	  number = MB_STRLEN (t);
+ 	}
+ #endif
+       else				/* ${#PS1} */
+@@ -4766,7 +4786,7 @@
+ 	  if (list)
+ 	    dispose_words (list);
+ 
+-	  number = STRLEN (t);
++	  number = MB_STRLEN (t);
+ 	  FREE (t);
+ 	}
+     }
+@@ -4871,7 +4891,7 @@
+     {
+     case VT_VARIABLE:
+     case VT_ARRAYMEMBER:
+-      len = strlen (value);
++      len = MB_STRLEN (value);
+       break;
+     case VT_POSPARMS:
+       len = number_of_args () + 1;
+@@ -4891,7 +4911,7 @@
+   if (*e1p < 0)		/* negative offsets count from end */
+     *e1p += len;
+ 
+-  if (*e1p >= len || *e1p < 0)
++  if (*e1p > len || *e1p < 0)
+     return (-1);
+ 
+ #if defined (ARRAY_VARS)
+@@ -4982,7 +5002,7 @@
+       else
+ 	return -1;
+     }
+-  else if ((v = find_variable (varname)) && array_p (v))
++  else if ((v = find_variable (varname)) && (invisible_p (v) == 0) && array_p (v))
+     {
+       vtype = VT_ARRAYMEMBER;
+       *varp = v;
+diff -Naur bash-3.0.orig/tests/dbg-support.tests bash-3.0/tests/dbg-support.tests
+--- bash-3.0.orig/tests/dbg-support.tests	2003-03-25 20:33:03.000000000 +0000
++++ bash-3.0/tests/dbg-support.tests	2004-09-29 16:37:42.030613712 +0000
+@@ -62,8 +62,8 @@
+ trap 'print_debug_trap $LINENO' DEBUG
+ trap 'print_return_trap $LINENO' RETURN
+ 
+-# Funcname is now an array. Vanilla Bash 2.05 doesn't have FUNCNAME array.
+-echo "FUNCNAME" ${FUNCNAME[0]}
++# Funcname is now an array, but you still can't see it outside a function
++echo "FUNCNAME" ${FUNCNAME[0]:-main}
+ 
+ # We should trace into the below. 
+ # Start easy with a simple function.
+diff -Naur bash-3.0.orig/tests/errors.right bash-3.0/tests/errors.right
+--- bash-3.0.orig/tests/errors.right	2004-05-28 02:26:03.000000000 +0000
++++ bash-3.0/tests/errors.right	2004-09-29 16:37:44.528234016 +0000
+@@ -85,7 +85,7 @@
+ ./errors.tests: line 213: /bin/sh + 0: syntax error: operand expected (error token is "/bin/sh + 0")
+ ./errors.tests: line 216: trap: NOSIG: invalid signal specification
+ ./errors.tests: line 219: trap: -s: invalid option
+-trap: usage: trap [-lp] [[arg] signal_spec ...]
++trap: usage: trap [-lp] [arg signal_spec ...]
+ ./errors.tests: line 225: return: can only `return' from a function or sourced script
+ ./errors.tests: line 229: break: 0: loop count out of range
+ ./errors.tests: line 233: continue: 0: loop count out of range
+diff -Naur bash-3.0.orig/variables.c bash-3.0/variables.c
+--- bash-3.0.orig/variables.c	2004-07-04 17:57:26.000000000 +0000
++++ bash-3.0/variables.c	2004-09-29 16:37:42.009616904 +0000
+@@ -1419,11 +1419,11 @@
+   v = init_dynamic_array_var ("GROUPS", get_groupset, null_array_assign, att_noassign);
+ 
+ #  if defined (DEBUGGER)
+-  v = init_dynamic_array_var ("BASH_ARGC", get_self, null_array_assign, (att_invisible|att_noassign));
+-  v = init_dynamic_array_var ("BASH_ARGV", get_self, null_array_assign, (att_invisible|att_noassign));
++  v = init_dynamic_array_var ("BASH_ARGC", get_self, null_array_assign, att_noassign);
++  v = init_dynamic_array_var ("BASH_ARGV", get_self, null_array_assign, att_noassign);
+ #  endif /* DEBUGGER */
+-  v = init_dynamic_array_var ("BASH_SOURCE", get_self, null_array_assign, (att_invisible|att_noassign));
+-  v = init_dynamic_array_var ("BASH_LINENO", get_self, null_array_assign, (att_invisible|att_noassign));
++  v = init_dynamic_array_var ("BASH_SOURCE", get_self, null_array_assign, att_noassign);
++  v = init_dynamic_array_var ("BASH_LINENO", get_self, null_array_assign, att_noassign);
+ #endif
+ 
+   v = init_funcname_var ();
+@@ -1599,7 +1599,10 @@
+   /* local foo; local foo;  is a no-op. */
+   old_var = find_variable (name);
+   if (old_var && local_p (old_var) && old_var->context == variable_context)
+-    return (old_var);
++    {
++      VUNSETATTR (old_var, att_invisible);
++      return (old_var);
++    }
+ 
+   was_tmpvar = old_var && tempvar_p (old_var);
+   if (was_tmpvar)
Index: tches/bash-3.2-fixes-8.patch
===================================================================
--- patches/bash-3.2-fixes-8.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,12115 +1,0 @@
-Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
-Date: 06-18-2008
-Initial Package Version: 3.2
-Origin: Upstream
-Upstream Status: Applied
-Description: Contains all upstream patches up to 3.2-039
-
-diff -Naur bash-3.2.orig/array.c bash-3.2/array.c
---- bash-3.2.orig/array.c	2005-06-01 16:39:22.000000000 -0400
-+++ bash-3.2/array.c	2008-06-18 06:46:19.000000000 -0400
-@@ -120,7 +120,6 @@
- 	return(a1);
- }
- 
--#ifdef INCLUDE_UNUSED
- /*
-  * Make and return a new array composed of the elements in array A from
-  * S to E, inclusive.
-@@ -141,13 +140,12 @@
- 	for (p = s, i = 0; p != e; p = element_forw(p), i++) {
- 		n = array_create_element (element_index(p), element_value(p));
- 		ADD_BEFORE(a->head, n);
--		mi = element_index(ae);
-+		mi = element_index(n);
- 	}
- 	a->num_elements = i;
- 	a->max_index = mi;
- 	return a;
- }
--#endif
- 
- /*
-  * Walk the array, calling FUNC once for each element, with the array
-@@ -300,6 +298,23 @@
- 	return array;
- }
- 
-+ARRAY	*
-+array_quote_escapes(array)
-+ARRAY	*array;
-+{
-+	ARRAY_ELEMENT	*a;
-+	char	*t;
-+
-+	if (array == 0 || array_head(array) == 0 || array_empty(array))
-+		return (ARRAY *)NULL;
-+	for (a = element_forw(array->head); a != array->head; a = element_forw(a)) {
-+		t = quote_escapes (a->value);
-+		FREE(a->value);
-+		a->value = t;
-+	}
-+	return array;
-+}
-+
- /*
-  * Return a string whose elements are the members of array A beginning at
-  * index START and spanning NELEM members.  Null elements are counted.
-@@ -311,9 +326,10 @@
- arrayind_t	start, nelem;
- int	starsub, quoted;
- {
-+	ARRAY		*a2;
- 	ARRAY_ELEMENT	*h, *p;
- 	arrayind_t	i;
--	char		*ifs, sep[2];
-+	char		*ifs, sep[2], *t;
- 
- 	p = a ? array_head (a) : 0;
- 	if (p == 0 || array_empty (a) || start > array_max_index(a))
-@@ -336,6 +352,13 @@
- 	for (i = 0, h = p; p != a->head && i < nelem; i++, p = element_forw(p))
- 		;
- 
-+	a2 = array_slice(a, h, p);
-+
-+	if (quoted & (Q_DOUBLE_QUOTES|Q_HERE_DOCUMENT))
-+		array_quote(a2);
-+	else
-+		array_quote_escapes(a2);
-+
- 	if (starsub && (quoted & (Q_DOUBLE_QUOTES|Q_HERE_DOCUMENT))) {
- 		ifs = getifs();
- 		sep[0] = ifs ? *ifs : '\0';
-@@ -343,7 +366,10 @@
- 		sep[0] = ' ';
- 	sep[1] = '\0';
- 
--	return (array_to_string_internal (h, p, sep, quoted));
-+	t = array_to_string (a2, sep, 0);
-+	array_dispose(a2);
-+
-+	return t;
- }
- 
- char *
-@@ -367,7 +393,9 @@
- 	}
- 
- 	if (mflags & MATCH_QUOTED)
--		array_quote (a2);
-+		array_quote(a2);
-+	else
-+		array_quote_escapes(a2);
- 	if (mflags & MATCH_STARSUB) {
- 		ifs = getifs();
- 		sifs[0] = ifs ? *ifs : '\0';
-diff -Naur bash-3.2.orig/array.h bash-3.2/array.h
---- bash-3.2.orig/array.h	2003-06-01 15:50:30.000000000 -0400
-+++ bash-3.2/array.h	2008-06-18 06:46:19.000000000 -0400
-@@ -55,6 +55,7 @@
- extern ARRAY_ELEMENT *array_unshift_element __P((ARRAY *));
- extern int	array_shift_element __P((ARRAY *, char *));
- extern ARRAY	*array_quote __P((ARRAY *));
-+extern ARRAY	*array_quote_escapes __P((ARRAY *));
- 
- extern char	*array_subrange __P((ARRAY *, arrayind_t, arrayind_t, int, int));
- extern char	*array_patsub __P((ARRAY *, char *, char *, int));
-diff -Naur bash-3.2.orig/arrayfunc.c bash-3.2/arrayfunc.c
---- bash-3.2.orig/arrayfunc.c	2006-07-27 09:37:59.000000000 -0400
-+++ bash-3.2/arrayfunc.c	2008-06-18 06:46:30.000000000 -0400
-@@ -618,6 +618,8 @@
-   if (expok == 0)
-     {
-       last_command_exit_value = EXECUTION_FAILURE;
-+
-+      top_level_cleanup ();      
-       jump_to_top_level (DISCARD);
-     }
-   return val;
-@@ -720,7 +722,7 @@
-   if (ALL_ELEMENT_SUB (t[0]) && t[1] == ']')
-     {
-       if (rtype)
--	*rtype = 1;
-+	*rtype = (t[0] == '*') ? 1 : 2;
-       if (allow_all == 0)
- 	{
- 	  err_badarraysub (s);
-diff -Naur bash-3.2.orig/bashline.c bash-3.2/bashline.c
---- bash-3.2.orig/bashline.c	2006-07-29 16:39:30.000000000 -0400
-+++ bash-3.2/bashline.c	2008-06-18 06:46:32.000000000 -0400
-@@ -2357,7 +2357,7 @@
-   if (should_expand_dirname)  
-     {
-       new_dirname = savestring (local_dirname);
--      wl = expand_prompt_string (new_dirname, 0);	/* does the right thing */
-+      wl = expand_prompt_string (new_dirname, 0, W_NOCOMSUB);	/* does the right thing */
-       if (wl)
- 	{
- 	  *dirname = string_list (wl);
-diff -Naur bash-3.2.orig/builtins/common.c bash-3.2/builtins/common.c
---- bash-3.2.orig/builtins/common.c	2006-07-27 09:39:51.000000000 -0400
-+++ bash-3.2/builtins/common.c	2008-06-18 06:46:23.000000000 -0400
-@@ -1,4 +1,4 @@
--/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
-+/* Copyright (C) 1987-2007 Free Software Foundation, Inc.
- 
-    This file is part of GNU Bash, the Bourne Again SHell.
- 
-@@ -131,6 +131,7 @@
-   if (list)
-     {
-       builtin_error (_("too many arguments"));
-+      top_level_cleanup ();
-       jump_to_top_level (DISCARD);
-     }
- }
-@@ -395,7 +396,10 @@
- 	  if (fatal)
- 	    throw_to_top_level ();
- 	  else
--	    jump_to_top_level (DISCARD);
-+	    {
-+	      top_level_cleanup ();
-+	      jump_to_top_level (DISCARD);
-+	    }
- 	}
-       no_args (list->next);
-     }
-@@ -475,7 +479,11 @@
- 
-   if (the_current_working_directory == 0)
-     {
-+#if defined (GETCWD_BROKEN)
-+      the_current_working_directory = getcwd (0, PATH_MAX);
-+#else
-       the_current_working_directory = getcwd (0, 0);
-+#endif
-       if (the_current_working_directory == 0)
- 	{
- 	  fprintf (stderr, _("%s: error retrieving current directory: %s: %s\n"),
-diff -Naur bash-3.2.orig/builtins/printf.def bash-3.2/builtins/printf.def
---- bash-3.2.orig/builtins/printf.def	2006-09-18 08:48:42.000000000 -0400
-+++ bash-3.2/builtins/printf.def	2008-06-18 06:46:18.000000000 -0400
-@@ -1,7 +1,7 @@
- This file is printf.def, from which is created printf.c.
- It implements the builtin "printf" in Bash.
- 
--Copyright (C) 1997-2005 Free Software Foundation, Inc.
-+Copyright (C) 1997-2007 Free Software Foundation, Inc.
- 
- This file is part of GNU Bash, the Bourne Again SHell.
- 
-@@ -49,6 +49,12 @@
- #  define INT_MIN		(-2147483647-1)
- #endif
- 
-+#if defined (PREFER_STDARG)
-+#  include <stdarg.h>
-+#else
-+#  include <varargs.h>
-+#endif
-+
- #include <stdio.h>
- #include <chartypes.h>
- 
-@@ -64,6 +70,10 @@
- #include "bashgetopt.h"
- #include "common.h"
- 
-+#if defined (PRI_MACROS_BROKEN)
-+#  undef PRIdMAX
-+#endif
-+
- #if !defined (PRIdMAX)
- #  if HAVE_LONG_LONG
- #    define PRIdMAX	"lld"
-@@ -151,6 +161,10 @@
- #define SKIP1 "#'-+ 0"
- #define LENMODS "hjlLtz"
- 
-+#ifndef HAVE_ASPRINTF
-+extern int asprintf __P((char **, const char *, ...)) __attribute__((__format__ (printf, 2, 3)));
-+#endif
-+
- static void printf_erange __P((char *));
- static int printstr __P((char *, char *, int, int, int));
- static int tescape __P((char *, char *, int *));
-diff -Naur bash-3.2.orig/builtins/read.def bash-3.2/builtins/read.def
---- bash-3.2.orig/builtins/read.def	2006-09-19 08:45:48.000000000 -0400
-+++ bash-3.2/builtins/read.def	2008-06-18 06:46:33.000000000 -0400
-@@ -127,14 +127,14 @@
-      WORD_LIST *list;
- {
-   register char *varname;
--  int size, i, nr, pass_next, saw_escape, eof, opt, retval, code;
--  int input_is_tty, input_is_pipe, unbuffered_read;
-+  int size, i, nr, pass_next, saw_escape, eof, opt, retval, code, print_ps2;
-+  int input_is_tty, input_is_pipe, unbuffered_read, skip_ctlesc, skip_ctlnul;
-   int raw, edit, nchars, silent, have_timeout, fd;
-   unsigned int tmout;
-   intmax_t intval;
-   char c;
-   char *input_string, *orig_input_string, *ifs_chars, *prompt, *arrayname;
--  char *e, *t, *t1;
-+  char *e, *t, *t1, *ps2, *tofree;
-   struct stat tsb;
-   SHELL_VAR *var;
- #if defined (ARRAY_VARS)
-@@ -148,6 +148,7 @@
-   USE_VAR(size);
-   USE_VAR(i);
-   USE_VAR(pass_next);
-+  USE_VAR(print_ps2);
-   USE_VAR(saw_escape);
-   USE_VAR(input_is_pipe);
- /*  USE_VAR(raw); */
-@@ -163,6 +164,7 @@
-   USE_VAR(rlind);
- #endif
-   USE_VAR(list);
-+  USE_VAR(ps2);
- 
-   i = 0;		/* Index into the string that we are reading. */
-   raw = edit = 0;	/* Not reading raw input by default. */
-@@ -386,7 +388,8 @@
-   setmode (0, O_TEXT);
- #endif
- 
--  for (eof = retval = 0;;)
-+  ps2 = 0;
-+  for (print_ps2 = eof = retval = 0;;)
-     {
- #if defined (READLINE)
-       if (edit)
-@@ -412,6 +415,15 @@
- 	{
- #endif
- 
-+      if (print_ps2)
-+	{
-+	  if (ps2 == 0)
-+	    ps2 = get_string_value ("PS2");
-+	  fprintf (stderr, "%s", ps2 ? ps2 : "");
-+	  fflush (stderr);
-+	  print_ps2 = 0;
-+	}
-+
-       if (unbuffered_read)
- 	retval = zread (fd, &c, 1);
-       else
-@@ -440,7 +452,11 @@
- 	{
- 	  pass_next = 0;
- 	  if (c == '\n')
--	    i--;		/* back up over the CTLESC */
-+	    {
-+	      i--;		/* back up over the CTLESC */
-+	      if (interactive && input_is_tty && raw == 0)
-+		print_ps2 = 1;
-+	    }
- 	  else
- 	    goto add_char;
- 	  continue;
-@@ -658,12 +674,13 @@
- #else
-   /* Check whether or not the number of fields is exactly the same as the
-      number of variables. */
-+  tofree = NULL;
-   if (*input_string)
-     {
-       t1 = input_string;
-       t = get_word_from_string (&input_string, ifs_chars, &e);
-       if (*input_string == 0)
--	input_string = t;
-+	tofree = input_string = t;
-       else
- 	input_string = strip_trailing_ifs_whitespace (t1, ifs_chars, saw_escape);
-     }
-@@ -678,6 +695,8 @@
-   else
-     var = bind_read_variable (list->word->word, input_string);
-   stupidly_hack_special_variables (list->word->word);
-+  FREE (tofree);
-+
-   if (var)
-     VUNSETATTR (var, att_invisible);
-   xfree (orig_input_string);
-diff -Naur bash-3.2.orig/builtins/shopt.def bash-3.2/builtins/shopt.def
---- bash-3.2.orig/builtins/shopt.def	2005-02-19 17:25:03.000000000 -0500
-+++ bash-3.2/builtins/shopt.def	2008-06-18 06:46:33.000000000 -0400
-@@ -101,11 +101,14 @@
- 
- static int set_shellopts_after_change __P((int));
- 
-+static int set_compatibility_level __P((int));
-+
- #if defined (RESTRICTED_SHELL)
- static int set_restricted_shell __P((int));
- #endif
- 
- static int shopt_login_shell;
-+static int shopt_compat31;
- 
- typedef int shopt_set_func_t __P((int));
- 
-@@ -121,6 +124,7 @@
- #if defined (HISTORY)
-   { "cmdhist", &command_oriented_history, (shopt_set_func_t *)NULL },
- #endif
-+  { "compat31", &shopt_compat31, set_compatibility_level },
-   { "dotglob", &glob_dot_filenames, (shopt_set_func_t *)NULL },
-   { "execfail", &no_exit_on_failed_exec, (shopt_set_func_t *)NULL },
-   { "expand_aliases", &expand_aliases, (shopt_set_func_t *)NULL },
-@@ -459,6 +463,18 @@
-   return (0);
- }
- 
-+static int
-+set_compatibility_level (mode)
-+     int mode;
-+{
-+  /* Need to change logic here as we add more compatibility levels */
-+  if (shopt_compat31)
-+    shell_compatibility_level = 31;
-+  else
-+    shell_compatibility_level = 32;
-+  return 0;
-+}
-+
- #if defined (RESTRICTED_SHELL)
- /* Don't allow the value of restricted_shell to be modified. */
- 
-diff -Naur bash-3.2.orig/config-bot.h bash-3.2/config-bot.h
---- bash-3.2.orig/config-bot.h	2006-09-12 16:43:04.000000000 -0400
-+++ bash-3.2/config-bot.h	2008-06-18 06:46:18.000000000 -0400
-@@ -1,7 +1,7 @@
- /* config-bot.h */
- /* modify settings or make new ones based on what autoconf tells us. */
- 
--/* Copyright (C) 1989-2002 Free Software Foundation, Inc.
-+/* Copyright (C) 1989-2007 Free Software Foundation, Inc.
- 
-    This file is part of GNU Bash, the Bourne Again SHell.
- 
-@@ -70,9 +70,11 @@
- #  define TERMIOS_MISSING
- #endif
- 
--/* If we have a getcwd(3), but it calls popen(), #undef HAVE_GETCWD so
--   the replacement in getcwd.c will be built. */
--#if defined (HAVE_GETCWD) && defined (GETCWD_BROKEN)
-+/* If we have a getcwd(3), but one that does not dynamically allocate memory,
-+   #undef HAVE_GETCWD so the replacement in getcwd.c will be built.  We do
-+   not do this on Solaris, because their implementation of loopback mounts
-+   breaks the traditional file system assumptions that getcwd uses. */
-+#if defined (HAVE_GETCWD) && defined (GETCWD_BROKEN) && !defined (SOLARIS)
- #  undef HAVE_GETCWD
- #endif
- 
-diff -Naur bash-3.2.orig/config.h.in bash-3.2/config.h.in
---- bash-3.2.orig/config.h.in	2006-09-12 16:00:54.000000000 -0400
-+++ bash-3.2/config.h.in	2008-06-18 06:46:18.000000000 -0400
-@@ -1,6 +1,6 @@
- /* config.h -- Configuration file for bash. */
- 
--/* Copyright (C) 1987-2006 Free Software Foundation, Inc.
-+/* Copyright (C) 1987-2007 Free Software Foundation, Inc.
- 
-    This file is part of GNU Bash, the Bourne Again SHell.
- 
-@@ -413,6 +413,8 @@
- 
- #undef HAVE_DECL_STRTOLD
- 
-+#undef PRI_MACROS_BROKEN
-+
- #undef STRTOLD_BROKEN
- 
- /* Define if WCONTINUED is defined in system headers, but rejected by waitpid */
-@@ -1006,6 +1008,9 @@
- /* Define if you have the `dcgettext' function. */
- #undef HAVE_DCGETTEXT
- 
-+/* Define if you have the `localeconv' function. */
-+#undef HAVE_LOCALECONV
-+
- /* Define if your system has a working `malloc' function. */
- /* #undef HAVE_MALLOC */
- 
-diff -Naur bash-3.2.orig/configure bash-3.2/configure
---- bash-3.2.orig/configure	2006-09-26 11:06:01.000000000 -0400
-+++ bash-3.2/configure	2008-06-18 06:46:26.000000000 -0400
-@@ -4871,7 +4871,7 @@
- 		# static version specified as -llibname to override the
- 		# dynamic version
- 		case "${host_os}" in
--		darwin8*)	READLINE_LIB='${READLINE_LIBRARY}' ;;
-+		darwin[89]*)	READLINE_LIB='${READLINE_LIBRARY}' ;;
- 		*)		READLINE_LIB=-lreadline ;;
- 		esac
- 	fi
-@@ -27316,7 +27316,8 @@
- sco3.2v4*)	LOCAL_CFLAGS="-DMUST_UNBLOCK_CHLD -DPATH_MAX=1024" ;;
- sco3.2*)	LOCAL_CFLAGS=-DMUST_UNBLOCK_CHLD ;;
- sunos4*)	LOCAL_CFLAGS=-DSunOS4 ;;
--solaris2.5*)	LOCAL_CFLAGS=-DSunOS5 ;;
-+solaris2.5*)	LOCAL_CFLAGS="-DSunOS5 -DSOLARIS" ;;
-+solaris2*)	LOCAL_CFLAGS=-DSOLARIS ;;
- lynxos*)	LOCAL_CFLAGS=-DRECYCLES_PIDS ;;
- linux*)		LOCAL_LDFLAGS=-rdynamic		 # allow dynamic loading
- 		case "`uname -r`" in
-diff -Naur bash-3.2.orig/configure.in bash-3.2/configure.in
---- bash-3.2.orig/configure.in	2006-09-26 11:05:45.000000000 -0400
-+++ bash-3.2/configure.in	2008-06-18 06:46:26.000000000 -0400
-@@ -5,7 +5,7 @@
- dnl
- dnl Process this file with autoconf to produce a configure script.
- 
--# Copyright (C) 1987-2006 Free Software Foundation, Inc.
-+# Copyright (C) 1987-2007 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
-@@ -518,7 +518,7 @@
- 		# static version specified as -llibname to override the
- 		# dynamic version
- 		case "${host_os}" in
--		darwin8*)	READLINE_LIB='${READLINE_LIBRARY}' ;;
-+		darwin[[89]]*)	READLINE_LIB='${READLINE_LIBRARY}' ;;
- 		*)		READLINE_LIB=-lreadline ;;
- 		esac
- 	fi
-@@ -991,7 +991,8 @@
- sco3.2v4*)	LOCAL_CFLAGS="-DMUST_UNBLOCK_CHLD -DPATH_MAX=1024" ;;
- sco3.2*)	LOCAL_CFLAGS=-DMUST_UNBLOCK_CHLD ;;
- sunos4*)	LOCAL_CFLAGS=-DSunOS4 ;;
--solaris2.5*)	LOCAL_CFLAGS=-DSunOS5 ;;
-+solaris2.5*)	LOCAL_CFLAGS="-DSunOS5 -DSOLARIS" ;;
-+solaris2*)	LOCAL_CFLAGS=-DSOLARIS ;;
- lynxos*)	LOCAL_CFLAGS=-DRECYCLES_PIDS ;;
- linux*)		LOCAL_LDFLAGS=-rdynamic		 # allow dynamic loading
- 		case "`uname -r`" in
-diff -Naur bash-3.2.orig/doc/bash.1 bash-3.2/doc/bash.1
---- bash-3.2.orig/doc/bash.1	2006-10-03 08:54:26.000000000 -0400
-+++ bash-3.2/doc/bash.1	2008-06-18 06:46:33.000000000 -0400
-@@ -7977,6 +7977,12 @@
- command in the same history entry.  This allows
- easy re-editing of multi-line commands.
- .TP 8
-+.B compat31
-+If set,
-+.B bash
-+changes its behavior to that of version 3.1 with respect to quoted
-+arguments to the conditional command's =~ operator.
-+.TP 8
- .B dotglob
- If set, 
- .B bash
-diff -Naur bash-3.2.orig/doc/bashref.texi bash-3.2/doc/bashref.texi
---- bash-3.2.orig/doc/bashref.texi	2006-09-28 10:25:28.000000000 -0400
-+++ bash-3.2/doc/bashref.texi	2008-06-18 06:46:33.000000000 -0400
-@@ -3598,6 +3598,11 @@
- command in the same history entry.  This allows
- easy re-editing of multi-line commands.
- 
-+@item compat31
-+If set, Bash
-+changes its behavior to that of version 3.1 with respect to quoted
-+arguments to the conditional command's =~ operator.
-+
- @item dotglob
- If set, Bash includes filenames beginning with a `.' in
- the results of filename expansion.
-diff -Naur bash-3.2.orig/doc/bashref.texi.orig bash-3.2/doc/bashref.texi.orig
---- bash-3.2.orig/doc/bashref.texi.orig	1969-12-31 19:00:00.000000000 -0500
-+++ bash-3.2/doc/bashref.texi.orig	2006-09-28 10:25:28.000000000 -0400
-@@ -0,0 +1,7422 @@
-+\input texinfo.tex @c -*- texinfo -*-
-+@c %**start of header
-+@setfilename bashref.info
-+@settitle Bash Reference Manual
-+@c %**end of header
-+
-+@setchapternewpage odd
-+
-+@include version.texi
-+
-+@copying
-+This text is a brief description of the features that are present in
-+the Bash shell (version @value{VERSION}, @value{UPDATED}).
-+
-+This is Edition @value{EDITION}, last updated @value{UPDATED},
-+of @cite{The GNU Bash Reference Manual},
-+for @code{Bash}, Version @value{VERSION}.
-+
-+Copyright @copyright{} 1988-2005 Free Software Foundation, Inc.
-+
-+Permission is granted to make and distribute verbatim copies of
-+this manual provided the copyright notice and this permission notice
-+are preserved on all copies.
-+
-+@quotation
-+Permission is granted to copy, distribute and/or modify this document
-+under the terms of the GNU Free Documentation License, Version 1.2 or
-+any later version published by the Free Software Foundation; with no
-+Invariant Sections, with the Front-Cover texts being ``A GNU Manual,''
-+and with the Back-Cover Texts as in (a) below.  A copy of the license is
-+included in the section entitled ``GNU Free Documentation License.''
-+
-+(a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify
-+this GNU Manual, like GNU software.  Copies published by the Free
-+Software Foundation raise funds for GNU development.''
-+@end quotation
-+@end copying
-+
-+@defcodeindex bt
-+@defcodeindex rw
-+@set BashFeatures
-+
-+@dircategory Basics
-+@direntry
-+* Bash: (bash).                     The GNU Bourne-Again SHell.
-+@end direntry
-+
-+@finalout
-+
-+@titlepage
-+@title Bash Reference Manual
-+@subtitle Reference Documentation for Bash
-+@subtitle Edition @value{EDITION}, for @code{Bash} Version @value{VERSION}.
-+@subtitle @value{UPDATED-MONTH}
-+@author Chet Ramey, Case Western Reserve University
-+@author Brian Fox, Free Software Foundation
-+
-+@page
-+@vskip 0pt plus 1filll
-+@insertcopying
-+
-+@sp 1
-+Published by the Free Software Foundation @*
-+59 Temple Place, Suite 330, @*
-+Boston, MA 02111-1307 @*
-+USA @*
-+
-+@end titlepage
-+
-+@contents
-+
-+@ifnottex
-+@node Top, Introduction, (dir), (dir)
-+@top Bash Features
-+
-+This text is a brief description of the features that are present in
-+the Bash shell (version @value{VERSION}, @value{UPDATED}).
-+
-+This is Edition @value{EDITION}, last updated @value{UPDATED},
-+of @cite{The GNU Bash Reference Manual},
-+for @code{Bash}, Version @value{VERSION}.
-+
-+Bash contains features that appear in other popular shells, and some
-+features that only appear in Bash.  Some of the shells that Bash has
-+borrowed concepts from are the Bourne Shell (@file{sh}), the Korn Shell
-+(@file{ksh}), and the C-shell (@file{csh} and its successor,
-+@file{tcsh}). The following menu breaks the features up into
-+categories based upon which one of these other shells inspired the
-+feature.
-+
-+This manual is meant as a brief introduction to features found in
-+Bash.  The Bash manual page should be used as the definitive
-+reference on shell behavior.
-+
-+@menu
-+* Introduction::		An introduction to the shell.
-+* Definitions::			Some definitions used in the rest of this
-+				manual.
-+* Basic Shell Features::	The shell "building blocks".
-+* Shell Builtin Commands::	Commands that are a part of the shell.
-+* Shell Variables::		Variables used or set by Bash.
-+* Bash Features::		Features found only in Bash.
-+* Job Control::			What job control is and how Bash allows you
-+				to use it.
-+* Using History Interactively::	Command History Expansion
-+* Command Line Editing::	Chapter describing the command line
-+				editing features.
-+* Installing Bash::		How to build and install Bash on your system.
-+* Reporting Bugs::		How to report bugs in Bash.
-+* Major Differences From The Bourne Shell::	A terse list of the differences
-+						between Bash and historical
-+						versions of /bin/sh.
-+* Copying This Manual::		Copying this manual.
-+* Builtin Index::		Index of Bash builtin commands.
-+* Reserved Word Index::		Index of Bash reserved words.
-+* Variable Index::		Quick reference helps you find the
-+				variable you want.
-+* Function Index::		Index of bindable Readline functions.
-+* Concept Index::		General index for concepts described in
-+				this manual.
-+@end menu
-+@end ifnottex
-+
-+@node Introduction
-+@chapter Introduction
-+@menu
-+* What is Bash?::		A short description of Bash.
-+* What is a shell?::		A brief introduction to shells.
-+@end menu
-+
-+@node What is Bash?
-+@section What is Bash?
-+
-+Bash is the shell, or command language interpreter,
-+for the @sc{gnu} operating system.
-+The name is an acronym for the @samp{Bourne-Again SHell},
-+a pun on Stephen Bourne, the author of the direct ancestor of
-+the current Unix shell @code{sh}, 
-+which appeared in the Seventh Edition Bell Labs Research version
-+of Unix.
-+
-+Bash is largely compatible with @code{sh} and incorporates useful
-+features from the Korn shell @code{ksh} and the C shell @code{csh}.
-+It is intended to be a conformant implementation of the @sc{ieee}
-+@sc{posix} Shell and Tools portion of the @sc{ieee} @sc{posix}
-+specification (@sc{ieee} Standard 1003.1).
-+It offers functional improvements over @code{sh} for both interactive and
-+programming use.
-+
-+While the @sc{gnu} operating system provides other shells, including
-+a version of @code{csh}, Bash is the default shell.
-+Like other @sc{gnu} software, Bash is quite portable.  It currently runs
-+on nearly every version of Unix and a few other operating systems @minus{}
-+independently-supported ports exist for @sc{ms-dos}, @sc{os/2},
-+and Windows platforms.
-+
-+@node What is a shell?
-+@section What is a shell?
-+
-+At its base, a shell is simply a macro processor that executes
-+commands.  The term macro processor means functionality where text
-+and symbols are expanded to create larger expressions.
-+
-+A Unix shell is both a command interpreter and a programming
-+language.  As a command interpreter, the shell provides the user
-+interface to the rich set of @sc{gnu} utilities.  The programming
-+language features allow these utilitites to be combined.
-+Files containing commands can be created, and become
-+commands themselves.  These new commands have the same status as
-+system commands in directories such as @file{/bin}, allowing users
-+or groups to establish custom environments to automate their common
-+tasks.
-+
-+Shells may be used interactively or non-interactively.  In
-+interactive mode, they accept input typed from the keyboard.
-+When executing non-interactively, shells execute commands read
-+from a file.
-+
-+A shell allows execution of @sc{gnu} commands, both synchronously and
-+asynchronously.
-+The shell waits for synchronous commands to complete before accepting
-+more input; asynchronous commands continue to execute in parallel
-+with the shell while it reads and executes additional commands.
-+The @dfn{redirection} constructs permit
-+fine-grained control of the input and output of those commands.
-+Moreover, the shell allows control over the contents of commands'
-+environments.
-+
-+Shells also provide a small set of built-in
-+commands (@dfn{builtins}) implementing functionality impossible
-+or inconvenient to obtain via separate utilities.
-+For example, @code{cd}, @code{break}, @code{continue}, and
-+@code{exec}) cannot be implemented outside of the shell because
-+they directly manipulate the shell itself.
-+The @code{history}, @code{getopts}, @code{kill}, or @code{pwd}
-+builtins, among others, could be implemented in separate utilities,
-+but they are more convenient to use as builtin commands.
-+All of the shell builtins are described in
-+subsequent sections.
-+
-+While executing commands is essential, most of the power (and
-+complexity) of shells is due to their embedded programming
-+languages.  Like any high-level language, the shell provides
-+variables, flow control constructs, quoting, and functions. 
-+
-+Shells offer features geared specifically for
-+interactive use rather than to augment the programming language. 
-+These interactive features include job control, command line
-+editing, command history and aliases.  Each of these features is
-+described in this manual.
-+
-+@node Definitions
-+@chapter Definitions
-+These definitions are used throughout the remainder of this manual.
-+
-+@table @code
-+
-+@item POSIX
-+@cindex POSIX
-+A family of open system standards based on Unix.  Bash
-+is primarily concerned with the Shell and Utilities portion of the
-+@sc{posix} 1003.1 standard. 
-+
-+@item blank
-+A space or tab character.
-+
-+@item builtin
-+@cindex builtin
-+A command that is implemented internally by the shell itself, rather
-+than by an executable program somewhere in the file system.
-+
-+@item control operator
-+@cindex control operator
-+A @code{word} that performs a control function.  It is a @code{newline}
-+or one of the following:
-+@samp{||}, @samp{&&}, @samp{&}, @samp{;}, @samp{;;},
-+@samp{|}, @samp{(}, or @samp{)}.
-+
-+@item exit status
-+@cindex exit status
-+The value returned by a command to its caller.  The value is restricted
-+to eight bits, so the maximum value is 255.
-+
-+@item field
-+@cindex field
-+A unit of text that is the result of one of the shell expansions.  After
-+expansion, when executing a command, the resulting fields are used as
-+the command name and arguments.
-+
-+@item filename
-+@cindex filename
-+A string of characters used to identify a file.
-+
-+@item job
-+@cindex job
-+A set of processes comprising a pipeline, and any processes descended
-+from it, that are all in the same process group.
-+
-+@item job control
-+@cindex job control
-+A mechanism by which users can selectively stop (suspend) and restart
-+(resume) execution of processes.
-+
-+@item metacharacter
-+@cindex metacharacter
-+A character that, when unquoted, separates words.  A metacharacter is
-+a @code{blank} or one of the following characters:
-+@samp{|}, @samp{&}, @samp{;}, @samp{(}, @samp{)}, @samp{<}, or
-+@samp{>}.
-+
-+@item name
-+@cindex name
-+@cindex identifier
-+A @code{word} consisting solely of letters, numbers, and underscores,
-+and beginning with a letter or underscore.  @code{Name}s are used as
-+shell variable and function names.
-+Also referred to as an @code{identifier}.
-+
-+@item operator
-+@cindex operator, shell
-+A @code{control operator} or a @code{redirection operator}.
-+@xref{Redirections}, for a list of redirection operators.
-+
-+@item process group
-+@cindex process group
-+A collection of related processes each having the same process
-+group @sc{id}.
-+
-+@item process group ID
-+@cindex process group ID
-+A unique identifer that represents a @code{process group}
-+during its lifetime.
-+
-+@item reserved word
-+@cindex reserved word
-+A @code{word} that has a special meaning to the shell.  Most reserved
-+words introduce shell flow control constructs, such as @code{for} and
-+@code{while}.
-+
-+@item return status
-+@cindex return status
-+A synonym for @code{exit status}.
-+
-+@item signal
-+@cindex signal
-+A mechanism by which a process may be notified by the kernel
-+of an event occurring in the system.
-+
-+@item special builtin
-+@cindex special builtin
-+A shell builtin command that has been classified as special by the
-+@sc{posix} standard.
-+
-+@item token
-+@cindex token
-+A sequence of characters considered a single unit by the shell.  It is
-+either a @code{word} or an @code{operator}.
-+
-+@item word
-+@cindex word
-+A @code{token} that is not an @code{operator}.
-+@end table
-+
-+@node Basic Shell Features
-+@chapter Basic Shell Features
-+@cindex Bourne shell
-+
-+Bash is an acronym for @samp{Bourne-Again SHell}.
-+The Bourne shell is
-+the traditional Unix shell originally written by Stephen Bourne.
-+All of the Bourne shell builtin commands are available in Bash,
-+The rules for evaluation and quoting are taken from the @sc{posix}
-+specification for the `standard' Unix shell.
-+
-+This chapter briefly summarizes the shell's `building blocks':
-+commands, control structures, shell functions, shell @i{parameters},
-+shell expansions,
-+@i{redirections}, which are a way to direct input and output from
-+and to named files, and how the shell executes commands.
-+
-+@menu
-+* Shell Syntax::		What your input means to the shell.
-+* Shell Commands::		The types of commands you can use.
-+* Shell Functions::		Grouping commands by name.
-+* Shell Parameters::		How the shell stores values.
-+* Shell Expansions::		How Bash expands parameters and the various
-+				expansions available.
-+* Redirections::		A way to control where input and output go.
-+* Executing Commands::		What happens when you run a command.
-+* Shell Scripts::		Executing files of shell commands.
-+@end menu
-+
-+@node Shell Syntax
-+@section Shell Syntax
-+@menu
-+* Shell Operation::	The basic operation of the shell.
-+* Quoting::		How to remove the special meaning from characters.
-+* Comments::		How to specify comments.
-+@end menu
-+
-+When the shell reads input, it proceeds through a
-+sequence of operations.  If the input indicates the beginning of a
-+comment, the shell ignores the comment symbol (@samp{#}), and the rest
-+of that line.
-+                                
-+Otherwise, roughly speaking,  the shell reads its input and
-+divides the input into words and operators, employing the quoting rules
-+to select which meanings to assign various words and characters.
-+
-+The shell then parses these tokens into commands and other constructs,
-+removes the special meaning of certain words or characters, expands
-+others, redirects input and output as needed, executes the specified
-+command, waits for the command's exit status, and makes that exit status
-+available for further inspection or processing.
-+
-+@node Shell Operation
-+@subsection Shell Operation
-+
-+The following is a brief description of the shell's operation when it
-+reads and executes a command.  Basically, the shell does the
-+following:
-+
-+@enumerate
-+@item
-+Reads its input from a file (@pxref{Shell Scripts}), from a string
-+supplied as an argument to the @option{-c} invocation option
-+(@pxref{Invoking Bash}), or from the user's terminal.
-+
-+@item
-+Breaks the input into words and operators, obeying the quoting rules
-+described in @ref{Quoting}.  These tokens are separated by
-+@code{metacharacters}.  Alias expansion is performed by this step
-+(@pxref{Aliases}).
-+
-+@item
-+Parses the tokens into simple and compound commands
-+(@pxref{Shell Commands}).
-+
-+@item
-+Performs the various shell expansions (@pxref{Shell Expansions}), breaking
-+the expanded tokens into lists of filenames (@pxref{Filename Expansion})
-+and commands and arguments.
-+
-+@item
-+Performs any necessary redirections (@pxref{Redirections}) and removes
-+the redirection operators and their operands from the argument list.
-+
-+@item
-+Executes the command (@pxref{Executing Commands}).
-+
-+@item
-+Optionally waits for the command to complete and collects its exit
-+status (@pxref{Exit Status}).
-+
-+@end enumerate
-+
-+@node Quoting
-+@subsection Quoting
-+@cindex quoting
-+@menu
-+* Escape Character::	How to remove the special meaning from a single
-+			character.
-+* Single Quotes::	How to inhibit all interpretation of a sequence
-+			of characters.
-+* Double Quotes::	How to suppress most of the interpretation of a
-+			sequence of characters.
-+* ANSI-C Quoting::	How to expand ANSI-C sequences in quoted strings.
-+* Locale Translation::	How to translate strings into different languages.
-+@end menu
-+
-+Quoting is used to remove the special meaning of certain
-+characters or words to the shell.  Quoting can be used to
-+disable special treatment for special characters, to prevent
-+reserved words from being recognized as such, and to prevent
-+parameter expansion.
-+
-+Each of the shell metacharacters (@pxref{Definitions})
-+has special meaning to the shell and must be quoted if it is to
-+represent itself.
-+When the command history expansion facilities are being used
-+(@pxref{History Interaction}), the
-+@var{history expansion} character, usually @samp{!}, must be quoted
-+to prevent history expansion.  @xref{Bash History Facilities}, for
-+more details concerning history expansion.
-+
-+There are three quoting mechanisms: the
-+@var{escape character}, single quotes, and double quotes.
-+
-+@node Escape Character
-+@subsubsection Escape Character
-+A non-quoted backslash @samp{\} is the Bash escape character.
-+It preserves the literal value of the next character that follows,
-+with the exception of @code{newline}.  If a @code{\newline} pair
-+appears, and the backslash itself is not quoted, the @code{\newline}
-+is treated as a line continuation (that is, it is removed from
-+the input stream and effectively ignored).
-+
-+@node Single Quotes
-+@subsubsection Single Quotes
-+
-+Enclosing characters in single quotes (@samp{'}) preserves the literal value
-+of each character within the quotes.  A single quote may not occur
-+between single quotes, even when preceded by a backslash.
-+
-+@node Double Quotes
-+@subsubsection Double Quotes
-+
-+Enclosing characters in double quotes (@samp{"}) preserves the literal value
-+of all characters within the quotes, with the exception of
-+@samp{$}, @samp{`}, @samp{\},
-+and, when history expansion is enabled, @samp{!}.
-+The characters @samp{$} and @samp{`}
-+retain their special meaning within double quotes (@pxref{Shell Expansions}).
-+The backslash retains its special meaning only when followed by one of
-+the following characters:
-+@samp{$}, @samp{`}, @samp{"}, @samp{\}, or @code{newline}.
-+Within double quotes, backslashes that are followed by one of these
-+characters are removed.  Backslashes preceding characters without a
-+special meaning are left unmodified.
-+A double quote may be quoted within double quotes by preceding it with
-+a backslash.
-+If enabled, history expansion will be performed unless an @samp{!}
-+appearing in double quotes is escaped using a backslash.
-+The backslash preceding the @samp{!} is not removed.
-+
-+The special parameters @samp{*} and @samp{@@} have special meaning
-+when in double quotes (@pxref{Shell Parameter Expansion}).
-+
-+@node ANSI-C Quoting
-+@subsubsection ANSI-C Quoting
-+@cindex quoting, ANSI
-+
-+Words of the form @code{$'@var{string}'} are treated specially.  The
-+word expands to @var{string}, with backslash-escaped characters replaced
-+as specified by the ANSI C standard.  Backslash escape sequences, if
-+present, are decoded as follows:
-+
-+@table @code
-+@item \a
-+alert (bell)
-+@item \b
-+backspace
-+@item \e
-+an escape character (not ANSI C)
-+@item \f
-+form feed
-+@item \n
-+newline
-+@item \r
-+carriage return
-+@item \t
-+horizontal tab
-+@item \v
-+vertical tab
-+@item \\
-+backslash
-+@item \'
-+single quote
-+@item \@var{nnn}
-+the eight-bit character whose value is the octal value @var{nnn}
-+(one to three digits)
-+@item \x@var{HH}
-+the eight-bit character whose value is the hexadecimal value @var{HH}
-+(one or two hex digits)
-+@item \c@var{x}
-+a control-@var{x} character
-+@end table
-+
-+@noindent
-+The expanded result is single-quoted, as if the dollar sign had not
-+been present.
-+
-+@node Locale Translation
-+@subsubsection Locale-Specific Translation
-+@cindex localization
-+@cindex internationalization
-+@cindex native languages
-+@cindex translation, native languages
-+
-+A double-quoted string preceded by a dollar sign (@samp{$}) will cause
-+the string to be translated according to the current locale.
-+If the current locale is @code{C} or @code{POSIX}, the dollar sign
-+is ignored.
-+If the string is translated and replaced, the replacement is
-+double-quoted.
-+
-+@vindex LC_MESSAGES
-+@vindex TEXTDOMAIN
-+@vindex TEXTDOMAINDIR
-+Some systems use the message catalog selected by the @env{LC_MESSAGES}
-+shell variable.  Others create the name of the message catalog from the
-+value of the @env{TEXTDOMAIN} shell variable, possibly adding a
-+suffix of @samp{.mo}.  If you use the @env{TEXTDOMAIN} variable, you
-+may need to set the @env{TEXTDOMAINDIR} variable to the location of
-+the message catalog files.  Still others use both variables in this
-+fashion:
-+@env{TEXTDOMAINDIR}/@env{LC_MESSAGES}/LC_MESSAGES/@env{TEXTDOMAIN}.mo.
-+
-+@node Comments
-+@subsection Comments
-+@cindex comments, shell
-+
-+In a non-interactive shell, or an interactive shell in which the
-+@code{interactive_comments} option to the @code{shopt}
-+builtin is enabled (@pxref{Bash Builtins}),
-+a word beginning with @samp{#}
-+causes that word and all remaining characters on that line to
-+be ignored.  An interactive shell without the @code{interactive_comments}
-+option enabled does not allow comments.  The @code{interactive_comments}
-+option is on by default in interactive shells.
-+@xref{Interactive Shells}, for a description of what makes
-+a shell interactive.
-+
-+@node Shell Commands
-+@section Shell Commands
-+@cindex commands, shell
-+
-+A simple shell command such as @code{echo a b c} consists of the command
-+itself followed by arguments, separated by spaces.
-+
-+More complex shell commands are composed of simple commands arranged together
-+in a variety of ways: in a pipeline in which the output of one command
-+becomes the input of a second, in a loop or conditional construct, or in
-+some other grouping.
-+
-+@menu
-+* Simple Commands::		The most common type of command.
-+* Pipelines::			Connecting the input and output of several
-+				commands.
-+* Lists::			How to execute commands sequentially.
-+* Compound Commands::		Shell commands for control flow.
-+@end menu
-+
-+@node Simple Commands
-+@subsection Simple Commands
-+@cindex commands, simple
-+
-+A simple command is the kind of command encountered most often.
-+It's just a sequence of words separated by @code{blank}s, terminated
-+by one of the shell's control operators (@pxref{Definitions}).  The
-+first word generally specifies a command to be executed, with the
-+rest of the words being that command's arguments.
-+
-+The return status (@pxref{Exit Status}) of a simple command is
-+its exit status as provided
-+by the @sc{posix} 1003.1 @code{waitpid} function, or 128+@var{n} if
-+the command was terminated by signal @var{n}.
-+
-+@node Pipelines
-+@subsection Pipelines
-+@cindex pipeline
-+@cindex commands, pipelines
-+
-+A @code{pipeline} is a sequence of simple commands separated by
-+@samp{|}.
-+
-+@rwindex time
-+@rwindex !
-+@cindex command timing
-+The format for a pipeline is
-+@example
-+[@code{time} [@code{-p}]] [@code{!}] @var{command1} [@code{|} @var{command2} @dots{}]
-+@end example
-+
-+@noindent
-+The output of each command in the pipeline is connected via a pipe
-+to the input of the next command.
-+That is, each command reads the previous command's output.
-+
-+The reserved word @code{time} causes timing statistics
-+to be printed for the pipeline once it finishes.
-+The statistics currently consist of elapsed (wall-clock) time and
-+user and system time consumed by the command's execution.
-+The @option{-p} option changes the output format to that specified
-+by @sc{posix}.
-+The @env{TIMEFORMAT} variable may be set to a format string that
-+specifies how the timing information should be displayed.
-+@xref{Bash Variables}, for a description of the available formats.
-+The use of @code{time} as a reserved word permits the timing of
-+shell builtins, shell functions, and pipelines.  An external
-+@code{time} command cannot time these easily.
-+
-+If the pipeline is not executed asynchronously (@pxref{Lists}), the
-+shell waits for all commands in the pipeline to complete.
-+
-+Each command in a pipeline is executed in its own subshell
-+(@pxref{Command Execution Environment}).  The exit
-+status of a pipeline is the exit status of the last command in the
-+pipeline, unless the @code{pipefail} option is enabled
-+(@pxref{The Set Builtin}).
-+If @code{pipefail} is enabled, the pipeline's return status is the
-+value of the last (rightmost) command to exit with a non-zero status,
-+or zero if all commands exit successfully.
-+If the reserved word @samp{!} precedes the pipeline, the
-+exit status is the logical negation of the exit status as described
-+above.
-+The shell waits for all commands in the pipeline to terminate before
-+returning a value.
-+
-+@node Lists
-+@subsection Lists of Commands
-+@cindex commands, lists
-+
-+A @code{list} is a sequence of one or more pipelines separated by one
-+of the operators @samp{;}, @samp{&}, @samp{&&}, or @samp{||},
-+and optionally terminated by one of @samp{;}, @samp{&}, or a
-+@code{newline}.
-+
-+Of these list operators, @samp{&&} and @samp{||}
-+have equal precedence, followed by @samp{;} and @samp{&},
-+which have equal precedence.
-+
-+A sequence of one or more newlines may appear in a @code{list}
-+to delimit commands, equivalent to a semicolon.
-+
-+If a command is terminated by the control operator @samp{&},
-+the shell executes the command asynchronously in a subshell.
-+This is known as executing the command in the @var{background}.
-+The shell does not wait for the command to finish, and the return
-+status is 0 (true).
-+When job control is not active (@pxref{Job Control}),
-+the standard input for asynchronous commands, in the absence of any
-+explicit redirections, is redirected from @code{/dev/null}.
-+
-+Commands separated by a @samp{;} are executed sequentially; the shell
-+waits for each command to terminate in turn.  The return status is the
-+exit status of the last command executed.
-+
-+The control operators @samp{&&} and @samp{||}
-+denote @sc{and} lists and @sc{or} lists, respectively.
-+An @sc{and} list has the form
-+@example
-+@var{command1} && @var{command2}
-+@end example
-+
-+@noindent
-+@var{command2} is executed if, and only if, @var{command1}
-+returns an exit status of zero.
-+
-+An @sc{or} list has the form
-+@example
-+@var{command1} || @var{command2}
-+@end example
-+
-+@noindent
-+@var{command2} is executed if, and only if, @var{command1}
-+returns a non-zero exit status.
-+
-+The return status of
-+@sc{and} and @sc{or} lists is the exit status of the last command
-+executed in the list.
-+
-+@node Compound Commands
-+@subsection Compound Commands
-+@cindex commands, compound
-+
-+@menu
-+* Looping Constructs::		Shell commands for iterative action.
-+* Conditional Constructs::	Shell commands for conditional execution.
-+* Command Grouping::		Ways to group commands.
-+@end menu
-+
-+Compound commands are the shell programming constructs.
-+Each construct begins with a reserved word or control operator and is
-+terminated by a corresponding reserved word or operator.
-+Any redirections (@pxref{Redirections}) associated with a compound command
-+apply to all commands within that compound command unless explicitly overridden.
-+
-+Bash provides looping constructs, conditional commands, and mechanisms
-+to group commands and execute them as a unit.
-+
-+@node Looping Constructs
-+@subsubsection Looping Constructs
-+@cindex commands, looping
-+
-+Bash supports the following looping constructs.
-+
-+Note that wherever a @samp{;} appears in the description of a
-+command's syntax, it may be replaced with one or more newlines.
-+
-+@table @code
-+@item until
-+@rwindex until
-+@rwindex do
-+@rwindex done
-+The syntax of the @code{until} command is:
-+@example
-+until @var{test-commands}; do @var{consequent-commands}; done
-+@end example
-+Execute @var{consequent-commands} as long as
-+@var{test-commands} has an exit status which is not zero.
-+The return status is the exit status of the last command executed
-+in @var{consequent-commands}, or zero if none was executed.
-+
-+@item while
-+@rwindex while
-+The syntax of the @code{while} command is:
-+@example
-+while @var{test-commands}; do @var{consequent-commands}; done
-+@end example
-+
-+Execute @var{consequent-commands} as long as
-+@var{test-commands} has an exit status of zero.
-+The return status is the exit status of the last command executed
-+in @var{consequent-commands}, or zero if none was executed.
-+
-+@item for
-+@rwindex for
-+The syntax of the @code{for} command is:
-+
-+@example
-+for @var{name} [in @var{words} @dots{}]; do @var{commands}; done
-+@end example
-+Expand @var{words}, and execute @var{commands} once for each member
-+in the resultant list, with @var{name} bound to the current member.
-+If @samp{in @var{words}} is not present, the @code{for} command
-+executes the @var{commands} once for each positional parameter that is
-+set, as if @samp{in "$@@"} had been specified
-+(@pxref{Special Parameters}).
-+The return status is the exit status of the last command that executes.
-+If there are no items in the expansion of @var{words}, no commands are
-+executed, and the return status is zero.
-+
-+An alternate form of the @code{for} command is also supported:
-+
-+@example
-+for (( @var{expr1} ; @var{expr2} ; @var{expr3} )) ; do @var{commands} ; done
-+@end example
-+First, the arithmetic expression @var{expr1} is evaluated according
-+to the rules described below (@pxref{Shell Arithmetic}).
-+The arithmetic expression @var{expr2} is then evaluated repeatedly
-+until it evaluates to zero.   
-+Each time @var{expr2} evaluates to a non-zero value, @var{commands} are
-+executed and the arithmetic expression @var{expr3} is evaluated.       
-+If any expression is omitted, it behaves as if it evaluates to 1.
-+The return value is the exit status of the last command in @var{list}
-+that is executed, or false if any of the expressions is invalid.
-+
-+@end table
-+
-+The @code{break} and @code{continue} builtins (@pxref{Bourne Shell Builtins})
-+may be used to control loop execution.
-+
-+@node Conditional Constructs
-+@subsubsection Conditional Constructs
-+@cindex commands, conditional
-+
-+@table @code
-+@item if
-+@rwindex if
-+@rwindex then
-+@rwindex else
-+@rwindex elif
-+@rwindex fi
-+The syntax of the @code{if} command is:
-+
-+@example
-+if @var{test-commands}; then
-+  @var{consequent-commands};
-+[elif @var{more-test-commands}; then
-+  @var{more-consequents};]
-+[else @var{alternate-consequents};]
-+fi
-+@end example
-+
-+The @var{test-commands} list is executed, and if its return status is zero,
-+the @var{consequent-commands} list is executed.
-+If @var{test-commands} returns a non-zero status, each @code{elif} list
-+is executed in turn, and if its exit status is zero,
-+the corresponding @var{more-consequents} is executed and the   
-+command completes.
-+If @samp{else @var{alternate-consequents}} is present, and
-+the final command in the final @code{if} or @code{elif} clause
-+has a non-zero exit status, then @var{alternate-consequents} is executed.
-+The return status is the exit status of the last command executed, or
-+zero if no condition tested true.
-+
-+@item case
-+@rwindex case
-+@rwindex in
-+@rwindex esac
-+The syntax of the @code{case} command is:
-+
-+@example
-+@code{case @var{word} in [ [(] @var{pattern} [| @var{pattern}]@dots{}) @var{command-list} ;;]@dots{} esac}
-+@end example
-+
-+@code{case} will selectively execute the @var{command-list} corresponding to
-+the first @var{pattern} that matches @var{word}.
-+If the shell option @code{nocasematch}
-+(see the description of @code{shopt} in @ref{Bash Builtins})
-+is enabled, the match is performed without regard to the case
-+of alphabetic characters.
-+The @samp{|} is used to separate multiple patterns, and the @samp{)}
-+operator terminates a pattern list.
-+A list of patterns and an associated command-list is known
-+as a @var{clause}.  Each clause must be terminated with @samp{;;}.
-+The @var{word} undergoes tilde expansion, parameter expansion, command
-+substitution, arithmetic expansion, and quote removal before matching is
-+attempted.  Each @var{pattern} undergoes tilde expansion, parameter
-+expansion, command substitution, and arithmetic expansion.
-+
-+There may be an arbitrary number of @code{case} clauses, each terminated
-+by a @samp{;;}.  The first pattern that matches determines the
-+command-list that is executed.
-+
-+Here is an example using @code{case} in a script that could be used to
-+describe one interesting feature of an animal:
-+
-+@example
-+echo -n "Enter the name of an animal: "
-+read ANIMAL
-+echo -n "The $ANIMAL has "
-+case $ANIMAL in
-+  horse | dog | cat) echo -n "four";;
-+  man | kangaroo ) echo -n "two";;
-+  *) echo -n "an unknown number of";;
-+esac
-+echo " legs."
-+@end example
-+
-+@noindent
-+The return status is zero if no @var{pattern} is matched.  Otherwise, the
-+return status is the exit status of the @var{command-list} executed.
-+
-+@item select
-+@rwindex select
-+
-+The @code{select} construct allows the easy generation of menus.
-+It has almost the same syntax as the @code{for} command:
-+
-+@example
-+select @var{name} [in @var{words} @dots{}]; do @var{commands}; done
-+@end example
-+
-+The list of words following @code{in} is expanded, generating a list
-+of items.  The set of expanded words is printed on the standard
-+error output stream, each preceded by a number.  If the
-+@samp{in @var{words}} is omitted, the positional parameters are printed,
-+as if @samp{in "$@@"} had been specifed.
-+The @env{PS3} prompt is then displayed and a line is read from the
-+standard input.
-+If the line consists of a number corresponding to one of the displayed
-+words, then the value of @var{name} is set to that word.
-+If the line is empty, the words and prompt are displayed again.
-+If @code{EOF} is read, the @code{select} command completes.
-+Any other value read causes @var{name} to be set to null.
-+The line read is saved in the variable @env{REPLY}.
-+
-+The @var{commands} are executed after each selection until a
-+@code{break} command is executed, at which
-+point the @code{select} command completes.
-+
-+Here is an example that allows the user to pick a filename from the
-+current directory, and displays the name and index of the file
-+selected.
-+
-+@example
-+select fname in *;
-+do
-+	echo you picked $fname \($REPLY\)
-+	break;
-+done
-+@end example
-+
-+@item ((@dots{}))
-+@example
-+(( @var{expression} ))
-+@end example
-+
-+The arithmetic @var{expression} is evaluated according to the rules
-+described below (@pxref{Shell Arithmetic}).
-+If the value of the expression is non-zero, the return status is 0;
-+otherwise the return status is 1.  This is exactly equivalent to
-+@example
-+let "@var{expression}"
-+@end example
-+@noindent
-+@xref{Bash Builtins}, for a full description of the @code{let} builtin.
-+
-+@item [[@dots{}]]
-+@rwindex [[
-+@rwindex ]]
-+@example
-+[[ @var{expression} ]]
-+@end example
-+
-+Return a status of 0 or 1 depending on the evaluation of
-+the conditional expression @var{expression}.
-+Expressions are composed of the primaries described below in
-+@ref{Bash Conditional Expressions}.
-+Word splitting and filename expansion are not performed on the words
-+between the @samp{[[} and @samp{]]}; tilde expansion, parameter and
-+variable expansion, arithmetic expansion, command substitution, process
-+substitution, and quote removal are performed.
-+Conditional operators such as @samp{-f} must be unquoted to be recognized
-+as primaries.
-+
-+When the @samp{==} and @samp{!=} operators are used, the string to the
-+right of the operator is considered a pattern and matched according
-+to the rules described below in @ref{Pattern Matching}.
-+If the shell option @code{nocasematch}
-+(see the description of @code{shopt} in @ref{Bash Builtins})
-+is enabled, the match is performed without regard to the case
-+of alphabetic characters.
-+The return value is 0 if the string matches (@samp{==}) or does not
-+match (@samp{!=})the pattern, and 1 otherwise.
-+Any part of the pattern may be quoted to force it to be matched as a
-+string.
-+
-+An additional binary operator, @samp{=~}, is available, with the same
-+precedence as @samp{==} and @samp{!=}.
-+When it is used, the string to the right of the operator is considered
-+an extended regular expression and matched accordingly (as in @i{regex}3)).  
-+The return value is 0 if the string matches
-+the pattern, and 1 otherwise.
-+If the regular expression is syntactically incorrect, the conditional
-+expression's return value is 2.
-+If the shell option @code{nocasematch}
-+(see the description of @code{shopt} in @ref{Bash Builtins})
-+is enabled, the match is performed without regard to the case
-+of alphabetic characters.
-+Substrings matched by parenthesized subexpressions within the regular
-+expression are saved in the array variable @code{BASH_REMATCH}.
-+The element of @code{BASH_REMATCH} with index 0 is the portion of the string
-+matching the entire regular expression.
-+The element of @code{BASH_REMATCH} with index @var{n} is the portion of the
-+string matching the @var{n}th parenthesized subexpression.
-+
-+Expressions may be combined using the following operators, listed
-+in decreasing order of precedence:
-+
-+@table @code
-+@item ( @var{expression} )
-+Returns the value of @var{expression}.
-+This may be used to override the normal precedence of operators.
-+
-+@item ! @var{expression}
-+True if @var{expression} is false.
-+
-+@item @var{expression1} && @var{expression2}
-+True if both @var{expression1} and @var{expression2} are true.
-+
-+@item @var{expression1} || @var{expression2}
-+True if either @var{expression1} or @var{expression2} is true.
-+@end table
-+@noindent
-+The @code{&&} and @code{||} operators do not evaluate @var{expression2} if the
-+value of @var{expression1} is sufficient to determine the return
-+value of the entire conditional expression.
-+
-+@end table
-+
-+@node Command Grouping
-+@subsubsection Grouping Commands
-+@cindex commands, grouping
-+
-+Bash provides two ways to group a list of commands to be executed
-+as a unit.  When commands are grouped, redirections may be applied
-+to the entire command list.  For example, the output of all the
-+commands in the list may be redirected to a single stream.
-+
-+@table @code
-+@item ()
-+@example
-+( @var{list} )
-+@end example
-+
-+Placing a list of commands between parentheses causes a subshell
-+environment to be created (@pxref{Command Execution Environment}), and each
-+of the commands in @var{list} to be executed in that subshell.  Since the
-+@var{list} is executed in a subshell, variable assignments do not remain in
-+effect after the subshell completes. 
-+
-+@item @{@}
-+@rwindex @{
-+@rwindex @}
-+@example
-+@{ @var{list}; @}
-+@end example
-+
-+Placing a list of commands between curly braces causes the list to
-+be executed in the current shell context.  No subshell is created.
-+The semicolon (or newline) following @var{list} is required.
-+@end table
-+
-+In addition to the creation of a subshell, there is a subtle difference
-+between these two constructs due to historical reasons.  The braces
-+are @code{reserved words}, so they must be separated from the @var{list}
-+by @code{blank}s.  The parentheses are @code{operators}, and are
-+recognized as separate tokens by the shell even if they are not separated
-+from the @var{list} by whitespace.
-+
-+The exit status of both of these constructs is the exit status of
-+@var{list}.
-+
-+@node Shell Functions
-+@section Shell Functions
-+@cindex shell function
-+@cindex functions, shell
-+
-+Shell functions are a way to group commands for later execution
-+using a single name for the group.  They are executed just like
-+a "regular" command.
-+When the name of a shell function is used as a simple command name,
-+the list of commands associated with that function name is executed.
-+Shell functions are executed in the current
-+shell context; no new process is created to interpret them.
-+
-+Functions are declared using this syntax:
-+@rwindex function
-+@example
-+[ @code{function} ] @var{name} () @var{compound-command} [ @var{redirections} ]
-+@end example
-+
-+This defines a shell function named @var{name}.  The reserved
-+word @code{function} is optional.
-+If the @code{function} reserved
-+word is supplied, the parentheses are optional.
-+The @var{body} of the function is the compound command
-+@var{compound-command} (@pxref{Compound Commands}).
-+That command is usually a @var{list} enclosed between @{ and @}, but
-+may be any compound command listed above.
-+@var{compound-command} is executed whenever @var{name} is specified as the
-+name of a command.
-+Any redirections (@pxref{Redirections}) associated with the shell function
-+are performed when the function is executed.
-+
-+A function definition may be deleted using the @option{-f} option to the
-+@code{unset} builtin (@pxref{Bourne Shell Builtins}).
-+
-+The exit status of a function definition is zero unless a syntax error
-+occurs or a readonly function with the same name already exists.
-+When executed, the exit status of a function is the exit status of the
-+last command executed in the body.
-+
-+Note that for historical reasons, in the most common usage the curly braces
-+that surround the body of the function must be separated from the body by
-+@code{blank}s or newlines.
-+This is because the braces are reserved words and are only recognized
-+as such when they are separated by whitespace.
-+Also, when using the braces, the @var{list} must be terminated by a semicolon,
-+a @samp{&}, or a newline.
-+
-+When a function is executed, the arguments to the
-+function become the positional parameters
-+during its execution (@pxref{Positional Parameters}).
-+The special parameter @samp{#} that expands to the number of
-+positional parameters is updated to reflect the change.
-+Special parameter @code{0} is unchanged.
-+The first element of the @env{FUNCNAME} variable is set to the
-+name of the function while the function is executing.
-+All other aspects of the shell execution
-+environment are identical between a function and its caller
-+with the exception that the @env{DEBUG} and @env{RETURN} traps
-+are not inherited unless the function has been given the
-+@code{trace} attribute using the @code{declare} builtin or
-+the @code{-o functrace} option has been enabled with
-+the @code{set} builtin,
-+(in which case all functions inherit the @env{DEBUG} and @env{RETURN} traps).
-+@xref{Bourne Shell Builtins}, for the description of the
-+@code{trap} builtin.
-+
-+If the builtin command @code{return}
-+is executed in a function, the function completes and
-+execution resumes with the next command after the function
-+call.
-+Any command associated with the @code{RETURN} trap is executed
-+before execution resumes.
-+When a function completes, the values of the
-+positional parameters and the special parameter @samp{#}
-+are restored to the values they had prior to the function's
-+execution.  If a numeric argument is given to @code{return},
-+that is the function's return status; otherwise the function's
-+return status is the exit status of the last command executed
-+before the @code{return}.
-+
-+Variables local to the function may be declared with the
-+@code{local} builtin.  These variables are visible only to
-+the function and the commands it invokes.
-+
-+Function names and definitions may be listed with the
-+@option{-f} option to the @code{declare} or @code{typeset}
-+builtin commands (@pxref{Bash Builtins}).
-+The @option{-F} option to @code{declare} or @code{typeset}
-+will list the function names only
-+(and optionally the source file and line number, if the @code{extdebug}
-+shell option is enabled).
-+Functions may be exported so that subshells
-+automatically have them defined with the
-+@option{-f} option to the @code{export} builtin
-+(@pxref{Bourne Shell Builtins}).
-+Note that shell functions and variables with the same name may result
-+in multiple identically-named entries in the environment passed to the
-+shell's children.
-+Care should be taken in cases where this may cause a problem.
-+
-+Functions may be recursive.  No limit is placed on the number of
-+recursive  calls.
-+
-+@node Shell Parameters
-+@section Shell Parameters
-+@cindex parameters
-+@cindex variable, shell
-+@cindex shell variable
-+
-+@menu
-+* Positional Parameters::	The shell's command-line arguments.
-+* Special Parameters::		Parameters denoted by special characters.
-+@end menu
-+
-+A @var{parameter} is an entity that stores values.
-+It can be a @code{name}, a number, or one of the special characters
-+listed below.
-+A @var{variable} is a parameter denoted by a @code{name}.
-+A variable has a @var{value} and zero or more @var{attributes}.
-+Attributes are assigned using the @code{declare} builtin command
-+(see the description of the @code{declare} builtin in @ref{Bash Builtins}).
-+
-+A parameter is set if it has been assigned a value.  The null string is
-+a valid value.  Once a variable is set, it may be unset only by using
-+the @code{unset} builtin command.
-+
-+A variable may be assigned to by a statement of the form
-+@example
-+@var{name}=[@var{value}]
-+@end example
-+@noindent
-+If @var{value}
-+is not given, the variable is assigned the null string.  All
-+@var{value}s undergo tilde expansion, parameter and variable expansion,
-+command substitution, arithmetic expansion, and quote
-+removal (detailed below).  If the variable has its @code{integer}
-+attribute set, then @var{value} 
-+is evaluated as an arithmetic expression even if the @code{$((@dots{}))}
-+expansion is not used (@pxref{Arithmetic Expansion}).
-+Word splitting is not performed, with the exception
-+of @code{"$@@"} as explained below.
-+Filename expansion is not performed.
-+Assignment statements may also appear as arguments to the
-+@code{alias}, 
-+@code{declare}, @code{typeset}, @code{export}, @code{readonly},
-+and @code{local} builtin commands.
-+
-+In the context where an assignment statement is assigning a value  
-+to a shell variable or array index (@pxref{Arrays}), the @samp{+=}
-+operator can be used to   
-+append to or add to the variable's previous value.
-+When @samp{+=} is applied to a variable for which the integer attribute
-+has been set, @var{value} is evaluated as an arithmetic expression and
-+added to the variable's current value, which is also evaluated.
-+When @samp{+=} is applied to an array variable using compound assignment
-+(@pxref{Arrays}), the
-+variable's value is not unset (as it is when using @samp{=}), and new
-+values are appended to the array beginning at one greater than the array's
-+maximum index.
-+When applied to a string-valued variable, @var{value} is expanded and
-+appended to the variable's value.
-+
-+@node Positional Parameters
-+@subsection Positional Parameters
-+@cindex parameters, positional
-+
-+A @var{positional parameter} is a parameter denoted by one or more
-+digits, other than the single digit @code{0}.  Positional parameters are
-+assigned from the shell's arguments when it is invoked,
-+and may be reassigned using the @code{set} builtin command.
-+Positional parameter @code{N} may be referenced as @code{$@{N@}}, or
-+as @code{$N} when @code{N} consists of a single digit.
-+Positional parameters may not be assigned to with assignment statements.
-+The @code{set} and @code{shift} builtins are used to set and
-+unset them (@pxref{Shell Builtin Commands}).
-+The positional parameters are
-+temporarily replaced when a shell function is executed
-+(@pxref{Shell Functions}).
-+
-+When a positional parameter consisting of more than a single
-+digit is expanded, it must be enclosed in braces.
-+
-+@node Special Parameters
-+@subsection Special Parameters
-+@cindex parameters, special
-+
-+The shell treats several parameters specially.  These parameters may
-+only be referenced; assignment to them is not allowed.
-+
-+@vtable @code
-+
-+@item *
-+Expands to the positional parameters, starting from one.  When the
-+expansion occurs within double quotes, it expands to a single word
-+with the value of each parameter separated by the first character
-+of the @env{IFS}
-+special variable.  That is, @code{"$*"} is equivalent
-+to @code{"$1@var{c}$2@var{c}@dots{}"}, where @var{c}
-+is the first character of the value of the @code{IFS}
-+variable.
-+If @env{IFS} is unset, the parameters are separated by spaces.
-+If @env{IFS} is null, the parameters are joined without intervening
-+separators.
-+
-+
-+@item @@
-+Expands to the positional parameters, starting from one.  When the
-+expansion occurs within double quotes, each parameter expands to a
-+separate word.  That is, @code{"$@@"} is equivalent to
-+@code{"$1" "$2" @dots{}}.
-+If the double-quoted expansion occurs within a word, the expansion of
-+the first parameter is joined with the beginning part of the original
-+word, and the expansion of the last parameter is joined with the last
-+part of the original word.
-+When there are no positional parameters, @code{"$@@"} and
-+@code{$@@}
-+expand to nothing (i.e., they are removed).
-+
-+@item #
-+Expands to the number of positional parameters in decimal.
-+
-+@item ?
-+Expands to the exit status of the most recently executed foreground
-+pipeline.
-+
-+@item -
-+(A hyphen.)  Expands to the current option flags as specified upon
-+invocation, by the @code{set}
-+builtin command, or those set by the shell itself
-+(such as the @option{-i} option).
-+
-+@item $
-+Expands to the process @sc{id} of the shell.  In a @code{()} subshell, it
-+expands to the process @sc{id} of the invoking shell, not the subshell.
-+
-+@item !
-+Expands to the process @sc{id} of the most recently executed background
-+(asynchronous) command.
-+
-+@item 0
-+Expands to the name of the shell or shell script.  This is set at
-+shell initialization.  If Bash is invoked with a file of commands
-+(@pxref{Shell Scripts}), @code{$0} is set to the name of that file.
-+If Bash is started with the @option{-c} option (@pxref{Invoking Bash}),
-+then @code{$0} is set to the first argument after the string to be
-+executed, if one is present.  Otherwise, it is set
-+to the filename used to invoke Bash, as given by argument zero.
-+
-+@item _
-+(An underscore.)
-+At shell startup, set to the absolute pathname used to invoke the
-+shell or shell script being executed as passed in the environment
-+or argument list.
-+Subsequently, expands to the last argument to the previous command,
-+after expansion.   
-+Also set to the full pathname used to invoke each command executed
-+and placed in the environment exported to that command.
-+When checking mail, this parameter holds the name of the mail file.
-+@end vtable
-+
-+@node Shell Expansions
-+@section Shell Expansions
-+@cindex expansion
-+
-+Expansion is performed on the command line after it has been split into
-+@code{token}s.  There are seven kinds of expansion performed:
-+@itemize @bullet
-+@item brace expansion
-+@item tilde expansion
-+@item parameter and variable expansion
-+@item command substitution
-+@item arithmetic expansion
-+@item word splitting
-+@item filename expansion
-+@end itemize
-+
-+@menu
-+* Brace Expansion::		Expansion of expressions within braces.
-+* Tilde Expansion::		Expansion of the ~ character.
-+* Shell Parameter Expansion::	How Bash expands variables to their values.
-+* Command Substitution::	Using the output of a command as an argument.
-+* Arithmetic Expansion::	How to use arithmetic in shell expansions.
-+* Process Substitution::	A way to write and read to and from a
-+				command.
-+* Word Splitting::	How the results of expansion are split into separate
-+			arguments.
-+* Filename Expansion::	A shorthand for specifying filenames matching patterns.
-+* Quote Removal::	How and when quote characters are removed from
-+			words.
-+@end menu
-+
-+The order of expansions is: brace expansion, tilde expansion,
-+parameter, variable, and arithmetic expansion and
-+command substitution
-+(done in a left-to-right fashion), word splitting, and filename
-+expansion.
-+
-+On systems that can support it, there is an additional expansion
-+available: @var{process substitution}.  This is performed at the
-+same time as parameter, variable, and arithmetic expansion and
-+command substitution.
-+
-+Only brace expansion, word splitting, and filename expansion
-+can change the number of words of the expansion; other expansions
-+expand a single word to a single word.
-+The only exceptions to this are the expansions of
-+@code{"$@@"} (@pxref{Special Parameters}) and @code{"$@{@var{name}[@@]@}"}
-+(@pxref{Arrays}).
-+
-+After all expansions, @code{quote removal} (@pxref{Quote Removal})
-+is performed.
-+
-+@node Brace Expansion
-+@subsection Brace Expansion
-+@cindex brace expansion
-+@cindex expansion, brace
-+
-+Brace expansion is a mechanism by which arbitrary strings may be generated.
-+This mechanism is similar to
-+@var{filename expansion} (@pxref{Filename Expansion}),
-+but the file names generated need not exist.
-+Patterns to be brace expanded take the form of an optional @var{preamble},
-+followed by either a series of comma-separated strings or a sequnce expression
-+between a pair of braces,
-+followed by an optional @var{postscript}.
-+The preamble is prefixed to each string contained within the braces, and
-+the postscript is then appended to each resulting string, expanding left
-+to right.
-+
-+Brace expansions may be nested.
-+The results of each expanded string are not sorted; left to right order
-+is preserved.
-+For example,
-+@example
-+bash$ echo a@{d,c,b@}e
-+ade ace abe
-+@end example
-+
-+A sequence expression takes the form @code{@{@var{x}..@var{y}@}},
-+where @var{x} and @var{y} are either integers or single characters.
-+When integers are supplied, the expression expands to each number between
-+@var{x} and @var{y}, inclusive.
-+When characters are supplied, the expression expands to each character
-+lexicographically between @var{x} and @var{y}, inclusive.  Note that
-+both @var{x} and @var{y} must be of the same type.
-+
-+Brace expansion is performed before any other expansions,
-+and any characters special to other expansions are preserved
-+in the result.  It is strictly textual.  Bash
-+does not apply any syntactic interpretation to the context of the
-+expansion or the text between the braces.
-+To avoid conflicts with parameter expansion, the string @samp{$@{}
-+is not considered eligible for brace expansion.
-+
-+A correctly-formed brace expansion must contain unquoted opening
-+and closing braces, and at least one unquoted comma or a valid
-+sequence expression.
-+Any incorrectly formed brace expansion is left unchanged.
-+
-+A @{ or @samp{,} may be quoted with a backslash to prevent its
-+being considered part of a brace expression.
-+To avoid conflicts with parameter expansion, the string @samp{$@{}
-+is not considered eligible for brace expansion.
-+
-+This construct is typically used as shorthand when the common
-+prefix of the strings to be generated is longer than in the
-+above example:
-+@example
-+mkdir /usr/local/src/bash/@{old,new,dist,bugs@}
-+@end example
-+or
-+@example
-+chown root /usr/@{ucb/@{ex,edit@},lib/@{ex?.?*,how_ex@}@}
-+@end example
-+
-+@node Tilde Expansion
-+@subsection Tilde Expansion
-+@cindex tilde expansion
-+@cindex expansion, tilde
-+
-+If a word begins with an unquoted tilde character (@samp{~}), all of the
-+characters up to the first unquoted slash (or all characters,
-+if there is no unquoted slash) are considered a @var{tilde-prefix}.
-+If none of the characters in the tilde-prefix are quoted, the
-+characters in the tilde-prefix following the tilde are treated as a
-+possible @var{login name}.
-+If this login name is the null string, the tilde is replaced with the
-+value of the @env{HOME} shell variable.
-+If @env{HOME} is unset, the home directory of the user executing the
-+shell is substituted instead.
-+Otherwise, the tilde-prefix is replaced with the home directory
-+associated with the specified login name.
-+
-+If the tilde-prefix is @samp{~+}, the value of
-+the shell variable @env{PWD} replaces the tilde-prefix.
-+If the tilde-prefix is @samp{~-}, the value of the shell variable
-+@env{OLDPWD}, if it is set, is substituted.
-+
-+If the characters following the tilde in the tilde-prefix consist of a
-+number @var{N}, optionally prefixed by a @samp{+} or a @samp{-},
-+the tilde-prefix is replaced with the
-+corresponding element from the directory stack, as it would be displayed
-+by the @code{dirs} builtin invoked with the characters following tilde
-+in the tilde-prefix as an argument (@pxref{The Directory Stack}).
-+If the tilde-prefix, sans the tilde, consists of a number without a
-+leading @samp{+} or @samp{-}, @samp{+} is assumed.
-+
-+If the login name is invalid, or the tilde expansion fails, the word is
-+left unchanged.
-+
-+Each variable assignment is checked for unquoted tilde-prefixes immediately
-+following a @samp{:} or the first @samp{=}.
-+In these cases, tilde expansion is also performed.
-+Consequently, one may use file names with tildes in assignments to
-+@env{PATH}, @env{MAILPATH}, and @env{CDPATH},
-+and the shell assigns the expanded value.
-+
-+The following table shows how Bash treats unquoted tilde-prefixes:
-+
-+@table @code
-+@item ~
-+The value of @code{$HOME}
-+@item ~/foo
-+@file{$HOME/foo}
-+
-+@item ~fred/foo
-+The subdirectory @code{foo} of the home directory of the user
-+@code{fred}
-+
-+@item ~+/foo
-+@file{$PWD/foo}
-+
-+@item ~-/foo
-+@file{$@{OLDPWD-'~-'@}/foo}
-+
-+@item ~@var{N}
-+The string that would be displayed by @samp{dirs +@var{N}}
-+
-+@item ~+@var{N}
-+The string that would be displayed by @samp{dirs +@var{N}}
-+
-+@item ~-@var{N}
-+The string that would be displayed by @samp{dirs -@var{N}}
-+
-+@end table
-+
-+@node Shell Parameter Expansion
-+@subsection Shell Parameter Expansion
-+@cindex parameter expansion
-+@cindex expansion, parameter
-+
-+The @samp{$} character introduces parameter expansion,
-+command substitution, or arithmetic expansion.  The parameter name
-+or symbol to be expanded may be enclosed in braces, which
-+are optional but serve to protect the variable to be expanded from
-+characters immediately following it which could be
-+interpreted as part of the name.
-+
-+When braces are used, the matching ending brace is the first @samp{@}}
-+not escaped by a backslash or within a quoted string, and not within an
-+embedded arithmetic expansion, command substitution, or parameter
-+expansion.
-+
-+The basic form of parameter expansion is $@{@var{parameter}@}.
-+The value of @var{parameter} is substituted.  The braces are required
-+when @var{parameter}
-+is a positional parameter with more than one digit,
-+or when @var{parameter}
-+is followed by a character that is not to be
-+interpreted as part of its name.
-+
-+If the first character of @var{parameter} is an exclamation point,
-+a level of variable indirection is introduced.
-+Bash uses the value of the variable formed from the rest of
-+@var{parameter} as the name of the variable; this variable is then
-+expanded and that value is used in the rest of the substitution, rather
-+than the value of @var{parameter} itself.
-+This is known as @code{indirect expansion}.
-+The exceptions to this are the expansions of $@{!@var{prefix*}@}
-+and $@{!@var{name}[@@]@}
-+described below.
-+The exclamation point must immediately follow the left brace in order to
-+introduce indirection.
-+
-+In each of the cases below, @var{word} is subject to tilde expansion,
-+parameter expansion, command substitution, and arithmetic expansion.
-+
-+When not performing substring expansion, Bash tests for a parameter
-+that is unset or null; omitting the colon results in a test only for a
-+parameter that is unset.  Put another way, if the colon is included,
-+the operator tests for both existence and that the value is not null;
-+if the colon is omitted, the operator tests only for existence.
-+
-+@table @code
-+
-+@item $@{@var{parameter}:@minus{}@var{word}@}
-+If @var{parameter} is unset or null, the expansion of
-+@var{word} is substituted.  Otherwise, the value of
-+@var{parameter} is substituted.
-+
-+@item $@{@var{parameter}:=@var{word}@}
-+If @var{parameter}
-+is unset or null, the expansion of @var{word}
-+is assigned to @var{parameter}.
-+The value of @var{parameter} is then substituted. 
-+Positional parameters and special parameters may not be assigned to
-+in this way.
-+
-+@item $@{@var{parameter}:?@var{word}@}
-+If @var{parameter}
-+is null or unset, the expansion of @var{word} (or a message
-+to that effect if @var{word}
-+is not present) is written to the standard error and the shell, if it
-+is not interactive, exits.  Otherwise, the value of @var{parameter} is
-+substituted.
-+
-+@item $@{@var{parameter}:+@var{word}@}
-+If @var{parameter}
-+is null or unset, nothing is substituted, otherwise the expansion of
-+@var{word} is substituted.
-+
-+@item $@{@var{parameter}:@var{offset}@}
-+@itemx $@{@var{parameter}:@var{offset}:@var{length}@}
-+Expands to up to @var{length} characters of @var{parameter}
-+starting at the character specified by @var{offset}.
-+If @var{length} is omitted, expands to the substring of
-+@var{parameter} starting at the character specified by @var{offset}.
-+@var{length} and @var{offset} are arithmetic expressions
-+(@pxref{Shell Arithmetic}).
-+This is referred to as Substring Expansion.
-+
-+@var{length} must evaluate to a number greater than or equal to zero.
-+If @var{offset} evaluates to a number less than zero, the value
-+is used as an offset from the end of the value of @var{parameter}.
-+If @var{parameter} is @samp{@@}, the result is @var{length} positional
-+parameters beginning at @var{offset}.
-+If @var{parameter} is an array name indexed by @samp{@@} or @samp{*},
-+the result is the @var{length}
-+members of the array beginning with @code{$@{@var{parameter}[@var{offset}]@}}.
-+A negative @var{offset} is taken relative to one greater than the maximum
-+index of the specified array.
-+Note that a negative offset must be separated from the colon by at least
-+one space to avoid being confused with the @samp{:-} expansion.
-+Substring indexing is zero-based unless the positional parameters
-+are used, in which case the indexing starts at 1.
-+
-+@item $@{!@var{prefix}*@}
-+@itemx $@{!@var{prefix}@@@}
-+Expands to the names of variables whose names begin with @var{prefix},
-+separated by the first character of the @env{IFS} special variable.
-+
-+@item $@{!@var{name}[@@]@}
-+@itemx $@{!@var{name}[*]@}
-+If @var{name} is an array variable, expands to the list of array indices
-+(keys) assigned in @var{name}.
-+If @var{name} is not an array, expands to 0 if @var{name} is set and null
-+otherwise.
-+When @samp{@@} is used and the expansion appears within double quotes, each
-+key expands to a separate word.
-+
-+@item $@{#@var{parameter}@}
-+The length in characters of the expanded value of @var{parameter} is
-+substituted.
-+If @var{parameter} is @samp{*} or @samp{@@}, the value substituted
-+is the number of positional parameters.
-+If @var{parameter} is an array name subscripted by @samp{*} or @samp{@@}, 
-+the value substituted is the number of elements in the array.
-+
-+@item $@{@var{parameter}#@var{word}@}
-+@itemx $@{@var{parameter}##@var{word}@}
-+The @var{word}
-+is expanded to produce a pattern just as in filename
-+expansion (@pxref{Filename Expansion}).  If the pattern matches
-+the beginning of the expanded value of @var{parameter},
-+then the result of the expansion is the expanded value of @var{parameter}
-+with the shortest matching pattern (the @samp{#} case) or the
-+longest matching pattern (the @samp{##} case) deleted.
-+If @var{parameter} is @samp{@@} or @samp{*},
-+the pattern removal operation is applied to each positional
-+parameter in turn, and the expansion is the resultant list.
-+If @var{parameter} is an array variable subscripted with
-+@samp{@@} or @samp{*},
-+the pattern removal operation is applied to each member of the
-+array in turn, and the expansion is the resultant list.
-+
-+@item $@{@var{parameter}%@var{word}@}
-+@itemx $@{@var{parameter}%%@var{word}@}
-+The @var{word} is expanded to produce a pattern just as in
-+filename expansion.
-+If the pattern matches a trailing portion of the expanded value of
-+@var{parameter}, then the result of the expansion is the value of
-+@var{parameter} with the shortest matching pattern (the @samp{%} case)
-+or the longest matching pattern (the @samp{%%} case) deleted.
-+If @var{parameter} is @samp{@@} or @samp{*},
-+the pattern removal operation is applied to each positional
-+parameter in turn, and the expansion is the resultant list.
-+If @var{parameter}
-+is an array variable subscripted with @samp{@@} or @samp{*},
-+the pattern removal operation is applied to each member of the
-+array in turn, and the expansion is the resultant list.
-+
-+@item $@{@var{parameter}/@var{pattern}/@var{string}@} 
-+
-+The @var{pattern} is expanded to produce a pattern just as in
-+filename expansion.
-+@var{Parameter} is expanded and the longest match of @var{pattern}
-+against its value is replaced with @var{string}.
-+If @var{pattern} begins with @samp{/}, all matches of @var{pattern} are
-+replaced with @var{string}.  Normally only the first match is replaced.
-+If @var{pattern} begins with @samp{#}, it must match at the beginning
-+of the expanded value of @var{parameter}.
-+If @var{pattern} begins with @samp{%}, it must match at the end
-+of the expanded value of @var{parameter}.
-+If @var{string} is null, matches of @var{pattern} are deleted
-+and the @code{/} following @var{pattern} may be omitted.
-+If @var{parameter} is @samp{@@} or @samp{*},
-+the substitution operation is applied to each positional
-+parameter in turn, and the expansion is the resultant list.
-+If @var{parameter}
-+is an array variable subscripted with @samp{@@} or @samp{*},
-+the substitution operation is applied to each member of the
-+array in turn, and the expansion is the resultant list.
-+
-+@end table
-+
-+@node Command Substitution
-+@subsection Command Substitution
-+@cindex command substitution
-+
-+Command substitution allows the output of a command to replace
-+the command itself.
-+Command substitution occurs when a command is enclosed as follows:
-+@example
-+$(@var{command})
-+@end example
-+@noindent
-+or
-+@example
-+`@var{command}`
-+@end example
-+
-+@noindent
-+Bash performs the expansion by executing @var{command} and
-+replacing the command substitution with the standard output of the
-+command, with any trailing newlines deleted.
-+Embedded newlines are not deleted, but they may be removed during
-+word splitting.
-+The command substitution @code{$(cat @var{file})} can be
-+replaced by the equivalent but faster @code{$(< @var{file})}.
-+
-+When the old-style backquote form of substitution is used,
-+backslash retains its literal meaning except when followed by
-+@samp{$}, @samp{`}, or @samp{\}. 
-+The first backquote not preceded by a backslash terminates the
-+command substitution.
-+When using the @code{$(@var{command})} form, all characters between
-+the parentheses make up the command; none are treated specially.
-+
-+Command substitutions may be nested.  To nest when using the backquoted
-+form, escape the inner backquotes with backslashes.
-+
-+If the substitution appears within double quotes, word splitting and
-+filename expansion are not performed on the results.
-+
-+@node Arithmetic Expansion
-+@subsection Arithmetic Expansion
-+@cindex expansion, arithmetic
-+@cindex arithmetic expansion
-+
-+Arithmetic expansion allows the evaluation of an arithmetic expression
-+and the substitution of the result.  The format for arithmetic expansion is:
-+
-+@example
-+$(( @var{expression} ))
-+@end example
-+
-+The expression is treated as if it were within double quotes, but
-+a double quote inside the parentheses is not treated specially.
-+All tokens in the expression undergo parameter expansion, command
-+substitution, and quote removal.
-+Arithmetic expansions may be nested. 
-+
-+The evaluation is performed according to the rules listed below
-+(@pxref{Shell Arithmetic}).
-+If the expression is invalid, Bash prints a message indicating
-+failure to the standard error and no substitution occurs.
-+
-+@node Process Substitution
-+@subsection Process Substitution
-+@cindex process substitution
-+
-+Process substitution is supported on systems that support named
-+pipes (@sc{fifo}s) or the @file{/dev/fd} method of naming open files.
-+It takes the form of 
-+@example
-+<(@var{list})
-+@end example
-+@noindent
-+or
-+@example
-+>(@var{list})
-+@end example
-+@noindent
-+The process @var{list} is run with its input or output connected to a
-+@sc{fifo} or some file in @file{/dev/fd}.  The name of this file is
-+passed as an argument to the current command as the result of the
-+expansion.  If the @code{>(@var{list})} form is used, writing to
-+the file will provide input for @var{list}.  If the
-+@code{<(@var{list})} form is used, the file passed as an
-+argument should be read to obtain the output of @var{list}.
-+Note that no space may appear between the @code{<} or @code{>}
-+and the left parenthesis, otherwise the construct would be interpreted
-+as a redirection.
-+
-+When available, process substitution is performed simultaneously with
-+parameter and variable expansion, command substitution, and arithmetic
-+expansion.
-+
-+@node Word Splitting
-+@subsection Word Splitting
-+@cindex word splitting
-+
-+The shell scans the results of parameter expansion, command substitution,
-+and arithmetic expansion that did not occur within double quotes for
-+word splitting.
-+
-+The shell treats each character of @env{$IFS}
-+as a delimiter, and splits the results of the other
-+expansions into words on these characters.  If
-+@env{IFS} is unset, or its value is exactly @code{<space><tab><newline>},
-+the default, then any sequence of @env{IFS}
-+characters serves to delimit words.  If @env{IFS}
-+has a value other than the default, then sequences of
-+the whitespace characters @code{space} and @code{tab}
-+are ignored at the beginning and end of the
-+word, as long as the whitespace character is in the
-+value of @env{IFS} (an @env{IFS} whitespace character).
-+Any character in @env{IFS} that is not @env{IFS}
-+whitespace, along with any adjacent @env{IFS}
-+whitespace characters, delimits a field.  A sequence of @env{IFS}
-+whitespace characters is also treated as a delimiter.
-+If the value of @env{IFS} is null, no word splitting occurs.
-+
-+Explicit null arguments (@code{""} or @code{''}) are retained.
-+Unquoted implicit null arguments, resulting from the expansion of
-+parameters that have no values, are removed.
-+If a parameter with no value is expanded within double quotes, a
-+null argument results and is retained.
-+
-+Note that if no expansion occurs, no splitting
-+is performed.
-+
-+@node Filename Expansion
-+@subsection Filename Expansion
-+@menu
-+* Pattern Matching::	How the shell matches patterns.
-+@end menu
-+@cindex expansion, filename
-+@cindex expansion, pathname
-+@cindex filename expansion
-+@cindex pathname expansion
-+
-+After word splitting, unless the @option{-f} option has been set
-+(@pxref{The Set Builtin}), Bash scans each word for the characters
-+@samp{*}, @samp{?}, and @samp{[}.
-+If one of these characters appears, then the word is
-+regarded as a @var{pattern},
-+and replaced with an alphabetically sorted list of
-+file names matching the pattern. If no matching file names are found,
-+and the shell option @code{nullglob} is disabled, the word is left
-+unchanged.
-+If the @code{nullglob} option is set, and no matches are found, the word
-+is removed.
-+If the @code{failglob} shell option is set, and no matches are found,
-+an error message is printed and the command is not executed.
-+If the shell option @code{nocaseglob} is enabled, the match is performed
-+without regard to the case of alphabetic characters.
-+
-+When a pattern is used for filename generation, the character @samp{.}
-+at the start of a filename or immediately following a slash
-+must be matched explicitly, unless the shell option @code{dotglob} is set.
-+When matching a file name, the slash character must always be
-+matched explicitly.
-+In other cases, the @samp{.} character is not treated specially.
-+
-+See the description of @code{shopt} in @ref{Bash Builtins},
-+for a description of the @code{nocaseglob}, @code{nullglob},
-+@code{failglob}, and @code{dotglob} options.
-+
-+The @env{GLOBIGNORE}
-+shell variable may be used to restrict the set of filenames matching a
-+pattern.  If @env{GLOBIGNORE}
-+is set, each matching filename that also matches one of the patterns in
-+@env{GLOBIGNORE} is removed from the list of matches.  The filenames
-+@file{.} and @file{..}
-+are always ignored when @env{GLOBIGNORE}
-+is set and not null.
-+However, setting @env{GLOBIGNORE} to a non-null value has the effect of
-+enabling the @code{dotglob}
-+shell option, so all other filenames beginning with a
-+@samp{.} will match.
-+To get the old behavior of ignoring filenames beginning with a
-+@samp{.}, make @samp{.*} one of the patterns in @env{GLOBIGNORE}.
-+The @code{dotglob} option is disabled when @env{GLOBIGNORE}
-+is unset.
-+
-+@node Pattern Matching
-+@subsubsection Pattern Matching
-+@cindex pattern matching
-+@cindex matching, pattern
-+
-+Any character that appears in a pattern, other than the special pattern
-+characters described below, matches itself.
-+The @sc{nul} character may not occur in a pattern.
-+A backslash escapes the following character; the
-+escaping backslash is discarded when matching.
-+The special pattern characters must be quoted if they are to be matched
-+literally.
-+
-+The special pattern characters have the following meanings:
-+@table @code
-+@item *
-+Matches any string, including the null string.
-+@item ?
-+Matches any single character.
-+@item [@dots{}]
-+Matches any one of the enclosed characters.  A pair of characters
-+separated by a hyphen denotes a @var{range expression};
-+any character that sorts between those two characters, inclusive,
-+using the current locale's collating sequence and character set,
-+is matched.  If the first character following the
-+@samp{[} is a @samp{!}  or a @samp{^}
-+then any character not enclosed is matched.  A @samp{@minus{}}
-+may be matched by including it as the first or last character
-+in the set.  A @samp{]} may be matched by including it as the first
-+character in the set.
-+The sorting order of characters in range expressions is determined by
-+the current locale and the value of the @env{LC_COLLATE} shell variable,
-+if set.
-+
-+For example, in the default C locale, @samp{[a-dx-z]} is equivalent to
-+@samp{[abcdxyz]}.  Many locales sort characters in dictionary order, and in
-+these locales @samp{[a-dx-z]} is typically not equivalent to @samp{[abcdxyz]};
-+it might be equivalent to @samp{[aBbCcDdxXyYz]}, for example.  To obtain
-+the traditional interpretation of ranges in bracket expressions, you can
-+force the use of the C locale by setting the @env{LC_COLLATE} or
-+@env{LC_ALL} environment variable to the value @samp{C}.
-+
-+Within @samp{[} and @samp{]}, @var{character classes} can be specified
-+using the syntax
-+@code{[:}@var{class}@code{:]}, where @var{class} is one of the
-+following classes defined in the @sc{posix} standard:
-+@example
-+alnum   alpha   ascii   blank   cntrl   digit   graph   lower
-+print   punct   space   upper   word    xdigit
-+@end example
-+@noindent
-+A character class matches any character belonging to that class.
-+The @code{word} character class matches letters, digits, and the character
-+@samp{_}.
-+
-+Within @samp{[} and @samp{]}, an @var{equivalence class} can be
-+specified using the syntax @code{[=}@var{c}@code{=]}, which
-+matches all characters with the same collation weight (as defined
-+by the current locale) as the character @var{c}.
-+
-+Within @samp{[} and @samp{]}, the syntax @code{[.}@var{symbol}@code{.]}
-+matches the collating symbol @var{symbol}.
-+@end table
-+
-+If the @code{extglob} shell option is enabled using the @code{shopt}
-+builtin, several extended pattern matching operators are recognized.
-+In the following description, a @var{pattern-list} is a list of one
-+or more patterns separated by a @samp{|}.
-+Composite patterns may be formed using one or more of the following
-+sub-patterns:
-+
-+@table @code
-+@item ?(@var{pattern-list})
-+Matches zero or one occurrence of the given patterns.
-+
-+@item *(@var{pattern-list})
-+Matches zero or more occurrences of the given patterns.
-+
-+@item +(@var{pattern-list})
-+Matches one or more occurrences of the given patterns.
-+
-+@item @@(@var{pattern-list})
-+Matches one of the given patterns.
-+
-+@item !(@var{pattern-list})
-+Matches anything except one of the given patterns.
-+@end table
-+
-+@node Quote Removal
-+@subsection Quote Removal
-+
-+After the preceding expansions, all unquoted occurrences of the
-+characters @samp{\}, @samp{'}, and @samp{"} that did not
-+result from one of the above expansions are removed.
-+
-+@node Redirections
-+@section Redirections
-+@cindex redirection
-+
-+Before a command is executed, its input and output
-+may be @var{redirected}
-+using a special notation interpreted by the shell.
-+Redirection may also be used to open and close files for the
-+current shell execution environment.  The following redirection
-+operators may precede or appear anywhere within a
-+simple command or may follow a command.
-+Redirections are processed in the order they appear, from
-+left to right.
-+
-+In the following descriptions, if the file descriptor number is
-+omitted, and the first character of the redirection operator is
-+@samp{<}, the redirection refers to the standard input (file
-+descriptor 0).  If the first character of the redirection operator
-+is @samp{>}, the redirection refers to the standard output (file
-+descriptor 1).
-+
-+The word following the redirection operator in the following
-+descriptions, unless otherwise noted, is subjected to brace expansion,
-+tilde expansion, parameter expansion, command substitution, arithmetic
-+expansion, quote removal, filename expansion, and word splitting.
-+If it expands to more than one word, Bash reports an error.
-+
-+Note that the order of redirections is significant.  For example,
-+the command
-+@example
-+ls > @var{dirlist} 2>&1
-+@end example
-+@noindent
-+directs both standard output (file descriptor 1) and standard error
-+(file descriptor 2) to the file @var{dirlist}, while the command
-+@example
-+ls 2>&1 > @var{dirlist}
-+@end example
-+@noindent
-+directs only the standard output to file @var{dirlist},
-+because the standard error was duplicated as standard output
-+before the standard output was redirected to @var{dirlist}.
-+
-+Bash handles several filenames specially when they are used in
-+redirections, as described in the following table:
-+
-+@table @code
-+@item /dev/fd/@var{fd}
-+If @var{fd} is a valid integer, file descriptor @var{fd} is duplicated.
-+
-+@item /dev/stdin
-+File descriptor 0 is duplicated.
-+
-+@item /dev/stdout
-+File descriptor 1 is duplicated.
-+
-+@item /dev/stderr
-+File descriptor 2 is duplicated.
-+
-+@item /dev/tcp/@var{host}/@var{port}
-+If @var{host} is a valid hostname or Internet address, and @var{port}
-+is an integer port number or service name, Bash attempts to open a TCP
-+connection to the corresponding socket.
-+
-+@item /dev/udp/@var{host}/@var{port}
-+If @var{host} is a valid hostname or Internet address, and @var{port}
-+is an integer port number or service name, Bash attempts to open a UDP
-+connection to the corresponding socket.
-+
-+@end table
-+
-+A failure to open or create a file causes the redirection to fail.
-+
-+Redirections using file descriptors greater than 9 should be used with
-+care, as they may conflict with file descriptors the shell uses
-+internally.
-+
-+@subsection Redirecting Input
-+Redirection of input causes the file whose name results from
-+the expansion of @var{word}
-+to be opened for reading on file descriptor @code{n},
-+or the standard input (file descriptor 0) if @code{n}
-+is not specified.
-+
-+The general format for redirecting input is:
-+@example
-+[@var{n}]<@var{word}
-+@end example
-+
-+@subsection Redirecting Output
-+Redirection of output causes the file whose name results from
-+the expansion of @var{word}
-+to be opened for writing on file descriptor @var{n},
-+or the standard output (file descriptor 1) if @var{n}
-+is not specified.  If the file does not exist it is created;
-+if it does exist it is truncated to zero size.
-+
-+The general format for redirecting output is:
-+@example
-+[@var{n}]>[|]@var{word}
-+@end example
-+
-+If the redirection operator is @samp{>}, and the @code{noclobber}
-+option to the @code{set} builtin has been enabled, the redirection
-+will fail if the file whose name results from the expansion of
-+@var{word} exists and is a regular file.
-+If the redirection operator is @samp{>|}, or the redirection operator is
-+@samp{>} and the @code{noclobber} option is not enabled, the redirection
-+is attempted even if the file named by @var{word} exists.
-+
-+@subsection Appending Redirected Output
-+Redirection of output in this fashion
-+causes the file whose name results from
-+the expansion of @var{word}
-+to be opened for appending on file descriptor @var{n},
-+or the standard output (file descriptor 1) if @var{n}
-+is not specified.  If the file does not exist it is created.
-+
-+The general format for appending output is:
-+@example
-+[@var{n}]>>@var{word}
-+@end example
-+
-+@subsection Redirecting Standard Output and Standard Error
-+Bash allows both the
-+standard output (file descriptor 1) and
-+the standard error output (file descriptor 2)
-+to be redirected to the file whose name is the
-+expansion of @var{word} with this construct.
-+
-+There are two formats for redirecting standard output and
-+standard error:
-+@example
-+&>@var{word}
-+@end example
-+@noindent
-+and
-+@example
-+>&@var{word}
-+@end example
-+@noindent
-+Of the two forms, the first is preferred.
-+This is semantically equivalent to
-+@example
-+>@var{word} 2>&1
-+@end example
-+
-+@subsection Here Documents
-+This type of redirection instructs the shell to read input from the
-+current source until a line containing only @var{word}
-+(with no trailing blanks) is seen.  All of
-+the lines read up to that point are then used as the standard
-+input for a command.
-+
-+The format of here-documents is:
-+@example
-+<<[@minus{}]@var{word}
-+        @var{here-document}
-+@var{delimiter}
-+@end example
-+
-+No parameter expansion, command substitution, arithmetic expansion,
-+or filename expansion is performed on
-+@var{word}.  If any characters in @var{word} are quoted, the
-+@var{delimiter} is the result of quote removal on @var{word},
-+and the lines in the here-document are not expanded.
-+If @var{word} is unquoted,
-+all lines of the here-document are subjected to parameter expansion,
-+command substitution, and arithmetic expansion.  In the latter
-+case, the character sequence @code{\newline} is ignored, and @samp{\}
-+must be used to quote the characters
-+@samp{\}, @samp{$}, and @samp{`}.
-+
-+If the redirection operator is @samp{<<-},
-+then all leading tab characters are stripped from input lines and the
-+line containing @var{delimiter}.
-+This allows here-documents within shell scripts to be indented in a
-+natural fashion.
-+
-+@subsection Here Strings
-+A variant of here documents, the format is:
-+@example
-+<<< @var{word}
-+@end example
-+
-+The @var{word} is expanded and supplied to the command on its standard
-+input.
-+
-+@subsection Duplicating File Descriptors
-+The redirection operator
-+@example
-+[@var{n}]<&@var{word}
-+@end example
-+@noindent
-+is used to duplicate input file descriptors.
-+If @var{word}
-+expands to one or more digits, the file descriptor denoted by @var{n}
-+is made to be a copy of that file descriptor.
-+If the digits in @var{word} do not specify a file descriptor open for
-+input, a redirection error occurs.
-+If @var{word}
-+evaluates to @samp{-}, file descriptor @var{n} is closed.  If
-+@var{n} is not specified, the standard input (file descriptor 0) is used.
-+
-+The operator
-+@example
-+[@var{n}]>&@var{word}
-+@end example
-+@noindent
-+is used similarly to duplicate output file descriptors.  If
-+@var{n} is not specified, the standard output (file descriptor 1) is used.
-+If the digits in @var{word} do not specify a file descriptor open for
-+output, a redirection error occurs.
-+As a special case, if @var{n} is omitted, and @var{word} does not
-+expand to one or more digits, the standard output and standard
-+error are redirected as described previously.
-+
-+@subsection Moving File Descriptors
-+The redirection operator
-+@example
-+[@var{n}]<&@var{digit}-
-+@end example
-+@noindent
-+moves the file descriptor @var{digit} to file descriptor @var{n},
-+or the standard input (file descriptor 0) if @var{n} is not specified.
-+@var{digit} is closed after being duplicated to @var{n}.
-+
-+Similarly, the redirection operator
-+@example
-+[@var{n}]>&@var{digit}-
-+@end example
-+@noindent
-+moves the file descriptor @var{digit} to file descriptor @var{n},
-+or the standard output (file descriptor 1) if @var{n} is not specified.
-+
-+@subsection Opening File Descriptors for Reading and Writing
-+The redirection operator
-+@example
-+[@var{n}]<>@var{word}
-+@end example
-+@noindent
-+causes the file whose name is the expansion of @var{word}
-+to be opened for both reading and writing on file descriptor
-+@var{n}, or on file descriptor 0 if @var{n}
-+is not specified.  If the file does not exist, it is created.
-+
-+@node Executing Commands
-+@section Executing Commands
-+
-+@menu
-+* Simple Command Expansion::	How Bash expands simple commands before
-+				executing them.
-+* Command Search and Execution::	How Bash finds commands and runs them.
-+* Command Execution Environment::	The environment in which Bash
-+					executes commands that are not
-+					shell builtins.
-+* Environment::		The environment given to a command.
-+* Exit Status::		The status returned by commands and how Bash
-+			interprets it.
-+* Signals::		What happens when Bash or a command it runs
-+			receives a signal.
-+@end menu
-+
-+@node Simple Command Expansion
-+@subsection Simple Command Expansion
-+@cindex command expansion
-+
-+When a simple command is executed, the shell performs the following
-+expansions, assignments, and redirections, from left to right.
-+
-+@enumerate
-+@item
-+The words that the parser has marked as variable assignments (those
-+preceding the command name) and redirections are saved for later
-+processing.
-+
-+@item
-+The words that are not variable assignments or redirections are
-+expanded (@pxref{Shell Expansions}).
-+If any words remain after expansion, the first word
-+is taken to be the name of the command and the remaining words are
-+the arguments.
-+
-+@item
-+Redirections are performed as described above (@pxref{Redirections}).
-+
-+@item
-+The text after the @samp{=} in each variable assignment undergoes tilde
-+expansion, parameter expansion, command substitution, arithmetic expansion,
-+and quote removal before being assigned to the variable.
-+@end enumerate
-+
-+If no command name results, the variable assignments affect the current
-+shell environment.  Otherwise, the variables are added to the environment
-+of the executed command and do not affect the current shell environment.
-+If any of the assignments attempts to assign a value to a readonly variable,
-+an error occurs, and the command exits with a non-zero status.
-+
-+If no command name results, redirections are performed, but do not
-+affect the current shell environment.  A redirection error causes the
-+command to exit with a non-zero status.
-+
-+If there is a command name left after expansion, execution proceeds as
-+described below.  Otherwise, the command exits.  If one of the expansions
-+contained a command substitution, the exit status of the command is
-+the exit status of the last command substitution performed.  If there
-+were no command substitutions, the command exits with a status of zero.
-+
-+@node Command Search and Execution
-+@subsection Command Search and Execution
-+@cindex command execution
-+@cindex command search
-+
-+After a command has been split into words, if it results in a
-+simple command and an optional list of arguments, the following
-+actions are taken.
-+
-+@enumerate
-+@item
-+If the command name contains no slashes, the shell attempts to
-+locate it.  If there exists a shell function by that name, that
-+function is invoked as described in @ref{Shell Functions}.
-+
-+@item
-+If the name does not match a function, the shell searches for
-+it in the list of shell builtins.  If a match is found, that
-+builtin is invoked.
-+
-+@item
-+If the name is neither a shell function nor a builtin,
-+and contains no slashes, Bash searches each element of
-+@env{$PATH} for a directory containing an executable file
-+by that name.  Bash uses a hash table to remember the full
-+pathnames of executable files to avoid multiple @env{PATH} searches
-+(see the description of @code{hash} in @ref{Bourne Shell Builtins}).
-+A full search of the directories in @env{$PATH}
-+is performed only if the command is not found in the hash table.
-+If the search is unsuccessful, the shell prints an error
-+message and returns an exit status of 127.
-+
-+@item
-+If the search is successful, or if the command name contains
-+one or more slashes, the shell executes the named program in
-+a separate execution environment.
-+Argument 0 is set to the name given, and the remaining arguments
-+to the command are set to the arguments supplied, if any.
-+
-+@item
-+If this execution fails because the file is not in executable
-+format, and the file is not a directory, it is assumed to be a
-+@var{shell script} and the shell executes it as described in
-+@ref{Shell Scripts}.
-+
-+@item
-+If the command was not begun asynchronously, the shell waits for
-+the command to complete and collects its exit status.
-+
-+@end enumerate
-+
-+@node Command Execution Environment
-+@subsection Command Execution Environment
-+@cindex execution environment
-+
-+The shell has an @var{execution environment}, which consists of the
-+following:
-+
-+@itemize @bullet
-+@item
-+open files inherited by the shell at invocation, as modified by
-+redirections supplied to the @code{exec} builtin
-+
-+@item
-+the current working directory as set by @code{cd}, @code{pushd}, or
-+@code{popd}, or inherited by the shell at invocation
-+
-+@item
-+the file creation mode mask as set by @code{umask} or inherited from
-+the shell's parent
-+
-+@item
-+current traps set by @code{trap}
-+
-+@item
-+shell parameters that are set by variable assignment or with @code{set}
-+or inherited from the shell's parent in the environment
-+
-+@item
-+shell functions defined during execution or inherited from the shell's
-+parent in the environment
-+
-+@item
-+options enabled at invocation (either by default or with command-line
-+arguments) or by @code{set}
-+
-+@item
-+options enabled by @code{shopt}
-+
-+@item
-+shell aliases defined with @code{alias} (@pxref{Aliases})
-+
-+@item
-+various process @sc{id}s, including those of background jobs
-+(@pxref{Lists}), the value of @code{$$}, and the value of
-+@env{$PPID}
-+
-+@end itemize
-+
-+When a simple command other than a builtin or shell function
-+is to be executed, it
-+is invoked in a separate execution environment that consists of
-+the following.  Unless otherwise noted, the values are inherited
-+from the shell.
-+
-+@itemize @bullet
-+@item
-+the shell's open files, plus any modifications and additions specified
-+by redirections to the command
-+
-+@item
-+the current working directory
-+
-+@item
-+the file creation mode mask
-+
-+@item
-+shell variables and functions marked for export, along with variables
-+exported for the command, passed in the environment (@pxref{Environment})
-+
-+@item
-+traps caught by the shell are reset to the values inherited from the
-+shell's parent, and traps ignored by the shell are ignored
-+
-+@end itemize
-+
-+A command invoked in this separate environment cannot affect the
-+shell's execution environment. 
-+
-+Command substitution, commands grouped with parentheses,
-+and asynchronous commands are invoked in a
-+subshell environment that is a duplicate of the shell environment,
-+except that traps caught by the shell are reset to the values
-+that the shell inherited from its parent at invocation.  Builtin
-+commands that are invoked as part of a pipeline are also executed
-+in a subshell environment.  Changes made to the subshell environment
-+cannot affect the shell's execution environment.
-+
-+If a command is followed by a @samp{&} and job control is not active, the
-+default standard input for the command is the empty file @file{/dev/null}.
-+Otherwise, the invoked command inherits the file descriptors of the calling
-+shell as modified by redirections.
-+
-+@node Environment
-+@subsection Environment
-+@cindex environment
-+
-+When a program is invoked it is given an array of strings
-+called the @var{environment}.
-+This is a list of name-value pairs, of the form @code{name=value}.
-+
-+Bash provides several ways to manipulate the environment.
-+On invocation, the shell scans its own environment and
-+creates a parameter for each name found, automatically marking
-+it for @var{export}
-+to child processes.  Executed commands inherit the environment.
-+The @code{export} and @samp{declare -x}
-+commands allow parameters and functions to be added to and
-+deleted from the environment.  If the value of a parameter
-+in the environment is modified, the new value becomes part
-+of the environment, replacing the old.  The environment
-+inherited by any executed command consists of the shell's
-+initial environment, whose values may be modified in the shell,
-+less any pairs removed by the @code{unset} and @samp{export -n}
-+commands, plus any additions via the @code{export} and
-+@samp{declare -x} commands.
-+
-+The environment for any simple command
-+or function may be augmented temporarily by prefixing it with
-+parameter assignments, as described in @ref{Shell Parameters}.
-+These assignment statements affect only the environment seen
-+by that command.
-+
-+If the @option{-k} option is set (@pxref{The Set Builtin}), then all
-+parameter assignments are placed in the environment for a command,
-+not just those that precede the command name.
-+
-+When Bash invokes an external command, the variable @samp{$_}
-+is set to the full path name of the command and passed to that
-+command in its environment.
-+
-+@node Exit Status
-+@subsection Exit Status
-+@cindex exit status
-+
-+For the shell's purposes, a command which exits with a
-+zero exit status has succeeded.
-+A non-zero exit status indicates failure.
-+This seemingly counter-intuitive scheme is used so there
-+is one well-defined way to indicate success and a variety of
-+ways to indicate various failure modes.
-+When a command terminates on a fatal signal whose number is @var{N},
-+Bash uses the value 128+@var{N} as the exit status.
-+
-+If a command is not found, the child process created to
-+execute it returns a status of 127.  If a command is found  
-+but is not executable, the return status is 126.
-+
-+If a command fails because of an error during expansion or redirection,
-+the exit status is greater than zero.
-+
-+The exit status is used by the Bash conditional commands
-+(@pxref{Conditional Constructs}) and some of the list
-+constructs (@pxref{Lists}).
-+
-+All of the Bash builtins return an exit status of zero if they succeed
-+and a non-zero status on failure, so they may be used by the
-+conditional and list constructs.
-+All builtins return an exit status of 2 to indicate incorrect usage.
-+
-+@node Signals
-+@subsection Signals
-+@cindex signal handling
-+
-+When Bash is interactive, in the absence of any traps, it ignores
-+@code{SIGTERM} (so that @samp{kill 0} does not kill an interactive shell),
-+and @code{SIGINT}
-+is caught and handled (so that the @code{wait} builtin is interruptible).
-+When Bash receives a @code{SIGINT}, it breaks out of any executing loops.
-+In all cases, Bash ignores @code{SIGQUIT}.
-+If job control is in effect (@pxref{Job Control}), Bash
-+ignores @code{SIGTTIN}, @code{SIGTTOU}, and @code{SIGTSTP}.
-+
-+Non-builtin commands started by Bash have signal handlers set to the
-+values inherited by the shell from its parent.
-+When job control is not in effect, asynchronous commands
-+ignore @code{SIGINT} and @code{SIGQUIT} in addition to these inherited
-+handlers.
-+Commands run as a result of
-+command substitution ignore the keyboard-generated job control signals
-+@code{SIGTTIN}, @code{SIGTTOU}, and @code{SIGTSTP}.
-+
-+The shell exits by default upon receipt of a @code{SIGHUP}.
-+Before exiting, an interactive shell resends the @code{SIGHUP} to
-+all jobs, running or stopped.
-+Stopped jobs are sent @code{SIGCONT} to ensure that they receive
-+the @code{SIGHUP}.
-+To prevent the shell from sending the @code{SIGHUP} signal to a
-+particular job, it should be removed
-+from the jobs table with the @code{disown}
-+builtin (@pxref{Job Control Builtins}) or marked
-+to not receive @code{SIGHUP} using @code{disown -h}.
-+
-+If the  @code{huponexit} shell option has been set with @code{shopt}
-+(@pxref{Bash Builtins}), Bash sends a @code{SIGHUP} to all jobs when
-+an interactive login shell exits.
-+
-+If Bash is waiting for a command to complete and receives a signal
-+for which a trap has been set, the trap will not be executed until
-+the command completes. 
-+When Bash is waiting for an asynchronous
-+command via the @code{wait} builtin, the reception of a signal for
-+which a trap has been set will cause the @code{wait} builtin to return
-+immediately with an exit status greater than 128, immediately after
-+which the trap is executed.
-+
-+@node Shell Scripts
-+@section Shell Scripts
-+@cindex shell script
-+
-+A shell script is a text file containing shell commands.  When such
-+a file is used as the first non-option argument when invoking Bash,
-+and neither the @option{-c} nor @option{-s} option is supplied
-+(@pxref{Invoking Bash}), 
-+Bash reads and executes commands from the file, then exits.  This
-+mode of operation creates a non-interactive shell.  The shell first
-+searches for the file in the current directory, and looks in the
-+directories in @env{$PATH} if not found there.
-+
-+When Bash runs
-+a shell script, it sets the special parameter @code{0} to the name
-+of the file, rather than the name of the shell, and the positional
-+parameters are set to the remaining arguments, if any are given.
-+If no additional arguments are supplied, the positional parameters
-+are unset.
-+
-+A shell script may be made executable by using the @code{chmod} command
-+to turn on the execute bit.  When Bash finds such a file while
-+searching the @env{$PATH} for a command, it spawns a subshell to
-+execute it.  In other words, executing
-+@example
-+filename @var{arguments}
-+@end example
-+@noindent
-+is equivalent to executing
-+@example
-+bash filename @var{arguments}
-+@end example
-+
-+@noindent
-+if @code{filename} is an executable shell script.
-+This subshell reinitializes itself, so that the effect is as if a
-+new shell had been invoked to interpret the script, with the
-+exception that the locations of commands remembered by the parent
-+(see the description of @code{hash} in @ref{Bourne Shell Builtins})
-+are retained by the child.
-+
-+Most versions of Unix make this a part of the operating system's command
-+execution mechanism.  If the first line of a script begins with
-+the two characters @samp{#!}, the remainder of the line specifies
-+an interpreter for the program.
-+Thus, you can specify Bash, @code{awk}, Perl, or some other
-+interpreter and write the rest of the script file in that language.
-+
-+The arguments to the interpreter
-+consist of a single optional argument following the interpreter
-+name on the first line of the script file, followed by the name of
-+the script file, followed by the rest of the arguments.  Bash
-+will perform this action on operating systems that do not handle it
-+themselves.  Note that some older versions of Unix limit the interpreter
-+name and argument to a maximum of 32 characters.
-+
-+Bash scripts often begin with @code{#! /bin/bash} (assuming that
-+Bash has been installed in @file{/bin}), since this ensures that
-+Bash will be used to interpret the script, even if it is executed
-+under another shell.
-+
-+@node Shell Builtin Commands
-+@chapter Shell Builtin Commands
-+
-+@menu
-+* Bourne Shell Builtins::	Builtin commands inherited from the Bourne
-+				Shell.
-+* Bash Builtins::		Table of builtins specific to Bash.
-+* The Set Builtin::		This builtin is so overloaded it
-+				deserves its own section.
-+* Special Builtins::		Builtin commands classified specially by
-+				POSIX.
-+@end menu
-+
-+Builtin commands are contained within the shell itself.
-+When the name of a builtin command is used as the first word of
-+a simple command (@pxref{Simple Commands}), the shell executes
-+the command directly, without invoking another program.
-+Builtin commands are necessary to implement functionality impossible
-+or inconvenient to obtain with separate utilities.
-+
-+This section briefly describes the builtins which Bash inherits from
-+the Bourne Shell, as well as the builtin commands which are unique
-+to or have been extended in Bash.
-+
-+Several builtin commands are described in other chapters:  builtin
-+commands which provide the Bash interface to the job control
-+facilities (@pxref{Job Control Builtins}), the directory stack
-+(@pxref{Directory Stack Builtins}), the command history
-+(@pxref{Bash History Builtins}), and the programmable completion
-+facilities (@pxref{Programmable Completion Builtins}).
-+
-+Many of the builtins have been extended by @sc{posix} or Bash.
-+
-+Unless otherwise noted, each builtin command documented as accepting
-+options preceded by @samp{-} accepts @samp{--}
-+to signify the end of the options.
-+For example, the @code{:}, @code{true}, @code{false}, and @code{test}
-+builtins do not accept options.
-+
-+@node Bourne Shell Builtins
-+@section Bourne Shell Builtins
-+
-+The following shell builtin commands are inherited from the Bourne Shell.
-+These commands are implemented as specified by the @sc{posix} standard.
-+
-+@table @code
-+@item :    @r{(a colon)}
-+@btindex :
-+@example
-+: [@var{arguments}]
-+@end example
-+Do nothing beyond expanding @var{arguments} and performing redirections.
-+The return status is zero.
-+
-+@item .    @r{(a period)}
-+@btindex .
-+@example
-+. @var{filename} [@var{arguments}]
-+@end example
-+Read and execute commands from the @var{filename} argument in the
-+current shell context.  If @var{filename} does not contain a slash,
-+the @env{PATH} variable is used to find @var{filename}.
-+When Bash is not in @sc{posix} mode, the current directory is searched
-+if @var{filename} is not found in @env{$PATH}.
-+If any @var{arguments} are supplied, they become the positional
-+parameters when @var{filename} is executed.  Otherwise the positional
-+parameters are unchanged.
-+The return status is the exit status of the last command executed, or
-+zero if no commands are executed.  If @var{filename} is not found, or
-+cannot be read, the return status is non-zero.
-+This builtin is equivalent to @code{source}.
-+
-+@item break
-+@btindex break
-+@example
-+break [@var{n}]
-+@end example
-+Exit from a @code{for}, @code{while}, @code{until}, or @code{select} loop.
-+If @var{n} is supplied, the @var{n}th enclosing loop is exited.
-+@var{n} must be greater than or equal to 1.
-+The return status is zero unless @var{n} is not greater than or equal to 1.
-+
-+@item cd
-+@btindex cd
-+@example
-+cd [-L|-P] [@var{directory}]
-+@end example
-+Change the current working directory to @var{directory}.
-+If @var{directory} is not given, the value of the @env{HOME} shell
-+variable is used.
-+If the shell variable @env{CDPATH} exists, it is used as a search path.
-+If @var{directory} begins with a slash, @env{CDPATH} is not used.
-+
-+The @option{-P} option means to not follow symbolic links; symbolic
-+links are followed by default or with the @option{-L} option.
-+If @var{directory} is @samp{-}, it is equivalent to @env{$OLDPWD}.
-+
-+If a non-empty directory name from @env{CDPATH} is used, or if
-+@samp{-} is the first argument, and the directory change is
-+successful, the absolute pathname of the new working directory is
-+written to the standard output.
-+
-+The return status is zero if the directory is successfully changed,
-+non-zero otherwise.
-+
-+@item continue
-+@btindex continue
-+@example
-+continue [@var{n}]
-+@end example
-+Resume the next iteration of an enclosing @code{for}, @code{while},
-+@code{until}, or @code{select} loop.
-+If @var{n} is supplied, the execution of the @var{n}th enclosing loop
-+is resumed.
-+@var{n} must be greater than or equal to 1.
-+The return status is zero unless @var{n} is not greater than or equal to 1.
-+
-+@item eval
-+@btindex eval
-+@example
-+eval [@var{arguments}]
-+@end example
-+The arguments are concatenated together into a single command, which is
-+then read and executed, and its exit status returned as the exit status
-+of @code{eval}.
-+If there are no arguments or only empty arguments, the return status is
-+zero.
-+
-+@item exec
-+@btindex exec
-+@example
-+exec [-cl] [-a @var{name}] [@var{command} [@var{arguments}]]
-+@end example
-+If @var{command}
-+is supplied, it replaces the shell without creating a new process.
-+If the @option{-l} option is supplied, the shell places a dash at the
-+beginning of the zeroth arg passed to @var{command}.
-+This is what the @code{login} program does.
-+The @option{-c} option causes @var{command} to be executed with an empty
-+environment.
-+If @option{-a} is supplied, the shell passes @var{name} as the zeroth
-+argument to @var{command}.
-+If no @var{command} is specified, redirections may be used to affect
-+the current shell environment.  If there are no redirection errors, the
-+return status is zero; otherwise the return status is non-zero.
-+
-+@item exit
-+@btindex exit
-+@example
-+exit [@var{n}]
-+@end example
-+Exit the shell, returning a status of @var{n} to the shell's parent.
-+If @var{n} is omitted, the exit status is that of the last command executed.
-+Any trap on @code{EXIT} is executed before the shell terminates.
-+
-+@item export
-+@btindex export
-+@example
-+export [-fn] [-p] [@var{name}[=@var{value}]]
-+@end example
-+Mark each @var{name} to be passed to child processes
-+in the environment.  If the @option{-f} option is supplied, the @var{name}s
-+refer to shell functions; otherwise the names refer to shell variables.
-+The @option{-n} option means to no longer mark each @var{name} for export.
-+If no @var{names} are supplied, or if the @option{-p} option is given, a
-+list of exported names is displayed.
-+The @option{-p} option displays output in a form that may be reused as input.
-+If a variable name is followed by =@var{value}, the value of
-+the variable is set to @var{value}.
-+
-+The return status is zero unless an invalid option is supplied, one of
-+the names is not a valid shell variable name, or @option{-f} is supplied
-+with a name that is not a shell function.
-+
-+@item getopts
-+@btindex getopts
-+@example
-+getopts @var{optstring} @var{name} [@var{args}]
-+@end example
-+@code{getopts} is used by shell scripts to parse positional parameters.
-+@var{optstring} contains the option characters to be recognized; if a
-+character is followed by a colon, the option is expected to have an
-+argument, which should be separated from it by white space.
-+The colon (@samp{:}) and question mark (@samp{?}) may not be
-+used as option characters.
-+Each time it is invoked, @code{getopts}
-+places the next option in the shell variable @var{name}, initializing
-+@var{name} if it does not exist,
-+and the index of the next argument to be processed into the
-+variable @env{OPTIND}.
-+@env{OPTIND} is initialized to 1 each time the shell or a shell script
-+is invoked.
-+When an option requires an argument,
-+@code{getopts} places that argument into the variable @env{OPTARG}.
-+The shell does not reset @env{OPTIND} automatically; it must be manually
-+reset between multiple calls to @code{getopts} within the same shell
-+invocation if a new set of parameters is to be used.
-+
-+When the end of options is encountered, @code{getopts} exits with a
-+return value greater than zero.
-+@env{OPTIND} is set to the index of the first non-option argument,
-+and @code{name} is set to @samp{?}.
-+
-+@code{getopts}
-+normally parses the positional parameters, but if more arguments are
-+given in @var{args}, @code{getopts} parses those instead.
-+
-+@code{getopts} can report errors in two ways.  If the first character of
-+@var{optstring} is a colon, @var{silent}
-+error reporting is used.  In normal operation diagnostic messages
-+are printed when invalid options or missing option arguments are
-+encountered.
-+If the variable @env{OPTERR}
-+is set to 0, no error messages will be displayed, even if the first
-+character of @code{optstring} is not a colon.
-+
-+If an invalid option is seen,
-+@code{getopts} places @samp{?} into @var{name} and, if not silent,
-+prints an error message and unsets @env{OPTARG}.
-+If @code{getopts} is silent, the option character found is placed in
-+@env{OPTARG} and no diagnostic message is printed.
-+
-+If a required argument is not found, and @code{getopts}
-+is not silent, a question mark (@samp{?}) is placed in @var{name},
-+@code{OPTARG} is unset, and a diagnostic message is printed.
-+If @code{getopts} is silent, then a colon (@samp{:}) is placed in
-+@var{name} and @env{OPTARG} is set to the option character found.
-+
-+@item hash
-+@btindex hash
-+@example
-+hash [-r] [-p @var{filename}] [-dt] [@var{name}]
-+@end example
-+Remember the full pathnames of commands specified as @var{name} arguments,
-+so they need not be searched for on subsequent invocations.
-+The commands are found by searching through the directories listed in
-+@env{$PATH}.
-+The @option{-p} option inhibits the path search, and @var{filename} is
-+used as the location of @var{name}.
-+The @option{-r} option causes the shell to forget all remembered locations.
-+The @option{-d} option causes the shell to forget the remembered location
-+of each @var{name}.
-+If the @option{-t} option is supplied, the full pathname to which each
-+@var{name} corresponds is printed.  If multiple @var{name} arguments are
-+supplied with @option{-t} the @var{name} is printed before the hashed
-+full pathname.
-+The @option{-l} option causes output to be displayed in a format
-+that may be reused as input.
-+If no arguments are given, or if only @option{-l} is supplied,
-+information about remembered commands is printed.
-+The return status is zero unless a @var{name} is not found or an invalid
-+option is supplied.
-+
-+@item pwd
-+@btindex pwd
-+@example
-+pwd [-LP]
-+@end example
-+Print the absolute pathname of the current working directory.
-+If the @option{-P} option is supplied, the pathname printed will not
-+contain symbolic links.
-+If the @option{-L} option is supplied, the pathname printed may contain
-+symbolic links.
-+The return status is zero unless an error is encountered while
-+determining the name of the current directory or an invalid option
-+is supplied.
-+
-+@item readonly
-+@btindex readonly
-+@example
-+readonly [-apf] [@var{name}[=@var{value}]] @dots{}
-+@end example
-+Mark each @var{name} as readonly.
-+The values of these names may not be changed by subsequent assignment.
-+If the @option{-f} option is supplied, each @var{name} refers to a shell
-+function.
-+The @option{-a} option means each @var{name} refers to an array variable.
-+If no @var{name} arguments are given, or if the @option{-p}
-+option is supplied, a list of all readonly names is printed.
-+The @option{-p} option causes output to be displayed in a format that
-+may be reused as input.
-+If a variable name is followed by =@var{value}, the value of
-+the variable is set to @var{value}.
-+The return status is zero unless an invalid option is supplied, one of
-+the @var{name} arguments is not a valid shell variable or function name,
-+or the @option{-f} option is supplied with a name that is not a shell function.
-+
-+@item return
-+@btindex return
-+@example
-+return [@var{n}]
-+@end example
-+Cause a shell function to exit with the return value @var{n}.
-+If @var{n} is not supplied, the return value is the exit status of the
-+last command executed in the function.
-+This may also be used to terminate execution of a script being executed
-+with the @code{.} (or @code{source}) builtin, returning either @var{n} or
-+the exit status of the last command executed within the script as the exit
-+status of the script.
-+Any command associated with the @code{RETURN} trap is executed
-+before execution resumes after the function or script.
-+The return status is non-zero if @code{return} is used outside a function
-+and not during the execution of a script by @code{.} or @code{source}.
-+
-+@item shift
-+@btindex shift
-+@example
-+shift [@var{n}]
-+@end example
-+Shift the positional parameters to the left by @var{n}.
-+The positional parameters from @var{n}+1 @dots{} @code{$#} are
-+renamed to @code{$1} @dots{} @code{$#}-@var{n}+1.
-+Parameters represented by the numbers @code{$#} to @var{n}+1 are unset.
-+@var{n} must be a non-negative number less than or equal to @code{$#}.
-+If @var{n} is zero or greater than @code{$#}, the positional parameters
-+are not changed.
-+If @var{n} is not supplied, it is assumed to be 1.
-+The return status is zero unless @var{n} is greater than @code{$#} or
-+less than zero, non-zero otherwise.
-+
-+@item test
-+@itemx [
-+@btindex test
-+@btindex [
-+Evaluate a conditional expression @var{expr}.
-+Each operator and operand must be a separate argument.
-+Expressions are composed of the primaries described below in
-+@ref{Bash Conditional Expressions}.
-+@code{test} does not accept any options, nor does it accept and ignore
-+an argument of @option{--} as signifying the end of options.
-+
-+When the @code{[} form is used, the last argument to the command must
-+be a @code{]}.
-+
-+Expressions may be combined using the following operators, listed in
-+decreasing order of precedence.
-+
-+@table @code
-+@item ! @var{expr}
-+True if @var{expr} is false.
-+
-+@item ( @var{expr} )
-+Returns the value of @var{expr}.
-+This may be used to override the normal precedence of operators.
-+
-+@item @var{expr1} -a @var{expr2}
-+True if both @var{expr1} and @var{expr2} are true.
-+
-+@item @var{expr1} -o @var{expr2}
-+True if either @var{expr1} or @var{expr2} is true.
-+@end table
-+
-+The @code{test} and @code{[} builtins evaluate conditional
-+expressions using a set of rules based on the number of arguments.
-+
-+@table @asis
-+@item 0 arguments
-+The expression is false.
-+
-+@item 1 argument
-+The expression is true if and only if the argument is not null.
-+
-+@item 2 arguments
-+If the first argument is @samp{!}, the expression is true if and
-+only if the second argument is null.
-+If the first argument is one of the unary conditional operators
-+(@pxref{Bash Conditional Expressions}), the expression
-+is true if the unary test is true.
-+If the first argument is not a valid unary operator, the expression is
-+false.
-+
-+@item 3 arguments
-+If the second argument is one of the binary conditional
-+operators (@pxref{Bash Conditional Expressions}), the
-+result of the expression is the result of the binary test using the
-+first and third arguments as operands.
-+If the first argument is @samp{!}, the value is the negation of
-+the two-argument test using the second and third arguments.
-+If the first argument is exactly @samp{(} and the third argument is
-+exactly @samp{)}, the result is the one-argument test of the second
-+argument.
-+Otherwise, the expression is false.
-+The @samp{-a} and @samp{-o} operators are considered binary operators
-+in this case.  
-+
-+@item 4 arguments
-+If the first argument is @samp{!}, the result is the negation of
-+the three-argument expression composed of the remaining arguments.
-+Otherwise, the expression is parsed and evaluated according to 
-+precedence using the rules listed above.
-+
-+@item 5 or more arguments
-+The expression is parsed and evaluated according to precedence
-+using the rules listed above.
-+@end table
-+
-+@item times
-+@btindex times
-+@example
-+times
-+@end example
-+Print out the user and system times used by the shell and its children.
-+The return status is zero.
-+
-+@item trap
-+@btindex trap
-+@example
-+trap [-lp] [@var{arg}] [@var{sigspec} @dots{}]
-+@end example
-+The commands in @var{arg} are to be read and executed when the
-+shell receives signal @var{sigspec}.  If @var{arg} is absent (and
-+there is a single @var{sigspec}) or
-+equal to @samp{-}, each specified signal's disposition is reset
-+to the value it had when the shell was started.
-+If @var{arg} is the null string, then the signal specified by
-+each @var{sigspec} is ignored by the shell and commands it invokes.
-+If @var{arg} is not present and @option{-p} has been supplied,
-+the shell displays the trap commands associated with each @var{sigspec}.
-+If no arguments are supplied, or
-+only @option{-p} is given, @code{trap} prints the list of commands
-+associated with each signal number in a form that may be reused as
-+shell input.
-+The @option{-l} option causes the shell to print a list of signal names
-+and their corresponding numbers.
-+Each @var{sigspec} is either a signal name or a signal number.
-+Signal names are case insensitive and the @code{SIG} prefix is optional.
-+If a @var{sigspec}
-+is @code{0} or @code{EXIT}, @var{arg} is executed when the shell exits.
-+If a @var{sigspec} is @code{DEBUG}, the command @var{arg} is executed
-+before every simple command, @code{for} command, @code{case} command,
-+@code{select} command, every arithmetic @code{for} command, and before
-+the first command executes in a shell function.
-+Refer to the description of the @code{extglob} option to the
-+@code{shopt} builtin (@pxref{Bash Builtins}) for details of its
-+effect on the @code{DEBUG} trap.
-+If a @var{sigspec} is @code{ERR}, the command @var{arg} 
-+is executed whenever a simple command has a non-zero exit status,
-+subject to the following conditions.
-+The @code{ERR} trap is not executed if the failed command is part of the
-+command list immediately following an @code{until} or @code{while} keyword,
-+part of the test in an @code{if} statement,
-+part of a @code{&&} or @code{||} list, or if the command's return
-+status is being inverted using @code{!}.
-+These are the same conditions obeyed by the @code{errexit} option.
-+If a @var{sigspec} is @code{RETURN}, the command @var{arg} is executed
-+each time a shell function or a script executed with the @code{.} or
-+@code{source} builtins finishes executing.
-+
-+Signals ignored upon entry to the shell cannot be trapped or reset.
-+Trapped signals that are not being ignored are reset to their original
-+values in a child process when it is created.
-+
-+The return status is zero unless a @var{sigspec} does not specify a
-+valid signal.
-+
-+@item umask
-+@btindex umask
-+@example
-+umask [-p] [-S] [@var{mode}]
-+@end example
-+Set the shell process's file creation mask to @var{mode}.  If
-+@var{mode} begins with a digit, it is interpreted as an octal number;
-+if not, it is interpreted as a symbolic mode mask similar
-+to that accepted by the @code{chmod} command.  If @var{mode} is
-+omitted, the current value of the mask is printed.  If the @option{-S}
-+option is supplied without a @var{mode} argument, the mask is printed
-+in a symbolic format.
-+If the  @option{-p} option is supplied, and @var{mode}
-+is omitted, the output is in a form that may be reused as input.
-+The return status is zero if the mode is successfully changed or if
-+no @var{mode} argument is supplied, and non-zero otherwise.
-+
-+Note that when the mode is interpreted as an octal number, each number
-+of the umask is subtracted from @code{7}.  Thus, a umask of @code{022}
-+results in permissions of @code{755}.
-+
-+@item unset
-+@btindex unset
-+@example
-+unset [-fv] [@var{name}]
-+@end example
-+Each variable or function @var{name} is removed.
-+If no options are supplied, or the @option{-v} option is given, each
-+@var{name} refers to a shell variable. 
-+If the @option{-f} option is given, the @var{name}s refer to shell
-+functions, and the function definition is removed.
-+Readonly variables and functions may not be unset.
-+The return status is zero unless a @var{name} is readonly.
-+@end table
-+
-+@node Bash Builtins
-+@section Bash Builtin Commands
-+
-+This section describes builtin commands which are unique to
-+or have been extended in Bash.
-+Some of these commands are specified in the @sc{posix} standard.
-+
-+@table @code
-+
-+@item alias
-+@btindex alias
-+@example
-+alias [@code{-p}] [@var{name}[=@var{value}] @dots{}]
-+@end example
-+
-+Without arguments or with the @option{-p} option, @code{alias} prints
-+the list of aliases on the standard output in a form that allows
-+them to be reused as input.
-+If arguments are supplied, an alias is defined for each @var{name}
-+whose @var{value} is given.  If no @var{value} is given, the name
-+and value of the alias is printed.
-+Aliases are described in @ref{Aliases}.
-+
-+@item bind
-+@btindex bind
-+@example
-+bind [-m @var{keymap}] [-lpsvPSV]
-+bind [-m @var{keymap}] [-q @var{function}] [-u @var{function}] [-r @var{keyseq}]
-+bind [-m @var{keymap}] -f @var{filename}
-+bind [-m @var{keymap}] -x @var{keyseq:shell-command}
-+bind [-m @var{keymap}] @var{keyseq:function-name}
-+bind @var{readline-command}
-+@end example
-+
-+Display current Readline (@pxref{Command Line Editing})
-+key and function bindings,
-+bind a key sequence to a Readline function or macro,
-+or set a Readline variable.
-+Each non-option argument is a command as it would appear in a
-+a Readline initialization file (@pxref{Readline Init File}),
-+but each binding or command must be passed as a separate argument;  e.g.,
-+@samp{"\C-x\C-r":re-read-init-file}.
-+Options, if supplied, have the following meanings:
-+
-+@table @code
-+@item -m @var{keymap}
-+Use @var{keymap} as the keymap to be affected by
-+the subsequent bindings.  Acceptable @var{keymap}
-+names are
-+@code{emacs},
-+@code{emacs-standard},
-+@code{emacs-meta},
-+@code{emacs-ctlx},
-+@code{vi},
-+@code{vi-move},
-+@code{vi-command}, and
-+@code{vi-insert}.
-+@code{vi} is equivalent to @code{vi-command};
-+@code{emacs} is equivalent to @code{emacs-standard}.
-+
-+@item -l
-+List the names of all Readline functions.
-+
-+@item -p
-+Display Readline function names and bindings in such a way that they
-+can be used as input or in a Readline initialization file.
-+
-+@item -P
-+List current Readline function names and bindings.
-+
-+@item -v
-+Display Readline variable names and values in such a way that they
-+can be used as input or in a Readline initialization file.
-+
-+@item -V
-+List current Readline variable names and values.
-+
-+@item -s
-+Display Readline key sequences bound to macros and the strings they output
-+in such a way that they can be used as input or in a Readline
-+initialization file.
-+
-+@item -S
-+Display Readline key sequences bound to macros and the strings they output.
-+
-+@item -f @var{filename}
-+Read key bindings from @var{filename}.
-+
-+@item -q @var{function}
-+Query about which keys invoke the named @var{function}.
-+
-+@item -u @var{function}
-+Unbind all keys bound to the named @var{function}.
-+
-+@item -r @var{keyseq}
-+Remove any current binding for @var{keyseq}.
-+
-+@item -x @var{keyseq:shell-command}
-+Cause @var{shell-command} to be executed whenever @var{keyseq} is
-+entered.
-+
-+@end table
-+
-+@noindent
-+The return status is zero unless an invalid option is supplied or an
-+error occurs.
-+
-+@item builtin
-+@btindex builtin
-+@example
-+builtin [@var{shell-builtin} [@var{args}]]
-+@end example
-+Run a shell builtin, passing it @var{args}, and return its exit status.
-+This is useful when defining a shell function with the same
-+name as a shell builtin, retaining the functionality of the builtin within
-+the function.
-+The return status is non-zero if @var{shell-builtin} is not a shell
-+builtin command.
-+
-+@item caller
-+@btindex caller
-+@example
-+caller [@var{expr}]
-+@end example
-+Returns the context of any active subroutine call (a shell function or
-+a script executed with the @code{.} or @code{source} builtins).
-+
-+Without @var{expr}, @code{caller} displays the line number and source
-+filename of the current subroutine call.
-+If a non-negative integer is supplied as @var{expr}, @code{caller} 
-+displays the line number, subroutine name, and source file corresponding
-+to that position in the current execution call stack.  This extra
-+information may be used, for example, to print a stack trace.  The
-+current frame is frame 0.
-+
-+The return value is 0 unless the shell is not executing a subroutine
-+call or @var{expr} does not correspond to a valid position in the
-+call stack.
-+
-+@item command
-+@btindex command
-+@example
-+command [-pVv] @var{command} [@var{arguments} @dots{}]
-+@end example
-+Runs @var{command} with @var{arguments} ignoring any shell function
-+named @var{command}.
-+Only shell builtin commands or commands found by searching the
-+@env{PATH} are executed.
-+If there is a shell function named @code{ls}, running @samp{command ls}
-+within the function will execute the external command @code{ls}
-+instead of calling the function recursively.
-+The @option{-p} option means to use a default value for @env{PATH}
-+that is guaranteed to find all of the standard utilities.
-+The return status in this case is 127 if @var{command} cannot be
-+found or an error occurred, and the exit status of @var{command}
-+otherwise.
-+
-+If either the @option{-V} or @option{-v} option is supplied, a
-+description of @var{command} is printed.  The @option{-v} option
-+causes a single word indicating the command or file name used to
-+invoke @var{command} to be displayed; the @option{-V} option produces
-+a more verbose description.  In this case, the return status is
-+zero if @var{command} is found, and non-zero if not.
-+
-+@item declare
-+@btindex declare
-+@example
-+declare [-afFirtx] [-p] [@var{name}[=@var{value}] @dots{}]
-+@end example
-+
-+Declare variables and give them attributes.  If no @var{name}s
-+are given, then display the values of variables instead. 
-+
-+The @option{-p} option will display the attributes and values of each
-+@var{name}.
-+When @option{-p} is used, additional options are ignored.
-+The @option{-F} option inhibits the display of function definitions;
-+only the function name and attributes are printed.
-+If the @code{extdebug} shell option is enabled using @code{shopt}
-+(@pxref{Bash Builtins}), the source file name and line number where
-+the function is defined are displayed as well.
-+@option{-F} implies @option{-f}.
-+The following options can be used to restrict output to variables with
-+the specified attributes or to give variables attributes:
-+
-+@table @code
-+@item -a
-+Each @var{name} is an array variable (@pxref{Arrays}).
-+
-+@item -f
-+Use function names only.
-+
-+@item -i
-+The variable is to be treated as
-+an integer; arithmetic evaluation (@pxref{Shell Arithmetic}) is
-+performed when the variable is assigned a value.
-+
-+@item -r
-+Make @var{name}s readonly.  These names cannot then be assigned values
-+by subsequent assignment statements or unset.
-+
-+@item -t
-+Give each @var{name} the @code{trace} attribute.
-+Traced functions inherit the @code{DEBUG} and @code{RETURN} traps from
-+the calling shell.
-+The trace attribute has no special meaning for variables.
-+
-+@item -x
-+Mark each @var{name} for export to subsequent commands via
-+the environment.
-+@end table
-+
-+Using @samp{+} instead of @samp{-} turns off the attribute instead.
-+When used in a function, @code{declare} makes each @var{name} local,
-+as with the @code{local} command.  If a variable name is followed by
-+=@var{value}, the value of the variable is set to @var{value}.
-+
-+The return status is zero unless an invalid option is encountered,
-+an attempt is made to define a function using @samp{-f foo=bar},
-+an attempt is made to assign a value to a readonly variable,
-+an attempt is made to assign a value to an array variable without
-+using the compound assignment syntax (@pxref{Arrays}),
-+one of the @var{names} is not a valid shell variable name,
-+an attempt is made to turn off readonly status for a readonly variable,
-+an attempt is made to turn off array status for an array variable,
-+or an attempt is made to display a non-existent function with @option{-f}.
-+
-+@item echo
-+@btindex echo
-+@example
-+echo [-neE] [@var{arg} @dots{}]
-+@end example
-+Output the @var{arg}s, separated by spaces, terminated with a
-+newline.
-+The return status is always 0.
-+If @option{-n} is specified, the trailing newline is suppressed.
-+If the @option{-e} option is given, interpretation of the following
-+backslash-escaped characters is enabled.
-+The @option{-E} option disables the interpretation of these escape characters,
-+even on systems where they are interpreted by default.
-+The @code{xpg_echo} shell option may be used to
-+dynamically determine whether or not @code{echo} expands these
-+escape characters by default.
-+@code{echo} does not interpret @option{--} to mean the end of options.
-+
-+@code{echo} interprets the following escape sequences:
-+@table @code
-+@item \a
-+alert (bell)
-+@item \b
-+backspace
-+@item \c
-+suppress trailing newline
-+@item \e
-+escape
-+@item \f
-+form feed
-+@item \n
-+new line
-+@item \r
-+carriage return
-+@item \t 
-+horizontal tab
-+@item \v
-+vertical tab
-+@item \\
-+backslash
-+@item \0@var{nnn}
-+the eight-bit character whose value is the octal value @var{nnn}
-+(zero to three octal digits)
-+@item \x@var{HH}
-+the eight-bit character whose value is the hexadecimal value @var{HH}
-+(one or two hex digits)
-+@end table
-+
-+@item enable
-+@btindex enable
-+@example
-+enable [-n] [-p] [-f @var{filename}] [-ads] [@var{name} @dots{}]
-+@end example
-+Enable and disable builtin shell commands.
-+Disabling a builtin allows a disk command which has the same name
-+as a shell builtin to be executed without specifying a full pathname,
-+even though the shell normally searches for builtins before disk commands.
-+If @option{-n} is used, the @var{name}s become disabled.  Otherwise
-+@var{name}s are enabled.  For example, to use the @code{test} binary
-+found via @env{$PATH} instead of the shell builtin version, type
-+@samp{enable -n test}.
-+
-+If the @option{-p} option is supplied, or no @var{name} arguments appear,
-+a list of shell builtins is printed.  With no other arguments, the list
-+consists of all enabled shell builtins.
-+The @option{-a} option means to list
-+each builtin with an indication of whether or not it is enabled. 
-+
-+The @option{-f} option means to load the new builtin command @var{name}
-+from shared object @var{filename}, on systems that support dynamic loading.
-+The @option{-d} option will delete a builtin loaded with @option{-f}.
-+
-+If there are no options, a list of the shell builtins is displayed.
-+The @option{-s} option restricts @code{enable} to the @sc{posix} special
-+builtins.  If @option{-s} is used with @option{-f}, the new builtin becomes
-+a special builtin (@pxref{Special Builtins}).
-+
-+The return status is zero unless a @var{name} is not a shell builtin
-+or there is an error loading a new builtin from a shared object.
-+
-+@item help
-+@btindex help
-+@example
-+help [-s] [@var{pattern}]
-+@end example
-+Display helpful information about builtin commands.
-+If @var{pattern} is specified, @code{help} gives detailed help
-+on all commands matching @var{pattern}, otherwise a list of
-+the builtins is printed.
-+The @option{-s} option restricts the information displayed to a short
-+usage synopsis.
-+The return status is zero unless no command matches @var{pattern}.
-+
-+@item let
-+@btindex let
-+@example
-+let @var{expression} [@var{expression}]
-+@end example
-+The @code{let} builtin allows arithmetic to be performed on shell
-+variables.  Each @var{expression} is evaluated according to the
-+rules given below in @ref{Shell Arithmetic}.  If the
-+last @var{expression} evaluates to 0, @code{let} returns 1;
-+otherwise 0 is returned.
-+
-+@item local
-+@btindex local
-+@example
-+local [@var{option}] @var{name}[=@var{value}] @dots{}
-+@end example
-+For each argument, a local variable named @var{name} is created,
-+and assigned @var{value}.
-+The @var{option} can be any of the options accepted by @code{declare}.
-+@code{local} can only be used within a function; it makes the variable
-+@var{name} have a visible scope restricted to that function and its
-+children.  The return status is zero unless @code{local} is used outside
-+a function, an invalid @var{name} is supplied, or @var{name} is a
-+readonly variable.
-+
-+@item logout
-+@btindex logout
-+@example
-+logout [@var{n}]
-+@end example
-+Exit a login shell, returning a status of @var{n} to the shell's
-+parent.
-+
-+@item printf
-+@btindex printf
-+@example
-+@code{printf} [-v @var{var}] @var{format} [@var{arguments}]
-+@end example
-+Write the formatted @var{arguments} to the standard output under the
-+control of the @var{format}.
-+The @var{format} is a character string which contains three types of objects:
-+plain characters, which are simply copied to standard output, character
-+escape sequences, which are converted and copied to the standard output, and
-+format specifications, each of which causes printing of the next successive
-+@var{argument}.
-+In addition to the standard @code{printf(1)} formats, @samp{%b} causes
-+@code{printf} to expand backslash escape sequences in the corresponding
-+@var{argument},
-+(except that @samp{\c} terminates output, backslashes in
-+@samp{\'}, @samp{\"}, and @samp{\?} are not removed, and octal escapes
-+beginning with @samp{\0} may contain up to four digits),
-+and @samp{%q} causes @code{printf} to output the
-+corresponding @var{argument} in a format that can be reused as shell input.
-+
-+The @option{-v} option causes the output to be assigned to the variable
-+@var{var} rather than being printed to the standard output.
-+
-+The @var{format} is reused as necessary to consume all of the @var{arguments}.
-+If the @var{format} requires more @var{arguments} than are supplied, the
-+extra format specifications behave as if a zero value or null string, as
-+appropriate, had been supplied.  The return value is zero on success,
-+non-zero on failure.
-+
-+@item read
-+@btindex read
-+@example
-+read [-ers] [-a @var{aname}] [-d @var{delim}] [-n @var{nchars}] [-p @var{prompt}] [-t @var{timeout}] [-u @var{fd}] [@var{name} @dots{}]
-+@end example
-+One line is read from the standard input, or from the file descriptor
-+@var{fd} supplied as an argument to the @option{-u} option, and the first word
-+is assigned to the first @var{name}, the second word to the second @var{name},
-+and so on, with leftover words and their intervening separators assigned
-+to the last @var{name}.
-+If there are fewer words read from the input stream than names,
-+the remaining names are assigned empty values.
-+The characters in the value of the @env{IFS} variable
-+are used to split the line into words.
-+The backslash character @samp{\} may be used to remove any special
-+meaning for the next character read and for line continuation.
-+If no names are supplied, the line read is assigned to the
-+variable @env{REPLY}.
-+The return code is zero, unless end-of-file is encountered, @code{read}
-+times out, or an invalid file descriptor is supplied as the argument to
-+@option{-u}.
-+Options, if supplied, have the following meanings:
-+
-+@table @code
-+@item -a @var{aname}
-+The words are assigned to sequential indices of the array variable
-+@var{aname}, starting at 0.
-+All elements are removed from @var{aname} before the assignment.
-+Other @var{name} arguments are ignored.
-+
-+@item -d @var{delim}
-+The first character of @var{delim} is used to terminate the input line,
-+rather than newline.
-+
-+@item -e
-+Readline (@pxref{Command Line Editing}) is used to obtain the line.
-+
-+@item -n @var{nchars}
-+@code{read} returns after reading @var{nchars} characters rather than
-+waiting for a complete line of input.
-+
-+@item -p @var{prompt}
-+Display @var{prompt}, without a trailing newline, before attempting
-+to read any input.
-+The prompt is displayed only if input is coming from a terminal.
-+
-+@item -r
-+If this option is given, backslash does not act as an escape character.
-+The backslash is considered to be part of the line.
-+In particular, a backslash-newline pair may not be used as a line
-+continuation.
-+
-+@item -s
-+Silent mode.  If input is coming from a terminal, characters are
-+not echoed.
-+
-+@item -t @var{timeout}
-+Cause @code{read} to time out and return failure if a complete line of
-+input is not read within @var{timeout} seconds.
-+This option has no effect if @code{read} is not reading input from the
-+terminal or a pipe.
-+
-+@item -u @var{fd}
-+Read input from file descriptor @var{fd}.
-+
-+@end table
-+
-+@item shopt
-+@btindex shopt
-+@example
-+shopt [-pqsu] [-o] [@var{optname} @dots{}]
-+@end example
-+Toggle the values of variables controlling optional shell behavior.
-+With no options, or with the @option{-p} option, a list of all settable
-+options is displayed, with an indication of whether or not each is set.
-+The @option{-p} option causes output to be displayed in a form that
-+may be reused as input.
-+Other options have the following meanings:
-+
-+@table @code
-+@item -s
-+Enable (set) each @var{optname}.
-+
-+@item -u
-+Disable (unset) each @var{optname}.
-+
-+@item -q
-+Suppresses normal output; the return status
-+indicates whether the @var{optname} is set or unset.
-+If multiple @var{optname} arguments are given with @option{-q},
-+the return status is zero if all @var{optnames} are enabled;
-+non-zero otherwise.
-+
-+@item -o
-+Restricts the values of
-+@var{optname} to be those defined for the @option{-o} option to the
-+@code{set} builtin (@pxref{The Set Builtin}).
-+@end table
-+
-+If either @option{-s} or @option{-u}
-+is used with no @var{optname} arguments, the display is limited to
-+those options which are set or unset, respectively.
-+
-+Unless otherwise noted, the @code{shopt} options are disabled (off)
-+by default.
-+
-+The return status when listing options is zero if all @var{optnames}
-+are enabled, non-zero otherwise.  When setting or unsetting options,
-+the return status is zero unless an @var{optname} is not a valid shell
-+option.
-+
-+The list of @code{shopt} options is:
-+@table @code
-+@item cdable_vars
-+If this is set, an argument to the @code{cd}
-+builtin command that
-+is not a directory is assumed to be the name of a variable whose
-+value is the directory to change to.
-+
-+@item cdspell
-+If set, minor errors in the spelling of a directory component in a
-+@code{cd} command will be corrected.
-+The errors checked for are transposed characters,
-+a missing character, and a character too many.
-+If a correction is found, the corrected path is printed,
-+and the command proceeds.
-+This option is only used by interactive shells.
-+
-+@item checkhash
-+If this is set, Bash checks that a command found in the hash
-+table exists before trying to execute it.  If a hashed command no
-+longer exists, a normal path search is performed.
-+
-+@item checkwinsize
-+If set, Bash checks the window size after each command
-+and, if necessary, updates the values of    
-+@env{LINES} and @env{COLUMNS}.
-+
-+@item cmdhist
-+If set, Bash
-+attempts to save all lines of a multiple-line
-+command in the same history entry.  This allows
-+easy re-editing of multi-line commands.
-+
-+@item dotglob
-+If set, Bash includes filenames beginning with a `.' in
-+the results of filename expansion.
-+
-+@item execfail
-+If this is set, a non-interactive shell will not exit if
-+it cannot execute the file specified as an argument to the @code{exec}
-+builtin command.  An interactive shell does not exit if @code{exec}
-+fails.
-+
-+@item expand_aliases
-+If set, aliases are expanded as described below under Aliases,
-+@ref{Aliases}.
-+This option is enabled by default for interactive shells.
-+
-+@item extdebug
-+If set, behavior intended for use by debuggers is enabled:
-+
-+@enumerate
-+@item
-+The @option{-F} option to the @code{declare} builtin (@pxref{Bash Builtins})
-+displays the source file name and line number corresponding to each function
-+name supplied as an argument.
-+
-+@item
-+If the command run by the @code{DEBUG} trap returns a non-zero value, the
-+next command is skipped and not executed.
-+
-+@item
-+If the command run by the @code{DEBUG} trap returns a value of 2, and the
-+shell is executing in a subroutine (a shell function or a shell script
-+executed by the @code{.} or @code{source} builtins), a call to
-+@code{return} is simulated.
-+
-+@item
-+@code{BASH_ARGC} and @code{BASH_ARGV} are updated as described in their
-+descriptions (@pxref{Bash Variables}).
-+
-+@item
-+Function tracing is enabled:  command substitution, shell functions, and
-+subshells invoked with @code{( @var{command} )} inherit the
-+@code{DEBUG} and @code{RETURN} traps.
-+
-+@item
-+Error tracing is enabled:  command substitution, shell functions, and
-+subshells invoked with @code{( @var{command} )} inherit the
-+@code{ERROR} trap.
-+@end enumerate
-+
-+@item extglob
-+If set, the extended pattern matching features described above
-+(@pxref{Pattern Matching}) are enabled.
-+
-+@item extquote
-+If set, @code{$'@var{string}'} and @code{$"@var{string}"} quoting is  
-+performed within @code{$@{@var{parameter}@}} expansions                     
-+enclosed in double quotes.  This option is enabled by default. 
-+
-+@item failglob
-+If set, patterns which fail to match filenames during pathname expansion
-+result in an expansion error.
-+
-+@item force_fignore
-+If set, the suffixes specified by the @env{FIGNORE} shell variable
-+cause words to be ignored when performing word completion even if
-+the ignored words are the only possible completions.
-+@xref{Bash Variables}, for a description of @env{FIGNORE}.
-+This option is enabled by default.
-+
-+@item gnu_errfmt
-+If set, shell error messages are written in the standard @sc{gnu} error
-+message format.
-+
-+@item histappend
-+If set, the history list is appended to the file named by the value
-+of the @env{HISTFILE}
-+variable when the shell exits, rather than overwriting the file.
-+
-+@item histreedit
-+If set, and Readline
-+is being used, a user is given the opportunity to re-edit a
-+failed history substitution.
-+
-+@item histverify
-+If set, and Readline
-+is being used, the results of history substitution are not immediately
-+passed to the shell parser.  Instead, the resulting line is loaded into
-+the Readline editing buffer, allowing further modification.
-+
-+@item hostcomplete
-+If set, and Readline is being used, Bash will attempt to perform
-+hostname completion when a word containing a @samp{@@} is being
-+completed (@pxref{Commands For Completion}).  This option is enabled
-+by default.
-+
-+@item huponexit
-+If set, Bash will send @code{SIGHUP} to all jobs when an interactive
-+login shell exits (@pxref{Signals}).
-+
-+@item interactive_comments
-+Allow a word beginning with @samp{#}
-+to cause that word and all remaining characters on that
-+line to be ignored in an interactive shell.
-+This option is enabled by default.
-+
-+@item lithist
-+If enabled, and the @code{cmdhist}
-+option is enabled, multi-line commands are saved to the history with
-+embedded newlines rather than using semicolon separators where possible.
-+
-+@item login_shell
-+The shell sets this option if it is started as a login shell
-+(@pxref{Invoking Bash}).
-+The value may not be changed.
-+
-+@item mailwarn
-+If set, and a file that Bash is checking for mail has been  
-+accessed since the last time it was checked, the message
-+@code{"The mail in @var{mailfile} has been read"} is displayed.
-+
-+@item no_empty_cmd_completion
-+If set, and Readline is being used, Bash will not attempt to search
-+the @env{PATH} for possible completions when completion is attempted
-+on an empty line.
-+
-+@item nocaseglob
-+If set, Bash matches filenames in a case-insensitive fashion when
-+performing filename expansion.
-+
-+@item nocasematch
-+If set, Bash matches patterns in a case-insensitive fashion when
-+performing matching while executing @code{case} or @code{[[}
-+conditional commands.
-+
-+@item nullglob
-+If set, Bash allows filename patterns which match no
-+files to expand to a null string, rather than themselves.
-+
-+@item progcomp
-+If set, the programmable completion facilities
-+(@pxref{Programmable Completion}) are enabled.
-+This option is enabled by default.
-+
-+@item promptvars
-+If set, prompt strings undergo
-+parameter expansion, command substitution, arithmetic
-+expansion, and quote removal after being expanded
-+as described below (@pxref{Printing a Prompt}).
-+This option is enabled by default.
-+
-+@item restricted_shell
-+The shell sets this option if it is started in restricted mode
-+(@pxref{The Restricted Shell}).
-+The value may not be changed.
-+This is not reset when the startup files are executed, allowing
-+the startup files to discover whether or not a shell is restricted.
-+
-+@item shift_verbose
-+If this is set, the @code{shift}
-+builtin prints an error message when the shift count exceeds the
-+number of positional parameters.
-+
-+@item sourcepath
-+If set, the @code{source} builtin uses the value of @env{PATH}
-+to find the directory containing the file supplied as an argument.
-+This option is enabled by default.
-+
-+@item xpg_echo
-+If set, the @code{echo} builtin expands backslash-escape sequences
-+by default.
-+
-+@end table
-+
-+@noindent
-+The return status when listing options is zero if all @var{optnames}
-+are enabled, non-zero otherwise.
-+When setting or unsetting options, the return status is zero unless an
-+@var{optname} is not a valid shell option.
-+
-+@item source
-+@btindex source
-+@example
-+source @var{filename}
-+@end example
-+A synonym for @code{.} (@pxref{Bourne Shell Builtins}).
-+
-+@item type
-+@btindex type
-+@example
-+type [-afptP] [@var{name} @dots{}]
-+@end example
-+For each @var{name}, indicate how it would be interpreted if used as a
-+command name.
-+
-+If the @option{-t} option is used, @code{type} prints a single word
-+which is one of @samp{alias}, @samp{function}, @samp{builtin},
-+@samp{file} or @samp{keyword},
-+if @var{name} is an alias, shell function, shell builtin,
-+disk file, or shell reserved word, respectively.
-+If the @var{name} is not found, then nothing is printed, and
-+@code{type} returns a failure status.
-+
-+If the @option{-p} option is used, @code{type} either returns the name
-+of the disk file that would be executed, or nothing if @option{-t}
-+would not return @samp{file}.
-+
-+The @option{-P} option forces a path search for each @var{name}, even if
-+@option{-t} would not return @samp{file}.
-+
-+If a command is hashed, @option{-p} and @option{-P} print the hashed value,
-+not necessarily the file that appears first in @code{$PATH}.
-+
-+If the @option{-a} option is used, @code{type} returns all of the places
-+that contain an executable named @var{file}.
-+This includes aliases and functions, if and only if the @option{-p} option
-+is not also used.
-+
-+If the @option{-f} option is used, @code{type} does not attempt to find
-+shell functions, as with the @code{command} builtin.
-+
-+The return status is zero if any of the @var{names} are found, non-zero
-+if none are found.
-+
-+@item typeset
-+@btindex typeset
-+@example
-+typeset [-afFrxi] [-p] [@var{name}[=@var{value}] @dots{}]
-+@end example
-+The @code{typeset} command is supplied for compatibility with the Korn
-+shell; however, it has been deprecated in favor of the @code{declare}
-+builtin command.
-+
-+@item ulimit
-+@btindex ulimit
-+@example
-+ulimit [-acdefilmnpqrstuvxSH] [@var{limit}]
-+@end example
-+@code{ulimit} provides control over the resources available to processes
-+started by the shell, on systems that allow such control.  If an
-+option is given, it is interpreted as follows:
-+@table @code
-+@item -S
-+Change and report the soft limit associated with a resource.
-+
-+@item -H
-+Change and report the hard limit associated with a resource.
-+
-+@item -a
-+All current limits are reported.
-+
-+@item -c
-+The maximum size of core files created.
-+
-+@item -d
-+The maximum size of a process's data segment.
-+
-+@item -e
-+The maximum scheduling priority ("nice").
-+
-+@item -f
-+The maximum size of files written by the shell and its children.
-+
-+@item -i
-+The maximum number of pending signals.
-+
-+@item -l
-+The maximum size that may be locked into memory.
-+
-+@item -m
-+The maximum resident set size.
-+
-+@item -n
-+The maximum number of open file descriptors.
-+
-+@item -p
-+The pipe buffer size.
-+
-+@item -q
-+The maximum number of bytes in POSIX message queues.
-+
-+@item -r
-+The maximum real-time scheduling priority.
-+
-+@item -s
-+The maximum stack size.
-+
-+@item -t
-+The maximum amount of cpu time in seconds.
-+
-+@item -u
-+The maximum number of processes available to a single user.
-+
-+@item -v
-+The maximum amount of virtual memory available to the process.
-+
-+@item -x
-+The maximum number of file locks.
-+
-+@end table
-+
-+If @var{limit} is given, it is the new value of the specified resource;
-+the special @var{limit} values @code{hard}, @code{soft}, and
-+@code{unlimited} stand for the current hard limit, the current soft limit,
-+and no limit, respectively.
-+Otherwise, the current value of the soft limit for the specified resource
-+is printed, unless the @option{-H} option is supplied.
-+When setting new limits, if neither @option{-H} nor @option{-S} is supplied,
-+both the hard and soft limits are set.
-+If no option is given, then @option{-f} is assumed.  Values are in 1024-byte
-+increments, except for @option{-t}, which is in seconds, @option{-p},
-+which is in units of 512-byte blocks, and @option{-n} and @option{-u}, which
-+are unscaled values.
-+
-+The return status is zero unless an invalid option or argument is supplied,
-+or an error occurs while setting a new limit.
-+
-+@item unalias
-+@btindex unalias
-+@example
-+unalias [-a] [@var{name} @dots{} ]
-+@end example
-+
-+Remove each @var{name} from the list of aliases.  If @option{-a} is
-+supplied, all aliases are removed.
-+Aliases are described in @ref{Aliases}.
-+
-+@end table
-+
-+@node The Set Builtin
-+@section The Set Builtin
-+
-+This builtin is so complicated that it deserves its own section.
-+
-+@table @code
-+@item set
-+@btindex set
-+@example
-+set [--abefhkmnptuvxBCHP] [-o @var{option}] [@var{argument} @dots{}]
-+@end example
-+
-+If no options or arguments are supplied, @code{set} displays the names
-+and values of all shell variables and functions, sorted according to the
-+current locale, in a format that may be reused as input
-+for setting or resetting the currently-set variables.
-+Read-only variables cannot be reset.
-+In @sc{posix} mode, only shell variables are listed.
-+
-+When options are supplied, they set or unset shell attributes.
-+Options, if specified, have the following meanings:
-+
-+@table @code
-+@item -a
-+Mark variables and function which are modified or created for export
-+to the environment of subsequent commands.
-+
-+@item -b
-+Cause the status of terminated background jobs to be reported
-+immediately, rather than before printing the next primary prompt.
-+
-+@item -e
-+Exit immediately if a simple command (@pxref{Simple Commands}) exits
-+with a non-zero status, unless the command that fails is part of the
-+command list immediately following a @code{while} or @code{until}
-+keyword, part of the test in an @code{if} statement,
-+part of a @code{&&} or @code{||} list, or if the command's return
-+status is being inverted using @code{!}.
-+A trap on @code{ERR}, if set, is executed before the shell exits.
-+
-+@item -f
-+Disable file name generation (globbing).
-+
-+@item -h
-+Locate and remember (hash) commands as they are looked up for execution.
-+This option is enabled by default.
-+
-+@item -k
-+All arguments in the form of assignment statements are placed
-+in the environment for a command, not just those that precede
-+the command name.
-+
-+@item -m
-+Job control is enabled (@pxref{Job Control}).
-+
-+@item -n
-+Read commands but do not execute them; this may be used to check a
-+script for syntax errors.
-+This option is ignored by interactive shells.
-+
-+@item -o @var{option-name}
-+
-+Set the option corresponding to @var{option-name}:
-+
-+@table @code
-+@item allexport
-+Same as @code{-a}.
-+
-+@item braceexpand
-+Same as @code{-B}.
-+
-+@item emacs
-+Use an @code{emacs}-style line editing interface (@pxref{Command Line Editing}).
-+
-+@item errexit
-+Same as @code{-e}.
-+
-+@item errtrace
-+Same as @code{-E}.
-+
-+@item functrace
-+Same as @code{-T}.
-+
-+@item hashall
-+Same as @code{-h}.
-+
-+@item histexpand
-+Same as @code{-H}.
-+
-+@item history
-+Enable command history, as described in @ref{Bash History Facilities}.
-+This option is on by default in interactive shells.
-+
-+@item ignoreeof
-+An interactive shell will not exit upon reading EOF.
-+
-+@item keyword
-+Same as @code{-k}.
-+
-+@item monitor
-+Same as @code{-m}.
-+
-+@item noclobber
-+Same as @code{-C}.
-+
-+@item noexec
-+Same as @code{-n}.
-+
-+@item noglob
-+Same as @code{-f}.
-+
-+@item nolog
-+Currently ignored.
-+
-+@item notify
-+Same as @code{-b}.
-+
-+@item nounset
-+Same as @code{-u}.
-+
-+@item onecmd
-+Same as @code{-t}.
-+
-+@item physical
-+Same as @code{-P}.
-+
-+@item pipefail
-+If set, the return value of a pipeline is the value of the last
-+(rightmost) command to exit with a non-zero status, or zero if all
-+commands in the pipeline exit successfully.
-+This option is disabled by default.
-+
-+@item posix
-+Change the behavior of Bash where the default operation differs
-+from the @sc{posix} standard to match the standard
-+(@pxref{Bash POSIX Mode}).
-+This is intended to make Bash behave as a strict superset of that
-+standard.
-+
-+@item privileged
-+Same as @code{-p}.
-+
-+@item verbose
-+Same as @code{-v}.
-+
-+@item vi
-+Use a @code{vi}-style line editing interface.
-+
-+@item xtrace
-+Same as @code{-x}.
-+@end table
-+
-+@item -p
-+Turn on privileged mode.
-+In this mode, the @env{$BASH_ENV} and @env{$ENV} files are not
-+processed, shell functions are not inherited from the environment,
-+and the @env{SHELLOPTS} variable, if it appears in the environment,
-+is ignored.
-+If the shell is started with the effective user (group) id not equal to the
-+real user (group) id, and the @code{-p} option is not supplied, these actions
-+are taken and the effective user id is set to the real user id.
-+If the @code{-p} option is supplied at startup, the effective user id is
-+not reset.
-+Turning this option off causes the effective user
-+and group ids to be set to the real user and group ids.
-+
-+@item -t
-+Exit after reading and executing one command.
-+
-+@item -u
-+Treat unset variables as an error when performing parameter expansion.
-+An error message will be written to the standard error, and a non-interactive
-+shell will exit.
-+
-+@item -v
-+Print shell input lines as they are read.
-+
-+@item -x
-+Print a trace of simple commands, @code{for} commands, @code{case}
-+commands, @code{select} commands, and arithmetic @code{for} commands
-+and their arguments or associated word lists after they are
-+expanded and before they are executed.  The value of the @env{PS4}
-+variable is expanded and the resultant value is printed before
-+the command and its expanded arguments.
-+
-+@item -B
-+The shell will perform brace expansion (@pxref{Brace Expansion}).
-+This option is on by default.
-+
-+@item -C
-+Prevent output redirection using @samp{>}, @samp{>&}, and @samp{<>}
-+from overwriting existing files.
-+
-+@item -E
-+If set, any trap on @code{ERR} is inherited by shell functions, command
-+substitutions, and commands executed in a subshell environment.
-+The @code{ERR} trap is normally not inherited in such cases.
-+
-+@item -H
-+Enable @samp{!} style history substitution (@pxref{History Interaction}).
-+This option is on by default for interactive shells.
-+
-+@item -P
-+If set, do not follow symbolic links when performing commands such as
-+@code{cd} which change the current directory.  The physical directory
-+is used instead.  By default, Bash follows
-+the logical chain of directories when performing commands
-+which change the current directory.
-+
-+For example, if @file{/usr/sys} is a symbolic link to @file{/usr/local/sys}
-+then:
-+@example
-+$ cd /usr/sys; echo $PWD
-+/usr/sys
-+$ cd ..; pwd
-+/usr
-+@end example
-+
-+@noindent
-+If @code{set -P} is on, then:
-+@example
-+$ cd /usr/sys; echo $PWD
-+/usr/local/sys
-+$ cd ..; pwd
-+/usr/local
-+@end example
-+
-+@item -T
-+If set, any trap on @code{DEBUG} and @code{RETURN} are inherited by
-+shell functions, command substitutions, and commands executed
-+in a subshell environment.
-+The @code{DEBUG} and @code{RETURN} traps are normally not inherited
-+in such cases.
-+
-+@item --
-+If no arguments follow this option, then the positional parameters are
-+unset.  Otherwise, the positional parameters are set to the
-+@var{arguments}, even if some of them begin with a @samp{-}.
-+
-+@item -
-+Signal the end of options, cause all remaining @var{arguments}
-+to be assigned to the positional parameters.  The @option{-x}
-+and @option{-v}  options are turned off.
-+If there are no arguments, the positional parameters remain unchanged.
-+@end table
-+
-+Using @samp{+} rather than @samp{-} causes these options to be
-+turned off.  The options can also be used upon invocation of the
-+shell.  The current set of options may be found in @code{$-}.
-+
-+The remaining N @var{arguments} are positional parameters and are
-+assigned, in order, to @code{$1}, @code{$2}, @dots{}  @code{$N}.
-+The special parameter @code{#} is set to N.
-+
-+The return status is always zero unless an invalid option is supplied.
-+@end table
-+
-+@node Special Builtins
-+@section Special Builtins
-+@cindex special builtin
-+
-+For historical reasons, the @sc{posix} standard has classified
-+several builtin commands as @emph{special}.
-+When Bash is executing in @sc{posix} mode, the special builtins
-+differ from other builtin commands in three respects:
-+
-+@enumerate
-+@item
-+Special builtins are found before shell functions during command lookup.
-+
-+@item
-+If a special builtin returns an error status, a non-interactive shell exits.
-+
-+@item
-+Assignment statements preceding the command stay in effect in the shell
-+environment after the command completes.
-+@end enumerate
-+
-+When Bash is not executing in @sc{posix} mode, these builtins behave no
-+differently than the rest of the Bash builtin commands.
-+The Bash @sc{posix} mode is described in @ref{Bash POSIX Mode}. 
-+
-+These are the @sc{posix} special builtins:
-+@example
-+@w{break : . continue eval exec exit export readonly return set}
-+@w{shift trap unset}
-+@end example
-+
-+@node Shell Variables
-+@chapter Shell Variables
-+
-+@menu
-+* Bourne Shell Variables::	Variables which Bash uses in the same way
-+				as the Bourne Shell.
-+* Bash Variables::		List of variables that exist in Bash.
-+@end menu
-+
-+This chapter describes the shell variables that Bash uses.
-+Bash automatically assigns default values to a number of variables.
-+
-+@node Bourne Shell Variables
-+@section Bourne Shell Variables
-+
-+Bash uses certain shell variables in the same way as the Bourne shell.
-+In some cases, Bash assigns a default value to the variable.
-+
-+@vtable @code
-+
-+@item CDPATH
-+A colon-separated list of directories used as a search path for
-+the @code{cd} builtin command.
-+
-+@item HOME
-+The current user's home directory; the default for the @code{cd} builtin
-+command.
-+The value of this variable is also used by tilde expansion
-+(@pxref{Tilde Expansion}).
-+
-+@item IFS
-+A list of characters that separate fields; used when the shell splits
-+words as part of expansion.
-+
-+@item MAIL
-+If this parameter is set to a filename and the @env{MAILPATH} variable
-+is not set, Bash informs the user of the arrival of mail in
-+the specified file.
-+
-+@item MAILPATH
-+A colon-separated list of filenames which the shell periodically checks
-+for new mail.
-+Each list entry can specify the message that is printed when new mail
-+arrives in the mail file by separating the file name from the message with
-+a @samp{?}.
-+When used in the text of the message, @code{$_} expands to the name of
-+the current mail file.
-+
-+@item OPTARG
-+The value of the last option argument processed by the @code{getopts} builtin.
-+
-+@item OPTIND
-+The index of the last option argument processed by the @code{getopts} builtin.
-+
-+@item PATH
-+A colon-separated list of directories in which the shell looks for
-+commands.
-+A zero-length (null) directory name in the value of @code{PATH} indicates the
-+current directory.
-+A null directory name may appear as two adjacent colons, or as an initial
-+or trailing colon.
-+
-+
-+@item PS1
-+The primary prompt string.  The default value is @samp{\s-\v\$ }.
-+@xref{Printing a Prompt}, for the complete list of escape
-+sequences that are expanded before @env{PS1} is displayed.
-+
-+@item PS2
-+The secondary prompt string.  The default value is @samp{> }.
-+
-+@end vtable
-+
-+@node Bash Variables
-+@section Bash Variables
-+
-+These variables are set or used by Bash, but other shells
-+do not normally treat them specially.
-+
-+A few variables used by Bash are described in different chapters:
-+variables for controlling the job control facilities
-+(@pxref{Job Control Variables}).
-+
-+@vtable @code
-+
-+@item BASH
-+The full pathname used to execute the current instance of Bash.
-+
-+@item BASH_ARGC
-+An array variable whose values are the number of parameters in each
-+frame of the current bash execution call stack.  The number of
-+parameters to the current subroutine (shell function or script executed
-+with @code{.} or @code{source}) is at the top of the stack.  When a
-+subroutine is executed, the number of parameters passed is pushed onto
-+@code{BASH_ARGC}.
-+The shell sets @code{BASH_ARGC} only when in extended debugging mode
-+(see @ref{Bash Builtins}  
-+for a description of the @code{extdebug} option to the @code{shopt}
-+builtin).
-+
-+@item BASH_ARGV
-+An array variable containing all of the parameters in the current bash
-+execution call stack.  The final parameter of the last subroutine call
-+is at the top of the stack; the first parameter of the initial call is
-+at the bottom.  When a subroutine is executed, the parameters supplied
-+are pushed onto @code{BASH_ARGV}.
-+The shell sets @code{BASH_ARGV} only when in extended debugging mode
-+(see @ref{Bash Builtins}  
-+for a description of the @code{extdebug} option to the @code{shopt}
-+builtin).
-+
-+@item BASH_COMMAND
-+The command currently being executed or about to be executed, unless the
-+shell is executing a command as the result of a trap,
-+in which case it is the command executing at the time of the trap.
-+
-+@item BASH_ENV
-+If this variable is set when Bash is invoked to execute a shell
-+script, its value is expanded and used as the name of a startup file
-+to read before executing the script.  @xref{Bash Startup Files}.
-+
-+@item BASH_EXECUTION_STRING
-+The command argument to the @option{-c} invocation option.
-+
-+@item BASH_LINENO
-+An array variable whose members are the line numbers in source files
-+corresponding to each member of @var{FUNCNAME}.
-+@code{$@{BASH_LINENO[$i]@}} is the line number in the source file where
-+@code{$@{FUNCNAME[$i]@}} was called.
-+The corresponding source file name is @code{$@{BASH_SOURCE[$i]@}}.
-+Use @code{LINENO} to obtain the current line number.
-+
-+@item BASH_REMATCH
-+An array variable whose members are assigned by the @samp{=~} binary
-+operator to the @code{[[} conditional command
-+(@pxref{Conditional Constructs}).
-+The element with index 0 is the portion of the string
-+matching the entire regular expression.
-+The element with index @var{n} is the portion of the
-+string matching the @var{n}th parenthesized subexpression.
-+This variable is read-only.
-+
-+@item BASH_SOURCE
-+An array variable whose members are the source filenames corresponding
-+to the elements in the @code{FUNCNAME} array variable.
-+
-+@item BASH_SUBSHELL
-+Incremented by one each time a subshell or subshell environment is spawned.
-+The initial value is 0.
-+
-+@item BASH_VERSINFO
-+A readonly array variable (@pxref{Arrays})
-+whose members hold version information for this instance of Bash.
-+The values assigned to the array members are as follows:
-+
-+@table @code
-+
-+@item BASH_VERSINFO[0]
-+The major version number (the @var{release}).
-+
-+@item BASH_VERSINFO[1]
-+The minor version number (the @var{version}).
-+
-+@item BASH_VERSINFO[2]
-+The patch level.
-+
-+@item BASH_VERSINFO[3]
-+The build version.
-+
-+@item BASH_VERSINFO[4]
-+The release status (e.g., @var{beta1}).
-+
-+@item BASH_VERSINFO[5]
-+The value of @env{MACHTYPE}.
-+
-+@end table
-+
-+@item BASH_VERSION
-+The version number of the current instance of Bash.
-+
-+@item COLUMNS
-+Used by the @code{select} builtin command to determine the terminal width
-+when printing selection lists.  Automatically set upon receipt of a
-+@code{SIGWINCH}.
-+
-+@item COMP_CWORD
-+An index into @env{$@{COMP_WORDS@}} of the word containing the current
-+cursor position.
-+This variable is available only in shell functions invoked by the
-+programmable completion facilities (@pxref{Programmable Completion}).
-+
-+@item COMP_LINE
-+The current command line.
-+This variable is available only in shell functions and external
-+commands invoked by the
-+programmable completion facilities (@pxref{Programmable Completion}).
-+
-+@item COMP_POINT
-+The index of the current cursor position relative to the beginning of
-+the current command.
-+If the current cursor position is at the end of the current command,
-+the value of this variable is equal to @code{$@{#COMP_LINE@}}.
-+This variable is available only in shell functions and external
-+commands invoked by the
-+programmable completion facilities (@pxref{Programmable Completion}).
-+
-+@item COMP_WORDBREAKS
-+The set of characters that the Readline library treats as word
-+separators when performing word completion.
-+If @code{COMP_WORDBREAKS} is unset, it loses its special properties,
-+even if it is subsequently reset.
-+
-+@item COMP_WORDS
-+An array variable consisting of the individual
-+words in the current command line.
-+The words are split on shell metacharacters as the shell parser would
-+separate them.
-+This variable is available only in shell functions invoked by the
-+programmable completion facilities (@pxref{Programmable Completion}).
-+
-+@item COMPREPLY
-+An array variable from which Bash reads the possible completions
-+generated by a shell function invoked by the programmable completion
-+facility (@pxref{Programmable Completion}).
-+
-+@item DIRSTACK
-+An array variable containing the current contents of the directory stack.
-+Directories appear in the stack in the order they are displayed by the
-+@code{dirs} builtin.
-+Assigning to members of this array variable may be used to modify
-+directories already in the stack, but the @code{pushd} and @code{popd}
-+builtins must be used to add and remove directories.
-+Assignment to this variable will not change the current directory.
-+If @env{DIRSTACK} is unset, it loses its special properties, even if
-+it is subsequently reset.
-+
-+@item EMACS
-+If Bash finds this variable in the environment when the shell
-+starts with value @samp{t}, it assumes that the shell is running in an
-+emacs shell buffer and disables line editing.
-+
-+@item EUID
-+The numeric effective user id of the current user.  This variable
-+is readonly.
-+
-+@item FCEDIT
-+The editor used as a default by the @option{-e} option to the @code{fc}
-+builtin command.
-+
-+@item FIGNORE
-+A colon-separated list of suffixes to ignore when performing
-+filename completion.
-+A file name whose suffix matches one of the entries in 
-+@env{FIGNORE}
-+is excluded from the list of matched file names.  A sample
-+value is @samp{.o:~}
-+
-+@item FUNCNAME
-+An array variable containing the names of all shell functions
-+currently in the execution call stack.
-+The element with index 0 is the name of any currently-executing
-+shell function.
-+The bottom-most element is "main".
-+This variable exists only when a shell function is executing.
-+Assignments to @env{FUNCNAME} have no effect and return an error status.
-+If @env{FUNCNAME} is unset, it loses its special properties, even if
-+it is subsequently reset.
-+
-+@item GLOBIGNORE
-+A colon-separated list of patterns defining the set of filenames to
-+be ignored by filename expansion.
-+If a filename matched by a filename expansion pattern also matches one
-+of the patterns in @env{GLOBIGNORE}, it is removed from the list
-+of matches.
-+
-+@item GROUPS
-+An array variable containing the list of groups of which the current    
-+user is a member.
-+Assignments to @env{GROUPS} have no effect and return an error status.
-+If @env{GROUPS} is unset, it loses its special properties, even if it is
-+subsequently reset.
-+
-+@item histchars
-+Up to three characters which control history expansion, quick
-+substitution, and tokenization (@pxref{History Interaction}).
-+The first character is the
-+@var{history expansion} character, that is, the character which signifies the
-+start of a history expansion, normally @samp{!}.  The second character is the
-+character which signifies `quick substitution' when seen as the first
-+character on a line, normally @samp{^}.  The optional third character is the
-+character which indicates that the remainder of the line is a comment when
-+found as the first character of a word, usually @samp{#}.  The history
-+comment character causes history substitution to be skipped for the
-+remaining words on the line.  It does not necessarily cause the shell
-+parser to treat the rest of the line as a comment.
-+
-+@item HISTCMD
-+The history number, or index in the history list, of the current
-+command.  If @env{HISTCMD} is unset, it loses its special properties,
-+even if it is subsequently reset.
-+
-+@item HISTCONTROL
-+A colon-separated list of values controlling how commands are saved on
-+the history list.
-+If the list of values includes @samp{ignorespace}, lines which begin
-+with a space character are not saved in the history list.
-+A value of @samp{ignoredups} causes lines which match the previous
-+history entry to not be saved.
-+A value of @samp{ignoreboth} is shorthand for
-+@samp{ignorespace} and @samp{ignoredups}.
-+A value of @samp{erasedups} causes all previous lines matching the
-+current line to be removed from the history list before that line
-+is saved.
-+Any value not in the above list is ignored.
-+If @env{HISTCONTROL} is unset, or does not include a valid value, 
-+all lines read by the shell parser are saved on the history list, 
-+subject to the value of @env{HISTIGNORE}.
-+The second and subsequent lines of a multi-line compound command are
-+not tested, and are added to the history regardless of the value of
-+@env{HISTCONTROL}.
-+
-+@item HISTFILE
-+The name of the file to which the command history is saved.  The
-+default value is @file{~/.bash_history}.
-+
-+@item HISTFILESIZE
-+The maximum number of lines contained in the history file.  When this
-+variable is assigned a value, the history file is truncated, if
-+necessary, by removing the oldest entries,
-+to contain no more than that number of lines.
-+The history file is also truncated to this size after
-+writing it when an interactive shell exits.
-+The default value is 500.
-+
-+@item HISTIGNORE
-+A colon-separated list of patterns used to decide which command
-+lines should be saved on the history list.  Each pattern is
-+anchored at the beginning of the line and must match the complete
-+line (no implicit @samp{*} is appended).  Each pattern is tested
-+against the line after the checks specified by @env{HISTCONTROL}
-+are applied.  In addition to the normal shell pattern matching
-+characters, @samp{&} matches the previous history line.  @samp{&}
-+may be escaped using a backslash; the backslash is removed
-+before attempting a match. 
-+The second and subsequent lines of a multi-line compound command are
-+not tested, and are added to the history regardless of the value of
-+@env{HISTIGNORE}.
-+
-+@env{HISTIGNORE} subsumes the function of @env{HISTCONTROL}.  A
-+pattern of @samp{&} is identical to @code{ignoredups}, and a
-+pattern of @samp{[ ]*} is identical to @code{ignorespace}. 
-+Combining these two patterns, separating them with a colon,
-+provides the functionality of @code{ignoreboth}. 
-+
-+@item HISTSIZE
-+The maximum number of commands to remember on the history list.
-+The default value is 500.
-+
-+@item HISTTIMEFORMAT
-+If this variable is set and not null, its value is used as a format string
-+for @var{strftime} to print the time stamp associated with each history
-+entry displayed by the @code{history} builtin.
-+If this variable is set, time stamps are written to the history file so
-+they may be preserved across shell sessions.
-+
-+@item HOSTFILE
-+Contains the name of a file in the same format as @file{/etc/hosts} that
-+should be read when the shell needs to complete a hostname.
-+The list of possible hostname completions may be changed while the shell
-+is running;
-+the next time hostname completion is attempted after the
-+value is changed, Bash adds the contents of the new file to the
-+existing list.
-+If @env{HOSTFILE} is set, but has no value, Bash attempts to read 
-+@file{/etc/hosts} to obtain the list of possible hostname completions.
-+When @env{HOSTFILE} is unset, the hostname list is cleared.
-+
-+@item HOSTNAME
-+The name of the current host.
-+
-+@item HOSTTYPE
-+A string describing the machine Bash is running on.
-+
-+@item IGNOREEOF
-+Controls the action of the shell on receipt of an @code{EOF} character
-+as the sole input.  If set, the value denotes the number
-+of consecutive @code{EOF} characters that can be read as the
-+first character on an input line
-+before the shell will exit.  If the variable exists but does not
-+have a numeric value (or has no value) then the default is 10.
-+If the variable does not exist, then @code{EOF} signifies the end of 
-+input to the shell.  This is only in effect for interactive shells.
-+
-+@item INPUTRC
-+The name of the Readline initialization file, overriding the default
-+of @file{~/.inputrc}.
-+
-+@item LANG  
-+Used to determine the locale category for any category not specifically
-+selected with a variable starting with @code{LC_}.
-+
-+@item LC_ALL
-+This variable overrides the value of @env{LANG} and any other
-+@code{LC_} variable specifying a locale category.
-+
-+@item LC_COLLATE
-+This variable determines the collation order used when sorting the
-+results of filename expansion, and
-+determines the behavior of range expressions, equivalence classes,
-+and collating sequences within filename expansion and pattern matching
-+(@pxref{Filename Expansion}).
-+
-+@item LC_CTYPE
-+This variable determines the interpretation of characters and the
-+behavior of character classes within filename expansion and pattern
-+matching (@pxref{Filename Expansion}).
-+
-+@item LC_MESSAGES
-+This variable determines the locale used to translate double-quoted
-+strings preceded by a @samp{$} (@pxref{Locale Translation}).
-+
-+@item LC_NUMERIC
-+This variable determines the locale category used for number formatting.
-+
-+@item LINENO
-+The line number in the script or shell function currently executing.
-+
-+@item LINES
-+Used by the @code{select} builtin command to determine the column length
-+for printing selection lists.  Automatically set upon receipt of a
-+@code{SIGWINCH}.
-+
-+@item MACHTYPE
-+A string that fully describes the system type on which Bash
-+is executing, in the standard @sc{gnu} @var{cpu-company-system} format.
-+
-+@item MAILCHECK
-+How often (in seconds) that the shell should check for mail in the
-+files specified in the @env{MAILPATH} or @env{MAIL} variables.
-+The default is 60 seconds.  When it is time to check
-+for mail, the shell does so before displaying the primary prompt.
-+If this variable is unset, or set to a value that is not a number
-+greater than or equal to zero, the shell disables mail checking.
-+
-+@item OLDPWD
-+The previous working directory as set by the @code{cd} builtin.
-+
-+@item OPTERR
-+If set to the value 1, Bash displays error messages
-+generated by the @code{getopts} builtin command.
-+
-+@item OSTYPE
-+A string describing the operating system Bash is running on.
-+
-+@item PIPESTATUS
-+An array variable (@pxref{Arrays})
-+containing a list of exit status values from the processes
-+in the most-recently-executed foreground pipeline (which may
-+contain only a single command).
-+
-+@item POSIXLY_CORRECT
-+If this variable is in the environment when @code{bash} starts, the shell
-+enters @sc{posix} mode (@pxref{Bash POSIX Mode}) before reading the
-+startup files, as if the @option{--posix} invocation option had been supplied.
-+If it is set while the shell is running, @code{bash} enables @sc{posix} mode,
-+as if the command
-+@example
-+@code{set -o posix}
-+@end example
-+@noindent
-+had been executed.  
-+
-+@item PPID
-+The process @sc{id} of the shell's parent process.  This variable
-+is readonly.
-+
-+@item PROMPT_COMMAND
-+If set, the value is interpreted as a command to execute
-+before the printing of each primary prompt (@env{$PS1}).
-+
-+@item PS3
-+The value of this variable is used as the prompt for the
-+@code{select} command.  If this variable is not set, the
-+@code{select} command prompts with @samp{#? }
-+
-+@item PS4
-+The value is the prompt printed before the command line is echoed
-+when the @option{-x} option is set (@pxref{The Set Builtin}).
-+The first character of @env{PS4} is replicated multiple times, as
-+necessary, to indicate multiple levels of indirection.
-+The default is @samp{+ }.
-+
-+@item PWD
-+The current working directory as set by the @code{cd} builtin.
-+
-+@item RANDOM
-+Each time this parameter is referenced, a random integer
-+between 0 and 32767 is generated.  Assigning a value to this
-+variable seeds the random number generator.
-+
-+@item REPLY
-+The default variable for the @code{read} builtin.
-+
-+@item SECONDS
-+This variable expands to the number of seconds since the
-+shell was started.  Assignment to this variable resets
-+the count to the value assigned, and the expanded value
-+becomes the value assigned plus the number of seconds
-+since the assignment.
-+
-+@item SHELL
-+The full pathname to the shell is kept in this environment variable.
-+If it is not set when the shell starts,
-+Bash assigns to it the full pathname of the current user's login shell.
-+
-+@item SHELLOPTS
-+A colon-separated list of enabled shell options.  Each word in
-+the list is a valid argument for the @option{-o} option to the
-+@code{set} builtin command (@pxref{The Set Builtin}).
-+The options appearing in @env{SHELLOPTS} are those reported
-+as @samp{on} by @samp{set -o}.
-+If this variable is in the environment when Bash
-+starts up, each shell option in the list will be enabled before
-+reading any startup files.  This variable is readonly.
-+
-+@item SHLVL
-+Incremented by one each time a new instance of Bash is started.  This is
-+intended to be a count of how deeply your Bash shells are nested.
-+
-+@item TIMEFORMAT
-+The value of this parameter is used as a format string specifying
-+how the timing information for pipelines prefixed with the @code{time}
-+reserved word should be displayed.
-+The @samp{%} character introduces an
-+escape sequence that is expanded to a time value or other
-+information.
-+The escape sequences and their meanings are as
-+follows; the braces denote optional portions. 
-+
-+@table @code
-+
-+@item %%
-+A literal @samp{%}.
-+
-+@item %[@var{p}][l]R
-+The elapsed time in seconds. 
-+
-+@item %[@var{p}][l]U
-+The number of CPU seconds spent in user mode. 
-+
-+@item %[@var{p}][l]S
-+The number of CPU seconds spent in system mode. 
-+
-+@item %P
-+The CPU percentage, computed as (%U + %S) / %R. 
-+@end table
-+
-+The optional @var{p} is a digit specifying the precision, the number of
-+fractional digits after a decimal point.
-+A value of 0 causes no decimal point or fraction to be output.
-+At most three places after the decimal point may be specified; values
-+of @var{p} greater than 3 are changed to 3.
-+If @var{p} is not specified, the value 3 is used. 
-+
-+The optional @code{l} specifies a longer format, including minutes, of
-+the form @var{MM}m@var{SS}.@var{FF}s.
-+The value of @var{p} determines whether or not the fraction is included. 
-+
-+If this variable is not set, Bash acts as if it had the value
-+@example
-+@code{$'\nreal\t%3lR\nuser\t%3lU\nsys\t%3lS'}
-+@end example
-+If the value is null, no timing information is displayed.
-+A trailing newline is added when the format string is displayed.
-+
-+@item TMOUT
-+If set to a value greater than zero, @code{TMOUT} is treated as the
-+default timeout for the @code{read} builtin (@pxref{Bash Builtins}).
-+The @code{select} command (@pxref{Conditional Constructs}) terminates
-+if input does not arrive after @code{TMOUT} seconds when input is coming
-+from a terminal.
-+
-+In an interative shell, the value is interpreted as
-+the number of seconds to wait for input after issuing the primary
-+prompt when the shell is interactive.
-+Bash terminates after that number of seconds if input does
-+not arrive.
-+
-+@item TMPDIR
-+If set, Bash uses its value as the name of a directory in which
-+Bash creates temporary files for the shell's use.
-+
-+@item UID
-+The numeric real user id of the current user.  This variable is readonly.
-+
-+@end vtable
-+
-+@node Bash Features
-+@chapter Bash Features
-+
-+This section describes features unique to Bash.
-+
-+@menu
-+* Invoking Bash::		Command line options that you can give
-+				to Bash.
-+* Bash Startup Files::		When and how Bash executes scripts.
-+* Interactive Shells::		What an interactive shell is.
-+* Bash Conditional Expressions::	Primitives used in composing expressions for
-+				the @code{test} builtin.
-+* Shell Arithmetic::		Arithmetic on shell variables.
-+* Aliases::			Substituting one command for another.
-+* Arrays::			Array Variables.
-+* The Directory Stack::		History of visited directories.
-+* Printing a Prompt::		Controlling the PS1 string.
-+* The Restricted Shell::	A more controlled mode of shell execution.
-+* Bash POSIX Mode::		Making Bash behave more closely to what
-+				the POSIX standard specifies.
-+@end menu
-+
-+@node Invoking Bash
-+@section Invoking Bash
-+
-+@example
-+bash [long-opt] [-ir] [-abefhkmnptuvxdBCDHP] [-o @var{option}] [-O @var{shopt_option}] [@var{argument} @dots{}]
-+bash [long-opt] [-abefhkmnptuvxdBCDHP] [-o @var{option}] [-O @var{shopt_option}] -c @var{string} [@var{argument} @dots{}]
-+bash [long-opt] -s [-abefhkmnptuvxdBCDHP] [-o @var{option}] [-O @var{shopt_option}] [@var{argument} @dots{}]
-+@end example
-+
-+In addition to the single-character shell command-line options
-+(@pxref{The Set Builtin}), there are several multi-character
-+options that you can use.  These options must appear on the command
-+line before the single-character options to be recognized. 
-+
-+@table @code
-+@item --debugger
-+Arrange for the debugger profile to be executed before the shell
-+starts.  Turns on extended debugging mode (see @ref{Bash Builtins}
-+for a description of the @code{extdebug} option to the @code{shopt}
-+builtin) and shell function tracing
-+(see @ref{The Set Builtin} for a description of the @code{-o functrace}
-+option).
-+
-+@item --dump-po-strings
-+A list of all double-quoted strings preceded by @samp{$}
-+is printed on the standard output
-+in the @sc{gnu} @code{gettext} PO (portable object) file format.
-+Equivalent to @option{-D} except for the output format.
-+
-+@item --dump-strings
-+Equivalent to @option{-D}.
-+
-+@item --help
-+Display a usage message on standard output and exit sucessfully.
-+
-+@item --init-file @var{filename}
-+@itemx --rcfile @var{filename}
-+Execute commands from @var{filename} (instead of @file{~/.bashrc})
-+in an interactive shell.
-+
-+@item --login
-+Equivalent to @option{-l}.
-+
-+@item --noediting
-+Do not use the @sc{gnu} Readline library (@pxref{Command Line Editing})
-+to read  command lines when the shell is interactive.
-+
-+@item --noprofile
-+Don't load the system-wide startup file @file{/etc/profile}
-+or any of the personal initialization files
-+@file{~/.bash_profile}, @file{~/.bash_login}, or @file{~/.profile}
-+when Bash is invoked as a login shell.
-+
-+@item --norc
-+Don't read the @file{~/.bashrc} initialization file in an
-+interactive shell.  This is on by default if the shell is
-+invoked as @code{sh}.
-+
-+@item --posix
-+Change the behavior of Bash where the default operation differs
-+from the @sc{posix} standard to match the standard.  This
-+is intended to make Bash behave as a strict superset of that
-+standard.  @xref{Bash POSIX Mode}, for a description of the Bash
-+@sc{posix} mode.
-+
-+@item --restricted
-+Make the shell a restricted shell (@pxref{The Restricted Shell}).
-+
-+@item --verbose
-+Equivalent to @option{-v}.  Print shell input lines as they're read.
-+
-+@item --version
-+Show version information for this instance of
-+Bash on the standard output and exit successfully.
-+
-+@end table
-+
-+There are several single-character options that may be supplied at
-+invocation which are not available with the @code{set} builtin.
-+
-+@table @code
-+@item -c @var{string}
-+Read and execute commands from @var{string} after processing the
-+options, then exit.  Any remaining arguments are assigned to the
-+positional parameters, starting with @code{$0}.
-+
-+@item -i
-+Force the shell to run interactively.  Interactive shells are
-+described in @ref{Interactive Shells}.
-+
-+@item -l
-+Make this shell act as if it had been directly invoked by login.
-+When the shell is interactive, this is equivalent to starting a
-+login shell with @samp{exec -l bash}.
-+When the shell is not interactive, the login shell startup files will
-+be executed.
-+@samp{exec bash -l} or @samp{exec bash --login}
-+will replace the current shell with a Bash login shell.
-+@xref{Bash Startup Files}, for a description of the special behavior
-+of a login shell.
-+
-+@item -r
-+Make the shell a restricted shell (@pxref{The Restricted Shell}).
-+
-+@item -s
-+If this option is present, or if no arguments remain after option
-+processing, then commands are read from the standard input.
-+This option allows the positional parameters to be set
-+when invoking an interactive shell.
-+
-+@item -D
-+A list of all double-quoted strings preceded by @samp{$}
-+is printed on the standard output.
-+These are the strings that
-+are subject to language translation when the current locale
-+is not @code{C} or @code{POSIX} (@pxref{Locale Translation}).
-+This implies the @option{-n} option; no commands will be executed.
-+
-+@item [-+]O [@var{shopt_option}]
-+@var{shopt_option} is one of the shell options accepted by the
-+@code{shopt} builtin (@pxref{Shell Builtin Commands}).
-+If @var{shopt_option} is present, @option{-O} sets the value of that option;
-+@option{+O} unsets it.  
-+If @var{shopt_option} is not supplied, the names and values of the shell
-+options accepted by @code{shopt} are printed on the standard output.
-+If the invocation option is @option{+O}, the output is displayed in a format
-+that may be reused as input.
-+
-+@item --
-+A @code{--} signals the end of options and disables further option
-+processing.
-+Any arguments after the @code{--} are treated as filenames and arguments.
-+
-+@end table
-+
-+@cindex login shell
-+A @emph{login} shell is one whose first character of argument zero is
-+@samp{-}, or one invoked with the @option{--login} option.
-+
-+@cindex interactive shell
-+An @emph{interactive} shell is one started without non-option arguments,
-+unless @option{-s} is specified,
-+without specifying the @option{-c} option, and whose input and output are both
-+connected to terminals (as determined by @code{isatty(3)}), or one
-+started with the @option{-i} option.  @xref{Interactive Shells}, for more
-+information.
-+
-+If arguments remain after option processing, and neither the
-+@option{-c} nor the @option{-s}
-+option has been supplied, the first argument is assumed to
-+be the name of a file containing shell commands (@pxref{Shell Scripts}).
-+When Bash is invoked in this fashion, @code{$0}
-+is set to the name of the file, and the positional parameters
-+are set to the remaining arguments.
-+Bash reads and executes commands from this file, then exits.   
-+Bash's exit status is the exit status of the last command executed
-+in the script.  If no commands are executed, the exit status is 0.
-+
-+@node Bash Startup Files
-+@section Bash Startup Files
-+@cindex startup files
-+
-+This section describs how Bash executes its startup files.
-+If any of the files exist but cannot be read, Bash reports an error.
-+Tildes are expanded in file names as described above under
-+Tilde Expansion (@pxref{Tilde Expansion}).
-+
-+Interactive shells are described in @ref{Interactive Shells}.
-+
-+@subsubheading Invoked as an interactive login shell, or with @option{--login}
-+
-+When Bash is invoked as an interactive login shell, or as a
-+non-interactive shell with the @option{--login} option, it first reads and
-+executes commands from the file @file{/etc/profile}, if that file exists.
-+After reading that file, it looks for @file{~/.bash_profile},
-+@file{~/.bash_login}, and @file{~/.profile}, in that order, and reads
-+and executes commands from the first one that exists and is readable.
-+The @option{--noprofile} option may be used when the shell is started to
-+inhibit this behavior.
-+
-+When a login shell exits, Bash reads and executes commands from
-+the file @file{~/.bash_logout}, if it exists.
-+
-+@subsubheading Invoked as an interactive non-login shell
-+
-+When an interactive shell that is not a login shell is started, Bash
-+reads and executes commands from @file{~/.bashrc}, if that file exists.
-+This may be inhibited by using the @option{--norc} option.
-+The @option{--rcfile @var{file}} option will force Bash to read and
-+execute commands from @var{file} instead of @file{~/.bashrc}.
-+
-+So, typically, your @file{~/.bash_profile} contains the line
-+@example
-+@code{if [ -f ~/.bashrc ]; then . ~/.bashrc; fi}
-+@end example
-+@noindent
-+after (or before) any login-specific initializations.
-+
-+@subsubheading Invoked non-interactively
-+
-+When Bash is started non-interactively, to run a shell script,
-+for example, it looks for the variable @env{BASH_ENV} in the environment,
-+expands its value if it appears there, and uses the expanded value as
-+the name of a file to read and execute.  Bash behaves as if the
-+following command were executed:
-+@example
-+@code{if [ -n "$BASH_ENV" ]; then . "$BASH_ENV"; fi}
-+@end example
-+@noindent
-+but the value of the @env{PATH} variable is not used to search for the
-+file name.
-+
-+As noted above, if a non-interactive shell is invoked with the
-+@option{--login} option, Bash attempts to read and execute commands from the
-+login shell startup files. 
-+
-+@subsubheading Invoked with name @code{sh}
-+
-+If Bash is invoked with the name @code{sh}, it tries to mimic the
-+startup behavior of historical versions of @code{sh} as closely as
-+possible, while conforming to the @sc{posix} standard as well.
-+
-+When invoked as an interactive login shell, or as a non-interactive
-+shell with the @option{--login} option, it first attempts to read
-+and execute commands from @file{/etc/profile} and @file{~/.profile}, in
-+that order.
-+The @option{--noprofile} option may be used to inhibit this behavior.
-+When invoked as an interactive shell with the name @code{sh}, Bash
-+looks for the variable @env{ENV}, expands its value if it is defined,
-+and uses the expanded value as the name of a file to read and execute.
-+Since a shell invoked as @code{sh} does not attempt to read and execute
-+commands from any other startup files, the @option{--rcfile} option has
-+no effect.
-+A non-interactive shell invoked with the name @code{sh} does not attempt
-+to read any other startup files.
-+
-+When invoked as @code{sh}, Bash enters @sc{posix} mode after
-+the startup files are read.
-+
-+@subsubheading Invoked in @sc{posix} mode
-+
-+When Bash is started in @sc{posix} mode, as with the
-+@option{--posix} command line option, it follows the @sc{posix} standard
-+for startup files.
-+In this mode, interactive shells expand the @env{ENV} variable
-+and commands are read and executed from the file whose name is the
-+expanded value.
-+No other startup files are read.
-+
-+@subsubheading Invoked by remote shell daemon
-+
-+Bash attempts to determine when it is being run by the remote shell
-+daemon, usually @code{rshd}.  If Bash determines it is being run by
-+rshd, it reads and executes commands from @file{~/.bashrc}, if that
-+file exists and is readable.
-+It will not do this if invoked as @code{sh}.
-+The @option{--norc} option may be used to inhibit this behavior, and the
-+@option{--rcfile} option may be used to force another file to be read, but
-+@code{rshd} does not generally invoke the shell with those options or
-+allow them to be specified.
-+
-+@subsubheading Invoked with unequal effective and real @sc{uid/gid}s
-+
-+If Bash is started with the effective user (group) id not equal to the
-+real user (group) id, and the @code{-p} option is not supplied, no startup
-+files are read, shell functions are not inherited from the environment,
-+the @env{SHELLOPTS} variable, if it appears in the environment, is ignored,
-+and the effective user id is set to the real user id.
-+If the @code{-p} option is supplied at invocation, the startup behavior is
-+the same, but the effective user id is not reset.
-+
-+@node Interactive Shells
-+@section Interactive Shells
-+@cindex interactive shell
-+@cindex shell, interactive
-+
-+@menu
-+* What is an Interactive Shell?::	What determines whether a shell is Interactive.
-+* Is this Shell Interactive?::	How to tell if a shell is interactive.
-+* Interactive Shell Behavior::	What changes in a interactive shell?
-+@end menu
-+
-+@node What is an Interactive Shell?
-+@subsection What is an Interactive Shell?
-+
-+An interactive shell
-+is one started without non-option arguments, unless @option{-s} is
-+specified, without specifiying the @option{-c} option, and
-+whose input and error output are both
-+connected to terminals (as determined by @code{isatty(3)}),
-+or one started with the @option{-i} option.
-+
-+An interactive shell generally reads from and writes to a user's
-+terminal.
-+
-+The @option{-s} invocation option may be used to set the positional parameters
-+when an interactive shell is started.
-+
-+@node Is this Shell Interactive?
-+@subsection Is this Shell Interactive?
-+
-+To determine within a startup script whether or not Bash is
-+running interactively,
-+test the value of the @samp{-} special parameter.
-+It contains @code{i} when the shell is interactive.  For example:
-+
-+@example
-+case "$-" in
-+*i*)	echo This shell is interactive ;;
-+*)	echo This shell is not interactive ;;
-+esac
-+@end example
-+
-+Alternatively, startup scripts may examine the variable
-+@env{PS1}; it is unset in non-interactive shells, and set in
-+interactive shells.  Thus:
-+
-+@example
-+if [ -z "$PS1" ]; then
-+        echo This shell is not interactive
-+else
-+        echo This shell is interactive
-+fi
-+@end example
-+
-+@node Interactive Shell Behavior
-+@subsection Interactive Shell Behavior
-+
-+When the shell is running interactively, it changes its behavior in
-+several ways.
-+
-+@enumerate
-+@item
-+Startup files are read and executed as described in @ref{Bash Startup Files}.
-+
-+@item
-+Job Control (@pxref{Job Control}) is enabled by default.  When job
-+control is in effect, Bash ignores the keyboard-generated job control
-+signals @code{SIGTTIN}, @code{SIGTTOU}, and @code{SIGTSTP}.
-+
-+@item
-+Bash expands and displays @env{PS1} before reading the first line
-+of a command, and expands and displays @env{PS2} before reading the
-+second and subsequent lines of a multi-line command.
-+
-+@item
-+Bash executes the value of the @env{PROMPT_COMMAND} variable as a command
-+before printing the primary prompt, @env{$PS1}
-+(@pxref{Bash Variables}).
-+
-+@item
-+Readline (@pxref{Command Line Editing}) is used to read commands from
-+the user's terminal.
-+
-+@item
-+Bash inspects the value of the @code{ignoreeof} option to @code{set -o}
-+instead of exiting immediately when it receives an @code{EOF} on its
-+standard input when reading a command (@pxref{The Set Builtin}).
-+
-+@item
-+Command history (@pxref{Bash History Facilities})
-+and history expansion (@pxref{History Interaction})
-+are enabled by default.
-+Bash will save the command history to the file named by @env{$HISTFILE}
-+when an interactive shell exits.
-+
-+@item
-+Alias expansion (@pxref{Aliases}) is performed by default.
-+
-+@item
-+In the absence of any traps, Bash ignores @code{SIGTERM}
-+(@pxref{Signals}).
-+
-+@item
-+In the absence of any traps, @code{SIGINT} is caught and handled
-+((@pxref{Signals}).
-+@code{SIGINT} will interrupt some shell builtins.
-+
-+@item
-+An interactive login shell sends a @code{SIGHUP} to all jobs on exit
-+if the @code{hupoxexit} shell option has been enabled (@pxref{Signals}).
-+
-+@item
-+The @option{-n} invocation option is ignored, and @samp{set -n} has
-+no effect (@pxref{The Set Builtin}).
-+
-+@item
-+Bash will check for mail periodically, depending on the values of the
-+@env{MAIL}, @env{MAILPATH}, and @env{MAILCHECK} shell variables
-+(@pxref{Bash Variables}).
-+
-+@item
-+Expansion errors due to references to unbound shell variables after
-+@samp{set -u} has been enabled will not cause the shell to exit
-+(@pxref{The Set Builtin}).
-+
-+@item
-+The shell will not exit on expansion errors caused by @var{var} being unset
-+or null in @code{$@{@var{var}:?@var{word}@}} expansions
-+(@pxref{Shell Parameter Expansion}).
-+
-+@item
-+Redirection errors encountered by shell builtins will not cause the
-+shell to exit.
-+
-+@item
-+When running in @sc{posix} mode, a special builtin returning an error
-+status will not cause the shell to exit (@pxref{Bash POSIX Mode}).
-+
-+@item
-+A failed @code{exec} will not cause the shell to exit
-+(@pxref{Bourne Shell Builtins}).
-+
-+@item
-+Parser syntax errors will not cause the shell to exit.
-+
-+@item
-+Simple spelling correction for directory arguments to the @code{cd}
-+builtin is enabled by default (see the description of the @code{cdspell}
-+option to the @code{shopt} builtin in @ref{Bash Builtins}).
-+
-+@item
-+The shell will check the value of the @env{TMOUT} variable and exit
-+if a command is not read within the specified number of seconds after
-+printing @env{$PS1} (@pxref{Bash Variables}).
-+
-+@end enumerate
-+
-+@node Bash Conditional Expressions
-+@section Bash Conditional Expressions
-+@cindex expressions, conditional
-+
-+Conditional expressions are used by the @code{[[} compound command
-+and the @code{test} and @code{[} builtin commands.
-+
-+Expressions may be unary or binary.
-+Unary expressions are often used to examine the status of a file.
-+There are string operators and numeric comparison operators as well.
-+If the @var{file} argument to one of the primaries is of the form
-+@file{/dev/fd/@var{N}}, then file descriptor @var{N} is checked.
-+If the @var{file} argument to one of the primaries is one of
-+@file{/dev/stdin}, @file{/dev/stdout}, or @file{/dev/stderr}, file
-+descriptor 0, 1, or 2, respectively, is checked.
-+
-+Unless otherwise specified, primaries that operate on files follow symbolic
-+links and operate on the target of the link, rather than the link itself.
-+
-+@table @code
-+@item -a @var{file}
-+True if @var{file} exists.
-+
-+@item -b @var{file}
-+True if @var{file} exists and is a block special file.
-+
-+@item -c @var{file}
-+True if @var{file} exists and is a character special file.
-+
-+@item -d @var{file}
-+True if @var{file} exists and is a directory.
-+
-+@item -e @var{file}
-+True if @var{file} exists.
-+
-+@item -f @var{file}
-+True if @var{file} exists and is a regular file.
-+
-+@item -g @var{file}
-+True if @var{file} exists and its set-group-id bit is set.
-+
-+@item -h @var{file}
-+True if @var{file} exists and is a symbolic link.
-+
-+@item -k @var{file}
-+True if @var{file} exists and its "sticky" bit is set.
-+
-+@item -p @var{file}
-+True if @var{file} exists and is a named pipe (FIFO).
-+
-+@item -r @var{file}
-+True if @var{file} exists and is readable.
-+
-+@item -s @var{file}
-+True if @var{file} exists and has a size greater than zero.
-+
-+@item -t @var{fd}
-+True if file descriptor @var{fd} is open and refers to a terminal.
-+
-+@item -u @var{file}
-+True if @var{file} exists and its set-user-id bit is set.
-+
-+@item -w @var{file}
-+True if @var{file} exists and is writable.
-+
-+@item -x @var{file}
-+True if @var{file} exists and is executable.
-+
-+@item -O @var{file}
-+True if @var{file} exists and is owned by the effective user id.
-+
-+@item -G @var{file}
-+True if @var{file} exists and is owned by the effective group id.
-+
-+@item -L @var{file}
-+True if @var{file} exists and is a symbolic link.
-+
-+@item -S @var{file}
-+True if @var{file} exists and is a socket.
-+
-+@item -N @var{file}
-+True if @var{file} exists and has been modified since it was last read.
-+
-+@item @var{file1} -nt @var{file2}
-+True if @var{file1} is newer (according to modification date)
-+than @var{file2}, or if @var{file1} exists and @var{file2} does not.
-+
-+@item @var{file1} -ot @var{file2}
-+True if @var{file1} is older than @var{file2},
-+or if @var{file2} exists and @var{file1} does not.
-+
-+@item @var{file1} -ef @var{file2}
-+True if @var{file1} and @var{file2} refer to the same device and
-+inode numbers.
-+
-+@item -o @var{optname}
-+True if shell option @var{optname} is enabled.
-+The list of options appears in the description of the @option{-o}
-+option to the @code{set} builtin (@pxref{The Set Builtin}).
-+
-+@item -z @var{string}
-+True if the length of @var{string} is zero.
-+
-+@item -n @var{string}
-+@itemx @var{string}
-+True if the length of @var{string} is non-zero.
-+
-+@item @var{string1} == @var{string2}
-+True if the strings are equal.
-+@samp{=} may be used in place of @samp{==} for strict @sc{posix} compliance.
-+
-+@item @var{string1} != @var{string2}
-+True if the strings are not equal.
-+
-+@item @var{string1} < @var{string2}
-+True if @var{string1} sorts before @var{string2} lexicographically
-+in the current locale.
-+
-+@item @var{string1} > @var{string2}
-+True if @var{string1} sorts after @var{string2} lexicographically
-+in the current locale.
-+
-+@item @var{arg1} OP @var{arg2}
-+@code{OP} is one of 
-+@samp{-eq}, @samp{-ne}, @samp{-lt}, @samp{-le}, @samp{-gt}, or @samp{-ge}.
-+These arithmetic binary operators return true if @var{arg1}
-+is equal to, not equal to, less than, less than or equal to,
-+greater than, or greater than or equal to @var{arg2},
-+respectively.  @var{Arg1} and @var{arg2}
-+may be positive or negative integers.
-+
-+@end table
-+
-+@node Shell Arithmetic
-+@section Shell Arithmetic
-+@cindex arithmetic, shell
-+@cindex shell arithmetic
-+@cindex expressions, arithmetic
-+@cindex evaluation, arithmetic
-+@cindex arithmetic evaluation
-+
-+The shell allows arithmetic expressions to be evaluated, as one of
-+the shell expansions or by the @code{let} and the @option{-i} option
-+to the @code{declare} builtins.
-+
-+Evaluation is done in fixed-width integers with no check for overflow,
-+though division by 0 is trapped and flagged as an error.
-+The operators and their precedence, associativity, and values
-+are the same as in the C language.
-+The following list of operators is grouped into levels of
-+equal-precedence operators.
-+The levels are listed in order of decreasing precedence. 
-+
-+@table @code
-+
-+@item @var{id}++ @var{id}--
-+variable post-increment and post-decrement 
-+
-+@item ++@var{id} --@var{id}
-+variable pre-increment and pre-decrement
-+
-+@item - +
-+unary minus and plus
-+
-+@item ! ~
-+logical and bitwise negation
-+
-+@item **
-+exponentiation
-+
-+@item * / %
-+multiplication, division, remainder
-+
-+@item + -
-+addition, subtraction
-+
-+@item << >>
-+left and right bitwise shifts
-+
-+@item <= >= < >
-+comparison
-+
-+@item == !=
-+equality and inequality
-+
-+@item &
-+bitwise AND
-+
-+@item ^
-+bitwise exclusive OR
-+
-+@item |
-+bitwise OR
-+
-+@item &&
-+logical AND
-+
-+@item ||
-+logical OR
-+
-+@item expr ? expr : expr
-+conditional operator
-+
-+@item = *= /= %= += -= <<= >>= &= ^= |=
-+assignment
-+
-+@item expr1 , expr2
-+comma
-+@end table
-+
-+Shell variables are allowed as operands; parameter expansion is
-+performed before the expression is evaluated. 
-+Within an expression, shell variables may also be referenced by name
-+without using the parameter expansion syntax.
-+A shell variable that is null or unset evaluates to 0 when referenced
-+by name without using the parameter expansion syntax.
-+The value of a variable is evaluated as an arithmetic expression
-+when it is referenced, or when a variable which has been given the  
-+@var{integer} attribute using @samp{declare -i} is assigned a value.
-+A null value evaluates to 0.
-+A shell variable need not have its integer attribute turned on
-+to be used in an expression.
-+
-+Constants with a leading 0 are interpreted as octal numbers.
-+A leading @samp{0x} or @samp{0X} denotes hexadecimal.  Otherwise,
-+numbers take the form [@var{base}@code{#}]@var{n}, where @var{base}
-+is a decimal number between 2 and 64 representing the arithmetic
-+base, and @var{n} is a number in that base.  If @var{base}@code{#} is
-+omitted, then base 10 is used.
-+The digits greater than 9 are represented by the lowercase letters,
-+the uppercase letters, @samp{@@}, and @samp{_}, in that order.
-+If @var{base} is less than or equal to 36, lowercase and uppercase
-+letters may be used interchangeably to represent numbers between 10
-+and 35.
-+
-+Operators are evaluated in order of precedence.  Sub-expressions in
-+parentheses are evaluated first and may override the precedence
-+rules above.
-+
-+@node Aliases
-+@section Aliases
-+@cindex alias expansion
-+
-+@var{Aliases} allow a string to be substituted for a word when it is used
-+as the first word of a simple command.
-+The shell maintains a list of aliases that may be set and unset with
-+the @code{alias} and @code{unalias} builtin commands.
-+
-+The first word of each simple command, if unquoted, is checked to see
-+if it has an alias.
-+If so, that word is replaced by the text of the alias.
-+The characters @samp{/}, @samp{$}, @samp{`}, @samp{=} and any of the
-+shell metacharacters or quoting characters listed above may not appear
-+in an alias name.
-+The replacement text may contain any valid
-+shell input, including shell metacharacters.
-+The first word of the replacement text is tested for
-+aliases, but a word that is identical to an alias being expanded
-+is not expanded a second time.
-+This means that one may alias @code{ls} to @code{"ls -F"},
-+for instance, and Bash does not try to recursively expand the
-+replacement text. If the last character of the alias value is a
-+space or tab character, then the next command word following the
-+alias is also checked for alias expansion.
-+
-+Aliases are created and listed with the @code{alias}
-+command, and removed with the @code{unalias} command.
-+
-+There is no mechanism for using arguments in the replacement text,
-+as in @code{csh}.
-+If arguments are needed, a shell function should be used
-+(@pxref{Shell Functions}).
-+
-+Aliases are not expanded when the shell is not interactive,
-+unless the @code{expand_aliases} shell option is set using
-+@code{shopt} (@pxref{Bash Builtins}).
-+
-+The rules concerning the definition and use of aliases are
-+somewhat confusing.  Bash
-+always reads at least one complete line
-+of input before executing any
-+of the commands on that line.  Aliases are expanded when a
-+command is read, not when it is executed.  Therefore, an
-+alias definition appearing on the same line as another
-+command does not take effect until the next line of input is read.
-+The commands following the alias definition
-+on that line are not affected by the new alias.
-+This behavior is also an issue when functions are executed.
-+Aliases are expanded when a function definition is read,
-+not when the function is executed, because a function definition
-+is itself a compound command.  As a consequence, aliases
-+defined in a function are not available until after that
-+function is executed.  To be safe, always put
-+alias definitions on a separate line, and do not use @code{alias}
-+in compound commands.
-+
-+For almost every purpose, shell functions are preferred over aliases.
-+
-+@node Arrays
-+@section Arrays
-+@cindex arrays
-+
-+Bash provides one-dimensional array variables.  Any variable may be used as
-+an array; the @code{declare} builtin will explicitly declare an array.
-+There is no maximum
-+limit on the size of an array, nor any requirement that members
-+be indexed or assigned contiguously.  Arrays are zero-based.
-+
-+An array is created automatically if any variable is assigned to using
-+the syntax
-+@example
-+name[@var{subscript}]=@var{value}
-+@end example
-+
-+@noindent
-+The @var{subscript}
-+is treated as an arithmetic expression that must evaluate to a number
-+greater than or equal to zero.  To explicitly declare an array, use
-+@example
-+declare -a @var{name}
-+@end example
-+@noindent
-+The syntax
-+@example
-+declare -a @var{name}[@var{subscript}]
-+@end example
-+@noindent
-+is also accepted; the @var{subscript} is ignored.  Attributes may be
-+specified for an array variable using the @code{declare} and
-+@code{readonly} builtins.  Each attribute applies to all members of
-+an array.
-+
-+Arrays are assigned to using compound assignments of the form
-+@example
-+name=(value@var{1} @dots{} value@var{n})
-+@end example
-+@noindent
-+where each
-+@var{value} is of the form @code{[[@var{subscript}]=]}@var{string}.  If
-+the optional subscript is supplied, that index is assigned to;
-+otherwise the index of the element assigned is the last index assigned
-+to by the statement plus one.  Indexing starts at zero.
-+This syntax is also accepted by the @code{declare}
-+builtin.  Individual array elements may be assigned to using the
-+@code{name[}@var{subscript}@code{]=}@var{value} syntax introduced above.
-+
-+Any element of an array may be referenced using
-+@code{$@{name[}@var{subscript}@code{]@}}.
-+The braces are required to avoid
-+conflicts with the shell's filename expansion operators.  If the
-+@var{subscript} is @samp{@@} or @samp{*}, the word expands to all members
-+of the array @var{name}.  These subscripts differ only when the word
-+appears within double quotes.
-+If the word is double-quoted,
-+@code{$@{name[*]@}} expands to a single word with
-+the value of each array member separated by the first character of the
-+@env{IFS} variable, and @code{$@{name[@@]@}} expands each element of
-+@var{name} to a separate word.  When there are no array members,
-+@code{$@{name[@@]@}} expands to nothing.
-+If the double-quoted expansion occurs within a word, the expansion of
-+the first parameter is joined with the beginning part of the original
-+word, and the expansion of the last parameter is joined with the last
-+part of the original word.
-+This is analogous to the
-+expansion of the special parameters @samp{@@} and @samp{*}. 
-+@code{$@{#name[}@var{subscript}@code{]@}} expands to the length of
-+@code{$@{name[}@var{subscript}@code{]@}}.
-+If @var{subscript} is @samp{@@} or
-+@samp{*}, the expansion is the number of elements in the array. 
-+Referencing an array variable without a subscript is equivalent to
-+referencing element zero. 
-+
-+The @code{unset} builtin is used to destroy arrays.
-+@code{unset} @var{name}[@var{subscript}]
-+destroys the array element at index @var{subscript}.
-+Care must be taken to avoid unwanted side effects caused by filename
-+generation.
-+@code{unset} @var{name}, where @var{name} is an array, removes the
-+entire array. A subscript of @samp{*} or @samp{@@} also removes the
-+entire array.
-+
-+The @code{declare}, @code{local}, and @code{readonly}
-+builtins each accept a @option{-a}
-+option to specify an array.  The @code{read}
-+builtin accepts a @option{-a}
-+option to assign a list of words read from the standard input
-+to an array, and can read values from the standard input into
-+individual array elements.  The @code{set} and @code{declare}
-+builtins display array values in a way that allows them to be
-+reused as input.
-+
-+@node The Directory Stack
-+@section The Directory Stack
-+@cindex directory stack
-+
-+@menu
-+* Directory Stack Builtins::		Bash builtin commands to manipulate
-+					the directory stack.
-+@end menu
-+
-+The directory stack is a list of recently-visited directories.  The
-+@code{pushd} builtin adds directories to the stack as it changes
-+the current directory, and the @code{popd} builtin removes specified
-+directories from the stack and changes the current directory to
-+the directory removed.  The @code{dirs} builtin displays the contents
-+of the directory stack.
-+
-+The contents of the directory stack are also visible
-+as the value of the @env{DIRSTACK} shell variable.
-+
-+@node Directory Stack Builtins
-+@subsection Directory Stack Builtins
-+
-+@table @code
-+
-+@item dirs
-+@btindex dirs
-+@example
-+dirs [+@var{N} | -@var{N}] [-clpv]
-+@end example
-+Display the list of currently remembered directories.  Directories
-+are added to the list with the @code{pushd} command; the
-+@code{popd} command removes directories from the list.
-+@table @code
-+@item +@var{N}
-+Displays the @var{N}th directory (counting from the left of the
-+list printed by @code{dirs} when invoked without options), starting
-+with zero.
-+@item -@var{N}
-+Displays the @var{N}th directory (counting from the right of the
-+list printed by @code{dirs} when invoked without options), starting
-+with zero.
-+@item -c
-+Clears the directory stack by deleting all of the elements.
-+@item -l
-+Produces a longer listing; the default listing format uses a 
-+tilde to denote the home directory.
-+@item -p
-+Causes @code{dirs} to print the directory stack with one entry per
-+line.
-+@item -v
-+Causes @code{dirs} to print the directory stack with one entry per
-+line, prefixing each entry with its index in the stack.
-+@end table
-+
-+@item popd
-+@btindex popd
-+@example
-+popd [+@var{N} | -@var{N}] [-n]
-+@end example
-+
-+Remove the top entry from the directory stack, and @code{cd}
-+to the new top directory.
-+When no arguments are given, @code{popd}
-+removes the top directory from the stack and
-+performs a @code{cd} to the new top directory.  The
-+elements are numbered from 0 starting at the first directory listed with
-+@code{dirs}; i.e., @code{popd} is equivalent to @code{popd +0}.
-+@table @code
-+@item +@var{N}
-+Removes the @var{N}th directory (counting from the left of the
-+list printed by @code{dirs}), starting with zero.
-+@item -@var{N}
-+Removes the @var{N}th directory (counting from the right of the
-+list printed by @code{dirs}), starting with zero.
-+@item -n
-+Suppresses the normal change of directory when removing directories
-+from the stack, so that only the stack is manipulated.
-+@end table
-+
-+@btindex pushd
-+@item pushd
-+@example
-+pushd [@var{dir} | @var{+N} | @var{-N}] [-n]
-+@end example
-+
-+Save the current directory on the top of the directory stack
-+and then @code{cd} to @var{dir}.
-+With no arguments, @code{pushd} exchanges the top two directories.
-+
-+@table @code
-+@item +@var{N}
-+Brings the @var{N}th directory (counting from the left of the
-+list printed by @code{dirs}, starting with zero) to the top of
-+the list by rotating the stack.
-+@item -@var{N}
-+Brings the @var{N}th directory (counting from the right of the
-+list printed by @code{dirs}, starting with zero) to the top of
-+the list by rotating the stack.
-+@item -n
-+Suppresses the normal change of directory when adding directories
-+to the stack, so that only the stack is manipulated.
-+@item @var{dir}
-+Makes the current working directory be the top of the stack, and then
-+executes the equivalent of `@code{cd} @var{dir}'.
-+@code{cd}s to @var{dir}.
-+@end table
-+
-+@end table
-+
-+@node Printing a Prompt
-+@section Controlling the Prompt
-+@cindex prompting
-+
-+The value of the variable @env{PROMPT_COMMAND} is examined just before
-+Bash prints each primary prompt.  If @env{PROMPT_COMMAND} is set and
-+has a non-null value, then the
-+value is executed just as if it had been typed on the command line.
-+
-+In addition, the following table describes the special characters which
-+can appear in the prompt variables:
-+
-+@table @code
-+@item \a
-+A bell character.
-+@item \d
-+The date, in "Weekday Month Date" format (e.g., "Tue May 26").
-+@item \D@{@var{format}@}
-+The @var{format} is passed to @code{strftime}(3) and the result is inserted
-+into the prompt string; an empty @var{format} results in a locale-specific
-+time representation.  The braces are required.
-+@item \e
-+An escape character.
-+@item \h
-+The hostname, up to the first `.'.
-+@item \H
-+The hostname.
-+@item \j
-+The number of jobs currently managed by the shell.
-+@item \l
-+The basename of the shell's terminal device name.
-+@item \n
-+A newline.
-+@item \r
-+A carriage return.
-+@item \s
-+The name of the shell, the basename of @code{$0} (the portion
-+following the final slash).
-+@item \t
-+The time, in 24-hour HH:MM:SS format.
-+@item \T
-+The time, in 12-hour HH:MM:SS format.
-+@item \@@
-+The time, in 12-hour am/pm format.
-+@item \A
-+The time, in 24-hour HH:MM format.
-+@item \u
-+The username of the current user.
-+@item \v
-+The version of Bash (e.g., 2.00)          
-+@item \V
-+The release of Bash, version + patchlevel (e.g., 2.00.0)
-+@item \w
-+The current working directory, with @env{$HOME} abbreviated with a tilde.
-+@item \W
-+The basename of @env{$PWD}, with @env{$HOME} abbreviated with a tilde.
-+@item \!
-+The history number of this command.
-+@item \#
-+The command number of this command.
-+@item \$
-+If the effective uid is 0, @code{#}, otherwise @code{$}.
-+@item \@var{nnn}
-+The character whose ASCII code is the octal value @var{nnn}.
-+@item \\
-+A backslash.
-+@item \[
-+Begin a sequence of non-printing characters.  This could be used to
-+embed a terminal control sequence into the prompt.
-+@item \]
-+End a sequence of non-printing characters.
-+@end table
-+
-+The command number and the history number are usually different:
-+the history number of a command is its position in the history
-+list, which may include commands restored from the history file
-+(@pxref{Bash History Facilities}), while the command number is
-+the position in the sequence of commands executed during the current
-+shell session.
-+
-+After the string is decoded, it is expanded via
-+parameter expansion, command substitution, arithmetic
-+expansion, and quote removal, subject to the value of the
-+@code{promptvars} shell option (@pxref{Bash Builtins}).
-+
-+@node The Restricted Shell
-+@section The Restricted Shell
-+@cindex restricted shell
-+
-+If Bash is started with the name @code{rbash}, or the
-+@option{--restricted}
-+or
-+@option{-r}
-+option is supplied at invocation, the shell becomes restricted.
-+A restricted shell is used to
-+set up an environment more controlled than the standard shell.
-+A restricted shell behaves identically to @code{bash}
-+with the exception that the following are disallowed or not performed:
-+
-+@itemize @bullet
-+@item
-+Changing directories with the @code{cd} builtin.
-+@item
-+Setting or unsetting the values of the @env{SHELL}, @env{PATH},
-+@env{ENV}, or @env{BASH_ENV} variables.
-+@item
-+Specifying command names containing slashes.
-+@item
-+Specifying a filename containing a slash as an argument to the @code{.}
-+builtin command.
-+@item
-+Specifying a filename containing a slash as an argument to the @option{-p}
-+option to the @code{hash} builtin command.
-+@item
-+Importing function definitions from the shell environment at startup.
-+@item
-+Parsing the value of @env{SHELLOPTS} from the shell environment at startup.
-+@item
-+Redirecting output using the @samp{>}, @samp{>|}, @samp{<>}, @samp{>&},
-+@samp{&>}, and @samp{>>} redirection operators.
-+@item
-+Using the @code{exec} builtin to replace the shell with another command.
-+@item
-+Adding or deleting builtin commands with the
-+@option{-f} and @option{-d} options to the @code{enable} builtin.
-+@item
-+Using the @code{enable} builtin command to enable disabled shell builtins.
-+@item
-+Specifying the @option{-p} option to the @code{command} builtin.
-+@item
-+Turning off restricted mode with @samp{set +r} or @samp{set +o restricted}.
-+@end itemize
-+
-+These restrictions are enforced after any startup files are read.
-+
-+When a command that is found to be a shell script is executed
-+(@pxref{Shell Scripts}), @code{rbash} turns off any restrictions in
-+the shell spawned to execute the script.
-+
-+@node Bash POSIX Mode
-+@section Bash POSIX Mode
-+@cindex POSIX Mode
-+
-+Starting Bash with the @option{--posix} command-line option or executing
-+@samp{set -o posix} while Bash is running will cause Bash to conform more
-+closely to the @sc{posix} standard by changing the behavior to
-+match that specified by @sc{posix} in areas where the Bash default differs.
-+
-+When invoked as @code{sh}, Bash enters @sc{posix} mode after reading the
-+startup files.
-+
-+The following list is what's changed when `@sc{posix} mode' is in effect:
-+
-+@enumerate
-+@item
-+When a command in the hash table no longer exists, Bash will re-search
-+@env{$PATH} to find the new location.  This is also available with
-+@samp{shopt -s checkhash}.
-+
-+@item
-+The message printed by the job control code and builtins when a job
-+exits with a non-zero status is `Done(status)'.
-+
-+@item
-+The message printed by the job control code and builtins when a job
-+is stopped is `Stopped(@var{signame})', where @var{signame} is, for
-+example, @code{SIGTSTP}.
-+
-+@item
-+The @code{bg} builtin uses the required format to describe each job placed
-+in the background, which does not include an indication of whether the job
-+is the current or previous job.
-+
-+@item
-+Reserved words appearing in a context where reserved words are recognized
-+do not undergo alias expansion.
-+
-+@item
-+The @sc{posix} @env{PS1} and @env{PS2} expansions of @samp{!} to
-+the history number and @samp{!!} to @samp{!} are enabled,
-+and parameter expansion is performed on the values of @env{PS1} and
-+@env{PS2} regardless of the setting of the @code{promptvars} option.
-+
-+@item
-+The @sc{posix} startup files are executed (@env{$ENV}) rather than
-+the normal Bash files.
-+
-+@item
-+Tilde expansion is only performed on assignments preceding a command
-+name, rather than on all assignment statements on the line.
-+
-+@item
-+The default history file is @file{~/.sh_history} (this is the
-+default value of @env{$HISTFILE}).
-+
-+@item
-+The output of @samp{kill -l} prints all the signal names on a single line,
-+separated by spaces, without the @samp{SIG} prefix.
-+
-+@item
-+The @code{kill} builtin does not accept signal names with a @samp{SIG}
-+prefix.
-+
-+@item
-+Non-interactive shells exit if @var{filename} in @code{.} @var{filename}
-+is not found.
-+
-+@item
-+Non-interactive shells exit if a syntax error in an arithmetic expansion
-+results in an invalid expression.
-+
-+@item
-+Redirection operators do not perform filename expansion on the word
-+in the redirection unless the shell is interactive.
-+
-+@item
-+Redirection operators do not perform word splitting on the word in the
-+redirection.
-+
-+@item
-+Function names must be valid shell @code{name}s.  That is, they may not
-+contain characters other than letters, digits, and underscores, and
-+may not start with a digit.  Declaring a function with an invalid name
-+causes a fatal syntax error in non-interactive shells.
-+
-+@item
-+@sc{posix} special builtins are found before shell functions
-+during command lookup.
-+
-+@item
-+If a @sc{posix} special builtin returns an error status, a
-+non-interactive shell exits.  The fatal errors are those listed in
-+the POSIX standard, and include things like passing incorrect options,
-+redirection errors, variable assignment errors for assignments preceding
-+the command name, and so on.
-+
-+@item
-+If @env{CDPATH} is set, the @code{cd} builtin will not implicitly
-+append the current directory to it.  This means that @code{cd} will
-+fail if no valid directory name can be constructed from
-+any of the entries in @env{$CDPATH}, even if the a directory with
-+the same name as the name given as an argument to @code{cd} exists
-+in the current directory.
-+
-+@item
-+A non-interactive shell exits with an error status if a variable
-+assignment error occurs when no command name follows the assignment
-+statements.
-+A variable assignment error occurs, for example, when trying to assign
-+a value to a readonly variable.
-+
-+@item
-+A non-interactive shell exits with an error status if the iteration
-+variable in a @code{for} statement or the selection variable in a
-+@code{select} statement is a readonly variable.
-+
-+@item
-+Process substitution is not available.
-+
-+@item
-+Assignment statements preceding @sc{posix} special builtins
-+persist in the shell environment after the builtin completes.
-+
-+@item
-+Assignment statements preceding shell function calls persist in the
-+shell environment after the function returns, as if a @sc{posix}
-+special builtin command had been executed.
-+
-+@item
-+The @code{export} and @code{readonly} builtin commands display their
-+output in the format required by @sc{posix}.
-+
-+@item
-+The @code{trap} builtin displays signal names without the leading
-+@code{SIG}.
-+
-+@item
-+The @code{trap} builtin doesn't check the first argument for a possible
-+signal specification and revert the signal handling to the original
-+disposition if it is, unless that argument consists solely of digits and
-+is a valid signal number.  If users want to reset the handler for a given
-+signal to the original disposition, they should use @samp{-} as the
-+first argument.
-+
-+@item
-+The @code{.} and @code{source} builtins do not search the current directory
-+for the filename argument if it is not found by searching @env{PATH}.
-+
-+@item
-+Subshells spawned to execute command substitutions inherit the value of
-+the @option{-e} option from the parent shell.  When not in @sc{posix} mode,
-+Bash clears the @option{-e} option in such subshells.
-+
-+@item
-+Alias expansion is always enabled, even in non-interactive shells.
-+
-+@item
-+When the @code{alias} builtin displays alias definitions, it does not
-+display them with a leading @samp{alias } unless the @option{-p} option
-+is supplied.
-+
-+@item
-+When the @code{set} builtin is invoked without options, it does not display
-+shell function names and definitions.
-+
-+@item
-+When the @code{set} builtin is invoked without options, it displays
-+variable values without quotes, unless they contain shell metacharacters,
-+even if the result contains nonprinting characters.
-+
-+@item
-+When the @code{cd} builtin is invoked in @var{logical} mode, and the pathname
-+constructed from @code{$PWD} and the directory name supplied as an argument
-+does not refer to an existing directory, @code{cd} will fail instead of
-+falling back to @var{physical} mode.
-+
-+@item
-+When the @code{pwd} builtin is supplied the @option{-P} option, it resets
-+@code{$PWD} to a pathname containing no symlinks.
-+
-+@item
-+The @code{pwd} builtin verifies that the value it prints is the same as the
-+current directory, even if it is not asked to check the file system with the
-+@option{-P} option.
-+
-+@item
-+When listing the history, the @code{fc} builtin does not include an
-+indication of whether or not a history entry has been modified.
-+
-+@item
-+The default editor used by @code{fc} is @code{ed}.
-+
-+@item
-+The @code{type} and @code{command} builtins will not report a non-executable
-+file as having been found, though the shell will attempt to execute such a
-+file if it is the only so-named file found in @code{$PATH}.
-+
-+@item
-+The @code{vi} editing mode will invoke the @code{vi} editor directly when
-+the @samp{v} command is run, instead of checking @code{$FCEDIT} and
-+@code{$EDITOR}.
-+
-+@item
-+When the @code{xpg_echo} option is enabled, Bash does not attempt to interpret
-+any arguments to @code{echo} as options.  Each argument is displayed, after
-+escape characters are converted.
-+
-+@end enumerate
-+
-+There is other @sc{posix} behavior that Bash does not implement by
-+default even when in @sc{posix} mode.
-+Specifically:
-+
-+@enumerate
-+
-+@item
-+The @code{fc} builtin checks @code{$EDITOR} as a program to edit history
-+entries if @code{FCEDIT} is unset, rather than defaulting directly to
-+@code{ed}.  @code{fc} uses @code{ed} if @code{EDITOR} is unset.
-+
-+@item
-+As noted above, Bash requires the @code{xpg_echo} option to be enabled for
-+the @code{echo} builtin to be fully conformant.
-+
-+@end enumerate
-+
-+Bash can be configured to be @sc{posix}-conformant by default, by specifying
-+the @option{--enable-strict-posix-default} to @code{configure} when building
-+(@pxref{Optional Features}).
-+
-+@node Job Control
-+@chapter Job Control
-+
-+This chapter discusses what job control is, how it works, and how
-+Bash allows you to access its facilities.
-+
-+@menu
-+* Job Control Basics::		How job control works.
-+* Job Control Builtins::	Bash builtin commands used to interact
-+				with job control.
-+* Job Control Variables::	Variables Bash uses to customize job
-+				control.
-+@end menu
-+
-+@node Job Control Basics
-+@section Job Control Basics
-+@cindex job control
-+@cindex foreground
-+@cindex background
-+@cindex suspending jobs
-+
-+Job control
-+refers to the ability to selectively stop (suspend)
-+the execution of processes and continue (resume)
-+their execution at a later point.  A user typically employs
-+this facility via an interactive interface supplied jointly
-+by the system's terminal driver and Bash.
-+
-+The shell associates a @var{job} with each pipeline.  It keeps a
-+table of currently executing jobs, which may be listed with the
-+@code{jobs} command.  When Bash starts a job
-+asynchronously, it prints a line that looks
-+like:
-+@example
-+[1] 25647
-+@end example
-+@noindent
-+indicating that this job is job number 1 and that the process @sc{id}
-+of the last process in the pipeline associated with this job is
-+25647.  All of the processes in a single pipeline are members of
-+the same job.  Bash uses the @var{job} abstraction as the
-+basis for job control. 
-+
-+To facilitate the implementation of the user interface to job
-+control, the operating system maintains the notion of a current terminal
-+process group @sc{id}.  Members of this process group (processes whose
-+process group @sc{id} is equal to the current terminal process group
-+@sc{id}) receive keyboard-generated signals such as @code{SIGINT}. 
-+These processes are said to be in the foreground.  Background
-+processes are those whose process group @sc{id} differs from the
-+terminal's; such processes are immune to keyboard-generated
-+signals.  Only foreground processes are allowed to read from or
-+write to the terminal.  Background processes which attempt to
-+read from (write to) the terminal are sent a @code{SIGTTIN}
-+(@code{SIGTTOU}) signal by the terminal driver, which, unless
-+caught, suspends the process. 
-+
-+If the operating system on which Bash is running supports
-+job control, Bash contains facilities to use it.  Typing the
-+@var{suspend} character (typically @samp{^Z}, Control-Z) while a
-+process is running causes that process to be stopped and returns
-+control to Bash.  Typing the @var{delayed suspend} character
-+(typically @samp{^Y}, Control-Y) causes the process to be stopped
-+when it attempts to read input from the terminal, and control to
-+be returned to Bash.  The user then manipulates the state of
-+this job, using the @code{bg} command to continue it in the
-+background, the @code{fg} command to continue it in the
-+foreground, or the @code{kill} command to kill it.  A @samp{^Z}
-+takes effect immediately, and has the additional side effect of
-+causing pending output and typeahead to be discarded. 
-+
-+There are a number of ways to refer to a job in the shell.  The
-+character @samp{%} introduces a job name.
-+
-+Job number @code{n} may be referred to as @samp{%n}.
-+The symbols @samp{%%} and  @samp{%+} refer to the shell's notion of the
-+current job, which is the last job stopped while it was in the foreground
-+or started in the background.
-+A single @samp{%} (with no accompanying job specification) also refers
-+to the current job.
-+The previous job may be referenced using @samp{%-}.  In output
-+pertaining to jobs (e.g., the output of the @code{jobs} command),
-+the current job is always flagged with a @samp{+}, and the
-+previous job with a @samp{-}. 
-+
-+A job may also be referred to
-+using a prefix of the name used to start it, or using a substring
-+that appears in its command line.  For example, @samp{%ce} refers
-+to a stopped @code{ce} job. Using @samp{%?ce}, on the
-+other hand, refers to any job containing the string @samp{ce} in
-+its command line.  If the prefix or substring matches more than one job,
-+Bash reports an error.
-+
-+Simply naming a job can be used to bring it into the foreground:
-+@samp{%1} is a synonym for @samp{fg %1}, bringing job 1 from the
-+background into the foreground.  Similarly, @samp{%1 &} resumes
-+job 1 in the background, equivalent to @samp{bg %1}
-+
-+The shell learns immediately whenever a job changes state. 
-+Normally, Bash waits until it is about to print a prompt
-+before reporting changes in a job's status so as to not interrupt
-+any other output.
-+If the @option{-b} option to the @code{set} builtin is enabled,
-+Bash reports such changes immediately (@pxref{The Set Builtin}).
-+Any trap on @code{SIGCHLD} is executed for each child process
-+that exits.
-+
-+If an attempt to exit Bash is made while jobs are stopped, the
-+shell prints a message warning that there are stopped jobs.
-+The @code{jobs} command may then be used to inspect their status.
-+If a second attempt to exit is made without an intervening command,
-+Bash does not print another warning, and the stopped jobs are terminated.
-+
-+@node Job Control Builtins
-+@section Job Control Builtins
-+
-+@table @code
-+
-+@item bg
-+@btindex bg
-+@example
-+bg [@var{jobspec} @dots{}]
-+@end example
-+Resume each suspended job @var{jobspec} in the background, as if it
-+had been started with @samp{&}.
-+If @var{jobspec} is not supplied, the current job is used.
-+The return status is zero unless it is run when job control is not
-+enabled, or, when run with job control enabled, any
-+@var{jobspec} was not found or specifies a job
-+that was started without job control.
-+
-+@item fg
-+@btindex fg
-+@example
-+fg [@var{jobspec}]
-+@end example
-+Resume the job @var{jobspec} in the foreground and make it the current job.
-+If @var{jobspec} is not supplied, the current job is used.
-+The return status is that of the command placed into the foreground,
-+or non-zero if run when job control is disabled or, when run with
-+job control enabled, @var{jobspec} does not specify a valid job or
-+@var{jobspec} specifies a job that was started without job control.
-+
-+@item jobs
-+@btindex jobs
-+@example
-+jobs [-lnprs] [@var{jobspec}]
-+jobs -x @var{command} [@var{arguments}]
-+@end example
-+
-+The first form lists the active jobs.  The options have the
-+following meanings:
-+
-+@table @code
-+@item -l
-+List process @sc{id}s in addition to the normal information.
-+
-+@item -n
-+Display information only about jobs that have changed status since
-+the user was last notified of their status.
-+
-+@item -p
-+List only the process @sc{id} of the job's process group leader.
-+
-+@item -r
-+Restrict output to running jobs.
-+
-+@item -s
-+Restrict output to stopped jobs.
-+@end table
-+
-+If @var{jobspec} is given,
-+output is restricted to information about that job. 
-+If @var{jobspec} is not supplied, the status of all jobs is
-+listed.
-+
-+If the @option{-x} option is supplied, @code{jobs} replaces any
-+@var{jobspec} found in @var{command} or @var{arguments} with the
-+corresponding process group @sc{id}, and executes @var{command},
-+passing it @var{argument}s, returning its exit status. 
-+
-+@item kill
-+@btindex kill
-+@example
-+kill [-s @var{sigspec}] [-n @var{signum}] [-@var{sigspec}] @var{jobspec} or @var{pid}
-+kill -l [@var{exit_status}]
-+@end example
-+Send a signal specified by @var{sigspec} or @var{signum} to the process
-+named by job specification @var{jobspec} or process @sc{id} @var{pid}.
-+@var{sigspec} is either a case-insensitive signal name such as
-+@code{SIGINT} (with or without the @code{SIG} prefix)
-+or a signal number; @var{signum} is a signal number.
-+If @var{sigspec} and @var{signum} are not present, @code{SIGTERM} is used.
-+The @option{-l} option lists the signal names.
-+If any arguments are supplied when @option{-l} is given, the names of the
-+signals corresponding to the arguments are listed, and the return status
-+is zero.
-+@var{exit_status} is a number specifying a signal number or the exit
-+status of a process terminated by a signal.
-+The return status is zero if at least one signal was successfully sent,
-+or non-zero if an error occurs or an invalid option is encountered.
-+
-+@item wait
-+@btindex wait
-+@example
-+wait [@var{jobspec} or @var{pid} ...]
-+@end example
-+Wait until the child process specified by each process @sc{id} @var{pid}
-+or job specification @var{jobspec} exits and return the exit status of the
-+last command waited for.
-+If a job spec is given, all processes in the job are waited for.
-+If no arguments are given, all currently active child processes are
-+waited for, and the return status is zero.
-+If neither @var{jobspec} nor @var{pid} specifies an active child process
-+of the shell, the return status is 127.
-+
-+@item disown
-+@btindex disown
-+@example
-+disown [-ar] [-h] [@var{jobspec} @dots{}]
-+@end example
-+Without options, each @var{jobspec} is removed from the table of
-+active jobs.
-+If the @option{-h} option is given, the job is not removed from the table,
-+but is marked so that @code{SIGHUP} is not sent to the job if the shell
-+receives a @code{SIGHUP}.
-+If @var{jobspec} is not present, and neither the @option{-a} nor @option{-r}
-+option is supplied, the current job is used.
-+If no @var{jobspec} is supplied, the @option{-a} option means to remove or
-+mark all jobs; the @option{-r} option without a @var{jobspec}
-+argument restricts operation to running jobs.
-+
-+@item suspend
-+@btindex suspend
-+@example
-+suspend [-f]
-+@end example
-+Suspend the execution of this shell until it receives a
-+@code{SIGCONT} signal.  The @option{-f} option means to suspend
-+even if the shell is a login shell.
-+
-+@end table
-+
-+When job control is not active, the @code{kill} and @code{wait}
-+builtins do not accept @var{jobspec} arguments.  They must be
-+supplied process @sc{id}s.
-+
-+@node Job Control Variables
-+@section Job Control Variables
-+
-+@vtable @code
-+
-+@item auto_resume
-+This variable controls how the shell interacts with the user and
-+job control.  If this variable exists then single word simple
-+commands without redirections are treated as candidates for resumption
-+of an existing job.  There is no ambiguity allowed; if there is
-+more than one job beginning with the string typed, then
-+the most recently accessed job will be selected.
-+The name of a stopped job, in this context, is the command line
-+used to start it.  If this variable is set to the value @samp{exact},
-+the string supplied must match the name of a stopped job exactly;
-+if set to @samp{substring},
-+the string supplied needs to match a substring of the name of a
-+stopped job.  The @samp{substring} value provides functionality
-+analogous to the @samp{%?} job @sc{id} (@pxref{Job Control Basics}).
-+If set to any other value, the supplied string must
-+be a prefix of a stopped job's name; this provides functionality
-+analogous to the @samp{%} job @sc{id}.
-+
-+@end vtable
-+
-+@set readline-appendix
-+@set history-appendix
-+@cindex Readline, how to use
-+@include rluser.texi
-+@cindex History, how to use
-+@include hsuser.texi
-+@clear readline-appendix
-+@clear history-appendix
-+
-+@node Installing Bash
-+@chapter Installing Bash
-+
-+This chapter provides basic instructions for installing Bash on
-+the various supported platforms.  The distribution supports the
-+@sc{gnu} operating systems, nearly every version of Unix, and several
-+non-Unix systems such as BeOS and Interix.
-+Other independent ports exist for
-+@sc{ms-dos}, @sc{os/2}, and Windows platforms.
-+
-+@menu
-+* Basic Installation::	Installation instructions.
-+* Compilers and Options::	How to set special options for various
-+				systems.
-+* Compiling For Multiple Architectures::	How to compile Bash for more
-+						than one kind of system from
-+						the same source tree.
-+* Installation Names::	How to set the various paths used by the installation.
-+* Specifying the System Type::	How to configure Bash for a particular system.
-+* Sharing Defaults::	How to share default configuration values among GNU
-+			programs.
-+* Operation Controls::	Options recognized by the configuration program.
-+* Optional Features::	How to enable and disable optional features when
-+			building Bash.
-+@end menu
-+
-+@node Basic Installation
-+@section Basic Installation
-+@cindex installation
-+@cindex configuration
-+@cindex Bash installation
-+@cindex Bash configuration
-+
-+These are installation instructions for Bash.
-+
-+The simplest way to compile Bash is:
-+
-+@enumerate
-+@item
-+@code{cd} to the directory containing the source code and type
-+@samp{./configure} to configure Bash for your system.  If you're
-+using @code{csh} on an old version of System V, you might need to
-+type @samp{sh ./configure} instead to prevent @code{csh} from trying
-+to execute @code{configure} itself.
-+
-+Running @code{configure} takes some time.
-+While running, it prints messages telling which features it is
-+checking for.
-+
-+@item
-+Type @samp{make} to compile Bash and build the @code{bashbug} bug
-+reporting script.
-+
-+@item
-+Optionally, type @samp{make tests} to run the Bash test suite.
-+
-+@item
-+Type @samp{make install} to install @code{bash} and @code{bashbug}.
-+This will also install the manual pages and Info file.
-+
-+@end enumerate
-+
-+The @code{configure} shell script attempts to guess correct
-+values for various system-dependent variables used during
-+compilation.  It uses those values to create a @file{Makefile} in
-+each directory of the package (the top directory, the
-+@file{builtins}, @file{doc}, and @file{support} directories,
-+each directory under @file{lib}, and several others).  It also creates a
-+@file{config.h} file containing system-dependent definitions. 
-+Finally, it creates a shell script named @code{config.status} that you
-+can run in the future to recreate the current configuration, a
-+file @file{config.cache} that saves the results of its tests to
-+speed up reconfiguring, and a file @file{config.log} containing
-+compiler output (useful mainly for debugging @code{configure}). 
-+If at some point
-+@file{config.cache} contains results you don't want to keep, you
-+may remove or edit it. 
-+
-+To find out more about the options and arguments that the
-+@code{configure} script understands, type 
-+
-+@example
-+bash-2.04$ ./configure --help
-+@end example
-+
-+@noindent
-+at the Bash prompt in your Bash source directory.
-+
-+If you need to do unusual things to compile Bash, please
-+try to figure out how @code{configure} could check whether or not
-+to do them, and mail diffs or instructions to
-+@email{bash-maintainers@@gnu.org} so they can be
-+considered for the next release.
-+
-+The file @file{configure.in} is used to create @code{configure}
-+by a program called Autoconf.  You only need
-+@file{configure.in} if you want to change it or regenerate
-+@code{configure} using a newer version of Autoconf.  If
-+you do this, make sure you are using Autoconf version 2.50 or
-+newer.
-+
-+You can remove the program binaries and object files from the
-+source code directory by typing @samp{make clean}.  To also remove the
-+files that @code{configure} created (so you can compile Bash for
-+a different kind of computer), type @samp{make distclean}.
-+
-+@node Compilers and Options
-+@section Compilers and Options
-+
-+Some systems require unusual options for compilation or linking
-+that the @code{configure} script does not know about.  You can
-+give @code{configure} initial values for variables by setting
-+them in the environment.  Using a Bourne-compatible shell, you
-+can do that on the command line like this:
-+
-+@example
-+CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
-+@end example
-+
-+On systems that have the @code{env} program, you can do it like this:
-+
-+@example
-+env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
-+@end example
-+
-+The configuration process uses GCC to build Bash if it
-+is available.
-+
-+@node Compiling For Multiple Architectures
-+@section Compiling For Multiple Architectures
-+
-+You can compile Bash for more than one kind of computer at the
-+same time, by placing the object files for each architecture in their
-+own directory.  To do this, you must use a version of @code{make} that
-+supports the @code{VPATH} variable, such as GNU @code{make}.
-+@code{cd} to the
-+directory where you want the object files and executables to go and run
-+the @code{configure} script from the source directory.  You may need to
-+supply the @option{--srcdir=PATH} argument to tell @code{configure} where the
-+source files are.  @code{configure} automatically checks for the
-+source code in the directory that @code{configure} is in and in `..'.
-+
-+If you have to use a @code{make} that does not supports the @code{VPATH}
-+variable, you can compile Bash for one architecture at a
-+time in the source code directory.  After you have installed
-+Bash for one architecture, use @samp{make distclean} before
-+reconfiguring for another architecture.
-+
-+Alternatively, if your system supports symbolic links, you can use the
-+@file{support/mkclone} script to create a build tree which has
-+symbolic links back to each file in the source directory.  Here's an
-+example that creates a build directory in the current directory from a
-+source directory @file{/usr/gnu/src/bash-2.0}:
-+
-+@example
-+bash /usr/gnu/src/bash-2.0/support/mkclone -s /usr/gnu/src/bash-2.0 .
-+@end example
-+
-+@noindent
-+The @code{mkclone} script requires Bash, so you must have already built
-+Bash for at least one architecture before you can create build
-+directories for other architectures.
-+
-+@node Installation Names
-+@section Installation Names
-+
-+By default, @samp{make install} will install into
-+@file{/usr/local/bin}, @file{/usr/local/man}, etc.  You can
-+specify an installation prefix other than @file{/usr/local} by
-+giving @code{configure} the option @option{--prefix=@var{PATH}},
-+or by specifying a value for the @code{DESTDIR} @samp{make}
-+variable when running @samp{make install}.
-+
-+You can specify separate installation prefixes for
-+architecture-specific files and architecture-independent files. 
-+If you give @code{configure} the option
-+@option{--exec-prefix=@var{PATH}}, @samp{make install} will use
-+@var{PATH} as the prefix for installing programs and libraries.
-+Documentation and other data files will still use the regular prefix. 
-+
-+@node Specifying the System Type
-+@section Specifying the System Type
-+
-+There may be some features @code{configure} can not figure out
-+automatically, but need to determine by the type of host Bash
-+will run on.  Usually @code{configure} can figure that
-+out, but if it prints a message saying it can not guess the host
-+type, give it the @option{--host=TYPE} option.  @samp{TYPE} can
-+either be a short name for the system type, such as @samp{sun4},
-+or a canonical name with three fields: @samp{CPU-COMPANY-SYSTEM}
-+(e.g., @samp{i386-unknown-freebsd4.2}).
-+
-+See the file @file{support/config.sub} for the possible
-+values of each field. 
-+
-+@node Sharing Defaults
-+@section Sharing Defaults
-+
-+If you want to set default values for @code{configure} scripts to
-+share, you can create a site shell script called
-+@code{config.site} that gives default values for variables like
-+@code{CC}, @code{cache_file}, and @code{prefix}.  @code{configure}
-+looks for @file{PREFIX/share/config.site} if it exists, then
-+@file{PREFIX/etc/config.site} if it exists.  Or, you can set the
-+@code{CONFIG_SITE} environment variable to the location of the site
-+script.  A warning: the Bash @code{configure} looks for a site script,
-+but not all @code{configure} scripts do.
-+
-+@node Operation Controls
-+@section Operation Controls
-+
-+@code{configure} recognizes the following options to control how it
-+operates.
-+
-+@table @code
-+
-+@item --cache-file=@var{file}
-+Use and save the results of the tests in
-+@var{file} instead of @file{./config.cache}.  Set @var{file} to
-+@file{/dev/null} to disable caching, for debugging
-+@code{configure}. 
-+
-+@item --help
-+Print a summary of the options to @code{configure}, and exit.
-+
-+@item --quiet
-+@itemx --silent
-+@itemx -q
-+Do not print messages saying which checks are being made.
-+
-+@item --srcdir=@var{dir}
-+Look for the Bash source code in directory @var{dir}.  Usually
-+@code{configure} can determine that directory automatically.
-+
-+@item --version
-+Print the version of Autoconf used to generate the @code{configure}
-+script, and exit.
-+@end table
-+
-+@code{configure} also accepts some other, not widely used, boilerplate
-+options.  @samp{configure --help} prints the complete list.
-+
-+@node Optional Features
-+@section Optional Features
-+
-+The Bash @code{configure} has a number of @option{--enable-@var{feature}}
-+options, where @var{feature} indicates an optional part of Bash.
-+There are also several @option{--with-@var{package}} options,
-+where @var{package} is something like @samp{bash-malloc} or @samp{purify}.
-+To turn off the default use of a package, use
-+@option{--without-@var{package}}.  To configure Bash without a feature
-+that is enabled by default, use @option{--disable-@var{feature}}.
-+
-+Here is a complete list of the @option{--enable-} and
-+@option{--with-} options that the Bash @code{configure} recognizes. 
-+
-+@table @code
-+@item --with-afs
-+Define if you are using the Andrew File System from Transarc.
-+
-+@item --with-bash-malloc
-+Use the Bash version of
-+@code{malloc} in the directory @file{lib/malloc}.  This is not the same
-+@code{malloc} that appears in @sc{gnu} libc, but an older version
-+originally derived from the 4.2 @sc{bsd} @code{malloc}.  This @code{malloc}
-+is very fast, but wastes some space on each allocation.
-+This option is enabled by default.
-+The @file{NOTES} file contains a list of systems for
-+which this should be turned off, and @code{configure} disables this
-+option automatically for a number of systems.
-+
-+@item --with-curses
-+Use the curses library instead of the termcap library.  This should
-+be supplied if your system has an inadequate or incomplete termcap
-+database.
-+
-+@item --with-gnu-malloc
-+A synonym for @code{--with-bash-malloc}.
-+
-+@item --with-installed-readline[=@var{PREFIX}]
-+Define this to make Bash link with a locally-installed version of Readline
-+rather than the version in @file{lib/readline}.  This works only with
-+Readline 5.0 and later versions.  If @var{PREFIX} is @code{yes} or not
-+supplied, @code{configure} uses the values of the make variables
-+@code{includedir} and @code{libdir}, which are subdirectories of @code{prefix}
-+by default, to find the installed version of Readline if it is not in
-+the standard system include and library directories.
-+If @var{PREFIX} is @code{no}, Bash links with the version in
-+@file{lib/readline}.
-+If @var{PREFIX} is set to any other value, @code{configure} treats it as
-+a directory pathname and looks for
-+the installed version of Readline in subdirectories of that directory
-+(include files in @var{PREFIX}/@code{include} and the library in
-+@var{PREFIX}/@code{lib}).
-+
-+@item --with-purify
-+Define this to use the Purify memory allocation checker from Rational
-+Software.
-+
-+@item --enable-minimal-config
-+This produces a shell with minimal features, close to the historical
-+Bourne shell.
-+@end table
-+
-+There are several @option{--enable-} options that alter how Bash is
-+compiled and linked, rather than changing run-time features.
-+
-+@table @code
-+@item --enable-largefile
-+Enable support for @uref{http://www.sas.com/standards/large_file/x_open.20Mar96.html,
-+large files} if the operating system requires special compiler options
-+to build programs which can access large files.  This is enabled by
-+default, if the operating system provides large file support.
-+
-+@item --enable-profiling
-+This builds a Bash binary that produces profiling information to be
-+processed by @code{gprof} each time it is executed.
-+
-+@item --enable-static-link
-+This causes Bash to be linked statically, if @code{gcc} is being used.
-+This could be used to build a version to use as root's shell.
-+@end table
-+
-+The @samp{minimal-config} option can be used to disable all of
-+the following options, but it is processed first, so individual
-+options may be enabled using @samp{enable-@var{feature}}. 
-+
-+All of the following options except for @samp{disabled-builtins} and
-+@samp{xpg-echo-default} are
-+enabled by default, unless the operating system does not provide the
-+necessary support.
-+
-+@table @code
-+@item --enable-alias
-+Allow alias expansion and include the @code{alias} and @code{unalias}
-+builtins (@pxref{Aliases}).
-+
-+@item --enable-arith-for-command
-+Include support for the alternate form of the @code{for} command
-+that behaves like the C language @code{for} statement
-+(@pxref{Looping Constructs}).
-+
-+@item --enable-array-variables
-+Include support for one-dimensional array shell variables
-+(@pxref{Arrays}).
-+
-+@item --enable-bang-history
-+Include support for @code{csh}-like history substitution
-+(@pxref{History Interaction}).
-+
-+@item --enable-brace-expansion
-+Include @code{csh}-like brace expansion
-+( @code{b@{a,b@}c} @expansion{} @code{bac bbc} ).
-+See @ref{Brace Expansion}, for a complete description.
-+
-+@item --enable-command-timing
-+Include support for recognizing @code{time} as a reserved word and for
-+displaying timing statistics for the pipeline following @code{time}
-+(@pxref{Pipelines}).
-+This allows pipelines as well as shell builtins and functions to be timed.
-+
-+@item --enable-cond-command
-+Include support for the @code{[[} conditional command.
-+(@pxref{Conditional Constructs}).
-+
-+@item --enable-cond-regexp
-+Include support for matching POSIX regular expressions using the
-+@samp{=~} binary operator in the @code{[[} conditional command.
-+(@pxref{Conditional Constructs}).
-+
-+@item --enable-debugger
-+Include support for the bash debugger (distributed separately).
-+
-+@item --enable-directory-stack
-+Include support for a @code{csh}-like directory stack and the
-+@code{pushd}, @code{popd}, and @code{dirs} builtins
-+(@pxref{The Directory Stack}).
-+
-+@item --enable-disabled-builtins
-+Allow builtin commands to be invoked via @samp{builtin xxx}
-+even after @code{xxx} has been disabled using @samp{enable -n xxx}.
-+See @ref{Bash Builtins}, for details of the @code{builtin} and
-+@code{enable} builtin commands.
-+
-+@item --enable-dparen-arithmetic
-+Include support for the @code{((@dots{}))} command
-+(@pxref{Conditional Constructs}).
-+
-+@item --enable-extended-glob
-+Include support for the extended pattern matching features described
-+above under @ref{Pattern Matching}.
-+
-+@item --enable-help-builtin
-+Include the @code{help} builtin, which displays help on shell builtins and
-+variables (@pxref{Bash Builtins}).
-+
-+@item --enable-history
-+Include command history and the @code{fc} and @code{history}
-+builtin commands (@pxref{Bash History Facilities}).
-+
-+@item --enable-job-control
-+This enables the job control features (@pxref{Job Control}),
-+if the operating system supports them.
-+
-+@item --enable-multibyte
-+This enables support for multibyte characters if the operating
-+system provides the necessary support.
-+
-+@item --enable-net-redirections
-+This enables the special handling of filenames of the form
-+@code{/dev/tcp/@var{host}/@var{port}} and
-+@code{/dev/udp/@var{host}/@var{port}}
-+when used in redirections (@pxref{Redirections}).
-+
-+@item --enable-process-substitution
-+This enables process substitution (@pxref{Process Substitution}) if
-+the operating system provides the necessary support.
-+
-+@item --enable-progcomp
-+Enable the programmable completion facilities
-+(@pxref{Programmable Completion}).
-+If Readline is not enabled, this option has no effect.
-+
-+@item --enable-prompt-string-decoding
-+Turn on the interpretation of a number of backslash-escaped characters
-+in the @env{$PS1}, @env{$PS2}, @env{$PS3}, and @env{$PS4} prompt
-+strings.  See @ref{Printing a Prompt}, for a complete list of prompt
-+string escape sequences.
-+
-+@item --enable-readline
-+Include support for command-line editing and history with the Bash
-+version of the Readline library (@pxref{Command Line Editing}).
-+
-+@item --enable-restricted
-+Include support for a @dfn{restricted shell}.  If this is enabled, Bash,
-+when called as @code{rbash}, enters a restricted mode.  See
-+@ref{The Restricted Shell}, for a description of restricted mode.
-+
-+@item --enable-select
-+Include the @code{select} builtin, which allows the generation of simple
-+menus (@pxref{Conditional Constructs}).
-+
-+@item --enable-separate-helpfiles
-+Use external files for the documentation displayed by the @code{help} builtin
-+instead of storing the text internally.
-+
-+@item --enable-single-help-strings
-+Store the text displayed by the @code{help} builtin as a single string for
-+each help topic.  This aids in translating the text to different languages.
-+You may need to disable this if your compiler cannot handle very long string
-+literals.
-+
-+@item --enable-strict-posix-default
-+Make Bash @sc{posix}-conformant by default (@pxref{Bash POSIX Mode}).
-+
-+@item --enable-usg-echo-default
-+A synonym for @code{--enable-xpg-echo-default}.
-+
-+@item --enable-xpg-echo-default
-+Make the @code{echo} builtin expand backslash-escaped characters by default,
-+without requiring the @option{-e} option.
-+This sets the default value of the @code{xpg_echo} shell option to @code{on},
-+which makes the Bash @code{echo} behave more like the version specified in
-+the Single Unix Specification, version 3.
-+@xref{Bash Builtins}, for a description of the escape sequences that
-+@code{echo} recognizes.
-+
-+@end table
-+
-+The file @file{config-top.h} contains C Preprocessor
-+@samp{#define} statements for options which are not settable from
-+@code{configure}.
-+Some of these are not meant to be changed; beware of the consequences if
-+you do.
-+Read the comments associated with each definition for more
-+information about its effect.
-+
-+@node Reporting Bugs
-+@appendix Reporting Bugs
-+
-+Please report all bugs you find in Bash.
-+But first, you should
-+make sure that it really is a bug, and that it appears in the latest
-+version of Bash.
-+The latest version of Bash is always available for FTP from
-+@uref{ftp://ftp.gnu.org/pub/bash/}.
-+
-+Once you have determined that a bug actually exists, use the
-+@code{bashbug} command to submit a bug report.
-+If you have a fix, you are encouraged to mail that as well!
-+Suggestions and `philosophical' bug reports may be mailed
-+to @email{bug-bash@@gnu.org} or posted to the Usenet
-+newsgroup @code{gnu.bash.bug}.
-+
-+All bug reports should include:
-+@itemize @bullet
-+@item
-+The version number of Bash.
-+@item
-+The hardware and operating system.
-+@item
-+The compiler used to compile Bash.
-+@item
-+A description of the bug behaviour.
-+@item
-+A short script or `recipe' which exercises the bug and may be used
-+to reproduce it.
-+@end itemize
-+
-+@noindent
-+@code{bashbug} inserts the first three items automatically into
-+the template it provides for filing a bug report.
-+
-+Please send all reports concerning this manual to
-+@email{chet@@po.CWRU.Edu}.
-+
-+@node Major Differences From The Bourne Shell
-+@appendix Major Differences From The Bourne Shell
-+
-+Bash implements essentially the same grammar, parameter and
-+variable expansion, redirection, and quoting as the Bourne Shell. 
-+Bash uses the @sc{posix} standard as the specification of
-+how these features are to be implemented.  There are some
-+differences between the traditional Bourne shell and Bash; this
-+section quickly details the differences of significance.  A
-+number of these differences are explained in greater depth in
-+previous sections.
-+This section uses the version of @code{sh} included in SVR4.2 (the
-+last version of the historical Bourne shell) as the baseline reference.
-+
-+@itemize @bullet
-+
-+@item
-+Bash is @sc{posix}-conformant, even where the @sc{posix} specification
-+differs from traditional @code{sh} behavior (@pxref{Bash POSIX Mode}).
-+
-+@item
-+Bash has multi-character invocation options (@pxref{Invoking Bash}).
-+
-+@item
-+Bash has command-line editing (@pxref{Command Line Editing}) and
-+the @code{bind} builtin.
-+
-+@item
-+Bash provides a programmable word completion mechanism
-+(@pxref{Programmable Completion}), and two builtin commands,
-+@code{complete} and @code{compgen}, to manipulate it.
-+
-+@item
-+Bash has command history (@pxref{Bash History Facilities}) and the
-+@code{history} and @code{fc} builtins to manipulate it.
-+The Bash history list maintains timestamp information and uses the
-+value of the @code{HISTTIMEFORMAT} variable to display it.
-+
-+@item
-+Bash implements @code{csh}-like history expansion
-+(@pxref{History Interaction}).
-+
-+@item
-+Bash has one-dimensional array variables (@pxref{Arrays}), and the
-+appropriate variable expansions and assignment syntax to use them.
-+Several of the Bash builtins take options to act on arrays.
-+Bash provides a number of built-in array variables.
-+
-+@item
-+The @code{$'@dots{}'} quoting syntax, which expands ANSI-C
-+backslash-escaped characters in the text between the single quotes,
-+is supported (@pxref{ANSI-C Quoting}).
-+
-+@item
-+Bash supports the @code{$"@dots{}"} quoting syntax to do
-+locale-specific translation of the characters between the double
-+quotes.  The @option{-D}, @option{--dump-strings}, and @option{--dump-po-strings}
-+invocation options list the translatable strings found in a script
-+(@pxref{Locale Translation}).
-+
-+@item
-+Bash implements the @code{!} keyword to negate the return value of
-+a pipeline (@pxref{Pipelines}).
-+Very useful when an @code{if} statement needs to act only if a test fails.
-+The Bash @samp{-o pipefail} option to @code{set} will cause a pipeline to
-+return a failure status if any command fails.
-+
-+@item
-+Bash has the @code{time} reserved word and command timing (@pxref{Pipelines}).
-+The display of the timing statistics may be controlled with the
-+@env{TIMEFORMAT} variable.
-+
-+@item
-+Bash implements the @code{for (( @var{expr1} ; @var{expr2} ; @var{expr3} ))}
-+arithmetic for command, similar to the C language (@pxref{Looping Constructs}).
-+
-+@item
-+Bash includes the @code{select} compound command, which allows the
-+generation of simple menus (@pxref{Conditional Constructs}).
-+
-+@item
-+Bash includes the @code{[[} compound command, which makes conditional
-+testing part of the shell grammar (@pxref{Conditional Constructs}), including
-+optional regular expression matching.
-+
-+@item
-+Bash provides optional case-insensitive matching for the @code{case} and
-+@code{[[} constructs.
-+
-+@item
-+Bash includes brace expansion (@pxref{Brace Expansion}) and tilde
-+expansion (@pxref{Tilde Expansion}).
-+
-+@item
-+Bash implements command aliases and the @code{alias} and @code{unalias}
-+builtins (@pxref{Aliases}).
-+
-+@item
-+Bash provides shell arithmetic, the @code{((} compound command
-+(@pxref{Conditional Constructs}),
-+and arithmetic expansion (@pxref{Shell Arithmetic}).
-+
-+@item
-+Variables present in the shell's initial environment are automatically
-+exported to child processes.  The Bourne shell does not normally do
-+this unless the variables are explicitly marked using the @code{export}
-+command.
-+
-+@item
-+Bash supports the @samp{+=} assignment operator, which appends to the value
-+of the variable named on the left hand side.
-+
-+@item
-+Bash includes the @sc{posix} pattern removal @samp{%}, @samp{#}, @samp{%%}
-+and @samp{##} expansions to remove leading or trailing substrings from
-+variable values (@pxref{Shell Parameter Expansion}).
-+
-+@item
-+The expansion @code{$@{#xx@}}, which returns the length of @code{$@{xx@}},
-+is supported (@pxref{Shell Parameter Expansion}).
-+
-+@item
-+The expansion @code{$@{var:}@var{offset}@code{[:}@var{length}@code{]@}},
-+which expands to the substring of @code{var}'s value of length
-+@var{length}, beginning at @var{offset}, is present
-+(@pxref{Shell Parameter Expansion}).
-+
-+@item
-+The expansion
-+@code{$@{var/[/]}@var{pattern}@code{[/}@var{replacement}@code{]@}},
-+which matches @var{pattern} and replaces it with @var{replacement} in
-+the value of @code{var}, is available (@pxref{Shell Parameter Expansion}).
-+
-+@item
-+The expansion @code{$@{!@var{prefix@}*}} expansion, which expands to
-+the names of all shell variables whose names begin with @var{prefix},
-+is available (@pxref{Shell Parameter Expansion}).
-+
-+@item
-+Bash has @var{indirect} variable expansion using @code{$@{!word@}}
-+(@pxref{Shell Parameter Expansion}).
-+
-+@item
-+Bash can expand positional parameters beyond @code{$9} using
-+@code{$@{@var{num}@}}.
-+
-+@item
-+The @sc{posix} @code{$()} form of command substitution
-+is implemented (@pxref{Command Substitution}),
-+and preferred to the Bourne shell's @code{``} (which
-+is also implemented for backwards compatibility).
-+
-+@item
-+Bash has process substitution (@pxref{Process Substitution}).
-+
-+@item
-+Bash automatically assigns variables that provide information about the
-+current user (@env{UID}, @env{EUID}, and @env{GROUPS}), the current host
-+(@env{HOSTTYPE}, @env{OSTYPE}, @env{MACHTYPE}, and @env{HOSTNAME}),
-+and the instance of Bash that is running (@env{BASH},
-+@env{BASH_VERSION}, and @env{BASH_VERSINFO}).  @xref{Bash Variables},
-+for details.
-+
-+@item
-+The @env{IFS} variable is used to split only the results of expansion,
-+not all words (@pxref{Word Splitting}).
-+This closes a longstanding shell security hole.
-+
-+@item
-+Bash implements the full set of @sc{posix} filename expansion operators,
-+including @var{character classes}, @var{equivalence classes}, and
-+@var{collating symbols} (@pxref{Filename Expansion}).
-+
-+@item
-+Bash implements extended pattern matching features when the @code{extglob}
-+shell option is enabled (@pxref{Pattern Matching}).
-+
-+@item
-+It is possible to have a variable and a function with the same name;
-+@code{sh} does not separate the two name spaces.
-+
-+@item
-+Bash functions are permitted to have local variables using the
-+@code{local} builtin, and thus useful recursive functions may be written
-+(@pxref{Bash Builtins}).
-+
-+@item
-+Variable assignments preceding commands affect only that command, even
-+builtins and functions (@pxref{Environment}).
-+In @code{sh}, all variable assignments 
-+preceding commands are global unless the command is executed from the
-+file system.
-+
-+@item
-+Bash performs filename expansion on filenames specified as operands
-+to input and output redirection operators (@pxref{Redirections}).
-+
-+@item
-+Bash contains the @samp{<>} redirection operator, allowing a file to be
-+opened for both reading and writing, and the @samp{&>} redirection
-+operator, for directing standard output and standard error to the same
-+file (@pxref{Redirections}).
-+
-+@item
-+Bash includes the @samp{<<<} redirection operator, allowing a string to
-+be used as the standard input to a command.
-+
-+@item
-+Bash implements the @samp{[n]<&@var{word}} and @samp{[n]>&@var{word}}
-+redirection operators, which move one file descriptor to another.
-+
-+@item
-+Bash treats a number of filenames specially when they are
-+used in redirection operators (@pxref{Redirections}).
-+
-+@item
-+Bash can open network connections to arbitrary machines and services
-+with the redirection operators (@pxref{Redirections}).
-+
-+@item
-+The @code{noclobber} option is available to avoid overwriting existing
-+files with output redirection (@pxref{The Set Builtin}).
-+The @samp{>|} redirection operator may be used to override @code{noclobber}.
-+
-+@item
-+The Bash @code{cd} and @code{pwd} builtins (@pxref{Bourne Shell Builtins})
-+each take @option{-L} and @option{-P} options to switch between logical and
-+physical modes.
-+
-+@item
-+Bash allows a function to override a builtin with the same name, and provides
-+access to that builtin's functionality within the function via the
-+@code{builtin} and @code{command} builtins (@pxref{Bash Builtins}).
-+
-+@item
-+The @code{command} builtin allows selective disabling of functions
-+when command lookup is performed (@pxref{Bash Builtins}).
-+
-+@item
-+Individual builtins may be enabled or disabled using the @code{enable}
-+builtin (@pxref{Bash Builtins}).
-+
-+@item
-+The Bash @code{exec} builtin takes additional options that allow users
-+to control the contents of the environment passed to the executed
-+command, and what the zeroth argument to the command is to be
-+(@pxref{Bourne Shell Builtins}).
-+
-+@item
-+Shell functions may be exported to children via the environment
-+using @code{export -f} (@pxref{Shell Functions}).
-+
-+@item
-+The Bash @code{export}, @code{readonly}, and @code{declare} builtins can
-+take a @option{-f} option to act on shell functions, a @option{-p} option to
-+display variables with various attributes set in a format that can be
-+used as shell input, a @option{-n} option to remove various variable
-+attributes, and @samp{name=value} arguments to set variable attributes
-+and values simultaneously.
-+
-+@item
-+The Bash @code{hash} builtin allows a name to be associated with
-+an arbitrary filename, even when that filename cannot be found by
-+searching the @env{$PATH}, using @samp{hash -p}
-+(@pxref{Bourne Shell Builtins}).
-+
-+@item
-+Bash includes a @code{help} builtin for quick reference to shell
-+facilities (@pxref{Bash Builtins}).
-+
-+@item
-+The @code{printf} builtin is available to display formatted output
-+(@pxref{Bash Builtins}).
-+
-+@item
-+The Bash @code{read} builtin (@pxref{Bash Builtins})
-+will read a line ending in @samp{\} with
-+the @option{-r} option, and will use the @env{REPLY} variable as a
-+default if no non-option arguments are supplied.
-+The Bash @code{read} builtin
-+also accepts a prompt string with the @option{-p} option and will use
-+Readline to obtain the line when given the @option{-e} option.
-+The @code{read} builtin also has additional options to control input:
-+the @option{-s} option will turn off echoing of input characters as
-+they are read, the @option{-t} option will allow @code{read} to time out
-+if input does not arrive within a specified number of seconds, the
-+@option{-n} option will allow reading only a specified number of
-+characters rather than a full line, and the @option{-d} option will read
-+until a particular character rather than newline.
-+
-+@item
-+The @code{return} builtin may be used to abort execution of scripts
-+executed with the @code{.} or @code{source} builtins
-+(@pxref{Bourne Shell Builtins}).
-+
-+@item
-+Bash includes the @code{shopt} builtin, for finer control of shell
-+optional capabilities (@pxref{Bash Builtins}), and allows these options
-+to be set and unset at shell invocation (@pxref{Invoking Bash}).
-+
-+@item
-+Bash has much more optional behavior controllable with the @code{set}
-+builtin (@pxref{The Set Builtin}).
-+
-+@item
-+The @samp{-x} (@code{xtrace}) option displays commands other than
-+simple commands when performing an execution trace
-+(@pxref{The Set Builtin}).
-+
-+@item
-+The @code{test} builtin (@pxref{Bourne Shell Builtins})
-+is slightly different, as it implements the @sc{posix} algorithm,
-+which specifies the behavior based on the number of arguments.
-+
-+@item
-+Bash includes the @code{caller} builtin, which displays the context of
-+any active subroutine call (a shell function or a script executed with
-+the @code{.} or @code{source} builtins).  This supports the bash
-+debugger.
-+
-+@item
-+The @code{trap} builtin (@pxref{Bourne Shell Builtins}) allows a
-+@code{DEBUG} pseudo-signal specification, similar to @code{EXIT}.
-+Commands specified with a @code{DEBUG} trap are executed before every
-+simple command, @code{for} command, @code{case} command,
-+@code{select} command, every arithmetic @code{for} command, and before
-+the first command executes in a shell function.
-+The @code{DEBUG} trap is not inherited by shell functions unless the
-+function has been given the @code{trace} attribute or the
-+@code{functrace} option has been enabled using the @code{shopt} builtin.
-+The @code{extdebug} shell option has additional effects on the
-+@code{DEBUG} trap.
-+
-+The @code{trap} builtin (@pxref{Bourne Shell Builtins}) allows an
-+@code{ERR} pseudo-signal specification, similar to @code{EXIT} and @code{DEBUG}.
-+Commands specified with an @code{ERR} trap are executed after a simple
-+command fails, with a few exceptions.
-+The @code{ERR} trap is not inherited by shell functions unless the
-+@code{-o errtrace} option to the @code{set} builtin is enabled.
-+
-+The @code{trap} builtin (@pxref{Bourne Shell Builtins}) allows a
-+@code{RETURN} pseudo-signal specification, similar to
-+@code{EXIT} and @code{DEBUG}.
-+Commands specified with an @code{RETURN} trap are executed before
-+execution resumes after a shell function or a shell script executed with
-+@code{.} or @code{source} returns.
-+The @code{RETURN} trap is not inherited by shell functions unless the
-+function has been given the @code{trace} attribute or the
-+@code{functrace} option has been enabled using the @code{shopt} builtin.
-+
-+@item
-+The Bash @code{type} builtin is more extensive and gives more information
-+about the names it finds (@pxref{Bash Builtins}).
-+
-+@item
-+The Bash @code{umask} builtin permits a @option{-p} option to cause
-+the output to be displayed in the form of a @code{umask} command
-+that may be reused as input (@pxref{Bourne Shell Builtins}).
-+
-+@item
-+Bash implements a @code{csh}-like directory stack, and provides the
-+@code{pushd}, @code{popd}, and @code{dirs} builtins to manipulate it
-+(@pxref{The Directory Stack}).
-+Bash also makes the directory stack visible as the value of the
-+@env{DIRSTACK} shell variable.
-+
-+@item
-+Bash interprets special backslash-escaped characters in the prompt
-+strings when interactive (@pxref{Printing a Prompt}).
-+
-+@item
-+The Bash restricted mode is more useful (@pxref{The Restricted Shell});
-+the SVR4.2 shell restricted mode is too limited.
-+
-+@item
-+The @code{disown} builtin can remove a job from the internal shell
-+job table (@pxref{Job Control Builtins}) or suppress the sending
-+of @code{SIGHUP} to a job when the shell exits as the result of a
-+@code{SIGHUP}.
-+
-+@item
-+Bash includes a number of features to support a separate debugger for
-+shell scripts.
-+
-+@item
-+The SVR4.2 shell has two privilege-related builtins
-+(@code{mldmode} and @code{priv}) not present in Bash.
-+
-+@item
-+Bash does not have the @code{stop} or @code{newgrp} builtins.
-+
-+@item
-+Bash does not use the @env{SHACCT} variable or perform shell accounting.
-+
-+@item
-+The SVR4.2 @code{sh} uses a @env{TIMEOUT} variable like Bash uses
-+@env{TMOUT}.
-+
-+@end itemize
-+
-+@noindent
-+More features unique to Bash may be found in @ref{Bash Features}.
-+
-+
-+@appendixsec Implementation Differences From The SVR4.2 Shell
-+
-+Since Bash is a completely new implementation, it does not suffer from
-+many of the limitations of the SVR4.2 shell.  For instance:
-+
-+@itemize @bullet
-+
-+@item
-+Bash does not fork a subshell when redirecting into or out of
-+a shell control structure such as  an @code{if} or @code{while}
-+statement.
-+
-+@item
-+Bash does not allow unbalanced quotes.  The SVR4.2 shell will silently
-+insert a needed closing quote at @code{EOF} under certain circumstances.
-+This can be the cause of some hard-to-find errors.
-+
-+@item
-+The SVR4.2 shell uses a baroque memory management scheme based on
-+trapping @code{SIGSEGV}.  If the shell is started from a process with
-+@code{SIGSEGV} blocked (e.g., by using the @code{system()} C library
-+function call), it misbehaves badly.
-+
-+@item
-+In a questionable attempt at security, the SVR4.2 shell,
-+when invoked without the @option{-p} option, will alter its real
-+and effective @sc{uid} and @sc{gid} if they are less than some
-+magic threshold value, commonly 100.
-+This can lead to unexpected results.
-+
-+@item
-+The SVR4.2 shell does not allow users to trap @code{SIGSEGV},
-+@code{SIGALRM}, or @code{SIGCHLD}.
-+
-+@item
-+The SVR4.2 shell does not allow the @env{IFS}, @env{MAILCHECK},
-+@env{PATH}, @env{PS1}, or @env{PS2} variables to be unset.
-+
-+@item
-+The SVR4.2 shell treats @samp{^} as the undocumented equivalent of
-+@samp{|}.
-+
-+@item
-+Bash allows multiple option arguments when it is invoked (@code{-x -v});
-+the SVR4.2 shell allows only one option argument (@code{-xv}).  In
-+fact, some versions of the shell dump core if the second argument begins
-+with a @samp{-}.
-+
-+@item
-+The SVR4.2 shell exits a script if any builtin fails; Bash exits
-+a script only if one of the @sc{posix} special builtins fails, and
-+only for certain failures, as enumerated in the @sc{posix} standard.
-+
-+@item 
-+The SVR4.2 shell behaves differently when invoked as @code{jsh}
-+(it turns on job control).
-+@end itemize
-+
-+@node Copying This Manual
-+@appendix Copying This Manual
-+
-+@menu
-+* GNU Free Documentation License::      License for copying this manual.
-+@end menu
-+
-+@include fdl.texi
-+
-+@node Builtin Index
-+@unnumbered Index of Shell Builtin Commands
-+@printindex bt
-+
-+@node Reserved Word Index
-+@unnumbered Index of Shell Reserved Words
-+@printindex rw
-+
-+@node Variable Index
-+@unnumbered Parameter and Variable Index
-+@printindex vr
-+
-+@node Function Index
-+@unnumbered Function Index
-+@printindex fn
-+
-+@node Concept Index
-+@unnumbered Concept Index
-+@printindex cp
-+
-+@bye
-diff -Naur bash-3.2.orig/execute_cmd.c bash-3.2/execute_cmd.c
---- bash-3.2.orig/execute_cmd.c	2006-08-26 00:23:17.000000000 -0400
-+++ bash-3.2/execute_cmd.c	2008-06-18 06:46:33.000000000 -0400
-@@ -1,6 +1,6 @@
- /* execute_cmd.c -- Execute a COMMAND structure. */
- 
--/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
-+/* Copyright (C) 1987-2007 Free Software Foundation, Inc.
- 
-    This file is part of GNU Bash, the Bourne Again SHell.
- 
-@@ -614,7 +614,7 @@
-       cleanup_redirects (redirection_undo_list);
-       redirection_undo_list = (REDIRECT *)NULL;
-       dispose_exec_redirects ();
--      return (EXECUTION_FAILURE);
-+      return (last_command_exit_value = EXECUTION_FAILURE);
-     }
- 
-   if (redirection_undo_list)
-@@ -2546,7 +2546,8 @@
-       arg1 = cond_expand_word (cond->left->op, 0);
-       if (arg1 == 0)
- 	arg1 = nullstr;
--      arg2 = cond_expand_word (cond->right->op, patmatch||rmatch);
-+      arg2 = cond_expand_word (cond->right->op,
-+			       (rmatch && shell_compatibility_level > 31) ? 2 : (patmatch ? 1 : 0));
-       if (arg2 == 0)
- 	arg2 = nullstr;
- 
-@@ -3050,6 +3051,11 @@
-   if (command_line == 0)
-     command_line = savestring (the_printed_command_except_trap);
- 
-+#if defined (PROCESS_SUBSTITUTION)
-+  if ((subshell_environment & SUBSHELL_COMSUB) && (simple_command->flags & CMD_NO_FORK) && fifos_pending() > 0)
-+    simple_command->flags &= ~CMD_NO_FORK;
-+#endif
-+
-   execute_disk_command (words, simple_command->redirects, command_line,
- 			pipe_in, pipe_out, async, fds_to_close,
- 			simple_command->flags);
-@@ -3875,6 +3881,8 @@
-     shell_variables = shell_variables->down;
- 
-   clear_unwind_protect_list (0);
-+  /* XXX -- are there other things we should be resetting here? */
-+  parse_and_execute_level = 0;		/* nothing left to restore it */
- 
-   /* We're no longer inside a shell function. */
-   variable_context = return_catch_flag = 0;
-diff -Naur bash-3.2.orig/expr.c bash-3.2/expr.c
---- bash-3.2.orig/expr.c	2005-12-28 17:47:03.000000000 -0500
-+++ bash-3.2/expr.c	2008-06-18 06:46:28.000000000 -0400
-@@ -286,6 +286,8 @@
-       free (expr_stack[expr_depth]);
-     }
-   free (expr_stack[expr_depth]);	/* free the allocated EXPR_CONTEXT */
-+
-+  noeval = 0;	/* XXX */
- }
- 
- static void
-@@ -319,6 +321,7 @@
-   procenv_t oevalbuf;
- 
-   val = 0;
-+  noeval = 0;
- 
-   FASTCOPY (evalbuf, oevalbuf, sizeof (evalbuf));
- 
-@@ -929,6 +932,7 @@
-       if (interactive_shell)
- 	{
- 	  expr_unwind ();
-+	  top_level_cleanup ();
- 	  jump_to_top_level (DISCARD);
- 	}
-       else
-diff -Naur bash-3.2.orig/findcmd.c bash-3.2/findcmd.c
---- bash-3.2.orig/findcmd.c	2005-08-17 16:49:54.000000000 -0400
-+++ bash-3.2/findcmd.c	2008-06-18 06:46:16.000000000 -0400
-@@ -308,7 +308,7 @@
-   if (hashed_file && (posixly_correct || check_hashed_filenames))
-     {
-       st = file_status (hashed_file);
--      if ((st ^ (FS_EXISTS | FS_EXECABLE)) != 0)
-+      if ((st & (FS_EXISTS|FS_EXECABLE)) != (FS_EXISTS|FS_EXECABLE))
- 	{
- 	  phash_remove (pathname);
- 	  free (hashed_file);
-diff -Naur bash-3.2.orig/jobs.c bash-3.2/jobs.c
---- bash-3.2.orig/jobs.c	2006-07-29 16:40:48.000000000 -0400
-+++ bash-3.2/jobs.c	2008-06-18 06:46:31.000000000 -0400
-@@ -250,6 +250,7 @@
- static int job_exit_signal __P((int));
- static int set_job_status_and_cleanup __P((int));
- 
-+static WAIT job_signal_status __P((int));
- static WAIT raw_job_exit_status __P((int));
- 
- static void notify_of_job_status __P((void));
-@@ -783,11 +784,13 @@
-   if (jobs[js.j_firstj] == 0)
-     {
-       old = js.j_firstj++;
-+      if (old >= js.j_jobslots)
-+	old = js.j_jobslots - 1;
-       while (js.j_firstj != old)
- 	{
- 	  if (js.j_firstj >= js.j_jobslots)
- 	    js.j_firstj = 0;
--	  if (jobs[js.j_firstj])
-+	  if (jobs[js.j_firstj] || js.j_firstj == old)	/* needed if old == 0 */
- 	    break;
- 	  js.j_firstj++;
- 	}
-@@ -797,11 +800,13 @@
-   if (jobs[js.j_lastj] == 0)
-     {
-       old = js.j_lastj--;
-+      if (old < 0)
-+	old = 0;
-       while (js.j_lastj != old)
- 	{
- 	  if (js.j_lastj < 0)
- 	    js.j_lastj = js.j_jobslots - 1;
--	  if (jobs[js.j_lastj])
-+	  if (jobs[js.j_lastj] || js.j_lastj == old)	/* needed if old == js.j_jobslots */
- 	    break;
- 	  js.j_lastj--;
- 	}
-@@ -963,7 +968,11 @@
-   reap_dead_jobs ();
-   realloc_jobs_list ();
- 
--  return (js.j_lastj);
-+#ifdef DEBUG
-+  itrace("compact_jobs_list: returning %d", (js.j_lastj || jobs[js.j_lastj]) ? js.j_lastj + 1 : 0);
-+#endif
-+
-+  return ((js.j_lastj || jobs[js.j_lastj]) ? js.j_lastj + 1 : 0);
- }
- 
- /* Delete the job at INDEX from the job list.  Must be called
-@@ -984,8 +993,6 @@
-   temp = jobs[job_index];
-   if (temp == 0)
-     return;
--  if (job_index == js.j_current || job_index == js.j_previous)
--    reset_current ();
- 
-   if ((dflags & DEL_NOBGPID) == 0)
-     {
-@@ -1028,6 +1035,9 @@
-     js.j_firstj = js.j_lastj = 0;
-   else if (jobs[js.j_firstj] == 0 || jobs[js.j_lastj] == 0)
-     reset_job_indices ();
-+
-+  if (job_index == js.j_current || job_index == js.j_previous)
-+    reset_current ();
- }
- 
- /* Must be called with SIGCHLD blocked. */
-@@ -2210,6 +2220,26 @@
-     return (EXECUTION_SUCCESS);
- }
- 
-+static WAIT
-+job_signal_status (job)
-+     int job;
-+{
-+  register PROCESS *p;
-+  WAIT s;
-+
-+  p = jobs[job]->pipe;
-+  do
-+    {
-+      s = p->status;
-+      if (WIFSIGNALED(s) || WIFSTOPPED(s))
-+	break;
-+      p = p->next;
-+    }
-+  while (p != jobs[job]->pipe);
-+
-+  return s;
-+}
-+  
- /* Return the exit status of the last process in the pipeline for job JOB.
-    This is the exit status of the entire job. */
- static WAIT
-@@ -2292,11 +2322,14 @@
-      to finish.  We don't want the shell to exit if an interrupt is
-      received, only if one of the jobs run is killed via SIGINT.  If
-      job control is not set, the job will be run in the same pgrp as
--     the shell, and the shell will see any signals the job gets. */
-+     the shell, and the shell will see any signals the job gets.  In
-+     fact, we want this set every time the waiting shell and the waited-
-+     for process are in the same process group, including command
-+     substitution. */
- 
-   /* This is possibly a race condition -- should it go in stop_pipeline? */
-   wait_sigint_received = 0;
--  if (job_control == 0)
-+  if (job_control == 0 || (subshell_environment&SUBSHELL_COMSUB))
-     {
-       old_sigint_handler = set_signal_handler (SIGINT, wait_sigint_handler);
-       if (old_sigint_handler == SIG_IGN)
-@@ -2442,15 +2475,7 @@
- 	     to a signal.  We might want to change this later to just check
- 	     the last process in the pipeline.  If no process exits due to a
- 	     signal, S is left as the status of the last job in the pipeline. */
--	  p = jobs[job]->pipe;
--	  do
--	    {
--	      s = p->status;
--	      if (WIFSIGNALED(s) || WIFSTOPPED(s))
--		break;
--	      p = p->next;
--	    }
--	  while (p != jobs[job]->pipe);
-+	  s = job_signal_status (job);
- 
- 	  if (WIFSIGNALED (s) || WIFSTOPPED (s))
- 	    {
-@@ -2484,6 +2509,24 @@
- 		}
- 	    }
- 	}
-+      else if ((subshell_environment & SUBSHELL_COMSUB) && wait_sigint_received)
-+	{
-+	  /* If waiting for a job in a subshell started to do command
-+	     substitution, simulate getting and being killed by the SIGINT to
-+	     pass the status back to our parent. */
-+	  s = job_signal_status (job);
-+	
-+	  if (WIFSIGNALED (s) && WTERMSIG (s) == SIGINT && signal_is_trapped (SIGINT) == 0)
-+	    {
-+	      UNBLOCK_CHILD (oset);
-+	      restore_sigint_handler ();
-+	      old_sigint_handler = set_signal_handler (SIGINT, SIG_DFL);
-+	      if (old_sigint_handler == SIG_IGN)
-+		restore_sigint_handler ();
-+	      else
-+		kill (getpid (), SIGINT);
-+	    }
-+	}
- 
-       /* Moved here from set_job_status_and_cleanup, which is in the SIGCHLD
-          signal handler path */
-diff -Naur bash-3.2.orig/lib/readline/complete.c bash-3.2/lib/readline/complete.c
---- bash-3.2.orig/lib/readline/complete.c	2006-07-28 11:35:49.000000000 -0400
-+++ bash-3.2/lib/readline/complete.c	2008-06-18 06:46:22.000000000 -0400
-@@ -428,7 +428,7 @@
- 	return (1);
-       if (c == 'n' || c == 'N' || c == RUBOUT)
- 	return (0);
--      if (c == ABORT_CHAR)
-+      if (c == ABORT_CHAR || c < 0)
- 	_rl_abort_internal ();
-       if (for_pager && (c == NEWLINE || c == RETURN))
- 	return (2);
-diff -Naur bash-3.2.orig/lib/readline/display.c bash-3.2/lib/readline/display.c
---- bash-3.2.orig/lib/readline/display.c	2006-09-14 14:20:12.000000000 -0400
-+++ bash-3.2/lib/readline/display.c	2008-06-18 06:46:29.000000000 -0400
-@@ -391,14 +391,14 @@
-       t = ++p;
-       local_prompt = expand_prompt (p, &prompt_visible_length,
- 				       &prompt_last_invisible,
--				       (int *)NULL,
-+				       &prompt_invis_chars_first_line,
- 				       &prompt_physical_chars);
-       c = *t; *t = '\0';
-       /* The portion of the prompt string up to and including the
- 	 final newline is now null-terminated. */
-       local_prompt_prefix = expand_prompt (prompt, &prompt_prefix_length,
- 						   (int *)NULL,
--						   &prompt_invis_chars_first_line,
-+						   (int *)NULL,
- 						   (int *)NULL);
-       *t = c;
-       local_prompt_len = local_prompt ? strlen (local_prompt) : 0;
-@@ -561,6 +561,17 @@
-       wrap_offset = prompt_invis_chars_first_line = 0;
-     }
- 
-+#if defined (HANDLE_MULTIBYTE)
-+#define CHECK_INV_LBREAKS() \
-+      do { \
-+	if (newlines >= (inv_lbsize - 2)) \
-+	  { \
-+	    inv_lbsize *= 2; \
-+	    inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \
-+	    _rl_wrapped_line = (int *)xrealloc (_rl_wrapped_line, inv_lbsize * sizeof (int)); \
-+	  } \
-+      } while (0)
-+#else
- #define CHECK_INV_LBREAKS() \
-       do { \
- 	if (newlines >= (inv_lbsize - 2)) \
-@@ -569,6 +580,7 @@
- 	    inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \
- 	  } \
-       } while (0)
-+#endif /* HANDLE_MULTIBYTE */
- 
- #if defined (HANDLE_MULTIBYTE)	  
- #define CHECK_LPOS() \
-@@ -1036,7 +1048,7 @@
- 		tx = _rl_col_width (&visible_line[pos], 0, nleft) - visible_wrap_offset;
- 	      else
- 		tx = nleft;
--	      if (_rl_last_c_pos > tx)
-+	      if (tx >= 0 && _rl_last_c_pos > tx)
- 		{
- 	          _rl_backspace (_rl_last_c_pos - tx);	/* XXX */
- 	          _rl_last_c_pos = tx;
-@@ -1192,7 +1204,7 @@
-      int current_line, omax, nmax, inv_botlin;
- {
-   register char *ofd, *ols, *oe, *nfd, *nls, *ne;
--  int temp, lendiff, wsatend, od, nd;
-+  int temp, lendiff, wsatend, od, nd, o_cpos;
-   int current_invis_chars;
-   int col_lendiff, col_temp;
- #if defined (HANDLE_MULTIBYTE)
-@@ -1453,6 +1465,8 @@
- 	_rl_last_c_pos = lendiff;
-     }
- 
-+  o_cpos = _rl_last_c_pos;
-+
-   /* When this function returns, _rl_last_c_pos is correct, and an absolute
-      cursor postion in multibyte mode, but a buffer index when not in a
-      multibyte locale. */
-@@ -1462,7 +1476,9 @@
-   /* We need to indicate that the cursor position is correct in the presence of
-      invisible characters in the prompt string.  Let's see if setting this when
-      we make sure we're at the end of the drawn prompt string works. */
--  if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 && _rl_last_c_pos == prompt_physical_chars)
-+  if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 && 
-+      (_rl_last_c_pos > 0 || o_cpos > 0) &&
-+      _rl_last_c_pos == prompt_physical_chars)
-     cpos_adjusted = 1;
- #endif
- #endif
-@@ -1506,11 +1522,31 @@
-     {
-       /* Non-zero if we're increasing the number of lines. */
-       int gl = current_line >= _rl_vis_botlin && inv_botlin > _rl_vis_botlin;
-+      /* If col_lendiff is > 0, implying that the new string takes up more
-+	 screen real estate than the old, but lendiff is < 0, meaning that it
-+	 takes fewer bytes, we need to just output the characters starting
-+	 from the first difference.  These will overwrite what is on the
-+	 display, so there's no reason to do a smart update.  This can really
-+	 only happen in a multibyte environment. */
-+      if (lendiff < 0)
-+	{
-+	  _rl_output_some_chars (nfd, temp);
-+	  _rl_last_c_pos += _rl_col_width (nfd, 0, temp);
-+	  /* If nfd begins before any invisible characters in the prompt,
-+	     adjust _rl_last_c_pos to account for wrap_offset and set
-+	     cpos_adjusted to let the caller know. */
-+	  if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible))
-+	    {
-+	      _rl_last_c_pos -= wrap_offset;
-+	      cpos_adjusted = 1;
-+	    }
-+	  return;
-+	}
-       /* Sometimes it is cheaper to print the characters rather than
- 	 use the terminal's capabilities.  If we're growing the number
- 	 of lines, make sure we actually cause the new line to wrap
- 	 around on auto-wrapping terminals. */
--      if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl))
-+      else if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl))
- 	{
- 	  /* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and
- 	     _rl_horizontal_scroll_mode == 1, inserting the characters with
-@@ -1533,11 +1569,16 @@
- 	    }
- 	  else
- 	    {
--	      /* We have horizontal scrolling and we are not inserting at
--		 the end.  We have invisible characters in this line.  This
--		 is a dumb update. */
- 	      _rl_output_some_chars (nfd, temp);
- 	      _rl_last_c_pos += col_temp;
-+	      /* If nfd begins before any invisible characters in the prompt,
-+		 adjust _rl_last_c_pos to account for wrap_offset and set
-+		 cpos_adjusted to let the caller know. */
-+	      if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible))
-+		{
-+		  _rl_last_c_pos -= wrap_offset;
-+		  cpos_adjusted = 1;
-+		}
- 	      return;
- 	    }
- 	  /* Copy (new) chars to screen from first diff to last match. */
-@@ -1586,8 +1627,22 @@
- 	  temp = nls - nfd;
- 	  if (temp > 0)
- 	    {
-+	      /* If nfd begins at the prompt, or before the invisible
-+		 characters in the prompt, we need to adjust _rl_last_c_pos
-+		 in a multibyte locale to account for the wrap offset and
-+		 set cpos_adjusted accordingly. */
- 	      _rl_output_some_chars (nfd, temp);
--	      _rl_last_c_pos += _rl_col_width (nfd, 0, temp);;
-+	      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+		{
-+                  _rl_last_c_pos += _rl_col_width (nfd, 0, temp);
-+                  if (current_line == 0 && wrap_offset &&  ((nfd - new) <= prompt_last_invisible))
-+		    {
-+		      _rl_last_c_pos -= wrap_offset;
-+		      cpos_adjusted = 1;
-+		    }
-+		}
-+              else
-+                _rl_last_c_pos += temp;
- 	    }
- 	}
-       /* Otherwise, print over the existing material. */
-@@ -1595,8 +1650,20 @@
- 	{
- 	  if (temp > 0)
- 	    {
-+	      /* If nfd begins at the prompt, or before the invisible
-+		 characters in the prompt, we need to adjust _rl_last_c_pos
-+		 in a multibyte locale to account for the wrap offset and
-+		 set cpos_adjusted accordingly. */
- 	      _rl_output_some_chars (nfd, temp);
- 	      _rl_last_c_pos += col_temp;		/* XXX */
-+	      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+		{
-+		  if (current_line == 0 && wrap_offset &&  ((nfd - new) <= prompt_last_invisible))
-+		    {
-+		      _rl_last_c_pos -= wrap_offset;
-+		      cpos_adjusted = 1;
-+		    }
-+		}
- 	    }
- 	  lendiff = (oe - old) - (ne - new);
- 	  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-@@ -1732,7 +1799,10 @@
-   if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-     {
-       dpos = _rl_col_width (data, 0, new);
--      if (dpos > prompt_last_invisible)		/* XXX - don't use woff here */
-+      /* Use NEW when comparing against the last invisible character in the
-+	 prompt string, since they're both buffer indices and DPOS is a
-+	 desired display position. */
-+      if (new > prompt_last_invisible)		/* XXX - don't use woff here */
- 	{
- 	  dpos -= woff;
- 	  /* Since this will be assigned to _rl_last_c_pos at the end (more
-@@ -2380,6 +2450,8 @@
- 
-   if (end <= start)
-     return 0;
-+  if (MB_CUR_MAX == 1 || rl_byte_oriented)
-+    return (end - start);
- 
-   memset (&ps, 0, sizeof (mbstate_t));
- 
-diff -Naur bash-3.2.orig/lib/readline/display.c.orig bash-3.2/lib/readline/display.c.orig
---- bash-3.2.orig/lib/readline/display.c.orig	1969-12-31 19:00:00.000000000 -0500
-+++ bash-3.2/lib/readline/display.c.orig	2008-06-18 06:46:27.000000000 -0400
-@@ -0,0 +1,2518 @@
-+/* display.c -- readline redisplay facility. */
-+
-+/* Copyright (C) 1987-2006 Free Software Foundation, Inc.
-+
-+   This file is part of the GNU Readline Library, a library for
-+   reading lines of text with interactive input and history editing.
-+
-+   The GNU Readline Library is free software; you can redistribute it
-+   and/or modify it under the terms of the GNU General Public License
-+   as published by the Free Software Foundation; either version 2, or
-+   (at your option) any later version.
-+
-+   The GNU Readline Library is distributed in the hope that it will be
-+   useful, but WITHOUT ANY WARRANTY; without even the implied warranty
-+   of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   The GNU General Public License is often shipped with GNU software, and
-+   is generally kept in a file called COPYING or LICENSE.  If you do not
-+   have a copy of the license, write to the Free Software Foundation,
-+   59 Temple Place, Suite 330, Boston, MA 02111 USA. */
-+#define READLINE_LIBRARY
-+
-+#if defined (HAVE_CONFIG_H)
-+#  include <config.h>
-+#endif
-+
-+#include <sys/types.h>
-+
-+#if defined (HAVE_UNISTD_H)
-+#  include <unistd.h>
-+#endif /* HAVE_UNISTD_H */
-+
-+#include "posixstat.h"
-+
-+#if defined (HAVE_STDLIB_H)
-+#  include <stdlib.h>
-+#else
-+#  include "ansi_stdlib.h"
-+#endif /* HAVE_STDLIB_H */
-+
-+#include <stdio.h>
-+
-+/* System-specific feature definitions and include files. */
-+#include "rldefs.h"
-+#include "rlmbutil.h"
-+
-+/* Termcap library stuff. */
-+#include "tcap.h"
-+
-+/* Some standard library routines. */
-+#include "readline.h"
-+#include "history.h"
-+
-+#include "rlprivate.h"
-+#include "xmalloc.h"
-+
-+#if !defined (strchr) && !defined (__STDC__)
-+extern char *strchr (), *strrchr ();
-+#endif /* !strchr && !__STDC__ */
-+
-+static void update_line PARAMS((char *, char *, int, int, int, int));
-+static void space_to_eol PARAMS((int));
-+static void delete_chars PARAMS((int));
-+static void insert_some_chars PARAMS((char *, int, int));
-+static void cr PARAMS((void));
-+
-+#if defined (HANDLE_MULTIBYTE)
-+static int _rl_col_width PARAMS((const char *, int, int));
-+static int *_rl_wrapped_line;
-+#else
-+#  define _rl_col_width(l, s, e)	(((e) <= (s)) ? 0 : (e) - (s))
-+#endif
-+
-+static int *inv_lbreaks, *vis_lbreaks;
-+static int inv_lbsize, vis_lbsize;
-+
-+/* Heuristic used to decide whether it is faster to move from CUR to NEW
-+   by backing up or outputting a carriage return and moving forward.  CUR
-+   and NEW are either both buffer positions or absolute screen positions. */
-+#define CR_FASTER(new, cur) (((new) + 1) < ((cur) - (new)))
-+
-+/* _rl_last_c_pos is an absolute cursor position in multibyte locales and a
-+   buffer index in others.  This macro is used when deciding whether the
-+   current cursor position is in the middle of a prompt string containing
-+   invisible characters. */
-+#define PROMPT_ENDING_INDEX \
-+  ((MB_CUR_MAX > 1 && rl_byte_oriented == 0) ? prompt_physical_chars : prompt_last_invisible+1)
-+  
-+
-+/* **************************************************************** */
-+/*								    */
-+/*			Display stuff				    */
-+/*								    */
-+/* **************************************************************** */
-+
-+/* This is the stuff that is hard for me.  I never seem to write good
-+   display routines in C.  Let's see how I do this time. */
-+
-+/* (PWP) Well... Good for a simple line updater, but totally ignores
-+   the problems of input lines longer than the screen width.
-+
-+   update_line and the code that calls it makes a multiple line,
-+   automatically wrapping line update.  Careful attention needs
-+   to be paid to the vertical position variables. */
-+
-+/* Keep two buffers; one which reflects the current contents of the
-+   screen, and the other to draw what we think the new contents should
-+   be.  Then compare the buffers, and make whatever changes to the
-+   screen itself that we should.  Finally, make the buffer that we
-+   just drew into be the one which reflects the current contents of the
-+   screen, and place the cursor where it belongs.
-+
-+   Commands that want to can fix the display themselves, and then let
-+   this function know that the display has been fixed by setting the
-+   RL_DISPLAY_FIXED variable.  This is good for efficiency. */
-+
-+/* Application-specific redisplay function. */
-+rl_voidfunc_t *rl_redisplay_function = rl_redisplay;
-+
-+/* Global variables declared here. */
-+/* What YOU turn on when you have handled all redisplay yourself. */
-+int rl_display_fixed = 0;
-+
-+int _rl_suppress_redisplay = 0;
-+int _rl_want_redisplay = 0;
-+
-+/* The stuff that gets printed out before the actual text of the line.
-+   This is usually pointing to rl_prompt. */
-+char *rl_display_prompt = (char *)NULL;
-+
-+/* Pseudo-global variables declared here. */
-+
-+/* The visible cursor position.  If you print some text, adjust this. */
-+/* NOTE: _rl_last_c_pos is used as a buffer index when not in a locale
-+   supporting multibyte characters, and an absolute cursor position when
-+   in such a locale.  This is an artifact of the donated multibyte support.
-+   Care must be taken when modifying its value. */
-+int _rl_last_c_pos = 0;
-+int _rl_last_v_pos = 0;
-+
-+static int cpos_adjusted;
-+static int cpos_buffer_position;
-+
-+/* Number of lines currently on screen minus 1. */
-+int _rl_vis_botlin = 0;
-+
-+/* Variables used only in this file. */
-+/* The last left edge of text that was displayed.  This is used when
-+   doing horizontal scrolling.  It shifts in thirds of a screenwidth. */
-+static int last_lmargin;
-+
-+/* The line display buffers.  One is the line currently displayed on
-+   the screen.  The other is the line about to be displayed. */
-+static char *visible_line = (char *)NULL;
-+static char *invisible_line = (char *)NULL;
-+
-+/* A buffer for `modeline' messages. */
-+static char msg_buf[128];
-+
-+/* Non-zero forces the redisplay even if we thought it was unnecessary. */
-+static int forced_display;
-+
-+/* Default and initial buffer size.  Can grow. */
-+static int line_size = 1024;
-+
-+/* Variables to keep track of the expanded prompt string, which may
-+   include invisible characters. */
-+
-+static char *local_prompt, *local_prompt_prefix;
-+static int local_prompt_len;
-+static int prompt_visible_length, prompt_prefix_length;
-+
-+/* The number of invisible characters in the line currently being
-+   displayed on the screen. */
-+static int visible_wrap_offset;
-+
-+/* The number of invisible characters in the prompt string.  Static so it
-+   can be shared between rl_redisplay and update_line */
-+static int wrap_offset;
-+
-+/* The index of the last invisible character in the prompt string. */
-+static int prompt_last_invisible;
-+
-+/* The length (buffer offset) of the first line of the last (possibly
-+   multi-line) buffer displayed on the screen. */
-+static int visible_first_line_len;
-+
-+/* Number of invisible characters on the first physical line of the prompt.
-+   Only valid when the number of physical characters in the prompt exceeds
-+   (or is equal to) _rl_screenwidth. */
-+static int prompt_invis_chars_first_line;
-+
-+static int prompt_last_screen_line;
-+
-+static int prompt_physical_chars;
-+
-+/* Variables to save and restore prompt and display information. */
-+
-+/* These are getting numerous enough that it's time to create a struct. */
-+
-+static char *saved_local_prompt;
-+static char *saved_local_prefix;
-+static int saved_last_invisible;
-+static int saved_visible_length;
-+static int saved_prefix_length;
-+static int saved_local_length;
-+static int saved_invis_chars_first_line;
-+static int saved_physical_chars;
-+
-+/* Expand the prompt string S and return the number of visible
-+   characters in *LP, if LP is not null.  This is currently more-or-less
-+   a placeholder for expansion.  LIP, if non-null is a place to store the
-+   index of the last invisible character in the returned string. NIFLP,
-+   if non-zero, is a place to store the number of invisible characters in
-+   the first prompt line.  The previous are used as byte counts -- indexes
-+   into a character buffer. */
-+
-+/* Current implementation:
-+	\001 (^A) start non-visible characters
-+	\002 (^B) end non-visible characters
-+   all characters except \001 and \002 (following a \001) are copied to
-+   the returned string; all characters except those between \001 and
-+   \002 are assumed to be `visible'. */	
-+
-+static char *
-+expand_prompt (pmt, lp, lip, niflp, vlp)
-+     char *pmt;
-+     int *lp, *lip, *niflp, *vlp;
-+{
-+  char *r, *ret, *p, *igstart;
-+  int l, rl, last, ignoring, ninvis, invfl, invflset, ind, pind, physchars;
-+
-+  /* Short-circuit if we can. */
-+  if ((MB_CUR_MAX <= 1 || rl_byte_oriented) && strchr (pmt, RL_PROMPT_START_IGNORE) == 0)
-+    {
-+      r = savestring (pmt);
-+      if (lp)
-+	*lp = strlen (r);
-+      if (lip)
-+	*lip = 0;
-+      if (niflp)
-+	*niflp = 0;
-+      if (vlp)
-+	*vlp = lp ? *lp : strlen (r);
-+      return r;
-+    }
-+
-+  l = strlen (pmt);
-+  r = ret = (char *)xmalloc (l + 1);
-+
-+  invfl = 0;	/* invisible chars in first line of prompt */
-+  invflset = 0;	/* we only want to set invfl once */
-+
-+  igstart = 0;
-+  for (rl = ignoring = last = ninvis = physchars = 0, p = pmt; p && *p; p++)
-+    {
-+      /* This code strips the invisible character string markers
-+	 RL_PROMPT_START_IGNORE and RL_PROMPT_END_IGNORE */
-+      if (ignoring == 0 && *p == RL_PROMPT_START_IGNORE)		/* XXX - check ignoring? */
-+	{
-+	  ignoring = 1;
-+	  igstart = p;
-+	  continue;
-+	}
-+      else if (ignoring && *p == RL_PROMPT_END_IGNORE)
-+	{
-+	  ignoring = 0;
-+	  if (p != (igstart + 1))
-+	    last = r - ret - 1;
-+	  continue;
-+	}
-+      else
-+	{
-+#if defined (HANDLE_MULTIBYTE)
-+	  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+	    {
-+	      pind = p - pmt;
-+	      ind = _rl_find_next_mbchar (pmt, pind, 1, MB_FIND_NONZERO);
-+	      l = ind - pind;
-+	      while (l--)
-+	        *r++ = *p++;
-+	      if (!ignoring)
-+		{
-+		  rl += ind - pind;
-+		  physchars += _rl_col_width (pmt, pind, ind);
-+		}
-+	      else
-+		ninvis += ind - pind;
-+	      p--;			/* compensate for later increment */
-+	    }
-+	  else
-+#endif
-+	    {
-+	      *r++ = *p;
-+	      if (!ignoring)
-+		{
-+		  rl++;			/* visible length byte counter */
-+		  physchars++;
-+		}
-+	      else
-+		ninvis++;		/* invisible chars byte counter */
-+	    }
-+
-+	  if (invflset == 0 && rl >= _rl_screenwidth)
-+	    {
-+	      invfl = ninvis;
-+	      invflset = 1;
-+	    }
-+	}
-+    }
-+
-+  if (rl < _rl_screenwidth)
-+    invfl = ninvis;
-+
-+  *r = '\0';
-+  if (lp)
-+    *lp = rl;
-+  if (lip)
-+    *lip = last;
-+  if (niflp)
-+    *niflp = invfl;
-+  if  (vlp)
-+    *vlp = physchars;
-+  return ret;
-+}
-+
-+/* Just strip out RL_PROMPT_START_IGNORE and RL_PROMPT_END_IGNORE from
-+   PMT and return the rest of PMT. */
-+char *
-+_rl_strip_prompt (pmt)
-+     char *pmt;
-+{
-+  char *ret;
-+
-+  ret = expand_prompt (pmt, (int *)NULL, (int *)NULL, (int *)NULL, (int *)NULL);
-+  return ret;
-+}
-+
-+/*
-+ * Expand the prompt string into the various display components, if
-+ * necessary.
-+ *
-+ * local_prompt = expanded last line of string in rl_display_prompt
-+ *		  (portion after the final newline)
-+ * local_prompt_prefix = portion before last newline of rl_display_prompt,
-+ *			 expanded via expand_prompt
-+ * prompt_visible_length = number of visible characters in local_prompt
-+ * prompt_prefix_length = number of visible characters in local_prompt_prefix
-+ *
-+ * This function is called once per call to readline().  It may also be
-+ * called arbitrarily to expand the primary prompt.
-+ *
-+ * The return value is the number of visible characters on the last line
-+ * of the (possibly multi-line) prompt.
-+ */
-+int
-+rl_expand_prompt (prompt)
-+     char *prompt;
-+{
-+  char *p, *t;
-+  int c;
-+
-+  /* Clear out any saved values. */
-+  FREE (local_prompt);
-+  FREE (local_prompt_prefix);
-+
-+  local_prompt = local_prompt_prefix = (char *)0;
-+  local_prompt_len = 0;
-+  prompt_last_invisible = prompt_invis_chars_first_line = 0;
-+  prompt_visible_length = prompt_physical_chars = 0;
-+
-+  if (prompt == 0 || *prompt == 0)
-+    return (0);
-+
-+  p = strrchr (prompt, '\n');
-+  if (!p)
-+    {
-+      /* The prompt is only one logical line, though it might wrap. */
-+      local_prompt = expand_prompt (prompt, &prompt_visible_length,
-+					    &prompt_last_invisible,
-+					    &prompt_invis_chars_first_line,
-+					    &prompt_physical_chars);
-+      local_prompt_prefix = (char *)0;
-+      local_prompt_len = local_prompt ? strlen (local_prompt) : 0;
-+      return (prompt_visible_length);
-+    }
-+  else
-+    {
-+      /* The prompt spans multiple lines. */
-+      t = ++p;
-+      local_prompt = expand_prompt (p, &prompt_visible_length,
-+				       &prompt_last_invisible,
-+				       &prompt_invis_chars_first_line,
-+				       &prompt_physical_chars);
-+      c = *t; *t = '\0';
-+      /* The portion of the prompt string up to and including the
-+	 final newline is now null-terminated. */
-+      local_prompt_prefix = expand_prompt (prompt, &prompt_prefix_length,
-+						   (int *)NULL,
-+						   (int *)NULL,
-+						   (int *)NULL);
-+      *t = c;
-+      local_prompt_len = local_prompt ? strlen (local_prompt) : 0;
-+      return (prompt_prefix_length);
-+    }
-+}
-+
-+/* Initialize the VISIBLE_LINE and INVISIBLE_LINE arrays, and their associated
-+   arrays of line break markers.  MINSIZE is the minimum size of VISIBLE_LINE
-+   and INVISIBLE_LINE; if it is greater than LINE_SIZE, LINE_SIZE is
-+   increased.  If the lines have already been allocated, this ensures that
-+   they can hold at least MINSIZE characters. */
-+static void
-+init_line_structures (minsize)
-+      int minsize;
-+{
-+  register int n;
-+
-+  if (invisible_line == 0)	/* initialize it */
-+    {
-+      if (line_size < minsize)
-+	line_size = minsize;
-+      visible_line = (char *)xmalloc (line_size);
-+      invisible_line = (char *)xmalloc (line_size);
-+    }
-+  else if (line_size < minsize)	/* ensure it can hold MINSIZE chars */
-+    {
-+      line_size *= 2;
-+      if (line_size < minsize)
-+	line_size = minsize;
-+      visible_line = (char *)xrealloc (visible_line, line_size);
-+      invisible_line = (char *)xrealloc (invisible_line, line_size);
-+    }
-+
-+  for (n = minsize; n < line_size; n++)
-+    {
-+      visible_line[n] = 0;
-+      invisible_line[n] = 1;
-+    }
-+
-+  if (vis_lbreaks == 0)
-+    {
-+      /* should be enough. */
-+      inv_lbsize = vis_lbsize = 256;
-+      inv_lbreaks = (int *)xmalloc (inv_lbsize * sizeof (int));
-+      vis_lbreaks = (int *)xmalloc (vis_lbsize * sizeof (int));
-+#if defined (HANDLE_MULTIBYTE)
-+      _rl_wrapped_line = (int *)xmalloc (vis_lbsize * sizeof (int));
-+#endif
-+      inv_lbreaks[0] = vis_lbreaks[0] = 0;
-+    }
-+}
-+  
-+/* Basic redisplay algorithm. */
-+void
-+rl_redisplay ()
-+{
-+  register int in, out, c, linenum, cursor_linenum;
-+  register char *line;
-+  int inv_botlin, lb_botlin, lb_linenum, o_cpos;
-+  int newlines, lpos, temp, modmark, n0, num;
-+  char *prompt_this_line;
-+#if defined (HANDLE_MULTIBYTE)
-+  wchar_t wc;
-+  size_t wc_bytes;
-+  int wc_width;
-+  mbstate_t ps;
-+  int _rl_wrapped_multicolumn = 0;
-+#endif
-+
-+  if (!readline_echoing_p)
-+    return;
-+
-+  if (!rl_display_prompt)
-+    rl_display_prompt = "";
-+
-+  if (invisible_line == 0 || vis_lbreaks == 0)
-+    {
-+      init_line_structures (0);
-+      rl_on_new_line ();
-+    }
-+
-+  /* Draw the line into the buffer. */
-+  cpos_buffer_position = -1;
-+
-+  line = invisible_line;
-+  out = inv_botlin = 0;
-+
-+  /* Mark the line as modified or not.  We only do this for history
-+     lines. */
-+  modmark = 0;
-+  if (_rl_mark_modified_lines && current_history () && rl_undo_list)
-+    {
-+      line[out++] = '*';
-+      line[out] = '\0';
-+      modmark = 1;
-+    }
-+
-+  /* If someone thought that the redisplay was handled, but the currently
-+     visible line has a different modification state than the one about
-+     to become visible, then correct the caller's misconception. */
-+  if (visible_line[0] != invisible_line[0])
-+    rl_display_fixed = 0;
-+
-+  /* If the prompt to be displayed is the `primary' readline prompt (the
-+     one passed to readline()), use the values we have already expanded.
-+     If not, use what's already in rl_display_prompt.  WRAP_OFFSET is the
-+     number of non-visible characters in the prompt string. */
-+  if (rl_display_prompt == rl_prompt || local_prompt)
-+    {
-+      if (local_prompt_prefix && forced_display)
-+	_rl_output_some_chars (local_prompt_prefix, strlen (local_prompt_prefix));
-+
-+      if (local_prompt_len > 0)
-+	{
-+	  temp = local_prompt_len + out + 2;
-+	  if (temp >= line_size)
-+	    {
-+	      line_size = (temp + 1024) - (temp % 1024);
-+	      visible_line = (char *)xrealloc (visible_line, line_size);
-+	      line = invisible_line = (char *)xrealloc (invisible_line, line_size);
-+	    }
-+	  strncpy (line + out, local_prompt, local_prompt_len);
-+	  out += local_prompt_len;
-+	}
-+      line[out] = '\0';
-+      wrap_offset = local_prompt_len - prompt_visible_length;
-+    }
-+  else
-+    {
-+      int pmtlen;
-+      prompt_this_line = strrchr (rl_display_prompt, '\n');
-+      if (!prompt_this_line)
-+	prompt_this_line = rl_display_prompt;
-+      else
-+	{
-+	  prompt_this_line++;
-+	  pmtlen = prompt_this_line - rl_display_prompt;	/* temp var */
-+	  if (forced_display)
-+	    {
-+	      _rl_output_some_chars (rl_display_prompt, pmtlen);
-+	      /* Make sure we are at column zero even after a newline,
-+		 regardless of the state of terminal output processing. */
-+	      if (pmtlen < 2 || prompt_this_line[-2] != '\r')
-+		cr ();
-+	    }
-+	}
-+
-+      prompt_physical_chars = pmtlen = strlen (prompt_this_line);
-+      temp = pmtlen + out + 2;
-+      if (temp >= line_size)
-+	{
-+	  line_size = (temp + 1024) - (temp % 1024);
-+	  visible_line = (char *)xrealloc (visible_line, line_size);
-+	  line = invisible_line = (char *)xrealloc (invisible_line, line_size);
-+	}
-+      strncpy (line + out,  prompt_this_line, pmtlen);
-+      out += pmtlen;
-+      line[out] = '\0';
-+      wrap_offset = prompt_invis_chars_first_line = 0;
-+    }
-+
-+#if defined (HANDLE_MULTIBYTE)
-+#define CHECK_INV_LBREAKS() \
-+      do { \
-+	if (newlines >= (inv_lbsize - 2)) \
-+	  { \
-+	    inv_lbsize *= 2; \
-+	    inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \
-+	    _rl_wrapped_line = (int *)xrealloc (_rl_wrapped_line, inv_lbsize * sizeof (int)); \
-+	  } \
-+      } while (0)
-+#else
-+#define CHECK_INV_LBREAKS() \
-+      do { \
-+	if (newlines >= (inv_lbsize - 2)) \
-+	  { \
-+	    inv_lbsize *= 2; \
-+	    inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \
-+	  } \
-+      } while (0)
-+#endif /* HANDLE_MULTIBYTE */
-+
-+#if defined (HANDLE_MULTIBYTE)	  
-+#define CHECK_LPOS() \
-+      do { \
-+	lpos++; \
-+	if (lpos >= _rl_screenwidth) \
-+	  { \
-+	    if (newlines >= (inv_lbsize - 2)) \
-+	      { \
-+		inv_lbsize *= 2; \
-+		inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \
-+		_rl_wrapped_line = (int *)xrealloc (_rl_wrapped_line, inv_lbsize * sizeof (int)); \
-+	      } \
-+	    inv_lbreaks[++newlines] = out; \
-+	    _rl_wrapped_line[newlines] = _rl_wrapped_multicolumn; \
-+	    lpos = 0; \
-+	  } \
-+      } while (0)
-+#else
-+#define CHECK_LPOS() \
-+      do { \
-+	lpos++; \
-+	if (lpos >= _rl_screenwidth) \
-+	  { \
-+	    if (newlines >= (inv_lbsize - 2)) \
-+	      { \
-+		inv_lbsize *= 2; \
-+		inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \
-+	      } \
-+	    inv_lbreaks[++newlines] = out; \
-+	    lpos = 0; \
-+	  } \
-+      } while (0)
-+#endif
-+
-+  /* inv_lbreaks[i] is where line i starts in the buffer. */
-+  inv_lbreaks[newlines = 0] = 0;
-+#if 0
-+  lpos = out - wrap_offset;
-+#else
-+  lpos = prompt_physical_chars + modmark;
-+#endif
-+
-+#if defined (HANDLE_MULTIBYTE)
-+  memset (_rl_wrapped_line, 0, vis_lbsize);
-+  num = 0;
-+#endif
-+
-+  /* prompt_invis_chars_first_line is the number of invisible characters in
-+     the first physical line of the prompt.
-+     wrap_offset - prompt_invis_chars_first_line is the number of invis
-+     chars on the second line. */
-+
-+  /* what if lpos is already >= _rl_screenwidth before we start drawing the
-+     contents of the command line? */
-+  while (lpos >= _rl_screenwidth)
-+    {
-+      int z;
-+      /* fix from Darin Johnson <darin@acuson.com> for prompt string with
-+         invisible characters that is longer than the screen width.  The
-+         prompt_invis_chars_first_line variable could be made into an array
-+         saying how many invisible characters there are per line, but that's
-+         probably too much work for the benefit gained.  How many people have
-+         prompts that exceed two physical lines?
-+         Additional logic fix from Edward Catmur <ed@catmur.co.uk> */
-+#if defined (HANDLE_MULTIBYTE)
-+      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+	{
-+	  n0 = num;
-+          temp = local_prompt_len;
-+          while (num < temp)
-+	    {
-+	      z = _rl_col_width  (local_prompt, n0, num);
-+	      if (z > _rl_screenwidth)
-+		{
-+	          num = _rl_find_prev_mbchar (local_prompt, num, MB_FIND_ANY);
-+	          break;
-+		}
-+	      else if (z == _rl_screenwidth)
-+	        break;
-+	      num++;
-+	    }
-+          temp = num;
-+	}
-+      else
-+#endif /* !HANDLE_MULTIBYTE */
-+	temp = ((newlines + 1) * _rl_screenwidth);
-+
-+      /* Now account for invisible characters in the current line. */
-+      temp += ((local_prompt_prefix == 0) ? ((newlines == 0) ? prompt_invis_chars_first_line
-+							     : ((newlines == 1) ? wrap_offset : 0))
-+					  : ((newlines == 0) ? wrap_offset :0));
-+             
-+      inv_lbreaks[++newlines] = temp;
-+#if defined (HANDLE_MULTIBYTE)
-+      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+	lpos -= _rl_col_width (local_prompt, n0, num);
-+      else
-+#endif
-+	lpos -= _rl_screenwidth;
-+    }
-+
-+  prompt_last_screen_line = newlines;
-+
-+  /* Draw the rest of the line (after the prompt) into invisible_line, keeping
-+     track of where the cursor is (cpos_buffer_position), the number of the line containing
-+     the cursor (lb_linenum), the last line number (lb_botlin and inv_botlin).
-+     It maintains an array of line breaks for display (inv_lbreaks).
-+     This handles expanding tabs for display and displaying meta characters. */
-+  lb_linenum = 0;
-+#if defined (HANDLE_MULTIBYTE)
-+  in = 0;
-+  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+    {
-+      memset (&ps, 0, sizeof (mbstate_t));
-+      wc_bytes = mbrtowc (&wc, rl_line_buffer, rl_end, &ps);
-+    }
-+  else
-+    wc_bytes = 1;
-+  while (in < rl_end)
-+#else
-+  for (in = 0; in < rl_end; in++)
-+#endif
-+    {
-+      c = (unsigned char)rl_line_buffer[in];
-+
-+#if defined (HANDLE_MULTIBYTE)
-+      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+	{
-+	  if (MB_INVALIDCH (wc_bytes))
-+	    {
-+	      /* Byte sequence is invalid or shortened.  Assume that the
-+	         first byte represents a character. */
-+	      wc_bytes = 1;
-+	      /* Assume that a character occupies a single column. */
-+	      wc_width = 1;
-+	      memset (&ps, 0, sizeof (mbstate_t));
-+	    }
-+	  else if (MB_NULLWCH (wc_bytes))
-+	    break;			/* Found '\0' */
-+	  else
-+	    {
-+	      temp = wcwidth (wc);
-+	      wc_width = (temp >= 0) ? temp : 1;
-+	    }
-+	}
-+#endif
-+
-+      if (out + 8 >= line_size)		/* XXX - 8 for \t */
-+	{
-+	  line_size *= 2;
-+	  visible_line = (char *)xrealloc (visible_line, line_size);
-+	  invisible_line = (char *)xrealloc (invisible_line, line_size);
-+	  line = invisible_line;
-+	}
-+
-+      if (in == rl_point)
-+	{
-+	  cpos_buffer_position = out;
-+	  lb_linenum = newlines;
-+	}
-+
-+#if defined (HANDLE_MULTIBYTE)
-+      if (META_CHAR (c) && _rl_output_meta_chars == 0)	/* XXX - clean up */
-+#else
-+      if (META_CHAR (c))
-+#endif
-+	{
-+	  if (_rl_output_meta_chars == 0)
-+	    {
-+	      sprintf (line + out, "\\%o", c);
-+
-+	      if (lpos + 4 >= _rl_screenwidth)
-+		{
-+		  temp = _rl_screenwidth - lpos;
-+		  CHECK_INV_LBREAKS ();
-+		  inv_lbreaks[++newlines] = out + temp;
-+		  lpos = 4 - temp;
-+		}
-+	      else
-+		lpos += 4;
-+
-+	      out += 4;
-+	    }
-+	  else
-+	    {
-+	      line[out++] = c;
-+	      CHECK_LPOS();
-+	    }
-+	}
-+#if defined (DISPLAY_TABS)
-+      else if (c == '\t')
-+	{
-+	  register int newout;
-+
-+#if 0
-+	  newout = (out | (int)7) + 1;
-+#else
-+	  newout = out + 8 - lpos % 8;
-+#endif
-+	  temp = newout - out;
-+	  if (lpos + temp >= _rl_screenwidth)
-+	    {
-+	      register int temp2;
-+	      temp2 = _rl_screenwidth - lpos;
-+	      CHECK_INV_LBREAKS ();
-+	      inv_lbreaks[++newlines] = out + temp2;
-+	      lpos = temp - temp2;
-+	      while (out < newout)
-+		line[out++] = ' ';
-+	    }
-+	  else
-+	    {
-+	      while (out < newout)
-+		line[out++] = ' ';
-+	      lpos += temp;
-+	    }
-+	}
-+#endif
-+      else if (c == '\n' && _rl_horizontal_scroll_mode == 0 && _rl_term_up && *_rl_term_up)
-+	{
-+	  line[out++] = '\0';	/* XXX - sentinel */
-+	  CHECK_INV_LBREAKS ();
-+	  inv_lbreaks[++newlines] = out;
-+	  lpos = 0;
-+	}
-+      else if (CTRL_CHAR (c) || c == RUBOUT)
-+	{
-+	  line[out++] = '^';
-+	  CHECK_LPOS();
-+	  line[out++] = CTRL_CHAR (c) ? UNCTRL (c) : '?';
-+	  CHECK_LPOS();
-+	}
-+      else
-+	{
-+#if defined (HANDLE_MULTIBYTE)
-+	  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+	    {
-+	      register int i;
-+
-+	      _rl_wrapped_multicolumn = 0;
-+
-+	      if (_rl_screenwidth < lpos + wc_width)
-+		for (i = lpos; i < _rl_screenwidth; i++)
-+		  {
-+		    /* The space will be removed in update_line() */
-+		    line[out++] = ' ';
-+		    _rl_wrapped_multicolumn++;
-+		    CHECK_LPOS();
-+		  }
-+	      if (in == rl_point)
-+		{
-+		  cpos_buffer_position = out;
-+		  lb_linenum = newlines;
-+		}
-+	      for (i = in; i < in+wc_bytes; i++)
-+		line[out++] = rl_line_buffer[i];
-+	      for (i = 0; i < wc_width; i++)
-+		CHECK_LPOS();
-+	    }
-+	  else
-+	    {
-+	      line[out++] = c;
-+	      CHECK_LPOS();
-+	    }
-+#else
-+	  line[out++] = c;
-+	  CHECK_LPOS();
-+#endif
-+	}
-+
-+#if defined (HANDLE_MULTIBYTE)
-+      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+	{
-+	  in += wc_bytes;
-+	  wc_bytes = mbrtowc (&wc, rl_line_buffer + in, rl_end - in, &ps);
-+	}
-+      else
-+        in++;
-+#endif
-+
-+    }
-+  line[out] = '\0';
-+  if (cpos_buffer_position < 0)
-+    {
-+      cpos_buffer_position = out;
-+      lb_linenum = newlines;
-+    }
-+
-+  inv_botlin = lb_botlin = newlines;
-+  CHECK_INV_LBREAKS ();
-+  inv_lbreaks[newlines+1] = out;
-+  cursor_linenum = lb_linenum;
-+
-+  /* CPOS_BUFFER_POSITION == position in buffer where cursor should be placed.
-+     CURSOR_LINENUM == line number where the cursor should be placed. */
-+
-+  /* PWP: now is when things get a bit hairy.  The visible and invisible
-+     line buffers are really multiple lines, which would wrap every
-+     (screenwidth - 1) characters.  Go through each in turn, finding
-+     the changed region and updating it.  The line order is top to bottom. */
-+
-+  /* If we can move the cursor up and down, then use multiple lines,
-+     otherwise, let long lines display in a single terminal line, and
-+     horizontally scroll it. */
-+
-+  if (_rl_horizontal_scroll_mode == 0 && _rl_term_up && *_rl_term_up)
-+    {
-+      int nleft, pos, changed_screen_line, tx;
-+
-+      if (!rl_display_fixed || forced_display)
-+	{
-+	  forced_display = 0;
-+
-+	  /* If we have more than a screenful of material to display, then
-+	     only display a screenful.  We should display the last screen,
-+	     not the first.  */
-+	  if (out >= _rl_screenchars)
-+	    {
-+	      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+		out = _rl_find_prev_mbchar (line, _rl_screenchars, MB_FIND_ANY);
-+	      else
-+		out = _rl_screenchars - 1;
-+	    }
-+
-+	  /* The first line is at character position 0 in the buffer.  The
-+	     second and subsequent lines start at inv_lbreaks[N], offset by
-+	     OFFSET (which has already been calculated above).  */
-+
-+#define W_OFFSET(line, offset) ((line) == 0 ? offset : 0)
-+#define VIS_LLEN(l)	((l) > _rl_vis_botlin ? 0 : (vis_lbreaks[l+1] - vis_lbreaks[l]))
-+#define INV_LLEN(l)	(inv_lbreaks[l+1] - inv_lbreaks[l])
-+#define VIS_CHARS(line) (visible_line + vis_lbreaks[line])
-+#define VIS_LINE(line) ((line) > _rl_vis_botlin) ? "" : VIS_CHARS(line)
-+#define INV_LINE(line) (invisible_line + inv_lbreaks[line])
-+
-+	  /* For each line in the buffer, do the updating display. */
-+	  for (linenum = 0; linenum <= inv_botlin; linenum++)
-+	    {
-+	      /* This can lead us astray if we execute a program that changes
-+		 the locale from a non-multibyte to a multibyte one. */
-+	      o_cpos = _rl_last_c_pos;
-+	      cpos_adjusted = 0;
-+	      update_line (VIS_LINE(linenum), INV_LINE(linenum), linenum,
-+			   VIS_LLEN(linenum), INV_LLEN(linenum), inv_botlin);
-+
-+	      /* update_line potentially changes _rl_last_c_pos, but doesn't
-+		 take invisible characters into account, since _rl_last_c_pos
-+		 is an absolute cursor position in a multibyte locale.  See
-+		 if compensating here is the right thing, or if we have to
-+		 change update_line itself.  There is one case in which
-+		 update_line adjusts _rl_last_c_pos itself (so it can pass
-+		 _rl_move_cursor_relative accurate values); it communicates
-+		 this back by setting cpos_adjusted.  If we assume that
-+		 _rl_last_c_pos is correct (an absolute cursor position) each
-+		 time update_line is called, then we can assume in our
-+		 calculations that o_cpos does not need to be adjusted by
-+		 wrap_offset. */
-+	      if (linenum == 0 && (MB_CUR_MAX > 1 && rl_byte_oriented == 0) &&
-+		  cpos_adjusted == 0 &&
-+		  _rl_last_c_pos != o_cpos &&
-+		  _rl_last_c_pos > wrap_offset &&
-+		  o_cpos < prompt_last_invisible)
-+		_rl_last_c_pos -= wrap_offset;
-+		  
-+	      /* If this is the line with the prompt, we might need to
-+		 compensate for invisible characters in the new line. Do
-+		 this only if there is not more than one new line (which
-+		 implies that we completely overwrite the old visible line)
-+		 and the new line is shorter than the old.  Make sure we are
-+		 at the end of the new line before clearing. */
-+	      if (linenum == 0 &&
-+		  inv_botlin == 0 && _rl_last_c_pos == out &&
-+		  (wrap_offset > visible_wrap_offset) &&
-+		  (_rl_last_c_pos < visible_first_line_len))
-+		{
-+		  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+		    nleft = _rl_screenwidth - _rl_last_c_pos;
-+		  else
-+		    nleft = _rl_screenwidth + wrap_offset - _rl_last_c_pos;
-+		  if (nleft)
-+		    _rl_clear_to_eol (nleft);
-+		}
-+
-+	      /* Since the new first line is now visible, save its length. */
-+	      if (linenum == 0)
-+		visible_first_line_len = (inv_botlin > 0) ? inv_lbreaks[1] : out - wrap_offset;
-+	    }
-+
-+	  /* We may have deleted some lines.  If so, clear the left over
-+	     blank ones at the bottom out. */
-+	  if (_rl_vis_botlin > inv_botlin)
-+	    {
-+	      char *tt;
-+	      for (; linenum <= _rl_vis_botlin; linenum++)
-+		{
-+		  tt = VIS_CHARS (linenum);
-+		  _rl_move_vert (linenum);
-+		  _rl_move_cursor_relative (0, tt);
-+		  _rl_clear_to_eol
-+		    ((linenum == _rl_vis_botlin) ? strlen (tt) : _rl_screenwidth);
-+		}
-+	    }
-+	  _rl_vis_botlin = inv_botlin;
-+
-+	  /* CHANGED_SCREEN_LINE is set to 1 if we have moved to a
-+	     different screen line during this redisplay. */
-+	  changed_screen_line = _rl_last_v_pos != cursor_linenum;
-+	  if (changed_screen_line)
-+	    {
-+	      _rl_move_vert (cursor_linenum);
-+	      /* If we moved up to the line with the prompt using _rl_term_up,
-+		 the physical cursor position on the screen stays the same,
-+		 but the buffer position needs to be adjusted to account
-+		 for invisible characters. */
-+	      if ((MB_CUR_MAX == 1 || rl_byte_oriented) && cursor_linenum == 0 && wrap_offset)
-+		_rl_last_c_pos += wrap_offset;
-+	    }
-+
-+	  /* We have to reprint the prompt if it contains invisible
-+	     characters, since it's not generally OK to just reprint
-+	     the characters from the current cursor position.  But we
-+	     only need to reprint it if the cursor is before the last
-+	     invisible character in the prompt string. */
-+	  nleft = prompt_visible_length + wrap_offset;
-+	  if (cursor_linenum == 0 && wrap_offset > 0 && _rl_last_c_pos > 0 &&
-+#if 0
-+	      _rl_last_c_pos <= PROMPT_ENDING_INDEX && local_prompt)
-+#else
-+	      _rl_last_c_pos < PROMPT_ENDING_INDEX && local_prompt)
-+#endif
-+	    {
-+#if defined (__MSDOS__)
-+	      putc ('\r', rl_outstream);
-+#else
-+	      if (_rl_term_cr)
-+		tputs (_rl_term_cr, 1, _rl_output_character_function);
-+#endif
-+	      _rl_output_some_chars (local_prompt, nleft);
-+	      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+		_rl_last_c_pos = _rl_col_width (local_prompt, 0, nleft) - wrap_offset;
-+	      else
-+		_rl_last_c_pos = nleft;
-+	    }
-+
-+	  /* Where on that line?  And where does that line start
-+	     in the buffer? */
-+	  pos = inv_lbreaks[cursor_linenum];
-+	  /* nleft == number of characters in the line buffer between the
-+	     start of the line and the desired cursor position. */
-+	  nleft = cpos_buffer_position - pos;
-+
-+	  /* NLEFT is now a number of characters in a buffer.  When in a
-+	     multibyte locale, however, _rl_last_c_pos is an absolute cursor
-+	     position that doesn't take invisible characters in the prompt
-+	     into account.  We use a fudge factor to compensate. */
-+
-+	  /* Since _rl_backspace() doesn't know about invisible characters in the
-+	     prompt, and there's no good way to tell it, we compensate for
-+	     those characters here and call _rl_backspace() directly. */
-+	  if (wrap_offset && cursor_linenum == 0 && nleft < _rl_last_c_pos)
-+	    {
-+	      /* TX == new physical cursor position in multibyte locale. */
-+	      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+		tx = _rl_col_width (&visible_line[pos], 0, nleft) - visible_wrap_offset;
-+	      else
-+		tx = nleft;
-+	      if (tx >= 0 && _rl_last_c_pos > tx)
-+		{
-+	          _rl_backspace (_rl_last_c_pos - tx);	/* XXX */
-+	          _rl_last_c_pos = tx;
-+		}
-+	    }
-+
-+	  /* We need to note that in a multibyte locale we are dealing with
-+	     _rl_last_c_pos as an absolute cursor position, but moving to a
-+	     point specified by a buffer position (NLEFT) that doesn't take
-+	     invisible characters into account. */
-+	  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+	    _rl_move_cursor_relative (nleft, &invisible_line[pos]);
-+	  else if (nleft != _rl_last_c_pos)
-+	    _rl_move_cursor_relative (nleft, &invisible_line[pos]);
-+	}
-+    }
-+  else				/* Do horizontal scrolling. */
-+    {
-+#define M_OFFSET(margin, offset) ((margin) == 0 ? offset : 0)
-+      int lmargin, ndisp, nleft, phys_c_pos, t;
-+
-+      /* Always at top line. */
-+      _rl_last_v_pos = 0;
-+
-+      /* Compute where in the buffer the displayed line should start.  This
-+	 will be LMARGIN. */
-+
-+      /* The number of characters that will be displayed before the cursor. */
-+      ndisp = cpos_buffer_position - wrap_offset;
-+      nleft  = prompt_visible_length + wrap_offset;
-+      /* Where the new cursor position will be on the screen.  This can be
-+	 longer than SCREENWIDTH; if it is, lmargin will be adjusted. */
-+      phys_c_pos = cpos_buffer_position - (last_lmargin ? last_lmargin : wrap_offset);
-+      t = _rl_screenwidth / 3;
-+
-+      /* If the number of characters had already exceeded the screenwidth,
-+	 last_lmargin will be > 0. */
-+
-+      /* If the number of characters to be displayed is more than the screen
-+	 width, compute the starting offset so that the cursor is about
-+	 two-thirds of the way across the screen. */
-+      if (phys_c_pos > _rl_screenwidth - 2)
-+	{
-+	  lmargin = cpos_buffer_position - (2 * t);
-+	  if (lmargin < 0)
-+	    lmargin = 0;
-+	  /* If the left margin would be in the middle of a prompt with
-+	     invisible characters, don't display the prompt at all. */
-+	  if (wrap_offset && lmargin > 0 && lmargin < nleft)
-+	    lmargin = nleft;
-+	}
-+      else if (ndisp < _rl_screenwidth - 2)		/* XXX - was -1 */
-+	lmargin = 0;
-+      else if (phys_c_pos < 1)
-+	{
-+	  /* If we are moving back towards the beginning of the line and
-+	     the last margin is no longer correct, compute a new one. */
-+	  lmargin = ((cpos_buffer_position - 1) / t) * t;	/* XXX */
-+	  if (wrap_offset && lmargin > 0 && lmargin < nleft)
-+	    lmargin = nleft;
-+	}
-+      else
-+	lmargin = last_lmargin;
-+
-+      /* If the first character on the screen isn't the first character
-+	 in the display line, indicate this with a special character. */
-+      if (lmargin > 0)
-+	line[lmargin] = '<';
-+
-+      /* If SCREENWIDTH characters starting at LMARGIN do not encompass
-+	 the whole line, indicate that with a special character at the
-+	 right edge of the screen.  If LMARGIN is 0, we need to take the
-+	 wrap offset into account. */
-+      t = lmargin + M_OFFSET (lmargin, wrap_offset) + _rl_screenwidth;
-+      if (t < out)
-+	line[t - 1] = '>';
-+
-+      if (!rl_display_fixed || forced_display || lmargin != last_lmargin)
-+	{
-+	  forced_display = 0;
-+	  update_line (&visible_line[last_lmargin],
-+		       &invisible_line[lmargin],
-+		       0,
-+		       _rl_screenwidth + visible_wrap_offset,
-+		       _rl_screenwidth + (lmargin ? 0 : wrap_offset),
-+		       0);
-+
-+	  /* If the visible new line is shorter than the old, but the number
-+	     of invisible characters is greater, and we are at the end of
-+	     the new line, we need to clear to eol. */
-+	  t = _rl_last_c_pos - M_OFFSET (lmargin, wrap_offset);
-+	  if ((M_OFFSET (lmargin, wrap_offset) > visible_wrap_offset) &&
-+	      (_rl_last_c_pos == out) &&
-+	      t < visible_first_line_len)
-+	    {
-+	      nleft = _rl_screenwidth - t;
-+	      _rl_clear_to_eol (nleft);
-+	    }
-+	  visible_first_line_len = out - lmargin - M_OFFSET (lmargin, wrap_offset);
-+	  if (visible_first_line_len > _rl_screenwidth)
-+	    visible_first_line_len = _rl_screenwidth;
-+
-+	  _rl_move_cursor_relative (cpos_buffer_position - lmargin, &invisible_line[lmargin]);
-+	  last_lmargin = lmargin;
-+	}
-+    }
-+  fflush (rl_outstream);
-+
-+  /* Swap visible and non-visible lines. */
-+  {
-+    char *vtemp = visible_line;
-+    int *itemp = vis_lbreaks, ntemp = vis_lbsize;
-+
-+    visible_line = invisible_line;
-+    invisible_line = vtemp;
-+
-+    vis_lbreaks = inv_lbreaks;
-+    inv_lbreaks = itemp;
-+
-+    vis_lbsize = inv_lbsize;
-+    inv_lbsize = ntemp;
-+
-+    rl_display_fixed = 0;
-+    /* If we are displaying on a single line, and last_lmargin is > 0, we
-+       are not displaying any invisible characters, so set visible_wrap_offset
-+       to 0. */
-+    if (_rl_horizontal_scroll_mode && last_lmargin)
-+      visible_wrap_offset = 0;
-+    else
-+      visible_wrap_offset = wrap_offset;
-+  }
-+}
-+
-+/* PWP: update_line() is based on finding the middle difference of each
-+   line on the screen; vis:
-+
-+			     /old first difference
-+	/beginning of line   |	      /old last same       /old EOL
-+	v		     v	      v		    v
-+old:	eddie> Oh, my little gruntle-buggy is to me, as lurgid as
-+new:	eddie> Oh, my little buggy says to me, as lurgid as
-+	^		     ^	^			   ^
-+	\beginning of line   |	\new last same	   \new end of line
-+			     \new first difference
-+
-+   All are character pointers for the sake of speed.  Special cases for
-+   no differences, as well as for end of line additions must be handled.
-+
-+   Could be made even smarter, but this works well enough */
-+static void
-+update_line (old, new, current_line, omax, nmax, inv_botlin)
-+     register char *old, *new;
-+     int current_line, omax, nmax, inv_botlin;
-+{
-+  register char *ofd, *ols, *oe, *nfd, *nls, *ne;
-+  int temp, lendiff, wsatend, od, nd, o_cpos;
-+  int current_invis_chars;
-+  int col_lendiff, col_temp;
-+#if defined (HANDLE_MULTIBYTE)
-+  mbstate_t ps_new, ps_old;
-+  int new_offset, old_offset;
-+#endif
-+
-+  /* If we're at the right edge of a terminal that supports xn, we're
-+     ready to wrap around, so do so.  This fixes problems with knowing
-+     the exact cursor position and cut-and-paste with certain terminal
-+     emulators.  In this calculation, TEMP is the physical screen
-+     position of the cursor. */
-+  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+    temp = _rl_last_c_pos;
-+  else
-+    temp = _rl_last_c_pos - W_OFFSET(_rl_last_v_pos, visible_wrap_offset);
-+  if (temp == _rl_screenwidth && _rl_term_autowrap && !_rl_horizontal_scroll_mode
-+	&& _rl_last_v_pos == current_line - 1)
-+    {
-+#if defined (HANDLE_MULTIBYTE)
-+      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+	{
-+	  wchar_t wc;
-+	  mbstate_t ps;
-+	  int tempwidth, bytes;
-+	  size_t ret;
-+
-+	  /* This fixes only double-column characters, but if the wrapped
-+	     character comsumes more than three columns, spaces will be
-+	     inserted in the string buffer. */
-+	  if (_rl_wrapped_line[current_line] > 0)
-+	    _rl_clear_to_eol (_rl_wrapped_line[current_line]);
-+
-+	  memset (&ps, 0, sizeof (mbstate_t));
-+	  ret = mbrtowc (&wc, new, MB_CUR_MAX, &ps);
-+	  if (MB_INVALIDCH (ret))
-+	    {
-+	      tempwidth = 1;
-+	      ret = 1;
-+	    }
-+	  else if (MB_NULLWCH (ret))
-+	    tempwidth = 0;
-+	  else
-+	    tempwidth = wcwidth (wc);
-+
-+	  if (tempwidth > 0)
-+	    {
-+	      int count;
-+	      bytes = ret;
-+	      for (count = 0; count < bytes; count++)
-+		putc (new[count], rl_outstream);
-+	      _rl_last_c_pos = tempwidth;
-+	      _rl_last_v_pos++;
-+	      memset (&ps, 0, sizeof (mbstate_t));
-+	      ret = mbrtowc (&wc, old, MB_CUR_MAX, &ps);
-+	      if (ret != 0 && bytes != 0)
-+		{
-+		  if (MB_INVALIDCH (ret))
-+		    memmove (old+bytes, old+1, strlen (old+1));
-+		  else
-+		    memmove (old+bytes, old+ret, strlen (old+ret));
-+		  memcpy (old, new, bytes);
-+		}
-+	    }
-+	  else
-+	    {
-+	      putc (' ', rl_outstream);
-+	      _rl_last_c_pos = 1;
-+	      _rl_last_v_pos++;
-+	      if (old[0] && new[0])
-+		old[0] = new[0];
-+	    }
-+	}
-+      else
-+#endif
-+	{
-+	  if (new[0])
-+	    putc (new[0], rl_outstream);
-+	  else
-+	    putc (' ', rl_outstream);
-+	  _rl_last_c_pos = 1;
-+	  _rl_last_v_pos++;
-+	  if (old[0] && new[0])
-+	    old[0] = new[0];
-+	}
-+    }
-+
-+      
-+  /* Find first difference. */
-+#if defined (HANDLE_MULTIBYTE)
-+  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+    {
-+      /* See if the old line is a subset of the new line, so that the
-+	 only change is adding characters. */
-+      temp = (omax < nmax) ? omax : nmax;
-+      if (memcmp (old, new, temp) == 0)
-+	{
-+	  ofd = old + temp;
-+	  nfd = new + temp;
-+	}
-+      else
-+	{      
-+	  memset (&ps_new, 0, sizeof(mbstate_t));
-+	  memset (&ps_old, 0, sizeof(mbstate_t));
-+
-+	  if (omax == nmax && STREQN (new, old, omax))
-+	    {
-+	      ofd = old + omax;
-+	      nfd = new + nmax;
-+	    }
-+	  else
-+	    {
-+	      new_offset = old_offset = 0;
-+	      for (ofd = old, nfd = new;
-+		    (ofd - old < omax) && *ofd &&
-+		    _rl_compare_chars(old, old_offset, &ps_old, new, new_offset, &ps_new); )
-+		{
-+		  old_offset = _rl_find_next_mbchar (old, old_offset, 1, MB_FIND_ANY);
-+		  new_offset = _rl_find_next_mbchar (new, new_offset, 1, MB_FIND_ANY);
-+		  ofd = old + old_offset;
-+		  nfd = new + new_offset;
-+		}
-+	    }
-+	}
-+    }
-+  else
-+#endif
-+  for (ofd = old, nfd = new;
-+       (ofd - old < omax) && *ofd && (*ofd == *nfd);
-+       ofd++, nfd++)
-+    ;
-+
-+  /* Move to the end of the screen line.  ND and OD are used to keep track
-+     of the distance between ne and new and oe and old, respectively, to
-+     move a subtraction out of each loop. */
-+  for (od = ofd - old, oe = ofd; od < omax && *oe; oe++, od++);
-+  for (nd = nfd - new, ne = nfd; nd < nmax && *ne; ne++, nd++);
-+
-+  /* If no difference, continue to next line. */
-+  if (ofd == oe && nfd == ne)
-+    return;
-+
-+  wsatend = 1;			/* flag for trailing whitespace */
-+
-+#if defined (HANDLE_MULTIBYTE)
-+  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+    {
-+      ols = old + _rl_find_prev_mbchar (old, oe - old, MB_FIND_ANY);
-+      nls = new + _rl_find_prev_mbchar (new, ne - new, MB_FIND_ANY);
-+      while ((ols > ofd) && (nls > nfd))
-+	{
-+	  memset (&ps_old, 0, sizeof (mbstate_t));
-+	  memset (&ps_new, 0, sizeof (mbstate_t));
-+
-+#if 0
-+	  /* On advice from jir@yamato.ibm.com */
-+	  _rl_adjust_point (old, ols - old, &ps_old);
-+	  _rl_adjust_point (new, nls - new, &ps_new);
-+#endif
-+
-+	  if (_rl_compare_chars (old, ols - old, &ps_old, new, nls - new, &ps_new) == 0)
-+	    break;
-+
-+	  if (*ols == ' ')
-+	    wsatend = 0;
-+
-+	  ols = old + _rl_find_prev_mbchar (old, ols - old, MB_FIND_ANY);
-+	  nls = new + _rl_find_prev_mbchar (new, nls - new, MB_FIND_ANY);
-+	}
-+    }
-+  else
-+    {
-+#endif /* HANDLE_MULTIBYTE */
-+  ols = oe - 1;			/* find last same */
-+  nls = ne - 1;
-+  while ((ols > ofd) && (nls > nfd) && (*ols == *nls))
-+    {
-+      if (*ols != ' ')
-+	wsatend = 0;
-+      ols--;
-+      nls--;
-+    }
-+#if defined (HANDLE_MULTIBYTE)
-+    }
-+#endif
-+
-+  if (wsatend)
-+    {
-+      ols = oe;
-+      nls = ne;
-+    }
-+#if defined (HANDLE_MULTIBYTE)
-+  /* This may not work for stateful encoding, but who cares?  To handle
-+     stateful encoding properly, we have to scan each string from the
-+     beginning and compare. */
-+  else if (_rl_compare_chars (ols, 0, NULL, nls, 0, NULL) == 0)
-+#else
-+  else if (*ols != *nls)
-+#endif
-+    {
-+      if (*ols)			/* don't step past the NUL */
-+	{
-+	  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+	    ols = old + _rl_find_next_mbchar (old, ols - old, 1, MB_FIND_ANY);
-+	  else
-+	    ols++;
-+	}
-+      if (*nls)
-+	{
-+	  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+	    nls = new + _rl_find_next_mbchar (new, nls - new, 1, MB_FIND_ANY);
-+	  else
-+	    nls++;
-+	}
-+    }
-+
-+  /* count of invisible characters in the current invisible line. */
-+  current_invis_chars = W_OFFSET (current_line, wrap_offset);
-+  if (_rl_last_v_pos != current_line)
-+    {
-+      _rl_move_vert (current_line);
-+      if ((MB_CUR_MAX == 1 || rl_byte_oriented) && current_line == 0 && visible_wrap_offset)
-+	_rl_last_c_pos += visible_wrap_offset;
-+    }
-+
-+  /* If this is the first line and there are invisible characters in the
-+     prompt string, and the prompt string has not changed, and the current
-+     cursor position is before the last invisible character in the prompt,
-+     and the index of the character to move to is past the end of the prompt
-+     string, then redraw the entire prompt string.  We can only do this
-+     reliably if the terminal supports a `cr' capability.
-+
-+     This is not an efficiency hack -- there is a problem with redrawing
-+     portions of the prompt string if they contain terminal escape
-+     sequences (like drawing the `unbold' sequence without a corresponding
-+     `bold') that manifests itself on certain terminals. */
-+
-+  lendiff = local_prompt_len;
-+  od = ofd - old;	/* index of first difference in visible line */
-+  if (current_line == 0 && !_rl_horizontal_scroll_mode &&
-+      _rl_term_cr && lendiff > prompt_visible_length && _rl_last_c_pos > 0 &&
-+      od >= lendiff && _rl_last_c_pos < PROMPT_ENDING_INDEX)
-+    {
-+#if defined (__MSDOS__)
-+      putc ('\r', rl_outstream);
-+#else
-+      tputs (_rl_term_cr, 1, _rl_output_character_function);
-+#endif
-+      _rl_output_some_chars (local_prompt, lendiff);
-+      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+	{
-+	  /* We take wrap_offset into account here so we can pass correct
-+	     information to _rl_move_cursor_relative. */
-+	  _rl_last_c_pos = _rl_col_width (local_prompt, 0, lendiff) - wrap_offset;
-+	  cpos_adjusted = 1;
-+	}
-+      else
-+	_rl_last_c_pos = lendiff;
-+    }
-+
-+  o_cpos = _rl_last_c_pos;
-+
-+  /* When this function returns, _rl_last_c_pos is correct, and an absolute
-+     cursor postion in multibyte mode, but a buffer index when not in a
-+     multibyte locale. */
-+  _rl_move_cursor_relative (od, old);
-+#if 1
-+#if defined (HANDLE_MULTIBYTE)
-+  /* We need to indicate that the cursor position is correct in the presence of
-+     invisible characters in the prompt string.  Let's see if setting this when
-+     we make sure we're at the end of the drawn prompt string works. */
-+  if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 && 
-+      (_rl_last_c_pos > 0 || o_cpos > 0) &&
-+      _rl_last_c_pos == prompt_physical_chars)
-+    cpos_adjusted = 1;
-+#endif
-+#endif
-+
-+  /* if (len (new) > len (old))
-+     lendiff == difference in buffer
-+     col_lendiff == difference on screen
-+     When not using multibyte characters, these are equal */
-+  lendiff = (nls - nfd) - (ols - ofd);
-+  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+    col_lendiff = _rl_col_width (new, nfd - new, nls - new) - _rl_col_width (old, ofd - old, ols - old);
-+  else
-+    col_lendiff = lendiff;
-+
-+  /* If we are changing the number of invisible characters in a line, and
-+     the spot of first difference is before the end of the invisible chars,
-+     lendiff needs to be adjusted. */
-+  if (current_line == 0 && !_rl_horizontal_scroll_mode &&
-+      current_invis_chars != visible_wrap_offset)
-+    {
-+      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+	{
-+	  lendiff += visible_wrap_offset - current_invis_chars;
-+	  col_lendiff += visible_wrap_offset - current_invis_chars;
-+	}
-+      else
-+	{
-+	  lendiff += visible_wrap_offset - current_invis_chars;
-+	  col_lendiff = lendiff;
-+	}
-+    }
-+
-+  /* Insert (diff (len (old), len (new)) ch. */
-+  temp = ne - nfd;
-+  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+    col_temp = _rl_col_width (new, nfd - new, ne - new);
-+  else
-+    col_temp = temp;
-+
-+  if (col_lendiff > 0)	/* XXX - was lendiff */
-+    {
-+      /* Non-zero if we're increasing the number of lines. */
-+      int gl = current_line >= _rl_vis_botlin && inv_botlin > _rl_vis_botlin;
-+      /* If col_lendiff is > 0, implying that the new string takes up more
-+	 screen real estate than the old, but lendiff is < 0, meaning that it
-+	 takes fewer bytes, we need to just output the characters starting
-+	 from the first difference.  These will overwrite what is on the
-+	 display, so there's no reason to do a smart update.  This can really
-+	 only happen in a multibyte environment. */
-+      if (lendiff < 0)
-+	{
-+	  _rl_output_some_chars (nfd, temp);
-+	  _rl_last_c_pos += _rl_col_width (nfd, 0, temp);
-+	  /* If nfd begins before any invisible characters in the prompt,
-+	     adjust _rl_last_c_pos to account for wrap_offset and set
-+	     cpos_adjusted to let the caller know. */
-+	  if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible))
-+	    {
-+	      _rl_last_c_pos -= wrap_offset;
-+	      cpos_adjusted = 1;
-+	    }
-+	  return;
-+	}
-+      /* Sometimes it is cheaper to print the characters rather than
-+	 use the terminal's capabilities.  If we're growing the number
-+	 of lines, make sure we actually cause the new line to wrap
-+	 around on auto-wrapping terminals. */
-+      else if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl))
-+	{
-+	  /* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and
-+	     _rl_horizontal_scroll_mode == 1, inserting the characters with
-+	     _rl_term_IC or _rl_term_ic will screw up the screen because of the
-+	     invisible characters.  We need to just draw them. */
-+	  if (*ols && (!_rl_horizontal_scroll_mode || _rl_last_c_pos > 0 ||
-+			lendiff <= prompt_visible_length || !current_invis_chars))
-+	    {
-+	      insert_some_chars (nfd, lendiff, col_lendiff);
-+	      _rl_last_c_pos += col_lendiff;
-+	    }
-+	  else if ((MB_CUR_MAX == 1 || rl_byte_oriented != 0) && *ols == 0 && lendiff > 0)
-+	    {
-+	      /* At the end of a line the characters do not have to
-+		 be "inserted".  They can just be placed on the screen. */
-+	      /* However, this screws up the rest of this block, which
-+		 assumes you've done the insert because you can. */
-+	      _rl_output_some_chars (nfd, lendiff);
-+	      _rl_last_c_pos += col_lendiff;
-+	    }
-+	  else
-+	    {
-+	      /* We have horizontal scrolling and we are not inserting at
-+		 the end.  We have invisible characters in this line.  This
-+		 is a dumb update. */
-+	      _rl_output_some_chars (nfd, temp);
-+	      _rl_last_c_pos += col_temp;
-+	      return;
-+	    }
-+	  /* Copy (new) chars to screen from first diff to last match. */
-+	  temp = nls - nfd;
-+	  if ((temp - lendiff) > 0)
-+	    {
-+	      _rl_output_some_chars (nfd + lendiff, temp - lendiff);
-+#if 1
-+	     /* XXX -- this bears closer inspection.  Fixes a redisplay bug
-+		reported against bash-3.0-alpha by Andreas Schwab involving
-+		multibyte characters and prompt strings with invisible
-+		characters, but was previously disabled. */
-+	      _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-col_lendiff);
-+#else
-+	      _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-lendiff);
-+#endif
-+	    }
-+	}
-+      else
-+	{
-+	  /* cannot insert chars, write to EOL */
-+	  _rl_output_some_chars (nfd, temp);
-+	  _rl_last_c_pos += col_temp;
-+	  /* If we're in a multibyte locale and were before the last invisible
-+	     char in the current line (which implies we just output some invisible
-+	     characters) we need to adjust _rl_last_c_pos, since it represents
-+	     a physical character position. */
-+	}
-+    }
-+  else				/* Delete characters from line. */
-+    {
-+      /* If possible and inexpensive to use terminal deletion, then do so. */
-+      if (_rl_term_dc && (2 * col_temp) >= -col_lendiff)
-+	{
-+	  /* If all we're doing is erasing the invisible characters in the
-+	     prompt string, don't bother.  It screws up the assumptions
-+	     about what's on the screen. */
-+	  if (_rl_horizontal_scroll_mode && _rl_last_c_pos == 0 &&
-+	      -lendiff == visible_wrap_offset)
-+	    col_lendiff = 0;
-+
-+	  if (col_lendiff)
-+	    delete_chars (-col_lendiff); /* delete (diff) characters */
-+
-+	  /* Copy (new) chars to screen from first diff to last match */
-+	  temp = nls - nfd;
-+	  if (temp > 0)
-+	    {
-+	      /* If nfd begins at the prompt, or before the invisible
-+		 characters in the prompt, we need to adjust _rl_last_c_pos
-+		 in a multibyte locale to account for the wrap offset and
-+		 set cpos_adjusted accordingly. */
-+	      _rl_output_some_chars (nfd, temp);
-+	      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+		{
-+                  _rl_last_c_pos += _rl_col_width (nfd, 0, temp);
-+                  if (current_line == 0 && wrap_offset &&  ((nfd - new) <= prompt_last_invisible))
-+		    {
-+		      _rl_last_c_pos -= wrap_offset;
-+		      cpos_adjusted = 1;
-+		    }
-+		}
-+              else
-+                _rl_last_c_pos += temp;
-+	    }
-+	}
-+      /* Otherwise, print over the existing material. */
-+      else
-+	{
-+	  if (temp > 0)
-+	    {
-+	      /* If nfd begins at the prompt, or before the invisible
-+		 characters in the prompt, we need to adjust _rl_last_c_pos
-+		 in a multibyte locale to account for the wrap offset and
-+		 set cpos_adjusted accordingly. */
-+	      _rl_output_some_chars (nfd, temp);
-+	      _rl_last_c_pos += col_temp;		/* XXX */
-+	      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+		{
-+		  if (current_line == 0 && wrap_offset &&  ((nfd - new) <= prompt_last_invisible))
-+		    {
-+		      _rl_last_c_pos -= wrap_offset;
-+		      cpos_adjusted = 1;
-+		    }
-+		}
-+	    }
-+	  lendiff = (oe - old) - (ne - new);
-+	  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+	    col_lendiff = _rl_col_width (old, 0, oe - old) - _rl_col_width (new, 0, ne - new);
-+	  else
-+	    col_lendiff = lendiff;
-+
-+	  if (col_lendiff)
-+	    {	  
-+	      if (_rl_term_autowrap && current_line < inv_botlin)
-+		space_to_eol (col_lendiff);
-+	      else
-+		_rl_clear_to_eol (col_lendiff);
-+	    }
-+	}
-+    }
-+}
-+
-+/* Tell the update routines that we have moved onto a new (empty) line. */
-+int
-+rl_on_new_line ()
-+{
-+  if (visible_line)
-+    visible_line[0] = '\0';
-+
-+  _rl_last_c_pos = _rl_last_v_pos = 0;
-+  _rl_vis_botlin = last_lmargin = 0;
-+  if (vis_lbreaks)
-+    vis_lbreaks[0] = vis_lbreaks[1] = 0;
-+  visible_wrap_offset = 0;
-+  return 0;
-+}
-+
-+/* Tell the update routines that we have moved onto a new line with the
-+   prompt already displayed.  Code originally from the version of readline
-+   distributed with CLISP.  rl_expand_prompt must have already been called
-+   (explicitly or implicitly).  This still doesn't work exactly right. */
-+int
-+rl_on_new_line_with_prompt ()
-+{
-+  int prompt_size, i, l, real_screenwidth, newlines;
-+  char *prompt_last_line, *lprompt;
-+
-+  /* Initialize visible_line and invisible_line to ensure that they can hold
-+     the already-displayed prompt. */
-+  prompt_size = strlen (rl_prompt) + 1;
-+  init_line_structures (prompt_size);
-+
-+  /* Make sure the line structures hold the already-displayed prompt for
-+     redisplay. */
-+  lprompt = local_prompt ? local_prompt : rl_prompt;
-+  strcpy (visible_line, lprompt);
-+  strcpy (invisible_line, lprompt);
-+
-+  /* If the prompt contains newlines, take the last tail. */
-+  prompt_last_line = strrchr (rl_prompt, '\n');
-+  if (!prompt_last_line)
-+    prompt_last_line = rl_prompt;
-+
-+  l = strlen (prompt_last_line);
-+  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+    _rl_last_c_pos = _rl_col_width (prompt_last_line, 0, l);	/* XXX */
-+  else
-+    _rl_last_c_pos = l;
-+
-+  /* Dissect prompt_last_line into screen lines. Note that here we have
-+     to use the real screenwidth. Readline's notion of screenwidth might be
-+     one less, see terminal.c. */
-+  real_screenwidth = _rl_screenwidth + (_rl_term_autowrap ? 0 : 1);
-+  _rl_last_v_pos = l / real_screenwidth;
-+  /* If the prompt length is a multiple of real_screenwidth, we don't know
-+     whether the cursor is at the end of the last line, or already at the
-+     beginning of the next line. Output a newline just to be safe. */
-+  if (l > 0 && (l % real_screenwidth) == 0)
-+    _rl_output_some_chars ("\n", 1);
-+  last_lmargin = 0;
-+
-+  newlines = 0; i = 0;
-+  while (i <= l)
-+    {
-+      _rl_vis_botlin = newlines;
-+      vis_lbreaks[newlines++] = i;
-+      i += real_screenwidth;
-+    }
-+  vis_lbreaks[newlines] = l;
-+  visible_wrap_offset = 0;
-+
-+  rl_display_prompt = rl_prompt;	/* XXX - make sure it's set */
-+
-+  return 0;
-+}
-+
-+/* Actually update the display, period. */
-+int
-+rl_forced_update_display ()
-+{
-+  register char *temp;
-+
-+  if (visible_line)
-+    {
-+      temp = visible_line;
-+      while (*temp)
-+	*temp++ = '\0';
-+    }
-+  rl_on_new_line ();
-+  forced_display++;
-+  (*rl_redisplay_function) ();
-+  return 0;
-+}
-+
-+/* Move the cursor from _rl_last_c_pos to NEW, which are buffer indices.
-+   (Well, when we don't have multibyte characters, _rl_last_c_pos is a
-+   buffer index.)
-+   DATA is the contents of the screen line of interest; i.e., where
-+   the movement is being done. */
-+void
-+_rl_move_cursor_relative (new, data)
-+     int new;
-+     const char *data;
-+{
-+  register int i;
-+  int woff;			/* number of invisible chars on current line */
-+  int cpos, dpos;		/* current and desired cursor positions */
-+
-+  woff = W_OFFSET (_rl_last_v_pos, wrap_offset);
-+  cpos = _rl_last_c_pos;
-+#if defined (HANDLE_MULTIBYTE)
-+  /* If we have multibyte characters, NEW is indexed by the buffer point in
-+     a multibyte string, but _rl_last_c_pos is the display position.  In
-+     this case, NEW's display position is not obvious and must be
-+     calculated.  We need to account for invisible characters in this line,
-+     as long as we are past them and they are counted by _rl_col_width. */
-+  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+    {
-+      dpos = _rl_col_width (data, 0, new);
-+      /* Use NEW when comparing against the last invisible character in the
-+	 prompt string, since they're both buffer indices and DPOS is a
-+	 desired display position. */
-+      if (new > prompt_last_invisible)		/* XXX - don't use woff here */
-+	{
-+	  dpos -= woff;
-+	  /* Since this will be assigned to _rl_last_c_pos at the end (more
-+	     precisely, _rl_last_c_pos == dpos when this function returns),
-+	     let the caller know. */
-+	  cpos_adjusted = 1;
-+	}
-+    }
-+  else
-+#endif
-+    dpos = new;
-+
-+  /* If we don't have to do anything, then return. */
-+  if (cpos == dpos)
-+    return;
-+
-+  /* It may be faster to output a CR, and then move forwards instead
-+     of moving backwards. */
-+  /* i == current physical cursor position. */
-+#if defined (HANDLE_MULTIBYTE)
-+  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+    i = _rl_last_c_pos;
-+  else
-+#endif
-+  i = _rl_last_c_pos - woff;
-+  if (dpos == 0 || CR_FASTER (dpos, _rl_last_c_pos) ||
-+      (_rl_term_autowrap && i == _rl_screenwidth))
-+    {
-+#if defined (__MSDOS__)
-+      putc ('\r', rl_outstream);
-+#else
-+      tputs (_rl_term_cr, 1, _rl_output_character_function);
-+#endif /* !__MSDOS__ */
-+      cpos = _rl_last_c_pos = 0;
-+    }
-+
-+  if (cpos < dpos)
-+    {
-+      /* Move the cursor forward.  We do it by printing the command
-+	 to move the cursor forward if there is one, else print that
-+	 portion of the output buffer again.  Which is cheaper? */
-+
-+      /* The above comment is left here for posterity.  It is faster
-+	 to print one character (non-control) than to print a control
-+	 sequence telling the terminal to move forward one character.
-+	 That kind of control is for people who don't know what the
-+	 data is underneath the cursor. */
-+
-+      /* However, we need a handle on where the current display position is
-+	 in the buffer for the immediately preceding comment to be true.
-+	 In multibyte locales, we don't currently have that info available.
-+	 Without it, we don't know where the data we have to display begins
-+	 in the buffer and we have to go back to the beginning of the screen
-+	 line.  In this case, we can use the terminal sequence to move forward
-+	 if it's available. */
-+      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+	{
-+	  if (_rl_term_forward_char)
-+	    {
-+	      for (i = cpos; i < dpos; i++)
-+	        tputs (_rl_term_forward_char, 1, _rl_output_character_function);
-+	    }
-+	  else
-+	    {
-+	      tputs (_rl_term_cr, 1, _rl_output_character_function);
-+	      for (i = 0; i < new; i++)
-+		putc (data[i], rl_outstream);
-+	    }
-+	}
-+      else
-+	for (i = cpos; i < new; i++)
-+	  putc (data[i], rl_outstream);
-+    }
-+
-+#if defined (HANDLE_MULTIBYTE)
-+  /* NEW points to the buffer point, but _rl_last_c_pos is the display point.
-+     The byte length of the string is probably bigger than the column width
-+     of the string, which means that if NEW == _rl_last_c_pos, then NEW's
-+     display point is less than _rl_last_c_pos. */
-+#endif
-+  else if (cpos > dpos)
-+    _rl_backspace (cpos - dpos);
-+
-+  _rl_last_c_pos = dpos;
-+}
-+
-+/* PWP: move the cursor up or down. */
-+void
-+_rl_move_vert (to)
-+     int to;
-+{
-+  register int delta, i;
-+
-+  if (_rl_last_v_pos == to || to > _rl_screenheight)
-+    return;
-+
-+  if ((delta = to - _rl_last_v_pos) > 0)
-+    {
-+      for (i = 0; i < delta; i++)
-+	putc ('\n', rl_outstream);
-+#if defined (__MSDOS__)
-+      putc ('\r', rl_outstream);
-+#else
-+      tputs (_rl_term_cr, 1, _rl_output_character_function);
-+#endif
-+      _rl_last_c_pos = 0;
-+    }
-+  else
-+    {			/* delta < 0 */
-+      if (_rl_term_up && *_rl_term_up)
-+	for (i = 0; i < -delta; i++)
-+	  tputs (_rl_term_up, 1, _rl_output_character_function);
-+    }
-+
-+  _rl_last_v_pos = to;		/* Now TO is here */
-+}
-+
-+/* Physically print C on rl_outstream.  This is for functions which know
-+   how to optimize the display.  Return the number of characters output. */
-+int
-+rl_show_char (c)
-+     int c;
-+{
-+  int n = 1;
-+  if (META_CHAR (c) && (_rl_output_meta_chars == 0))
-+    {
-+      fprintf (rl_outstream, "M-");
-+      n += 2;
-+      c = UNMETA (c);
-+    }
-+
-+#if defined (DISPLAY_TABS)
-+  if ((CTRL_CHAR (c) && c != '\t') || c == RUBOUT)
-+#else
-+  if (CTRL_CHAR (c) || c == RUBOUT)
-+#endif /* !DISPLAY_TABS */
-+    {
-+      fprintf (rl_outstream, "C-");
-+      n += 2;
-+      c = CTRL_CHAR (c) ? UNCTRL (c) : '?';
-+    }
-+
-+  putc (c, rl_outstream);
-+  fflush (rl_outstream);
-+  return n;
-+}
-+
-+int
-+rl_character_len (c, pos)
-+     register int c, pos;
-+{
-+  unsigned char uc;
-+
-+  uc = (unsigned char)c;
-+
-+  if (META_CHAR (uc))
-+    return ((_rl_output_meta_chars == 0) ? 4 : 1);
-+
-+  if (uc == '\t')
-+    {
-+#if defined (DISPLAY_TABS)
-+      return (((pos | 7) + 1) - pos);
-+#else
-+      return (2);
-+#endif /* !DISPLAY_TABS */
-+    }
-+
-+  if (CTRL_CHAR (c) || c == RUBOUT)
-+    return (2);
-+
-+  return ((ISPRINT (uc)) ? 1 : 2);
-+}
-+/* How to print things in the "echo-area".  The prompt is treated as a
-+   mini-modeline. */
-+static int msg_saved_prompt = 0;
-+
-+#if defined (USE_VARARGS)
-+int
-+#if defined (PREFER_STDARG)
-+rl_message (const char *format, ...)
-+#else
-+rl_message (va_alist)
-+     va_dcl
-+#endif
-+{
-+  va_list args;
-+#if defined (PREFER_VARARGS)
-+  char *format;
-+#endif
-+
-+#if defined (PREFER_STDARG)
-+  va_start (args, format);
-+#else
-+  va_start (args);
-+  format = va_arg (args, char *);
-+#endif
-+
-+#if defined (HAVE_VSNPRINTF)
-+  vsnprintf (msg_buf, sizeof (msg_buf) - 1, format, args);
-+#else
-+  vsprintf (msg_buf, format, args);
-+  msg_buf[sizeof(msg_buf) - 1] = '\0';	/* overflow? */
-+#endif
-+  va_end (args);
-+
-+  if (saved_local_prompt == 0)
-+    {
-+      rl_save_prompt ();
-+      msg_saved_prompt = 1;
-+    }
-+  rl_display_prompt = msg_buf;
-+  local_prompt = expand_prompt (msg_buf, &prompt_visible_length,
-+					 &prompt_last_invisible,
-+					 &prompt_invis_chars_first_line,
-+					 &prompt_physical_chars);
-+  local_prompt_prefix = (char *)NULL;
-+  local_prompt_len = local_prompt ? strlen (local_prompt) : 0;
-+  (*rl_redisplay_function) ();
-+
-+  return 0;
-+}
-+#else /* !USE_VARARGS */
-+int
-+rl_message (format, arg1, arg2)
-+     char *format;
-+{
-+  sprintf (msg_buf, format, arg1, arg2);
-+  msg_buf[sizeof(msg_buf) - 1] = '\0';	/* overflow? */
-+
-+  rl_display_prompt = msg_buf;
-+  if (saved_local_prompt == 0)
-+    {
-+      rl_save_prompt ();
-+      msg_saved_prompt = 1;
-+    }
-+  local_prompt = expand_prompt (msg_buf, &prompt_visible_length,
-+					 &prompt_last_invisible,
-+					 &prompt_invis_chars_first_line,
-+					 &prompt_physical_chars);
-+  local_prompt_prefix = (char *)NULL;
-+  local_prompt_len = local_prompt ? strlen (local_prompt) : 0;
-+  (*rl_redisplay_function) ();
-+      
-+  return 0;
-+}
-+#endif /* !USE_VARARGS */
-+
-+/* How to clear things from the "echo-area". */
-+int
-+rl_clear_message ()
-+{
-+  rl_display_prompt = rl_prompt;
-+  if (msg_saved_prompt)
-+    {
-+      rl_restore_prompt ();
-+      msg_saved_prompt = 0;
-+    }
-+  (*rl_redisplay_function) ();
-+  return 0;
-+}
-+
-+int
-+rl_reset_line_state ()
-+{
-+  rl_on_new_line ();
-+
-+  rl_display_prompt = rl_prompt ? rl_prompt : "";
-+  forced_display = 1;
-+  return 0;
-+}
-+
-+void
-+rl_save_prompt ()
-+{
-+  saved_local_prompt = local_prompt;
-+  saved_local_prefix = local_prompt_prefix;
-+  saved_prefix_length = prompt_prefix_length;
-+  saved_local_length = local_prompt_len;
-+  saved_last_invisible = prompt_last_invisible;
-+  saved_visible_length = prompt_visible_length;
-+  saved_invis_chars_first_line = prompt_invis_chars_first_line;
-+  saved_physical_chars = prompt_physical_chars;
-+
-+  local_prompt = local_prompt_prefix = (char *)0;
-+  local_prompt_len = 0;
-+  prompt_last_invisible = prompt_visible_length = prompt_prefix_length = 0;
-+  prompt_invis_chars_first_line = prompt_physical_chars = 0;
-+}
-+
-+void
-+rl_restore_prompt ()
-+{
-+  FREE (local_prompt);
-+  FREE (local_prompt_prefix);
-+
-+  local_prompt = saved_local_prompt;
-+  local_prompt_prefix = saved_local_prefix;
-+  local_prompt_len = saved_local_length;
-+  prompt_prefix_length = saved_prefix_length;
-+  prompt_last_invisible = saved_last_invisible;
-+  prompt_visible_length = saved_visible_length;
-+  prompt_invis_chars_first_line = saved_invis_chars_first_line;
-+  prompt_physical_chars = saved_physical_chars;
-+
-+  /* can test saved_local_prompt to see if prompt info has been saved. */
-+  saved_local_prompt = saved_local_prefix = (char *)0;
-+  saved_local_length = 0;
-+  saved_last_invisible = saved_visible_length = saved_prefix_length = 0;
-+  saved_invis_chars_first_line = saved_physical_chars = 0;
-+}
-+
-+char *
-+_rl_make_prompt_for_search (pchar)
-+     int pchar;
-+{
-+  int len;
-+  char *pmt, *p;
-+
-+  rl_save_prompt ();
-+
-+  /* We've saved the prompt, and can do anything with the various prompt
-+     strings we need before they're restored.  We want the unexpanded
-+     portion of the prompt string after any final newline. */
-+  p = rl_prompt ? strrchr (rl_prompt, '\n') : 0;
-+  if (p == 0)
-+    {
-+      len = (rl_prompt && *rl_prompt) ? strlen (rl_prompt) : 0;
-+      pmt = (char *)xmalloc (len + 2);
-+      if (len)
-+	strcpy (pmt, rl_prompt);
-+      pmt[len] = pchar;
-+      pmt[len+1] = '\0';
-+    }
-+  else
-+    {
-+      p++;
-+      len = strlen (p);
-+      pmt = (char *)xmalloc (len + 2);
-+      if (len)
-+	strcpy (pmt, p);
-+      pmt[len] = pchar;
-+      pmt[len+1] = '\0';
-+    }  
-+
-+  /* will be overwritten by expand_prompt, called from rl_message */
-+  prompt_physical_chars = saved_physical_chars + 1;
-+  return pmt;
-+}
-+
-+/* Quick redisplay hack when erasing characters at the end of the line. */
-+void
-+_rl_erase_at_end_of_line (l)
-+     int l;
-+{
-+  register int i;
-+
-+  _rl_backspace (l);
-+  for (i = 0; i < l; i++)
-+    putc (' ', rl_outstream);
-+  _rl_backspace (l);
-+  for (i = 0; i < l; i++)
-+    visible_line[--_rl_last_c_pos] = '\0';
-+  rl_display_fixed++;
-+}
-+
-+/* Clear to the end of the line.  COUNT is the minimum
-+   number of character spaces to clear, */
-+void
-+_rl_clear_to_eol (count)
-+     int count;
-+{
-+  if (_rl_term_clreol)
-+    tputs (_rl_term_clreol, 1, _rl_output_character_function);
-+  else if (count)
-+    space_to_eol (count);
-+}
-+
-+/* Clear to the end of the line using spaces.  COUNT is the minimum
-+   number of character spaces to clear, */
-+static void
-+space_to_eol (count)
-+     int count;
-+{
-+  register int i;
-+
-+  for (i = 0; i < count; i++)
-+   putc (' ', rl_outstream);
-+
-+  _rl_last_c_pos += count;
-+}
-+
-+void
-+_rl_clear_screen ()
-+{
-+  if (_rl_term_clrpag)
-+    tputs (_rl_term_clrpag, 1, _rl_output_character_function);
-+  else
-+    rl_crlf ();
-+}
-+
-+/* Insert COUNT characters from STRING to the output stream at column COL. */
-+static void
-+insert_some_chars (string, count, col)
-+     char *string;
-+     int count, col;
-+{
-+#if defined (__MSDOS__) || defined (__MINGW32__)
-+  _rl_output_some_chars (string, count);
-+#else
-+  /* DEBUGGING */
-+  if (MB_CUR_MAX == 1 || rl_byte_oriented)
-+    if (count != col)
-+      fprintf(stderr, "readline: debug: insert_some_chars: count (%d) != col (%d)\n", count, col);
-+
-+  /* If IC is defined, then we do not have to "enter" insert mode. */
-+  if (_rl_term_IC)
-+    {
-+      char *buffer;
-+
-+      buffer = tgoto (_rl_term_IC, 0, col);
-+      tputs (buffer, 1, _rl_output_character_function);
-+      _rl_output_some_chars (string, count);
-+    }
-+  else
-+    {
-+      register int i;
-+
-+      /* If we have to turn on insert-mode, then do so. */
-+      if (_rl_term_im && *_rl_term_im)
-+	tputs (_rl_term_im, 1, _rl_output_character_function);
-+
-+      /* If there is a special command for inserting characters, then
-+	 use that first to open up the space. */
-+      if (_rl_term_ic && *_rl_term_ic)
-+	{
-+	  for (i = col; i--; )
-+	    tputs (_rl_term_ic, 1, _rl_output_character_function);
-+	}
-+
-+      /* Print the text. */
-+      _rl_output_some_chars (string, count);
-+
-+      /* If there is a string to turn off insert mode, we had best use
-+	 it now. */
-+      if (_rl_term_ei && *_rl_term_ei)
-+	tputs (_rl_term_ei, 1, _rl_output_character_function);
-+    }
-+#endif /* __MSDOS__ || __MINGW32__ */
-+}
-+
-+/* Delete COUNT characters from the display line. */
-+static void
-+delete_chars (count)
-+     int count;
-+{
-+  if (count > _rl_screenwidth)	/* XXX */
-+    return;
-+
-+#if !defined (__MSDOS__) && !defined (__MINGW32__)
-+  if (_rl_term_DC && *_rl_term_DC)
-+    {
-+      char *buffer;
-+      buffer = tgoto (_rl_term_DC, count, count);
-+      tputs (buffer, count, _rl_output_character_function);
-+    }
-+  else
-+    {
-+      if (_rl_term_dc && *_rl_term_dc)
-+	while (count--)
-+	  tputs (_rl_term_dc, 1, _rl_output_character_function);
-+    }
-+#endif /* !__MSDOS__ && !__MINGW32__ */
-+}
-+
-+void
-+_rl_update_final ()
-+{
-+  int full_lines;
-+
-+  full_lines = 0;
-+  /* If the cursor is the only thing on an otherwise-blank last line,
-+     compensate so we don't print an extra CRLF. */
-+  if (_rl_vis_botlin && _rl_last_c_pos == 0 &&
-+	visible_line[vis_lbreaks[_rl_vis_botlin]] == 0)
-+    {
-+      _rl_vis_botlin--;
-+      full_lines = 1;
-+    }
-+  _rl_move_vert (_rl_vis_botlin);
-+  /* If we've wrapped lines, remove the final xterm line-wrap flag. */
-+  if (full_lines && _rl_term_autowrap && (VIS_LLEN(_rl_vis_botlin) == _rl_screenwidth))
-+    {
-+      char *last_line;
-+
-+      last_line = &visible_line[vis_lbreaks[_rl_vis_botlin]];
-+      cpos_buffer_position = -1;	/* don't know where we are in buffer */
-+      _rl_move_cursor_relative (_rl_screenwidth - 1, last_line);	/* XXX */
-+      _rl_clear_to_eol (0);
-+      putc (last_line[_rl_screenwidth - 1], rl_outstream);
-+    }
-+  _rl_vis_botlin = 0;
-+  rl_crlf ();
-+  fflush (rl_outstream);
-+  rl_display_fixed++;
-+}
-+
-+/* Move to the start of the current line. */
-+static void
-+cr ()
-+{
-+  if (_rl_term_cr)
-+    {
-+#if defined (__MSDOS__)
-+      putc ('\r', rl_outstream);
-+#else
-+      tputs (_rl_term_cr, 1, _rl_output_character_function);
-+#endif
-+      _rl_last_c_pos = 0;
-+    }
-+}
-+
-+/* Redraw the last line of a multi-line prompt that may possibly contain
-+   terminal escape sequences.  Called with the cursor at column 0 of the
-+   line to draw the prompt on. */
-+static void
-+redraw_prompt (t)
-+     char *t;
-+{
-+  char *oldp;
-+
-+  oldp = rl_display_prompt;
-+  rl_save_prompt ();
-+
-+  rl_display_prompt = t;
-+  local_prompt = expand_prompt (t, &prompt_visible_length,
-+				   &prompt_last_invisible,
-+				   &prompt_invis_chars_first_line,
-+				   &prompt_physical_chars);
-+  local_prompt_prefix = (char *)NULL;
-+  local_prompt_len = local_prompt ? strlen (local_prompt) : 0;
-+
-+  rl_forced_update_display ();
-+
-+  rl_display_prompt = oldp;
-+  rl_restore_prompt();
-+}
-+      
-+/* Redisplay the current line after a SIGWINCH is received. */
-+void
-+_rl_redisplay_after_sigwinch ()
-+{
-+  char *t;
-+
-+  /* Clear the current line and put the cursor at column 0.  Make sure
-+     the right thing happens if we have wrapped to a new screen line. */
-+  if (_rl_term_cr)
-+    {
-+#if defined (__MSDOS__)
-+      putc ('\r', rl_outstream);
-+#else
-+      tputs (_rl_term_cr, 1, _rl_output_character_function);
-+#endif
-+      _rl_last_c_pos = 0;
-+#if defined (__MSDOS__)
-+      space_to_eol (_rl_screenwidth);
-+      putc ('\r', rl_outstream);
-+#else
-+      if (_rl_term_clreol)
-+	tputs (_rl_term_clreol, 1, _rl_output_character_function);
-+      else
-+	{
-+	  space_to_eol (_rl_screenwidth);
-+	  tputs (_rl_term_cr, 1, _rl_output_character_function);
-+	}
-+#endif
-+      if (_rl_last_v_pos > 0)
-+	_rl_move_vert (0);
-+    }
-+  else
-+    rl_crlf ();
-+
-+  /* Redraw only the last line of a multi-line prompt. */
-+  t = strrchr (rl_display_prompt, '\n');
-+  if (t)
-+    redraw_prompt (++t);
-+  else
-+    rl_forced_update_display ();
-+}
-+
-+void
-+_rl_clean_up_for_exit ()
-+{
-+  if (readline_echoing_p)
-+    {
-+      _rl_move_vert (_rl_vis_botlin);
-+      _rl_vis_botlin = 0;
-+      fflush (rl_outstream);
-+      rl_restart_output (1, 0);
-+    }
-+}
-+
-+void
-+_rl_erase_entire_line ()
-+{
-+  cr ();
-+  _rl_clear_to_eol (0);
-+  cr ();
-+  fflush (rl_outstream);
-+}
-+
-+/* return the `current display line' of the cursor -- the number of lines to
-+   move up to get to the first screen line of the current readline line. */
-+int
-+_rl_current_display_line ()
-+{
-+  int ret, nleft;
-+
-+  /* Find out whether or not there might be invisible characters in the
-+     editing buffer. */
-+  if (rl_display_prompt == rl_prompt)
-+    nleft = _rl_last_c_pos - _rl_screenwidth - rl_visible_prompt_length;
-+  else
-+    nleft = _rl_last_c_pos - _rl_screenwidth;
-+
-+  if (nleft > 0)
-+    ret = 1 + nleft / _rl_screenwidth;
-+  else
-+    ret = 0;
-+
-+  return ret;
-+}
-+
-+#if defined (HANDLE_MULTIBYTE)
-+/* Calculate the number of screen columns occupied by STR from START to END.
-+   In the case of multibyte characters with stateful encoding, we have to
-+   scan from the beginning of the string to take the state into account. */
-+static int
-+_rl_col_width (str, start, end)
-+     const char *str;
-+     int start, end;
-+{
-+  wchar_t wc;
-+  mbstate_t ps;
-+  int tmp, point, width, max;
-+
-+  if (end <= start)
-+    return 0;
-+  if (MB_CUR_MAX == 1 || rl_byte_oriented)
-+    return (end - start);
-+
-+  memset (&ps, 0, sizeof (mbstate_t));
-+
-+  point = 0;
-+  max = end;
-+
-+  while (point < start)
-+    {
-+      tmp = mbrlen (str + point, max, &ps);
-+      if (MB_INVALIDCH ((size_t)tmp))
-+	{
-+	  /* In this case, the bytes are invalid or too short to compose a
-+	     multibyte character, so we assume that the first byte represents
-+	     a single character. */
-+	  point++;
-+	  max--;
-+
-+	  /* Clear the state of the byte sequence, because in this case the
-+	     effect of mbstate is undefined. */
-+	  memset (&ps, 0, sizeof (mbstate_t));
-+	}
-+      else if (MB_NULLWCH (tmp))
-+	break;		/* Found '\0' */
-+      else
-+	{
-+	  point += tmp;
-+	  max -= tmp;
-+	}
-+    }
-+
-+  /* If START is not a byte that starts a character, then POINT will be
-+     greater than START.  In this case, assume that (POINT - START) gives
-+     a byte count that is the number of columns of difference. */
-+  width = point - start;
-+
-+  while (point < end)
-+    {
-+      tmp = mbrtowc (&wc, str + point, max, &ps);
-+      if (MB_INVALIDCH ((size_t)tmp))
-+	{
-+	  /* In this case, the bytes are invalid or too short to compose a
-+	     multibyte character, so we assume that the first byte represents
-+	     a single character. */
-+	  point++;
-+	  max--;
-+
-+	  /* and assume that the byte occupies a single column. */
-+	  width++;
-+
-+	  /* Clear the state of the byte sequence, because in this case the
-+	     effect of mbstate is undefined. */
-+	  memset (&ps, 0, sizeof (mbstate_t));
-+	}
-+      else if (MB_NULLWCH (tmp))
-+	break;			/* Found '\0' */
-+      else
-+	{
-+	  point += tmp;
-+	  max -= tmp;
-+	  tmp = wcwidth(wc);
-+	  width += (tmp >= 0) ? tmp : 1;
-+	}
-+    }
-+
-+  width += point - end;
-+
-+  return width;
-+}
-+#endif /* HANDLE_MULTIBYTE */
-diff -Naur bash-3.2.orig/lib/readline/input.c bash-3.2/lib/readline/input.c
---- bash-3.2.orig/lib/readline/input.c	2006-08-16 15:15:16.000000000 -0400
-+++ bash-3.2/lib/readline/input.c	2008-06-18 06:46:29.000000000 -0400
-@@ -133,8 +133,11 @@
-     return (0);
- 
-   *key = ibuffer[pop_index++];
--
-+#if 0
-   if (pop_index >= ibuffer_len)
-+#else
-+  if (pop_index > ibuffer_len)
-+#endif
-     pop_index = 0;
- 
-   return (1);
-@@ -151,7 +154,7 @@
-     {
-       pop_index--;
-       if (pop_index < 0)
--	pop_index = ibuffer_len - 1;
-+	pop_index = ibuffer_len;
-       ibuffer[pop_index] = key;
-       return (1);
-     }
-@@ -250,7 +253,8 @@
-       while (chars_avail--)
- 	{
- 	  k = (*rl_getc_function) (rl_instream);
--	  rl_stuff_char (k);
-+	  if (rl_stuff_char (k) == 0)
-+	    break;			/* some problem; no more room */
- 	  if (k == NEWLINE || k == RETURN)
- 	    break;
- 	}
-@@ -373,7 +377,11 @@
-       RL_SETSTATE (RL_STATE_INPUTPENDING);
-     }
-   ibuffer[push_index++] = key;
-+#if 0
-   if (push_index >= ibuffer_len)
-+#else
-+  if (push_index > ibuffer_len)
-+#endif
-     push_index = 0;
- 
-   return 1;
-@@ -513,20 +521,26 @@
-      char *mbchar;
-      int size;
- {
--  int mb_len = 0;
-+  int mb_len, c;
-   size_t mbchar_bytes_length;
-   wchar_t wc;
-   mbstate_t ps, ps_back;
- 
-   memset(&ps, 0, sizeof (mbstate_t));
-   memset(&ps_back, 0, sizeof (mbstate_t));
--  
-+
-+  mb_len = 0;  
-   while (mb_len < size)
-     {
-       RL_SETSTATE(RL_STATE_MOREINPUT);
--      mbchar[mb_len++] = rl_read_key ();
-+      c = rl_read_key ();
-       RL_UNSETSTATE(RL_STATE_MOREINPUT);
- 
-+      if (c < 0)
-+	break;
-+
-+      mbchar[mb_len++] = c;
-+
-       mbchar_bytes_length = mbrtowc (&wc, mbchar, mb_len, &ps);
-       if (mbchar_bytes_length == (size_t)(-1))
- 	break;		/* invalid byte sequence for the current locale */
-@@ -564,7 +578,7 @@
- 
-   c = first;
-   memset (mb, 0, mlen);
--  for (i = 0; i < mlen; i++)
-+  for (i = 0; c >= 0 && i < mlen; i++)
-     {
-       mb[i] = (char)c;
-       memset (&ps, 0, sizeof (mbstate_t));
-diff -Naur bash-3.2.orig/lib/readline/isearch.c bash-3.2/lib/readline/isearch.c
---- bash-3.2.orig/lib/readline/isearch.c	2005-12-26 17:18:53.000000000 -0500
-+++ bash-3.2/lib/readline/isearch.c	2008-06-18 06:46:22.000000000 -0400
-@@ -327,8 +327,15 @@
-   rl_command_func_t *f;
- 
-   f = (rl_command_func_t *)NULL;
-- 
-- /* Translate the keys we do something with to opcodes. */
-+
-+  if (c < 0)
-+    {
-+      cxt->sflags |= SF_FAILED;
-+      cxt->history_pos = cxt->last_found_line;
-+      return -1;
-+    }
-+
-+  /* Translate the keys we do something with to opcodes. */
-   if (c >= 0 && _rl_keymap[c].type == ISFUNC)
-     {
-       f = _rl_keymap[c].function;
-diff -Naur bash-3.2.orig/lib/readline/misc.c bash-3.2/lib/readline/misc.c
---- bash-3.2.orig/lib/readline/misc.c	2005-12-26 17:20:46.000000000 -0500
-+++ bash-3.2/lib/readline/misc.c	2008-06-18 06:46:22.000000000 -0400
-@@ -146,6 +146,8 @@
- 	  rl_restore_prompt ();
- 	  rl_clear_message ();
- 	  RL_UNSETSTATE(RL_STATE_NUMERICARG);
-+	  if (key < 0)
-+	    return -1;
- 	  return (_rl_dispatch (key, _rl_keymap));
- 	}
-     }
-diff -Naur bash-3.2.orig/lib/readline/readline.c bash-3.2/lib/readline/readline.c
---- bash-3.2.orig/lib/readline/readline.c	2006-08-16 15:00:36.000000000 -0400
-+++ bash-3.2/lib/readline/readline.c	2008-06-18 06:46:22.000000000 -0400
-@@ -645,6 +645,11 @@
-   if ((cxt->flags & KSEQ_DISPATCHED) == 0)
-     {
-       nkey = _rl_subseq_getchar (cxt->okey);
-+      if (nkey < 0)
-+	{
-+	  _rl_abort_internal ();
-+	  return -1;
-+	}
-       r = _rl_dispatch_subseq (nkey, cxt->dmap, cxt->subseq_arg);
-       cxt->flags |= KSEQ_DISPATCHED;
-     }
-diff -Naur bash-3.2.orig/lib/readline/text.c bash-3.2/lib/readline/text.c
---- bash-3.2.orig/lib/readline/text.c	2006-07-28 11:55:27.000000000 -0400
-+++ bash-3.2/lib/readline/text.c	2008-06-18 06:46:22.000000000 -0400
-@@ -857,6 +857,9 @@
-   c = rl_read_key ();
-   RL_UNSETSTATE(RL_STATE_MOREINPUT);
- 
-+  if (c < 0)
-+    return -1;
-+
- #if defined (HANDLE_SIGNALS)
-   if (RL_ISSTATE (RL_STATE_CALLBACK) == 0)
-     _rl_restore_tty_signals ();
-@@ -1520,6 +1523,9 @@
- 
-   mb_len = _rl_read_mbchar (mbchar, MB_LEN_MAX);
- 
-+  if (mb_len <= 0)
-+    return -1;
-+
-   if (count < 0)
-     return (_rl_char_search_internal (-count, bdir, mbchar, mb_len));
-   else
-@@ -1536,6 +1542,9 @@
-   c = rl_read_key ();
-   RL_UNSETSTATE(RL_STATE_MOREINPUT);
- 
-+  if (c < 0)
-+    return -1;
-+
-   if (count < 0)
-     return (_rl_char_search_internal (-count, bdir, c));
-   else
-diff -Naur bash-3.2.orig/lib/readline/vi_mode.c bash-3.2/lib/readline/vi_mode.c
---- bash-3.2.orig/lib/readline/vi_mode.c	2006-07-29 16:42:28.000000000 -0400
-+++ bash-3.2/lib/readline/vi_mode.c	2008-06-18 06:46:22.000000000 -0400
-@@ -886,6 +886,13 @@
-   RL_SETSTATE(RL_STATE_MOREINPUT);
-   c = rl_read_key ();
-   RL_UNSETSTATE(RL_STATE_MOREINPUT);
-+
-+  if (c < 0)
-+    {
-+      *nextkey = 0;
-+      return -1;
-+    }
-+
-   *nextkey = c;
- 
-   if (!member (c, vi_motion))
-@@ -902,6 +909,11 @@
- 	  RL_SETSTATE(RL_STATE_MOREINPUT);
- 	  c = rl_read_key ();	/* real command */
- 	  RL_UNSETSTATE(RL_STATE_MOREINPUT);
-+	  if (c < 0)
-+	    {
-+	      *nextkey = 0;
-+	      return -1;
-+	    }
- 	  *nextkey = c;
- 	}
-       else if (key == c && (key == 'd' || key == 'y' || key == 'c'))
-@@ -1224,14 +1236,22 @@
- _rl_vi_callback_char_search (data)
-      _rl_callback_generic_arg *data;
- {
-+  int c;
- #if defined (HANDLE_MULTIBYTE)
--  _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
-+  c = _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
- #else
-   RL_SETSTATE(RL_STATE_MOREINPUT);
--  _rl_vi_last_search_char = rl_read_key ();
-+  c = rl_read_key ();
-   RL_UNSETSTATE(RL_STATE_MOREINPUT);
- #endif
- 
-+  if (c <= 0)
-+    return -1;
-+
-+#if !defined (HANDLE_MULTIBYTE)
-+  _rl_vi_last_search_char = c;
-+#endif
-+
-   _rl_callback_func = 0;
-   _rl_want_redisplay = 1;
- 
-@@ -1247,6 +1267,7 @@
- rl_vi_char_search (count, key)
-      int count, key;
- {
-+  int c;
- #if defined (HANDLE_MULTIBYTE)
-   static char *target;
-   static int tlen;
-@@ -1293,11 +1314,17 @@
-       else
- 	{
- #if defined (HANDLE_MULTIBYTE)
--	  _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
-+	  c = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
-+	  if (c <= 0)
-+	    return -1;
-+	  _rl_vi_last_search_mblen = c;
- #else
- 	  RL_SETSTATE(RL_STATE_MOREINPUT);
--	  _rl_vi_last_search_char = rl_read_key ();
-+	  c = rl_read_key ();
- 	  RL_UNSETSTATE(RL_STATE_MOREINPUT);
-+	  if (c < 0)
-+	    return -1;
-+	  _rl_vi_last_search_char = c;
- #endif
- 	}
-     }
-@@ -1467,6 +1494,9 @@
-   c = rl_read_key ();
-   RL_UNSETSTATE(RL_STATE_MOREINPUT);
- 
-+  if (c < 0)
-+    return -1;
-+
- #if defined (HANDLE_MULTIBYTE)
-   if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-     c = _rl_read_mbstring (c, mb, mlen);
-@@ -1485,6 +1515,9 @@
- 
-   _rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX);
- 
-+  if (c < 0)
-+    return -1;
-+
-   _rl_callback_func = 0;
-   _rl_want_redisplay = 1;
- 
-@@ -1516,6 +1549,9 @@
-   else
-     _rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX);
- 
-+  if (c < 0)
-+    return -1;
-+
-   return (_rl_vi_change_char (count, c, mb));
- }
- 
-@@ -1650,7 +1686,7 @@
-   ch = rl_read_key ();
-   RL_UNSETSTATE(RL_STATE_MOREINPUT);
- 
--  if (ch < 'a' || ch > 'z')
-+  if (ch < 0 || ch < 'a' || ch > 'z')	/* make test against 0 explicit */
-     {
-       rl_ding ();
-       return -1;
-@@ -1702,7 +1738,7 @@
-       rl_point = rl_mark;
-       return 0;
-     }
--  else if (ch < 'a' || ch > 'z')
-+  else if (ch < 0 || ch < 'a' || ch > 'z')	/* make test against 0 explicit */
-     {
-       rl_ding ();
-       return -1;
-diff -Naur bash-3.2.orig/lib/sh/getcwd.c bash-3.2/lib/sh/getcwd.c
---- bash-3.2.orig/lib/sh/getcwd.c	2004-07-21 17:15:19.000000000 -0400
-+++ bash-3.2/lib/sh/getcwd.c	2008-06-18 06:46:31.000000000 -0400
-@@ -251,19 +251,21 @@
- 
-   {
-     size_t len = pathbuf + pathsize - pathp;
-+    if (buf == NULL && size <= 0)
-+      size = len;
-+
-+    if ((size_t) size < len)
-+      {
-+	errno = ERANGE;
-+	goto lose2;
-+      }
-     if (buf == NULL)
-       {
--	if (len < (size_t) size)
--	  len = size;
--	buf = (char *) malloc (len);
-+	buf = (char *) malloc (size);
- 	if (buf == NULL)
- 	  goto lose2;
-       }
--    else if ((size_t) size < len)
--      {
--	errno = ERANGE;
--	goto lose2;
--      }
-+
-     (void) memcpy((PTR_T) buf, (PTR_T) pathp, len);
-   }
- 
-diff -Naur bash-3.2.orig/lib/sh/snprintf.c bash-3.2/lib/sh/snprintf.c
---- bash-3.2.orig/lib/sh/snprintf.c	2006-04-06 09:48:40.000000000 -0400
-+++ bash-3.2/lib/sh/snprintf.c	2008-06-18 06:46:17.000000000 -0400
-@@ -471,6 +471,8 @@
- 	  10^x ~= r
-  * log_10(200) = 2;
-  * log_10(250) = 2;
-+ *
-+ * NOTE: do not call this with r == 0 -- an infinite loop results.
-  */
- static int
- log_10(r)
-@@ -576,8 +578,11 @@
-     { 
-       integral_part[0] = '0';
-       integral_part[1] = '\0';
--      fraction_part[0] = '0';
--      fraction_part[1] = '\0';
-+      /* The fractional part has to take the precision into account */
-+      for (ch = 0; ch < precision-1; ch++)
-+ 	fraction_part[ch] = '0';
-+      fraction_part[ch] = '0';
-+      fraction_part[ch+1] = '\0';
-       if (fract)
- 	*fract = fraction_part;
-       return integral_part;
-@@ -663,7 +668,8 @@
-     p->flags &= ~PF_ZEROPAD;
- 
-   sd = d;	/* signed for ' ' padding in base 10 */
--  flags = (*p->pf == 'u' || *p->pf == 'U') ? FL_UNSIGNED : 0;
-+  flags = 0;
-+  flags = (*p->pf == 'x' || *p->pf == 'X' || *p->pf == 'o' || *p->pf == 'u' || *p->pf == 'U') ? FL_UNSIGNED : 0;
-   if (*p->pf == 'X')
-     flags |= FL_HEXUPPER;
- 
-@@ -733,7 +739,7 @@
-     p->flags &= ~PF_ZEROPAD;
- 
-   sd = d;	/* signed for ' ' padding in base 10 */
--  flags = (*p->pf == 'u' || *p->pf == 'U') ? FL_UNSIGNED : 0;
-+  flags = (*p->pf == 'x' || *p->pf == 'X' || *p->pf == 'o' || *p->pf == 'u' || *p->pf == 'U') ? FL_UNSIGNED : 0;
-   if (*p->pf == 'X')
-     flags |= FL_HEXUPPER;
- 
-@@ -805,6 +811,7 @@
-       PUT_CHAR(*tmp, p);
-       tmp++;
-     }
-+
-   PAD_LEFT(p);
- }
- 
-@@ -972,11 +979,21 @@
-   if ((p->flags & PF_THOUSANDS) && grouping && (t = groupnum (tmp)))
-     tmp = t;
- 
-+  if ((*p->pf == 'g' || *p->pf == 'G') && (p->flags & PF_ALTFORM) == 0)
-+    {
-+      /* smash the trailing zeros unless altform */
-+      for (i = strlen(tmp2) - 1; i >= 0 && tmp2[i] == '0'; i--)
-+        tmp2[i] = '\0'; 
-+      if (tmp2[0] == '\0')
-+	p->precision = 0;
-+    }
-+
-   /* calculate the padding. 1 for the dot */
-   p->width = p->width -
- 	    ((d > 0. && p->justify == RIGHT) ? 1:0) -
- 	    ((p->flags & PF_SPACE) ? 1:0) -
--	    strlen(tmp) - p->precision - 1;
-+	    strlen(tmp) - p->precision -
-+	    ((p->precision != 0 || (p->flags & PF_ALTFORM)) ? 1 : 0);	/* radix char */
-   PAD_RIGHT(p);  
-   PUT_PLUS(d, p, 0.);
-   PUT_SPACE(d, p, 0.);
-@@ -991,11 +1008,6 @@
-   if (p->precision != 0 || (p->flags & PF_ALTFORM))
-     PUT_CHAR(decpoint, p);  /* put the '.' */
- 
--  if ((*p->pf == 'g' || *p->pf == 'G') && (p->flags & PF_ALTFORM) == 0)
--    /* smash the trailing zeros unless altform */
--    for (i = strlen(tmp2) - 1; i >= 0 && tmp2[i] == '0'; i--)
--      tmp2[i] = '\0'; 
--
-   for (; *tmp2; tmp2++)
-     PUT_CHAR(*tmp2, p); /* the fraction */
-   
-@@ -1011,14 +1023,19 @@
-   char *tmp, *tmp2;
-   int j, i;
- 
--  if (chkinfnan(p, d, 1) || chkinfnan(p, d, 2))
-+  if (d != 0 && (chkinfnan(p, d, 1) || chkinfnan(p, d, 2)))
-     return;	/* already printed nan or inf */
- 
-   GETLOCALEDATA(decpoint, thoussep, grouping);
-   DEF_PREC(p);
--  j = log_10(d);
--  d = d / pow_10(j);  /* get the Mantissa */
--  d = ROUND(d, p);		  
-+  if (d == 0.)
-+    j = 0;
-+  else
-+    {
-+      j = log_10(d);
-+      d = d / pow_10(j);  /* get the Mantissa */
-+      d = ROUND(d, p);		  
-+    }
-   tmp = dtoa(d, p->precision, &tmp2);
- 
-   /* 1 for unit, 1 for the '.', 1 for 'e|E',
-@@ -1076,6 +1093,7 @@
-        PUT_CHAR(*tmp, p);
-        tmp++;
-      }
-+
-    PAD_LEFT(p);
- }
- #endif
-@@ -1358,7 +1376,7 @@
- 		STAR_ARGS(data);
- 		DEF_PREC(data);
- 		d = GETDOUBLE(data);
--		i = log_10(d);
-+		i = (d != 0.) ? log_10(d) : -1;
- 		/*
- 		 * for '%g|%G' ANSI: use f if exponent
- 		 * is in the range or [-4,p] exclusively
-diff -Naur bash-3.2.orig/parse.y bash-3.2/parse.y
---- bash-3.2.orig/parse.y	2006-09-19 16:37:21.000000000 -0400
-+++ bash-3.2/parse.y	2008-06-18 06:46:32.000000000 -0400
-@@ -1029,6 +1029,7 @@
- #define PST_CMDTOKEN	0x1000		/* command token OK - unused */
- #define PST_COMPASSIGN	0x2000		/* parsing x=(...) compound assignment */
- #define PST_ASSIGNOK	0x4000		/* assignment statement ok in this context */
-+#define PST_REGEXP	0x8000		/* parsing an ERE/BRE as a single word */
- 
- /* Initial size to allocate for tokens, and the
-    amount to grow them by. */
-@@ -2591,6 +2592,9 @@
-       return (character);
-     }
- 
-+  if (parser_state & PST_REGEXP)
-+    goto tokword;
-+
-   /* Shell meta-characters. */
-   if MBTEST(shellmeta (character) && ((parser_state & PST_DBLPAREN) == 0))
-     {
-@@ -2698,6 +2702,7 @@
-   if MBTEST(character == '-' && (last_read_token == LESS_AND || last_read_token == GREATER_AND))
-     return (character);
- 
-+tokword:
-   /* Okay, if we got this far, we have to read a word.  Read one,
-      and then check it against the known ones. */
-   result = read_token_word (character);
-@@ -2735,7 +2740,7 @@
- /* itrace("parse_matched_pair: open = %c close = %c", open, close); */
-   count = 1;
-   pass_next_character = backq_backslash = was_dollar = in_comment = 0;
--  check_comment = (flags & P_COMMAND) && qc != '\'' && qc != '"' && (flags & P_DQUOTE) == 0;
-+  check_comment = (flags & P_COMMAND) && qc != '`' && qc != '\'' && qc != '"' && (flags & P_DQUOTE) == 0;
- 
-   /* RFLAGS is the set of flags we want to pass to recursive calls. */
-   rflags = (qc == '"') ? P_DQUOTE : (flags & P_DQUOTE);
-@@ -3202,8 +3207,11 @@
-       if (tok == WORD && test_binop (yylval.word->word))
- 	op = yylval.word;
- #if defined (COND_REGEXP)
--      else if (tok == WORD && STREQ (yylval.word->word,"=~"))
--	op = yylval.word;
-+      else if (tok == WORD && STREQ (yylval.word->word, "=~"))
-+	{
-+	  op = yylval.word;
-+	  parser_state |= PST_REGEXP;
-+	}
- #endif
-       else if (tok == '<' || tok == '>')
- 	op = make_word_from_token (tok);  /* ( */
-@@ -3234,6 +3242,7 @@
- 
-       /* rhs */
-       tok = read_token (READ);
-+      parser_state &= ~PST_REGEXP;
-       if (tok == WORD)
- 	{
- 	  tright = make_cond_node (COND_TERM, yylval.word, (COND_COM *)NULL, (COND_COM *)NULL);
-@@ -3367,7 +3376,7 @@
-       if (pass_next_character)
- 	{
- 	  pass_next_character = 0;
--	  goto got_character;
-+	  goto got_escaped_character;
- 	}
- 
-       cd = current_delimiter (dstack);
-@@ -3419,9 +3428,34 @@
- 	  goto next_character;
- 	}
- 
-+#ifdef COND_REGEXP
-+      /* When parsing a regexp as a single word inside a conditional command,
-+	 we need to special-case characters special to both the shell and
-+	 regular expressions.  Right now, that is only '(' and '|'. */ /*)*/
-+      if MBTEST((parser_state & PST_REGEXP) && (character == '(' || character == '|'))		/*)*/
-+        {
-+          if (character == '|')
-+            goto got_character;
-+
-+	  push_delimiter (dstack, character);
-+	  ttok = parse_matched_pair (cd, '(', ')', &ttoklen, 0);
-+	  pop_delimiter (dstack);
-+	  if (ttok == &matched_pair_error)
-+	    return -1;		/* Bail immediately. */
-+	  RESIZE_MALLOCED_BUFFER (token, token_index, ttoklen + 2,
-+				  token_buffer_size, TOKEN_DEFAULT_GROW_SIZE);
-+	  token[token_index++] = character;
-+	  strcpy (token + token_index, ttok);
-+	  token_index += ttoklen;
-+	  FREE (ttok);
-+	  dollar_present = all_digit_token = 0;
-+	  goto next_character;
-+        }
-+#endif /* COND_REGEXP */
-+
- #ifdef EXTENDED_GLOB
-       /* Parse a ksh-style extended pattern matching specification. */
--      if (extended_glob && PATTERN_CHAR (character))
-+      if MBTEST(extended_glob && PATTERN_CHAR (character))
- 	{
- 	  peek_char = shell_getc (1);
- 	  if MBTEST(peek_char == '(')		/* ) */
-@@ -3616,12 +3650,14 @@
- 
-     got_character:
- 
--      all_digit_token &= DIGIT (character);
--      dollar_present |= character == '$';
--
-       if (character == CTLESC || character == CTLNUL)
- 	token[token_index++] = CTLESC;
- 
-+    got_escaped_character:
-+
-+      all_digit_token &= DIGIT (character);
-+      dollar_present |= character == '$';
-+
-       token[token_index++] = character;
- 
-       RESIZE_MALLOCED_BUFFER (token, token_index, 1, token_buffer_size,
-@@ -4330,7 +4366,7 @@
-   if (promptvars || posixly_correct)
-     {
-       last_exit_value = last_command_exit_value;
--      list = expand_prompt_string (result, Q_DOUBLE_QUOTES);
-+      list = expand_prompt_string (result, Q_DOUBLE_QUOTES, 0);
-       free (result);
-       result = string_list (list);
-       dispose_words (list);
-diff -Naur bash-3.2.orig/patchlevel.h bash-3.2/patchlevel.h
---- bash-3.2.orig/patchlevel.h	2006-04-13 08:31:04.000000000 -0400
-+++ bash-3.2/patchlevel.h	2008-06-18 06:46:33.000000000 -0400
-@@ -25,6 +25,6 @@
-    regexp `^#define[ 	]*PATCHLEVEL', since that's what support/mkversion.sh
-    looks for to find the patch level (for the sccs version string). */
- 
--#define PATCHLEVEL 0
-+#define PATCHLEVEL 39
- 
- #endif /* _PATCHLEVEL_H_ */
-diff -Naur bash-3.2.orig/pathexp.c bash-3.2/pathexp.c
---- bash-3.2.orig/pathexp.c	2002-05-06 13:43:05.000000000 -0400
-+++ bash-3.2/pathexp.c	2008-06-18 06:46:17.000000000 -0400
-@@ -1,6 +1,6 @@
- /* pathexp.c -- The shell interface to the globbing library. */
- 
--/* Copyright (C) 1995-2002 Free Software Foundation, Inc.
-+/* Copyright (C) 1995-2007 Free Software Foundation, Inc.
- 
-    This file is part of GNU Bash, the Bourne Again SHell.
- 
-@@ -110,6 +110,33 @@
-   return (0);
- }
- 
-+/* Return 1 if C is a character that is `special' in a POSIX ERE and needs to
-+   be quoted to match itself. */
-+static inline int
-+ere_char (c)
-+     int c;
-+{
-+  switch (c)
-+    {
-+    case '.':
-+    case '[':
-+    case '\\':
-+    case '(':
-+    case ')':
-+    case '*':
-+    case '+':
-+    case '?':
-+    case '{':
-+    case '|':
-+    case '^':
-+    case '$':
-+      return 1;
-+    default: 
-+      return 0;
-+    }
-+  return (0);
-+}
-+
- /* PATHNAME can contain characters prefixed by CTLESC; this indicates
-    that the character is to be quoted.  We quote it here in the style
-    that the glob library recognizes.  If flags includes QGLOB_CVTNULL,
-@@ -142,6 +169,8 @@
- 	{
- 	  if ((qflags & QGLOB_FILENAME) && pathname[i+1] == '/')
- 	    continue;
-+	  if ((qflags & QGLOB_REGEXP) && ere_char (pathname[i+1]) == 0)
-+	    continue;
- 	  temp[j++] = '\\';
- 	  i++;
- 	  if (pathname[i] == '\0')
-diff -Naur bash-3.2.orig/pathexp.h bash-3.2/pathexp.h
---- bash-3.2.orig/pathexp.h	2005-02-19 17:23:18.000000000 -0500
-+++ bash-3.2/pathexp.h	2008-06-18 06:46:17.000000000 -0400
-@@ -1,6 +1,6 @@
- /* pathexp.h -- The shell interface to the globbing library. */
- 
--/* Copyright (C) 1987-2005 Free Software Foundation, Inc.
-+/* Copyright (C) 1987-2007 Free Software Foundation, Inc.
- 
-    This file is part of GNU Bash, the Bourne Again SHell.
- 
-@@ -32,6 +32,7 @@
- /* Flag values for quote_string_for_globbing */
- #define QGLOB_CVTNULL	0x01	/* convert QUOTED_NULL strings to '\0' */
- #define QGLOB_FILENAME	0x02	/* do correct quoting for matching filenames */
-+#define QGLOB_REGEXP	0x04	/* quote an ERE for regcomp/regexec */
- 
- #if defined (EXTENDED_GLOB)
- /* Flags to OR with other flag args to strmatch() to enabled the extended
-diff -Naur bash-3.2.orig/po/ru.po bash-3.2/po/ru.po
---- bash-3.2.orig/po/ru.po	2006-01-10 17:51:03.000000000 -0500
-+++ bash-3.2/po/ru.po	2008-06-18 06:46:13.000000000 -0400
-@@ -12,7 +12,7 @@
- "Last-Translator: Evgeniy Dushistov <dushistov@mail.ru>\n"
- "Language-Team: Russian <ru@li.org>\n"
- "MIME-Version: 1.0\n"
--"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Type: text/plain; charset=KOI8-R\n"
- "Content-Transfer-Encoding: 8bit\n"
- "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
- 
-diff -Naur bash-3.2.orig/shell.h bash-3.2/shell.h
---- bash-3.2.orig/shell.h	2003-06-01 15:04:36.000000000 -0400
-+++ bash-3.2/shell.h	2008-06-18 06:46:33.000000000 -0400
-@@ -89,6 +89,7 @@
- extern int executing, login_shell;
- extern int interactive, interactive_shell;
- extern int startup_state;
-+extern int shell_compatibility_level;
- 
- /* Structure to pass around that holds a bitmap of file descriptors
-    to close, and the size of that structure.  Used in execute_cmd.c. */
-diff -Naur bash-3.2.orig/sig.c bash-3.2/sig.c
---- bash-3.2.orig/sig.c	2006-01-25 14:57:59.000000000 -0500
-+++ bash-3.2/sig.c	2008-06-18 06:46:23.000000000 -0400
-@@ -350,6 +350,25 @@
- #undef XSIG
- #undef XHANDLER
- 
-+/* Run some of the cleanups that should be performed when we run
-+   jump_to_top_level from a builtin command context.  XXX - might want to
-+   also call reset_parser here. */
-+void
-+top_level_cleanup ()
-+{
-+  /* Clean up string parser environment. */
-+  while (parse_and_execute_level)
-+    parse_and_execute_cleanup ();
-+
-+#if defined (PROCESS_SUBSTITUTION)
-+  unlink_fifo_list ();
-+#endif /* PROCESS_SUBSTITUTION */
-+
-+  run_unwind_protects ();
-+  loop_level = continuing = breaking = 0;
-+  return_catch_flag = 0;
-+}
-+
- /* What to do when we've been interrupted, and it is safe to handle it. */
- void
- throw_to_top_level ()
-diff -Naur bash-3.2.orig/sig.h bash-3.2/sig.h
---- bash-3.2.orig/sig.h	2006-01-25 14:50:27.000000000 -0500
-+++ bash-3.2/sig.h	2008-06-18 06:46:23.000000000 -0400
-@@ -121,6 +121,7 @@
- extern void initialize_signals __P((int));
- extern void initialize_terminating_signals __P((void));
- extern void reset_terminating_signals __P((void));
-+extern void top_level_cleanup __P((void));
- extern void throw_to_top_level __P((void));
- extern void jump_to_top_level __P((int)) __attribute__((__noreturn__));
- 
-diff -Naur bash-3.2.orig/subst.c bash-3.2/subst.c
---- bash-3.2.orig/subst.c	2006-09-19 08:35:09.000000000 -0400
-+++ bash-3.2/subst.c	2008-06-18 06:46:32.000000000 -0400
-@@ -4,7 +4,7 @@
- /* ``Have a little faith, there's magic in the night.  You ain't a
-      beauty, but, hey, you're alright.'' */
- 
--/* Copyright (C) 1987-2006 Free Software Foundation, Inc.
-+/* Copyright (C) 1987-2007 Free Software Foundation, Inc.
- 
-    This file is part of GNU Bash, the Bourne Again SHell.
- 
-@@ -1278,7 +1278,7 @@
-     {
-       if (no_longjmp_on_fatal_error == 0)
- 	{			/* { */
--	  report_error ("bad substitution: no closing `%s' in %s", "}", string);
-+	  report_error (_("bad substitution: no closing `%s' in %s"), "}", string);
- 	  last_command_exit_value = EXECUTION_FAILURE;
- 	  exp_jump_to_top_level (DISCARD);
- 	}
-@@ -1887,7 +1887,13 @@
-   sep[1] = '\0';
- #endif
- 
-+  /* XXX -- why call quote_list if ifs == 0?  we can get away without doing
-+     it now that quote_escapes quotes spaces */
-+#if 0
-   tlist = ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) || (ifs && *ifs == 0))
-+#else
-+  tlist = (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))
-+#endif
- 		? quote_list (list)
- 		: list_quote_escapes (list);
- 
-@@ -2646,11 +2652,12 @@
- 
- /* This needs better error handling. */
- /* Expand W for use as an argument to a unary or binary operator in a
--   [[...]] expression.  If SPECIAL is nonzero, this is the rhs argument
-+   [[...]] expression.  If SPECIAL is 1, this is the rhs argument
-    to the != or == operator, and should be treated as a pattern.  In
--   this case, we quote the string specially for the globbing code.  The
--   caller is responsible for removing the backslashes if the unquoted
--   words is needed later. */   
-+   this case, we quote the string specially for the globbing code.  If
-+   SPECIAL is 2, this is an rhs argument for the =~ operator, and should
-+   be quoted appropriately for regcomp/regexec.  The caller is responsible
-+   for removing the backslashes if the unquoted word is needed later. */   
- char *
- cond_expand_word (w, special)
-      WORD_DESC *w;
-@@ -2658,6 +2665,7 @@
- {
-   char *r, *p;
-   WORD_LIST *l;
-+  int qflags;
- 
-   if (w->word == 0 || w->word[0] == '\0')
-     return ((char *)NULL);
-@@ -2672,8 +2680,11 @@
- 	}
-       else
- 	{
-+	  qflags = QGLOB_CVTNULL;
-+	  if (special == 2)
-+	    qflags |= QGLOB_REGEXP;
- 	  p = string_list (l);
--	  r = quote_string_for_globbing (p, QGLOB_CVTNULL);
-+	  r = quote_string_for_globbing (p, qflags);
- 	  free (p);
- 	}
-       dispose_words (l);
-@@ -2803,9 +2814,10 @@
-    passed string when an error occurs.  Might want to trap other calls
-    to jump_to_top_level here so we don't endlessly loop. */
- WORD_LIST *
--expand_prompt_string (string, quoted)
-+expand_prompt_string (string, quoted, wflags)
-      char *string;
-      int quoted;
-+     int wflags;
- {
-   WORD_LIST *value;
-   WORD_DESC td;
-@@ -2813,7 +2825,7 @@
-   if (string == 0 || *string == 0)
-     return ((WORD_LIST *)NULL);
- 
--  td.flags = 0;
-+  td.flags = wflags;
-   td.word = savestring (string);
- 
-   no_longjmp_on_fatal_error = 1;
-@@ -2916,7 +2928,12 @@
- 
- /* Quote escape characters in string s, but no other characters.  This is
-    used to protect CTLESC and CTLNUL in variable values from the rest of
--   the word expansion process after the variable is expanded. */
-+   the word expansion process after the variable is expanded.  If IFS is
-+   null, we quote spaces as well, just in case we split on spaces later
-+   (in the case of unquoted $@, we will eventually attempt to split the
-+   entire word on spaces).  Corresponding code exists in dequote_escapes.
-+   Even if we don't end up splitting on spaces, quoting spaces is not a
-+   problem. */
- char *
- quote_escapes (string)
-      char *string;
-@@ -2924,17 +2941,19 @@
-   register char *s, *t;
-   size_t slen;
-   char *result, *send;
-+  int quote_spaces;
-   DECLARE_MBSTATE; 
- 
-   slen = strlen (string);
-   send = string + slen;
- 
-+  quote_spaces = (ifs_value && *ifs_value == 0);
-   t = result = (char *)xmalloc ((slen * 2) + 1);
-   s = string;
- 
-   while (*s)
-     {
--      if (*s == CTLESC || *s == CTLNUL)
-+      if (*s == CTLESC || *s == CTLNUL || (quote_spaces && *s == ' '))
- 	*t++ = CTLESC;
-       COPY_CHAR_P (t, s, send);
-     }
-@@ -2976,6 +2995,7 @@
-   register char *s, *t;
-   size_t slen;
-   char *result, *send;
-+  int quote_spaces;
-   DECLARE_MBSTATE;
- 
-   if (string == 0)
-@@ -2990,9 +3010,10 @@
-   if (strchr (string, CTLESC) == 0)
-     return (strcpy (result, s));
- 
-+  quote_spaces = (ifs_value && *ifs_value == 0);
-   while (*s)
-     {
--      if (*s == CTLESC && (s[1] == CTLESC || s[1] == CTLNUL))
-+      if (*s == CTLESC && (s[1] == CTLESC || s[1] == CTLNUL || (quote_spaces && s[1] == ' ')))
- 	{
- 	  s++;
- 	  if (*s == '\0')
-@@ -3954,7 +3975,11 @@
-   if (patspec == RP_LONG_LEFT || patspec == RP_LONG_RIGHT)
-     patstr++;
- 
--  pattern = getpattern (patstr, quoted, 1);
-+  /* Need to pass getpattern newly-allocated memory in case of expansion --
-+     the expansion code will free the passed string on an error. */
-+  temp1 = savestring (patstr);
-+  pattern = getpattern (temp1, quoted, 1);
-+  free (temp1);
- 
-   temp1 = (char *)NULL;		/* shut up gcc */
-   switch (vtype)
-@@ -4123,6 +4148,12 @@
-     nfifo = 0;
- }
- 
-+int
-+fifos_pending ()
-+{
-+  return nfifo;
-+}
-+
- static char *
- make_named_pipe ()
- {
-@@ -4172,6 +4203,12 @@
-   nfds++;
- }
- 
-+int
-+fifos_pending ()
-+{
-+  return 0;	/* used for cleanup; not needed with /dev/fd */
-+}
-+
- void
- unlink_fifo_list ()
- {
-@@ -4456,7 +4493,15 @@
-       /* Add the character to ISTRING, possibly after resizing it. */
-       RESIZE_MALLOCED_BUFFER (istring, istring_index, 2, istring_size, DEFAULT_ARRAY_SIZE);
- 
--      if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) || c == CTLESC || c == CTLNUL)
-+      /* This is essentially quote_string inline */
-+      if ((quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES)) /* || c == CTLESC || c == CTLNUL */)
-+	istring[istring_index++] = CTLESC;
-+      /* Escape CTLESC and CTLNUL in the output to protect those characters
-+	 from the rest of the word expansions (word splitting and globbing.)
-+	 This is essentially quote_escapes inline. */
-+      else if (c == CTLESC)
-+	istring[istring_index++] = CTLESC;
-+      else if (c == CTLNUL || (c == ' ' && (ifs_value && *ifs_value == 0)))
- 	istring[istring_index++] = CTLESC;
- 
-       istring[istring_index++] = c;
-@@ -4578,7 +4623,8 @@
- #if defined (JOB_CONTROL)
-   set_sigchld_handler ();
-   stop_making_children ();
--  pipeline_pgrp = old_pipeline_pgrp;
-+  if (pid != 0)
-+    pipeline_pgrp = old_pipeline_pgrp;
- #else
-   stop_making_children ();
- #endif /* JOB_CONTROL */
-@@ -4665,6 +4711,9 @@
- 
-       last_command_exit_value = rc;
-       rc = run_exit_trap ();
-+#if defined (PROCESS_SUBSTITUTION)
-+      unlink_fifo_list ();
-+#endif
-       exit (rc);
-     }
-   else
-@@ -4860,10 +4909,11 @@
-   char *temp, *tt;
-   intmax_t arg_index;
-   SHELL_VAR *var;
--  int atype;
-+  int atype, rflags;
- 
-   ret = 0;
-   temp = 0;
-+  rflags = 0;
- 
-   /* Handle multiple digit arguments, as in ${11}. */  
-   if (legal_number (name, &arg_index))
-@@ -4896,6 +4946,8 @@
-  	temp = (*temp && (quoted & (Q_DOUBLE_QUOTES|Q_HERE_DOCUMENT)))
-  		  ? quote_string (temp)
-  		  : quote_escapes (temp);
-+      else if (atype == 1 && temp && QUOTED_NULL (temp) && (quoted & (Q_DOUBLE_QUOTES|Q_HERE_DOCUMENT)))
-+	rflags |= W_HASQUOTEDNULL;
-     }
- #endif
-   else if (var = find_variable (name))
-@@ -4923,6 +4975,7 @@
-     {
-       ret = alloc_word_desc ();
-       ret->word = temp;
-+      ret->flags |= rflags;
-     }
-   return ret;
- }
-@@ -5546,12 +5599,16 @@
- 	 so verify_substring_values just returns the numbers specified and we
- 	 rely on array_subrange to understand how to deal with them). */
-       tt = array_subrange (array_cell (v), e1, e2, starsub, quoted);
-+#if 0
-+      /* array_subrange now calls array_quote_escapes as appropriate, so the
-+	 caller no longer needs to. */
-       if ((quoted & (Q_DOUBLE_QUOTES|Q_HERE_DOCUMENT)) == 0)
- 	{
- 	  temp = tt ? quote_escapes (tt) : (char *)NULL;
- 	  FREE (tt);
- 	}
-       else
-+#endif
- 	temp = tt;
-       break;
- #endif
-@@ -5707,6 +5764,11 @@
-   vtype &= ~VT_STARSUB;
- 
-   mflags = 0;
-+  if (patsub && *patsub == '/')
-+    {
-+      mflags |= MATCH_GLOBREP;
-+      patsub++;
-+    }
- 
-   /* Malloc this because expand_string_if_necessary or one of the expansion
-      functions in its call chain may free it on a substitution error. */
-@@ -5741,13 +5803,12 @@
-     }
- 
-   /* ksh93 doesn't allow the match specifier to be a part of the expanded
--     pattern.  This is an extension. */
-+     pattern.  This is an extension.  Make sure we don't anchor the pattern
-+     at the beginning or end of the string if we're doing global replacement,
-+     though. */
-   p = pat;
--  if (pat && pat[0] == '/')
--    {
--      mflags |= MATCH_GLOBREP|MATCH_ANY;
--      p++;
--    }
-+  if (mflags & MATCH_GLOBREP)
-+    mflags |= MATCH_ANY;
-   else if (pat && pat[0] == '#')
-     {
-       mflags |= MATCH_BEG;
-@@ -5798,12 +5859,16 @@
- #if defined (ARRAY_VARS)
-     case VT_ARRAYVAR:
-       temp = array_patsub (array_cell (v), p, rep, mflags);
-+#if 0
-+      /* Don't need to do this anymore; array_patsub calls array_quote_escapes
-+	 as appropriate before adding the space separators. */
-       if (temp && (mflags & MATCH_QUOTED) == 0)
- 	{
- 	  tt = quote_escapes (temp);
- 	  free (temp);
- 	  temp = tt;
- 	}
-+#endif
-       break;
- #endif
-     }
-@@ -7607,6 +7672,8 @@
-   expand_no_split_dollar_star = 0;	/* XXX */
-   expanding_redir = 0;
- 
-+  top_level_cleanup ();			/* from sig.c */
-+
-   jump_to_top_level (v);
- }
- 
-@@ -7824,7 +7891,7 @@
- 	  else if (fail_glob_expansion != 0)
- 	    {
- 	      report_error (_("no match: %s"), tlist->word->word);
--	      jump_to_top_level (DISCARD);
-+	      exp_jump_to_top_level (DISCARD);
- 	    }
- 	  else if (allow_null_glob_expansion == 0)
- 	    {
-diff -Naur bash-3.2.orig/subst.h bash-3.2/subst.h
---- bash-3.2.orig/subst.h	2006-09-19 08:34:41.000000000 -0400
-+++ bash-3.2/subst.h	2008-06-18 06:46:32.000000000 -0400
-@@ -135,7 +135,7 @@
- extern WORD_LIST *expand_string_assignment __P((char *, int));
- 
- /* Expand a prompt string. */
--extern WORD_LIST *expand_prompt_string __P((char *, int));
-+extern WORD_LIST *expand_prompt_string __P((char *, int, int));
- 
- /* Expand STRING just as if you were expanding a word.  This also returns
-    a list of words.  Note that filename globbing is *NOT* done for word
-@@ -222,6 +222,7 @@
- extern char *command_substitute __P((char *, int));
- extern char *pat_subst __P((char *, char *, char *, int));
- 
-+extern int fifos_pending __P((void));
- extern void unlink_fifo_list __P((void));
- 
- extern WORD_LIST *list_string_with_quotes __P((char *));
-diff -Naur bash-3.2.orig/tests/new-exp.right bash-3.2/tests/new-exp.right
---- bash-3.2.orig/tests/new-exp.right	2006-08-10 12:00:00.000000000 -0400
-+++ bash-3.2/tests/new-exp.right	2008-06-18 06:46:14.000000000 -0400
-@@ -430,7 +430,7 @@
- Case06---1---A B C::---
- Case07---3---A:B:C---
- Case08---3---A:B:C---
--./new-exp.tests: line 506: /${$(($#-1))}: bad substitution
-+./new-exp.tests: line 506: ${$(($#-1))}: bad substitution
- argv[1] = <a>
- argv[2] = <b>
- argv[3] = <c>
-diff -Naur bash-3.2.orig/tests/shopt.right bash-3.2/tests/shopt.right
---- bash-3.2.orig/tests/shopt.right	2005-02-19 17:46:09.000000000 -0500
-+++ bash-3.2/tests/shopt.right	2008-06-18 06:46:33.000000000 -0400
-@@ -6,6 +6,7 @@
- shopt -u checkhash
- shopt -u checkwinsize
- shopt -s cmdhist
-+shopt -u compat31
- shopt -u dotglob
- shopt -u execfail
- shopt -s expand_aliases
-@@ -53,6 +54,7 @@
- shopt -u cdable_vars
- shopt -u checkhash
- shopt -u checkwinsize
-+shopt -u compat31
- shopt -u dotglob
- shopt -u execfail
- shopt -u extdebug
-@@ -77,6 +79,7 @@
- cdable_vars    	off
- checkhash      	off
- checkwinsize   	off
-+compat31       	off
- dotglob        	off
- execfail       	off
- extdebug       	off
-diff -Naur bash-3.2.orig/variables.c bash-3.2/variables.c
---- bash-3.2.orig/variables.c	2006-09-08 13:33:32.000000000 -0400
-+++ bash-3.2/variables.c	2008-06-18 06:46:23.000000000 -0400
-@@ -1821,11 +1821,17 @@
- 	  oval = value_cell (var);
- 	  lval = evalexp (oval, &expok);	/* ksh93 seems to do this */
- 	  if (expok == 0)
--	    jump_to_top_level (DISCARD);
-+	    {
-+	      top_level_cleanup ();
-+	      jump_to_top_level (DISCARD);
-+	    }
- 	}
-       rval = evalexp (value, &expok);
-       if (expok == 0)
--	jump_to_top_level (DISCARD);
-+	{
-+	  top_level_cleanup ();
-+	  jump_to_top_level (DISCARD);
-+	}
-       if (flags & ASS_APPEND)
- 	rval += lval;
-       retval = itos (rval);
-diff -Naur bash-3.2.orig/version.c bash-3.2/version.c
---- bash-3.2.orig/version.c	2005-05-16 11:58:34.000000000 -0400
-+++ bash-3.2/version.c	2008-06-18 06:46:33.000000000 -0400
-@@ -43,6 +43,9 @@
- #endif
- const char *sccs_version = SCCSVERSION;
- 
-+/* If == 31, shell compatible with bash-3.1, == 32 with bash-3.2, and so on */
-+int shell_compatibility_level = 32;
-+
- /* Functions for getting, setting, and displaying the shell version. */
- 
- /* Forward declarations so we don't have to include externs.h */
-@@ -79,5 +82,5 @@
- {
-   printf ("GNU bash, version %s (%s)\n", shell_version_string (), MACHTYPE);
-   if (extended)
--    printf (_("Copyright (C) 2005 Free Software Foundation, Inc.\n"));
-+    printf (_("Copyright (C) 2007 Free Software Foundation, Inc.\n"));
- }
Index: tches/bin86-0.16.17-x86_64-1.patch
===================================================================
--- patches/bin86-0.16.17-x86_64-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,44 +1,0 @@
-Submitted By: Ken Moffat <ken@kenmoffat.uklinux.net>
-Date: 2005-06-28
-Initial Package Version: 0.16.14
-Upstream Status: Submitted Upstream
-Origin: from ROCK Linux
-Description: Allows bin86 to compile on x86_64, which permits lilo to
- be used in a 64-bit system.  I'm dubious about ROCK's attempts to
- automatically add dual-licensing to all their patches, but bin86 is
- already GPL'd.  I've heard from the maintainer that this will be
- included in the next upload.
-
-
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/x86/bin86/x86_64.patch
-# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-diff -urN bin86-0.16.14-orig/ld/x86_aout.h bin86-0.16.14/ld/x86_aout.h
---- bin86-0.16.14-orig/ld/x86_aout.h	2004-11-07 20:07:31.506442000 +0100
-+++ bin86-0.16.14/ld/x86_aout.h	2004-11-07 20:07:41.106982496 +0100
-@@ -12,6 +12,9 @@
- #if defined(i386) || defined(__BCC__) || defined(MSDOS)
- typedef long Long;
- #define __OUT_OK 1
-+#elif defined(__x86_64__)
-+typedef int Long;
-+#define __OUT_OK 1
- #else
- typedef char Long[4];
- #endif
Index: patches/binutils-2.14-genscripts-multilib.patch
===================================================================
--- patches/binutils-2.14-genscripts-multilib.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/binutils-2.14-genscripts-multilib.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,115 @@
+diff -uNr binutils-2.14-orig/ld/genscripts.sh binutils-2.14/ld/genscripts.sh
+--- binutils-2.14-orig/ld/genscripts.sh	2003-02-08 01:21:03.000000000 +1100
++++ binutils-2.14/ld/genscripts.sh	2004-05-19 12:40:51.000000000 +1000
+@@ -50,8 +50,13 @@
+     if [ "x${host}" = "x${target}" ] ; then
+       NATIVE=yes
+       USE_LIBPATH=yes
++      skip_libdir=no
+     elif [ "x${use_sysroot}" = "xyes" ] ; then
+       USE_LIBPATH=yes
++      skip_libdir=no
++    elif [ "x${LIB_PATH}" != "x" ] ; then
++      USE_LIBPATH=yes
++      skip_libdir=yes
+     fi
+     ;;
+ esac
+@@ -72,13 +77,29 @@
+ #
+ # If the emulparams file set LIBPATH_SUFFIX, prepend an extra copy of
+ # the library path with the suffix applied.
++if [ "x${USE_LIBPATH}" = xyes ] ; then
++  LIB_PATH2=
++  if [ "x${LIB_PATH}" = "x" ] ; then
++    libs="${NATIVE_LIB_DIRS}"
++  else
++    libs=`echo ${LIB_PATH} | sed 's/:/ /g'`
++    LIB_PATH=
++  fi
+ 
+-if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then
+-  if [ x"$use_sysroot" != xyes ] ; then
+-    LIB_PATH=${libdir}
++  if [ "x${use_sysroot}" != "xyes" ] ; then
++    if [ "x${skip_libdir}" != "xyes" ] ; then
++      case " ${libs} " in
++        *" ${libdir} "*) ;;
++        *) libs="${libdir} ${libs}" ;;
++      esac
++    fi
++    case " ${libs} " in
++      *" ${tool_lib} "*) ;;
++      *) libs="${tool_lib} ${libs}" ;;
++    esac
+   fi
+-  LIB_PATH2=""
+-  for lib in ${NATIVE_LIB_DIRS}; do
++
++  for lib in ${libs}; do
+     # The "=" is harmless if we aren't using a sysroot, but also needless.
+     if [ "x${use_sysroot}" = "xyes" ] ; then
+       lib="=${lib}"
+@@ -91,34 +112,51 @@
+     esac
+     if test -n "$addsuffix"; then
+       case :${LIB_PATH}: in
+-	*:${lib}${LIBPATH_SUFFIX}:*) ;;
+-	::) LIB_PATH=${lib}${LIBPATH_SUFFIX} ;;
+-	*) LIB_PATH=${LIB_PATH}:${lib}${LIBPATH_SUFFIX} ;;
++        *:${lib}${LIBPATH_SUFFIX}:*) ;;
++        ::) LIB_PATH=${lib}${LIBPATH_SUFFIX} ;;
++        *) LIB_PATH=${LIB_PATH}:${lib}${LIBPATH_SUFFIX} ;;
+       esac
+-      case :${LIB_PATH}${LIB_PATH2}: in
+-	*:${lib}:*) ;;
++      case :${LIB_PATH}:${LIB_PATH2}: in
++        *:${lib}:*) ;;
++        *::) LIB_PATH2=${lib} ;;
+         *) LIB_PATH2=${LIB_PATH2}:${lib} ;;
+       esac
+     else
+-      case :${LIB_PATH}: in
++      case :${LIB_PATH2}: in
+         *:${lib}:*) ;;
+-        ::) LIB_PATH=${lib} ;;
+-        *) LIB_PATH=${LIB_PATH}:${lib} ;;
++        ::) LIB_PATH2=${lib} ;;
++        *) LIB_PATH2=${LIB_PATH2}:${lib} ;;
+       esac
+     fi
+   done
+-  LIB_PATH=${LIB_PATH}${LIB_PATH2}
+-fi
+ 
++  case :${LIB_PATH}:${LIB_PATH2}: in
++    *:: | ::*) LIB_PATH=${LIB_PATH}${LIB_PATH2} ;;
++    *) LIB_PATH=${LIB_PATH}:${LIB_PATH2} ;;
++  esac
++fi
+ 
+ # Always search $(tooldir)/lib, aka /usr/local/TARGET/lib, except for
+ # sysrooted configurations.
+ if [ "x${use_sysroot}" != "xyes" ] ; then
+-  LIB_PATH=${tool_lib}:${LIB_PATH}
++  case :${LIB_PATH}: in
++  ::: | *:${tool_lib}:*) ;;
++  ::) LIB_PATH=${tool_lib} ;;
++  *) LIB_PATH=${tool_lib}:${LIB_PATH} ;;
++  esac
+ fi
+ 
+ LIB_SEARCH_DIRS=`echo ${LIB_PATH} | sed -e 's/:/ /g' -e 's/\([^ ][^ ]*\)/SEARCH_DIR(\\"\1\\");/g'`
+ 
++# We need it for testsuite.
++case " $EMULATION_LIBPATH " in
++  *" ${EMULATION_NAME} "*)
++    test -d tmpdir || mkdir tmpdir
++    test -f tmpdir/libpath.exp || \
++    echo "set libpath \"${LIB_PATH}\"" | sed -e 's/:/ /g' > tmpdir/libpath.exp
++    ;;
++esac
++
+ # Generate 5 or 6 script files from a master script template in
+ # ${srcdir}/scripttempl/${SCRIPT_NAME}.sh.  Which one of the 5 or 6
+ # script files is actually used depends on command line options given
Index: patches/binutils-2.14.90.0.8-genscripts-multilib.patch
===================================================================
--- patches/binutils-2.14.90.0.8-genscripts-multilib.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/binutils-2.14.90.0.8-genscripts-multilib.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,67 @@
+diff -uNr binutils-2.14.90.0.8-ORIG/ld/genscripts.sh binutils-2.14.90.0.8/ld/genscripts.sh
+--- binutils-2.14.90.0.8-ORIG/ld/genscripts.sh	2004-01-15 08:07:52.000000000 +1100
++++ binutils-2.14.90.0.8/ld/genscripts.sh	2004-03-29 13:04:52.000000000 +1000
+@@ -103,8 +103,13 @@
+     if [ "x${host}" = "x${target}" ] ; then
+       NATIVE=yes
+       USE_LIBPATH=yes
++      skip_libdir=no
+     elif [ "x${use_sysroot}" = "xyes" ] ; then
+       USE_LIBPATH=yes
++      skip_libdir=no
++    elif [ "x${LIB_PATH}" != "x" ] ; then
++      USE_LIBPATH=yes
++      skip_libdir=yes
+     fi
+     ;;
+ esac
+@@ -125,13 +130,29 @@
+ #
+ # If the emulparams file set LIBPATH_SUFFIX, prepend an extra copy of
+ # the library path with the suffix applied.
+-
+-if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then
++if [ "x${USE_LIBPATH}" = xyes ] ; then
+   LIB_PATH2=
+-  if [ x"$use_sysroot" != xyes ] ; then
+-    LIB_PATH2=${libdir}
++  if [ "x${LIB_PATH}" = "x" ] ; then 
++    libs="${NATIVE_LIB_DIRS}"
++  else
++    libs=`echo ${LIB_PATH} | sed 's/:/ /g'`
++    LIB_PATH=
++  fi
++
++  if [ "x${use_sysroot}" != "xyes" ] ; then
++    if [ "x${skip_libdir}" != "xyes" ] ; then
++      case " ${libs} " in
++        *" ${libdir} "*) ;;
++        *) libs="${libdir} ${libs}" ;;
++      esac
++    fi
++    case " ${libs} " in
++      *" ${tool_lib} "*) ;;
++      *) libs="${tool_lib} ${libs}" ;;
++    esac
+   fi
+-  for lib in ${NATIVE_LIB_DIRS}; do
++
++  for lib in ${libs}; do
+     # The "=" is harmless if we aren't using a sysroot, but also needless.
+     if [ "x${use_sysroot}" = "xyes" ] ; then
+       lib="=${lib}"
+@@ -161,13 +182,13 @@
+       esac
+     fi
+   done
++
+   case :${LIB_PATH}:${LIB_PATH2}: in
+     *:: | ::*) LIB_PATH=${LIB_PATH}${LIB_PATH2} ;;
+     *) LIB_PATH=${LIB_PATH}:${LIB_PATH2} ;;
+   esac
+ fi
+ 
+-
+ # Always search $(tooldir)/lib, aka /usr/local/TARGET/lib, except for
+ # sysrooted configurations and when LIBPATH=":".
+ if [ "x${use_sysroot}" != "xyes" ] ; then
Index: patches/binutils-2.15.90.0.1-genscripts-multilib.patch
===================================================================
--- patches/binutils-2.15.90.0.1-genscripts-multilib.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/binutils-2.15.90.0.1-genscripts-multilib.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,47 @@
+diff -uNr binutils-2.15.90.0.1-ORIG/ld/genscripts.sh binutils-2.15.90.0.1/ld/genscripts.sh
+--- binutils-2.15.90.0.1-ORIG/ld/genscripts.sh	2004-03-04 07:24:34.000000000 +1100
++++ binutils-2.15.90.0.1/ld/genscripts.sh	2004-03-21 17:30:10.000000000 +1100
+@@ -103,8 +103,13 @@
+     if [ "x${host}" = "x${target}" ] ; then
+       NATIVE=yes
+       USE_LIBPATH=yes
++      skip_libdir=no
+     elif [ "x${use_sysroot}" = "xyes" ] ; then
+       USE_LIBPATH=yes
++      skip_libdir=no
++    elif [ "x${LIB_PATH}" != "x" ] ; then
++      USE_LIBPATH=yes
++      skip_libdir=yes
+     fi
+     ;;
+ esac
+@@ -125,16 +130,22 @@
+ #
+ # If the emulparams file set LIBPATH_SUFFIX, prepend an extra copy of
+ # the library path with the suffix applied.
+-
+-if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then
++if [ "x${USE_LIBPATH}" = xyes ] ; then
+   LIB_PATH2=
++  if [ "x${LIB_PATH}" = "x" ] ; then 
++    libs="${NATIVE_LIB_DIRS}"
++  else
++    libs=`echo ${LIB_PATH} | sed 's/:/ /g'`
++    LIB_PATH=
++  fi
+ 
+-  libs=${NATIVE_LIB_DIRS}
+   if [ "x${use_sysroot}" != "xyes" ] ; then
+-    case " ${libs} " in
+-      *" ${libdir} "*) ;;
+-      *) libs="${libdir} ${libs}" ;;
+-    esac
++    if [ "x${skip_libdir}" != "xyes" ] ; then
++      case " ${libs} " in
++        *" ${libdir} "*) ;;
++        *) libs="${libdir} ${libs}" ;;
++      esac
++    fi
+     case " ${libs} " in
+       *" ${tool_lib} "*) ;;
+       *) libs="${tool_lib} ${libs}" ;;
Index: patches/binutils-2.15.91.0.1-genscripts-multilib-2.patch
===================================================================
--- patches/binutils-2.15.91.0.1-genscripts-multilib-2.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/binutils-2.15.91.0.1-genscripts-multilib-2.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,65 @@
+Submitted By: Ryan Oliver (ryan dot oliver at pha dot com dot au)
+Origin: Ryan Oliver
+Date: 2005-04-03
+Initial package version: 2.15 (problem also exists in 2.14 series)
+Description:
+        Updated patch, use this for all binutils 2.15 series instead of the
+        binutils-2.15.90.0.1-genscripts-multilib.patch
+
+        If --with-libpath= was specified during configure (or LIB_PATH was
+        supplied during make) we want to have these libraries added to the
+        linker scripts search paths, and in the case of multi-lib have them
+        processed to provide both lib and lib64 search paths.
+        This patch produces this behaviour when building a cross-binutils.
+
+        Also to fix an annoyance we remove whatever was specified (if anything)
+        by --libdir= from the linker script search path. This is so when cross-
+        compiling a 64bit target-native biarch toolchain we can specify the
+        installation directory for binutils produced libraries to be */lib64
+        without having this directory added to the 32bit emulation search path.
+
+        By rights we should really check if ${libdir} matches a search path in
+        any of the supported emulations for this target (as opposed to only the
+        one genscripts.sh is currently processing) and if so ignore ${libpath}.
+
+	This patch differs from the preceding genscripts-multilib patch as now
+	USE_LIBPATH will always be set if LIB_PATH is non empty
+
+diff -uNr binutils-2.15.91.0.1-orig/ld/genscripts.sh binutils-2.15.91.0.1/ld/genscripts.sh
+--- binutils-2.15.91.0.1-orig/ld/genscripts.sh	2004-05-28 04:26:04.000000000 +1000
++++ binutils-2.15.91.0.1/ld/genscripts.sh	2005-04-03 16:14:51.000000000 +1000
+@@ -110,7 +110,8 @@
+ esac
+ 
+ # If the emulparams file sets NATIVE, make sure USE_LIBPATH is set also.
+-if test "x$NATIVE" = "xyes" ; then
++# Also set USE_LIBPATH if LIB_PATH has been set
++if [ "x$NATIVE" = "xyes" -o "x${LIB_PATH}" != "x" ] ; then
+   USE_LIBPATH=yes
+ fi
+ 
+@@ -125,17 +126,17 @@
+ #
+ # If the emulparams file set LIBPATH_SUFFIX, prepend an extra copy of
+ # the library path with the suffix applied.
+-
+-if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then
++if [ "x${USE_LIBPATH}" = xyes ] ; then
+   LIB_PATH2=
++  if [ "x${LIB_PATH}" = "x" ] ; then 
++    libs="${NATIVE_LIB_DIRS}"
++  else
++    libs=`echo ${LIB_PATH} | sed 's/:/ /g'`
++    LIB_PATH=
++  fi
+ 
+-  libs=${NATIVE_LIB_DIRS}
+   if [ "x${use_sysroot}" != "xyes" ] ; then
+     case " ${libs} " in
+-      *" ${libdir} "*) ;;
+-      *) libs="${libdir} ${libs}" ;;
+-    esac
+-    case " ${libs} " in
+       *" ${tool_lib} "*) ;;
+       *) libs="${tool_lib} ${libs}" ;;
+     esac
Index: patches/binutils-2.15.91.0.1-genscripts-multilib.patch
===================================================================
--- patches/binutils-2.15.91.0.1-genscripts-multilib.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/binutils-2.15.91.0.1-genscripts-multilib.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,60 @@
+Submitted By: Ryan Oliver (ryan dot oliver at pha dot com dot au)
+Origin: Ryan Oliver
+Date: 2004-07-15
+Initial package version: 2.15 (problem also exists in 2.14 series)
+Description:
+	Updated patch, use this for all binutils 2.15 series instead of the
+	binutils-2.15.90.0.1-genscripts-multilib.patch
+
+	If --with-libpath= was specified during configure (or LIB_PATH was 
+	supplied during make) we want to have these libraries added to the
+	linker scripts search paths, and in the case of multi-lib have them
+	processed to provide both lib and lib64 search paths.
+	This patch produces this behaviour when building a cross-binutils.
+
+	Also to fix an annoyance we remove whatever was specified (if anything)
+	by --libdir= from the linker script search path. This is so when cross-
+	compiling a 64bit target-native biarch toolchain we can specify the
+	installation directory for binutils produced libraries to be */lib64
+	without having this directory added to the 32bit emulation search path.
+
+	By rights we should really check if ${libdir} matches a search path in
+	any of the supported emulations for this target (as opposed to only the
+	one genscripts.sh is currently processing) and if so ignore ${libpath}.
+
+--- binutils-2.15.91.0.1-ORIG/ld/genscripts.sh	2004-05-28 04:26:04.000000000 +1000
++++ binutils-2.15.91.0.1/ld/genscripts.sh	2004-07-15 00:09:16.000000000 +1000
+@@ -105,6 +105,8 @@
+       USE_LIBPATH=yes
+     elif [ "x${use_sysroot}" = "xyes" ] ; then
+       USE_LIBPATH=yes
++    elif [ "x${LIB_PATH}" != "x" ] ; then
++      USE_LIBPATH=yes
+     fi
+     ;;
+ esac
+@@ -125,17 +127,17 @@
+ #
+ # If the emulparams file set LIBPATH_SUFFIX, prepend an extra copy of
+ # the library path with the suffix applied.
+-
+-if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then
++if [ "x${USE_LIBPATH}" = xyes ] ; then
+   LIB_PATH2=
++  if [ "x${LIB_PATH}" = "x" ] ; then 
++    libs="${NATIVE_LIB_DIRS}"
++  else
++    libs=`echo ${LIB_PATH} | sed 's/:/ /g'`
++    LIB_PATH=
++  fi
+ 
+-  libs=${NATIVE_LIB_DIRS}
+   if [ "x${use_sysroot}" != "xyes" ] ; then
+     case " ${libs} " in
+-      *" ${libdir} "*) ;;
+-      *) libs="${libdir} ${libs}" ;;
+-    esac
+-    case " ${libs} " in
+       *" ${tool_lib} "*) ;;
+       *) libs="${tool_lib} ${libs}" ;;
+     esac
Index: patches/binutils-2.15.91.0.1-genscripts-multilib_use_libpath.patch
===================================================================
--- patches/binutils-2.15.91.0.1-genscripts-multilib_use_libpath.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/binutils-2.15.91.0.1-genscripts-multilib_use_libpath.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,30 @@
+--- binutils-2.15.91.0.1-ORIG/ld/genscripts.sh	2004-05-28 04:26:04.000000000 +1000
++++ binutils-2.15.91.0.1/ld/genscripts.sh	2004-07-14 23:54:02.000000000 +1000
+@@ -105,6 +105,8 @@
+       USE_LIBPATH=yes
+     elif [ "x${use_sysroot}" = "xyes" ] ; then
+       USE_LIBPATH=yes
++    elif [ "x${LIB_PATH}" != "x" ] ; then
++      USE_LIBPATH=yes
+     fi
+     ;;
+ esac
+@@ -125,11 +127,15 @@
+ #
+ # If the emulparams file set LIBPATH_SUFFIX, prepend an extra copy of
+ # the library path with the suffix applied.
+-
+-if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then
++if [ "x${USE_LIBPATH}" = xyes ] ; then
+   LIB_PATH2=
++  if [ "x${LIB_PATH}" = "x" ] ; then 
++    libs="${NATIVE_LIB_DIRS}"
++  else
++    libs=`echo ${LIB_PATH} | sed 's/:/ /g'`
++    LIB_PATH=
++  fi
+ 
+-  libs=${NATIVE_LIB_DIRS}
+   if [ "x${use_sysroot}" != "xyes" ] ; then
+     case " ${libs} " in
+       *" ${libdir} "*) ;;
Index: patches/binutils-2.15.91.0.1-genscripts-no_libdir.patch
===================================================================
--- patches/binutils-2.15.91.0.1-genscripts-no_libdir.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/binutils-2.15.91.0.1-genscripts-no_libdir.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,13 @@
+--- binutils-2.15.91.0.1-ORIG/ld/genscripts.sh	2004-05-28 04:26:04.000000000 +1000
++++ binutils-2.15.91.0.1/ld/genscripts.sh	2004-07-14 23:52:12.000000000 +1000
+@@ -132,10 +132,6 @@
+   libs=${NATIVE_LIB_DIRS}
+   if [ "x${use_sysroot}" != "xyes" ] ; then
+     case " ${libs} " in
+-      *" ${libdir} "*) ;;
+-      *) libs="${libdir} ${libs}" ;;
+-    esac
+-    case " ${libs} " in
+       *" ${tool_lib} "*) ;;
+       *) libs="${tool_lib} ${libs}" ;;
+     esac
Index: patches/binutils-2.15.94.0.1-fix_strip-1.patch
===================================================================
--- patches/binutils-2.15.94.0.1-fix_strip-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/binutils-2.15.94.0.1-fix_strip-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,20 @@
+Submitted By: Jeremy Utley <jeremy@linuxfromscratch.org>
+Initial Package Version: 2.15.94.0.1
+Upstream Status: From Upstream
+Origin: ML Post by HJ Lu - http://sources.redhat.com/ml/binutils/2004-11/msg00332.html
+Description: With this version of binutils, TLS information is lost when
+stripping libc.a.  This patch fixes the problem.  Binutils bugzilla id 574.
+
+diff -Naur binutils-2.15.94.0.1/bfd/elfcode.h binutils-2.15.94.0.1-new/bfd/elfcode.h
+--- binutils-2.15.94.0.1/bfd/elfcode.h	2004-11-22 20:33:31.000000000 +0000
++++ binutils-2.15.94.0.1-new/bfd/elfcode.h	2004-12-04 20:27:06.800747251 +0000
+@@ -1158,6 +1158,9 @@
+ 	    case STT_OBJECT:
+ 	      sym->symbol.flags |= BSF_OBJECT;
+ 	      break;
++	    case STT_TLS:
++	      sym->symbol.flags |= BSF_THREAD_LOCAL;
++	      break;
+ 	    }
+ 
+ 	  if (dynamic)
Index: tches/binutils-2.18-branch_update-3.patch
===================================================================
--- patches/binutils-2.18-branch_update-3.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,17301 +1,0 @@
-Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
-Date: 12-21-2007
-Initial Package Version: 2.18
-Origin: Upstream
-Upstream Status: Applied
-Description: This is a branch update for binutils-2.18, and should be
-             rechecked periodically.
-
-diff -Naur binutils-2.18.orig/bfd/ChangeLog binutils-2.18/bfd/ChangeLog
---- binutils-2.18.orig/bfd/ChangeLog	2007-08-28 16:20:54.000000000 -0400
-+++ binutils-2.18/bfd/ChangeLog	2007-12-13 08:49:33.000000000 -0500
-@@ -1,3 +1,50 @@
-+2007-12-13  Matthias Klose  <doko@ubuntu.com>
-+
-+	* configure.in: Bump version to 2.18.0
-+	* configure: Regenerate.
-+
-+2007-11-29  Nick Clifton  <nickc@redhat.com>
-+
-+	PR ld/5398
-+	* elf32-arm.c (bfd_elf32_arm_process_before_allocation): Do not
-+	complain if there is no glue bfd, just return.
-+
-+2007-10-27  Daniel Jacobowitz  <dan@codesourcery.com>
-+
-+	* elfxx-mips.c (mips_elf_sort_hash_table_f): Handle forced
-+	local symbols specially.
-+	(mips_elf_set_global_got_offset): Skip forced local symbols.
-+
-+2007-10-25  Joseph Myers  <joseph@codesourcery.com>
-+
-+	* elfxx-mips.c (_bfd_mips_elf_modify_segment_map): Do not add
-+	PT_NULL header when not linking.
-+
-+2007-10-25  Daniel Jacobowitz  <dan@codesourcery.com>
-+
-+	* elf.c (assign_file_positions_for_load_sections): Trust
-+	p_align_valid.
-+	(copy_elf_program_header): Copy PT_NULL segments.
-+
-+2007-09-14  Alan Modra  <amodra@bigpond.net.au>
-+
-+	* opncls.c (find_separate_debug_file): Ensure bfd_set_error has
-+	been called on all error return paths.
-+	(bfd_fill_in_gnu_debuglink_section): Use bfd_malloc, not malloc.
-+	Clear padding after filename
-+
-+2007-09-14  Alan Modra  <amodra@bigpond.net.au>
-+
-+	* format.c (bfd_check_format_matches): Record matching targets even
-+	when "matching" is NULL to allow bfd_associated_vector matches.
-+	Consolidate error return code.  Consolidate ok return code.  Always
-+	restore original target and format on error.
-+
-+2007-08-28  Daniel Jacobowitz  <dan@codesourcery.com>
-+
-+	* Makefile.am (RELEASE): Unset.
-+	* Makefile.in: Regenerated.
-+
- 2007-08-28  Daniel Jacobowitz  <dan@codesourcery.com>
- 
- 	* configure.in (VERSION): Update.
-diff -Naur binutils-2.18.orig/bfd/configure binutils-2.18/bfd/configure
---- binutils-2.18.orig/bfd/configure	2007-08-28 16:19:51.000000000 -0400
-+++ binutils-2.18/bfd/configure	2007-12-13 08:49:34.000000000 -0500
-@@ -2994,7 +2994,7 @@
- 
- # Define the identity of the package.
-  PACKAGE=bfd
-- VERSION=2.18
-+ VERSION=2.18.0
- 
- 
- cat >>confdefs.h <<_ACEOF
-diff -Naur binutils-2.18.orig/bfd/configure.in binutils-2.18/bfd/configure.in
---- binutils-2.18.orig/bfd/configure.in	2007-08-28 16:19:56.000000000 -0400
-+++ binutils-2.18/bfd/configure.in	2007-12-13 08:49:36.000000000 -0500
-@@ -8,7 +8,7 @@
- AC_CANONICAL_TARGET
- AC_ISC_POSIX
- 
--AM_INIT_AUTOMAKE(bfd, 2.18)
-+AM_INIT_AUTOMAKE(bfd, 2.18.0)
- 
- dnl These must be called before AM_PROG_LIBTOOL, because it may want
- dnl to call AC_CHECK_PROG.
-diff -Naur binutils-2.18.orig/bfd/elf.c binutils-2.18/bfd/elf.c
---- binutils-2.18.orig/bfd/elf.c	2007-08-28 13:19:33.000000000 -0400
-+++ binutils-2.18/bfd/elf.c	2007-10-25 11:31:26.000000000 -0400
-@@ -4082,10 +4082,10 @@
- 
- 	  p->p_align = maxpagesize;
- 	}
--      else if (m->count == 0)
--	p->p_align = 1 << bed->s->log_file_align;
-       else if (m->p_align_valid)
- 	p->p_align = m->p_align;
-+      else if (m->count == 0)
-+	p->p_align = 1 << bed->s->log_file_align;
-       else
- 	p->p_align = 0;
- 
-@@ -5563,10 +5563,6 @@
-       asection *first_section = NULL;
-       asection *lowest_section = NULL;
- 
--      /* FIXME: Do we need to copy PT_NULL segment?  */
--      if (segment->p_type == PT_NULL)
--	continue;
--
-       /* Compute how many sections are in this segment.  */
-       for (section = ibfd->sections, section_count = 0;
- 	   section != NULL;
-diff -Naur binutils-2.18.orig/bfd/elf32-arm.c binutils-2.18/bfd/elf32-arm.c
---- binutils-2.18.orig/bfd/elf32-arm.c	2007-08-06 15:59:23.000000000 -0400
-+++ binutils-2.18/bfd/elf32-arm.c	2007-11-29 03:17:54.000000000 -0500
-@@ -3114,13 +3114,13 @@
-   if (link_info->relocatable)
-     return TRUE;
- 
--  /* Here we have a bfd that is to be included on the link.  We have a hook
--     to do reloc rummaging, before section sizes are nailed down.  */
-+  /* Here we have a bfd that is to be included on the link.  We have a
-+     hook to do reloc rummaging, before section sizes are nailed down.  */
-   globals = elf32_arm_hash_table (link_info);
--  check_use_blx (globals);
- 
-   BFD_ASSERT (globals != NULL);
--  BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
-+
-+  check_use_blx (globals);
- 
-   if (globals->byteswap_code && !bfd_big_endian (abfd))
-     {
-@@ -3129,6 +3129,12 @@
-       return FALSE;
-     }
- 
-+  /* PR 5398: If we have not decided to include any loadable sections in
-+     the output then we will not have a glue owner bfd.  This is OK, it
-+     just means that there is nothing else for us to do here.  */
-+  if (globals->bfd_of_glue_owner == NULL)
-+    return TRUE;
-+
-   /* Rummage around all the relocs and map the glue vectors.  */
-   sec = abfd->sections;
- 
-diff -Naur binutils-2.18.orig/bfd/elfxx-mips.c binutils-2.18/bfd/elfxx-mips.c
---- binutils-2.18.orig/bfd/elfxx-mips.c	2007-08-24 10:01:08.000000000 -0400
-+++ binutils-2.18/bfd/elfxx-mips.c	2007-10-26 13:58:52.000000000 -0400
-@@ -2797,7 +2797,8 @@
-   /* Global symbols that need GOT entries that are not explicitly
-      referenced are marked with got offset 2.  Those that are
-      referenced get a 1, and those that don't need GOT entries get
--     -1.  */
-+     -1.  Forced local symbols may also be marked with got offset 1,
-+     but are never given global GOT entries.  */
-   if (h->root.got.offset == 2)
-     {
-       BFD_ASSERT (h->tls_type == GOT_NORMAL);
-@@ -2806,7 +2807,7 @@
- 	hsd->low = (struct elf_link_hash_entry *) h;
-       h->root.dynindx = hsd->max_unref_got_dynindx++;
-     }
--  else if (h->root.got.offset != 1)
-+  else if (h->root.got.offset != 1 || h->forced_local)
-     h->root.dynindx = hsd->max_non_got_dynindx++;
-   else
-     {
-@@ -3269,6 +3270,7 @@
- 
-   if (entry->abfd != NULL && entry->symndx == -1
-       && entry->d.h->root.dynindx != -1
-+      && !entry->d.h->forced_local
-       && entry->d.h->tls_type == GOT_NORMAL)
-     {
-       if (g)
-@@ -9325,7 +9327,7 @@
- 
- bfd_boolean
- _bfd_mips_elf_modify_segment_map (bfd *abfd,
--				  struct bfd_link_info *info ATTRIBUTE_UNUSED)
-+				  struct bfd_link_info *info)
- {
-   asection *s;
-   struct elf_segment_map *m, **pm;
-@@ -9550,8 +9552,12 @@
-      header instead, and avoid the need to move any sections.
-      There is a long tradition of allocating spare dynamic tags,
-      so allocating a spare program header seems like a natural
--     extension.  */
--  if (!SGI_COMPAT (abfd)
-+     extension.
-+
-+     If INFO is NULL, we may be copying an already prelinked binary
-+     with objcopy or strip, so do not add this header.  */
-+  if (info != NULL
-+      && !SGI_COMPAT (abfd)
-       && bfd_get_section_by_name (abfd, ".dynamic"))
-     {
-       for (pm = &elf_tdata (abfd)->segment_map; *pm != NULL; pm = &(*pm)->next)
-diff -Naur binutils-2.18.orig/bfd/format.c binutils-2.18/bfd/format.c
---- binutils-2.18.orig/bfd/format.c	2007-08-06 15:59:36.000000000 -0400
-+++ binutils-2.18/bfd/format.c	2007-10-12 10:09:21.000000000 -0400
-@@ -125,6 +125,9 @@
-   int match_count;
-   int ar_match_index;
- 
-+  if (matching != NULL)
-+    *matching = NULL;
-+
-   if (!bfd_read_p (abfd)
-       || (unsigned int) abfd->format >= (unsigned int) bfd_type_end)
-     {
-@@ -141,11 +144,10 @@
-   match_count = 0;
-   ar_match_index = _bfd_target_vector_entries;
- 
--  if (matching)
-+  if (matching != NULL || *bfd_associated_vector != NULL)
-     {
-       bfd_size_type amt;
- 
--      *matching = NULL;
-       amt = sizeof (*matching_vector) * 2 * _bfd_target_vector_entries;
-       matching_vector = bfd_malloc (amt);
-       if (!matching_vector)
-@@ -162,31 +164,12 @@
-   if (!abfd->target_defaulted)
-     {
-       if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)	/* rewind! */
--	{
--	  if (matching)
--	    free (matching_vector);
--	  return FALSE;
--	}
-+	goto err_ret;
- 
-       right_targ = BFD_SEND_FMT (abfd, _bfd_check_format, (abfd));
- 
-       if (right_targ)
--	{
--	  abfd->xvec = right_targ;	/* Set the target as returned.  */
--
--	  if (matching)
--	    free (matching_vector);
--
--	  /* If the file was opened for update, then `output_has_begun'
--	     some time ago when the file was created.  Do not recompute
--	     sections sizes or alignments in _bfd_set_section_contents.
--	     We can not set this flag until after checking the format,
--	     because it will interfere with creation of BFD sections.  */
--	  if (abfd->direction == both_direction)
--	    abfd->output_has_begun = TRUE;
--
--	  return TRUE;			/* File position has moved, BTW.  */
--	}
-+	goto ok_ret;
- 
-       /* For a long time the code has dropped through to check all
- 	 targets if the specified target was wrong.  I don't know why,
-@@ -201,17 +184,7 @@
- 	 this sort, I changed this test to check only for the binary
- 	 target.  */
-       if (format == bfd_archive && save_targ == &binary_vec)
--	{
--	  abfd->xvec = save_targ;
--	  abfd->format = bfd_unknown;
--
--	  if (matching)
--	    free (matching_vector);
--
--	  bfd_set_error (bfd_error_file_not_recognized);
--
--	  return FALSE;
--	}
-+	goto err_unrecog;
-     }
- 
-   for (target = bfd_target_vector; *target != NULL; target++)
-@@ -227,11 +200,7 @@
-       abfd->xvec = *target;	/* Change BFD's target temporarily.  */
- 
-       if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
--	{
--	  if (matching)
--	    free (matching_vector);
--	  return FALSE;
--	}
-+	goto err_ret;
- 
-       /* If _bfd_check_format neglects to set bfd_error, assume
- 	 bfd_error_wrong_format.  We didn't used to even pay any
-@@ -255,9 +224,8 @@
- 	      break;
- 	    }
- 
--	  if (matching)
-+	  if (matching_vector)
- 	    matching_vector[match_count] = temp;
--
- 	  match_count++;
- 	}
-       else if ((err = bfd_get_error ()) == bfd_error_wrong_object_format
-@@ -268,20 +236,12 @@
- 	     no better matches.  */
- 	  if (ar_right_targ != bfd_default_vector[0])
- 	    ar_right_targ = *target;
--	  if (matching)
-+	  if (matching_vector)
- 	    matching_vector[ar_match_index] = *target;
- 	  ar_match_index++;
- 	}
-       else if (err != bfd_error_wrong_format)
--	{
--	  abfd->xvec = save_targ;
--	  abfd->format = bfd_unknown;
--
--	  if (matching)
--	    free (matching_vector);
--
--	  return FALSE;
--	}
-+	goto err_ret;
-     }
- 
-   if (match_count == 0)
-@@ -297,16 +257,14 @@
- 	{
- 	  match_count = ar_match_index - _bfd_target_vector_entries;
- 
--	  if (matching && match_count > 1)
-+	  if (matching_vector && match_count > 1)
- 	    memcpy (matching_vector,
- 		    matching_vector + _bfd_target_vector_entries,
- 		    sizeof (*matching_vector) * match_count);
- 	}
-     }
- 
--  if (match_count > 1
--      && bfd_associated_vector != NULL
--      && matching)
-+  if (match_count > 1)
-     {
-       const bfd_target * const *assoc = bfd_associated_vector;
- 
-@@ -328,11 +286,9 @@
- 
-   if (match_count == 1)
-     {
-+    ok_ret:
-       abfd->xvec = right_targ;		/* Change BFD's target permanently.  */
- 
--      if (matching)
--	free (matching_vector);
--
-       /* If the file was opened for update, then `output_has_begun'
- 	 some time ago when the file was created.  Do not recompute
- 	 sections sizes or alignments in _bfd_set_section_contents.
-@@ -341,37 +297,39 @@
-       if (abfd->direction == both_direction)
- 	abfd->output_has_begun = TRUE;
- 
-+      if (matching_vector)
-+	free (matching_vector);
-       return TRUE;			/* File position has moved, BTW.  */
-     }
- 
--  abfd->xvec = save_targ;		/* Restore original target type.  */
--  abfd->format = bfd_unknown;		/* Restore original format.  */
--
-   if (match_count == 0)
-     {
-+    err_unrecog:
-       bfd_set_error (bfd_error_file_not_recognized);
--
--      if (matching)
-+    err_ret:
-+      abfd->xvec = save_targ;
-+      abfd->format = bfd_unknown;
-+      if (matching_vector)
- 	free (matching_vector);
-+      return FALSE;
-     }
--  else
--    {
--      bfd_set_error (bfd_error_file_ambiguously_recognized);
- 
--      if (matching)
-+  abfd->xvec = save_targ;		/* Restore original target type.  */
-+  abfd->format = bfd_unknown;		/* Restore original format.  */
-+  bfd_set_error (bfd_error_file_ambiguously_recognized);
-+
-+  if (matching)
-+    {
-+      *matching = (char **) matching_vector;
-+      matching_vector[match_count] = NULL;
-+      /* Return target names.  This is a little nasty.  Maybe we
-+	 should do another bfd_malloc?  */
-+      while (--match_count >= 0)
- 	{
--	  *matching = (char **) matching_vector;
--	  matching_vector[match_count] = NULL;
--	  /* Return target names.  This is a little nasty.  Maybe we
--	     should do another bfd_malloc?  */
--	  while (--match_count >= 0)
--	    {
--	      const char *name = matching_vector[match_count]->name;
--	      *(const char **) &matching_vector[match_count] = name;
--	    }
-+	  const char *name = matching_vector[match_count]->name;
-+	  *(const char **) &matching_vector[match_count] = name;
- 	}
-     }
--
-   return FALSE;
- }
- 
-diff -Naur binutils-2.18.orig/bfd/opncls.c binutils-2.18/bfd/opncls.c
---- binutils-2.18.orig/bfd/opncls.c	2007-08-06 15:59:39.000000000 -0400
-+++ binutils-2.18/bfd/opncls.c	2007-10-12 10:10:28.000000000 -0400
-@@ -1216,46 +1216,48 @@
-   char *debugfile;
-   unsigned long crc32;
-   int i;
-+  size_t dirlen;
- 
-   BFD_ASSERT (abfd);
-   if (debug_file_directory == NULL)
-     debug_file_directory = ".";
- 
-   /* BFD may have been opened from a stream.  */
--  if (! abfd->filename)
--    return NULL;
-+  if (abfd->filename == NULL)
-+    {
-+      bfd_set_error (bfd_error_invalid_operation);
-+      return NULL;
-+    }
- 
-   basename = get_debug_link_info (abfd, & crc32);
-   if (basename == NULL)
-     return NULL;
- 
--  if (strlen (basename) < 1)
-+  if (basename[0] == '\0')
-     {
-       free (basename);
-+      bfd_set_error (bfd_error_no_debug_section);
-       return NULL;
-     }
- 
--  dir = strdup (abfd->filename);
-+  for (dirlen = strlen (abfd->filename); dirlen > 0; dirlen--)
-+    if (IS_DIR_SEPARATOR (abfd->filename[dirlen - 1]))
-+      break;
-+
-+  dir = bfd_malloc (dirlen + 1);
-   if (dir == NULL)
-     {
-       free (basename);
-       return NULL;
-     }
--  BFD_ASSERT (strlen (dir) != 0);
--
--  /* Strip off filename part.  */
--  for (i = strlen (dir) - 1; i >= 0; i--)
--    if (IS_DIR_SEPARATOR (dir[i]))
--      break;
-+  memcpy (dir, abfd->filename, dirlen);
-+  dir[dirlen] = '\0';
- 
--  dir[i + 1] = '\0';
--  BFD_ASSERT (dir[i] == '/' || dir[0] == '\0');
--
--  debugfile = malloc (strlen (debug_file_directory) + 1
--		      + strlen (dir)
--		      + strlen (".debug/")
--		      + strlen (basename)
--		      + 1);
-+  debugfile = bfd_malloc (strlen (debug_file_directory) + 1
-+			  + dirlen
-+			  + strlen (".debug/")
-+			  + strlen (basename)
-+			  + 1);
-   if (debugfile == NULL)
-     {
-       free (basename);
-@@ -1434,6 +1436,7 @@
-   FILE * handle;
-   static unsigned char buffer[8 * 1024];
-   size_t count;
-+  size_t filelen;
- 
-   if (abfd == NULL || sect == NULL || filename == NULL)
-     {
-@@ -1463,21 +1466,22 @@
-      now that we no longer need them.  */
-   filename = lbasename (filename);
- 
--  debuglink_size = strlen (filename) + 1;
-+  filelen = strlen (filename);
-+  debuglink_size = filelen + 1;
-   debuglink_size += 3;
-   debuglink_size &= ~3;
-   debuglink_size += 4;
- 
--  contents = malloc (debuglink_size);
-+  contents = bfd_malloc (debuglink_size);
-   if (contents == NULL)
-     {
-       /* XXX Should we delete the section from the bfd ?  */
--      bfd_set_error (bfd_error_no_memory);
-       return FALSE;
-     }
- 
--  strcpy (contents, filename);
-   crc_offset = debuglink_size - 4;
-+  memcpy (contents, filename, filelen);
-+  memset (contents + filelen, 0, crc_offset - filelen);
- 
-   bfd_put_32 (abfd, crc32, contents + crc_offset);
- 
-diff -Naur binutils-2.18.orig/bfd/version.h binutils-2.18/bfd/version.h
---- binutils-2.18.orig/bfd/version.h	2007-08-28 13:19:33.000000000 -0400
-+++ binutils-2.18/bfd/version.h	2007-12-19 18:00:17.000000000 -0500
-@@ -1,4 +1,4 @@
--#define BFD_VERSION_DATE 20070828
-+#define BFD_VERSION_DATE 20071220
- #define BFD_VERSION @bfd_version@
- #define BFD_VERSION_STRING  @bfd_version_package@ @bfd_version_string@
- #define REPORT_BUGS_TO @report_bugs_to@
-diff -Naur binutils-2.18.orig/config.sub binutils-2.18/config.sub
---- binutils-2.18.orig/config.sub	2007-08-06 16:00:30.000000000 -0400
-+++ binutils-2.18/config.sub	2007-08-29 04:58:58.000000000 -0400
-@@ -4,7 +4,7 @@
- #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
- #   Inc.
- 
--timestamp='2007-04-29'
-+timestamp='2007-08-29'
- 
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -479,6 +479,10 @@
- 		basic_machine=cr16c-unknown
- 		os=-elf
- 		;;
-+        cr16)
-+		basic_machine=cr16-unknown
-+		os=-elf
-+		;;
- 	crds | unos)
- 		basic_machine=m68k-crds
- 		;;
-diff -Naur binutils-2.18.orig/configure binutils-2.18/configure
---- binutils-2.18.orig/configure	2007-08-06 16:29:40.000000000 -0400
-+++ binutils-2.18/configure	2007-10-12 10:03:20.000000000 -0400
-@@ -6128,7 +6128,7 @@
-     # For an installed makeinfo, we require it to be from texinfo 4.4 or
-     # higher, else we use the "missing" dummy.
-     if ${MAKEINFO} --version \
--       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
-+       | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
-       :
-     else
-       MAKEINFO="$MISSING makeinfo"
-diff -Naur binutils-2.18.orig/configure.ac binutils-2.18/configure.ac
---- binutils-2.18.orig/configure.ac	2007-08-28 16:24:26.000000000 -0400
-+++ binutils-2.18/configure.ac	2007-10-12 10:03:20.000000000 -0400
-@@ -158,7 +158,7 @@
- # know that we are building the simulator.
- # binutils, gas and ld appear in that order because it makes sense to run
- # "make check" in that particular order.
--host_tools="byacc flex bison binutils gas ld fixincludes gcc sid sim gdb make patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils gettext zip fastjar gnattools"
-+host_tools="texinfo byacc flex bison binutils gas ld fixincludes gcc sid sim gdb make patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils gettext zip fastjar gnattools"
- 
- # libgcj represents the runtime libraries only used by gcj.
- libgcj="target-libffi \
-@@ -2403,7 +2403,7 @@
-     # For an installed makeinfo, we require it to be from texinfo 4.4 or
-     # higher, else we use the "missing" dummy.
-     if ${MAKEINFO} --version \
--       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then
-+       | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
-       :
-     else
-       MAKEINFO="$MISSING makeinfo"
-diff -Naur binutils-2.18.orig/gprof/ChangeLog binutils-2.18/gprof/ChangeLog
---- binutils-2.18.orig/gprof/ChangeLog	2007-08-24 10:04:53.000000000 -0400
-+++ binutils-2.18/gprof/ChangeLog	2007-08-30 09:31:50.000000000 -0400
-@@ -1,3 +1,7 @@
-+2007-08-30  Nick Clifton  <nickc@redhat.com>
-+
-+	* po/fi.po: Updated Finnish translation.
-+
- 2007-08-24  Daniel Jacobowitz  <dan@codesourcery.com>
- 
- 	* po/sv.po: Updated Swedish translation.
-diff -Naur binutils-2.18.orig/gprof/po/fi.po binutils-2.18/gprof/po/fi.po
---- binutils-2.18.orig/gprof/po/fi.po	2007-08-11 09:17:01.000000000 -0400
-+++ binutils-2.18/gprof/po/fi.po	2007-08-30 09:31:50.000000000 -0400
-@@ -8,7 +8,7 @@
- "Project-Id-Version: gprof 2.17.90\n"
- "Report-Msgid-Bugs-To: \n"
- "POT-Creation-Date: 2007-05-15 16:49+0930\n"
--"PO-Revision-Date: 2007-08-10 16:17+0300\n"
-+"PO-Revision-Date: 2007-08-29 20:12+0300\n"
- "Last-Translator: Jorma Karvonen <karvjorm@users.sf.net>\n"
- "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
- "MIME-Version: 1.0\n"
-@@ -23,17 +23,17 @@
- #: alpha.c:107 mips.c:59
- #, c-format
- msgid "[find_call] %s: 0x%lx to 0x%lx\n"
--msgstr "[find_call] %s: 0x%lx to 0x%lx\n"
-+msgstr "[etsi_kutsu] %s: 0x%lx arvoon 0x%lx\n"
- 
- #: alpha.c:129
- #, c-format
- msgid "[find_call] 0x%lx: jsr%s <indirect_child>\n"
--msgstr "[find_call] 0x%lx: jsr%s <indirect_child>\n"
-+msgstr "[etsi_kutsu] 0x%lx: jsr%s-kÃ€sky <epÃ€suora_lapsi>\n"
- 
- #: alpha.c:139
- #, c-format
- msgid "[find_call] 0x%lx: bsr"
--msgstr "[find_call] 0x%lx: bsr"
-+msgstr "[etsi_kutsu] 0x%lx: bsr-kÃ€sky"
- 
- #  ensimmÃ€inen %s whoami, toinen %s filename
- #: basic_blocks.c:128 call_graph.c:89 hist.c:105
-@@ -51,7 +51,7 @@
- #: basic_blocks.c:289 basic_blocks.c:299
- #, c-format
- msgid "%s:%d: (%s:0x%lx) %lu executions\n"
--msgstr "%s:%d: (%s:0x%lx) %lu suorituksia\n"
-+msgstr "%s:%d: (%s:0x%lx) %lu suoritusta\n"
- 
- #: basic_blocks.c:290 basic_blocks.c:300
- msgid "<unknown>"
-@@ -125,7 +125,7 @@
- "\t\t     Call graph (explanation follows)\n"
- "\n"
- msgstr ""
--"\t\t     Kutsugrafiikka (selitys seuraa)\n"
-+"\t\t     Kutsugraafi (selitys seuraa)\n"
- "\n"
- 
- #: cg_print.c:75
-@@ -134,7 +134,7 @@
- "\t\t\tCall graph\n"
- "\n"
- msgstr ""
--"\t\t\tKutsugrafiikka\n"
-+"\t\t\tKutsugraafi\n"
- "\n"
- 
- #: cg_print.c:78 hist.c:466
-@@ -256,7 +256,7 @@
- #: corefile.c:177
- #, c-format
- msgid "%s: can't find .text section in %s\n"
--msgstr "%s: ei lÃ¶ydy \".text\"-lohkoa kohteesta %s\n"
-+msgstr "%s: ei lÃ¶ydy â.textâ-lohkoa kohteesta %s\n"
- 
- #: corefile.c:252
- #, c-format
-@@ -276,7 +276,7 @@
- #: corefile.c:470
- #, c-format
- msgid "%s: file `%s' has no symbols\n"
--msgstr "%s: tiedostossa \"%s\" ei ole symboleja\n"
-+msgstr "%s: tiedostossa â%sâ ei ole symboleja\n"
- 
- #: corefile.c:772
- #, c-format
-@@ -296,12 +296,12 @@
- #: gmon_io.c:330 gmon_io.c:459
- #, c-format
- msgid "%s: file `%s' has bad magic cookie\n"
--msgstr "%s: tiedostossa \"%s\" on virheellinen maaginen pipari\n"
-+msgstr "%s: tiedostossa â%sâ on virheellinen maaginen pipari\n"
- 
- #: gmon_io.c:341
- #, c-format
- msgid "%s: file `%s' has unsupported version %d\n"
--msgstr "%s: tiedostossa \"%s\" on tukematon versio %d\n"
-+msgstr "%s: tiedostossa â%sâ on tukematon versio %d\n"
- 
- #: gmon_io.c:371
- #, c-format
-@@ -321,12 +321,12 @@
- #: gmon_io.c:516
- #, c-format
- msgid "%s: file '%s' does not appear to be in gmon.out format\n"
--msgstr "%s: tiedosto \"%s\" ei vaikuta olevan \"gmon.out\"-muotoinen\n"
-+msgstr "%s: tiedosto â%sâ ei vaikuta olevan âgmon.outâ-muotoinen\n"
- 
- #: gmon_io.c:529
- #, c-format
- msgid "%s: unexpected EOF after reading %d/%d bins\n"
--msgstr "%s: odottamaton tiedoston loppumerkki \"%d/%d bins\"-lukemisen jÃ€lkeen\n"
-+msgstr "%s: odottamaton tiedoston loppumerkki â%d/%d binsâ-lukemisen jÃ€lkeen\n"
- 
- #: gmon_io.c:563
- #, c-format
-@@ -341,7 +341,7 @@
- #: gmon_io.c:576
- #, c-format
- msgid "File `%s' (version %d) contains:\n"
--msgstr "Tiedosto \"%s\" (versio %d) sisÃ€ltÃ€Ã€:\n"
-+msgstr "Tiedosto â%sâ (versio %d) sisÃ€ltÃ€Ã€:\n"
- 
- #: gmon_io.c:579
- #, c-format
-@@ -356,12 +356,12 @@
- #: gmon_io.c:582
- #, c-format
- msgid "\t%d call-graph record\n"
--msgstr "\t%d kutsugrafiikkatietue\n"
-+msgstr "\t%d kutsugraafitietue\n"
- 
- #: gmon_io.c:583
- #, c-format
- msgid "\t%d call-graph records\n"
--msgstr "\t%d kutsugrafiikkatietueet\n"
-+msgstr "\t%d kutsugraafitietueet\n"
- 
- #: gmon_io.c:585
- #, c-format
-@@ -407,12 +407,12 @@
- #: gprof.c:174
- #, c-format
- msgid "Report bugs to %s\n"
--msgstr "Raportoi virheestÃ€ osoitteeseen %s\n"
-+msgstr "LÃ€hetÃ€ raportit ohjelmistovioista (englanniksi) osoitteeseen %s\n"
- 
- #: gprof.c:250
- #, c-format
- msgid "%s: debugging not supported; -d ignored\n"
--msgstr "%s: debuggausta ei tueta; -d ei oteta huomioon\n"
-+msgstr "%s: debuggausta ei tueta; -d:tÃ€ ei oteta huomioon\n"
- 
- #: gprof.c:330
- #, c-format
-@@ -428,7 +428,7 @@
- #: gprof.c:415
- #, c-format
- msgid "Based on BSD gprof, copyright 1983 Regents of the University of California.\n"
--msgstr "Perustuu BSD gprof, copyright 1983 Regents of the University of California.\n"
-+msgstr "Perustuu BSD:n gprofiin, copyright 1983 Regents of the University of California.\n"
- 
- #: gprof.c:416
- #, c-format
-@@ -438,27 +438,27 @@
- #: gprof.c:457
- #, c-format
- msgid "%s: unknown demangling style `%s'\n"
--msgstr "%s: tuntematon eheytystyyli \"%s\"\n"
-+msgstr "%s: tuntematon eheytystyyli â%sâ\n"
- 
- #: gprof.c:477
- #, c-format
- msgid "%s: Only one of --function-ordering and --file-ordering may be specified.\n"
--msgstr "%s: Vain joko \"--function-ordering\" tai \"--file-ordering\" saadaan mÃ€Ã€ritellÃ€.\n"
-+msgstr "%s: Vain joko â--function-orderingâ tai â--file-orderingâ saadaan mÃ€Ã€ritellÃ€.\n"
- 
- #: gprof.c:527
- #, c-format
- msgid "%s: sorry, file format `prof' is not yet supported\n"
--msgstr "%s: valitettavasti tiedostomuotoa \"prof\" ei vielÃ€ tueta\n"
-+msgstr "%s: valitettavasti tiedostomuotoa âprofâ ei vielÃ€ tueta\n"
- 
- #: gprof.c:581
- #, c-format
- msgid "%s: gmon.out file is missing histogram\n"
--msgstr "%s: \"gmon.out\"-tiedosto puuttuu histogrammista\n"
-+msgstr "%s: âgmon.outâ-tiedosto puuttuu histogrammista\n"
- 
- #: gprof.c:588
- #, c-format
- msgid "%s: gmon.out file is missing call-graph data\n"
--msgstr "%s: \"gmon.out\"-tiedosto puuttuu kutsugrafiikkadatasta\n"
-+msgstr "%s: âgmon.outâ-tiedosto puuttuu kutsugraafidatasta\n"
- 
- #: hist.c:133
- #, c-format
-@@ -468,8 +468,8 @@
- "%s: to '%s'\n"
- msgstr ""
- "%s: mittasuhdeyksikkÃ¶ muuttui histogrammitietueiden vÃ€lillÃ€\n"
--"%s: arvosta \"%s\"\n"
--"%s: arvoon \"%s\"\n"
-+"%s: arvosta â%sâ\n"
-+"%s: arvoon â%sâ\n"
- 
- #: hist.c:143
- #, c-format
-@@ -479,8 +479,8 @@
- "%s: to '%c'\n"
- msgstr ""
- "%s: mittasuhdelyhenne muuttui histogrammitietueiden vÃ€lillÃ€\n"
--"%s: arvosta \"%c\"\n"
--"%s: arvoon \"%c\"\n"
-+"%s: arvosta â%câ\n"
-+"%s: arvoon â%câ\n"
- 
- #: hist.c:157
- #, c-format
-@@ -508,7 +508,7 @@
- " for %.2f%% of %.2f %s\n"
- "\n"
- msgstr ""
--" kohteelle %.2f%% of %.2f %s\n"
-+" kohteelle %.2f%% / %.2f %s\n"
- "\n"
- 
- #: hist.c:476
-@@ -526,7 +526,7 @@
- " no time accumulated\n"
- "\n"
- msgstr ""
--" ei akkumuloitunutta aikaa\n"
-+" ei kerÃ€Ã€ntynyttÃ€ aikaa\n"
- "\n"
- 
- #: hist.c:488
-@@ -575,17 +575,17 @@
- #: mips.c:71
- #, c-format
- msgid "[find_call] 0x%lx: jal"
--msgstr "[find_call] 0x%lx: jal-kÃ€sky"
-+msgstr "[etsi_kutsu] 0x%lx: jal-kÃ€sky"
- 
- #: mips.c:96
- #, c-format
- msgid "[find_call] 0x%lx: jalr\n"
--msgstr "[find_call] 0x%lx: jalr-kÃ€sky (epÃ€suora kutsu)\n"
-+msgstr "[etsi_kutsu] 0x%lx: jalr-kÃ€sky (epÃ€suora kutsu)\n"
- 
- #: source.c:162
- #, c-format
- msgid "%s: could not locate `%s'\n"
--msgstr "%s: ei voitu paikantaa \"%s\"\n"
-+msgstr "%s: ei voitu paikantaa â%sâ\n"
- 
- #: source.c:237
- #, c-format
-diff -Naur binutils-2.18.orig/ld/testsuite/ChangeLog binutils-2.18/ld/testsuite/ChangeLog
---- binutils-2.18.orig/ld/testsuite/ChangeLog	2007-08-24 10:01:57.000000000 -0400
-+++ binutils-2.18/ld/testsuite/ChangeLog	2007-10-29 13:53:53.000000000 -0400
-@@ -1,3 +1,11 @@
-+2007-10-29  Joseph Myers  <joseph@codesourcery.com>
-+
-+	* ld-mips-elf/multi-got-hidden-1.d,
-+	ld-mips-elf/multi-got-hidden-1.s,
-+	ld-mips-elf/multi-got-hidden-2.d,
-+	ld-mips-elf/multi-got-hidden-2.s: New.
-+	* ld-mips-elf/mips-elf.exp: Run multi-got-hidden tests.
-+
- 2007-08-20  Richard Sandiford  <richard@codesourcery.com>
- 
- 	* ld-mips-elf/vxworks-forced-local-1.d,
-diff -Naur binutils-2.18.orig/ld/testsuite/ld-mips-elf/mips-elf.exp binutils-2.18/ld/testsuite/ld-mips-elf/mips-elf.exp
---- binutils-2.18.orig/ld/testsuite/ld-mips-elf/mips-elf.exp	2007-08-24 10:02:02.000000000 -0400
-+++ binutils-2.18/ld/testsuite/ld-mips-elf/mips-elf.exp	2007-10-29 13:53:53.000000000 -0400
-@@ -68,6 +68,8 @@
- if { $linux_gnu } {
-     run_dump_test "multi-got-1"
-     run_dump_test "multi-got-no-shared"
-+    run_dump_test "multi-got-hidden-1"
-+    run_dump_test "multi-got-hidden-2"
- }
- 
- if $has_newabi {
-diff -Naur binutils-2.18.orig/ld/testsuite/ld-mips-elf/multi-got-hidden-1.d binutils-2.18/ld/testsuite/ld-mips-elf/multi-got-hidden-1.d
---- binutils-2.18.orig/ld/testsuite/ld-mips-elf/multi-got-hidden-1.d	1969-12-31 19:00:00.000000000 -0500
-+++ binutils-2.18/ld/testsuite/ld-mips-elf/multi-got-hidden-1.d	2007-10-29 13:53:53.000000000 -0400
-@@ -0,0 +1,8 @@
-+#name: MIPS multi-got-hidden-1
-+#as: -EB -32 -KPIC
-+#source: multi-got-1-1.s
-+#source: multi-got-1-2.s
-+#source: multi-got-hidden-1.s
-+#ld: -melf32btsmip -e 0
-+#objdump: -dr
-+#pass
-diff -Naur binutils-2.18.orig/ld/testsuite/ld-mips-elf/multi-got-hidden-1.s binutils-2.18/ld/testsuite/ld-mips-elf/multi-got-hidden-1.s
---- binutils-2.18.orig/ld/testsuite/ld-mips-elf/multi-got-hidden-1.s	1969-12-31 19:00:00.000000000 -0500
-+++ binutils-2.18/ld/testsuite/ld-mips-elf/multi-got-hidden-1.s	2007-10-29 13:53:53.000000000 -0400
-@@ -0,0 +1,5 @@
-+.hidden __init_array_end
-+.hidden __init_array_start
-+sym_3_1:
-+la $2, __init_array_start
-+la $2, __init_array_end
-diff -Naur binutils-2.18.orig/ld/testsuite/ld-mips-elf/multi-got-hidden-2.d binutils-2.18/ld/testsuite/ld-mips-elf/multi-got-hidden-2.d
---- binutils-2.18.orig/ld/testsuite/ld-mips-elf/multi-got-hidden-2.d	1969-12-31 19:00:00.000000000 -0500
-+++ binutils-2.18/ld/testsuite/ld-mips-elf/multi-got-hidden-2.d	2007-10-29 13:53:53.000000000 -0400
-@@ -0,0 +1,7 @@
-+#name: MIPS multi-got-hidden-2
-+#as: -EB -32 -KPIC
-+#source: multi-got-1-1.s
-+#source: multi-got-hidden-2.s
-+#ld: -melf32btsmip -e 0
-+#objdump: -dr
-+#pass
-diff -Naur binutils-2.18.orig/ld/testsuite/ld-mips-elf/multi-got-hidden-2.s binutils-2.18/ld/testsuite/ld-mips-elf/multi-got-hidden-2.s
---- binutils-2.18.orig/ld/testsuite/ld-mips-elf/multi-got-hidden-2.s	1969-12-31 19:00:00.000000000 -0500
-+++ binutils-2.18/ld/testsuite/ld-mips-elf/multi-got-hidden-2.s	2007-10-29 13:53:53.000000000 -0400
-@@ -0,0 +1,16389 @@
-+.globl sym_2_1
-+sym_2_1: la $2, sym_2_1
-+.globl sym_2_2
-+sym_2_2: la $2, sym_2_2
-+.globl sym_2_3
-+sym_2_3: la $2, sym_2_3
-+.globl sym_2_4
-+sym_2_4: la $2, sym_2_4
-+.globl sym_2_5
-+sym_2_5: la $2, sym_2_5
-+.globl sym_2_6
-+sym_2_6: la $2, sym_2_6
-+.globl sym_2_7
-+sym_2_7: la $2, sym_2_7
-+.globl sym_2_8
-+sym_2_8: la $2, sym_2_8
-+.globl sym_2_9
-+sym_2_9: la $2, sym_2_9
-+.globl sym_2_10
-+sym_2_10: la $2, sym_2_10
-+.globl sym_2_11
-+sym_2_11: la $2, sym_2_11
-+.globl sym_2_12
-+sym_2_12: la $2, sym_2_12
-+.globl sym_2_13
-+sym_2_13: la $2, sym_2_13
-+.globl sym_2_14
-+sym_2_14: la $2, sym_2_14
-+.globl sym_2_15
-+sym_2_15: la $2, sym_2_15
-+.globl sym_2_16
-+sym_2_16: la $2, sym_2_16
-+.globl sym_2_17
-+sym_2_17: la $2, sym_2_17
-+.globl sym_2_18
-+sym_2_18: la $2, sym_2_18
-+.globl sym_2_19
-+sym_2_19: la $2, sym_2_19
-+.globl sym_2_20
-+sym_2_20: la $2, sym_2_20
-+.globl sym_2_21
-+sym_2_21: la $2, sym_2_21
-+.globl sym_2_22
-+sym_2_22: la $2, sym_2_22
-+.globl sym_2_23
-+sym_2_23: la $2, sym_2_23
-+.globl sym_2_24
-+sym_2_24: la $2, sym_2_24
-+.globl sym_2_25
-+sym_2_25: la $2, sym_2_25
-+.globl sym_2_26
-+sym_2_26: la $2, sym_2_26
-+.globl sym_2_27
-+sym_2_27: la $2, sym_2_27
-+.globl sym_2_28
-+sym_2_28: la $2, sym_2_28
-+.globl sym_2_29
-+sym_2_29: la $2, sym_2_29
-+.globl sym_2_30
-+sym_2_30: la $2, sym_2_30
-+.globl sym_2_31
-+sym_2_31: la $2, sym_2_31
-+.globl sym_2_32
-+sym_2_32: la $2, sym_2_32
-+.globl sym_2_33
-+sym_2_33: la $2, sym_2_33
-+.globl sym_2_34
-+sym_2_34: la $2, sym_2_34
-+.globl sym_2_35
-+sym_2_35: la $2, sym_2_35
-+.globl sym_2_36
-+sym_2_36: la $2, sym_2_36
-+.globl sym_2_37
-+sym_2_37: la $2, sym_2_37
-+.globl sym_2_38
-+sym_2_38: la $2, sym_2_38
-+.globl sym_2_39
-+sym_2_39: la $2, sym_2_39
-+.globl sym_2_40
-+sym_2_40: la $2, sym_2_40
-+.globl sym_2_41
-+sym_2_41: la $2, sym_2_41
-+.globl sym_2_42
-+sym_2_42: la $2, sym_2_42
-+.globl sym_2_43
-+sym_2_43: la $2, sym_2_43
-+.globl sym_2_44
-+sym_2_44: la $2, sym_2_44
-+.globl sym_2_45
-+sym_2_45: la $2, sym_2_45
-+.globl sym_2_46
-+sym_2_46: la $2, sym_2_46
-+.globl sym_2_47
-+sym_2_47: la $2, sym_2_47
-+.globl sym_2_48
-+sym_2_48: la $2, sym_2_48
-+.globl sym_2_49
-+sym_2_49: la $2, sym_2_49
-+.globl sym_2_50
-+sym_2_50: la $2, sym_2_50
-+.globl sym_2_51
-+sym_2_51: la $2, sym_2_51
-+.globl sym_2_52
-+sym_2_52: la $2, sym_2_52
-+.globl sym_2_53
-+sym_2_53: la $2, sym_2_53
-+.globl sym_2_54
-+sym_2_54: la $2, sym_2_54
-+.globl sym_2_55
-+sym_2_55: la $2, sym_2_55
-+.globl sym_2_56
-+sym_2_56: la $2, sym_2_56
-+.globl sym_2_57
-+sym_2_57: la $2, sym_2_57
-+.globl sym_2_58
-+sym_2_58: la $2, sym_2_58
-+.globl sym_2_59
-+sym_2_59: la $2, sym_2_59
-+.globl sym_2_60
-+sym_2_60: la $2, sym_2_60
-+.globl sym_2_61
-+sym_2_61: la $2, sym_2_61
-+.globl sym_2_62
-+sym_2_62: la $2, sym_2_62
-+.globl sym_2_63
-+sym_2_63: la $2, sym_2_63
-+.globl sym_2_64
-+sym_2_64: la $2, sym_2_64
-+.globl sym_2_65
-+sym_2_65: la $2, sym_2_65
-+.globl sym_2_66
-+sym_2_66: la $2, sym_2_66
-+.globl sym_2_67
-+sym_2_67: la $2, sym_2_67
-+.globl sym_2_68
-+sym_2_68: la $2, sym_2_68
-+.globl sym_2_69
-+sym_2_69: la $2, sym_2_69
-+.globl sym_2_70
-+sym_2_70: la $2, sym_2_70
-+.globl sym_2_71
-+sym_2_71: la $2, sym_2_71
-+.globl sym_2_72
-+sym_2_72: la $2, sym_2_72
-+.globl sym_2_73
-+sym_2_73: la $2, sym_2_73
-+.globl sym_2_74
-+sym_2_74: la $2, sym_2_74
-+.globl sym_2_75
-+sym_2_75: la $2, sym_2_75
-+.globl sym_2_76
-+sym_2_76: la $2, sym_2_76
-+.globl sym_2_77
-+sym_2_77: la $2, sym_2_77
-+.globl sym_2_78
-+sym_2_78: la $2, sym_2_78
-+.globl sym_2_79
-+sym_2_79: la $2, sym_2_79
-+.globl sym_2_80
-+sym_2_80: la $2, sym_2_80
-+.globl sym_2_81
-+sym_2_81: la $2, sym_2_81
-+.globl sym_2_82
-+sym_2_82: la $2, sym_2_82
-+.globl sym_2_83
-+sym_2_83: la $2, sym_2_83
-+.globl sym_2_84
-+sym_2_84: la $2, sym_2_84
-+.globl sym_2_85
-+sym_2_85: la $2, sym_2_85
-+.globl sym_2_86
-+sym_2_86: la $2, sym_2_86
-+.globl sym_2_87
-+sym_2_87: la $2, sym_2_87
-+.globl sym_2_88
-+sym_2_88: la $2, sym_2_88
-+.globl sym_2_89
-+sym_2_89: la $2, sym_2_89
-+.globl sym_2_90
-+sym_2_90: la $2, sym_2_90
-+.globl sym_2_91
-+sym_2_91: la $2, sym_2_91
-+.globl sym_2_92
-+sym_2_92: la $2, sym_2_92
-+.globl sym_2_93
-+sym_2_93: la $2, sym_2_93
-+.globl sym_2_94
-+sym_2_94: la $2, sym_2_94
-+.globl sym_2_95
-+sym_2_95: la $2, sym_2_95
-+.globl sym_2_96
-+sym_2_96: la $2, sym_2_96
-+.globl sym_2_97
-+sym_2_97: la $2, sym_2_97
-+.globl sym_2_98
-+sym_2_98: la $2, sym_2_98
-+.globl sym_2_99
-+sym_2_99: la $2, sym_2_99
-+.globl sym_2_100
-+sym_2_100: la $2, sym_2_100
-+.globl sym_2_101
-+sym_2_101: la $2, sym_2_101
-+.globl sym_2_102
-+sym_2_102: la $2, sym_2_102
-+.globl sym_2_103
-+sym_2_103: la $2, sym_2_103
-+.globl sym_2_104
-+sym_2_104: la $2, sym_2_104
-+.globl sym_2_105
-+sym_2_105: la $2, sym_2_105
-+.globl sym_2_106
-+sym_2_106: la $2, sym_2_106
-+.globl sym_2_107
-+sym_2_107: la $2, sym_2_107
-+.globl sym_2_108
-+sym_2_108: la $2, sym_2_108
-+.globl sym_2_109
-+sym_2_109: la $2, sym_2_109
-+.globl sym_2_110
-+sym_2_110: la $2, sym_2_110
-+.globl sym_2_111
-+sym_2_111: la $2, sym_2_111
-+.globl sym_2_112
-+sym_2_112: la $2, sym_2_112
-+.globl sym_2_113
-+sym_2_113: la $2, sym_2_113
-+.globl sym_2_114
-+sym_2_114: la $2, sym_2_114
-+.globl sym_2_115
-+sym_2_115: la $2, sym_2_115
-+.globl sym_2_116
-+sym_2_116: la $2, sym_2_116
-+.globl sym_2_117
-+sym_2_117: la $2, sym_2_117
-+.globl sym_2_118
-+sym_2_118: la $2, sym_2_118
-+.globl sym_2_119
-+sym_2_119: la $2, sym_2_119
-+.globl sym_2_120
-+sym_2_120: la $2, sym_2_120
-+.globl sym_2_121
-+sym_2_121: la $2, sym_2_121
-+.globl sym_2_122
-+sym_2_122: la $2, sym_2_122
-+.globl sym_2_123
-+sym_2_123: la $2, sym_2_123
-+.globl sym_2_124
-+sym_2_124: la $2, sym_2_124
-+.globl sym_2_125
-+sym_2_125: la $2, sym_2_125
-+.globl sym_2_126
-+sym_2_126: la $2, sym_2_126
-+.globl sym_2_127
-+sym_2_127: la $2, sym_2_127
-+.globl sym_2_128
-+sym_2_128: la $2, sym_2_128
-+.globl sym_2_129
-+sym_2_129: la $2, sym_2_129
-+.globl sym_2_130
-+sym_2_130: la $2, sym_2_130
-+.globl sym_2_131
-+sym_2_131: la $2, sym_2_131
-+.globl sym_2_132
-+sym_2_132: la $2, sym_2_132
-+.globl sym_2_133
-+sym_2_133: la $2, sym_2_133
-+.globl sym_2_134
-+sym_2_134: la $2, sym_2_134
-+.globl sym_2_135
-+sym_2_135: la $2, sym_2_135
-+.globl sym_2_136
-+sym_2_136: la $2, sym_2_136
-+.globl sym_2_137
-+sym_2_137: la $2, sym_2_137
-+.globl sym_2_138
-+sym_2_138: la $2, sym_2_138
-+.globl sym_2_139
-+sym_2_139: la $2, sym_2_139
-+.globl sym_2_140
-+sym_2_140: la $2, sym_2_140
-+.globl sym_2_141
-+sym_2_141: la $2, sym_2_141
-+.globl sym_2_142
-+sym_2_142: la $2, sym_2_142
-+.globl sym_2_143
-+sym_2_143: la $2, sym_2_143
-+.globl sym_2_144
-+sym_2_144: la $2, sym_2_144
-+.globl sym_2_145
-+sym_2_145: la $2, sym_2_145
-+.globl sym_2_146
-+sym_2_146: la $2, sym_2_146
-+.globl sym_2_147
-+sym_2_147: la $2, sym_2_147
-+.globl sym_2_148
-+sym_2_148: la $2, sym_2_148
-+.globl sym_2_149
-+sym_2_149: la $2, sym_2_149
-+.globl sym_2_150
-+sym_2_150: la $2, sym_2_150
-+.globl sym_2_151
-+sym_2_151: la $2, sym_2_151
-+.globl sym_2_152
-+sym_2_152: la $2, sym_2_152
-+.globl sym_2_153
-+sym_2_153: la $2, sym_2_153
-+.globl sym_2_154
-+sym_2_154: la $2, sym_2_154
-+.globl sym_2_155
-+sym_2_155: la $2, sym_2_155
-+.globl sym_2_156
-+sym_2_156: la $2, sym_2_156
-+.globl sym_2_157
-+sym_2_157: la $2, sym_2_157
-+.globl sym_2_158
-+sym_2_158: la $2, sym_2_158
-+.globl sym_2_159
-+sym_2_159: la $2, sym_2_159
-+.globl sym_2_160
-+sym_2_160: la $2, sym_2_160
-+.globl sym_2_161
-+sym_2_161: la $2, sym_2_161
-+.globl sym_2_162
-+sym_2_162: la $2, sym_2_162
-+.globl sym_2_163
-+sym_2_163: la $2, sym_2_163
-+.globl sym_2_164
-+sym_2_164: la $2, sym_2_164
-+.globl sym_2_165
-+sym_2_165: la $2, sym_2_165
-+.globl sym_2_166
-+sym_2_166: la $2, sym_2_166
-+.globl sym_2_167
-+sym_2_167: la $2, sym_2_167
-+.globl sym_2_168
-+sym_2_168: la $2, sym_2_168
-+.globl sym_2_169
-+sym_2_169: la $2, sym_2_169
-+.globl sym_2_170
-+sym_2_170: la $2, sym_2_170
-+.globl sym_2_171
-+sym_2_171: la $2, sym_2_171
-+.globl sym_2_172
-+sym_2_172: la $2, sym_2_172
-+.globl sym_2_173
-+sym_2_173: la $2, sym_2_173
-+.globl sym_2_174
-+sym_2_174: la $2, sym_2_174
-+.globl sym_2_175
-+sym_2_175: la $2, sym_2_175
-+.globl sym_2_176
-+sym_2_176: la $2, sym_2_176
-+.globl sym_2_177
-+sym_2_177: la $2, sym_2_177
-+.globl sym_2_178
-+sym_2_178: la $2, sym_2_178
-+.globl sym_2_179
-+sym_2_179: la $2, sym_2_179
-+.globl sym_2_180
-+sym_2_180: la $2, sym_2_180
-+.globl sym_2_181
-+sym_2_181: la $2, sym_2_181
-+.globl sym_2_182
-+sym_2_182: la $2, sym_2_182
-+.globl sym_2_183
-+sym_2_183: la $2, sym_2_183
-+.globl sym_2_184
-+sym_2_184: la $2, sym_2_184
-+.globl sym_2_185
-+sym_2_185: la $2, sym_2_185
-+.globl sym_2_186
-+sym_2_186: la $2, sym_2_186
-+.globl sym_2_187
-+sym_2_187: la $2, sym_2_187
-+.globl sym_2_188
-+sym_2_188: la $2, sym_2_188
-+.globl sym_2_189
-+sym_2_189: la $2, sym_2_189
-+.globl sym_2_190
-+sym_2_190: la $2, sym_2_190
-+.globl sym_2_191
-+sym_2_191: la $2, sym_2_191
-+.globl sym_2_192
-+sym_2_192: la $2, sym_2_192
-+.globl sym_2_193
-+sym_2_193: la $2, sym_2_193
-+.globl sym_2_194
-+sym_2_194: la $2, sym_2_194
-+.globl sym_2_195
-+sym_2_195: la $2, sym_2_195
-+.globl sym_2_196
-+sym_2_196: la $2, sym_2_196
-+.globl sym_2_197
-+sym_2_197: la $2, sym_2_197
-+.globl sym_2_198
-+sym_2_198: la $2, sym_2_198
-+.globl sym_2_199
-+sym_2_199: la $2, sym_2_199
-+.globl sym_2_200
-+sym_2_200: la $2, sym_2_200
-+.globl sym_2_201
-+sym_2_201: la $2, sym_2_201
-+.globl sym_2_202
-+sym_2_202: la $2, sym_2_202
-+.globl sym_2_203
-+sym_2_203: la $2, sym_2_203
-+.globl sym_2_204
-+sym_2_204: la $2, sym_2_204
-+.globl sym_2_205
-+sym_2_205: la $2, sym_2_205
-+.globl sym_2_206
-+sym_2_206: la $2, sym_2_206
-+.globl sym_2_207
-+sym_2_207: la $2, sym_2_207
-+.globl sym_2_208
-+sym_2_208: la $2, sym_2_208
-+.globl sym_2_209
-+sym_2_209: la $2, sym_2_209
-+.globl sym_2_210
-+sym_2_210: la $2, sym_2_210
-+.globl sym_2_211
-+sym_2_211: la $2, sym_2_211
-+.globl sym_2_212
-+sym_2_212: la $2, sym_2_212
-+.globl sym_2_213
-+sym_2_213: la $2, sym_2_213
-+.globl sym_2_214
-+sym_2_214: la $2, sym_2_214
-+.globl sym_2_215
-+sym_2_215: la $2, sym_2_215
-+.globl sym_2_216
-+sym_2_216: la $2, sym_2_216
-+.globl sym_2_217
-+sym_2_217: la $2, sym_2_217
-+.globl sym_2_218
-+sym_2_218: la $2, sym_2_218
-+.globl sym_2_219
-+sym_2_219: la $2, sym_2_219
-+.globl sym_2_220
-+sym_2_220: la $2, sym_2_220
-+.globl sym_2_221
-+sym_2_221: la $2, sym_2_221
-+.globl sym_2_222
-+sym_2_222: la $2, sym_2_222
-+.globl sym_2_223
-+sym_2_223: la $2, sym_2_223
-+.globl sym_2_224
-+sym_2_224: la $2, sym_2_224
-+.globl sym_2_225
-+sym_2_225: la $2, sym_2_225
-+.globl sym_2_226
-+sym_2_226: la $2, sym_2_226
-+.globl sym_2_227
-+sym_2_227: la $2, sym_2_227
-+.globl sym_2_228
-+sym_2_228: la $2, sym_2_228
-+.globl sym_2_229
-+sym_2_229: la $2, sym_2_229
-+.globl sym_2_230
-+sym_2_230: la $2, sym_2_230
-+.globl sym_2_231
-+sym_2_231: la $2, sym_2_231
-+.globl sym_2_232
-+sym_2_232: la $2, sym_2_232
-+.globl sym_2_233
-+sym_2_233: la $2, sym_2_233
-+.globl sym_2_234
-+sym_2_234: la $2, sym_2_234
-+.globl sym_2_235
-+sym_2_235: la $2, sym_2_235
-+.globl sym_2_236
-+sym_2_236: la $2, sym_2_236
-+.globl sym_2_237
-+sym_2_237: la $2, sym_2_237
-+.globl sym_2_238
-+sym_2_238: la $2, sym_2_238
-+.globl sym_2_239
-+sym_2_239: la $2, sym_2_239
-+.globl sym_2_240
-+sym_2_240: la $2, sym_2_240
-+.globl sym_2_241
-+sym_2_241: la $2, sym_2_241
-+.globl sym_2_242
-+sym_2_242: la $2, sym_2_242
-+.globl sym_2_243
-+sym_2_243: la $2, sym_2_243
-+.globl sym_2_244
-+sym_2_244: la $2, sym_2_244
-+.globl sym_2_245
-+sym_2_245: la $2, sym_2_245
-+.globl sym_2_246
-+sym_2_246: la $2, sym_2_246
-+.globl sym_2_247
-+sym_2_247: la $2, sym_2_247
-+.globl sym_2_248
-+sym_2_248: la $2, sym_2_248
-+.globl sym_2_249
-+sym_2_249: la $2, sym_2_249
-+.globl sym_2_250
-+sym_2_250: la $2, sym_2_250
-+.globl sym_2_251
-+sym_2_251: la $2, sym_2_251
-+.globl sym_2_252
-+sym_2_252: la $2, sym_2_252
-+.globl sym_2_253
-+sym_2_253: la $2, sym_2_253
-+.globl sym_2_254
-+sym_2_254: la $2, sym_2_254
-+.globl sym_2_255
-+sym_2_255: la $2, sym_2_255
-+.globl sym_2_256
-+sym_2_256: la $2, sym_2_256
-+.globl sym_2_257
-+sym_2_257: la $2, sym_2_257
-+.globl sym_2_258
-+sym_2_258: la $2, sym_2_258
-+.globl sym_2_259
-+sym_2_259: la $2, sym_2_259
-+.globl sym_2_260
-+sym_2_260: la $2, sym_2_260
-+.globl sym_2_261
-+sym_2_261: la $2, sym_2_261
-+.globl sym_2_262
-+sym_2_262: la $2, sym_2_262
-+.globl sym_2_263
-+sym_2_263: la $2, sym_2_263
-+.globl sym_2_264
-+sym_2_264: la $2, sym_2_264
-+.globl sym_2_265
-+sym_2_265: la $2, sym_2_265
-+.globl sym_2_266
-+sym_2_266: la $2, sym_2_266
-+.globl sym_2_267
-+sym_2_267: la $2, sym_2_267
-+.globl sym_2_268
-+sym_2_268: la $2, sym_2_268
-+.globl sym_2_269
-+sym_2_269: la $2, sym_2_269
-+.globl sym_2_270
-+sym_2_270: la $2, sym_2_270
-+.globl sym_2_271
-+sym_2_271: la $2, sym_2_271
-+.globl sym_2_272
-+sym_2_272: la $2, sym_2_272
-+.globl sym_2_273
-+sym_2_273: la $2, sym_2_273
-+.globl sym_2_274
-+sym_2_274: la $2, sym_2_274
-+.globl sym_2_275
-+sym_2_275: la $2, sym_2_275
-+.globl sym_2_276
-+sym_2_276: la $2, sym_2_276
-+.globl sym_2_277
-+sym_2_277: la $2, sym_2_277
-+.globl sym_2_278
-+sym_2_278: la $2, sym_2_278
-+.globl sym_2_279
-+sym_2_279: la $2, sym_2_279
-+.globl sym_2_280
-+sym_2_280: la $2, sym_2_280
-+.globl sym_2_281
-+sym_2_281: la $2, sym_2_281
-+.globl sym_2_282
-+sym_2_282: la $2, sym_2_282
-+.globl sym_2_283
-+sym_2_283: la $2, sym_2_283
-+.globl sym_2_284
-+sym_2_284: la $2, sym_2_284
-+.globl sym_2_285
-+sym_2_285: la $2, sym_2_285
-+.globl sym_2_286
-+sym_2_286: la $2, sym_2_286
-+.globl sym_2_287
-+sym_2_287: la $2, sym_2_287
-+.globl sym_2_288
-+sym_2_288: la $2, sym_2_288
-+.globl sym_2_289
-+sym_2_289: la $2, sym_2_289
-+.globl sym_2_290
-+sym_2_290: la $2, sym_2_290
-+.globl sym_2_291
-+sym_2_291: la $2, sym_2_291
-+.globl sym_2_292
-+sym_2_292: la $2, sym_2_292
-+.globl sym_2_293
-+sym_2_293: la $2, sym_2_293
-+.globl sym_2_294
-+sym_2_294: la $2, sym_2_294
-+.globl sym_2_295
-+sym_2_295: la $2, sym_2_295
-+.globl sym_2_296
-+sym_2_296: la $2, sym_2_296
-+.globl sym_2_297
-+sym_2_297: la $2, sym_2_297
-+.globl sym_2_298
-+sym_2_298: la $2, sym_2_298
-+.globl sym_2_299
-+sym_2_299: la $2, sym_2_299
-+.globl sym_2_300
-+sym_2_300: la $2, sym_2_300
-+.globl sym_2_301
-+sym_2_301: la $2, sym_2_301
-+.globl sym_2_302
-+sym_2_302: la $2, sym_2_302
-+.globl sym_2_303
-+sym_2_303: la $2, sym_2_303
-+.globl sym_2_304
-+sym_2_304: la $2, sym_2_304
-+.globl sym_2_305
-+sym_2_305: la $2, sym_2_305
-+.globl sym_2_306
-+sym_2_306: la $2, sym_2_306
-+.globl sym_2_307
-+sym_2_307: la $2, sym_2_307
-+.globl sym_2_308
-+sym_2_308: la $2, sym_2_308
-+.globl sym_2_309
-+sym_2_309: la $2, sym_2_309
-+.globl sym_2_310
-+sym_2_310: la $2, sym_2_310
-+.globl sym_2_311
-+sym_2_311: la $2, sym_2_311
-+.globl sym_2_312
-+sym_2_312: la $2, sym_2_312
-+.globl sym_2_313
-+sym_2_313: la $2, sym_2_313
-+.globl sym_2_314
-+sym_2_314: la $2, sym_2_314
-+.globl sym_2_315
-+sym_2_315: la $2, sym_2_315
-+.globl sym_2_316
-+sym_2_316: la $2, sym_2_316
-+.globl sym_2_317
-+sym_2_317: la $2, sym_2_317
-+.globl sym_2_318
-+sym_2_318: la $2, sym_2_318
-+.globl sym_2_319
-+sym_2_319: la $2, sym_2_319
-+.globl sym_2_320
-+sym_2_320: la $2, sym_2_320
-+.globl sym_2_321
-+sym_2_321: la $2, sym_2_321
-+.globl sym_2_322
-+sym_2_322: la $2, sym_2_322
-+.globl sym_2_323
-+sym_2_323: la $2, sym_2_323
-+.globl sym_2_324
-+sym_2_324: la $2, sym_2_324
-+.globl sym_2_325
-+sym_2_325: la $2, sym_2_325
-+.globl sym_2_326
-+sym_2_326: la $2, sym_2_326
-+.globl sym_2_327
-+sym_2_327: la $2, sym_2_327
-+.globl sym_2_328
-+sym_2_328: la $2, sym_2_328
-+.globl sym_2_329
-+sym_2_329: la $2, sym_2_329
-+.globl sym_2_330
-+sym_2_330: la $2, sym_2_330
-+.globl sym_2_331
-+sym_2_331: la $2, sym_2_331
-+.globl sym_2_332
-+sym_2_332: la $2, sym_2_332
-+.globl sym_2_333
-+sym_2_333: la $2, sym_2_333
-+.globl sym_2_334
-+sym_2_334: la $2, sym_2_334
-+.globl sym_2_335
-+sym_2_335: la $2, sym_2_335
-+.globl sym_2_336
-+sym_2_336: la $2, sym_2_336
-+.globl sym_2_337
-+sym_2_337: la $2, sym_2_337
-+.globl sym_2_338
-+sym_2_338: la $2, sym_2_338
-+.globl sym_2_339
-+sym_2_339: la $2, sym_2_339
-+.globl sym_2_340
-+sym_2_340: la $2, sym_2_340
-+.globl sym_2_341
-+sym_2_341: la $2, sym_2_341
-+.globl sym_2_342
-+sym_2_342: la $2, sym_2_342
-+.globl sym_2_343
-+sym_2_343: la $2, sym_2_343
-+.globl sym_2_344
-+sym_2_344: la $2, sym_2_344
-+.globl sym_2_345
-+sym_2_345: la $2, sym_2_345
-+.globl sym_2_346
-+sym_2_346: la $2, sym_2_346
-+.globl sym_2_347
-+sym_2_347: la $2, sym_2_347
-+.globl sym_2_348
-+sym_2_348: la $2, sym_2_348
-+.globl sym_2_349
-+sym_2_349: la $2, sym_2_349
-+.globl sym_2_350
-+sym_2_350: la $2, sym_2_350
-+.globl sym_2_351
-+sym_2_351: la $2, sym_2_351
-+.globl sym_2_352
-+sym_2_352: la $2, sym_2_352
-+.globl sym_2_353
-+sym_2_353: la $2, sym_2_353
-+.globl sym_2_354
-+sym_2_354: la $2, sym_2_354
-+.globl sym_2_355
-+sym_2_355: la $2, sym_2_355
-+.globl sym_2_356
-+sym_2_356: la $2, sym_2_356
-+.globl sym_2_357
-+sym_2_357: la $2, sym_2_357
-+.globl sym_2_358
-+sym_2_358: la $2, sym_2_358
-+.globl sym_2_359
-+sym_2_359: la $2, sym_2_359
-+.globl sym_2_360
-+sym_2_360: la $2, sym_2_360
-+.globl sym_2_361
-+sym_2_361: la $2, sym_2_361
-+.globl sym_2_362
-+sym_2_362: la $2, sym_2_362
-+.globl sym_2_363
-+sym_2_363: la $2, sym_2_363
-+.globl sym_2_364
-+sym_2_364: la $2, sym_2_364
-+.globl sym_2_365
-+sym_2_365: la $2, sym_2_365
-+.globl sym_2_366
-+sym_2_366: la $2, sym_2_366
-+.globl sym_2_367
-+sym_2_367: la $2, sym_2_367
-+.globl sym_2_368
-+sym_2_368: la $2, sym_2_368
-+.globl sym_2_369
-+sym_2_369: la $2, sym_2_369
-+.globl sym_2_370
-+sym_2_370: la $2, sym_2_370
-+.globl sym_2_371
-+sym_2_371: la $2, sym_2_371
-+.globl sym_2_372
-+sym_2_372: la $2, sym_2_372
-+.globl sym_2_373
-+sym_2_373: la $2, sym_2_373
-+.globl sym_2_374
-+sym_2_374: la $2, sym_2_374
-+.globl sym_2_375
-+sym_2_375: la $2, sym_2_375
-+.globl sym_2_376
-+sym_2_376: la $2, sym_2_376
-+.globl sym_2_377
-+sym_2_377: la $2, sym_2_377
-+.globl sym_2_378
-+sym_2_378: la $2, sym_2_378
-+.globl sym_2_379
-+sym_2_379: la $2, sym_2_379
-+.globl sym_2_380
-+sym_2_380: la $2, sym_2_380
-+.globl sym_2_381
-+sym_2_381: la $2, sym_2_381
-+.globl sym_2_382
-+sym_2_382: la $2, sym_2_382
-+.globl sym_2_383
-+sym_2_383: la $2, sym_2_383
-+.globl sym_2_384
-+sym_2_384: la $2, sym_2_384
-+.globl sym_2_385
-+sym_2_385: la $2, sym_2_385
-+.globl sym_2_386
-+sym_2_386: la $2, sym_2_386
-+.globl sym_2_387
-+sym_2_387: la $2, sym_2_387
-+.globl sym_2_388
-+sym_2_388: la $2, sym_2_388
-+.globl sym_2_389
-+sym_2_389: la $2, sym_2_389
-+.globl sym_2_390
-+sym_2_390: la $2, sym_2_390
-+.globl sym_2_391
-+sym_2_391: la $2, sym_2_391
-+.globl sym_2_392
-+sym_2_392: la $2, sym_2_392
-+.globl sym_2_393
-+sym_2_393: la $2, sym_2_393
-+.globl sym_2_394
-+sym_2_394: la $2, sym_2_394
-+.globl sym_2_395
-+sym_2_395: la $2, sym_2_395
-+.globl sym_2_396
-+sym_2_396: la $2, sym_2_396
-+.globl sym_2_397
-+sym_2_397: la $2, sym_2_397
-+.globl sym_2_398
-+sym_2_398: la $2, sym_2_398
-+.globl sym_2_399
-+sym_2_399: la $2, sym_2_399
-+.globl sym_2_400
-+sym_2_400: la $2, sym_2_400
-+.globl sym_2_401
-+sym_2_401: la $2, sym_2_401
-+.globl sym_2_402
-+sym_2_402: la $2, sym_2_402
-+.globl sym_2_403
-+sym_2_403: la $2, sym_2_403
-+.globl sym_2_404
-+sym_2_404: la $2, sym_2_404
-+.globl sym_2_405
-+sym_2_405: la $2, sym_2_405
-+.globl sym_2_406
-+sym_2_406: la $2, sym_2_406
-+.globl sym_2_407
-+sym_2_407: la $2, sym_2_407
-+.globl sym_2_408
-+sym_2_408: la $2, sym_2_408
-+.globl sym_2_409
-+sym_2_409: la $2, sym_2_409
-+.globl sym_2_410
-+sym_2_410: la $2, sym_2_410
-+.globl sym_2_411
-+sym_2_411: la $2, sym_2_411
-+.globl sym_2_412
-+sym_2_412: la $2, sym_2_412
-+.globl sym_2_413
-+sym_2_413: la $2, sym_2_413
-+.globl sym_2_414
-+sym_2_414: la $2, sym_2_414
-+.globl sym_2_415
-+sym_2_415: la $2, sym_2_415
-+.globl sym_2_416
-+sym_2_416: la $2, sym_2_416
-+.globl sym_2_417
-+sym_2_417: la $2, sym_2_417
-+.globl sym_2_418
-+sym_2_418: la $2, sym_2_418
-+.globl sym_2_419
-+sym_2_419: la $2, sym_2_419
-+.globl sym_2_420
-+sym_2_420: la $2, sym_2_420
-+.globl sym_2_421
-+sym_2_421: la $2, sym_2_421
-+.globl sym_2_422
-+sym_2_422: la $2, sym_2_422
-+.globl sym_2_423
-+sym_2_423: la $2, sym_2_423
-+.globl sym_2_424
-+sym_2_424: la $2, sym_2_424
-+.globl sym_2_425
-+sym_2_425: la $2, sym_2_425
-+.globl sym_2_426
-+sym_2_426: la $2, sym_2_426
-+.globl sym_2_427
-+sym_2_427: la $2, sym_2_427
-+.globl sym_2_428
-+sym_2_428: la $2, sym_2_428
-+.globl sym_2_429
-+sym_2_429: la $2, sym_2_429
-+.globl sym_2_430
-+sym_2_430: la $2, sym_2_430
-+.globl sym_2_431
-+sym_2_431: la $2, sym_2_431
-+.globl sym_2_432
-+sym_2_432: la $2, sym_2_432
-+.globl sym_2_433
-+sym_2_433: la $2, sym_2_433
-+.globl sym_2_434
-+sym_2_434: la $2, sym_2_434
-+.globl sym_2_435
-+sym_2_435: la $2, sym_2_435
-+.globl sym_2_436
-+sym_2_436: la $2, sym_2_436
-+.globl sym_2_437
-+sym_2_437: la $2, sym_2_437
-+.globl sym_2_438
-+sym_2_438: la $2, sym_2_438
-+.globl sym_2_439
-+sym_2_439: la $2, sym_2_439
-+.globl sym_2_440
-+sym_2_440: la $2, sym_2_440
-+.globl sym_2_441
-+sym_2_441: la $2, sym_2_441
-+.globl sym_2_442
-+sym_2_442: la $2, sym_2_442
-+.globl sym_2_443
-+sym_2_443: la $2, sym_2_443
-+.globl sym_2_444
-+sym_2_444: la $2, sym_2_444
-+.globl sym_2_445
-+sym_2_445: la $2, sym_2_445
-+.globl sym_2_446
-+sym_2_446: la $2, sym_2_446
-+.globl sym_2_447
-+sym_2_447: la $2, sym_2_447
-+.globl sym_2_448
-+sym_2_448: la $2, sym_2_448
-+.globl sym_2_449
-+sym_2_449: la $2, sym_2_449
-+.globl sym_2_450
-+sym_2_450: la $2, sym_2_450
-+.globl sym_2_451
-+sym_2_451: la $2, sym_2_451
-+.globl sym_2_452
-+sym_2_452: la $2, sym_2_452
-+.globl sym_2_453
-+sym_2_453: la $2, sym_2_453
-+.globl sym_2_454
-+sym_2_454: la $2, sym_2_454
-+.globl sym_2_455
-+sym_2_455: la $2, sym_2_455
-+.globl sym_2_456
-+sym_2_456: la $2, sym_2_456
-+.globl sym_2_457
-+sym_2_457: la $2, sym_2_457
-+.globl sym_2_458
-+sym_2_458: la $2, sym_2_458
-+.globl sym_2_459
-+sym_2_459: la $2, sym_2_459
-+.globl sym_2_460
-+sym_2_460: la $2, sym_2_460
-+.globl sym_2_461
-+sym_2_461: la $2, sym_2_461
-+.globl sym_2_462
-+sym_2_462: la $2, sym_2_462
-+.globl sym_2_463
-+sym_2_463: la $2, sym_2_463
-+.globl sym_2_464
-+sym_2_464: la $2, sym_2_464
-+.globl sym_2_465
-+sym_2_465: la $2, sym_2_465
-+.globl sym_2_466
-+sym_2_466: la $2, sym_2_466
-+.globl sym_2_467
-+sym_2_467: la $2, sym_2_467
-+.globl sym_2_468
-+sym_2_468: la $2, sym_2_468
-+.globl sym_2_469
-+sym_2_469: la $2, sym_2_469
-+.globl sym_2_470
-+sym_2_470: la $2, sym_2_470
-+.globl sym_2_471
-+sym_2_471: la $2, sym_2_471
-+.globl sym_2_472
-+sym_2_472: la $2, sym_2_472
-+.globl sym_2_473
-+sym_2_473: la $2, sym_2_473
-+.globl sym_2_474
-+sym_2_474: la $2, sym_2_474
-+.globl sym_2_475
-+sym_2_475: la $2, sym_2_475
-+.globl sym_2_476
-+sym_2_476: la $2, sym_2_476
-+.globl sym_2_477
-+sym_2_477: la $2, sym_2_477
-+.globl sym_2_478
-+sym_2_478: la $2, sym_2_478
-+.globl sym_2_479
-+sym_2_479: la $2, sym_2_479
-+.globl sym_2_480
-+sym_2_480: la $2, sym_2_480
-+.globl sym_2_481
-+sym_2_481: la $2, sym_2_481
-+.globl sym_2_482
-+sym_2_482: la $2, sym_2_482
-+.globl sym_2_483
-+sym_2_483: la $2, sym_2_483
-+.globl sym_2_484
-+sym_2_484: la $2, sym_2_484
-+.globl sym_2_485
-+sym_2_485: la $2, sym_2_485
-+.globl sym_2_486
-+sym_2_486: la $2, sym_2_486
-+.globl sym_2_487
-+sym_2_487: la $2, sym_2_487
-+.globl sym_2_488
-+sym_2_488: la $2, sym_2_488
-+.globl sym_2_489
-+sym_2_489: la $2, sym_2_489
-+.globl sym_2_490
-+sym_2_490: la $2, sym_2_490
-+.globl sym_2_491
-+sym_2_491: la $2, sym_2_491
-+.globl sym_2_492
-+sym_2_492: la $2, sym_2_492
-+.globl sym_2_493
-+sym_2_493: la $2, sym_2_493
-+.globl sym_2_494
-+sym_2_494: la $2, sym_2_494
-+.globl sym_2_495
-+sym_2_495: la $2, sym_2_495
-+.globl sym_2_496
-+sym_2_496: la $2, sym_2_496
-+.globl sym_2_497
-+sym_2_497: la $2, sym_2_497
-+.globl sym_2_498
-+sym_2_498: la $2, sym_2_498
-+.globl sym_2_499
-+sym_2_499: la $2, sym_2_499
-+.globl sym_2_500
-+sym_2_500: la $2, sym_2_500
-+.globl sym_2_501
-+sym_2_501: la $2, sym_2_501
-+.globl sym_2_502
-+sym_2_502: la $2, sym_2_502
-+.globl sym_2_503
-+sym_2_503: la $2, sym_2_503
-+.globl sym_2_504
-+sym_2_504: la $2, sym_2_504
-+.globl sym_2_505
-+sym_2_505: la $2, sym_2_505
-+.globl sym_2_506
-+sym_2_506: la $2, sym_2_506
-+.globl sym_2_507
-+sym_2_507: la $2, sym_2_507
-+.globl sym_2_508
-+sym_2_508: la $2, sym_2_508
-+.globl sym_2_509
-+sym_2_509: la $2, sym_2_509
-+.globl sym_2_510
-+sym_2_510: la $2, sym_2_510
-+.globl sym_2_511
-+sym_2_511: la $2, sym_2_511
-+.globl sym_2_512
-+sym_2_512: la $2, sym_2_512
-+.globl sym_2_513
-+sym_2_513: la $2, sym_2_513
-+.globl sym_2_514
-+sym_2_514: la $2, sym_2_514
-+.globl sym_2_515
-+sym_2_515: la $2, sym_2_515
-+.globl sym_2_516
-+sym_2_516: la $2, sym_2_516
-+.globl sym_2_517
-+sym_2_517: la $2, sym_2_517
-+.globl sym_2_518
-+sym_2_518: la $2, sym_2_518
-+.globl sym_2_519
-+sym_2_519: la $2, sym_2_519
-+.globl sym_2_520
-+sym_2_520: la $2, sym_2_520
-+.globl sym_2_521
-+sym_2_521: la $2, sym_2_521
-+.globl sym_2_522
-+sym_2_522: la $2, sym_2_522
-+.globl sym_2_523
-+sym_2_523: la $2, sym_2_523
-+.globl sym_2_524
-+sym_2_524: la $2, sym_2_524
-+.globl sym_2_525
-+sym_2_525: la $2, sym_2_525
-+.globl sym_2_526
-+sym_2_526: la $2, sym_2_526
-+.globl sym_2_527
-+sym_2_527: la $2, sym_2_527
-+.globl sym_2_528
-+sym_2_528: la $2, sym_2_528
-+.globl sym_2_529
-+sym_2_529: la $2, sym_2_529
-+.globl sym_2_530
-+sym_2_530: la $2, sym_2_530
-+.globl sym_2_531
-+sym_2_531: la $2, sym_2_531
-+.globl sym_2_532
-+sym_2_532: la $2, sym_2_532
-+.globl sym_2_533
-+sym_2_533: la $2, sym_2_533
-+.globl sym_2_534
-+sym_2_534: la $2, sym_2_534
-+.globl sym_2_535
-+sym_2_535: la $2, sym_2_535
-+.globl sym_2_536
-+sym_2_536: la $2, sym_2_536
-+.globl sym_2_537
-+sym_2_537: la $2, sym_2_537
-+.globl sym_2_538
-+sym_2_538: la $2, sym_2_538
-+.globl sym_2_539
-+sym_2_539: la $2, sym_2_539
-+.globl sym_2_540
-+sym_2_540: la $2, sym_2_540
-+.globl sym_2_541
-+sym_2_541: la $2, sym_2_541
-+.globl sym_2_542
-+sym_2_542: la $2, sym_2_542
-+.globl sym_2_543
-+sym_2_543: la $2, sym_2_543
-+.globl sym_2_544
-+sym_2_544: la $2, sym_2_544
-+.globl sym_2_545
-+sym_2_545: la $2, sym_2_545
-+.globl sym_2_546
-+sym_2_546: la $2, sym_2_546
-+.globl sym_2_547
-+sym_2_547: la $2, sym_2_547
-+.globl sym_2_548
-+sym_2_548: la $2, sym_2_548
-+.globl sym_2_549
-+sym_2_549: la $2, sym_2_549
-+.globl sym_2_550
-+sym_2_550: la $2, sym_2_550
-+.globl sym_2_551
-+sym_2_551: la $2, sym_2_551
-+.globl sym_2_552
-+sym_2_552: la $2, sym_2_552
-+.globl sym_2_553
-+sym_2_553: la $2, sym_2_553
-+.globl sym_2_554
-+sym_2_554: la $2, sym_2_554
-+.globl sym_2_555
-+sym_2_555: la $2, sym_2_555
-+.globl sym_2_556
-+sym_2_556: la $2, sym_2_556
-+.globl sym_2_557
-+sym_2_557: la $2, sym_2_557
-+.globl sym_2_558
-+sym_2_558: la $2, sym_2_558
-+.globl sym_2_559
-+sym_2_559: la $2, sym_2_559
-+.globl sym_2_560
-+sym_2_560: la $2, sym_2_560
-+.globl sym_2_561
-+sym_2_561: la $2, sym_2_561
-+.globl sym_2_562
-+sym_2_562: la $2, sym_2_562
-+.globl sym_2_563
-+sym_2_563: la $2, sym_2_563
-+.globl sym_2_564
-+sym_2_564: la $2, sym_2_564
-+.globl sym_2_565
-+sym_2_565: la $2, sym_2_565
-+.globl sym_2_566
-+sym_2_566: la $2, sym_2_566
-+.globl sym_2_567
-+sym_2_567: la $2, sym_2_567
-+.globl sym_2_568
-+sym_2_568: la $2, sym_2_568
-+.globl sym_2_569
-+sym_2_569: la $2, sym_2_569
-+.globl sym_2_570
-+sym_2_570: la $2, sym_2_570
-+.globl sym_2_571
-+sym_2_571: la $2, sym_2_571
-+.globl sym_2_572
-+sym_2_572: la $2, sym_2_572
-+.globl sym_2_573
-+sym_2_573: la $2, sym_2_573
-+.globl sym_2_574
-+sym_2_574: la $2, sym_2_574
-+.globl sym_2_575
-+sym_2_575: la $2, sym_2_575
-+.globl sym_2_576
-+sym_2_576: la $2, sym_2_576
-+.globl sym_2_577
-+sym_2_577: la $2, sym_2_577
-+.globl sym_2_578
-+sym_2_578: la $2, sym_2_578
-+.globl sym_2_579
-+sym_2_579: la $2, sym_2_579
-+.globl sym_2_580
-+sym_2_580: la $2, sym_2_580
-+.globl sym_2_581
-+sym_2_581: la $2, sym_2_581
-+.globl sym_2_582
-+sym_2_582: la $2, sym_2_582
-+.globl sym_2_583
-+sym_2_583: la $2, sym_2_583
-+.globl sym_2_584
-+sym_2_584: la $2, sym_2_584
-+.globl sym_2_585
-+sym_2_585: la $2, sym_2_585
-+.globl sym_2_586
-+sym_2_586: la $2, sym_2_586
-+.globl sym_2_587
-+sym_2_587: la $2, sym_2_587
-+.globl sym_2_588
-+sym_2_588: la $2, sym_2_588
-+.globl sym_2_589
-+sym_2_589: la $2, sym_2_589
-+.globl sym_2_590
-+sym_2_590: la $2, sym_2_590
-+.globl sym_2_591
-+sym_2_591: la $2, sym_2_591
-+.globl sym_2_592
-+sym_2_592: la $2, sym_2_592
-+.globl sym_2_593
-+sym_2_593: la $2, sym_2_593
-+.globl sym_2_594
-+sym_2_594: la $2, sym_2_594
-+.globl sym_2_595
-+sym_2_595: la $2, sym_2_595
-+.globl sym_2_596
-+sym_2_596: la $2, sym_2_596
-+.globl sym_2_597
-+sym_2_597: la $2, sym_2_597
-+.globl sym_2_598
-+sym_2_598: la $2, sym_2_598
-+.globl sym_2_599
-+sym_2_599: la $2, sym_2_599
-+.globl sym_2_600
-+sym_2_600: la $2, sym_2_600
-+.globl sym_2_601
-+sym_2_601: la $2, sym_2_601
-+.globl sym_2_602
-+sym_2_602: la $2, sym_2_602
-+.globl sym_2_603
-+sym_2_603: la $2, sym_2_603
-+.globl sym_2_604
-+sym_2_604: la $2, sym_2_604
-+.globl sym_2_605
-+sym_2_605: la $2, sym_2_605
-+.globl sym_2_606
-+sym_2_606: la $2, sym_2_606
-+.globl sym_2_607
-+sym_2_607: la $2, sym_2_607
-+.globl sym_2_608
-+sym_2_608: la $2, sym_2_608
-+.globl sym_2_609
-+sym_2_609: la $2, sym_2_609
-+.globl sym_2_610
-+sym_2_610: la $2, sym_2_610
-+.globl sym_2_611
-+sym_2_611: la $2, sym_2_611
-+.globl sym_2_612
-+sym_2_612: la $2, sym_2_612
-+.globl sym_2_613
-+sym_2_613: la $2, sym_2_613
-+.globl sym_2_614
-+sym_2_614: la $2, sym_2_614
-+.globl sym_2_615
-+sym_2_615: la $2, sym_2_615
-+.globl sym_2_616
-+sym_2_616: la $2, sym_2_616
-+.globl sym_2_617
-+sym_2_617: la $2, sym_2_617
-+.globl sym_2_618
-+sym_2_618: la $2, sym_2_618
-+.globl sym_2_619
-+sym_2_619: la $2, sym_2_619
-+.globl sym_2_620
-+sym_2_620: la $2, sym_2_620
-+.globl sym_2_621
-+sym_2_621: la $2, sym_2_621
-+.globl sym_2_622
-+sym_2_622: la $2, sym_2_622
-+.globl sym_2_623
-+sym_2_623: la $2, sym_2_623
-+.globl sym_2_624
-+sym_2_624: la $2, sym_2_624
-+.globl sym_2_625
-+sym_2_625: la $2, sym_2_625
-+.globl sym_2_626
-+sym_2_626: la $2, sym_2_626
-+.globl sym_2_627
-+sym_2_627: la $2, sym_2_627
-+.globl sym_2_628
-+sym_2_628: la $2, sym_2_628
-+.globl sym_2_629
-+sym_2_629: la $2, sym_2_629
-+.globl sym_2_630
-+sym_2_630: la $2, sym_2_630
-+.globl sym_2_631
-+sym_2_631: la $2, sym_2_631
-+.globl sym_2_632
-+sym_2_632: la $2, sym_2_632
-+.globl sym_2_633
-+sym_2_633: la $2, sym_2_633
-+.globl sym_2_634
-+sym_2_634: la $2, sym_2_634
-+.globl sym_2_635
-+sym_2_635: la $2, sym_2_635
-+.globl sym_2_636
-+sym_2_636: la $2, sym_2_636
-+.globl sym_2_637
-+sym_2_637: la $2, sym_2_637
-+.globl sym_2_638
-+sym_2_638: la $2, sym_2_638
-+.globl sym_2_639
-+sym_2_639: la $2, sym_2_639
-+.globl sym_2_640
-+sym_2_640: la $2, sym_2_640
-+.globl sym_2_641
-+sym_2_641: la $2, sym_2_641
-+.globl sym_2_642
-+sym_2_642: la $2, sym_2_642
-+.globl sym_2_643
-+sym_2_643: la $2, sym_2_643
-+.globl sym_2_644
-+sym_2_644: la $2, sym_2_644
-+.globl sym_2_645
-+sym_2_645: la $2, sym_2_645
-+.globl sym_2_646
-+sym_2_646: la $2, sym_2_646
-+.globl sym_2_647
-+sym_2_647: la $2, sym_2_647
-+.globl sym_2_648
-+sym_2_648: la $2, sym_2_648
-+.globl sym_2_649
-+sym_2_649: la $2, sym_2_649
-+.globl sym_2_650
-+sym_2_650: la $2, sym_2_650
-+.globl sym_2_651
-+sym_2_651: la $2, sym_2_651
-+.globl sym_2_652
-+sym_2_652: la $2, sym_2_652
-+.globl sym_2_653
-+sym_2_653: la $2, sym_2_653
-+.globl sym_2_654
-+sym_2_654: la $2, sym_2_654
-+.globl sym_2_655
-+sym_2_655: la $2, sym_2_655
-+.globl sym_2_656
-+sym_2_656: la $2, sym_2_656
-+.globl sym_2_657
-+sym_2_657: la $2, sym_2_657
-+.globl sym_2_658
-+sym_2_658: la $2, sym_2_658
-+.globl sym_2_659
-+sym_2_659: la $2, sym_2_659
-+.globl sym_2_660
-+sym_2_660: la $2, sym_2_660
-+.globl sym_2_661
-+sym_2_661: la $2, sym_2_661
-+.globl sym_2_662
-+sym_2_662: la $2, sym_2_662
-+.globl sym_2_663
-+sym_2_663: la $2, sym_2_663
-+.globl sym_2_664
-+sym_2_664: la $2, sym_2_664
-+.globl sym_2_665
-+sym_2_665: la $2, sym_2_665
-+.globl sym_2_666
-+sym_2_666: la $2, sym_2_666
-+.globl sym_2_667
-+sym_2_667: la $2, sym_2_667
-+.globl sym_2_668
-+sym_2_668: la $2, sym_2_668
-+.globl sym_2_669
-+sym_2_669: la $2, sym_2_669
-+.globl sym_2_670
-+sym_2_670: la $2, sym_2_670
-+.globl sym_2_671
-+sym_2_671: la $2, sym_2_671
-+.globl sym_2_672
-+sym_2_672: la $2, sym_2_672
-+.globl sym_2_673
-+sym_2_673: la $2, sym_2_673
-+.globl sym_2_674
-+sym_2_674: la $2, sym_2_674
-+.globl sym_2_675
-+sym_2_675: la $2, sym_2_675
-+.globl sym_2_676
-+sym_2_676: la $2, sym_2_676
-+.globl sym_2_677
-+sym_2_677: la $2, sym_2_677
-+.globl sym_2_678
-+sym_2_678: la $2, sym_2_678
-+.globl sym_2_679
-+sym_2_679: la $2, sym_2_679
-+.globl sym_2_680
-+sym_2_680: la $2, sym_2_680
-+.globl sym_2_681
-+sym_2_681: la $2, sym_2_681
-+.globl sym_2_682
-+sym_2_682: la $2, sym_2_682
-+.globl sym_2_683
-+sym_2_683: la $2, sym_2_683
-+.globl sym_2_684
-+sym_2_684: la $2, sym_2_684
-+.globl sym_2_685
-+sym_2_685: la $2, sym_2_685
-+.globl sym_2_686
-+sym_2_686: la $2, sym_2_686
-+.globl sym_2_687
-+sym_2_687: la $2, sym_2_687
-+.globl sym_2_688
-+sym_2_688: la $2, sym_2_688
-+.globl sym_2_689
-+sym_2_689: la $2, sym_2_689
-+.globl sym_2_690
-+sym_2_690: la $2, sym_2_690
-+.globl sym_2_691
-+sym_2_691: la $2, sym_2_691
-+.globl sym_2_692
-+sym_2_692: la $2, sym_2_692
-+.globl sym_2_693
-+sym_2_693: la $2, sym_2_693
-+.globl sym_2_694
-+sym_2_694: la $2, sym_2_694
-+.globl sym_2_695
-+sym_2_695: la $2, sym_2_695
-+.globl sym_2_696
-+sym_2_696: la $2, sym_2_696
-+.globl sym_2_697
-+sym_2_697: la $2, sym_2_697
-+.globl sym_2_698
-+sym_2_698: la $2, sym_2_698
-+.globl sym_2_699
-+sym_2_699: la $2, sym_2_699
-+.globl sym_2_700
-+sym_2_700: la $2, sym_2_700
-+.globl sym_2_701
-+sym_2_701: la $2, sym_2_701
-+.globl sym_2_702
-+sym_2_702: la $2, sym_2_702
-+.globl sym_2_703
-+sym_2_703: la $2, sym_2_703
-+.globl sym_2_704
-+sym_2_704: la $2, sym_2_704
-+.globl sym_2_705
-+sym_2_705: la $2, sym_2_705
-+.globl sym_2_706
-+sym_2_706: la $2, sym_2_706
-+.globl sym_2_707
-+sym_2_707: la $2, sym_2_707
-+.globl sym_2_708
-+sym_2_708: la $2, sym_2_708
-+.globl sym_2_709
-+sym_2_709: la $2, sym_2_709
-+.globl sym_2_710
-+sym_2_710: la $2, sym_2_710
-+.globl sym_2_711
-+sym_2_711: la $2, sym_2_711
-+.globl sym_2_712
-+sym_2_712: la $2, sym_2_712
-+.globl sym_2_713
-+sym_2_713: la $2, sym_2_713
-+.globl sym_2_714
-+sym_2_714: la $2, sym_2_714
-+.globl sym_2_715
-+sym_2_715: la $2, sym_2_715
-+.globl sym_2_716
-+sym_2_716: la $2, sym_2_716
-+.globl sym_2_717
-+sym_2_717: la $2, sym_2_717
-+.globl sym_2_718
-+sym_2_718: la $2, sym_2_718
-+.globl sym_2_719
-+sym_2_719: la $2, sym_2_719
-+.globl sym_2_720
-+sym_2_720: la $2, sym_2_720
-+.globl sym_2_721
-+sym_2_721: la $2, sym_2_721
-+.globl sym_2_722
-+sym_2_722: la $2, sym_2_722
-+.globl sym_2_723
-+sym_2_723: la $2, sym_2_723
-+.globl sym_2_724
-+sym_2_724: la $2, sym_2_724
-+.globl sym_2_725
-+sym_2_725: la $2, sym_2_725
-+.globl sym_2_726
-+sym_2_726: la $2, sym_2_726
-+.globl sym_2_727
-+sym_2_727: la $2, sym_2_727
-+.globl sym_2_728
-+sym_2_728: la $2, sym_2_728
-+.globl sym_2_729
-+sym_2_729: la $2, sym_2_729
-+.globl sym_2_730
-+sym_2_730: la $2, sym_2_730
-+.globl sym_2_731
-+sym_2_731: la $2, sym_2_731
-+.globl sym_2_732
-+sym_2_732: la $2, sym_2_732
-+.globl sym_2_733
-+sym_2_733: la $2, sym_2_733
-+.globl sym_2_734
-+sym_2_734: la $2, sym_2_734
-+.globl sym_2_735
-+sym_2_735: la $2, sym_2_735
-+.globl sym_2_736
-+sym_2_736: la $2, sym_2_736
-+.globl sym_2_737
-+sym_2_737: la $2, sym_2_737
-+.globl sym_2_738
-+sym_2_738: la $2, sym_2_738
-+.globl sym_2_739
-+sym_2_739: la $2, sym_2_739
-+.globl sym_2_740
-+sym_2_740: la $2, sym_2_740
-+.globl sym_2_741
-+sym_2_741: la $2, sym_2_741
-+.globl sym_2_742
-+sym_2_742: la $2, sym_2_742
-+.globl sym_2_743
-+sym_2_743: la $2, sym_2_743
-+.globl sym_2_744
-+sym_2_744: la $2, sym_2_744
-+.globl sym_2_745
-+sym_2_745: la $2, sym_2_745
-+.globl sym_2_746
-+sym_2_746: la $2, sym_2_746
-+.globl sym_2_747
-+sym_2_747: la $2, sym_2_747
-+.globl sym_2_748
-+sym_2_748: la $2, sym_2_748
-+.globl sym_2_749
-+sym_2_749: la $2, sym_2_749
-+.globl sym_2_750
-+sym_2_750: la $2, sym_2_750
-+.globl sym_2_751
-+sym_2_751: la $2, sym_2_751
-+.globl sym_2_752
-+sym_2_752: la $2, sym_2_752
-+.globl sym_2_753
-+sym_2_753: la $2, sym_2_753
-+.globl sym_2_754
-+sym_2_754: la $2, sym_2_754
-+.globl sym_2_755
-+sym_2_755: la $2, sym_2_755
-+.globl sym_2_756
-+sym_2_756: la $2, sym_2_756
-+.globl sym_2_757
-+sym_2_757: la $2, sym_2_757
-+.globl sym_2_758
-+sym_2_758: la $2, sym_2_758
-+.globl sym_2_759
-+sym_2_759: la $2, sym_2_759
-+.globl sym_2_760
-+sym_2_760: la $2, sym_2_760
-+.globl sym_2_761
-+sym_2_761: la $2, sym_2_761
-+.globl sym_2_762
-+sym_2_762: la $2, sym_2_762
-+.globl sym_2_763
-+sym_2_763: la $2, sym_2_763
-+.globl sym_2_764
-+sym_2_764: la $2, sym_2_764
-+.globl sym_2_765
-+sym_2_765: la $2, sym_2_765
-+.globl sym_2_766
-+sym_2_766: la $2, sym_2_766
-+.globl sym_2_767
-+sym_2_767: la $2, sym_2_767
-+.globl sym_2_768
-+sym_2_768: la $2, sym_2_768
-+.globl sym_2_769
-+sym_2_769: la $2, sym_2_769
-+.globl sym_2_770
-+sym_2_770: la $2, sym_2_770
-+.globl sym_2_771
-+sym_2_771: la $2, sym_2_771
-+.globl sym_2_772
-+sym_2_772: la $2, sym_2_772
-+.globl sym_2_773
-+sym_2_773: la $2, sym_2_773
-+.globl sym_2_774
-+sym_2_774: la $2, sym_2_774
-+.globl sym_2_775
-+sym_2_775: la $2, sym_2_775
-+.globl sym_2_776
-+sym_2_776: la $2, sym_2_776
-+.globl sym_2_777
-+sym_2_777: la $2, sym_2_777
-+.globl sym_2_778
-+sym_2_778: la $2, sym_2_778
-+.globl sym_2_779
-+sym_2_779: la $2, sym_2_779
-+.globl sym_2_780
-+sym_2_780: la $2, sym_2_780
-+.globl sym_2_781
-+sym_2_781: la $2, sym_2_781
-+.globl sym_2_782
-+sym_2_782: la $2, sym_2_782
-+.globl sym_2_783
-+sym_2_783: la $2, sym_2_783
-+.globl sym_2_784
-+sym_2_784: la $2, sym_2_784
-+.globl sym_2_785
-+sym_2_785: la $2, sym_2_785
-+.globl sym_2_786
-+sym_2_786: la $2, sym_2_786
-+.globl sym_2_787
-+sym_2_787: la $2, sym_2_787
-+.globl sym_2_788
-+sym_2_788: la $2, sym_2_788
-+.globl sym_2_789
-+sym_2_789: la $2, sym_2_789
-+.globl sym_2_790
-+sym_2_790: la $2, sym_2_790
-+.globl sym_2_791
-+sym_2_791: la $2, sym_2_791
-+.globl sym_2_792
-+sym_2_792: la $2, sym_2_792
-+.globl sym_2_793
-+sym_2_793: la $2, sym_2_793
-+.globl sym_2_794
-+sym_2_794: la $2, sym_2_794
-+.globl sym_2_795
-+sym_2_795: la $2, sym_2_795
-+.globl sym_2_796
-+sym_2_796: la $2, sym_2_796
-+.globl sym_2_797
-+sym_2_797: la $2, sym_2_797
-+.globl sym_2_798
-+sym_2_798: la $2, sym_2_798
-+.globl sym_2_799
-+sym_2_799: la $2, sym_2_799
-+.globl sym_2_800
-+sym_2_800: la $2, sym_2_800
-+.globl sym_2_801
-+sym_2_801: la $2, sym_2_801
-+.globl sym_2_802
-+sym_2_802: la $2, sym_2_802
-+.globl sym_2_803
-+sym_2_803: la $2, sym_2_803
-+.globl sym_2_804
-+sym_2_804: la $2, sym_2_804
-+.globl sym_2_805
-+sym_2_805: la $2, sym_2_805
-+.globl sym_2_806
-+sym_2_806: la $2, sym_2_806
-+.globl sym_2_807
-+sym_2_807: la $2, sym_2_807
-+.globl sym_2_808
-+sym_2_808: la $2, sym_2_808
-+.globl sym_2_809
-+sym_2_809: la $2, sym_2_809
-+.globl sym_2_810
-+sym_2_810: la $2, sym_2_810
-+.globl sym_2_811
-+sym_2_811: la $2, sym_2_811
-+.globl sym_2_812
-+sym_2_812: la $2, sym_2_812
-+.globl sym_2_813
-+sym_2_813: la $2, sym_2_813
-+.globl sym_2_814
-+sym_2_814: la $2, sym_2_814
-+.globl sym_2_815
-+sym_2_815: la $2, sym_2_815
-+.globl sym_2_816
-+sym_2_816: la $2, sym_2_816
-+.globl sym_2_817
-+sym_2_817: la $2, sym_2_817
-+.globl sym_2_818
-+sym_2_818: la $2, sym_2_818
-+.globl sym_2_819
-+sym_2_819: la $2, sym_2_819
-+.globl sym_2_820
-+sym_2_820: la $2, sym_2_820
-+.globl sym_2_821
-+sym_2_821: la $2, sym_2_821
-+.globl sym_2_822
-+sym_2_822: la $2, sym_2_822
-+.globl sym_2_823
-+sym_2_823: la $2, sym_2_823
-+.globl sym_2_824
-+sym_2_824: la $2, sym_2_824
-+.globl sym_2_825
-+sym_2_825: la $2, sym_2_825
-+.globl sym_2_826
-+sym_2_826: la $2, sym_2_826
-+.globl sym_2_827
-+sym_2_827: la $2, sym_2_827
-+.globl sym_2_828
-+sym_2_828: la $2, sym_2_828
-+.globl sym_2_829
-+sym_2_829: la $2, sym_2_829
-+.globl sym_2_830
-+sym_2_830: la $2, sym_2_830
-+.globl sym_2_831
-+sym_2_831: la $2, sym_2_831
-+.globl sym_2_832
-+sym_2_832: la $2, sym_2_832
-+.globl sym_2_833
-+sym_2_833: la $2, sym_2_833
-+.globl sym_2_834
-+sym_2_834: la $2, sym_2_834
-+.globl sym_2_835
-+sym_2_835: la $2, sym_2_835
-+.globl sym_2_836
-+sym_2_836: la $2, sym_2_836
-+.globl sym_2_837
-+sym_2_837: la $2, sym_2_837
-+.globl sym_2_838
-+sym_2_838: la $2, sym_2_838
-+.globl sym_2_839
-+sym_2_839: la $2, sym_2_839
-+.globl sym_2_840
-+sym_2_840: la $2, sym_2_840
-+.globl sym_2_841
-+sym_2_841: la $2, sym_2_841
-+.globl sym_2_842
-+sym_2_842: la $2, sym_2_842
-+.globl sym_2_843
-+sym_2_843: la $2, sym_2_843
-+.globl sym_2_844
-+sym_2_844: la $2, sym_2_844
-+.globl sym_2_845
-+sym_2_845: la $2, sym_2_845
-+.globl sym_2_846
-+sym_2_846: la $2, sym_2_846
-+.globl sym_2_847
-+sym_2_847: la $2, sym_2_847
-+.globl sym_2_848
-+sym_2_848: la $2, sym_2_848
-+.globl sym_2_849
-+sym_2_849: la $2, sym_2_849
-+.globl sym_2_850
-+sym_2_850: la $2, sym_2_850
-+.globl sym_2_851
-+sym_2_851: la $2, sym_2_851
-+.globl sym_2_852
-+sym_2_852: la $2, sym_2_852
-+.globl sym_2_853
-+sym_2_853: la $2, sym_2_853
-+.globl sym_2_854
-+sym_2_854: la $2, sym_2_854
-+.globl sym_2_855
-+sym_2_855: la $2, sym_2_855
-+.globl sym_2_856
-+sym_2_856: la $2, sym_2_856
-+.globl sym_2_857
-+sym_2_857: la $2, sym_2_857
-+.globl sym_2_858
-+sym_2_858: la $2, sym_2_858
-+.globl sym_2_859
-+sym_2_859: la $2, sym_2_859
-+.globl sym_2_860
-+sym_2_860: la $2, sym_2_860
-+.globl sym_2_861
-+sym_2_861: la $2, sym_2_861
-+.globl sym_2_862
-+sym_2_862: la $2, sym_2_862
-+.globl sym_2_863
-+sym_2_863: la $2, sym_2_863
-+.globl sym_2_864
-+sym_2_864: la $2, sym_2_864
-+.globl sym_2_865
-+sym_2_865: la $2, sym_2_865
-+.globl sym_2_866
-+sym_2_866: la $2, sym_2_866
-+.globl sym_2_867
-+sym_2_867: la $2, sym_2_867
-+.globl sym_2_868
-+sym_2_868: la $2, sym_2_868
-+.globl sym_2_869
-+sym_2_869: la $2, sym_2_869
-+.globl sym_2_870
-+sym_2_870: la $2, sym_2_870
-+.globl sym_2_871
-+sym_2_871: la $2, sym_2_871
-+.globl sym_2_872
-+sym_2_872: la $2, sym_2_872
-+.globl sym_2_873
-+sym_2_873: la $2, sym_2_873
-+.globl sym_2_874
-+sym_2_874: la $2, sym_2_874
-+.globl sym_2_875
-+sym_2_875: la $2, sym_2_875
-+.globl sym_2_876
-+sym_2_876: la $2, sym_2_876
-+.globl sym_2_877
-+sym_2_877: la $2, sym_2_877
-+.globl sym_2_878
-+sym_2_878: la $2, sym_2_878
-+.globl sym_2_879
-+sym_2_879: la $2, sym_2_879
-+.globl sym_2_880
-+sym_2_880: la $2, sym_2_880
-+.globl sym_2_881
-+sym_2_881: la $2, sym_2_881
-+.globl sym_2_882
-+sym_2_882: la $2, sym_2_882
-+.globl sym_2_883
-+sym_2_883: la $2, sym_2_883
-+.globl sym_2_884
-+sym_2_884: la $2, sym_2_884
-+.globl sym_2_885
-+sym_2_885: la $2, sym_2_885
-+.globl sym_2_886
-+sym_2_886: la $2, sym_2_886
-+.globl sym_2_887
-+sym_2_887: la $2, sym_2_887
-+.globl sym_2_888
-+sym_2_888: la $2, sym_2_888
-+.globl sym_2_889
-+sym_2_889: la $2, sym_2_889
-+.globl sym_2_890
-+sym_2_890: la $2, sym_2_890
-+.globl sym_2_891
-+sym_2_891: la $2, sym_2_891
-+.globl sym_2_892
-+sym_2_892: la $2, sym_2_892
-+.globl sym_2_893
-+sym_2_893: la $2, sym_2_893
-+.globl sym_2_894
-+sym_2_894: la $2, sym_2_894
-+.globl sym_2_895
-+sym_2_895: la $2, sym_2_895
-+.globl sym_2_896
-+sym_2_896: la $2, sym_2_896
-+.globl sym_2_897
-+sym_2_897: la $2, sym_2_897
-+.globl sym_2_898
-+sym_2_898: la $2, sym_2_898
-+.globl sym_2_899
-+sym_2_899: la $2, sym_2_899
-+.globl sym_2_900
-+sym_2_900: la $2, sym_2_900
-+.globl sym_2_901
-+sym_2_901: la $2, sym_2_901
-+.globl sym_2_902
-+sym_2_902: la $2, sym_2_902
-+.globl sym_2_903
-+sym_2_903: la $2, sym_2_903
-+.globl sym_2_904
-+sym_2_904: la $2, sym_2_904
-+.globl sym_2_905
-+sym_2_905: la $2, sym_2_905
-+.globl sym_2_906
-+sym_2_906: la $2, sym_2_906
-+.globl sym_2_907
-+sym_2_907: la $2, sym_2_907
-+.globl sym_2_908
-+sym_2_908: la $2, sym_2_908
-+.globl sym_2_909
-+sym_2_909: la $2, sym_2_909
-+.globl sym_2_910
-+sym_2_910: la $2, sym_2_910
-+.globl sym_2_911
-+sym_2_911: la $2, sym_2_911
-+.globl sym_2_912
-+sym_2_912: la $2, sym_2_912
-+.globl sym_2_913
-+sym_2_913: la $2, sym_2_913
-+.globl sym_2_914
-+sym_2_914: la $2, sym_2_914
-+.globl sym_2_915
-+sym_2_915: la $2, sym_2_915
-+.globl sym_2_916
-+sym_2_916: la $2, sym_2_916
-+.globl sym_2_917
-+sym_2_917: la $2, sym_2_917
-+.globl sym_2_918
-+sym_2_918: la $2, sym_2_918
-+.globl sym_2_919
-+sym_2_919: la $2, sym_2_919
-+.globl sym_2_920
-+sym_2_920: la $2, sym_2_920
-+.globl sym_2_921
-+sym_2_921: la $2, sym_2_921
-+.globl sym_2_922
-+sym_2_922: la $2, sym_2_922
-+.globl sym_2_923
-+sym_2_923: la $2, sym_2_923
-+.globl sym_2_924
-+sym_2_924: la $2, sym_2_924
-+.globl sym_2_925
-+sym_2_925: la $2, sym_2_925
-+.globl sym_2_926
-+sym_2_926: la $2, sym_2_926
-+.globl sym_2_927
-+sym_2_927: la $2, sym_2_927
-+.globl sym_2_928
-+sym_2_928: la $2, sym_2_928
-+.globl sym_2_929
-+sym_2_929: la $2, sym_2_929
-+.globl sym_2_930
-+sym_2_930: la $2, sym_2_930
-+.globl sym_2_931
-+sym_2_931: la $2, sym_2_931
-+.globl sym_2_932
-+sym_2_932: la $2, sym_2_932
-+.globl sym_2_933
-+sym_2_933: la $2, sym_2_933
-+.globl sym_2_934
-+sym_2_934: la $2, sym_2_934
-+.globl sym_2_935
-+sym_2_935: la $2, sym_2_935
-+.globl sym_2_936
-+sym_2_936: la $2, sym_2_936
-+.globl sym_2_937
-+sym_2_937: la $2, sym_2_937
-+.globl sym_2_938
-+sym_2_938: la $2, sym_2_938
-+.globl sym_2_939
-+sym_2_939: la $2, sym_2_939
-+.globl sym_2_940
-+sym_2_940: la $2, sym_2_940
-+.globl sym_2_941
-+sym_2_941: la $2, sym_2_941
-+.globl sym_2_942
-+sym_2_942: la $2, sym_2_942
-+.globl sym_2_943
-+sym_2_943: la $2, sym_2_943
-+.globl sym_2_944
-+sym_2_944: la $2, sym_2_944
-+.globl sym_2_945
-+sym_2_945: la $2, sym_2_945
-+.globl sym_2_946
-+sym_2_946: la $2, sym_2_946
-+.globl sym_2_947
-+sym_2_947: la $2, sym_2_947
-+.globl sym_2_948
-+sym_2_948: la $2, sym_2_948
-+.globl sym_2_949
-+sym_2_949: la $2, sym_2_949
-+.globl sym_2_950
-+sym_2_950: la $2, sym_2_950
-+.globl sym_2_951
-+sym_2_951: la $2, sym_2_951
-+.globl sym_2_952
-+sym_2_952: la $2, sym_2_952
-+.globl sym_2_953
-+sym_2_953: la $2, sym_2_953
-+.globl sym_2_954
-+sym_2_954: la $2, sym_2_954
-+.globl sym_2_955
-+sym_2_955: la $2, sym_2_955
-+.globl sym_2_956
-+sym_2_956: la $2, sym_2_956
-+.globl sym_2_957
-+sym_2_957: la $2, sym_2_957
-+.globl sym_2_958
-+sym_2_958: la $2, sym_2_958
-+.globl sym_2_959
-+sym_2_959: la $2, sym_2_959
-+.globl sym_2_960
-+sym_2_960: la $2, sym_2_960
-+.globl sym_2_961
-+sym_2_961: la $2, sym_2_961
-+.globl sym_2_962
-+sym_2_962: la $2, sym_2_962
-+.globl sym_2_963
-+sym_2_963: la $2, sym_2_963
-+.globl sym_2_964
-+sym_2_964: la $2, sym_2_964
-+.globl sym_2_965
-+sym_2_965: la $2, sym_2_965
-+.globl sym_2_966
-+sym_2_966: la $2, sym_2_966
-+.globl sym_2_967
-+sym_2_967: la $2, sym_2_967
-+.globl sym_2_968
-+sym_2_968: la $2, sym_2_968
-+.globl sym_2_969
-+sym_2_969: la $2, sym_2_969
-+.globl sym_2_970
-+sym_2_970: la $2, sym_2_970
-+.globl sym_2_971
-+sym_2_971: la $2, sym_2_971
-+.globl sym_2_972
-+sym_2_972: la $2, sym_2_972
-+.globl sym_2_973
-+sym_2_973: la $2, sym_2_973
-+.globl sym_2_974
-+sym_2_974: la $2, sym_2_974
-+.globl sym_2_975
-+sym_2_975: la $2, sym_2_975
-+.globl sym_2_976
-+sym_2_976: la $2, sym_2_976
-+.globl sym_2_977
-+sym_2_977: la $2, sym_2_977
-+.globl sym_2_978
-+sym_2_978: la $2, sym_2_978
-+.globl sym_2_979
-+sym_2_979: la $2, sym_2_979
-+.globl sym_2_980
-+sym_2_980: la $2, sym_2_980
-+.globl sym_2_981
-+sym_2_981: la $2, sym_2_981
-+.globl sym_2_982
-+sym_2_982: la $2, sym_2_982
-+.globl sym_2_983
-+sym_2_983: la $2, sym_2_983
-+.globl sym_2_984
-+sym_2_984: la $2, sym_2_984
-+.globl sym_2_985
-+sym_2_985: la $2, sym_2_985
-+.globl sym_2_986
-+sym_2_986: la $2, sym_2_986
-+.globl sym_2_987
-+sym_2_987: la $2, sym_2_987
-+.globl sym_2_988
-+sym_2_988: la $2, sym_2_988
-+.globl sym_2_989
-+sym_2_989: la $2, sym_2_989
-+.globl sym_2_990
-+sym_2_990: la $2, sym_2_990
-+.globl sym_2_991
-+sym_2_991: la $2, sym_2_991
-+.globl sym_2_992
-+sym_2_992: la $2, sym_2_992
-+.globl sym_2_993
-+sym_2_993: la $2, sym_2_993
-+.globl sym_2_994
-+sym_2_994: la $2, sym_2_994
-+.globl sym_2_995
-+sym_2_995: la $2, sym_2_995
-+.globl sym_2_996
-+sym_2_996: la $2, sym_2_996
-+.globl sym_2_997
-+sym_2_997: la $2, sym_2_997
-+.globl sym_2_998
-+sym_2_998: la $2, sym_2_998
-+.globl sym_2_999
-+sym_2_999: la $2, sym_2_999
-+.globl sym_2_1000
-+sym_2_1000: la $2, sym_2_1000
-+.globl sym_2_1001
-+sym_2_1001: la $2, sym_2_1001
-+.globl sym_2_1002
-+sym_2_1002: la $2, sym_2_1002
-+.globl sym_2_1003
-+sym_2_1003: la $2, sym_2_1003
-+.globl sym_2_1004
-+sym_2_1004: la $2, sym_2_1004
-+.globl sym_2_1005
-+sym_2_1005: la $2, sym_2_1005
-+.globl sym_2_1006
-+sym_2_1006: la $2, sym_2_1006
-+.globl sym_2_1007
-+sym_2_1007: la $2, sym_2_1007
-+.globl sym_2_1008
-+sym_2_1008: la $2, sym_2_1008
-+.globl sym_2_1009
-+sym_2_1009: la $2, sym_2_1009
-+.globl sym_2_1010
-+sym_2_1010: la $2, sym_2_1010
-+.globl sym_2_1011
-+sym_2_1011: la $2, sym_2_1011
-+.globl sym_2_1012
-+sym_2_1012: la $2, sym_2_1012
-+.globl sym_2_1013
-+sym_2_1013: la $2, sym_2_1013
-+.globl sym_2_1014
-+sym_2_1014: la $2, sym_2_1014
-+.globl sym_2_1015
-+sym_2_1015: la $2, sym_2_1015
-+.globl sym_2_1016
-+sym_2_1016: la $2, sym_2_1016
-+.globl sym_2_1017
-+sym_2_1017: la $2, sym_2_1017
-+.globl sym_2_1018
-+sym_2_1018: la $2, sym_2_1018
-+.globl sym_2_1019
-+sym_2_1019: la $2, sym_2_1019
-+.globl sym_2_1020
-+sym_2_1020: la $2, sym_2_1020
-+.globl sym_2_1021
-+sym_2_1021: la $2, sym_2_1021
-+.globl sym_2_1022
-+sym_2_1022: la $2, sym_2_1022
-+.globl sym_2_1023
-+sym_2_1023: la $2, sym_2_1023
-+.globl sym_2_1024
-+sym_2_1024: la $2, sym_2_1024
-+.globl sym_2_1025
-+sym_2_1025: la $2, sym_2_1025
-+.globl sym_2_1026
-+sym_2_1026: la $2, sym_2_1026
-+.globl sym_2_1027
-+sym_2_1027: la $2, sym_2_1027
-+.globl sym_2_1028
-+sym_2_1028: la $2, sym_2_1028
-+.globl sym_2_1029
-+sym_2_1029: la $2, sym_2_1029
-+.globl sym_2_1030
-+sym_2_1030: la $2, sym_2_1030
-+.globl sym_2_1031
-+sym_2_1031: la $2, sym_2_1031
-+.globl sym_2_1032
-+sym_2_1032: la $2, sym_2_1032
-+.globl sym_2_1033
-+sym_2_1033: la $2, sym_2_1033
-+.globl sym_2_1034
-+sym_2_1034: la $2, sym_2_1034
-+.globl sym_2_1035
-+sym_2_1035: la $2, sym_2_1035
-+.globl sym_2_1036
-+sym_2_1036: la $2, sym_2_1036
-+.globl sym_2_1037
-+sym_2_1037: la $2, sym_2_1037
-+.globl sym_2_1038
-+sym_2_1038: la $2, sym_2_1038
-+.globl sym_2_1039
-+sym_2_1039: la $2, sym_2_1039
-+.globl sym_2_1040
-+sym_2_1040: la $2, sym_2_1040
-+.globl sym_2_1041
-+sym_2_1041: la $2, sym_2_1041
-+.globl sym_2_1042
-+sym_2_1042: la $2, sym_2_1042
-+.globl sym_2_1043
-+sym_2_1043: la $2, sym_2_1043
-+.globl sym_2_1044
-+sym_2_1044: la $2, sym_2_1044
-+.globl sym_2_1045
-+sym_2_1045: la $2, sym_2_1045
-+.globl sym_2_1046
-+sym_2_1046: la $2, sym_2_1046
-+.globl sym_2_1047
-+sym_2_1047: la $2, sym_2_1047
-+.globl sym_2_1048
-+sym_2_1048: la $2, sym_2_1048
-+.globl sym_2_1049
-+sym_2_1049: la $2, sym_2_1049
-+.globl sym_2_1050
-+sym_2_1050: la $2, sym_2_1050
-+.globl sym_2_1051
-+sym_2_1051: la $2, sym_2_1051
-+.globl sym_2_1052
-+sym_2_1052: la $2, sym_2_1052
-+.globl sym_2_1053
-+sym_2_1053: la $2, sym_2_1053
-+.globl sym_2_1054
-+sym_2_1054: la $2, sym_2_1054
-+.globl sym_2_1055
-+sym_2_1055: la $2, sym_2_1055
-+.globl sym_2_1056
-+sym_2_1056: la $2, sym_2_1056
-+.globl sym_2_1057
-+sym_2_1057: la $2, sym_2_1057
-+.globl sym_2_1058
-+sym_2_1058: la $2, sym_2_1058
-+.globl sym_2_1059
-+sym_2_1059: la $2, sym_2_1059
-+.globl sym_2_1060
-+sym_2_1060: la $2, sym_2_1060
-+.globl sym_2_1061
-+sym_2_1061: la $2, sym_2_1061
-+.globl sym_2_1062
-+sym_2_1062: la $2, sym_2_1062
-+.globl sym_2_1063
-+sym_2_1063: la $2, sym_2_1063
-+.globl sym_2_1064
-+sym_2_1064: la $2, sym_2_1064
-+.globl sym_2_1065
-+sym_2_1065: la $2, sym_2_1065
-+.globl sym_2_1066
-+sym_2_1066: la $2, sym_2_1066
-+.globl sym_2_1067
-+sym_2_1067: la $2, sym_2_1067
-+.globl sym_2_1068
-+sym_2_1068: la $2, sym_2_1068
-+.globl sym_2_1069
-+sym_2_1069: la $2, sym_2_1069
-+.globl sym_2_1070
-+sym_2_1070: la $2, sym_2_1070
-+.globl sym_2_1071
-+sym_2_1071: la $2, sym_2_1071
-+.globl sym_2_1072
-+sym_2_1072: la $2, sym_2_1072
-+.globl sym_2_1073
-+sym_2_1073: la $2, sym_2_1073
-+.globl sym_2_1074
-+sym_2_1074: la $2, sym_2_1074
-+.globl sym_2_1075
-+sym_2_1075: la $2, sym_2_1075
-+.globl sym_2_1076
-+sym_2_1076: la $2, sym_2_1076
-+.globl sym_2_1077
-+sym_2_1077: la $2, sym_2_1077
-+.globl sym_2_1078
-+sym_2_1078: la $2, sym_2_1078
-+.globl sym_2_1079
-+sym_2_1079: la $2, sym_2_1079
-+.globl sym_2_1080
-+sym_2_1080: la $2, sym_2_1080
-+.globl sym_2_1081
-+sym_2_1081: la $2, sym_2_1081
-+.globl sym_2_1082
-+sym_2_1082: la $2, sym_2_1082
-+.globl sym_2_1083
-+sym_2_1083: la $2, sym_2_1083
-+.globl sym_2_1084
-+sym_2_1084: la $2, sym_2_1084
-+.globl sym_2_1085
-+sym_2_1085: la $2, sym_2_1085
-+.globl sym_2_1086
-+sym_2_1086: la $2, sym_2_1086
-+.globl sym_2_1087
-+sym_2_1087: la $2, sym_2_1087
-+.globl sym_2_1088
-+sym_2_1088: la $2, sym_2_1088
-+.globl sym_2_1089
-+sym_2_1089: la $2, sym_2_1089
-+.globl sym_2_1090
-+sym_2_1090: la $2, sym_2_1090
-+.globl sym_2_1091
-+sym_2_1091: la $2, sym_2_1091
-+.globl sym_2_1092
-+sym_2_1092: la $2, sym_2_1092
-+.globl sym_2_1093
-+sym_2_1093: la $2, sym_2_1093
-+.globl sym_2_1094
-+sym_2_1094: la $2, sym_2_1094
-+.globl sym_2_1095
-+sym_2_1095: la $2, sym_2_1095
-+.globl sym_2_1096
-+sym_2_1096: la $2, sym_2_1096
-+.globl sym_2_1097
-+sym_2_1097: la $2, sym_2_1097
-+.globl sym_2_1098
-+sym_2_1098: la $2, sym_2_1098
-+.globl sym_2_1099
-+sym_2_1099: la $2, sym_2_1099
-+.globl sym_2_1100
-+sym_2_1100: la $2, sym_2_1100
-+.globl sym_2_1101
-+sym_2_1101: la $2, sym_2_1101
-+.globl sym_2_1102
-+sym_2_1102: la $2, sym_2_1102
-+.globl sym_2_1103
-+sym_2_1103: la $2, sym_2_1103
-+.globl sym_2_1104
-+sym_2_1104: la $2, sym_2_1104
-+.globl sym_2_1105
-+sym_2_1105: la $2, sym_2_1105
-+.globl sym_2_1106
-+sym_2_1106: la $2, sym_2_1106
-+.globl sym_2_1107
-+sym_2_1107: la $2, sym_2_1107
-+.globl sym_2_1108
-+sym_2_1108: la $2, sym_2_1108
-+.globl sym_2_1109
-+sym_2_1109: la $2, sym_2_1109
-+.globl sym_2_1110
-+sym_2_1110: la $2, sym_2_1110
-+.globl sym_2_1111
-+sym_2_1111: la $2, sym_2_1111
-+.globl sym_2_1112
-+sym_2_1112: la $2, sym_2_1112
-+.globl sym_2_1113
-+sym_2_1113: la $2, sym_2_1113
-+.globl sym_2_1114
-+sym_2_1114: la $2, sym_2_1114
-+.globl sym_2_1115
-+sym_2_1115: la $2, sym_2_1115
-+.globl sym_2_1116
-+sym_2_1116: la $2, sym_2_1116
-+.globl sym_2_1117
-+sym_2_1117: la $2, sym_2_1117
-+.globl sym_2_1118
-+sym_2_1118: la $2, sym_2_1118
-+.globl sym_2_1119
-+sym_2_1119: la $2, sym_2_1119
-+.globl sym_2_1120
-+sym_2_1120: la $2, sym_2_1120
-+.globl sym_2_1121
-+sym_2_1121: la $2, sym_2_1121
-+.globl sym_2_1122
-+sym_2_1122: la $2, sym_2_1122
-+.globl sym_2_1123
-+sym_2_1123: la $2, sym_2_1123
-+.globl sym_2_1124
-+sym_2_1124: la $2, sym_2_1124
-+.globl sym_2_1125
-+sym_2_1125: la $2, sym_2_1125
-+.globl sym_2_1126
-+sym_2_1126: la $2, sym_2_1126
-+.globl sym_2_1127
-+sym_2_1127: la $2, sym_2_1127
-+.globl sym_2_1128
-+sym_2_1128: la $2, sym_2_1128
-+.globl sym_2_1129
-+sym_2_1129: la $2, sym_2_1129
-+.globl sym_2_1130
-+sym_2_1130: la $2, sym_2_1130
-+.globl sym_2_1131
-+sym_2_1131: la $2, sym_2_1131
-+.globl sym_2_1132
-+sym_2_1132: la $2, sym_2_1132
-+.globl sym_2_1133
-+sym_2_1133: la $2, sym_2_1133
-+.globl sym_2_1134
-+sym_2_1134: la $2, sym_2_1134
-+.globl sym_2_1135
-+sym_2_1135: la $2, sym_2_1135
-+.globl sym_2_1136
-+sym_2_1136: la $2, sym_2_1136
-+.globl sym_2_1137
-+sym_2_1137: la $2, sym_2_1137
-+.globl sym_2_1138
-+sym_2_1138: la $2, sym_2_1138
-+.globl sym_2_1139
-+sym_2_1139: la $2, sym_2_1139
-+.globl sym_2_1140
-+sym_2_1140: la $2, sym_2_1140
-+.globl sym_2_1141
-+sym_2_1141: la $2, sym_2_1141
-+.globl sym_2_1142
-+sym_2_1142: la $2, sym_2_1142
-+.globl sym_2_1143
-+sym_2_1143: la $2, sym_2_1143
-+.globl sym_2_1144
-+sym_2_1144: la $2, sym_2_1144
-+.globl sym_2_1145
-+sym_2_1145: la $2, sym_2_1145
-+.globl sym_2_1146
-+sym_2_1146: la $2, sym_2_1146
-+.globl sym_2_1147
-+sym_2_1147: la $2, sym_2_1147
-+.globl sym_2_1148
-+sym_2_1148: la $2, sym_2_1148
-+.globl sym_2_1149
-+sym_2_1149: la $2, sym_2_1149
-+.globl sym_2_1150
-+sym_2_1150: la $2, sym_2_1150
-+.globl sym_2_1151
-+sym_2_1151: la $2, sym_2_1151
-+.globl sym_2_1152
-+sym_2_1152: la $2, sym_2_1152
-+.globl sym_2_1153
-+sym_2_1153: la $2, sym_2_1153
-+.globl sym_2_1154
-+sym_2_1154: la $2, sym_2_1154
-+.globl sym_2_1155
-+sym_2_1155: la $2, sym_2_1155
-+.globl sym_2_1156
-+sym_2_1156: la $2, sym_2_1156
-+.globl sym_2_1157
-+sym_2_1157: la $2, sym_2_1157
-+.globl sym_2_1158
-+sym_2_1158: la $2, sym_2_1158
-+.globl sym_2_1159
-+sym_2_1159: la $2, sym_2_1159
-+.globl sym_2_1160
-+sym_2_1160: la $2, sym_2_1160
-+.globl sym_2_1161
-+sym_2_1161: la $2, sym_2_1161
-+.globl sym_2_1162
-+sym_2_1162: la $2, sym_2_1162
-+.globl sym_2_1163
-+sym_2_1163: la $2, sym_2_1163
-+.globl sym_2_1164
-+sym_2_1164: la $2, sym_2_1164
-+.globl sym_2_1165
-+sym_2_1165: la $2, sym_2_1165
-+.globl sym_2_1166
-+sym_2_1166: la $2, sym_2_1166
-+.globl sym_2_1167
-+sym_2_1167: la $2, sym_2_1167
-+.globl sym_2_1168
-+sym_2_1168: la $2, sym_2_1168
-+.globl sym_2_1169
-+sym_2_1169: la $2, sym_2_1169
-+.globl sym_2_1170
-+sym_2_1170: la $2, sym_2_1170
-+.globl sym_2_1171
-+sym_2_1171: la $2, sym_2_1171
-+.globl sym_2_1172
-+sym_2_1172: la $2, sym_2_1172
-+.globl sym_2_1173
-+sym_2_1173: la $2, sym_2_1173
-+.globl sym_2_1174
-+sym_2_1174: la $2, sym_2_1174
-+.globl sym_2_1175
-+sym_2_1175: la $2, sym_2_1175
-+.globl sym_2_1176
-+sym_2_1176: la $2, sym_2_1176
-+.globl sym_2_1177
-+sym_2_1177: la $2, sym_2_1177
-+.globl sym_2_1178
-+sym_2_1178: la $2, sym_2_1178
-+.globl sym_2_1179
-+sym_2_1179: la $2, sym_2_1179
-+.globl sym_2_1180
-+sym_2_1180: la $2, sym_2_1180
-+.globl sym_2_1181
-+sym_2_1181: la $2, sym_2_1181
-+.globl sym_2_1182
-+sym_2_1182: la $2, sym_2_1182
-+.globl sym_2_1183
-+sym_2_1183: la $2, sym_2_1183
-+.globl sym_2_1184
-+sym_2_1184: la $2, sym_2_1184
-+.globl sym_2_1185
-+sym_2_1185: la $2, sym_2_1185
-+.globl sym_2_1186
-+sym_2_1186: la $2, sym_2_1186
-+.globl sym_2_1187
-+sym_2_1187: la $2, sym_2_1187
-+.globl sym_2_1188
-+sym_2_1188: la $2, sym_2_1188
-+.globl sym_2_1189
-+sym_2_1189: la $2, sym_2_1189
-+.globl sym_2_1190
-+sym_2_1190: la $2, sym_2_1190
-+.globl sym_2_1191
-+sym_2_1191: la $2, sym_2_1191
-+.globl sym_2_1192
-+sym_2_1192: la $2, sym_2_1192
-+.globl sym_2_1193
-+sym_2_1193: la $2, sym_2_1193
-+.globl sym_2_1194
-+sym_2_1194: la $2, sym_2_1194
-+.globl sym_2_1195
-+sym_2_1195: la $2, sym_2_1195
-+.globl sym_2_1196
-+sym_2_1196: la $2, sym_2_1196
-+.globl sym_2_1197
-+sym_2_1197: la $2, sym_2_1197
-+.globl sym_2_1198
-+sym_2_1198: la $2, sym_2_1198
-+.globl sym_2_1199
-+sym_2_1199: la $2, sym_2_1199
-+.globl sym_2_1200
-+sym_2_1200: la $2, sym_2_1200
-+.globl sym_2_1201
-+sym_2_1201: la $2, sym_2_1201
-+.globl sym_2_1202
-+sym_2_1202: la $2, sym_2_1202
-+.globl sym_2_1203
-+sym_2_1203: la $2, sym_2_1203
-+.globl sym_2_1204
-+sym_2_1204: la $2, sym_2_1204
-+.globl sym_2_1205
-+sym_2_1205: la $2, sym_2_1205
-+.globl sym_2_1206
-+sym_2_1206: la $2, sym_2_1206
-+.globl sym_2_1207
-+sym_2_1207: la $2, sym_2_1207
-+.globl sym_2_1208
-+sym_2_1208: la $2, sym_2_1208
-+.globl sym_2_1209
-+sym_2_1209: la $2, sym_2_1209
-+.globl sym_2_1210
-+sym_2_1210: la $2, sym_2_1210
-+.globl sym_2_1211
-+sym_2_1211: la $2, sym_2_1211
-+.globl sym_2_1212
-+sym_2_1212: la $2, sym_2_1212
-+.globl sym_2_1213
-+sym_2_1213: la $2, sym_2_1213
-+.globl sym_2_1214
-+sym_2_1214: la $2, sym_2_1214
-+.globl sym_2_1215
-+sym_2_1215: la $2, sym_2_1215
-+.globl sym_2_1216
-+sym_2_1216: la $2, sym_2_1216
-+.globl sym_2_1217
-+sym_2_1217: la $2, sym_2_1217
-+.globl sym_2_1218
-+sym_2_1218: la $2, sym_2_1218
-+.globl sym_2_1219
-+sym_2_1219: la $2, sym_2_1219
-+.globl sym_2_1220
-+sym_2_1220: la $2, sym_2_1220
-+.globl sym_2_1221
-+sym_2_1221: la $2, sym_2_1221
-+.globl sym_2_1222
-+sym_2_1222: la $2, sym_2_1222
-+.globl sym_2_1223
-+sym_2_1223: la $2, sym_2_1223
-+.globl sym_2_1224
-+sym_2_1224: la $2, sym_2_1224
-+.globl sym_2_1225
-+sym_2_1225: la $2, sym_2_1225
-+.globl sym_2_1226
-+sym_2_1226: la $2, sym_2_1226
-+.globl sym_2_1227
-+sym_2_1227: la $2, sym_2_1227
-+.globl sym_2_1228
-+sym_2_1228: la $2, sym_2_1228
-+.globl sym_2_1229
-+sym_2_1229: la $2, sym_2_1229
-+.globl sym_2_1230
-+sym_2_1230: la $2, sym_2_1230
-+.globl sym_2_1231
-+sym_2_1231: la $2, sym_2_1231
-+.globl sym_2_1232
-+sym_2_1232: la $2, sym_2_1232
-+.globl sym_2_1233
-+sym_2_1233: la $2, sym_2_1233
-+.globl sym_2_1234
-+sym_2_1234: la $2, sym_2_1234
-+.globl sym_2_1235
-+sym_2_1235: la $2, sym_2_1235
-+.globl sym_2_1236
-+sym_2_1236: la $2, sym_2_1236
-+.globl sym_2_1237
-+sym_2_1237: la $2, sym_2_1237
-+.globl sym_2_1238
-+sym_2_1238: la $2, sym_2_1238
-+.globl sym_2_1239
-+sym_2_1239: la $2, sym_2_1239
-+.globl sym_2_1240
-+sym_2_1240: la $2, sym_2_1240
-+.globl sym_2_1241
-+sym_2_1241: la $2, sym_2_1241
-+.globl sym_2_1242
-+sym_2_1242: la $2, sym_2_1242
-+.globl sym_2_1243
-+sym_2_1243: la $2, sym_2_1243
-+.globl sym_2_1244
-+sym_2_1244: la $2, sym_2_1244
-+.globl sym_2_1245
-+sym_2_1245: la $2, sym_2_1245
-+.globl sym_2_1246
-+sym_2_1246: la $2, sym_2_1246
-+.globl sym_2_1247
-+sym_2_1247: la $2, sym_2_1247
-+.globl sym_2_1248
-+sym_2_1248: la $2, sym_2_1248
-+.globl sym_2_1249
-+sym_2_1249: la $2, sym_2_1249
-+.globl sym_2_1250
-+sym_2_1250: la $2, sym_2_1250
-+.globl sym_2_1251
-+sym_2_1251: la $2, sym_2_1251
-+.globl sym_2_1252
-+sym_2_1252: la $2, sym_2_1252
-+.globl sym_2_1253
-+sym_2_1253: la $2, sym_2_1253
-+.globl sym_2_1254
-+sym_2_1254: la $2, sym_2_1254
-+.globl sym_2_1255
-+sym_2_1255: la $2, sym_2_1255
-+.globl sym_2_1256
-+sym_2_1256: la $2, sym_2_1256
-+.globl sym_2_1257
-+sym_2_1257: la $2, sym_2_1257
-+.globl sym_2_1258
-+sym_2_1258: la $2, sym_2_1258
-+.globl sym_2_1259
-+sym_2_1259: la $2, sym_2_1259
-+.globl sym_2_1260
-+sym_2_1260: la $2, sym_2_1260
-+.globl sym_2_1261
-+sym_2_1261: la $2, sym_2_1261
-+.globl sym_2_1262
-+sym_2_1262: la $2, sym_2_1262
-+.globl sym_2_1263
-+sym_2_1263: la $2, sym_2_1263
-+.globl sym_2_1264
-+sym_2_1264: la $2, sym_2_1264
-+.globl sym_2_1265
-+sym_2_1265: la $2, sym_2_1265
-+.globl sym_2_1266
-+sym_2_1266: la $2, sym_2_1266
-+.globl sym_2_1267
-+sym_2_1267: la $2, sym_2_1267
-+.globl sym_2_1268
-+sym_2_1268: la $2, sym_2_1268
-+.globl sym_2_1269
-+sym_2_1269: la $2, sym_2_1269
-+.globl sym_2_1270
-+sym_2_1270: la $2, sym_2_1270
-+.globl sym_2_1271
-+sym_2_1271: la $2, sym_2_1271
-+.globl sym_2_1272
-+sym_2_1272: la $2, sym_2_1272
-+.globl sym_2_1273
-+sym_2_1273: la $2, sym_2_1273
-+.globl sym_2_1274
-+sym_2_1274: la $2, sym_2_1274
-+.globl sym_2_1275
-+sym_2_1275: la $2, sym_2_1275
-+.globl sym_2_1276
-+sym_2_1276: la $2, sym_2_1276
-+.globl sym_2_1277
-+sym_2_1277: la $2, sym_2_1277
-+.globl sym_2_1278
-+sym_2_1278: la $2, sym_2_1278
-+.globl sym_2_1279
-+sym_2_1279: la $2, sym_2_1279
-+.globl sym_2_1280
-+sym_2_1280: la $2, sym_2_1280
-+.globl sym_2_1281
-+sym_2_1281: la $2, sym_2_1281
-+.globl sym_2_1282
-+sym_2_1282: la $2, sym_2_1282
-+.globl sym_2_1283
-+sym_2_1283: la $2, sym_2_1283
-+.globl sym_2_1284
-+sym_2_1284: la $2, sym_2_1284
-+.globl sym_2_1285
-+sym_2_1285: la $2, sym_2_1285
-+.globl sym_2_1286
-+sym_2_1286: la $2, sym_2_1286
-+.globl sym_2_1287
-+sym_2_1287: la $2, sym_2_1287
-+.globl sym_2_1288
-+sym_2_1288: la $2, sym_2_1288
-+.globl sym_2_1289
-+sym_2_1289: la $2, sym_2_1289
-+.globl sym_2_1290
-+sym_2_1290: la $2, sym_2_1290
-+.globl sym_2_1291
-+sym_2_1291: la $2, sym_2_1291
-+.globl sym_2_1292
-+sym_2_1292: la $2, sym_2_1292
-+.globl sym_2_1293
-+sym_2_1293: la $2, sym_2_1293
-+.globl sym_2_1294
-+sym_2_1294: la $2, sym_2_1294
-+.globl sym_2_1295
-+sym_2_1295: la $2, sym_2_1295
-+.globl sym_2_1296
-+sym_2_1296: la $2, sym_2_1296
-+.globl sym_2_1297
-+sym_2_1297: la $2, sym_2_1297
-+.globl sym_2_1298
-+sym_2_1298: la $2, sym_2_1298
-+.globl sym_2_1299
-+sym_2_1299: la $2, sym_2_1299
-+.globl sym_2_1300
-+sym_2_1300: la $2, sym_2_1300
-+.globl sym_2_1301
-+sym_2_1301: la $2, sym_2_1301
-+.globl sym_2_1302
-+sym_2_1302: la $2, sym_2_1302
-+.globl sym_2_1303
-+sym_2_1303: la $2, sym_2_1303
-+.globl sym_2_1304
-+sym_2_1304: la $2, sym_2_1304
-+.globl sym_2_1305
-+sym_2_1305: la $2, sym_2_1305
-+.globl sym_2_1306
-+sym_2_1306: la $2, sym_2_1306
-+.globl sym_2_1307
-+sym_2_1307: la $2, sym_2_1307
-+.globl sym_2_1308
-+sym_2_1308: la $2, sym_2_1308
-+.globl sym_2_1309
-+sym_2_1309: la $2, sym_2_1309
-+.globl sym_2_1310
-+sym_2_1310: la $2, sym_2_1310
-+.globl sym_2_1311
-+sym_2_1311: la $2, sym_2_1311
-+.globl sym_2_1312
-+sym_2_1312: la $2, sym_2_1312
-+.globl sym_2_1313
-+sym_2_1313: la $2, sym_2_1313
-+.globl sym_2_1314
-+sym_2_1314: la $2, sym_2_1314
-+.globl sym_2_1315
-+sym_2_1315: la $2, sym_2_1315
-+.globl sym_2_1316
-+sym_2_1316: la $2, sym_2_1316
-+.globl sym_2_1317
-+sym_2_1317: la $2, sym_2_1317
-+.globl sym_2_1318
-+sym_2_1318: la $2, sym_2_1318
-+.globl sym_2_1319
-+sym_2_1319: la $2, sym_2_1319
-+.globl sym_2_1320
-+sym_2_1320: la $2, sym_2_1320
-+.globl sym_2_1321
-+sym_2_1321: la $2, sym_2_1321
-+.globl sym_2_1322
-+sym_2_1322: la $2, sym_2_1322
-+.globl sym_2_1323
-+sym_2_1323: la $2, sym_2_1323
-+.globl sym_2_1324
-+sym_2_1324: la $2, sym_2_1324
-+.globl sym_2_1325
-+sym_2_1325: la $2, sym_2_1325
-+.globl sym_2_1326
-+sym_2_1326: la $2, sym_2_1326
-+.globl sym_2_1327
-+sym_2_1327: la $2, sym_2_1327
-+.globl sym_2_1328
-+sym_2_1328: la $2, sym_2_1328
-+.globl sym_2_1329
-+sym_2_1329: la $2, sym_2_1329
-+.globl sym_2_1330
-+sym_2_1330: la $2, sym_2_1330
-+.globl sym_2_1331
-+sym_2_1331: la $2, sym_2_1331
-+.globl sym_2_1332
-+sym_2_1332: la $2, sym_2_1332
-+.globl sym_2_1333
-+sym_2_1333: la $2, sym_2_1333
-+.globl sym_2_1334
-+sym_2_1334: la $2, sym_2_1334
-+.globl sym_2_1335
-+sym_2_1335: la $2, sym_2_1335
-+.globl sym_2_1336
-+sym_2_1336: la $2, sym_2_1336
-+.globl sym_2_1337
-+sym_2_1337: la $2, sym_2_1337
-+.globl sym_2_1338
-+sym_2_1338: la $2, sym_2_1338
-+.globl sym_2_1339
-+sym_2_1339: la $2, sym_2_1339
-+.globl sym_2_1340
-+sym_2_1340: la $2, sym_2_1340
-+.globl sym_2_1341
-+sym_2_1341: la $2, sym_2_1341
-+.globl sym_2_1342
-+sym_2_1342: la $2, sym_2_1342
-+.globl sym_2_1343
-+sym_2_1343: la $2, sym_2_1343
-+.globl sym_2_1344
-+sym_2_1344: la $2, sym_2_1344
-+.globl sym_2_1345
-+sym_2_1345: la $2, sym_2_1345
-+.globl sym_2_1346
-+sym_2_1346: la $2, sym_2_1346
-+.globl sym_2_1347
-+sym_2_1347: la $2, sym_2_1347
-+.globl sym_2_1348
-+sym_2_1348: la $2, sym_2_1348
-+.globl sym_2_1349
-+sym_2_1349: la $2, sym_2_1349
-+.globl sym_2_1350
-+sym_2_1350: la $2, sym_2_1350
-+.globl sym_2_1351
-+sym_2_1351: la $2, sym_2_1351
-+.globl sym_2_1352
-+sym_2_1352: la $2, sym_2_1352
-+.globl sym_2_1353
-+sym_2_1353: la $2, sym_2_1353
-+.globl sym_2_1354
-+sym_2_1354: la $2, sym_2_1354
-+.globl sym_2_1355
-+sym_2_1355: la $2, sym_2_1355
-+.globl sym_2_1356
-+sym_2_1356: la $2, sym_2_1356
-+.globl sym_2_1357
-+sym_2_1357: la $2, sym_2_1357
-+.globl sym_2_1358
-+sym_2_1358: la $2, sym_2_1358
-+.globl sym_2_1359
-+sym_2_1359: la $2, sym_2_1359
-+.globl sym_2_1360
-+sym_2_1360: la $2, sym_2_1360
-+.globl sym_2_1361
-+sym_2_1361: la $2, sym_2_1361
-+.globl sym_2_1362
-+sym_2_1362: la $2, sym_2_1362
-+.globl sym_2_1363
-+sym_2_1363: la $2, sym_2_1363
-+.globl sym_2_1364
-+sym_2_1364: la $2, sym_2_1364
-+.globl sym_2_1365
-+sym_2_1365: la $2, sym_2_1365
-+.globl sym_2_1366
-+sym_2_1366: la $2, sym_2_1366
-+.globl sym_2_1367
-+sym_2_1367: la $2, sym_2_1367
-+.globl sym_2_1368
-+sym_2_1368: la $2, sym_2_1368
-+.globl sym_2_1369
-+sym_2_1369: la $2, sym_2_1369
-+.globl sym_2_1370
-+sym_2_1370: la $2, sym_2_1370
-+.globl sym_2_1371
-+sym_2_1371: la $2, sym_2_1371
-+.globl sym_2_1372
-+sym_2_1372: la $2, sym_2_1372
-+.globl sym_2_1373
-+sym_2_1373: la $2, sym_2_1373
-+.globl sym_2_1374
-+sym_2_1374: la $2, sym_2_1374
-+.globl sym_2_1375
-+sym_2_1375: la $2, sym_2_1375
-+.globl sym_2_1376
-+sym_2_1376: la $2, sym_2_1376
-+.globl sym_2_1377
-+sym_2_1377: la $2, sym_2_1377
-+.globl sym_2_1378
-+sym_2_1378: la $2, sym_2_1378
-+.globl sym_2_1379
-+sym_2_1379: la $2, sym_2_1379
-+.globl sym_2_1380
-+sym_2_1380: la $2, sym_2_1380
-+.globl sym_2_1381
-+sym_2_1381: la $2, sym_2_1381
-+.globl sym_2_1382
-+sym_2_1382: la $2, sym_2_1382
-+.globl sym_2_1383
-+sym_2_1383: la $2, sym_2_1383
-+.globl sym_2_1384
-+sym_2_1384: la $2, sym_2_1384
-+.globl sym_2_1385
-+sym_2_1385: la $2, sym_2_1385
-+.globl sym_2_1386
-+sym_2_1386: la $2, sym_2_1386
-+.globl sym_2_1387
-+sym_2_1387: la $2, sym_2_1387
-+.globl sym_2_1388
-+sym_2_1388: la $2, sym_2_1388
-+.globl sym_2_1389
-+sym_2_1389: la $2, sym_2_1389
-+.globl sym_2_1390
-+sym_2_1390: la $2, sym_2_1390
-+.globl sym_2_1391
-+sym_2_1391: la $2, sym_2_1391
-+.globl sym_2_1392
-+sym_2_1392: la $2, sym_2_1392
-+.globl sym_2_1393
-+sym_2_1393: la $2, sym_2_1393
-+.globl sym_2_1394
-+sym_2_1394: la $2, sym_2_1394
-+.globl sym_2_1395
-+sym_2_1395: la $2, sym_2_1395
-+.globl sym_2_1396
-+sym_2_1396: la $2, sym_2_1396
-+.globl sym_2_1397
-+sym_2_1397: la $2, sym_2_1397
-+.globl sym_2_1398
-+sym_2_1398: la $2, sym_2_1398
-+.globl sym_2_1399
-+sym_2_1399: la $2, sym_2_1399
-+.globl sym_2_1400
-+sym_2_1400: la $2, sym_2_1400
-+.globl sym_2_1401
-+sym_2_1401: la $2, sym_2_1401
-+.globl sym_2_1402
-+sym_2_1402: la $2, sym_2_1402
-+.globl sym_2_1403
-+sym_2_1403: la $2, sym_2_1403
-+.globl sym_2_1404
-+sym_2_1404: la $2, sym_2_1404
-+.globl sym_2_1405
-+sym_2_1405: la $2, sym_2_1405
-+.globl sym_2_1406
-+sym_2_1406: la $2, sym_2_1406
-+.globl sym_2_1407
-+sym_2_1407: la $2, sym_2_1407
-+.globl sym_2_1408
-+sym_2_1408: la $2, sym_2_1408
-+.globl sym_2_1409
-+sym_2_1409: la $2, sym_2_1409
-+.globl sym_2_1410
-+sym_2_1410: la $2, sym_2_1410
-+.globl sym_2_1411
-+sym_2_1411: la $2, sym_2_1411
-+.globl sym_2_1412
-+sym_2_1412: la $2, sym_2_1412
-+.globl sym_2_1413
-+sym_2_1413: la $2, sym_2_1413
-+.globl sym_2_1414
-+sym_2_1414: la $2, sym_2_1414
-+.globl sym_2_1415
-+sym_2_1415: la $2, sym_2_1415
-+.globl sym_2_1416
-+sym_2_1416: la $2, sym_2_1416
-+.globl sym_2_1417
-+sym_2_1417: la $2, sym_2_1417
-+.globl sym_2_1418
-+sym_2_1418: la $2, sym_2_1418
-+.globl sym_2_1419
-+sym_2_1419: la $2, sym_2_1419
-+.globl sym_2_1420
-+sym_2_1420: la $2, sym_2_1420
-+.globl sym_2_1421
-+sym_2_1421: la $2, sym_2_1421
-+.globl sym_2_1422
-+sym_2_1422: la $2, sym_2_1422
-+.globl sym_2_1423
-+sym_2_1423: la $2, sym_2_1423
-+.globl sym_2_1424
-+sym_2_1424: la $2, sym_2_1424
-+.globl sym_2_1425
-+sym_2_1425: la $2, sym_2_1425
-+.globl sym_2_1426
-+sym_2_1426: la $2, sym_2_1426
-+.globl sym_2_1427
-+sym_2_1427: la $2, sym_2_1427
-+.globl sym_2_1428
-+sym_2_1428: la $2, sym_2_1428
-+.globl sym_2_1429
-+sym_2_1429: la $2, sym_2_1429
-+.globl sym_2_1430
-+sym_2_1430: la $2, sym_2_1430
-+.globl sym_2_1431
-+sym_2_1431: la $2, sym_2_1431
-+.globl sym_2_1432
-+sym_2_1432: la $2, sym_2_1432
-+.globl sym_2_1433
-+sym_2_1433: la $2, sym_2_1433
-+.globl sym_2_1434
-+sym_2_1434: la $2, sym_2_1434
-+.globl sym_2_1435
-+sym_2_1435: la $2, sym_2_1435
-+.globl sym_2_1436
-+sym_2_1436: la $2, sym_2_1436
-+.globl sym_2_1437
-+sym_2_1437: la $2, sym_2_1437
-+.globl sym_2_1438
-+sym_2_1438: la $2, sym_2_1438
-+.globl sym_2_1439
-+sym_2_1439: la $2, sym_2_1439
-+.globl sym_2_1440
-+sym_2_1440: la $2, sym_2_1440
-+.globl sym_2_1441
-+sym_2_1441: la $2, sym_2_1441
-+.globl sym_2_1442
-+sym_2_1442: la $2, sym_2_1442
-+.globl sym_2_1443
-+sym_2_1443: la $2, sym_2_1443
-+.globl sym_2_1444
-+sym_2_1444: la $2, sym_2_1444
-+.globl sym_2_1445
-+sym_2_1445: la $2, sym_2_1445
-+.globl sym_2_1446
-+sym_2_1446: la $2, sym_2_1446
-+.globl sym_2_1447
-+sym_2_1447: la $2, sym_2_1447
-+.globl sym_2_1448
-+sym_2_1448: la $2, sym_2_1448
-+.globl sym_2_1449
-+sym_2_1449: la $2, sym_2_1449
-+.globl sym_2_1450
-+sym_2_1450: la $2, sym_2_1450
-+.globl sym_2_1451
-+sym_2_1451: la $2, sym_2_1451
-+.globl sym_2_1452
-+sym_2_1452: la $2, sym_2_1452
-+.globl sym_2_1453
-+sym_2_1453: la $2, sym_2_1453
-+.globl sym_2_1454
-+sym_2_1454: la $2, sym_2_1454
-+.globl sym_2_1455
-+sym_2_1455: la $2, sym_2_1455
-+.globl sym_2_1456
-+sym_2_1456: la $2, sym_2_1456
-+.globl sym_2_1457
-+sym_2_1457: la $2, sym_2_1457
-+.globl sym_2_1458
-+sym_2_1458: la $2, sym_2_1458
-+.globl sym_2_1459
-+sym_2_1459: la $2, sym_2_1459
-+.globl sym_2_1460
-+sym_2_1460: la $2, sym_2_1460
-+.globl sym_2_1461
-+sym_2_1461: la $2, sym_2_1461
-+.globl sym_2_1462
-+sym_2_1462: la $2, sym_2_1462
-+.globl sym_2_1463
-+sym_2_1463: la $2, sym_2_1463
-+.globl sym_2_1464
-+sym_2_1464: la $2, sym_2_1464
-+.globl sym_2_1465
-+sym_2_1465: la $2, sym_2_1465
-+.globl sym_2_1466
-+sym_2_1466: la $2, sym_2_1466
-+.globl sym_2_1467
-+sym_2_1467: la $2, sym_2_1467
-+.globl sym_2_1468
-+sym_2_1468: la $2, sym_2_1468
-+.globl sym_2_1469
-+sym_2_1469: la $2, sym_2_1469
-+.globl sym_2_1470
-+sym_2_1470: la $2, sym_2_1470
-+.globl sym_2_1471
-+sym_2_1471: la $2, sym_2_1471
-+.globl sym_2_1472
-+sym_2_1472: la $2, sym_2_1472
-+.globl sym_2_1473
-+sym_2_1473: la $2, sym_2_1473
-+.globl sym_2_1474
-+sym_2_1474: la $2, sym_2_1474
-+.globl sym_2_1475
-+sym_2_1475: la $2, sym_2_1475
-+.globl sym_2_1476
-+sym_2_1476: la $2, sym_2_1476
-+.globl sym_2_1477
-+sym_2_1477: la $2, sym_2_1477
-+.globl sym_2_1478
-+sym_2_1478: la $2, sym_2_1478
-+.globl sym_2_1479
-+sym_2_1479: la $2, sym_2_1479
-+.globl sym_2_1480
-+sym_2_1480: la $2, sym_2_1480
-+.globl sym_2_1481
-+sym_2_1481: la $2, sym_2_1481
-+.globl sym_2_1482
-+sym_2_1482: la $2, sym_2_1482
-+.globl sym_2_1483
-+sym_2_1483: la $2, sym_2_1483
-+.globl sym_2_1484
-+sym_2_1484: la $2, sym_2_1484
-+.globl sym_2_1485
-+sym_2_1485: la $2, sym_2_1485
-+.globl sym_2_1486
-+sym_2_1486: la $2, sym_2_1486
-+.globl sym_2_1487
-+sym_2_1487: la $2, sym_2_1487
-+.globl sym_2_1488
-+sym_2_1488: la $2, sym_2_1488
-+.globl sym_2_1489
-+sym_2_1489: la $2, sym_2_1489
-+.globl sym_2_1490
-+sym_2_1490: la $2, sym_2_1490
-+.globl sym_2_1491
-+sym_2_1491: la $2, sym_2_1491
-+.globl sym_2_1492
-+sym_2_1492: la $2, sym_2_1492
-+.globl sym_2_1493
-+sym_2_1493: la $2, sym_2_1493
-+.globl sym_2_1494
-+sym_2_1494: la $2, sym_2_1494
-+.globl sym_2_1495
-+sym_2_1495: la $2, sym_2_1495
-+.globl sym_2_1496
-+sym_2_1496: la $2, sym_2_1496
-+.globl sym_2_1497
-+sym_2_1497: la $2, sym_2_1497
-+.globl sym_2_1498
-+sym_2_1498: la $2, sym_2_1498
-+.globl sym_2_1499
-+sym_2_1499: la $2, sym_2_1499
-+.globl sym_2_1500
-+sym_2_1500: la $2, sym_2_1500
-+.globl sym_2_1501
-+sym_2_1501: la $2, sym_2_1501
-+.globl sym_2_1502
-+sym_2_1502: la $2, sym_2_1502
-+.globl sym_2_1503
-+sym_2_1503: la $2, sym_2_1503
-+.globl sym_2_1504
-+sym_2_1504: la $2, sym_2_1504
-+.globl sym_2_1505
-+sym_2_1505: la $2, sym_2_1505
-+.globl sym_2_1506
-+sym_2_1506: la $2, sym_2_1506
-+.globl sym_2_1507
-+sym_2_1507: la $2, sym_2_1507
-+.globl sym_2_1508
-+sym_2_1508: la $2, sym_2_1508
-+.globl sym_2_1509
-+sym_2_1509: la $2, sym_2_1509
-+.globl sym_2_1510
-+sym_2_1510: la $2, sym_2_1510
-+.globl sym_2_1511
-+sym_2_1511: la $2, sym_2_1511
-+.globl sym_2_1512
-+sym_2_1512: la $2, sym_2_1512
-+.globl sym_2_1513
-+sym_2_1513: la $2, sym_2_1513
-+.globl sym_2_1514
-+sym_2_1514: la $2, sym_2_1514
-+.globl sym_2_1515
-+sym_2_1515: la $2, sym_2_1515
-+.globl sym_2_1516
-+sym_2_1516: la $2, sym_2_1516
-+.globl sym_2_1517
-+sym_2_1517: la $2, sym_2_1517
-+.globl sym_2_1518
-+sym_2_1518: la $2, sym_2_1518
-+.globl sym_2_1519
-+sym_2_1519: la $2, sym_2_1519
-+.globl sym_2_1520
-+sym_2_1520: la $2, sym_2_1520
-+.globl sym_2_1521
-+sym_2_1521: la $2, sym_2_1521
-+.globl sym_2_1522
-+sym_2_1522: la $2, sym_2_1522
-+.globl sym_2_1523
-+sym_2_1523: la $2, sym_2_1523
-+.globl sym_2_1524
-+sym_2_1524: la $2, sym_2_1524
-+.globl sym_2_1525
-+sym_2_1525: la $2, sym_2_1525
-+.globl sym_2_1526
-+sym_2_1526: la $2, sym_2_1526
-+.globl sym_2_1527
-+sym_2_1527: la $2, sym_2_1527
-+.globl sym_2_1528
-+sym_2_1528: la $2, sym_2_1528
-+.globl sym_2_1529
-+sym_2_1529: la $2, sym_2_1529
-+.globl sym_2_1530
-+sym_2_1530: la $2, sym_2_1530
-+.globl sym_2_1531
-+sym_2_1531: la $2, sym_2_1531
-+.globl sym_2_1532
-+sym_2_1532: la $2, sym_2_1532
-+.globl sym_2_1533
-+sym_2_1533: la $2, sym_2_1533
-+.globl sym_2_1534
-+sym_2_1534: la $2, sym_2_1534
-+.globl sym_2_1535
-+sym_2_1535: la $2, sym_2_1535
-+.globl sym_2_1536
-+sym_2_1536: la $2, sym_2_1536
-+.globl sym_2_1537
-+sym_2_1537: la $2, sym_2_1537
-+.globl sym_2_1538
-+sym_2_1538: la $2, sym_2_1538
-+.globl sym_2_1539
-+sym_2_1539: la $2, sym_2_1539
-+.globl sym_2_1540
-+sym_2_1540: la $2, sym_2_1540
-+.globl sym_2_1541
-+sym_2_1541: la $2, sym_2_1541
-+.globl sym_2_1542
-+sym_2_1542: la $2, sym_2_1542
-+.globl sym_2_1543
-+sym_2_1543: la $2, sym_2_1543
-+.globl sym_2_1544
-+sym_2_1544: la $2, sym_2_1544
-+.globl sym_2_1545
-+sym_2_1545: la $2, sym_2_1545
-+.globl sym_2_1546
-+sym_2_1546: la $2, sym_2_1546
-+.globl sym_2_1547
-+sym_2_1547: la $2, sym_2_1547
-+.globl sym_2_1548
-+sym_2_1548: la $2, sym_2_1548
-+.globl sym_2_1549
-+sym_2_1549: la $2, sym_2_1549
-+.globl sym_2_1550
-+sym_2_1550: la $2, sym_2_1550
-+.globl sym_2_1551
-+sym_2_1551: la $2, sym_2_1551
-+.globl sym_2_1552
-+sym_2_1552: la $2, sym_2_1552
-+.globl sym_2_1553
-+sym_2_1553: la $2, sym_2_1553
-+.globl sym_2_1554
-+sym_2_1554: la $2, sym_2_1554
-+.globl sym_2_1555
-+sym_2_1555: la $2, sym_2_1555
-+.globl sym_2_1556
-+sym_2_1556: la $2, sym_2_1556
-+.globl sym_2_1557
-+sym_2_1557: la $2, sym_2_1557
-+.globl sym_2_1558
-+sym_2_1558: la $2, sym_2_1558
-+.globl sym_2_1559
-+sym_2_1559: la $2, sym_2_1559
-+.globl sym_2_1560
-+sym_2_1560: la $2, sym_2_1560
-+.globl sym_2_1561
-+sym_2_1561: la $2, sym_2_1561
-+.globl sym_2_1562
-+sym_2_1562: la $2, sym_2_1562
-+.globl sym_2_1563
-+sym_2_1563: la $2, sym_2_1563
-+.globl sym_2_1564
-+sym_2_1564: la $2, sym_2_1564
-+.globl sym_2_1565
-+sym_2_1565: la $2, sym_2_1565
-+.globl sym_2_1566
-+sym_2_1566: la $2, sym_2_1566
-+.globl sym_2_1567
-+sym_2_1567: la $2, sym_2_1567
-+.globl sym_2_1568
-+sym_2_1568: la $2, sym_2_1568
-+.globl sym_2_1569
-+sym_2_1569: la $2, sym_2_1569
-+.globl sym_2_1570
-+sym_2_1570: la $2, sym_2_1570
-+.globl sym_2_1571
-+sym_2_1571: la $2, sym_2_1571
-+.globl sym_2_1572
-+sym_2_1572: la $2, sym_2_1572
-+.globl sym_2_1573
-+sym_2_1573: la $2, sym_2_1573
-+.globl sym_2_1574
-+sym_2_1574: la $2, sym_2_1574
-+.globl sym_2_1575
-+sym_2_1575: la $2, sym_2_1575
-+.globl sym_2_1576
-+sym_2_1576: la $2, sym_2_1576
-+.globl sym_2_1577
-+sym_2_1577: la $2, sym_2_1577
-+.globl sym_2_1578
-+sym_2_1578: la $2, sym_2_1578
-+.globl sym_2_1579
-+sym_2_1579: la $2, sym_2_1579
-+.globl sym_2_1580
-+sym_2_1580: la $2, sym_2_1580
-+.globl sym_2_1581
-+sym_2_1581: la $2, sym_2_1581
-+.globl sym_2_1582
-+sym_2_1582: la $2, sym_2_1582
-+.globl sym_2_1583
-+sym_2_1583: la $2, sym_2_1583
-+.globl sym_2_1584
-+sym_2_1584: la $2, sym_2_1584
-+.globl sym_2_1585
-+sym_2_1585: la $2, sym_2_1585
-+.globl sym_2_1586
-+sym_2_1586: la $2, sym_2_1586
-+.globl sym_2_1587
-+sym_2_1587: la $2, sym_2_1587
-+.globl sym_2_1588
-+sym_2_1588: la $2, sym_2_1588
-+.globl sym_2_1589
-+sym_2_1589: la $2, sym_2_1589
-+.globl sym_2_1590
-+sym_2_1590: la $2, sym_2_1590
-+.globl sym_2_1591
-+sym_2_1591: la $2, sym_2_1591
-+.globl sym_2_1592
-+sym_2_1592: la $2, sym_2_1592
-+.globl sym_2_1593
-+sym_2_1593: la $2, sym_2_1593
-+.globl sym_2_1594
-+sym_2_1594: la $2, sym_2_1594
-+.globl sym_2_1595
-+sym_2_1595: la $2, sym_2_1595
-+.globl sym_2_1596
-+sym_2_1596: la $2, sym_2_1596
-+.globl sym_2_1597
-+sym_2_1597: la $2, sym_2_1597
-+.globl sym_2_1598
-+sym_2_1598: la $2, sym_2_1598
-+.globl sym_2_1599
-+sym_2_1599: la $2, sym_2_1599
-+.globl sym_2_1600
-+sym_2_1600: la $2, sym_2_1600
-+.globl sym_2_1601
-+sym_2_1601: la $2, sym_2_1601
-+.globl sym_2_1602
-+sym_2_1602: la $2, sym_2_1602
-+.globl sym_2_1603
-+sym_2_1603: la $2, sym_2_1603
-+.globl sym_2_1604
-+sym_2_1604: la $2, sym_2_1604
-+.globl sym_2_1605
-+sym_2_1605: la $2, sym_2_1605
-+.globl sym_2_1606
-+sym_2_1606: la $2, sym_2_1606
-+.globl sym_2_1607
-+sym_2_1607: la $2, sym_2_1607
-+.globl sym_2_1608
-+sym_2_1608: la $2, sym_2_1608
-+.globl sym_2_1609
-+sym_2_1609: la $2, sym_2_1609
-+.globl sym_2_1610
-+sym_2_1610: la $2, sym_2_1610
-+.globl sym_2_1611
-+sym_2_1611: la $2, sym_2_1611
-+.globl sym_2_1612
-+sym_2_1612: la $2, sym_2_1612
-+.globl sym_2_1613
-+sym_2_1613: la $2, sym_2_1613
-+.globl sym_2_1614
-+sym_2_1614: la $2, sym_2_1614
-+.globl sym_2_1615
-+sym_2_1615: la $2, sym_2_1615
-+.globl sym_2_1616
-+sym_2_1616: la $2, sym_2_1616
-+.globl sym_2_1617
-+sym_2_1617: la $2, sym_2_1617
-+.globl sym_2_1618
-+sym_2_1618: la $2, sym_2_1618
-+.globl sym_2_1619
-+sym_2_1619: la $2, sym_2_1619
-+.globl sym_2_1620
-+sym_2_1620: la $2, sym_2_1620
-+.globl sym_2_1621
-+sym_2_1621: la $2, sym_2_1621
-+.globl sym_2_1622
-+sym_2_1622: la $2, sym_2_1622
-+.globl sym_2_1623
-+sym_2_1623: la $2, sym_2_1623
-+.globl sym_2_1624
-+sym_2_1624: la $2, sym_2_1624
-+.globl sym_2_1625
-+sym_2_1625: la $2, sym_2_1625
-+.globl sym_2_1626
-+sym_2_1626: la $2, sym_2_1626
-+.globl sym_2_1627
-+sym_2_1627: la $2, sym_2_1627
-+.globl sym_2_1628
-+sym_2_1628: la $2, sym_2_1628
-+.globl sym_2_1629
-+sym_2_1629: la $2, sym_2_1629
-+.globl sym_2_1630
-+sym_2_1630: la $2, sym_2_1630
-+.globl sym_2_1631
-+sym_2_1631: la $2, sym_2_1631
-+.globl sym_2_1632
-+sym_2_1632: la $2, sym_2_1632
-+.globl sym_2_1633
-+sym_2_1633: la $2, sym_2_1633
-+.globl sym_2_1634
-+sym_2_1634: la $2, sym_2_1634
-+.globl sym_2_1635
-+sym_2_1635: la $2, sym_2_1635
-+.globl sym_2_1636
-+sym_2_1636: la $2, sym_2_1636
-+.globl sym_2_1637
-+sym_2_1637: la $2, sym_2_1637
-+.globl sym_2_1638
-+sym_2_1638: la $2, sym_2_1638
-+.globl sym_2_1639
-+sym_2_1639: la $2, sym_2_1639
-+.globl sym_2_1640
-+sym_2_1640: la $2, sym_2_1640
-+.globl sym_2_1641
-+sym_2_1641: la $2, sym_2_1641
-+.globl sym_2_1642
-+sym_2_1642: la $2, sym_2_1642
-+.globl sym_2_1643
-+sym_2_1643: la $2, sym_2_1643
-+.globl sym_2_1644
-+sym_2_1644: la $2, sym_2_1644
-+.globl sym_2_1645
-+sym_2_1645: la $2, sym_2_1645
-+.globl sym_2_1646
-+sym_2_1646: la $2, sym_2_1646
-+.globl sym_2_1647
-+sym_2_1647: la $2, sym_2_1647
-+.globl sym_2_1648
-+sym_2_1648: la $2, sym_2_1648
-+.globl sym_2_1649
-+sym_2_1649: la $2, sym_2_1649
-+.globl sym_2_1650
-+sym_2_1650: la $2, sym_2_1650
-+.globl sym_2_1651
-+sym_2_1651: la $2, sym_2_1651
-+.globl sym_2_1652
-+sym_2_1652: la $2, sym_2_1652
-+.globl sym_2_1653
-+sym_2_1653: la $2, sym_2_1653
-+.globl sym_2_1654
-+sym_2_1654: la $2, sym_2_1654
-+.globl sym_2_1655
-+sym_2_1655: la $2, sym_2_1655
-+.globl sym_2_1656
-+sym_2_1656: la $2, sym_2_1656
-+.globl sym_2_1657
-+sym_2_1657: la $2, sym_2_1657
-+.globl sym_2_1658
-+sym_2_1658: la $2, sym_2_1658
-+.globl sym_2_1659
-+sym_2_1659: la $2, sym_2_1659
-+.globl sym_2_1660
-+sym_2_1660: la $2, sym_2_1660
-+.globl sym_2_1661
-+sym_2_1661: la $2, sym_2_1661
-+.globl sym_2_1662
-+sym_2_1662: la $2, sym_2_1662
-+.globl sym_2_1663
-+sym_2_1663: la $2, sym_2_1663
-+.globl sym_2_1664
-+sym_2_1664: la $2, sym_2_1664
-+.globl sym_2_1665
-+sym_2_1665: la $2, sym_2_1665
-+.globl sym_2_1666
-+sym_2_1666: la $2, sym_2_1666
-+.globl sym_2_1667
-+sym_2_1667: la $2, sym_2_1667
-+.globl sym_2_1668
-+sym_2_1668: la $2, sym_2_1668
-+.globl sym_2_1669
-+sym_2_1669: la $2, sym_2_1669
-+.globl sym_2_1670
-+sym_2_1670: la $2, sym_2_1670
-+.globl sym_2_1671
-+sym_2_1671: la $2, sym_2_1671
-+.globl sym_2_1672
-+sym_2_1672: la $2, sym_2_1672
-+.globl sym_2_1673
-+sym_2_1673: la $2, sym_2_1673
-+.globl sym_2_1674
-+sym_2_1674: la $2, sym_2_1674
-+.globl sym_2_1675
-+sym_2_1675: la $2, sym_2_1675
-+.globl sym_2_1676
-+sym_2_1676: la $2, sym_2_1676
-+.globl sym_2_1677
-+sym_2_1677: la $2, sym_2_1677
-+.globl sym_2_1678
-+sym_2_1678: la $2, sym_2_1678
-+.globl sym_2_1679
-+sym_2_1679: la $2, sym_2_1679
-+.globl sym_2_1680
-+sym_2_1680: la $2, sym_2_1680
-+.globl sym_2_1681
-+sym_2_1681: la $2, sym_2_1681
-+.globl sym_2_1682
-+sym_2_1682: la $2, sym_2_1682
-+.globl sym_2_1683
-+sym_2_1683: la $2, sym_2_1683
-+.globl sym_2_1684
-+sym_2_1684: la $2, sym_2_1684
-+.globl sym_2_1685
-+sym_2_1685: la $2, sym_2_1685
-+.globl sym_2_1686
-+sym_2_1686: la $2, sym_2_1686
-+.globl sym_2_1687
-+sym_2_1687: la $2, sym_2_1687
-+.globl sym_2_1688
-+sym_2_1688: la $2, sym_2_1688
-+.globl sym_2_1689
-+sym_2_1689: la $2, sym_2_1689
-+.globl sym_2_1690
-+sym_2_1690: la $2, sym_2_1690
-+.globl sym_2_1691
-+sym_2_1691: la $2, sym_2_1691
-+.globl sym_2_1692
-+sym_2_1692: la $2, sym_2_1692
-+.globl sym_2_1693
-+sym_2_1693: la $2, sym_2_1693
-+.globl sym_2_1694
-+sym_2_1694: la $2, sym_2_1694
-+.globl sym_2_1695
-+sym_2_1695: la $2, sym_2_1695
-+.globl sym_2_1696
-+sym_2_1696: la $2, sym_2_1696
-+.globl sym_2_1697
-+sym_2_1697: la $2, sym_2_1697
-+.globl sym_2_1698
-+sym_2_1698: la $2, sym_2_1698
-+.globl sym_2_1699
-+sym_2_1699: la $2, sym_2_1699
-+.globl sym_2_1700
-+sym_2_1700: la $2, sym_2_1700
-+.globl sym_2_1701
-+sym_2_1701: la $2, sym_2_1701
-+.globl sym_2_1702
-+sym_2_1702: la $2, sym_2_1702
-+.globl sym_2_1703
-+sym_2_1703: la $2, sym_2_1703
-+.globl sym_2_1704
-+sym_2_1704: la $2, sym_2_1704
-+.globl sym_2_1705
-+sym_2_1705: la $2, sym_2_1705
-+.globl sym_2_1706
-+sym_2_1706: la $2, sym_2_1706
-+.globl sym_2_1707
-+sym_2_1707: la $2, sym_2_1707
-+.globl sym_2_1708
-+sym_2_1708: la $2, sym_2_1708
-+.globl sym_2_1709
-+sym_2_1709: la $2, sym_2_1709
-+.globl sym_2_1710
-+sym_2_1710: la $2, sym_2_1710
-+.globl sym_2_1711
-+sym_2_1711: la $2, sym_2_1711
-+.globl sym_2_1712
-+sym_2_1712: la $2, sym_2_1712
-+.globl sym_2_1713
-+sym_2_1713: la $2, sym_2_1713
-+.globl sym_2_1714
-+sym_2_1714: la $2, sym_2_1714
-+.globl sym_2_1715
-+sym_2_1715: la $2, sym_2_1715
-+.globl sym_2_1716
-+sym_2_1716: la $2, sym_2_1716
-+.globl sym_2_1717
-+sym_2_1717: la $2, sym_2_1717
-+.globl sym_2_1718
-+sym_2_1718: la $2, sym_2_1718
-+.globl sym_2_1719
-+sym_2_1719: la $2, sym_2_1719
-+.globl sym_2_1720
-+sym_2_1720: la $2, sym_2_1720
-+.globl sym_2_1721
-+sym_2_1721: la $2, sym_2_1721
-+.globl sym_2_1722
-+sym_2_1722: la $2, sym_2_1722
-+.globl sym_2_1723
-+sym_2_1723: la $2, sym_2_1723
-+.globl sym_2_1724
-+sym_2_1724: la $2, sym_2_1724
-+.globl sym_2_1725
-+sym_2_1725: la $2, sym_2_1725
-+.globl sym_2_1726
-+sym_2_1726: la $2, sym_2_1726
-+.globl sym_2_1727
-+sym_2_1727: la $2, sym_2_1727
-+.globl sym_2_1728
-+sym_2_1728: la $2, sym_2_1728
-+.globl sym_2_1729
-+sym_2_1729: la $2, sym_2_1729
-+.globl sym_2_1730
-+sym_2_1730: la $2, sym_2_1730
-+.globl sym_2_1731
-+sym_2_1731: la $2, sym_2_1731
-+.globl sym_2_1732
-+sym_2_1732: la $2, sym_2_1732
-+.globl sym_2_1733
-+sym_2_1733: la $2, sym_2_1733
-+.globl sym_2_1734
-+sym_2_1734: la $2, sym_2_1734
-+.globl sym_2_1735
-+sym_2_1735: la $2, sym_2_1735
-+.globl sym_2_1736
-+sym_2_1736: la $2, sym_2_1736
-+.globl sym_2_1737
-+sym_2_1737: la $2, sym_2_1737
-+.globl sym_2_1738
-+sym_2_1738: la $2, sym_2_1738
-+.globl sym_2_1739
-+sym_2_1739: la $2, sym_2_1739
-+.globl sym_2_1740
-+sym_2_1740: la $2, sym_2_1740
-+.globl sym_2_1741
-+sym_2_1741: la $2, sym_2_1741
-+.globl sym_2_1742
-+sym_2_1742: la $2, sym_2_1742
-+.globl sym_2_1743
-+sym_2_1743: la $2, sym_2_1743
-+.globl sym_2_1744
-+sym_2_1744: la $2, sym_2_1744
-+.globl sym_2_1745
-+sym_2_1745: la $2, sym_2_1745
-+.globl sym_2_1746
-+sym_2_1746: la $2, sym_2_1746
-+.globl sym_2_1747
-+sym_2_1747: la $2, sym_2_1747
-+.globl sym_2_1748
-+sym_2_1748: la $2, sym_2_1748
-+.globl sym_2_1749
-+sym_2_1749: la $2, sym_2_1749
-+.globl sym_2_1750
-+sym_2_1750: la $2, sym_2_1750
-+.globl sym_2_1751
-+sym_2_1751: la $2, sym_2_1751
-+.globl sym_2_1752
-+sym_2_1752: la $2, sym_2_1752
-+.globl sym_2_1753
-+sym_2_1753: la $2, sym_2_1753
-+.globl sym_2_1754
-+sym_2_1754: la $2, sym_2_1754
-+.globl sym_2_1755
-+sym_2_1755: la $2, sym_2_1755
-+.globl sym_2_1756
-+sym_2_1756: la $2, sym_2_1756
-+.globl sym_2_1757
-+sym_2_1757: la $2, sym_2_1757
-+.globl sym_2_1758
-+sym_2_1758: la $2, sym_2_1758
-+.globl sym_2_1759
-+sym_2_1759: la $2, sym_2_1759
-+.globl sym_2_1760
-+sym_2_1760: la $2, sym_2_1760
-+.globl sym_2_1761
-+sym_2_1761: la $2, sym_2_1761
-+.globl sym_2_1762
-+sym_2_1762: la $2, sym_2_1762
-+.globl sym_2_1763
-+sym_2_1763: la $2, sym_2_1763
-+.globl sym_2_1764
-+sym_2_1764: la $2, sym_2_1764
-+.globl sym_2_1765
-+sym_2_1765: la $2, sym_2_1765
-+.globl sym_2_1766
-+sym_2_1766: la $2, sym_2_1766
-+.globl sym_2_1767
-+sym_2_1767: la $2, sym_2_1767
-+.globl sym_2_1768
-+sym_2_1768: la $2, sym_2_1768
-+.globl sym_2_1769
-+sym_2_1769: la $2, sym_2_1769
-+.globl sym_2_1770
-+sym_2_1770: la $2, sym_2_1770
-+.globl sym_2_1771
-+sym_2_1771: la $2, sym_2_1771
-+.globl sym_2_1772
-+sym_2_1772: la $2, sym_2_1772
-+.globl sym_2_1773
-+sym_2_1773: la $2, sym_2_1773
-+.globl sym_2_1774
-+sym_2_1774: la $2, sym_2_1774
-+.globl sym_2_1775
-+sym_2_1775: la $2, sym_2_1775
-+.globl sym_2_1776
-+sym_2_1776: la $2, sym_2_1776
-+.globl sym_2_1777
-+sym_2_1777: la $2, sym_2_1777
-+.globl sym_2_1778
-+sym_2_1778: la $2, sym_2_1778
-+.globl sym_2_1779
-+sym_2_1779: la $2, sym_2_1779
-+.globl sym_2_1780
-+sym_2_1780: la $2, sym_2_1780
-+.globl sym_2_1781
-+sym_2_1781: la $2, sym_2_1781
-+.globl sym_2_1782
-+sym_2_1782: la $2, sym_2_1782
-+.globl sym_2_1783
-+sym_2_1783: la $2, sym_2_1783
-+.globl sym_2_1784
-+sym_2_1784: la $2, sym_2_1784
-+.globl sym_2_1785
-+sym_2_1785: la $2, sym_2_1785
-+.globl sym_2_1786
-+sym_2_1786: la $2, sym_2_1786
-+.globl sym_2_1787
-+sym_2_1787: la $2, sym_2_1787
-+.globl sym_2_1788
-+sym_2_1788: la $2, sym_2_1788
-+.globl sym_2_1789
-+sym_2_1789: la $2, sym_2_1789
-+.globl sym_2_1790
-+sym_2_1790: la $2, sym_2_1790
-+.globl sym_2_1791
-+sym_2_1791: la $2, sym_2_1791
-+.globl sym_2_1792
-+sym_2_1792: la $2, sym_2_1792
-+.globl sym_2_1793
-+sym_2_1793: la $2, sym_2_1793
-+.globl sym_2_1794
-+sym_2_1794: la $2, sym_2_1794
-+.globl sym_2_1795
-+sym_2_1795: la $2, sym_2_1795
-+.globl sym_2_1796
-+sym_2_1796: la $2, sym_2_1796
-+.globl sym_2_1797
-+sym_2_1797: la $2, sym_2_1797
-+.globl sym_2_1798
-+sym_2_1798: la $2, sym_2_1798
-+.globl sym_2_1799
-+sym_2_1799: la $2, sym_2_1799
-+.globl sym_2_1800
-+sym_2_1800: la $2, sym_2_1800
-+.globl sym_2_1801
-+sym_2_1801: la $2, sym_2_1801
-+.globl sym_2_1802
-+sym_2_1802: la $2, sym_2_1802
-+.globl sym_2_1803
-+sym_2_1803: la $2, sym_2_1803
-+.globl sym_2_1804
-+sym_2_1804: la $2, sym_2_1804
-+.globl sym_2_1805
-+sym_2_1805: la $2, sym_2_1805
-+.globl sym_2_1806
-+sym_2_1806: la $2, sym_2_1806
-+.globl sym_2_1807
-+sym_2_1807: la $2, sym_2_1807
-+.globl sym_2_1808
-+sym_2_1808: la $2, sym_2_1808
-+.globl sym_2_1809
-+sym_2_1809: la $2, sym_2_1809
-+.globl sym_2_1810
-+sym_2_1810: la $2, sym_2_1810
-+.globl sym_2_1811
-+sym_2_1811: la $2, sym_2_1811
-+.globl sym_2_1812
-+sym_2_1812: la $2, sym_2_1812
-+.globl sym_2_1813
-+sym_2_1813: la $2, sym_2_1813
-+.globl sym_2_1814
-+sym_2_1814: la $2, sym_2_1814
-+.globl sym_2_1815
-+sym_2_1815: la $2, sym_2_1815
-+.globl sym_2_1816
-+sym_2_1816: la $2, sym_2_1816
-+.globl sym_2_1817
-+sym_2_1817: la $2, sym_2_1817
-+.globl sym_2_1818
-+sym_2_1818: la $2, sym_2_1818
-+.globl sym_2_1819
-+sym_2_1819: la $2, sym_2_1819
-+.globl sym_2_1820
-+sym_2_1820: la $2, sym_2_1820
-+.globl sym_2_1821
-+sym_2_1821: la $2, sym_2_1821
-+.globl sym_2_1822
-+sym_2_1822: la $2, sym_2_1822
-+.globl sym_2_1823
-+sym_2_1823: la $2, sym_2_1823
-+.globl sym_2_1824
-+sym_2_1824: la $2, sym_2_1824
-+.globl sym_2_1825
-+sym_2_1825: la $2, sym_2_1825
-+.globl sym_2_1826
-+sym_2_1826: la $2, sym_2_1826
-+.globl sym_2_1827
-+sym_2_1827: la $2, sym_2_1827
-+.globl sym_2_1828
-+sym_2_1828: la $2, sym_2_1828
-+.globl sym_2_1829
-+sym_2_1829: la $2, sym_2_1829
-+.globl sym_2_1830
-+sym_2_1830: la $2, sym_2_1830
-+.globl sym_2_1831
-+sym_2_1831: la $2, sym_2_1831
-+.globl sym_2_1832
-+sym_2_1832: la $2, sym_2_1832
-+.globl sym_2_1833
-+sym_2_1833: la $2, sym_2_1833
-+.globl sym_2_1834
-+sym_2_1834: la $2, sym_2_1834
-+.globl sym_2_1835
-+sym_2_1835: la $2, sym_2_1835
-+.globl sym_2_1836
-+sym_2_1836: la $2, sym_2_1836
-+.globl sym_2_1837
-+sym_2_1837: la $2, sym_2_1837
-+.globl sym_2_1838
-+sym_2_1838: la $2, sym_2_1838
-+.globl sym_2_1839
-+sym_2_1839: la $2, sym_2_1839
-+.globl sym_2_1840
-+sym_2_1840: la $2, sym_2_1840
-+.globl sym_2_1841
-+sym_2_1841: la $2, sym_2_1841
-+.globl sym_2_1842
-+sym_2_1842: la $2, sym_2_1842
-+.globl sym_2_1843
-+sym_2_1843: la $2, sym_2_1843
-+.globl sym_2_1844
-+sym_2_1844: la $2, sym_2_1844
-+.globl sym_2_1845
-+sym_2_1845: la $2, sym_2_1845
-+.globl sym_2_1846
-+sym_2_1846: la $2, sym_2_1846
-+.globl sym_2_1847
-+sym_2_1847: la $2, sym_2_1847
-+.globl sym_2_1848
-+sym_2_1848: la $2, sym_2_1848
-+.globl sym_2_1849
-+sym_2_1849: la $2, sym_2_1849
-+.globl sym_2_1850
-+sym_2_1850: la $2, sym_2_1850
-+.globl sym_2_1851
-+sym_2_1851: la $2, sym_2_1851
-+.globl sym_2_1852
-+sym_2_1852: la $2, sym_2_1852
-+.globl sym_2_1853
-+sym_2_1853: la $2, sym_2_1853
-+.globl sym_2_1854
-+sym_2_1854: la $2, sym_2_1854
-+.globl sym_2_1855
-+sym_2_1855: la $2, sym_2_1855
-+.globl sym_2_1856
-+sym_2_1856: la $2, sym_2_1856
-+.globl sym_2_1857
-+sym_2_1857: la $2, sym_2_1857
-+.globl sym_2_1858
-+sym_2_1858: la $2, sym_2_1858
-+.globl sym_2_1859
-+sym_2_1859: la $2, sym_2_1859
-+.globl sym_2_1860
-+sym_2_1860: la $2, sym_2_1860
-+.globl sym_2_1861
-+sym_2_1861: la $2, sym_2_1861
-+.globl sym_2_1862
-+sym_2_1862: la $2, sym_2_1862
-+.globl sym_2_1863
-+sym_2_1863: la $2, sym_2_1863
-+.globl sym_2_1864
-+sym_2_1864: la $2, sym_2_1864
-+.globl sym_2_1865
-+sym_2_1865: la $2, sym_2_1865
-+.globl sym_2_1866
-+sym_2_1866: la $2, sym_2_1866
-+.globl sym_2_1867
-+sym_2_1867: la $2, sym_2_1867
-+.globl sym_2_1868
-+sym_2_1868: la $2, sym_2_1868
-+.globl sym_2_1869
-+sym_2_1869: la $2, sym_2_1869
-+.globl sym_2_1870
-+sym_2_1870: la $2, sym_2_1870
-+.globl sym_2_1871
-+sym_2_1871: la $2, sym_2_1871
-+.globl sym_2_1872
-+sym_2_1872: la $2, sym_2_1872
-+.globl sym_2_1873
-+sym_2_1873: la $2, sym_2_1873
-+.globl sym_2_1874
-+sym_2_1874: la $2, sym_2_1874
-+.globl sym_2_1875
-+sym_2_1875: la $2, sym_2_1875
-+.globl sym_2_1876
-+sym_2_1876: la $2, sym_2_1876
-+.globl sym_2_1877
-+sym_2_1877: la $2, sym_2_1877
-+.globl sym_2_1878
-+sym_2_1878: la $2, sym_2_1878
-+.globl sym_2_1879
-+sym_2_1879: la $2, sym_2_1879
-+.globl sym_2_1880
-+sym_2_1880: la $2, sym_2_1880
-+.globl sym_2_1881
-+sym_2_1881: la $2, sym_2_1881
-+.globl sym_2_1882
-+sym_2_1882: la $2, sym_2_1882
-+.globl sym_2_1883
-+sym_2_1883: la $2, sym_2_1883
-+.globl sym_2_1884
-+sym_2_1884: la $2, sym_2_1884
-+.globl sym_2_1885
-+sym_2_1885: la $2, sym_2_1885
-+.globl sym_2_1886
-+sym_2_1886: la $2, sym_2_1886
-+.globl sym_2_1887
-+sym_2_1887: la $2, sym_2_1887
-+.globl sym_2_1888
-+sym_2_1888: la $2, sym_2_1888
-+.globl sym_2_1889
-+sym_2_1889: la $2, sym_2_1889
-+.globl sym_2_1890
-+sym_2_1890: la $2, sym_2_1890
-+.globl sym_2_1891
-+sym_2_1891: la $2, sym_2_1891
-+.globl sym_2_1892
-+sym_2_1892: la $2, sym_2_1892
-+.globl sym_2_1893
-+sym_2_1893: la $2, sym_2_1893
-+.globl sym_2_1894
-+sym_2_1894: la $2, sym_2_1894
-+.globl sym_2_1895
-+sym_2_1895: la $2, sym_2_1895
-+.globl sym_2_1896
-+sym_2_1896: la $2, sym_2_1896
-+.globl sym_2_1897
-+sym_2_1897: la $2, sym_2_1897
-+.globl sym_2_1898
-+sym_2_1898: la $2, sym_2_1898
-+.globl sym_2_1899
-+sym_2_1899: la $2, sym_2_1899
-+.globl sym_2_1900
-+sym_2_1900: la $2, sym_2_1900
-+.globl sym_2_1901
-+sym_2_1901: la $2, sym_2_1901
-+.globl sym_2_1902
-+sym_2_1902: la $2, sym_2_1902
-+.globl sym_2_1903
-+sym_2_1903: la $2, sym_2_1903
-+.globl sym_2_1904
-+sym_2_1904: la $2, sym_2_1904
-+.globl sym_2_1905
-+sym_2_1905: la $2, sym_2_1905
-+.globl sym_2_1906
-+sym_2_1906: la $2, sym_2_1906
-+.globl sym_2_1907
-+sym_2_1907: la $2, sym_2_1907
-+.globl sym_2_1908
-+sym_2_1908: la $2, sym_2_1908
-+.globl sym_2_1909
-+sym_2_1909: la $2, sym_2_1909
-+.globl sym_2_1910
-+sym_2_1910: la $2, sym_2_1910
-+.globl sym_2_1911
-+sym_2_1911: la $2, sym_2_1911
-+.globl sym_2_1912
-+sym_2_1912: la $2, sym_2_1912
-+.globl sym_2_1913
-+sym_2_1913: la $2, sym_2_1913
-+.globl sym_2_1914
-+sym_2_1914: la $2, sym_2_1914
-+.globl sym_2_1915
-+sym_2_1915: la $2, sym_2_1915
-+.globl sym_2_1916
-+sym_2_1916: la $2, sym_2_1916
-+.globl sym_2_1917
-+sym_2_1917: la $2, sym_2_1917
-+.globl sym_2_1918
-+sym_2_1918: la $2, sym_2_1918
-+.globl sym_2_1919
-+sym_2_1919: la $2, sym_2_1919
-+.globl sym_2_1920
-+sym_2_1920: la $2, sym_2_1920
-+.globl sym_2_1921
-+sym_2_1921: la $2, sym_2_1921
-+.globl sym_2_1922
-+sym_2_1922: la $2, sym_2_1922
-+.globl sym_2_1923
-+sym_2_1923: la $2, sym_2_1923
-+.globl sym_2_1924
-+sym_2_1924: la $2, sym_2_1924
-+.globl sym_2_1925
-+sym_2_1925: la $2, sym_2_1925
-+.globl sym_2_1926
-+sym_2_1926: la $2, sym_2_1926
-+.globl sym_2_1927
-+sym_2_1927: la $2, sym_2_1927
-+.globl sym_2_1928
-+sym_2_1928: la $2, sym_2_1928
-+.globl sym_2_1929
-+sym_2_1929: la $2, sym_2_1929
-+.globl sym_2_1930
-+sym_2_1930: la $2, sym_2_1930
-+.globl sym_2_1931
-+sym_2_1931: la $2, sym_2_1931
-+.globl sym_2_1932
-+sym_2_1932: la $2, sym_2_1932
-+.globl sym_2_1933
-+sym_2_1933: la $2, sym_2_1933
-+.globl sym_2_1934
-+sym_2_1934: la $2, sym_2_1934
-+.globl sym_2_1935
-+sym_2_1935: la $2, sym_2_1935
-+.globl sym_2_1936
-+sym_2_1936: la $2, sym_2_1936
-+.globl sym_2_1937
-+sym_2_1937: la $2, sym_2_1937
-+.globl sym_2_1938
-+sym_2_1938: la $2, sym_2_1938
-+.globl sym_2_1939
-+sym_2_1939: la $2, sym_2_1939
-+.globl sym_2_1940
-+sym_2_1940: la $2, sym_2_1940
-+.globl sym_2_1941
-+sym_2_1941: la $2, sym_2_1941
-+.globl sym_2_1942
-+sym_2_1942: la $2, sym_2_1942
-+.globl sym_2_1943
-+sym_2_1943: la $2, sym_2_1943
-+.globl sym_2_1944
-+sym_2_1944: la $2, sym_2_1944
-+.globl sym_2_1945
-+sym_2_1945: la $2, sym_2_1945
-+.globl sym_2_1946
-+sym_2_1946: la $2, sym_2_1946
-+.globl sym_2_1947
-+sym_2_1947: la $2, sym_2_1947
-+.globl sym_2_1948
-+sym_2_1948: la $2, sym_2_1948
-+.globl sym_2_1949
-+sym_2_1949: la $2, sym_2_1949
-+.globl sym_2_1950
-+sym_2_1950: la $2, sym_2_1950
-+.globl sym_2_1951
-+sym_2_1951: la $2, sym_2_1951
-+.globl sym_2_1952
-+sym_2_1952: la $2, sym_2_1952
-+.globl sym_2_1953
-+sym_2_1953: la $2, sym_2_1953
-+.globl sym_2_1954
-+sym_2_1954: la $2, sym_2_1954
-+.globl sym_2_1955
-+sym_2_1955: la $2, sym_2_1955
-+.globl sym_2_1956
-+sym_2_1956: la $2, sym_2_1956
-+.globl sym_2_1957
-+sym_2_1957: la $2, sym_2_1957
-+.globl sym_2_1958
-+sym_2_1958: la $2, sym_2_1958
-+.globl sym_2_1959
-+sym_2_1959: la $2, sym_2_1959
-+.globl sym_2_1960
-+sym_2_1960: la $2, sym_2_1960
-+.globl sym_2_1961
-+sym_2_1961: la $2, sym_2_1961
-+.globl sym_2_1962
-+sym_2_1962: la $2, sym_2_1962
-+.globl sym_2_1963
-+sym_2_1963: la $2, sym_2_1963
-+.globl sym_2_1964
-+sym_2_1964: la $2, sym_2_1964
-+.globl sym_2_1965
-+sym_2_1965: la $2, sym_2_1965
-+.globl sym_2_1966
-+sym_2_1966: la $2, sym_2_1966
-+.globl sym_2_1967
-+sym_2_1967: la $2, sym_2_1967
-+.globl sym_2_1968
-+sym_2_1968: la $2, sym_2_1968
-+.globl sym_2_1969
-+sym_2_1969: la $2, sym_2_1969
-+.globl sym_2_1970
-+sym_2_1970: la $2, sym_2_1970
-+.globl sym_2_1971
-+sym_2_1971: la $2, sym_2_1971
-+.globl sym_2_1972
-+sym_2_1972: la $2, sym_2_1972
-+.globl sym_2_1973
-+sym_2_1973: la $2, sym_2_1973
-+.globl sym_2_1974
-+sym_2_1974: la $2, sym_2_1974
-+.globl sym_2_1975
-+sym_2_1975: la $2, sym_2_1975
-+.globl sym_2_1976
-+sym_2_1976: la $2, sym_2_1976
-+.globl sym_2_1977
-+sym_2_1977: la $2, sym_2_1977
-+.globl sym_2_1978
-+sym_2_1978: la $2, sym_2_1978
-+.globl sym_2_1979
-+sym_2_1979: la $2, sym_2_1979
-+.globl sym_2_1980
-+sym_2_1980: la $2, sym_2_1980
-+.globl sym_2_1981
-+sym_2_1981: la $2, sym_2_1981
-+.globl sym_2_1982
-+sym_2_1982: la $2, sym_2_1982
-+.globl sym_2_1983
-+sym_2_1983: la $2, sym_2_1983
-+.globl sym_2_1984
-+sym_2_1984: la $2, sym_2_1984
-+.globl sym_2_1985
-+sym_2_1985: la $2, sym_2_1985
-+.globl sym_2_1986
-+sym_2_1986: la $2, sym_2_1986
-+.globl sym_2_1987
-+sym_2_1987: la $2, sym_2_1987
-+.globl sym_2_1988
-+sym_2_1988: la $2, sym_2_1988
-+.globl sym_2_1989
-+sym_2_1989: la $2, sym_2_1989
-+.globl sym_2_1990
-+sym_2_1990: la $2, sym_2_1990
-+.globl sym_2_1991
-+sym_2_1991: la $2, sym_2_1991
-+.globl sym_2_1992
-+sym_2_1992: la $2, sym_2_1992
-+.globl sym_2_1993
-+sym_2_1993: la $2, sym_2_1993
-+.globl sym_2_1994
-+sym_2_1994: la $2, sym_2_1994
-+.globl sym_2_1995
-+sym_2_1995: la $2, sym_2_1995
-+.globl sym_2_1996
-+sym_2_1996: la $2, sym_2_1996
-+.globl sym_2_1997
-+sym_2_1997: la $2, sym_2_1997
-+.globl sym_2_1998
-+sym_2_1998: la $2, sym_2_1998
-+.globl sym_2_1999
-+sym_2_1999: la $2, sym_2_1999
-+.globl sym_2_2000
-+sym_2_2000: la $2, sym_2_2000
-+.globl sym_2_2001
-+sym_2_2001: la $2, sym_2_2001
-+.globl sym_2_2002
-+sym_2_2002: la $2, sym_2_2002
-+.globl sym_2_2003
-+sym_2_2003: la $2, sym_2_2003
-+.globl sym_2_2004
-+sym_2_2004: la $2, sym_2_2004
-+.globl sym_2_2005
-+sym_2_2005: la $2, sym_2_2005
-+.globl sym_2_2006
-+sym_2_2006: la $2, sym_2_2006
-+.globl sym_2_2007
-+sym_2_2007: la $2, sym_2_2007
-+.globl sym_2_2008
-+sym_2_2008: la $2, sym_2_2008
-+.globl sym_2_2009
-+sym_2_2009: la $2, sym_2_2009
-+.globl sym_2_2010
-+sym_2_2010: la $2, sym_2_2010
-+.globl sym_2_2011
-+sym_2_2011: la $2, sym_2_2011
-+.globl sym_2_2012
-+sym_2_2012: la $2, sym_2_2012
-+.globl sym_2_2013
-+sym_2_2013: la $2, sym_2_2013
-+.globl sym_2_2014
-+sym_2_2014: la $2, sym_2_2014
-+.globl sym_2_2015
-+sym_2_2015: la $2, sym_2_2015
-+.globl sym_2_2016
-+sym_2_2016: la $2, sym_2_2016
-+.globl sym_2_2017
-+sym_2_2017: la $2, sym_2_2017
-+.globl sym_2_2018
-+sym_2_2018: la $2, sym_2_2018
-+.globl sym_2_2019
-+sym_2_2019: la $2, sym_2_2019
-+.globl sym_2_2020
-+sym_2_2020: la $2, sym_2_2020
-+.globl sym_2_2021
-+sym_2_2021: la $2, sym_2_2021
-+.globl sym_2_2022
-+sym_2_2022: la $2, sym_2_2022
-+.globl sym_2_2023
-+sym_2_2023: la $2, sym_2_2023
-+.globl sym_2_2024
-+sym_2_2024: la $2, sym_2_2024
-+.globl sym_2_2025
-+sym_2_2025: la $2, sym_2_2025
-+.globl sym_2_2026
-+sym_2_2026: la $2, sym_2_2026
-+.globl sym_2_2027
-+sym_2_2027: la $2, sym_2_2027
-+.globl sym_2_2028
-+sym_2_2028: la $2, sym_2_2028
-+.globl sym_2_2029
-+sym_2_2029: la $2, sym_2_2029
-+.globl sym_2_2030
-+sym_2_2030: la $2, sym_2_2030
-+.globl sym_2_2031
-+sym_2_2031: la $2, sym_2_2031
-+.globl sym_2_2032
-+sym_2_2032: la $2, sym_2_2032
-+.globl sym_2_2033
-+sym_2_2033: la $2, sym_2_2033
-+.globl sym_2_2034
-+sym_2_2034: la $2, sym_2_2034
-+.globl sym_2_2035
-+sym_2_2035: la $2, sym_2_2035
-+.globl sym_2_2036
-+sym_2_2036: la $2, sym_2_2036
-+.globl sym_2_2037
-+sym_2_2037: la $2, sym_2_2037
-+.globl sym_2_2038
-+sym_2_2038: la $2, sym_2_2038
-+.globl sym_2_2039
-+sym_2_2039: la $2, sym_2_2039
-+.globl sym_2_2040
-+sym_2_2040: la $2, sym_2_2040
-+.globl sym_2_2041
-+sym_2_2041: la $2, sym_2_2041
-+.globl sym_2_2042
-+sym_2_2042: la $2, sym_2_2042
-+.globl sym_2_2043
-+sym_2_2043: la $2, sym_2_2043
-+.globl sym_2_2044
-+sym_2_2044: la $2, sym_2_2044
-+.globl sym_2_2045
-+sym_2_2045: la $2, sym_2_2045
-+.globl sym_2_2046
-+sym_2_2046: la $2, sym_2_2046
-+.globl sym_2_2047
-+sym_2_2047: la $2, sym_2_2047
-+.globl sym_2_2048
-+sym_2_2048: la $2, sym_2_2048
-+.globl sym_2_2049
-+sym_2_2049: la $2, sym_2_2049
-+.globl sym_2_2050
-+sym_2_2050: la $2, sym_2_2050
-+.globl sym_2_2051
-+sym_2_2051: la $2, sym_2_2051
-+.globl sym_2_2052
-+sym_2_2052: la $2, sym_2_2052
-+.globl sym_2_2053
-+sym_2_2053: la $2, sym_2_2053
-+.globl sym_2_2054
-+sym_2_2054: la $2, sym_2_2054
-+.globl sym_2_2055
-+sym_2_2055: la $2, sym_2_2055
-+.globl sym_2_2056
-+sym_2_2056: la $2, sym_2_2056
-+.globl sym_2_2057
-+sym_2_2057: la $2, sym_2_2057
-+.globl sym_2_2058
-+sym_2_2058: la $2, sym_2_2058
-+.globl sym_2_2059
-+sym_2_2059: la $2, sym_2_2059
-+.globl sym_2_2060
-+sym_2_2060: la $2, sym_2_2060
-+.globl sym_2_2061
-+sym_2_2061: la $2, sym_2_2061
-+.globl sym_2_2062
-+sym_2_2062: la $2, sym_2_2062
-+.globl sym_2_2063
-+sym_2_2063: la $2, sym_2_2063
-+.globl sym_2_2064
-+sym_2_2064: la $2, sym_2_2064
-+.globl sym_2_2065
-+sym_2_2065: la $2, sym_2_2065
-+.globl sym_2_2066
-+sym_2_2066: la $2, sym_2_2066
-+.globl sym_2_2067
-+sym_2_2067: la $2, sym_2_2067
-+.globl sym_2_2068
-+sym_2_2068: la $2, sym_2_2068
-+.globl sym_2_2069
-+sym_2_2069: la $2, sym_2_2069
-+.globl sym_2_2070
-+sym_2_2070: la $2, sym_2_2070
-+.globl sym_2_2071
-+sym_2_2071: la $2, sym_2_2071
-+.globl sym_2_2072
-+sym_2_2072: la $2, sym_2_2072
-+.globl sym_2_2073
-+sym_2_2073: la $2, sym_2_2073
-+.globl sym_2_2074
-+sym_2_2074: la $2, sym_2_2074
-+.globl sym_2_2075
-+sym_2_2075: la $2, sym_2_2075
-+.globl sym_2_2076
-+sym_2_2076: la $2, sym_2_2076
-+.globl sym_2_2077
-+sym_2_2077: la $2, sym_2_2077
-+.globl sym_2_2078
-+sym_2_2078: la $2, sym_2_2078
-+.globl sym_2_2079
-+sym_2_2079: la $2, sym_2_2079
-+.globl sym_2_2080
-+sym_2_2080: la $2, sym_2_2080
-+.globl sym_2_2081
-+sym_2_2081: la $2, sym_2_2081
-+.globl sym_2_2082
-+sym_2_2082: la $2, sym_2_2082
-+.globl sym_2_2083
-+sym_2_2083: la $2, sym_2_2083
-+.globl sym_2_2084
-+sym_2_2084: la $2, sym_2_2084
-+.globl sym_2_2085
-+sym_2_2085: la $2, sym_2_2085
-+.globl sym_2_2086
-+sym_2_2086: la $2, sym_2_2086
-+.globl sym_2_2087
-+sym_2_2087: la $2, sym_2_2087
-+.globl sym_2_2088
-+sym_2_2088: la $2, sym_2_2088
-+.globl sym_2_2089
-+sym_2_2089: la $2, sym_2_2089
-+.globl sym_2_2090
-+sym_2_2090: la $2, sym_2_2090
-+.globl sym_2_2091
-+sym_2_2091: la $2, sym_2_2091
-+.globl sym_2_2092
-+sym_2_2092: la $2, sym_2_2092
-+.globl sym_2_2093
-+sym_2_2093: la $2, sym_2_2093
-+.globl sym_2_2094
-+sym_2_2094: la $2, sym_2_2094
-+.globl sym_2_2095
-+sym_2_2095: la $2, sym_2_2095
-+.globl sym_2_2096
-+sym_2_2096: la $2, sym_2_2096
-+.globl sym_2_2097
-+sym_2_2097: la $2, sym_2_2097
-+.globl sym_2_2098
-+sym_2_2098: la $2, sym_2_2098
-+.globl sym_2_2099
-+sym_2_2099: la $2, sym_2_2099
-+.globl sym_2_2100
-+sym_2_2100: la $2, sym_2_2100
-+.globl sym_2_2101
-+sym_2_2101: la $2, sym_2_2101
-+.globl sym_2_2102
-+sym_2_2102: la $2, sym_2_2102
-+.globl sym_2_2103
-+sym_2_2103: la $2, sym_2_2103
-+.globl sym_2_2104
-+sym_2_2104: la $2, sym_2_2104
-+.globl sym_2_2105
-+sym_2_2105: la $2, sym_2_2105
-+.globl sym_2_2106
-+sym_2_2106: la $2, sym_2_2106
-+.globl sym_2_2107
-+sym_2_2107: la $2, sym_2_2107
-+.globl sym_2_2108
-+sym_2_2108: la $2, sym_2_2108
-+.globl sym_2_2109
-+sym_2_2109: la $2, sym_2_2109
-+.globl sym_2_2110
-+sym_2_2110: la $2, sym_2_2110
-+.globl sym_2_2111
-+sym_2_2111: la $2, sym_2_2111
-+.globl sym_2_2112
-+sym_2_2112: la $2, sym_2_2112
-+.globl sym_2_2113
-+sym_2_2113: la $2, sym_2_2113
-+.globl sym_2_2114
-+sym_2_2114: la $2, sym_2_2114
-+.globl sym_2_2115
-+sym_2_2115: la $2, sym_2_2115
-+.globl sym_2_2116
-+sym_2_2116: la $2, sym_2_2116
-+.globl sym_2_2117
-+sym_2_2117: la $2, sym_2_2117
-+.globl sym_2_2118
-+sym_2_2118: la $2, sym_2_2118
-+.globl sym_2_2119
-+sym_2_2119: la $2, sym_2_2119
-+.globl sym_2_2120
-+sym_2_2120: la $2, sym_2_2120
-+.globl sym_2_2121
-+sym_2_2121: la $2, sym_2_2121
-+.globl sym_2_2122
-+sym_2_2122: la $2, sym_2_2122
-+.globl sym_2_2123
-+sym_2_2123: la $2, sym_2_2123
-+.globl sym_2_2124
-+sym_2_2124: la $2, sym_2_2124
-+.globl sym_2_2125
-+sym_2_2125: la $2, sym_2_2125
-+.globl sym_2_2126
-+sym_2_2126: la $2, sym_2_2126
-+.globl sym_2_2127
-+sym_2_2127: la $2, sym_2_2127
-+.globl sym_2_2128
-+sym_2_2128: la $2, sym_2_2128
-+.globl sym_2_2129
-+sym_2_2129: la $2, sym_2_2129
-+.globl sym_2_2130
-+sym_2_2130: la $2, sym_2_2130
-+.globl sym_2_2131
-+sym_2_2131: la $2, sym_2_2131
-+.globl sym_2_2132
-+sym_2_2132: la $2, sym_2_2132
-+.globl sym_2_2133
-+sym_2_2133: la $2, sym_2_2133
-+.globl sym_2_2134
-+sym_2_2134: la $2, sym_2_2134
-+.globl sym_2_2135
-+sym_2_2135: la $2, sym_2_2135
-+.globl sym_2_2136
-+sym_2_2136: la $2, sym_2_2136
-+.globl sym_2_2137
-+sym_2_2137: la $2, sym_2_2137
-+.globl sym_2_2138
-+sym_2_2138: la $2, sym_2_2138
-+.globl sym_2_2139
-+sym_2_2139: la $2, sym_2_2139
-+.globl sym_2_2140
-+sym_2_2140: la $2, sym_2_2140
-+.globl sym_2_2141
-+sym_2_2141: la $2, sym_2_2141
-+.globl sym_2_2142
-+sym_2_2142: la $2, sym_2_2142
-+.globl sym_2_2143
-+sym_2_2143: la $2, sym_2_2143
-+.globl sym_2_2144
-+sym_2_2144: la $2, sym_2_2144
-+.globl sym_2_2145
-+sym_2_2145: la $2, sym_2_2145
-+.globl sym_2_2146
-+sym_2_2146: la $2, sym_2_2146
-+.globl sym_2_2147
-+sym_2_2147: la $2, sym_2_2147
-+.globl sym_2_2148
-+sym_2_2148: la $2, sym_2_2148
-+.globl sym_2_2149
-+sym_2_2149: la $2, sym_2_2149
-+.globl sym_2_2150
-+sym_2_2150: la $2, sym_2_2150
-+.globl sym_2_2151
-+sym_2_2151: la $2, sym_2_2151
-+.globl sym_2_2152
-+sym_2_2152: la $2, sym_2_2152
-+.globl sym_2_2153
-+sym_2_2153: la $2, sym_2_2153
-+.globl sym_2_2154
-+sym_2_2154: la $2, sym_2_2154
-+.globl sym_2_2155
-+sym_2_2155: la $2, sym_2_2155
-+.globl sym_2_2156
-+sym_2_2156: la $2, sym_2_2156
-+.globl sym_2_2157
-+sym_2_2157: la $2, sym_2_2157
-+.globl sym_2_2158
-+sym_2_2158: la $2, sym_2_2158
-+.globl sym_2_2159
-+sym_2_2159: la $2, sym_2_2159
-+.globl sym_2_2160
-+sym_2_2160: la $2, sym_2_2160
-+.globl sym_2_2161
-+sym_2_2161: la $2, sym_2_2161
-+.globl sym_2_2162
-+sym_2_2162: la $2, sym_2_2162
-+.globl sym_2_2163
-+sym_2_2163: la $2, sym_2_2163
-+.globl sym_2_2164
-+sym_2_2164: la $2, sym_2_2164
-+.globl sym_2_2165
-+sym_2_2165: la $2, sym_2_2165
-+.globl sym_2_2166
-+sym_2_2166: la $2, sym_2_2166
-+.globl sym_2_2167
-+sym_2_2167: la $2, sym_2_2167
-+.globl sym_2_2168
-+sym_2_2168: la $2, sym_2_2168
-+.globl sym_2_2169
-+sym_2_2169: la $2, sym_2_2169
-+.globl sym_2_2170
-+sym_2_2170: la $2, sym_2_2170
-+.globl sym_2_2171
-+sym_2_2171: la $2, sym_2_2171
-+.globl sym_2_2172
-+sym_2_2172: la $2, sym_2_2172
-+.globl sym_2_2173
-+sym_2_2173: la $2, sym_2_2173
-+.globl sym_2_2174
-+sym_2_2174: la $2, sym_2_2174
-+.globl sym_2_2175
-+sym_2_2175: la $2, sym_2_2175
-+.globl sym_2_2176
-+sym_2_2176: la $2, sym_2_2176
-+.globl sym_2_2177
-+sym_2_2177: la $2, sym_2_2177
-+.globl sym_2_2178
-+sym_2_2178: la $2, sym_2_2178
-+.globl sym_2_2179
-+sym_2_2179: la $2, sym_2_2179
-+.globl sym_2_2180
-+sym_2_2180: la $2, sym_2_2180
-+.globl sym_2_2181
-+sym_2_2181: la $2, sym_2_2181
-+.globl sym_2_2182
-+sym_2_2182: la $2, sym_2_2182
-+.globl sym_2_2183
-+sym_2_2183: la $2, sym_2_2183
-+.globl sym_2_2184
-+sym_2_2184: la $2, sym_2_2184
-+.globl sym_2_2185
-+sym_2_2185: la $2, sym_2_2185
-+.globl sym_2_2186
-+sym_2_2186: la $2, sym_2_2186
-+.globl sym_2_2187
-+sym_2_2187: la $2, sym_2_2187
-+.globl sym_2_2188
-+sym_2_2188: la $2, sym_2_2188
-+.globl sym_2_2189
-+sym_2_2189: la $2, sym_2_2189
-+.globl sym_2_2190
-+sym_2_2190: la $2, sym_2_2190
-+.globl sym_2_2191
-+sym_2_2191: la $2, sym_2_2191
-+.globl sym_2_2192
-+sym_2_2192: la $2, sym_2_2192
-+.globl sym_2_2193
-+sym_2_2193: la $2, sym_2_2193
-+.globl sym_2_2194
-+sym_2_2194: la $2, sym_2_2194
-+.globl sym_2_2195
-+sym_2_2195: la $2, sym_2_2195
-+.globl sym_2_2196
-+sym_2_2196: la $2, sym_2_2196
-+.globl sym_2_2197
-+sym_2_2197: la $2, sym_2_2197
-+.globl sym_2_2198
-+sym_2_2198: la $2, sym_2_2198
-+.globl sym_2_2199
-+sym_2_2199: la $2, sym_2_2199
-+.globl sym_2_2200
-+sym_2_2200: la $2, sym_2_2200
-+.globl sym_2_2201
-+sym_2_2201: la $2, sym_2_2201
-+.globl sym_2_2202
-+sym_2_2202: la $2, sym_2_2202
-+.globl sym_2_2203
-+sym_2_2203: la $2, sym_2_2203
-+.globl sym_2_2204
-+sym_2_2204: la $2, sym_2_2204
-+.globl sym_2_2205
-+sym_2_2205: la $2, sym_2_2205
-+.globl sym_2_2206
-+sym_2_2206: la $2, sym_2_2206
-+.globl sym_2_2207
-+sym_2_2207: la $2, sym_2_2207
-+.globl sym_2_2208
-+sym_2_2208: la $2, sym_2_2208
-+.globl sym_2_2209
-+sym_2_2209: la $2, sym_2_2209
-+.globl sym_2_2210
-+sym_2_2210: la $2, sym_2_2210
-+.globl sym_2_2211
-+sym_2_2211: la $2, sym_2_2211
-+.globl sym_2_2212
-+sym_2_2212: la $2, sym_2_2212
-+.globl sym_2_2213
-+sym_2_2213: la $2, sym_2_2213
-+.globl sym_2_2214
-+sym_2_2214: la $2, sym_2_2214
-+.globl sym_2_2215
-+sym_2_2215: la $2, sym_2_2215
-+.globl sym_2_2216
-+sym_2_2216: la $2, sym_2_2216
-+.globl sym_2_2217
-+sym_2_2217: la $2, sym_2_2217
-+.globl sym_2_2218
-+sym_2_2218: la $2, sym_2_2218
-+.globl sym_2_2219
-+sym_2_2219: la $2, sym_2_2219
-+.globl sym_2_2220
-+sym_2_2220: la $2, sym_2_2220
-+.globl sym_2_2221
-+sym_2_2221: la $2, sym_2_2221
-+.globl sym_2_2222
-+sym_2_2222: la $2, sym_2_2222
-+.globl sym_2_2223
-+sym_2_2223: la $2, sym_2_2223
-+.globl sym_2_2224
-+sym_2_2224: la $2, sym_2_2224
-+.globl sym_2_2225
-+sym_2_2225: la $2, sym_2_2225
-+.globl sym_2_2226
-+sym_2_2226: la $2, sym_2_2226
-+.globl sym_2_2227
-+sym_2_2227: la $2, sym_2_2227
-+.globl sym_2_2228
-+sym_2_2228: la $2, sym_2_2228
-+.globl sym_2_2229
-+sym_2_2229: la $2, sym_2_2229
-+.globl sym_2_2230
-+sym_2_2230: la $2, sym_2_2230
-+.globl sym_2_2231
-+sym_2_2231: la $2, sym_2_2231
-+.globl sym_2_2232
-+sym_2_2232: la $2, sym_2_2232
-+.globl sym_2_2233
-+sym_2_2233: la $2, sym_2_2233
-+.globl sym_2_2234
-+sym_2_2234: la $2, sym_2_2234
-+.globl sym_2_2235
-+sym_2_2235: la $2, sym_2_2235
-+.globl sym_2_2236
-+sym_2_2236: la $2, sym_2_2236
-+.globl sym_2_2237
-+sym_2_2237: la $2, sym_2_2237
-+.globl sym_2_2238
-+sym_2_2238: la $2, sym_2_2238
-+.globl sym_2_2239
-+sym_2_2239: la $2, sym_2_2239
-+.globl sym_2_2240
-+sym_2_2240: la $2, sym_2_2240
-+.globl sym_2_2241
-+sym_2_2241: la $2, sym_2_2241
-+.globl sym_2_2242
-+sym_2_2242: la $2, sym_2_2242
-+.globl sym_2_2243
-+sym_2_2243: la $2, sym_2_2243
-+.globl sym_2_2244
-+sym_2_2244: la $2, sym_2_2244
-+.globl sym_2_2245
-+sym_2_2245: la $2, sym_2_2245
-+.globl sym_2_2246
-+sym_2_2246: la $2, sym_2_2246
-+.globl sym_2_2247
-+sym_2_2247: la $2, sym_2_2247
-+.globl sym_2_2248
-+sym_2_2248: la $2, sym_2_2248
-+.globl sym_2_2249
-+sym_2_2249: la $2, sym_2_2249
-+.globl sym_2_2250
-+sym_2_2250: la $2, sym_2_2250
-+.globl sym_2_2251
-+sym_2_2251: la $2, sym_2_2251
-+.globl sym_2_2252
-+sym_2_2252: la $2, sym_2_2252
-+.globl sym_2_2253
-+sym_2_2253: la $2, sym_2_2253
-+.globl sym_2_2254
-+sym_2_2254: la $2, sym_2_2254
-+.globl sym_2_2255
-+sym_2_2255: la $2, sym_2_2255
-+.globl sym_2_2256
-+sym_2_2256: la $2, sym_2_2256
-+.globl sym_2_2257
-+sym_2_2257: la $2, sym_2_2257
-+.globl sym_2_2258
-+sym_2_2258: la $2, sym_2_2258
-+.globl sym_2_2259
-+sym_2_2259: la $2, sym_2_2259
-+.globl sym_2_2260
-+sym_2_2260: la $2, sym_2_2260
-+.globl sym_2_2261
-+sym_2_2261: la $2, sym_2_2261
-+.globl sym_2_2262
-+sym_2_2262: la $2, sym_2_2262
-+.globl sym_2_2263
-+sym_2_2263: la $2, sym_2_2263
-+.globl sym_2_2264
-+sym_2_2264: la $2, sym_2_2264
-+.globl sym_2_2265
-+sym_2_2265: la $2, sym_2_2265
-+.globl sym_2_2266
-+sym_2_2266: la $2, sym_2_2266
-+.globl sym_2_2267
-+sym_2_2267: la $2, sym_2_2267
-+.globl sym_2_2268
-+sym_2_2268: la $2, sym_2_2268
-+.globl sym_2_2269
-+sym_2_2269: la $2, sym_2_2269
-+.globl sym_2_2270
-+sym_2_2270: la $2, sym_2_2270
-+.globl sym_2_2271
-+sym_2_2271: la $2, sym_2_2271
-+.globl sym_2_2272
-+sym_2_2272: la $2, sym_2_2272
-+.globl sym_2_2273
-+sym_2_2273: la $2, sym_2_2273
-+.globl sym_2_2274
-+sym_2_2274: la $2, sym_2_2274
-+.globl sym_2_2275
-+sym_2_2275: la $2, sym_2_2275
-+.globl sym_2_2276
-+sym_2_2276: la $2, sym_2_2276
-+.globl sym_2_2277
-+sym_2_2277: la $2, sym_2_2277
-+.globl sym_2_2278
-+sym_2_2278: la $2, sym_2_2278
-+.globl sym_2_2279
-+sym_2_2279: la $2, sym_2_2279
-+.globl sym_2_2280
-+sym_2_2280: la $2, sym_2_2280
-+.globl sym_2_2281
-+sym_2_2281: la $2, sym_2_2281
-+.globl sym_2_2282
-+sym_2_2282: la $2, sym_2_2282
-+.globl sym_2_2283
-+sym_2_2283: la $2, sym_2_2283
-+.globl sym_2_2284
-+sym_2_2284: la $2, sym_2_2284
-+.globl sym_2_2285
-+sym_2_2285: la $2, sym_2_2285
-+.globl sym_2_2286
-+sym_2_2286: la $2, sym_2_2286
-+.globl sym_2_2287
-+sym_2_2287: la $2, sym_2_2287
-+.globl sym_2_2288
-+sym_2_2288: la $2, sym_2_2288
-+.globl sym_2_2289
-+sym_2_2289: la $2, sym_2_2289
-+.globl sym_2_2290
-+sym_2_2290: la $2, sym_2_2290
-+.globl sym_2_2291
-+sym_2_2291: la $2, sym_2_2291
-+.globl sym_2_2292
-+sym_2_2292: la $2, sym_2_2292
-+.globl sym_2_2293
-+sym_2_2293: la $2, sym_2_2293
-+.globl sym_2_2294
-+sym_2_2294: la $2, sym_2_2294
-+.globl sym_2_2295
-+sym_2_2295: la $2, sym_2_2295
-+.globl sym_2_2296
-+sym_2_2296: la $2, sym_2_2296
-+.globl sym_2_2297
-+sym_2_2297: la $2, sym_2_2297
-+.globl sym_2_2298
-+sym_2_2298: la $2, sym_2_2298
-+.globl sym_2_2299
-+sym_2_2299: la $2, sym_2_2299
-+.globl sym_2_2300
-+sym_2_2300: la $2, sym_2_2300
-+.globl sym_2_2301
-+sym_2_2301: la $2, sym_2_2301
-+.globl sym_2_2302
-+sym_2_2302: la $2, sym_2_2302
-+.globl sym_2_2303
-+sym_2_2303: la $2, sym_2_2303
-+.globl sym_2_2304
-+sym_2_2304: la $2, sym_2_2304
-+.globl sym_2_2305
-+sym_2_2305: la $2, sym_2_2305
-+.globl sym_2_2306
-+sym_2_2306: la $2, sym_2_2306
-+.globl sym_2_2307
-+sym_2_2307: la $2, sym_2_2307
-+.globl sym_2_2308
-+sym_2_2308: la $2, sym_2_2308
-+.globl sym_2_2309
-+sym_2_2309: la $2, sym_2_2309
-+.globl sym_2_2310
-+sym_2_2310: la $2, sym_2_2310
-+.globl sym_2_2311
-+sym_2_2311: la $2, sym_2_2311
-+.globl sym_2_2312
-+sym_2_2312: la $2, sym_2_2312
-+.globl sym_2_2313
-+sym_2_2313: la $2, sym_2_2313
-+.globl sym_2_2314
-+sym_2_2314: la $2, sym_2_2314
-+.globl sym_2_2315
-+sym_2_2315: la $2, sym_2_2315
-+.globl sym_2_2316
-+sym_2_2316: la $2, sym_2_2316
-+.globl sym_2_2317
-+sym_2_2317: la $2, sym_2_2317
-+.globl sym_2_2318
-+sym_2_2318: la $2, sym_2_2318
-+.globl sym_2_2319
-+sym_2_2319: la $2, sym_2_2319
-+.globl sym_2_2320
-+sym_2_2320: la $2, sym_2_2320
-+.globl sym_2_2321
-+sym_2_2321: la $2, sym_2_2321
-+.globl sym_2_2322
-+sym_2_2322: la $2, sym_2_2322
-+.globl sym_2_2323
-+sym_2_2323: la $2, sym_2_2323
-+.globl sym_2_2324
-+sym_2_2324: la $2, sym_2_2324
-+.globl sym_2_2325
-+sym_2_2325: la $2, sym_2_2325
-+.globl sym_2_2326
-+sym_2_2326: la $2, sym_2_2326
-+.globl sym_2_2327
-+sym_2_2327: la $2, sym_2_2327
-+.globl sym_2_2328
-+sym_2_2328: la $2, sym_2_2328
-+.globl sym_2_2329
-+sym_2_2329: la $2, sym_2_2329
-+.globl sym_2_2330
-+sym_2_2330: la $2, sym_2_2330
-+.globl sym_2_2331
-+sym_2_2331: la $2, sym_2_2331
-+.globl sym_2_2332
-+sym_2_2332: la $2, sym_2_2332
-+.globl sym_2_2333
-+sym_2_2333: la $2, sym_2_2333
-+.globl sym_2_2334
-+sym_2_2334: la $2, sym_2_2334
-+.globl sym_2_2335
-+sym_2_2335: la $2, sym_2_2335
-+.globl sym_2_2336
-+sym_2_2336: la $2, sym_2_2336
-+.globl sym_2_2337
-+sym_2_2337: la $2, sym_2_2337
-+.globl sym_2_2338
-+sym_2_2338: la $2, sym_2_2338
-+.globl sym_2_2339
-+sym_2_2339: la $2, sym_2_2339
-+.globl sym_2_2340
-+sym_2_2340: la $2, sym_2_2340
-+.globl sym_2_2341
-+sym_2_2341: la $2, sym_2_2341
-+.globl sym_2_2342
-+sym_2_2342: la $2, sym_2_2342
-+.globl sym_2_2343
-+sym_2_2343: la $2, sym_2_2343
-+.globl sym_2_2344
-+sym_2_2344: la $2, sym_2_2344
-+.globl sym_2_2345
-+sym_2_2345: la $2, sym_2_2345
-+.globl sym_2_2346
-+sym_2_2346: la $2, sym_2_2346
-+.globl sym_2_2347
-+sym_2_2347: la $2, sym_2_2347
-+.globl sym_2_2348
-+sym_2_2348: la $2, sym_2_2348
-+.globl sym_2_2349
-+sym_2_2349: la $2, sym_2_2349
-+.globl sym_2_2350
-+sym_2_2350: la $2, sym_2_2350
-+.globl sym_2_2351
-+sym_2_2351: la $2, sym_2_2351
-+.globl sym_2_2352
-+sym_2_2352: la $2, sym_2_2352
-+.globl sym_2_2353
-+sym_2_2353: la $2, sym_2_2353
-+.globl sym_2_2354
-+sym_2_2354: la $2, sym_2_2354
-+.globl sym_2_2355
-+sym_2_2355: la $2, sym_2_2355
-+.globl sym_2_2356
-+sym_2_2356: la $2, sym_2_2356
-+.globl sym_2_2357
-+sym_2_2357: la $2, sym_2_2357
-+.globl sym_2_2358
-+sym_2_2358: la $2, sym_2_2358
-+.globl sym_2_2359
-+sym_2_2359: la $2, sym_2_2359
-+.globl sym_2_2360
-+sym_2_2360: la $2, sym_2_2360
-+.globl sym_2_2361
-+sym_2_2361: la $2, sym_2_2361
-+.globl sym_2_2362
-+sym_2_2362: la $2, sym_2_2362
-+.globl sym_2_2363
-+sym_2_2363: la $2, sym_2_2363
-+.globl sym_2_2364
-+sym_2_2364: la $2, sym_2_2364
-+.globl sym_2_2365
-+sym_2_2365: la $2, sym_2_2365
-+.globl sym_2_2366
-+sym_2_2366: la $2, sym_2_2366
-+.globl sym_2_2367
-+sym_2_2367: la $2, sym_2_2367
-+.globl sym_2_2368
-+sym_2_2368: la $2, sym_2_2368
-+.globl sym_2_2369
-+sym_2_2369: la $2, sym_2_2369
-+.globl sym_2_2370
-+sym_2_2370: la $2, sym_2_2370
-+.globl sym_2_2371
-+sym_2_2371: la $2, sym_2_2371
-+.globl sym_2_2372
-+sym_2_2372: la $2, sym_2_2372
-+.globl sym_2_2373
-+sym_2_2373: la $2, sym_2_2373
-+.globl sym_2_2374
-+sym_2_2374: la $2, sym_2_2374
-+.globl sym_2_2375
-+sym_2_2375: la $2, sym_2_2375
-+.globl sym_2_2376
-+sym_2_2376: la $2, sym_2_2376
-+.globl sym_2_2377
-+sym_2_2377: la $2, sym_2_2377
-+.globl sym_2_2378
-+sym_2_2378: la $2, sym_2_2378
-+.globl sym_2_2379
-+sym_2_2379: la $2, sym_2_2379
-+.globl sym_2_2380
-+sym_2_2380: la $2, sym_2_2380
-+.globl sym_2_2381
-+sym_2_2381: la $2, sym_2_2381
-+.globl sym_2_2382
-+sym_2_2382: la $2, sym_2_2382
-+.globl sym_2_2383
-+sym_2_2383: la $2, sym_2_2383
-+.globl sym_2_2384
-+sym_2_2384: la $2, sym_2_2384
-+.globl sym_2_2385
-+sym_2_2385: la $2, sym_2_2385
-+.globl sym_2_2386
-+sym_2_2386: la $2, sym_2_2386
-+.globl sym_2_2387
-+sym_2_2387: la $2, sym_2_2387
-+.globl sym_2_2388
-+sym_2_2388: la $2, sym_2_2388
-+.globl sym_2_2389
-+sym_2_2389: la $2, sym_2_2389
-+.globl sym_2_2390
-+sym_2_2390: la $2, sym_2_2390
-+.globl sym_2_2391
-+sym_2_2391: la $2, sym_2_2391
-+.globl sym_2_2392
-+sym_2_2392: la $2, sym_2_2392
-+.globl sym_2_2393
-+sym_2_2393: la $2, sym_2_2393
-+.globl sym_2_2394
-+sym_2_2394: la $2, sym_2_2394
-+.globl sym_2_2395
-+sym_2_2395: la $2, sym_2_2395
-+.globl sym_2_2396
-+sym_2_2396: la $2, sym_2_2396
-+.globl sym_2_2397
-+sym_2_2397: la $2, sym_2_2397
-+.globl sym_2_2398
-+sym_2_2398: la $2, sym_2_2398
-+.globl sym_2_2399
-+sym_2_2399: la $2, sym_2_2399
-+.globl sym_2_2400
-+sym_2_2400: la $2, sym_2_2400
-+.globl sym_2_2401
-+sym_2_2401: la $2, sym_2_2401
-+.globl sym_2_2402
-+sym_2_2402: la $2, sym_2_2402
-+.globl sym_2_2403
-+sym_2_2403: la $2, sym_2_2403
-+.globl sym_2_2404
-+sym_2_2404: la $2, sym_2_2404
-+.globl sym_2_2405
-+sym_2_2405: la $2, sym_2_2405
-+.globl sym_2_2406
-+sym_2_2406: la $2, sym_2_2406
-+.globl sym_2_2407
-+sym_2_2407: la $2, sym_2_2407
-+.globl sym_2_2408
-+sym_2_2408: la $2, sym_2_2408
-+.globl sym_2_2409
-+sym_2_2409: la $2, sym_2_2409
-+.globl sym_2_2410
-+sym_2_2410: la $2, sym_2_2410
-+.globl sym_2_2411
-+sym_2_2411: la $2, sym_2_2411
-+.globl sym_2_2412
-+sym_2_2412: la $2, sym_2_2412
-+.globl sym_2_2413
-+sym_2_2413: la $2, sym_2_2413
-+.globl sym_2_2414
-+sym_2_2414: la $2, sym_2_2414
-+.globl sym_2_2415
-+sym_2_2415: la $2, sym_2_2415
-+.globl sym_2_2416
-+sym_2_2416: la $2, sym_2_2416
-+.globl sym_2_2417
-+sym_2_2417: la $2, sym_2_2417
-+.globl sym_2_2418
-+sym_2_2418: la $2, sym_2_2418
-+.globl sym_2_2419
-+sym_2_2419: la $2, sym_2_2419
-+.globl sym_2_2420
-+sym_2_2420: la $2, sym_2_2420
-+.globl sym_2_2421
-+sym_2_2421: la $2, sym_2_2421
-+.globl sym_2_2422
-+sym_2_2422: la $2, sym_2_2422
-+.globl sym_2_2423
-+sym_2_2423: la $2, sym_2_2423
-+.globl sym_2_2424
-+sym_2_2424: la $2, sym_2_2424
-+.globl sym_2_2425
-+sym_2_2425: la $2, sym_2_2425
-+.globl sym_2_2426
-+sym_2_2426: la $2, sym_2_2426
-+.globl sym_2_2427
-+sym_2_2427: la $2, sym_2_2427
-+.globl sym_2_2428
-+sym_2_2428: la $2, sym_2_2428
-+.globl sym_2_2429
-+sym_2_2429: la $2, sym_2_2429
-+.globl sym_2_2430
-+sym_2_2430: la $2, sym_2_2430
-+.globl sym_2_2431
-+sym_2_2431: la $2, sym_2_2431
-+.globl sym_2_2432
-+sym_2_2432: la $2, sym_2_2432
-+.globl sym_2_2433
-+sym_2_2433: la $2, sym_2_2433
-+.globl sym_2_2434
-+sym_2_2434: la $2, sym_2_2434
-+.globl sym_2_2435
-+sym_2_2435: la $2, sym_2_2435
-+.globl sym_2_2436
-+sym_2_2436: la $2, sym_2_2436
-+.globl sym_2_2437
-+sym_2_2437: la $2, sym_2_2437
-+.globl sym_2_2438
-+sym_2_2438: la $2, sym_2_2438
-+.globl sym_2_2439
-+sym_2_2439: la $2, sym_2_2439
-+.globl sym_2_2440
-+sym_2_2440: la $2, sym_2_2440
-+.globl sym_2_2441
-+sym_2_2441: la $2, sym_2_2441
-+.globl sym_2_2442
-+sym_2_2442: la $2, sym_2_2442
-+.globl sym_2_2443
-+sym_2_2443: la $2, sym_2_2443
-+.globl sym_2_2444
-+sym_2_2444: la $2, sym_2_2444
-+.globl sym_2_2445
-+sym_2_2445: la $2, sym_2_2445
-+.globl sym_2_2446
-+sym_2_2446: la $2, sym_2_2446
-+.globl sym_2_2447
-+sym_2_2447: la $2, sym_2_2447
-+.globl sym_2_2448
-+sym_2_2448: la $2, sym_2_2448
-+.globl sym_2_2449
-+sym_2_2449: la $2, sym_2_2449
-+.globl sym_2_2450
-+sym_2_2450: la $2, sym_2_2450
-+.globl sym_2_2451
-+sym_2_2451: la $2, sym_2_2451
-+.globl sym_2_2452
-+sym_2_2452: la $2, sym_2_2452
-+.globl sym_2_2453
-+sym_2_2453: la $2, sym_2_2453
-+.globl sym_2_2454
-+sym_2_2454: la $2, sym_2_2454
-+.globl sym_2_2455
-+sym_2_2455: la $2, sym_2_2455
-+.globl sym_2_2456
-+sym_2_2456: la $2, sym_2_2456
-+.globl sym_2_2457
-+sym_2_2457: la $2, sym_2_2457
-+.globl sym_2_2458
-+sym_2_2458: la $2, sym_2_2458
-+.globl sym_2_2459
-+sym_2_2459: la $2, sym_2_2459
-+.globl sym_2_2460
-+sym_2_2460: la $2, sym_2_2460
-+.globl sym_2_2461
-+sym_2_2461: la $2, sym_2_2461
-+.globl sym_2_2462
-+sym_2_2462: la $2, sym_2_2462
-+.globl sym_2_2463
-+sym_2_2463: la $2, sym_2_2463
-+.globl sym_2_2464
-+sym_2_2464: la $2, sym_2_2464
-+.globl sym_2_2465
-+sym_2_2465: la $2, sym_2_2465
-+.globl sym_2_2466
-+sym_2_2466: la $2, sym_2_2466
-+.globl sym_2_2467
-+sym_2_2467: la $2, sym_2_2467
-+.globl sym_2_2468
-+sym_2_2468: la $2, sym_2_2468
-+.globl sym_2_2469
-+sym_2_2469: la $2, sym_2_2469
-+.globl sym_2_2470
-+sym_2_2470: la $2, sym_2_2470
-+.globl sym_2_2471
-+sym_2_2471: la $2, sym_2_2471
-+.globl sym_2_2472
-+sym_2_2472: la $2, sym_2_2472
-+.globl sym_2_2473
-+sym_2_2473: la $2, sym_2_2473
-+.globl sym_2_2474
-+sym_2_2474: la $2, sym_2_2474
-+.globl sym_2_2475
-+sym_2_2475: la $2, sym_2_2475
-+.globl sym_2_2476
-+sym_2_2476: la $2, sym_2_2476
-+.globl sym_2_2477
-+sym_2_2477: la $2, sym_2_2477
-+.globl sym_2_2478
-+sym_2_2478: la $2, sym_2_2478
-+.globl sym_2_2479
-+sym_2_2479: la $2, sym_2_2479
-+.globl sym_2_2480
-+sym_2_2480: la $2, sym_2_2480
-+.globl sym_2_2481
-+sym_2_2481: la $2, sym_2_2481
-+.globl sym_2_2482
-+sym_2_2482: la $2, sym_2_2482
-+.globl sym_2_2483
-+sym_2_2483: la $2, sym_2_2483
-+.globl sym_2_2484
-+sym_2_2484: la $2, sym_2_2484
-+.globl sym_2_2485
-+sym_2_2485: la $2, sym_2_2485
-+.globl sym_2_2486
-+sym_2_2486: la $2, sym_2_2486
-+.globl sym_2_2487
-+sym_2_2487: la $2, sym_2_2487
-+.globl sym_2_2488
-+sym_2_2488: la $2, sym_2_2488
-+.globl sym_2_2489
-+sym_2_2489: la $2, sym_2_2489
-+.globl sym_2_2490
-+sym_2_2490: la $2, sym_2_2490
-+.globl sym_2_2491
-+sym_2_2491: la $2, sym_2_2491
-+.globl sym_2_2492
-+sym_2_2492: la $2, sym_2_2492
-+.globl sym_2_2493
-+sym_2_2493: la $2, sym_2_2493
-+.globl sym_2_2494
-+sym_2_2494: la $2, sym_2_2494
-+.globl sym_2_2495
-+sym_2_2495: la $2, sym_2_2495
-+.globl sym_2_2496
-+sym_2_2496: la $2, sym_2_2496
-+.globl sym_2_2497
-+sym_2_2497: la $2, sym_2_2497
-+.globl sym_2_2498
-+sym_2_2498: la $2, sym_2_2498
-+.globl sym_2_2499
-+sym_2_2499: la $2, sym_2_2499
-+.globl sym_2_2500
-+sym_2_2500: la $2, sym_2_2500
-+.globl sym_2_2501
-+sym_2_2501: la $2, sym_2_2501
-+.globl sym_2_2502
-+sym_2_2502: la $2, sym_2_2502
-+.globl sym_2_2503
-+sym_2_2503: la $2, sym_2_2503
-+.globl sym_2_2504
-+sym_2_2504: la $2, sym_2_2504
-+.globl sym_2_2505
-+sym_2_2505: la $2, sym_2_2505
-+.globl sym_2_2506
-+sym_2_2506: la $2, sym_2_2506
-+.globl sym_2_2507
-+sym_2_2507: la $2, sym_2_2507
-+.globl sym_2_2508
-+sym_2_2508: la $2, sym_2_2508
-+.globl sym_2_2509
-+sym_2_2509: la $2, sym_2_2509
-+.globl sym_2_2510
-+sym_2_2510: la $2, sym_2_2510
-+.globl sym_2_2511
-+sym_2_2511: la $2, sym_2_2511
-+.globl sym_2_2512
-+sym_2_2512: la $2, sym_2_2512
-+.globl sym_2_2513
-+sym_2_2513: la $2, sym_2_2513
-+.globl sym_2_2514
-+sym_2_2514: la $2, sym_2_2514
-+.globl sym_2_2515
-+sym_2_2515: la $2, sym_2_2515
-+.globl sym_2_2516
-+sym_2_2516: la $2, sym_2_2516
-+.globl sym_2_2517
-+sym_2_2517: la $2, sym_2_2517
-+.globl sym_2_2518
-+sym_2_2518: la $2, sym_2_2518
-+.globl sym_2_2519
-+sym_2_2519: la $2, sym_2_2519
-+.globl sym_2_2520
-+sym_2_2520: la $2, sym_2_2520
-+.globl sym_2_2521
-+sym_2_2521: la $2, sym_2_2521
-+.globl sym_2_2522
-+sym_2_2522: la $2, sym_2_2522
-+.globl sym_2_2523
-+sym_2_2523: la $2, sym_2_2523
-+.globl sym_2_2524
-+sym_2_2524: la $2, sym_2_2524
-+.globl sym_2_2525
-+sym_2_2525: la $2, sym_2_2525
-+.globl sym_2_2526
-+sym_2_2526: la $2, sym_2_2526
-+.globl sym_2_2527
-+sym_2_2527: la $2, sym_2_2527
-+.globl sym_2_2528
-+sym_2_2528: la $2, sym_2_2528
-+.globl sym_2_2529
-+sym_2_2529: la $2, sym_2_2529
-+.globl sym_2_2530
-+sym_2_2530: la $2, sym_2_2530
-+.globl sym_2_2531
-+sym_2_2531: la $2, sym_2_2531
-+.globl sym_2_2532
-+sym_2_2532: la $2, sym_2_2532
-+.globl sym_2_2533
-+sym_2_2533: la $2, sym_2_2533
-+.globl sym_2_2534
-+sym_2_2534: la $2, sym_2_2534
-+.globl sym_2_2535
-+sym_2_2535: la $2, sym_2_2535
-+.globl sym_2_2536
-+sym_2_2536: la $2, sym_2_2536
-+.globl sym_2_2537
-+sym_2_2537: la $2, sym_2_2537
-+.globl sym_2_2538
-+sym_2_2538: la $2, sym_2_2538
-+.globl sym_2_2539
-+sym_2_2539: la $2, sym_2_2539
-+.globl sym_2_2540
-+sym_2_2540: la $2, sym_2_2540
-+.globl sym_2_2541
-+sym_2_2541: la $2, sym_2_2541
-+.globl sym_2_2542
-+sym_2_2542: la $2, sym_2_2542
-+.globl sym_2_2543
-+sym_2_2543: la $2, sym_2_2543
-+.globl sym_2_2544
-+sym_2_2544: la $2, sym_2_2544
-+.globl sym_2_2545
-+sym_2_2545: la $2, sym_2_2545
-+.globl sym_2_2546
-+sym_2_2546: la $2, sym_2_2546
-+.globl sym_2_2547
-+sym_2_2547: la $2, sym_2_2547
-+.globl sym_2_2548
-+sym_2_2548: la $2, sym_2_2548
-+.globl sym_2_2549
-+sym_2_2549: la $2, sym_2_2549
-+.globl sym_2_2550
-+sym_2_2550: la $2, sym_2_2550
-+.globl sym_2_2551
-+sym_2_2551: la $2, sym_2_2551
-+.globl sym_2_2552
-+sym_2_2552: la $2, sym_2_2552
-+.globl sym_2_2553
-+sym_2_2553: la $2, sym_2_2553
-+.globl sym_2_2554
-+sym_2_2554: la $2, sym_2_2554
-+.globl sym_2_2555
-+sym_2_2555: la $2, sym_2_2555
-+.globl sym_2_2556
-+sym_2_2556: la $2, sym_2_2556
-+.globl sym_2_2557
-+sym_2_2557: la $2, sym_2_2557
-+.globl sym_2_2558
-+sym_2_2558: la $2, sym_2_2558
-+.globl sym_2_2559
-+sym_2_2559: la $2, sym_2_2559
-+.globl sym_2_2560
-+sym_2_2560: la $2, sym_2_2560
-+.globl sym_2_2561
-+sym_2_2561: la $2, sym_2_2561
-+.globl sym_2_2562
-+sym_2_2562: la $2, sym_2_2562
-+.globl sym_2_2563
-+sym_2_2563: la $2, sym_2_2563
-+.globl sym_2_2564
-+sym_2_2564: la $2, sym_2_2564
-+.globl sym_2_2565
-+sym_2_2565: la $2, sym_2_2565
-+.globl sym_2_2566
-+sym_2_2566: la $2, sym_2_2566
-+.globl sym_2_2567
-+sym_2_2567: la $2, sym_2_2567
-+.globl sym_2_2568
-+sym_2_2568: la $2, sym_2_2568
-+.globl sym_2_2569
-+sym_2_2569: la $2, sym_2_2569
-+.globl sym_2_2570
-+sym_2_2570: la $2, sym_2_2570
-+.globl sym_2_2571
-+sym_2_2571: la $2, sym_2_2571
-+.globl sym_2_2572
-+sym_2_2572: la $2, sym_2_2572
-+.globl sym_2_2573
-+sym_2_2573: la $2, sym_2_2573
-+.globl sym_2_2574
-+sym_2_2574: la $2, sym_2_2574
-+.globl sym_2_2575
-+sym_2_2575: la $2, sym_2_2575
-+.globl sym_2_2576
-+sym_2_2576: la $2, sym_2_2576
-+.globl sym_2_2577
-+sym_2_2577: la $2, sym_2_2577
-+.globl sym_2_2578
-+sym_2_2578: la $2, sym_2_2578
-+.globl sym_2_2579
-+sym_2_2579: la $2, sym_2_2579
-+.globl sym_2_2580
-+sym_2_2580: la $2, sym_2_2580
-+.globl sym_2_2581
-+sym_2_2581: la $2, sym_2_2581
-+.globl sym_2_2582
-+sym_2_2582: la $2, sym_2_2582
-+.globl sym_2_2583
-+sym_2_2583: la $2, sym_2_2583
-+.globl sym_2_2584
-+sym_2_2584: la $2, sym_2_2584
-+.globl sym_2_2585
-+sym_2_2585: la $2, sym_2_2585
-+.globl sym_2_2586
-+sym_2_2586: la $2, sym_2_2586
-+.globl sym_2_2587
-+sym_2_2587: la $2, sym_2_2587
-+.globl sym_2_2588
-+sym_2_2588: la $2, sym_2_2588
-+.globl sym_2_2589
-+sym_2_2589: la $2, sym_2_2589
-+.globl sym_2_2590
-+sym_2_2590: la $2, sym_2_2590
-+.globl sym_2_2591
-+sym_2_2591: la $2, sym_2_2591
-+.globl sym_2_2592
-+sym_2_2592: la $2, sym_2_2592
-+.globl sym_2_2593
-+sym_2_2593: la $2, sym_2_2593
-+.globl sym_2_2594
-+sym_2_2594: la $2, sym_2_2594
-+.globl sym_2_2595
-+sym_2_2595: la $2, sym_2_2595
-+.globl sym_2_2596
-+sym_2_2596: la $2, sym_2_2596
-+.globl sym_2_2597
-+sym_2_2597: la $2, sym_2_2597
-+.globl sym_2_2598
-+sym_2_2598: la $2, sym_2_2598
-+.globl sym_2_2599
-+sym_2_2599: la $2, sym_2_2599
-+.globl sym_2_2600
-+sym_2_2600: la $2, sym_2_2600
-+.globl sym_2_2601
-+sym_2_2601: la $2, sym_2_2601
-+.globl sym_2_2602
-+sym_2_2602: la $2, sym_2_2602
-+.globl sym_2_2603
-+sym_2_2603: la $2, sym_2_2603
-+.globl sym_2_2604
-+sym_2_2604: la $2, sym_2_2604
-+.globl sym_2_2605
-+sym_2_2605: la $2, sym_2_2605
-+.globl sym_2_2606
-+sym_2_2606: la $2, sym_2_2606
-+.globl sym_2_2607
-+sym_2_2607: la $2, sym_2_2607
-+.globl sym_2_2608
-+sym_2_2608: la $2, sym_2_2608
-+.globl sym_2_2609
-+sym_2_2609: la $2, sym_2_2609
-+.globl sym_2_2610
-+sym_2_2610: la $2, sym_2_2610
-+.globl sym_2_2611
-+sym_2_2611: la $2, sym_2_2611
-+.globl sym_2_2612
-+sym_2_2612: la $2, sym_2_2612
-+.globl sym_2_2613
-+sym_2_2613: la $2, sym_2_2613
-+.globl sym_2_2614
-+sym_2_2614: la $2, sym_2_2614
-+.globl sym_2_2615
-+sym_2_2615: la $2, sym_2_2615
-+.globl sym_2_2616
-+sym_2_2616: la $2, sym_2_2616
-+.globl sym_2_2617
-+sym_2_2617: la $2, sym_2_2617
-+.globl sym_2_2618
-+sym_2_2618: la $2, sym_2_2618
-+.globl sym_2_2619
-+sym_2_2619: la $2, sym_2_2619
-+.globl sym_2_2620
-+sym_2_2620: la $2, sym_2_2620
-+.globl sym_2_2621
-+sym_2_2621: la $2, sym_2_2621
-+.globl sym_2_2622
-+sym_2_2622: la $2, sym_2_2622
-+.globl sym_2_2623
-+sym_2_2623: la $2, sym_2_2623
-+.globl sym_2_2624
-+sym_2_2624: la $2, sym_2_2624
-+.globl sym_2_2625
-+sym_2_2625: la $2, sym_2_2625
-+.globl sym_2_2626
-+sym_2_2626: la $2, sym_2_2626
-+.globl sym_2_2627
-+sym_2_2627: la $2, sym_2_2627
-+.globl sym_2_2628
-+sym_2_2628: la $2, sym_2_2628
-+.globl sym_2_2629
-+sym_2_2629: la $2, sym_2_2629
-+.globl sym_2_2630
-+sym_2_2630: la $2, sym_2_2630
-+.globl sym_2_2631
-+sym_2_2631: la $2, sym_2_2631
-+.globl sym_2_2632
-+sym_2_2632: la $2, sym_2_2632
-+.globl sym_2_2633
-+sym_2_2633: la $2, sym_2_2633
-+.globl sym_2_2634
-+sym_2_2634: la $2, sym_2_2634
-+.globl sym_2_2635
-+sym_2_2635: la $2, sym_2_2635
-+.globl sym_2_2636
-+sym_2_2636: la $2, sym_2_2636
-+.globl sym_2_2637
-+sym_2_2637: la $2, sym_2_2637
-+.globl sym_2_2638
-+sym_2_2638: la $2, sym_2_2638
-+.globl sym_2_2639
-+sym_2_2639: la $2, sym_2_2639
-+.globl sym_2_2640
-+sym_2_2640: la $2, sym_2_2640
-+.globl sym_2_2641
-+sym_2_2641: la $2, sym_2_2641
-+.globl sym_2_2642
-+sym_2_2642: la $2, sym_2_2642
-+.globl sym_2_2643
-+sym_2_2643: la $2, sym_2_2643
-+.globl sym_2_2644
-+sym_2_2644: la $2, sym_2_2644
-+.globl sym_2_2645
-+sym_2_2645: la $2, sym_2_2645
-+.globl sym_2_2646
-+sym_2_2646: la $2, sym_2_2646
-+.globl sym_2_2647
-+sym_2_2647: la $2, sym_2_2647
-+.globl sym_2_2648
-+sym_2_2648: la $2, sym_2_2648
-+.globl sym_2_2649
-+sym_2_2649: la $2, sym_2_2649
-+.globl sym_2_2650
-+sym_2_2650: la $2, sym_2_2650
-+.globl sym_2_2651
-+sym_2_2651: la $2, sym_2_2651
-+.globl sym_2_2652
-+sym_2_2652: la $2, sym_2_2652
-+.globl sym_2_2653
-+sym_2_2653: la $2, sym_2_2653
-+.globl sym_2_2654
-+sym_2_2654: la $2, sym_2_2654
-+.globl sym_2_2655
-+sym_2_2655: la $2, sym_2_2655
-+.globl sym_2_2656
-+sym_2_2656: la $2, sym_2_2656
-+.globl sym_2_2657
-+sym_2_2657: la $2, sym_2_2657
-+.globl sym_2_2658
-+sym_2_2658: la $2, sym_2_2658
-+.globl sym_2_2659
-+sym_2_2659: la $2, sym_2_2659
-+.globl sym_2_2660
-+sym_2_2660: la $2, sym_2_2660
-+.globl sym_2_2661
-+sym_2_2661: la $2, sym_2_2661
-+.globl sym_2_2662
-+sym_2_2662: la $2, sym_2_2662
-+.globl sym_2_2663
-+sym_2_2663: la $2, sym_2_2663
-+.globl sym_2_2664
-+sym_2_2664: la $2, sym_2_2664
-+.globl sym_2_2665
-+sym_2_2665: la $2, sym_2_2665
-+.globl sym_2_2666
-+sym_2_2666: la $2, sym_2_2666
-+.globl sym_2_2667
-+sym_2_2667: la $2, sym_2_2667
-+.globl sym_2_2668
-+sym_2_2668: la $2, sym_2_2668
-+.globl sym_2_2669
-+sym_2_2669: la $2, sym_2_2669
-+.globl sym_2_2670
-+sym_2_2670: la $2, sym_2_2670
-+.globl sym_2_2671
-+sym_2_2671: la $2, sym_2_2671
-+.globl sym_2_2672
-+sym_2_2672: la $2, sym_2_2672
-+.globl sym_2_2673
-+sym_2_2673: la $2, sym_2_2673
-+.globl sym_2_2674
-+sym_2_2674: la $2, sym_2_2674
-+.globl sym_2_2675
-+sym_2_2675: la $2, sym_2_2675
-+.globl sym_2_2676
-+sym_2_2676: la $2, sym_2_2676
-+.globl sym_2_2677
-+sym_2_2677: la $2, sym_2_2677
-+.globl sym_2_2678
-+sym_2_2678: la $2, sym_2_2678
-+.globl sym_2_2679
-+sym_2_2679: la $2, sym_2_2679
-+.globl sym_2_2680
-+sym_2_2680: la $2, sym_2_2680
-+.globl sym_2_2681
-+sym_2_2681: la $2, sym_2_2681
-+.globl sym_2_2682
-+sym_2_2682: la $2, sym_2_2682
-+.globl sym_2_2683
-+sym_2_2683: la $2, sym_2_2683
-+.globl sym_2_2684
-+sym_2_2684: la $2, sym_2_2684
-+.globl sym_2_2685
-+sym_2_2685: la $2, sym_2_2685
-+.globl sym_2_2686
-+sym_2_2686: la $2, sym_2_2686
-+.globl sym_2_2687
-+sym_2_2687: la $2, sym_2_2687
-+.globl sym_2_2688
-+sym_2_2688: la $2, sym_2_2688
-+.globl sym_2_2689
-+sym_2_2689: la $2, sym_2_2689
-+.globl sym_2_2690
-+sym_2_2690: la $2, sym_2_2690
-+.globl sym_2_2691
-+sym_2_2691: la $2, sym_2_2691
-+.globl sym_2_2692
-+sym_2_2692: la $2, sym_2_2692
-+.globl sym_2_2693
-+sym_2_2693: la $2, sym_2_2693
-+.globl sym_2_2694
-+sym_2_2694: la $2, sym_2_2694
-+.globl sym_2_2695
-+sym_2_2695: la $2, sym_2_2695
-+.globl sym_2_2696
-+sym_2_2696: la $2, sym_2_2696
-+.globl sym_2_2697
-+sym_2_2697: la $2, sym_2_2697
-+.globl sym_2_2698
-+sym_2_2698: la $2, sym_2_2698
-+.globl sym_2_2699
-+sym_2_2699: la $2, sym_2_2699
-+.globl sym_2_2700
-+sym_2_2700: la $2, sym_2_2700
-+.globl sym_2_2701
-+sym_2_2701: la $2, sym_2_2701
-+.globl sym_2_2702
-+sym_2_2702: la $2, sym_2_2702
-+.globl sym_2_2703
-+sym_2_2703: la $2, sym_2_2703
-+.globl sym_2_2704
-+sym_2_2704: la $2, sym_2_2704
-+.globl sym_2_2705
-+sym_2_2705: la $2, sym_2_2705
-+.globl sym_2_2706
-+sym_2_2706: la $2, sym_2_2706
-+.globl sym_2_2707
-+sym_2_2707: la $2, sym_2_2707
-+.globl sym_2_2708
-+sym_2_2708: la $2, sym_2_2708
-+.globl sym_2_2709
-+sym_2_2709: la $2, sym_2_2709
-+.globl sym_2_2710
-+sym_2_2710: la $2, sym_2_2710
-+.globl sym_2_2711
-+sym_2_2711: la $2, sym_2_2711
-+.globl sym_2_2712
-+sym_2_2712: la $2, sym_2_2712
-+.globl sym_2_2713
-+sym_2_2713: la $2, sym_2_2713
-+.globl sym_2_2714
-+sym_2_2714: la $2, sym_2_2714
-+.globl sym_2_2715
-+sym_2_2715: la $2, sym_2_2715
-+.globl sym_2_2716
-+sym_2_2716: la $2, sym_2_2716
-+.globl sym_2_2717
-+sym_2_2717: la $2, sym_2_2717
-+.globl sym_2_2718
-+sym_2_2718: la $2, sym_2_2718
-+.globl sym_2_2719
-+sym_2_2719: la $2, sym_2_2719
-+.globl sym_2_2720
-+sym_2_2720: la $2, sym_2_2720
-+.globl sym_2_2721
-+sym_2_2721: la $2, sym_2_2721
-+.globl sym_2_2722
-+sym_2_2722: la $2, sym_2_2722
-+.globl sym_2_2723
-+sym_2_2723: la $2, sym_2_2723
-+.globl sym_2_2724
-+sym_2_2724: la $2, sym_2_2724
-+.globl sym_2_2725
-+sym_2_2725: la $2, sym_2_2725
-+.globl sym_2_2726
-+sym_2_2726: la $2, sym_2_2726
-+.globl sym_2_2727
-+sym_2_2727: la $2, sym_2_2727
-+.globl sym_2_2728
-+sym_2_2728: la $2, sym_2_2728
-+.globl sym_2_2729
-+sym_2_2729: la $2, sym_2_2729
-+.globl sym_2_2730
-+sym_2_2730: la $2, sym_2_2730
-+.globl sym_2_2731
-+sym_2_2731: la $2, sym_2_2731
-+.globl sym_2_2732
-+sym_2_2732: la $2, sym_2_2732
-+.globl sym_2_2733
-+sym_2_2733: la $2, sym_2_2733
-+.globl sym_2_2734
-+sym_2_2734: la $2, sym_2_2734
-+.globl sym_2_2735
-+sym_2_2735: la $2, sym_2_2735
-+.globl sym_2_2736
-+sym_2_2736: la $2, sym_2_2736
-+.globl sym_2_2737
-+sym_2_2737: la $2, sym_2_2737
-+.globl sym_2_2738
-+sym_2_2738: la $2, sym_2_2738
-+.globl sym_2_2739
-+sym_2_2739: la $2, sym_2_2739
-+.globl sym_2_2740
-+sym_2_2740: la $2, sym_2_2740
-+.globl sym_2_2741
-+sym_2_2741: la $2, sym_2_2741
-+.globl sym_2_2742
-+sym_2_2742: la $2, sym_2_2742
-+.globl sym_2_2743
-+sym_2_2743: la $2, sym_2_2743
-+.globl sym_2_2744
-+sym_2_2744: la $2, sym_2_2744
-+.globl sym_2_2745
-+sym_2_2745: la $2, sym_2_2745
-+.globl sym_2_2746
-+sym_2_2746: la $2, sym_2_2746
-+.globl sym_2_2747
-+sym_2_2747: la $2, sym_2_2747
-+.globl sym_2_2748
-+sym_2_2748: la $2, sym_2_2748
-+.globl sym_2_2749
-+sym_2_2749: la $2, sym_2_2749
-+.globl sym_2_2750
-+sym_2_2750: la $2, sym_2_2750
-+.globl sym_2_2751
-+sym_2_2751: la $2, sym_2_2751
-+.globl sym_2_2752
-+sym_2_2752: la $2, sym_2_2752
-+.globl sym_2_2753
-+sym_2_2753: la $2, sym_2_2753
-+.globl sym_2_2754
-+sym_2_2754: la $2, sym_2_2754
-+.globl sym_2_2755
-+sym_2_2755: la $2, sym_2_2755
-+.globl sym_2_2756
-+sym_2_2756: la $2, sym_2_2756
-+.globl sym_2_2757
-+sym_2_2757: la $2, sym_2_2757
-+.globl sym_2_2758
-+sym_2_2758: la $2, sym_2_2758
-+.globl sym_2_2759
-+sym_2_2759: la $2, sym_2_2759
-+.globl sym_2_2760
-+sym_2_2760: la $2, sym_2_2760
-+.globl sym_2_2761
-+sym_2_2761: la $2, sym_2_2761
-+.globl sym_2_2762
-+sym_2_2762: la $2, sym_2_2762
-+.globl sym_2_2763
-+sym_2_2763: la $2, sym_2_2763
-+.globl sym_2_2764
-+sym_2_2764: la $2, sym_2_2764
-+.globl sym_2_2765
-+sym_2_2765: la $2, sym_2_2765
-+.globl sym_2_2766
-+sym_2_2766: la $2, sym_2_2766
-+.globl sym_2_2767
-+sym_2_2767: la $2, sym_2_2767
-+.globl sym_2_2768
-+sym_2_2768: la $2, sym_2_2768
-+.globl sym_2_2769
-+sym_2_2769: la $2, sym_2_2769
-+.globl sym_2_2770
-+sym_2_2770: la $2, sym_2_2770
-+.globl sym_2_2771
-+sym_2_2771: la $2, sym_2_2771
-+.globl sym_2_2772
-+sym_2_2772: la $2, sym_2_2772
-+.globl sym_2_2773
-+sym_2_2773: la $2, sym_2_2773
-+.globl sym_2_2774
-+sym_2_2774: la $2, sym_2_2774
-+.globl sym_2_2775
-+sym_2_2775: la $2, sym_2_2775
-+.globl sym_2_2776
-+sym_2_2776: la $2, sym_2_2776
-+.globl sym_2_2777
-+sym_2_2777: la $2, sym_2_2777
-+.globl sym_2_2778
-+sym_2_2778: la $2, sym_2_2778
-+.globl sym_2_2779
-+sym_2_2779: la $2, sym_2_2779
-+.globl sym_2_2780
-+sym_2_2780: la $2, sym_2_2780
-+.globl sym_2_2781
-+sym_2_2781: la $2, sym_2_2781
-+.globl sym_2_2782
-+sym_2_2782: la $2, sym_2_2782
-+.globl sym_2_2783
-+sym_2_2783: la $2, sym_2_2783
-+.globl sym_2_2784
-+sym_2_2784: la $2, sym_2_2784
-+.globl sym_2_2785
-+sym_2_2785: la $2, sym_2_2785
-+.globl sym_2_2786
-+sym_2_2786: la $2, sym_2_2786
-+.globl sym_2_2787
-+sym_2_2787: la $2, sym_2_2787
-+.globl sym_2_2788
-+sym_2_2788: la $2, sym_2_2788
-+.globl sym_2_2789
-+sym_2_2789: la $2, sym_2_2789
-+.globl sym_2_2790
-+sym_2_2790: la $2, sym_2_2790
-+.globl sym_2_2791
-+sym_2_2791: la $2, sym_2_2791
-+.globl sym_2_2792
-+sym_2_2792: la $2, sym_2_2792
-+.globl sym_2_2793
-+sym_2_2793: la $2, sym_2_2793
-+.globl sym_2_2794
-+sym_2_2794: la $2, sym_2_2794
-+.globl sym_2_2795
-+sym_2_2795: la $2, sym_2_2795
-+.globl sym_2_2796
-+sym_2_2796: la $2, sym_2_2796
-+.globl sym_2_2797
-+sym_2_2797: la $2, sym_2_2797
-+.globl sym_2_2798
-+sym_2_2798: la $2, sym_2_2798
-+.globl sym_2_2799
-+sym_2_2799: la $2, sym_2_2799
-+.globl sym_2_2800
-+sym_2_2800: la $2, sym_2_2800
-+.globl sym_2_2801
-+sym_2_2801: la $2, sym_2_2801
-+.globl sym_2_2802
-+sym_2_2802: la $2, sym_2_2802
-+.globl sym_2_2803
-+sym_2_2803: la $2, sym_2_2803
-+.globl sym_2_2804
-+sym_2_2804: la $2, sym_2_2804
-+.globl sym_2_2805
-+sym_2_2805: la $2, sym_2_2805
-+.globl sym_2_2806
-+sym_2_2806: la $2, sym_2_2806
-+.globl sym_2_2807
-+sym_2_2807: la $2, sym_2_2807
-+.globl sym_2_2808
-+sym_2_2808: la $2, sym_2_2808
-+.globl sym_2_2809
-+sym_2_2809: la $2, sym_2_2809
-+.globl sym_2_2810
-+sym_2_2810: la $2, sym_2_2810
-+.globl sym_2_2811
-+sym_2_2811: la $2, sym_2_2811
-+.globl sym_2_2812
-+sym_2_2812: la $2, sym_2_2812
-+.globl sym_2_2813
-+sym_2_2813: la $2, sym_2_2813
-+.globl sym_2_2814
-+sym_2_2814: la $2, sym_2_2814
-+.globl sym_2_2815
-+sym_2_2815: la $2, sym_2_2815
-+.globl sym_2_2816
-+sym_2_2816: la $2, sym_2_2816
-+.globl sym_2_2817
-+sym_2_2817: la $2, sym_2_2817
-+.globl sym_2_2818
-+sym_2_2818: la $2, sym_2_2818
-+.globl sym_2_2819
-+sym_2_2819: la $2, sym_2_2819
-+.globl sym_2_2820
-+sym_2_2820: la $2, sym_2_2820
-+.globl sym_2_2821
-+sym_2_2821: la $2, sym_2_2821
-+.globl sym_2_2822
-+sym_2_2822: la $2, sym_2_2822
-+.globl sym_2_2823
-+sym_2_2823: la $2, sym_2_2823
-+.globl sym_2_2824
-+sym_2_2824: la $2, sym_2_2824
-+.globl sym_2_2825
-+sym_2_2825: la $2, sym_2_2825
-+.globl sym_2_2826
-+sym_2_2826: la $2, sym_2_2826
-+.globl sym_2_2827
-+sym_2_2827: la $2, sym_2_2827
-+.globl sym_2_2828
-+sym_2_2828: la $2, sym_2_2828
-+.globl sym_2_2829
-+sym_2_2829: la $2, sym_2_2829
-+.globl sym_2_2830
-+sym_2_2830: la $2, sym_2_2830
-+.globl sym_2_2831
-+sym_2_2831: la $2, sym_2_2831
-+.globl sym_2_2832
-+sym_2_2832: la $2, sym_2_2832
-+.globl sym_2_2833
-+sym_2_2833: la $2, sym_2_2833
-+.globl sym_2_2834
-+sym_2_2834: la $2, sym_2_2834
-+.globl sym_2_2835
-+sym_2_2835: la $2, sym_2_2835
-+.globl sym_2_2836
-+sym_2_2836: la $2, sym_2_2836
-+.globl sym_2_2837
-+sym_2_2837: la $2, sym_2_2837
-+.globl sym_2_2838
-+sym_2_2838: la $2, sym_2_2838
-+.globl sym_2_2839
-+sym_2_2839: la $2, sym_2_2839
-+.globl sym_2_2840
-+sym_2_2840: la $2, sym_2_2840
-+.globl sym_2_2841
-+sym_2_2841: la $2, sym_2_2841
-+.globl sym_2_2842
-+sym_2_2842: la $2, sym_2_2842
-+.globl sym_2_2843
-+sym_2_2843: la $2, sym_2_2843
-+.globl sym_2_2844
-+sym_2_2844: la $2, sym_2_2844
-+.globl sym_2_2845
-+sym_2_2845: la $2, sym_2_2845
-+.globl sym_2_2846
-+sym_2_2846: la $2, sym_2_2846
-+.globl sym_2_2847
-+sym_2_2847: la $2, sym_2_2847
-+.globl sym_2_2848
-+sym_2_2848: la $2, sym_2_2848
-+.globl sym_2_2849
-+sym_2_2849: la $2, sym_2_2849
-+.globl sym_2_2850
-+sym_2_2850: la $2, sym_2_2850
-+.globl sym_2_2851
-+sym_2_2851: la $2, sym_2_2851
-+.globl sym_2_2852
-+sym_2_2852: la $2, sym_2_2852
-+.globl sym_2_2853
-+sym_2_2853: la $2, sym_2_2853
-+.globl sym_2_2854
-+sym_2_2854: la $2, sym_2_2854
-+.globl sym_2_2855
-+sym_2_2855: la $2, sym_2_2855
-+.globl sym_2_2856
-+sym_2_2856: la $2, sym_2_2856
-+.globl sym_2_2857
-+sym_2_2857: la $2, sym_2_2857
-+.globl sym_2_2858
-+sym_2_2858: la $2, sym_2_2858
-+.globl sym_2_2859
-+sym_2_2859: la $2, sym_2_2859
-+.globl sym_2_2860
-+sym_2_2860: la $2, sym_2_2860
-+.globl sym_2_2861
-+sym_2_2861: la $2, sym_2_2861
-+.globl sym_2_2862
-+sym_2_2862: la $2, sym_2_2862
-+.globl sym_2_2863
-+sym_2_2863: la $2, sym_2_2863
-+.globl sym_2_2864
-+sym_2_2864: la $2, sym_2_2864
-+.globl sym_2_2865
-+sym_2_2865: la $2, sym_2_2865
-+.globl sym_2_2866
-+sym_2_2866: la $2, sym_2_2866
-+.globl sym_2_2867
-+sym_2_2867: la $2, sym_2_2867
-+.globl sym_2_2868
-+sym_2_2868: la $2, sym_2_2868
-+.globl sym_2_2869
-+sym_2_2869: la $2, sym_2_2869
-+.globl sym_2_2870
-+sym_2_2870: la $2, sym_2_2870
-+.globl sym_2_2871
-+sym_2_2871: la $2, sym_2_2871
-+.globl sym_2_2872
-+sym_2_2872: la $2, sym_2_2872
-+.globl sym_2_2873
-+sym_2_2873: la $2, sym_2_2873
-+.globl sym_2_2874
-+sym_2_2874: la $2, sym_2_2874
-+.globl sym_2_2875
-+sym_2_2875: la $2, sym_2_2875
-+.globl sym_2_2876
-+sym_2_2876: la $2, sym_2_2876
-+.globl sym_2_2877
-+sym_2_2877: la $2, sym_2_2877
-+.globl sym_2_2878
-+sym_2_2878: la $2, sym_2_2878
-+.globl sym_2_2879
-+sym_2_2879: la $2, sym_2_2879
-+.globl sym_2_2880
-+sym_2_2880: la $2, sym_2_2880
-+.globl sym_2_2881
-+sym_2_2881: la $2, sym_2_2881
-+.globl sym_2_2882
-+sym_2_2882: la $2, sym_2_2882
-+.globl sym_2_2883
-+sym_2_2883: la $2, sym_2_2883
-+.globl sym_2_2884
-+sym_2_2884: la $2, sym_2_2884
-+.globl sym_2_2885
-+sym_2_2885: la $2, sym_2_2885
-+.globl sym_2_2886
-+sym_2_2886: la $2, sym_2_2886
-+.globl sym_2_2887
-+sym_2_2887: la $2, sym_2_2887
-+.globl sym_2_2888
-+sym_2_2888: la $2, sym_2_2888
-+.globl sym_2_2889
-+sym_2_2889: la $2, sym_2_2889
-+.globl sym_2_2890
-+sym_2_2890: la $2, sym_2_2890
-+.globl sym_2_2891
-+sym_2_2891: la $2, sym_2_2891
-+.globl sym_2_2892
-+sym_2_2892: la $2, sym_2_2892
-+.globl sym_2_2893
-+sym_2_2893: la $2, sym_2_2893
-+.globl sym_2_2894
-+sym_2_2894: la $2, sym_2_2894
-+.globl sym_2_2895
-+sym_2_2895: la $2, sym_2_2895
-+.globl sym_2_2896
-+sym_2_2896: la $2, sym_2_2896
-+.globl sym_2_2897
-+sym_2_2897: la $2, sym_2_2897
-+.globl sym_2_2898
-+sym_2_2898: la $2, sym_2_2898
-+.globl sym_2_2899
-+sym_2_2899: la $2, sym_2_2899
-+.globl sym_2_2900
-+sym_2_2900: la $2, sym_2_2900
-+.globl sym_2_2901
-+sym_2_2901: la $2, sym_2_2901
-+.globl sym_2_2902
-+sym_2_2902: la $2, sym_2_2902
-+.globl sym_2_2903
-+sym_2_2903: la $2, sym_2_2903
-+.globl sym_2_2904
-+sym_2_2904: la $2, sym_2_2904
-+.globl sym_2_2905
-+sym_2_2905: la $2, sym_2_2905
-+.globl sym_2_2906
-+sym_2_2906: la $2, sym_2_2906
-+.globl sym_2_2907
-+sym_2_2907: la $2, sym_2_2907
-+.globl sym_2_2908
-+sym_2_2908: la $2, sym_2_2908
-+.globl sym_2_2909
-+sym_2_2909: la $2, sym_2_2909
-+.globl sym_2_2910
-+sym_2_2910: la $2, sym_2_2910
-+.globl sym_2_2911
-+sym_2_2911: la $2, sym_2_2911
-+.globl sym_2_2912
-+sym_2_2912: la $2, sym_2_2912
-+.globl sym_2_2913
-+sym_2_2913: la $2, sym_2_2913
-+.globl sym_2_2914
-+sym_2_2914: la $2, sym_2_2914
-+.globl sym_2_2915
-+sym_2_2915: la $2, sym_2_2915
-+.globl sym_2_2916
-+sym_2_2916: la $2, sym_2_2916
-+.globl sym_2_2917
-+sym_2_2917: la $2, sym_2_2917
-+.globl sym_2_2918
-+sym_2_2918: la $2, sym_2_2918
-+.globl sym_2_2919
-+sym_2_2919: la $2, sym_2_2919
-+.globl sym_2_2920
-+sym_2_2920: la $2, sym_2_2920
-+.globl sym_2_2921
-+sym_2_2921: la $2, sym_2_2921
-+.globl sym_2_2922
-+sym_2_2922: la $2, sym_2_2922
-+.globl sym_2_2923
-+sym_2_2923: la $2, sym_2_2923
-+.globl sym_2_2924
-+sym_2_2924: la $2, sym_2_2924
-+.globl sym_2_2925
-+sym_2_2925: la $2, sym_2_2925
-+.globl sym_2_2926
-+sym_2_2926: la $2, sym_2_2926
-+.globl sym_2_2927
-+sym_2_2927: la $2, sym_2_2927
-+.globl sym_2_2928
-+sym_2_2928: la $2, sym_2_2928
-+.globl sym_2_2929
-+sym_2_2929: la $2, sym_2_2929
-+.globl sym_2_2930
-+sym_2_2930: la $2, sym_2_2930
-+.globl sym_2_2931
-+sym_2_2931: la $2, sym_2_2931
-+.globl sym_2_2932
-+sym_2_2932: la $2, sym_2_2932
-+.globl sym_2_2933
-+sym_2_2933: la $2, sym_2_2933
-+.globl sym_2_2934
-+sym_2_2934: la $2, sym_2_2934
-+.globl sym_2_2935
-+sym_2_2935: la $2, sym_2_2935
-+.globl sym_2_2936
-+sym_2_2936: la $2, sym_2_2936
-+.globl sym_2_2937
-+sym_2_2937: la $2, sym_2_2937
-+.globl sym_2_2938
-+sym_2_2938: la $2, sym_2_2938
-+.globl sym_2_2939
-+sym_2_2939: la $2, sym_2_2939
-+.globl sym_2_2940
-+sym_2_2940: la $2, sym_2_2940
-+.globl sym_2_2941
-+sym_2_2941: la $2, sym_2_2941
-+.globl sym_2_2942
-+sym_2_2942: la $2, sym_2_2942
-+.globl sym_2_2943
-+sym_2_2943: la $2, sym_2_2943
-+.globl sym_2_2944
-+sym_2_2944: la $2, sym_2_2944
-+.globl sym_2_2945
-+sym_2_2945: la $2, sym_2_2945
-+.globl sym_2_2946
-+sym_2_2946: la $2, sym_2_2946
-+.globl sym_2_2947
-+sym_2_2947: la $2, sym_2_2947
-+.globl sym_2_2948
-+sym_2_2948: la $2, sym_2_2948
-+.globl sym_2_2949
-+sym_2_2949: la $2, sym_2_2949
-+.globl sym_2_2950
-+sym_2_2950: la $2, sym_2_2950
-+.globl sym_2_2951
-+sym_2_2951: la $2, sym_2_2951
-+.globl sym_2_2952
-+sym_2_2952: la $2, sym_2_2952
-+.globl sym_2_2953
-+sym_2_2953: la $2, sym_2_2953
-+.globl sym_2_2954
-+sym_2_2954: la $2, sym_2_2954
-+.globl sym_2_2955
-+sym_2_2955: la $2, sym_2_2955
-+.globl sym_2_2956
-+sym_2_2956: la $2, sym_2_2956
-+.globl sym_2_2957
-+sym_2_2957: la $2, sym_2_2957
-+.globl sym_2_2958
-+sym_2_2958: la $2, sym_2_2958
-+.globl sym_2_2959
-+sym_2_2959: la $2, sym_2_2959
-+.globl sym_2_2960
-+sym_2_2960: la $2, sym_2_2960
-+.globl sym_2_2961
-+sym_2_2961: la $2, sym_2_2961
-+.globl sym_2_2962
-+sym_2_2962: la $2, sym_2_2962
-+.globl sym_2_2963
-+sym_2_2963: la $2, sym_2_2963
-+.globl sym_2_2964
-+sym_2_2964: la $2, sym_2_2964
-+.globl sym_2_2965
-+sym_2_2965: la $2, sym_2_2965
-+.globl sym_2_2966
-+sym_2_2966: la $2, sym_2_2966
-+.globl sym_2_2967
-+sym_2_2967: la $2, sym_2_2967
-+.globl sym_2_2968
-+sym_2_2968: la $2, sym_2_2968
-+.globl sym_2_2969
-+sym_2_2969: la $2, sym_2_2969
-+.globl sym_2_2970
-+sym_2_2970: la $2, sym_2_2970
-+.globl sym_2_2971
-+sym_2_2971: la $2, sym_2_2971
-+.globl sym_2_2972
-+sym_2_2972: la $2, sym_2_2972
-+.globl sym_2_2973
-+sym_2_2973: la $2, sym_2_2973
-+.globl sym_2_2974
-+sym_2_2974: la $2, sym_2_2974
-+.globl sym_2_2975
-+sym_2_2975: la $2, sym_2_2975
-+.globl sym_2_2976
-+sym_2_2976: la $2, sym_2_2976
-+.globl sym_2_2977
-+sym_2_2977: la $2, sym_2_2977
-+.globl sym_2_2978
-+sym_2_2978: la $2, sym_2_2978
-+.globl sym_2_2979
-+sym_2_2979: la $2, sym_2_2979
-+.globl sym_2_2980
-+sym_2_2980: la $2, sym_2_2980
-+.globl sym_2_2981
-+sym_2_2981: la $2, sym_2_2981
-+.globl sym_2_2982
-+sym_2_2982: la $2, sym_2_2982
-+.globl sym_2_2983
-+sym_2_2983: la $2, sym_2_2983
-+.globl sym_2_2984
-+sym_2_2984: la $2, sym_2_2984
-+.globl sym_2_2985
-+sym_2_2985: la $2, sym_2_2985
-+.globl sym_2_2986
-+sym_2_2986: la $2, sym_2_2986
-+.globl sym_2_2987
-+sym_2_2987: la $2, sym_2_2987
-+.globl sym_2_2988
-+sym_2_2988: la $2, sym_2_2988
-+.globl sym_2_2989
-+sym_2_2989: la $2, sym_2_2989
-+.globl sym_2_2990
-+sym_2_2990: la $2, sym_2_2990
-+.globl sym_2_2991
-+sym_2_2991: la $2, sym_2_2991
-+.globl sym_2_2992
-+sym_2_2992: la $2, sym_2_2992
-+.globl sym_2_2993
-+sym_2_2993: la $2, sym_2_2993
-+.globl sym_2_2994
-+sym_2_2994: la $2, sym_2_2994
-+.globl sym_2_2995
-+sym_2_2995: la $2, sym_2_2995
-+.globl sym_2_2996
-+sym_2_2996: la $2, sym_2_2996
-+.globl sym_2_2997
-+sym_2_2997: la $2, sym_2_2997
-+.globl sym_2_2998
-+sym_2_2998: la $2, sym_2_2998
-+.globl sym_2_2999
-+sym_2_2999: la $2, sym_2_2999
-+.globl sym_2_3000
-+sym_2_3000: la $2, sym_2_3000
-+.globl sym_2_3001
-+sym_2_3001: la $2, sym_2_3001
-+.globl sym_2_3002
-+sym_2_3002: la $2, sym_2_3002
-+.globl sym_2_3003
-+sym_2_3003: la $2, sym_2_3003
-+.globl sym_2_3004
-+sym_2_3004: la $2, sym_2_3004
-+.globl sym_2_3005
-+sym_2_3005: la $2, sym_2_3005
-+.globl sym_2_3006
-+sym_2_3006: la $2, sym_2_3006
-+.globl sym_2_3007
-+sym_2_3007: la $2, sym_2_3007
-+.globl sym_2_3008
-+sym_2_3008: la $2, sym_2_3008
-+.globl sym_2_3009
-+sym_2_3009: la $2, sym_2_3009
-+.globl sym_2_3010
-+sym_2_3010: la $2, sym_2_3010
-+.globl sym_2_3011
-+sym_2_3011: la $2, sym_2_3011
-+.globl sym_2_3012
-+sym_2_3012: la $2, sym_2_3012
-+.globl sym_2_3013
-+sym_2_3013: la $2, sym_2_3013
-+.globl sym_2_3014
-+sym_2_3014: la $2, sym_2_3014
-+.globl sym_2_3015
-+sym_2_3015: la $2, sym_2_3015
-+.globl sym_2_3016
-+sym_2_3016: la $2, sym_2_3016
-+.globl sym_2_3017
-+sym_2_3017: la $2, sym_2_3017
-+.globl sym_2_3018
-+sym_2_3018: la $2, sym_2_3018
-+.globl sym_2_3019
-+sym_2_3019: la $2, sym_2_3019
-+.globl sym_2_3020
-+sym_2_3020: la $2, sym_2_3020
-+.globl sym_2_3021
-+sym_2_3021: la $2, sym_2_3021
-+.globl sym_2_3022
-+sym_2_3022: la $2, sym_2_3022
-+.globl sym_2_3023
-+sym_2_3023: la $2, sym_2_3023
-+.globl sym_2_3024
-+sym_2_3024: la $2, sym_2_3024
-+.globl sym_2_3025
-+sym_2_3025: la $2, sym_2_3025
-+.globl sym_2_3026
-+sym_2_3026: la $2, sym_2_3026
-+.globl sym_2_3027
-+sym_2_3027: la $2, sym_2_3027
-+.globl sym_2_3028
-+sym_2_3028: la $2, sym_2_3028
-+.globl sym_2_3029
-+sym_2_3029: la $2, sym_2_3029
-+.globl sym_2_3030
-+sym_2_3030: la $2, sym_2_3030
-+.globl sym_2_3031
-+sym_2_3031: la $2, sym_2_3031
-+.globl sym_2_3032
-+sym_2_3032: la $2, sym_2_3032
-+.globl sym_2_3033
-+sym_2_3033: la $2, sym_2_3033
-+.globl sym_2_3034
-+sym_2_3034: la $2, sym_2_3034
-+.globl sym_2_3035
-+sym_2_3035: la $2, sym_2_3035
-+.globl sym_2_3036
-+sym_2_3036: la $2, sym_2_3036
-+.globl sym_2_3037
-+sym_2_3037: la $2, sym_2_3037
-+.globl sym_2_3038
-+sym_2_3038: la $2, sym_2_3038
-+.globl sym_2_3039
-+sym_2_3039: la $2, sym_2_3039
-+.globl sym_2_3040
-+sym_2_3040: la $2, sym_2_3040
-+.globl sym_2_3041
-+sym_2_3041: la $2, sym_2_3041
-+.globl sym_2_3042
-+sym_2_3042: la $2, sym_2_3042
-+.globl sym_2_3043
-+sym_2_3043: la $2, sym_2_3043
-+.globl sym_2_3044
-+sym_2_3044: la $2, sym_2_3044
-+.globl sym_2_3045
-+sym_2_3045: la $2, sym_2_3045
-+.globl sym_2_3046
-+sym_2_3046: la $2, sym_2_3046
-+.globl sym_2_3047
-+sym_2_3047: la $2, sym_2_3047
-+.globl sym_2_3048
-+sym_2_3048: la $2, sym_2_3048
-+.globl sym_2_3049
-+sym_2_3049: la $2, sym_2_3049
-+.globl sym_2_3050
-+sym_2_3050: la $2, sym_2_3050
-+.globl sym_2_3051
-+sym_2_3051: la $2, sym_2_3051
-+.globl sym_2_3052
-+sym_2_3052: la $2, sym_2_3052
-+.globl sym_2_3053
-+sym_2_3053: la $2, sym_2_3053
-+.globl sym_2_3054
-+sym_2_3054: la $2, sym_2_3054
-+.globl sym_2_3055
-+sym_2_3055: la $2, sym_2_3055
-+.globl sym_2_3056
-+sym_2_3056: la $2, sym_2_3056
-+.globl sym_2_3057
-+sym_2_3057: la $2, sym_2_3057
-+.globl sym_2_3058
-+sym_2_3058: la $2, sym_2_3058
-+.globl sym_2_3059
-+sym_2_3059: la $2, sym_2_3059
-+.globl sym_2_3060
-+sym_2_3060: la $2, sym_2_3060
-+.globl sym_2_3061
-+sym_2_3061: la $2, sym_2_3061
-+.globl sym_2_3062
-+sym_2_3062: la $2, sym_2_3062
-+.globl sym_2_3063
-+sym_2_3063: la $2, sym_2_3063
-+.globl sym_2_3064
-+sym_2_3064: la $2, sym_2_3064
-+.globl sym_2_3065
-+sym_2_3065: la $2, sym_2_3065
-+.globl sym_2_3066
-+sym_2_3066: la $2, sym_2_3066
-+.globl sym_2_3067
-+sym_2_3067: la $2, sym_2_3067
-+.globl sym_2_3068
-+sym_2_3068: la $2, sym_2_3068
-+.globl sym_2_3069
-+sym_2_3069: la $2, sym_2_3069
-+.globl sym_2_3070
-+sym_2_3070: la $2, sym_2_3070
-+.globl sym_2_3071
-+sym_2_3071: la $2, sym_2_3071
-+.globl sym_2_3072
-+sym_2_3072: la $2, sym_2_3072
-+.globl sym_2_3073
-+sym_2_3073: la $2, sym_2_3073
-+.globl sym_2_3074
-+sym_2_3074: la $2, sym_2_3074
-+.globl sym_2_3075
-+sym_2_3075: la $2, sym_2_3075
-+.globl sym_2_3076
-+sym_2_3076: la $2, sym_2_3076
-+.globl sym_2_3077
-+sym_2_3077: la $2, sym_2_3077
-+.globl sym_2_3078
-+sym_2_3078: la $2, sym_2_3078
-+.globl sym_2_3079
-+sym_2_3079: la $2, sym_2_3079
-+.globl sym_2_3080
-+sym_2_3080: la $2, sym_2_3080
-+.globl sym_2_3081
-+sym_2_3081: la $2, sym_2_3081
-+.globl sym_2_3082
-+sym_2_3082: la $2, sym_2_3082
-+.globl sym_2_3083
-+sym_2_3083: la $2, sym_2_3083
-+.globl sym_2_3084
-+sym_2_3084: la $2, sym_2_3084
-+.globl sym_2_3085
-+sym_2_3085: la $2, sym_2_3085
-+.globl sym_2_3086
-+sym_2_3086: la $2, sym_2_3086
-+.globl sym_2_3087
-+sym_2_3087: la $2, sym_2_3087
-+.globl sym_2_3088
-+sym_2_3088: la $2, sym_2_3088
-+.globl sym_2_3089
-+sym_2_3089: la $2, sym_2_3089
-+.globl sym_2_3090
-+sym_2_3090: la $2, sym_2_3090
-+.globl sym_2_3091
-+sym_2_3091: la $2, sym_2_3091
-+.globl sym_2_3092
-+sym_2_3092: la $2, sym_2_3092
-+.globl sym_2_3093
-+sym_2_3093: la $2, sym_2_3093
-+.globl sym_2_3094
-+sym_2_3094: la $2, sym_2_3094
-+.globl sym_2_3095
-+sym_2_3095: la $2, sym_2_3095
-+.globl sym_2_3096
-+sym_2_3096: la $2, sym_2_3096
-+.globl sym_2_3097
-+sym_2_3097: la $2, sym_2_3097
-+.globl sym_2_3098
-+sym_2_3098: la $2, sym_2_3098
-+.globl sym_2_3099
-+sym_2_3099: la $2, sym_2_3099
-+.globl sym_2_3100
-+sym_2_3100: la $2, sym_2_3100
-+.globl sym_2_3101
-+sym_2_3101: la $2, sym_2_3101
-+.globl sym_2_3102
-+sym_2_3102: la $2, sym_2_3102
-+.globl sym_2_3103
-+sym_2_3103: la $2, sym_2_3103
-+.globl sym_2_3104
-+sym_2_3104: la $2, sym_2_3104
-+.globl sym_2_3105
-+sym_2_3105: la $2, sym_2_3105
-+.globl sym_2_3106
-+sym_2_3106: la $2, sym_2_3106
-+.globl sym_2_3107
-+sym_2_3107: la $2, sym_2_3107
-+.globl sym_2_3108
-+sym_2_3108: la $2, sym_2_3108
-+.globl sym_2_3109
-+sym_2_3109: la $2, sym_2_3109
-+.globl sym_2_3110
-+sym_2_3110: la $2, sym_2_3110
-+.globl sym_2_3111
-+sym_2_3111: la $2, sym_2_3111
-+.globl sym_2_3112
-+sym_2_3112: la $2, sym_2_3112
-+.globl sym_2_3113
-+sym_2_3113: la $2, sym_2_3113
-+.globl sym_2_3114
-+sym_2_3114: la $2, sym_2_3114
-+.globl sym_2_3115
-+sym_2_3115: la $2, sym_2_3115
-+.globl sym_2_3116
-+sym_2_3116: la $2, sym_2_3116
-+.globl sym_2_3117
-+sym_2_3117: la $2, sym_2_3117
-+.globl sym_2_3118
-+sym_2_3118: la $2, sym_2_3118
-+.globl sym_2_3119
-+sym_2_3119: la $2, sym_2_3119
-+.globl sym_2_3120
-+sym_2_3120: la $2, sym_2_3120
-+.globl sym_2_3121
-+sym_2_3121: la $2, sym_2_3121
-+.globl sym_2_3122
-+sym_2_3122: la $2, sym_2_3122
-+.globl sym_2_3123
-+sym_2_3123: la $2, sym_2_3123
-+.globl sym_2_3124
-+sym_2_3124: la $2, sym_2_3124
-+.globl sym_2_3125
-+sym_2_3125: la $2, sym_2_3125
-+.globl sym_2_3126
-+sym_2_3126: la $2, sym_2_3126
-+.globl sym_2_3127
-+sym_2_3127: la $2, sym_2_3127
-+.globl sym_2_3128
-+sym_2_3128: la $2, sym_2_3128
-+.globl sym_2_3129
-+sym_2_3129: la $2, sym_2_3129
-+.globl sym_2_3130
-+sym_2_3130: la $2, sym_2_3130
-+.globl sym_2_3131
-+sym_2_3131: la $2, sym_2_3131
-+.globl sym_2_3132
-+sym_2_3132: la $2, sym_2_3132
-+.globl sym_2_3133
-+sym_2_3133: la $2, sym_2_3133
-+.globl sym_2_3134
-+sym_2_3134: la $2, sym_2_3134
-+.globl sym_2_3135
-+sym_2_3135: la $2, sym_2_3135
-+.globl sym_2_3136
-+sym_2_3136: la $2, sym_2_3136
-+.globl sym_2_3137
-+sym_2_3137: la $2, sym_2_3137
-+.globl sym_2_3138
-+sym_2_3138: la $2, sym_2_3138
-+.globl sym_2_3139
-+sym_2_3139: la $2, sym_2_3139
-+.globl sym_2_3140
-+sym_2_3140: la $2, sym_2_3140
-+.globl sym_2_3141
-+sym_2_3141: la $2, sym_2_3141
-+.globl sym_2_3142
-+sym_2_3142: la $2, sym_2_3142
-+.globl sym_2_3143
-+sym_2_3143: la $2, sym_2_3143
-+.globl sym_2_3144
-+sym_2_3144: la $2, sym_2_3144
-+.globl sym_2_3145
-+sym_2_3145: la $2, sym_2_3145
-+.globl sym_2_3146
-+sym_2_3146: la $2, sym_2_3146
-+.globl sym_2_3147
-+sym_2_3147: la $2, sym_2_3147
-+.globl sym_2_3148
-+sym_2_3148: la $2, sym_2_3148
-+.globl sym_2_3149
-+sym_2_3149: la $2, sym_2_3149
-+.globl sym_2_3150
-+sym_2_3150: la $2, sym_2_3150
-+.globl sym_2_3151
-+sym_2_3151: la $2, sym_2_3151
-+.globl sym_2_3152
-+sym_2_3152: la $2, sym_2_3152
-+.globl sym_2_3153
-+sym_2_3153: la $2, sym_2_3153
-+.globl sym_2_3154
-+sym_2_3154: la $2, sym_2_3154
-+.globl sym_2_3155
-+sym_2_3155: la $2, sym_2_3155
-+.globl sym_2_3156
-+sym_2_3156: la $2, sym_2_3156
-+.globl sym_2_3157
-+sym_2_3157: la $2, sym_2_3157
-+.globl sym_2_3158
-+sym_2_3158: la $2, sym_2_3158
-+.globl sym_2_3159
-+sym_2_3159: la $2, sym_2_3159
-+.globl sym_2_3160
-+sym_2_3160: la $2, sym_2_3160
-+.globl sym_2_3161
-+sym_2_3161: la $2, sym_2_3161
-+.globl sym_2_3162
-+sym_2_3162: la $2, sym_2_3162
-+.globl sym_2_3163
-+sym_2_3163: la $2, sym_2_3163
-+.globl sym_2_3164
-+sym_2_3164: la $2, sym_2_3164
-+.globl sym_2_3165
-+sym_2_3165: la $2, sym_2_3165
-+.globl sym_2_3166
-+sym_2_3166: la $2, sym_2_3166
-+.globl sym_2_3167
-+sym_2_3167: la $2, sym_2_3167
-+.globl sym_2_3168
-+sym_2_3168: la $2, sym_2_3168
-+.globl sym_2_3169
-+sym_2_3169: la $2, sym_2_3169
-+.globl sym_2_3170
-+sym_2_3170: la $2, sym_2_3170
-+.globl sym_2_3171
-+sym_2_3171: la $2, sym_2_3171
-+.globl sym_2_3172
-+sym_2_3172: la $2, sym_2_3172
-+.globl sym_2_3173
-+sym_2_3173: la $2, sym_2_3173
-+.globl sym_2_3174
-+sym_2_3174: la $2, sym_2_3174
-+.globl sym_2_3175
-+sym_2_3175: la $2, sym_2_3175
-+.globl sym_2_3176
-+sym_2_3176: la $2, sym_2_3176
-+.globl sym_2_3177
-+sym_2_3177: la $2, sym_2_3177
-+.globl sym_2_3178
-+sym_2_3178: la $2, sym_2_3178
-+.globl sym_2_3179
-+sym_2_3179: la $2, sym_2_3179
-+.globl sym_2_3180
-+sym_2_3180: la $2, sym_2_3180
-+.globl sym_2_3181
-+sym_2_3181: la $2, sym_2_3181
-+.globl sym_2_3182
-+sym_2_3182: la $2, sym_2_3182
-+.globl sym_2_3183
-+sym_2_3183: la $2, sym_2_3183
-+.globl sym_2_3184
-+sym_2_3184: la $2, sym_2_3184
-+.globl sym_2_3185
-+sym_2_3185: la $2, sym_2_3185
-+.globl sym_2_3186
-+sym_2_3186: la $2, sym_2_3186
-+.globl sym_2_3187
-+sym_2_3187: la $2, sym_2_3187
-+.globl sym_2_3188
-+sym_2_3188: la $2, sym_2_3188
-+.globl sym_2_3189
-+sym_2_3189: la $2, sym_2_3189
-+.globl sym_2_3190
-+sym_2_3190: la $2, sym_2_3190
-+.globl sym_2_3191
-+sym_2_3191: la $2, sym_2_3191
-+.globl sym_2_3192
-+sym_2_3192: la $2, sym_2_3192
-+.globl sym_2_3193
-+sym_2_3193: la $2, sym_2_3193
-+.globl sym_2_3194
-+sym_2_3194: la $2, sym_2_3194
-+.globl sym_2_3195
-+sym_2_3195: la $2, sym_2_3195
-+.globl sym_2_3196
-+sym_2_3196: la $2, sym_2_3196
-+.globl sym_2_3197
-+sym_2_3197: la $2, sym_2_3197
-+.globl sym_2_3198
-+sym_2_3198: la $2, sym_2_3198
-+.globl sym_2_3199
-+sym_2_3199: la $2, sym_2_3199
-+.globl sym_2_3200
-+sym_2_3200: la $2, sym_2_3200
-+.globl sym_2_3201
-+sym_2_3201: la $2, sym_2_3201
-+.globl sym_2_3202
-+sym_2_3202: la $2, sym_2_3202
-+.globl sym_2_3203
-+sym_2_3203: la $2, sym_2_3203
-+.globl sym_2_3204
-+sym_2_3204: la $2, sym_2_3204
-+.globl sym_2_3205
-+sym_2_3205: la $2, sym_2_3205
-+.globl sym_2_3206
-+sym_2_3206: la $2, sym_2_3206
-+.globl sym_2_3207
-+sym_2_3207: la $2, sym_2_3207
-+.globl sym_2_3208
-+sym_2_3208: la $2, sym_2_3208
-+.globl sym_2_3209
-+sym_2_3209: la $2, sym_2_3209
-+.globl sym_2_3210
-+sym_2_3210: la $2, sym_2_3210
-+.globl sym_2_3211
-+sym_2_3211: la $2, sym_2_3211
-+.globl sym_2_3212
-+sym_2_3212: la $2, sym_2_3212
-+.globl sym_2_3213
-+sym_2_3213: la $2, sym_2_3213
-+.globl sym_2_3214
-+sym_2_3214: la $2, sym_2_3214
-+.globl sym_2_3215
-+sym_2_3215: la $2, sym_2_3215
-+.globl sym_2_3216
-+sym_2_3216: la $2, sym_2_3216
-+.globl sym_2_3217
-+sym_2_3217: la $2, sym_2_3217
-+.globl sym_2_3218
-+sym_2_3218: la $2, sym_2_3218
-+.globl sym_2_3219
-+sym_2_3219: la $2, sym_2_3219
-+.globl sym_2_3220
-+sym_2_3220: la $2, sym_2_3220
-+.globl sym_2_3221
-+sym_2_3221: la $2, sym_2_3221
-+.globl sym_2_3222
-+sym_2_3222: la $2, sym_2_3222
-+.globl sym_2_3223
-+sym_2_3223: la $2, sym_2_3223
-+.globl sym_2_3224
-+sym_2_3224: la $2, sym_2_3224
-+.globl sym_2_3225
-+sym_2_3225: la $2, sym_2_3225
-+.globl sym_2_3226
-+sym_2_3226: la $2, sym_2_3226
-+.globl sym_2_3227
-+sym_2_3227: la $2, sym_2_3227
-+.globl sym_2_3228
-+sym_2_3228: la $2, sym_2_3228
-+.globl sym_2_3229
-+sym_2_3229: la $2, sym_2_3229
-+.globl sym_2_3230
-+sym_2_3230: la $2, sym_2_3230
-+.globl sym_2_3231
-+sym_2_3231: la $2, sym_2_3231
-+.globl sym_2_3232
-+sym_2_3232: la $2, sym_2_3232
-+.globl sym_2_3233
-+sym_2_3233: la $2, sym_2_3233
-+.globl sym_2_3234
-+sym_2_3234: la $2, sym_2_3234
-+.globl sym_2_3235
-+sym_2_3235: la $2, sym_2_3235
-+.globl sym_2_3236
-+sym_2_3236: la $2, sym_2_3236
-+.globl sym_2_3237
-+sym_2_3237: la $2, sym_2_3237
-+.globl sym_2_3238
-+sym_2_3238: la $2, sym_2_3238
-+.globl sym_2_3239
-+sym_2_3239: la $2, sym_2_3239
-+.globl sym_2_3240
-+sym_2_3240: la $2, sym_2_3240
-+.globl sym_2_3241
-+sym_2_3241: la $2, sym_2_3241
-+.globl sym_2_3242
-+sym_2_3242: la $2, sym_2_3242
-+.globl sym_2_3243
-+sym_2_3243: la $2, sym_2_3243
-+.globl sym_2_3244
-+sym_2_3244: la $2, sym_2_3244
-+.globl sym_2_3245
-+sym_2_3245: la $2, sym_2_3245
-+.globl sym_2_3246
-+sym_2_3246: la $2, sym_2_3246
-+.globl sym_2_3247
-+sym_2_3247: la $2, sym_2_3247
-+.globl sym_2_3248
-+sym_2_3248: la $2, sym_2_3248
-+.globl sym_2_3249
-+sym_2_3249: la $2, sym_2_3249
-+.globl sym_2_3250
-+sym_2_3250: la $2, sym_2_3250
-+.globl sym_2_3251
-+sym_2_3251: la $2, sym_2_3251
-+.globl sym_2_3252
-+sym_2_3252: la $2, sym_2_3252
-+.globl sym_2_3253
-+sym_2_3253: la $2, sym_2_3253
-+.globl sym_2_3254
-+sym_2_3254: la $2, sym_2_3254
-+.globl sym_2_3255
-+sym_2_3255: la $2, sym_2_3255
-+.globl sym_2_3256
-+sym_2_3256: la $2, sym_2_3256
-+.globl sym_2_3257
-+sym_2_3257: la $2, sym_2_3257
-+.globl sym_2_3258
-+sym_2_3258: la $2, sym_2_3258
-+.globl sym_2_3259
-+sym_2_3259: la $2, sym_2_3259
-+.globl sym_2_3260
-+sym_2_3260: la $2, sym_2_3260
-+.globl sym_2_3261
-+sym_2_3261: la $2, sym_2_3261
-+.globl sym_2_3262
-+sym_2_3262: la $2, sym_2_3262
-+.globl sym_2_3263
-+sym_2_3263: la $2, sym_2_3263
-+.globl sym_2_3264
-+sym_2_3264: la $2, sym_2_3264
-+.globl sym_2_3265
-+sym_2_3265: la $2, sym_2_3265
-+.globl sym_2_3266
-+sym_2_3266: la $2, sym_2_3266
-+.globl sym_2_3267
-+sym_2_3267: la $2, sym_2_3267
-+.globl sym_2_3268
-+sym_2_3268: la $2, sym_2_3268
-+.globl sym_2_3269
-+sym_2_3269: la $2, sym_2_3269
-+.globl sym_2_3270
-+sym_2_3270: la $2, sym_2_3270
-+.globl sym_2_3271
-+sym_2_3271: la $2, sym_2_3271
-+.globl sym_2_3272
-+sym_2_3272: la $2, sym_2_3272
-+.globl sym_2_3273
-+sym_2_3273: la $2, sym_2_3273
-+.globl sym_2_3274
-+sym_2_3274: la $2, sym_2_3274
-+.globl sym_2_3275
-+sym_2_3275: la $2, sym_2_3275
-+.globl sym_2_3276
-+sym_2_3276: la $2, sym_2_3276
-+.globl sym_2_3277
-+sym_2_3277: la $2, sym_2_3277
-+.globl sym_2_3278
-+sym_2_3278: la $2, sym_2_3278
-+.globl sym_2_3279
-+sym_2_3279: la $2, sym_2_3279
-+.globl sym_2_3280
-+sym_2_3280: la $2, sym_2_3280
-+.globl sym_2_3281
-+sym_2_3281: la $2, sym_2_3281
-+.globl sym_2_3282
-+sym_2_3282: la $2, sym_2_3282
-+.globl sym_2_3283
-+sym_2_3283: la $2, sym_2_3283
-+.globl sym_2_3284
-+sym_2_3284: la $2, sym_2_3284
-+.globl sym_2_3285
-+sym_2_3285: la $2, sym_2_3285
-+.globl sym_2_3286
-+sym_2_3286: la $2, sym_2_3286
-+.globl sym_2_3287
-+sym_2_3287: la $2, sym_2_3287
-+.globl sym_2_3288
-+sym_2_3288: la $2, sym_2_3288
-+.globl sym_2_3289
-+sym_2_3289: la $2, sym_2_3289
-+.globl sym_2_3290
-+sym_2_3290: la $2, sym_2_3290
-+.globl sym_2_3291
-+sym_2_3291: la $2, sym_2_3291
-+.globl sym_2_3292
-+sym_2_3292: la $2, sym_2_3292
-+.globl sym_2_3293
-+sym_2_3293: la $2, sym_2_3293
-+.globl sym_2_3294
-+sym_2_3294: la $2, sym_2_3294
-+.globl sym_2_3295
-+sym_2_3295: la $2, sym_2_3295
-+.globl sym_2_3296
-+sym_2_3296: la $2, sym_2_3296
-+.globl sym_2_3297
-+sym_2_3297: la $2, sym_2_3297
-+.globl sym_2_3298
-+sym_2_3298: la $2, sym_2_3298
-+.globl sym_2_3299
-+sym_2_3299: la $2, sym_2_3299
-+.globl sym_2_3300
-+sym_2_3300: la $2, sym_2_3300
-+.globl sym_2_3301
-+sym_2_3301: la $2, sym_2_3301
-+.globl sym_2_3302
-+sym_2_3302: la $2, sym_2_3302
-+.globl sym_2_3303
-+sym_2_3303: la $2, sym_2_3303
-+.globl sym_2_3304
-+sym_2_3304: la $2, sym_2_3304
-+.globl sym_2_3305
-+sym_2_3305: la $2, sym_2_3305
-+.globl sym_2_3306
-+sym_2_3306: la $2, sym_2_3306
-+.globl sym_2_3307
-+sym_2_3307: la $2, sym_2_3307
-+.globl sym_2_3308
-+sym_2_3308: la $2, sym_2_3308
-+.globl sym_2_3309
-+sym_2_3309: la $2, sym_2_3309
-+.globl sym_2_3310
-+sym_2_3310: la $2, sym_2_3310
-+.globl sym_2_3311
-+sym_2_3311: la $2, sym_2_3311
-+.globl sym_2_3312
-+sym_2_3312: la $2, sym_2_3312
-+.globl sym_2_3313
-+sym_2_3313: la $2, sym_2_3313
-+.globl sym_2_3314
-+sym_2_3314: la $2, sym_2_3314
-+.globl sym_2_3315
-+sym_2_3315: la $2, sym_2_3315
-+.globl sym_2_3316
-+sym_2_3316: la $2, sym_2_3316
-+.globl sym_2_3317
-+sym_2_3317: la $2, sym_2_3317
-+.globl sym_2_3318
-+sym_2_3318: la $2, sym_2_3318
-+.globl sym_2_3319
-+sym_2_3319: la $2, sym_2_3319
-+.globl sym_2_3320
-+sym_2_3320: la $2, sym_2_3320
-+.globl sym_2_3321
-+sym_2_3321: la $2, sym_2_3321
-+.globl sym_2_3322
-+sym_2_3322: la $2, sym_2_3322
-+.globl sym_2_3323
-+sym_2_3323: la $2, sym_2_3323
-+.globl sym_2_3324
-+sym_2_3324: la $2, sym_2_3324
-+.globl sym_2_3325
-+sym_2_3325: la $2, sym_2_3325
-+.globl sym_2_3326
-+sym_2_3326: la $2, sym_2_3326
-+.globl sym_2_3327
-+sym_2_3327: la $2, sym_2_3327
-+.globl sym_2_3328
-+sym_2_3328: la $2, sym_2_3328
-+.globl sym_2_3329
-+sym_2_3329: la $2, sym_2_3329
-+.globl sym_2_3330
-+sym_2_3330: la $2, sym_2_3330
-+.globl sym_2_3331
-+sym_2_3331: la $2, sym_2_3331
-+.globl sym_2_3332
-+sym_2_3332: la $2, sym_2_3332
-+.globl sym_2_3333
-+sym_2_3333: la $2, sym_2_3333
-+.globl sym_2_3334
-+sym_2_3334: la $2, sym_2_3334
-+.globl sym_2_3335
-+sym_2_3335: la $2, sym_2_3335
-+.globl sym_2_3336
-+sym_2_3336: la $2, sym_2_3336
-+.globl sym_2_3337
-+sym_2_3337: la $2, sym_2_3337
-+.globl sym_2_3338
-+sym_2_3338: la $2, sym_2_3338
-+.globl sym_2_3339
-+sym_2_3339: la $2, sym_2_3339
-+.globl sym_2_3340
-+sym_2_3340: la $2, sym_2_3340
-+.globl sym_2_3341
-+sym_2_3341: la $2, sym_2_3341
-+.globl sym_2_3342
-+sym_2_3342: la $2, sym_2_3342
-+.globl sym_2_3343
-+sym_2_3343: la $2, sym_2_3343
-+.globl sym_2_3344
-+sym_2_3344: la $2, sym_2_3344
-+.globl sym_2_3345
-+sym_2_3345: la $2, sym_2_3345
-+.globl sym_2_3346
-+sym_2_3346: la $2, sym_2_3346
-+.globl sym_2_3347
-+sym_2_3347: la $2, sym_2_3347
-+.globl sym_2_3348
-+sym_2_3348: la $2, sym_2_3348
-+.globl sym_2_3349
-+sym_2_3349: la $2, sym_2_3349
-+.globl sym_2_3350
-+sym_2_3350: la $2, sym_2_3350
-+.globl sym_2_3351
-+sym_2_3351: la $2, sym_2_3351
-+.globl sym_2_3352
-+sym_2_3352: la $2, sym_2_3352
-+.globl sym_2_3353
-+sym_2_3353: la $2, sym_2_3353
-+.globl sym_2_3354
-+sym_2_3354: la $2, sym_2_3354
-+.globl sym_2_3355
-+sym_2_3355: la $2, sym_2_3355
-+.globl sym_2_3356
-+sym_2_3356: la $2, sym_2_3356
-+.globl sym_2_3357
-+sym_2_3357: la $2, sym_2_3357
-+.globl sym_2_3358
-+sym_2_3358: la $2, sym_2_3358
-+.globl sym_2_3359
-+sym_2_3359: la $2, sym_2_3359
-+.globl sym_2_3360
-+sym_2_3360: la $2, sym_2_3360
-+.globl sym_2_3361
-+sym_2_3361: la $2, sym_2_3361
-+.globl sym_2_3362
-+sym_2_3362: la $2, sym_2_3362
-+.globl sym_2_3363
-+sym_2_3363: la $2, sym_2_3363
-+.globl sym_2_3364
-+sym_2_3364: la $2, sym_2_3364
-+.globl sym_2_3365
-+sym_2_3365: la $2, sym_2_3365
-+.globl sym_2_3366
-+sym_2_3366: la $2, sym_2_3366
-+.globl sym_2_3367
-+sym_2_3367: la $2, sym_2_3367
-+.globl sym_2_3368
-+sym_2_3368: la $2, sym_2_3368
-+.globl sym_2_3369
-+sym_2_3369: la $2, sym_2_3369
-+.globl sym_2_3370
-+sym_2_3370: la $2, sym_2_3370
-+.globl sym_2_3371
-+sym_2_3371: la $2, sym_2_3371
-+.globl sym_2_3372
-+sym_2_3372: la $2, sym_2_3372
-+.globl sym_2_3373
-+sym_2_3373: la $2, sym_2_3373
-+.globl sym_2_3374
-+sym_2_3374: la $2, sym_2_3374
-+.globl sym_2_3375
-+sym_2_3375: la $2, sym_2_3375
-+.globl sym_2_3376
-+sym_2_3376: la $2, sym_2_3376
-+.globl sym_2_3377
-+sym_2_3377: la $2, sym_2_3377
-+.globl sym_2_3378
-+sym_2_3378: la $2, sym_2_3378
-+.globl sym_2_3379
-+sym_2_3379: la $2, sym_2_3379
-+.globl sym_2_3380
-+sym_2_3380: la $2, sym_2_3380
-+.globl sym_2_3381
-+sym_2_3381: la $2, sym_2_3381
-+.globl sym_2_3382
-+sym_2_3382: la $2, sym_2_3382
-+.globl sym_2_3383
-+sym_2_3383: la $2, sym_2_3383
-+.globl sym_2_3384
-+sym_2_3384: la $2, sym_2_3384
-+.globl sym_2_3385
-+sym_2_3385: la $2, sym_2_3385
-+.globl sym_2_3386
-+sym_2_3386: la $2, sym_2_3386
-+.globl sym_2_3387
-+sym_2_3387: la $2, sym_2_3387
-+.globl sym_2_3388
-+sym_2_3388: la $2, sym_2_3388
-+.globl sym_2_3389
-+sym_2_3389: la $2, sym_2_3389
-+.globl sym_2_3390
-+sym_2_3390: la $2, sym_2_3390
-+.globl sym_2_3391
-+sym_2_3391: la $2, sym_2_3391
-+.globl sym_2_3392
-+sym_2_3392: la $2, sym_2_3392
-+.globl sym_2_3393
-+sym_2_3393: la $2, sym_2_3393
-+.globl sym_2_3394
-+sym_2_3394: la $2, sym_2_3394
-+.globl sym_2_3395
-+sym_2_3395: la $2, sym_2_3395
-+.globl sym_2_3396
-+sym_2_3396: la $2, sym_2_3396
-+.globl sym_2_3397
-+sym_2_3397: la $2, sym_2_3397
-+.globl sym_2_3398
-+sym_2_3398: la $2, sym_2_3398
-+.globl sym_2_3399
-+sym_2_3399: la $2, sym_2_3399
-+.globl sym_2_3400
-+sym_2_3400: la $2, sym_2_3400
-+.globl sym_2_3401
-+sym_2_3401: la $2, sym_2_3401
-+.globl sym_2_3402
-+sym_2_3402: la $2, sym_2_3402
-+.globl sym_2_3403
-+sym_2_3403: la $2, sym_2_3403
-+.globl sym_2_3404
-+sym_2_3404: la $2, sym_2_3404
-+.globl sym_2_3405
-+sym_2_3405: la $2, sym_2_3405
-+.globl sym_2_3406
-+sym_2_3406: la $2, sym_2_3406
-+.globl sym_2_3407
-+sym_2_3407: la $2, sym_2_3407
-+.globl sym_2_3408
-+sym_2_3408: la $2, sym_2_3408
-+.globl sym_2_3409
-+sym_2_3409: la $2, sym_2_3409
-+.globl sym_2_3410
-+sym_2_3410: la $2, sym_2_3410
-+.globl sym_2_3411
-+sym_2_3411: la $2, sym_2_3411
-+.globl sym_2_3412
-+sym_2_3412: la $2, sym_2_3412
-+.globl sym_2_3413
-+sym_2_3413: la $2, sym_2_3413
-+.globl sym_2_3414
-+sym_2_3414: la $2, sym_2_3414
-+.globl sym_2_3415
-+sym_2_3415: la $2, sym_2_3415
-+.globl sym_2_3416
-+sym_2_3416: la $2, sym_2_3416
-+.globl sym_2_3417
-+sym_2_3417: la $2, sym_2_3417
-+.globl sym_2_3418
-+sym_2_3418: la $2, sym_2_3418
-+.globl sym_2_3419
-+sym_2_3419: la $2, sym_2_3419
-+.globl sym_2_3420
-+sym_2_3420: la $2, sym_2_3420
-+.globl sym_2_3421
-+sym_2_3421: la $2, sym_2_3421
-+.globl sym_2_3422
-+sym_2_3422: la $2, sym_2_3422
-+.globl sym_2_3423
-+sym_2_3423: la $2, sym_2_3423
-+.globl sym_2_3424
-+sym_2_3424: la $2, sym_2_3424
-+.globl sym_2_3425
-+sym_2_3425: la $2, sym_2_3425
-+.globl sym_2_3426
-+sym_2_3426: la $2, sym_2_3426
-+.globl sym_2_3427
-+sym_2_3427: la $2, sym_2_3427
-+.globl sym_2_3428
-+sym_2_3428: la $2, sym_2_3428
-+.globl sym_2_3429
-+sym_2_3429: la $2, sym_2_3429
-+.globl sym_2_3430
-+sym_2_3430: la $2, sym_2_3430
-+.globl sym_2_3431
-+sym_2_3431: la $2, sym_2_3431
-+.globl sym_2_3432
-+sym_2_3432: la $2, sym_2_3432
-+.globl sym_2_3433
-+sym_2_3433: la $2, sym_2_3433
-+.globl sym_2_3434
-+sym_2_3434: la $2, sym_2_3434
-+.globl sym_2_3435
-+sym_2_3435: la $2, sym_2_3435
-+.globl sym_2_3436
-+sym_2_3436: la $2, sym_2_3436
-+.globl sym_2_3437
-+sym_2_3437: la $2, sym_2_3437
-+.globl sym_2_3438
-+sym_2_3438: la $2, sym_2_3438
-+.globl sym_2_3439
-+sym_2_3439: la $2, sym_2_3439
-+.globl sym_2_3440
-+sym_2_3440: la $2, sym_2_3440
-+.globl sym_2_3441
-+sym_2_3441: la $2, sym_2_3441
-+.globl sym_2_3442
-+sym_2_3442: la $2, sym_2_3442
-+.globl sym_2_3443
-+sym_2_3443: la $2, sym_2_3443
-+.globl sym_2_3444
-+sym_2_3444: la $2, sym_2_3444
-+.globl sym_2_3445
-+sym_2_3445: la $2, sym_2_3445
-+.globl sym_2_3446
-+sym_2_3446: la $2, sym_2_3446
-+.globl sym_2_3447
-+sym_2_3447: la $2, sym_2_3447
-+.globl sym_2_3448
-+sym_2_3448: la $2, sym_2_3448
-+.globl sym_2_3449
-+sym_2_3449: la $2, sym_2_3449
-+.globl sym_2_3450
-+sym_2_3450: la $2, sym_2_3450
-+.globl sym_2_3451
-+sym_2_3451: la $2, sym_2_3451
-+.globl sym_2_3452
-+sym_2_3452: la $2, sym_2_3452
-+.globl sym_2_3453
-+sym_2_3453: la $2, sym_2_3453
-+.globl sym_2_3454
-+sym_2_3454: la $2, sym_2_3454
-+.globl sym_2_3455
-+sym_2_3455: la $2, sym_2_3455
-+.globl sym_2_3456
-+sym_2_3456: la $2, sym_2_3456
-+.globl sym_2_3457
-+sym_2_3457: la $2, sym_2_3457
-+.globl sym_2_3458
-+sym_2_3458: la $2, sym_2_3458
-+.globl sym_2_3459
-+sym_2_3459: la $2, sym_2_3459
-+.globl sym_2_3460
-+sym_2_3460: la $2, sym_2_3460
-+.globl sym_2_3461
-+sym_2_3461: la $2, sym_2_3461
-+.globl sym_2_3462
-+sym_2_3462: la $2, sym_2_3462
-+.globl sym_2_3463
-+sym_2_3463: la $2, sym_2_3463
-+.globl sym_2_3464
-+sym_2_3464: la $2, sym_2_3464
-+.globl sym_2_3465
-+sym_2_3465: la $2, sym_2_3465
-+.globl sym_2_3466
-+sym_2_3466: la $2, sym_2_3466
-+.globl sym_2_3467
-+sym_2_3467: la $2, sym_2_3467
-+.globl sym_2_3468
-+sym_2_3468: la $2, sym_2_3468
-+.globl sym_2_3469
-+sym_2_3469: la $2, sym_2_3469
-+.globl sym_2_3470
-+sym_2_3470: la $2, sym_2_3470
-+.globl sym_2_3471
-+sym_2_3471: la $2, sym_2_3471
-+.globl sym_2_3472
-+sym_2_3472: la $2, sym_2_3472
-+.globl sym_2_3473
-+sym_2_3473: la $2, sym_2_3473
-+.globl sym_2_3474
-+sym_2_3474: la $2, sym_2_3474
-+.globl sym_2_3475
-+sym_2_3475: la $2, sym_2_3475
-+.globl sym_2_3476
-+sym_2_3476: la $2, sym_2_3476
-+.globl sym_2_3477
-+sym_2_3477: la $2, sym_2_3477
-+.globl sym_2_3478
-+sym_2_3478: la $2, sym_2_3478
-+.globl sym_2_3479
-+sym_2_3479: la $2, sym_2_3479
-+.globl sym_2_3480
-+sym_2_3480: la $2, sym_2_3480
-+.globl sym_2_3481
-+sym_2_3481: la $2, sym_2_3481
-+.globl sym_2_3482
-+sym_2_3482: la $2, sym_2_3482
-+.globl sym_2_3483
-+sym_2_3483: la $2, sym_2_3483
-+.globl sym_2_3484
-+sym_2_3484: la $2, sym_2_3484
-+.globl sym_2_3485
-+sym_2_3485: la $2, sym_2_3485
-+.globl sym_2_3486
-+sym_2_3486: la $2, sym_2_3486
-+.globl sym_2_3487
-+sym_2_3487: la $2, sym_2_3487
-+.globl sym_2_3488
-+sym_2_3488: la $2, sym_2_3488
-+.globl sym_2_3489
-+sym_2_3489: la $2, sym_2_3489
-+.globl sym_2_3490
-+sym_2_3490: la $2, sym_2_3490
-+.globl sym_2_3491
-+sym_2_3491: la $2, sym_2_3491
-+.globl sym_2_3492
-+sym_2_3492: la $2, sym_2_3492
-+.globl sym_2_3493
-+sym_2_3493: la $2, sym_2_3493
-+.globl sym_2_3494
-+sym_2_3494: la $2, sym_2_3494
-+.globl sym_2_3495
-+sym_2_3495: la $2, sym_2_3495
-+.globl sym_2_3496
-+sym_2_3496: la $2, sym_2_3496
-+.globl sym_2_3497
-+sym_2_3497: la $2, sym_2_3497
-+.globl sym_2_3498
-+sym_2_3498: la $2, sym_2_3498
-+.globl sym_2_3499
-+sym_2_3499: la $2, sym_2_3499
-+.globl sym_2_3500
-+sym_2_3500: la $2, sym_2_3500
-+.globl sym_2_3501
-+sym_2_3501: la $2, sym_2_3501
-+.globl sym_2_3502
-+sym_2_3502: la $2, sym_2_3502
-+.globl sym_2_3503
-+sym_2_3503: la $2, sym_2_3503
-+.globl sym_2_3504
-+sym_2_3504: la $2, sym_2_3504
-+.globl sym_2_3505
-+sym_2_3505: la $2, sym_2_3505
-+.globl sym_2_3506
-+sym_2_3506: la $2, sym_2_3506
-+.globl sym_2_3507
-+sym_2_3507: la $2, sym_2_3507
-+.globl sym_2_3508
-+sym_2_3508: la $2, sym_2_3508
-+.globl sym_2_3509
-+sym_2_3509: la $2, sym_2_3509
-+.globl sym_2_3510
-+sym_2_3510: la $2, sym_2_3510
-+.globl sym_2_3511
-+sym_2_3511: la $2, sym_2_3511
-+.globl sym_2_3512
-+sym_2_3512: la $2, sym_2_3512
-+.globl sym_2_3513
-+sym_2_3513: la $2, sym_2_3513
-+.globl sym_2_3514
-+sym_2_3514: la $2, sym_2_3514
-+.globl sym_2_3515
-+sym_2_3515: la $2, sym_2_3515
-+.globl sym_2_3516
-+sym_2_3516: la $2, sym_2_3516
-+.globl sym_2_3517
-+sym_2_3517: la $2, sym_2_3517
-+.globl sym_2_3518
-+sym_2_3518: la $2, sym_2_3518
-+.globl sym_2_3519
-+sym_2_3519: la $2, sym_2_3519
-+.globl sym_2_3520
-+sym_2_3520: la $2, sym_2_3520
-+.globl sym_2_3521
-+sym_2_3521: la $2, sym_2_3521
-+.globl sym_2_3522
-+sym_2_3522: la $2, sym_2_3522
-+.globl sym_2_3523
-+sym_2_3523: la $2, sym_2_3523
-+.globl sym_2_3524
-+sym_2_3524: la $2, sym_2_3524
-+.globl sym_2_3525
-+sym_2_3525: la $2, sym_2_3525
-+.globl sym_2_3526
-+sym_2_3526: la $2, sym_2_3526
-+.globl sym_2_3527
-+sym_2_3527: la $2, sym_2_3527
-+.globl sym_2_3528
-+sym_2_3528: la $2, sym_2_3528
-+.globl sym_2_3529
-+sym_2_3529: la $2, sym_2_3529
-+.globl sym_2_3530
-+sym_2_3530: la $2, sym_2_3530
-+.globl sym_2_3531
-+sym_2_3531: la $2, sym_2_3531
-+.globl sym_2_3532
-+sym_2_3532: la $2, sym_2_3532
-+.globl sym_2_3533
-+sym_2_3533: la $2, sym_2_3533
-+.globl sym_2_3534
-+sym_2_3534: la $2, sym_2_3534
-+.globl sym_2_3535
-+sym_2_3535: la $2, sym_2_3535
-+.globl sym_2_3536
-+sym_2_3536: la $2, sym_2_3536
-+.globl sym_2_3537
-+sym_2_3537: la $2, sym_2_3537
-+.globl sym_2_3538
-+sym_2_3538: la $2, sym_2_3538
-+.globl sym_2_3539
-+sym_2_3539: la $2, sym_2_3539
-+.globl sym_2_3540
-+sym_2_3540: la $2, sym_2_3540
-+.globl sym_2_3541
-+sym_2_3541: la $2, sym_2_3541
-+.globl sym_2_3542
-+sym_2_3542: la $2, sym_2_3542
-+.globl sym_2_3543
-+sym_2_3543: la $2, sym_2_3543
-+.globl sym_2_3544
-+sym_2_3544: la $2, sym_2_3544
-+.globl sym_2_3545
-+sym_2_3545: la $2, sym_2_3545
-+.globl sym_2_3546
-+sym_2_3546: la $2, sym_2_3546
-+.globl sym_2_3547
-+sym_2_3547: la $2, sym_2_3547
-+.globl sym_2_3548
-+sym_2_3548: la $2, sym_2_3548
-+.globl sym_2_3549
-+sym_2_3549: la $2, sym_2_3549
-+.globl sym_2_3550
-+sym_2_3550: la $2, sym_2_3550
-+.globl sym_2_3551
-+sym_2_3551: la $2, sym_2_3551
-+.globl sym_2_3552
-+sym_2_3552: la $2, sym_2_3552
-+.globl sym_2_3553
-+sym_2_3553: la $2, sym_2_3553
-+.globl sym_2_3554
-+sym_2_3554: la $2, sym_2_3554
-+.globl sym_2_3555
-+sym_2_3555: la $2, sym_2_3555
-+.globl sym_2_3556
-+sym_2_3556: la $2, sym_2_3556
-+.globl sym_2_3557
-+sym_2_3557: la $2, sym_2_3557
-+.globl sym_2_3558
-+sym_2_3558: la $2, sym_2_3558
-+.globl sym_2_3559
-+sym_2_3559: la $2, sym_2_3559
-+.globl sym_2_3560
-+sym_2_3560: la $2, sym_2_3560
-+.globl sym_2_3561
-+sym_2_3561: la $2, sym_2_3561
-+.globl sym_2_3562
-+sym_2_3562: la $2, sym_2_3562
-+.globl sym_2_3563
-+sym_2_3563: la $2, sym_2_3563
-+.globl sym_2_3564
-+sym_2_3564: la $2, sym_2_3564
-+.globl sym_2_3565
-+sym_2_3565: la $2, sym_2_3565
-+.globl sym_2_3566
-+sym_2_3566: la $2, sym_2_3566
-+.globl sym_2_3567
-+sym_2_3567: la $2, sym_2_3567
-+.globl sym_2_3568
-+sym_2_3568: la $2, sym_2_3568
-+.globl sym_2_3569
-+sym_2_3569: la $2, sym_2_3569
-+.globl sym_2_3570
-+sym_2_3570: la $2, sym_2_3570
-+.globl sym_2_3571
-+sym_2_3571: la $2, sym_2_3571
-+.globl sym_2_3572
-+sym_2_3572: la $2, sym_2_3572
-+.globl sym_2_3573
-+sym_2_3573: la $2, sym_2_3573
-+.globl sym_2_3574
-+sym_2_3574: la $2, sym_2_3574
-+.globl sym_2_3575
-+sym_2_3575: la $2, sym_2_3575
-+.globl sym_2_3576
-+sym_2_3576: la $2, sym_2_3576
-+.globl sym_2_3577
-+sym_2_3577: la $2, sym_2_3577
-+.globl sym_2_3578
-+sym_2_3578: la $2, sym_2_3578
-+.globl sym_2_3579
-+sym_2_3579: la $2, sym_2_3579
-+.globl sym_2_3580
-+sym_2_3580: la $2, sym_2_3580
-+.globl sym_2_3581
-+sym_2_3581: la $2, sym_2_3581
-+.globl sym_2_3582
-+sym_2_3582: la $2, sym_2_3582
-+.globl sym_2_3583
-+sym_2_3583: la $2, sym_2_3583
-+.globl sym_2_3584
-+sym_2_3584: la $2, sym_2_3584
-+.globl sym_2_3585
-+sym_2_3585: la $2, sym_2_3585
-+.globl sym_2_3586
-+sym_2_3586: la $2, sym_2_3586
-+.globl sym_2_3587
-+sym_2_3587: la $2, sym_2_3587
-+.globl sym_2_3588
-+sym_2_3588: la $2, sym_2_3588
-+.globl sym_2_3589
-+sym_2_3589: la $2, sym_2_3589
-+.globl sym_2_3590
-+sym_2_3590: la $2, sym_2_3590
-+.globl sym_2_3591
-+sym_2_3591: la $2, sym_2_3591
-+.globl sym_2_3592
-+sym_2_3592: la $2, sym_2_3592
-+.globl sym_2_3593
-+sym_2_3593: la $2, sym_2_3593
-+.globl sym_2_3594
-+sym_2_3594: la $2, sym_2_3594
-+.globl sym_2_3595
-+sym_2_3595: la $2, sym_2_3595
-+.globl sym_2_3596
-+sym_2_3596: la $2, sym_2_3596
-+.globl sym_2_3597
-+sym_2_3597: la $2, sym_2_3597
-+.globl sym_2_3598
-+sym_2_3598: la $2, sym_2_3598
-+.globl sym_2_3599
-+sym_2_3599: la $2, sym_2_3599
-+.globl sym_2_3600
-+sym_2_3600: la $2, sym_2_3600
-+.globl sym_2_3601
-+sym_2_3601: la $2, sym_2_3601
-+.globl sym_2_3602
-+sym_2_3602: la $2, sym_2_3602
-+.globl sym_2_3603
-+sym_2_3603: la $2, sym_2_3603
-+.globl sym_2_3604
-+sym_2_3604: la $2, sym_2_3604
-+.globl sym_2_3605
-+sym_2_3605: la $2, sym_2_3605
-+.globl sym_2_3606
-+sym_2_3606: la $2, sym_2_3606
-+.globl sym_2_3607
-+sym_2_3607: la $2, sym_2_3607
-+.globl sym_2_3608
-+sym_2_3608: la $2, sym_2_3608
-+.globl sym_2_3609
-+sym_2_3609: la $2, sym_2_3609
-+.globl sym_2_3610
-+sym_2_3610: la $2, sym_2_3610
-+.globl sym_2_3611
-+sym_2_3611: la $2, sym_2_3611
-+.globl sym_2_3612
-+sym_2_3612: la $2, sym_2_3612
-+.globl sym_2_3613
-+sym_2_3613: la $2, sym_2_3613
-+.globl sym_2_3614
-+sym_2_3614: la $2, sym_2_3614
-+.globl sym_2_3615
-+sym_2_3615: la $2, sym_2_3615
-+.globl sym_2_3616
-+sym_2_3616: la $2, sym_2_3616
-+.globl sym_2_3617
-+sym_2_3617: la $2, sym_2_3617
-+.globl sym_2_3618
-+sym_2_3618: la $2, sym_2_3618
-+.globl sym_2_3619
-+sym_2_3619: la $2, sym_2_3619
-+.globl sym_2_3620
-+sym_2_3620: la $2, sym_2_3620
-+.globl sym_2_3621
-+sym_2_3621: la $2, sym_2_3621
-+.globl sym_2_3622
-+sym_2_3622: la $2, sym_2_3622
-+.globl sym_2_3623
-+sym_2_3623: la $2, sym_2_3623
-+.globl sym_2_3624
-+sym_2_3624: la $2, sym_2_3624
-+.globl sym_2_3625
-+sym_2_3625: la $2, sym_2_3625
-+.globl sym_2_3626
-+sym_2_3626: la $2, sym_2_3626
-+.globl sym_2_3627
-+sym_2_3627: la $2, sym_2_3627
-+.globl sym_2_3628
-+sym_2_3628: la $2, sym_2_3628
-+.globl sym_2_3629
-+sym_2_3629: la $2, sym_2_3629
-+.globl sym_2_3630
-+sym_2_3630: la $2, sym_2_3630
-+.globl sym_2_3631
-+sym_2_3631: la $2, sym_2_3631
-+.globl sym_2_3632
-+sym_2_3632: la $2, sym_2_3632
-+.globl sym_2_3633
-+sym_2_3633: la $2, sym_2_3633
-+.globl sym_2_3634
-+sym_2_3634: la $2, sym_2_3634
-+.globl sym_2_3635
-+sym_2_3635: la $2, sym_2_3635
-+.globl sym_2_3636
-+sym_2_3636: la $2, sym_2_3636
-+.globl sym_2_3637
-+sym_2_3637: la $2, sym_2_3637
-+.globl sym_2_3638
-+sym_2_3638: la $2, sym_2_3638
-+.globl sym_2_3639
-+sym_2_3639: la $2, sym_2_3639
-+.globl sym_2_3640
-+sym_2_3640: la $2, sym_2_3640
-+.globl sym_2_3641
-+sym_2_3641: la $2, sym_2_3641
-+.globl sym_2_3642
-+sym_2_3642: la $2, sym_2_3642
-+.globl sym_2_3643
-+sym_2_3643: la $2, sym_2_3643
-+.globl sym_2_3644
-+sym_2_3644: la $2, sym_2_3644
-+.globl sym_2_3645
-+sym_2_3645: la $2, sym_2_3645
-+.globl sym_2_3646
-+sym_2_3646: la $2, sym_2_3646
-+.globl sym_2_3647
-+sym_2_3647: la $2, sym_2_3647
-+.globl sym_2_3648
-+sym_2_3648: la $2, sym_2_3648
-+.globl sym_2_3649
-+sym_2_3649: la $2, sym_2_3649
-+.globl sym_2_3650
-+sym_2_3650: la $2, sym_2_3650
-+.globl sym_2_3651
-+sym_2_3651: la $2, sym_2_3651
-+.globl sym_2_3652
-+sym_2_3652: la $2, sym_2_3652
-+.globl sym_2_3653
-+sym_2_3653: la $2, sym_2_3653
-+.globl sym_2_3654
-+sym_2_3654: la $2, sym_2_3654
-+.globl sym_2_3655
-+sym_2_3655: la $2, sym_2_3655
-+.globl sym_2_3656
-+sym_2_3656: la $2, sym_2_3656
-+.globl sym_2_3657
-+sym_2_3657: la $2, sym_2_3657
-+.globl sym_2_3658
-+sym_2_3658: la $2, sym_2_3658
-+.globl sym_2_3659
-+sym_2_3659: la $2, sym_2_3659
-+.globl sym_2_3660
-+sym_2_3660: la $2, sym_2_3660
-+.globl sym_2_3661
-+sym_2_3661: la $2, sym_2_3661
-+.globl sym_2_3662
-+sym_2_3662: la $2, sym_2_3662
-+.globl sym_2_3663
-+sym_2_3663: la $2, sym_2_3663
-+.globl sym_2_3664
-+sym_2_3664: la $2, sym_2_3664
-+.globl sym_2_3665
-+sym_2_3665: la $2, sym_2_3665
-+.globl sym_2_3666
-+sym_2_3666: la $2, sym_2_3666
-+.globl sym_2_3667
-+sym_2_3667: la $2, sym_2_3667
-+.globl sym_2_3668
-+sym_2_3668: la $2, sym_2_3668
-+.globl sym_2_3669
-+sym_2_3669: la $2, sym_2_3669
-+.globl sym_2_3670
-+sym_2_3670: la $2, sym_2_3670
-+.globl sym_2_3671
-+sym_2_3671: la $2, sym_2_3671
-+.globl sym_2_3672
-+sym_2_3672: la $2, sym_2_3672
-+.globl sym_2_3673
-+sym_2_3673: la $2, sym_2_3673
-+.globl sym_2_3674
-+sym_2_3674: la $2, sym_2_3674
-+.globl sym_2_3675
-+sym_2_3675: la $2, sym_2_3675
-+.globl sym_2_3676
-+sym_2_3676: la $2, sym_2_3676
-+.globl sym_2_3677
-+sym_2_3677: la $2, sym_2_3677
-+.globl sym_2_3678
-+sym_2_3678: la $2, sym_2_3678
-+.globl sym_2_3679
-+sym_2_3679: la $2, sym_2_3679
-+.globl sym_2_3680
-+sym_2_3680: la $2, sym_2_3680
-+.globl sym_2_3681
-+sym_2_3681: la $2, sym_2_3681
-+.globl sym_2_3682
-+sym_2_3682: la $2, sym_2_3682
-+.globl sym_2_3683
-+sym_2_3683: la $2, sym_2_3683
-+.globl sym_2_3684
-+sym_2_3684: la $2, sym_2_3684
-+.globl sym_2_3685
-+sym_2_3685: la $2, sym_2_3685
-+.globl sym_2_3686
-+sym_2_3686: la $2, sym_2_3686
-+.globl sym_2_3687
-+sym_2_3687: la $2, sym_2_3687
-+.globl sym_2_3688
-+sym_2_3688: la $2, sym_2_3688
-+.globl sym_2_3689
-+sym_2_3689: la $2, sym_2_3689
-+.globl sym_2_3690
-+sym_2_3690: la $2, sym_2_3690
-+.globl sym_2_3691
-+sym_2_3691: la $2, sym_2_3691
-+.globl sym_2_3692
-+sym_2_3692: la $2, sym_2_3692
-+.globl sym_2_3693
-+sym_2_3693: la $2, sym_2_3693
-+.globl sym_2_3694
-+sym_2_3694: la $2, sym_2_3694
-+.globl sym_2_3695
-+sym_2_3695: la $2, sym_2_3695
-+.globl sym_2_3696
-+sym_2_3696: la $2, sym_2_3696
-+.globl sym_2_3697
-+sym_2_3697: la $2, sym_2_3697
-+.globl sym_2_3698
-+sym_2_3698: la $2, sym_2_3698
-+.globl sym_2_3699
-+sym_2_3699: la $2, sym_2_3699
-+.globl sym_2_3700
-+sym_2_3700: la $2, sym_2_3700
-+.globl sym_2_3701
-+sym_2_3701: la $2, sym_2_3701
-+.globl sym_2_3702
-+sym_2_3702: la $2, sym_2_3702
-+.globl sym_2_3703
-+sym_2_3703: la $2, sym_2_3703
-+.globl sym_2_3704
-+sym_2_3704: la $2, sym_2_3704
-+.globl sym_2_3705
-+sym_2_3705: la $2, sym_2_3705
-+.globl sym_2_3706
-+sym_2_3706: la $2, sym_2_3706
-+.globl sym_2_3707
-+sym_2_3707: la $2, sym_2_3707
-+.globl sym_2_3708
-+sym_2_3708: la $2, sym_2_3708
-+.globl sym_2_3709
-+sym_2_3709: la $2, sym_2_3709
-+.globl sym_2_3710
-+sym_2_3710: la $2, sym_2_3710
-+.globl sym_2_3711
-+sym_2_3711: la $2, sym_2_3711
-+.globl sym_2_3712
-+sym_2_3712: la $2, sym_2_3712
-+.globl sym_2_3713
-+sym_2_3713: la $2, sym_2_3713
-+.globl sym_2_3714
-+sym_2_3714: la $2, sym_2_3714
-+.globl sym_2_3715
-+sym_2_3715: la $2, sym_2_3715
-+.globl sym_2_3716
-+sym_2_3716: la $2, sym_2_3716
-+.globl sym_2_3717
-+sym_2_3717: la $2, sym_2_3717
-+.globl sym_2_3718
-+sym_2_3718: la $2, sym_2_3718
-+.globl sym_2_3719
-+sym_2_3719: la $2, sym_2_3719
-+.globl sym_2_3720
-+sym_2_3720: la $2, sym_2_3720
-+.globl sym_2_3721
-+sym_2_3721: la $2, sym_2_3721
-+.globl sym_2_3722
-+sym_2_3722: la $2, sym_2_3722
-+.globl sym_2_3723
-+sym_2_3723: la $2, sym_2_3723
-+.globl sym_2_3724
-+sym_2_3724: la $2, sym_2_3724
-+.globl sym_2_3725
-+sym_2_3725: la $2, sym_2_3725
-+.globl sym_2_3726
-+sym_2_3726: la $2, sym_2_3726
-+.globl sym_2_3727
-+sym_2_3727: la $2, sym_2_3727
-+.globl sym_2_3728
-+sym_2_3728: la $2, sym_2_3728
-+.globl sym_2_3729
-+sym_2_3729: la $2, sym_2_3729
-+.globl sym_2_3730
-+sym_2_3730: la $2, sym_2_3730
-+.globl sym_2_3731
-+sym_2_3731: la $2, sym_2_3731
-+.globl sym_2_3732
-+sym_2_3732: la $2, sym_2_3732
-+.globl sym_2_3733
-+sym_2_3733: la $2, sym_2_3733
-+.globl sym_2_3734
-+sym_2_3734: la $2, sym_2_3734
-+.globl sym_2_3735
-+sym_2_3735: la $2, sym_2_3735
-+.globl sym_2_3736
-+sym_2_3736: la $2, sym_2_3736
-+.globl sym_2_3737
-+sym_2_3737: la $2, sym_2_3737
-+.globl sym_2_3738
-+sym_2_3738: la $2, sym_2_3738
-+.globl sym_2_3739
-+sym_2_3739: la $2, sym_2_3739
-+.globl sym_2_3740
-+sym_2_3740: la $2, sym_2_3740
-+.globl sym_2_3741
-+sym_2_3741: la $2, sym_2_3741
-+.globl sym_2_3742
-+sym_2_3742: la $2, sym_2_3742
-+.globl sym_2_3743
-+sym_2_3743: la $2, sym_2_3743
-+.globl sym_2_3744
-+sym_2_3744: la $2, sym_2_3744
-+.globl sym_2_3745
-+sym_2_3745: la $2, sym_2_3745
-+.globl sym_2_3746
-+sym_2_3746: la $2, sym_2_3746
-+.globl sym_2_3747
-+sym_2_3747: la $2, sym_2_3747
-+.globl sym_2_3748
-+sym_2_3748: la $2, sym_2_3748
-+.globl sym_2_3749
-+sym_2_3749: la $2, sym_2_3749
-+.globl sym_2_3750
-+sym_2_3750: la $2, sym_2_3750
-+.globl sym_2_3751
-+sym_2_3751: la $2, sym_2_3751
-+.globl sym_2_3752
-+sym_2_3752: la $2, sym_2_3752
-+.globl sym_2_3753
-+sym_2_3753: la $2, sym_2_3753
-+.globl sym_2_3754
-+sym_2_3754: la $2, sym_2_3754
-+.globl sym_2_3755
-+sym_2_3755: la $2, sym_2_3755
-+.globl sym_2_3756
-+sym_2_3756: la $2, sym_2_3756
-+.globl sym_2_3757
-+sym_2_3757: la $2, sym_2_3757
-+.globl sym_2_3758
-+sym_2_3758: la $2, sym_2_3758
-+.globl sym_2_3759
-+sym_2_3759: la $2, sym_2_3759
-+.globl sym_2_3760
-+sym_2_3760: la $2, sym_2_3760
-+.globl sym_2_3761
-+sym_2_3761: la $2, sym_2_3761
-+.globl sym_2_3762
-+sym_2_3762: la $2, sym_2_3762
-+.globl sym_2_3763
-+sym_2_3763: la $2, sym_2_3763
-+.globl sym_2_3764
-+sym_2_3764: la $2, sym_2_3764
-+.globl sym_2_3765
-+sym_2_3765: la $2, sym_2_3765
-+.globl sym_2_3766
-+sym_2_3766: la $2, sym_2_3766
-+.globl sym_2_3767
-+sym_2_3767: la $2, sym_2_3767
-+.globl sym_2_3768
-+sym_2_3768: la $2, sym_2_3768
-+.globl sym_2_3769
-+sym_2_3769: la $2, sym_2_3769
-+.globl sym_2_3770
-+sym_2_3770: la $2, sym_2_3770
-+.globl sym_2_3771
-+sym_2_3771: la $2, sym_2_3771
-+.globl sym_2_3772
-+sym_2_3772: la $2, sym_2_3772
-+.globl sym_2_3773
-+sym_2_3773: la $2, sym_2_3773
-+.globl sym_2_3774
-+sym_2_3774: la $2, sym_2_3774
-+.globl sym_2_3775
-+sym_2_3775: la $2, sym_2_3775
-+.globl sym_2_3776
-+sym_2_3776: la $2, sym_2_3776
-+.globl sym_2_3777
-+sym_2_3777: la $2, sym_2_3777
-+.globl sym_2_3778
-+sym_2_3778: la $2, sym_2_3778
-+.globl sym_2_3779
-+sym_2_3779: la $2, sym_2_3779
-+.globl sym_2_3780
-+sym_2_3780: la $2, sym_2_3780
-+.globl sym_2_3781
-+sym_2_3781: la $2, sym_2_3781
-+.globl sym_2_3782
-+sym_2_3782: la $2, sym_2_3782
-+.globl sym_2_3783
-+sym_2_3783: la $2, sym_2_3783
-+.globl sym_2_3784
-+sym_2_3784: la $2, sym_2_3784
-+.globl sym_2_3785
-+sym_2_3785: la $2, sym_2_3785
-+.globl sym_2_3786
-+sym_2_3786: la $2, sym_2_3786
-+.globl sym_2_3787
-+sym_2_3787: la $2, sym_2_3787
-+.globl sym_2_3788
-+sym_2_3788: la $2, sym_2_3788
-+.globl sym_2_3789
-+sym_2_3789: la $2, sym_2_3789
-+.globl sym_2_3790
-+sym_2_3790: la $2, sym_2_3790
-+.globl sym_2_3791
-+sym_2_3791: la $2, sym_2_3791
-+.globl sym_2_3792
-+sym_2_3792: la $2, sym_2_3792
-+.globl sym_2_3793
-+sym_2_3793: la $2, sym_2_3793
-+.globl sym_2_3794
-+sym_2_3794: la $2, sym_2_3794
-+.globl sym_2_3795
-+sym_2_3795: la $2, sym_2_3795
-+.globl sym_2_3796
-+sym_2_3796: la $2, sym_2_3796
-+.globl sym_2_3797
-+sym_2_3797: la $2, sym_2_3797
-+.globl sym_2_3798
-+sym_2_3798: la $2, sym_2_3798
-+.globl sym_2_3799
-+sym_2_3799: la $2, sym_2_3799
-+.globl sym_2_3800
-+sym_2_3800: la $2, sym_2_3800
-+.globl sym_2_3801
-+sym_2_3801: la $2, sym_2_3801
-+.globl sym_2_3802
-+sym_2_3802: la $2, sym_2_3802
-+.globl sym_2_3803
-+sym_2_3803: la $2, sym_2_3803
-+.globl sym_2_3804
-+sym_2_3804: la $2, sym_2_3804
-+.globl sym_2_3805
-+sym_2_3805: la $2, sym_2_3805
-+.globl sym_2_3806
-+sym_2_3806: la $2, sym_2_3806
-+.globl sym_2_3807
-+sym_2_3807: la $2, sym_2_3807
-+.globl sym_2_3808
-+sym_2_3808: la $2, sym_2_3808
-+.globl sym_2_3809
-+sym_2_3809: la $2, sym_2_3809
-+.globl sym_2_3810
-+sym_2_3810: la $2, sym_2_3810
-+.globl sym_2_3811
-+sym_2_3811: la $2, sym_2_3811
-+.globl sym_2_3812
-+sym_2_3812: la $2, sym_2_3812
-+.globl sym_2_3813
-+sym_2_3813: la $2, sym_2_3813
-+.globl sym_2_3814
-+sym_2_3814: la $2, sym_2_3814
-+.globl sym_2_3815
-+sym_2_3815: la $2, sym_2_3815
-+.globl sym_2_3816
-+sym_2_3816: la $2, sym_2_3816
-+.globl sym_2_3817
-+sym_2_3817: la $2, sym_2_3817
-+.globl sym_2_3818
-+sym_2_3818: la $2, sym_2_3818
-+.globl sym_2_3819
-+sym_2_3819: la $2, sym_2_3819
-+.globl sym_2_3820
-+sym_2_3820: la $2, sym_2_3820
-+.globl sym_2_3821
-+sym_2_3821: la $2, sym_2_3821
-+.globl sym_2_3822
-+sym_2_3822: la $2, sym_2_3822
-+.globl sym_2_3823
-+sym_2_3823: la $2, sym_2_3823
-+.globl sym_2_3824
-+sym_2_3824: la $2, sym_2_3824
-+.globl sym_2_3825
-+sym_2_3825: la $2, sym_2_3825
-+.globl sym_2_3826
-+sym_2_3826: la $2, sym_2_3826
-+.globl sym_2_3827
-+sym_2_3827: la $2, sym_2_3827
-+.globl sym_2_3828
-+sym_2_3828: la $2, sym_2_3828
-+.globl sym_2_3829
-+sym_2_3829: la $2, sym_2_3829
-+.globl sym_2_3830
-+sym_2_3830: la $2, sym_2_3830
-+.globl sym_2_3831
-+sym_2_3831: la $2, sym_2_3831
-+.globl sym_2_3832
-+sym_2_3832: la $2, sym_2_3832
-+.globl sym_2_3833
-+sym_2_3833: la $2, sym_2_3833
-+.globl sym_2_3834
-+sym_2_3834: la $2, sym_2_3834
-+.globl sym_2_3835
-+sym_2_3835: la $2, sym_2_3835
-+.globl sym_2_3836
-+sym_2_3836: la $2, sym_2_3836
-+.globl sym_2_3837
-+sym_2_3837: la $2, sym_2_3837
-+.globl sym_2_3838
-+sym_2_3838: la $2, sym_2_3838
-+.globl sym_2_3839
-+sym_2_3839: la $2, sym_2_3839
-+.globl sym_2_3840
-+sym_2_3840: la $2, sym_2_3840
-+.globl sym_2_3841
-+sym_2_3841: la $2, sym_2_3841
-+.globl sym_2_3842
-+sym_2_3842: la $2, sym_2_3842
-+.globl sym_2_3843
-+sym_2_3843: la $2, sym_2_3843
-+.globl sym_2_3844
-+sym_2_3844: la $2, sym_2_3844
-+.globl sym_2_3845
-+sym_2_3845: la $2, sym_2_3845
-+.globl sym_2_3846
-+sym_2_3846: la $2, sym_2_3846
-+.globl sym_2_3847
-+sym_2_3847: la $2, sym_2_3847
-+.globl sym_2_3848
-+sym_2_3848: la $2, sym_2_3848
-+.globl sym_2_3849
-+sym_2_3849: la $2, sym_2_3849
-+.globl sym_2_3850
-+sym_2_3850: la $2, sym_2_3850
-+.globl sym_2_3851
-+sym_2_3851: la $2, sym_2_3851
-+.globl sym_2_3852
-+sym_2_3852: la $2, sym_2_3852
-+.globl sym_2_3853
-+sym_2_3853: la $2, sym_2_3853
-+.globl sym_2_3854
-+sym_2_3854: la $2, sym_2_3854
-+.globl sym_2_3855
-+sym_2_3855: la $2, sym_2_3855
-+.globl sym_2_3856
-+sym_2_3856: la $2, sym_2_3856
-+.globl sym_2_3857
-+sym_2_3857: la $2, sym_2_3857
-+.globl sym_2_3858
-+sym_2_3858: la $2, sym_2_3858
-+.globl sym_2_3859
-+sym_2_3859: la $2, sym_2_3859
-+.globl sym_2_3860
-+sym_2_3860: la $2, sym_2_3860
-+.globl sym_2_3861
-+sym_2_3861: la $2, sym_2_3861
-+.globl sym_2_3862
-+sym_2_3862: la $2, sym_2_3862
-+.globl sym_2_3863
-+sym_2_3863: la $2, sym_2_3863
-+.globl sym_2_3864
-+sym_2_3864: la $2, sym_2_3864
-+.globl sym_2_3865
-+sym_2_3865: la $2, sym_2_3865
-+.globl sym_2_3866
-+sym_2_3866: la $2, sym_2_3866
-+.globl sym_2_3867
-+sym_2_3867: la $2, sym_2_3867
-+.globl sym_2_3868
-+sym_2_3868: la $2, sym_2_3868
-+.globl sym_2_3869
-+sym_2_3869: la $2, sym_2_3869
-+.globl sym_2_3870
-+sym_2_3870: la $2, sym_2_3870
-+.globl sym_2_3871
-+sym_2_3871: la $2, sym_2_3871
-+.globl sym_2_3872
-+sym_2_3872: la $2, sym_2_3872
-+.globl sym_2_3873
-+sym_2_3873: la $2, sym_2_3873
-+.globl sym_2_3874
-+sym_2_3874: la $2, sym_2_3874
-+.globl sym_2_3875
-+sym_2_3875: la $2, sym_2_3875
-+.globl sym_2_3876
-+sym_2_3876: la $2, sym_2_3876
-+.globl sym_2_3877
-+sym_2_3877: la $2, sym_2_3877
-+.globl sym_2_3878
-+sym_2_3878: la $2, sym_2_3878
-+.globl sym_2_3879
-+sym_2_3879: la $2, sym_2_3879
-+.globl sym_2_3880
-+sym_2_3880: la $2, sym_2_3880
-+.globl sym_2_3881
-+sym_2_3881: la $2, sym_2_3881
-+.globl sym_2_3882
-+sym_2_3882: la $2, sym_2_3882
-+.globl sym_2_3883
-+sym_2_3883: la $2, sym_2_3883
-+.globl sym_2_3884
-+sym_2_3884: la $2, sym_2_3884
-+.globl sym_2_3885
-+sym_2_3885: la $2, sym_2_3885
-+.globl sym_2_3886
-+sym_2_3886: la $2, sym_2_3886
-+.globl sym_2_3887
-+sym_2_3887: la $2, sym_2_3887
-+.globl sym_2_3888
-+sym_2_3888: la $2, sym_2_3888
-+.globl sym_2_3889
-+sym_2_3889: la $2, sym_2_3889
-+.globl sym_2_3890
-+sym_2_3890: la $2, sym_2_3890
-+.globl sym_2_3891
-+sym_2_3891: la $2, sym_2_3891
-+.globl sym_2_3892
-+sym_2_3892: la $2, sym_2_3892
-+.globl sym_2_3893
-+sym_2_3893: la $2, sym_2_3893
-+.globl sym_2_3894
-+sym_2_3894: la $2, sym_2_3894
-+.globl sym_2_3895
-+sym_2_3895: la $2, sym_2_3895
-+.globl sym_2_3896
-+sym_2_3896: la $2, sym_2_3896
-+.globl sym_2_3897
-+sym_2_3897: la $2, sym_2_3897
-+.globl sym_2_3898
-+sym_2_3898: la $2, sym_2_3898
-+.globl sym_2_3899
-+sym_2_3899: la $2, sym_2_3899
-+.globl sym_2_3900
-+sym_2_3900: la $2, sym_2_3900
-+.globl sym_2_3901
-+sym_2_3901: la $2, sym_2_3901
-+.globl sym_2_3902
-+sym_2_3902: la $2, sym_2_3902
-+.globl sym_2_3903
-+sym_2_3903: la $2, sym_2_3903
-+.globl sym_2_3904
-+sym_2_3904: la $2, sym_2_3904
-+.globl sym_2_3905
-+sym_2_3905: la $2, sym_2_3905
-+.globl sym_2_3906
-+sym_2_3906: la $2, sym_2_3906
-+.globl sym_2_3907
-+sym_2_3907: la $2, sym_2_3907
-+.globl sym_2_3908
-+sym_2_3908: la $2, sym_2_3908
-+.globl sym_2_3909
-+sym_2_3909: la $2, sym_2_3909
-+.globl sym_2_3910
-+sym_2_3910: la $2, sym_2_3910
-+.globl sym_2_3911
-+sym_2_3911: la $2, sym_2_3911
-+.globl sym_2_3912
-+sym_2_3912: la $2, sym_2_3912
-+.globl sym_2_3913
-+sym_2_3913: la $2, sym_2_3913
-+.globl sym_2_3914
-+sym_2_3914: la $2, sym_2_3914
-+.globl sym_2_3915
-+sym_2_3915: la $2, sym_2_3915
-+.globl sym_2_3916
-+sym_2_3916: la $2, sym_2_3916
-+.globl sym_2_3917
-+sym_2_3917: la $2, sym_2_3917
-+.globl sym_2_3918
-+sym_2_3918: la $2, sym_2_3918
-+.globl sym_2_3919
-+sym_2_3919: la $2, sym_2_3919
-+.globl sym_2_3920
-+sym_2_3920: la $2, sym_2_3920
-+.globl sym_2_3921
-+sym_2_3921: la $2, sym_2_3921
-+.globl sym_2_3922
-+sym_2_3922: la $2, sym_2_3922
-+.globl sym_2_3923
-+sym_2_3923: la $2, sym_2_3923
-+.globl sym_2_3924
-+sym_2_3924: la $2, sym_2_3924
-+.globl sym_2_3925
-+sym_2_3925: la $2, sym_2_3925
-+.globl sym_2_3926
-+sym_2_3926: la $2, sym_2_3926
-+.globl sym_2_3927
-+sym_2_3927: la $2, sym_2_3927
-+.globl sym_2_3928
-+sym_2_3928: la $2, sym_2_3928
-+.globl sym_2_3929
-+sym_2_3929: la $2, sym_2_3929
-+.globl sym_2_3930
-+sym_2_3930: la $2, sym_2_3930
-+.globl sym_2_3931
-+sym_2_3931: la $2, sym_2_3931
-+.globl sym_2_3932
-+sym_2_3932: la $2, sym_2_3932
-+.globl sym_2_3933
-+sym_2_3933: la $2, sym_2_3933
-+.globl sym_2_3934
-+sym_2_3934: la $2, sym_2_3934
-+.globl sym_2_3935
-+sym_2_3935: la $2, sym_2_3935
-+.globl sym_2_3936
-+sym_2_3936: la $2, sym_2_3936
-+.globl sym_2_3937
-+sym_2_3937: la $2, sym_2_3937
-+.globl sym_2_3938
-+sym_2_3938: la $2, sym_2_3938
-+.globl sym_2_3939
-+sym_2_3939: la $2, sym_2_3939
-+.globl sym_2_3940
-+sym_2_3940: la $2, sym_2_3940
-+.globl sym_2_3941
-+sym_2_3941: la $2, sym_2_3941
-+.globl sym_2_3942
-+sym_2_3942: la $2, sym_2_3942
-+.globl sym_2_3943
-+sym_2_3943: la $2, sym_2_3943
-+.globl sym_2_3944
-+sym_2_3944: la $2, sym_2_3944
-+.globl sym_2_3945
-+sym_2_3945: la $2, sym_2_3945
-+.globl sym_2_3946
-+sym_2_3946: la $2, sym_2_3946
-+.globl sym_2_3947
-+sym_2_3947: la $2, sym_2_3947
-+.globl sym_2_3948
-+sym_2_3948: la $2, sym_2_3948
-+.globl sym_2_3949
-+sym_2_3949: la $2, sym_2_3949
-+.globl sym_2_3950
-+sym_2_3950: la $2, sym_2_3950
-+.globl sym_2_3951
-+sym_2_3951: la $2, sym_2_3951
-+.globl sym_2_3952
-+sym_2_3952: la $2, sym_2_3952
-+.globl sym_2_3953
-+sym_2_3953: la $2, sym_2_3953
-+.globl sym_2_3954
-+sym_2_3954: la $2, sym_2_3954
-+.globl sym_2_3955
-+sym_2_3955: la $2, sym_2_3955
-+.globl sym_2_3956
-+sym_2_3956: la $2, sym_2_3956
-+.globl sym_2_3957
-+sym_2_3957: la $2, sym_2_3957
-+.globl sym_2_3958
-+sym_2_3958: la $2, sym_2_3958
-+.globl sym_2_3959
-+sym_2_3959: la $2, sym_2_3959
-+.globl sym_2_3960
-+sym_2_3960: la $2, sym_2_3960
-+.globl sym_2_3961
-+sym_2_3961: la $2, sym_2_3961
-+.globl sym_2_3962
-+sym_2_3962: la $2, sym_2_3962
-+.globl sym_2_3963
-+sym_2_3963: la $2, sym_2_3963
-+.globl sym_2_3964
-+sym_2_3964: la $2, sym_2_3964
-+.globl sym_2_3965
-+sym_2_3965: la $2, sym_2_3965
-+.globl sym_2_3966
-+sym_2_3966: la $2, sym_2_3966
-+.globl sym_2_3967
-+sym_2_3967: la $2, sym_2_3967
-+.globl sym_2_3968
-+sym_2_3968: la $2, sym_2_3968
-+.globl sym_2_3969
-+sym_2_3969: la $2, sym_2_3969
-+.globl sym_2_3970
-+sym_2_3970: la $2, sym_2_3970
-+.globl sym_2_3971
-+sym_2_3971: la $2, sym_2_3971
-+.globl sym_2_3972
-+sym_2_3972: la $2, sym_2_3972
-+.globl sym_2_3973
-+sym_2_3973: la $2, sym_2_3973
-+.globl sym_2_3974
-+sym_2_3974: la $2, sym_2_3974
-+.globl sym_2_3975
-+sym_2_3975: la $2, sym_2_3975
-+.globl sym_2_3976
-+sym_2_3976: la $2, sym_2_3976
-+.globl sym_2_3977
-+sym_2_3977: la $2, sym_2_3977
-+.globl sym_2_3978
-+sym_2_3978: la $2, sym_2_3978
-+.globl sym_2_3979
-+sym_2_3979: la $2, sym_2_3979
-+.globl sym_2_3980
-+sym_2_3980: la $2, sym_2_3980
-+.globl sym_2_3981
-+sym_2_3981: la $2, sym_2_3981
-+.globl sym_2_3982
-+sym_2_3982: la $2, sym_2_3982
-+.globl sym_2_3983
-+sym_2_3983: la $2, sym_2_3983
-+.globl sym_2_3984
-+sym_2_3984: la $2, sym_2_3984
-+.globl sym_2_3985
-+sym_2_3985: la $2, sym_2_3985
-+.globl sym_2_3986
-+sym_2_3986: la $2, sym_2_3986
-+.globl sym_2_3987
-+sym_2_3987: la $2, sym_2_3987
-+.globl sym_2_3988
-+sym_2_3988: la $2, sym_2_3988
-+.globl sym_2_3989
-+sym_2_3989: la $2, sym_2_3989
-+.globl sym_2_3990
-+sym_2_3990: la $2, sym_2_3990
-+.globl sym_2_3991
-+sym_2_3991: la $2, sym_2_3991
-+.globl sym_2_3992
-+sym_2_3992: la $2, sym_2_3992
-+.globl sym_2_3993
-+sym_2_3993: la $2, sym_2_3993
-+.globl sym_2_3994
-+sym_2_3994: la $2, sym_2_3994
-+.globl sym_2_3995
-+sym_2_3995: la $2, sym_2_3995
-+.globl sym_2_3996
-+sym_2_3996: la $2, sym_2_3996
-+.globl sym_2_3997
-+sym_2_3997: la $2, sym_2_3997
-+.globl sym_2_3998
-+sym_2_3998: la $2, sym_2_3998
-+.globl sym_2_3999
-+sym_2_3999: la $2, sym_2_3999
-+.globl sym_2_4000
-+sym_2_4000: la $2, sym_2_4000
-+.globl sym_2_4001
-+sym_2_4001: la $2, sym_2_4001
-+.globl sym_2_4002
-+sym_2_4002: la $2, sym_2_4002
-+.globl sym_2_4003
-+sym_2_4003: la $2, sym_2_4003
-+.globl sym_2_4004
-+sym_2_4004: la $2, sym_2_4004
-+.globl sym_2_4005
-+sym_2_4005: la $2, sym_2_4005
-+.globl sym_2_4006
-+sym_2_4006: la $2, sym_2_4006
-+.globl sym_2_4007
-+sym_2_4007: la $2, sym_2_4007
-+.globl sym_2_4008
-+sym_2_4008: la $2, sym_2_4008
-+.globl sym_2_4009
-+sym_2_4009: la $2, sym_2_4009
-+.globl sym_2_4010
-+sym_2_4010: la $2, sym_2_4010
-+.globl sym_2_4011
-+sym_2_4011: la $2, sym_2_4011
-+.globl sym_2_4012
-+sym_2_4012: la $2, sym_2_4012
-+.globl sym_2_4013
-+sym_2_4013: la $2, sym_2_4013
-+.globl sym_2_4014
-+sym_2_4014: la $2, sym_2_4014
-+.globl sym_2_4015
-+sym_2_4015: la $2, sym_2_4015
-+.globl sym_2_4016
-+sym_2_4016: la $2, sym_2_4016
-+.globl sym_2_4017
-+sym_2_4017: la $2, sym_2_4017
-+.globl sym_2_4018
-+sym_2_4018: la $2, sym_2_4018
-+.globl sym_2_4019
-+sym_2_4019: la $2, sym_2_4019
-+.globl sym_2_4020
-+sym_2_4020: la $2, sym_2_4020
-+.globl sym_2_4021
-+sym_2_4021: la $2, sym_2_4021
-+.globl sym_2_4022
-+sym_2_4022: la $2, sym_2_4022
-+.globl sym_2_4023
-+sym_2_4023: la $2, sym_2_4023
-+.globl sym_2_4024
-+sym_2_4024: la $2, sym_2_4024
-+.globl sym_2_4025
-+sym_2_4025: la $2, sym_2_4025
-+.globl sym_2_4026
-+sym_2_4026: la $2, sym_2_4026
-+.globl sym_2_4027
-+sym_2_4027: la $2, sym_2_4027
-+.globl sym_2_4028
-+sym_2_4028: la $2, sym_2_4028
-+.globl sym_2_4029
-+sym_2_4029: la $2, sym_2_4029
-+.globl sym_2_4030
-+sym_2_4030: la $2, sym_2_4030
-+.globl sym_2_4031
-+sym_2_4031: la $2, sym_2_4031
-+.globl sym_2_4032
-+sym_2_4032: la $2, sym_2_4032
-+.globl sym_2_4033
-+sym_2_4033: la $2, sym_2_4033
-+.globl sym_2_4034
-+sym_2_4034: la $2, sym_2_4034
-+.globl sym_2_4035
-+sym_2_4035: la $2, sym_2_4035
-+.globl sym_2_4036
-+sym_2_4036: la $2, sym_2_4036
-+.globl sym_2_4037
-+sym_2_4037: la $2, sym_2_4037
-+.globl sym_2_4038
-+sym_2_4038: la $2, sym_2_4038
-+.globl sym_2_4039
-+sym_2_4039: la $2, sym_2_4039
-+.globl sym_2_4040
-+sym_2_4040: la $2, sym_2_4040
-+.globl sym_2_4041
-+sym_2_4041: la $2, sym_2_4041
-+.globl sym_2_4042
-+sym_2_4042: la $2, sym_2_4042
-+.globl sym_2_4043
-+sym_2_4043: la $2, sym_2_4043
-+.globl sym_2_4044
-+sym_2_4044: la $2, sym_2_4044
-+.globl sym_2_4045
-+sym_2_4045: la $2, sym_2_4045
-+.globl sym_2_4046
-+sym_2_4046: la $2, sym_2_4046
-+.globl sym_2_4047
-+sym_2_4047: la $2, sym_2_4047
-+.globl sym_2_4048
-+sym_2_4048: la $2, sym_2_4048
-+.globl sym_2_4049
-+sym_2_4049: la $2, sym_2_4049
-+.globl sym_2_4050
-+sym_2_4050: la $2, sym_2_4050
-+.globl sym_2_4051
-+sym_2_4051: la $2, sym_2_4051
-+.globl sym_2_4052
-+sym_2_4052: la $2, sym_2_4052
-+.globl sym_2_4053
-+sym_2_4053: la $2, sym_2_4053
-+.globl sym_2_4054
-+sym_2_4054: la $2, sym_2_4054
-+.globl sym_2_4055
-+sym_2_4055: la $2, sym_2_4055
-+.globl sym_2_4056
-+sym_2_4056: la $2, sym_2_4056
-+.globl sym_2_4057
-+sym_2_4057: la $2, sym_2_4057
-+.globl sym_2_4058
-+sym_2_4058: la $2, sym_2_4058
-+.globl sym_2_4059
-+sym_2_4059: la $2, sym_2_4059
-+.globl sym_2_4060
-+sym_2_4060: la $2, sym_2_4060
-+.globl sym_2_4061
-+sym_2_4061: la $2, sym_2_4061
-+.globl sym_2_4062
-+sym_2_4062: la $2, sym_2_4062
-+.globl sym_2_4063
-+sym_2_4063: la $2, sym_2_4063
-+.globl sym_2_4064
-+sym_2_4064: la $2, sym_2_4064
-+.globl sym_2_4065
-+sym_2_4065: la $2, sym_2_4065
-+.globl sym_2_4066
-+sym_2_4066: la $2, sym_2_4066
-+.globl sym_2_4067
-+sym_2_4067: la $2, sym_2_4067
-+.globl sym_2_4068
-+sym_2_4068: la $2, sym_2_4068
-+.globl sym_2_4069
-+sym_2_4069: la $2, sym_2_4069
-+.globl sym_2_4070
-+sym_2_4070: la $2, sym_2_4070
-+.globl sym_2_4071
-+sym_2_4071: la $2, sym_2_4071
-+.globl sym_2_4072
-+sym_2_4072: la $2, sym_2_4072
-+.globl sym_2_4073
-+sym_2_4073: la $2, sym_2_4073
-+.globl sym_2_4074
-+sym_2_4074: la $2, sym_2_4074
-+.globl sym_2_4075
-+sym_2_4075: la $2, sym_2_4075
-+.globl sym_2_4076
-+sym_2_4076: la $2, sym_2_4076
-+.globl sym_2_4077
-+sym_2_4077: la $2, sym_2_4077
-+.globl sym_2_4078
-+sym_2_4078: la $2, sym_2_4078
-+.globl sym_2_4079
-+sym_2_4079: la $2, sym_2_4079
-+.globl sym_2_4080
-+sym_2_4080: la $2, sym_2_4080
-+.globl sym_2_4081
-+sym_2_4081: la $2, sym_2_4081
-+.globl sym_2_4082
-+sym_2_4082: la $2, sym_2_4082
-+.globl sym_2_4083
-+sym_2_4083: la $2, sym_2_4083
-+.globl sym_2_4084
-+sym_2_4084: la $2, sym_2_4084
-+.globl sym_2_4085
-+sym_2_4085: la $2, sym_2_4085
-+.globl sym_2_4086
-+sym_2_4086: la $2, sym_2_4086
-+.globl sym_2_4087
-+sym_2_4087: la $2, sym_2_4087
-+.globl sym_2_4088
-+sym_2_4088: la $2, sym_2_4088
-+.globl sym_2_4089
-+sym_2_4089: la $2, sym_2_4089
-+.globl sym_2_4090
-+sym_2_4090: la $2, sym_2_4090
-+.globl sym_2_4091
-+sym_2_4091: la $2, sym_2_4091
-+.globl sym_2_4092
-+sym_2_4092: la $2, sym_2_4092
-+.globl sym_2_4093
-+sym_2_4093: la $2, sym_2_4093
-+.globl sym_2_4094
-+sym_2_4094: la $2, sym_2_4094
-+.globl sym_2_4095
-+sym_2_4095: la $2, sym_2_4095
-+.globl sym_2_4096
-+sym_2_4096: la $2, sym_2_4096
-+.globl sym_2_4097
-+sym_2_4097: la $2, sym_2_4097
-+.globl sym_2_4098
-+sym_2_4098: la $2, sym_2_4098
-+.globl sym_2_4099
-+sym_2_4099: la $2, sym_2_4099
-+.globl sym_2_4100
-+sym_2_4100: la $2, sym_2_4100
-+.globl sym_2_4101
-+sym_2_4101: la $2, sym_2_4101
-+.globl sym_2_4102
-+sym_2_4102: la $2, sym_2_4102
-+.globl sym_2_4103
-+sym_2_4103: la $2, sym_2_4103
-+.globl sym_2_4104
-+sym_2_4104: la $2, sym_2_4104
-+.globl sym_2_4105
-+sym_2_4105: la $2, sym_2_4105
-+.globl sym_2_4106
-+sym_2_4106: la $2, sym_2_4106
-+.globl sym_2_4107
-+sym_2_4107: la $2, sym_2_4107
-+.globl sym_2_4108
-+sym_2_4108: la $2, sym_2_4108
-+.globl sym_2_4109
-+sym_2_4109: la $2, sym_2_4109
-+.globl sym_2_4110
-+sym_2_4110: la $2, sym_2_4110
-+.globl sym_2_4111
-+sym_2_4111: la $2, sym_2_4111
-+.globl sym_2_4112
-+sym_2_4112: la $2, sym_2_4112
-+.globl sym_2_4113
-+sym_2_4113: la $2, sym_2_4113
-+.globl sym_2_4114
-+sym_2_4114: la $2, sym_2_4114
-+.globl sym_2_4115
-+sym_2_4115: la $2, sym_2_4115
-+.globl sym_2_4116
-+sym_2_4116: la $2, sym_2_4116
-+.globl sym_2_4117
-+sym_2_4117: la $2, sym_2_4117
-+.globl sym_2_4118
-+sym_2_4118: la $2, sym_2_4118
-+.globl sym_2_4119
-+sym_2_4119: la $2, sym_2_4119
-+.globl sym_2_4120
-+sym_2_4120: la $2, sym_2_4120
-+.globl sym_2_4121
-+sym_2_4121: la $2, sym_2_4121
-+.globl sym_2_4122
-+sym_2_4122: la $2, sym_2_4122
-+.globl sym_2_4123
-+sym_2_4123: la $2, sym_2_4123
-+.globl sym_2_4124
-+sym_2_4124: la $2, sym_2_4124
-+.globl sym_2_4125
-+sym_2_4125: la $2, sym_2_4125
-+.globl sym_2_4126
-+sym_2_4126: la $2, sym_2_4126
-+.globl sym_2_4127
-+sym_2_4127: la $2, sym_2_4127
-+.globl sym_2_4128
-+sym_2_4128: la $2, sym_2_4128
-+.globl sym_2_4129
-+sym_2_4129: la $2, sym_2_4129
-+.globl sym_2_4130
-+sym_2_4130: la $2, sym_2_4130
-+.globl sym_2_4131
-+sym_2_4131: la $2, sym_2_4131
-+.globl sym_2_4132
-+sym_2_4132: la $2, sym_2_4132
-+.globl sym_2_4133
-+sym_2_4133: la $2, sym_2_4133
-+.globl sym_2_4134
-+sym_2_4134: la $2, sym_2_4134
-+.globl sym_2_4135
-+sym_2_4135: la $2, sym_2_4135
-+.globl sym_2_4136
-+sym_2_4136: la $2, sym_2_4136
-+.globl sym_2_4137
-+sym_2_4137: la $2, sym_2_4137
-+.globl sym_2_4138
-+sym_2_4138: la $2, sym_2_4138
-+.globl sym_2_4139
-+sym_2_4139: la $2, sym_2_4139
-+.globl sym_2_4140
-+sym_2_4140: la $2, sym_2_4140
-+.globl sym_2_4141
-+sym_2_4141: la $2, sym_2_4141
-+.globl sym_2_4142
-+sym_2_4142: la $2, sym_2_4142
-+.globl sym_2_4143
-+sym_2_4143: la $2, sym_2_4143
-+.globl sym_2_4144
-+sym_2_4144: la $2, sym_2_4144
-+.globl sym_2_4145
-+sym_2_4145: la $2, sym_2_4145
-+.globl sym_2_4146
-+sym_2_4146: la $2, sym_2_4146
-+.globl sym_2_4147
-+sym_2_4147: la $2, sym_2_4147
-+.globl sym_2_4148
-+sym_2_4148: la $2, sym_2_4148
-+.globl sym_2_4149
-+sym_2_4149: la $2, sym_2_4149
-+.globl sym_2_4150
-+sym_2_4150: la $2, sym_2_4150
-+.globl sym_2_4151
-+sym_2_4151: la $2, sym_2_4151
-+.globl sym_2_4152
-+sym_2_4152: la $2, sym_2_4152
-+.globl sym_2_4153
-+sym_2_4153: la $2, sym_2_4153
-+.globl sym_2_4154
-+sym_2_4154: la $2, sym_2_4154
-+.globl sym_2_4155
-+sym_2_4155: la $2, sym_2_4155
-+.globl sym_2_4156
-+sym_2_4156: la $2, sym_2_4156
-+.globl sym_2_4157
-+sym_2_4157: la $2, sym_2_4157
-+.globl sym_2_4158
-+sym_2_4158: la $2, sym_2_4158
-+.globl sym_2_4159
-+sym_2_4159: la $2, sym_2_4159
-+.globl sym_2_4160
-+sym_2_4160: la $2, sym_2_4160
-+.globl sym_2_4161
-+sym_2_4161: la $2, sym_2_4161
-+.globl sym_2_4162
-+sym_2_4162: la $2, sym_2_4162
-+.globl sym_2_4163
-+sym_2_4163: la $2, sym_2_4163
-+.globl sym_2_4164
-+sym_2_4164: la $2, sym_2_4164
-+.globl sym_2_4165
-+sym_2_4165: la $2, sym_2_4165
-+.globl sym_2_4166
-+sym_2_4166: la $2, sym_2_4166
-+.globl sym_2_4167
-+sym_2_4167: la $2, sym_2_4167
-+.globl sym_2_4168
-+sym_2_4168: la $2, sym_2_4168
-+.globl sym_2_4169
-+sym_2_4169: la $2, sym_2_4169
-+.globl sym_2_4170
-+sym_2_4170: la $2, sym_2_4170
-+.globl sym_2_4171
-+sym_2_4171: la $2, sym_2_4171
-+.globl sym_2_4172
-+sym_2_4172: la $2, sym_2_4172
-+.globl sym_2_4173
-+sym_2_4173: la $2, sym_2_4173
-+.globl sym_2_4174
-+sym_2_4174: la $2, sym_2_4174
-+.globl sym_2_4175
-+sym_2_4175: la $2, sym_2_4175
-+.globl sym_2_4176
-+sym_2_4176: la $2, sym_2_4176
-+.globl sym_2_4177
-+sym_2_4177: la $2, sym_2_4177
-+.globl sym_2_4178
-+sym_2_4178: la $2, sym_2_4178
-+.globl sym_2_4179
-+sym_2_4179: la $2, sym_2_4179
-+.globl sym_2_4180
-+sym_2_4180: la $2, sym_2_4180
-+.globl sym_2_4181
-+sym_2_4181: la $2, sym_2_4181
-+.globl sym_2_4182
-+sym_2_4182: la $2, sym_2_4182
-+.globl sym_2_4183
-+sym_2_4183: la $2, sym_2_4183
-+.globl sym_2_4184
-+sym_2_4184: la $2, sym_2_4184
-+.globl sym_2_4185
-+sym_2_4185: la $2, sym_2_4185
-+.globl sym_2_4186
-+sym_2_4186: la $2, sym_2_4186
-+.globl sym_2_4187
-+sym_2_4187: la $2, sym_2_4187
-+.globl sym_2_4188
-+sym_2_4188: la $2, sym_2_4188
-+.globl sym_2_4189
-+sym_2_4189: la $2, sym_2_4189
-+.globl sym_2_4190
-+sym_2_4190: la $2, sym_2_4190
-+.globl sym_2_4191
-+sym_2_4191: la $2, sym_2_4191
-+.globl sym_2_4192
-+sym_2_4192: la $2, sym_2_4192
-+.globl sym_2_4193
-+sym_2_4193: la $2, sym_2_4193
-+.globl sym_2_4194
-+sym_2_4194: la $2, sym_2_4194
-+.globl sym_2_4195
-+sym_2_4195: la $2, sym_2_4195
-+.globl sym_2_4196
-+sym_2_4196: la $2, sym_2_4196
-+.globl sym_2_4197
-+sym_2_4197: la $2, sym_2_4197
-+.globl sym_2_4198
-+sym_2_4198: la $2, sym_2_4198
-+.globl sym_2_4199
-+sym_2_4199: la $2, sym_2_4199
-+.globl sym_2_4200
-+sym_2_4200: la $2, sym_2_4200
-+.globl sym_2_4201
-+sym_2_4201: la $2, sym_2_4201
-+.globl sym_2_4202
-+sym_2_4202: la $2, sym_2_4202
-+.globl sym_2_4203
-+sym_2_4203: la $2, sym_2_4203
-+.globl sym_2_4204
-+sym_2_4204: la $2, sym_2_4204
-+.globl sym_2_4205
-+sym_2_4205: la $2, sym_2_4205
-+.globl sym_2_4206
-+sym_2_4206: la $2, sym_2_4206
-+.globl sym_2_4207
-+sym_2_4207: la $2, sym_2_4207
-+.globl sym_2_4208
-+sym_2_4208: la $2, sym_2_4208
-+.globl sym_2_4209
-+sym_2_4209: la $2, sym_2_4209
-+.globl sym_2_4210
-+sym_2_4210: la $2, sym_2_4210
-+.globl sym_2_4211
-+sym_2_4211: la $2, sym_2_4211
-+.globl sym_2_4212
-+sym_2_4212: la $2, sym_2_4212
-+.globl sym_2_4213
-+sym_2_4213: la $2, sym_2_4213
-+.globl sym_2_4214
-+sym_2_4214: la $2, sym_2_4214
-+.globl sym_2_4215
-+sym_2_4215: la $2, sym_2_4215
-+.globl sym_2_4216
-+sym_2_4216: la $2, sym_2_4216
-+.globl sym_2_4217
-+sym_2_4217: la $2, sym_2_4217
-+.globl sym_2_4218
-+sym_2_4218: la $2, sym_2_4218
-+.globl sym_2_4219
-+sym_2_4219: la $2, sym_2_4219
-+.globl sym_2_4220
-+sym_2_4220: la $2, sym_2_4220
-+.globl sym_2_4221
-+sym_2_4221: la $2, sym_2_4221
-+.globl sym_2_4222
-+sym_2_4222: la $2, sym_2_4222
-+.globl sym_2_4223
-+sym_2_4223: la $2, sym_2_4223
-+.globl sym_2_4224
-+sym_2_4224: la $2, sym_2_4224
-+.globl sym_2_4225
-+sym_2_4225: la $2, sym_2_4225
-+.globl sym_2_4226
-+sym_2_4226: la $2, sym_2_4226
-+.globl sym_2_4227
-+sym_2_4227: la $2, sym_2_4227
-+.globl sym_2_4228
-+sym_2_4228: la $2, sym_2_4228
-+.globl sym_2_4229
-+sym_2_4229: la $2, sym_2_4229
-+.globl sym_2_4230
-+sym_2_4230: la $2, sym_2_4230
-+.globl sym_2_4231
-+sym_2_4231: la $2, sym_2_4231
-+.globl sym_2_4232
-+sym_2_4232: la $2, sym_2_4232
-+.globl sym_2_4233
-+sym_2_4233: la $2, sym_2_4233
-+.globl sym_2_4234
-+sym_2_4234: la $2, sym_2_4234
-+.globl sym_2_4235
-+sym_2_4235: la $2, sym_2_4235
-+.globl sym_2_4236
-+sym_2_4236: la $2, sym_2_4236
-+.globl sym_2_4237
-+sym_2_4237: la $2, sym_2_4237
-+.globl sym_2_4238
-+sym_2_4238: la $2, sym_2_4238
-+.globl sym_2_4239
-+sym_2_4239: la $2, sym_2_4239
-+.globl sym_2_4240
-+sym_2_4240: la $2, sym_2_4240
-+.globl sym_2_4241
-+sym_2_4241: la $2, sym_2_4241
-+.globl sym_2_4242
-+sym_2_4242: la $2, sym_2_4242
-+.globl sym_2_4243
-+sym_2_4243: la $2, sym_2_4243
-+.globl sym_2_4244
-+sym_2_4244: la $2, sym_2_4244
-+.globl sym_2_4245
-+sym_2_4245: la $2, sym_2_4245
-+.globl sym_2_4246
-+sym_2_4246: la $2, sym_2_4246
-+.globl sym_2_4247
-+sym_2_4247: la $2, sym_2_4247
-+.globl sym_2_4248
-+sym_2_4248: la $2, sym_2_4248
-+.globl sym_2_4249
-+sym_2_4249: la $2, sym_2_4249
-+.globl sym_2_4250
-+sym_2_4250: la $2, sym_2_4250
-+.globl sym_2_4251
-+sym_2_4251: la $2, sym_2_4251
-+.globl sym_2_4252
-+sym_2_4252: la $2, sym_2_4252
-+.globl sym_2_4253
-+sym_2_4253: la $2, sym_2_4253
-+.globl sym_2_4254
-+sym_2_4254: la $2, sym_2_4254
-+.globl sym_2_4255
-+sym_2_4255: la $2, sym_2_4255
-+.globl sym_2_4256
-+sym_2_4256: la $2, sym_2_4256
-+.globl sym_2_4257
-+sym_2_4257: la $2, sym_2_4257
-+.globl sym_2_4258
-+sym_2_4258: la $2, sym_2_4258
-+.globl sym_2_4259
-+sym_2_4259: la $2, sym_2_4259
-+.globl sym_2_4260
-+sym_2_4260: la $2, sym_2_4260
-+.globl sym_2_4261
-+sym_2_4261: la $2, sym_2_4261
-+.globl sym_2_4262
-+sym_2_4262: la $2, sym_2_4262
-+.globl sym_2_4263
-+sym_2_4263: la $2, sym_2_4263
-+.globl sym_2_4264
-+sym_2_4264: la $2, sym_2_4264
-+.globl sym_2_4265
-+sym_2_4265: la $2, sym_2_4265
-+.globl sym_2_4266
-+sym_2_4266: la $2, sym_2_4266
-+.globl sym_2_4267
-+sym_2_4267: la $2, sym_2_4267
-+.globl sym_2_4268
-+sym_2_4268: la $2, sym_2_4268
-+.globl sym_2_4269
-+sym_2_4269: la $2, sym_2_4269
-+.globl sym_2_4270
-+sym_2_4270: la $2, sym_2_4270
-+.globl sym_2_4271
-+sym_2_4271: la $2, sym_2_4271
-+.globl sym_2_4272
-+sym_2_4272: la $2, sym_2_4272
-+.globl sym_2_4273
-+sym_2_4273: la $2, sym_2_4273
-+.globl sym_2_4274
-+sym_2_4274: la $2, sym_2_4274
-+.globl sym_2_4275
-+sym_2_4275: la $2, sym_2_4275
-+.globl sym_2_4276
-+sym_2_4276: la $2, sym_2_4276
-+.globl sym_2_4277
-+sym_2_4277: la $2, sym_2_4277
-+.globl sym_2_4278
-+sym_2_4278: la $2, sym_2_4278
-+.globl sym_2_4279
-+sym_2_4279: la $2, sym_2_4279
-+.globl sym_2_4280
-+sym_2_4280: la $2, sym_2_4280
-+.globl sym_2_4281
-+sym_2_4281: la $2, sym_2_4281
-+.globl sym_2_4282
-+sym_2_4282: la $2, sym_2_4282
-+.globl sym_2_4283
-+sym_2_4283: la $2, sym_2_4283
-+.globl sym_2_4284
-+sym_2_4284: la $2, sym_2_4284
-+.globl sym_2_4285
-+sym_2_4285: la $2, sym_2_4285
-+.globl sym_2_4286
-+sym_2_4286: la $2, sym_2_4286
-+.globl sym_2_4287
-+sym_2_4287: la $2, sym_2_4287
-+.globl sym_2_4288
-+sym_2_4288: la $2, sym_2_4288
-+.globl sym_2_4289
-+sym_2_4289: la $2, sym_2_4289
-+.globl sym_2_4290
-+sym_2_4290: la $2, sym_2_4290
-+.globl sym_2_4291
-+sym_2_4291: la $2, sym_2_4291
-+.globl sym_2_4292
-+sym_2_4292: la $2, sym_2_4292
-+.globl sym_2_4293
-+sym_2_4293: la $2, sym_2_4293
-+.globl sym_2_4294
-+sym_2_4294: la $2, sym_2_4294
-+.globl sym_2_4295
-+sym_2_4295: la $2, sym_2_4295
-+.globl sym_2_4296
-+sym_2_4296: la $2, sym_2_4296
-+.globl sym_2_4297
-+sym_2_4297: la $2, sym_2_4297
-+.globl sym_2_4298
-+sym_2_4298: la $2, sym_2_4298
-+.globl sym_2_4299
-+sym_2_4299: la $2, sym_2_4299
-+.globl sym_2_4300
-+sym_2_4300: la $2, sym_2_4300
-+.globl sym_2_4301
-+sym_2_4301: la $2, sym_2_4301
-+.globl sym_2_4302
-+sym_2_4302: la $2, sym_2_4302
-+.globl sym_2_4303
-+sym_2_4303: la $2, sym_2_4303
-+.globl sym_2_4304
-+sym_2_4304: la $2, sym_2_4304
-+.globl sym_2_4305
-+sym_2_4305: la $2, sym_2_4305
-+.globl sym_2_4306
-+sym_2_4306: la $2, sym_2_4306
-+.globl sym_2_4307
-+sym_2_4307: la $2, sym_2_4307
-+.globl sym_2_4308
-+sym_2_4308: la $2, sym_2_4308
-+.globl sym_2_4309
-+sym_2_4309: la $2, sym_2_4309
-+.globl sym_2_4310
-+sym_2_4310: la $2, sym_2_4310
-+.globl sym_2_4311
-+sym_2_4311: la $2, sym_2_4311
-+.globl sym_2_4312
-+sym_2_4312: la $2, sym_2_4312
-+.globl sym_2_4313
-+sym_2_4313: la $2, sym_2_4313
-+.globl sym_2_4314
-+sym_2_4314: la $2, sym_2_4314
-+.globl sym_2_4315
-+sym_2_4315: la $2, sym_2_4315
-+.globl sym_2_4316
-+sym_2_4316: la $2, sym_2_4316
-+.globl sym_2_4317
-+sym_2_4317: la $2, sym_2_4317
-+.globl sym_2_4318
-+sym_2_4318: la $2, sym_2_4318
-+.globl sym_2_4319
-+sym_2_4319: la $2, sym_2_4319
-+.globl sym_2_4320
-+sym_2_4320: la $2, sym_2_4320
-+.globl sym_2_4321
-+sym_2_4321: la $2, sym_2_4321
-+.globl sym_2_4322
-+sym_2_4322: la $2, sym_2_4322
-+.globl sym_2_4323
-+sym_2_4323: la $2, sym_2_4323
-+.globl sym_2_4324
-+sym_2_4324: la $2, sym_2_4324
-+.globl sym_2_4325
-+sym_2_4325: la $2, sym_2_4325
-+.globl sym_2_4326
-+sym_2_4326: la $2, sym_2_4326
-+.globl sym_2_4327
-+sym_2_4327: la $2, sym_2_4327
-+.globl sym_2_4328
-+sym_2_4328: la $2, sym_2_4328
-+.globl sym_2_4329
-+sym_2_4329: la $2, sym_2_4329
-+.globl sym_2_4330
-+sym_2_4330: la $2, sym_2_4330
-+.globl sym_2_4331
-+sym_2_4331: la $2, sym_2_4331
-+.globl sym_2_4332
-+sym_2_4332: la $2, sym_2_4332
-+.globl sym_2_4333
-+sym_2_4333: la $2, sym_2_4333
-+.globl sym_2_4334
-+sym_2_4334: la $2, sym_2_4334
-+.globl sym_2_4335
-+sym_2_4335: la $2, sym_2_4335
-+.globl sym_2_4336
-+sym_2_4336: la $2, sym_2_4336
-+.globl sym_2_4337
-+sym_2_4337: la $2, sym_2_4337
-+.globl sym_2_4338
-+sym_2_4338: la $2, sym_2_4338
-+.globl sym_2_4339
-+sym_2_4339: la $2, sym_2_4339
-+.globl sym_2_4340
-+sym_2_4340: la $2, sym_2_4340
-+.globl sym_2_4341
-+sym_2_4341: la $2, sym_2_4341
-+.globl sym_2_4342
-+sym_2_4342: la $2, sym_2_4342
-+.globl sym_2_4343
-+sym_2_4343: la $2, sym_2_4343
-+.globl sym_2_4344
-+sym_2_4344: la $2, sym_2_4344
-+.globl sym_2_4345
-+sym_2_4345: la $2, sym_2_4345
-+.globl sym_2_4346
-+sym_2_4346: la $2, sym_2_4346
-+.globl sym_2_4347
-+sym_2_4347: la $2, sym_2_4347
-+.globl sym_2_4348
-+sym_2_4348: la $2, sym_2_4348
-+.globl sym_2_4349
-+sym_2_4349: la $2, sym_2_4349
-+.globl sym_2_4350
-+sym_2_4350: la $2, sym_2_4350
-+.globl sym_2_4351
-+sym_2_4351: la $2, sym_2_4351
-+.globl sym_2_4352
-+sym_2_4352: la $2, sym_2_4352
-+.globl sym_2_4353
-+sym_2_4353: la $2, sym_2_4353
-+.globl sym_2_4354
-+sym_2_4354: la $2, sym_2_4354
-+.globl sym_2_4355
-+sym_2_4355: la $2, sym_2_4355
-+.globl sym_2_4356
-+sym_2_4356: la $2, sym_2_4356
-+.globl sym_2_4357
-+sym_2_4357: la $2, sym_2_4357
-+.globl sym_2_4358
-+sym_2_4358: la $2, sym_2_4358
-+.globl sym_2_4359
-+sym_2_4359: la $2, sym_2_4359
-+.globl sym_2_4360
-+sym_2_4360: la $2, sym_2_4360
-+.globl sym_2_4361
-+sym_2_4361: la $2, sym_2_4361
-+.globl sym_2_4362
-+sym_2_4362: la $2, sym_2_4362
-+.globl sym_2_4363
-+sym_2_4363: la $2, sym_2_4363
-+.globl sym_2_4364
-+sym_2_4364: la $2, sym_2_4364
-+.globl sym_2_4365
-+sym_2_4365: la $2, sym_2_4365
-+.globl sym_2_4366
-+sym_2_4366: la $2, sym_2_4366
-+.globl sym_2_4367
-+sym_2_4367: la $2, sym_2_4367
-+.globl sym_2_4368
-+sym_2_4368: la $2, sym_2_4368
-+.globl sym_2_4369
-+sym_2_4369: la $2, sym_2_4369
-+.globl sym_2_4370
-+sym_2_4370: la $2, sym_2_4370
-+.globl sym_2_4371
-+sym_2_4371: la $2, sym_2_4371
-+.globl sym_2_4372
-+sym_2_4372: la $2, sym_2_4372
-+.globl sym_2_4373
-+sym_2_4373: la $2, sym_2_4373
-+.globl sym_2_4374
-+sym_2_4374: la $2, sym_2_4374
-+.globl sym_2_4375
-+sym_2_4375: la $2, sym_2_4375
-+.globl sym_2_4376
-+sym_2_4376: la $2, sym_2_4376
-+.globl sym_2_4377
-+sym_2_4377: la $2, sym_2_4377
-+.globl sym_2_4378
-+sym_2_4378: la $2, sym_2_4378
-+.globl sym_2_4379
-+sym_2_4379: la $2, sym_2_4379
-+.globl sym_2_4380
-+sym_2_4380: la $2, sym_2_4380
-+.globl sym_2_4381
-+sym_2_4381: la $2, sym_2_4381
-+.globl sym_2_4382
-+sym_2_4382: la $2, sym_2_4382
-+.globl sym_2_4383
-+sym_2_4383: la $2, sym_2_4383
-+.globl sym_2_4384
-+sym_2_4384: la $2, sym_2_4384
-+.globl sym_2_4385
-+sym_2_4385: la $2, sym_2_4385
-+.globl sym_2_4386
-+sym_2_4386: la $2, sym_2_4386
-+.globl sym_2_4387
-+sym_2_4387: la $2, sym_2_4387
-+.globl sym_2_4388
-+sym_2_4388: la $2, sym_2_4388
-+.globl sym_2_4389
-+sym_2_4389: la $2, sym_2_4389
-+.globl sym_2_4390
-+sym_2_4390: la $2, sym_2_4390
-+.globl sym_2_4391
-+sym_2_4391: la $2, sym_2_4391
-+.globl sym_2_4392
-+sym_2_4392: la $2, sym_2_4392
-+.globl sym_2_4393
-+sym_2_4393: la $2, sym_2_4393
-+.globl sym_2_4394
-+sym_2_4394: la $2, sym_2_4394
-+.globl sym_2_4395
-+sym_2_4395: la $2, sym_2_4395
-+.globl sym_2_4396
-+sym_2_4396: la $2, sym_2_4396
-+.globl sym_2_4397
-+sym_2_4397: la $2, sym_2_4397
-+.globl sym_2_4398
-+sym_2_4398: la $2, sym_2_4398
-+.globl sym_2_4399
-+sym_2_4399: la $2, sym_2_4399
-+.globl sym_2_4400
-+sym_2_4400: la $2, sym_2_4400
-+.globl sym_2_4401
-+sym_2_4401: la $2, sym_2_4401
-+.globl sym_2_4402
-+sym_2_4402: la $2, sym_2_4402
-+.globl sym_2_4403
-+sym_2_4403: la $2, sym_2_4403
-+.globl sym_2_4404
-+sym_2_4404: la $2, sym_2_4404
-+.globl sym_2_4405
-+sym_2_4405: la $2, sym_2_4405
-+.globl sym_2_4406
-+sym_2_4406: la $2, sym_2_4406
-+.globl sym_2_4407
-+sym_2_4407: la $2, sym_2_4407
-+.globl sym_2_4408
-+sym_2_4408: la $2, sym_2_4408
-+.globl sym_2_4409
-+sym_2_4409: la $2, sym_2_4409
-+.globl sym_2_4410
-+sym_2_4410: la $2, sym_2_4410
-+.globl sym_2_4411
-+sym_2_4411: la $2, sym_2_4411
-+.globl sym_2_4412
-+sym_2_4412: la $2, sym_2_4412
-+.globl sym_2_4413
-+sym_2_4413: la $2, sym_2_4413
-+.globl sym_2_4414
-+sym_2_4414: la $2, sym_2_4414
-+.globl sym_2_4415
-+sym_2_4415: la $2, sym_2_4415
-+.globl sym_2_4416
-+sym_2_4416: la $2, sym_2_4416
-+.globl sym_2_4417
-+sym_2_4417: la $2, sym_2_4417
-+.globl sym_2_4418
-+sym_2_4418: la $2, sym_2_4418
-+.globl sym_2_4419
-+sym_2_4419: la $2, sym_2_4419
-+.globl sym_2_4420
-+sym_2_4420: la $2, sym_2_4420
-+.globl sym_2_4421
-+sym_2_4421: la $2, sym_2_4421
-+.globl sym_2_4422
-+sym_2_4422: la $2, sym_2_4422
-+.globl sym_2_4423
-+sym_2_4423: la $2, sym_2_4423
-+.globl sym_2_4424
-+sym_2_4424: la $2, sym_2_4424
-+.globl sym_2_4425
-+sym_2_4425: la $2, sym_2_4425
-+.globl sym_2_4426
-+sym_2_4426: la $2, sym_2_4426
-+.globl sym_2_4427
-+sym_2_4427: la $2, sym_2_4427
-+.globl sym_2_4428
-+sym_2_4428: la $2, sym_2_4428
-+.globl sym_2_4429
-+sym_2_4429: la $2, sym_2_4429
-+.globl sym_2_4430
-+sym_2_4430: la $2, sym_2_4430
-+.globl sym_2_4431
-+sym_2_4431: la $2, sym_2_4431
-+.globl sym_2_4432
-+sym_2_4432: la $2, sym_2_4432
-+.globl sym_2_4433
-+sym_2_4433: la $2, sym_2_4433
-+.globl sym_2_4434
-+sym_2_4434: la $2, sym_2_4434
-+.globl sym_2_4435
-+sym_2_4435: la $2, sym_2_4435
-+.globl sym_2_4436
-+sym_2_4436: la $2, sym_2_4436
-+.globl sym_2_4437
-+sym_2_4437: la $2, sym_2_4437
-+.globl sym_2_4438
-+sym_2_4438: la $2, sym_2_4438
-+.globl sym_2_4439
-+sym_2_4439: la $2, sym_2_4439
-+.globl sym_2_4440
-+sym_2_4440: la $2, sym_2_4440
-+.globl sym_2_4441
-+sym_2_4441: la $2, sym_2_4441
-+.globl sym_2_4442
-+sym_2_4442: la $2, sym_2_4442
-+.globl sym_2_4443
-+sym_2_4443: la $2, sym_2_4443
-+.globl sym_2_4444
-+sym_2_4444: la $2, sym_2_4444
-+.globl sym_2_4445
-+sym_2_4445: la $2, sym_2_4445
-+.globl sym_2_4446
-+sym_2_4446: la $2, sym_2_4446
-+.globl sym_2_4447
-+sym_2_4447: la $2, sym_2_4447
-+.globl sym_2_4448
-+sym_2_4448: la $2, sym_2_4448
-+.globl sym_2_4449
-+sym_2_4449: la $2, sym_2_4449
-+.globl sym_2_4450
-+sym_2_4450: la $2, sym_2_4450
-+.globl sym_2_4451
-+sym_2_4451: la $2, sym_2_4451
-+.globl sym_2_4452
-+sym_2_4452: la $2, sym_2_4452
-+.globl sym_2_4453
-+sym_2_4453: la $2, sym_2_4453
-+.globl sym_2_4454
-+sym_2_4454: la $2, sym_2_4454
-+.globl sym_2_4455
-+sym_2_4455: la $2, sym_2_4455
-+.globl sym_2_4456
-+sym_2_4456: la $2, sym_2_4456
-+.globl sym_2_4457
-+sym_2_4457: la $2, sym_2_4457
-+.globl sym_2_4458
-+sym_2_4458: la $2, sym_2_4458
-+.globl sym_2_4459
-+sym_2_4459: la $2, sym_2_4459
-+.globl sym_2_4460
-+sym_2_4460: la $2, sym_2_4460
-+.globl sym_2_4461
-+sym_2_4461: la $2, sym_2_4461
-+.globl sym_2_4462
-+sym_2_4462: la $2, sym_2_4462
-+.globl sym_2_4463
-+sym_2_4463: la $2, sym_2_4463
-+.globl sym_2_4464
-+sym_2_4464: la $2, sym_2_4464
-+.globl sym_2_4465
-+sym_2_4465: la $2, sym_2_4465
-+.globl sym_2_4466
-+sym_2_4466: la $2, sym_2_4466
-+.globl sym_2_4467
-+sym_2_4467: la $2, sym_2_4467
-+.globl sym_2_4468
-+sym_2_4468: la $2, sym_2_4468
-+.globl sym_2_4469
-+sym_2_4469: la $2, sym_2_4469
-+.globl sym_2_4470
-+sym_2_4470: la $2, sym_2_4470
-+.globl sym_2_4471
-+sym_2_4471: la $2, sym_2_4471
-+.globl sym_2_4472
-+sym_2_4472: la $2, sym_2_4472
-+.globl sym_2_4473
-+sym_2_4473: la $2, sym_2_4473
-+.globl sym_2_4474
-+sym_2_4474: la $2, sym_2_4474
-+.globl sym_2_4475
-+sym_2_4475: la $2, sym_2_4475
-+.globl sym_2_4476
-+sym_2_4476: la $2, sym_2_4476
-+.globl sym_2_4477
-+sym_2_4477: la $2, sym_2_4477
-+.globl sym_2_4478
-+sym_2_4478: la $2, sym_2_4478
-+.globl sym_2_4479
-+sym_2_4479: la $2, sym_2_4479
-+.globl sym_2_4480
-+sym_2_4480: la $2, sym_2_4480
-+.globl sym_2_4481
-+sym_2_4481: la $2, sym_2_4481
-+.globl sym_2_4482
-+sym_2_4482: la $2, sym_2_4482
-+.globl sym_2_4483
-+sym_2_4483: la $2, sym_2_4483
-+.globl sym_2_4484
-+sym_2_4484: la $2, sym_2_4484
-+.globl sym_2_4485
-+sym_2_4485: la $2, sym_2_4485
-+.globl sym_2_4486
-+sym_2_4486: la $2, sym_2_4486
-+.globl sym_2_4487
-+sym_2_4487: la $2, sym_2_4487
-+.globl sym_2_4488
-+sym_2_4488: la $2, sym_2_4488
-+.globl sym_2_4489
-+sym_2_4489: la $2, sym_2_4489
-+.globl sym_2_4490
-+sym_2_4490: la $2, sym_2_4490
-+.globl sym_2_4491
-+sym_2_4491: la $2, sym_2_4491
-+.globl sym_2_4492
-+sym_2_4492: la $2, sym_2_4492
-+.globl sym_2_4493
-+sym_2_4493: la $2, sym_2_4493
-+.globl sym_2_4494
-+sym_2_4494: la $2, sym_2_4494
-+.globl sym_2_4495
-+sym_2_4495: la $2, sym_2_4495
-+.globl sym_2_4496
-+sym_2_4496: la $2, sym_2_4496
-+.globl sym_2_4497
-+sym_2_4497: la $2, sym_2_4497
-+.globl sym_2_4498
-+sym_2_4498: la $2, sym_2_4498
-+.globl sym_2_4499
-+sym_2_4499: la $2, sym_2_4499
-+.globl sym_2_4500
-+sym_2_4500: la $2, sym_2_4500
-+.globl sym_2_4501
-+sym_2_4501: la $2, sym_2_4501
-+.globl sym_2_4502
-+sym_2_4502: la $2, sym_2_4502
-+.globl sym_2_4503
-+sym_2_4503: la $2, sym_2_4503
-+.globl sym_2_4504
-+sym_2_4504: la $2, sym_2_4504
-+.globl sym_2_4505
-+sym_2_4505: la $2, sym_2_4505
-+.globl sym_2_4506
-+sym_2_4506: la $2, sym_2_4506
-+.globl sym_2_4507
-+sym_2_4507: la $2, sym_2_4507
-+.globl sym_2_4508
-+sym_2_4508: la $2, sym_2_4508
-+.globl sym_2_4509
-+sym_2_4509: la $2, sym_2_4509
-+.globl sym_2_4510
-+sym_2_4510: la $2, sym_2_4510
-+.globl sym_2_4511
-+sym_2_4511: la $2, sym_2_4511
-+.globl sym_2_4512
-+sym_2_4512: la $2, sym_2_4512
-+.globl sym_2_4513
-+sym_2_4513: la $2, sym_2_4513
-+.globl sym_2_4514
-+sym_2_4514: la $2, sym_2_4514
-+.globl sym_2_4515
-+sym_2_4515: la $2, sym_2_4515
-+.globl sym_2_4516
-+sym_2_4516: la $2, sym_2_4516
-+.globl sym_2_4517
-+sym_2_4517: la $2, sym_2_4517
-+.globl sym_2_4518
-+sym_2_4518: la $2, sym_2_4518
-+.globl sym_2_4519
-+sym_2_4519: la $2, sym_2_4519
-+.globl sym_2_4520
-+sym_2_4520: la $2, sym_2_4520
-+.globl sym_2_4521
-+sym_2_4521: la $2, sym_2_4521
-+.globl sym_2_4522
-+sym_2_4522: la $2, sym_2_4522
-+.globl sym_2_4523
-+sym_2_4523: la $2, sym_2_4523
-+.globl sym_2_4524
-+sym_2_4524: la $2, sym_2_4524
-+.globl sym_2_4525
-+sym_2_4525: la $2, sym_2_4525
-+.globl sym_2_4526
-+sym_2_4526: la $2, sym_2_4526
-+.globl sym_2_4527
-+sym_2_4527: la $2, sym_2_4527
-+.globl sym_2_4528
-+sym_2_4528: la $2, sym_2_4528
-+.globl sym_2_4529
-+sym_2_4529: la $2, sym_2_4529
-+.globl sym_2_4530
-+sym_2_4530: la $2, sym_2_4530
-+.globl sym_2_4531
-+sym_2_4531: la $2, sym_2_4531
-+.globl sym_2_4532
-+sym_2_4532: la $2, sym_2_4532
-+.globl sym_2_4533
-+sym_2_4533: la $2, sym_2_4533
-+.globl sym_2_4534
-+sym_2_4534: la $2, sym_2_4534
-+.globl sym_2_4535
-+sym_2_4535: la $2, sym_2_4535
-+.globl sym_2_4536
-+sym_2_4536: la $2, sym_2_4536
-+.globl sym_2_4537
-+sym_2_4537: la $2, sym_2_4537
-+.globl sym_2_4538
-+sym_2_4538: la $2, sym_2_4538
-+.globl sym_2_4539
-+sym_2_4539: la $2, sym_2_4539
-+.globl sym_2_4540
-+sym_2_4540: la $2, sym_2_4540
-+.globl sym_2_4541
-+sym_2_4541: la $2, sym_2_4541
-+.globl sym_2_4542
-+sym_2_4542: la $2, sym_2_4542
-+.globl sym_2_4543
-+sym_2_4543: la $2, sym_2_4543
-+.globl sym_2_4544
-+sym_2_4544: la $2, sym_2_4544
-+.globl sym_2_4545
-+sym_2_4545: la $2, sym_2_4545
-+.globl sym_2_4546
-+sym_2_4546: la $2, sym_2_4546
-+.globl sym_2_4547
-+sym_2_4547: la $2, sym_2_4547
-+.globl sym_2_4548
-+sym_2_4548: la $2, sym_2_4548
-+.globl sym_2_4549
-+sym_2_4549: la $2, sym_2_4549
-+.globl sym_2_4550
-+sym_2_4550: la $2, sym_2_4550
-+.globl sym_2_4551
-+sym_2_4551: la $2, sym_2_4551
-+.globl sym_2_4552
-+sym_2_4552: la $2, sym_2_4552
-+.globl sym_2_4553
-+sym_2_4553: la $2, sym_2_4553
-+.globl sym_2_4554
-+sym_2_4554: la $2, sym_2_4554
-+.globl sym_2_4555
-+sym_2_4555: la $2, sym_2_4555
-+.globl sym_2_4556
-+sym_2_4556: la $2, sym_2_4556
-+.globl sym_2_4557
-+sym_2_4557: la $2, sym_2_4557
-+.globl sym_2_4558
-+sym_2_4558: la $2, sym_2_4558
-+.globl sym_2_4559
-+sym_2_4559: la $2, sym_2_4559
-+.globl sym_2_4560
-+sym_2_4560: la $2, sym_2_4560
-+.globl sym_2_4561
-+sym_2_4561: la $2, sym_2_4561
-+.globl sym_2_4562
-+sym_2_4562: la $2, sym_2_4562
-+.globl sym_2_4563
-+sym_2_4563: la $2, sym_2_4563
-+.globl sym_2_4564
-+sym_2_4564: la $2, sym_2_4564
-+.globl sym_2_4565
-+sym_2_4565: la $2, sym_2_4565
-+.globl sym_2_4566
-+sym_2_4566: la $2, sym_2_4566
-+.globl sym_2_4567
-+sym_2_4567: la $2, sym_2_4567
-+.globl sym_2_4568
-+sym_2_4568: la $2, sym_2_4568
-+.globl sym_2_4569
-+sym_2_4569: la $2, sym_2_4569
-+.globl sym_2_4570
-+sym_2_4570: la $2, sym_2_4570
-+.globl sym_2_4571
-+sym_2_4571: la $2, sym_2_4571
-+.globl sym_2_4572
-+sym_2_4572: la $2, sym_2_4572
-+.globl sym_2_4573
-+sym_2_4573: la $2, sym_2_4573
-+.globl sym_2_4574
-+sym_2_4574: la $2, sym_2_4574
-+.globl sym_2_4575
-+sym_2_4575: la $2, sym_2_4575
-+.globl sym_2_4576
-+sym_2_4576: la $2, sym_2_4576
-+.globl sym_2_4577
-+sym_2_4577: la $2, sym_2_4577
-+.globl sym_2_4578
-+sym_2_4578: la $2, sym_2_4578
-+.globl sym_2_4579
-+sym_2_4579: la $2, sym_2_4579
-+.globl sym_2_4580
-+sym_2_4580: la $2, sym_2_4580
-+.globl sym_2_4581
-+sym_2_4581: la $2, sym_2_4581
-+.globl sym_2_4582
-+sym_2_4582: la $2, sym_2_4582
-+.globl sym_2_4583
-+sym_2_4583: la $2, sym_2_4583
-+.globl sym_2_4584
-+sym_2_4584: la $2, sym_2_4584
-+.globl sym_2_4585
-+sym_2_4585: la $2, sym_2_4585
-+.globl sym_2_4586
-+sym_2_4586: la $2, sym_2_4586
-+.globl sym_2_4587
-+sym_2_4587: la $2, sym_2_4587
-+.globl sym_2_4588
-+sym_2_4588: la $2, sym_2_4588
-+.globl sym_2_4589
-+sym_2_4589: la $2, sym_2_4589
-+.globl sym_2_4590
-+sym_2_4590: la $2, sym_2_4590
-+.globl sym_2_4591
-+sym_2_4591: la $2, sym_2_4591
-+.globl sym_2_4592
-+sym_2_4592: la $2, sym_2_4592
-+.globl sym_2_4593
-+sym_2_4593: la $2, sym_2_4593
-+.globl sym_2_4594
-+sym_2_4594: la $2, sym_2_4594
-+.globl sym_2_4595
-+sym_2_4595: la $2, sym_2_4595
-+.globl sym_2_4596
-+sym_2_4596: la $2, sym_2_4596
-+.globl sym_2_4597
-+sym_2_4597: la $2, sym_2_4597
-+.globl sym_2_4598
-+sym_2_4598: la $2, sym_2_4598
-+.globl sym_2_4599
-+sym_2_4599: la $2, sym_2_4599
-+.globl sym_2_4600
-+sym_2_4600: la $2, sym_2_4600
-+.globl sym_2_4601
-+sym_2_4601: la $2, sym_2_4601
-+.globl sym_2_4602
-+sym_2_4602: la $2, sym_2_4602
-+.globl sym_2_4603
-+sym_2_4603: la $2, sym_2_4603
-+.globl sym_2_4604
-+sym_2_4604: la $2, sym_2_4604
-+.globl sym_2_4605
-+sym_2_4605: la $2, sym_2_4605
-+.globl sym_2_4606
-+sym_2_4606: la $2, sym_2_4606
-+.globl sym_2_4607
-+sym_2_4607: la $2, sym_2_4607
-+.globl sym_2_4608
-+sym_2_4608: la $2, sym_2_4608
-+.globl sym_2_4609
-+sym_2_4609: la $2, sym_2_4609
-+.globl sym_2_4610
-+sym_2_4610: la $2, sym_2_4610
-+.globl sym_2_4611
-+sym_2_4611: la $2, sym_2_4611
-+.globl sym_2_4612
-+sym_2_4612: la $2, sym_2_4612
-+.globl sym_2_4613
-+sym_2_4613: la $2, sym_2_4613
-+.globl sym_2_4614
-+sym_2_4614: la $2, sym_2_4614
-+.globl sym_2_4615
-+sym_2_4615: la $2, sym_2_4615
-+.globl sym_2_4616
-+sym_2_4616: la $2, sym_2_4616
-+.globl sym_2_4617
-+sym_2_4617: la $2, sym_2_4617
-+.globl sym_2_4618
-+sym_2_4618: la $2, sym_2_4618
-+.globl sym_2_4619
-+sym_2_4619: la $2, sym_2_4619
-+.globl sym_2_4620
-+sym_2_4620: la $2, sym_2_4620
-+.globl sym_2_4621
-+sym_2_4621: la $2, sym_2_4621
-+.globl sym_2_4622
-+sym_2_4622: la $2, sym_2_4622
-+.globl sym_2_4623
-+sym_2_4623: la $2, sym_2_4623
-+.globl sym_2_4624
-+sym_2_4624: la $2, sym_2_4624
-+.globl sym_2_4625
-+sym_2_4625: la $2, sym_2_4625
-+.globl sym_2_4626
-+sym_2_4626: la $2, sym_2_4626
-+.globl sym_2_4627
-+sym_2_4627: la $2, sym_2_4627
-+.globl sym_2_4628
-+sym_2_4628: la $2, sym_2_4628
-+.globl sym_2_4629
-+sym_2_4629: la $2, sym_2_4629
-+.globl sym_2_4630
-+sym_2_4630: la $2, sym_2_4630
-+.globl sym_2_4631
-+sym_2_4631: la $2, sym_2_4631
-+.globl sym_2_4632
-+sym_2_4632: la $2, sym_2_4632
-+.globl sym_2_4633
-+sym_2_4633: la $2, sym_2_4633
-+.globl sym_2_4634
-+sym_2_4634: la $2, sym_2_4634
-+.globl sym_2_4635
-+sym_2_4635: la $2, sym_2_4635
-+.globl sym_2_4636
-+sym_2_4636: la $2, sym_2_4636
-+.globl sym_2_4637
-+sym_2_4637: la $2, sym_2_4637
-+.globl sym_2_4638
-+sym_2_4638: la $2, sym_2_4638
-+.globl sym_2_4639
-+sym_2_4639: la $2, sym_2_4639
-+.globl sym_2_4640
-+sym_2_4640: la $2, sym_2_4640
-+.globl sym_2_4641
-+sym_2_4641: la $2, sym_2_4641
-+.globl sym_2_4642
-+sym_2_4642: la $2, sym_2_4642
-+.globl sym_2_4643
-+sym_2_4643: la $2, sym_2_4643
-+.globl sym_2_4644
-+sym_2_4644: la $2, sym_2_4644
-+.globl sym_2_4645
-+sym_2_4645: la $2, sym_2_4645
-+.globl sym_2_4646
-+sym_2_4646: la $2, sym_2_4646
-+.globl sym_2_4647
-+sym_2_4647: la $2, sym_2_4647
-+.globl sym_2_4648
-+sym_2_4648: la $2, sym_2_4648
-+.globl sym_2_4649
-+sym_2_4649: la $2, sym_2_4649
-+.globl sym_2_4650
-+sym_2_4650: la $2, sym_2_4650
-+.globl sym_2_4651
-+sym_2_4651: la $2, sym_2_4651
-+.globl sym_2_4652
-+sym_2_4652: la $2, sym_2_4652
-+.globl sym_2_4653
-+sym_2_4653: la $2, sym_2_4653
-+.globl sym_2_4654
-+sym_2_4654: la $2, sym_2_4654
-+.globl sym_2_4655
-+sym_2_4655: la $2, sym_2_4655
-+.globl sym_2_4656
-+sym_2_4656: la $2, sym_2_4656
-+.globl sym_2_4657
-+sym_2_4657: la $2, sym_2_4657
-+.globl sym_2_4658
-+sym_2_4658: la $2, sym_2_4658
-+.globl sym_2_4659
-+sym_2_4659: la $2, sym_2_4659
-+.globl sym_2_4660
-+sym_2_4660: la $2, sym_2_4660
-+.globl sym_2_4661
-+sym_2_4661: la $2, sym_2_4661
-+.globl sym_2_4662
-+sym_2_4662: la $2, sym_2_4662
-+.globl sym_2_4663
-+sym_2_4663: la $2, sym_2_4663
-+.globl sym_2_4664
-+sym_2_4664: la $2, sym_2_4664
-+.globl sym_2_4665
-+sym_2_4665: la $2, sym_2_4665
-+.globl sym_2_4666
-+sym_2_4666: la $2, sym_2_4666
-+.globl sym_2_4667
-+sym_2_4667: la $2, sym_2_4667
-+.globl sym_2_4668
-+sym_2_4668: la $2, sym_2_4668
-+.globl sym_2_4669
-+sym_2_4669: la $2, sym_2_4669
-+.globl sym_2_4670
-+sym_2_4670: la $2, sym_2_4670
-+.globl sym_2_4671
-+sym_2_4671: la $2, sym_2_4671
-+.globl sym_2_4672
-+sym_2_4672: la $2, sym_2_4672
-+.globl sym_2_4673
-+sym_2_4673: la $2, sym_2_4673
-+.globl sym_2_4674
-+sym_2_4674: la $2, sym_2_4674
-+.globl sym_2_4675
-+sym_2_4675: la $2, sym_2_4675
-+.globl sym_2_4676
-+sym_2_4676: la $2, sym_2_4676
-+.globl sym_2_4677
-+sym_2_4677: la $2, sym_2_4677
-+.globl sym_2_4678
-+sym_2_4678: la $2, sym_2_4678
-+.globl sym_2_4679
-+sym_2_4679: la $2, sym_2_4679
-+.globl sym_2_4680
-+sym_2_4680: la $2, sym_2_4680
-+.globl sym_2_4681
-+sym_2_4681: la $2, sym_2_4681
-+.globl sym_2_4682
-+sym_2_4682: la $2, sym_2_4682
-+.globl sym_2_4683
-+sym_2_4683: la $2, sym_2_4683
-+.globl sym_2_4684
-+sym_2_4684: la $2, sym_2_4684
-+.globl sym_2_4685
-+sym_2_4685: la $2, sym_2_4685
-+.globl sym_2_4686
-+sym_2_4686: la $2, sym_2_4686
-+.globl sym_2_4687
-+sym_2_4687: la $2, sym_2_4687
-+.globl sym_2_4688
-+sym_2_4688: la $2, sym_2_4688
-+.globl sym_2_4689
-+sym_2_4689: la $2, sym_2_4689
-+.globl sym_2_4690
-+sym_2_4690: la $2, sym_2_4690
-+.globl sym_2_4691
-+sym_2_4691: la $2, sym_2_4691
-+.globl sym_2_4692
-+sym_2_4692: la $2, sym_2_4692
-+.globl sym_2_4693
-+sym_2_4693: la $2, sym_2_4693
-+.globl sym_2_4694
-+sym_2_4694: la $2, sym_2_4694
-+.globl sym_2_4695
-+sym_2_4695: la $2, sym_2_4695
-+.globl sym_2_4696
-+sym_2_4696: la $2, sym_2_4696
-+.globl sym_2_4697
-+sym_2_4697: la $2, sym_2_4697
-+.globl sym_2_4698
-+sym_2_4698: la $2, sym_2_4698
-+.globl sym_2_4699
-+sym_2_4699: la $2, sym_2_4699
-+.globl sym_2_4700
-+sym_2_4700: la $2, sym_2_4700
-+.globl sym_2_4701
-+sym_2_4701: la $2, sym_2_4701
-+.globl sym_2_4702
-+sym_2_4702: la $2, sym_2_4702
-+.globl sym_2_4703
-+sym_2_4703: la $2, sym_2_4703
-+.globl sym_2_4704
-+sym_2_4704: la $2, sym_2_4704
-+.globl sym_2_4705
-+sym_2_4705: la $2, sym_2_4705
-+.globl sym_2_4706
-+sym_2_4706: la $2, sym_2_4706
-+.globl sym_2_4707
-+sym_2_4707: la $2, sym_2_4707
-+.globl sym_2_4708
-+sym_2_4708: la $2, sym_2_4708
-+.globl sym_2_4709
-+sym_2_4709: la $2, sym_2_4709
-+.globl sym_2_4710
-+sym_2_4710: la $2, sym_2_4710
-+.globl sym_2_4711
-+sym_2_4711: la $2, sym_2_4711
-+.globl sym_2_4712
-+sym_2_4712: la $2, sym_2_4712
-+.globl sym_2_4713
-+sym_2_4713: la $2, sym_2_4713
-+.globl sym_2_4714
-+sym_2_4714: la $2, sym_2_4714
-+.globl sym_2_4715
-+sym_2_4715: la $2, sym_2_4715
-+.globl sym_2_4716
-+sym_2_4716: la $2, sym_2_4716
-+.globl sym_2_4717
-+sym_2_4717: la $2, sym_2_4717
-+.globl sym_2_4718
-+sym_2_4718: la $2, sym_2_4718
-+.globl sym_2_4719
-+sym_2_4719: la $2, sym_2_4719
-+.globl sym_2_4720
-+sym_2_4720: la $2, sym_2_4720
-+.globl sym_2_4721
-+sym_2_4721: la $2, sym_2_4721
-+.globl sym_2_4722
-+sym_2_4722: la $2, sym_2_4722
-+.globl sym_2_4723
-+sym_2_4723: la $2, sym_2_4723
-+.globl sym_2_4724
-+sym_2_4724: la $2, sym_2_4724
-+.globl sym_2_4725
-+sym_2_4725: la $2, sym_2_4725
-+.globl sym_2_4726
-+sym_2_4726: la $2, sym_2_4726
-+.globl sym_2_4727
-+sym_2_4727: la $2, sym_2_4727
-+.globl sym_2_4728
-+sym_2_4728: la $2, sym_2_4728
-+.globl sym_2_4729
-+sym_2_4729: la $2, sym_2_4729
-+.globl sym_2_4730
-+sym_2_4730: la $2, sym_2_4730
-+.globl sym_2_4731
-+sym_2_4731: la $2, sym_2_4731
-+.globl sym_2_4732
-+sym_2_4732: la $2, sym_2_4732
-+.globl sym_2_4733
-+sym_2_4733: la $2, sym_2_4733
-+.globl sym_2_4734
-+sym_2_4734: la $2, sym_2_4734
-+.globl sym_2_4735
-+sym_2_4735: la $2, sym_2_4735
-+.globl sym_2_4736
-+sym_2_4736: la $2, sym_2_4736
-+.globl sym_2_4737
-+sym_2_4737: la $2, sym_2_4737
-+.globl sym_2_4738
-+sym_2_4738: la $2, sym_2_4738
-+.globl sym_2_4739
-+sym_2_4739: la $2, sym_2_4739
-+.globl sym_2_4740
-+sym_2_4740: la $2, sym_2_4740
-+.globl sym_2_4741
-+sym_2_4741: la $2, sym_2_4741
-+.globl sym_2_4742
-+sym_2_4742: la $2, sym_2_4742
-+.globl sym_2_4743
-+sym_2_4743: la $2, sym_2_4743
-+.globl sym_2_4744
-+sym_2_4744: la $2, sym_2_4744
-+.globl sym_2_4745
-+sym_2_4745: la $2, sym_2_4745
-+.globl sym_2_4746
-+sym_2_4746: la $2, sym_2_4746
-+.globl sym_2_4747
-+sym_2_4747: la $2, sym_2_4747
-+.globl sym_2_4748
-+sym_2_4748: la $2, sym_2_4748
-+.globl sym_2_4749
-+sym_2_4749: la $2, sym_2_4749
-+.globl sym_2_4750
-+sym_2_4750: la $2, sym_2_4750
-+.globl sym_2_4751
-+sym_2_4751: la $2, sym_2_4751
-+.globl sym_2_4752
-+sym_2_4752: la $2, sym_2_4752
-+.globl sym_2_4753
-+sym_2_4753: la $2, sym_2_4753
-+.globl sym_2_4754
-+sym_2_4754: la $2, sym_2_4754
-+.globl sym_2_4755
-+sym_2_4755: la $2, sym_2_4755
-+.globl sym_2_4756
-+sym_2_4756: la $2, sym_2_4756
-+.globl sym_2_4757
-+sym_2_4757: la $2, sym_2_4757
-+.globl sym_2_4758
-+sym_2_4758: la $2, sym_2_4758
-+.globl sym_2_4759
-+sym_2_4759: la $2, sym_2_4759
-+.globl sym_2_4760
-+sym_2_4760: la $2, sym_2_4760
-+.globl sym_2_4761
-+sym_2_4761: la $2, sym_2_4761
-+.globl sym_2_4762
-+sym_2_4762: la $2, sym_2_4762
-+.globl sym_2_4763
-+sym_2_4763: la $2, sym_2_4763
-+.globl sym_2_4764
-+sym_2_4764: la $2, sym_2_4764
-+.globl sym_2_4765
-+sym_2_4765: la $2, sym_2_4765
-+.globl sym_2_4766
-+sym_2_4766: la $2, sym_2_4766
-+.globl sym_2_4767
-+sym_2_4767: la $2, sym_2_4767
-+.globl sym_2_4768
-+sym_2_4768: la $2, sym_2_4768
-+.globl sym_2_4769
-+sym_2_4769: la $2, sym_2_4769
-+.globl sym_2_4770
-+sym_2_4770: la $2, sym_2_4770
-+.globl sym_2_4771
-+sym_2_4771: la $2, sym_2_4771
-+.globl sym_2_4772
-+sym_2_4772: la $2, sym_2_4772
-+.globl sym_2_4773
-+sym_2_4773: la $2, sym_2_4773
-+.globl sym_2_4774
-+sym_2_4774: la $2, sym_2_4774
-+.globl sym_2_4775
-+sym_2_4775: la $2, sym_2_4775
-+.globl sym_2_4776
-+sym_2_4776: la $2, sym_2_4776
-+.globl sym_2_4777
-+sym_2_4777: la $2, sym_2_4777
-+.globl sym_2_4778
-+sym_2_4778: la $2, sym_2_4778
-+.globl sym_2_4779
-+sym_2_4779: la $2, sym_2_4779
-+.globl sym_2_4780
-+sym_2_4780: la $2, sym_2_4780
-+.globl sym_2_4781
-+sym_2_4781: la $2, sym_2_4781
-+.globl sym_2_4782
-+sym_2_4782: la $2, sym_2_4782
-+.globl sym_2_4783
-+sym_2_4783: la $2, sym_2_4783
-+.globl sym_2_4784
-+sym_2_4784: la $2, sym_2_4784
-+.globl sym_2_4785
-+sym_2_4785: la $2, sym_2_4785
-+.globl sym_2_4786
-+sym_2_4786: la $2, sym_2_4786
-+.globl sym_2_4787
-+sym_2_4787: la $2, sym_2_4787
-+.globl sym_2_4788
-+sym_2_4788: la $2, sym_2_4788
-+.globl sym_2_4789
-+sym_2_4789: la $2, sym_2_4789
-+.globl sym_2_4790
-+sym_2_4790: la $2, sym_2_4790
-+.globl sym_2_4791
-+sym_2_4791: la $2, sym_2_4791
-+.globl sym_2_4792
-+sym_2_4792: la $2, sym_2_4792
-+.globl sym_2_4793
-+sym_2_4793: la $2, sym_2_4793
-+.globl sym_2_4794
-+sym_2_4794: la $2, sym_2_4794
-+.globl sym_2_4795
-+sym_2_4795: la $2, sym_2_4795
-+.globl sym_2_4796
-+sym_2_4796: la $2, sym_2_4796
-+.globl sym_2_4797
-+sym_2_4797: la $2, sym_2_4797
-+.globl sym_2_4798
-+sym_2_4798: la $2, sym_2_4798
-+.globl sym_2_4799
-+sym_2_4799: la $2, sym_2_4799
-+.globl sym_2_4800
-+sym_2_4800: la $2, sym_2_4800
-+.globl sym_2_4801
-+sym_2_4801: la $2, sym_2_4801
-+.globl sym_2_4802
-+sym_2_4802: la $2, sym_2_4802
-+.globl sym_2_4803
-+sym_2_4803: la $2, sym_2_4803
-+.globl sym_2_4804
-+sym_2_4804: la $2, sym_2_4804
-+.globl sym_2_4805
-+sym_2_4805: la $2, sym_2_4805
-+.globl sym_2_4806
-+sym_2_4806: la $2, sym_2_4806
-+.globl sym_2_4807
-+sym_2_4807: la $2, sym_2_4807
-+.globl sym_2_4808
-+sym_2_4808: la $2, sym_2_4808
-+.globl sym_2_4809
-+sym_2_4809: la $2, sym_2_4809
-+.globl sym_2_4810
-+sym_2_4810: la $2, sym_2_4810
-+.globl sym_2_4811
-+sym_2_4811: la $2, sym_2_4811
-+.globl sym_2_4812
-+sym_2_4812: la $2, sym_2_4812
-+.globl sym_2_4813
-+sym_2_4813: la $2, sym_2_4813
-+.globl sym_2_4814
-+sym_2_4814: la $2, sym_2_4814
-+.globl sym_2_4815
-+sym_2_4815: la $2, sym_2_4815
-+.globl sym_2_4816
-+sym_2_4816: la $2, sym_2_4816
-+.globl sym_2_4817
-+sym_2_4817: la $2, sym_2_4817
-+.globl sym_2_4818
-+sym_2_4818: la $2, sym_2_4818
-+.globl sym_2_4819
-+sym_2_4819: la $2, sym_2_4819
-+.globl sym_2_4820
-+sym_2_4820: la $2, sym_2_4820
-+.globl sym_2_4821
-+sym_2_4821: la $2, sym_2_4821
-+.globl sym_2_4822
-+sym_2_4822: la $2, sym_2_4822
-+.globl sym_2_4823
-+sym_2_4823: la $2, sym_2_4823
-+.globl sym_2_4824
-+sym_2_4824: la $2, sym_2_4824
-+.globl sym_2_4825
-+sym_2_4825: la $2, sym_2_4825
-+.globl sym_2_4826
-+sym_2_4826: la $2, sym_2_4826
-+.globl sym_2_4827
-+sym_2_4827: la $2, sym_2_4827
-+.globl sym_2_4828
-+sym_2_4828: la $2, sym_2_4828
-+.globl sym_2_4829
-+sym_2_4829: la $2, sym_2_4829
-+.globl sym_2_4830
-+sym_2_4830: la $2, sym_2_4830
-+.globl sym_2_4831
-+sym_2_4831: la $2, sym_2_4831
-+.globl sym_2_4832
-+sym_2_4832: la $2, sym_2_4832
-+.globl sym_2_4833
-+sym_2_4833: la $2, sym_2_4833
-+.globl sym_2_4834
-+sym_2_4834: la $2, sym_2_4834
-+.globl sym_2_4835
-+sym_2_4835: la $2, sym_2_4835
-+.globl sym_2_4836
-+sym_2_4836: la $2, sym_2_4836
-+.globl sym_2_4837
-+sym_2_4837: la $2, sym_2_4837
-+.globl sym_2_4838
-+sym_2_4838: la $2, sym_2_4838
-+.globl sym_2_4839
-+sym_2_4839: la $2, sym_2_4839
-+.globl sym_2_4840
-+sym_2_4840: la $2, sym_2_4840
-+.globl sym_2_4841
-+sym_2_4841: la $2, sym_2_4841
-+.globl sym_2_4842
-+sym_2_4842: la $2, sym_2_4842
-+.globl sym_2_4843
-+sym_2_4843: la $2, sym_2_4843
-+.globl sym_2_4844
-+sym_2_4844: la $2, sym_2_4844
-+.globl sym_2_4845
-+sym_2_4845: la $2, sym_2_4845
-+.globl sym_2_4846
-+sym_2_4846: la $2, sym_2_4846
-+.globl sym_2_4847
-+sym_2_4847: la $2, sym_2_4847
-+.globl sym_2_4848
-+sym_2_4848: la $2, sym_2_4848
-+.globl sym_2_4849
-+sym_2_4849: la $2, sym_2_4849
-+.globl sym_2_4850
-+sym_2_4850: la $2, sym_2_4850
-+.globl sym_2_4851
-+sym_2_4851: la $2, sym_2_4851
-+.globl sym_2_4852
-+sym_2_4852: la $2, sym_2_4852
-+.globl sym_2_4853
-+sym_2_4853: la $2, sym_2_4853
-+.globl sym_2_4854
-+sym_2_4854: la $2, sym_2_4854
-+.globl sym_2_4855
-+sym_2_4855: la $2, sym_2_4855
-+.globl sym_2_4856
-+sym_2_4856: la $2, sym_2_4856
-+.globl sym_2_4857
-+sym_2_4857: la $2, sym_2_4857
-+.globl sym_2_4858
-+sym_2_4858: la $2, sym_2_4858
-+.globl sym_2_4859
-+sym_2_4859: la $2, sym_2_4859
-+.globl sym_2_4860
-+sym_2_4860: la $2, sym_2_4860
-+.globl sym_2_4861
-+sym_2_4861: la $2, sym_2_4861
-+.globl sym_2_4862
-+sym_2_4862: la $2, sym_2_4862
-+.globl sym_2_4863
-+sym_2_4863: la $2, sym_2_4863
-+.globl sym_2_4864
-+sym_2_4864: la $2, sym_2_4864
-+.globl sym_2_4865
-+sym_2_4865: la $2, sym_2_4865
-+.globl sym_2_4866
-+sym_2_4866: la $2, sym_2_4866
-+.globl sym_2_4867
-+sym_2_4867: la $2, sym_2_4867
-+.globl sym_2_4868
-+sym_2_4868: la $2, sym_2_4868
-+.globl sym_2_4869
-+sym_2_4869: la $2, sym_2_4869
-+.globl sym_2_4870
-+sym_2_4870: la $2, sym_2_4870
-+.globl sym_2_4871
-+sym_2_4871: la $2, sym_2_4871
-+.globl sym_2_4872
-+sym_2_4872: la $2, sym_2_4872
-+.globl sym_2_4873
-+sym_2_4873: la $2, sym_2_4873
-+.globl sym_2_4874
-+sym_2_4874: la $2, sym_2_4874
-+.globl sym_2_4875
-+sym_2_4875: la $2, sym_2_4875
-+.globl sym_2_4876
-+sym_2_4876: la $2, sym_2_4876
-+.globl sym_2_4877
-+sym_2_4877: la $2, sym_2_4877
-+.globl sym_2_4878
-+sym_2_4878: la $2, sym_2_4878
-+.globl sym_2_4879
-+sym_2_4879: la $2, sym_2_4879
-+.globl sym_2_4880
-+sym_2_4880: la $2, sym_2_4880
-+.globl sym_2_4881
-+sym_2_4881: la $2, sym_2_4881
-+.globl sym_2_4882
-+sym_2_4882: la $2, sym_2_4882
-+.globl sym_2_4883
-+sym_2_4883: la $2, sym_2_4883
-+.globl sym_2_4884
-+sym_2_4884: la $2, sym_2_4884
-+.globl sym_2_4885
-+sym_2_4885: la $2, sym_2_4885
-+.globl sym_2_4886
-+sym_2_4886: la $2, sym_2_4886
-+.globl sym_2_4887
-+sym_2_4887: la $2, sym_2_4887
-+.globl sym_2_4888
-+sym_2_4888: la $2, sym_2_4888
-+.globl sym_2_4889
-+sym_2_4889: la $2, sym_2_4889
-+.globl sym_2_4890
-+sym_2_4890: la $2, sym_2_4890
-+.globl sym_2_4891
-+sym_2_4891: la $2, sym_2_4891
-+.globl sym_2_4892
-+sym_2_4892: la $2, sym_2_4892
-+.globl sym_2_4893
-+sym_2_4893: la $2, sym_2_4893
-+.globl sym_2_4894
-+sym_2_4894: la $2, sym_2_4894
-+.globl sym_2_4895
-+sym_2_4895: la $2, sym_2_4895
-+.globl sym_2_4896
-+sym_2_4896: la $2, sym_2_4896
-+.globl sym_2_4897
-+sym_2_4897: la $2, sym_2_4897
-+.globl sym_2_4898
-+sym_2_4898: la $2, sym_2_4898
-+.globl sym_2_4899
-+sym_2_4899: la $2, sym_2_4899
-+.globl sym_2_4900
-+sym_2_4900: la $2, sym_2_4900
-+.globl sym_2_4901
-+sym_2_4901: la $2, sym_2_4901
-+.globl sym_2_4902
-+sym_2_4902: la $2, sym_2_4902
-+.globl sym_2_4903
-+sym_2_4903: la $2, sym_2_4903
-+.globl sym_2_4904
-+sym_2_4904: la $2, sym_2_4904
-+.globl sym_2_4905
-+sym_2_4905: la $2, sym_2_4905
-+.globl sym_2_4906
-+sym_2_4906: la $2, sym_2_4906
-+.globl sym_2_4907
-+sym_2_4907: la $2, sym_2_4907
-+.globl sym_2_4908
-+sym_2_4908: la $2, sym_2_4908
-+.globl sym_2_4909
-+sym_2_4909: la $2, sym_2_4909
-+.globl sym_2_4910
-+sym_2_4910: la $2, sym_2_4910
-+.globl sym_2_4911
-+sym_2_4911: la $2, sym_2_4911
-+.globl sym_2_4912
-+sym_2_4912: la $2, sym_2_4912
-+.globl sym_2_4913
-+sym_2_4913: la $2, sym_2_4913
-+.globl sym_2_4914
-+sym_2_4914: la $2, sym_2_4914
-+.globl sym_2_4915
-+sym_2_4915: la $2, sym_2_4915
-+.globl sym_2_4916
-+sym_2_4916: la $2, sym_2_4916
-+.globl sym_2_4917
-+sym_2_4917: la $2, sym_2_4917
-+.globl sym_2_4918
-+sym_2_4918: la $2, sym_2_4918
-+.globl sym_2_4919
-+sym_2_4919: la $2, sym_2_4919
-+.globl sym_2_4920
-+sym_2_4920: la $2, sym_2_4920
-+.globl sym_2_4921
-+sym_2_4921: la $2, sym_2_4921
-+.globl sym_2_4922
-+sym_2_4922: la $2, sym_2_4922
-+.globl sym_2_4923
-+sym_2_4923: la $2, sym_2_4923
-+.globl sym_2_4924
-+sym_2_4924: la $2, sym_2_4924
-+.globl sym_2_4925
-+sym_2_4925: la $2, sym_2_4925
-+.globl sym_2_4926
-+sym_2_4926: la $2, sym_2_4926
-+.globl sym_2_4927
-+sym_2_4927: la $2, sym_2_4927
-+.globl sym_2_4928
-+sym_2_4928: la $2, sym_2_4928
-+.globl sym_2_4929
-+sym_2_4929: la $2, sym_2_4929
-+.globl sym_2_4930
-+sym_2_4930: la $2, sym_2_4930
-+.globl sym_2_4931
-+sym_2_4931: la $2, sym_2_4931
-+.globl sym_2_4932
-+sym_2_4932: la $2, sym_2_4932
-+.globl sym_2_4933
-+sym_2_4933: la $2, sym_2_4933
-+.globl sym_2_4934
-+sym_2_4934: la $2, sym_2_4934
-+.globl sym_2_4935
-+sym_2_4935: la $2, sym_2_4935
-+.globl sym_2_4936
-+sym_2_4936: la $2, sym_2_4936
-+.globl sym_2_4937
-+sym_2_4937: la $2, sym_2_4937
-+.globl sym_2_4938
-+sym_2_4938: la $2, sym_2_4938
-+.globl sym_2_4939
-+sym_2_4939: la $2, sym_2_4939
-+.globl sym_2_4940
-+sym_2_4940: la $2, sym_2_4940
-+.globl sym_2_4941
-+sym_2_4941: la $2, sym_2_4941
-+.globl sym_2_4942
-+sym_2_4942: la $2, sym_2_4942
-+.globl sym_2_4943
-+sym_2_4943: la $2, sym_2_4943
-+.globl sym_2_4944
-+sym_2_4944: la $2, sym_2_4944
-+.globl sym_2_4945
-+sym_2_4945: la $2, sym_2_4945
-+.globl sym_2_4946
-+sym_2_4946: la $2, sym_2_4946
-+.globl sym_2_4947
-+sym_2_4947: la $2, sym_2_4947
-+.globl sym_2_4948
-+sym_2_4948: la $2, sym_2_4948
-+.globl sym_2_4949
-+sym_2_4949: la $2, sym_2_4949
-+.globl sym_2_4950
-+sym_2_4950: la $2, sym_2_4950
-+.globl sym_2_4951
-+sym_2_4951: la $2, sym_2_4951
-+.globl sym_2_4952
-+sym_2_4952: la $2, sym_2_4952
-+.globl sym_2_4953
-+sym_2_4953: la $2, sym_2_4953
-+.globl sym_2_4954
-+sym_2_4954: la $2, sym_2_4954
-+.globl sym_2_4955
-+sym_2_4955: la $2, sym_2_4955
-+.globl sym_2_4956
-+sym_2_4956: la $2, sym_2_4956
-+.globl sym_2_4957
-+sym_2_4957: la $2, sym_2_4957
-+.globl sym_2_4958
-+sym_2_4958: la $2, sym_2_4958
-+.globl sym_2_4959
-+sym_2_4959: la $2, sym_2_4959
-+.globl sym_2_4960
-+sym_2_4960: la $2, sym_2_4960
-+.globl sym_2_4961
-+sym_2_4961: la $2, sym_2_4961
-+.globl sym_2_4962
-+sym_2_4962: la $2, sym_2_4962
-+.globl sym_2_4963
-+sym_2_4963: la $2, sym_2_4963
-+.globl sym_2_4964
-+sym_2_4964: la $2, sym_2_4964
-+.globl sym_2_4965
-+sym_2_4965: la $2, sym_2_4965
-+.globl sym_2_4966
-+sym_2_4966: la $2, sym_2_4966
-+.globl sym_2_4967
-+sym_2_4967: la $2, sym_2_4967
-+.globl sym_2_4968
-+sym_2_4968: la $2, sym_2_4968
-+.globl sym_2_4969
-+sym_2_4969: la $2, sym_2_4969
-+.globl sym_2_4970
-+sym_2_4970: la $2, sym_2_4970
-+.globl sym_2_4971
-+sym_2_4971: la $2, sym_2_4971
-+.globl sym_2_4972
-+sym_2_4972: la $2, sym_2_4972
-+.globl sym_2_4973
-+sym_2_4973: la $2, sym_2_4973
-+.globl sym_2_4974
-+sym_2_4974: la $2, sym_2_4974
-+.globl sym_2_4975
-+sym_2_4975: la $2, sym_2_4975
-+.globl sym_2_4976
-+sym_2_4976: la $2, sym_2_4976
-+.globl sym_2_4977
-+sym_2_4977: la $2, sym_2_4977
-+.globl sym_2_4978
-+sym_2_4978: la $2, sym_2_4978
-+.globl sym_2_4979
-+sym_2_4979: la $2, sym_2_4979
-+.globl sym_2_4980
-+sym_2_4980: la $2, sym_2_4980
-+.globl sym_2_4981
-+sym_2_4981: la $2, sym_2_4981
-+.globl sym_2_4982
-+sym_2_4982: la $2, sym_2_4982
-+.globl sym_2_4983
-+sym_2_4983: la $2, sym_2_4983
-+.globl sym_2_4984
-+sym_2_4984: la $2, sym_2_4984
-+.globl sym_2_4985
-+sym_2_4985: la $2, sym_2_4985
-+.globl sym_2_4986
-+sym_2_4986: la $2, sym_2_4986
-+.globl sym_2_4987
-+sym_2_4987: la $2, sym_2_4987
-+.globl sym_2_4988
-+sym_2_4988: la $2, sym_2_4988
-+.globl sym_2_4989
-+sym_2_4989: la $2, sym_2_4989
-+.globl sym_2_4990
-+sym_2_4990: la $2, sym_2_4990
-+.globl sym_2_4991
-+sym_2_4991: la $2, sym_2_4991
-+.globl sym_2_4992
-+sym_2_4992: la $2, sym_2_4992
-+.globl sym_2_4993
-+sym_2_4993: la $2, sym_2_4993
-+.globl sym_2_4994
-+sym_2_4994: la $2, sym_2_4994
-+.globl sym_2_4995
-+sym_2_4995: la $2, sym_2_4995
-+.globl sym_2_4996
-+sym_2_4996: la $2, sym_2_4996
-+.globl sym_2_4997
-+sym_2_4997: la $2, sym_2_4997
-+.globl sym_2_4998
-+sym_2_4998: la $2, sym_2_4998
-+.globl sym_2_4999
-+sym_2_4999: la $2, sym_2_4999
-+.globl sym_2_5000
-+sym_2_5000: la $2, sym_2_5000
-+.globl sym_2_5001
-+sym_2_5001: la $2, sym_2_5001
-+.globl sym_2_5002
-+sym_2_5002: la $2, sym_2_5002
-+.globl sym_2_5003
-+sym_2_5003: la $2, sym_2_5003
-+.globl sym_2_5004
-+sym_2_5004: la $2, sym_2_5004
-+.globl sym_2_5005
-+sym_2_5005: la $2, sym_2_5005
-+.globl sym_2_5006
-+sym_2_5006: la $2, sym_2_5006
-+.globl sym_2_5007
-+sym_2_5007: la $2, sym_2_5007
-+.globl sym_2_5008
-+sym_2_5008: la $2, sym_2_5008
-+.globl sym_2_5009
-+sym_2_5009: la $2, sym_2_5009
-+.globl sym_2_5010
-+sym_2_5010: la $2, sym_2_5010
-+.globl sym_2_5011
-+sym_2_5011: la $2, sym_2_5011
-+.globl sym_2_5012
-+sym_2_5012: la $2, sym_2_5012
-+.globl sym_2_5013
-+sym_2_5013: la $2, sym_2_5013
-+.globl sym_2_5014
-+sym_2_5014: la $2, sym_2_5014
-+.globl sym_2_5015
-+sym_2_5015: la $2, sym_2_5015
-+.globl sym_2_5016
-+sym_2_5016: la $2, sym_2_5016
-+.globl sym_2_5017
-+sym_2_5017: la $2, sym_2_5017
-+.globl sym_2_5018
-+sym_2_5018: la $2, sym_2_5018
-+.globl sym_2_5019
-+sym_2_5019: la $2, sym_2_5019
-+.globl sym_2_5020
-+sym_2_5020: la $2, sym_2_5020
-+.globl sym_2_5021
-+sym_2_5021: la $2, sym_2_5021
-+.globl sym_2_5022
-+sym_2_5022: la $2, sym_2_5022
-+.globl sym_2_5023
-+sym_2_5023: la $2, sym_2_5023
-+.globl sym_2_5024
-+sym_2_5024: la $2, sym_2_5024
-+.globl sym_2_5025
-+sym_2_5025: la $2, sym_2_5025
-+.globl sym_2_5026
-+sym_2_5026: la $2, sym_2_5026
-+.globl sym_2_5027
-+sym_2_5027: la $2, sym_2_5027
-+.globl sym_2_5028
-+sym_2_5028: la $2, sym_2_5028
-+.globl sym_2_5029
-+sym_2_5029: la $2, sym_2_5029
-+.globl sym_2_5030
-+sym_2_5030: la $2, sym_2_5030
-+.globl sym_2_5031
-+sym_2_5031: la $2, sym_2_5031
-+.globl sym_2_5032
-+sym_2_5032: la $2, sym_2_5032
-+.globl sym_2_5033
-+sym_2_5033: la $2, sym_2_5033
-+.globl sym_2_5034
-+sym_2_5034: la $2, sym_2_5034
-+.globl sym_2_5035
-+sym_2_5035: la $2, sym_2_5035
-+.globl sym_2_5036
-+sym_2_5036: la $2, sym_2_5036
-+.globl sym_2_5037
-+sym_2_5037: la $2, sym_2_5037
-+.globl sym_2_5038
-+sym_2_5038: la $2, sym_2_5038
-+.globl sym_2_5039
-+sym_2_5039: la $2, sym_2_5039
-+.globl sym_2_5040
-+sym_2_5040: la $2, sym_2_5040
-+.globl sym_2_5041
-+sym_2_5041: la $2, sym_2_5041
-+.globl sym_2_5042
-+sym_2_5042: la $2, sym_2_5042
-+.globl sym_2_5043
-+sym_2_5043: la $2, sym_2_5043
-+.globl sym_2_5044
-+sym_2_5044: la $2, sym_2_5044
-+.globl sym_2_5045
-+sym_2_5045: la $2, sym_2_5045
-+.globl sym_2_5046
-+sym_2_5046: la $2, sym_2_5046
-+.globl sym_2_5047
-+sym_2_5047: la $2, sym_2_5047
-+.globl sym_2_5048
-+sym_2_5048: la $2, sym_2_5048
-+.globl sym_2_5049
-+sym_2_5049: la $2, sym_2_5049
-+.globl sym_2_5050
-+sym_2_5050: la $2, sym_2_5050
-+.globl sym_2_5051
-+sym_2_5051: la $2, sym_2_5051
-+.globl sym_2_5052
-+sym_2_5052: la $2, sym_2_5052
-+.globl sym_2_5053
-+sym_2_5053: la $2, sym_2_5053
-+.globl sym_2_5054
-+sym_2_5054: la $2, sym_2_5054
-+.globl sym_2_5055
-+sym_2_5055: la $2, sym_2_5055
-+.globl sym_2_5056
-+sym_2_5056: la $2, sym_2_5056
-+.globl sym_2_5057
-+sym_2_5057: la $2, sym_2_5057
-+.globl sym_2_5058
-+sym_2_5058: la $2, sym_2_5058
-+.globl sym_2_5059
-+sym_2_5059: la $2, sym_2_5059
-+.globl sym_2_5060
-+sym_2_5060: la $2, sym_2_5060
-+.globl sym_2_5061
-+sym_2_5061: la $2, sym_2_5061
-+.globl sym_2_5062
-+sym_2_5062: la $2, sym_2_5062
-+.globl sym_2_5063
-+sym_2_5063: la $2, sym_2_5063
-+.globl sym_2_5064
-+sym_2_5064: la $2, sym_2_5064
-+.globl sym_2_5065
-+sym_2_5065: la $2, sym_2_5065
-+.globl sym_2_5066
-+sym_2_5066: la $2, sym_2_5066
-+.globl sym_2_5067
-+sym_2_5067: la $2, sym_2_5067
-+.globl sym_2_5068
-+sym_2_5068: la $2, sym_2_5068
-+.globl sym_2_5069
-+sym_2_5069: la $2, sym_2_5069
-+.globl sym_2_5070
-+sym_2_5070: la $2, sym_2_5070
-+.globl sym_2_5071
-+sym_2_5071: la $2, sym_2_5071
-+.globl sym_2_5072
-+sym_2_5072: la $2, sym_2_5072
-+.globl sym_2_5073
-+sym_2_5073: la $2, sym_2_5073
-+.globl sym_2_5074
-+sym_2_5074: la $2, sym_2_5074
-+.globl sym_2_5075
-+sym_2_5075: la $2, sym_2_5075
-+.globl sym_2_5076
-+sym_2_5076: la $2, sym_2_5076
-+.globl sym_2_5077
-+sym_2_5077: la $2, sym_2_5077
-+.globl sym_2_5078
-+sym_2_5078: la $2, sym_2_5078
-+.globl sym_2_5079
-+sym_2_5079: la $2, sym_2_5079
-+.globl sym_2_5080
-+sym_2_5080: la $2, sym_2_5080
-+.globl sym_2_5081
-+sym_2_5081: la $2, sym_2_5081
-+.globl sym_2_5082
-+sym_2_5082: la $2, sym_2_5082
-+.globl sym_2_5083
-+sym_2_5083: la $2, sym_2_5083
-+.globl sym_2_5084
-+sym_2_5084: la $2, sym_2_5084
-+.globl sym_2_5085
-+sym_2_5085: la $2, sym_2_5085
-+.globl sym_2_5086
-+sym_2_5086: la $2, sym_2_5086
-+.globl sym_2_5087
-+sym_2_5087: la $2, sym_2_5087
-+.globl sym_2_5088
-+sym_2_5088: la $2, sym_2_5088
-+.globl sym_2_5089
-+sym_2_5089: la $2, sym_2_5089
-+.globl sym_2_5090
-+sym_2_5090: la $2, sym_2_5090
-+.globl sym_2_5091
-+sym_2_5091: la $2, sym_2_5091
-+.globl sym_2_5092
-+sym_2_5092: la $2, sym_2_5092
-+.globl sym_2_5093
-+sym_2_5093: la $2, sym_2_5093
-+.globl sym_2_5094
-+sym_2_5094: la $2, sym_2_5094
-+.globl sym_2_5095
-+sym_2_5095: la $2, sym_2_5095
-+.globl sym_2_5096
-+sym_2_5096: la $2, sym_2_5096
-+.globl sym_2_5097
-+sym_2_5097: la $2, sym_2_5097
-+.globl sym_2_5098
-+sym_2_5098: la $2, sym_2_5098
-+.globl sym_2_5099
-+sym_2_5099: la $2, sym_2_5099
-+.globl sym_2_5100
-+sym_2_5100: la $2, sym_2_5100
-+.globl sym_2_5101
-+sym_2_5101: la $2, sym_2_5101
-+.globl sym_2_5102
-+sym_2_5102: la $2, sym_2_5102
-+.globl sym_2_5103
-+sym_2_5103: la $2, sym_2_5103
-+.globl sym_2_5104
-+sym_2_5104: la $2, sym_2_5104
-+.globl sym_2_5105
-+sym_2_5105: la $2, sym_2_5105
-+.globl sym_2_5106
-+sym_2_5106: la $2, sym_2_5106
-+.globl sym_2_5107
-+sym_2_5107: la $2, sym_2_5107
-+.globl sym_2_5108
-+sym_2_5108: la $2, sym_2_5108
-+.globl sym_2_5109
-+sym_2_5109: la $2, sym_2_5109
-+.globl sym_2_5110
-+sym_2_5110: la $2, sym_2_5110
-+.globl sym_2_5111
-+sym_2_5111: la $2, sym_2_5111
-+.globl sym_2_5112
-+sym_2_5112: la $2, sym_2_5112
-+.globl sym_2_5113
-+sym_2_5113: la $2, sym_2_5113
-+.globl sym_2_5114
-+sym_2_5114: la $2, sym_2_5114
-+.globl sym_2_5115
-+sym_2_5115: la $2, sym_2_5115
-+.globl sym_2_5116
-+sym_2_5116: la $2, sym_2_5116
-+.globl sym_2_5117
-+sym_2_5117: la $2, sym_2_5117
-+.globl sym_2_5118
-+sym_2_5118: la $2, sym_2_5118
-+.globl sym_2_5119
-+sym_2_5119: la $2, sym_2_5119
-+.globl sym_2_5120
-+sym_2_5120: la $2, sym_2_5120
-+.globl sym_2_5121
-+sym_2_5121: la $2, sym_2_5121
-+.globl sym_2_5122
-+sym_2_5122: la $2, sym_2_5122
-+.globl sym_2_5123
-+sym_2_5123: la $2, sym_2_5123
-+.globl sym_2_5124
-+sym_2_5124: la $2, sym_2_5124
-+.globl sym_2_5125
-+sym_2_5125: la $2, sym_2_5125
-+.globl sym_2_5126
-+sym_2_5126: la $2, sym_2_5126
-+.globl sym_2_5127
-+sym_2_5127: la $2, sym_2_5127
-+.globl sym_2_5128
-+sym_2_5128: la $2, sym_2_5128
-+.globl sym_2_5129
-+sym_2_5129: la $2, sym_2_5129
-+.globl sym_2_5130
-+sym_2_5130: la $2, sym_2_5130
-+.globl sym_2_5131
-+sym_2_5131: la $2, sym_2_5131
-+.globl sym_2_5132
-+sym_2_5132: la $2, sym_2_5132
-+.globl sym_2_5133
-+sym_2_5133: la $2, sym_2_5133
-+.globl sym_2_5134
-+sym_2_5134: la $2, sym_2_5134
-+.globl sym_2_5135
-+sym_2_5135: la $2, sym_2_5135
-+.globl sym_2_5136
-+sym_2_5136: la $2, sym_2_5136
-+.globl sym_2_5137
-+sym_2_5137: la $2, sym_2_5137
-+.globl sym_2_5138
-+sym_2_5138: la $2, sym_2_5138
-+.globl sym_2_5139
-+sym_2_5139: la $2, sym_2_5139
-+.globl sym_2_5140
-+sym_2_5140: la $2, sym_2_5140
-+.globl sym_2_5141
-+sym_2_5141: la $2, sym_2_5141
-+.globl sym_2_5142
-+sym_2_5142: la $2, sym_2_5142
-+.globl sym_2_5143
-+sym_2_5143: la $2, sym_2_5143
-+.globl sym_2_5144
-+sym_2_5144: la $2, sym_2_5144
-+.globl sym_2_5145
-+sym_2_5145: la $2, sym_2_5145
-+.globl sym_2_5146
-+sym_2_5146: la $2, sym_2_5146
-+.globl sym_2_5147
-+sym_2_5147: la $2, sym_2_5147
-+.globl sym_2_5148
-+sym_2_5148: la $2, sym_2_5148
-+.globl sym_2_5149
-+sym_2_5149: la $2, sym_2_5149
-+.globl sym_2_5150
-+sym_2_5150: la $2, sym_2_5150
-+.globl sym_2_5151
-+sym_2_5151: la $2, sym_2_5151
-+.globl sym_2_5152
-+sym_2_5152: la $2, sym_2_5152
-+.globl sym_2_5153
-+sym_2_5153: la $2, sym_2_5153
-+.globl sym_2_5154
-+sym_2_5154: la $2, sym_2_5154
-+.globl sym_2_5155
-+sym_2_5155: la $2, sym_2_5155
-+.globl sym_2_5156
-+sym_2_5156: la $2, sym_2_5156
-+.globl sym_2_5157
-+sym_2_5157: la $2, sym_2_5157
-+.globl sym_2_5158
-+sym_2_5158: la $2, sym_2_5158
-+.globl sym_2_5159
-+sym_2_5159: la $2, sym_2_5159
-+.globl sym_2_5160
-+sym_2_5160: la $2, sym_2_5160
-+.globl sym_2_5161
-+sym_2_5161: la $2, sym_2_5161
-+.globl sym_2_5162
-+sym_2_5162: la $2, sym_2_5162
-+.globl sym_2_5163
-+sym_2_5163: la $2, sym_2_5163
-+.globl sym_2_5164
-+sym_2_5164: la $2, sym_2_5164
-+.globl sym_2_5165
-+sym_2_5165: la $2, sym_2_5165
-+.globl sym_2_5166
-+sym_2_5166: la $2, sym_2_5166
-+.globl sym_2_5167
-+sym_2_5167: la $2, sym_2_5167
-+.globl sym_2_5168
-+sym_2_5168: la $2, sym_2_5168
-+.globl sym_2_5169
-+sym_2_5169: la $2, sym_2_5169
-+.globl sym_2_5170
-+sym_2_5170: la $2, sym_2_5170
-+.globl sym_2_5171
-+sym_2_5171: la $2, sym_2_5171
-+.globl sym_2_5172
-+sym_2_5172: la $2, sym_2_5172
-+.globl sym_2_5173
-+sym_2_5173: la $2, sym_2_5173
-+.globl sym_2_5174
-+sym_2_5174: la $2, sym_2_5174
-+.globl sym_2_5175
-+sym_2_5175: la $2, sym_2_5175
-+.globl sym_2_5176
-+sym_2_5176: la $2, sym_2_5176
-+.globl sym_2_5177
-+sym_2_5177: la $2, sym_2_5177
-+.globl sym_2_5178
-+sym_2_5178: la $2, sym_2_5178
-+.globl sym_2_5179
-+sym_2_5179: la $2, sym_2_5179
-+.globl sym_2_5180
-+sym_2_5180: la $2, sym_2_5180
-+.globl sym_2_5181
-+sym_2_5181: la $2, sym_2_5181
-+.globl sym_2_5182
-+sym_2_5182: la $2, sym_2_5182
-+.globl sym_2_5183
-+sym_2_5183: la $2, sym_2_5183
-+.globl sym_2_5184
-+sym_2_5184: la $2, sym_2_5184
-+.globl sym_2_5185
-+sym_2_5185: la $2, sym_2_5185
-+.globl sym_2_5186
-+sym_2_5186: la $2, sym_2_5186
-+.globl sym_2_5187
-+sym_2_5187: la $2, sym_2_5187
-+.globl sym_2_5188
-+sym_2_5188: la $2, sym_2_5188
-+.globl sym_2_5189
-+sym_2_5189: la $2, sym_2_5189
-+.globl sym_2_5190
-+sym_2_5190: la $2, sym_2_5190
-+.globl sym_2_5191
-+sym_2_5191: la $2, sym_2_5191
-+.globl sym_2_5192
-+sym_2_5192: la $2, sym_2_5192
-+.globl sym_2_5193
-+sym_2_5193: la $2, sym_2_5193
-+.globl sym_2_5194
-+sym_2_5194: la $2, sym_2_5194
-+.globl sym_2_5195
-+sym_2_5195: la $2, sym_2_5195
-+.globl sym_2_5196
-+sym_2_5196: la $2, sym_2_5196
-+.globl sym_2_5197
-+sym_2_5197: la $2, sym_2_5197
-+.globl sym_2_5198
-+sym_2_5198: la $2, sym_2_5198
-+.globl sym_2_5199
-+sym_2_5199: la $2, sym_2_5199
-+.globl sym_2_5200
-+sym_2_5200: la $2, sym_2_5200
-+.globl sym_2_5201
-+sym_2_5201: la $2, sym_2_5201
-+.globl sym_2_5202
-+sym_2_5202: la $2, sym_2_5202
-+.globl sym_2_5203
-+sym_2_5203: la $2, sym_2_5203
-+.globl sym_2_5204
-+sym_2_5204: la $2, sym_2_5204
-+.globl sym_2_5205
-+sym_2_5205: la $2, sym_2_5205
-+.globl sym_2_5206
-+sym_2_5206: la $2, sym_2_5206
-+.globl sym_2_5207
-+sym_2_5207: la $2, sym_2_5207
-+.globl sym_2_5208
-+sym_2_5208: la $2, sym_2_5208
-+.globl sym_2_5209
-+sym_2_5209: la $2, sym_2_5209
-+.globl sym_2_5210
-+sym_2_5210: la $2, sym_2_5210
-+.globl sym_2_5211
-+sym_2_5211: la $2, sym_2_5211
-+.globl sym_2_5212
-+sym_2_5212: la $2, sym_2_5212
-+.globl sym_2_5213
-+sym_2_5213: la $2, sym_2_5213
-+.globl sym_2_5214
-+sym_2_5214: la $2, sym_2_5214
-+.globl sym_2_5215
-+sym_2_5215: la $2, sym_2_5215
-+.globl sym_2_5216
-+sym_2_5216: la $2, sym_2_5216
-+.globl sym_2_5217
-+sym_2_5217: la $2, sym_2_5217
-+.globl sym_2_5218
-+sym_2_5218: la $2, sym_2_5218
-+.globl sym_2_5219
-+sym_2_5219: la $2, sym_2_5219
-+.globl sym_2_5220
-+sym_2_5220: la $2, sym_2_5220
-+.globl sym_2_5221
-+sym_2_5221: la $2, sym_2_5221
-+.globl sym_2_5222
-+sym_2_5222: la $2, sym_2_5222
-+.globl sym_2_5223
-+sym_2_5223: la $2, sym_2_5223
-+.globl sym_2_5224
-+sym_2_5224: la $2, sym_2_5224
-+.globl sym_2_5225
-+sym_2_5225: la $2, sym_2_5225
-+.globl sym_2_5226
-+sym_2_5226: la $2, sym_2_5226
-+.globl sym_2_5227
-+sym_2_5227: la $2, sym_2_5227
-+.globl sym_2_5228
-+sym_2_5228: la $2, sym_2_5228
-+.globl sym_2_5229
-+sym_2_5229: la $2, sym_2_5229
-+.globl sym_2_5230
-+sym_2_5230: la $2, sym_2_5230
-+.globl sym_2_5231
-+sym_2_5231: la $2, sym_2_5231
-+.globl sym_2_5232
-+sym_2_5232: la $2, sym_2_5232
-+.globl sym_2_5233
-+sym_2_5233: la $2, sym_2_5233
-+.globl sym_2_5234
-+sym_2_5234: la $2, sym_2_5234
-+.globl sym_2_5235
-+sym_2_5235: la $2, sym_2_5235
-+.globl sym_2_5236
-+sym_2_5236: la $2, sym_2_5236
-+.globl sym_2_5237
-+sym_2_5237: la $2, sym_2_5237
-+.globl sym_2_5238
-+sym_2_5238: la $2, sym_2_5238
-+.globl sym_2_5239
-+sym_2_5239: la $2, sym_2_5239
-+.globl sym_2_5240
-+sym_2_5240: la $2, sym_2_5240
-+.globl sym_2_5241
-+sym_2_5241: la $2, sym_2_5241
-+.globl sym_2_5242
-+sym_2_5242: la $2, sym_2_5242
-+.globl sym_2_5243
-+sym_2_5243: la $2, sym_2_5243
-+.globl sym_2_5244
-+sym_2_5244: la $2, sym_2_5244
-+.globl sym_2_5245
-+sym_2_5245: la $2, sym_2_5245
-+.globl sym_2_5246
-+sym_2_5246: la $2, sym_2_5246
-+.globl sym_2_5247
-+sym_2_5247: la $2, sym_2_5247
-+.globl sym_2_5248
-+sym_2_5248: la $2, sym_2_5248
-+.globl sym_2_5249
-+sym_2_5249: la $2, sym_2_5249
-+.globl sym_2_5250
-+sym_2_5250: la $2, sym_2_5250
-+.globl sym_2_5251
-+sym_2_5251: la $2, sym_2_5251
-+.globl sym_2_5252
-+sym_2_5252: la $2, sym_2_5252
-+.globl sym_2_5253
-+sym_2_5253: la $2, sym_2_5253
-+.globl sym_2_5254
-+sym_2_5254: la $2, sym_2_5254
-+.globl sym_2_5255
-+sym_2_5255: la $2, sym_2_5255
-+.globl sym_2_5256
-+sym_2_5256: la $2, sym_2_5256
-+.globl sym_2_5257
-+sym_2_5257: la $2, sym_2_5257
-+.globl sym_2_5258
-+sym_2_5258: la $2, sym_2_5258
-+.globl sym_2_5259
-+sym_2_5259: la $2, sym_2_5259
-+.globl sym_2_5260
-+sym_2_5260: la $2, sym_2_5260
-+.globl sym_2_5261
-+sym_2_5261: la $2, sym_2_5261
-+.globl sym_2_5262
-+sym_2_5262: la $2, sym_2_5262
-+.globl sym_2_5263
-+sym_2_5263: la $2, sym_2_5263
-+.globl sym_2_5264
-+sym_2_5264: la $2, sym_2_5264
-+.globl sym_2_5265
-+sym_2_5265: la $2, sym_2_5265
-+.globl sym_2_5266
-+sym_2_5266: la $2, sym_2_5266
-+.globl sym_2_5267
-+sym_2_5267: la $2, sym_2_5267
-+.globl sym_2_5268
-+sym_2_5268: la $2, sym_2_5268
-+.globl sym_2_5269
-+sym_2_5269: la $2, sym_2_5269
-+.globl sym_2_5270
-+sym_2_5270: la $2, sym_2_5270
-+.globl sym_2_5271
-+sym_2_5271: la $2, sym_2_5271
-+.globl sym_2_5272
-+sym_2_5272: la $2, sym_2_5272
-+.globl sym_2_5273
-+sym_2_5273: la $2, sym_2_5273
-+.globl sym_2_5274
-+sym_2_5274: la $2, sym_2_5274
-+.globl sym_2_5275
-+sym_2_5275: la $2, sym_2_5275
-+.globl sym_2_5276
-+sym_2_5276: la $2, sym_2_5276
-+.globl sym_2_5277
-+sym_2_5277: la $2, sym_2_5277
-+.globl sym_2_5278
-+sym_2_5278: la $2, sym_2_5278
-+.globl sym_2_5279
-+sym_2_5279: la $2, sym_2_5279
-+.globl sym_2_5280
-+sym_2_5280: la $2, sym_2_5280
-+.globl sym_2_5281
-+sym_2_5281: la $2, sym_2_5281
-+.globl sym_2_5282
-+sym_2_5282: la $2, sym_2_5282
-+.globl sym_2_5283
-+sym_2_5283: la $2, sym_2_5283
-+.globl sym_2_5284
-+sym_2_5284: la $2, sym_2_5284
-+.globl sym_2_5285
-+sym_2_5285: la $2, sym_2_5285
-+.globl sym_2_5286
-+sym_2_5286: la $2, sym_2_5286
-+.globl sym_2_5287
-+sym_2_5287: la $2, sym_2_5287
-+.globl sym_2_5288
-+sym_2_5288: la $2, sym_2_5288
-+.globl sym_2_5289
-+sym_2_5289: la $2, sym_2_5289
-+.globl sym_2_5290
-+sym_2_5290: la $2, sym_2_5290
-+.globl sym_2_5291
-+sym_2_5291: la $2, sym_2_5291
-+.globl sym_2_5292
-+sym_2_5292: la $2, sym_2_5292
-+.globl sym_2_5293
-+sym_2_5293: la $2, sym_2_5293
-+.globl sym_2_5294
-+sym_2_5294: la $2, sym_2_5294
-+.globl sym_2_5295
-+sym_2_5295: la $2, sym_2_5295
-+.globl sym_2_5296
-+sym_2_5296: la $2, sym_2_5296
-+.globl sym_2_5297
-+sym_2_5297: la $2, sym_2_5297
-+.globl sym_2_5298
-+sym_2_5298: la $2, sym_2_5298
-+.globl sym_2_5299
-+sym_2_5299: la $2, sym_2_5299
-+.globl sym_2_5300
-+sym_2_5300: la $2, sym_2_5300
-+.globl sym_2_5301
-+sym_2_5301: la $2, sym_2_5301
-+.globl sym_2_5302
-+sym_2_5302: la $2, sym_2_5302
-+.globl sym_2_5303
-+sym_2_5303: la $2, sym_2_5303
-+.globl sym_2_5304
-+sym_2_5304: la $2, sym_2_5304
-+.globl sym_2_5305
-+sym_2_5305: la $2, sym_2_5305
-+.globl sym_2_5306
-+sym_2_5306: la $2, sym_2_5306
-+.globl sym_2_5307
-+sym_2_5307: la $2, sym_2_5307
-+.globl sym_2_5308
-+sym_2_5308: la $2, sym_2_5308
-+.globl sym_2_5309
-+sym_2_5309: la $2, sym_2_5309
-+.globl sym_2_5310
-+sym_2_5310: la $2, sym_2_5310
-+.globl sym_2_5311
-+sym_2_5311: la $2, sym_2_5311
-+.globl sym_2_5312
-+sym_2_5312: la $2, sym_2_5312
-+.globl sym_2_5313
-+sym_2_5313: la $2, sym_2_5313
-+.globl sym_2_5314
-+sym_2_5314: la $2, sym_2_5314
-+.globl sym_2_5315
-+sym_2_5315: la $2, sym_2_5315
-+.globl sym_2_5316
-+sym_2_5316: la $2, sym_2_5316
-+.globl sym_2_5317
-+sym_2_5317: la $2, sym_2_5317
-+.globl sym_2_5318
-+sym_2_5318: la $2, sym_2_5318
-+.globl sym_2_5319
-+sym_2_5319: la $2, sym_2_5319
-+.globl sym_2_5320
-+sym_2_5320: la $2, sym_2_5320
-+.globl sym_2_5321
-+sym_2_5321: la $2, sym_2_5321
-+.globl sym_2_5322
-+sym_2_5322: la $2, sym_2_5322
-+.globl sym_2_5323
-+sym_2_5323: la $2, sym_2_5323
-+.globl sym_2_5324
-+sym_2_5324: la $2, sym_2_5324
-+.globl sym_2_5325
-+sym_2_5325: la $2, sym_2_5325
-+.globl sym_2_5326
-+sym_2_5326: la $2, sym_2_5326
-+.globl sym_2_5327
-+sym_2_5327: la $2, sym_2_5327
-+.globl sym_2_5328
-+sym_2_5328: la $2, sym_2_5328
-+.globl sym_2_5329
-+sym_2_5329: la $2, sym_2_5329
-+.globl sym_2_5330
-+sym_2_5330: la $2, sym_2_5330
-+.globl sym_2_5331
-+sym_2_5331: la $2, sym_2_5331
-+.globl sym_2_5332
-+sym_2_5332: la $2, sym_2_5332
-+.globl sym_2_5333
-+sym_2_5333: la $2, sym_2_5333
-+.globl sym_2_5334
-+sym_2_5334: la $2, sym_2_5334
-+.globl sym_2_5335
-+sym_2_5335: la $2, sym_2_5335
-+.globl sym_2_5336
-+sym_2_5336: la $2, sym_2_5336
-+.globl sym_2_5337
-+sym_2_5337: la $2, sym_2_5337
-+.globl sym_2_5338
-+sym_2_5338: la $2, sym_2_5338
-+.globl sym_2_5339
-+sym_2_5339: la $2, sym_2_5339
-+.globl sym_2_5340
-+sym_2_5340: la $2, sym_2_5340
-+.globl sym_2_5341
-+sym_2_5341: la $2, sym_2_5341
-+.globl sym_2_5342
-+sym_2_5342: la $2, sym_2_5342
-+.globl sym_2_5343
-+sym_2_5343: la $2, sym_2_5343
-+.globl sym_2_5344
-+sym_2_5344: la $2, sym_2_5344
-+.globl sym_2_5345
-+sym_2_5345: la $2, sym_2_5345
-+.globl sym_2_5346
-+sym_2_5346: la $2, sym_2_5346
-+.globl sym_2_5347
-+sym_2_5347: la $2, sym_2_5347
-+.globl sym_2_5348
-+sym_2_5348: la $2, sym_2_5348
-+.globl sym_2_5349
-+sym_2_5349: la $2, sym_2_5349
-+.globl sym_2_5350
-+sym_2_5350: la $2, sym_2_5350
-+.globl sym_2_5351
-+sym_2_5351: la $2, sym_2_5351
-+.globl sym_2_5352
-+sym_2_5352: la $2, sym_2_5352
-+.globl sym_2_5353
-+sym_2_5353: la $2, sym_2_5353
-+.globl sym_2_5354
-+sym_2_5354: la $2, sym_2_5354
-+.globl sym_2_5355
-+sym_2_5355: la $2, sym_2_5355
-+.globl sym_2_5356
-+sym_2_5356: la $2, sym_2_5356
-+.globl sym_2_5357
-+sym_2_5357: la $2, sym_2_5357
-+.globl sym_2_5358
-+sym_2_5358: la $2, sym_2_5358
-+.globl sym_2_5359
-+sym_2_5359: la $2, sym_2_5359
-+.globl sym_2_5360
-+sym_2_5360: la $2, sym_2_5360
-+.globl sym_2_5361
-+sym_2_5361: la $2, sym_2_5361
-+.globl sym_2_5362
-+sym_2_5362: la $2, sym_2_5362
-+.globl sym_2_5363
-+sym_2_5363: la $2, sym_2_5363
-+.globl sym_2_5364
-+sym_2_5364: la $2, sym_2_5364
-+.globl sym_2_5365
-+sym_2_5365: la $2, sym_2_5365
-+.globl sym_2_5366
-+sym_2_5366: la $2, sym_2_5366
-+.globl sym_2_5367
-+sym_2_5367: la $2, sym_2_5367
-+.globl sym_2_5368
-+sym_2_5368: la $2, sym_2_5368
-+.globl sym_2_5369
-+sym_2_5369: la $2, sym_2_5369
-+.globl sym_2_5370
-+sym_2_5370: la $2, sym_2_5370
-+.globl sym_2_5371
-+sym_2_5371: la $2, sym_2_5371
-+.globl sym_2_5372
-+sym_2_5372: la $2, sym_2_5372
-+.globl sym_2_5373
-+sym_2_5373: la $2, sym_2_5373
-+.globl sym_2_5374
-+sym_2_5374: la $2, sym_2_5374
-+.globl sym_2_5375
-+sym_2_5375: la $2, sym_2_5375
-+.globl sym_2_5376
-+sym_2_5376: la $2, sym_2_5376
-+.globl sym_2_5377
-+sym_2_5377: la $2, sym_2_5377
-+.globl sym_2_5378
-+sym_2_5378: la $2, sym_2_5378
-+.globl sym_2_5379
-+sym_2_5379: la $2, sym_2_5379
-+.globl sym_2_5380
-+sym_2_5380: la $2, sym_2_5380
-+.globl sym_2_5381
-+sym_2_5381: la $2, sym_2_5381
-+.globl sym_2_5382
-+sym_2_5382: la $2, sym_2_5382
-+.globl sym_2_5383
-+sym_2_5383: la $2, sym_2_5383
-+.globl sym_2_5384
-+sym_2_5384: la $2, sym_2_5384
-+.globl sym_2_5385
-+sym_2_5385: la $2, sym_2_5385
-+.globl sym_2_5386
-+sym_2_5386: la $2, sym_2_5386
-+.globl sym_2_5387
-+sym_2_5387: la $2, sym_2_5387
-+.globl sym_2_5388
-+sym_2_5388: la $2, sym_2_5388
-+.globl sym_2_5389
-+sym_2_5389: la $2, sym_2_5389
-+.globl sym_2_5390
-+sym_2_5390: la $2, sym_2_5390
-+.globl sym_2_5391
-+sym_2_5391: la $2, sym_2_5391
-+.globl sym_2_5392
-+sym_2_5392: la $2, sym_2_5392
-+.globl sym_2_5393
-+sym_2_5393: la $2, sym_2_5393
-+.globl sym_2_5394
-+sym_2_5394: la $2, sym_2_5394
-+.globl sym_2_5395
-+sym_2_5395: la $2, sym_2_5395
-+.globl sym_2_5396
-+sym_2_5396: la $2, sym_2_5396
-+.globl sym_2_5397
-+sym_2_5397: la $2, sym_2_5397
-+.globl sym_2_5398
-+sym_2_5398: la $2, sym_2_5398
-+.globl sym_2_5399
-+sym_2_5399: la $2, sym_2_5399
-+.globl sym_2_5400
-+sym_2_5400: la $2, sym_2_5400
-+.globl sym_2_5401
-+sym_2_5401: la $2, sym_2_5401
-+.globl sym_2_5402
-+sym_2_5402: la $2, sym_2_5402
-+.globl sym_2_5403
-+sym_2_5403: la $2, sym_2_5403
-+.globl sym_2_5404
-+sym_2_5404: la $2, sym_2_5404
-+.globl sym_2_5405
-+sym_2_5405: la $2, sym_2_5405
-+.globl sym_2_5406
-+sym_2_5406: la $2, sym_2_5406
-+.globl sym_2_5407
-+sym_2_5407: la $2, sym_2_5407
-+.globl sym_2_5408
-+sym_2_5408: la $2, sym_2_5408
-+.globl sym_2_5409
-+sym_2_5409: la $2, sym_2_5409
-+.globl sym_2_5410
-+sym_2_5410: la $2, sym_2_5410
-+.globl sym_2_5411
-+sym_2_5411: la $2, sym_2_5411
-+.globl sym_2_5412
-+sym_2_5412: la $2, sym_2_5412
-+.globl sym_2_5413
-+sym_2_5413: la $2, sym_2_5413
-+.globl sym_2_5414
-+sym_2_5414: la $2, sym_2_5414
-+.globl sym_2_5415
-+sym_2_5415: la $2, sym_2_5415
-+.globl sym_2_5416
-+sym_2_5416: la $2, sym_2_5416
-+.globl sym_2_5417
-+sym_2_5417: la $2, sym_2_5417
-+.globl sym_2_5418
-+sym_2_5418: la $2, sym_2_5418
-+.globl sym_2_5419
-+sym_2_5419: la $2, sym_2_5419
-+.globl sym_2_5420
-+sym_2_5420: la $2, sym_2_5420
-+.globl sym_2_5421
-+sym_2_5421: la $2, sym_2_5421
-+.globl sym_2_5422
-+sym_2_5422: la $2, sym_2_5422
-+.globl sym_2_5423
-+sym_2_5423: la $2, sym_2_5423
-+.globl sym_2_5424
-+sym_2_5424: la $2, sym_2_5424
-+.globl sym_2_5425
-+sym_2_5425: la $2, sym_2_5425
-+.globl sym_2_5426
-+sym_2_5426: la $2, sym_2_5426
-+.globl sym_2_5427
-+sym_2_5427: la $2, sym_2_5427
-+.globl sym_2_5428
-+sym_2_5428: la $2, sym_2_5428
-+.globl sym_2_5429
-+sym_2_5429: la $2, sym_2_5429
-+.globl sym_2_5430
-+sym_2_5430: la $2, sym_2_5430
-+.globl sym_2_5431
-+sym_2_5431: la $2, sym_2_5431
-+.globl sym_2_5432
-+sym_2_5432: la $2, sym_2_5432
-+.globl sym_2_5433
-+sym_2_5433: la $2, sym_2_5433
-+.globl sym_2_5434
-+sym_2_5434: la $2, sym_2_5434
-+.globl sym_2_5435
-+sym_2_5435: la $2, sym_2_5435
-+.globl sym_2_5436
-+sym_2_5436: la $2, sym_2_5436
-+.globl sym_2_5437
-+sym_2_5437: la $2, sym_2_5437
-+.globl sym_2_5438
-+sym_2_5438: la $2, sym_2_5438
-+.globl sym_2_5439
-+sym_2_5439: la $2, sym_2_5439
-+.globl sym_2_5440
-+sym_2_5440: la $2, sym_2_5440
-+.globl sym_2_5441
-+sym_2_5441: la $2, sym_2_5441
-+.globl sym_2_5442
-+sym_2_5442: la $2, sym_2_5442
-+.globl sym_2_5443
-+sym_2_5443: la $2, sym_2_5443
-+.globl sym_2_5444
-+sym_2_5444: la $2, sym_2_5444
-+.globl sym_2_5445
-+sym_2_5445: la $2, sym_2_5445
-+.globl sym_2_5446
-+sym_2_5446: la $2, sym_2_5446
-+.globl sym_2_5447
-+sym_2_5447: la $2, sym_2_5447
-+.globl sym_2_5448
-+sym_2_5448: la $2, sym_2_5448
-+.globl sym_2_5449
-+sym_2_5449: la $2, sym_2_5449
-+.globl sym_2_5450
-+sym_2_5450: la $2, sym_2_5450
-+.globl sym_2_5451
-+sym_2_5451: la $2, sym_2_5451
-+.globl sym_2_5452
-+sym_2_5452: la $2, sym_2_5452
-+.globl sym_2_5453
-+sym_2_5453: la $2, sym_2_5453
-+.globl sym_2_5454
-+sym_2_5454: la $2, sym_2_5454
-+.globl sym_2_5455
-+sym_2_5455: la $2, sym_2_5455
-+.globl sym_2_5456
-+sym_2_5456: la $2, sym_2_5456
-+.globl sym_2_5457
-+sym_2_5457: la $2, sym_2_5457
-+.globl sym_2_5458
-+sym_2_5458: la $2, sym_2_5458
-+.globl sym_2_5459
-+sym_2_5459: la $2, sym_2_5459
-+.globl sym_2_5460
-+sym_2_5460: la $2, sym_2_5460
-+.globl sym_2_5461
-+sym_2_5461: la $2, sym_2_5461
-+.globl sym_2_5462
-+sym_2_5462: la $2, sym_2_5462
-+.globl sym_2_5463
-+sym_2_5463: la $2, sym_2_5463
-+.globl sym_2_5464
-+sym_2_5464: la $2, sym_2_5464
-+.globl sym_2_5465
-+sym_2_5465: la $2, sym_2_5465
-+.globl sym_2_5466
-+sym_2_5466: la $2, sym_2_5466
-+.globl sym_2_5467
-+sym_2_5467: la $2, sym_2_5467
-+.globl sym_2_5468
-+sym_2_5468: la $2, sym_2_5468
-+.globl sym_2_5469
-+sym_2_5469: la $2, sym_2_5469
-+.globl sym_2_5470
-+sym_2_5470: la $2, sym_2_5470
-+.globl sym_2_5471
-+sym_2_5471: la $2, sym_2_5471
-+.globl sym_2_5472
-+sym_2_5472: la $2, sym_2_5472
-+.globl sym_2_5473
-+sym_2_5473: la $2, sym_2_5473
-+.globl sym_2_5474
-+sym_2_5474: la $2, sym_2_5474
-+.globl sym_2_5475
-+sym_2_5475: la $2, sym_2_5475
-+.globl sym_2_5476
-+sym_2_5476: la $2, sym_2_5476
-+.globl sym_2_5477
-+sym_2_5477: la $2, sym_2_5477
-+.globl sym_2_5478
-+sym_2_5478: la $2, sym_2_5478
-+.globl sym_2_5479
-+sym_2_5479: la $2, sym_2_5479
-+.globl sym_2_5480
-+sym_2_5480: la $2, sym_2_5480
-+.globl sym_2_5481
-+sym_2_5481: la $2, sym_2_5481
-+.globl sym_2_5482
-+sym_2_5482: la $2, sym_2_5482
-+.globl sym_2_5483
-+sym_2_5483: la $2, sym_2_5483
-+.globl sym_2_5484
-+sym_2_5484: la $2, sym_2_5484
-+.globl sym_2_5485
-+sym_2_5485: la $2, sym_2_5485
-+.globl sym_2_5486
-+sym_2_5486: la $2, sym_2_5486
-+.globl sym_2_5487
-+sym_2_5487: la $2, sym_2_5487
-+.globl sym_2_5488
-+sym_2_5488: la $2, sym_2_5488
-+.globl sym_2_5489
-+sym_2_5489: la $2, sym_2_5489
-+.globl sym_2_5490
-+sym_2_5490: la $2, sym_2_5490
-+.globl sym_2_5491
-+sym_2_5491: la $2, sym_2_5491
-+.globl sym_2_5492
-+sym_2_5492: la $2, sym_2_5492
-+.globl sym_2_5493
-+sym_2_5493: la $2, sym_2_5493
-+.globl sym_2_5494
-+sym_2_5494: la $2, sym_2_5494
-+.globl sym_2_5495
-+sym_2_5495: la $2, sym_2_5495
-+.globl sym_2_5496
-+sym_2_5496: la $2, sym_2_5496
-+.globl sym_2_5497
-+sym_2_5497: la $2, sym_2_5497
-+.globl sym_2_5498
-+sym_2_5498: la $2, sym_2_5498
-+.globl sym_2_5499
-+sym_2_5499: la $2, sym_2_5499
-+.globl sym_2_5500
-+sym_2_5500: la $2, sym_2_5500
-+.globl sym_2_5501
-+sym_2_5501: la $2, sym_2_5501
-+.globl sym_2_5502
-+sym_2_5502: la $2, sym_2_5502
-+.globl sym_2_5503
-+sym_2_5503: la $2, sym_2_5503
-+.globl sym_2_5504
-+sym_2_5504: la $2, sym_2_5504
-+.globl sym_2_5505
-+sym_2_5505: la $2, sym_2_5505
-+.globl sym_2_5506
-+sym_2_5506: la $2, sym_2_5506
-+.globl sym_2_5507
-+sym_2_5507: la $2, sym_2_5507
-+.globl sym_2_5508
-+sym_2_5508: la $2, sym_2_5508
-+.globl sym_2_5509
-+sym_2_5509: la $2, sym_2_5509
-+.globl sym_2_5510
-+sym_2_5510: la $2, sym_2_5510
-+.globl sym_2_5511
-+sym_2_5511: la $2, sym_2_5511
-+.globl sym_2_5512
-+sym_2_5512: la $2, sym_2_5512
-+.globl sym_2_5513
-+sym_2_5513: la $2, sym_2_5513
-+.globl sym_2_5514
-+sym_2_5514: la $2, sym_2_5514
-+.globl sym_2_5515
-+sym_2_5515: la $2, sym_2_5515
-+.globl sym_2_5516
-+sym_2_5516: la $2, sym_2_5516
-+.globl sym_2_5517
-+sym_2_5517: la $2, sym_2_5517
-+.globl sym_2_5518
-+sym_2_5518: la $2, sym_2_5518
-+.globl sym_2_5519
-+sym_2_5519: la $2, sym_2_5519
-+.globl sym_2_5520
-+sym_2_5520: la $2, sym_2_5520
-+.globl sym_2_5521
-+sym_2_5521: la $2, sym_2_5521
-+.globl sym_2_5522
-+sym_2_5522: la $2, sym_2_5522
-+.globl sym_2_5523
-+sym_2_5523: la $2, sym_2_5523
-+.globl sym_2_5524
-+sym_2_5524: la $2, sym_2_5524
-+.globl sym_2_5525
-+sym_2_5525: la $2, sym_2_5525
-+.globl sym_2_5526
-+sym_2_5526: la $2, sym_2_5526
-+.globl sym_2_5527
-+sym_2_5527: la $2, sym_2_5527
-+.globl sym_2_5528
-+sym_2_5528: la $2, sym_2_5528
-+.globl sym_2_5529
-+sym_2_5529: la $2, sym_2_5529
-+.globl sym_2_5530
-+sym_2_5530: la $2, sym_2_5530
-+.globl sym_2_5531
-+sym_2_5531: la $2, sym_2_5531
-+.globl sym_2_5532
-+sym_2_5532: la $2, sym_2_5532
-+.globl sym_2_5533
-+sym_2_5533: la $2, sym_2_5533
-+.globl sym_2_5534
-+sym_2_5534: la $2, sym_2_5534
-+.globl sym_2_5535
-+sym_2_5535: la $2, sym_2_5535
-+.globl sym_2_5536
-+sym_2_5536: la $2, sym_2_5536
-+.globl sym_2_5537
-+sym_2_5537: la $2, sym_2_5537
-+.globl sym_2_5538
-+sym_2_5538: la $2, sym_2_5538
-+.globl sym_2_5539
-+sym_2_5539: la $2, sym_2_5539
-+.globl sym_2_5540
-+sym_2_5540: la $2, sym_2_5540
-+.globl sym_2_5541
-+sym_2_5541: la $2, sym_2_5541
-+.globl sym_2_5542
-+sym_2_5542: la $2, sym_2_5542
-+.globl sym_2_5543
-+sym_2_5543: la $2, sym_2_5543
-+.globl sym_2_5544
-+sym_2_5544: la $2, sym_2_5544
-+.globl sym_2_5545
-+sym_2_5545: la $2, sym_2_5545
-+.globl sym_2_5546
-+sym_2_5546: la $2, sym_2_5546
-+.globl sym_2_5547
-+sym_2_5547: la $2, sym_2_5547
-+.globl sym_2_5548
-+sym_2_5548: la $2, sym_2_5548
-+.globl sym_2_5549
-+sym_2_5549: la $2, sym_2_5549
-+.globl sym_2_5550
-+sym_2_5550: la $2, sym_2_5550
-+.globl sym_2_5551
-+sym_2_5551: la $2, sym_2_5551
-+.globl sym_2_5552
-+sym_2_5552: la $2, sym_2_5552
-+.globl sym_2_5553
-+sym_2_5553: la $2, sym_2_5553
-+.globl sym_2_5554
-+sym_2_5554: la $2, sym_2_5554
-+.globl sym_2_5555
-+sym_2_5555: la $2, sym_2_5555
-+.globl sym_2_5556
-+sym_2_5556: la $2, sym_2_5556
-+.globl sym_2_5557
-+sym_2_5557: la $2, sym_2_5557
-+.globl sym_2_5558
-+sym_2_5558: la $2, sym_2_5558
-+.globl sym_2_5559
-+sym_2_5559: la $2, sym_2_5559
-+.globl sym_2_5560
-+sym_2_5560: la $2, sym_2_5560
-+.globl sym_2_5561
-+sym_2_5561: la $2, sym_2_5561
-+.globl sym_2_5562
-+sym_2_5562: la $2, sym_2_5562
-+.globl sym_2_5563
-+sym_2_5563: la $2, sym_2_5563
-+.globl sym_2_5564
-+sym_2_5564: la $2, sym_2_5564
-+.globl sym_2_5565
-+sym_2_5565: la $2, sym_2_5565
-+.globl sym_2_5566
-+sym_2_5566: la $2, sym_2_5566
-+.globl sym_2_5567
-+sym_2_5567: la $2, sym_2_5567
-+.globl sym_2_5568
-+sym_2_5568: la $2, sym_2_5568
-+.globl sym_2_5569
-+sym_2_5569: la $2, sym_2_5569
-+.globl sym_2_5570
-+sym_2_5570: la $2, sym_2_5570
-+.globl sym_2_5571
-+sym_2_5571: la $2, sym_2_5571
-+.globl sym_2_5572
-+sym_2_5572: la $2, sym_2_5572
-+.globl sym_2_5573
-+sym_2_5573: la $2, sym_2_5573
-+.globl sym_2_5574
-+sym_2_5574: la $2, sym_2_5574
-+.globl sym_2_5575
-+sym_2_5575: la $2, sym_2_5575
-+.globl sym_2_5576
-+sym_2_5576: la $2, sym_2_5576
-+.globl sym_2_5577
-+sym_2_5577: la $2, sym_2_5577
-+.globl sym_2_5578
-+sym_2_5578: la $2, sym_2_5578
-+.globl sym_2_5579
-+sym_2_5579: la $2, sym_2_5579
-+.globl sym_2_5580
-+sym_2_5580: la $2, sym_2_5580
-+.globl sym_2_5581
-+sym_2_5581: la $2, sym_2_5581
-+.globl sym_2_5582
-+sym_2_5582: la $2, sym_2_5582
-+.globl sym_2_5583
-+sym_2_5583: la $2, sym_2_5583
-+.globl sym_2_5584
-+sym_2_5584: la $2, sym_2_5584
-+.globl sym_2_5585
-+sym_2_5585: la $2, sym_2_5585
-+.globl sym_2_5586
-+sym_2_5586: la $2, sym_2_5586
-+.globl sym_2_5587
-+sym_2_5587: la $2, sym_2_5587
-+.globl sym_2_5588
-+sym_2_5588: la $2, sym_2_5588
-+.globl sym_2_5589
-+sym_2_5589: la $2, sym_2_5589
-+.globl sym_2_5590
-+sym_2_5590: la $2, sym_2_5590
-+.globl sym_2_5591
-+sym_2_5591: la $2, sym_2_5591
-+.globl sym_2_5592
-+sym_2_5592: la $2, sym_2_5592
-+.globl sym_2_5593
-+sym_2_5593: la $2, sym_2_5593
-+.globl sym_2_5594
-+sym_2_5594: la $2, sym_2_5594
-+.globl sym_2_5595
-+sym_2_5595: la $2, sym_2_5595
-+.globl sym_2_5596
-+sym_2_5596: la $2, sym_2_5596
-+.globl sym_2_5597
-+sym_2_5597: la $2, sym_2_5597
-+.globl sym_2_5598
-+sym_2_5598: la $2, sym_2_5598
-+.globl sym_2_5599
-+sym_2_5599: la $2, sym_2_5599
-+.globl sym_2_5600
-+sym_2_5600: la $2, sym_2_5600
-+.globl sym_2_5601
-+sym_2_5601: la $2, sym_2_5601
-+.globl sym_2_5602
-+sym_2_5602: la $2, sym_2_5602
-+.globl sym_2_5603
-+sym_2_5603: la $2, sym_2_5603
-+.globl sym_2_5604
-+sym_2_5604: la $2, sym_2_5604
-+.globl sym_2_5605
-+sym_2_5605: la $2, sym_2_5605
-+.globl sym_2_5606
-+sym_2_5606: la $2, sym_2_5606
-+.globl sym_2_5607
-+sym_2_5607: la $2, sym_2_5607
-+.globl sym_2_5608
-+sym_2_5608: la $2, sym_2_5608
-+.globl sym_2_5609
-+sym_2_5609: la $2, sym_2_5609
-+.globl sym_2_5610
-+sym_2_5610: la $2, sym_2_5610
-+.globl sym_2_5611
-+sym_2_5611: la $2, sym_2_5611
-+.globl sym_2_5612
-+sym_2_5612: la $2, sym_2_5612
-+.globl sym_2_5613
-+sym_2_5613: la $2, sym_2_5613
-+.globl sym_2_5614
-+sym_2_5614: la $2, sym_2_5614
-+.globl sym_2_5615
-+sym_2_5615: la $2, sym_2_5615
-+.globl sym_2_5616
-+sym_2_5616: la $2, sym_2_5616
-+.globl sym_2_5617
-+sym_2_5617: la $2, sym_2_5617
-+.globl sym_2_5618
-+sym_2_5618: la $2, sym_2_5618
-+.globl sym_2_5619
-+sym_2_5619: la $2, sym_2_5619
-+.globl sym_2_5620
-+sym_2_5620: la $2, sym_2_5620
-+.globl sym_2_5621
-+sym_2_5621: la $2, sym_2_5621
-+.globl sym_2_5622
-+sym_2_5622: la $2, sym_2_5622
-+.globl sym_2_5623
-+sym_2_5623: la $2, sym_2_5623
-+.globl sym_2_5624
-+sym_2_5624: la $2, sym_2_5624
-+.globl sym_2_5625
-+sym_2_5625: la $2, sym_2_5625
-+.globl sym_2_5626
-+sym_2_5626: la $2, sym_2_5626
-+.globl sym_2_5627
-+sym_2_5627: la $2, sym_2_5627
-+.globl sym_2_5628
-+sym_2_5628: la $2, sym_2_5628
-+.globl sym_2_5629
-+sym_2_5629: la $2, sym_2_5629
-+.globl sym_2_5630
-+sym_2_5630: la $2, sym_2_5630
-+.globl sym_2_5631
-+sym_2_5631: la $2, sym_2_5631
-+.globl sym_2_5632
-+sym_2_5632: la $2, sym_2_5632
-+.globl sym_2_5633
-+sym_2_5633: la $2, sym_2_5633
-+.globl sym_2_5634
-+sym_2_5634: la $2, sym_2_5634
-+.globl sym_2_5635
-+sym_2_5635: la $2, sym_2_5635
-+.globl sym_2_5636
-+sym_2_5636: la $2, sym_2_5636
-+.globl sym_2_5637
-+sym_2_5637: la $2, sym_2_5637
-+.globl sym_2_5638
-+sym_2_5638: la $2, sym_2_5638
-+.globl sym_2_5639
-+sym_2_5639: la $2, sym_2_5639
-+.globl sym_2_5640
-+sym_2_5640: la $2, sym_2_5640
-+.globl sym_2_5641
-+sym_2_5641: la $2, sym_2_5641
-+.globl sym_2_5642
-+sym_2_5642: la $2, sym_2_5642
-+.globl sym_2_5643
-+sym_2_5643: la $2, sym_2_5643
-+.globl sym_2_5644
-+sym_2_5644: la $2, sym_2_5644
-+.globl sym_2_5645
-+sym_2_5645: la $2, sym_2_5645
-+.globl sym_2_5646
-+sym_2_5646: la $2, sym_2_5646
-+.globl sym_2_5647
-+sym_2_5647: la $2, sym_2_5647
-+.globl sym_2_5648
-+sym_2_5648: la $2, sym_2_5648
-+.globl sym_2_5649
-+sym_2_5649: la $2, sym_2_5649
-+.globl sym_2_5650
-+sym_2_5650: la $2, sym_2_5650
-+.globl sym_2_5651
-+sym_2_5651: la $2, sym_2_5651
-+.globl sym_2_5652
-+sym_2_5652: la $2, sym_2_5652
-+.globl sym_2_5653
-+sym_2_5653: la $2, sym_2_5653
-+.globl sym_2_5654
-+sym_2_5654: la $2, sym_2_5654
-+.globl sym_2_5655
-+sym_2_5655: la $2, sym_2_5655
-+.globl sym_2_5656
-+sym_2_5656: la $2, sym_2_5656
-+.globl sym_2_5657
-+sym_2_5657: la $2, sym_2_5657
-+.globl sym_2_5658
-+sym_2_5658: la $2, sym_2_5658
-+.globl sym_2_5659
-+sym_2_5659: la $2, sym_2_5659
-+.globl sym_2_5660
-+sym_2_5660: la $2, sym_2_5660
-+.globl sym_2_5661
-+sym_2_5661: la $2, sym_2_5661
-+.globl sym_2_5662
-+sym_2_5662: la $2, sym_2_5662
-+.globl sym_2_5663
-+sym_2_5663: la $2, sym_2_5663
-+.globl sym_2_5664
-+sym_2_5664: la $2, sym_2_5664
-+.globl sym_2_5665
-+sym_2_5665: la $2, sym_2_5665
-+.globl sym_2_5666
-+sym_2_5666: la $2, sym_2_5666
-+.globl sym_2_5667
-+sym_2_5667: la $2, sym_2_5667
-+.globl sym_2_5668
-+sym_2_5668: la $2, sym_2_5668
-+.globl sym_2_5669
-+sym_2_5669: la $2, sym_2_5669
-+.globl sym_2_5670
-+sym_2_5670: la $2, sym_2_5670
-+.globl sym_2_5671
-+sym_2_5671: la $2, sym_2_5671
-+.globl sym_2_5672
-+sym_2_5672: la $2, sym_2_5672
-+.globl sym_2_5673
-+sym_2_5673: la $2, sym_2_5673
-+.globl sym_2_5674
-+sym_2_5674: la $2, sym_2_5674
-+.globl sym_2_5675
-+sym_2_5675: la $2, sym_2_5675
-+.globl sym_2_5676
-+sym_2_5676: la $2, sym_2_5676
-+.globl sym_2_5677
-+sym_2_5677: la $2, sym_2_5677
-+.globl sym_2_5678
-+sym_2_5678: la $2, sym_2_5678
-+.globl sym_2_5679
-+sym_2_5679: la $2, sym_2_5679
-+.globl sym_2_5680
-+sym_2_5680: la $2, sym_2_5680
-+.globl sym_2_5681
-+sym_2_5681: la $2, sym_2_5681
-+.globl sym_2_5682
-+sym_2_5682: la $2, sym_2_5682
-+.globl sym_2_5683
-+sym_2_5683: la $2, sym_2_5683
-+.globl sym_2_5684
-+sym_2_5684: la $2, sym_2_5684
-+.globl sym_2_5685
-+sym_2_5685: la $2, sym_2_5685
-+.globl sym_2_5686
-+sym_2_5686: la $2, sym_2_5686
-+.globl sym_2_5687
-+sym_2_5687: la $2, sym_2_5687
-+.globl sym_2_5688
-+sym_2_5688: la $2, sym_2_5688
-+.globl sym_2_5689
-+sym_2_5689: la $2, sym_2_5689
-+.globl sym_2_5690
-+sym_2_5690: la $2, sym_2_5690
-+.globl sym_2_5691
-+sym_2_5691: la $2, sym_2_5691
-+.globl sym_2_5692
-+sym_2_5692: la $2, sym_2_5692
-+.globl sym_2_5693
-+sym_2_5693: la $2, sym_2_5693
-+.globl sym_2_5694
-+sym_2_5694: la $2, sym_2_5694
-+.globl sym_2_5695
-+sym_2_5695: la $2, sym_2_5695
-+.globl sym_2_5696
-+sym_2_5696: la $2, sym_2_5696
-+.globl sym_2_5697
-+sym_2_5697: la $2, sym_2_5697
-+.globl sym_2_5698
-+sym_2_5698: la $2, sym_2_5698
-+.globl sym_2_5699
-+sym_2_5699: la $2, sym_2_5699
-+.globl sym_2_5700
-+sym_2_5700: la $2, sym_2_5700
-+.globl sym_2_5701
-+sym_2_5701: la $2, sym_2_5701
-+.globl sym_2_5702
-+sym_2_5702: la $2, sym_2_5702
-+.globl sym_2_5703
-+sym_2_5703: la $2, sym_2_5703
-+.globl sym_2_5704
-+sym_2_5704: la $2, sym_2_5704
-+.globl sym_2_5705
-+sym_2_5705: la $2, sym_2_5705
-+.globl sym_2_5706
-+sym_2_5706: la $2, sym_2_5706
-+.globl sym_2_5707
-+sym_2_5707: la $2, sym_2_5707
-+.globl sym_2_5708
-+sym_2_5708: la $2, sym_2_5708
-+.globl sym_2_5709
-+sym_2_5709: la $2, sym_2_5709
-+.globl sym_2_5710
-+sym_2_5710: la $2, sym_2_5710
-+.globl sym_2_5711
-+sym_2_5711: la $2, sym_2_5711
-+.globl sym_2_5712
-+sym_2_5712: la $2, sym_2_5712
-+.globl sym_2_5713
-+sym_2_5713: la $2, sym_2_5713
-+.globl sym_2_5714
-+sym_2_5714: la $2, sym_2_5714
-+.globl sym_2_5715
-+sym_2_5715: la $2, sym_2_5715
-+.globl sym_2_5716
-+sym_2_5716: la $2, sym_2_5716
-+.globl sym_2_5717
-+sym_2_5717: la $2, sym_2_5717
-+.globl sym_2_5718
-+sym_2_5718: la $2, sym_2_5718
-+.globl sym_2_5719
-+sym_2_5719: la $2, sym_2_5719
-+.globl sym_2_5720
-+sym_2_5720: la $2, sym_2_5720
-+.globl sym_2_5721
-+sym_2_5721: la $2, sym_2_5721
-+.globl sym_2_5722
-+sym_2_5722: la $2, sym_2_5722
-+.globl sym_2_5723
-+sym_2_5723: la $2, sym_2_5723
-+.globl sym_2_5724
-+sym_2_5724: la $2, sym_2_5724
-+.globl sym_2_5725
-+sym_2_5725: la $2, sym_2_5725
-+.globl sym_2_5726
-+sym_2_5726: la $2, sym_2_5726
-+.globl sym_2_5727
-+sym_2_5727: la $2, sym_2_5727
-+.globl sym_2_5728
-+sym_2_5728: la $2, sym_2_5728
-+.globl sym_2_5729
-+sym_2_5729: la $2, sym_2_5729
-+.globl sym_2_5730
-+sym_2_5730: la $2, sym_2_5730
-+.globl sym_2_5731
-+sym_2_5731: la $2, sym_2_5731
-+.globl sym_2_5732
-+sym_2_5732: la $2, sym_2_5732
-+.globl sym_2_5733
-+sym_2_5733: la $2, sym_2_5733
-+.globl sym_2_5734
-+sym_2_5734: la $2, sym_2_5734
-+.globl sym_2_5735
-+sym_2_5735: la $2, sym_2_5735
-+.globl sym_2_5736
-+sym_2_5736: la $2, sym_2_5736
-+.globl sym_2_5737
-+sym_2_5737: la $2, sym_2_5737
-+.globl sym_2_5738
-+sym_2_5738: la $2, sym_2_5738
-+.globl sym_2_5739
-+sym_2_5739: la $2, sym_2_5739
-+.globl sym_2_5740
-+sym_2_5740: la $2, sym_2_5740
-+.globl sym_2_5741
-+sym_2_5741: la $2, sym_2_5741
-+.globl sym_2_5742
-+sym_2_5742: la $2, sym_2_5742
-+.globl sym_2_5743
-+sym_2_5743: la $2, sym_2_5743
-+.globl sym_2_5744
-+sym_2_5744: la $2, sym_2_5744
-+.globl sym_2_5745
-+sym_2_5745: la $2, sym_2_5745
-+.globl sym_2_5746
-+sym_2_5746: la $2, sym_2_5746
-+.globl sym_2_5747
-+sym_2_5747: la $2, sym_2_5747
-+.globl sym_2_5748
-+sym_2_5748: la $2, sym_2_5748
-+.globl sym_2_5749
-+sym_2_5749: la $2, sym_2_5749
-+.globl sym_2_5750
-+sym_2_5750: la $2, sym_2_5750
-+.globl sym_2_5751
-+sym_2_5751: la $2, sym_2_5751
-+.globl sym_2_5752
-+sym_2_5752: la $2, sym_2_5752
-+.globl sym_2_5753
-+sym_2_5753: la $2, sym_2_5753
-+.globl sym_2_5754
-+sym_2_5754: la $2, sym_2_5754
-+.globl sym_2_5755
-+sym_2_5755: la $2, sym_2_5755
-+.globl sym_2_5756
-+sym_2_5756: la $2, sym_2_5756
-+.globl sym_2_5757
-+sym_2_5757: la $2, sym_2_5757
-+.globl sym_2_5758
-+sym_2_5758: la $2, sym_2_5758
-+.globl sym_2_5759
-+sym_2_5759: la $2, sym_2_5759
-+.globl sym_2_5760
-+sym_2_5760: la $2, sym_2_5760
-+.globl sym_2_5761
-+sym_2_5761: la $2, sym_2_5761
-+.globl sym_2_5762
-+sym_2_5762: la $2, sym_2_5762
-+.globl sym_2_5763
-+sym_2_5763: la $2, sym_2_5763
-+.globl sym_2_5764
-+sym_2_5764: la $2, sym_2_5764
-+.globl sym_2_5765
-+sym_2_5765: la $2, sym_2_5765
-+.globl sym_2_5766
-+sym_2_5766: la $2, sym_2_5766
-+.globl sym_2_5767
-+sym_2_5767: la $2, sym_2_5767
-+.globl sym_2_5768
-+sym_2_5768: la $2, sym_2_5768
-+.globl sym_2_5769
-+sym_2_5769: la $2, sym_2_5769
-+.globl sym_2_5770
-+sym_2_5770: la $2, sym_2_5770
-+.globl sym_2_5771
-+sym_2_5771: la $2, sym_2_5771
-+.globl sym_2_5772
-+sym_2_5772: la $2, sym_2_5772
-+.globl sym_2_5773
-+sym_2_5773: la $2, sym_2_5773
-+.globl sym_2_5774
-+sym_2_5774: la $2, sym_2_5774
-+.globl sym_2_5775
-+sym_2_5775: la $2, sym_2_5775
-+.globl sym_2_5776
-+sym_2_5776: la $2, sym_2_5776
-+.globl sym_2_5777
-+sym_2_5777: la $2, sym_2_5777
-+.globl sym_2_5778
-+sym_2_5778: la $2, sym_2_5778
-+.globl sym_2_5779
-+sym_2_5779: la $2, sym_2_5779
-+.globl sym_2_5780
-+sym_2_5780: la $2, sym_2_5780
-+.globl sym_2_5781
-+sym_2_5781: la $2, sym_2_5781
-+.globl sym_2_5782
-+sym_2_5782: la $2, sym_2_5782
-+.globl sym_2_5783
-+sym_2_5783: la $2, sym_2_5783
-+.globl sym_2_5784
-+sym_2_5784: la $2, sym_2_5784
-+.globl sym_2_5785
-+sym_2_5785: la $2, sym_2_5785
-+.globl sym_2_5786
-+sym_2_5786: la $2, sym_2_5786
-+.globl sym_2_5787
-+sym_2_5787: la $2, sym_2_5787
-+.globl sym_2_5788
-+sym_2_5788: la $2, sym_2_5788
-+.globl sym_2_5789
-+sym_2_5789: la $2, sym_2_5789
-+.globl sym_2_5790
-+sym_2_5790: la $2, sym_2_5790
-+.globl sym_2_5791
-+sym_2_5791: la $2, sym_2_5791
-+.globl sym_2_5792
-+sym_2_5792: la $2, sym_2_5792
-+.globl sym_2_5793
-+sym_2_5793: la $2, sym_2_5793
-+.globl sym_2_5794
-+sym_2_5794: la $2, sym_2_5794
-+.globl sym_2_5795
-+sym_2_5795: la $2, sym_2_5795
-+.globl sym_2_5796
-+sym_2_5796: la $2, sym_2_5796
-+.globl sym_2_5797
-+sym_2_5797: la $2, sym_2_5797
-+.globl sym_2_5798
-+sym_2_5798: la $2, sym_2_5798
-+.globl sym_2_5799
-+sym_2_5799: la $2, sym_2_5799
-+.globl sym_2_5800
-+sym_2_5800: la $2, sym_2_5800
-+.globl sym_2_5801
-+sym_2_5801: la $2, sym_2_5801
-+.globl sym_2_5802
-+sym_2_5802: la $2, sym_2_5802
-+.globl sym_2_5803
-+sym_2_5803: la $2, sym_2_5803
-+.globl sym_2_5804
-+sym_2_5804: la $2, sym_2_5804
-+.globl sym_2_5805
-+sym_2_5805: la $2, sym_2_5805
-+.globl sym_2_5806
-+sym_2_5806: la $2, sym_2_5806
-+.globl sym_2_5807
-+sym_2_5807: la $2, sym_2_5807
-+.globl sym_2_5808
-+sym_2_5808: la $2, sym_2_5808
-+.globl sym_2_5809
-+sym_2_5809: la $2, sym_2_5809
-+.globl sym_2_5810
-+sym_2_5810: la $2, sym_2_5810
-+.globl sym_2_5811
-+sym_2_5811: la $2, sym_2_5811
-+.globl sym_2_5812
-+sym_2_5812: la $2, sym_2_5812
-+.globl sym_2_5813
-+sym_2_5813: la $2, sym_2_5813
-+.globl sym_2_5814
-+sym_2_5814: la $2, sym_2_5814
-+.globl sym_2_5815
-+sym_2_5815: la $2, sym_2_5815
-+.globl sym_2_5816
-+sym_2_5816: la $2, sym_2_5816
-+.globl sym_2_5817
-+sym_2_5817: la $2, sym_2_5817
-+.globl sym_2_5818
-+sym_2_5818: la $2, sym_2_5818
-+.globl sym_2_5819
-+sym_2_5819: la $2, sym_2_5819
-+.globl sym_2_5820
-+sym_2_5820: la $2, sym_2_5820
-+.globl sym_2_5821
-+sym_2_5821: la $2, sym_2_5821
-+.globl sym_2_5822
-+sym_2_5822: la $2, sym_2_5822
-+.globl sym_2_5823
-+sym_2_5823: la $2, sym_2_5823
-+.globl sym_2_5824
-+sym_2_5824: la $2, sym_2_5824
-+.globl sym_2_5825
-+sym_2_5825: la $2, sym_2_5825
-+.globl sym_2_5826
-+sym_2_5826: la $2, sym_2_5826
-+.globl sym_2_5827
-+sym_2_5827: la $2, sym_2_5827
-+.globl sym_2_5828
-+sym_2_5828: la $2, sym_2_5828
-+.globl sym_2_5829
-+sym_2_5829: la $2, sym_2_5829
-+.globl sym_2_5830
-+sym_2_5830: la $2, sym_2_5830
-+.globl sym_2_5831
-+sym_2_5831: la $2, sym_2_5831
-+.globl sym_2_5832
-+sym_2_5832: la $2, sym_2_5832
-+.globl sym_2_5833
-+sym_2_5833: la $2, sym_2_5833
-+.globl sym_2_5834
-+sym_2_5834: la $2, sym_2_5834
-+.globl sym_2_5835
-+sym_2_5835: la $2, sym_2_5835
-+.globl sym_2_5836
-+sym_2_5836: la $2, sym_2_5836
-+.globl sym_2_5837
-+sym_2_5837: la $2, sym_2_5837
-+.globl sym_2_5838
-+sym_2_5838: la $2, sym_2_5838
-+.globl sym_2_5839
-+sym_2_5839: la $2, sym_2_5839
-+.globl sym_2_5840
-+sym_2_5840: la $2, sym_2_5840
-+.globl sym_2_5841
-+sym_2_5841: la $2, sym_2_5841
-+.globl sym_2_5842
-+sym_2_5842: la $2, sym_2_5842
-+.globl sym_2_5843
-+sym_2_5843: la $2, sym_2_5843
-+.globl sym_2_5844
-+sym_2_5844: la $2, sym_2_5844
-+.globl sym_2_5845
-+sym_2_5845: la $2, sym_2_5845
-+.globl sym_2_5846
-+sym_2_5846: la $2, sym_2_5846
-+.globl sym_2_5847
-+sym_2_5847: la $2, sym_2_5847
-+.globl sym_2_5848
-+sym_2_5848: la $2, sym_2_5848
-+.globl sym_2_5849
-+sym_2_5849: la $2, sym_2_5849
-+.globl sym_2_5850
-+sym_2_5850: la $2, sym_2_5850
-+.globl sym_2_5851
-+sym_2_5851: la $2, sym_2_5851
-+.globl sym_2_5852
-+sym_2_5852: la $2, sym_2_5852
-+.globl sym_2_5853
-+sym_2_5853: la $2, sym_2_5853
-+.globl sym_2_5854
-+sym_2_5854: la $2, sym_2_5854
-+.globl sym_2_5855
-+sym_2_5855: la $2, sym_2_5855
-+.globl sym_2_5856
-+sym_2_5856: la $2, sym_2_5856
-+.globl sym_2_5857
-+sym_2_5857: la $2, sym_2_5857
-+.globl sym_2_5858
-+sym_2_5858: la $2, sym_2_5858
-+.globl sym_2_5859
-+sym_2_5859: la $2, sym_2_5859
-+.globl sym_2_5860
-+sym_2_5860: la $2, sym_2_5860
-+.globl sym_2_5861
-+sym_2_5861: la $2, sym_2_5861
-+.globl sym_2_5862
-+sym_2_5862: la $2, sym_2_5862
-+.globl sym_2_5863
-+sym_2_5863: la $2, sym_2_5863
-+.globl sym_2_5864
-+sym_2_5864: la $2, sym_2_5864
-+.globl sym_2_5865
-+sym_2_5865: la $2, sym_2_5865
-+.globl sym_2_5866
-+sym_2_5866: la $2, sym_2_5866
-+.globl sym_2_5867
-+sym_2_5867: la $2, sym_2_5867
-+.globl sym_2_5868
-+sym_2_5868: la $2, sym_2_5868
-+.globl sym_2_5869
-+sym_2_5869: la $2, sym_2_5869
-+.globl sym_2_5870
-+sym_2_5870: la $2, sym_2_5870
-+.globl sym_2_5871
-+sym_2_5871: la $2, sym_2_5871
-+.globl sym_2_5872
-+sym_2_5872: la $2, sym_2_5872
-+.globl sym_2_5873
-+sym_2_5873: la $2, sym_2_5873
-+.globl sym_2_5874
-+sym_2_5874: la $2, sym_2_5874
-+.globl sym_2_5875
-+sym_2_5875: la $2, sym_2_5875
-+.globl sym_2_5876
-+sym_2_5876: la $2, sym_2_5876
-+.globl sym_2_5877
-+sym_2_5877: la $2, sym_2_5877
-+.globl sym_2_5878
-+sym_2_5878: la $2, sym_2_5878
-+.globl sym_2_5879
-+sym_2_5879: la $2, sym_2_5879
-+.globl sym_2_5880
-+sym_2_5880: la $2, sym_2_5880
-+.globl sym_2_5881
-+sym_2_5881: la $2, sym_2_5881
-+.globl sym_2_5882
-+sym_2_5882: la $2, sym_2_5882
-+.globl sym_2_5883
-+sym_2_5883: la $2, sym_2_5883
-+.globl sym_2_5884
-+sym_2_5884: la $2, sym_2_5884
-+.globl sym_2_5885
-+sym_2_5885: la $2, sym_2_5885
-+.globl sym_2_5886
-+sym_2_5886: la $2, sym_2_5886
-+.globl sym_2_5887
-+sym_2_5887: la $2, sym_2_5887
-+.globl sym_2_5888
-+sym_2_5888: la $2, sym_2_5888
-+.globl sym_2_5889
-+sym_2_5889: la $2, sym_2_5889
-+.globl sym_2_5890
-+sym_2_5890: la $2, sym_2_5890
-+.globl sym_2_5891
-+sym_2_5891: la $2, sym_2_5891
-+.globl sym_2_5892
-+sym_2_5892: la $2, sym_2_5892
-+.globl sym_2_5893
-+sym_2_5893: la $2, sym_2_5893
-+.globl sym_2_5894
-+sym_2_5894: la $2, sym_2_5894
-+.globl sym_2_5895
-+sym_2_5895: la $2, sym_2_5895
-+.globl sym_2_5896
-+sym_2_5896: la $2, sym_2_5896
-+.globl sym_2_5897
-+sym_2_5897: la $2, sym_2_5897
-+.globl sym_2_5898
-+sym_2_5898: la $2, sym_2_5898
-+.globl sym_2_5899
-+sym_2_5899: la $2, sym_2_5899
-+.globl sym_2_5900
-+sym_2_5900: la $2, sym_2_5900
-+.globl sym_2_5901
-+sym_2_5901: la $2, sym_2_5901
-+.globl sym_2_5902
-+sym_2_5902: la $2, sym_2_5902
-+.globl sym_2_5903
-+sym_2_5903: la $2, sym_2_5903
-+.globl sym_2_5904
-+sym_2_5904: la $2, sym_2_5904
-+.globl sym_2_5905
-+sym_2_5905: la $2, sym_2_5905
-+.globl sym_2_5906
-+sym_2_5906: la $2, sym_2_5906
-+.globl sym_2_5907
-+sym_2_5907: la $2, sym_2_5907
-+.globl sym_2_5908
-+sym_2_5908: la $2, sym_2_5908
-+.globl sym_2_5909
-+sym_2_5909: la $2, sym_2_5909
-+.globl sym_2_5910
-+sym_2_5910: la $2, sym_2_5910
-+.globl sym_2_5911
-+sym_2_5911: la $2, sym_2_5911
-+.globl sym_2_5912
-+sym_2_5912: la $2, sym_2_5912
-+.globl sym_2_5913
-+sym_2_5913: la $2, sym_2_5913
-+.globl sym_2_5914
-+sym_2_5914: la $2, sym_2_5914
-+.globl sym_2_5915
-+sym_2_5915: la $2, sym_2_5915
-+.globl sym_2_5916
-+sym_2_5916: la $2, sym_2_5916
-+.globl sym_2_5917
-+sym_2_5917: la $2, sym_2_5917
-+.globl sym_2_5918
-+sym_2_5918: la $2, sym_2_5918
-+.globl sym_2_5919
-+sym_2_5919: la $2, sym_2_5919
-+.globl sym_2_5920
-+sym_2_5920: la $2, sym_2_5920
-+.globl sym_2_5921
-+sym_2_5921: la $2, sym_2_5921
-+.globl sym_2_5922
-+sym_2_5922: la $2, sym_2_5922
-+.globl sym_2_5923
-+sym_2_5923: la $2, sym_2_5923
-+.globl sym_2_5924
-+sym_2_5924: la $2, sym_2_5924
-+.globl sym_2_5925
-+sym_2_5925: la $2, sym_2_5925
-+.globl sym_2_5926
-+sym_2_5926: la $2, sym_2_5926
-+.globl sym_2_5927
-+sym_2_5927: la $2, sym_2_5927
-+.globl sym_2_5928
-+sym_2_5928: la $2, sym_2_5928
-+.globl sym_2_5929
-+sym_2_5929: la $2, sym_2_5929
-+.globl sym_2_5930
-+sym_2_5930: la $2, sym_2_5930
-+.globl sym_2_5931
-+sym_2_5931: la $2, sym_2_5931
-+.globl sym_2_5932
-+sym_2_5932: la $2, sym_2_5932
-+.globl sym_2_5933
-+sym_2_5933: la $2, sym_2_5933
-+.globl sym_2_5934
-+sym_2_5934: la $2, sym_2_5934
-+.globl sym_2_5935
-+sym_2_5935: la $2, sym_2_5935
-+.globl sym_2_5936
-+sym_2_5936: la $2, sym_2_5936
-+.globl sym_2_5937
-+sym_2_5937: la $2, sym_2_5937
-+.globl sym_2_5938
-+sym_2_5938: la $2, sym_2_5938
-+.globl sym_2_5939
-+sym_2_5939: la $2, sym_2_5939
-+.globl sym_2_5940
-+sym_2_5940: la $2, sym_2_5940
-+.globl sym_2_5941
-+sym_2_5941: la $2, sym_2_5941
-+.globl sym_2_5942
-+sym_2_5942: la $2, sym_2_5942
-+.globl sym_2_5943
-+sym_2_5943: la $2, sym_2_5943
-+.globl sym_2_5944
-+sym_2_5944: la $2, sym_2_5944
-+.globl sym_2_5945
-+sym_2_5945: la $2, sym_2_5945
-+.globl sym_2_5946
-+sym_2_5946: la $2, sym_2_5946
-+.globl sym_2_5947
-+sym_2_5947: la $2, sym_2_5947
-+.globl sym_2_5948
-+sym_2_5948: la $2, sym_2_5948
-+.globl sym_2_5949
-+sym_2_5949: la $2, sym_2_5949
-+.globl sym_2_5950
-+sym_2_5950: la $2, sym_2_5950
-+.globl sym_2_5951
-+sym_2_5951: la $2, sym_2_5951
-+.globl sym_2_5952
-+sym_2_5952: la $2, sym_2_5952
-+.globl sym_2_5953
-+sym_2_5953: la $2, sym_2_5953
-+.globl sym_2_5954
-+sym_2_5954: la $2, sym_2_5954
-+.globl sym_2_5955
-+sym_2_5955: la $2, sym_2_5955
-+.globl sym_2_5956
-+sym_2_5956: la $2, sym_2_5956
-+.globl sym_2_5957
-+sym_2_5957: la $2, sym_2_5957
-+.globl sym_2_5958
-+sym_2_5958: la $2, sym_2_5958
-+.globl sym_2_5959
-+sym_2_5959: la $2, sym_2_5959
-+.globl sym_2_5960
-+sym_2_5960: la $2, sym_2_5960
-+.globl sym_2_5961
-+sym_2_5961: la $2, sym_2_5961
-+.globl sym_2_5962
-+sym_2_5962: la $2, sym_2_5962
-+.globl sym_2_5963
-+sym_2_5963: la $2, sym_2_5963
-+.globl sym_2_5964
-+sym_2_5964: la $2, sym_2_5964
-+.globl sym_2_5965
-+sym_2_5965: la $2, sym_2_5965
-+.globl sym_2_5966
-+sym_2_5966: la $2, sym_2_5966
-+.globl sym_2_5967
-+sym_2_5967: la $2, sym_2_5967
-+.globl sym_2_5968
-+sym_2_5968: la $2, sym_2_5968
-+.globl sym_2_5969
-+sym_2_5969: la $2, sym_2_5969
-+.globl sym_2_5970
-+sym_2_5970: la $2, sym_2_5970
-+.globl sym_2_5971
-+sym_2_5971: la $2, sym_2_5971
-+.globl sym_2_5972
-+sym_2_5972: la $2, sym_2_5972
-+.globl sym_2_5973
-+sym_2_5973: la $2, sym_2_5973
-+.globl sym_2_5974
-+sym_2_5974: la $2, sym_2_5974
-+.globl sym_2_5975
-+sym_2_5975: la $2, sym_2_5975
-+.globl sym_2_5976
-+sym_2_5976: la $2, sym_2_5976
-+.globl sym_2_5977
-+sym_2_5977: la $2, sym_2_5977
-+.globl sym_2_5978
-+sym_2_5978: la $2, sym_2_5978
-+.globl sym_2_5979
-+sym_2_5979: la $2, sym_2_5979
-+.globl sym_2_5980
-+sym_2_5980: la $2, sym_2_5980
-+.globl sym_2_5981
-+sym_2_5981: la $2, sym_2_5981
-+.globl sym_2_5982
-+sym_2_5982: la $2, sym_2_5982
-+.globl sym_2_5983
-+sym_2_5983: la $2, sym_2_5983
-+.globl sym_2_5984
-+sym_2_5984: la $2, sym_2_5984
-+.globl sym_2_5985
-+sym_2_5985: la $2, sym_2_5985
-+.globl sym_2_5986
-+sym_2_5986: la $2, sym_2_5986
-+.globl sym_2_5987
-+sym_2_5987: la $2, sym_2_5987
-+.globl sym_2_5988
-+sym_2_5988: la $2, sym_2_5988
-+.globl sym_2_5989
-+sym_2_5989: la $2, sym_2_5989
-+.globl sym_2_5990
-+sym_2_5990: la $2, sym_2_5990
-+.globl sym_2_5991
-+sym_2_5991: la $2, sym_2_5991
-+.globl sym_2_5992
-+sym_2_5992: la $2, sym_2_5992
-+.globl sym_2_5993
-+sym_2_5993: la $2, sym_2_5993
-+.globl sym_2_5994
-+sym_2_5994: la $2, sym_2_5994
-+.globl sym_2_5995
-+sym_2_5995: la $2, sym_2_5995
-+.globl sym_2_5996
-+sym_2_5996: la $2, sym_2_5996
-+.globl sym_2_5997
-+sym_2_5997: la $2, sym_2_5997
-+.globl sym_2_5998
-+sym_2_5998: la $2, sym_2_5998
-+.globl sym_2_5999
-+sym_2_5999: la $2, sym_2_5999
-+.globl sym_2_6000
-+sym_2_6000: la $2, sym_2_6000
-+.globl sym_2_6001
-+sym_2_6001: la $2, sym_2_6001
-+.globl sym_2_6002
-+sym_2_6002: la $2, sym_2_6002
-+.globl sym_2_6003
-+sym_2_6003: la $2, sym_2_6003
-+.globl sym_2_6004
-+sym_2_6004: la $2, sym_2_6004
-+.globl sym_2_6005
-+sym_2_6005: la $2, sym_2_6005
-+.globl sym_2_6006
-+sym_2_6006: la $2, sym_2_6006
-+.globl sym_2_6007
-+sym_2_6007: la $2, sym_2_6007
-+.globl sym_2_6008
-+sym_2_6008: la $2, sym_2_6008
-+.globl sym_2_6009
-+sym_2_6009: la $2, sym_2_6009
-+.globl sym_2_6010
-+sym_2_6010: la $2, sym_2_6010
-+.globl sym_2_6011
-+sym_2_6011: la $2, sym_2_6011
-+.globl sym_2_6012
-+sym_2_6012: la $2, sym_2_6012
-+.globl sym_2_6013
-+sym_2_6013: la $2, sym_2_6013
-+.globl sym_2_6014
-+sym_2_6014: la $2, sym_2_6014
-+.globl sym_2_6015
-+sym_2_6015: la $2, sym_2_6015
-+.globl sym_2_6016
-+sym_2_6016: la $2, sym_2_6016
-+.globl sym_2_6017
-+sym_2_6017: la $2, sym_2_6017
-+.globl sym_2_6018
-+sym_2_6018: la $2, sym_2_6018
-+.globl sym_2_6019
-+sym_2_6019: la $2, sym_2_6019
-+.globl sym_2_6020
-+sym_2_6020: la $2, sym_2_6020
-+.globl sym_2_6021
-+sym_2_6021: la $2, sym_2_6021
-+.globl sym_2_6022
-+sym_2_6022: la $2, sym_2_6022
-+.globl sym_2_6023
-+sym_2_6023: la $2, sym_2_6023
-+.globl sym_2_6024
-+sym_2_6024: la $2, sym_2_6024
-+.globl sym_2_6025
-+sym_2_6025: la $2, sym_2_6025
-+.globl sym_2_6026
-+sym_2_6026: la $2, sym_2_6026
-+.globl sym_2_6027
-+sym_2_6027: la $2, sym_2_6027
-+.globl sym_2_6028
-+sym_2_6028: la $2, sym_2_6028
-+.globl sym_2_6029
-+sym_2_6029: la $2, sym_2_6029
-+.globl sym_2_6030
-+sym_2_6030: la $2, sym_2_6030
-+.globl sym_2_6031
-+sym_2_6031: la $2, sym_2_6031
-+.globl sym_2_6032
-+sym_2_6032: la $2, sym_2_6032
-+.globl sym_2_6033
-+sym_2_6033: la $2, sym_2_6033
-+.globl sym_2_6034
-+sym_2_6034: la $2, sym_2_6034
-+.globl sym_2_6035
-+sym_2_6035: la $2, sym_2_6035
-+.globl sym_2_6036
-+sym_2_6036: la $2, sym_2_6036
-+.globl sym_2_6037
-+sym_2_6037: la $2, sym_2_6037
-+.globl sym_2_6038
-+sym_2_6038: la $2, sym_2_6038
-+.globl sym_2_6039
-+sym_2_6039: la $2, sym_2_6039
-+.globl sym_2_6040
-+sym_2_6040: la $2, sym_2_6040
-+.globl sym_2_6041
-+sym_2_6041: la $2, sym_2_6041
-+.globl sym_2_6042
-+sym_2_6042: la $2, sym_2_6042
-+.globl sym_2_6043
-+sym_2_6043: la $2, sym_2_6043
-+.globl sym_2_6044
-+sym_2_6044: la $2, sym_2_6044
-+.globl sym_2_6045
-+sym_2_6045: la $2, sym_2_6045
-+.globl sym_2_6046
-+sym_2_6046: la $2, sym_2_6046
-+.globl sym_2_6047
-+sym_2_6047: la $2, sym_2_6047
-+.globl sym_2_6048
-+sym_2_6048: la $2, sym_2_6048
-+.globl sym_2_6049
-+sym_2_6049: la $2, sym_2_6049
-+.globl sym_2_6050
-+sym_2_6050: la $2, sym_2_6050
-+.globl sym_2_6051
-+sym_2_6051: la $2, sym_2_6051
-+.globl sym_2_6052
-+sym_2_6052: la $2, sym_2_6052
-+.globl sym_2_6053
-+sym_2_6053: la $2, sym_2_6053
-+.globl sym_2_6054
-+sym_2_6054: la $2, sym_2_6054
-+.globl sym_2_6055
-+sym_2_6055: la $2, sym_2_6055
-+.globl sym_2_6056
-+sym_2_6056: la $2, sym_2_6056
-+.globl sym_2_6057
-+sym_2_6057: la $2, sym_2_6057
-+.globl sym_2_6058
-+sym_2_6058: la $2, sym_2_6058
-+.globl sym_2_6059
-+sym_2_6059: la $2, sym_2_6059
-+.globl sym_2_6060
-+sym_2_6060: la $2, sym_2_6060
-+.globl sym_2_6061
-+sym_2_6061: la $2, sym_2_6061
-+.globl sym_2_6062
-+sym_2_6062: la $2, sym_2_6062
-+.globl sym_2_6063
-+sym_2_6063: la $2, sym_2_6063
-+.globl sym_2_6064
-+sym_2_6064: la $2, sym_2_6064
-+.globl sym_2_6065
-+sym_2_6065: la $2, sym_2_6065
-+.globl sym_2_6066
-+sym_2_6066: la $2, sym_2_6066
-+.globl sym_2_6067
-+sym_2_6067: la $2, sym_2_6067
-+.globl sym_2_6068
-+sym_2_6068: la $2, sym_2_6068
-+.globl sym_2_6069
-+sym_2_6069: la $2, sym_2_6069
-+.globl sym_2_6070
-+sym_2_6070: la $2, sym_2_6070
-+.globl sym_2_6071
-+sym_2_6071: la $2, sym_2_6071
-+.globl sym_2_6072
-+sym_2_6072: la $2, sym_2_6072
-+.globl sym_2_6073
-+sym_2_6073: la $2, sym_2_6073
-+.globl sym_2_6074
-+sym_2_6074: la $2, sym_2_6074
-+.globl sym_2_6075
-+sym_2_6075: la $2, sym_2_6075
-+.globl sym_2_6076
-+sym_2_6076: la $2, sym_2_6076
-+.globl sym_2_6077
-+sym_2_6077: la $2, sym_2_6077
-+.globl sym_2_6078
-+sym_2_6078: la $2, sym_2_6078
-+.globl sym_2_6079
-+sym_2_6079: la $2, sym_2_6079
-+.globl sym_2_6080
-+sym_2_6080: la $2, sym_2_6080
-+.globl sym_2_6081
-+sym_2_6081: la $2, sym_2_6081
-+.globl sym_2_6082
-+sym_2_6082: la $2, sym_2_6082
-+.globl sym_2_6083
-+sym_2_6083: la $2, sym_2_6083
-+.globl sym_2_6084
-+sym_2_6084: la $2, sym_2_6084
-+.globl sym_2_6085
-+sym_2_6085: la $2, sym_2_6085
-+.globl sym_2_6086
-+sym_2_6086: la $2, sym_2_6086
-+.globl sym_2_6087
-+sym_2_6087: la $2, sym_2_6087
-+.globl sym_2_6088
-+sym_2_6088: la $2, sym_2_6088
-+.globl sym_2_6089
-+sym_2_6089: la $2, sym_2_6089
-+.globl sym_2_6090
-+sym_2_6090: la $2, sym_2_6090
-+.globl sym_2_6091
-+sym_2_6091: la $2, sym_2_6091
-+.globl sym_2_6092
-+sym_2_6092: la $2, sym_2_6092
-+.globl sym_2_6093
-+sym_2_6093: la $2, sym_2_6093
-+.globl sym_2_6094
-+sym_2_6094: la $2, sym_2_6094
-+.globl sym_2_6095
-+sym_2_6095: la $2, sym_2_6095
-+.globl sym_2_6096
-+sym_2_6096: la $2, sym_2_6096
-+.globl sym_2_6097
-+sym_2_6097: la $2, sym_2_6097
-+.globl sym_2_6098
-+sym_2_6098: la $2, sym_2_6098
-+.globl sym_2_6099
-+sym_2_6099: la $2, sym_2_6099
-+.globl sym_2_6100
-+sym_2_6100: la $2, sym_2_6100
-+.globl sym_2_6101
-+sym_2_6101: la $2, sym_2_6101
-+.globl sym_2_6102
-+sym_2_6102: la $2, sym_2_6102
-+.globl sym_2_6103
-+sym_2_6103: la $2, sym_2_6103
-+.globl sym_2_6104
-+sym_2_6104: la $2, sym_2_6104
-+.globl sym_2_6105
-+sym_2_6105: la $2, sym_2_6105
-+.globl sym_2_6106
-+sym_2_6106: la $2, sym_2_6106
-+.globl sym_2_6107
-+sym_2_6107: la $2, sym_2_6107
-+.globl sym_2_6108
-+sym_2_6108: la $2, sym_2_6108
-+.globl sym_2_6109
-+sym_2_6109: la $2, sym_2_6109
-+.globl sym_2_6110
-+sym_2_6110: la $2, sym_2_6110
-+.globl sym_2_6111
-+sym_2_6111: la $2, sym_2_6111
-+.globl sym_2_6112
-+sym_2_6112: la $2, sym_2_6112
-+.globl sym_2_6113
-+sym_2_6113: la $2, sym_2_6113
-+.globl sym_2_6114
-+sym_2_6114: la $2, sym_2_6114
-+.globl sym_2_6115
-+sym_2_6115: la $2, sym_2_6115
-+.globl sym_2_6116
-+sym_2_6116: la $2, sym_2_6116
-+.globl sym_2_6117
-+sym_2_6117: la $2, sym_2_6117
-+.globl sym_2_6118
-+sym_2_6118: la $2, sym_2_6118
-+.globl sym_2_6119
-+sym_2_6119: la $2, sym_2_6119
-+.globl sym_2_6120
-+sym_2_6120: la $2, sym_2_6120
-+.globl sym_2_6121
-+sym_2_6121: la $2, sym_2_6121
-+.globl sym_2_6122
-+sym_2_6122: la $2, sym_2_6122
-+.globl sym_2_6123
-+sym_2_6123: la $2, sym_2_6123
-+.globl sym_2_6124
-+sym_2_6124: la $2, sym_2_6124
-+.globl sym_2_6125
-+sym_2_6125: la $2, sym_2_6125
-+.globl sym_2_6126
-+sym_2_6126: la $2, sym_2_6126
-+.globl sym_2_6127
-+sym_2_6127: la $2, sym_2_6127
-+.globl sym_2_6128
-+sym_2_6128: la $2, sym_2_6128
-+.globl sym_2_6129
-+sym_2_6129: la $2, sym_2_6129
-+.globl sym_2_6130
-+sym_2_6130: la $2, sym_2_6130
-+.globl sym_2_6131
-+sym_2_6131: la $2, sym_2_6131
-+.globl sym_2_6132
-+sym_2_6132: la $2, sym_2_6132
-+.globl sym_2_6133
-+sym_2_6133: la $2, sym_2_6133
-+.globl sym_2_6134
-+sym_2_6134: la $2, sym_2_6134
-+.globl sym_2_6135
-+sym_2_6135: la $2, sym_2_6135
-+.globl sym_2_6136
-+sym_2_6136: la $2, sym_2_6136
-+.globl sym_2_6137
-+sym_2_6137: la $2, sym_2_6137
-+.globl sym_2_6138
-+sym_2_6138: la $2, sym_2_6138
-+.globl sym_2_6139
-+sym_2_6139: la $2, sym_2_6139
-+.globl sym_2_6140
-+sym_2_6140: la $2, sym_2_6140
-+.globl sym_2_6141
-+sym_2_6141: la $2, sym_2_6141
-+.globl sym_2_6142
-+sym_2_6142: la $2, sym_2_6142
-+.globl sym_2_6143
-+sym_2_6143: la $2, sym_2_6143
-+.globl sym_2_6144
-+sym_2_6144: la $2, sym_2_6144
-+.globl sym_2_6145
-+sym_2_6145: la $2, sym_2_6145
-+.globl sym_2_6146
-+sym_2_6146: la $2, sym_2_6146
-+.globl sym_2_6147
-+sym_2_6147: la $2, sym_2_6147
-+.globl sym_2_6148
-+sym_2_6148: la $2, sym_2_6148
-+.globl sym_2_6149
-+sym_2_6149: la $2, sym_2_6149
-+.globl sym_2_6150
-+sym_2_6150: la $2, sym_2_6150
-+.globl sym_2_6151
-+sym_2_6151: la $2, sym_2_6151
-+.globl sym_2_6152
-+sym_2_6152: la $2, sym_2_6152
-+.globl sym_2_6153
-+sym_2_6153: la $2, sym_2_6153
-+.globl sym_2_6154
-+sym_2_6154: la $2, sym_2_6154
-+.globl sym_2_6155
-+sym_2_6155: la $2, sym_2_6155
-+.globl sym_2_6156
-+sym_2_6156: la $2, sym_2_6156
-+.globl sym_2_6157
-+sym_2_6157: la $2, sym_2_6157
-+.globl sym_2_6158
-+sym_2_6158: la $2, sym_2_6158
-+.globl sym_2_6159
-+sym_2_6159: la $2, sym_2_6159
-+.globl sym_2_6160
-+sym_2_6160: la $2, sym_2_6160
-+.globl sym_2_6161
-+sym_2_6161: la $2, sym_2_6161
-+.globl sym_2_6162
-+sym_2_6162: la $2, sym_2_6162
-+.globl sym_2_6163
-+sym_2_6163: la $2, sym_2_6163
-+.globl sym_2_6164
-+sym_2_6164: la $2, sym_2_6164
-+.globl sym_2_6165
-+sym_2_6165: la $2, sym_2_6165
-+.globl sym_2_6166
-+sym_2_6166: la $2, sym_2_6166
-+.globl sym_2_6167
-+sym_2_6167: la $2, sym_2_6167
-+.globl sym_2_6168
-+sym_2_6168: la $2, sym_2_6168
-+.globl sym_2_6169
-+sym_2_6169: la $2, sym_2_6169
-+.globl sym_2_6170
-+sym_2_6170: la $2, sym_2_6170
-+.globl sym_2_6171
-+sym_2_6171: la $2, sym_2_6171
-+.globl sym_2_6172
-+sym_2_6172: la $2, sym_2_6172
-+.globl sym_2_6173
-+sym_2_6173: la $2, sym_2_6173
-+.globl sym_2_6174
-+sym_2_6174: la $2, sym_2_6174
-+.globl sym_2_6175
-+sym_2_6175: la $2, sym_2_6175
-+.globl sym_2_6176
-+sym_2_6176: la $2, sym_2_6176
-+.globl sym_2_6177
-+sym_2_6177: la $2, sym_2_6177
-+.globl sym_2_6178
-+sym_2_6178: la $2, sym_2_6178
-+.globl sym_2_6179
-+sym_2_6179: la $2, sym_2_6179
-+.globl sym_2_6180
-+sym_2_6180: la $2, sym_2_6180
-+.globl sym_2_6181
-+sym_2_6181: la $2, sym_2_6181
-+.globl sym_2_6182
-+sym_2_6182: la $2, sym_2_6182
-+.globl sym_2_6183
-+sym_2_6183: la $2, sym_2_6183
-+.globl sym_2_6184
-+sym_2_6184: la $2, sym_2_6184
-+.globl sym_2_6185
-+sym_2_6185: la $2, sym_2_6185
-+.globl sym_2_6186
-+sym_2_6186: la $2, sym_2_6186
-+.globl sym_2_6187
-+sym_2_6187: la $2, sym_2_6187
-+.globl sym_2_6188
-+sym_2_6188: la $2, sym_2_6188
-+.globl sym_2_6189
-+sym_2_6189: la $2, sym_2_6189
-+.globl sym_2_6190
-+sym_2_6190: la $2, sym_2_6190
-+.globl sym_2_6191
-+sym_2_6191: la $2, sym_2_6191
-+.globl sym_2_6192
-+sym_2_6192: la $2, sym_2_6192
-+.globl sym_2_6193
-+sym_2_6193: la $2, sym_2_6193
-+.globl sym_2_6194
-+sym_2_6194: la $2, sym_2_6194
-+.globl sym_2_6195
-+sym_2_6195: la $2, sym_2_6195
-+.globl sym_2_6196
-+sym_2_6196: la $2, sym_2_6196
-+.globl sym_2_6197
-+sym_2_6197: la $2, sym_2_6197
-+.globl sym_2_6198
-+sym_2_6198: la $2, sym_2_6198
-+.globl sym_2_6199
-+sym_2_6199: la $2, sym_2_6199
-+.globl sym_2_6200
-+sym_2_6200: la $2, sym_2_6200
-+.globl sym_2_6201
-+sym_2_6201: la $2, sym_2_6201
-+.globl sym_2_6202
-+sym_2_6202: la $2, sym_2_6202
-+.globl sym_2_6203
-+sym_2_6203: la $2, sym_2_6203
-+.globl sym_2_6204
-+sym_2_6204: la $2, sym_2_6204
-+.globl sym_2_6205
-+sym_2_6205: la $2, sym_2_6205
-+.globl sym_2_6206
-+sym_2_6206: la $2, sym_2_6206
-+.globl sym_2_6207
-+sym_2_6207: la $2, sym_2_6207
-+.globl sym_2_6208
-+sym_2_6208: la $2, sym_2_6208
-+.globl sym_2_6209
-+sym_2_6209: la $2, sym_2_6209
-+.globl sym_2_6210
-+sym_2_6210: la $2, sym_2_6210
-+.globl sym_2_6211
-+sym_2_6211: la $2, sym_2_6211
-+.globl sym_2_6212
-+sym_2_6212: la $2, sym_2_6212
-+.globl sym_2_6213
-+sym_2_6213: la $2, sym_2_6213
-+.globl sym_2_6214
-+sym_2_6214: la $2, sym_2_6214
-+.globl sym_2_6215
-+sym_2_6215: la $2, sym_2_6215
-+.globl sym_2_6216
-+sym_2_6216: la $2, sym_2_6216
-+.globl sym_2_6217
-+sym_2_6217: la $2, sym_2_6217
-+.globl sym_2_6218
-+sym_2_6218: la $2, sym_2_6218
-+.globl sym_2_6219
-+sym_2_6219: la $2, sym_2_6219
-+.globl sym_2_6220
-+sym_2_6220: la $2, sym_2_6220
-+.globl sym_2_6221
-+sym_2_6221: la $2, sym_2_6221
-+.globl sym_2_6222
-+sym_2_6222: la $2, sym_2_6222
-+.globl sym_2_6223
-+sym_2_6223: la $2, sym_2_6223
-+.globl sym_2_6224
-+sym_2_6224: la $2, sym_2_6224
-+.globl sym_2_6225
-+sym_2_6225: la $2, sym_2_6225
-+.globl sym_2_6226
-+sym_2_6226: la $2, sym_2_6226
-+.globl sym_2_6227
-+sym_2_6227: la $2, sym_2_6227
-+.globl sym_2_6228
-+sym_2_6228: la $2, sym_2_6228
-+.globl sym_2_6229
-+sym_2_6229: la $2, sym_2_6229
-+.globl sym_2_6230
-+sym_2_6230: la $2, sym_2_6230
-+.globl sym_2_6231
-+sym_2_6231: la $2, sym_2_6231
-+.globl sym_2_6232
-+sym_2_6232: la $2, sym_2_6232
-+.globl sym_2_6233
-+sym_2_6233: la $2, sym_2_6233
-+.globl sym_2_6234
-+sym_2_6234: la $2, sym_2_6234
-+.globl sym_2_6235
-+sym_2_6235: la $2, sym_2_6235
-+.globl sym_2_6236
-+sym_2_6236: la $2, sym_2_6236
-+.globl sym_2_6237
-+sym_2_6237: la $2, sym_2_6237
-+.globl sym_2_6238
-+sym_2_6238: la $2, sym_2_6238
-+.globl sym_2_6239
-+sym_2_6239: la $2, sym_2_6239
-+.globl sym_2_6240
-+sym_2_6240: la $2, sym_2_6240
-+.globl sym_2_6241
-+sym_2_6241: la $2, sym_2_6241
-+.globl sym_2_6242
-+sym_2_6242: la $2, sym_2_6242
-+.globl sym_2_6243
-+sym_2_6243: la $2, sym_2_6243
-+.globl sym_2_6244
-+sym_2_6244: la $2, sym_2_6244
-+.globl sym_2_6245
-+sym_2_6245: la $2, sym_2_6245
-+.globl sym_2_6246
-+sym_2_6246: la $2, sym_2_6246
-+.globl sym_2_6247
-+sym_2_6247: la $2, sym_2_6247
-+.globl sym_2_6248
-+sym_2_6248: la $2, sym_2_6248
-+.globl sym_2_6249
-+sym_2_6249: la $2, sym_2_6249
-+.globl sym_2_6250
-+sym_2_6250: la $2, sym_2_6250
-+.globl sym_2_6251
-+sym_2_6251: la $2, sym_2_6251
-+.globl sym_2_6252
-+sym_2_6252: la $2, sym_2_6252
-+.globl sym_2_6253
-+sym_2_6253: la $2, sym_2_6253
-+.globl sym_2_6254
-+sym_2_6254: la $2, sym_2_6254
-+.globl sym_2_6255
-+sym_2_6255: la $2, sym_2_6255
-+.globl sym_2_6256
-+sym_2_6256: la $2, sym_2_6256
-+.globl sym_2_6257
-+sym_2_6257: la $2, sym_2_6257
-+.globl sym_2_6258
-+sym_2_6258: la $2, sym_2_6258
-+.globl sym_2_6259
-+sym_2_6259: la $2, sym_2_6259
-+.globl sym_2_6260
-+sym_2_6260: la $2, sym_2_6260
-+.globl sym_2_6261
-+sym_2_6261: la $2, sym_2_6261
-+.globl sym_2_6262
-+sym_2_6262: la $2, sym_2_6262
-+.globl sym_2_6263
-+sym_2_6263: la $2, sym_2_6263
-+.globl sym_2_6264
-+sym_2_6264: la $2, sym_2_6264
-+.globl sym_2_6265
-+sym_2_6265: la $2, sym_2_6265
-+.globl sym_2_6266
-+sym_2_6266: la $2, sym_2_6266
-+.globl sym_2_6267
-+sym_2_6267: la $2, sym_2_6267
-+.globl sym_2_6268
-+sym_2_6268: la $2, sym_2_6268
-+.globl sym_2_6269
-+sym_2_6269: la $2, sym_2_6269
-+.globl sym_2_6270
-+sym_2_6270: la $2, sym_2_6270
-+.globl sym_2_6271
-+sym_2_6271: la $2, sym_2_6271
-+.globl sym_2_6272
-+sym_2_6272: la $2, sym_2_6272
-+.globl sym_2_6273
-+sym_2_6273: la $2, sym_2_6273
-+.globl sym_2_6274
-+sym_2_6274: la $2, sym_2_6274
-+.globl sym_2_6275
-+sym_2_6275: la $2, sym_2_6275
-+.globl sym_2_6276
-+sym_2_6276: la $2, sym_2_6276
-+.globl sym_2_6277
-+sym_2_6277: la $2, sym_2_6277
-+.globl sym_2_6278
-+sym_2_6278: la $2, sym_2_6278
-+.globl sym_2_6279
-+sym_2_6279: la $2, sym_2_6279
-+.globl sym_2_6280
-+sym_2_6280: la $2, sym_2_6280
-+.globl sym_2_6281
-+sym_2_6281: la $2, sym_2_6281
-+.globl sym_2_6282
-+sym_2_6282: la $2, sym_2_6282
-+.globl sym_2_6283
-+sym_2_6283: la $2, sym_2_6283
-+.globl sym_2_6284
-+sym_2_6284: la $2, sym_2_6284
-+.globl sym_2_6285
-+sym_2_6285: la $2, sym_2_6285
-+.globl sym_2_6286
-+sym_2_6286: la $2, sym_2_6286
-+.globl sym_2_6287
-+sym_2_6287: la $2, sym_2_6287
-+.globl sym_2_6288
-+sym_2_6288: la $2, sym_2_6288
-+.globl sym_2_6289
-+sym_2_6289: la $2, sym_2_6289
-+.globl sym_2_6290
-+sym_2_6290: la $2, sym_2_6290
-+.globl sym_2_6291
-+sym_2_6291: la $2, sym_2_6291
-+.globl sym_2_6292
-+sym_2_6292: la $2, sym_2_6292
-+.globl sym_2_6293
-+sym_2_6293: la $2, sym_2_6293
-+.globl sym_2_6294
-+sym_2_6294: la $2, sym_2_6294
-+.globl sym_2_6295
-+sym_2_6295: la $2, sym_2_6295
-+.globl sym_2_6296
-+sym_2_6296: la $2, sym_2_6296
-+.globl sym_2_6297
-+sym_2_6297: la $2, sym_2_6297
-+.globl sym_2_6298
-+sym_2_6298: la $2, sym_2_6298
-+.globl sym_2_6299
-+sym_2_6299: la $2, sym_2_6299
-+.globl sym_2_6300
-+sym_2_6300: la $2, sym_2_6300
-+.globl sym_2_6301
-+sym_2_6301: la $2, sym_2_6301
-+.globl sym_2_6302
-+sym_2_6302: la $2, sym_2_6302
-+.globl sym_2_6303
-+sym_2_6303: la $2, sym_2_6303
-+.globl sym_2_6304
-+sym_2_6304: la $2, sym_2_6304
-+.globl sym_2_6305
-+sym_2_6305: la $2, sym_2_6305
-+.globl sym_2_6306
-+sym_2_6306: la $2, sym_2_6306
-+.globl sym_2_6307
-+sym_2_6307: la $2, sym_2_6307
-+.globl sym_2_6308
-+sym_2_6308: la $2, sym_2_6308
-+.globl sym_2_6309
-+sym_2_6309: la $2, sym_2_6309
-+.globl sym_2_6310
-+sym_2_6310: la $2, sym_2_6310
-+.globl sym_2_6311
-+sym_2_6311: la $2, sym_2_6311
-+.globl sym_2_6312
-+sym_2_6312: la $2, sym_2_6312
-+.globl sym_2_6313
-+sym_2_6313: la $2, sym_2_6313
-+.globl sym_2_6314
-+sym_2_6314: la $2, sym_2_6314
-+.globl sym_2_6315
-+sym_2_6315: la $2, sym_2_6315
-+.globl sym_2_6316
-+sym_2_6316: la $2, sym_2_6316
-+.globl sym_2_6317
-+sym_2_6317: la $2, sym_2_6317
-+.globl sym_2_6318
-+sym_2_6318: la $2, sym_2_6318
-+.globl sym_2_6319
-+sym_2_6319: la $2, sym_2_6319
-+.globl sym_2_6320
-+sym_2_6320: la $2, sym_2_6320
-+.globl sym_2_6321
-+sym_2_6321: la $2, sym_2_6321
-+.globl sym_2_6322
-+sym_2_6322: la $2, sym_2_6322
-+.globl sym_2_6323
-+sym_2_6323: la $2, sym_2_6323
-+.globl sym_2_6324
-+sym_2_6324: la $2, sym_2_6324
-+.globl sym_2_6325
-+sym_2_6325: la $2, sym_2_6325
-+.globl sym_2_6326
-+sym_2_6326: la $2, sym_2_6326
-+.globl sym_2_6327
-+sym_2_6327: la $2, sym_2_6327
-+.globl sym_2_6328
-+sym_2_6328: la $2, sym_2_6328
-+.globl sym_2_6329
-+sym_2_6329: la $2, sym_2_6329
-+.globl sym_2_6330
-+sym_2_6330: la $2, sym_2_6330
-+.globl sym_2_6331
-+sym_2_6331: la $2, sym_2_6331
-+.globl sym_2_6332
-+sym_2_6332: la $2, sym_2_6332
-+.globl sym_2_6333
-+sym_2_6333: la $2, sym_2_6333
-+.globl sym_2_6334
-+sym_2_6334: la $2, sym_2_6334
-+.globl sym_2_6335
-+sym_2_6335: la $2, sym_2_6335
-+.globl sym_2_6336
-+sym_2_6336: la $2, sym_2_6336
-+.globl sym_2_6337
-+sym_2_6337: la $2, sym_2_6337
-+.globl sym_2_6338
-+sym_2_6338: la $2, sym_2_6338
-+.globl sym_2_6339
-+sym_2_6339: la $2, sym_2_6339
-+.globl sym_2_6340
-+sym_2_6340: la $2, sym_2_6340
-+.globl sym_2_6341
-+sym_2_6341: la $2, sym_2_6341
-+.globl sym_2_6342
-+sym_2_6342: la $2, sym_2_6342
-+.globl sym_2_6343
-+sym_2_6343: la $2, sym_2_6343
-+.globl sym_2_6344
-+sym_2_6344: la $2, sym_2_6344
-+.globl sym_2_6345
-+sym_2_6345: la $2, sym_2_6345
-+.globl sym_2_6346
-+sym_2_6346: la $2, sym_2_6346
-+.globl sym_2_6347
-+sym_2_6347: la $2, sym_2_6347
-+.globl sym_2_6348
-+sym_2_6348: la $2, sym_2_6348
-+.globl sym_2_6349
-+sym_2_6349: la $2, sym_2_6349
-+.globl sym_2_6350
-+sym_2_6350: la $2, sym_2_6350
-+.globl sym_2_6351
-+sym_2_6351: la $2, sym_2_6351
-+.globl sym_2_6352
-+sym_2_6352: la $2, sym_2_6352
-+.globl sym_2_6353
-+sym_2_6353: la $2, sym_2_6353
-+.globl sym_2_6354
-+sym_2_6354: la $2, sym_2_6354
-+.globl sym_2_6355
-+sym_2_6355: la $2, sym_2_6355
-+.globl sym_2_6356
-+sym_2_6356: la $2, sym_2_6356
-+.globl sym_2_6357
-+sym_2_6357: la $2, sym_2_6357
-+.globl sym_2_6358
-+sym_2_6358: la $2, sym_2_6358
-+.globl sym_2_6359
-+sym_2_6359: la $2, sym_2_6359
-+.globl sym_2_6360
-+sym_2_6360: la $2, sym_2_6360
-+.globl sym_2_6361
-+sym_2_6361: la $2, sym_2_6361
-+.globl sym_2_6362
-+sym_2_6362: la $2, sym_2_6362
-+.globl sym_2_6363
-+sym_2_6363: la $2, sym_2_6363
-+.globl sym_2_6364
-+sym_2_6364: la $2, sym_2_6364
-+.globl sym_2_6365
-+sym_2_6365: la $2, sym_2_6365
-+.globl sym_2_6366
-+sym_2_6366: la $2, sym_2_6366
-+.globl sym_2_6367
-+sym_2_6367: la $2, sym_2_6367
-+.globl sym_2_6368
-+sym_2_6368: la $2, sym_2_6368
-+.globl sym_2_6369
-+sym_2_6369: la $2, sym_2_6369
-+.globl sym_2_6370
-+sym_2_6370: la $2, sym_2_6370
-+.globl sym_2_6371
-+sym_2_6371: la $2, sym_2_6371
-+.globl sym_2_6372
-+sym_2_6372: la $2, sym_2_6372
-+.globl sym_2_6373
-+sym_2_6373: la $2, sym_2_6373
-+.globl sym_2_6374
-+sym_2_6374: la $2, sym_2_6374
-+.globl sym_2_6375
-+sym_2_6375: la $2, sym_2_6375
-+.globl sym_2_6376
-+sym_2_6376: la $2, sym_2_6376
-+.globl sym_2_6377
-+sym_2_6377: la $2, sym_2_6377
-+.globl sym_2_6378
-+sym_2_6378: la $2, sym_2_6378
-+.globl sym_2_6379
-+sym_2_6379: la $2, sym_2_6379
-+.globl sym_2_6380
-+sym_2_6380: la $2, sym_2_6380
-+.globl sym_2_6381
-+sym_2_6381: la $2, sym_2_6381
-+.globl sym_2_6382
-+sym_2_6382: la $2, sym_2_6382
-+.globl sym_2_6383
-+sym_2_6383: la $2, sym_2_6383
-+.globl sym_2_6384
-+sym_2_6384: la $2, sym_2_6384
-+.globl sym_2_6385
-+sym_2_6385: la $2, sym_2_6385
-+.globl sym_2_6386
-+sym_2_6386: la $2, sym_2_6386
-+.globl sym_2_6387
-+sym_2_6387: la $2, sym_2_6387
-+.globl sym_2_6388
-+sym_2_6388: la $2, sym_2_6388
-+.globl sym_2_6389
-+sym_2_6389: la $2, sym_2_6389
-+.globl sym_2_6390
-+sym_2_6390: la $2, sym_2_6390
-+.globl sym_2_6391
-+sym_2_6391: la $2, sym_2_6391
-+.globl sym_2_6392
-+sym_2_6392: la $2, sym_2_6392
-+.globl sym_2_6393
-+sym_2_6393: la $2, sym_2_6393
-+.globl sym_2_6394
-+sym_2_6394: la $2, sym_2_6394
-+.globl sym_2_6395
-+sym_2_6395: la $2, sym_2_6395
-+.globl sym_2_6396
-+sym_2_6396: la $2, sym_2_6396
-+.globl sym_2_6397
-+sym_2_6397: la $2, sym_2_6397
-+.globl sym_2_6398
-+sym_2_6398: la $2, sym_2_6398
-+.globl sym_2_6399
-+sym_2_6399: la $2, sym_2_6399
-+.globl sym_2_6400
-+sym_2_6400: la $2, sym_2_6400
-+.globl sym_2_6401
-+sym_2_6401: la $2, sym_2_6401
-+.globl sym_2_6402
-+sym_2_6402: la $2, sym_2_6402
-+.globl sym_2_6403
-+sym_2_6403: la $2, sym_2_6403
-+.globl sym_2_6404
-+sym_2_6404: la $2, sym_2_6404
-+.globl sym_2_6405
-+sym_2_6405: la $2, sym_2_6405
-+.globl sym_2_6406
-+sym_2_6406: la $2, sym_2_6406
-+.globl sym_2_6407
-+sym_2_6407: la $2, sym_2_6407
-+.globl sym_2_6408
-+sym_2_6408: la $2, sym_2_6408
-+.globl sym_2_6409
-+sym_2_6409: la $2, sym_2_6409
-+.globl sym_2_6410
-+sym_2_6410: la $2, sym_2_6410
-+.globl sym_2_6411
-+sym_2_6411: la $2, sym_2_6411
-+.globl sym_2_6412
-+sym_2_6412: la $2, sym_2_6412
-+.globl sym_2_6413
-+sym_2_6413: la $2, sym_2_6413
-+.globl sym_2_6414
-+sym_2_6414: la $2, sym_2_6414
-+.globl sym_2_6415
-+sym_2_6415: la $2, sym_2_6415
-+.globl sym_2_6416
-+sym_2_6416: la $2, sym_2_6416
-+.globl sym_2_6417
-+sym_2_6417: la $2, sym_2_6417
-+.globl sym_2_6418
-+sym_2_6418: la $2, sym_2_6418
-+.globl sym_2_6419
-+sym_2_6419: la $2, sym_2_6419
-+.globl sym_2_6420
-+sym_2_6420: la $2, sym_2_6420
-+.globl sym_2_6421
-+sym_2_6421: la $2, sym_2_6421
-+.globl sym_2_6422
-+sym_2_6422: la $2, sym_2_6422
-+.globl sym_2_6423
-+sym_2_6423: la $2, sym_2_6423
-+.globl sym_2_6424
-+sym_2_6424: la $2, sym_2_6424
-+.globl sym_2_6425
-+sym_2_6425: la $2, sym_2_6425
-+.globl sym_2_6426
-+sym_2_6426: la $2, sym_2_6426
-+.globl sym_2_6427
-+sym_2_6427: la $2, sym_2_6427
-+.globl sym_2_6428
-+sym_2_6428: la $2, sym_2_6428
-+.globl sym_2_6429
-+sym_2_6429: la $2, sym_2_6429
-+.globl sym_2_6430
-+sym_2_6430: la $2, sym_2_6430
-+.globl sym_2_6431
-+sym_2_6431: la $2, sym_2_6431
-+.globl sym_2_6432
-+sym_2_6432: la $2, sym_2_6432
-+.globl sym_2_6433
-+sym_2_6433: la $2, sym_2_6433
-+.globl sym_2_6434
-+sym_2_6434: la $2, sym_2_6434
-+.globl sym_2_6435
-+sym_2_6435: la $2, sym_2_6435
-+.globl sym_2_6436
-+sym_2_6436: la $2, sym_2_6436
-+.globl sym_2_6437
-+sym_2_6437: la $2, sym_2_6437
-+.globl sym_2_6438
-+sym_2_6438: la $2, sym_2_6438
-+.globl sym_2_6439
-+sym_2_6439: la $2, sym_2_6439
-+.globl sym_2_6440
-+sym_2_6440: la $2, sym_2_6440
-+.globl sym_2_6441
-+sym_2_6441: la $2, sym_2_6441
-+.globl sym_2_6442
-+sym_2_6442: la $2, sym_2_6442
-+.globl sym_2_6443
-+sym_2_6443: la $2, sym_2_6443
-+.globl sym_2_6444
-+sym_2_6444: la $2, sym_2_6444
-+.globl sym_2_6445
-+sym_2_6445: la $2, sym_2_6445
-+.globl sym_2_6446
-+sym_2_6446: la $2, sym_2_6446
-+.globl sym_2_6447
-+sym_2_6447: la $2, sym_2_6447
-+.globl sym_2_6448
-+sym_2_6448: la $2, sym_2_6448
-+.globl sym_2_6449
-+sym_2_6449: la $2, sym_2_6449
-+.globl sym_2_6450
-+sym_2_6450: la $2, sym_2_6450
-+.globl sym_2_6451
-+sym_2_6451: la $2, sym_2_6451
-+.globl sym_2_6452
-+sym_2_6452: la $2, sym_2_6452
-+.globl sym_2_6453
-+sym_2_6453: la $2, sym_2_6453
-+.globl sym_2_6454
-+sym_2_6454: la $2, sym_2_6454
-+.globl sym_2_6455
-+sym_2_6455: la $2, sym_2_6455
-+.globl sym_2_6456
-+sym_2_6456: la $2, sym_2_6456
-+.globl sym_2_6457
-+sym_2_6457: la $2, sym_2_6457
-+.globl sym_2_6458
-+sym_2_6458: la $2, sym_2_6458
-+.globl sym_2_6459
-+sym_2_6459: la $2, sym_2_6459
-+.globl sym_2_6460
-+sym_2_6460: la $2, sym_2_6460
-+.globl sym_2_6461
-+sym_2_6461: la $2, sym_2_6461
-+.globl sym_2_6462
-+sym_2_6462: la $2, sym_2_6462
-+.globl sym_2_6463
-+sym_2_6463: la $2, sym_2_6463
-+.globl sym_2_6464
-+sym_2_6464: la $2, sym_2_6464
-+.globl sym_2_6465
-+sym_2_6465: la $2, sym_2_6465
-+.globl sym_2_6466
-+sym_2_6466: la $2, sym_2_6466
-+.globl sym_2_6467
-+sym_2_6467: la $2, sym_2_6467
-+.globl sym_2_6468
-+sym_2_6468: la $2, sym_2_6468
-+.globl sym_2_6469
-+sym_2_6469: la $2, sym_2_6469
-+.globl sym_2_6470
-+sym_2_6470: la $2, sym_2_6470
-+.globl sym_2_6471
-+sym_2_6471: la $2, sym_2_6471
-+.globl sym_2_6472
-+sym_2_6472: la $2, sym_2_6472
-+.globl sym_2_6473
-+sym_2_6473: la $2, sym_2_6473
-+.globl sym_2_6474
-+sym_2_6474: la $2, sym_2_6474
-+.globl sym_2_6475
-+sym_2_6475: la $2, sym_2_6475
-+.globl sym_2_6476
-+sym_2_6476: la $2, sym_2_6476
-+.globl sym_2_6477
-+sym_2_6477: la $2, sym_2_6477
-+.globl sym_2_6478
-+sym_2_6478: la $2, sym_2_6478
-+.globl sym_2_6479
-+sym_2_6479: la $2, sym_2_6479
-+.globl sym_2_6480
-+sym_2_6480: la $2, sym_2_6480
-+.globl sym_2_6481
-+sym_2_6481: la $2, sym_2_6481
-+.globl sym_2_6482
-+sym_2_6482: la $2, sym_2_6482
-+.globl sym_2_6483
-+sym_2_6483: la $2, sym_2_6483
-+.globl sym_2_6484
-+sym_2_6484: la $2, sym_2_6484
-+.globl sym_2_6485
-+sym_2_6485: la $2, sym_2_6485
-+.globl sym_2_6486
-+sym_2_6486: la $2, sym_2_6486
-+.globl sym_2_6487
-+sym_2_6487: la $2, sym_2_6487
-+.globl sym_2_6488
-+sym_2_6488: la $2, sym_2_6488
-+.globl sym_2_6489
-+sym_2_6489: la $2, sym_2_6489
-+.globl sym_2_6490
-+sym_2_6490: la $2, sym_2_6490
-+.globl sym_2_6491
-+sym_2_6491: la $2, sym_2_6491
-+.globl sym_2_6492
-+sym_2_6492: la $2, sym_2_6492
-+.globl sym_2_6493
-+sym_2_6493: la $2, sym_2_6493
-+.globl sym_2_6494
-+sym_2_6494: la $2, sym_2_6494
-+.globl sym_2_6495
-+sym_2_6495: la $2, sym_2_6495
-+.globl sym_2_6496
-+sym_2_6496: la $2, sym_2_6496
-+.globl sym_2_6497
-+sym_2_6497: la $2, sym_2_6497
-+.globl sym_2_6498
-+sym_2_6498: la $2, sym_2_6498
-+.globl sym_2_6499
-+sym_2_6499: la $2, sym_2_6499
-+.globl sym_2_6500
-+sym_2_6500: la $2, sym_2_6500
-+.globl sym_2_6501
-+sym_2_6501: la $2, sym_2_6501
-+.globl sym_2_6502
-+sym_2_6502: la $2, sym_2_6502
-+.globl sym_2_6503
-+sym_2_6503: la $2, sym_2_6503
-+.globl sym_2_6504
-+sym_2_6504: la $2, sym_2_6504
-+.globl sym_2_6505
-+sym_2_6505: la $2, sym_2_6505
-+.globl sym_2_6506
-+sym_2_6506: la $2, sym_2_6506
-+.globl sym_2_6507
-+sym_2_6507: la $2, sym_2_6507
-+.globl sym_2_6508
-+sym_2_6508: la $2, sym_2_6508
-+.globl sym_2_6509
-+sym_2_6509: la $2, sym_2_6509
-+.globl sym_2_6510
-+sym_2_6510: la $2, sym_2_6510
-+.globl sym_2_6511
-+sym_2_6511: la $2, sym_2_6511
-+.globl sym_2_6512
-+sym_2_6512: la $2, sym_2_6512
-+.globl sym_2_6513
-+sym_2_6513: la $2, sym_2_6513
-+.globl sym_2_6514
-+sym_2_6514: la $2, sym_2_6514
-+.globl sym_2_6515
-+sym_2_6515: la $2, sym_2_6515
-+.globl sym_2_6516
-+sym_2_6516: la $2, sym_2_6516
-+.globl sym_2_6517
-+sym_2_6517: la $2, sym_2_6517
-+.globl sym_2_6518
-+sym_2_6518: la $2, sym_2_6518
-+.globl sym_2_6519
-+sym_2_6519: la $2, sym_2_6519
-+.globl sym_2_6520
-+sym_2_6520: la $2, sym_2_6520
-+.globl sym_2_6521
-+sym_2_6521: la $2, sym_2_6521
-+.globl sym_2_6522
-+sym_2_6522: la $2, sym_2_6522
-+.globl sym_2_6523
-+sym_2_6523: la $2, sym_2_6523
-+.globl sym_2_6524
-+sym_2_6524: la $2, sym_2_6524
-+.globl sym_2_6525
-+sym_2_6525: la $2, sym_2_6525
-+.globl sym_2_6526
-+sym_2_6526: la $2, sym_2_6526
-+.globl sym_2_6527
-+sym_2_6527: la $2, sym_2_6527
-+.globl sym_2_6528
-+sym_2_6528: la $2, sym_2_6528
-+.globl sym_2_6529
-+sym_2_6529: la $2, sym_2_6529
-+.globl sym_2_6530
-+sym_2_6530: la $2, sym_2_6530
-+.globl sym_2_6531
-+sym_2_6531: la $2, sym_2_6531
-+.globl sym_2_6532
-+sym_2_6532: la $2, sym_2_6532
-+.globl sym_2_6533
-+sym_2_6533: la $2, sym_2_6533
-+.globl sym_2_6534
-+sym_2_6534: la $2, sym_2_6534
-+.globl sym_2_6535
-+sym_2_6535: la $2, sym_2_6535
-+.globl sym_2_6536
-+sym_2_6536: la $2, sym_2_6536
-+.globl sym_2_6537
-+sym_2_6537: la $2, sym_2_6537
-+.globl sym_2_6538
-+sym_2_6538: la $2, sym_2_6538
-+.globl sym_2_6539
-+sym_2_6539: la $2, sym_2_6539
-+.globl sym_2_6540
-+sym_2_6540: la $2, sym_2_6540
-+.globl sym_2_6541
-+sym_2_6541: la $2, sym_2_6541
-+.globl sym_2_6542
-+sym_2_6542: la $2, sym_2_6542
-+.globl sym_2_6543
-+sym_2_6543: la $2, sym_2_6543
-+.globl sym_2_6544
-+sym_2_6544: la $2, sym_2_6544
-+.globl sym_2_6545
-+sym_2_6545: la $2, sym_2_6545
-+.globl sym_2_6546
-+sym_2_6546: la $2, sym_2_6546
-+.globl sym_2_6547
-+sym_2_6547: la $2, sym_2_6547
-+.globl sym_2_6548
-+sym_2_6548: la $2, sym_2_6548
-+.globl sym_2_6549
-+sym_2_6549: la $2, sym_2_6549
-+.globl sym_2_6550
-+sym_2_6550: la $2, sym_2_6550
-+.globl sym_2_6551
-+sym_2_6551: la $2, sym_2_6551
-+.globl sym_2_6552
-+sym_2_6552: la $2, sym_2_6552
-+.globl sym_2_6553
-+sym_2_6553: la $2, sym_2_6553
-+.globl sym_2_6554
-+sym_2_6554: la $2, sym_2_6554
-+.globl sym_2_6555
-+sym_2_6555: la $2, sym_2_6555
-+.globl sym_2_6556
-+sym_2_6556: la $2, sym_2_6556
-+.globl sym_2_6557
-+sym_2_6557: la $2, sym_2_6557
-+.globl sym_2_6558
-+sym_2_6558: la $2, sym_2_6558
-+.globl sym_2_6559
-+sym_2_6559: la $2, sym_2_6559
-+.globl sym_2_6560
-+sym_2_6560: la $2, sym_2_6560
-+.globl sym_2_6561
-+sym_2_6561: la $2, sym_2_6561
-+.globl sym_2_6562
-+sym_2_6562: la $2, sym_2_6562
-+.globl sym_2_6563
-+sym_2_6563: la $2, sym_2_6563
-+.globl sym_2_6564
-+sym_2_6564: la $2, sym_2_6564
-+.globl sym_2_6565
-+sym_2_6565: la $2, sym_2_6565
-+.globl sym_2_6566
-+sym_2_6566: la $2, sym_2_6566
-+.globl sym_2_6567
-+sym_2_6567: la $2, sym_2_6567
-+.globl sym_2_6568
-+sym_2_6568: la $2, sym_2_6568
-+.globl sym_2_6569
-+sym_2_6569: la $2, sym_2_6569
-+.globl sym_2_6570
-+sym_2_6570: la $2, sym_2_6570
-+.globl sym_2_6571
-+sym_2_6571: la $2, sym_2_6571
-+.globl sym_2_6572
-+sym_2_6572: la $2, sym_2_6572
-+.globl sym_2_6573
-+sym_2_6573: la $2, sym_2_6573
-+.globl sym_2_6574
-+sym_2_6574: la $2, sym_2_6574
-+.globl sym_2_6575
-+sym_2_6575: la $2, sym_2_6575
-+.globl sym_2_6576
-+sym_2_6576: la $2, sym_2_6576
-+.globl sym_2_6577
-+sym_2_6577: la $2, sym_2_6577
-+.globl sym_2_6578
-+sym_2_6578: la $2, sym_2_6578
-+.globl sym_2_6579
-+sym_2_6579: la $2, sym_2_6579
-+.globl sym_2_6580
-+sym_2_6580: la $2, sym_2_6580
-+.globl sym_2_6581
-+sym_2_6581: la $2, sym_2_6581
-+.globl sym_2_6582
-+sym_2_6582: la $2, sym_2_6582
-+.globl sym_2_6583
-+sym_2_6583: la $2, sym_2_6583
-+.globl sym_2_6584
-+sym_2_6584: la $2, sym_2_6584
-+.globl sym_2_6585
-+sym_2_6585: la $2, sym_2_6585
-+.globl sym_2_6586
-+sym_2_6586: la $2, sym_2_6586
-+.globl sym_2_6587
-+sym_2_6587: la $2, sym_2_6587
-+.globl sym_2_6588
-+sym_2_6588: la $2, sym_2_6588
-+.globl sym_2_6589
-+sym_2_6589: la $2, sym_2_6589
-+.globl sym_2_6590
-+sym_2_6590: la $2, sym_2_6590
-+.globl sym_2_6591
-+sym_2_6591: la $2, sym_2_6591
-+.globl sym_2_6592
-+sym_2_6592: la $2, sym_2_6592
-+.globl sym_2_6593
-+sym_2_6593: la $2, sym_2_6593
-+.globl sym_2_6594
-+sym_2_6594: la $2, sym_2_6594
-+.globl sym_2_6595
-+sym_2_6595: la $2, sym_2_6595
-+.globl sym_2_6596
-+sym_2_6596: la $2, sym_2_6596
-+.globl sym_2_6597
-+sym_2_6597: la $2, sym_2_6597
-+.globl sym_2_6598
-+sym_2_6598: la $2, sym_2_6598
-+.globl sym_2_6599
-+sym_2_6599: la $2, sym_2_6599
-+.globl sym_2_6600
-+sym_2_6600: la $2, sym_2_6600
-+.globl sym_2_6601
-+sym_2_6601: la $2, sym_2_6601
-+.globl sym_2_6602
-+sym_2_6602: la $2, sym_2_6602
-+.globl sym_2_6603
-+sym_2_6603: la $2, sym_2_6603
-+.globl sym_2_6604
-+sym_2_6604: la $2, sym_2_6604
-+.globl sym_2_6605
-+sym_2_6605: la $2, sym_2_6605
-+.globl sym_2_6606
-+sym_2_6606: la $2, sym_2_6606
-+.globl sym_2_6607
-+sym_2_6607: la $2, sym_2_6607
-+.globl sym_2_6608
-+sym_2_6608: la $2, sym_2_6608
-+.globl sym_2_6609
-+sym_2_6609: la $2, sym_2_6609
-+.globl sym_2_6610
-+sym_2_6610: la $2, sym_2_6610
-+.globl sym_2_6611
-+sym_2_6611: la $2, sym_2_6611
-+.globl sym_2_6612
-+sym_2_6612: la $2, sym_2_6612
-+.globl sym_2_6613
-+sym_2_6613: la $2, sym_2_6613
-+.globl sym_2_6614
-+sym_2_6614: la $2, sym_2_6614
-+.globl sym_2_6615
-+sym_2_6615: la $2, sym_2_6615
-+.globl sym_2_6616
-+sym_2_6616: la $2, sym_2_6616
-+.globl sym_2_6617
-+sym_2_6617: la $2, sym_2_6617
-+.globl sym_2_6618
-+sym_2_6618: la $2, sym_2_6618
-+.globl sym_2_6619
-+sym_2_6619: la $2, sym_2_6619
-+.globl sym_2_6620
-+sym_2_6620: la $2, sym_2_6620
-+.globl sym_2_6621
-+sym_2_6621: la $2, sym_2_6621
-+.globl sym_2_6622
-+sym_2_6622: la $2, sym_2_6622
-+.globl sym_2_6623
-+sym_2_6623: la $2, sym_2_6623
-+.globl sym_2_6624
-+sym_2_6624: la $2, sym_2_6624
-+.globl sym_2_6625
-+sym_2_6625: la $2, sym_2_6625
-+.globl sym_2_6626
-+sym_2_6626: la $2, sym_2_6626
-+.globl sym_2_6627
-+sym_2_6627: la $2, sym_2_6627
-+.globl sym_2_6628
-+sym_2_6628: la $2, sym_2_6628
-+.globl sym_2_6629
-+sym_2_6629: la $2, sym_2_6629
-+.globl sym_2_6630
-+sym_2_6630: la $2, sym_2_6630
-+.globl sym_2_6631
-+sym_2_6631: la $2, sym_2_6631
-+.globl sym_2_6632
-+sym_2_6632: la $2, sym_2_6632
-+.globl sym_2_6633
-+sym_2_6633: la $2, sym_2_6633
-+.globl sym_2_6634
-+sym_2_6634: la $2, sym_2_6634
-+.globl sym_2_6635
-+sym_2_6635: la $2, sym_2_6635
-+.globl sym_2_6636
-+sym_2_6636: la $2, sym_2_6636
-+.globl sym_2_6637
-+sym_2_6637: la $2, sym_2_6637
-+.globl sym_2_6638
-+sym_2_6638: la $2, sym_2_6638
-+.globl sym_2_6639
-+sym_2_6639: la $2, sym_2_6639
-+.globl sym_2_6640
-+sym_2_6640: la $2, sym_2_6640
-+.globl sym_2_6641
-+sym_2_6641: la $2, sym_2_6641
-+.globl sym_2_6642
-+sym_2_6642: la $2, sym_2_6642
-+.globl sym_2_6643
-+sym_2_6643: la $2, sym_2_6643
-+.globl sym_2_6644
-+sym_2_6644: la $2, sym_2_6644
-+.globl sym_2_6645
-+sym_2_6645: la $2, sym_2_6645
-+.globl sym_2_6646
-+sym_2_6646: la $2, sym_2_6646
-+.globl sym_2_6647
-+sym_2_6647: la $2, sym_2_6647
-+.globl sym_2_6648
-+sym_2_6648: la $2, sym_2_6648
-+.globl sym_2_6649
-+sym_2_6649: la $2, sym_2_6649
-+.globl sym_2_6650
-+sym_2_6650: la $2, sym_2_6650
-+.globl sym_2_6651
-+sym_2_6651: la $2, sym_2_6651
-+.globl sym_2_6652
-+sym_2_6652: la $2, sym_2_6652
-+.globl sym_2_6653
-+sym_2_6653: la $2, sym_2_6653
-+.globl sym_2_6654
-+sym_2_6654: la $2, sym_2_6654
-+.globl sym_2_6655
-+sym_2_6655: la $2, sym_2_6655
-+.globl sym_2_6656
-+sym_2_6656: la $2, sym_2_6656
-+.globl sym_2_6657
-+sym_2_6657: la $2, sym_2_6657
-+.globl sym_2_6658
-+sym_2_6658: la $2, sym_2_6658
-+.globl sym_2_6659
-+sym_2_6659: la $2, sym_2_6659
-+.globl sym_2_6660
-+sym_2_6660: la $2, sym_2_6660
-+.globl sym_2_6661
-+sym_2_6661: la $2, sym_2_6661
-+.globl sym_2_6662
-+sym_2_6662: la $2, sym_2_6662
-+.globl sym_2_6663
-+sym_2_6663: la $2, sym_2_6663
-+.globl sym_2_6664
-+sym_2_6664: la $2, sym_2_6664
-+.globl sym_2_6665
-+sym_2_6665: la $2, sym_2_6665
-+.globl sym_2_6666
-+sym_2_6666: la $2, sym_2_6666
-+.globl sym_2_6667
-+sym_2_6667: la $2, sym_2_6667
-+.globl sym_2_6668
-+sym_2_6668: la $2, sym_2_6668
-+.globl sym_2_6669
-+sym_2_6669: la $2, sym_2_6669
-+.globl sym_2_6670
-+sym_2_6670: la $2, sym_2_6670
-+.globl sym_2_6671
-+sym_2_6671: la $2, sym_2_6671
-+.globl sym_2_6672
-+sym_2_6672: la $2, sym_2_6672
-+.globl sym_2_6673
-+sym_2_6673: la $2, sym_2_6673
-+.globl sym_2_6674
-+sym_2_6674: la $2, sym_2_6674
-+.globl sym_2_6675
-+sym_2_6675: la $2, sym_2_6675
-+.globl sym_2_6676
-+sym_2_6676: la $2, sym_2_6676
-+.globl sym_2_6677
-+sym_2_6677: la $2, sym_2_6677
-+.globl sym_2_6678
-+sym_2_6678: la $2, sym_2_6678
-+.globl sym_2_6679
-+sym_2_6679: la $2, sym_2_6679
-+.globl sym_2_6680
-+sym_2_6680: la $2, sym_2_6680
-+.globl sym_2_6681
-+sym_2_6681: la $2, sym_2_6681
-+.globl sym_2_6682
-+sym_2_6682: la $2, sym_2_6682
-+.globl sym_2_6683
-+sym_2_6683: la $2, sym_2_6683
-+.globl sym_2_6684
-+sym_2_6684: la $2, sym_2_6684
-+.globl sym_2_6685
-+sym_2_6685: la $2, sym_2_6685
-+.globl sym_2_6686
-+sym_2_6686: la $2, sym_2_6686
-+.globl sym_2_6687
-+sym_2_6687: la $2, sym_2_6687
-+.globl sym_2_6688
-+sym_2_6688: la $2, sym_2_6688
-+.globl sym_2_6689
-+sym_2_6689: la $2, sym_2_6689
-+.globl sym_2_6690
-+sym_2_6690: la $2, sym_2_6690
-+.globl sym_2_6691
-+sym_2_6691: la $2, sym_2_6691
-+.globl sym_2_6692
-+sym_2_6692: la $2, sym_2_6692
-+.globl sym_2_6693
-+sym_2_6693: la $2, sym_2_6693
-+.globl sym_2_6694
-+sym_2_6694: la $2, sym_2_6694
-+.globl sym_2_6695
-+sym_2_6695: la $2, sym_2_6695
-+.globl sym_2_6696
-+sym_2_6696: la $2, sym_2_6696
-+.globl sym_2_6697
-+sym_2_6697: la $2, sym_2_6697
-+.globl sym_2_6698
-+sym_2_6698: la $2, sym_2_6698
-+.globl sym_2_6699
-+sym_2_6699: la $2, sym_2_6699
-+.globl sym_2_6700
-+sym_2_6700: la $2, sym_2_6700
-+.globl sym_2_6701
-+sym_2_6701: la $2, sym_2_6701
-+.globl sym_2_6702
-+sym_2_6702: la $2, sym_2_6702
-+.globl sym_2_6703
-+sym_2_6703: la $2, sym_2_6703
-+.globl sym_2_6704
-+sym_2_6704: la $2, sym_2_6704
-+.globl sym_2_6705
-+sym_2_6705: la $2, sym_2_6705
-+.globl sym_2_6706
-+sym_2_6706: la $2, sym_2_6706
-+.globl sym_2_6707
-+sym_2_6707: la $2, sym_2_6707
-+.globl sym_2_6708
-+sym_2_6708: la $2, sym_2_6708
-+.globl sym_2_6709
-+sym_2_6709: la $2, sym_2_6709
-+.globl sym_2_6710
-+sym_2_6710: la $2, sym_2_6710
-+.globl sym_2_6711
-+sym_2_6711: la $2, sym_2_6711
-+.globl sym_2_6712
-+sym_2_6712: la $2, sym_2_6712
-+.globl sym_2_6713
-+sym_2_6713: la $2, sym_2_6713
-+.globl sym_2_6714
-+sym_2_6714: la $2, sym_2_6714
-+.globl sym_2_6715
-+sym_2_6715: la $2, sym_2_6715
-+.globl sym_2_6716
-+sym_2_6716: la $2, sym_2_6716
-+.globl sym_2_6717
-+sym_2_6717: la $2, sym_2_6717
-+.globl sym_2_6718
-+sym_2_6718: la $2, sym_2_6718
-+.globl sym_2_6719
-+sym_2_6719: la $2, sym_2_6719
-+.globl sym_2_6720
-+sym_2_6720: la $2, sym_2_6720
-+.globl sym_2_6721
-+sym_2_6721: la $2, sym_2_6721
-+.globl sym_2_6722
-+sym_2_6722: la $2, sym_2_6722
-+.globl sym_2_6723
-+sym_2_6723: la $2, sym_2_6723
-+.globl sym_2_6724
-+sym_2_6724: la $2, sym_2_6724
-+.globl sym_2_6725
-+sym_2_6725: la $2, sym_2_6725
-+.globl sym_2_6726
-+sym_2_6726: la $2, sym_2_6726
-+.globl sym_2_6727
-+sym_2_6727: la $2, sym_2_6727
-+.globl sym_2_6728
-+sym_2_6728: la $2, sym_2_6728
-+.globl sym_2_6729
-+sym_2_6729: la $2, sym_2_6729
-+.globl sym_2_6730
-+sym_2_6730: la $2, sym_2_6730
-+.globl sym_2_6731
-+sym_2_6731: la $2, sym_2_6731
-+.globl sym_2_6732
-+sym_2_6732: la $2, sym_2_6732
-+.globl sym_2_6733
-+sym_2_6733: la $2, sym_2_6733
-+.globl sym_2_6734
-+sym_2_6734: la $2, sym_2_6734
-+.globl sym_2_6735
-+sym_2_6735: la $2, sym_2_6735
-+.globl sym_2_6736
-+sym_2_6736: la $2, sym_2_6736
-+.globl sym_2_6737
-+sym_2_6737: la $2, sym_2_6737
-+.globl sym_2_6738
-+sym_2_6738: la $2, sym_2_6738
-+.globl sym_2_6739
-+sym_2_6739: la $2, sym_2_6739
-+.globl sym_2_6740
-+sym_2_6740: la $2, sym_2_6740
-+.globl sym_2_6741
-+sym_2_6741: la $2, sym_2_6741
-+.globl sym_2_6742
-+sym_2_6742: la $2, sym_2_6742
-+.globl sym_2_6743
-+sym_2_6743: la $2, sym_2_6743
-+.globl sym_2_6744
-+sym_2_6744: la $2, sym_2_6744
-+.globl sym_2_6745
-+sym_2_6745: la $2, sym_2_6745
-+.globl sym_2_6746
-+sym_2_6746: la $2, sym_2_6746
-+.globl sym_2_6747
-+sym_2_6747: la $2, sym_2_6747
-+.globl sym_2_6748
-+sym_2_6748: la $2, sym_2_6748
-+.globl sym_2_6749
-+sym_2_6749: la $2, sym_2_6749
-+.globl sym_2_6750
-+sym_2_6750: la $2, sym_2_6750
-+.globl sym_2_6751
-+sym_2_6751: la $2, sym_2_6751
-+.globl sym_2_6752
-+sym_2_6752: la $2, sym_2_6752
-+.globl sym_2_6753
-+sym_2_6753: la $2, sym_2_6753
-+.globl sym_2_6754
-+sym_2_6754: la $2, sym_2_6754
-+.globl sym_2_6755
-+sym_2_6755: la $2, sym_2_6755
-+.globl sym_2_6756
-+sym_2_6756: la $2, sym_2_6756
-+.globl sym_2_6757
-+sym_2_6757: la $2, sym_2_6757
-+.globl sym_2_6758
-+sym_2_6758: la $2, sym_2_6758
-+.globl sym_2_6759
-+sym_2_6759: la $2, sym_2_6759
-+.globl sym_2_6760
-+sym_2_6760: la $2, sym_2_6760
-+.globl sym_2_6761
-+sym_2_6761: la $2, sym_2_6761
-+.globl sym_2_6762
-+sym_2_6762: la $2, sym_2_6762
-+.globl sym_2_6763
-+sym_2_6763: la $2, sym_2_6763
-+.globl sym_2_6764
-+sym_2_6764: la $2, sym_2_6764
-+.globl sym_2_6765
-+sym_2_6765: la $2, sym_2_6765
-+.globl sym_2_6766
-+sym_2_6766: la $2, sym_2_6766
-+.globl sym_2_6767
-+sym_2_6767: la $2, sym_2_6767
-+.globl sym_2_6768
-+sym_2_6768: la $2, sym_2_6768
-+.globl sym_2_6769
-+sym_2_6769: la $2, sym_2_6769
-+.globl sym_2_6770
-+sym_2_6770: la $2, sym_2_6770
-+.globl sym_2_6771
-+sym_2_6771: la $2, sym_2_6771
-+.globl sym_2_6772
-+sym_2_6772: la $2, sym_2_6772
-+.globl sym_2_6773
-+sym_2_6773: la $2, sym_2_6773
-+.globl sym_2_6774
-+sym_2_6774: la $2, sym_2_6774
-+.globl sym_2_6775
-+sym_2_6775: la $2, sym_2_6775
-+.globl sym_2_6776
-+sym_2_6776: la $2, sym_2_6776
-+.globl sym_2_6777
-+sym_2_6777: la $2, sym_2_6777
-+.globl sym_2_6778
-+sym_2_6778: la $2, sym_2_6778
-+.globl sym_2_6779
-+sym_2_6779: la $2, sym_2_6779
-+.globl sym_2_6780
-+sym_2_6780: la $2, sym_2_6780
-+.globl sym_2_6781
-+sym_2_6781: la $2, sym_2_6781
-+.globl sym_2_6782
-+sym_2_6782: la $2, sym_2_6782
-+.globl sym_2_6783
-+sym_2_6783: la $2, sym_2_6783
-+.globl sym_2_6784
-+sym_2_6784: la $2, sym_2_6784
-+.globl sym_2_6785
-+sym_2_6785: la $2, sym_2_6785
-+.globl sym_2_6786
-+sym_2_6786: la $2, sym_2_6786
-+.globl sym_2_6787
-+sym_2_6787: la $2, sym_2_6787
-+.globl sym_2_6788
-+sym_2_6788: la $2, sym_2_6788
-+.globl sym_2_6789
-+sym_2_6789: la $2, sym_2_6789
-+.globl sym_2_6790
-+sym_2_6790: la $2, sym_2_6790
-+.globl sym_2_6791
-+sym_2_6791: la $2, sym_2_6791
-+.globl sym_2_6792
-+sym_2_6792: la $2, sym_2_6792
-+.globl sym_2_6793
-+sym_2_6793: la $2, sym_2_6793
-+.globl sym_2_6794
-+sym_2_6794: la $2, sym_2_6794
-+.globl sym_2_6795
-+sym_2_6795: la $2, sym_2_6795
-+.globl sym_2_6796
-+sym_2_6796: la $2, sym_2_6796
-+.globl sym_2_6797
-+sym_2_6797: la $2, sym_2_6797
-+.globl sym_2_6798
-+sym_2_6798: la $2, sym_2_6798
-+.globl sym_2_6799
-+sym_2_6799: la $2, sym_2_6799
-+.globl sym_2_6800
-+sym_2_6800: la $2, sym_2_6800
-+.globl sym_2_6801
-+sym_2_6801: la $2, sym_2_6801
-+.globl sym_2_6802
-+sym_2_6802: la $2, sym_2_6802
-+.globl sym_2_6803
-+sym_2_6803: la $2, sym_2_6803
-+.globl sym_2_6804
-+sym_2_6804: la $2, sym_2_6804
-+.globl sym_2_6805
-+sym_2_6805: la $2, sym_2_6805
-+.globl sym_2_6806
-+sym_2_6806: la $2, sym_2_6806
-+.globl sym_2_6807
-+sym_2_6807: la $2, sym_2_6807
-+.globl sym_2_6808
-+sym_2_6808: la $2, sym_2_6808
-+.globl sym_2_6809
-+sym_2_6809: la $2, sym_2_6809
-+.globl sym_2_6810
-+sym_2_6810: la $2, sym_2_6810
-+.globl sym_2_6811
-+sym_2_6811: la $2, sym_2_6811
-+.globl sym_2_6812
-+sym_2_6812: la $2, sym_2_6812
-+.globl sym_2_6813
-+sym_2_6813: la $2, sym_2_6813
-+.globl sym_2_6814
-+sym_2_6814: la $2, sym_2_6814
-+.globl sym_2_6815
-+sym_2_6815: la $2, sym_2_6815
-+.globl sym_2_6816
-+sym_2_6816: la $2, sym_2_6816
-+.globl sym_2_6817
-+sym_2_6817: la $2, sym_2_6817
-+.globl sym_2_6818
-+sym_2_6818: la $2, sym_2_6818
-+.globl sym_2_6819
-+sym_2_6819: la $2, sym_2_6819
-+.globl sym_2_6820
-+sym_2_6820: la $2, sym_2_6820
-+.globl sym_2_6821
-+sym_2_6821: la $2, sym_2_6821
-+.globl sym_2_6822
-+sym_2_6822: la $2, sym_2_6822
-+.globl sym_2_6823
-+sym_2_6823: la $2, sym_2_6823
-+.globl sym_2_6824
-+sym_2_6824: la $2, sym_2_6824
-+.globl sym_2_6825
-+sym_2_6825: la $2, sym_2_6825
-+.globl sym_2_6826
-+sym_2_6826: la $2, sym_2_6826
-+.globl sym_2_6827
-+sym_2_6827: la $2, sym_2_6827
-+.globl sym_2_6828
-+sym_2_6828: la $2, sym_2_6828
-+.globl sym_2_6829
-+sym_2_6829: la $2, sym_2_6829
-+.globl sym_2_6830
-+sym_2_6830: la $2, sym_2_6830
-+.globl sym_2_6831
-+sym_2_6831: la $2, sym_2_6831
-+.globl sym_2_6832
-+sym_2_6832: la $2, sym_2_6832
-+.globl sym_2_6833
-+sym_2_6833: la $2, sym_2_6833
-+.globl sym_2_6834
-+sym_2_6834: la $2, sym_2_6834
-+.globl sym_2_6835
-+sym_2_6835: la $2, sym_2_6835
-+.globl sym_2_6836
-+sym_2_6836: la $2, sym_2_6836
-+.globl sym_2_6837
-+sym_2_6837: la $2, sym_2_6837
-+.globl sym_2_6838
-+sym_2_6838: la $2, sym_2_6838
-+.globl sym_2_6839
-+sym_2_6839: la $2, sym_2_6839
-+.globl sym_2_6840
-+sym_2_6840: la $2, sym_2_6840
-+.globl sym_2_6841
-+sym_2_6841: la $2, sym_2_6841
-+.globl sym_2_6842
-+sym_2_6842: la $2, sym_2_6842
-+.globl sym_2_6843
-+sym_2_6843: la $2, sym_2_6843
-+.globl sym_2_6844
-+sym_2_6844: la $2, sym_2_6844
-+.globl sym_2_6845
-+sym_2_6845: la $2, sym_2_6845
-+.globl sym_2_6846
-+sym_2_6846: la $2, sym_2_6846
-+.globl sym_2_6847
-+sym_2_6847: la $2, sym_2_6847
-+.globl sym_2_6848
-+sym_2_6848: la $2, sym_2_6848
-+.globl sym_2_6849
-+sym_2_6849: la $2, sym_2_6849
-+.globl sym_2_6850
-+sym_2_6850: la $2, sym_2_6850
-+.globl sym_2_6851
-+sym_2_6851: la $2, sym_2_6851
-+.globl sym_2_6852
-+sym_2_6852: la $2, sym_2_6852
-+.globl sym_2_6853
-+sym_2_6853: la $2, sym_2_6853
-+.globl sym_2_6854
-+sym_2_6854: la $2, sym_2_6854
-+.globl sym_2_6855
-+sym_2_6855: la $2, sym_2_6855
-+.globl sym_2_6856
-+sym_2_6856: la $2, sym_2_6856
-+.globl sym_2_6857
-+sym_2_6857: la $2, sym_2_6857
-+.globl sym_2_6858
-+sym_2_6858: la $2, sym_2_6858
-+.globl sym_2_6859
-+sym_2_6859: la $2, sym_2_6859
-+.globl sym_2_6860
-+sym_2_6860: la $2, sym_2_6860
-+.globl sym_2_6861
-+sym_2_6861: la $2, sym_2_6861
-+.globl sym_2_6862
-+sym_2_6862: la $2, sym_2_6862
-+.globl sym_2_6863
-+sym_2_6863: la $2, sym_2_6863
-+.globl sym_2_6864
-+sym_2_6864: la $2, sym_2_6864
-+.globl sym_2_6865
-+sym_2_6865: la $2, sym_2_6865
-+.globl sym_2_6866
-+sym_2_6866: la $2, sym_2_6866
-+.globl sym_2_6867
-+sym_2_6867: la $2, sym_2_6867
-+.globl sym_2_6868
-+sym_2_6868: la $2, sym_2_6868
-+.globl sym_2_6869
-+sym_2_6869: la $2, sym_2_6869
-+.globl sym_2_6870
-+sym_2_6870: la $2, sym_2_6870
-+.globl sym_2_6871
-+sym_2_6871: la $2, sym_2_6871
-+.globl sym_2_6872
-+sym_2_6872: la $2, sym_2_6872
-+.globl sym_2_6873
-+sym_2_6873: la $2, sym_2_6873
-+.globl sym_2_6874
-+sym_2_6874: la $2, sym_2_6874
-+.globl sym_2_6875
-+sym_2_6875: la $2, sym_2_6875
-+.globl sym_2_6876
-+sym_2_6876: la $2, sym_2_6876
-+.globl sym_2_6877
-+sym_2_6877: la $2, sym_2_6877
-+.globl sym_2_6878
-+sym_2_6878: la $2, sym_2_6878
-+.globl sym_2_6879
-+sym_2_6879: la $2, sym_2_6879
-+.globl sym_2_6880
-+sym_2_6880: la $2, sym_2_6880
-+.globl sym_2_6881
-+sym_2_6881: la $2, sym_2_6881
-+.globl sym_2_6882
-+sym_2_6882: la $2, sym_2_6882
-+.globl sym_2_6883
-+sym_2_6883: la $2, sym_2_6883
-+.globl sym_2_6884
-+sym_2_6884: la $2, sym_2_6884
-+.globl sym_2_6885
-+sym_2_6885: la $2, sym_2_6885
-+.globl sym_2_6886
-+sym_2_6886: la $2, sym_2_6886
-+.globl sym_2_6887
-+sym_2_6887: la $2, sym_2_6887
-+.globl sym_2_6888
-+sym_2_6888: la $2, sym_2_6888
-+.globl sym_2_6889
-+sym_2_6889: la $2, sym_2_6889
-+.globl sym_2_6890
-+sym_2_6890: la $2, sym_2_6890
-+.globl sym_2_6891
-+sym_2_6891: la $2, sym_2_6891
-+.globl sym_2_6892
-+sym_2_6892: la $2, sym_2_6892
-+.globl sym_2_6893
-+sym_2_6893: la $2, sym_2_6893
-+.globl sym_2_6894
-+sym_2_6894: la $2, sym_2_6894
-+.globl sym_2_6895
-+sym_2_6895: la $2, sym_2_6895
-+.globl sym_2_6896
-+sym_2_6896: la $2, sym_2_6896
-+.globl sym_2_6897
-+sym_2_6897: la $2, sym_2_6897
-+.globl sym_2_6898
-+sym_2_6898: la $2, sym_2_6898
-+.globl sym_2_6899
-+sym_2_6899: la $2, sym_2_6899
-+.globl sym_2_6900
-+sym_2_6900: la $2, sym_2_6900
-+.globl sym_2_6901
-+sym_2_6901: la $2, sym_2_6901
-+.globl sym_2_6902
-+sym_2_6902: la $2, sym_2_6902
-+.globl sym_2_6903
-+sym_2_6903: la $2, sym_2_6903
-+.globl sym_2_6904
-+sym_2_6904: la $2, sym_2_6904
-+.globl sym_2_6905
-+sym_2_6905: la $2, sym_2_6905
-+.globl sym_2_6906
-+sym_2_6906: la $2, sym_2_6906
-+.globl sym_2_6907
-+sym_2_6907: la $2, sym_2_6907
-+.globl sym_2_6908
-+sym_2_6908: la $2, sym_2_6908
-+.globl sym_2_6909
-+sym_2_6909: la $2, sym_2_6909
-+.globl sym_2_6910
-+sym_2_6910: la $2, sym_2_6910
-+.globl sym_2_6911
-+sym_2_6911: la $2, sym_2_6911
-+.globl sym_2_6912
-+sym_2_6912: la $2, sym_2_6912
-+.globl sym_2_6913
-+sym_2_6913: la $2, sym_2_6913
-+.globl sym_2_6914
-+sym_2_6914: la $2, sym_2_6914
-+.globl sym_2_6915
-+sym_2_6915: la $2, sym_2_6915
-+.globl sym_2_6916
-+sym_2_6916: la $2, sym_2_6916
-+.globl sym_2_6917
-+sym_2_6917: la $2, sym_2_6917
-+.globl sym_2_6918
-+sym_2_6918: la $2, sym_2_6918
-+.globl sym_2_6919
-+sym_2_6919: la $2, sym_2_6919
-+.globl sym_2_6920
-+sym_2_6920: la $2, sym_2_6920
-+.globl sym_2_6921
-+sym_2_6921: la $2, sym_2_6921
-+.globl sym_2_6922
-+sym_2_6922: la $2, sym_2_6922
-+.globl sym_2_6923
-+sym_2_6923: la $2, sym_2_6923
-+.globl sym_2_6924
-+sym_2_6924: la $2, sym_2_6924
-+.globl sym_2_6925
-+sym_2_6925: la $2, sym_2_6925
-+.globl sym_2_6926
-+sym_2_6926: la $2, sym_2_6926
-+.globl sym_2_6927
-+sym_2_6927: la $2, sym_2_6927
-+.globl sym_2_6928
-+sym_2_6928: la $2, sym_2_6928
-+.globl sym_2_6929
-+sym_2_6929: la $2, sym_2_6929
-+.globl sym_2_6930
-+sym_2_6930: la $2, sym_2_6930
-+.globl sym_2_6931
-+sym_2_6931: la $2, sym_2_6931
-+.globl sym_2_6932
-+sym_2_6932: la $2, sym_2_6932
-+.globl sym_2_6933
-+sym_2_6933: la $2, sym_2_6933
-+.globl sym_2_6934
-+sym_2_6934: la $2, sym_2_6934
-+.globl sym_2_6935
-+sym_2_6935: la $2, sym_2_6935
-+.globl sym_2_6936
-+sym_2_6936: la $2, sym_2_6936
-+.globl sym_2_6937
-+sym_2_6937: la $2, sym_2_6937
-+.globl sym_2_6938
-+sym_2_6938: la $2, sym_2_6938
-+.globl sym_2_6939
-+sym_2_6939: la $2, sym_2_6939
-+.globl sym_2_6940
-+sym_2_6940: la $2, sym_2_6940
-+.globl sym_2_6941
-+sym_2_6941: la $2, sym_2_6941
-+.globl sym_2_6942
-+sym_2_6942: la $2, sym_2_6942
-+.globl sym_2_6943
-+sym_2_6943: la $2, sym_2_6943
-+.globl sym_2_6944
-+sym_2_6944: la $2, sym_2_6944
-+.globl sym_2_6945
-+sym_2_6945: la $2, sym_2_6945
-+.globl sym_2_6946
-+sym_2_6946: la $2, sym_2_6946
-+.globl sym_2_6947
-+sym_2_6947: la $2, sym_2_6947
-+.globl sym_2_6948
-+sym_2_6948: la $2, sym_2_6948
-+.globl sym_2_6949
-+sym_2_6949: la $2, sym_2_6949
-+.globl sym_2_6950
-+sym_2_6950: la $2, sym_2_6950
-+.globl sym_2_6951
-+sym_2_6951: la $2, sym_2_6951
-+.globl sym_2_6952
-+sym_2_6952: la $2, sym_2_6952
-+.globl sym_2_6953
-+sym_2_6953: la $2, sym_2_6953
-+.globl sym_2_6954
-+sym_2_6954: la $2, sym_2_6954
-+.globl sym_2_6955
-+sym_2_6955: la $2, sym_2_6955
-+.globl sym_2_6956
-+sym_2_6956: la $2, sym_2_6956
-+.globl sym_2_6957
-+sym_2_6957: la $2, sym_2_6957
-+.globl sym_2_6958
-+sym_2_6958: la $2, sym_2_6958
-+.globl sym_2_6959
-+sym_2_6959: la $2, sym_2_6959
-+.globl sym_2_6960
-+sym_2_6960: la $2, sym_2_6960
-+.globl sym_2_6961
-+sym_2_6961: la $2, sym_2_6961
-+.globl sym_2_6962
-+sym_2_6962: la $2, sym_2_6962
-+.globl sym_2_6963
-+sym_2_6963: la $2, sym_2_6963
-+.globl sym_2_6964
-+sym_2_6964: la $2, sym_2_6964
-+.globl sym_2_6965
-+sym_2_6965: la $2, sym_2_6965
-+.globl sym_2_6966
-+sym_2_6966: la $2, sym_2_6966
-+.globl sym_2_6967
-+sym_2_6967: la $2, sym_2_6967
-+.globl sym_2_6968
-+sym_2_6968: la $2, sym_2_6968
-+.globl sym_2_6969
-+sym_2_6969: la $2, sym_2_6969
-+.globl sym_2_6970
-+sym_2_6970: la $2, sym_2_6970
-+.globl sym_2_6971
-+sym_2_6971: la $2, sym_2_6971
-+.globl sym_2_6972
-+sym_2_6972: la $2, sym_2_6972
-+.globl sym_2_6973
-+sym_2_6973: la $2, sym_2_6973
-+.globl sym_2_6974
-+sym_2_6974: la $2, sym_2_6974
-+.globl sym_2_6975
-+sym_2_6975: la $2, sym_2_6975
-+.globl sym_2_6976
-+sym_2_6976: la $2, sym_2_6976
-+.globl sym_2_6977
-+sym_2_6977: la $2, sym_2_6977
-+.globl sym_2_6978
-+sym_2_6978: la $2, sym_2_6978
-+.globl sym_2_6979
-+sym_2_6979: la $2, sym_2_6979
-+.globl sym_2_6980
-+sym_2_6980: la $2, sym_2_6980
-+.globl sym_2_6981
-+sym_2_6981: la $2, sym_2_6981
-+.globl sym_2_6982
-+sym_2_6982: la $2, sym_2_6982
-+.globl sym_2_6983
-+sym_2_6983: la $2, sym_2_6983
-+.globl sym_2_6984
-+sym_2_6984: la $2, sym_2_6984
-+.globl sym_2_6985
-+sym_2_6985: la $2, sym_2_6985
-+.globl sym_2_6986
-+sym_2_6986: la $2, sym_2_6986
-+.globl sym_2_6987
-+sym_2_6987: la $2, sym_2_6987
-+.globl sym_2_6988
-+sym_2_6988: la $2, sym_2_6988
-+.globl sym_2_6989
-+sym_2_6989: la $2, sym_2_6989
-+.globl sym_2_6990
-+sym_2_6990: la $2, sym_2_6990
-+.globl sym_2_6991
-+sym_2_6991: la $2, sym_2_6991
-+.globl sym_2_6992
-+sym_2_6992: la $2, sym_2_6992
-+.globl sym_2_6993
-+sym_2_6993: la $2, sym_2_6993
-+.globl sym_2_6994
-+sym_2_6994: la $2, sym_2_6994
-+.globl sym_2_6995
-+sym_2_6995: la $2, sym_2_6995
-+.globl sym_2_6996
-+sym_2_6996: la $2, sym_2_6996
-+.globl sym_2_6997
-+sym_2_6997: la $2, sym_2_6997
-+.globl sym_2_6998
-+sym_2_6998: la $2, sym_2_6998
-+.globl sym_2_6999
-+sym_2_6999: la $2, sym_2_6999
-+.globl sym_2_7000
-+sym_2_7000: la $2, sym_2_7000
-+.globl sym_2_7001
-+sym_2_7001: la $2, sym_2_7001
-+.globl sym_2_7002
-+sym_2_7002: la $2, sym_2_7002
-+.globl sym_2_7003
-+sym_2_7003: la $2, sym_2_7003
-+.globl sym_2_7004
-+sym_2_7004: la $2, sym_2_7004
-+.globl sym_2_7005
-+sym_2_7005: la $2, sym_2_7005
-+.globl sym_2_7006
-+sym_2_7006: la $2, sym_2_7006
-+.globl sym_2_7007
-+sym_2_7007: la $2, sym_2_7007
-+.globl sym_2_7008
-+sym_2_7008: la $2, sym_2_7008
-+.globl sym_2_7009
-+sym_2_7009: la $2, sym_2_7009
-+.globl sym_2_7010
-+sym_2_7010: la $2, sym_2_7010
-+.globl sym_2_7011
-+sym_2_7011: la $2, sym_2_7011
-+.globl sym_2_7012
-+sym_2_7012: la $2, sym_2_7012
-+.globl sym_2_7013
-+sym_2_7013: la $2, sym_2_7013
-+.globl sym_2_7014
-+sym_2_7014: la $2, sym_2_7014
-+.globl sym_2_7015
-+sym_2_7015: la $2, sym_2_7015
-+.globl sym_2_7016
-+sym_2_7016: la $2, sym_2_7016
-+.globl sym_2_7017
-+sym_2_7017: la $2, sym_2_7017
-+.globl sym_2_7018
-+sym_2_7018: la $2, sym_2_7018
-+.globl sym_2_7019
-+sym_2_7019: la $2, sym_2_7019
-+.globl sym_2_7020
-+sym_2_7020: la $2, sym_2_7020
-+.globl sym_2_7021
-+sym_2_7021: la $2, sym_2_7021
-+.globl sym_2_7022
-+sym_2_7022: la $2, sym_2_7022
-+.globl sym_2_7023
-+sym_2_7023: la $2, sym_2_7023
-+.globl sym_2_7024
-+sym_2_7024: la $2, sym_2_7024
-+.globl sym_2_7025
-+sym_2_7025: la $2, sym_2_7025
-+.globl sym_2_7026
-+sym_2_7026: la $2, sym_2_7026
-+.globl sym_2_7027
-+sym_2_7027: la $2, sym_2_7027
-+.globl sym_2_7028
-+sym_2_7028: la $2, sym_2_7028
-+.globl sym_2_7029
-+sym_2_7029: la $2, sym_2_7029
-+.globl sym_2_7030
-+sym_2_7030: la $2, sym_2_7030
-+.globl sym_2_7031
-+sym_2_7031: la $2, sym_2_7031
-+.globl sym_2_7032
-+sym_2_7032: la $2, sym_2_7032
-+.globl sym_2_7033
-+sym_2_7033: la $2, sym_2_7033
-+.globl sym_2_7034
-+sym_2_7034: la $2, sym_2_7034
-+.globl sym_2_7035
-+sym_2_7035: la $2, sym_2_7035
-+.globl sym_2_7036
-+sym_2_7036: la $2, sym_2_7036
-+.globl sym_2_7037
-+sym_2_7037: la $2, sym_2_7037
-+.globl sym_2_7038
-+sym_2_7038: la $2, sym_2_7038
-+.globl sym_2_7039
-+sym_2_7039: la $2, sym_2_7039
-+.globl sym_2_7040
-+sym_2_7040: la $2, sym_2_7040
-+.globl sym_2_7041
-+sym_2_7041: la $2, sym_2_7041
-+.globl sym_2_7042
-+sym_2_7042: la $2, sym_2_7042
-+.globl sym_2_7043
-+sym_2_7043: la $2, sym_2_7043
-+.globl sym_2_7044
-+sym_2_7044: la $2, sym_2_7044
-+.globl sym_2_7045
-+sym_2_7045: la $2, sym_2_7045
-+.globl sym_2_7046
-+sym_2_7046: la $2, sym_2_7046
-+.globl sym_2_7047
-+sym_2_7047: la $2, sym_2_7047
-+.globl sym_2_7048
-+sym_2_7048: la $2, sym_2_7048
-+.globl sym_2_7049
-+sym_2_7049: la $2, sym_2_7049
-+.globl sym_2_7050
-+sym_2_7050: la $2, sym_2_7050
-+.globl sym_2_7051
-+sym_2_7051: la $2, sym_2_7051
-+.globl sym_2_7052
-+sym_2_7052: la $2, sym_2_7052
-+.globl sym_2_7053
-+sym_2_7053: la $2, sym_2_7053
-+.globl sym_2_7054
-+sym_2_7054: la $2, sym_2_7054
-+.globl sym_2_7055
-+sym_2_7055: la $2, sym_2_7055
-+.globl sym_2_7056
-+sym_2_7056: la $2, sym_2_7056
-+.globl sym_2_7057
-+sym_2_7057: la $2, sym_2_7057
-+.globl sym_2_7058
-+sym_2_7058: la $2, sym_2_7058
-+.globl sym_2_7059
-+sym_2_7059: la $2, sym_2_7059
-+.globl sym_2_7060
-+sym_2_7060: la $2, sym_2_7060
-+.globl sym_2_7061
-+sym_2_7061: la $2, sym_2_7061
-+.globl sym_2_7062
-+sym_2_7062: la $2, sym_2_7062
-+.globl sym_2_7063
-+sym_2_7063: la $2, sym_2_7063
-+.globl sym_2_7064
-+sym_2_7064: la $2, sym_2_7064
-+.globl sym_2_7065
-+sym_2_7065: la $2, sym_2_7065
-+.globl sym_2_7066
-+sym_2_7066: la $2, sym_2_7066
-+.globl sym_2_7067
-+sym_2_7067: la $2, sym_2_7067
-+.globl sym_2_7068
-+sym_2_7068: la $2, sym_2_7068
-+.globl sym_2_7069
-+sym_2_7069: la $2, sym_2_7069
-+.globl sym_2_7070
-+sym_2_7070: la $2, sym_2_7070
-+.globl sym_2_7071
-+sym_2_7071: la $2, sym_2_7071
-+.globl sym_2_7072
-+sym_2_7072: la $2, sym_2_7072
-+.globl sym_2_7073
-+sym_2_7073: la $2, sym_2_7073
-+.globl sym_2_7074
-+sym_2_7074: la $2, sym_2_7074
-+.globl sym_2_7075
-+sym_2_7075: la $2, sym_2_7075
-+.globl sym_2_7076
-+sym_2_7076: la $2, sym_2_7076
-+.globl sym_2_7077
-+sym_2_7077: la $2, sym_2_7077
-+.globl sym_2_7078
-+sym_2_7078: la $2, sym_2_7078
-+.globl sym_2_7079
-+sym_2_7079: la $2, sym_2_7079
-+.globl sym_2_7080
-+sym_2_7080: la $2, sym_2_7080
-+.globl sym_2_7081
-+sym_2_7081: la $2, sym_2_7081
-+.globl sym_2_7082
-+sym_2_7082: la $2, sym_2_7082
-+.globl sym_2_7083
-+sym_2_7083: la $2, sym_2_7083
-+.globl sym_2_7084
-+sym_2_7084: la $2, sym_2_7084
-+.globl sym_2_7085
-+sym_2_7085: la $2, sym_2_7085
-+.globl sym_2_7086
-+sym_2_7086: la $2, sym_2_7086
-+.globl sym_2_7087
-+sym_2_7087: la $2, sym_2_7087
-+.globl sym_2_7088
-+sym_2_7088: la $2, sym_2_7088
-+.globl sym_2_7089
-+sym_2_7089: la $2, sym_2_7089
-+.globl sym_2_7090
-+sym_2_7090: la $2, sym_2_7090
-+.globl sym_2_7091
-+sym_2_7091: la $2, sym_2_7091
-+.globl sym_2_7092
-+sym_2_7092: la $2, sym_2_7092
-+.globl sym_2_7093
-+sym_2_7093: la $2, sym_2_7093
-+.globl sym_2_7094
-+sym_2_7094: la $2, sym_2_7094
-+.globl sym_2_7095
-+sym_2_7095: la $2, sym_2_7095
-+.globl sym_2_7096
-+sym_2_7096: la $2, sym_2_7096
-+.globl sym_2_7097
-+sym_2_7097: la $2, sym_2_7097
-+.globl sym_2_7098
-+sym_2_7098: la $2, sym_2_7098
-+.globl sym_2_7099
-+sym_2_7099: la $2, sym_2_7099
-+.globl sym_2_7100
-+sym_2_7100: la $2, sym_2_7100
-+.globl sym_2_7101
-+sym_2_7101: la $2, sym_2_7101
-+.globl sym_2_7102
-+sym_2_7102: la $2, sym_2_7102
-+.globl sym_2_7103
-+sym_2_7103: la $2, sym_2_7103
-+.globl sym_2_7104
-+sym_2_7104: la $2, sym_2_7104
-+.globl sym_2_7105
-+sym_2_7105: la $2, sym_2_7105
-+.globl sym_2_7106
-+sym_2_7106: la $2, sym_2_7106
-+.globl sym_2_7107
-+sym_2_7107: la $2, sym_2_7107
-+.globl sym_2_7108
-+sym_2_7108: la $2, sym_2_7108
-+.globl sym_2_7109
-+sym_2_7109: la $2, sym_2_7109
-+.globl sym_2_7110
-+sym_2_7110: la $2, sym_2_7110
-+.globl sym_2_7111
-+sym_2_7111: la $2, sym_2_7111
-+.globl sym_2_7112
-+sym_2_7112: la $2, sym_2_7112
-+.globl sym_2_7113
-+sym_2_7113: la $2, sym_2_7113
-+.globl sym_2_7114
-+sym_2_7114: la $2, sym_2_7114
-+.globl sym_2_7115
-+sym_2_7115: la $2, sym_2_7115
-+.globl sym_2_7116
-+sym_2_7116: la $2, sym_2_7116
-+.globl sym_2_7117
-+sym_2_7117: la $2, sym_2_7117
-+.globl sym_2_7118
-+sym_2_7118: la $2, sym_2_7118
-+.globl sym_2_7119
-+sym_2_7119: la $2, sym_2_7119
-+.globl sym_2_7120
-+sym_2_7120: la $2, sym_2_7120
-+.globl sym_2_7121
-+sym_2_7121: la $2, sym_2_7121
-+.globl sym_2_7122
-+sym_2_7122: la $2, sym_2_7122
-+.globl sym_2_7123
-+sym_2_7123: la $2, sym_2_7123
-+.globl sym_2_7124
-+sym_2_7124: la $2, sym_2_7124
-+.globl sym_2_7125
-+sym_2_7125: la $2, sym_2_7125
-+.globl sym_2_7126
-+sym_2_7126: la $2, sym_2_7126
-+.globl sym_2_7127
-+sym_2_7127: la $2, sym_2_7127
-+.globl sym_2_7128
-+sym_2_7128: la $2, sym_2_7128
-+.globl sym_2_7129
-+sym_2_7129: la $2, sym_2_7129
-+.globl sym_2_7130
-+sym_2_7130: la $2, sym_2_7130
-+.globl sym_2_7131
-+sym_2_7131: la $2, sym_2_7131
-+.globl sym_2_7132
-+sym_2_7132: la $2, sym_2_7132
-+.globl sym_2_7133
-+sym_2_7133: la $2, sym_2_7133
-+.globl sym_2_7134
-+sym_2_7134: la $2, sym_2_7134
-+.globl sym_2_7135
-+sym_2_7135: la $2, sym_2_7135
-+.globl sym_2_7136
-+sym_2_7136: la $2, sym_2_7136
-+.globl sym_2_7137
-+sym_2_7137: la $2, sym_2_7137
-+.globl sym_2_7138
-+sym_2_7138: la $2, sym_2_7138
-+.globl sym_2_7139
-+sym_2_7139: la $2, sym_2_7139
-+.globl sym_2_7140
-+sym_2_7140: la $2, sym_2_7140
-+.globl sym_2_7141
-+sym_2_7141: la $2, sym_2_7141
-+.globl sym_2_7142
-+sym_2_7142: la $2, sym_2_7142
-+.globl sym_2_7143
-+sym_2_7143: la $2, sym_2_7143
-+.globl sym_2_7144
-+sym_2_7144: la $2, sym_2_7144
-+.globl sym_2_7145
-+sym_2_7145: la $2, sym_2_7145
-+.globl sym_2_7146
-+sym_2_7146: la $2, sym_2_7146
-+.globl sym_2_7147
-+sym_2_7147: la $2, sym_2_7147
-+.globl sym_2_7148
-+sym_2_7148: la $2, sym_2_7148
-+.globl sym_2_7149
-+sym_2_7149: la $2, sym_2_7149
-+.globl sym_2_7150
-+sym_2_7150: la $2, sym_2_7150
-+.globl sym_2_7151
-+sym_2_7151: la $2, sym_2_7151
-+.globl sym_2_7152
-+sym_2_7152: la $2, sym_2_7152
-+.globl sym_2_7153
-+sym_2_7153: la $2, sym_2_7153
-+.globl sym_2_7154
-+sym_2_7154: la $2, sym_2_7154
-+.globl sym_2_7155
-+sym_2_7155: la $2, sym_2_7155
-+.globl sym_2_7156
-+sym_2_7156: la $2, sym_2_7156
-+.globl sym_2_7157
-+sym_2_7157: la $2, sym_2_7157
-+.globl sym_2_7158
-+sym_2_7158: la $2, sym_2_7158
-+.globl sym_2_7159
-+sym_2_7159: la $2, sym_2_7159
-+.globl sym_2_7160
-+sym_2_7160: la $2, sym_2_7160
-+.globl sym_2_7161
-+sym_2_7161: la $2, sym_2_7161
-+.globl sym_2_7162
-+sym_2_7162: la $2, sym_2_7162
-+.globl sym_2_7163
-+sym_2_7163: la $2, sym_2_7163
-+.globl sym_2_7164
-+sym_2_7164: la $2, sym_2_7164
-+.globl sym_2_7165
-+sym_2_7165: la $2, sym_2_7165
-+.globl sym_2_7166
-+sym_2_7166: la $2, sym_2_7166
-+.globl sym_2_7167
-+sym_2_7167: la $2, sym_2_7167
-+.globl sym_2_7168
-+sym_2_7168: la $2, sym_2_7168
-+.globl sym_2_7169
-+sym_2_7169: la $2, sym_2_7169
-+.globl sym_2_7170
-+sym_2_7170: la $2, sym_2_7170
-+.globl sym_2_7171
-+sym_2_7171: la $2, sym_2_7171
-+.globl sym_2_7172
-+sym_2_7172: la $2, sym_2_7172
-+.globl sym_2_7173
-+sym_2_7173: la $2, sym_2_7173
-+.globl sym_2_7174
-+sym_2_7174: la $2, sym_2_7174
-+.globl sym_2_7175
-+sym_2_7175: la $2, sym_2_7175
-+.globl sym_2_7176
-+sym_2_7176: la $2, sym_2_7176
-+.globl sym_2_7177
-+sym_2_7177: la $2, sym_2_7177
-+.globl sym_2_7178
-+sym_2_7178: la $2, sym_2_7178
-+.globl sym_2_7179
-+sym_2_7179: la $2, sym_2_7179
-+.globl sym_2_7180
-+sym_2_7180: la $2, sym_2_7180
-+.globl sym_2_7181
-+sym_2_7181: la $2, sym_2_7181
-+.globl sym_2_7182
-+sym_2_7182: la $2, sym_2_7182
-+.globl sym_2_7183
-+sym_2_7183: la $2, sym_2_7183
-+.globl sym_2_7184
-+sym_2_7184: la $2, sym_2_7184
-+.globl sym_2_7185
-+sym_2_7185: la $2, sym_2_7185
-+.globl sym_2_7186
-+sym_2_7186: la $2, sym_2_7186
-+.globl sym_2_7187
-+sym_2_7187: la $2, sym_2_7187
-+.globl sym_2_7188
-+sym_2_7188: la $2, sym_2_7188
-+.globl sym_2_7189
-+sym_2_7189: la $2, sym_2_7189
-+.globl sym_2_7190
-+sym_2_7190: la $2, sym_2_7190
-+.globl sym_2_7191
-+sym_2_7191: la $2, sym_2_7191
-+.globl sym_2_7192
-+sym_2_7192: la $2, sym_2_7192
-+.globl sym_2_7193
-+sym_2_7193: la $2, sym_2_7193
-+.globl sym_2_7194
-+sym_2_7194: la $2, sym_2_7194
-+.globl sym_2_7195
-+sym_2_7195: la $2, sym_2_7195
-+.globl sym_2_7196
-+sym_2_7196: la $2, sym_2_7196
-+.globl sym_2_7197
-+sym_2_7197: la $2, sym_2_7197
-+.globl sym_2_7198
-+sym_2_7198: la $2, sym_2_7198
-+.globl sym_2_7199
-+sym_2_7199: la $2, sym_2_7199
-+.globl sym_2_7200
-+sym_2_7200: la $2, sym_2_7200
-+.globl sym_2_7201
-+sym_2_7201: la $2, sym_2_7201
-+.globl sym_2_7202
-+sym_2_7202: la $2, sym_2_7202
-+.globl sym_2_7203
-+sym_2_7203: la $2, sym_2_7203
-+.globl sym_2_7204
-+sym_2_7204: la $2, sym_2_7204
-+.globl sym_2_7205
-+sym_2_7205: la $2, sym_2_7205
-+.globl sym_2_7206
-+sym_2_7206: la $2, sym_2_7206
-+.globl sym_2_7207
-+sym_2_7207: la $2, sym_2_7207
-+.globl sym_2_7208
-+sym_2_7208: la $2, sym_2_7208
-+.globl sym_2_7209
-+sym_2_7209: la $2, sym_2_7209
-+.globl sym_2_7210
-+sym_2_7210: la $2, sym_2_7210
-+.globl sym_2_7211
-+sym_2_7211: la $2, sym_2_7211
-+.globl sym_2_7212
-+sym_2_7212: la $2, sym_2_7212
-+.globl sym_2_7213
-+sym_2_7213: la $2, sym_2_7213
-+.globl sym_2_7214
-+sym_2_7214: la $2, sym_2_7214
-+.globl sym_2_7215
-+sym_2_7215: la $2, sym_2_7215
-+.globl sym_2_7216
-+sym_2_7216: la $2, sym_2_7216
-+.globl sym_2_7217
-+sym_2_7217: la $2, sym_2_7217
-+.globl sym_2_7218
-+sym_2_7218: la $2, sym_2_7218
-+.globl sym_2_7219
-+sym_2_7219: la $2, sym_2_7219
-+.globl sym_2_7220
-+sym_2_7220: la $2, sym_2_7220
-+.globl sym_2_7221
-+sym_2_7221: la $2, sym_2_7221
-+.globl sym_2_7222
-+sym_2_7222: la $2, sym_2_7222
-+.globl sym_2_7223
-+sym_2_7223: la $2, sym_2_7223
-+.globl sym_2_7224
-+sym_2_7224: la $2, sym_2_7224
-+.globl sym_2_7225
-+sym_2_7225: la $2, sym_2_7225
-+.globl sym_2_7226
-+sym_2_7226: la $2, sym_2_7226
-+.globl sym_2_7227
-+sym_2_7227: la $2, sym_2_7227
-+.globl sym_2_7228
-+sym_2_7228: la $2, sym_2_7228
-+.globl sym_2_7229
-+sym_2_7229: la $2, sym_2_7229
-+.globl sym_2_7230
-+sym_2_7230: la $2, sym_2_7230
-+.globl sym_2_7231
-+sym_2_7231: la $2, sym_2_7231
-+.globl sym_2_7232
-+sym_2_7232: la $2, sym_2_7232
-+.globl sym_2_7233
-+sym_2_7233: la $2, sym_2_7233
-+.globl sym_2_7234
-+sym_2_7234: la $2, sym_2_7234
-+.globl sym_2_7235
-+sym_2_7235: la $2, sym_2_7235
-+.globl sym_2_7236
-+sym_2_7236: la $2, sym_2_7236
-+.globl sym_2_7237
-+sym_2_7237: la $2, sym_2_7237
-+.globl sym_2_7238
-+sym_2_7238: la $2, sym_2_7238
-+.globl sym_2_7239
-+sym_2_7239: la $2, sym_2_7239
-+.globl sym_2_7240
-+sym_2_7240: la $2, sym_2_7240
-+.globl sym_2_7241
-+sym_2_7241: la $2, sym_2_7241
-+.globl sym_2_7242
-+sym_2_7242: la $2, sym_2_7242
-+.globl sym_2_7243
-+sym_2_7243: la $2, sym_2_7243
-+.globl sym_2_7244
-+sym_2_7244: la $2, sym_2_7244
-+.globl sym_2_7245
-+sym_2_7245: la $2, sym_2_7245
-+.globl sym_2_7246
-+sym_2_7246: la $2, sym_2_7246
-+.globl sym_2_7247
-+sym_2_7247: la $2, sym_2_7247
-+.globl sym_2_7248
-+sym_2_7248: la $2, sym_2_7248
-+.globl sym_2_7249
-+sym_2_7249: la $2, sym_2_7249
-+.globl sym_2_7250
-+sym_2_7250: la $2, sym_2_7250
-+.globl sym_2_7251
-+sym_2_7251: la $2, sym_2_7251
-+.globl sym_2_7252
-+sym_2_7252: la $2, sym_2_7252
-+.globl sym_2_7253
-+sym_2_7253: la $2, sym_2_7253
-+.globl sym_2_7254
-+sym_2_7254: la $2, sym_2_7254
-+.globl sym_2_7255
-+sym_2_7255: la $2, sym_2_7255
-+.globl sym_2_7256
-+sym_2_7256: la $2, sym_2_7256
-+.globl sym_2_7257
-+sym_2_7257: la $2, sym_2_7257
-+.globl sym_2_7258
-+sym_2_7258: la $2, sym_2_7258
-+.globl sym_2_7259
-+sym_2_7259: la $2, sym_2_7259
-+.globl sym_2_7260
-+sym_2_7260: la $2, sym_2_7260
-+.globl sym_2_7261
-+sym_2_7261: la $2, sym_2_7261
-+.globl sym_2_7262
-+sym_2_7262: la $2, sym_2_7262
-+.globl sym_2_7263
-+sym_2_7263: la $2, sym_2_7263
-+.globl sym_2_7264
-+sym_2_7264: la $2, sym_2_7264
-+.globl sym_2_7265
-+sym_2_7265: la $2, sym_2_7265
-+.globl sym_2_7266
-+sym_2_7266: la $2, sym_2_7266
-+.globl sym_2_7267
-+sym_2_7267: la $2, sym_2_7267
-+.globl sym_2_7268
-+sym_2_7268: la $2, sym_2_7268
-+.globl sym_2_7269
-+sym_2_7269: la $2, sym_2_7269
-+.globl sym_2_7270
-+sym_2_7270: la $2, sym_2_7270
-+.globl sym_2_7271
-+sym_2_7271: la $2, sym_2_7271
-+.globl sym_2_7272
-+sym_2_7272: la $2, sym_2_7272
-+.globl sym_2_7273
-+sym_2_7273: la $2, sym_2_7273
-+.globl sym_2_7274
-+sym_2_7274: la $2, sym_2_7274
-+.globl sym_2_7275
-+sym_2_7275: la $2, sym_2_7275
-+.globl sym_2_7276
-+sym_2_7276: la $2, sym_2_7276
-+.globl sym_2_7277
-+sym_2_7277: la $2, sym_2_7277
-+.globl sym_2_7278
-+sym_2_7278: la $2, sym_2_7278
-+.globl sym_2_7279
-+sym_2_7279: la $2, sym_2_7279
-+.globl sym_2_7280
-+sym_2_7280: la $2, sym_2_7280
-+.globl sym_2_7281
-+sym_2_7281: la $2, sym_2_7281
-+.globl sym_2_7282
-+sym_2_7282: la $2, sym_2_7282
-+.globl sym_2_7283
-+sym_2_7283: la $2, sym_2_7283
-+.globl sym_2_7284
-+sym_2_7284: la $2, sym_2_7284
-+.globl sym_2_7285
-+sym_2_7285: la $2, sym_2_7285
-+.globl sym_2_7286
-+sym_2_7286: la $2, sym_2_7286
-+.globl sym_2_7287
-+sym_2_7287: la $2, sym_2_7287
-+.globl sym_2_7288
-+sym_2_7288: la $2, sym_2_7288
-+.globl sym_2_7289
-+sym_2_7289: la $2, sym_2_7289
-+.globl sym_2_7290
-+sym_2_7290: la $2, sym_2_7290
-+.globl sym_2_7291
-+sym_2_7291: la $2, sym_2_7291
-+.globl sym_2_7292
-+sym_2_7292: la $2, sym_2_7292
-+.globl sym_2_7293
-+sym_2_7293: la $2, sym_2_7293
-+.globl sym_2_7294
-+sym_2_7294: la $2, sym_2_7294
-+.globl sym_2_7295
-+sym_2_7295: la $2, sym_2_7295
-+.globl sym_2_7296
-+sym_2_7296: la $2, sym_2_7296
-+.globl sym_2_7297
-+sym_2_7297: la $2, sym_2_7297
-+.globl sym_2_7298
-+sym_2_7298: la $2, sym_2_7298
-+.globl sym_2_7299
-+sym_2_7299: la $2, sym_2_7299
-+.globl sym_2_7300
-+sym_2_7300: la $2, sym_2_7300
-+.globl sym_2_7301
-+sym_2_7301: la $2, sym_2_7301
-+.globl sym_2_7302
-+sym_2_7302: la $2, sym_2_7302
-+.globl sym_2_7303
-+sym_2_7303: la $2, sym_2_7303
-+.globl sym_2_7304
-+sym_2_7304: la $2, sym_2_7304
-+.globl sym_2_7305
-+sym_2_7305: la $2, sym_2_7305
-+.globl sym_2_7306
-+sym_2_7306: la $2, sym_2_7306
-+.globl sym_2_7307
-+sym_2_7307: la $2, sym_2_7307
-+.globl sym_2_7308
-+sym_2_7308: la $2, sym_2_7308
-+.globl sym_2_7309
-+sym_2_7309: la $2, sym_2_7309
-+.globl sym_2_7310
-+sym_2_7310: la $2, sym_2_7310
-+.globl sym_2_7311
-+sym_2_7311: la $2, sym_2_7311
-+.globl sym_2_7312
-+sym_2_7312: la $2, sym_2_7312
-+.globl sym_2_7313
-+sym_2_7313: la $2, sym_2_7313
-+.globl sym_2_7314
-+sym_2_7314: la $2, sym_2_7314
-+.globl sym_2_7315
-+sym_2_7315: la $2, sym_2_7315
-+.globl sym_2_7316
-+sym_2_7316: la $2, sym_2_7316
-+.globl sym_2_7317
-+sym_2_7317: la $2, sym_2_7317
-+.globl sym_2_7318
-+sym_2_7318: la $2, sym_2_7318
-+.globl sym_2_7319
-+sym_2_7319: la $2, sym_2_7319
-+.globl sym_2_7320
-+sym_2_7320: la $2, sym_2_7320
-+.globl sym_2_7321
-+sym_2_7321: la $2, sym_2_7321
-+.globl sym_2_7322
-+sym_2_7322: la $2, sym_2_7322
-+.globl sym_2_7323
-+sym_2_7323: la $2, sym_2_7323
-+.globl sym_2_7324
-+sym_2_7324: la $2, sym_2_7324
-+.globl sym_2_7325
-+sym_2_7325: la $2, sym_2_7325
-+.globl sym_2_7326
-+sym_2_7326: la $2, sym_2_7326
-+.globl sym_2_7327
-+sym_2_7327: la $2, sym_2_7327
-+.globl sym_2_7328
-+sym_2_7328: la $2, sym_2_7328
-+.globl sym_2_7329
-+sym_2_7329: la $2, sym_2_7329
-+.globl sym_2_7330
-+sym_2_7330: la $2, sym_2_7330
-+.globl sym_2_7331
-+sym_2_7331: la $2, sym_2_7331
-+.globl sym_2_7332
-+sym_2_7332: la $2, sym_2_7332
-+.globl sym_2_7333
-+sym_2_7333: la $2, sym_2_7333
-+.globl sym_2_7334
-+sym_2_7334: la $2, sym_2_7334
-+.globl sym_2_7335
-+sym_2_7335: la $2, sym_2_7335
-+.globl sym_2_7336
-+sym_2_7336: la $2, sym_2_7336
-+.globl sym_2_7337
-+sym_2_7337: la $2, sym_2_7337
-+.globl sym_2_7338
-+sym_2_7338: la $2, sym_2_7338
-+.globl sym_2_7339
-+sym_2_7339: la $2, sym_2_7339
-+.globl sym_2_7340
-+sym_2_7340: la $2, sym_2_7340
-+.globl sym_2_7341
-+sym_2_7341: la $2, sym_2_7341
-+.globl sym_2_7342
-+sym_2_7342: la $2, sym_2_7342
-+.globl sym_2_7343
-+sym_2_7343: la $2, sym_2_7343
-+.globl sym_2_7344
-+sym_2_7344: la $2, sym_2_7344
-+.globl sym_2_7345
-+sym_2_7345: la $2, sym_2_7345
-+.globl sym_2_7346
-+sym_2_7346: la $2, sym_2_7346
-+.globl sym_2_7347
-+sym_2_7347: la $2, sym_2_7347
-+.globl sym_2_7348
-+sym_2_7348: la $2, sym_2_7348
-+.globl sym_2_7349
-+sym_2_7349: la $2, sym_2_7349
-+.globl sym_2_7350
-+sym_2_7350: la $2, sym_2_7350
-+.globl sym_2_7351
-+sym_2_7351: la $2, sym_2_7351
-+.globl sym_2_7352
-+sym_2_7352: la $2, sym_2_7352
-+.globl sym_2_7353
-+sym_2_7353: la $2, sym_2_7353
-+.globl sym_2_7354
-+sym_2_7354: la $2, sym_2_7354
-+.globl sym_2_7355
-+sym_2_7355: la $2, sym_2_7355
-+.globl sym_2_7356
-+sym_2_7356: la $2, sym_2_7356
-+.globl sym_2_7357
-+sym_2_7357: la $2, sym_2_7357
-+.globl sym_2_7358
-+sym_2_7358: la $2, sym_2_7358
-+.globl sym_2_7359
-+sym_2_7359: la $2, sym_2_7359
-+.globl sym_2_7360
-+sym_2_7360: la $2, sym_2_7360
-+.globl sym_2_7361
-+sym_2_7361: la $2, sym_2_7361
-+.globl sym_2_7362
-+sym_2_7362: la $2, sym_2_7362
-+.globl sym_2_7363
-+sym_2_7363: la $2, sym_2_7363
-+.globl sym_2_7364
-+sym_2_7364: la $2, sym_2_7364
-+.globl sym_2_7365
-+sym_2_7365: la $2, sym_2_7365
-+.globl sym_2_7366
-+sym_2_7366: la $2, sym_2_7366
-+.globl sym_2_7367
-+sym_2_7367: la $2, sym_2_7367
-+.globl sym_2_7368
-+sym_2_7368: la $2, sym_2_7368
-+.globl sym_2_7369
-+sym_2_7369: la $2, sym_2_7369
-+.globl sym_2_7370
-+sym_2_7370: la $2, sym_2_7370
-+.globl sym_2_7371
-+sym_2_7371: la $2, sym_2_7371
-+.globl sym_2_7372
-+sym_2_7372: la $2, sym_2_7372
-+.globl sym_2_7373
-+sym_2_7373: la $2, sym_2_7373
-+.globl sym_2_7374
-+sym_2_7374: la $2, sym_2_7374
-+.globl sym_2_7375
-+sym_2_7375: la $2, sym_2_7375
-+.globl sym_2_7376
-+sym_2_7376: la $2, sym_2_7376
-+.globl sym_2_7377
-+sym_2_7377: la $2, sym_2_7377
-+.globl sym_2_7378
-+sym_2_7378: la $2, sym_2_7378
-+.globl sym_2_7379
-+sym_2_7379: la $2, sym_2_7379
-+.globl sym_2_7380
-+sym_2_7380: la $2, sym_2_7380
-+.globl sym_2_7381
-+sym_2_7381: la $2, sym_2_7381
-+.globl sym_2_7382
-+sym_2_7382: la $2, sym_2_7382
-+.globl sym_2_7383
-+sym_2_7383: la $2, sym_2_7383
-+.globl sym_2_7384
-+sym_2_7384: la $2, sym_2_7384
-+.globl sym_2_7385
-+sym_2_7385: la $2, sym_2_7385
-+.globl sym_2_7386
-+sym_2_7386: la $2, sym_2_7386
-+.globl sym_2_7387
-+sym_2_7387: la $2, sym_2_7387
-+.globl sym_2_7388
-+sym_2_7388: la $2, sym_2_7388
-+.globl sym_2_7389
-+sym_2_7389: la $2, sym_2_7389
-+.globl sym_2_7390
-+sym_2_7390: la $2, sym_2_7390
-+.globl sym_2_7391
-+sym_2_7391: la $2, sym_2_7391
-+.globl sym_2_7392
-+sym_2_7392: la $2, sym_2_7392
-+.globl sym_2_7393
-+sym_2_7393: la $2, sym_2_7393
-+.globl sym_2_7394
-+sym_2_7394: la $2, sym_2_7394
-+.globl sym_2_7395
-+sym_2_7395: la $2, sym_2_7395
-+.globl sym_2_7396
-+sym_2_7396: la $2, sym_2_7396
-+.globl sym_2_7397
-+sym_2_7397: la $2, sym_2_7397
-+.globl sym_2_7398
-+sym_2_7398: la $2, sym_2_7398
-+.globl sym_2_7399
-+sym_2_7399: la $2, sym_2_7399
-+.globl sym_2_7400
-+sym_2_7400: la $2, sym_2_7400
-+.globl sym_2_7401
-+sym_2_7401: la $2, sym_2_7401
-+.globl sym_2_7402
-+sym_2_7402: la $2, sym_2_7402
-+.globl sym_2_7403
-+sym_2_7403: la $2, sym_2_7403
-+.globl sym_2_7404
-+sym_2_7404: la $2, sym_2_7404
-+.globl sym_2_7405
-+sym_2_7405: la $2, sym_2_7405
-+.globl sym_2_7406
-+sym_2_7406: la $2, sym_2_7406
-+.globl sym_2_7407
-+sym_2_7407: la $2, sym_2_7407
-+.globl sym_2_7408
-+sym_2_7408: la $2, sym_2_7408
-+.globl sym_2_7409
-+sym_2_7409: la $2, sym_2_7409
-+.globl sym_2_7410
-+sym_2_7410: la $2, sym_2_7410
-+.globl sym_2_7411
-+sym_2_7411: la $2, sym_2_7411
-+.globl sym_2_7412
-+sym_2_7412: la $2, sym_2_7412
-+.globl sym_2_7413
-+sym_2_7413: la $2, sym_2_7413
-+.globl sym_2_7414
-+sym_2_7414: la $2, sym_2_7414
-+.globl sym_2_7415
-+sym_2_7415: la $2, sym_2_7415
-+.globl sym_2_7416
-+sym_2_7416: la $2, sym_2_7416
-+.globl sym_2_7417
-+sym_2_7417: la $2, sym_2_7417
-+.globl sym_2_7418
-+sym_2_7418: la $2, sym_2_7418
-+.globl sym_2_7419
-+sym_2_7419: la $2, sym_2_7419
-+.globl sym_2_7420
-+sym_2_7420: la $2, sym_2_7420
-+.globl sym_2_7421
-+sym_2_7421: la $2, sym_2_7421
-+.globl sym_2_7422
-+sym_2_7422: la $2, sym_2_7422
-+.globl sym_2_7423
-+sym_2_7423: la $2, sym_2_7423
-+.globl sym_2_7424
-+sym_2_7424: la $2, sym_2_7424
-+.globl sym_2_7425
-+sym_2_7425: la $2, sym_2_7425
-+.globl sym_2_7426
-+sym_2_7426: la $2, sym_2_7426
-+.globl sym_2_7427
-+sym_2_7427: la $2, sym_2_7427
-+.globl sym_2_7428
-+sym_2_7428: la $2, sym_2_7428
-+.globl sym_2_7429
-+sym_2_7429: la $2, sym_2_7429
-+.globl sym_2_7430
-+sym_2_7430: la $2, sym_2_7430
-+.globl sym_2_7431
-+sym_2_7431: la $2, sym_2_7431
-+.globl sym_2_7432
-+sym_2_7432: la $2, sym_2_7432
-+.globl sym_2_7433
-+sym_2_7433: la $2, sym_2_7433
-+.globl sym_2_7434
-+sym_2_7434: la $2, sym_2_7434
-+.globl sym_2_7435
-+sym_2_7435: la $2, sym_2_7435
-+.globl sym_2_7436
-+sym_2_7436: la $2, sym_2_7436
-+.globl sym_2_7437
-+sym_2_7437: la $2, sym_2_7437
-+.globl sym_2_7438
-+sym_2_7438: la $2, sym_2_7438
-+.globl sym_2_7439
-+sym_2_7439: la $2, sym_2_7439
-+.globl sym_2_7440
-+sym_2_7440: la $2, sym_2_7440
-+.globl sym_2_7441
-+sym_2_7441: la $2, sym_2_7441
-+.globl sym_2_7442
-+sym_2_7442: la $2, sym_2_7442
-+.globl sym_2_7443
-+sym_2_7443: la $2, sym_2_7443
-+.globl sym_2_7444
-+sym_2_7444: la $2, sym_2_7444
-+.globl sym_2_7445
-+sym_2_7445: la $2, sym_2_7445
-+.globl sym_2_7446
-+sym_2_7446: la $2, sym_2_7446
-+.globl sym_2_7447
-+sym_2_7447: la $2, sym_2_7447
-+.globl sym_2_7448
-+sym_2_7448: la $2, sym_2_7448
-+.globl sym_2_7449
-+sym_2_7449: la $2, sym_2_7449
-+.globl sym_2_7450
-+sym_2_7450: la $2, sym_2_7450
-+.globl sym_2_7451
-+sym_2_7451: la $2, sym_2_7451
-+.globl sym_2_7452
-+sym_2_7452: la $2, sym_2_7452
-+.globl sym_2_7453
-+sym_2_7453: la $2, sym_2_7453
-+.globl sym_2_7454
-+sym_2_7454: la $2, sym_2_7454
-+.globl sym_2_7455
-+sym_2_7455: la $2, sym_2_7455
-+.globl sym_2_7456
-+sym_2_7456: la $2, sym_2_7456
-+.globl sym_2_7457
-+sym_2_7457: la $2, sym_2_7457
-+.globl sym_2_7458
-+sym_2_7458: la $2, sym_2_7458
-+.globl sym_2_7459
-+sym_2_7459: la $2, sym_2_7459
-+.globl sym_2_7460
-+sym_2_7460: la $2, sym_2_7460
-+.globl sym_2_7461
-+sym_2_7461: la $2, sym_2_7461
-+.globl sym_2_7462
-+sym_2_7462: la $2, sym_2_7462
-+.globl sym_2_7463
-+sym_2_7463: la $2, sym_2_7463
-+.globl sym_2_7464
-+sym_2_7464: la $2, sym_2_7464
-+.globl sym_2_7465
-+sym_2_7465: la $2, sym_2_7465
-+.globl sym_2_7466
-+sym_2_7466: la $2, sym_2_7466
-+.globl sym_2_7467
-+sym_2_7467: la $2, sym_2_7467
-+.globl sym_2_7468
-+sym_2_7468: la $2, sym_2_7468
-+.globl sym_2_7469
-+sym_2_7469: la $2, sym_2_7469
-+.globl sym_2_7470
-+sym_2_7470: la $2, sym_2_7470
-+.globl sym_2_7471
-+sym_2_7471: la $2, sym_2_7471
-+.globl sym_2_7472
-+sym_2_7472: la $2, sym_2_7472
-+.globl sym_2_7473
-+sym_2_7473: la $2, sym_2_7473
-+.globl sym_2_7474
-+sym_2_7474: la $2, sym_2_7474
-+.globl sym_2_7475
-+sym_2_7475: la $2, sym_2_7475
-+.globl sym_2_7476
-+sym_2_7476: la $2, sym_2_7476
-+.globl sym_2_7477
-+sym_2_7477: la $2, sym_2_7477
-+.globl sym_2_7478
-+sym_2_7478: la $2, sym_2_7478
-+.globl sym_2_7479
-+sym_2_7479: la $2, sym_2_7479
-+.globl sym_2_7480
-+sym_2_7480: la $2, sym_2_7480
-+.globl sym_2_7481
-+sym_2_7481: la $2, sym_2_7481
-+.globl sym_2_7482
-+sym_2_7482: la $2, sym_2_7482
-+.globl sym_2_7483
-+sym_2_7483: la $2, sym_2_7483
-+.globl sym_2_7484
-+sym_2_7484: la $2, sym_2_7484
-+.globl sym_2_7485
-+sym_2_7485: la $2, sym_2_7485
-+.globl sym_2_7486
-+sym_2_7486: la $2, sym_2_7486
-+.globl sym_2_7487
-+sym_2_7487: la $2, sym_2_7487
-+.globl sym_2_7488
-+sym_2_7488: la $2, sym_2_7488
-+.globl sym_2_7489
-+sym_2_7489: la $2, sym_2_7489
-+.globl sym_2_7490
-+sym_2_7490: la $2, sym_2_7490
-+.globl sym_2_7491
-+sym_2_7491: la $2, sym_2_7491
-+.globl sym_2_7492
-+sym_2_7492: la $2, sym_2_7492
-+.globl sym_2_7493
-+sym_2_7493: la $2, sym_2_7493
-+.globl sym_2_7494
-+sym_2_7494: la $2, sym_2_7494
-+.globl sym_2_7495
-+sym_2_7495: la $2, sym_2_7495
-+.globl sym_2_7496
-+sym_2_7496: la $2, sym_2_7496
-+.globl sym_2_7497
-+sym_2_7497: la $2, sym_2_7497
-+.globl sym_2_7498
-+sym_2_7498: la $2, sym_2_7498
-+.globl sym_2_7499
-+sym_2_7499: la $2, sym_2_7499
-+.globl sym_2_7500
-+sym_2_7500: la $2, sym_2_7500
-+.globl sym_2_7501
-+sym_2_7501: la $2, sym_2_7501
-+.globl sym_2_7502
-+sym_2_7502: la $2, sym_2_7502
-+.globl sym_2_7503
-+sym_2_7503: la $2, sym_2_7503
-+.globl sym_2_7504
-+sym_2_7504: la $2, sym_2_7504
-+.globl sym_2_7505
-+sym_2_7505: la $2, sym_2_7505
-+.globl sym_2_7506
-+sym_2_7506: la $2, sym_2_7506
-+.globl sym_2_7507
-+sym_2_7507: la $2, sym_2_7507
-+.globl sym_2_7508
-+sym_2_7508: la $2, sym_2_7508
-+.globl sym_2_7509
-+sym_2_7509: la $2, sym_2_7509
-+.globl sym_2_7510
-+sym_2_7510: la $2, sym_2_7510
-+.globl sym_2_7511
-+sym_2_7511: la $2, sym_2_7511
-+.globl sym_2_7512
-+sym_2_7512: la $2, sym_2_7512
-+.globl sym_2_7513
-+sym_2_7513: la $2, sym_2_7513
-+.globl sym_2_7514
-+sym_2_7514: la $2, sym_2_7514
-+.globl sym_2_7515
-+sym_2_7515: la $2, sym_2_7515
-+.globl sym_2_7516
-+sym_2_7516: la $2, sym_2_7516
-+.globl sym_2_7517
-+sym_2_7517: la $2, sym_2_7517
-+.globl sym_2_7518
-+sym_2_7518: la $2, sym_2_7518
-+.globl sym_2_7519
-+sym_2_7519: la $2, sym_2_7519
-+.globl sym_2_7520
-+sym_2_7520: la $2, sym_2_7520
-+.globl sym_2_7521
-+sym_2_7521: la $2, sym_2_7521
-+.globl sym_2_7522
-+sym_2_7522: la $2, sym_2_7522
-+.globl sym_2_7523
-+sym_2_7523: la $2, sym_2_7523
-+.globl sym_2_7524
-+sym_2_7524: la $2, sym_2_7524
-+.globl sym_2_7525
-+sym_2_7525: la $2, sym_2_7525
-+.globl sym_2_7526
-+sym_2_7526: la $2, sym_2_7526
-+.globl sym_2_7527
-+sym_2_7527: la $2, sym_2_7527
-+.globl sym_2_7528
-+sym_2_7528: la $2, sym_2_7528
-+.globl sym_2_7529
-+sym_2_7529: la $2, sym_2_7529
-+.globl sym_2_7530
-+sym_2_7530: la $2, sym_2_7530
-+.globl sym_2_7531
-+sym_2_7531: la $2, sym_2_7531
-+.globl sym_2_7532
-+sym_2_7532: la $2, sym_2_7532
-+.globl sym_2_7533
-+sym_2_7533: la $2, sym_2_7533
-+.globl sym_2_7534
-+sym_2_7534: la $2, sym_2_7534
-+.globl sym_2_7535
-+sym_2_7535: la $2, sym_2_7535
-+.globl sym_2_7536
-+sym_2_7536: la $2, sym_2_7536
-+.globl sym_2_7537
-+sym_2_7537: la $2, sym_2_7537
-+.globl sym_2_7538
-+sym_2_7538: la $2, sym_2_7538
-+.globl sym_2_7539
-+sym_2_7539: la $2, sym_2_7539
-+.globl sym_2_7540
-+sym_2_7540: la $2, sym_2_7540
-+.globl sym_2_7541
-+sym_2_7541: la $2, sym_2_7541
-+.globl sym_2_7542
-+sym_2_7542: la $2, sym_2_7542
-+.globl sym_2_7543
-+sym_2_7543: la $2, sym_2_7543
-+.globl sym_2_7544
-+sym_2_7544: la $2, sym_2_7544
-+.globl sym_2_7545
-+sym_2_7545: la $2, sym_2_7545
-+.globl sym_2_7546
-+sym_2_7546: la $2, sym_2_7546
-+.globl sym_2_7547
-+sym_2_7547: la $2, sym_2_7547
-+.globl sym_2_7548
-+sym_2_7548: la $2, sym_2_7548
-+.globl sym_2_7549
-+sym_2_7549: la $2, sym_2_7549
-+.globl sym_2_7550
-+sym_2_7550: la $2, sym_2_7550
-+.globl sym_2_7551
-+sym_2_7551: la $2, sym_2_7551
-+.globl sym_2_7552
-+sym_2_7552: la $2, sym_2_7552
-+.globl sym_2_7553
-+sym_2_7553: la $2, sym_2_7553
-+.globl sym_2_7554
-+sym_2_7554: la $2, sym_2_7554
-+.globl sym_2_7555
-+sym_2_7555: la $2, sym_2_7555
-+.globl sym_2_7556
-+sym_2_7556: la $2, sym_2_7556
-+.globl sym_2_7557
-+sym_2_7557: la $2, sym_2_7557
-+.globl sym_2_7558
-+sym_2_7558: la $2, sym_2_7558
-+.globl sym_2_7559
-+sym_2_7559: la $2, sym_2_7559
-+.globl sym_2_7560
-+sym_2_7560: la $2, sym_2_7560
-+.globl sym_2_7561
-+sym_2_7561: la $2, sym_2_7561
-+.globl sym_2_7562
-+sym_2_7562: la $2, sym_2_7562
-+.globl sym_2_7563
-+sym_2_7563: la $2, sym_2_7563
-+.globl sym_2_7564
-+sym_2_7564: la $2, sym_2_7564
-+.globl sym_2_7565
-+sym_2_7565: la $2, sym_2_7565
-+.globl sym_2_7566
-+sym_2_7566: la $2, sym_2_7566
-+.globl sym_2_7567
-+sym_2_7567: la $2, sym_2_7567
-+.globl sym_2_7568
-+sym_2_7568: la $2, sym_2_7568
-+.globl sym_2_7569
-+sym_2_7569: la $2, sym_2_7569
-+.globl sym_2_7570
-+sym_2_7570: la $2, sym_2_7570
-+.globl sym_2_7571
-+sym_2_7571: la $2, sym_2_7571
-+.globl sym_2_7572
-+sym_2_7572: la $2, sym_2_7572
-+.globl sym_2_7573
-+sym_2_7573: la $2, sym_2_7573
-+.globl sym_2_7574
-+sym_2_7574: la $2, sym_2_7574
-+.globl sym_2_7575
-+sym_2_7575: la $2, sym_2_7575
-+.globl sym_2_7576
-+sym_2_7576: la $2, sym_2_7576
-+.globl sym_2_7577
-+sym_2_7577: la $2, sym_2_7577
-+.globl sym_2_7578
-+sym_2_7578: la $2, sym_2_7578
-+.globl sym_2_7579
-+sym_2_7579: la $2, sym_2_7579
-+.globl sym_2_7580
-+sym_2_7580: la $2, sym_2_7580
-+.globl sym_2_7581
-+sym_2_7581: la $2, sym_2_7581
-+.globl sym_2_7582
-+sym_2_7582: la $2, sym_2_7582
-+.globl sym_2_7583
-+sym_2_7583: la $2, sym_2_7583
-+.globl sym_2_7584
-+sym_2_7584: la $2, sym_2_7584
-+.globl sym_2_7585
-+sym_2_7585: la $2, sym_2_7585
-+.globl sym_2_7586
-+sym_2_7586: la $2, sym_2_7586
-+.globl sym_2_7587
-+sym_2_7587: la $2, sym_2_7587
-+.globl sym_2_7588
-+sym_2_7588: la $2, sym_2_7588
-+.globl sym_2_7589
-+sym_2_7589: la $2, sym_2_7589
-+.globl sym_2_7590
-+sym_2_7590: la $2, sym_2_7590
-+.globl sym_2_7591
-+sym_2_7591: la $2, sym_2_7591
-+.globl sym_2_7592
-+sym_2_7592: la $2, sym_2_7592
-+.globl sym_2_7593
-+sym_2_7593: la $2, sym_2_7593
-+.globl sym_2_7594
-+sym_2_7594: la $2, sym_2_7594
-+.globl sym_2_7595
-+sym_2_7595: la $2, sym_2_7595
-+.globl sym_2_7596
-+sym_2_7596: la $2, sym_2_7596
-+.globl sym_2_7597
-+sym_2_7597: la $2, sym_2_7597
-+.globl sym_2_7598
-+sym_2_7598: la $2, sym_2_7598
-+.globl sym_2_7599
-+sym_2_7599: la $2, sym_2_7599
-+.globl sym_2_7600
-+sym_2_7600: la $2, sym_2_7600
-+.globl sym_2_7601
-+sym_2_7601: la $2, sym_2_7601
-+.globl sym_2_7602
-+sym_2_7602: la $2, sym_2_7602
-+.globl sym_2_7603
-+sym_2_7603: la $2, sym_2_7603
-+.globl sym_2_7604
-+sym_2_7604: la $2, sym_2_7604
-+.globl sym_2_7605
-+sym_2_7605: la $2, sym_2_7605
-+.globl sym_2_7606
-+sym_2_7606: la $2, sym_2_7606
-+.globl sym_2_7607
-+sym_2_7607: la $2, sym_2_7607
-+.globl sym_2_7608
-+sym_2_7608: la $2, sym_2_7608
-+.globl sym_2_7609
-+sym_2_7609: la $2, sym_2_7609
-+.globl sym_2_7610
-+sym_2_7610: la $2, sym_2_7610
-+.globl sym_2_7611
-+sym_2_7611: la $2, sym_2_7611
-+.globl sym_2_7612
-+sym_2_7612: la $2, sym_2_7612
-+.globl sym_2_7613
-+sym_2_7613: la $2, sym_2_7613
-+.globl sym_2_7614
-+sym_2_7614: la $2, sym_2_7614
-+.globl sym_2_7615
-+sym_2_7615: la $2, sym_2_7615
-+.globl sym_2_7616
-+sym_2_7616: la $2, sym_2_7616
-+.globl sym_2_7617
-+sym_2_7617: la $2, sym_2_7617
-+.globl sym_2_7618
-+sym_2_7618: la $2, sym_2_7618
-+.globl sym_2_7619
-+sym_2_7619: la $2, sym_2_7619
-+.globl sym_2_7620
-+sym_2_7620: la $2, sym_2_7620
-+.globl sym_2_7621
-+sym_2_7621: la $2, sym_2_7621
-+.globl sym_2_7622
-+sym_2_7622: la $2, sym_2_7622
-+.globl sym_2_7623
-+sym_2_7623: la $2, sym_2_7623
-+.globl sym_2_7624
-+sym_2_7624: la $2, sym_2_7624
-+.globl sym_2_7625
-+sym_2_7625: la $2, sym_2_7625
-+.globl sym_2_7626
-+sym_2_7626: la $2, sym_2_7626
-+.globl sym_2_7627
-+sym_2_7627: la $2, sym_2_7627
-+.globl sym_2_7628
-+sym_2_7628: la $2, sym_2_7628
-+.globl sym_2_7629
-+sym_2_7629: la $2, sym_2_7629
-+.globl sym_2_7630
-+sym_2_7630: la $2, sym_2_7630
-+.globl sym_2_7631
-+sym_2_7631: la $2, sym_2_7631
-+.globl sym_2_7632
-+sym_2_7632: la $2, sym_2_7632
-+.globl sym_2_7633
-+sym_2_7633: la $2, sym_2_7633
-+.globl sym_2_7634
-+sym_2_7634: la $2, sym_2_7634
-+.globl sym_2_7635
-+sym_2_7635: la $2, sym_2_7635
-+.globl sym_2_7636
-+sym_2_7636: la $2, sym_2_7636
-+.globl sym_2_7637
-+sym_2_7637: la $2, sym_2_7637
-+.globl sym_2_7638
-+sym_2_7638: la $2, sym_2_7638
-+.globl sym_2_7639
-+sym_2_7639: la $2, sym_2_7639
-+.globl sym_2_7640
-+sym_2_7640: la $2, sym_2_7640
-+.globl sym_2_7641
-+sym_2_7641: la $2, sym_2_7641
-+.globl sym_2_7642
-+sym_2_7642: la $2, sym_2_7642
-+.globl sym_2_7643
-+sym_2_7643: la $2, sym_2_7643
-+.globl sym_2_7644
-+sym_2_7644: la $2, sym_2_7644
-+.globl sym_2_7645
-+sym_2_7645: la $2, sym_2_7645
-+.globl sym_2_7646
-+sym_2_7646: la $2, sym_2_7646
-+.globl sym_2_7647
-+sym_2_7647: la $2, sym_2_7647
-+.globl sym_2_7648
-+sym_2_7648: la $2, sym_2_7648
-+.globl sym_2_7649
-+sym_2_7649: la $2, sym_2_7649
-+.globl sym_2_7650
-+sym_2_7650: la $2, sym_2_7650
-+.globl sym_2_7651
-+sym_2_7651: la $2, sym_2_7651
-+.globl sym_2_7652
-+sym_2_7652: la $2, sym_2_7652
-+.globl sym_2_7653
-+sym_2_7653: la $2, sym_2_7653
-+.globl sym_2_7654
-+sym_2_7654: la $2, sym_2_7654
-+.globl sym_2_7655
-+sym_2_7655: la $2, sym_2_7655
-+.globl sym_2_7656
-+sym_2_7656: la $2, sym_2_7656
-+.globl sym_2_7657
-+sym_2_7657: la $2, sym_2_7657
-+.globl sym_2_7658
-+sym_2_7658: la $2, sym_2_7658
-+.globl sym_2_7659
-+sym_2_7659: la $2, sym_2_7659
-+.globl sym_2_7660
-+sym_2_7660: la $2, sym_2_7660
-+.globl sym_2_7661
-+sym_2_7661: la $2, sym_2_7661
-+.globl sym_2_7662
-+sym_2_7662: la $2, sym_2_7662
-+.globl sym_2_7663
-+sym_2_7663: la $2, sym_2_7663
-+.globl sym_2_7664
-+sym_2_7664: la $2, sym_2_7664
-+.globl sym_2_7665
-+sym_2_7665: la $2, sym_2_7665
-+.globl sym_2_7666
-+sym_2_7666: la $2, sym_2_7666
-+.globl sym_2_7667
-+sym_2_7667: la $2, sym_2_7667
-+.globl sym_2_7668
-+sym_2_7668: la $2, sym_2_7668
-+.globl sym_2_7669
-+sym_2_7669: la $2, sym_2_7669
-+.globl sym_2_7670
-+sym_2_7670: la $2, sym_2_7670
-+.globl sym_2_7671
-+sym_2_7671: la $2, sym_2_7671
-+.globl sym_2_7672
-+sym_2_7672: la $2, sym_2_7672
-+.globl sym_2_7673
-+sym_2_7673: la $2, sym_2_7673
-+.globl sym_2_7674
-+sym_2_7674: la $2, sym_2_7674
-+.globl sym_2_7675
-+sym_2_7675: la $2, sym_2_7675
-+.globl sym_2_7676
-+sym_2_7676: la $2, sym_2_7676
-+.globl sym_2_7677
-+sym_2_7677: la $2, sym_2_7677
-+.globl sym_2_7678
-+sym_2_7678: la $2, sym_2_7678
-+.globl sym_2_7679
-+sym_2_7679: la $2, sym_2_7679
-+.globl sym_2_7680
-+sym_2_7680: la $2, sym_2_7680
-+.globl sym_2_7681
-+sym_2_7681: la $2, sym_2_7681
-+.globl sym_2_7682
-+sym_2_7682: la $2, sym_2_7682
-+.globl sym_2_7683
-+sym_2_7683: la $2, sym_2_7683
-+.globl sym_2_7684
-+sym_2_7684: la $2, sym_2_7684
-+.globl sym_2_7685
-+sym_2_7685: la $2, sym_2_7685
-+.globl sym_2_7686
-+sym_2_7686: la $2, sym_2_7686
-+.globl sym_2_7687
-+sym_2_7687: la $2, sym_2_7687
-+.globl sym_2_7688
-+sym_2_7688: la $2, sym_2_7688
-+.globl sym_2_7689
-+sym_2_7689: la $2, sym_2_7689
-+.globl sym_2_7690
-+sym_2_7690: la $2, sym_2_7690
-+.globl sym_2_7691
-+sym_2_7691: la $2, sym_2_7691
-+.globl sym_2_7692
-+sym_2_7692: la $2, sym_2_7692
-+.globl sym_2_7693
-+sym_2_7693: la $2, sym_2_7693
-+.globl sym_2_7694
-+sym_2_7694: la $2, sym_2_7694
-+.globl sym_2_7695
-+sym_2_7695: la $2, sym_2_7695
-+.globl sym_2_7696
-+sym_2_7696: la $2, sym_2_7696
-+.globl sym_2_7697
-+sym_2_7697: la $2, sym_2_7697
-+.globl sym_2_7698
-+sym_2_7698: la $2, sym_2_7698
-+.globl sym_2_7699
-+sym_2_7699: la $2, sym_2_7699
-+.globl sym_2_7700
-+sym_2_7700: la $2, sym_2_7700
-+.globl sym_2_7701
-+sym_2_7701: la $2, sym_2_7701
-+.globl sym_2_7702
-+sym_2_7702: la $2, sym_2_7702
-+.globl sym_2_7703
-+sym_2_7703: la $2, sym_2_7703
-+.globl sym_2_7704
-+sym_2_7704: la $2, sym_2_7704
-+.globl sym_2_7705
-+sym_2_7705: la $2, sym_2_7705
-+.globl sym_2_7706
-+sym_2_7706: la $2, sym_2_7706
-+.globl sym_2_7707
-+sym_2_7707: la $2, sym_2_7707
-+.globl sym_2_7708
-+sym_2_7708: la $2, sym_2_7708
-+.globl sym_2_7709
-+sym_2_7709: la $2, sym_2_7709
-+.globl sym_2_7710
-+sym_2_7710: la $2, sym_2_7710
-+.globl sym_2_7711
-+sym_2_7711: la $2, sym_2_7711
-+.globl sym_2_7712
-+sym_2_7712: la $2, sym_2_7712
-+.globl sym_2_7713
-+sym_2_7713: la $2, sym_2_7713
-+.globl sym_2_7714
-+sym_2_7714: la $2, sym_2_7714
-+.globl sym_2_7715
-+sym_2_7715: la $2, sym_2_7715
-+.globl sym_2_7716
-+sym_2_7716: la $2, sym_2_7716
-+.globl sym_2_7717
-+sym_2_7717: la $2, sym_2_7717
-+.globl sym_2_7718
-+sym_2_7718: la $2, sym_2_7718
-+.globl sym_2_7719
-+sym_2_7719: la $2, sym_2_7719
-+.globl sym_2_7720
-+sym_2_7720: la $2, sym_2_7720
-+.globl sym_2_7721
-+sym_2_7721: la $2, sym_2_7721
-+.globl sym_2_7722
-+sym_2_7722: la $2, sym_2_7722
-+.globl sym_2_7723
-+sym_2_7723: la $2, sym_2_7723
-+.globl sym_2_7724
-+sym_2_7724: la $2, sym_2_7724
-+.globl sym_2_7725
-+sym_2_7725: la $2, sym_2_7725
-+.globl sym_2_7726
-+sym_2_7726: la $2, sym_2_7726
-+.globl sym_2_7727
-+sym_2_7727: la $2, sym_2_7727
-+.globl sym_2_7728
-+sym_2_7728: la $2, sym_2_7728
-+.globl sym_2_7729
-+sym_2_7729: la $2, sym_2_7729
-+.globl sym_2_7730
-+sym_2_7730: la $2, sym_2_7730
-+.globl sym_2_7731
-+sym_2_7731: la $2, sym_2_7731
-+.globl sym_2_7732
-+sym_2_7732: la $2, sym_2_7732
-+.globl sym_2_7733
-+sym_2_7733: la $2, sym_2_7733
-+.globl sym_2_7734
-+sym_2_7734: la $2, sym_2_7734
-+.globl sym_2_7735
-+sym_2_7735: la $2, sym_2_7735
-+.globl sym_2_7736
-+sym_2_7736: la $2, sym_2_7736
-+.globl sym_2_7737
-+sym_2_7737: la $2, sym_2_7737
-+.globl sym_2_7738
-+sym_2_7738: la $2, sym_2_7738
-+.globl sym_2_7739
-+sym_2_7739: la $2, sym_2_7739
-+.globl sym_2_7740
-+sym_2_7740: la $2, sym_2_7740
-+.globl sym_2_7741
-+sym_2_7741: la $2, sym_2_7741
-+.globl sym_2_7742
-+sym_2_7742: la $2, sym_2_7742
-+.globl sym_2_7743
-+sym_2_7743: la $2, sym_2_7743
-+.globl sym_2_7744
-+sym_2_7744: la $2, sym_2_7744
-+.globl sym_2_7745
-+sym_2_7745: la $2, sym_2_7745
-+.globl sym_2_7746
-+sym_2_7746: la $2, sym_2_7746
-+.globl sym_2_7747
-+sym_2_7747: la $2, sym_2_7747
-+.globl sym_2_7748
-+sym_2_7748: la $2, sym_2_7748
-+.globl sym_2_7749
-+sym_2_7749: la $2, sym_2_7749
-+.globl sym_2_7750
-+sym_2_7750: la $2, sym_2_7750
-+.globl sym_2_7751
-+sym_2_7751: la $2, sym_2_7751
-+.globl sym_2_7752
-+sym_2_7752: la $2, sym_2_7752
-+.globl sym_2_7753
-+sym_2_7753: la $2, sym_2_7753
-+.globl sym_2_7754
-+sym_2_7754: la $2, sym_2_7754
-+.globl sym_2_7755
-+sym_2_7755: la $2, sym_2_7755
-+.globl sym_2_7756
-+sym_2_7756: la $2, sym_2_7756
-+.globl sym_2_7757
-+sym_2_7757: la $2, sym_2_7757
-+.globl sym_2_7758
-+sym_2_7758: la $2, sym_2_7758
-+.globl sym_2_7759
-+sym_2_7759: la $2, sym_2_7759
-+.globl sym_2_7760
-+sym_2_7760: la $2, sym_2_7760
-+.globl sym_2_7761
-+sym_2_7761: la $2, sym_2_7761
-+.globl sym_2_7762
-+sym_2_7762: la $2, sym_2_7762
-+.globl sym_2_7763
-+sym_2_7763: la $2, sym_2_7763
-+.globl sym_2_7764
-+sym_2_7764: la $2, sym_2_7764
-+.globl sym_2_7765
-+sym_2_7765: la $2, sym_2_7765
-+.globl sym_2_7766
-+sym_2_7766: la $2, sym_2_7766
-+.globl sym_2_7767
-+sym_2_7767: la $2, sym_2_7767
-+.globl sym_2_7768
-+sym_2_7768: la $2, sym_2_7768
-+.globl sym_2_7769
-+sym_2_7769: la $2, sym_2_7769
-+.globl sym_2_7770
-+sym_2_7770: la $2, sym_2_7770
-+.globl sym_2_7771
-+sym_2_7771: la $2, sym_2_7771
-+.globl sym_2_7772
-+sym_2_7772: la $2, sym_2_7772
-+.globl sym_2_7773
-+sym_2_7773: la $2, sym_2_7773
-+.globl sym_2_7774
-+sym_2_7774: la $2, sym_2_7774
-+.globl sym_2_7775
-+sym_2_7775: la $2, sym_2_7775
-+.globl sym_2_7776
-+sym_2_7776: la $2, sym_2_7776
-+.globl sym_2_7777
-+sym_2_7777: la $2, sym_2_7777
-+.globl sym_2_7778
-+sym_2_7778: la $2, sym_2_7778
-+.globl sym_2_7779
-+sym_2_7779: la $2, sym_2_7779
-+.globl sym_2_7780
-+sym_2_7780: la $2, sym_2_7780
-+.globl sym_2_7781
-+sym_2_7781: la $2, sym_2_7781
-+.globl sym_2_7782
-+sym_2_7782: la $2, sym_2_7782
-+.globl sym_2_7783
-+sym_2_7783: la $2, sym_2_7783
-+.globl sym_2_7784
-+sym_2_7784: la $2, sym_2_7784
-+.globl sym_2_7785
-+sym_2_7785: la $2, sym_2_7785
-+.globl sym_2_7786
-+sym_2_7786: la $2, sym_2_7786
-+.globl sym_2_7787
-+sym_2_7787: la $2, sym_2_7787
-+.globl sym_2_7788
-+sym_2_7788: la $2, sym_2_7788
-+.globl sym_2_7789
-+sym_2_7789: la $2, sym_2_7789
-+.globl sym_2_7790
-+sym_2_7790: la $2, sym_2_7790
-+.globl sym_2_7791
-+sym_2_7791: la $2, sym_2_7791
-+.globl sym_2_7792
-+sym_2_7792: la $2, sym_2_7792
-+.globl sym_2_7793
-+sym_2_7793: la $2, sym_2_7793
-+.globl sym_2_7794
-+sym_2_7794: la $2, sym_2_7794
-+.globl sym_2_7795
-+sym_2_7795: la $2, sym_2_7795
-+.globl sym_2_7796
-+sym_2_7796: la $2, sym_2_7796
-+.globl sym_2_7797
-+sym_2_7797: la $2, sym_2_7797
-+.globl sym_2_7798
-+sym_2_7798: la $2, sym_2_7798
-+.globl sym_2_7799
-+sym_2_7799: la $2, sym_2_7799
-+.globl sym_2_7800
-+sym_2_7800: la $2, sym_2_7800
-+.globl sym_2_7801
-+sym_2_7801: la $2, sym_2_7801
-+.globl sym_2_7802
-+sym_2_7802: la $2, sym_2_7802
-+.globl sym_2_7803
-+sym_2_7803: la $2, sym_2_7803
-+.globl sym_2_7804
-+sym_2_7804: la $2, sym_2_7804
-+.globl sym_2_7805
-+sym_2_7805: la $2, sym_2_7805
-+.globl sym_2_7806
-+sym_2_7806: la $2, sym_2_7806
-+.globl sym_2_7807
-+sym_2_7807: la $2, sym_2_7807
-+.globl sym_2_7808
-+sym_2_7808: la $2, sym_2_7808
-+.globl sym_2_7809
-+sym_2_7809: la $2, sym_2_7809
-+.globl sym_2_7810
-+sym_2_7810: la $2, sym_2_7810
-+.globl sym_2_7811
-+sym_2_7811: la $2, sym_2_7811
-+.globl sym_2_7812
-+sym_2_7812: la $2, sym_2_7812
-+.globl sym_2_7813
-+sym_2_7813: la $2, sym_2_7813
-+.globl sym_2_7814
-+sym_2_7814: la $2, sym_2_7814
-+.globl sym_2_7815
-+sym_2_7815: la $2, sym_2_7815
-+.globl sym_2_7816
-+sym_2_7816: la $2, sym_2_7816
-+.globl sym_2_7817
-+sym_2_7817: la $2, sym_2_7817
-+.globl sym_2_7818
-+sym_2_7818: la $2, sym_2_7818
-+.globl sym_2_7819
-+sym_2_7819: la $2, sym_2_7819
-+.globl sym_2_7820
-+sym_2_7820: la $2, sym_2_7820
-+.globl sym_2_7821
-+sym_2_7821: la $2, sym_2_7821
-+.globl sym_2_7822
-+sym_2_7822: la $2, sym_2_7822
-+.globl sym_2_7823
-+sym_2_7823: la $2, sym_2_7823
-+.globl sym_2_7824
-+sym_2_7824: la $2, sym_2_7824
-+.globl sym_2_7825
-+sym_2_7825: la $2, sym_2_7825
-+.globl sym_2_7826
-+sym_2_7826: la $2, sym_2_7826
-+.globl sym_2_7827
-+sym_2_7827: la $2, sym_2_7827
-+.globl sym_2_7828
-+sym_2_7828: la $2, sym_2_7828
-+.globl sym_2_7829
-+sym_2_7829: la $2, sym_2_7829
-+.globl sym_2_7830
-+sym_2_7830: la $2, sym_2_7830
-+.globl sym_2_7831
-+sym_2_7831: la $2, sym_2_7831
-+.globl sym_2_7832
-+sym_2_7832: la $2, sym_2_7832
-+.globl sym_2_7833
-+sym_2_7833: la $2, sym_2_7833
-+.globl sym_2_7834
-+sym_2_7834: la $2, sym_2_7834
-+.globl sym_2_7835
-+sym_2_7835: la $2, sym_2_7835
-+.globl sym_2_7836
-+sym_2_7836: la $2, sym_2_7836
-+.globl sym_2_7837
-+sym_2_7837: la $2, sym_2_7837
-+.globl sym_2_7838
-+sym_2_7838: la $2, sym_2_7838
-+.globl sym_2_7839
-+sym_2_7839: la $2, sym_2_7839
-+.globl sym_2_7840
-+sym_2_7840: la $2, sym_2_7840
-+.globl sym_2_7841
-+sym_2_7841: la $2, sym_2_7841
-+.globl sym_2_7842
-+sym_2_7842: la $2, sym_2_7842
-+.globl sym_2_7843
-+sym_2_7843: la $2, sym_2_7843
-+.globl sym_2_7844
-+sym_2_7844: la $2, sym_2_7844
-+.globl sym_2_7845
-+sym_2_7845: la $2, sym_2_7845
-+.globl sym_2_7846
-+sym_2_7846: la $2, sym_2_7846
-+.globl sym_2_7847
-+sym_2_7847: la $2, sym_2_7847
-+.globl sym_2_7848
-+sym_2_7848: la $2, sym_2_7848
-+.globl sym_2_7849
-+sym_2_7849: la $2, sym_2_7849
-+.globl sym_2_7850
-+sym_2_7850: la $2, sym_2_7850
-+.globl sym_2_7851
-+sym_2_7851: la $2, sym_2_7851
-+.globl sym_2_7852
-+sym_2_7852: la $2, sym_2_7852
-+.globl sym_2_7853
-+sym_2_7853: la $2, sym_2_7853
-+.globl sym_2_7854
-+sym_2_7854: la $2, sym_2_7854
-+.globl sym_2_7855
-+sym_2_7855: la $2, sym_2_7855
-+.globl sym_2_7856
-+sym_2_7856: la $2, sym_2_7856
-+.globl sym_2_7857
-+sym_2_7857: la $2, sym_2_7857
-+.globl sym_2_7858
-+sym_2_7858: la $2, sym_2_7858
-+.globl sym_2_7859
-+sym_2_7859: la $2, sym_2_7859
-+.globl sym_2_7860
-+sym_2_7860: la $2, sym_2_7860
-+.globl sym_2_7861
-+sym_2_7861: la $2, sym_2_7861
-+.globl sym_2_7862
-+sym_2_7862: la $2, sym_2_7862
-+.globl sym_2_7863
-+sym_2_7863: la $2, sym_2_7863
-+.globl sym_2_7864
-+sym_2_7864: la $2, sym_2_7864
-+.globl sym_2_7865
-+sym_2_7865: la $2, sym_2_7865
-+.globl sym_2_7866
-+sym_2_7866: la $2, sym_2_7866
-+.globl sym_2_7867
-+sym_2_7867: la $2, sym_2_7867
-+.globl sym_2_7868
-+sym_2_7868: la $2, sym_2_7868
-+.globl sym_2_7869
-+sym_2_7869: la $2, sym_2_7869
-+.globl sym_2_7870
-+sym_2_7870: la $2, sym_2_7870
-+.globl sym_2_7871
-+sym_2_7871: la $2, sym_2_7871
-+.globl sym_2_7872
-+sym_2_7872: la $2, sym_2_7872
-+.globl sym_2_7873
-+sym_2_7873: la $2, sym_2_7873
-+.globl sym_2_7874
-+sym_2_7874: la $2, sym_2_7874
-+.globl sym_2_7875
-+sym_2_7875: la $2, sym_2_7875
-+.globl sym_2_7876
-+sym_2_7876: la $2, sym_2_7876
-+.globl sym_2_7877
-+sym_2_7877: la $2, sym_2_7877
-+.globl sym_2_7878
-+sym_2_7878: la $2, sym_2_7878
-+.globl sym_2_7879
-+sym_2_7879: la $2, sym_2_7879
-+.globl sym_2_7880
-+sym_2_7880: la $2, sym_2_7880
-+.globl sym_2_7881
-+sym_2_7881: la $2, sym_2_7881
-+.globl sym_2_7882
-+sym_2_7882: la $2, sym_2_7882
-+.globl sym_2_7883
-+sym_2_7883: la $2, sym_2_7883
-+.globl sym_2_7884
-+sym_2_7884: la $2, sym_2_7884
-+.globl sym_2_7885
-+sym_2_7885: la $2, sym_2_7885
-+.globl sym_2_7886
-+sym_2_7886: la $2, sym_2_7886
-+.globl sym_2_7887
-+sym_2_7887: la $2, sym_2_7887
-+.globl sym_2_7888
-+sym_2_7888: la $2, sym_2_7888
-+.globl sym_2_7889
-+sym_2_7889: la $2, sym_2_7889
-+.globl sym_2_7890
-+sym_2_7890: la $2, sym_2_7890
-+.globl sym_2_7891
-+sym_2_7891: la $2, sym_2_7891
-+.globl sym_2_7892
-+sym_2_7892: la $2, sym_2_7892
-+.globl sym_2_7893
-+sym_2_7893: la $2, sym_2_7893
-+.globl sym_2_7894
-+sym_2_7894: la $2, sym_2_7894
-+.globl sym_2_7895
-+sym_2_7895: la $2, sym_2_7895
-+.globl sym_2_7896
-+sym_2_7896: la $2, sym_2_7896
-+.globl sym_2_7897
-+sym_2_7897: la $2, sym_2_7897
-+.globl sym_2_7898
-+sym_2_7898: la $2, sym_2_7898
-+.globl sym_2_7899
-+sym_2_7899: la $2, sym_2_7899
-+.globl sym_2_7900
-+sym_2_7900: la $2, sym_2_7900
-+.globl sym_2_7901
-+sym_2_7901: la $2, sym_2_7901
-+.globl sym_2_7902
-+sym_2_7902: la $2, sym_2_7902
-+.globl sym_2_7903
-+sym_2_7903: la $2, sym_2_7903
-+.globl sym_2_7904
-+sym_2_7904: la $2, sym_2_7904
-+.globl sym_2_7905
-+sym_2_7905: la $2, sym_2_7905
-+.globl sym_2_7906
-+sym_2_7906: la $2, sym_2_7906
-+.globl sym_2_7907
-+sym_2_7907: la $2, sym_2_7907
-+.globl sym_2_7908
-+sym_2_7908: la $2, sym_2_7908
-+.globl sym_2_7909
-+sym_2_7909: la $2, sym_2_7909
-+.globl sym_2_7910
-+sym_2_7910: la $2, sym_2_7910
-+.globl sym_2_7911
-+sym_2_7911: la $2, sym_2_7911
-+.globl sym_2_7912
-+sym_2_7912: la $2, sym_2_7912
-+.globl sym_2_7913
-+sym_2_7913: la $2, sym_2_7913
-+.globl sym_2_7914
-+sym_2_7914: la $2, sym_2_7914
-+.globl sym_2_7915
-+sym_2_7915: la $2, sym_2_7915
-+.globl sym_2_7916
-+sym_2_7916: la $2, sym_2_7916
-+.globl sym_2_7917
-+sym_2_7917: la $2, sym_2_7917
-+.globl sym_2_7918
-+sym_2_7918: la $2, sym_2_7918
-+.globl sym_2_7919
-+sym_2_7919: la $2, sym_2_7919
-+.globl sym_2_7920
-+sym_2_7920: la $2, sym_2_7920
-+.globl sym_2_7921
-+sym_2_7921: la $2, sym_2_7921
-+.globl sym_2_7922
-+sym_2_7922: la $2, sym_2_7922
-+.globl sym_2_7923
-+sym_2_7923: la $2, sym_2_7923
-+.globl sym_2_7924
-+sym_2_7924: la $2, sym_2_7924
-+.globl sym_2_7925
-+sym_2_7925: la $2, sym_2_7925
-+.globl sym_2_7926
-+sym_2_7926: la $2, sym_2_7926
-+.globl sym_2_7927
-+sym_2_7927: la $2, sym_2_7927
-+.globl sym_2_7928
-+sym_2_7928: la $2, sym_2_7928
-+.globl sym_2_7929
-+sym_2_7929: la $2, sym_2_7929
-+.globl sym_2_7930
-+sym_2_7930: la $2, sym_2_7930
-+.globl sym_2_7931
-+sym_2_7931: la $2, sym_2_7931
-+.globl sym_2_7932
-+sym_2_7932: la $2, sym_2_7932
-+.globl sym_2_7933
-+sym_2_7933: la $2, sym_2_7933
-+.globl sym_2_7934
-+sym_2_7934: la $2, sym_2_7934
-+.globl sym_2_7935
-+sym_2_7935: la $2, sym_2_7935
-+.globl sym_2_7936
-+sym_2_7936: la $2, sym_2_7936
-+.globl sym_2_7937
-+sym_2_7937: la $2, sym_2_7937
-+.globl sym_2_7938
-+sym_2_7938: la $2, sym_2_7938
-+.globl sym_2_7939
-+sym_2_7939: la $2, sym_2_7939
-+.globl sym_2_7940
-+sym_2_7940: la $2, sym_2_7940
-+.globl sym_2_7941
-+sym_2_7941: la $2, sym_2_7941
-+.globl sym_2_7942
-+sym_2_7942: la $2, sym_2_7942
-+.globl sym_2_7943
-+sym_2_7943: la $2, sym_2_7943
-+.globl sym_2_7944
-+sym_2_7944: la $2, sym_2_7944
-+.globl sym_2_7945
-+sym_2_7945: la $2, sym_2_7945
-+.globl sym_2_7946
-+sym_2_7946: la $2, sym_2_7946
-+.globl sym_2_7947
-+sym_2_7947: la $2, sym_2_7947
-+.globl sym_2_7948
-+sym_2_7948: la $2, sym_2_7948
-+.globl sym_2_7949
-+sym_2_7949: la $2, sym_2_7949
-+.globl sym_2_7950
-+sym_2_7950: la $2, sym_2_7950
-+.globl sym_2_7951
-+sym_2_7951: la $2, sym_2_7951
-+.globl sym_2_7952
-+sym_2_7952: la $2, sym_2_7952
-+.globl sym_2_7953
-+sym_2_7953: la $2, sym_2_7953
-+.globl sym_2_7954
-+sym_2_7954: la $2, sym_2_7954
-+.globl sym_2_7955
-+sym_2_7955: la $2, sym_2_7955
-+.globl sym_2_7956
-+sym_2_7956: la $2, sym_2_7956
-+.globl sym_2_7957
-+sym_2_7957: la $2, sym_2_7957
-+.globl sym_2_7958
-+sym_2_7958: la $2, sym_2_7958
-+.globl sym_2_7959
-+sym_2_7959: la $2, sym_2_7959
-+.globl sym_2_7960
-+sym_2_7960: la $2, sym_2_7960
-+.globl sym_2_7961
-+sym_2_7961: la $2, sym_2_7961
-+.globl sym_2_7962
-+sym_2_7962: la $2, sym_2_7962
-+.globl sym_2_7963
-+sym_2_7963: la $2, sym_2_7963
-+.globl sym_2_7964
-+sym_2_7964: la $2, sym_2_7964
-+.globl sym_2_7965
-+sym_2_7965: la $2, sym_2_7965
-+.globl sym_2_7966
-+sym_2_7966: la $2, sym_2_7966
-+.globl sym_2_7967
-+sym_2_7967: la $2, sym_2_7967
-+.globl sym_2_7968
-+sym_2_7968: la $2, sym_2_7968
-+.globl sym_2_7969
-+sym_2_7969: la $2, sym_2_7969
-+.globl sym_2_7970
-+sym_2_7970: la $2, sym_2_7970
-+.globl sym_2_7971
-+sym_2_7971: la $2, sym_2_7971
-+.globl sym_2_7972
-+sym_2_7972: la $2, sym_2_7972
-+.globl sym_2_7973
-+sym_2_7973: la $2, sym_2_7973
-+.globl sym_2_7974
-+sym_2_7974: la $2, sym_2_7974
-+.globl sym_2_7975
-+sym_2_7975: la $2, sym_2_7975
-+.globl sym_2_7976
-+sym_2_7976: la $2, sym_2_7976
-+.globl sym_2_7977
-+sym_2_7977: la $2, sym_2_7977
-+.globl sym_2_7978
-+sym_2_7978: la $2, sym_2_7978
-+.globl sym_2_7979
-+sym_2_7979: la $2, sym_2_7979
-+.globl sym_2_7980
-+sym_2_7980: la $2, sym_2_7980
-+.globl sym_2_7981
-+sym_2_7981: la $2, sym_2_7981
-+.globl sym_2_7982
-+sym_2_7982: la $2, sym_2_7982
-+.globl sym_2_7983
-+sym_2_7983: la $2, sym_2_7983
-+.globl sym_2_7984
-+sym_2_7984: la $2, sym_2_7984
-+.globl sym_2_7985
-+sym_2_7985: la $2, sym_2_7985
-+.globl sym_2_7986
-+sym_2_7986: la $2, sym_2_7986
-+.globl sym_2_7987
-+sym_2_7987: la $2, sym_2_7987
-+.globl sym_2_7988
-+sym_2_7988: la $2, sym_2_7988
-+.globl sym_2_7989
-+sym_2_7989: la $2, sym_2_7989
-+.globl sym_2_7990
-+sym_2_7990: la $2, sym_2_7990
-+.globl sym_2_7991
-+sym_2_7991: la $2, sym_2_7991
-+.globl sym_2_7992
-+sym_2_7992: la $2, sym_2_7992
-+.globl sym_2_7993
-+sym_2_7993: la $2, sym_2_7993
-+.globl sym_2_7994
-+sym_2_7994: la $2, sym_2_7994
-+.globl sym_2_7995
-+sym_2_7995: la $2, sym_2_7995
-+.globl sym_2_7996
-+sym_2_7996: la $2, sym_2_7996
-+.globl sym_2_7997
-+sym_2_7997: la $2, sym_2_7997
-+.globl sym_2_7998
-+sym_2_7998: la $2, sym_2_7998
-+.globl sym_2_7999
-+sym_2_7999: la $2, sym_2_7999
-+.globl sym_2_8000
-+sym_2_8000: la $2, sym_2_8000
-+.globl sym_2_8001
-+sym_2_8001: la $2, sym_2_8001
-+.globl sym_2_8002
-+sym_2_8002: la $2, sym_2_8002
-+.globl sym_2_8003
-+sym_2_8003: la $2, sym_2_8003
-+.globl sym_2_8004
-+sym_2_8004: la $2, sym_2_8004
-+.globl sym_2_8005
-+sym_2_8005: la $2, sym_2_8005
-+.globl sym_2_8006
-+sym_2_8006: la $2, sym_2_8006
-+.globl sym_2_8007
-+sym_2_8007: la $2, sym_2_8007
-+.globl sym_2_8008
-+sym_2_8008: la $2, sym_2_8008
-+.globl sym_2_8009
-+sym_2_8009: la $2, sym_2_8009
-+.globl sym_2_8010
-+sym_2_8010: la $2, sym_2_8010
-+.globl sym_2_8011
-+sym_2_8011: la $2, sym_2_8011
-+.globl sym_2_8012
-+sym_2_8012: la $2, sym_2_8012
-+.globl sym_2_8013
-+sym_2_8013: la $2, sym_2_8013
-+.globl sym_2_8014
-+sym_2_8014: la $2, sym_2_8014
-+.globl sym_2_8015
-+sym_2_8015: la $2, sym_2_8015
-+.globl sym_2_8016
-+sym_2_8016: la $2, sym_2_8016
-+.globl sym_2_8017
-+sym_2_8017: la $2, sym_2_8017
-+.globl sym_2_8018
-+sym_2_8018: la $2, sym_2_8018
-+.globl sym_2_8019
-+sym_2_8019: la $2, sym_2_8019
-+.globl sym_2_8020
-+sym_2_8020: la $2, sym_2_8020
-+.globl sym_2_8021
-+sym_2_8021: la $2, sym_2_8021
-+.globl sym_2_8022
-+sym_2_8022: la $2, sym_2_8022
-+.globl sym_2_8023
-+sym_2_8023: la $2, sym_2_8023
-+.globl sym_2_8024
-+sym_2_8024: la $2, sym_2_8024
-+.globl sym_2_8025
-+sym_2_8025: la $2, sym_2_8025
-+.globl sym_2_8026
-+sym_2_8026: la $2, sym_2_8026
-+.globl sym_2_8027
-+sym_2_8027: la $2, sym_2_8027
-+.globl sym_2_8028
-+sym_2_8028: la $2, sym_2_8028
-+.globl sym_2_8029
-+sym_2_8029: la $2, sym_2_8029
-+.globl sym_2_8030
-+sym_2_8030: la $2, sym_2_8030
-+.globl sym_2_8031
-+sym_2_8031: la $2, sym_2_8031
-+.globl sym_2_8032
-+sym_2_8032: la $2, sym_2_8032
-+.globl sym_2_8033
-+sym_2_8033: la $2, sym_2_8033
-+.globl sym_2_8034
-+sym_2_8034: la $2, sym_2_8034
-+.globl sym_2_8035
-+sym_2_8035: la $2, sym_2_8035
-+.globl sym_2_8036
-+sym_2_8036: la $2, sym_2_8036
-+.globl sym_2_8037
-+sym_2_8037: la $2, sym_2_8037
-+.globl sym_2_8038
-+sym_2_8038: la $2, sym_2_8038
-+.globl sym_2_8039
-+sym_2_8039: la $2, sym_2_8039
-+.globl sym_2_8040
-+sym_2_8040: la $2, sym_2_8040
-+.globl sym_2_8041
-+sym_2_8041: la $2, sym_2_8041
-+.globl sym_2_8042
-+sym_2_8042: la $2, sym_2_8042
-+.globl sym_2_8043
-+sym_2_8043: la $2, sym_2_8043
-+.globl sym_2_8044
-+sym_2_8044: la $2, sym_2_8044
-+.globl sym_2_8045
-+sym_2_8045: la $2, sym_2_8045
-+.globl sym_2_8046
-+sym_2_8046: la $2, sym_2_8046
-+.globl sym_2_8047
-+sym_2_8047: la $2, sym_2_8047
-+.globl sym_2_8048
-+sym_2_8048: la $2, sym_2_8048
-+.globl sym_2_8049
-+sym_2_8049: la $2, sym_2_8049
-+.globl sym_2_8050
-+sym_2_8050: la $2, sym_2_8050
-+.globl sym_2_8051
-+sym_2_8051: la $2, sym_2_8051
-+.globl sym_2_8052
-+sym_2_8052: la $2, sym_2_8052
-+.globl sym_2_8053
-+sym_2_8053: la $2, sym_2_8053
-+.globl sym_2_8054
-+sym_2_8054: la $2, sym_2_8054
-+.globl sym_2_8055
-+sym_2_8055: la $2, sym_2_8055
-+.globl sym_2_8056
-+sym_2_8056: la $2, sym_2_8056
-+.globl sym_2_8057
-+sym_2_8057: la $2, sym_2_8057
-+.globl sym_2_8058
-+sym_2_8058: la $2, sym_2_8058
-+.globl sym_2_8059
-+sym_2_8059: la $2, sym_2_8059
-+.globl sym_2_8060
-+sym_2_8060: la $2, sym_2_8060
-+.globl sym_2_8061
-+sym_2_8061: la $2, sym_2_8061
-+.globl sym_2_8062
-+sym_2_8062: la $2, sym_2_8062
-+.globl sym_2_8063
-+sym_2_8063: la $2, sym_2_8063
-+.globl sym_2_8064
-+sym_2_8064: la $2, sym_2_8064
-+.globl sym_2_8065
-+sym_2_8065: la $2, sym_2_8065
-+.globl sym_2_8066
-+sym_2_8066: la $2, sym_2_8066
-+.globl sym_2_8067
-+sym_2_8067: la $2, sym_2_8067
-+.globl sym_2_8068
-+sym_2_8068: la $2, sym_2_8068
-+.globl sym_2_8069
-+sym_2_8069: la $2, sym_2_8069
-+.globl sym_2_8070
-+sym_2_8070: la $2, sym_2_8070
-+.globl sym_2_8071
-+sym_2_8071: la $2, sym_2_8071
-+.globl sym_2_8072
-+sym_2_8072: la $2, sym_2_8072
-+.globl sym_2_8073
-+sym_2_8073: la $2, sym_2_8073
-+.globl sym_2_8074
-+sym_2_8074: la $2, sym_2_8074
-+.globl sym_2_8075
-+sym_2_8075: la $2, sym_2_8075
-+.globl sym_2_8076
-+sym_2_8076: la $2, sym_2_8076
-+.globl sym_2_8077
-+sym_2_8077: la $2, sym_2_8077
-+.globl sym_2_8078
-+sym_2_8078: la $2, sym_2_8078
-+.globl sym_2_8079
-+sym_2_8079: la $2, sym_2_8079
-+.globl sym_2_8080
-+sym_2_8080: la $2, sym_2_8080
-+.globl sym_2_8081
-+sym_2_8081: la $2, sym_2_8081
-+.globl sym_2_8082
-+sym_2_8082: la $2, sym_2_8082
-+.globl sym_2_8083
-+sym_2_8083: la $2, sym_2_8083
-+.globl sym_2_8084
-+sym_2_8084: la $2, sym_2_8084
-+.globl sym_2_8085
-+sym_2_8085: la $2, sym_2_8085
-+.globl sym_2_8086
-+sym_2_8086: la $2, sym_2_8086
-+.globl sym_2_8087
-+sym_2_8087: la $2, sym_2_8087
-+.globl sym_2_8088
-+sym_2_8088: la $2, sym_2_8088
-+.globl sym_2_8089
-+sym_2_8089: la $2, sym_2_8089
-+.globl sym_2_8090
-+sym_2_8090: la $2, sym_2_8090
-+.globl sym_2_8091
-+sym_2_8091: la $2, sym_2_8091
-+.globl sym_2_8092
-+sym_2_8092: la $2, sym_2_8092
-+.globl sym_2_8093
-+sym_2_8093: la $2, sym_2_8093
-+.globl sym_2_8094
-+sym_2_8094: la $2, sym_2_8094
-+.globl sym_2_8095
-+sym_2_8095: la $2, sym_2_8095
-+.globl sym_2_8096
-+sym_2_8096: la $2, sym_2_8096
-+.globl sym_2_8097
-+sym_2_8097: la $2, sym_2_8097
-+.globl sym_2_8098
-+sym_2_8098: la $2, sym_2_8098
-+.globl sym_2_8099
-+sym_2_8099: la $2, sym_2_8099
-+.globl sym_2_8100
-+sym_2_8100: la $2, sym_2_8100
-+.globl sym_2_8101
-+sym_2_8101: la $2, sym_2_8101
-+.globl sym_2_8102
-+sym_2_8102: la $2, sym_2_8102
-+.globl sym_2_8103
-+sym_2_8103: la $2, sym_2_8103
-+.globl sym_2_8104
-+sym_2_8104: la $2, sym_2_8104
-+.globl sym_2_8105
-+sym_2_8105: la $2, sym_2_8105
-+.globl sym_2_8106
-+sym_2_8106: la $2, sym_2_8106
-+.globl sym_2_8107
-+sym_2_8107: la $2, sym_2_8107
-+.globl sym_2_8108
-+sym_2_8108: la $2, sym_2_8108
-+.globl sym_2_8109
-+sym_2_8109: la $2, sym_2_8109
-+.globl sym_2_8110
-+sym_2_8110: la $2, sym_2_8110
-+.globl sym_2_8111
-+sym_2_8111: la $2, sym_2_8111
-+.globl sym_2_8112
-+sym_2_8112: la $2, sym_2_8112
-+.globl sym_2_8113
-+sym_2_8113: la $2, sym_2_8113
-+.globl sym_2_8114
-+sym_2_8114: la $2, sym_2_8114
-+.globl sym_2_8115
-+sym_2_8115: la $2, sym_2_8115
-+.globl sym_2_8116
-+sym_2_8116: la $2, sym_2_8116
-+.globl sym_2_8117
-+sym_2_8117: la $2, sym_2_8117
-+.globl sym_2_8118
-+sym_2_8118: la $2, sym_2_8118
-+.globl sym_2_8119
-+sym_2_8119: la $2, sym_2_8119
-+.globl sym_2_8120
-+sym_2_8120: la $2, sym_2_8120
-+.globl sym_2_8121
-+sym_2_8121: la $2, sym_2_8121
-+.globl sym_2_8122
-+sym_2_8122: la $2, sym_2_8122
-+.globl sym_2_8123
-+sym_2_8123: la $2, sym_2_8123
-+.globl sym_2_8124
-+sym_2_8124: la $2, sym_2_8124
-+.globl sym_2_8125
-+sym_2_8125: la $2, sym_2_8125
-+.globl sym_2_8126
-+sym_2_8126: la $2, sym_2_8126
-+.globl sym_2_8127
-+sym_2_8127: la $2, sym_2_8127
-+.globl sym_2_8128
-+sym_2_8128: la $2, sym_2_8128
-+.globl sym_2_8129
-+sym_2_8129: la $2, sym_2_8129
-+.globl sym_2_8130
-+sym_2_8130: la $2, sym_2_8130
-+.globl sym_2_8131
-+sym_2_8131: la $2, sym_2_8131
-+.globl sym_2_8132
-+sym_2_8132: la $2, sym_2_8132
-+.globl sym_2_8133
-+sym_2_8133: la $2, sym_2_8133
-+.globl sym_2_8134
-+sym_2_8134: la $2, sym_2_8134
-+.globl sym_2_8135
-+sym_2_8135: la $2, sym_2_8135
-+.globl sym_2_8136
-+sym_2_8136: la $2, sym_2_8136
-+.globl sym_2_8137
-+sym_2_8137: la $2, sym_2_8137
-+.globl sym_2_8138
-+sym_2_8138: la $2, sym_2_8138
-+.globl sym_2_8139
-+sym_2_8139: la $2, sym_2_8139
-+.globl sym_2_8140
-+sym_2_8140: la $2, sym_2_8140
-+.globl sym_2_8141
-+sym_2_8141: la $2, sym_2_8141
-+.globl sym_2_8142
-+sym_2_8142: la $2, sym_2_8142
-+.globl sym_2_8143
-+sym_2_8143: la $2, sym_2_8143
-+.globl sym_2_8144
-+sym_2_8144: la $2, sym_2_8144
-+.globl sym_2_8145
-+sym_2_8145: la $2, sym_2_8145
-+.globl sym_2_8146
-+sym_2_8146: la $2, sym_2_8146
-+.globl sym_2_8147
-+sym_2_8147: la $2, sym_2_8147
-+.globl sym_2_8148
-+sym_2_8148: la $2, sym_2_8148
-+.globl sym_2_8149
-+sym_2_8149: la $2, sym_2_8149
-+.globl sym_2_8150
-+sym_2_8150: la $2, sym_2_8150
-+.globl sym_2_8151
-+sym_2_8151: la $2, sym_2_8151
-+.globl sym_2_8152
-+sym_2_8152: la $2, sym_2_8152
-+.globl sym_2_8153
-+sym_2_8153: la $2, sym_2_8153
-+.globl sym_2_8154
-+sym_2_8154: la $2, sym_2_8154
-+.globl sym_2_8155
-+sym_2_8155: la $2, sym_2_8155
-+.globl sym_2_8156
-+sym_2_8156: la $2, sym_2_8156
-+.globl sym_2_8157
-+sym_2_8157: la $2, sym_2_8157
-+.globl sym_2_8158
-+sym_2_8158: la $2, sym_2_8158
-+.globl sym_2_8159
-+sym_2_8159: la $2, sym_2_8159
-+.globl sym_2_8160
-+sym_2_8160: la $2, sym_2_8160
-+.globl sym_2_8161
-+sym_2_8161: la $2, sym_2_8161
-+.globl sym_2_8162
-+sym_2_8162: la $2, sym_2_8162
-+.globl sym_2_8163
-+sym_2_8163: la $2, sym_2_8163
-+.globl sym_2_8164
-+sym_2_8164: la $2, sym_2_8164
-+.globl sym_2_8165
-+sym_2_8165: la $2, sym_2_8165
-+.globl sym_2_8166
-+sym_2_8166: la $2, sym_2_8166
-+.globl sym_2_8167
-+sym_2_8167: la $2, sym_2_8167
-+.globl sym_2_8168
-+sym_2_8168: la $2, sym_2_8168
-+.globl sym_2_8169
-+sym_2_8169: la $2, sym_2_8169
-+.globl sym_2_8170
-+sym_2_8170: la $2, sym_2_8170
-+.globl sym_2_8171
-+sym_2_8171: la $2, sym_2_8171
-+.globl sym_2_8172
-+sym_2_8172: la $2, sym_2_8172
-+.globl sym_2_8173
-+sym_2_8173: la $2, sym_2_8173
-+.globl sym_2_8174
-+sym_2_8174: la $2, sym_2_8174
-+.globl sym_2_8175
-+sym_2_8175: la $2, sym_2_8175
-+.globl sym_2_8176
-+sym_2_8176: la $2, sym_2_8176
-+.globl sym_2_8177
-+sym_2_8177: la $2, sym_2_8177
-+.globl sym_2_8178
-+sym_2_8178: la $2, sym_2_8178
-+.globl sym_2_8179
-+sym_2_8179: la $2, sym_2_8179
-+.globl sym_2_8180
-+sym_2_8180: la $2, sym_2_8180
-+.globl sym_2_8181
-+sym_2_8181: la $2, sym_2_8181
-+.globl sym_2_8182
-+sym_2_8182: la $2, sym_2_8182
-+.globl sym_2_8183
-+sym_2_8183: la $2, sym_2_8183
-+.globl sym_2_8184
-+sym_2_8184: la $2, sym_2_8184
-+.globl sym_2_8185
-+sym_2_8185: la $2, sym_2_8185
-+.globl sym_2_8186
-+sym_2_8186: la $2, sym_2_8186
-+.globl sym_2_8187
-+sym_2_8187: la $2, sym_2_8187
-+.globl sym_2_8188
-+sym_2_8188: la $2, sym_2_8188
-+.globl sym_2_8189
-+sym_2_8189: la $2, sym_2_8189
-+.globl sym_2_8190
-+sym_2_8190: la $2, sym_2_8190
-+.globl sym_2_8191
-+sym_2_8191: la $2, sym_2_8191
-+.globl sym_2_8192
-+sym_2_8192: la $2, sym_2_8192
-+.hidden __init_array_end
-+.hidden __init_array_start
-+sym_3_1:
-+la $2, __init_array_start
-+la $2, __init_array_end
Index: tches/binutils-2.18-genscripts_multilib-1.patch
===================================================================
--- patches/binutils-2.18-genscripts_multilib-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,65 +1,0 @@
-Submitted By: Ryan Oliver (ryan dot oliver at pha dot com dot au)
-Origin: Ryan Oliver
-Date: 2005-04-03
-Initial package version: 2.15 (problem also exists in 2.14 series)
-Description:
-        Updated patch, use this for all binutils 2.15 series instead of the
-        binutils-2.15.90.0.1-genscripts-multilib.patch
-
-        If --with-libpath= was specified during configure (or LIB_PATH was
-        supplied during make) we want to have these libraries added to the
-        linker scripts search paths, and in the case of multi-lib have them
-        processed to provide both lib and lib64 search paths.
-        This patch produces this behaviour when building a cross-binutils.
-
-        Also to fix an annoyance we remove whatever was specified (if anything)
-        by --libdir= from the linker script search path. This is so when cross-
-        compiling a 64bit target-native biarch toolchain we can specify the
-        installation directory for binutils produced libraries to be */lib64
-        without having this directory added to the 32bit emulation search path.
-
-        By rights we should really check if ${libdir} matches a search path in
-        any of the supported emulations for this target (as opposed to only the
-        one genscripts.sh is currently processing) and if so ignore ${libpath}.
-
-	This patch differs from the preceding genscripts-multilib patch as now
-	USE_LIBPATH will always be set if LIB_PATH is non empty
-
-diff -uNr binutils-2.15.91.0.1-orig/ld/genscripts.sh binutils-2.15.91.0.1/ld/genscripts.sh
---- binutils-2.15.91.0.1-orig/ld/genscripts.sh	2004-05-28 04:26:04.000000000 +1000
-+++ binutils-2.15.91.0.1/ld/genscripts.sh	2005-04-03 16:14:51.000000000 +1000
-@@ -110,7 +110,8 @@
- esac
- 
- # If the emulparams file sets NATIVE, make sure USE_LIBPATH is set also.
--if test "x$NATIVE" = "xyes" ; then
-+# Also set USE_LIBPATH if LIB_PATH has been set
-+if [ "x$NATIVE" = "xyes" -o "x${LIB_PATH}" != "x" ] ; then
-   USE_LIBPATH=yes
- fi
- 
-@@ -125,17 +126,17 @@
- #
- # If the emulparams file set LIBPATH_SUFFIX, prepend an extra copy of
- # the library path with the suffix applied.
--
--if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then
-+if [ "x${USE_LIBPATH}" = xyes ] ; then
-   LIB_PATH2=
-+  if [ "x${LIB_PATH}" = "x" ] ; then 
-+    libs="${NATIVE_LIB_DIRS}"
-+  else
-+    libs=`echo ${LIB_PATH} | sed 's/:/ /g'`
-+    LIB_PATH=
-+  fi
- 
--  libs=${NATIVE_LIB_DIRS}
-   if [ "x${use_sysroot}" != "xyes" ] ; then
-     case " ${libs} " in
--      *" ${libdir} "*) ;;
--      *) libs="${libdir} ${libs}" ;;
--    esac
--    case " ${libs} " in
-       *" ${tool_lib} "*) ;;
-       *) libs="${tool_lib} ${libs}" ;;
-     esac
Index: tches/binutils-2.18-posix-1.patch
===================================================================
--- patches/binutils-2.18-posix-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,73 +1,0 @@
-Submitted By: Jim Gifford (patches at jg555 dot com)
-Date: 2007-09-01
-Initial Package Version: 2.18
-Origin: http://ttervo.vectorstar.net/nptl/posix-patches/binutils-2.14.90.0.7-posix-head-tail.patch
-Upstream Status: Accepted/but Suspended
-Description: Makes Posix Compliant
-
-diff -Naur binutils-2.18.orig/gas/Makefile.am binutils-2.18/gas/Makefile.am
---- binutils-2.18.orig/gas/Makefile.am	2007-08-28 10:19:35.000000000 -0700
-+++ binutils-2.18/gas/Makefile.am	2007-09-01 11:36:26.000000000 -0700
-@@ -791,13 +791,13 @@
- against=stage2
- 
- # This rule is derived from corresponding code in the Makefile.in for gcc.
--# The "tail +16c" is to bypass headers which may include timestamps or
-+# The "tail -c +16" is to bypass headers which may include timestamps or
- # temporary assembly file names.
- comparison:
- 	x=0 ; \
- 	for file in *.o ; do \
--	  tail +16c ./$$file > tmp-foo1; \
--	  if tail +16c ${against}/$$file > tmp-foo2 2>/dev/null ; then \
-+	  tail -c +16 ./$$file > tmp-foo1; \
-+	  if tail -c +16 ${against}/$$file > tmp-foo2 2>/dev/null ; then \
- 	    if cmp tmp-foo1 tmp-foo2 ; then \
- 	      true ; \
- 	    else \
-diff -Naur binutils-2.18.orig/gas/Makefile.in binutils-2.18/gas/Makefile.in
---- binutils-2.18.orig/gas/Makefile.in	2007-08-28 10:19:35.000000000 -0700
-+++ binutils-2.18/gas/Makefile.in	2007-09-01 11:36:26.000000000 -0700
-@@ -2763,13 +2763,13 @@
- 	if [ -f stage3/as-new$(EXEEXT) -a ! -f stage3/as$(EXEEXT) ] ; then (cd stage3 ; ln -s as-new as$(EXEEXT)) ; fi
- 
- # This rule is derived from corresponding code in the Makefile.in for gcc.
--# The "tail +16c" is to bypass headers which may include timestamps or
-+# The "tail -c +16" is to bypass headers which may include timestamps or
- # temporary assembly file names.
- comparison:
- 	x=0 ; \
- 	for file in *.o ; do \
--	  tail +16c ./$$file > tmp-foo1; \
--	  if tail +16c ${against}/$$file > tmp-foo2 2>/dev/null ; then \
-+	  tail -c +16 ./$$file > tmp-foo1; \
-+	  if tail -c +16 ${against}/$$file > tmp-foo2 2>/dev/null ; then \
- 	    if cmp tmp-foo1 tmp-foo2 ; then \
- 	      true ; \
- 	    else \
-diff -Naur binutils-2.18.orig/ld/testsuite/ld-bootstrap/bootstrap.exp binutils-2.18/ld/testsuite/ld-bootstrap/bootstrap.exp
---- binutils-2.18.orig/ld/testsuite/ld-bootstrap/bootstrap.exp	2007-08-06 13:00:23.000000000 -0700
-+++ binutils-2.18/ld/testsuite/ld-bootstrap/bootstrap.exp	2007-09-01 11:36:26.000000000 -0700
-@@ -152,8 +152,8 @@
-         # Although this works, a way to set the date would be better.
-         # Removing or zeroing the date stamp in the binary produced by
-         # the linker is not possible as it is required by the target OS.
--        exec tail +140 tmpdir/ld2 >tmpdir/ld2tail
--        exec tail +140 tmpdir/ld3 >tmpdir/ld3tail
-+        exec tail -n +140 tmpdir/ld2 >tmpdir/ld2tail
-+        exec tail -n +140 tmpdir/ld3 >tmpdir/ld3tail
-         catch "exec cmp tmpdir/ld2tail tmpdir/ld3tail" exec_output
-         exec rm tmpdir/ld2tail tmpdir/ld3tail
-     } else {
-diff -Naur binutils-2.18.orig/src-release binutils-2.18/src-release
---- binutils-2.18.orig/src-release	2007-08-12 12:04:26.000000000 -0700
-+++ binutils-2.18/src-release	2007-09-01 11:36:38.000000000 -0700
-@@ -73,7 +73,7 @@
- 	elif grep AM_INIT_AUTOMAKE $(TOOL)/configure.in >/dev/null 2>&1; then \
- 	  sed < $(TOOL)/configure.in -n 's/AM_INIT_AUTOMAKE[^,]*, *\([^)]*\))/\1/p'; \
- 	elif test -f $(TOOL)/version.in; then \
--	  head -1 $(TOOL)/version.in; \
-+	  head -n 1 $(TOOL)/version.in; \
- 	elif grep VERSION $(TOOL)/Makefile.in > /dev/null 2>&1; then \
- 	  sed < $(TOOL)/Makefile.in -n 's/^VERSION *= *//p'; \
- 	else \
Index: tches/binutils-2.18-ppc64_fix_testsuite-1.patch
===================================================================
--- patches/binutils-2.18-ppc64_fix_testsuite-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,86 +1,0 @@
-Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
-Date: 2006-07-22
-Initial Package Version: 2.17
-Origin: Jakub Jelinek, http://sourceware.org/ml/binutils/2004-08/msg00030.html
-Upstream Status: unknown
-Description: Fixes ld visibility errors on ppc64, rediffed to apply with -p1.  The original was for a much earlier version of binutils, but still applies.  I couldn't find why this wasn't committed, but at the time it only fixed some of the failures he was seeing.
-
-diff -Naur binutils-2.17vanilla/ld/testsuite/ld-elfvsb/elfvsb.exp binutils-2.17/ld/testsuite/ld-elfvsb/elfvsb.exp
---- binutils-2.17vanilla/ld/testsuite/ld-elfvsb/elfvsb.exp	2005-05-12 08:32:06.000000000 +0100
-+++ binutils-2.17/ld/testsuite/ld-elfvsb/elfvsb.exp	2006-07-22 20:19:41.000000000 +0100
-@@ -315,8 +315,8 @@
- 
- 	# Now compile the code using -fpic.
- 
--	if { ![ld_compile "$CC -g $CFLAGS $SHCFLAG $VSBCFLAG $picflag" $srcdir/$subdir/sh1.c $tmpdir/sh1p.o] 
--	    || ![ld_compile "$CC -g $CFLAGS $SHCFLAG $VSBCFLAG $picflag" $srcdir/$subdir/sh2.c $tmpdir/sh2p.o] } {
-+	if { ![ld_compile "$CC -g $CFLAGS $SHCFLAG $VSBCFLAG -DSHARED $picflag" $srcdir/$subdir/sh1.c $tmpdir/sh1p.o] 
-+	    || ![ld_compile "$CC -g $CFLAGS $SHCFLAG $VSBCFLAG -DSHARED $picflag" $srcdir/$subdir/sh2.c $tmpdir/sh2p.o] } {
- 	    unresolved "visibility ($visibility)"
- 	} else {
- 	    if { [ string match $visibility "protected" ]
-@@ -337,7 +337,7 @@
-     }
- 
-     # Now do the same tests again, but this time compile main.c PIC.
--    if ![ld_compile "$CC -g $CFLAGS $SHCFLAG $VSBCFLAG $picflag" $srcdir/$subdir/main.c $tmpdir/mainp.o] {
-+    if ![ld_compile "$CC -g $CFLAGS $SHCFLAG $VSBCFLAG -DSHARED $picflag" $srcdir/$subdir/main.c $tmpdir/mainp.o] {
- 	unresolved "visibility ($visibility) (PIC main, non PIC so)"
- 	unresolved "visibility ($visibility) (PIC main)"
-     } else {
-@@ -446,7 +446,7 @@
- if { ![ld_compile "$CC -g $CFLAGS" $srcdir/$subdir/test.c tmpdir/test.o] } {
-     unresolved "weak hidden symbol"
- } else {
--   if { ![ld_compile "$CC -g $CFLAGS $picflag" $srcdir/$subdir/sh3.c tmpdir/sh3.o] } {
-+   if { ![ld_compile "$CC -g $CFLAGS -DSHARED $picflag" $srcdir/$subdir/sh3.c tmpdir/sh3.o] } {
- 	unresolved "weak hidden symbol"
-     } else {
- 	if ![ld_simple_link $ld tmpdir/sh3.so "-shared tmpdir/sh3.o"] {
-diff -Naur binutils-2.17vanilla/ld/testsuite/ld-elfvsb/sh1.c binutils-2.17/ld/testsuite/ld-elfvsb/sh1.c
---- binutils-2.17vanilla/ld/testsuite/ld-elfvsb/sh1.c	2003-05-05 06:46:53.000000000 +0100
-+++ binutils-2.17/ld/testsuite/ld-elfvsb/sh1.c	2006-07-22 20:19:41.000000000 +0100
-@@ -13,7 +13,11 @@
- /* This variable is defined in the shared library, and overridden by
-    the main program.  */
- #ifndef XCOFF_TEST
-+#ifdef SHARED
- int overriddenvar = -1;
-+#else
-+extern int overriddenvar;
-+#endif
- #endif
- 
- /* This variable is defined in the shared library.  */
-@@ -76,12 +80,14 @@
-   return shlib_overriddencall2 ();
- }
- 
-+#ifdef SHARED
- int
- shlib_overriddencall2 ()
- {
-   return 7;
- }
- #endif
-+#endif
- 
- /* This function calls a function defined by the main program.  */
- 
-diff -Naur binutils-2.17vanilla/ld/testsuite/ld-elfvsb/sh2.c binutils-2.17/ld/testsuite/ld-elfvsb/sh2.c
---- binutils-2.17vanilla/ld/testsuite/ld-elfvsb/sh2.c	2003-04-28 04:31:36.000000000 +0100
-+++ binutils-2.17/ld/testsuite/ld-elfvsb/sh2.c	2006-07-22 20:19:41.000000000 +0100
-@@ -44,3 +44,13 @@
-   return 2;
- }
- #endif
-+
-+#if !defined (XCOFF_TEST) && !defined (SHARED)
-+int overriddenvar = -1;
-+
-+int
-+shlib_overriddencall2 ()
-+{
-+  return 7;
-+}
-+#endif
Index: tches/colo-1.22-make_fix-1.patch
===================================================================
--- patches/colo-1.22-make_fix-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,57 +1,0 @@
-Submitted By: Joe Ciccone <joeciccone@crazyeyesoft.com>
-Date: 2005-11-23
-Initial Package Version: 1.19
-Upstream Status: Sent
-Origin: Joe Ciccone <joeciccone@crazyeyesoft.com
-Description: Adds flags to the stage1, stage2, and chain Makefiles
-             forcing them to build as 32bit.
-
-	     2-2-06 Updated for Colo 1.21 
-diff -Naur colo-1.21.orig/chain/Makefile colo-1.21/chain/Makefile
---- colo-1.21.orig/chain/Makefile	2006-01-17 23:03:58.000000000 +0000
-+++ colo-1.21/chain/Makefile	2006-02-02 15:43:32.000000000 +0000
-@@ -18,9 +18,9 @@
- 
- DEPS=$(OBJS:.o=.d)
- 
--LDFLAGS= -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map
--CFLAGS= -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
--CPPFLAGS= -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
-+LDFLAGS= -mabi=32 -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map
-+CFLAGS= -mabi=32 -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
-+CPPFLAGS= -mabi=32 -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
- 
- all:
- 	$(MAKE) -C .. binary
-diff -Naur colo-1.21.orig/stage1/Makefile colo-1.21/stage1/Makefile
---- colo-1.21.orig/stage1/Makefile	2006-01-17 23:03:58.000000000 +0000
-+++ colo-1.21/stage1/Makefile	2006-02-02 15:44:18.000000000 +0000
-@@ -21,9 +21,9 @@
- 
- DEPS=$(OBJS:.o=.d)
- 
--LDFLAGS= -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map
--CFLAGS= -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
--CPPFLAGS= -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
-+LDFLAGS= -mabi=32 -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map
-+CFLAGS= -mabi=32 -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
-+CPPFLAGS= -mabi=32 -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
- 
- all:
- 	$(MAKE) -C .. binary
-diff -Naur colo-1.21.orig/stage2/Makefile colo-1.21/stage2/Makefile
---- colo-1.21.orig/stage2/Makefile	2006-01-17 23:03:58.000000000 +0000
-+++ colo-1.21/stage2/Makefile	2006-02-02 15:44:02.000000000 +0000
-@@ -54,9 +54,9 @@
- 
- DEPS=$(OBJS:.o=.d)
- 
--LDFLAGS= -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map,--emit-relocs
--CFLAGS= -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
--CPPFLAGS= -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
-+LDFLAGS= -mabi=32 -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map,--emit-relocs
-+CFLAGS= -mabi=32 -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
-+CPPFLAGS= -mabi=32 -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
- 
- LOADADDR= $(shell $(CROSS_COMPILE)readelf -l $(TARG) | awk '$$1 ~ /^LOAD$$/ { print $$3 }')
- 
Index: tches/colo-1.22-relocation_fix-1.patch
===================================================================
--- patches/colo-1.22-relocation_fix-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,21 +1,0 @@
-Submitted By: Joe Ciccone <jciccone@linuxfromscratch.org>
-Date: 2006-06-11
-Initial Package Version: 1.21
-Upstream Status: Unknown
-Origin: Joe Ciccone
-Description: Fixes relocation errors when linking.
-
-diff -Naur colo-1.21.orig/stage1/include/lib.h colo-1.21/stage1/include/lib.h
---- colo-1.21.orig/stage1/include/lib.h	2006-01-17 18:03:58.000000000 -0500
-+++ colo-1.21/stage1/include/lib.h	2006-07-11 01:01:29.000000000 -0400
-@@ -47,8 +47,8 @@
- 
- /* fast.c */
- 
--extern void * __attribute__((section(".data"))) _memcpy_w(void *, const void *, size_t);
--extern void * __attribute__((section(".data"))) _memset_w(void *, int, size_t);
-+extern void * _memcpy_w(void *, const void *, size_t);
-+extern void * _memset_w(void *, int, size_t);
- 
- #endif
- 
Index: tches/coreutils-6.9-suppress_uptime_kill_su-1.patch
===================================================================
--- patches/coreutils-6.9-suppress_uptime_kill_su-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,274 +1,0 @@
-Submitted By: Matthew Burgess <matthew at linuxfromscratch dot org>
-Date: 2006-11-20
-Initial Package Version: 6.5
-Origin: original suppress_hotname_uptame_kill_su patch (Robert Connolly)
-Upstream Status: N/A
-Description: This patch supresses the building of uptime, and kill.  The su
-	     command is built so the testsuite can run, use './src/su', but
-	     it will not be installed.
-
-	     Updated for 6.3, 6.4, and 6.5 by Jim Gifford
-
-diff -Naur coreutils-6.5.orig/AUTHORS coreutils-6.5/AUTHORS
---- coreutils-6.5.orig/AUTHORS	2006-10-22 09:54:15.000000000 -0700
-+++ coreutils-6.5/AUTHORS	2006-11-20 10:40:52.000000000 -0800
-@@ -35,7 +35,6 @@
- hostname: Jim Meyering
- id: Arnold Robbins, David MacKenzie
- join: Mike Haertel
--kill: Paul Eggert
- link: Michael Stone
- ln: Mike Parker, David MacKenzie
- logname: FIXME: unknown
-@@ -89,7 +88,6 @@
- unexpand: David MacKenzie
- uniq: Richard Stallman, David MacKenzie
- unlink: Michael Stone
--uptime: Joseph Arceneaux, David MacKenzie, Kaveh Ghazi
- users: Joseph Arceneaux, David MacKenzie
- vdir: Richard Stallman, David MacKenzie
- wc: Paul Rubin, David MacKenzie
-diff -Naur coreutils-6.5.orig/Makefile.in coreutils-6.5/Makefile.in
---- coreutils-6.5.orig/Makefile.in	2006-11-19 02:10:23.000000000 -0800
-+++ coreutils-6.5/Makefile.in	2006-11-20 10:41:25.000000000 -0800
-@@ -177,7 +177,7 @@
- 	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
- 	$(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink-busy.m4 \
- 	$(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \
--	$(top_srcdir)/m4/uptime.m4 $(top_srcdir)/m4/userspec.m4 \
-+	$(top_srcdir)/m4/userspec.m4 \
- 	$(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utime.m4 \
- 	$(top_srcdir)/m4/utimecmp.m4 $(top_srcdir)/m4/utimens.m4 \
- 	$(top_srcdir)/m4/utimes-null.m4 $(top_srcdir)/m4/utimes.m4 \
-diff -Naur coreutils-6.5.orig/README coreutils-6.5/README
---- coreutils-6.5.orig/README	2006-10-22 09:54:15.000000000 -0700
-+++ coreutils-6.5/README	2006-11-20 10:40:52.000000000 -0800
-@@ -9,11 +9,11 @@
- 
-   [ base64 basename cat chgrp chmod chown chroot cksum comm cp csplit cut date
-   dd df dir dircolors dirname du echo env expand expr factor false fmt fold
--  ginstall groups head hostid hostname id join kill link ln logname ls
-+  ginstall groups head hostid hostname id join link ln logname ls
-   md5sum mkdir mkfifo mknod mv nice nl nohup od paste pathchk pinky pr
-   printenv printf ptx pwd readlink rm rmdir seq sha1sum sha224sum sha256sum
-   sha384sum sha512sum shred shuf sleep sort split stat stty su sum sync tac
--  tail tee test touch tr true tsort tty uname unexpand uniq unlink uptime
-+  tail tee test touch tr true tsort tty uname unexpand uniq unlink
-   users vdir wc who whoami yes
- 
- See the file NEWS for a list of major changes in the current release.
-diff -Naur coreutils-6.5.orig/configure coreutils-6.5/configure
---- coreutils-6.5.orig/configure	2006-11-19 02:10:10.000000000 -0800
-+++ coreutils-6.5/configure	2006-11-20 10:40:52.000000000 -0800
-@@ -49467,8 +49467,7 @@
- { echo "$as_me:$LINENO: result: $gnulib_cv_have_boot_time" >&5
- echo "${ECHO_T}$gnulib_cv_have_boot_time" >&6; }
-   if test $gnulib_cv_have_boot_time = yes; then
--  OPTIONAL_BIN_PROGS="$OPTIONAL_BIN_PROGS uptime\$(EXEEXT)"
--  MAN="$MAN uptime.1"
-+echo "uptime is suppressed"
- fi
- 
- 
-diff -Naur coreutils-6.5.orig/man/Makefile.in coreutils-6.5/man/Makefile.in
---- coreutils-6.5.orig/man/Makefile.in	2006-11-19 02:10:19.000000000 -0800
-+++ coreutils-6.5/man/Makefile.in	2006-11-20 10:43:26.000000000 -0800
-@@ -172,7 +172,7 @@
- 	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
- 	$(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink-busy.m4 \
- 	$(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \
--	$(top_srcdir)/m4/uptime.m4 $(top_srcdir)/m4/userspec.m4 \
-+	$(top_srcdir)/m4/userspec.m4 \
- 	$(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utime.m4 \
- 	$(top_srcdir)/m4/utimecmp.m4 $(top_srcdir)/m4/utimens.m4 \
- 	$(top_srcdir)/m4/utimes-null.m4 $(top_srcdir)/m4/utimes.m4 \
-@@ -382,13 +382,13 @@
-   base64.1 basename.1 cat.1 chgrp.1 chmod.1 chown.1 cksum.1 comm.1 \
-   cp.1 csplit.1 cut.1 date.1 dd.1 df.1 dir.1 dircolors.1 dirname.1 du.1 \
-   echo.1 env.1 expand.1 expr.1 factor.1 false.1 fmt.1 fold.1 groups.1 \
--  head.1 hostname.1 id.1 install.1 join.1 kill.1 \
-+  head.1 hostname.1 id.1 install.1 join.1 \
-   link.1 ln.1 logname.1 \
-   ls.1 md5sum.1 mkdir.1 mkfifo.1 mknod.1 mv.1 nl.1 nohup.1 od.1 \
-   paste.1 pathchk.1 pr.1 printenv.1 printf.1 ptx.1 pwd.1 readlink.1 \
-   rm.1 rmdir.1 seq.1 sha1sum.1 sha224sum.1 sha256sum.1 sha384sum.1 sha512sum.1 \
-   shred.1 shuf.1 sleep.1 sort.1 split.1 stat.1 \
--  su.1 sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \
-+  sum.1 sync.1 tac.1 tail.1 tee.1 test.1 touch.1 tr.1 true.1 tsort.1 \
-   tty.1 unexpand.1 uniq.1 unlink.1 vdir.1 wc.1 \
-   whoami.1 yes.1 $(MAN)
- 
-@@ -668,7 +668,6 @@
- id.1:		$(common_dep)	$(srcdir)/id.x		../src/id.c
- install.1:	$(common_dep)	$(srcdir)/install.x	../src/install.c
- join.1:		$(common_dep)	$(srcdir)/join.x	../src/join.c
--kill.1:		$(common_dep)	$(srcdir)/kill.x	../src/kill.c
- link.1:		$(common_dep)	$(srcdir)/link.x	../src/link.c
- ln.1:		$(common_dep)	$(srcdir)/ln.x		../src/ln.c
- logname.1:	$(common_dep)	$(srcdir)/logname.x	../src/logname.c
-@@ -706,7 +705,6 @@
- split.1:	$(common_dep)	$(srcdir)/split.x	../src/split.c
- stat.1:		$(common_dep)	$(srcdir)/stat.x	../src/stat.c
- stty.1:		$(common_dep)	$(srcdir)/stty.x	../src/stty.c
--su.1:		$(common_dep)	$(srcdir)/su.x		../src/su.c
- sum.1:		$(common_dep)	$(srcdir)/sum.x		../src/sum.c
- sync.1:		$(common_dep)	$(srcdir)/sync.x	../src/sync.c
- tac.1:		$(common_dep)	$(srcdir)/tac.x		../src/tac.c
-@@ -722,7 +720,6 @@
- unexpand.1:	$(common_dep)	$(srcdir)/unexpand.x	../src/unexpand.c
- uniq.1:		$(common_dep)	$(srcdir)/uniq.x	../src/uniq.c
- unlink.1:	$(common_dep)	$(srcdir)/unlink.x	../src/unlink.c
--uptime.1:	$(common_dep)	$(srcdir)/uptime.x	../src/uptime.c
- users.1:	$(common_dep)	$(srcdir)/users.x	../src/users.c
- vdir.1:		$(common_dep)	$(srcdir)/vdir.x	../src/ls.c
- wc.1:		$(common_dep)	$(srcdir)/wc.x		../src/wc.c
-@@ -754,7 +751,7 @@
- check-x-vs-1:
- 	PATH=../src$(PATH_SEPARATOR)$$PATH; export PATH;		\
- 	t=ls-files.$$$$;						\
--	(cd $(srcdir) && ls -1 *.x) | sed 's/\.x$$//' | $(ASSORT) > $$t;\
-+	(cd $(srcdir) && ls -1 *.x) | grep -v -e 'kill.x' -e 'su.x' -e 'uptime.x' | sed 's/\.x$$//' | $(ASSORT) > $$t;\
- 	echo $(dist_man_MANS) | tr -s ' ' '\n' | sed 's/\.1$$//'	\
- 	  | $(ASSORT) | diff - $$t || { rm $$t; exit 1; };		\
- 	rm $$t
-diff -Naur coreutils-6.5.orig/src/Makefile.in coreutils-6.5/src/Makefile.in
---- coreutils-6.5.orig/src/Makefile.in	2006-11-19 04:59:23.000000000 -0800
-+++ coreutils-6.5/src/Makefile.in	2006-11-20 10:44:00.000000000 -0800
-@@ -35,7 +35,7 @@
- host_triplet = @host@
- EXTRA_PROGRAMS = chroot$(EXEEXT) df$(EXEEXT) hostid$(EXEEXT) \
- 	nice$(EXEEXT) pinky$(EXEEXT) stty$(EXEEXT) su$(EXEEXT) \
--	uname$(EXEEXT) uptime$(EXEEXT) users$(EXEEXT) who$(EXEEXT)
-+	uname$(EXEEXT) users$(EXEEXT) who$(EXEEXT)
- bin_PROGRAMS = [$(EXEEXT) chgrp$(EXEEXT) chown$(EXEEXT) chmod$(EXEEXT) \
- 	cp$(EXEEXT) dd$(EXEEXT) dircolors$(EXEEXT) du$(EXEEXT) \
- 	ginstall$(EXEEXT) link$(EXEEXT) ln$(EXEEXT) dir$(EXEEXT) \
-@@ -53,7 +53,7 @@
- 	tsort$(EXEEXT) unexpand$(EXEEXT) uniq$(EXEEXT) wc$(EXEEXT) \
- 	basename$(EXEEXT) date$(EXEEXT) dirname$(EXEEXT) echo$(EXEEXT) \
- 	env$(EXEEXT) expr$(EXEEXT) factor$(EXEEXT) false$(EXEEXT) \
--	hostname$(EXEEXT) id$(EXEEXT) kill$(EXEEXT) logname$(EXEEXT) \
-+	hostname$(EXEEXT) id$(EXEEXT) logname$(EXEEXT) \
- 	pathchk$(EXEEXT) printenv$(EXEEXT) printf$(EXEEXT) \
- 	pwd$(EXEEXT) seq$(EXEEXT) sleep$(EXEEXT) tee$(EXEEXT) \
- 	test$(EXEEXT) true$(EXEEXT) tty$(EXEEXT) whoami$(EXEEXT) \
-@@ -180,7 +180,7 @@
- 	$(top_srcdir)/m4/unicodeio.m4 $(top_srcdir)/m4/unistd-safer.m4 \
- 	$(top_srcdir)/m4/unistd_h.m4 $(top_srcdir)/m4/unlink-busy.m4 \
- 	$(top_srcdir)/m4/unlinkdir.m4 $(top_srcdir)/m4/unlocked-io.m4 \
--	$(top_srcdir)/m4/uptime.m4 $(top_srcdir)/m4/userspec.m4 \
-+	$(top_srcdir)/m4/userspec.m4 \
- 	$(top_srcdir)/m4/utimbuf.m4 $(top_srcdir)/m4/utime.m4 \
- 	$(top_srcdir)/m4/utimecmp.m4 $(top_srcdir)/m4/utimens.m4 \
- 	$(top_srcdir)/m4/utimes-null.m4 $(top_srcdir)/m4/utimes.m4 \
-@@ -366,11 +366,6 @@
- join_LDADD = $(LDADD)
- join_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \
- 	../lib/libcoreutils.a
--kill_SOURCES = kill.c
--kill_OBJECTS = kill.$(OBJEXT)
--kill_LDADD = $(LDADD)
--kill_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \
--	../lib/libcoreutils.a
- link_SOURCES = link.c
- link_OBJECTS = link.$(OBJEXT)
- link_LDADD = $(LDADD)
-@@ -619,10 +614,6 @@
- unlink_LDADD = $(LDADD)
- unlink_DEPENDENCIES = ../lib/libcoreutils.a $(am__DEPENDENCIES_1) \
- 	../lib/libcoreutils.a
--uptime_SOURCES = uptime.c
--uptime_OBJECTS = uptime.$(OBJEXT)
--uptime_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
--	$(am__DEPENDENCIES_1)
- users_SOURCES = users.c
- users_OBJECTS = users.$(OBJEXT)
- users_LDADD = $(LDADD)
-@@ -666,7 +657,7 @@
- 	csplit.c cut.c date.c dd.c df.c $(dir_SOURCES) dircolors.c \
- 	dirname.c du.c echo.c env.c expand.c expr.c factor.c false.c \
- 	fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c hostname.c \
--	id.c join.c kill.c link.c ln.c logname.c $(ls_SOURCES) \
-+	id.c join.c link.c ln.c logname.c $(ls_SOURCES) \
- 	$(md5sum_SOURCES) mkdir.c mkfifo.c mknod.c $(mv_SOURCES) \
- 	nice.c nl.c nohup.c od.c paste.c pathchk.c pinky.c pr.c \
- 	printenv.c printf.c ptx.c pwd.c readlink.c $(rm_SOURCES) \
-@@ -675,14 +666,14 @@
- 	$(sha512sum_SOURCES) shred.c shuf.c sleep.c sort.c split.c \
- 	stat.c stty.c su.c sum.c sync.c tac.c tail.c tee.c test.c \
- 	touch.c tr.c true.c tsort.c tty.c uname.c unexpand.c uniq.c \
--	unlink.c uptime.c users.c $(vdir_SOURCES) wc.c who.c whoami.c \
-+	unlink.c users.c $(vdir_SOURCES) wc.c who.c whoami.c \
- 	yes.c
- DIST_SOURCES = $(__SOURCES) base64.c basename.c cat.c $(chgrp_SOURCES) \
- 	chmod.c $(chown_SOURCES) chroot.c cksum.c comm.c $(cp_SOURCES) \
- 	csplit.c cut.c date.c dd.c df.c $(dir_SOURCES) dircolors.c \
- 	dirname.c du.c echo.c env.c expand.c expr.c factor.c false.c \
- 	fmt.c fold.c $(ginstall_SOURCES) head.c hostid.c hostname.c \
--	id.c join.c kill.c link.c ln.c logname.c $(ls_SOURCES) \
-+	id.c join.c link.c ln.c logname.c $(ls_SOURCES) \
- 	$(md5sum_SOURCES) mkdir.c mkfifo.c mknod.c $(mv_SOURCES) \
- 	nice.c nl.c nohup.c od.c paste.c pathchk.c pinky.c pr.c \
- 	printenv.c printf.c ptx.c pwd.c readlink.c $(rm_SOURCES) \
-@@ -691,7 +682,7 @@
- 	$(sha512sum_SOURCES) shred.c shuf.c sleep.c sort.c split.c \
- 	stat.c stty.c su.c sum.c sync.c tac.c tail.c tee.c test.c \
- 	touch.c tr.c true.c tsort.c tty.c uname.c unexpand.c uniq.c \
--	unlink.c uptime.c users.c $(vdir_SOURCES) wc.c who.c whoami.c \
-+	unlink.c users.c $(vdir_SOURCES) wc.c who.c whoami.c \
- 	yes.c
- HEADERS = $(noinst_HEADERS)
- ETAGS = etags
-@@ -949,7 +940,6 @@
- tail_LDADD = $(nanosec_libs)
- 
- # If necessary, add -lm to resolve use of pow in lib/strtod.c.
--uptime_LDADD = $(LDADD) $(POW_LIB) $(GETLOADAVG_LIBS)
- su_LDADD = $(LDADD) $(LIB_CRYPT)
- SUFFIXES = .sh
- installed_su = $(DESTDIR)$(bindir)/`echo su|sed '$(transform)'`
-@@ -1196,9 +1186,6 @@
- join$(EXEEXT): $(join_OBJECTS) $(join_DEPENDENCIES) 
- 	@rm -f join$(EXEEXT)
- 	$(LINK) $(join_OBJECTS) $(join_LDADD) $(LIBS)
--kill$(EXEEXT): $(kill_OBJECTS) $(kill_DEPENDENCIES) 
--	@rm -f kill$(EXEEXT)
--	$(LINK) $(kill_OBJECTS) $(kill_LDADD) $(LIBS)
- link$(EXEEXT): $(link_OBJECTS) $(link_DEPENDENCIES) 
- 	@rm -f link$(EXEEXT)
- 	$(LINK) $(link_OBJECTS) $(link_LDADD) $(LIBS)
-@@ -1361,9 +1348,6 @@
- unlink$(EXEEXT): $(unlink_OBJECTS) $(unlink_DEPENDENCIES) 
- 	@rm -f unlink$(EXEEXT)
- 	$(LINK) $(unlink_OBJECTS) $(unlink_LDADD) $(LIBS)
--uptime$(EXEEXT): $(uptime_OBJECTS) $(uptime_DEPENDENCIES) 
--	@rm -f uptime$(EXEEXT)
--	$(LINK) $(uptime_OBJECTS) $(uptime_LDADD) $(LIBS)
- users$(EXEEXT): $(users_OBJECTS) $(users_DEPENDENCIES) 
- 	@rm -f users$(EXEEXT)
- 	$(LINK) $(users_OBJECTS) $(users_LDADD) $(LIBS)
-@@ -1458,7 +1442,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/id.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/install.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/join.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/kill.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lbracket.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/link.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ln.Po@am__quote@
-@@ -1518,7 +1501,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unexpand.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uniq.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unlink.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uptime.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/users.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wc.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/who.Po@am__quote@
-@@ -1839,7 +1821,7 @@
- 	  && can_create_suid_root_executable=yes; \
- 	rm -f $$TMPFILE; \
- 	if test $$can_create_suid_root_executable = yes; then \
--	  $(INSTALL_SU); \
-+	  echo "Installation of su is suppressed"; \
- 	else \
- 	  echo "WARNING: insufficient access; not installing su"; \
- 	  echo "NOTE: to install su, run 'make install-root' as root"; \
Index: tches/coreutils-6.9-uname-1.patch
===================================================================
--- patches/coreutils-6.9-uname-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,161 +1,0 @@
-Submitted By: Jim Gifford <jim at linuxfromscratch dot org>
-Date: 2006-08-24
-Initial Package Version: 5.97
-Upstream Status: Not Accepted
-Origin: Gentoo - http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/coreutils
-Description: Display CPU Information from /proc/cpuinfo or /proc/sysinfo
-
-Original Patch by - Matthew Burgess and Scot McPherson
-
-diff -Naur coreutils-5.97.orig/src/uname.c coreutils-5.97/src/uname.c
---- coreutils-5.97.orig/src/uname.c	2005-09-15 12:57:04.000000000 -0700
-+++ coreutils-5.97/src/uname.c	2006-08-24 15:52:53.000000000 -0700
-@@ -51,6 +51,11 @@
- # include <mach-o/arch.h>
- #endif
- 
-+#if defined (__linux__)
-+# define USE_PROCINFO
-+# define UNAME_HARDWARE_PLATFORM
-+#endif
-+
- #include "system.h"
- #include "error.h"
- #include "quote.h"
-@@ -138,6 +143,106 @@
-   exit (status);
- }
- 
-+#if defined(USE_PROCINFO)
-+
-+# if defined(__s390__) || defined(__s390x__)
-+#  define CPUINFO_FILE    "/proc/sysinfo"
-+#  define CPUINFO_FORMAT  "%64[^\t :]%*[ :]%256[^\n]%c"
-+# else
-+#  define CPUINFO_FILE    "/proc/cpuinfo"
-+#  define CPUINFO_FORMAT  "%64[^\t:]\t:%256[^\n]%c"
-+# endif
-+
-+# define PROCINFO_PROCESSOR      0
-+# define PROCINFO_HARDWARE_PLATFORM 1
-+
-+static void __eat_cpuinfo_space(char *buf)
-+{
-+	/* first eat trailing space */
-+	char *tmp = buf + strlen(buf) - 1;
-+	while (tmp > buf && isspace(*tmp))
-+		*tmp-- = '\0';
-+	/* then eat leading space */
-+	tmp = buf;
-+	while (*tmp && isspace(*tmp))
-+		tmp++;
-+	if (tmp != buf)
-+		memmove(buf, tmp, strlen(tmp)+1);
-+}
-+
-+static int __linux_procinfo (int x, char *fstr, size_t s)
-+{
-+	FILE *fp;
-+
-+	char *procinfo_keys[] = {
-+		/* --processor --hardware-platform */
-+		#if defined(__alpha__)
-+			"cpu model", "system type"
-+		#elif defined(__arm__)
-+			"Processor", "Hardware"
-+		#elif defined(bfin)
-+			"CPU", "BOARD Name"
-+		#elif defined(__cris__)
-+			"cpu", "cpu model"
-+		#elif defined(__frv__)
-+			"CPU-Core", "System"
-+		#elif defined(__i386__) || defined(__x86_64__)
-+			"model name", "vendor_id"
-+		#elif defined(__ia64__)
-+			"family", "vendor"
-+		#elif defined(__hppa__)
-+			"cpu", "model"
-+		#elif defined(__m68k__)
-+			"CPU", "MMU"
-+		#elif defined(__mips__)
-+			"cpu model", "system type"
-+		#elif defined(__powerpc__) || defined(__powerpc64__)
-+			"cpu", "machine"
-+		#elif defined(__s390__) || defined(__s390x__)
-+			"Type", "Manufacturer"
-+		#elif defined(__sh__)
-+			"cpu type", "machine"
-+		#elif defined(sparc) || defined(__sparc__)
-+			"type", "cpu"
-+		#elif defined(__vax__)
-+			"cpu type", "cpu"
-+		#else
-+			"unknown", "unknown"
-+		#endif
-+	};
-+
-+	if ((fp = fopen(CPUINFO_FILE, "r")) != NULL) {
-+		char key[65], value[257], eol, *ret = NULL;
-+
-+		while (fscanf(fp, CPUINFO_FORMAT, key, value, &eol) != EOF) {
-+			__eat_cpuinfo_space(key);
-+			if (!strcmp(key, procinfo_keys[x])) {
-+				__eat_cpuinfo_space(value);
-+				ret = value;
-+				break;
-+			}
-+			if (eol != '\n') {
-+				/* we need two fscanf's here in case the previous
-+				 * length limit caused us to read right up to the
-+				 * newline ... doing "%*[^\n]\n" wont eat the newline
-+				 */
-+				fscanf(fp, "%*[^\n]");
-+				fscanf(fp, "\n");
-+			}
-+		}
-+		fclose(fp);
-+
-+		if (ret) {
-+			strncpy(fstr, ret, s);
-+			return 0;
-+		}
-+	}
-+
-+	return -1;
-+}
-+
-+#endif
-+
- /* Print ELEMENT, preceded by a space if something has already been
-    printed.  */
- 
-@@ -250,10 +355,14 @@
-   if (toprint & PRINT_PROCESSOR)
-     {
-       char const *element = unknown;
--#if HAVE_SYSINFO && defined SI_ARCHITECTURE
-+#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO)
-       {
- 	static char processor[257];
-+#if defined(USE_PROCINFO)
-+	if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor))
-+#else
- 	if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
-+#endif
- 	  element = processor;
-       }
- #endif
-@@ -306,9 +415,13 @@
-       if (element == unknown)
- 	{
- 	  static char hardware_platform[257];
-+#if defined(USE_PROCINFO)
-+	  if (0 <= __linux_procinfo (PROCINFO_HARDWARE_PLATFORM, hardware_platform, sizeof hardware_platform))
-+#else
- 	  size_t s = sizeof hardware_platform;
- 	  static int mib[] = { CTL_HW, UNAME_HARDWARE_PLATFORM };
- 	  if (sysctl (mib, 2, hardware_platform, &s, 0, 0) >= 0)
-+#endif
- 	    element = hardware_platform;
- 	}
- #endif
Index: patches/cracklib,2.7-blfs-1.patch
===================================================================
--- patches/cracklib,2.7-blfs-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/cracklib,2.7-blfs-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,191 @@
+Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
+Date: 2004-04-22
+Initial Package Version: 2,7
+Origin: Jim Gifford & DJ Lucas
+Description: Makes Cracklib a dynamic library installed at /lib
+             Fixes buffer underruns
+             Add's missing header
+             Install's Missing Headers
+
+diff -Naur cracklib,2.7-orig/Makefile cracklib,2.7/Makefile
+--- cracklib,2.7-orig/Makefile	1997-12-31 04:33:53.000000000 -0600
++++ cracklib,2.7/Makefile	2004-04-30 16:58:01.000000000 -0500
+@@ -7,14 +7,21 @@
+ ###
+ 
+ ###
++# cracklib version
++MAJOR=2
++MINOR=7
++VERSION=$(MAJOR).$(MINOR)
++export MAJOR MINOR VERSION
++
++###
+ # set this to the absolute path (less extn) of compressed dict.
+ 
+-DICTPATH="/usr/local/lib/pw_dict"
++DICTPATH="/lib/cracklib_dict"
+ 
+ ###
+ # Set this to the path of one or more files continaing wordlists.
+ 
+-SRCDICTS=/usr/dict/words
++SRCDICTS=/usr/share/dict/words /usr/share/dict/extra.words
+ 
+ ###
+ # If you have installed the cracklib-dicts directory, use this
+@@ -36,7 +43,9 @@
+ 	-rm -f all installed Part* *.BAK *.bak *~
+ 
+ install: all
++	( cd cracklib && make install && exit $$? )
++	( cd util && make install && exit $$? )
+ 	@echo 'if "sort" dies from lack of space, see "util/mkdict"'
+-	util/mkdict $(SRCDICTS) | util/packer $(DICTPATH)
++	util/mkdict $(SRCDICTS) | LD_LIBRARY_PATH=cracklib util/packer $(DESTDIR)$(DICTPATH)
+ 	touch installed
+ ###	@echo 'now go install passwd/passwd where you want it'
+diff -Naur cracklib,2.7-orig/cracklib/Makefile cracklib,2.7/cracklib/Makefile
+--- cracklib,2.7-orig/cracklib/Makefile	1997-12-14 16:49:21.000000000 -0600
++++ cracklib,2.7/cracklib/Makefile	2004-04-30 16:58:01.000000000 -0500
+@@ -6,13 +6,24 @@
+ # and upwards.
+ ###
+ 
+-LIB=	libcrack.a
+-OBJ=	fascist.o packlib.o rules.o stringlib.o
+-CFLAGS= -O -I../cracklib -DIN_CRACKLIB
++LIB	= libcrack.so
++OBJ	= fascist.o packlib.o rules.o stringlib.o
++CFLAGS += -g -I../cracklib -DIN_CRACKLIB -fPIC
++LD	= ld
+ 
+-$(LIB):	$(OBJ)
+-	ar rv $(LIB) $?
+-	-ranlib $(LIB)
++$(LIB):	$(OBJ) Makefile
++	$(LD) -shared -soname $(LIB).$(MAJOR) -o $(LIB).$(VERSION) $(OBJ) -lc
++	rm -f $(LIB).$(MAJOR) $(LIB)
++	ln -s $(LIB).$(VERSION) $(LIB).$(MAJOR)
++	ln -s $(LIB).$(MAJOR) $(LIB)
+ 
+ clean:
+-	-rm -f $(OBJ) $(LIB) *~
++	-rm -f $(OBJ) $(LIB) $(LIB).$(VERSION) *~
++
++install: $(LIB) crack.h
++	install -m 755 $(LIB).$(VERSION) $(DESTDIR)/lib
++	ln -sf $(LIB).$(VERSION) $(DESTDIR)/lib/$(LIB)
++	ln -sf $(DESTDIR)/lib/$(LIB).$(VERSION) $(DESTDIR)/lib/$(LIB).$(MAJOR)
++
++	install -m 644 packer.h $(DESTDIR)/usr/include
++	install -m 644 crack.h $(DESTDIR)/usr/include
+diff -Naur cracklib,2.7-orig/cracklib/crack.h cracklib,2.7/cracklib/crack.h
+--- cracklib,2.7-orig/cracklib/crack.h	1969-12-31 18:00:00.000000000 -0600
++++ cracklib,2.7/cracklib/crack.h	2004-04-30 17:11:03.000000000 -0500
+@@ -0,0 +1,15 @@
++
++#ifndef CRACKLIB_H
++#define CRACKLIB_H
++
++/* Pass this function a password (pw) and a path to the
++ * dictionaries (/lib/cracklib_dict should be specified)
++ * and it will either return a NULL string, meaning that the
++ * password is good, or a pointer to a string that explains the
++ * problem with the password.
++ * You must link with -lcrack
++ */
++
++extern char *FascistCheck(char *pw, char *dictpath);
++
++#endif
+diff -Naur cracklib,2.7-orig/cracklib/fascist.c cracklib,2.7/cracklib/fascist.c
+--- cracklib,2.7-orig/cracklib/fascist.c	1997-12-31 04:26:46.000000000 -0600
++++ cracklib,2.7/cracklib/fascist.c	2004-04-30 16:58:01.000000000 -0500
+@@ -11,6 +11,7 @@
+ #include "packer.h"
+ #include <sys/types.h>
+ #include <pwd.h>
++#include <string.h>
+ 
+ #define ISSKIP(x) (isspace(x) || ispunct(x))
+ 
+@@ -659,7 +660,7 @@
+ 	return ("it does not contain enough DIFFERENT characters");
+     }
+ 
+-    strcpy(password, Lowercase(password));
++    strcpy(password, (char *)Lowercase(password));
+ 
+     Trim(password);
+ 
+@@ -722,7 +723,7 @@
+ 	}
+     }
+ 
+-    strcpy(password, Reverse(password));
++    strcpy(password, (char *)Reverse(password));
+ 
+     for (i = 0; r_destructors[i]; i++)
+     {
+diff -Naur cracklib,2.7-orig/util/Makefile cracklib,2.7/util/Makefile
+--- cracklib,2.7-orig/util/Makefile	1997-12-14 16:49:34.000000000 -0600
++++ cracklib,2.7/util/Makefile	2004-04-30 16:58:01.000000000 -0500
+@@ -14,27 +14,31 @@
+ #SunOS users (and others?) should consider static linking of their passwd binary
+ #CFLAGS= -O -I../cracklib '-DCRACKLIB_DICTPATH="$(DICTPATH)"' -Bstatic
+ 
+-CFLAGS= -O -I../cracklib '-DCRACKLIB_DICTPATH="$(DICTPATH)"'
+-LIBS=	../cracklib/libcrack.a
++CFLAGS += -I../cracklib '-DCRACKLIB_DICTPATH="$(DICTPATH)"'
++LDFLAGS	= -L../cracklib -lcrack
++LIBS	= ../cracklib/libcrack.so
+ 
+ all:	packer unpacker testnum teststr testlib
+ 	touch all
+ 
+ packer: packer.o $(LIBS)
+-	cc $(CFLAGS) -o $@ $@.o $(LIBS)
++	$(CC) $(CFLAGS) -o $@ $@.o $(LDFLAGS)
+ 
+ unpacker: unpacker.o $(LIBS)
+-	cc $(CFLAGS) -o $@ $@.o $(LIBS)
++	$(CC) $(CFLAGS) -o $@ $@.o $(LDFLAGS)
+ 
+ testnum: testnum.o $(LIBS)
+-	cc $(CFLAGS) -o $@ $@.o $(LIBS)
++	$(CC) $(CFLAGS) -o $@ $@.o $(LDFLAGS)
+ 
+ teststr: teststr.o $(LIBS)
+-	cc $(CFLAGS) -o $@ $@.o $(LIBS)
++	$(CC) $(CFLAGS) -o $@ $@.o $(LDFLAGS)
+ 
+ testlib: testlib.o $(LIBS)
+-	cc $(CFLAGS) -o $@ $@.o $(LIBS)
++	$(CC) $(CFLAGS) -o $@ $@.o $(LDFLAGS)
+ 
+ clean:
+ 	-rm *.o *~ all
+ 	-rm teststr testnum testlib packer unpacker
++
++install: all create-cracklib-dict
++	install -m 755 mkdict packer create-cracklib-dict $(DESTDIR)/usr/sbin
+diff -Naur cracklib,2.7-orig/util/create-cracklib-dict cracklib,2.7/util/create-cracklib-dict
+--- cracklib,2.7-orig/util/create-cracklib-dict	1969-12-31 18:00:00.000000000 -0600
++++ cracklib,2.7/util/create-cracklib-dict	2004-04-30 16:58:01.000000000 -0500
+@@ -0,0 +1,15 @@
++#!/bin/sh
++if [ -z "$*" ]; then
++    echo "Usage:"
++    echo "  /usr/sbin/create-cracklib-dict wordlist ..."
++    echo
++    echo "This script takes one or more word list files as arguments"
++    echo "and converts them into cracklib dictionaries for use"
++    echo "by password checking programs. The results are placed in"
++    echo "/lib/cracklib_dict.*"
++    echo
++    echo "Example:"
++    echo "/usr/sbin/create-cracklib-dict /usr/dict/words"
++else
++    /usr/sbin/mkdict $* | /usr/sbin/packer /usr/share/cracklib/pw_dict
++fi
Index: patches/cyrus-sasl-2.1.20-gcc4_fixes.patch
===================================================================
--- patches/cyrus-sasl-2.1.20-gcc4_fixes.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/cyrus-sasl-2.1.20-gcc4_fixes.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,21 @@
+Submitted By: Ryan Oliver <ryan.oliver@pha.com.au>
+Date: 2005-04-25
+Initial Package Version: 2.1.20
+Origin: Ryan Oliver
+Description: Fix compilation issues with gcc4
+
+gcc -DHAVE_CONFIG_H -I. -I. -I.. -I../include -I../plugins -I../include -Wall -W -MT client.lo -MD -MP -MF .deps/client.Tpo -c client.c  -fPIC -DPIC -o client.lo
+client.c:64: error: static declaration of 'global_callbacks' follows non-static declaration
+saslint.h:112: error: previous declaration of 'global_callbacks' was here
+
+--- cyrus-sasl-2.1.20/lib/client.c-orig	2003-11-12 03:26:06.000000000 +1100
++++ cyrus-sasl-2.1.20/lib/client.c	2005-04-25 17:16:56.000000000 +1000
+@@ -61,7 +61,7 @@
+ 
+ static cmech_list_t *cmechlist; /* global var which holds the list */
+ 
+-static sasl_global_callbacks_t global_callbacks;
++sasl_global_callbacks_t global_callbacks;
+ 
+ static int _sasl_client_active = 0;
+ 
Index: patches/cyrus-sasl-2.1.20-set_plugindir_from_libdir-full.patch
===================================================================
--- patches/cyrus-sasl-2.1.20-set_plugindir_from_libdir-full.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/cyrus-sasl-2.1.20-set_plugindir_from_libdir-full.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,102 @@
+diff -uNr cyrus-sasl-2.1.20-orig/Makefile.am cyrus-sasl-2.1.20/Makefile.am
+--- cyrus-sasl-2.1.20-orig/Makefile.am	2004-10-20 09:48:11.000000000 +1000
++++ cyrus-sasl-2.1.20/Makefile.am	2004-10-25 21:37:53.780833136 +1000
+@@ -78,14 +78,14 @@
+ 
+ framedir = /Library/Frameworks/SASL2.framework
+ install-exec-local: $(INSTALLOSX)
+-	@if test "$(plugindir)" != "$(prefix)/lib/sasl2"; then \
++	@if test "$(plugindir)" != "$(libdir)/sasl2"; then \
+ 	  echo "********************************************************"; \
+ 	  echo "* WARNING:"; \
+-	  echo "* Plugins are being installed into $(prefix)/lib/sasl2,"; \
++	  echo "* Plugins are being installed into $(libdir)/sasl2,"; \
+ 	  echo "* but the library will look for them in $(plugindir)."; \
+ 	  echo "* You need to make sure that the plugins will eventually"; \
+ 	  echo "* be in $(plugindir) -- the easiest way is to make a"; \
+-	  echo "* symbolic link from $(plugindir) to $(prefix)/lib/sasl2,"; \
++	  echo "* symbolic link from $(plugindir) to $(libdir)/sasl2,"; \
+ 	  echo "* but this may not be appropriate for your site, so this"; \
+ 	  echo "* installation procedure won't do it for you."; \
+ 	  echo "*"; \
+diff -uNr cyrus-sasl-2.1.20-orig/Makefile.in cyrus-sasl-2.1.20/Makefile.in
+--- cyrus-sasl-2.1.20-orig/Makefile.in	2004-10-25 06:21:09.000000000 +1000
++++ cyrus-sasl-2.1.20/Makefile.in	2004-10-25 21:37:53.780833136 +1000
+@@ -656,14 +656,14 @@
+ 	@find $(distdir) -exec chmod o+w {} ';'
+ 	@find $(distdir) -name CVS -print | xargs -t rm -rf
+ install-exec-local: $(INSTALLOSX)
+-	@if test "$(plugindir)" != "$(prefix)/lib/sasl2"; then \
++	@if test "$(plugindir)" != "$(libdir)/sasl2"; then \
+ 	  echo "********************************************************"; \
+ 	  echo "* WARNING:"; \
+-	  echo "* Plugins are being installed into $(prefix)/lib/sasl2,"; \
++	  echo "* Plugins are being installed into $(libdir)/sasl2,"; \
+ 	  echo "* but the library will look for them in $(plugindir)."; \
+ 	  echo "* You need to make sure that the plugins will eventually"; \
+ 	  echo "* be in $(plugindir) -- the easiest way is to make a"; \
+-	  echo "* symbolic link from $(plugindir) to $(prefix)/lib/sasl2,"; \
++	  echo "* symbolic link from $(plugindir) to $(libdir)/sasl2,"; \
+ 	  echo "* but this may not be appropriate for your site, so this"; \
+ 	  echo "* installation procedure won't do it for you."; \
+ 	  echo "*"; \
+diff -uNr cyrus-sasl-2.1.20-orig/configure cyrus-sasl-2.1.20/configure
+--- cyrus-sasl-2.1.20-orig/configure	2004-10-25 06:21:08.000000000 +1000
++++ cyrus-sasl-2.1.20/configure	2004-10-25 21:38:31.938032360 +1000
+@@ -904,7 +904,7 @@
+   --with-pgsql=PATH       use PostgreSQL from PATH
+   --with-sqlite=PATH       use SQLite from PATH
+   --with-plugindir=DIR    set the directory where plugins will
+-                          be found [/usr/lib/sasl2]
++                          be found [LIBDIR/sasl2]
+   --with-rc4              use internal rc4 routines [yes]
+   --with-dmalloc=DIR      with DMALLOC support (for test applications) [no]
+   --with-sfio=DIR         with SFIO support (for smtptest/libsfsasl) [no]
+@@ -11437,7 +11437,7 @@
+   withval="$with_plugindir"
+   plugindir=$withval
+ else
+-  plugindir=/usr/lib/sasl2
++  plugindir=${libdir}/sasl2
+ fi;
+ 
+ cat >>confdefs.h <<_ACEOF
+diff -uNr cyrus-sasl-2.1.20-orig/configure.in cyrus-sasl-2.1.20/configure.in
+--- cyrus-sasl-2.1.20-orig/configure.in	2004-10-25 06:05:13.000000000 +1000
++++ cyrus-sasl-2.1.20/configure.in	2004-10-25 21:37:53.786832224 +1000
+@@ -787,9 +787,9 @@
+ AC_SUBST(SASL_STATIC_LIBS)
+ 
+ AC_ARG_WITH(plugindir, [  --with-plugindir=DIR    set the directory where plugins will
+-                          be found [[/usr/lib/sasl2]] ],
++                          be found [[LIBDIR/sasl2]] ],
+   plugindir=$withval,
+-  plugindir=/usr/lib/sasl2)
++  plugindir=${libdir}/sasl2)
+ AC_DEFINE_UNQUOTED(PLUGINDIR, "$plugindir", [Runtime plugin location])
+ AC_SUBST(plugindir)
+ 
+diff -uNr cyrus-sasl-2.1.20-orig/plugins/Makefile.am cyrus-sasl-2.1.20/plugins/Makefile.am
+--- cyrus-sasl-2.1.20-orig/plugins/Makefile.am	2004-10-25 06:05:20.000000000 +1000
++++ cyrus-sasl-2.1.20/plugins/Makefile.am	2004-10-25 21:37:53.786832224 +1000
+@@ -73,7 +73,7 @@
+ 
+ common_sources = plugin_common.c plugin_common.h
+ 
+-sasldir = $(prefix)/lib/sasl2
++sasldir = $(libdir)/sasl2
+ sasl_LTLIBRARIES = @SASL_MECHS@
+ EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la \
+ 	libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \
+diff -uNr cyrus-sasl-2.1.20-orig/plugins/Makefile.in cyrus-sasl-2.1.20/plugins/Makefile.in
+--- cyrus-sasl-2.1.20-orig/plugins/Makefile.in	2004-10-25 06:21:09.000000000 +1000
++++ cyrus-sasl-2.1.20/plugins/Makefile.in	2004-10-25 21:37:53.787832072 +1000
+@@ -255,7 +255,7 @@
+ 
+ common_sources = plugin_common.c plugin_common.h
+ 
+-sasldir = $(prefix)/lib/sasl2
++sasldir = $(libdir)/sasl2
+ sasl_LTLIBRARIES = @SASL_MECHS@
+ EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la \
+ 	libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \
Index: patches/cyrus-sasl-2.1.20-set_plugindir_from_libdir.patch
===================================================================
--- patches/cyrus-sasl-2.1.20-set_plugindir_from_libdir.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/cyrus-sasl-2.1.20-set_plugindir_from_libdir.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,60 @@
+Submitted By: Ryan Oliver <ryan.oliver@pha.com.au>
+Date: 2004-10-25
+Initial Package Version: 2.1.20 (may apply to earlier)
+Origin: Ryan Oliver
+Description: This patch ensures that the plugin directory gets located
+  under the same directory specified with "--with-libdir=" .
+diff -uNr cyrus-sasl-2.1.20-orig/Makefile.in cyrus-sasl-2.1.20/Makefile.in
+--- cyrus-sasl-2.1.20-orig/Makefile.in	2004-10-25 06:21:09.000000000 +1000
++++ cyrus-sasl-2.1.20/Makefile.in	2004-10-25 21:37:53.780833136 +1000
+@@ -656,14 +656,14 @@
+ 	@find $(distdir) -exec chmod o+w {} ';'
+ 	@find $(distdir) -name CVS -print | xargs -t rm -rf
+ install-exec-local: $(INSTALLOSX)
+-	@if test "$(plugindir)" != "$(prefix)/lib/sasl2"; then \
++	@if test "$(plugindir)" != "$(libdir)/sasl2"; then \
+ 	  echo "********************************************************"; \
+ 	  echo "* WARNING:"; \
+-	  echo "* Plugins are being installed into $(prefix)/lib/sasl2,"; \
++	  echo "* Plugins are being installed into $(libdir)/sasl2,"; \
+ 	  echo "* but the library will look for them in $(plugindir)."; \
+ 	  echo "* You need to make sure that the plugins will eventually"; \
+ 	  echo "* be in $(plugindir) -- the easiest way is to make a"; \
+-	  echo "* symbolic link from $(plugindir) to $(prefix)/lib/sasl2,"; \
++	  echo "* symbolic link from $(plugindir) to $(libdir)/sasl2,"; \
+ 	  echo "* but this may not be appropriate for your site, so this"; \
+ 	  echo "* installation procedure won't do it for you."; \
+ 	  echo "*"; \
+diff -uNr cyrus-sasl-2.1.20-orig/configure cyrus-sasl-2.1.20/configure
+--- cyrus-sasl-2.1.20-orig/configure	2004-10-25 06:21:08.000000000 +1000
++++ cyrus-sasl-2.1.20/configure	2004-10-25 21:38:31.938032360 +1000
+@@ -904,7 +904,7 @@
+   --with-pgsql=PATH       use PostgreSQL from PATH
+   --with-sqlite=PATH       use SQLite from PATH
+   --with-plugindir=DIR    set the directory where plugins will
+-                          be found [/usr/lib/sasl2]
++                          be found [LIBDIR/sasl2]
+   --with-rc4              use internal rc4 routines [yes]
+   --with-dmalloc=DIR      with DMALLOC support (for test applications) [no]
+   --with-sfio=DIR         with SFIO support (for smtptest/libsfsasl) [no]
+@@ -11437,7 +11437,7 @@
+   withval="$with_plugindir"
+   plugindir=$withval
+ else
+-  plugindir=/usr/lib/sasl2
++  plugindir=${libdir}/sasl2
+ fi;
+ 
+ cat >>confdefs.h <<_ACEOF
+diff -uNr cyrus-sasl-2.1.20-orig/plugins/Makefile.in cyrus-sasl-2.1.20/plugins/Makefile.in
+--- cyrus-sasl-2.1.20-orig/plugins/Makefile.in	2004-10-25 06:21:09.000000000 +1000
++++ cyrus-sasl-2.1.20/plugins/Makefile.in	2004-10-25 21:37:53.787832072 +1000
+@@ -255,7 +255,7 @@
+ 
+ common_sources = plugin_common.c plugin_common.h
+ 
+-sasldir = $(prefix)/lib/sasl2
++sasldir = $(libdir)/sasl2
+ sasl_LTLIBRARIES = @SASL_MECHS@
+ EXTRA_LTLIBRARIES = libplain.la libanonymous.la libkerberos4.la libcrammd5.la \
+ 	libgssapiv2.la libdigestmd5.la liblogin.la libsrp.la libotp.la \
Index: patches/db-4.2.52-libtool_fixes.patch
===================================================================
--- patches/db-4.2.52-libtool_fixes.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/db-4.2.52-libtool_fixes.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,36 @@
+Submitted By: Ryan Oliver <ryan.oliver AT pha.com.au>
+Date: 2004-10-24
+Initial Package Version: 4.2.52
+Origin: Ryan Oliver
+Description: This patch fixes issues with determining whether ld is gnu ld
+  on bi-arch systems (where an emulation type is also specified with LD)
+  For example, if LD="ld -m elf_x86_64", the checks will try to locate a
+  file with filename "ld -m elf_x86_64" (which does not exist) and will
+  conclude that gnu ld is not being used. 
+  If gnu ld is not being used, libtool attempts to link libraries without 
+  specifying -nostdlib, and the startfiles are linked in twice causing
+  duplicate _init and _fini errors.
+
+  See the following link at libtool-patches
+    http://lists.gnu.org/archive/html/libtool-patches/2003-06/msg00056.html
+
+--- db-4.2.52-ORIG/dist/configure	2003-12-04 08:10:02.000000000 +1100
++++ db-4.2.52/dist/configure	2004-10-24 18:36:58.204928008 +1000
+@@ -5657,7 +5657,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+-case `"$LD" -v 2>&1 </dev/null` in
++case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+   lt_cv_prog_gnu_ld=yes
+   ;;
+@@ -11135,7 +11135,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+-case `"$LD" -v 2>&1 </dev/null` in
++case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+   lt_cv_prog_gnu_ld=yes
+   ;;
Index: patches/depmod-pl-lfh-cross-compile.patch
===================================================================
--- patches/depmod-pl-lfh-cross-compile.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/depmod-pl-lfh-cross-compile.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,11 @@
+--- depmod.pl.orig	Thu Aug 21 00:31:27 2003
++++ depmod.pl	Thu Aug 21 00:32:15 2003
+@@ -82,7 +82,7 @@
+     warn "MODULE = $tgtname\n" if $verbose;
+ 
+     # get a list of symbols
+-	@output=`nm $obj`;
++	@output=`$ENV{CROSS_COMPILE}nm $obj`;
+ 	$ksymtab=grep m/ __ksymtab/, @output;
+ 
+     # gather the exported symbols
Index: tches/dvhtool-1.0.1-fixes-1.patch
===================================================================
--- patches/dvhtool-1.0.1-fixes-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,169 +1,0 @@
-Submitted By: Jim Gifford (patches at jg555 dot com)
-Date: 2005-11-20
-Initial Package Version: 1.0.1
-Origin: Gentoo and Debian
-Upstream Status: Applied
-Description: Fixes Build issues with Dvhtool
-             Adds support for LVM and Linux Partitions
- 
-diff -Naur dvhtool-1.0.1.orig/Makefile.in dvhtool-1.0.1/Makefile.in
---- dvhtool-1.0.1.orig/Makefile.in	2001-04-17 18:07:24.000000000 +0000
-+++ dvhtool-1.0.1/Makefile.in	2005-11-21 03:17:54.000000000 +0000
-@@ -1,4 +1,4 @@
--# Makefile.in generated automatically by automake 1.4a from Makefile.am
-+# Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
- 
- # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
-@@ -46,10 +46,9 @@
- AUTOHEADER = @AUTOHEADER@
- 
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
--INSTALL_STRIP_FLAG =
- transform = @program_transform_name@
- 
- NORMAL_INSTALL = :
-@@ -104,7 +103,7 @@
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
- 
--TAR = gtar
-+TAR = tar
- GZIP_ENV = --best
- DEP_FILES =  .deps/dvhlib.P .deps/dvhtool.P .deps/getopt.P \
- .deps/getopt1.P .deps/pread.P
-@@ -124,7 +123,7 @@
- $(ACLOCAL_M4):  configure.in  acinclude.m4
- 	cd $(srcdir) && $(ACLOCAL)
- 
--config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+config.status: $(srcdir)/configure.in $(CONFIG_STATUS_DEPENDENCIES)
- 	$(SHELL) ./config.status --recheck
- $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
- 	cd $(srcdir) && $(AUTOCONF)
-@@ -173,8 +172,8 @@
- 	$(mkinstalldirs) $(DESTDIR)$(sbindir)
- 	@list='$(sbin_PROGRAMS)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo "  $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
--	     $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
-+	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-+	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
- 	  else :; fi; \
- 	done
- 
-@@ -382,7 +381,7 @@
- all-am: Makefile $(PROGRAMS) $(MANS) $(HEADERS) config.h
- all-redirect: all-am
- install-strip:
--	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
-+	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
- installdirs:
- 	$(mkinstalldirs)  $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)/man8
- 
-diff -Naur dvhtool-1.0.1.orig/aclocal.m4 dvhtool-1.0.1/aclocal.m4
---- dvhtool-1.0.1.orig/aclocal.m4	2000-11-07 00:05:27.000000000 +0000
-+++ dvhtool-1.0.1/aclocal.m4	2005-11-21 03:17:54.000000000 +0000
-@@ -1,4 +1,4 @@
--dnl aclocal.m4 generated automatically by aclocal 1.4a
-+dnl aclocal.m4 generated automatically by aclocal 1.4-p4
- 
- dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
- dnl This file is free software; the Free Software Foundation
-@@ -51,8 +51,6 @@
- 
- AC_DEFUN(AM_INIT_AUTOMAKE,
- [AC_REQUIRE([AC_PROG_INSTALL])
--dnl We require 2.13 because we rely on SHELL being computed by configure.
--AC_PREREQ([2.13])
- PACKAGE=[$1]
- AC_SUBST(PACKAGE)
- VERSION=[$2]
-diff -Naur dvhtool-1.0.1.orig/dvh.h dvhtool-1.0.1/dvh.h
---- dvhtool-1.0.1.orig/dvh.h	2001-02-22 02:29:45.000000000 +0000
-+++ dvhtool-1.0.1/dvh.h	2005-11-21 03:18:42.000000000 +0000
-@@ -127,6 +127,10 @@
- #define	PTYPE_XFSLOG	11		/* partition is sgi XFS log */
- #define	PTYPE_XLV	12		/* partition is part of an XLV vol */
- #define	PTYPE_XVM	13		/* partition is sgi XVM */
-+#define	PTYPE_LSWAP	0x82		/* partition is Linux swap */
-+#define	PTYPE_LINUX	0x83		/* partition is Linux native */
-+#define PTYPE_LLVM	0x8e		/* partition is Linux LVM */
-+#define PTYPE_LRAID	0xfd		/* partition is Linux RAID */
- #define NPTYPES		16
- 
- #define	VHMAGIC		0xbe5a941	/* randomly chosen value */
-diff -Naur dvhtool-1.0.1.orig/dvhlib.c dvhtool-1.0.1/dvhlib.c
---- dvhtool-1.0.1.orig/dvhlib.c	2001-02-24 10:37:37.000000000 +0000
-+++ dvhtool-1.0.1/dvhlib.c	2005-11-21 03:18:42.000000000 +0000
-@@ -50,6 +50,10 @@
- 	case PTYPE_XFSLOG:	return "XFS Log";
- 	case PTYPE_XLV:		return "XLV Volume";
- 	case PTYPE_XVM:		return "XVM Volume";
-+	case PTYPE_LSWAP:	return "Linux Swap";
-+	case PTYPE_LINUX:	return "Linux Native";
-+	case PTYPE_LLVM:	return "Linux LVM";
-+	case PTYPE_LRAID:	return "Linux RAID";
- 	}
- 	return "Unknown Partition Type";
- }
-@@ -325,8 +329,10 @@
- 	if (res == -1)
- 		die("Couldn't stat source file");
- 
--	/* XXX pad to blocksize? */
--	size = vh->vh_pt[8].pt_nblks * blksize - istat.st_size;
-+	/* calculate free blocks in vh */
-+	size = vh->vh_pt[8].pt_nblks				/* total vh size */
-+		- ( vh->vh_pt[8].pt_firstlbn + 4 )		/* reserved area */
-+		- (( istat.st_size + blksize - 1 ) / blksize );	/* pad to blocksize */
- 	/*
- 	 * Are we replacing an existing file, check for enough space and free
- 	 * entry in volume header
-@@ -336,16 +342,15 @@
- 			/* It's an existing file, delete it.  */
- 			memset(vd->vd_name, 0, VDNAMESIZE);
- 			vd->vd_nbytes = 0;
--			break;
- 		}
- 		if ( vd->vd_nbytes ) {
--			size -= vd->vd_nbytes;
-+			size -= (vd->vd_nbytes + blksize - 1 ) / blksize; /* pad to blocksize */
- 			num++;
- 		}
- 		vd++;
- 	}
- 
--	if ( num == NVDIR ) 
-+	if ( num == NVDIR )
- 		die("No more free entries in volume header");
- 	if ( size <= 0 )
- 		die("Not enough space left in volume header");
-@@ -403,7 +408,7 @@
- 				die("Short write");
- 			}
- 		}
--		dest += (vd->vd_nbytes + 511) / 512;	/* XXX Blocksize  */
-+		dest += (vd->vd_nbytes + blksize - 1) / blksize;
- 		vd++;
- 	}
- 
-diff -Naur dvhtool-1.0.1.orig/dvhtool.8 dvhtool-1.0.1/dvhtool.8
---- dvhtool-1.0.1.orig/dvhtool.8	2001-02-24 10:37:37.000000000 +0000
-+++ dvhtool-1.0.1/dvhtool.8	2005-11-21 03:17:54.000000000 +0000
-@@ -1,4 +1,4 @@
--.TH DVHTOOL 1 "July 2000"
-+.TH DVHTOOL 8 "July 2000"
- .UC 4
- .SH NAME
- dvhtool \- Disk volume header manipulation tool
-@@ -85,4 +85,4 @@
- .PP
- .I dvhtool
- was written by Ralf Baechle <ralf@oss.sgi.com>, Keith M. Wesolowski <wesolows@foobazco.org>,
--Tor Arntsen <tor@spacetec.no>, Guido Guenther <guido.guenther@gmx.net>. 
-+Tor Arntsen <tor@spacetec.no>, Guido Guenther <agx@debian.org>. 
Index: patches/e2fsprogs-1.34-2.6.0hdr-fix.patch
===================================================================
--- patches/e2fsprogs-1.34-2.6.0hdr-fix.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/e2fsprogs-1.34-2.6.0hdr-fix.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,19 @@
+diff -X /usr/src/dontdiff -urN e2fsprogs-old/misc/util.c e2fsprogs-1.34/misc/util.c
+--- e2fsprogs-old/misc/util.c	Sat May  3 15:46:47 2003
++++ e2fsprogs-1.34/misc/util.c	Tue Sep 30 06:56:11 2003
+@@ -108,13 +108,8 @@
+ #define MAJOR(dev)	((dev)>>8)
+ #define MINOR(dev)	((dev) & 0xff)
+ #endif
+-#ifndef SCSI_BLK_MAJOR
+-#define SCSI_BLK_MAJOR(M)  ((M) == SCSI_DISK_MAJOR || (M) == SCSI_CDROM_MAJOR)
+-#endif
+-	if (((MAJOR(s.st_rdev) == HD_MAJOR &&
+-	      MINOR(s.st_rdev)%64 == 0) ||
+-	     (SCSI_BLK_MAJOR(MAJOR(s.st_rdev)) &&
+-	      MINOR(s.st_rdev)%16 == 0))) {
++	if (MAJOR(s.st_rdev) == HD_MAJOR &&
++	    MINOR(s.st_rdev)%64 == 0) {
+ 		printf(_("%s is entire device, not just one partition!\n"),
+ 		       device);
+ 		proceed_question();
Index: patches/ed-0.2-mkstemp-1.patch
===================================================================
--- patches/ed-0.2-mkstemp-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/ed-0.2-mkstemp-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,25 @@
+Submitted By: LFS Book <lfs-book@linuxfromscratch.org>
+Date: 2003-10-05
+Initial Package Version: 0.2
+Origin: Slackware Source
+Description: Use mkstemp instead of mktemp.
+diff -Naur ed-0.2/buf.c ed-0.2-2/buf.c
+--- ed-0.2/buf.c	Sat Nov 19 04:37:59 1994
++++ ed-0.2-2/buf.c	Tue May 28 18:38:23 2002
+@@ -200,13 +200,13 @@
+ int
+ open_sbuf ()
+ {
+-  char *mktemp ();
+-  int u;
++  int u, sfd;
+ 
+   isbinary = newline_added = 0;
+   u = umask(077);
+   strcpy (sfn, "/tmp/ed.XXXXXX");
+-  if (mktemp (sfn) == NULL || (sfp = fopen (sfn, "w+")) == NULL)
++  sfd = mkstemp(sfn);
++    if ((sfd == -1) || (sfp = fopen (sfn, "w+")) == NULL)
+     {
+       fprintf (stderr, "%s: %s\n", sfn, strerror (errno));
+       sprintf (errmsg, "Cannot open temp file");
Index: tches/elftoaout-2.3-64bit_fixes-1.patch
===================================================================
--- patches/elftoaout-2.3-64bit_fixes-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,261 +1,0 @@
-Submitted By: Jim Gifford (patches at jg555 dot com)
-Date: 2006-01-03
-Initial Package Version: 2.3
-Origin: Dave Miller
-Upstream Status: Unknown
-Description: Fixes 64 Bit Issues with Elftoaout
-
-	http://marc.theaimsgroup.com/?l=linux-sparc&m=113617505627794&w=2
- 
-diff -Naur elftoaout-2.3.orig/elftoaout.c elftoaout-2.3/elftoaout.c
---- elftoaout-2.3.orig/elftoaout.c	2000-06-03 20:20:12.000000000 +0000
-+++ elftoaout-2.3/elftoaout.c	2006-01-03 22:33:28.000000000 +0000
-@@ -20,16 +20,36 @@
-  */
- #include <stdio.h>
- #include <stdlib.h>
--#ifdef linux
- #include <linux/elf.h>
--#define ELFDATA2MSB   2
--#else
--#include <sys/elf.h>
--#endif
--
--#define swab16(x)  (((x)<<8&0xFF00)|((x)>>8&0x00FF))
--#define swab32(x)  (((x)<<24&0xFF000000)|((x)<<8&0x00FF0000)|((x)>>24&0x000000FF)|((x)>>8&0x0000FF00))
--#define swab64(x)  ((((unsigned long long)(swab32((unsigned int)x))) << 32) | (swab32(((unsigned long long)x)>>32)))
-+#include <sys/types.h>
-+
-+static inline u_int16_t swab16(u_int16_t x)
-+{
-+	return (((x << 8)  & 0xFF00) |
-+		((x >> 8) & 0x00FF));
-+}
-+
-+static inline u_int32_t swab32(u_int32_t x)
-+{
-+	return (((x << 24) & 0xFF000000) |
-+		((x <<  8) & 0x00FF0000) |
-+		((x >> 24) & 0x000000FF) |
-+		((x >>  8) & 0x0000FF00));
-+}
-+
-+static inline u_int64_t swab64(u_int64_t x)
-+{
-+	return ((u_int64_t)
-+	((u_int64_t)(((u_int64_t)x & (u_int64_t)0x00000000000000ffULL) << 56) |
-+	 (u_int64_t)(((u_int64_t)x & (u_int64_t)0x000000000000ff00ULL) << 40) |
-+	 (u_int64_t)(((u_int64_t)x & (u_int64_t)0x0000000000ff0000ULL) << 24) |
-+	 (u_int64_t)(((u_int64_t)x & (u_int64_t)0x00000000ff000000ULL) <<  8) |
-+	 (u_int64_t)(((u_int64_t)x & (u_int64_t)0x000000ff00000000ULL) >>  8) |
-+	 (u_int64_t)(((u_int64_t)x & (u_int64_t)0x0000ff0000000000ULL) >> 24) |
-+	 (u_int64_t)(((u_int64_t)x & (u_int64_t)0x00ff000000000000ULL) >> 40) |
-+	 (u_int64_t)(((u_int64_t)x & (u_int64_t)0xff00000000000000ULL) >> 56)));
-+}
-+
- 
- /* We carry a.out header here in order to compile the thing on Solaris */
- 
-@@ -37,14 +57,14 @@
- #define	CMAGIC	    0x01030108
- 
- typedef struct {
--	unsigned long	a_magic;	/* magic number */
--	unsigned long	a_text;		/* size of text segment */
--	unsigned long	a_data;		/* size of initialized data */
--	unsigned long	a_bss;		/* size of uninitialized data */
--	unsigned long	a_syms;		/* size of symbol table || checksum */
--	unsigned long	a_entry;	/* entry point */
--	unsigned long	a_trsize;	/* size of text relocation */
--	unsigned long	a_drsize;	/* size of data relocation */
-+	u_int32_t	a_magic;	/* magic number */
-+	u_int32_t	a_text;		/* size of text segment */
-+	u_int32_t	a_data;		/* size of initialized data */
-+	u_int32_t	a_bss;		/* size of uninitialized data */
-+	u_int32_t	a_syms;		/* size of symbol table || checksum */
-+	u_int32_t	a_entry;	/* entry point */
-+	u_int32_t	a_trsize;	/* size of text relocation */
-+	u_int32_t	a_drsize;	/* size of data relocation */
- } Exec;
- 
- 
-@@ -56,17 +76,16 @@
- 	int swab;
- 	int sparc64;
- 	int csum;
--	/* friend void Usage(void); */
- } Application;
- 
- typedef struct {
- 	Elf32_Phdr *tab;
--	unsigned len;
-+	unsigned int len;
- } ProgTable;
- 
- typedef struct {
- 	Elf64_Phdr *tab;
--	unsigned len;
-+	unsigned int len;
- } ProgTable64;
- 
- void get_ptab(ProgTable *t, FILE *inp, const Elf32_Ehdr *h);
-@@ -75,9 +94,9 @@
- void print_ptab64(ProgTable64 *t);
- 
- typedef struct {
--	char *buf;                /* Image data */
--	unsigned len;             /* Length of buffer */
--	unsigned bss;             /* Length of extra data */
-+	unsigned char *buf;       /* Image data */
-+	unsigned int len;         /* Length of buffer */
-+	unsigned int bss;         /* Length of extra data */
- } Segment;
- 
- void load_image(Segment *t, const ProgTable *h, FILE *inp);
-@@ -105,7 +124,8 @@
- 
- 	parse_args(&prog, argc, argv);
- 
--	if (prog.version) Version();
-+	if (prog.version)
-+		Version();
- 
- 	if (freopen(prog.iname, "r", stdin) == NULL) {
- 		fprintf(stderr, "Cannot open \"%s\"\n", prog.iname);
-@@ -141,7 +161,8 @@
- 	exit(0);
- }
- 
--void parse_args( Application *t, unsigned argc, const char **argv ){
-+void parse_args( Application *t, unsigned argc, const char **argv )
-+{
- 	const char *arg;
- 	union {
- 		char c[4];
-@@ -185,8 +206,8 @@
- 	if (t->csum && t->sun4_mode) Usage ();	/* Checksum lives in header. */
- }
- 
--void get_header(Elf32_Ehdr *t, FILE *inp) {
--
-+void get_header(Elf32_Ehdr *t, FILE *inp)
-+{
-         if (fread((void*) t, sizeof(Elf64_Ehdr), 1, inp) != 1) {
- 		fprintf(stderr, "Read error on header\n");
- 		exit(1);
-@@ -249,8 +270,9 @@
- 	}
- }
- 
--void get_ptab(ProgTable *t, FILE *inp, const Elf32_Ehdr *h) {
--	unsigned x;
-+void get_ptab(ProgTable *t, FILE *inp, const Elf32_Ehdr *h)
-+{
-+	unsigned int x;
- 
- 	/** fprintf(stderr, "Program header table off = 0x%x\n",
- 		(unsigned) h->e_phoff); **/
-@@ -294,8 +316,9 @@
- 	}
- }
- 
--void get_ptab64(ProgTable64 *t, FILE *inp, const Elf64_Ehdr *h) {
--	unsigned x;
-+void get_ptab64(ProgTable64 *t, FILE *inp, const Elf64_Ehdr *h)
-+{
-+	unsigned int x;
- 
- 	if (h->e_phoff == 0) {
- 		fprintf(stderr, "No Program Header Table\n");
-@@ -332,8 +355,9 @@
- 	}
- }
- 
--void print_ptab(ProgTable *t) {
--	unsigned x;
-+void print_ptab(ProgTable *t)
-+{
-+	unsigned int x;
- 	const Elf32_Phdr *p;
- 
- 	for (x = 0; x < t->len; x++) {
-@@ -374,8 +398,9 @@
- 	}
- }
- 
--void print_ptab64(ProgTable64 *t) {
--	unsigned x;
-+void print_ptab64(ProgTable64 *t)
-+{
-+	unsigned int x;
- 	const Elf64_Phdr *p;
- 
- 	for (x = 0; x < t->len; x++) {
-@@ -387,8 +412,11 @@
- 			break;
- 		case PT_LOAD:
- 			printf("Loadable to 0x%Lx[0x%Lx] from 0x%Lx[0x%Lx] align 0x%Lx",
--				p->p_vaddr, p->p_memsz, p->p_offset, p->p_filesz,
--				p->p_align);
-+			       (unsigned long long) p->p_vaddr,
-+			       (unsigned long long) p->p_memsz,
-+			       (unsigned long long) p->p_offset,
-+			       (unsigned long long) p->p_filesz,
-+			       (unsigned long long) p->p_align);
- 			break;
- 		case PT_DYNAMIC:
- 			printf("Dynamic");
-@@ -416,9 +444,10 @@
- 	}
- }
- 
--void load_image(Segment *t, const ProgTable *tp, FILE *inp) {
-+void load_image(Segment *t, const ProgTable *tp, FILE *inp)
-+{
- 	Elf32_Phdr *p, *q;
--	unsigned x;
-+	unsigned int x;
- 	unsigned long off, len;
- 
- 	p = 0;
-@@ -484,9 +513,10 @@
- 	}
- }
- 
--void load_image64(Segment *t, const ProgTable64 *tp, FILE *inp) {
-+void load_image64(Segment *t, const ProgTable64 *tp, FILE *inp)
-+{
- 	Elf64_Phdr *p, *q;
--	unsigned x;
-+	unsigned int x;
- 	unsigned long long off, len;
- 
- 	p = 0;
-@@ -547,7 +577,8 @@
- 	}
- }
- 
--void store_image(Segment *t, FILE *out) {
-+void store_image(Segment *t, FILE *out)
-+{
- 	Exec ohdb;
- 
- 	if (prog.swab) {
-@@ -585,13 +616,15 @@
- 	return;
- }
- 
--void Usage(){
-+void Usage()
-+{
- 	if (prog.version) Version();
- 	fprintf(stderr, "Usage: elftoaout [-o output] [-c|-b] [-V] input\n");
- 	exit(1);
- }
- 
--void Version(){
-+void Version()
-+{
- 	printf("elftoaout 2.3: ELF to a.out convertor for SPARC and SPARC64 bootstraps\n");
- }
- 
Index: tches/expect-5.43.0-config_update-1.patch
===================================================================
--- patches/expect-5.43.0-config_update-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,2049 +1,0 @@
-Submitted By: Jim Gifford (patches at jg555 dot com)
-Date: 2005-12-26
-Initial Package Version: 5.4.3
-Origin: Jim Gifford
-Upstream Status: Unknown
-Description: Updates config.sub and config.guess
- 
-diff -Naur expect-5.43.orig/config.guess expect-5.43/config.guess
---- expect-5.43.orig/config.guess	2002-03-23 04:46:44.000000000 +0000
-+++ expect-5.43/config.guess	2005-12-27 04:16:22.000000000 +0000
-@@ -1,9 +1,9 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002 Free Software Foundation, Inc.
-+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
- 
--timestamp='2002-03-04'
-+timestamp='2004-11-12'
- 
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -53,7 +53,7 @@
- GNU config.guess ($timestamp)
- 
- Originally written by Per Bothner.
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
- Free Software Foundation, Inc.
- 
- This is free software; see the source for copying conditions.  There is NO
-@@ -88,30 +88,42 @@
-   exit 1
- fi
- 
-+trap 'exit 1' 1 2 15
- 
--dummy=dummy-$$
--trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
-+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-+# compiler to aid in system detection is discouraged as it requires
-+# temporary files to be created and, as you can see below, it is a
-+# headache to deal with in a portable fashion.
- 
--# CC_FOR_BUILD -- compiler used by this script.
- # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
- # use `HOST_CC' if defined, but it is deprecated.
- 
--set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
-- ,,)    echo "int dummy(){}" > $dummy.c ;
--	for c in cc gcc c89 ; do
--	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
--	  if test $? = 0 ; then
-+# Portable tmp directory creation inspired by the Autoconf team.
-+
-+set_cc_for_build='
-+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-+: ${TMPDIR=/tmp} ;
-+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
-+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
-+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-+dummy=$tmp/dummy ;
-+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-+case $CC_FOR_BUILD,$HOST_CC,$CC in
-+ ,,)    echo "int x;" > $dummy.c ;
-+	for c in cc gcc c89 c99 ; do
-+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
- 	     CC_FOR_BUILD="$c"; break ;
- 	  fi ;
- 	done ;
--	rm -f $dummy.c $dummy.o $dummy.rel ;
- 	if test x"$CC_FOR_BUILD" = x ; then
- 	  CC_FOR_BUILD=no_compiler_found ;
- 	fi
- 	;;
-  ,,*)   CC_FOR_BUILD=$CC ;;
-  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
--esac'
-+esac ;'
- 
- # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
- # (ghazi@noc.rutgers.edu 1994-08-24)
-@@ -142,6 +154,7 @@
- 	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
- 	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
- 	case "${UNAME_MACHINE_ARCH}" in
-+	    armeb) machine=armeb-unknown ;;
- 	    arm*) machine=arm-unknown ;;
- 	    sh3el) machine=shl-unknown ;;
- 	    sh3eb) machine=sh-unknown ;;
-@@ -167,21 +180,38 @@
- 		;;
- 	esac
- 	# The OS release
--	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+	# Debian GNU/NetBSD machines have a different userland, and
-+	# thus, need a distinct triplet. However, they do not need
-+	# kernel version information, so it can be replaced with a
-+	# suitable tag, in the style of linux-gnu.
-+	case "${UNAME_VERSION}" in
-+	    Debian*)
-+		release='-gnu'
-+		;;
-+	    *)
-+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+		;;
-+	esac
- 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
- 	# contains redundant information, the shorter form:
- 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- 	echo "${machine}-${os}${release}"
- 	exit 0 ;;
-+    amd64:OpenBSD:*:*)
-+	echo x86_64-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-     amiga:OpenBSD:*:*)
- 	echo m68k-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
--    arc:OpenBSD:*:*)
--	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+    cats:OpenBSD:*:*)
-+	echo arm-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
-     hp300:OpenBSD:*:*)
- 	echo m68k-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
-+    luna88k:OpenBSD:*:*)
-+    	echo m88k-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-     mac68k:OpenBSD:*:*)
- 	echo m68k-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
-@@ -197,83 +227,76 @@
-     mvmeppc:OpenBSD:*:*)
- 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
--    pmax:OpenBSD:*:*)
--	echo mipsel-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
-     sgi:OpenBSD:*:*)
--	echo mipseb-unknown-openbsd${UNAME_RELEASE}
-+	echo mips64-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
-     sun3:OpenBSD:*:*)
- 	echo m68k-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
--    wgrisc:OpenBSD:*:*)
--	echo mipsel-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
-     *:OpenBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
- 	exit 0 ;;
-+    *:ekkoBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    macppc:MirBSD:*:*)
-+	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    *:MirBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-+	exit 0 ;;
-     alpha:OSF1:*:*)
--	if test $UNAME_RELEASE = "V4.0"; then
-+	case $UNAME_RELEASE in
-+	*4.0)
- 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
--	fi
-+		;;
-+	*5.*)
-+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-+		;;
-+	esac
-+	# According to Compaq, /usr/sbin/psrinfo has been available on
-+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-+	# covers most systems running today.  This code pipes the CPU
-+	# types through head -n 1, so we only detect the type of CPU 0.
-+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-+	case "$ALPHA_CPU_TYPE" in
-+	    "EV4 (21064)")
-+		UNAME_MACHINE="alpha" ;;
-+	    "EV4.5 (21064)")
-+		UNAME_MACHINE="alpha" ;;
-+	    "LCA4 (21066/21068)")
-+		UNAME_MACHINE="alpha" ;;
-+	    "EV5 (21164)")
-+		UNAME_MACHINE="alphaev5" ;;
-+	    "EV5.6 (21164A)")
-+		UNAME_MACHINE="alphaev56" ;;
-+	    "EV5.6 (21164PC)")
-+		UNAME_MACHINE="alphapca56" ;;
-+	    "EV5.7 (21164PC)")
-+		UNAME_MACHINE="alphapca57" ;;
-+	    "EV6 (21264)")
-+		UNAME_MACHINE="alphaev6" ;;
-+	    "EV6.7 (21264A)")
-+		UNAME_MACHINE="alphaev67" ;;
-+	    "EV6.8CB (21264C)")
-+		UNAME_MACHINE="alphaev68" ;;
-+	    "EV6.8AL (21264B)")
-+		UNAME_MACHINE="alphaev68" ;;
-+	    "EV6.8CX (21264D)")
-+		UNAME_MACHINE="alphaev68" ;;
-+	    "EV6.9A (21264/EV69A)")
-+		UNAME_MACHINE="alphaev69" ;;
-+	    "EV7 (21364)")
-+		UNAME_MACHINE="alphaev7" ;;
-+	    "EV7.9 (21364A)")
-+		UNAME_MACHINE="alphaev79" ;;
-+	esac
-+	# A Pn.n version is a patched version.
- 	# A Vn.n version is a released version.
- 	# A Tn.n version is a released field test version.
- 	# A Xn.n version is an unreleased experimental baselevel.
- 	# 1.2 uses "1.2" for uname -r.
--	cat <<EOF >$dummy.s
--	.data
--\$Lformat:
--	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
--
--	.text
--	.globl main
--	.align 4
--	.ent main
--main:
--	.frame \$30,16,\$26,0
--	ldgp \$29,0(\$27)
--	.prologue 1
--	.long 0x47e03d80 # implver \$0
--	lda \$2,-1
--	.long 0x47e20c21 # amask \$2,\$1
--	lda \$16,\$Lformat
--	mov \$0,\$17
--	not \$1,\$18
--	jsr \$26,printf
--	ldgp \$29,0(\$26)
--	mov 0,\$16
--	jsr \$26,exit
--	.end main
--EOF
--	eval $set_cc_for_build
--	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
--	if test "$?" = 0 ; then
--		case `./$dummy` in
--			0-0)
--				UNAME_MACHINE="alpha"
--				;;
--			1-0)
--				UNAME_MACHINE="alphaev5"
--				;;
--			1-1)
--				UNAME_MACHINE="alphaev56"
--				;;
--			1-101)
--				UNAME_MACHINE="alphapca56"
--				;;
--			2-303)
--				UNAME_MACHINE="alphaev6"
--				;;
--			2-307)
--				UNAME_MACHINE="alphaev67"
--				;;
--			2-1307)
--				UNAME_MACHINE="alphaev68"
--				;;
--		esac
--	fi
--	rm -f $dummy.s $dummy
--	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- 	exit 0 ;;
-     Alpha\ *:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
-@@ -296,6 +319,12 @@
-     *:OS/390:*:*)
- 	echo i370-ibm-openedition
- 	exit 0 ;;
-+    *:z/VM:*:*)
-+	echo s390-ibm-zvmoe
-+	exit 0 ;;
-+    *:OS400:*:*)
-+        echo powerpc-ibm-os400
-+	exit 0 ;;
-     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- 	echo arm-acorn-riscix${UNAME_RELEASE}
- 	exit 0;;
-@@ -313,6 +342,13 @@
-     NILE*:*:*:dcosx)
- 	echo pyramid-pyramid-svr4
- 	exit 0 ;;
-+    DRS?6000:unix:4.0:6*)
-+	echo sparc-icl-nx6
-+	exit 0 ;;
-+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-+	case `/usr/bin/uname -p` in
-+	    sparc) echo sparc-icl-nx7 && exit 0 ;;
-+	esac ;;
-     sun4H:SunOS:5.*:*)
- 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- 	exit 0 ;;
-@@ -381,6 +417,9 @@
-     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-         echo m68k-unknown-mint${UNAME_RELEASE}
-         exit 0 ;;
-+    m68k:machten:*:*)
-+	echo m68k-apple-machten${UNAME_RELEASE}
-+	exit 0 ;;
-     powerpc:machten:*:*)
- 	echo powerpc-apple-machten${UNAME_RELEASE}
- 	exit 0 ;;
-@@ -419,15 +458,20 @@
- 	  exit (-1);
- 	}
- EOF
--	$CC_FOR_BUILD $dummy.c -o $dummy \
--	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
--	  && rm -f $dummy.c $dummy && exit 0
--	rm -f $dummy.c $dummy
-+	$CC_FOR_BUILD -o $dummy $dummy.c \
-+	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-+	  && exit 0
- 	echo mips-mips-riscos${UNAME_RELEASE}
- 	exit 0 ;;
-     Motorola:PowerMAX_OS:*:*)
- 	echo powerpc-motorola-powermax
- 	exit 0 ;;
-+    Motorola:*:4.3:PL8-*)
-+	echo powerpc-harris-powermax
-+	exit 0 ;;
-+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-+	echo powerpc-harris-powermax
-+	exit 0 ;;
-     Night_Hawk:Power_UNIX:*:*)
- 	echo powerpc-harris-powerunix
- 	exit 0 ;;
-@@ -500,8 +544,7 @@
- 			exit(0);
- 			}
- EOF
--		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
--		rm -f $dummy.c $dummy
-+		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
- 		echo rs6000-ibm-aix3.2.5
- 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
- 		echo rs6000-ibm-aix3.2.4
-@@ -599,11 +642,21 @@
-                   exit (0);
-               }
- EOF
--		    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
--		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
--		    rm -f $dummy.c $dummy
-+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-+		    test -z "$HP_ARCH" && HP_ARCH=hppa
- 		fi ;;
- 	esac
-+	if [ ${HP_ARCH} = "hppa2.0w" ]
-+	then
-+	    # avoid double evaluation of $set_cc_for_build
-+	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
-+	    then
-+		HP_ARCH="hppa2.0w"
-+	    else
-+		HP_ARCH="hppa64"
-+	    fi
-+	fi
- 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
- 	exit 0 ;;
-     ia64:HP-UX:*:*)
-@@ -637,8 +690,7 @@
- 	  exit (0);
- 	}
- EOF
--	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
--	rm -f $dummy.c $dummy
-+	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
- 	echo unknown-hitachi-hiuxwe2
- 	exit 0 ;;
-     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-@@ -696,21 +748,26 @@
-     CRAY*TS:*:*:*)
- 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- 	exit 0 ;;
--    CRAY*T3D:*:*:*)
--	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-     CRAY*T3E:*:*:*)
- 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- 	exit 0 ;;
-     CRAY*SV1:*:*:*)
- 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- 	exit 0 ;;
-+    *:UNICOS/mp:*:*)
-+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit 0 ;;
-     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-         exit 0 ;;
-+    5000:UNIX_System_V:4.*:*)
-+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+	exit 0 ;;
-     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
- 	exit 0 ;;
-@@ -732,14 +789,17 @@
-     i*:PW*:*)
- 	echo ${UNAME_MACHINE}-pc-pw32
- 	exit 0 ;;
--    x86:Interix*:3*)
--	echo i386-pc-interix3
-+    x86:Interix*:[34]*)
-+	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-+	exit 0 ;;
-+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-+	echo i${UNAME_MACHINE}-pc-mks
- 	exit 0 ;;
-     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
- 	# UNAME_MACHINE based on the output of uname instead of i386?
--	echo i386-pc-interix
-+	echo i586-pc-interix
- 	exit 0 ;;
-     i*:UWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-uwin
-@@ -751,16 +811,33 @@
- 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- 	exit 0 ;;
-     *:GNU:*:*)
-+	# the GNU system
- 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
- 	exit 0 ;;
-+    *:GNU/*:*:*)
-+	# other systems with GNU libc and userland
-+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-+	exit 0 ;;
-     i*86:Minix:*:*)
- 	echo ${UNAME_MACHINE}-pc-minix
- 	exit 0 ;;
-     arm*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit 0 ;;
-+    cris:Linux:*:*)
-+	echo cris-axis-linux-gnu
-+	exit 0 ;;
-+    crisv32:Linux:*:*)
-+	echo crisv32-axis-linux-gnu
-+	exit 0 ;;
-+    frv:Linux:*:*)
-+    	echo frv-unknown-linux-gnu
-+	exit 0 ;;
-     ia64:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit 0 ;;
-+    m32r*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit 0 ;;
-     m68*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-@@ -771,19 +848,37 @@
- 	#undef CPU
- 	#undef mips
- 	#undef mipsel
--	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) 
--	CPU=mipsel 
-+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-+	CPU=mipsel
- 	#else
--	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) 
-+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
- 	CPU=mips
- 	#else
- 	CPU=
- 	#endif
--	#endif 
-+	#endif
-+EOF
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-+	;;
-+    mips64:Linux:*:*)
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+	#undef CPU
-+	#undef mips64
-+	#undef mips64el
-+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-+	CPU=mips64el
-+	#else
-+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-+	CPU=mips64
-+	#else
-+	CPU=
-+	#endif
-+	#endif
- EOF
- 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
--	rm -f $dummy.c
--	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
-+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
- 	;;
-     ppc:Linux:*:*)
- 	echo powerpc-unknown-linux-gnu
-@@ -819,6 +914,9 @@
-     s390:Linux:*:* | s390x:Linux:*:*)
- 	echo ${UNAME_MACHINE}-ibm-linux
- 	exit 0 ;;
-+    sh64*:Linux:*:*)
-+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit 0 ;;
-     sh*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit 0 ;;
-@@ -845,7 +943,7 @@
- 		;;
- 	  a.out-i386-linux)
- 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
--		exit 0 ;;		
-+		exit 0 ;;
- 	  coff-i386)
- 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
- 		exit 0 ;;
-@@ -876,9 +974,11 @@
- 	LIBC=gnuaout
- 	#endif
- 	#endif
-+	#ifdef __dietlibc__
-+	LIBC=dietlibc
-+	#endif
- EOF
- 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
--	rm -f $dummy.c
- 	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
- 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
- 	;;
-@@ -896,6 +996,26 @@
-         # Use sysv4.2uw... so that sysv4* matches it.
- 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
- 	exit 0 ;;
-+    i*86:OS/2:*:*)
-+	# If we were able to find `uname', then EMX Unix compatibility
-+	# is probably installed.
-+	echo ${UNAME_MACHINE}-pc-os2-emx
-+	exit 0 ;;
-+    i*86:XTS-300:*:STOP)
-+	echo ${UNAME_MACHINE}-unknown-stop
-+	exit 0 ;;
-+    i*86:atheos:*:*)
-+	echo ${UNAME_MACHINE}-unknown-atheos
-+	exit 0 ;;
-+	i*86:syllable:*:*)
-+	echo ${UNAME_MACHINE}-pc-syllable
-+	exit 0 ;;
-+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+	echo i386-unknown-lynxos${UNAME_RELEASE}
-+	exit 0 ;;
-+    i*86:*DOS:*:*)
-+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-+	exit 0 ;;
-     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
- 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
- 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-@@ -917,22 +1037,19 @@
- 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
- 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
- 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
--		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
--		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
--		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
- 			&& UNAME_MACHINE=i586
--		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
-+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
- 			&& UNAME_MACHINE=i686
--		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
-+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
- 			&& UNAME_MACHINE=i686
- 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
- 	else
- 		echo ${UNAME_MACHINE}-pc-sysv32
- 	fi
- 	exit 0 ;;
--    i*86:*DOS:*:*)
--	echo ${UNAME_MACHINE}-pc-msdosdjgpp
--	exit 0 ;;
-     pc:*:*:*)
- 	# Left here for compatibility:
-         # uname -m prints for DJGPP always 'pc', but it prints nothing about
-@@ -956,9 +1073,15 @@
- 	# "miniframe"
- 	echo m68010-convergent-sysv
- 	exit 0 ;;
--    M68*:*:R3V[567]*:*)
-+    mc68k:UNIX:SYSTEM5:3.51m)
-+	echo m68k-convergent-sysv
-+	exit 0 ;;
-+    M680?0:D-NIX:5.3:*)
-+	echo m68k-diab-dnix
-+	exit 0 ;;
-+    M68*:*:R3V[5678]*:*)
- 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
--    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
-+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
- 	OS_REL=''
- 	test -r /etc/.relid \
- 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-@@ -975,9 +1098,6 @@
-     mc68030:UNIX_System_V:4.*:*)
- 	echo m68k-atari-sysv4
- 	exit 0 ;;
--    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
--	echo i386-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-     TSUNAMI:LynxOS:2.*:*)
- 	echo sparc-unknown-lynxos${UNAME_RELEASE}
- 	exit 0 ;;
-@@ -1049,6 +1169,9 @@
-     SX-5:SUPER-UX:*:*)
- 	echo sx5-nec-superux${UNAME_RELEASE}
- 	exit 0 ;;
-+    SX-6:SUPER-UX:*:*)
-+	echo sx6-nec-superux${UNAME_RELEASE}
-+	exit 0 ;;
-     Power*:Rhapsody:*:*)
- 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
- 	exit 0 ;;
-@@ -1056,20 +1179,25 @@
- 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
- 	exit 0 ;;
-     *:Darwin:*:*)
--	echo `uname -p`-apple-darwin${UNAME_RELEASE}
-+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-+	case $UNAME_PROCESSOR in
-+	    *86) UNAME_PROCESSOR=i686 ;;
-+	    unknown) UNAME_PROCESSOR=powerpc ;;
-+	esac
-+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
- 	exit 0 ;;
-     *:procnto*:*:* | *:QNX:[0123456789]*:*)
--	if test "${UNAME_MACHINE}" = "x86pc"; then
-+	UNAME_PROCESSOR=`uname -p`
-+	if test "$UNAME_PROCESSOR" = "x86"; then
-+		UNAME_PROCESSOR=i386
- 		UNAME_MACHINE=pc
--		echo i386-${UNAME_MACHINE}-nto-qnx
--	else
--		echo `uname -p`-${UNAME_MACHINE}-nto-qnx
- 	fi
-+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
- 	exit 0 ;;
-     *:QNX:*:4*)
- 	echo i386-pc-qnx
- 	exit 0 ;;
--    NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)
-+    NSR-?:NONSTOP_KERNEL:*:*)
- 	echo nsr-tandem-nsk${UNAME_RELEASE}
- 	exit 0 ;;
-     *:NonStop-UX:*:*)
-@@ -1092,11 +1220,6 @@
- 	fi
- 	echo ${UNAME_MACHINE}-unknown-plan9
- 	exit 0 ;;
--    i*86:OS/2:*:*)
--	# If we were able to find `uname', then EMX Unix compatibility
--	# is probably installed.
--	echo ${UNAME_MACHINE}-pc-os2-emx
--	exit 0 ;;
-     *:TOPS-10:*:*)
- 	echo pdp10-unknown-tops10
- 	exit 0 ;;
-@@ -1115,11 +1238,21 @@
-     *:ITS:*:*)
- 	echo pdp10-unknown-its
- 	exit 0 ;;
--    i*86:XTS-300:*:STOP)
--	echo ${UNAME_MACHINE}-unknown-stop
-+    SEI:*:*:SEIUX)
-+        echo mips-sei-seiux${UNAME_RELEASE}
- 	exit 0 ;;
--    i*86:atheos:*:*)
--	echo ${UNAME_MACHINE}-unknown-atheos
-+    *:DragonFly:*:*)
-+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+	exit 0 ;;
-+    *:*VMS:*:*)
-+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+	case "${UNAME_MACHINE}" in
-+	    A*) echo alpha-dec-vms && exit 0 ;;
-+	    I*) echo ia64-dec-vms && exit 0 ;;
-+	    V*) echo vax-dec-vms && exit 0 ;;
-+	esac ;;
-+    *:XENIX:*:SysV)
-+	echo i386-pc-xenix
- 	exit 0 ;;
- esac
- 
-@@ -1241,8 +1374,7 @@
- }
- EOF
- 
--$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
--rm -f $dummy.c $dummy
-+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
- 
- # Apollos put the system type in the environment.
- 
-diff -Naur expect-5.43.orig/config.sub expect-5.43/config.sub
---- expect-5.43.orig/config.sub	2002-02-12 02:00:55.000000000 +0000
-+++ expect-5.43/config.sub	2005-12-27 04:16:26.000000000 +0000
-@@ -1,6 +1,10 @@
- #! /bin/sh
--# Configuration validation subroutine script, version 1.1.
--#   Copyright (C) 1991, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
-+# Configuration validation subroutine script.
-+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-+
-+timestamp='2004-11-30'
-+
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
- # can handle that machine.  It does not imply ALL GNU software can.
-@@ -25,6 +29,9 @@
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
- 
-+# Please send patches to <config-patches@gnu.org>.  Submit a context
-+# diff and a properly formatted ChangeLog entry.
-+#
- # Configuration subroutine to validate and canonicalize a configuration type.
- # Supply the specified configuration type as an argument.
- # If it is invalid, we print an error message on stderr and exit with code 1.
-@@ -45,30 +52,74 @@
- #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
- # It is wrong to echo any other type of specification.
- 
--if [ x$1 = x ]
--then
--	echo Configuration name missing. 1>&2
--	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
--	echo "or     $0 ALIAS" 1>&2
--	echo where ALIAS is a recognized configuration type. 1>&2
--	exit 1
--fi
-+me=`echo "$0" | sed -e 's,.*/,,'`
- 
--# First pass through any local machine types.
--case $1 in
--	*local*)
--		echo $1
--		exit 0
--		;;
--	*)
--	;;
-+usage="\
-+Usage: $0 [OPTION] CPU-MFR-OPSYS
-+       $0 [OPTION] ALIAS
-+
-+Canonicalize a configuration name.
-+
-+Operation modes:
-+  -h, --help         print this help, then exit
-+  -t, --time-stamp   print date of last modification, then exit
-+  -v, --version      print version number, then exit
-+
-+Report bugs and patches to <config-patches@gnu.org>."
-+
-+version="\
-+GNU config.sub ($timestamp)
-+
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-+Free Software Foundation, Inc.
-+
-+This is free software; see the source for copying conditions.  There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+
-+help="
-+Try \`$me --help' for more information."
-+
-+# Parse command line
-+while test $# -gt 0 ; do
-+  case $1 in
-+    --time-stamp | --time* | -t )
-+       echo "$timestamp" ; exit 0 ;;
-+    --version | -v )
-+       echo "$version" ; exit 0 ;;
-+    --help | --h* | -h )
-+       echo "$usage"; exit 0 ;;
-+    -- )     # Stop option processing
-+       shift; break ;;
-+    - )	# Use stdin as input.
-+       break ;;
-+    -* )
-+       echo "$me: invalid option $1$help"
-+       exit 1 ;;
-+
-+    *local*)
-+       # First pass through any local machine types.
-+       echo $1
-+       exit 0;;
-+
-+    * )
-+       break ;;
-+  esac
-+done
-+
-+case $# in
-+ 0) echo "$me: missing argument$help" >&2
-+    exit 1;;
-+ 1) ;;
-+ *) echo "$me: too many arguments$help" >&2
-+    exit 1;;
- esac
- 
- # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
--  linux-gnu*)
-+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-     os=-$maybe_os
-     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-     ;;
-@@ -94,15 +145,33 @@
- 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
- 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
- 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
--	-apple)
-+	-apple | -axis | -knuth | -cray)
-+		os=
-+		basic_machine=$1
-+		;;
-+	-sim | -cisco | -oki | -wec | -winbond)
- 		os=
- 		basic_machine=$1
- 		;;
-+	-scout)
-+		;;
-+	-wrs)
-+		os=-vxworks
-+		basic_machine=$1
-+		;;
-+	-chorusos*)
-+		os=-chorusos
-+		basic_machine=$1
-+		;;
-+ 	-chorusrdb)
-+ 		os=-chorusrdb
-+		basic_machine=$1
-+ 		;;
- 	-hiux*)
- 		os=-hiuxwe2
- 		;;
- 	-sco5)
--		os=sco3.2v5
-+		os=-sco3.2v5
- 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- 		;;
- 	-sco4)
-@@ -121,6 +190,9 @@
- 		os=-sco3.2v2
- 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- 		;;
-+	-udk*)
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
- 	-isc)
- 		os=-isc2.2
- 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -143,25 +215,74 @@
- 	-psos*)
- 		os=-psos
- 		;;
-+	-mint | -mint[0-9]*)
-+		basic_machine=m68k-atari
-+		os=-mint
-+		;;
- esac
- 
- # Decode aliases for certain CPU-COMPANY combinations.
- case $basic_machine in
- 	# Recognize the basic CPU types without company name.
- 	# Some are omitted here because they have special meanings below.
--	tahoe | i860 | m68k | m68000 | m88k | ns32k | arm \
--		| arme[lb] | pyramid \
--		| tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
--		| alpha | we32k | ns16k | clipper | i370 | sh \
--		| powerpc | powerpcle | 1750a | dsp16xx | mips64 | mipsel \
--		| pdp11 | mips64el | mips64orion | mips64orionel \
--		| sparc | sparclet | sparclite | sparc64)
-+	1750a | 580 \
-+	| a29k \
-+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-+	| am33_2.0 \
-+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-+	| c4x | clipper \
-+	| d10v | d30v | dlx | dsp16xx \
-+	| fr30 | frv \
-+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-+	| i370 | i860 | i960 | ia64 \
-+	| ip2k | iq2000 \
-+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
-+	| mips | mipsbe | mipseb | mipsel | mipsle \
-+	| mips16 \
-+	| mips64 | mips64el \
-+	| mips64vr | mips64vrel \
-+	| mips64orion | mips64orionel \
-+	| mips64vr4100 | mips64vr4100el \
-+	| mips64vr4300 | mips64vr4300el \
-+	| mips64vr5000 | mips64vr5000el \
-+	| mipsisa32 | mipsisa32el \
-+	| mipsisa32r2 | mipsisa32r2el \
-+	| mipsisa64 | mipsisa64el \
-+	| mipsisa64r2 | mipsisa64r2el \
-+	| mipsisa64sb1 | mipsisa64sb1el \
-+	| mipsisa64sr71k | mipsisa64sr71kel \
-+	| mipstx39 | mipstx39el \
-+	| mn10200 | mn10300 \
-+	| msp430 \
-+	| ns16k | ns32k \
-+	| openrisc | or32 \
-+	| pdp10 | pdp11 | pj | pjl \
-+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-+	| pyramid \
-+	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+	| sh64 | sh64le \
-+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
-+	| strongarm \
-+	| tahoe | thumb | tic4x | tic80 | tron \
-+	| v850 | v850e \
-+	| we32k \
-+	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
-+	| z8k)
- 		basic_machine=$basic_machine-unknown
- 		;;
-+	m6811 | m68hc11 | m6812 | m68hc12)
-+		# Motorola 68HC11/12.
-+		basic_machine=$basic_machine-unknown
-+		os=-none
-+		;;
-+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-+		;;
-+
- 	# We use `pc' rather than `unknown'
- 	# because (1) that's what they normally are, and
- 	# (2) the word "unknown" tends to confuse beginning users.
--	i[3456]86)
-+	i*86 | x86_64)
- 	  basic_machine=$basic_machine-pc
- 	  ;;
- 	# Object if more than one company name word.
-@@ -170,23 +291,86 @@
- 		exit 1
- 		;;
- 	# Recognize the basic CPU types with company name.
--	vax-* | tahoe-* | i[3456]86-* | i860-* | m68k-* | m68000-* | m88k-* \
--	      | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \
--	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \
--	      | none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
--	      | hppa-* | hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
--	      | pn-* | np1-* | xps100-* | clipper-* | orion-* | sparclite-* \
--	      | pdp11-* | sh-* | powerpc-* | powerpcle-* | sparc64-* | mips64-* | mipsel-* \
--	      | mips64el-* | mips64orion-* | mips64orionel-*)
-+	580-* \
-+	| a29k-* \
-+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+	| avr-* \
-+	| bs2000-* \
-+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-+	| clipper-* | craynv-* | cydra-* \
-+	| d10v-* | d30v-* | dlx-* \
-+	| elxsi-* \
-+	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-+	| h8300-* | h8500-* \
-+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-+	| i*86-* | i860-* | i960-* | ia64-* \
-+	| ip2k-* | iq2000-* \
-+	| m32r-* | m32rle-* \
-+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-+	| m88110-* | m88k-* | maxq-* | mcore-* \
-+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-+	| mips16-* \
-+	| mips64-* | mips64el-* \
-+	| mips64vr-* | mips64vrel-* \
-+	| mips64orion-* | mips64orionel-* \
-+	| mips64vr4100-* | mips64vr4100el-* \
-+	| mips64vr4300-* | mips64vr4300el-* \
-+	| mips64vr5000-* | mips64vr5000el-* \
-+	| mipsisa32-* | mipsisa32el-* \
-+	| mipsisa32r2-* | mipsisa32r2el-* \
-+	| mipsisa64-* | mipsisa64el-* \
-+	| mipsisa64r2-* | mipsisa64r2el-* \
-+	| mipsisa64sb1-* | mipsisa64sb1el-* \
-+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-+	| mipstx39-* | mipstx39el-* \
-+	| mmix-* \
-+	| msp430-* \
-+	| none-* | np1-* | ns16k-* | ns32k-* \
-+	| orion-* \
-+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-+	| pyramid-* \
-+	| romp-* | rs6000-* \
-+	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-+	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-+	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-+	| tahoe-* | thumb-* \
-+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+	| tron-* \
-+	| v850-* | v850e-* | vax-* \
-+	| we32k-* \
-+	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-+	| xstormy16-* | xtensa-* \
-+	| ymp-* \
-+	| z8k-*)
- 		;;
- 	# Recognize the various machine names and aliases which stand
- 	# for a CPU type and a company and sometimes even an OS.
-+	386bsd)
-+		basic_machine=i386-unknown
-+		os=-bsd
-+		;;
- 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
- 		basic_machine=m68000-att
- 		;;
- 	3b*)
- 		basic_machine=we32k-att
- 		;;
-+	a29khif)
-+		basic_machine=a29k-amd
-+		os=-udi
-+		;;
-+    	abacus)
-+		basic_machine=abacus-unknown
-+		;;
-+	adobe68k)
-+		basic_machine=m68010-adobe
-+		os=-scout
-+		;;
- 	alliant | fx80)
- 		basic_machine=fx80-alliant
- 		;;
-@@ -197,25 +381,35 @@
- 		basic_machine=a29k-none
- 		os=-bsd
- 		;;
-+	amd64)
-+		basic_machine=x86_64-pc
-+		;;
-+	amd64-*)
-+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
- 	amdahl)
- 		basic_machine=580-amdahl
- 		os=-sysv
- 		;;
- 	amiga | amiga-*)
--		basic_machine=m68k-cbm
-+		basic_machine=m68k-unknown
- 		;;
--	amigados)
--		basic_machine=m68k-cbm
--		os=-amigados
-+	amigaos | amigados)
-+		basic_machine=m68k-unknown
-+		os=-amigaos
- 		;;
- 	amigaunix | amix)
--		basic_machine=m68k-cbm
-+		basic_machine=m68k-unknown
- 		os=-sysv4
- 		;;
- 	apollo68)
- 		basic_machine=m68k-apollo
- 		os=-sysv
- 		;;
-+	apollo68bsd)
-+		basic_machine=m68k-apollo
-+		os=-bsd
-+		;;
- 	aux)
- 		basic_machine=m68k-apple
- 		os=-aux
-@@ -224,6 +418,10 @@
- 		basic_machine=ns32k-sequent
- 		os=-dynix
- 		;;
-+	c90)
-+		basic_machine=c90-cray
-+		os=-unicos
-+		;;
- 	convex-c1)
- 		basic_machine=c1-convex
- 		os=-bsd
-@@ -244,27 +442,45 @@
- 		basic_machine=c38-convex
- 		os=-bsd
- 		;;
--	cray | ymp)
--		basic_machine=ymp-cray
--		os=-unicos
--		;;
--	cray2)
--		basic_machine=cray2-cray
-+	cray | j90)
-+		basic_machine=j90-cray
- 		os=-unicos
- 		;;
--	[ctj]90-cray)
--		basic_machine=c90-cray
--		os=-unicos
-+	craynv)
-+		basic_machine=craynv-cray
-+		os=-unicosmp
-+		;;
-+	cr16c)
-+		basic_machine=cr16c-unknown
-+		os=-elf
- 		;;
- 	crds | unos)
- 		basic_machine=m68k-crds
- 		;;
-+	crisv32 | crisv32-* | etraxfs*)
-+		basic_machine=crisv32-axis
-+		;;
-+	cris | cris-* | etrax*)
-+		basic_machine=cris-axis
-+		;;
-+	crx)
-+		basic_machine=crx-unknown
-+		os=-elf
-+		;;
- 	da30 | da30-*)
- 		basic_machine=m68k-da30
- 		;;
- 	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
- 		basic_machine=mips-dec
- 		;;
-+	decsystem10* | dec10*)
-+		basic_machine=pdp10-dec
-+		os=-tops10
-+		;;
-+	decsystem20* | dec20*)
-+		basic_machine=pdp10-dec
-+		os=-tops20
-+		;;
- 	delta | 3300 | motorola-3300 | motorola-delta \
- 	      | 3300-motorola | delta-motorola)
- 		basic_machine=m68k-motorola
-@@ -273,6 +489,10 @@
- 		basic_machine=m88k-motorola
- 		os=-sysv3
- 		;;
-+	djgpp)
-+		basic_machine=i586-pc
-+		os=-msdosdjgpp
-+		;;
- 	dpx20 | dpx20-*)
- 		basic_machine=rs6000-bull
- 		os=-bosx
-@@ -292,6 +512,10 @@
- 	encore | umax | mmax)
- 		basic_machine=ns32k-encore
- 		;;
-+	es1800 | OSE68k | ose68k | ose | OSE)
-+		basic_machine=m68k-ericsson
-+		os=-ose
-+		;;
- 	fx2800)
- 		basic_machine=i860-alliant
- 		;;
-@@ -302,6 +526,10 @@
- 		basic_machine=tron-gmicro
- 		os=-sysv
- 		;;
-+	go32)
-+		basic_machine=i386-pc
-+		os=-go32
-+		;;
- 	h3050r* | hiux*)
- 		basic_machine=hppa1.1-hitachi
- 		os=-hiuxwe2
-@@ -310,6 +538,14 @@
- 		basic_machine=h8300-hitachi
- 		os=-hms
- 		;;
-+	h8300xray)
-+		basic_machine=h8300-hitachi
-+		os=-xray
-+		;;
-+	h8500hms)
-+		basic_machine=h8500-hitachi
-+		os=-hms
-+		;;
- 	harris)
- 		basic_machine=m88k-harris
- 		os=-sysv3
-@@ -325,13 +561,30 @@
- 		basic_machine=m68k-hp
- 		os=-hpux
- 		;;
-+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-+		basic_machine=hppa1.0-hp
-+		;;
- 	hp9k2[0-9][0-9] | hp9k31[0-9])
- 		basic_machine=m68000-hp
- 		;;
- 	hp9k3[2-9][0-9])
- 		basic_machine=m68k-hp
- 		;;
--	hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
-+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-+		basic_machine=hppa1.0-hp
-+		;;
-+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-+		basic_machine=hppa1.1-hp
-+		;;
-+	hp9k78[0-9] | hp78[0-9])
-+		# FIXME: really hppa2.0-hp
-+		basic_machine=hppa1.1-hp
-+		;;
-+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-+		# FIXME: really hppa2.0-hp
-+		basic_machine=hppa1.1-hp
-+		;;
-+	hp9k8[0-9][13679] | hp8[0-9][13679])
- 		basic_machine=hppa1.1-hp
- 		;;
- 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-@@ -340,27 +593,42 @@
- 	hppa-next)
- 		os=-nextstep3
- 		;;
-+	hppaosf)
-+		basic_machine=hppa1.1-hp
-+		os=-osf
-+		;;
-+	hppro)
-+		basic_machine=hppa1.1-hp
-+		os=-proelf
-+		;;
- 	i370-ibm* | ibm*)
- 		basic_machine=i370-ibm
--		os=-mvs
- 		;;
- # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
--	i[3456]86v32)
-+	i*86v32)
- 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- 		os=-sysv32
- 		;;
--	i[3456]86v4*)
-+	i*86v4*)
- 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- 		os=-sysv4
- 		;;
--	i[3456]86v)
-+	i*86v)
- 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- 		os=-sysv
- 		;;
--	i[3456]86sol2)
-+	i*86sol2)
- 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
- 		os=-solaris2
- 		;;
-+	i386mach)
-+		basic_machine=i386-mach
-+		os=-mach
-+		;;
-+	i386-vsta | vsta)
-+		basic_machine=i386-unknown
-+		os=-vsta
-+		;;
- 	iris | iris4d)
- 		basic_machine=mips-sgi
- 		case $os in
-@@ -386,19 +654,51 @@
- 		basic_machine=ns32k-utek
- 		os=-sysv
- 		;;
-+	mingw32)
-+		basic_machine=i386-pc
-+		os=-mingw32
-+		;;
- 	miniframe)
- 		basic_machine=m68000-convergent
- 		;;
-+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-+		basic_machine=m68k-atari
-+		os=-mint
-+		;;
- 	mips3*-*)
- 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
- 		;;
- 	mips3*)
- 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
- 		;;
-+	monitor)
-+		basic_machine=m68k-rom68k
-+		os=-coff
-+		;;
-+	morphos)
-+		basic_machine=powerpc-unknown
-+		os=-morphos
-+		;;
-+	msdos)
-+		basic_machine=i386-pc
-+		os=-msdos
-+		;;
-+	mvs)
-+		basic_machine=i370-ibm
-+		os=-mvs
-+		;;
- 	ncr3000)
- 		basic_machine=i486-ncr
- 		os=-sysv4
- 		;;
-+	netbsd386)
-+		basic_machine=i386-unknown
-+		os=-netbsd
-+		;;
-+	netwinder)
-+		basic_machine=armv4l-rebel
-+		os=-linux
-+		;;
- 	news | news700 | news800 | news900)
- 		basic_machine=m68k-sony
- 		os=-newsos
-@@ -411,6 +711,10 @@
- 		basic_machine=mips-sony
- 		os=-newsos
- 		;;
-+	necv70)
-+		basic_machine=v70-nec
-+		os=-sysv
-+		;;
- 	next | m*-next )
- 		basic_machine=m68k-next
- 		case $os in
-@@ -436,9 +740,40 @@
- 		basic_machine=i960-intel
- 		os=-nindy
- 		;;
-+	mon960)
-+		basic_machine=i960-intel
-+		os=-mon960
-+		;;
-+	nonstopux)
-+		basic_machine=mips-compaq
-+		os=-nonstopux
-+		;;
- 	np1)
- 		basic_machine=np1-gould
- 		;;
-+	nsr-tandem)
-+		basic_machine=nsr-tandem
-+		;;
-+	op50n-* | op60c-*)
-+		basic_machine=hppa1.1-oki
-+		os=-proelf
-+		;;
-+	or32 | or32-*)
-+		basic_machine=or32-unknown
-+		os=-coff
-+		;;
-+	os400)
-+		basic_machine=powerpc-ibm
-+		os=-os400
-+		;;
-+	OSE68000 | ose68000)
-+		basic_machine=m68000-ericsson
-+		os=-ose
-+		;;
-+	os68k)
-+		basic_machine=m68k-none
-+		os=-os68k
-+		;;
- 	pa-hitachi)
- 		basic_machine=hppa1.1-hitachi
- 		os=-hiuxwe2
-@@ -453,53 +788,95 @@
- 	pbb)
- 		basic_machine=m68k-tti
- 		;;
--        pc532 | pc532-*)
-+	pc532 | pc532-*)
- 		basic_machine=ns32k-pc532
- 		;;
--	pentium | p5)
--		basic_machine=i586-intel
-+	pentium | p5 | k5 | k6 | nexgen | viac3)
-+		basic_machine=i586-pc
-+		;;
-+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-+		basic_machine=i686-pc
-+		;;
-+	pentiumii | pentium2 | pentiumiii | pentium3)
-+		basic_machine=i686-pc
- 		;;
--	pentiumpro | p6)
--		basic_machine=i686-intel
-+	pentium4)
-+		basic_machine=i786-pc
- 		;;
--	pentium-* | p5-*)
-+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
- 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
--	pentiumpro-* | p6-*)
-+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
- 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
--	k5)
--		# We don't have specific support for AMD's K5 yet, so just call it a Pentium
--		basic_machine=i586-amd
--		;;
--	nexen)
--		# We don't have specific support for Nexgen yet, so just call it a Pentium
--		basic_machine=i586-nexgen
-+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	pentium4-*)
-+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
- 	pn)
- 		basic_machine=pn-gould
- 		;;
--	power)	basic_machine=rs6000-ibm
-+	power)	basic_machine=power-ibm
- 		;;
- 	ppc)	basic_machine=powerpc-unknown
--	        ;;
-+		;;
- 	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
- 	ppcle | powerpclittle | ppc-le | powerpc-little)
- 		basic_machine=powerpcle-unknown
--	        ;;
-+		;;
- 	ppcle-* | powerpclittle-*)
- 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
-+	ppc64)	basic_machine=powerpc64-unknown
-+		;;
-+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-+		basic_machine=powerpc64le-unknown
-+		;;
-+	ppc64le-* | powerpc64little-*)
-+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
- 	ps2)
- 		basic_machine=i386-ibm
- 		;;
-+	pw32)
-+		basic_machine=i586-unknown
-+		os=-pw32
-+		;;
-+	rom68k)
-+		basic_machine=m68k-rom68k
-+		os=-coff
-+		;;
- 	rm[46]00)
- 		basic_machine=mips-siemens
- 		;;
- 	rtpc | rtpc-*)
- 		basic_machine=romp-ibm
- 		;;
-+	s390 | s390-*)
-+		basic_machine=s390-ibm
-+		;;
-+	s390x | s390x-*)
-+		basic_machine=s390x-ibm
-+		;;
-+	sa29200)
-+		basic_machine=a29k-amd
-+		os=-udi
-+		;;
-+	sb1)
-+		basic_machine=mipsisa64sb1-unknown
-+		;;
-+	sb1el)
-+		basic_machine=mipsisa64sb1el-unknown
-+		;;
-+	sei)
-+		basic_machine=mips-sei
-+		os=-seiux
-+		;;
- 	sequent)
- 		basic_machine=i386-sequent
- 		;;
-@@ -507,6 +884,13 @@
- 		basic_machine=sh-hitachi
- 		os=-hms
- 		;;
-+	sh64)
-+		basic_machine=sh64-unknown
-+		;;
-+	sparclite-wrs | simso-wrs)
-+		basic_machine=sparclite-wrs
-+		os=-vxworks
-+		;;
- 	sps7)
- 		basic_machine=m68k-bull
- 		os=-sysv2
-@@ -514,6 +898,13 @@
- 	spur)
- 		basic_machine=spur-unknown
- 		;;
-+	st2000)
-+		basic_machine=m68k-tandem
-+		;;
-+	stratus)
-+		basic_machine=i860-stratus
-+		os=-sysv4
-+		;;
- 	sun2)
- 		basic_machine=m68000-sun
- 		;;
-@@ -554,13 +945,51 @@
- 	sun386 | sun386i | roadrunner)
- 		basic_machine=i386-sun
- 		;;
-+	sv1)
-+		basic_machine=sv1-cray
-+		os=-unicos
-+		;;
- 	symmetry)
- 		basic_machine=i386-sequent
- 		os=-dynix
- 		;;
-+	t3e)
-+		basic_machine=alphaev5-cray
-+		os=-unicos
-+		;;
-+	t90)
-+		basic_machine=t90-cray
-+		os=-unicos
-+		;;
-+	tic54x | c54x*)
-+		basic_machine=tic54x-unknown
-+		os=-coff
-+		;;
-+	tic55x | c55x*)
-+		basic_machine=tic55x-unknown
-+		os=-coff
-+		;;
-+	tic6x | c6x*)
-+		basic_machine=tic6x-unknown
-+		os=-coff
-+		;;
-+	tx39)
-+		basic_machine=mipstx39-unknown
-+		;;
-+	tx39el)
-+		basic_machine=mipstx39el-unknown
-+		;;
-+	toad1)
-+		basic_machine=pdp10-xkl
-+		os=-tops20
-+		;;
- 	tower | tower-32)
- 		basic_machine=m68k-ncr
- 		;;
-+	tpf)
-+		basic_machine=s390x-ibm
-+		os=-tpf
-+		;;
- 	udi29k)
- 		basic_machine=a29k-amd
- 		os=-udi
-@@ -569,6 +998,10 @@
- 		basic_machine=a29k-nyu
- 		os=-sym1
- 		;;
-+	v810 | necv810)
-+		basic_machine=v810-nec
-+		os=-none
-+		;;
- 	vaxv)
- 		basic_machine=vax-dec
- 		os=-sysv
-@@ -577,6 +1010,9 @@
- 		basic_machine=vax-dec
- 		os=-vms
- 		;;
-+	vpp*|vx|vx-*)
-+		basic_machine=f301-fujitsu
-+		;;
- 	vxworks960)
- 		basic_machine=i960-wrs
- 		os=-vxworks
-@@ -589,13 +1025,29 @@
- 		basic_machine=a29k-wrs
- 		os=-vxworks
- 		;;
--	xmp)
--		basic_machine=xmp-cray
--		os=-unicos
-+	w65*)
-+		basic_machine=w65-wdc
-+		os=-none
-+		;;
-+	w89k-*)
-+		basic_machine=hppa1.1-winbond
-+		os=-proelf
-+		;;
-+	xbox)
-+		basic_machine=i686-pc
-+		os=-mingw32
- 		;;
--        xps | xps100)
-+	xps | xps100)
- 		basic_machine=xps100-honeywell
- 		;;
-+	ymp)
-+		basic_machine=ymp-cray
-+		os=-unicos
-+		;;
-+	z8k-*-coff)
-+		basic_machine=z8k-unknown
-+		os=-sim
-+		;;
- 	none)
- 		basic_machine=none-none
- 		os=-none
-@@ -603,28 +1055,47 @@
- 
- # Here we handle the default manufacturer of certain CPU types.  It is in
- # some cases the only manufacturer, in others, it is the most popular.
--	mips)
--		basic_machine=mips-mips
-+	w89k)
-+		basic_machine=hppa1.1-winbond
-+		;;
-+	op50n)
-+		basic_machine=hppa1.1-oki
-+		;;
-+	op60c)
-+		basic_machine=hppa1.1-oki
- 		;;
- 	romp)
- 		basic_machine=romp-ibm
- 		;;
-+	mmix)
-+		basic_machine=mmix-knuth
-+		;;
- 	rs6000)
- 		basic_machine=rs6000-ibm
- 		;;
- 	vax)
- 		basic_machine=vax-dec
- 		;;
-+	pdp10)
-+		# there are many clones, so DEC is not a safe bet
-+		basic_machine=pdp10-unknown
-+		;;
- 	pdp11)
- 		basic_machine=pdp11-dec
- 		;;
- 	we32k)
- 		basic_machine=we32k-att
- 		;;
--	sparc)
-+	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
-+		basic_machine=sh-unknown
-+		;;
-+	sh64)
-+		basic_machine=sh64-unknown
-+		;;
-+	sparc | sparcv8 | sparcv9 | sparcv9b)
- 		basic_machine=sparc-sun
- 		;;
--        cydra)
-+	cydra)
- 		basic_machine=cydra-cydrome
- 		;;
- 	orion)
-@@ -633,6 +1104,15 @@
- 	orion105)
- 		basic_machine=clipper-highlevel
- 		;;
-+	mac | mpw | mac-mpw)
-+		basic_machine=m68k-apple
-+		;;
-+	pmac | pmac-mpw)
-+		basic_machine=powerpc-apple
-+		;;
-+	*-unknown)
-+		# Make sure to match an already-canonicalized machine name.
-+		;;
- 	*)
- 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
- 		exit 1
-@@ -665,9 +1145,12 @@
- 	-solaris)
- 		os=-solaris2
- 		;;
--	-unixware* | svr4*)
-+	-svr4*)
- 		os=-sysv4
- 		;;
-+	-unixware*)
-+		os=-sysv4.2uw
-+		;;
- 	-gnu/linux*)
- 		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
- 		;;
-@@ -678,17 +1161,50 @@
- 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
--	      | -amigados* | -msdos* | -newsos* | -unicos* | -aof* | -aos* \
-+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-+	      | -aos* \
- 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
--	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
--	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
-+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
--	      | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
--	      | -linux-gnu*)
-+	      | -chorusos* | -chorusrdb* \
-+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-+	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
-+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
-+	-qnx*)
-+		case $basic_machine in
-+		    x86-* | i*86-*)
-+			;;
-+		    *)
-+			os=-nto$os
-+			;;
-+		esac
-+		;;
-+	-nto-qnx*)
-+		;;
-+	-nto*)
-+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-+		;;
-+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-+		;;
-+	-mac*)
-+		os=`echo $os | sed -e 's|mac|macos|'`
-+		;;
-+	-linux-dietlibc)
-+		os=-linux-dietlibc
-+		;;
- 	-linux*)
- 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
- 		;;
-@@ -698,6 +1214,15 @@
- 	-sunos6*)
- 		os=`echo $os | sed -e 's|sunos6|solaris3|'`
- 		;;
-+	-opened*)
-+		os=-openedition
-+		;;
-+        -os400*)
-+		os=-os400
-+		;;
-+	-wince*)
-+		os=-wince
-+		;;
- 	-osfrose*)
- 		os=-osfrose
- 		;;
-@@ -713,11 +1238,26 @@
- 	-acis*)
- 		os=-aos
- 		;;
-+	-atheos*)
-+		os=-atheos
-+		;;
-+	-syllable*)
-+		os=-syllable
-+		;;
-+	-386bsd)
-+		os=-bsd
-+		;;
- 	-ctix* | -uts*)
- 		os=-sysv
- 		;;
-+	-nova*)
-+		os=-rtmk-nova
-+		;;
- 	-ns2 )
--	        os=-nextstep2
-+		os=-nextstep2
-+		;;
-+	-nsk*)
-+		os=-nsk
- 		;;
- 	# Preserve the version number of sinix5.
- 	-sinix5.*)
-@@ -726,6 +1266,9 @@
- 	-sinix*)
- 		os=-sysv4
- 		;;
-+        -tpf*)
-+		os=-tpf
-+		;;
- 	-triton*)
- 		os=-sysv3
- 		;;
-@@ -744,9 +1287,27 @@
- 	# This must come after -sysvr4.
- 	-sysv*)
- 		;;
-+	-ose*)
-+		os=-ose
-+		;;
-+	-es1800*)
-+		os=-ose
-+		;;
- 	-xenix)
- 		os=-xenix
- 		;;
-+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-+		os=-mint
-+		;;
-+	-aros*)
-+		os=-aros
-+		;;
-+	-kaos*)
-+		os=-kaos
-+		;;
-+	-zvmoe)
-+		os=-zvmoe
-+		;;
- 	-none)
- 		;;
- 	*)
-@@ -772,10 +1333,20 @@
- 	*-acorn)
- 		os=-riscix1.2
- 		;;
-+	arm*-rebel)
-+		os=-linux
-+		;;
- 	arm*-semi)
- 		os=-aout
- 		;;
--        pdp11-*)
-+    c4x-* | tic4x-*)
-+        os=-coff
-+        ;;
-+	# This must come before the *-dec entry.
-+	pdp10-*)
-+		os=-tops20
-+		;;
-+	pdp11-*)
- 		os=-none
- 		;;
- 	*-dec | vax-*)
-@@ -793,15 +1364,42 @@
- 		# default.
- 		# os=-sunos4
- 		;;
-+	m68*-cisco)
-+		os=-aout
-+		;;
-+	mips*-cisco)
-+		os=-elf
-+		;;
-+	mips*-*)
-+		os=-elf
-+		;;
-+	or32-*)
-+		os=-coff
-+		;;
- 	*-tti)	# must be before sparc entry or we get the wrong os.
- 		os=-sysv3
- 		;;
- 	sparc-* | *-sun)
- 		os=-sunos4.1.1
- 		;;
-+	*-be)
-+		os=-beos
-+		;;
- 	*-ibm)
- 		os=-aix
- 		;;
-+    	*-knuth)
-+		os=-mmixware
-+		;;
-+	*-wec)
-+		os=-proelf
-+		;;
-+	*-winbond)
-+		os=-proelf
-+		;;
-+	*-oki)
-+		os=-proelf
-+		;;
- 	*-hp)
- 		os=-hpux
- 		;;
-@@ -812,7 +1410,7 @@
- 		os=-sysv
- 		;;
- 	*-cbm)
--		os=-amigados
-+		os=-amigaos
- 		;;
- 	*-dg)
- 		os=-dgux
-@@ -844,24 +1442,39 @@
- 	*-next)
- 		os=-nextstep3
- 		;;
--        *-gould)
-+	*-gould)
- 		os=-sysv
- 		;;
--        *-highlevel)
-+	*-highlevel)
- 		os=-bsd
- 		;;
- 	*-encore)
- 		os=-bsd
- 		;;
--        *-sgi)
-+	*-sgi)
- 		os=-irix
- 		;;
--        *-siemens)
-+	*-siemens)
- 		os=-sysv4
- 		;;
- 	*-masscomp)
- 		os=-rtu
- 		;;
-+	f30[01]-fujitsu | f700-fujitsu)
-+		os=-uxpv
-+		;;
-+	*-rom68k)
-+		os=-coff
-+		;;
-+	*-*bug)
-+		os=-coff
-+		;;
-+	*-apple)
-+		os=-macos
-+		;;
-+	*-atari*)
-+		os=-mint
-+		;;
- 	*)
- 		os=-none
- 		;;
-@@ -883,9 +1496,15 @@
- 			-aix*)
- 				vendor=ibm
- 				;;
-+			-beos*)
-+				vendor=be
-+				;;
- 			-hpux*)
- 				vendor=hp
- 				;;
-+			-mpeix*)
-+				vendor=hp
-+				;;
- 			-hiux*)
- 				vendor=hitachi
- 				;;
-@@ -901,21 +1520,47 @@
- 			-genix*)
- 				vendor=ns
- 				;;
--			-mvs*)
-+			-mvs* | -opened*)
-+				vendor=ibm
-+				;;
-+			-os400*)
- 				vendor=ibm
- 				;;
- 			-ptx*)
- 				vendor=sequent
- 				;;
--			-vxsim* | -vxworks*)
-+			-tpf*)
-+				vendor=ibm
-+				;;
-+			-vxsim* | -vxworks* | -windiss*)
- 				vendor=wrs
- 				;;
- 			-aux*)
- 				vendor=apple
- 				;;
-+			-hms*)
-+				vendor=hitachi
-+				;;
-+			-mpw* | -macos*)
-+				vendor=apple
-+				;;
-+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-+				vendor=atari
-+				;;
-+			-vos*)
-+				vendor=stratus
-+				;;
- 		esac
- 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
- 		;;
- esac
- 
- echo $basic_machine$os
-+exit 0
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "timestamp='"
-+# time-stamp-format: "%:y-%02m-%02d"
-+# time-stamp-end: "'"
-+# End:
Index: tches/expect-5.43.0-spawn-2.patch
===================================================================
--- patches/expect-5.43.0-spawn-2.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,221 +1,0 @@
-Submitted By:            LFS Book <lfs-book@linuxfromscratch.org>
-Date:                    2005-02-27 (originally submitted 2003-10-05)
-Initial Package Version: 5.38
-Origin:                  Redhat RPM (Patch by HJ Lu); rediffed by Randy McMurchy
-Description:             NA
-
-$LastChangedBy: randy $
-$Date: 2005-03-24 21:05:48 -0700 (Thu, 24 Mar 2005) $
-
-diff -Naur expect-5.43-orig/exp_chan.c expect-5.43/exp_chan.c
---- expect-5.43-orig/exp_chan.c	2005-02-08 02:01:20.000000000 +0000
-+++ expect-5.43/exp_chan.c	2005-02-27 15:09:29.270201960 +0000
-@@ -622,6 +622,7 @@
-     esPtr->buffer = Tcl_NewStringObj("",0);
-     Tcl_IncrRefCount(esPtr->buffer);
-     esPtr->umsize = exp_default_match_max;
-+    esPtr->umsize_changed = exp_default_match_max_changed;
-     /* this will reallocate object with an appropriate sized buffer */
-     expAdjust(esPtr);
- 
-diff -Naur expect-5.43-orig/exp_command.h expect-5.43/exp_command.h
---- expect-5.43-orig/exp_command.h	2004-07-30 15:35:28.000000000 +0000
-+++ expect-5.43/exp_command.h	2005-02-27 15:09:29.272201656 +0000
-@@ -30,6 +30,7 @@
- EXTERN char *		exp_get_var _ANSI_ARGS_((Tcl_Interp *,char *));
- 
- EXTERN int exp_default_match_max;
-+EXTERN int exp_default_match_max_changed;
- EXTERN int exp_default_parity;
- EXTERN int exp_default_rm_nulls;
- EXTERN int exp_default_close_on_eof;
-@@ -103,6 +104,7 @@
-     int msize;	        /* # of bytes that buffer can hold (max) */
-     int umsize;	        /* # of bytes (min) that is guaranteed to match */
- 			/* this comes from match_max command */
-+    int umsize_changed;	/* is umsize changed by user?  */
-     int printed;	/* # of bytes written to stdout (if logging on) */
-                         /* but not actually returned via a match yet */
-     int echoed;	        /* additional # of bytes (beyond "printed" above) */
-diff -Naur expect-5.43-orig/expect.c expect-5.43/expect.c
---- expect-5.43-orig/expect.c	2004-07-06 23:26:02.000000000 +0000
-+++ expect-5.43/expect.c	2005-02-27 15:09:29.279200592 +0000
-@@ -41,8 +41,17 @@
- #include "tcldbg.h"
- #endif
- 
-+/* The initial length is 2000. We increment it by 2000. The maximum
-+   is 8MB (0x800000).  */
-+#define EXP_MATCH_MAX		2000
-+#define EXP_MATCH_INC		2000
-+#define EXP_MATCH_STEP_LIMIT	0x700000
-+#define EXP_MATCH_LIMIT		0x800000
-+#define EXP_MATCH_LIMIT_QUOTE	"0x800000"
-+
- /* initial length of strings that we can guarantee patterns can match */
--int exp_default_match_max =	2000;
-+int exp_default_match_max =	EXP_MATCH_MAX;
-+int exp_default_match_max_changed = 0;
- #define INIT_EXPECT_TIMEOUT_LIT	"10"	/* seconds */
- #define INIT_EXPECT_TIMEOUT	10	/* seconds */
- int exp_default_parity =	TRUE;
-@@ -1619,6 +1628,76 @@
-     return newsize;
- }
- 
-+/* returns # of bytes until we see a newline at the end or EOF.  */
-+/*ARGSUSED*/
-+static int
-+expReadNewLine(interp,esPtr,save_flags) /* INTL */
-+Tcl_Interp *interp;
-+ExpState *esPtr;
-+int save_flags;
-+{
-+    int size;
-+    int exp_size;
-+    int full_size;
-+    int count;
-+    char *str;
-+
-+    count = 0;
-+    for (;;) {
-+	exp_size = expSizeGet(esPtr);
-+
-+	/* When we reach the limit, we will only read one char at a
-+	   time.  */
-+	if (esPtr->umsize >= EXP_MATCH_STEP_LIMIT)
-+	    size = TCL_UTF_MAX;
-+	else
-+	    size = exp_size;
-+
-+	if (exp_size + TCL_UTF_MAX >= esPtr->msize) {
-+	    if (esPtr->umsize >= EXP_MATCH_LIMIT) {
-+		expDiagLogU("WARNING: interact buffer is full. probably your program\r\n");
-+		expDiagLogU("is not interactive or has a very long output line. The\r\n");
-+		expDiagLogU("current limit is " EXP_MATCH_LIMIT_QUOTE ".\r\n");
-+		expDiagLogU("Dumping first half of buffer in order to continue\r\n");
-+		expDiagLogU("Recommend you enlarge the buffer.\r\n");
-+		exp_buffer_shuffle(interp,esPtr,save_flags,EXPECT_OUT,"expect");
-+		return count;
-+	    }
-+	    else {
-+		esPtr->umsize += EXP_MATCH_INC;
-+		expAdjust(esPtr);
-+	    }
-+	}
-+
-+	full_size = esPtr->msize - (size / TCL_UTF_MAX);
-+	size = Tcl_ReadChars(esPtr->channel,
-+			esPtr->buffer,
-+			full_size,
-+			1 /* append */);
-+	if (size > 0) {
-+	    count += size;
-+	    /* We try again if there are more to read and we haven't
-+	       seen a newline at the end. */
-+	    if (size == full_size) {
-+		str = Tcl_GetStringFromObj(esPtr->buffer, &size);
-+		if (str[size - 1] != '\n')
-+		    continue;
-+	    }
-+	}
-+	else {
-+	    /* It is even trickier. We got an error from read. We have
-+	       to recover from it. Let's make sure the size of
-+	       buffer is correct. It can be corrupted. */
-+	    str = Tcl_GetString(esPtr->buffer);
-+	    Tcl_SetObjLength(esPtr->buffer, strlen(str));
-+	}
-+
-+	break;
-+    }
-+
-+    return count;
-+}
-+
- /* returns # of bytes read or (non-positive) error of form EXP_XXX */
- /* returns 0 for end of file */
- /* If timeout is non-zero, set an alarm before doing the read, else assume */
-@@ -1633,6 +1712,8 @@
- {
-     int cc = EXP_TIMEOUT;
-     int size = expSizeGet(esPtr);
-+    int full_size;
-+    int count;
- 
-     if (size + TCL_UTF_MAX >= esPtr->msize) 
- 	exp_buffer_shuffle(interp,esPtr,save_flags,EXPECT_OUT,"expect");
-@@ -1649,11 +1730,43 @@
-     }
- #endif
- 
--    
-+    /* FIXME: If we ask less than what is available in the tcl buffer
-+       when tcl has seen EOF, we will throw away the remaining data
-+       since the next read will get EOF. Since expect is line-oriented,
-+       we exand our buffer to get EOF or the next newline at the end of
-+       the input buffer. I don't know if it is the right fix.  H.J. */
-+    count = 0;
-+    full_size = esPtr->msize - (size / TCL_UTF_MAX);
-     cc = Tcl_ReadChars(esPtr->channel,
--	    esPtr->buffer,
--	    esPtr->msize - (size / TCL_UTF_MAX),
--	    1 /* append */);
-+		esPtr->buffer,
-+		full_size,
-+		1 /* append */);
-+    if (cc > 0) {
-+	count += cc;
-+	/* It gets very tricky. There are more to read. We will expand
-+	   our buffer and get EOF or a newline at the end unless the
-+	   buffer length has been changed.  */
-+	if (cc == full_size) {
-+	    char *str;
-+	    str = Tcl_GetStringFromObj(esPtr->buffer, &size);
-+	    if (str[size - 1] != '\n') {
-+		if (esPtr->umsize_changed) {
-+		    char buf[20];	/* big enough for 64bit int in hex.  */
-+		    snprintf(buf,sizeof(buf),"0x%x", esPtr->umsize);
-+		    expDiagLogU("WARNING: interact buffer is not large enough to hold\r\n");
-+		    expDiagLogU("all output. probably your program is not interactive or\r\n");
-+		    expDiagLogU("has a very long output line. The current limit is ");
-+		    expDiagLogU(buf);
-+		    expDiagLogU(".\r\n");
-+		}
-+		else {
-+		    cc = expReadNewLine(interp,esPtr,save_flags);
-+		    if (cc > 0)
-+			count += cc;
-+		}
-+	    }
-+	}
-+    }
-     i_read_errno = errno;
- 
- #ifdef SIMPLE_EVENT
-@@ -1674,7 +1787,7 @@
- 	}
-     }
- #endif
--    return cc;	
-+    return count > 0 ? count : cc;
- }
- 
- /*
-@@ -2751,8 +2864,14 @@
- 	return(TCL_ERROR);
-     }
- 
--    if (Default) exp_default_match_max = size;
--    else esPtr->umsize = size;
-+    if (Default) {
-+	exp_default_match_max = size;
-+	exp_default_match_max_changed = 1;
-+    }
-+    else {
-+	esPtr->umsize = size;
-+	esPtr->umsize_changed = 1;
-+    }
- 
-     return(TCL_OK);
- }
Index: patches/flex-2.5.31-debian_fixes-2.patch
===================================================================
--- patches/flex-2.5.31-debian_fixes-2.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/flex-2.5.31-debian_fixes-2.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,263 @@
+Submitted By: Zack Winkles <winkie@linuxfromscratch.org>
+Date: 2004-03-01
+Initial Package Version: 2.5.31
+Origin: Debian
+Description: This fixes a ton of things. I'm not entirely sure what, but
+	it's all stuff that Debian thought to be broken, and I trust them.
+	All the non-code changes have been stripped (otherwise it would
+	be gargantuan). I've been using this patch for a few months now
+	and it makes flex not suck anymore. That's a good thing.
+
+diff -Naur flex-2.5.31.orig/filter.c flex-2.5.31/filter.c
+--- flex-2.5.31.orig/filter.c	2003-03-25 11:39:08.000000000 -0500
++++ flex-2.5.31/filter.c	2004-03-01 23:14:28.868777672 -0500
+@@ -157,11 +157,15 @@
+ 		if (chain->filter_func) {
+ 			int     r;
+ 
+-			/* setup streams again */
++			/* setup streams again  -- Removed. POSIX states that children inherit
++			   open streams in the parent. Also, ANSI C99 states that the stdin
++				 and stdout macors need not be modified lvalues; so this code is 
++				 broken in the first place.
+ 			if ((stdin = fdopen (0, "r")) == NULL)
+ 				flexfatal (_("fdopen(0) failed"));
+ 			if ((stdout = fdopen (1, "w")) == NULL)
+ 				flexfatal (_("fdopen(1) failed"));
++      */
+ 
+ 			if ((r = chain->filter_func (chain)) == -1)
+ 				flexfatal (_("filter_func failed"));
+@@ -181,9 +185,11 @@
+ 	if (dup2 (pipes[1], 1) == -1)
+ 		flexfatal (_("dup2(pipes[1],1)"));
+ 	close (pipes[1]);
++	/* This is not legal; stfout does not need to be a modifiable
++	lvalue 
+ 	if ((stdout = fdopen (1, "w")) == NULL)
+ 		flexfatal (_("fdopen(1) failed"));
+-
++	*/
+ 	return true;
+ }
+ 
+diff -Naur flex-2.5.31.orig/flex.skl flex-2.5.31/flex.skl
+--- flex-2.5.31.orig/flex.skl	2003-03-31 20:51:38.000000000 -0500
++++ flex-2.5.31/flex.skl	2004-03-01 23:14:28.870777368 -0500
+@@ -27,6 +27,11 @@
+ %# Macros for runtime processing stage.
+ m4_changecom
+ m4_changequote
++
++%# Let user use our quoting strings
++m4_changequote({, })
++m4_define( {m4_userquote_start}, {m4_changequote(<, >)[[m4_changequote([[, ]])})
++m4_define( {m4_userquote_end}, {m4_changequote(<, >)]]m4_changequote([[, ]])})
+ m4_changequote([[, ]])
+ 
+ %# 
+@@ -345,19 +350,19 @@
+ %#        yyscan_t yyscanner;
+ %#
+ %# Generate traditional function defs
+-    m4_define( [[YYFARGS0]], [[(M4_YY_DEF_ONLY_ARG)
++    m4_define( [[YYFARGS0]], [[(M4_YY_DEF_ONLY_ARG) [[\]]
+         M4_YY_DECL_LAST_ARG]])
+-    m4_define( [[YYFARGS1]], [[($2 M4_YY_DEF_LAST_ARG)
+-        $1 $2;
++    m4_define( [[YYFARGS1]], [[($2 M4_YY_DEF_LAST_ARG) [[\]]
++        $1 $2; [[\]]
+         M4_YY_DECL_LAST_ARG]])
+-    m4_define( [[YYFARGS2]], [[($2,$4 M4_YY_DEF_LAST_ARG)
+-        $1 $2;
+-        $3 $4;
++    m4_define( [[YYFARGS2]], [[($2,$4 M4_YY_DEF_LAST_ARG) [[\]]
++        $1 $2; [[\]]
++        $3 $4; [[\]]
+         M4_YY_DECL_LAST_ARG]])
+-    m4_define( [[YYFARGS3]], [[($2,$4,$6 M4_YY_DEF_LAST_ARG)
+-        $1 $2;
+-        $3 $4;
+-        $5 $6;
++    m4_define( [[YYFARGS3]], [[($2,$4,$6 M4_YY_DEF_LAST_ARG) [[\]]
++        $1 $2; [[\]]
++        $3 $4; [[\]]
++        $5 $6; [[\]]
+         M4_YY_DECL_LAST_ARG]])
+ ]],
+ [[
+@@ -724,6 +729,7 @@
+ 
+ m4_ifdef( [[M4_YY_NO_UNISTD_H]],,
+ [[
++#ifndef YY_NO_UNISTD_H
+ /* Special case for "unistd.h", since it is non-ANSI. We include it way
+  * down here because we want the user's section 1 to have been scanned first.
+  * The user has a chance to override it with an option.
+@@ -734,6 +740,7 @@
+ %if-c++-only
+ #include <unistd.h>
+ %endif
++#endif
+ ]])
+ 
+ #ifndef YY_EXTRA_TYPE
+@@ -1124,9 +1131,9 @@
+     m4_dnl  The bison pure parser is used. Redefine yylex to
+     m4_dnl  accept the lval parameter.
+ 
+-    m4_define( [[M4_YY_LEX_PROTO]],
++    m4_define( [[M4_YY_LEX_PROTO]], [[\]]
+                [[M4_YY_PARAMS(YYSTYPE * yylval_param M4_YY_PROTO_LAST_ARG)]])
+-    m4_define( [[M4_YY_LEX_DECLARATION]],
++    m4_define( [[M4_YY_LEX_DECLARATION]], [[\]]
+                [[YYFARGS1(YYSTYPE *,yylval_param)]])
+ ]])
+ 
+@@ -1134,9 +1141,9 @@
+ [[
+     m4_dnl  Locations are used. yylex should also accept the ylloc parameter.
+ 
+-    m4_define( [[M4_YY_LEX_PROTO]],
++    m4_define( [[M4_YY_LEX_PROTO]], [[\]]
+                [[M4_YY_PARAMS(YYSTYPE * yylval_param, YYLTYPE * yylloc_param M4_YY_PROTO_LAST_ARG)]])
+-    m4_define( [[M4_YY_LEX_DECLARATION]],
++    m4_define( [[M4_YY_LEX_DECLARATION]], [[\]]
+                [[YYFARGS2(YYSTYPE *,yylval_param, YYLTYPE *,yylloc_param)]])
+ ]])
+ 
+@@ -2251,11 +2258,11 @@
+  * @note If you want to scan bytes that may contain NUL values, then use
+  *       yy_scan_bytes() instead.
+  */
+-YY_BUFFER_STATE yy_scan_string YYFARGS1( yyconst char *,str)
++YY_BUFFER_STATE yy_scan_string YYFARGS1( yyconst char *,yy_str)
+ {
+     m4_dnl M4_YY_DECL_GUTS_VAR();
+ 
+-	return yy_scan_bytes( str, strlen(str) M4_YY_CALL_LAST_ARG);
++	return yy_scan_bytes( yy_str, strlen(yy_str) M4_YY_CALL_LAST_ARG);
+ }
+ %endif
+ ]])
+diff -Naur flex-2.5.31.orig/gen.c flex-2.5.31/gen.c
+--- flex-2.5.31.orig/gen.c	2003-03-30 14:58:44.000000000 -0500
++++ flex-2.5.31/gen.c	2004-03-01 23:14:28.862778584 -0500
+@@ -1812,7 +1812,6 @@
+ 			if (yytext_is_array) {
+ 				if (!reentrant){
+     				indent_puts ("static int yy_more_offset = 0;");
+-                }else{
+                     indent_puts ("static int yy_prev_more_offset = 0;");
+                 }
+ 			}
+diff -Naur flex-2.5.31.orig/main.c flex-2.5.31/main.c
+--- flex-2.5.31.orig/main.c	2003-03-31 20:51:38.000000000 -0500
++++ flex-2.5.31/main.c	2004-03-01 23:14:28.863778432 -0500
+@@ -199,6 +199,7 @@
+ {
+ #if ENABLE_NLS
+ 	setlocale (LC_MESSAGES, "");
++	setlocale (LC_CTYPE, "");
+ 	textdomain (PACKAGE);
+ 	bindtextdomain (PACKAGE, LOCALEDIR);
+ #endif
+@@ -1595,7 +1596,6 @@
+ 			outn ("#else");
+ 			outn (yy_stdinit);
+ 			outn ("#endif");
+-			outn ("#endif");
+ 		}
+ 
+ 		else {
+diff -Naur flex-2.5.31.orig/scan.c flex-2.5.31/scan.c
+--- flex-2.5.31.orig/scan.c	2003-04-01 11:33:17.000000000 -0500
++++ flex-2.5.31/scan.c	2004-03-01 23:14:28.860778888 -0500
+@@ -1619,11 +1619,13 @@
+ #define LINEDIR 18
+ #define CODEBLOCK_MATCH_BRACE 19
+ 
++#ifndef YY_NO_UNISTD_H
+ /* Special case for "unistd.h", since it is non-ANSI. We include it way
+  * down here because we want the user's section 1 to have been scanned first.
+  * The user has a chance to override it with an option.
+  */
+ #include <unistd.h>
++#endif
+ 
+ #ifndef YY_EXTRA_TYPE
+ #define YY_EXTRA_TYPE void *
+diff -Naur flex-2.5.31.orig/scan.l flex-2.5.31/scan.l
+--- flex-2.5.31.orig/scan.l	2003-03-31 20:51:38.000000000 -0500
++++ flex-2.5.31/scan.l	2004-03-01 23:14:28.864778280 -0500
+@@ -194,8 +194,14 @@
+ <COMMENT>{
+ 	"*/"		ACTION_ECHO; yy_pop_state();
+ 	"*"		ACTION_ECHO;
+-	[^*\n]+		ACTION_ECHO;
+-	[^*\n]*{NL}	++linenum; ACTION_ECHO;
++	[\[\]]		ACTION_ECHO;
++	[^*\[\]\n]+	ACTION_ECHO;
++	[^*\[\]\n]*{NL}	++linenum; ACTION_ECHO;
++	\[\[		add_action("[" "[]" "]m4_" "userquote_start()");
++	\]\]		add_action("[" "[]" "]m4_" "userquote_end()");
++			/* Macros need to be clearly separated from surrounding
++			 * text and this file needs to go through flex untouched.
++			 */
+ }
+ 
+ <LINEDIR>{
+diff -Naur flex-2.5.31.orig/skel.c flex-2.5.31/skel.c
+--- flex-2.5.31.orig/skel.c	2003-04-01 11:33:08.000000000 -0500
++++ flex-2.5.31/skel.c	2004-03-01 23:14:28.867777824 -0500
+@@ -404,16 +404,16 @@
+   "%#        yyscan_t yyscanner;",
+   "%#",
+   "%# Generate traditional function defs",
+-  "    m4_define( [[YYFARGS0]], [[(M4_YY_DEF_ONLY_ARG)",
++  "    m4_define( [[YYFARGS0]], [[(M4_YY_DEF_ONLY_ARG) [[\\]]",
+   "        M4_YY_DECL_LAST_ARG]])",
+-  "    m4_define( [[YYFARGS1]], [[($2 M4_YY_DEF_LAST_ARG)",
++  "    m4_define( [[YYFARGS1]], [[($2 M4_YY_DEF_LAST_ARG) [[\\]]",
+   "        $1 $2;",
+   "        M4_YY_DECL_LAST_ARG]])",
+-  "    m4_define( [[YYFARGS2]], [[($2,$4 M4_YY_DEF_LAST_ARG)",
++  "    m4_define( [[YYFARGS2]], [[($2,$4 M4_YY_DEF_LAST_ARG) [[\\]]",
+   "        $1 $2;",
+   "        $3 $4;",
+   "        M4_YY_DECL_LAST_ARG]])",
+-  "    m4_define( [[YYFARGS3]], [[($2,$4,$6 M4_YY_DEF_LAST_ARG)",
++  "    m4_define( [[YYFARGS3]], [[($2,$4,$6 M4_YY_DEF_LAST_ARG) [[\\]]",
+   "        $1 $2;",
+   "        $3 $4;",
+   "        $5 $6;",
+@@ -783,6 +783,7 @@
+   "",
+   "m4_ifdef( [[M4_YY_NO_UNISTD_H]],,",
+   "[[",
++  "#ifndef YY_NO_UNISTD_H",
+   "/* Special case for \"unistd.h\", since it is non-ANSI. We include it way",
+   " * down here because we want the user's section 1 to have been scanned first.",
+   " * The user has a chance to override it with an option.",
+@@ -793,6 +794,7 @@
+   "%if-c++-only",
+   "#include <unistd.h>",
+   "%endif",
++  "#endif",
+   "]])",
+   "",
+   "#ifndef YY_EXTRA_TYPE",
+@@ -2454,11 +2456,11 @@
+   " * @note If you want to scan bytes that may contain NUL values, then use",
+   " *       yy_scan_bytes() instead.",
+   " */",
+-  "YY_BUFFER_STATE yy_scan_string YYFARGS1( yyconst char *,str)",
++  "YY_BUFFER_STATE yy_scan_string YYFARGS1( yyconst char *,yy_str)",
+   "{",
+   "    m4_dnl M4_YY_DECL_GUTS_VAR();",
+   "",
+-  "	return yy_scan_bytes( str, strlen(str) M4_YY_CALL_LAST_ARG);",
++  "	return yy_scan_bytes( yy_str, strlen(yy_str) M4_YY_CALL_LAST_ARG);",
+   "}",
+   "%endif",
+   "]])",
Index: patches/freetype-2.1.9-bytecode_interpreter-1.patch
===================================================================
--- patches/freetype-2.1.9-bytecode_interpreter-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/freetype-2.1.9-bytecode_interpreter-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,21 @@
+Submitted By: BLFS Book <blfs-book@linuxfromscratch.org>
+Date: 2004-02-01
+Initial Package Version: 2.1.5
+Origin: Freetype FAQ
+Description: Enables bytecode interpreter for TT driver.
+
+$LastChangedBy: bdubbs $
+$Date: 2004-08-07 18:56:30 -0600 (Sat, 07 Aug 2004) $
+
+diff -ur freetype-2.1.5.orig/include/freetype/config/ftoption.h freetype-2.1.5/include/freetype/config/ftoption.h
+--- freetype-2.1.5.orig/include/freetype/config/ftoption.h	2004-02-01 02:29:17.000000000 -0600
++++ freetype-2.1.5/include/freetype/config/ftoption.h	2004-02-01 02:31:42.000000000 -0600
+@@ -399,7 +399,7 @@
+   /*   Do not #undef this macro here, since the build system might         */
+   /*   define it for certain configurations only.                          */
+   /*                                                                       */
+-/* #define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
++#define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+ 
+ 
+   /*************************************************************************/
Index: patches/gcc-3.4.0-arm-bigendian.patch
===================================================================
--- patches/gcc-3.4.0-arm-bigendian.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/gcc-3.4.0-arm-bigendian.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,70 @@
+By Lennert Buytenhek <buytenh@wantstofly.org>
+Adds support for arm*b-linux* big-endian ARM targets
+
+See http://gcc.gnu.org/PR16350
+
+diff -urN gcc-3.4.0.orig/gcc/config/arm/linux-elf.h gcc-3.4.0/gcc/config/arm/linux-elf.h
+--- gcc-3.4.0.orig/gcc/config/arm/linux-elf.h	2004-01-31 07:18:11.000000000 +0100
++++ gcc-3.4.0/gcc/config/arm/linux-elf.h	2004-07-02 14:46:29.225443757 +0200
+@@ -30,17 +30,34 @@
+ /* Do not assume anything about header files.  */
+ #define NO_IMPLICIT_EXTERN_C
+ 
++/*
++ * 'config.gcc' defines TARGET_BIG_ENDIAN_DEFAULT as 1 for arm*b-*
++ * (big endian) configurations.
++ */
++#if TARGET_BIG_ENDIAN_DEFAULT
++#define TARGET_ENDIAN_DEFAULT ARM_FLAG_BIG_END
++#define TARGET_ENDIAN_OPTION "mbig-endian"
++#define TARGET_LINKER_EMULATION "armelfb_linux"
++#else
++#define TARGET_ENDIAN_DEFAULT 0
++#define TARGET_ENDIAN_OPTION "mlittle-endian"
++#define TARGET_LINKER_EMULATION "armelf_linux"
++#endif
++
+ /* Default is to use APCS-32 mode.  */
+ #undef  TARGET_DEFAULT
+-#define TARGET_DEFAULT (ARM_FLAG_APCS_32 | ARM_FLAG_MMU_TRAPS)
++#define TARGET_DEFAULT \
++		( ARM_FLAG_APCS_32 | \
++		  ARM_FLAG_MMU_TRAPS | \
++		  TARGET_ENDIAN_DEFAULT )
+ 
+ #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm6
+ 
+-#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux -p"
++#define SUBTARGET_EXTRA_LINK_SPEC " -m " TARGET_LINKER_EMULATION " -p"
+ 
+ #undef  MULTILIB_DEFAULTS
+ #define MULTILIB_DEFAULTS \
+-	{ "marm", "mlittle-endian", "mhard-float", "mapcs-32", "mno-thumb-interwork" }
++	{ "marm", TARGET_ENDIAN_OPTION, "mhard-float", "mapcs-32", "mno-thumb-interwork" }
+ 
+ #define CPP_APCS_PC_DEFAULT_SPEC "-D__APCS_32__"
+ 
+@@ -89,7 +106,7 @@
+    %{rdynamic:-export-dynamic} \
+    %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2} \
+    -X \
+-   %{mbig-endian:-EB}" \
++   %{mbig-endian:-EB} %{mlittle-endian:-EL}" \
+    SUBTARGET_EXTRA_LINK_SPEC
+ 
+ #define TARGET_OS_CPP_BUILTINS() LINUX_TARGET_OS_CPP_BUILTINS()
+diff -urN gcc-3.4.0.orig/gcc/config.gcc gcc-3.4.0/gcc/config.gcc
+--- gcc-3.4.0.orig/gcc/config.gcc	2004-04-17 04:28:24.000000000 +0200
++++ gcc-3.4.0/gcc/config.gcc	2004-07-02 14:44:40.045822542 +0200
+@@ -666,6 +666,11 @@
+ 	;;
+ arm*-*-linux*)			# ARM GNU/Linux with ELF
+ 	tm_file="dbxelf.h elfos.h linux.h arm/elf.h  arm/linux-gas.h arm/linux-elf.h arm/aout.h arm/arm.h"
++	case $target in
++	arm*b-*)
++		tm_defines="TARGET_BIG_ENDIAN_DEFAULT=1 $tm_defines"
++		;;
++	esac
+ 	tmake_file="t-slibgcc-elf-ver t-linux arm/t-linux"
+ 	extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
+ 	gnu_ld=yes
Index: patches/gcc-3.4.0-arm-lib1asm.patch
===================================================================
--- patches/gcc-3.4.0-arm-lib1asm.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/gcc-3.4.0-arm-lib1asm.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,27 @@
+# Origin: from a patch by Dimitry Andric <dimitry@andric.com>, 2004-05-01
+# See http://gcc.gnu.org/PR14352 and http://gcc.gnu.org/PR16314
+# See also http://gcc.gnu.org/ml/gcc-patches/2004-08/msg02568.html et seq for why this isn't in mainline
+# Fixes errors like the following when building glibc (or any other executable
+# or shared library) when using gcc 3.4.0 for ARM with softfloat:
+#
+# .../libc_pic.os(.text+0x15834): In function `__modf': undefined reference to `__subdf3'
+# .../libc_pic.os(.text+0x158b8): In function `__modf': undefined reference to `__subdf3'
+# .../libc_pic.os(.text+0x1590c): In function `scalbn': undefined reference to `__muldf3'
+# .../libc_pic.os(.text+0x15e94): In function `__ldexpf': undefined reference to `__eqsf2'
+# .../libc_pic.os(.text+0xcee4c): In function `monstartup': undefined reference to `__fixsfsi'
+
+diff -urNd gcc-3.4.0-orig/gcc/config/arm/t-linux gcc-3.4.0/gcc/config/arm/t-linux
+--- gcc-3.4.0-orig/gcc/config/arm/t-linux	2003-09-20 23:09:07.000000000 +0200
++++ gcc-3.4.0/gcc/config/arm/t-linux	2004-05-01 20:31:59.102846400 +0200
+@@ -4,7 +4,10 @@
+ LIBGCC2_DEBUG_CFLAGS = -g0
+ 
+ LIB1ASMSRC = arm/lib1funcs.asm
+-LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx
++LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx \
++	_negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
++	_truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
++	_fixsfsi _fixunssfsi
+ 
+ # MULTILIB_OPTIONS = mhard-float/msoft-float
+ # MULTILIB_DIRNAMES = hard-float soft-float
Index: patches/gcc-3.4.0-arm-nolibfloat.patch
===================================================================
--- patches/gcc-3.4.0-arm-nolibfloat.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/gcc-3.4.0-arm-nolibfloat.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,24 @@
+# Dimitry Andric <dimitry@andric.com>, 2004-05-01
+#
+# * Removed the extra -lfloat option from LIBGCC_SPEC, since it isn't needed
+#   anymore.  (The required functions are now in libgcc.)
+# 
+# Fixes errors like
+# arm-softfloat-linux-gnu/3.4.0/../../../../arm-softfloat-linux-gnu/bin/ld: cannot find -lfloat
+# collect2: ld returned 1 exit status
+# make[2]: *** [arm-softfloat-linux-gnu/gcc-3.4.0-glibc-2.3.2/build-glibc/iconvdata/ISO8859-1.so] Error 1
+# when building glibc-2.3.3 with gcc-3.4.0 for arm-softfloat
+
+diff -urNd gcc-3.4.0-orig/gcc/config/arm/linux-elf.h gcc-3.4.0/gcc/config/arm/linux-elf.h
+--- gcc-3.4.0-orig/gcc/config/arm/linux-elf.h	2004-01-31 07:18:11.000000000 +0100
++++ gcc-3.4.0/gcc/config/arm/linux-elf.h	2004-05-01 19:19:06.935979200 +0200
+@@ -55,7 +73,7 @@
+    %{shared:-lc} \
+    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
+ 
+-#define LIBGCC_SPEC "%{msoft-float:-lfloat} -lgcc"
++#define LIBGCC_SPEC "-lgcc"
+ 
+ /* Provide a STARTFILE_SPEC appropriate for GNU/Linux.  Here we add
+    the GNU/Linux magical crtbegin.o file (see crtstuff.c) which
+
Index: patches/gcc-3.4.1-fix_configure_for_target_native.patch
===================================================================
--- patches/gcc-3.4.1-fix_configure_for_target_native.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/gcc-3.4.1-fix_configure_for_target_native.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,94 @@
+Submitted By: Ryan Oliver (ryan dot oliver at pha dot com dot au)
+Origin: Ryan Oliver
+Date: 2004-07-15
+Initial Package Version: 3.4.1 (problem exists through 3.3 series)
+Description: There are issues with configure when attempting to cross-compile
+	a native gcc for target. During the last stage of make configure-host,
+	where host = target, the configury doesn't check if host != build.
+	Therefore it assumes that the build is a native build and performs
+	 binutils feature checks using either 
+	a) what the native compiler we are building would normally use.
+	   If a target-native binutils has already been built with the same
+	   prefix, this is the binutils which is used which of course will not
+	   work on host
+	b) the host os's assembler/linker/nm/as
+	which leads to bogus results.
+	This patch fixes this behaviour, so that if host = target and 
+	host != build the cross tools will be used for feature checks.
+
+--- gcc-3.4.1-ORIG/gcc/configure	2004-04-19 09:45:10.000000000 +1000
++++ gcc-3.4.1/gcc/configure	2004-07-15 02:01:17.000000000 +1000
+@@ -9518,7 +9518,9 @@
+ 	# If the loop below does not find an assembler, then use whatever
+ 	# one we can find in the users's path.
+ 	# user's path.
+-	if test "x$program_prefix" != xNONE; then
++	if test "x$host" = "x$target" -a "x$host" != "x$build"; then
++		gcc_cv_as=${target_alias}-as$host_exeext
++	elif test "x$gcc_cv_as" = x -a "x$program_prefix" != xNONE; then
+ 		gcc_cv_as=${program_prefix}as$host_exeext
+ 	else
+ 		gcc_cv_as=`echo as | sed ${program_transform_name}`$host_exeext
+@@ -9528,10 +9530,13 @@
+ 		   $test_prefix/libexec/gcc/$target_noncanonical \
+ 		   /usr/lib/gcc/$target_noncanonical/$gcc_version \
+ 		   /usr/lib/gcc/$target_noncanonical \
+-		   $test_prefix/$target_noncanonical/bin/$target_noncanonical/$gcc_version \
+-		   $test_prefix/$target_noncanonical/bin"
++		   $test_prefix/$target_noncanonical/bin/$target_noncanonical/$gcc_version"
++	if test "x$build" = "x$target" ; then 
++		test_dirs="$test_dirs \
++			   $test_prefix/$target_noncanonical/bin"
++	fi
+ 
+-	if test x$host = x$target; then
++	if test x$host = x$target -a x$host = x$build; then
+ 	    test_dirs="$test_dirs \
+ 		   /usr/libexec \
+ 		   /usr/ccs/gcc \
+@@ -9633,7 +9638,9 @@
+ 	# If the loop below does not find an linker, then use whatever
+ 	# one we can find in the users's path.
+ 	# user's path.
+-	if test "x$program_prefix" != xNONE; then
++	if test "x$host" = "x$target" -a "x$host" != "x$build"; then
++		gcc_cv_ld=${target_alias}-ld$host_exeext
++	elif test "x$gcc_cv_ld" = x -a "x$program_prefix" != xNONE; then
+ 		gcc_cv_ld=${program_prefix}ld$host_exeext
+ 	else
+ 		gcc_cv_ld=`echo ld | sed ${program_transform_name}`$host_exeext
+@@ -9643,10 +9650,13 @@
+ 		   $test_prefix/libexec/gcc/$target_noncanonical \
+ 		   /usr/lib/gcc/$target_noncanonical/$gcc_version \
+ 		   /usr/lib/gcc/$target_noncanonical \
+-		   $test_prefix/$target_noncanonical/bin/$target_noncanonical/$gcc_version \
+-		   $test_prefix/$target_noncanonical/bin"
++		   $test_prefix/$target_noncanonical/bin/$target_noncanonical/$gcc_version"
++	if test "x$build" = "x$target" ; then 
++		test_dirs="$test_dirs \
++			   $test_prefix/$target_noncanonical/bin"
++	fi
+ 
+-	if test x$host = x$target; then
++	if test x$host = x$target -a x$host = x$build; then
+ 	    test_dirs="$test_dirs \
+ 		   /usr/libexec \
+ 		   /usr/ccs/gcc \
+@@ -9692,6 +9702,8 @@
+ 	gcc_cv_nm=./nm$host_exeext
+ 	rm -f nm$host_exeext
+ 	$symbolic_link ../binutils/nm-new$host_exeext nm$host_exeext 2>/dev/null
++elif test "x$host" = "x$target" -a "x$host" != "x$build"; then
++	gcc_cv_nm=${target_alias}-nm$host_exeext
+ elif test "x$program_prefix" != xNONE; then
+ 	gcc_cv_nm=${program_prefix}nm$host_exeext
+ else
+@@ -9718,6 +9730,8 @@
+ 	rm -f objdump$host_exeext
+ 	$symbolic_link ../binutils/objdump$host_exeext \
+ 		objdump$host_exeext 2>/dev/null
++elif test "x$host" = "x$target" -a "x$host" != "x$build"; then
++	gcc_cv_objdump=${target_alias}-objdump$host_exeext
+ elif test "x$program_prefix" != xNONE; then
+ 	gcc_cv_objdump=${program_prefix}objdump$host_exeext
+ else
Index: patches/gcc-3.4.3-clean_exec_and_lib_search_paths_when_cross-1.patch
===================================================================
--- patches/gcc-3.4.3-clean_exec_and_lib_search_paths_when_cross-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/gcc-3.4.3-clean_exec_and_lib_search_paths_when_cross-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,47 @@
+Submitted by: Ryan Oliver <ryan.oliver@pha.com.au>
+Date: 2005-05-02
+Initial Package Version: 3.4.3
+Origin: Ryan Oliver (issue reported by Erik-Jan Post)
+Upstream Status: N/A
+Description: 
+  Removes standard_exec_prefix_2 from library search path when cross-compiling.
+  Removes both standard_exec_prefix_1 and standard_exec_prefix_2 from the gcc
+  executable search path when cross-compiling.
+
+  ie: if cross_compile = 1 in the specs file, do not
+      - do not add /usr/lib/gcc/${TARGET}/${GCC_VER} to the library search path
+      - do not add /usr/lib/gcc/${TARGET}/${GCC_VER} or
+                   /usr/libexec/gcc/${TARGET}/${GCC_VER}
+        to the executable search path
+
+  This avoids the possibility of linking in libraries from the host if they
+  exist under those directories.
+
+--- gcc-3.4.3/gcc/gcc.c-orig	2004-09-09 01:16:11.000000000 +1000
++++ gcc-3.4.3/gcc/gcc.c	2005-05-02 21:16:05.000000000 +1000
+@@ -3757,16 +3757,22 @@
+ 	      PREFIX_PRIORITY_LAST, 2, warn_std_ptr, 0);
+   add_prefix (&exec_prefixes, standard_exec_prefix, "BINUTILS",
+ 	      PREFIX_PRIORITY_LAST, 2, warn_std_ptr, 0);
+-  add_prefix (&exec_prefixes, standard_exec_prefix_1, "BINUTILS",
++  if (*cross_compile == '0')
++    {
++      add_prefix (&exec_prefixes, standard_exec_prefix_1, "BINUTILS",
+ 	      PREFIX_PRIORITY_LAST, 2, warn_std_ptr, 0);
+-  add_prefix (&exec_prefixes, standard_exec_prefix_2, "BINUTILS",
++      add_prefix (&exec_prefixes, standard_exec_prefix_2, "BINUTILS",
+ 	      PREFIX_PRIORITY_LAST, 2, warn_std_ptr, 0);
++    }
+ #endif
+ 
+   add_prefix (&startfile_prefixes, standard_exec_prefix, "BINUTILS",
+ 	      PREFIX_PRIORITY_LAST, 1, warn_std_ptr, 0);
+-  add_prefix (&startfile_prefixes, standard_exec_prefix_2, "BINUTILS",
++  if (*cross_compile == '0')
++    {
++      add_prefix (&startfile_prefixes, standard_exec_prefix_2, "BINUTILS",
+ 	      PREFIX_PRIORITY_LAST, 1, warn_std_ptr, 0);
++    }
+ 
+   tooldir_prefix = concat (tooldir_base_prefix, spec_machine,
+ 			   dir_separator_str, NULL);
Index: patches/gcc-3.4.3-clean_lib_search_paths_when_cross-1.patch
===================================================================
--- patches/gcc-3.4.3-clean_lib_search_paths_when_cross-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/gcc-3.4.3-clean_lib_search_paths_when_cross-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,22 @@
+Submitted by: Ryan Oliver <ryan.oliver@pha.com.au>
+Date: 20050502
+Description:
+  Removes standard_exec_prefix_2 from library search path when cross-compiling
+  ie: if cross_compile = 1 in the specs file, do not add
+      /usr/lib/gcc/${TARGET}/${GCC_VER} to the library search path
+ 
+--- gcc-3.4.3/gcc/gcc.c-orig	2004-09-09 01:16:11.000000000 +1000
++++ gcc-3.4.3/gcc/gcc.c	2005-05-02 21:32:34.000000000 +1000
+@@ -3765,8 +3765,11 @@
+ 
+   add_prefix (&startfile_prefixes, standard_exec_prefix, "BINUTILS",
+ 	      PREFIX_PRIORITY_LAST, 1, warn_std_ptr, 0);
+-  add_prefix (&startfile_prefixes, standard_exec_prefix_2, "BINUTILS",
++  if (*cross_compile == '0')
++    {
++      add_prefix (&startfile_prefixes, standard_exec_prefix_2, "BINUTILS",
+ 	      PREFIX_PRIORITY_LAST, 1, warn_std_ptr, 0);
++    }
+ 
+   tooldir_prefix = concat (tooldir_base_prefix, spec_machine,
+ 			   dir_separator_str, NULL);
Index: patches/gcc-3.4.3-linkonce-1.patch
===================================================================
--- patches/gcc-3.4.3-linkonce-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/gcc-3.4.3-linkonce-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,354 @@
+Submitted By: Jim Gifford (patches at jg555 dot com)
+Date: 2004-11-05
+Initial Package Version: 3.4.3
+Origin: Jim Gifford
+Upstream Status: Delayed till 3.4.4
+Description: Fixes linkone/comdat issue
+ 
+diff -Naur gcc-3.4.3.orig/gcc/config/alpha/alpha.c gcc-3.4.3/gcc/config/alpha/alpha.c
+--- gcc-3.4.3.orig/gcc/config/alpha/alpha.c	2004-09-30 17:45:48.000000000 +0000
++++ gcc-3.4.3/gcc/config/alpha/alpha.c	2004-11-05 17:08:46.220272104 +0000
+@@ -10169,6 +10169,8 @@
+ # define TARGET_SECTION_TYPE_FLAGS unicosmk_section_type_flags
+ # undef TARGET_ASM_UNIQUE_SECTION
+ # define TARGET_ASM_UNIQUE_SECTION unicosmk_unique_section
++#undef TARGET_ASM_FUNCTION_RODATA_SECTION
++#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
+ # undef TARGET_ASM_GLOBALIZE_LABEL
+ # define TARGET_ASM_GLOBALIZE_LABEL hook_void_FILEptr_constcharptr
+ #endif
+diff -Naur gcc-3.4.3.orig/gcc/config/arm/pe.h gcc-3.4.3/gcc/config/arm/pe.h
+--- gcc-3.4.3.orig/gcc/config/arm/pe.h	2004-02-24 14:25:22.000000000 +0000
++++ gcc-3.4.3/gcc/config/arm/pe.h	2004-11-05 17:08:46.225271344 +0000
+@@ -97,6 +97,7 @@
+ #define MULTIPLE_SYMBOL_SPACES
+ 
+ #define TARGET_ASM_UNIQUE_SECTION arm_pe_unique_section
++#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
+ 
+ #define SUPPORTS_ONE_ONLY 1
+ 
+diff -Naur gcc-3.4.3.orig/gcc/config/avr/avr.c gcc-3.4.3/gcc/config/avr/avr.c
+--- gcc-3.4.3.orig/gcc/config/avr/avr.c	2004-09-28 01:13:55.000000000 +0000
++++ gcc-3.4.3/gcc/config/avr/avr.c	2004-11-05 17:56:54.764146688 +0000
+@@ -229,6 +229,8 @@
+ #define TARGET_ASM_FUNCTION_EPILOGUE avr_output_function_epilogue
+ #undef TARGET_ATTRIBUTE_TABLE
+ #define TARGET_ATTRIBUTE_TABLE avr_attribute_table
++#undef TARGET_ASM_FUNCTION_RODATA_SECTION
++#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
+ #undef TARGET_INSERT_ATTRIBUTES
+ #define TARGET_INSERT_ATTRIBUTES avr_insert_attributes
+ #undef TARGET_SECTION_TYPE_FLAGS
+diff -Naur gcc-3.4.3.orig/gcc/config/darwin.h gcc-3.4.3/gcc/config/darwin.h
+--- gcc-3.4.3.orig/gcc/config/darwin.h	2004-09-11 20:32:17.000000000 +0000
++++ gcc-3.4.3/gcc/config/darwin.h	2004-11-05 17:08:46.300259944 +0000
+@@ -686,6 +686,9 @@
+ #undef	TARGET_ASM_SELECT_RTX_SECTION
+ #define TARGET_ASM_SELECT_RTX_SECTION machopic_select_rtx_section
+ 
++#undef  TARGET_ASM_FUNCTION_RODATA_SECTION
++#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
++
+ #define ASM_DECLARE_UNRESOLVED_REFERENCE(FILE,NAME)			\
+     do {								\
+ 	 if (FILE) {							\
+diff -Naur gcc-3.4.3.orig/gcc/config/i386/cygming.h gcc-3.4.3/gcc/config/i386/cygming.h
+--- gcc-3.4.3.orig/gcc/config/i386/cygming.h	2004-06-08 06:30:13.000000000 +0000
++++ gcc-3.4.3/gcc/config/i386/cygming.h	2004-11-05 17:08:46.304259336 +0000
+@@ -255,6 +255,7 @@
+ 
+ extern void i386_pe_unique_section (TREE, int);
+ #define TARGET_ASM_UNIQUE_SECTION i386_pe_unique_section
++#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
+ 
+ #define SUPPORTS_ONE_ONLY 1
+ 
+diff -Naur gcc-3.4.3.orig/gcc/config/i386/i386-interix.h gcc-3.4.3/gcc/config/i386/i386-interix.h
+--- gcc-3.4.3.orig/gcc/config/i386/i386-interix.h	2004-01-31 06:18:20.000000000 +0000
++++ gcc-3.4.3/gcc/config/i386/i386-interix.h	2004-11-05 17:08:46.307258880 +0000
+@@ -344,6 +344,7 @@
+ 
+ extern void i386_pe_unique_section (tree, int);
+ #define TARGET_ASM_UNIQUE_SECTION i386_pe_unique_section
++#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
+ 
+ #define SUPPORTS_ONE_ONLY 1
+ #endif /* 0 */
+diff -Naur gcc-3.4.3.orig/gcc/config/ip2k/ip2k.c gcc-3.4.3/gcc/config/ip2k/ip2k.c
+--- gcc-3.4.3.orig/gcc/config/ip2k/ip2k.c	2004-01-31 06:18:25.000000000 +0000
++++ gcc-3.4.3/gcc/config/ip2k/ip2k.c	2004-11-05 17:08:46.352252040 +0000
+@@ -98,6 +98,9 @@
+ #undef TARGET_ASM_UNIQUE_SECTION
+ #define TARGET_ASM_UNIQUE_SECTION unique_section
+ 
++#undef TARGET_ASM_FUNCTION_RODATA_SECTION
++#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
++
+ #undef TARGET_ATTRIBUTE_TABLE
+ #define TARGET_ATTRIBUTE_TABLE ip2k_attribute_table
+ 
+diff -Naur gcc-3.4.3.orig/gcc/config/mcore/mcore.c gcc-3.4.3/gcc/config/mcore/mcore.c
+--- gcc-3.4.3.orig/gcc/config/mcore/mcore.c	2004-01-31 06:18:29.000000000 +0000
++++ gcc-3.4.3/gcc/config/mcore/mcore.c	2004-11-05 17:08:46.384247176 +0000
+@@ -165,6 +165,8 @@
+ #define TARGET_ATTRIBUTE_TABLE 		mcore_attribute_table
+ #undef  TARGET_ASM_UNIQUE_SECTION
+ #define TARGET_ASM_UNIQUE_SECTION 	mcore_unique_section
++#undef  TARGET_ASM_FUNCTION_RODATA_SECTION
++#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
+ #undef  TARGET_ENCODE_SECTION_INFO
+ #define TARGET_ENCODE_SECTION_INFO 	mcore_encode_section_info
+ #undef  TARGET_STRIP_NAME_ENCODING
+diff -Naur gcc-3.4.3.orig/gcc/config/rs6000/xcoff.h gcc-3.4.3/gcc/config/rs6000/xcoff.h
+--- gcc-3.4.3.orig/gcc/config/rs6000/xcoff.h	2004-01-31 06:18:34.000000000 +0000
++++ gcc-3.4.3/gcc/config/rs6000/xcoff.h	2004-11-05 17:08:46.000000000 +0000
+@@ -172,6 +172,7 @@
+ #define TARGET_ASM_SELECT_SECTION  rs6000_xcoff_select_section
+ #define TARGET_ASM_SELECT_RTX_SECTION  rs6000_xcoff_select_rtx_section
+ #define TARGET_ASM_UNIQUE_SECTION  rs6000_xcoff_unique_section
++#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
+ #define TARGET_STRIP_NAME_ENCODING  rs6000_xcoff_strip_name_encoding
+ #define TARGET_SECTION_TYPE_FLAGS  rs6000_xcoff_section_type_flags
+ 
+diff -Naur gcc-3.4.3.orig/gcc/doc/tm.texi gcc-3.4.3/gcc/doc/tm.texi
+--- gcc-3.4.3.orig/gcc/doc/tm.texi	2004-10-13 14:16:27.000000000 +0000
++++ gcc-3.4.3/gcc/doc/tm.texi	2004-11-05 17:08:46.503229088 +0000
+@@ -6003,6 +6003,15 @@
+ Whatever the actual target object format, this is often good enough.
+ @end deftypefn
+ 
++@deftypefn {Target Hook} void TARGET_ASM_FUNCTION_RODATA_SECTION (tree @var{decl})
++Switches to a readonly data section associated with
++@samp{DECL_SECTION_NAME (@var{decl})}.
++The default version of this function switches to @code{.gnu.linkonce.r.name}
++section if function's section is @code{.gnu.linkonce.t.name}, to
++@code{.rodata.name} if function is in @code{.text.name} section
++and otherwise switches to the normal readonly data section.
++@end deftypefn
++
+ @deftypefn {Target Hook} void TARGET_ASM_SELECT_RTX_SECTION (enum machine_mode @var{mode}, rtx @var{x}, unsigned HOST_WIDE_INT @var{align})
+ Switches to the appropriate section for output of constant pool entry
+ @var{x} in @var{mode}.  You can assume that @var{x} is some kind of
+diff -Naur gcc-3.4.3.orig/gcc/final.c gcc-3.4.3/gcc/final.c
+--- gcc-3.4.3.orig/gcc/final.c	2004-01-18 22:39:57.000000000 +0000
++++ gcc-3.4.3/gcc/final.c	2004-11-05 17:08:46.542223160 +0000
+@@ -1881,7 +1881,7 @@
+ 		{
+ 		  int log_align;
+ 
+-		  readonly_data_section ();
++		  targetm.asm_out.function_rodata_section (current_function_decl);
+ 
+ #ifdef ADDR_VEC_ALIGN
+ 		  log_align = ADDR_VEC_ALIGN (NEXT_INSN (insn));
+diff -Naur gcc-3.4.3.orig/gcc/output.h gcc-3.4.3/gcc/output.h
+--- gcc-3.4.3.orig/gcc/output.h	2004-01-18 22:39:57.000000000 +0000
++++ gcc-3.4.3/gcc/output.h	2004-11-05 17:08:46.549222096 +0000
+@@ -500,6 +500,8 @@
+ 					  unsigned HOST_WIDE_INT, int);
+ extern void default_unique_section (tree, int);
+ extern void default_unique_section_1 (tree, int, int);
++extern void default_function_rodata_section (tree);
++extern void default_no_function_rodata_section (tree);
+ extern void default_select_rtx_section (enum machine_mode, rtx,
+ 					unsigned HOST_WIDE_INT);
+ extern void default_elf_select_rtx_section (enum machine_mode, rtx,
+diff -Naur gcc-3.4.3.orig/gcc/target-def.h gcc-3.4.3/gcc/target-def.h
+--- gcc-3.4.3.orig/gcc/target-def.h	2004-08-23 18:02:40.000000000 +0000
++++ gcc-3.4.3/gcc/target-def.h	2004-11-05 17:08:46.553221488 +0000
+@@ -78,6 +78,10 @@
+ #define TARGET_ASM_UNIQUE_SECTION default_unique_section
+ #endif
+ 
++#ifndef TARGET_ASM_FUNCTION_RODATA_SECTION
++#define TARGET_ASM_FUNCTION_RODATA_SECTION default_function_rodata_section
++#endif
++
+ #ifndef TARGET_ASM_SELECT_RTX_SECTION
+ #define TARGET_ASM_SELECT_RTX_SECTION default_select_rtx_section
+ #endif
+@@ -201,6 +205,7 @@
+ 			TARGET_ASM_SELECT_SECTION,		\
+ 			TARGET_ASM_SELECT_RTX_SECTION,		\
+ 			TARGET_ASM_UNIQUE_SECTION,		\
++			TARGET_ASM_FUNCTION_RODATA_SECTION,	\
+ 			TARGET_ASM_CONSTRUCTOR,			\
+ 			TARGET_ASM_DESTRUCTOR,                  \
+                         TARGET_ASM_OUTPUT_MI_THUNK,             \
+diff -Naur gcc-3.4.3.orig/gcc/target.h gcc-3.4.3/gcc/target.h
+--- gcc-3.4.3.orig/gcc/target.h	2004-08-23 18:02:41.000000000 +0000
++++ gcc-3.4.3/gcc/target.h	2004-11-05 17:08:46.558220728 +0000
+@@ -118,6 +118,10 @@
+        for SELECT_SECTION.  */
+     void (* unique_section) (tree, int);
+ 
++    /* Tell assembler to switch to the readonly data section associated
++       with function DECL.  */
++    void (* function_rodata_section) (tree); 
++
+     /* Output a constructor for a symbol with a given priority.  */
+     void (* constructor) (rtx, int);
+ 
+diff -Naur gcc-3.4.3.orig/gcc/testsuite/g++.old-deja/g++.other/comdat4-aux.cc gcc-3.4.3/gcc/testsuite/g++.old-deja/g++.other/comdat4-aux.cc
+--- gcc-3.4.3.orig/gcc/testsuite/g++.old-deja/g++.other/comdat4-aux.cc	1970-01-01 00:00:00.000000000 +0000
++++ gcc-3.4.3/gcc/testsuite/g++.old-deja/g++.other/comdat4-aux.cc	2004-11-05 17:08:46.560220424 +0000
+@@ -0,0 +1,40 @@
++extern void
++bar (int x);
++
++inline void
++foo (int i)
++{
++  switch (i)
++    {
++    case 3:
++    case 5:
++    case 6:
++    case 9:
++    case 15:
++      bar (1);
++      break;
++    case 2:
++    case 4:
++    case 7:
++    case 10:
++    case 11:
++    case 12:
++      bar (2);
++      break;
++    case 0:
++    case 1:
++    case 8:
++    case 13:
++    case 16:
++      bar (3);
++      break;
++    case 14:
++      bar (4);
++      break;
++    default:
++      bar (5);
++      break;
++    }
++}
++
++void *fooaddr2 = (void *) foo;
+diff -Naur gcc-3.4.3.orig/gcc/testsuite/g++.old-deja/g++.other/comdat4.C gcc-3.4.3/gcc/testsuite/g++.old-deja/g++.other/comdat4.C
+--- gcc-3.4.3.orig/gcc/testsuite/g++.old-deja/g++.other/comdat4.C	1970-01-01 00:00:00.000000000 +0000
++++ gcc-3.4.3/gcc/testsuite/g++.old-deja/g++.other/comdat4.C	2004-11-05 17:08:46.562220120 +0000
+@@ -0,0 +1,57 @@
++// PR c++/16276
++// { dg-do link }
++// { dg-additional-sources " comdat4-aux.cc" }
++// { dg-options "-O2" }
++
++extern void
++bar (int x);
++
++inline void
++foo (int i)
++{
++  switch (i)
++    {
++    case 3:
++    case 5:
++    case 6:
++    case 9:
++    case 15:
++      bar (1);
++      break;
++    case 2:
++    case 4:
++    case 7:
++    case 10:
++    case 11:
++    case 12:
++      bar (2);
++      break;
++    case 0:
++    case 1:
++    case 8:
++    case 13:
++    case 16:
++      bar (3);
++      break;
++    case 14:
++      bar (4);
++      break;
++    default:
++      bar (5);
++      break;
++    }
++}
++
++void *fooaddr = (void *) foo;
++
++void
++bar (int x)
++{
++  __asm __volatile ("" : : "r" (x));
++}
++
++int
++main (void)
++{
++  return 0;
++}
+diff -Naur gcc-3.4.3.orig/gcc/varasm.c gcc-3.4.3/gcc/varasm.c
+--- gcc-3.4.3.orig/gcc/varasm.c	2004-10-31 09:10:03.000000000 +0000
++++ gcc-3.4.3/gcc/varasm.c	2004-11-05 17:08:46.603213888 +0000
+@@ -535,6 +535,53 @@
+     text_section ();
+ }
+ 
++/* Switch to read-only data section associated with function DECL.  */
++
++void
++default_function_rodata_section (tree decl)
++{
++  if (decl != NULL_TREE && DECL_SECTION_NAME (decl))
++    {
++      const char *name = TREE_STRING_POINTER (DECL_SECTION_NAME (decl));
++
++      /* For .gnu.linkonce.t.foo we want to use .gnu.linkonce.r.foo.  */
++      if (DECL_ONE_ONLY (decl) && strncmp (name, ".gnu.linkonce.t.", 16) == 0)
++	{
++	  size_t len = strlen (name) + 1;
++	  char *rname = alloca (len);
++
++	  memcpy (rname, name, len);
++	  rname[14] = 'r';
++	  named_section_flags (rname, SECTION_LINKONCE);
++	  return;
++	}
++      /* For .text.foo we want to use .rodata.foo.  */
++      else if (flag_function_sections && flag_data_sections
++	       && strncmp (name, ".text.", 6) == 0)
++	{
++	  size_t len = strlen (name) + 1;
++	  char *rname = alloca (len + 2);
++
++	  memcpy (rname, ".rodata", 7);
++	  memcpy (rname + 7, name + 5, len - 5);
++	  named_section_flags (rname, 0);
++	  return;
++	}
++    }
++
++  readonly_data_section ();
++}
++
++/* Switch to read-only data section associated with function DECL
++   for targets where that section should be always the single
++   readonly data section.  */
++
++void
++default_no_function_rodata_section (tree decl ATTRIBUTE_UNUSED)
++{
++  readonly_data_section ();
++}
++
+ /* Switch to section for variable DECL.  RELOC is the same as the
+    argument to SELECT_SECTION.  */
+ 
Index: patches/gcc-3.4.3-remove_standard_startfile_prefix_from_startfile_prefixes-1.patch
===================================================================
--- patches/gcc-3.4.3-remove_standard_startfile_prefix_from_startfile_prefixes-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/gcc-3.4.3-remove_standard_startfile_prefix_from_startfile_prefixes-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,36 @@
+Submitted By: Ryan Oliver (ryan dot oliver at pha dot com dot au)
+Origin: Ryan Oliver
+Date: 2005-03-21
+Initial Package Version: 3.4.3 
+Description: This patch is primarily here to fix issues with libtool when building
+	packages on a multi-arch/multilib system, as libtool effectively uses the
+	library search paths from gcc -print-search-dirs to locate .la files.
+	This poses a problem as by default gcc supplies
+		eg: /usr/lib64/gcc/x86_64-pc-linux-gnu/3.4.3/../../../
+	which following the example would cause libtool to use .la files under
+	/usr/lib64 instead of /usr/lib if building a package 32bit, and thus will
+	attempt to link in incompatible 64bit libraries.
+	Here we simply remove this path ( provided by standard_startfile_prefix )
+	from the library search order
+
+diff -uNr gcc-3.4.3-orig/gcc/gcc.c gcc-3.4.3/gcc/gcc.c
+--- gcc-3.4.3-orig/gcc/gcc.c	2004-09-09 01:16:11.000000000 +1000
++++ gcc-3.4.3/gcc/gcc.c	2005-03-21 17:54:44.000000000 +1100
+@@ -6135,7 +6135,7 @@
+ 	add_sysrooted_prefix (&startfile_prefixes,
+ 			      standard_startfile_prefix, "BINUTILS",
+ 			      PREFIX_PRIORITY_LAST, 0, NULL, 1);
+-      else if (*cross_compile == '0')
++      /* else if (*cross_compile == '0')
+ 	{
+ 	  if (gcc_exec_prefix)
+ 	    add_prefix (&startfile_prefixes,
+@@ -6147,7 +6147,7 @@
+ 			      machine_suffix,
+ 			      standard_startfile_prefix, NULL),
+ 		      NULL, PREFIX_PRIORITY_LAST, 0, NULL, 1);
+-	}
++	} */
+ 
+       add_sysrooted_prefix (&startfile_prefixes, standard_startfile_prefix_1,
+ 			    "BINUTILS", PREFIX_PRIORITY_LAST, 0, NULL, 1);
Index: patches/gcc-4.0.0-clean_exec_and_lib_search_paths_when_cross-1.patch
===================================================================
--- patches/gcc-4.0.0-clean_exec_and_lib_search_paths_when_cross-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/gcc-4.0.0-clean_exec_and_lib_search_paths_when_cross-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,43 @@
+Submitted by: Ryan Oliver <ryan.oliver@pha.com.au>
+Date: 20050503
+Initial Package Version: 4.0.0
+Description:
+  Removes standard_exec_prefix_2 from library search path when cross-compiling.
+  Removes both standard_exec_prefix_1 and standard_exec_prefix_2 from the gcc
+  executable search path when cross-compiling.
+
+  ie: if cross_compile = 1 in the specs file, do not
+      - add /usr/lib/gcc/${TARGET}/${GCC_VER} to the library search path
+      - add /usr/lib/gcc/${TARGET}/${GCC_VER} or
+            /usr/libexec/gcc/${TARGET}/${GCC_VER}
+        to the executable search path
+
+
+--- gcc-4.0.0/gcc/gcc.c-orig	2005-04-16 11:38:45.000000000 +1000
++++ gcc-4.0.0/gcc/gcc.c	2005-05-03 22:18:10.000000000 +1000
+@@ -3797,16 +3797,22 @@
+ 	      PREFIX_PRIORITY_LAST, 2, 0);
+   add_prefix (&exec_prefixes, standard_exec_prefix, "BINUTILS",
+ 	      PREFIX_PRIORITY_LAST, 2, 0);
+-  add_prefix (&exec_prefixes, standard_exec_prefix_1, "BINUTILS",
++  if (*cross_compile == '0')
++    {
++      add_prefix (&exec_prefixes, standard_exec_prefix_1, "BINUTILS",
+ 	      PREFIX_PRIORITY_LAST, 2, 0);
+-  add_prefix (&exec_prefixes, standard_exec_prefix_2, "BINUTILS",
++      add_prefix (&exec_prefixes, standard_exec_prefix_2, "BINUTILS",
+ 	      PREFIX_PRIORITY_LAST, 2, 0);
++    }
+ #endif
+ 
+   add_prefix (&startfile_prefixes, standard_exec_prefix, "BINUTILS",
+ 	      PREFIX_PRIORITY_LAST, 1, 0);
+-  add_prefix (&startfile_prefixes, standard_exec_prefix_2, "BINUTILS",
++  if (*cross_compile == '0')
++    {
++      add_prefix (&startfile_prefixes, standard_exec_prefix_2, "BINUTILS",
+ 	      PREFIX_PRIORITY_LAST, 1, 0);
++    }
+ 
+   tooldir_prefix = concat (tooldir_base_prefix, spec_machine,
+ 			   dir_separator_str, NULL);
Index: patches/gcc-4.0.0-fix_tree_optimisation_PR21173.patch
===================================================================
--- patches/gcc-4.0.0-fix_tree_optimisation_PR21173.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/gcc-4.0.0-fix_tree_optimisation_PR21173.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,48 @@
+Submitted By: Ryan Oliver <ryan.oliver@pha.com.au>
+Source: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=21173
+Initial Package Version: 4.0.0
+Upstrean Status: In Gcc4 Mainline
+Description:
+
+2005-04-25  Daniel Berlin  <dberlin@dberlin.org>
+
+	Fix PR tree-optimization/21173
+	
+	* tree-ssa-pre.c (create_expression_by_pieces): Call unshare_expr
+	on things we pass to force_gimple_operand.  Don't try to special
+	case min_invariants.
+
+===================================================================
+RCS file: /cvs/gcc/gcc/gcc/tree-ssa-pre.c,v
+retrieving revision 2.65.4.2
+retrieving revision 2.65.4.3
+diff -u -r2.65.4.2 -r2.65.4.3
+--- gcc/gcc/tree-ssa-pre.c	2005/04/17 23:40:31	2.65.4.2
++++ gcc/gcc/tree-ssa-pre.c	2005/04/25 14:02:31	2.65.4.3
+@@ -1330,7 +1330,8 @@
+ 	
+ 	folded = fold (build (TREE_CODE (expr), TREE_TYPE (expr), 
+ 			      genop1, genop2));
+-	newexpr = force_gimple_operand (folded, &forced_stmts, false, NULL);
++	newexpr = force_gimple_operand (unshare_expr (folded), 
++					&forced_stmts, false, NULL);
+ 	if (forced_stmts)
+ 	  {
+ 	    tsi = tsi_start (forced_stmts);
+@@ -1372,14 +1373,8 @@
+ 	add_referenced_tmp_var (temp);
+ 	folded = fold (build (TREE_CODE (expr), TREE_TYPE (expr), 
+ 			      genop1));
+-	/* If the generated operand  is already GIMPLE min_invariant
+-	   just use it instead of calling force_gimple_operand on it,
+-	   since that may make it not invariant by copying it into an
+-	   assignment.  */
+-	if (!is_gimple_min_invariant (genop1))
+-	  newexpr = force_gimple_operand (folded, &forced_stmts, false, NULL);
+-	else
+-	  newexpr = genop1;
++	newexpr = force_gimple_operand (unshare_expr (folded), 
++					&forced_stmts, false, NULL);
+ 	if (forced_stmts)
+ 	  {
+ 	    tsi = tsi_start (forced_stmts);
Index: patches/gcc-4.0.0-reload_check_uninitialized_pseudos_PR20973.patch
===================================================================
--- patches/gcc-4.0.0-reload_check_uninitialized_pseudos_PR20973.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/gcc-4.0.0-reload_check_uninitialized_pseudos_PR20973.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,59 @@
+Submitted by: Ryan Oliver <ryan.oliver@pha.com.au>
+Source: http://gcc.gnu.org/ml/gcc-cvs/2005-04/msg01085.html
+Initial Package Version: 4.0.0
+Upstream Status: In gcc4 mainline
+Description:
+
+2005-04-20  Michael Matz  <matz@suse.de>
+
+       PR20973
+       * reload.c (push_reload, find_dummy_reload): Check for uninitialized
+       pseudos.
+
+===================================================================
+RCS file: /cvs/gcc/gcc/gcc/reload.c,v
+retrieving revision 1.268
+retrieving revision 1.269
+diff -u -r1.268 -r1.269
+--- gcc/gcc/reload.c	2005/02/24 22:06:06	1.268
++++ gcc/gcc/reload.c	2005/04/20 14:30:38	1.269
+@@ -1520,7 +1520,7 @@
+      But if there is no spilling in this block, that is OK.
+      An explicitly used hard reg cannot be a spill reg.  */
+ 
+-  if (rld[i].reg_rtx == 0 && in != 0)
++  if (rld[i].reg_rtx == 0 && in != 0 && hard_regs_live_known)
+     {
+       rtx note;
+       int regno;
+@@ -1534,6 +1534,11 @@
+ 	    && REG_P (XEXP (note, 0))
+ 	    && (regno = REGNO (XEXP (note, 0))) < FIRST_PSEUDO_REGISTER
+ 	    && reg_mentioned_p (XEXP (note, 0), in)
++	    /* Check that we don't use a hardreg for an uninitialized
++	       pseudo.  See also find_dummy_reload().  */
++	    && (ORIGINAL_REGNO (XEXP (note, 0)) < FIRST_PSEUDO_REGISTER
++		|| ! bitmap_bit_p (ENTRY_BLOCK_PTR->global_live_at_end,
++				   ORIGINAL_REGNO (XEXP (note, 0))))
+ 	    && ! refers_to_regno_for_reload_p (regno,
+ 					       (regno
+ 						+ hard_regno_nregs[regno]
+@@ -1997,7 +2002,17 @@
+ 				is a subreg, and in that case, out
+ 				has a real mode.  */
+ 			     (GET_MODE (out) != VOIDmode
+-			      ? GET_MODE (out) : outmode)))
++			      ? GET_MODE (out) : outmode))
++        /* But only do all this if we can be sure, that this input
++           operand doesn't correspond with an uninitialized pseudoreg.
++           global can assign some hardreg to it, which is the same as
++	   a different pseudo also currently live (as it can ignore the
++	   conflict).  So we never must introduce writes to such hardregs,
++	   as they would clobber the other live pseudo using the same.
++	   See also PR20973.  */
++      && (ORIGINAL_REGNO (in) < FIRST_PSEUDO_REGISTER
++          || ! bitmap_bit_p (ENTRY_BLOCK_PTR->global_live_at_end,
++			     ORIGINAL_REGNO (in))))
+     {
+       unsigned int regno = REGNO (in) + in_offset;
+       unsigned int nwords = hard_regno_nregs[regno][inmode];
Index: patches/gcc-4.0.0-remove_standard_startfile_prefix_from_startfile_prefixes-1.patch
===================================================================
--- patches/gcc-4.0.0-remove_standard_startfile_prefix_from_startfile_prefixes-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/gcc-4.0.0-remove_standard_startfile_prefix_from_startfile_prefixes-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,36 @@
+Submitted By: Ryan Oliver (ryan dot oliver at pha dot com dot au)
+Origin: Ryan Oliver
+Date: 2005-04-24
+Initial Package Version: 4.0.0
+Description: This patch is primarily here to fix issues with libtool when
+	building packages on a multi-arch/multilib system, as libtool 
+	effectively uses the library search paths from gcc -print-search-dirs
+	to locate .la files.
+	This poses a problem as by default gcc supplies
+		eg: /usr/lib64/gcc/x86_64-pc-linux-gnu/3.4.3/../../../
+	which following the example would cause libtool to use .la files under
+	/usr/lib64 instead of /usr/lib if building a package 32bit, and thus
+	will attempt to link in incompatible 64bit libraries.
+	Here we simply remove this path (provided by standard_startfile_prefix)
+	from the library search order
+
+--- gcc-4.0.0-orig/gcc/gcc.c	2005-04-16 04:22:57.000000000 +1000
++++ gcc-4.0.0/gcc/gcc.c	2005-04-24 10:07:51.000000000 +1000
+@@ -6188,7 +6188,7 @@
+ 	add_sysrooted_prefix (&startfile_prefixes,
+ 			      standard_startfile_prefix, "BINUTILS",
+ 			      PREFIX_PRIORITY_LAST, 0, 1);
+-      else if (*cross_compile == '0')
++      /* else if (*cross_compile == '0')
+ 	{
+ 	  if (gcc_exec_prefix)
+ 	    add_prefix (&startfile_prefixes,
+@@ -6200,7 +6200,7 @@
+ 			      machine_suffix,
+ 			      standard_startfile_prefix, NULL),
+ 		      NULL, PREFIX_PRIORITY_LAST, 0, 1);
+-	}
++	} */
+ 
+       if (*standard_startfile_prefix_1)
+  	add_sysrooted_prefix (&startfile_prefixes,
Index: tches/gcc-4.2.4-PR31490-1.patch
===================================================================
--- patches/gcc-4.2.4-PR31490-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,28 +1,0 @@
-Submitted By: Ken Moffat <zarniwhoop @ ntlworld dot com>
-Date: 2008-01-06
-Initial Package Version: 4.2.2
-Upstream Status: Kicking around in bugzilla, apparently nobody cares.
-Origin: Dinar Temirbulatov
-Description: Allows gcc-4.2 to compile a modular kernel on ppc64.  Rediffed
- to apply with -p1.
-
-diff -Naur gcc-4.2.2/gcc/varasm.c gcc-4.2.2-PR31490/gcc/varasm.c
---- gcc-4.2.2/gcc/varasm.c	2007-09-01 16:28:30.000000000 +0100
-+++ gcc-4.2.2-PR31490/gcc/varasm.c	2007-11-22 17:50:24.000000000 +0000
-@@ -5452,12 +5452,14 @@
- 	     be read-only or not, but whether the dynamic link will have to
- 	     do something.  If so, we wish to segregate the data in order to
- 	     minimize cache misses inside the dynamic linker.  */
--	  if (reloc & targetm.asm_out.reloc_rw_mask ())
-+	  if (reloc & targetm.asm_out.reloc_rw_mask ()
-+	      && !lookup_attribute ("section", DECL_ATTRIBUTES (decl)))
- 	    ret = reloc == 1 ? SECCAT_DATA_REL_LOCAL : SECCAT_DATA_REL;
- 	  else
- 	    ret = SECCAT_DATA;
- 	}
--      else if (reloc & targetm.asm_out.reloc_rw_mask ())
-+      else if (reloc & targetm.asm_out.reloc_rw_mask ()
-+              && !lookup_attribute ("section", DECL_ATTRIBUTES (decl)))
- 	ret = reloc == 1 ? SECCAT_DATA_REL_RO_LOCAL : SECCAT_DATA_REL_RO;
-       else if (reloc || flag_merge_constants < 2)
- 	/* C and C++ don't allow different variables to share the same
Index: tches/gcc-4.2.4-cross_search_paths-1.patch
===================================================================
--- patches/gcc-4.2.4-cross_search_paths-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,51 +1,0 @@
-Submitted by: Ryan Oliver <ryan.oliver@pha.com.au>
-Date: 2007-02-14
-Initial Package Version: 4.2.0
-Origin: Ryan Oliver (issue reported by Erik-Jan Post)
-        Rediffed against 4.1.0 by Chris Staub
-        Rediffed against 4.1.2 by Jim Gifford
-	Rediffed against 4.2.0 by Joe Ciccone
-Upstream Status: N/A
-Description:
-  Removes standard_exec_prefix_2 from library search path when cross-compiling.
-  Removes both standard_exec_prefix_1 and standard_exec_prefix_2 from the gcc
-  executable search path when cross-compiling.
-
-  ie: if cross_compile = 1 in the specs file, do not
-      - do not add /usr/lib/gcc/${TARGET}/${GCC_VER} to the library search path
-      - do not add /usr/lib/gcc/${TARGET}/${GCC_VER} or
-                   /usr/libexec/gcc/${TARGET}/${GCC_VER}
-        to the executable search path
-
-  This avoids the possibility of linking in libraries from the host if they
-  exist under those directories.
-
-diff -Naur gcc-4.2.0.orig/gcc/gcc.c gcc-4.2.0/gcc/gcc.c
---- gcc-4.2.0.orig/gcc/gcc.c	2007-05-16 19:21:26.000000000 -0400
-+++ gcc-4.2.0/gcc/gcc.c	2007-05-16 19:22:10.000000000 -0400
-@@ -3949,16 +3949,22 @@
- 	      PREFIX_PRIORITY_LAST, 2, 0);
-   add_prefix (&exec_prefixes, standard_exec_prefix, "BINUTILS",
- 	      PREFIX_PRIORITY_LAST, 2, 0);
--  add_prefix (&exec_prefixes, standard_exec_prefix_1, "BINUTILS",
-+  if (*cross_compile == '0')
-+    {
-+      add_prefix (&exec_prefixes, standard_exec_prefix_1, "BINUTILS",
- 	      PREFIX_PRIORITY_LAST, 2, 0);
--  add_prefix (&exec_prefixes, standard_exec_prefix_2, "BINUTILS",
-+      add_prefix (&exec_prefixes, standard_exec_prefix_2, "BINUTILS",
- 	      PREFIX_PRIORITY_LAST, 2, 0);
-+    }
- #endif
- 
-   add_prefix (&startfile_prefixes, standard_exec_prefix, "BINUTILS",
- 	      PREFIX_PRIORITY_LAST, 1, 0);
--  add_prefix (&startfile_prefixes, standard_exec_prefix_2, "BINUTILS",
-+  if (*cross_compile == '0')
-+    {
-+      add_prefix (&startfile_prefixes, standard_exec_prefix_2, "BINUTILS",
- 	      PREFIX_PRIORITY_LAST, 1, 0);
-+    }
- 
-   tooldir_prefix = concat (tooldir_base_prefix, spec_machine,
- 			   dir_separator_str, NULL);
Index: tches/gcc-4.2.4-posix-1.patch
===================================================================
--- patches/gcc-4.2.4-posix-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,296 +1,0 @@
-Submitted By: Jim Gifford (patches at jg555 dot com)
-Date: 2007-02-14
-Initial Package Version: 4.1.2
-Origin: Jim Gifford
-        Rediffed against 4.1.0 by Chris Staub
-        Rediffed against 4.1.2 by Jim Gifford
-	Rediffed and additions against 4.2.0 by Joe Ciccone
-Upstream Status: On Hold
-Description: Makes GCC Posix Compliant
-
-diff -Naur gcc-4.2.0.orig/contrib/test_summary gcc-4.2.0/contrib/test_summary
---- gcc-4.2.0.orig/contrib/test_summary	2007-05-16 19:21:35.000000000 -0400
-+++ gcc-4.2.0/contrib/test_summary	2007-05-18 16:38:48.000000000 -0400
-@@ -106,7 +106,7 @@
-     srcdir = configflags;
-     sub(/\/configure .*/, "", srcdir);
-     printf "LAST_UPDATED: ";
--    system("tail -1 " srcdir "/LAST_UPDATED");
-+    system("tail -n 1 " srcdir "/LAST_UPDATED");
-     print "";
- 
-     sub(/^[^ ]*\/configure */, " ", configflags);
-diff -Naur gcc-4.2.0.orig/gcc/configure.ac gcc-4.2.0/gcc/configure.ac
---- gcc-4.2.0.orig/gcc/configure.ac	2007-05-16 19:21:23.000000000 -0400
-+++ gcc-4.2.0/gcc/configure.ac	2007-05-18 16:39:21.000000000 -0400
-@@ -2227,7 +2227,7 @@
-   # Therefore, use diff -b for the comparisons.
-   if test x$gcc_cv_objdump != x \
-   && $gcc_cv_objdump -s -j .eh_frame conftest.o 2>/dev/null \
--     | tail -3 > conftest.got \
-+     | tail -n 3 > conftest.got \
-   && { diff -b conftest.lit conftest.got > /dev/null 2>&1 \
-     || diff -b conftest.big conftest.got > /dev/null 2>&1; }
-   then
-diff -Naur gcc-4.2.0.orig/gcc/configure gcc-4.2.0/gcc/configure
---- gcc-4.2.0.orig/gcc/configure	2007-05-16 19:21:26.000000000 -0400
-+++ gcc-4.2.0/gcc/configure	2007-05-18 16:39:10.000000000 -0400
-@@ -14120,7 +14120,7 @@
-   # Therefore, use diff -b for the comparisons.
-   if test x$gcc_cv_objdump != x \
-   && $gcc_cv_objdump -s -j .eh_frame conftest.o 2>/dev/null \
--     | tail -3 > conftest.got \
-+     | tail -n 3 > conftest.got \
-   && { diff -b conftest.lit conftest.got > /dev/null 2>&1 \
-     || diff -b conftest.big conftest.got > /dev/null 2>&1; }
-   then
-diff -Naur gcc-4.2.0.orig/gcc/testsuite/ada/acats/run_all.sh gcc-4.2.0/gcc/testsuite/ada/acats/run_all.sh
---- gcc-4.2.0.orig/gcc/testsuite/ada/acats/run_all.sh	2007-05-16 19:21:20.000000000 -0400
-+++ gcc-4.2.0/gcc/testsuite/ada/acats/run_all.sh	2007-05-18 16:44:02.000000000 -0400
-@@ -68,7 +68,7 @@
-   ls ${i}?.adb > ${i}.lst 2> /dev/null
-   ls ${i}*m.adb >> ${i}.lst 2> /dev/null
-   ls ${i}.adb >> ${i}.lst 2> /dev/null
--  main=`tail -1 ${i}.lst`
-+  main=`tail -n 1 ${i}.lst`
- }
- 
- EXTERNAL_OBJECTS=""
-diff -Naur gcc-4.2.0.orig/libgomp/acinclude.m4 gcc-4.2.0/libgomp/acinclude.m4
---- gcc-4.2.0.orig/libgomp/acinclude.m4	2007-05-16 19:21:18.000000000 -0400
-+++ gcc-4.2.0/libgomp/acinclude.m4	2007-05-18 16:42:11.000000000 -0400
-@@ -147,7 +147,7 @@
-   # Start by getting the version number.  I think the libtool test already
-   # does some of this, but throws away the result.
-   changequote(,)
--  ldver=`$LD --version 2>/dev/null | head -1 | \
-+  ldver=`$LD --version 2>/dev/null | head -n 1 | \
-          sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
-   changequote([,])
-   libgomp_gnu_ld_version=`echo $ldver | \
-diff -Naur gcc-4.2.0.orig/libgomp/configure gcc-4.2.0/libgomp/configure
---- gcc-4.2.0.orig/libgomp/configure	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/libgomp/configure	2007-05-18 16:42:19.000000000 -0400
-@@ -9314,7 +9314,7 @@
-   # Start by getting the version number.  I think the libtool test already
-   # does some of this, but throws away the result.
- 
--  ldver=`$LD --version 2>/dev/null | head -1 | \
-+  ldver=`$LD --version 2>/dev/null | head -n 1 | \
-          sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-   libgomp_gnu_ld_version=`echo $ldver | \
-diff -Naur gcc-4.2.0.orig/libjava/classpath/m4/ax_create_stdint_h.m4 gcc-4.2.0/libjava/classpath/m4/ax_create_stdint_h.m4
---- gcc-4.2.0.orig/libjava/classpath/m4/ax_create_stdint_h.m4	2007-05-16 19:21:35.000000000 -0400
-+++ gcc-4.2.0/libjava/classpath/m4/ax_create_stdint_h.m4	2007-05-18 16:43:26.000000000 -0400
-@@ -217,7 +217,7 @@
- fi # shortcircut to system "stdint.h"
- # ------------------ PREPARE VARIABLES ------------------------------
- if test "$GCC" = "yes" ; then
--ac_cv_stdint_message="using gnu compiler "`$CC --version | head -1`
-+ac_cv_stdint_message="using gnu compiler "`$CC --version | head -n 1`
- else
- ac_cv_stdint_message="using $CC"
- fi
-diff -Naur gcc-4.2.0.orig/libjava/classpath/configure gcc-4.2.0/libjava/classpath/configure
---- gcc-4.2.0.orig/libjava/classpath/configure	2007-05-16 19:21:35.000000000 -0400
-+++ gcc-4.2.0/libjava/classpath/configure	2007-05-18 16:43:09.000000000 -0400
-@@ -18514,7 +18514,7 @@
- fi # shortcircut to system "stdint.h"
- # ------------------ PREPARE VARIABLES ------------------------------
- if test "$GCC" = "yes" ; then
--ac_cv_stdint_message="using gnu compiler "`$CC --version | head -1`
-+ac_cv_stdint_message="using gnu compiler "`$CC --version | head -n 1`
- else
- ac_cv_stdint_message="using $CC"
- fi
-diff -Naur gcc-4.2.0.orig/libjava/classpath/ltcf-c.sh gcc-4.2.0/libjava/classpath/ltcf-c.sh
---- gcc-4.2.0.orig/libjava/classpath/ltcf-c.sh	2007-05-16 19:21:31.000000000 -0400
-+++ gcc-4.2.0/libjava/classpath/ltcf-c.sh	2007-05-18 16:42:36.000000000 -0400
-@@ -153,7 +153,7 @@
-     # If the export-symbols file already is a .def file (1st line
-     # is EXPORTS), use it as is.
-     # If DATA tags from a recent dlltool are present, honour them!
--    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
-+    archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
-         cp $export_symbols $output_objdir/$soname-def;
-       else
-         echo EXPORTS > $output_objdir/$soname-def;
-diff -Naur gcc-4.2.0.orig/libjava/classpath/ltcf-gcj.sh gcc-4.2.0/libjava/classpath/ltcf-gcj.sh
---- gcc-4.2.0.orig/libjava/classpath/ltcf-gcj.sh	2007-05-16 19:21:34.000000000 -0400
-+++ gcc-4.2.0/libjava/classpath/ltcf-gcj.sh	2007-05-18 16:42:45.000000000 -0400
-@@ -156,7 +156,7 @@
-     # If the export-symbols file already is a .def file (1st line
-     # is EXPORTS), use it as is.
-     # If DATA tags from a recent dlltool are present, honour them!
--    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
-+    archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
-         cp $export_symbols $output_objdir/$soname-def;
-       else
-         echo EXPORTS > $output_objdir/$soname-def;
-diff -Naur gcc-4.2.0.orig/libjava/mingwld.m4 gcc-4.2.0/libjava/mingwld.m4
---- gcc-4.2.0.orig/libjava/mingwld.m4	2007-05-16 19:21:29.000000000 -0400
-+++ gcc-4.2.0/libjava/mingwld.m4	2007-05-18 16:40:06.000000000 -0400
-@@ -3,8 +3,8 @@
- AC_MSG_CHECKING(whether 'ld' is at least 2.13)
- LD_PROG=`$CC --print-prog-name=ld`
- LD_VERSION=`$LD_PROG --version`
--LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
--LD_VERSION_MINOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 2`
-+LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
-+LD_VERSION_MINOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 2`
- if expr "$LD_VERSION_MAJOR" \> 2 > /dev/null; then
-   LD_OK="ok"
- else
-diff -Naur gcc-4.2.0.orig/libjava/configure gcc-4.2.0/libjava/configure
---- gcc-4.2.0.orig/libjava/configure	2007-05-16 19:21:29.000000000 -0400
-+++ gcc-4.2.0/libjava/configure	2007-05-18 16:39:43.000000000 -0400
-@@ -7025,8 +7025,8 @@
- echo $ECHO_N "checking whether 'ld' is at least 2.13... $ECHO_C" >&6
- LD_PROG=`$CC --print-prog-name=ld`
- LD_VERSION=`$LD_PROG --version`
--LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
--LD_VERSION_MINOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 2`
-+LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 1 | cut -d ' ' -f 4`
-+LD_VERSION_MINOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 2`
- if expr "$LD_VERSION_MAJOR" \> 2 > /dev/null; then
-   LD_OK="ok"
- else
-diff -Naur gcc-4.2.0.orig/libstdc++-v3/acinclude.m4 gcc-4.2.0/libstdc++-v3/acinclude.m4
---- gcc-4.2.0.orig/libstdc++-v3/acinclude.m4	2007-05-16 19:21:35.000000000 -0400
-+++ gcc-4.2.0/libstdc++-v3/acinclude.m4	2007-05-18 16:40:37.000000000 -0400
-@@ -234,7 +234,7 @@
-   if test x"$with_gnu_ld" = x"yes"; then
-     AC_MSG_CHECKING([for ld version])
-     changequote(,)
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
-     changequote([,])
-     glibcxx_gnu_ld_version=`echo $ldver | \
-diff -Naur gcc-4.2.0.orig/libstdc++-v3/configure gcc-4.2.0/libstdc++-v3/configure
---- gcc-4.2.0.orig/libstdc++-v3/configure	2007-05-16 19:21:36.000000000 -0400
-+++ gcc-4.2.0/libstdc++-v3/configure	2007-05-18 16:41:04.000000000 -0400
-@@ -8377,7 +8377,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
-@@ -54289,7 +54289,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
-@@ -75651,7 +75651,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
-@@ -77176,7 +77176,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
-@@ -78669,7 +78669,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
-@@ -100561,7 +100561,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
-@@ -101408,7 +101408,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
-@@ -102811,7 +102811,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
-@@ -104606,7 +104606,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
-@@ -105851,7 +105851,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
-@@ -106880,7 +106880,7 @@
-     echo "$as_me:$LINENO: checking for ld version" >&5
- echo $ECHO_N "checking for ld version... $ECHO_C" >&6
- 
--    ldver=`$LD --version 2>/dev/null | head -1 | \
-+    ldver=`$LD --version 2>/dev/null | head -n 1 | \
-            sed -e 's/GNU ld \(version \)\{0,1\}\(([^)]*) \)\{0,1\}\([0-9.][0-9.]*\).*/\3/'`
- 
-     glibcxx_gnu_ld_version=`echo $ldver | \
-diff -Naur gcc-4.2.0.orig/ltcf-c.sh gcc-4.2.0/ltcf-c.sh
---- gcc-4.2.0.orig/ltcf-c.sh	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/ltcf-c.sh	2007-05-18 16:41:18.000000000 -0400
-@@ -153,7 +153,7 @@
-     # If the export-symbols file already is a .def file (1st line
-     # is EXPORTS), use it as is.
-     # If DATA tags from a recent dlltool are present, honour them!
--    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
-+    archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
-         cp $export_symbols $output_objdir/$soname-def;
-       else
-         echo EXPORTS > $output_objdir/$soname-def;
-diff -Naur gcc-4.2.0.orig/ltcf-gcj.sh gcc-4.2.0/ltcf-gcj.sh
---- gcc-4.2.0.orig/ltcf-gcj.sh	2007-05-16 19:21:35.000000000 -0400
-+++ gcc-4.2.0/ltcf-gcj.sh	2007-05-18 16:41:29.000000000 -0400
-@@ -156,7 +156,7 @@
-     # If the export-symbols file already is a .def file (1st line
-     # is EXPORTS), use it as is.
-     # If DATA tags from a recent dlltool are present, honour them!
--    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
-+    archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS; then
-         cp $export_symbols $output_objdir/$soname-def;
-       else
-         echo EXPORTS > $output_objdir/$soname-def;
Index: tches/gcc-4.2.4-powerpc64_multilib-1.patch
===================================================================
--- patches/gcc-4.2.4-powerpc64_multilib-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,35 +1,0 @@
-Submitted By: Ken Moffat (ken at linuxfromscratch dot org)
-Origin: fedora
-        Rediffed against 4.1.0 by Chris Staub
-	Rediffed against 4.2.0 by Joe Ciccone
-	Rediffed agaisnt 4.2.4 by Ken Moffat
-Date: 2005-11-22
-Initial package version: 4.0.2
-Description: In a native ppc64 build, this fixes a linkage failure while
-installing a 32-bit nof/ (no -hardware- floating point) library, and also gets
-rid of 1500 failures in the g++ testsuite.  From fedora gcc-4.0.1, rediffed to
-apply with -p1.
-
-diff -Naur gcc-4.2.4.orig/gcc/config/rs6000/t-linux64 gcc-4.2.4/gcc/config/rs6000/t-linux64
---- gcc-4.2.4.orig/gcc/config/rs6000/t-linux64	2008-03-05 17:25:28.000000000 +0000
-+++ gcc-4.2.4/gcc/config/rs6000/t-linux64	2008-06-12 20:45:36.000000000 +0100
-@@ -14,13 +14,13 @@
- # it doesn't tell anything about the 32bit libraries on those systems.  Set
- # MULTILIB_OSDIRNAMES according to what is found on the target.
- 
--MULTILIB_OPTIONS        = m64/m32 msoft-float
--MULTILIB_DIRNAMES       = 64 32 nof
-+MULTILIB_OPTIONS        = m64/m32
-+MULTILIB_DIRNAMES       = 64 32
- MULTILIB_EXTRA_OPTS     = fPIC mstrict-align
--MULTILIB_EXCEPTIONS     = m64/msoft-float
--MULTILIB_EXCLUSIONS     = m64/!m32/msoft-float
--MULTILIB_OSDIRNAMES	= ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
--MULTILIB_MATCHES        = $(MULTILIB_MATCHES_FLOAT)
-+MULTILIB_EXCEPTIONS     =
-+MULTILIB_EXCLUSIONS     =
-+MULTILIB_OSDIRNAMES	= ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_MATCHES        =
- 
- softfp_wrap_start := '\#ifndef __powerpc64__'
- softfp_wrap_end := '\#endif'
Index: tches/gcc-4.2.4-pure64-1.patch
===================================================================
--- patches/gcc-4.2.4-pure64-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,172 +1,0 @@
-Submitted By: Jim Gifford (patches at jg555 dot com)
-Date: 2005-08-27
-Initial Package Version: 4.x
-Origin: Ken Moffat and Jim Gifford
-        Rediffed against 4.1.0 by Chris Staub
-	Changes for 4.2.{0,1,2} not noted
-	Rediffed against 4.2.4 and header reinstated by Ken Moffat
-Upstream Status: CLFS Specific
-Description: Make LIB64 builds in /lib instead of /lib64 
-
-diff -Naur gcc-4.2.4.orig/gcc/config/i386/linux64.h gcc-4.2.4/gcc/config/i386/linux64.h
---- gcc-4.2.4.orig/gcc/config/i386/linux64.h	2007-09-01 16:28:30.000000000 +0100
-+++ gcc-4.2.4/gcc/config/i386/linux64.h	2008-06-12 19:55:27.000000000 +0100
-@@ -48,8 +48,8 @@
-    When the -shared link option is used a final link is not being
-    done.  */
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
- 
- #undef	LINK_SPEC
- #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
-diff -Naur gcc-4.2.4.orig/gcc/config/i386/t-linux64 gcc-4.2.4/gcc/config/i386/t-linux64
---- gcc-4.2.4.orig/gcc/config/i386/t-linux64	2008-03-05 17:25:28.000000000 +0000
-+++ gcc-4.2.4/gcc/config/i386/t-linux64	2008-06-12 20:05:44.000000000 +0100
-@@ -13,7 +13,7 @@
- 
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32 
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
- 
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
-diff -Naur gcc-4.2.4.orig/gcc/config/mips/linux64.h gcc-4.2.4/gcc/config/mips/linux64.h
---- gcc-4.2.4.orig/gcc/config/mips/linux64.h	2007-09-01 16:28:30.000000000 +0100
-+++ gcc-4.2.4/gcc/config/mips/linux64.h	2008-06-12 19:55:27.000000000 +0100
-@@ -35,10 +35,10 @@
- %{!shared: %{pthread:-lpthread} \
-   %{profile:-lc_p} %{!profile: -lc}}"
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
--#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
--#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKERN32 "/lib64/ld.so.1"
-+#define UCLIBC_DYNAMIC_LINKERN32 "/lib64/ld-uClibc.so.0"
- #define LINUX_DYNAMIC_LINKERN32 \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
- 
-diff -Naur gcc-4.2.4.orig/gcc/config/mips/t-linux64 gcc-4.2.4/gcc/config/mips/t-linux64
---- gcc-4.2.4.orig/gcc/config/mips/t-linux64	2006-06-06 13:51:24.000000000 +0100
-+++ gcc-4.2.4/gcc/config/mips/t-linux64	2008-06-12 19:55:27.000000000 +0100
-@@ -1,6 +1,6 @@
- MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
- MULTILIB_DIRNAMES = n32 32 64
--MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
-+MULTILIB_OSDIRNAMES = ../lib64 ../lib32 ../lib
- 
- EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
- 
-diff -Naur gcc-4.2.4.orig/gcc/config/rs6000/linux64.h gcc-4.2.4/gcc/config/rs6000/linux64.h
---- gcc-4.2.4.orig/gcc/config/rs6000/linux64.h	2007-09-01 16:28:30.000000000 +0100
-+++ gcc-4.2.4/gcc/config/rs6000/linux64.h	2008-06-12 19:55:27.000000000 +0100
-@@ -335,8 +335,8 @@
- #undef	LINK_OS_DEFAULT_SPEC
- #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
- #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
- #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
- #if UCLIBC_DEFAULT
-diff -Naur gcc-4.2.4.orig/gcc/config/rs6000/t-linux64 gcc-4.2.4/gcc/config/rs6000/t-linux64
---- gcc-4.2.4.orig/gcc/config/rs6000/t-linux64	2008-03-05 17:25:28.000000000 +0000
-+++ gcc-4.2.4/gcc/config/rs6000/t-linux64	2008-06-12 20:13:59.000000000 +0100
-@@ -19,7 +19,7 @@
- MULTILIB_EXTRA_OPTS     = fPIC mstrict-align
- MULTILIB_EXCEPTIONS     = m64/msoft-float
- MULTILIB_EXCLUSIONS     = m64/!m32/msoft-float
--MULTILIB_OSDIRNAMES	= ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
-+MULTILIB_OSDIRNAMES	= ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
- MULTILIB_MATCHES        = $(MULTILIB_MATCHES_FLOAT)
- 
- softfp_wrap_start := '\#ifndef __powerpc64__'
-diff -Naur gcc-4.2.4.orig/gcc/config/s390/t-linux64 gcc-4.2.4/gcc/config/s390/t-linux64
---- gcc-4.2.4.orig/gcc/config/s390/t-linux64	2006-02-06 17:41:54.000000000 +0000
-+++ gcc-4.2.4/gcc/config/s390/t-linux64	2008-06-12 19:55:27.000000000 +0100
-@@ -1,6 +1,6 @@
- MULTILIB_OPTIONS = m64/m31
- MULTILIB_DIRNAMES = 64 32
--MULTILIB_OSDIRNAMES = ../lib64 ../lib
-+MULTILIB_OSDIRNAMES = ../lib ../lib32
- 
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
-diff -Naur gcc-4.2.4.orig/gcc/config/sparc/linux64.h gcc-4.2.4/gcc/config/sparc/linux64.h
---- gcc-4.2.4.orig/gcc/config/sparc/linux64.h	2007-09-01 16:28:30.000000000 +0100
-+++ gcc-4.2.4/gcc/config/sparc/linux64.h	2008-06-12 19:55:27.000000000 +0100
-@@ -143,8 +143,8 @@
- 
- /* If ELF is the default format, we should not use /lib/elf.  */
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2"
- #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
- #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
- #if UCLIBC_DEFAULT
-@@ -166,7 +166,7 @@
-   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
-   { "link_arch",	 LINK_ARCH_SPEC },
- 
--#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib32 %{shared:-shared} \
-   %{!shared: \
-     %{!ibcs: \
-       %{!static: \
-@@ -175,7 +175,7 @@
-         %{static:-static}}} \
- "
- 
--#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
-+#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib %{shared:-shared} \
-   %{!shared: \
-     %{!ibcs: \
-       %{!static: \
-@@ -256,7 +256,7 @@
- #else /* !SPARC_BI_ARCH */
- 
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib %{shared:-shared} \
-   %{!shared: \
-     %{!ibcs: \
-       %{!static: \
-diff -Naur gcc-4.2.4.orig/gcc/config/sparc/linux.h gcc-4.2.4/gcc/config/sparc/linux.h
---- gcc-4.2.4.orig/gcc/config/sparc/linux.h	2007-09-01 16:28:30.000000000 +0100
-+++ gcc-4.2.4/gcc/config/sparc/linux.h	2008-06-12 19:55:27.000000000 +0100
-@@ -132,7 +132,7 @@
- 
- 
- #undef  LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib32 %{shared:-shared} \
-   %{!mno-relax:%{!r:-relax}} \
-   %{!shared: \
-     %{!ibcs: \
-diff -Naur gcc-4.2.4.orig/gcc/config/sparc/t-linux64 gcc-4.2.4/gcc/config/sparc/t-linux64
---- gcc-4.2.4.orig/gcc/config/sparc/t-linux64	2006-02-08 07:19:43.000000000 +0000
-+++ gcc-4.2.4/gcc/config/sparc/t-linux64	2008-06-12 19:55:27.000000000 +0100
-@@ -1,6 +1,6 @@
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32
--MULTILIB_OSDIRNAMES = ../lib64 ../lib
-+MULTILIB_OSDIRNAMES = ../lib ../lib32
- 
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
-@@ -10,4 +10,4 @@
- 
- CRTSTUFF_T_CFLAGS = `if test x$$($(GCC_FOR_TARGET) $(MULTILIB_CFLAGS) \
- 				 -print-multi-os-directory) \
--			= x../lib64; then echo -mcmodel=medany; fi`
-+			= x../lib; then echo -mcmodel=medany; fi`
Index: tches/gcc-4.2.4-pure64_specs-1.patch
===================================================================
--- patches/gcc-4.2.4-pure64_specs-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,388 +1,0 @@
-Submitted By: Robert Connolly <robert at linuxfromscratch dot org> (ashes)
-Date: 2007-02-14
-Initial Package Version: 4.1.2
-Upstream Status: Not Sent - LFS Specific
-Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
-        the Pure LFS project.
-        More architectures added by Zack Winkles.
-        Further fine tunings by Greg Schafer.
-        Rediffed against gcc 4.0.0 by Robert Connolly.
-        Rediffed against gcc 4.1.0 by Chris Staub
-        Rediffed against gcc 4.1.2 by Jim Gifford
-        Rediffed against gcc 4.2.0 by Joe Ciccone
-Description: This patch modifies the location of the dynamic linker for
-        the GCC Pass 2 build in LFS Chapter 5.
-
-diff -Naur gcc-4.2.0.orig/gcc/config/alpha/gnu.h gcc-4.2.0/gcc/config/alpha/gnu.h
---- gcc-4.2.0.orig/gcc/config/alpha/gnu.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/alpha/gnu.h	2007-05-18 16:27:10.000000000 -0400
-@@ -11,7 +11,7 @@
-     } while (0)
- 
- #undef ELF_DYNAMIC_LINKER
--#define ELF_DYNAMIC_LINKER	"/lib/ld.so"
-+#define ELF_DYNAMIC_LINKER	"/tools/lib/ld.so"
- 
- #undef	STARTFILE_SPEC
- #define STARTFILE_SPEC \
-diff -Naur gcc-4.2.0.orig/gcc/config/alpha/linux-elf.h gcc-4.2.0/gcc/config/alpha/linux-elf.h
---- gcc-4.2.0.orig/gcc/config/alpha/linux-elf.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/alpha/linux-elf.h	2007-05-18 16:23:31.000000000 -0400
-@@ -28,8 +28,8 @@
- #define SUBTARGET_EXTRA_SPECS \
- { "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
- 
--#define GLIBC_DYNAMIC_LINKER	"/lib/ld-linux.so.2"
--#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER	"/tools/lib/ld-linux.so.2"
-+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
- #if UCLIBC_DEFAULT
- #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
- #else
-diff -Naur gcc-4.2.0.orig/gcc/config/arm/linux-eabi.h gcc-4.2.0/gcc/config/arm/linux-eabi.h
---- gcc-4.2.0.orig/gcc/config/arm/linux-eabi.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/arm/linux-eabi.h	2007-05-18 16:26:45.000000000 -0400
-@@ -53,7 +53,7 @@
- /* Use ld-linux.so.3 so that it will be possible to run "classic"
-    GNU/Linux binaries on an EABI system.  */
- #undef GLIBC_DYNAMIC_LINKER
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.3"
- 
- /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
-    use the GNU/Linux version, not the generic BPABI version.  */
-diff -Naur gcc-4.2.0.orig/gcc/config/arm/linux-elf.h gcc-4.2.0/gcc/config/arm/linux-elf.h
---- gcc-4.2.0.orig/gcc/config/arm/linux-elf.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/arm/linux-elf.h	2007-05-18 16:23:31.000000000 -0400
-@@ -51,7 +51,7 @@
- 
- #define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
- 
- #define LINUX_TARGET_LINK_SPEC  "%{h*} %{version:-v} \
-    %{b} \
-diff -Naur gcc-4.2.0.orig/gcc/config/cris/linux.h gcc-4.2.0/gcc/config/cris/linux.h
---- gcc-4.2.0.orig/gcc/config/cris/linux.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/cris/linux.h	2007-05-18 16:30:54.000000000 -0400
-@@ -76,7 +76,7 @@
- #undef CRIS_SUBTARGET_VERSION
- #define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- /* We need an -rpath-link to ld.so.1, and presumably to each directory
-    specified with -B.  */
-dff -Naur gcc-4.2.0.orig/gcc/config/frv/linux.h gcc-4.2.0/gcc/config/frv/linux.h
---- gcc-4.2.0.orig/gcc/config/frv/linux.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/frv/linux.h	2007-05-18 16:23:31.000000000 -0400
-@@ -36,7 +36,7 @@
- #define ENDFILE_SPEC \
-   "%{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s"
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef LINK_SPEC
- #define LINK_SPEC "\
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/gnu.h gcc-4.2.0/gcc/config/i386/gnu.h
---- gcc-4.2.0.orig/gcc/config/i386/gnu.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/gnu.h	2007-05-18 16:23:31.000000000 -0400
-@@ -22,7 +22,7 @@
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
--      %{!dynamic-linker:-dynamic-linker /lib/ld.so}} \
-+      %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so}} \
-     %{static:-static}}"
- 
- #undef	STARTFILE_SPEC
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h
---- gcc-4.2.0.orig/gcc/config/i386/linux64.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/linux64.h	2007-05-18 16:23:31.000000000 -0400
-@@ -49,8 +49,8 @@
-    When the -shared link option is used a final link is not being
-    done.  */
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-linux-x86-64.so.2"
- 
- #undef	LINK_SPEC
- #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux.h gcc-4.2.0/gcc/config/i386/linux.h
---- gcc-4.2.0.orig/gcc/config/i386/linux.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/linux.h	2007-05-18 16:23:31.000000000 -0400
-@@ -101,7 +101,7 @@
- 
- /* These macros may be overridden in k*bsd-gnu.h and i386/k*bsd-gnu.h. */
- #define LINK_EMULATION "elf_i386"
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
- 
- #undef  SUBTARGET_EXTRA_SPECS
- #define SUBTARGET_EXTRA_SPECS \
-diff -Naur gcc-4.2.0.orig/gcc/config/ia64/linux.h gcc-4.2.0/gcc/config/ia64/linux.h
---- gcc-4.2.0.orig/gcc/config/ia64/linux.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/ia64/linux.h	2007-05-18 16:23:31.000000000 -0400
-@@ -37,7 +37,7 @@
- /* Define this for shared library support because it isn't in the main
-    linux.h file.  */
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-ia64.so.2"
- 
- #undef LINK_SPEC
- #define LINK_SPEC "\
-diff -Naur gcc-4.2.0.orig/gcc/config/linux.h gcc-4.2.0/gcc/config/linux.h
---- gcc-4.2.0.orig/gcc/config/linux.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/linux.h	2007-05-18 16:23:31.000000000 -0400
-@@ -112,9 +112,9 @@
-    GLIBC_DYNAMIC_LINKER must be defined for each target using them, or
-    GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
-    supporting both 32-bit and 64-bit compilation.  */
--#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
--#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
--#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
- #define LINUX_DYNAMIC_LINKER \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
- #define LINUX_DYNAMIC_LINKER32 \
-@@ -127,3 +127,7 @@
- #define TARGET_C99_FUNCTIONS (OPTION_GLIBC)
- 
- #define TARGET_POSIX_IO
-+
-+/* Remove /usr/include from the end of the include search path.  */
-+#undef STANDARD_INCLUDE_DIR
-+#define STANDARD_INCLUDE_DIR 0
-diff -Naur gcc-4.2.0.orig/gcc/config/m32r/linux.h gcc-4.2.0/gcc/config/m32r/linux.h
---- gcc-4.2.0.orig/gcc/config/m32r/linux.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/m32r/linux.h	2007-05-18 16:23:31.000000000 -0400
-@@ -59,7 +59,7 @@
- 
- /* If ELF is the default format, we should not use /lib/elf.  */
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
- 
- #undef	LINK_SPEC
- #if TARGET_LITTLE_ENDIAN
-diff -Naur gcc-4.2.0.orig/gcc/config/m68k/linux.h gcc-4.2.0/gcc/config/m68k/linux.h
---- gcc-4.2.0.orig/gcc/config/m68k/linux.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/m68k/linux.h	2007-05-18 16:23:31.000000000 -0400
-@@ -123,7 +123,7 @@
- 
- /* If ELF is the default format, we should not use /lib/elf.  */
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef	LINK_SPEC
- #define LINK_SPEC "-m m68kelf %{shared} \
-diff -Naur gcc-4.2.0.orig/gcc/config/mips/linux64.h gcc-4.2.0/gcc/config/mips/linux64.h
---- gcc-4.2.0.orig/gcc/config/mips/linux64.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/mips/linux64.h	2007-05-18 16:23:31.000000000 -0400
-@@ -36,10 +36,10 @@
- %{!shared: %{pthread:-lpthread} \
-   %{profile:-lc_p} %{!profile: -lc}}"
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
--#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
--#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKERN32 "/tools/lib64/ld.so.1"
-+#define UCLIBC_DYNAMIC_LINKERN32 "/tools/lib64/ld-uClibc.so.0"
- #define LINUX_DYNAMIC_LINKERN32 \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
- 
-diff -Naur gcc-4.2.0.orig/gcc/config/mips/linux.h gcc-4.2.0/gcc/config/mips/linux.h
---- gcc-4.2.0.orig/gcc/config/mips/linux.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/mips/linux.h	2007-05-18 16:23:31.000000000 -0400
-@@ -104,7 +104,7 @@
- #undef MIPS_DEFAULT_GVALUE
- #define MIPS_DEFAULT_GVALUE 0
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- /* Borrowed from sparc/linux.h */
- #undef LINK_SPEC
-diff -Naur gcc-4.2.0.orig/gcc/config/mn10300/linux.h gcc-4.2.0/gcc/config/mn10300/linux.h
---- gcc-4.2.0.orig/gcc/config/mn10300/linux.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/mn10300/linux.h	2007-05-18 16:23:31.000000000 -0400
-@@ -33,7 +33,7 @@
- #undef  ASM_SPEC
- #define ASM_SPEC "%{Wa,*:%*}"
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef  LINK_SPEC
- #define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \
-diff -Naur gcc-4.2.0.orig/gcc/config/pa/pa-linux.h gcc-4.2.0/gcc/config/pa/pa-linux.h
---- gcc-4.2.0.orig/gcc/config/pa/pa-linux.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/pa/pa-linux.h	2007-05-18 16:23:31.000000000 -0400
-@@ -45,7 +45,7 @@
- /* Define this for shared library support because it isn't in the main
-    linux.h file.  */
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef LINK_SPEC
- #define LINK_SPEC "\
-diff -Naur gcc-4.2.0.orig/gcc/config/rs6000/linux64.h gcc-4.2.0/gcc/config/rs6000/linux64.h
---- gcc-4.2.0.orig/gcc/config/rs6000/linux64.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/rs6000/linux64.h	2007-05-18 16:23:31.000000000 -0400
-@@ -336,10 +336,10 @@
- #undef	LINK_OS_DEFAULT_SPEC
- #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
--#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
--#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1"
-+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
- #if UCLIBC_DEFAULT
- #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
- #else
-diff -Naur gcc-4.2.0.orig/gcc/config/rs6000/sysv4.h gcc-4.2.0/gcc/config/rs6000/sysv4.h
---- gcc-4.2.0.orig/gcc/config/rs6000/sysv4.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/rs6000/sysv4.h	2007-05-18 16:29:05.000000000 -0400
-@@ -892,8 +892,8 @@
- 
- #define LINK_START_LINUX_SPEC ""
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
--#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
-+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
- #if UCLIBC_DEFAULT
- #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
- #else
-@@ -935,7 +935,7 @@
- 
- #define LINK_OS_GNU_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
--  %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
-+  %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so.1}}}"
- 
- #define CPP_OS_GNU_SPEC "-D__unix__ -D__gnu_hurd__ -D__GNU__	\
- %{!undef:					                \
-diff -Naur gcc-4.2.0.orig/gcc/config/s390/linux.h gcc-4.2.0/gcc/config/s390/linux.h
---- gcc-4.2.0.orig/gcc/config/s390/linux.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/s390/linux.h	2007-05-18 16:23:31.000000000 -0400
-@@ -73,8 +73,8 @@
- #define MULTILIB_DEFAULTS { "m31" }
- #endif
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
--#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
-+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1"
- 
- #undef  LINK_SPEC
- #define LINK_SPEC \
-diff -Naur gcc-4.2.0.orig/gcc/config/sh/linux.h gcc-4.2.0/gcc/config/sh/linux.h
---- gcc-4.2.0.orig/gcc/config/sh/linux.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/sh/linux.h	2007-05-18 16:23:31.000000000 -0400
-@@ -48,7 +48,7 @@
- 
- #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
- 
- #undef SUBTARGET_LINK_EMUL_SUFFIX
- #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
-diff -Naur gcc-4.2.0.orig/gcc/config/sparc/linux64.h gcc-4.2.0/gcc/config/sparc/linux64.h
---- gcc-4.2.0.orig/gcc/config/sparc/linux64.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/sparc/linux64.h	2007-05-18 16:25:23.000000000 -0400
-@@ -144,10 +144,10 @@
- 
- /* If ELF is the default format, we should not use /lib/elf.  */
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
--#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
--#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-linux.so.2"
-+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
- #if UCLIBC_DEFAULT
- #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
- #else
-@@ -167,7 +167,7 @@
-   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
-   { "link_arch",	 LINK_ARCH_SPEC },
- 
--#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/tools/lib32 %{shared:-shared} \
-   %{!shared: \
-     %{!ibcs: \
-       %{!static: \
-@@ -176,7 +176,7 @@
-         %{static:-static}}} \
- "
- 
--#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
-+#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/tools/lib %{shared:-shared} \
-   %{!shared: \
-     %{!ibcs: \
-       %{!static: \
-@@ -257,7 +257,7 @@
- #else /* !SPARC_BI_ARCH */
- 
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc -Y P,/tools/lib %{shared:-shared} \
-   %{!shared: \
-     %{!ibcs: \
-       %{!static: \
-diff -Naur gcc-4.2.0.orig/gcc/config/sparc/linux.h gcc-4.2.0/gcc/config/sparc/linux.h
---- gcc-4.2.0.orig/gcc/config/sparc/linux.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/sparc/linux.h	2007-05-18 16:24:24.000000000 -0400
-@@ -121,8 +121,8 @@
- 
- /* If ELF is the default format, we should not use /lib/elf.  */
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
--#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
-+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
- #if UCLIBC_DEFAULT
- #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
- #else
-@@ -133,7 +133,7 @@
- 
- 
- #undef  LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc -Y P,/tools/lib32 %{shared:-shared} \
-   %{!mno-relax:%{!r:-relax}} \
-   %{!shared: \
-     %{!ibcs: \
-diff -Naur gcc-4.2.0.orig/gcc/config/xtensa/linux.h gcc-4.2.0/gcc/config/xtensa/linux.h
---- gcc-4.2.0.orig/gcc/config/xtensa/linux.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/xtensa/linux.h	2007-05-18 16:23:31.000000000 -0400
-@@ -43,7 +43,7 @@
-   %{mlongcalls:--longcalls} \
-   %{mno-longcalls:--no-longcalls}"
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef LINK_SPEC
- #define LINK_SPEC \
Index: tches/gcc-4.2.4-specs-1.patch
===================================================================
--- patches/gcc-4.2.4-specs-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,388 +1,0 @@
-Submitted By: Robert Connolly <robert at linuxfromscratch dot org> (ashes)
-Date: 2007-02-14
-Initial Package Version: 4.1.2
-Upstream Status: Not Sent - LFS Specific
-Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
-        the Pure LFS project.
-        More architectures added by Zack Winkles.
-        Further fine tunings by Greg Schafer.
-        Rediffed against gcc 4.0.0 by Robert Connolly.
-        Rediffed against gcc 4.1.0 by Chris Staub
-        Rediffed against gcc 4.1.2 by Jim Gifford
-        Rediffed against gcc 4.2.0 by Joe Ciccone
-Description: This patch modifies the location of the dynamic linker for
-        the GCC Pass 2 build in LFS Chapter 5.
-
-diff -Naur gcc-4.2.0.orig/gcc/config/alpha/gnu.h gcc-4.2.0/gcc/config/alpha/gnu.h
---- gcc-4.2.0.orig/gcc/config/alpha/gnu.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/alpha/gnu.h	2007-05-18 16:27:10.000000000 -0400
-@@ -11,7 +11,7 @@
-     } while (0)
- 
- #undef ELF_DYNAMIC_LINKER
--#define ELF_DYNAMIC_LINKER	"/lib/ld.so"
-+#define ELF_DYNAMIC_LINKER	"/tools/lib/ld.so"
- 
- #undef	STARTFILE_SPEC
- #define STARTFILE_SPEC \
-diff -Naur gcc-4.2.0.orig/gcc/config/alpha/linux-elf.h gcc-4.2.0/gcc/config/alpha/linux-elf.h
---- gcc-4.2.0.orig/gcc/config/alpha/linux-elf.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/alpha/linux-elf.h	2007-05-18 16:23:31.000000000 -0400
-@@ -28,8 +28,8 @@
- #define SUBTARGET_EXTRA_SPECS \
- { "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
- 
--#define GLIBC_DYNAMIC_LINKER	"/lib/ld-linux.so.2"
--#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER	"/tools/lib/ld-linux.so.2"
-+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
- #if UCLIBC_DEFAULT
- #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
- #else
-diff -Naur gcc-4.2.0.orig/gcc/config/arm/linux-eabi.h gcc-4.2.0/gcc/config/arm/linux-eabi.h
---- gcc-4.2.0.orig/gcc/config/arm/linux-eabi.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/arm/linux-eabi.h	2007-05-18 16:26:45.000000000 -0400
-@@ -53,7 +53,7 @@
- /* Use ld-linux.so.3 so that it will be possible to run "classic"
-    GNU/Linux binaries on an EABI system.  */
- #undef GLIBC_DYNAMIC_LINKER
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.3"
- 
- /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
-    use the GNU/Linux version, not the generic BPABI version.  */
-diff -Naur gcc-4.2.0.orig/gcc/config/arm/linux-elf.h gcc-4.2.0/gcc/config/arm/linux-elf.h
---- gcc-4.2.0.orig/gcc/config/arm/linux-elf.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/arm/linux-elf.h	2007-05-18 16:23:31.000000000 -0400
-@@ -51,7 +51,7 @@
- 
- #define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
- 
- #define LINUX_TARGET_LINK_SPEC  "%{h*} %{version:-v} \
-    %{b} \
-diff -Naur gcc-4.2.0.orig/gcc/config/cris/linux.h gcc-4.2.0/gcc/config/cris/linux.h
---- gcc-4.2.0.orig/gcc/config/cris/linux.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/cris/linux.h	2007-05-18 16:30:54.000000000 -0400
-@@ -76,7 +76,7 @@
- #undef CRIS_SUBTARGET_VERSION
- #define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- /* We need an -rpath-link to ld.so.1, and presumably to each directory
-    specified with -B.  */
-diff -Naur gcc-4.2.0.orig/gcc/config/frv/linux.h gcc-4.2.0/gcc/config/frv/linux.h
---- gcc-4.2.0.orig/gcc/config/frv/linux.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/frv/linux.h	2007-05-18 16:23:31.000000000 -0400
-@@ -36,7 +36,7 @@
- #define ENDFILE_SPEC \
-   "%{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s"
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef LINK_SPEC
- #define LINK_SPEC "\
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/gnu.h gcc-4.2.0/gcc/config/i386/gnu.h
---- gcc-4.2.0.orig/gcc/config/i386/gnu.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/gnu.h	2007-05-18 16:23:31.000000000 -0400
-@@ -22,7 +22,7 @@
-   %{!shared: \
-     %{!static: \
-       %{rdynamic:-export-dynamic} \
--      %{!dynamic-linker:-dynamic-linker /lib/ld.so}} \
-+      %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so}} \
-     %{static:-static}}"
- 
- #undef	STARTFILE_SPEC
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h
---- gcc-4.2.0.orig/gcc/config/i386/linux64.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/linux64.h	2007-05-18 16:23:31.000000000 -0400
-@@ -49,8 +49,8 @@
-    When the -shared link option is used a final link is not being
-    done.  */
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld-linux-x86-64.so.2"
- 
- #undef	LINK_SPEC
- #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux.h gcc-4.2.0/gcc/config/i386/linux.h
---- gcc-4.2.0.orig/gcc/config/i386/linux.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/linux.h	2007-05-18 16:23:31.000000000 -0400
-@@ -101,7 +101,7 @@
- 
- /* These macros may be overridden in k*bsd-gnu.h and i386/k*bsd-gnu.h. */
- #define LINK_EMULATION "elf_i386"
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
- 
- #undef  SUBTARGET_EXTRA_SPECS
- #define SUBTARGET_EXTRA_SPECS \
-diff -Naur gcc-4.2.0.orig/gcc/config/ia64/linux.h gcc-4.2.0/gcc/config/ia64/linux.h
---- gcc-4.2.0.orig/gcc/config/ia64/linux.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/ia64/linux.h	2007-05-18 16:23:31.000000000 -0400
-@@ -37,7 +37,7 @@
- /* Define this for shared library support because it isn't in the main
-    linux.h file.  */
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-ia64.so.2"
- 
- #undef LINK_SPEC
- #define LINK_SPEC "\
-diff -Naur gcc-4.2.0.orig/gcc/config/linux.h gcc-4.2.0/gcc/config/linux.h
---- gcc-4.2.0.orig/gcc/config/linux.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/linux.h	2007-05-18 16:23:31.000000000 -0400
-@@ -112,9 +112,9 @@
-    GLIBC_DYNAMIC_LINKER must be defined for each target using them, or
-    GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
-    supporting both 32-bit and 64-bit compilation.  */
--#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
--#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
--#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
- #define LINUX_DYNAMIC_LINKER \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
- #define LINUX_DYNAMIC_LINKER32 \
-@@ -127,3 +127,7 @@
- #define TARGET_C99_FUNCTIONS (OPTION_GLIBC)
- 
- #define TARGET_POSIX_IO
-+
-+/* Remove /usr/include from the end of the include search path.  */
-+#undef STANDARD_INCLUDE_DIR
-+#define STANDARD_INCLUDE_DIR 0
-diff -Naur gcc-4.2.0.orig/gcc/config/m32r/linux.h gcc-4.2.0/gcc/config/m32r/linux.h
---- gcc-4.2.0.orig/gcc/config/m32r/linux.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/m32r/linux.h	2007-05-18 16:23:31.000000000 -0400
-@@ -59,7 +59,7 @@
- 
- /* If ELF is the default format, we should not use /lib/elf.  */
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
- 
- #undef	LINK_SPEC
- #if TARGET_LITTLE_ENDIAN
-diff -Naur gcc-4.2.0.orig/gcc/config/m68k/linux.h gcc-4.2.0/gcc/config/m68k/linux.h
---- gcc-4.2.0.orig/gcc/config/m68k/linux.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/m68k/linux.h	2007-05-18 16:23:31.000000000 -0400
-@@ -123,7 +123,7 @@
- 
- /* If ELF is the default format, we should not use /lib/elf.  */
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef	LINK_SPEC
- #define LINK_SPEC "-m m68kelf %{shared} \
-diff -Naur gcc-4.2.0.orig/gcc/config/mips/linux64.h gcc-4.2.0/gcc/config/mips/linux64.h
---- gcc-4.2.0.orig/gcc/config/mips/linux64.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/mips/linux64.h	2007-05-18 16:23:31.000000000 -0400
-@@ -36,10 +36,10 @@
- %{!shared: %{pthread:-lpthread} \
-   %{profile:-lc_p} %{!profile: -lc}}"
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
--#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
--#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKERN32 "/tools/lib32/ld.so.1"
-+#define UCLIBC_DYNAMIC_LINKERN32 "/tools/lib32/ld-uClibc.so.0"
- #define LINUX_DYNAMIC_LINKERN32 \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
- 
-diff -Naur gcc-4.2.0.orig/gcc/config/mips/linux.h gcc-4.2.0/gcc/config/mips/linux.h
---- gcc-4.2.0.orig/gcc/config/mips/linux.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/mips/linux.h	2007-05-18 16:23:31.000000000 -0400
-@@ -104,7 +104,7 @@
- #undef MIPS_DEFAULT_GVALUE
- #define MIPS_DEFAULT_GVALUE 0
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- /* Borrowed from sparc/linux.h */
- #undef LINK_SPEC
-diff -Naur gcc-4.2.0.orig/gcc/config/mn10300/linux.h gcc-4.2.0/gcc/config/mn10300/linux.h
---- gcc-4.2.0.orig/gcc/config/mn10300/linux.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/mn10300/linux.h	2007-05-18 16:23:31.000000000 -0400
-@@ -33,7 +33,7 @@
- #undef  ASM_SPEC
- #define ASM_SPEC "%{Wa,*:%*}"
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef  LINK_SPEC
- #define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \
-diff -Naur gcc-4.2.0.orig/gcc/config/pa/pa-linux.h gcc-4.2.0/gcc/config/pa/pa-linux.h
---- gcc-4.2.0.orig/gcc/config/pa/pa-linux.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/pa/pa-linux.h	2007-05-18 16:23:31.000000000 -0400
-@@ -45,7 +45,7 @@
- /* Define this for shared library support because it isn't in the main
-    linux.h file.  */
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef LINK_SPEC
- #define LINK_SPEC "\
-diff -Naur gcc-4.2.0.orig/gcc/config/rs6000/linux64.h gcc-4.2.0/gcc/config/rs6000/linux64.h
---- gcc-4.2.0.orig/gcc/config/rs6000/linux64.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/rs6000/linux64.h	2007-05-18 16:23:31.000000000 -0400
-@@ -336,10 +336,10 @@
- #undef	LINK_OS_DEFAULT_SPEC
- #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
--#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
--#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld64.so.1"
-+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
- #if UCLIBC_DEFAULT
- #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
- #else
-diff -Naur gcc-4.2.0.orig/gcc/config/rs6000/sysv4.h gcc-4.2.0/gcc/config/rs6000/sysv4.h
---- gcc-4.2.0.orig/gcc/config/rs6000/sysv4.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/rs6000/sysv4.h	2007-05-18 16:29:05.000000000 -0400
-@@ -892,8 +892,8 @@
- 
- #define LINK_START_LINUX_SPEC ""
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
--#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
-+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
- #if UCLIBC_DEFAULT
- #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
- #else
-@@ -935,7 +935,7 @@
- 
- #define LINK_OS_GNU_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-   %{rdynamic:-export-dynamic} \
--  %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
-+  %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so.1}}}"
- 
- #define CPP_OS_GNU_SPEC "-D__unix__ -D__gnu_hurd__ -D__GNU__	\
- %{!undef:					                \
-diff -Naur gcc-4.2.0.orig/gcc/config/s390/linux.h gcc-4.2.0/gcc/config/s390/linux.h
---- gcc-4.2.0.orig/gcc/config/s390/linux.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/s390/linux.h	2007-05-18 16:23:31.000000000 -0400
-@@ -73,8 +73,8 @@
- #define MULTILIB_DEFAULTS { "m31" }
- #endif
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
--#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
-+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1"
- 
- #undef  LINK_SPEC
- #define LINK_SPEC \
-diff -Naur gcc-4.2.0.orig/gcc/config/sh/linux.h gcc-4.2.0/gcc/config/sh/linux.h
---- gcc-4.2.0.orig/gcc/config/sh/linux.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/sh/linux.h	2007-05-18 16:23:31.000000000 -0400
-@@ -48,7 +48,7 @@
- 
- #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
- 
- #undef SUBTARGET_LINK_EMUL_SUFFIX
- #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
-diff -Naur gcc-4.2.0.orig/gcc/config/sparc/linux64.h gcc-4.2.0/gcc/config/sparc/linux64.h
---- gcc-4.2.0.orig/gcc/config/sparc/linux64.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/sparc/linux64.h	2007-05-18 16:25:23.000000000 -0400
-@@ -144,10 +144,10 @@
- 
- /* If ELF is the default format, we should not use /lib/elf.  */
- 
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
--#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
--#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld-linux.so.2"
-+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
- #if UCLIBC_DEFAULT
- #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
- #else
-@@ -167,7 +167,7 @@
-   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
-   { "link_arch",	 LINK_ARCH_SPEC },
- 
--#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/tools/lib %{shared:-shared} \
-   %{!shared: \
-     %{!ibcs: \
-       %{!static: \
-@@ -176,7 +176,7 @@
-         %{static:-static}}} \
- "
- 
--#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
-+#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/tools/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!ibcs: \
-       %{!static: \
-@@ -257,7 +257,7 @@
- #else /* !SPARC_BI_ARCH */
- 
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc -Y P,/tools/lib64 %{shared:-shared} \
-   %{!shared: \
-     %{!ibcs: \
-       %{!static: \
-diff -Naur gcc-4.2.0.orig/gcc/config/sparc/linux.h gcc-4.2.0/gcc/config/sparc/linux.h
---- gcc-4.2.0.orig/gcc/config/sparc/linux.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/sparc/linux.h	2007-05-18 16:24:24.000000000 -0400
-@@ -121,8 +121,8 @@
- 
- /* If ELF is the default format, we should not use /lib/elf.  */
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
--#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
-+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
- #if UCLIBC_DEFAULT
- #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
- #else
-@@ -133,7 +133,7 @@
- 
- 
- #undef  LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc -Y P,/tools/lib %{shared:-shared} \
-   %{!mno-relax:%{!r:-relax}} \
-   %{!shared: \
-     %{!ibcs: \
-diff -Naur gcc-4.2.0.orig/gcc/config/xtensa/linux.h gcc-4.2.0/gcc/config/xtensa/linux.h
---- gcc-4.2.0.orig/gcc/config/xtensa/linux.h	2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/xtensa/linux.h	2007-05-18 16:23:31.000000000 -0400
-@@ -43,7 +43,7 @@
-   %{mlongcalls:--longcalls} \
-   %{mno-longcalls:--no-longcalls}"
- 
--#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
- 
- #undef LINK_SPEC
- #define LINK_SPEC \
Index: patches/glibc-2.3.3-lfh-m68k-no-precision-timers.patch
===================================================================
--- patches/glibc-2.3.3-lfh-m68k-no-precision-timers.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/glibc-2.3.3-lfh-m68k-no-precision-timers.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,11 @@
+--- glibc-20040423/sysdeps/unix/sysv/linux/kernel-features.h-orig	Tue Jun  8 00:00:18 2004
++++ glibc-20040423/sysdeps/unix/sysv/linux/kernel-features.h	Tue Jun  8 00:01:28 2004
+@@ -300,7 +300,7 @@
+ 
+ /* Beginning with 2.5.63 support for realtime and monotonic clocks and
+    timers based on them is available.  */
+-#if __LINUX_KERNEL_VERSION >= 132415
++#if __LINUX_KERNEL_VERSION >= 132415 && !defined __mc68000__
+ # define __ASSUME_POSIX_TIMERS		1
+ #endif
+ 
Index: patches/glibc-2.3.3-lfs-5.1-m68k_fix_fcntl.patch
===================================================================
--- patches/glibc-2.3.3-lfs-5.1-m68k_fix_fcntl.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/glibc-2.3.3-lfs-5.1-m68k_fix_fcntl.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,234 @@
+diff -uNr glibc-2.3.3-lfs-5.1-ORIG/sysdeps/unix/sysv/linux/m68k/fcntl.c glibc-2.3.3-lfs-5.1/sysdeps/unix/sysv/linux/m68k/fcntl.c
+--- glibc-2.3.3-lfs-5.1-ORIG/sysdeps/unix/sysv/linux/m68k/fcntl.c	2000-10-15 04:48:52.000000000 +1100
++++ glibc-2.3.3-lfs-5.1/sysdeps/unix/sysv/linux/m68k/fcntl.c	2004-05-22 16:45:59.000000000 +1000
+@@ -1 +1,140 @@
+-#include <sysdeps/unix/sysv/linux/i386/fcntl.c>
++/* Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, write to the Free
++   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++   02111-1307 USA.  */
++
++#include <assert.h>
++#include <errno.h>
++#include <fcntl.h>
++#include <stdarg.h>
++
++#include <sysdep-cancel.h>
++#include <sys/syscall.h>
++#include "../kernel-features.h"
++
++/* This variable is shared with all files that check for fcntl64.  */
++int __have_no_fcntl64;
++
++
++int
++__fcntl_nocancel (int fd, int cmd, ...)
++{
++  va_list ap;
++  void *arg;
++
++  va_start (ap, cmd);
++  arg = va_arg (ap, void *);
++  va_end (ap);
++
++  switch (cmd)
++    {
++    case F_GETLK64:
++      /* Convert arg from flock64 to flock and back.  */
++      {
++	struct flock fl;
++	struct flock64 *fl64 = arg;
++	int res;
++
++	fl.l_start = (off_t)fl64->l_start;
++	/* Check if we can represent the values with the smaller type.  */
++	if ((off64_t) fl.l_start != fl64->l_start)
++	  {
++	    __set_errno (EOVERFLOW);
++	    return -1;
++	  }
++	fl.l_len = (off_t) fl64->l_len;
++	/* Check if we can represent the values with the smaller type.  */
++	if ((off64_t) fl.l_len != fl64->l_len)
++	  {
++	    __set_errno (EOVERFLOW);
++	    return -1;
++	  }
++	fl.l_type = fl64->l_type;
++	fl.l_whence = fl64->l_whence;
++	fl.l_pid = fl64->l_pid;
++
++	res = INLINE_SYSCALL (fcntl, 3, fd, F_GETLK, &fl);
++	if (res  != 0)
++	  return res;
++	/* Everything ok, convert back.  */
++	fl64->l_type = fl.l_type;
++	fl64->l_whence = fl.l_whence;
++	fl64->l_start = fl.l_start;
++	fl64->l_len = fl.l_len;
++	fl64->l_pid = fl.l_pid;
++
++	return 0;
++      }
++    case F_SETLK64:
++    case F_SETLKW64:
++      /* Try to convert arg from flock64 to flock.  */
++      {
++	struct flock fl;
++	struct flock64 *fl64 = arg;
++
++	fl.l_start = (off_t) fl64->l_start;
++	/* Check if we can represent the values with the smaller type.  */
++	if ((off64_t) fl.l_start != fl64->l_start)
++	  {
++	    __set_errno (EOVERFLOW);
++	    return -1;
++	  }
++	fl.l_len = (off_t)fl64->l_len;
++	/* Check if we can represent the values with the smaller type.  */
++	if ((off64_t) fl.l_len != fl64->l_len)
++	  {
++	    __set_errno (EOVERFLOW);
++	    return -1;
++	  }
++	fl.l_type = fl64->l_type;
++	fl.l_whence = fl64->l_whence;
++	fl.l_pid = fl64->l_pid;
++	assert (F_SETLK - F_SETLKW == F_SETLK64 - F_SETLKW64);
++	return INLINE_SYSCALL (fcntl, 3, fd, cmd + F_SETLK - F_SETLK64, &fl);
++      }
++    default:
++      return INLINE_SYSCALL (fcntl, 3, fd, cmd, arg);
++    }
++  return -1;
++}
++
++
++int
++__libc_fcntl (int fd, int cmd, ...)
++{
++  va_list ap;
++  void *arg;
++
++  va_start (ap, cmd);
++  arg = va_arg (ap, void *);
++  va_end (ap);
++
++  if (SINGLE_THREAD_P || (cmd != F_SETLKW && cmd != F_SETLKW64))
++    return __fcntl_nocancel (fd, cmd, arg);
++
++  int oldtype = LIBC_CANCEL_ASYNC ();
++
++  int result = __fcntl_nocancel (fd, cmd, arg);
++
++  LIBC_CANCEL_RESET (oldtype);
++
++  return result;
++}
++libc_hidden_def (__libc_fcntl)
++
++weak_alias (__libc_fcntl, __fcntl)
++libc_hidden_weak (__fcntl)
++weak_alias (__libc_fcntl, fcntl)
+diff -uNr glibc-2.3.3-lfs-5.1-ORIG/sysdeps/unix/sysv/linux/m68k/lockf64.c glibc-2.3.3-lfs-5.1/sysdeps/unix/sysv/linux/m68k/lockf64.c
+--- glibc-2.3.3-lfs-5.1-ORIG/sysdeps/unix/sysv/linux/m68k/lockf64.c	2000-10-15 04:49:26.000000000 +1100
++++ glibc-2.3.3-lfs-5.1/sysdeps/unix/sysv/linux/m68k/lockf64.c	2004-05-22 16:11:37.000000000 +1000
+@@ -1 +1,84 @@
+-#include <sysdeps/unix/sysv/linux/i386/lockf64.c>
++/* Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2003
++   Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, write to the Free
++   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++   02111-1307 USA.  */
++
++#include <sys/types.h>
++#include <unistd.h>
++#include <fcntl.h>
++#include <errno.h>
++#include <string.h>
++#include <sysdep.h>
++
++#include "kernel-features.h"
++
++/* lockf is a simplified interface to fcntl's locking facilities.  */
++
++/* This variable is shared with all files that check for fcntl64. The
++   declaration is in fcntl.c.  */
++extern int __have_no_fcntl64;
++
++int
++lockf64 (int fd, int cmd, off64_t len64)
++{
++  struct flock fl;
++  off_t len = (off_t) len64;
++
++  memset ((char *) &fl, '\0', sizeof (fl));
++
++  /* lockf is always relative to the current file position.  */
++  fl.l_whence = SEEK_CUR;
++  fl.l_start = 0;
++  fl.l_len = len;
++
++  if (len64 != (off64_t) len)
++    {
++      /* We can't represent the length.  */
++      __set_errno (EOVERFLOW);
++      return -1;
++    }
++  switch (cmd)
++    {
++    case F_TEST:
++      /* Test the lock: return 0 if FD is unlocked or locked by this process;
++	 return -1, set errno to EACCES, if another process holds the lock.  */
++      fl.l_type = F_RDLCK;
++      if (__fcntl (fd, F_GETLK, &fl) < 0)
++	return -1;
++      if (fl.l_type == F_UNLCK || fl.l_pid == __getpid ())
++	return 0;
++      __set_errno (EACCES);
++      return -1;
++    case F_ULOCK:
++      fl.l_type = F_UNLCK;
++      cmd = F_SETLK;
++      break;
++    case F_LOCK:
++      fl.l_type = F_WRLCK;
++      cmd = F_SETLKW;
++      break;
++    case F_TLOCK:
++      fl.l_type = F_WRLCK;
++      cmd = F_SETLK;
++      break;
++
++    default:
++      __set_errno (EINVAL);
++      return -1;
++    }
++  return __fcntl (fd, cmd, &fl);
++}
Index: patches/glibc-2.3.4-allow-gcc-4.0-iconvdata.patch
===================================================================
--- patches/glibc-2.3.4-allow-gcc-4.0-iconvdata.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/glibc-2.3.4-allow-gcc-4.0-iconvdata.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,51 @@
+Submitted By: Ryan Oliver <ryan.oliver@pha.com.au>
+Date: 2005-05-03
+Initial Package Version: 2.3.4
+Origin: Dan Kegel's crosstool ( http://kegel.com/crosstool/ )
+Upstream Status: Fixed in glibc cvs ( libc/iconvdata/jis0208.h -r1.10 )
+Description: (struct jisx0208_ucs_idx): Move before use
+
+See http://sources.redhat.com/ml/libc-hacker/2005-02/msg00000.html
+and http://www.mail-archive.com/pld-cvs-commit@pld-linux.org/msg00229.html
+
+Fixes
+  In file included from jis0208.c:23:
+  jis0208.h:32: error: array type has incomplete element type
+when building glibc with gcc-4.0
+The bug has been present since at least glibc-2.2.5.
+This patch applies cleanly to glibc-2.3.4
+
+--- /home/dank/downloads/glibc-2.3-20050307/iconvdata/jis0208.h	2003-06-11 14:40:42.000000000 -0700
++++ glibc-2.3-20050307/iconvdata/jis0208.h	2005-03-13 20:55:01.784054760 -0800
+@@ -24,15 +24,6 @@
+ #include <gconv.h>
+ #include <stdint.h>
+ 
+-/* Conversion table.  */
+-extern const uint16_t __jis0208_to_ucs[];
+-
+-extern const char __jisx0208_from_ucs4_lat1[256][2];
+-extern const char __jisx0208_from_ucs4_greek[0xc1][2];
+-extern const struct jisx0208_ucs_idx __jisx0208_from_ucs_idx[];
+-extern const char __jisx0208_from_ucs_tab[][2];
+-
+-
+ /* Struct for table with indeces in UCS mapping table.  */
+ struct jisx0208_ucs_idx
+ {
+@@ -42,6 +33,15 @@
+ };
+ 
+ 
++/* Conversion table.  */
++extern const uint16_t __jis0208_to_ucs[];
++
++extern const char __jisx0208_from_ucs4_lat1[256][2];
++extern const char __jisx0208_from_ucs4_greek[0xc1][2];
++extern const struct jisx0208_ucs_idx __jisx0208_from_ucs_idx[];
++extern const char __jisx0208_from_ucs_tab[][2];
++
++
+ static inline uint32_t
+ __attribute ((always_inline))
+ jisx0208_to_ucs4 (const unsigned char **s, size_t avail, unsigned char offset)
Index: patches/glibc-2.3.4-allow-gcc-4.0-powerpc-procfs.patch
===================================================================
--- patches/glibc-2.3.4-allow-gcc-4.0-powerpc-procfs.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/glibc-2.3.4-allow-gcc-4.0-powerpc-procfs.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,69 @@
+Submitted By: Ryan Oliver <ryan.oliver@pha.com.au>
+Date: 2005-05-03
+Initial Package Version: 2.3.4
+Origin: Dan Kegel's crosstool ( http://kegel.com/crosstool/ )
+Upstream Status: Fixed in glibc cvs ( see below for rev )
+Description: 
+
+First discussed here:
+http://gcc.gnu.org/ml/gcc/2005-01/msg00509.html
+
+Revision 1.12, Wed Mar 2 20:11:38 2005 UTC by roland
+Branch: MAIN
+CVS Tags: fedora-glibc-20050303T1335, HEAD
+Changes since 1.11: +3 -8 lines
+Diff to previous 1.11 (colored)
+
+2005-02-21  Alan Modra <amodra@bigpond.net.au>
+
+	* sysdeps/unix/sysv/linux/powerpc/sys/procfs.h (elf_vrreg_t): Don't
+	use __uint128_t.
+
+http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h?cvsroot=glibc
+http://sources.redhat.com/cgi-bin/cvsweb.cgi/libc/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h.diff?r1=1.11&r2=1.12&cvsroot=glibc
+
+Fixes
+
+In file included from ../linuxthreads_db/proc_service.h:20,
+                 from ../linuxthreads_db/thread_dbP.h:7,
+                 from ../linuxthreads/descr.h:44,
+                 from ../linuxthreads/internals.h:30,
+                 from ../linuxthreads/sysdeps/pthread/bits/libc-lock.h:27,
+                 from ../sysdeps/generic/ldsodefs.h:38,
+                 from ../sysdeps/unix/sysv/linux/ldsodefs.h:25,
+                 from <stdin>:2:
+../sysdeps/unix/sysv/linux/powerpc/sys/procfs.h:57: error: syntax error before 'elf_vrreg_t'
+../sysdeps/unix/sysv/linux/powerpc/sys/procfs.h:57: warning: type defaults to 'int' in declaration of 'elf_vrreg_t'
+../sysdeps/unix/sysv/linux/powerpc/sys/procfs.h:57: warning: data definition has no type or storage class
+../sysdeps/unix/sysv/linux/powerpc/sys/procfs.h:58: error: syntax error before 'elf_vrregset_t'
+../sysdeps/unix/sysv/linux/powerpc/sys/procfs.h:58: warning: type defaults to 'int' in declaration of 'elf_vrregset_t'
+../sysdeps/unix/sysv/linux/powerpc/sys/procfs.h:58: warning: data definition has no type or storage class
+make[2]: make[2]: Leaving directory `/home/dank/queue/jobdir.fast2/crosstool-dev/build/powerpc-750-linux-gnu/gcc-4.0-20050305-glibc-2.3-20050307/glibc-2.3-20050307/csu'
+
+
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h,v
+retrieving revision 1.11
+retrieving revision 1.12
+diff -u -r1.11 -r1.12
+--- libc/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h	2003/12/17 23:09:34	1.11
++++ libc/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h	2005/03/02 20:11:38	1.12
+@@ -46,15 +46,10 @@
+ typedef double elf_fpreg_t;
+ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
+ 
+-/* gcc 3.1 and newer support __uint128_t.  */
+-#if !__GNUC_PREREQ(3,1)
+-typedef struct {
+-  unsigned long u[4];
+-} __attribute((aligned(16))) __uint128_t;
+-#endif
+-
+ /* Altivec registers */
+-typedef __uint128_t elf_vrreg_t;
++typedef struct {
++  unsigned int u[4];
++} __attribute__ ((aligned (16))) elf_vrreg_t;
+ typedef elf_vrreg_t elf_vrregset_t[ELF_NVRREG];
+ #endif
+ 
Index: patches/glibc-2.3.4-gcc4_elf_fixes.patch
===================================================================
--- patches/glibc-2.3.4-gcc4_elf_fixes.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/glibc-2.3.4-gcc4_elf_fixes.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,517 @@
+Submitted By: Ryan Oliver <ryan.oliver@pha.com.au> 
+Date: 2005-05-03 (updated 2005-06-03)
+Initial Package Version: 2.3.4
+Origin: glibc cvs
+        libc/elf/dynamic-link.h -r1.54
+        libc/sysdeps/alpha/dl-machine.h -r1.81
+        libc/sysdeps/arm/dl-machine.h
+         - fix_bad_pc24 fix from Dan Kegel's crosstool
+         - remainder from -r1.52
+        libc/sysdeps/generic/dl-machine.h -r1.9
+        libc/sysdeps/mips/dl-machine.h -r1.77
+         - fixes cherry picked from this version
+        libc/sysdeps/powepc/powerpc32/dl-machine.h -r1.13
+        libc/sysdeps/powepc/powerpc64/dl-machine.h -r1.23
+        libc/sysdeps/sparc/sparc64/dl-machine.h -r1.48
+	libc/sysdeps/i386/dl-machine.h -r1.134 (except using RESOLVE)
+Upstream Status: See Origin, all except fix_bad_pc24 fixed in glibc cvs
+Description: 
+
+2005-03-15  Jakub Jelinek  <jakub@redhat.com>
+
+        * elf/dynamic-link.h (elf_machine_rel, elf_machine_rel_relative,
+        elf_machine_rela, elf_machine_rela_relative, elf_machine_lazy_rel):
+        Add inline keyword.
+        * sysdeps/alpha/dl-machine.h (elf_machine_rela,
+        elf_machine_rela_relative, elf_machine_lazy_rel): Add always_inline
+        attribute.
+        * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela,
+        elf_machine_rela_relative, elf_machine_lazy_rel): Likewise.  Change
+        static inline into auto inline.
+        * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela,
+        elf_machine_rela_relative, elf_machine_lazy_rel): Likewise.
+        * sysdeps/generic/dl-machine.h (elf_machine_rel, elf_machine_rela):
+        Likewise.
+        * sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rel_relative,
+        elf_machine_rela, elf_machine_rela_relative, elf_machine_lazy_rel):
+        Likewise.
+
+2005-03-05  Jakub Jelinek  <jakub@redhat.com>
+
+        * sysdeps/i386/dl-machine.h (ELF_MACHINE_NO_RELA): Define
+        unconditionally to (defined RTLD_BOOTSTRAP).
+	* sysdeps/arm/dl-machine.h (ELF_MACHINE_NO_RELA): Likewise
+
+2005-03-01  Roland McGrath  <roland@redhat.com>
+
+	[BZ #721]
+	* sysdeps/arm/dl-machine.h (ELF_MACHINE_NO_RELA): Define this outside
+	of [RESOLVE_MAP]
+
+2005-02-16  Roland McGrath  <roland@redhat.com>
+
+        [BZ #721]
+        * sysdeps/i386/dl-machine.h (ELF_MACHINE_NO_RELA): Define this outside
+        of [RESOLVE_MAP].
+        * sysdeps/sh/dl-machine.h (ELF_MACHINE_NO_REL): Likewise.
+        * sysdeps/powerpc/powerpc32/dl-machine.h
+        (elf_machine_rel, elf_machine_rel_relative): Removed.
+        * sysdeps/powerpc/powerpc64/dl-machine.h
+        (elf_machine_rel, elf_machine_rel_relative): Removed.
+
+2005-02-14  Alan Modra  <amodra@bigpond.net.au>
+
+        * sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela): Define
+        with auto inline, and attribute always_inline.
+        (elf_machine_rela_relative, elf_machine_lazy_rel): Likewise.
+        (elf_machine_rel, elf_machine_rel_relative): Likewise.
+        * sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela): Likewise.
+        (elf_machine_rela_relative, elf_machine_lazy_rel): Likewise.
+        (elf_machine_rel, elf_machine_rel_relative): Likewise.
+        (elf_machine_tprel): Likewise.
+
+2005-02-03  Alexandre Oliva  <aoliva@redhat.com>
+
+        [BZ #721]
+        * elf/dynamic-link.h: Don't declare nested auto functions that are
+        not going to be defined.
+
+===================================================================
+RCS file: /cvs/glibc/libc/elf/dynamic-link.h,v
+retrieving revision 1.51
+retrieving revision 1.54
+diff -u -r1.51 -r1.54
+--- libc/elf/dynamic-link.h	2004/09/24 17:09:03	1.51
++++ libc/elf/dynamic-link.h	2005/03/15 22:57:25	1.54
+@@ -1,5 +1,5 @@
+ /* Inline functions for dynamic linking.
+-   Copyright (C) 1995-2002, 2003, 2004 Free Software Foundation, Inc.
++   Copyright (C) 1995-2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -31,26 +31,30 @@
+    optimizing away alignment tests or using word instructions for
+    copying memory, breaking the very code written to handle the
+    unaligned cases.  */
+-auto void __attribute__((always_inline))
++# if ! ELF_MACHINE_NO_REL
++auto inline void __attribute__((always_inline))
+ elf_machine_rel (struct link_map *map, const ElfW(Rel) *reloc,
+ 		 const ElfW(Sym) *sym, const struct r_found_version *version,
+ 		 void *const reloc_addr);
+-auto void __attribute__((always_inline))
++auto inline void __attribute__((always_inline))
++elf_machine_rel_relative (ElfW(Addr) l_addr, const ElfW(Rel) *reloc,
++			  void *const reloc_addr);
++# endif
++# if ! ELF_MACHINE_NO_RELA
++auto inline void __attribute__((always_inline))
+ elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc,
+ 		  const ElfW(Sym) *sym, const struct r_found_version *version,
+ 		  void *const reloc_addr);
+-auto void __attribute__((always_inline))
+-elf_machine_rel_relative (ElfW(Addr) l_addr, const ElfW(Rel) *reloc,
+-			  void *const reloc_addr);
+-auto void __attribute__((always_inline))
++auto inline void __attribute__((always_inline))
+ elf_machine_rela_relative (ElfW(Addr) l_addr, const ElfW(Rela) *reloc,
+ 			   void *const reloc_addr);
++# endif
+ # if ELF_MACHINE_NO_RELA || defined ELF_MACHINE_PLT_REL
+-auto void __attribute__((always_inline))
++auto inline void __attribute__((always_inline))
+ elf_machine_lazy_rel (struct link_map *map,
+ 		      ElfW(Addr) l_addr, const ElfW(Rel) *reloc);
+ # else
+-auto void __attribute__((always_inline))
++auto inline void __attribute__((always_inline))
+ elf_machine_lazy_rel (struct link_map *map,
+ 		      ElfW(Addr) l_addr, const ElfW(Rela) *reloc);
+ # endif
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/alpha/dl-machine.h,v
+retrieving revision 1.80
+retrieving revision 1.81
+diff -u -r1.80 -r1.81
+--- libc/sysdeps/alpha/dl-machine.h	2005/02/07 03:11:46	1.80
++++ libc/sysdeps/alpha/dl-machine.h	2005/03/15 22:57:26	1.81
+@@ -1,5 +1,5 @@
+ /* Machine-dependent ELF dynamic relocation inline functions.  Alpha version.
+-   Copyright (C) 1996-2002, 2003, 2004 Free Software Foundation, Inc.
++   Copyright (C) 1996-2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Richard Henderson <rth@tamu.edu>.
+ 
+@@ -376,6 +376,7 @@
+ /* Perform the relocation specified by RELOC and SYM (which is fully resolved).
+    MAP is the object containing the reloc.  */
+ auto inline void
++__attribute__ ((always_inline))
+ elf_machine_rela (struct link_map *map,
+ 		  const Elf64_Rela *reloc,
+ 		  const Elf64_Sym *sym,
+@@ -504,6 +505,7 @@
+ #define ELF_MACHINE_REL_RELATIVE 1
+ 
+ auto inline void
++__attribute__ ((always_inline))
+ elf_machine_rela_relative (Elf64_Addr l_addr, const Elf64_Rela *reloc,
+ 			   void *const reloc_addr_arg)
+ {
+@@ -520,6 +522,7 @@
+ }
+ 
+ auto inline void
++__attribute__ ((always_inline))
+ elf_machine_lazy_rel (struct link_map *map,
+ 		      Elf64_Addr l_addr, const Elf64_Rela *reloc)
+ {
+--- glibc-2.3.4/sysdeps/arm/dl-machine.h-orig	2004-12-05 08:20:17.000000000 +1100
++++ glibc-2.3.4/sysdeps/arm/dl-machine.h	2005-06-03 15:33:44.000000000 +1000
+@@ -350,16 +350,15 @@
+ 
+ #endif /* !dl_machine_h */
+ 
+-#ifdef RESOLVE
+-
+ /* ARM never uses Elf32_Rela relocations for the dynamic linker.
+    Prelinked libraries may use Elf32_Rela though.  */
+-# ifdef RTLD_BOOTSTRAP
+-#  define ELF_MACHINE_NO_RELA 1
+-# endif
++#define ELF_MACHINE_NO_RELA defined RTLD_BOOTSTRAP
++
++#ifdef RESOLVE
+ 
+ /* Deal with an out-of-range PC24 reloc.  */
+-static Elf32_Addr
++auto inline Elf32_Addr
++__attribute__ ((always_inline))
+ fix_bad_pc24 (Elf32_Addr *const reloc_addr, Elf32_Addr value)
+ {
+   static void *fix_page;
+@@ -392,7 +391,8 @@
+ /* Perform the relocation specified by RELOC and SYM (which is fully resolved).
+    MAP is the object containing the reloc.  */
+ 
+-static inline void
++auto inline void
++__attribute__ ((always_inline))
+ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
+ 		 const Elf32_Sym *sym, const struct r_found_version *version,
+ 		 void *const reloc_addr_arg)
+@@ -517,7 +517,8 @@
+ }
+ 
+ # ifndef RTLD_BOOTSTRAP
+-static inline void
++auto inline void
++__attribute__ ((always_inline))
+ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
+ 		  const Elf32_Sym *sym, const struct r_found_version *version,
+ 		  void *const reloc_addr_arg)
+@@ -597,7 +598,8 @@
+ }
+ # endif
+ 
+-static inline void
++auto inline void
++__attribute__ ((always_inline))
+ elf_machine_rel_relative (Elf32_Addr l_addr, const Elf32_Rel *reloc,
+ 			  void *const reloc_addr_arg)
+ {
+@@ -606,7 +608,8 @@
+ }
+ 
+ # ifndef RTLD_BOOTSTRAP
+-static inline void
++auto inline void
++__attribute__ ((always_inline))
+ elf_machine_rela_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc,
+ 			   void *const reloc_addr_arg)
+ {
+@@ -615,7 +618,8 @@
+ }
+ # endif
+ 
+-static inline void
++auto inline void
++__attribute__ ((always_inline))
+ elf_machine_lazy_rel (struct link_map *map,
+ 		      Elf32_Addr l_addr, const Elf32_Rel *reloc)
+ {
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/generic/dl-machine.h,v
+retrieving revision 1.8
+retrieving revision 1.9
+diff -u -r1.8 -r1.9
+--- libc/sysdeps/generic/dl-machine.h	2001/09/08 17:16:43	1.8
++++ libc/sysdeps/generic/dl-machine.h	2005/03/15 22:57:24	1.9
+@@ -1,5 +1,6 @@
+ /* Machine-dependent ELF dynamic relocation inline functions.  Stub version.
+-   Copyright (C) 1995,1996,1997,1999,2000,2001 Free Software Foundation, Inc.
++   Copyright (C) 1995, 1996, 1997, 1999, 2000, 2001, 2005
++   Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -64,7 +65,8 @@
+    LOADADDR is the load address of the object; INFO is an array indexed
+    by DT_* of the .dynamic section info.  */
+ 
+-static inline void
++auto inline void
++__attribute__ ((always_inline))
+ elf_machine_rel (Elf32_Addr loadaddr, Elf32_Dyn *info[DT_NUM],
+ 		 const Elf32_Rel *reloc, const Elf32_Sym *sym,
+ 		 Elf32_Addr (*resolve) (const Elf32_Sym **ref,
+@@ -87,7 +89,8 @@
+ }
+ 
+ 
+-static inline Elf32_Addr
++auto inline Elf32_Addr
++__attribute__ ((always_inline))
+ elf_machine_rela (Elf32_Addr loadaddr, Elf32_Dyn *info[DT_NUM],
+ 		  const Elf32_Rel *reloc, const Elf32_Sym *sym,
+ 		  Elf32_Addr (*resolve) (const Elf32_Sym **ref,
+--- glibc-2.3.4/sysdeps/mips/dl-machine.h-orig	2004-11-24 15:36:09.000000000 +1100
++++ glibc-2.3.4/sysdeps/mips/dl-machine.h	2005-05-05 01:39:11.000000000 +1000
+@@ -528,7 +528,7 @@
+ /* Perform the relocation specified by RELOC and SYM (which is fully resolved).
+    MAP is the object containing the reloc.  */
+ 
+-static inline void
++auto inline void
+ #ifdef RTLD_BOOTSTRAP
+   __attribute__ ((always_inline))
+ #endif
+@@ -635,14 +635,16 @@
+     }
+ }
+ 
+-static inline void
++auto inline void
++__attribute__((always_inline))
+ elf_machine_rel_relative (ElfW(Addr) l_addr, const ElfW(Rel) *reloc,
+ 			  void *const reloc_addr)
+ {
+   /* XXX Nothing to do.  There is no relative relocation, right?  */
+ }
+ 
+-static inline void
++auto inline void
++__attribute__((always_inline))
+ elf_machine_lazy_rel (struct link_map *map,
+ 		      ElfW(Addr) l_addr, const ElfW(Rel) *reloc)
+ {
+@@ -651,7 +653,8 @@
+ 
+ #ifndef RTLD_BOOTSTRAP
+ /* Relocate GOT. */
+-static inline void
++auto inline void
++__attribute__((always_inline))
+ elf_machine_got_rel (struct link_map *map, int lazy)
+ {
+   ElfW(Addr) *got;
+@@ -738,7 +741,8 @@
+ /* Set up the loaded object described by L so its stub function
+    will jump to the on-demand fixup code __dl_runtime_resolve.  */
+ 
+-static inline int
++auto inline int
++__attribute__((always_inline))
+ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
+ {
+ # ifndef RTLD_BOOTSTRAP
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/powerpc/powerpc32/dl-machine.h,v
+retrieving revision 1.11
+retrieving revision 1.13
+diff -u -r1.11 -r1.13
+--- libc/sysdeps/powerpc/powerpc32/dl-machine.h	2005/01/25 10:42:04	1.11
++++ libc/sysdeps/powerpc/powerpc32/dl-machine.h	2005/02/17 01:16:34	1.13
+@@ -204,7 +204,7 @@
+    LOADADDR is the load address of the object; INFO is an array indexed
+    by DT_* of the .dynamic section info.  */
+ 
+-inline void
++auto inline void __attribute__ ((always_inline))
+ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
+ 		  const Elf32_Sym *sym, const struct r_found_version *version,
+ 		  void *const reloc_addr_arg)
+@@ -298,7 +298,7 @@
+     }
+ }
+ 
+-static inline void
++auto inline void __attribute__ ((always_inline))
+ elf_machine_rela_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc,
+ 			   void *const reloc_addr_arg)
+ {
+@@ -306,7 +306,7 @@
+   *reloc_addr = l_addr + reloc->r_addend;
+ }
+ 
+-static inline void
++auto inline void __attribute__ ((always_inline))
+ elf_machine_lazy_rel (struct link_map *map,
+ 		      Elf32_Addr l_addr, const Elf32_Rela *reloc)
+ {
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/powerpc/powerpc64/dl-machine.h,v
+retrieving revision 1.21
+retrieving revision 1.23
+diff -u -r1.21 -r1.23
+--- libc/sysdeps/powerpc/powerpc64/dl-machine.h	2005/01/08 07:07:01	1.21
++++ libc/sysdeps/powerpc/powerpc64/dl-machine.h	2005/02/17 01:16:34	1.23
+@@ -487,7 +487,7 @@
+                                 const Elf64_Sym *refsym)
+                                 attribute_hidden;
+ 
+-static inline void
++auto inline void __attribute__ ((always_inline))
+ elf_machine_rela_relative (Elf64_Addr l_addr, const Elf64_Rela *reloc,
+ 			   void *const reloc_addr_arg)
+ {
+@@ -497,7 +497,7 @@
+ 
+ #if defined USE_TLS && (!defined RTLD_BOOTSTRAP || USE___THREAD)
+ /* This computes the value used by TPREL* relocs.  */
+-static Elf64_Addr __attribute__ ((const))
++auto inline Elf64_Addr __attribute__ ((always_inline, const))
+ elf_machine_tprel (struct link_map *map,
+ 		   struct link_map *sym_map,
+ 		   const Elf64_Sym *sym,
+@@ -518,7 +518,7 @@
+ 
+ /* Perform the relocation specified by RELOC and SYM (which is fully
+    resolved).  MAP is the object containing the reloc.  */
+-static inline void
++auto inline void __attribute__ ((always_inline))
+ elf_machine_rela (struct link_map *map,
+ 		  const Elf64_Rela *reloc,
+ 		  const Elf64_Sym *sym,
+@@ -803,11 +803,12 @@
+   MODIFIED_CODE_NOQUEUE (reloc_addr);
+ }
+ 
+-static inline void
++auto inline void __attribute__ ((always_inline))
+ elf_machine_lazy_rel (struct link_map *map,
+ 		      Elf64_Addr l_addr, const Elf64_Rela *reloc)
+ {
+   /* elf_machine_runtime_setup handles this.  */
+ }
+ 
++
+ #endif /* RESOLVE */
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc32/dl-machine.h,v
+retrieving revision 1.53
+retrieving revision 1.54
+diff -u -r1.53 -r1.54
+--- libc/sysdeps/sparc/sparc32/dl-machine.h	2004/05/17 18:20:30	1.53
++++ libc/sysdeps/sparc/sparc32/dl-machine.h	2005/03/15 22:57:24	1.54
+@@ -1,5 +1,5 @@
+ /* Machine-dependent ELF dynamic relocation inline functions.  SPARC version.
+-   Copyright (C) 1996-2003, 2004 Free Software Foundation, Inc.
++   Copyright (C) 1996-2003, 2004, 2005 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -411,7 +411,8 @@
+ /* Perform the relocation specified by RELOC and SYM (which is fully resolved).
+    MAP is the object containing the reloc.  */
+ 
+-static inline void
++auto inline void
++__attribute__ ((always_inline))
+ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
+ 		  const Elf32_Sym *sym, const struct r_found_version *version,
+ 		  void *const reloc_addr_arg)
+@@ -593,7 +594,8 @@
+     }
+ }
+ 
+-static inline void
++auto inline void
++__attribute__ ((always_inline))
+ elf_machine_rela_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc,
+ 			   void *const reloc_addr_arg)
+ {
+@@ -601,7 +603,8 @@
+   *reloc_addr += l_addr + reloc->r_addend;
+ }
+ 
+-static inline void
++auto inline void
++__attribute__ ((always_inline))
+ elf_machine_lazy_rel (struct link_map *map,
+ 		      Elf32_Addr l_addr, const Elf32_Rela *reloc)
+ {
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc64/dl-machine.h,v
+retrieving revision 1.47
+retrieving revision 1.48
+diff -u -r1.47 -r1.48
+--- libc/sysdeps/sparc/sparc64/dl-machine.h	2004/03/05 10:27:55	1.47
++++ libc/sysdeps/sparc/sparc64/dl-machine.h	2005/03/15 22:57:26	1.48
+@@ -1,5 +1,5 @@
+ /* Machine-dependent ELF dynamic relocation inline functions.  Sparc64 version.
+-   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
++   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+ 	Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+@@ -238,7 +238,8 @@
+ /* Perform the relocation specified by RELOC and SYM (which is fully resolved).
+    MAP is the object containing the reloc.  */
+ 
+-static inline void
++auto inline void
++__attribute__ ((always_inline))
+ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc,
+ 		  const Elf64_Sym *sym, const struct r_found_version *version,
+ 		  void *const reloc_addr_arg)
+@@ -430,7 +431,8 @@
+     }
+ }
+ 
+-static inline void
++auto inline void
++__attribute__ ((always_inline))
+ elf_machine_rela_relative (Elf64_Addr l_addr, const Elf64_Rela *reloc,
+ 			   void *const reloc_addr_arg)
+ {
+@@ -438,7 +440,8 @@
+   *reloc_addr = l_addr + reloc->r_addend;
+ }
+ 
+-static inline void
++auto inline void
++__attribute__ ((always_inline))
+ elf_machine_lazy_rel (struct link_map *map,
+ 		      Elf64_Addr l_addr, const Elf64_Rela *reloc)
+ {
+--- glibc-2.3.4/sysdeps/i386/dl-machine.h-orig	2004-09-28 14:54:41.000000000 +1000
++++ glibc-2.3.4/sysdeps/i386/dl-machine.h	2005-06-02 19:28:58.000000000 +1000
+@@ -377,13 +377,11 @@
+ 
+ #endif /* !dl_machine_h */
+ 
+-#ifdef RESOLVE
+-
+ /* The i386 never uses Elf32_Rela relocations for the dynamic linker.
+    Prelinked libraries may use Elf32_Rela though.  */
+-#ifdef RTLD_BOOTSTRAP
+-# define ELF_MACHINE_NO_RELA 1
+-#endif
++#define ELF_MACHINE_NO_RELA defined RTLD_BOOTSTRAP
++
++#ifdef RESOLVE
+ 
+ /* Perform the relocation specified by RELOC and SYM (which is fully resolved).
+    MAP is the object containing the reloc.  */
Index: patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_alpha_elf_dl-machine.patch
===================================================================
--- patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_alpha_elf_dl-machine.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_alpha_elf_dl-machine.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,53 @@
+Submitted By: Ryan Oliver <ryan.oliver@pha.com.au>
+Date: 2005-05-03
+Initial Package Version: 2.3.4
+Origin: glibc cvs ( libc/sysdeps/alpha/dl-machine.h -r1.81 )
+Upstream Status: See Origin
+Description:
+
+(RO: edited changelog entry)
+
+2005-03-15  Jakub Jelinek  <jakub@redhat.com>
+
+        * sysdeps/alpha/dl-machine.h (elf_machine_rela,
+        elf_machine_rela_relative, elf_machine_lazy_rel): Add always_inline
+        attribute.
+
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/alpha/dl-machine.h,v
+retrieving revision 1.80
+retrieving revision 1.81
+diff -u -r1.80 -r1.81
+--- libc/sysdeps/alpha/dl-machine.h	2005/02/07 03:11:46	1.80
++++ libc/sysdeps/alpha/dl-machine.h	2005/03/15 22:57:26	1.81
+@@ -1,5 +1,5 @@
+ /* Machine-dependent ELF dynamic relocation inline functions.  Alpha version.
+-   Copyright (C) 1996-2002, 2003, 2004 Free Software Foundation, Inc.
++   Copyright (C) 1996-2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Richard Henderson <rth@tamu.edu>.
+ 
+@@ -376,6 +376,7 @@
+ /* Perform the relocation specified by RELOC and SYM (which is fully resolved).
+    MAP is the object containing the reloc.  */
+ auto inline void
++__attribute__ ((always_inline))
+ elf_machine_rela (struct link_map *map,
+ 		  const Elf64_Rela *reloc,
+ 		  const Elf64_Sym *sym,
+@@ -504,6 +505,7 @@
+ #define ELF_MACHINE_REL_RELATIVE 1
+ 
+ auto inline void
++__attribute__ ((always_inline))
+ elf_machine_rela_relative (Elf64_Addr l_addr, const Elf64_Rela *reloc,
+ 			   void *const reloc_addr_arg)
+ {
+@@ -520,6 +522,7 @@
+ }
+ 
+ auto inline void
++__attribute__ ((always_inline))
+ elf_machine_lazy_rel (struct link_map *map,
+ 		      Elf64_Addr l_addr, const Elf64_Rela *reloc)
+ {
Index: patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_arm_elf_dl-machine.patch
===================================================================
--- patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_arm_elf_dl-machine.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_arm_elf_dl-machine.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,101 @@
+Submitted By: Ryan Oliver <ryan.oliver@pha.com.au> 
+Date: 2005-05-03 (updated 20050603)
+Initial Package Version: 2.3.4
+Origin: fix_bad_pc24 from Dan Kegel's crosstool, rest from glibc cvs
+Upstream Status: all except fix_bad_pc24 fixed in glibc cvs
+Description: 
+
+( edited changelog entries )
+2005-03-15  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/arm/dl-machine.h (elf_machine_rel, elf_machine_rel_relative,
+	elf_machine_rela, elf_machine_rela_relative, elf_machine_lazy_rel):
+	Add inline keyword.
+
+2005-03-05  Jakub Jelinek  <jakub@redhat.com>
+
+        * sysdeps/arm/dl-machine.h (ELF_MACHINE_NO_RELA): Define
+        unconditionally to (defined RTLD_BOOTSTRAP).
+
+2005-03-01  Roland McGrath  <roland@redhat.com>
+
+	[BZ #721]
+	* sysdeps/arm/dl-machine.h (ELF_MACHINE_NO_RELA): Define this outside
+	of [RESOLVE_MAP]
+
+fix_bad_pc24 fix from Dan Kegel's crosstool
+
+--- glibc-2.3.4/sysdeps/arm/dl-machine.h-orig	2004-12-05 08:20:17.000000000 +1100
++++ glibc-2.3.4/sysdeps/arm/dl-machine.h	2005-06-03 15:33:44.000000000 +1000
+@@ -350,16 +350,15 @@
+ 
+ #endif /* !dl_machine_h */
+ 
+-#ifdef RESOLVE
+-
+ /* ARM never uses Elf32_Rela relocations for the dynamic linker.
+    Prelinked libraries may use Elf32_Rela though.  */
+-# ifdef RTLD_BOOTSTRAP
+-#  define ELF_MACHINE_NO_RELA 1
+-# endif
++#define ELF_MACHINE_NO_RELA defined RTLD_BOOTSTRAP
++
++#ifdef RESOLVE
+ 
+ /* Deal with an out-of-range PC24 reloc.  */
+-static Elf32_Addr
++auto inline Elf32_Addr
++__attribute__ ((always_inline))
+ fix_bad_pc24 (Elf32_Addr *const reloc_addr, Elf32_Addr value)
+ {
+   static void *fix_page;
+@@ -392,7 +391,8 @@
+ /* Perform the relocation specified by RELOC and SYM (which is fully resolved).
+    MAP is the object containing the reloc.  */
+ 
+-static inline void
++auto inline void
++__attribute__ ((always_inline))
+ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
+ 		 const Elf32_Sym *sym, const struct r_found_version *version,
+ 		 void *const reloc_addr_arg)
+@@ -517,7 +517,8 @@
+ }
+ 
+ # ifndef RTLD_BOOTSTRAP
+-static inline void
++auto inline void
++__attribute__ ((always_inline))
+ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
+ 		  const Elf32_Sym *sym, const struct r_found_version *version,
+ 		  void *const reloc_addr_arg)
+@@ -597,7 +598,8 @@
+ }
+ # endif
+ 
+-static inline void
++auto inline void
++__attribute__ ((always_inline))
+ elf_machine_rel_relative (Elf32_Addr l_addr, const Elf32_Rel *reloc,
+ 			  void *const reloc_addr_arg)
+ {
+@@ -606,7 +608,8 @@
+ }
+ 
+ # ifndef RTLD_BOOTSTRAP
+-static inline void
++auto inline void
++__attribute__ ((always_inline))
+ elf_machine_rela_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc,
+ 			   void *const reloc_addr_arg)
+ {
+@@ -615,7 +618,8 @@
+ }
+ # endif
+ 
+-static inline void
++auto inline void
++__attribute__ ((always_inline))
+ elf_machine_lazy_rel (struct link_map *map,
+ 		      Elf32_Addr l_addr, const Elf32_Rel *reloc)
+ {
Index: patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_elf_dynamic-link.patch
===================================================================
--- patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_elf_dynamic-link.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_elf_dynamic-link.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,77 @@
+Submitted By: Ryan Oliver <ryan.oliver@pha.com.au>
+Date: 2005-05-03
+Initial Package Version: 2.3.4
+Origin: glibc cvs ( libc/elf/dynamic-link.h -r1.54 )
+Upstream Status: See Origin
+Description:
+   http://sources.redhat.com/bugzilla/show_bug.cgi?id=721
+   http://sources.redhat.com/ml/libc-hacker/2005-02/msg00000.html
+   http://sources.redhat.com/ml/libc-hacker/2005-03/msg00008.html
+
+(RO: edited changelog entries )
+2005-03-15  Jakub Jelinek  <jakub@redhat.com>
+
+        * elf/dynamic-link.h (elf_machine_rel, elf_machine_rel_relative,
+        elf_machine_rela, elf_machine_rela_relative, elf_machine_lazy_rel):
+        Add inline keyword.
+
+2005-02-03  Alexandre Oliva  <aoliva@redhat.com>
+
+        [BZ #721]
+        * elf/dynamic-link.h: Don't declare nested auto functions that are
+        not going to be defined.
+
+
+===================================================================
+RCS file: /cvs/glibc/libc/elf/dynamic-link.h,v
+retrieving revision 1.51
+retrieving revision 1.54
+diff -u -r1.51 -r1.54
+--- libc/elf/dynamic-link.h	2004/09/24 17:09:03	1.51
++++ libc/elf/dynamic-link.h	2005/03/15 22:57:25	1.54
+@@ -1,5 +1,5 @@
+ /* Inline functions for dynamic linking.
+-   Copyright (C) 1995-2002, 2003, 2004 Free Software Foundation, Inc.
++   Copyright (C) 1995-2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -31,26 +31,30 @@
+    optimizing away alignment tests or using word instructions for
+    copying memory, breaking the very code written to handle the
+    unaligned cases.  */
+-auto void __attribute__((always_inline))
++# if ! ELF_MACHINE_NO_REL
++auto inline void __attribute__((always_inline))
+ elf_machine_rel (struct link_map *map, const ElfW(Rel) *reloc,
+ 		 const ElfW(Sym) *sym, const struct r_found_version *version,
+ 		 void *const reloc_addr);
+-auto void __attribute__((always_inline))
++auto inline void __attribute__((always_inline))
++elf_machine_rel_relative (ElfW(Addr) l_addr, const ElfW(Rel) *reloc,
++			  void *const reloc_addr);
++# endif
++# if ! ELF_MACHINE_NO_RELA
++auto inline void __attribute__((always_inline))
+ elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc,
+ 		  const ElfW(Sym) *sym, const struct r_found_version *version,
+ 		  void *const reloc_addr);
+-auto void __attribute__((always_inline))
+-elf_machine_rel_relative (ElfW(Addr) l_addr, const ElfW(Rel) *reloc,
+-			  void *const reloc_addr);
+-auto void __attribute__((always_inline))
++auto inline void __attribute__((always_inline))
+ elf_machine_rela_relative (ElfW(Addr) l_addr, const ElfW(Rela) *reloc,
+ 			   void *const reloc_addr);
++# endif
+ # if ELF_MACHINE_NO_RELA || defined ELF_MACHINE_PLT_REL
+-auto void __attribute__((always_inline))
++auto inline void __attribute__((always_inline))
+ elf_machine_lazy_rel (struct link_map *map,
+ 		      ElfW(Addr) l_addr, const ElfW(Rel) *reloc);
+ # else
+-auto void __attribute__((always_inline))
++auto inline void __attribute__((always_inline))
+ elf_machine_lazy_rel (struct link_map *map,
+ 		      ElfW(Addr) l_addr, const ElfW(Rela) *reloc);
+ # endif
Index: patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_generic_elf_dl-machine.patch
===================================================================
--- patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_generic_elf_dl-machine.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_generic_elf_dl-machine.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,49 @@
+Submitted By: Ryan Oliver <ryan.oliver@pha.com.au>
+Date: 2005-05-03
+Initial Package Version: 2.3.4
+Origin: glibc cvs ( libc/sysdeps/generic/dl-machine.h -r1.9 )
+Upstream Status: See Origin
+Description:
+
+(RO: edited changelog entry)
+
+2005-03-15  Jakub Jelinek  <jakub@redhat.com>
+
+        * sysdeps/generic/dl-machine.h (elf_machine_rel, elf_machine_rela):
+        Add always_inline attribute. Change static inline into auto inline.
+
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/generic/dl-machine.h,v
+retrieving revision 1.8
+retrieving revision 1.9
+diff -u -r1.8 -r1.9
+--- libc/sysdeps/generic/dl-machine.h	2001/09/08 17:16:43	1.8
++++ libc/sysdeps/generic/dl-machine.h	2005/03/15 22:57:24	1.9
+@@ -1,5 +1,6 @@
+ /* Machine-dependent ELF dynamic relocation inline functions.  Stub version.
+-   Copyright (C) 1995,1996,1997,1999,2000,2001 Free Software Foundation, Inc.
++   Copyright (C) 1995, 1996, 1997, 1999, 2000, 2001, 2005
++   Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -64,7 +65,8 @@
+    LOADADDR is the load address of the object; INFO is an array indexed
+    by DT_* of the .dynamic section info.  */
+ 
+-static inline void
++auto inline void
++__attribute__ ((always_inline))
+ elf_machine_rel (Elf32_Addr loadaddr, Elf32_Dyn *info[DT_NUM],
+ 		 const Elf32_Rel *reloc, const Elf32_Sym *sym,
+ 		 Elf32_Addr (*resolve) (const Elf32_Sym **ref,
+@@ -87,7 +89,8 @@
+ }
+ 
+ 
+-static inline Elf32_Addr
++auto inline Elf32_Addr
++__attribute__ ((always_inline))
+ elf_machine_rela (Elf32_Addr loadaddr, Elf32_Dyn *info[DT_NUM],
+ 		  const Elf32_Rel *reloc, const Elf32_Sym *sym,
+ 		  Elf32_Addr (*resolve) (const Elf32_Sym **ref,
Index: patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_i386_elf_dl-machine.patch
===================================================================
--- patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_i386_elf_dl-machine.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_i386_elf_dl-machine.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,40 @@
+Submitted By: Ryan Oliver <ryan.oliver@pha.com.au>
+Date: 2005-06-02
+Initial Package Version: 2.3.4
+Origin: Similar to glibc cvs -r1.132 -r1.134
+Upstream Status: See Origin
+Description:
+
+2005-03-05  Jakub Jelinek  <jakub@redhat.com>
+
+        * sysdeps/i386/dl-machine.h (ELF_MACHINE_NO_RELA): Define
+        unconditionally to (defined RTLD_BOOTSTRAP).
+	* sysdeps/arm/dl-machine.h (ELF_MACHINE_NO_RELA): Likewise
+
+2005-02-16  Roland McGrath  <roland@redhat.com>
+
+        [BZ #721]
+        * sysdeps/i386/dl-machine.h (ELF_MACHINE_NO_RELA): Define this outside
+        of [RESOLVE_MAP].
+
+(though in this case, [RESOLVE])
+
+--- glibc-2.3.4/sysdeps/i386/dl-machine.h-orig	2004-09-28 14:54:41.000000000 +1000
++++ glibc-2.3.4/sysdeps/i386/dl-machine.h	2005-06-02 19:28:58.000000000 +1000
+@@ -377,13 +377,11 @@
+ 
+ #endif /* !dl_machine_h */
+ 
+-#ifdef RESOLVE
+-
+ /* The i386 never uses Elf32_Rela relocations for the dynamic linker.
+    Prelinked libraries may use Elf32_Rela though.  */
+-#ifdef RTLD_BOOTSTRAP
+-# define ELF_MACHINE_NO_RELA 1
+-#endif
++#define ELF_MACHINE_NO_RELA defined RTLD_BOOTSTRAP
++
++#ifdef RESOLVE
+ 
+ /* Perform the relocation specified by RELOC and SYM (which is fully resolved).
+    MAP is the object containing the reloc.  */
Index: patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_mips_elf_dl-machine.patch
===================================================================
--- patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_mips_elf_dl-machine.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_mips_elf_dl-machine.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,60 @@
+Submitted By: Ryan Oliver <ryan.oliver@pha.com.au>
+Date: 2005-05-03
+Initial Package Version: 2.3.4
+Origin: glibc cvs, (cherry picked from libc/sysdeps/mips/dl-machine.h -r1.77 )
+Upstream Status: See Origin
+Description:
+
+(RO: edited changelog entry)
+	(elf_machine_rel, elf_machine_rel_relative, elf_machine_lazy_rel)
+	(elf_machine_runtime_setup): Use "auto inline".
+--- glibc-2.3.4/sysdeps/mips/dl-machine.h-orig	2004-11-24 15:36:09.000000000 +1100
++++ glibc-2.3.4/sysdeps/mips/dl-machine.h	2005-05-05 01:39:11.000000000 +1000
+@@ -528,7 +528,7 @@
+ /* Perform the relocation specified by RELOC and SYM (which is fully resolved).
+    MAP is the object containing the reloc.  */
+ 
+-static inline void
++auto inline void
+ #ifdef RTLD_BOOTSTRAP
+   __attribute__ ((always_inline))
+ #endif
+@@ -635,14 +635,16 @@
+     }
+ }
+ 
+-static inline void
++auto inline void
++__attribute__((always_inline))
+ elf_machine_rel_relative (ElfW(Addr) l_addr, const ElfW(Rel) *reloc,
+ 			  void *const reloc_addr)
+ {
+   /* XXX Nothing to do.  There is no relative relocation, right?  */
+ }
+ 
+-static inline void
++auto inline void
++__attribute__((always_inline))
+ elf_machine_lazy_rel (struct link_map *map,
+ 		      ElfW(Addr) l_addr, const ElfW(Rel) *reloc)
+ {
+@@ -651,7 +653,8 @@
+ 
+ #ifndef RTLD_BOOTSTRAP
+ /* Relocate GOT. */
+-static inline void
++auto inline void
++__attribute__((always_inline))
+ elf_machine_got_rel (struct link_map *map, int lazy)
+ {
+   ElfW(Addr) *got;
+@@ -738,7 +741,8 @@
+ /* Set up the loaded object described by L so its stub function
+    will jump to the on-demand fixup code __dl_runtime_resolve.  */
+ 
+-static inline int
++auto inline int
++__attribute__((always_inline))
+ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
+ {
+ # ifndef RTLD_BOOTSTRAP
Index: patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_powerpc32_elf_dl-machine.patch
===================================================================
--- patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_powerpc32_elf_dl-machine.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_powerpc32_elf_dl-machine.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,48 @@
+Submitted By: Ryan Oliver <ryan.oliver@pha.com.au>
+Date: 2005-05-03
+Initial Package Version: 2.3.4
+Origin: glibc cvs 
+Upstream Status: See Origin
+Description: 
+
+(RO: Modified changelog entry)
+2005-02-14  Alan Modra  <amodra@bigpond.net.au>
+
+	* sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela): Define
+	with auto inline, and attribute always_inline.
+	(elf_machine_rela_relative, elf_machine_lazy_rel): Likewise.
+
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/powerpc/powerpc32/dl-machine.h,v
+retrieving revision 1.11
+retrieving revision 1.13
+diff -u -r1.11 -r1.13
+--- libc/sysdeps/powerpc/powerpc32/dl-machine.h	2005/01/25 10:42:04	1.11
++++ libc/sysdeps/powerpc/powerpc32/dl-machine.h	2005/02/17 01:16:34	1.13
+@@ -204,7 +204,7 @@
+    LOADADDR is the load address of the object; INFO is an array indexed
+    by DT_* of the .dynamic section info.  */
+ 
+-inline void
++auto inline void __attribute__ ((always_inline))
+ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
+ 		  const Elf32_Sym *sym, const struct r_found_version *version,
+ 		  void *const reloc_addr_arg)
+@@ -298,7 +298,7 @@
+     }
+ }
+ 
+-static inline void
++auto inline void __attribute__ ((always_inline))
+ elf_machine_rela_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc,
+ 			   void *const reloc_addr_arg)
+ {
+@@ -306,7 +306,7 @@
+   *reloc_addr = l_addr + reloc->r_addend;
+ }
+ 
+-static inline void
++auto inline void __attribute__ ((always_inline))
+ elf_machine_lazy_rel (struct link_map *map,
+ 		      Elf32_Addr l_addr, const Elf32_Rela *reloc)
+ {
Index: patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_powerpc64_elf_dl-machine.patch
===================================================================
--- patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_powerpc64_elf_dl-machine.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_powerpc64_elf_dl-machine.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,62 @@
+Submitted By: Ryan Oliver <ryan.oliver@pha.com.au>
+Date: 2005-05-03
+Initial Package Version: 2.3.4
+Origin: glibc cvs
+Upstream Status: See Origin
+Description:
+
+(RO: Modified changelog entry)
+2005-02-14  Alan Modra  <amodra@bigpond.net.au>
+
+        * sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_rela): Likewise.
+        (elf_machine_rela_relative, elf_machine_lazy_rel): Likewise.
+        (elf_machine_tprel): Likewise
+
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/powerpc/powerpc64/dl-machine.h,v
+retrieving revision 1.21
+retrieving revision 1.23
+diff -u -r1.21 -r1.23
+--- libc/sysdeps/powerpc/powerpc64/dl-machine.h	2005/01/08 07:07:01	1.21
++++ libc/sysdeps/powerpc/powerpc64/dl-machine.h	2005/02/17 01:16:34	1.23
+@@ -487,7 +487,7 @@
+                                 const Elf64_Sym *refsym)
+                                 attribute_hidden;
+ 
+-static inline void
++auto inline void __attribute__ ((always_inline))
+ elf_machine_rela_relative (Elf64_Addr l_addr, const Elf64_Rela *reloc,
+ 			   void *const reloc_addr_arg)
+ {
+@@ -497,7 +497,7 @@
+ 
+ #if defined USE_TLS && (!defined RTLD_BOOTSTRAP || USE___THREAD)
+ /* This computes the value used by TPREL* relocs.  */
+-static Elf64_Addr __attribute__ ((const))
++auto inline Elf64_Addr __attribute__ ((always_inline, const))
+ elf_machine_tprel (struct link_map *map,
+ 		   struct link_map *sym_map,
+ 		   const Elf64_Sym *sym,
+@@ -518,7 +518,7 @@
+ 
+ /* Perform the relocation specified by RELOC and SYM (which is fully
+    resolved).  MAP is the object containing the reloc.  */
+-static inline void
++auto inline void __attribute__ ((always_inline))
+ elf_machine_rela (struct link_map *map,
+ 		  const Elf64_Rela *reloc,
+ 		  const Elf64_Sym *sym,
+@@ -803,11 +803,12 @@
+   MODIFIED_CODE_NOQUEUE (reloc_addr);
+ }
+ 
+-static inline void
++auto inline void __attribute__ ((always_inline))
+ elf_machine_lazy_rel (struct link_map *map,
+ 		      Elf64_Addr l_addr, const Elf64_Rela *reloc)
+ {
+   /* elf_machine_runtime_setup handles this.  */
+ }
+ 
++
+ #endif /* RESOLVE */
Index: patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_sparc32_elf_dl-machine.patch
===================================================================
--- patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_sparc32_elf_dl-machine.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_sparc32_elf_dl-machine.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,59 @@
+Submitted By: Ryan Oliver <ryan.oliver@pha.com.au>
+Date: 2005-05-03
+Initial Package Version: 2.3.4
+Origin: glibc cvs ( libc/sysdeps/sparc/sparc32/dl-machine.h -r1.54 )
+Upstream Status: See Origin
+Description:
+
+(RO: edited changelog entry)
+
+2005-03-15  Jakub Jelinek  <jakub@redhat.com>
+
+        * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela,
+        elf_machine_rela_relative, elf_machine_lazy_rel):  Add always_inline
+        attribute. Change static inline into auto inline.
+
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc32/dl-machine.h,v
+retrieving revision 1.53
+retrieving revision 1.54
+diff -u -r1.53 -r1.54
+--- libc/sysdeps/sparc/sparc32/dl-machine.h	2004/05/17 18:20:30	1.53
++++ libc/sysdeps/sparc/sparc32/dl-machine.h	2005/03/15 22:57:24	1.54
+@@ -1,5 +1,5 @@
+ /* Machine-dependent ELF dynamic relocation inline functions.  SPARC version.
+-   Copyright (C) 1996-2003, 2004 Free Software Foundation, Inc.
++   Copyright (C) 1996-2003, 2004, 2005 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -411,7 +411,8 @@
+ /* Perform the relocation specified by RELOC and SYM (which is fully resolved).
+    MAP is the object containing the reloc.  */
+ 
+-static inline void
++auto inline void
++__attribute__ ((always_inline))
+ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
+ 		  const Elf32_Sym *sym, const struct r_found_version *version,
+ 		  void *const reloc_addr_arg)
+@@ -593,7 +594,8 @@
+     }
+ }
+ 
+-static inline void
++auto inline void
++__attribute__ ((always_inline))
+ elf_machine_rela_relative (Elf32_Addr l_addr, const Elf32_Rela *reloc,
+ 			   void *const reloc_addr_arg)
+ {
+@@ -601,7 +603,8 @@
+   *reloc_addr += l_addr + reloc->r_addend;
+ }
+ 
+-static inline void
++auto inline void
++__attribute__ ((always_inline))
+ elf_machine_lazy_rel (struct link_map *map,
+ 		      Elf32_Addr l_addr, const Elf32_Rela *reloc)
+ {
Index: patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_sparc64_elf_dl-machine.patch
===================================================================
--- patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_sparc64_elf_dl-machine.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_sparc64_elf_dl-machine.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,59 @@
+Submitted By: Ryan Oliver <ryan.oliver@pha.com.au>
+Date: 2005-05-03
+Initial Package Version: 2.3.4
+Origin: glibc cvs ( libc/sysdeps/sparc/sparc64/dl-machine.h -r1.48 )
+Upstream Status: See Origin
+Description:
+
+(RO: edited changelog entry)
+
+2005-03-15  Jakub Jelinek  <jakub@redhat.com>
+
+        * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela,
+        elf_machine_rela_relative, elf_machine_lazy_rel): Add always_inline
+        attribute. Change static inline into auto inline.
+
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/sparc/sparc64/dl-machine.h,v
+retrieving revision 1.47
+retrieving revision 1.48
+diff -u -r1.47 -r1.48
+--- libc/sysdeps/sparc/sparc64/dl-machine.h	2004/03/05 10:27:55	1.47
++++ libc/sysdeps/sparc/sparc64/dl-machine.h	2005/03/15 22:57:26	1.48
+@@ -1,5 +1,5 @@
+ /* Machine-dependent ELF dynamic relocation inline functions.  Sparc64 version.
+-   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
++   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+ 	Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+@@ -238,7 +238,8 @@
+ /* Perform the relocation specified by RELOC and SYM (which is fully resolved).
+    MAP is the object containing the reloc.  */
+ 
+-static inline void
++auto inline void
++__attribute__ ((always_inline))
+ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc,
+ 		  const Elf64_Sym *sym, const struct r_found_version *version,
+ 		  void *const reloc_addr_arg)
+@@ -430,7 +431,8 @@
+     }
+ }
+ 
+-static inline void
++auto inline void
++__attribute__ ((always_inline))
+ elf_machine_rela_relative (Elf64_Addr l_addr, const Elf64_Rela *reloc,
+ 			   void *const reloc_addr_arg)
+ {
+@@ -438,7 +440,8 @@
+   *reloc_addr = l_addr + reloc->r_addend;
+ }
+ 
+-static inline void
++auto inline void
++__attribute__ ((always_inline))
+ elf_machine_lazy_rel (struct link_map *map,
+ 		      Elf64_Addr l_addr, const Elf64_Rela *reloc)
+ {
Index: patches/glibc-2.3.4-mips_syscall-2.patch
===================================================================
--- patches/glibc-2.3.4-mips_syscall-2.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/glibc-2.3.4-mips_syscall-2.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,254 @@
+Submitted By: Jim Gifford (patches at jg555 dot com)
+Date: 2005-02-23
+Initial Package Version: 2.3.4
+Origin: Richard Sandiford
+Upstream Status: Unknown
+Description: Fixes Syscall.h generation
+ 
+diff -Naur glibc-2.3.4.orig/sysdeps/unix/sysv/linux/mips/Makefile glibc-2.3.4/sysdeps/unix/sysv/linux/mips/Makefile
+--- glibc-2.3.4.orig/sysdeps/unix/sysv/linux/mips/Makefile	2004-11-24 04:38:15 +0000
++++ glibc-2.3.4/sysdeps/unix/sysv/linux/mips/Makefile	2005-02-23 18:21:54 +0000
+@@ -9,11 +9,73 @@
+ 
+ no_syscall_list_h = 1
+ 
+-# Generate the list of SYS_* macros for the system calls (__NR_* macros).
+-# We generate not only SYS_<syscall>, pointing at SYS_<abi>_<syscall> if
+-# it exists, but also define SYS_<abi>_<syscall> for all ABIs.
++# A callable macro that expands to a shell command.  Preprocess file $(1)
++# using ABI option $(2) and see which macros it defines.  Print FOO for each
++# macro of the form __NR$(3)_FOO, filtering out ABI-specific __NR macros
++# that have a prefix other than $(3).
++mips_list_syscalls =	$(filter-out -m%,$(CC)) -E -x c $(+includes) \
++			    $(sysincludes) -D_LIBC -dM -mabi=$(2) $(1) | \
++			sed -n 's@^\#define __NR$(3)_\([^ ]*\) .*@\1@p' | \
++			sed -e '/^[ON]32_/d' -e '/^N64_/d' -e '/^64_/d' | \
++			LC_ALL=C sort
++
++# Generate a list of SYS_* macros from the linux __NR macros.
++#
++# Before version 2.6, linux had separate 32-bit and 64-bit MIPS ports,
++# each with its own set of headers.  The ports were merged for 2.6 and
++# this merged port defines the syscalls in a slightly different way.
++# There are therefore three sets of headers that we need to consider:
++#
++#    (1) Headers from the separate 32-bit MIPS port.  They just define
++#	 a single list of __NR macros.
++#
++#    (2) Headers from the separate 64-bit MIPS port.  They unconditionally
++#	 define syscalls for all three ABIs, with o32 syscalls prefixed
++#	 by __NR_O32, n32 syscalls prefixed by __NR_N32 and n64 syscalls
++#	 prefixed by plain __NR.
++#
++#    (3) Headers from the combined port.  They use the _MIPS_SIM macro to
++#	 define the right set of syscalls for the current ABI.  The syscalls
++#	 themselves have no special ABI prefix, but the headers also define:
++#
++#	    __NR_O32_Linux{,_syscalls}
++#	    __NR_N32_Linux{,_syscalls}
++#	    __NR_64_Linux{,_syscalls}
++#
++# In case (1) we just want a simple list of SYS_* macros.  In cases (2)
++# and (3) we want a file that will work for all three ABIs, regardless
++# of which ABI we are currently using.  We also want the file to work
++# if the user later moves from (2) to (3).  Thus the file we create
++# for (2) and (3) has the form:
++#
++#    #if _MIPS_SIM == _MIPS_SIM_NABI32
++#    # ifdef __NR_N32_open
++#    #  define SYS_n32syscall1 __NR_N32_n32syscall1
++#    #  ...
++#    # else
++#    #  define SYS_n32syscall1 __NR_n32syscall1
++#    #  ...
++#    # endif
++#    #elif _MIPS_SIM == _MIPS_SIM_ABI64
++#    # define SYS_n64syscall1 __NR_n64syscall1
++#    # ...
++#    #else
++#    # ifdef __NR_O32_open
++#    #  define SYS_o32syscall1 __NR_O32_o32syscall1
++#    #  ...
++#    # else
++#    #  define SYS_o32syscall1 __NR_o32syscall1
++#    #  ...
++#    # endif
++#    #endif
++#
++# Here, __NR_N32_open and __NR_O32_open are used to detect case (2)
++# over case (3).  The n64 SYS_* macros can always use the normal
++# ABI-less names.
+ $(objpfx)syscall-%.h $(objpfx)syscall-%.d: ../sysdeps/unix/sysv/linux/mips/sys/syscall.h
+ 	$(make-target-directory)
++	$(CC) -E -x c $(+includes) $(sysincludes) -D_LIBC $< -MD -MP \
++	      -MF $(@:.h=.d)-t -MT '$(@:.d=.h) $(@:.h=.d)' > /dev/null
+ 	{ \
+ 	 echo '/* Generated at libc build time from kernel syscall list.  */';\
+ 	 echo ''; \
+@@ -22,28 +84,38 @@
+ 	 echo '#endif'; \
+ 	 echo ''; \
+ 	 echo '#include <sgidefs.h>'; \
+-	 rm -f $(@:.d=.h).newt; \
+-	 $(CC) -E -MD -MP -MF $(@:.h=.d)-t -MT '$(@:.d=.h) $(@:.h=.d)' \
+-	       -x c $(+includes) $(sysincludes) $< -D_LIBC -dM | \
+-	 sed -n 's@^#define __NR_\([^ ]*\) .*$$@#define SYS_\1 __NR_\1@p' \
+-	     > $(@:.d=.h).newt; \
+-	 if grep SYS_O32_ $(@:.d=.h).newt > /dev/null; then \
++ 	 rm -f $(@:.d=.h).new32 $(@:.d=.h).newn32 $(@:.d=.h).new64; \
++ 	 $(call mips_list_syscalls,$<,n32,_N32) > $(@:.d=.h).newn32; \
++ 	 if test -s $(@:.d=.h).newn32; then \
++ 	   if grep open $(@:.d=.h).newn32 > /dev/null; then \
++ 	     $(call mips_list_syscalls,$<,32,_O32) > $(@:.d=.h).new32; \
++ 	     $(call mips_list_syscalls,$<,64,) > $(@:.d=.h).new64; \
++ 	   else \
++ 	     $(call mips_list_syscalls,$<,32,) > $(@:.d=.h).new32; \
++ 	     $(call mips_list_syscalls,$<,n32,) > $(@:.d=.h).newn32; \
++ 	     $(call mips_list_syscalls,$<,64,) > $(@:.d=.h).new64; \
++ 	   fi; \
+ 	   echo '#if _MIPS_SIM == _ABIN32'; \
+-	   sed -n 's/^\(#define SYS_\)N32_/\1/p' < $(@:.d=.h).newt | \
+-		LC_ALL=C sort; \
++ 	   echo '# ifdef __NR_N32_open'; \
++ 	   sed 's@\(.*\)@#  define SYS_\1 __NR_N32_\1@' < $(@:.d=.h).newn32; \
++ 	   echo '# else'; \
++ 	   sed 's@\(.*\)@#  define SYS_\1 __NR_\1@' < $(@:.d=.h).newn32; \
++ 	   echo '# endif'; \
+ 	   echo '#elif _MIPS_SIM == _ABI64'; \
+-	   sed -n 's/^\(#define SYS_\)N64_/\1/p' < $(@:.d=.h).newt | \
+-		LC_ALL=C sort; \
++ 	   sed 's@\(.*\)@# define SYS_\1 __NR_\1@' < $(@:.d=.h).new64; \
+ 	   echo '#else'; \
+-	   sed -n 's/^\(#define SYS_\)O32_/\1/p' < $(@:.d=.h).newt | \
+-		LC_ALL=C sort; \
++ 	   echo '# ifdef __NR_O32_open'; \
++ 	   sed 's@\(.*\)@#  define SYS_\1 __NR_O32_\1@' < $(@:.d=.h).new32; \
++ 	   echo '# else'; \
++ 	   sed 's@\(.*\)@#  define SYS_\1 __NR_\1@' < $(@:.d=.h).new32; \
++ 	   echo '# endif'; \
+ 	   echo '#endif'; \
+-	   sed -n '/^#define SYS_\([ON]32\|N64\)_/p' < $(@:.d=.h).newt | \
+-		LC_ALL=C sort +1.8; \
+ 	 else \
+-	   cat $(@:.d=.h).newt; \
++ 	   $(CC) -E -x c $(+includes) $(sysincludes) -D_LIBC -dM $< | \
++ 	   sed -n 's@^\#define __NR_\([^ ]*\) .*@\#define SYS_\1 __NR_\1@p' | \
++ 	   LC_ALL=C sort; \
+ 	 fi; \
+-	 rm $(@:.d=.h).newt; \
++ 	 rm -f $(@:.d=.h).new32 $(@:.d=.h).newn32 $(@:.d=.h).new64; \
+ 	} > $(@:.d=.h).new
+ 	mv -f $(@:.d=.h).new $(@:.d=.h)
+ ifneq (,$(objpfx))
+diff -Naur glibc-2.3.4.orig/sysdeps/unix/sysv/linux/mips/configure glibc-2.3.4/sysdeps/unix/sysv/linux/mips/configure
+--- glibc-2.3.4.orig/sysdeps/unix/sysv/linux/mips/configure	2004-11-24 04:42:45 +0000
++++ glibc-2.3.4/sysdeps/unix/sysv/linux/mips/configure	2005-02-23 18:10:11 +0000
+@@ -18,7 +18,7 @@
+     { echo "$as_me:$LINENO: WARNING: *** asm/unistd.h not found, it will not be pre-processed" >&5
+ echo "$as_me: WARNING: *** asm/unistd.h not found, it will not be pre-processed" >&2;}
+     echo '#include <asm/unistd.h>' > asm-unistd.h
+-  else
++  elif grep __NR_N32_open "$asm_unistd_h" > /dev/null; then
+     # The point of this preprocessing is to turn __NR_<syscall> into
+     # __NR_N64_<syscall>, as well as to define __NR_<syscall> to
+     # __NR_<abi>_<syscall>, if __NR_<abi>_<syscall> is defined
+@@ -68,6 +68,8 @@
+ {
+ 	print;
+ }'
++  else
++    echo '#include <asm/unistd.h>' > asm-unistd.h
+   fi ;;
+ mips*)
+   rm -f asm-unistd.h
+diff -Naur glibc-2.3.4.orig/sysdeps/unix/sysv/linux/mips/configure.in glibc-2.3.4/sysdeps/unix/sysv/linux/mips/configure.in
+--- glibc-2.3.4.orig/sysdeps/unix/sysv/linux/mips/configure.in	2004-11-24 04:38:31 +0000
++++ glibc-2.3.4/sysdeps/unix/sysv/linux/mips/configure.in	2005-02-23 18:10:11 +0000
+@@ -18,7 +18,7 @@
+   if test ! -f "$asm_unistd_h"; then
+     AC_MSG_WARN([*** asm/unistd.h not found, it will not be pre-processed])
+     echo '#include <asm/unistd.h>' > asm-unistd.h
+-  else
++  elif grep __NR_N32_open "$asm_unistd_h" > /dev/null; then
+     # The point of this preprocessing is to turn __NR_<syscall> into
+     # __NR_N64_<syscall>, as well as to define __NR_<syscall> to
+     # __NR_<abi>_<syscall>, if __NR_<abi>_<syscall> is defined
+@@ -68,6 +68,8 @@
+ {
+ 	print;
+ }'
++  else
++    echo '#include <asm/unistd.h>' > asm-unistd.h
+   fi ;;
+ mips*)
+   rm -f asm-unistd.h
+diff -Naur glibc-2.3.4.orig/sysdeps/unix/sysv/linux/mips/mips32/kern64/sysdep.h glibc-2.3.4/sysdeps/unix/sysv/linux/mips/mips32/kern64/sysdep.h
+--- glibc-2.3.4.orig/sysdeps/unix/sysv/linux/mips/mips32/kern64/sysdep.h	2003-03-29 08:15:29 +0000
++++ glibc-2.3.4/sysdeps/unix/sysv/linux/mips/mips32/kern64/sysdep.h	2005-02-23 18:10:11 +0000
+@@ -1,36 +0,0 @@
+-/* Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc.
+-   This file is part of the GNU C Library.
+-
+-   The GNU C Library is free software; you can redistribute it and/or
+-   modify it under the terms of the GNU Lesser General Public
+-   License as published by the Free Software Foundation; either
+-   version 2.1 of the License, or (at your option) any later version.
+-
+-   The GNU C Library is distributed in the hope that it will be useful,
+-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-   Lesser General Public License for more details.
+-
+-   You should have received a copy of the GNU Lesser General Public
+-   License along with the GNU C Library; if not, write to the Free
+-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+-   02111-1307 USA.  */
+-
+-#ifndef _LINUX_MIPS_MIPS32_KERN64_SYSDEP_H
+-#define _LINUX_MIPS_MIPS32_KERN64_SYSDEP_H 1
+-
+-/* There is some commonality.  */
+-#include <sysdeps/unix/sysv/linux/mips/mips32/sysdep.h>
+-
+-/* For Linux we can use the system call table in the header file
+-	/usr/include/asm/unistd.h
+-   of the kernel.  But these symbols do not follow the SYS_* syntax
+-   so we have to redefine the `SYS_ify' macro here.  */
+-#undef SYS_ify
+-#ifdef __STDC__
+-# define SYS_ify(syscall_name)	__NR_O32_##syscall_name
+-#else
+-# define SYS_ify(syscall_name)	__NR_O32_/**/syscall_name
+-#endif
+-
+-#endif /* linux/mips/mips32/kern64/sysdep.h */
+diff -Naur glibc-2.3.4.orig/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h glibc-2.3.4/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h
+--- glibc-2.3.4.orig/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h	2004-10-18 05:16:07 +0000
++++ glibc-2.3.4/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h	2005-02-23 18:10:11 +0000
+@@ -28,9 +28,9 @@
+    so we have to redefine the `SYS_ify' macro here.  */
+ #undef SYS_ify
+ #ifdef __STDC__
+-# define SYS_ify(syscall_name)	__NR_N32_##syscall_name
++# define SYS_ify(syscall_name)	__NR_##syscall_name
+ #else
+-# define SYS_ify(syscall_name)	__NR_N32_/**/syscall_name
++# define SYS_ify(syscall_name)	__NR_/**/syscall_name
+ #endif
+ 
+ #ifdef __ASSEMBLER__
+diff -Naur glibc-2.3.4.orig/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h glibc-2.3.4/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h
+--- glibc-2.3.4.orig/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h	2004-10-18 05:16:08 +0000
++++ glibc-2.3.4/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h	2005-02-23 18:10:11 +0000
+@@ -28,9 +28,9 @@
+    so we have to redefine the `SYS_ify' macro here.  */
+ #undef SYS_ify
+ #ifdef __STDC__
+-# define SYS_ify(syscall_name)	__NR_N64_##syscall_name
++# define SYS_ify(syscall_name)	__NR_##syscall_name
+ #else
+-# define SYS_ify(syscall_name)	__NR_N64_/**/syscall_name
++# define SYS_ify(syscall_name)	__NR_/**/syscall_name
+ #endif
+ 
+ #ifdef __ASSEMBLER__
Index: patches/glibc-2.3.5-allow-gcc-4.0-wordexp.patch
===================================================================
--- patches/glibc-2.3.5-allow-gcc-4.0-wordexp.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/glibc-2.3.5-allow-gcc-4.0-wordexp.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,26 @@
+Submitted By: Ryan Oliver <ryan.oliver@pha.com.au>
+Date: 2005-05-03
+Initial Package Version: 2.3.5
+Origin: Dan Kegel's crosstool ( http://kegel.com/crosstool/ )
+Upstream Status: in glibc cvs ( libc/sysdeps/generic/wordexp.c -r1.15 )
+Description:
+
+../sysdeps/generic/wordexp.c: In function 'exec_comm':
+../sysdeps/generic/wordexp.c:815: sorry, unimplemented: inlining failed in call to 'exec_comm_child': function body not available
+../sysdeps/generic/wordexp.c:900: sorry, unimplemented: called from here
+make[2]: *** [/home/dank/queue/jobdir.fast2/crosstool-dev/build/i686-unknown-linux-gnu/gcc-4.0-20050305-glibc-2.3-20050307/build-glibc/posix/wordexp.o] Error
+
+I had to add the keyword 'inline' to get it to compile:
+
+--- glibc-2.3-20050307/sysdeps/generic/wordexp.c.old	2005-03-12 08:54:15.709253928 -0800
++++ glibc-2.3-20050307/sysdeps/generic/wordexp.c	2005-03-12 08:54:51.242852000 -0800
+@@ -809,7 +809,7 @@
+ }
+
+ /* Function called by child process in exec_comm() */
+-static void
++static inline void
+ internal_function __attribute__ ((always_inline))
+ exec_comm_child (char *comm, int *fildes, int showerr, int noexec)
+ {
+
Index: patches/glibc-2.3.5-allow-gcc4-string.patch
===================================================================
--- patches/glibc-2.3.5-allow-gcc4-string.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/glibc-2.3.5-allow-gcc4-string.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,89 @@
+Submitted By: Ryan Oliver <ryan.oliver@pha.com.au>
+Date: 2005-05-03
+Initial Package Version: 2.3.4
+Origin: Dan Kegel's crosstool ( http://kegel.com/crosstool/ )
+Upstream Status: in glibc cvs ( see below for details )
+Description:
+
+Fixes? the following error when building with gcc-4.0.0:
+
+../string/strcoll.c:39: error: '__EI_strcoll' aliased to undefined symbol '__GI_strcoll'
+make[2]: *** [/home/dank/crosstool-0.32/build/i686-unknown-linux-gnu/gcc-4.0.0-20050410-glibc-2.3.4/build-glibc/wcsmbs/wcscoll.os] Error 1
+make[2]: Leaving directory `/home/dank/crosstool-0.32/build/i686-unknown-linux-gnu/gcc-4.0.0-20050410-glibc-2.3.4/glibc-2.3.4/wcsmbs'
+
+
+Thu Mar 17 21:06:24 2005 UTC (3 weeks, 5 days ago) by roland
+Branch: MAIN
+CVS Tags: fedora-glibc-20050405T2114, fedora-glibc-20050401T1444, fedora-glibc-20050324T0715, fedora-glibc-20050319T1907, HEAD
+
+2005-03-16  Richard Henderson  <rth@redhat.com>
+
+	* include/wchar.h (__wcscoll): Remove.
+	* wcsmbs/wcscoll.c: Define wcscoll directly instead of via __wcscoll.
+	* string/strcoll.c: Don't issue libc_hidden_def STRCOLL redefined.
+
+http://sourceware.org/cgi-bin/cvsweb.cgi/libc/string/strcoll.c.diff?r1=1.33&r2=1.34&cvsroot=glibc
+http://sourceware.org/cgi-bin/cvsweb.cgi/libc/include/wchar.h.diff?r1=1.26&r2=1.27&cvsroot=glibc
+http://sourceware.org/cgi-bin/cvsweb.cgi/libc/wcsmbs/wcscoll.c.diff?r1=1.13&r2=1.14&cvsroot=glibc
+
+===================================================================
+RCS file: /cvs/glibc/libc/string/strcoll.c,v
+retrieving revision 1.33
+retrieving revision 1.34
+diff -u -r1.33 -r1.34
+--- libc/string/strcoll.c	2004/03/14 20:51:30	1.33
++++ libc/string/strcoll.c	2005/03/17 21:06:24	1.34
+@@ -23,6 +23,7 @@
+ # define STRING_TYPE char
+ # define STRCOLL strcoll
+ # define STRCOLL_L __strcoll_l
++# define USE_HIDDEN_DEF
+ #endif
+ 
+ #include "../locale/localeinfo.h"
+@@ -35,6 +36,7 @@
+ {
+   return STRCOLL_L (s1, s2, _NL_CURRENT_LOCALE);
+ }
+-#if !defined WIDE_CHAR_VERSION
+-libc_hidden_def (strcoll)
++
++#ifdef USE_HIDDEN_DEF
++libc_hidden_def (STRCOLL)
+ #endif
+===================================================================
+RCS file: /cvs/glibc/libc/include/wchar.h,v
+retrieving revision 1.26
+retrieving revision 1.27
+diff -u -r1.26 -r1.27
+--- libc/include/wchar.h	2004/03/14 20:45:10	1.26
++++ libc/include/wchar.h	2005/03/17 21:06:24	1.27
+@@ -56,7 +56,6 @@
+ extern int __wcsncasecmp (__const wchar_t *__s1, __const wchar_t *__s2,
+ 			  size_t __n)
+      __attribute_pure__;
+-extern int __wcscoll (__const wchar_t *__s1, __const wchar_t *__s2);
+ extern size_t __wcslen (__const wchar_t *__s) __attribute_pure__;
+ extern size_t __wcsnlen (__const wchar_t *__s, size_t __maxlen)
+      __attribute_pure__;
+===================================================================
+RCS file: /cvs/glibc/libc/wcsmbs/wcscoll.c,v
+retrieving revision 1.13
+retrieving revision 1.14
+diff -u -r1.13 -r1.14
+--- libc/wcsmbs/wcscoll.c	2004/03/14 21:05:48	1.13
++++ libc/wcsmbs/wcscoll.c	2005/03/17 21:06:24	1.14
+@@ -22,12 +22,11 @@
+ 
+ #define STRING_TYPE wchar_t
+ #define USTRING_TYPE wint_t
+-#define STRCOLL __wcscoll
++#define STRCOLL wcscoll
+ #define STRCOLL_L __wcscoll_l
+ 
+ #include "../string/strcoll.c"
+ 
+ #ifndef USE_IN_EXTENDED_LOCALE_MODEL
+-weak_alias (__wcscoll, wcscoll)
+ libc_hidden_weak (wcscoll)
+ #endif
Index: patches/glibc-2.3.5-allow-gcc4-symbols.patch
===================================================================
--- patches/glibc-2.3.5-allow-gcc4-symbols.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/glibc-2.3.5-allow-gcc4-symbols.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,133 @@
+Submitted By: Ryan Oliver <ryan.oliver@pha.com.au>
+Date: 2005-05-03
+Initial Package Version: 2.3.4
+Origin: Dan Kegel's crosstool ( http://kegel.com/crosstool/ )
+Upstream Status: in glibc cvs ( libc/include/libc-symbols.h -r1.71 )
+Description: 
+
+If I'm really lucky, this fixes the following error building with gcc-4.0.0:
+
+../sysdeps/ieee754/dbl-64/s_isinf.c:29: error: 'isinf' aliased to undefined symbol '__isinf'
+make[2]: *** [/home/dank/queue/jobdir.fast/crosstool-0.32/build/i686-unknown-linux-gnu/gcc-4.0.0-20050410-glibc-2.3.4/build-glibc/math/s_isinf.os] Error 1
+make[1]: *** [math/subdir_lib] Error 2
+make: *** [lib] Error 2
+
+---
+
+
+Revision 1.71, Thu Mar 17 21:06:27 2005 UTC (3 weeks, 5 days ago) by roland
+Branch: MAIN
+CVS Tags: fedora-glibc-20050405T2114, fedora-glibc-20050401T1444, fedora-glibc-20050324T0715, fedora-glibc-20050319T1907, HEAD
+Changes since 1.70: +11 -66 lines
+Diff to previous 1.70 (colored)
+
+2005-03-16  Richard Henderson  <rth@redhat.com>
+
+	* include/libc-symbols.h (__hidden_proto): Remove bogus declaration
+	of internal.
+	(__hidden_def1, __hidden_dot_def1): Remove.
+	(__hidden_def2, __hidden_def3): Remove.
+	(__hidden_ver1): New.
+	(hidden_ver, hidden_def, hidden_weak): Use it.
+	(hidden_data_ver, hidden_data_ver, hidden_data_weak): Use non-data
+	version of the macro.
+
+http://sourceware.org/cgi-bin/cvsweb.cgi/libc/include/libc-symbols.h.diff?r1=1.70&r2=1.71&cvsroot=glibc
+
+===================================================================
+RCS file: /cvs/glibc/libc/include/libc-symbols.h,v
+retrieving revision 1.70
+retrieving revision 1.71
+diff -u -r1.70 -r1.71
+--- libc/include/libc-symbols.h	2005/02/11 00:29:46	1.70
++++ libc/include/libc-symbols.h	2005/03/17 21:06:27	1.71
+@@ -583,78 +583,23 @@
+ #  define hidden_proto(name, attrs...) \
+   __hidden_proto (name, __GI_##name, ##attrs)
+ #  define __hidden_proto(name, internal, attrs...) \
+-  extern __typeof (name) internal; \
+   extern __typeof (name) name __asm__ (__hidden_asmname (#internal)) \
+   __hidden_proto_hiddenattr (attrs);
+ #  define __hidden_asmname(name) \
+   __hidden_asmname1 (__USER_LABEL_PREFIX__, name)
+ #  define __hidden_asmname1(prefix, name) __hidden_asmname2(prefix, name)
+ #  define __hidden_asmname2(prefix, name) #prefix name
+-#  ifdef HAVE_ASM_SET_DIRECTIVE
+-#   define __hidden_def1(original, alias)			\
+-  ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME (alias) ASM_LINE_SEP	\
+-  .set C_SYMBOL_NAME (alias), C_SYMBOL_NAME (original)
+-#   ifdef HAVE_ASM_GLOBAL_DOT_NAME
+-#     define __hidden_dot_def1(original, alias)	 ASM_LINE_SEP	\
+-  ASM_GLOBAL_DIRECTIVE C_SYMBOL_DOT_NAME (alias) ASM_LINE_SEP	\
+-  .set C_SYMBOL_DOT_NAME (alias), C_SYMBOL_DOT_NAME (original)
+-#   else
+-#     define __hidden_dot_def1(original, alias)
+-#   endif
+-#  else
+-#   define __hidden_def1(original, alias)			\
+-  ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME (alias) ASM_LINE_SEP	\
+-  C_SYMBOL_NAME (alias) = C_SYMBOL_NAME (original)
+-#   ifdef HAVE_ASM_GLOBAL_DOT_NAME
+-#    define __hidden_dot_def1(original, alias)	ASM_LINE_SEP	\
+-  ASM_GLOBAL_DIRECTIVE C_SYMBOL_DOT_NAME (alias) ASM_LINE_SEP	\
+-  C_SYMBOL_DOT_NAME (alias) = C_SYMBOL_DOT_NAME (original)
+-#   else
+-#    define __hidden_dot_def1(original, alias)
+-#   endif
+-#  endif
+-#  define __hidden_def2(...) #__VA_ARGS__
+-#  define __hidden_def3(...) __hidden_def2 (__VA_ARGS__)
+-#  define hidden_def(name)					\
+-  __asm__ (__hidden_def3 (__hidden_def1 (__GI_##name, name) \
+-  __hidden_dot_def1 (__GI_##name, name)));
+-#  define hidden_data_def(name)					\
+-  __asm__ (__hidden_def3 (__hidden_def1 (__GI_##name, name)));
+-#  define hidden_ver(local, name)				\
+-  __asm__ (__hidden_def3 (__hidden_def1 (local, __GI_##name) \
+-  __hidden_dot_def1 (local, __GI_##name)));
+-#  define hidden_data_ver(local, name)				\
+-  __asm__ (__hidden_def3 (__hidden_def1 (local, __GI_##name)));
+-#  ifdef HAVE_WEAK_SYMBOLS
+-#   ifdef HAVE_ASM_WEAKEXT_DIRECTIVE
+-#    define __hidden_weak1(original, alias)			\
+-  .weakext C_SYMBOL_NAME (alias), C_SYMBOL_NAME (original)
+-#    ifdef HAVE_ASM_GLOBAL_DOT_NAME
+-#     define __hidden_dot_weak1(original, alias)	ASM_LINE_SEP	\
+-  .weakext C_SYMBOL_DOT_NAME (alias), C_SYMBOL_DOT_NAME (original)
+-#    else
+-#     define __hidden_dot_weak1(original, alias)
+-#    endif
+-#   else /* ! HAVE_ASM_WEAKEXT_DIRECTIVE */
+-#    define __hidden_weak1(original, alias)			\
+-  .weak C_SYMBOL_NAME (alias) ASM_LINE_SEP			\
+-  C_SYMBOL_NAME (alias) = C_SYMBOL_NAME (original)
+-#    ifdef HAVE_ASM_GLOBAL_DOT_NAME
+-#     define __hidden_dot_weak1(original, alias)	ASM_LINE_SEP	\
+-  .weak C_SYMBOL_DOT_NAME (alias) ASM_LINE_SEP	\
+-  C_SYMBOL_DOT_NAME (alias) = C_SYMBOL_DOT_NAME (original)
+-#    else
+-#     define __hidden_dot_weak1(original, alias)
+-#    endif
+-#   endif
+-#   define hidden_weak(name)					\
+-  __asm__ (__hidden_def3 (__hidden_weak1 (__GI_##name, name) \
+-  __hidden_dot_weak1 (__GI_##name, name)));
+-#   define hidden_data_weak(name)					\
+-  __asm__ (__hidden_def3 (__hidden_weak1 (__GI_##name, name)));
+-#  else
+-#   define hidden_weak(name) hidden_def (name)
+-#  endif
++#  define __hidden_ver1(local, internal, name) \
++  extern __typeof (name) __EI_##name __asm__(__hidden_asmname (#internal)); \
++  extern __typeof (name) __EI_##name \
++	__attribute__((alias (__hidden_asmname (#local))))
++#  define hidden_ver(local, name)	__hidden_ver1(local, __GI_##name, name);
++#  define hidden_data_ver(local, name)	hidden_ver(local, name)
++#  define hidden_def(name)		__hidden_ver1(__GI_##name, name, name);
++#  define hidden_data_def(name)		hidden_def(name)
++#  define hidden_weak(name) \
++	__hidden_ver1(__GI_##name, name, name) __attribute__((weak));
++#  define hidden_data_weak(name)	hidden_weak(name)
+ # else
+ /* For assembly, we need to do the opposite of what we do in C:
+    in assembly gcc __REDIRECT stuff is not in place, so functions
Index: patches/glibc-2.3.5-allow-gcc4-wcstol_l.patch
===================================================================
--- patches/glibc-2.3.5-allow-gcc4-wcstol_l.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/glibc-2.3.5-allow-gcc4-wcstol_l.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,64 @@
+Submitted By: Ryan Oliver <ryan.oliver@pha.com.au>
+Date: 2005-05-03
+Initial Package Version: 2.3.4
+Origin: Dan Kegel's crosstool ( http://kegel.com/crosstool/ )
+Upstream Status: Fixed in glibc cvs ( see below for revs )
+Description:
+
+Fixes
+../sysdeps/wordsize-64/wcstol_l.c:11: error: '____wcstoll_l_internal' aliased to undefined symbol '____wcstol_l_internal'
+../sysdeps/wordsize-64/wcstol_l.c:12: error: '__wcstoll_l' aliased to undefined symbol '__wcstol_l'
+../sysdeps/wordsize-64/wcstol_l.c:13: error: 'wcstoll_l' aliased to undefined symbol '__wcstol_l'
+make[2]: *** [/home/dkegel/queue/jobdir.produser_cpsm10/crosstool-0.32/build/x86_64-unknown-linux-gnu/gcc-4.0.0-20050410-glibc-2.3.4/build-glibc/wcsmbs/wcstoul_l.o] Error 1
+
+https://www.redhat.com/archives/fedora-cvs-commits/2005-March/msg00408.html
+%changelog
++* Fri Mar 25 2005 Jakub Jelinek <jakub redhat com> 2.3.4-18
++- fix build on 64-bit arches with new GCC
+
+Revision 1.4.2.1, Fri Mar 25 11:59:01 2005 UTC (3 weeks, 4 days ago) by jakub
+Branch: fedora-branch
+CVS Tags: fedora-glibc-2_3_4-18
+Changes since 1.4: +2 -0 lines
+Diff to previous 1.4 (colored)
+
+	* sysdeps/wordsize-64/strtol_l.c: Don't add aliases if UNSIGNED.
+	* sysdeps/wordsize-64/wcstol_l.c: Likewise.
+
+
+http://sourceware.org/cgi-bin/cvsweb.cgi/libc/sysdeps/wordsize-64/strtol_l.c.diff?r1=1.4&r2=1.4.2.1&cvsroot=glibc
+http://sourceware.org/cgi-bin/cvsweb.cgi/libc/sysdeps/wordsize-64/wcstol_l.c.diff?r1=1.4&r2=1.4.2.1&cvsroot=glibc
+
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/wordsize-64/strtol_l.c,v
+retrieving revision 1.4
+retrieving revision 1.4.2.1
+diff -u -r1.4 -r1.4.2.1
+--- libc/sysdeps/wordsize-64/strtol_l.c	2003/03/03 09:45:12	1.4
++++ libc/sysdeps/wordsize-64/strtol_l.c	2005/03/25 11:59:01	1.4.2.1
+@@ -8,7 +8,9 @@
+ #undef ____strtoll_l_internal
+ #undef __strtoll_l
+ #undef strtoll_l
++#if !UNSIGNED
+ strong_alias (____strtol_l_internal, ____strtoll_l_internal)
+ libc_hidden_ver (____strtol_l_internal, ____strtoll_l_internal)
+ weak_alias (__strtol_l, __strtoll_l)
+ weak_alias (__strtol_l, strtoll_l)
++#endif
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/wordsize-64/wcstol_l.c,v
+retrieving revision 1.4
+retrieving revision 1.4.2.1
+diff -u -r1.4 -r1.4.2.1
+--- libc/sysdeps/wordsize-64/wcstol_l.c	2002/08/08 11:44:51	1.4
++++ libc/sysdeps/wordsize-64/wcstol_l.c	2005/03/25 11:59:01	1.4.2.1
+@@ -8,6 +8,8 @@
+ #undef ____wcstoll_l_internal
+ #undef __wcstoll_l
+ #undef wcstoll_l
++#if !UNSIGNED
+ strong_alias (____wcstol_l_internal, ____wcstoll_l_internal)
+ weak_alias (__wcstol_l, __wcstoll_l)
+ weak_alias (__wcstol_l, wcstoll_l)
++#endif
Index: tches/glibc-2.7-alpha_PTR_MANGLE_fix-1.patch
===================================================================
--- patches/glibc-2.7-alpha_PTR_MANGLE_fix-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,101 +1,0 @@
-Submitted By: Joe Ciccone <jciccone@gmail.com>
-Date: 2007-12-21
-Initial Package Version: 2.7
-Upstream Status: Reported
-Origin: http://sources.redhat.com/bugzilla/show_bug.cgi?id=5216
-Description: Moves and fixes the PTR_MANGLE definitions.
-
---- glibc-2.7.orig/sysdeps/unix/alpha/sysdep.h
-+++ glibc-2.7/sysdeps/unix/alpha/sysdep.h
-@@ -397,42 +397,4 @@
- 	_sc_ret = _sc_0, _sc_err = _sc_19;			\
- }
- 
--/* Pointer mangling support.  Note that tls access is slow enough that
--   we don't deoptimize things by placing the pointer check value there.  */
--
--#include <stdint.h>
--
--#if defined NOT_IN_libc && defined IS_IN_rtld
--# ifdef __ASSEMBLER__
--#  define PTR_MANGLE(dst, src, tmp)				\
--	ldah	tmp, __pointer_chk_guard_local($29) !gprelhigh;	\
--	ldq	tmp, __pointer_chk_guard_local(tmp) !gprellow;	\
--	xor	src, tmp, dst
--#  define PTR_MANGLE2(dst, src, tmp)				\
--	xor	src, tmp, dst
--#  define PTR_DEMANGLE(dst, tmp)   PTR_MANGLE(dst, dst, tmp)
--#  define PTR_DEMANGLE2(dst, tmp)  PTR_MANGLE2(dst, dst, tmp)
--# else
--extern uintptr_t __pointer_chk_guard_local attribute_relro attribute_hidden;
--#  define PTR_MANGLE(var)	\
--  (var) = (__typeof (var)) ((uintptr_t) (var) ^ __pointer_chk_guard_local)
--#  define PTR_DEMANGLE(var)  PTR_MANGLE(var)
--# endif
--#elif defined PIC
--# ifdef __ASSEMBLER__
--#  define PTR_MANGLE(dst, src, tmp)		\
--	ldq	tmp, __pointer_chk_guard;	\
--	xor	src, tmp, dst
--#  define PTR_MANGLE2(dst, src, tmp)		\
--	xor	src, tmp, dst
--#  define PTR_DEMANGLE(dst, tmp)   PTR_MANGLE(dst, dst, tmp)
--#  define PTR_DEMANGLE2(dst, tmp)  PTR_MANGLE2(dst, dst, tmp)
--# else
--extern uintptr_t __pointer_chk_guard attribute_relro;
--#  define PTR_MANGLE(var)	\
--	(var) = (void *) ((uintptr_t) (var) ^ __pointer_chk_guard)
--#  define PTR_DEMANGLE(var)  PTR_MANGLE(var)
--# endif
--#endif
--
- #endif /* ASSEMBLER */
---- glibc-2.7.orig/sysdeps/unix/sysv/linux/alpha/sysdep.h
-+++ glibc-2.7/sysdeps/unix/sysv/linux/alpha/sysdep.h
-@@ -98,4 +98,46 @@
- 	INTERNAL_SYSCALL1(name, err_out, nr, args);			\
- })
- 
-+/* Pointer mangling support.  Note that tls access is slow enough that
-+   we don't deoptimize things by placing the pointer check value there.  */
-+
-+#if defined NOT_IN_libc && defined IS_IN_rtld
-+# ifdef __ASSEMBLER__
-+#  define PTR_MANGLE(dst, src, tmp)				\
-+	ldah	tmp, __pointer_chk_guard_local($29) !gprelhigh;	\
-+	ldq	tmp, __pointer_chk_guard_local(tmp) !gprellow;	\
-+	xor	src, tmp, dst
-+#  define PTR_MANGLE2(dst, src, tmp)				\
-+	xor	src, tmp, dst
-+#  define PTR_DEMANGLE(dst, tmp)   PTR_MANGLE(dst, dst, tmp)
-+#  define PTR_DEMANGLE2(dst, tmp)  PTR_MANGLE2(dst, dst, tmp)
-+# else
-+extern uintptr_t __pointer_chk_guard_local attribute_relro attribute_hidden;
-+#  define PTR_MANGLE(var)	\
-+  (var) = (__typeof (var)) ((uintptr_t) (var) ^ __pointer_chk_guard_local)
-+#  define PTR_DEMANGLE(var)  PTR_MANGLE(var)
-+# endif
-+#elif defined PIC
-+# ifdef __ASSEMBLER__
-+#  define PTR_MANGLE(dst, src, tmp)		\
-+	ldq	tmp, __pointer_chk_guard;	\
-+	xor	src, tmp, dst
-+#  define PTR_MANGLE2(dst, src, tmp)		\
-+	xor	src, tmp, dst
-+#  define PTR_DEMANGLE(dst, tmp)   PTR_MANGLE(dst, dst, tmp)
-+#  define PTR_DEMANGLE2(dst, tmp)  PTR_MANGLE2(dst, dst, tmp)
-+# else
-+extern uintptr_t __pointer_chk_guard attribute_relro;
-+#  define PTR_MANGLE(var)	\
-+	(var) = (void *) ((uintptr_t) (var) ^ __pointer_chk_guard)
-+#  define PTR_DEMANGLE(var)  PTR_MANGLE(var)
-+# endif
-+#else
-+/* Pointer mangling is not yet supported for static libc on alpha.  */
-+# ifndef __ASSEMBLER__
-+#  define PTR_MANGLE(var)   (void) (var)
-+#  define PTR_DEMANGLE(var) (void) (var)
-+# endif
-+#endif
-+
- #endif /* _LINUX_ALPHA_SYSDEP_H */
Index: tches/glibc-2.7-branch_update-1A.patch
===================================================================
--- patches/glibc-2.7-branch_update-1A.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,2036 +1,0 @@
-Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
-Date: 10-25-2007
- Altered to omit changes to nptl/sysdeps/powerpc/tcb-offsets.sym which don't compile
- and are no longer in recent snapshots: Ken Moffat
-Initial Package Version: 2.7
-Origin: Upstream
-Upstream Status: Applied
-Description: This is a branch update for Glibc-2.7, and should be
-             rechecked periodically. See the 'Changelog' and 'localedata/ChangeLog'
-             for specific details.
-
-diff -Naur glibc-2.7.orig/ChangeLog glibc-2.7/ChangeLog
---- glibc-2.7.orig/ChangeLog	2007-10-17 17:09:32.000000000 -0700
-+++ glibc-2.7/ChangeLog	2007-10-21 22:03:58.000000000 -0700
-@@ -1,3 +1,17 @@
-+2007-10-21  Andreas Jaeger  <aj@suse.de>
-+
-+	* manual/texinfo.tex: Update to latest version.
-+
-+	* manual/sysinfo.texi (System Parameters): Fix Formatting.
-+
-+	* manual/arith.texi (Status bit operations): Fix formatting.
-+
-+	* manual/errno.texi (Error Messages): Fix formatting.
-+
-+	* manual/sysinfo.texi (System Parameters): Fix formatting.
-+
-+	* manual/libc.texinfo: Update VERSION and UPDATED.
-+
- 2007-10-17  Jakub Jelinek  <jakub@redhat.com>
- 
- 	* sysdeps/x86_64/memset.S (bzero): Renamed to __bzero.  Add
-diff -Naur glibc-2.7.orig/manual/arith.texi glibc-2.7/manual/arith.texi
---- glibc-2.7.orig/manual/arith.texi	2004-10-05 20:02:14.000000000 -0700
-+++ glibc-2.7/manual/arith.texi	2007-10-21 22:03:58.000000000 -0700
-@@ -778,8 +778,7 @@
- 
- @comment fenv.h
- @comment ISO
--@deftypefun int fesetexceptflag (const fexcept_t *@var{flagp}, int
--@var{excepts})
-+@deftypefun int fesetexceptflag (const fexcept_t *@var{flagp}, int @var{excepts})
- This function restores the flags for the exceptions indicated by
- @var{excepts} to the values stored in the variable pointed to by
- @var{flagp}.
-diff -Naur glibc-2.7.orig/manual/errno.texi glibc-2.7/manual/errno.texi
---- glibc-2.7.orig/manual/errno.texi	2007-07-21 23:53:48.000000000 -0700
-+++ glibc-2.7/manual/errno.texi	2007-10-21 22:03:58.000000000 -0700
-@@ -1494,7 +1494,7 @@
- 
- @comment error.h
- @comment GNU
--@deftypevar {void (*} error_print_progname ) (void)
-+@deftypevar {void (*) error_print_progname } (void)
- If the @code{error_print_progname} variable is defined to a non-zero
- value the function pointed to is called by @code{error} or
- @code{error_at_line}.  It is expected to print the program name or do
-diff -Naur glibc-2.7.orig/manual/libc.texinfo glibc-2.7/manual/libc.texinfo
---- glibc-2.7.orig/manual/libc.texinfo	2007-07-30 18:53:58.000000000 -0700
-+++ glibc-2.7/manual/libc.texinfo	2007-10-21 22:03:58.000000000 -0700
-@@ -19,8 +19,8 @@
- 
- @c sold 0.06/1.09, print run out 21may96
- @set EDITION 0.11
--@set VERSION 2.6
--@set UPDATED 2006-12-03
-+@set VERSION 2.7
-+@set UPDATED 2007-09-09
- @set ISBN 1-882114-55-8
- 
- @copying
-diff -Naur glibc-2.7.orig/manual/sysinfo.texi glibc-2.7/manual/sysinfo.texi
---- glibc-2.7.orig/manual/sysinfo.texi	2006-11-10 13:10:22.000000000 -0800
-+++ glibc-2.7/manual/sysinfo.texi	2007-10-21 22:03:58.000000000 -0700
-@@ -1066,8 +1066,7 @@
- 
- @comment sysctl.h
- @comment BSD
--@deftypefun int sysctl (int *@var{names}, int @var{nlen}, void *@var{oldval},
--        size_t *@var{oldlenp}, void *@var{newval}, size_t @var{newlen})
-+@deftypefun int sysctl (int *@var{names}, int @var{nlen}, void *@var{oldval}, size_t *@var{oldlenp}, void *@var{newval}, size_t @var{newlen})
- 
- @code{sysctl} gets or sets a specified system parameter.  There are so
- many of these parameters that it is not practical to list them all here,
-diff -Naur glibc-2.7.orig/manual/texinfo.tex glibc-2.7/manual/texinfo.tex
---- glibc-2.7.orig/manual/texinfo.tex	2005-02-15 20:23:16.000000000 -0800
-+++ glibc-2.7/manual/texinfo.tex	2007-10-21 22:03:58.000000000 -0700
-@@ -3,11 +3,11 @@
- % Load plain if necessary, i.e., if running under initex.
- \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi
- %
--\def\texinfoversion{2004-11-25.16}
-+\def\texinfoversion{2006-11-08.17}
- %
- % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
--% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software
--% Foundation, Inc.
-+% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free
-+% Software Foundation, Inc.
- %
- % This texinfo.tex file is free software; you can redistribute it and/or
- % modify it under the terms of the GNU General Public License as
-@@ -21,8 +21,8 @@
- %
- % You should have received a copy of the GNU General Public License
- % along with this texinfo.tex file; see the file COPYING.  If not, write
--% to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
--% Boston, MA 02111-1307, USA.
-+% to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-+% Boston, MA 02110-1301, USA.
- %
- % As a special exception, when this file is read by TeX when processing
- % a Texinfo source document, you may use the result without
-@@ -153,20 +153,22 @@
- \ifx\putwordDefopt\undefined    \gdef\putwordDefopt{User Option}\fi
- \ifx\putwordDeffunc\undefined   \gdef\putwordDeffunc{Function}\fi
- 
--% In some macros, we cannot use the `\? notation---the left quote is
--% in some cases the escape char.
-+% Since the category of space is not known, we have to be careful.
-+\chardef\spacecat = 10
-+\def\spaceisspace{\catcode`\ =\spacecat}
-+
-+% sometimes characters are active, so we need control sequences.
- \chardef\colonChar = `\:
- \chardef\commaChar = `\,
-+\chardef\dashChar  = `\-
- \chardef\dotChar   = `\.
- \chardef\exclamChar= `\!
-+\chardef\lquoteChar= `\`
- \chardef\questChar = `\?
-+\chardef\rquoteChar= `\'
- \chardef\semiChar  = `\;
- \chardef\underChar = `\_
- 
--\chardef\spaceChar = `\ %
--\chardef\spacecat = 10
--\def\spaceisspace{\catcode\spaceChar=\spacecat}
--
- % Ignore a token.
- %
- \def\gobble#1{}
-@@ -302,10 +304,14 @@
-     % take effect in \write's, yet the group defined by the \vbox ends
-     % before the \shipout runs.
-     %
--    \escapechar = `\\     % use backslash in output files.
-     \indexdummies         % don't expand commands in the output.
-     \normalturnoffactive  % \ in index entries must not stay \, e.g., if
--                   % the page break happens to be in the middle of an example.
-+               % the page break happens to be in the middle of an example.
-+               % We don't want .vr (or whatever) entries like this:
-+               % \entry{{\tt \indexbackslash }acronym}{32}{\code {\acronym}}
-+               % "\acronym" won't work when it's read back in;
-+               % it needs to be 
-+               % {\code {{\tt \backslashcurfont }acronym}
-     \shipout\vbox{%
-       % Do this early so pdf references go to the beginning of the page.
-       \ifpdfmakepagedest \pdfdest name{\the\pageno} xyz\fi
-@@ -333,9 +339,9 @@
-       \pagebody{#1}%
-       \ifdim\ht\footlinebox > 0pt
-         % Only leave this space if the footline is nonempty.
--        % (We lessened \vsize for it in \oddfootingxxx.)
-+        % (We lessened \vsize for it in \oddfootingyyy.)
-         % The \baselineskip=24pt in plain's \makefootline has no effect.
--        \vskip 2\baselineskip
-+        \vskip 24pt
-         \unvbox\footlinebox
-       \fi
-       %
-@@ -356,7 +362,7 @@
-       \egroup % \vbox from first cropmarks clause
-       \fi
-     }% end of \shipout\vbox
--  }% end of group with \normalturnoffactive
-+  }% end of group with \indexdummies
-   \advancepageno
-   \ifnum\outputpenalty>-20000 \else\dosupereject\fi
- }
-@@ -391,7 +397,7 @@
- %
- \def\parsearg{\parseargusing{}}
- \def\parseargusing#1#2{%
--  \def\next{#2}%
-+  \def\argtorun{#2}%
-   \begingroup
-     \obeylines
-     \spaceisspace
-@@ -422,8 +428,7 @@
- \def\argcheckspacesY#1\^^M#2\^^M#3\ArgTerm{%
-   \def\temp{#3}%
-   \ifx\temp\empty
--    % We cannot use \next here, as it holds the macro to run;
--    % thus we reuse \temp.
-+    % Do not use \next, perhaps the caller of \parsearg uses it; reuse \temp:
-     \let\temp\finishparsearg
-   \else
-     \let\temp\argcheckspaces
-@@ -435,14 +440,14 @@
- % If a _delimited_ argument is enclosed in braces, they get stripped; so
- % to get _exactly_ the rest of the line, we had to prevent such situation.
- % We prepended an \empty token at the very beginning and we expand it now,
--% just before passing the control to \next.
-+% just before passing the control to \argtorun.
- % (Similarily, we have to think about #3 of \argcheckspacesY above: it is
- % either the null string, or it ends with \^^M---thus there is no danger
- % that a pair of braces would be stripped.
- %
- % But first, we have to remove the trailing space token.
- %
--\def\finishparsearg#1 \ArgTerm{\expandafter\next\expandafter{#1}}
-+\def\finishparsearg#1 \ArgTerm{\expandafter\argtorun\expandafter{#1}}
- 
- % \parseargdef\foo{...}
- %	is roughly equivalent to
-@@ -566,7 +571,7 @@
- \let\}=\myrbrace
- \begingroup
-   % Definitions to produce \{ and \} commands for indices,
--  % and @{ and @} for the aux file.
-+  % and @{ and @} for the aux/toc files.
-   \catcode`\{ = \other \catcode`\} = \other
-   \catcode`\[ = 1 \catcode`\] = 2
-   \catcode`\! = 0 \catcode`\\ = \other
-@@ -647,13 +652,28 @@
- \let\/=\allowbreak
- 
- % @. is an end-of-sentence period.
--\def\.{.\spacefactor=3000 }
-+\def\.{.\spacefactor=\endofsentencespacefactor\space}
- 
- % @! is an end-of-sentence bang.
--\def\!{!\spacefactor=3000 }
-+\def\!{!\spacefactor=\endofsentencespacefactor\space}
- 
- % @? is an end-of-sentence query.
--\def\?{?\spacefactor=3000 }
-+\def\?{?\spacefactor=\endofsentencespacefactor\space}
-+
-+% @frenchspacing on|off  says whether to put extra space after punctuation.
-+% 
-+\def\onword{on}
-+\def\offword{off}
-+%
-+\parseargdef\frenchspacing{%
-+  \def\temp{#1}%
-+  \ifx\temp\onword \plainfrenchspacing
-+  \else\ifx\temp\offword \plainnonfrenchspacing
-+  \else
-+    \errhelp = \EMsimple
-+    \errmessage{Unknown @frenchspacing option `\temp', must be on/off}%
-+  \fi\fi
-+}
- 
- % @w prevents a word break.  Without the \leavevmode, @w at the
- % beginning of a paragraph, when TeX is still in vertical mode, would
-@@ -1031,9 +1051,9 @@
- % _ active, and distinguish by seeing if the current family is \slfam,
- % which is what @var uses.
- {
--  \catcode\underChar = \active
-+  \catcode`\_ = \active
-   \gdef\mathunderscore{%
--    \catcode\underChar=\active
-+    \catcode`\_=\active
-     \def_{\ifnum\fam=\slfam \_\else\sb\fi}%
-   }
- }
-@@ -1076,15 +1096,24 @@
- \def\minus{$-$}
- 
- % @dots{} outputs an ellipsis using the current font.
--% We do .5em per period so that it has the same spacing in a typewriter
--% font as three actual period characters.
-+% We do .5em per period so that it has the same spacing in the cm
-+% typewriter fonts as three actual period characters; on the other hand,
-+% in other typewriter fonts three periods are wider than 1.5em.  So do
-+% whichever is larger.
- %
- \def\dots{%
-   \leavevmode
--  \hbox to 1.5em{%
--    \hskip 0pt plus 0.25fil
--    .\hfil.\hfil.%
--    \hskip 0pt plus 0.5fil
-+  \setbox0=\hbox{...}% get width of three periods
-+  \ifdim\wd0 > 1.5em
-+    \dimen0 = \wd0
-+  \else
-+    \dimen0 = 1.5em
-+  \fi
-+  \hbox to \dimen0{%
-+    \hskip 0pt plus.25fil
-+    .\hskip 0pt plus1fil
-+    .\hskip 0pt plus1fil
-+    .\hskip 0pt plus.5fil
-   }%
- }
- 
-@@ -1092,7 +1121,7 @@
- %
- \def\enddots{%
-   \dots
--  \spacefactor=3000
-+  \spacefactor=\endofsentencespacefactor
- }
- 
- % @comma{} is so commas can be inserted into text without messing up
-@@ -1176,13 +1205,98 @@
-     \fi
-   \fi
- \fi
--%
-+
-+% PDF uses PostScript string constants for the names of xref targets,
-+% for display in the outlines, and in other places.  Thus, we have to
-+% double any backslashes.  Otherwise, a name like "\node" will be
-+% interpreted as a newline (\n), followed by o, d, e.  Not good.
-+% http://www.ntg.nl/pipermail/ntg-pdftex/2004-July/000654.html
-+% (and related messages, the final outcome is that it is up to the TeX
-+% user to double the backslashes and otherwise make the string valid, so
-+% that's what we do).
-+
-+% double active backslashes.
-+% 
-+{\catcode`\@=0 \catcode`\\=\active
-+ @gdef@activebackslashdouble{%
-+   @catcode`@\=@active
-+   @let\=@doublebackslash}
-+}
-+
-+% To handle parens, we must adopt a different approach, since parens are
-+% not active characters.  hyperref.dtx (which has the same problem as
-+% us) handles it with this amazing macro to replace tokens.  I've
-+% tinkered with it a little for texinfo, but it's definitely from there.
-+% 
-+% #1 is the tokens to replace.
-+% #2 is the replacement.
-+% #3 is the control sequence with the string.
-+% 
-+\def\HyPsdSubst#1#2#3{%
-+  \def\HyPsdReplace##1#1##2\END{%
-+    ##1%
-+    \ifx\\##2\\%
-+    \else
-+      #2%
-+      \HyReturnAfterFi{%
-+        \HyPsdReplace##2\END
-+      }%
-+    \fi
-+  }%
-+  \xdef#3{\expandafter\HyPsdReplace#3#1\END}%
-+}
-+\long\def\HyReturnAfterFi#1\fi{\fi#1}
-+
-+% #1 is a control sequence in which to do the replacements.
-+\def\backslashparens#1{%
-+  \xdef#1{#1}% redefine it as its expansion; the definition is simply
-+             % \lastnode when called from \setref -> \pdfmkdest.
-+  \HyPsdSubst{(}{\realbackslash(}{#1}%
-+  \HyPsdSubst{)}{\realbackslash)}{#1}%
-+}
-+
-+\newhelp\nopdfimagehelp{Texinfo supports .png, .jpg, .jpeg, and .pdf images
-+with PDF output, and none of those formats could be found.  (.eps cannot
-+be supported due to the design of the PDF format; use regular TeX (DVI
-+output) for that.)}
-+
- \ifpdf
-   \input pdfcolor
-   \pdfcatalog{/PageMode /UseOutlines}%
-+  % #1 is image name, #2 width (might be empty/whitespace), #3 height (ditto).
-   \def\dopdfimage#1#2#3{%
--    \def\imagewidth{#2}%
--    \def\imageheight{#3}%
-+    \def\imagewidth{#2}\setbox0 = \hbox{\ignorespaces #2}%
-+    \def\imageheight{#3}\setbox2 = \hbox{\ignorespaces #3}%
-+    %
-+    % pdftex (and the PDF format) support .png, .jpg, .pdf (among
-+    % others).  Let's try in that order.
-+    \let\pdfimgext=\empty
-+    \begingroup
-+      \openin 1 #1.png \ifeof 1
-+        \openin 1 #1.jpg \ifeof 1
-+          \openin 1 #1.jpeg \ifeof 1
-+            \openin 1 #1.JPG \ifeof 1
-+              \openin 1 #1.pdf \ifeof 1
-+                \errhelp = \nopdfimagehelp
-+                \errmessage{Could not find image file #1 for pdf}%
-+              \else
-+                \gdef\pdfimgext{pdf}%
-+              \fi
-+            \else
-+              \gdef\pdfimgext{JPG}%
-+            \fi
-+          \else
-+            \gdef\pdfimgext{jpeg}%
-+          \fi
-+        \else
-+          \gdef\pdfimgext{jpg}%
-+        \fi
-+      \else
-+        \gdef\pdfimgext{png}%
-+      \fi
-+      \closein 1
-+    \endgroup
-+    %
-     % without \immediate, pdftex seg faults when the same image is
-     % included twice.  (Version 3.14159-pre-1.0-unofficial-20010704.)
-     \ifnum\pdftexversion < 14
-@@ -1190,24 +1304,29 @@
-     \else
-       \immediate\pdfximage
-     \fi
--      \ifx\empty\imagewidth\else width \imagewidth \fi
--      \ifx\empty\imageheight\else height \imageheight \fi
-+      \ifdim \wd0 >0pt width \imagewidth \fi
-+      \ifdim \wd2 >0pt height \imageheight \fi
-       \ifnum\pdftexversion<13
--         #1.pdf%
-+         #1.\pdfimgext
-        \else
--         {#1.pdf}%
-+         {#1.\pdfimgext}%
-        \fi
-     \ifnum\pdftexversion < 14 \else
-       \pdfrefximage \pdflastximage
-     \fi}
-   \def\pdfmkdest#1{{%
--    % We have to set dummies so commands such as @code in a section title
--    % aren't expanded.
-+    % We have to set dummies so commands such as @code, and characters
-+    % such as \, aren't expanded when present in a section title.
-     \atdummies
--    \normalturnoffactive
--    \pdfdest name{#1} xyz%
--  }}
--  \def\pdfmkpgn#1{#1}
-+    \activebackslashdouble
-+    \def\pdfdestname{#1}%
-+    \backslashparens\pdfdestname
-+    \pdfdest name{\pdfdestname} xyz%
-+  }}%
-+  %
-+  % used to mark target names; must be expandable.
-+  \def\pdfmkpgn#1{#1}%
-+  %
-   \let\linkcolor = \Blue  % was Cyan, but that seems light?
-   \def\endlink{\Black\pdfendlink}
-   % Adding outlines to PDF; macros for calculating structure of outlines
-@@ -1218,20 +1337,31 @@
-     \advance\tempnum by 1
-     \expandafter\xdef\csname#1\endcsname{\the\tempnum}}
-   %
--  % #1 is the section text.  #2 is the pdf expression for the number
--  % of subentries (or empty, for subsubsections).  #3 is the node
--  % text, which might be empty if this toc entry had no
--  % corresponding node.  #4 is the page number.
-+  % #1 is the section text, which is what will be displayed in the
-+  % outline by the pdf viewer.  #2 is the pdf expression for the number
-+  % of subentries (or empty, for subsubsections).  #3 is the node text,
-+  % which might be empty if this toc entry had no corresponding node.
-+  % #4 is the page number
-   %
-   \def\dopdfoutline#1#2#3#4{%
-     % Generate a link to the node text if that exists; else, use the
-     % page number.  We could generate a destination for the section
-     % text in the case where a section has no node, but it doesn't
--    % seem worthwhile, since most documents are normally structured.
-+    % seem worth the trouble, since most documents are normally structured.
-     \def\pdfoutlinedest{#3}%
--    \ifx\pdfoutlinedest\empty \def\pdfoutlinedest{#4}\fi
-+    \ifx\pdfoutlinedest\empty
-+      \def\pdfoutlinedest{#4}%
-+    \else
-+      % Doubled backslashes in the name.
-+      {\activebackslashdouble \xdef\pdfoutlinedest{#3}%
-+       \backslashparens\pdfoutlinedest}%
-+    \fi
-     %
--    \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{#1}%
-+    % Also double the backslashes in the display string.
-+    {\activebackslashdouble \xdef\pdfoutlinetext{#1}%
-+     \backslashparens\pdfoutlinetext}%
-+    %
-+    \pdfoutline goto name{\pdfmkpgn{\pdfoutlinedest}}#2{\pdfoutlinetext}%
-   }
-   %
-   \def\pdfmakeoutlines{%
-@@ -1272,7 +1402,7 @@
-       \def\unnsecentry{\numsecentry}%
-       \def\unnsubsecentry{\numsubsecentry}%
-       \def\unnsubsubsecentry{\numsubsubsecentry}%
--      \input \jobname.toc
-+      \readdatafile{toc}%
-       %
-       % Read toc second time, this time actually producing the outlines.
-       % The `-' means take the \expnumber as the absolute number of
-@@ -1298,41 +1428,12 @@
-       % their "best" equivalent, based on the @documentencoding.  Right
-       % now, I guess we'll just let the pdf reader have its way.
-       \indexnofonts
--      \turnoffactive
-+      \setupdatafile
-+      \catcode`\\=\active \otherbackslash
-       \input \jobname.toc
-     \endgroup
-   }
-   %
--  \def\makelinks #1,{%
--    \def\params{#1}\def\E{END}%
--    \ifx\params\E
--      \let\nextmakelinks=\relax
--    \else
--      \let\nextmakelinks=\makelinks
--      \ifnum\lnkcount>0,\fi
--      \picknum{#1}%
--      \startlink attr{/Border [0 0 0]}
--        goto name{\pdfmkpgn{\the\pgn}}%
--      \linkcolor #1%
--      \advance\lnkcount by 1%
--      \endlink
--    \fi
--    \nextmakelinks
--  }
--  \def\picknum#1{\expandafter\pn#1}
--  \def\pn#1{%
--    \def\p{#1}%
--    \ifx\p\lbrace
--      \let\nextpn=\ppn
--    \else
--      \let\nextpn=\ppnn
--      \def\first{#1}
--    \fi
--    \nextpn
--  }
--  \def\ppn#1{\pgn=#1\gobble}
--  \def\ppnn{\pgn=\first}
--  \def\pdfmklnk#1{\lnkcount=0\makelinks #1,END,}
-   \def\skipspaces#1{\def\PP{#1}\def\D{|}%
-     \ifx\PP\D\let\nextsp\relax
-     \else\let\nextsp\skipspaces
-@@ -1347,9 +1448,17 @@
-   \else
-     \let \startlink \pdfstartlink
-   \fi
-+  % make a live url in pdf output.
-   \def\pdfurl#1{%
-     \begingroup
--      \normalturnoffactive\def\@{@}%
-+      % it seems we really need yet another set of dummies; have not
-+      % tried to figure out what each command should do in the context
-+      % of @url.  for now, just make @/ a no-op, that's the only one
-+      % people have actually reported a problem with.
-+      % 
-+      \normalturnoffactive
-+      \def\@{@}%
-+      \let\/=\empty
-       \makevalueexpandable
-       \leavevmode\Red
-       \startlink attr{/Border [0 0 0]}%
-@@ -1419,6 +1528,7 @@
- % We don't need math for this font style.
- \def\ttsl{\setfontstyle{ttsl}}
- 
-+
- % Default leading.
- \newdimen\textleading  \textleading = 13.2pt
- 
-@@ -1440,11 +1550,13 @@
-   }%
- }
- 
-+
- % Set the font macro #1 to the font named #2, adding on the
- % specified font prefix (normally `cm').
- % #3 is the font's design size, #4 is a scale factor
- \def\setfont#1#2#3#4{\font#1=\fontprefix#2#3 scaled #4}
- 
-+
- % Use cm as the default font prefix.
- % To specify the font prefix, you must define \fontprefix
- % before you read in texinfo.tex.
-@@ -1468,6 +1580,10 @@
- \def\scshape{csc}
- \def\scbshape{csc}
- 
-+% Definitions for a main text size of 11pt.  This is the default in
-+% Texinfo.
-+% 
-+\def\definetextfontsizexi{
- % Text fonts (11.2pt, magstep1).
- \def\textnominalsize{11pt}
- \edef\mainmagstep{\magstephalf}
-@@ -1581,6 +1697,165 @@
- \font\reducedi=cmmi10
- \font\reducedsy=cmsy10
- 
-+% reset the current fonts
-+\textfonts
-+\rm
-+} % end of 11pt text font size definitions
-+
-+
-+% Definitions to make the main text be 10pt Computer Modern, with
-+% section, chapter, etc., sizes following suit.  This is for the GNU
-+% Press printing of the Emacs 22 manual.  Maybe other manuals in the
-+% future.  Used with @smallbook, which sets the leading to 12pt.
-+% 
-+\def\definetextfontsizex{%
-+% Text fonts (10pt).
-+\def\textnominalsize{10pt}
-+\edef\mainmagstep{1000}
-+\setfont\textrm\rmshape{10}{\mainmagstep}
-+\setfont\texttt\ttshape{10}{\mainmagstep}
-+\setfont\textbf\bfshape{10}{\mainmagstep}
-+\setfont\textit\itshape{10}{\mainmagstep}
-+\setfont\textsl\slshape{10}{\mainmagstep}
-+\setfont\textsf\sfshape{10}{\mainmagstep}
-+\setfont\textsc\scshape{10}{\mainmagstep}
-+\setfont\textttsl\ttslshape{10}{\mainmagstep}
-+\font\texti=cmmi10 scaled \mainmagstep
-+\font\textsy=cmsy10 scaled \mainmagstep
-+
-+% A few fonts for @defun names and args.
-+\setfont\defbf\bfshape{10}{\magstephalf}
-+\setfont\deftt\ttshape{10}{\magstephalf}
-+\setfont\defttsl\ttslshape{10}{\magstephalf}
-+\def\df{\let\tentt=\deftt \let\tenbf = \defbf \let\tenttsl=\defttsl \bf}
-+
-+% Fonts for indices, footnotes, small examples (9pt).
-+\def\smallnominalsize{9pt}
-+\setfont\smallrm\rmshape{9}{1000}
-+\setfont\smalltt\ttshape{9}{1000}
-+\setfont\smallbf\bfshape{10}{900}
-+\setfont\smallit\itshape{9}{1000}
-+\setfont\smallsl\slshape{9}{1000}
-+\setfont\smallsf\sfshape{9}{1000}
-+\setfont\smallsc\scshape{10}{900}
-+\setfont\smallttsl\ttslshape{10}{900}
-+\font\smalli=cmmi9
-+\font\smallsy=cmsy9
-+
-+% Fonts for small examples (8pt).
-+\def\smallernominalsize{8pt}
-+\setfont\smallerrm\rmshape{8}{1000}
-+\setfont\smallertt\ttshape{8}{1000}
-+\setfont\smallerbf\bfshape{10}{800}
-+\setfont\smallerit\itshape{8}{1000}
-+\setfont\smallersl\slshape{8}{1000}
-+\setfont\smallersf\sfshape{8}{1000}
-+\setfont\smallersc\scshape{10}{800}
-+\setfont\smallerttsl\ttslshape{10}{800}
-+\font\smalleri=cmmi8
-+\font\smallersy=cmsy8
-+
-+% Fonts for title page (20.4pt):
-+\def\titlenominalsize{20pt}
-+\setfont\titlerm\rmbshape{12}{\magstep3}
-+\setfont\titleit\itbshape{10}{\magstep4}
-+\setfont\titlesl\slbshape{10}{\magstep4}
-+\setfont\titlett\ttbshape{12}{\magstep3}
-+\setfont\titlettsl\ttslshape{10}{\magstep4}
-+\setfont\titlesf\sfbshape{17}{\magstep1}
-+\let\titlebf=\titlerm
-+\setfont\titlesc\scbshape{10}{\magstep4}
-+\font\titlei=cmmi12 scaled \magstep3
-+\font\titlesy=cmsy10 scaled \magstep4
-+\def\authorrm{\secrm}
-+\def\authortt{\sectt}
-+
-+% Chapter fonts (14.4pt).
-+\def\chapnominalsize{14pt}
-+\setfont\chaprm\rmbshape{12}{\magstep1}
-+\setfont\chapit\itbshape{10}{\magstep2}
-+\setfont\chapsl\slbshape{10}{\magstep2}
-+\setfont\chaptt\ttbshape{12}{\magstep1}
-+\setfont\chapttsl\ttslshape{10}{\magstep2}
-+\setfont\chapsf\sfbshape{12}{\magstep1}
-+\let\chapbf\chaprm
-+\setfont\chapsc\scbshape{10}{\magstep2}
-+\font\chapi=cmmi12 scaled \magstep1
-+\font\chapsy=cmsy10 scaled \magstep2
-+
-+% Section fonts (12pt).
-+\def\secnominalsize{12pt}
-+\setfont\secrm\rmbshape{12}{1000}
-+\setfont\secit\itbshape{10}{\magstep1}
-+\setfont\secsl\slbshape{10}{\magstep1}
-+\setfont\sectt\ttbshape{12}{1000}
-+\setfont\secttsl\ttslshape{10}{\magstep1}
-+\setfont\secsf\sfbshape{12}{1000}
-+\let\secbf\secrm
-+\setfont\secsc\scbshape{10}{\magstep1}
-+\font\seci=cmmi12 
-+\font\secsy=cmsy10 scaled \magstep1
-+
-+% Subsection fonts (10pt).
-+\def\ssecnominalsize{10pt}
-+\setfont\ssecrm\rmbshape{10}{1000}
-+\setfont\ssecit\itbshape{10}{1000}
-+\setfont\ssecsl\slbshape{10}{1000}
-+\setfont\ssectt\ttbshape{10}{1000}
-+\setfont\ssecttsl\ttslshape{10}{1000}
-+\setfont\ssecsf\sfbshape{10}{1000}
-+\let\ssecbf\ssecrm
-+\setfont\ssecsc\scbshape{10}{1000}
-+\font\sseci=cmmi10
-+\font\ssecsy=cmsy10
-+
-+% Reduced fonts for @acro in text (9pt).
-+\def\reducednominalsize{9pt}
-+\setfont\reducedrm\rmshape{9}{1000}
-+\setfont\reducedtt\ttshape{9}{1000}
-+\setfont\reducedbf\bfshape{10}{900}
-+\setfont\reducedit\itshape{9}{1000}
-+\setfont\reducedsl\slshape{9}{1000}
-+\setfont\reducedsf\sfshape{9}{1000}
-+\setfont\reducedsc\scshape{10}{900}
-+\setfont\reducedttsl\ttslshape{10}{900}
-+\font\reducedi=cmmi9
-+\font\reducedsy=cmsy9
-+
-+% reduce space between paragraphs
-+\divide\parskip by 2
-+
-+% reset the current fonts
-+\textfonts
-+\rm
-+} % end of 10pt text font size definitions
-+
-+
-+% We provide the user-level command
-+%   @fonttextsize 10
-+% (or 11) to redefine the text font size.  pt is assumed.
-+% 
-+\def\xword{10}
-+\def\xiword{11}
-+%
-+\parseargdef\fonttextsize{%
-+  \def\textsizearg{#1}%
-+  \wlog{doing @fonttextsize \textsizearg}%
-+  %
-+  % Set \globaldefs so that documents can use this inside @tex, since
-+  % makeinfo 4.8 does not support it, but we need it nonetheless.
-+  % 
-+ \begingroup \globaldefs=1
-+  \ifx\textsizearg\xword \definetextfontsizex
-+  \else \ifx\textsizearg\xiword \definetextfontsizexi
-+  \else
-+    \errhelp=\EMsimple
-+    \errmessage{@fonttextsize only supports `10' or `11', not `\textsizearg'}
-+  \fi\fi
-+ \endgroup
-+}
-+
-+
- % In order for the font changes to affect most math symbols and letters,
- % we have to define the \textfont of the standard families.  Since
- % texinfo doesn't allow for producing subscripts and superscripts except
-@@ -1691,7 +1966,7 @@
- 
- % Set up the default fonts, so we can use them for creating boxes.
- %
--\textfonts \rm
-+\definetextfontsizexi
- 
- % Define these so they can be easily changed for other fonts.
- \def\angleleft{$\langle$}
-@@ -1749,14 +2024,21 @@
- % sometimes \x has an active definition that messes things up.
- %
- \catcode`@=11
--  \def\frenchspacing{%
-+  \def\plainfrenchspacing{%
-     \sfcode\dotChar  =\@m \sfcode\questChar=\@m \sfcode\exclamChar=\@m
-     \sfcode\colonChar=\@m \sfcode\semiChar =\@m \sfcode\commaChar =\@m
-+    \def\endofsentencespacefactor{1000}% for @. and friends
-+  }
-+  \def\plainnonfrenchspacing{%
-+    \sfcode`\.3000\sfcode`\?3000\sfcode`\!3000
-+    \sfcode`\:2000\sfcode`\;1500\sfcode`\,1250
-+    \def\endofsentencespacefactor{3000}% for @. and friends
-   }
- \catcode`@=\other
-+\def\endofsentencespacefactor{3000}% default
- 
- \def\t#1{%
--  {\tt \rawbackslash \frenchspacing #1}%
-+  {\tt \rawbackslash \plainfrenchspacing #1}%
-   \null
- }
- \def\samp#1{`\tclose{#1}'\null}
-@@ -1768,6 +2050,7 @@
-      \hbox{\raise0.4pt\hbox{\vphantom{\angleleft}}#1}}%
-     \kern-0.4pt\hrule}%
-   \kern-.06em\raise0.4pt\hbox{\angleright}}}}
-+\def\key #1{{\nohyphenation \uppercase{#1}}\null}
- % The old definition, with no lozenge:
- %\def\key #1{{\ttsl \nohyphenation \uppercase{#1}}\null}
- \def\ctrl #1{{\tt \rawbackslash \hat}#1}
-@@ -1793,7 +2076,7 @@
-     \nohyphenation
-     %
-     \rawbackslash
--    \frenchspacing
-+    \plainfrenchspacing
-     #1%
-   }%
-   \null
-@@ -1809,12 +2092,21 @@
- % and arrange explicitly to hyphenate at a dash.
- %  -- rms.
- {
--  \catcode`\-=\active
--  \catcode`\_=\active
-+  \catcode`\-=\active \catcode`\_=\active
-+  \catcode`\'=\active \catcode`\`=\active
-   %
-   \global\def\code{\begingroup
--    \catcode`\-=\active \let-\codedash
--    \catcode`\_=\active \let_\codeunder
-+    \catcode\rquoteChar=\active \catcode\lquoteChar=\active
-+    \let'\codequoteright \let`\codequoteleft
-+    %
-+    \catcode\dashChar=\active  \catcode\underChar=\active
-+    \ifallowcodebreaks
-+     \let-\codedash
-+     \let_\codeunder
-+    \else
-+     \let-\realdash
-+     \let_\realunder
-+    \fi
-     \codex
-   }
- }
-@@ -1834,6 +2126,28 @@
- }
- \def\codex #1{\tclose{#1}\endgroup}
- 
-+% An additional complication: the above will allow breaks after, e.g.,
-+% each of the four underscores in __typeof__.  This is undesirable in
-+% some manuals, especially if they don't have long identifiers in
-+% general.  @allowcodebreaks provides a way to control this.
-+% 
-+\newif\ifallowcodebreaks  \allowcodebreakstrue
-+
-+\def\keywordtrue{true}
-+\def\keywordfalse{false}
-+
-+\parseargdef\allowcodebreaks{%
-+  \def\txiarg{#1}%
-+  \ifx\txiarg\keywordtrue
-+    \allowcodebreakstrue
-+  \else\ifx\txiarg\keywordfalse
-+    \allowcodebreaksfalse
-+  \else
-+    \errhelp = \EMsimple
-+    \errmessage{Unknown @allowcodebreaks option `\txiarg'}%
-+  \fi\fi
-+}
-+
- % @kbd is like @code, except that if the argument is just one @key command,
- % then @kbd has no effect.
- 
-@@ -1841,16 +2155,16 @@
- %   `example' (@kbd uses ttsl only inside of @example and friends),
- %   or `code' (@kbd uses normal tty font always).
- \parseargdef\kbdinputstyle{%
--  \def\arg{#1}%
--  \ifx\arg\worddistinct
-+  \def\txiarg{#1}%
-+  \ifx\txiarg\worddistinct
-     \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\ttsl}%
--  \else\ifx\arg\wordexample
-+  \else\ifx\txiarg\wordexample
-     \gdef\kbdexamplefont{\ttsl}\gdef\kbdfont{\tt}%
--  \else\ifx\arg\wordcode
-+  \else\ifx\txiarg\wordcode
-     \gdef\kbdexamplefont{\tt}\gdef\kbdfont{\tt}%
-   \else
-     \errhelp = \EMsimple
--    \errmessage{Unknown @kbdinputstyle option `\arg'}%
-+    \errmessage{Unknown @kbdinputstyle option `\txiarg'}%
-   \fi\fi\fi
- }
- \def\worddistinct{distinct}
-@@ -1962,7 +2276,7 @@
- % 
- \def\abbr#1{\doabbr #1,,\finish}
- \def\doabbr#1,#2,#3\finish{%
--  {\frenchspacing #1}%
-+  {\plainfrenchspacing #1}%
-   \def\temp{#2}%
-   \ifx\temp\empty \else
-     \space ({\unsepspaces \ignorespaces \temp \unskip})%
-@@ -2000,7 +2314,7 @@
- \def\eurofont{%
-   % We set the font at each command, rather than predefining it in
-   % \textfonts and the other font-switching commands, so that
--  % installations which never need the symbold don't have to have the
-+  % installations which never need the symbol don't have to have the
-   % font installed.
-   % 
-   % There is only one designed size (nominal 10pt), so we always scale
-@@ -2031,6 +2345,10 @@
-     }$%
- }
- 
-+% @textdegree - the normal degrees sign.
-+%
-+\def\textdegree{$^\circ$}
-+
- % Laurent Siebenmann reports \Orb undefined with:
- %  Textures 1.7.7 (preloaded format=plain 93.10.14)  (68K)  16 APR 2004 02:38
- % so we'll define it if necessary.
-@@ -2202,8 +2520,8 @@
-   %
-   % Leave some space for the footline.  Hopefully ok to assume
-   % @evenfooting will not be used by itself.
--  \global\advance\pageheight by -\baselineskip
--  \global\advance\vsize by -\baselineskip
-+  \global\advance\pageheight by -12pt
-+  \global\advance\vsize by -12pt
- }
- 
- \parseargdef\everyfooting{\oddfootingxxx{#1}\evenfootingxxx{#1}}
-@@ -2862,6 +3180,7 @@
- 
- \def\doignore#1{\begingroup
-   % Scan in ``verbatim'' mode:
-+  \obeylines
-   \catcode`\@ = \other
-   \catcode`\{ = \other
-   \catcode`\} = \other
-@@ -2882,16 +3201,16 @@
-   \gdef\dodoignore#1{%
-     % #1 contains the command name as a string, e.g., `ifinfo'.
-     %
--    % Define a command to find the next `@end #1', which must be on a line
--    % by itself.
--    \long\def\doignoretext##1^^M@end #1{\doignoretextyyy##1^^M@#1\_STOP_}%
-+    % Define a command to find the next `@end #1'.
-+    \long\def\doignoretext##1^^M@end #1{%
-+      \doignoretextyyy##1^^M@#1\_STOP_}%
-+    %
-     % And this command to find another #1 command, at the beginning of a
-     % line.  (Otherwise, we would consider a line `@c @ifset', for
-     % example, to count as an @ifset for nesting.)
-     \long\def\doignoretextyyy##1^^M@#1##2\_STOP_{\doignoreyyy{##2}\_STOP_}%
-     %
-     % And now expand that command.
--    \obeylines %
-     \doignoretext ^^M%
-   }%
- }
-@@ -2921,7 +3240,12 @@
- }
- 
- % Finish off ignored text.
--\def\enddoignore{\endgroup\ignorespaces}
-+{ \obeylines%
-+  % Ignore anything after the last `@end #1'; this matters in verbatim
-+  % environments, where otherwise the newline after an ignored conditional
-+  % would result in a blank line in the output.
-+  \gdef\enddoignore#1^^M{\endgroup\ignorespaces}%
-+}
- 
- 
- % @set VAR sets the variable VAR to an empty value.
-@@ -3121,42 +3445,50 @@
- % we have to laboriously prevent expansion for those that we don't.
- %
- \def\indexdummies{%
-+  \escapechar = `\\     % use backslash in output files.
-   \def\@{@}% change to @@ when we switch to @ as escape char in index files.
-   \def\ {\realbackslash\space }%
-+  %
-   % Need these in case \tex is in effect and \{ is a \delimiter again.
-   % But can't use \lbracecmd and \rbracecmd because texindex assumes
-   % braces and backslashes are used only as delimiters.
-   \let\{ = \mylbrace
-   \let\} = \myrbrace
-   %
--  % \definedummyword defines \#1 as \realbackslash #1\space, thus
--  % effectively preventing its expansion.  This is used only for control
--  % words, not control letters, because the \space would be incorrect
--  % for control characters, but is needed to separate the control word
--  % from whatever follows.
--  %
--  % For control letters, we have \definedummyletter, which omits the
--  % space.
--  %
--  % These can be used both for control words that take an argument and
--  % those that do not.  If it is followed by {arg} in the input, then
--  % that will dutifully get written to the index (or wherever).
--  %
--  \def\definedummyword##1{%
--    \expandafter\def\csname ##1\endcsname{\realbackslash ##1\space}%
--  }%
--  \def\definedummyletter##1{%
--    \expandafter\def\csname ##1\endcsname{\realbackslash ##1}%
--  }%
--  \let\definedummyaccent\definedummyletter
-+  % I don't entirely understand this, but when an index entry is
-+  % generated from a macro call, the \endinput which \scanmacro inserts
-+  % causes processing to be prematurely terminated.  This is,
-+  % apparently, because \indexsorttmp is fully expanded, and \endinput
-+  % is an expandable command.  The redefinition below makes \endinput
-+  % disappear altogether for that purpose -- although logging shows that
-+  % processing continues to some further point.  On the other hand, it
-+  % seems \endinput does not hurt in the printed index arg, since that
-+  % is still getting written without apparent harm.
-+  % 
-+  % Sample source (mac-idx3.tex, reported by Graham Percival to
-+  % help-texinfo, 22may06):
-+  % @macro funindex {WORD}
-+  % @findex xyz
-+  % @end macro
-+  % ...
-+  % @funindex commtest
-+  % 
-+  % The above is not enough to reproduce the bug, but it gives the flavor.
-+  % 
-+  % Sample whatsit resulting:
-+  % .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}}
-+  % 
-+  % So:
-+  \let\endinput = \empty
-   %
-   % Do the redefinitions.
-   \commondummies
- }
- 
--% For the aux file, @ is the escape character.  So we want to redefine
--% everything using @ instead of \realbackslash.  When everything uses
--% @, this will be simpler.
-+% For the aux and toc files, @ is the escape character.  So we want to
-+% redefine everything using @ as the escape character (instead of
-+% \realbackslash, still used for index files).  When everything uses @,
-+% this will be simpler.
- %
- \def\atdummies{%
-   \def\@{@@}%
-@@ -3164,147 +3496,152 @@
-   \let\{ = \lbraceatcmd
-   \let\} = \rbraceatcmd
-   %
--  % (See comments in \indexdummies.)
--  \def\definedummyword##1{%
--    \expandafter\def\csname ##1\endcsname{@##1\space}%
--  }%
--  \def\definedummyletter##1{%
--    \expandafter\def\csname ##1\endcsname{@##1}%
--  }%
--  \let\definedummyaccent\definedummyletter
--  %
-   % Do the redefinitions.
-   \commondummies
-+  \otherbackslash
- }
- 
--% Called from \indexdummies and \atdummies.  \definedummyword and
--% \definedummyletter must be defined first.
-+% Called from \indexdummies and \atdummies.
- %
- \def\commondummies{%
-   %
--  \normalturnoffactive
-+  % \definedummyword defines \#1 as \string\#1\space, thus effectively
-+  % preventing its expansion.  This is used only for control% words,
-+  % not control letters, because the \space would be incorrect for
-+  % control characters, but is needed to separate the control word
-+  % from whatever follows.
-+  %
-+  % For control letters, we have \definedummyletter, which omits the
-+  % space.
-+  %
-+  % These can be used both for control words that take an argument and
-+  % those that do not.  If it is followed by {arg} in the input, then
-+  % that will dutifully get written to the index (or wherever).
-+  %
-+  \def\definedummyword  ##1{\def##1{\string##1\space}}%
-+  \def\definedummyletter##1{\def##1{\string##1}}%
-+  \let\definedummyaccent\definedummyletter
-   %
-   \commondummiesnofonts
-   %
--  \definedummyletter{_}%
-+  \definedummyletter\_%
-   %
-   % Non-English letters.
--  \definedummyword{AA}%
--  \definedummyword{AE}%
--  \definedummyword{L}%
--  \definedummyword{OE}%
--  \definedummyword{O}%
--  \definedummyword{aa}%
--  \definedummyword{ae}%
--  \definedummyword{l}%
--  \definedummyword{oe}%
--  \definedummyword{o}%
--  \definedummyword{ss}%
--  \definedummyword{exclamdown}%
--  \definedummyword{questiondown}%
--  \definedummyword{ordf}%
--  \definedummyword{ordm}%
-+  \definedummyword\AA
-+  \definedummyword\AE
-+  \definedummyword\L
-+  \definedummyword\OE
-+  \definedummyword\O
-+  \definedummyword\aa
-+  \definedummyword\ae
-+  \definedummyword\l
-+  \definedummyword\oe
-+  \definedummyword\o
-+  \definedummyword\ss
-+  \definedummyword\exclamdown
-+  \definedummyword\questiondown
-+  \definedummyword\ordf
-+  \definedummyword\ordm
-   %
-   % Although these internal commands shouldn't show up, sometimes they do.
--  \definedummyword{bf}%
--  \definedummyword{gtr}%
--  \definedummyword{hat}%
--  \definedummyword{less}%
--  \definedummyword{sf}%
--  \definedummyword{sl}%
--  \definedummyword{tclose}%
--  \definedummyword{tt}%
-+  \definedummyword\bf
-+  \definedummyword\gtr
-+  \definedummyword\hat
-+  \definedummyword\less
-+  \definedummyword\sf
-+  \definedummyword\sl
-+  \definedummyword\tclose
-+  \definedummyword\tt
-   %
--  \definedummyword{LaTeX}%
--  \definedummyword{TeX}%
-+  \definedummyword\LaTeX
-+  \definedummyword\TeX
-   %
-   % Assorted special characters.
--  \definedummyword{bullet}%
--  \definedummyword{comma}%
--  \definedummyword{copyright}%
--  \definedummyword{registeredsymbol}%
--  \definedummyword{dots}%
--  \definedummyword{enddots}%
--  \definedummyword{equiv}%
--  \definedummyword{error}%
--  \definedummyword{euro}%
--  \definedummyword{expansion}%
--  \definedummyword{minus}%
--  \definedummyword{pounds}%
--  \definedummyword{point}%
--  \definedummyword{print}%
--  \definedummyword{result}%
-+  \definedummyword\bullet
-+  \definedummyword\comma
-+  \definedummyword\copyright
-+  \definedummyword\registeredsymbol
-+  \definedummyword\dots
-+  \definedummyword\enddots
-+  \definedummyword\equiv
-+  \definedummyword\error
-+  \definedummyword\euro
-+  \definedummyword\expansion
-+  \definedummyword\minus
-+  \definedummyword\pounds
-+  \definedummyword\point
-+  \definedummyword\print
-+  \definedummyword\result
-+  \definedummyword\textdegree
-+  %
-+  % We want to disable all macros so that they are not expanded by \write.
-+  \macrolist
-+  %
-+  \normalturnoffactive
-   %
-   % Handle some cases of @value -- where it does not contain any
-   % (non-fully-expandable) commands.
-   \makevalueexpandable
--  %
--  % Normal spaces, not active ones.
--  \unsepspaces
--  %
--  % No macro expansion.
--  \turnoffmacros
- }
- 
- % \commondummiesnofonts: common to \commondummies and \indexnofonts.
- %
--% Better have this without active chars.
--{
--  \catcode`\~=\other
--  \gdef\commondummiesnofonts{%
--    % Control letters and accents.
--    \definedummyletter{!}%
--    \definedummyaccent{"}%
--    \definedummyaccent{'}%
--    \definedummyletter{*}%
--    \definedummyaccent{,}%
--    \definedummyletter{.}%
--    \definedummyletter{/}%
--    \definedummyletter{:}%
--    \definedummyaccent{=}%
--    \definedummyletter{?}%
--    \definedummyaccent{^}%
--    \definedummyaccent{`}%
--    \definedummyaccent{~}%
--    \definedummyword{u}%
--    \definedummyword{v}%
--    \definedummyword{H}%
--    \definedummyword{dotaccent}%
--    \definedummyword{ringaccent}%
--    \definedummyword{tieaccent}%
--    \definedummyword{ubaraccent}%
--    \definedummyword{udotaccent}%
--    \definedummyword{dotless}%
--    %
--    % Texinfo font commands.
--    \definedummyword{b}%
--    \definedummyword{i}%
--    \definedummyword{r}%
--    \definedummyword{sc}%
--    \definedummyword{t}%
--    %
--    % Commands that take arguments.
--    \definedummyword{acronym}%
--    \definedummyword{cite}%
--    \definedummyword{code}%
--    \definedummyword{command}%
--    \definedummyword{dfn}%
--    \definedummyword{emph}%
--    \definedummyword{env}%
--    \definedummyword{file}%
--    \definedummyword{kbd}%
--    \definedummyword{key}%
--    \definedummyword{math}%
--    \definedummyword{option}%
--    \definedummyword{samp}%
--    \definedummyword{strong}%
--    \definedummyword{tie}%
--    \definedummyword{uref}%
--    \definedummyword{url}%
--    \definedummyword{var}%
--    \definedummyword{verb}%
--    \definedummyword{w}%
--  }
-+\def\commondummiesnofonts{%
-+  % Control letters and accents.
-+  \definedummyletter\!%
-+  \definedummyaccent\"%
-+  \definedummyaccent\'%
-+  \definedummyletter\*%
-+  \definedummyaccent\,%
-+  \definedummyletter\.%
-+  \definedummyletter\/%
-+  \definedummyletter\:%
-+  \definedummyaccent\=%
-+  \definedummyletter\?%
-+  \definedummyaccent\^%
-+  \definedummyaccent\`%
-+  \definedummyaccent\~%
-+  \definedummyword\u
-+  \definedummyword\v
-+  \definedummyword\H
-+  \definedummyword\dotaccent
-+  \definedummyword\ringaccent
-+  \definedummyword\tieaccent
-+  \definedummyword\ubaraccent
-+  \definedummyword\udotaccent
-+  \definedummyword\dotless
-+  %
-+  % Texinfo font commands.
-+  \definedummyword\b
-+  \definedummyword\i
-+  \definedummyword\r
-+  \definedummyword\sc
-+  \definedummyword\t
-+  %
-+  % Commands that take arguments.
-+  \definedummyword\acronym
-+  \definedummyword\cite
-+  \definedummyword\code
-+  \definedummyword\command
-+  \definedummyword\dfn
-+  \definedummyword\emph
-+  \definedummyword\env
-+  \definedummyword\file
-+  \definedummyword\kbd
-+  \definedummyword\key
-+  \definedummyword\math
-+  \definedummyword\option
-+  \definedummyword\pxref
-+  \definedummyword\ref
-+  \definedummyword\samp
-+  \definedummyword\strong
-+  \definedummyword\tie
-+  \definedummyword\uref
-+  \definedummyword\url
-+  \definedummyword\var
-+  \definedummyword\verb
-+  \definedummyword\w
-+  \definedummyword\xref
- }
- 
- % \indexnofonts is used when outputting the strings to sort the index
-@@ -3314,13 +3651,9 @@
- %
- \def\indexnofonts{%
-   % Accent commands should become @asis.
--  \def\definedummyaccent##1{%
--    \expandafter\let\csname ##1\endcsname\asis
--  }%
-+  \def\definedummyaccent##1{\let##1\asis}%
-   % We can just ignore other control letters.
--  \def\definedummyletter##1{%
--    \expandafter\def\csname ##1\endcsname{}%
--  }%
-+  \def\definedummyletter##1{\let##1\empty}%
-   % Hopefully, all control words can become @asis.
-   \let\definedummyword\definedummyaccent
-   %
-@@ -3373,9 +3706,19 @@
-   \def\point{.}%
-   \def\print{-|}%
-   \def\result{=>}%
-+  \def\textdegree{degrees}%
-   %
--  % Don't write macro names.
--  \emptyusermacros
-+  % We need to get rid of all macros, leaving only the arguments (if present).
-+  % Of course this is not nearly correct, but it is the best we can do for now.
-+  % makeinfo does not expand macros in the argument to @deffn, which ends up
-+  % writing an index entry, and texindex isn't prepared for an index sort entry
-+  % that starts with \.
-+  % 
-+  % Since macro invocations are followed by braces, we can just redefine them
-+  % to take a single TeX argument.  The case of a macro invocation that
-+  % goes to end-of-line is not handled.
-+  % 
-+  \macrolist
- }
- 
- \let\indexbackslash=0  %overridden during \printindex.
-@@ -3422,7 +3765,6 @@
-   %
-   % Remember, we are within a group.
-   \indexdummies % Must do this here, since \bf, etc expand at this stage
--  \escapechar=`\\
-   \def\backslashcurfont{\indexbackslash}% \indexbackslash isn't defined now
-       % so it will be output as is; and it will print as backslash.
-   %
-@@ -3713,9 +4055,9 @@
-   \endgroup
- }
- 
--% Like \dotfill except takes at least 1 em.
-+% Like plain.tex's \dotfill, except uses up at least 1 em.
- \def\indexdotfill{\cleaders
--  \hbox{$\mathsurround=0pt \mkern1.5mu ${\it .}$ \mkern1.5mu$}\hskip 1em plus 1fill}
-+  \hbox{$\mathsurround=0pt \mkern1.5mu.\mkern1.5mu$}\hskip 1em plus 1fill}
- 
- \def\primary #1{\line{#1\hfil}}
- 
-@@ -4289,14 +4631,17 @@
-     \ifx\temptype\Ynothingkeyword
-       \setbox0 = \hbox{}%
-       \def\toctype{unnchap}%
--      \def\thischapter{#1}%
-+      \gdef\thischapternum{}%
-+      \gdef\thischapter{#1}%
-     \else\ifx\temptype\Yomitfromtockeyword
-       \setbox0 = \hbox{}% contents like unnumbered, but no toc entry
-       \def\toctype{omit}%
--      \xdef\thischapter{}%
-+      \gdef\thischapternum{}%
-+      \gdef\thischapter{}%
-     \else\ifx\temptype\Yappendixkeyword
-       \setbox0 = \hbox{\putwordAppendix{} #3\enspace}%
-       \def\toctype{app}%
-+      \xdef\thischapternum{\appendixletter}%
-       % We don't substitute the actual chapter name into \thischapter
-       % because we don't want its macros evaluated now.  And we don't
-       % use \thissection because that changes with each section.
-@@ -4306,6 +4651,7 @@
-     \else
-       \setbox0 = \hbox{#3\enspace}%
-       \def\toctype{numchap}%
-+      \xdef\thischapternum{\the\chapno}%
-       \xdef\thischapter{\putwordChapter{} \the\chapno:
-                         \noexpand\thischaptername}%
-     \fi\fi\fi
-@@ -4417,13 +4763,21 @@
-       \gdef\thissection{#1}%
-     \fi\fi\fi
-     %
--    % Write the toc entry (before \donoderef).  See comments in \chfplain.
-+    % Write the toc entry (before \donoderef).  See comments in \chapmacro.
-     \writetocentry{\toctype\sectionlevel}{#1}{#4}%
-     %
-     % Write the node reference (= pdf destination for pdftex).
--    % Again, see comments in \chfplain.
-+    % Again, see comments in \chapmacro.
-     \donoderef{#3}%
-     %
-+    % Interline glue will be inserted when the vbox is completed.
-+    % That glue will be a valid breakpoint for the page, since it'll be
-+    % preceded by a whatsit (usually from the \donoderef, or from the
-+    % \writetocentry if there was no node).  We don't want to allow that
-+    % break, since then the whatsits could end up on page n while the
-+    % section is on page n+1, thus toc/etc. are wrong.  Debian bug 276000.
-+    \nobreak
-+    %
-     % Output the actual section heading.
-     \vbox{\hyphenpenalty=10000 \tolerance=5000 \parindent=0pt \raggedright
-           \hangindent=\wd0  % zero if no section number
-@@ -4482,11 +4836,11 @@
-     \fi
-     %
-     \iflinks
--      \toks0 = {#2}%
--      \toks2 = \expandafter{\lastnode}%
--      \edef\temp{\write\tocfile{\realbackslash #1entry{\the\toks0}{#3}%
--                               {\the\toks2}{\noexpand\folio}}}%
--      \temp
-+      {\atdummies
-+       \edef\temp{%
-+         \write\tocfile{@#1entry{#2}{#3}{\lastnode}{\noexpand\folio}}}%
-+       \temp
-+      }%
-     \fi
-   \fi
-   %
-@@ -4499,6 +4853,31 @@
-   \ifpdf \global\pdfmakepagedesttrue \fi
- }
- 
-+
-+% These characters do not print properly in the Computer Modern roman
-+% fonts, so we must take special care.  This is more or less redundant
-+% with the Texinfo input format setup at the end of this file.
-+% 
-+\def\activecatcodes{%
-+  \catcode`\"=\active
-+  \catcode`\$=\active
-+  \catcode`\<=\active
-+  \catcode`\>=\active
-+  \catcode`\\=\active
-+  \catcode`\^=\active
-+  \catcode`\_=\active
-+  \catcode`\|=\active
-+  \catcode`\~=\active
-+}
-+
-+
-+% Read the toc file, which is essentially Texinfo input.
-+\def\readtocfile{%
-+  \setupdatafile
-+  \activecatcodes
-+  \input \jobname.toc
-+}
-+
- \newskip\contentsrightmargin \contentsrightmargin=1in
- \newcount\savepageno
- \newcount\lastnegativepageno \lastnegativepageno = -1
-@@ -4520,11 +4899,7 @@
-   %
-   \savepageno = \pageno
-   \begingroup                  % Set up to handle contents files properly.
--    \catcode`\\=0  \catcode`\{=1  \catcode`\}=2  \catcode`\@=11
--    % We can't do this, because then an actual ^ in a section
--    % title fails, e.g., @chapter ^ -- exponentiation.  --karl, 9jul97.
--    %\catcode`\^=7 % to see ^^e4 as \"a etc. juha@piuha.ydi.vtt.fi
--    \raggedbottom             % Worry more about breakpoints than the bottom.
-+    \raggedbottom              % Worry more about breakpoints than the bottom.
-     \advance\hsize by -\contentsrightmargin % Don't use the full line length.
-     %
-     % Roman numerals for page numbers.
-@@ -4537,7 +4912,7 @@
-   \startcontents{\putwordTOC}%
-     \openin 1 \jobname.toc
-     \ifeof 1 \else
--      \input \jobname.toc
-+      \readtocfile
-     \fi
-     \vfill \eject
-     \contentsalignmacro % in case @setchapternewpage odd is in effect
-@@ -4575,7 +4950,7 @@
-     \let\unnsubsubsecentry = \numsecentry
-     \openin 1 \jobname.toc
-     \ifeof 1 \else
--      \input \jobname.toc
-+      \readtocfile
-     \fi
-     \closein 1
-     \vfill \eject
-@@ -4717,7 +5092,7 @@
- {\tentt \global\dimen0 = 3em}% Width of the box.
- \dimen2 = .55pt % Thickness of rules
- % The text. (`r' is open on the right, `e' somewhat less so on the left.)
--\setbox0 = \hbox{\kern-.75pt \tensf error\kern-1.5pt}
-+\setbox0 = \hbox{\kern-.75pt \reducedsf error\kern-1.5pt}
- %
- \setbox\errorbox=\hbox to \dimen0{\hfil
-    \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right.
-@@ -4765,6 +5140,7 @@
-   \let\/=\ptexslash
-   \let\*=\ptexstar
-   \let\t=\ptext
-+  \let\frenchspacing=\plainfrenchspacing
-   %
-   \def\endldots{\mathinner{\ldots\ldots\ldots\ldots}}%
-   \def\enddots{\relax\ifmmode\endldots\else$\mathsurround=0pt \endldots\,$\fi}%
-@@ -4810,7 +5186,8 @@
- 
- \let\afterenvbreak = \aboveenvbreak
- 
--% \nonarrowing is a flag.  If "set", @lisp etc don't narrow margins.
-+% \nonarrowing is a flag.  If "set", @lisp etc don't narrow margins; it will
-+% also clear it, so that its embedded environments do the narrowing again.
- \let\nonarrowing=\relax
- 
- % @cartouche ... @end cartouche: draw rectangle w/rounded corners around
-@@ -4847,7 +5224,7 @@
- 				% each corner char, and rule thickness
-   \normbskip=\baselineskip \normpskip=\parskip \normlskip=\lineskip
-   % Flag to tell @lisp, etc., not to narrow margin.
--  \let\nonarrowing=\comment
-+  \let\nonarrowing = t%
-   \vbox\bgroup
-       \baselineskip=0pt\parskip=0pt\lineskip=0pt
-       \carttop
-@@ -4887,11 +5264,11 @@
-   \parskip = 0pt
-   \parindent = 0pt
-   \emergencystretch = 0pt % don't try to avoid overfull boxes
--  % @cartouche defines \nonarrowing to inhibit narrowing
--  % at next level down.
-   \ifx\nonarrowing\relax
-     \advance \leftskip by \lispnarrowing
-     \exdentamount=\lispnarrowing
-+  \else
-+    \let\nonarrowing = \relax
-   \fi
-   \let\exdent=\nofillexdent
- }
-@@ -4938,11 +5315,10 @@
- %
- \maketwodispenvs {lisp}{example}{%
-   \nonfillstart
--  \tt
-+  \tt\quoteexpand
-   \let\kbdfont = \kbdexamplefont % Allow @kbd to do something special.
-   \gobble       % eat return
- }
--
- % @display/@smalldisplay: same as @lisp except keep current font.
- %
- \makedispenv {display}{%
-@@ -4991,6 +5367,7 @@
-     \advance\leftskip by \lispnarrowing
-     \advance\rightskip by \lispnarrowing
-     \exdentamount = \lispnarrowing
-+  \else
-     \let\nonarrowing = \relax
-   \fi
-   \parsearg\quotationlabel
-@@ -5069,6 +5446,34 @@
- \newdimen\tabw \setbox0=\hbox{\tt\space} \tabw=8\wd0 % tab amount
- %
- \def\starttabbox{\setbox0=\hbox\bgroup}
-+
-+% Allow an option to not replace quotes with a regular directed right
-+% quote/apostrophe (char 0x27), but instead use the undirected quote
-+% from cmtt (char 0x0d).  The undirected quote is ugly, so don't make it
-+% the default, but it works for pasting with more pdf viewers (at least
-+% evince), the lilypond developers report.  xpdf does work with the
-+% regular 0x27.  
-+% 
-+\def\codequoteright{%
-+  \expandafter\ifx\csname SETcodequoteundirected\endcsname\relax
-+    '%
-+  \else
-+    \char'15
-+  \fi
-+}
-+%
-+% and a similar option for the left quote char vs. a grave accent.
-+% Modern fonts display ASCII 0x60 as a grave accent, so some people like
-+% the code environments to do likewise.
-+% 
-+\def\codequoteleft{%
-+  \expandafter\ifx\csname SETcodequotebacktick\endcsname\relax
-+    `%
-+  \else
-+    \char'22
-+  \fi
-+}
-+%
- \begingroup
-   \catcode`\^^I=\active
-   \gdef\tabexpand{%
-@@ -5081,15 +5486,25 @@
-       \wd0=\dimen0 \box0 \starttabbox
-     }%
-   }
-+  \catcode`\'=\active
-+  \gdef\rquoteexpand{\catcode\rquoteChar=\active \def'{\codequoteright}}%
-+  %
-+  \catcode`\`=\active
-+  \gdef\lquoteexpand{\catcode\lquoteChar=\active \def`{\codequoteleft}}%
-+  %
-+  \gdef\quoteexpand{\rquoteexpand \lquoteexpand}%
- \endgroup
-+
-+% start the verbatim environment.
- \def\setupverbatim{%
-+  \let\nonarrowing = t%
-   \nonfillstart
--  \advance\leftskip by -\defbodyindent
-   % Easiest (and conventionally used) font for verbatim
-   \tt
-   \def\par{\leavevmode\egroup\box0\endgraf}%
-   \catcode`\`=\active
-   \tabexpand
-+  \quoteexpand
-   % Respect line breaks,
-   % print special symbols as themselves, and
-   % make each space count
-@@ -5539,7 +5954,6 @@
-     \spaceisspace
-     %
-     % Append \endinput to make sure that TeX does not see the ending newline.
--    %
-     % I've verified that it is necessary both for e-TeX and for ordinary TeX
-     %							--kasal, 29nov03
-     \scantokens{#1\endinput}%
-@@ -5554,8 +5968,19 @@
- \newcount\paramno   % Count of parameters
- \newtoks\macname    % Macro name
- \newif\ifrecursive  % Is it recursive?
--\def\macrolist{}    % List of all defined macros in the form
--                    % \do\macro1\do\macro2...
-+
-+% List of all defined macros in the form
-+%    \definedummyword\macro1\definedummyword\macro2...
-+% Currently is also contains all @aliases; the list can be split
-+% if there is a need.
-+\def\macrolist{}
-+
-+% Add the macro to \macrolist
-+\def\addtomacrolist#1{\expandafter \addtomacrolistxxx \csname#1\endcsname}
-+\def\addtomacrolistxxx#1{%
-+     \toks0 = \expandafter{\macrolist\definedummyword#1}%
-+     \xdef\macrolist{\the\toks0}%
-+}
- 
- % Utility routines.
- % This does \let #1 = #2, with \csnames; that is,
-@@ -5653,10 +6078,7 @@
-      \else \errmessage{Macro name \the\macname\space already defined}\fi
-      \global\cslet{macsave.\the\macname}{\the\macname}%
-      \global\expandafter\let\csname ismacro.\the\macname\endcsname=1%
--     % Add the macroname to \macrolist
--     \toks0 = \expandafter{\macrolist\do}%
--     \xdef\macrolist{\the\toks0
--       \expandafter\noexpand\csname\the\macname\endcsname}%
-+     \addtomacrolist{\the\macname}%
-   \fi
-   \begingroup \macrobodyctxt
-   \ifrecursive \expandafter\parsermacbody
-@@ -5670,7 +6092,7 @@
-     % Remove the macro name from \macrolist:
-     \begingroup
-       \expandafter\let\csname#1\endcsname \relax
--      \let\do\unmacrodo
-+      \let\definedummyword\unmacrodo
-       \xdef\macrolist{\macrolist}%
-     \endgroup
-   \else
-@@ -5682,10 +6104,10 @@
- % macro definitions that have been changed to \relax.
- %
- \def\unmacrodo#1{%
--  \ifx#1\relax
-+  \ifx #1\relax
-     % remove this
-   \else
--    \noexpand\do \noexpand #1%
-+    \noexpand\definedummyword \noexpand#1%
-   \fi
- }
- 
-@@ -5798,30 +6220,11 @@
- % {.  If so it reads up to the closing }, if not, it reads the whole
- % line.  Whatever was read is then fed to the next control sequence
- % as an argument (by \parsebrace or \parsearg)
--\def\braceorline#1{\let\next=#1\futurelet\nchar\braceorlinexxx}
-+\def\braceorline#1{\let\macnamexxx=#1\futurelet\nchar\braceorlinexxx}
- \def\braceorlinexxx{%
-   \ifx\nchar\bgroup\else
-     \expandafter\parsearg
--  \fi \next}
--
--% We want to disable all macros during \shipout so that they are not
--% expanded by \write.
--\def\turnoffmacros{\begingroup \def\do##1{\let\noexpand##1=\relax}%
--  \edef\next{\macrolist}\expandafter\endgroup\next}
--
--% For \indexnofonts, we need to get rid of all macros, leaving only the
--% arguments (if present).  Of course this is not nearly correct, but it
--% is the best we can do for now.  makeinfo does not expand macros in the
--% argument to @deffn, which ends up writing an index entry, and texindex
--% isn't prepared for an index sort entry that starts with \.
--% 
--% Since macro invocations are followed by braces, we can just redefine them
--% to take a single TeX argument.  The case of a macro invocation that
--% goes to end-of-line is not handled.
--% 
--\def\emptyusermacros{\begingroup
--  \def\do##1{\let\noexpand##1=\noexpand\asis}%
--  \edef\next{\macrolist}\expandafter\endgroup\next}
-+  \fi \macnamexxx}
- 
- 
- % @alias.
-@@ -5832,6 +6235,7 @@
- \def\aliasyyy #1=#2\relax{%
-   {%
-     \expandafter\let\obeyedspace=\empty
-+    \addtomacrolist{#1}%
-     \xdef\next{\global\let\makecsname{#1}=\makecsname{#2}}%
-   }%
-   \next
-@@ -5901,8 +6305,6 @@
-   \iflinks
-     {%
-       \atdummies  % preserve commands, but don't expand them
--      \turnoffactive
--      \otherbackslash
-       \edef\writexrdef##1##2{%
- 	\write\auxfile{@xrdef{#1-% #1 of \setref, expanded by the \edef
- 	  ##1}{##2}}% these are parameters of \writexrdef
-@@ -5956,13 +6358,17 @@
-   \ifpdf
-     \leavevmode
-     \getfilename{#4}%
--    {\turnoffactive \otherbackslash
-+    {\turnoffactive
-+     % See comments at \activebackslashdouble.
-+     {\activebackslashdouble \xdef\pdfxrefdest{#1}%
-+      \backslashparens\pdfxrefdest}%
-+     %
-      \ifnum\filenamelength>0
-        \startlink attr{/Border [0 0 0]}%
--         goto file{\the\filename.pdf} name{#1}%
-+         goto file{\the\filename.pdf} name{\pdfxrefdest}%
-      \else
-        \startlink attr{/Border [0 0 0]}%
--         goto name{\pdfmkpgn{#1}}%
-+         goto name{\pdfmkpgn{\pdfxrefdest}}%
-      \fi
-     }%
-     \linkcolor
-@@ -5976,7 +6382,6 @@
-     % include an _ in the xref name, etc.
-     \indexnofonts
-     \turnoffactive
--    \otherbackslash
-     \expandafter\global\expandafter\let\expandafter\Xthisreftitle
-       \csname XR#1-title\endcsname
-   }%
-@@ -5984,7 +6389,7 @@
-     % If the user specified the print name (third arg) to the ref,
-     % print it instead of our usual "Figure 1.2".
-     \ifdim\wd0 = 0pt
--      \refx{#1-snt}%
-+      \refx{#1-snt}{}%
-     \else
-       \printedrefname
-     \fi
-@@ -6011,7 +6416,7 @@
-       % into the usual \leavevmode...\vrule stuff for purposes of
-       % printing. So we \turnoffactive for the \refx-snt, back on for the
-       % printing, back off for the \refx-pg.
--      {\turnoffactive \otherbackslash
-+      {\turnoffactive
-        % Only output a following space if the -snt ref is nonempty; for
-        % @unnumbered and @anchor, it won't be.
-        \setbox2 = \hbox{\ignorespaces \refx{#1-snt}{}}%
-@@ -6024,7 +6429,7 @@
-       ,\space
-       %
-       % output the `page 3'.
--      \turnoffactive \otherbackslash \putwordpage\tie\refx{#1-pg}{}%
-+      \turnoffactive \putwordpage\tie\refx{#1-pg}{}%
-     \fi
-   \fi
-   \endlink
-@@ -6127,13 +6532,13 @@
- \def\tryauxfile{%
-   \openin 1 \jobname.aux
-   \ifeof 1 \else
--    \readauxfile
-+    \readdatafile{aux}%
-     \global\havexrefstrue
-   \fi
-   \closein 1
- }
- 
--\def\readauxfile{\begingroup
-+\def\setupdatafile{%
-   \catcode`\^^@=\other
-   \catcode`\^^A=\other
-   \catcode`\^^B=\other
-@@ -6202,11 +6607,11 @@
-   %
-   % Make the characters 128-255 be printing characters.
-   {%
--    \count 1=128
-+    \count1=128
-     \def\loop{%
--      \catcode\count 1=\other
--      \advance\count 1 by 1
--      \ifnum \count 1<256 \loop \fi
-+      \catcode\count1=\other
-+      \advance\count1 by 1
-+      \ifnum \count1<256 \loop \fi
-     }%
-   }%
-   %
-@@ -6214,10 +6619,13 @@
-   \catcode`\{=1
-   \catcode`\}=2
-   \catcode`\@=0
--  %
--  \input \jobname.aux
--\endgroup}
-+}
- 
-+\def\readdatafile#1{%
-+\begingroup
-+  \setupdatafile
-+  \input\jobname.#1
-+\endgroup}
- 
- \message{insertions,}
- % including footnotes.
-@@ -6411,7 +6819,7 @@
-     % above and below.
-     \nobreak\vskip\parskip
-     \nobreak
--    \line\bgroup\hss
-+    \line\bgroup
-   \fi
-   %
-   % Output the image.
-@@ -6424,7 +6832,7 @@
-     \epsfbox{#1.eps}%
-   \fi
-   %
--  \ifimagevmode \hss \egroup \bigbreak \fi  % space after the image
-+  \ifimagevmode \egroup \bigbreak \fi  % space after the image
- \endgroup}
- 
- 
-@@ -6564,7 +6972,8 @@
-       % \floatlabel-lof.  Besides \floatident, we include the short
-       % caption if specified, else the full caption if specified, else nothing.
-       {%
--        \atdummies \turnoffactive \otherbackslash
-+        \atdummies
-+        %
-         % since we read the caption text in the macro world, where ^^M
-         % is turned into a normal character, we have to scan it back, so
-         % we don't write the literal three characters "^^M" into the aux file.
-@@ -6585,8 +6994,9 @@
-   %
-   % place the captured inserts
-   %
--  % BEWARE: when the floats start float, we have to issue warning whenever an
--  % insert appears inside a float which could possibly float. --kasal, 26may04
-+  % BEWARE: when the floats start floating, we have to issue warning
-+  % whenever an insert appears inside a float which could possibly
-+  % float. --kasal, 26may04
-   %
-   \checkinserts
- }
-@@ -6754,9 +7164,9 @@
-   \fi
- }
- 
--% Parameters in order: 1) textheight; 2) textwidth; 3) voffset;
--% 4) hoffset; 5) binding offset; 6) topskip; 7) physical page height; 8)
--% physical page width.
-+% Parameters in order: 1) textheight; 2) textwidth;
-+% 3) voffset; 4) hoffset; 5) binding offset; 6) topskip;
-+% 7) physical page height; 8) physical page width.
- %
- % We also call \setleading{\textleading}, so the caller should define
- % \textleading.  The caller should also set \parskip.
-@@ -6803,7 +7213,7 @@
-                     {11in}{8.5in}%
- }}
- 
--% Use @smallbook to reset parameters for 7x9.5 (or so) format.
-+% Use @smallbook to reset parameters for 7x9.25 trim size.
- \def\smallbook{{\globaldefs = 1
-   \parskip = 2pt plus 1pt
-   \textleading = 12pt
-@@ -6820,6 +7230,24 @@
-   \defbodyindent = .5cm
- }}
- 
-+% Use @smallerbook to reset parameters for 6x9 trim size.
-+% (Just testing, parameters still in flux.)
-+\def\smallerbook{{\globaldefs = 1
-+  \parskip = 1.5pt plus 1pt
-+  \textleading = 12pt
-+  %
-+  \internalpagesizes{7.4in}{4.8in}%
-+                    {-.2in}{-.4in}%
-+                    {0pt}{14pt}%
-+                    {9in}{6in}%
-+  %
-+  \lispnarrowing = 0.25in
-+  \tolerance = 700
-+  \hfuzz = 1pt
-+  \contentsrightmargin = 0pt
-+  \defbodyindent = .4cm
-+}}
-+
- % Use @afourpaper to print on European A4 paper.
- \def\afourpaper{{\globaldefs = 1
-   \parskip = 3pt plus 2pt minus 1pt
-@@ -6972,6 +7400,7 @@
- 
- \catcode`\_=\active
- \def_{\ifusingtt\normalunderscore\_}
-+\let\realunder=_
- % Subroutine for the previous macro.
- \def\_{\leavevmode \kern.07em \vbox{\hrule width.3em height.1ex}\kern .07em }
- 
-@@ -6994,6 +7423,13 @@
- % \otherifyactive is called near the end of this file.
- \def\otherifyactive{\catcode`+=\other \catcode`\_=\other}
- 
-+% Used sometimes to turn off (effectively) the active characters even after
-+% parsing them.
-+\def\turnoffactive{%
-+  \normalturnoffactive
-+  \otherbackslash
-+}
-+
- \catcode`\@=0
- 
- % \backslashcurfont outputs one backslash character in current font,
-@@ -7001,27 +7437,29 @@
- \global\chardef\backslashcurfont=`\\
- \global\let\rawbackslashxx=\backslashcurfont  % let existing .??s files work
- 
-+% \realbackslash is an actual character `\' with catcode other, and
-+% \doublebackslash is two of them (for the pdf outlines).
-+{\catcode`\\=\other @gdef@realbackslash{\} @gdef@doublebackslash{\\}}
-+
-+% In texinfo, backslash is an active character; it prints the backslash
-+% in fixed width font.
-+\catcode`\\=\active
-+@def@normalbackslash{{@tt@backslashcurfont}}
-+% On startup, @fixbackslash assigns:
-+%  @let \ = @normalbackslash
-+
- % \rawbackslash defines an active \ to do \backslashcurfont.
- % \otherbackslash defines an active \ to be a literal `\' character with
- % catcode other.
--{\catcode`\\=\active
-- @gdef@rawbackslash{@let\=@backslashcurfont}
-- @gdef@otherbackslash{@let\=@realbackslash}
--}
--
--% \realbackslash is an actual character `\' with catcode other.
--{\catcode`\\=\other @gdef@realbackslash{\}}
-+@gdef@rawbackslash{@let\=@backslashcurfont}
-+@gdef@otherbackslash{@let\=@realbackslash}
- 
--% \normalbackslash outputs one backslash in fixed width font.
--\def\normalbackslash{{\tt\backslashcurfont}}
--
--\catcode`\\=\active
--
--% Used sometimes to turn off (effectively) the active characters
--% even after parsing them.
--@def@turnoffactive{%
-+% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
-+% the literal character `\'.
-+% 
-+@def@normalturnoffactive{%
-+  @let\=@normalbackslash
-   @let"=@normaldoublequote
--  @let\=@realbackslash
-   @let~=@normaltilde
-   @let^=@normalcaret
-   @let_=@normalunderscore
-@@ -7033,12 +7471,6 @@
-   @unsepspaces
- }
- 
--% Same as @turnoffactive except outputs \ as {\tt\char`\\} instead of
--% the literal character `\'.  (Thus, \ is not expandable when this is in
--% effect.)
--%
--@def@normalturnoffactive{@turnoffactive @let\=@normalbackslash}
--
- % Make _ and + \other characters, temporarily.
- % This is canceled by @fixbackslash.
- @otherifyactive
-@@ -7051,9 +7483,9 @@
- @global@let\ = @eatinput
- 
- % On the other hand, perhaps the file did not have a `\input texinfo'. Then
--% the first `\{ in the file would cause an error. This macro tries to fix
-+% the first `\' in the file would cause an error. This macro tries to fix
- % that, assuming it is called before the first `\' could plausibly occur.
--% Also back turn on active characters that might appear in the input
-+% Also turn back on active characters that might appear in the input
- % file name, in case not using a pre-dumped format.
- %
- @gdef@fixbackslash{%
Index: tches/glibc-2.7-i586_chk-2.patch
===================================================================
--- patches/glibc-2.7-i586_chk-2.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,24 +1,0 @@
-Submitted By: Joe Ciccone <jciccone@gmail.com>
-Date: 2008-01-22
-Initial Package Version: 2.7
-Upstream Status: Unknown
-Origin: http://bugs.gentoo.org/show_bug.cgi?id=199479
-Description: Defines memcpy_chk, mempcpy_chk, and memset_chk on i586.
-
-Change made to put the files in sysdeps, mistake caught my Gernot Miksch.
-
-diff -Naur glibc-2.7.orig/sysdeps/i386/i586/memcpy_chk.S glibc-2.7/sysdeps/i386/i586/memcpy_chk.S
---- glibc-2.7.orig/sysdeps/i386/i586/memcpy_chk.S	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.7/sysdeps/i386/i586/memcpy_chk.S	2008-05-18 12:21:49.000000000 +0200
-@@ -0,0 +1 @@
-+#include <sysdeps/i386/i686/memcpy_chk.S>
-diff -Naur glibc-2.7.orig/sysdeps/i386/i586/mempcpy_chk.S glibc-2.7/sysdeps/i386/i586/mempcpy_chk.S
---- glibc-2.7.orig/sysdeps/i386/i586/mempcpy_chk.S	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.7/sysdeps/i386/i586/mempcpy_chk.S	2008-05-18 12:21:49.000000000 +0200
-@@ -0,0 +1 @@
-+#include <sysdeps/i386/i686/mempcpy_chk.S>
-diff -Naur glibc-2.7.orig/sysdeps/i386/i586/memset_chk.S glibc-2.7/sysdeps/i386/i586/memset_chk.S
---- glibc-2.7.orig/sysdeps/i386/i586/memset_chk.S	1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.7/sysdeps/i386/i586/memset_chk.S	2008-05-18 12:21:49.000000000 +0200
-@@ -0,0 +1 @@
-+#include <sysdeps/i386/i686/memset_chk.S>
Index: tches/glibc-2.7-libgcc_eh-1.patch
===================================================================
--- patches/glibc-2.7-libgcc_eh-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,136 +1,0 @@
-Submitted By: Joe Ciccone <jciccone@linuxfromscratch.org>
-Date: 2006-11-09
-Initial Package Version: 2.5
-Origin: Joe Ciccone
-Upstream Status: Unknown
-Description: Checks to see if libgcc_eh has been provided by gcc. If it has
-             the glibc will attempt to link to it.
-
-	     Rediffed for 2.7 by Jim Gifford
-
-diff -Naur glibc-2.7.orig/Makeconfig glibc-2.7/Makeconfig
---- glibc-2.7.orig/Makeconfig	2007-07-05 15:03:47.000000000 -0700
-+++ glibc-2.7/Makeconfig	2007-10-20 15:23:21.000000000 -0700
-@@ -524,12 +524,20 @@
-   libunwind = -lunwind
- endif
- ifneq ($(have-as-needed),yes)
-+ifneq ($(have-cc-with-libgcc_eh),yes)
-+ libgcc_eh := $(libunwind)
-+else
-  libgcc_eh := -lgcc_eh $(libunwind)
-+endif
- else
-  libgcc_eh := -Wl,--as-needed -lgcc_s$(libgcc_s_suffix) $(libunwind) -Wl,--no-as-needed
- endif
- gnulib := -lgcc $(libgcc_eh)
--static-gnulib := -lgcc -lgcc_eh $(libunwind)
-+ifneq ($(have-cc-with-libgcc_eh),yes)
-+ static-gnulib := -lgcc $(libunwind)
-+else
-+ static-gnulib := -lgcc -lgcc_eh $(libunwind)
-+endif
- libc.so-gnulib := -lgcc
- endif
- ifeq ($(elf),yes)
-diff -Naur glibc-2.7.orig/config.make.in glibc-2.7/config.make.in
---- glibc-2.7.orig/config.make.in	2007-08-25 15:25:24.000000000 -0700
-+++ glibc-2.7/config.make.in	2007-10-20 15:23:21.000000000 -0700
-@@ -60,6 +60,7 @@
- have-libaudit = @have_libaudit@
- have-libcap = @have_libcap@
- have-cc-with-libunwind = @libc_cv_cc_with_libunwind@
-+have-cc-with-libgcc_eh = @libc_cv_cc_with_libgcc_eh@
- fno-unit-at-a-time = @fno_unit_at_a_time@
- bind-now = @bindnow@
- have-hash-style = @libc_cv_hashstyle@
-diff -Naur glibc-2.7.orig/configure glibc-2.7/configure
---- glibc-2.7.orig/configure	2007-10-18 04:22:23.000000000 -0700
-+++ glibc-2.7/configure	2007-10-20 21:26:18.000000000 -0700
-@@ -716,6 +716,7 @@
- BISON
- VERSIONING
- libc_cv_cc_with_libunwind
-+libc_cv_cc_with_libgcc_eh
- libc_cv_Bgroup
- libc_cv_libgcc_s_suffix
- libc_cv_as_needed
-@@ -6045,6 +6046,33 @@
- 
-   fi
- 
-+  { echo "$as_me:$LINENO: checking whether to link against libgcc_eh" >&5
-+echo $ECHO_N "checking whether to link against libgcc_eh... $ECHO_C" >&6; }
-+if test "${libc_cv_cc_with_libgcc_eh+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+    cat > conftest.c <<EOF
-+int main (void) { return 0; }
-+EOF
-+    if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \
-+       conftest.c -v 2>&1 >/dev/null | grep -q " -lgcc_eh "; then
-+      libc_cv_cc_with_libgcc_eh=yes
-+    else
-+      libc_cv_cc_with_libgcc_eh=no
-+    fi
-+    rm -f conftest*
-+fi
-+{ echo "$as_me:$LINENO: result: $libc_cv_cc_with_libgcc_eh" >&5
-+echo "${ECHO_T}$libc_cv_cc_with_libgcc_eh" >&6; }
-+
-+  if test $libc_cv_cc_with_libgcc_eh = yes; then
-+    cat >>confdefs.h <<\_ACEOF
-+#define HAVE_CC_WITH_LIBGCC_EH 1
-+_ACEOF
-+
-+  fi
-+
-   { echo "$as_me:$LINENO: checking for -z nodelete option" >&5
- echo $ECHO_N "checking for -z nodelete option... $ECHO_C" >&6; }
- if test "${libc_cv_z_nodelete+set}" = set; then
-@@ -9243,6 +9271,7 @@
- BISON!$BISON$ac_delim
- VERSIONING!$VERSIONING$ac_delim
- libc_cv_cc_with_libunwind!$libc_cv_cc_with_libunwind$ac_delim
-+libc_cv_cc_with_libgcc_eh!$libc_cv_cc_with_libgcc_eh$ac_delim
- libc_cv_Bgroup!$libc_cv_Bgroup$ac_delim
- libc_cv_libgcc_s_suffix!$libc_cv_libgcc_s_suffix$ac_delim
- libc_cv_as_needed!$libc_cv_as_needed$ac_delim
-@@ -9294,7 +9323,7 @@
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 52; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 53; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-diff -Naur glibc-2.7.orig/configure.in glibc-2.7/configure.in
---- glibc-2.7.orig/configure.in	2007-06-07 20:16:36.000000000 -0700
-+++ glibc-2.7/configure.in	2007-10-20 15:23:21.000000000 -0700
-@@ -1388,6 +1388,23 @@
-     AC_DEFINE(HAVE_CC_WITH_LIBUNWIND)
-   fi
- 
-+  AC_CACHE_CHECK(whether to link against libgcc_eh,
-+                 libc_cv_cc_with_libgcc_eh, [
-+    cat > conftest.c <<EOF
-+int main (void) { return 0; }
-+EOF
-+    if ${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -static -o conftest \
-+       conftest.c -v 2>&1 >/dev/null | grep -q " -lgcc_eh "; then
-+      libc_cv_cc_with_libgcc_eh=yes
-+    else
-+      libc_cv_cc_with_libgcc_eh=no
-+    fi
-+    rm -f conftest*])
-+  AC_SUBST(libc_cv_cc_with_libgcc_eh)
-+  if test $libc_cv_cc_with_libgcc_eh = yes; then
-+    AC_DEFINE(HAVE_CC_WITH_LIBGCC_EH)
-+  fi
-+
-   AC_CACHE_CHECK(for -z nodelete option,
- 		 libc_cv_z_nodelete, [dnl
-   cat > conftest.c <<EOF
-
Index: tches/glibc-2.7-localedef_segfault-1.patch
===================================================================
--- patches/glibc-2.7-localedef_segfault-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,56 +1,0 @@
-Submitted By: Jim Gifford (patches at jg555 dot com)
-Date: 2007-05-19
-Initial Package Version: 2.6
-Origin: Debian
-Upstream Status: Unknown
-Description: Fixes Segfault when using localdef.
-             This problem is only noticed when using PaX
-             and some architectures besides x86.
-	     See debian bug # 231438
-
-diff -Naur glibc-2.6.orig/locale/programs/3level.h glibc-2.6/locale/programs/3level.h
---- glibc-2.6.orig/locale/programs/3level.h	2005-12-06 21:47:27.000000000 -0800
-+++ glibc-2.6/locale/programs/3level.h	2007-05-19 13:38:01.000000000 -0700
-@@ -202,6 +202,42 @@
- 	}
-     }
- }
-+
-+/* GCC ATM seems to do a poor job with pointers to nested functions passed
-+   to inlined functions.  Help it a little bit with this hack.  */
-+#define wchead_table_iterate(tp, fn) \
-+do									      \
-+  {									      \
-+    struct wchead_table *t = (tp);					      \
-+    uint32_t index1;							      \
-+    for (index1 = 0; index1 < t->level1_size; index1++)			      \
-+      {									      \
-+	uint32_t lookup1 = t->level1[index1];				      \
-+	if (lookup1 != ((uint32_t) ~0))					      \
-+	  {								      \
-+	    uint32_t lookup1_shifted = lookup1 << t->q;			      \
-+	    uint32_t index2;						      \
-+	    for (index2 = 0; index2 < (1 << t->q); index2++)		      \
-+	      {								      \
-+		uint32_t lookup2 = t->level2[index2 + lookup1_shifted];	      \
-+		if (lookup2 != ((uint32_t) ~0))				      \
-+		  {							      \
-+		    uint32_t lookup2_shifted = lookup2 << t->p;		      \
-+		    uint32_t index3;					      \
-+		    for (index3 = 0; index3 < (1 << t->p); index3++)	      \
-+		      {							      \
-+			struct element_t *lookup3			      \
-+			  = t->level3[index3 + lookup2_shifted];	      \
-+			if (lookup3 != NULL)				      \
-+			  fn ((((index1 << t->q) + index2) << t->p) + index3, \
-+			      lookup3);					      \
-+		      }							      \
-+		  }							      \
-+	      }								      \
-+	  }								      \
-+      }									      \
-+  } while (0)
-+
- #endif
- 
- #ifndef NO_FINALIZE
Index: tches/glibc-2.7-mawk_fix-1.patch
===================================================================
--- patches/glibc-2.7-mawk_fix-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,39 +1,0 @@
-Submitted By: Mark Vels <mark.vels@fundem.net>
-Date: 2007-07-20
-Initial Package Version: 2.6
-Origin: original patch glibc-2.6-mawk_fix-1.patch by Jim Gifford <jim@linuxfromscratch.org>
-Upstream Status: Not submitted
-Description: Fixes build if host distro is using mawk.
-	     Distro's known to have this issue are Debian 
-	     and Ubuntu
-
-	     Changes wrt version 1: added two more cases.
-
-diff -Naur glibc-2.6.orig/scripts/gen-sorted.awk glibc-2.6/scripts/gen-sorted.awk
---- glibc-2.6.orig/scripts/gen-sorted.awk	2006-02-28 07:05:57.000000000 +0000
-+++ glibc-2.6/scripts/gen-sorted.awk	2007-07-20 21:03:50.000000000 +0000
-@@ -16,7 +16,7 @@
- {
-   subdir = type = FILENAME;
-   sub(/^.*\//, "", type);
--  sub(/\/[^/]+$/, "", subdir);
-+  sub(/\/[^\/]+$/, "", subdir);
-   sub(/^.*\//, "", subdir);
-   thisdir = "";
- }
-@@ -56,13 +56,13 @@
-     # The Subdirs file comes from an add-on that should have the subdirectory.
-     dir = FILENAME;
-     do
--      sub(/\/[^/]+$/, "", dir);
-+      sub(/\/[^\/]+$/, "", dir);
-     while (dir !~ /\/sysdeps$/);
-     sub(/\/sysdeps$/, "", dir);
-     if (system("test -d " dir "/" thisdir) == 0)
-       dir = dir "/" thisdir;
-     else {
--      sub(/\/[^/]+$/, "", dir);
-+      sub(/\/[^\/]+$/, "", dir);
-       if (system("test -d " dir "/" thisdir) == 0)
-         dir = dir "/" thisdir;
-       else {
Index: patches/glibc-arm-ctl_bus_isa.patch
===================================================================
--- patches/glibc-arm-ctl_bus_isa.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/glibc-arm-ctl_bus_isa.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,55 @@
+Submitted By: Ryan Oliver <ryan.oliver@pha.com.au>
+Source: Dan Kegel's crosstool ( http://kegel.com/crosstool )
+Initial Package Version: See Below
+
+Applies to both glibc-2.2.5 and glibc-2.3.2, and probably glibc cvs as of Aug 2004.
+Needed to build glibc with linux kernels 2.4.23 or higher on ARM, 
+Fixes following error:
+
+../sysdeps/unix/sysv/linux/arm/ioperm.c: In function `init_iosys':
+../sysdeps/unix/sysv/linux/arm/ioperm.c:103: error: `BUS_ISA' undeclared (first use in this function)
+../sysdeps/unix/sysv/linux/arm/ioperm.c:103: error: (Each undeclared identifier is reported only once
+../sysdeps/unix/sysv/linux/arm/ioperm.c:103: error: for each function it appears in.)
+../sysdeps/unix/sysv/linux/arm/ioperm.c:103: error: initializer element is not constant
+../sysdeps/unix/sysv/linux/arm/ioperm.c:103: error: (near initialization for `iobase_name[1]')
+../sysdeps/unix/sysv/linux/arm/ioperm.c:104: error: initializer element is not constant
+../sysdeps/unix/sysv/linux/arm/ioperm.c:104: error: (near initialization for `ioshift_name[1]')
+make[2]: *** [/home/dank/crosstool-0.28/build/arm-softfloat-linux-gnu/gcc-3.3.4-glibc-2.2.5/build-glibc/misc/ioperm.o] Error 1
+
+cf. "[SYSCTL] BUS_ISA -> CTL_BUS_ISA",  http://www.ussg.iu.edu/hypermail/linux/kernel/0311.0/0529.html
+
+--- glibc-2.3.2/sysdeps/unix/sysv/linux/arm/ioperm.c.old	2003-02-20 14:22:24.000000000 -0800
++++ glibc-2.3.2/sysdeps/unix/sysv/linux/arm/ioperm.c	2004-01-31 16:01:50.000000000 -0800
+@@ -47,6 +47,12 @@
+ #include <asm/page.h>
+ #include <sys/sysctl.h>
+ 
++/* see http://www.ussg.iu.edu/hypermail/linux/kernel/0311.0/0529.html */
++#include <linux/version.h>
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,23))
++#define CTL_BUS_ISA BUS_ISA	/* and hope it's not the one from linux/input.h */
++#endif
++
+ #define PATH_ARM_SYSTYPE	"/etc/arm_systype"
+ #define PATH_CPUINFO		"/proc/cpuinfo"
+ 
+@@ -80,7 +86,7 @@
+  * Initialize I/O system.  There are several ways to get the information
+  * we need.  Each is tried in turn until one succeeds.
+  *
+- * 1. Sysctl (CTL_BUS, BUS_ISA, ISA_*).  This is the preferred method
++ * 1. Sysctl (CTL_BUS, CTL_BUS_ISA, ISA_*).  This is the preferred method
+  *    but not all kernels support it.
+  *
+  * 2. Read the value (not the contents) of symlink PATH_ARM_SYSTYPE.
+@@ -100,8 +106,8 @@
+ {
+   char systype[256];
+   int i, n;
+-  static int iobase_name[] = { CTL_BUS, BUS_ISA, BUS_ISA_PORT_BASE };
+-  static int ioshift_name[] = { CTL_BUS, BUS_ISA, BUS_ISA_PORT_SHIFT };
++  static int iobase_name[] = { CTL_BUS, CTL_BUS_ISA, BUS_ISA_PORT_BASE };
++  static int ioshift_name[] = { CTL_BUS, CTL_BUS_ISA, BUS_ISA_PORT_SHIFT };
+   size_t len = sizeof(io.base);
+ 
+   if (! sysctl (iobase_name, 3, &io.io_base, &len, NULL, 0)
Index: patches/glibc-vfp.patch
===================================================================
--- patches/glibc-vfp.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/glibc-vfp.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,167 @@
+# Source: http://sources.redhat.com/ml/crossgcc/2004-02/msg00104.html
+#
+# From: Dan Kegel <dank at kegel dot com>
+# To: Nicolas Pitre <nico at cam dot org>
+# Cc: add <addsub at eyou dot com>, Richard dot Earnshaw at arm dot com,
+#     rearnsha at arm dot com, crossgcc at sources dot redhat dot com,
+#     linux-arm at lists dot arm dot linux dot org dot uk
+# Date: Mon, 16 Feb 2004 22:49:35 -0800
+# Subject: Re: problem while building arm vfp softfloat gcc
+#
+# Attached is a patch from addsub@eyou.com that he says patches glibc and
+# makes printf("%f", 1.0) work again.   I haven't tested it, just wanted
+# to give Nico a chance to have a look at it.  Not sure if addsub wrote
+# this himself or whether it's suitable for glibc mainline (I've asked him).
+# - Dan
+
+diff -uNrp glibc.old/sysdeps/arm/bits/endian.h glibc.new/sysdeps/arm/bits/endian.h
+--- glibc.old/sysdeps/arm/bits/endian.h	1999-04-12 11:59:13.000000000 -0400
++++ glibc.new/sysdeps/arm/bits/endian.h	2004-02-12 09:15:13.000000000 -0500
+@@ -9,4 +9,9 @@
+ #else
+ #define __BYTE_ORDER __LITTLE_ENDIAN
+ #endif
++
++#ifdef __VFP_FP__
++#define __FLOAT_WORD_ORDER __BYTE_ORDER
++#else
+ #define __FLOAT_WORD_ORDER __BIG_ENDIAN
++#endif
+diff -uNrp glibc.old/sysdeps/arm/gmp-mparam.h glibc.new/sysdeps/arm/gmp-mparam.h
+--- glibc.old/sysdeps/arm/gmp-mparam.h	2001-07-07 15:21:19.000000000 -0400
++++ glibc.new/sysdeps/arm/gmp-mparam.h	2004-02-12 09:15:13.000000000 -0500
+@@ -26,5 +26,13 @@ MA 02111-1307, USA. */
+ #define BITS_PER_SHORTINT 16
+ #define BITS_PER_CHAR 8
+ 
+-#define IEEE_DOUBLE_BIG_ENDIAN 0
+-#define IEEE_DOUBLE_MIXED_ENDIAN 1
++#if defined(__ARMEB__)
++# define IEEE_DOUBLE_MIXED_ENDIAN 0
++# define IEEE_DOUBLE_BIG_ENDIAN 1
++#elif defined(__VFP_FP__)
++# define IEEE_DOUBLE_MIXED_ENDIAN 0
++# define IEEE_DOUBLE_BIG_ENDIAN 0
++#else
++# define IEEE_DOUBLE_BIG_ENDIAN 0
++# define IEEE_DOUBLE_MIXED_ENDIAN 1
++#endif
+diff -uNrp glibc.old/sysdeps/arm/ieee754.h glibc.new/sysdeps/arm/ieee754.h
+--- glibc.old/sysdeps/arm/ieee754.h	2001-07-07 15:21:19.000000000 -0400
++++ glibc.new/sysdeps/arm/ieee754.h	1969-12-31 19:00:00.000000000 -0500
+@@ -1,115 +0,0 @@
+-/* Copyright (C) 1992, 1995, 1996, 1998 Free Software Foundation, Inc.
+-   This file is part of the GNU C Library.
+-
+-   The GNU C Library is free software; you can redistribute it and/or
+-   modify it under the terms of the GNU Lesser General Public
+-   License as published by the Free Software Foundation; either
+-   version 2.1 of the License, or (at your option) any later version.
+-
+-   The GNU C Library is distributed in the hope that it will be useful,
+-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-   Lesser General Public License for more details.
+-
+-   You should have received a copy of the GNU Lesser General Public
+-   License along with the GNU C Library; if not, write to the Free
+-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+-   02111-1307 USA.  */
+-
+-#ifndef _IEEE754_H
+-
+-#define _IEEE754_H 1
+-#include <features.h>
+-
+-#include <endian.h>
+-
+-__BEGIN_DECLS
+-
+-union ieee754_float
+-  {
+-    float f;
+-
+-    /* This is the IEEE 754 single-precision format.  */
+-    struct
+-      {
+-	unsigned int mantissa:23;
+-	unsigned int exponent:8;
+-	unsigned int negative:1;
+-      } ieee;
+-
+-    /* This format makes it easier to see if a NaN is a signalling NaN.  */
+-    struct
+-      {
+-	unsigned int mantissa:22;
+-	unsigned int quiet_nan:1;
+-	unsigned int exponent:8;
+-	unsigned int negative:1;
+-      } ieee_nan;
+-  };
+-
+-#define IEEE754_FLOAT_BIAS	0x7f /* Added to exponent.  */
+-
+-
+-union ieee754_double
+-  {
+-    double d;
+-
+-    /* This is the IEEE 754 double-precision format.  */
+-    struct
+-      {
+-	unsigned int mantissa0:20;
+-	unsigned int exponent:11;
+-	unsigned int negative:1;
+-	unsigned int mantissa1:32;
+-      } ieee;
+-
+-    /* This format makes it easier to see if a NaN is a signalling NaN.  */
+-    struct
+-      {
+-	unsigned int mantissa0:19;
+-	unsigned int quiet_nan:1;
+-	unsigned int exponent:11;
+-	unsigned int negative:1;
+-	unsigned int mantissa1:32;
+-      } ieee_nan;
+-  };
+-
+-#define IEEE754_DOUBLE_BIAS	0x3ff /* Added to exponent.  */
+-
+-
+-/* The following two structures are correct for `new' floating point systems but
+-   wrong for the old FPPC.  The only solution seems to be to avoid their use on
+-   old hardware.  */
+-
+-union ieee854_long_double
+-  {
+-    long double d;
+-
+-    /* This is the IEEE 854 double-extended-precision format.  */
+-    struct
+-      {
+-	unsigned int exponent:15;
+-	unsigned int empty:16;
+-	unsigned int negative:1;
+-	unsigned int mantissa1:32;
+-	unsigned int mantissa0:32;
+-      } ieee;
+-
+-    /* This is for NaNs in the IEEE 854 double-extended-precision format.  */
+-    struct
+-      {
+-	unsigned int exponent:15;
+-	unsigned int empty:16;
+-	unsigned int negative:1;
+-	unsigned int mantissa1:32;
+-	unsigned int mantissa0:30;
+-	unsigned int quiet_nan:1;
+-	unsigned int one:1;
+-      } ieee_nan;
+-  };
+-
+-#define IEEE854_LONG_DOUBLE_BIAS 0x3fff
+-
+-__END_DECLS
+-
+-#endif /* ieee754.h */
Index: tches/grub-0.97-256byte_inode-1.patch
===================================================================
--- patches/grub-0.97-256byte_inode-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,102 +1,0 @@
-Submitted By: Jeremy Huntwork (jhuntwork at linuxfromscratch dot org)
-Date: 2008-04-03
-Initial Package Version: 0.97
-Upstream Status: Not sent. Development on 'GRUB legacy' abandoned for 'GRUB2'.
-Origin: http://bugs.debian.org/463123
-Description: Fixes GRUB to recognize ext2 filesystems created with 256-byte
-inodes.
-
-diff -Nrup a/stage2/fsys_ext2fs.c b/stage2/fsys_ext2fs.c
---- a/stage2/fsys_ext2fs.c	2004-08-08 20:19:18.000000000 +0200
-+++ b/stage2/fsys_ext2fs.c	2008-01-30 14:27:20.000000000 +0100
-@@ -79,7 +79,52 @@ struct ext2_super_block
-     __u32 s_rev_level;		/* Revision level */
-     __u16 s_def_resuid;		/* Default uid for reserved blocks */
-     __u16 s_def_resgid;		/* Default gid for reserved blocks */
--    __u32 s_reserved[235];	/* Padding to the end of the block */
-+    /*
-+     * These fields are for EXT2_DYNAMIC_REV superblocks only.
-+     *
-+     * Note: the difference between the compatible feature set and
-+     * the incompatible feature set is that if there is a bit set
-+     * in the incompatible feature set that the kernel doesn't
-+     * know about, it should refuse to mount the filesystem.
-+     *
-+     * e2fsck's requirements are more strict; if it doesn't know
-+     * about a feature in either the compatible or incompatible
-+     * feature set, it must abort and not try to meddle with
-+     * things it doesn't understand...
-+     */
-+    __u32 s_first_ino;		/* First non-reserved inode */
-+    __u16 s_inode_size;		/* size of inode structure */
-+    __u16 s_block_group_nr;	/* block group # of this superblock */
-+    __u32 s_feature_compat;	/* compatible feature set */
-+    __u32 s_feature_incompat;	/* incompatible feature set */
-+    __u32 s_feature_ro_compat;	/* readonly-compatible feature set */
-+    __u8  s_uuid[16];		/* 128-bit uuid for volume */
-+    char  s_volume_name[16];	/* volume name */
-+    char  s_last_mounted[64];	/* directory where last mounted */
-+    __u32 s_algorithm_usage_bitmap; /* For compression */
-+    /*
-+     * Performance hints.  Directory preallocation should only
-+     * happen if the EXT2_FEATURE_COMPAT_DIR_PREALLOC flag is on.
-+     */
-+    __u8  s_prealloc_blocks;	/* Nr of blocks to try to preallocate*/
-+    __u8  s_prealloc_dir_blocks;	/* Nr to preallocate for dirs */
-+    __u16 s_reserved_gdt_blocks;/* Per group table for online growth */
-+    /*
-+     * Journaling support valid if EXT2_FEATURE_COMPAT_HAS_JOURNAL set.
-+     */
-+    __u8 s_journal_uuid[16];	/* uuid of journal superblock */
-+    __u32 s_journal_inum;	/* inode number of journal file */
-+    __u32 s_journal_dev;	/* device number of journal file */
-+    __u32 s_last_orphan;	/* start of list of inodes to delete */
-+    __u32 s_hash_seed[4];	/* HTREE hash seed */
-+    __u8  s_def_hash_version;	/* Default hash version to use */
-+    __u8  s_jnl_backup_type; 	/* Default type of journal backup */
-+    __u16 s_reserved_word_pad;
-+    __u32 s_default_mount_opts;
-+    __u32 s_first_meta_bg;	/* First metablock group */
-+    __u32 s_mkfs_time;		/* When the filesystem was created */
-+    __u32 s_jnl_blocks[17]; 	/* Backup of the journal inode */
-+    __u32 s_reserved[172];	/* Padding to the end of the block */
-   };
- 
- struct ext2_group_desc
-@@ -218,6 +263,9 @@ struct ext2_dir_entry
- #define EXT2_ADDR_PER_BLOCK(s)          (EXT2_BLOCK_SIZE(s) / sizeof (__u32))
- #define EXT2_ADDR_PER_BLOCK_BITS(s)		(log2(EXT2_ADDR_PER_BLOCK(s)))
- 
-+#define EXT2_INODE_SIZE(s)		(SUPERBLOCK->s_inode_size)
-+#define EXT2_INODES_PER_BLOCK(s)	(EXT2_BLOCK_SIZE(s)/EXT2_INODE_SIZE(s))
-+
- /* linux/ext2_fs.h */
- #define EXT2_BLOCK_SIZE_BITS(s)        ((s)->s_log_block_size + 10)
- /* kind of from ext2/super.c */
-@@ -553,7 +601,7 @@ ext2fs_dir (char *dirname)
-       gdp = GROUP_DESC;
-       ino_blk = gdp[desc].bg_inode_table +
- 	(((current_ino - 1) % (SUPERBLOCK->s_inodes_per_group))
--	 >> log2 (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode)));
-+	 >> log2 (EXT2_INODES_PER_BLOCK (SUPERBLOCK)));
- #ifdef E2DEBUG
-       printf ("inode table fsblock=%d\n", ino_blk);
- #endif /* E2DEBUG */
-@@ -565,13 +613,12 @@ ext2fs_dir (char *dirname)
-       /* reset indirect blocks! */
-       mapblock2 = mapblock1 = -1;
- 
--      raw_inode = INODE +
--	((current_ino - 1)
--	 & (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode) - 1));
-+      raw_inode = (struct ext2_inode *)((char *)INODE +
-+	((current_ino - 1) & (EXT2_INODES_PER_BLOCK (SUPERBLOCK) - 1)) *
-+	EXT2_INODE_SIZE (SUPERBLOCK));
- #ifdef E2DEBUG
-       printf ("ipb=%d, sizeof(inode)=%d\n",
--	      (EXT2_BLOCK_SIZE (SUPERBLOCK) / sizeof (struct ext2_inode)),
--	      sizeof (struct ext2_inode));
-+	      EXT2_INODES_PER_BLOCK (SUPERBLOCK), EXT2_INODE_SIZE (SUPERBLOCK));
-       printf ("inode=%x, raw_inode=%x\n", INODE, raw_inode);
-       printf ("offset into inode table block=%d\n", (int) raw_inode - (int) INODE);
-       for (i = (unsigned char *) INODE; i <= (unsigned char *) raw_inode;
Index: tches/grub-0.97-fixes-1.patch
===================================================================
--- patches/grub-0.97-fixes-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,4500 +1,0 @@
-Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
-Date: 2006-07-04
-Initial Package Version: 0.97
-Origin: Debian
-Upstream Status: Unknown
-Description: Contains various fixes and enhancements
-	Graphics mode support
-	Fixes for Raid Support
-	XFS Filesystem Boot Freeze Fixes
-	Removed 2GB Memory Limitation
-	Freebsd support
-	Fixes for initrd support
-	Grub installation Fixes
-	Linux 2.6 geometry Fixes
-	Intel Mac Support
-	Autoconf and aclocal updates
-
-diff -Naur grub-0.97.orig/aclocal.m4 grub-0.97/aclocal.m4
---- grub-0.97.orig/aclocal.m4	2005-05-07 19:41:18.000000000 -0700
-+++ grub-0.97/aclocal.m4	2006-07-04 00:08:22.000000000 -0700
-@@ -1,7 +1,7 @@
--# generated automatically by aclocal 1.9.4 -*- Autoconf -*-
-+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
- 
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
--# Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005  Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -11,23 +11,11 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
--#                                                        -*- Autoconf -*-
--# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
--# Generated from amversion.in; do not edit by hand.
--
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# Copyright (C) 2002, 2003, 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.
- 
- # AM_AUTOMAKE_VERSION(VERSION)
- # ----------------------------
-@@ -40,26 +28,15 @@
- # Call AM_AUTOMAKE_VERSION so it can be traced.
- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--	 [AM_AUTOMAKE_VERSION([1.9.4])])
--
--# AM_AUX_DIR_EXPAND
--
--# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-+	 [AM_AUTOMAKE_VERSION([1.9.6])])
- 
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
- 
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2001, 2003, 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.
- 
- # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
- # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-@@ -106,26 +83,16 @@
- am_aux_dir=`cd $ac_aux_dir && pwd`
- ])
- 
--# AM_CONDITIONAL                                              -*- Autoconf -*-
-+# AM_CONDITIONAL                                            -*- Autoconf -*-
- 
--# Copyright (C) 1997, 2000, 2001, 2003, 2004 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
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1997, 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 6
-+# serial 7
- 
- # AM_CONDITIONAL(NAME, SHELL-CONDITION)
- # -------------------------------------
-@@ -149,26 +116,15 @@
- Usually this means the macro was only invoked conditionally.]])
- fi])])
- 
--# serial 7						-*- Autoconf -*-
- 
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
- # Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
-+# serial 8
- 
- # 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,
-@@ -177,7 +133,6 @@
- # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
- 
- 
--
- # _AM_DEPENDENCIES(NAME)
- # ----------------------
- # See how the compiler implements dependency checking.
-@@ -317,27 +272,16 @@
- AC_SUBST([AMDEPBACKSLASH])
- ])
- 
--# Generate code to set up dependency tracking.   -*- Autoconf -*-
--
--# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
--#   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
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# Generate code to set up dependency tracking.              -*- Autoconf -*-
- 
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--#serial 2
-+#serial 3
- 
- # _AM_OUTPUT_DEPENDENCY_COMMANDS
- # ------------------------------
-@@ -396,30 +340,19 @@
-      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
- ])
- 
--# Do all the work for Automake.                            -*- Autoconf -*-
-+# Do all the work for Automake.                             -*- Autoconf -*-
- 
--# This macro actually does too much some checks are only needed if
--# your package does certain things.  But this isn't really a big deal.
--
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
- # Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# serial 12
- 
--# serial 11
-+# This macro actually does too much.  Some checks are only needed if
-+# your package does certain things.  But this isn't really a big deal.
- 
- # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
- # AM_INIT_AUTOMAKE([OPTIONS])
-@@ -521,51 +454,27 @@
- done
- echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
- 
-+# Copyright (C) 2001, 2003, 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.
-+
- # AM_PROG_INSTALL_SH
- # ------------------
- # Define $install_sh.
--
--# Copyright (C) 2001, 2003 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
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
- AC_DEFUN([AM_PROG_INSTALL_SH],
- [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
- install_sh=${install_sh-"$am_aux_dir/install-sh"}
- AC_SUBST(install_sh)])
- 
--#                                                          -*- Autoconf -*-
--# Copyright (C) 2003  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
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2003, 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 1
-+# serial 2
- 
- # Check whether the underlying file-system supports filenames
- # with a leading dot.  For instance MS-DOS doesn't.
-@@ -580,28 +489,17 @@
- rmdir .tst 2>/dev/null
- AC_SUBST([am__leading_dot])])
- 
--# Add --enable-maintainer-mode option to configure.
-+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
- # From Jim Meyering
- 
--# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004
-+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
- # Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
--# serial 3
-+# serial 4
- 
- AC_DEFUN([AM_MAINTAINER_MODE],
- [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-@@ -620,26 +518,15 @@
- 
- AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
- 
--# Check to see how 'make' treats includes.	-*- Autoconf -*-
--
--# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
- 
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2001, 2002, 2003, 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 2
-+# serial 3
- 
- # AM_MAKE_INCLUDE()
- # -----------------
-@@ -683,27 +570,16 @@
- rm -f confinc confmf
- ])
- 
--#  -*- Autoconf -*-
--
--
--# Copyright (C) 1997, 1999, 2000, 2001, 2003 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
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
- 
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 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 3
-+# serial 4
- 
- # AM_MISSING_PROG(NAME, PROGRAM)
- # ------------------------------
-@@ -729,27 +605,16 @@
- fi
- ])
- 
-+# Copyright (C) 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.
-+
- # AM_PROG_MKDIR_P
- # ---------------
- # Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
--
--# Copyright (C) 2003, 2004 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
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
-+#
- # 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).
-@@ -803,26 +668,15 @@
- fi
- AC_SUBST([mkdir_p])])
- 
--# Helper functions for option handling.                    -*- Autoconf -*-
-+# Helper functions for option handling.                     -*- Autoconf -*-
- 
--# Copyright (C) 2001, 2002, 2003  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
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2001, 2002, 2003, 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 2
-+# serial 3
- 
- # _AM_MANGLE_OPTION(NAME)
- # -----------------------
-@@ -847,28 +701,16 @@
- AC_DEFUN([_AM_IF_OPTION],
- [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
- 
--#
--# Check to make sure that the build environment is sane.
--#
--
--# Copyright (C) 1996, 1997, 2000, 2001, 2003 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
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
-+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
- 
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 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 3
-+# serial 4
- 
- # AM_SANITY_CHECK
- # ---------------
-@@ -911,25 +753,14 @@
- fi
- AC_MSG_RESULT(yes)])
- 
--# AM_PROG_INSTALL_STRIP
--
--# Copyright (C) 2001, 2003 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
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
-+# Copyright (C) 2001, 2003, 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.
- 
-+# AM_PROG_INSTALL_STRIP
-+# ---------------------
- # One issue with vendor `install' (even GNU) is that you can't
- # specify the program used to strip binaries.  This is especially
- # annoying in cross-compiling environments, where the build's strip
-@@ -952,25 +783,13 @@
- 
- # Check how to create a tarball.                            -*- Autoconf -*-
- 
--# Copyright (C) 2004  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
--# the Free Software Foundation; either version 2, or (at your option)
--# any later version.
--
--# This program is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
--# 02111-1307, USA.
--
--# serial 1
-+# Copyright (C) 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 2
- 
- # _AM_PROG_TAR(FORMAT)
- # --------------------
-diff -Naur grub-0.97.orig/ChangeLog grub-0.97/ChangeLog
---- grub-0.97.orig/ChangeLog	2005-05-07 19:47:02.000000000 -0700
-+++ grub-0.97/ChangeLog	2006-07-04 00:01:50.000000000 -0700
-@@ -1,3 +1,51 @@
-+2006-05-02  Pavel Roskin  <proski@gnu.org>
-+
-+	* stage2/stage2.c (run_menu): Fix "savedefault" to save only top
-+	level menu positions.  Remember current position when calling a
-+	submenu.  Don't recalculate it when booting from a submenu.
-+
-+	* grub/main.c (main): Make sure the boot drive number doesn't
-+	exceed 255.
-+
-+2006-05-02  Vesa Jaaskelainen  <chaac@nic.fi>
-+
-+	* stage2/shared.h (vbe_mode): Back ported aligment fix from GRUB 2
-+	to GRUB Legacy.  Problem reported by Gerardo Richarte.
-+
-+2006-04-23  Robert Millan  <robertmh@gnu.org>
-+
-+	* grub/asmstub.c (get_diskinfo): Optimize sysctl routine.
-+
-+2006-04-20  Robert Millan  <robertmh@gnu.org>
-+
-+	Fixes for kernel of FreeBSD:
-+	* grub/asmstub.c (get_diskinfo): Toggle "kern.geom.debugflags" sysctl
-+	before opening a device for writing.
-+	* util/grub-install.in: Devices don't have this "r" prefix anymore.
-+
-+2006-04-16  Yoshinori K. Okuji  <okuji@enbug.org>
-+
-+	* docs/multiboot.texi: Correct the offset of address
-+	fields. Reported by Jeroen Dekkers.
-+
-+2006-03-21  Yoshinori K. Okuji  <okuji@enbug.org>
-+
-+	* stage2/builtins.c (setup_func): Specify the size of DEVICE to
-+	grub_strncat instead of a strange number 256. Reported by Vitaly
-+	Fertman <vitaly@namesys.com>.
-+
-+2005-09-29  Yoshinori K. Okuji  <okuji@enbug.org>
-+
-+	* docs/multiboot.texi: Fix a bug in the byte order of
-+	boot_device. I hope this won't affect any OS image.
-+	Increased the version number to 0.6.94.
-+
-+2005-09-28  Yoshinori K. Okuji  <okuji@enbug.org>
-+
-+	* stage2/boot.c (load_image): Even if an OS image is an ELF
-+	object, use the a.out kludge if MULTIBOOT_AOUT_KLUDGE is
-+	specified.
-+
- 2005-05-08  Yoshinori K. Okuji  <okuji@enbug.org>
- 
- 	* configure.ac (AC_INIT): Upgraded to 0.97.
-diff -Naur grub-0.97.orig/configure grub-0.97/configure
---- grub-0.97.orig/configure	2005-05-07 19:48:12.000000000 -0700
-+++ grub-0.97/configure	2006-07-04 00:08:05.000000000 -0700
-@@ -311,7 +311,7 @@
- # include <unistd.h>
- #endif"
- 
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT PERL CC ac_ct_CC CFLAGS LDFLAGS CPPFLAGS EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CCAS RANLIB ac_ct_RANLIB STAGE1_CFLAGS STAGE2_CFLAGS GRUB_CFLAGS OBJCOPY ac_ct_OBJCOPY GRUB_LIBS CPP EGREP NETBOOT_SUPPORT_TRUE NETBOOT_SUPPORT_FALSE DISKLESS_SUPPORT_TRUE DISKLESS_SUPPORT_FALSE HERCULES_SUPPORT_TRUE HERCULES_SUPPORT_FALSE SERIAL_SUPPORT_TRUE SERIAL_SUPPORT_FALSE SERIAL_SPEED_SIMULATION_TRUE SERIAL_SPEED_SIMULATION_FALSE BUILD_EXAMPLE_KERNEL_TRUE BUILD_EXAMPLE_KERNEL_FALSE FSYS_CFLAGS NET_CFLAGS NET_EXTRAFLAGS NETBOOT_DRIVERS CCASFLAGS LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT PERL CC ac_ct_CC CFLAGS LDFLAGS CPPFLAGS EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CCAS RANLIB ac_ct_RANLIB STAGE1_CFLAGS STAGE2_CFLAGS GRUB_CFLAGS OBJCOPY ac_ct_OBJCOPY GRUB_LIBS CPP EGREP NETBOOT_SUPPORT_TRUE NETBOOT_SUPPORT_FALSE DISKLESS_SUPPORT_TRUE DISKLESS_SUPPORT_FALSE GRAPHICS_SUPPORT_TRUE GRAPHICS_SUPPORT_FALSE HERCULES_SUPPORT_TRUE HERCULES_SUPPORT_FALSE SERIAL_SUPPORT_TRUE SERIAL_SUPPORT_FALSE SERIAL_SPEED_SIMULATION_TRUE SERIAL_SPEED_SIMULATION_FALSE BUILD_EXAMPLE_KERNEL_TRUE BUILD_EXAMPLE_KERNEL_FALSE FSYS_CFLAGS NET_CFLAGS NET_EXTRAFLAGS NETBOOT_DRIVERS CCASFLAGS LIBOBJS LTLIBOBJS'
- ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -914,6 +914,7 @@
-                           set the default memory location for WD/SMC
-   --enable-cs-scan=LIST   probe for CS89x0 base address using LIST
-   --enable-diskless       enable diskless support
-+  --disable-graphics      disable graphics terminal support
-   --disable-hercules      disable hercules terminal support
-   --disable-serial        disable serial terminal support
-   --enable-serial-speed-simulation
-@@ -5966,6 +5967,22 @@
- fi
- 
- 
-+# Check whether --enable-graphics or --disable-graphics was given.
-+if test "${enable_graphics+set}" = set; then
-+  enableval="$enable_graphics"
-+
-+fi;
-+
-+
-+if test "x$enable_graphics" != xno; then
-+  GRAPHICS_SUPPORT_TRUE=
-+  GRAPHICS_SUPPORT_FALSE='#'
-+else
-+  GRAPHICS_SUPPORT_TRUE='#'
-+  GRAPHICS_SUPPORT_FALSE=
-+fi
-+
-+
- # Check whether --enable-hercules or --disable-hercules was given.
- if test "${enable_hercules+set}" = set; then
-   enableval="$enable_hercules"
-@@ -6270,6 +6287,13 @@
- Usually this means the macro was only invoked conditionally." >&2;}
-    { (exit 1); exit 1; }; }
- fi
-+if test -z "${GRAPHICS_SUPPORT_TRUE}" && test -z "${GRAPHICS_SUPPORT_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"GRAPHICS_SUPPORT\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"GRAPHICS_SUPPORT\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
- if test -z "${HERCULES_SUPPORT_TRUE}" && test -z "${HERCULES_SUPPORT_FALSE}"; then
-   { { echo "$as_me:$LINENO: error: conditional \"HERCULES_SUPPORT\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
-@@ -6907,6 +6931,8 @@
- s,@NETBOOT_SUPPORT_FALSE@,$NETBOOT_SUPPORT_FALSE,;t t
- s,@DISKLESS_SUPPORT_TRUE@,$DISKLESS_SUPPORT_TRUE,;t t
- s,@DISKLESS_SUPPORT_FALSE@,$DISKLESS_SUPPORT_FALSE,;t t
-+s,@GRAPHICS_SUPPORT_TRUE@,$GRAPHICS_SUPPORT_TRUE,;t t
-+s,@GRAPHICS_SUPPORT_FALSE@,$GRAPHICS_SUPPORT_FALSE,;t t
- s,@HERCULES_SUPPORT_TRUE@,$HERCULES_SUPPORT_TRUE,;t t
- s,@HERCULES_SUPPORT_FALSE@,$HERCULES_SUPPORT_FALSE,;t t
- s,@SERIAL_SUPPORT_TRUE@,$SERIAL_SUPPORT_TRUE,;t t
-diff -Naur grub-0.97.orig/configure.ac grub-0.97/configure.ac
---- grub-0.97.orig/configure.ac	2005-05-07 19:36:03.000000000 -0700
-+++ grub-0.97/configure.ac	2006-07-03 23:58:41.000000000 -0700
-@@ -595,6 +595,11 @@
-   [  --enable-diskless       enable diskless support])
- AM_CONDITIONAL(DISKLESS_SUPPORT, test "x$enable_diskless" = xyes)
- 
-+dnl Graphical splashscreen support
-+AC_ARG_ENABLE(graphics,
-+  [  --disable-graphics      disable graphics terminal support])
-+AM_CONDITIONAL(GRAPHICS_SUPPORT, test "x$enable_graphics" != xno)
-+
- dnl Hercules terminal
- AC_ARG_ENABLE(hercules,
-   [  --disable-hercules      disable hercules terminal support])
-diff -Naur grub-0.97.orig/docs/grub.8 grub-0.97/docs/grub.8
---- grub-0.97.orig/docs/grub.8	2005-05-07 19:48:56.000000000 -0700
-+++ grub-0.97/docs/grub.8	2006-07-04 00:01:50.000000000 -0700
-@@ -1,5 +1,5 @@
- .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
--.TH GRUB "8" "May 2005" "grub (GNU GRUB 0.97)" FSF
-+.TH GRUB "8" "September 2005" "grub (GNU GRUB 0.97)" FSF
- .SH NAME
- grub \- the grub shell
- .SH SYNOPSIS
-diff -Naur grub-0.97.orig/docs/grub.texi grub-0.97/docs/grub.texi
---- grub-0.97.orig/docs/grub.texi	2005-05-07 19:59:59.000000000 -0700
-+++ grub-0.97/docs/grub.texi	2006-07-04 00:00:54.000000000 -0700
-@@ -2199,6 +2199,7 @@
- * rarp::                        Initialize a network device via RARP
- * serial::                      Set up a serial device
- * setkey::                      Configure the key map
-+* splashimage::                 Use a splash image
- * terminal::                    Choose a terminal
- * terminfo::                    Define escape sequences for a terminal
- * tftpserver::                  Specify a TFTP server
-@@ -2578,6 +2579,16 @@
- @end deffn
- 
- 
-+@node splashimage
-+@subsection splashimage
-+
-+@deffn Command splashimage file
-+Select an image to use as the background image.  This should be
-+specified using normal GRUB device naming syntax.  The format of the
-+file is a gzipped xpm which is 640x480 with a 14 color palette.
-+@end deffn
-+
-+
- @node terminal
- @subsection terminal
- 
-@@ -2685,6 +2696,7 @@
- * module::                      Load a module
- * modulenounzip::               Load a module without decompression
- * pause::                       Wait for a key press
-+* print::                       Print a message
- * quit::                        Exit from the grub shell
- * reboot::                      Reboot your computer
- * read::                        Read data from memory
-@@ -3091,6 +3103,16 @@
- @end deffn
- 
- 
-+@node print
-+@subsection print
-+
-+@deffn Command print message @dots{}
-+Print the @var{message}. Note that placing @key{^G} (ASCII code 7) in the
-+message will cause the speaker to emit the standard beep sound, which is
-+useful for visually impaired people.
-+@end deffn
-+
-+
- @node quit
- @subsection quit
- 
-diff -Naur grub-0.97.orig/docs/multiboot.texi grub-0.97/docs/multiboot.texi
---- grub-0.97.orig/docs/multiboot.texi	2003-07-09 04:45:36.000000000 -0700
-+++ grub-0.97/docs/multiboot.texi	2006-07-04 00:01:50.000000000 -0700
-@@ -25,7 +25,7 @@
- @ifinfo
- Copyright @copyright{} 1995, 96 Bryan Ford <baford@@cs.utah.edu>
- Copyright @copyright{} 1995, 96 Erich Stefan Boleyn <erich@@uruk.org>
--Copyright @copyright{} 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
-+Copyright @copyright{} 1999, 2000, 2001, 2002, 2005, 2006 Free Software Foundation, Inc.
- 
- Permission is granted to make and distribute verbatim copies of
- this manual provided the copyright notice and this permission notice
-@@ -57,7 +57,7 @@
- @vskip 0pt plus 1filll
- Copyright @copyright{} 1995, 96 Bryan Ford <baford@@cs.utah.edu>
- Copyright @copyright{} 1995, 96 Erich Stefan Boleyn <erich@@uruk.org>
--Copyright @copyright{} 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
-+Copyright @copyright{} 1999, 2000, 2001, 2002, 2005, 2006 Free Software Foundation, Inc.
- 
- Permission is granted to make and distribute verbatim copies of
- this manual provided the copyright notice and this permission notice
-@@ -80,7 +80,7 @@
- @top Multiboot Specification
- 
- This file documents Multiboot Specification, the proposal for the boot
--sequence standard. This edition documents version 0.6.93.
-+sequence standard. This edition documents version 0.6.94.
- @end ifnottex
- 
- @menu
-@@ -426,7 +426,7 @@
- kernel.
- 
- If bit 16 in the @samp{flags} word is set, then the fields at offsets
--8-24 in the Multiboot header are valid, and the boot loader should use
-+12-28 in the Multiboot header are valid, and the boot loader should use
- them instead of the fields in the actual executable header to calculate
- where to load the OS image. This information does not need to be
- provided if the kernel image is in @sc{elf} format, but it @emph{must}
-@@ -677,7 +677,7 @@
- @example
- @group
- +-------+-------+-------+-------+
--| drive | part1 | part2 | part3 |
-+| part3 | part2 | part1 | drive |
- +-------+-------+-------+-------+
- @end group
- @end example
-@@ -1199,6 +1199,13 @@
- @email{bug-grub@@gnu.org}, from Bryan Ford and Erich Stefan Boleyn.
- @end itemize
- 
-+@item
-+The byte order of the @samp{boot_device} in Multiboot information is
-+reversed. This was a mistake.
-+
-+@item
-+The offset of the address fields were wrong.
-+
- @item 0.6
- @itemize @bullet
- @item
-diff -Naur grub-0.97.orig/grub/asmstub.c grub-0.97/grub/asmstub.c
---- grub-0.97.orig/grub/asmstub.c	2005-02-16 12:45:14.000000000 -0800
-+++ grub-0.97/grub/asmstub.c	2006-07-04 00:01:50.000000000 -0700
-@@ -42,6 +42,12 @@
- #include <sys/time.h>
- #include <termios.h>
- #include <signal.h>
-+#include <sys/mman.h>
-+
-+#include <limits.h>
-+#ifndef PAGESIZE
-+#define PAGESIZE 4096
-+#endif
- 
- #ifdef __linux__
- # include <sys/ioctl.h>		/* ioctl */
-@@ -55,6 +61,10 @@
- # endif /* ! BLKFLSBUF */
- #endif /* __linux__ */
- 
-+#if defined(__FreeBSD_kernel__) || defined(__FreeBSD__)
-+# include <sys/sysctl.h>
-+#endif
-+
- /* We want to prevent any circularararity in our stubs, as well as
-    libc name clashes. */
- #define WITHOUT_LIBC_STUBS 1
-@@ -144,6 +154,22 @@
-   assert (grub_scratch_mem == 0);
-   scratch = malloc (0x100000 + EXTENDED_MEMSIZE + 15);
-   assert (scratch);
-+
-+  {
-+    char *p;
-+    int ret;
-+
-+    /* Align to a multiple of PAGESIZE, assumed to be a power of two. */
-+    p = (char *) (((long) scratch) & ~(PAGESIZE - 1));
-+
-+    /* The simulated stack needs to be executable, since GCC uses stack
-+     * trampolines to implement nested functions.
-+     */
-+    ret = mprotect (p, 0x100000 + EXTENDED_MEMSIZE + 15,
-+		    PROT_READ | PROT_WRITE | PROT_EXEC);
-+    assert (ret == 0);
-+  }
-+
-   grub_scratch_mem = (char *) ((((int) scratch) >> 4) << 4);
- 
-   /* FIXME: simulate the memory holes using mprot, if available. */
-@@ -777,7 +803,39 @@
- 
-       /* Open read/write, or read-only if that failed. */
-       if (! read_only)
--	disks[drive].flags = open (devname, O_RDWR);
-+	{
-+/* By default, kernel of FreeBSD does not allow overwriting MBR */
-+#if defined(__FreeBSD_kernel__) || defined(__FreeBSD__)
-+#define GEOM_SYSCTL	"kern.geom.debugflags"
-+	  int old_flags, flags;
-+	  size_t sizeof_int = sizeof (int);
-+
-+	  if (sysctlbyname (GEOM_SYSCTL, &old_flags, &sizeof_int, NULL, 0) != 0)
-+	    grub_printf ("failed to get " GEOM_SYSCTL "sysctl: %s\n", strerror (errno));
-+
-+	  if ((old_flags & 0x10) == 0)
-+	    {
-+	      /* "allow foot shooting", see geom(4) */
-+	      flags = old_flags | 0x10;
-+
-+	      if (sysctlbyname (GEOM_SYSCTL, NULL, NULL, &flags, sizeof (int)) != 0)
-+		{
-+		  flags = old_flags;
-+		  grub_printf ("failed to set " GEOM_SYSCTL "sysctl: %s\n", strerror (errno));
-+		}
-+	    }
-+	  else
-+	    flags = old_flags;
-+#endif
-+	  disks[drive].flags = open (devname, O_RDWR);
-+#if defined(__FreeBSD_kernel__) || defined(__FreeBSD__)
-+	  if (flags != old_flags)
-+	    {
-+	      if (sysctlbyname (GEOM_SYSCTL, NULL, NULL, &old_flags, sizeof (int)) != 0)
-+	        grub_printf ("failed to set " GEOM_SYSCTL "sysctl: %s\n", strerror (errno));
-+	    }
-+#endif
-+	}
- 
-       if (disks[drive].flags == -1)
- 	{
-diff -Naur grub-0.97.orig/grub/main.c grub-0.97/grub/main.c
---- grub-0.97.orig/grub/main.c	2003-07-09 04:45:36.000000000 -0700
-+++ grub-0.97/grub/main.c	2006-07-04 00:01:50.000000000 -0700
-@@ -32,6 +32,7 @@
- #define WITHOUT_LIBC_STUBS 1
- #include <shared.h>
- #include <term.h>
-+#include <device.h>
- 
- char *program_name = 0;
- int use_config_file = 1;
-@@ -192,6 +193,12 @@
- 	      perror ("strtoul");
- 	      exit (1);
- 	    }
-+	  if (boot_drive >= NUM_DISKS)
-+	    {
-+	      fprintf (stderr, "boot_drive should be from 0 to %d\n",
-+		       NUM_DISKS - 1);
-+	      exit (1);
-+	    }
- 	  break;
- 
- 	case OPT_NO_CONFIG_FILE:
-diff -Naur grub-0.97.orig/lib/device.c grub-0.97/lib/device.c
---- grub-0.97.orig/lib/device.c	2005-03-27 15:14:25.000000000 -0800
-+++ grub-0.97/lib/device.c	2006-07-04 00:00:44.000000000 -0700
-@@ -131,6 +131,152 @@
- #include <shared.h>
- #include <device.h>
- 
-+#if defined(__linux__)
-+/* The 2.6 kernel has removed all of the geometry handling for IDE drives
-+ * that did fixups for LBA, etc.  This means that the geometry we get
-+ * with the ioctl has a good chance of being wrong.  So, we get to 
-+ * also know about partition tables and try to read what the geometry
-+ * is there. *grumble*   Very closely based on code from cfdisk
-+ */
-+static void get_kernel_geometry(int fd, long long *cyl, int *heads, int *sectors) {
-+    struct hd_geometry hdg;
-+    
-+    if (ioctl (fd, HDIO_GETGEO, &hdg))
-+        return;
-+
-+    *cyl = hdg.cylinders;
-+    *heads = hdg.heads;
-+    *sectors = hdg.sectors;
-+}
-+
-+struct partition {
-+        unsigned char boot_ind;         /* 0x80 - active */
-+        unsigned char head;             /* starting head */
-+        unsigned char sector;           /* starting sector */
-+        unsigned char cyl;              /* starting cylinder */
-+        unsigned char sys_ind;          /* What partition type */
-+        unsigned char end_head;         /* end head */
-+        unsigned char end_sector;       /* end sector */
-+        unsigned char end_cyl;          /* end cylinder */
-+        unsigned char start4[4];        /* starting sector counting from 0 */
-+        unsigned char size4[4];         /* nr of sectors in partition */
-+};
-+
-+#define ALIGNMENT 2
-+typedef union {
-+    struct {
-+	unsigned char align[ALIGNMENT];
-+	unsigned char b[SECTOR_SIZE];
-+    } c;
-+    struct {
-+	unsigned char align[ALIGNMENT];
-+	unsigned char buffer[0x1BE];
-+	struct partition part[4];
-+	unsigned char magicflag[2];
-+    } p;
-+} partition_table;
-+
-+#define PART_TABLE_FLAG0 0x55
-+#define PART_TABLE_FLAG1 0xAA
-+
-+static void
-+get_partition_table_geometry(partition_table *bufp, long long *cyl, int *heads, 
-+                             int *sectors) {
-+    struct partition *p;
-+    int i,h,s,hh,ss;
-+    int first = 1;
-+    int bad = 0;
-+
-+    if (bufp->p.magicflag[0] != PART_TABLE_FLAG0 ||
-+	bufp->p.magicflag[1] != PART_TABLE_FLAG1) {
-+	    /* Matthew Wilcox: slightly friendlier version of
-+	       fatal(_("Bad signature on partition table"), 3);
-+	    */
-+            fprintf(stderr, "Unknown partition table signature\n");
-+	    return;
-+    }
-+
-+    hh = ss = 0;
-+    for (i=0; i<4; i++) {
-+	p = &(bufp->p.part[i]);
-+	if (p->sys_ind != 0) {
-+	    h = p->end_head + 1;
-+	    s = (p->end_sector & 077);
-+	    if (first) {
-+		hh = h;
-+		ss = s;
-+		first = 0;
-+	    } else if (hh != h || ss != s)
-+		bad = 1;
-+	}
-+    }
-+
-+    if (!first && !bad) {
-+	*heads = hh;
-+	*sectors = ss;
-+    }
-+}
-+
-+static long long my_lseek (unsigned int fd, long long offset, 
-+                           unsigned int origin)
-+{
-+#if defined(__linux__) && (!defined(__GLIBC__) || \
-+        ((__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 1))))
-+  /* Maybe libc doesn't have large file support.  */
-+  loff_t offset, result;
-+  static int _llseek (uint filedes, ulong hi, ulong lo,
-+                      loff_t *res, uint wh);
-+  _syscall5 (int, _llseek, uint, filedes, ulong, hi, ulong, lo,
-+             loff_t *, res, uint, wh);
-+  
-+  if (_llseek (fd, offset >> 32, offset & 0xffffffff, &result, SEEK_SET) < 0)
-+    return (long long) -1;
-+  return result;
-+#else
-+  return lseek(fd, offset, SEEK_SET);
-+#endif
-+}
-+
-+static void get_linux_geometry (int fd, struct geometry *geom) {
-+    long long kern_cyl = 0; int kern_head = 0, kern_sectors = 0;
-+    long long pt_cyl = 0; int pt_head = 0, pt_sectors = 0;
-+    partition_table bufp;
-+    char *buff, *buf_unaligned;
-+
-+    buf_unaligned = malloc(sizeof(partition_table) + 4095);
-+    buff = (char *) (((unsigned long)buf_unaligned + 4096 - 1) &
-+                     (~(4096-1)));
-+
-+    get_kernel_geometry(fd, &kern_cyl, &kern_head, &kern_sectors);
-+
-+    if (my_lseek (fd, 0*SECTOR_SIZE, SEEK_SET) < 0) {
-+        fprintf(stderr, "Unable to seek");
-+    }
-+
-+    if (read(fd, buff, SECTOR_SIZE) == SECTOR_SIZE) {
-+        memcpy(bufp.c.b, buff, SECTOR_SIZE);
-+        get_partition_table_geometry(&bufp, &pt_cyl, &pt_head, &pt_sectors);
-+    } else {
-+        fprintf(stderr, "Unable to read partition table: %s\n", strerror(errno));
-+    }
-+
-+    if (pt_head && pt_sectors) {
-+        int cyl_size;
-+
-+        geom->heads = pt_head;
-+        geom->sectors = pt_sectors;
-+        cyl_size = pt_head * pt_sectors;
-+        geom->cylinders = geom->total_sectors/cyl_size;
-+    } else {
-+        geom->heads = kern_head;
-+        geom->sectors = kern_sectors;
-+        geom->cylinders = kern_cyl;
-+    }
-+
-+    return;
-+}
-+#endif
-+
- /* Get the geometry of a drive DRIVE.  */
- void
- get_drive_geometry (struct geometry *geom, char **map, int drive)
-@@ -151,21 +297,16 @@
- #if defined(__linux__)
-   /* Linux */
-   {
--    struct hd_geometry hdg;
-     unsigned long nr;
--    
--    if (ioctl (fd, HDIO_GETGEO, &hdg))
--      goto fail;
- 
-     if (ioctl (fd, BLKGETSIZE, &nr))
-       goto fail;
-     
-     /* Got the geometry, so save it. */
--    geom->cylinders = hdg.cylinders;
--    geom->heads = hdg.heads;
--    geom->sectors = hdg.sectors;
-     geom->total_sectors = nr;
--    
-+    get_linux_geometry(fd, geom);
-+    if (!geom->heads && !geom->cylinders && !geom->sectors)
-+        goto fail;
-     goto success;
-   }
- 
-@@ -403,6 +544,18 @@
- }
- 
- static void
-+get_cciss_disk_name (char *name, int controller, int drive)
-+{
-+  sprintf (name, "/dev/cciss/c%dd%d", controller, drive);
-+}
-+
-+static void
-+get_ida_disk_name (char *name, int controller, int drive)
-+{
-+  sprintf (name, "/dev/ida/c%dd%d", controller, drive);
-+}
-+
-+static void
- get_ataraid_disk_name (char *name, int unit)
- {
-   sprintf (name, "/dev/ataraid/d%c", unit + '0');
-@@ -801,6 +954,74 @@
- 	  }
-       }
-   }
-+
-+  /* This is for CCISS, its like the DAC960  - we have
-+     /dev/cciss/<controller>d<logical drive>p<partition> 
-+
-+     It currently supports up to 3 controllers, 10 logical volumes
-+     and 10 partitions
-+
-+     Code gratuitously copied from DAC960 above.
-+     Horms <horms@verge.net.au> 23rd July 2004
-+  */
-+  {
-+    int controller, drive;
-+    
-+    for (controller = 0; controller < 2; controller++)
-+      {
-+	for (drive = 0; drive < 9; drive++)
-+	  {
-+	    char name[24];
-+	    
-+	    get_cciss_disk_name (name, controller, drive);
-+	    if (check_device (name))
-+	      {
-+		(*map)[num_hd + 0x80] = strdup (name);
-+		assert ((*map)[num_hd + 0x80]);
-+		
-+		/* If the device map file is opened, write the map.  */
-+		if (fp)
-+		  fprintf (fp, "(hd%d)\t%s\n", num_hd, name);
-+		
-+		num_hd++;
-+	      }
-+	  }
-+      }
-+  }
-+
-+  /* This is for Compaq Smart Array, its like the DAC960  - we have
-+     /dev/ida/<controller>d<logical drive>p<partition> 
-+
-+     It currently supports up to 3 controllers, 10 logical volumes
-+     and 15 partitions
-+
-+     Code gratuitously copied from DAC960 above.
-+     Piotr Roszatycki <dexter@debian.org>
-+  */
-+  {
-+    int controller, drive;
-+    
-+    for (controller = 0; controller < 2; controller++)
-+      {
-+	for (drive = 0; drive < 9; drive++)
-+	  {
-+	    char name[24];
-+	    
-+	    get_ida_disk_name (name, controller, drive);
-+	    if (check_device (name))
-+	      {
-+		(*map)[num_hd + 0x80] = strdup (name);
-+		assert ((*map)[num_hd + 0x80]);
-+		
-+		/* If the device map file is opened, write the map.  */
-+		if (fp)
-+		  fprintf (fp, "(hd%d)\t%s\n", num_hd, name);
-+		
-+		num_hd++;
-+	      }
-+	  }
-+      }
-+  }
- #endif /* __linux__ */
-   
-   /* OK, close the device map file if opened.  */
-@@ -844,6 +1065,7 @@
- {
-   char dev[PATH_MAX];	/* XXX */
-   int fd;
-+  off_t offset = (off_t) sector * (off_t) SECTOR_SIZE;
-   
-   if ((partition & 0x00FF00) != 0x00FF00)
-     {
-@@ -861,8 +1083,14 @@
-       if (strcmp (dev + strlen(dev) - 5, "/disc") == 0)
- 	strcpy (dev + strlen(dev) - 5, "/part");
-     }
--  sprintf (dev + strlen(dev), "%d", ((partition >> 16) & 0xFF) + 1);
--  
-+  sprintf (dev + strlen(dev), "%s%d", 
-+   /* Compaq smart and others */
-+   (strncmp(dev, "/dev/ida/", 9) == 0 ||
-+   strncmp(dev, "/dev/ataraid/", 13) == 0 ||
-+   strncmp(dev, "/dev/cciss/", 11) == 0 ||
-+   strncmp(dev, "/dev/rd/", 8) == 0) ? "p" : "",
-+   ((partition >> 16) & 0xFF) + 1);
-+
-   /* Open the partition.  */
-   fd = open (dev, O_RDWR);
-   if (fd < 0)
-@@ -870,35 +1098,13 @@
-       errnum = ERR_NO_PART;
-       return 0;
-     }
--  
--#if defined(__linux__) && (!defined(__GLIBC__) || \
--        ((__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 1))))
--  /* Maybe libc doesn't have large file support.  */
--  {
--    loff_t offset, result;
--    static int _llseek (uint filedes, ulong hi, ulong lo,
--                        loff_t *res, uint wh);
--    _syscall5 (int, _llseek, uint, filedes, ulong, hi, ulong, lo,
--               loff_t *, res, uint, wh);
- 
--    offset = (loff_t) sector * (loff_t) SECTOR_SIZE;
--    if (_llseek (fd, offset >> 32, offset & 0xffffffff, &result, SEEK_SET))
--      {
--	errnum = ERR_DEV_VALUES;
--	return 0;
--      }
--  }
--#else
--  {
--    off_t offset = (off_t) sector * (off_t) SECTOR_SIZE;
- 
--    if (lseek (fd, offset, SEEK_SET) != offset)
--      {
--	errnum = ERR_DEV_VALUES;
--	return 0;
--      }
--  }
--#endif
-+  if (my_lseek(fd, offset, SEEK_SET) != offset)
-+    {
-+      errnum = ERR_DEV_VALUES;
-+      return 0;
-+    }
-   
-   if (write (fd, buf, size * SECTOR_SIZE) != (size * SECTOR_SIZE))
-     {
-diff -Naur grub-0.97.orig/stage2/asm.S grub-0.97/stage2/asm.S
---- grub-0.97.orig/stage2/asm.S	2004-06-19 09:55:22.000000000 -0700
-+++ grub-0.97/stage2/asm.S	2006-07-04 00:01:19.000000000 -0700
-@@ -1651,7 +1651,29 @@
- 	jnz	3f
- 	ret
- 
--3:	/* use keyboard controller */
-+3:	/*
-+	 * try to switch gateA20 using PORT92, the "Fast A20 and Init"
-+	 * register
-+	*/
-+	mov $0x92, %dx
-+	inb %dx, %al
-+	/* skip the port92 code if it's unimplemented (read returns 0xff) */
-+	cmpb $0xff, %al
-+	jz 6f
-+	
-+	/* set or clear bit1, the ALT_A20_GATE bit */
-+	movb 4(%esp), %ah
-+	testb %ah, %ah
-+	jz 4f
-+	orb $2, %al
-+	jmp 5f
-+4:	and $0xfd, %al
-+	
-+	/* clear the INIT_NOW bit don't accidently reset the machine */
-+5:	and $0xfe, %al
-+	outb %al, %dx
-+	
-+6:	/* use keyboard controller */
- 	pushl	%eax
- 
- 	call    gloop1
-@@ -1661,9 +1683,12 @@
- 
- gloopint1:
- 	inb	$K_STATUS
-+	cmpb	$0xff, %al
-+	jz	gloopint1_done
- 	andb	$K_IBUF_FUL, %al
- 	jnz	gloopint1
- 
-+gloopint1_done:	
- 	movb	$KB_OUTPUT_MASK, %al
- 	cmpb	$0, 0x8(%esp)
- 	jz	gdoit
-@@ -1684,6 +1709,8 @@
- 
- gloop1:
- 	inb	$K_STATUS
-+	cmpb	$0xff, %al
-+	jz	gloop2ret
- 	andb	$K_IBUF_FUL, %al
- 	jnz	gloop1
- 
-@@ -1991,6 +2018,11 @@
- ENTRY(console_getkey)
- 	push	%ebp
- 
-+wait_for_key:
-+	call	EXT_C(console_checkkey)
-+	incl	%eax
-+	jz	wait_for_key
-+	
- 	call	EXT_C(prot_to_real)
- 	.code16
- 
-@@ -2216,7 +2248,304 @@
- 	pop	%ebx
- 	pop	%ebp
- 	ret
--		
-+
-+
-+/* graphics mode functions */
-+#ifdef SUPPORT_GRAPHICS
-+VARIABLE(cursorX)
-+.word	0
-+VARIABLE(cursorY)
-+.word	0
-+VARIABLE(cursorCount)
-+.word 0
-+VARIABLE(cursorBuf)
-+.byte	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-+
-+
-+/*
-+ * set_int1c_handler(void)
-+ */
-+ENTRY(set_int1c_handler)
-+	pushl   %edi
-+
-+	/* save the original int1c handler */
-+	movl    $0x70, %edi
-+	movw    (%edi), %ax
-+	movw    %ax, ABS(int1c_offset)
-+	movw    2(%edi), %ax
-+	movw    %ax, ABS(int1c_segment)
-+
-+	/* save the new int1c handler */
-+	movw    $ABS(int1c_handler), %ax
-+	movw    %ax, (%edi)
-+	xorw    %ax, %ax
-+	movw    %ax, 2(%edi)
-+
-+	popl    %edi
-+	ret
-+
-+
-+/*
-+ * unset_int1c_handler(void)
-+ */
-+ENTRY(unset_int1c_handler)
-+	pushl   %edi
-+
-+	/* check if int1c_handler is set */
-+	movl    $0x70, %edi
-+	movw    $ABS(int1c_handler), %ax
-+	cmpw    %ax, (%edi)
-+	jne     int1c_1
-+	xorw    %ax, %ax
-+	cmpw    %ax, 2(%edi)
-+	jne     int1c_1
-+
-+	/* restore the original */
-+	movw    ABS(int1c_offset), %ax
-+	movw    %ax, (%edi)
-+	movw    ABS(int1c_segment), %ax
-+	movw    %ax, 2(%edi)
-+
-+int1c_1:
-+	popl    %edi
-+	ret
-+
-+
-+/*
-+ * blinks graphics cursor
-+ */
-+	.code16
-+write_data:
-+	movw    $0, %ax
-+	movw    %ax, %ds
-+
-+	mov     $0xA000, %ax            /* video in es:di */
-+	mov     %ax, %es
-+	mov     $80, %ax
-+	movw    $ABS(cursorY), %si
-+	mov     %ds:(%si), %bx
-+	mul     %bx
-+	movw    $ABS(cursorX), %si
-+	mov     %ds:(%si), %bx
-+	shr     $3, %bx                 /* %bx /= 8 */
-+	add     %bx, %ax
-+	mov     %ax, %di
-+
-+	movw    $ABS(cursorBuf), %si    /* fontBuf in ds:si */
-+
-+	/* prepare for data moving */
-+	mov     $16, %dx                /* altura da fonte */
-+	mov     $80, %bx                /* bytes por linha */
-+
-+write_loop:
-+	movb    %ds:(%si), %al
-+	xorb    $0xff, %al
-+	movb    %al, %ds:(%si)          /* invert cursorBuf */
-+	movb    %al, %es:(%di)          /* write to video */
-+	add     %bx, %di
-+	inc     %si
-+	dec     %dx
-+	jg      write_loop
-+	ret
-+
-+int1c_handler:
-+	pusha
-+	mov     $0, %ax
-+	mov     %ax, %ds
-+	mov     $ABS(cursorCount), %si
-+	mov     %ds:(%si), %ax
-+	inc     %ax
-+	mov     %ax, %ds:(%si)
-+	cmp     $9, %ax
-+	jne     int1c_done
-+
-+	mov     $0, %ax
-+	mov     %ax, %ds:(%si)
-+	call    write_data
-+
-+int1c_done:
-+	popa
-+	iret
-+	/* call previous int1c handler */
-+	/* ljmp */
-+	.byte   0xea
-+int1c_offset:  .word   0
-+int1c_segment: .word   0
-+	.code32
-+
-+
-+/*
-+ * unsigned char set_videomode(unsigned char mode)
-+ * BIOS call "INT 10H Function 0h" to set video mode
-+ *	Call with	%ah = 0x0
-+ *			%al = video mode
-+ *  Returns old videomode.
-+ */
-+ENTRY(set_videomode)
-+	pushl	%ebp
-+	movl	%esp,%ebp
-+	pushl	%ebx
-+	pushl	%ecx
-+
-+	movb	8(%ebp), %cl
-+
-+	call	EXT_C(prot_to_real)
-+	.code16
-+
-+	xorb	%al, %al
-+	movb	$0xf, %ah
-+	int	$0x10			/* Get Current Video mode */
-+	movb	%al, %ch
-+	xorb	%ah, %ah
-+	movb	%cl, %al
-+	int	$0x10			/* Set Video mode */
-+
-+	DATA32	call	EXT_C(real_to_prot)
-+	.code32
-+
-+	xorl	%eax, %eax
-+	movb	%ch, %al
-+
-+	popl	%ecx
-+	popl	%ebx
-+	popl	%ebp
-+	ret
-+
-+
-+/*
-+ * int get_videomode()
-+ * BIOS call "INT 10H Function 0Fh" to get current video mode
-+ *	Call with	%al = 0x0
-+ *			%ah = 0xF
-+ *	Returns current videomode.
-+ */
-+ENTRY(get_videomode)
-+	pushl	%ebp
-+	movl	%esp,%ebp
-+	pushl	%ebx
-+	pushl	%ecx
-+
-+	call	EXT_C(prot_to_real)
-+	.code16
-+
-+	xorb	%al, %al
-+	movb	$0xF, %ah
-+	int	$0x10			/* Get Current Video mode */
-+	movb	%al, %cl	/* For now we only want display mode */
-+
-+	DATA32	call	EXT_C(real_to_prot)
-+	.code32
-+
-+	xorl	%eax, %eax
-+	movb	%cl, %al
-+
-+	popl	%ecx
-+	popl	%ebx
-+	popl	%ebp
-+	ret
-+
-+
-+/*
-+ * unsigned char * graphics_get_font()
-+ * BIOS call "INT 10H Function 11h" to set font
-+ *      Call with       %ah = 0x11
-+ */
-+ENTRY(graphics_get_font)
-+	push	%ebp
-+	push	%ebx
-+	push	%ecx
-+	push	%edx
-+
-+	call	EXT_C(prot_to_real)
-+	.code16
-+
-+	movw	$0x1130, %ax
-+	movb	$6, %bh		/* font 8x16 */
-+	int	$0x10
-+	movw	%bp, %dx
-+	movw	%es, %cx
-+
-+	DATA32	call	EXT_C(real_to_prot)
-+	.code32
-+
-+	xorl	%eax, %eax
-+	movw	%cx, %ax
-+	shll	$4, %eax
-+	movw	%dx, %ax
-+
-+	pop	%edx
-+	pop	%ecx
-+	pop	%ebx
-+	pop	%ebp
-+	ret
-+
-+
-+/*
-+ * graphics_set_palette(index, red, green, blue)
-+ * BIOS call "INT 10H Function 10h" to set individual dac register
-+ *	Call with	%ah = 0x10
-+ *			%bx = register number
-+ *			%ch = new value for green (0-63)
-+ *			%cl = new value for blue (0-63)
-+ *			%dh = new value for red (0-63)
-+ */
-+
-+ENTRY(graphics_set_palette)
-+	push	%ebp
-+	push	%eax
-+	push	%ebx
-+	push	%ecx
-+	push	%edx
-+
-+	movw	$0x3c8, %bx		/* address write mode register */
-+
-+	/* wait vertical retrace */
-+	movw	$0x3da, %dx
-+l1b:
-+	inb	%dx, %al	/* wait vertical active display */
-+	test	$8, %al
-+	jnz	l1b
-+
-+l2b:
-+	inb	%dx, %al	/* wait vertical retrace */
-+	test	$8, %al
-+	jnz	l2b
-+
-+	mov	%bx, %dx
-+	movb	0x18(%esp), %al		/* index */
-+	outb	%al, %dx
-+	inc	%dx
-+
-+	movb	0x1c(%esp), %al		/* red */
-+	outb	%al, %dx
-+
-+	movb	0x20(%esp), %al		/* green */
-+	outb	%al, %dx
-+
-+	movb	0x24(%esp), %al		/* blue */
-+	outb	%al, %dx
-+
-+	movw	0x18(%esp), %bx
-+
-+	call	EXT_C(prot_to_real)
-+	.code16
-+
-+	movb	%bl, %bh
-+	movw	$0x1000, %ax
-+	int	$0x10
-+
-+	DATA32	call	EXT_C(real_to_prot)
-+	.code32
-+
-+	pop	%edx
-+	pop	%ecx
-+	pop	%ebx
-+	pop	%eax
-+	pop	%ebp
-+	ret
-+#endif /* SUPPORT_GRAPHICS */
-+
-+
- /*
-  * getrtsecs()
-  *	if a seconds value can be read, read it and return it (BCD),
-diff -Naur grub-0.97.orig/stage2/boot.c grub-0.97/stage2/boot.c
---- grub-0.97.orig/stage2/boot.c	2004-03-30 03:44:08.000000000 -0800
-+++ grub-0.97/stage2/boot.c	2006-07-04 00:01:50.000000000 -0700
-@@ -1,7 +1,7 @@
- /* boot.c - load and bootstrap a kernel */
- /*
-  *  GRUB  --  GRand Unified Bootloader
-- *  Copyright (C) 1999,2000,2001,2002,2003,2004  Free Software Foundation, Inc.
-+ *  Copyright (C) 1999,2000,2001,2002,2003,2004,2005  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
-@@ -29,6 +29,8 @@
- entry_func entry_addr;
- static struct mod_list mll[99];
- static int linux_mem_size;
-+static int elf_kernel_addr;
-+static int elf_kernel_size;
- 
- /*
-  *  The next two functions, 'load_image' and 'load_module', are the building
-@@ -96,7 +98,7 @@
-   lh = (struct linux_kernel_header *) buffer;
-   
-   /* ELF loading supported if multiboot, FreeBSD and NetBSD.  */
--  if ((type == KERNEL_TYPE_MULTIBOOT
-+  if (((type == KERNEL_TYPE_MULTIBOOT && ! (flags & MULTIBOOT_AOUT_KLUDGE))
-        || pu.elf->e_ident[EI_OSABI] == ELFOSABI_FREEBSD
-        || grub_strcmp (pu.elf->e_ident + EI_BRAND, "FreeBSD") == 0
-        || suggested_type == KERNEL_TYPE_NETBSD)
-@@ -594,6 +596,7 @@
- 
-       /* reset this to zero for now */
-       cur_addr = 0;
-+      elf_kernel_addr = ~0;
- 
-       /* scan for program segments */
-       for (i = 0; i < pu.elf->e_phnum; i++)
-@@ -630,6 +633,8 @@
- 	      /* mark memory as used */
- 	      if (cur_addr < memaddr + memsiz)
- 		cur_addr = memaddr + memsiz;
-+	      if (elf_kernel_addr > cur_addr)
-+		elf_kernel_addr = cur_addr;
- 	      printf (", <0x%x:0x%x:0x%x>", memaddr, filesiz,
- 		      memsiz - filesiz);
- 	      /* increment number of segments */
-@@ -647,6 +652,8 @@
- 	    }
- 	}
- 
-+      elf_kernel_size = cur_addr - elf_kernel_addr;
-+
-       if (! errnum)
- 	{
- 	  if (! loaded)
-@@ -824,8 +831,11 @@
-     moveto = (mbi.mem_upper + 0x400) << 10;
-   
-   moveto = (moveto - len) & 0xfffff000;
--  max_addr = (lh->header == LINUX_MAGIC_SIGNATURE && lh->version >= 0x0203
--	      ? lh->initrd_addr_max : LINUX_INITRD_MAX_ADDRESS);
-+  max_addr = LINUX_INITRD_MAX_ADDRESS;
-+  if (lh->header == LINUX_MAGIC_SIGNATURE &&
-+      lh->version >= 0x0203 &&
-+      lh->initrd_addr_max < max_addr)
-+    max_addr = lh->initrd_addr_max;
-   if (moveto + len >= max_addr)
-     moveto = (max_addr - len) & 0xfffff000;
-   
-@@ -864,6 +874,129 @@
- }
- #endif
- 
-+#define mem_align4k(p)	((p) + 0xFFF) & 0xFFFFF000
-+
-+static void
-+kfreebsd_setenv (char *env, const char *var, const char *value)
-+{
-+  while (1)
-+    {
-+      if (env[0] == '\0' && env[1] == '\0')
-+	{
-+	  env++;
-+	  break;
-+	}
-+      else
-+        env++;
-+    }
-+
-+  grub_sprintf (env, "%s=%s", var, value);
-+  env[grub_strlen (env) + 1] = '\0';
-+}
-+
-+static char *
-+kfreebsd_read_hints (char *buf)
-+{
-+  char *buf_end = buf;
-+
-+  if (grub_open ("/boot/device.hints"))
-+    {
-+      char *line_start;
-+      int line_len = 0;
-+      char *envp;
-+      int env_len;
-+
-+      env_len = grub_read (buf, -1);
-+      if (env_len)
-+	{
-+	  buf_end += env_len;
-+	  *(buf_end++) = '\0';
-+	}
-+      else
-+	return buf_end;
-+
-+      grub_close ();
-+
-+      envp = line_start = buf;
-+      while (*envp)
-+	{
-+	  char *envp_current = envp;
-+	
-+	  switch (*envp)
-+	    {
-+	      case ' ':
-+		while (*envp == ' ')
-+		  {
-+		    envp++;
-+		    env_len--;
-+		  }
-+		grub_memmove (envp_current, envp, env_len + 1);
-+		envp = envp_current;
-+		break;
-+	      case '#':
-+		while (*envp != '\n')
-+		  {
-+		    envp++;
-+		    env_len--;
-+		  }
-+		if (!line_len)
-+		  envp++;
-+		grub_memmove (envp_current, envp, env_len + 1);
-+		envp = envp_current;
-+		break;
-+	      case '\n':
-+		if (!line_len)
-+		  {
-+		    env_len--;
-+		    grub_memmove (line_start, envp, env_len + 1);
-+		  }
-+		*(envp++) = '\0';
-+		line_len = 0;
-+		line_start = envp;
-+	      default:
-+		envp++;
-+		line_len++;
-+		break;
-+	    }
-+	}
-+
-+      buf_end = buf + env_len;
-+      *(buf_end++) = '\0';
-+    }
-+
-+  return buf_end;
-+}
-+
-+static u32_t *
-+kfreebsd_set_module_string (u32_t type, u32_t *dst, char *src)
-+{
-+  int size;
-+
-+  *(dst++) = type;
-+  *(dst++) = size = grub_strlen (src) + 1;
-+  grub_strcpy ((void *) dst, src);
-+
-+  return dst + (size + sizeof(u32_t) - 1) / sizeof(u32_t);
-+}
-+
-+static u32_t *
-+kfreebsd_set_module_var (u32_t type, u32_t *dst, u32_t src)
-+{
-+  *(dst++) = type;
-+  *(dst++) = sizeof(u32_t);
-+  *(dst++) = src;
-+
-+  return dst;
-+}
-+
-+static u32_t *
-+kfreebsd_set_modules (u32_t *modulep)
-+{
-+  /* XXX: Need to copy the whole module structure.  */
-+  /* XXX: How to pass the module name ?  */
-+
-+  return modulep;
-+}
- 
- /*
-  *  All "*_boot" commands depend on the images being loaded into memory
-@@ -877,7 +1010,10 @@
- bsd_boot (kernel_t type, int bootdev, char *arg)
- {
-   char *str;
--  int clval = 0, i;
-+  char *kernelname;
-+  char *bsd_root;
-+  int clval = 0;
-+  int i;
-   struct bootinfo bi;
- 
- #ifdef GRUB_UTIL
-@@ -886,8 +1022,21 @@
-   stop_floppy ();
- #endif
- 
-+  while (*arg != '/')
-+    arg++;
-+  kernelname = arg;
-+
-   while (*(++arg) && *arg != ' ');
-+  *(arg++) = 0;
-   str = arg;
-+
-+  bsd_root = grub_strstr (str, "root=");
-+  if (bsd_root)
-+    {
-+      bsd_root += 5;
-+      /* XXX: should copy the str or terminate it.  */
-+    }
-+
-   while (*str)
-     {
-       if (*str == '-')
-@@ -910,6 +1059,8 @@
- 		clval |= RB_GDB;
- 	      if (*str == 'h')
- 		clval |= RB_SERIAL;
-+	      if (*str == 'p')
-+		clval |= RB_PAUSE;
- 	      if (*str == 'm')
- 		clval |= RB_MUTE;
- 	      if (*str == 'r')
-@@ -927,14 +1078,17 @@
- 
-   if (type == KERNEL_TYPE_FREEBSD)
-     {
-+      char *envp;
-+      u32_t *modp;
-+
-       clval |= RB_BOOTINFO;
- 
-       bi.bi_version = BOOTINFO_VERSION;
- 
--      *arg = 0;
--      while ((--arg) > (char *) MB_CMDLINE_BUF && *arg != '/');
--      if (*arg == '/')
--	bi.bi_kernelname = arg + 1;
-+      bi.bi_pad[0] = bi.bi_pad[1] = 0;
-+
-+      if (*kernelname == '/')
-+	bi.bi_kernelname = kernelname;
-       else
- 	bi.bi_kernelname = 0;
- 
-@@ -961,6 +1115,30 @@
-       bi.bi_basemem = mbi.mem_lower;
-       bi.bi_extmem = extended_memory;
- 
-+      /* Setup the environment.  */
-+      bi.bi_envp = cur_addr = mem_align4k (cur_addr);
-+      grub_memset ((void *) cur_addr, 0, 2);
-+      cur_addr = (int) kfreebsd_read_hints ((void *) cur_addr);
-+
-+      envp = (char *) bi.bi_envp;
-+      kfreebsd_setenv (envp, "kernelname", kernelname);
-+      kfreebsd_setenv (envp, "vfs.root.mountfrom", bsd_root);
-+
-+      /* Setup the modules list.  */
-+      bi.bi_modulep = cur_addr = mem_align4k (cur_addr);
-+      modp = (u32_t *) bi.bi_modulep;
-+      /* The first module is the kernel.  */
-+      modp = kfreebsd_set_module_string (MODINFO_NAME, modp, kernelname);
-+      modp = kfreebsd_set_module_string (MODINFO_TYPE, modp, "elf kernel");
-+      modp = kfreebsd_set_module_string (MODINFO_ARGS, modp, arg);
-+      modp = kfreebsd_set_module_var (MODINFO_ADDR, modp, elf_kernel_addr);
-+      modp = kfreebsd_set_module_var (MODINFO_SIZE, modp, elf_kernel_size);
-+      /* Now the real modules.  */
-+      modp = kfreebsd_set_modules(modp);
-+
-+      /* Set the kernel end.  */
-+      bi.bi_kernend = cur_addr = mem_align4k (((int) modp) + 1);
-+
-       if (mbi.flags & MB_INFO_AOUT_SYMS)
- 	{
- 	  bi.bi_symtab = mbi.syms.a.addr;
-@@ -970,8 +1148,9 @@
- #if 0
-       else if (mbi.flags & MB_INFO_ELF_SHDR)
- 	{
--	  /* FIXME: Should check if a symbol table exists and, if exists,
--	     pass the table to BI.  */
-+	  bi.bi_symtab = mbi.syms.e.addr;
-+	  bi.bi_esymtab = mbi.syms.e.addr
-+	    + mbi.syms.e.size * mbi.syms.e.num * mbi.syms.e.shndx;
- 	}
- #endif
-       else
-diff -Naur grub-0.97.orig/stage2/builtins.c grub-0.97/stage2/builtins.c
---- grub-0.97.orig/stage2/builtins.c	2005-02-15 13:58:23.000000000 -0800
-+++ grub-0.97/stage2/builtins.c	2006-07-04 00:01:50.000000000 -0700
-@@ -28,6 +28,10 @@
- #include <filesys.h>
- #include <term.h>
- 
-+#ifdef SUPPORT_GRAPHICS
-+# include <graphics.h>
-+#endif
-+
- #ifdef SUPPORT_NETBOOT
- # define GRUB	1
- # include <etherboot.h>
-@@ -82,6 +86,10 @@
-    inside other functions.  */
- static int configfile_func (char *arg, int flags);
- 
-+static int savedefault_helper (char *arg, int flags);
-+
-+static int savedefault_shell (char *arg, int flags);
-+
- /* Initialize the data for builtins.  */
- void
- init_builtins (void)
-@@ -237,12 +245,22 @@
- static int
- boot_func (char *arg, int flags)
- {
-+  struct term_entry *prev_term = current_term;
-   /* Clear the int15 handler if we can boot the kernel successfully.
-      This assumes that the boot code never fails only if KERNEL_TYPE is
-      not KERNEL_TYPE_NONE. Is this assumption is bad?  */
-   if (kernel_type != KERNEL_TYPE_NONE)
-     unset_int15_handler ();
- 
-+  /* if our terminal needed initialization, we should shut it down
-+   * before booting the kernel, but we want to save what it was so
-+   * we can come back if needed */
-+  if (current_term->shutdown) 
-+    {
-+      current_term->shutdown();
-+      current_term = term_table; /* assumption: console is first */
-+    }
-+
- #ifdef SUPPORT_NETBOOT
-   /* Shut down the networking.  */
-   cleanup_net ();
-@@ -306,6 +324,13 @@
-       return 1;
-     }
- 
-+  /* if we get back here, we should go back to what our term was before */
-+  current_term = prev_term;
-+  if (current_term->startup)
-+      /* if our terminal fails to initialize, fall back to console since
-+       * it should always work */
-+      if (current_term->startup() == 0)
-+          current_term = term_table; /* we know that console is first */
-   return 0;
- }
- 
-@@ -852,6 +877,251 @@
- };
- #endif /* SUPPORT_NETBOOT */
- 
-+#ifdef SUPPORT_GRAPHICS
-+
-
-+static int splashimage_func(char *arg, int flags) {
-+  int i;
-+    
-+  /* filename can only be 256 characters due to our buffer size */
-+  if (grub_strlen(arg) > 256) {
-+    grub_printf("Splash image filename too large\n");
-+    grub_printf("Press any key to continue...");
-+    getkey();
-+    return 1;
-+  }
-+
-+  /* get rid of TERM_NEED_INIT from the graphics terminal. */
-+  for (i = 0; term_table[i].name; i++) {
-+    if (grub_strcmp (term_table[i].name, "graphics") == 0) {
-+      term_table[i].flags &= ~TERM_NEED_INIT;
-+      break;
-+    }
-+  }
-+
-+  graphics_set_splash(arg);
-+
-+  if (flags == BUILTIN_CMDLINE && graphics_inited) {
-+    graphics_end();
-+    if (graphics_init() == 0) {
-+      /* Fallback to default term */
-+      current_term = term_table;
-+      max_lines = current_term->max_lines;
-+      if (current_term->cls)
-+        current_term->cls();
-+      grub_printf("Failed to set splash image and/or graphics mode\n");
-+      return 1;
-+    }
-+    graphics_cls();
-+  }
-+
-+  if (flags == BUILTIN_MENU)
-+    current_term = term_table + i;
-+
-+  return 0;
-+}
-+
-+static struct builtin builtin_splashimage =
-+{
-+  "splashimage",
-+  splashimage_func,
-+  BUILTIN_CMDLINE | BUILTIN_MENU | BUILTIN_HELP_LIST,
-+  "splashimage FILE",
-+  "Load FILE as the background image when in graphics mode."
-+};
-+
-+
-
-+/* shade */
-+static int
-+shade_func(char *arg, int flags)
-+{
-+    int new_shade;
-+
-+    if (!arg || safe_parse_maxint(&arg, &new_shade) == 0)
-+       return (1);
-+
-+    if (shade != new_shade) {
-+       shade = new_shade;
-+       if (flags == BUILTIN_CMDLINE && graphics_inited) {
-+           graphics_end();
-+           graphics_init();
-+           graphics_cls();
-+       }
-+    }
-+
-+    return 0;
-+}
-+
-+static struct builtin builtin_shade =
-+{
-+  "shade",
-+  shade_func,
-+  BUILTIN_CMDLINE | BUILTIN_MENU | BUILTIN_HELP_LIST,
-+  "shade INTEGER",
-+  "If set to 0, disables the use of shaded text, else enables it."
-+};
-+
-+
-
-+/* foreground */
-+static int
-+foreground_func(char *arg, int flags)
-+{
-+    if (grub_strlen(arg) == 6) {
-+	int r = ((hex(arg[0]) << 4) | hex(arg[1])) >> 2;
-+	int g = ((hex(arg[2]) << 4) | hex(arg[3])) >> 2;
-+	int b = ((hex(arg[4]) << 4) | hex(arg[5])) >> 2;
-+
-+	foreground = (r << 16) | (g << 8) | b;
-+	if (graphics_inited)
-+	    graphics_set_palette(15, r, g, b);
-+
-+	return 0;
-+    }
-+
-+    return 1;
-+}
-+
-+static struct builtin builtin_foreground =
-+{
-+  "foreground",
-+  foreground_func,
-+  BUILTIN_CMDLINE | BUILTIN_MENU | BUILTIN_HELP_LIST,
-+  "foreground RRGGBB",
-+  "Sets the foreground color when in graphics mode."
-+  "RR is red, GG is green, and BB blue. Numbers must be in hexadecimal."
-+};
-+
-+
-
-+/* background */
-+static int
-+background_func(char *arg, int flags)
-+{
-+    if (grub_strlen(arg) == 6) {
-+	int r = ((hex(arg[0]) << 4) | hex(arg[1])) >> 2;
-+	int g = ((hex(arg[2]) << 4) | hex(arg[3])) >> 2;
-+	int b = ((hex(arg[4]) << 4) | hex(arg[5])) >> 2;
-+
-+	background = (r << 16) | (g << 8) | b;
-+	if (graphics_inited)
-+	    graphics_set_palette(0, r, g, b);
-+	return 0;
-+    }
-+
-+    return 1;
-+}
-+
-+static struct builtin builtin_background =
-+{
-+  "background",
-+  background_func,
-+  BUILTIN_CMDLINE | BUILTIN_MENU | BUILTIN_HELP_LIST,
-+  "background RRGGBB",
-+  "Sets the background color when in graphics mode."
-+  "RR is red, GG is green, and BB blue. Numbers must be in hexadecimal."
-+};
-+
-+
-
-+/* border */
-+static int
-+border_func(char *arg, int flags)
-+{
-+    if (grub_strlen(arg) == 6) {
-+       int r = ((hex(arg[0]) << 4) | hex(arg[1])) >> 2;
-+       int g = ((hex(arg[2]) << 4) | hex(arg[3])) >> 2;
-+       int b = ((hex(arg[4]) << 4) | hex(arg[5])) >> 2;
-+
-+       window_border = (r << 16) | (g << 8) | b;
-+       if (graphics_inited)
-+           graphics_set_palette(0x11, r, g, b);
-+
-+       return 0;
-+    }
-+
-+    return 1;
-+}
-+
-+static struct builtin builtin_border =
-+{
-+  "border",
-+  border_func,
-+  BUILTIN_CMDLINE | BUILTIN_MENU | BUILTIN_HELP_LIST,
-+  "border RRGGBB",
-+  "Sets the border video color when in graphics mode."
-+  "RR is red, GG is green, and BB blue. Numbers must be in hexadecimal."
-+};
-+
-+
-
-+/* viewport */
-+static int
-+viewport_func (char *arg, int flags)
-+{
-+    int i;
-+    int x0 = 0, y0 = 0, x1 = 80, y1 = 30;
-+    int *pos[4] = { &x0, &y0, &x1, &y1 };
-+
-+    if (!arg)
-+       return (1);
-+    for (i = 0; i < 4; i++) {
-+       if (!*arg)
-+           return (1);
-+    while (*arg && (*arg == ' ' || *arg == '\t'))
-+           ++arg;
-+       if (!safe_parse_maxint(&arg, pos[i]))
-+           return (1);
-+       while (*arg && (*arg != ' ' && *arg != '\t'))
-+           ++arg;
-+    }
-+
-+    /* minimum size is 65 colums and 16 rows */
-+    if (x0 > x1 - 66 || y0 > y1 - 16 || x0 < 0 || y0 < 0 || x1 > 80 || y1 > 30)
-+       return 1;
-+
-+    view_x0 = x0;
-+    view_y0 = y0;
-+    view_x1 = x1;
-+    view_y1 = y1;
-+
-+    if (flags == BUILTIN_CMDLINE && graphics_inited) {
-+       graphics_end();
-+       graphics_init();
-+       graphics_cls();
-+    }
-+
-+    return 0;
-+}
-+
-+static struct builtin builtin_viewport =
-+{
-+  "viewport",
-+  viewport_func,
-+  BUILTIN_CMDLINE | BUILTIN_MENU | BUILTIN_HELP_LIST,
-+  "viewport x0 y0 x1 y1",
-+  "Changes grub internals to output text in the window defined by"
-+  " four parameters. The x and y parameters are 0 based. This option"
-+  " only works with the graphics interface."
-+};
-+
-+#endif /* SUPPORT_GRAPHICS */
-+
-+
-
-+/* clear */
-+static int 
-+clear_func() 
-+{
-+  if (current_term->cls)
-+    current_term->cls();
-+
-+  return 0;
-+}
-+
-+static struct builtin builtin_clear =
-+{
-+  "clear",
-+  clear_func,
-+  BUILTIN_CMDLINE | BUILTIN_HELP_LIST,
-+  "clear",
-+  "Clear the screen"
-+};
-+
- 
-
- /* displayapm */
- static int
-@@ -1454,14 +1724,20 @@
- 
- 
-
- /* help */
--#define MAX_SHORT_DOC_LEN	39
--#define MAX_LONG_DOC_LEN	66
--
- static int
- help_func (char *arg, int flags)
- {
--  int all = 0;
--  
-+  int all = 0, max_short_doc_len, max_long_doc_len;
-+  max_short_doc_len = 39;
-+  max_long_doc_len = 66;
-+#ifdef SUPPORT_GRAPHICS
-+  if (grub_memcmp (current_term->name, "graphics", sizeof ("graphics") - 1) == 0)
-+    {
-+      max_short_doc_len = (view_x1 - view_x0 + 1) / 2 - 1;
-+      max_long_doc_len = (view_x1 - view_x0) - 14;
-+    }
-+#endif
-+
-   if (grub_memcmp (arg, "--all", sizeof ("--all") - 1) == 0)
-     {
-       all = 1;
-@@ -1491,13 +1767,13 @@
- 
- 	  len = grub_strlen ((*builtin)->short_doc);
- 	  /* If the length of SHORT_DOC is too long, truncate it.  */
--	  if (len > MAX_SHORT_DOC_LEN - 1)
--	    len = MAX_SHORT_DOC_LEN - 1;
-+	  if (len > max_short_doc_len - 1)
-+	    len = max_short_doc_len - 1;
- 
- 	  for (i = 0; i < len; i++)
- 	    grub_putchar ((*builtin)->short_doc[i]);
- 
--	  for (; i < MAX_SHORT_DOC_LEN; i++)
-+	  for (; i < max_short_doc_len; i++)
- 	    grub_putchar (' ');
- 
- 	  if (! left)
-@@ -1546,10 +1822,10 @@
- 		      int i;
- 
- 		      /* If LEN is too long, fold DOC.  */
--		      if (len > MAX_LONG_DOC_LEN)
-+		      if (len > max_long_doc_len)
- 			{
- 			  /* Fold this line at the position of a space.  */
--			  for (len = MAX_LONG_DOC_LEN; len > 0; len--)
-+			  for (len = max_long_doc_len; len > 0; len--)
- 			    if (doc[len - 1] == ' ')
- 			      break;
- 			}
-@@ -2323,6 +2599,25 @@
-   "Probe I/O ports used for the drive DRIVE."
- };
- 
-+/* print */
-+static int
-+print_func (char *arg, int flags)
-+{
-+  printf("%s\n", arg);
-+
-+  return 0;
-+}
-+
-+static struct builtin builtin_print =
-+{
-+  "print",
-+  print_func,
-+  BUILTIN_CMDLINE | BUILTIN_MENU | BUILTIN_NO_ECHO,
-+  "print [MESSAGE ...]",
-+  "Print MESSAGE."
-+};
-+
-+
- 
-
- /* kernel */
- static int
-@@ -3221,7 +3516,102 @@
- static int
- savedefault_func (char *arg, int flags)
- {
--#if !defined(SUPPORT_DISKLESS) && !defined(GRUB_UTIL)
-+#if !defined(SUPPORT_DISKLESS)
-+  #if !defined(GRUB_UTIL)
-+	savedefault_helper(arg, flags);
-+  #else
-+	savedefault_shell(arg, flags);
-+  #endif
-+#else /* !SUPPORT_DISKLESS */ 
-+  errnum = ERR_UNRECOGNIZED;
-+  return 1;
-+#endif /* !SUPPORT_DISKLESS */
-+}
-+
-+#if !defined(SUPPORT_DISKLESS) && defined(GRUB_UTIL)
-+/* savedefault_shell */
-+static int
-+savedefault_shell(char *arg, int flags)
-+ {
-+  int once_only = 0;
-+  int new_default;
-+  int curr_default = -1;
-+  int curr_prev_default = -1;
-+  int new_prev_default = -1;
-+  FILE *fp;
-+  size_t bytes = 10;
-+  char line[bytes];
-+  char *default_file = (char *) DEFAULT_FILE_BUF;
-+  char buf[bytes];
-+  int i;
-+  
-+  while (1)
-+    {
-+      if (grub_memcmp ("--default=", arg, sizeof ("--default=") - 1) == 0)
-+        {
-+          char *p = arg + sizeof ("--default=") - 1;
-+          if (! safe_parse_maxint (&p, &new_default))
-+            return 1;
-+          arg = skip_to (0, arg);
-+        }
-+      else if (grub_memcmp ("--once", arg, sizeof ("--once") - 1) == 0)
-+        {
-+         once_only = 1;
-+         arg = skip_to (0, arg);
-+	}
-+      else
-+        break;
-+    }
-+
-+  *default_file = 0;
-+  grub_strncat (default_file, config_file, DEFAULT_FILE_BUFLEN);
-+  for (i = grub_strlen(default_file); i >= 0; i--)
-+    if (default_file[i] == '/')
-+    {
-+      i++;
-+      break;
-+    }
-+  default_file[i] = 0;
-+  grub_strncat (default_file + i, "default", DEFAULT_FILE_BUFLEN - i);
-+
-+  if(!(fp = fopen(default_file,"w")))
-+    {
-+      errnum = ERR_READ;
-+      goto fail;
-+    }
-+  
-+  read(&line, -1);
-+    
-+  sscanf(line, "%d:%d", &curr_prev_default, &curr_default);
-+     
-+  if(curr_default != -1)
-+    new_prev_default = curr_default;
-+  else
-+    {
-+      if(curr_prev_default != -1)
-+        new_prev_default = curr_prev_default;
-+      else
-+        new_prev_default = 0;
-+    }
-+     
-+  if(once_only)
-+    sprintf(buf, "%d:%d\n", new_prev_default, new_default);
-+  else
-+    sprintf(buf, "%d\n", new_default);
-+     
-+  fprintf(fp, buf);   
-+     
-+fail:
-+  fclose(fp);
-+  return errnum;
-+}
-+#endif
-+
-+/* savedefault_helper */
-+static int
-+savedefault_helper (char *arg, int flags)
-+{
-+#if !defined(SUPPORT_DISKLESS)
-   unsigned long tmp_drive = saved_drive;
-   unsigned long tmp_partition = saved_partition;
-   char *default_file = (char *) DEFAULT_FILE_BUF;
-@@ -3300,19 +3690,23 @@
-       disk_read_hook = 0;
-       grub_close ();
-       
--      if (len != sizeof (buf))
--	{
--	  /* This is too small. Do not modify the file manually, please!  */
--	  errnum = ERR_READ;
--	  goto fail;
--	}
--
-       if (sector_count > 2)
- 	{
- 	  /* Is this possible?! Too fragmented!  */
- 	  errnum = ERR_FSYS_CORRUPT;
- 	  goto fail;
- 	}
-+
-+      char *tmp;
-+      if((tmp = grub_strstr(buf, ":")) != NULL)
-+      {
-+       int f_len = grub_strlen(buf) - grub_strlen(tmp);
-+       char *def;
-+       int a;
-+       for(a = 0; a < f_len; a++)
-+         grub_memcpy(&def[a], &buf[a], sizeof(char));
-+       safe_parse_maxint (&def, &entryno);
-+      }
-       
-       /* Set up a string to be written.  */
-       grub_memset (buf, '\n', sizeof (buf));
-@@ -3830,15 +4224,15 @@
- 	{
- 	  char tmp[16];
- 	  grub_sprintf (tmp, ",%d", (partition >> 16) & 0xFF);
--	  grub_strncat (device, tmp, 256);
-+	  grub_strncat (device, tmp, sizeof (device));
- 	}
-       if ((partition & 0x00FF00) != 0x00FF00)
- 	{
- 	  char tmp[16];
- 	  grub_sprintf (tmp, ",%c", 'a' + ((partition >> 8) & 0xFF));
--	  grub_strncat (device, tmp, 256);
-+	  grub_strncat (device, tmp, sizeof (device));
- 	}
--      grub_strncat (device, ")", 256);
-+      grub_strncat (device, ")", sizeof (device));
-     }
-   
-   int embed_stage1_5 (char *stage1_5, int drive, int partition)
-@@ -4085,7 +4479,7 @@
- };
- 
- 
-
--#if defined(SUPPORT_SERIAL) || defined(SUPPORT_HERCULES)
-+#if defined(SUPPORT_SERIAL) || defined(SUPPORT_HERCULES) || defined(SUPPORT_GRAPHICS)
- /* terminal */
- static int
- terminal_func (char *arg, int flags)
-@@ -4244,17 +4638,29 @@
-  end:
-   current_term = term_table + default_term;
-   current_term->flags = term_flags;
--  
-+
-   if (lines)
-     max_lines = lines;
-   else
--    /* 24 would be a good default value.  */
--    max_lines = 24;
--  
-+    max_lines = current_term->max_lines;
-+
-   /* If the interface is currently the command-line,
-      restart it to repaint the screen.  */
--  if (current_term != prev_term && (flags & BUILTIN_CMDLINE))
-+  if ((current_term != prev_term) && (flags & BUILTIN_CMDLINE)){
-+    if (prev_term->shutdown)
-+      prev_term->shutdown();
-+    if (current_term->startup) {
-+      /* If startup fails, return to previous term */
-+      if (current_term->startup() == 0) {
-+        current_term = prev_term;
-+        max_lines = current_term->max_lines;
-+        if (current_term->cls) {
-+          current_term->cls();
-+        }
-+      }
-+    }
-     grub_longjmp (restart_cmdline_env, 0);
-+  }
-   
-   return 0;
- }
-@@ -4264,7 +4670,7 @@
-   "terminal",
-   terminal_func,
-   BUILTIN_MENU | BUILTIN_CMDLINE | BUILTIN_HELP_LIST,
--  "terminal [--dumb] [--no-echo] [--no-edit] [--timeout=SECS] [--lines=LINES] [--silent] [console] [serial] [hercules]",
-+  "terminal [--dumb] [--no-echo] [--no-edit] [--timeout=SECS] [--lines=LINES] [--silent] [console] [serial] [hercules] [graphics]",
-   "Select a terminal. When multiple terminals are specified, wait until"
-   " you push any key to continue. If both console and serial are specified,"
-   " the terminal to which you input a key first will be selected. If no"
-@@ -4276,7 +4682,7 @@
-   " seconds. The option --lines specifies the maximum number of lines."
-   " The option --silent is used to suppress messages."
- };
--#endif /* SUPPORT_SERIAL || SUPPORT_HERCULES */
-+#endif /* SUPPORT_SERIAL || SUPPORT_HERCULES || SUPPORT_GRAPHICS */
- 
- 
-
- #ifdef SUPPORT_SERIAL
-@@ -4795,13 +5201,20 @@
- /* The table of builtin commands. Sorted in dictionary order.  */
- struct builtin *builtin_table[] =
- {
-+#ifdef SUPPORT_GRAPHICS
-+  &builtin_background,
-+#endif
-   &builtin_blocklist,
-   &builtin_boot,
- #ifdef SUPPORT_NETBOOT
-   &builtin_bootp,
- #endif /* SUPPORT_NETBOOT */
-+#ifdef SUPPORT_GRAPHICS
-+  &builtin_border,
-+#endif
-   &builtin_cat,
-   &builtin_chainloader,
-+  &builtin_clear,
-   &builtin_cmp,
-   &builtin_color,
-   &builtin_configfile,
-@@ -4821,6 +5234,9 @@
-   &builtin_embed,
-   &builtin_fallback,
-   &builtin_find,
-+#ifdef SUPPORT_GRAPHICS
-+  &builtin_foreground,
-+#endif
-   &builtin_fstest,
-   &builtin_geometry,
-   &builtin_halt,
-@@ -4848,6 +5264,7 @@
-   &builtin_parttype,
-   &builtin_password,
-   &builtin_pause,
-+  &builtin_print,
- #ifdef GRUB_UTIL
-   &builtin_quit,
- #endif /* GRUB_UTIL */
-@@ -4864,9 +5281,13 @@
- #endif /* SUPPORT_SERIAL */
-   &builtin_setkey,
-   &builtin_setup,
--#if defined(SUPPORT_SERIAL) || defined(SUPPORT_HERCULES)
-+#ifdef SUPPORT_GRAPHICS
-+  &builtin_shade,
-+  &builtin_splashimage,
-+#endif /* SUPPORT_GRAPHICS */
-+#if defined(SUPPORT_SERIAL) || defined(SUPPORT_HERCULES) || defined(SUPPORT_GRAPHICS)
-   &builtin_terminal,
--#endif /* SUPPORT_SERIAL || SUPPORT_HERCULES */
-+#endif /* SUPPORT_SERIAL || SUPPORT_HERCULES || SUPPORT_GRAPHICS */
- #ifdef SUPPORT_SERIAL
-   &builtin_terminfo,
- #endif /* SUPPORT_SERIAL */
-@@ -4880,5 +5301,8 @@
-   &builtin_unhide,
-   &builtin_uppermem,
-   &builtin_vbeprobe,
-+#ifdef SUPPORT_GRAPHICS
-+  &builtin_viewport,
-+#endif
-   0
- };
-diff -Naur grub-0.97.orig/stage2/char_io.c grub-0.97/stage2/char_io.c
---- grub-0.97.orig/stage2/char_io.c	2005-02-01 12:51:23.000000000 -0800
-+++ grub-0.97/stage2/char_io.c	2006-07-03 23:59:27.000000000 -0700
-@@ -29,12 +29,17 @@
- # include <serial.h>
- #endif
- 
-+#ifdef SUPPORT_GRAPHICS
-+# include <graphics.h>
-+#endif
-+
- #ifndef STAGE1_5
- struct term_entry term_table[] =
-   {
-     {
-       "console",
-       0,
-+      24,
-       console_putchar,
-       console_checkkey,
-       console_getkey,
-@@ -43,13 +48,16 @@
-       console_cls,
-       console_setcolorstate,
-       console_setcolor,
--      console_setcursor
-+      console_setcursor,
-+      0, 
-+      0
-     },
- #ifdef SUPPORT_SERIAL
-     {
-       "serial",
-       /* A serial device must be initialized.  */
-       TERM_NEED_INIT,
-+      24,
-       serial_putchar,
-       serial_checkkey,
-       serial_getkey,
-@@ -58,6 +66,8 @@
-       serial_cls,
-       serial_setcolorstate,
-       0,
-+      0,
-+      0, 
-       0
-     },
- #endif /* SUPPORT_SERIAL */
-@@ -65,6 +75,7 @@
-     {
-       "hercules",
-       0,
-+      24,
-       hercules_putchar,
-       console_checkkey,
-       console_getkey,
-@@ -73,11 +84,30 @@
-       hercules_cls,
-       hercules_setcolorstate,
-       hercules_setcolor,
--      hercules_setcursor
-+      hercules_setcursor,
-+      0,
-+      0
-     },      
- #endif /* SUPPORT_HERCULES */
-+#ifdef SUPPORT_GRAPHICS
-+    { "graphics",
-+      TERM_NEED_INIT, /* flags */
-+      30, /* number of lines */
-+      graphics_putchar, /* putchar */
-+      console_checkkey, /* checkkey */
-+      console_getkey, /* getkey */
-+      graphics_getxy, /* getxy */
-+      graphics_gotoxy, /* gotoxy */
-+      graphics_cls, /* cls */
-+      graphics_setcolorstate, /* setcolorstate */
-+      graphics_setcolor, /* setcolor */
-+      graphics_setcursor, /* nocursor */
-+      graphics_init, /* initialize */
-+      graphics_end /* shutdown */
-+    },
-+#endif /* SUPPORT_GRAPHICS */
-     /* This must be the last entry.  */
--    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
-+    { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
-   };
- 
- /* This must be console.  */
-@@ -305,9 +335,10 @@
- 
-   /* XXX: These should be defined in shared.h, but I leave these here,
-      until this code is freezed.  */
--#define CMDLINE_WIDTH	78
- #define CMDLINE_MARGIN	10
--  
-+
-+  /* command-line limits */
-+  int cmdline_width = 78, col_start = 0;
-   int xpos, lpos, c, section;
-   /* The length of PROMPT.  */
-   int plen;
-@@ -338,7 +369,7 @@
-       
-       /* If the cursor is in the first section, display the first section
- 	 instead of the second.  */
--      if (section == 1 && plen + lpos < CMDLINE_WIDTH)
-+      if (section == 1 && plen + lpos < cmdline_width)
- 	cl_refresh (1, 0);
-       else if (xpos - count < 1)
- 	cl_refresh (1, 0);
-@@ -354,7 +385,7 @@
- 		grub_putchar ('\b');
- 	    }
- 	  else
--	    gotoxy (xpos, getxy () & 0xFF);
-+	    gotoxy (xpos + col_start, getxy () & 0xFF);
- 	}
-     }
- 
-@@ -364,7 +395,7 @@
-       lpos += count;
- 
-       /* If the cursor goes outside, scroll the screen to the right.  */
--      if (xpos + count >= CMDLINE_WIDTH)
-+      if (xpos + count >= cmdline_width)
- 	cl_refresh (1, 0);
-       else
- 	{
-@@ -383,7 +414,7 @@
- 		}
- 	    }
- 	  else
--	    gotoxy (xpos, getxy () & 0xFF);
-+	    gotoxy (xpos + col_start, getxy () & 0xFF);
- 	}
-     }
- 
-@@ -398,14 +429,14 @@
-       if (full)
- 	{
- 	  /* Recompute the section number.  */
--	  if (lpos + plen < CMDLINE_WIDTH)
-+	  if (lpos + plen < cmdline_width)
- 	    section = 0;
- 	  else
--	    section = ((lpos + plen - CMDLINE_WIDTH)
--		       / (CMDLINE_WIDTH - 1 - CMDLINE_MARGIN) + 1);
-+	    section = ((lpos + plen - cmdline_width)
-+		       / (cmdline_width - 1 - CMDLINE_MARGIN) + 1);
- 
- 	  /* From the start to the end.  */
--	  len = CMDLINE_WIDTH;
-+	  len = cmdline_width;
- 	  pos = 0;
- 	  grub_putchar ('\r');
- 
-@@ -445,8 +476,8 @@
- 	  if (! full)
- 	    offset = xpos - 1;
- 	  
--	  start = ((section - 1) * (CMDLINE_WIDTH - 1 - CMDLINE_MARGIN)
--		   + CMDLINE_WIDTH - plen - CMDLINE_MARGIN);
-+	  start = ((section - 1) * (cmdline_width - 1 - CMDLINE_MARGIN)
-+		   + cmdline_width - plen - CMDLINE_MARGIN);
- 	  xpos = lpos + 1 - start;
- 	  start += offset;
- 	}
-@@ -471,7 +502,7 @@
-       
-       /* If the cursor is at the last position, put `>' or a space,
- 	 depending on if there are more characters in BUF.  */
--      if (pos == CMDLINE_WIDTH)
-+      if (pos == cmdline_width)
- 	{
- 	  if (start + len < llen)
- 	    grub_putchar ('>');
-@@ -488,7 +519,7 @@
- 	    grub_putchar ('\b');
- 	}
-       else
--	gotoxy (xpos, getxy () & 0xFF);
-+	gotoxy (xpos + col_start, getxy () & 0xFF);
-     }
- 
-   /* Initialize the command-line.  */
-@@ -518,10 +549,10 @@
- 	  
- 	  llen += l;
- 	  lpos += l;
--	  if (xpos + l >= CMDLINE_WIDTH)
-+	  if (xpos + l >= cmdline_width)
- 	    cl_refresh (1, 0);
--	  else if (xpos + l + llen - lpos > CMDLINE_WIDTH)
--	    cl_refresh (0, CMDLINE_WIDTH - xpos);
-+	  else if (xpos + l + llen - lpos > cmdline_width)
-+	    cl_refresh (0, cmdline_width - xpos);
- 	  else
- 	    cl_refresh (0, l + llen - lpos);
- 	}
-@@ -533,12 +564,22 @@
-       grub_memmove (buf + lpos, buf + lpos + count, llen - count + 1);
-       llen -= count;
-       
--      if (xpos + llen + count - lpos > CMDLINE_WIDTH)
--	cl_refresh (0, CMDLINE_WIDTH - xpos);
-+      if (xpos + llen + count - lpos > cmdline_width)
-+	cl_refresh (0, cmdline_width - xpos);
-       else
- 	cl_refresh (0, llen + count - lpos);
-     }
- 
-+  max_lines = current_term->max_lines;
-+#ifdef SUPPORT_GRAPHICS
-+  if (grub_memcmp (current_term->name, "graphics", sizeof ("graphics") - 1) == 0)
-+    {
-+      cmdline_width = (view_x1 - view_x0) - 2;
-+      col_start = view_x0;
-+      max_lines = view_y1 - view_y0;
-+    }
-+#endif
-+
-   plen = grub_strlen (prompt);
-   llen = grub_strlen (cmdline);
- 
-@@ -1006,6 +1047,48 @@
- }
- #endif /* ! STAGE1_5 */
- 
-+#ifndef STAGE1_5
-+/* Internal pager.  */
-+int
-+do_more (void)
-+{
-+  if (count_lines >= 0)
-+    {
-+      count_lines++;
-+      if (count_lines >= max_lines - 2)
-+        {
-+          int tmp;
-+
-+          /* It's important to disable the feature temporarily, because
-+             the following grub_printf call will print newlines.  */
-+          count_lines = -1;
-+
-+          grub_printf("\n");
-+          if (current_term->setcolorstate)
-+            current_term->setcolorstate (COLOR_STATE_HIGHLIGHT);
-+
-+          grub_printf ("[Hit return to continue]");
-+
-+          if (current_term->setcolorstate)
-+            current_term->setcolorstate (COLOR_STATE_NORMAL);
-+
-+
-+          do
-+            {
-+              tmp = ASCII_CHAR (getkey ());
-+            }
-+          while (tmp != '\n' && tmp != '\r');
-+          grub_printf ("\r                        \r");
-+
-+          /* Restart to count lines.  */
-+          count_lines = 0;
-+          return 1;
-+        }
-+    }
-+  return 0;
-+}
-+#endif
-+
- /* Display an ASCII character.  */
- void
- grub_putchar (int c)
-@@ -1034,38 +1117,11 @@
- 
-   if (c == '\n')
-     {
-+      int flag;
-       /* Internal `more'-like feature.  */
--      if (count_lines >= 0)
--	{
--	  count_lines++;
--	  if (count_lines >= max_lines - 2)
--	    {
--	      int tmp;
--	      
--	      /* It's important to disable the feature temporarily, because
--		 the following grub_printf call will print newlines.  */
--	      count_lines = -1;
--
--	      if (current_term->setcolorstate)
--		current_term->setcolorstate (COLOR_STATE_HIGHLIGHT);
--	      
--	      grub_printf ("\n[Hit return to continue]");
--
--	      if (current_term->setcolorstate)
--		current_term->setcolorstate (COLOR_STATE_NORMAL);
--	      
--	      do
--		{
--		  tmp = ASCII_CHAR (getkey ());
--		}
--	      while (tmp != '\n' && tmp != '\r');
--	      grub_printf ("\r                        \r");
--	      
--	      /* Restart to count lines.  */
--	      count_lines = 0;
--	      return;
--	    }
--	}
-+      flag = do_more ();
-+      if (flag)
-+        return;
-     }
- 
-   current_term->putchar (c);
-@@ -1090,7 +1146,7 @@
- cls (void)
- {
-   /* If the terminal is dumb, there is no way to clean the terminal.  */
--  if (current_term->flags & TERM_DUMB)
-+  if (current_term->flags & TERM_DUMB) 
-     grub_putchar ('\n');
-   else
-     current_term->cls ();
-@@ -1175,13 +1231,13 @@
- #endif /* ! STAGE1_5 */
- 
- int
--memcheck (int addr, int len)
-+memcheck (unsigned long int addr, unsigned long int len)
- {
- #ifdef GRUB_UTIL
--  auto int start_addr (void);
--  auto int end_addr (void);
-+  auto unsigned long int start_addr (void);
-+  auto int unsigned long end_addr (void);
-   
--  auto int start_addr (void)
-+  auto unsigned long int start_addr (void)
-     {
-       int ret;
- # if defined(HAVE_START_SYMBOL)
-@@ -1192,7 +1248,7 @@
-       return ret;
-     }
- 
--  auto int end_addr (void)
-+  auto unsigned long int end_addr (void)
-     {
-       int ret;
- # if defined(HAVE_END_SYMBOL)
-@@ -1217,6 +1273,16 @@
-   return ! errnum;
- }
- 
-+void
-+grub_memcpy(void *dest, const void *src, int len)
-+{
-+  int i;
-+  register char *d = (char*)dest, *s = (char*)src;
-+
-+  for (i = 0; i < len; i++)
-+    d[i] = s[i];
-+}
-+
- void *
- grub_memmove (void *to, const void *from, int len)
- {
-diff -Naur grub-0.97.orig/stage2/cmdline.c grub-0.97/stage2/cmdline.c
---- grub-0.97.orig/stage2/cmdline.c	2004-08-16 16:23:01.000000000 -0700
-+++ grub-0.97/stage2/cmdline.c	2006-07-03 23:58:41.000000000 -0700
-@@ -50,10 +50,11 @@
- void
- print_cmdline_message (int forever)
- {
--  printf (" [ Minimal BASH-like line editing is supported.  For the first word, TAB\n"
--	  "   lists possible command completions.  Anywhere else TAB lists the possible\n"
--	  "   completions of a device/filename.%s ]\n",
--	  (forever ? "" : "  ESC at any time exits."));
-+  grub_printf("       [ Minimal BASH-like line editing is supported.   For\n"
-+              "         the   first   word,  TAB  lists  possible  command\n"
-+              "         completions.  Anywhere else TAB lists the possible\n"
-+              "         completions of a device/filename.%s ]\n",
-+              (forever ? "" : "  ESC at any time\n         exits."));
- }
- 
- /* Find the builtin whose command name is COMMAND and return the
-diff -Naur grub-0.97.orig/stage2/freebsd.h grub-0.97/stage2/freebsd.h
---- grub-0.97.orig/stage2/freebsd.h	2003-07-09 04:45:52.000000000 -0700
-+++ grub-0.97/stage2/freebsd.h	2006-07-03 23:59:36.000000000 -0700
-@@ -1,7 +1,7 @@
- 
- /*
-  *  GRUB  --  GRand Unified Bootloader
-- *  Copyright (C) 2001  Free Software Foundation, Inc.
-+ *  Copyright (C) 2001, 2004  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
-@@ -35,6 +35,10 @@
- #define RB_CDROM        0x2000	/* use cdrom as root */
- #define RB_GDB		0x8000	/* use GDB remote debugger instead of DDB */
- #define RB_MUTE		0x10000	/* Come up with the console muted */
-+#define RB_SELFTEST	0x20000 /* don't complete the boot; do selftest */
-+#define RB_RESERVED1	0x40000 /* reserved for internal use of boot blocks */
-+#define RB_RESERVED2	0x80000 /* reserved for internal use of boot blocks */
-+#define RB_PAUSE	0x100000 /* pause after each output line during probe */
- #define RB_MULTIPLE	0x20000000	/* Use multiple consoles */
- 
- #define RB_BOOTINFO     0x80000000	/* have `struct bootinfo *' arg */
-@@ -70,6 +74,9 @@
- 
- #define N_BIOS_GEOM             8
- 
-+typedef unsigned char u8_t;
-+typedef unsigned int u32_t;
-+
- /*
-  * A zero bootinfo field often means that there is no info available.
-  * Flags are used to indicate the validity of fields where zero is a
-@@ -77,19 +84,33 @@
-  */
- struct bootinfo
-   {
--    unsigned int bi_version;
--    unsigned char *bi_kernelname;
--    struct nfs_diskless *bi_nfs_diskless;
-+    u32_t bi_version;
-+    u8_t *bi_kernelname;
-+    u32_t bi_nfs_diskless;
-     /* End of fields that are always present. */
- #define bi_endcommon            bi_n_bios_used
--    unsigned int bi_n_bios_used;
--    unsigned long bi_bios_geom[N_BIOS_GEOM];
--    unsigned int bi_size;
--    unsigned char bi_memsizes_valid;
--    unsigned char bi_bios_dev;
--    unsigned char bi_pad[2];
--    unsigned long bi_basemem;
--    unsigned long bi_extmem;
--    unsigned long bi_symtab;
--    unsigned long bi_esymtab;
-+    u32_t bi_n_bios_used;
-+    u32_t bi_bios_geom[N_BIOS_GEOM];
-+    u32_t bi_size;
-+    u8_t bi_memsizes_valid;
-+    u8_t bi_bios_dev;
-+    u8_t bi_pad[2];
-+    u32_t bi_basemem;
-+    u32_t bi_extmem;
-+    u32_t bi_symtab;
-+    u32_t bi_esymtab;
-+    /* Items below only from advanced bootloader */
-+    u32_t bi_kernend;
-+    u32_t bi_envp;
-+    u32_t bi_modulep;
-   };
-+
-+#define MODINFO_END		0x0000		/* End of list */
-+#define MODINFO_NAME		0x0001		/* Name of module (string) */
-+#define MODINFO_TYPE		0x0002		/* Type of module (string) */
-+#define MODINFO_ADDR		0x0003		/* Loaded address */
-+#define MODINFO_SIZE		0x0004		/* Size of module */
-+#define MODINFO_EMPTY		0x0005		/* Has been deleted */
-+#define MODINFO_ARGS		0x0006		/* Parameters string */
-+#define MODINFO_METADATA	0x8000		/* Module-specfic */
-+
-diff -Naur grub-0.97.orig/stage2/graphics.c grub-0.97/stage2/graphics.c
---- grub-0.97.orig/stage2/graphics.c	1969-12-31 16:00:00.000000000 -0800
-+++ grub-0.97/stage2/graphics.c	2006-07-03 23:58:41.000000000 -0700
-@@ -0,0 +1,585 @@
-+/*
-+ * graphics.c - graphics mode support for GRUB
-+ * Implemented as a terminal type by Jeremy Katz <katzj@redhat.com> based
-+ * on a patch by Paulo César Pereira de Andrade <pcpa@conectiva.com.br>
-+ * Options and enhancements made by Herton Ronaldo Krzesinski
-+ * <herton@mandriva.com>
-+ *
-+ *  GRUB  --  GRand Unified Bootloader
-+ *  Copyright (C) 2001,2002  Red Hat, Inc.
-+ *  Portions copyright (C) 2000  Conectiva, 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
-+ *  the Free Software Foundation; either version 2 of the License, or
-+ *  (at your option) any later version.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with this program; if not, write to the Free Software
-+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ */
-+
-+#ifdef SUPPORT_GRAPHICS
-+
-+#include <term.h>
-+#include <shared.h>
-+#include <graphics.h>
-+
-+int saved_videomode;
-+unsigned char *font8x16;
-+
-+int graphics_inited = 0;
-+static char splashimage[256];
-+
-+int shade = 1, no_cursor = 0;
-+
-+#define VSHADOW VSHADOW1
-+unsigned char VSHADOW1[38400];
-+unsigned char VSHADOW2[38400];
-+unsigned char VSHADOW4[38400];
-+unsigned char VSHADOW8[38400];
-+
-+/* define the default viewable area */
-+int view_x0 = 0;
-+int view_y0 = 0;
-+int view_x1 = 80;
-+int view_y1 = 30;
-+
-+/* text buffer has to be kept around so that we can write things as we
-+ * scroll and the like */
-+unsigned short text[80 * 30];
-+
-+/* graphics options */
-+int foreground = (63 << 16) | (63 << 8) | (63), background = 0, window_border = 0;
-+
-+/* current position */
-+static int fontx = 0;
-+static int fonty = 0;
-+
-+/* global state so that we don't try to recursively scroll or cursor */
-+static int no_scroll = 0;
-+
-+/* color state */
-+static int graphics_standard_color = A_NORMAL;
-+static int graphics_normal_color = A_NORMAL;
-+static int graphics_highlight_color = A_REVERSE;
-+static int graphics_current_color = A_NORMAL;
-+static color_state graphics_color_state = COLOR_STATE_STANDARD;
-+
-+static inline void outb(unsigned short port, unsigned char val)
-+{
-+    __asm __volatile ("outb %0,%1"::"a" (val), "d" (port));
-+}
-+
-+static void MapMask(int value) {
-+    outb(0x3c4, 2);
-+    outb(0x3c5, value);
-+}
-+
-+/* bit mask register */
-+static void BitMask(int value) {
-+    outb(0x3ce, 8);
-+    outb(0x3cf, value);
-+}
-+
-+/* move the graphics cursor location to col, row */
-+static void graphics_setxy(int col, int row) {
-+    if (col >= view_x0 && col < view_x1) {
-+        fontx = col;
-+        cursorX = col << 3;
-+    }
-+    if (row >= view_y0 && row < view_y1) {
-+        fonty = row;
-+        cursorY = row << 4;
-+    }
-+}
-+
-+/* scroll the screen */
-+static void graphics_scroll() {
-+    int i, j, k;
-+
-+    /* we don't want to scroll recursively... that would be bad */
-+    if (no_scroll)
-+        return;
-+    no_scroll = 1;
-+
-+    /* disable pager temporarily */
-+    k = count_lines;
-+    count_lines = -1;
-+    
-+    /* move everything up a line */
-+    for (j = view_y0 + 1; j < view_y1; j++) {
-+        graphics_gotoxy(view_x0, j - 1);
-+        for (i = view_x0; i < view_x1; i++) {
-+            graphics_putchar(text[j * 80 + i]);
-+        }
-+    }
-+
-+    /* last line should be blank */
-+    graphics_gotoxy(view_x0, view_y1 - 1);
-+    for (i = view_x0; i < view_x1; i++)
-+        graphics_putchar(' ');
-+    graphics_setxy(view_x0, view_y1 - 1);
-+
-+    count_lines = k;
-+
-+    no_scroll = 0;
-+}
-+
-+/* Set the splash image */
-+void graphics_set_splash(char *splashfile) {
-+    grub_strcpy(splashimage, splashfile);
-+}
-+
-+/* Get the current splash image */
-+char *graphics_get_splash(void) {
-+    return splashimage;
-+}
-+
-+/* 
-+ * Initialize a vga16 graphics display with the palette based off of
-+ * the image in splashimage.  If the image doesn't exist, leave graphics
-+ * mode. The mode initiated is 12h. From "Ralf Brown's Interrupt List":
-+ *      text/ text pixel   pixel   colors disply scrn  system
-+ *      grph resol  box  resolution       pages  addr
-+ * 12h   G   80x30  8x16  640x480  16/256K  .    A000  VGA,ATI VIP
-+ *       G   80x30  8x16  640x480  16/64    .    A000  ATI EGA Wonder
-+ *       G     .     .    640x480  16       .      .   UltraVision+256K EGA
-+ */
-+int graphics_init()
-+{
-+    if (!graphics_inited) {
-+        saved_videomode = set_videomode(0x12);
-+        if (get_videomode() != 0x12) {
-+            set_videomode(saved_videomode);
-+            return 0;
-+        }
-+        graphics_inited = 1;
-+    }
-+    else
-+        return 1;
-+
-+    font8x16 = (unsigned char*)graphics_get_font();
-+
-+    /* make sure that the highlight color is set correctly */
-+    graphics_highlight_color = ((graphics_normal_color >> 4) | 
-+                                ((graphics_normal_color & 0xf) << 4));
-+
-+    graphics_cls();
-+
-+    if (!read_image(splashimage)) {
-+        grub_printf("Failed to read splash image (%s)\n", splashimage);
-+        grub_printf("Press any key to continue...");
-+        getkey();
-+        set_videomode(saved_videomode);
-+        graphics_inited = 0;
-+        return 0;
-+    }
-+
-+    set_int1c_handler();
-+
-+    return 1;
-+}
-+
-+/* Leave graphics mode */
-+void graphics_end(void)
-+{
-+    if (graphics_inited) {
-+        unset_int1c_handler();
-+        set_videomode(saved_videomode);
-+        graphics_inited = 0;
-+        no_cursor = 0;
-+    }
-+}
-+
-+/* Print ch on the screen.  Handle any needed scrolling or the like */
-+void graphics_putchar(int ch) {
-+    ch &= 0xff;
-+
-+    graphics_cursor(0);
-+
-+    if (ch == '\n') {
-+        if (fonty + 1 < view_y1)
-+            graphics_setxy(fontx, fonty + 1);
-+        else
-+            graphics_scroll();
-+        graphics_cursor(1);
-+        return;
-+    } else if (ch == '\r') {
-+        graphics_setxy(view_x0, fonty);
-+        graphics_cursor(1);
-+        return;
-+    }
-+
-+    graphics_cursor(0);
-+
-+    text[fonty * 80 + fontx] = ch;
-+    text[fonty * 80 + fontx] &= 0x00ff;
-+    if (graphics_current_color & 0xf0)
-+        text[fonty * 80 + fontx] |= 0x100;
-+
-+    graphics_cursor(0);
-+
-+    if ((fontx + 1) >= view_x1) {
-+        graphics_setxy(view_x0, fonty);
-+        if (fonty + 1 < view_y1)
-+            graphics_setxy(view_x0, fonty + 1);
-+        else
-+            graphics_scroll();
-+        graphics_cursor(1);
-+        do_more ();
-+        graphics_cursor(0);
-+    } else {
-+        graphics_setxy(fontx + 1, fonty);
-+    }
-+
-+    graphics_cursor(1);
-+}
-+
-+/* get the current location of the cursor */
-+int graphics_getxy(void) {
-+    return (fontx << 8) | fonty;
-+}
-+
-+void graphics_gotoxy(int x, int y) {
-+    graphics_cursor(0);
-+
-+    graphics_setxy(x, y);
-+
-+    graphics_cursor(1);
-+}
-+
-+void graphics_cls(void) {
-+    int i;
-+    unsigned char *mem, *s1, *s2, *s4, *s8;
-+
-+    graphics_cursor(0);
-+    graphics_gotoxy(view_x0, view_y0);
-+
-+    mem = (unsigned char*)VIDEOMEM;
-+    s1 = (unsigned char*)VSHADOW1;
-+    s2 = (unsigned char*)VSHADOW2;
-+    s4 = (unsigned char*)VSHADOW4;
-+    s8 = (unsigned char*)VSHADOW8;
-+
-+    for (i = 0; i < 80 * 30; i++)
-+        text[i] = ' ';
-+    graphics_cursor(1);
-+
-+    BitMask(0xff);
-+
-+    /* plane 1 */
-+    MapMask(1);
-+    grub_memcpy(mem, s1, 38400);
-+
-+    /* plane 2 */
-+    MapMask(2);
-+    grub_memcpy(mem, s2, 38400);
-+
-+    /* plane 3 */
-+    MapMask(4);
-+    grub_memcpy(mem, s4, 38400);
-+
-+    /* plane 4 */
-+    MapMask(8);
-+    grub_memcpy(mem, s8, 38400);
-+
-+    MapMask(15);
-+
-+    if (no_cursor) {
-+        no_cursor = 0;
-+        set_int1c_handler();
-+    }
-+}
-+
-+void graphics_setcolorstate (color_state state) {
-+    switch (state) {
-+    case COLOR_STATE_STANDARD:
-+        graphics_current_color = graphics_standard_color;
-+        break;
-+    case COLOR_STATE_NORMAL:
-+        graphics_current_color = graphics_normal_color;
-+        break;
-+    case COLOR_STATE_HIGHLIGHT:
-+        graphics_current_color = graphics_highlight_color;
-+        break;
-+    default:
-+        graphics_current_color = graphics_standard_color;
-+        break;
-+    }
-+
-+    graphics_color_state = state;
-+}
-+
-+void graphics_setcolor (int normal_color, int highlight_color) {
-+    graphics_normal_color = normal_color;
-+    graphics_highlight_color = highlight_color;
-+
-+    graphics_setcolorstate (graphics_color_state);
-+}
-+
-+int graphics_setcursor (int on) {
-+    if (!no_cursor && !on) {
-+        no_cursor = 1;
-+        unset_int1c_handler();
-+        graphics_cursor(0);
-+    }
-+    else if(no_cursor && on) {
-+        no_cursor = 0;
-+        set_int1c_handler();
-+        graphics_cursor(1);
-+    }
-+    return 0;
-+}
-+
-+/* Read in the splashscreen image and set the palette up appropriately.
-+ * Format of splashscreen is an xpm (can be gzipped) with 16 colors and
-+ * 640x480. */
-+int read_image(char *s)
-+{
-+    char buf[32], pal[16], c;
-+    unsigned char base, mask, *s1, *s2, *s4, *s8;
-+    unsigned i, len, idx, colors, x, y, width, height;
-+
-+    if (!grub_open(s))
-+        return 0;
-+
-+    /* read header */
-+    if (!grub_read((char*)&buf, 10) || grub_memcmp(buf, "/* XPM */\n", 10)) {
-+        grub_close();
-+        return 0;
-+    }
-+    
-+    /* parse info */
-+    while (grub_read(&c, 1)) {
-+        if (c == '"')
-+            break;
-+    }
-+
-+    while (grub_read(&c, 1) && (c == ' ' || c == '\t'))
-+        ;
-+
-+    i = 0;
-+    width = c - '0';
-+    while (grub_read(&c, 1)) {
-+        if (c >= '0' && c <= '9')
-+            width = width * 10 + c - '0';
-+        else
-+            break;
-+    }
-+    while (grub_read(&c, 1) && (c == ' ' || c == '\t'))
-+        ;
-+
-+    height = c - '0';
-+    while (grub_read(&c, 1)) {
-+        if (c >= '0' && c <= '9')
-+            height = height * 10 + c - '0';
-+        else
-+            break;
-+    }
-+    while (grub_read(&c, 1) && (c == ' ' || c == '\t'))
-+        ;
-+
-+    colors = c - '0';
-+    while (grub_read(&c, 1)) {
-+        if (c >= '0' && c <= '9')
-+            colors = colors * 10 + c - '0';
-+        else
-+            break;
-+    }
-+
-+    base = 0;
-+    while (grub_read(&c, 1) && c != '"')
-+        ;
-+
-+    /* palette */
-+    for (i = 0, idx = 1; i < colors; i++) {
-+        len = 0;
-+
-+        while (grub_read(&c, 1) && c != '"')
-+            ;
-+        grub_read(&c, 1);       /* char */
-+        base = c;
-+        grub_read(buf, 4);      /* \t c # */
-+
-+        while (grub_read(&c, 1) && c != '"') {
-+            if (len < sizeof(buf))
-+                buf[len++] = c;
-+        }
-+
-+        if (len == 6 && idx < 15) {
-+            int r = ((hex(buf[0]) << 4) | hex(buf[1])) >> 2;
-+            int g = ((hex(buf[2]) << 4) | hex(buf[3])) >> 2;
-+            int b = ((hex(buf[4]) << 4) | hex(buf[5])) >> 2;
-+
-+            pal[idx] = base;
-+            graphics_set_palette(idx, r, g, b);
-+            ++idx;
-+        }
-+    }
-+
-+    x = y = len = 0;
-+
-+    s1 = (unsigned char*)VSHADOW1;
-+    s2 = (unsigned char*)VSHADOW2;
-+    s4 = (unsigned char*)VSHADOW4;
-+    s8 = (unsigned char*)VSHADOW8;
-+
-+    for (i = 0; i < 38400; i++)
-+        s1[i] = s2[i] = s4[i] = s8[i] = 0;
-+
-+    /* parse xpm data */
-+    while (y < height) {
-+        while (1) {
-+            if (!grub_read(&c, 1)) {
-+                grub_close();
-+                return 0;
-+            }
-+            if (c == '"')
-+                break;
-+        }
-+
-+        while (grub_read(&c, 1) && c != '"') {
-+            for (i = 1; i < 15; i++)
-+                if (pal[i] == c) {
-+                    c = i;
-+                    break;
-+                }
-+
-+            mask = 0x80 >> (x & 7);
-+            if (c & 1)
-+                s1[len + (x >> 3)] |= mask;
-+            if (c & 2)
-+                s2[len + (x >> 3)] |= mask;
-+            if (c & 4)
-+                s4[len + (x >> 3)] |= mask;
-+            if (c & 8)
-+                s8[len + (x >> 3)] |= mask;
-+
-+            if (++x >= 640) {
-+                x = 0;
-+
-+                if (y < 480)
-+                    len += 80;
-+                ++y;
-+            }
-+        }
-+    }
-+
-+    grub_close();
-+
-+    graphics_set_palette(0, (background >> 16), (background >> 8) & 63, 
-+                background & 63);
-+    graphics_set_palette(15, (foreground >> 16), (foreground >> 8) & 63, 
-+                foreground & 63);
-+    graphics_set_palette(0x11, (window_border >> 16), (window_border >> 8) & 63, 
-+                         window_border & 63);
-+
-+    return 1;
-+}
-+
-+/* Convert a character which is a hex digit to the appropriate integer */
-+int hex(int v)
-+{
-+    if (v >= 'A' && v <= 'F')
-+        return (v - 'A' + 10);
-+    if (v >= 'a' && v <= 'f')
-+        return (v - 'a' + 10);
-+    return (v - '0');
-+}
-+
-+void graphics_cursor(int set) {
-+    unsigned char *pat, *mem, *ptr, chr[16 << 2];
-+    int i, ch, invert, offset;
-+
-+    if (set && (no_cursor || no_scroll))
-+        return;
-+
-+    offset = cursorY * 80 + fontx;
-+    ch = text[fonty * 80 + fontx] & 0xff;
-+    invert = (text[fonty * 80 + fontx] & 0xff00) != 0;
-+    pat = font8x16 + (ch << 4);
-+
-+    mem = (unsigned char*)VIDEOMEM + offset;
-+
-+    if (!set) {
-+        for (i = 0; i < 16; i++) {
-+            unsigned char mask = pat[i];
-+
-+            if (!invert) {
-+                chr[i     ] = ((unsigned char*)VSHADOW1)[offset];
-+                chr[16 + i] = ((unsigned char*)VSHADOW2)[offset];
-+                chr[32 + i] = ((unsigned char*)VSHADOW4)[offset];
-+                chr[48 + i] = ((unsigned char*)VSHADOW8)[offset];
-+
-+                if (shade) {
-+                    if (ch == DISP_VERT || ch == DISP_LL ||
-+                        ch == DISP_UR || ch == DISP_LR) {
-+                        unsigned char pmask = ~(pat[i] >> 1);
-+
-+                        chr[i     ] &= pmask;
-+                        chr[16 + i] &= pmask;
-+                        chr[32 + i] &= pmask;
-+                        chr[48 + i] &= pmask;
-+                    }
-+                    if (i > 0 && ch != DISP_VERT) {
-+                        unsigned char pmask = ~(pat[i - 1] >> 1);
-+
-+                        chr[i     ] &= pmask;
-+                        chr[16 + i] &= pmask;
-+                        chr[32 + i] &= pmask;
-+                        chr[48 + i] &= pmask;
-+                        if (ch == DISP_HORIZ || ch == DISP_UR || ch == DISP_LR) {
-+                            pmask = ~pat[i - 1];
-+
-+                            chr[i     ] &= pmask;
-+                            chr[16 + i] &= pmask;
-+                            chr[32 + i] &= pmask;
-+                            chr[48 + i] &= pmask;
-+                        }
-+                    }
-+                }
-+                chr[i     ] |= mask;
-+                chr[16 + i] |= mask;
-+                chr[32 + i] |= mask;
-+                chr[48 + i] |= mask;
-+
-+                offset += 80;
-+            }
-+            else {
-+                chr[i     ] = mask;
-+                chr[16 + i] = mask;
-+                chr[32 + i] = mask;
-+                chr[48 + i] = mask;
-+            }
-+        }
-+    }
-+    else {
-+        MapMask(15);
-+        ptr = mem;
-+        for (i = 0; i < 16; i++, ptr += 80) {
-+            cursorBuf[i] = pat[i];
-+            *ptr = ~pat[i];
-+        }
-+        return;
-+    }
-+
-+    offset = 0;
-+    for (i = 1; i < 16; i <<= 1, offset += 16) {
-+        int j;
-+
-+        MapMask(i);
-+        ptr = mem;
-+        for (j = 0; j < 16; j++, ptr += 80)
-+            *ptr = chr[j + offset];
-+    }
-+
-+    MapMask(15);
-+}
-+
-+#endif /* SUPPORT_GRAPHICS */
-diff -Naur grub-0.97.orig/stage2/graphics.h grub-0.97/stage2/graphics.h
---- grub-0.97.orig/stage2/graphics.h	1969-12-31 16:00:00.000000000 -0800
-+++ grub-0.97/stage2/graphics.h	2006-07-03 23:58:41.000000000 -0700
-@@ -0,0 +1,44 @@
-+/* graphics.h - graphics console interface */
-+/*
-+ *  GRUB  --  GRand Unified Bootloader
-+ *  Copyright (C) 2002  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
-+ *  the Free Software Foundation; either version 2 of the License, or
-+ *  (at your option) any later version.
-+ *
-+ *  This program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with this program; if not, write to the Free Software
-+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+ */
-+
-+#ifndef GRAPHICS_H
-+#define GRAPHICS_H
-+
-+/* magic constant */
-+#define VIDEOMEM 0xA0000
-+
-+/* function prototypes */
-+char *graphics_get_splash(void);
-+
-+int read_image(char *s);
-+void graphics_cursor(int set);
-+
-+/* function prototypes for asm functions */
-+void * graphics_get_font();
-+void graphics_set_palette(int idx, int red, int green, int blue);
-+void set_int1c_handler();
-+void unset_int1c_handler();
-+
-+extern short cursorX, cursorY;
-+extern char cursorBuf[16];
-+extern int shade;
-+extern int view_x0, view_y0, view_x1, view_y1;
-+
-+#endif /* GRAPHICS_H */
-diff -Naur grub-0.97.orig/stage2/Makefile.am grub-0.97/stage2/Makefile.am
---- grub-0.97.orig/stage2/Makefile.am	2005-02-02 12:37:35.000000000 -0800
-+++ grub-0.97/stage2/Makefile.am	2006-07-03 23:58:41.000000000 -0700
-@@ -7,7 +7,7 @@
-         fat.h filesys.h freebsd.h fs.h hercules.h i386-elf.h \
- 	imgact_aout.h iso9660.h jfs.h mb_header.h mb_info.h md5.h \
- 	nbi.h pc_slice.h serial.h shared.h smp-imps.h term.h \
--	terminfo.h tparm.h nbi.h ufs2.h vstafs.h xfs.h
-+	terminfo.h tparm.h nbi.h ufs2.h vstafs.h xfs.h graphics.h
- EXTRA_DIST = setjmp.S apm.S $(noinst_SCRIPTS)
- 
- # For <stage1.h>.
-@@ -19,7 +19,7 @@
- 	disk_io.c fsys_ext2fs.c fsys_fat.c fsys_ffs.c fsys_iso9660.c \
- 	fsys_jfs.c fsys_minix.c fsys_reiserfs.c fsys_ufs2.c \
- 	fsys_vstafs.c fsys_xfs.c gunzip.c md5.c serial.c stage2.c \
--	terminfo.c tparm.c
-+	terminfo.c tparm.c graphics.c
- libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \
- 	-DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
- 	-DFSYS_ISO9660=1 -DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 \
-@@ -79,8 +79,14 @@
- HERCULES_FLAGS =
- endif
- 
-+if GRAPHICS_SUPPORT
-+GRAPHICS_FLAGS = -DSUPPORT_GRAPHICS=1
-+else
-+GRAPHICS_FLAGS =
-+endif
-+
- STAGE2_COMPILE = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
--	$(NETBOOT_FLAGS) $(SERIAL_FLAGS) $(HERCULES_FLAGS)
-+	$(NETBOOT_FLAGS) $(SERIAL_FLAGS) $(HERCULES_FLAGS) $(GRAPHICS_FLAGS)
- 
- STAGE1_5_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,2000
- STAGE1_5_COMPILE = $(STAGE2_COMPILE) -DNO_DECOMPRESSION=1 -DSTAGE1_5=1
-@@ -90,7 +96,8 @@
- 	cmdline.c common.c console.c disk_io.c fsys_ext2fs.c \
- 	fsys_fat.c fsys_ffs.c fsys_iso9660.c fsys_jfs.c fsys_minix.c \
- 	fsys_reiserfs.c fsys_ufs2.c fsys_vstafs.c fsys_xfs.c gunzip.c \
--	hercules.c md5.c serial.c smp-imps.c stage2.c terminfo.c tparm.c
-+	hercules.c md5.c serial.c smp-imps.c stage2.c terminfo.c tparm.c \
-+	graphics.c
- pre_stage2_exec_CFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
- pre_stage2_exec_CCASFLAGS = $(STAGE2_COMPILE) $(FSYS_CFLAGS)
- pre_stage2_exec_LDFLAGS = $(PRE_STAGE2_LINK)
-diff -Naur grub-0.97.orig/stage2/shared.h grub-0.97/stage2/shared.h
---- grub-0.97.orig/stage2/shared.h	2004-06-19 09:40:09.000000000 -0700
-+++ grub-0.97/stage2/shared.h	2006-07-04 00:01:50.000000000 -0700
-@@ -499,7 +499,11 @@
-   unsigned char linear_reserved_field_position;
-   unsigned long max_pixel_clock;
- 
--  unsigned char reserved3[189];
-+  /* Reserved field to make structure to be 256 bytes long, VESA BIOS 
-+     Extension 3.0 Specification says to reserve 189 bytes here but 
-+     that doesn't make structure to be 256 bytes.  So additional one is 
-+     added here.  */
-+  unsigned char reserved3[189 + 1];
- } __attribute__ ((packed));
- 
- 
-@@ -792,6 +796,11 @@
- /* Set the cursor position. */
- void gotoxy (int x, int y);
- 
-+/* Internal pager
-+   Returns 1 = if pager was used
-+           0 = if pager wasn't used  */
-+int do_more (void);
-+
- /* Displays an ASCII character.  IBM displays will translate some
-    characters to special graphical ones (see the DISP_* constants). */
- void grub_putchar (int c);
-@@ -871,6 +880,7 @@
- int grub_tolower (int c);
- int grub_isspace (int c);
- int grub_strncat (char *s1, const char *s2, int n);
-+void grub_memcpy(void *dest, const void *src, int len);
- void *grub_memmove (void *to, const void *from, int len);
- void *grub_memset (void *start, int c, int len);
- int grub_strncat (char *s1, const char *s2, int n);
-@@ -911,7 +921,7 @@
- int nul_terminate (char *str);
- int get_based_digit (int c, int base);
- int safe_parse_maxint (char **str_ptr, int *myint_ptr);
--int memcheck (int start, int len);
-+int memcheck (unsigned long int start, unsigned long int len);
- void grub_putstr (const char *str);
- 
- #ifndef NO_DECOMPRESSION
-diff -Naur grub-0.97.orig/stage2/stage2.c grub-0.97/stage2/stage2.c
---- grub-0.97.orig/stage2/stage2.c	2005-03-19 09:51:57.000000000 -0800
-+++ grub-0.97/stage2/stage2.c	2006-07-04 00:01:50.000000000 -0700
-@@ -20,6 +20,12 @@
- #include <shared.h>
- #include <term.h>
- 
-+#ifdef SUPPORT_GRAPHICS
-+# include <graphics.h>
-+#endif
-+
-+int col_start, col_end, row_start, box_size;
-+
- grub_jmp_buf restart_env;
- 
- #if defined(PRESET_MENU_STRING) || defined(SUPPORT_DISKLESS)
-@@ -105,13 +111,13 @@
-   if (highlight && current_term->setcolorstate)
-     current_term->setcolorstate (COLOR_STATE_HIGHLIGHT);
- 
--  gotoxy (2, y);
-+  gotoxy (2 + col_start, y);
-   grub_putchar (' ');
--  for (x = 3; x < 75; x++)
-+  for (x = 3 + col_start; x < (col_end - 5); x++)
-     {
--      if (*entry && x <= 72)
-+      if (*entry && x <= (col_end - 8))
- 	{
--	  if (x == 72)
-+	  if (x == (col_end - 8))
- 	    grub_putchar (DISP_RIGHT);
- 	  else
- 	    grub_putchar (*entry++);
-@@ -119,7 +125,7 @@
-       else
- 	grub_putchar (' ');
-     }
--  gotoxy (74, y);
-+  gotoxy ((col_end - 6), y);
- 
-   if (current_term->setcolorstate)
-     current_term->setcolorstate (COLOR_STATE_STANDARD);
-@@ -131,7 +137,7 @@
- {
-   int i;
-   
--  gotoxy (77, y + 1);
-+  gotoxy ((col_end - 3), y + 1);
- 
-   if (first)
-     grub_putchar (DISP_UP);
-@@ -151,14 +157,14 @@
- 	menu_entries++;
-     }
- 
--  gotoxy (77, y + size);
-+  gotoxy ((col_end - 3), y + size);
- 
-   if (*menu_entries)
-     grub_putchar (DISP_DOWN);
-   else
-     grub_putchar (' ');
- 
--  gotoxy (74, y + entryno + 1);
-+  gotoxy ((col_end - 6), y + entryno + 1);
- }
- 
- static void
-@@ -196,30 +202,30 @@
-   if (current_term->setcolorstate)
-     current_term->setcolorstate (COLOR_STATE_NORMAL);
-   
--  gotoxy (1, y);
-+  gotoxy (1 + col_start, y);
- 
-   grub_putchar (DISP_UL);
--  for (i = 0; i < 73; i++)
-+  for (i = col_start; i < (col_end - 7); i++)
-     grub_putchar (DISP_HORIZ);
-   grub_putchar (DISP_UR);
- 
-   i = 1;
-   while (1)
-     {
--      gotoxy (1, y + i);
-+      gotoxy (1 + col_start, y + i);
- 
-       if (i > size)
- 	break;
-       
-       grub_putchar (DISP_VERT);
--      gotoxy (75, y + i);
-+      gotoxy ((col_end - 5), y + i);
-       grub_putchar (DISP_VERT);
- 
-       i++;
-     }
- 
-   grub_putchar (DISP_LL);
--  for (i = 0; i < 73; i++)
-+  for (i = col_start; i < (col_end - 7); i++)
-     grub_putchar (DISP_HORIZ);
-   grub_putchar (DISP_LR);
- 
-@@ -233,6 +239,7 @@
- {
-   int c, time1, time2 = -1, first_entry = 0;
-   char *cur_entry = 0;
-+  struct term_entry *prev_term = NULL;
- 
-   /*
-    *  Main loop for menu UI.
-@@ -250,6 +257,22 @@
- 	}
-     }
- 
-+  col_start = 0;
-+  col_end = 80;
-+  row_start = 0;
-+  box_size = 12;
-+  /* if we're using viewport we need to make sure to setup
-+     coordinates correctly.  */
-+#ifdef SUPPORT_GRAPHICS
-+  if (grub_memcmp (current_term->name, "graphics", sizeof ("graphics") - 1) == 0)
-+    {
-+      col_start = view_x0;
-+      col_end = view_x1;
-+      row_start = view_y0;
-+      box_size = (view_y1 - view_y0) - 13;
-+    }
-+#endif
-+
-   /* If the timeout was expired or wasn't set, force to show the menu
-      interface. */
-   if (grub_timeout < 0)
-@@ -302,36 +325,36 @@
-       if (current_term->flags & TERM_DUMB)
- 	print_entries_raw (num_entries, first_entry, menu_entries);
-       else
--	print_border (3, 12);
-+	print_border (3 + row_start, box_size);
- 
-       grub_printf ("\n\
--      Use the %c and %c keys to select which entry is highlighted.\n",
-+    Use the %c and %c keys to select which entry is highlighted.\n",
- 		   DISP_UP, DISP_DOWN);
-       
-       if (! auth && password)
- 	{
- 	  printf ("\
--      Press enter to boot the selected OS or \'p\' to enter a\n\
--      password to unlock the next set of features.");
-+    Press enter to boot the selected OS or \'p\' to enter a\n\
-+    password to unlock the next set of features.");
- 	}
-       else
- 	{
- 	  if (config_entries)
- 	    printf ("\
--      Press enter to boot the selected OS, \'e\' to edit the\n\
--      commands before booting, or \'c\' for a command-line.");
-+    Press enter to boot the selected OS, \'e\' to edit the\n\
-+    commands before booting, or \'c\' for a command-line.");
- 	  else
- 	    printf ("\
--      Press \'b\' to boot, \'e\' to edit the selected command in the\n\
--      boot sequence, \'c\' for a command-line, \'o\' to open a new line\n\
--      after (\'O\' for before) the selected line, \'d\' to remove the\n\
--      selected line, or escape to go back to the main menu.");
-+    Press \'b\' to boot, \'e\' to edit the selected command in the\n\
-+    boot sequence, \'c\' for a command-line, \'o\' to open a new line\n\
-+    after (\'O\' for before) the selected line, \'d\' to remove the\n\
-+    selected line, or escape to go back to the main menu.");
- 	}
- 
-       if (current_term->flags & TERM_DUMB)
- 	grub_printf ("\n\nThe selected entry is %d ", entryno);
-       else
--	print_entries (3, 12, first_entry, entryno, menu_entries);
-+	print_entries (3 + row_start, box_size, first_entry, entryno, menu_entries);
-     }
- 
-   /* XX using RT clock now, need to initialize value */
-@@ -358,10 +381,10 @@
- 			   entryno, grub_timeout);
- 	  else
- 	    {
--	      gotoxy (3, 22);
--	      grub_printf ("The highlighted entry will be booted automatically in %d seconds.    ",
-+	      gotoxy (3 + col_start, 10 + box_size + row_start);
-+	      grub_printf (" The highlighted entry will be booted automatically in %d seconds.   ",
- 			   grub_timeout);
--	      gotoxy (74, 4 + entryno);
-+	      gotoxy ((col_end - 6), 4 + entryno + row_start);
- 	  }
- 	  
- 	  grub_timeout--;
-@@ -387,12 +410,12 @@
- 	      if (current_term->flags & TERM_DUMB)
- 		grub_putchar ('\r');
- 	      else
--		gotoxy (3, 22);
-+		gotoxy (3 + col_start, 10 + box_size + row_start);
- 	      printf ("                                                                    ");
- 	      grub_timeout = -1;
- 	      fallback_entryno = -1;
- 	      if (! (current_term->flags & TERM_DUMB))
--		gotoxy (74, 4 + entryno);
-+		gotoxy ((col_end - 6), 4 + entryno + row_start);
- 	    }
- 
- 	  /* We told them above (at least in SUPPORT_SERIAL) to use
-@@ -408,12 +431,12 @@
- 		{
- 		  if (entryno > 0)
- 		    {
--		      print_entry (4 + entryno, 0,
-+		      print_entry (4 + entryno + row_start, 0,
- 				   get_entry (menu_entries,
- 					      first_entry + entryno,
- 					      0));
- 		      entryno--;
--		      print_entry (4 + entryno, 1,
-+		      print_entry (4 + entryno + row_start, 1,
- 				   get_entry (menu_entries,
- 					      first_entry + entryno,
- 					      0));
-@@ -421,7 +444,7 @@
- 		  else if (first_entry > 0)
- 		    {
- 		      first_entry--;
--		      print_entries (3, 12, first_entry, entryno,
-+		      print_entries (3 + row_start, box_size, first_entry, entryno,
- 				     menu_entries);
- 		    }
- 		}
-@@ -433,29 +456,29 @@
- 		entryno++;
- 	      else
- 		{
--		  if (entryno < 11)
-+		  if (entryno < (box_size - 1))
- 		    {
--		      print_entry (4 + entryno, 0,
-+		      print_entry (4 + entryno + row_start, 0,
- 				   get_entry (menu_entries,
- 					      first_entry + entryno,
- 					      0));
- 		      entryno++;
--		      print_entry (4 + entryno, 1,
-+		      print_entry (4 + entryno + row_start, 1,
- 				   get_entry (menu_entries,
- 					      first_entry + entryno,
- 					      0));
- 		  }
--		else if (num_entries > 12 + first_entry)
-+		else if (num_entries > box_size + first_entry)
- 		  {
- 		    first_entry++;
--		    print_entries (3, 12, first_entry, entryno, menu_entries);
-+		    print_entries (3 + row_start, box_size, first_entry, entryno, menu_entries);
- 		  }
- 		}
- 	    }
- 	  else if (c == 7)
- 	    {
- 	      /* Page Up */
--	      first_entry -= 12;
-+	      first_entry -= box_size;
- 	      if (first_entry < 0)
- 		{
- 		  entryno += first_entry;
-@@ -463,20 +486,20 @@
- 		  if (entryno < 0)
- 		    entryno = 0;
- 		}
--	      print_entries (3, 12, first_entry, entryno, menu_entries);
-+	      print_entries (3 + row_start, box_size, first_entry, entryno, menu_entries);
- 	    }
- 	  else if (c == 3)
- 	    {
- 	      /* Page Down */
--	      first_entry += 12;
-+	      first_entry += box_size;
- 	      if (first_entry + entryno + 1 >= num_entries)
- 		{
--		  first_entry = num_entries - 12;
-+		  first_entry = num_entries - box_size;
- 		  if (first_entry < 0)
- 		    first_entry = 0;
- 		  entryno = num_entries - first_entry - 1;
- 		}
--	      print_entries (3, 12, first_entry, entryno, menu_entries);
-+	      print_entries (3 + row_start, box_size, first_entry, entryno, menu_entries);
- 	    }
- 
- 	  if (config_entries)
-@@ -489,7 +512,7 @@
- 	      if ((c == 'd') || (c == 'o') || (c == 'O'))
- 		{
- 		  if (! (current_term->flags & TERM_DUMB))
--		    print_entry (4 + entryno, 0,
-+		    print_entry (4 + entryno + row_start, 0,
- 				 get_entry (menu_entries,
- 					    first_entry + entryno,
- 					    0));
-@@ -537,7 +560,7 @@
- 
- 		      if (entryno >= num_entries)
- 			entryno--;
--		      if (first_entry && num_entries < 12 + first_entry)
-+		      if (first_entry && num_entries < box_size + first_entry)
- 			first_entry--;
- 		    }
- 
-@@ -549,7 +572,7 @@
- 		      grub_printf ("\n");
- 		    }
- 		  else
--		    print_entries (3, 12, first_entry, entryno, menu_entries);
-+		    print_entries (3 + row_start, box_size, first_entry, entryno, menu_entries);
- 		}
- 
- 	      cur_entry = menu_entries;
-@@ -570,7 +593,7 @@
- 		  if (current_term->flags & TERM_DUMB)
- 		    grub_printf ("\r                                    ");
- 		  else
--		    gotoxy (1, 21);
-+		    gotoxy (1 + col_start, 9 + box_size + row_start);
- 
- 		  /* Wipe out the previously entered password */
- 		  grub_memset (entered, 0, sizeof (entered));
-@@ -651,7 +674,10 @@
- 		  *(new_heap++) = 0;
- 
- 		  if (config_entries)
--		    run_menu (heap, NULL, new_num_entries, new_heap, 0);
-+		    {
-+		      current_entryno = first_entry + entryno;
-+		      run_menu (heap, NULL, new_num_entries, new_heap, 0);
-+		    }
- 		  else
- 		    {
- 		      cls ();
-@@ -714,6 +740,15 @@
-   
-   cls ();
-   setcursor (1);
-+  /* if our terminal needed initialization, we should shut it down
-+   * before booting the kernel, but we want to save what it was so
-+   * we can come back if needed */
-+  prev_term = current_term;
-+  if (current_term->shutdown) 
-+    {
-+      current_term->shutdown();
-+      current_term = term_table; /* assumption: console is first */
-+    }
-   
-   while (1)
-     {
-@@ -727,7 +762,8 @@
- 	cur_entry = get_entry (config_entries, first_entry + entryno, 1);
- 
-       /* Set CURRENT_ENTRYNO for the command "savedefault".  */
--      current_entryno = first_entry + entryno;
-+      if (config_entries)
-+	current_entryno = first_entry + entryno;
-       
-       if (run_script (cur_entry, heap))
- 	{
-@@ -748,6 +784,13 @@
- 	break;
-     }
- 
-+  /* if we get back here, we should go back to what our term was before */
-+  current_term = prev_term;
-+  if (current_term->startup)
-+      /* if our terminal fails to initialize, fall back to console since
-+       * it should always work */
-+      if (current_term->startup() == 0)
-+          current_term = term_table; /* we know that console is first */
-   show_menu = 1;
-   goto restart;
- }
-@@ -891,8 +934,18 @@
- 	      len = grub_read (buf, sizeof (buf));
- 	      if (len > 0)
- 		{
-+		  char *tmp;
-+		  char *def;
- 		  buf[sizeof (buf) - 1] = 0;
--		  safe_parse_maxint (&p, &saved_entryno);
-+
-+		  if((tmp = grub_strstr(p, ":")) != NULL)
-+		  {
-+		    *tmp++;
-+		    grub_memcpy(&def, &tmp, sizeof(p));
-+		  }else
-+		    grub_memcpy(&def, &p, sizeof(p));
-+		  
-+		  safe_parse_maxint (&def, &saved_entryno);
- 		}
- 
- 	      grub_close ();
-@@ -1050,6 +1103,16 @@
- 	  while (is_preset);
- 	}
- 
-+      /* go ahead and make sure the terminal is setup */
-+      if (current_term->startup)
-+	{
-+	  /* If initialization fails, go back to default terminal */
-+	  if (current_term->startup() == 0)
-+		  {
-+		      current_term = term_table;
-+		  }
-+	}
-+
-       if (! num_entries)
- 	{
- 	  /* If no acceptable config file, goto command-line, starting
-diff -Naur grub-0.97.orig/stage2/term.h grub-0.97/stage2/term.h
---- grub-0.97.orig/stage2/term.h	2003-07-09 04:45:53.000000000 -0700
-+++ grub-0.97/stage2/term.h	2006-07-03 23:58:41.000000000 -0700
-@@ -60,6 +60,8 @@
-   const char *name;
-   /* The feature flags defined above.  */
-   unsigned long flags;
-+  /* Default for maximum number of lines if not specified */
-+  unsigned short max_lines;
-   /* Put a character.  */
-   void (*putchar) (int c);
-   /* Check if any input character is available.  */
-@@ -79,6 +81,10 @@
-   void (*setcolor) (int normal_color, int highlight_color);
-   /* Turn on/off the cursor.  */
-   int (*setcursor) (int on);
-+  /* function to start a terminal */
-+  int (*startup) (void);
-+  /* function to use to shutdown a terminal */
-+  void (*shutdown) (void);
- };
- 
- /* This lists up available terminals.  */
-@@ -124,4 +130,24 @@
- int hercules_setcursor (int on);
- #endif
- 
-+#ifdef SUPPORT_GRAPHICS
-+extern int foreground, background, window_border, graphics_inited, saved_videomode;
-+
-+void graphics_set_splash(char *splashfile);
-+int set_videomode(int mode);
-+int get_videomode(void);
-+void graphics_putchar (int c);
-+int graphics_getxy(void);
-+void graphics_gotoxy(int x, int y);
-+void graphics_cls(void);
-+void graphics_setcolorstate (color_state state);
-+void graphics_setcolor (int normal_color, int highlight_color);
-+int graphics_setcursor (int on);
-+int graphics_init(void);
-+void graphics_end(void);
-+
-+int hex(int v);
-+void graphics_set_palette(int idx, int red, int green, int blue);
-+#endif /* SUPPORT_GRAPHICS */
-+
- #endif /* ! GRUB_TERM_HEADER */
-diff -Naur grub-0.97.orig/THANKS grub-0.97/THANKS
---- grub-0.97.orig/THANKS	2005-05-07 19:17:43.000000000 -0700
-+++ grub-0.97/THANKS	2006-07-04 00:01:50.000000000 -0700
-@@ -121,3 +121,4 @@
- Yedidyah Bar-David <didi@post.tau.ac.il>
- Yury V. Umanets <umka@namesys.com>
- Yuri Zaporogets <yuriz@ukr.net>
-+Vitaly Fertman <vitaly@namesys.com>
-diff -Naur grub-0.97.orig/util/grub-install.in grub-0.97/util/grub-install.in
---- grub-0.97.orig/util/grub-install.in	2004-07-24 11:57:31.000000000 -0700
-+++ grub-0.97/util/grub-install.in	2006-07-04 00:01:50.000000000 -0700
-@@ -81,6 +81,50 @@
- EOF
- }
- 
-+# Usage: getraid_mdadm mddevice
-+# Routine to find a physical device from an md device
-+# If found, the first grub BIOS device (from device.map) is returned 
-+# If no BIOS drives match the RAID devices, the first device returned
-+# from mdadm -D is returned
-+getraid_mdadm() {
-+	device=$1
-+	mdadm=$(mdadm -D "$device") || {
-+		echo "$PROG: mdadm -D $device failed" >&2
-+		exit 1
-+	}
-+	eval "$(
-+		echo "$mdadm" | awk '
-+			$1 == "Number" && $2 == "Major" { start = 1; next }
-+			$1 == "UUID" { print "uuid=" $3; start = 0; next }
-+			!start { next }
-+			$2 == 0 && $3 == 0 { next }
-+			{ devices = devices "\n" $NF }
-+			END { print "devices='\''" devices "'\''" }
-+		'
-+	)"
-+
-+	# Convert RAID devices list into a list of disks
-+	tmp_disks=`echo "$devices" | sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%' \
-+					 -e 's%\(d[0-9]*\)p[0-9]*$%\1%' \
-+					 -e 's%\(fd[0-9]*\)$%\1%' \
-+					 -e 's%/part[0-9]*$%/disc%' \
-+					 -e 's%\(c[0-7]d[0-9]*\).*$%\1%' \
-+					 -e '/^$/d' |
-+				     sed -n '1h;2,$H;${g;s/\n/|/g;p}'`
-+
-+	# Find first BIOS disk that's a member of the RAID array
-+	# Default to first RAID member if no tmp_disks are BIOS devices
-+	set -- `egrep $tmp_disks $device_map | \
-+		sort | \
-+		sed -n 1p `
-+	device=${2:-${tmp_disks%%|*}}
-+
-+	# Return first partition on BIOS disk that's part of the RAID
-+	echo "$devices" | \
-+		sed -n "\:${device}:p" | \
-+		sed -n 1p
-+}
-+
- # Usage: convert os_device
- # Convert an OS device to the corresponding GRUB drive.
- # This part is OS-specific.
-@@ -96,6 +140,10 @@
-     # Break the device name into the disk part and the partition part.
-     case "$host_os" in
-     linux*)
-+	# Find an actual physical device if we're passed a RAID device
-+	case $1 in
-+		/dev/md*)  set -- `getraid_mdadm $1`
-+	esac
- 	tmp_disk=`echo "$1" | sed -e 's%\([sh]d[a-z]\)[0-9]*$%\1%' \
- 				  -e 's%\(d[0-9]*\)p[0-9]*$%\1%' \
- 				  -e 's%\(fd[0-9]*\)$%\1%' \
-@@ -112,8 +160,8 @@
- 	tmp_disk=`echo "$1" | sed 's%\([sh]d[0-9]*\).*%\1%'`
- 	tmp_part=`echo "$1" | sed "s%$tmp_disk%%"` ;;
-     freebsd* | kfreebsd*-gnu)
--	tmp_disk=`echo "$1" | sed 's%r\{0,1\}\([saw]d[0-9]*\).*$%r\1%' \
--			    | sed 's%r\{0,1\}\(da[0-9]*\).*$%r\1%'`
-+	tmp_disk=`echo "$1" | sed 's%r\{0,1\}\([saw]d[0-9]*\).*$%\1%' \
-+			    | sed 's%r\{0,1\}\(da[0-9]*\).*$%\1%'`
- 	tmp_part=`echo "$1" \
- 	    | sed "s%.*/r\{0,1\}[saw]d[0-9]\(s[0-9]*[a-h]\)%\1%" \
-        	    | sed "s%.*/r\{0,1\}da[0-9]\(s[0-9]*[a-h]\)%\1%"`
-@@ -131,7 +179,7 @@
- 
-     # Get the drive name.
-     tmp_drive=`grep -v '^#' $device_map | grep "$tmp_disk *$" \
--	| sed 's%.*\(([hf]d[0-9][a-g0-9,]*)\).*%\1%'`
-+	| sed 's%.*\(([hf]d[0-9][a-z0-9,]*)\).*%\1%'`
- 
-     # If not found, print an error message and exit.
-     if test "x$tmp_drive" = x; then
-@@ -148,13 +196,13 @@
- 	gnu*)
- 	    if echo $tmp_part | grep "^s" >/dev/null; then
- 		tmp_pc_slice=`echo $tmp_part \
--		    | sed "s%s\([0-9]*\)[a-g]*$%\1%"`
-+		    | sed "s%s\([0-9]*\)[a-z]*$%\1%"`
- 		tmp_drive=`echo "$tmp_drive" \
- 		    | sed "s%)%,\`expr "$tmp_pc_slice" - 1\`)%"`
- 	    fi
--	    if echo $tmp_part | grep "[a-g]$" >/dev/null; then
-+	    if echo $tmp_part | grep "[a-z]$" >/dev/null; then
- 		tmp_bsd_partition=`echo "$tmp_part" \
--		    | sed "s%[^a-g]*\([a-g]\)$%\1%"`
-+		    | sed "s%[^a-z]*\([a-z]\)$%\1%"`
- 		tmp_drive=`echo "$tmp_drive" \
- 		    | sed "s%)%,$tmp_bsd_partition)%"`
- 	    fi
-@@ -336,6 +384,10 @@
-     # Create a safe temporary file.
-     test -n "$mklog" && log_file=`$mklog`
- 
-+    # Before all invocations of the grub shell, call sync to make sure
-+    # the raw device is in sync with any bufferring in filesystems.
-+    sync
-+ 
-     $grub_shell --batch $no_floppy --device-map=$device_map <<EOF >$log_file
- quit
- EOF
-@@ -450,6 +502,24 @@
- # Create a safe temporary file.
- test -n "$mklog" && log_file=`$mklog`
- 
-+# Sync to prevent GRUB from not finding stage files (notably, on XFS)
-+sync
-+
-+# XFS needs special magic
-+xfs_frozen=false
-+if which xfs_freeze > /dev/null ; then
-+  cat << EOF
-+Due to a bug in xfs_freeze, the following command might produce a segmentation
-+fault when ${grubdir} is not in an XFS filesystem. This error is harmless and
-+can be ignored.
-+EOF
-+  if xfs_freeze -f ${grubdir} ; then xfs_frozen=true ; fi
-+fi
-+
-+# Before all invocations of the grub shell, call sync to make sure
-+# the raw device is in sync with any bufferring in filesystems.
-+sync
-+
- # Now perform the installation.
- $grub_shell --batch $no_floppy --device-map=$device_map <<EOF >$log_file
- root $root_drive
-@@ -457,6 +527,10 @@
- quit
- EOF
- 
-+if ${xfs_frozen} ; then
-+  xfs_freeze -u ${grubdir}
-+fi
-+
- if grep "Error [0-9]*: " $log_file >/dev/null || test $debug = yes; then
-     cat $log_file 1>&2
-     exit 1
Index: tches/grub-0.97-use_mmap-1.patch
===================================================================
--- patches/grub-0.97-use_mmap-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,63 +1,0 @@
-Submitted By: Jim Gifford <jim@linuxfromscratch.org>
-Date: 07-14-2006
-Initial Package Version: 0.97
-Upstream Status: Unknown
-Origin: Grub Bug Report - http://savannah.gnu.org/bugs/?func=detailitem&item_id=11312
-Description: This patch fixes the following issues on x86_64
-	1) malloc'd pages seem to lack the execute bit on x86_64;
-	2) grub seems to use some stack pointer diversion to malloc'd pages;
-	3) nested functions execute data on the stack;
-	4) this causes a segfault (at least on my machine)
-
-diff -Naur grub-0.97.orig/grub/asmstub.c grub-0.97/grub/asmstub.c
---- grub-0.97.orig/grub/asmstub.c	2005-02-16 12:45:14.000000000 -0800
-+++ grub-0.97/grub/asmstub.c	2006-07-14 12:38:08.305902933 -0700
-@@ -43,6 +43,8 @@
- #include <termios.h>
- #include <signal.h>
- 
-+#include <sys/mman.h>
-+
- #ifdef __linux__
- # include <sys/ioctl.h>		/* ioctl */
- # if !defined(__GLIBC__) || \
-@@ -142,14 +144,25 @@
-     }
- 
-   assert (grub_scratch_mem == 0);
--  scratch = malloc (0x100000 + EXTENDED_MEMSIZE + 15);
-+  scratch = mmap(NULL,
-+                 0x100000 + EXTENDED_MEMSIZE + 15,
-+                 PROT_EXEC | PROT_READ | PROT_WRITE,
-+                 MAP_PRIVATE | MAP_GROWSDOWN | MAP_ANONYMOUS | MAP_32BIT,
-+                 -1,
-+                 0);
-+
-   assert (scratch);
-   grub_scratch_mem = (char *) ((((int) scratch) >> 4) << 4);
- 
-   /* FIXME: simulate the memory holes using mprot, if available. */
- 
-   assert (disks == 0);
--  disks = malloc (NUM_DISKS * sizeof (*disks));
-+  disks = mmap(NULL,
-+               NUM_DISKS * sizeof (*disks),
-+               PROT_EXEC | PROT_READ | PROT_WRITE,
-+               MAP_PRIVATE | MAP_GROWSDOWN | MAP_ANONYMOUS | MAP_32BIT,
-+               -1,
-+               0);
-   assert (disks);
-   /* Initialize DISKS.  */
-   for (i = 0; i < NUM_DISKS; i++)
-@@ -215,9 +228,9 @@
-   /* Release memory. */
-   restore_device_map (device_map);
-   device_map = 0;
--  free (disks);
-+  munmap(disks, NUM_DISKS * sizeof (*disks));
-   disks = 0;
--  free (scratch);
-+  munmap(scratch, 0x100000 + EXTENDED_MEMSIZE + 15);
-   grub_scratch_mem = 0;
- 
-   if (serial_device)
Index: patches/inetutils-1.4.2-gcc4_fixes-1.patch
===================================================================
--- patches/inetutils-1.4.2-gcc4_fixes-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/inetutils-1.4.2-gcc4_fixes-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,47 @@
+# DIY Linux Patch
+Date: 2005-03-29
+Author: Refer Description
+Origin: Refer Description
+Maker: Greg Schafer <gschafer@zip.com.au>
+Upstream Status: ftp changes submitted but not yet applied
+Description: Fix compilation with GCC4
+
+http://savannah.gnu.org/cgi-bin/viewcvs/inetutils/inetutils/libinetutils/ttymsg.c.diff?r1=1.14&r2=1.15&diff_format=u
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=300080
+
+diff -Naur inetutils-1.4.2.orig/ftp/cmdtab.c inetutils-1.4.2/ftp/cmdtab.c
+--- inetutils-1.4.2.orig/ftp/cmdtab.c	2000-07-06 04:21:07.000000000 +0000
++++ inetutils-1.4.2/ftp/cmdtab.c	2005-03-29 03:38:37.000000000 +0000
+@@ -109,7 +109,7 @@
+ char	userhelp[] =	"send new user information";
+ char	verbosehelp[] =	"toggle verbose mode";
+ 
+-struct cmd cmdtab[] = {
++struct cmd *cmdtab = {
+ 	{ "!",		shellhelp,	0,	0,	0,	shell },
+ 	{ "$",		domachelp,	1,	0,	0,	domacro },
+ 	{ "account",	accounthelp,	0,	1,	1,	account},
+diff -Naur inetutils-1.4.2.orig/ftp/extern.h inetutils-1.4.2/ftp/extern.h
+--- inetutils-1.4.2.orig/ftp/extern.h	2000-08-09 05:44:23.000000000 +0000
++++ inetutils-1.4.2/ftp/extern.h	2005-03-29 03:38:50.000000000 +0000
+@@ -137,7 +137,7 @@
+ 
+ extern jmp_buf	abortprox;
+ extern int	abrtflag;
+-extern struct	cmd cmdtab[];
++extern struct	cmd *cmdtab;
+ extern FILE	*cout;
+ extern int	data;
+ extern char    *home;
+diff -Naur inetutils-1.4.2.orig/libinetutils/ttymsg.c inetutils-1.4.2/libinetutils/ttymsg.c
+--- inetutils-1.4.2.orig/libinetutils/ttymsg.c	2001-11-01 15:52:19.000000000 +0000
++++ inetutils-1.4.2/libinetutils/ttymsg.c	2005-03-29 03:39:21.000000000 +0000
+@@ -132,7 +132,7 @@
+ 	    }
+ 	  if (wret)
+ 	    {
+-	      (char *)iov->iov_base += wret;
++	      iov->iov_base = (char *)iov->iov_base + wret;
+ 	      iov->iov_len -= wret;
+ 	    }
+ 	  continue;
Index: tches/inetutils-1.5-memcpy_sparc64-1.patch
===================================================================
--- patches/inetutils-1.5-memcpy_sparc64-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,752 +1,0 @@
-Submitted By: William Harrington <wwh04660 at ucmo dot edu>
-Date: 2008-08-24
-Initial Package Version: 1.5
-Upstream Status: Rejected
-Description: Use a local memcpy instead of the glibc implementation for ping
-             This resolves the bus errors
-
-diff -Naur inetutils-1.5.orig/ping/Makefile.in inetutils-1.5/ping/Makefile.in
---- inetutils-1.5.orig/ping/Makefile.in	2006-10-21 11:59:48.000000000 +0000
-+++ inetutils-1.5/ping/Makefile.in	2007-06-28 23:10:43.000000000 +0000
-@@ -109,7 +109,8 @@
- PROGRAMS = $(bin_PROGRAMS)
- am_ping_OBJECTS = ping.$(OBJEXT) ping_common.$(OBJEXT) \
- 	ping_echo.$(OBJEXT) ping_address.$(OBJEXT) \
--	ping_router.$(OBJEXT) ping_timestamp.$(OBJEXT)
-+	ping_router.$(OBJEXT) ping_timestamp.$(OBJEXT) \
-+	wordcopy.$(OBJEXT)
- ping_OBJECTS = $(am_ping_OBJECTS)
- ping_DEPENDENCIES =
- am_ping6_OBJECTS = ping6.$(OBJEXT) ping_common.$(OBJEXT)
-@@ -333,8 +334,9 @@
- ping_LDADD = -L../libinetutils -linetutils -L../libicmp -licmp -L../lib -lgnu
- ping6_LDADD = -L../lib -lgnu -L../libinetutils -linetutils
- INCLUDES = -I$(top_srcdir)/lib -I../lib -I$(top_srcdir)/libicmp 
--ping_SOURCES = ping.c ping_common.c ping_echo.c ping_address.c \
--  ping_router.c ping_timestamp.c ping_common.h  ping_impl.h
-+ping_SOURCES = memcopy.h pagecopy.h ping.c ping_common.c \
-+  ping_echo.c ping_address.c ping_router.c ping_timestamp.c \
-+  ping_common.h  ping_impl.h wordcopy.c
- 
- ping6_SOURCES = ping6.c ping_common.c ping_common.h ping6.h
- SUIDMODE = -o root -m 4775
-diff -Naur inetutils-1.5.orig/ping/memcopy.h inetutils-1.5/ping/memcopy.h
---- inetutils-1.5.orig/ping/memcopy.h	1970-01-01 00:00:00.000000000 +0000
-+++ inetutils-1.5/ping/memcopy.h	2007-06-28 23:08:34.000000000 +0000
-@@ -0,0 +1,150 @@
-+/* memcopy.h -- definitions for memory copy functions.  Generic C version.
-+   Copyright (C) 1991, 1992, 1993, 1997, 2004 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Torbjorn Granlund (tege@sics.se).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+/* The strategy of the memory functions is:
-+
-+     1. Copy bytes until the destination pointer is aligned.
-+
-+     2. Copy words in unrolled loops.  If the source and destination
-+     are not aligned in the same way, use word memory operations,
-+     but shift and merge two read words before writing.
-+
-+     3. Copy the few remaining bytes.
-+
-+   This is fast on processors that have at least 10 registers for
-+   allocation by GCC, and that can access memory at reg+const in one
-+   instruction.
-+
-+   I made an "exhaustive" test of this memmove when I wrote it,
-+   exhaustive in the sense that I tried all alignment and length
-+   combinations, with and without overlap.  */
-+
-+#include <sys/cdefs.h>
-+#include <endian.h>
-+
-+/* The macros defined in this file are:
-+
-+   BYTE_COPY_FWD(dst_beg_ptr, src_beg_ptr, nbytes_to_copy)
-+
-+   BYTE_COPY_BWD(dst_end_ptr, src_end_ptr, nbytes_to_copy)
-+
-+   WORD_COPY_FWD(dst_beg_ptr, src_beg_ptr, nbytes_remaining, nbytes_to_copy)
-+
-+   WORD_COPY_BWD(dst_end_ptr, src_end_ptr, nbytes_remaining, nbytes_to_copy)
-+
-+   MERGE(old_word, sh_1, new_word, sh_2)
-+     [I fail to understand.  I feel stupid.  --roland]
-+*/
-+
-+/* Type to use for aligned memory operations.
-+   This should normally be the biggest type supported by a single load
-+   and store.  */
-+#define	op_t	unsigned long int
-+#define OPSIZ	(sizeof(op_t))
-+
-+/* Type to use for unaligned operations.  */
-+typedef unsigned char byte;
-+
-+/* Optimal type for storing bytes in registers.  */
-+#define	reg_char	char
-+
-+#if __BYTE_ORDER == __LITTLE_ENDIAN
-+#define MERGE(w0, sh_1, w1, sh_2) (((w0) >> (sh_1)) | ((w1) << (sh_2)))
-+#endif
-+#if __BYTE_ORDER == __BIG_ENDIAN
-+#define MERGE(w0, sh_1, w1, sh_2) (((w0) << (sh_1)) | ((w1) >> (sh_2)))
-+#endif
-+
-+/* Copy exactly NBYTES bytes from SRC_BP to DST_BP,
-+   without any assumptions about alignment of the pointers.  */
-+#define BYTE_COPY_FWD(dst_bp, src_bp, nbytes)				      \
-+  do									      \
-+    {									      \
-+      size_t __nbytes = (nbytes);					      \
-+      while (__nbytes > 0)						      \
-+	{								      \
-+	  byte __x = ((byte *) src_bp)[0];				      \
-+	  src_bp += 1;							      \
-+	  __nbytes -= 1;						      \
-+	  ((byte *) dst_bp)[0] = __x;					      \
-+	  dst_bp += 1;							      \
-+	}								      \
-+    } while (0)
-+
-+/* Copy exactly NBYTES_TO_COPY bytes from SRC_END_PTR to DST_END_PTR,
-+   beginning at the bytes right before the pointers and continuing towards
-+   smaller addresses.  Don't assume anything about alignment of the
-+   pointers.  */
-+#define BYTE_COPY_BWD(dst_ep, src_ep, nbytes)				      \
-+  do									      \
-+    {									      \
-+      size_t __nbytes = (nbytes);					      \
-+      while (__nbytes > 0)						      \
-+	{								      \
-+	  byte __x;							      \
-+	  src_ep -= 1;							      \
-+	  __x = ((byte *) src_ep)[0];					      \
-+	  dst_ep -= 1;							      \
-+	  __nbytes -= 1;						      \
-+	  ((byte *) dst_ep)[0] = __x;					      \
-+	}								      \
-+    } while (0)
-+
-+/* Copy *up to* NBYTES bytes from SRC_BP to DST_BP, with
-+   the assumption that DST_BP is aligned on an OPSIZ multiple.  If
-+   not all bytes could be easily copied, store remaining number of bytes
-+   in NBYTES_LEFT, otherwise store 0.  */
-+extern void _wordcopy_fwd_aligned (long int, long int, size_t) __THROW;
-+extern void _wordcopy_fwd_dest_aligned (long int, long int, size_t) __THROW;
-+#define WORD_COPY_FWD(dst_bp, src_bp, nbytes_left, nbytes)		      \
-+  do									      \
-+    {									      \
-+      if (src_bp % OPSIZ == 0)						      \
-+	_wordcopy_fwd_aligned (dst_bp, src_bp, (nbytes) / OPSIZ);	      \
-+      else								      \
-+	_wordcopy_fwd_dest_aligned (dst_bp, src_bp, (nbytes) / OPSIZ);	      \
-+      src_bp += (nbytes) & -OPSIZ;					      \
-+      dst_bp += (nbytes) & -OPSIZ;					      \
-+      (nbytes_left) = (nbytes) % OPSIZ;					      \
-+    } while (0)
-+
-+/* Copy *up to* NBYTES_TO_COPY bytes from SRC_END_PTR to DST_END_PTR,
-+   beginning at the words (of type op_t) right before the pointers and
-+   continuing towards smaller addresses.  May take advantage of that
-+   DST_END_PTR is aligned on an OPSIZ multiple.  If not all bytes could be
-+   easily copied, store remaining number of bytes in NBYTES_REMAINING,
-+   otherwise store 0.  */
-+extern void _wordcopy_bwd_aligned (long int, long int, size_t) __THROW;
-+extern void _wordcopy_bwd_dest_aligned (long int, long int, size_t) __THROW;
-+#define WORD_COPY_BWD(dst_ep, src_ep, nbytes_left, nbytes)		      \
-+  do									      \
-+    {									      \
-+      if (src_ep % OPSIZ == 0)						      \
-+	_wordcopy_bwd_aligned (dst_ep, src_ep, (nbytes) / OPSIZ);	      \
-+      else								      \
-+	_wordcopy_bwd_dest_aligned (dst_ep, src_ep, (nbytes) / OPSIZ);	      \
-+      src_ep -= (nbytes) & -OPSIZ;					      \
-+      dst_ep -= (nbytes) & -OPSIZ;					      \
-+      (nbytes_left) = (nbytes) % OPSIZ;					      \
-+    } while (0)
-+
-+
-+/* Threshold value for when to enter the unrolled loops.  */
-+#define	OP_T_THRES	16
-diff -Naur inetutils-1.5.orig/ping/pagecopy.h inetutils-1.5/ping/pagecopy.h
---- inetutils-1.5.orig/ping/pagecopy.h	1970-01-01 00:00:00.000000000 +0000
-+++ inetutils-1.5/ping/pagecopy.h	2007-06-28 23:08:34.000000000 +0000
-@@ -0,0 +1,75 @@
-+/* Macros for copying by pages; used in memcpy, memmove.  Generic macros.
-+   Copyright (C) 1995, 1997 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+/* This file defines the macro:
-+
-+   PAGE_COPY_FWD_MAYBE (dstp, srcp, nbytes_left, nbytes)
-+
-+   which is invoked like WORD_COPY_FWD et al.  The pointers should be at
-+   least word aligned.  This will check if virtual copying by pages can and
-+   should be done and do it if so.
-+
-+   System-specific pagecopy.h files should define these macros and then
-+   #include this file:
-+
-+   PAGE_COPY_THRESHOLD
-+   -- Minimum size for which virtual copying by pages is worthwhile.
-+
-+   PAGE_SIZE
-+   -- Size of a page.
-+
-+   PAGE_COPY_FWD (dstp, srcp, nbytes_left, nbytes)
-+   -- Macro to perform the virtual copy operation.
-+   The pointers will be aligned to PAGE_SIZE bytes.
-+*/
-+
-+
-+#if PAGE_COPY_THRESHOLD
-+
-+#include <assert.h>
-+
-+#define PAGE_COPY_FWD_MAYBE(dstp, srcp, nbytes_left, nbytes)		      \
-+  do									      \
-+    {									      \
-+      if ((nbytes) >= PAGE_COPY_THRESHOLD &&				      \
-+	  PAGE_OFFSET ((dstp) - (srcp)) == 0) 				      \
-+	{								      \
-+	  /* The amount to copy is past the threshold for copying	      \
-+	     pages virtually with kernel VM operations, and the		      \
-+	     source and destination addresses have the same alignment.  */    \
-+	  size_t nbytes_before = PAGE_OFFSET (-(dstp));			      \
-+	  if (nbytes_before != 0)					      \
-+	    {								      \
-+	      /* First copy the words before the first page boundary.  */     \
-+	      WORD_COPY_FWD (dstp, srcp, nbytes_left, nbytes_before);	      \
-+	      assert (nbytes_left == 0);				      \
-+	      nbytes -= nbytes_before;					      \
-+	    }								      \
-+	  PAGE_COPY_FWD (dstp, srcp, nbytes_left, nbytes);		      \
-+	}								      \
-+    } while (0)
-+
-+/* The page size is always a power of two, so we can avoid modulo division.  */
-+#define PAGE_OFFSET(n)	((n) & (PAGE_SIZE - 1))
-+
-+#else
-+
-+#define PAGE_COPY_FWD_MAYBE(dstp, srcp, nbytes_left, nbytes) /* nada */
-+
-+#endif
-diff -Naur inetutils-1.5.orig/ping/ping_echo.c inetutils-1.5/ping/ping_echo.c
---- inetutils-1.5.orig/ping/ping_echo.c	2006-10-11 21:46:25.000000000 +0000
-+++ inetutils-1.5/ping/ping_echo.c	2007-06-28 23:08:34.000000000 +0000
-@@ -57,6 +57,11 @@
- 
- #include <xalloc.h>
- 
-+#ifndef memcpy
-+#include "memcopy.h"
-+#include "pagecopy.h"
-+#endif
-+
- static int handler (int code, void *closure,
- 		   struct sockaddr_in *dest, struct sockaddr_in *from,
- 		   struct ip *ip, icmphdr_t *icmp, int datalen);
-@@ -68,7 +73,6 @@
- void print_icmp_header (struct sockaddr_in *from,
- 			      struct ip *ip, icmphdr_t *icmp, int len);
- static void print_ip_opt (struct ip *ip, int hlen);
--
- int
- ping_echo (int argc, char **argv)
- {
-@@ -169,6 +173,46 @@
-       timing++;
-       tp = (struct timeval *) icmp->icmp_data;
- 
-+#define OP_T_THRES	16
-+#undef memcpy
-+void *
-+	memcpy (dstpp, srcpp, len)
-+	void *dstpp;
-+const void *srcpp;
-+size_t len;
-+{
-+	unsigned long int dstp = (long int) dstpp;
-+	unsigned long int srcp = (long int) srcpp;
-+
-+	/* Copy from the beginning to the end. */
-+
-+	/* If there not too few bytes to copy, use word copy. */
-+	if (len >= OP_T_THRES)
-+	{
-+		/* Copy just a few bytes to make DSTP aligned. */
-+		len -= (-dstp) % OPSIZ;
-+		BYTE_COPY_FWD (dstp, srcp, (-dstp) % OPSIZ);
-+
-+		/* Copy whole pages from SRCP to DSTP by virtual address
-+		   manipulation, as much as possible. */
-+
-+		PAGE_COPY_FWD_MAYBE (dstp, srcp, len, len);
-+
-+		/* Copy from SRCP to DSTP taking advantage of the known alignment
-+		   of DSTP. Number of bytes remaining is put in the third argument,
-+		   i.e. in LEN. This number may vary from machine to machine. */
-+
-+		WORD_COPY_FWD (dstp, srcp, len, len);
-+
-+		/* Fall out and copy the tail. */
-+	}
-+
-+	/* There are just a few bytes to copy. Use byte memory operations. */
-+	BYTE_COPY_FWD (dstp, srcp, len);
-+
-+	return dstpp;
-+}
-+
-       /* Avoid unaligned data: */
-       memcpy (&tv1, tp, sizeof (tv1));
-       tvsub (&tv, &tv1);
-diff -Naur inetutils-1.5.orig/ping/wordcopy.c inetutils-1.5/ping/wordcopy.c
---- inetutils-1.5.orig/ping/wordcopy.c	1970-01-01 00:00:00.000000000 +0000
-+++ inetutils-1.5/ping/wordcopy.c	2007-06-28 23:00:04.000000000 +0000
-@@ -0,0 +1,413 @@
-+/* _memcopy.c -- subroutines for memory copy functions.
-+   Copyright (C) 1991, 1996 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+   Contributed by Torbjorn Granlund (tege@sics.se).
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+/* BE VERY CAREFUL IF YOU CHANGE THIS CODE...!  */
-+
-+#include <stddef.h>
-+#include <memcopy.h>
-+
-+/* _wordcopy_fwd_aligned -- Copy block beginning at SRCP to
-+   block beginning at DSTP with LEN `op_t' words (not LEN bytes!).
-+   Both SRCP and DSTP should be aligned for memory operations on `op_t's.  */
-+
-+void
-+_wordcopy_fwd_aligned (dstp, srcp, len)
-+     long int dstp;
-+     long int srcp;
-+     size_t len;
-+{
-+  op_t a0, a1;
-+
-+  switch (len % 8)
-+    {
-+    case 2:
-+      a0 = ((op_t *) srcp)[0];
-+      srcp -= 6 * OPSIZ;
-+      dstp -= 7 * OPSIZ;
-+      len += 6;
-+      goto do1;
-+    case 3:
-+      a1 = ((op_t *) srcp)[0];
-+      srcp -= 5 * OPSIZ;
-+      dstp -= 6 * OPSIZ;
-+      len += 5;
-+      goto do2;
-+    case 4:
-+      a0 = ((op_t *) srcp)[0];
-+      srcp -= 4 * OPSIZ;
-+      dstp -= 5 * OPSIZ;
-+      len += 4;
-+      goto do3;
-+    case 5:
-+      a1 = ((op_t *) srcp)[0];
-+      srcp -= 3 * OPSIZ;
-+      dstp -= 4 * OPSIZ;
-+      len += 3;
-+      goto do4;
-+    case 6:
-+      a0 = ((op_t *) srcp)[0];
-+      srcp -= 2 * OPSIZ;
-+      dstp -= 3 * OPSIZ;
-+      len += 2;
-+      goto do5;
-+    case 7:
-+      a1 = ((op_t *) srcp)[0];
-+      srcp -= 1 * OPSIZ;
-+      dstp -= 2 * OPSIZ;
-+      len += 1;
-+      goto do6;
-+
-+    case 0:
-+      if (OP_T_THRES <= 3 * OPSIZ && len == 0)
-+	return;
-+      a0 = ((op_t *) srcp)[0];
-+      srcp -= 0 * OPSIZ;
-+      dstp -= 1 * OPSIZ;
-+      goto do7;
-+    case 1:
-+      a1 = ((op_t *) srcp)[0];
-+      srcp -=-1 * OPSIZ;
-+      dstp -= 0 * OPSIZ;
-+      len -= 1;
-+      if (OP_T_THRES <= 3 * OPSIZ && len == 0)
-+	goto do0;
-+      goto do8;			/* No-op.  */
-+    }
-+
-+  do
-+    {
-+    do8:
-+      a0 = ((op_t *) srcp)[0];
-+      ((op_t *) dstp)[0] = a1;
-+    do7:
-+      a1 = ((op_t *) srcp)[1];
-+      ((op_t *) dstp)[1] = a0;
-+    do6:
-+      a0 = ((op_t *) srcp)[2];
-+      ((op_t *) dstp)[2] = a1;
-+    do5:
-+      a1 = ((op_t *) srcp)[3];
-+      ((op_t *) dstp)[3] = a0;
-+    do4:
-+      a0 = ((op_t *) srcp)[4];
-+      ((op_t *) dstp)[4] = a1;
-+    do3:
-+      a1 = ((op_t *) srcp)[5];
-+      ((op_t *) dstp)[5] = a0;
-+    do2:
-+      a0 = ((op_t *) srcp)[6];
-+      ((op_t *) dstp)[6] = a1;
-+    do1:
-+      a1 = ((op_t *) srcp)[7];
-+      ((op_t *) dstp)[7] = a0;
-+
-+      srcp += 8 * OPSIZ;
-+      dstp += 8 * OPSIZ;
-+      len -= 8;
-+    }
-+  while (len != 0);
-+
-+  /* This is the right position for do0.  Please don't move
-+     it into the loop.  */
-+ do0:
-+  ((op_t *) dstp)[0] = a1;
-+}
-+
-+/* _wordcopy_fwd_dest_aligned -- Copy block beginning at SRCP to
-+   block beginning at DSTP with LEN `op_t' words (not LEN bytes!).
-+   DSTP should be aligned for memory operations on `op_t's, but SRCP must
-+   *not* be aligned.  */
-+
-+void
-+_wordcopy_fwd_dest_aligned (dstp, srcp, len)
-+     long int dstp;
-+     long int srcp;
-+     size_t len;
-+{
-+  op_t a0, a1, a2, a3;
-+  int sh_1, sh_2;
-+
-+  /* Calculate how to shift a word read at the memory operation
-+     aligned srcp to make it aligned for copy.  */
-+
-+  sh_1 = 8 * (srcp % OPSIZ);
-+  sh_2 = 8 * OPSIZ - sh_1;
-+
-+  /* Make SRCP aligned by rounding it down to the beginning of the `op_t'
-+     it points in the middle of.  */
-+  srcp &= -OPSIZ;
-+
-+  switch (len % 4)
-+    {
-+    case 2:
-+      a1 = ((op_t *) srcp)[0];
-+      a2 = ((op_t *) srcp)[1];
-+      srcp -= 1 * OPSIZ;
-+      dstp -= 3 * OPSIZ;
-+      len += 2;
-+      goto do1;
-+    case 3:
-+      a0 = ((op_t *) srcp)[0];
-+      a1 = ((op_t *) srcp)[1];
-+      srcp -= 0 * OPSIZ;
-+      dstp -= 2 * OPSIZ;
-+      len += 1;
-+      goto do2;
-+    case 0:
-+      if (OP_T_THRES <= 3 * OPSIZ && len == 0)
-+	return;
-+      a3 = ((op_t *) srcp)[0];
-+      a0 = ((op_t *) srcp)[1];
-+      srcp -=-1 * OPSIZ;
-+      dstp -= 1 * OPSIZ;
-+      len += 0;
-+      goto do3;
-+    case 1:
-+      a2 = ((op_t *) srcp)[0];
-+      a3 = ((op_t *) srcp)[1];
-+      srcp -=-2 * OPSIZ;
-+      dstp -= 0 * OPSIZ;
-+      len -= 1;
-+      if (OP_T_THRES <= 3 * OPSIZ && len == 0)
-+	goto do0;
-+      goto do4;			/* No-op.  */
-+    }
-+
-+  do
-+    {
-+    do4:
-+      a0 = ((op_t *) srcp)[0];
-+      ((op_t *) dstp)[0] = MERGE (a2, sh_1, a3, sh_2);
-+    do3:
-+      a1 = ((op_t *) srcp)[1];
-+      ((op_t *) dstp)[1] = MERGE (a3, sh_1, a0, sh_2);
-+    do2:
-+      a2 = ((op_t *) srcp)[2];
-+      ((op_t *) dstp)[2] = MERGE (a0, sh_1, a1, sh_2);
-+    do1:
-+      a3 = ((op_t *) srcp)[3];
-+      ((op_t *) dstp)[3] = MERGE (a1, sh_1, a2, sh_2);
-+
-+      srcp += 4 * OPSIZ;
-+      dstp += 4 * OPSIZ;
-+      len -= 4;
-+    }
-+  while (len != 0);
-+
-+  /* This is the right position for do0.  Please don't move
-+     it into the loop.  */
-+ do0:
-+  ((op_t *) dstp)[0] = MERGE (a2, sh_1, a3, sh_2);
-+}
-+
-+/* _wordcopy_bwd_aligned -- Copy block finishing right before
-+   SRCP to block finishing right before DSTP with LEN `op_t' words
-+   (not LEN bytes!).  Both SRCP and DSTP should be aligned for memory
-+   operations on `op_t's.  */
-+
-+void
-+_wordcopy_bwd_aligned (dstp, srcp, len)
-+     long int dstp;
-+     long int srcp;
-+     size_t len;
-+{
-+  op_t a0, a1;
-+
-+  switch (len % 8)
-+    {
-+    case 2:
-+      srcp -= 2 * OPSIZ;
-+      dstp -= 1 * OPSIZ;
-+      a0 = ((op_t *) srcp)[1];
-+      len += 6;
-+      goto do1;
-+    case 3:
-+      srcp -= 3 * OPSIZ;
-+      dstp -= 2 * OPSIZ;
-+      a1 = ((op_t *) srcp)[2];
-+      len += 5;
-+      goto do2;
-+    case 4:
-+      srcp -= 4 * OPSIZ;
-+      dstp -= 3 * OPSIZ;
-+      a0 = ((op_t *) srcp)[3];
-+      len += 4;
-+      goto do3;
-+    case 5:
-+      srcp -= 5 * OPSIZ;
-+      dstp -= 4 * OPSIZ;
-+      a1 = ((op_t *) srcp)[4];
-+      len += 3;
-+      goto do4;
-+    case 6:
-+      srcp -= 6 * OPSIZ;
-+      dstp -= 5 * OPSIZ;
-+      a0 = ((op_t *) srcp)[5];
-+      len += 2;
-+      goto do5;
-+    case 7:
-+      srcp -= 7 * OPSIZ;
-+      dstp -= 6 * OPSIZ;
-+      a1 = ((op_t *) srcp)[6];
-+      len += 1;
-+      goto do6;
-+
-+    case 0:
-+      if (OP_T_THRES <= 3 * OPSIZ && len == 0)
-+	return;
-+      srcp -= 8 * OPSIZ;
-+      dstp -= 7 * OPSIZ;
-+      a0 = ((op_t *) srcp)[7];
-+      goto do7;
-+    case 1:
-+      srcp -= 9 * OPSIZ;
-+      dstp -= 8 * OPSIZ;
-+      a1 = ((op_t *) srcp)[8];
-+      len -= 1;
-+      if (OP_T_THRES <= 3 * OPSIZ && len == 0)
-+	goto do0;
-+      goto do8;			/* No-op.  */
-+    }
-+
-+  do
-+    {
-+    do8:
-+      a0 = ((op_t *) srcp)[7];
-+      ((op_t *) dstp)[7] = a1;
-+    do7:
-+      a1 = ((op_t *) srcp)[6];
-+      ((op_t *) dstp)[6] = a0;
-+    do6:
-+      a0 = ((op_t *) srcp)[5];
-+      ((op_t *) dstp)[5] = a1;
-+    do5:
-+      a1 = ((op_t *) srcp)[4];
-+      ((op_t *) dstp)[4] = a0;
-+    do4:
-+      a0 = ((op_t *) srcp)[3];
-+      ((op_t *) dstp)[3] = a1;
-+    do3:
-+      a1 = ((op_t *) srcp)[2];
-+      ((op_t *) dstp)[2] = a0;
-+    do2:
-+      a0 = ((op_t *) srcp)[1];
-+      ((op_t *) dstp)[1] = a1;
-+    do1:
-+      a1 = ((op_t *) srcp)[0];
-+      ((op_t *) dstp)[0] = a0;
-+
-+      srcp -= 8 * OPSIZ;
-+      dstp -= 8 * OPSIZ;
-+      len -= 8;
-+    }
-+  while (len != 0);
-+
-+  /* This is the right position for do0.  Please don't move
-+     it into the loop.  */
-+ do0:
-+  ((op_t *) dstp)[7] = a1;
-+}
-+
-+/* _wordcopy_bwd_dest_aligned -- Copy block finishing right
-+   before SRCP to block finishing right before DSTP with LEN `op_t'
-+   words (not LEN bytes!).  DSTP should be aligned for memory
-+   operations on `op_t', but SRCP must *not* be aligned.  */
-+
-+void
-+_wordcopy_bwd_dest_aligned (dstp, srcp, len)
-+     long int dstp;
-+     long int srcp;
-+     size_t len;
-+{
-+  op_t a0, a1, a2, a3;
-+  int sh_1, sh_2;
-+
-+  /* Calculate how to shift a word read at the memory operation
-+     aligned srcp to make it aligned for copy.  */
-+
-+  sh_1 = 8 * (srcp % OPSIZ);
-+  sh_2 = 8 * OPSIZ - sh_1;
-+
-+  /* Make srcp aligned by rounding it down to the beginning of the op_t
-+     it points in the middle of.  */
-+  srcp &= -OPSIZ;
-+  srcp += OPSIZ;
-+
-+  switch (len % 4)
-+    {
-+    case 2:
-+      srcp -= 3 * OPSIZ;
-+      dstp -= 1 * OPSIZ;
-+      a2 = ((op_t *) srcp)[2];
-+      a1 = ((op_t *) srcp)[1];
-+      len += 2;
-+      goto do1;
-+    case 3:
-+      srcp -= 4 * OPSIZ;
-+      dstp -= 2 * OPSIZ;
-+      a3 = ((op_t *) srcp)[3];
-+      a2 = ((op_t *) srcp)[2];
-+      len += 1;
-+      goto do2;
-+    case 0:
-+      if (OP_T_THRES <= 3 * OPSIZ && len == 0)
-+	return;
-+      srcp -= 5 * OPSIZ;
-+      dstp -= 3 * OPSIZ;
-+      a0 = ((op_t *) srcp)[4];
-+      a3 = ((op_t *) srcp)[3];
-+      goto do3;
-+    case 1:
-+      srcp -= 6 * OPSIZ;
-+      dstp -= 4 * OPSIZ;
-+      a1 = ((op_t *) srcp)[5];
-+      a0 = ((op_t *) srcp)[4];
-+      len -= 1;
-+      if (OP_T_THRES <= 3 * OPSIZ && len == 0)
-+	goto do0;
-+      goto do4;			/* No-op.  */
-+    }
-+
-+  do
-+    {
-+    do4:
-+      a3 = ((op_t *) srcp)[3];
-+      ((op_t *) dstp)[3] = MERGE (a0, sh_1, a1, sh_2);
-+    do3:
-+      a2 = ((op_t *) srcp)[2];
-+      ((op_t *) dstp)[2] = MERGE (a3, sh_1, a0, sh_2);
-+    do2:
-+      a1 = ((op_t *) srcp)[1];
-+      ((op_t *) dstp)[1] = MERGE (a2, sh_1, a3, sh_2);
-+    do1:
-+      a0 = ((op_t *) srcp)[0];
-+      ((op_t *) dstp)[0] = MERGE (a1, sh_1, a2, sh_2);
-+
-+      srcp -= 4 * OPSIZ;
-+      dstp -= 4 * OPSIZ;
-+      len -= 4;
-+    }
-+  while (len != 0);
-+
-+  /* This is the right position for do0.  Please don't move
-+     it into the loop.  */
-+ do0:
-+  ((op_t *) dstp)[3] = MERGE (a0, sh_1, a1, sh_2);
-+}
Index: tches/inetutils-1.5-no_server_man_pages-2.patch
===================================================================
--- patches/inetutils-1.5-no_server_man_pages-2.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,117 +1,0 @@
-Submitted By: Matthew Burgess <matthew at linuxfromscratch dot org>
-Resubmitted By: Joe Ciccone <jciccone at linuxfromscratch dot org>
-Date: 2006-11-07
-Initial Package Version: 1.5
-Origin: Greg Schafer
-Description: Prevent installation of unwanted server man pages.
-
-diff -Naur inetutils-1.5.orig/ftpd/Makefile.in inetutils-1.5/ftpd/Makefile.in
---- inetutils-1.5.orig/ftpd/Makefile.in	2006-11-07 19:55:51.000000000 -0500
-+++ inetutils-1.5/ftpd/Makefile.in	2006-11-07 19:56:37.000000000 -0500
-@@ -336,7 +336,6 @@
-                conf.c server_mode.c
- 
- noinst_HEADERS = extern.h
--man_MANS = ftpd.8
- INCLUDES = -I$(top_srcdir)/lib -I../lib -I$(top_srcdir)/libinetutils 
- AM_CPPFLAGS = $(PATHDEF_FTPWELCOME) $(PATHDEF_FTPUSERS) \
-            $(PATHDEF_FTPLOGINMESG) $(PATHDEF_FTPCHROOT) $(PATHDEF_FTPDPID) \
-diff -Naur inetutils-1.5.orig/inetd/Makefile.in inetutils-1.5/inetd/Makefile.in
---- inetutils-1.5.orig/inetd/Makefile.in	2006-11-07 19:55:51.000000000 -0500
-+++ inetutils-1.5/inetd/Makefile.in	2006-11-07 19:56:37.000000000 -0500
-@@ -325,7 +325,6 @@
- whois_BUILD = @whois_BUILD@
- whois_INSTALL_HOOK = @whois_INSTALL_HOOK@
- inetd_SOURCES = inetd.c
--man_MANS = inetd.8
- INCLUDES = -I$(top_srcdir)/lib -I../lib 
- AM_CPPFLAGS = $(PATHDEF_INETDCONF) $(PATHDEF_INETDDIR) \
-            $(PATHDEF_INETDPID)
-diff -Naur inetutils-1.5.orig/logger/Makefile.in inetutils-1.5/logger/Makefile.in
---- inetutils-1.5.orig/logger/Makefile.in	2006-11-07 19:55:51.000000000 -0500
-+++ inetutils-1.5/logger/Makefile.in	2006-11-07 19:56:37.000000000 -0500
-@@ -327,7 +327,6 @@
- INCLUDES = -I$(top_srcdir)/lib -I../lib 
- LDADD = -L../libinetutils -linetutils ../lib/libgnu.a
- logger_SOURCES = logger.c
--man_MANS = logger.1
- EXTRA_DIST = $(man_MANS)
- all: all-am
- 
-diff -Naur inetutils-1.5.orig/rexecd/Makefile.in inetutils-1.5/rexecd/Makefile.in
---- inetutils-1.5.orig/rexecd/Makefile.in	2006-11-07 19:55:51.000000000 -0500
-+++ inetutils-1.5/rexecd/Makefile.in	2006-11-07 19:57:33.000000000 -0500
-@@ -326,7 +326,6 @@
- whois_BUILD = @whois_BUILD@
- whois_INSTALL_HOOK = @whois_INSTALL_HOOK@
- rexecd_SOURCES = rexecd.c
--man_MANS = rexecd.8
- AM_CPPFLAGS = $(PATHDEF_DEFPATH) $(PATHDEF_BSHELL)
- INCLUDES = -I$(top_srcdir)/lib -I../lib 
- LDADD = -L../libinetutils -linetutils -L../lib -lgnu $(LIBCRYPT)
-diff -Naur inetutils-1.5.orig/rlogind/Makefile.in inetutils-1.5/rlogind/Makefile.in
---- inetutils-1.5.orig/rlogind/Makefile.in	2006-11-07 19:55:51.000000000 -0500
-+++ inetutils-1.5/rlogind/Makefile.in	2006-11-07 19:56:37.000000000 -0500
-@@ -326,7 +326,6 @@
- whois_BUILD = @whois_BUILD@
- whois_INSTALL_HOOK = @whois_INSTALL_HOOK@
- rlogind_SOURCES = rlogind.c
--man_MANS = rlogind.8
- INCLUDES = -I$(top_srcdir)/headers -I$(top_srcdir)/libinetutils -I$(top_srcdir)/lib -I../lib 
- AM_CPPFLAGS = $(PATHDEF_DEV) $(PATHDEF_LOGIN)
- LDADD = -L../libinetutils -linetutils -L../lib -lgnu $(LIBUTIL) @LIBCRYPT@ @LIBAUTH@
-diff -Naur inetutils-1.5.orig/rshd/Makefile.in inetutils-1.5/rshd/Makefile.in
---- inetutils-1.5.orig/rshd/Makefile.in	2006-11-07 19:55:51.000000000 -0500
-+++ inetutils-1.5/rshd/Makefile.in	2006-11-07 19:56:37.000000000 -0500
-@@ -326,7 +326,6 @@
- whois_BUILD = @whois_BUILD@
- whois_INSTALL_HOOK = @whois_INSTALL_HOOK@
- rshd_SOURCES = rshd.c
--man_MANS = rshd.8
- AM_CPPFLAGS = $(PATHDEF_BSHELL) $(PATHDEF_NOLOGIN) $(PATHDEF_DEFPATH)
- INCLUDES = -I$(top_srcdir)/headers -I$(top_srcdir)/libinetutils -I$(top_srcdir)/lib -I../lib 
- LDADD = -L../libinetutils -linetutils  -L../lib -lgnu \
-diff -Naur inetutils-1.5.orig/syslogd/Makefile.in inetutils-1.5/syslogd/Makefile.in
---- inetutils-1.5.orig/syslogd/Makefile.in	2006-11-07 19:55:51.000000000 -0500
-+++ inetutils-1.5/syslogd/Makefile.in	2006-11-07 19:56:37.000000000 -0500
-@@ -327,7 +327,6 @@
- whois_BUILD = @whois_BUILD@
- whois_INSTALL_HOOK = @whois_INSTALL_HOOK@
- syslogd_SOURCES = syslogd.c
--man_MANS = syslog.conf.5 syslogd.8
- AM_CPPFLAGS = $(PATHDEF_LOG) $(PATHDEF_KLOG) $(PATHDEF_LOGCONF) \
-               $(PATHDEF_LOGPID) $(PATHDEF_CONSOLE) $(PATHDEF_UTMP)
- 
-diff -Naur inetutils-1.5.orig/talkd/Makefile.in inetutils-1.5/talkd/Makefile.in
---- inetutils-1.5.orig/talkd/Makefile.in	2006-11-07 19:55:51.000000000 -0500
-+++ inetutils-1.5/talkd/Makefile.in	2006-11-07 19:56:37.000000000 -0500
-@@ -334,7 +334,6 @@
-  talkd.c\
-  intalkd.h
- 
--man_MANS = talkd.8
- AM_CPPFLAGS = $(PATHDEF_DEV) 
- INCLUDES = -I$(top_srcdir)/lib -I../lib -I${top_srcdir}/libinetutils
- LDADD = -L../libinetutils -linetutils -L../lib -lgnu
-diff -Naur inetutils-1.5.orig/telnetd/Makefile.in inetutils-1.5/telnetd/Makefile.in
---- inetutils-1.5.orig/telnetd/Makefile.in	2006-11-07 19:55:51.000000000 -0500
-+++ inetutils-1.5/telnetd/Makefile.in	2006-11-07 19:56:37.000000000 -0500
-@@ -333,7 +333,6 @@
- whois_INSTALL_HOOK = @whois_INSTALL_HOOK@
- telnetd_SOURCES = telnetd.c pty.c term.c utility.c state.c termstat.c slc.c
- noinst_HEADERS = telnetd.h
--man_MANS = telnetd.8
- AM_CPPFLAGS = $(PATHDEF_DEV) $(PATHDEF_TTY) $(PATHDEF_LOGIN) 
- INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/lib -I../lib -I$(top_srcdir)/libinetutils\
-            @INCAUTH@
-diff -Naur inetutils-1.5.orig/tftpd/Makefile.in inetutils-1.5/tftpd/Makefile.in
---- inetutils-1.5.orig/tftpd/Makefile.in	2006-11-07 19:55:51.000000000 -0500
-+++ inetutils-1.5/tftpd/Makefile.in	2006-11-07 19:56:37.000000000 -0500
-@@ -326,7 +326,6 @@
- whois_INSTALL_HOOK = @whois_INSTALL_HOOK@
- INCLUDES = -I$(top_srcdir)/headers -I$(top_srcdir)/lib -I../lib 
- tftpd_SOURCES = tftpd.c
--man_MANS = tftpd.8
- LDADD = -L../libinetutils -linetutils -L../lib -lgnu
- EXTRA_DIST = $(man_MANS)
- all: all-am
Index: tches/iproute2-2.6.23-libdir-1.patch
===================================================================
--- patches/iproute2-2.6.23-libdir-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,102 +1,0 @@
-Submitted By: Joe Ciccone <jciccone@linuxfromscratch.org>
-Date: 2007-09-01
-Upstream Status: Unknown
-Origin: Joe Ciccone
-Description: Changes the path of /usr/lib/tc to one defined in the Makefile.
-
-diff -Naur iproute2-2.6.22-070710.orig/include/iptables.h iproute2-2.6.22-070710/include/iptables.h
---- iproute2-2.6.22-070710.orig/include/iptables.h	2007-07-10 18:34:14.000000000 -0700
-+++ iproute2-2.6.22-070710/include/iptables.h	2007-09-02 08:29:41.000000000 -0700
-@@ -5,7 +5,7 @@
- #include "libiptc/libiptc.h"
- 
- #ifndef IPT_LIB_DIR
--#define IPT_LIB_DIR "/usr/local/lib/iptables"
-+#define IPT_LIB_DIR LIBDIR
- #endif
- 
- #ifndef IPPROTO_SCTP
-diff -Naur iproute2-2.6.22-070710.orig/Makefile iproute2-2.6.22-070710/Makefile
---- iproute2-2.6.22-070710.orig/Makefile	2007-07-10 18:34:14.000000000 -0700
-+++ iproute2-2.6.22-070710/Makefile	2007-09-02 08:38:27.000000000 -0700
-@@ -1,5 +1,7 @@
- DESTDIR=
- SBINDIR=/usr/sbin
-+LIBDIR=/usr/lib
-+VARLIB=/var/lib
- CONFDIR=/etc/iproute2
- DOCDIR=/usr/share/doc/iproute2
- MANDIR=/usr/share/man
-@@ -22,7 +24,7 @@
- CC = gcc
- HOSTCC = gcc
- CCOPTS = -D_GNU_SOURCE -O2 -Wstrict-prototypes -Wall
--CFLAGS = $(CCOPTS) -I../include $(DEFINES)
-+CFLAGS = -DLIBDIR=\"$(LIBDIR)\" -DVARLIB=\"$(VARLIB)\" $(CCOPTS) -I../include $(DEFINES)
- YACCFLAGS = -d -t -v
- 
- LDLIBS += -L../lib -lnetlink -lutil
-diff -Naur iproute2-2.6.22-070710.orig/misc/arpd.c iproute2-2.6.22-070710/misc/arpd.c
---- iproute2-2.6.22-070710.orig/misc/arpd.c	2007-07-10 18:34:14.000000000 -0700
-+++ iproute2-2.6.22-070710/misc/arpd.c	2007-09-02 08:38:08.000000000 -0700
-@@ -40,7 +40,7 @@
- int resolve_hosts;
- 
- DB	*dbase;
--char	*dbname = "/var/lib/arpd/arpd.db";
-+char	*dbname = VARLIB "/arpd/arpd.db";
- 
- int	ifnum;
- int	*ifvec;
-diff -Naur iproute2-2.6.22-070710.orig/netem/Makefile iproute2-2.6.22-070710/netem/Makefile
---- iproute2-2.6.22-070710.orig/netem/Makefile	2007-07-10 18:34:14.000000000 -0700
-+++ iproute2-2.6.22-070710/netem/Makefile	2007-09-02 08:29:41.000000000 -0700
-@@ -4,6 +4,8 @@
- HOSTCC ?= $(CC)
- LDLIBS += -lm 
- 
-+LIBDIR = /usr/lib
-+
- all: $(DISTGEN) $(DISTDATA)
- 
- $(DISTGEN):
-@@ -19,9 +21,9 @@
- 	$(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
- 
- install: all
--	mkdir -p $(DESTDIR)/usr/lib/tc
-+	mkdir -p $(DESTDIR)/$(LIBDIR)/tc
- 	for i in $(DISTDATA); \
--	do install -m 755 $$i $(DESTDIR)/usr/lib/tc; \
-+	do install -m 755 $$i $(DESTDIR)/$(LIBDIR)/tc; \
- 	done
- 
- clean:
-diff -Naur iproute2-2.6.22-070710.orig/tc/Makefile iproute2-2.6.22-070710/tc/Makefile
---- iproute2-2.6.22-070710.orig/tc/Makefile	2007-07-10 18:34:14.000000000 -0700
-+++ iproute2-2.6.22-070710/tc/Makefile	2007-09-02 08:29:41.000000000 -0700
-@@ -69,10 +69,10 @@
- 	$(AR) rcs $@ $(TCLIB)
- 
- install: all
--	mkdir -p $(DESTDIR)/usr/lib/tc
-+	mkdir -p $(DESTDIR)/$(LIBDIR)/tc
- 	install -m 0755 -s tc $(DESTDIR)$(SBINDIR)
- 	for i in $(TCSO); \
--	do install -m 755 -s $$i $(DESTDIR)/usr/lib/tc; \
-+	do install -m 755 -s $$i $(DESTDIR)/$(LIBDIR)/tc; \
- 	done
- 
- clean:
-diff -Naur iproute2-2.6.22-070710.orig/tc/tc_util.c iproute2-2.6.22-070710/tc/tc_util.c
---- iproute2-2.6.22-070710.orig/tc/tc_util.c	2007-07-10 18:34:14.000000000 -0700
-+++ iproute2-2.6.22-070710/tc/tc_util.c	2007-09-02 08:33:48.000000000 -0700
-@@ -30,7 +30,7 @@
- 
- 	lib_dir = getenv("TC_LIB_DIR");
- 	if (!lib_dir)
--		lib_dir = "/usr/lib/tc";
-+		lib_dir = LIBDIR "/tc";
- 
- 	return lib_dir;
- }
Index: patches/iproute2-2.6.8_040823-remove_db-1.patch
===================================================================
--- patches/iproute2-2.6.8_040823-remove_db-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/iproute2-2.6.8_040823-remove_db-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,28 @@
+Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
+Date: 2004-07-02
+Initial Package Version: 2.6.8
+Origin: Jim Gifford
+Upstream Status: N/A
+Description: Removes DB for LFS Build
+ 
+diff -Naur iproute2-2.6.8.orig/misc/Makefile iproute2-2.6.8/misc/Makefile
+--- iproute2-2.6.8.orig/misc/Makefile	2004-07-01 22:24:22.000000000 +0000
++++ iproute2-2.6.8/misc/Makefile	2004-07-02 18:45:31.995115122 +0000
+@@ -1,6 +1,6 @@
+ SSOBJ=ss.o ssfilter.o
+ 
+-TARGETS=ss nstat ifstat rtacct arpd rtstat
++TARGETS=ss nstat ifstat rtacct rtstat
+ 
+ include ../Config
+ 
+@@ -24,9 +24,6 @@
+ rtacct: rtacct.c
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o rtacct rtacct.c $(LIBNETLINK) -lm
+ 
+-arpd: arpd.c
+-	$(CC) $(CFLAGS) -I$(DBM_INCLUDE) $(LDFLAGS) -o arpd arpd.c $(LIBNETLINK) -ldb
+-
+ rtstat: rtstat.c
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o rtstat rtstat.c
+ 
Index: patches/kbd-1.08.patch
===================================================================
--- patches/kbd-1.08.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/kbd-1.08.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,24 @@
+diff -Naur kbd-1.08/src/Makefile.in kbd-1.08-patched/src/Makefile.in
+--- kbd-1.08/src/Makefile.in	Sun Oct 13 03:34:10 2002
++++ kbd-1.08-patched/src/Makefile.in	Tue Oct 15 17:24:22 2002
+@@ -37,8 +37,9 @@
+ OLDPROGS= mapscrn loadunimap
+ 
+ # Not installed by default
+-MISC    = screendump setlogcons setvesablank spawn_console spawn_login \
+-	  getunimap clrunimap outpsfheader setpalette
++#MISC    = screendump setlogcons setvesablank spawn_console spawn_login \
++#	  getunimap clrunimap outpsfheader setpalette
++MISC     = setlogcons setvesablank getunimap
+ 
+ # Installed by default
+ SHCMDS  = unicode_start unicode_stop
+@@ -64,7 +65,7 @@
+ install:	all
+ 	install -d -m 755 $(BINDIR) $(LOADKEYS_BINDIR)
+ 	install -s -m 0755 -o root $(PROGS) $(OLDPROGS) $(BINDIR)
+-#	install -s -m 0755 -o root $(MISC) $(BINDIR)
++	install -s -m 0755 -o root $(MISC) $(BINDIR)
+ 	install -c -m 0755 -o root $(SHCMDS) $(BINDIR)
+ 	for i in psfaddtable psfgettable psfstriptable; do \
+ 		rm -f $(BINDIR)/$$i; ln -s psfxtable $(BINDIR)/$$i; \
Index: patches/kbd-1.12.patch
===================================================================
--- patches/kbd-1.12.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/kbd-1.12.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,23 @@
+--- kbd-1.12/src/Makefile.in.orig	2004-01-03 17:53:54.000000000 +0000
++++ kbd-1.12/src/Makefile.in	2004-08-01 04:49:04.602780040 +0000
+@@ -46,8 +46,9 @@
+ OLDPROGS= mapscrn loadunimap
+ 
+ # Not installed by default
+-MISC    = screendump setlogcons setvesablank spawn_console spawn_login \
+-	  getunimap clrunimap outpsfheader setpalette
++#MISC    = screendump setlogcons setvesablank spawn_console spawn_login \
++#	  getunimap clrunimap outpsfheader setpalette
++MISC     = setlogcons setvesablank getunimap
+ 
+ # Installed by default
+ SHCMDS  = unicode_start unicode_stop
+@@ -73,7 +74,7 @@
+ install:	all
+ 	install -d -m 0755 $(BINDIR) $(LOADKEYS_BINDIR)
+ 	install -s -m 0755 $(setowner) $(PROGS) $(OLDPROGS) $(BINDIR)
+-#	install -s -m 0755 $(setowner) $(MISC) $(BINDIR)
++	install -s -m 0755 $(setowner) $(MISC) $(BINDIR)
+ 	install -c -m 0755 $(setowner) $(SHCMDS) $(BINDIR)
+ 	for i in psfaddtable psfgettable psfstriptable; do \
+ 		rm -f $(BINDIR)/$$i; ln -s psfxtable $(BINDIR)/$$i; \
Index: patches/libpng-1.2.7-fix_pc_for_biarch.patch
===================================================================
--- patches/libpng-1.2.7-fix_pc_for_biarch.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/libpng-1.2.7-fix_pc_for_biarch.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,32 @@
+Submitted By: Ryan Oliver <ryan.oliver AT pha.com.au>
+Date: 2004-10-28
+Initial Package Version: 1.2.7
+Origin: Ryan Oliver
+Description: Patch ensures generated pkgconfig file points to the correct
+  location for the installed libraries
+diff -uNr libpng-1.2.7-orig/scripts/libpng.pc.in libpng-1.2.7/scripts/libpng.pc.in
+--- libpng-1.2.7-orig/scripts/libpng.pc.in	2004-09-12 12:19:36.000000000 +1000
++++ libpng-1.2.7/scripts/libpng.pc.in	2004-10-28 00:10:52.124127368 +1000
+@@ -1,7 +1,7 @@
+ 
+ prefix=@PREFIX@
+ exec_prefix=${prefix}
+-libdir=${exec_prefix}/lib
++libdir=@LIBPATH@
+ includedir=${exec_prefix}/include
+ 
+ Name: libpng12
+diff -uNr libpng-1.2.7-orig/scripts/makefile.linux libpng-1.2.7/scripts/makefile.linux
+--- libpng-1.2.7-orig/scripts/makefile.linux	2004-09-12 12:19:36.000000000 +1000
++++ libpng-1.2.7/scripts/makefile.linux	2004-10-28 00:10:24.220369384 +1000
+@@ -78,7 +78,9 @@
+ 	$(RANLIB) $@
+ 
+ libpng.pc:
+-	cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
++	cat scripts/libpng.pc.in | \
++	sed -e s\!@PREFIX@!$(prefix)! \
++	    -e s\!@LIBPATH@!$(LIBPATH)! > libpng.pc
+ 
+ libpng-config:
+ 	( cat scripts/libpng-config-head.in; \
Index: patches/libpng-1.2.7-link_to_proper_libs-1.patch
===================================================================
--- patches/libpng-1.2.7-link_to_proper_libs-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/libpng-1.2.7-link_to_proper_libs-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,60 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2004-08-05
+Initial Package Version: 1.2.6
+Origin: http://blfs-bugs.linuxfromscratch.org/show_bug.cgi?id=644
+Description: libpng is not linked against libz and libm. This causes problems
+for packages that try to link against libpng without including "-lz -lm" in
+the linker flags.
+
+$LastChangedBy: igor $
+$Date: 2004-10-06 03:32:45 +0200 (Wed, 06 Oct 2004) $
+
+diff -ur libpng-1.2.6rc1.orig/scripts/libpng.pc.in libpng-1.2.6rc1/scripts/libpng.pc.in
+--- libpng-1.2.6rc1.orig/scripts/libpng.pc.in	2002-10-03 06:32:33.000000000 -0500
++++ libpng-1.2.6rc1/scripts/libpng.pc.in	2004-03-14 10:29:13.000000000 -0600
+@@ -7,5 +7,5 @@
+ Name: libpng12
+ Description: Loads and saves PNG files
+ Version: 1.2.7
+-Libs: -L${libdir} -lpng12 -lz -lm
++Libs: -L${libdir} -lpng12
+ Cflags: -I${includedir}/libpng12
+diff -ur libpng-1.2.6rc1.orig/scripts/makefile.linux libpng-1.2.6rc1/scripts/makefile.linux
+--- libpng-1.2.6rc1.orig/scripts/makefile.linux	2002-10-03 06:32:34.000000000 -0500
++++ libpng-1.2.6rc1/scripts/makefile.linux	2004-03-14 10:31:21.000000000 -0600
+@@ -34,8 +34,9 @@
+ CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \
+ 	$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
+ 
+-LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm
+-LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
++LIBS=-lz -lm
++LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12
++LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a $(LIBS)
+ 
+ RANLIB=ranlib
+ #RANLIB=echo
+@@ -86,7 +87,7 @@
+ 	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
+ 	echo L_opts=\"-L$(LIBPATH)\"; \
+ 	echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \
+-	echo libs=\"-lpng12 -lz -lm\"; \
++	echo libs=\"-lpng12\"; \
+ 	cat scripts/libpng-config-body.in ) > libpng-config
+ 	chmod +x libpng-config
+ 
+@@ -99,12 +100,12 @@
+ $(LIBNAME).so.$(PNGVER): $(OBJSDLL)
+ 	$(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \
+ 	-o $(LIBNAME).so.$(PNGVER) \
+-	$(OBJSDLL)
++	$(OBJSDLL) $(LIBS)
+ 
+ libpng.so.3.$(PNGMIN): $(OBJSDLL)
+ 	$(CC) -shared -Wl,-soname,libpng.so.3 \
+ 	-o libpng.so.3.$(PNGMIN) \
+-	$(OBJSDLL)
++	$(OBJSDLL) $(LIBS)
+ 
+ pngtest: pngtest.o $(LIBNAME).so
+ 	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
Index: patches/libpng-1.2.8-link_to_proper_libs-1.patch
===================================================================
--- patches/libpng-1.2.8-link_to_proper_libs-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/libpng-1.2.8-link_to_proper_libs-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,59 @@
+Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
+Date: 2004-08-05
+Updated By: Ryan Oliver <ryan.oliver@pha.com.au>
+Date: 2005-03-28
+Initial Package Version: 1.2.8
+Origin: http://blfs-bugs.linuxfromscratch.org/show_bug.cgi?id=644
+Description: libpng is not linked against libz and libm. This causes problems
+for packages that try to link against libpng without including "-lz -lm" in
+the linker flags.
+
+diff -uNr libpng-1.2.8-orig/scripts/libpng.pc.in libpng-1.2.8/scripts/libpng.pc.in
+--- libpng-1.2.8-orig/scripts/libpng.pc.in	2004-12-03 11:14:31.000000000 +1100
++++ libpng-1.2.8/scripts/libpng.pc.in	2005-03-28 21:29:02.000000000 +1000
+@@ -7,5 +7,5 @@
+ Name: libpng12
+ Description: Loads and saves PNG files
+ Version: 1.2.8
+-Libs: -L${libdir} -lpng12 -lz -lm
++Libs: -L${libdir} -lpng12
+ Cflags: -I${includedir}/libpng12
+diff -uNr libpng-1.2.8-orig/scripts/makefile.linux libpng-1.2.8/scripts/makefile.linux
+--- libpng-1.2.8-orig/scripts/makefile.linux	2004-12-03 11:14:31.000000000 +1100
++++ libpng-1.2.8/scripts/makefile.linux	2005-03-28 21:27:56.000000000 +1000
+@@ -34,8 +34,9 @@
+ CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \
+ 	$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
+ 
+-LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm
+-LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
++LIBS=-lz -lm
++LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12
++LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a $(LIBS)
+ 
+ RANLIB=ranlib
+ #RANLIB=echo
+@@ -86,7 +87,7 @@
+ 	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
+ 	echo L_opts=\"-L$(LIBPATH)\"; \
+ 	echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \
+-	echo libs=\"-lpng12 -lz -lm\"; \
++	echo libs=\"-lpng12\"; \
+ 	cat scripts/libpng-config-body.in ) > libpng-config
+ 	chmod +x libpng-config
+ 
+@@ -99,12 +100,12 @@
+ $(LIBNAME).so.$(PNGVER): $(OBJSDLL)
+ 	$(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \
+ 	-o $(LIBNAME).so.$(PNGVER) \
+-	$(OBJSDLL)
++	$(OBJSDLL) $(LIBS)
+ 
+ libpng.so.3.$(PNGMIN): $(OBJSDLL)
+ 	$(CC) -shared -Wl,-soname,libpng.so.3 \
+ 	-o libpng.so.3.$(PNGMIN) \
+-	$(OBJSDLL)
++	$(OBJSDLL) $(LIBS)
+ 
+ pngtest: pngtest.o $(LIBNAME).so
+ 	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
Index: tches/lilo-22.8-cross_compile_x86_64-2.patch
===================================================================
--- patches/lilo-22.8-cross_compile_x86_64-2.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,88 +1,0 @@
-Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
-Date: 2006-03-11
-Initial Package Version: 22.7.1
-Upstream Status: Not submitted, purely for cross-compiling for x86_64(-64)
-Origin: Self
-Description: Allows lilo-static to be built with a cross-compiler (plus
- cross as86, ld86).
-
-diff -Nru lilo-22.8-ori/checkit lilo-22.8/checkit
---- lilo-22.8-ori/checkit	2006-08-13 21:24:45.000000000 +0200
-+++ lilo-22.8/checkit	2007-02-27 07:53:07.000000000 +0100
-@@ -58,29 +58,29 @@
- 
- echo
- echo AS86 version $dev or later is required
--as86 -v 1>foo1 2>foo2
-+x86_64-unknown-linux-gnu-as86 -v 1>foo1 2>foo2
- A=`cat foo1 foo2 | grep version | cut -d " " -f 3`
- rm -f foo1 foo2
- if [ -z $A ]; then
--	echo as86 is not present
-+	echo x86_64-unknown-linux-gnu-as86 is not present
- 	ret=1
- else
- 	vers_min $A $dev
--	echo as86 version $A
-+	echo x86_64-unknown-linux-gnu-as86 version $A
- 	if [ $rc = 0 ]; then echo OKAY; else echo ERROR; ret=1; fi
- fi
- 
- echo
- echo LD86 version $dev or later is required
--ld86 -v 1>foo1 2>foo2
-+x86_64-unknown-linux-gnu-ld86 -v 1>foo1 2>foo2
- L=`cat foo1 foo2 | grep version | cut -d " " -f 3`
- rm -f foo1 foo2
- if [ -z $L ]; then
--	echo ld86 is not present
-+	echo x86_64-unknown-linux-gnu-ld86 is not present
- 	ret=1
- else
- 	vers_min $L $dev
--	echo ld86 version $L
-+	echo x86_64-unknown-linux-gnu-ld86 version $L
- 	if [ $rc = 0 ]; then echo OKAY; else echo ERROR; ret=1; fi
- fi
- 
-diff -Nru lilo-22.8-ori/Makefile lilo-22.8/Makefile
---- lilo-22.8-ori/Makefile	2007-02-19 18:15:10.000000000 +0100
-+++ lilo-22.8/Makefile	2007-02-27 07:57:03.000000000 +0100
-@@ -101,18 +101,18 @@
-   cat $$ROOT/etc/lilo.defines; else echo $(CONFIG); fi ) | \
-   sed 's/-D/-DLCF_/g'`
- LILO=-DLILO=0xbb920890
--KVER=`if [ -f /usr/include/linux/version.h ]; then echo -DHAS_VERSION_H; fi`
--HDM=`if [ -f /usr/include/libdevmapper.h ]; then echo -DHAS_LIBDEVMAPPER_H; fi`
--DEVMAPPER=`if [ -f /usr/include/libdevmapper.h ]; then echo "-ldevmapper"; fi`
-+KVER=
-+HDM=
-+DEVMAPPER=
- 
- TMP=_TmP_
- 
- 
- SHELL=/bin/sh
--CC=gcc
-+#CC=gcc
- CPP=$(CC) -E
--AS86=as86 -0 -a
--LD86=ld86 -0
-+AS86=x86_64-unknown-linux-gnu-as86 -0 -a
-+LD86=x86_64-unknown-linux-gnu-ld86 -0
- NASM=nasm
- G=`cat foo1 foo2 | grep version | cut -d " " -f 3`
- 
-@@ -471,10 +471,10 @@
- 		mv tmp_make Makefile
- 
- version:	common.c lilo.h common.h
--		$(CC) $(CFLAGS) -DSHS_MAIN -o version common.c
-+		gcc $(CFLAGS) -DSHS_MAIN -o version common.c
- 
- mkloader:	temp.c
--		$(CC) $(CFLAGS) -DLILO_BINARY -o mkloader temp.c
-+		gcc $(CFLAGS) -DLILO_BINARY -o mkloader temp.c
- 
- tidy:
- 		rm -f core $(LIS) *.shs *.crc $(TMP)*
Index: patches/linux-2.4-lfh-Makefile.patch
===================================================================
--- patches/linux-2.4-lfh-Makefile.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/linux-2.4-lfh-Makefile.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,38 @@
+# To allow us to cross build the kernel, we fixes calls to
+# expr and xargs that used linux syntax, and call a patched
+# depmod.pl instead of the target native depmod.
+
+--- linux-2.4.21/Makefile.orig	Wed Aug 20 20:07:06 2003
++++ linux-2.4.21/Makefile	Thu Aug 21 00:53:16 2003
+@@ -347,7 +347,7 @@
+ 	@rm -f .ver1
+ 
+ include/linux/version.h: ./Makefile
+-	@expr length "$(KERNELRELEASE)" \<= $(uts_len) > /dev/null || \
++	@expr "$(KERNELRELEASE)" : '.*' \<= $(uts_len) > /dev/null || \
+ 	  (echo KERNELRELEASE \"$(KERNELRELEASE)\" exceeds $(uts_len) characters >&2; false)
+ 	@echo \#define UTS_RELEASE \"$(KERNELRELEASE)\" > .ver
+ 	@echo \#define LINUX_VERSION_CODE `expr $(VERSION) \\* 65536 + $(PATCHLEVEL) \\* 256 + $(SUBLEVEL)` >> .ver
+@@ -410,11 +410,11 @@
+ ifeq "$(strip $(INSTALL_MOD_PATH))" ""
+ depmod_opts	:=
+ else
+-depmod_opts	:= -b $(INSTALL_MOD_PATH) -r
++depmod_opts	:= -b $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE)
+ endif
+ .PHONY: _modinst_post
+ _modinst_post: _modinst_post_pcmcia
+-	if [ -r System.map ]; then $(DEPMOD) -ae -F System.map $(depmod_opts) $(KERNELRELEASE); fi
++	if [ -r System.map ]; then depmod.pl -F System.map $(depmod_opts) -k vmlinux; fi
+ 
+ # Backwards compatibilty symlinks for people still using old versions
+ # of pcmcia-cs with hard coded pathnames on insmod.  Remove
+@@ -423,7 +423,7 @@
+ _modinst_post_pcmcia:
+ 	cd $(MODLIB); \
+ 	mkdir -p pcmcia; \
+-	find kernel -path '*/pcmcia/*' -name '*.o' | xargs -i -r ln -sf ../{} pcmcia
++	find kernel -path '*/pcmcia/*' -name '*.o' -exec ln -sf '../{}' pcmcia \; 
+ 
+ .PHONY: $(patsubst %, _modinst_%, $(SUBDIRS))
+ $(patsubst %, _modinst_%, $(SUBDIRS)) :
Index: patches/linux-2.4.26-m68k-lfh.patch
===================================================================
--- patches/linux-2.4.26-m68k-lfh.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/linux-2.4.26-m68k-lfh.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,8387 @@
+diff -Naur linux-2.4.26/Documentation/Configure.help linux-2.4.26-m68k/Documentation/Configure.help
+--- linux-2.4.26/Documentation/Configure.help	2004-04-14 23:05:24.000000000 +1000
++++ linux-2.4.26-m68k/Documentation/Configure.help	2004-04-15 06:41:29.000000000 +1000
+@@ -17167,6 +17167,26 @@
+   say M here and read <file:Documentation/modules.txt>.  If unsure,
+   say N.
+ 
++Amiga SFS file system support
++CONFIG_ASFS_FS
++  The Amiga Smart FileSystem (SFS) is the file system used on hard 
++  disks by Amiga(tm) and MorphOS(tm) systems.  Say Y if you want 
++  to be able to read files from an Amiga SFS partition on your hard 
++  drive.  
++
++  This file system driver is in EXPERIMENTAL state. Use it with care. 
++  Although it CANNOT destroy your data (because it is a read-only 
++  driver) it MIGHT cause a crash in some circumstances.
++
++  For more information read <file:Documentation/filesystems/asfs.txt>
++
++  This file system is also available as a module ( = code which can be
++  inserted in and removed from the running kernel whenever you want).
++  The module is called affs.o.  If you want to compile it as a module,
++  say M here and read <file:Documentation/modules.txt>.  
++
++  If unsure, say N.
++
+ Apple HFS file system support
+ CONFIG_HFS_FS
+   If you say Y here, you will be able to mount Macintosh-formatted
+@@ -23357,6 +23377,29 @@
+ 
+   If you don't want to compile a kernel for a Sun 3x, say N.
+ 
++TekXpress XP2x support
++CONFIG_TEKXP
++   This option enables support for the TekXpress XP2x series of
++   X-Terminals made by Tektronix.
++   You will also want to enable 68030 support below.
++   Additional information about this port is available at
++   <http://www-users.rwth-aachen.de/Michael.Mueller4/tekxp/tekxp.html>.
++
++   If you don't want to compile a kernel for TekXpress XP2x, say N.
++
++Kernel command line
++CONFIG_BOOTCMD
++   You have to specify a kernel commandline here.
++   There will be no possiblity to change the content on run-time.
++
++Report as MVME160
++CONFIG_TEKXP_REPORT_MVME
++   Enabling this option the TekXpress X-Terminals report as
++   Motorola MVME160 in /proc/harware (if available).
++
++   Say Y, if you intend to use this kernel to install the
++   Debian/m68k Linux distribution. Otherwhise it is save to say N.
++
+ Sun3x builtin serial support
+ CONFIG_SUN3X_ZS
+   ZS refers to a type of asynchronous serial port built in to the Sun3
+@@ -23810,6 +23853,18 @@
+   If you want to compile it as a module, say M here and read
+   <file:Documentation/modules.txt>.
+ 
++TekXpress on-board Sonic support
++CONFIG_TEKSONIC
++  Say Y here if you want to use the integrated network controller of
++  the TekXpress X-Terminals. If you do not modify it it is unlikely
++  you will get Linux running without this selected.
++
++SCC2962 serial support
++CONFIG_SCC2692
++  Say Y here if you want to use the serial interfaces from user-space.
++  It is safe to say N here, if it will only be used for the output of
++  kernel messages.
++
+ Support for early boot text console
+ CONFIG_BOOTX_TEXT
+   Say Y here to see progress messages from the boot firmware in text
+diff -Naur linux-2.4.26/Documentation/filesystems/00-INDEX linux-2.4.26-m68k/Documentation/filesystems/00-INDEX
+--- linux-2.4.26/Documentation/filesystems/00-INDEX	2004-02-19 00:36:30.000000000 +1100
++++ linux-2.4.26-m68k/Documentation/filesystems/00-INDEX	2004-02-19 09:11:42.000000000 +1100
+@@ -6,6 +6,8 @@
+ 	- info and mount options for the Acorn Advanced Disc Filing System.
+ affs.txt
+ 	- info and mount options for the Amiga Fast File System.
++asfs.txt
++	- info and mount options for the Amiga Smart File System.
+ befs.txt
+ 	- info for the BeOS file system (BFS)
+ bfs.txt
+diff -Naur linux-2.4.26/Documentation/filesystems/asfs.txt linux-2.4.26-m68k/Documentation/filesystems/asfs.txt
+--- linux-2.4.26/Documentation/filesystems/asfs.txt	1970-01-01 10:00:00.000000000 +1000
++++ linux-2.4.26-m68k/Documentation/filesystems/asfs.txt	2003-06-20 21:32:32.000000000 +1000
+@@ -0,0 +1,40 @@
++
++Amiga SmartFileSystem, Linux implementation
++===========================================
++
++This is a simple read-only driver. It support reading files and directories.
++Symbolic links (called soft links) are not supported yet. Don't even try
++to read them.
++
++
++Mount options for the ASFS
++==========================
++
++setuid[=uid]	
++		This sets the owner of all files and directories in the file
++		system to uid or the uid of the current user, respectively.
++
++setgid[=gid]	
++		Same as above, but for gid.
++
++mode=mode	
++		Sets the mode flags to the given (octal) value. Directories 
++		will get an x permission if the corresponding r bit is set.
++		The default mode is 0444, which means all r bits are set
++		(for directories this means also that all x bits are set).
++
++
++Other information
++=================
++
++Supported block sizes are: 512, 1024, 2048 and 4096 bytes. Larger blocks
++speed up almost everything at the expense of wasted disk space. The speed
++gain above 4K seems not really worth the price, so you don't lose too
++much here, either.
++
++This file system hasn't been well tested yet. Athough it CANNOT destroy 
++your data, it MIGHT cause a crash. Sorry.
++
++This file system has been tested on Motorola PPC and Intel x86 systems.
++It SHOULD also work on Motorola 68k. It probably WON'T work on other 
++systems (especially 64bit).
+diff -Naur linux-2.4.26/arch/m68k/Makefile linux-2.4.26-m68k/arch/m68k/Makefile
+--- linux-2.4.26/arch/m68k/Makefile	2001-06-12 12:15:27.000000000 +1000
++++ linux-2.4.26-m68k/arch/m68k/Makefile	2003-07-22 07:26:06.000000000 +1000
+@@ -119,6 +119,11 @@
+ SUBDIRS := $(SUBDIRS) arch/m68k/sun3 arch/m68k/sun3/prom
+ endif
+ 
++ifdef CONFIG_TEKXP
++CORE_FILES := $(CORE_FILES) arch/m68k/tekxp/tekxp.o
++SUBDIRS := $(SUBDIRS) arch/m68k/tekxp
++endif
++
+ ifdef CONFIG_M68040
+ CORE_FILES := $(CORE_FILES) arch/m68k/fpsp040/fpsp.o
+ SUBDIRS := $(SUBDIRS) arch/m68k/fpsp040
+@@ -172,5 +177,6 @@
+ 	rm -f arch/m68k/kernel/m68k_defs.h arch/m68k/kernel/m68k_defs.d
+ 
+ archmrproper:
++	rm -f arch/m68k/boot/bootstrap bootstrap
+ 
+ archdep:
+diff -Naur linux-2.4.26/arch/m68k/boot/Makefile linux-2.4.26-m68k/arch/m68k/boot/Makefile
+--- linux-2.4.26/arch/m68k/boot/Makefile	1970-01-01 10:00:00.000000000 +1000
++++ linux-2.4.26-m68k/arch/m68k/boot/Makefile	2003-07-22 07:26:07.000000000 +1000
+@@ -0,0 +1,15 @@
++
++ifdef CONFIG_TEKXP
++.PHONY: bootstrap
++bootstrap: boot.o
++	$(LD) -T tekxp.ld -Ttext 0x1000 -o $@ $<
++	-rm -f ../../../bootstrap
++	dd if=$@ of=../../../bootstrap bs=4096 conv=sync
++	$(STRIP) -s -o vmlinux.s ../../../vmlinux
++	cat vmlinux.s >> ../../../bootstrap
++
++boot.o: boot.S
++	$(CC) -c -o $@ -m68030 -O2 -I$(HPATH) -D__ASSEMBLY__ -DDEBUG $<
++
++endif
++
+diff -Naur linux-2.4.26/arch/m68k/boot/boot.S linux-2.4.26-m68k/arch/m68k/boot/boot.S
+--- linux-2.4.26/arch/m68k/boot/boot.S	1970-01-01 10:00:00.000000000 +1000
++++ linux-2.4.26-m68k/arch/m68k/boot/boot.S	2003-07-22 07:26:07.000000000 +1000
+@@ -0,0 +1,744 @@
++/*
++ *  linux/arch/m68k/boot/boot.S
++ *
++ *  Copyright (C) 2002,2003 Michael Mueller <malware@t-online.de>
++ *
++ *  Parts taken from head.S.
++ *
++ * This file is subject to the terms and conditions of the GNU General Public
++ * license. See the file COPYING in the main directory of this archive for
++ * more details.
++ */
++
++/*
++ * This is a wrapper to the linux kernel. Compiled as a.out binary it can be
++ * used to bootstrap the Linux kernel using the TekXpress Boot Monitor.
++ *
++ * In general it does copy the kernel image to the end of the available
++ * memory and does rearrange it to the top memory as described within the
++ * ELF header of wrapped vmlinux file.
++ *
++ * On some of the TekXpress systems there is not enough continous memory
++ * available to fit the whole kernel into. Thus this code does enable the
++ * MMU which is rather unusual.
++ */
++ 
++#include <linux/config.h>
++#include <linux/linkage.h>
++#include <linux/init.h>
++#include <asm/bootinfo.h>
++#include <asm/setup.h>
++#include <asm/pgtable.h>
++#include <asm/page.h>
++
++/***********************************************************************/
++
++/*
++ *  Little helpers for defining functions
++ */
++
++#ifdef __STDC__
++#define L(name) .L##name
++#else
++#define L(name) .L/**/name
++#endif
++
++#define STACK	%a6@(stackstart)
++#define ARG0	%a6@(4)
++#define ARG1	%a6@(8)
++#define ARG2	%a6@(12)
++#define ARG3	%a6@(16)
++#define ARG4	%a6@(20)
++
++.macro	func_start	name,saveregs,stack=0
++L(\name):
++	linkw	%a6,#-\stack
++	moveml	\saveregs,%sp@-
++.set	stackstart,-\stack
++
++.macro	func_return_\name
++	moveml	%sp@+,\saveregs
++	unlk	%a6
++	rts
++.endm
++.endm
++
++.macro	func_return	name
++	func_return_\name
++.endm
++
++.macro	func_call	name
++	jbsr	L(\name)
++.endm
++
++.macro	move_stack	nr,arg1,arg2,arg3,arg4
++.if	\nr
++	move_stack	"(\nr-1)",\arg2,\arg3,\arg4
++	movel	\arg1,%sp@-
++.endif
++.endm
++
++.macro	func_define	name,nr=0
++.macro	\name	arg1,arg2,arg3,arg4
++	move_stack	\nr,\arg1,\arg2,\arg3,\arg4
++	func_call	\name
++.if	\nr
++	lea	%sp@(\nr*4),%sp
++.endif
++.endm
++.endm
++
++/***********************************************************************/
++
++/*
++ * Start of the code (not entry point!)
++ */
++.text
++ENTRY(_stext)
++
++/*
++ * This is a faked a.out Header
++ */
++.long	0x10B			/* a.out magic number */
++.long	SYMBOL_NAME(__end) - header_end	
++				/* size of content = size of text segment */
++.long	0
++.long	0
++.long	0
++.long	SYMBOL_NAME(__start)	/* entry point */
++.long	0
++.long	0
++header_end:
++
++/*
++ * Platform specific constants
++ */
++#define	MEMSTART	0xF0000000	/* start address of CPU RAM */
++#define OPTRAMSTART	0xF4000000	/* start address of Option RAM */
++#define	MEMCHUNK	0x01000000	/* spacing beetween memory chunks */
++#define MEMORY_MAP_ENTRIES	8	/* number of memory chunks */
++
++/*
++ * MMU definitions
++ */
++PAGESIZE		= 4096
++PAGESHIFT		= 12
++ROOT_TABLE_SIZE		= 128
++PTR_TABLE_SIZE		= 128
++PAGE_TABLE_SIZE		= 64
++ROOT_INDEX_SHIFT	= 25
++PTR_INDEX_SHIFT		= 18
++PAGE_INDEX_SHIFT	= 12
++
++/*
++ * Function declarations
++ */
++func_define	mmu_map,4
++func_define	mmu_get_root_table_entry,1
++func_define	mmu_get_ptr_table_entry,2
++func_define	build_memory_list
++func_define	dump_memory_list
++func_define	get_kernel_size
++func_define	get_kernel_start
++func_define	get_kernel_physical_headers
++func_define	get_kernel_entry
++
++/*
++ * Translation tables.
++ *
++ * These have to be located at the same position as within head.S. As
++ * they are references from the kernel later.
++ */
++.equ	SYMBOL_NAME(kernel_pg_dir),SYMBOL_NAME(_stext)
++.equ	SYMBOL_NAME(kernel_ptr_dir1),SYMBOL_NAME(kernel_pg_dir)+ROOT_TABLE_SIZE*4
++.equ	SYMBOL_NAME(kernel_ptr_dir2),SYMBOL_NAME(kernel_ptr_dir1)+PTR_TABLE_SIZE*4
++.equ	SYMBOL_NAME(kernel_ptr_dir3),SYMBOL_NAME(kernel_ptr_dir2)+PTR_TABLE_SIZE*4
++.equ	SYMBOL_NAME(kernel_ptr_dir4),SYMBOL_NAME(kernel_ptr_dir3)+PTR_TABLE_SIZE*4
++.equ	.,SYMBOL_NAME(_stext)+PAGESIZE /* Skip to end of page */
++
++/*
++ * Functions for debugging output
++ */
++func_define serial_init
++func_define putc,1
++func_define putn,1
++func_define puts,1
++func_define dump,2
++
++.macro	dputc	ch
++#ifdef DEBUG
++	putc	\ch
++#endif
++.endm
++
++.macro putr
++	putc	'\r'
++	putc	'\n'
++.endm
++
++.macro dputr
++#ifdef DEBUG
++	putr
++#endif
++.endm
++
++.macro dputn	nr
++#ifdef DEBUG
++	putn	\nr
++#endif
++.endm
++
++.macro	puts	string
++	.data
++.Lstr\@:
++	.asciz	"\string"
++	.previous
++	pea	%pc@(.Lstr\@)
++	func_call	puts
++	addql	#4,%sp
++.endm
++
++.macro dputs	string
++#ifdef DEBUG
++	puts	"\string"
++#endif
++.endm
++
++func_start	puts,%d0/%a0
++	movl	ARG1,%a0
++1:
++	movb	%a0@+,%d0
++	beqs	2f
++	putc	%d0
++	bras	1b
++2:
++func_return	puts
++
++func_start	putn,%d0-%d2
++	movl	ARG1,%d0
++	movl	#7,%d1
++1:
++	roll	#4,%d0
++	movl	%d0,%d2
++	andb	#15,%d2
++	addb	#'0',%d2
++	cmpb	#'9',%d2
++	jls	2f
++	addb	#'A'-('9'+1),%d2
++2:
++	putc	%d2
++	dbra	%d1,1b
++	putc	#' '
++func_return	putn
++
++func_start	putc,%d0/%a0
++	movl	#0xFF800000,%a0
++1:
++	movb	4(%a0),%d0
++	andb	#4,%d0
++	tstb	%d0
++	bne	2f
++	bra	1b
++2:
++	movl	ARG1,%d0
++	movb	%d0,12(%a0)
++func_return	putc
++
++func_start	dump,%d0/%a0
++	movl	ARG1,%a0
++	movl	ARG2,%d0
++1:
++	putn	%a0
++	putn	%a0@
++	putn	%a0@(4)
++	putn	%a0@(8)
++	putn	%a0@(12)
++	putn	%a0@(16)
++	putn	%a0@(20)
++	putn	%a0@(24)
++	putn	%a0@(28)
++	putc	#'\r'	
++	putc	#'\n'	
++	addl	#32,%a0
++	subl	#32,%d0
++	bpl	1b
++func_return	dump
++
++func_start	serial_init,%a0
++        movl    #0xFF800000,%a0         /* address of UART */
++        clrb    0x34(%a0)
++        movb    #0x80,0x10(%a0)         /* ACR: baud rate set 2 */
++        clrb    0x14(%a0)               /* reset interrupt mask */
++        movb    #0x10,8(%a0)            /* CRA: reset MR pointer */
++        movb    #0x20,8(%a0)
++        movb    #0x30,8(%a0)
++        movb    #2,(%a0)                /* 7 bits per char */
++        movb    #7,(%a0)                /* one stop bit */
++        movb    #0xBB,4(%a0)            /* 9600 baud */
++        movb    #5,8(%a0)               /* enable tx and rx */
++func_return	serial_init
++
++.macro  putc	ch
++	pea	\ch
++	func_call	putc
++	addql	#4,%sp
++.endm
++
++
++
++/*
++ * Entry into the code
++ */
++ENTRY(__start)
++
++	/* Use the first 256 byte of memory as scratch area
++	 */
++	movl	#MEMSTART+0x100, %sp
++
++	/* Initialize the serial port
++	 */
++	serial_init
++	dputs	"\r\nLinux@TekXP starting...\r\n"
++
++	/* Build a memory map for later usage
++	 */
++	putc	'a'
++	build_memory_list
++/*	dump_memory_list	*/
++
++	/* Clear the translation tables 
++	 */
++	dputc	'b'
++	movl	#PAGESIZE/4-1,%d0
++	lea	%pc@(SYMBOL_NAME(kernel_pg_dir)),%a0
++1:
++	clrl	%a0@+
++	dbra	%d0,1b
++
++	/* Setup pointer tables for virtual addresses starting at 0 and
++	 * the current PC.
++	 * We need 4 pointer tables at maximum for 128MB.
++	 * Since both memory ranges should map equal we simple use the
++	 * same pointer tables for both.
++	 */
++	dputc	'c'
++	lea	%pc@(SYMBOL_NAME(_stext)),%a0
++	movl	%a0,%d0
++	movl	#ROOT_INDEX_SHIFT,%d1
++	lsrl	%d1,%d0
++
++	lea	%pc@(SYMBOL_NAME(kernel_pg_dir)),%a0
++	lea	%pc@(SYMBOL_NAME(kernel_ptr_dir1)+_PAGE_TABLE+_PAGE_ACCESSED),%a1
++	movl	%a1,%a0@(%d0:l:4)
++	movl	%a1,%a0@+
++	lea	%pc@(SYMBOL_NAME(kernel_ptr_dir2)+_PAGE_TABLE+_PAGE_ACCESSED),%a1
++	movl	%a1,%a0@(%d0:l:4)
++	movl	%a1,%a0@+
++	lea	%pc@(SYMBOL_NAME(kernel_ptr_dir3)+_PAGE_TABLE+_PAGE_ACCESSED),%a1
++	movl	%a1,%a0@(%d0:l:4)
++	movl	%a1,%a0@+
++	lea	%pc@(SYMBOL_NAME(kernel_ptr_dir4)+_PAGE_TABLE+_PAGE_ACCESSED),%a1
++	movl	%a1,%a0@(%d0:l:4)
++	movl	%a1,%a0@+
++
++	/* Setup early terminator pages for hardware access */
++	dputc	'd'
++	lea	%pc@(SYMBOL_NAME(kernel_pg_dir) + 127*4),%a1
++	movl	#0xFE000000+_PAGE_PRESENT+_PAGE_ACCESSED+_PAGE_DIRTY+_PAGE_NOCACHE030,%d1
++	movl	%d1,%a1@
++
++	/* Map the memory to appear linear
++	 */
++	dputc	'e'
++	clrl	%d0		/* virtual address */
++	lea	%pc@(Lmemory_list),%a0
++1:
++	movl	%a0@+,%a1	/* address */
++	movl	%a0@+,%d1	/* size */
++	tstl	%a1
++	beqs	2f
++	mmu_map	%d0,%a1,%d1,#_PAGE_NOCACHE030
++	addl	%d1,%d0
++	bras	1b
++2:
++	lea	%pc@(Lmemory_last),%a0
++	movl	%d0,%a0@
++
++#if 0
++	lea	%pc@(SYMBOL_NAME(kernel_pg_dir)),%a0
++	dump	%a0,#PAGESIZE
++#endif
++
++	/* Enable the MMU
++	 */
++	dputc	'f'
++	.chip	68030
++	lea	%pc@(Lmmu_engage_030_temp),%a0
++	movel	#0x80000002,%a0@
++	lea	%pc@(SYMBOL_NAME(kernel_pg_dir)),%a1
++	movl	%a1,%a0@(4)
++	movl	#0x0808,%d0
++	movec	%d0,%cacr
++	pmove	%a0@,%srp
++	pflusha
++	movl	#0x82c07760,%a0@(8)
++	pmove	%a0@(8),%tc
++	jmp	1f:l
++1:
++	movl	#0x0808,%d0
++	movec	%d0,%cacr
++	pflusha
++	.chip	68k
++
++	/* Fix the stack
++	 */
++	movl	#0x100,%sp
++
++	/* Remove the now unneeded mappings (5 mappings remain, 4 at top) */
++	dputc	'g'
++	movl	#SYMBOL_NAME(kernel_pg_dir)+16,%a0
++	movl	#ROOT_TABLE_SIZE-6,%d0
++1:
++	clrl	%a0@+
++	dbra	%d0,1b
++
++	/* Move yourself and the kernel to end of the memory
++	 */
++	dputc	'h'
++	get_kernel_size
++	addl	#SYMBOL_NAME(__end)+4095,%d0
++	andl	#-PAGESIZE,%d0
++	movl	Lmemory_last,%a1
++	subl	%d0,%a1
++	movl	%a1,Lmemory_last
++	movl	#0,%a0
++	lsrl	#2,%d0
++1:
++	subl	#1,%d0
++	bmi	2f
++	movl	%a0@+,%a1@+
++	bras	1b
++2:
++	movl	Lmemory_last,%a0
++	jmpl	%a0@(3f)
++
++3:
++	dputc	'i'
++
++	/*
++	 * Loop through the sections of the kernel and copy them over.
++	 */
++
++	get_kernel_start		/* in %a0 */
++	movel	%a0,%a1			/* offset of all numbers */
++	clrl	%d3			/* end of bss */
++
++	get_kernel_physical_headers	 /* count in d0, first in %a0 */
++	subl	#32,%a0
++
++1:
++	dputc	'j'
++	subl	#1,%d0
++	bmi	5f
++	addl	#32,%a0
++
++	movel	%a0@(4),%a2	/* file offset */
++	addl	%a1,%a2		/* current memory address */
++	
++	movel	%a0@(8),%a3	/* load memory address */
++	movel	%a0@(16),%d1	/* file size */
++	movel	%a0@(20),%d2	/* memory size */
++
++	cmpl	#SYMBOL_NAME(_stext)+PAGESIZE,%a3
++	bpl	2f
++
++	movl	#SYMBOL_NAME(_stext)+PAGESIZE,%d3
++	subl	%a3,%d3		/* how much is below */
++
++	addl	%d3,%a3		/* move it up */
++	addl	%d3,%a2		/* move it up */
++
++	subl	%d3,%d2
++	bmi	1b		/* nothing left */
++
++	subl	%d3,%d1
++	bmi	4f
++2:
++	subl	%d1,%d2		/* do not clear what is in file */
++	bpl	3f
++	addl	%d1,%d2
++	movl	%d2,%d1
++	clrl	%d2
++
++3:
++	subl	#1,%d1
++	bmi	4f
++	moveb	%a2@+,%a3@+
++	bras	3b
++
++4:	/* clear */
++	lea	%a3@(%d2),%a4
++	cmpl	%a4,%d3
++	bpl	4f
++	movl	%a4,%d3
++4:
++
++	subl	#1,%d2
++	bmi	1b
++	clrb	%a3@+
++	bras	4b
++5:
++
++	/*
++	 * Create a boot info record
++	 */
++	dputc	'k'
++	addl	#PAGESIZE-1,%d3
++	andl	#-PAGE_SIZE,%d3
++	movl	%d3,%a0
++
++	movw	#BI_MACHTYPE,%a0@+
++	movw	#8,%a0@+
++	movl	#MACH_TEKXP,%a0@+
++
++	movw	#BI_CPUTYPE,%a0@+
++	movw	#8,%a0@+
++	movl	#CPU_68030,%a0@+
++
++	movw	#BI_FPUTYPE,%a0@+
++	movw	#8,%a0@+
++	movl	#0,%a0@+
++
++	movw	#BI_MMUTYPE,%a0@+
++	movw	#8,%a0@+
++	movl	#MMU_68030,%a0@+
++
++	lea	%pc@(Lmemory_list),%a1
++1:
++	movel	%a1@+,%d1
++	movel	%a1@+,%d0
++	tstl	%d1
++	beqs	2f
++	movw	#BI_MEMCHUNK,%a0@+
++	movw	#12,%a0@+
++	movl	%d1,%a0@+
++	movl	%d0,%a0@+
++	bras	1b
++2:
++
++	movw	#BI_LAST,%a0@+
++	clrw	%a0@+
++
++	/* jump into the kernel */
++	dputc	'l'
++	get_kernel_entry
++	jmpl	%a0@
++
++/*
++ * Get the position of the kernels ELF header. It is located on the next
++ * page after this wrapper program.
++ */
++
++func_start	get_kernel_start,%d0
++	lea	%pc@(__end+PAGESIZE-1),%a0
++	movl	%a0,%d0
++	andl	#-PAGESIZE,%d0
++	movl	%d0,%a0
++func_return	get_kernel_start
++
++/*
++ * Read the entry point of the ELF executable.
++ */
++
++func_start	get_kernel_entry,%d0
++	get_kernel_start
++	movl	%a0@(0x18),%a0
++func_return	get_kernel_entry
++
++/*
++ * Get the address of the first physical header (into %a0) and the number
++ * of those headers present (into %d0).
++ */
++func_start	get_kernel_physical_headers,%d1
++	get_kernel_start
++	clrl	%d0
++	movw	%a0@(0x2C),%d0		/* Number of headers */
++	movl	%a0@(0x1C),%d1		/* Offset of the table */
++	lea	%a0@(%d1),%a0
++func_return	get_kernel_physical_headers
++
++/*
++ * Calculate the size kernel image. Notice this is not its final footprint.
++ */
++func_start	get_kernel_size,%d1/%d2/%a0
++	get_kernel_physical_headers
++	clrl	%d1
++1:
++	subl	#1,%d0
++	bmi	3f
++	movl	%a0@(4),%d2
++	addl	%a0@(16),%d2
++	cmpl	%d2,%d1
++	bpl	2f
++	movl	%d2,%d1
++2:
++	addl	#32,%a0
++	bras	1b
++3:
++	movl	%d1,%d0
++func_return	get_kernel_size
++
++
++/*
++ * Fetch the memory configuration and store it in a field for later
++ * retrieval.
++ */
++func_start	build_memory_list,%a2/%a4/%d0/%d1
++	lea	%pc@(Lmemory_list),%a4
++
++	movl	#MEMSTART,%a2
++	bfextu	0xFFD00003{4:4},%d0
++	movl	%pc@(Lcpsram_bitmap_table,%d0:l:4),%d0
++1:
++	tstl	%d0
++	beqs	2f
++	movl	%d0,%d1
++	andl	#3,%d1
++	movl	%pc@(Ldram_size_table,%d1:l:4),%d1
++	movl	%a2,%a4@+
++	movl	%d1,%a4@+
++	addl	#MEMCHUNK,%a2
++	lsrl	#2,%d0
++	bras	1b
++2:
++	bfextu	0xFFD00003{0:1},%d0
++	tstl	%d0
++	bnes	4f
++	movl	#OPTRAMSTART,%a2
++	bfextu	0xFFD00003{1:3},%d0
++	movl	%pc@(Lcporam_bitmap_table,%d0:l:4),%d0
++3:
++	tstl	%d0
++	beqs	4f
++	movl	%d0,%d1
++	andl	#3,%d1
++	movl	%pc@(Ldram_size_table,%d1:l:4),%d1
++	movl	%a2,%a4@+
++	movl	%d1,%a4@+
++	addl	#MEMCHUNK,%a2
++	lsrl	#2,%d0
++	bras	3b
++4:
++func_return	build_memory_list
++
++Ldram_size_table:
++	.long	0
++	.long	0x100000
++	.long	0x400000
++	.long	0x040000
++
++Lcporam_bitmap_table:
++	.long	0xAA
++	.long	0x2A
++	.long	0x0A
++	.long	0x02
++	.long	0x55
++	.long	0x05
++	.long	0x01
++	.long	0x15
++
++Lcpsram_bitmap_table:
++	.long	0x95
++	.long	0x01
++	.long	0x05
++	.long	0x15
++	.long	0x55
++	.long	0x06
++	.long	0x16
++	.long	0x56
++	.long	0x0A
++	.long	0x1A
++	.long	0x5A
++	.long	0xA5
++	.long	0x2A
++	.long	0x6A
++	.long	0x02
++	.long	0xAA
++
++
++/*
++ * Memory mapping functions from head.S. (shortened)
++ */
++
++func_start	mmu_map,%d0-%d4/%a0-%a4
++	/* Get the logical address, it is assumed to be rounded to 256KiB */
++	movl	ARG1,%a3
++
++	/* Get the end address. The length should be rounded to 256KiB */
++	movl	%a3,%a4
++	addl	ARG3,%a4
++	subql	#1,%a4
++
++	/* Get the physical address, assumed to be rounded to 256KiB too */
++	movl	ARG2,%a2
++
++	/* Augment the physical address with page attributes */
++	movl	ARG4,%d0
++	orw	#_PAGE_PRESENT+_PAGE_ACCESSED+_PAGE_DIRTY,%d0
++	addw	%d0,%a2
++
++1:
++	/* Calculate the offset into the root table */
++	movl	%a3,%d0
++	movl	#ROOT_INDEX_SHIFT,%d1
++	lsrl	%d1,%d0
++	mmu_get_root_table_entry	%d0
++
++	/* Calculate the offset into the pointer table */
++	movl	%a3,%d0
++	movl	#PTR_INDEX_SHIFT,%d1
++	lsrl	%d1,%d0
++	andl	#PTR_TABLE_SIZE-1,%d0
++	mmu_get_ptr_table_entry		%a0,%d0
++
++
++	movl	%a2,%a0@
++	addl	#PAGE_TABLE_SIZE*PAGESIZE,%a2
++	addl	#PAGE_TABLE_SIZE*PAGESIZE,%a3
++
++	lea	%a3@(-1),%a0
++	cmpl	%a0,%a4
++	jhi	1b
++	
++func_return	mmu_map
++	
++func_start	mmu_get_root_table_entry,%d0
++	movl	ARG1,%d0
++	lea	%pc@(SYMBOL_NAME(kernel_pg_dir),%d0:l:4),%a0
++func_return	mmu_get_root_table_entry
++
++func_start	mmu_get_ptr_table_entry,%d0
++	movl	ARG1,%a0
++	movl	%a0@,%d0
++	andw	#-PTR_TABLE_SIZE,%d0
++	movl	%d0,%a0
++	movl	ARG2,%d0
++	lea	%a0@(%d0:l:4),%a0
++func_return	mmu_get_ptr_table_entry
++	
++
++
++
++.data
++Lmmu_engage_030_temp:
++	.space 12
++
++Lmemory_last:
++	.long	0		/* end of virtual memory */
++
++Lmemory_list:
++	.rept	MEMORY_MAP_ENTRIES
++	.long	0			/* address */
++	.long	0			/* size */
++	.endr
++
+diff -Naur linux-2.4.26/arch/m68k/boot/tekxp.ld linux-2.4.26-m68k/arch/m68k/boot/tekxp.ld
+--- linux-2.4.26/arch/m68k/boot/tekxp.ld	1970-01-01 10:00:00.000000000 +1000
++++ linux-2.4.26-m68k/arch/m68k/boot/tekxp.ld	2003-07-22 07:26:07.000000000 +1000
+@@ -0,0 +1,36 @@
++OUTPUT_FORMAT("binary")
++ENTRY(__start)
++SECTIONS
++{
++  .text :
++  {
++    *(.init)
++    *(.text)
++     ___CTOR_LIST__ = .;
++     LONG((___CTOR_END__ - ___CTOR_LIST__) / 4 - 2)
++     *(.ctors)
++     LONG(0)
++     ___CTOR_END__ = .;
++     ___DTOR_LIST__ = .;
++     LONG((___DTOR_END__ - ___DTOR_LIST__) / 4 - 2)
++     *(.dtors)
++     LONG(0)
++     ___DTOR_END__ = .;
++    *(.fini)
++     etext  =  .;
++     __etext  =  .;
++  }
++  .data  SIZEOF(.text) + ADDR(.text) :
++  {
++    *(.data .data2)
++     edata  =  .;
++     __edata  =  .;
++  }
++  .bss  SIZEOF(.data) + ADDR(.data) :
++  {
++    *(.bss)
++    *(COMMON)
++     end = .;
++     __end = .;
++  }
++}
+diff -Naur linux-2.4.26/arch/m68k/config.in linux-2.4.26-m68k/arch/m68k/config.in
+--- linux-2.4.26/arch/m68k/config.in	2004-02-19 00:36:30.000000000 +1100
++++ linux-2.4.26-m68k/arch/m68k/config.in	2004-02-19 09:12:42.000000000 +1100
+@@ -56,7 +56,14 @@
+ fi
+ bool 'Sun3x support' CONFIG_SUN3X
+ bool 'Sun3 support' CONFIG_SUN3
+-  
++bool 'TekXpress 2x support' CONFIG_TEKXP
++if [ "$CONFIG_TEKXP" = "y" ] ; then
++   define_bool CONFIG_PSMOUSE y
++   define_bool CONFIG_NO_CMDLINE y
++   string '  Kernel command line' CONFIG_BOOTCMD "root=nfs ip=192.168.3.10:192.168.2.1:192.168.3.1:255.255.255.0:tek.malware.de:eth0:none nfsroot=192.168.2.1:/tftpboot/XP20"
++   bool '  Report as MVME160' CONFIG_TEKXP_REPORT_MVME
++fi
++ 
+ bool 'Q40/Q60 support' CONFIG_Q40
+ 
+ comment 'Processor type'
+@@ -365,6 +372,9 @@
+ 	 fi
+          dep_tristate 'NE2000/NE1000 support' CONFIG_NE2000 m
+       fi
++      if [ "$CONFIG_TEKXP" = "y" ]; then
++        bool '  TekXpress on-board Sonic support' CONFIG_TEKSONIC
++      fi
+    fi
+    endmenu
+ 
+@@ -474,6 +484,10 @@
+    define_tristate CONFIG_SERIAL $CONFIG_DN_SERIAL
+ fi 
+ 
++if [ "$CONFIG_TEKXP" = "y" ] ; then
++   tristate 'SCC2962 serial support' CONFIG_SCC2692
++fi
++
+ if [ "$CONFIG_SUN3" = "y" -o "$CONFIG_SUN3X" = "y" ]; then
+    bool 'Sun3/3x builtin serial support' CONFIG_SUN3X_ZS
+ else
+@@ -499,7 +513,7 @@
+      "$CONFIG_SUN3X_ZS" = "y" -o "$CONFIG_SERIAL" = "y" -o \
+      "$CONFIG_MVME147_SCC" -o "$CONFIG_SERIAL167" = "y" -o \
+      "$CONFIG_MVME162_SCC" -o "$CONFIG_BVME6000_SCC" = "y" -o \
+-     "$CONFIG_DN_SERIAL" ]; then
++     "$CONFIG_DN_SERIAL" = "y" -o "$CONFIG_SCC2692" = "y" ]; then
+    bool 'Support for serial port console' CONFIG_SERIAL_CONSOLE
+ fi
+ bool 'Support for user serial device modules' CONFIG_USERIAL
+diff -Naur linux-2.4.26/arch/m68k/kernel/head.S linux-2.4.26-m68k/arch/m68k/kernel/head.S
+--- linux-2.4.26/arch/m68k/kernel/head.S	2003-06-14 00:51:31.000000000 +1000
++++ linux-2.4.26-m68k/arch/m68k/kernel/head.S	2003-07-22 07:21:27.000000000 +1000
+@@ -39,6 +39,12 @@
+  * Disabled caches
+  * Put us in supervisor state.
+  *
++ * On TekXpress (CONFIG_TEKXP) the boat loader enables the MMU since
++ * there might not be enough physically continues memory available
++ * for the kernel (e.g. 6 x 1MB memory configuration). The mapping is
++ * 1:1 for the first chunk of physical memory and does use the same
++ * table sizes as the temporary memory map used during enabling the MMU.
++ *
+  * The kernel setup code takes the following steps:
+  * .  Raise interrupt level
+  * .  Set up initial kernel memory mapping.
+@@ -480,6 +486,14 @@
+ 	addql	#4,%sp
+ .endm
+ 
++.macro	get_bi_record_continue	record,recsize,binfo
++	movel	\binfo,%sp@-
++	movel	\recsize,%sp@-
++	pea	\record
++	func_call	get_bi_record_continue
++	addl	#12,%sp
++.endm
++
+ func_define	serial_putc,1
+ func_define	console_putc,1
+ 
+@@ -543,6 +557,7 @@
+ #define is_not_apollo(lab) cmpl &MACH_APOLLO,%pc@(m68k_machtype); jne lab
+ #define is_not_q40(lab) cmpl &MACH_Q40,%pc@(m68k_machtype); jne lab
+ #define is_not_sun3x(lab) cmpl &MACH_SUN3X,%pc@(m68k_machtype); jne lab
++#define is_not_tekxp(lab) cmpl &MACH_TEKXP,%pc@(m68k_machtype); jne lab
+ 
+ #define hasnt_leds(lab) cmpl &MACH_HP300,%pc@(m68k_machtype); \
+ 			jeq 42f; \
+@@ -587,6 +602,7 @@
+ 	.long	MACH_BVME6000, BVME6000_BOOTI_VERSION
+ 	.long	MACH_MAC, MAC_BOOTI_VERSION
+ 	.long	MACH_Q40, Q40_BOOTI_VERSION	
++	.long	MACH_TEKXP, TEKXP_BOOTI_VERSION
+ 	.long	0
+ 1:	jra	SYMBOL_NAME(__start)
+ 
+@@ -993,6 +1009,40 @@
+ 
+ 	leds	0x4
+ 
++#ifdef CONFIG_TEKXP
++	is_not_tekxp(5f)
++
++	get_bi_record	BI_LAST
++	addw	#PAGESIZE-1,%a0
++	movel	%a0,%d2
++	andw	#-PAGESIZE,%d2
++
++	/* Convert it into a physical address */
++	movl	%d2,%d1
++	get_bi_record	BI_MEMCHUNK
++1:
++	cmpl	#-1,%d0
++	beqs	2f
++	subl	%a0@(4),%d1
++	bcs	4f
++	get_bi_record_continue	BI_MEMCHUNK,%d0,%a0
++	bras	1b
++4:
++	movl	%d1,%d0
++	addl	%a0@(4),%d0
++	addl	%a0@,%d0
++	bras	3f
++2:
++	movl	%d2,%d0
++3:
++
++	movel	%d0,availmem
++
++	/* Skip all the MMU stuff here */
++	bra	L(engage_done)
++5:
++#endif
++
+ /*
+  *	mmu_init
+  *
+@@ -1310,11 +1360,22 @@
+ 
+ 	putc	'P'
+ 	mmu_map         #0x80000000,#0,#0x02000000,#_PAGE_NOCACHE030
+-	
+-L(notapollo):	
+ 	jbra	L(mmu_init_done)
++
++L(notapollo):	
+ #endif
+ 
++#ifdef CONFIG_TEKXP
++	is_not_tekxp(L(nottekxp))
++
++	putc	'P'
++	mmu_map_tt	#0,#0xff000000,#0x01000000,#_PAGE_NOCACHE030
++
++L(nottekxp):
++#endif
++
++	jbra	L(mmu_init_done)
++
+ L(mmu_init_done):
+ 
+ 	putc	'G'
+@@ -1442,6 +1503,8 @@
+ 
+ 	movel	L(memory_start),availmem
+ 
++L(engage_done):
++
+ #ifdef CONFIG_AMIGA
+ 	is_not_amiga(1f)
+ 	/* fixup the Amiga custom register location before printing */
+@@ -1572,10 +1635,7 @@
+  * Returns: d0: size (-1 if not found)
+  *          a0: data pointer (end-of-records if not found)
+  */
+-func_start	get_bi_record,%d1
+-
+-	movel	ARG1,%d0
+-	lea	%pc@(SYMBOL_NAME(_end)),%a0
++.macro get_bi_record_core
+ #ifndef CONFIG_HP300
+ 1:	tstw	%a0@(BIR_TAG)
+ 	jeq	3f
+@@ -1591,8 +1651,22 @@
+ 	lea	%a0@(BIR_SIZE),%a0
+ 4:
+ #endif /* CONFIG_HP300 */
++.endm
++ 
++func_start	get_bi_record,%d1
++
++	movel	ARG1,%d0
++	lea	%pc@(SYMBOL_NAME(_end)),%a0
++	get_bi_record_core
+ func_return	get_bi_record
+ 
++func_start	get_bi_record_continue,%d1
++	movl	ARG3,%a0
++	addl	ARG2,%a0
++	subl	#BIR_DATA,%a0
++	movl	ARG1,%d0
++	get_bi_record_core
++func_return	get_bi_record_continue
+ 
+ /*
+  *	MMU Initialization Begins Here
+@@ -3020,6 +3094,27 @@
+ /* We count on the PROM initializing SIO1 */
+ #endif
+ 
++#ifdef CONFIG_TEKXP
++#if 0
++	is_not_tekxp(1f)
++	movl	%a0,-(%sp)
++        movl    #0xFF800000,%a0         /* address of UART */
++        clrb    0x34(%a0)
++        movb    #0x80,0x10(%a0)         /* ACR: baud rate set 2 */
++        clrb    0x14(%a0)               /* reset interrupt mask */
++        movb    #0x10,8(%a0)            /* CRA: reset MR pointer */
++        movb    #0x20,8(%a0)
++        movb    #0x30,8(%a0)
++        movb    #2,(%a0)                /* 7 bits per char */
++        movb    #7,(%a0)                /* one stop bit */
++        movb    #0xBB,4(%a0)            /* 9600 baud */
++        movb    #5,8(%a0)               /* enable tx and rx */
++	movl	(%sp)+,%a0
++	bras	L(serial_init_done)
++1:
++#endif
++#endif
++
+ L(serial_init_done):
+ func_return	serial_init
+ 
+@@ -3215,6 +3310,23 @@
+ 2:
+ #endif
+ 
++#ifdef CONFIG_TEKXP
++	is_not_tekxp(3f)
++	moveml	%a0/%d0-%d1,%sp@-
++	movl	#0xFF800000,%a0
++1:
++	movb	4(%a0),%d1
++	andb	#4,%d1
++	tstb	%d1
++	bne	2f
++	bra	1b
++2:
++	movb	%d0,12(%a0)
++	moveml	%sp@+,%d0-%d1/%a0
++	jbra	L(serial_putc_done)
++3:
++#endif
++
+ L(serial_putc_done):
+ func_return	serial_putc
+ 
+diff -Naur linux-2.4.26/arch/m68k/kernel/m68k_ksyms.c linux-2.4.26-m68k/arch/m68k/kernel/m68k_ksyms.c
+--- linux-2.4.26/arch/m68k/kernel/m68k_ksyms.c	2004-02-19 00:36:30.000000000 +1100
++++ linux-2.4.26-m68k/arch/m68k/kernel/m68k_ksyms.c	2003-11-12 22:57:01.000000000 +1100
+@@ -53,6 +53,7 @@
+ EXPORT_SYMBOL(mm_cachebits);
+ #endif
+ #endif /* !CONFIG_SUN3 */
++EXPORT_SYMBOL(flush_icache_user_range);
+ EXPORT_SYMBOL(m68k_debug_device);
+ EXPORT_SYMBOL(mach_hwclk);
+ EXPORT_SYMBOL(mach_get_ss);
+diff -Naur linux-2.4.26/arch/m68k/kernel/setup.c linux-2.4.26-m68k/arch/m68k/kernel/setup.c
+--- linux-2.4.26/arch/m68k/kernel/setup.c	2003-06-14 00:51:31.000000000 +1000
++++ linux-2.4.26-m68k/arch/m68k/kernel/setup.c	2003-07-22 07:20:23.000000000 +1000
+@@ -140,6 +140,7 @@
+ extern void config_hp300(void);
+ extern void config_q40(void);
+ extern void config_sun3x(void);
++extern void config_tekxp(void);
+ 
+ extern void mac_debugging_short (int, short);
+ extern void mac_debugging_long  (int, long);
+@@ -150,6 +151,10 @@
+ 
+ static void __init m68k_parse_bootinfo(const struct bi_record *record)
+ {
++#ifdef CONFIG_NO_CMDLINE
++    strncpy(m68k_command_line, CONFIG_BOOTCMD, CL_SIZE);
++#endif
++
+     while (record->tag != BI_LAST) {
+ 	int unknown = 0;
+ 	const unsigned long *data = record->data;
+@@ -354,6 +359,11 @@
+ 		config_sun3x();
+ 		break;
+ #endif
++#ifdef CONFIG_TEKXP
++	    case MACH_TEKXP:
++		config_tekxp();
++		break;
++#endif
+ 	    default:
+ 		panic ("No configuration setup");
+ 	}
+diff -Naur linux-2.4.26/arch/m68k/mac/iop.c linux-2.4.26-m68k/arch/m68k/mac/iop.c
+--- linux-2.4.26/arch/m68k/mac/iop.c	2003-06-14 00:51:31.000000000 +1000
++++ linux-2.4.26-m68k/arch/m68k/mac/iop.c	2004-06-20 21:17:45.000000000 +1000
+@@ -261,7 +261,7 @@
+ 		} else {
+ 			iop_base[IOP_NUM_ISM] = (struct mac_iop *) ISM_IOP_BASE_QUADRA;
+ 		}
+-		iop_base[IOP_NUM_SCC]->status_ctrl = 0;
++		iop_base[IOP_NUM_ISM]->status_ctrl = 0;
+ 		iop_ism_present = 1;
+ 	} else {
+ 		iop_base[IOP_NUM_ISM] = NULL;
+diff -Naur linux-2.4.26/arch/m68k/mm/Makefile linux-2.4.26-m68k/arch/m68k/mm/Makefile
+--- linux-2.4.26/arch/m68k/mm/Makefile	2003-06-14 00:51:31.000000000 +1000
++++ linux-2.4.26-m68k/arch/m68k/mm/Makefile	2003-07-02 09:46:59.000000000 +1000
+@@ -9,7 +9,7 @@
+ 
+ O_TARGET := mm.o
+ 
+-obj-y		:= init.o fault.o extable.o hwtest.o
++obj-y		:= cache.o init.o fault.o extable.o hwtest.o
+ 
+ ifndef CONFIG_SUN3
+ obj-y		+= kmap.o memory.o motorola.o
+diff -Naur linux-2.4.26/arch/m68k/mm/cache.c linux-2.4.26-m68k/arch/m68k/mm/cache.c
+--- linux-2.4.26/arch/m68k/mm/cache.c	1970-01-01 10:00:00.000000000 +1000
++++ linux-2.4.26-m68k/arch/m68k/mm/cache.c	2003-11-13 02:23:27.000000000 +1100
+@@ -0,0 +1,161 @@
++/*
++ *  linux/arch/m68k/mm/cache.c
++ *
++ *  Instruction cache handling
++ *
++ *  Copyright (C) 1995  Hamish Macdonald
++ */
++
++#include <linux/pagemap.h>
++
++#include <asm/traps.h>
++
++
++static unsigned long virt_to_phys_slow(unsigned long vaddr, mm_segment_t fs)
++{
++	if (CPU_IS_060) {
++		mm_segment_t old_fs = get_fs();
++		unsigned long paddr;
++
++		set_fs(fs);
++
++		/* The PLPAR instruction causes an access error if the translation
++		 * is not possible. To catch this we use the same exception mechanism
++		 * as for user space accesses in <asm/uaccess.h>. */
++		asm volatile (".chip 68060\n"
++			      "1: plpar (%0)\n"
++			      ".chip 68k\n"
++			      "2:\n"
++			      ".section .fixup,\"ax\"\n"
++			      "   .even\n"
++			      "3: sub.l %0,%0\n"
++			      "   jra 2b\n"
++			      ".previous\n"
++			      ".section __ex_table,\"a\"\n"
++			      "   .align 4\n"
++			      "   .long 1b,3b\n"
++			      ".previous"
++			      : "=a" (paddr)
++			      : "0" (vaddr));
++		set_fs(old_fs);
++		return paddr;
++	} else if (CPU_IS_040) {
++		mm_segment_t old_fs = get_fs();
++		unsigned long mmusr;
++
++		set_fs(fs);
++		
++		asm volatile (".chip 68040\n\t"
++			      "ptestr (%1)\n\t"
++			      "movec %%mmusr, %0\n\t"
++			      ".chip 68k"
++			      : "=r" (mmusr)
++			      : "a" (vaddr));
++		set_fs(old_fs);
++
++		if (mmusr & MMU_R_040)
++			return (mmusr & PAGE_MASK) | (vaddr & ~PAGE_MASK);
++	} else {
++		unsigned short mmusr;
++		unsigned long *descaddr;
++
++		asm volatile ("ptestr %3,%2@,#7,%0\n\t"
++			      "pmove %%psr,%1@"
++			      : "=a&" (descaddr)
++			      : "a" (&mmusr), "a" (vaddr), "d" (fs.seg));
++		if (mmusr & (MMU_I|MMU_B|MMU_L))
++			return 0;
++		descaddr = phys_to_virt((unsigned long)descaddr);
++		switch (mmusr & MMU_NUM) {
++		case 1:
++			return (*descaddr & 0xfe000000) | (vaddr & 0x01ffffff);
++		case 2:
++			return (*descaddr & 0xfffc0000) | (vaddr & 0x0003ffff);
++		case 3:
++			return (*descaddr & PAGE_MASK) | (vaddr & ~PAGE_MASK);
++		}
++	}
++	return 0;
++}
++
++/* Push n pages at kernel virtual address and clear the icache */
++/* RZ: use cpush %bc instead of cpush %dc, cinv %ic */
++void flush_icache_range(unsigned long address, unsigned long endaddr)
++{
++	if (CPU_IS_040_OR_060) {
++		address &= PAGE_MASK;
++
++		if (address >= PAGE_OFFSET && address < (unsigned long)high_memory) {
++			do {
++				asm volatile ("nop\n\t"
++					      ".chip 68040\n\t"
++					      "cpushp %%bc,(%0)\n\t"
++					      ".chip 68k"
++					      : : "a" (virt_to_phys((void *)address)));
++				address += PAGE_SIZE;
++			} while (address < endaddr);
++		} else {
++			do {
++				asm volatile ("nop\n\t"
++					      ".chip 68040\n\t"
++					      "cpushp %%bc,(%0)\n\t"
++					      ".chip 68k"
++					      : : "a" (virt_to_phys_slow(address, KERNEL_DS)));
++				address += PAGE_SIZE;
++			} while (address < endaddr);
++		}
++	} else {
++		unsigned long tmp;
++		asm volatile ("movec %%cacr,%0\n\t"
++			      "orw %1,%0\n\t"
++			      "movec %0,%%cacr"
++			      : "=&d" (tmp)
++			      : "di" (FLUSH_I));
++	}
++}
++
++void flush_icache_user_range(void *addr, unsigned long size)
++{
++	unsigned long address = (unsigned long)addr;
++	unsigned long endaddr = address + size;
++
++	if (CPU_IS_040_OR_060) {
++		address &= PAGE_MASK;
++
++		do {
++			asm volatile ("nop\n\t"
++				      ".chip 68040\n\t"
++				      "cpushp %%bc,(%0)\n\t"
++				      ".chip 68k"
++				      : : "a" (virt_to_phys_slow(address, get_fs())));
++			address += PAGE_SIZE;
++		} while (address < endaddr);
++	} else {
++		unsigned long tmp;
++		asm volatile ("movec %%cacr,%0\n\t"
++			      "orw %1,%0\n\t"
++			      "movec %0,%%cacr"
++			      : "=&d" (tmp)
++			      : "di" (FLUSH_I));
++	}
++}
++
++void flush_icache_user_page(struct vm_area_struct *vma, struct page *page,
++			    unsigned long addr, int len)
++{
++	if (CPU_IS_040_OR_060) {
++		asm volatile ("nop\n\t"
++			      ".chip 68040\n\t"
++			      "cpushp %%bc,(%0)\n\t"
++			      ".chip 68k"
++			      : : "a" (page_to_phys(page)));
++	} else {
++		unsigned long tmp;
++		asm volatile ("movec %%cacr,%0\n\t"
++			      "orw %1,%0\n\t"
++			      "movec %0,%%cacr"
++			      : "=&d" (tmp)
++			      : "di" (FLUSH_I));
++	}
++}
++
+diff -Naur linux-2.4.26/arch/m68k/tekxp/Makefile linux-2.4.26-m68k/arch/m68k/tekxp/Makefile
+--- linux-2.4.26/arch/m68k/tekxp/Makefile	1970-01-01 10:00:00.000000000 +1000
++++ linux-2.4.26-m68k/arch/m68k/tekxp/Makefile	2003-07-22 07:20:23.000000000 +1000
+@@ -0,0 +1,15 @@
++#
++# Makefile for Linux arch/m68k/tekxp source directory
++#
++# Note! Dependencies are done automagically by 'make dep', which also
++# removes any old dependencies. DON'T put your own dependencies here
++# unless it's something special (ie not a .c file).
++#
++# Note 2! The CFLAGS definitions are now in the main makefile...
++
++O_TARGET := tekxp.o
++
++export-objs	:= tek_ksyms.o tekuart.o nvram.o
++obj-y		:= config.o tekuart.o nvram.o tek_ksyms.o
++
++include $(TOPDIR)/Rules.make
+diff -Naur linux-2.4.26/arch/m68k/tekxp/config.c linux-2.4.26-m68k/arch/m68k/tekxp/config.c
+--- linux-2.4.26/arch/m68k/tekxp/config.c	1970-01-01 10:00:00.000000000 +1000
++++ linux-2.4.26-m68k/arch/m68k/tekxp/config.c	2003-07-22 07:20:24.000000000 +1000
+@@ -0,0 +1,199 @@
++/*
++ *  linux/arch/m68k/tekxp/config.c
++ *
++ *  Copyright (C) 2002,2003 Michael Mueller <malware@t-online.de>
++ *
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License. See the file COPYING in the main directory of this archive for
++ * more details.
++ */
++
++#include <linux/config.h>
++#include <linux/types.h>
++#include <linux/console.h>
++#include <linux/sched.h>
++
++#include <asm/machdep.h>
++#include <asm/irq.h>
++#include <asm/tekirq.h>
++#include <asm/tekuart.h>
++#include <asm/teknvram.h>
++
++unsigned char aux_device_present = 1;
++
++/*
++ * While the support for this platform is still under development we just
++ * spit out a stupid message whenever an unexpected IRQ does occur.
++ * This message when appearing once most possible will run forever,
++ * since we have no interrupt controller we can give an acknowledgement.
++ */
++
++static void tekxp_int_unhandled(int irq, void *dev_id, struct pt_regs *regs)
++{
++	printk(KERN_ERR "Unhandled IRQ %d\n", irq);
++}
++
++static void (*tekxp_default_handler[SYS_IRQS])(int, void *, struct pt_regs *) = {
++	tekxp_int_unhandled, tekxp_int_unhandled, tekxp_int_unhandled,
++	tekxp_int_unhandled, tekxp_int_unhandled, tekxp_int_unhandled,
++	tekxp_int_unhandled, tekxp_int_unhandled
++};
++
++/*
++ * Reset the machine.
++ */
++static void tekxp_reset(void)
++{
++	tek_uart_set_op(4);
++	__asm__ volatile("1:\tbras 1b\r\n");
++}
++
++#ifdef USE_VIDEO_REFRESH_AS_TIMER
++/*
++ * Timer interrupt handler
++ */
++
++static void tek_timer(int irq, void *dev_id, struct pt_regs *regs)
++{
++	register void (*handler)(int,void*,struct pt_regs*) = dev_id;
++
++	(*(volatile unsigned char *)(0xFFB00000))++;
++
++	handler(irq, NULL, regs);
++}
++#endif
++
++/*
++ * To initialize the scheduling we setup a timer on the DUART.
++ * The hardware offers a screen refresh interrupt but its rate varies with
++ * the display mode and in all cases is less than HZ.
++ */
++
++static void __init tek_sched_init(void (*handler)(int, void *, struct pt_regs *))
++{
++#ifdef USE_VIDEO_REFRESH_AS_TIMER
++	/*
++	 * Enable the timer
++	 */
++	(*(volatile unsigned char *)(0xFFB00000))++;
++
++	if ( request_irq(TEK_IRQ_VIDEO, tek_timer, IRQ_FLG_LOCK, "timer", handler) )
++		panic("Could not register timer interrupt");
++#else
++	tek_uart_setup_timer(handler);
++#endif
++}
++
++/*
++ * Currently there is no such function implemented.
++ * However one could read the counter registers of the DUART here.
++ */
++
++static unsigned long tek_gettimeoffset(void)
++{
++	return 0;
++}
++
++/*
++ * There is not much to do with the keyboard here.
++ * The TekXpress Bootmonitor did most of the work already. What is left
++ * will be done by the PC keyboard driver later.
++ */
++
++static int __init tek_dummy_keyb_init(void)
++{
++	return 0;
++}
++
++/*
++ * This function simply modifies the C character for a new line into the
++ * MSDOS-typical version of it.
++ */
++
++static void tek_serial_console_write(struct console *co, const char *s,
++                                       unsigned int count)
++{
++	while ( count-- )
++	{
++		char c = *s++;
++		if ( c == '\n' )
++			tek_uart_putchar(0, '\r', 1);
++		tek_uart_putchar(0, c, 1);
++	}
++}
++
++/*
++ */
++
++static struct console tekxp_console_driver = {
++        name:           "debug",
++        flags:          CON_PRINTBUFFER,
++        index:          -1,
++};
++
++/*
++ */
++static void __init tekxp_debug_init(void)
++{
++	extern char m68k_debug_device[];
++
++	if (!strcmp( m68k_debug_device, "ser" )) {
++		/* no initialization required (?) */
++		tekxp_console_driver.write = tek_serial_console_write;
++		register_console(&tekxp_console_driver);
++        }
++}
++
++/*
++ * Get the model number as stored in NVRAM and make it readable.
++ *
++ * FIXME: This does not work as expected.
++ */
++
++static void tekxp_get_model(char *model)
++{
++#ifdef CONFIG_TEKXP_REPORT_MVME
++    sprintf(model, "Motorola MVME160");
++#else
++    unsigned short m = nvram_readw(NVRAM_DISPLAY);
++    static const int model_number[] = {24,25,27,29,25,21,25,25};
++
++    if ( m < sizeof model_number )
++	sprintf(model, "TekXpress XP%02d", model_number[m]);
++    else
++	sprintf(model, "TekXpress");
++#endif
++}
++
++/*
++ * This basicly sets the machine dependent variables as needed by
++ * the m68k port of the linux kernel.
++ * Besides it initializes a console for kernel messages and the NVRAM
++ * routines.
++ */
++
++void __init config_tekxp(void)
++{
++	tekxp_debug_init();
++	init_nvram(NULL);
++
++	mach_get_model		= tekxp_get_model;
++	mach_sched_init		= tek_sched_init;
++#ifdef CONFIG_VT
++	mach_keyb_init		= tek_dummy_keyb_init;
++#endif
++	mach_init_IRQ		= tek_uart_init_IRQ;
++	mach_request_irq	= tek_uart_request_irq;
++	mach_free_irq		= tek_uart_free_irq;
++	enable_irq		= tek_uart_enable_irq;
++	disable_irq		= tek_uart_disable_irq;
++	mach_get_irq_list	= tek_uart_get_irq_list;
++	mach_gettimeoffset	= tek_gettimeoffset;
++	mach_max_dma_address	= 0xffffffff;
++#ifdef CONFIG_DUMMY_CONSOLE
++	conswitchp		= &dummy_con;
++#endif
++	mach_default_handler	= &tekxp_default_handler;
++	mach_reset		= tekxp_reset;
++}
++
+diff -Naur linux-2.4.26/arch/m68k/tekxp/nvram.c linux-2.4.26-m68k/arch/m68k/tekxp/nvram.c
+--- linux-2.4.26/arch/m68k/tekxp/nvram.c	1970-01-01 10:00:00.000000000 +1000
++++ linux-2.4.26-m68k/arch/m68k/tekxp/nvram.c	2003-07-22 07:20:24.000000000 +1000
+@@ -0,0 +1,164 @@
++/*
++ *  linux/arch/m68k/tekxp/nvram.c
++ *
++ *  Copyright (C) 2002,2003 Michael Mueller <malware@t-online.de>
++ *
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License. See the file COPYING in the main directory of this archive for
++ * more details.
++ */
++
++#include <linux/config.h>
++#include <linux/kernel.h>
++#include <linux/types.h>
++#include <linux/errno.h>
++#include <linux/mm.h>
++#include <linux/slab.h>
++#include <asm/io.h>
++#include <asm/teknvram.h>
++#include <asm/tekuart.h>
++
++#define DEBUG
++
++#ifdef DEBUG
++static int nvram_init = 0;
++#endif
++static u_char *eeprom_ptr;
++static u_char nvram_copy[EEPROM_SIZE];
++
++static void ee_enable(void)
++{
++#if 0
++	// TODO: We still rely on the I/O being transparently mapped
++	// TODO: This might interfere with other code using the UART
++	*(volatile u_char*)0xFF800038 = (u_char)0x80;
++#else
++	tek_uart_set_op(7);
++#endif
++}
++
++static void ee_disable(void)
++{
++#if 0
++	// TODO: We still rely on the I/O being transparently mapped
++	// TODO: This might interfere with other code using the UART
++	*(volatile u_char*)0xFF80003C = (u_char)0x80;
++#else
++	tek_uart_clr_op(7);
++#endif
++}
++
++void init_nvram(unsigned long *mem_start)
++{
++	u_char chksum;
++	u_char chksum2;
++	u_short chksum_complete;
++	int i;
++
++	// FIXME: When this code is running ioremap* is not working yet.
++	//  So we access the EEPROM through the transparent mapping
++	//  established in head.S
++#if 0
++	// Map EEPROM into kernel memory space
++	eeprom_ptr = ioremap_writethrough(EEPROM_BASE, EEPROM_SIZE);
++	if ( !eeprom_ptr )
++	{
++		panic(KERN_ERR "Could not map NVRAM into kernel memory space\n");
++	}
++#else
++	eeprom_ptr = (u_char*)EEPROM_BASE;
++#endif
++
++	// Make a copy of the content to avoid access count excess
++	ee_enable();
++	memcpy(nvram_copy, eeprom_ptr, EEPROM_SIZE);
++	ee_disable();
++
++	// Check the checksum of the content
++	chksum = 0xFF;
++	chksum2 = 0xFF;
++	for ( i = EEPROM_SIZE-1; i >= 0 ; i-- )
++	{
++		u_long new_chk /* d0 */ = chksum + nvram_copy[i];
++		if ( new_chk > 0xFF )
++			new_chk++;
++		chksum = new_chk & 0xFF;
++
++		new_chk = chksum2 + chksum;
++		if ( new_chk > 0xFF )
++			new_chk++;
++		chksum2 = new_chk++;
++	}
++
++	chksum_complete = ((u_short)chksum2 << 8) + chksum;
++	if ( chksum_complete == 0xFFFF )
++	{
++		printk("NVRAM checksum is ok\n");
++	}
++	else
++	{
++		printk(KERN_WARNING "NVRAM checksum invalid!\n");
++	}
++
++#ifdef DEBUG
++	nvram_init++;
++#endif
++}
++
++u_char nvram_readb(int ofs)
++{
++#ifdef DEBUG
++	if ( !nvram_init )
++	{
++		printk(KERN_ERR "Trial to read uninitialized NVRAM\n");
++		return 0xFF;
++	}
++#endif
++	if ( ofs < 0 || ofs >= EEPROM_SIZE )
++		return 0xFF;
++
++	return nvram_copy[ofs];
++}
++
++u_short nvram_readw(int ofs)
++{
++#ifdef DEBUG
++	if ( !nvram_init )
++	{
++		printk(KERN_ERR "Trial to read uninitialized NVRAM\n");
++		return 0xFFFFU;
++	}
++	if ( ofs & 1 )
++	{
++		panic("Unaligned word access to NVRAM");
++		return 0xFFFFU;
++	}
++#endif
++	if ( ofs < 0 || ofs >= EEPROM_SIZE )
++		return 0xFFFFU;
++
++	return *(u_short*)(nvram_copy + ofs);
++}
++
++
++u_long nvram_readl(int ofs)
++{
++#ifdef DEBUG
++	if ( !nvram_init )
++	{
++		printk(KERN_ERR "Trial to read uninitialized NVRAM\n");
++		return 0xFFFFFFFFUL;
++	}
++	if ( ofs & 3 )
++	{
++		panic("Unaligned word access to NVRAM");
++		return 0xFFFFFFFFUL;
++	}
++#endif
++	if ( ofs < 0 || ofs >= EEPROM_SIZE )
++		return 0xFFFFFFFFUL;
++
++	return *(u_long*)(nvram_copy + ofs);
++}
++
++
+diff -Naur linux-2.4.26/arch/m68k/tekxp/tek_ksyms.c linux-2.4.26-m68k/arch/m68k/tekxp/tek_ksyms.c
+--- linux-2.4.26/arch/m68k/tekxp/tek_ksyms.c	1970-01-01 10:00:00.000000000 +1000
++++ linux-2.4.26-m68k/arch/m68k/tekxp/tek_ksyms.c	2003-07-22 07:20:24.000000000 +1000
+@@ -0,0 +1,23 @@
++/*
++ *  linux/arch/m68k/tekxp/tek_ksyms.c
++ *
++ *  Copyright (C) 2002,2003 Michael Mueller <malware@t-online.de>
++ *
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License. See the file COPYING in the main directory of this archive for
++ * more details.
++ */
++
++#include <linux/config.h>
++#include <linux/module.h>
++#include <linux/types.h>
++#include <asm/ptrace.h>
++#include <asm/tekuart.h>
++#include <asm/teknvram.h>
++
++EXPORT_SYMBOL(tek_uart_putchar);
++EXPORT_SYMBOL(tek_uart_lock);
++EXPORT_SYMBOL(nvram_readb);
++EXPORT_SYMBOL(nvram_readw);
++EXPORT_SYMBOL(nvram_readl);
++
+diff -Naur linux-2.4.26/arch/m68k/tekxp/tekuart.c linux-2.4.26-m68k/arch/m68k/tekxp/tekuart.c
+--- linux-2.4.26/arch/m68k/tekxp/tekuart.c	1970-01-01 10:00:00.000000000 +1000
++++ linux-2.4.26-m68k/arch/m68k/tekxp/tekuart.c	2003-07-22 07:20:24.000000000 +1000
+@@ -0,0 +1,476 @@
++/*
++ *  linux/arch/m68k/tekxp/tekuart.c
++ *
++ *  Copyright (C) 2002,2003 Michael Mueller <malware@t-online.de>
++ *
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License. See the file COPYING in the main directory of this archive for
++ * more details.
++ */
++
++#include <linux/config.h>
++#include <linux/types.h>
++#include <linux/sched.h>
++#include <linux/kernel.h>
++#include <linux/mm.h>
++#include <linux/errno.h>
++#include <linux/spinlock.h>
++
++#include <asm/system.h>
++#include <asm/irq.h>
++#include <asm/pgtable.h>
++#include <asm/tekuart.h>
++#include <asm/tekirq.h>
++
++spinlock_t tek_uart_lock = SPIN_LOCK_UNLOCKED;
++static spinlock_t tek_irq_lock = SPIN_LOCK_UNLOCKED;
++
++/*
++ * Base address of the UART
++ *
++ * Initialized to the address accessable by a transparent mapping.
++ *
++ * FIXME: This is never mapped into the memory space of the kernel
++ *        since memory mapping is not available while initializing the
++ *        platform specific stuff.
++ */
++
++static tek_uart_t *uart = (tek_uart_t*)TEK_UART_BASE;
++
++/*
++ * Interrupt handler tables and call statistics
++ */
++
++static irq_handler_t irq_handlers[UART_IRQS];
++static int tek_irq_stat[UART_IRQS];
++
++#define IRQ_IDX(n) ((n)-SYS_IRQS)
++
++/*
++ * Dummy variable used as Lvalue when we need to read from the
++ * hardware without any need for the actual result value.
++ */
++
++static volatile u_char dummy;
++
++/*
++ * Variables used for the interrupt routine
++ */
++
++static u_char tek_uart_imr;		/* shadow Interrupt Mask Register   */
++static u_char tek_uart_isr;		/* shadow Interrupt Status Register */
++#ifndef USE_VIDEO_REFRESH_AS_TIMER
++static unsigned short tek_timer;	/* value to put into the counter    */
++#endif
++
++static u_char timer_mode = 0x80;	/* choose second baudrate set       */
++
++/*
++ * Set the interrupt mask register.
++ */
++
++static inline void __set_IMR(void)
++{
++	uart->wr.IMR = tek_uart_imr;
++}
++
++static void set_IMR(void)
++{
++	unsigned long flags;
++	spin_lock_irqsave(tek_uart_lock, flags);
++	__set_IMR();
++	spin_unlock_irqrestore(tek_uart_lock, flags);
++}
++
++/*
++ * Interrupt handler.
++ *
++ * Besides demultiplexing the interrupt sources of the DUART it does take
++ * care of the counter prior to calling the kernel handler.
++ */
++
++static void tek_irqhandler(int irq, void *dev_id, struct pt_regs *regs)
++{
++	int i;
++
++	/*
++	 * Read the ISR once. This does even clear all pending interrupts.
++	 */
++	unsigned char ISR = uart->rd.ISR;
++
++#ifndef USE_VIDEO_REFRESH_AS_TIMER
++	/*
++	 * Handle the counter.
++	 */
++	if ( ISR & (1<<IRQ_IDX(TEK_IRQ_TIMER_A)) )
++		dummy = uart->rd.CounterStop;	/* just ack */
++#endif
++
++#ifdef DEBUG
++	printk("tek_irqhandler: ISR=%02x IMR=%02x\n", ISR, tek_uart_imr);
++#endif
++
++	/*
++	 * Store the interrupt status for later usage.
++	 *
++	 * This does also queue disabled interrupts for later usage.
++	 */
++	ISR = (tek_uart_isr |= ISR) & tek_uart_imr;
++
++	/*
++	 * Run the handler for each interrupt source.
++	 */
++	for ( i=0; i<UART_IRQS; i++ )
++	{
++		if ( ISR & (1<<i) )
++		{
++			unsigned long flags;
++			spin_lock_irqsave(tek_irq_lock, flags);
++
++			tek_irq_stat[i]++;
++
++			if ( irq_handlers[i].handler )
++			{
++				irq_handler_t handler = irq_handlers[i];
++				spin_unlock_irqrestore(tek_irq_lock, flags);
++
++				handler.handler(i, handler.dev_id, regs);
++			}
++			else
++				spin_unlock_irqrestore(tek_irq_lock, flags);
++			tek_uart_isr &= ~(1<<i);
++		}
++	}
++}
++
++/*
++ * Set an output line (to Low)
++ *
++ * Following values for the line are of special use:
++ *	3	connected to internal beeper
++ *	4	will reset the machine
++ */
++
++void tek_uart_set_op(int nr)
++{
++	unsigned long flags;
++	spin_lock_irqsave(tek_uart_lock, flags);
++
++	uart->wr.OutputSet = 1 << nr;
++
++	spin_unlock_irqrestore(tek_uart_lock, flags);
++}
++
++/*
++ * Clear an output line (to High)
++ */
++
++void tek_uart_clr_op(int nr)
++{
++	unsigned long flags;
++	spin_lock_irqsave(tek_uart_lock, flags);
++
++	uart->wr.OutputClear = 1 << nr;
++
++	spin_unlock_irqrestore(tek_uart_lock, flags);
++}
++
++/*
++ * Setup an interrupt handler managing all interrupt sources of the DUART.
++ */
++
++void __init tek_uart_init_IRQ(void)
++{
++	unsigned long flags;
++	spin_lock_irqsave(tek_uart_lock, flags);
++
++	/*
++	 * Disable all interrupts
++	 */
++	tek_uart_imr = 0;
++	__set_IMR();
++
++
++	/*
++	 * Clear pending interrupts
++	 */
++	tek_uart_isr = 0;
++	dummy = uart->rd.ISR;
++
++	spin_unlock_irqrestore(tek_uart_lock, flags);
++
++	/*
++	 * Register the interrupt handler
++	 */
++	if ( request_irq(TEK_IRQ_UART, tek_irqhandler, IRQ_FLG_LOCK, "UART demux", NULL) )
++	{
++		panic("Could not register UART demux interrupt handler");
++	}
++}
++
++/*
++ * Enable a specific interrupt source of the DUART.
++ */
++
++static inline void enable_uart_irq(unsigned int irq)
++{
++	unsigned long flags;
++	spin_lock_irqsave(tek_uart_lock, flags);
++
++	tek_uart_imr |= (1<<irq);
++	__set_IMR();
++
++	spin_unlock_irqrestore(tek_uart_lock, flags);
++}
++
++/*
++ * Disable a specific interrupt source of the DUART.
++ */
++
++static inline void disable_uart_irq(unsigned int irq)
++{
++	unsigned long flags;
++	spin_lock_irqsave(tek_uart_lock, flags);
++
++	tek_uart_imr &= ~(1<<irq);
++	__set_IMR();
++
++	spin_unlock_irqrestore(tek_uart_lock, flags);
++}
++
++/*
++ * Register an interrupt handler for an interrupt source of the DUART.
++ *
++ * This is also called for system interrupts. These requests are passed
++ * to the generic function made available by the m68k port.
++ */
++
++int tek_uart_request_irq(unsigned int irq,
++                          void (*handler)(int, void *, struct pt_regs *),
++                          unsigned long flags,
++                          const char *devname, void *dev_id)
++{
++	unsigned long _flags;
++
++	if ( irq < SYS_IRQS )
++		return sys_request_irq(irq, handler, flags, devname, dev_id);
++	irq -= SYS_IRQS;
++
++	if ( irq >= UART_IRQS )
++		return -ENXIO;
++	if ( !handler )
++		return -EINVAL;
++
++	spin_lock_irqsave(tek_irq_lock, _flags);
++
++	if ( irq_handlers[irq].handler && (irq_handlers[irq].dev_id != dev_id) )	{
++		spin_unlock_irqrestore(tek_irq_lock, _flags);
++		return -EBUSY;
++	}
++
++	irq_handlers[irq].handler = handler;
++	irq_handlers[irq].flags	  = flags;
++	irq_handlers[irq].devname = devname;
++	irq_handlers[irq].dev_id  = dev_id;
++
++	spin_unlock_irqrestore(tek_irq_lock, _flags);
++
++	enable_uart_irq(irq);
++
++	return 0;
++}
++
++/*
++ * Unregister an interrupt handler for an interrupt source of the DUART.
++ *
++ * This is also called for system interrupts. These requests are passed
++ * to the generic function made available by the m68k port.
++ */
++
++void tek_uart_free_irq(unsigned int irq, void *dev_id)
++{
++	unsigned long flags;
++
++	if ( irq < SYS_IRQS )
++		return sys_free_irq(irq, dev_id);
++	irq -= SYS_IRQS;
++
++	if ( irq >= UART_IRQS )
++		return /* -ENXIO */;
++
++	spin_lock_irqsave(tek_irq_lock, flags);
++
++	if ( !irq_handlers[irq].handler )
++		return /* -EINVAL */;
++
++	if ( dev_id != irq_handlers[irq].dev_id )
++		return /* -EPERM */;
++
++	disable_uart_irq(irq);
++	irq_handlers[irq].handler = NULL;
++
++	spin_unlock_irqrestore(tek_irq_lock, flags);
++}
++
++/*
++ * Wrapper for enabling an IRQ.
++ */
++
++void tek_uart_enable_irq(unsigned int irq)
++{
++	if ( irq < SYS_IRQS )
++		return;
++
++	enable_uart_irq(irq - SYS_IRQS);
++}
++
++/*
++ * Wrapper for disabling an IRQ.
++ */
++
++void tek_uart_disable_irq(unsigned int irq)
++{
++	if ( irq < SYS_IRQS )
++		return;
++
++	disable_uart_irq(irq - SYS_IRQS);
++}
++
++/*
++ * Build an ASCII list of the interrupt handlers registered and the call
++ * statistics. This part of the content of /proc/interrupts.
++ */
++
++int tek_uart_get_irq_list(char *buf)
++{
++	int i, len = 0;
++	unsigned long flags;
++	spin_lock_irqsave(tek_irq_lock, flags);
++
++	for ( i=0; i < UART_IRQS; i++ )
++	{
++		if ( irq_handlers[i].handler )
++		{
++			len += sprintf(buf+len, "uart %2d: %10u ", i, tek_irq_stat[i]);
++			len += sprintf(buf+len, "  ");
++			len += sprintf(buf+len, "%s\n", irq_handlers[i].devname);
++		}
++	}
++	spin_unlock_irqrestore(tek_irq_lock, flags);
++	return len;
++}
++
++#ifndef USE_VIDEO_REFRESH_AS_TIMER
++
++static void tek_irq2(int irq, void *dev_id, struct pt_regs *regs)
++{
++	/*
++	 * Acknowledge the interrupt
++	 */
++	(*(volatile unsigned char *)(0xFFB00000))++;
++
++}
++
++/*
++ * Setup a timer interrupt.
++ */
++void __init tek_uart_setup_timer(void (*handler)(int, void *, struct pt_regs *))
++{
++	unsigned long flags;
++
++	/*
++	 * Calculate the divider of the clock interval
++	 */
++	if ( HZ < 32 )
++	{
++		/*
++		 * Use 115.2k base clock.
++		 *
++		 * Do not permit frequencies <2Hz, they can be provided
++		 * by further software dividing only and are not very
++		 * usefull.
++		 */
++		if ( HZ < 2 )
++			panic("I will not provide such a slow timer");
++
++		timer_mode |= 0x70;
++		tek_timer = 115200 / HZ;
++	}
++	else if ( HZ <= 57600 )
++	{
++		/*
++		 * Use 115.2k * 16 base clock
++		 */
++		timer_mode |= 0x60;
++		tek_timer = (115200*16) / HZ;
++	}
++	else
++		/*
++		 * We can not provide a faster timer.
++		 */
++		panic("Old hardware is no ferrari");
++
++	/*
++	 * And setup an handler for the video refresh.
++	 */
++	if ( request_irq(TEK_IRQ_VIDEO, tek_irq2, IRQ_FLG_LOCK, "display", NULL) )
++		panic("Could not register display interrupt");
++
++	/*
++	 * Setup an handler for the timer interrupt.
++	 */
++        if ( request_irq(TEK_IRQ_TIMER_A, handler, IRQ_FLG_LOCK, "timer", NULL) )
++		panic("Could not register timer interrupt");
++
++	spin_lock_irqsave(tek_uart_lock, flags);
++
++	/*
++	 * Start the timer.
++	 */
++	dummy = uart->rd.CounterStop;
++	uart->wr.ACR = timer_mode;
++	uart->wr.CRUR = tek_timer >> 8;
++	uart->wr.CTLR = tek_timer & 255;
++	dummy = uart->rd.CounterStart;
++
++	spin_unlock_irqrestore(tek_uart_lock, flags);
++
++	/*
++	 * Enable the video refresh interrupt
++	 */
++	(*(volatile unsigned char *)(0xFFB00000))++;
++}
++#endif
++
++/*
++ * Output a character on the serial port A.
++ *
++ * This routine is called from interrupt and non-interrupt contexts.
++ */
++
++void tek_uart_putchar(int channel, int c, int waitloop)
++{
++	unsigned long flags;
++	spin_lock_irqsave(tek_uart_lock, flags);
++
++	channel &= 1;
++
++	if ( waitloop )
++	{
++//		disable_uart_irq(channel ? 4 : 0);
++		while ( !((channel ? uart->rd.SRB : uart->rd.SRA) & 4) )
++			;
++	}
++
++	(channel ? uart->wr.THRB : uart->wr.THRA) = (u_char)c;
++
++        if ( waitloop )
++	{
++		while ( !((channel ? uart->rd.SRB : uart->rd.SRA) & 4) )
++                        ;
++//		enable_uart_irq(channel ? 4 : 0);
++	}
++
++	spin_unlock_irqrestore(tek_uart_lock, flags);
++}
++
+diff -Naur linux-2.4.26/drivers/char/16c552.h linux-2.4.26-m68k/drivers/char/16c552.h
+--- linux-2.4.26/drivers/char/16c552.h	1970-01-01 10:00:00.000000000 +1000
++++ linux-2.4.26-m68k/drivers/char/16c552.h	2001-10-22 19:34:32.000000000 +1000
+@@ -0,0 +1,165 @@
++/*
++ * Definitions for the 16c552 DACE
++ * (dual-asynchronous-communications-element) used on the GVP
++ * IO-Extender. 
++ *
++ * Basically this is two 16c550 uarts's and a parallel port, which is
++ * why the serial definitions should be valid for the 16c550 uart
++ * aswell.
++ *
++ * Data was taken from National Semiconductors duart 16c552
++ * data-sheets and the Texas Instruments DACE 16c552 data-sheets (the
++ * NS version of the chip is _non_ standard and their data-sheets did
++ * cost me several wasted hours of work).
++ *
++ * This file is (C) 1995 Jes Sorensen (jds@kom.auc.dk)
++ *
++ * Moved from drivers/char/ to include/linux/, because it's useful
++ * on more than just the one card. I'm using it on the hp300 DCA
++ * serial driver, for example.  
++ *      -- Peter Maydell <pmaydell@chiark.greenend.org.uk> 05/1998
++ */
++
++#ifndef _16C552_H_
++#define _16C552_H_
++
++/* Serial stuff */
++
++struct uart_16c550 {
++	volatile u_char skip0;
++	volatile u_char RBR;
++	volatile u_char skip1;
++	volatile u_char IER;
++	volatile u_char skip2;
++	volatile u_char IIR;
++	volatile u_char skip3;
++	volatile u_char LCR;
++	volatile u_char skip4;
++	volatile u_char MCR;
++	volatile u_char skip5;
++	volatile u_char LSR;
++	volatile u_char skip6;
++	volatile u_char MSR;
++	volatile u_char skip7;
++	volatile u_char SCR;
++};
++
++#define THR RBR
++#define FCR IIR
++#define DLL RBR
++#define DLM IER
++#define AFR IIR
++
++/*
++ * Bit-defines for the various registers.
++ */
++
++
++/* IER */
++
++#define ERDAI         (1<<0)
++#define ETHREI        (1<<1)
++#define ELSI          (1<<2)
++#define EMSI          (1<<3)
++
++/* IIR - Interrupt Ident. Register */
++
++#define IRQ_PEND      (1<<0) /* NOTE: IRQ_PEND=0 implies irq pending */
++#define IRQ_ID1       (1<<1)
++#define IRQ_ID2       (1<<2)
++#define IRQ_ID3       (1<<3)
++#define FIFO_ENA0     (1<<6) /* Both these are set when FCR(1<<0)=1 */
++#define FIFO_ENA1     (1<<7)
++
++#define IRQ_RLS  (IRQ_ID1 | IRQ_ID2)
++#define IRQ_RDA  (IRQ_ID2)
++#define IRQ_CTI  (IRQ_ID2 | IRQ_ID3)
++#define IRQ_THRE (IRQ_ID1)
++#define IRQ_MS   0
++
++/* FCR - FIFO Control Register */
++
++#define FIFO_ENA      (1<<0)
++#define RCVR_FIFO_RES (1<<1)
++#define XMIT_FIFO_RES (1<<2)
++#define DMA_MODE_SEL  (1<<3)
++#define RCVR_TRIG_LSB (1<<6)
++#define RCVR_TRIG_MSB (1<<7)
++
++#define FIFO_TRIG_1   0x00
++#define FIFO_TRIG_4   RCVR_TRIG_LSB
++#define FIFO_TRIG_8   RCVR_TRIG_MSB
++#define FIFO_TRIG_14  RCVR_TRIG_LSB|RCVR_TRIG_MSB
++
++/* LCR - Line Control Register */
++
++#define WLS0          (1<<0)
++#define WLS1          (1<<1)
++#define STB           (1<<2)
++#define PEN           (1<<3)
++#define EPS           (1<<4)
++#define STICK_PARITY  (1<<5)
++#define SET_BREAK     (1<<6)
++#define DLAB          (1<<7)
++
++#define data_5bit      0x00
++#define data_6bit      0x01
++#define data_7bit      0x02
++#define data_8bit      0x03
++
++
++/* MCR - Modem Control Register */
++
++#define DTR           (1<<0)
++#define RTS           (1<<1)
++#define OUT1          (1<<2)
++#define OUT2          (1<<3)
++#define LOOP          (1<<4)
++
++/* LSR - Line Status Register */
++
++#define DR            (1<<0)
++#define OE            (1<<1)
++#define PE            (1<<2)
++#define FE            (1<<3)
++#define BI            (1<<4)
++#define THRE          (1<<5)
++#define TEMT          (1<<6)
++#define RCVR_FIFO_ERR (1<<7)
++
++/* MSR - Modem Status Register */
++
++#define DCTS          (1<<0)
++#define DDSR          (1<<1)
++#define TERI          (1<<2)
++#define DDCD          (1<<3)
++#define CTS           (1<<4)
++#define DSR           (1<<5)
++#define RING_I        (1<<6)
++#define DCD           (1<<7)
++
++/* AFR - Alternate Function Register */
++
++#define CONCUR_WRITE  (1<<0)
++#define BAUDOUT       (1<<1)
++#define RXRDY         (1<<2)
++
++/* Parallel stuff */
++
++/*
++ * Unfortunately National Semiconductors did not supply the
++ * specifications for the parallel port in the chip :-(
++ * TI succed though, so here they are :-)
++ *
++ * Defines for the bits can be found by including <linux/lp.h>
++ */
++struct IOEXT_par {
++	volatile u_char skip0;
++	volatile u_char DATA;
++	volatile u_char skip1;
++	volatile u_char STATUS;
++	volatile u_char skip2;
++	volatile u_char CTRL;
++};
++
++#endif
+diff -Naur linux-2.4.26/drivers/char/Makefile linux-2.4.26-m68k/drivers/char/Makefile
+--- linux-2.4.26/drivers/char/Makefile	2004-02-19 00:36:31.000000000 +1100
++++ linux-2.4.26-m68k/drivers/char/Makefile	2004-02-19 09:16:15.000000000 +1100
+@@ -321,6 +321,7 @@
+ obj-$(CONFIG_WAFER_WDT) += wafer5823wdt.o
+ obj-$(CONFIG_SOFT_WATCHDOG) += softdog.o
+ obj-$(CONFIG_AMD7XX_TCO) += amd7xx_tco.o
++obj-$(CONFIG_SCC2692) += generic_serial.o scc2692.o
+ obj-$(CONFIG_INDYDOG) += indydog.o
+ obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o
+ 
+diff -Naur linux-2.4.26/drivers/char/ioext.h linux-2.4.26-m68k/drivers/char/ioext.h
+--- linux-2.4.26/drivers/char/ioext.h	1970-01-01 10:00:00.000000000 +1000
++++ linux-2.4.26-m68k/drivers/char/ioext.h	2001-10-22 19:34:32.000000000 +1000
+@@ -0,0 +1,108 @@
++/*
++ * Shared data structure for GVP IO-Extender support.
++ *
++ * Merge of ioext.h and ser_ioext.h
++ */
++#ifndef _IOEXT_H_
++#define _IOEXT_H_
++
++#include <linux/config.h>
++#include <linux/netdevice.h>
++
++#include "16c552.h"
++
++#define MAX_IOEXT 5 /*
++		     * The maximum number of io-extenders is 5, as you
++		     * can't have more than 5 ZII boards in any Amiga.
++		     */
++
++#define UART_CLK 7372800
++
++#define IOEXT_BAUD_BASE (UART_CLK / 16)
++
++#define IOEXT_MAX_LINES 2
++
++#define IOEXT_PAR_PLIP  0x0001
++#define IOEXT_PAR_LP    0x0002
++
++
++/*
++ * Macros for the serial driver.
++ */
++#define curruart(info) ((struct uart_16c550 *)(info->port))
++
++#define ser_DTRon(info)  curruart(info)->MCR |=  DTR
++#define ser_RTSon(info)  curruart(info)->MCR |=  RTS
++#define ser_DTRoff(info) curruart(info)->MCR &= ~DTR
++#define ser_RTSoff(info) curruart(info)->MCR &= ~RTS
++
++
++/*
++ * CNTR defines (copied from the GVP SCSI-driver file gvp11.h
++ */
++#define GVP_BUSY	(1<<0)
++#define GVP_IRQ_PEND	(1<<1)
++#define GVP_IRQ_ENA 	(1<<3)
++#define GVP_DIR_WRITE   (1<<4)
++
++
++/*
++ * CTRL defines 
++ */
++#define PORT0_MIDI   (1<<0)  /* CLR = DRIVERS         SET = MIDI      */
++#define PORT1_MIDI   (1<<1)  /* CLR = DRIVERS         SET = MIDI      */
++#define PORT0_DRIVER (1<<2)  /* CLR = RS232,          SET = MIDI      */
++#define PORT1_DRIVER (1<<3)  /* CLR = RS232,          SET = MIDI      */
++#define IRQ_SEL      (1<<4)  /* CLR = INT2,           SET = INT6      */
++#define ROM_BANK_SEL (1<<5)  /* CLR = LOW 32K,        SET = HIGH 32K  */
++#define PORT0_CTRL   (1<<6)  /* CLR = RTSx or RXRDYx, SET = RTSx ONLY */
++#define PORT1_CTRL   (1<<7)  /* CLR = RTSx or RXRDYx, SET = RTSx ONLY */
++
++
++/*
++ * This is the struct describing the registers on the IO-Extender.
++ * NOTE: The board uses a dual uart (16c552), which should be equal to
++ * two 16c550 uarts.
++ */
++typedef struct {
++	char gap0[0x41];
++	volatile unsigned char CNTR;	/* GVP DMAC CNTR (status register)   */
++	char gap1[0x11e];
++	struct uart_16c550 uart0;	/* The first uart                    */
++	char gap2[0xf0];
++	struct uart_16c550 uart1;	/* The second uart                   */
++	char gap3[0xf0];
++	struct IOEXT_par par;		/* The parallel port                 */
++	char gap4[0xfb];
++	volatile unsigned char CTRL;	/* The control-register on the board */
++} IOEXT_struct;
++
++
++typedef struct {
++	int num_uarts;
++	int line[IOEXT_MAX_LINES];
++	volatile struct uart_16c550 *uart[IOEXT_MAX_LINES];
++	IOEXT_struct *board;
++	int spurious_count;
++	unsigned char par_use;		/* IOEXT_PAR_xxx */
++#if defined(CONFIG_GVPIOEXT_PLIP) || defined(CONFIG_GVPIOEXT_PLIP_MODULE)
++	struct nt_device *dev;
++#endif
++#if defined(CONFIG_GVPIOEXT_LP) || defined(CONFIG_GVPIOEXT_LP_MODULE)
++	struct lp_struct *lp_table;
++	int lp_dev;
++	int lp_interrupt;
++#endif
++} IOExtInfoType;
++
++/* Number of detected boards.  */
++extern int ioext_num;
++extern IOExtInfoType ioext_info[MAX_IOEXT];
++
++void ioext_plip_interrupt(struct net_device *dev, int *spurious_count);
++void ioext_lp_interrupt(int dev, int *spurious_count);
++
++extern struct net_device ioext_dev_plip[3];
++extern struct lp_struct ioext_lp_table[1];
++
++#endif
+diff -Naur linux-2.4.26/drivers/char/mc68681.h linux-2.4.26-m68k/drivers/char/mc68681.h
+--- linux-2.4.26/drivers/char/mc68681.h	1970-01-01 10:00:00.000000000 +1000
++++ linux-2.4.26-m68k/drivers/char/mc68681.h	2001-10-22 19:34:32.000000000 +1000
+@@ -0,0 +1,131 @@
++#ifndef _MC68681_H_
++#define _MC68681_H_
++
++/* 
++ * This describes an MC68681 DUART. It has almost only overlayed registers, which
++ * the structure very ugly.
++ * Note that the ri-register isn't really a register of the duart but a kludge of bsc
++ * to make the ring indicator available.
++ * 
++ * The data came from the MFC-31-Developer Kit (from Ralph Seidel,
++ * zodiac@darkness.gun.de) and the data sheet of Phillip's clone device (SCN68681)
++ * (from Richard Hirst, srh@gpt.co.uk)
++ *
++ * 11.11.95 copyright Joerg Dorchain (dorchain@mpi-sb.mpg.de)
++ *
++ */
++
++struct duarthalf {
++union {
++volatile u_char mr1; /* rw */
++volatile u_char mr2; /* rw */
++}  mr;
++volatile u_char ri;   /* special, read */
++union {
++volatile u_char sr;  /* read */
++volatile u_char csr; /* write */
++} sr_csr;
++u_char pad1;
++volatile u_char cr; /* write */
++u_char pad2;
++union {
++volatile u_char rhr; /* read */
++volatile u_char thr; /* write */
++} hr;
++u_char pad3;
++};
++
++struct duart {
++struct duarthalf pa;
++union {
++volatile u_char ipcr; /* read */
++volatile u_char acr;  /* write */
++} ipcr_acr;
++u_char pad1;
++union {
++volatile u_char isr; /* read */
++volatile u_char imr; /* write */
++} ir;
++u_char pad2;
++volatile u_char ctu;
++u_char pad3;
++volatile u_char ctl;
++u_char pad4;
++struct duarthalf pb;
++volatile u_char ivr;
++u_char pad5;
++union {
++volatile u_char ipr; /* read */
++volatile u_char opcr; /* write */
++} ipr_opcr;
++u_char pad6;
++union {
++volatile u_char start; /* read */
++volatile u_char sopc; /* write */
++} start_sopc;
++u_char pad7;
++union {
++volatile u_char stop; /* read */
++volatile u_char ropc; /* write */
++} stop_ropc;
++u_char pad8;
++};
++
++#define MR1_BITS 3
++#define MR1_5BITS 0
++#define MR1_6BITS 1
++#define MR1_7BITS 2
++#define MR1_8BITS 3
++
++#define MR1_PARITY_ODD 4
++
++#define MR1_PARITY 24
++#define MR1_PARITY_WITH 0
++#define MR1_PARITY_FORCE 8
++#define MR1_PARITY_NO 16
++#define MR1_PARITY_MULTIDROP 24
++
++#define MR1_ERROR_BLOCK 32
++#define MR1_FFULL_IRQ 64
++#define MR1_RxRTS_ON 128
++
++#define MR2_STOPS 15
++#define MR2_1STOP 7
++#define MR2_2STOP 15
++
++#define MR2_CTS_ON 16
++#define MR2_TxRTS_ON 32
++
++#define MR2_MODE 192
++#define MR2_NORMAL 0
++#define MR2_ECHO 64
++#define MR2_LOCALLOOP 128
++#define MR2_REMOTELOOP 192
++
++#define CR_RXCOMMAND 3
++#define CR_NONE 0
++#define CR_RX_ON 1
++#define CR_RX_OFF 2
++#define CR_TXCOMMAND 12
++#define CR_TX_ON 4
++#define CR_TX_OFF 8
++#define CR_MISC 112
++#define CR_RESET_MR 16
++#define CR_RESET_RX 32
++#define CR_RESET_TX 48
++#define CR_RESET_ERR 64
++#define CR_RESET_BREAK 80
++#define CR_START_BREAK 96
++#define CR_STOP_BREAK 112
++
++#define SR_RXRDY 1
++#define SR_FFULL 2
++#define SR_TXRDY 4
++#define SR_TXEMPT 8
++#define SR_OVERRUN 16
++#define SR_PARITY 32
++#define SR_FRAMING 64
++#define SR_BREAK 128
++
++
++#endif
+diff -Naur linux-2.4.26/drivers/char/pc_keyb.c linux-2.4.26-m68k/drivers/char/pc_keyb.c
+--- linux-2.4.26/drivers/char/pc_keyb.c	2002-11-29 10:53:12.000000000 +1100
++++ linux-2.4.26-m68k/drivers/char/pc_keyb.c	2003-07-22 07:33:07.000000000 +1000
+@@ -898,6 +898,8 @@
+ 
+ void __init pckbd_init_hw(void)
+ {
++	unsigned long flags;
++
+ 	if (!kbd_controller_present()) {
+ 		kbd_exists = 0;
+ 		return;
+@@ -905,6 +907,9 @@
+ 
+ 	kbd_request_region();
+ 
++	save_flags(flags);
++	cli();
++
+ 	/* Flush any pending input. */
+ 	kbd_clear_input();
+ 
+@@ -922,6 +927,8 @@
+ 
+ 	/* Ok, finally allocate the IRQ, and off we go.. */
+ 	kbd_request_irq(keyboard_interrupt);
++
++	restore_flags(flags);
+ }
+ 
+ #if defined CONFIG_PSMOUSE
+diff -Naur linux-2.4.26/drivers/char/plip_ioext.c linux-2.4.26-m68k/drivers/char/plip_ioext.c
+--- linux-2.4.26/drivers/char/plip_ioext.c	1970-01-01 10:00:00.000000000 +1000
++++ linux-2.4.26-m68k/drivers/char/plip_ioext.c	2001-11-02 07:04:56.000000000 +1100
+@@ -0,0 +1,1065 @@
++/*
++ * plip_ioext: A parallel port "network" driver for GVP IO-Extender.
++ *
++ * Authors:	See drivers/net/plip.c
++ *              IO-Extender version by Steve Bennett, <msteveb@ozemail.com.au>
++ *
++ * This driver is for use with a 5-bit cable (LapLink (R) cable).
++ */
++
++static const char *version = "NET3 PLIP version 2.2/m68k";
++
++#define __NO_VERSION__
++
++#include <linux/module.h>
++#include <linux/types.h>
++#include <linux/sched.h>
++#include <linux/errno.h>
++#include <linux/interrupt.h>
++#include <linux/slab.h>
++#include <linux/termios.h>
++#include <linux/tty.h>
++#include <linux/serial.h>
++
++#include <asm/setup.h>
++#include <asm/irq.h>
++#include <asm/amigahw.h>
++#include <asm/amigaints.h>
++#include <linux/zorro.h>
++
++#include <linux/config.h>
++#include <linux/kernel.h>
++#include <linux/fcntl.h>
++#include <linux/string.h>
++#include <linux/ptrace.h>
++#include <linux/if_ether.h>
++
++#include <asm/system.h>
++
++#include <linux/in.h>
++#include <linux/delay.h>
++/*#include <linux/lp_m68k.h>*/
++
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/inetdevice.h>
++#include <linux/skbuff.h>
++#include <linux/if_plip.h>
++
++#include <linux/tqueue.h>
++#include <linux/ioport.h>
++#include <asm/bitops.h>
++#include <asm/byteorder.h>
++
++#include "ioext.h"
++
++#define DEBUG 0
++
++/* Map 'struct device *' to our control structure */
++#define PLIP_DEV(DEV) (&ioext_info[(DEV)->irq])
++
++/************************************************************************
++**
++** PLIP definitions
++**
++*************************************************************************
++*/
++
++/* Use 0 for production, 1 for verification, >2 for debug */
++#ifndef NET_DEBUG
++#define NET_DEBUG 2
++#endif
++static unsigned int net_debug = NET_DEBUG;
++
++/* In micro second */
++#define PLIP_DELAY_UNIT       1
++
++/* Connection time out = PLIP_TRIGGER_WAIT * PLIP_DELAY_UNIT usec */
++#define PLIP_TRIGGER_WAIT	 500
++
++/* Nibble time out = PLIP_NIBBLE_WAIT * PLIP_DELAY_UNIT usec */
++#define PLIP_NIBBLE_WAIT        3000
++
++#define PAR_DATA(dev)     ((dev)->base_addr+0)
++#define PAR_STATUS(dev)   ((dev)->base_addr+2)
++#define PAR_CONTROL(dev)  ((dev)->base_addr+4)
++
++static void enable_par_irq(struct device *dev, int on);
++static int plip_init(struct device *dev);
++
++/* Bottom halfs */
++static void plip_kick_bh(struct device *dev);
++static void plip_bh(struct device *dev);
++
++/* Functions for DEV methods */
++static int plip_rebuild_header(struct sk_buff *skb);
++static int plip_tx_packet(struct sk_buff *skb, struct device *dev);
++static int plip_open(struct device *dev);
++static int plip_close(struct device *dev);
++static struct enet_statistics *plip_get_stats(struct device *dev);
++static int plip_config(struct device *dev, struct ifmap *map);
++static int plip_ioctl(struct device *dev, struct ifreq *ifr, int cmd);
++
++enum plip_connection_state {
++	PLIP_CN_NONE=0,
++	PLIP_CN_RECEIVE,
++	PLIP_CN_SEND,
++	PLIP_CN_CLOSING,
++	PLIP_CN_ERROR
++};
++
++enum plip_packet_state {
++	PLIP_PK_DONE=0,
++	PLIP_PK_TRIGGER,
++	PLIP_PK_LENGTH_LSB,
++	PLIP_PK_LENGTH_MSB,
++	PLIP_PK_DATA,
++	PLIP_PK_CHECKSUM
++};
++
++enum plip_nibble_state {
++	PLIP_NB_BEGIN,
++	PLIP_NB_1,
++	PLIP_NB_2,
++};
++
++struct plip_local {
++	enum plip_packet_state state;
++	enum plip_nibble_state nibble;
++	union {
++		struct {
++#if defined(__LITTLE_ENDIAN)
++			unsigned char lsb;
++			unsigned char msb;
++#elif defined(__BIG_ENDIAN)
++			unsigned char msb;
++			unsigned char lsb;
++#else
++#error  "Please fix the endianness defines in <asm/byteorder.h>"
++#endif            
++		} b;
++		unsigned short h;
++	} length;
++	unsigned short byte;
++	unsigned char  checksum;
++	unsigned char  data;
++	struct sk_buff *skb;
++};
++
++struct net_local {
++	struct enet_statistics enet_stats;
++	struct tq_struct immediate;
++	struct tq_struct deferred;
++	struct plip_local snd_data;
++	struct plip_local rcv_data;
++	unsigned long  trigger;
++	unsigned long  nibble;
++	enum plip_connection_state connection;
++	unsigned short timeout_count;
++	char is_deferred;
++	int (*orig_rebuild_header)(struct sk_buff *skb);
++};
++
++struct device ioext_dev_plip[] = {
++	{
++		"plip0",
++		0, 0, 0, 0,    /* memory */
++		0, 0,    /* base, irq */
++		0, 0, 0, NULL, plip_init 
++	},
++	{
++		"plip1",
++		0, 0, 0, 0,    /* memory */
++		0, 0,    /* base, irq */
++		0, 0, 0, NULL, plip_init 
++	},
++	{
++		"plip2",
++		0, 0, 0, 0,    /* memory */
++		0, 0,    /* base, irq */
++		0, 0, 0, NULL, plip_init 
++	}
++};
++
++/*
++ * Check for and handle an interrupt for this PLIP device.
++ *
++ */
++void ioext_plip_interrupt(struct device *dev, int *spurious_count)
++{
++	struct net_local *nl;
++	struct plip_local *rcv;
++	unsigned char c0;
++	unsigned long flags;
++
++	nl = (struct net_local *)dev->priv;
++	rcv = &nl->rcv_data;
++
++	c0 = z_readb(PAR_STATUS(dev));
++
++	if (dev->interrupt) {
++		return;
++	}
++
++	if ((c0 & 0xf8) != 0xc0) {
++		/* Not for us */
++		++*spurious_count;
++		return;
++	}
++
++	*spurious_count = 0;
++	dev->interrupt = 1;
++
++	save_flags(flags);
++	cli();
++
++	switch (nl->connection) {
++	case PLIP_CN_CLOSING:
++		dev->tbusy = 0;
++	case PLIP_CN_NONE:
++	case PLIP_CN_SEND:
++		dev->last_rx = jiffies;
++		rcv->state = PLIP_PK_TRIGGER;
++		nl->connection = PLIP_CN_RECEIVE;
++		nl->timeout_count = 0;
++		queue_task(&nl->immediate, &tq_immediate);
++		mark_bh(IMMEDIATE_BH);
++		restore_flags(flags);
++#if 0
++		printk("%s: receive irq in SEND/NONE/CLOSING (%d) ok\n",
++		       dev->name, nl->connection);
++#endif
++		break;
++
++	case PLIP_CN_RECEIVE:
++		restore_flags(flags);
++		printk("%s: receive interrupt when receiving packet\n",
++		       dev->name);
++		break;
++
++	case PLIP_CN_ERROR:
++		restore_flags(flags);
++		printk("%s: receive interrupt in error state\n", dev->name);
++		break;
++	}
++}
++
++
+
++/* Bottom half handler for the delayed request.
++   This routine is kicked by do_timer().
++   Request `plip_bh' to be invoked. */
++static void
++plip_kick_bh(struct device *dev)
++{
++	struct net_local *nl = (struct net_local *)dev->priv;
++
++	if (nl->is_deferred) {
++		queue_task(&nl->immediate, &tq_immediate);
++		mark_bh(IMMEDIATE_BH);
++	}
++}
++
++/* Forward declarations of internal routines */
++static int plip_none(struct device *, struct net_local *,
++		     struct plip_local *, struct plip_local *);
++static int plip_receive_packet(struct device *, struct net_local *,
++			       struct plip_local *, struct plip_local *);
++static int plip_send_packet(struct device *, struct net_local *,
++			    struct plip_local *, struct plip_local *);
++static int plip_connection_close(struct device *, struct net_local *,
++				 struct plip_local *, struct plip_local *);
++static int plip_error(struct device *, struct net_local *,
++		      struct plip_local *, struct plip_local *);
++static int plip_bh_timeout_error(struct device *dev, struct net_local *nl,
++				 struct plip_local *snd,
++				 struct plip_local *rcv,
++				 int error);
++
++#define OK        0
++#define TIMEOUT   1
++#define ERROR     2
++
++typedef int (*plip_func)(struct device *dev, struct net_local *nl,
++			 struct plip_local *snd, struct plip_local *rcv);
++
++static plip_func connection_state_table[] =
++{
++	plip_none,
++	plip_receive_packet,
++	plip_send_packet,
++	plip_connection_close,
++	plip_error
++};
++
++/*
++** enable_par_irq()
++** 
++** Enable or disable parallel irq for 'dev' according to 'on'.
++**
++** It is NOT possible to disable only the parallel irq.
++** So we disable the board interrupt instead. This means that
++** during reception of a PLIP packet, no serial interrupts can
++** happen. Sorry.
++*/
++static void enable_par_irq(struct device *dev, int on)
++{
++	if (on) {
++		PLIP_DEV(dev)->board->CNTR |= GVP_IRQ_ENA;
++	}
++	else {
++		PLIP_DEV(dev)->board->CNTR &= ~GVP_IRQ_ENA;
++	}
++}
++
++/* Bottom half handler of PLIP. */
++static void
++plip_bh(struct device *dev)
++{
++	struct net_local *nl = (struct net_local *)dev->priv;
++	struct plip_local *snd = &nl->snd_data;
++	struct plip_local *rcv = &nl->rcv_data;
++	plip_func f;
++	int r;
++
++	nl->is_deferred = 0;
++	f = connection_state_table[nl->connection];
++	if ((r = (*f)(dev, nl, snd, rcv)) != OK
++	    && (r = plip_bh_timeout_error(dev, nl, snd, rcv, r)) != OK) {
++		nl->is_deferred = 1;
++		queue_task(&nl->deferred, &tq_timer);
++	}
++}
++
++static int
++plip_bh_timeout_error(struct device *dev, struct net_local *nl,
++		      struct plip_local *snd, struct plip_local *rcv,
++		      int error)
++{
++	unsigned char c0;
++	unsigned long flags;
++
++	save_flags(flags);
++	cli();
++	if (nl->connection == PLIP_CN_SEND) {
++
++		if (error != ERROR) { /* Timeout */
++			nl->timeout_count++;
++			if ((snd->state == PLIP_PK_TRIGGER
++			     && nl->timeout_count <= 10)
++			    || nl->timeout_count <= 3) {
++				restore_flags(flags);
++				/* Try again later */
++				return TIMEOUT;
++			}
++			c0 = z_readb(PAR_STATUS(dev));
++			printk(KERN_INFO "%s: transmit timeout(%d,%02x)\n",
++			       dev->name, snd->state, c0);
++		}
++		nl->enet_stats.tx_errors++;
++		nl->enet_stats.tx_aborted_errors++;
++	} else if (nl->connection == PLIP_CN_RECEIVE) {
++		if (rcv->state == PLIP_PK_TRIGGER) {
++			/* Transmission was interrupted. */
++			restore_flags(flags);
++			return OK;
++		}
++		if (error != ERROR) { /* Timeout */
++			if (++nl->timeout_count <= 3) {
++				restore_flags(flags);
++				/* Try again later */
++				return TIMEOUT;
++			}
++			c0 = z_readb(PAR_STATUS(dev));
++			printk(KERN_INFO "%s: receive timeout(%d,%02x)\n",
++			       dev->name, rcv->state, c0);
++		}
++		nl->enet_stats.rx_dropped++;
++	}
++	rcv->state = PLIP_PK_DONE;
++	if (rcv->skb) {
++		kfree_skb(rcv->skb);
++		rcv->skb = NULL;
++	}
++	snd->state = PLIP_PK_DONE;
++	if (snd->skb) {
++		dev_kfree_skb(snd->skb);
++		snd->skb = NULL;
++	}
++	enable_par_irq(dev, 0);
++	dev->tbusy = 1;
++	nl->connection = PLIP_CN_ERROR;
++	z_writeb(0x00, PAR_DATA(dev));
++	restore_flags(flags);
++
++	return TIMEOUT;
++}
++
++static int
++plip_none(struct device *dev, struct net_local *nl,
++	  struct plip_local *snd, struct plip_local *rcv)
++{
++	return OK;
++}
++
++/* PLIP_RECEIVE --- receive a byte(two nibbles)
++   Returns OK on success, TIMEOUT on timeout */
++inline static int
++plip_receive(struct device *dev, unsigned short nibble_timeout, 
++	     enum plip_nibble_state *ns_p, unsigned char *data_p)
++{
++	unsigned char c0, c1;
++	unsigned int cx;
++
++	switch (*ns_p) {
++	case PLIP_NB_BEGIN:
++		cx = nibble_timeout;
++		while (1) {
++			c0 = z_readb(PAR_STATUS(dev));
++			udelay(PLIP_DELAY_UNIT);
++			if ((c0 & 0x80) == 0) {
++				c1 = z_readb(PAR_STATUS(dev));
++				if (c0 == c1)
++					break;
++			}
++			if (--cx == 0)
++				return TIMEOUT;
++		}
++#if 0
++		printk("received first nybble: %02X -> %02X\n",
++		       c0, (c0 >> 3) & 0x0F);
++#endif
++		*data_p = (c0 >> 3) & 0x0f;
++		z_writeb(0x10, PAR_DATA(dev)); /* send ACK */
++		*ns_p = PLIP_NB_1;
++
++	case PLIP_NB_1:
++		cx = nibble_timeout;
++		while (1) {
++			c0 = z_readb(PAR_STATUS(dev));
++			udelay(PLIP_DELAY_UNIT);
++			if (c0 & 0x80) {
++				c1 = z_readb(PAR_STATUS(dev));
++				if (c0 == c1)
++					break;
++			}
++			if (--cx == 0)
++				return TIMEOUT;
++		}
++#if 0
++		printk("received second nybble: %02X -> %02X\n",
++		       c0, (c0 << 1) & 0xF0);
++#endif
++		*data_p |= (c0 << 1) & 0xf0;
++		z_writeb(0x00, PAR_DATA(dev)); /* send ACK */
++		*ns_p = PLIP_NB_BEGIN;
++	case PLIP_NB_2:
++		break;
++	}
++	return OK;
++}
++
++/* PLIP_RECEIVE_PACKET --- receive a packet */
++static int
++plip_receive_packet(struct device *dev, struct net_local *nl,
++		    struct plip_local *snd, struct plip_local *rcv)
++{
++	unsigned short nibble_timeout = nl->nibble;
++	unsigned char *lbuf;
++	unsigned long flags;
++
++	switch (rcv->state) {
++	case PLIP_PK_TRIGGER:
++		enable_par_irq(dev, 0);
++		dev->interrupt = 0;
++		z_writeb(0x01, PAR_DATA(dev)); /* send ACK */
++		if (net_debug > 2)
++			printk(KERN_DEBUG "%s: receive start\n", dev->name);
++		rcv->state = PLIP_PK_LENGTH_LSB;
++		rcv->nibble = PLIP_NB_BEGIN;
++
++	case PLIP_PK_LENGTH_LSB:
++		if (snd->state != PLIP_PK_DONE) {
++			if (plip_receive(dev, nl->trigger,
++					 &rcv->nibble, &rcv->length.b.lsb)) {
++				/* collision, here dev->tbusy == 1 */
++				rcv->state = PLIP_PK_DONE;
++				nl->is_deferred = 1;
++				nl->connection = PLIP_CN_SEND;
++				queue_task(&nl->deferred, &tq_timer);
++				enable_par_irq(dev, 1);
++				return OK;
++			}
++		} else {
++			if (plip_receive(dev, nibble_timeout, 
++					 &rcv->nibble, &rcv->length.b.lsb))
++				return TIMEOUT;
++		}
++		rcv->state = PLIP_PK_LENGTH_MSB;
++
++	case PLIP_PK_LENGTH_MSB:
++		if (plip_receive(dev, nibble_timeout, 
++				 &rcv->nibble, &rcv->length.b.msb))
++			return TIMEOUT;
++		if (rcv->length.h > dev->mtu + dev->hard_header_len
++		    || rcv->length.h < 8) {
++			printk(KERN_INFO "%s: bogus packet size %d.\n",
++			       dev->name, rcv->length.h);
++			return ERROR;
++		}
++		/* Malloc up new buffer. */
++		rcv->skb = dev_alloc_skb(rcv->length.h);
++		if (rcv->skb == NULL) {
++			printk(KERN_INFO "%s: Memory squeeze.\n", dev->name);
++			return ERROR;
++		}
++		skb_put(rcv->skb,rcv->length.h);
++		rcv->skb->dev = dev;
++		rcv->state = PLIP_PK_DATA;
++		rcv->byte = 0;
++		rcv->checksum = 0;
++
++	case PLIP_PK_DATA:
++		lbuf = rcv->skb->data;
++		do
++			if (plip_receive(dev, nibble_timeout, 
++					 &rcv->nibble, &lbuf[rcv->byte]))
++				return TIMEOUT;
++		while (++rcv->byte < rcv->length.h);
++		do
++			rcv->checksum += lbuf[--rcv->byte];
++		while (rcv->byte);
++		rcv->state = PLIP_PK_CHECKSUM;
++
++	case PLIP_PK_CHECKSUM:
++		if (plip_receive(dev, nibble_timeout, 
++				 &rcv->nibble, &rcv->data))
++			return TIMEOUT;
++		if (rcv->data != rcv->checksum) {
++			nl->enet_stats.rx_crc_errors++;
++			if (net_debug)
++				printk(KERN_INFO "%s: checksum error\n",
++				       dev->name);
++			return ERROR;
++		}
++		rcv->state = PLIP_PK_DONE;
++
++	case PLIP_PK_DONE:
++		/* Inform the upper layer for the arrival of a packet. */
++		rcv->skb->protocol=eth_type_trans(rcv->skb, dev);
++		netif_rx(rcv->skb);
++		nl->enet_stats.rx_packets++;
++		rcv->skb = NULL;
++		if (net_debug > 2)
++			printk(KERN_DEBUG "%s: receive end\n", dev->name);
++
++		/* Close the connection. */
++		z_writeb (0x00, PAR_DATA(dev));
++
++		save_flags(flags);
++		cli();
++		if (snd->state != PLIP_PK_DONE) {
++			nl->connection = PLIP_CN_SEND;
++			restore_flags(flags);
++			queue_task(&nl->immediate, &tq_immediate);
++			mark_bh(IMMEDIATE_BH);
++			enable_par_irq(dev, 1);
++			return OK;
++		} else {
++			nl->connection = PLIP_CN_NONE;
++			restore_flags(flags);
++			enable_par_irq(dev, 1);
++			return OK;
++		}
++	}
++	return OK;
++}
++
++/* PLIP_SEND --- send a byte (two nibbles) 
++   Returns OK on success, TIMEOUT when timeout    */
++inline static int
++plip_send(struct device *dev, unsigned short nibble_timeout, 
++	  enum plip_nibble_state *ns_p, unsigned char data)
++{
++	unsigned char c0;
++	unsigned int cx;
++
++	switch (*ns_p) {
++	case PLIP_NB_BEGIN:
++		z_writeb((data & 0x0f), PAR_DATA(dev));
++		*ns_p = PLIP_NB_1;
++
++	case PLIP_NB_1:
++		z_writeb(0x10 | (data & 0x0f), PAR_DATA(dev));
++		cx = nibble_timeout;
++		while (1) {
++			c0 = z_readb(PAR_STATUS(dev));
++			if ((c0 & 0x80) == 0) 
++				break;
++			if (--cx == 0)
++				return TIMEOUT;
++			udelay(PLIP_DELAY_UNIT);
++		}
++		z_writeb(0x10 | (data >> 4), PAR_DATA(dev));
++		*ns_p = PLIP_NB_2;
++
++	case PLIP_NB_2:
++		z_writeb((data >> 4), PAR_DATA(dev));
++		cx = nibble_timeout;
++		while (1) {
++			c0 = z_readb(PAR_STATUS(dev));
++			if (c0 & 0x80)
++				break;
++			if (--cx == 0)
++				return TIMEOUT;
++			udelay(PLIP_DELAY_UNIT);
++		}
++		*ns_p = PLIP_NB_BEGIN;
++		return OK;
++	}
++	return OK;
++}
++
++/* PLIP_SEND_PACKET --- send a packet */
++static int
++plip_send_packet(struct device *dev, struct net_local *nl,
++		 struct plip_local *snd, struct plip_local *rcv)
++{
++	unsigned short nibble_timeout = nl->nibble;
++	unsigned char *lbuf;
++	unsigned char c0;
++	unsigned int cx;
++	unsigned long flags;
++
++	if (snd->skb == NULL || (lbuf = snd->skb->data) == NULL) {
++		printk(KERN_INFO "%s: send skb lost\n", dev->name);
++		snd->state = PLIP_PK_DONE;
++		snd->skb = NULL;
++		return ERROR;
++	}
++
++	if (snd->length.h == 0) {
++		return OK;
++	}
++
++	switch (snd->state) {
++	case PLIP_PK_TRIGGER:
++		if ((z_readb(PAR_STATUS(dev)) & 0xf8) != 0x80)
++			return TIMEOUT;
++
++		/* Trigger remote rx interrupt. */
++		z_writeb(0x08, PAR_DATA(dev));
++		cx = nl->trigger;
++		while (1) {
++			udelay(PLIP_DELAY_UNIT);
++                        save_flags(flags);
++			cli();
++			if (nl->connection == PLIP_CN_RECEIVE) {
++				restore_flags(flags);
++				/* interrupted */
++				nl->enet_stats.collisions++;
++				if (net_debug > 1)
++					printk(KERN_INFO "%s: collision.\n",
++					       dev->name);
++				return OK;
++			}
++			c0 = z_readb(PAR_STATUS(dev));
++			if (c0 & 0x08) {
++				enable_par_irq(dev, 0);
++				if (net_debug > 2)
++					printk(KERN_DEBUG "%s: send start\n",
++					       dev->name);
++				snd->state = PLIP_PK_LENGTH_LSB;
++				snd->nibble = PLIP_NB_BEGIN;
++				nl->timeout_count = 0;
++				restore_flags(flags);
++				break;
++			}
++			restore_flags(flags);
++			if (--cx == 0) {
++				z_writeb(0x00, PAR_DATA(dev));
++				return TIMEOUT;
++			}
++		}
++
++	case PLIP_PK_LENGTH_LSB:
++		if (plip_send(dev, nibble_timeout, 
++			      &snd->nibble, snd->length.b.lsb))
++			return TIMEOUT;
++		snd->state = PLIP_PK_LENGTH_MSB;
++
++	case PLIP_PK_LENGTH_MSB:
++		if (plip_send(dev, nibble_timeout, 
++			      &snd->nibble, snd->length.b.msb))
++			return TIMEOUT;
++		snd->state = PLIP_PK_DATA;
++		snd->byte = 0;
++		snd->checksum = 0;
++
++	case PLIP_PK_DATA:
++		do
++			if (plip_send(dev, nibble_timeout, 
++				      &snd->nibble, lbuf[snd->byte]))
++				return TIMEOUT;
++		while (++snd->byte < snd->length.h);
++		do
++			snd->checksum += lbuf[--snd->byte];
++		while (snd->byte);
++		snd->state = PLIP_PK_CHECKSUM;
++
++	case PLIP_PK_CHECKSUM:
++		if (plip_send(dev, nibble_timeout, 
++			      &snd->nibble, snd->checksum))
++			return TIMEOUT;
++
++		dev_kfree_skb(snd->skb);
++		nl->enet_stats.tx_packets++;
++		snd->state = PLIP_PK_DONE;
++
++	case PLIP_PK_DONE:
++		/* Close the connection */
++		z_writeb (0x00, PAR_DATA(dev));
++		snd->skb = NULL;
++		if (net_debug > 2)
++			printk(KERN_DEBUG "%s: send end\n", dev->name);
++		nl->connection = PLIP_CN_CLOSING;
++		nl->is_deferred = 1;
++		queue_task(&nl->deferred, &tq_timer);
++		enable_par_irq(dev, 1);
++		return OK;
++	}
++	return OK;
++}
++
++static int
++plip_connection_close(struct device *dev, struct net_local *nl,
++		      struct plip_local *snd, struct plip_local *rcv)
++{
++	unsigned long flags;
++
++        save_flags(flags);
++	cli();
++	if (nl->connection == PLIP_CN_CLOSING) {
++		nl->connection = PLIP_CN_NONE;
++		dev->tbusy = 0;
++		mark_bh(NET_BH);
++	}
++	restore_flags(flags);
++	return OK;
++}
++
++/* PLIP_ERROR --- wait till other end settled */
++static int
++plip_error(struct device *dev, struct net_local *nl,
++	   struct plip_local *snd, struct plip_local *rcv)
++{
++	unsigned char status;
++
++	status = z_readb(PAR_STATUS(dev));
++	if ((status & 0xf8) == 0x80) {
++		if (net_debug > 2)
++			printk(KERN_DEBUG "%s: reset interface.\n", dev->name);
++		nl->connection = PLIP_CN_NONE;
++		dev->tbusy = 0;
++		dev->interrupt = 0;
++		enable_par_irq(dev, 1);
++		mark_bh(NET_BH);
++	} else {
++		nl->is_deferred = 1;
++		queue_task(&nl->deferred, &tq_timer);
++	}
++
++	return OK;
++}
++
++/* We don't need to send arp, for plip is point-to-point. */
++static int
++plip_rebuild_header(struct sk_buff *skb)
++{
++	struct device *dev = skb->dev;
++	struct net_local *nl = (struct net_local *)dev->priv;
++	struct ethhdr *eth = (struct ethhdr *)skb->data;
++	int i;
++
++	if ((dev->flags & IFF_NOARP)==0)
++		return nl->orig_rebuild_header(skb);
++
++	if (eth->h_proto != __constant_htons(ETH_P_IP)
++#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
++	    && eth->h_proto != __constant_htons(ETH_P_IPV6)
++#endif
++		) {
++		printk(KERN_ERR "plip_rebuild_header: Don't know how to resolve type %d addresses?\n", (int)eth->h_proto);
++		memcpy(eth->h_source, dev->dev_addr, dev->addr_len);
++		return 0;
++	}
++
++	for (i=0; i < ETH_ALEN - sizeof(u32); i++)
++		eth->h_dest[i] = 0xfc;
++#if 0
++	*(u32 *)(eth->h_dest+i) = dst;
++#else
++	/* Do not want to include net/route.h here.
++	 * In any case, it is TOP of silliness to emulate
++	 * hardware addresses on PtP link. --ANK
++	 */
++	*(u32 *)(eth->h_dest+i) = 0;
++#endif
++	return 0;
++}
++
++static int
++plip_tx_packet(struct sk_buff *skb, struct device *dev)
++{
++	struct net_local *nl = (struct net_local *)dev->priv;
++	struct plip_local *snd = &nl->snd_data;
++	unsigned long flags;
++
++	if (dev->tbusy)
++		return 1;
++
++	if (test_and_set_bit(0, (void*)&dev->tbusy) != 0) {
++		printk(KERN_ERR "%s: Transmitter access conflict.\n",
++		       dev->name);
++		return 1;
++	}
++
++	if (skb->len > dev->mtu + dev->hard_header_len) {
++		printk(KERN_ERR "%s: packet too big, %d.\n",
++		       dev->name, (int)skb->len);
++		dev->tbusy = 0;
++		return 0;
++	}
++
++	if (net_debug > 2)
++		printk(KERN_DEBUG "%s: send request\n", dev->name);
++
++	save_flags(flags);
++	cli();
++	dev->trans_start = jiffies;
++	snd->skb = skb;
++	snd->length.h = skb->len;
++	snd->state = PLIP_PK_TRIGGER;
++	if (nl->connection == PLIP_CN_NONE) {
++		nl->connection = PLIP_CN_SEND;
++		nl->timeout_count = 0;
++	}
++	queue_task(&nl->immediate, &tq_immediate);
++	mark_bh(IMMEDIATE_BH);
++	restore_flags(flags);
++
++	return 0;
++}
++
++/* Open/initialize the board.  This is called (in the current kernel)
++   sometime after booting when the 'ifconfig' program is run.
++
++ */
++static int
++plip_open(struct device *dev)
++{
++	struct net_local *nl = (struct net_local *)dev->priv;
++	struct in_device *in_dev;
++
++#if defined(CONFIG_GVPIOEXT_LP) || defined(CONFIG_GVPIOEXT_LP_MODULE)
++	/* Yes, there is a race condition here. Fix it later */
++	if (PLIP_DEV(dev)->par_use & IOEXT_PAR_LP) {
++		/* Can't open if lp is in use */
++#if DEBUG
++		printk("par is in use by lp\n");
++#endif
++		return(-EBUSY);
++	}
++#endif
++	PLIP_DEV(dev)->par_use |= IOEXT_PAR_PLIP;
++
++#if DEBUG
++	printk("plip_open(): sending 00 to data port\n");
++#endif
++
++	/* Clear the data port. */
++	z_writeb (0x00, PAR_DATA(dev));
++
++#if DEBUG
++	printk("plip_open(): sent\n");
++#endif
++
++	/* Initialize the state machine. */
++	nl->rcv_data.state = nl->snd_data.state = PLIP_PK_DONE;
++	nl->rcv_data.skb = nl->snd_data.skb = NULL;
++	nl->connection = PLIP_CN_NONE;
++	nl->is_deferred = 0;
++
++	/* Fill in the MAC-level header.
++	   (ab)Use "dev->broadcast" to store point-to-point MAC address.
++
++	   PLIP doesn't have a real mac address, but we need to create one
++	   to be DOS compatible.  */
++	memset(dev->dev_addr,  0xfc, ETH_ALEN);
++	memset(dev->broadcast, 0xfc, ETH_ALEN);
++
++	if ((in_dev=dev->ip_ptr) != NULL) {
++		/*
++		 *	Any address will do - we take the first
++		 */
++		struct in_ifaddr *ifa=in_dev->ifa_list;
++		if (ifa != NULL) {
++			memcpy(dev->dev_addr+2, &ifa->ifa_local, 4);
++			memcpy(dev->broadcast+2, &ifa->ifa_address, 4);
++		}
++	}
++
++	dev->interrupt = 0;
++	dev->start = 1;
++	dev->tbusy = 0;
++
++	MOD_INC_USE_COUNT;
++
++	/* Enable rx interrupt. */
++	enable_par_irq(dev, 1);
++
++	return 0;
++}
++
++/* The inverse routine to plip_open (). */
++static int
++plip_close(struct device *dev)
++{
++	struct net_local *nl = (struct net_local *)dev->priv;
++	struct plip_local *snd = &nl->snd_data;
++	struct plip_local *rcv = &nl->rcv_data;
++	unsigned long flags;
++
++	dev->tbusy = 1;
++	dev->start = 0;
++        save_flags(flags);
++	cli();
++	nl->is_deferred = 0;
++	nl->connection = PLIP_CN_NONE;
++	restore_flags(flags);
++	z_writeb(0x00, PAR_DATA(dev));
++
++	snd->state = PLIP_PK_DONE;
++	if (snd->skb) {
++		dev_kfree_skb(snd->skb);
++		snd->skb = NULL;
++	}
++	rcv->state = PLIP_PK_DONE;
++	if (rcv->skb) {
++		kfree_skb(rcv->skb);
++		rcv->skb = NULL;
++	}
++
++	PLIP_DEV(dev)->par_use &= ~IOEXT_PAR_PLIP;
++
++	MOD_DEC_USE_COUNT;
++	return 0;
++}
++
++static struct enet_statistics *
++plip_get_stats(struct device *dev)
++{
++	struct net_local *nl = (struct net_local *)dev->priv;
++	struct enet_statistics *r = &nl->enet_stats;
++
++	return r;
++}
++
++static int
++plip_config(struct device *dev, struct ifmap *map)
++{
++	if (dev->flags & IFF_UP)
++		return -EBUSY;
++
++	printk(KERN_INFO "%s: This interface is autodetected (ignored).\n",
++	       dev->name);
++
++	return 0;
++}
++
++static int
++plip_ioctl(struct device *dev, struct ifreq *rq, int cmd)
++{
++	struct net_local *nl = (struct net_local *) dev->priv;
++	struct plipconf *pc = (struct plipconf *) &rq->ifr_data;
++  
++	switch(pc->pcmd) {
++	case PLIP_GET_TIMEOUT:
++		pc->trigger = nl->trigger;
++		pc->nibble  = nl->nibble;
++		break;
++	case PLIP_SET_TIMEOUT:
++		nl->trigger = pc->trigger;
++		nl->nibble  = pc->nibble;
++		break;
++	default:
++		return -EOPNOTSUPP;
++	}
++	return 0;
++}
++
++/*
++ * Detect and initialize all IO-Extenders in this system.
++ *
++ * Both PLIP and serial devices are configured.
++ */
++int plip_init(struct device *dev)
++{
++	IOEXT_struct *board;
++	struct net_local *nl;
++
++	if (ioext_num == 0) {
++		printk(KERN_INFO "%s\n", version);
++	}
++
++	board = PLIP_DEV(dev)->board;
++	dev->base_addr = (unsigned long)&board->par.DATA;
++
++	/* Cheat and use irq to index into our table */
++	dev->irq = ioext_num;
++
++	printk(KERN_INFO "%s: IO-Extender parallel port at 0x%08lX\n", dev->name, dev->base_addr);
++
++	/* Fill in the generic fields of the device structure. */
++	ether_setup(dev);
++
++	/* Then, override parts of it */
++	dev->hard_start_xmit  = plip_tx_packet;
++	dev->open    = plip_open;
++	dev->stop    = plip_close;
++	dev->get_stats     = plip_get_stats;
++	dev->set_config    = plip_config;
++	dev->do_ioctl    = plip_ioctl;
++	dev->tx_queue_len  = 10;
++	dev->flags          = IFF_POINTOPOINT|IFF_NOARP;
++
++	/* Set the private structure */
++	dev->priv = kmalloc(sizeof (struct net_local), GFP_KERNEL);
++	if (dev->priv == NULL) {
++		printk(KERN_ERR "%s: out of memory\n", dev->name);
++		return -ENOMEM;
++	}
++	memset(dev->priv, 0, sizeof(struct net_local));
++	nl = (struct net_local *) dev->priv;
++
++	nl->orig_rebuild_header = dev->rebuild_header;
++	dev->rebuild_header   = plip_rebuild_header;
++
++	/* Initialize constants */
++	nl->trigger  = PLIP_TRIGGER_WAIT;
++	nl->nibble  = PLIP_NIBBLE_WAIT;
++
++	/* Initialize task queue structures */
++	nl->immediate.next = NULL;
++	nl->immediate.sync = 0;
++	nl->immediate.routine = (void *)(void *)plip_bh;
++	nl->immediate.data = dev;
++
++	nl->deferred.next = NULL;
++	nl->deferred.sync = 0;
++	nl->deferred.routine = (void *)(void *)plip_kick_bh;
++	nl->deferred.data = dev;
++
++	/* Don't enable interrupts yet */
++
++	return 0;
++}
+diff -Naur linux-2.4.26/drivers/char/scc2692.c linux-2.4.26-m68k/drivers/char/scc2692.c
+--- linux-2.4.26/drivers/char/scc2692.c	1970-01-01 10:00:00.000000000 +1000
++++ linux-2.4.26-m68k/drivers/char/scc2692.c	2003-07-22 07:31:02.000000000 +1000
+@@ -0,0 +1,617 @@
++#include <linux/module.h>
++#include <linux/config.h>
++#include <linux/kdev_t.h>
++#include <asm/io.h>
++#include <linux/kernel.h>
++#include <linux/sched.h>
++#include <linux/ioport.h>
++#include <linux/interrupt.h>
++#include <linux/errno.h>
++#include <linux/tty.h>
++#include <linux/tty_flip.h>
++#include <linux/mm.h>
++#include <linux/serial.h>
++#include <linux/fcntl.h>
++#include <linux/major.h>
++#include <linux/delay.h>
++#include <linux/tqueue.h>
++#include <linux/version.h>
++#include <linux/slab.h>
++#include <linux/miscdevice.h>
++#include <linux/console.h>
++#include <linux/init.h>
++#include <asm/setup.h>
++#include <asm/bootinfo.h>
++
++#include <asm/tekuart.h>
++#include <asm/tekirq.h>
++
++#include <linux/generic_serial.h>
++
++#define NR_PORTS 2
++
++static struct scc_port
++{
++	struct gs_port	gs;
++	unsigned long	base;
++	int		irq_rx, irq_tx;
++	unsigned char	channel;
++	unsigned long	scale;
++} scc_ports[NR_PORTS];
++
++#define STATUS(scc)	((scc)->base + (((scc)->channel * 8 + 1) * (scc)->scale))
++#define CSR(scc)	STATUS(scc)
++
++#define RECEIVE(scc)	((scc)->base + (((scc)->channel * 8 + 3) * (scc)->scale))
++#define TRANSMIT(scc)	RECEIVE(scc)
++
++#define COMMAND(scc)	((scc)->base + (((scc)->channel * 8 + 2) * (scc)->scale))
++
++#define MR(scc)		((scc)->base + (((scc)->channel * 8 + 0) * (scc)->scale))
++
++
++static struct tty_driver scc_driver, scc_callout_driver;
++static struct tty_struct *scc_table[NR_PORTS] = { NULL, NULL };
++static struct termios *scc_termios[NR_PORTS];
++static struct termios *scc_termios_locked[NR_PORTS];
++
++int scc_refcount;
++
++#define SCC_MINOR_BASE        64
++#define SCC_MAGIC 0x52696368
++
++static inline void scc_disable_tx_interrupts(void *ptr)
++{
++	struct scc_port *port = ptr;
++	disable_irq(port->irq_tx);
++	port->gs.flags &= ~GS_TX_INTEN;
++}
++
++static inline void scc_enable_tx_interrupts(void *ptr)
++{
++	struct scc_port *port = ptr;
++        enable_irq(port->irq_tx);
++}
++
++static inline void scc_disable_rx_interrupts(void *ptr)
++{
++	struct scc_port *port = ptr;
++        disable_irq(port->irq_rx);
++}
++
++static inline void scc_enable_rx_interrupts(void *ptr)
++{
++	struct scc_port *port = ptr;
++        enable_irq(port->irq_rx);
++}
++
++
++/*
++ * Receiver Interrupt
++ */
++static void scc_rx_int(int irq, void *data, struct pt_regs *fp)
++{
++	struct scc_port *port = data;
++	struct tty_struct *tty = port->gs.tty;
++	unsigned long flags;
++	volatile unsigned char ch;
++
++	spin_lock_irqsave(tek_uart_lock, flags);
++	while ( *(volatile unsigned char *)STATUS(port) & 0x1 )
++	{
++		ch = *(volatile unsigned char *)RECEIVE(port);
++
++		if (!tty)
++			/*
++			 * FIXME: It might be a bad idea to call printk
++			 *        with the lock held.
++			 */
++			printk(KERN_WARNING "scc_rx_int with NULL tty!\n");
++		else if (tty->flip.count < TTY_FLIPBUF_SIZE) {
++			*tty->flip.char_buf_ptr = ch;
++			*tty->flip.flag_buf_ptr = 0;
++			tty->flip.flag_buf_ptr++;
++			tty->flip.char_buf_ptr++;
++			tty->flip.count++;
++		}
++	}
++	spin_unlock_irqrestore(tek_uart_lock, flags);
++
++	tty_flip_buffer_push(tty);
++}
++
++/*
++ * Transmitter interrupt
++ */
++static void scc_tx_int(int irq, void *data, struct pt_regs *fp)
++{
++	struct scc_port *port = data;
++	struct tty_struct *tty = port->gs.tty;
++	unsigned long flags;
++
++	if ( !tty )
++	{
++		scc_disable_tx_interrupts(port);
++		return;
++	}
++	
++	spin_lock_irqsave(tek_uart_lock, flags);
++	while ( *(volatile unsigned char *)STATUS(port) & 0x4 )
++	{
++		*(volatile unsigned char *)TRANSMIT(port) =
++			port->gs.xmit_buf[port->gs.xmit_tail++];
++		port->gs.xmit_tail = port->gs.xmit_tail & (SERIAL_XMIT_SIZE-1);
++		if (--port->gs.xmit_cnt <= 0)
++			break;
++	}
++	spin_unlock_irqrestore(tek_uart_lock, flags);
++
++	if ((port->gs.xmit_cnt <= 0) || (tty && (tty->stopped || tty->hw_stopped)) )
++	{
++		scc_disable_tx_interrupts(port);
++	}
++
++        if (tty && port->gs.xmit_cnt <= port->gs.wakeup_chars) {
++                if ((tty->flags & (1 << TTY_DO_WRITE_WAKEUP)) && tty->ldisc.write_wakeup)
++                        (tty->ldisc.write_wakeup)(port->gs.tty);
++                wake_up_interruptible(&tty->write_wait);
++        }
++}
++
++/*---------------------------------------------------------------------------
++ * generic_serial.c callback funtions
++ *--------------------------------------------------------------------------*/
++
++static int scc_get_CD(void *ptr)
++{
++	return 1;
++}
++
++static void scc_shutdown_port(void *ptr)
++{
++        struct scc_port *port = ptr;
++
++        port->gs.flags &= ~ GS_ACTIVE;
++}
++
++static const int baudrates[B38400] = {
++	[B19200]	13,
++	[B9600]		12,
++	[B4800]		10,
++	[B2400]		9,
++	[B1200]		7,
++	[B600]		6,
++	[B300]		5,
++	[B134]		3,
++	[B110]		2,
++	[B75]		1
++};
++
++static int scc_set_real_termios(void *ptr)
++{
++	struct scc_port *port = ptr;
++	unsigned long flags;
++	unsigned int cflag;
++	unsigned char baudrate = 0;
++	unsigned char mr1 = 0x80, mr2 = 0;
++	int baud;
++
++	if (!port->gs.tty || !port->gs.tty->termios)
++		return 0;
++
++	cflag = port->gs.tty->termios->c_cflag;
++	baud = cflag & (CBAUD | CBAUDEX);
++
++	if (baud == B0)
++	{
++		// TODO: hangup
++		return 0;
++	}
++
++	if ((baud >= sizeof baudrates/sizeof baudrates[0]) || !baudrates[baud])
++		return -EINVAL;
++	baudrate = baudrates[baud] - 1;
++
++	if ( cflag & CSTOPB )
++		mr2 |= 0x7;	/* 1 stop bit */
++
++	if ( !(cflag & PARENB) )
++		mr1 |= 0x10;	/* no parity */
++	else if ( cflag & PARODD )
++		mr1 |= 0x04;
++
++	switch (cflag & CSIZE)
++	{
++	case CS5:
++		break;
++	case CS6:
++		mr1 |= 0x01;
++		break;
++	case CS7:
++		mr1 |= 0x02;
++		break;
++	case CS8:
++		mr1 |= 0x03;
++		break;
++	default:
++		return -EINVAL;
++	}
++	
++/*
++	printk("scc2692: real_termios line=%d baudrate=%02x mr1=%02x mr2=%02x\n", port->channel, baudrate, mr1, mr2);
++*/
++
++	spin_lock_irqsave(tek_uart_lock, flags);
++
++	// Set baudrate into register CSRA
++	*(volatile unsigned char *)CSR(port) = (baudrate << 4) | (baudrate & 0xf);
++	// Reset MR pointer
++	*(volatile unsigned char *)COMMAND(port) = 1 << 4;
++	// Set MR1
++	*(volatile unsigned char *)MR(port) = mr1;
++	// Set MR2
++	*(volatile unsigned char *)MR(port) = mr2;
++
++	spin_unlock_irqrestore(tek_uart_lock, flags);
++
++	return 0;
++}
++
++static int scc_chars_in_buffer(void *ptr)
++{
++	struct scc_port *port = ptr;
++	int res;
++	unsigned long flags;
++
++	spin_lock_irqsave(tek_uart_lock, flags);
++	res = !(*(volatile unsigned char *)STATUS(port) & 4);
++	spin_unlock_irqrestore(tek_uart_lock, flags);
++
++	return res;
++}
++
++static void scc_hungup(void *ptr)
++{
++        scc_disable_tx_interrupts(ptr);
++        scc_disable_rx_interrupts(ptr);
++        MOD_DEC_USE_COUNT;
++}
++
++static void scc_close(void *ptr)
++{
++        scc_disable_tx_interrupts(ptr);
++        scc_disable_rx_interrupts(ptr);
++        MOD_DEC_USE_COUNT;
++}
++
++/*---------------------------------------------------------------------------
++ * Driver entrypoints referenced from above
++ *--------------------------------------------------------------------------*/
++
++static int scc_open (struct tty_struct * tty, struct file * filp)
++{
++        int line = MINOR(tty->device) - SCC_MINOR_BASE;
++        int retval;
++        struct scc_port *port = &scc_ports[line];
++
++        if ( line >= 2 )
++		return -ENXIO;
++
++        tty->driver_data = port;
++        port->gs.tty = tty;
++        port->gs.count++;
++        retval = gs_init_port(&port->gs);
++        if (retval) {
++                port->gs.count--;
++                return retval;
++        }
++        port->gs.flags |= GS_ACTIVE;
++        if (port->gs.count == 1) {
++                MOD_INC_USE_COUNT;
++        }
++        retval = gs_block_til_ready(port, filp);
++
++        if (retval) {
++                MOD_DEC_USE_COUNT;
++                port->gs.count--;
++                return retval;
++        }
++
++        if ((port->gs.count == 1) && (port->gs.flags & ASYNC_SPLIT_TERMIOS)) {
++                if (tty->driver.subtype == SERIAL_TYPE_NORMAL)
++                        *tty->termios = port->gs.normal_termios;
++                else
++                        *tty->termios = port->gs.callout_termios;
++                scc_set_real_termios (port);
++//		scc_disable_tx_interrupts(ptr);
++        }
++
++        port->gs.session = current->session;
++        port->gs.pgrp = current->pgrp;
++
++        scc_enable_rx_interrupts(port);
++
++        return 0;
++}
++
++static void scc_throttle (struct tty_struct * tty)
++{
++/*
++        struct scc_port *port = (struct scc_port *)tty->driver_data;
++        unsigned long   flags;
++        SCC_ACCESS_INIT(port);
++
++        if (tty->termios->c_cflag & CRTSCTS) {
++                save_flags(flags);
++                cli();
++                SCCmod(TX_CTRL_REG, ~TCR_RTS, 0);
++                restore_flags(flags);
++        }
++        if (I_IXOFF(tty))
++                scc_send_xchar(tty, STOP_CHAR(tty));
++*/
++}
++
++static void scc_unthrottle (struct tty_struct * tty)
++{
++}
++
++static int scc_ioctl(struct tty_struct *tty, struct file *file,
++                     unsigned int cmd, unsigned long arg)
++{
++        return -ENOIOCTLCMD;
++}
++
++static void scc_break_ctl(struct tty_struct *tty, int break_state)
++{
++}
++
++/*---------------------------------------------------------------------------
++ * Interface from generic_serial.c back here
++ *--------------------------------------------------------------------------*/
++
++static struct real_driver scc_real_driver = {
++        scc_disable_tx_interrupts,
++        scc_enable_tx_interrupts,
++        scc_disable_rx_interrupts,
++        scc_enable_rx_interrupts,
++        scc_get_CD,
++        scc_shutdown_port,
++        scc_set_real_termios,
++        scc_chars_in_buffer,
++        scc_close,
++        scc_hungup,
++        NULL
++};
++
++
++int __devinit scc_register_chip(struct scc_port *port)
++{
++	port->gs.callout_termios = tty_std_termios;
++	port->gs.normal_termios = tty_std_termios;
++	port->gs.magic = SCC_MAGIC;
++	port->gs.close_delay = HZ/2;
++	port->gs.closing_wait = 30 * HZ;
++	port->gs.rd = &scc_real_driver;
++#ifdef NEW_WRITE_LOCKING
++	port->gs.port_write_sem = MUTEX;
++#endif
++
++	init_waitqueue_head(&port->gs.open_wait);
++	init_waitqueue_head(&port->gs.close_wait);
++
++	return 0;
++}
++
++static int __devinit scc_chip_init(unsigned long base, int irq_rxa, int irq_txa,
++			 int irq_rxb, int irq_txb)
++{
++	int err = 0;
++	unsigned long flags;
++
++	scc_ports[0].base   = base;
++	scc_ports[0].scale  = 4;
++	scc_ports[0].irq_rx = irq_rxa;
++	scc_ports[0].irq_tx = irq_txa;
++	scc_ports[0].channel = 0;
++
++	scc_ports[1].base   = base;
++	scc_ports[1].scale  = 4;
++	scc_ports[1].irq_rx = irq_rxb;
++	scc_ports[1].irq_tx = irq_txb;
++	scc_ports[1].channel = 1;
++
++	save_flags(flags);
++	cli();
++
++	err = request_irq(irq_rxa, scc_rx_int, SA_INTERRUPT, "SCC-A RX", &scc_ports[0]);
++	if ( err < 0 )
++		return err;
++
++	err = request_irq(irq_txa, scc_tx_int, SA_INTERRUPT, "SCC-A TX", &scc_ports[0]);
++	if ( err < 0 )
++	{
++		free_irq(irq_rxa, &scc_ports[0]);
++		return err;
++	}
++
++	err = request_irq(irq_rxb, scc_rx_int, SA_INTERRUPT, "SCC-B RX", &scc_ports[1]);
++	if ( err < 0 )
++	{
++		free_irq(irq_rxa, &scc_ports[0]);
++		free_irq(irq_txa, &scc_ports[0]);
++		return err;
++	}
++
++	err = request_irq(irq_txb, scc_tx_int, SA_INTERRUPT, "SCC-B TX", &scc_ports[1]);
++	if ( err < 0 )
++	{
++		free_irq(irq_rxa, &scc_ports[0]);
++		free_irq(irq_txa, &scc_ports[0]);
++		free_irq(irq_rxb, &scc_ports[1]);
++		return err;
++	}
++
++	disable_irq(irq_rxa);
++	disable_irq(irq_txa);
++	disable_irq(irq_rxb);
++	disable_irq(irq_txb);
++
++	restore_flags(flags);
++
++	scc_register_chip(&scc_ports[0]);
++	scc_register_chip(&scc_ports[1]);
++
++	return 0;
++}
++
++int __devinit tekscc_init(void)
++{
++	int err = -ENXIO;
++
++#ifdef CONFIG_TEKXP
++	err = scc_chip_init(TEK_UART_BASE, TEK_IRQ_RXRDY_A, TEK_IRQ_TXRDY_A,
++			    TEK_IRQ_RXRDY_B, TEK_IRQ_TXRDY_B);
++#endif
++	if ( err < 0 )
++		return err;
++
++	memset(&scc_driver, 0, sizeof(scc_driver));
++	scc_driver.magic = TTY_DRIVER_MAGIC;
++	scc_driver.driver_name = "scc2692";
++#ifdef CONFIG_DEVFS_FS
++	scc_driver.name = "tts/%d";
++#else
++	scc_driver.name = "ttyS";
++#endif
++	scc_driver.major = TTY_MAJOR;
++	scc_driver.minor_start = SCC_MINOR_BASE;
++	scc_driver.num = 2;
++	scc_driver.type = TTY_DRIVER_TYPE_SERIAL;
++	scc_driver.subtype = SERIAL_TYPE_NORMAL;
++	scc_driver.init_termios = tty_std_termios;
++	scc_driver.init_termios.c_cflag = B9600 | PARENB | CSTOPB | CS7 | CREAD | HUPCL | CLOCAL;
++	scc_driver.flags = TTY_DRIVER_REAL_RAW;
++	scc_driver.refcount = &scc_refcount;
++	scc_driver.table = scc_table;
++	scc_driver.termios = scc_termios;
++	scc_driver.termios_locked = scc_termios_locked;
++	scc_driver.open = scc_open;
++	scc_driver.close = gs_close;
++	scc_driver.write = gs_write;
++	scc_driver.put_char = gs_put_char;
++	scc_driver.flush_chars = gs_flush_chars;
++	scc_driver.write_room = gs_write_room;
++	scc_driver.chars_in_buffer = gs_chars_in_buffer;
++	scc_driver.flush_buffer = gs_flush_buffer;
++	scc_driver.ioctl = scc_ioctl;
++	scc_driver.throttle = scc_throttle;
++	scc_driver.unthrottle = scc_unthrottle;
++	scc_driver.set_termios = gs_set_termios;
++	scc_driver.stop = gs_stop;
++	scc_driver.start = gs_start;
++	scc_driver.hangup = gs_hangup;
++	scc_driver.break_ctl = scc_break_ctl;
++
++	scc_callout_driver = scc_driver;
++#ifdef CONFIG_DEVFS_FS
++	scc_callout_driver.driver_name = "cua/%d";
++#else
++	scc_callout_driver.driver_name = "cua";
++#endif
++	scc_callout_driver.major = TTYAUX_MAJOR;
++	scc_callout_driver.subtype = SERIAL_TYPE_CALLOUT;
++
++	if ((err = tty_register_driver(&scc_driver))) {
++		printk(KERN_ERR "scc2692: Couldn't register scc driver, error = %d\n", err);
++		return -EBUSY;
++	}
++	if ((err = tty_register_driver(&scc_callout_driver))) {
++		printk(KERN_ERR "scc2692: Couldn't register scc callout driver, error = %d\n", err);
++		return -EBUSY;
++	}
++
++	return 0;
++}
++
++static void __devexit tekscc_exit(void)
++{
++	struct scc_port *port = &scc_ports[0];
++        scc_disable_tx_interrupts(port);
++        scc_disable_rx_interrupts(port);
++        free_irq(port->irq_rx, port);
++        free_irq(port->irq_tx, port);
++
++        port = &scc_ports[1];
++        scc_disable_tx_interrupts(port);
++        scc_disable_rx_interrupts(port);
++        free_irq(port->irq_rx, port);
++        free_irq(port->irq_tx, port);
++
++	if ( tty_unregister_driver(&scc_driver) )
++		printk(KERN_ERR "Could not unregister SCC2692 serial driver\n");
++	if ( tty_unregister_driver(&scc_callout_driver) )
++		printk(KERN_ERR "Could not unregister SCC2692 callout driver\n");
++}
++
++module_init(tekscc_init);
++module_exit(tekscc_exit);
++MODULE_LICENSE("GPL");
++
++#ifdef CONFIG_SERIAL_CONSOLE
++
++/*---------------------------------------------------------------------------
++ * Serial console stuff...
++ *--------------------------------------------------------------------------*/
++
++#define scc_delay() do { __asm__ __volatile__ (" nop; nop"); } while (0)
++
++static void scc_ch_write (char ch)
++{
++	tek_uart_putchar(0, ch, 1);
++}
++
++static void scc_console_write (struct console *co, const char *str, unsigned count)
++{
++        unsigned long   flags;
++
++        save_flags(flags);
++        cli();
++
++        while (count--)
++        {
++                if (*str == '\n')
++                        scc_ch_write ('\r');
++                scc_ch_write (*str++);
++        }
++        restore_flags(flags);
++}
++
++static kdev_t scc_console_device(struct console *c)
++{
++        return MKDEV(TTY_MAJOR, SCC_MINOR_BASE + c->index);
++}
++
++
++static int __devinit scc_console_setup(struct console *co, char *options)
++{
++        return 0;
++}
++
++static struct console sercons = {
++        name:           "ttyS",
++        write:          scc_console_write,
++        device:         scc_console_device,
++        setup:          scc_console_setup,
++        flags:          CON_PRINTBUFFER,
++        index:          -1,
++};
++
++
++void __init tekscc_console_init(void)
++{
++                register_console(&sercons);
++}
++
++#endif
++
+diff -Naur linux-2.4.26/drivers/char/tty_io.c linux-2.4.26-m68k/drivers/char/tty_io.c
+--- linux-2.4.26/drivers/char/tty_io.c	2004-04-14 23:05:29.000000000 +1000
++++ linux-2.4.26-m68k/drivers/char/tty_io.c	2004-04-15 06:42:20.000000000 +1000
+@@ -138,7 +138,9 @@
+ 	      unsigned int cmd, unsigned long arg);
+ static int tty_fasync(int fd, struct file * filp, int on);
+ extern int vme_scc_init (void);
++extern int tekscc_init (void);
+ extern long vme_scc_console_init(void);
++extern long tekscc_console_init(void);
+ extern int serial167_init(void);
+ extern long serial167_console_init(void);
+ extern void console_8xx_init(void);
+@@ -2269,6 +2271,9 @@
+ #if defined(CONFIG_SERIAL167)
+ 	serial167_console_init();
+ #endif
++#if defined(CONFIG_SCC2692)
++	tekscc_console_init();
++#endif
+ #if defined(CONFIG_SH_SCI)
+ 	sci_console_init();
+ #endif
+@@ -2408,6 +2413,9 @@
+ #if defined(CONFIG_MVME162_SCC) || defined(CONFIG_BVME6000_SCC) || defined(CONFIG_MVME147_SCC)
+ 	vme_scc_init();
+ #endif
++#ifdef CONFIG_SCC2692
++	tekscc_init();
++#endif
+ #ifdef CONFIG_SERIAL_TX3912
+ 	tx3912_rs_init();
+ #endif
+diff -Naur linux-2.4.26/drivers/ide/ide-probe.c linux-2.4.26-m68k/drivers/ide/ide-probe.c
+--- linux-2.4.26/drivers/ide/ide-probe.c	2004-04-14 23:05:29.000000000 +1000
++++ linux-2.4.26-m68k/drivers/ide/ide-probe.c	2004-04-15 06:42:24.000000000 +1000
+@@ -350,6 +350,7 @@
+ 		rc = 0;
+ 		/* clear drive IRQ */
+ 		(void) hwif->INB(IDE_STATUS_REG);
++		(void) ide_ack_intr(hwif);
+ 		local_irq_restore(flags);
+ 	} else {
+ 		/* drive refused ID */
+@@ -503,6 +504,7 @@
+ 				drive->name, hwif->INB(IDE_STATUS_REG));
+ 		/* ensure drive irq is clear */
+ 		(void) hwif->INB(IDE_STATUS_REG);
++		(void) ide_ack_intr(hwif);
+ 	} else {
+ 		/* not present or maybe ATAPI */
+ 		rc = 3;
+@@ -513,6 +515,7 @@
+ 		ide_delay_50ms();
+ 		/* ensure drive irq is clear */
+ 		(void) hwif->INB(IDE_STATUS_REG);
++		(void) ide_ack_intr(hwif);
+ 	}
+ 	return rc;
+ }
+diff -Naur linux-2.4.26/drivers/macintosh/adb.c linux-2.4.26-m68k/drivers/macintosh/adb.c
+--- linux-2.4.26/drivers/macintosh/adb.c	2003-08-25 21:44:42.000000000 +1000
++++ linux-2.4.26-m68k/drivers/macintosh/adb.c	2003-10-21 07:14:22.000000000 +1000
+@@ -35,6 +35,7 @@
+ #include <linux/init.h>
+ #include <linux/delay.h>
+ #include <linux/completion.h>
++
+ #include <asm/uaccess.h>
+ #ifdef CONFIG_PPC
+ #include <asm/prom.h>
+@@ -380,14 +381,14 @@
+ 	
+ 	if (adb_controller == NULL)
+ 		return -ENXIO;
+-		
++	
+ 	if (adb_controller->autopoll)
+ 		adb_controller->autopoll(0);
+ 
+ 	nret = notifier_call_chain(&adb_client_list, ADB_MSG_PRE_RESET, NULL);
+ 	if (nret & NOTIFY_STOP_MASK) {
+ 		if (adb_controller->autopoll)
+-			adb_controller->autopoll(devs);
++			adb_controller->autopoll(0);
+ 		return -EBUSY;
+ 	}
+ 
+@@ -467,13 +468,15 @@
+ 		use_sreq = 1;
+ 	} else
+ 		use_sreq = 0;
+-	req->nbytes = nbytes+1;
++	i = (flags & ADBREQ_RAW) ? 0 : 1;
++	req->nbytes = nbytes+i;
+ 	req->done = done;
+ 	req->reply_expected = flags & ADBREQ_REPLY;
+ 	req->data[0] = ADB_PACKET;
+ 	va_start(list, nbytes);
+-	for (i = 0; i < nbytes; ++i)
+-		req->data[i+1] = va_arg(list, int);
++	while (i < req->nbytes) {
++		req->data[i++] = va_arg(list, int);
++	}
+ 	va_end(list);
+ 
+ 	if (flags & ADBREQ_NOSEND)
+diff -Naur linux-2.4.26/drivers/mtd/maps/Config.in linux-2.4.26-m68k/drivers/mtd/maps/Config.in
+--- linux-2.4.26/drivers/mtd/maps/Config.in	2003-06-14 00:51:34.000000000 +1000
++++ linux-2.4.26-m68k/drivers/mtd/maps/Config.in	2003-07-22 07:32:35.000000000 +1000
+@@ -96,6 +96,10 @@
+    dep_tristate '  Generic uClinux RAM/ROM filesystem support' CONFIG_MTD_UCLINUX $CONFIG_MTD_PARTITIONS
+ fi
+ 
++if [ "$CONFIG_TEKXP" = "y" ]; then
++   dep_tristate '  TekXpress optional ROM support' CONFIG_MTD_TEKXP_OPTROM $CONFIG_MTD_ROM
++fi
++
+ # This needs CFI or JEDEC, depending on the cards found.
+ dep_tristate '  PCI MTD driver' CONFIG_MTD_PCI $CONFIG_MTD $CONFIG_PCI
+ dep_tristate '  PCMCIA MTD driver' CONFIG_MTD_PCMCIA $CONFIG_MTD $CONFIG_PCMCIA
+diff -Naur linux-2.4.26/drivers/mtd/maps/Makefile linux-2.4.26-m68k/drivers/mtd/maps/Makefile
+--- linux-2.4.26/drivers/mtd/maps/Makefile	2003-06-14 00:51:34.000000000 +1000
++++ linux-2.4.26-m68k/drivers/mtd/maps/Makefile	2003-07-22 07:32:35.000000000 +1000
+@@ -22,6 +22,7 @@
+ obj-$(CONFIG_MTD_L440GX)	+= l440gx.o
+ obj-$(CONFIG_MTD_AMD76XROM)	+= amd76xrom.o
+ obj-$(CONFIG_MTD_ICH2ROM)	+= ich2rom.o
++obj-$(CONFIG_MTD_TEKXP_OPTROM)	+= tekxp_optrom.o
+ obj-$(CONFIG_MTD_TSUNAMI)	+= tsunami_flash.o
+ obj-$(CONFIG_MTD_MBX860)	+= mbx860.o
+ obj-$(CONFIG_MTD_NORA)		+= nora.o
+diff -Naur linux-2.4.26/drivers/mtd/maps/tekxp_optrom.c linux-2.4.26-m68k/drivers/mtd/maps/tekxp_optrom.c
+--- linux-2.4.26/drivers/mtd/maps/tekxp_optrom.c	1970-01-01 10:00:00.000000000 +1000
++++ linux-2.4.26-m68k/drivers/mtd/maps/tekxp_optrom.c	2003-07-22 07:32:35.000000000 +1000
+@@ -0,0 +1,177 @@
++#include <linux/module.h>
++#include <linux/types.h>
++#include <linux/kernel.h>
++#include <asm/io.h>
++#include <linux/mtd/mtd.h>
++#include <linux/mtd/map.h>
++#include <linux/config.h>
++
++/*
++ * Maximum number of ROMS supported by this drivers.
++ *
++ * There will be definitely be no more, since the address space for them
++ * is restricted to what those 16 may span.
++ */
++#define MAX_NUM_OPTROM	16
++
++/*
++ * Virtual address of the address space potentially used by the ROMs.
++ */
++static unsigned long possible_rom_memory;
++
++/*
++ * Structure holding just the information needed for the MTD framework.
++ * The driver itself needs no further information about a single ROM.
++ */
++typedef struct {
++	struct map_info		map;
++	struct mtd_info		*mtd;
++} optrom_desc_t;
++
++static int num_optrom;
++static optrom_desc_t optrom_desc[MAX_NUM_OPTROM];
++
++/*
++ * Check if a ROM is present and determinate its size.
++ */
++static unsigned int __init detect_optrom_size(unsigned long start_address)
++{
++	unsigned long original = *(unsigned long *)start_address;
++
++	/*
++	 * We try to write into the ROM. It will not fault on us.
++	 */
++	*(volatile unsigned long *)start_address = ~original;
++
++	/*
++	 * If the write did not change there is a ROM or nothing.
++	 */
++	if ( *(volatile unsigned long *)start_address == original )
++	{
++		/*
++		 * But the Nothing will fail to report a correct size.
++		 *
++		 * Yes, the size is stored at a given position within the
++		 * ROM. So if someone did create ROMs on his own behalf
++		 * not following the "specification" this driver will
++		 * fail to detect them.
++		 *
++		 * Do NOT fix this! It is intended behaviour since the
++		 * future goal of this driver is to present the filesystem
++		 * stored in the original ROMs.
++		 */
++		unsigned short size = *(unsigned short *)(start_address + 6);
++		if ( size == 0x80 || size == 0x100 || size == 0x200 || size == 0x400 )
++			return size * 1024;
++	}
++
++	/*
++	 * If we hit something else try to restore the original content.
++	 */
++	*(unsigned long *)start_address = original;
++
++	return 0;
++}
++
++/*
++ * Just the obvious way to copy memory around.
++ */
++static void optrom_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len)
++{
++	memcpy(to, (char *)map->map_priv_1 + from, len);
++}
++
++/*
++ * We can not write into the ROMs.
++ */
++static void optrom_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len)
++{
++}
++
++/*
++ * Initialization
++ */
++static int __init init_optrom(void)
++{
++	int i;
++
++	/*
++	 * Get all memory mapped that may hold a ROM. This might have to
++	 * be switched to a less gready sheme if causing any problems.
++	 */
++	possible_rom_memory = (unsigned long)ioremap_nocache(0x1000000, MAX_NUM_OPTROM * 0x100000);
++	if ( !possible_rom_memory )
++	{
++		printk(KERN_WARNING "Could not map optroms into the virtual memory space\n");
++		return -ENXIO;
++	}
++
++	/*
++	 * Search through the complete address space for any ROM.
++	 * If any ROM is found register it with the MTD framework.
++	 */
++	for ( i=0; i<MAX_NUM_OPTROM; i++ )
++	{
++		unsigned int size = detect_optrom_size(possible_rom_memory + i * 0x100000);
++		if ( size > 0 )
++		{
++			optrom_desc_t *desc = &optrom_desc[num_optrom];
++
++			printk(KERN_INFO "Found optional ROM of size %u at %08x\n", size, 0x1000000 + i * 0x100000);
++
++			desc->map.name = "TekXpress optional ROM";
++			desc->map.size = size;
++			desc->map.map_priv_1 = possible_rom_memory + i * 0x100000;
++			desc->map.copy_from = optrom_copy_from;
++			desc->map.copy_to = optrom_copy_to;
++
++			desc->mtd = do_map_probe("map_rom", &desc->map);
++			if ( !desc->mtd )
++			{
++				printk(KERN_ERR "Could not allocate MTD structure\n");
++				continue;
++			}
++
++			desc->mtd->module = THIS_MODULE;
++			add_mtd_device(desc->mtd);
++
++			num_optrom++;
++		}
++
++	}
++
++	if ( num_optrom <= 0 )
++	{
++		iounmap((void *)possible_rom_memory);
++		printk(KERN_WARNING "No optional rom found\n");
++		return -ENXIO;
++	}
++
++	return 0;
++}
++
++/*
++ * Unregister all ROMs found from the MTD framework.
++ */
++void __exit cleanup_optrom(void)
++{
++	while ( num_optrom-- )
++	{
++		optrom_desc_t *desc = &optrom_desc[num_optrom];
++
++		del_mtd_device(desc->mtd);
++		map_destroy(desc->mtd);
++	}
++
++	iounmap((void*)possible_rom_memory);
++}
++
++
++
++module_init(init_optrom);
++module_exit(cleanup_optrom);
++
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("Michael Mueller <malware@t-online.de>");
++MODULE_DESCRIPTION("MTD map driver for optional ROM of the TekXpress XP2x X-Terminals");
++
+diff -Naur linux-2.4.26/drivers/net/Makefile linux-2.4.26-m68k/drivers/net/Makefile
+--- linux-2.4.26/drivers/net/Makefile	2004-04-14 23:05:30.000000000 +1000
++++ linux-2.4.26-m68k/drivers/net/Makefile	2004-04-15 06:42:31.000000000 +1000
+@@ -95,6 +95,7 @@
+ obj-$(CONFIG_FEALNX) += fealnx.o mii.o
+ obj-$(CONFIG_TC35815) += tc35815.o
+ obj-$(CONFIG_TIGON3) += tg3.o
++obj-$(CONFIG_TEKSONIC) += teksonic.o
+ 
+ ifeq ($(CONFIG_E100),y)
+   obj-y += e100/e100.o
+diff -Naur linux-2.4.26/drivers/net/Space.c linux-2.4.26-m68k/drivers/net/Space.c
+--- linux-2.4.26/drivers/net/Space.c	2004-02-19 00:36:31.000000000 +1100
++++ linux-2.4.26-m68k/drivers/net/Space.c	2004-02-19 09:16:53.000000000 +1100
+@@ -101,6 +101,7 @@
+ extern int mac8390_probe(struct net_device *dev);
+ extern int mac89x0_probe(struct net_device *dev);
+ extern int mc32_probe(struct net_device *dev);
++extern int teksonic_probe(struct net_device *dev);
+   
+ /* Detachable devices ("pocket adaptors") */
+ extern int de600_probe(struct net_device *);
+@@ -326,6 +327,9 @@
+ };
+ 
+ static struct devprobe m68k_probes[] __initdata = {
++#ifdef CONFIG_TEKSONIC
++	{teksonic_probe, 0},
++#endif
+ #ifdef CONFIG_ATARILANCE	/* Lance-based Atari ethernet boards */
+ 	{atarilance_probe, 0},
+ #endif
+diff -Naur linux-2.4.26/drivers/net/a2065.c linux-2.4.26-m68k/drivers/net/a2065.c
+--- linux-2.4.26/drivers/net/a2065.c	2003-06-14 00:51:34.000000000 +1000
++++ linux-2.4.26-m68k/drivers/net/a2065.c	2004-04-16 21:37:49.000000000 +1000
+@@ -284,6 +284,7 @@
+ 	struct sk_buff *skb = 0;	/* XXX shut up gcc warnings */
+ 
+ #ifdef TEST_HITS
++	int i;
+ 	printk ("[");
+ 	for (i = 0; i < RX_RING_SIZE; i++) {
+ 		if (i == lp->rx_new)
+diff -Naur linux-2.4.26/drivers/net/macsonic.c linux-2.4.26-m68k/drivers/net/macsonic.c
+--- linux-2.4.26/drivers/net/macsonic.c	2003-08-25 21:44:42.000000000 +1000
++++ linux-2.4.26-m68k/drivers/net/macsonic.c	2004-06-20 21:17:28.000000000 +1000
+@@ -199,6 +199,7 @@
+ 	if ((lp->rba = (char *)
+ 	     kmalloc(SONIC_NUM_RRS * SONIC_RBSIZE, GFP_KERNEL | GFP_DMA)) == NULL) {
+ 		printk(KERN_ERR "%s: couldn't allocate receive buffers\n", dev->name);
++		kfree(lp);
+ 		return -ENOMEM;
+ 	}
+ 
+@@ -635,19 +636,14 @@
+ }
+ 
+ #ifdef MODULE
+-static char namespace[16] = "";
+ static struct net_device dev_macsonic;
+ 
+ MODULE_PARM(sonic_debug, "i");
+ MODULE_PARM_DESC(sonic_debug, "macsonic debug level (1-4)");
+-MODULE_LICENSE("GPL");
+-
+-EXPORT_NO_SYMBOLS;
+ 
+ int
+ init_module(void)
+ {
+-        dev_macsonic.name = namespace;
+         dev_macsonic.init = macsonic_probe;
+ 
+         if (register_netdev(&dev_macsonic) != 0) {
+diff -Naur linux-2.4.26/drivers/net/teksonic.c linux-2.4.26-m68k/drivers/net/teksonic.c
+--- linux-2.4.26/drivers/net/teksonic.c	1970-01-01 10:00:00.000000000 +1000
++++ linux-2.4.26-m68k/drivers/net/teksonic.c	2003-07-22 07:28:08.000000000 +1000
+@@ -0,0 +1,310 @@
++/*
++ *  linux/drivers/net/teksonic.c
++ *
++ * (C) 2003 Michael Mueller <malware@t-online.de>
++ *
++ * based on the macsonic driver:
++ *
++ * (C) 1998 Alan Cox
++ *
++ * Debugging Andreas Ehliar, Michael Schmitz
++ *
++ * Based on code
++ * (C) 1996 by Thomas Bogendoerfer (tsbogend@bigbug.franken.de)
++ *
++ * This driver is based on work from Andreas Busse, but most of
++ * the code is rewritten.
++ *
++ * (C) 1995 by Andreas Busse (andy@waldorf-gmbh.de)
++ *
++ */
++
++#include <linux/kernel.h>
++#include <linux/sched.h>
++#include <linux/types.h>
++#include <linux/ctype.h>
++#include <linux/fcntl.h>
++#include <linux/interrupt.h>
++#include <linux/ptrace.h>
++#include <linux/ioport.h>
++#include <linux/in.h>
++#include <linux/slab.h>
++#include <linux/string.h>
++#include <linux/delay.h>
++#include <asm/system.h>
++#include <asm/bitops.h>
++#include <asm/pgtable.h>
++#include <asm/segment.h>
++#include <asm/io.h>
++#include <asm/irq.h>
++#include <asm/dma.h>
++
++#include <linux/errno.h>
++
++#include <linux/netdevice.h>
++#include <linux/etherdevice.h>
++#include <linux/skbuff.h>
++#include <linux/module.h>
++#include <asm/teknvram.h>
++
++/*
++ * All registers are located at addresses dividable by 4.
++ */
++
++#define SREGS_PAD(n)    u16 n;
++
++/*
++ * This is a hack to get the endianness stuff done correctly.
++ */
++
++#define CONFIG_MACSONIC
++
++/*
++ * Generic Sonic definitions
++ */
++#include "sonic.h"
++
++#ifdef DEBUG
++
++#define SONIC_READ(reg) _SONIC_READ(base_addr, reg)
++#define SONIC_WRITE(reg,val) do { _SONIC_WRITE(base_addr, reg, val); } while(0)
++
++static inline unsigned short _SONIC_READ(unsigned long base_addr, int reg)
++{
++	unsigned short val = *((volatile unsigned long*)(base_addr + 4*(reg))) & 0xffff;
++	printk("sonic_read(%08x) = %02x\n", base_addr + 4*(reg), val);
++	return val;
++}
++
++static inline void _SONIC_WRITE(unsigned long base_addr, int reg, unsigned short val)
++{
++	printk("sonic_write(%08x,%04x)\n", base_addr + 4*(reg), val);
++	*((volatile unsigned long*)(base_addr + 4*(reg))) = (val) & 0xffff;
++}
++
++static inline unsigned short sonic_read(struct net_device *dev, int reg)
++{
++        unsigned short val = *((volatile unsigned long*)(dev->base_addr + 4*(reg))) & 0xffff;
++        printk("sonic_read(%08x) = %02x\n", dev->base_addr + 4*(reg), val);
++	return val;
++}
++
++static inline void sonic_write(struct net_device *dev, int reg, unsigned short val)
++{
++        printk("sonic_write(%08x,%04x)\n", dev->base_addr + 4*(reg), val);
++        *((volatile unsigned long*)(dev->base_addr + 4*(reg))) = (val) & 0xffff;
++}
++
++#else
++
++#define SONIC_READ(reg) ((unsigned short)(*(volatile unsigned long *)((base_addr) + 4*(reg))) & 0xffff)
++
++#define SONIC_WRITE(reg, val) do { *(volatile unsigned long*)((base_addr) + 4*(reg)) = (val)& 0xffff; } while (0)
++
++#define sonic_read(dev,reg) ((unsigned short)(*(volatile unsigned long *)((dev)->base_addr + 4*(reg))) & 0xffff)
++
++#define sonic_write(dev, reg, val) do { *(volatile unsigned long*)((dev)->base_addr + 4*(reg)) = (val)& 0xffff; } while (0)
++
++#endif
++
++static int sonic_debug = 0;
++static int sonic_version_printed;
++
++static int reg_offset;
++
++int teksonic_init(struct net_device* dev)
++{
++	int i,j;
++	struct sonic_local* lp_alloc[20];
++	struct sonic_local* lp;
++
++        /* Allocate the entire chunk of memory for the descriptors.
++           Note that this cannot cross a 64K boundary. */
++        for (i = 0; i < 20; i++) {
++		unsigned long desc_base, desc_top, desc_top2;
++                if((lp_alloc[i] = kmalloc(sizeof(struct sonic_local), GFP_KERNEL)) == NULL) {
++                        printk(KERN_ERR "%s: couldn't allocate descriptor buffers\n", dev->name);
++                        return -ENOMEM;
++		}
++		desc_base = (unsigned long)virt_to_phys(lp_alloc[i]);
++		desc_top = desc_base + sizeof(struct sonic_local);
++		desc_top2 = (unsigned long)virt_to_phys(lp_alloc[i] + 1);
++
++		if ( (desc_top == desc_top2) && (desc_top & 0xffff) >= (desc_base & 0xffff))
++			break;
++
++		/* Hmm. try again (FIXME: does this actually work?) */
++		/* Note: It did not work when freeing the memory allocated
++		         previously since it got the same memory again. */
++/*              kfree(lp);	*/
++		printk(KERN_DEBUG
++		       "%s: didn't get continguous chunk [%08lx - %08lx], trying again\n",
++                       dev->name, desc_base, desc_top);
++
++        }
++
++	/* Deallocate what was allocated just to get the alignment done. */
++	for ( j = i-1; j >= 0; j-- )
++		kfree(lp_alloc[j]);
++
++        if (i==20) {
++		/* Note: Do not free dev->priv, it is deallocated later! */
++                printk(KERN_ERR "%s: tried 20 times to allocate descriptor buffers, giving up.\n",
++                       dev->name);
++                return -ENOMEM;
++        }
++
++	dev->priv = lp = lp_alloc[i];
++
++	memset(lp, 0, sizeof(struct sonic_local));
++
++	lp->cda_laddr = virt_to_phys(&(lp->cda));
++	lp->tda_laddr = virt_to_phys(lp->tda);
++	lp->rra_laddr = virt_to_phys(lp->rra);
++	lp->rda_laddr = virt_to_phys(lp->rda);
++
++        /* FIXME, maybe we should use skbs */
++	if ((lp->rba = (char *)kmalloc(SONIC_NUM_RRS * SONIC_RBSIZE, GFP_KERNEL)) == NULL) {
++		printk(KERN_ERR "%s: couldn't allocate receive buffers\n", dev->name);
++		return -ENOMEM;
++	}
++	lp->rba_laddr = virt_to_phys(lp->rba);
++
++#if 0
++	{
++		int rs, ds;
++
++		/* almost always 12*4096, but let's not take chances */
++		rs = ((SONIC_NUM_RRS * SONIC_RBSIZE + 4095) / 4096) * 4096;
++		/* almost always under a page, but let's not take chances */
++		ds = ((sizeof(struct sonic_local) + 4095) / 4096) * 4096;
++		kernel_set_cachemode(lp->rba, rs, IOMAP_NOCACHE_SER);
++		kernel_set_cachemode(lp, ds, IOMAP_NOCACHE_SER);
++	}
++#endif
++
++
++#if 0
++	flush_cache_all();
++#endif
++
++	dev->open = sonic_open;
++	dev->stop = sonic_close;
++	dev->hard_start_xmit = sonic_send_packet;
++	dev->get_stats = sonic_get_stats;
++	dev->set_multicast_list = &sonic_multicast_list;
++
++	/*
++	 * clear tally counter
++	 */
++	sonic_write(dev, SONIC_CRCT, 0xffff);
++	sonic_write(dev, SONIC_FAET, 0xffff);
++	sonic_write(dev, SONIC_MPT, 0xffff);
++
++	/* Fill in the fields of the device structure with ethernet values. */
++	ether_setup(dev);
++	return 0;
++}
++
++int teksonic_ethernet_addr(struct net_device* dev)
++{
++	int i;
++
++	/* On NuBus boards we can sometimes look in the ROM resources.
++	   No such luck for comm-slot/onboard. */
++	for(i = 0; i < 6; i++)
++		dev->dev_addr[i] = nvram_readb(NVRAM_SONIC_MAC+i);
++
++	return 0;
++}
++
++int teksonic_probe(struct net_device* dev)
++{
++	/* Bwahahaha */
++	static int once_is_more_than_enough;
++	int i;
++	int dma_bitmode;
++
++	if (once_is_more_than_enough)
++		return -ENODEV;
++	once_is_more_than_enough = 1;
++
++	if (dev) {
++		dev = init_etherdev(dev, sizeof(struct sonic_local));
++		if (!dev)
++			return -ENOMEM;
++	} else {
++		dev = init_etherdev(NULL, sizeof(struct sonic_local));
++	}
++	if (dev->priv != NULL) {
++		kfree(dev->priv);
++		dev->priv = NULL;
++	}
++
++	if (dev == NULL)
++		return -ENOMEM;
++
++	/* Danger!  My arms are flailing wildly!  You *must* set this
++           before using sonic_read() */
++
++	dev->base_addr = 0xFFC00000;	// FIXME: This does rely on transparent translation
++	dev->irq = IRQ6;
++
++	if (!sonic_version_printed) {
++		printk(KERN_INFO "%s", version);
++		sonic_version_printed = 1;
++	}
++	printk(KERN_INFO "%s: SONIC at 0x%08lx\n",
++	       dev->name, dev->base_addr);
++
++	reg_offset = 0;
++	dma_bitmode = 1;
++
++	/* Software reset, then initialize control registers. */
++	sonic_write(dev, SONIC_CMD, SONIC_CR_RST);
++
++	sonic_write(dev, SONIC_DCR, SONIC_DCR_BMS |
++		    SONIC_DCR_RFT1 | SONIC_DCR_TFT0 | SONIC_DCR_EXBUS |
++		    (dma_bitmode ? SONIC_DCR_DW : 0));
++#if 0
++	sonic_write(dev, SONIC_DCR, 0x3F);
++#endif
++
++	/* This *must* be written back to in order to restore the
++           extended programmable output bits */
++	sonic_write(dev, SONIC_DCR2, 0);
++
++	sonic_write(dev, SONIC_CMD, 0);
++
++	/* Clear *and* disable interrupts to be on the safe side */
++	sonic_write(dev, SONIC_ISR,0x7fff);
++	sonic_write(dev, SONIC_IMR,0);
++
++	/* Now look for the MAC address. */
++	if (teksonic_ethernet_addr(dev) != 0)
++		return -ENODEV;
++
++	printk(KERN_INFO "MAC ");
++	for (i = 0; i < 6; i++) {
++		printk("%2.2x", dev->dev_addr[i]);
++		if (i < 5)
++			printk(":");
++	}
++
++	printk(" IRQ %d\n", dev->irq);
++
++	/* Shared init code */
++	return teksonic_init(dev);
++}
++
++
++#define vdma_alloc(foo, bar) ((u32)(foo))
++#define vdma_free(baz)
++#define sonic_chiptomem(bat) (phys_to_virt(bat))
++#define PHYSADDR(quux) (virt_to_phys((void*)(quux)))
++
++#define sonic_request_irq       request_irq
++#define sonic_free_irq          free_irq
++
++#include "sonic.c"
++
+diff -Naur linux-2.4.26/drivers/sbus/char/sunkbd.c linux-2.4.26-m68k/drivers/sbus/char/sunkbd.c
+--- linux-2.4.26/drivers/sbus/char/sunkbd.c	2002-08-03 10:39:44.000000000 +1000
++++ linux-2.4.26-m68k/drivers/sbus/char/sunkbd.c	2002-08-06 00:37:03.000000000 +1000
+@@ -761,6 +761,7 @@
+ 
+ static void boot_it(void)
+ {
++#if !defined(CONFIG_SUN3) && !defined(CONFIG_SUN3X)
+ 	extern int obp_system_intr(void);
+ 
+ 	if (!obp_system_intr())
+@@ -768,6 +769,7 @@
+ 	/* sigh.. attempt to prevent multiple entry */
+ 	last_keycode=1;
+ 	rep = 0;
++#endif
+ }
+ 
+ static void compose(void)
+@@ -1232,7 +1234,7 @@
+ 
+ int __init sun_kbd_init(void)
+ {
+-	int i, opt_node;
++	int i;
+ 	struct kbd_struct kbd0;
+ 	extern struct tty_driver console_driver;
+ 
+@@ -1250,18 +1252,22 @@
+ 
+ 	kd_mksound = sunkbd_kd_mksound;
+ 
++#ifndef CONFIG_SUN3X_ZS
+ 	/* XXX Check keyboard-click? property in 'options' PROM node XXX */
+ 	if(sparc_cpu_model != sun4) {
+-		opt_node = prom_getchild(prom_root_node);
++		int opt_node = prom_getchild(prom_root_node);
+ 		opt_node = prom_searchsiblings(opt_node, "options");
+ 		i = prom_getintdefault(opt_node, "keyboard-click?", -1);
+ 		if(i != -1)
+ 			sunkbd_clickp = 1;
+ 		else
+ 			sunkbd_clickp = 0;
+-	} else {
++	} else
++#else
++	{
+ 		sunkbd_clickp = 0;
+ 	}
++#endif
+ 
+ 	keyboard_tasklet.func = sun_kbd_bh;
+ 
+diff -Naur linux-2.4.26/drivers/sbus/char/sunserial.c linux-2.4.26-m68k/drivers/sbus/char/sunserial.c
+--- linux-2.4.26/drivers/sbus/char/sunserial.c	2002-08-03 10:39:44.000000000 +1000
++++ linux-2.4.26-m68k/drivers/sbus/char/sunserial.c	2002-08-03 22:45:22.000000000 +1000
+@@ -10,6 +10,13 @@
+ #include <linux/module.h>
+ #include <linux/errno.h>
+ #include <linux/tty.h>
++
++#ifdef CONFIG_SUN3
++#include <linux/sched.h>
++#include <asm/ptrace.h>
++#include <linux/interrupt.h>
++#endif
++
+ #include <linux/serial.h>
+ #include <linux/serialP.h>
+ #include <linux/string.h>
+@@ -228,6 +235,7 @@
+ void
+ sunserial_console_termios(struct console *con)
+ {
++#ifndef CONFIG_SUN3X_ZS
+ 	char mode[16], buf[16], *s;
+ 	char *mode_prop = "ttyX-mode";
+ 	char *cd_prop = "ttyX-ignore-cd";
+@@ -331,6 +339,9 @@
+ 	}
+ 
+ 	con->cflag = cflag;
++#else /* CONFIG_SUN3 */
++	con->cflag = CREAD | HUPCL | CLOCAL | B9600 | CS8;
++#endif /* CONFIG_SUN3 */
+ }
+ 
+ void
+@@ -452,6 +463,9 @@
+ 	}
+ #endif
+ 
++#ifndef CONFIG_SUN3X_ZS
+ 	prom_printf("No serial devices found, bailing out.\n");
+ 	prom_halt();
++#endif
++	
+ }
+diff -Naur linux-2.4.26/drivers/sbus/char/zs.c linux-2.4.26-m68k/drivers/sbus/char/zs.c
+--- linux-2.4.26/drivers/sbus/char/zs.c	2002-08-03 10:39:44.000000000 +1000
++++ linux-2.4.26-m68k/drivers/sbus/char/zs.c	2002-08-06 00:37:04.000000000 +1000
+@@ -11,6 +11,8 @@
+  * /proc/tty/driver/serial now exists and is readable.
+  *   Alex Buell <alex.buell@tahallah.demon.co.uk>, 2001-12-23
+  *
++ * Tweaks for sun3x by Oliver Jowett <oliver@jowett.manawatu.gen.nz>
++ *
+  */
+ 
+ #include <linux/errno.h>
+@@ -39,23 +41,39 @@
+ #include <asm/system.h>
+ #include <asm/uaccess.h>
+ #include <asm/bitops.h>
++
++#include <asm/sbus.h>
++#ifndef CONFIG_SUN3X_ZS
+ #include <asm/kdebug.h>
+ #include <asm/page.h>
+ #include <asm/pgtable.h>
+ 
+-#include <asm/sbus.h>
+ #ifdef __sparc_v9__
+ #include <asm/fhc.h>
+ #endif
+ #ifdef CONFIG_PCI
+ #include <linux/pci.h>
+ #endif
++#else /* CONFIG_SUN3X_ZS */
++#include <linux/ioport.h>
++#ifndef CONFIG_SUN3X
++#include <asm/sun3mmu.h>
++#else
++#include <asm/sun3xprom.h>
++#endif
++#endif /* CONFIG_SUN3X_ZS */
+ 
+ #include "sunserial.h"
+ #include "zs.h"
+ #include "sunkbd.h"
+ #include "sunmouse.h"
+ 
++/* some sun3 boxen always use vectors */
++#ifdef CONFIG_SUN3
++#undef NV
++#define NV 0
++#endif
++
+ static int num_serial = 2; /* sun4/sun4c/sun4m - Two chips on board. */
+ #define NUM_SERIAL num_serial
+ #define NUM_CHANNELS (NUM_SERIAL * 2)
+@@ -425,6 +443,7 @@
+  */
+ void batten_down_hatches(void)
+ {
++#ifndef CONFIG_SUN3X_ZS
+ 	if (!stop_a_enabled)
+ 		return;
+ 	/* If we are doing kadb, we call the debugger
+@@ -448,6 +467,13 @@
+ 	 */
+ 
+ 	return;
++#else /* CONFIG_SUN3X_ZS */
++#ifndef CONFIG_SUN3X
++	prom_reboot("");
++#else
++	sun3x_reboot();
++#endif
++#endif /* CONFIG_SUN3X_ZS */
+ }
+ 
+ 
+@@ -550,7 +576,9 @@
+ 		 * arch/sparc/kernel/sparc-stub.c to see how all this works.
+ 		 */
+ 		if (info->kgdb_channel && (ch =='\003')) {
++#ifndef CONFIG_SUN3X_ZS
+ 			breakpoint();
++#endif
+ 			return;
+ 		}
+ #endif
+@@ -683,6 +711,23 @@
+ 	for (i = 0; i < NUM_SERIAL; i++) {
+ 		unsigned char r3 = read_zsreg(info->zs_channel, 3);
+ 
++		/* some sun3's need the pending flags cleared */
++#ifdef CONFIG_SUN3
++		unsigned char r2 = read_zsreg(info->zs_next->zs_channel, 2);
++		r2 &= STATUS_MASK;
++		if(r2 & 0x8) {
++			sbus_writeb(RES_H_IUS, &info->zs_channel->control);
++			ZSDELAY();
++			ZS_WSYNC(info->zs_channel);
++			ZSLOG(REGCTRL, RES_H_IUS, 1);
++		} else {
++			sbus_writeb(RES_H_IUS, &info->zs_next->zs_channel->control);
++			ZSDELAY();
++			ZS_WSYNC(info->zs_next->zs_channel);
++			ZSLOG(REGCTRL, RES_H_IUS, 1);
++		}
++#endif
++
+ 		/* Channel A -- /dev/ttya or /dev/kbd, could be the console */
+ 		if (r3 & (CHAEXT | CHATxIP | CHARxIP)) {
+ 			sbus_writeb(RES_H_IUS, &info->zs_channel->control);
+@@ -1964,6 +2009,88 @@
+ 
+ /* Finally, routines used to initialize the serial driver. */
+ 
++
++#ifdef CONFIG_SUN3X_ZS
++
++static void show_serial_version(void)
++{
++	char *revision = "$Revision: 1.5 $";
++	char *version, *p;
++
++	version = strchr(revision, ' ');
++	p = strchr(++version, ' ');
++	*p = '\0';
++	printk("sun3/3x Zilog8530 serial driver version %s\n", version);
++	*p = ' ';
++}
++
++static struct sun_zslayout * __init  
++	   get_zs(int chip)
++{
++	unsigned int vaddr = 0;
++	unsigned long iopte;
++	static int irq = 0;
++
++	if(chip < 0 || chip >= NUM_SERIAL)
++		panic("get_zs bogon zs chip number");
++
++#ifndef CONFIG_SUN3X 
++	/* sun3 OBIO version */
++        /* Grrr, these have to be hardcoded aieee */
++ 	switch(chip) {
++ 	case 0:
++ 		for(vaddr = 0xfe00000; vaddr < (0xfe00000 +
++						SUN3_PMEG_SIZE); vaddr += SUN3_PTE_SIZE) {
++			
++ 			iopte = sun3_get_pte(vaddr);
++ 			if(!(iopte & SUN3_PAGE_TYPE_IO)) /* this an io page? */
++ 				continue;
++ 			
++ 			if(((iopte & SUN3_PAGE_PGNUM_MASK) << PAGE_SHIFT) ==
++ 			   0x20000) {
++ 				break;
++ 			}
++ 		}
++ 		break;
++ 	case 1:
++ 		for(vaddr = 0xfe00000; vaddr < (0xfe00000 +
++ 						SUN3_PMEG_SIZE); vaddr += SUN3_PTE_SIZE) {
++  		  
++ 			iopte = sun3_get_pte(vaddr);
++ 			if(!(iopte & SUN3_PAGE_TYPE_IO)) /* this an io page? */
++ 				continue;
++  		  
++ 			if(((iopte & SUN3_PAGE_PGNUM_MASK) << PAGE_SHIFT) ==
++ 			   0) {
++ 				break;
++ 			}
++ 		}
++ 		break;
++ 	};
++#else
++	/* sun3x is a wee bit cleaner. :) */
++	switch(chip) {
++	case 0:
++		vaddr = SUN3X_ZS2;
++		break;
++
++	case 1:
++		vaddr = SUN3X_ZS1;
++		break;
++	}
++#endif	
++ 	
++ 	zs_nodes[chip] = 0;
++	zilog_irq = irq = 6;
++ 	
++ 	if(!vaddr)
++ 		panic("get_zs whee no serial chip mappable");
++ 	
++ 	return (struct sun_zslayout *)(unsigned long) vaddr;
++}
++ 
++#else /* !CONFIG_SUN3X_ZS */
++
+ static void show_serial_version(void)
+ {
+ 	char *revision = "$Revision: 1.68.2.2 $";
+@@ -2224,6 +2351,9 @@
+ 	return (struct sun_zslayout *)(unsigned long) vaddr[0];
+ }
+ #endif
++
++#endif /* !CONFIG_SUN3X_ZS */
++        
+ /* This is for the auto baud rate detection in the mouse driver. */
+ void zs_change_mouse_baud(int newbaud)
+ {
+@@ -2292,6 +2422,8 @@
+ 
+ int __init zs_probe(void)
+ {
++#ifndef CONFIG_SUN3X_ZS
++
+ 	int node;
+ 
+ 	if(sparc_cpu_model == sun4)
+@@ -2344,6 +2476,8 @@
+ 	NUM_SERIAL = 2;
+ 
+ no_probe:
++#endif /* !CONFIG_SUN3X_ZS */
++
+ 	zs_alloc_tables();
+ 
+ 	/* Fill in rs_ops struct... */
+@@ -2501,6 +2635,7 @@
+ 	/* Initialize Softinfo */
+ 	zs_prepare();
+ 
++#ifndef CONFIG_SUN3X_ZS
+ 	/* Grab IRQ line before poking the chips so we do
+ 	 * not lose any interrupts.
+ 	 */
+@@ -2509,6 +2644,7 @@
+ 		prom_printf("Unable to attach zs intr\n");
+ 		prom_halt();
+ 	}
++#endif /* !CONFIG_SUN3X_ZS */
+ 
+ 	/* Initialize Hardware */
+ 	for(channel = 0; channel < NUM_CHANNELS; channel++) {
+@@ -2517,6 +2653,10 @@
+ 			write_zsreg(zs_soft[channel].zs_channel, R9, FHWRES);
+ 			ZSDELAY_LONG();
+ 			dummy = read_zsreg(zs_soft[channel].zs_channel, R0);
++#ifdef CONFIG_SUN3
++			/* program the int vector */
++			write_zsreg(zs_soft[channel].zs_channel, R2, 0x18+zilog_irq);
++#endif
+ 		}
+ 
+ 		if(channel == KEYBOARD_LINE) {
+@@ -2676,11 +2816,23 @@
+ 		info->normal_termios = serial_driver.init_termios;
+ 		init_waitqueue_head(&info->open_wait);
+ 		init_waitqueue_head(&info->close_wait);
++#ifdef CONFIG_SUN3X_ZS
++		printk("tty%02d at 0x%04x (irq = %d)", info->line, 
++		       info->port, info->irq);
++#else /* !CONFIG_SUN3X_ZS */
+ 		printk("tty%02d at 0x%04x (irq = %s)", info->line, 
+ 		       info->port, __irq_itoa(info->irq));
++#endif /* !CONFIG_SUN3X_ZS */
+ 		printk(" is a Zilog8530\n");
+ 	}
+ 
++#ifdef CONFIG_SUN3X_ZS
++	if (request_irq(zilog_irq, zs_interrupt,
++			(SA_INTERRUPT),
++			"Zilog8530", zs_chain))
++		panic("Unable to attach zs intr\n");
++#endif /* CONFIG_SUN3X_ZS */
++
+ 	restore_flags(flags);
+ 
+ 	keyboard_zsinit(kbd_put_char);
+@@ -2881,10 +3033,15 @@
+ {
+ 	extern int con_is_present(void);
+ 
++#ifndef CONFIG_SUN3X_ZS
+ 	if (con_is_present())
+ 		return 0;
+ 
+ 	zs_console.index = serial_console - 1;
++#else /* CONFIG_SUN3X_ZS */
++	zs_console.index = 0;
++#endif /* CONFIG_SUN3X_ZS */
++
+ 	register_console(&zs_console);
+ 	return 0;
+ }
+diff -Naur linux-2.4.26/drivers/scsi/NCR53C9x.c linux-2.4.26-m68k/drivers/scsi/NCR53C9x.c
+--- linux-2.4.26/drivers/scsi/NCR53C9x.c	2002-11-29 10:53:14.000000000 +1100
++++ linux-2.4.26-m68k/drivers/scsi/NCR53C9x.c	2003-06-14 21:46:22.000000000 +1000
+@@ -917,7 +917,7 @@
+ 		if (esp->dma_mmu_get_scsi_one)
+ 			esp->dma_mmu_get_scsi_one(esp, sp);
+ 		else
+-			sp->SCp.have_data_in = (int) sp->SCp.ptr =
++			sp->SCp.ptr =
+ 				(char *) virt_to_phys(sp->request_buffer);
+ 	} else {
+ 		sp->SCp.buffer = (struct scatterlist *) sp->buffer;
+diff -Naur linux-2.4.26/drivers/scsi/oktagon_esp.c linux-2.4.26-m68k/drivers/scsi/oktagon_esp.c
+--- linux-2.4.26/drivers/scsi/oktagon_esp.c	2002-08-03 10:39:44.000000000 +1000
++++ linux-2.4.26-m68k/drivers/scsi/oktagon_esp.c	2003-06-14 21:46:22.000000000 +1000
+@@ -548,7 +548,7 @@
+ 
+ void dma_mmu_get_scsi_one(struct NCR_ESP *esp, Scsi_Cmnd *sp)
+ {
+-        sp->SCp.have_data_in = (int) sp->SCp.ptr =
++        sp->SCp.ptr =
+                 sp->request_buffer;
+ }
+ 
+diff -Naur linux-2.4.26/drivers/video/Config.in linux-2.4.26-m68k/drivers/video/Config.in
+--- linux-2.4.26/drivers/video/Config.in	2004-02-19 00:36:31.000000000 +1100
++++ linux-2.4.26-m68k/drivers/video/Config.in	2004-02-19 09:17:54.000000000 +1100
+@@ -43,6 +43,9 @@
+    if [ "$CONFIG_Q40" = "y" ]; then
+       define_bool CONFIG_FB_Q40 y
+    fi
++   if [ "$CONFIG_TEKXP" = "y" ]; then
++      define_bool CONFIG_FB_TEKXP y
++   fi
+    if [ "$CONFIG_AMIGA" = "y" ]; then
+       tristate '  Amiga native chipset support' CONFIG_FB_AMIGA
+       if [ "$CONFIG_FB_AMIGA" != "n" ]; then
+@@ -107,6 +110,7 @@
+       bool '  Sun3 framebuffer support' CONFIG_FB_SUN3
+       if [ "$CONFIG_FB_SUN3" != "n" ]; then
+          bool '    BWtwo support' CONFIG_FB_BWTWO
++         bool '    CGthree support' CONFIG_FB_CGTHREE
+          bool '    CGsix (GX,TurboGX) support' CONFIG_FB_CGSIX
+       fi
+    fi
+@@ -265,7 +269,7 @@
+ 	   "$CONFIG_FB_MAC" = "y" -o "$CONFIG_FB_RETINAZ3" = "y" -o \
+ 	   "$CONFIG_FB_VIRGE" = "y" -o "$CONFIG_FB_VIRTUAL" = "y" -o \
+ 	   "$CONFIG_FB_BWTWO" = "y" -o "$CONFIG_FB_CLGEN" = "y"  -o \
+-	   "$CONFIG_FB_TX3912" = "y" ]; then
++	   "$CONFIG_FB_TX3912" = "y" -o "$CONFIG_FB_TEKXP" = "y" ]; then
+ 	 define_tristate CONFIG_FBCON_MFB y
+       else
+ 	 if [ "$CONFIG_FB_ACORN" = "m" -o "$CONFIG_FB_AMIGA" = "m" -o \
+@@ -281,12 +285,21 @@
+ 	   "$CONFIG_FB_SA1100" = "y" -o "$CONFIG_FB_VIRTUAL" = "y" -o \
+ 	   "$CONFIG_FB_TX3912" = "y" ]; then
+ 	 define_tristate CONFIG_FBCON_CFB2 y
+-	 define_tristate CONFIG_FBCON_CFB4 y
+       else
+-	 if [ "$CONFIG_FB_ACORN" = "m" -o "$CONFIG_FB_MAC" = "m" -o \
++ 	 if [ "$CONFIG_FB_ACORN" = "m" -o "$CONFIG_FB_MAC" = "m" -o \
+ 	      "$CONFIG_FB_SA1100" = "m" -o "$CONFIG_FB_VIRTUAL" = "m" -o \
+ 	      "$CONFIG_FB_TX3912" = "m" ]; then
+ 	    define_tristate CONFIG_FBCON_CFB2 m
++	 fi
++      fi
++      if [ "$CONFIG_FB_ACORN" = "y" -o "$CONFIG_FB_MAC" = "y" -o \
++	   "$CONFIG_FB_SA1100" = "y" -o "$CONFIG_FB_VIRTUAL" = "y" -o \
++	   "$CONFIG_FB_TX3912" = "y" -o "$CONFIG_FB_TEKXP" = "y" ]; then
++	 define_tristate CONFIG_FBCON_CFB4 y
++      else
++ 	 if [ "$CONFIG_FB_ACORN" = "m" -o "$CONFIG_FB_MAC" = "m" -o \
++	      "$CONFIG_FB_SA1100" = "m" -o "$CONFIG_FB_VIRTUAL" = "m" -o \
++	      "$CONFIG_FB_TX3912" = "m" ]; then
+ 	    define_tristate CONFIG_FBCON_CFB4 m
+ 	 fi
+       fi
+@@ -312,7 +325,7 @@
+ 	   "$CONFIG_FB_TX3912" = "y" -o \
+ 	   "$CONFIG_FB_SIS" = "y" -o "$CONFIG_FB_NEOMAGIC" = "y" -o \
+ 	   "$CONFIG_FB_STI" = "y" -o "$CONFIG_FB_HP300" = "y" -o \
+-	   "$CONFIG_FB_INTEL" = "y" ]; then
++	   "$CONFIG_FB_INTEL" = "y" -o "$CONFIG_FB_TEKXP" = "y" ]; then
+ 	 define_tristate CONFIG_FBCON_CFB8 y
+       else
+ 	 if [ "$CONFIG_FB_ACORN" = "m" -o "$CONFIG_FB_ATARI" = "m" -o \
+diff -Naur linux-2.4.26/drivers/video/Makefile linux-2.4.26-m68k/drivers/video/Makefile
+--- linux-2.4.26/drivers/video/Makefile	2004-02-19 00:36:31.000000000 +1100
++++ linux-2.4.26-m68k/drivers/video/Makefile	2004-02-19 09:17:54.000000000 +1100
+@@ -73,14 +73,22 @@
+ obj-$(CONFIG_FB_VIRGE)            += virgefb.o
+ obj-$(CONFIG_FB_G364)             += g364fb.o
+ obj-$(CONFIG_FB_FM2)              += fm2fb.o
+-obj-$(CONFIG_FB_CREATOR)          += creatorfb.o sbusfb.o
+-obj-$(CONFIG_FB_CGSIX)            += cgsixfb.o sbusfb.o
+-obj-$(CONFIG_FB_BWTWO)            += bwtwofb.o sbusfb.o
+-obj-$(CONFIG_FB_CGTHREE)          += cgthreefb.o sbusfb.o
+-obj-$(CONFIG_FB_TCX)              += tcxfb.o sbusfb.o
+-obj-$(CONFIG_FB_CGFOURTEEN)       += cgfourteenfb.o sbusfb.o
+-obj-$(CONFIG_FB_P9100)            += p9100fb.o sbusfb.o
+-obj-$(CONFIG_FB_LEO)              += leofb.o sbusfb.o
++
++SBUSFB	=
++ifneq ($(CONFIG_SUN3),y)
++ifneq ($(CONFIG_SUN3X),y)
++    SBUSFB	= sbusfb.o
++endif
++endif
++
++obj-$(CONFIG_FB_CREATOR)          += creatorfb.o $(SBUSFB)
++obj-$(CONFIG_FB_CGSIX)            += cgsixfb.o $(SBUSFB)
++obj-$(CONFIG_FB_BWTWO)            += bwtwofb.o $(SBUSFB)
++obj-$(CONFIG_FB_CGTHREE)          += cgthreefb.o $(SBUSFB)
++obj-$(CONFIG_FB_TCX)              += tcxfb.o $(SBUSFB)
++obj-$(CONFIG_FB_CGFOURTEEN)       += cgfourteenfb.o $(SBUSFB)
++obj-$(CONFIG_FB_P9100)            += p9100fb.o $(SBUSFB)
++obj-$(CONFIG_FB_LEO)              += leofb.o $(SBUSFB)
+ obj-$(CONFIG_FB_PMAG_AA)          += pmag-aa-fb.o
+ obj-$(CONFIG_FB_PMAG_BA)          += pmag-ba-fb.o
+ obj-$(CONFIG_FB_PMAGB_B)          += pmagb-b-fb.o
+@@ -125,7 +133,6 @@
+ endif
+ 
+ obj-$(CONFIG_FB_SUN3)             += sun3fb.o
+-obj-$(CONFIG_FB_BWTWO)            += bwtwofb.o
+ obj-$(CONFIG_FB_HGA)              += hgafb.o  
+ obj-$(CONFIG_FB_SA1100)           += sa1100fb.o
+ obj-$(CONFIG_FB_VIRTUAL)          += vfb.o  
+@@ -134,6 +141,7 @@
+ obj-$(CONFIG_FB_E1356)            += epson1356fb.o
+ obj-$(CONFIG_FB_PVR2)             += pvr2fb.o
+ obj-$(CONFIG_FB_VOODOO1)          += sstfb.o
++obj-$(CONFIG_FB_TEKXP)            += tek_fb.o
+ 
+ # Generic Low Level Drivers
+ 
+diff -Naur linux-2.4.26/drivers/video/cgthreefb.c linux-2.4.26-m68k/drivers/video/cgthreefb.c
+--- linux-2.4.26/drivers/video/cgthreefb.c	2001-09-21 07:11:58.000000000 +1000
++++ linux-2.4.26-m68k/drivers/video/cgthreefb.c	2001-10-22 19:34:33.000000000 +1000
+@@ -178,13 +178,16 @@
+ 	struct display *disp = &fb->disp;
+ 	struct fbtype *type = &fb->type;
+ 	struct sbus_dev *sdev = fb->sbdp;
++#ifndef CONFIG_SUN3
+ 	unsigned long phys = sdev->reg_addrs[0].phys_addr;
+ 	int cgRDI = strstr(fb->sbdp->prom_name, "cgRDI") != NULL;
++#endif
+ 
+ #ifndef FBCON_HAS_CFB8
+ 	return NULL;
+ #endif
+ 
++#ifndef CONFIG_SUN3
+ 	if (!fb->s.cg3.regs) {
+ 		fb->s.cg3.regs = (struct cg3_regs *)
+ 			sbus_ioremap(&sdev->resource[0], CG3_REGS_OFFSET,
+@@ -211,6 +214,9 @@
+ 			}
+ 		}
+ 	}
++#else
++	fb->s.cg3.regs = (struct cg3_regs *)0x0fe0e000;
++#endif
+ 
+ 	strcpy(fb->info.modename, "CGthree");
+ 	strcpy(fix->id, "CGthree");
+@@ -218,12 +224,19 @@
+ 	fix->accel = FB_ACCEL_SUN_CGTHREE;
+ 	
+ 	disp->scrollmode = SCROLL_YREDRAW;
++#ifndef CONFIG_SUN3
+ 	if (!disp->screen_base) {
+ 		disp->screen_base = (char *)
+ 			sbus_ioremap(&sdev->resource[0], CG3_RAM_OFFSET,
+ 				     type->fb_size, "cg3 ram");
+ 	}
+-	disp->screen_base += fix->line_length * fb->y_margin + fb->x_margin;
++	fb->physbase = phys;
++#else
++	disp->screen_base = (char *)0x0fd00000;
++	fb->physbase = (unsigned long)0x0fd00000;
++#endif
++
++//	disp->screen_base += fix->line_length * fb->y_margin + fb->x_margin;
+ 	fb->dispsw = fbcon_cfb8;
+ 
+ 	fb->margins = cg3_margins;
+@@ -231,9 +244,9 @@
+ 	fb->blank = cg3_blank;
+ 	fb->unblank = cg3_unblank;
+ 	
+-	fb->physbase = phys;
+ 	fb->mmap_map = cg3_mmap_map;
+-	
++
++#ifndef CONFIG_SUN3	
+ #ifdef __sparc_v9__	
+ 	sprintf(idstring, "%s at %016lx", cgRDI ? "cgRDI" : "cgthree", phys);
+ #else
+@@ -279,6 +292,22 @@
+ 			sbus_writeb(p[1], regp);
+ 		}
+ 	}
++#else
++	sprintf(idstring, "%s: mem %x regs %x", "cgthree", fb->physbase, fb->s.cg3.regs);
++
++	/* kick up the sun3 -- 66hz prom mode only */
++	/* this also turns off the overlay in case it's really a cg4 */
++	
++	fb->s.cg3.regs->cmap.addr = 4;
++	fb->s.cg3.regs->cmap.control = 0xff; 
++	fb->s.cg3.regs->cmap.addr = 5;
++	fb->s.cg3.regs->cmap.control = 0;
++	fb->s.cg3.regs->cmap.addr = 6;
++	fb->s.cg3.regs->cmap.control = 0x40; 
++	fb->s.cg3.regs->cmap.addr = 7;
++	fb->s.cg3.regs->cmap.control = 0;
++
++#endif
+ 
+ 	return idstring;
+ }
+diff -Naur linux-2.4.26/drivers/video/fbcon.c linux-2.4.26-m68k/drivers/video/fbcon.c
+--- linux-2.4.26/drivers/video/fbcon.c	2003-08-25 21:44:42.000000000 +1000
++++ linux-2.4.26-m68k/drivers/video/fbcon.c	2003-08-26 13:13:09.000000000 +1000
+@@ -2340,6 +2340,27 @@
+ 	    done = 1;
+ 	}
+ #endif
++#ifdef CONFIG_HP300
++    if (depth == 6 && p->type == FB_TYPE_PACKED_PIXELS) {
++	/* depth 6 or more, packed, with color registers */
++		
++	src = logo;
++	for( y1 = 0; y1 < LOGO_H; y1++ ) {
++	    int c;
++	    dst = fb + y1*line;
++	    for( x1 = 0; x1 < LOGO_W / 2; x1++ ) {
++		fb_writeb((*src >> 4) + 16, dst++);
++		fb_writeb(((*src++) & 0xf) + 16, dst++);
++	    }
++	    dst += 8;
++	    for (c = 0; c < 32; c++)
++	      for (x1 = 0; x1 < 24; x1++)
++		*dst++ = c;
++	}
++
++	done = 1;
++    }
++#endif /* CONFIG_HP300 */
+ #if defined(CONFIG_FBCON_AFB) || defined(CONFIG_FBCON_ILBM) || \
+     defined(CONFIG_FBCON_IPLAN2P2) || defined(CONFIG_FBCON_IPLAN2P4) || \
+     defined(CONFIG_FBCON_IPLAN2P8)
+@@ -2412,8 +2433,22 @@
+ 		    dst = fb + (y1%4)*8192 + (y1>>2)*line + x/8;
+ 		else
+ 		    dst = fb + y1*line + x/8;
+-		for( x1 = 0; x1 < LOGO_LINE; ++x1 )
++		for( x1 = 0; x1 < LOGO_LINE; ++x1 ) {
++#ifndef CONFIG_HP300
+ 		    fb_writeb(*src++ ^ inverse, dst++);
++#else /* CONFIG_HP300 */
++		    /* hack hack -- make it work with topcat in pseudomono mode */
++		    char c = *src++ ^ inverse;
++		    fb_writeb((c >> 7) & 1, dst++);
++		    fb_writeb((c >> 6) & 1, dst++);
++		    fb_writeb((c >> 5) & 1, dst++);
++		    fb_writeb((c >> 4) & 1, dst++);
++		    fb_writeb((c >> 3) & 1, dst++);
++		    fb_writeb((c >> 2) & 1, dst++);
++		    fb_writeb((c >> 1) & 1, dst++);
++		    fb_writeb((c >> 0) & 1, dst++);
++#endif /* CONFIG_HP300 */
++		}
+ 	    }
+ 	    done = 1;
+ 	}
+diff -Naur linux-2.4.26/drivers/video/fbmem.c linux-2.4.26-m68k/drivers/video/fbmem.c
+--- linux-2.4.26/drivers/video/fbmem.c	2004-02-19 00:36:31.000000000 +1100
++++ linux-2.4.26-m68k/drivers/video/fbmem.c	2004-02-19 09:17:54.000000000 +1100
+@@ -53,6 +53,7 @@
+ extern int amifb_setup(char*);
+ extern int atafb_init(void);
+ extern int atafb_setup(char*);
++extern int tekfb_init(void);
+ extern int macfb_init(void);
+ extern int macfb_setup(char*);
+ extern int cyberfb_init(void);
+@@ -271,6 +272,9 @@
+ #ifdef CONFIG_FB_ATARI
+ 	{ "atafb", atafb_init, atafb_setup },
+ #endif
++#ifdef CONFIG_FB_TEKXP
++	{ "tekfb", tekfb_init, NULL },
++#endif
+ #ifdef CONFIG_FB_MAC
+ 	{ "macfb", macfb_init, macfb_setup },
+ #endif
+@@ -964,9 +968,9 @@
+ 					    fb_drivers[i].init;
+ 				    fb_drivers[i].init = NULL;
+ 			    }
+-			    if (fb_drivers[i].setup)
+-				    fb_drivers[i].setup(options+j+1);
+ 		    }
++		    if (fb_drivers[i].setup)
++			    fb_drivers[i].setup(options+j+1);
+ 		    return 0;
+ 	    }
+     }
+diff -Naur linux-2.4.26/drivers/video/sun3fb.c linux-2.4.26-m68k/drivers/video/sun3fb.c
+--- linux-2.4.26/drivers/video/sun3fb.c	2001-10-01 05:26:08.000000000 +1000
++++ linux-2.4.26-m68k/drivers/video/sun3fb.c	2003-06-14 21:44:17.000000000 +1000
+@@ -48,6 +48,8 @@
+ 
+ #ifdef CONFIG_SUN3
+ #include <asm/oplib.h>
++#include <asm/machines.h>
++#include <asm/idprom.h>
+ #endif
+ #ifdef CONFIG_SUN3X
+ #include <asm/sun3x.h>
+@@ -59,12 +61,14 @@
+ #define CURSOR_SHAPE			1
+ #define CURSOR_BLINK			2
+ 
++#define mymemset(x,y) memset(x,0,y)
++
+     /*
+      *  Interface used by the world
+      */
+ 
+ int sun3fb_init(void);
+-int sun3fb_setup(char *options);
++void sun3fb_setup(char *options);
+ 
+ static int currcon;
+ static char fontname[40] __initdata = { 0 };
+@@ -115,6 +119,8 @@
+ static void sun3fb_clear_margin(struct display *p, int s)
+ {
+ 	struct fb_info_sbusfb *fb = sbusfbinfod(p);
++	
++	return;
+ 
+ 	if (fb->switch_from_graph)
+ 		(*fb->switch_from_graph)(fb);
+@@ -354,7 +360,7 @@
+ 		p++;
+ 	}
+ 
+-	return 0;
++	return;
+ }
+ 
+ static int sun3fbcon_switch(int con, struct fb_info *info)
+@@ -523,7 +529,7 @@
+      */
+ static int __init sun3fb_init_fb(int fbtype, unsigned long addr)
+ {
+-	static struct linux_sbus_device sdb;
++	static struct sbus_dev sdb;
+ 	struct fb_fix_screeninfo *fix;
+ 	struct fb_var_screeninfo *var;
+ 	struct display *disp;
+@@ -531,7 +537,7 @@
+ 	struct fbtype *type;
+ 	int linebytes, w, h, depth;
+ 	char *p = NULL;
+-
++	
+ 	fb = kmalloc(sizeof(struct fb_info_sbusfb), GFP_ATOMIC);
+ 	if (!fb)
+ 		return -ENOMEM;
+@@ -600,8 +606,13 @@
+ 	case FBTYPE_SUN2BW:
+ 		p = bwtwofb_init(fb); break;
+ #endif
++#ifdef CONFIG_FB_CGTHREE
++	case FBTYPE_SUN4COLOR:
++	case FBTYPE_SUN3COLOR:
++		p = cgthreefb_init(fb); break;
++#endif
+ 	}
+-	fix->smem_start = fb->disp.screen_base;
++	fix->smem_start = (unsigned long)fb->disp.screen_base;
+ 	
+ 	if (!p) {
+ 		kfree(fb);
+@@ -656,17 +667,25 @@
+ 	unsigned long addr;
+ 	char p4id;
+ 	
+-	if (!con_is_present()) return;
+-	printk("sun3fb_init()\n");
++	if (!con_is_present()) return -ENXIO;
+ #ifdef CONFIG_SUN3
+-	addr = 0xfe20000;
+         switch(*(romvec->pv_fbtype))
+         {
+-		case FBTYPE_SUN2BW:
+-			return sun3fb_init_fb(FBTYPE_SUN2BW, addr);
+-		case FBTYPE_SUN3COLOR:
+-			printk("cg3 detected but not supported\n");
+-			return -EINVAL;
++	case FBTYPE_SUN2BW:
++		addr = 0xfe20000;
++		return sun3fb_init_fb(FBTYPE_SUN2BW, addr);
++	case FBTYPE_SUN3COLOR:
++	case FBTYPE_SUN4COLOR:
++		if(idprom->id_machtype != (SM_SUN3|SM_3_60)) {
++			printk("sun3fb: cgthree/four only supported on 3/60\n");
++			return -ENODEV;
++		}
++		
++		addr = 0xfd00000;
++		return sun3fb_init_fb(*(romvec->pv_fbtype), addr);
++	default:
++		printk("sun3fb: unsupported framebuffer\n");
++		return -ENODEV;
+ 	}
+ #else
+ 	addr = SUN3X_VIDEO_BASE;
+diff -Naur linux-2.4.26/drivers/video/tek_fb.c linux-2.4.26-m68k/drivers/video/tek_fb.c
+--- linux-2.4.26/drivers/video/tek_fb.c	1970-01-01 10:00:00.000000000 +1000
++++ linux-2.4.26-m68k/drivers/video/tek_fb.c	2003-07-22 07:31:52.000000000 +1000
+@@ -0,0 +1,442 @@
++/*
++ *   linux/drivers/video/tek_fb.c
++ *
++ *   Copyright (C) 2002,2003 Michael Mueller <malware@t-online.de>
++ *
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License.  See the file COPYING in the main directory of this archive
++ * for more details.
++ *
++ *
++ * It is basicly a hack to get the console working. So if someone feels
++ * familiar with the framebuffer API a rework would be welcome.
++ */
++
++#include <linux/config.h>
++#include <linux/kernel.h>
++#include <linux/sched.h>
++#include <linux/errno.h>
++#include <linux/string.h>
++#include <linux/mm.h>
++#include <linux/tty.h>
++#include <linux/slab.h>
++#include <linux/init.h>
++
++#include <linux/fb.h>
++
++#include <video/fbcon.h>
++#ifdef CONFIG_FBCON_CFB8
++#include <video/fbcon-cfb8.h>
++#endif
++#ifdef CONFIG_FBCON_CFB4
++#include <video/fbcon-cfb4.h>
++#endif
++#ifdef CONFIG_FBCON_MFB
++#include <video/fbcon-mfb.h>
++#endif
++
++#include <asm/setup.h>
++#include <asm/uaccess.h>
++#include <asm/pgtable.h>
++#include <asm/irq.h>
++
++#include <asm/teknvram.h>
++
++#define MAX_TEKFB_SIZE	(1280*1024+0x100)
++#define TEKFP_BASE	(0xDE000000UL)
++
++struct tekfb_priv {
++	u_char*		frameptr;
++	int		display_type;
++	int		display_height;
++	int		display_width;
++	int		display_coldepth;
++	int		display_fps;
++
++	u_char *	ptr;
++	u_char *	ptr_ramdac;
++	int		ramdac_type;
++	u_char *	ramdac_regs[5];
++};
++
++#define arraysize(x) (sizeof (x)/sizeof (x)[0])
++
++   /*
++    *    Interface used by the world
++    */
++
++void tekxp_video_setup(char *options, int *ints)
++{
++	// There is nothing we can do currently
++}
++
++   /*
++    *    Interface to the low level console driver
++    */
++
++static struct fb_info fb_info;
++//static int tekfb_switch(int con, struct fb_info *);
++static int tekfb_update_var(int con, struct fb_info *);
++static void tekfb_blank(int, struct fb_info *);
++
++static int tekfb_get_fix(struct fb_fix_screeninfo *, int, struct fb_info *);
++static int tekfb_get_var(struct fb_var_screeninfo *, int, struct fb_info *);
++static int tekfb_set_var(struct fb_var_screeninfo *, int, struct fb_info *);
++static int tekfb_get_cmap(struct fb_cmap *, int, int, struct fb_info *);
++static int tekfb_set_cmap(struct fb_cmap *, int, int, struct fb_info *);
++
++static struct fb_ops tekfb_ops = {
++	fb_get_fix: tekfb_get_fix,
++	fb_get_var: tekfb_get_var,
++	fb_set_var: tekfb_set_var,
++	fb_get_cmap: tekfb_get_cmap,
++	fb_set_cmap: tekfb_set_cmap,
++};
++
++static struct display disp;
++
++//static struct fb_var_screeninfo tekfb_predefined;
++
++struct fb_var_screeninfo tekfb_fixed =
++{
++	xres: 1152, yres: 900,	/* visible resolution */
++	xres_virtual: 1152, yres_virtual: 900,	/* virtual resolution */
++	xoffset: 0, yoffset: 0,		/* offset of visible within virtual */
++	bits_per_pixel: 8,		/* bits per pixel */
++	grayscale: 0,		/* grayscale */
++	red: {0, 6, 0},	/* red */
++	green: {0, 6, 0},	/* green */
++	blue: {0, 6, 0},	/* blue */
++	transp: {0, 0, 0},	/* transp */
++	nonstd: 0,		/* no non-standard pixel format */
++	activate: 0,		/* activate */
++	height: -1,		/* height in mm */
++	width: -1,		/* width in mm */
++	accel_flags: FB_ACCEL_NONE,	/* accel */
++};
++
++static const char* ramdac_names[4] = { "???", "???", "Bt459", "???" };
++
++static int get_private(struct tekfb_priv *priv)
++{
++	priv->ptr = ioremap_writethrough(0xD8200000, 0x100);
++	priv->ptr_ramdac = ioremap_writethrough(0xD8100000, 0x100);
++	if ( !priv->ptr || !priv->ptr_ramdac )
++	{
++		printk("tek_fb: Could not map ramdac into kernel memory space\n");
++		return -ENOMEM;
++	}
++
++	/*
++	 * Maybe sometime I will understand how a bit field is organized.
++	 * Meanwhile this assembler stuff will do the trick.
++	 */
++	__asm__("bfextu %1{#6:#2}, %0\n"
++	        : "=r" (priv->ramdac_type)
++	        : "m" (*(priv->ptr + 1)) );
++	printk("tek_fb: RAMDAC: %d (%s)\n",
++	       priv->ramdac_type, ramdac_names[priv->ramdac_type]);
++
++	if ( priv->ramdac_type & 1 )
++	{
++		priv->ramdac_regs[0] = priv->ptr_ramdac + 0;
++		priv->ramdac_regs[1] = priv->ptr_ramdac + 4;
++		priv->ramdac_regs[2] = priv->ptr_ramdac + 8;
++		priv->ramdac_regs[3] = priv->ptr_ramdac + 12;
++		priv->ramdac_regs[4] = NULL;
++	}
++	else
++	{
++		priv->ramdac_regs[0] = priv->ptr_ramdac + 0;
++		priv->ramdac_regs[1] = NULL;
++		priv->ramdac_regs[2] = priv->ptr_ramdac + 8;
++		priv->ramdac_regs[3] = priv->ptr_ramdac + 4;
++		priv->ramdac_regs[4] = priv->ptr_ramdac + 12;
++	}
++
++	priv->display_type = nvram_readw(NVRAM_DISPLAY);
++	switch ( priv->display_type )
++	{
++		case 0:
++			priv->display_width = 1280;
++			priv->display_height = 1024;
++			priv->display_coldepth = 4;
++			priv->display_fps = 72;
++			break;
++		case 1:
++			priv->display_width = 1152;
++			priv->display_height = 900;
++			priv->display_coldepth = 8;
++			priv->display_fps = 60;
++			break;
++		case 3:
++			priv->display_width = 1280;
++			priv->display_height = 1024;
++			priv->display_coldepth = 8;
++			priv->display_fps = 72;
++			break;
++		case 4:
++			priv->display_width = 1024;
++			priv->display_height = 768;
++			priv->display_coldepth = 8;
++			priv->display_fps = 70;
++			break;
++		case 5:
++			priv->display_width = 1024;
++			priv->display_height = 768;
++			priv->display_coldepth = 8;
++			priv->display_fps = 60;
++			break;
++		case 6:	// note: it is not really the same as above
++			priv->display_width = 1024;
++			priv->display_height = 768;
++			priv->display_coldepth = 8;
++			priv->display_fps = 60;
++			break;
++		case 7:
++			priv->display_width = 1152;
++			priv->display_height = 900;
++			priv->display_coldepth = 1;
++			priv->display_fps = 72;
++			break;
++		case 8:
++			priv->display_width = 1280;
++			priv->display_height = 1024;
++			priv->display_coldepth = 1;
++			priv->display_fps = 72;
++			break;
++		case 9:
++			priv->display_width = 1280;
++			priv->display_height = 864;
++			priv->display_coldepth = 8;
++			priv->display_fps = 60;
++			break;
++		default:
++			priv->display_width = 1152;
++			priv->display_height = 900;
++			priv->display_coldepth = 8;
++			priv->display_fps = 72;
++	}
++	printk("tek_fb: display type: %d (%dx%dx%d@%d)\n",
++	       priv->display_type, priv->display_width,
++	       priv->display_height, priv->display_coldepth,
++	       priv->display_fps);
++
++	return 0;
++}
++
++static inline void set_ramdac_addr(struct tekfb_priv *priv, int addr)
++{
++	*(volatile int *)(priv->ramdac_regs[0]) = addr;
++	if ( priv->ramdac_type & 1 )
++		*(volatile int *)(priv->ramdac_regs[1]) = (addr >> 8) & 0xff;
++}
++
++static inline unsigned long get_fb_size(struct tekfb_priv *priv)
++{
++	return (priv->display_width * priv->display_height * priv->display_coldepth) / 8;
++}
++
++int __devinit tekfb_init(void)
++{
++	int err;
++	struct tekfb_priv *priv = kmalloc(sizeof (*priv), GFP_KERNEL);
++	if ( !priv )
++	{
++		printk(KERN_ERR "tek_fb: Could not allocate memory for private device data\n");
++		return -ENOMEM;
++	}
++	memset(priv, 0, sizeof (*priv));
++
++	priv->frameptr = (u_char*)ioremap_writethrough(TEKFP_BASE, MAX_TEKFB_SIZE);
++	if ( !priv->frameptr )
++	{
++		printk(KERN_ERR "tek_fb: Frame buffer did not map into kernel memory space\n");
++		return -ENOMEM;
++	}
++
++	err = get_private(priv);
++	if ( err < 0 )
++		return err;
++
++	strcpy(fb_info.modename, "TekXpress");
++	fb_info.changevar = NULL;
++	fb_info.node = -1;
++	fb_info.fbops = &tekfb_ops;
++	fb_info.disp = &disp;
++//	fb_info.switch_con = tekfb_switch;
++	fb_info.switch_con = NULL;
++        fb_info.updatevar=tekfb_update_var;
++        fb_info.blank=&tekfb_blank;
++	fb_info.flags = FBINFO_FLAG_DEFAULT;
++	fb_info.fontname[0] = 0;
++	fb_info.par = priv;
++	if ( fb_alloc_cmap(&fb_info.cmap, 1 << 8, 0) < 0 )
++	{
++		printk("tek_fb: Could not allocate color map\n");
++		return -ENOMEM;
++	}
++
++	tekfb_get_var(&disp.var, 0, &fb_info);
++	disp.screen_base = priv->frameptr + 0x100;
++	disp.type = FB_TYPE_PACKED_PIXELS;
++	disp.line_length = 0;
++	disp.can_soft_blank = 0;
++	disp.inverse = 0;
++	disp.ypanstep = 0;
++	disp.ywrapstep = 0;
++	switch ( priv->display_coldepth )
++	{
++#ifdef CONFIG_FBCON_CFB8
++	case 8:
++		disp.visual = FB_VISUAL_PSEUDOCOLOR;
++		disp.dispsw = &fbcon_cfb8;
++		break;
++#endif
++#ifdef CONFIG_FBCON_CFB4
++	case 4:
++		disp.visual = FB_VISUAL_PSEUDOCOLOR;
++		disp.dispsw = &fbcon_cfb4;
++		break;
++#endif
++#ifdef CONFIG_FBCON_MFB
++	case 1:
++		disp.visual = FB_VISUAL_MONO10;
++		disp.dispsw = &fbcon_mfb;
++		break;
++#endif
++	default:
++		panic("tek_fb: unknown/unsupported color depth %d", priv->display_coldepth);
++	}
++
++	memset(priv->frameptr + 0x100, 0, get_fb_size(priv));
++
++	return register_framebuffer(&fb_info);
++}
++
++/*
++static int tekfb_switch(int con, struct fb_info *info)
++{
++	return 0;
++}
++*/
++
++static int tekfb_update_var(int con, struct fb_info *info)
++{
++	return 0;
++}
++
++static void tekfb_blank(int m, struct fb_info *info)
++{
++}
++
++static int tekfb_get_fix(struct fb_fix_screeninfo *fix, int con, struct fb_info *info)
++{
++	int i;
++	struct tekfb_priv *priv = info->par;
++
++	strcpy(fix->id, "TekXpress");
++	fix->smem_start = (unsigned long)priv->frameptr + 0x100;
++	fix->smem_len	= MAX_TEKFB_SIZE - 0x100;
++	fix->type	= FB_TYPE_PACKED_PIXELS;
++	switch ( priv->display_coldepth )
++	{
++	case 8:
++	case 4:
++		fix->visual = FB_VISUAL_PSEUDOCOLOR;
++		break;
++	case 1:
++		fix->visual = FB_VISUAL_MONO10;
++		break;
++	default:
++		panic("tek_fb: unknown color depth");
++	}
++	fix->xpanstep = 0;
++        fix->ypanstep = 0;
++        fix->ywrapstep = 0;
++        fix->line_length = 0;
++        for (i=0; i<arraysize(fix->reserved); i++)
++                fix->reserved[i]=0;
++        return 0;
++
++}
++
++static int tekfb_get_var(struct fb_var_screeninfo *var, int con, struct fb_info *info)
++{
++	struct tekfb_priv *priv = info->par;
++
++	*var = tekfb_fixed;
++
++	var->xres_virtual = var->xres = priv->display_width;
++	var->yres_virtual = var->yres = priv->display_height;
++	var->xoffset = var->yoffset = 0;
++	var->bits_per_pixel = priv->display_coldepth;
++
++	return 0;
++}
++
++static int tekfb_set_var(struct fb_var_screeninfo *var, int con, struct fb_info *info)
++{
++	return 0;
++}
++
++static int tekfb_get_cmap(struct fb_cmap *cmap, int kspc, int con, struct fb_info *info)
++{
++	struct tekfb_priv *priv = info->par;
++	int iCol;
++
++	set_ramdac_addr(priv, info->cmap.start);
++	for ( iCol=0; iCol < info->cmap.len; iCol++ )
++	{
++		unsigned long r,g,b;
++
++		r = *(volatile u_long *)(priv->ramdac_regs[3]);
++		if ( priv->ramdac_type )
++		{
++			g = *(volatile u_long *)(priv->ramdac_regs[3]);
++			b = *(volatile u_long *)(priv->ramdac_regs[3]);
++		}
++		else
++			b = g = r;
++
++		info->cmap.red[iCol] = r;
++		info->cmap.green[iCol] = g;
++		info->cmap.blue[iCol] = b;
++	}
++
++	fb_copy_cmap(&info->cmap, cmap, kspc ? 0 : 2);
++
++	return 0;
++}
++
++static int tekfb_set_cmap(struct fb_cmap *cmap, int kspc, int con, struct fb_info *info)
++{
++	struct tekfb_priv *priv = info->par;
++	if ( priv )
++	{
++		int iCol;
++
++		fb_copy_cmap(cmap, &info->cmap, kspc ? 0 : 1);
++
++		set_ramdac_addr(priv, info->cmap.start);
++		for ( iCol = 0; iCol < info->cmap.len; iCol++ )
++		{
++			int r = info->cmap.red[iCol];
++			int g = info->cmap.green[iCol];
++			int b = info->cmap.blue[iCol];
++
++			if ( !priv->ramdac_type )
++				r = g = b = (38 * r + 90 * g + 128 * b) / 256;
++
++			*(volatile u_long *)(priv->ramdac_regs[3]) = r;
++			if ( priv->ramdac_type )
++			{
++				*(volatile u_long *)(priv->ramdac_regs[3]) = g;
++				*(volatile u_long *)(priv->ramdac_regs[3]) = b;
++			}
++
++		}
++	}
++	return 0;
++}
++
+diff -Naur linux-2.4.26/fs/Config.in linux-2.4.26-m68k/fs/Config.in
+--- linux-2.4.26/fs/Config.in	2004-02-19 00:36:31.000000000 +1100
++++ linux-2.4.26-m68k/fs/Config.in	2004-02-19 09:18:00.000000000 +1100
+@@ -19,6 +19,8 @@
+ 
+ dep_tristate 'Amiga FFS file system support (EXPERIMENTAL)' CONFIG_AFFS_FS $CONFIG_EXPERIMENTAL
+ 
++dep_tristate 'Amiga SFS file system support (read-only) (EXPERIMENTAL)' CONFIG_ASFS_FS $CONFIG_EXPERIMENTAL
++
+ dep_tristate 'Apple HFS file system support (EXPERIMENTAL)' CONFIG_HFS_FS $CONFIG_EXPERIMENTAL
+ 
+ dep_tristate 'Apple HFS+ (Extended HFS) file system support (EXPERIMENTAL)' CONFIG_HFSPLUS_FS $CONFIG_EXPERIMENTAL
+diff -Naur linux-2.4.26/fs/Makefile linux-2.4.26-m68k/fs/Makefile
+--- linux-2.4.26/fs/Makefile	2004-02-19 00:36:31.000000000 +1100
++++ linux-2.4.26-m68k/fs/Makefile	2004-02-19 09:18:00.000000000 +1100
+@@ -55,6 +55,7 @@
+ subdir-$(CONFIG_JFFS_FS)	+= jffs
+ subdir-$(CONFIG_JFFS2_FS)	+= jffs2
+ subdir-$(CONFIG_AFFS_FS)	+= affs
++subdir-$(CONFIG_ASFS_FS)	+= asfs
+ subdir-$(CONFIG_ROMFS_FS)	+= romfs
+ subdir-$(CONFIG_QNX4FS_FS)	+= qnx4
+ subdir-$(CONFIG_UDF_FS)		+= udf
+diff -Naur linux-2.4.26/fs/affs/amigaffs.c linux-2.4.26-m68k/fs/affs/amigaffs.c
+--- linux-2.4.26/fs/affs/amigaffs.c	2001-09-12 01:19:35.000000000 +1000
++++ linux-2.4.26-m68k/fs/affs/amigaffs.c	2004-06-11 07:01:42.000000000 +1000
+@@ -458,7 +458,6 @@
+ 	if (!(sb->s_flags & MS_RDONLY))
+ 		printk(KERN_WARNING "AFFS: Remounting filesystem read-only\n");
+ 	sb->s_flags |= MS_RDONLY;
+-	AFFS_SB->s_flags |= SF_READONLY;	/* Don't allow to remount rw */
+ }
+ 
+ void
+diff -Naur linux-2.4.26/fs/affs/bitmap.c linux-2.4.26-m68k/fs/affs/bitmap.c
+--- linux-2.4.26/fs/affs/bitmap.c	2002-02-26 06:38:07.000000000 +1100
++++ linux-2.4.26-m68k/fs/affs/bitmap.c	2004-06-11 07:01:42.000000000 +1000
+@@ -268,8 +268,7 @@
+ 	return 0;
+ }
+ 
+-int
+-affs_init_bitmap(struct super_block *sb)
++int affs_init_bitmap(struct super_block *sb, int *flags)
+ {
+ 	struct affs_bm_info *bm;
+ 	struct buffer_head *bmap_bh = NULL, *bh = NULL;
+@@ -277,13 +276,13 @@
+ 	u32 size, blk, end, offset, mask;
+ 	int i, res = 0;
+ 
+-	if (sb->s_flags & MS_RDONLY)
++	if (*flags & MS_RDONLY)
+ 		return 0;
+ 
+ 	if (!AFFS_ROOT_TAIL(sb, AFFS_SB->s_root_bh)->bm_flag) {
+ 		printk(KERN_NOTICE "AFFS: Bitmap invalid - mounting %s read only\n",
+ 			kdevname(sb->s_dev));
+-		sb->s_flags |= MS_RDONLY;
++		*flags |= MS_RDONLY;
+ 		return 0;
+ 	}
+ 
+@@ -296,7 +295,7 @@
+ 	bm = AFFS_SB->s_bitmap = kmalloc(size, GFP_KERNEL);
+ 	if (!AFFS_SB->s_bitmap) {
+ 		printk(KERN_ERR "AFFS: Bitmap allocation failed\n");
+-		return 1;
++		return -ENOMEM;
+ 	}
+ 	memset(AFFS_SB->s_bitmap, 0, size);
+ 
+@@ -311,13 +310,13 @@
+ 		bh = affs_bread(sb, bm->bm_key);
+ 		if (!bh) {
+ 			printk(KERN_ERR "AFFS: Cannot read bitmap\n");
+-			res = 1;
++			res = -EIO;
+ 			goto out;
+ 		}
+ 		if (affs_checksum_block(sb, bh)) {
+ 			printk(KERN_WARNING "AFFS: Bitmap %u invalid - mounting %s read only.\n",
+ 			       bm->bm_key, kdevname(sb->s_dev));
+-			sb->s_flags |= MS_RDONLY;
++			*flags |= MS_RDONLY;
+ 			goto out;
+ 		}
+ 		pr_debug("AFFS: read bitmap block %d: %d\n", blk, bm->bm_key);
+@@ -333,7 +332,7 @@
+ 		bmap_bh = affs_bread(sb, be32_to_cpu(bmap_blk[blk]));
+ 		if (!bmap_bh) {
+ 			printk(KERN_ERR "AFFS: Cannot read bitmap extension\n");
+-			res = 1;
++			res = -EIO;
+ 			goto out;
+ 		}
+ 		bmap_blk = (u32 *)bmap_bh->b_data;
+@@ -378,3 +377,15 @@
+ 	affs_brelse(bmap_bh);
+ 	return res;
+ }
++
++void affs_free_bitmap(struct super_block *sb)
++{
++	if (!AFFS_SB->s_bitmap)
++		return;
++
++	affs_brelse(AFFS_SB->s_bmap_bh);
++	AFFS_SB->s_bmap_bh = NULL;
++	AFFS_SB->s_last_bmap = ~0;
++	kfree(AFFS_SB->s_bitmap);
++	AFFS_SB->s_bitmap = NULL;
++}
+diff -Naur linux-2.4.26/fs/affs/super.c linux-2.4.26-m68k/fs/affs/super.c
+--- linux-2.4.26/fs/affs/super.c	2002-02-26 06:38:07.000000000 +1100
++++ linux-2.4.26-m68k/fs/affs/super.c	2004-06-11 07:01:42.000000000 +1000
+@@ -48,10 +48,9 @@
+ 		mark_buffer_dirty(AFFS_SB->s_root_bh);
+ 	}
+ 
+-	affs_brelse(AFFS_SB->s_bmap_bh);
+ 	if (AFFS_SB->s_prefix)
+ 		kfree(AFFS_SB->s_prefix);
+-	kfree(AFFS_SB->s_bitmap);
++	affs_free_bitmap(sb);
+ 	affs_brelse(AFFS_SB->s_root_bh);
+ 
+ 	return;
+@@ -235,6 +234,7 @@
+ 	gid_t			 gid;
+ 	int			 reserved;
+ 	unsigned long		 mount_flags;
++	int			 tmp_flags;	/* fix remount prototype... */
+ 
+ 	pr_debug("AFFS: read_super(%s)\n",data ? (const char *)data : "no options");
+ 
+@@ -349,7 +349,6 @@
+ 		printk(KERN_NOTICE "AFFS: Dircache FS - mounting %s read only\n",
+ 			kdevname(dev));
+ 		sb->s_flags |= MS_RDONLY;
+-		AFFS_SB->s_flags |= SF_READONLY;
+ 	}
+ 	switch (chksum) {
+ 		case MUFS_FS:
+@@ -405,8 +404,10 @@
+ 	AFFS_SB->s_root_bh = root_bh;
+ 	/* N.B. after this point s_root_bh must be released */
+ 
+-	if (affs_init_bitmap(sb))
++	tmp_flags = sb->s_flags;
++	if (affs_init_bitmap(sb, &tmp_flags))
+ 		goto out_error;
++	sb->s_flags = tmp_flags;
+ 
+ 	/* set up enough so that it can read an inode */
+ 
+@@ -445,14 +446,14 @@
+ 	int			 reserved;
+ 	int			 root_block;
+ 	unsigned long		 mount_flags;
+-	unsigned long		 read_only = AFFS_SB->s_flags & SF_READONLY;
++	int			 res = 0;
+ 
+ 	pr_debug("AFFS: remount(flags=0x%x,opts=\"%s\")\n",*flags,data);
+ 
+ 	if (!parse_options(data,&uid,&gid,&mode,&reserved,&root_block,
+ 	    &blocksize,&AFFS_SB->s_prefix,AFFS_SB->s_volume,&mount_flags))
+ 		return -EINVAL;
+-	AFFS_SB->s_flags = mount_flags | read_only;
++	AFFS_SB->s_flags = mount_flags;
+ 	AFFS_SB->s_mode  = mode;
+ 	AFFS_SB->s_uid   = uid;
+ 	AFFS_SB->s_gid   = gid;
+@@ -463,14 +464,11 @@
+ 		sb->s_dirt = 1;
+ 		while (sb->s_dirt)
+ 			affs_write_super(sb);
+-		sb->s_flags |= MS_RDONLY;
+-	} else if (!(AFFS_SB->s_flags & SF_READONLY)) {
+-		sb->s_flags &= ~MS_RDONLY;
+-	} else {
+-		affs_warning(sb,"remount","Cannot remount fs read/write because of errors");
+-		return -EINVAL;
+-	}
+-	return 0;
++		affs_free_bitmap(sb);
++	} else
++		res = affs_init_bitmap(sb, flags);
++
++	return res;
+ }
+ 
+ static int
+diff -Naur linux-2.4.26/fs/asfs/Makefile linux-2.4.26-m68k/fs/asfs/Makefile
+--- linux-2.4.26/fs/asfs/Makefile	1970-01-01 10:00:00.000000000 +1000
++++ linux-2.4.26-m68k/fs/asfs/Makefile	2003-06-20 21:32:40.000000000 +1000
+@@ -0,0 +1,15 @@
++#
++# Makefile for the linux asfs filesystem routines.
++#
++# Note! Dependencies are done automagically by 'make dep', which also
++# removes any old dependencies. DON'T put your own dependencies here
++# unless it's something special (not a .c file).
++#
++# Note 2! The CFLAGS definitions are now in the main makefile.
++
++O_TARGET := asfs.o
++
++obj-y  := inode.o
++obj-m  := $(O_TARGET)
++
++include $(TOPDIR)/Rules.make
+diff -Naur linux-2.4.26/fs/asfs/inode.c linux-2.4.26-m68k/fs/asfs/inode.c
+--- linux-2.4.26/fs/asfs/inode.c	1970-01-01 10:00:00.000000000 +1000
++++ linux-2.4.26-m68k/fs/asfs/inode.c	2003-07-01 05:16:14.000000000 +1000
+@@ -0,0 +1,664 @@
++/*
++ *
++ * Amiga Smart File System, Linux implementation
++ *
++ * version: 0.3beta (16.06.2003)
++ *  
++ * Copyright (C) 2003  Marek 'March' Szyprowski <marek@amiga.pl>
++ *
++ *
++ * Thanks to Marcin Kurek (Morgoth/Dreamolers-CAPS) for help.
++ *
++ * Based on the Linux implementation of the ROMFS file system
++ * Copyright (C) 1997-1999  Janos Farkas <chexum@shadow.banki.hu>
++ *
++ * Using parts of the Amiga FFS filesystem
++ * Copyright (C) 1993  Ray Burr
++ * Copyright (C) 1996  Hans-Joachim Widmaier
++ *
++ * and parts of the smbfs filesystem additionally
++ * Copyright (C) 1995, 1996 by Paal-Kr. Engstad and Volker Lendecke
++ * Copyright (C) 1997 by Volker Lendecke
++ *
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version
++ * 2 of the License, or (at your option) any later version.
++ *
++ *
++ * History:
++ *
++ * v0.3beta (17.06.2003)
++ * - second code clean-up
++ *
++ * v0.2beta2 (15.06.2003)
++ * - fixed yet another stupid bug - driver can't read root block on little-endian systems
++ * v0.2beta (15.06.2003)
++ * - fixed stupid bug - now files have 'file' flag (S_IFREG) set...
++ * - added mount options to set uid, gid and mode of files and dirs
++ * - made hidden files & dirs really hidden (= not listed in directories)
++ * - code clean-up
++ *
++ * v0.1beta (11.06.2003) 
++ * - after many kernel crashes, finally got it! 
++ * - first working read-only filesystem driver
++ *
++ */
++
++/* todo:
++ *	- remove bugs
++ *	- considering write access...
++ *	- speed-up entry lookup (use HashTables...)
++ */
++
++#include <linux/module.h>
++#include <linux/types.h>
++#include <linux/errno.h>
++#include <linux/slab.h>
++#include <linux/asfs_fs.h>
++#include <linux/fs.h>
++#include <linux/locks.h>
++#include <linux/init.h>
++#include <linux/smp_lock.h>
++
++#include <asm/byteorder.h>
++#include <asm/uaccess.h>
++
++static struct inode *asfs_iget_from_fsObject(struct super_block *sb, struct fsObject *obj);
++
++static u32 asfs_calcchecksum(struct fsBlockHeader *block, u32 blocksize)
++{
++	u32 *data=(void *)block, checksum = 1, tmpchecksum = block->checksum;
++
++	block->checksum=0;
++	while(blocksize > 0) {
++		checksum+=be32_to_cpu(*data++);
++		blocksize-=4;
++	}
++	block->checksum=tmpchecksum;
++	return(-checksum);
++}
++
++static inline int asfs_check_block(struct fsBlockHeader *block, u32 blocksize, u32 n)
++{
++	if (asfs_calcchecksum((struct fsBlockHeader *)block, blocksize) == be32_to_cpu(((struct fsBlockHeader *)block)->checksum) && n == be32_to_cpu(((struct fsBlockHeader *)block)->ownblock))
++		return 1;
++	return 0;
++}
++
++/* get fs structure from block and do some checks... */
++static int asfs_get_contblock(struct super_block *sb, u32 n, void *dest)
++{
++	struct buffer_head *bh;
++
++	bh = sb_bread(sb, n);
++	if (!bh)
++		return -1;		/* error */
++	memcpy(dest, ((char *)bh->b_data), sb->s_blocksize);
++	brelse(bh);
++
++	if (asfs_check_block(dest, sb->s_blocksize, n)) {
++		from32be(((struct fsBlockHeader *)dest)->ownblock);
++		return 1; /* all okay */
++	}
++	return -1; /* error */
++}
++
++/* get data from block without checks... */
++/*static int asfs_get_datablock (struct super_block *sb, u32 n, void *dest, int len)
++{
++	struct buffer_head *bh;
++	bh = sb_bread(sb, n);
++	if (!bh)
++		return -1;
++	memcpy(dest, ((char *)bh->b_data), len);
++	brelse(bh);
++	return 1;
++}
++*/
++static inline struct inode *asfs_get_root_inode(struct super_block *sb)
++{
++	struct inode *result = NULL;
++	void *block;
++	struct fsObject *obj;
++
++	asfs_debug("asfs_get_root_inode\n");
++
++	block = kmalloc(sb->s_blocksize, GFP_KERNEL);
++	if (asfs_get_contblock(sb, sb->u.asfs_sb.rootobjectcontainer, block) < 0)
++		goto free_and_return;
++
++	obj = &(((struct fsObjectContainer *)block)->object[0]);
++	from32be(obj->objectnode);
++	from32be(obj->object.dir.firstdirblock);
++
++	if (obj->objectnode > 0)
++		result = asfs_iget_from_fsObject(sb, obj);
++
++free_and_return:
++	kfree(block);
++	return result;
++}
++
++static struct super_operations asfs_ops;
++
++static int asfs_parse_options(char *options, struct super_block *sb)
++{
++	char *this_char, *value, *optn;
++	int f;
++
++	/* Fill in defaults */
++	sb->u.asfs_sb.uid = ASFS_DEFAULT_UID;
++	sb->u.asfs_sb.gid = ASFS_DEFAULT_GID;
++	sb->u.asfs_sb.mode = ASFS_DEFAULT_MODE;
++
++	if (!options)
++		return 1;
++	for (this_char = strtok(options,","); this_char; this_char = strtok(NULL,",")) {
++		f = 0;
++		if ((value = strchr(this_char,'=')) != NULL)
++			*value++ = 0;
++		if ((f = !strcmp(this_char,"setuid")) || !strcmp(this_char,"setgid")) {
++			if (value) {
++				if (!*value) {
++					printk("ASFS: Argument for set[ug]id option missing\n");
++					return 0;
++				} else {
++					(f ? sb->u.asfs_sb.uid : sb->u.asfs_sb.gid) = simple_strtoul(value,&value,0);
++					if (*value) {
++						printk("ASFS: Bad set[ug]id argument\n");
++						return 0;
++					}
++				}
++			}
++		} else if (!strcmp(this_char,"mode")) {
++			optn = "mode";
++			if (!value || !*value)
++				goto out_no_arg;
++			sb->u.asfs_sb.mode = simple_strtoul(value,&value,8) & 0777;
++			if (*value)
++				return 0;
++		} else {
++			printk("ASFS: Unrecognized mount option %s\n", this_char);
++			return 0;
++		}
++	}
++	return 1;
++
++out_no_arg:
++	printk("ASFS: The %s option requires an argument\n", optn);
++	return 0;
++}
++
++static struct super_block *asfs_read_super(struct super_block *sb, void *data, int silent)
++{
++	struct buffer_head *bh;
++	kdev_t dev = sb->s_dev;
++	struct fsRootBlock *rootblock;
++
++	if (!asfs_parse_options(data, sb)) {
++		printk(KERN_ERR "ASFS: Error parsing options\n");
++		return NULL;
++	}
++
++	if (!sb_set_blocksize(sb, 512))
++		return NULL;
++	sb->s_maxbytes = 0xFFFFFFFF;
++
++	bh = sb_bread(sb, 0);
++	if (!bh) {
++		printk(KERN_ERR "ASFS: unable to read superblock\n");
++		goto outnobh;
++	}
++
++	rootblock = (struct fsRootBlock *)bh->b_data;
++
++	if (be32_to_cpu(rootblock->bheader.id) == ASFS_ROOTID && be16_to_cpu(rootblock->version) == ASFS_STRUCTURE_VERISON) {
++		sb->s_blocksize = be32_to_cpu(rootblock->blocksize);
++		sb->u.asfs_sb.totalblocks = be32_to_cpu(rootblock->totalblocks);
++		sb->u.asfs_sb.rootobjectcontainer = be32_to_cpu(rootblock->rootobjectcontainer);
++		sb->u.asfs_sb.extentbnoderoot = be32_to_cpu(rootblock->extentbnoderoot);
++
++		brelse(bh);
++
++		if (!sb_set_blocksize(sb, sb->s_blocksize)) {
++			printk(KERN_ERR "ASFS: Found Amiga SFS RootBlock on dev %s, but blocksize %ld is not supported!\n", bdevname(dev), sb->s_blocksize);
++			return NULL;
++		}
++
++		bh = sb_bread(sb, 0);
++		if (!bh) {
++			printk(KERN_ERR "ASFS: unable to read superblock\n");
++			goto out;
++		}
++		rootblock = (struct fsRootBlock *)bh->b_data;
++
++		if (asfs_check_block((void *)rootblock, sb->s_blocksize, 0))
++			printk(KERN_NOTICE "ASFS: Found Amiga SFS RootBlock on dev %s. Checksum okay. Mounting...\n", bdevname(dev));
++		else {
++			if (!silent)
++				printk(KERN_ERR "ASFS: Found something like Amiga SFS RootBlock on dev %s, but it has checksum error!\n", bdevname(dev));
++			goto out;
++		}
++	} else {
++		if (!silent)
++			printk(KERN_ERR "ASFS: Can't find a valid Amiga SFS filesystem on dev %s.\n", bdevname(dev));
++		goto out;
++	}
++
++	brelse(bh);
++
++	sb->s_magic = ASFS_MAGIC;
++	sb->s_flags |= MS_RDONLY | MS_NODEV | MS_NOSUID;
++	sb->s_op = &asfs_ops;
++	sb->s_root = d_alloc_root(asfs_get_root_inode(sb));
++	if (!sb->s_root)
++		goto outnobh;
++
++	/* Ehrhm; sorry.. :) */
++	if (0) {
++out:
++		brelse(bh);
++outnobh:
++		sb = NULL;
++	}
++	return sb;
++}
++
++/* That's simple too. */
++
++static int asfs_statfs(struct super_block *sb, struct statfs *buf)
++{
++	buf->f_type = ASFS_MAGIC;
++	buf->f_bsize = sb->s_blocksize;
++	buf->f_bfree = buf->f_bavail = buf->f_ffree;
++	buf->f_blocks = sb->u.asfs_sb.totalblocks;
++	buf->f_namelen = ASFS_MAXFN;
++	return 0;
++}
++
++static int asfs_get_fsObject_varlen(struct fsObject *obj)
++{
++	int len, i;
++	u8 *p = obj->name;
++	for (i=2; i > 0; p++)
++		if (*p == '\0')
++			i--;
++	len = (p - (u8 *)obj);
++	if (len & 1)
++		len++;
++	return len;
++}
++
++static int asfs_readdir(struct file *filp, void *dirent, filldir_t filldir)
++{
++	struct inode *diri = filp->f_dentry->d_inode;
++	unsigned long f_pos;
++	int stored = 0;
++	int obj_skip;
++
++	struct fsObjectContainer *objcont;
++	struct fsObject *obj;
++	int i;
++	unsigned long block;
++
++	asfs_debug("asfs_readdir:\n");
++
++	if (filp->f_pos == diri->i_sb->u.asfs_sb.totalblocks)
++		return stored;
++
++	f_pos = filp->f_pos;
++
++	if (f_pos == 0) {
++		filp->private_data = (void *)0;
++		if (filldir(dirent, ".", 1, f_pos, diri->i_ino, DT_DIR) < 0)
++			return 0;
++		filp->f_pos = f_pos = 1;
++		stored++;
++	}
++	if (f_pos == 1) {
++		if (filldir(dirent, "..", 2, f_pos, filp->f_dentry->d_parent->d_inode->i_ino, DT_DIR) < 0)
++			return stored;
++		filp->f_pos = f_pos = 2;
++		stored++;
++	}
++
++	if (diri->u.asfs_i.firstdirblock == 0) {	/* empty directory */
++		filp->f_pos = diri->i_sb->u.asfs_sb.totalblocks;
++		return stored;
++	}
++
++	objcont = kmalloc(diri->i_sb->s_blocksize, GFP_KERNEL);
++
++	if (f_pos == 2) {	/* reading directory from its beginning */
++		block = diri->u.asfs_i.firstdirblock;
++		do {
++			if (asfs_get_contblock(diri->i_sb, block, (void *)objcont) < 0)
++				goto free_and_end;
++			from32be(objcont->previous);
++			from32be(objcont->next);
++			block = objcont->previous;
++		} while (objcont->previous != 0);
++		obj_skip = 0;
++	} else {
++		block = f_pos;
++		if (asfs_get_contblock(diri->i_sb, block, (void *)objcont) < 0)
++			goto free_and_end;
++		from32be(objcont->previous);
++		from32be(objcont->next);
++		obj_skip = (int)filp->private_data;
++	}
++
++	i=0;
++	block = ((struct fsBlockHeader *)objcont)->ownblock;
++
++	do {
++		if (i != 0) {
++			if (asfs_get_contblock(diri->i_sb, block, (void *)objcont) < 0)
++				goto free_and_end;
++			from32be(objcont->previous);
++			from32be(objcont->next);
++		}
++
++		i = 0;
++		obj = &(objcont->object[0]);
++		from32be(obj->objectnode);
++
++		while (obj->objectnode > 0 && ((char *)obj - (char *)objcont) + sizeof(struct fsObject) < diri->i_sb->s_blocksize) {
++			if (obj_skip > 0)
++				obj_skip--;
++			else if (!(obj->bits & OTYPE_HIDDEN)) {
++				asfs_debug("ASFS: DirFilling: entry #%d (in_cont: %d) \"%s\" (node %lu offset %lu), type %d\n", stored, i, obj->name, (unsigned long) obj->objectnode, block, obj->bits);
++				filp->f_pos = block;
++				if (filldir(dirent, obj->name, strlen(obj->name), block, obj->objectnode, ((obj->bits & OTYPE_DIR) ? DT_DIR : DT_REG)) < 0) {
++					filp->private_data = (void *)i;
++					asfs_debug("ASFS: DirFilling: to be continued...\n");
++					goto free_and_end;
++				}
++				stored++;
++			}
++			obj = (struct fsObject *)((char *)(obj) + asfs_get_fsObject_varlen(obj));
++			i++;
++		}
++		block = objcont->next;
++
++	} while (objcont->next != 0);
++
++	filp->f_pos = diri->i_sb->u.asfs_sb.totalblocks;
++
++free_and_end:
++	kfree(objcont);
++	return stored;
++}
++
++static inline u8 upperchar(u8 c)
++{
++	if((c>=224 && c<=254 && c!=247) || (c>='a' && c<='z'))
++		c-=32;
++	return(c);
++}
++
++static int namecmp(u8 *s, u8 *ct)
++{
++	while (upperchar(*s) == upperchar(*ct) && *ct != '\0' && *ct != '/') {
++		s++; ct++;
++	}
++	return (*s == '\0' && (*ct == '\0' || *ct == '/')) ? 0 : *ct - *s;
++}
++
++
++static struct dentry *asfs_lookup(struct inode *dir, struct dentry *dentry)
++{
++	int res;
++	struct inode *inode;
++	unsigned char *name;		/* got from dentry */
++
++	struct fsObjectContainer *objcont;
++	struct fsObject *obj;
++	int i;
++	unsigned long block;
++
++	name = (unsigned char *)dentry->d_name.name;
++	res = -EACCES;			/* placeholder for "no data here" */
++
++	asfs_debug("asfs_lookup: (searching \"%s\"...) ", name);
++
++	objcont = kmalloc(dir->i_sb->s_blocksize, GFP_KERNEL);
++
++	block = dir->u.asfs_i.firstdirblock;
++
++	do {
++		if (asfs_get_contblock(dir->i_sb, block, (void *)objcont) < 0)
++			goto free_and_error;
++		from32be(objcont->previous);
++		from32be(objcont->next);
++		block = objcont->previous;
++	} while (objcont->previous != 0);
++
++	i=0;
++	block = ((struct fsBlockHeader *)objcont)->ownblock;
++
++	do {
++		if (i != 0) {
++			if (asfs_get_contblock(dir->i_sb, block, (void *)objcont) < 0)
++				goto free_and_error;
++			from32be(objcont->previous);
++			from32be(objcont->next);
++		}
++
++		i = 0;
++		obj = &(objcont->object[0]);
++		while (be32_to_cpu(obj->objectnode) > 0 && ((char *)obj - (char *)objcont) + sizeof(struct fsObject) < dir->i_sb->s_blocksize) {
++			if (namecmp(obj->name, name) == 0) {
++				from32be(obj->objectnode);
++				from32be(obj->object.dir.firstdirblock); /* it also corrects file.size and file.firstdatablock */
++				from32be(obj->object.dir.hashtable);     /* because they are union */
++				from32be(obj->datemodified);
++				asfs_debug("Object found! #%d: Node %u, Name %s, Type: %d, inCont %lu\n", i, obj->objectnode, obj->name, obj->bits, block);
++
++				if ((inode = asfs_iget_from_fsObject(dir->i_sb, obj)))
++					goto found_inode;
++
++				asfs_debug("ASFS: Strange - no inode allocated... :(\n");
++				goto free_and_error;
++			}
++			obj = (struct fsObject *)((char *)(obj) + asfs_get_fsObject_varlen(obj));
++			i++;
++		}
++		block = objcont->next;
++
++	} while (objcont->next != 0);
++
++	/*
++	 * it's a bit funky, _lookup needs to return an error code
++	 * (negative) or a NULL, both as a dentry.  ENOENT should not
++	 * be returned, instead we need to create a negative dentry by
++	 * d_add(dentry, NULL); and return 0 as no error.
++	 * (Although as I see, it only matters on writable file
++	 * systems).
++	 */
++
++	inode = NULL;
++	asfs_debug("ASFS: object not found.\n");
++found_inode:
++	res = 0;
++	d_add(dentry, inode);
++free_and_error:
++	kfree(objcont);
++	return ERR_PTR(res);
++}
++
++static struct fsExtentBNode asfs_search_BNodeTree(struct super_block *sb, u32 key)
++{
++	struct fsBNodeContainer *bnodecont;
++	struct fsExtentBNode result;
++	unsigned long block = sb->u.asfs_sb.extentbnoderoot;
++
++	bnodecont = kmalloc(sb->s_blocksize, GFP_KERNEL);
++	while (asfs_get_contblock(sb, block, bnodecont) > 0) {
++		from16be(bnodecont->btc.nodecount);
++		if (bnodecont->btc.isleaf) {
++			int i;
++			struct fsExtentBNode *exbnode;
++			exbnode = (void *)bnodecont->btc.bnode;
++			for (i=0; i < bnodecont->btc.nodecount; i++) {
++				from32be(exbnode->key);
++				from32be(exbnode->next);
++				from32be(exbnode->prev);
++				from16be(exbnode->blocks);
++				if (exbnode->key == key) {
++					result = *exbnode;
++					goto found;
++				}
++				exbnode = (void *)exbnode + bnodecont->btc.nodesize;
++			}
++		} else {
++			int i;
++			struct BNode *bnode;
++			bnode = (void *)bnodecont->btc.bnode;
++			for (i=0; i < bnodecont->btc.nodecount && key >= be32_to_cpu(bnode->key); i++)
++				bnode = (void *)bnode + bnodecont->btc.nodesize;
++
++			bnode = (void *)bnode - bnodecont->btc.nodesize;
++			block = be32_to_cpu(bnode->data);
++		}
++	}
++	/* read error or key not found */
++	result = (struct fsExtentBNode){0, 0, 0, 0};
++found:
++	kfree(bnodecont);
++	return result;
++}
++
++static int
++asfs_get_block(struct inode *inode, long block, struct buffer_head *bh_result, int create)
++{
++	struct fsExtentBNode extend;
++	u32 filedata = inode->u.asfs_i.firstdatablock;
++	unsigned long pos = 0;
++
++	asfs_debug("ASFS: get_block(%lu, %ld)\n", inode->i_ino, block);
++
++	if (block < 0) {
++		printk(KERN_ERR "ASFS: asfsget_block: requested block (%ld) < 0!\n", block);
++		return -EIO;
++	}
++
++	if (block >= inode->i_blocks) {
++		printk(KERN_ERR "ASFS: asfsget_block: strange block request %ld!\n", block);
++		return -EIO;
++	}
++
++	do {
++		extend = asfs_search_BNodeTree(inode->i_sb, filedata);
++		if (extend.key == 0)
++			goto error;
++		filedata = extend.next;
++		if (pos + extend.blocks > block) {
++			bh_result->b_blocknr = extend.key + block - pos;
++			bh_result->b_dev = inode->i_dev;
++			bh_result->b_state |= (1UL << BH_Mapped);
++			return 0;
++		}
++		pos += extend.blocks;
++	} while (extend.next != 0 && pos < inode->i_blocks);
++error:
++	return -EIO;
++}
++
++static int asfs_readpage(struct file *file, struct page *page)
++{
++	return block_read_full_page(page, asfs_get_block);
++}
++static int asfs_bmap(struct address_space *mapping, long block)
++{
++	return generic_block_bmap(mapping,block,asfs_get_block);
++}
++
++/* Mapping from our types to the kernel */
++
++static struct address_space_operations asfs_aops = {
++	.readpage	= asfs_readpage,
++	.sync_page	= block_sync_page,
++	.bmap		= asfs_bmap,
++};
++
++struct file_operations asfs_file_operations = {
++	.llseek		= generic_file_llseek,
++	.read		= generic_file_read,
++	.mmap		= generic_file_mmap,
++};
++
++static struct file_operations asfs_dir_operations = {
++	.read		= generic_read_dir,
++	.readdir	= asfs_readdir,
++};
++
++static struct inode_operations asfs_dir_inode_operations = {
++	.lookup		= asfs_lookup,
++};
++
++static struct inode *asfs_iget_from_fsObject(struct super_block *sb, struct fsObject *obj)
++{
++	struct inode *result;
++
++	result = new_inode(sb);
++	if (!result)
++		return result;
++
++	result->i_ino = obj->objectnode;
++	result->i_mode = sb->u.asfs_sb.mode;
++	result->i_mtime = result->i_atime = result->i_ctime = obj->datemodified + (365*8+2)*24*60*60;  /* Linux: seconds since 01-01-1970, AmigaSFS: seconds since 01-01-1978 */
++	result->i_uid = sb->u.asfs_sb.uid;
++	result->i_gid = sb->u.asfs_sb.gid;
++
++	asfs_debug("asfs_iget_from_fsObject: Setting-up node %lu... ", result->i_ino);
++
++	if (obj->bits & OTYPE_DIR) {
++		asfs_debug("dir (FirstdirBlock: %u, HashTable %u)\n", obj->object.dir.firstdirblock, obj->object.dir.hashtable);
++
++		result->i_size = 0;
++		result->i_op = &asfs_dir_inode_operations;
++		result->i_fop = &asfs_dir_operations;
++		result->i_mode |= S_IFDIR | ((result->i_mode & 0400) ? 0100 : 0) | ((result->i_mode & 0040) ? 0010 : 0) | ((result->i_mode & 0004) ? 0001 : 0);
++		result->u.asfs_i.firstdirblock = obj->object.dir.firstdirblock;
++		result->u.asfs_i.hashtable = obj->object.dir.hashtable;
++	} else {
++		asfs_debug("file (Size: %u, FirstBlock: %u)\n", obj->object.file.size, obj->object.file.data);
++
++		result->i_size = obj->object.file.size;
++		result->i_blocks = (obj->object.file.size + sb->s_blocksize - 1) >> sb->s_blocksize_bits;
++		result->i_fop = &asfs_file_operations;
++		result->i_mapping->a_ops = &asfs_aops;
++		result->i_mode |= S_IFREG;
++		result->u.asfs_i.firstdatablock = obj->object.file.data;
++	}
++	insert_inode_hash(result);
++	return result;
++}
++
++static struct super_operations asfs_ops = {
++	.statfs		= asfs_statfs,
++};
++
++static DECLARE_FSTYPE_DEV(asfs_fs_type, "asfs", asfs_read_super);
++
++static int __init init_asfs_fs(void)
++{
++	return register_filesystem(&asfs_fs_type);
++}
++
++static void __exit exit_asfs_fs(void)
++{
++	unregister_filesystem(&asfs_fs_type);
++}
++
++/* Yes, works even as a module... :) */
++
++EXPORT_NO_SYMBOLS;
++MODULE_DESCRIPTION("Amiga Smart File System support for Linux");
++
++module_init(init_asfs_fs)
++module_exit(exit_asfs_fs)
++MODULE_LICENSE("GPL");
+diff -Naur linux-2.4.26/fs/binfmt_aout.c linux-2.4.26-m68k/fs/binfmt_aout.c
+--- linux-2.4.26/fs/binfmt_aout.c	2001-11-03 12:39:20.000000000 +1100
++++ linux-2.4.26-m68k/fs/binfmt_aout.c	2003-04-07 09:23:02.000000000 +1000
+@@ -349,7 +349,7 @@
+ 			return error;
+ 		}
+ 			 
+-		flush_icache_range(text_addr, text_addr+ex.a_text+ex.a_data);
++		flush_icache_user_range((void *)text_addr, ex.a_text + ex.a_data);
+ 	} else {
+ 		static unsigned long error_time, error_time2;
+ 		if ((ex.a_text & 0xfff || ex.a_data & 0xfff) &&
+@@ -373,9 +373,7 @@
+ 			do_brk(N_TXTADDR(ex), ex.a_text+ex.a_data);
+ 			bprm->file->f_op->read(bprm->file,(char *)N_TXTADDR(ex),
+ 					ex.a_text+ex.a_data, &pos);
+-			flush_icache_range((unsigned long) N_TXTADDR(ex),
+-					   (unsigned long) N_TXTADDR(ex) +
+-					   ex.a_text+ex.a_data);
++			flush_icache_user_range((void *)N_TXTADDR(ex), ex.a_text + ex.a_data);
+ 			goto beyond_if;
+ 		}
+ 
+@@ -471,8 +469,7 @@
+ 		
+ 		file->f_op->read(file, (char *)start_addr,
+ 			ex.a_text + ex.a_data, &pos);
+-		flush_icache_range((unsigned long) start_addr,
+-				   (unsigned long) start_addr + ex.a_text + ex.a_data);
++		flush_icache_user_range((void *)start_addr, ex.a_text + ex.a_data);
+ 
+ 		retval = 0;
+ 		goto out;
+diff -Naur linux-2.4.26/fs/binfmt_elf.c linux-2.4.26-m68k/fs/binfmt_elf.c
+--- linux-2.4.26/fs/binfmt_elf.c	2004-04-14 23:05:40.000000000 +1000
++++ linux-2.4.26-m68k/fs/binfmt_elf.c	2004-04-15 06:42:54.000000000 +1000
+@@ -403,8 +403,7 @@
+ 	retval = interpreter->f_op->read(interpreter, addr, text_data, &offset);
+ 	if (retval < 0)
+ 		goto out;
+-	flush_icache_range((unsigned long)addr,
+-	                   (unsigned long)addr + text_data);
++	flush_icache_user_range(addr, text_data);
+ 
+ 	do_brk(ELF_PAGESTART(text_data + ELF_MIN_ALIGN - 1),
+ 		interp_ex->a_bss);
+diff -Naur linux-2.4.26/fs/fat/inode.c linux-2.4.26-m68k/fs/fat/inode.c
+--- linux-2.4.26/fs/fat/inode.c	2004-04-14 23:05:40.000000000 +1000
++++ linux-2.4.26-m68k/fs/fat/inode.c	2004-04-15 06:42:55.000000000 +1000
+@@ -11,6 +11,8 @@
+  */
+ 
+ #include <linux/module.h>
++
++#include <linux/config.h>
+ #include <linux/msdos_fs.h>
+ #include <linux/nls.h>
+ #include <linux/kernel.h>
+@@ -226,6 +228,13 @@
+ 	opts->shortname = 0;
+ 	opts->utf8 = 0;
+ 	opts->iocharset = NULL;
++	opts->atari = 0;
++
++#ifdef CONFIG_ATARI
++	if(MACH_IS_ATARI)
++	/* make Atari GEMDOS format the default if machine is an Atari */
++		opts->atari = 1;
++#endif
+ 	*debug = *fat = 0;
+ 
+ 	if (!options)
+@@ -324,6 +333,11 @@
+ 			if (value) ret = 0;
+ 			else opts->sys_immutable = 1;
+ 		}
++		else if (!strcmp(this_char,"atari")) {
++			if (!value || !strcmp(value,"yes")) opts->atari = 1;
++			else if (!strcmp(value,"no")) opts->atari = 0;
++			else ret = 0;
++		}
+ 		else if (!strcmp(this_char,"codepage") && value) {
+ 			opts->codepage = simple_strtoul(value,&value,0);
+ 			if (*value) ret = 0;
+@@ -716,16 +730,41 @@
+ 
+ 	error = 0;
+ 	if (!error) {
+-		sbi->fat_bits = fat32 ? 32 :
++ 		if (!opts.atari)
++			sbi->fat_bits = fat32 ? 32 :
+ 			(fat ? fat :
+ 			 (sbi->clusters > MSDOS_FAT12 ? 16 : 12));
++ 		else {
++ 			int sectors;
++ 			/* Atari GEMDOS partitions always have 16-bit fat */
++ 			sbi->fat_bits = fat32 ? 32 : (fat ? fat : 16);
++ 			/* If more clusters than fat entries in 16-bit fat, we assume
++ 			 * it's a real MSDOS partition with 12-bit fat.
++ 			 */
++ 			if (!fat32 && sbi->clusters+2 > sbi->
++ 				fat_length*SECTOR_SIZE*8/sbi->fat_bits)
++ 				sbi->fat_bits = 12;
++ 			/* if it's a floppy disk --> 12bit fat */
++ 			if (!fat32 && MAJOR(sb->s_dev) == FLOPPY_MAJOR)
++ 				sbi->fat_bits = 12;
++ 			/* if it's a ramdisk or loopback device and has one of the usual
++ 			 * floppy sizes -> 12bit FAT  */
++ 			sectors = total_sectors + sbi->data_start;
++ 			if (!fat32 && (MAJOR(sb->s_dev) == RAMDISK_MAJOR ||
++ 				 MAJOR(sb->s_dev) == LOOP_MAJOR) &&
++ 				(sectors == 720 || sectors == 1440 || sectors == 2880))
++ 				sbi->fat_bits = 12;
++ 		}
+ 		fat_clusters =
+ 			sbi->fat_length * logical_sector_size * 8 / sbi->fat_bits;
+ 		error = !sbi->fats || (sbi->dir_entries & (sbi->dir_per_block - 1))
+ 			|| sbi->clusters + 2 > fat_clusters + MSDOS_MAX_EXTRA
+ 			|| logical_sector_size < 512
+ 			|| PAGE_CACHE_SIZE < logical_sector_size
+-			|| !b->secs_track || !b->heads;
++			/* secs_track and heads may be arbitrary on GEMDOS
++			   partitions, it depends on partitioning software
++			   used.  */
++			|| (!opts.atari && (!b->secs_track || !b->heads));
+ 	}
+ 	brelse(bh);
+ 
+@@ -744,10 +783,10 @@
+ 		error = cvf_formats[i]->mount_cvf(sb, cvf_options);
+ 	if (error || debug) {
+ 		/* The MSDOS_CAN_BMAP is obsolete, but left just to remember */
+-		printk("[MS-DOS FS Rel. 12,FAT %d,check=%c,conv=%c,"
++		printk("[MS-DOS FS Rel. 12,FAT %d,check=%c,conv=%c,atari=%c,"
+ 		       "uid=%d,gid=%d,umask=%03o%s]\n",
+-		       sbi->fat_bits,opts.name_check,
+-		       opts.conversion,opts.fs_uid,opts.fs_gid,opts.fs_umask,
++		       sbi->fat_bits,opts.name_check,opts.conversion,
++		       opts.atari?'y':'n',opts.fs_uid,opts.fs_gid,opts.fs_umask,
+ 		       MSDOS_CAN_BMAP(sbi) ? ",bmap" : "");
+ 		printk("[me=0x%x,cs=%d,#f=%d,fs=%d,fl=%ld,ds=%ld,de=%d,data=%ld,"
+ 		       "se=%u,ts=%u,ls=%d,rc=%ld,fc=%u]\n",
+diff -Naur linux-2.4.26/include/asm-m68k/bootinfo.h linux-2.4.26-m68k/include/asm-m68k/bootinfo.h
+--- linux-2.4.26/include/asm-m68k/bootinfo.h	2001-04-19 04:49:13.000000000 +1000
++++ linux-2.4.26-m68k/include/asm-m68k/bootinfo.h	2003-07-22 07:20:24.000000000 +1000
+@@ -255,6 +255,7 @@
+ #define MVME16x_BOOTI_VERSION  MK_BI_VERSION( 2, 0 )
+ #define BVME6000_BOOTI_VERSION MK_BI_VERSION( 2, 0 )
+ #define Q40_BOOTI_VERSION      MK_BI_VERSION( 2, 0 )
++#define TEKXP_BOOTI_VERSION    MK_BI_VERSION( 2, 0 )
+ 
+ #ifdef BOOTINFO_COMPAT_1_0
+ 
+diff -Naur linux-2.4.26/include/asm-m68k/keyboard.h linux-2.4.26-m68k/include/asm-m68k/keyboard.h
+--- linux-2.4.26/include/asm-m68k/keyboard.h	2004-04-14 23:05:40.000000000 +1000
++++ linux-2.4.26-m68k/include/asm-m68k/keyboard.h	2004-02-10 07:24:32.000000000 +1100
+@@ -13,6 +13,58 @@
+ 
+ #ifdef __KERNEL__
+ 
++#ifdef CONFIG_TEKXP
++
++#include <linux/kernel.h>
++#include <linux/ioport.h>
++#include <asm/io.h>
++
++#define KEYBOARD_IRQ			4
++#define DISABLE_KBD_DURING_INTERRUPTS	0
++
++extern int pckbd_setkeycode(unsigned int scancode, unsigned int keycode);
++extern int pckbd_getkeycode(unsigned int scancode);
++extern int pckbd_translate(unsigned char scancode, unsigned char *keycode,
++			   char raw_mode);
++extern char pckbd_unexpected_up(unsigned char keycode);
++extern void pckbd_leds(unsigned char leds);
++extern void pckbd_init_hw(void);
++extern unsigned char pckbd_sysrq_xlate[128];
++
++#define kbd_setkeycode		pckbd_setkeycode
++#define kbd_getkeycode		pckbd_getkeycode
++#define kbd_translate		pckbd_translate
++#define kbd_unexpected_up	pckbd_unexpected_up
++#define kbd_leds		pckbd_leds
++#define kbd_init_hw		pckbd_init_hw
++#define kbd_sysrq_xlate		pckbd_sysrq_xlate
++
++#define SYSRQ_KEY 0x54
++
++/* resource allocation */
++#define kbd_request_region()
++#define kbd_request_irq(handler) request_irq(KEYBOARD_IRQ, handler, 0, \
++                                             "keyboard", NULL)
++
++/* How to access the keyboard macros on this platform.  */
++#define kbd_read_input() (*(volatile unsigned char*)0xff900000)
++#define kbd_read_status() (*(volatile unsigned char*)0xff900004)
++#define kbd_write_output(val) do { *(volatile unsigned char*)0xff900000 = (val); } while(0)
++#define kbd_write_command(val) do { *(volatile unsigned char*)0xff900004 = (val); } while(0)
++
++/* Some stoneage hardware needs delays after some operations.  */
++#define kbd_pause() do { } while(0)
++
++/*
++ * Machine specific bits for the PS/2 driver
++ */
++
++#define AUX_IRQ 4
++#define aux_request_irq(hand, dev_id) (0)
++#define aux_free_irq(dev_id)	do { } while (0)
++
++#else	/* !CONFIG_TEKXP */
++
+ #include <linux/config.h>
+ #include <linux/kd.h>
+ #include <asm/machdep.h>
+@@ -72,6 +124,8 @@
+ #define kbd_write_command(val) out_8(KBD_CNTL_REG, val)
+ extern unsigned int SYSRQ_KEY;
+ 
++#endif	/* !CONFIG_TEKXP */
++
+ #endif /* __KERNEL__ */
+ 
+ #endif /* __M68K_KEYBOARD_H */
+diff -Naur linux-2.4.26/include/asm-m68k/motorola_pgalloc.h linux-2.4.26-m68k/include/asm-m68k/motorola_pgalloc.h
+--- linux-2.4.26/include/asm-m68k/motorola_pgalloc.h	2004-02-19 00:36:32.000000000 +1100
++++ linux-2.4.26-m68k/include/asm-m68k/motorola_pgalloc.h	2004-04-06 03:59:32.000000000 +1000
+@@ -231,20 +231,24 @@
+ 
+ static inline void flush_tlb_mm(struct mm_struct *mm)
+ {
+-	if (mm == current->mm)
++	if (mm == current->active_mm)
+ 		__flush_tlb();
+ }
+ 
+ static inline void flush_tlb_page(struct vm_area_struct *vma, unsigned long addr)
+ {
+-	if (vma->vm_mm == current->mm)
++	if (vma->vm_mm == current->active_mm) {
++		mm_segment_t old_fs = get_fs();
++		set_fs(USER_DS);
+ 		__flush_tlb_one(addr);
++		set_fs(old_fs);
++	}
+ }
+ 
+ static inline void flush_tlb_range(struct mm_struct *mm,
+ 				   unsigned long start, unsigned long end)
+ {
+-	if (mm == current->mm)
++	if (mm == current->active_mm)
+ 		__flush_tlb();
+ }
+ 
+diff -Naur linux-2.4.26/include/asm-m68k/pgalloc.h linux-2.4.26-m68k/include/asm-m68k/pgalloc.h
+--- linux-2.4.26/include/asm-m68k/pgalloc.h	2004-02-19 00:36:32.000000000 +1100
++++ linux-2.4.26-m68k/include/asm-m68k/pgalloc.h	2003-12-01 06:18:08.000000000 +1100
+@@ -126,35 +126,12 @@
+ 
+ #define flush_dcache_page(page)			do { } while (0)
+ #define flush_icache_page(vma,pg)              do { } while (0)
+-#define flush_icache_user_range(vma,pg,adr,len)	do { } while (0)
+-
+-/* Push n pages at kernel virtual address and clear the icache */
+-/* RZ: use cpush %bc instead of cpush %dc, cinv %ic */
+-extern inline void flush_icache_range (unsigned long address,
+-				       unsigned long endaddr)
+-{
+-	if (CPU_IS_040_OR_060) {
+-		short n = (endaddr - address + PAGE_SIZE - 1) / PAGE_SIZE;
+-
+-		while (--n >= 0) {
+-			__asm__ __volatile__("nop\n\t"
+-					     ".chip 68040\n\t"
+-					     "cpushp %%bc,(%0)\n\t"
+-					     ".chip 68k"
+-					     : : "a" (virt_to_phys((void *)address)));
+-			address += PAGE_SIZE;
+-		}
+-	} else {
+-		unsigned long tmp;
+-		__asm__ __volatile__("movec %%cacr,%0\n\t"
+-				     "orw %1,%0\n\t"
+-				     "movec %0,%%cacr"
+-				     : "=&d" (tmp)
+-				     : "di" (FLUSH_I));
+-	}
+-}
+ 
++extern void flush_icache_user_page(struct vm_area_struct *vma, struct page *page,
++				   unsigned long addr, int len);
+ 
++extern void flush_icache_range(unsigned long address, unsigned long endaddr);
++extern void flush_icache_user_range(void *address, unsigned long size);
+ 
+ 
+ #ifdef CONFIG_SUN3
+diff -Naur linux-2.4.26/include/asm-m68k/setup.h linux-2.4.26-m68k/include/asm-m68k/setup.h
+--- linux-2.4.26/include/asm-m68k/setup.h	2000-01-27 07:44:21.000000000 +1100
++++ linux-2.4.26-m68k/include/asm-m68k/setup.h	2003-07-22 07:34:11.000000000 +1000
+@@ -41,6 +41,7 @@
+ #define MACH_HP300    9
+ #define MACH_Q40     10
+ #define MACH_SUN3X   11
++#define MACH_TEKXP   12
+ 
+ #ifdef __KERNEL__
+ 
+@@ -53,7 +54,8 @@
+ #elif defined(CONFIG_ATARI) || defined(CONFIG_MAC) || defined(CONFIG_APOLLO) \
+ 	|| defined(CONFIG_MVME16x) || defined(CONFIG_BVME6000)               \
+ 	|| defined(CONFIG_HP300) || defined(CONFIG_Q40)                      \
+-	|| defined(CONFIG_SUN3X) || defined(CONFIG_MVME147)
++	|| defined(CONFIG_SUN3X) || defined(CONFIG_MVME147)                  \
++        || defined(CONFIG_TEKXP)
+ #  define MACH_IS_AMIGA (m68k_machtype == MACH_AMIGA)
+ #else
+ #  define MACH_AMIGA_ONLY
+@@ -66,7 +68,8 @@
+ #elif defined(CONFIG_AMIGA) || defined(CONFIG_MAC) || defined(CONFIG_APOLLO) \
+ 	|| defined(CONFIG_MVME16x) || defined(CONFIG_BVME6000)               \
+ 	|| defined(CONFIG_HP300) || defined(CONFIG_Q40)                      \
+-	|| defined(CONFIG_SUN3X) || defined(CONFIG_MVME147)
++	|| defined(CONFIG_SUN3X) || defined(CONFIG_MVME147)                  \
++        || defined(CONFIG_TEKXP)
+ #  define MACH_IS_ATARI (m68k_machtype == MACH_ATARI)
+ #else
+ #  define MACH_ATARI_ONLY
+@@ -79,7 +82,8 @@
+ #elif defined(CONFIG_AMIGA) || defined(CONFIG_ATARI) || defined(CONFIG_APOLLO) \
+ 	|| defined(CONFIG_MVME16x) || defined(CONFIG_BVME6000)                 \
+ 	|| defined(CONFIG_HP300) || defined(CONFIG_Q40)                        \
+-	|| defined(CONFIG_SUN3X) || defined(CONFIG_MVME147)
++	|| defined(CONFIG_SUN3X) || defined(CONFIG_MVME147)                    \
++        || defined(CONFIG_TEKXP)
+ #  define MACH_IS_MAC (m68k_machtype == MACH_MAC)
+ #else
+ #  define MACH_MAC_ONLY
+@@ -100,7 +104,8 @@
+ #elif defined(CONFIG_AMIGA) || defined(CONFIG_MAC) || defined(CONFIG_ATARI) \
+ 	|| defined(CONFIG_MVME16x) || defined(CONFIG_BVME6000)              \
+ 	|| defined(CONFIG_HP300) || defined(CONFIG_Q40)                     \
+-	|| defined(CONFIG_SUN3X) || defined(CONFIG_MVME147)
++	|| defined(CONFIG_SUN3X) || defined(CONFIG_MVME147)                 \
++        || defined(CONFIG_TEKXP)
+ #  define MACH_IS_APOLLO (m68k_machtype == MACH_APOLLO)
+ #else
+ #  define MACH_APOLLO_ONLY
+@@ -113,7 +118,8 @@
+ #elif defined(CONFIG_AMIGA) || defined(CONFIG_MAC) || defined(CONFIG_ATARI) \
+ 	|| defined(CONFIG_APOLLO) || defined(CONFIG_BVME6000)               \
+ 	|| defined(CONFIG_HP300) || defined(CONFIG_Q40)                     \
+-	|| defined(CONFIG_SUN3X) || defined(CONFIG_MVME16x)
++	|| defined(CONFIG_SUN3X) || defined(CONFIG_MVME16x)                 \
++        || defined(CONFIG_TEKXP)
+ #  define MACH_IS_MVME147 (m68k_machtype == MACH_MVME147)
+ #else
+ #  define MACH_MVME147_ONLY
+@@ -126,7 +132,8 @@
+ #elif defined(CONFIG_AMIGA) || defined(CONFIG_MAC) || defined(CONFIG_ATARI) \
+ 	|| defined(CONFIG_APOLLO) || defined(CONFIG_BVME6000)               \
+ 	|| defined(CONFIG_HP300) || defined(CONFIG_Q40)                     \
+-	|| defined(CONFIG_SUN3X) || defined(CONFIG_MVME147)
++	|| defined(CONFIG_SUN3X) || defined(CONFIG_MVME147)                 \
++        || defined(CONFIG_TEKXP)
+ #  define MACH_IS_MVME16x (m68k_machtype == MACH_MVME16x)
+ #else
+ #  define MACH_MVME16x_ONLY
+@@ -139,7 +146,8 @@
+ #elif defined(CONFIG_AMIGA) || defined(CONFIG_MAC) || defined(CONFIG_ATARI) \
+ 	|| defined(CONFIG_APOLLO) || defined(CONFIG_MVME16x)                \
+ 	|| defined(CONFIG_HP300) || defined(CONFIG_Q40)                     \
+-	|| defined(CONFIG_SUN3X) || defined(CONFIG_MVME147)
++	|| defined(CONFIG_SUN3X) || defined(CONFIG_MVME147)                 \
++        || defined(CONFIG_TEKXP)
+ #  define MACH_IS_BVME6000 (m68k_machtype == MACH_BVME6000)
+ #else
+ #  define MACH_BVME6000_ONLY
+@@ -152,7 +160,8 @@
+ #elif defined(CONFIG_AMIGA) || defined(CONFIG_MAC) || defined(CONFIG_ATARI) \
+ 	|| defined(CONFIG_APOLLO) || defined(CONFIG_MVME16x) \
+ 	|| defined(CONFIG_BVME6000) || defined(CONFIG_Q40) \
+-	|| defined(CONFIG_SUN3X) || defined(CONFIG_MVME147)
++	|| defined(CONFIG_SUN3X) || defined(CONFIG_MVME147) \
++        || defined(CONFIG_TEKXP)
+ #  define MACH_IS_HP300 (m68k_machtype == MACH_HP300)
+ #else
+ #  define MACH_HP300_ONLY
+@@ -165,7 +174,8 @@
+ #elif defined(CONFIG_AMIGA) || defined(CONFIG_MAC) || defined(CONFIG_ATARI) \
+ 	|| defined(CONFIG_APOLLO) || defined(CONFIG_MVME16x)                \
+ 	|| defined(CONFIG_BVME6000) || defined(CONFIG_HP300)                \
+-	|| defined(CONFIG_SUN3X) || defined(CONFIG_MVME147)
++	|| defined(CONFIG_SUN3X) || defined(CONFIG_MVME147)                 \
++        || defined(CONFIG_TEKXP)
+ #  define MACH_IS_Q40 (m68k_machtype == MACH_Q40)
+ #else
+ #  define MACH_Q40_ONLY
+@@ -178,7 +188,8 @@
+ #elif defined(CONFIG_AMIGA) || defined(CONFIG_MAC) || defined(CONFIG_ATARI) \
+ 	|| defined(CONFIG_APOLLO) || defined(CONFIG_MVME16x)                \
+ 	|| defined(CONFIG_BVME6000) || defined(CONFIG_HP300)                \
+-	|| defined(CONFIG_Q40) || defined(CONFIG_MVME147)
++	|| defined(CONFIG_Q40) || defined(CONFIG_MVME147)                   \
++        || defined(CONFIG_TEKXP)
+ #  define MACH_IS_SUN3X (m68k_machtype == MACH_SUN3X)
+ #else
+ #  define CONFIG_SUN3X_ONLY
+@@ -186,6 +197,20 @@
+ #  define MACH_TYPE (MACH_SUN3X)
+ #endif
+ 
++#if !defined (CONFIG_TEKXP)
++#  define MACH_IS_TEKXP (0)
++#elif defined(CONFIG_AMIGA) || defined(CONFIG_MAC) || defined(CONFIG_ATARI) \
++	|| defined(CONFIG_APOLLO) || defined(CONFIG_MVME16x)                \
++	|| defined(CONFIG_BVME6000) || defined(CONFIG_HP300)                \
++	|| defined(CONFIG_Q40) || defined(CONFIG_MVME147)                   \
++        || defined(CONFIG_SUN3X)
++#  define MACH_IS_TEKXP (m68k_machtype == MACH_TEKXP)
++#else
++#  define CONFIG_TEKXP_ONLY
++#  define MACH_IS_TEKXP (1)
++#  define MACH_TYPE (MACH_TEKXP)
++#endif
++
+ #ifndef MACH_TYPE
+ #  define MACH_TYPE (m68k_machtype)
+ #endif
+@@ -355,7 +380,7 @@
+      *  Miscellaneous
+      */
+ 
+-#define NUM_MEMINFO	4
++#define NUM_MEMINFO	8
+ #define CL_SIZE		256
+ 
+ #ifndef __ASSEMBLY__
+diff -Naur linux-2.4.26/include/asm-m68k/tekirq.h linux-2.4.26-m68k/include/asm-m68k/tekirq.h
+--- linux-2.4.26/include/asm-m68k/tekirq.h	1970-01-01 10:00:00.000000000 +1000
++++ linux-2.4.26-m68k/include/asm-m68k/tekirq.h	2003-07-22 07:20:24.000000000 +1000
+@@ -0,0 +1,27 @@
++/*
++ *  linux/include/asm-m68k/tekirq.h
++ *
++ *  Copyright (C) 2002,2003 Michael Mueller <malware@t-online.de>
++ *
++ * This file is subject to the terms and conditions of the GNU General Public
++ * license. See the file COPYING in the main directory of this archive
++ * for more details.
++ */
++
++#ifndef _ASM_TEKIRQ_H_
++#define _ASM_TEKIRQ_H_
++
++#include <asm/irq.h>
++
++#define TEK_IRQ_VIDEO		(IRQ2)
++#define TEK_IRQ_KEYB		(IRQ4)
++#define TEK_IRQ_UART		(IRQ5)
++#define TEK_IRQ_NET		(IRQ6)
++
++#define TEK_IRQ_TIMER_A		(SYS_IRQS + 3)
++#define TEK_IRQ_TXRDY_A		(SYS_IRQS + 0)
++#define TEK_IRQ_RXRDY_A		(SYS_IRQS + 1)
++#define TEK_IRQ_TXRDY_B		(SYS_IRQS + 4)
++#define TEK_IRQ_RXRDY_B		(SYS_IRQS + 5)
++
++#endif	/* !defined(_ASM_TEKIRQ_H_) */
+diff -Naur linux-2.4.26/include/asm-m68k/teknvram.h linux-2.4.26-m68k/include/asm-m68k/teknvram.h
+--- linux-2.4.26/include/asm-m68k/teknvram.h	1970-01-01 10:00:00.000000000 +1000
++++ linux-2.4.26-m68k/include/asm-m68k/teknvram.h	2003-07-22 07:20:24.000000000 +1000
+@@ -0,0 +1,31 @@
++/*
++ *  linux/include/asm-m68k/teknvram.h
++ *
++ *  Copyright (C) 2002,2003 Michael Mueller <malware@t-online.de>
++ *
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License. See the file COPYING in the main directory of this archive for
++ * more details.
++ */
++
++#ifndef _ASM_TEKNVRAM_H_
++#define _ASM_TEKNVRAM_H_
++
++#define EEPROM_BASE	0xFFF00000UL
++#define EEPROM_SIZE	0x800
++
++extern void init_nvram(unsigned long* memstart);
++
++extern u_char	nvram_readb(int);
++extern u_short	nvram_readw(int);
++extern u_long	nvram_readl(int);
++
++
++/*
++ * Some known data locations within the NVRAM
++ */
++#define NVRAM_SONIC_MAC		4	/* 6 bytes MAC address for sonic */
++#define NVRAM_DISPLAY		0x1c	/* Display type */
++
++#endif	/* !defined(_ASM_TEKNVRAM_H_) */
++
+diff -Naur linux-2.4.26/include/asm-m68k/tekuart.h linux-2.4.26-m68k/include/asm-m68k/tekuart.h
+--- linux-2.4.26/include/asm-m68k/tekuart.h	1970-01-01 10:00:00.000000000 +1000
++++ linux-2.4.26-m68k/include/asm-m68k/tekuart.h	2003-07-22 07:20:24.000000000 +1000
+@@ -0,0 +1,118 @@
++/*
++ *  linux/include/asm-m68k/tekuart.h
++ *
++ *  Copyright (C) 2002,2003 Michael Mueller <malware@t-online.de>
++ *
++ * This file is subject to the terms and conditions of the GNU General Public
++ * License. See the file COPYING in the main directory of this archive for
++ * more details.
++ */
++
++#ifndef ASM_TEKUART
++#define ASM_TEKUART
++
++extern spinlock_t tek_uart_lock;
++
++#define TEK_UART_BASE	(0xFF800000UL)
++
++#define UART_IRQS 8
++
++void tek_uart_init_IRQ(void);
++int tek_uart_request_irq(unsigned int irq,
++                          void (*handler)(int, void *, struct pt_regs *),
++                          unsigned long flags,
++                          const char *devname, void *dev_id);
++void tek_uart_free_irq(unsigned int irq, void *dev_id);
++void tek_uart_enable_irq(unsigned int irq);
++void tek_uart_disable_irq(unsigned int irq);
++int tek_uart_get_irq_list(char *buf);
++
++void tek_uart_setup_timer(void (*handler)(int, void *, struct pt_regs *));
++void tek_uart_putchar(int channel, int c, int waitloop);
++
++void tek_uart_set_op(int nr);
++void tek_uart_clr_op(int nr);
++
++/*
++ * Structures describing the register set of the Motorola 68681 DUART.
++ */
++
++struct tek_uart_rd {
++	unsigned char	MRxA;
++	unsigned short	_pad1;
++	unsigned char	SRA;
++	unsigned short	_pad2;
++	unsigned char	BRG_Test;
++	unsigned short	_pad3;
++	unsigned char	RHRA;
++	unsigned short	_pad4;
++	unsigned char	IPCR;
++	unsigned short	_pad5;
++	unsigned char	ISR;
++	unsigned short	_pad6;
++	unsigned char	CTU;
++	unsigned short	_pad7;
++	unsigned char	CTL;
++	unsigned short	_pad8;
++	unsigned char	MRxB;
++	unsigned short	_pad9;
++	unsigned char	SRB;
++	unsigned short	_pad10;
++	unsigned char	x1x16_Test;
++	unsigned short	_pad11;
++	unsigned char	RHRB;
++	unsigned short	_pad12;
++	unsigned char	res1;
++	unsigned short	_pad13;
++	unsigned char	IP;
++	unsigned short	_pad14;
++	unsigned char	CounterStart;
++	unsigned short	_pad15;
++	unsigned char	CounterStop;
++	unsigned short	_pad16;
++};
++
++struct tek_uart_wr {
++	unsigned char	MRxA;
++	unsigned short	_pad1;
++	unsigned char	CSRA;
++	unsigned short	_pad2;
++	unsigned char	CRA;
++	unsigned short	_pad3;
++	unsigned char	THRA;
++	unsigned short	_pad4;
++	unsigned char	ACR;
++	unsigned short	_pad5;
++	unsigned char	IMR;
++	unsigned short	_pad6;
++	unsigned char	CRUR;
++	unsigned short	_pad7;
++	unsigned char	CTLR;
++	unsigned short	_pad8;
++	unsigned char	MRxB;
++	unsigned short	_pad9;
++	unsigned char	CSRB;
++	unsigned short	_pad10;
++	unsigned char	CRB;
++	unsigned short	_pad11;
++	unsigned char	THRB;
++	unsigned short	_pad12;
++	unsigned char	res1;
++	unsigned short	_pad13;
++	unsigned char	OPCR;
++	unsigned short	_pad14;
++	unsigned char	OutputSet;
++	unsigned short	_pad15;
++	unsigned char	OutputClear;
++	unsigned short	_pad16;
++};
++
++union tek_uart {
++	struct tek_uart_rd rd;
++	struct tek_uart_wr wr;
++};
++
++typedef union tek_uart tek_uart_t;
++
++#endif	/* defined(ASM_TEKUART) */
++
+diff -Naur linux-2.4.26/include/linux/adb.h linux-2.4.26-m68k/include/linux/adb.h
+--- linux-2.4.26/include/linux/adb.h	2003-08-25 21:44:44.000000000 +1000
++++ linux-2.4.26-m68k/include/linux/adb.h	2003-08-26 13:18:04.000000000 +1000
+@@ -76,6 +76,7 @@
+ #define ADBREQ_REPLY	1	/* expect reply */
+ #define ADBREQ_SYNC	2	/* poll until done */
+ #define ADBREQ_NOSEND	4	/* build the request, but don't send it */
++#define ADBREQ_RAW	8	/* send raw packet (don't prepend ADB_PACKET) */
+ 
+ /* Messages sent thru the client_list notifier. You should NOT stop
+    the operation, at least not with this version */
+diff -Naur linux-2.4.26/include/linux/affs_fs.h linux-2.4.26-m68k/include/linux/affs_fs.h
+--- linux-2.4.26/include/linux/affs_fs.h	2001-04-20 15:57:06.000000000 +1000
++++ linux-2.4.26-m68k/include/linux/affs_fs.h	2004-06-11 07:01:42.000000000 +1000
+@@ -33,7 +33,8 @@
+ extern u32	affs_count_free_blocks(struct super_block *s);
+ extern void	affs_free_block(struct super_block *sb, u32 block);
+ extern u32	affs_alloc_block(struct inode *inode, u32 goal);
+-extern int	affs_init_bitmap(struct super_block *sb);
++extern int	affs_init_bitmap(struct super_block *sb, int *flags);
++extern void	affs_free_bitmap(struct super_block *sb);
+ 
+ /* namei.c */
+ 
+diff -Naur linux-2.4.26/include/linux/affs_fs_sb.h linux-2.4.26-m68k/include/linux/affs_fs_sb.h
+--- linux-2.4.26/include/linux/affs_fs_sb.h	2001-04-20 15:57:06.000000000 +1000
++++ linux-2.4.26-m68k/include/linux/affs_fs_sb.h	2004-06-11 07:01:42.000000000 +1000
+@@ -47,7 +47,6 @@
+ #define SF_OFS		0x0200		/* Old filesystem */
+ #define SF_PREFIX	0x0400		/* Buffer for prefix is allocated */
+ #define SF_VERBOSE	0x0800		/* Talk about fs when mounting */
+-#define SF_READONLY	0x1000		/* Don't allow to remount rw */
+ 
+ /* short cut to get to the affs specific sb data */
+ #define AFFS_SB		(&sb->u.affs_sb)
+diff -Naur linux-2.4.26/include/linux/asfs_fs.h linux-2.4.26-m68k/include/linux/asfs_fs.h
+--- linux-2.4.26/include/linux/asfs_fs.h	1970-01-01 10:00:00.000000000 +1000
++++ linux-2.4.26-m68k/include/linux/asfs_fs.h	2003-07-01 05:16:14.000000000 +1000
+@@ -0,0 +1,151 @@
++#ifndef __LINUX_ASFS_FS_H
++#define __LINUX_ASFS_FS_H
++
++#include <linux/types.h>
++#include <asm/byteorder.h>
++
++#define asfs_debug(fmt,arg...) pr_debug(fmt,##arg)
++//#define asfs_debug(fmt,arg...) printk(fmt,##arg)
++
++/* some helper macros... */
++
++#define from32be(t) ((t)=be32_to_cpu(t))
++#define from16be(t) ((t)=be16_to_cpu(t))
++
++#define ASFS_MAKE_ID(a,b,c,d) (((a)&0xff)<<24|((b)&0xff)<<16|((c)&0xff)<<8|((d)&0xff))
++
++/* Amiga SFS defines */
++
++#define ASFS_MAGIC 0xa0ff
++#define ASFS_MAXFN 105
++
++#define ASFS_ROOTID ASFS_MAKE_ID('S','F','S',0)
++
++#define ASFS_DEFAULT_UID 0 
++#define ASFS_DEFAULT_GID 0
++#define ASFS_DEFAULT_MODE 0444 /* default permission bits for files, dirs have same permission, but with "x" set */ 
++
++#define ASFS_STRUCTURE_VERISON (3)
++
++#define OTYPE_HIDDEN      (1)
++#define OTYPE_LINK        (64)
++#define OTYPE_DIR         (128)
++
++#define MSB_MASK (1ul << 31)
++
++/* Each block has its own header with checksum and id, its called fsBlockHeader */
++
++struct fsBlockHeader {
++	u32 id;				/* 4 character id string of this block */
++	u32 checksum;			/* The checksum */
++	u32 ownblock;			/* The blocknumber of the block this block is stored at */
++};
++
++/* On-disk "super block", called fsRootBlock */
++
++struct fsRootBlock {
++	struct fsBlockHeader bheader;
++
++	u16 version;			/* Version number of the filesystem block structure */
++	u16 sequencenumber;		/* The Root with the highest sequencenumber is valid */
++
++	u32 datecreated;		/* Creation date (when first formatted).  Cannot be changed. */
++	u8 bits;			/* various settings, see defines below. */
++	u8 pad1;
++	u16 pad2;
++
++	u32 reserved1[2];
++
++	u64 firstbyte;			/* The first byte of our partition from the start of the disk. */
++
++	u64 lastbyte;			/* The last byte of our partition, excluding this one. */
++
++	u32 totalblocks;		/* size of this partition in blocks */
++	u32 blocksize;			/* blocksize used */
++
++	u32 reserved2[2];
++	u32 reserved3[8];
++
++	u32 bitmapbase;			/* location of the bitmap */
++	u32 adminspacecontainer;	/* location of first adminspace container */
++	u32 rootobjectcontainer;	/* location of the root objectcontainer */
++	u32 extentbnoderoot;		/* location of the root of the extentbnode B-tree */
++	u32 objectnoderoot;		/* location of the root of the objectnode tree */
++
++	u32 reserved4[3];
++};
++
++/* On disk inode, called fsObject */
++
++struct fsObject {
++	u16 owneruid;
++	u16 ownergid;
++	u32 objectnode;
++	u32 protection;
++
++	union {
++		struct {
++			u32 data;
++			u32 size;
++		} file;
++
++		struct {
++			u32 hashtable;	/* for directories & root, 0 means no hashblock */
++			u32 firstdirblock;
++		} dir;
++	} object;
++
++	u32 datemodified;
++	u8 bits;
++
++	u8 name[0];
++	u8 comment[0];
++};
++
++/* On disk block containging a number of fsObjects */
++
++struct fsObjectContainer {
++	struct fsBlockHeader bheader;
++
++	u32 parent;
++	u32 next;
++	u32 previous;			/* 0 for the first block in the directory chain */
++
++	struct fsObject object[0];
++};
++
++/* BTree structures, used to collect file data position on disk */
++
++struct fsExtentBNode {
++	u32 key;			/* data! */
++	u32 next;
++	u32 prev;
++	u16 blocks;			/* The size in blocks of the region this Extent controls */
++};
++
++struct BNode {
++	u32 key;
++	u32 data;
++};
++
++struct BTreeContainer {
++	u16 nodecount;
++	u8 isleaf;
++	u8 nodesize;			/* Must be a multiple of 2 */
++
++	struct BNode bnode[0];
++};
++
++/* On disk block with BTreeContainer */
++
++struct fsBNodeContainer {
++	struct fsBlockHeader bheader;
++	struct BTreeContainer btc;
++};
++
++#ifdef __KERNEL__
++
++/* Not much now */
++
++#endif /* __KERNEL__ */
++#endif
+diff -Naur linux-2.4.26/include/linux/asfs_fs_i.h linux-2.4.26-m68k/include/linux/asfs_fs_i.h
+--- linux-2.4.26/include/linux/asfs_fs_i.h	1970-01-01 10:00:00.000000000 +1000
++++ linux-2.4.26-m68k/include/linux/asfs_fs_i.h	2003-07-01 05:16:14.000000000 +1000
+@@ -0,0 +1,12 @@
++#ifndef __ASFS_FS_I
++#define __ASFS_FS_I
++
++/* inode in-kernel data */
++
++struct asfs_inode_info {
++	u32 firstdirblock;
++	u32 firstdatablock;
++	u32 hashtable;
++};
++
++#endif
+diff -Naur linux-2.4.26/include/linux/asfs_fs_sb.h linux-2.4.26-m68k/include/linux/asfs_fs_sb.h
+--- linux-2.4.26/include/linux/asfs_fs_sb.h	1970-01-01 10:00:00.000000000 +1000
++++ linux-2.4.26-m68k/include/linux/asfs_fs_sb.h	2003-07-01 05:16:14.000000000 +1000
+@@ -0,0 +1,15 @@
++#ifndef __ASFS_FS_SB
++#define __ASFS_FS_SB
++
++/* Amiga SFS superblock in-core data */
++
++struct asfs_sb_info {
++	u32 totalblocks;
++	u32 rootobjectcontainer;
++	u32 extentbnoderoot;
++	uid_t uid;
++	gid_t gid;
++	umode_t mode;
++};
++
++#endif
+diff -Naur linux-2.4.26/include/linux/bootmem.h linux-2.4.26-m68k/include/linux/bootmem.h
+--- linux-2.4.26/include/linux/bootmem.h	2002-11-29 10:53:15.000000000 +1100
++++ linux-2.4.26-m68k/include/linux/bootmem.h	2002-12-01 01:59:10.000000000 +1100
+@@ -38,11 +38,11 @@
+ #define alloc_bootmem(x) \
+ 	__alloc_bootmem((x), SMP_CACHE_BYTES, __pa(MAX_DMA_ADDRESS))
+ #define alloc_bootmem_low(x) \
+-	__alloc_bootmem((x), SMP_CACHE_BYTES, 0)
++	__alloc_bootmem((x), SMP_CACHE_BYTES, __pa(PAGE_OFFSET))
+ #define alloc_bootmem_pages(x) \
+ 	__alloc_bootmem((x), PAGE_SIZE, __pa(MAX_DMA_ADDRESS))
+ #define alloc_bootmem_low_pages(x) \
+-	__alloc_bootmem((x), PAGE_SIZE, 0)
++	__alloc_bootmem((x), PAGE_SIZE, __pa(PAGE_OFFSET))
+ extern unsigned long __init free_all_bootmem (void);
+ 
+ extern unsigned long __init init_bootmem_node (pg_data_t *pgdat, unsigned long freepfn, unsigned long startpfn, unsigned long endpfn);
+diff -Naur linux-2.4.26/include/linux/fs.h linux-2.4.26-m68k/include/linux/fs.h
+--- linux-2.4.26/include/linux/fs.h	2004-02-19 00:36:32.000000000 +1100
++++ linux-2.4.26-m68k/include/linux/fs.h	2004-02-19 09:19:03.000000000 +1100
+@@ -307,6 +307,7 @@
+ #include <linux/nfs_fs_i.h>
+ #include <linux/sysv_fs_i.h>
+ #include <linux/affs_fs_i.h>
++#include <linux/asfs_fs_i.h>
+ #include <linux/ufs_fs_i.h>
+ #include <linux/efs_fs_i.h>
+ #include <linux/coda_fs_i.h>
+@@ -502,6 +503,7 @@
+ 		struct nfs_inode_info		nfs_i;
+ 		struct sysv_inode_info		sysv_i;
+ 		struct affs_inode_info		affs_i;
++		struct asfs_inode_info		asfs_i;
+ 		struct ufs_inode_info		ufs_i;
+ 		struct efs_inode_info		efs_i;
+ 		struct romfs_inode_info		romfs_i;
+@@ -719,6 +721,7 @@
+ #include <linux/nfs_fs_sb.h>
+ #include <linux/sysv_fs_sb.h>
+ #include <linux/affs_fs_sb.h>
++#include <linux/asfs_fs_sb.h>
+ #include <linux/ufs_fs_sb.h>
+ #include <linux/efs_fs_sb.h>
+ #include <linux/romfs_fs_sb.h>
+@@ -777,6 +780,7 @@
+ 		struct nfs_sb_info	nfs_sb;
+ 		struct sysv_sb_info	sysv_sb;
+ 		struct affs_sb_info	affs_sb;
++		struct asfs_sb_info	asfs_sb;
+ 		struct ufs_sb_info	ufs_sb;
+ 		struct efs_sb_info	efs_sb;
+ 		struct shmem_sb_info	shmem_sb;
+diff -Naur linux-2.4.26/include/linux/module.h linux-2.4.26-m68k/include/linux/module.h
+--- linux-2.4.26/include/linux/module.h	2004-04-14 23:05:40.000000000 +1000
++++ linux-2.4.26-m68k/include/linux/module.h	2004-05-04 21:21:50.000000000 +1000
+@@ -284,7 +284,7 @@
+  */
+  
+ #define MODULE_LICENSE(license) 	\
+-static const char __module_license[] __attribute__((section(".modinfo"))) =   \
++static const char __module_license[] __attribute_used__ __attribute__((section(".modinfo"))) =   \
+ "license=" license
+ 
+ /* Define the module variable, and usage macros.  */
+@@ -296,10 +296,10 @@
+ #define MOD_IN_USE		__MOD_IN_USE(THIS_MODULE)
+ 
+ #include <linux/version.h>
+-static const char __module_kernel_version[] __attribute__((section(".modinfo"))) =
++static const char __module_kernel_version[] __attribute_used__ __attribute__((section(".modinfo"))) =
+ "kernel_version=" UTS_RELEASE;
+ #ifdef MODVERSIONS
+-static const char __module_using_checksums[] __attribute__((section(".modinfo"))) =
++static const char __module_using_checksums[] __attribute_used__ __attribute__((section(".modinfo"))) =
+ "using_checksums=1";
+ #endif
+ 
+diff -Naur linux-2.4.26/include/linux/pc_keyb.h linux-2.4.26-m68k/include/linux/pc_keyb.h
+--- linux-2.4.26/include/linux/pc_keyb.h	1999-10-12 03:15:40.000000000 +1000
++++ linux-2.4.26-m68k/include/linux/pc_keyb.h	2003-07-22 07:33:33.000000000 +1000
+@@ -14,7 +14,11 @@
+ #define KBD_REPORT_UNKN			/* Report unknown scan codes */
+ #define KBD_REPORT_TIMEOUTS		/* Report keyboard timeouts */
+ #undef KBD_IS_FOCUS_9000		/* We have the brain-damaged FOCUS-9000 keyboard */
++#ifndef CONFIG_TEKXP
+ #undef INITIALIZE_MOUSE			/* Define if your PS/2 mouse needs initialization. */
++#else
++#define INITIALIZE_MOUSE 1
++#endif
+ 
+ 
+ 
+diff -Naur linux-2.4.26/kernel/ptrace.c linux-2.4.26-m68k/kernel/ptrace.c
+--- linux-2.4.26/kernel/ptrace.c	2003-08-25 21:44:44.000000000 +1000
++++ linux-2.4.26-m68k/kernel/ptrace.c	2003-08-26 13:18:26.000000000 +1000
+@@ -165,7 +165,7 @@
+ 		if (write) {
+ 			memcpy(maddr + offset, buf, bytes);
+ 			flush_page_to_ram(page);
+-			flush_icache_user_range(vma, page, addr, len);
++			flush_icache_user_page(vma, page, addr, len);
+ 			set_page_dirty(page);
+ 		} else {
+ 			memcpy(buf, maddr + offset, bytes);
+diff -Naur linux-2.4.26/mm/bootmem.c linux-2.4.26-m68k/mm/bootmem.c
+--- linux-2.4.26/mm/bootmem.c	2002-11-29 10:53:15.000000000 +1100
++++ linux-2.4.26-m68k/mm/bootmem.c	2002-12-01 01:59:34.000000000 +1100
+@@ -244,7 +244,7 @@
+ 
+ static unsigned long __init free_all_bootmem_core(pg_data_t *pgdat)
+ {
+-	struct page *page = pgdat->node_mem_map;
++	struct page *page;
+ 	bootmem_data_t *bdata = pgdat->bdata;
+ 	unsigned long i, count, total = 0;
+ 	unsigned long idx;
+@@ -253,8 +253,10 @@
+ 
+ 	count = 0;
+ 	idx = bdata->node_low_pfn - (bdata->node_boot_start >> PAGE_SHIFT);
+-	for (i = 0; i < idx; i++, page++) {
++	for (i = 0; i < idx; i++) {
+ 		if (!test_bit(i, bdata->node_bootmem_map)) {
++			page = virt_to_page(phys_to_virt((i << PAGE_SHIFT) +
++							 bdata->node_boot_start));
+ 			count++;
+ 			ClearPageReserved(page);
+ 			set_page_count(page, 1);
+diff -Naur linux-2.4.26/mm/page_alloc.c linux-2.4.26-m68k/mm/page_alloc.c
+--- linux-2.4.26/mm/page_alloc.c	2004-02-19 00:36:32.000000000 +1100
++++ linux-2.4.26-m68k/mm/page_alloc.c	2004-02-19 09:19:12.000000000 +1100
+@@ -720,7 +720,7 @@
+  *   - clear the memory bitmaps
+  */
+ void __init free_area_init_core(int nid, pg_data_t *pgdat, struct page **gmap,
+-	unsigned long *zones_size, unsigned long zone_start_paddr, 
++	unsigned long *zones_size, unsigned long zone_start_vaddr, 
+ 	unsigned long *zholes_size, struct page *lmem_map)
+ {
+ 	unsigned long i, j;
+@@ -728,7 +728,7 @@
+ 	unsigned long totalpages, offset, realtotalpages;
+ 	const unsigned long zone_required_alignment = 1UL << (MAX_ORDER-1);
+ 
+-	if (zone_start_paddr & ~PAGE_MASK)
++	if (zone_start_vaddr & ~PAGE_MASK)
+ 		BUG();
+ 
+ 	totalpages = 0;
+@@ -758,7 +758,7 @@
+ 	}
+ 	*gmap = pgdat->node_mem_map = lmem_map;
+ 	pgdat->node_size = totalpages;
+-	pgdat->node_start_paddr = zone_start_paddr;
++	pgdat->node_start_paddr = __pa(zone_start_vaddr);
+ 	pgdat->node_start_mapnr = (lmem_map - mem_map);
+ 	pgdat->nr_zones = 0;
+ 
+@@ -835,9 +835,9 @@
+ 
+ 		zone->zone_mem_map = mem_map + offset;
+ 		zone->zone_start_mapnr = offset;
+-		zone->zone_start_paddr = zone_start_paddr;
++		zone->zone_start_paddr = __pa(zone_start_vaddr);
+ 
+-		if ((zone_start_paddr >> PAGE_SHIFT) & (zone_required_alignment-1))
++		if ((zone_start_vaddr >> PAGE_SHIFT) & (zone_required_alignment-1))
+ 			printk("BUG: wrong zone alignment, it will crash\n");
+ 
+ 		/*
+@@ -852,8 +852,9 @@
+ 			SetPageReserved(page);
+ 			INIT_LIST_HEAD(&page->list);
+ 			if (j != ZONE_HIGHMEM)
+-				set_page_address(page, __va(zone_start_paddr));
+-			zone_start_paddr += PAGE_SIZE;
++				set_page_address(page,
++						 (void *)zone_start_vaddr);
++			zone_start_vaddr += PAGE_SIZE;
+ 		}
+ 
+ 		offset += size;
+@@ -900,7 +901,7 @@
+ 
+ void __init free_area_init(unsigned long *zones_size)
+ {
+-	free_area_init_core(0, &contig_page_data, &mem_map, zones_size, 0, 0, 0);
++	free_area_init_core(0, &contig_page_data, &mem_map, zones_size, PAGE_OFFSET, 0, 0);
+ }
+ 
+ static int __init setup_mem_frac(char *str)
Index: patches/linux-2.6-lfh-Makefile.patch
===================================================================
--- patches/linux-2.6-lfh-Makefile.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/linux-2.6-lfh-Makefile.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,15 @@
+--- linux-2.6.4-rc2/Makefile	Thu Mar  4 17:16:50 2004
++++ linux-2.6.4-rc2-patched/Makefile	Sun Mar 14 16:25:32 2004
+@@ -708,11 +708,11 @@
+ ifeq "$(strip $(INSTALL_MOD_PATH))" ""
+ depmod_opts	:=
+ else
+-depmod_opts	:= -b $(INSTALL_MOD_PATH) -r
++depmod_opts	:= -b $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE)
+ endif
+ .PHONY: _modinst_post
+ _modinst_post: _modinst_
+-	if [ -r System.map ]; then $(DEPMOD) -ae -F System.map $(depmod_opts) $(KERNELRELEASE); fi
++	if [ -r System.map ]; then depmod.pl -F System.map $(depmod_opts) -k vmlinux; fi
+ 
+ else # CONFIG_MODULES
Index: patches/linux-2.6-seg-5.patch
===================================================================
--- patches/linux-2.6-seg-5.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/linux-2.6-seg-5.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,102 @@
+--- linux/arch/i386/kernel/process.c.seg	2005-03-27 13:07:14.000000000 -0800
++++ linux/arch/i386/kernel/process.c	2005-03-28 10:28:47.000000000 -0800
+@@ -597,8 +597,8 @@ struct task_struct fastcall * __switch_t
+ 	 * Save away %fs and %gs. No need to save %es and %ds, as
+ 	 * those are always kernel segments while inside the kernel.
+ 	 */
+-	asm volatile("movl %%fs,%0":"=m" (*(int *)&prev->fs));
+-	asm volatile("movl %%gs,%0":"=m" (*(int *)&prev->gs));
++	asm volatile("mov %%fs,%0":"=m" (prev->fs));
++	asm volatile("mov %%gs,%0":"=m" (prev->gs));
+ 
+ 	/*
+ 	 * Restore %fs and %gs if needed.
+--- linux/arch/i386/kernel/vm86.c.seg	2005-03-27 13:07:14.000000000 -0800
++++ linux/arch/i386/kernel/vm86.c	2005-03-28 10:28:47.000000000 -0800
+@@ -294,8 +294,8 @@ static void do_sys_vm86(struct kernel_vm
+  */
+ 	info->regs32->eax = 0;
+ 	tsk->thread.saved_esp0 = tsk->thread.esp0;
+-	asm volatile("movl %%fs,%0":"=m" (tsk->thread.saved_fs));
+-	asm volatile("movl %%gs,%0":"=m" (tsk->thread.saved_gs));
++	asm volatile("mov %%fs,%0":"=m" (tsk->thread.saved_fs));
++	asm volatile("mov %%gs,%0":"=m" (tsk->thread.saved_gs));
+ 
+ 	tss = &per_cpu(init_tss, get_cpu());
+ 	tsk->thread.esp0 = (unsigned long) &info->VM86_TSS_ESP0;
+--- linux/arch/x86_64/kernel/process.c.seg	2005-03-27 13:07:49.000000000 -0800
++++ linux/arch/x86_64/kernel/process.c	2005-03-28 11:11:04.206766410 -0800
+@@ -391,10 +391,10 @@ int copy_thread(int nr, unsigned long cl
+ 	p->thread.fs = me->thread.fs;
+ 	p->thread.gs = me->thread.gs;
+ 
+-	asm("movl %%gs,%0" : "=m" (p->thread.gsindex));
+-	asm("movl %%fs,%0" : "=m" (p->thread.fsindex));
+-	asm("movl %%es,%0" : "=m" (p->thread.es));
+-	asm("movl %%ds,%0" : "=m" (p->thread.ds));
++	asm("mov %%gs,%0" : "=m" (p->thread.gsindex));
++	asm("mov %%fs,%0" : "=m" (p->thread.fsindex));
++	asm("mov %%es,%0" : "=m" (p->thread.es));
++	asm("mov %%ds,%0" : "=m" (p->thread.ds));
+ 
+ 	if (unlikely(me->thread.io_bitmap_ptr != NULL)) { 
+ 		p->thread.io_bitmap_ptr = kmalloc(IO_BITMAP_BYTES, GFP_KERNEL);
+@@ -457,11 +457,11 @@ struct task_struct *__switch_to(struct t
+ 	 * Switch DS and ES.
+ 	 * This won't pick up thread selector changes, but I guess that is ok.
+ 	 */
+-	asm volatile("movl %%es,%0" : "=m" (prev->es)); 
++	asm volatile("mov %%es,%0" : "=m" (prev->es)); 
+ 	if (unlikely(next->es | prev->es))
+ 		loadsegment(es, next->es); 
+ 	
+-	asm volatile ("movl %%ds,%0" : "=m" (prev->ds)); 
++	asm volatile ("mov %%ds,%0" : "=m" (prev->ds)); 
+ 	if (unlikely(next->ds | prev->ds))
+ 		loadsegment(ds, next->ds);
+ 
+@@ -472,7 +472,7 @@ struct task_struct *__switch_to(struct t
+ 	 */
+ 	{ 
+ 		unsigned fsindex;
+-		asm volatile("movl %%fs,%0" : "=g" (fsindex)); 
++		asm volatile("movl %%fs,%0" : "=r" (fsindex)); 
+ 		/* segment register != 0 always requires a reload. 
+ 		   also reload when it has changed. 
+ 		   when prev process used 64bit base always reload
+@@ -493,7 +493,7 @@ struct task_struct *__switch_to(struct t
+ 	}
+ 	{ 
+ 		unsigned gsindex;
+-		asm volatile("movl %%gs,%0" : "=g" (gsindex)); 
++		asm volatile("movl %%gs,%0" : "=r" (gsindex)); 
+ 		if (unlikely(gsindex | next->gsindex | prev->gs)) {
+ 			load_gs_index(next->gsindex);
+ 			if (gsindex)
+--- linux/include/asm-i386/system.h.seg	2005-03-27 13:09:12.000000000 -0800
++++ linux/include/asm-i386/system.h	2005-03-28 10:28:47.000000000 -0800
+@@ -81,7 +81,7 @@ static inline unsigned long _get_base(ch
+ #define loadsegment(seg,value)			\
+ 	asm volatile("\n"			\
+ 		"1:\t"				\
+-		"movl %0,%%" #seg "\n"		\
++		"mov %0,%%" #seg "\n"		\
+ 		"2:\n"				\
+ 		".section .fixup,\"ax\"\n"	\
+ 		"3:\t"				\
+@@ -93,13 +93,13 @@ static inline unsigned long _get_base(ch
+ 		".align 4\n\t"			\
+ 		".long 1b,3b\n"			\
+ 		".previous"			\
+-		: :"m" (*(unsigned int *)&(value)))
++		: :"m" (value))
+ 
+ /*
+  * Save a segment register away
+  */
+ #define savesegment(seg, value) \
+-	asm volatile("movl %%" #seg ",%0":"=m" (*(int *)&(value)))
++	asm volatile("mov %%" #seg ",%0":"=m" (value))
+ 
+ /*
+  * Clear and set 'TS' bit respectively
Index: patches/linux-2.6.10-cx88-update.patch
===================================================================
--- patches/linux-2.6.10-cx88-update.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/linux-2.6.10-cx88-update.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1398 @@
+Subject: [patch] cx88 update
+
+FIXME: description
+
+Signed-off-by: Gerd Knorr <kraxel@bytesex.org>
+Index: linux-2004-12-16/drivers/media/video/cx88/cx88-cards.c
+===================================================================
+--- linux-2004-12-16.orig/drivers/media/video/cx88/cx88-cards.c	2004-12-17 12:09:01.000000000 +0100
++++ linux-2004-12-16/drivers/media/video/cx88/cx88-cards.c	2004-12-17 12:47:15.117293538 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * $Id: cx88-cards.c,v 1.47 2004/11/03 09:04:50 kraxel Exp $
++ * $Id: cx88-cards.c,v 1.53 2004/12/14 15:33:30 kraxel Exp $
+  *
+  * device driver for Conexant 2388x based TV cards
+  * card-specific stuff.
+@@ -32,7 +32,8 @@
+ 
+ #include "cx88.h"
+ #ifdef WITH_DVB
+-#include "cx22702.h"
++# include "dvb-pll.h"
++# include "cx22702.h"
+ #endif
+ 
+ /* ------------------------------------------------------------------ */
+@@ -91,7 +92,7 @@ struct cx88_board cx88_boards[] = {
+ 	},
+ 	[CX88_BOARD_PIXELVIEW] = {
+ 		.name           = "PixelView",
+-		.tuner_type     = UNSET,
++		.tuner_type     = 5,
+ 		.input          = {{
+ 			.type   = CX88_VMUX_TELEVISION,
+ 			.vmux   = 0,
+@@ -223,20 +224,26 @@ struct cx88_board cx88_boards[] = {
+                 },
+         },
+         [CX88_BOARD_LEADTEK_PVR2000] = {
++		// gpio values for PAL version from regspy by DScaler
+                 .name           = "Leadtek PVR 2000",
+                 .tuner_type     = 38,
++		.tda9887_conf   = TDA9887_PRESENT,
+                 .input          = {{
+                         .type   = CX88_VMUX_TELEVISION,
+                         .vmux   = 0,
++                        .gpio0  = 0x0000bde6,
+                 },{
+                         .type   = CX88_VMUX_COMPOSITE1,
+                         .vmux   = 1,
++                        .gpio0  = 0x0000bde6,
+                 },{
+                         .type   = CX88_VMUX_SVIDEO,
+                         .vmux   = 2,
++                        .gpio0  = 0x0000bde6,
+                 }},
+                 .radio = {
+                         .type   = CX88_RADIO,
++                        .gpio0  = 0x0000bd62,
+                 },
+ 		.blackbird = 1,
+         },
+@@ -452,6 +459,22 @@ struct cx88_board cx88_boards[] = {
+ 		}},
+ 		.dvb            = 1,
+ 	},
++	[CX88_BOARD_DNTV_LIVE_DVB_T] = {
++		.name	        = "digitalnow DNTV Live! DVB-T",
++		.tuner_type     = TUNER_ABSENT,
++		.input	        = {{
++			.type   = CX88_VMUX_COMPOSITE1,
++			.vmux   = 1,
++			.gpio0  = 0x00000700,
++			.gpio2  = 0x00000101,
++		},{
++			.type   = CX88_VMUX_SVIDEO,
++			.vmux   = 2,
++			.gpio0  = 0x00000700,
++			.gpio2  = 0x00000101,
++		}},
++		.dvb            = 1,
++	},
+ };
+ const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards);
+ 
+@@ -543,6 +566,18 @@ struct cx88_subid cx88_subids[] = {
+ 		.subvendor = 0x18AC,
+ 		.subdevice = 0xDB10,
+ 		.card      = CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS,
++	},{
++                .subvendor = 0x1554,
++                .subdevice = 0x4811,
++                .card      = CX88_BOARD_PIXELVIEW,
++	},{
++		.subvendor = 0x7063,
++		.subdevice = 0x3000, /* HD-3000 card */
++		.card      = CX88_BOARD_PCHDTV_HD3000,
++	},{
++		.subvendor = 0x17DE,
++		.subdevice = 0xA8A6,
++		.card      = CX88_BOARD_DNTV_LIVE_DVB_T,
+ 	}
+ };
+ const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids);
+@@ -632,11 +667,13 @@ static struct {
+ 	{ TUNER_LG_PAL_FM,     "LG TPI8PSB01D"},
+ 	{ TUNER_LG_PAL,        "LG TPI8PSB11D"},
+ 	{ TUNER_LG_PAL_I_FM,   "LG TAPC-I001D"},
+-	{ TUNER_LG_PAL_I,      "LG TAPC-I701D"}
++	{ TUNER_LG_PAL_I,      "LG TAPC-I701D"},
++	{ TUNER_THOMSON_DTT7610,  "DTT-7610"}
+ };
+ 
+ static void hauppauge_eeprom(struct cx88_core *core, u8 *eeprom_data)
+ {
++#if 0
+ 	unsigned int blk2,tuner,radio,model;
+ 
+ 	if (eeprom_data[0] != 0x84 || eeprom_data[2] != 0) {
+@@ -663,6 +700,13 @@ static void hauppauge_eeprom(struct cx88
+ 	       core->name, model, (tuner < ARRAY_SIZE(hauppauge_tuner)
+ 				   ? hauppauge_tuner[tuner].name : "?"),
+ 	       core->tuner_type, radio ? "yes" : "no");
++#else
++	struct tveeprom tv;
++
++	tveeprom_hauppauge_analog(&tv, eeprom_data);
++	core->tuner_type = tv.tuner_type;
++	core->has_radio  = tv.has_radio;
++#endif
+ }
+ 
+ #ifdef WITH_DVB
+@@ -670,7 +714,6 @@ static int hauppauge_eeprom_dvb(struct c
+ {
+ 	int model;
+ 	int tuner;
+-	char *tname;
+ 
+ 	/* Make sure we support the board model */
+ 	model = ee[0x1f] << 24 | ee[0x1e] << 16 | ee[0x1d] << 8 | ee[0x1c];
+@@ -689,23 +732,20 @@ static int hauppauge_eeprom_dvb(struct c
+ 	/* Make sure we support the tuner */
+ 	tuner = ee[0x2d];
+ 	switch(tuner) {
+-	case 0x4B:
+-		tname = "Thomson DTT 7595";
+-		core->pll_type = PLLTYPE_DTT7595;
+-		break;
+-	case 0x4C:
+-		tname = "Thomson DTT 7592";
+-		core->pll_type = PLLTYPE_DTT7592;
++	case 0x4B: /* ddt 7595 */
++	case 0x4C: /* dtt 7592 */
++		core->pll_desc = &dvb_pll_thomson_dtt759x;
+ 		break;
+ 	default:
+ 		printk("%s: error: unknown hauppauge tuner 0x%02x\n",
+ 		       core->name, tuner);
+ 		return -ENODEV;
+ 	}
+-	printk(KERN_INFO "%s: hauppauge eeprom: model=%d, tuner=%s (%d)\n",
+-	       core->name, model, tname, tuner);
++	printk(KERN_INFO "%s: hauppauge eeprom: model=%d, tuner=%d (%s)\n",
++	       core->name, model, tuner, 
++	       core->pll_desc ? core->pll_desc->name : "UNKNOWN");
+ 
+-	core->pll_addr = 0x61;
++	core->pll_addr   = 0x61;
+ 	core->demod_addr = 0x43;
+ }
+ #endif
+@@ -763,36 +803,6 @@ static void gdi_eeprom(struct cx88_core 
+ 
+ /* ----------------------------------------------------------------------- */
+ 
+-static int
+-i2c_eeprom(struct i2c_client *c, unsigned char *eedata, int len)
+-{
+-	unsigned char buf;
+-	int err;
+-
+-	c->addr = 0xa0 >> 1;
+-	buf = 0;
+-	if (1 != (err = i2c_master_send(c,&buf,1))) {
+-		printk(KERN_INFO "cx88: Huh, no eeprom present (err=%d)?\n",
+-		       err);
+-		return -1;
+-	}
+-	if (len != (err = i2c_master_recv(c,eedata,len))) {
+-		printk(KERN_WARNING "cx88: i2c eeprom read error (err=%d)\n",
+-		       err);
+-		return -1;
+-	}
+-#if 0
+-	for (i = 0; i < len; i++) {
+-		if (0 == (i % 16))
+-			printk(KERN_INFO "cx88 ee: %02x:",i);
+-		printk(" %02x",eedata[i]);
+-		if (15 == (i % 16))
+-			printk("\n");
+-	}
+-#endif
+-	return 0;
+-}
+-
+ void cx88_card_list(struct cx88_core *core, struct pci_dev *pci)
+ {
+ 	int i;
+@@ -823,21 +833,33 @@ void cx88_card_setup(struct cx88_core *c
+ {
+ 	static u8 eeprom[128];
+ 
++	if (0 == core->i2c_rc) {
++		core->i2c_client.addr = 0xa0 >> 1;
++		tveeprom_read(&core->i2c_client,eeprom,sizeof(eeprom));
++	}
++
+ 	switch (core->board) {
+ 	case CX88_BOARD_HAUPPAUGE:
+ 		if (0 == core->i2c_rc)
+-			i2c_eeprom(&core->i2c_client,eeprom,sizeof(eeprom));
+-		hauppauge_eeprom(core,eeprom+8);
++			hauppauge_eeprom(core,eeprom+8);
+ 		break;
+ 	case CX88_BOARD_GDI:
+ 		if (0 == core->i2c_rc)
+-			i2c_eeprom(&core->i2c_client,eeprom,sizeof(eeprom));
+-		gdi_eeprom(core,eeprom);
++			gdi_eeprom(core,eeprom);
+ 		break;
+ 	case CX88_BOARD_WINFAST2000XP:
+ 		if (0 == core->i2c_rc)
+-			i2c_eeprom(&core->i2c_client,eeprom,sizeof(eeprom));
+-		leadtek_eeprom(core,eeprom);
++			leadtek_eeprom(core,eeprom);
++		break;
++#ifdef WITH_DVB
++	case CX88_BOARD_HAUPPAUGE_DVB_T1:
++		if (0 == core->i2c_rc)
++			hauppauge_eeprom_dvb(core,eeprom);
++		break;
++	case CX88_BOARD_CONEXANT_DVB_T1:
++		core->pll_desc   = &dvb_pll_thomson_dtt7579;
++		core->pll_addr   = 0x60;
++		core->demod_addr = 0x43;
+ 		break;
+ 	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:
+ 		/* Tuner reset is hooked to  the tuner out of reset */
+@@ -845,17 +867,22 @@ void cx88_card_setup(struct cx88_core *c
+ 		cx_clear(MO_GP0_IO, 0x00000001);
+ 		msleep(1);
+ 		cx_set(MO_GP0_IO, 0x00000101);
++		core->pll_addr = 0x61;
++		core->pll_desc = &dvb_pll_lg_z201;
+ 		break;
+-#ifdef WITH_DVB
+-	case CX88_BOARD_HAUPPAUGE_DVB_T1:
+-		if (0 == core->i2c_rc)
+-			i2c_eeprom(&core->i2c_client,eeprom,sizeof(eeprom));
+-		hauppauge_eeprom_dvb(core,eeprom);
++	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS:
++		core->pll_addr = 0x60;
++		core->pll_desc = &dvb_pll_thomson_dtt7579;
+ 		break;
+-	case CX88_BOARD_CONEXANT_DVB_T1:
+-		core->pll_type   = PLLTYPE_DTT7579;
+-		core->pll_addr   = 0x60;
+-		core->demod_addr = 0x43;
++	case CX88_BOARD_DNTV_LIVE_DVB_T:
++		cx_set(MO_GP0_IO, 0x00000707);
++		cx_set(MO_GP2_IO, 0x00000101);
++		cx_clear(MO_GP2_IO, 0x00000001);
++		msleep(1);
++		cx_clear(MO_GP0_IO, 0x00000007);
++		cx_set(MO_GP2_IO, 0x00000101);
++		core->pll_addr = 0x61;
++		core->pll_desc = &dvb_pll_unknown_1;
+ 		break;
+ #endif
+ 	}
+Index: linux-2004-12-16/drivers/media/video/cx88/cx88-core.c
+===================================================================
+--- linux-2004-12-16.orig/drivers/media/video/cx88/cx88-core.c	2004-12-17 12:07:24.000000000 +0100
++++ linux-2004-12-16/drivers/media/video/cx88/cx88-core.c	2004-12-17 12:47:15.126291846 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * $Id: cx88-core.c,v 1.15 2004/10/25 11:26:36 kraxel Exp $
++ * $Id: cx88-core.c,v 1.21 2004/12/10 12:33:39 kraxel Exp $
+  *
+  * device driver for Conexant 2388x based TV cards
+  * driver core
+@@ -24,6 +24,7 @@
+ #include <linux/init.h>
+ #include <linux/list.h>
+ #include <linux/module.h>
++#include <linux/moduleparam.h>
+ #include <linux/kernel.h>
+ #include <linux/slab.h>
+ #include <linux/kmod.h>
+@@ -62,6 +63,10 @@ static unsigned int nicam = 0;
+ module_param(nicam,int,0644);
+ MODULE_PARM_DESC(nicam,"tv audio is nicam");
+ 
++static unsigned int nocomb = 0;
++module_param(nocomb,int,0644);
++MODULE_PARM_DESC(nicam,"disable comb filter");
++
+ #define dprintk(level,fmt, arg...)	if (core_debug >= level)	\
+ 	printk(KERN_DEBUG "%s: " fmt, core->name , ## arg)
+ 
+@@ -462,6 +467,7 @@ int cx88_risc_decode(u32 risc)
+ 	return incr[risc >> 28] ? incr[risc >> 28] : 1;
+ }
+ 
++#if 0 /* currently unused, but useful for debugging */
+ void cx88_risc_disasm(struct cx88_core *core,
+ 		      struct btcx_riscmem *risc)
+ {
+@@ -479,6 +485,7 @@ void cx88_risc_disasm(struct cx88_core *
+ 			break;
+ 	}
+ }
++#endif
+ 
+ void cx88_sram_channel_dump(struct cx88_core *core,
+ 			    struct sram_channel *ch)
+@@ -579,10 +586,19 @@ void cx88_print_irqbits(char *name, char
+ 
+ /* ------------------------------------------------------------------ */
+ 
+-void cx88_irq(struct cx88_core *core, u32 status, u32 mask)
++int cx88_core_irq(struct cx88_core *core, u32 status)
+ {
+-	cx88_print_irqbits(core->name, "irq pci",
+-			   cx88_pci_irqs, status, mask);
++	int handled = 0;
++
++	if (status & (1<<18)) {
++		cx88_ir_irq(core);
++		handled++;
++	}
++	if (!handled)
++		cx88_print_irqbits(core->name, "irq pci",
++				   cx88_pci_irqs, status,
++				   core->pci_irqmask);
++	return handled;
+ }
+ 
+ void cx88_wakeup(struct cx88_core *core,
+@@ -800,6 +816,8 @@ int cx88_set_scale(struct cx88_core *cor
+ 		value |= (1 << 0); // 3-tap interpolation
+ 	if (width < 193)
+ 		value |= (1 << 1); // 5-tap interpolation
++	if (nocomb)
++		value |= (3 << 5); // disable comb filter
+ 
+ 	cx_write(MO_FILTER_EVEN,  value);
+ 	cx_write(MO_FILTER_ODD,   value);
+@@ -969,6 +987,9 @@ int cx88_set_tvnorm(struct cx88_core *co
+ 	cx_write(MO_VBI_PACKET, ((1 << 11) | /* (norm_vdelay(norm)   << 11) | */
+ 				 norm_vbipack(norm)));
+ 
++	// this is needed as well to set all tvnorm parameter
++	cx88_set_scale(core, 320, 240, V4L2_FIELD_INTERLACED);
++
+ 	// audio
+ 	set_tvaudio(core);
+ 
+@@ -1105,9 +1126,10 @@ struct cx88_core* cx88_core_get(struct p
+ 		goto fail_unlock;
+ 
+ 	memset(core,0,sizeof(*core));
++	atomic_inc(&core->refcount);
+ 	core->pci_bus  = pci->bus->number;
+ 	core->pci_slot = PCI_SLOT(pci->devfn);
+-	atomic_inc(&core->refcount);
++	core->pci_irqmask = 0x00fc00;
+ 
+ 	core->nr = cx88_devcount++;
+ 	sprintf(core->name,"cx88[%d]",core->nr);
+@@ -1150,6 +1172,8 @@ struct cx88_core* cx88_core_get(struct p
+ 	cx88_reset(core);
+ 	cx88_i2c_init(core,pci);
+ 	cx88_card_setup(core);
++	cx88_ir_init(core,pci);
++	cx_write(MO_PCI_INTMSK, core->pci_irqmask);
+ 
+ 	up(&devlist);
+ 	return core;
+@@ -1170,6 +1194,7 @@ void cx88_core_put(struct cx88_core *cor
+ 		return;
+ 
+ 	down(&devlist);
++	cx88_ir_fini(core);
+ 	if (0 == core->i2c_rc)
+ 		i2c_bit_del_bus(&core->i2c_adap);
+ 	list_del(&core->devlist);
+@@ -1187,7 +1212,7 @@ EXPORT_SYMBOL(cx88_vid_irqs);
+ EXPORT_SYMBOL(cx88_mpeg_irqs);
+ EXPORT_SYMBOL(cx88_print_irqbits);
+ 
+-EXPORT_SYMBOL(cx88_irq);
++EXPORT_SYMBOL(cx88_core_irq);
+ EXPORT_SYMBOL(cx88_wakeup);
+ EXPORT_SYMBOL(cx88_reset);
+ EXPORT_SYMBOL(cx88_shutdown);
+@@ -1197,8 +1222,6 @@ EXPORT_SYMBOL(cx88_risc_databuffer);
+ EXPORT_SYMBOL(cx88_risc_stopper);
+ EXPORT_SYMBOL(cx88_free_buffer);
+ 
+-EXPORT_SYMBOL(cx88_risc_disasm);
+-
+ EXPORT_SYMBOL(cx88_sram_channels);
+ EXPORT_SYMBOL(cx88_sram_channel_setup);
+ EXPORT_SYMBOL(cx88_sram_channel_dump);
+Index: linux-2004-12-16/drivers/media/video/cx88/cx88-blackbird.c
+===================================================================
+--- linux-2004-12-16.orig/drivers/media/video/cx88/cx88-blackbird.c	2004-12-17 12:09:05.000000000 +0100
++++ linux-2004-12-16/drivers/media/video/cx88/cx88-blackbird.c	2004-12-17 12:47:15.136289964 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * $Id: cx88-blackbird.c,v 1.17 2004/11/07 13:17:15 kraxel Exp $
++ * $Id: cx88-blackbird.c,v 1.23 2004/12/10 12:33:39 kraxel Exp $
+  *
+  *  Support for a cx23416 mpeg encoder via cx2388x host port.
+  *  "blackbird" reference design.
+@@ -25,6 +25,7 @@
+  */
+ 
+ #include <linux/module.h>
++#include <linux/moduleparam.h>
+ #include <linux/init.h>
+ #include <linux/fs.h>
+ #include <linux/delay.h>
+@@ -207,10 +208,6 @@ static int register_write(struct cx88_co
+ 	cx_read(P1_RADDR0);
+ 
+ 	return wait_ready_gpio0_bit1(core,1);
+-#if 0
+-	udelay(1000); /* without this, things don't go right (subsequent memory_write()'s don't get through */
+-	/* ? would this be safe here? set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(1); */
+-#endif
+ }
+ 
+ 
+@@ -283,7 +280,7 @@ static int blackbird_api_cmd(struct cx88
+ 	timeout = jiffies + msecs_to_jiffies(10);
+ 	for (;;) {
+ 		memory_read(dev->core, dev->mailbox, &flag);
+-		if (0 == (flag & 4))
++		if (0 != (flag & 4))
+ 			break;
+ 		if (time_after(jiffies,timeout)) {
+ 			dprintk(0, "ERROR: API Mailbox timeout\n");
+@@ -324,7 +321,7 @@ static int blackbird_find_mailbox(struct
+ 			signaturecnt = 0;
+ 		if (4 == signaturecnt) {
+ 			dprintk(1, "Mailbox signature found\n");
+-			return i;
++			return i+1;
+ 		}
+ 	}
+ 	dprintk(0, "Mailbox signature values not found!\n");
+@@ -427,7 +424,8 @@ static void blackbird_codec_settings(str
+         blackbird_api_cmd(dev, IVTV_API_ASSIGN_FRAMERATE, 1, 0, 0);
+ 
+         /* assign frame size */
+-        blackbird_api_cmd(dev, IVTV_API_ASSIGN_FRAME_SIZE, 2, 0, 480, 720);
++        blackbird_api_cmd(dev, IVTV_API_ASSIGN_FRAME_SIZE, 2, 0,
++			  dev->height, dev->width);
+ 
+         /* assign aspect ratio */
+         blackbird_api_cmd(dev, IVTV_API_ASSIGN_ASPECT_RATIO, 1, 0, 2);
+@@ -629,8 +627,8 @@ static int mpeg_do_ioctl(struct inode *i
+ 
+ 		memset(f,0,sizeof(*f));
+ 		f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+-		f->fmt.pix.width        = 720;
+-		f->fmt.pix.height       = 576;
++		f->fmt.pix.width        = dev->width;
++		f->fmt.pix.height       = dev->height;
+ 		f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
+ 		f->fmt.pix.sizeimage    = 1024 * 512 /* FIXME: BUFFER_SIZE */;
+ 	}
+@@ -694,6 +692,10 @@ static int mpeg_open(struct inode *inode
+ 	file->private_data = fh;
+ 	fh->dev      = dev;
+ 
++	/* FIXME: locking against other video device */
++	cx88_set_scale(dev->core, dev->width, dev->height,
++		       V4L2_FIELD_INTERLACED);
++	
+ 	videobuf_queue_init(&fh->mpegq, &blackbird_qops,
+ 			    dev->pci, &dev->slock,
+ 			    V4L2_BUF_TYPE_VIDEO_CAPTURE,
+@@ -715,6 +717,7 @@ static int mpeg_release(struct inode *in
+ 	if (fh->mpegq.reading)
+ 		videobuf_read_stop(&fh->mpegq);
+ 
++	videobuf_mmap_free(&fh->mpegq);
+ 	file->private_data = NULL;
+ 	kfree(fh);
+ 	return 0;
+@@ -821,6 +824,8 @@ static int __devinit blackbird_probe(str
+ 	memset(dev,0,sizeof(*dev));
+ 	dev->pci = pci_dev;
+ 	dev->core = core;
++	dev->width = 720;
++	dev->height = 480;
+ 
+ 	err = cx8802_init_common(dev);
+ 	if (0 != err)
+Index: linux-2004-12-16/drivers/media/video/Kconfig
+===================================================================
+--- linux-2004-12-16.orig/drivers/media/video/Kconfig	2004-12-17 12:47:08.871468650 +0100
++++ linux-2004-12-16/drivers/media/video/Kconfig	2004-12-17 12:47:43.205009038 +0100
+@@ -309,6 +309,7 @@ config VIDEO_CX88
+ 	select VIDEO_BTCX
+ 	select VIDEO_BUF
+ 	select VIDEO_TUNER
++	select VIDEO_TVEEPROM
+ 	---help---
+ 	  This is a video4linux driver for Conexant 2388x based
+ 	  TV cards.
+@@ -318,7 +319,7 @@ config VIDEO_CX88
+ 
+ config VIDEO_CX88_DVB
+ 	tristate "DVB Support for cx2388x based TV cards"
+-	depends on VIDEO_CX88 && DVB_CORE && BROKEN
++	depends on VIDEO_CX88 && DVB_CORE
+ 	select VIDEO_BUF_DVB
+ 	---help---
+ 	  This adds support for DVB cards based on the
+Index: linux-2004-12-16/drivers/media/video/cx88/cx88-video.c
+===================================================================
+--- linux-2004-12-16.orig/drivers/media/video/cx88/cx88-video.c	2004-12-17 12:08:16.000000000 +0100
++++ linux-2004-12-16/drivers/media/video/cx88/cx88-video.c	2004-12-17 12:47:15.148287707 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * $Id: cx88-video.c,v 1.46 2004/11/07 14:44:59 kraxel Exp $
++ * $Id: cx88-video.c,v 1.50 2004/12/10 12:33:39 kraxel Exp $
+  *
+  * device driver for Conexant 2388x based TV cards
+  * video4linux video interface
+@@ -24,6 +24,7 @@
+ #include <linux/init.h>
+ #include <linux/list.h>
+ #include <linux/module.h>
++#include <linux/moduleparam.h>
+ #include <linux/kmod.h>
+ #include <linux/kernel.h>
+ #include <linux/slab.h>
+@@ -428,7 +429,7 @@ static int start_video_dma(struct cx8800
+ 	q->count = 1;
+ 
+ 	/* enable irqs */
+-	cx_set(MO_PCI_INTMSK, 0x00fc01);
++	cx_set(MO_PCI_INTMSK, core->pci_irqmask | 0x01);
+ 	cx_set(MO_VID_INTMSK, 0x0f0011);
+ 
+ 	/* enable capture */
+@@ -1002,7 +1003,7 @@ static int video_open(struct inode *inod
+ }
+ 
+ static ssize_t
+-video_read(struct file *file, char __user *data, size_t count, loff_t *ppos)
++video_read(struct file *file, char *data, size_t count, loff_t *ppos)
+ {
+ 	struct cx8800_fh *fh = file->private_data;
+ 
+@@ -1083,6 +1084,8 @@ static int video_release(struct inode *i
+ 		res_free(dev,fh,RESOURCE_VBI);
+ 	}
+ 
++	videobuf_mmap_free(&fh->vidq);
++	videobuf_mmap_free(&fh->vbiq);
+ 	file->private_data = NULL;
+ 	kfree(fh);
+ 	return 0;
+@@ -1880,19 +1883,18 @@ static irqreturn_t cx8800_irq(int irq, v
+ {
+ 	struct cx8800_dev *dev = dev_id;
+ 	struct cx88_core *core = dev->core;
+-	u32 status, mask;
++	u32 status;
+ 	int loop, handled = 0;
+ 
+ 	for (loop = 0; loop < 10; loop++) {
+-		status = cx_read(MO_PCI_INTSTAT) & (~0x1f | 0x01);
+-		mask   = cx_read(MO_PCI_INTMSK);
+-		if (0 == (status & mask))
++		status = cx_read(MO_PCI_INTSTAT) & (core->pci_irqmask | 0x01);
++		if (0 == status)
+ 			goto out;
+ 		cx_write(MO_PCI_INTSTAT, status);
+ 		handled = 1;
+ 
+-		if (status & mask & ~0x1f)
+-			cx88_irq(core,status,mask);
++		if (status & core->pci_irqmask)
++			cx88_core_irq(core,status);
+ 		if (status & 0x01)
+ 			cx8800_vid_irq(dev);
+ 	};
+Index: linux-2004-12-16/drivers/media/video/cx88/cx88-mpeg.c
+===================================================================
+--- linux-2004-12-16.orig/drivers/media/video/cx88/cx88-mpeg.c	2004-12-17 12:09:55.000000000 +0100
++++ linux-2004-12-16/drivers/media/video/cx88/cx88-mpeg.c	2004-12-17 12:47:15.150287331 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * $Id: cx88-mpeg.c,v 1.14 2004/10/25 11:26:36 kraxel Exp $
++ * $Id: cx88-mpeg.c,v 1.16 2004/12/10 12:33:39 kraxel Exp $
+  *
+  *  Support for the mpeg transport stream transfers
+  *  PCI function #2 of the cx2388x.
+@@ -24,6 +24,7 @@
+  */
+ 
+ #include <linux/module.h>
++#include <linux/moduleparam.h>
+ #include <linux/init.h>
+ #include <linux/device.h>
+ #include <linux/interrupt.h>
+@@ -93,7 +94,7 @@ static int cx8802_start_dma(struct cx880
+ 	q->count = 1;
+ 
+ 	/* enable irqs */
+-	cx_set(MO_PCI_INTMSK, 0x00fc04);
++	cx_set(MO_PCI_INTMSK, core->pci_irqmask | 0x04);
+ 	cx_write(MO_TS_INTMSK,  0x1f0011);
+ 
+ 	/* start dma */
+@@ -292,19 +293,18 @@ static irqreturn_t cx8802_irq(int irq, v
+ {
+ 	struct cx8802_dev *dev = dev_id;
+ 	struct cx88_core *core = dev->core;
+-	u32 status, mask;
++	u32 status;
+ 	int loop, handled = 0;
+ 
+ 	for (loop = 0; loop < 10; loop++) {
+-		status = cx_read(MO_PCI_INTSTAT) & (~0x1f | 0x04);
+-		mask   = cx_read(MO_PCI_INTMSK);
+-		if (0 == (status & mask))
++		status = cx_read(MO_PCI_INTSTAT) & (core->pci_irqmask | 0x04);
++		if (0 == status)
+ 			goto out;
+ 		handled = 1;
+ 		cx_write(MO_PCI_INTSTAT, status);
+ 
+-		if (status & mask & ~0x1f)
+-			cx88_irq(core,status,mask);
++		if (status & core->pci_irqmask)
++			cx88_core_irq(core,status);
+ 		if (status & 0x04)
+ 			cx8802_mpeg_irq(dev);
+ 	};
+Index: linux-2004-12-16/drivers/media/video/cx88/cx88-tvaudio.c
+===================================================================
+--- linux-2004-12-16.orig/drivers/media/video/cx88/cx88-tvaudio.c	2004-12-17 12:07:52.000000000 +0100
++++ linux-2004-12-16/drivers/media/video/cx88/cx88-tvaudio.c	2004-12-17 12:47:15.155286390 +0100
+@@ -1,5 +1,5 @@
+ /*
+-    $Id: cx88-tvaudio.c,v 1.24 2004/10/25 11:51:00 kraxel Exp $
++    $Id: cx88-tvaudio.c,v 1.26 2004/12/10 12:33:39 kraxel Exp $
+ 
+     cx88x-audio.c - Conexant CX23880/23881 audio downstream driver driver
+ 
+@@ -37,6 +37,7 @@
+ */
+ 
+ #include <linux/module.h>
++#include <linux/moduleparam.h>
+ #include <linux/errno.h>
+ #include <linux/kernel.h>
+ #include <linux/slab.h>
+Index: linux-2004-12-16/drivers/media/video/cx88/cx88-dvb.c
+===================================================================
+--- linux-2004-12-16.orig/drivers/media/video/cx88/cx88-dvb.c	2004-12-17 12:08:32.000000000 +0100
++++ linux-2004-12-16/drivers/media/video/cx88/cx88-dvb.c	2004-12-17 12:47:15.164284697 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * $Id: cx88-dvb.c,v 1.19 2004/11/07 14:44:59 kraxel Exp $
++ * $Id: cx88-dvb.c,v 1.21 2004/12/09 12:51:35 kraxel Exp $
+  *
+  * device driver for Conexant 2388x based TV cards
+  * MPEG Transport Stream (DVB) routines
+@@ -31,6 +31,7 @@
+ #include <linux/suspend.h>
+ 
+ #include "cx88.h"
++#include "dvb-pll.h"
+ #include "cx22702.h"
+ #include "mt352.h"
+ #include "mt352_priv.h" /* FIXME */
+@@ -110,72 +111,52 @@ static int dvico_fusionhdtv_demod_init(s
+ 	return 0;
+ }
+ 
+-#define IF_FREQUENCYx6 217    /* 6 * 36.16666666667MHz */
+-
+-static int lg_z201_pll_set(struct dvb_frontend* fe,
+-			   struct dvb_frontend_parameters* params, u8* pllbuf)
++static int dntv_live_dvbt_demod_init(struct dvb_frontend* fe)
+ {
+-	u32 div;
+-	unsigned char cp = 0;
+-	unsigned char bs = 0;
+-
+-	div = (((params->frequency + 83333) * 3) / 500000) + IF_FREQUENCYx6;
+-
+-	if (params->frequency < 542000000) cp = 0xbc;
+-	else if (params->frequency < 830000000) cp = 0xf4;
+-	else cp = 0xfc;
+-
+-	if (params->frequency == 0) bs = 0x03;
+-	else if (params->frequency < 157500000) bs = 0x01;
+-	else if (params->frequency < 443250000) bs = 0x02;
+-	else bs = 0x04;
+-
+-	pllbuf[0] = 0xC2; /* Note: non-linux standard PLL I2C address */
+-	pllbuf[1] = div >> 8;
+-	pllbuf[2] = div & 0xff;
+-	pllbuf[3] = cp;
+-	pllbuf[4] = bs;
++	static u8 clock_config []  = { 0x89, 0x38, 0x39 };
++	static u8 reset []         = { 0x50, 0x80 };
++	static u8 adc_ctl_1_cfg [] = { 0x8E, 0x40 };
++	static u8 agc_cfg []       = { 0x67, 0x10, 0x23, 0x00, 0xFF, 0xFF,
++	                               0x00, 0xFF, 0x00, 0x40, 0x40 };
++	static u8 dntv_extra[]     = { 0xB5, 0x7A };
++	static u8 capt_range_cfg[] = { 0x75, 0x32 };
++  
++	mt352_write(fe, clock_config,   sizeof(clock_config));
++	udelay(2000);
++	mt352_write(fe, reset,          sizeof(reset));
++	mt352_write(fe, adc_ctl_1_cfg,  sizeof(adc_ctl_1_cfg));
++
++	mt352_write(fe, agc_cfg,        sizeof(agc_cfg));
++	udelay(2000);
++	mt352_write(fe, dntv_extra,     sizeof(dntv_extra));
++	mt352_write(fe, capt_range_cfg, sizeof(capt_range_cfg));
+ 
+ 	return 0;
+ }
+ 
+-static int thomson_dtt7579_pll_set(struct dvb_frontend* fe,
+-				   struct dvb_frontend_parameters* params,
+-				   u8* pllbuf)
+-{
+-	u32 div;
+-	unsigned char cp = 0;
+-	unsigned char bs = 0;
+-
+-	div = (((params->frequency + 83333) * 3) / 500000) + IF_FREQUENCYx6;
+-
+-	if (params->frequency < 542000000) cp = 0xb4;
+-	else if (params->frequency < 771000000) cp = 0xbc;
+-	else cp = 0xf4;
+-
+-        if (params->frequency == 0) bs = 0x03;
+-	else if (params->frequency < 443250000) bs = 0x02;
+-	else bs = 0x08;
+-
+-	pllbuf[0] = 0xc0; // Note: non-linux standard PLL i2c address
+-	pllbuf[1] = div >> 8;
+-   	pllbuf[2] = div & 0xff;
+-   	pllbuf[3] = cp;
+-   	pllbuf[4] = bs;
+-
++static int mt352_pll_set(struct dvb_frontend* fe,
++			 struct dvb_frontend_parameters* params,
++			 u8* pllbuf)
++{
++	struct cx8802_dev *dev= fe->dvb->priv;
++
++	pllbuf[0] = dev->core->pll_addr << 1;
++	dvb_pll_configure(dev->core->pll_desc, pllbuf+1,
++			  params->frequency,
++			  params->u.ofdm.bandwidth);
+ 	return 0;
+ }
+ 
+-struct mt352_config dvico_fusionhdtv_dvbt1 = {
++static struct mt352_config dvico_fusionhdtv = {
+ 	.demod_address = 0x0F,
+ 	.demod_init    = dvico_fusionhdtv_demod_init,
+-	.pll_set       = lg_z201_pll_set,
++	.pll_set       = mt352_pll_set,
+ };
+ 
+-struct mt352_config dvico_fusionhdtv_dvbt_plus = {
+-	.demod_address = 0x0F,
+-	.demod_init    = dvico_fusionhdtv_demod_init,
+-	.pll_set       = thomson_dtt7579_pll_set,
++static struct mt352_config dntv_live_dvbt_config = {
++	.demod_address = 0x0f,
++	.demod_init    = dntv_live_dvbt_demod_init,
++	.pll_set       = mt352_pll_set,
+ };
+ 
+ static int dvb_register(struct cx8802_dev *dev)
+@@ -189,32 +170,32 @@ static int dvb_register(struct cx8802_de
+ 	case CX88_BOARD_CONEXANT_DVB_T1:
+ 		dev->dvb.frontend = cx22702_create(&dev->core->i2c_adap,
+ 						   dev->core->pll_addr,
+-						   dev->core->pll_type,
++						   dev->core->pll_desc,
+ 						   dev->core->demod_addr);
+ 		break;
+ 	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:
+-		dev->dvb.frontend = mt352_attach(&dvico_fusionhdtv_dvbt1,
++	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS:
++		dev->dvb.frontend = mt352_attach(&dvico_fusionhdtv,
+ 						 &dev->core->i2c_adap);
+-		if (dev->dvb.frontend) {
+-			dev->dvb.frontend->ops->info.frequency_min = 174000000;
+-			dev->dvb.frontend->ops->info.frequency_max = 862000000;
+-		}
+ 		break;
+-	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS:
+-		dev->dvb.frontend = mt352_attach(&dvico_fusionhdtv_dvbt_plus,
++	case CX88_BOARD_DNTV_LIVE_DVB_T:
++		dev->dvb.frontend = mt352_attach(&dntv_live_dvbt_config,
+ 						 &dev->core->i2c_adap);
+-		if (dev->dvb.frontend) {
+-			dev->dvb.frontend->ops->info.frequency_min = 174000000;
+-			dev->dvb.frontend->ops->info.frequency_max = 862000000;
+-		}
+ 		break;
+ 	default:
+ 		printk("%s: FIXME: frontend handling not here yet ...\n",
+ 		       dev->core->name);
+ 		break;
+ 	}
+-	if (NULL == dev->dvb.frontend)
++	if (NULL == dev->dvb.frontend) {
++		printk("%s: frontend initialization failed\n",dev->core->name);
+ 		return -1;
++	}
++
++	if (dev->core->pll_desc) {
++		dev->dvb.frontend->ops->info.frequency_min = dev->core->pll_desc->min;
++		dev->dvb.frontend->ops->info.frequency_max = dev->core->pll_desc->max;
++	}
+ 
+ 	/* Copy the board name into the DVB structure */
+ 	strlcpy(dev->dvb.frontend->ops->info.name,
+@@ -222,7 +203,7 @@ static int dvb_register(struct cx8802_de
+ 		sizeof(dev->dvb.frontend->ops->info.name));
+ 
+ 	/* register everything */
+-	return videobuf_dvb_register(&dev->dvb);
++	return videobuf_dvb_register(&dev->dvb, THIS_MODULE, dev);
+ }
+ 
+ /* ----------------------------------------------------------- */
+Index: linux-2004-12-16/drivers/media/video/cx88/cx88-input.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2004-12-16/drivers/media/video/cx88/cx88-input.c	2004-12-17 12:47:15.165284509 +0100
+@@ -0,0 +1,394 @@
++/*
++ * $Id: cx88-input.c,v 1.3 2004/12/10 12:33:39 kraxel Exp $
++ *
++ * Device driver for GPIO attached remote control interfaces
++ * on Conexant 2388x based TV/DVB cards.
++ *
++ * Copyright (c) 2003 Pavel Machek
++ * Copyright (c) 2004 Gerd Knorr
++ * Copyright (c) 2004 Chris Pascoe
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ */
++
++#include <linux/init.h>
++#include <linux/delay.h>
++#include <linux/input.h>
++#include <linux/pci.h>
++#include <linux/module.h>
++#include <linux/moduleparam.h>
++
++#include <media/ir-common.h>
++
++#include "cx88.h"
++
++/* ---------------------------------------------------------------------- */
++
++/* DigitalNow DNTV Live DVB-T Remote */
++static IR_KEYTAB_TYPE ir_codes_dntv_live_dvb_t[IR_KEYTAB_SIZE] = {
++	[ 0x00 ] = KEY_ESC,         // 'go up a level?'
++	[ 0x01 ] = KEY_KP1,         // '1'
++	[ 0x02 ] = KEY_KP2,         // '2'
++	[ 0x03 ] = KEY_KP3,         // '3'
++	[ 0x04 ] = KEY_KP4,         // '4'
++	[ 0x05 ] = KEY_KP5,         // '5'
++	[ 0x06 ] = KEY_KP6,         // '6'
++	[ 0x07 ] = KEY_KP7,         // '7'
++	[ 0x08 ] = KEY_KP8,         // '8'
++	[ 0x09 ] = KEY_KP9,         // '9'
++	[ 0x0a ] = KEY_KP0,         // '0'
++	[ 0x0b ] = KEY_TUNER,       // 'tv/fm'
++	[ 0x0c ] = KEY_SEARCH,      // 'scan'
++	[ 0x0d ] = KEY_STOP,        // 'stop'
++	[ 0x0e ] = KEY_PAUSE,       // 'pause'
++	[ 0x0f ] = KEY_LIST,        // 'source'
++
++	[ 0x10 ] = KEY_MUTE,        // 'mute'
++	[ 0x11 ] = KEY_REWIND,      // 'backward <<'
++	[ 0x12 ] = KEY_POWER,       // 'power'
++	[ 0x13 ] = KEY_S,           // 'snap'
++	[ 0x14 ] = KEY_AUDIO,       // 'stereo'
++	[ 0x15 ] = KEY_CLEAR,       // 'reset'
++	[ 0x16 ] = KEY_PLAY,        // 'play'
++	[ 0x17 ] = KEY_ENTER,       // 'enter'
++	[ 0x18 ] = KEY_ZOOM,        // 'full screen'
++	[ 0x19 ] = KEY_FASTFORWARD, // 'forward >>'
++	[ 0x1a ] = KEY_CHANNELUP,   // 'channel +'
++	[ 0x1b ] = KEY_VOLUMEUP,    // 'volume +'
++	[ 0x1c ] = KEY_INFO,        // 'preview'
++	[ 0x1d ] = KEY_RECORD,      // 'record'
++	[ 0x1e ] = KEY_CHANNELDOWN, // 'channel -'
++	[ 0x1f ] = KEY_VOLUMEDOWN,  // 'volume -'
++};
++
++/* ---------------------------------------------------------------------- */
++
++struct cx88_IR {
++	struct cx88_core	*core;
++	struct input_dev        input;
++	struct ir_input_state   ir;
++	char                    name[32];
++	char                    phys[32];
++
++	/* sample from gpio pin 16 */
++	int                     sampling;
++	u32                     samples[16];
++	int                     scount;
++	unsigned long           release;
++
++	/* poll external decoder */
++	int                     polling;
++	struct work_struct      work;
++	struct timer_list       timer;
++	u32			gpio_addr;
++	u32                     last_gpio;
++	u32                     mask_keycode;
++	u32                     mask_keydown;
++	u32                     mask_keyup;
++};
++
++static int ir_debug = 0;
++module_param(ir_debug, int, 0644);    /* debug level [IR] */
++MODULE_PARM_DESC(ir_debug, "enable debug messages [IR]");
++
++#define ir_dprintk(fmt, arg...)	if (ir_debug) \
++	printk(KERN_DEBUG "%s IR: " fmt , ir->core->name, ## arg)
++
++/* ---------------------------------------------------------------------- */
++
++static void cx88_ir_handle_key(struct cx88_IR *ir)
++{
++	struct cx88_core *core = ir->core;
++	u32 gpio, data;
++
++	/* read gpio value */
++	gpio = cx_read(ir->gpio_addr);
++	if (ir->polling) {
++		if (ir->last_gpio == gpio)
++			return;
++		ir->last_gpio = gpio;
++	}
++
++	/* extract data */
++	data = ir_extract_bits(gpio, ir->mask_keycode);
++	ir_dprintk("irq gpio=0x%x code=%d | %s%s%s\n",
++		gpio, data,
++		ir->polling               ? "poll"  : "irq",
++		(gpio & ir->mask_keydown) ? " down" : "",
++		(gpio & ir->mask_keyup)   ? " up"   : "");
++
++	if (ir->mask_keydown) {
++		/* bit set on keydown */
++		if (gpio & ir->mask_keydown) {
++			ir_input_keydown(&ir->input,&ir->ir,data,data);
++		} else {
++			ir_input_nokey(&ir->input,&ir->ir);
++		}
++
++	} else if (ir->mask_keyup) {
++		/* bit cleared on keydown */
++		if (0 == (gpio & ir->mask_keyup)) {
++			ir_input_keydown(&ir->input,&ir->ir,data,data);
++		} else {
++			ir_input_nokey(&ir->input,&ir->ir);
++		}
++
++	} else {
++		/* can't disturgissh keydown/up :-/ */
++		ir_input_keydown(&ir->input,&ir->ir,data,data);
++		ir_input_nokey(&ir->input,&ir->ir);
++	}
++}
++
++static void ir_timer(unsigned long data)
++{
++	struct cx88_IR *ir = (struct cx88_IR*)data;
++
++	schedule_work(&ir->work);
++}
++
++static void cx88_ir_work(void *data)
++{
++	struct cx88_IR *ir = data;
++	unsigned long timeout;
++
++	cx88_ir_handle_key(ir);
++	timeout = jiffies + (ir->polling * HZ / 1000);
++	mod_timer(&ir->timer, timeout);
++}
++
++/* ---------------------------------------------------------------------- */
++
++int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
++{
++	struct cx88_IR *ir;
++	IR_KEYTAB_TYPE *ir_codes = NULL;
++	int ir_type = IR_TYPE_OTHER;
++
++	ir = kmalloc(sizeof(*ir),GFP_KERNEL);
++	if (NULL == ir)
++		return -ENOMEM;
++	memset(ir,0,sizeof(*ir));
++
++	/* detect & configure */
++	switch (core->board) {
++	case CX88_BOARD_DNTV_LIVE_DVB_T:
++		ir_codes         = ir_codes_dntv_live_dvb_t;
++		ir->gpio_addr    = MO_GP1_IO;
++		ir->mask_keycode = 0x1f;
++		ir->mask_keyup   = 0x60;
++		ir->polling      = 50; // ms
++		break;
++	case CX88_BOARD_HAUPPAUGE:
++	case CX88_BOARD_HAUPPAUGE_DVB_T1:
++		ir_codes         = ir_codes_rc5_tv;
++		ir_type          = IR_TYPE_RC5;
++		ir->sampling     = 1;
++		break;
++	}
++	if (NULL == ir_codes) {
++		kfree(ir);
++		return -ENODEV;
++	}
++
++	/* init input device */
++	snprintf(ir->name, sizeof(ir->name), "cx88 IR (%s)",
++		 cx88_boards[core->board].name);
++	snprintf(ir->phys, sizeof(ir->phys), "pci-%s/ir0",
++		 pci_name(pci));
++
++	ir_input_init(&ir->input, &ir->ir, ir_type, ir_codes);
++	ir->input.name = ir->name;
++	ir->input.phys = ir->phys;
++	ir->input.id.bustype = BUS_PCI;
++	ir->input.id.version = 1;
++	if (pci->subsystem_vendor) {
++		ir->input.id.vendor  = pci->subsystem_vendor;
++		ir->input.id.product = pci->subsystem_device;
++	} else {
++		ir->input.id.vendor  = pci->vendor;
++		ir->input.id.product = pci->device;
++	}
++
++	/* record handles to ourself */
++	ir->core = core;
++	core->ir = ir;
++
++	if (ir->polling) {
++		INIT_WORK(&ir->work, cx88_ir_work, ir);
++		init_timer(&ir->timer);
++		ir->timer.function = ir_timer;
++		ir->timer.data     = (unsigned long)ir;
++		schedule_work(&ir->work);
++	}
++	if (ir->sampling) {
++		core->pci_irqmask |= (1<<18);   // IR_SMP_INT
++		cx_write(MO_DDS_IO, 0xa80a80);  // 4 kHz sample rate
++		cx_write(MO_DDSCFG_IO,   0x5);  // enable
++	}
++
++	/* all done */
++	input_register_device(&ir->input);
++	printk("%s: registered IR remote control\n", core->name);
++
++	return 0;
++}
++
++int cx88_ir_fini(struct cx88_core *core)
++{
++	struct cx88_IR *ir = core->ir;
++
++	/* skip detach on non attached boards */
++	if (NULL == ir)
++		return 0;
++
++	if (ir->polling) {
++		del_timer(&ir->timer);
++		flush_scheduled_work();
++	}
++
++	input_unregister_device(&ir->input);
++	kfree(ir);
++
++	/* done */
++	core->ir = NULL;
++	return 0;
++}
++
++/* ---------------------------------------------------------------------- */
++
++static int inline getbit(u32 *samples, int bit)
++{
++	return (samples[bit/32] & (1 << (31-(bit%32)))) ? 1 : 0;
++}
++
++static int dump_samples(u32 *samples, int count)
++{
++	int i, bit, start;
++
++	printk(KERN_DEBUG "ir samples @ 4kHz: ");
++	start = 0;
++	for (i = 0; i < count * 32; i++) {
++		bit = getbit(samples,i);
++		if (bit)
++			start = 1;
++		if (0 == start)
++			continue;
++		printk("%s", bit ? "#" : "_");
++	}
++	printk("\n");
++}
++
++static int ir_decode_biphase(u32 *samples, int count, int low, int high)
++{
++	int i,last,bit,len,flips;
++	u32 value;
++
++	/* find start bit (1) */
++	for (i = 0; i < 32; i++) {
++		bit = getbit(samples,i);
++		if (bit)
++			break;
++	}
++
++	/* go decoding */
++	len   = 0;
++	flips = 0;
++	value = 1;
++	for (; i < count * 32; i++) {
++		if (len > high)
++			break;
++		if (flips > 1)
++			break;
++		last = bit;
++		bit  = getbit(samples,i);
++		if (last == bit) {
++			len++;
++			continue;
++		}
++		if (len < low) {
++			len++;
++			flips++;
++			continue;
++		}
++		value <<= 1;
++		value |= bit;
++		flips = 0;
++		len   = 1;
++	}
++	return value;
++}
++
++void cx88_ir_irq(struct cx88_core *core)
++{
++	struct cx88_IR *ir = core->ir;
++	u32 samples,rc5;
++	int i;
++
++	if (NULL == ir)
++		return;
++	if (!ir->sampling)
++		return;
++
++	samples = cx_read(MO_SAMPLE_IO);
++	if (0 != samples  &&  0xffffffff != samples) {
++		/* record sample data */
++		if (ir->scount < ARRAY_SIZE(ir->samples))
++			ir->samples[ir->scount++] = samples;
++		return;
++	}
++	if (!ir->scount) {
++		/* nothing to sample */
++		if (ir->ir.keypressed && time_after(jiffies,ir->release))
++			ir_input_nokey(&ir->input,&ir->ir);
++		return;
++	}
++
++	/* have a complete sample */
++	if (ir->scount < ARRAY_SIZE(ir->samples))
++		ir->samples[ir->scount++] = samples;
++	for (i = 0; i < ir->scount; i++)
++		ir->samples[i] = ~ir->samples[i];
++	if (ir_debug)
++		dump_samples(ir->samples,ir->scount);
++
++	/* decode it */
++	switch (core->board) {
++	case CX88_BOARD_HAUPPAUGE:
++	case CX88_BOARD_HAUPPAUGE_DVB_T1:
++		rc5 = ir_decode_biphase(ir->samples,ir->scount,5,7);
++		ir_dprintk("biphase decoded: %x\n",rc5);
++		if ((rc5 & 0xfffff000) != 0x3000)
++			break;
++		ir_input_keydown(&ir->input, &ir->ir, rc5 & 0x3f, rc5);
++		ir->release = jiffies + msecs_to_jiffies(120);
++		break;
++	}
++
++	ir->scount = 0;
++	return;
++}
++
++/* ---------------------------------------------------------------------- */
++
++MODULE_AUTHOR("Gerd Knorr, Pavel Machek, Chris Pascoe");
++MODULE_DESCRIPTION("input driver for cx88 GPIO-based IR remote controls");
++MODULE_LICENSE("GPL");
++
++/*
++ * Local variables:
++ * c-basic-offset: 8
++ * End:
++ */
+Index: linux-2004-12-16/drivers/media/video/cx88/cx88-vbi.c
+===================================================================
+--- linux-2004-12-16.orig/drivers/media/video/cx88/cx88-vbi.c	2004-12-17 12:08:00.000000000 +0100
++++ linux-2004-12-16/drivers/media/video/cx88/cx88-vbi.c	2004-12-17 12:47:15.166284321 +0100
+@@ -1,8 +1,9 @@
+ /*
+- * $Id: cx88-vbi.c,v 1.14 2004/11/07 13:17:15 kraxel Exp $
++ * $Id: cx88-vbi.c,v 1.16 2004/12/10 12:33:39 kraxel Exp $
+  */
+ #include <linux/kernel.h>
+ #include <linux/module.h>
++#include <linux/moduleparam.h>
+ #include <linux/init.h>
+ #include <linux/slab.h>
+ 
+@@ -64,7 +65,7 @@ int cx8800_start_vbi_dma(struct cx8800_d
+ 	q->count = 1;
+ 
+ 	/* enable irqs */
+-	cx_set(MO_PCI_INTMSK, 0x00fc01);
++	cx_set(MO_PCI_INTMSK, core->pci_irqmask | 0x01);
+ 	cx_set(MO_VID_INTMSK, 0x0f0088);
+ 
+ 	/* enable capture */
+Index: linux-2004-12-16/drivers/media/video/cx88/cx88.h
+===================================================================
+--- linux-2004-12-16.orig/drivers/media/video/cx88/cx88.h	2004-12-17 12:09:48.000000000 +0100
++++ linux-2004-12-16/drivers/media/video/cx88/cx88.h	2004-12-17 12:47:15.169283757 +0100
+@@ -1,5 +1,5 @@
+ /*
+- * $Id: cx88.h,v 1.40 2004/11/03 09:04:51 kraxel Exp $
++ * $Id: cx88.h,v 1.47 2004/12/14 15:33:30 kraxel Exp $
+  *
+  * v4l2 device driver for cx2388x based TV cards
+  *
+@@ -27,6 +27,7 @@
+ #include <linux/kdev_t.h>
+ 
+ #include <media/tuner.h>
++#include <media/tveeprom.h>
+ #include <media/audiochip.h>
+ #include <media/video-buf.h>
+ #include <media/video-buf-dvb.h>
+@@ -156,6 +157,8 @@ extern struct sram_channel cx88_sram_cha
+ #define CX88_BOARD_CONEXANT_DVB_T1         19
+ #define CX88_BOARD_PROVIDEO_PV259          20
+ #define CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS 21
++#define CX88_BOARD_PCHDTV_HD3000           22
++#define CX88_BOARD_DNTV_LIVE_DVB_T         23
+ 
+ enum cx88_itype {
+ 	CX88_VMUX_COMPOSITE1 = 1,
+@@ -238,6 +241,7 @@ struct cx88_core {
+         u32                        __iomem *lmmio;
+         u8                         __iomem *bmmio;
+ 	u32                        shadow[SHADOW_MAX];
++	int                        pci_irqmask;
+ 
+ 	/* i2c i/o */
+ 	struct i2c_adapter         i2c_adap;
+@@ -252,7 +256,7 @@ struct cx88_core {
+ 	unsigned int               has_radio;
+ 
+ 	/* config info -- dvb */
+-	unsigned int               pll_type;
++	struct dvb_pll_desc        *pll_desc;
+ 	unsigned int               pll_addr;
+ 	unsigned int               demod_addr;
+ 
+@@ -262,6 +266,9 @@ struct cx88_core {
+ 	u32                        tvaudio;
+ 	u32                        input;
+ 	u32                        astat;
++
++	/* IR remote control state */
++	struct cx88_IR             *ir;
+ };
+ 
+ struct cx8800_dev;
+@@ -371,6 +378,8 @@ struct cx8802_dev {
+ 	struct list_head           devlist;
+ 	struct video_device        *mpeg_dev;
+ 	u32                        mailbox;
++	int                        width;
++	int                        height;
+ 
+ 	/* for dvb only */
+ 	struct videobuf_dvb        dvb;
+@@ -411,7 +420,7 @@ extern void cx88_print_irqbits(char *nam
+ 			       u32 bits, u32 mask);
+ extern void cx88_print_ioctl(char *name, unsigned int cmd);
+ 
+-extern void cx88_irq(struct cx88_core *core, u32 status, u32 mask);
++extern int cx88_core_irq(struct cx88_core *core, u32 status);
+ extern void cx88_wakeup(struct cx88_core *core,
+ 			struct cx88_dmaqueue *q, u32 count);
+ extern void cx88_shutdown(struct cx88_core *core);
+@@ -508,6 +517,13 @@ void cx88_set_stereo(struct cx88_core *c
+ int cx88_audio_thread(void *data);
+ 
+ /* ----------------------------------------------------------- */
++/* cx88-input.c                                                */
++
++int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci);
++int cx88_ir_fini(struct cx88_core *core);
++void cx88_ir_irq(struct cx88_core *core);
++
++/* ----------------------------------------------------------- */
+ /* cx88-mpeg.c                                                 */
+ 
+ int cx8802_buf_prepare(struct cx8802_dev *dev, struct cx88_buffer *buf);
+Index: linux-2004-12-16/drivers/media/video/cx88/Makefile
+===================================================================
+--- linux-2004-12-16.orig/drivers/media/video/cx88/Makefile	2004-12-17 12:07:11.000000000 +0100
++++ linux-2004-12-16/drivers/media/video/cx88/Makefile	2004-12-17 12:47:15.177282252 +0100
+@@ -1,4 +1,5 @@
+-cx88xx-objs	:= cx88-cards.o cx88-core.o cx88-i2c.o cx88-tvaudio.o
++cx88xx-objs	:= cx88-cards.o cx88-core.o cx88-i2c.o cx88-tvaudio.o \
++		   cx88-input.o
+ cx8800-objs	:= cx88-video.o cx88-vbi.o
+ cx8802-objs	:= cx88-mpeg.o
+ 
+Index: linux-2004-12-16/drivers/media/video/cx88/cx88-i2c.c
+===================================================================
+--- linux-2004-12-16.orig/drivers/media/video/cx88/cx88-i2c.c	2004-12-17 12:07:37.000000000 +0100
++++ linux-2004-12-16/drivers/media/video/cx88/cx88-i2c.c	2004-12-17 12:47:15.184280935 +0100
+@@ -1,5 +1,5 @@
+ /*
+-    $Id: cx88-i2c.c,v 1.18 2004/10/13 10:39:00 kraxel Exp $
++    $Id: cx88-i2c.c,v 1.19 2004/12/10 12:33:39 kraxel Exp $
+ 
+     cx88-i2c.c  --  all the i2c code is here
+ 
+@@ -25,6 +25,7 @@
+ */
+ 
+ #include <linux/module.h>
++#include <linux/moduleparam.h>
+ #include <linux/init.h>
+ 
+ #include <asm/io.h>
Index: patches/linux-2.6.11-gcc4_fixes.patch
===================================================================
--- patches/linux-2.6.11-gcc4_fixes.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/linux-2.6.11-gcc4_fixes.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,275 @@
+--- ./include/linux/i2c.h.sav	2005-02-23 10:35:36.000000000 -0800
++++ ./include/linux/i2c.h	2005-02-23 10:46:23.000000000 -0800
+@@ -55,7 +55,7 @@
+ 
+ /* Transfer num messages.
+  */
+-extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],int num);
++extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num);
+ 
+ /*
+  * Some adapter types (i.e. PCF 8584 based ones) may support slave behaviuor. 
+@@ -194,7 +194,7 @@
+ 	   to NULL. If an adapter algorithm can do SMBus access, set 
+ 	   smbus_xfer. If set to NULL, the SMBus protocol is simulated
+ 	   using common I2C messages */
+-	int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg msgs[], 
++	int (*master_xfer)(struct i2c_adapter *adap,struct i2c_msg *msgs, 
+ 	                   int num);
+ 	int (*smbus_xfer) (struct i2c_adapter *adap, u16 addr, 
+ 	                   unsigned short flags, char read_write,
+--- ./drivers/i2c/busses/i2c-iop3xx.c.sav	2005-02-23 10:36:21.000000000 -0800
++++ ./drivers/i2c/busses/i2c-iop3xx.c	2005-02-23 10:47:36.000000000 -0800
+@@ -361,7 +361,7 @@
+  * master_xfer() - main read/write entry
+  */
+ static int 
+-iop3xx_i2c_master_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], 
++iop3xx_i2c_master_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, 
+ 				int num)
+ {
+ 	struct i2c_algo_iop3xx_data *iop3xx_adap = i2c_adap->algo_data;
+--- ./drivers/i2c/i2c-core.c.sav	2005-02-23 10:34:59.000000000 -0800
++++ ./drivers/i2c/i2c-core.c	2005-02-23 10:49:18.000000000 -0800
+@@ -583,7 +583,7 @@
+  * ----------------------------------------------------
+  */
+ 
+-int i2c_transfer(struct i2c_adapter * adap, struct i2c_msg msgs[],int num)
++int i2c_transfer(struct i2c_adapter * adap, struct i2c_msg *msgs, int num)
+ {
+ 	int ret;
+ 
+--- ./drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c.sav	2005-02-23 10:39:53.000000000 -0800
++++ ./drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c	2005-02-23 10:50:07.000000000 -0800
+@@ -252,7 +252,7 @@
+ 	return rcv_len;
+ }
+ 
+-static int master_xfer(struct i2c_adapter* adapter, struct i2c_msg msg[], int num)
++static int master_xfer(struct i2c_adapter* adapter, struct i2c_msg *msg, int num)
+ {
+ 	struct ttusb *ttusb = i2c_get_adapdata(adapter);
+ 	int i = 0;
+--- ./drivers/media/dvb/b2c2/skystar2.c.sav	2005-02-23 10:40:33.000000000 -0800
++++ ./drivers/media/dvb/b2c2/skystar2.c	2005-02-23 10:50:42.000000000 -0800
+@@ -293,7 +293,7 @@
+ 	return buf - start;
+ }
+ 
+-static int master_xfer(struct i2c_adapter* adapter, struct i2c_msg msgs[], int num)
++static int master_xfer(struct i2c_adapter* adapter, struct i2c_msg *msgs, int num)
+ {
+ 	struct adapter *tmp = i2c_get_adapdata(adapter);
+ 	int i, ret = 0;
+--- ./Documentation/i2c/writing-clients.sav	2005-02-23 10:42:00.000000000 -0800
++++ ./Documentation/i2c/writing-clients	2005-02-23 10:42:30.000000000 -0800
+@@ -642,7 +642,7 @@
+ parameter contains the bytes the read/write, the third the length of the
+ buffer. Returned is the actual number of bytes read/written.
+   
+-  extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg msg[],
++  extern int i2c_transfer(struct i2c_adapter *adap, struct i2c_msg *msg,
+                           int num);
+ 
+ This sends a series of messages. Each message can be a read or write,
+--- ./include/media/saa7146.h.sav	2005-02-23 12:01:51.000000000 -0800
++++ ./include/media/saa7146.h	2005-02-23 12:19:38.000000000 -0800
+@@ -157,7 +157,7 @@
+ 
+ /* from saa7146_i2c.c */
+ int saa7146_i2c_adapter_prepare(struct saa7146_dev *dev, struct i2c_adapter *i2c_adapter, u32 bitrate);
+-int saa7146_i2c_transfer(struct saa7146_dev *saa, const struct i2c_msg msgs[], int num,  int retries);
++int saa7146_i2c_transfer(struct saa7146_dev *saa, const struct i2c_msg *msgs, int num,  int retries);
+ 
+ /* from saa7146_core.c */
+ extern struct list_head saa7146_devices;
+--- ./drivers/i2c/busses/i2c-s3c2410.c.sav	2005-02-23 12:03:29.000000000 -0800
++++ ./drivers/i2c/busses/i2c-s3c2410.c	2005-02-23 12:20:31.000000000 -0800
+@@ -483,7 +483,7 @@
+  * this starts an i2c transfer
+ */
+ 
+-static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, struct i2c_msg msgs[], int num)
++static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, struct i2c_msg *msgs, int num)
+ {
+ 	unsigned long timeout;
+ 	int ret;
+@@ -534,7 +534,7 @@
+ */
+ 
+ static int s3c24xx_i2c_xfer(struct i2c_adapter *adap,
+-			struct i2c_msg msgs[], int num)
++			struct i2c_msg *msgs, int num)
+ {
+ 	struct s3c24xx_i2c *i2c = (struct s3c24xx_i2c *)adap->algo_data;
+ 	int retry;
+--- ./drivers/i2c/busses/i2c-mpc.c.sav	2005-02-23 12:04:11.000000000 -0800
++++ ./drivers/i2c/busses/i2c-mpc.c	2005-02-23 12:17:28.000000000 -0800
+@@ -233,7 +233,7 @@
+ 	return length;
+ }
+ 
+-static int mpc_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
++static int mpc_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
+ {
+ 	struct i2c_msg *pmsg;
+ 	int i;
+--- ./drivers/i2c/busses/i2c-ibm_iic.c.sav	2005-02-23 12:04:42.000000000 -0800
++++ ./drivers/i2c/busses/i2c-ibm_iic.c	2005-02-23 12:21:08.000000000 -0800
+@@ -549,7 +549,7 @@
+  * Generic master transfer entrypoint. 
+  * Returns the number of processed messages or error (<0)
+  */
+-static int iic_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)
++static int iic_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
+ {
+     	struct ibm_iic_private* dev = (struct ibm_iic_private*)(i2c_get_adapdata(adap));
+ 	volatile struct iic_regs __iomem *iic = dev->vaddr;
+--- ./drivers/i2c/busses/i2c-keywest.c.sav	2005-02-23 12:05:10.000000000 -0800
++++ ./drivers/i2c/busses/i2c-keywest.c	2005-02-23 12:26:47.000000000 -0800
+@@ -399,7 +399,7 @@
+  */
+ static int
+ keywest_xfer(	struct i2c_adapter *adap,
+-		struct i2c_msg msgs[], 
++		struct i2c_msg *msgs, 
+ 		int num)
+ {
+ 	struct keywest_chan* chan = i2c_get_adapdata(adap);
+--- ./drivers/i2c/busses/i2c-au1550.c.sav	2005-02-23 12:06:00.000000000 -0800
++++ ./drivers/i2c/busses/i2c-au1550.c	2005-02-23 12:27:39.000000000 -0800
+@@ -253,7 +253,7 @@
+ }
+ 
+ static int
+-au1550_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num)
++au1550_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num)
+ {
+ 	struct i2c_au1550_data *adap = i2c_adap->algo_data;
+ 	struct i2c_msg *p;
+--- ./drivers/i2c/algos/i2c-algo-pca.c.sav	2005-02-23 12:06:21.000000000 -0800
++++ ./drivers/i2c/algos/i2c-algo-pca.c	2005-02-23 12:28:09.000000000 -0800
+@@ -178,7 +178,7 @@
+ }
+ 
+ static int pca_xfer(struct i2c_adapter *i2c_adap,
+-                    struct i2c_msg msgs[],
++                    struct i2c_msg *msgs,
+                     int num)
+ {
+         struct i2c_algo_pca_data *adap = i2c_adap->algo_data;
+--- ./drivers/i2c/algos/i2c-algo-pcf.c.sav	2005-02-23 12:07:04.000000000 -0800
++++ ./drivers/i2c/algos/i2c-algo-pcf.c	2005-02-23 12:28:49.000000000 -0800
+@@ -332,7 +332,7 @@
+ }
+ 
+ static int pcf_xfer(struct i2c_adapter *i2c_adap,
+-		    struct i2c_msg msgs[], 
++		    struct i2c_msg *msgs, 
+ 		    int num)
+ {
+ 	struct i2c_algo_pcf_data *adap = i2c_adap->algo_data;
+--- ./drivers/i2c/algos/i2c-algo-ite.c.sav	2005-02-23 12:07:17.000000000 -0800
++++ ./drivers/i2c/algos/i2c-algo-ite.c	2005-02-23 12:29:31.000000000 -0800
+@@ -490,7 +490,7 @@
+  * condition.
+  */
+ #if 0
+-static int iic_combined_transaction(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num) 
++static int iic_combined_transaction(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num) 
+ {
+    int i;
+    struct i2c_msg *pmsg;
+@@ -600,7 +600,7 @@
+  * verify that the bus is not busy or in some unknown state.
+  */
+ static int iic_xfer(struct i2c_adapter *i2c_adap,
+-		    struct i2c_msg msgs[], 
++		    struct i2c_msg *msgs, 
+ 		    int num)
+ {
+ 	struct i2c_algo_iic_data *adap = i2c_adap->algo_data;
+--- ./drivers/i2c/algos/i2c-algo-sgi.c.sav	2005-02-23 12:07:40.000000000 -0800
++++ ./drivers/i2c/algos/i2c-algo-sgi.c	2005-02-23 12:29:58.000000000 -0800
+@@ -131,7 +131,7 @@
+ 	return 0;
+ }
+ 
+-static int sgi_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[],
++static int sgi_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs,
+ 		    int num)
+ {
+ 	struct i2c_algo_sgi_data *adap = i2c_adap->algo_data;
+--- ./drivers/media/video/saa7134/saa7134-i2c.c.sav	2005-02-23 12:08:12.000000000 -0800
++++ ./drivers/media/video/saa7134/saa7134-i2c.c	2005-02-23 12:30:20.000000000 -0800
+@@ -236,7 +236,7 @@
+ }
+ 
+ static int saa7134_i2c_xfer(struct i2c_adapter *i2c_adap,
+-			    struct i2c_msg msgs[], int num)
++			    struct i2c_msg *msgs, int num)
+ {
+ 	struct saa7134_dev *dev = i2c_adap->algo_data;
+ 	enum i2c_status status;
+--- ./drivers/media/video/bttv-i2c.c.sav	2005-02-23 12:08:29.000000000 -0800
++++ ./drivers/media/video/bttv-i2c.c	2005-02-23 12:30:56.000000000 -0800
+@@ -245,7 +245,7 @@
+        	return retval;
+ }
+ 
+-static int bttv_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg msgs[], int num)
++static int bttv_i2c_xfer(struct i2c_adapter *i2c_adap, struct i2c_msg *msgs, int num)
+ {
+ 	struct bttv *btv = i2c_get_adapdata(i2c_adap);
+ 	int retval = 0;
+--- ./drivers/media/dvb/dibusb/dvb-dibusb-fe-i2c.c.sav	2005-02-23 12:09:43.000000000 -0800
++++ ./drivers/media/dvb/dibusb/dvb-dibusb-fe-i2c.c	2005-02-23 12:31:38.000000000 -0800
+@@ -38,7 +38,7 @@
+ /*
+  * I2C master xfer function
+  */
+-static int dibusb_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg msg[],int num)
++static int dibusb_i2c_xfer(struct i2c_adapter *adap,struct i2c_msg *msg,int num)
+ {
+ 	struct usb_dibusb *dib = i2c_get_adapdata(adap);
+ 	int i;
+--- ./drivers/media/common/saa7146_i2c.c.sav	2005-02-23 12:10:06.000000000 -0800
++++ ./drivers/media/common/saa7146_i2c.c	2005-02-23 12:32:45.000000000 -0800
+@@ -25,7 +25,7 @@
+    sent through the saa7146. have a look at the specifications p. 122 ff 
+    to understand this. it returns the number of u32s to send, or -1
+    in case of an error. */
+-static int saa7146_i2c_msg_prepare(const struct i2c_msg m[], int num, u32 *op)
++static int saa7146_i2c_msg_prepare(const struct i2c_msg *m, int num, u32 *op)
+ {
+ 	int h1, h2;
+ 	int i, j, addr;
+@@ -89,7 +89,7 @@
+    which bytes were read through the adapter and write them back to the corresponding
+    i2c-message. but instead, we simply write back all bytes.
+    fixme: this could be improved. */
+-static int saa7146_i2c_msg_cleanup(const struct i2c_msg m[], int num, u32 *op)
++static int saa7146_i2c_msg_cleanup(const struct i2c_msg *m, int num, u32 *op)
+ {
+ 	int i, j;
+ 	int op_count = 0;
+@@ -272,7 +272,7 @@
+ 	return 0;
+ }
+ 
+-int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg msgs[], int num, int retries)
++int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *msgs, int num, int retries)
+ {
+ 	int i = 0, count = 0;
+ 	u32* buffer = dev->d_i2c.cpu_addr;
+@@ -372,7 +372,7 @@
+ }
+ 
+ /* utility functions */
+-static int saa7146_i2c_xfer(struct i2c_adapter* adapter, struct i2c_msg msg[], int num)
++static int saa7146_i2c_xfer(struct i2c_adapter* adapter, struct i2c_msg *msg, int num)
+ {
+ 	struct saa7146_dev* dev = i2c_get_adapdata(adapter);
+ 	
+
Index: patches/linux-2.6.11-rc4-enable_dvico_dvb.patch
===================================================================
--- patches/linux-2.6.11-rc4-enable_dvico_dvb.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/linux-2.6.11-rc4-enable_dvico_dvb.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,104 @@
+diff -ru linux-2.6.11-rc4.clean/drivers/media/video/cx88/cx88-cards.c linux-2.6.11-rc4/drivers/media/video/cx88/cx88-cards.c
+--- linux-2.6.11-rc4.clean/drivers/media/video/cx88/cx88-cards.c	2005-02-13 13:07:18.000000000 +1000
++++ linux-2.6.11-rc4/drivers/media/video/cx88/cx88-cards.c	2005-02-15 08:15:47.000000000 +1000
+@@ -27,7 +27,12 @@
+ #include <linux/delay.h>
+ 
+ #if defined(CONFIG_VIDEO_CX88_DVB) || defined(CONFIG_VIDEO_CX88_DVB_MODULE)
+-# define WITH_DVB 1
++/*
++ * The Hauppauge and Conexant CX22702 based DVB-only cards enabled by this 
++ * are currently broken.
++ *
++ * # define WITH_DVB 1
++ */
+ #endif
+ 
+ #include "cx88.h"
+@@ -840,12 +845,14 @@
+ 		leadtek_eeprom(core,eeprom);
+ 		break;
+ 	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:
+-		/* Tuner reset is hooked to  the tuner out of reset */
++	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS:
++		/* GPIO0:0 is hooked to mt352 reset pin */
+ 		cx_set(MO_GP0_IO, 0x00000101);
+ 		cx_clear(MO_GP0_IO, 0x00000001);
+ 		msleep(1);
+ 		cx_set(MO_GP0_IO, 0x00000101);
+ 		break;
++#if 0
+ #ifdef WITH_DVB
+ 	case CX88_BOARD_HAUPPAUGE_DVB_T1:
+ 		if (0 == core->i2c_rc)
+@@ -858,6 +865,13 @@
+ 		core->demod_addr = 0x43;
+ 		break;
+ #endif
++#else
++	case CX88_BOARD_HAUPPAUGE_DVB_T1:
++	case CX88_BOARD_CONEXANT_DVB_T1:
++		printk(KERN_NOTICE "Hauppauge and Conexant DVB-T cards not supported "
++		       "in this release\n");
++		break;
++#endif
+ 	}
+ 	if (cx88_boards[core->board].radio.type == CX88_RADIO)
+ 		core->has_radio = 1;
+diff -ru linux-2.6.11-rc4.clean/drivers/media/video/cx88/cx88-dvb.c linux-2.6.11-rc4/drivers/media/video/cx88/cx88-dvb.c
+--- linux-2.6.11-rc4.clean/drivers/media/video/cx88/cx88-dvb.c	2005-02-13 13:06:55.000000000 +1000
++++ linux-2.6.11-rc4/drivers/media/video/cx88/cx88-dvb.c	2005-02-15 08:10:48.000000000 +1000
+@@ -187,10 +187,15 @@
+ 	switch (dev->core->board) {
+ 	case CX88_BOARD_HAUPPAUGE_DVB_T1:
+ 	case CX88_BOARD_CONEXANT_DVB_T1:
++#if 0
+ 		dev->dvb.frontend = cx22702_create(&dev->core->i2c_adap,
+ 						   dev->core->pll_addr,
+ 						   dev->core->pll_type,
+ 						   dev->core->demod_addr);
++#else
++		printk(KERN_NOTICE "Hauppauge and Conexant DVB-T cards not supported "
++		       "in this release\n");
++#endif
+ 		break;
+ 	case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:
+ 		dev->dvb.frontend = mt352_attach(&dvico_fusionhdtv_dvbt1,
+@@ -222,7 +227,7 @@
+ 		sizeof(dev->dvb.frontend->ops->info.name));
+ 
+ 	/* register everything */
+-	return videobuf_dvb_register(&dev->dvb);
++	return videobuf_dvb_register(&dev->dvb, THIS_MODULE, dev);
+ }
+ 
+ /* ----------------------------------------------------------- */
+diff -ru linux-2.6.11-rc4.clean/drivers/media/video/Kconfig linux-2.6.11-rc4/drivers/media/video/Kconfig
+--- linux-2.6.11-rc4.clean/drivers/media/video/Kconfig	2005-02-13 13:07:40.000000000 +1000
++++ linux-2.6.11-rc4/drivers/media/video/Kconfig	2005-02-15 08:20:46.000000000 +1000
+@@ -305,7 +305,7 @@
+ 
+ config VIDEO_CX88
+ 	tristate "Conexant 2388x (bt878 successor) support"
+-	depends on VIDEO_DEV && PCI && EXPERIMENTAL
++	depends on VIDEO_DEV && PCI && I2C && EXPERIMENTAL
+ 	select I2C_ALGOBIT
+ 	select VIDEO_BTCX
+ 	select VIDEO_BUF
+@@ -319,12 +319,15 @@
+ 
+ config VIDEO_CX88_DVB
+ 	tristate "DVB Support for cx2388x based TV cards"
+-	depends on VIDEO_CX88 && DVB_CORE && BROKEN
++	depends on VIDEO_CX88 && DVB_CORE
+ 	select VIDEO_BUF_DVB
++	select DVB_MT352
+ 	---help---
+ 	  This adds support for DVB cards based on the
+ 	  Connexant 2388x chip.
+ 
++	  As of this release only the DVICO DVB-T cards are supported.
++
+ config VIDEO_OVCAMCHIP
+ 	tristate "OmniVision Camera Chip support"
+ 	depends on VIDEO_DEV && I2C
Index: tches/linux-2.6.24.7-alpha_PAGE_SIZE-2.patch
===================================================================
--- patches/linux-2.6.24.7-alpha_PAGE_SIZE-2.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,36 +1,0 @@
-Submitted By: Joe Ciccone <jciccone@gmail.com>
-Date: 2008-02-03
-Rediffed and changed on 2008-07-13
-Initial Package Version: 2.6.23
-Upstream Status: Not Submitted
-Origin: Joe Ciccone
-Description: Define PAGE_SIZE outside of ifdef __KERNEL__ so it's not removed
-             when the headers are sanatized.
-             We also need the linux/const.h for _AC
-
-diff -Naur linux-2.6.24.7.orig/include/asm-alpha/page.h linux-2.6.24.7/include/asm-alpha/page.h
---- linux-2.6.24.7.orig/include/asm-alpha/page.h	2008-05-06 19:22:34.000000000 -0400
-+++ linux-2.6.24.7/include/asm-alpha/page.h	2008-07-13 18:24:31.000000000 -0400
-@@ -1,15 +1,16 @@
- #ifndef _ALPHA_PAGE_H
- #define _ALPHA_PAGE_H
- 
--#ifdef __KERNEL__
--
- #include <linux/const.h>
--#include <asm/pal.h>
- 
- /* PAGE_SHIFT determines the page size */
--#define PAGE_SHIFT	13
--#define PAGE_SIZE	(_AC(1,UL) << PAGE_SHIFT)
--#define PAGE_MASK	(~(PAGE_SIZE-1))
-+#define PAGE_SHIFT      13
-+#define PAGE_SIZE       (_AC(1,UL) << PAGE_SHIFT)
-+#define PAGE_MASK       (~(PAGE_SIZE-1))
-+
-+#ifdef __KERNEL__
-+
-+#include <asm/pal.h>
- 
- #ifndef __ASSEMBLY__
- 
Index: tches/linux-2.6.24.7-elf_spitfire_fix-1.patch
===================================================================
--- patches/linux-2.6.24.7-elf_spitfire_fix-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,33 +1,0 @@
-Submitted By: Joe Ciccone <jciccone@gmail.com>
-Date: 2008-02-03
-Initial Package Version: 2.6.24
-Upstream Status: Not Submitted
-Origin: Joe Ciccone
-Description: Ensure that spitfire.h is available for asm-sparc64/elf.h and
-             ensure that the same header also includes spitfire.h out of
-             kernel space.
-
-diff -Naur linux-2.6.24.orig/include/asm-sparc64/elf.h linux-2.6.24/include/asm-sparc64/elf.h
---- linux-2.6.24.orig/include/asm-sparc64/elf.h	2008-01-24 17:58:37.000000000 -0500
-+++ linux-2.6.24/include/asm-sparc64/elf.h	2008-02-03 12:35:17.000000000 -0500
-@@ -10,8 +10,8 @@
- #ifdef __KERNEL__
- #include <asm/processor.h>
- #include <asm/uaccess.h>
--#include <asm/spitfire.h>
- #endif
-+#include <asm/spitfire.h>
- 
- /*
-  * Sparc section types
-diff -Naur linux-2.6.24.orig/include/asm-sparc64/Kbuild linux-2.6.24/include/asm-sparc64/Kbuild
---- linux-2.6.24.orig/include/asm-sparc64/Kbuild	2008-01-24 17:58:37.000000000 -0500
-+++ linux-2.6.24/include/asm-sparc64/Kbuild	2008-02-03 12:35:17.000000000 -0500
-@@ -16,6 +16,7 @@
- header-y += psrcompat.h
- header-y += pstate.h
- header-y += reg.h
-+header-y += spitfire.h
- header-y += uctx.h
- header-y += utrap.h
- header-y += watchdog.h
Index: tches/linux-2.6.24.7-security_fixes-1.patch
===================================================================
--- patches/linux-2.6.24.7-security_fixes-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,505 +1,0 @@
-Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
-Date: 2008-06-17
-Initial Package Version: 2.6.24.7
-Upstream Status: Merged
-Origin: Debian
-Description: 2.6.24 is no longer maintained by -stable.  These patches from
-debian (some are straight git pulls from upstream, others are backports)
-fix the following: CVE-2008-{1615,1673,2136,2137,2148}.
-
- fixes CVE-2008-1673
- Subject: asn1: additional sanity checking during BER decoding
- X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=ddb2c43594f22843e9f3153da151deaba1a834c5
- 
- asn1: additional sanity checking during BER decoding
- 
- - Don't trust a length which is greater than the working buffer.
-   An invalid length could cause overflow when calculating buffer size
-   for decoding oid.
- 
- - An oid length of zero is invalid and allows for an off-by-one error when
-   decoding oid because the first subid actually encodes first 2 subids.
- 
- - A primitive encoding may not have an indefinite length.
- 
- Thanks to Wei Wang from McAfee for report.
- 
- Cc: Steven French <sfrench@us.ibm.com>
- Cc: stable@kernel.org
- Acked-by: Patrick McHardy <kaber@trash.net>
- Signed-off-by: Chris Wright <chrisw@sous-sol.org>
- Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
- ---
-
-diff --git a/fs/cifs/asn1.c b/fs/cifs/asn1.c
-index cb52cbb..f58e41d 100644
---- a/fs/cifs/asn1.c
-+++ b/fs/cifs/asn1.c
-@@ -186,6 +186,11 @@ asn1_length_decode(struct asn1_ctx *ctx, unsigned int *def, unsigned int *len)
- 			}
- 		}
- 	}
-+
-+	/* don't trust len bigger than ctx buffer */
-+	if (*len > ctx->end - ctx->pointer)
-+		return 0;
-+
- 	return 1;
- }
- 
-@@ -203,6 +208,10 @@ asn1_header_decode(struct asn1_ctx *ctx,
- 	if (!asn1_length_decode(ctx, &def, &len))
- 		return 0;
- 
-+	/* primitive shall be definite, indefinite shall be constructed */
-+	if (*con == ASN1_PRI && !def)
-+		return 0;
-+
- 	if (def)
- 		*eoc = ctx->pointer + len;
- 	else
-@@ -389,6 +398,11 @@ asn1_oid_decode(struct asn1_ctx *ctx,
- 	unsigned long *optr;
- 
- 	size = eoc - ctx->pointer + 1;
-+
-+	/* first subid actually encodes first two subids */
-+	if (size < 2 || size > ULONG_MAX/sizeof(unsigned long))
-+		return 0;
-+
- 	*oid = kmalloc(size * sizeof(unsigned long), GFP_ATOMIC);
- 	if (*oid == NULL)
- 		return 0;
-diff --git a/net/ipv4/netfilter/nf_nat_snmp_basic.c b/net/ipv4/netfilter/nf_nat_snmp_basic.c
-index 5daefad..7750c97 100644
---- a/net/ipv4/netfilter/nf_nat_snmp_basic.c
-+++ b/net/ipv4/netfilter/nf_nat_snmp_basic.c
-@@ -232,6 +232,11 @@ static unsigned char asn1_length_decode(struct asn1_ctx *ctx,
- 			}
- 		}
- 	}
-+
-+	/* don't trust len bigger than ctx buffer */
-+	if (*len > ctx->end - ctx->pointer)
-+		return 0;
-+
- 	return 1;
- }
- 
-@@ -250,6 +255,10 @@ static unsigned char asn1_header_decode(struct asn1_ctx *ctx,
- 	if (!asn1_length_decode(ctx, &def, &len))
- 		return 0;
- 
-+	/* primitive shall be definite, indefinite shall be constructed */
-+	if (*con == ASN1_PRI && !def)
-+		return 0;
-+
- 	if (def)
- 		*eoc = ctx->pointer + len;
- 	else
-@@ -434,6 +443,11 @@ static unsigned char asn1_oid_decode(struct asn1_ctx *ctx,
- 	unsigned long *optr;
- 
- 	size = eoc - ctx->pointer + 1;
-+
-+	/* first subid actually encodes first two subids */
-+	if (size < 2 || size > ULONG_MAX/sizeof(unsigned long))
-+		return 0;
-+
- 	*oid = kmalloc(size * sizeof(unsigned long), GFP_ATOMIC);
- 	if (*oid == NULL) {
- 		if (net_ratelimit())
-
-
- fixes local ptrace dos on x86_64, CVE-2008-1615
- from debian's 2.6.24, backported by dann frazier
-diff -urpN linux-source-2.6.24.orig/arch/x86/kernel/entry_64.S linux-source-2.6.24/arch/x86/kernel/entry_64.S
---- linux-source-2.6.24.orig/arch/x86/kernel/entry_64.S	2008-01-24 15:58:37.000000000 -0700
-+++ linux-source-2.6.24/arch/x86/kernel/entry_64.S	2008-06-03 01:26:47.000000000 -0600
-@@ -779,7 +779,7 @@ paranoid_swapgs\trace:
- 	swapgs
- paranoid_restore\trace:
- 	RESTORE_ALL 8
--	iretq
-+	jmp iret_label
- paranoid_userspace\trace:
- 	GET_THREAD_INFO(%rcx)
- 	movl threadinfo_flags(%rcx),%ebx
-
- fix ipv6 over ipv4 remotely triggerable memory leak, CVE-2008-2136
- commit 36ca34cc3b8335eb1fe8bd9a1d0a2592980c3f02
- Author: David S. Miller <davem@davemloft.net>
- Date:   Thu May 8 23:40:26 2008 -0700
- 
-     sit: Add missing kfree_skb() on pskb_may_pull() failure.
-     
-     Noticed by Paul Marks <paul@pmarks.net>.
-     
-     Signed-off-by: David S. Miller <davem@davemloft.net>
- 
- Adjusted to apply to Debian's 2.6.24 by dann frazier <dannf@debian.org>
-
-diff -urpN linux-source-2.6.24.orig/net/ipv6/sit.c linux-source-2.6.24/net/ipv6/sit.c
---- linux-source-2.6.24.orig/net/ipv6/sit.c	2008-01-24 15:58:37.000000000 -0700
-+++ linux-source-2.6.24/net/ipv6/sit.c	2008-05-21 00:00:08.000000000 -0600
-@@ -395,9 +395,9 @@ static int ipip6_rcv(struct sk_buff *skb
- 	}
- 
- 	icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
--	kfree_skb(skb);
- 	read_unlock(&ipip6_lock);
- out:
-+	kfree_skb(skb);
- 	return 0;
- }
- 
-
-  * [sparc] Validate address ranges regardless of MAP_FIXED (CVE-2008-2137)
- commit 94d149c34cda933ff5096aca94bb23bf68602f4e
- Author: David S. Miller <davem@davemloft.net>
- Date:   Mon May 12 16:33:33 2008 -0700
- 
-     sparc: Fix mremap address range validation.
-     
-     Just like mmap, we need to validate address ranges regardless
-     of MAP_FIXED.
-     
-     sparc{,64}_mmap_check()'s flag argument is unused, remove.
-     
-     Based upon a report and preliminary patch by
-     Jan Lieskovsky <jlieskov@redhat.com>
-     
-     Signed-off-by: David S. Miller <davem@davemloft.net>
-
-diff --git a/arch/sparc/kernel/sys_sparc.c b/arch/sparc/kernel/sys_sparc.c
-index e995491..3c6b49a 100644
---- a/arch/sparc/kernel/sys_sparc.c
-+++ b/arch/sparc/kernel/sys_sparc.c
-@@ -219,7 +219,7 @@ out:
- 	return err;
- }
- 
--int sparc_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
-+int sparc_mmap_check(unsigned long addr, unsigned long len)
- {
- 	if (ARCH_SUN4C_SUN4 &&
- 	    (len > 0x20000000 ||
-@@ -295,52 +295,14 @@ asmlinkage unsigned long sparc_mremap(unsigned long addr,
- 	unsigned long old_len, unsigned long new_len,
- 	unsigned long flags, unsigned long new_addr)
- {
--	struct vm_area_struct *vma;
- 	unsigned long ret = -EINVAL;
--	if (ARCH_SUN4C_SUN4) {
--		if (old_len > 0x20000000 || new_len > 0x20000000)
--			goto out;
--		if (addr < 0xe0000000 && addr + old_len > 0x20000000)
--			goto out;
--	}
--	if (old_len > TASK_SIZE - PAGE_SIZE ||
--	    new_len > TASK_SIZE - PAGE_SIZE)
-+
-+	if (unlikely(sparc_mmap_check(addr, old_len)))
-+		goto out;
-+	if (unlikely(sparc_mmap_check(new_addr, new_len)))
- 		goto out;
- 	down_write(&current->mm->mmap_sem);
--	if (flags & MREMAP_FIXED) {
--		if (ARCH_SUN4C_SUN4 &&
--		    new_addr < 0xe0000000 &&
--		    new_addr + new_len > 0x20000000)
--			goto out_sem;
--		if (new_addr + new_len > TASK_SIZE - PAGE_SIZE)
--			goto out_sem;
--	} else if ((ARCH_SUN4C_SUN4 && addr < 0xe0000000 &&
--		    addr + new_len > 0x20000000) ||
--		   addr + new_len > TASK_SIZE - PAGE_SIZE) {
--		unsigned long map_flags = 0;
--		struct file *file = NULL;
--
--		ret = -ENOMEM;
--		if (!(flags & MREMAP_MAYMOVE))
--			goto out_sem;
--
--		vma = find_vma(current->mm, addr);
--		if (vma) {
--			if (vma->vm_flags & VM_SHARED)
--				map_flags |= MAP_SHARED;
--			file = vma->vm_file;
--		}
--
--		new_addr = get_unmapped_area(file, addr, new_len,
--				     vma ? vma->vm_pgoff : 0,
--				     map_flags);
--		ret = new_addr;
--		if (new_addr & ~PAGE_MASK)
--			goto out_sem;
--		flags |= MREMAP_FIXED;
--	}
- 	ret = do_mremap(addr, old_len, new_len, flags, new_addr);
--out_sem:
- 	up_write(&current->mm->mmap_sem);
- out:
- 	return ret;       
-diff --git a/arch/sparc64/kernel/sys_sparc.c b/arch/sparc64/kernel/sys_sparc.c
-index 0dbc941..ac1bff5 100644
---- a/arch/sparc64/kernel/sys_sparc.c
-+++ b/arch/sparc64/kernel/sys_sparc.c
-@@ -542,8 +542,7 @@ asmlinkage long sparc64_personality(unsigned long personality)
- 	return ret;
- }
- 
--int sparc64_mmap_check(unsigned long addr, unsigned long len,
--		unsigned long flags)
-+int sparc64_mmap_check(unsigned long addr, unsigned long len)
- {
- 	if (test_thread_flag(TIF_32BIT)) {
- 		if (len >= STACK_TOP32)
-@@ -609,46 +608,19 @@ asmlinkage unsigned long sys64_mremap(unsigned long addr,
- 	unsigned long old_len, unsigned long new_len,
- 	unsigned long flags, unsigned long new_addr)
- {
--	struct vm_area_struct *vma;
- 	unsigned long ret = -EINVAL;
- 
- 	if (test_thread_flag(TIF_32BIT))
- 		goto out;
- 	if (unlikely(new_len >= VA_EXCLUDE_START))
- 		goto out;
--	if (unlikely(invalid_64bit_range(addr, old_len)))
-+	if (unlikely(sparc64_mmap_check(addr, old_len)))
-+		goto out;
-+	if (unlikely(sparc64_mmap_check(new_addr, new_len)))
- 		goto out;
- 
- 	down_write(&current->mm->mmap_sem);
--	if (flags & MREMAP_FIXED) {
--		if (invalid_64bit_range(new_addr, new_len))
--			goto out_sem;
--	} else if (invalid_64bit_range(addr, new_len)) {
--		unsigned long map_flags = 0;
--		struct file *file = NULL;
--
--		ret = -ENOMEM;
--		if (!(flags & MREMAP_MAYMOVE))
--			goto out_sem;
--
--		vma = find_vma(current->mm, addr);
--		if (vma) {
--			if (vma->vm_flags & VM_SHARED)
--				map_flags |= MAP_SHARED;
--			file = vma->vm_file;
--		}
--
--		/* MREMAP_FIXED checked above. */
--		new_addr = get_unmapped_area(file, addr, new_len,
--				    vma ? vma->vm_pgoff : 0,
--				    map_flags);
--		ret = new_addr;
--		if (new_addr & ~PAGE_MASK)
--			goto out_sem;
--		flags |= MREMAP_FIXED;
--	}
- 	ret = do_mremap(addr, old_len, new_len, flags, new_addr);
--out_sem:
- 	up_write(&current->mm->mmap_sem);
- out:
- 	return ret;       
-diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c
-index 1aa4288..ba5bd62 100644
---- a/arch/sparc64/kernel/sys_sparc32.c
-+++ b/arch/sparc64/kernel/sys_sparc32.c
-@@ -867,44 +867,15 @@ asmlinkage unsigned long sys32_mremap(unsigned long addr,
- 	unsigned long old_len, unsigned long new_len,
- 	unsigned long flags, u32 __new_addr)
- {
--	struct vm_area_struct *vma;
- 	unsigned long ret = -EINVAL;
- 	unsigned long new_addr = __new_addr;
- 
--	if (old_len > STACK_TOP32 || new_len > STACK_TOP32)
-+	if (unlikely(sparc64_mmap_check(addr, old_len)))
- 		goto out;
--	if (addr > STACK_TOP32 - old_len)
-+	if (unlikely(sparc64_mmap_check(new_addr, new_len)))
- 		goto out;
- 	down_write(&current->mm->mmap_sem);
--	if (flags & MREMAP_FIXED) {
--		if (new_addr > STACK_TOP32 - new_len)
--			goto out_sem;
--	} else if (addr > STACK_TOP32 - new_len) {
--		unsigned long map_flags = 0;
--		struct file *file = NULL;
--
--		ret = -ENOMEM;
--		if (!(flags & MREMAP_MAYMOVE))
--			goto out_sem;
--
--		vma = find_vma(current->mm, addr);
--		if (vma) {
--			if (vma->vm_flags & VM_SHARED)
--				map_flags |= MAP_SHARED;
--			file = vma->vm_file;
--		}
--
--		/* MREMAP_FIXED checked above. */
--		new_addr = get_unmapped_area(file, addr, new_len,
--				    vma ? vma->vm_pgoff : 0,
--				    map_flags);
--		ret = new_addr;
--		if (new_addr & ~PAGE_MASK)
--			goto out_sem;
--		flags |= MREMAP_FIXED;
--	}
- 	ret = do_mremap(addr, old_len, new_len, flags, new_addr);
--out_sem:
- 	up_write(&current->mm->mmap_sem);
- out:
- 	return ret;       
-diff --git a/include/asm-sparc/mman.h b/include/asm-sparc/mman.h
-index e18be98..3d16b40 100644
---- a/include/asm-sparc/mman.h
-+++ b/include/asm-sparc/mman.h
-@@ -24,9 +24,8 @@
- 
- #ifdef __KERNEL__
- #ifndef __ASSEMBLY__
--#define arch_mmap_check	sparc_mmap_check
--int sparc_mmap_check(unsigned long addr, unsigned long len,
--		unsigned long flags);
-+#define arch_mmap_check(addr,len,flags)	sparc_mmap_check(addr,len)
-+int sparc_mmap_check(unsigned long addr, unsigned long len);
- #endif
- #endif
- 
-diff --git a/include/asm-sparc64/mman.h b/include/asm-sparc64/mman.h
-index e584563..625be4d 100644
---- a/include/asm-sparc64/mman.h
-+++ b/include/asm-sparc64/mman.h
-@@ -24,9 +24,8 @@
- 
- #ifdef __KERNEL__
- #ifndef __ASSEMBLY__
--#define arch_mmap_check	sparc64_mmap_check
--int sparc64_mmap_check(unsigned long addr, unsigned long len,
--		unsigned long flags);
-+#define arch_mmap_check(addr,len,flags)	sparc64_mmap_check(addr,len)
-+int sparc64_mmap_check(unsigned long addr, unsigned long len);
- #endif
- #endif
- 
-
-  a second part for this
- commit 5816339310b2d9623cf413d33e538b45e815da5d
- Author: David S. Miller <davem@davemloft.net>
- Date:   Wed May 7 02:24:28 2008 -0700
- 
-     sparc: Fix mmap VA span checking.
-     
-     We should not conditionalize VA range checks on MAP_FIXED.
-     
-     Signed-off-by: David S. Miller <davem@davemloft.net>
-
-diff --git a/arch/sparc/kernel/sys_sparc.c b/arch/sparc/kernel/sys_sparc.c
-index f188b5d..e995491 100644
---- a/arch/sparc/kernel/sys_sparc.c
-+++ b/arch/sparc/kernel/sys_sparc.c
-@@ -223,8 +223,7 @@ int sparc_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
- {
- 	if (ARCH_SUN4C_SUN4 &&
- 	    (len > 0x20000000 ||
--	     ((flags & MAP_FIXED) &&
--	      addr < 0xe0000000 && addr + len > 0x20000000)))
-+	     (addr < 0xe0000000 && addr + len > 0x20000000)))
- 		return -EINVAL;
- 
- 	/* See asm-sparc/uaccess.h */
-diff --git a/arch/sparc64/kernel/sys_sparc.c b/arch/sparc64/kernel/sys_sparc.c
-index 8d4761f..0dbc941 100644
---- a/arch/sparc64/kernel/sys_sparc.c
-+++ b/arch/sparc64/kernel/sys_sparc.c
-@@ -549,13 +549,13 @@ int sparc64_mmap_check(unsigned long addr, unsigned long len,
- 		if (len >= STACK_TOP32)
- 			return -EINVAL;
- 
--		if ((flags & MAP_FIXED) && addr > STACK_TOP32 - len)
-+		if (addr > STACK_TOP32 - len)
- 			return -EINVAL;
- 	} else {
- 		if (len >= VA_EXCLUDE_START)
- 			return -EINVAL;
- 
--		if ((flags & MAP_FIXED) && invalid_64bit_range(addr, len))
-+		if (invalid_64bit_range(addr, len))
- 			return -EINVAL;
- 	}
- 
-
- fix CVE-2008-2148 (prevent local users modifying file times without permission)
- commit 02c6be615f1fcd37ac5ed93a3ad6692ad8991cd9
- Author: Miklos Szeredi <mszeredi@suse.cz>
- Date:   Thu May 1 04:34:45 2008 -0700
- 
-     vfs: fix permission checking in sys_utimensat
-     
-     If utimensat() is called with both times set to UTIME_NOW or one of them to
-     UTIME_NOW and the other to UTIME_OMIT, then it will update the file time
-     without any permission checking.
-     
-     I don't think this can be used for anything other than a local DoS, but could
-     be quite bewildering at that (e.g.  "Why was that large source tree rebuilt
-     when I didn't modify anything???")
-     
-     This affects all kernels from 2.6.22, when the utimensat() syscall was
-     introduced.
-     
-     Fix by doing the same permission checking as for the "times == NULL" case.
-     
-     Thanks to Michael Kerrisk, whose utimensat-non-conformances-and-fixes.patch in
-     -mm also fixes this (and breaks other stuff), only he didn't realize the
-     security implications of this bug.
-     
-     Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
-     Cc: Ulrich Drepper <drepper@redhat.com>
-     Cc: Michael Kerrisk <mtk-manpages@gmx.net>
-     Cc: <stable@kernel.org>
-     Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-     Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-
-diff --git a/fs/utimes.c b/fs/utimes.c
-index a2bef77..af059d5 100644
---- a/fs/utimes.c
-+++ b/fs/utimes.c
-@@ -40,9 +40,14 @@ asmlinkage long sys_utime(char __user *filename, struct utimbuf __user *times)
- 
- #endif
- 
-+static bool nsec_special(long nsec)
-+{
-+	return nsec == UTIME_OMIT || nsec == UTIME_NOW;
-+}
-+
- static bool nsec_valid(long nsec)
- {
--	if (nsec == UTIME_OMIT || nsec == UTIME_NOW)
-+	if (nsec_special(nsec))
- 		return true;
- 
- 	return nsec >= 0 && nsec <= 999999999;
-@@ -119,7 +124,15 @@ long do_utimes(int dfd, char __user *filename, struct timespec *times, int flags
- 			newattrs.ia_mtime.tv_nsec = times[1].tv_nsec;
- 			newattrs.ia_valid |= ATTR_MTIME_SET;
- 		}
--	} else {
-+	}
-+
-+	/*
-+	 * If times is NULL or both times are either UTIME_OMIT or
-+	 * UTIME_NOW, then need to check permissions, because
-+	 * inode_change_ok() won't do it.
-+	 */
-+	if (!times || (nsec_special(times[0].tv_nsec) &&
-+		       nsec_special(times[1].tv_nsec))) {
- 		error = -EACCES;
-                 if (IS_IMMUTABLE(inode))
- 			goto mnt_drop_write_and_out;
Index: patches/linux-2.6.6-x86_64-unistd_h-fix.patch
===================================================================
--- patches/linux-2.6.6-x86_64-unistd_h-fix.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/linux-2.6.6-x86_64-unistd_h-fix.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,30 @@
+Submitted by: Ryan Oliver <ryan.oliver@pha.com.au>
+Date: 2004-05-10
+Initial Package Version: 2.6.4
+Origin: http://www.x86-64.org/lists/discuss/msg04963.html
+Description: Fixes issues with glibc compilation for x86_64
+             due to changes made in asm-x86_64/unistd.h between 
+             kernel 2.6.3 and 2.6.4, for full description check
+             the URL listed above.
+             Patch here taken against linux-2.6.6
+
+--- linux-2.6.6-ORIG/include/asm-x86_64/unistd.h	2004-05-10 13:32:17.000000000 +1000
++++ linux-2.6.6/include/asm-x86_64/unistd.h	2004-05-10 13:38:43.000000000 +1000
+@@ -731,7 +731,7 @@
+ 
+ #endif /* __KERNEL_SYSCALLS__ */
+ 
+-#ifndef __ASSEMBLY__
++#if ((!defined  __ASSEMBLY__) && (defined __KERNEL__))
+ 
+ #include <linux/linkage.h>
+ #include <linux/compiler.h>
+@@ -748,7 +748,7 @@
+ 				struct sigaction __user *oact,
+ 				size_t sigsetsize);
+ 
+-#endif	/* __ASSEMBLY__ */
++#endif	/* ((!defined __ASSEMBLY__) && (defined __KERNEL__) */
+ 
+ #endif /* __NO_STUBS */
+ 
Index: patches/m4-1.4-regex_c-hack.patch
===================================================================
--- patches/m4-1.4-regex_c-hack.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/m4-1.4-regex_c-hack.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,17 @@
+diff -uNr m4-1.4-orig/lib/regex.c m4-1.4/lib/regex.c
+--- m4-1.4-orig/lib/regex.c	1994-10-27 08:43:45.000000000 +1000
++++ m4-1.4/lib/regex.c	2004-06-22 21:52:42.000000000 +1000
+@@ -46,13 +46,7 @@
+ 
+ #else  /* not emacs */
+ 
+-#ifdef STDC_HEADERS
+ #include <stdlib.h>
+-#else
+-char *malloc ();
+-char *realloc ();
+-#endif
+-
+ 
+ /* We used to test for `BSTRING' here, but only GCC and Emacs define
+    `BSTRING', as far as I know, and neither of them use this code.  */
Index: tches/mktemp-1.5-add_tempfile-3.patch
===================================================================
--- patches/mktemp-1.5-add_tempfile-3.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,111 +1,0 @@
-Submitted By: Tushar Teredesai <tushar@linuxfromscratch.org>
-Date: 2005-07-25
-Initial Package Version: 1.5
-Upstream Status: Sent, no response yet.
-Origin: http://archive.linuxfromscratch.org/mail-archives/lfs-dev/2003-April/033602.html
-        http://archive.linuxfromscratch.org/mail-archives/lfs-dev/2003-June/035234.html
-		http://linuxfromscratch.org/pipermail/lfs-dev/2005-June/051908.html
-Description: Add tempfile wrapper script. Use "make install-tempfile" to install it.
-
-diff -Naur mktemp-1.5.orig/Makefile.in mktemp-1.5/Makefile.in
---- mktemp-1.5.orig/Makefile.in	2003-03-23 18:09:56.000000000 -0700
-+++ mktemp-1.5/Makefile.in	2005-07-25 11:11:11.000000000 -0600
-@@ -113,6 +113,9 @@
- install-man:
- 	$(INSTALL) -m 0444 $(srcdir)/$(PROG).$(mantype) $(mandir)/man1/$(PROG).1
- 
-+install-tempfile: $(srcdir)/tempfile
-+	$(INSTALL) -m 0555 $(srcdir)/tempfile $(bindir)/tempfile
-+
- check:
- 	@echo nothing to check
- 
-diff -Naur mktemp-1.5.orig/tempfile mktemp-1.5/tempfile
---- mktemp-1.5.orig/tempfile	1969-12-31 17:00:00.000000000 -0700
-+++ mktemp-1.5/tempfile	2005-07-25 11:13:41.000000000 -0600
-@@ -0,0 +1,85 @@
-+#!/bin/bash
-+# A tempfile wrapper for mktemp
-+# Note: If you can, avoid using tempfile and use mktemp instead.
-+#       This wrapper is provided for compatibility since some scripts use
-+#       tempfile. If possible, the best solution is to patch the scripts
-+#       to use mktemp.
-+#
-+# Copyright (c) Tushar Teredesai <tush@yahoo.com>
-+#
-+# Permission to use, copy, modify, and distribute this software for any
-+# purpose with or without fee is hereby granted, provided that the above
-+# copyright notice and this permission notice appear in all copies.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+#
-+
-+# Usage info
-+usage()
-+{
-+	echo "Usage: tempfile [OPTION]"
-+	echo
-+	echo "Create a temporary file in a safe manner."
-+	echo "This version is a wrapper that invokes mktemp."
-+	echo "NOTE: Do not use tempfile in your scripts."
-+	echo "      Use mktemp instead."
-+	echo
-+	echo "[-d|--directory] DIR -> place temporary file in DIR"
-+	echo "[-p|--prefix] PREFIX -> ignored"
-+	echo "[-s|--suffix] SUFFIX -> ignored"
-+	echo "[-n|--name] NAME -> ignored"
-+	echo "[-m|--mode] MODE -> ignored"
-+	echo "--version -> output version information and exit"
-+}
-+
-+# parse all arguments
-+while [ $# != 0 ]
-+do
-+	case "$1" in
-+	# -d for tempfile is equivalent to -p for mktemp
-+	-d|--directory)
-+		dir="$2"
-+		shift 2
-+	;;
-+	--directory=*)
-+		dir="${1#--directory=}"
-+		shift 1
-+	;;
-+	-d*)
-+		dir="${1#-d}"
-+		shift 1
-+	;;
-+	# The following switches are ignored.
-+	-p|--prefix|-s|--suffix|-n|--name|-m|--mode)
-+		shift 2
-+	;;
-+	-p*|--prefix=*|-s*|--suffix=*|-n*|--name=*|-m*|--mode=*)
-+		shift 1
-+	;;
-+	# --version for tempfile is equivalent to -V for mktemp
-+	--version)
-+		echo "tempfile 1.0 (`mktemp -V 2>/dev/null`)"
-+		exit 0
-+	;;
-+	# Unknown switch
-+	*)
-+		usage
-+		exit 1
-+	;;
-+	esac
-+done
-+
-+# Use the dir if $TMPDIR is not set.
-+if [ -z "$TMPDIR" -a ! -z "$dir" ]
-+then
-+	export TMPDIR="$dir"
-+fi
-+# Execute mktemp with proper arguments
-+# the -t behaviour of mktemp is the default for tempfile
-+exec mktemp -t
Index: tches/mktemp-1.5-config_update-1.patch
===================================================================
--- patches/mktemp-1.5-config_update-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,1999 +1,0 @@
-Submitted By: Jim Gifford (patches at jg555 dot com)
-Date: 2005-10-01
-Initial Package Version: 1.5
-Origin: Jim Gifford
-Upstream Status: Sent
-Description: Updates config.sub and config.guess
- 
-diff -Naur mktemp-1.5.orig/config.guess mktemp-1.5/config.guess
---- mktemp-1.5.orig/config.guess	2001-07-17 02:57:40.000000000 +0000
-+++ mktemp-1.5/config.guess	2005-10-01 23:24:40.000000000 +0000
-@@ -1,9 +1,9 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
--#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
--#   Free Software Foundation, Inc.
-+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
- 
--timestamp='2001-04-20'
-+timestamp='2004-11-12'
- 
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -24,8 +24,9 @@
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
- 
--# Written by Per Bothner <bothner@cygnus.com>.
--# Please send patches to <config-patches@gnu.org>.
-+# Originally written by Per Bothner <per@bothner.com>.
-+# Please send patches to <config-patches@gnu.org>.  Submit a context
-+# diff and a properly formatted ChangeLog entry.
- #
- # This script attempts to guess a canonical system name similar to
- # config.sub.  If it succeeds, it prints the system name on stdout, and
-@@ -52,7 +53,7 @@
- GNU config.guess ($timestamp)
- 
- Originally written by Per Bothner.
--Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
- Free Software Foundation, Inc.
- 
- This is free software; see the source for copying conditions.  There is NO
-@@ -87,33 +88,45 @@
-   exit 1
- fi
- 
-+trap 'exit 1' 1 2 15
- 
--dummy=dummy-$$
--trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
-+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-+# compiler to aid in system detection is discouraged as it requires
-+# temporary files to be created and, as you can see below, it is a
-+# headache to deal with in a portable fashion.
- 
--# CC_FOR_BUILD -- compiler used by this script.
- # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
- # use `HOST_CC' if defined, but it is deprecated.
- 
-+# Portable tmp directory creation inspired by the Autoconf team.
-+
-+set_cc_for_build='
-+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-+: ${TMPDIR=/tmp} ;
-+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
-+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
-+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-+dummy=$tmp/dummy ;
-+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
- case $CC_FOR_BUILD,$HOST_CC,$CC in
-- ,,)    echo "int dummy(){}" > $dummy.c
--	for c in cc gcc c89 ; do
--	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1
--	  if test $? = 0 ; then
--	     CC_FOR_BUILD="$c"; break
--	  fi
--	done
--	rm -f $dummy.c $dummy.o $dummy.rel
-+ ,,)    echo "int x;" > $dummy.c ;
-+	for c in cc gcc c89 c99 ; do
-+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-+	     CC_FOR_BUILD="$c"; break ;
-+	  fi ;
-+	done ;
- 	if test x"$CC_FOR_BUILD" = x ; then
--	  CC_FOR_BUILD=no_compiler_found
-+	  CC_FOR_BUILD=no_compiler_found ;
- 	fi
- 	;;
-  ,,*)   CC_FOR_BUILD=$CC ;;
-  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
--esac
-+esac ;'
- 
- # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
--# (ghazi@noc.rutgers.edu 8/24/94.)
-+# (ghazi@noc.rutgers.edu 1994-08-24)
- if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
- 	PATH=$PATH:/.attbin ; export PATH
- fi
-@@ -127,29 +140,31 @@
- 
- case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-     *:NetBSD:*:*)
--	# Netbsd (nbsd) targets should (where applicable) match one or
-+	# NetBSD (nbsd) targets should (where applicable) match one or
- 	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
- 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
- 	# switched to ELF, *-*-netbsd* would select the old
- 	# object file format.  This provides both forward
- 	# compatibility and a consistent mechanism for selecting the
- 	# object file format.
--	# Determine the machine/vendor (is the vendor relevant).
--	case "${UNAME_MACHINE}" in
--	    amiga) machine=m68k-unknown ;;
--	    arm32) machine=arm-unknown ;;
--	    atari*) machine=m68k-atari ;;
--	    sun3*) machine=m68k-sun ;;
--	    mac68k) machine=m68k-apple ;;
--	    macppc) machine=powerpc-apple ;;
--	    hp3[0-9][05]) machine=m68k-hp ;;
--	    ibmrt|romp-ibm) machine=romp-ibm ;;
--	    *) machine=${UNAME_MACHINE}-unknown ;;
-+	#
-+	# Note: NetBSD doesn't particularly care about the vendor
-+	# portion of the name.  We always set it to "unknown".
-+	sysctl="sysctl -n hw.machine_arch"
-+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-+	case "${UNAME_MACHINE_ARCH}" in
-+	    armeb) machine=armeb-unknown ;;
-+	    arm*) machine=arm-unknown ;;
-+	    sh3el) machine=shl-unknown ;;
-+	    sh3eb) machine=sh-unknown ;;
-+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
- 	esac
- 	# The Operating System including object format, if it has switched
- 	# to ELF recently, or will in the future.
--	case "${UNAME_MACHINE}" in
--	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
-+	case "${UNAME_MACHINE_ARCH}" in
-+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-+		eval $set_cc_for_build
- 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
- 			| grep __ELF__ >/dev/null
- 		then
-@@ -165,70 +180,123 @@
- 		;;
- 	esac
- 	# The OS release
--	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+	# Debian GNU/NetBSD machines have a different userland, and
-+	# thus, need a distinct triplet. However, they do not need
-+	# kernel version information, so it can be replaced with a
-+	# suitable tag, in the style of linux-gnu.
-+	case "${UNAME_VERSION}" in
-+	    Debian*)
-+		release='-gnu'
-+		;;
-+	    *)
-+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+		;;
-+	esac
- 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
- 	# contains redundant information, the shorter form:
- 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
- 	echo "${machine}-${os}${release}"
- 	exit 0 ;;
-+    amd64:OpenBSD:*:*)
-+	echo x86_64-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    amiga:OpenBSD:*:*)
-+	echo m68k-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    cats:OpenBSD:*:*)
-+	echo arm-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    hp300:OpenBSD:*:*)
-+	echo m68k-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    luna88k:OpenBSD:*:*)
-+    	echo m88k-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    mac68k:OpenBSD:*:*)
-+	echo m68k-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    macppc:OpenBSD:*:*)
-+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    mvme68k:OpenBSD:*:*)
-+	echo m68k-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    mvme88k:OpenBSD:*:*)
-+	echo m88k-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    mvmeppc:OpenBSD:*:*)
-+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    sgi:OpenBSD:*:*)
-+	echo mips64-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    sun3:OpenBSD:*:*)
-+	echo m68k-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    *:OpenBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    *:ekkoBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    macppc:MirBSD:*:*)
-+	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-+	exit 0 ;;
-+    *:MirBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-+	exit 0 ;;
-     alpha:OSF1:*:*)
--	if test $UNAME_RELEASE = "V4.0"; then
-+	case $UNAME_RELEASE in
-+	*4.0)
- 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
--	fi
-+		;;
-+	*5.*)
-+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-+		;;
-+	esac
-+	# According to Compaq, /usr/sbin/psrinfo has been available on
-+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-+	# covers most systems running today.  This code pipes the CPU
-+	# types through head -n 1, so we only detect the type of CPU 0.
-+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-+	case "$ALPHA_CPU_TYPE" in
-+	    "EV4 (21064)")
-+		UNAME_MACHINE="alpha" ;;
-+	    "EV4.5 (21064)")
-+		UNAME_MACHINE="alpha" ;;
-+	    "LCA4 (21066/21068)")
-+		UNAME_MACHINE="alpha" ;;
-+	    "EV5 (21164)")
-+		UNAME_MACHINE="alphaev5" ;;
-+	    "EV5.6 (21164A)")
-+		UNAME_MACHINE="alphaev56" ;;
-+	    "EV5.6 (21164PC)")
-+		UNAME_MACHINE="alphapca56" ;;
-+	    "EV5.7 (21164PC)")
-+		UNAME_MACHINE="alphapca57" ;;
-+	    "EV6 (21264)")
-+		UNAME_MACHINE="alphaev6" ;;
-+	    "EV6.7 (21264A)")
-+		UNAME_MACHINE="alphaev67" ;;
-+	    "EV6.8CB (21264C)")
-+		UNAME_MACHINE="alphaev68" ;;
-+	    "EV6.8AL (21264B)")
-+		UNAME_MACHINE="alphaev68" ;;
-+	    "EV6.8CX (21264D)")
-+		UNAME_MACHINE="alphaev68" ;;
-+	    "EV6.9A (21264/EV69A)")
-+		UNAME_MACHINE="alphaev69" ;;
-+	    "EV7 (21364)")
-+		UNAME_MACHINE="alphaev7" ;;
-+	    "EV7.9 (21364A)")
-+		UNAME_MACHINE="alphaev79" ;;
-+	esac
-+	# A Pn.n version is a patched version.
- 	# A Vn.n version is a released version.
- 	# A Tn.n version is a released field test version.
- 	# A Xn.n version is an unreleased experimental baselevel.
- 	# 1.2 uses "1.2" for uname -r.
--	cat <<EOF >$dummy.s
--	.data
--\$Lformat:
--	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
--
--	.text
--	.globl main
--	.align 4
--	.ent main
--main:
--	.frame \$30,16,\$26,0
--	ldgp \$29,0(\$27)
--	.prologue 1
--	.long 0x47e03d80 # implver \$0
--	lda \$2,-1
--	.long 0x47e20c21 # amask \$2,\$1
--	lda \$16,\$Lformat
--	mov \$0,\$17
--	not \$1,\$18
--	jsr \$26,printf
--	ldgp \$29,0(\$26)
--	mov 0,\$16
--	jsr \$26,exit
--	.end main
--EOF
--	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
--	if test "$?" = 0 ; then
--		case `./$dummy` in
--			0-0)
--				UNAME_MACHINE="alpha"
--				;;
--			1-0)
--				UNAME_MACHINE="alphaev5"
--				;;
--			1-1)
--				UNAME_MACHINE="alphaev56"
--				;;
--			1-101)
--				UNAME_MACHINE="alphapca56"
--				;;
--			2-303)
--				UNAME_MACHINE="alphaev6"
--				;;
--			2-307)
--				UNAME_MACHINE="alphaev67"
--				;;
--		esac
--	fi
--	rm -f $dummy.s $dummy
--	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- 	exit 0 ;;
-     Alpha\ *:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
-@@ -242,33 +310,21 @@
-     Amiga*:UNIX_System_V:4.0:*)
- 	echo m68k-unknown-sysv4
- 	exit 0;;
--    amiga:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
-     *:[Aa]miga[Oo][Ss]:*:*)
- 	echo ${UNAME_MACHINE}-unknown-amigaos
- 	exit 0 ;;
--    arc64:OpenBSD:*:*)
--	echo mips64el-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    arc:OpenBSD:*:*)
--	echo mipsel-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    hkmips:OpenBSD:*:*)
--	echo mips-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    pmax:OpenBSD:*:*)
--	echo mipsel-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    sgi:OpenBSD:*:*)
--	echo mips-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    wgrisc:OpenBSD:*:*)
--	echo mipsel-unknown-openbsd${UNAME_RELEASE}
-+    *:[Mm]orph[Oo][Ss]:*:*)
-+	echo ${UNAME_MACHINE}-unknown-morphos
- 	exit 0 ;;
-     *:OS/390:*:*)
- 	echo i370-ibm-openedition
- 	exit 0 ;;
-+    *:z/VM:*:*)
-+	echo s390-ibm-zvmoe
-+	exit 0 ;;
-+    *:OS400:*:*)
-+        echo powerpc-ibm-os400
-+	exit 0 ;;
-     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- 	echo arm-acorn-riscix${UNAME_RELEASE}
- 	exit 0;;
-@@ -286,6 +342,13 @@
-     NILE*:*:*:dcosx)
- 	echo pyramid-pyramid-svr4
- 	exit 0 ;;
-+    DRS?6000:unix:4.0:6*)
-+	echo sparc-icl-nx6
-+	exit 0 ;;
-+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-+	case `/usr/bin/uname -p` in
-+	    sparc) echo sparc-icl-nx7 && exit 0 ;;
-+	esac ;;
-     sun4H:SunOS:5.*:*)
- 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- 	exit 0 ;;
-@@ -314,7 +377,7 @@
- 	echo m68k-sun-sunos${UNAME_RELEASE}
- 	exit 0 ;;
-     sun*:*:4.2BSD:*)
--	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
- 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
- 	case "`/bin/arch`" in
- 	    sun3)
-@@ -328,9 +391,6 @@
-     aushp:SunOS:*:*)
- 	echo sparc-auspex-sunos${UNAME_RELEASE}
- 	exit 0 ;;
--    atari*:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
-     # The situation for MiNT is a little confusing.  The machine name
-     # can be virtually everything (everything which is not
-     # "atarist" or "atariste" at least should have a processor
-@@ -357,17 +417,8 @@
-     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-         echo m68k-unknown-mint${UNAME_RELEASE}
-         exit 0 ;;
--    sun3*:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mac68k:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mvme68k:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
--	exit 0 ;;
--    mvme88k:OpenBSD:*:*)
--	echo m88k-unknown-openbsd${UNAME_RELEASE}
-+    m68k:machten:*:*)
-+	echo m68k-apple-machten${UNAME_RELEASE}
- 	exit 0 ;;
-     powerpc:machten:*:*)
- 	echo powerpc-apple-machten${UNAME_RELEASE}
-@@ -385,6 +436,7 @@
- 	echo clipper-intergraph-clix${UNAME_RELEASE}
- 	exit 0 ;;
-     mips:*:*:UMIPS | mips:*:*:RISCos)
-+	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
- #ifdef __cplusplus
- #include <stdio.h>  /* for printf() prototype */
-@@ -406,15 +458,20 @@
- 	  exit (-1);
- 	}
- EOF
--	$CC_FOR_BUILD $dummy.c -o $dummy \
--	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
--	  && rm -f $dummy.c $dummy && exit 0
--	rm -f $dummy.c $dummy
-+	$CC_FOR_BUILD -o $dummy $dummy.c \
-+	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-+	  && exit 0
- 	echo mips-mips-riscos${UNAME_RELEASE}
- 	exit 0 ;;
-     Motorola:PowerMAX_OS:*:*)
- 	echo powerpc-motorola-powermax
- 	exit 0 ;;
-+    Motorola:*:4.3:PL8-*)
-+	echo powerpc-harris-powermax
-+	exit 0 ;;
-+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-+	echo powerpc-harris-powermax
-+	exit 0 ;;
-     Night_Hawk:Power_UNIX:*:*)
- 	echo powerpc-harris-powerunix
- 	exit 0 ;;
-@@ -475,6 +532,7 @@
- 	exit 0 ;;
-     *:AIX:2:3)
- 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-+		eval $set_cc_for_build
- 		sed 's/^		//' << EOF >$dummy.c
- 		#include <sys/systemcfg.h>
- 
-@@ -486,8 +544,7 @@
- 			exit(0);
- 			}
- EOF
--		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
--		rm -f $dummy.c $dummy
-+		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
- 		echo rs6000-ibm-aix3.2.5
- 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
- 		echo rs6000-ibm-aix3.2.4
-@@ -496,7 +553,7 @@
- 	fi
- 	exit 0 ;;
-     *:AIX:*:[45])
--	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
-+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- 		IBM_ARCH=rs6000
- 	else
-@@ -536,10 +593,8 @@
- 	    9000/31? )            HP_ARCH=m68000 ;;
- 	    9000/[34]?? )         HP_ARCH=m68k ;;
- 	    9000/[678][0-9][0-9])
--              case "${HPUX_REV}" in
--                11.[0-9][0-9])
--                  if [ -x /usr/bin/getconf ]; then
--                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-+		if [ -x /usr/bin/getconf ]; then
-+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                     sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                     case "${sc_cpu_version}" in
-                       523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-@@ -548,12 +603,13 @@
-                         case "${sc_kernel_bits}" in
-                           32) HP_ARCH="hppa2.0n" ;;
-                           64) HP_ARCH="hppa2.0w" ;;
-+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                         esac ;;
-                     esac
--                  fi ;;
--              esac
--              if [ "${HP_ARCH}" = "" ]; then
--              sed 's/^              //' << EOF >$dummy.c
-+		fi
-+		if [ "${HP_ARCH}" = "" ]; then
-+		    eval $set_cc_for_build
-+		    sed 's/^              //' << EOF >$dummy.c
- 
-               #define _HPUX_SOURCE
-               #include <stdlib.h>
-@@ -586,11 +642,21 @@
-                   exit (0);
-               }
- EOF
--	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
--	if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
--	rm -f $dummy.c $dummy
--	fi ;;
-+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-+		    test -z "$HP_ARCH" && HP_ARCH=hppa
-+		fi ;;
- 	esac
-+	if [ ${HP_ARCH} = "hppa2.0w" ]
-+	then
-+	    # avoid double evaluation of $set_cc_for_build
-+	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
-+	    then
-+		HP_ARCH="hppa2.0w"
-+	    else
-+		HP_ARCH="hppa64"
-+	    fi
-+	fi
- 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
- 	exit 0 ;;
-     ia64:HP-UX:*:*)
-@@ -598,6 +664,7 @@
- 	echo ia64-hp-hpux${HPUX_REV}
- 	exit 0 ;;
-     3050*:HI-UX:*:*)
-+	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
- 	#include <unistd.h>
- 	int
-@@ -623,8 +690,7 @@
- 	  exit (0);
- 	}
- EOF
--	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
--	rm -f $dummy.c $dummy
-+	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
- 	echo unknown-hitachi-hiuxwe2
- 	exit 0 ;;
-     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-@@ -633,7 +699,7 @@
-     9000/8??:4.3bsd:*:*)
- 	echo hppa1.0-hp-bsd
- 	exit 0 ;;
--    *9??*:MPE/iX:*:*)
-+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
- 	echo hppa1.0-hp-mpeix
- 	exit 0 ;;
-     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-@@ -652,9 +718,6 @@
-     parisc*:Lites*:*:*)
- 	echo hppa1.1-hp-lites
- 	exit 0 ;;
--    hppa*:OpenBSD:*:*)
--	echo hppa-unknown-openbsd
--	exit 0 ;;
-     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
- 	echo c1-convex-bsd
-         exit 0 ;;
-@@ -673,40 +736,37 @@
-     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- 	echo c4-convex-bsd
-         exit 0 ;;
--    CRAY*X-MP:*:*:*)
--	echo xmp-cray-unicos
--        exit 0 ;;
-     CRAY*Y-MP:*:*:*)
--	echo ymp-cray-unicos${UNAME_RELEASE}
-+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- 	exit 0 ;;
-     CRAY*[A-Z]90:*:*:*)
- 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
- 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
--	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
-+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-+	      -e 's/\.[^.]*$/.X/'
- 	exit 0 ;;
-     CRAY*TS:*:*:*)
- 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- 	exit 0 ;;
--    CRAY*T3D:*:*:*)
--	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
--	exit 0 ;;
-     CRAY*T3E:*:*:*)
- 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- 	exit 0 ;;
-     CRAY*SV1:*:*:*)
- 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- 	exit 0 ;;
--    CRAY-2:*:*:*)
--	echo cray2-cray-unicos
--        exit 0 ;;
-+    *:UNICOS/mp:*:*)
-+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit 0 ;;
-     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-         exit 0 ;;
--    hp300:OpenBSD:*:*)
--	echo m68k-unknown-openbsd${UNAME_RELEASE}
-+    5000:UNIX_System_V:4.*:*)
-+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- 	exit 0 ;;
-     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-@@ -720,9 +780,6 @@
-     *:FreeBSD:*:*)
- 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- 	exit 0 ;;
--    *:OpenBSD:*:*)
--	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
--	exit 0 ;;
-     i*:CYGWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-cygwin
- 	exit 0 ;;
-@@ -732,11 +789,17 @@
-     i*:PW*:*)
- 	echo ${UNAME_MACHINE}-pc-pw32
- 	exit 0 ;;
-+    x86:Interix*:[34]*)
-+	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-+	exit 0 ;;
-+    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-+	echo i${UNAME_MACHINE}-pc-mks
-+	exit 0 ;;
-     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
- 	# UNAME_MACHINE based on the output of uname instead of i386?
--	echo i386-pc-interix
-+	echo i586-pc-interix
- 	exit 0 ;;
-     i*:UWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-uwin
-@@ -748,112 +811,93 @@
- 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- 	exit 0 ;;
-     *:GNU:*:*)
-+	# the GNU system
- 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
- 	exit 0 ;;
-+    *:GNU/*:*:*)
-+	# other systems with GNU libc and userland
-+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-+	exit 0 ;;
-     i*86:Minix:*:*)
- 	echo ${UNAME_MACHINE}-pc-minix
- 	exit 0 ;;
-     arm*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit 0 ;;
-+    cris:Linux:*:*)
-+	echo cris-axis-linux-gnu
-+	exit 0 ;;
-+    crisv32:Linux:*:*)
-+	echo crisv32-axis-linux-gnu
-+	exit 0 ;;
-+    frv:Linux:*:*)
-+    	echo frv-unknown-linux-gnu
-+	exit 0 ;;
-     ia64:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit 0 ;;
-+    m32r*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit 0 ;;
-     m68*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit 0 ;;
-     mips:Linux:*:*)
--	cat >$dummy.c <<EOF
--#ifdef __cplusplus
--#include <stdio.h>  /* for printf() prototype */
--int main (int argc, char *argv[]) {
--#else
--int main (argc, argv) int argc; char *argv[]; {
--#endif
--#ifdef __MIPSEB__
--  printf ("%s-unknown-linux-gnu\n", argv[1]);
--#endif
--#ifdef __MIPSEL__
--  printf ("%sel-unknown-linux-gnu\n", argv[1]);
--#endif
--  return 0;
--}
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+	#undef CPU
-+	#undef mips
-+	#undef mipsel
-+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-+	CPU=mipsel
-+	#else
-+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-+	CPU=mips
-+	#else
-+	CPU=
-+	#endif
-+	#endif
- EOF
--	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
--	rm -f $dummy.c $dummy
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
- 	;;
--    ppc:Linux:*:*)
--	# Determine Lib Version
--	cat >$dummy.c <<EOF
--#include <features.h>
--#if defined(__GLIBC__)
--extern char __libc_version[];
--extern char __libc_release[];
--#endif
--main(argc, argv)
--     int argc;
--     char *argv[];
--{
--#if defined(__GLIBC__)
--  printf("%s %s\n", __libc_version, __libc_release);
--#else
--  printf("unknown\n");
--#endif
--  return 0;
--}
-+    mips64:Linux:*:*)
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+	#undef CPU
-+	#undef mips64
-+	#undef mips64el
-+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-+	CPU=mips64el
-+	#else
-+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-+	CPU=mips64
-+	#else
-+	CPU=
-+	#endif
-+	#endif
- EOF
--	LIBC=""
--	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
--	if test "$?" = 0 ; then
--		./$dummy | grep 1\.99 > /dev/null
--		if test "$?" = 0 ; then LIBC="libc1" ; fi
--	fi
--	rm -f $dummy.c $dummy
--	echo powerpc-unknown-linux-gnu${LIBC}
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-+	;;
-+    ppc:Linux:*:*)
-+	echo powerpc-unknown-linux-gnu
-+	exit 0 ;;
-+    ppc64:Linux:*:*)
-+	echo powerpc64-unknown-linux-gnu
- 	exit 0 ;;
-     alpha:Linux:*:*)
--	cat <<EOF >$dummy.s
--	  .data
--	  \$Lformat:
--		.byte 37,100,45,37,120,10,0	# "%d-%x\n"
--	   .text
--		.globl main
--		.align 4
--		.ent main
--	    main:
--		.frame \$30,16,\$26,0
--		ldgp \$29,0(\$27)
--		.prologue 1
--		.long 0x47e03d80 # implver \$0
--		lda \$2,-1
--		.long 0x47e20c21 # amask \$2,\$1
--		lda \$16,\$Lformat
--		mov \$0,\$17
--		not \$1,\$18
--		jsr \$26,printf
--		ldgp \$29,0(\$26)
--		mov 0,\$16
--		jsr \$26,exit
--		.end main
--EOF
--	LIBC=""
--	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
--	if test "$?" = 0 ; then
--		case `./$dummy` in
--		0-0)	UNAME_MACHINE="alpha" ;;
--		1-0)	UNAME_MACHINE="alphaev5" ;;
--		1-1)    UNAME_MACHINE="alphaev56" ;;
--		1-101)	UNAME_MACHINE="alphapca56" ;;
--		2-303)	UNAME_MACHINE="alphaev6" ;;
--		2-307)	UNAME_MACHINE="alphaev67" ;;
--		esac
--		objdump --private-headers $dummy | \
--		  grep ld.so.1 > /dev/null
--		if test "$?" = 0 ; then
--			LIBC="libc1"
--		fi
--	fi
--	rm -f $dummy.s $dummy
-+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-+	  EV5)   UNAME_MACHINE=alphaev5 ;;
-+	  EV56)  UNAME_MACHINE=alphaev56 ;;
-+	  PCA56) UNAME_MACHINE=alphapca56 ;;
-+	  PCA57) UNAME_MACHINE=alphapca56 ;;
-+	  EV6)   UNAME_MACHINE=alphaev6 ;;
-+	  EV67)  UNAME_MACHINE=alphaev67 ;;
-+	  EV68*) UNAME_MACHINE=alphaev68 ;;
-+        esac
-+	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- 	exit 0 ;;
-     parisc:Linux:*:* | hppa:Linux:*:*)
-@@ -870,6 +914,9 @@
-     s390:Linux:*:* | s390x:Linux:*:*)
- 	echo ${UNAME_MACHINE}-ibm-linux
- 	exit 0 ;;
-+    sh64*:Linux:*:*)
-+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit 0 ;;
-     sh*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit 0 ;;
-@@ -883,71 +930,62 @@
- 	# The BFD linker knows what the default object file format is, so
- 	# first see if it will tell us. cd to the root directory to prevent
- 	# problems with other programs or directories called `ld' in the path.
--	ld_supported_emulations=`cd /; ld --help 2>&1 \
--			 | sed -ne '/supported emulations:/!d
-+	# Set LC_ALL=C to ensure ld outputs messages in English.
-+	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-+			 | sed -ne '/supported targets:/!d
- 				    s/[ 	][ 	]*/ /g
--				    s/.*supported emulations: *//
-+				    s/.*supported targets: *//
- 				    s/ .*//
- 				    p'`
--        case "$ld_supported_emulations" in
--	  i*86linux)
--		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
--		exit 0
--		;;
--	  elf_i*86)
-+        case "$ld_supported_targets" in
-+	  elf32-i386)
- 		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- 		;;
--	  i*86coff)
-+	  a.out-i386-linux)
-+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-+		exit 0 ;;
-+	  coff-i386)
- 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
--		exit 0
--		;;
--	esac
--	# Either a pre-BFD a.out linker (linux-gnuoldld)
--	# or one that does not give us useful --help.
--	# GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
--	# If ld does not provide *any* "supported emulations:"
--	# that means it is gnuoldld.
--	test -z "$ld_supported_emulations" && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
--	case "${UNAME_MACHINE}" in
--	i*86)
--	  VENDOR=pc;
--	  ;;
--	*)
--	  VENDOR=unknown;
--	  ;;
-+		exit 0 ;;
-+	  "")
-+		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-+		# one that does not give us useful --help.
-+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-+		exit 0 ;;
- 	esac
- 	# Determine whether the default compiler is a.out or elf
--	cat >$dummy.c <<EOF
--#include <features.h>
--#ifdef __cplusplus
--#include <stdio.h>  /* for printf() prototype */
--	int main (int argc, char *argv[]) {
--#else
--	int main (argc, argv) int argc; char *argv[]; {
--#endif
--#ifdef __ELF__
--# ifdef __GLIBC__
--#  if __GLIBC__ >= 2
--    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
--#  else
--    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
--#  endif
--# else
--   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
--# endif
--#else
--  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
--#endif
--  return 0;
--}
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+	#include <features.h>
-+	#ifdef __ELF__
-+	# ifdef __GLIBC__
-+	#  if __GLIBC__ >= 2
-+	LIBC=gnu
-+	#  else
-+	LIBC=gnulibc1
-+	#  endif
-+	# else
-+	LIBC=gnulibc1
-+	# endif
-+	#else
-+	#ifdef __INTEL_COMPILER
-+	LIBC=gnu
-+	#else
-+	LIBC=gnuaout
-+	#endif
-+	#endif
-+	#ifdef __dietlibc__
-+	LIBC=dietlibc
-+	#endif
- EOF
--	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
--	rm -f $dummy.c $dummy
-+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-+	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
- 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
- 	;;
--# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
--# are messed up and put the nodename in both sysname and nodename.
-     i*86:DYNIX/ptx:4*:*)
-+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-+	# earlier versions are messed up and put the nodename in both
-+	# sysname and nodename.
- 	echo i386-sequent-sysv4
- 	exit 0 ;;
-     i*86:UNIX_SV:4.2MP:2.*)
-@@ -958,6 +996,26 @@
-         # Use sysv4.2uw... so that sysv4* matches it.
- 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
- 	exit 0 ;;
-+    i*86:OS/2:*:*)
-+	# If we were able to find `uname', then EMX Unix compatibility
-+	# is probably installed.
-+	echo ${UNAME_MACHINE}-pc-os2-emx
-+	exit 0 ;;
-+    i*86:XTS-300:*:STOP)
-+	echo ${UNAME_MACHINE}-unknown-stop
-+	exit 0 ;;
-+    i*86:atheos:*:*)
-+	echo ${UNAME_MACHINE}-unknown-atheos
-+	exit 0 ;;
-+	i*86:syllable:*:*)
-+	echo ${UNAME_MACHINE}-pc-syllable
-+	exit 0 ;;
-+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+	echo i386-unknown-lynxos${UNAME_RELEASE}
-+	exit 0 ;;
-+    i*86:*DOS:*:*)
-+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-+	exit 0 ;;
-     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
- 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
- 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-@@ -966,36 +1024,32 @@
- 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
- 	fi
- 	exit 0 ;;
--    i*86:*:5:7*)
--        # Fixed at (any) Pentium or better
--        UNAME_MACHINE=i586
--        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
--	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
--	else
--	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
--	fi
-+    i*86:*:5:[78]*)
-+	case `/bin/uname -X | grep "^Machine"` in
-+	    *486*)	     UNAME_MACHINE=i486 ;;
-+	    *Pentium)	     UNAME_MACHINE=i586 ;;
-+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-+	esac
-+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
- 	exit 0 ;;
-     i*86:*:3.2:*)
- 	if test -f /usr/options/cb.name; then
- 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
- 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
- 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
--		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
--		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
--		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
- 			&& UNAME_MACHINE=i586
--		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
-+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
- 			&& UNAME_MACHINE=i686
--		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
-+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
- 			&& UNAME_MACHINE=i686
- 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
- 	else
- 		echo ${UNAME_MACHINE}-pc-sysv32
- 	fi
- 	exit 0 ;;
--    i*86:*DOS:*:*)
--	echo ${UNAME_MACHINE}-pc-msdosdjgpp
--	exit 0 ;;
-     pc:*:*:*)
- 	# Left here for compatibility:
-         # uname -m prints for DJGPP always 'pc', but it prints nothing about
-@@ -1019,9 +1073,15 @@
- 	# "miniframe"
- 	echo m68010-convergent-sysv
- 	exit 0 ;;
--    M68*:*:R3V[567]*:*)
-+    mc68k:UNIX:SYSTEM5:3.51m)
-+	echo m68k-convergent-sysv
-+	exit 0 ;;
-+    M680?0:D-NIX:5.3:*)
-+	echo m68k-diab-dnix
-+	exit 0 ;;
-+    M68*:*:R3V[5678]*:*)
- 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
--    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
-+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
- 	OS_REL=''
- 	test -r /etc/.relid \
- 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-@@ -1038,9 +1098,6 @@
-     mc68030:UNIX_System_V:4.*:*)
- 	echo m68k-atari-sysv4
- 	exit 0 ;;
--    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
--	echo i386-unknown-lynxos${UNAME_RELEASE}
--	exit 0 ;;
-     TSUNAMI:LynxOS:2.*:*)
- 	echo sparc-unknown-lynxos${UNAME_RELEASE}
- 	exit 0 ;;
-@@ -1067,8 +1124,8 @@
- 		echo ns32k-sni-sysv
- 	fi
- 	exit 0 ;;
--    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
--                           # says <Richard.M.Bartel@ccMail.Census.GOV>
-+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-+                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-         echo i586-unisys-sysv4
-         exit 0 ;;
-     *:UNIX_System_V:4*:FTX*)
-@@ -1080,6 +1137,10 @@
- 	# From seanf@swdc.stratus.com.
- 	echo i860-stratus-sysv4
- 	exit 0 ;;
-+    *:VOS:*:*)
-+	# From Paul.Green@stratus.com.
-+	echo hppa1.1-stratus-vos
-+	exit 0 ;;
-     mc68*:A/UX:*:*)
- 	echo m68k-apple-aux${UNAME_RELEASE}
- 	exit 0 ;;
-@@ -1108,6 +1169,9 @@
-     SX-5:SUPER-UX:*:*)
- 	echo sx5-nec-superux${UNAME_RELEASE}
- 	exit 0 ;;
-+    SX-6:SUPER-UX:*:*)
-+	echo sx6-nec-superux${UNAME_RELEASE}
-+	exit 0 ;;
-     Power*:Rhapsody:*:*)
- 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
- 	exit 0 ;;
-@@ -1115,18 +1179,25 @@
- 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
- 	exit 0 ;;
-     *:Darwin:*:*)
--	echo `uname -p`-apple-darwin${UNAME_RELEASE}
-+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-+	case $UNAME_PROCESSOR in
-+	    *86) UNAME_PROCESSOR=i686 ;;
-+	    unknown) UNAME_PROCESSOR=powerpc ;;
-+	esac
-+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
- 	exit 0 ;;
-     *:procnto*:*:* | *:QNX:[0123456789]*:*)
--	if test "${UNAME_MACHINE}" = "x86pc"; then
-+	UNAME_PROCESSOR=`uname -p`
-+	if test "$UNAME_PROCESSOR" = "x86"; then
-+		UNAME_PROCESSOR=i386
- 		UNAME_MACHINE=pc
- 	fi
--	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
-+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
- 	exit 0 ;;
-     *:QNX:*:4*)
- 	echo i386-pc-qnx
- 	exit 0 ;;
--    NSR-[KW]:NONSTOP_KERNEL:*:*)
-+    NSR-?:NONSTOP_KERNEL:*:*)
- 	echo nsr-tandem-nsk${UNAME_RELEASE}
- 	exit 0 ;;
-     *:NonStop-UX:*:*)
-@@ -1149,11 +1220,6 @@
- 	fi
- 	echo ${UNAME_MACHINE}-unknown-plan9
- 	exit 0 ;;
--    i*86:OS/2:*:*)
--	# If we were able to find `uname', then EMX Unix compatibility
--	# is probably installed.
--	echo ${UNAME_MACHINE}-pc-os2-emx
--	exit 0 ;;
-     *:TOPS-10:*:*)
- 	echo pdp10-unknown-tops10
- 	exit 0 ;;
-@@ -1172,11 +1238,28 @@
-     *:ITS:*:*)
- 	echo pdp10-unknown-its
- 	exit 0 ;;
-+    SEI:*:*:SEIUX)
-+        echo mips-sei-seiux${UNAME_RELEASE}
-+	exit 0 ;;
-+    *:DragonFly:*:*)
-+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+	exit 0 ;;
-+    *:*VMS:*:*)
-+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+	case "${UNAME_MACHINE}" in
-+	    A*) echo alpha-dec-vms && exit 0 ;;
-+	    I*) echo ia64-dec-vms && exit 0 ;;
-+	    V*) echo vax-dec-vms && exit 0 ;;
-+	esac ;;
-+    *:XENIX:*:SysV)
-+	echo i386-pc-xenix
-+	exit 0 ;;
- esac
- 
- #echo '(No uname command or uname output not recognized.)' 1>&2
- #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
- 
-+eval $set_cc_for_build
- cat >$dummy.c <<EOF
- #ifdef _SEQUENT_
- # include <sys/types.h>
-@@ -1291,8 +1374,7 @@
- }
- EOF
- 
--$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
--rm -f $dummy.c $dummy
-+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
- 
- # Apollos put the system type in the environment.
- 
-diff -Naur mktemp-1.5.orig/config.sub mktemp-1.5/config.sub
---- mktemp-1.5.orig/config.sub	2001-07-17 02:57:40.000000000 +0000
-+++ mktemp-1.5/config.sub	2005-10-01 23:24:44.000000000 +0000
-@@ -1,9 +1,9 @@
- #! /bin/sh
- # Configuration validation subroutine script.
--#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
--#   Free Software Foundation, Inc.
-+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
- 
--timestamp='2001-05-11'
-+timestamp='2004-11-30'
- 
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -29,7 +29,8 @@
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
- 
--# Please send patches to <config-patches@gnu.org>.
-+# Please send patches to <config-patches@gnu.org>.  Submit a context
-+# diff and a properly formatted ChangeLog entry.
- #
- # Configuration subroutine to validate and canonicalize a configuration type.
- # Supply the specified configuration type as an argument.
-@@ -69,7 +70,7 @@
- version="\
- GNU config.sub ($timestamp)
- 
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
- Free Software Foundation, Inc.
- 
- This is free software; see the source for copying conditions.  There is NO
-@@ -117,7 +118,8 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
--  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*)
-+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-     os=-$maybe_os
-     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-     ;;
-@@ -143,7 +145,7 @@
- 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
- 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
- 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
--	-apple | -axis)
-+	-apple | -axis | -knuth | -cray)
- 		os=
- 		basic_machine=$1
- 		;;
-@@ -157,6 +159,14 @@
- 		os=-vxworks
- 		basic_machine=$1
- 		;;
-+	-chorusos*)
-+		os=-chorusos
-+		basic_machine=$1
-+		;;
-+ 	-chorusrdb)
-+ 		os=-chorusrdb
-+		basic_machine=$1
-+ 		;;
- 	-hiux*)
- 		os=-hiuxwe2
- 		;;
-@@ -215,26 +225,50 @@
- case $basic_machine in
- 	# Recognize the basic CPU types without company name.
- 	# Some are omitted here because they have special meanings below.
--	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc \
--	        | arm | arme[lb] | arm[bl]e | armv[2345] | armv[345][lb] | strongarm | xscale \
--		| pyramid | mn10200 | mn10300 | tron | a29k \
--		| 580 | i960 | h8300 \
--		| x86 | ppcbe | mipsbe | mipsle | shbe | shle \
--		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
--		| hppa64 \
--		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
--		| alphaev6[78] \
--		| we32k | ns16k | clipper | i370 | sh | sh[34] \
--		| powerpc | powerpcle \
--		| 1750a | dsp16xx | pdp10 | pdp11 \
--		| mips16 | mips64 | mipsel | mips64el \
--		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
--		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
--		| mips64vr5000 | miprs64vr5000el | mcore | s390 | s390x \
--		| sparc | sparclet | sparclite | sparc64 | sparcv9 | sparcv9b \
--		| v850 | c4x \
--		| thumb | d10v | d30v | fr30 | avr | openrisc | tic80 \
--		| pj | pjl | h8500 | z8k)
-+	1750a | 580 \
-+	| a29k \
-+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-+	| am33_2.0 \
-+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-+	| c4x | clipper \
-+	| d10v | d30v | dlx | dsp16xx \
-+	| fr30 | frv \
-+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-+	| i370 | i860 | i960 | ia64 \
-+	| ip2k | iq2000 \
-+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
-+	| mips | mipsbe | mipseb | mipsel | mipsle \
-+	| mips16 \
-+	| mips64 | mips64el \
-+	| mips64vr | mips64vrel \
-+	| mips64orion | mips64orionel \
-+	| mips64vr4100 | mips64vr4100el \
-+	| mips64vr4300 | mips64vr4300el \
-+	| mips64vr5000 | mips64vr5000el \
-+	| mipsisa32 | mipsisa32el \
-+	| mipsisa32r2 | mipsisa32r2el \
-+	| mipsisa64 | mipsisa64el \
-+	| mipsisa64r2 | mipsisa64r2el \
-+	| mipsisa64sb1 | mipsisa64sb1el \
-+	| mipsisa64sr71k | mipsisa64sr71kel \
-+	| mipstx39 | mipstx39el \
-+	| mn10200 | mn10300 \
-+	| msp430 \
-+	| ns16k | ns32k \
-+	| openrisc | or32 \
-+	| pdp10 | pdp11 | pj | pjl \
-+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-+	| pyramid \
-+	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-+	| sh64 | sh64le \
-+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
-+	| strongarm \
-+	| tahoe | thumb | tic4x | tic80 | tron \
-+	| v850 | v850e \
-+	| we32k \
-+	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
-+	| z8k)
- 		basic_machine=$basic_machine-unknown
- 		;;
- 	m6811 | m68hc11 | m6812 | m68hc12)
-@@ -242,7 +276,7 @@
- 		basic_machine=$basic_machine-unknown
- 		os=-none
- 		;;
--	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | w65 | z8k)
-+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
- 		;;
- 
- 	# We use `pc' rather than `unknown'
-@@ -257,31 +291,62 @@
- 		exit 1
- 		;;
- 	# Recognize the basic CPU types with company name.
--	# FIXME: clean up the formatting here.
--	vax-* | tahoe-* | i*86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
--	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | c[123]* \
--	      | arm-*  | armbe-* | armle-* | armv*-* | strongarm-* | xscale-* \
--	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
--	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
--	      | xmp-* | ymp-* \
--	      | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* \
--	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \
--	      | hppa2.0n-* | hppa64-* \
--	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
--	      | alphaev6[78]-* \
--	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
--	      | clipper-* | orion-* \
--	      | sparclite-* | pdp10-* | pdp11-* | sh-* | sh[34]-* | sh[34]eb-* \
--	      | powerpc-* | powerpcle-* | sparc64-* | sparcv9-* | sparcv9b-* | sparc86x-* \
--	      | mips16-* | mips64-* | mipsel-* \
--	      | mips64el-* | mips64orion-* | mips64orionel-* \
--	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
--	      | mipstx39-* | mipstx39el-* | mcore-* \
--	      | f30[01]-* | f700-* | s390-* | s390x-* | sv1-* | t3e-* \
--	      | [cjt]90-* \
--	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
--	      | thumb-* | v850-* | d30v-* | tic30-* | tic80-* | c30-* | fr30-* \
--	      | bs2000-* | tic54x-* | c54x-* | x86_64-* | pj-* | pjl-*)
-+	580-* \
-+	| a29k-* \
-+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+	| avr-* \
-+	| bs2000-* \
-+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-+	| clipper-* | craynv-* | cydra-* \
-+	| d10v-* | d30v-* | dlx-* \
-+	| elxsi-* \
-+	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-+	| h8300-* | h8500-* \
-+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-+	| i*86-* | i860-* | i960-* | ia64-* \
-+	| ip2k-* | iq2000-* \
-+	| m32r-* | m32rle-* \
-+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-+	| m88110-* | m88k-* | maxq-* | mcore-* \
-+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-+	| mips16-* \
-+	| mips64-* | mips64el-* \
-+	| mips64vr-* | mips64vrel-* \
-+	| mips64orion-* | mips64orionel-* \
-+	| mips64vr4100-* | mips64vr4100el-* \
-+	| mips64vr4300-* | mips64vr4300el-* \
-+	| mips64vr5000-* | mips64vr5000el-* \
-+	| mipsisa32-* | mipsisa32el-* \
-+	| mipsisa32r2-* | mipsisa32r2el-* \
-+	| mipsisa64-* | mipsisa64el-* \
-+	| mipsisa64r2-* | mipsisa64r2el-* \
-+	| mipsisa64sb1-* | mipsisa64sb1el-* \
-+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-+	| mipstx39-* | mipstx39el-* \
-+	| mmix-* \
-+	| msp430-* \
-+	| none-* | np1-* | ns16k-* | ns32k-* \
-+	| orion-* \
-+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-+	| pyramid-* \
-+	| romp-* | rs6000-* \
-+	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-+	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-+	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-+	| tahoe-* | thumb-* \
-+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+	| tron-* \
-+	| v850-* | v850e-* | vax-* \
-+	| we32k-* \
-+	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-+	| xstormy16-* | xtensa-* \
-+	| ymp-* \
-+	| z8k-*)
- 		;;
- 	# Recognize the various machine names and aliases which stand
- 	# for a CPU type and a company and sometimes even an OS.
-@@ -299,6 +364,9 @@
- 		basic_machine=a29k-amd
- 		os=-udi
- 		;;
-+    	abacus)
-+		basic_machine=abacus-unknown
-+		;;
- 	adobe68k)
- 		basic_machine=m68010-adobe
- 		os=-scout
-@@ -313,6 +381,12 @@
- 		basic_machine=a29k-none
- 		os=-bsd
- 		;;
-+	amd64)
-+		basic_machine=x86_64-pc
-+		;;
-+	amd64-*)
-+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
- 	amdahl)
- 		basic_machine=580-amdahl
- 		os=-sysv
-@@ -344,6 +418,10 @@
- 		basic_machine=ns32k-sequent
- 		os=-dynix
- 		;;
-+	c90)
-+		basic_machine=c90-cray
-+		os=-unicos
-+		;;
- 	convex-c1)
- 		basic_machine=c1-convex
- 		os=-bsd
-@@ -364,30 +442,45 @@
- 		basic_machine=c38-convex
- 		os=-bsd
- 		;;
--	cray | ymp)
--		basic_machine=ymp-cray
-+	cray | j90)
-+		basic_machine=j90-cray
- 		os=-unicos
- 		;;
--	cray2)
--		basic_machine=cray2-cray
--		os=-unicos
-+	craynv)
-+		basic_machine=craynv-cray
-+		os=-unicosmp
- 		;;
--	[cjt]90)
--		basic_machine=${basic_machine}-cray
--		os=-unicos
-+	cr16c)
-+		basic_machine=cr16c-unknown
-+		os=-elf
- 		;;
- 	crds | unos)
- 		basic_machine=m68k-crds
- 		;;
-+	crisv32 | crisv32-* | etraxfs*)
-+		basic_machine=crisv32-axis
-+		;;
- 	cris | cris-* | etrax*)
- 		basic_machine=cris-axis
- 		;;
-+	crx)
-+		basic_machine=crx-unknown
-+		os=-elf
-+		;;
- 	da30 | da30-*)
- 		basic_machine=m68k-da30
- 		;;
- 	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
- 		basic_machine=mips-dec
- 		;;
-+	decsystem10* | dec10*)
-+		basic_machine=pdp10-dec
-+		os=-tops10
-+		;;
-+	decsystem20* | dec20*)
-+		basic_machine=pdp10-dec
-+		os=-tops20
-+		;;
- 	delta | 3300 | motorola-3300 | motorola-delta \
- 	      | 3300-motorola | delta-motorola)
- 		basic_machine=m68k-motorola
-@@ -396,6 +489,10 @@
- 		basic_machine=m88k-motorola
- 		os=-sysv3
- 		;;
-+	djgpp)
-+		basic_machine=i586-pc
-+		os=-msdosdjgpp
-+		;;
- 	dpx20 | dpx20-*)
- 		basic_machine=rs6000-bull
- 		os=-bosx
-@@ -568,28 +665,20 @@
- 		basic_machine=m68k-atari
- 		os=-mint
- 		;;
--	mipsel*-linux*)
--		basic_machine=mipsel-unknown
--		os=-linux-gnu
--		;;
--	mips*-linux*)
--		basic_machine=mips-unknown
--		os=-linux-gnu
--		;;
- 	mips3*-*)
- 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
- 		;;
- 	mips3*)
- 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
- 		;;
--	mmix*)
--		basic_machine=mmix-knuth
--		os=-mmixware
--		;;
- 	monitor)
- 		basic_machine=m68k-rom68k
- 		os=-coff
- 		;;
-+	morphos)
-+		basic_machine=powerpc-unknown
-+		os=-morphos
-+		;;
- 	msdos)
- 		basic_machine=i386-pc
- 		os=-msdos
-@@ -669,6 +758,14 @@
- 		basic_machine=hppa1.1-oki
- 		os=-proelf
- 		;;
-+	or32 | or32-*)
-+		basic_machine=or32-unknown
-+		os=-coff
-+		;;
-+	os400)
-+		basic_machine=powerpc-ibm
-+		os=-os400
-+		;;
- 	OSE68000 | ose68000)
- 		basic_machine=m68000-ericsson
- 		os=-ose
-@@ -691,42 +788,58 @@
- 	pbb)
- 		basic_machine=m68k-tti
- 		;;
--        pc532 | pc532-*)
-+	pc532 | pc532-*)
- 		basic_machine=ns32k-pc532
- 		;;
--	pentium | p5 | k5 | k6 | nexgen)
-+	pentium | p5 | k5 | k6 | nexgen | viac3)
- 		basic_machine=i586-pc
- 		;;
--	pentiumpro | p6 | 6x86 | athlon)
-+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
- 		basic_machine=i686-pc
- 		;;
--	pentiumii | pentium2)
-+	pentiumii | pentium2 | pentiumiii | pentium3)
- 		basic_machine=i686-pc
- 		;;
--	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
-+	pentium4)
-+		basic_machine=i786-pc
-+		;;
-+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
- 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
- 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
- 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
--	pentiumii-* | pentium2-*)
-+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
- 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
-+	pentium4-*)
-+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
- 	pn)
- 		basic_machine=pn-gould
- 		;;
- 	power)	basic_machine=power-ibm
- 		;;
- 	ppc)	basic_machine=powerpc-unknown
--	        ;;
-+		;;
- 	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
- 	ppcle | powerpclittle | ppc-le | powerpc-little)
- 		basic_machine=powerpcle-unknown
--	        ;;
-+		;;
- 	ppcle-* | powerpclittle-*)
- 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		;;
-+	ppc64)	basic_machine=powerpc64-unknown
-+		;;
-+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-+		basic_machine=powerpc64le-unknown
-+		;;
-+	ppc64le-* | powerpc64little-*)
-+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
- 	ps2)
- 		basic_machine=i386-ibm
- 		;;
-@@ -744,10 +857,26 @@
- 	rtpc | rtpc-*)
- 		basic_machine=romp-ibm
- 		;;
-+	s390 | s390-*)
-+		basic_machine=s390-ibm
-+		;;
-+	s390x | s390x-*)
-+		basic_machine=s390x-ibm
-+		;;
- 	sa29200)
- 		basic_machine=a29k-amd
- 		os=-udi
- 		;;
-+	sb1)
-+		basic_machine=mipsisa64sb1-unknown
-+		;;
-+	sb1el)
-+		basic_machine=mipsisa64sb1el-unknown
-+		;;
-+	sei)
-+		basic_machine=mips-sei
-+		os=-seiux
-+		;;
- 	sequent)
- 		basic_machine=i386-sequent
- 		;;
-@@ -755,7 +884,10 @@
- 		basic_machine=sh-hitachi
- 		os=-hms
- 		;;
--	sparclite-wrs)
-+	sh64)
-+		basic_machine=sh64-unknown
-+		;;
-+	sparclite-wrs | simso-wrs)
- 		basic_machine=sparclite-wrs
- 		os=-vxworks
- 		;;
-@@ -822,22 +954,42 @@
- 		os=-dynix
- 		;;
- 	t3e)
--		basic_machine=t3e-cray
-+		basic_machine=alphaev5-cray
-+		os=-unicos
-+		;;
-+	t90)
-+		basic_machine=t90-cray
- 		os=-unicos
- 		;;
- 	tic54x | c54x*)
- 		basic_machine=tic54x-unknown
- 		os=-coff
- 		;;
-+	tic55x | c55x*)
-+		basic_machine=tic55x-unknown
-+		os=-coff
-+		;;
-+	tic6x | c6x*)
-+		basic_machine=tic6x-unknown
-+		os=-coff
-+		;;
- 	tx39)
- 		basic_machine=mipstx39-unknown
- 		;;
- 	tx39el)
- 		basic_machine=mipstx39el-unknown
- 		;;
-+	toad1)
-+		basic_machine=pdp10-xkl
-+		os=-tops20
-+		;;
- 	tower | tower-32)
- 		basic_machine=m68k-ncr
- 		;;
-+	tpf)
-+		basic_machine=s390x-ibm
-+		os=-tpf
-+		;;
- 	udi29k)
- 		basic_machine=a29k-amd
- 		os=-udi
-@@ -859,8 +1011,8 @@
- 		os=-vms
- 		;;
- 	vpp*|vx|vx-*)
--               basic_machine=f301-fujitsu
--               ;;
-+		basic_machine=f301-fujitsu
-+		;;
- 	vxworks960)
- 		basic_machine=i960-wrs
- 		os=-vxworks
-@@ -881,13 +1033,17 @@
- 		basic_machine=hppa1.1-winbond
- 		os=-proelf
- 		;;
--	xmp)
--		basic_machine=xmp-cray
--		os=-unicos
-+	xbox)
-+		basic_machine=i686-pc
-+		os=-mingw32
- 		;;
--        xps | xps100)
-+	xps | xps100)
- 		basic_machine=xps100-honeywell
- 		;;
-+	ymp)
-+		basic_machine=ymp-cray
-+		os=-unicos
-+		;;
- 	z8k-*-coff)
- 		basic_machine=z8k-unknown
- 		os=-sim
-@@ -908,16 +1064,12 @@
- 	op60c)
- 		basic_machine=hppa1.1-oki
- 		;;
--	mips)
--		if [ x$os = x-linux-gnu ]; then
--			basic_machine=mips-unknown
--		else
--			basic_machine=mips-mips
--		fi
--		;;
- 	romp)
- 		basic_machine=romp-ibm
- 		;;
-+	mmix)
-+		basic_machine=mmix-knuth
-+		;;
- 	rs6000)
- 		basic_machine=rs6000-ibm
- 		;;
-@@ -934,13 +1086,16 @@
- 	we32k)
- 		basic_machine=we32k-att
- 		;;
--	sh3 | sh4)
-+	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
- 		basic_machine=sh-unknown
- 		;;
--	sparc | sparcv9 | sparcv9b)
-+	sh64)
-+		basic_machine=sh64-unknown
-+		;;
-+	sparc | sparcv8 | sparcv9 | sparcv9b)
- 		basic_machine=sparc-sun
- 		;;
--        cydra)
-+	cydra)
- 		basic_machine=cydra-cydrome
- 		;;
- 	orion)
-@@ -955,10 +1110,6 @@
- 	pmac | pmac-mpw)
- 		basic_machine=powerpc-apple
- 		;;
--	c4x*)
--		basic_machine=c4x-none
--		os=-coff
--		;;
- 	*-unknown)
- 		# Make sure to match an already-canonicalized machine name.
- 		;;
-@@ -1014,15 +1165,20 @@
- 	      | -aos* \
- 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
--	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
--	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
- 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
- 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-+	      | -chorusos* | -chorusrdb* \
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
--	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
--	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
-+	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
-+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
--	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* | -os2*)
-+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
-@@ -1034,8 +1190,10 @@
- 			;;
- 		esac
- 		;;
-+	-nto-qnx*)
-+		;;
- 	-nto*)
--		os=-nto-qnx
-+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
- 		;;
- 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
- 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-@@ -1044,6 +1202,9 @@
- 	-mac*)
- 		os=`echo $os | sed -e 's|mac|macos|'`
- 		;;
-+	-linux-dietlibc)
-+		os=-linux-dietlibc
-+		;;
- 	-linux*)
- 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
- 		;;
-@@ -1056,6 +1217,9 @@
- 	-opened*)
- 		os=-openedition
- 		;;
-+        -os400*)
-+		os=-os400
-+		;;
- 	-wince*)
- 		os=-wince
- 		;;
-@@ -1074,14 +1238,23 @@
- 	-acis*)
- 		os=-aos
- 		;;
-+	-atheos*)
-+		os=-atheos
-+		;;
-+	-syllable*)
-+		os=-syllable
-+		;;
- 	-386bsd)
- 		os=-bsd
- 		;;
- 	-ctix* | -uts*)
- 		os=-sysv
- 		;;
-+	-nova*)
-+		os=-rtmk-nova
-+		;;
- 	-ns2 )
--	        os=-nextstep2
-+		os=-nextstep2
- 		;;
- 	-nsk*)
- 		os=-nsk
-@@ -1093,6 +1266,9 @@
- 	-sinix*)
- 		os=-sysv4
- 		;;
-+        -tpf*)
-+		os=-tpf
-+		;;
- 	-triton*)
- 		os=-sysv3
- 		;;
-@@ -1120,8 +1296,17 @@
- 	-xenix)
- 		os=-xenix
- 		;;
--        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
--	        os=-mint
-+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-+		os=-mint
-+		;;
-+	-aros*)
-+		os=-aros
-+		;;
-+	-kaos*)
-+		os=-kaos
-+		;;
-+	-zvmoe)
-+		os=-zvmoe
- 		;;
- 	-none)
- 		;;
-@@ -1154,10 +1339,14 @@
- 	arm*-semi)
- 		os=-aout
- 		;;
-+    c4x-* | tic4x-*)
-+        os=-coff
-+        ;;
-+	# This must come before the *-dec entry.
- 	pdp10-*)
- 		os=-tops20
- 		;;
--        pdp11-*)
-+	pdp11-*)
- 		os=-none
- 		;;
- 	*-dec | vax-*)
-@@ -1184,6 +1373,9 @@
- 	mips*-*)
- 		os=-elf
- 		;;
-+	or32-*)
-+		os=-coff
-+		;;
- 	*-tti)	# must be before sparc entry or we get the wrong os.
- 		os=-sysv3
- 		;;
-@@ -1196,6 +1388,9 @@
- 	*-ibm)
- 		os=-aix
- 		;;
-+    	*-knuth)
-+		os=-mmixware
-+		;;
- 	*-wec)
- 		os=-proelf
- 		;;
-@@ -1247,19 +1442,19 @@
- 	*-next)
- 		os=-nextstep3
- 		;;
--        *-gould)
-+	*-gould)
- 		os=-sysv
- 		;;
--        *-highlevel)
-+	*-highlevel)
- 		os=-bsd
- 		;;
- 	*-encore)
- 		os=-bsd
- 		;;
--        *-sgi)
-+	*-sgi)
- 		os=-irix
- 		;;
--        *-siemens)
-+	*-siemens)
- 		os=-sysv4
- 		;;
- 	*-masscomp)
-@@ -1328,10 +1523,16 @@
- 			-mvs* | -opened*)
- 				vendor=ibm
- 				;;
-+			-os400*)
-+				vendor=ibm
-+				;;
- 			-ptx*)
- 				vendor=sequent
- 				;;
--			-vxsim* | -vxworks*)
-+			-tpf*)
-+				vendor=ibm
-+				;;
-+			-vxsim* | -vxworks* | -windiss*)
- 				vendor=wrs
- 				;;
- 			-aux*)
-@@ -1346,6 +1547,9 @@
- 			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
- 				vendor=atari
- 				;;
-+			-vos*)
-+				vendor=stratus
-+				;;
- 		esac
- 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
- 		;;
Index: patches/module-init-tools-3.0-cross-moveold.patch
===================================================================
--- patches/module-init-tools-3.0-cross-moveold.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/module-init-tools-3.0-cross-moveold.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,65 @@
+--- module-init-tools-3.0-ORIG/Makefile.in	2004-02-24 11:49:35.000000000 +1100
++++ module-init-tools-3.0/Makefile.in	2004-04-12 15:39:35.000000000 +1000
+@@ -760,17 +760,10 @@
+ 
+ release: check clean tarball testsuite
+ 
+-moveold: check-for-sbin check-for-old move-old-targets
+-
+-check-for-sbin:
+-	if [ "`echo $(DESTDIR)$(sbindir) | tr -s / /`" = /sbin ]; then :;    \
+-	else								     \
+-		echo moveold usually only makes sense when installing into /sbin; \
+-		exit 1;							     \
+-	fi
++moveold: check-for-old move-old-targets
+ 
+ check-for-old:
+-	if [ -f /sbin/lsmod.old ]; then					\
++	if [ -f $(DESTDIR)/sbin/lsmod.old ]; then					\
+ 		echo Someone already moved old versions. >&2; exit 1;	\
+ 	fi
+ 
+@@ -779,26 +772,29 @@
+ # Also, make symlink from /bin to /sbin for lsmod (FHS compliant).
+ move-old-targets:
+ 	for f in lsmod modprobe rmmod depmod insmod modinfo; do		    \
+-	    if [ -L /sbin/$$f ]; then					    \
+-		ln -sf `ls -l /sbin/$$f | sed 's/.* -> //'`.old /sbin/$$f;  \
++	    if [ -L $(DESTDIR)/sbin/$$f ]; then				    \
++		ln -sf `ls -l $(DESTDIR)/sbin/$$f | sed 's/.* -> //'`.old   \
++			$(DESTDIR)/sbin/$$f;				    \
+ 	    fi;								    \
+-	    mv /sbin/$$f /sbin/$$f.old;					    \
+-	    if [ -f /usr/share/man/man8/$$f.8.gz ]; then		    \
+-		mv /usr/share/man/man8/$$f.8.gz				    \
+-			/usr/share/man/man8/$$f.old.8.gz;		    \
+-	    elif [ -f /usr/share/man/man8/$$f.8.bz2 ]; then		    \
+-	        mv /usr/share/man/man8/$$f.8.bz2			    \
+-			/usr/share/man/man8/$$f.old.8.bz2;		    \
++	    mv $(DESTDIR)/sbin/$$f $(DESTDIR)/sbin/$$f.old;		    \
++	    if [ -f $(DESTDIR)/usr/share/man/man8/$$f.8.gz ]; then	    \
++		mv $(DESTDIR)/usr/share/man/man8/$$f.8.gz		    \
++			$(DESTDIR)/usr/share/man/man8/$$f.old.8.gz;	    \
++	    elif [ -f $(DESTDIR)/usr/share/man/man8/$$f.8.bz2 ]; then	    \
++	        mv $(DESTDIR)/usr/share/man/man8/$$f.8.bz2		    \
++			$(DESTDIR)/usr/share/man/man8/$$f.old.8.bz2;	    \
+ 	    else							    \
+-	        mv /usr/share/man/man8/$$f.8 /usr/share/man/man8/$$f.old.8; \
++	        mv $(DESTDIR)/usr/share/man/man8/$$f.8			    \
++			$(DESTDIR)/usr/share/man/man8/$$f.old.8;	    \
+ 	    fi;								    \
+ 	done
+ 	for f in kallsyms ksyms; do					    \
+-	    if [ -L /sbin/$$f ]; then					    \
+-		ln -sf `ls -l /sbin/$$f | sed 's/.* -> //'`.old /sbin/$$f;  \
++	    if [ -L $(DESTDIR)/sbin/$$f ]; then				    \
++		ln -sf `ls -l $(DESTDIR)/sbin/$$f | sed 's/.* -> //'`.old   \
++			$(DESTDIR)/sbin/$$f;				    \
+ 	    fi;								    \
+ 	done
+-	ln -s /sbin/lsmod.old /bin/lsmod.old
++	ln -s /sbin/lsmod.old $(DESTDIR)/bin/lsmod.old
+ 
+ # For installs in /usr/local/sbin
+ links:
Index: tches/module-init-tools-3.4-manpages-1.patch
===================================================================
--- patches/module-init-tools-3.4-manpages-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,902 +1,0 @@
-Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
-Date: 2008-01-14
-Initial Package Version: 3.4
-Upstream Status: Not submitted, this is a work around for missing docbook2man
-Origin: Self
-Description: Provides the man pages (adding docbook2man with all its
-dependencies would be a major addition to the book, so I built it
- -once- on a completed system and saved the data).
-
-diff -Naur module-init-tools-3.4/depmod.8 module-init-tools-3.4-with-man/depmod.8
---- module-init-tools-3.4/depmod.8	1970-01-01 01:00:00.000000000 +0100
-+++ module-init-tools-3.4-with-man/depmod.8	2008-01-14 00:43:37.000000000 +0000
-@@ -0,0 +1,111 @@
-+.\" This manpage has been automatically generated by docbook2man 
-+.\" from a DocBook document.  This tool can be found at:
-+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-+.\" Please send any bug reports, improvements, comments, patches, 
-+.\" etc. to Steve Cheng <steve@ggi-project.org>.
-+.TH "DEPMOD" "8" "14 January 2008" "" ""
-+
-+.SH NAME
-+depmod \- program to generate modules.dep and map files.
-+.SH SYNOPSIS
-+
-+\fBdepmod\fR [ \fB-b \fIbasedir\fB\fR ] [ \fB-e\fR ] [ \fB-F \fISystem.map\fB\fR ] [ \fB-n\fR ] [ \fB-v\fR ] [ \fB\fIversion\fB\fR ] [ \fB-A\fR ]
-+
-+
-+\fBdepmod\fR [ \fB-e\fR ] [ \fB-F\fISystem.map\fB\fR ] [ \fB-n\fR ] [ \fB-v\fR ] [ \fB\fIversion\fB\fR ] [ \fB\fIfilename\fB\fR\fI ...\fR ]
-+
-+.SH "DESCRIPTION"
-+.PP
-+Linux kernel modules can provide services (called "symbols") for
-+other modules to use (using EXPORT_SYMBOL in the code).  If a
-+second module uses this symbol, that second module clearly
-+depends on the first module.  These dependencies can get quite
-+complex.
-+.PP
-+\fBdepmod\fR creates a list of module dependencies,
-+by reading each module under
-+\fI/lib/modules/\fR\fIversion\fR 
-+and determining what symbols it exports, and what symbols it
-+needs.  By default this list is written to
-+\fImodules.dep\fR in the same directory.  If
-+filenames are given on the command line, only those modules are
-+examined (which is rarely useful, unless all modules are
-+listed).
-+.PP
-+If a \fIversion\fR is provided, then that
-+kernel version's module directory is used, rather than the
-+current kernel version (as returned by "uname -r").
-+.PP
-+\fBdepmod\fR will also generate various map files
-+in this directory, for use by the hotplug infrastructure.
-+.SH "OPTIONS"
-+.TP
-+\fB-a --all \fR
-+Probe all modules. This option is enabled by default if no
-+file names are given in the command-line.
-+.TP
-+\fB-A --quick \fR
-+This option scans to see if any modules are newer than the
-+\fImodules.dep\fR file before any work is done:
-+if not, it silently exits rather than regenerating the files.
-+.TP
-+\fB-b \fIbasedir\fB --basedir \fIbasedir\fB \fR
-+If your modules are not currently in the (normal)
-+directory
-+\fI/lib/modules/\fR\fIversion\fR,
-+but in a staging area, you can specify a
-+\fIbasedir\fR which is prepended to
-+the directory name.  This
-+\fIbasedir\fR is stripped from the
-+resulting \fImodules.dep\fR file, so it
-+is ready to be moved into the normal location.
-+.TP
-+\fB-C --config \fIfile or directory\fB \fR
-+This option overrides the default configuration file
-+(/etc/depmod.conf or /etc/depmod.d/ if that is not found).
-+.TP
-+\fB-e --errsyms \fR
-+When combined with the \fB-F\fR option, this
-+reports any symbols which a module needs which are not
-+supplied by other modules or the kernel.  Normally, any
-+symbols not provided by modules are assumed to be
-+provided by the kernel (which should be true in a
-+perfect world).
-+.TP
-+\fB-F --filesyms \fISystem.map\fB \fR
-+Supplied with the \fISystem.map\fR produced
-+when the kernel was built, this allows the
-+\fB-e\fR option to report unresolved symbols.
-+.TP
-+\fB-h --help \fR
-+Print the help message, and exit.
-+.TP
-+\fB-n --dry-run \fR
-+This sends the resulting modules.dep, then the various
-+map files, to standard output, rather than writing them into
-+the module directory.
-+.TP
-+\fB-v --verbose \fR
-+In verbose mode \fBdepmod\fR will print (to stdout)
-+all the symbols each module depends on and the module's file name
-+which provides that symbol.
-+.TP
-+\fB-V --version \fR
-+Show version of program, and exit. See below for caveats when
-+run on older kernels.
-+.SH "BACKWARDS COMPATIBILITY"
-+.PP
-+This version of \fBdepmod\fR is for kernels
-+2.5.48 and above.  If it detects a kernel
-+with support for old-style modules, or the version specified is
-+before 2.5.48, it will attempt to run
-+\fBdepmod.old\fR in its place, so it is completely
-+transparent to the user.
-+.SH "COPYRIGHT"
-+.PP
-+This manual page Copyright 2002, Rusty Russell, IBM Corporation.
-+.SH "SEE ALSO"
-+.PP
-+\fBmodprobe\fR(8),
-+\fBmodules.dep\fR(5),
-+\fBdepmod.old\fR(8)
-diff -Naur module-init-tools-3.4/depmod.conf.5 module-init-tools-3.4-with-man/depmod.conf.5
---- module-init-tools-3.4/depmod.conf.5	1970-01-01 01:00:00.000000000 +0100
-+++ module-init-tools-3.4-with-man/depmod.conf.5	2008-01-14 00:43:36.000000000 +0000
-@@ -0,0 +1,64 @@
-+.\" This manpage has been automatically generated by docbook2man 
-+.\" from a DocBook document.  This tool can be found at:
-+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-+.\" Please send any bug reports, improvements, comments, patches, 
-+.\" etc. to Steve Cheng <steve@ggi-project.org>.
-+.TH "DEPMOD.CONF" "5" "14 January 2008" "" ""
-+
-+.SH NAME
-+depmod.conf, depmod.d \- Configuration file/directory for depmod
-+.SH "DESCRIPTION"
-+.PP
-+The order in which modules are processed by the
-+\fBdepmod\fR command can be altered on a global or
-+per-module basis. This is typically useful in cases where built-in
-+kernel modules are complemented by custom built versions of the
-+same and the user wishes to affect the priority of processing in
-+order to override the module version supplied by the kernel.
-+.PP
-+The format of \fIdepmod.conf\fR and files under \fIdepmod.d\fR is simple: one
-+command per line, with blank lines and lines starting with #
-+ignored (useful for adding comments).  A \\ at the end of a line
-+causes it to continue on the next line, which makes the file a
-+bit neater.
-+.SH "COMMANDS"
-+.TP
-+\fBsearch \fIsubdirectory...\fB \fR
-+This allows you to specify the order in which /lib/modules
-+(or other configured module location) subdirectories will
-+be processed by \fBdepmod\fR\&. Directories are
-+listed in order, with the highest priority given to the
-+first listed directory and the lowest to the last. The
-+special keyword \fBbuilt-in\fR refers to
-+the standard module directories installed by the kernel.
-+
-+By default, depmod will give a higher priority to 
-+a directory with the name \fBupdates\fR
-+using this built-in search string: "updates built-in"
-+but more complex arrangements are possible and are
-+used in several popular distributions.
-+.TP
-+\fBoverride \fImodulename\fB \fIkernelversion\fB \fImodulesubdirectory\fB \fR
-+This command allows you to override which version of a
-+specific module will be used when more than one module
-+sharing the same name is processed by the
-+\fBdepmod\fR command. It is possible to
-+specify one kernel or all kernels using the * wildcard.
-+\fImodulesubdirectory\fR is the
-+name of the subdirectory under /lib/modules (or other
-+module location) where the target module is installed.
-+
-+For example, it is possible to override the priority of
-+an updated test module called \fBkmp\fR by
-+specifying the following command: "override kmp * extra".
-+This will ensure that any matching module name installed
-+under the \fBextra\fR subdirectory within
-+/lib/modules (or other module location) will take priority
-+over any likenamed module already provided by the kernel.
-+.TP
-+\fBinclude \fIfilename\fB \fR
-+Using this command, you can include other configuration
-+files, or whole directories, which is occasionally useful.
-+.SH "COPYRIGHT"
-+.PP
-+This manual page Copyright 2006, Jon Masters, Red Hat, Inc.
-diff -Naur module-init-tools-3.4/insmod.8 module-init-tools-3.4-with-man/insmod.8
---- module-init-tools-3.4/insmod.8	1970-01-01 01:00:00.000000000 +0100
-+++ module-init-tools-3.4-with-man/insmod.8	2008-01-14 00:43:38.000000000 +0000
-@@ -0,0 +1,43 @@
-+.\" This manpage has been automatically generated by docbook2man 
-+.\" from a DocBook document.  This tool can be found at:
-+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-+.\" Please send any bug reports, improvements, comments, patches, 
-+.\" etc. to Steve Cheng <steve@ggi-project.org>.
-+.TH "INSMOD" "8" "14 January 2008" "" ""
-+
-+.SH NAME
-+insmod \- simple program to insert a module into the Linux Kernel
-+.SH SYNOPSIS
-+
-+\fBinsmod\fR [ \fB\fIfilename\fB\fR ] [ \fB\fImodule options\fB\fR\fI ...\fR ]
-+
-+.SH "DESCRIPTION"
-+.PP
-+\fBinsmod\fR is a trivial program to insert a
-+module into the kernel: if the
-+\fIfilename\fR is a hyphen, the module is
-+taken from standard input. Most users will want to use
-+\fBmodprobe\fR(8) instead, which is
-+cleverer.
-+.PP
-+Only the most general of error messages are reported: as the
-+work of trying to link the module is now done inside the kernel,
-+the \fBdmesg\fR usually gives more information
-+about errors.
-+.SH "BACKWARDS COMPATIBILITY"
-+.PP
-+This version of \fBinsmod\fR is for kernels
-+2.5.48 and above.  If it detects a kernel
-+with support for old-style modules (for which much of the work
-+was done in userspace), it will attempt to run
-+\fBinsmod.old\fR in its place, so it is
-+completely transparent to the user.
-+.SH "COPYRIGHT"
-+.PP
-+This manual page Copyright 2002, Rusty Russell, IBM Corporation.
-+.SH "SEE ALSO"
-+.PP
-+\fBmodprobe\fR(8),
-+\fBrmmod\fR(8),
-+\fBlsmod\fR(8),
-+\fBinsmod.old\fR(8)
-diff -Naur module-init-tools-3.4/lsmod.8 module-init-tools-3.4-with-man/lsmod.8
---- module-init-tools-3.4/lsmod.8	1970-01-01 01:00:00.000000000 +0100
-+++ module-init-tools-3.4-with-man/lsmod.8	2008-01-14 00:43:39.000000000 +0000
-@@ -0,0 +1,32 @@
-+.\" This manpage has been automatically generated by docbook2man 
-+.\" from a DocBook document.  This tool can be found at:
-+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-+.\" Please send any bug reports, improvements, comments, patches, 
-+.\" etc. to Steve Cheng <steve@ggi-project.org>.
-+.TH "LSMOD" "8" "14 January 2008" "" ""
-+
-+.SH NAME
-+lsmod \- program to show the status of modules in the Linux Kernel
-+.SH SYNOPSIS
-+
-+\fBlsmod\fR
-+
-+.SH "DESCRIPTION"
-+.PP
-+\fBlsmod\fR is a trivial program which nicely
-+formats the contents of the \fI/proc/modules\fR,
-+showing what kernel modules are currently loaded.
-+.SH "BACKWARDS COMPATIBILITY"
-+.PP
-+This version of \fBlsmod\fR is for kernels
-+2.5.48 and above.  If it detects a kernel
-+with support for old-style modules, it will attempt to run
-+\fBlsmod.old\fR in its place, so it is completely
-+transparent to the user.
-+.SH "COPYRIGHT"
-+.PP
-+This manual page Copyright 2002, Rusty Russell, IBM Corporation.
-+.SH "SEE ALSO"
-+.PP
-+\fBmodprobe\fR(8),
-+\fBlsmod.old\fR(8)
-diff -Naur module-init-tools-3.4/modinfo.8 module-init-tools-3.4-with-man/modinfo.8
---- module-init-tools-3.4/modinfo.8	1970-01-01 01:00:00.000000000 +0100
-+++ module-init-tools-3.4-with-man/modinfo.8	2008-01-14 00:43:42.000000000 +0000
-@@ -0,0 +1,98 @@
-+.\" This manpage has been automatically generated by docbook2man 
-+.\" from a DocBook document.  This tool can be found at:
-+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-+.\" Please send any bug reports, improvements, comments, patches, 
-+.\" etc. to Steve Cheng <steve@ggi-project.org>.
-+.TH "MODINFO" "8" "14 January 2008" "" ""
-+
-+.SH NAME
-+modinfo \- program to show information about a Linux Kernel module
-+.SH SYNOPSIS
-+
-+\fBmodinfo\fR [ \fB-0\fR ] [ \fB-F \fIfield\fB\fR ] [ \fB-k \fIkernel\fB\fR ] [ \fBmodulename|filename\fR\fI ...\fR ]
-+
-+
-+\fBmodinfo -V\fR
-+
-+
-+\fBmodinfo -h\fR
-+
-+.SH "DESCRIPTION"
-+.PP
-+\fBmodinfo\fR extracts information from the Linux
-+Kernel modules given on the command line.  If the module name is
-+not a filename, then the
-+\fI/lib/modules/\fR\fIversion\fR
-+directory is searched, as done by
-+\fBmodprobe\fR(8)\&.
-+.PP
-+\fBmodinfo\fR by default lists each attribute
-+of the module in form \fIfieldname\fR :
-+\fIvalue\fR, for easy reading.  The
-+filename is listed the same way (although it's not really an
-+attribute).
-+.PP
-+This version of \fBmodinfo\fR can understand
-+modules of any Linux Kernel architecture.
-+.SH "OPTIONS"
-+.TP
-+\fB-V --version \fR
-+Print the modinfo version.  Note BACKWARDS COMPATIBILITY
-+below: you might be printing the version of
-+\fBmodinfo.old\fR\&.
-+.TP
-+\fB-F --field \fR
-+Only print this field value, one per line.  This is most
-+useful for scripts.  Field names are case-insenitive.
-+Common fields (which may not be in every module) include
-+author, description,
-+license, param,
-+depends, and alias\&.
-+There are often multiple param,
-+alias and depends
-+fields.  The special field filename
-+lists the filename of the module.
-+.TP
-+\fB-k \fIkernel\fB \fR
-+Provide information about a kernel other than the running one. This
-+is particularly useful for distributions needing to extract
-+information from a newly installed (but not yet running) set of
-+kernel modules. For example, you wish to find which firmware files
-+are needed by various modules in a new kernel for which you must
-+make an initrd image prior to booting.
-+.TP
-+\fB-0 --null \fR
-+Use the ASCII zero character to separate field values,
-+instead of a new line.  This is useful for scripts, since
-+a new line can theoretically appear inside a field.
-+.TP
-+\fB-a -d -l -p -n \fR
-+These are shortcuts for author,
-+description,
-+license\&.  param and
-+filename respectively, to ease the
-+transition from the old modutils
-+\fBmodinfo\fR\&.
-+.SH "BACKWARDS COMPATIBILITY"
-+.PP
-+This version of \fBmodinfo\fR is for kernel
-+modules 2.5.48 and above.  If it detects a
-+kernel with support for old-style modules, it will attempt to
-+run \fBmodprobe.old\fR in its place, so it is
-+completely transparent to the user.
-+.PP
-+Note that the output of this version of
-+\fBmodinfo\fR is simpler and more regular than
-+the older version: scripts attempting to use the default
-+output may get confused with complex fields.
-+.PP
-+You can force the new \fBmodinfo\fR to always
-+be used, by setting the NEW_MODINFO
-+environment variable.
-+.SH "COPYRIGHT"
-+.PP
-+This manual page Copyright 2003, Rusty Russell, IBM Corporation.
-+.SH "SEE ALSO"
-+.PP
-+\fBmodprobe\fR(8),
-+\fBmodinfo.old\fR(8)
-diff -Naur module-init-tools-3.4/modprobe.8 module-init-tools-3.4-with-man/modprobe.8
---- module-init-tools-3.4/modprobe.8	1970-01-01 01:00:00.000000000 +0100
-+++ module-init-tools-3.4-with-man/modprobe.8	2008-01-14 00:43:41.000000000 +0000
-@@ -0,0 +1,254 @@
-+.\" This manpage has been automatically generated by docbook2man 
-+.\" from a DocBook document.  This tool can be found at:
-+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-+.\" Please send any bug reports, improvements, comments, patches, 
-+.\" etc. to Steve Cheng <steve@ggi-project.org>.
-+.TH "MODPROBE" "8" "14 January 2008" "" ""
-+
-+.SH NAME
-+modprobe \- program to add and remove modules from the Linux Kernel
-+.SH SYNOPSIS
-+
-+\fBmodprobe\fR [ \fB-v\fR ] [ \fB-V\fR ] [ \fB-C \fIconfig-file\fB\fR ] [ \fB-n\fR ] [ \fB-i\fR ] [ \fB-q\fR ] [ \fB-o \fImodulename\fB\fR ] [ \fB\fImodulename\fB\fR ] [ \fB\fImodule parameters\fB\fR\fI ...\fR ]
-+
-+
-+\fBmodprobe\fR [ \fB-r\fR ] [ \fB-v\fR ] [ \fB-n\fR ] [ \fB-i\fR ] [ \fB\fImodulename\fB\fR\fI ...\fR ]
-+
-+
-+\fBmodprobe\fR [ \fB-l\fR ] [ \fB-t \fIdirname\fB\fR ] [ \fB\fIwildcard\fB\fR ]
-+
-+
-+\fBmodprobe\fR [ \fB-c\fR ]
-+
-+
-+\fBmodprobe\fR [ \fB--dump-modversions\fR ]
-+
-+.SH "DESCRIPTION"
-+.PP
-+\fBmodprobe\fR intelligently adds or removes a
-+module from the Linux kernel: note that for convenience, there
-+is no difference between _ and - in module names.
-+\fBmodprobe\fR looks in the module directory
-+\fI/lib/modules/`uname -r`\fR for all
-+the modules and other files, except for the optional
-+\fI/etc/modprobe.conf\fR configuration file and
-+\fI/etc/modprobe.d\fR directory
-+(see \fBmodprobe.conf\fR(5)).
-+.PP
-+Note that this version of \fBmodprobe\fR does not
-+do anything to the module itself: the work of resolving symbols
-+and understanding parameters is done inside the kernel.  So
-+module failure is sometimes accompanied by a kernel message: see
-+\fBdmesg\fR(8)\&.
-+.PP
-+\fBmodprobe\fR expects an up-to-date
-+\fImodules.dep\fR file, as generated by
-+\fBdepmod\fR (see \fBdepmod\fR(8)).  This file lists what other modules each
-+module needs (if any), and \fBmodprobe\fR uses this
-+to add or remove these dependencies automatically.  See
-+\fBmodules.dep\fR(5)).
-+.PP
-+If any arguments are given after the
-+\fImodulename\fR, they are passed to the
-+kernel (in addition to any options listed in the configuration
-+file).
-+.SH "OPTIONS"
-+.TP
-+\fB-v --verbose \fR
-+Print messages about what the program is doing.  Usually
-+\fBmodprobe\fR only prints messages if
-+something goes wrong.
-+
-+This option is passed through \fBinstall\fR
-+or \fBremove\fR commands to other
-+\fBmodprobe\fR commands in the
-+MODPROBE_OPTIONS environment variable.
-+.TP
-+\fB-C --config \fR
-+This option overrides the default configuration file
-+(\fI/etc/modprobe.conf\fR or 
-+\fI/etc/modprobe.d/\fR if that isn't found).
-+
-+This option is passed through \fBinstall\fR
-+or \fBremove\fR commands to other
-+\fBmodprobe\fR commands in the
-+MODPROBE_OPTIONS environment variable.
-+.TP
-+\fB-c --showconfig \fR
-+Dump out the configuration file and exit.
-+.TP
-+\fB-n --dry-run \fR
-+This option does everything but actually insert or
-+delete the modules (or run the install or remove
-+commands).  Combined with \fB-v\fR, it is
-+useful for debugging problems.
-+.TP
-+\fB-i --ignore-install --ignore-remove \fR
-+This option causes \fBmodprobe\fR to
-+ignore \fBinstall\fR and
-+\fBremove\fR commands in the
-+configuration file (if any), for the module on the
-+command line (any dependent modules are still subject
-+to commands set for them in the configuration file).
-+See \fBmodprobe.conf\fR(5)\&.
-+.TP
-+\fB-q --quiet \fR
-+Normally \fBmodprobe\fR will report an error
-+if you try to remove or insert a module it can't find (and
-+isn't an alias or
-+\fBinstall\fR/\fBremove\fR
-+command).  With this flag, \fBmodprobe\fR
-+will simply ignore any bogus names (the kernel uses this
-+to opportunistically probe for modules which might exist).
-+.TP
-+\fB-r --remove \fR
-+This option causes \fBmodprobe\fR to remove,
-+rather than insert a module.  If the modules it depends on
-+are also unused, \fBmodprobe\fR will try to
-+remove them, too.  Unlike insertion, more than one module
-+can be specified on the command line (it does not make
-+sense to specify module parameters when removing modules).
-+
-+There is usually no reason to remove modules, but some
-+buggy modules require it.  Your kernel may not support
-+removal of modules.
-+.TP
-+\fB-w --wait \fR
-+This option is applicable only with the -r or --remove option.
-+It causes modprobe to block in the kernel (within the kernel
-+module handling code itself) waiting for the specified modules'
-+reference count to reach zero. Default operation is for modprobe
-+to operate like rmmod, which exits with EWOULDBLOCK if the
-+modules reference count is non-zero.
-+.TP
-+\fB-V --version \fR
-+Show version of program, and exit.  See below for caveats when run on older kernels.
-+.TP
-+\fB-f --force \fR
-+Try to strip any versioning information from the module,
-+which might otherwise stop it from loading: this is the
-+same as using both \fB--force-vermagic\fR and
-+\fB--force-modversion\fR\&.  Naturally, these
-+checks are there for your protection, so using this option
-+is dangerous.
-+
-+This applies to any modules inserted: both the module (or
-+alias) on the command line, and any modules it depends on.
-+.TP
-+\fB--force-vermagic \fR
-+Every module contains a small string containing important
-+information, such as the kernel and compiler versions.  If
-+a module fails to load and the kernel complains that the
-+"version magic" doesn't match, you can use this option to
-+remove it.  Naturally, this check is there for your
-+protection, so this using option is dangerous.
-+
-+This applies to any modules inserted: both the module (or
-+alias) on the command line, and any modules it depends on.
-+.TP
-+\fB--force-modversion \fR
-+When modules are compiled with CONFIG_MODVERSIONS set, a
-+section is created detailing the versions of every
-+interface used by (or supplied by) the module.  If a
-+module fails to load and the kernel complains that the
-+module disagrees about a version of some interface, you
-+can use "--force-modversion" to remove the version
-+information altogether.  Naturally, this check is there
-+for your protection, so using this option is dangerous.
-+
-+This applies any modules inserted: both the module (or
-+alias) on the command line, and any modules it depends on.
-+.TP
-+\fB-l --list \fR
-+List all modules matching the given wildcard (or "*"
-+if no wildcard is given).  This option is provided for
-+backwards compatibility: see
-+\fBfind\fR(1) and
-+\fBbasename\fR(1) for a more flexible alternative.
-+.TP
-+\fB-a --all \fR
-+Insert all module names on the command line.
-+.TP
-+\fB-t --type \fR
-+Restrict \fB-l\fR to modules
-+in directories matching the
-+\fIdirname\fR given.  This option
-+is provided for backwards compatibility: see
-+\fBfind\fR(1)
-+and
-+\fBbasename\fR(1) or a more flexible alternative.
-+.TP
-+\fB-s --syslog \fR
-+This option causes any error messages to go through the
-+syslog mechanism (as LOG_DAEMON with level LOG_NOTICE)
-+rather than to standard error.  This is also automatically
-+enabled when stderr is unavailable.
-+
-+This option is passed through \fBinstall\fR
-+or \fBremove\fR commands to other
-+\fBmodprobe\fR commands in the
-+MODPROBE_OPTIONS environment variable.
-+.TP
-+\fB--set-version \fR
-+Set the kernel version, rather than using
-+\fBuname\fR(2) to decide on the kernel version (which dictates where to
-+find the modules).  This also disables backwards
-+compatibility checks (so 
-+\fBmodprobe.old\fR(8) will never be run).
-+.TP
-+\fB--show-depends \fR
-+List the dependencies of a module (or alias), including
-+the module itself.  This produces a (possibly empty) set
-+of module filenames, one per line, each starting with
-+"insmod".  Install commands which apply are shown prefixed by
-+"install".  It does not run any of the install commands.  Note that
-+\fBmodinfo\fR(8)
-+can be used to extract dependencies of a module from the
-+module itself, but knows nothing of aliases or install commands.
-+.TP
-+\fB-o --name \fR
-+This option tries to rename the module which is being
-+inserted into the kernel.  Some testing modules can
-+usefully be inserted multiple times, but the kernel
-+refuses to have two modules of the same name.  Normally,
-+modules should not require multiple insertions, as that
-+would make them useless if there were no module support.
-+.TP
-+\fB--first-time \fR
-+Normally, \fBmodprobe\fR will succeed (and do
-+nothing) if told to insert a module which is already
-+present, or remove a module which isn't present.  This is
-+backwards compatible with the modutils, and ideal for
-+simple scripts.  However, more complicated scripts often
-+want to know whether \fBmodprobe\fR really
-+did something: this option makes modprobe fail for that
-+case.
-+.TP
-+\fB--dump-modversions \fR
-+Print out a list of module versioning information required by a
-+module. This option is commonly used by distributions in order to
-+package up a Linuxx kernel module using module versioning deps.
-+.TP
-+\fB--use-blacklist \fR
-+Apply a matchin blacklist entry also to a request by module name,
-+not only to a request by an alias.
-+.SH "BACKWARDS COMPATIBILITY"
-+.PP
-+This version of \fBmodprobe\fR is for kernels
-+2.5.48 and above.  If it detects a kernel
-+with support for old-style modules (for which much of the work
-+was done in userspace), it will attempt to run
-+\fBmodprobe.old\fR in its place, so it is
-+completely transparent to the user.
-+.SH "ENVIRONMENT"
-+.PP
-+The MODPROBE_OPTIONS environment variable can also be used to
-+pass arguments to \fBmodprobe\fR\&.
-+.SH "COPYRIGHT"
-+.PP
-+This manual page Copyright 2002, Rusty Russell, IBM Corporation.
-+.SH "SEE ALSO"
-+.PP
-+\fBmodprobe.conf\fR(5),
-+\fBlsmod\fR(8),
-+\fBmodprobe.old\fR(8)
-diff -Naur module-init-tools-3.4/modprobe.conf.5 module-init-tools-3.4-with-man/modprobe.conf.5
---- module-init-tools-3.4/modprobe.conf.5	1970-01-01 01:00:00.000000000 +0100
-+++ module-init-tools-3.4-with-man/modprobe.conf.5	2008-01-14 00:43:34.000000000 +0000
-@@ -0,0 +1,146 @@
-+.\" This manpage has been automatically generated by docbook2man 
-+.\" from a DocBook document.  This tool can be found at:
-+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-+.\" Please send any bug reports, improvements, comments, patches, 
-+.\" etc. to Steve Cheng <steve@ggi-project.org>.
-+.TH "MODPROBE.CONF" "5" "14 January 2008" "" ""
-+
-+.SH NAME
-+modprobe.conf, modprobe.d \- Configuration file/directory for modprobe
-+.SH "DESCRIPTION"
-+.PP
-+Because the \fBmodprobe\fR command can add or
-+remove extra more than one module, due to module dependencies,
-+we need a method of specifying what options are to be used with
-+those modules.  \fI/etc/modprobe.conf\fR (or, if that does not exist, all files under the \fI/etc/modprobe.d\fR directory) specifies
-+those options, as required.  It can also be used to create
-+convenient aliases: alternate names for a module.  Finally, it
-+can override the normal \fBmodprobe\fR behavior
-+altogether, for those with very special requirements (such as
-+inserting more than one module).
-+.PP
-+Note that module and alias names (like other module names) can
-+have - or _ in them: both are interchangable throughout all the
-+module commands.
-+.PP
-+The format of \fImodprobe.conf\fR and files under \fImodprobe.d\fR is simple: one
-+command per line, with blank lines and lines starting with #
-+ignored (useful for adding comments).  A \\ at the end of a line
-+causes it to continue on the next line, which makes the file a
-+bit neater.
-+.PP
-+The syntax is a simplification of \fImodules.conf\fR, used in 2.4 kernels and earlier.
-+.SH "COMMANDS"
-+.TP
-+\fBalias \fIwildcard\fB \fImodulename\fB \fR
-+This allows you to give alternate names for a module.  For
-+example: "alias my-mod really_long_modulename"
-+means you can use "modprobe my-mod" instead of "modprobe
-+really_long_modulename".  You can also use shell-style
-+wildcards, so "alias my-mod* really_long_modulename"
-+means that "modprobe my-mod-something" has the same
-+effect.  You can't have aliases to other aliases (that
-+way lies madness), but aliases can have options, which
-+will be added to any other options.
-+
-+Note that modules can also contain their own aliases,
-+which you can see using \fBmodinfo\fR\&.  These
-+aliases are used as a last resort (ie. if there is no real
-+module, \fBinstall\fR,
-+\fBremove\fR, or \fBalias\fR
-+command in the configuration).
-+.TP
-+\fBoptions \fImodulename\fB \fIoption...\fB \fR
-+This command allows you to add options to the module
-+\fImodulename\fR (which might be an
-+alias) every time it is inserted into the kernel: whether
-+directly (using \fBmodprobe\fR 
-+\fImodulename\fR, or because the
-+module being inserted depends on this module.
-+
-+All options are added together: they can come from an
-+\fBoption\fR for the module itself, for an
-+alias, and on the command line.
-+.TP
-+\fBinstall \fImodulename\fB \fIcommand...\fB \fR
-+This is the most powerful primitive in
-+\fImodprobe.conf\fR: it tells
-+\fBmodprobe\fR to run your command instead of
-+inserting the module in the kernel as normal.  The command
-+can be any shell command: this allows you to do any kind
-+of complex processing you might wish.  For example, if the
-+module "fred" worked better with the module "barney"
-+already installed (but it didn't depend on it, so
-+\fBmodprobe\fR won't automatically load it),
-+you could say "install fred /sbin/modprobe barney;
-+/sbin/modprobe --ignore-install fred", which would do what
-+you wanted.  Note the \fB--ignore-install\fR,
-+which stops the second \fBmodprobe\fR from
-+re-running the same \fBinstall\fR command.
-+See also \fBremove\fR below.
-+
-+You can also use \fBinstall\fR to make up
-+modules which don't otherwise exist.  For example:
-+"install probe-ethernet /sbin/modprobe e100 ||
-+/sbin/modprobe eepro100", which will try first the e100
-+driver, then the eepro100 driver, when you do "modprobe
-+probe-ethernet".
-+
-+If you use the string "$CMDLINE_OPTS" in the command, it
-+will be replaced by any options specified on the modprobe
-+command line.  This can be useful because users expect
-+"modprobe fred opt=1" to pass the "opt=1" arg to the
-+module, even if there's an install command in the
-+configuration file.  So our above example becomes "install
-+fred /sbin/modprobe barney; /sbin/modprobe
-+--ignore-install fred $CMDLINE_OPTS"
-+.TP
-+\fBremove \fImodulename\fB \fIcommand...\fB \fR
-+This is similar to the \fBinstall\fR command
-+above, except it is invoked when "modprobe -r" is run.
-+The removal counterparts to the two examples above would
-+be: "remove fred /sbin/modprobe -r --ignore-remove fred &&
-+/sbin/modprobe -r barney", and "remove probe-ethernet
-+/sbin/modprobe -r eepro100 || /sbin/modprobe -r e100".
-+.TP
-+\fBinclude \fIfilename\fB \fR
-+Using this command, you can include other configuration
-+files, or whole directories, which is occasionally useful.  Note that aliases in
-+the included file will override aliases previously
-+declared in the current file.
-+.TP
-+\fBblacklist \fImodulename\fB \fR
-+Modules can contain their own aliases: usually these are
-+aliases describing the devices they support, such as
-+"pci:123...".  These "internal" aliases can be overridden
-+by normal "alias" keywords, but there are cases where two
-+or more modules both support the same devices, or a module
-+invalidly claims to support a device: the
-+\fBblacklist\fR keyword indicates that all of
-+that particular module's internal aliases are to be ignored.
-+.SH "BACKWARDS COMPATIBILITY"
-+.PP
-+There is a \fBgenerate_modprobe.conf\fR program
-+which should do a reasonable job of generating
-+\fImodprobe.conf\fR from your current (2.4 or
-+2.2) modules setup.
-+.PP
-+Although the syntax is similar to the older
-+\fI/etc/modules.conf\fR, there are many features
-+missing.  There are two reasons for this: firstly, install and
-+remove commands can do just about anything, and secondly, the
-+module-init-tools modprobe is designed to be simple enough that
-+it can be easily replaced.
-+.PP
-+With the complexity of actual module insertion reduced to three
-+system calls (open, read, init_module), and the
-+\fImodules.dep\fR file being simple and open,
-+producing a more powerful modprobe variant can be done
-+independently if there is a need.
-+.SH "COPYRIGHT"
-+.PP
-+This manual page Copyright 2004, Rusty Russell, IBM Corporation.
-+.SH "SEE ALSO"
-+.PP
-+\fBmodprobe\fR(8),
-+\fBmodules.dep\fR(5)
-diff -Naur module-init-tools-3.4/modules.dep.5 module-init-tools-3.4-with-man/modules.dep.5
---- module-init-tools-3.4/modules.dep.5	1970-01-01 01:00:00.000000000 +0100
-+++ module-init-tools-3.4-with-man/modules.dep.5	2008-01-14 00:43:35.000000000 +0000
-@@ -0,0 +1,45 @@
-+.\" This manpage has been automatically generated by docbook2man 
-+.\" from a DocBook document.  This tool can be found at:
-+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-+.\" Please send any bug reports, improvements, comments, patches, 
-+.\" etc. to Steve Cheng <steve@ggi-project.org>.
-+.TH "MODULES.DEP" "5" "14 January 2008" "" ""
-+
-+.SH NAME
-+modules.dep \- List of module dependencies
-+.SH "DESCRIPTION"
-+.PP
-+The \fImodules.dep\fR as generated by
-+module-init-tools \fBdepmod\fR, lists the
-+dependencies for every module in the directories under
-+\fI/lib/modules/\fR\fIversion\fR,
-+where \fImodules.dep\fR is.
-+.PP
-+Blank lines, and lines starting with a '#' (ignoring spaces) are
-+ignored.  Other lines are of the form "filename: [filename]*",
-+listing the complete dependencies for the first filename in
-+descending order.
-+.PP
-+For example, if
-+\fI/lib/modules/2.5.53/kernel/a.ko\fR depended on
-+\fIb.ko\fR and \fIc.ko\fR in the
-+same directory, and \fIc.ko\fR depended on
-+\fIb.ko\fR as well, the file might look like:
-+
-+.nf
-+# This is a comment.
-+/lib/modules/2.5.53/kernel/a.ko: /lib/modules/2.5.53/kernel/c.ko /lib/modules/2.5.53/kernel/b.ko
-+/lib/modules/2.5.53/kernel/b.ko:
-+/lib/modules/2.5.53/kernel/c.ko: /lib/modules/2.5.53/kernel/b.ko
-+    
-+.fi
-+.PP
-+This file is used by \fBmodprobe\fR to know the
-+order to load modules (they are loaded right to left, and
-+removed left to right).
-+.SH "COPYRIGHT"
-+.PP
-+This manual page Copyright 2002, Rusty Russell, IBM Corporation.
-+.SH "SEE ALSO"
-+.PP
-+\fBmodprobe\fR(8)
-diff -Naur module-init-tools-3.4/rmmod.8 module-init-tools-3.4-with-man/rmmod.8
---- module-init-tools-3.4/rmmod.8	1970-01-01 01:00:00.000000000 +0100
-+++ module-init-tools-3.4-with-man/rmmod.8	2008-01-14 00:43:40.000000000 +0000
-@@ -0,0 +1,64 @@
-+.\" This manpage has been automatically generated by docbook2man 
-+.\" from a DocBook document.  This tool can be found at:
-+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
-+.\" Please send any bug reports, improvements, comments, patches, 
-+.\" etc. to Steve Cheng <steve@ggi-project.org>.
-+.TH "RMMOD" "8" "14 January 2008" "" ""
-+
-+.SH NAME
-+rmmod \- simple program to remove a module from the Linux Kernel
-+.SH SYNOPSIS
-+
-+\fBrmmod\fR [ \fB-f\fR ] [ \fB-w\fR ] [ \fB-s\fR ] [ \fB-v\fR ] [ \fB\fImodulename\fB\fR ]
-+
-+.SH "DESCRIPTION"
-+.PP
-+\fBrmmod\fR is a trivial program to remove a
-+module from the kernel.  Most users will want to use
-+\fBmodprobe\fR(8) instead, with the \fB-r\fR option.
-+.SH "OPTIONS"
-+.TP
-+\fB-v --verbose \fR
-+Print messages about what the program is doing.
-+Usually \fBrmmod\fR only prints messages
-+if something goes wrong.
-+.TP
-+\fB-f --force \fR
-+This option can be extremely dangerous: it has no effect unless
-+CONFIG_MODULE_FORCE_UNLOAD was set when the kernel was
-+compiled.  With this option, you can remove modules which are
-+being used, or which are not designed to be removed, or have
-+been marked as unsafe (see \fBlsmod\fR(8)).
-+.TP
-+\fB-w --wait \fR
-+Normally, \fBrmmod\fR will refuse to
-+unload modules which are in use.  With this option,
-+\fBrmmod\fR will isolate the module, and
-+wait until the module is no longer used.  Noone new
-+will be able to use the module, but it's up to you to
-+make sure the current users eventually finish with it.
-+See \fBlsmod\fR(8)) for information on usage counts.
-+.TP
-+\fB-s --syslog \fR
-+Send errors to the syslog, instead of standard error.
-+.TP
-+\fB-V --version \fR
-+Show version of program, and exit.  See below for caveats
-+when run on older kernels.
-+.SH "BACKWARDS COMPATIBILITY"
-+.PP
-+This version of \fBrmmod\fR is for kernels
-+2.5.48 and above.  If it detects a kernel
-+with support for old-style modules (for which much of the work
-+was done in userspace), it will attempt to run
-+\fBrmmod.old\fR in its place, so it is completely
-+transparent to the user.
-+.SH "COPYRIGHT"
-+.PP
-+This manual page Copyright 2002, Rusty Russell, IBM Corporation.
-+.SH "SEE ALSO"
-+.PP
-+\fBmodprobe\fR(8),
-+\fBinsmod\fR(8),
-+\fBlsmod\fR(8),
-+\fBrmmod.old\fR(8)
Index: tches/ncurses-5.6-bash_fix-1.patch
===================================================================
--- patches/ncurses-5.6-bash_fix-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,21 +1,0 @@
-Submitted by: Jim Gifford (patches at jg555 dot com)
-Date: 2007-02-15
-Initial Package Version: 5.6
-Upstream Status: Sent
-Origin: Jim Gifford
-Description: Fixes Ncurses to utilize a buggy version of Bash
-
-diff -Naur ncurses-5.6.orig/include/MKhashsize.sh ncurses-5.6/include/MKhashsize.sh
---- ncurses-5.6.orig/include/MKhashsize.sh	2006-10-21 17:45:39.000000000 -0700
-+++ ncurses-5.6/include/MKhashsize.sh	2007-02-15 07:16:46.000000000 -0800
-@@ -35,7 +35,7 @@
- echo " */"
- 
- CAPS="${1-Caps}"
--TABSIZE=`grep -v '^[ #]' $CAPS | grep -v "^$" | grep -v "^capalias"| grep -v "^infoalias" | wc -l`
-+TABSIZE=$(grep -v '^[ #]' $CAPS | grep -v "^$" | grep -v "^capalias"| grep -v "^infoalias" | wc -l)
- 
- echo ""
- echo "#define CAPTABSIZE	${TABSIZE}"
-
-
Index: tches/ncurses-5.6-branch_update-3.patch
===================================================================
--- patches/ncurses-5.6-branch_update-3.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,152087 +1,0 @@
-Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
-Date: 06-18-2008
-Initial Package Version: 5.6
-Origin: Upstream
-Upstream Status: Applied
-Description: This is a branch update for NCurses-5.6, and should be
-             rechecked periodically. This patch covers up to 5.6-20080614.
-
-diff -Naur ncurses-5.6.orig/Ada95/gen/Makefile.in ncurses-5.6/Ada95/gen/Makefile.in
---- ncurses-5.6.orig/Ada95/gen/Makefile.in	2006-12-17 11:53:33.000000000 -0500
-+++ ncurses-5.6/Ada95/gen/Makefile.in	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- ##############################################################################
--# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -28,7 +28,7 @@
- #
- #  Author:  Juergen Pfeifer, 1996
- #
--#  $Id: Makefile.in,v 1.51 2006/12/17 16:53:33 tom Exp $
-+#  $Id: Makefile.in,v 1.60 2007/09/15 17:55:33 tom Exp $
- #
- .SUFFIXES:
- 
-@@ -42,10 +42,13 @@
- srcdir		= @srcdir@
- prefix		= @prefix@
- exec_prefix	= @exec_prefix@
-+bindir		= @bindir@
-+
- ADA_INCLUDE	= $(DESTDIR)@ADA_INCLUDE@
- ADA_OBJECTS	= $(DESTDIR)@ADA_OBJECTS@
- 
- INSTALL		= @INSTALL@
-+INSTALL_PROG	= @INSTALL_PROGRAM@
- INSTALL_DATA	= @INSTALL_DATA@
- 
- AWK		= @AWK@
-@@ -78,6 +81,9 @@
- M4		= m4
- M4FLAGS		=
- 
-+ADACURSES_CONFIG = adacurses-config
-+
-+WRAPPER		= sh $(top_srcdir)/misc/shlib
- GENERATE	= ./gen$x '@DFT_ARG_SUFFIX@'
- DEL_ADAMODE	= sed -e '/^\-\-\ \ \-\*\-\ ada\ \-\*\-.*/d'
- 
-@@ -92,17 +98,18 @@
- 
- GEN_FILES0      = Base_Defs
- 
--GEN_FILES1      = Key_Definitions              		\
--		  Old_Keys                     		\
--		  Character_Attribute_Set_Rep  		\
-+GEN_FILES1      = ACS_Map                      		\
- 		  AC_Rep                       		\
-+		  Base_Defs			        \
-+		  Character_Attribute_Set_Rep  		\
- 		  Color_Defs                   		\
--		  ACS_Map                      		\
-+		  Key_Definitions              		\
- 		  Linker_Options               		\
--		  Base_Defs			        \
--		  Window_Offsets                        \
-+		  Old_Keys                     		\
-+		  Public_Variables                      \
-+		  Trace_Defs				\
- 		  Version_Info				\
--		  Trace_Defs
-+		  Window_Offsets
- 
- GEN_FILES2      = Menu_Opt_Rep        		    	\
- 		  Menu_Base_Defs               		\
-@@ -123,6 +130,7 @@
- 		  Eti_Defs
- 
- GEN_TARGETS     = $(ADA_SRCDIR)/$(ABASE).ads         			\
-+		  $(ADA_SRCDIR)/$(ABASE).adb         			\
- 	          $(ADA_SRCDIR)/$(ABASE)-aux.ads   			\
- 	          $(ADA_SRCDIR)/$(ABASE)-trace.ads   			\
- 	          $(ADA_SRCDIR)/$(ABASE)-menus.ads   			\
-@@ -137,6 +145,7 @@
- 	          $(ADA_SRCDIR)/$(ABASE)-panels-user_data.ads
- 
- GEN_SRC		= $(srcdir)/$(ABASE).ads.m4				\
-+		  $(srcdir)/$(ABASE).adb.m4				\
- 	          $(srcdir)/$(ABASE)-aux.ads.m4 	  		\
- 	          $(srcdir)/$(ABASE)-trace.ads.m4 	  		\
- 	          $(srcdir)/$(ABASE)-menus.ads.m4 	  		\
-@@ -159,7 +168,7 @@
- 
- $(ADA_INCLUDE) \
- $(ADA_OBJECTS) :
--	$(top_srcdir)/mkinstalldirs $@
-+	sh $(top_srcdir)/mkdirs.sh $@
- 
- install \
- install.libs :: $(ADA_INCLUDE)
-@@ -177,6 +186,10 @@
- 	@$(top_srcdir)/tar-copy.sh '$(ALIB)[-.]*.ali' $(ADA_SRCDIR) $(ADA_OBJECTS)
- 	@-chmod u+x $(ADA_SRCDIR)/*.ali
- 
-+install \
-+install.libs :: $(DESTDIR)$(bindir) adacurses-config
-+	$(INSTALL_PROG) adacurses-config $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG)
-+
- uninstall \
- uninstall.libs ::
- 	@echo removing package $(ALIB) from $(ADA_INCLUDE)
-@@ -187,93 +200,106 @@
- 	@echo removing package $(ALIB) from $(ADA_OBJECTS)
- 	-@cd $(ADA_OBJECTS) && rm -f $(ALIB)[-.]*
- 
-+uninstall \
-+uninstall.libs ::
-+	-rm -f $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG)
-+
- gen$x:	gen.o
- 	@ECHO_LINK@ $(LINK) $(CFLAGS_NORMAL) gen.o $(LD_FLAGS) -o $@
- 
- gen.o:	$(srcdir)/gen.c
- 	$(HOST_CC) $(CFLAGS_NORMAL) -c -o $@ $(srcdir)/gen.c
--
-+################################################################################
- Character_Attribute_Set_Rep: gen$x
--	$(GENERATE) B A >$@
-+	$(WRAPPER) "$(GENERATE) B A" >$@
- 
- Base_Defs: gen$x
--	$(GENERATE) B B >$@
-+	$(WRAPPER) "$(GENERATE) B B" >$@
- 
- Color_Defs: gen$x
--	$(GENERATE) B C >$@
-+	$(WRAPPER) "$(GENERATE) B C" >$@
-+
-+Window_Offsets: gen$x
-+	$(WRAPPER) "$(GENERATE) B D" >$@
- 
- Key_Definitions: gen$x
--	$(GENERATE) B K >$@
-+	$(WRAPPER) "$(GENERATE) B K" >$@
- 
--Old_Keys: gen$x
--	$(GENERATE) B O >$@
-+Linker_Options: gen$x
-+	$(WRAPPER) "$(GENERATE) B L" >$@
- 
- ACS_Map: gen$x
--	$(GENERATE) B M >$@
-+	$(WRAPPER) "$(GENERATE) B M" >$@
- 
--AC_Rep: gen$x
--	$(GENERATE) B R >$@
-+Old_Keys: gen$x
-+	$(WRAPPER) "$(GENERATE) B O" >$@
- 
--Linker_Options: gen$x
--	$(GENERATE) B L >$@
-+Public_Variables: gen$x
-+	$(WRAPPER) "$(GENERATE) B P" >$@
- 
--Version_Info: gen$x
--	$(GENERATE) B V >$@
-+AC_Rep: gen$x
-+	$(WRAPPER) "$(GENERATE) B R" >$@
- 
--Window_Offsets: gen$x
--	$(GENERATE) B D >$@
-+Version_Info: gen$x
-+	$(WRAPPER) "$(GENERATE) B V" >$@
- 
- Trace_Defs: gen$x
--	$(GENERATE) B T >$@
--
-+	$(WRAPPER) "$(GENERATE) B T" >$@
-+################################################################################
- Menu_Opt_Rep: gen$x
--	$(GENERATE) M R >$@
-+	$(WRAPPER) "$(GENERATE) M R" >$@
- 
- Menu_Base_Defs: gen$x
--	$(GENERATE) M B >$@
-+	$(WRAPPER) "$(GENERATE) M B" >$@
- 
- Menu_Linker_Options: gen$x
--	$(GENERATE) M L >$@
-+	$(WRAPPER) "$(GENERATE) M L" >$@
- 
- Item_Rep: gen$x
--	$(GENERATE) M I >$@
--
-+	$(WRAPPER) "$(GENERATE) M I" >$@
-+################################################################################
- Form_Opt_Rep: gen$x
--	$(GENERATE) F R >$@
-+	$(WRAPPER) "$(GENERATE) F R" >$@
- 
- Form_Base_Defs: gen$x
--	$(GENERATE) F B >$@
-+	$(WRAPPER) "$(GENERATE) F B" >$@
- 
- Form_Linker_Options: gen$x
--	$(GENERATE) F L >$@
-+	$(WRAPPER) "$(GENERATE) F L" >$@
- 
- Field_Rep: gen$x
--	$(GENERATE) F I >$@
--
-+	$(WRAPPER) "$(GENERATE) F I" >$@
-+################################################################################
- Mouse_Base_Defs: gen$x
--	$(GENERATE) P B >$@
-+	$(WRAPPER) "$(GENERATE) P B" >$@
- 
- Mouse_Event_Rep: gen$x
--	$(GENERATE) P M >$@
-+	$(WRAPPER) "$(GENERATE) P M" >$@
- 
- Mouse_Events: gen$x
--	$(GENERATE) B E >$@
-+	$(WRAPPER) "$(GENERATE) B E" >$@
- 
- Panel_Linker_Options: gen$x
--	$(GENERATE) P L >$@
-+	$(WRAPPER) "$(GENERATE) P L" >$@
- 
- Chtype_Def: gen$x
--	$(GENERATE) E C >$@
-+	$(WRAPPER) "$(GENERATE) E C" >$@
- 
- Eti_Defs: gen$x
--	$(GENERATE) E E >$@
--
-+	$(WRAPPER) "$(GENERATE) E E" >$@
-+################################################################################
- $(ADA_SRCDIR)/$(ABASE).ads: 	$(srcdir)/$(ABASE).ads.m4 \
- 				$(GEN_FILES1) $(srcdir)/normal.m4
- 	$(M4) $(M4FLAGS) -DM4MACRO=$(srcdir)/normal.m4 \
- 	$(srcdir)/$(ABASE).ads.m4 |\
- 	$(DEL_ADAMODE) >$@
- 
-+$(ADA_SRCDIR)/$(ABASE).adb: 	$(srcdir)/$(ABASE).adb.m4 \
-+				$(GEN_FILES1) $(srcdir)/normal.m4
-+	$(M4) $(M4FLAGS) -DM4MACRO=$(srcdir)/normal.m4 \
-+	$(srcdir)/$(ABASE).adb.m4 |\
-+	$(DEL_ADAMODE) >$@
-+
- $(ADA_SRCDIR)/$(ABASE)-aux.ads: $(srcdir)/$(ABASE)-aux.ads.m4 \
- 				$(GEN_FILES5) $(srcdir)/normal.m4
- 	$(M4) $(M4FLAGS) -DM4MACRO=$(srcdir)/normal.m4 \
-@@ -357,8 +383,8 @@
- tags:
- 	ctags *.[ch]
- 
--TAGS:
--	etags *.[ch]
-+@MAKE_UPPER_TAGS@TAGS:
-+@MAKE_UPPER_TAGS@	etags *.[ch]
- 
- mostlyclean ::
- 	-rm -f a.out core gen$x *.o
-@@ -372,7 +398,8 @@
- 	-rm -f $(GEN_TARGETS) instab.tmp *.ad[bs] *.html *.ali *.tmp
- 
- distclean :: clean
--	rm -f Makefile
-+	-rm -f adacurses-config
-+	-rm -f Makefile
- 
- realclean :: distclean
- 
-@@ -408,9 +435,14 @@
- 	@mkdir -p $(HTML_DIR)
- 	cp -p ../src/*.ad[sb] . && chmod +w *.ad[sb]
- 	ln -sf ../src/*.ali .
--	for f in $(GEN_SRC); do \
-+	@echo "Filtering generated files"
-+	@for f in $(GEN_SRC); do \
-+	   h=`basename $$f` ;\
- 	   g=`basename $$f .ads.m4` ;\
--	   $(M4) $(M4FLAGS) -DM4MACRO=html.m4 $$f | $(DEL_ADAMODE) > $$g.ads ;\
-+	   if test "$$g" != "$$h" ; then \
-+	      $(M4) $(M4FLAGS) -DM4MACRO=html.m4 $$f | $(DEL_ADAMODE) > $$g.ads ;\
-+	      echo "... $$g.ads" ;\
-+	   fi \
- 	done
- 	@-rm -f $(HTML_DIR)/$(ALIB)*.htm*
- 	$(GNATHTML) -d -f $(ALIB)*.ads
-@@ -423,7 +455,7 @@
- 	   sed -e 's/3X/3x/g' |\
- 	   sed -e 's/$$\([ABCDEFGHIJKLMNOPQRSTUVWXZabcdefghijklmnopqrstuvwxz0123456789_]*:.*\)\$$/@\1@/' |\
- 	   sed -e 's%&lt;/A&gt;%</A>%g' > $$a.tmp ;\
--           mv $$a.tmp $$f ;\
-+	   mv $$a.tmp $$f ;\
- 	done
- 	@rm -f *.ad[sb] *.ali *.tmp
- 	@for f in funcs.htm main.htm ; do \
-diff -Naur ncurses-5.6.orig/Ada95/gen/adacurses-config.in ncurses-5.6/Ada95/gen/adacurses-config.in
---- ncurses-5.6.orig/Ada95/gen/adacurses-config.in	1969-12-31 19:00:00.000000000 -0500
-+++ ncurses-5.6/Ada95/gen/adacurses-config.in	2008-06-18 06:49:44.000000000 -0400
-@@ -0,0 +1,35 @@
-+#! /bin/sh
-+# $Id: adacurses-config.in,v 1.2 2007/04/07 21:06:50 tom Exp $
-+#
-+# This script will return the option to add to `gnatmake' for using
-+# AdaCurses.
-+#
-+
-+prefix="@prefix@"
-+exec_prefix="@exec_prefix@"
-+libdir="@libdir@"
-+
-+VERSION="@NCURSES_MAJOR@.@NCURSES_MINOR@.@NCURSES_PATCH@"
-+
-+CFLAGS="-I$libdir/adacurses -L$libdir/adacurses"
-+LIBS="-L$prefix/lib -lAdaCurses"
-+
-+case "x$1" in
-+    x--version)
-+        echo AdaCurses $VERSION
-+        ;;
-+    x--cflags)
-+        echo $CFLAGS
-+        ;;
-+    x--libs)
-+        echo $LIBS
-+        ;;
-+    x)
-+    	# if no parameter is given, give what gnatmake needs
-+        echo $CFLAGS -largs $LIBS
-+        ;;
-+    *)
-+        echo 'Usage: adacurses-config [--version | --cflags | --libs]' >&2
-+        exit 1
-+        ;;
-+esac
-diff -Naur ncurses-5.6.orig/Ada95/gen/gen.c ncurses-5.6/Ada95/gen/gen.c
---- ncurses-5.6.orig/Ada95/gen/gen.c	2005-01-22 12:03:48.000000000 -0500
-+++ ncurses-5.6/Ada95/gen/gen.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998,2004,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998,2005,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -32,7 +32,7 @@
- 
- /*
-     Version Control
--    $Id: gen.c,v 1.40 2005/01/22 17:03:48 tom Exp $
-+    $Id: gen.c,v 1.48 2007/05/05 17:24:36 tom Exp $
-   --------------------------------------------------------------------------*/
- /*
-   This program generates various record structures and constants from the
-@@ -41,6 +41,8 @@
-   to produce the real source.
-   */
- 
-+#include <ncurses_cfg.h>
-+
- #include <stdlib.h>
- #include <stddef.h>
- #include <string.h>
-@@ -771,6 +773,23 @@
- static void
- gen_acs(void)
- {
-+  printf("   type C_ACS_Map is array (Character'Val (0) .. Character'Val (127))\n");
-+  printf("        of Attributed_Character;\n");
-+#if USE_REENTRANT || BROKEN_LINKER
-+  printf("   type C_ACS_Ptr is access C_ACS_Map;\n");
-+  printf("   function ACS_Map return C_ACS_Ptr;\n");
-+  printf("   pragma Import (C, ACS_Map, \"_nc_acs_map\");\n");
-+#else
-+  printf("   ACS_Map : C_ACS_Map;\n");
-+  printf("   pragma Import (C, ACS_Map, \"acs_map\");\n");
-+#endif
-+  printf("   --\n");
-+  printf("   --\n");
-+  printf("   --  Constants for several characters from the Alternate Character Set\n");
-+  printf("   --  You must use these constants as indices into the ACS_Map array\n");
-+  printf("   --  to get the corresponding attributed character at runtime.\n");
-+  printf("   --\n");
-+
- #ifdef ACS_ULCORNER
-   acs_def("ACS_Upper_Left_Corner", &ACS_ULCORNER);
- #endif
-@@ -877,8 +896,7 @@
-    printf("   %-25s : constant Event_Mask := 8#%011lo#;\n", \
-           #name, name)
- 
--static
--void
-+static void
- gen_mouse_events(void)
- {
-   mmask_t all1 = 0;
-@@ -1004,6 +1022,56 @@
-   GEN_EVENT(BUTTON4_EVENTS, all4);
- }
- 
-+static void
-+wrap_one_var(const char *c_var,
-+	     const char *c_type,
-+	     const char *ada_func,
-+	     const char *ada_type)
-+{
-+#if USE_REENTRANT
-+  /* must wrap variables */
-+  printf("\n");
-+  printf("   function %s return %s\n", ada_func, ada_type);
-+  printf("   is\n");
-+  printf("      function Result return %s;\n", c_type);
-+  printf("      pragma Import (C, Result, \"_nc_%s\");\n", c_var);
-+  printf("   begin\n");
-+  if (strcmp(c_type, ada_type))
-+    printf("      return %s (Result);\n", ada_type);
-+  else
-+    printf("      return Result;\n");
-+  printf("   end %s;\n", ada_func);
-+#else
-+  /* global variables are really global */
-+  printf("\n");
-+  printf("   function %s return %s\n", ada_func, ada_type);
-+  printf("   is\n");
-+  printf("      Result : %s;\n", c_type);
-+  printf("      pragma Import (C, Result, \"%s\");\n", c_var);
-+  printf("   begin\n");
-+  if (strcmp(c_type, ada_type))
-+    printf("      return %s (Result);\n", ada_type);
-+  else
-+    printf("      return Result;\n");
-+  printf("   end %s;\n", ada_func);
-+#endif
-+}
-+
-+#define GEN_PUBLIC_VAR(c_var, c_type, ada_func, ada_type) \
-+	wrap_one_var(#c_var, #c_type, #ada_func, #ada_type)
-+
-+static void
-+gen_public_vars(void)
-+{
-+  GEN_PUBLIC_VAR(stdscr, Window, Standard_Window, Window);
-+  GEN_PUBLIC_VAR(curscr, Window, Current_Window, Window);
-+  GEN_PUBLIC_VAR(LINES, C_Int, Lines, Line_Count);
-+  GEN_PUBLIC_VAR(COLS, C_Int, Columns, Column_Count);
-+  GEN_PUBLIC_VAR(TABSIZE, C_Int, Tab_Size, Natural);
-+  GEN_PUBLIC_VAR(COLORS, C_Int, Number_Of_Colors, Natural);
-+  GEN_PUBLIC_VAR(COLOR_PAIRS, C_Int, Number_Of_Color_Pairs, Natural);
-+}
-+
- /*
-  * Output some comment lines indicating that the file is generated.
-  * The name parameter is the name of the facility to be used in
-@@ -1178,70 +1246,21 @@
-   return strlen(buf);
- }
- 
--#define GEN_OFFSET(member,itype)                                    \
--  if (sizeof(((WINDOW*)0)->member)==sizeof(itype)) {                \
--    o = offsetof(WINDOW, member);                                   \
--    if ((o%sizeof(itype) == 0)) {                                   \
--       printf("   Offset%-*s : constant Natural := %2ld; --  %s\n", \
--              12, #member, (long)(o/sizeof(itype)),#itype);         \
--    }                                                               \
--  }
--
- static void
- gen_offsets(void)
- {
--  long o;
-   const char *s_bool = "";
- 
--  GEN_OFFSET(_maxy, short);
--  GEN_OFFSET(_maxx, short);
--  GEN_OFFSET(_begy, short);
--  GEN_OFFSET(_begx, short);
--  GEN_OFFSET(_cury, short);
--  GEN_OFFSET(_curx, short);
--  GEN_OFFSET(_yoffset, short);
--  GEN_OFFSET(_pary, int);
--  GEN_OFFSET(_parx, int);
-   if (sizeof(bool) == sizeof(char))
-     {
--      GEN_OFFSET(_notimeout, char);
--      GEN_OFFSET(_clear, char);
--      GEN_OFFSET(_leaveok, char);
--      GEN_OFFSET(_scroll, char);
--      GEN_OFFSET(_idlok, char);
--      GEN_OFFSET(_idcok, char);
--      GEN_OFFSET(_immed, char);
--      GEN_OFFSET(_sync, char);
--      GEN_OFFSET(_use_keypad, char);
--
-       s_bool = "char";
-     }
-   else if (sizeof(bool) == sizeof(short))
-     {
--      GEN_OFFSET(_notimeout, short);
--      GEN_OFFSET(_clear, short);
--      GEN_OFFSET(_leaveok, short);
--      GEN_OFFSET(_scroll, short);
--      GEN_OFFSET(_idlok, short);
--      GEN_OFFSET(_idcok, short);
--      GEN_OFFSET(_immed, short);
--      GEN_OFFSET(_sync, short);
--      GEN_OFFSET(_use_keypad, short);
--
-       s_bool = "short";
-     }
-   else if (sizeof(bool) == sizeof(int))
-     {
--      GEN_OFFSET(_notimeout, int);
--      GEN_OFFSET(_clear, int);
--      GEN_OFFSET(_leaveok, int);
--      GEN_OFFSET(_scroll, int);
--      GEN_OFFSET(_idlok, int);
--      GEN_OFFSET(_idcok, int);
--      GEN_OFFSET(_immed, int);
--      GEN_OFFSET(_sync, int);
--      GEN_OFFSET(_use_keypad, int);
--
-       s_bool = "int";
-     }
-   printf("   Sizeof%-*s : constant Natural := %2ld; --  %s\n",
-@@ -1291,9 +1310,6 @@
- 	case 'A':		/* chtype translation into Ada95 record type */
- 	  gen_attr_set("Character_Attribute_Set");
- 	  break;
--	case 'K':		/* translation of keycodes */
--	  gen_keydefs(0);
--	  break;
- 	case 'B':		/* write some initial comment lines */
- 	  basedefs();
- 	  break;
-@@ -1306,24 +1322,30 @@
- 	case 'E':		/* generate Mouse Event codes */
- 	  gen_mouse_events();
- 	  break;
--	case 'M':		/* generate constants for the ACS characters */
--	  gen_acs();
-+	case 'K':		/* translation of keycodes */
-+	  gen_keydefs(0);
- 	  break;
- 	case 'L':		/* generate the Linker_Options pragma */
- 	  gen_linkopts();
- 	  break;
-+	case 'M':		/* generate constants for the ACS characters */
-+	  gen_acs();
-+	  break;
- 	case 'O':		/* generate definitions of the old key code names */
- 	  gen_keydefs(1);
- 	  break;
-+	case 'P':		/* generate definitions of the public variables */
-+	  gen_public_vars();
-+	  break;
- 	case 'R':		/* generate representation clause for Attributed character */
- 	  gen_chtype_rep("Attributed_Character");
- 	  break;
--	case 'V':		/* generate version info */
--	  gen_version_info();
--	  break;
- 	case 'T':		/* generate the Trace info */
- 	  gen_trace("Trace_Attribute_Set");
- 	  break;
-+	case 'V':		/* generate version info */
-+	  gen_version_info();
-+	  break;
- 	default:
- 	  break;
- 	}
-diff -Naur ncurses-5.6.orig/Ada95/gen/html.m4 ncurses-5.6/Ada95/gen/html.m4
---- ncurses-5.6.orig/Ada95/gen/html.m4	2006-04-22 19:16:44.000000000 -0400
-+++ ncurses-5.6/Ada95/gen/html.m4	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- dnl***************************************************************************
--dnl Copyright (c) 2000,2006 Free Software Foundation, Inc.                   *
-+dnl Copyright (c) 2000-2006,2007 Free Software Foundation, Inc.              *
- dnl                                                                          *
- dnl Permission is hereby granted, free of charge, to any person obtaining a  *
- dnl copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
- dnl authorization.                                                           *
- dnl***************************************************************************
- dnl
--dnl $Id: html.m4,v 1.2 2006/04/22 23:16:44 tom Exp $
-+dnl $Id: html.m4,v 1.3 2007/09/01 23:59:59 tom Exp $
- define(`ANCHORIDX',`0')dnl
- define(`MANPAGE',`define(`MANPG',$1)dnl
- |=====================================================================
-@@ -35,6 +35,6 @@
- define(`ANCHOR',`define(`ANCHORIDX',incr(ANCHORIDX))dnl
- `#'1A NAME="AFU`_'ANCHORIDX"`#'2dnl
- define(`CFUNAME',`$1')define(`AFUNAME',`$2')dnl
--|')
-+|')dnl
- define(`AKA',``AKA': <A HREF="../man/MANPG.html">CFUNAME</A>')dnl
- define(`ALIAS',``AKA': $1')dnl
-diff -Naur ncurses-5.6.orig/Ada95/gen/terminal_interface-curses-aux.ads.m4 ncurses-5.6/Ada95/gen/terminal_interface-curses-aux.ads.m4
---- ncurses-5.6.orig/Ada95/gen/terminal_interface-curses-aux.ads.m4	2003-10-25 11:39:18.000000000 -0400
-+++ ncurses-5.6/Ada95/gen/terminal_interface-curses-aux.ads.m4	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,7 @@
- --  -*- ada -*-
- define(`HTMLNAME',`terminal_interface-curses-aux__ads.htm')dnl
--include(M4MACRO)------------------------------------------------------------------------------
-+include(M4MACRO)dnl
-+------------------------------------------------------------------------------
- --                                                                          --
- --                           GNAT ncurses Binding                           --
- --                                                                          --
-@@ -37,7 +38,7 @@
- ------------------------------------------------------------------------------
- --  Author:  Juergen Pfeifer, 1996
- --  Version Control:
----  $Revision: 1.15 $
-+--  $Revision: 1.16 $
- --  Binding Version 01.00
- ------------------------------------------------------------------------------
- include(`Base_Defs')
-diff -Naur ncurses-5.6.orig/Ada95/gen/terminal_interface-curses-menus.ads.m4 ncurses-5.6/Ada95/gen/terminal_interface-curses-menus.ads.m4
---- ncurses-5.6.orig/Ada95/gen/terminal_interface-curses-menus.ads.m4	2006-06-25 10:30:22.000000000 -0400
-+++ ncurses-5.6/Ada95/gen/terminal_interface-curses-menus.ads.m4	2008-06-18 06:49:44.000000000 -0400
-@@ -38,8 +38,8 @@
- ------------------------------------------------------------------------------
- --  Author:  Juergen Pfeifer, 1996
- --  Version Control:
----  $Revision: 1.26 $
----  $Date: 2006/06/25 14:30:22 $
-+--  $Revision: 1.27 $
-+--  $Date: 2007/05/05 20:20:52 $
- --  Binding Version 01.00
- ------------------------------------------------------------------------------
- include(`Menu_Base_Defs')
-@@ -360,7 +360,7 @@
-    --  Implemented as function
-    pragma Inline (Mark);
- 
--   --  MANPAGE(`menu_attribs.3x')
-+   --  MANPAGE(`menu_attributes.3x')
- 
-    --  ANCHOR(`set_menu_fore()',`Set_Foreground')
-    procedure Set_Foreground
-diff -Naur ncurses-5.6.orig/Ada95/gen/terminal_interface-curses.adb.m4 ncurses-5.6/Ada95/gen/terminal_interface-curses.adb.m4
---- ncurses-5.6.orig/Ada95/gen/terminal_interface-curses.adb.m4	1969-12-31 19:00:00.000000000 -0500
-+++ ncurses-5.6/Ada95/gen/terminal_interface-curses.adb.m4	2008-06-18 06:49:44.000000000 -0400
-@@ -0,0 +1,2501 @@
-+--  -*- ada -*-
-+define(`HTMLNAME',`terminal_interface-curses__adb.htm')dnl
-+include(M4MACRO)------------------------------------------------------------------------------
-+--                                                                          --
-+--                           GNAT ncurses Binding                           --
-+--                                                                          --
-+--                        Terminal_Interface.Curses                         --
-+--                                                                          --
-+--                                 B O D Y                                  --
-+--                                                                          --
-+------------------------------------------------------------------------------
-+-- Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              --
-+--                                                                          --
-+-- Permission is hereby granted, free of charge, to any person obtaining a  --
-+-- copy of this software and associated documentation files (the            --
-+-- "Software"), to deal in the Software without restriction, including      --
-+-- without limitation the rights to use, copy, modify, merge, publish,      --
-+-- distribute, distribute with modifications, sublicense, and/or sell       --
-+-- copies of the Software, and to permit persons to whom the Software is    --
-+-- furnished to do so, subject to the following conditions:                 --
-+--                                                                          --
-+-- The above copyright notice and this permission notice shall be included  --
-+-- in all copies or substantial portions of the Software.                   --
-+--                                                                          --
-+-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  --
-+-- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               --
-+-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   --
-+-- IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   --
-+-- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    --
-+-- OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    --
-+-- THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               --
-+--                                                                          --
-+-- Except as contained in this notice, the name(s) of the above copyright   --
-+-- holders shall not be used in advertising or otherwise to promote the     --
-+-- sale, use or other dealings in this Software without prior written       --
-+-- authorization.                                                           --
-+------------------------------------------------------------------------------
-+--  Author: Juergen Pfeifer, 1996
-+--  Version Control:
-+--  $Revision: 1.4 $
-+--  $Date: 2007/05/05 20:09:10 $
-+--  Binding Version 01.00
-+------------------------------------------------------------------------------
-+with System;
-+
-+with Terminal_Interface.Curses.Aux;
-+with Interfaces.C;                  use Interfaces.C;
-+with Interfaces.C.Strings;          use Interfaces.C.Strings;
-+with Ada.Characters.Handling;       use Ada.Characters.Handling;
-+with Ada.Strings.Fixed;
-+
-+package body Terminal_Interface.Curses is
-+
-+   use Aux;
-+   use type System.Bit_Order;
-+
-+   package ASF renames Ada.Strings.Fixed;
-+
-+   type chtype_array is array (size_t range <>)
-+      of aliased Attributed_Character;
-+   pragma Convention (C, chtype_array);
-+
-+------------------------------------------------------------------------------
-+   function Key_Name (Key : in Real_Key_Code) return String
-+   is
-+      function Keyname (K : C_Int) return chars_ptr;
-+      pragma Import (C, Keyname, "keyname");
-+
-+      Ch : Character;
-+   begin
-+      if Key <= Character'Pos (Character'Last) then
-+         Ch := Character'Val (Key);
-+         if Is_Control (Ch) then
-+            return Un_Control (Attributed_Character'(Ch    => Ch,
-+                                                     Color => Color_Pair'First,
-+                                                     Attr  => Normal_Video));
-+         elsif Is_Graphic (Ch) then
-+            declare
-+               S : String (1 .. 1);
-+            begin
-+               S (1) := Ch;
-+               return S;
-+            end;
-+         else
-+            return "";
-+         end if;
-+      else
-+         return Fill_String (Keyname (C_Int (Key)));
-+      end if;
-+   end Key_Name;
-+
-+   procedure Key_Name (Key  : in  Real_Key_Code;
-+                       Name : out String)
-+   is
-+   begin
-+      ASF.Move (Key_Name (Key), Name);
-+   end Key_Name;
-+
-+------------------------------------------------------------------------------
-+   procedure Init_Screen
-+   is
-+      function Initscr return Window;
-+      pragma Import (C, Initscr, "initscr");
-+
-+      W : Window;
-+   begin
-+      W := Initscr;
-+      if W = Null_Window then
-+         raise Curses_Exception;
-+      end if;
-+   end Init_Screen;
-+
-+   procedure End_Windows
-+   is
-+      function Endwin return C_Int;
-+      pragma Import (C, Endwin, "endwin");
-+   begin
-+      if Endwin = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end End_Windows;
-+
-+   function Is_End_Window return Boolean
-+   is
-+      function Isendwin return Curses_Bool;
-+      pragma Import (C, Isendwin, "isendwin");
-+   begin
-+      if Isendwin = Curses_Bool_False then
-+         return False;
-+      else
-+         return True;
-+      end if;
-+   end Is_End_Window;
-+------------------------------------------------------------------------------
-+   procedure Move_Cursor (Win    : in Window := Standard_Window;
-+                          Line   : in Line_Position;
-+                          Column : in Column_Position)
-+   is
-+      function Wmove (Win    : Window;
-+                      Line   : C_Int;
-+                      Column : C_Int
-+                     ) return C_Int;
-+      pragma Import (C, Wmove, "wmove");
-+   begin
-+      if Wmove (Win, C_Int (Line), C_Int (Column)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Move_Cursor;
-+------------------------------------------------------------------------------
-+   procedure Add (Win : in Window := Standard_Window;
-+                  Ch  : in Attributed_Character)
-+   is
-+      function Waddch (W  : Window;
-+                       Ch : C_Chtype) return C_Int;
-+      pragma Import (C, Waddch, "waddch");
-+   begin
-+      if Waddch (Win, AttrChar_To_Chtype (Ch)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Add;
-+
-+   procedure Add (Win : in Window := Standard_Window;
-+                  Ch  : in Character)
-+   is
-+   begin
-+      Add (Win,
-+           Attributed_Character'(Ch    => Ch,
-+                                 Color => Color_Pair'First,
-+                                 Attr  => Normal_Video));
-+   end Add;
-+
-+   procedure Add
-+     (Win    : in Window := Standard_Window;
-+      Line   : in Line_Position;
-+      Column : in Column_Position;
-+      Ch     : in Attributed_Character)
-+   is
-+      function mvwaddch (W  : Window;
-+                         Y  : C_Int;
-+                         X  : C_Int;
-+                         Ch : C_Chtype) return C_Int;
-+      pragma Import (C, mvwaddch, "mvwaddch");
-+   begin
-+      if mvwaddch (Win, C_Int (Line),
-+                   C_Int (Column),
-+                   AttrChar_To_Chtype (Ch)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Add;
-+
-+   procedure Add
-+     (Win    : in Window := Standard_Window;
-+      Line   : in Line_Position;
-+      Column : in Column_Position;
-+      Ch     : in Character)
-+   is
-+   begin
-+      Add (Win,
-+           Line,
-+           Column,
-+           Attributed_Character'(Ch    => Ch,
-+                                 Color => Color_Pair'First,
-+                                 Attr  => Normal_Video));
-+   end Add;
-+
-+   procedure Add_With_Immediate_Echo
-+     (Win : in Window := Standard_Window;
-+      Ch  : in Attributed_Character)
-+   is
-+      function Wechochar (W  : Window;
-+                          Ch : C_Chtype) return C_Int;
-+      pragma Import (C, Wechochar, "wechochar");
-+   begin
-+      if Wechochar (Win, AttrChar_To_Chtype (Ch)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Add_With_Immediate_Echo;
-+
-+   procedure Add_With_Immediate_Echo
-+     (Win : in Window := Standard_Window;
-+      Ch  : in Character)
-+   is
-+   begin
-+      Add_With_Immediate_Echo
-+        (Win,
-+         Attributed_Character'(Ch    => Ch,
-+                               Color => Color_Pair'First,
-+                               Attr  => Normal_Video));
-+   end Add_With_Immediate_Echo;
-+------------------------------------------------------------------------------
-+   function Create (Number_Of_Lines       : Line_Count;
-+                    Number_Of_Columns     : Column_Count;
-+                    First_Line_Position   : Line_Position;
-+                    First_Column_Position : Column_Position) return Window
-+   is
-+      function Newwin (Number_Of_Lines       : C_Int;
-+                       Number_Of_Columns     : C_Int;
-+                       First_Line_Position   : C_Int;
-+                       First_Column_Position : C_Int) return Window;
-+      pragma Import (C, Newwin, "newwin");
-+
-+      W : Window;
-+   begin
-+      W := Newwin (C_Int (Number_Of_Lines),
-+                   C_Int (Number_Of_Columns),
-+                   C_Int (First_Line_Position),
-+                   C_Int (First_Column_Position));
-+      if W = Null_Window then
-+         raise Curses_Exception;
-+      end if;
-+      return W;
-+   end Create;
-+
-+   procedure Delete (Win : in out Window)
-+   is
-+      function Wdelwin (W : Window) return C_Int;
-+      pragma Import (C, Wdelwin, "delwin");
-+   begin
-+      if Wdelwin (Win) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+      Win := Null_Window;
-+   end Delete;
-+
-+   function Sub_Window
-+     (Win                   : Window := Standard_Window;
-+      Number_Of_Lines       : Line_Count;
-+      Number_Of_Columns     : Column_Count;
-+      First_Line_Position   : Line_Position;
-+      First_Column_Position : Column_Position) return Window
-+   is
-+      function Subwin
-+        (Win                   : Window;
-+         Number_Of_Lines       : C_Int;
-+         Number_Of_Columns     : C_Int;
-+         First_Line_Position   : C_Int;
-+         First_Column_Position : C_Int) return Window;
-+      pragma Import (C, Subwin, "subwin");
-+
-+      W : Window;
-+   begin
-+      W := Subwin (Win,
-+                   C_Int (Number_Of_Lines),
-+                   C_Int (Number_Of_Columns),
-+                   C_Int (First_Line_Position),
-+                   C_Int (First_Column_Position));
-+      if W = Null_Window then
-+         raise Curses_Exception;
-+      end if;
-+      return W;
-+   end Sub_Window;
-+
-+   function Derived_Window
-+     (Win                   : Window := Standard_Window;
-+      Number_Of_Lines       : Line_Count;
-+      Number_Of_Columns     : Column_Count;
-+      First_Line_Position   : Line_Position;
-+      First_Column_Position : Column_Position) return Window
-+   is
-+      function Derwin
-+        (Win                   : Window;
-+         Number_Of_Lines       : C_Int;
-+         Number_Of_Columns     : C_Int;
-+         First_Line_Position   : C_Int;
-+         First_Column_Position : C_Int) return Window;
-+      pragma Import (C, Derwin, "derwin");
-+
-+      W : Window;
-+   begin
-+      W := Derwin (Win,
-+                   C_Int (Number_Of_Lines),
-+                   C_Int (Number_Of_Columns),
-+                   C_Int (First_Line_Position),
-+                   C_Int (First_Column_Position));
-+      if W = Null_Window then
-+         raise Curses_Exception;
-+      end if;
-+      return W;
-+   end Derived_Window;
-+
-+   function Duplicate (Win : Window) return Window
-+   is
-+      function Dupwin (Win : Window) return Window;
-+      pragma Import (C, Dupwin, "dupwin");
-+
-+      W : constant Window := Dupwin (Win);
-+   begin
-+      if W = Null_Window then
-+         raise Curses_Exception;
-+      end if;
-+      return W;
-+   end Duplicate;
-+
-+   procedure Move_Window (Win    : in Window;
-+                          Line   : in Line_Position;
-+                          Column : in Column_Position)
-+   is
-+      function Mvwin (Win    : Window;
-+                      Line   : C_Int;
-+                      Column : C_Int) return C_Int;
-+      pragma Import (C, Mvwin, "mvwin");
-+   begin
-+      if Mvwin (Win, C_Int (Line), C_Int (Column)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Move_Window;
-+
-+   procedure Move_Derived_Window (Win    : in Window;
-+                                  Line   : in Line_Position;
-+                                  Column : in Column_Position)
-+   is
-+      function Mvderwin (Win    : Window;
-+                         Line   : C_Int;
-+                         Column : C_Int) return C_Int;
-+      pragma Import (C, Mvderwin, "mvderwin");
-+   begin
-+      if Mvderwin (Win, C_Int (Line), C_Int (Column)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Move_Derived_Window;
-+
-+   procedure Set_Synch_Mode (Win  : in Window  := Standard_Window;
-+                             Mode : in Boolean := False)
-+   is
-+      function Syncok (Win  : Window;
-+                       Mode : Curses_Bool) return C_Int;
-+      pragma Import (C, Syncok, "syncok");
-+   begin
-+      if Syncok (Win, Curses_Bool (Boolean'Pos (Mode))) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Set_Synch_Mode;
-+------------------------------------------------------------------------------
-+   procedure Add (Win : in Window := Standard_Window;
-+                  Str : in String;
-+                  Len : in Integer := -1)
-+   is
-+      function Waddnstr (Win : Window;
-+                         Str : char_array;
-+                         Len : C_Int := -1) return C_Int;
-+      pragma Import (C, Waddnstr, "waddnstr");
-+
-+      Txt    : char_array (0 .. Str'Length);
-+      Length : size_t;
-+   begin
-+      To_C (Str, Txt, Length);
-+      if Waddnstr (Win, Txt, C_Int (Len)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Add;
-+
-+   procedure Add
-+     (Win    : in Window := Standard_Window;
-+      Line   : in Line_Position;
-+      Column : in Column_Position;
-+      Str    : in String;
-+      Len    : in Integer := -1)
-+   is
-+   begin
-+      Move_Cursor (Win, Line, Column);
-+      Add (Win, Str, Len);
-+   end Add;
-+------------------------------------------------------------------------------
-+   procedure Add
-+     (Win : in Window := Standard_Window;
-+      Str : in Attributed_String;
-+      Len : in Integer := -1)
-+   is
-+      function Waddchnstr (Win : Window;
-+                           Str : chtype_array;
-+                           Len : C_Int := -1) return C_Int;
-+      pragma Import (C, Waddchnstr, "waddchnstr");
-+
-+      Txt : chtype_array (0 .. Str'Length);
-+   begin
-+      for Length in 1 .. size_t (Str'Length) loop
-+         Txt (Length - 1) := Str (Natural (Length));
-+      end loop;
-+      Txt (Str'Length) := Default_Character;
-+      if Waddchnstr (Win,
-+                     Txt,
-+                     C_Int (Len)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Add;
-+
-+   procedure Add
-+     (Win    : in Window := Standard_Window;
-+      Line   : in Line_Position;
-+      Column : in Column_Position;
-+      Str    : in Attributed_String;
-+      Len    : in Integer := -1)
-+   is
-+   begin
-+      Move_Cursor (Win, Line, Column);
-+      Add (Win, Str, Len);
-+   end Add;
-+------------------------------------------------------------------------------
-+   procedure Border
-+     (Win                       : in Window := Standard_Window;
-+      Left_Side_Symbol          : in Attributed_Character := Default_Character;
-+      Right_Side_Symbol         : in Attributed_Character := Default_Character;
-+      Top_Side_Symbol           : in Attributed_Character := Default_Character;
-+      Bottom_Side_Symbol        : in Attributed_Character := Default_Character;
-+      Upper_Left_Corner_Symbol  : in Attributed_Character := Default_Character;
-+      Upper_Right_Corner_Symbol : in Attributed_Character := Default_Character;
-+      Lower_Left_Corner_Symbol  : in Attributed_Character := Default_Character;
-+      Lower_Right_Corner_Symbol : in Attributed_Character := Default_Character)
-+   is
-+      function Wborder (W   : Window;
-+                        LS  : C_Chtype;
-+                        RS  : C_Chtype;
-+                        TS  : C_Chtype;
-+                        BS  : C_Chtype;
-+                        ULC : C_Chtype;
-+                        URC : C_Chtype;
-+                        LLC : C_Chtype;
-+                        LRC : C_Chtype) return C_Int;
-+      pragma Import (C, Wborder, "wborder");
-+   begin
-+      if Wborder (Win,
-+                  AttrChar_To_Chtype (Left_Side_Symbol),
-+                  AttrChar_To_Chtype (Right_Side_Symbol),
-+                  AttrChar_To_Chtype (Top_Side_Symbol),
-+                  AttrChar_To_Chtype (Bottom_Side_Symbol),
-+                  AttrChar_To_Chtype (Upper_Left_Corner_Symbol),
-+                  AttrChar_To_Chtype (Upper_Right_Corner_Symbol),
-+                  AttrChar_To_Chtype (Lower_Left_Corner_Symbol),
-+                  AttrChar_To_Chtype (Lower_Right_Corner_Symbol)
-+                  ) = Curses_Err
-+      then
-+         raise Curses_Exception;
-+      end if;
-+   end Border;
-+
-+   procedure Box
-+     (Win               : in Window := Standard_Window;
-+      Vertical_Symbol   : in Attributed_Character := Default_Character;
-+      Horizontal_Symbol : in Attributed_Character := Default_Character)
-+   is
-+   begin
-+      Border (Win,
-+              Vertical_Symbol, Vertical_Symbol,
-+              Horizontal_Symbol, Horizontal_Symbol);
-+   end Box;
-+
-+   procedure Horizontal_Line
-+     (Win         : in Window := Standard_Window;
-+      Line_Size   : in Natural;
-+      Line_Symbol : in Attributed_Character := Default_Character)
-+   is
-+      function Whline (W   : Window;
-+                       Ch  : C_Chtype;
-+                       Len : C_Int) return C_Int;
-+      pragma Import (C, Whline, "whline");
-+   begin
-+      if Whline (Win,
-+                 AttrChar_To_Chtype (Line_Symbol),
-+                 C_Int (Line_Size)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Horizontal_Line;
-+
-+   procedure Vertical_Line
-+     (Win         : in Window := Standard_Window;
-+      Line_Size   : in Natural;
-+      Line_Symbol : in Attributed_Character := Default_Character)
-+   is
-+      function Wvline (W   : Window;
-+                       Ch  : C_Chtype;
-+                       Len : C_Int) return C_Int;
-+      pragma Import (C, Wvline, "wvline");
-+   begin
-+      if Wvline (Win,
-+                 AttrChar_To_Chtype (Line_Symbol),
-+                 C_Int (Line_Size)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Vertical_Line;
-+
-+------------------------------------------------------------------------------
-+   function Get_Keystroke (Win : Window := Standard_Window)
-+     return Real_Key_Code
-+   is
-+      function Wgetch (W : Window) return C_Int;
-+      pragma Import (C, Wgetch, "wgetch");
-+
-+      C : constant C_Int := Wgetch (Win);
-+   begin
-+      if C = Curses_Err then
-+         return Key_None;
-+      else
-+         return Real_Key_Code (C);
-+      end if;
-+   end Get_Keystroke;
-+
-+   procedure Undo_Keystroke (Key : in Real_Key_Code)
-+   is
-+      function Ungetch (Ch : C_Int) return C_Int;
-+      pragma Import (C, Ungetch, "ungetch");
-+   begin
-+      if Ungetch (C_Int (Key)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Undo_Keystroke;
-+
-+   function Has_Key (Key : Special_Key_Code) return Boolean
-+   is
-+      function Haskey (Key : C_Int) return C_Int;
-+      pragma Import (C, Haskey, "has_key");
-+   begin
-+      if Haskey (C_Int (Key)) = Curses_False then
-+         return False;
-+      else
-+         return True;
-+      end if;
-+   end Has_Key;
-+
-+   function Is_Function_Key (Key : Special_Key_Code) return Boolean
-+   is
-+      L : constant Special_Key_Code  := Special_Key_Code (Natural (Key_F0) +
-+        Natural (Function_Key_Number'Last));
-+   begin
-+      if (Key >= Key_F0) and then (Key <= L) then
-+         return True;
-+      else
-+         return False;
-+      end if;
-+   end Is_Function_Key;
-+
-+   function Function_Key (Key : Real_Key_Code)
-+                          return Function_Key_Number
-+   is
-+   begin
-+      if Is_Function_Key (Key) then
-+         return Function_Key_Number (Key - Key_F0);
-+      else
-+         raise Constraint_Error;
-+      end if;
-+   end Function_Key;
-+
-+   function Function_Key_Code (Key : Function_Key_Number) return Real_Key_Code
-+   is
-+   begin
-+      return Real_Key_Code (Natural (Key_F0) + Natural (Key));
-+   end Function_Key_Code;
-+------------------------------------------------------------------------------
-+   procedure Standout (Win : Window  := Standard_Window;
-+                       On  : Boolean := True)
-+   is
-+      function wstandout (Win : Window) return C_Int;
-+      pragma Import (C, wstandout, "wstandout");
-+      function wstandend (Win : Window) return C_Int;
-+      pragma Import (C, wstandend, "wstandend");
-+
-+      Err : C_Int;
-+   begin
-+      if On then
-+         Err := wstandout (Win);
-+      else
-+         Err := wstandend (Win);
-+      end if;
-+      if Err = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Standout;
-+
-+   procedure Switch_Character_Attribute
-+     (Win  : in Window := Standard_Window;
-+      Attr : in Character_Attribute_Set := Normal_Video;
-+      On   : in Boolean := True)
-+   is
-+      function Wattron (Win    : Window;
-+                        C_Attr : C_AttrType) return C_Int;
-+      pragma Import (C, Wattron, "wattr_on");
-+      function Wattroff (Win    : Window;
-+                         C_Attr : C_AttrType) return C_Int;
-+      pragma Import (C, Wattroff, "wattr_off");
-+      --  In Ada we use the On Boolean to control whether or not we want to
-+      --  switch on or off the attributes in the set.
-+      Err : C_Int;
-+      AC  : constant Attributed_Character := (Ch    => Character'First,
-+                                              Color => Color_Pair'First,
-+                                              Attr  => Attr);
-+   begin
-+      if On then
-+         Err := Wattron  (Win, AttrChar_To_AttrType (AC));
-+      else
-+         Err := Wattroff (Win, AttrChar_To_AttrType (AC));
-+      end if;
-+      if Err = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Switch_Character_Attribute;
-+
-+   procedure Set_Character_Attributes
-+     (Win   : in Window := Standard_Window;
-+      Attr  : in Character_Attribute_Set := Normal_Video;
-+      Color : in Color_Pair := Color_Pair'First)
-+   is
-+      function Wattrset (Win    : Window;
-+                         C_Attr : C_AttrType) return C_Int;
-+      pragma Import (C, Wattrset, "wattrset"); -- ??? wattr_set
-+   begin
-+      if Wattrset (Win,
-+                   AttrChar_To_AttrType (Attributed_Character'
-+                                         (Ch    => Character'First,
-+                                          Color => Color,
-+                                          Attr  => Attr))) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Set_Character_Attributes;
-+
-+   function Get_Character_Attribute (Win : Window := Standard_Window)
-+                                     return Character_Attribute_Set
-+   is
-+      function Wattrget (Win : Window;
-+                         Atr : access C_AttrType;
-+                         Col : access C_Short;
-+                         Opt : System.Address) return C_Int;
-+      pragma Import (C, Wattrget, "wattr_get");
-+
-+      Attr : aliased C_AttrType;
-+      Col  : aliased C_Short;
-+      Res  : constant C_Int := Wattrget (Win, Attr'Access, Col'Access,
-+                                         System.Null_Address);
-+      Ch   : Attributed_Character;
-+   begin
-+      if Res = Curses_Ok then
-+         Ch := AttrType_To_AttrChar (Attr);
-+         return Ch.Attr;
-+      else
-+         raise Curses_Exception;
-+      end if;
-+   end Get_Character_Attribute;
-+
-+   function Get_Character_Attribute (Win : Window := Standard_Window)
-+                                     return Color_Pair
-+   is
-+      function Wattrget (Win : Window;
-+                         Atr : access C_AttrType;
-+                         Col : access C_Short;
-+                         Opt : System.Address) return C_Int;
-+      pragma Import (C, Wattrget, "wattr_get");
-+
-+      Attr : aliased C_AttrType;
-+      Col  : aliased C_Short;
-+      Res  : constant C_Int := Wattrget (Win, Attr'Access, Col'Access,
-+                                         System.Null_Address);
-+      Ch   : Attributed_Character;
-+   begin
-+      if Res = Curses_Ok then
-+         Ch := AttrType_To_AttrChar (Attr);
-+         return Ch.Color;
-+      else
-+         raise Curses_Exception;
-+      end if;
-+   end Get_Character_Attribute;
-+
-+   procedure Set_Color (Win  : in Window := Standard_Window;
-+                        Pair : in Color_Pair)
-+   is
-+      function Wset_Color (Win   : Window;
-+                           Color : C_Short;
-+                           Opts  : C_Void_Ptr) return C_Int;
-+      pragma Import (C, Wset_Color, "wcolor_set");
-+   begin
-+      if Wset_Color (Win,
-+                     C_Short (Pair),
-+                     C_Void_Ptr (System.Null_Address)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Set_Color;
-+
-+   procedure Change_Attributes
-+     (Win   : in Window := Standard_Window;
-+      Count : in Integer := -1;
-+      Attr  : in Character_Attribute_Set := Normal_Video;
-+      Color : in Color_Pair := Color_Pair'First)
-+   is
-+      function Wchgat (Win   : Window;
-+                       Cnt   : C_Int;
-+                       Attr  : C_AttrType;
-+                       Color : C_Short;
-+                       Opts  : System.Address := System.Null_Address)
-+                       return C_Int;
-+      pragma Import (C, Wchgat, "wchgat");
-+
-+      Ch : constant Attributed_Character :=
-+        (Ch => Character'First, Color => Color_Pair'First, Attr => Attr);
-+   begin
-+      if Wchgat (Win, C_Int (Count), AttrChar_To_AttrType (Ch),
-+                 C_Short (Color)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Change_Attributes;
-+
-+   procedure Change_Attributes
-+     (Win    : in Window := Standard_Window;
-+      Line   : in Line_Position := Line_Position'First;
-+      Column : in Column_Position := Column_Position'First;
-+      Count  : in Integer := -1;
-+      Attr   : in Character_Attribute_Set := Normal_Video;
-+      Color  : in Color_Pair := Color_Pair'First)
-+   is
-+   begin
-+      Move_Cursor (Win, Line, Column);
-+      Change_Attributes (Win, Count, Attr, Color);
-+   end Change_Attributes;
-+------------------------------------------------------------------------------
-+   procedure Beep
-+   is
-+      function Beeper return C_Int;
-+      pragma Import (C, Beeper, "beep");
-+   begin
-+      if Beeper = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Beep;
-+
-+   procedure Flash_Screen
-+   is
-+      function Flash return C_Int;
-+      pragma Import (C, Flash, "flash");
-+   begin
-+      if Flash = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Flash_Screen;
-+------------------------------------------------------------------------------
-+   procedure Set_Cbreak_Mode (SwitchOn : in Boolean := True)
-+   is
-+      function Cbreak return C_Int;
-+      pragma Import (C, Cbreak, "cbreak");
-+      function NoCbreak return C_Int;
-+      pragma Import (C, NoCbreak, "nocbreak");
-+
-+      Err : C_Int;
-+   begin
-+      if SwitchOn then
-+         Err := Cbreak;
-+      else
-+         Err := NoCbreak;
-+      end if;
-+      if Err = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Set_Cbreak_Mode;
-+
-+   procedure Set_Raw_Mode (SwitchOn : in Boolean := True)
-+   is
-+      function Raw return C_Int;
-+      pragma Import (C, Raw, "raw");
-+      function NoRaw return C_Int;
-+      pragma Import (C, NoRaw, "noraw");
-+
-+      Err : C_Int;
-+   begin
-+      if SwitchOn then
-+         Err := Raw;
-+      else
-+         Err := NoRaw;
-+      end if;
-+      if Err = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Set_Raw_Mode;
-+
-+   procedure Set_Echo_Mode (SwitchOn : in Boolean := True)
-+   is
-+      function Echo return C_Int;
-+      pragma Import (C, Echo, "echo");
-+      function NoEcho return C_Int;
-+      pragma Import (C, NoEcho, "noecho");
-+
-+      Err : C_Int;
-+   begin
-+      if SwitchOn then
-+         Err := Echo;
-+      else
-+         Err := NoEcho;
-+      end if;
-+      if Err = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Set_Echo_Mode;
-+
-+   procedure Set_Meta_Mode (Win      : in Window := Standard_Window;
-+                            SwitchOn : in Boolean := True)
-+   is
-+      function Meta (W : Window; Mode : Curses_Bool) return C_Int;
-+      pragma Import (C, Meta, "meta");
-+   begin
-+      if Meta (Win, Curses_Bool (Boolean'Pos (SwitchOn))) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Set_Meta_Mode;
-+
-+   procedure Set_KeyPad_Mode (Win      : in Window := Standard_Window;
-+                              SwitchOn : in Boolean := True)
-+   is
-+      function Keypad (W : Window; Mode : Curses_Bool) return C_Int;
-+      pragma Import (C, Keypad, "keypad");
-+   begin
-+      if Keypad (Win, Curses_Bool (Boolean'Pos (SwitchOn))) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Set_KeyPad_Mode;
-+
-+   function Get_KeyPad_Mode (Win : in Window := Standard_Window)
-+                             return Boolean
-+   is
-+      function Is_Keypad (W : Window) return Curses_Bool;
-+      pragma Import (C, Is_Keypad, "is_keypad");
-+   begin
-+      return (Is_Keypad (Win) /= Curses_Bool_False);
-+   end Get_KeyPad_Mode;
-+
-+   procedure Half_Delay (Amount : in Half_Delay_Amount)
-+   is
-+      function Halfdelay (Amount : C_Int) return C_Int;
-+      pragma Import (C, Halfdelay, "halfdelay");
-+   begin
-+      if Halfdelay (C_Int (Amount)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Half_Delay;
-+
-+   procedure Set_Flush_On_Interrupt_Mode
-+     (Win  : in Window := Standard_Window;
-+      Mode : in Boolean := True)
-+   is
-+      function Intrflush (Win : Window; Mode : Curses_Bool) return C_Int;
-+      pragma Import (C, Intrflush, "intrflush");
-+   begin
-+      if Intrflush (Win, Curses_Bool (Boolean'Pos (Mode))) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Set_Flush_On_Interrupt_Mode;
-+
-+   procedure Set_Queue_Interrupt_Mode
-+     (Win   : in Window := Standard_Window;
-+      Flush : in Boolean := True)
-+   is
-+      procedure Qiflush;
-+      pragma Import (C, Qiflush, "qiflush");
-+      procedure No_Qiflush;
-+      pragma Import (C, No_Qiflush, "noqiflush");
-+   begin
-+      if Win = Null_Window then
-+         raise Curses_Exception;
-+      end if;
-+      if Flush then
-+         Qiflush;
-+      else
-+         No_Qiflush;
-+      end if;
-+   end Set_Queue_Interrupt_Mode;
-+
-+   procedure Set_NoDelay_Mode
-+     (Win  : in Window := Standard_Window;
-+      Mode : in Boolean := False)
-+   is
-+      function Nodelay (Win : Window; Mode : Curses_Bool) return C_Int;
-+      pragma Import (C, Nodelay, "nodelay");
-+   begin
-+      if Nodelay (Win, Curses_Bool (Boolean'Pos (Mode))) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Set_NoDelay_Mode;
-+
-+   procedure Set_Timeout_Mode (Win    : in Window := Standard_Window;
-+                               Mode   : in Timeout_Mode;
-+                               Amount : in Natural)
-+   is
-+      procedure Wtimeout (Win : Window; Amount : C_Int);
-+      pragma Import (C, Wtimeout, "wtimeout");
-+
-+      Time : C_Int;
-+   begin
-+      case Mode is
-+         when Blocking     => Time := -1;
-+         when Non_Blocking => Time := 0;
-+         when Delayed      =>
-+            if Amount = 0 then
-+               raise Constraint_Error;
-+            end if;
-+            Time := C_Int (Amount);
-+      end case;
-+      Wtimeout (Win, Time);
-+   end Set_Timeout_Mode;
-+
-+   procedure Set_Escape_Timer_Mode
-+     (Win       : in Window := Standard_Window;
-+      Timer_Off : in Boolean := False)
-+   is
-+      function Notimeout (Win : Window; Mode : Curses_Bool) return C_Int;
-+      pragma Import (C, Notimeout, "notimeout");
-+   begin
-+      if Notimeout (Win, Curses_Bool (Boolean'Pos (Timer_Off)))
-+        = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Set_Escape_Timer_Mode;
-+
-+------------------------------------------------------------------------------
-+   procedure Set_NL_Mode (SwitchOn : in Boolean := True)
-+   is
-+      function NL return C_Int;
-+      pragma Import (C, NL, "nl");
-+      function NoNL return C_Int;
-+      pragma Import (C, NoNL, "nonl");
-+
-+      Err : C_Int;
-+   begin
-+      if SwitchOn then
-+         Err := NL;
-+      else
-+         Err := NoNL;
-+      end if;
-+      if Err = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Set_NL_Mode;
-+
-+   procedure Clear_On_Next_Update
-+     (Win      : in Window := Standard_Window;
-+      Do_Clear : in Boolean := True)
-+   is
-+      function Clear_Ok (W : Window; Flag : Curses_Bool) return C_Int;
-+      pragma Import (C, Clear_Ok, "clearok");
-+   begin
-+      if Clear_Ok (Win, Curses_Bool (Boolean'Pos (Do_Clear))) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Clear_On_Next_Update;
-+
-+   procedure Use_Insert_Delete_Line
-+     (Win    : in Window := Standard_Window;
-+      Do_Idl : in Boolean := True)
-+   is
-+      function IDL_Ok (W : Window; Flag : Curses_Bool) return C_Int;
-+      pragma Import (C, IDL_Ok, "idlok");
-+   begin
-+      if IDL_Ok (Win, Curses_Bool (Boolean'Pos (Do_Idl))) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Use_Insert_Delete_Line;
-+
-+   procedure Use_Insert_Delete_Character
-+     (Win    : in Window := Standard_Window;
-+      Do_Idc : in Boolean := True)
-+   is
-+      procedure IDC_Ok (W : Window; Flag : Curses_Bool);
-+      pragma Import (C, IDC_Ok, "idcok");
-+   begin
-+      IDC_Ok (Win, Curses_Bool (Boolean'Pos (Do_Idc)));
-+   end Use_Insert_Delete_Character;
-+
-+   procedure Leave_Cursor_After_Update
-+     (Win      : in Window := Standard_Window;
-+      Do_Leave : in Boolean := True)
-+   is
-+      function Leave_Ok (W : Window; Flag : Curses_Bool) return C_Int;
-+      pragma Import (C, Leave_Ok, "leaveok");
-+   begin
-+      if Leave_Ok (Win, Curses_Bool (Boolean'Pos (Do_Leave))) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Leave_Cursor_After_Update;
-+
-+   procedure Immediate_Update_Mode
-+     (Win  : in Window := Standard_Window;
-+      Mode : in Boolean := False)
-+   is
-+      procedure Immedok (Win : Window; Mode : Curses_Bool);
-+      pragma Import (C, Immedok, "immedok");
-+   begin
-+      Immedok (Win, Curses_Bool (Boolean'Pos (Mode)));
-+   end Immediate_Update_Mode;
-+
-+   procedure Allow_Scrolling
-+     (Win  : in Window  := Standard_Window;
-+      Mode : in Boolean := False)
-+   is
-+      function Scrollok (Win : Window; Mode : Curses_Bool) return C_Int;
-+      pragma Import (C, Scrollok, "scrollok");
-+   begin
-+      if Scrollok (Win, Curses_Bool (Boolean'Pos (Mode))) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Allow_Scrolling;
-+
-+   function Scrolling_Allowed (Win : Window := Standard_Window)
-+                               return Boolean
-+   is
-+      function Is_Scroll_Ok (W : Window) return Curses_Bool;
-+      pragma Import (C, Is_Scroll_Ok, "is_scrollok");
-+   begin
-+      return (Is_Scroll_Ok (Win) /= Curses_Bool_False);
-+   end Scrolling_Allowed;
-+
-+   procedure Set_Scroll_Region
-+     (Win         : in Window := Standard_Window;
-+      Top_Line    : in Line_Position;
-+      Bottom_Line : in Line_Position)
-+   is
-+      function Wsetscrreg (Win : Window;
-+                           Lin : C_Int;
-+                           Col : C_Int) return C_Int;
-+      pragma Import (C, Wsetscrreg, "wsetscrreg");
-+   begin
-+      if Wsetscrreg (Win, C_Int (Top_Line), C_Int (Bottom_Line))
-+        = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Set_Scroll_Region;
-+------------------------------------------------------------------------------
-+   procedure Update_Screen
-+   is
-+      function Do_Update return C_Int;
-+      pragma Import (C, Do_Update, "doupdate");
-+   begin
-+      if Do_Update = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Update_Screen;
-+
-+   procedure Refresh (Win : in Window := Standard_Window)
-+   is
-+      function Wrefresh (W : Window) return C_Int;
-+      pragma Import (C, Wrefresh, "wrefresh");
-+   begin
-+      if Wrefresh (Win) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Refresh;
-+
-+   procedure Refresh_Without_Update
-+     (Win : in Window := Standard_Window)
-+   is
-+      function Wnoutrefresh (W : Window) return C_Int;
-+      pragma Import (C, Wnoutrefresh, "wnoutrefresh");
-+   begin
-+      if Wnoutrefresh (Win) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Refresh_Without_Update;
-+
-+   procedure Redraw (Win : in Window := Standard_Window)
-+   is
-+      function Redrawwin (Win : Window) return C_Int;
-+      pragma Import (C, Redrawwin, "redrawwin");
-+   begin
-+      if Redrawwin (Win) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Redraw;
-+
-+   procedure Redraw
-+     (Win        : in Window := Standard_Window;
-+      Begin_Line : in Line_Position;
-+      Line_Count : in Positive)
-+   is
-+      function Wredrawln (Win : Window; First : C_Int; Cnt : C_Int)
-+                          return C_Int;
-+      pragma Import (C, Wredrawln, "wredrawln");
-+   begin
-+      if Wredrawln (Win,
-+                    C_Int (Begin_Line),
-+                    C_Int (Line_Count)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Redraw;
-+
-+------------------------------------------------------------------------------
-+   procedure Erase (Win : in Window := Standard_Window)
-+   is
-+      function Werase (W : Window) return C_Int;
-+      pragma Import (C, Werase, "werase");
-+   begin
-+      if Werase (Win) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Erase;
-+
-+   procedure Clear (Win : in Window := Standard_Window)
-+   is
-+      function Wclear (W : Window) return C_Int;
-+      pragma Import (C, Wclear, "wclear");
-+   begin
-+      if Wclear (Win) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Clear;
-+
-+   procedure Clear_To_End_Of_Screen (Win : in Window := Standard_Window)
-+   is
-+      function Wclearbot (W : Window) return C_Int;
-+      pragma Import (C, Wclearbot, "wclrtobot");
-+   begin
-+      if Wclearbot (Win) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Clear_To_End_Of_Screen;
-+
-+   procedure Clear_To_End_Of_Line (Win : in Window := Standard_Window)
-+   is
-+      function Wcleareol (W : Window) return C_Int;
-+      pragma Import (C, Wcleareol, "wclrtoeol");
-+   begin
-+      if Wcleareol (Win) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Clear_To_End_Of_Line;
-+------------------------------------------------------------------------------
-+   procedure Set_Background
-+     (Win : in Window := Standard_Window;
-+      Ch  : in Attributed_Character)
-+   is
-+      procedure WBackground (W : in Window; Ch : in C_Chtype);
-+      pragma Import (C, WBackground, "wbkgdset");
-+   begin
-+      WBackground (Win, AttrChar_To_Chtype (Ch));
-+   end Set_Background;
-+
-+   procedure Change_Background
-+     (Win : in Window := Standard_Window;
-+      Ch  : in Attributed_Character)
-+   is
-+      function WChangeBkgd (W : Window; Ch : C_Chtype) return C_Int;
-+      pragma Import (C, WChangeBkgd, "wbkgd");
-+   begin
-+      if WChangeBkgd (Win, AttrChar_To_Chtype (Ch)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Change_Background;
-+
-+   function Get_Background (Win : Window := Standard_Window)
-+     return Attributed_Character
-+   is
-+      function Wgetbkgd (Win : Window) return C_Chtype;
-+      pragma Import (C, Wgetbkgd, "getbkgd");
-+   begin
-+      return Chtype_To_AttrChar (Wgetbkgd (Win));
-+   end Get_Background;
-+------------------------------------------------------------------------------
-+   procedure Change_Lines_Status (Win   : in Window := Standard_Window;
-+                                  Start : in Line_Position;
-+                                  Count : in Positive;
-+                                  State : in Boolean)
-+   is
-+      function Wtouchln (Win : Window;
-+                         Sta : C_Int;
-+                         Cnt : C_Int;
-+                         Chg : C_Int) return C_Int;
-+      pragma Import (C, Wtouchln, "wtouchln");
-+   begin
-+      if Wtouchln (Win, C_Int (Start), C_Int (Count),
-+                   C_Int (Boolean'Pos (State))) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Change_Lines_Status;
-+
-+   procedure Touch (Win : in Window := Standard_Window)
-+   is
-+      Y : Line_Position;
-+      X : Column_Position;
-+   begin
-+      Get_Size (Win, Y, X);
-+      Change_Lines_Status (Win, 0, Positive (Y), True);
-+   end Touch;
-+
-+   procedure Untouch (Win : in Window := Standard_Window)
-+   is
-+      Y : Line_Position;
-+      X : Column_Position;
-+   begin
-+      Get_Size (Win, Y, X);
-+      Change_Lines_Status (Win, 0, Positive (Y), False);
-+   end Untouch;
-+
-+   procedure Touch (Win   : in Window := Standard_Window;
-+                    Start : in Line_Position;
-+                    Count : in Positive)
-+   is
-+   begin
-+      Change_Lines_Status (Win, Start, Count, True);
-+   end Touch;
-+
-+   function Is_Touched
-+     (Win  : Window := Standard_Window;
-+      Line : Line_Position) return Boolean
-+   is
-+      function WLineTouched (W : Window; L : C_Int) return Curses_Bool;
-+      pragma Import (C, WLineTouched, "is_linetouched");
-+   begin
-+      if WLineTouched (Win, C_Int (Line)) = Curses_Bool_False then
-+         return False;
-+      else
-+         return True;
-+      end if;
-+   end Is_Touched;
-+
-+   function Is_Touched
-+     (Win : Window := Standard_Window) return Boolean
-+   is
-+      function WWinTouched (W : Window) return Curses_Bool;
-+      pragma Import (C, WWinTouched, "is_wintouched");
-+   begin
-+      if WWinTouched (Win) = Curses_Bool_False then
-+         return False;
-+      else
-+         return True;
-+      end if;
-+   end Is_Touched;
-+------------------------------------------------------------------------------
-+   procedure Copy
-+     (Source_Window            : in Window;
-+      Destination_Window       : in Window;
-+      Source_Top_Row           : in Line_Position;
-+      Source_Left_Column       : in Column_Position;
-+      Destination_Top_Row      : in Line_Position;
-+      Destination_Left_Column  : in Column_Position;
-+      Destination_Bottom_Row   : in Line_Position;
-+      Destination_Right_Column : in Column_Position;
-+      Non_Destructive_Mode     : in Boolean := True)
-+   is
-+      function Copywin (Src : Window;
-+                        Dst : Window;
-+                        Str : C_Int;
-+                        Slc : C_Int;
-+                        Dtr : C_Int;
-+                        Dlc : C_Int;
-+                        Dbr : C_Int;
-+                        Drc : C_Int;
-+                        Ndm : C_Int) return C_Int;
-+      pragma Import (C, Copywin, "copywin");
-+   begin
-+      if Copywin (Source_Window,
-+                  Destination_Window,
-+                  C_Int (Source_Top_Row),
-+                  C_Int (Source_Left_Column),
-+                  C_Int (Destination_Top_Row),
-+                  C_Int (Destination_Left_Column),
-+                  C_Int (Destination_Bottom_Row),
-+                  C_Int (Destination_Right_Column),
-+                  Boolean'Pos (Non_Destructive_Mode)
-+                ) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Copy;
-+
-+   procedure Overwrite
-+     (Source_Window      : in Window;
-+      Destination_Window : in Window)
-+   is
-+      function Overwrite (Src : Window; Dst : Window) return C_Int;
-+      pragma Import (C, Overwrite, "overwrite");
-+   begin
-+      if Overwrite (Source_Window, Destination_Window) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Overwrite;
-+
-+   procedure Overlay
-+     (Source_Window      : in Window;
-+      Destination_Window : in Window)
-+   is
-+      function Overlay (Src : Window; Dst : Window) return C_Int;
-+      pragma Import (C, Overlay, "overlay");
-+   begin
-+      if Overlay (Source_Window, Destination_Window) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Overlay;
-+
-+------------------------------------------------------------------------------
-+   procedure Insert_Delete_Lines
-+     (Win   : in Window := Standard_Window;
-+      Lines : in Integer       := 1) -- default is to insert one line above
-+   is
-+      function Winsdelln (W : Window; N : C_Int) return C_Int;
-+      pragma Import (C, Winsdelln, "winsdelln");
-+   begin
-+      if Winsdelln (Win, C_Int (Lines)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Insert_Delete_Lines;
-+
-+   procedure Delete_Line (Win : in Window := Standard_Window)
-+   is
-+   begin
-+      Insert_Delete_Lines (Win, -1);
-+   end Delete_Line;
-+
-+   procedure Insert_Line (Win : in Window := Standard_Window)
-+   is
-+   begin
-+      Insert_Delete_Lines (Win, 1);
-+   end Insert_Line;
-+------------------------------------------------------------------------------
-+
-+   procedure Get_Size
-+     (Win               : in Window := Standard_Window;
-+      Number_Of_Lines   : out Line_Count;
-+      Number_Of_Columns : out Column_Count)
-+   is
-+      function GetMaxY (W : Window) return C_Int;
-+      pragma Import (C, GetMaxY, "getmaxy");
-+
-+      function GetMaxX (W : Window) return C_Int;
-+      pragma Import (C, GetMaxX, "getmaxx");
-+
-+      Y : constant C_Int := GetMaxY (Win)
-+                          + C_Int (Offset_XY);
-+      X : constant C_Int := GetMaxX (Win)
-+                          + C_Int (Offset_XY);
-+   begin
-+      Number_Of_Lines   := Line_Count (Y);
-+      Number_Of_Columns := Column_Count (X);
-+   end Get_Size;
-+
-+   procedure Get_Window_Position
-+     (Win             : in Window := Standard_Window;
-+      Top_Left_Line   : out Line_Position;
-+      Top_Left_Column : out Column_Position)
-+   is
-+      function GetBegY (W : Window) return C_Int;
-+      pragma Import (C, GetBegY, "getbegy");
-+
-+      function GetBegX (W : Window) return C_Int;
-+      pragma Import (C, GetBegX, "getbegx");
-+
-+      Y : constant C_Short := C_Short (GetBegY (Win));
-+      X : constant C_Short := C_Short (GetBegX (Win));
-+   begin
-+      Top_Left_Line   := Line_Position (Y);
-+      Top_Left_Column := Column_Position (X);
-+   end Get_Window_Position;
-+
-+   procedure Get_Cursor_Position
-+     (Win    : in  Window := Standard_Window;
-+      Line   : out Line_Position;
-+      Column : out Column_Position)
-+   is
-+      function GetCurY (W : Window) return C_Int;
-+      pragma Import (C, GetCurY, "getcury");
-+
-+      function GetCurX (W : Window) return C_Int;
-+      pragma Import (C, GetCurX, "getcurx");
-+
-+      Y : constant C_Short := C_Short (GetCurY (Win));
-+      X : constant C_Short := C_Short (GetCurX (Win));
-+   begin
-+      Line   := Line_Position (Y);
-+      Column := Column_Position (X);
-+   end Get_Cursor_Position;
-+
-+   procedure Get_Origin_Relative_To_Parent
-+     (Win                : in  Window;
-+      Top_Left_Line      : out Line_Position;
-+      Top_Left_Column    : out Column_Position;
-+      Is_Not_A_Subwindow : out Boolean)
-+   is
-+      function GetParY (W : Window) return C_Int;
-+      pragma Import (C, GetParY, "getpary");
-+
-+      function GetParX (W : Window) return C_Int;
-+      pragma Import (C, GetParX, "getparx");
-+
-+      Y : constant C_Int := GetParY (Win);
-+      X : constant C_Int := GetParX (Win);
-+   begin
-+      if Y = -1 then
-+         Top_Left_Line   := Line_Position'Last;
-+         Top_Left_Column := Column_Position'Last;
-+         Is_Not_A_Subwindow := True;
-+      else
-+         Top_Left_Line   := Line_Position (Y);
-+         Top_Left_Column := Column_Position (X);
-+         Is_Not_A_Subwindow := False;
-+      end if;
-+   end Get_Origin_Relative_To_Parent;
-+------------------------------------------------------------------------------
-+   function New_Pad (Lines   : Line_Count;
-+                     Columns : Column_Count) return Window
-+   is
-+      function Newpad (Lines : C_Int; Columns : C_Int) return Window;
-+      pragma Import (C, Newpad, "newpad");
-+
-+      W : Window;
-+   begin
-+      W := Newpad (C_Int (Lines), C_Int (Columns));
-+      if W = Null_Window then
-+         raise Curses_Exception;
-+      end if;
-+      return W;
-+   end New_Pad;
-+
-+   function Sub_Pad
-+     (Pad                   : Window;
-+      Number_Of_Lines       : Line_Count;
-+      Number_Of_Columns     : Column_Count;
-+      First_Line_Position   : Line_Position;
-+      First_Column_Position : Column_Position) return Window
-+   is
-+      function Subpad
-+        (Pad                   : Window;
-+         Number_Of_Lines       : C_Int;
-+         Number_Of_Columns     : C_Int;
-+         First_Line_Position   : C_Int;
-+         First_Column_Position : C_Int) return Window;
-+      pragma Import (C, Subpad, "subpad");
-+
-+      W : Window;
-+   begin
-+      W := Subpad (Pad,
-+                   C_Int (Number_Of_Lines),
-+                   C_Int (Number_Of_Columns),
-+                   C_Int (First_Line_Position),
-+                   C_Int (First_Column_Position));
-+      if W = Null_Window then
-+         raise Curses_Exception;
-+      end if;
-+      return W;
-+   end Sub_Pad;
-+
-+   procedure Refresh
-+     (Pad                      : in Window;
-+      Source_Top_Row           : in Line_Position;
-+      Source_Left_Column       : in Column_Position;
-+      Destination_Top_Row      : in Line_Position;
-+      Destination_Left_Column  : in Column_Position;
-+      Destination_Bottom_Row   : in Line_Position;
-+      Destination_Right_Column : in Column_Position)
-+   is
-+      function Prefresh
-+        (Pad                      : Window;
-+         Source_Top_Row           : C_Int;
-+         Source_Left_Column       : C_Int;
-+         Destination_Top_Row      : C_Int;
-+         Destination_Left_Column  : C_Int;
-+         Destination_Bottom_Row   : C_Int;
-+         Destination_Right_Column : C_Int) return C_Int;
-+      pragma Import (C, Prefresh, "prefresh");
-+   begin
-+      if Prefresh (Pad,
-+                   C_Int (Source_Top_Row),
-+                   C_Int (Source_Left_Column),
-+                   C_Int (Destination_Top_Row),
-+                   C_Int (Destination_Left_Column),
-+                   C_Int (Destination_Bottom_Row),
-+                   C_Int (Destination_Right_Column)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Refresh;
-+
-+   procedure Refresh_Without_Update
-+     (Pad                      : in Window;
-+      Source_Top_Row           : in Line_Position;
-+      Source_Left_Column       : in Column_Position;
-+      Destination_Top_Row      : in Line_Position;
-+      Destination_Left_Column  : in Column_Position;
-+      Destination_Bottom_Row   : in Line_Position;
-+      Destination_Right_Column : in Column_Position)
-+   is
-+      function Pnoutrefresh
-+        (Pad                      : Window;
-+         Source_Top_Row           : C_Int;
-+         Source_Left_Column       : C_Int;
-+         Destination_Top_Row      : C_Int;
-+         Destination_Left_Column  : C_Int;
-+         Destination_Bottom_Row   : C_Int;
-+         Destination_Right_Column : C_Int) return C_Int;
-+      pragma Import (C, Pnoutrefresh, "pnoutrefresh");
-+   begin
-+      if Pnoutrefresh (Pad,
-+                       C_Int (Source_Top_Row),
-+                       C_Int (Source_Left_Column),
-+                       C_Int (Destination_Top_Row),
-+                       C_Int (Destination_Left_Column),
-+                       C_Int (Destination_Bottom_Row),
-+                       C_Int (Destination_Right_Column)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Refresh_Without_Update;
-+
-+   procedure Add_Character_To_Pad_And_Echo_It
-+     (Pad : in Window;
-+      Ch  : in Attributed_Character)
-+   is
-+      function Pechochar (Pad : Window; Ch : C_Chtype)
-+                          return C_Int;
-+      pragma Import (C, Pechochar, "pechochar");
-+   begin
-+      if Pechochar (Pad, AttrChar_To_Chtype (Ch)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Add_Character_To_Pad_And_Echo_It;
-+
-+   procedure Add_Character_To_Pad_And_Echo_It
-+     (Pad : in Window;
-+      Ch  : in Character)
-+   is
-+   begin
-+      Add_Character_To_Pad_And_Echo_It
-+        (Pad,
-+         Attributed_Character'(Ch    => Ch,
-+                               Color => Color_Pair'First,
-+                               Attr  => Normal_Video));
-+   end Add_Character_To_Pad_And_Echo_It;
-+------------------------------------------------------------------------------
-+   procedure Scroll (Win    : in Window := Standard_Window;
-+                     Amount : in Integer := 1)
-+   is
-+      function Wscrl (Win : Window; N : C_Int) return C_Int;
-+      pragma Import (C, Wscrl, "wscrl");
-+
-+   begin
-+      if Wscrl (Win, C_Int (Amount)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Scroll;
-+
-+------------------------------------------------------------------------------
-+   procedure Delete_Character (Win : in Window := Standard_Window)
-+   is
-+      function Wdelch (Win : Window) return C_Int;
-+      pragma Import (C, Wdelch, "wdelch");
-+   begin
-+      if Wdelch (Win) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Delete_Character;
-+
-+   procedure Delete_Character
-+     (Win    : in Window := Standard_Window;
-+      Line   : in Line_Position;
-+      Column : in Column_Position)
-+   is
-+      function Mvwdelch (Win : Window;
-+                         Lin : C_Int;
-+                         Col : C_Int) return C_Int;
-+      pragma Import (C, Mvwdelch, "mvwdelch");
-+   begin
-+      if Mvwdelch (Win, C_Int (Line), C_Int (Column)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Delete_Character;
-+------------------------------------------------------------------------------
-+   function Peek (Win : Window := Standard_Window)
-+     return Attributed_Character
-+   is
-+      function Winch (Win : Window) return C_Chtype;
-+      pragma Import (C, Winch, "winch");
-+   begin
-+      return Chtype_To_AttrChar (Winch (Win));
-+   end Peek;
-+
-+   function Peek
-+     (Win    : Window := Standard_Window;
-+      Line   : Line_Position;
-+      Column : Column_Position) return Attributed_Character
-+   is
-+      function Mvwinch (Win : Window;
-+                        Lin : C_Int;
-+                        Col : C_Int) return C_Chtype;
-+      pragma Import (C, Mvwinch, "mvwinch");
-+   begin
-+      return Chtype_To_AttrChar (Mvwinch (Win, C_Int (Line), C_Int (Column)));
-+   end Peek;
-+------------------------------------------------------------------------------
-+   procedure Insert (Win : in Window := Standard_Window;
-+                     Ch  : in Attributed_Character)
-+   is
-+      function Winsch (Win : Window; Ch : C_Chtype) return C_Int;
-+      pragma Import (C, Winsch, "winsch");
-+   begin
-+      if Winsch (Win, AttrChar_To_Chtype (Ch)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Insert;
-+
-+   procedure Insert
-+     (Win    : in Window := Standard_Window;
-+      Line   : in Line_Position;
-+      Column : in Column_Position;
-+      Ch     : in Attributed_Character)
-+   is
-+      function Mvwinsch (Win : Window;
-+                         Lin : C_Int;
-+                         Col : C_Int;
-+                         Ch  : C_Chtype) return C_Int;
-+      pragma Import (C, Mvwinsch, "mvwinsch");
-+   begin
-+      if Mvwinsch (Win,
-+                   C_Int (Line),
-+                   C_Int (Column),
-+                   AttrChar_To_Chtype (Ch)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Insert;
-+------------------------------------------------------------------------------
-+   procedure Insert (Win : in Window := Standard_Window;
-+                     Str : in String;
-+                     Len : in Integer := -1)
-+   is
-+      function Winsnstr (Win : Window;
-+                         Str : char_array;
-+                         Len : Integer := -1) return C_Int;
-+      pragma Import (C, Winsnstr, "winsnstr");
-+
-+      Txt    : char_array (0 .. Str'Length);
-+      Length : size_t;
-+   begin
-+      To_C (Str, Txt, Length);
-+      if Winsnstr (Win, Txt, Len) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Insert;
-+
-+   procedure Insert
-+     (Win    : in Window := Standard_Window;
-+      Line   : in Line_Position;
-+      Column : in Column_Position;
-+      Str    : in String;
-+      Len    : in Integer := -1)
-+   is
-+      function Mvwinsnstr (Win    : Window;
-+                           Line   : C_Int;
-+                           Column : C_Int;
-+                           Str    : char_array;
-+                           Len    : C_Int) return C_Int;
-+      pragma Import (C, Mvwinsnstr, "mvwinsnstr");
-+
-+      Txt    : char_array (0 .. Str'Length);
-+      Length : size_t;
-+   begin
-+      To_C (Str, Txt, Length);
-+      if Mvwinsnstr (Win, C_Int (Line), C_Int (Column), Txt, C_Int (Len))
-+        = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Insert;
-+------------------------------------------------------------------------------
-+   procedure Peek (Win : in  Window := Standard_Window;
-+                   Str : out String;
-+                   Len : in  Integer := -1)
-+   is
-+      function Winnstr (Win : Window;
-+                        Str : char_array;
-+                        Len : C_Int) return C_Int;
-+      pragma Import (C, Winnstr, "winnstr");
-+
-+      N   : Integer := Len;
-+      Txt : char_array (0 .. Str'Length);
-+      Cnt : Natural;
-+   begin
-+      if N < 0 then
-+         N := Str'Length;
-+      end if;
-+      if N > Str'Length then
-+         raise Constraint_Error;
-+      end if;
-+      Txt (0) := Interfaces.C.char'First;
-+      if Winnstr (Win, Txt, C_Int (N)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+      To_Ada (Txt, Str, Cnt, True);
-+      if Cnt < Str'Length then
-+         Str ((Str'First + Cnt) .. Str'Last) := (others => ' ');
-+      end if;
-+   end Peek;
-+
-+   procedure Peek
-+     (Win    : in  Window := Standard_Window;
-+      Line   : in  Line_Position;
-+      Column : in  Column_Position;
-+      Str    : out String;
-+      Len    : in  Integer := -1)
-+   is
-+   begin
-+      Move_Cursor (Win, Line, Column);
-+      Peek (Win, Str, Len);
-+   end Peek;
-+------------------------------------------------------------------------------
-+   procedure Peek
-+     (Win : in  Window := Standard_Window;
-+      Str : out Attributed_String;
-+      Len : in  Integer := -1)
-+   is
-+      function Winchnstr (Win : Window;
-+                          Str : chtype_array;             -- out
-+                          Len : C_Int) return C_Int;
-+      pragma Import (C, Winchnstr, "winchnstr");
-+
-+      N   : Integer := Len;
-+      Txt : constant chtype_array (0 .. Str'Length)
-+          := (0 => Default_Character);
-+      Cnt : Natural := 0;
-+   begin
-+      if N < 0 then
-+         N := Str'Length;
-+      end if;
-+      if N > Str'Length then
-+         raise Constraint_Error;
-+      end if;
-+      if Winchnstr (Win, Txt, C_Int (N)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+      for To in Str'Range loop
-+         exit when Txt (size_t (Cnt)) = Default_Character;
-+         Str (To) := Txt (size_t (Cnt));
-+         Cnt := Cnt + 1;
-+      end loop;
-+      if Cnt < Str'Length then
-+         Str ((Str'First + Cnt) .. Str'Last) :=
-+           (others => (Ch => ' ',
-+                       Color => Color_Pair'First,
-+                       Attr => Normal_Video));
-+      end if;
-+   end Peek;
-+
-+   procedure Peek
-+     (Win    : in  Window := Standard_Window;
-+      Line   : in  Line_Position;
-+      Column : in  Column_Position;
-+      Str    : out Attributed_String;
-+      Len    : in Integer := -1)
-+   is
-+   begin
-+      Move_Cursor (Win, Line, Column);
-+      Peek (Win, Str, Len);
-+   end Peek;
-+------------------------------------------------------------------------------
-+   procedure Get (Win : in  Window := Standard_Window;
-+                  Str : out String;
-+                  Len : in  Integer := -1)
-+   is
-+      function Wgetnstr (Win : Window;
-+                         Str : char_array;
-+                         Len : C_Int) return C_Int;
-+      pragma Import (C, Wgetnstr, "wgetnstr");
-+
-+      N   : Integer := Len;
-+      Txt : char_array (0 .. Str'Length);
-+      Cnt : Natural;
-+   begin
-+      if N < 0 then
-+         N := Str'Length;
-+      end if;
-+      if N > Str'Length then
-+         raise Constraint_Error;
-+      end if;
-+      Txt (0) := Interfaces.C.char'First;
-+      if Wgetnstr (Win, Txt, C_Int (N)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+      To_Ada (Txt, Str, Cnt, True);
-+      if Cnt < Str'Length then
-+         Str ((Str'First + Cnt) .. Str'Last) := (others => ' ');
-+      end if;
-+   end Get;
-+
-+   procedure Get
-+     (Win    : in  Window := Standard_Window;
-+      Line   : in  Line_Position;
-+      Column : in  Column_Position;
-+      Str    : out String;
-+      Len    : in  Integer := -1)
-+   is
-+   begin
-+      Move_Cursor (Win, Line, Column);
-+      Get (Win, Str, Len);
-+   end Get;
-+------------------------------------------------------------------------------
-+   procedure Init_Soft_Label_Keys
-+     (Format : in Soft_Label_Key_Format := Three_Two_Three)
-+   is
-+      function Slk_Init (Fmt : C_Int) return C_Int;
-+      pragma Import (C, Slk_Init, "slk_init");
-+   begin
-+      if Slk_Init (Soft_Label_Key_Format'Pos (Format)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Init_Soft_Label_Keys;
-+
-+   procedure Set_Soft_Label_Key (Label : in Label_Number;
-+                                 Text  : in String;
-+                                 Fmt   : in Label_Justification := Left)
-+   is
-+      function Slk_Set (Label : C_Int;
-+                        Txt   : char_array;
-+                        Fmt   : C_Int) return C_Int;
-+      pragma Import (C, Slk_Set, "slk_set");
-+
-+      Txt : char_array (0 .. Text'Length);
-+      Len : size_t;
-+   begin
-+      To_C (Text, Txt, Len);
-+      if Slk_Set (C_Int (Label), Txt,
-+                  C_Int (Label_Justification'Pos (Fmt))) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Set_Soft_Label_Key;
-+
-+   procedure Refresh_Soft_Label_Keys
-+   is
-+      function Slk_Refresh return C_Int;
-+      pragma Import (C, Slk_Refresh, "slk_refresh");
-+   begin
-+      if Slk_Refresh = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Refresh_Soft_Label_Keys;
-+
-+   procedure Refresh_Soft_Label_Keys_Without_Update
-+   is
-+      function Slk_Noutrefresh return C_Int;
-+      pragma Import (C, Slk_Noutrefresh, "slk_noutrefresh");
-+   begin
-+      if Slk_Noutrefresh = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Refresh_Soft_Label_Keys_Without_Update;
-+
-+   procedure Get_Soft_Label_Key (Label : in Label_Number;
-+                                 Text  : out String)
-+   is
-+      function Slk_Label (Label : C_Int) return chars_ptr;
-+      pragma Import (C, Slk_Label, "slk_label");
-+   begin
-+      Fill_String (Slk_Label (C_Int (Label)), Text);
-+   end Get_Soft_Label_Key;
-+
-+   function Get_Soft_Label_Key (Label : in Label_Number) return String
-+   is
-+      function Slk_Label (Label : C_Int) return chars_ptr;
-+      pragma Import (C, Slk_Label, "slk_label");
-+   begin
-+      return Fill_String (Slk_Label (C_Int (Label)));
-+   end Get_Soft_Label_Key;
-+
-+   procedure Clear_Soft_Label_Keys
-+   is
-+      function Slk_Clear return C_Int;
-+      pragma Import (C, Slk_Clear, "slk_clear");
-+   begin
-+      if Slk_Clear = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Clear_Soft_Label_Keys;
-+
-+   procedure Restore_Soft_Label_Keys
-+   is
-+      function Slk_Restore return C_Int;
-+      pragma Import (C, Slk_Restore, "slk_restore");
-+   begin
-+      if Slk_Restore = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Restore_Soft_Label_Keys;
-+
-+   procedure Touch_Soft_Label_Keys
-+   is
-+      function Slk_Touch return C_Int;
-+      pragma Import (C, Slk_Touch, "slk_touch");
-+   begin
-+      if Slk_Touch = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Touch_Soft_Label_Keys;
-+
-+   procedure Switch_Soft_Label_Key_Attributes
-+     (Attr : in Character_Attribute_Set;
-+      On   : in Boolean := True)
-+   is
-+      function Slk_Attron (Ch : C_Chtype) return C_Int;
-+      pragma Import (C, Slk_Attron, "slk_attron");
-+      function Slk_Attroff (Ch : C_Chtype) return C_Int;
-+      pragma Import (C, Slk_Attroff, "slk_attroff");
-+
-+      Err : C_Int;
-+      Ch  : constant Attributed_Character := (Ch    => Character'First,
-+                                              Attr  => Attr,
-+                                              Color => Color_Pair'First);
-+   begin
-+      if On then
-+         Err := Slk_Attron  (AttrChar_To_Chtype (Ch));
-+      else
-+         Err := Slk_Attroff (AttrChar_To_Chtype (Ch));
-+      end if;
-+      if Err = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Switch_Soft_Label_Key_Attributes;
-+
-+   procedure Set_Soft_Label_Key_Attributes
-+     (Attr  : in Character_Attribute_Set := Normal_Video;
-+      Color : in Color_Pair := Color_Pair'First)
-+   is
-+      function Slk_Attrset (Ch : C_Chtype) return C_Int;
-+      pragma Import (C, Slk_Attrset, "slk_attrset");
-+
-+      Ch : constant Attributed_Character := (Ch    => Character'First,
-+                                             Attr  => Attr,
-+                                             Color => Color);
-+   begin
-+      if Slk_Attrset (AttrChar_To_Chtype (Ch)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Set_Soft_Label_Key_Attributes;
-+
-+   function Get_Soft_Label_Key_Attributes return Character_Attribute_Set
-+   is
-+      function Slk_Attr return C_Chtype;
-+      pragma Import (C, Slk_Attr, "slk_attr");
-+
-+      Attr : constant C_Chtype := Slk_Attr;
-+   begin
-+      return Chtype_To_AttrChar (Attr).Attr;
-+   end Get_Soft_Label_Key_Attributes;
-+
-+   function Get_Soft_Label_Key_Attributes return Color_Pair
-+   is
-+      function Slk_Attr return C_Chtype;
-+      pragma Import (C, Slk_Attr, "slk_attr");
-+
-+      Attr : constant C_Chtype := Slk_Attr;
-+   begin
-+      return Chtype_To_AttrChar (Attr).Color;
-+   end Get_Soft_Label_Key_Attributes;
-+
-+   procedure Set_Soft_Label_Key_Color (Pair : in Color_Pair)
-+   is
-+      function Slk_Color (Color : in C_Short) return C_Int;
-+      pragma Import (C, Slk_Color, "slk_color");
-+   begin
-+      if Slk_Color (C_Short (Pair)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Set_Soft_Label_Key_Color;
-+
-+------------------------------------------------------------------------------
-+   procedure Enable_Key (Key    : in Special_Key_Code;
-+                         Enable : in Boolean := True)
-+   is
-+      function Keyok (Keycode : C_Int;
-+                      On_Off  : Curses_Bool) return C_Int;
-+      pragma Import (C, Keyok, "keyok");
-+   begin
-+      if Keyok (C_Int (Key), Curses_Bool (Boolean'Pos (Enable)))
-+        = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Enable_Key;
-+------------------------------------------------------------------------------
-+   procedure Define_Key (Definition : in String;
-+                         Key        : in Special_Key_Code)
-+   is
-+      function Defkey (Def : char_array;
-+                       Key : C_Int) return C_Int;
-+      pragma Import (C, Defkey, "define_key");
-+
-+      Txt    : char_array (0 .. Definition'Length);
-+      Length : size_t;
-+   begin
-+      To_C (Definition, Txt, Length);
-+      if Defkey (Txt, C_Int (Key)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Define_Key;
-+------------------------------------------------------------------------------
-+   procedure Un_Control (Ch  : in Attributed_Character;
-+                         Str : out String)
-+   is
-+      function Unctrl (Ch : C_Chtype) return chars_ptr;
-+      pragma Import (C, Unctrl, "unctrl");
-+   begin
-+      Fill_String (Unctrl (AttrChar_To_Chtype (Ch)), Str);
-+   end Un_Control;
-+
-+   function Un_Control (Ch : in Attributed_Character) return String
-+   is
-+      function Unctrl (Ch : C_Chtype) return chars_ptr;
-+      pragma Import (C, Unctrl, "unctrl");
-+   begin
-+      return Fill_String (Unctrl (AttrChar_To_Chtype (Ch)));
-+   end Un_Control;
-+
-+   procedure Delay_Output (Msecs : in Natural)
-+   is
-+      function Delayoutput (Msecs : C_Int) return C_Int;
-+      pragma Import (C, Delayoutput, "delay_output");
-+   begin
-+      if Delayoutput (C_Int (Msecs)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Delay_Output;
-+
-+   procedure Flush_Input
-+   is
-+      function Flushinp return C_Int;
-+      pragma Import (C, Flushinp, "flushinp");
-+   begin
-+      if Flushinp = Curses_Err then  -- docu says that never happens, but...
-+         raise Curses_Exception;
-+      end if;
-+   end Flush_Input;
-+------------------------------------------------------------------------------
-+   function Baudrate return Natural
-+   is
-+      function Baud return C_Int;
-+      pragma Import (C, Baud, "baudrate");
-+   begin
-+      return Natural (Baud);
-+   end Baudrate;
-+
-+   function Erase_Character return Character
-+   is
-+      function Erasechar return C_Int;
-+      pragma Import (C, Erasechar, "erasechar");
-+   begin
-+      return Character'Val (Erasechar);
-+   end Erase_Character;
-+
-+   function Kill_Character return Character
-+   is
-+      function Killchar return C_Int;
-+      pragma Import (C, Killchar, "killchar");
-+   begin
-+      return Character'Val (Killchar);
-+   end Kill_Character;
-+
-+   function Has_Insert_Character return Boolean
-+   is
-+      function Has_Ic return Curses_Bool;
-+      pragma Import (C, Has_Ic, "has_ic");
-+   begin
-+      if Has_Ic = Curses_Bool_False then
-+         return False;
-+      else
-+         return True;
-+      end if;
-+   end Has_Insert_Character;
-+
-+   function Has_Insert_Line return Boolean
-+   is
-+      function Has_Il return Curses_Bool;
-+      pragma Import (C, Has_Il, "has_il");
-+   begin
-+      if Has_Il = Curses_Bool_False then
-+         return False;
-+      else
-+         return True;
-+      end if;
-+   end Has_Insert_Line;
-+
-+   function Supported_Attributes return Character_Attribute_Set
-+   is
-+      function Termattrs return C_Chtype;
-+      pragma Import (C, Termattrs, "termattrs");
-+
-+      Ch : constant Attributed_Character := Chtype_To_AttrChar (Termattrs);
-+   begin
-+      return Ch.Attr;
-+   end Supported_Attributes;
-+
-+   procedure Long_Name (Name : out String)
-+   is
-+      function Longname return chars_ptr;
-+      pragma Import (C, Longname, "longname");
-+   begin
-+      Fill_String (Longname, Name);
-+   end Long_Name;
-+
-+   function Long_Name return String
-+   is
-+      function Longname return chars_ptr;
-+      pragma Import (C, Longname, "longname");
-+   begin
-+      return Fill_String (Longname);
-+   end Long_Name;
-+
-+   procedure Terminal_Name (Name : out String)
-+   is
-+      function Termname return chars_ptr;
-+      pragma Import (C, Termname, "termname");
-+   begin
-+      Fill_String (Termname, Name);
-+   end Terminal_Name;
-+
-+   function Terminal_Name return String
-+   is
-+      function Termname return chars_ptr;
-+      pragma Import (C, Termname, "termname");
-+   begin
-+      return Fill_String (Termname);
-+   end Terminal_Name;
-+------------------------------------------------------------------------------
-+   procedure Init_Pair (Pair : in Redefinable_Color_Pair;
-+                        Fore : in Color_Number;
-+                        Back : in Color_Number)
-+   is
-+      function Initpair (Pair : C_Short;
-+                         Fore : C_Short;
-+                         Back : C_Short) return C_Int;
-+      pragma Import (C, Initpair, "init_pair");
-+   begin
-+      if Integer (Pair) >= Number_Of_Color_Pairs then
-+         raise Constraint_Error;
-+      end if;
-+      if Integer (Fore) >= Number_Of_Colors or else
-+        Integer (Back) >= Number_Of_Colors then raise Constraint_Error;
-+      end if;
-+      if Initpair (C_Short (Pair), C_Short (Fore), C_Short (Back))
-+        = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Init_Pair;
-+
-+   procedure Pair_Content (Pair : in Color_Pair;
-+                           Fore : out Color_Number;
-+                           Back : out Color_Number)
-+   is
-+      type C_Short_Access is access all C_Short;
-+      function Paircontent (Pair : C_Short;
-+                            Fp   : C_Short_Access;
-+                            Bp   : C_Short_Access) return C_Int;
-+      pragma Import (C, Paircontent, "pair_content");
-+
-+      F, B : aliased C_Short;
-+   begin
-+      if Paircontent (C_Short (Pair), F'Access, B'Access) = Curses_Err then
-+         raise Curses_Exception;
-+      else
-+         Fore := Color_Number (F);
-+         Back := Color_Number (B);
-+      end if;
-+   end Pair_Content;
-+
-+   function Has_Colors return Boolean
-+   is
-+      function Hascolors return Curses_Bool;
-+      pragma Import (C, Hascolors, "has_colors");
-+   begin
-+      if Hascolors = Curses_Bool_False then
-+         return False;
-+      else
-+         return True;
-+      end if;
-+   end Has_Colors;
-+
-+   procedure Init_Color (Color : in Color_Number;
-+                         Red   : in RGB_Value;
-+                         Green : in RGB_Value;
-+                         Blue  : in RGB_Value)
-+   is
-+      function Initcolor (Col   : C_Short;
-+                          Red   : C_Short;
-+                          Green : C_Short;
-+                          Blue  : C_Short) return C_Int;
-+      pragma Import (C, Initcolor, "init_color");
-+   begin
-+      if Initcolor (C_Short (Color), C_Short (Red), C_Short (Green),
-+                    C_Short (Blue)) = Curses_Err then
-+            raise Curses_Exception;
-+      end if;
-+   end Init_Color;
-+
-+   function Can_Change_Color return Boolean
-+   is
-+      function Canchangecolor return Curses_Bool;
-+      pragma Import (C, Canchangecolor, "can_change_color");
-+   begin
-+      if Canchangecolor = Curses_Bool_False then
-+         return False;
-+      else
-+         return True;
-+      end if;
-+   end Can_Change_Color;
-+
-+   procedure Color_Content (Color : in  Color_Number;
-+                            Red   : out RGB_Value;
-+                            Green : out RGB_Value;
-+                            Blue  : out RGB_Value)
-+   is
-+      type C_Short_Access is access all C_Short;
-+
-+      function Colorcontent (Color : C_Short; R, G, B : C_Short_Access)
-+                             return C_Int;
-+      pragma Import (C, Colorcontent, "color_content");
-+
-+      R, G, B : aliased C_Short;
-+   begin
-+      if Colorcontent (C_Short (Color), R'Access, G'Access, B'Access) =
-+        Curses_Err then
-+         raise Curses_Exception;
-+      else
-+         Red   := RGB_Value (R);
-+         Green := RGB_Value (G);
-+         Blue  := RGB_Value (B);
-+      end if;
-+   end Color_Content;
-+
-+------------------------------------------------------------------------------
-+   procedure Save_Curses_Mode (Mode : in Curses_Mode)
-+   is
-+      function Def_Prog_Mode return C_Int;
-+      pragma Import (C, Def_Prog_Mode, "def_prog_mode");
-+      function Def_Shell_Mode return C_Int;
-+      pragma Import (C, Def_Shell_Mode, "def_shell_mode");
-+
-+      Err : C_Int;
-+   begin
-+      case Mode is
-+         when Curses => Err := Def_Prog_Mode;
-+         when Shell  => Err := Def_Shell_Mode;
-+      end case;
-+      if Err = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Save_Curses_Mode;
-+
-+   procedure Reset_Curses_Mode (Mode : in Curses_Mode)
-+   is
-+      function Reset_Prog_Mode return C_Int;
-+      pragma Import (C, Reset_Prog_Mode, "reset_prog_mode");
-+      function Reset_Shell_Mode return C_Int;
-+      pragma Import (C, Reset_Shell_Mode, "reset_shell_mode");
-+
-+      Err : C_Int;
-+   begin
-+      case Mode is
-+         when Curses => Err := Reset_Prog_Mode;
-+         when Shell  => Err := Reset_Shell_Mode;
-+      end case;
-+      if Err = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Reset_Curses_Mode;
-+
-+   procedure Save_Terminal_State
-+   is
-+      function Savetty return C_Int;
-+      pragma Import (C, Savetty, "savetty");
-+   begin
-+      if Savetty = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Save_Terminal_State;
-+
-+   procedure Reset_Terminal_State
-+   is
-+      function Resetty return C_Int;
-+      pragma Import (C, Resetty, "resetty");
-+   begin
-+      if Resetty = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Reset_Terminal_State;
-+
-+   procedure Rip_Off_Lines (Lines : in Integer;
-+                            Proc  : in Stdscr_Init_Proc)
-+   is
-+      function Ripoffline (Lines : C_Int;
-+                           Proc  : Stdscr_Init_Proc) return C_Int;
-+      pragma Import (C, Ripoffline, "_nc_ripoffline");
-+   begin
-+      if Ripoffline (C_Int (Lines), Proc) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Rip_Off_Lines;
-+
-+   procedure Set_Cursor_Visibility (Visibility : in out Cursor_Visibility)
-+   is
-+      function Curs_Set (Curs : C_Int) return C_Int;
-+      pragma Import (C, Curs_Set, "curs_set");
-+
-+      Res : C_Int;
-+   begin
-+      Res := Curs_Set (Cursor_Visibility'Pos (Visibility));
-+      if Res /= Curses_Err then
-+         Visibility := Cursor_Visibility'Val (Res);
-+      end if;
-+   end Set_Cursor_Visibility;
-+
-+   procedure Nap_Milli_Seconds (Ms : in Natural)
-+   is
-+      function Napms (Ms : C_Int) return C_Int;
-+      pragma Import (C, Napms, "napms");
-+   begin
-+      if Napms (C_Int (Ms)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Nap_Milli_Seconds;
-+------------------------------------------------------------------------------
-+include(`Public_Variables')
-+------------------------------------------------------------------------------
-+   procedure Transform_Coordinates
-+     (W      : in Window := Standard_Window;
-+      Line   : in out Line_Position;
-+      Column : in out Column_Position;
-+      Dir    : in Transform_Direction := From_Screen)
-+   is
-+      type Int_Access is access all C_Int;
-+      function Transform (W    : Window;
-+                          Y, X : Int_Access;
-+                          Dir  : Curses_Bool) return C_Int;
-+      pragma Import (C, Transform, "wmouse_trafo");
-+
-+      X : aliased C_Int := C_Int (Column);
-+      Y : aliased C_Int := C_Int (Line);
-+      D : Curses_Bool := Curses_Bool_False;
-+      R : C_Int;
-+   begin
-+      if Dir = To_Screen then
-+         D := 1;
-+      end if;
-+      R := Transform (W, Y'Access, X'Access, D);
-+      if R = Curses_False then
-+         raise Curses_Exception;
-+      else
-+         Line   := Line_Position (Y);
-+         Column := Column_Position (X);
-+      end if;
-+   end Transform_Coordinates;
-+------------------------------------------------------------------------------
-+   procedure Use_Default_Colors is
-+      function C_Use_Default_Colors return C_Int;
-+      pragma Import (C, C_Use_Default_Colors, "use_default_colors");
-+      Err : constant C_Int := C_Use_Default_Colors;
-+   begin
-+      if Err = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Use_Default_Colors;
-+
-+   procedure Assume_Default_Colors (Fore : Color_Number := Default_Color;
-+                                    Back : Color_Number := Default_Color)
-+   is
-+      function C_Assume_Default_Colors (Fore : C_Int;
-+                                        Back : C_Int) return C_Int;
-+      pragma Import (C, C_Assume_Default_Colors, "assume_default_colors");
-+
-+      Err : constant C_Int := C_Assume_Default_Colors (C_Int (Fore),
-+                                                       C_Int (Back));
-+   begin
-+      if Err = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Assume_Default_Colors;
-+------------------------------------------------------------------------------
-+   function Curses_Version return String
-+   is
-+      function curses_versionC return chars_ptr;
-+      pragma Import (C, curses_versionC, "curses_version");
-+      Result : constant chars_ptr := curses_versionC;
-+   begin
-+      return Fill_String (Result);
-+   end Curses_Version;
-+------------------------------------------------------------------------------
-+   procedure Curses_Free_All is
-+      procedure curses_freeall;
-+      pragma Import (C, curses_freeall, "_nc_freeall");
-+   begin
-+      --  Use this only for testing: you cannot use curses after calling it,
-+      --  so it has to be the "last" thing done before exiting the program.
-+      --  This will not really free ALL of memory used by curses.  That is
-+      --  because it cannot free the memory used for stdout's setbuf.  The
-+      --  _nc_free_and_exit() procedure can do that, but it can be invoked
-+      --  safely only from C - and again, that only as the "last" thing done
-+      --  before exiting the program.
-+      curses_freeall;
-+   end Curses_Free_All;
-+------------------------------------------------------------------------------
-+   function Use_Extended_Names (Enable : Boolean) return Boolean
-+   is
-+      function use_extended_namesC (e : Curses_Bool) return C_Int;
-+      pragma Import (C, use_extended_namesC, "use_extended_names");
-+
-+      Res : constant C_Int :=
-+         use_extended_namesC (Curses_Bool (Boolean'Pos (Enable)));
-+   begin
-+      if Res = C_Int (Curses_Bool_False) then
-+         return False;
-+      else
-+         return True;
-+      end if;
-+   end Use_Extended_Names;
-+------------------------------------------------------------------------------
-+   procedure Screen_Dump_To_File (Filename : in String)
-+   is
-+      function scr_dump (f : char_array) return C_Int;
-+      pragma Import (C, scr_dump, "scr_dump");
-+      Txt    : char_array (0 .. Filename'Length);
-+      Length : size_t;
-+   begin
-+      To_C (Filename, Txt, Length);
-+      if Curses_Err = scr_dump (Txt) then
-+         raise Curses_Exception;
-+      end if;
-+   end Screen_Dump_To_File;
-+
-+   procedure Screen_Restore_From_File (Filename : in String)
-+   is
-+      function scr_restore (f : char_array) return C_Int;
-+      pragma Import (C, scr_restore, "scr_restore");
-+      Txt    : char_array (0 .. Filename'Length);
-+      Length : size_t;
-+   begin
-+      To_C (Filename, Txt, Length);
-+      if Curses_Err = scr_restore (Txt)  then
-+         raise Curses_Exception;
-+      end if;
-+   end Screen_Restore_From_File;
-+
-+   procedure Screen_Init_From_File (Filename : in String)
-+   is
-+      function scr_init (f : char_array) return C_Int;
-+      pragma Import (C, scr_init, "scr_init");
-+      Txt    : char_array (0 .. Filename'Length);
-+      Length : size_t;
-+   begin
-+      To_C (Filename, Txt, Length);
-+      if Curses_Err = scr_init (Txt) then
-+         raise Curses_Exception;
-+      end if;
-+   end Screen_Init_From_File;
-+
-+   procedure Screen_Set_File (Filename : in String)
-+   is
-+      function scr_set (f : char_array) return C_Int;
-+      pragma Import (C, scr_set, "scr_set");
-+      Txt    : char_array (0 .. Filename'Length);
-+      Length : size_t;
-+   begin
-+      To_C (Filename, Txt, Length);
-+      if Curses_Err = scr_set (Txt) then
-+         raise Curses_Exception;
-+      end if;
-+   end Screen_Set_File;
-+------------------------------------------------------------------------------
-+   procedure Resize (Win               : Window := Standard_Window;
-+                     Number_Of_Lines   : Line_Count;
-+                     Number_Of_Columns : Column_Count) is
-+      function wresize (win     : Window;
-+                        lines   : C_Int;
-+                        columns : C_Int) return C_Int;
-+      pragma Import (C, wresize);
-+   begin
-+      if wresize (Win,
-+                  C_Int (Number_Of_Lines),
-+                  C_Int (Number_Of_Columns)) = Curses_Err then
-+         raise Curses_Exception;
-+      end if;
-+   end Resize;
-+------------------------------------------------------------------------------
-+
-+end Terminal_Interface.Curses;
-diff -Naur ncurses-5.6.orig/Ada95/gen/terminal_interface-curses.ads.m4 ncurses-5.6/Ada95/gen/terminal_interface-curses.ads.m4
---- ncurses-5.6.orig/Ada95/gen/terminal_interface-curses.ads.m4	2006-06-25 10:30:22.000000000 -0400
-+++ ncurses-5.6/Ada95/gen/terminal_interface-curses.ads.m4	2008-06-18 06:49:44.000000000 -0400
-@@ -9,7 +9,7 @@
- --                                 S P E C                                  --
- --                                                                          --
- ------------------------------------------------------------------------------
---- Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.              --
-+-- Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              --
- --                                                                          --
- -- Permission is hereby granted, free of charge, to any person obtaining a  --
- -- copy of this software and associated documentation files (the            --
-@@ -37,8 +37,8 @@
- ------------------------------------------------------------------------------
- --  Author:  Juergen Pfeifer, 1996
- --  Version Control:
----  $Revision: 1.37 $
----  $Date: 2006/06/25 14:30:22 $
-+--  $Revision: 1.41 $
-+--  $Date: 2007/05/05 20:33:52 $
- --  Binding Version 01.00
- ------------------------------------------------------------------------------
- include(`Base_Defs')
-@@ -188,25 +188,21 @@
-    function Number_Of_Color_Pairs return Natural;
-    pragma Inline (Number_Of_Color_Pairs);
- 
--   ACS_Map : array (Character'Val (0) .. Character'Val (127)) of
--     Attributed_Character;
--   pragma Import (C, ACS_Map, "acs_map");
--   --
--   --
--   --  Constants for several characters from the Alternate Character Set
--   --  You must use this constants as indices into the ACS_Map array
--   --  to get the corresponding attributed character at runtime.
--   --
- include(`ACS_Map')dnl
- 
-    --  MANPAGE(`curs_initscr.3x')
--   --  | Not implemented: newterm, set_term, delscreen, curscr
-+   --  | Not implemented: newterm, set_term, delscreen
- 
-    --  ANCHOR(`stdscr',`Standard_Window')
-    function Standard_Window return Window;
-    --  AKA
-    pragma Inline (Standard_Window);
- 
-+   --  ANCHOR(`curscr',`Current_Window')
-+   function Current_Window return Window;
-+   --  AKA
-+   pragma Inline (Current_Window);
-+
-    --  ANCHOR(`initscr()',`Init_Screen')
-    procedure Init_Screen;
- 
-@@ -1478,7 +1474,7 @@
-    --  Window or if you pass the Null_Window as argument.
-    --  We don't inline this procedure
- 
--   --  MANPAGE(`dft_fgbg.3x')
-+   --  MANPAGE(`default_colors.3x')
- 
-    --  ANCHOR(`use_default_colors()',`Use_Default_Colors')
-    procedure Use_Default_Colors;
-@@ -1502,6 +1498,12 @@
-    function Use_Extended_Names (Enable : Boolean) return Boolean;
-    --  AKA
- 
-+   --  MANPAGE(`curs_trace.3x')
-+
-+   --  ANCHOR(`_nc_freeall()',`Curses_Free_All')
-+   procedure Curses_Free_All;
-+   --  AKA
-+
-    --  MANPAGE(`curs_scr_dump.3x')
- 
-    --  ANCHOR(`scr_dump()',`Screen_Dump_To_File')
-diff -Naur ncurses-5.6.orig/Ada95/samples/ncurses2-attr_test.adb ncurses-5.6/Ada95/samples/ncurses2-attr_test.adb
---- ncurses-5.6.orig/Ada95/samples/ncurses2-attr_test.adb	2006-06-25 10:24:40.000000000 -0400
-+++ ncurses-5.6/Ada95/samples/ncurses2-attr_test.adb	2008-06-18 06:49:44.000000000 -0400
-@@ -7,7 +7,7 @@
- --                                 B O D Y                                  --
- --                                                                          --
- ------------------------------------------------------------------------------
---- Copyright (c) 2000-2004,2006 Free Software Foundation, Inc.              --
-+-- Copyright (c) 2000-2006,2007 Free Software Foundation, Inc.              --
- --                                                                          --
- -- Permission is hereby granted, free of charge, to any person obtaining a  --
- -- copy of this software and associated documentation files (the            --
-@@ -35,8 +35,8 @@
- ------------------------------------------------------------------------------
- --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
- --  Version Control
----  $Revision: 1.6 $
----  $Date: 2006/06/25 14:24:40 $
-+--  $Revision: 1.8 $
-+--  $Date: 2007/05/05 21:28:18 $
- --  Binding Version 01.00
- ------------------------------------------------------------------------------
- with ncurses2.util; use ncurses2.util;
-@@ -56,7 +56,7 @@
-                         attr : Character_Attribute_Set;
-                         name : String;
-                         once : Boolean) return Line_Position;
--   procedure attr_getc (skip : out Integer;
-+   procedure attr_getc (skip : in out Integer;
-                         fg, bg : in out Color_Number;
-                         result : out Boolean);
- 
-@@ -233,20 +233,18 @@
-       return row + 2;
-    end show_attr;
- 
--   procedure attr_getc (skip : out Integer; fg, bg : in out Color_Number;
--                                            result : out Boolean) is
-+   procedure attr_getc (skip : in out Integer;
-+                        fg, bg : in out Color_Number;
-+                        result : out Boolean) is
-       ch : constant Key_Code := Getchar;
-       nc : constant Color_Number := Color_Number (Number_Of_Colors);
--      curscr : Window;
--      pragma Import (C, curscr, "curscr");
--      --  curscr is not implemented in the Ada binding
-    begin
-       result := True;
-       if Ada.Characters.Handling.Is_Digit (Character'Val (ch)) then
-          skip := ctoi (Code_To_Char (ch));
-       elsif ch = CTRL ('L') then
-          Touch;
--         Touch (curscr);
-+         Touch (Current_Window);
-          Refresh;
-       elsif Has_Colors then
-          case ch is
-diff -Naur ncurses-5.6.orig/Ada95/samples/ncurses2-m.adb ncurses-5.6/Ada95/samples/ncurses2-m.adb
---- ncurses-5.6.orig/Ada95/samples/ncurses2-m.adb	2006-06-25 10:24:40.000000000 -0400
-+++ ncurses-5.6/Ada95/samples/ncurses2-m.adb	2008-06-18 06:49:44.000000000 -0400
-@@ -35,8 +35,8 @@
- ------------------------------------------------------------------------------
- --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
- --  Version Control
----  $Revision: 1.6 $
----  $Date: 2006/06/25 14:24:40 $
-+--  $Revision: 1.7 $
-+--  $Date: 2007/05/05 18:02:40 $
- --  Binding Version 01.00
- ------------------------------------------------------------------------------
- --  TODO use Default_Character where appropriate
-@@ -442,6 +442,7 @@
- 
-          exit when command = 'q';
-       end loop;
-+      Curses_Free_All;
-       return 0; -- TODO ExitProgram(EXIT_SUCCESS);
-    end main;
- 
-diff -Naur ncurses-5.6.orig/Ada95/samples/rain.adb ncurses-5.6/Ada95/samples/rain.adb
---- ncurses-5.6.orig/Ada95/samples/rain.adb	2003-10-25 11:39:18.000000000 -0400
-+++ ncurses-5.6/Ada95/samples/rain.adb	2008-06-18 06:49:44.000000000 -0400
-@@ -36,7 +36,8 @@
- --  Author:  Laurent Pautet <pautet@gnat.com>
- --  Modified by:  Juergen Pfeifer, 1997
- --  Version Control
----  $Revision: 1.6 $
-+--  $Revision: 1.7 $
-+--  $Date: 2007/05/05 18:54:03 $
- --  Binding Version 01.00
- ------------------------------------------------------------------------------
- --                                                                          --
-@@ -158,5 +159,6 @@
-    Visibility := Normal;
-    Set_Cursor_Visibility (Visibility);
-    End_Windows;
-+   Curses_Free_All;
- 
- end Rain;
-diff -Naur ncurses-5.6.orig/Ada95/samples/sample.adb ncurses-5.6/Ada95/samples/sample.adb
---- ncurses-5.6.orig/Ada95/samples/sample.adb	2003-10-25 11:39:18.000000000 -0400
-+++ ncurses-5.6/Ada95/samples/sample.adb	2008-06-18 06:49:44.000000000 -0400
-@@ -35,7 +35,8 @@
- ------------------------------------------------------------------------------
- --  Author:  Juergen Pfeifer, 1996
- --  Version Control
----  $Revision: 1.14 $
-+--  $Revision: 1.15 $
-+--  $Date: 2007/05/05 18:46:21 $
- --  Binding Version 01.00
- ------------------------------------------------------------------------------
- with Text_IO;
-@@ -204,6 +205,7 @@
-       --  We have some fixed key throughout this sample
-       Main_Menu;
-       End_Windows;
-+      Curses_Free_All;
- 
-    exception
-       when Event : others =>
-diff -Naur ncurses-5.6.orig/Ada95/src/Makefile.in ncurses-5.6/Ada95/src/Makefile.in
---- ncurses-5.6.orig/Ada95/src/Makefile.in	2004-08-21 17:29:50.000000000 -0400
-+++ ncurses-5.6/Ada95/src/Makefile.in	2008-06-18 06:49:44.000000000 -0400
-@@ -28,7 +28,7 @@
- #
- #  Author:  Juergen Pfeifer, 1996
- #
--#  $Id: Makefile.in,v 1.30 2004/08/21 21:29:50 tom Exp $
-+#  $Id: Makefile.in,v 1.31 2007/09/15 18:22:24 tom Exp $
- #
- .SUFFIXES:
- 
-@@ -197,7 +197,7 @@
- 
- realclean :: distclean
- 
--BASEDEPS=$(ABASE).ads $(ABASE)-aux.ads $(srcdir)/$(ABASE).adb
-+BASEDEPS=$(ABASE).ads $(ABASE)-aux.ads $(ABASE).adb
- 
- $(ALIB).o: $(srcdir)/$(ALIB).ads
- 	$(ADA) $(ADAFLAGS) -c -o $@ $(srcdir)/$(ALIB).ads
-@@ -207,8 +207,8 @@
- 	$(ADA) $(ADAFLAGS) -c -o $@ $(srcdir)/$(ABASE)-aux.adb
- 
- 
--$(ABASE).o: $(srcdir)/$(ABASE).adb $(BASEDEPS)
--	$(ADA) $(ADAFLAGS) -c -o $@ $(srcdir)/$(ABASE).adb
-+$(ABASE).o: $(ABASE).adb $(BASEDEPS)
-+	$(ADA) $(ADAFLAGS) -c -o $@ $(ABASE).adb
- 
- 
- $(ABASE)-terminfo.o: \
-diff -Naur ncurses-5.6.orig/Ada95/src/terminal_interface-curses.adb ncurses-5.6/Ada95/src/terminal_interface-curses.adb
---- ncurses-5.6.orig/Ada95/src/terminal_interface-curses.adb	2006-06-25 10:30:22.000000000 -0400
-+++ ncurses-5.6/Ada95/src/terminal_interface-curses.adb	1969-12-31 19:00:00.000000000 -0500
-@@ -1,2565 +0,0 @@
--------------------------------------------------------------------------------
----                                                                          --
----                           GNAT ncurses Binding                           --
----                                                                          --
----                        Terminal_Interface.Curses                         --
----                                                                          --
----                                 B O D Y                                  --
----                                                                          --
--------------------------------------------------------------------------------
---- Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.              --
----                                                                          --
---- Permission is hereby granted, free of charge, to any person obtaining a  --
---- copy of this software and associated documentation files (the            --
---- "Software"), to deal in the Software without restriction, including      --
---- without limitation the rights to use, copy, modify, merge, publish,      --
---- distribute, distribute with modifications, sublicense, and/or sell       --
---- copies of the Software, and to permit persons to whom the Software is    --
---- furnished to do so, subject to the following conditions:                 --
----                                                                          --
---- The above copyright notice and this permission notice shall be included  --
---- in all copies or substantial portions of the Software.                   --
----                                                                          --
---- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  --
---- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               --
---- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   --
---- IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   --
---- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    --
---- OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    --
---- THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               --
----                                                                          --
---- Except as contained in this notice, the name(s) of the above copyright   --
---- holders shall not be used in advertising or otherwise to promote the     --
---- sale, use or other dealings in this Software without prior written       --
---- authorization.                                                           --
--------------------------------------------------------------------------------
----  Author: Juergen Pfeifer, 1996
----  Version Control:
----  $Revision: 1.34 $
----  $Date: 2006/06/25 14:30:22 $
----  Binding Version 01.00
--------------------------------------------------------------------------------
--with System;
--
--with Terminal_Interface.Curses.Aux;
--with Interfaces.C;                  use Interfaces.C;
--with Interfaces.C.Strings;          use Interfaces.C.Strings;
--with Interfaces.C.Pointers;
--with Ada.Characters.Handling;       use Ada.Characters.Handling;
--with Ada.Strings.Fixed;
--with Ada.Unchecked_Conversion;
--
--package body Terminal_Interface.Curses is
--
--   use Aux;
--   use type System.Bit_Order;
--
--   package ASF renames Ada.Strings.Fixed;
--
--   type chtype_array is array (size_t range <>)
--      of aliased Attributed_Character;
--   pragma Convention (C, chtype_array);
--
--------------------------------------------------------------------------------
--   generic
--      type Element is (<>);
--   function W_Get_Element (Win    : in Window;
--                           Offset : in Natural) return Element;
--
--   function W_Get_Element (Win    : in Window;
--                           Offset : in Natural) return Element is
--      type E_Array is array (Natural range <>) of aliased Element;
--      package C_E_Array is new
--        Interfaces.C.Pointers (Natural, Element, E_Array, Element'Val (0));
--      use C_E_Array;
--
--      function To_Pointer is new
--        Ada.Unchecked_Conversion (Window, Pointer);
--
--      P : Pointer := To_Pointer (Win);
--   begin
--      if Win = Null_Window then
--         raise Curses_Exception;
--      else
--         P := P + ptrdiff_t (Offset);
--         return P.all;
--      end if;
--   end W_Get_Element;
--
--   function W_Get_Int   is new W_Get_Element (C_Int);
--   function W_Get_Short is new W_Get_Element (C_Short);
--   function W_Get_Byte  is new W_Get_Element (Interfaces.C.unsigned_char);
--
--   function Get_Flag (Win    : Window;
--                      Offset : Natural) return Boolean;
--
--   function Get_Flag (Win    : Window;
--                      Offset : Natural) return Boolean
--   is
--      Res : C_Int;
--   begin
--      case Sizeof_bool is
--         when 1 => Res := C_Int (W_Get_Byte  (Win, Offset));
--         when 2 => Res := C_Int (W_Get_Short (Win, Offset));
--         when 4 => Res := C_Int (W_Get_Int   (Win, Offset));
--         when others => raise Curses_Exception;
--      end case;
--
--      case Res is
--         when 0       => return False;
--         when others  => return True;
--      end case;
--   end Get_Flag;
--
--------------------------------------------------------------------------------
--   function Key_Name (Key : in Real_Key_Code) return String
--   is
--      function Keyname (K : C_Int) return chars_ptr;
--      pragma Import (C, Keyname, "keyname");
--
--      Ch : Character;
--   begin
--      if Key <= Character'Pos (Character'Last) then
--         Ch := Character'Val (Key);
--         if Is_Control (Ch) then
--            return Un_Control (Attributed_Character'(Ch    => Ch,
--                                                     Color => Color_Pair'First,
--                                                     Attr  => Normal_Video));
--         elsif Is_Graphic (Ch) then
--            declare
--               S : String (1 .. 1);
--            begin
--               S (1) := Ch;
--               return S;
--            end;
--         else
--            return "";
--         end if;
--      else
--         return Fill_String (Keyname (C_Int (Key)));
--      end if;
--   end Key_Name;
--
--   procedure Key_Name (Key  : in  Real_Key_Code;
--                       Name : out String)
--   is
--   begin
--      ASF.Move (Key_Name (Key), Name);
--   end Key_Name;
--
--------------------------------------------------------------------------------
--   procedure Init_Screen
--   is
--      function Initscr return Window;
--      pragma Import (C, Initscr, "initscr");
--
--      W : Window;
--   begin
--      W := Initscr;
--      if W = Null_Window then
--         raise Curses_Exception;
--      end if;
--   end Init_Screen;
--
--   procedure End_Windows
--   is
--      function Endwin return C_Int;
--      pragma Import (C, Endwin, "endwin");
--   begin
--      if Endwin = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end End_Windows;
--
--   function Is_End_Window return Boolean
--   is
--      function Isendwin return Curses_Bool;
--      pragma Import (C, Isendwin, "isendwin");
--   begin
--      if Isendwin = Curses_Bool_False then
--         return False;
--      else
--         return True;
--      end if;
--   end Is_End_Window;
--------------------------------------------------------------------------------
--   procedure Move_Cursor (Win    : in Window := Standard_Window;
--                          Line   : in Line_Position;
--                          Column : in Column_Position)
--   is
--      function Wmove (Win    : Window;
--                      Line   : C_Int;
--                      Column : C_Int
--                     ) return C_Int;
--      pragma Import (C, Wmove, "wmove");
--   begin
--      if Wmove (Win, C_Int (Line), C_Int (Column)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Move_Cursor;
--------------------------------------------------------------------------------
--   procedure Add (Win : in Window := Standard_Window;
--                  Ch  : in Attributed_Character)
--   is
--      function Waddch (W  : Window;
--                       Ch : C_Chtype) return C_Int;
--      pragma Import (C, Waddch, "waddch");
--   begin
--      if Waddch (Win, AttrChar_To_Chtype (Ch)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Add;
--
--   procedure Add (Win : in Window := Standard_Window;
--                  Ch  : in Character)
--   is
--   begin
--      Add (Win,
--           Attributed_Character'(Ch    => Ch,
--                                 Color => Color_Pair'First,
--                                 Attr  => Normal_Video));
--   end Add;
--
--   procedure Add
--     (Win    : in Window := Standard_Window;
--      Line   : in Line_Position;
--      Column : in Column_Position;
--      Ch     : in Attributed_Character)
--   is
--      function mvwaddch (W  : Window;
--                         Y  : C_Int;
--                         X  : C_Int;
--                         Ch : C_Chtype) return C_Int;
--      pragma Import (C, mvwaddch, "mvwaddch");
--   begin
--      if mvwaddch (Win, C_Int (Line),
--                   C_Int (Column),
--                   AttrChar_To_Chtype (Ch)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Add;
--
--   procedure Add
--     (Win    : in Window := Standard_Window;
--      Line   : in Line_Position;
--      Column : in Column_Position;
--      Ch     : in Character)
--   is
--   begin
--      Add (Win,
--           Line,
--           Column,
--           Attributed_Character'(Ch    => Ch,
--                                 Color => Color_Pair'First,
--                                 Attr  => Normal_Video));
--   end Add;
--
--   procedure Add_With_Immediate_Echo
--     (Win : in Window := Standard_Window;
--      Ch  : in Attributed_Character)
--   is
--      function Wechochar (W  : Window;
--                          Ch : C_Chtype) return C_Int;
--      pragma Import (C, Wechochar, "wechochar");
--   begin
--      if Wechochar (Win, AttrChar_To_Chtype (Ch)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Add_With_Immediate_Echo;
--
--   procedure Add_With_Immediate_Echo
--     (Win : in Window := Standard_Window;
--      Ch  : in Character)
--   is
--   begin
--      Add_With_Immediate_Echo
--        (Win,
--         Attributed_Character'(Ch    => Ch,
--                               Color => Color_Pair'First,
--                               Attr  => Normal_Video));
--   end Add_With_Immediate_Echo;
--------------------------------------------------------------------------------
--   function Create (Number_Of_Lines       : Line_Count;
--                    Number_Of_Columns     : Column_Count;
--                    First_Line_Position   : Line_Position;
--                    First_Column_Position : Column_Position) return Window
--   is
--      function Newwin (Number_Of_Lines       : C_Int;
--                       Number_Of_Columns     : C_Int;
--                       First_Line_Position   : C_Int;
--                       First_Column_Position : C_Int) return Window;
--      pragma Import (C, Newwin, "newwin");
--
--      W : Window;
--   begin
--      W := Newwin (C_Int (Number_Of_Lines),
--                   C_Int (Number_Of_Columns),
--                   C_Int (First_Line_Position),
--                   C_Int (First_Column_Position));
--      if W = Null_Window then
--         raise Curses_Exception;
--      end if;
--      return W;
--   end Create;
--
--   procedure Delete (Win : in out Window)
--   is
--      function Wdelwin (W : Window) return C_Int;
--      pragma Import (C, Wdelwin, "delwin");
--   begin
--      if Wdelwin (Win) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--      Win := Null_Window;
--   end Delete;
--
--   function Sub_Window
--     (Win                   : Window := Standard_Window;
--      Number_Of_Lines       : Line_Count;
--      Number_Of_Columns     : Column_Count;
--      First_Line_Position   : Line_Position;
--      First_Column_Position : Column_Position) return Window
--   is
--      function Subwin
--        (Win                   : Window;
--         Number_Of_Lines       : C_Int;
--         Number_Of_Columns     : C_Int;
--         First_Line_Position   : C_Int;
--         First_Column_Position : C_Int) return Window;
--      pragma Import (C, Subwin, "subwin");
--
--      W : Window;
--   begin
--      W := Subwin (Win,
--                   C_Int (Number_Of_Lines),
--                   C_Int (Number_Of_Columns),
--                   C_Int (First_Line_Position),
--                   C_Int (First_Column_Position));
--      if W = Null_Window then
--         raise Curses_Exception;
--      end if;
--      return W;
--   end Sub_Window;
--
--   function Derived_Window
--     (Win                   : Window := Standard_Window;
--      Number_Of_Lines       : Line_Count;
--      Number_Of_Columns     : Column_Count;
--      First_Line_Position   : Line_Position;
--      First_Column_Position : Column_Position) return Window
--   is
--      function Derwin
--        (Win                   : Window;
--         Number_Of_Lines       : C_Int;
--         Number_Of_Columns     : C_Int;
--         First_Line_Position   : C_Int;
--         First_Column_Position : C_Int) return Window;
--      pragma Import (C, Derwin, "derwin");
--
--      W : Window;
--   begin
--      W := Derwin (Win,
--                   C_Int (Number_Of_Lines),
--                   C_Int (Number_Of_Columns),
--                   C_Int (First_Line_Position),
--                   C_Int (First_Column_Position));
--      if W = Null_Window then
--         raise Curses_Exception;
--      end if;
--      return W;
--   end Derived_Window;
--
--   function Duplicate (Win : Window) return Window
--   is
--      function Dupwin (Win : Window) return Window;
--      pragma Import (C, Dupwin, "dupwin");
--
--      W : constant Window := Dupwin (Win);
--   begin
--      if W = Null_Window then
--         raise Curses_Exception;
--      end if;
--      return W;
--   end Duplicate;
--
--   procedure Move_Window (Win    : in Window;
--                          Line   : in Line_Position;
--                          Column : in Column_Position)
--   is
--      function Mvwin (Win    : Window;
--                      Line   : C_Int;
--                      Column : C_Int) return C_Int;
--      pragma Import (C, Mvwin, "mvwin");
--   begin
--      if Mvwin (Win, C_Int (Line), C_Int (Column)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Move_Window;
--
--   procedure Move_Derived_Window (Win    : in Window;
--                                  Line   : in Line_Position;
--                                  Column : in Column_Position)
--   is
--      function Mvderwin (Win    : Window;
--                         Line   : C_Int;
--                         Column : C_Int) return C_Int;
--      pragma Import (C, Mvderwin, "mvderwin");
--   begin
--      if Mvderwin (Win, C_Int (Line), C_Int (Column)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Move_Derived_Window;
--
--   procedure Set_Synch_Mode (Win  : in Window  := Standard_Window;
--                             Mode : in Boolean := False)
--   is
--      function Syncok (Win  : Window;
--                       Mode : Curses_Bool) return C_Int;
--      pragma Import (C, Syncok, "syncok");
--   begin
--      if Syncok (Win, Curses_Bool (Boolean'Pos (Mode))) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Set_Synch_Mode;
--------------------------------------------------------------------------------
--   procedure Add (Win : in Window := Standard_Window;
--                  Str : in String;
--                  Len : in Integer := -1)
--   is
--      function Waddnstr (Win : Window;
--                         Str : char_array;
--                         Len : C_Int := -1) return C_Int;
--      pragma Import (C, Waddnstr, "waddnstr");
--
--      Txt    : char_array (0 .. Str'Length);
--      Length : size_t;
--   begin
--      To_C (Str, Txt, Length);
--      if Waddnstr (Win, Txt, C_Int (Len)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Add;
--
--   procedure Add
--     (Win    : in Window := Standard_Window;
--      Line   : in Line_Position;
--      Column : in Column_Position;
--      Str    : in String;
--      Len    : in Integer := -1)
--   is
--   begin
--      Move_Cursor (Win, Line, Column);
--      Add (Win, Str, Len);
--   end Add;
--------------------------------------------------------------------------------
--   procedure Add
--     (Win : in Window := Standard_Window;
--      Str : in Attributed_String;
--      Len : in Integer := -1)
--   is
--      function Waddchnstr (Win : Window;
--                           Str : chtype_array;
--                           Len : C_Int := -1) return C_Int;
--      pragma Import (C, Waddchnstr, "waddchnstr");
--
--      Txt : chtype_array (0 .. Str'Length);
--   begin
--      for Length in 1 .. size_t (Str'Length) loop
--         Txt (Length - 1) := Str (Natural (Length));
--      end loop;
--      Txt (Str'Length) := Default_Character;
--      if Waddchnstr (Win,
--                     Txt,
--                     C_Int (Len)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Add;
--
--   procedure Add
--     (Win    : in Window := Standard_Window;
--      Line   : in Line_Position;
--      Column : in Column_Position;
--      Str    : in Attributed_String;
--      Len    : in Integer := -1)
--   is
--   begin
--      Move_Cursor (Win, Line, Column);
--      Add (Win, Str, Len);
--   end Add;
--------------------------------------------------------------------------------
--   procedure Border
--     (Win                       : in Window := Standard_Window;
--      Left_Side_Symbol          : in Attributed_Character := Default_Character;
--      Right_Side_Symbol         : in Attributed_Character := Default_Character;
--      Top_Side_Symbol           : in Attributed_Character := Default_Character;
--      Bottom_Side_Symbol        : in Attributed_Character := Default_Character;
--      Upper_Left_Corner_Symbol  : in Attributed_Character := Default_Character;
--      Upper_Right_Corner_Symbol : in Attributed_Character := Default_Character;
--      Lower_Left_Corner_Symbol  : in Attributed_Character := Default_Character;
--      Lower_Right_Corner_Symbol : in Attributed_Character := Default_Character)
--   is
--      function Wborder (W   : Window;
--                        LS  : C_Chtype;
--                        RS  : C_Chtype;
--                        TS  : C_Chtype;
--                        BS  : C_Chtype;
--                        ULC : C_Chtype;
--                        URC : C_Chtype;
--                        LLC : C_Chtype;
--                        LRC : C_Chtype) return C_Int;
--      pragma Import (C, Wborder, "wborder");
--   begin
--      if Wborder (Win,
--                  AttrChar_To_Chtype (Left_Side_Symbol),
--                  AttrChar_To_Chtype (Right_Side_Symbol),
--                  AttrChar_To_Chtype (Top_Side_Symbol),
--                  AttrChar_To_Chtype (Bottom_Side_Symbol),
--                  AttrChar_To_Chtype (Upper_Left_Corner_Symbol),
--                  AttrChar_To_Chtype (Upper_Right_Corner_Symbol),
--                  AttrChar_To_Chtype (Lower_Left_Corner_Symbol),
--                  AttrChar_To_Chtype (Lower_Right_Corner_Symbol)
--                  ) = Curses_Err
--      then
--         raise Curses_Exception;
--      end if;
--   end Border;
--
--   procedure Box
--     (Win               : in Window := Standard_Window;
--      Vertical_Symbol   : in Attributed_Character := Default_Character;
--      Horizontal_Symbol : in Attributed_Character := Default_Character)
--   is
--   begin
--      Border (Win,
--              Vertical_Symbol, Vertical_Symbol,
--              Horizontal_Symbol, Horizontal_Symbol);
--   end Box;
--
--   procedure Horizontal_Line
--     (Win         : in Window := Standard_Window;
--      Line_Size   : in Natural;
--      Line_Symbol : in Attributed_Character := Default_Character)
--   is
--      function Whline (W   : Window;
--                       Ch  : C_Chtype;
--                       Len : C_Int) return C_Int;
--      pragma Import (C, Whline, "whline");
--   begin
--      if Whline (Win,
--                 AttrChar_To_Chtype (Line_Symbol),
--                 C_Int (Line_Size)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Horizontal_Line;
--
--   procedure Vertical_Line
--     (Win         : in Window := Standard_Window;
--      Line_Size   : in Natural;
--      Line_Symbol : in Attributed_Character := Default_Character)
--   is
--      function Wvline (W   : Window;
--                       Ch  : C_Chtype;
--                       Len : C_Int) return C_Int;
--      pragma Import (C, Wvline, "wvline");
--   begin
--      if Wvline (Win,
--                 AttrChar_To_Chtype (Line_Symbol),
--                 C_Int (Line_Size)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Vertical_Line;
--
--------------------------------------------------------------------------------
--   function Get_Keystroke (Win : Window := Standard_Window)
--     return Real_Key_Code
--   is
--      function Wgetch (W : Window) return C_Int;
--      pragma Import (C, Wgetch, "wgetch");
--
--      C : constant C_Int := Wgetch (Win);
--   begin
--      if C = Curses_Err then
--         return Key_None;
--      else
--         return Real_Key_Code (C);
--      end if;
--   end Get_Keystroke;
--
--   procedure Undo_Keystroke (Key : in Real_Key_Code)
--   is
--      function Ungetch (Ch : C_Int) return C_Int;
--      pragma Import (C, Ungetch, "ungetch");
--   begin
--      if Ungetch (C_Int (Key)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Undo_Keystroke;
--
--   function Has_Key (Key : Special_Key_Code) return Boolean
--   is
--      function Haskey (Key : C_Int) return C_Int;
--      pragma Import (C, Haskey, "has_key");
--   begin
--      if Haskey (C_Int (Key)) = Curses_False then
--         return False;
--      else
--         return True;
--      end if;
--   end Has_Key;
--
--   function Is_Function_Key (Key : Special_Key_Code) return Boolean
--   is
--      L : constant Special_Key_Code  := Special_Key_Code (Natural (Key_F0) +
--        Natural (Function_Key_Number'Last));
--   begin
--      if (Key >= Key_F0) and then (Key <= L) then
--         return True;
--      else
--         return False;
--      end if;
--   end Is_Function_Key;
--
--   function Function_Key (Key : Real_Key_Code)
--                          return Function_Key_Number
--   is
--   begin
--      if Is_Function_Key (Key) then
--         return Function_Key_Number (Key - Key_F0);
--      else
--         raise Constraint_Error;
--      end if;
--   end Function_Key;
--
--   function Function_Key_Code (Key : Function_Key_Number) return Real_Key_Code
--   is
--   begin
--      return Real_Key_Code (Natural (Key_F0) + Natural (Key));
--   end Function_Key_Code;
--------------------------------------------------------------------------------
--   procedure Standout (Win : Window  := Standard_Window;
--                       On  : Boolean := True)
--   is
--      function wstandout (Win : Window) return C_Int;
--      pragma Import (C, wstandout, "wstandout");
--      function wstandend (Win : Window) return C_Int;
--      pragma Import (C, wstandend, "wstandend");
--
--      Err : C_Int;
--   begin
--      if On then
--         Err := wstandout (Win);
--      else
--         Err := wstandend (Win);
--      end if;
--      if Err = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Standout;
--
--   procedure Switch_Character_Attribute
--     (Win  : in Window := Standard_Window;
--      Attr : in Character_Attribute_Set := Normal_Video;
--      On   : in Boolean := True)
--   is
--      function Wattron (Win    : Window;
--                        C_Attr : C_AttrType) return C_Int;
--      pragma Import (C, Wattron, "wattr_on");
--      function Wattroff (Win    : Window;
--                         C_Attr : C_AttrType) return C_Int;
--      pragma Import (C, Wattroff, "wattr_off");
--      --  In Ada we use the On Boolean to control whether or not we want to
--      --  switch on or off the attributes in the set.
--      Err : C_Int;
--      AC  : constant Attributed_Character := (Ch    => Character'First,
--                                              Color => Color_Pair'First,
--                                              Attr  => Attr);
--   begin
--      if On then
--         Err := Wattron  (Win, AttrChar_To_AttrType (AC));
--      else
--         Err := Wattroff (Win, AttrChar_To_AttrType (AC));
--      end if;
--      if Err = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Switch_Character_Attribute;
--
--   procedure Set_Character_Attributes
--     (Win   : in Window := Standard_Window;
--      Attr  : in Character_Attribute_Set := Normal_Video;
--      Color : in Color_Pair := Color_Pair'First)
--   is
--      function Wattrset (Win    : Window;
--                         C_Attr : C_AttrType) return C_Int;
--      pragma Import (C, Wattrset, "wattrset"); -- ??? wattr_set
--   begin
--      if Wattrset (Win,
--                   AttrChar_To_AttrType (Attributed_Character'
--                                         (Ch    => Character'First,
--                                          Color => Color,
--                                          Attr  => Attr))) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Set_Character_Attributes;
--
--   function Get_Character_Attribute (Win : Window := Standard_Window)
--                                     return Character_Attribute_Set
--   is
--      function Wattrget (Win : Window;
--                         Atr : access C_AttrType;
--                         Col : access C_Short;
--                         Opt : System.Address) return C_Int;
--      pragma Import (C, Wattrget, "wattr_get");
--
--      Attr : aliased C_AttrType;
--      Col  : aliased C_Short;
--      Res  : constant C_Int := Wattrget (Win, Attr'Access, Col'Access,
--                                         System.Null_Address);
--      Ch   : Attributed_Character;
--   begin
--      if Res = Curses_Ok then
--         Ch := AttrType_To_AttrChar (Attr);
--         return Ch.Attr;
--      else
--         raise Curses_Exception;
--      end if;
--   end Get_Character_Attribute;
--
--   function Get_Character_Attribute (Win : Window := Standard_Window)
--                                     return Color_Pair
--   is
--      function Wattrget (Win : Window;
--                         Atr : access C_AttrType;
--                         Col : access C_Short;
--                         Opt : System.Address) return C_Int;
--      pragma Import (C, Wattrget, "wattr_get");
--
--      Attr : aliased C_AttrType;
--      Col  : aliased C_Short;
--      Res  : constant C_Int := Wattrget (Win, Attr'Access, Col'Access,
--                                         System.Null_Address);
--      Ch   : Attributed_Character;
--   begin
--      if Res = Curses_Ok then
--         Ch := AttrType_To_AttrChar (Attr);
--         return Ch.Color;
--      else
--         raise Curses_Exception;
--      end if;
--   end Get_Character_Attribute;
--
--   procedure Set_Color (Win  : in Window := Standard_Window;
--                        Pair : in Color_Pair)
--   is
--      function Wset_Color (Win   : Window;
--                           Color : C_Short;
--                           Opts  : C_Void_Ptr) return C_Int;
--      pragma Import (C, Wset_Color, "wcolor_set");
--   begin
--      if Wset_Color (Win,
--                     C_Short (Pair),
--                     C_Void_Ptr (System.Null_Address)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Set_Color;
--
--   procedure Change_Attributes
--     (Win   : in Window := Standard_Window;
--      Count : in Integer := -1;
--      Attr  : in Character_Attribute_Set := Normal_Video;
--      Color : in Color_Pair := Color_Pair'First)
--   is
--      function Wchgat (Win   : Window;
--                       Cnt   : C_Int;
--                       Attr  : C_AttrType;
--                       Color : C_Short;
--                       Opts  : System.Address := System.Null_Address)
--                       return C_Int;
--      pragma Import (C, Wchgat, "wchgat");
--
--      Ch : constant Attributed_Character :=
--        (Ch => Character'First, Color => Color_Pair'First, Attr => Attr);
--   begin
--      if Wchgat (Win, C_Int (Count), AttrChar_To_AttrType (Ch),
--                 C_Short (Color)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Change_Attributes;
--
--   procedure Change_Attributes
--     (Win    : in Window := Standard_Window;
--      Line   : in Line_Position := Line_Position'First;
--      Column : in Column_Position := Column_Position'First;
--      Count  : in Integer := -1;
--      Attr   : in Character_Attribute_Set := Normal_Video;
--      Color  : in Color_Pair := Color_Pair'First)
--   is
--   begin
--      Move_Cursor (Win, Line, Column);
--      Change_Attributes (Win, Count, Attr, Color);
--   end Change_Attributes;
--------------------------------------------------------------------------------
--   procedure Beep
--   is
--      function Beeper return C_Int;
--      pragma Import (C, Beeper, "beep");
--   begin
--      if Beeper = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Beep;
--
--   procedure Flash_Screen
--   is
--      function Flash return C_Int;
--      pragma Import (C, Flash, "flash");
--   begin
--      if Flash = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Flash_Screen;
--------------------------------------------------------------------------------
--   procedure Set_Cbreak_Mode (SwitchOn : in Boolean := True)
--   is
--      function Cbreak return C_Int;
--      pragma Import (C, Cbreak, "cbreak");
--      function NoCbreak return C_Int;
--      pragma Import (C, NoCbreak, "nocbreak");
--
--      Err : C_Int;
--   begin
--      if SwitchOn then
--         Err := Cbreak;
--      else
--         Err := NoCbreak;
--      end if;
--      if Err = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Set_Cbreak_Mode;
--
--   procedure Set_Raw_Mode (SwitchOn : in Boolean := True)
--   is
--      function Raw return C_Int;
--      pragma Import (C, Raw, "raw");
--      function NoRaw return C_Int;
--      pragma Import (C, NoRaw, "noraw");
--
--      Err : C_Int;
--   begin
--      if SwitchOn then
--         Err := Raw;
--      else
--         Err := NoRaw;
--      end if;
--      if Err = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Set_Raw_Mode;
--
--   procedure Set_Echo_Mode (SwitchOn : in Boolean := True)
--   is
--      function Echo return C_Int;
--      pragma Import (C, Echo, "echo");
--      function NoEcho return C_Int;
--      pragma Import (C, NoEcho, "noecho");
--
--      Err : C_Int;
--   begin
--      if SwitchOn then
--         Err := Echo;
--      else
--         Err := NoEcho;
--      end if;
--      if Err = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Set_Echo_Mode;
--
--   procedure Set_Meta_Mode (Win      : in Window := Standard_Window;
--                            SwitchOn : in Boolean := True)
--   is
--      function Meta (W : Window; Mode : Curses_Bool) return C_Int;
--      pragma Import (C, Meta, "meta");
--   begin
--      if Meta (Win, Curses_Bool (Boolean'Pos (SwitchOn))) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Set_Meta_Mode;
--
--   procedure Set_KeyPad_Mode (Win      : in Window := Standard_Window;
--                              SwitchOn : in Boolean := True)
--   is
--      function Keypad (W : Window; Mode : Curses_Bool) return C_Int;
--      pragma Import (C, Keypad, "keypad");
--   begin
--      if Keypad (Win, Curses_Bool (Boolean'Pos (SwitchOn))) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Set_KeyPad_Mode;
--
--   function Get_KeyPad_Mode (Win : in Window := Standard_Window)
--                             return Boolean
--   is
--   begin
--      return Get_Flag (Win, Offset_use_keypad);
--   end Get_KeyPad_Mode;
--
--   procedure Half_Delay (Amount : in Half_Delay_Amount)
--   is
--      function Halfdelay (Amount : C_Int) return C_Int;
--      pragma Import (C, Halfdelay, "halfdelay");
--   begin
--      if Halfdelay (C_Int (Amount)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Half_Delay;
--
--   procedure Set_Flush_On_Interrupt_Mode
--     (Win  : in Window := Standard_Window;
--      Mode : in Boolean := True)
--   is
--      function Intrflush (Win : Window; Mode : Curses_Bool) return C_Int;
--      pragma Import (C, Intrflush, "intrflush");
--   begin
--      if Intrflush (Win, Curses_Bool (Boolean'Pos (Mode))) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Set_Flush_On_Interrupt_Mode;
--
--   procedure Set_Queue_Interrupt_Mode
--     (Win   : in Window := Standard_Window;
--      Flush : in Boolean := True)
--   is
--      procedure Qiflush;
--      pragma Import (C, Qiflush, "qiflush");
--      procedure No_Qiflush;
--      pragma Import (C, No_Qiflush, "noqiflush");
--   begin
--      if Win = Null_Window then
--         raise Curses_Exception;
--      end if;
--      if Flush then
--         Qiflush;
--      else
--         No_Qiflush;
--      end if;
--   end Set_Queue_Interrupt_Mode;
--
--   procedure Set_NoDelay_Mode
--     (Win  : in Window := Standard_Window;
--      Mode : in Boolean := False)
--   is
--      function Nodelay (Win : Window; Mode : Curses_Bool) return C_Int;
--      pragma Import (C, Nodelay, "nodelay");
--   begin
--      if Nodelay (Win, Curses_Bool (Boolean'Pos (Mode))) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Set_NoDelay_Mode;
--
--   procedure Set_Timeout_Mode (Win    : in Window := Standard_Window;
--                               Mode   : in Timeout_Mode;
--                               Amount : in Natural)
--   is
--      function Wtimeout (Win : Window; Amount : C_Int) return C_Int;
--      pragma Import (C, Wtimeout, "wtimeout");
--
--      Time : C_Int;
--   begin
--      case Mode is
--         when Blocking     => Time := -1;
--         when Non_Blocking => Time := 0;
--         when Delayed      =>
--            if Amount = 0 then
--               raise Constraint_Error;
--            end if;
--            Time := C_Int (Amount);
--      end case;
--      if Wtimeout (Win, Time) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Set_Timeout_Mode;
--
--   procedure Set_Escape_Timer_Mode
--     (Win       : in Window := Standard_Window;
--      Timer_Off : in Boolean := False)
--   is
--      function Notimeout (Win : Window; Mode : Curses_Bool) return C_Int;
--      pragma Import (C, Notimeout, "notimeout");
--   begin
--      if Notimeout (Win, Curses_Bool (Boolean'Pos (Timer_Off)))
--        = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Set_Escape_Timer_Mode;
--
--------------------------------------------------------------------------------
--   procedure Set_NL_Mode (SwitchOn : in Boolean := True)
--   is
--      function NL return C_Int;
--      pragma Import (C, NL, "nl");
--      function NoNL return C_Int;
--      pragma Import (C, NoNL, "nonl");
--
--      Err : C_Int;
--   begin
--      if SwitchOn then
--         Err := NL;
--      else
--         Err := NoNL;
--      end if;
--      if Err = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Set_NL_Mode;
--
--   procedure Clear_On_Next_Update
--     (Win      : in Window := Standard_Window;
--      Do_Clear : in Boolean := True)
--   is
--      function Clear_Ok (W : Window; Flag : Curses_Bool) return C_Int;
--      pragma Import (C, Clear_Ok, "clearok");
--   begin
--      if Clear_Ok (Win, Curses_Bool (Boolean'Pos (Do_Clear))) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Clear_On_Next_Update;
--
--   procedure Use_Insert_Delete_Line
--     (Win    : in Window := Standard_Window;
--      Do_Idl : in Boolean := True)
--   is
--      function IDL_Ok (W : Window; Flag : Curses_Bool) return C_Int;
--      pragma Import (C, IDL_Ok, "idlok");
--   begin
--      if IDL_Ok (Win, Curses_Bool (Boolean'Pos (Do_Idl))) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Use_Insert_Delete_Line;
--
--   procedure Use_Insert_Delete_Character
--     (Win    : in Window := Standard_Window;
--      Do_Idc : in Boolean := True)
--   is
--      function IDC_Ok (W : Window; Flag : Curses_Bool) return C_Int;
--      pragma Import (C, IDC_Ok, "idcok");
--   begin
--      if IDC_Ok (Win, Curses_Bool (Boolean'Pos (Do_Idc))) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Use_Insert_Delete_Character;
--
--   procedure Leave_Cursor_After_Update
--     (Win      : in Window := Standard_Window;
--      Do_Leave : in Boolean := True)
--   is
--      function Leave_Ok (W : Window; Flag : Curses_Bool) return C_Int;
--      pragma Import (C, Leave_Ok, "leaveok");
--   begin
--      if Leave_Ok (Win, Curses_Bool (Boolean'Pos (Do_Leave))) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Leave_Cursor_After_Update;
--
--   procedure Immediate_Update_Mode
--     (Win  : in Window := Standard_Window;
--      Mode : in Boolean := False)
--   is
--      function Immedok (Win : Window; Mode : Curses_Bool) return C_Int;
--      pragma Import (C, Immedok, "immedok");
--   begin
--      if Immedok (Win, Curses_Bool (Boolean'Pos (Mode))) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Immediate_Update_Mode;
--
--   procedure Allow_Scrolling
--     (Win  : in Window  := Standard_Window;
--      Mode : in Boolean := False)
--   is
--      function Scrollok (Win : Window; Mode : Curses_Bool) return C_Int;
--      pragma Import (C, Scrollok, "scrollok");
--   begin
--      if Scrollok (Win, Curses_Bool (Boolean'Pos (Mode))) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Allow_Scrolling;
--
--   function Scrolling_Allowed (Win : Window := Standard_Window)
--                               return Boolean
--   is
--   begin
--      return Get_Flag (Win, Offset_scroll);
--   end Scrolling_Allowed;
--
--   procedure Set_Scroll_Region
--     (Win         : in Window := Standard_Window;
--      Top_Line    : in Line_Position;
--      Bottom_Line : in Line_Position)
--   is
--      function Wsetscrreg (Win : Window;
--                           Lin : C_Int;
--                           Col : C_Int) return C_Int;
--      pragma Import (C, Wsetscrreg, "wsetscrreg");
--   begin
--      if Wsetscrreg (Win, C_Int (Top_Line), C_Int (Bottom_Line))
--        = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Set_Scroll_Region;
--------------------------------------------------------------------------------
--   procedure Update_Screen
--   is
--      function Do_Update return C_Int;
--      pragma Import (C, Do_Update, "doupdate");
--   begin
--      if Do_Update = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Update_Screen;
--
--   procedure Refresh (Win : in Window := Standard_Window)
--   is
--      function Wrefresh (W : Window) return C_Int;
--      pragma Import (C, Wrefresh, "wrefresh");
--   begin
--      if Wrefresh (Win) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Refresh;
--
--   procedure Refresh_Without_Update
--     (Win : in Window := Standard_Window)
--   is
--      function Wnoutrefresh (W : Window) return C_Int;
--      pragma Import (C, Wnoutrefresh, "wnoutrefresh");
--   begin
--      if Wnoutrefresh (Win) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Refresh_Without_Update;
--
--   procedure Redraw (Win : in Window := Standard_Window)
--   is
--      function Redrawwin (Win : Window) return C_Int;
--      pragma Import (C, Redrawwin, "redrawwin");
--   begin
--      if Redrawwin (Win) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Redraw;
--
--   procedure Redraw
--     (Win        : in Window := Standard_Window;
--      Begin_Line : in Line_Position;
--      Line_Count : in Positive)
--   is
--      function Wredrawln (Win : Window; First : C_Int; Cnt : C_Int)
--                          return C_Int;
--      pragma Import (C, Wredrawln, "wredrawln");
--   begin
--      if Wredrawln (Win,
--                    C_Int (Begin_Line),
--                    C_Int (Line_Count)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Redraw;
--
--------------------------------------------------------------------------------
--   procedure Erase (Win : in Window := Standard_Window)
--   is
--      function Werase (W : Window) return C_Int;
--      pragma Import (C, Werase, "werase");
--   begin
--      if Werase (Win) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Erase;
--
--   procedure Clear (Win : in Window := Standard_Window)
--   is
--      function Wclear (W : Window) return C_Int;
--      pragma Import (C, Wclear, "wclear");
--   begin
--      if Wclear (Win) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Clear;
--
--   procedure Clear_To_End_Of_Screen (Win : in Window := Standard_Window)
--   is
--      function Wclearbot (W : Window) return C_Int;
--      pragma Import (C, Wclearbot, "wclrtobot");
--   begin
--      if Wclearbot (Win) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Clear_To_End_Of_Screen;
--
--   procedure Clear_To_End_Of_Line (Win : in Window := Standard_Window)
--   is
--      function Wcleareol (W : Window) return C_Int;
--      pragma Import (C, Wcleareol, "wclrtoeol");
--   begin
--      if Wcleareol (Win) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Clear_To_End_Of_Line;
--------------------------------------------------------------------------------
--   procedure Set_Background
--     (Win : in Window := Standard_Window;
--      Ch  : in Attributed_Character)
--   is
--      procedure WBackground (W : in Window; Ch : in C_Chtype);
--      pragma Import (C, WBackground, "wbkgdset");
--   begin
--      WBackground (Win, AttrChar_To_Chtype (Ch));
--   end Set_Background;
--
--   procedure Change_Background
--     (Win : in Window := Standard_Window;
--      Ch  : in Attributed_Character)
--   is
--      function WChangeBkgd (W : Window; Ch : C_Chtype) return C_Int;
--      pragma Import (C, WChangeBkgd, "wbkgd");
--   begin
--      if WChangeBkgd (Win, AttrChar_To_Chtype (Ch)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Change_Background;
--
--   function Get_Background (Win : Window := Standard_Window)
--     return Attributed_Character
--   is
--      function Wgetbkgd (Win : Window) return C_Chtype;
--      pragma Import (C, Wgetbkgd, "getbkgd");
--   begin
--      return Chtype_To_AttrChar (Wgetbkgd (Win));
--   end Get_Background;
--------------------------------------------------------------------------------
--   procedure Change_Lines_Status (Win   : in Window := Standard_Window;
--                                  Start : in Line_Position;
--                                  Count : in Positive;
--                                  State : in Boolean)
--   is
--      function Wtouchln (Win : Window;
--                         Sta : C_Int;
--                         Cnt : C_Int;
--                         Chg : C_Int) return C_Int;
--      pragma Import (C, Wtouchln, "wtouchln");
--   begin
--      if Wtouchln (Win, C_Int (Start), C_Int (Count),
--                   C_Int (Boolean'Pos (State))) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Change_Lines_Status;
--
--   procedure Touch (Win : in Window := Standard_Window)
--   is
--      Y : Line_Position;
--      X : Column_Position;
--   begin
--      Get_Size (Win, Y, X);
--      Change_Lines_Status (Win, 0, Positive (Y), True);
--   end Touch;
--
--   procedure Untouch (Win : in Window := Standard_Window)
--   is
--      Y : Line_Position;
--      X : Column_Position;
--   begin
--      Get_Size (Win, Y, X);
--      Change_Lines_Status (Win, 0, Positive (Y), False);
--   end Untouch;
--
--   procedure Touch (Win   : in Window := Standard_Window;
--                    Start : in Line_Position;
--                    Count : in Positive)
--   is
--   begin
--      Change_Lines_Status (Win, Start, Count, True);
--   end Touch;
--
--   function Is_Touched
--     (Win  : Window := Standard_Window;
--      Line : Line_Position) return Boolean
--   is
--      function WLineTouched (W : Window; L : C_Int) return Curses_Bool;
--      pragma Import (C, WLineTouched, "is_linetouched");
--   begin
--      if WLineTouched (Win, C_Int (Line)) = Curses_Bool_False then
--         return False;
--      else
--         return True;
--      end if;
--   end Is_Touched;
--
--   function Is_Touched
--     (Win : Window := Standard_Window) return Boolean
--   is
--      function WWinTouched (W : Window) return Curses_Bool;
--      pragma Import (C, WWinTouched, "is_wintouched");
--   begin
--      if WWinTouched (Win) = Curses_Bool_False then
--         return False;
--      else
--         return True;
--      end if;
--   end Is_Touched;
--------------------------------------------------------------------------------
--   procedure Copy
--     (Source_Window            : in Window;
--      Destination_Window       : in Window;
--      Source_Top_Row           : in Line_Position;
--      Source_Left_Column       : in Column_Position;
--      Destination_Top_Row      : in Line_Position;
--      Destination_Left_Column  : in Column_Position;
--      Destination_Bottom_Row   : in Line_Position;
--      Destination_Right_Column : in Column_Position;
--      Non_Destructive_Mode     : in Boolean := True)
--   is
--      function Copywin (Src : Window;
--                        Dst : Window;
--                        Str : C_Int;
--                        Slc : C_Int;
--                        Dtr : C_Int;
--                        Dlc : C_Int;
--                        Dbr : C_Int;
--                        Drc : C_Int;
--                        Ndm : C_Int) return C_Int;
--      pragma Import (C, Copywin, "copywin");
--   begin
--      if Copywin (Source_Window,
--                  Destination_Window,
--                  C_Int (Source_Top_Row),
--                  C_Int (Source_Left_Column),
--                  C_Int (Destination_Top_Row),
--                  C_Int (Destination_Left_Column),
--                  C_Int (Destination_Bottom_Row),
--                  C_Int (Destination_Right_Column),
--                  Boolean'Pos (Non_Destructive_Mode)
--                ) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Copy;
--
--   procedure Overwrite
--     (Source_Window      : in Window;
--      Destination_Window : in Window)
--   is
--      function Overwrite (Src : Window; Dst : Window) return C_Int;
--      pragma Import (C, Overwrite, "overwrite");
--   begin
--      if Overwrite (Source_Window, Destination_Window) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Overwrite;
--
--   procedure Overlay
--     (Source_Window      : in Window;
--      Destination_Window : in Window)
--   is
--      function Overlay (Src : Window; Dst : Window) return C_Int;
--      pragma Import (C, Overlay, "overlay");
--   begin
--      if Overlay (Source_Window, Destination_Window) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Overlay;
--
--------------------------------------------------------------------------------
--   procedure Insert_Delete_Lines
--     (Win   : in Window := Standard_Window;
--      Lines : in Integer       := 1) -- default is to insert one line above
--   is
--      function Winsdelln (W : Window; N : C_Int) return C_Int;
--      pragma Import (C, Winsdelln, "winsdelln");
--   begin
--      if Winsdelln (Win, C_Int (Lines)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Insert_Delete_Lines;
--
--   procedure Delete_Line (Win : in Window := Standard_Window)
--   is
--   begin
--      Insert_Delete_Lines (Win, -1);
--   end Delete_Line;
--
--   procedure Insert_Line (Win : in Window := Standard_Window)
--   is
--   begin
--      Insert_Delete_Lines (Win, 1);
--   end Insert_Line;
--------------------------------------------------------------------------------
--
--   procedure Get_Size
--     (Win               : in Window := Standard_Window;
--      Number_Of_Lines   : out Line_Count;
--      Number_Of_Columns : out Column_Count)
--   is
--      --  Please note: in ncurses they are one off.
--      --  This might be different in other implementations of curses
--      Y : constant C_Int := C_Int (W_Get_Short (Win, Offset_maxy))
--                          + C_Int (Offset_XY);
--      X : constant C_Int := C_Int (W_Get_Short (Win, Offset_maxx))
--                          + C_Int (Offset_XY);
--   begin
--      Number_Of_Lines   := Line_Count (Y);
--      Number_Of_Columns := Column_Count (X);
--   end Get_Size;
--
--   procedure Get_Window_Position
--     (Win             : in Window := Standard_Window;
--      Top_Left_Line   : out Line_Position;
--      Top_Left_Column : out Column_Position)
--   is
--      Y : constant C_Short := W_Get_Short (Win, Offset_begy);
--      X : constant C_Short := W_Get_Short (Win, Offset_begx);
--   begin
--      Top_Left_Line   := Line_Position (Y);
--      Top_Left_Column := Column_Position (X);
--   end Get_Window_Position;
--
--   procedure Get_Cursor_Position
--     (Win    : in  Window := Standard_Window;
--      Line   : out Line_Position;
--      Column : out Column_Position)
--   is
--      Y : constant C_Short := W_Get_Short (Win, Offset_cury);
--      X : constant C_Short := W_Get_Short (Win, Offset_curx);
--   begin
--      Line   := Line_Position (Y);
--      Column := Column_Position (X);
--   end Get_Cursor_Position;
--
--   procedure Get_Origin_Relative_To_Parent
--     (Win                : in  Window;
--      Top_Left_Line      : out Line_Position;
--      Top_Left_Column    : out Column_Position;
--      Is_Not_A_Subwindow : out Boolean)
--   is
--      Y : constant C_Int := W_Get_Int (Win, Offset_pary);
--      X : constant C_Int := W_Get_Int (Win, Offset_parx);
--   begin
--      if Y = -1 then
--         Top_Left_Line   := Line_Position'Last;
--         Top_Left_Column := Column_Position'Last;
--         Is_Not_A_Subwindow := True;
--      else
--         Top_Left_Line   := Line_Position (Y);
--         Top_Left_Column := Column_Position (X);
--         Is_Not_A_Subwindow := False;
--      end if;
--   end Get_Origin_Relative_To_Parent;
--------------------------------------------------------------------------------
--   function New_Pad (Lines   : Line_Count;
--                     Columns : Column_Count) return Window
--   is
--      function Newpad (Lines : C_Int; Columns : C_Int) return Window;
--      pragma Import (C, Newpad, "newpad");
--
--      W : Window;
--   begin
--      W := Newpad (C_Int (Lines), C_Int (Columns));
--      if W = Null_Window then
--         raise Curses_Exception;
--      end if;
--      return W;
--   end New_Pad;
--
--   function Sub_Pad
--     (Pad                   : Window;
--      Number_Of_Lines       : Line_Count;
--      Number_Of_Columns     : Column_Count;
--      First_Line_Position   : Line_Position;
--      First_Column_Position : Column_Position) return Window
--   is
--      function Subpad
--        (Pad                   : Window;
--         Number_Of_Lines       : C_Int;
--         Number_Of_Columns     : C_Int;
--         First_Line_Position   : C_Int;
--         First_Column_Position : C_Int) return Window;
--      pragma Import (C, Subpad, "subpad");
--
--      W : Window;
--   begin
--      W := Subpad (Pad,
--                   C_Int (Number_Of_Lines),
--                   C_Int (Number_Of_Columns),
--                   C_Int (First_Line_Position),
--                   C_Int (First_Column_Position));
--      if W = Null_Window then
--         raise Curses_Exception;
--      end if;
--      return W;
--   end Sub_Pad;
--
--   procedure Refresh
--     (Pad                      : in Window;
--      Source_Top_Row           : in Line_Position;
--      Source_Left_Column       : in Column_Position;
--      Destination_Top_Row      : in Line_Position;
--      Destination_Left_Column  : in Column_Position;
--      Destination_Bottom_Row   : in Line_Position;
--      Destination_Right_Column : in Column_Position)
--   is
--      function Prefresh
--        (Pad                      : Window;
--         Source_Top_Row           : C_Int;
--         Source_Left_Column       : C_Int;
--         Destination_Top_Row      : C_Int;
--         Destination_Left_Column  : C_Int;
--         Destination_Bottom_Row   : C_Int;
--         Destination_Right_Column : C_Int) return C_Int;
--      pragma Import (C, Prefresh, "prefresh");
--   begin
--      if Prefresh (Pad,
--                   C_Int (Source_Top_Row),
--                   C_Int (Source_Left_Column),
--                   C_Int (Destination_Top_Row),
--                   C_Int (Destination_Left_Column),
--                   C_Int (Destination_Bottom_Row),
--                   C_Int (Destination_Right_Column)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Refresh;
--
--   procedure Refresh_Without_Update
--     (Pad                      : in Window;
--      Source_Top_Row           : in Line_Position;
--      Source_Left_Column       : in Column_Position;
--      Destination_Top_Row      : in Line_Position;
--      Destination_Left_Column  : in Column_Position;
--      Destination_Bottom_Row   : in Line_Position;
--      Destination_Right_Column : in Column_Position)
--   is
--      function Pnoutrefresh
--        (Pad                      : Window;
--         Source_Top_Row           : C_Int;
--         Source_Left_Column       : C_Int;
--         Destination_Top_Row      : C_Int;
--         Destination_Left_Column  : C_Int;
--         Destination_Bottom_Row   : C_Int;
--         Destination_Right_Column : C_Int) return C_Int;
--      pragma Import (C, Pnoutrefresh, "pnoutrefresh");
--   begin
--      if Pnoutrefresh (Pad,
--                       C_Int (Source_Top_Row),
--                       C_Int (Source_Left_Column),
--                       C_Int (Destination_Top_Row),
--                       C_Int (Destination_Left_Column),
--                       C_Int (Destination_Bottom_Row),
--                       C_Int (Destination_Right_Column)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Refresh_Without_Update;
--
--   procedure Add_Character_To_Pad_And_Echo_It
--     (Pad : in Window;
--      Ch  : in Attributed_Character)
--   is
--      function Pechochar (Pad : Window; Ch : C_Chtype)
--                          return C_Int;
--      pragma Import (C, Pechochar, "pechochar");
--   begin
--      if Pechochar (Pad, AttrChar_To_Chtype (Ch)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Add_Character_To_Pad_And_Echo_It;
--
--   procedure Add_Character_To_Pad_And_Echo_It
--     (Pad : in Window;
--      Ch  : in Character)
--   is
--   begin
--      Add_Character_To_Pad_And_Echo_It
--        (Pad,
--         Attributed_Character'(Ch    => Ch,
--                               Color => Color_Pair'First,
--                               Attr  => Normal_Video));
--   end Add_Character_To_Pad_And_Echo_It;
--------------------------------------------------------------------------------
--   procedure Scroll (Win    : in Window := Standard_Window;
--                     Amount : in Integer := 1)
--   is
--      function Wscrl (Win : Window; N : C_Int) return C_Int;
--      pragma Import (C, Wscrl, "wscrl");
--
--   begin
--      if Wscrl (Win, C_Int (Amount)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Scroll;
--
--------------------------------------------------------------------------------
--   procedure Delete_Character (Win : in Window := Standard_Window)
--   is
--      function Wdelch (Win : Window) return C_Int;
--      pragma Import (C, Wdelch, "wdelch");
--   begin
--      if Wdelch (Win) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Delete_Character;
--
--   procedure Delete_Character
--     (Win    : in Window := Standard_Window;
--      Line   : in Line_Position;
--      Column : in Column_Position)
--   is
--      function Mvwdelch (Win : Window;
--                         Lin : C_Int;
--                         Col : C_Int) return C_Int;
--      pragma Import (C, Mvwdelch, "mvwdelch");
--   begin
--      if Mvwdelch (Win, C_Int (Line), C_Int (Column)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Delete_Character;
--------------------------------------------------------------------------------
--   function Peek (Win : Window := Standard_Window)
--     return Attributed_Character
--   is
--      function Winch (Win : Window) return C_Chtype;
--      pragma Import (C, Winch, "winch");
--   begin
--      return Chtype_To_AttrChar (Winch (Win));
--   end Peek;
--
--   function Peek
--     (Win    : Window := Standard_Window;
--      Line   : Line_Position;
--      Column : Column_Position) return Attributed_Character
--   is
--      function Mvwinch (Win : Window;
--                        Lin : C_Int;
--                        Col : C_Int) return C_Chtype;
--      pragma Import (C, Mvwinch, "mvwinch");
--   begin
--      return Chtype_To_AttrChar (Mvwinch (Win, C_Int (Line), C_Int (Column)));
--   end Peek;
--------------------------------------------------------------------------------
--   procedure Insert (Win : in Window := Standard_Window;
--                     Ch  : in Attributed_Character)
--   is
--      function Winsch (Win : Window; Ch : C_Chtype) return C_Int;
--      pragma Import (C, Winsch, "winsch");
--   begin
--      if Winsch (Win, AttrChar_To_Chtype (Ch)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Insert;
--
--   procedure Insert
--     (Win    : in Window := Standard_Window;
--      Line   : in Line_Position;
--      Column : in Column_Position;
--      Ch     : in Attributed_Character)
--   is
--      function Mvwinsch (Win : Window;
--                         Lin : C_Int;
--                         Col : C_Int;
--                         Ch  : C_Chtype) return C_Int;
--      pragma Import (C, Mvwinsch, "mvwinsch");
--   begin
--      if Mvwinsch (Win,
--                   C_Int (Line),
--                   C_Int (Column),
--                   AttrChar_To_Chtype (Ch)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Insert;
--------------------------------------------------------------------------------
--   procedure Insert (Win : in Window := Standard_Window;
--                     Str : in String;
--                     Len : in Integer := -1)
--   is
--      function Winsnstr (Win : Window;
--                         Str : char_array;
--                         Len : Integer := -1) return C_Int;
--      pragma Import (C, Winsnstr, "winsnstr");
--
--      Txt    : char_array (0 .. Str'Length);
--      Length : size_t;
--   begin
--      To_C (Str, Txt, Length);
--      if Winsnstr (Win, Txt, Len) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Insert;
--
--   procedure Insert
--     (Win    : in Window := Standard_Window;
--      Line   : in Line_Position;
--      Column : in Column_Position;
--      Str    : in String;
--      Len    : in Integer := -1)
--   is
--      function Mvwinsnstr (Win    : Window;
--                           Line   : C_Int;
--                           Column : C_Int;
--                           Str    : char_array;
--                           Len    : C_Int) return C_Int;
--      pragma Import (C, Mvwinsnstr, "mvwinsnstr");
--
--      Txt    : char_array (0 .. Str'Length);
--      Length : size_t;
--   begin
--      To_C (Str, Txt, Length);
--      if Mvwinsnstr (Win, C_Int (Line), C_Int (Column), Txt, C_Int (Len))
--        = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Insert;
--------------------------------------------------------------------------------
--   procedure Peek (Win : in  Window := Standard_Window;
--                   Str : out String;
--                   Len : in  Integer := -1)
--   is
--      function Winnstr (Win : Window;
--                        Str : char_array;
--                        Len : C_Int) return C_Int;
--      pragma Import (C, Winnstr, "winnstr");
--
--      N   : Integer := Len;
--      Txt : char_array (0 .. Str'Length);
--      Cnt : Natural;
--   begin
--      if N < 0 then
--         N := Str'Length;
--      end if;
--      if N > Str'Length then
--         raise Constraint_Error;
--      end if;
--      Txt (0) := Interfaces.C.char'First;
--      if Winnstr (Win, Txt, C_Int (N)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--      To_Ada (Txt, Str, Cnt, True);
--      if Cnt < Str'Length then
--         Str ((Str'First + Cnt) .. Str'Last) := (others => ' ');
--      end if;
--   end Peek;
--
--   procedure Peek
--     (Win    : in  Window := Standard_Window;
--      Line   : in  Line_Position;
--      Column : in  Column_Position;
--      Str    : out String;
--      Len    : in  Integer := -1)
--   is
--   begin
--      Move_Cursor (Win, Line, Column);
--      Peek (Win, Str, Len);
--   end Peek;
--------------------------------------------------------------------------------
--   procedure Peek
--     (Win : in  Window := Standard_Window;
--      Str : out Attributed_String;
--      Len : in  Integer := -1)
--   is
--      function Winchnstr (Win : Window;
--                          Str : chtype_array;             -- out
--                          Len : C_Int) return C_Int;
--      pragma Import (C, Winchnstr, "winchnstr");
--
--      N   : Integer := Len;
--      Txt : constant chtype_array (0 .. Str'Length)
--          := (0 => Default_Character);
--      Cnt : Natural := 0;
--   begin
--      if N < 0 then
--         N := Str'Length;
--      end if;
--      if N > Str'Length then
--         raise Constraint_Error;
--      end if;
--      if Winchnstr (Win, Txt, C_Int (N)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--      for To in Str'Range loop
--         exit when Txt (size_t (Cnt)) = Default_Character;
--         Str (To) := Txt (size_t (Cnt));
--         Cnt := Cnt + 1;
--      end loop;
--      if Cnt < Str'Length then
--         Str ((Str'First + Cnt) .. Str'Last) :=
--           (others => (Ch => ' ',
--                       Color => Color_Pair'First,
--                       Attr => Normal_Video));
--      end if;
--   end Peek;
--
--   procedure Peek
--     (Win    : in  Window := Standard_Window;
--      Line   : in  Line_Position;
--      Column : in  Column_Position;
--      Str    : out Attributed_String;
--      Len    : in Integer := -1)
--   is
--   begin
--      Move_Cursor (Win, Line, Column);
--      Peek (Win, Str, Len);
--   end Peek;
--------------------------------------------------------------------------------
--   procedure Get (Win : in  Window := Standard_Window;
--                  Str : out String;
--                  Len : in  Integer := -1)
--   is
--      function Wgetnstr (Win : Window;
--                         Str : char_array;
--                         Len : C_Int) return C_Int;
--      pragma Import (C, Wgetnstr, "wgetnstr");
--
--      N   : Integer := Len;
--      Txt : char_array (0 .. Str'Length);
--      Cnt : Natural;
--   begin
--      if N < 0 then
--         N := Str'Length;
--      end if;
--      if N > Str'Length then
--         raise Constraint_Error;
--      end if;
--      Txt (0) := Interfaces.C.char'First;
--      if Wgetnstr (Win, Txt, C_Int (N)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--      To_Ada (Txt, Str, Cnt, True);
--      if Cnt < Str'Length then
--         Str ((Str'First + Cnt) .. Str'Last) := (others => ' ');
--      end if;
--   end Get;
--
--   procedure Get
--     (Win    : in  Window := Standard_Window;
--      Line   : in  Line_Position;
--      Column : in  Column_Position;
--      Str    : out String;
--      Len    : in  Integer := -1)
--   is
--   begin
--      Move_Cursor (Win, Line, Column);
--      Get (Win, Str, Len);
--   end Get;
--------------------------------------------------------------------------------
--   procedure Init_Soft_Label_Keys
--     (Format : in Soft_Label_Key_Format := Three_Two_Three)
--   is
--      function Slk_Init (Fmt : C_Int) return C_Int;
--      pragma Import (C, Slk_Init, "slk_init");
--   begin
--      if Slk_Init (Soft_Label_Key_Format'Pos (Format)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Init_Soft_Label_Keys;
--
--   procedure Set_Soft_Label_Key (Label : in Label_Number;
--                                 Text  : in String;
--                                 Fmt   : in Label_Justification := Left)
--   is
--      function Slk_Set (Label : C_Int;
--                        Txt   : char_array;
--                        Fmt   : C_Int) return C_Int;
--      pragma Import (C, Slk_Set, "slk_set");
--
--      Txt : char_array (0 .. Text'Length);
--      Len : size_t;
--   begin
--      To_C (Text, Txt, Len);
--      if Slk_Set (C_Int (Label), Txt,
--                  C_Int (Label_Justification'Pos (Fmt))) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Set_Soft_Label_Key;
--
--   procedure Refresh_Soft_Label_Keys
--   is
--      function Slk_Refresh return C_Int;
--      pragma Import (C, Slk_Refresh, "slk_refresh");
--   begin
--      if Slk_Refresh = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Refresh_Soft_Label_Keys;
--
--   procedure Refresh_Soft_Label_Keys_Without_Update
--   is
--      function Slk_Noutrefresh return C_Int;
--      pragma Import (C, Slk_Noutrefresh, "slk_noutrefresh");
--   begin
--      if Slk_Noutrefresh = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Refresh_Soft_Label_Keys_Without_Update;
--
--   procedure Get_Soft_Label_Key (Label : in Label_Number;
--                                 Text  : out String)
--   is
--      function Slk_Label (Label : C_Int) return chars_ptr;
--      pragma Import (C, Slk_Label, "slk_label");
--   begin
--      Fill_String (Slk_Label (C_Int (Label)), Text);
--   end Get_Soft_Label_Key;
--
--   function Get_Soft_Label_Key (Label : in Label_Number) return String
--   is
--      function Slk_Label (Label : C_Int) return chars_ptr;
--      pragma Import (C, Slk_Label, "slk_label");
--   begin
--      return Fill_String (Slk_Label (C_Int (Label)));
--   end Get_Soft_Label_Key;
--
--   procedure Clear_Soft_Label_Keys
--   is
--      function Slk_Clear return C_Int;
--      pragma Import (C, Slk_Clear, "slk_clear");
--   begin
--      if Slk_Clear = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Clear_Soft_Label_Keys;
--
--   procedure Restore_Soft_Label_Keys
--   is
--      function Slk_Restore return C_Int;
--      pragma Import (C, Slk_Restore, "slk_restore");
--   begin
--      if Slk_Restore = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Restore_Soft_Label_Keys;
--
--   procedure Touch_Soft_Label_Keys
--   is
--      function Slk_Touch return C_Int;
--      pragma Import (C, Slk_Touch, "slk_touch");
--   begin
--      if Slk_Touch = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Touch_Soft_Label_Keys;
--
--   procedure Switch_Soft_Label_Key_Attributes
--     (Attr : in Character_Attribute_Set;
--      On   : in Boolean := True)
--   is
--      function Slk_Attron (Ch : C_Chtype) return C_Int;
--      pragma Import (C, Slk_Attron, "slk_attron");
--      function Slk_Attroff (Ch : C_Chtype) return C_Int;
--      pragma Import (C, Slk_Attroff, "slk_attroff");
--
--      Err : C_Int;
--      Ch  : constant Attributed_Character := (Ch    => Character'First,
--                                              Attr  => Attr,
--                                              Color => Color_Pair'First);
--   begin
--      if On then
--         Err := Slk_Attron  (AttrChar_To_Chtype (Ch));
--      else
--         Err := Slk_Attroff (AttrChar_To_Chtype (Ch));
--      end if;
--      if Err = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Switch_Soft_Label_Key_Attributes;
--
--   procedure Set_Soft_Label_Key_Attributes
--     (Attr  : in Character_Attribute_Set := Normal_Video;
--      Color : in Color_Pair := Color_Pair'First)
--   is
--      function Slk_Attrset (Ch : C_Chtype) return C_Int;
--      pragma Import (C, Slk_Attrset, "slk_attrset");
--
--      Ch : constant Attributed_Character := (Ch    => Character'First,
--                                             Attr  => Attr,
--                                             Color => Color);
--   begin
--      if Slk_Attrset (AttrChar_To_Chtype (Ch)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Set_Soft_Label_Key_Attributes;
--
--   function Get_Soft_Label_Key_Attributes return Character_Attribute_Set
--   is
--      function Slk_Attr return C_Chtype;
--      pragma Import (C, Slk_Attr, "slk_attr");
--
--      Attr : constant C_Chtype := Slk_Attr;
--   begin
--      return Chtype_To_AttrChar (Attr).Attr;
--   end Get_Soft_Label_Key_Attributes;
--
--   function Get_Soft_Label_Key_Attributes return Color_Pair
--   is
--      function Slk_Attr return C_Chtype;
--      pragma Import (C, Slk_Attr, "slk_attr");
--
--      Attr : constant C_Chtype := Slk_Attr;
--   begin
--      return Chtype_To_AttrChar (Attr).Color;
--   end Get_Soft_Label_Key_Attributes;
--
--   procedure Set_Soft_Label_Key_Color (Pair : in Color_Pair)
--   is
--      function Slk_Color (Color : in C_Short) return C_Int;
--      pragma Import (C, Slk_Color, "slk_color");
--   begin
--      if Slk_Color (C_Short (Pair)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Set_Soft_Label_Key_Color;
--
--------------------------------------------------------------------------------
--   procedure Enable_Key (Key    : in Special_Key_Code;
--                         Enable : in Boolean := True)
--   is
--      function Keyok (Keycode : C_Int;
--                      On_Off  : Curses_Bool) return C_Int;
--      pragma Import (C, Keyok, "keyok");
--   begin
--      if Keyok (C_Int (Key), Curses_Bool (Boolean'Pos (Enable)))
--        = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Enable_Key;
--------------------------------------------------------------------------------
--   procedure Define_Key (Definition : in String;
--                         Key        : in Special_Key_Code)
--   is
--      function Defkey (Def : char_array;
--                       Key : C_Int) return C_Int;
--      pragma Import (C, Defkey, "define_key");
--
--      Txt    : char_array (0 .. Definition'Length);
--      Length : size_t;
--   begin
--      To_C (Definition, Txt, Length);
--      if Defkey (Txt, C_Int (Key)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Define_Key;
--------------------------------------------------------------------------------
--   procedure Un_Control (Ch  : in Attributed_Character;
--                         Str : out String)
--   is
--      function Unctrl (Ch : C_Chtype) return chars_ptr;
--      pragma Import (C, Unctrl, "unctrl");
--   begin
--      Fill_String (Unctrl (AttrChar_To_Chtype (Ch)), Str);
--   end Un_Control;
--
--   function Un_Control (Ch : in Attributed_Character) return String
--   is
--      function Unctrl (Ch : C_Chtype) return chars_ptr;
--      pragma Import (C, Unctrl, "unctrl");
--   begin
--      return Fill_String (Unctrl (AttrChar_To_Chtype (Ch)));
--   end Un_Control;
--
--   procedure Delay_Output (Msecs : in Natural)
--   is
--      function Delayoutput (Msecs : C_Int) return C_Int;
--      pragma Import (C, Delayoutput, "delay_output");
--   begin
--      if Delayoutput (C_Int (Msecs)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Delay_Output;
--
--   procedure Flush_Input
--   is
--      function Flushinp return C_Int;
--      pragma Import (C, Flushinp, "flushinp");
--   begin
--      if Flushinp = Curses_Err then  -- docu says that never happens, but...
--         raise Curses_Exception;
--      end if;
--   end Flush_Input;
--------------------------------------------------------------------------------
--   function Baudrate return Natural
--   is
--      function Baud return C_Int;
--      pragma Import (C, Baud, "baudrate");
--   begin
--      return Natural (Baud);
--   end Baudrate;
--
--   function Erase_Character return Character
--   is
--      function Erasechar return C_Int;
--      pragma Import (C, Erasechar, "erasechar");
--   begin
--      return Character'Val (Erasechar);
--   end Erase_Character;
--
--   function Kill_Character return Character
--   is
--      function Killchar return C_Int;
--      pragma Import (C, Killchar, "killchar");
--   begin
--      return Character'Val (Killchar);
--   end Kill_Character;
--
--   function Has_Insert_Character return Boolean
--   is
--      function Has_Ic return Curses_Bool;
--      pragma Import (C, Has_Ic, "has_ic");
--   begin
--      if Has_Ic = Curses_Bool_False then
--         return False;
--      else
--         return True;
--      end if;
--   end Has_Insert_Character;
--
--   function Has_Insert_Line return Boolean
--   is
--      function Has_Il return Curses_Bool;
--      pragma Import (C, Has_Il, "has_il");
--   begin
--      if Has_Il = Curses_Bool_False then
--         return False;
--      else
--         return True;
--      end if;
--   end Has_Insert_Line;
--
--   function Supported_Attributes return Character_Attribute_Set
--   is
--      function Termattrs return C_Chtype;
--      pragma Import (C, Termattrs, "termattrs");
--
--      Ch : constant Attributed_Character := Chtype_To_AttrChar (Termattrs);
--   begin
--      return Ch.Attr;
--   end Supported_Attributes;
--
--   procedure Long_Name (Name : out String)
--   is
--      function Longname return chars_ptr;
--      pragma Import (C, Longname, "longname");
--   begin
--      Fill_String (Longname, Name);
--   end Long_Name;
--
--   function Long_Name return String
--   is
--      function Longname return chars_ptr;
--      pragma Import (C, Longname, "longname");
--   begin
--      return Fill_String (Longname);
--   end Long_Name;
--
--   procedure Terminal_Name (Name : out String)
--   is
--      function Termname return chars_ptr;
--      pragma Import (C, Termname, "termname");
--   begin
--      Fill_String (Termname, Name);
--   end Terminal_Name;
--
--   function Terminal_Name return String
--   is
--      function Termname return chars_ptr;
--      pragma Import (C, Termname, "termname");
--   begin
--      return Fill_String (Termname);
--   end Terminal_Name;
--------------------------------------------------------------------------------
--   procedure Init_Pair (Pair : in Redefinable_Color_Pair;
--                        Fore : in Color_Number;
--                        Back : in Color_Number)
--   is
--      function Initpair (Pair : C_Short;
--                         Fore : C_Short;
--                         Back : C_Short) return C_Int;
--      pragma Import (C, Initpair, "init_pair");
--   begin
--      if Integer (Pair) >= Number_Of_Color_Pairs then
--         raise Constraint_Error;
--      end if;
--      if Integer (Fore) >= Number_Of_Colors or else
--        Integer (Back) >= Number_Of_Colors then raise Constraint_Error;
--      end if;
--      if Initpair (C_Short (Pair), C_Short (Fore), C_Short (Back))
--        = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Init_Pair;
--
--   procedure Pair_Content (Pair : in Color_Pair;
--                           Fore : out Color_Number;
--                           Back : out Color_Number)
--   is
--      type C_Short_Access is access all C_Short;
--      function Paircontent (Pair : C_Short;
--                            Fp   : C_Short_Access;
--                            Bp   : C_Short_Access) return C_Int;
--      pragma Import (C, Paircontent, "pair_content");
--
--      F, B : aliased C_Short;
--   begin
--      if Paircontent (C_Short (Pair), F'Access, B'Access) = Curses_Err then
--         raise Curses_Exception;
--      else
--         Fore := Color_Number (F);
--         Back := Color_Number (B);
--      end if;
--   end Pair_Content;
--
--   function Has_Colors return Boolean
--   is
--      function Hascolors return Curses_Bool;
--      pragma Import (C, Hascolors, "has_colors");
--   begin
--      if Hascolors = Curses_Bool_False then
--         return False;
--      else
--         return True;
--      end if;
--   end Has_Colors;
--
--   procedure Init_Color (Color : in Color_Number;
--                         Red   : in RGB_Value;
--                         Green : in RGB_Value;
--                         Blue  : in RGB_Value)
--   is
--      function Initcolor (Col   : C_Short;
--                          Red   : C_Short;
--                          Green : C_Short;
--                          Blue  : C_Short) return C_Int;
--      pragma Import (C, Initcolor, "init_color");
--   begin
--      if Initcolor (C_Short (Color), C_Short (Red), C_Short (Green),
--                    C_Short (Blue)) = Curses_Err then
--            raise Curses_Exception;
--      end if;
--   end Init_Color;
--
--   function Can_Change_Color return Boolean
--   is
--      function Canchangecolor return Curses_Bool;
--      pragma Import (C, Canchangecolor, "can_change_color");
--   begin
--      if Canchangecolor = Curses_Bool_False then
--         return False;
--      else
--         return True;
--      end if;
--   end Can_Change_Color;
--
--   procedure Color_Content (Color : in  Color_Number;
--                            Red   : out RGB_Value;
--                            Green : out RGB_Value;
--                            Blue  : out RGB_Value)
--   is
--      type C_Short_Access is access all C_Short;
--
--      function Colorcontent (Color : C_Short; R, G, B : C_Short_Access)
--                             return C_Int;
--      pragma Import (C, Colorcontent, "color_content");
--
--      R, G, B : aliased C_Short;
--   begin
--      if Colorcontent (C_Short (Color), R'Access, G'Access, B'Access) =
--        Curses_Err then
--         raise Curses_Exception;
--      else
--         Red   := RGB_Value (R);
--         Green := RGB_Value (G);
--         Blue  := RGB_Value (B);
--      end if;
--   end Color_Content;
--
--------------------------------------------------------------------------------
--   procedure Save_Curses_Mode (Mode : in Curses_Mode)
--   is
--      function Def_Prog_Mode return C_Int;
--      pragma Import (C, Def_Prog_Mode, "def_prog_mode");
--      function Def_Shell_Mode return C_Int;
--      pragma Import (C, Def_Shell_Mode, "def_shell_mode");
--
--      Err : C_Int;
--   begin
--      case Mode is
--         when Curses => Err := Def_Prog_Mode;
--         when Shell  => Err := Def_Shell_Mode;
--      end case;
--      if Err = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Save_Curses_Mode;
--
--   procedure Reset_Curses_Mode (Mode : in Curses_Mode)
--   is
--      function Reset_Prog_Mode return C_Int;
--      pragma Import (C, Reset_Prog_Mode, "reset_prog_mode");
--      function Reset_Shell_Mode return C_Int;
--      pragma Import (C, Reset_Shell_Mode, "reset_shell_mode");
--
--      Err : C_Int;
--   begin
--      case Mode is
--         when Curses => Err := Reset_Prog_Mode;
--         when Shell  => Err := Reset_Shell_Mode;
--      end case;
--      if Err = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Reset_Curses_Mode;
--
--   procedure Save_Terminal_State
--   is
--      function Savetty return C_Int;
--      pragma Import (C, Savetty, "savetty");
--   begin
--      if Savetty = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Save_Terminal_State;
--
--   procedure Reset_Terminal_State
--   is
--      function Resetty return C_Int;
--      pragma Import (C, Resetty, "resetty");
--   begin
--      if Resetty = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Reset_Terminal_State;
--
--   procedure Rip_Off_Lines (Lines : in Integer;
--                            Proc  : in Stdscr_Init_Proc)
--   is
--      function Ripoffline (Lines : C_Int;
--                           Proc  : Stdscr_Init_Proc) return C_Int;
--      pragma Import (C, Ripoffline, "_nc_ripoffline");
--   begin
--      if Ripoffline (C_Int (Lines), Proc) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Rip_Off_Lines;
--
--   procedure Set_Cursor_Visibility (Visibility : in out Cursor_Visibility)
--   is
--      function Curs_Set (Curs : C_Int) return C_Int;
--      pragma Import (C, Curs_Set, "curs_set");
--
--      Res : C_Int;
--   begin
--      Res := Curs_Set (Cursor_Visibility'Pos (Visibility));
--      if Res /= Curses_Err then
--         Visibility := Cursor_Visibility'Val (Res);
--      end if;
--   end Set_Cursor_Visibility;
--
--   procedure Nap_Milli_Seconds (Ms : in Natural)
--   is
--      function Napms (Ms : C_Int) return C_Int;
--      pragma Import (C, Napms, "napms");
--   begin
--      if Napms (C_Int (Ms)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Nap_Milli_Seconds;
--------------------------------------------------------------------------------
--
--   function Standard_Window return Window
--   is
--      Stdscr : Window;
--      pragma Import (C, Stdscr, "stdscr");
--   begin
--      return Stdscr;
--   end Standard_Window;
--
--   function Lines return Line_Count
--   is
--      C_Lines : C_Int;
--      pragma Import (C, C_Lines, "LINES");
--   begin
--      return Line_Count (C_Lines);
--   end Lines;
--
--   function Columns return Column_Count
--   is
--      C_Columns : C_Int;
--      pragma Import (C, C_Columns, "COLS");
--   begin
--      return Column_Count (C_Columns);
--   end Columns;
--
--   function Tab_Size return Natural
--   is
--      C_Tab_Size : C_Int;
--      pragma Import (C, C_Tab_Size, "TABSIZE");
--   begin
--      return Natural (C_Tab_Size);
--   end Tab_Size;
--
--   function Number_Of_Colors return Natural
--   is
--      C_Number_Of_Colors : C_Int;
--      pragma Import (C, C_Number_Of_Colors, "COLORS");
--   begin
--      return Natural (C_Number_Of_Colors);
--   end Number_Of_Colors;
--
--   function Number_Of_Color_Pairs return Natural
--   is
--      C_Number_Of_Color_Pairs : C_Int;
--      pragma Import (C, C_Number_Of_Color_Pairs, "COLOR_PAIRS");
--   begin
--      return Natural (C_Number_Of_Color_Pairs);
--   end Number_Of_Color_Pairs;
--------------------------------------------------------------------------------
--   procedure Transform_Coordinates
--     (W      : in Window := Standard_Window;
--      Line   : in out Line_Position;
--      Column : in out Column_Position;
--      Dir    : in Transform_Direction := From_Screen)
--   is
--      type Int_Access is access all C_Int;
--      function Transform (W    : Window;
--                          Y, X : Int_Access;
--                          Dir  : Curses_Bool) return C_Int;
--      pragma Import (C, Transform, "wmouse_trafo");
--
--      X : aliased C_Int := C_Int (Column);
--      Y : aliased C_Int := C_Int (Line);
--      D : Curses_Bool := Curses_Bool_False;
--      R : C_Int;
--   begin
--      if Dir = To_Screen then
--         D := 1;
--      end if;
--      R := Transform (W, Y'Access, X'Access, D);
--      if R = Curses_False then
--         raise Curses_Exception;
--      else
--         Line   := Line_Position (Y);
--         Column := Column_Position (X);
--      end if;
--   end Transform_Coordinates;
--------------------------------------------------------------------------------
--   procedure Use_Default_Colors is
--      function C_Use_Default_Colors return C_Int;
--      pragma Import (C, C_Use_Default_Colors, "use_default_colors");
--      Err : constant C_Int := C_Use_Default_Colors;
--   begin
--      if Err = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Use_Default_Colors;
--
--   procedure Assume_Default_Colors (Fore : Color_Number := Default_Color;
--                                    Back : Color_Number := Default_Color)
--   is
--      function C_Assume_Default_Colors (Fore : C_Int;
--                                        Back : C_Int) return C_Int;
--      pragma Import (C, C_Assume_Default_Colors, "assume_default_colors");
--
--      Err : constant C_Int := C_Assume_Default_Colors (C_Int (Fore),
--                                                       C_Int (Back));
--   begin
--      if Err = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Assume_Default_Colors;
--------------------------------------------------------------------------------
--   function Curses_Version return String
--   is
--      function curses_versionC return chars_ptr;
--      pragma Import (C, curses_versionC, "curses_version");
--      Result : constant chars_ptr := curses_versionC;
--   begin
--      return Fill_String (Result);
--   end Curses_Version;
--------------------------------------------------------------------------------
--   function Use_Extended_Names (Enable : Boolean) return Boolean
--   is
--      function use_extended_namesC (e : Curses_Bool) return C_Int;
--      pragma Import (C, use_extended_namesC, "use_extended_names");
--
--      Res : constant C_Int :=
--         use_extended_namesC (Curses_Bool (Boolean'Pos (Enable)));
--   begin
--      if Res = C_Int (Curses_Bool_False) then
--         return False;
--      else
--         return True;
--      end if;
--   end Use_Extended_Names;
--------------------------------------------------------------------------------
--   procedure Screen_Dump_To_File (Filename : in String)
--   is
--      function scr_dump (f : char_array) return C_Int;
--      pragma Import (C, scr_dump, "scr_dump");
--      Txt    : char_array (0 .. Filename'Length);
--      Length : size_t;
--   begin
--      To_C (Filename, Txt, Length);
--      if Curses_Err = scr_dump (Txt) then
--         raise Curses_Exception;
--      end if;
--   end Screen_Dump_To_File;
--
--   procedure Screen_Restore_From_File (Filename : in String)
--   is
--      function scr_restore (f : char_array) return C_Int;
--      pragma Import (C, scr_restore, "scr_restore");
--      Txt    : char_array (0 .. Filename'Length);
--      Length : size_t;
--   begin
--      To_C (Filename, Txt, Length);
--      if Curses_Err = scr_restore (Txt)  then
--         raise Curses_Exception;
--      end if;
--   end Screen_Restore_From_File;
--
--   procedure Screen_Init_From_File (Filename : in String)
--   is
--      function scr_init (f : char_array) return C_Int;
--      pragma Import (C, scr_init, "scr_init");
--      Txt    : char_array (0 .. Filename'Length);
--      Length : size_t;
--   begin
--      To_C (Filename, Txt, Length);
--      if Curses_Err = scr_init (Txt) then
--         raise Curses_Exception;
--      end if;
--   end Screen_Init_From_File;
--
--   procedure Screen_Set_File (Filename : in String)
--   is
--      function scr_set (f : char_array) return C_Int;
--      pragma Import (C, scr_set, "scr_set");
--      Txt    : char_array (0 .. Filename'Length);
--      Length : size_t;
--   begin
--      To_C (Filename, Txt, Length);
--      if Curses_Err = scr_set (Txt) then
--         raise Curses_Exception;
--      end if;
--   end Screen_Set_File;
--------------------------------------------------------------------------------
--   procedure Resize (Win               : Window := Standard_Window;
--                     Number_Of_Lines   : Line_Count;
--                     Number_Of_Columns : Column_Count) is
--      function wresize (win     : Window;
--                        lines   : C_Int;
--                        columns : C_Int) return C_Int;
--      pragma Import (C, wresize);
--   begin
--      if wresize (Win,
--                  C_Int (Number_Of_Lines),
--                  C_Int (Number_Of_Columns)) = Curses_Err then
--         raise Curses_Exception;
--      end if;
--   end Resize;
--------------------------------------------------------------------------------
--
--end Terminal_Interface.Curses;
-diff -Naur ncurses-5.6.orig/INSTALL ncurses-5.6/INSTALL
---- ncurses-5.6.orig/INSTALL	2006-12-17 14:58:19.000000000 -0500
-+++ ncurses-5.6/INSTALL	2008-06-18 06:49:49.000000000 -0400
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: INSTALL,v 1.114 2006/12/17 19:58:19 tom Exp $
-+-- $Id: INSTALL,v 1.124 2008/03/29 18:07:32 tom Exp $
- ---------------------------------------------------------------------
-              How to install Ncurses/Terminfo on your system
- ---------------------------------------------------------------------
-@@ -149,6 +149,9 @@
-     recent implementation of libiconv.  We have built this configuration on
-     Linux using libiconv, sometimes requiring libutf8.
- 
-+    If you configure using the --with-pthread option, a "t" is appended to
-+    the library names (e.g., libncursest.a, libncursestw.a).
-+
-     If you do not specify any models, the normal and debug libraries will be
-     configured.  Typing `configure' with no arguments is equivalent to:
- 
-@@ -304,6 +307,11 @@
- 	return deceptive results, so you may have to override the configure
- 	script.  Or you may be building tic for a smaller machine.
- 
-+    --disable-big-strings
-+	Disable compile-time optimization of predefined tables which puts
-+	all of their strings into a very long string, to reduce relocation
-+	overhead.
-+
-     --disable-database
- 	Use only built-in data.  The ncurses libraries normally read terminfo
- 	and termcap data from disk.  You can configure ncurses to have a
-@@ -334,6 +342,16 @@
- 	For testing, compile-in code that frees memory that normally would not
- 	be freed, to simplify analysis of memory-leaks.
- 
-+	Any implementation of curses must not free the memory associated with
-+	a screen, since (even after calling endwin()), it must be available
-+	for use in the next call to refresh().  There are also chunks of
-+	memory held for performance reasons.  That makes it hard to analyze
-+	curses applications for memory leaks.  To work around this, build
-+	a debugging version of the ncurses library which frees those chunks
-+	which it can, and provides the _nc_free_and_exit() function to free
-+	the remainder on exit.  The ncurses utility and test programs use this
-+	feature, e.g., via the ExitProgram() macro.
-+
-     --disable-lp64
- 	The header files will ignore use of the _LP64 symbol to make chtype
- 	and mmask_t types 32 bits (they may be long on 64-bit hosts, for
-@@ -358,6 +376,13 @@
- 	rather than the include directory.  This makes it simpler to avoid
- 	compile-time conflicts with other versions of curses.h
- 
-+    --disable-relink
-+	If --enable-rpath is given, the generated makefiles normally will
-+	rebuild the libraries during install.  Use this option to simply
-+	copy whatever the linked produced.
-+
-+	This option is ignored if --enable-rpath is not given.
-+
-     --disable-root-environ
- 	Compile with environment restriction, so certain environment variables
- 	are not available when running as root, or via a setuid/setgid
-@@ -476,12 +501,23 @@
- 	may not be accurate, or that your stty settings have disabled the use
- 	of tabs.
- 
-+    --enable-mixed-case
-+	Controls whether the filesystem on which the terminfo database resides
-+	supports mixed-case filenames (normal for UNIX, but not on other
-+	systems).  If you do not specify this option, the configure script
-+	checks the current filesystem.
-+
-     --enable-no-padding
- 	Compile-in support for the $NCURSES_NO_PADDING environment variable,
- 	which allows you to suppress the effect of non-mandatory padding in
- 	terminfo entries.  This is the default, unless you have disabled the
- 	extended functions.
- 
-+    --enable-reentrant
-+	Compile experimental configuration which improves reentrant use of the
-+	library by reducing global and static variables.  This option is also
-+	set if --with-pthread is used.
-+
-     --enable-rpath
- 	Use rpath option when generating shared libraries, and (with some
- 	restrictions) when linking the corresponding programs.  This originally
-@@ -495,6 +531,9 @@
- 	environment variable, they do not work with setuid applications since
- 	the LD_LIBRARY_PATH variable would be unset in that situation.
- 
-+	This option does not apply to --with-libtool, since libtool makes
-+	extra assumptions about rpath.
-+
-     --enable-safe-sprintf
- 	Compile with experimental safe-sprintf code.  You may consider using
- 	this if you are building ncurses for a system that has neither
-@@ -659,10 +698,16 @@
- 
- 	See also --without-dlsym
- 
--    --with-hashed-db
-+    --with-hashed-db[=XXX]
- 	Use a hashed database for storing terminfo data rather than storing
- 	each compiled entry in a separate binary file within a directory
- 	tree.
-+	
-+	In particular, this uses the Berkeley database 1.8.5 interface, as
-+	provided by that and its successors db 2, 3, and 4.  The actual
-+	interface is slightly different in the successor versions of the
-+	Berkeley database.  The database should have been configured using
-+	"--enable-compat185".
- 
- 	If you use this option for configuring ncurses, tic will only be able
- 	to write entries in the hashed database.  infocmp can still read
-@@ -674,6 +719,12 @@
- 	You cannot have a directory containing both hashed-database and
- 	filesystem-based terminfo entries.
- 
-+	Use the parameter value to give the install-prefix used for the
-+	datbase, e.g.,
-+		--with-hashed-db=/usr/local/BigBase
-+	to find the corresponding include- and lib-directories under the
-+	given directory.
-+
- 	See also the --enable-getcap option.
- 
-     --with-install-prefix=XXX
-@@ -769,6 +820,11 @@
- 	Generate profile-libraries These are named by adding "_p" to the root,
- 	e.g., libncurses_p.a
- 
-+    --with-pthread
-+	Link with POSIX threads, set --enable-reentrant.  The use_window() and
-+	use_screen() functions will use mutex's, allowing rudimentary support
-+	for multithreaded applications.
-+
-     --with-rcs-ids
- 	Compile-in RCS identifiers.  Most of the C files have an identifier.
- 
-@@ -833,6 +889,15 @@
- 	Specify a search-list of termcap files which will be compiled into the
- 	ncurses library (default:  /etc/termcap:/usr/share/misc/termcap)
- 
-+    --with-ticlib[=XXX]
-+	When building the ncurses library, build a separate library for
-+	the modules that are used only by the utility programs.  Normally
-+	those would be bundled with the termlib or ncurses libraries.
-+
-+	If an option value is given, that overrides the name of the tic
-+	library.  As in termlib, there is no ABI difference between the
-+	"wide" libticw.so and libtic.so
-+
-     --with-trace
- 	Configure the trace() function as part of the all models of the ncurses
- 	library.  Normally it is part of the debug (libncurses_g) library only.
-diff -Naur ncurses-5.6.orig/MANIFEST ncurses-5.6/MANIFEST
---- ncurses-5.6.orig/MANIFEST	2006-11-25 21:21:05.000000000 -0500
-+++ ncurses-5.6/MANIFEST	2008-06-18 06:49:46.000000000 -0400
-@@ -4,6 +4,7 @@
- ./Ada95/README
- ./Ada95/TODO
- ./Ada95/gen/Makefile.in
-+./Ada95/gen/adacurses-config.in
- ./Ada95/gen/gen.c
- ./Ada95/gen/html.m4
- ./Ada95/gen/normal.m4
-@@ -20,6 +21,7 @@
- ./Ada95/gen/terminal_interface-curses-panels-user_data.ads.m4
- ./Ada95/gen/terminal_interface-curses-panels.ads.m4
- ./Ada95/gen/terminal_interface-curses-trace.ads.m4
-+./Ada95/gen/terminal_interface-curses.adb.m4
- ./Ada95/gen/terminal_interface-curses.ads.m4
- ./Ada95/samples/Makefile.in
- ./Ada95/samples/README
-@@ -163,7 +165,6 @@
- ./Ada95/src/terminal_interface-curses-text_io.adb
- ./Ada95/src/terminal_interface-curses-text_io.ads
- ./Ada95/src/terminal_interface-curses-trace.adb_p
--./Ada95/src/terminal_interface-curses.adb
- ./Ada95/src/terminal_interface.ads
- ./INSTALL
- ./MANIFEST
-@@ -553,8 +554,10 @@
- ./man/curs_instr.3x
- ./man/curs_inwstr.3x
- ./man/curs_kernel.3x
-+./man/curs_legacy.3x
- ./man/curs_mouse.3x
- ./man/curs_move.3x
-+./man/curs_opaque.3x
- ./man/curs_outopts.3x
- ./man/curs_overlay.3x
- ./man/curs_pad.3x
-@@ -568,6 +571,7 @@
- ./man/curs_termattrs.3x
- ./man/curs_termcap.3x
- ./man/curs_terminfo.3x
-+./man/curs_threads.3x
- ./man/curs_touch.3x
- ./man/curs_trace.3x
- ./man/curs_util.3x
-@@ -709,7 +713,8 @@
- ./mk-0th.awk
- ./mk-1st.awk
- ./mk-2nd.awk
--./mkinstalldirs
-+./mk-hdr.awk
-+./mkdirs.sh
- ./ncurses/Makefile.in
- ./ncurses/README
- ./ncurses/README.IZ
-@@ -799,15 +804,19 @@
- ./ncurses/base/safe_sprintf.c
- ./ncurses/base/sigaction.c
- ./ncurses/base/tries.c
-+./ncurses/base/use_window.c
- ./ncurses/base/version.c
- ./ncurses/base/vsscanf.c
- ./ncurses/base/wresize.c
- ./ncurses/curses.priv.h
- ./ncurses/fifo_defs.h
- ./ncurses/llib-lncurses
-+./ncurses/llib-lncursest
- ./ncurses/llib-lncursesw
- ./ncurses/modules
- ./ncurses/tinfo/MKcaptab.awk
-+./ncurses/tinfo/MKcaptab.sh
-+./ncurses/tinfo/MKcodes.awk
- ./ncurses/tinfo/MKfallback.sh
- ./ncurses/tinfo/MKkeys_list.sh
- ./ncurses/tinfo/MKnames.awk
-@@ -824,6 +833,7 @@
- ./ncurses/tinfo/comp_scan.c
- ./ncurses/tinfo/db_iterator.c
- ./ncurses/tinfo/doalloc.c
-+./ncurses/tinfo/entries.c
- ./ncurses/tinfo/free_ttype.c
- ./ncurses/tinfo/getenv_num.c
- ./ncurses/tinfo/hashed_db.c
-@@ -856,6 +866,7 @@
- ./ncurses/tinfo/setbuf.c
- ./ncurses/tinfo/strings.c
- ./ncurses/tinfo/trim_sgr0.c
-+./ncurses/tinfo/use_screen.c
- ./ncurses/tinfo/write_entry.c
- ./ncurses/trace/README
- ./ncurses/trace/lib_trace.c
-@@ -891,6 +902,7 @@
- ./ncurses/widechar/lib_in_wchnstr.c
- ./ncurses/widechar/lib_ins_wch.c
- ./ncurses/widechar/lib_inwstr.c
-+./ncurses/widechar/lib_key_name.c
- ./ncurses/widechar/lib_pecho_wchar.c
- ./ncurses/widechar/lib_slk_wset.c
- ./ncurses/widechar/lib_unget_wch.c
-@@ -934,29 +946,6 @@
- ./progs/toe.c
- ./progs/tput.c
- ./progs/tset.c
--./tack/COPYING
--./tack/HISTORY
--./tack/Makefile.in
--./tack/README
--./tack/ansi.c
--./tack/charset.c
--./tack/color.c
--./tack/control.c
--./tack/crum.c
--./tack/edit.c
--./tack/fun.c
--./tack/init.c
--./tack/menu.c
--./tack/modes.c
--./tack/modules
--./tack/output.c
--./tack/pad.c
--./tack/scan.c
--./tack/sync.c
--./tack/sysdep.c
--./tack/tack.1
--./tack/tack.c
--./tack/tack.h
- ./tar-copy.sh
- ./test/Makefile.in
- ./test/README
-@@ -981,6 +970,7 @@
- ./test/demo_termcap.c
- ./test/ditto.c
- ./test/dots.c
-+./test/dots_mvcur.c
- ./test/echochar.c
- ./test/edit_field.c
- ./test/edit_field.h
-@@ -992,8 +982,11 @@
- ./test/gdc.c
- ./test/hanoi.c
- ./test/hashtest.c
-+./test/inch_wide.c
-+./test/inchs.c
- ./test/ins_wide.c
- ./test/inserts.c
-+./test/key_names.c
- ./test/keynames.c
- ./test/knight.c
- ./test/linux-color.dat
-@@ -1010,8 +1003,15 @@
- ./test/rain.c
- ./test/redraw.c
- ./test/savescreen.c
-+./test/savescreen.sh
- ./test/tclock.c
- ./test/test.priv.h
-+./test/test_arrays.c
-+./test/test_get_wstr.c
-+./test/test_getstr.c
-+./test/test_instr.c
-+./test/test_inwstr.c
-+./test/test_opaque.c
- ./test/testaddch.c
- ./test/testcurs.c
- ./test/testscanw.c
-diff -Naur ncurses-5.6.orig/NEWS ncurses-5.6/NEWS
---- ncurses-5.6.orig/NEWS	2006-12-17 15:36:26.000000000 -0500
-+++ ncurses-5.6/NEWS	2008-06-18 06:49:52.000000000 -0400
-@@ -1,5 +1,5 @@
- -------------------------------------------------------------------------------
---- Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.               --
-+-- Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.               --
- --                                                                           --
- -- Permission is hereby granted, free of charge, to any person obtaining a   --
- -- copy of this software and associated documentation files (the             --
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: NEWS,v 1.1056 2006/12/17 20:36:26 tom Exp $
-+-- $Id: NEWS,v 1.1245 2008/06/14 23:08:10 tom Exp $
- -------------------------------------------------------------------------------
- 
- This is a log of changes that ncurses has gone through since Zeyd started
-@@ -45,9 +45,688 @@
- Changes through 1.9.9e did not credit all contributions;
- it is not possible to add this information.
- 
-+20080614
-+	+ modify test/ditto.c to illustrate multi-threaded use_screen().
-+	+ change CC_SHARED_OPTS from -KPIC to -xcode=pic32 for Solaris.
-+	+ add "-shared" option to MK_SHARED_LIB for gcc on Solaris (report
-+	  by Poor Yorick).
-+
-+20080607
-+	+ finish changes to wgetch(), making it switch as needed to the
-+	  window's actual screen when calling wrefresh() and wgetnstr().  That
-+	  allows wgetch() to get used concurrently in different threads with
-+	  some minor restrictions, e.g., the application should not delete a
-+	  window which is being used in a wgetch().
-+	+ simplify mutex's, combining the window- and screen-mutex's.
-+
-+20080531
-+	+ modify wgetch() to use the screen which corresponds to its window
-+	  parameter rather than relying on SP; some dependent functions still
-+	  use SP internally.
-+	+ factor out most use of SP in lib_mouse.c, using parameter.
-+	+ add internal _nc_keyname(), replacing keyname() to associate with a
-+	  particular SCREEN rather than the global SP.
-+	+ add internal _nc_unctrl(), replacing unctrl() to associate with a
-+	  particular SCREEN rather than the global SP.
-+	+ add internal _nc_tracemouse(), replacing _tracemouse() to eliminate
-+	  its associated global buffer _nc_globals.tracemse_buf now in SCREEN.
-+	+ add internal _nc_tracechar(), replacing _tracechar() to use SCREEN in
-+	  preference to the global _nc_globals.tracechr_buf buffer.
-+
-+20080524
-+	+ modify _nc_keypad() to make it switch temporarily as needed to the
-+	  screen which must be updated.
-+	+ wrap cur_term variable to help make _nc_keymap() thread-safe, and
-+	  always set the screen's copy of this variable in set_curterm().
-+	+ restore curs_set() state after endwin()/refresh() (report/patch
-+	  Miroslav Lichvar)
-+
-+20080517
-+	+ modify configure script to note that --enable-ext-colors and
-+	  --enable-ext-mouse are not experimental, but extensions from
-+	  the ncurses ABI 5.
-+	+ corrected manpage description of setcchar() (discussion with
-+	  Emanuele Giaquinta).
-+	+ fix for adding a non-spacing character at the beginning of a line
-+	  (report/patch by Miroslav Lichvar).
-+
-+20080503
-+	+ modify screen.* terminfo entries using new screen+fkeys to fix
-+	  overridden keys in screen.rxvt (Debian #478094) -TD
-+	+ modify internal interfaces to reduce wgetch()'s dependency on the
-+	  global SP.
-+	+ simplify some loops with macros each_screen(), each_window() and
-+	  each_ripoff().
-+
-+20080426
-+	+ continue modifying test/ditto.c toward making it demonstrate
-+	  multithreaded use_screen(), using fifos to pass data between screens.
-+	+ fix typo in form.3x (report by Mike Gran).
-+
-+20080419
-+	+ add screen.rxvt terminfo entry -TD
-+	+ modify tic -f option to format spaces as \s to prevent them from
-+	  being lost when that is read back in unformatted strings.
-+	+ improve test/ditto.c, using a "talk"-style layout.
-+
-+20080412
-+	+ change test/ditto.c to use openpty() and xterm.
-+	+ add locks for copywin(), dupwin(), overlap(), overlay() on their
-+	  window parameters.
-+	+ add locks for initscr() and newterm() on updates to the SCREEN
-+	  pointer.
-+	+ finish table in curs_thread.3x manpage.
-+
-+20080405
-+	+ begin table in curs_thread.3x manpage describing the scope of data
-+	  used by each function (or symbol) for threading analysis.
-+	+ add null-pointer checks to setsyx() and getsyx() (prompted by
-+	  discussion by Martin v. Lowis and Jeroen Ruigrok van der Werven on
-+	  python-dev2 mailing list).
-+
-+20080329
-+	+ add null-pointer checks in set_term() and delscreen().
-+	+ move _nc_windows into _nc_globals, since windows can be pads, which
-+	  are not associated with a particular screen.
-+	+ change use_screen() to pass the SCREEN* parameter rather than
-+	  stdscr to the callback function.
-+	+ force libtool to use tag for 'CC' in case it does not detect this,
-+	  e.g., on aix when using CC=powerpc-ibm-aix5.3.0.0-gcc
-+	  (report/patch by Michael Haubenwallner).
-+	+ override OBJEXT to "lo" when building with libtool, to work on
-+	  platforms such as AIX where libtool may use a different suffix for
-+	  the object files than ".o" (report/patch by Michael Haubenwallner).
-+	+ add configure --with-pthread option, for building with the POSIX
-+	  thread library.
-+
-+20080322
-+	+ fill in extended-color pair two more places in wbkgrndset() and
-+	  waddch_nosync() (prompted by Sedeno's patch).
-+	+ fill in extended-color pair in _nc_build_wch() to make colors work
-+	  for wide-characters using extended-colors (patch by Alejandro R
-+	  Sedeno).
-+	+ add x/X toggles to ncurses.c C color test to test/demo
-+	  wide-characters with extended-colors.
-+	+ add a/A toggles to ncurses.c c/C color tests.
-+	+ modify test/ditto.c to use use_screen().
-+	+ finish modifying test/rain.c to demonstrate threads.
-+
-+20080308
-+	+ start modifying test/rain.c for threading demo.
-+	+ modify test/ncurses.c to make 'f' test accept the f/F/b/F/</> toggles
-+	  that the 'F' accepts.
-+	+ modify test/worm.c to show trail in reverse-video when other threads
-+	  are working concurrently.
-+	+ fix a deadlock from improper nesting of mutexes for windowlist and
-+	  window.
-+
-+20080301
-+	+ fixes from 20080223 resolved issue with mutexes; change to use
-+	  recursive mutexes to fix memory leak in delwin() as called from
-+	  _nc_free_and_exit().
-+
-+20080223
-+	+ fix a size-difference in _nc_globals which caused hanging of mutex
-+	  lock/unlock when termlib was built separately.
-+
-+20080216
-+	+ avoid using nanosleep() in threaded configuration since that often
-+	  is implemented to suspend the entire process.
-+
-+20080209
-+	+ update test programs to build/work with various UNIX curses for
-+	  comparisons.  This was to reinvestigate statement in X/Open curses
-+	  that insnstr and winsnstr perform wrapping.  None of the Unix-branded
-+	  implementations do this, as noted in manpage (cf: 20040228).
-+
-+20080203
-+	+ modify _nc_setupscreen() to set the legacy-coding value the same
-+	  for both narrow/wide models.  It had been set only for wide model,
-+	  but is needed to make unctrl() work with locale in the narrow model.
-+	+ improve waddch() and winsch() handling of EILSEQ from mbrtowc() by
-+	  using unctrl() to display illegal bytes rather than trying to append
-+	  further bytes to make up a valid sequence (reported by Andrey A
-+	  Chernov).
-+	+ modify unctrl() to check codes in 128-255 range versus isprint().
-+	  If they are not printable, and locale was set, use a "M-" or "~"
-+	  sequence.
-+
-+20080126
-+	+ improve threading in test/worm.c (wrap refresh calls, and KEY_RESIZE
-+	  handling).  Now it hangs in napms(), no matter whether nanosleep()
-+	  or poll() or select() are used on Linux.
-+
-+20080119
-+	+ fixes to build with --disable-ext-funcs
-+	+ add manpage for use_window and use_screen.
-+	+ add set_tabsize() and set_escdelay() functions.
-+
-+20080112
-+	+ remove recursive-mutex definitions, finish threading demo for worm.c
-+	+ remove a redundant adjustment of lines in resizeterm.c's
-+	  adjust_window() which caused occasional misadjustment of stdscr when
-+	  softkeys were used.
-+
-+20080105
-+	+ several improvements to terminfo entries based on xterm #230 -TD
-+	+ modify MKlib_gen.sh to handle keyname/key_name prototypes, so the
-+	  "link_test" builds properly.
-+	+ fix for toe command-line options -u/-U to ensure filename is given.
-+	+ fix allocation-size for command-line parsing in infocmp from 20070728
-+	  (report by Miroslav Lichvar)
-+	+ improve resizeterm() by moving ripped-off lines, and repainting the
-+	  soft-keys (report by Katarina Machalkova)
-+	+ add clarification in wclear's manpage noting that the screen will be
-+	  cleared even if a subwindow is cleared (prompted by Christer Enfors
-+	  question).
-+	+ change test/ncurses.c soft-key tests to work with KEY_RESIZE.
-+
-+20071222
-+	+ continue implementing support for threading demo by adding mutex
-+	  for delwin().
-+
-+20071215
-+	+ add several functions to C++ binding which wrap C functions that
-+	  pass a WINDOW* parameter (request by Chris Lee).
-+
-+20071201
-+	+ add note about configure options needed for Berkeley database to the
-+	  INSTALL file.
-+	+ improve checks for version of Berkeley database libraries.
-+	+ amend fix for rpath to not modify LDFLAGS if the platform has no
-+	  applicable transformation (report by Christian Ebert, cf: 20071124).
-+
-+20071124
-+	+ modify configure option --with-hashed-db to accept a parameter which
-+	  is the install-prefix of a given Berkeley Database (prompted by
-+	  pierre4d2 comments).
-+	+ rewrite wrapper for wcrtomb(), making it work on Solaris.  This is
-+	  used in the form library to determine the length of the buffer needed
-+	  by field_buffer (report by Alfred Fung).
-+	+ remove unneeded window-parameter from C++ binding for wresize (report
-+	  by Chris Lee).
-+
-+20071117
-+	+ modify the support for filesystems which do not support mixed-case to
-+	  generate 2-character (hexadecimal) codes for the lower-level of the
-+	  filesystem terminfo database (request by Michail Vidiassov).
-+	+ add configure option --enable-mixed-case, to allow overriding the
-+	  configure script's check if the filesystem supports mixed-case
-+	  filenames.
-+	+ add wresize() to C++ binding (request by Chris Lee).
-+	+ define NCURSES_EXT_FUNCS and NCURSES_EXT_COLORS in curses.h to make
-+	  it simpler to tell if the extended functions and/or colors are
-+	  declared.
-+
-+20071103
-+	+ update memory-leak checks for changes to names.c and codes.c
-+	+ correct acsc strings in h19, z100 (patch by Benjamin C W Sittler).
-+
-+20071020
-+	+ continue implementing support for threading demo by adding mutex
-+	  for use_window().
-+	+ add mrxvt terminfo entry, add/fix xterm building blocks for modified
-+	  cursor keys -TD
-+	+ compile with FreeBSD "contemporary" TTY interface (patch by
-+	  Rong-En Fan).
-+
-+20071013
-+	+ modify makefile rules to allow clear, tput and tset to be built
-+	  without libtic.  The other programs (infocmp, tic and toe) rely on
-+	  that library.
-+	+ add/modify null-pointer checks in several functions for SP and/or
-+	  the WINDOW* parameter (report by Thorben Krueger).
-+	+ fixes for field_buffer() in formw library (see Redhat Bugzilla
-+	  #310071, patches by Miroslav Lichvar).
-+	+ improve performance of NCURSES_CHAR_EQ code (patch by Miroslav
-+	  Lichvar).
-+	+ update/improve mlterm and rxvt terminfo entries, e.g., for
-+	  the modified cursor- and keypad-keys -TD
-+
-+20071006
-+	+ add code to curses.priv.h ifdef'd with NCURSES_CHAR_EQ, which
-+	  changes the CharEq() macro to an inline function to allow comparing
-+	  cchar_t struct's without comparing gaps in a possibly unpacked
-+	  memory layout (report by Miroslav Lichvar).
-+
-+20070929
-+	+ add new functions to lib_trace.c to setup mutex's for the _tracef()
-+	  calls within the ncurses library.
-+	+ for the reentrant model, move _nc_tputs_trace and _nc_outchars into
-+	  the SCREEN.
-+	+ start modifying test/worm.c to provide threading demo (incomplete).
-+	+ separated ifdef's for some BSD-related symbols in tset.c, to make
-+	  it compile on LynxOS (report by Greg Gemmer).
-+20070915
-+	+ modify Ada95/gen/Makefile to use shlib script, to simplify building
-+	  shared-library configuration on platforms lacking rpath support.
-+	+ build-fix for Ada95/src/Makefile to reflect changed dependency for
-+	  the terminal-interface-curses-aux.adb file which is now generated.
-+	+ restructuring test/worm.c, for use_window() example.
-+
-+20070908
-+	+ add use_window() and use_screen() functions, to develop into support
-+	  for threaded library (incomplete).
-+	+ fix typos in man/curs_opaque.3x which kept the install script from
-+	  creating symbolic links to two aliases created in 20070818 (report by
-+	  Rong-En Fan).
-+
-+20070901
-+	+ remove a spurious newline from output of html.m4, which caused links
-+	  for Ada95 html to be incorrect for the files generated using m4.
-+	+ start investigating mutex's for SCREEN manipulation (incomplete).
-+	+ minor cleanup of codes.c/names.c for --enable-const
-+	+ expand/revise "Routine and Argument Names" section of ncurses manpage
-+	  to address report by David Givens in newsgroup discussion.
-+	+ fix interaction between --without-progs/--with-termcap configure
-+	  options (report by Michail Vidiassov).
-+	+ fix typo in "--disable-relink" option (report by Michail Vidiassov).
-+
-+20070825
-+	+ fix a sign-extension bug in infocmp's repair_acsc() function
-+	  (cf: 971004).
-+	+ fix old configure script bug which prevented "--disable-warnings"
-+	  option from working (patch by Mike Frysinger).
-+
-+20070818
-+	+ add 9term terminal description (request by Juhapekka Tolvanen) -TD
-+	+ modify comp_hash.c's string output to avoid misinterpreting a null
-+	  "\0" followed by a digit.
-+	+ modify MKnames.awk and MKcodes.awk to support big-strings.
-+	  This only applies to the cases (broken linker, reentrant) where
-+	  the corresponding arrays are accessed via wrapper functions.
-+	+ split MKnames.awk into two scripts, eliminating the shell redirection
-+	  which complicated the make process and also the bogus timestamp file
-+	  which was introduced to fix "make -j".
-+	+ add test/test_opaque.c, test/test_arrays.c
-+	+ add wgetscrreg() and wgetparent() for applications that may need it
-+	  when NCURSES_OPAQUE is defined (prompted by Bryan Christ).
-+
-+20070812
-+	+ amend treatment of infocmp "-r" option to retain the 1023-byte limit
-+	  unless "-T" is given (cf: 981017).
-+	+ modify comp_captab.c generation to use big-strings.
-+	+ make _nc_capalias_table and _nc_infoalias_table private accessed via
-+	  _nc_get_alias_table() since the tables are used only within the tic
-+	  library.
-+	+ modify configure script to skip Intel compiler in CF_C_INLINE.
-+	+ make _nc_info_hash_table and _nc_cap_hash_table private accessed via
-+	  _nc_get_hash_table() since the tables are used only within the tic
-+	  library.
-+
-+20070728
-+	+ make _nc_capalias_table and _nc_infoalias_table private, accessed via
-+	  _nc_get_alias_table() since they are used only by parse_entry.c
-+	+ make _nc_key_names private since it is used only by lib_keyname.c
-+	+ add --disable-big-strings configure option to control whether
-+	  unctrl.c is generated using the big-string optimization - which may
-+	  use strings longer than supported by a given compiler.
-+	+ reduce relocation tables for tic, infocmp by changing type of
-+	  internal hash tables to short, and make those private symbols.
-+	+ eliminate large fixed arrays from progs/infocmp.c
-+
-+20070721
-+	+ change winnstr() to stop at the end of the line (cf: 970315).
-+	+ add test/test_get_wstr.c
-+	+ add test/test_getstr.c
-+	+ add test/test_inwstr.c
-+	+ add test/test_instr.c
-+
-+20070716
-+	+ restore a call to obtain screen-size in _nc_setupterm(), which
-+	  is used in tput and other non-screen applications via setupterm()
-+	  (Debian #433357, reported by Florent Bayle, Christian Ohm,
-+	  cf: 20070310).
-+
-+20070714
-+	+ add test/savescreen.c test-program
-+	+ add check to trace-file open, if the given name is a directory, add
-+	  ".log" to the name and try again.
-+	+ add konsole-256color entry -TD
-+	+ add extra gcc warning options from xterm.
-+	+ minor fixes for ncurses/hashmap test-program.
-+	+ modify configure script to quiet c++ build with libtool when the
-+	  --disable-echo option is used.
-+	+ modify configure script to disable ada95 if libtool is selected,
-+	  writing a warning message (addresses FreeBSD ports/114493).
-+	+ update config.guess, config.sub
-+
-+20070707
-+	+ add continuous-move "M" to demo_panels to help test refresh changes.
-+	+ improve fix for refresh of window on top of multi-column characters,
-+	  taking into account some split characters on left/right window
-+	  boundaries.
-+
-+20070630
-+	+ add "widec" row to _tracedump() output to help diagnose remaining
-+	  problems with multi-column characters.
-+	+ partial fix for refresh of window on top of multi-column characters
-+	  which are partly overwritten (report by Sadrul H Chowdhury).
-+	+ ignore A_CHARTEXT bits in vidattr() and vid_attr(), in case
-+	  multi-column extension bits are passed there.
-+	+ add setlocale() call to demo_panels.c, needed for wide-characters.
-+	+ add some output flags to _nc_trace_ttymode to help diagnose a bug
-+	  report by Larry Virden, i.e., ONLCR, OCRNL, ONOCR and ONLRET,
-+
-+20070623
-+	+ add test/demo_panels.c
-+	+ implement opaque version of setsyx() and getsyx().
-+
-+20070612
-+	+ corrected xterm+pcf2 terminfo modifiers for F1-F4, to match xterm
-+	  #226 -TD
-+	+ split-out key_name() from MKkeyname.awk since it now depends upon
-+	  wunctrl() which is not in libtinfo (report by Rong-En Fan).
-+
-+20070609
-+	+ add test/key_name.c
-+	+ add stdscr cases to test/inchs.c and test_inch_wide.c
-+	+ update test/configure
-+	+ correct formatting of DEL (0x7f) in _nc_vischar().
-+	+ null-terminate result of wunctrl().
-+	+ add null-pointer check in key_name() (report by Andreas Krennmair,
-+	  cf: 20020901).
-+
-+20070602
-+	+ adapt mouse-handling code from menu library in form-library
-+	  (discussion with Clive Nicolson).
-+	+ add a modification of test/dots.c, i.e., test/dots_mvcur.c to
-+	  illustrate how to use mvcur().
-+	+ modify wide-character flavor of SetAttr() to preserve the
-+	  WidecExt() value stored in the .attr field, e.g., in case it
-+	  is overwritten by chgat (report by Aleksi Torhamo).
-+	+ correct buffer-size for _nc_viswbuf2n() (report by Aleksi Torhamo).
-+	+ build-fixes for Solaris 2.6 and 2.7 (patch by Peter O'Gorman).
-+
-+20070526
-+	+ modify keyname() to use "^X" form only if meta() has been called, or
-+	  if keyname() is called without initializing curses, e.g., via
-+	  initscr() or newterm() (prompted by LinuxBase #1604).
-+	+ document some portability issues in man/curs_util.3x
-+	+ add a shadow copy of TTY buffer to _nc_prescreen to fix applications
-+	  broken by moving that data into SCREEN (cf: 20061230).
-+
-+20070512
-+	+ add 'O' (wide-character panel test) in ncurses.c to demonstrate a
-+	  problem reported by Sadrul H Chowdhury with repainting parts of
-+	  a fullwidth cell.
-+	+ modify slk_init() so that if there are preceding calls to
-+	  ripoffline(), those affect the available lines for soft-keys (adapted
-+	  from patch by Clive Nicolson).
-+	+ document some portability issues in man/curs_getyx.3x
-+
-+20070505
-+	+ fix a bug in Ada95/samples/ncurses which caused a variable to
-+	  become uninitialized in the "b" test.
-+	+ fix Ada95/gen/Makefile.in adahtml rule to account for recent
-+	  movement of files, fix a few incorrect manpage references in the
-+	  generated html.
-+	+ add Ada95 binding to _nc_freeall() as Curses_Free_All to help with
-+	  memory-checking.
-+	+ correct some functions in Ada95 binding which were using return value
-+	  from C where none was returned:  idcok(), immedok() and wtimeout().
-+	+ amend recent changes for Ada95 binding to make it build with
-+	  Cygwin's linker, e.g., with configure options
-+		--enable-broken-linker --with-ticlib
-+
-+20070428
-+	+ add a configure check for gcc's options for inlining, use that to
-+	  quiet a warning message where gcc's default behavior changed from
-+	  3.x to 4.x.
-+	+ improve warning message when checking if GPM is linked to curses
-+	  library by not warning if its use of "wgetch" is via a weak symbol.
-+	+ add loader options when building with static libraries to ensure that
-+	  an installed shared library for ncurses does not conflict.  This is
-+	  reported as problem with Tru64, but could affect other platforms
-+	  (report Martin Mokrejs, analysis by Tim Mooney).
-+	+ fix build on cygwin after recent ticlib/termlib changes, i.e.,
-+	  + adjust TINFO_SUFFIX value to work with cygwin's dll naming
-+	  + revert a change from 20070303 which commented out dependency of
-+	    SHLIB_LIST in form/menu/panel/c++ libraries.
-+	+ fix initialization of ripoff stack pointer (cf: 20070421).
-+
-+20070421
-+	+ move most static variables into structures _nc_globals and
-+	  _nc_prescreen, to simplify storage.
-+	+ add/use configure script macro CF_SIG_ATOMIC_T, use the corresponding
-+	  type for data manipulated by signal handlers (prompted by comments
-+	  in mailing.openbsd.bugs newsgroup).
-+	+ modify CF_WITH_LIBTOOL to allow one to pass options such as -static
-+	  to the libtool create- and link-operations.
-+
-+20070414
-+	+ fix whitespace in curs_opaque.3x which caused a spurious ';' in
-+	  the installed aliases (report by Peter Santoro).
-+	+ fix configure script to not try to generate adacurses-config when
-+	  Ada95 tree is not built.
-+
-+20070407
-+	+ add man/curs_legacy.3x, man/curs_opaque.3x
-+	+ fix acs_map binding for Ada95 when --enable-reentrant is used.
-+	+ add adacurses-config to the Ada95 install, based on version from
-+	  FreeBSD port, in turn by Juergen Pfeifer in 2000 (prompted by
-+	  comment on comp.lang.ada newsgroup).
-+	+ fix includes in c++ binding to build with Intel compiler
-+	  (cf: 20061209).
-+	+ update install rule in Ada95 to use mkdirs.sh
-+	> other fixes prompted by inspection for Coverity report:
-+	+ modify ifdef's for c++ binding to use try/catch/throw statements
-+	+ add a null-pointer check in tack/ansi.c request_cfss()
-+	+ fix a memory leak in ncurses/base/wresize.c
-+	+ corrected check for valid memu/meml capabilities in
-+	  progs/dump_entry.c when handling V_HPUX case.
-+	> fixes based on Coverity report:
-+	+ remove dead code in test/bs.c
-+	+ remove dead code in test/demo_defkey.c
-+	+ remove an unused assignment in progs/infocmp.c
-+	+ fix a limit check in tack/ansi.c tools_charset()
-+	+ fix tack/ansi.c tools_status() to perform the VT320/VT420
-+	  tests in request_cfss().  The function had exited too soon.
-+	+ fix a memory leak in tic.c's make_namelist()
-+	+ fix a couple of places in tack/output.c which did not check for EOF.
-+	+ fix a loop-condition in test/bs.c
-+	+ add index checks in lib_color.c for color palettes
-+	+ add index checks in progs/dump_entry.c for version_filter() handling
-+	  of V_BSD case.
-+	+ fix a possible null-pointer dereference in copywin()
-+	+ fix a possible null-pointer dereference in waddchnstr()
-+	+ add a null-pointer check in _nc_expand_try()
-+	+ add a null-pointer check in tic.c's make_namelist()
-+	+ add a null-pointer check in _nc_expand_try()
-+	+ add null-pointer checks in test/cardfile.c
-+	+ fix a double-free in ncurses/tinfo/trim_sgr0.c
-+	+ fix a double-free in ncurses/base/wresize.c
-+	+ add try/catch block to c++/cursesmain.cc
-+
-+20070331
-+	+ modify Ada95 binding to build with --enable-reentrant by wrapping
-+	  global variables (bug: acs_map does not yet work).
-+	+ modify Ada95 binding to use the new access-functions, allowing it
-+	  to build/run when NCURSES_OPAQUE is set.
-+	+ add access-functions and macros to return properties of the WINDOW
-+	  structure, e.g., when NCURSES_OPAQUE is set.
-+	+ improved install-sh's quoting.
-+	+ use mkdirs.sh rather than mkinstalldirs, e.g., to use fixes from
-+	  other programs.
-+
-+20070324
-+	+ eliminate part of the direct use of WINDOW data from Ada95 interface.
-+	+ fix substitutions for termlib filename to make configure option
-+	  --enable-reentrant work with --with-termlib.
-+	+ change a constructor for NCursesWindow to allow compiling with
-+	  NCURSES_OPAQUE set, since we cannot pass a reference to
-+	  an opaque pointer.
-+
-+20070317
-+	+ ignore --with-chtype=unsigned since unsigned is always added to
-+	  the type in curses.h; do the same for --with-mmask-t.
-+	+ change warning regarding --enable-ext-colors and wide-character
-+	  in the configure script to an error.
-+	+ tweak error message in CF_WITH_LIBTOOL to distinguish other programs
-+	  such as Darwin's libtool program (report by Michail Vidiassov)
-+	+ modify edit_man.sh to allow for multiple substitutions per line.
-+	+ set locale in misc/ncurses-config.in since it uses a range
-+	+ change permissions libncurses++.a install (report by Michail
-+	  Vidiassov).
-+	+ corrected length of temporary buffer in wide-character version
-+	  of set_field_buffer() (related to report by Bryan Christ).
-+
-+20070311
-+	+ fix mk-1st.awk script install_shlib() function, broken in 20070224
-+	  changes for cygwin (report by  Michail Vidiassov).
-+
-+20070310
-+	+ increase size of array in _nc_visbuf2n() to make "tic -v" work
-+	  properly in its similar_sgr() function (report/analysis by Peter
-+	  Santoro).
-+	+ add --enable-reentrant configure option for ongoing changes to
-+	  implement a reentrant version of ncurses:
-+	  + libraries are suffixed with "t"
-+	  + wrap several global variables (curscr, newscr, stdscr, ttytype,
-+	    COLORS, COLOR_PAIRS, COLS, ESCDELAY, LINES and TABSIZE) as
-+	    functions returning values stored in SCREEN or cur_term.
-+	  + move some initialization (LINES, COLS) from lib_setup.c,
-+	    i.e., setupterm() to _nc_setupscreen(), i.e., newterm().
-+
-+20070303
-+	+ regenerated html documentation.
-+	+ add NCURSES_OPAQUE symbol to curses.h, will use to make structs
-+	  opaque in selected configurations.
-+	+ move the chunk in lib_acs.c which resets acs capabilities when
-+	  running on a terminal whose locale interferes with those into
-+	  _nc_setupscreen(), so the libtinfo/libtinfow files can be made
-+	  identical (requested by Miroslav Lichvar).
-+	+ do not use configure variable SHLIB_LIBS for building libraries
-+	  outside the ncurses directory, since that symbol is customized
-+	  only for that directory, and using it introduces an unneeded
-+	  dependency on libdl (requested by Miroslav Lichvar).
-+	+ modify mk-1st.awk so the generated makefile rules for linking or
-+	  installing shared libraries do not first remove the library, in
-+	  case it is in use, e.g., libncurses.so by /bin/sh (report by Jeff
-+	  Chua).
-+	+ revised section "Using NCURSES under XTERM" in ncurses-intro.html
-+	  (prompted by newsgroup comment by Nick Guenther).
-+
-+20070224
-+	+ change internal return codes of _nc_wgetch() to check for cases
-+	  where KEY_CODE_YES should be returned, e.g., if a KEY_RESIZE was
-+	  ungetch'd, and read by wget_wch().
-+	+ fix static-library build broken in 20070217 changes to remove "-ldl"
-+	  (report by Miroslav Lichvar).
-+	+ change makefile/scripts for cygwin to allow building termlib.
-+	+ use Form_Hook in manpages to match form.h
-+	+ use Menu_Hook in manpages, as well as a few places in menu.h
-+	+ correct form- and menu-manpages to use specific Field_Options,
-+	  Menu_Options and Item_Options types.
-+	+ correct prototype for _tracechar() in manpage (cf: 20011229).
-+	+ correct prototype for wunctrl() in manpage.
-+
-+20070217
-+	+ fixes for $(TICS_LIST) in ncurses/Makefile (report by Miroslav
-+	  Lichvar).
-+	+ modify relinking of shared libraries to apply only when rpath is
-+	  enabled, and add --disable-relink option which can be used to
-+	  disable the feature altogether (reports by Michail Vidiassov,
-+	  Adam J Richter).
-+	+ fix --with-termlib option for wide-character configuration, stripping
-+	  the "w" suffix in one place (report by Miroslav Lichvar).
-+	+ remove "-ldl" from some library lists to reduce dependencies in
-+	  programs (report by Miroslav Lichvar).
-+	+ correct description of --enable-signed-char in configure --help
-+	  (report by Michail Vidiassov).
-+	+ add pattern for GNU/kFreeBSD configuration to CF_XOPEN_SOURCE,
-+	  which matches an earlier change to CF_SHARED_OPTS, from xterm #224
-+	  fixes.
-+	+ remove "${DESTDIR}" from -install_name option used for linking
-+	  shared libraries on Darwin (report by Michail Vidiassov).
-+
-+20070210
-+	+ add test/inchs.c, test_inch_wide.c, to test win_wchnstr().
-+	+ remove libdl from library list for termlib (report by Miroslav
-+	  Lichvar).
-+	+ fix configure.in to allow --without-progs --with-termlib (patch by
-+	  Miroslav Lichvar).
-+	+ modify win_wchnstr() to ensure that only a base cell is returned
-+	  for each multi-column character (prompted by report by Wei Kong
-+	  regarding change in mvwin_wch() cf: 20041023).
-+
-+20070203
-+	+ modify fix_wchnstr() in form library to strip attributes (and color)
-+	  from the cchar_t array (field cells) read from a field's window.
-+	  Otherwise, when copying the field cells back to the window, the
-+	  associated color overrides the field's background color (report by
-+	  Ricardo Cantu).
-+	+ improve tracing for form library, showing created forms, fields, etc.
-+	+ ignore --enable-rpath configure option if --with-shared was omitted.
-+	+ add _nc_leaks_tinfo(), _nc_free_tic(), _nc_free_tinfo() entrypoints
-+	  to allow leak-checking when both tic- and tinfo-libraries are built.
-+	+ drop CF_CPP_VSCAN_FUNC macro from configure script, since C++ binding
-+	  no longer relies on it.
-+	+ disallow combining configure script options --with-ticlib and
-+	  --enable-termcap (report by Rong-En Fan).
-+	+ remove tack from ncurses tree.
-+
-+20070128
-+	+ fix typo in configure script that broke --with-termlib option
-+	  (report by Rong-En Fan).
-+
-+20070127
-+	+ improve fix for FreeBSD gnu/98975, to allow for null pointer passed
-+	  to tgetent() (report by Rong-en Fan).
-+	+ update tack/HISTORY and tack/README to tell how to build it after
-+	  it is removed from the ncurses tree.
-+	+ fix configure check for libtool's version to trim blank lines
-+	  (report by sci-fi@hush.ai).
-+	+ review/eliminate other original-file artifacts in cursesw.cc, making
-+	  its license consistent with ncurses.
-+	+ use ncurses vw_scanw() rather than reading into a fixed buffer in
-+	  the c++ binding for scanw() methods (prompted by report by Nuno Dias).
-+	+ eliminate fixed-buffer vsprintf() calls in c++ binding.
-+
-+20070120
-+	+ add _nc_leaks_tic() to separate leak-checking of tic library from
-+	  term/ncurses libraries, and thereby eliminate a library dependency.
-+	+ fix test/mk-test.awk to ignore blank lines.
-+	+ correct paths in include/headers, for --srcdir (patch by Miroslav
-+	  Lichvar).
-+
-+20070113
-+	+ add a break-statement in misc/shlib to ensure that it exits on the
-+	  _first_ matched directory (report by Paul Novak).
-+	+ add tack/configure, which can be used to build tack outside the
-+	  ncurses build-tree.
-+	+ add --with-ticlib option, to build/install the tic-support functions
-+	  in a separate library (suggested by Miroslav Lichvar).
-+
-+20070106
-+	+ change MKunctrl.awk to reduce relocation table for unctrl.o
-+	+ change MKkeyname.awk to reduce relocation table for keyname.o
-+	  (patch by Miroslav Lichvar).
-+
-+20061230
-+	+ modify configure check for libtool's version to trim blank lines
-+	  (report by sci-fi@hush.ai).
-+	+ modify some modules to allow them to be reentrant if _REENTRANT is
-+	  defined: lib_baudrate.c, resizeterm.c (local data only)
-+	+ eliminate static data from some modules: add_tries.c, hardscroll.c,
-+	  lib_ttyflags.c, lib_twait.c
-+	+ improve manpage install to add aliases for the transformed program
-+	  names, e.g., from --program-prefix.
-+	+ used linklint to verify links in the HTML documentation, made fixes
-+	  to manpages as needed.
-+	+ fix a typo in curs_mouse.3x (report by William McBrine).
-+	+ fix install-rule for ncurses5-config to make the bin-directory.
-+
-+20061223
-+	+ modify configure script to omit the tic (terminfo compiler) support
-+	  from ncurses library if --without-progs option is given.
-+	+ modify install rule for ncurses5-config to do this via "install.libs"
-+	+ modify shared-library rules to allow FreeBSD 3.x to use rpath.
-+	+ update config.guess, config.sub
-+
- 20061217 5.6 release for upload to ftp.gnu.org
- 
--20061217 
-+20061217
- 	+ add ifdef's for <wctype.h> for HPUX, which has the corresponding
- 	  definitions in <wchar.h>.
- 	+ revert the va_copy() change from 20061202, since it was neither
-@@ -62,7 +741,7 @@
- 	+ modify configure --with-gpm option to allow it to accept a parameter,
- 	  i.e., the name of the dynamic GPM library to load via dlopen()
- 	  (requested by Bryan Henderson).
--	+ add configure option --with-valgrind (from vile).
-+	+ add configure option --with-valgrind, changes from vile.
- 	+ modify configure script AC_TRY_RUN and AC_TRY_LINK checks to use
- 	  'return' in preference to 'exit()'.
- 
-@@ -1524,7 +2203,8 @@
- 20031108
- 	+ add DJGPP to special case of DOS-style drive letters potentially
- 	  appearing in TERMCAP environment variable.
--	+ fix some spelling in comments (reports by jmc, Jonathon Gray).
-+	+ fix some spelling in comments (reports by Jason McIntyre, Jonathon
-+	  Gray).
- 	+ update config.guess, config.sub
- 
- 20031101
-@@ -1814,7 +2494,7 @@
- 	  "--srcdir" work (report by Warren L Dodge).
- 	+ correct missing definition of $(CC) in Ada95/gen/Makefile.in
- 	  (reported by Warren L Dodge <warrend@mdhost.cse.tek.com>).
--	+ fix typos and whitespace in manpages (patch by jmc
-+	+ fix typos and whitespace in manpages (patch by Jason McIntyre
- 	  <jmc@prioris.mini.pw.edu.pl>).
- 
- 20030503
-@@ -3449,7 +4129,7 @@
- 
- 20000923
- 	+ modify rs2 capability in xterm-r6 and similar where cursor
--	  save/restore bracketed the sequence for resetting video attributes. 
-+	  save/restore bracketed the sequence for resetting video attributes.
- 	  The cursor restore would undo that (report by John Hawkinson
- 	  <jhawk@MIT.EDU> (see NetBSD misc/11052)).
- 	+ using parameter check added to tic, corrected 27 typos in
-@@ -4266,7 +4946,7 @@
- 	  <bledp@voila.fr>)).
- 	+ change renaming of dft_fgbg.3x to use_default_colors.3ncurses in
- 	  man_db.renames, since Debian is not concerned with 14-character
--	  filename limitation (from Debian bug report by Josip Rodin
-+	  filename limitation (Debian bug report by Josip Rodin
- 	  <joy@cibalia.gkvk.hr>).
- 	+ corrected scoansi terminfo entry by testing with scoterm and console.
- 	+ revert change from 990614 to terminal_interface-curses-forms.ads.m4,
-@@ -5309,7 +5989,7 @@
- 
- 980321
- 	+ revise configure macro CF_SPEED_TYPE so that termcap.h has speed_t
--	  declared (from Adam J. Richter <adam@yggdrasil.com>)
-+	  declared (from Adam J Richter <adam@yggdrasil.com>)
- 	+ remove spurious curs_set() call from leaveok() (J T Conklin).
- 	+ corrected handling leaveok() in doupdate() (patch by Alexander V.
- 	  Lukyanov).
-diff -Naur ncurses-5.6.orig/TO-DO ncurses-5.6/TO-DO
---- ncurses-5.6.orig/TO-DO	2006-10-28 15:49:16.000000000 -0400
-+++ ncurses-5.6/TO-DO	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- -------------------------------------------------------------------------------
---- Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.               --
-+-- Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.               --
- --                                                                           --
- -- Permission is hereby granted, free of charge, to any person obtaining a   --
- -- copy of this software and associated documentation files (the             --
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: TO-DO,v 1.48 2006/10/28 19:49:16 tom Exp $
-+-- $Id: TO-DO,v 1.49 2007/02/03 16:29:17 tom Exp $
- -------------------------------------------------------------------------------
- 
- SHORT-TERM TO-DO ITEMS:
-@@ -58,9 +58,6 @@
- + The window classes defined in the c++ subdirectory need documentation.  Some
-   C++ programmer could earn a lot of good karma by doing this...
- 
--+ The resizeterm() function does not handle ripped-off lines such as that done
--  for the slk_XXX functions.
--
- + vid_attr() should support the set_a_attributes (sgr1) string, but does not. 
-   There appear to be no terminals that require that functionality.
- 
-@@ -75,19 +72,19 @@
-   ncurses/tty/lib_tstp.c .
- 
- + In theory, vwprintw and vwscanf are supposed to use the older varargs.h
--  interface for handling variadic argument lists.  Linux doesn't have
--  varargs.h, it has the newer X/Open-standard stdargs.h equivalent.  So these
--  functions use stdargs instead.  This is unlikely to be a problem unless
--  you're building ncurses on a System V old enough to only have varargs.h. 
--  (Solaris 2.5.1 uses the stdarg.h binding as well).
-+  interface for handling variadic argument lists (and are deprecated by X/Open
-+  for that reason).  Linux doesn't have varargs.h, it has the newer
-+  X/Open-standard stdargs.h equivalent.  So these functions use stdargs
-+  instead.  This is unlikely to be a problem unless you're building ncurses on
-+  a System V old enough to only have varargs.h.  (Solaris 2.5.1 used the
-+  stdarg.h binding as well).
- 
- + If you're using a BSD earlier than 4.4BSD, or a Linux old enough not to have
-   a native vsscanf(3) in its library, vwscanw() will not work.  You lose.  (It
-   should work on any System V, however).  If you want to fix this, add an
-   implementation to ncurses/vsscanf.c.
- 
--+ The C++ binding fails to build with a few C++ compilers, mainly with
--  configure script problems with vsscanf().
-++ The C++ binding fails to build with a few C++ compilers.
- 
- + terminfo.5 does not format with the SunOS (and most other platform's) tbl
-   utility because it relies on a diversion for each table entry.  Get the
-@@ -106,7 +103,7 @@
- 
- 1. Extended COSE conformance
- 
--There is an XPG4 standard recently released which describes a superset
-+There is an XPG4 standard released in 1996 which describes a superset
- of the SVr4 API.  The library is BASE conformant with this standard.
- We would like to make ncurses fully conformant at the EXTENDED level
- supporting internationalization.
-diff -Naur ncurses-5.6.orig/aclocal.m4 ncurses-5.6/aclocal.m4
---- ncurses-5.6.orig/aclocal.m4	2006-12-17 11:12:38.000000000 -0500
-+++ ncurses-5.6/aclocal.m4	2008-06-18 06:49:52.000000000 -0400
-@@ -1,5 +1,5 @@
- dnl***************************************************************************
--dnl Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+dnl Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
- dnl                                                                          *
- dnl Permission is hereby granted, free of charge, to any person obtaining a  *
- dnl copy of this software and associated documentation files (the            *
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: aclocal.m4,v 1.407 2006/12/17 16:12:38 tom Exp $
-+dnl $Id: aclocal.m4,v 1.448 2008/06/14 19:12:45 tom Exp $
- dnl Macros used in NCURSES auto-configuration script.
- dnl
- dnl These macros are maintained separately from NCURSES.  The copyright on
-@@ -168,6 +168,99 @@
- 
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_ADD_INCDIR version: 9 updated: 2008/02/09 13:15:34
-+dnl -------------
-+dnl Add an include-directory to $CPPFLAGS.  Don't add /usr/include, since it's
-+dnl redundant.  We don't normally need to add -I/usr/local/include for gcc,
-+dnl but old versions (and some misinstalled ones) need that.  To make things
-+dnl worse, gcc 3.x may give error messages if -I/usr/local/include is added to
-+dnl the include-path).
-+AC_DEFUN([CF_ADD_INCDIR],
-+[
-+if test -n "$1" ; then
-+  for cf_add_incdir in $1
-+  do
-+	while test $cf_add_incdir != /usr/include
-+	do
-+	  if test -d $cf_add_incdir
-+	  then
-+		cf_have_incdir=no
-+		if test -n "$CFLAGS$CPPFLAGS" ; then
-+		  # a loop is needed to ensure we can add subdirs of existing dirs
-+		  for cf_test_incdir in $CFLAGS $CPPFLAGS ; do
-+			if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then
-+			  cf_have_incdir=yes; break
-+			fi
-+		  done
-+		fi
-+
-+		if test "$cf_have_incdir" = no ; then
-+          if test "$cf_add_incdir" = /usr/local/include ; then
-+			if test "$GCC" = yes
-+			then
-+			  cf_save_CPPFLAGS=$CPPFLAGS
-+			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
-+			  AC_TRY_COMPILE([#include <stdio.h>],
-+				  [printf("Hello")],
-+				  [],
-+				  [cf_have_incdir=yes])
-+			  CPPFLAGS=$cf_save_CPPFLAGS
-+			fi
-+		  fi
-+		fi
-+
-+		if test "$cf_have_incdir" = no ; then
-+		  CF_VERBOSE(adding $cf_add_incdir to include-path)
-+		  ifelse($2,,CPPFLAGS,$2)="-I$cf_add_incdir $ifelse($2,,CPPFLAGS,[$]$2)"
-+
-+          cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
-+          test "$cf_top_incdir" = "$cf_add_incdir" && break
-+          cf_add_incdir="$cf_top_incdir"
-+		else
-+		  break
-+		fi
-+	  fi
-+	done
-+  done
-+fi
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_ADD_LIBDIR version: 6 updated: 2008/02/09 13:15:34
-+dnl -------------
-+dnl	Adds to the library-path
-+dnl
-+dnl	Some machines have trouble with multiple -L options.
-+dnl
-+dnl $1 is the (list of) directory(s) to add
-+dnl $2 is the optional name of the variable to update (default LDFLAGS)
-+dnl
-+AC_DEFUN([CF_ADD_LIBDIR],
-+[
-+if test -n "$1" ; then
-+  for cf_add_libdir in $1
-+  do
-+    if test $cf_add_libdir = /usr/lib ; then
-+      :
-+    elif test -d $cf_add_libdir
-+    then
-+      cf_have_libdir=no
-+      if test -n "$LDFLAGS$LIBS" ; then
-+        # a loop is needed to ensure we can add subdirs of existing dirs
-+        for cf_test_libdir in $LDFLAGS $LIBS ; do
-+          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-+            cf_have_libdir=yes; break
-+          fi
-+        done
-+      fi
-+      if test "$cf_have_libdir" = no ; then
-+        CF_VERBOSE(adding $cf_add_libdir to library-path)
-+        ifelse($2,,LDFLAGS,$2)="-L$cf_add_libdir $ifelse($2,,LDFLAGS,[$]$2)"
-+      fi
-+    fi
-+  done
-+fi
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_ANSI_CC_CHECK version: 9 updated: 2001/12/30 17:53:34
- dnl ----------------
- dnl This is adapted from the macros 'fp_PROG_CC_STDC' and 'fp_C_PROTOTYPES'
-@@ -220,7 +313,7 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_ANSI_CC_REQD version: 3 updated: 1997/09/06 13:40:44
-+dnl CF_ANSI_CC_REQD version: 4 updated: 2008/03/23 14:48:54
- dnl ---------------
- dnl For programs that must use an ANSI compiler, obtain compiler options that
- dnl will make it recognize prototypes.  We'll do preprocessor checks in other
-@@ -229,7 +322,7 @@
- AC_DEFUN([CF_ANSI_CC_REQD],
- [AC_REQUIRE([CF_ANSI_CC_CHECK])
- if test "$cf_cv_ansi_cc" = "no"; then
--	AC_ERROR(
-+	AC_MSG_ERROR(
- [Your compiler does not appear to recognize prototypes.
- You have the following choices:
- 	a. adjust your compiler options
-@@ -521,7 +614,7 @@
- test "$cf_cv_cgetent" = yes && AC_DEFINE(HAVE_BSD_CGETENT)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_CHECK_CACHE version: 10 updated: 2004/05/23 13:03:31
-+dnl CF_CHECK_CACHE version: 11 updated: 2008/03/23 14:45:59
- dnl --------------
- dnl Check if we're accidentally using a cache from a different machine.
- dnl Derive the system name, as a check for reusing the autoconf cache.
-@@ -552,7 +645,7 @@
- 
- if test ".$system_name" != ".$cf_cv_system_name" ; then
- 	AC_MSG_RESULT(Cached system name ($system_name) does not agree with actual ($cf_cv_system_name))
--	AC_ERROR("Please remove config.cache and try again.")
-+	AC_MSG_ERROR("Please remove config.cache and try again.")
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
-@@ -612,6 +705,50 @@
- 
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_CHECK_GPM_WGETCH version: 1 updated: 2007/04/28 14:38:06
-+dnl -------------------
-+dnl Check if GPM is already linked with curses.  If so - and if the linkage
-+dnl is not "weak" - warn about this because it can create problems linking
-+dnl applications with ncurses.
-+AC_DEFUN([CF_CHECK_GPM_WGETCH],[
-+AC_CHECK_LIB(gpm,Gpm_Wgetch,[
-+
-+AC_CACHE_CHECK(if GPM is weakly bound to curses library, cf_cv_check_gpm_wgetch,[
-+cf_cv_check_gpm_wgetch=unknown
-+if test "$cross_compiling" != yes ; then
-+
-+cat >conftest.$ac_ext <<CF_EOF
-+#include <gpm.h>
-+int main()
-+{
-+	Gpm_Wgetch();
-+	${cf_cv_main_return:-return}(0);
-+}
-+CF_EOF
-+
-+	cf_save_LIBS="$LIBS"
-+	# This only works if we can look at the symbol table.  If a shared
-+	# library is stripped for install, we cannot use that.  So we're forced
-+	# to rely on the static library, noting that some packagers may not
-+	# include it.
-+	LIBS="-static -lgpm -dynamic $LIBS"
-+	if AC_TRY_EVAL(ac_compile) ; then
-+		if AC_TRY_EVAL(ac_link) ; then
-+			cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[[vVwW]]\>'`
-+			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
-+			test -z "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=no
-+		fi
-+	fi
-+	rm -f conftest*
-+	LIBS="$cf_save_LIBS"
-+fi
-+])
-+
-+if test "$cf_cv_check_gpm_wgetch" != yes ; then
-+	AC_MSG_WARN(GPM library is already linked with curses - read the FAQ)
-+fi
-+])])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_CPP_PARAM_INIT version: 4 updated: 2001/04/07 22:31:18
- dnl -----------------
- dnl Check if the C++ compiler accepts duplicate parameter initialization.  This
-@@ -703,82 +840,36 @@
- test "$cf_cv_cpp_static_cast" = yes && AC_DEFINE(CPP_HAS_STATIC_CAST)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_CPP_VSCAN_FUNC version: 5 updated: 2001/12/02 01:39:28
--dnl -----------------
--dnl Check if the g++ compiler supports vscan function (not a standard feature).
--AC_DEFUN([CF_CPP_VSCAN_FUNC],
--[
--if test -n "$CXX"; then
--
--AC_LANG_SAVE
--AC_LANG_CPLUSPLUS
--AC_CHECK_HEADERS(strstream.h)
--
--AC_CACHE_CHECK(if $CXX supports vscan function,cf_cv_cpp_vscan_func,[
--	for cf_vscan_func in strstream strstream_cast stdio
--	do
--	case $cf_vscan_func in #(vi
--	stdio)		cf_vscan_defs=USE_STDIO_VSCAN ;; #(vi
--	strstream)	cf_vscan_defs=USE_STRSTREAM_VSCAN ;;
--	strstream_cast)	cf_vscan_defs=USE_STRSTREAM_VSCAN_CAST ;;
--	esac
--	AC_TRY_LINK([
--#include <stdio.h>
--#include <stdarg.h>
--#define $cf_vscan_defs 1
--#if defined(USE_STDIO_VSCAN)
--#elif defined(HAVE_STRSTREAM_H) && defined(USE_STRSTREAM_VSCAN)
--#include <strstream.h>
--#endif
--
--int scanw(const char* fmt, ...)
--{
--    int result = -1;
--    char buf[BUFSIZ];
--
--    va_list args;
--    va_start(args, fmt);
--#if defined(USE_STDIO_VSCAN)
--    if (::vsscanf(buf, fmt, args) != -1)
--	result = 0;
--#elif defined(USE_STRSTREAM_VSCAN)
--    strstreambuf ss(buf, sizeof(buf));
--    if (ss.vscan(fmt, args) != -1)
--	result = 0;
--#elif defined(USE_STRSTREAM_VSCAN_CAST)
--    strstreambuf ss(buf, sizeof(buf));
--    if (ss.vscan(fmt, (_IO_va_list)args) != -1)
--	result = 0;
--#else
--#error case $cf_vscan_func failed
--#endif
--    va_end(args);
--    return result;
--}
--],[int tmp, foo = scanw("%d", &tmp)],
--	[cf_cv_cpp_vscan_func=$cf_vscan_func; break],
--	[cf_cv_cpp_vscan_func=no])
--	test "$cf_cv_cpp_vscan_func" != no && break
--	done
--])
--
--AC_LANG_RESTORE
-+dnl CF_C_INLINE version: 2 updated: 2007/08/11 14:09:50
-+dnl -----------
-+dnl Check if the C compiler supports "inline".
-+dnl $1 is the name of a shell variable to set if inline is supported
-+dnl $2 is the threshold for gcc 4.x's option controlling maximum inline size
-+AC_DEFUN([CF_C_INLINE],[
-+AC_C_INLINE
-+$1=
-+if test "$ac_cv_c_inline" != no ; then
-+  $1=inline
-+  if test "$INTEL_COMPILER" = yes
-+  then
-+    :
-+  elif test "$GCC" = yes
-+  then
-+    AC_CACHE_CHECK(if gcc supports options to tune inlining,cf_cv_gcc_inline,[
-+      cf_save_CFLAGS=$CFLAGS
-+      CFLAGS="$CFLAGS --param max-inline-insns-single=$2"
-+      AC_TRY_COMPILE([inline int foo(void) { return 1; }],
-+      [${cf_cv_main_return:-return} foo()],
-+      [cf_cv_gcc_inline=yes],
-+      [cf_cv_gcc_inline=no])
-+      CFLAGS=$cf_save_CFLAGS
-+    ])
-+    if test "$cf_cv_gcc_inline" = yes ; then
-+        CF_ADD_CFLAGS([--param max-inline-insns-single=$2])
-+    fi
-+  fi
- fi
--
--case $cf_cv_cpp_vscan_func in #(vi
--stdio) #(vi
--	AC_DEFINE(CPP_HAS_VSCAN_FUNC)
--	AC_DEFINE(USE_STDIO_VSCAN)
--	;;
--strstream)
--	AC_DEFINE(CPP_HAS_VSCAN_FUNC)
--	AC_DEFINE(USE_STRSTREAM_VSCAN)
--	;;
--strstream_cast)
--	AC_DEFINE(CPP_HAS_VSCAN_FUNC)
--	AC_DEFINE(USE_STRSTREAM_VSCAN_CAST)
--	;;
--esac
-+AC_SUBST($1)
- ])dnl
- dnl ---------------------------------------------------------------------------
- dnl CF_DIRNAME version: 4 updated: 2002/12/21 19:25:52
-@@ -967,6 +1058,34 @@
- test "$cf_cv_func_nanosleep" = "yes" && AC_DEFINE(HAVE_NANOSLEEP)
- ])
- dnl ---------------------------------------------------------------------------
-+dnl CF_FUNC_OPENPTY version: 2 updated: 2008/04/12 19:49:01
-+dnl ---------------
-+dnl Check for openpty() function, along with <pty.h> header.  It may need the
-+dnl "util" library as well.
-+AC_DEFUN([CF_FUNC_OPENPTY],
-+[
-+AC_CHECK_LIB(util,openpty,cf_cv_lib_util=yes,cf_cv_lib_util=no)
-+AC_CACHE_CHECK(for openpty header,cf_cv_func_openpty,[
-+    cf_save_LIBS="$LIBS"
-+    test $cf_cv_lib_util = yes && LIBS="-lutil $LIBS"
-+    for cf_header in pty.h libutil.h util.h
-+    do
-+    AC_TRY_LINK([
-+#include <$cf_header>
-+],[
-+    int x = openpty((int *)0, (int *)0, (char *)0,
-+                   (struct termios *)0, (struct winsize *)0);
-+],[
-+        cf_cv_func_openpty=$cf_header
-+        break
-+],[
-+        cf_cv_func_openpty=no
-+])
-+    done
-+    LIBS="$cf_save_LIBS"
-+])
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_FUNC_POLL version: 4 updated: 2006/12/16 12:33:30
- dnl ------------
- dnl See if the poll function really works.  Some platforms have poll(), but
-@@ -1070,7 +1189,7 @@
- 
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_GCC_ATTRIBUTES version: 10 updated: 2005/05/28 13:16:28
-+dnl CF_GCC_ATTRIBUTES version: 11 updated: 2007/07/29 09:55:12
- dnl -----------------
- dnl Test for availability of useful gcc __attribute__ directives to quiet
- dnl compiler warnings.  Though useful, not all are supported -- and contrary
-@@ -1097,7 +1216,7 @@
- then
- 	AC_CHECKING([for $CC __attribute__ directives])
- cat > conftest.$ac_ext <<EOF
--#line __oline__ "configure"
-+#line __oline__ "${as_me-configure}"
- #include "confdefs.h"
- #include "conftest.h"
- #include "conftest.i"
-@@ -1159,7 +1278,7 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_GCC_WARNINGS version: 20 updated: 2005/08/06 18:37:29
-+dnl CF_GCC_WARNINGS version: 22 updated: 2007/07/29 09:55:12
- dnl ---------------
- dnl Check if the compiler supports useful warning options.  There's a few that
- dnl we don't use, simply because they're too noisy:
-@@ -1184,7 +1303,7 @@
- CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
- 
- cat > conftest.$ac_ext <<EOF
--#line __oline__ "configure"
-+#line __oline__ "${as_me-configure}"
- int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == 0) ; }
- EOF
- 
-@@ -1205,7 +1324,7 @@
- 	AC_CHECKING([for $CC warning options])
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS="-Wall"
--	for cf_opt in $1 \
-+	for cf_opt in \
- 		wd1419 \
- 		wd1682 \
- 		wd1683 \
-@@ -1561,11 +1680,24 @@
- AC_SUBST(EXTRA_CXXFLAGS)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_HASHED_DB version: 1 updated: 2006/08/19 09:16:14
-+dnl CF_HASHED_DB version: 3 updated: 2007/11/24 17:43:37
- dnl ------------
- dnl Look for an instance of the Berkeley hashed database.
-+dnl
-+dnl $1 = optional parameter, to specify install-prefix for the database.
- AC_DEFUN([CF_HASHED_DB],
- [
-+ifelse([$1],,,[
-+case $1 in #(vi
-+yes|*able*) #(vi
-+    ;;
-+*)
-+    if test -d "$1" ; then
-+        CF_ADD_INCDIR($1/include)
-+        CF_ADD_LIBDIR($1/lib)
-+    fi
-+esac
-+])
- AC_CHECK_HEADER(db.h,[
- CF_HASHED_DB_VERSION
- if test "$cf_cv_hashed_db_version" = unknown ; then
-@@ -1583,7 +1715,7 @@
- ])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_HASHED_DB_LIBS version: 6 updated: 2006/12/16 12:33:30
-+dnl CF_HASHED_DB_LIBS version: 7 updated: 2007/12/01 15:01:37
- dnl -----------------
- dnl Given that we have the header and version for hashed database, find the
- dnl library information.
-@@ -1591,7 +1723,7 @@
- [
- AC_CACHE_CHECK(for db libraries, cf_cv_hashed_db_libs,[
- cf_cv_hashed_db_libs=unknown
--for cf_db_libs in db$cf_cv_hashed_db_version db ''
-+for cf_db_libs in db$cf_cv_hashed_db_version db-$cf_cv_hashed_db_version db ''
- do
- 	cf_save_libs="$LIBS"
- 	if test -n "$cf_db_libs"; then
-@@ -1655,7 +1787,7 @@
- ])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_HASHED_DB_VERSION version: 2 updated: 2006/08/19 15:12:49
-+dnl CF_HASHED_DB_VERSION version: 3 updated: 2007/12/01 15:01:37
- dnl --------------------
- dnl Given that we have the header file for hashed database, find the version
- dnl information.
-@@ -1664,7 +1796,7 @@
- AC_CACHE_CHECK(for version of db, cf_cv_hashed_db_version,[
- cf_cv_hashed_db_version=unknown
- 
--for cf_db_version in 1 2 3 4
-+for cf_db_version in 1 2 3 4 5
- do
- 	CF_MSG_LOG(checking for db version $cf_db_version)
- 	AC_TRY_COMPILE([
-@@ -1778,7 +1910,7 @@
- test "$cf_cv_have_isascii" = yes && AC_DEFINE(HAVE_ISASCII)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_LARGEFILE version: 6 updated: 2006/09/23 19:07:52
-+dnl CF_LARGEFILE version: 7 updated: 2007/06/02 11:58:50
- dnl ------------
- dnl Add checks for large file support.
- AC_DEFUN([CF_LARGEFILE],[
-@@ -1796,6 +1928,7 @@
- 	# the config.h
- 	test "$ac_cv_sys_large_files"      != no && CPPFLAGS="$CPPFLAGS -D_LARGE_FILES "
- 	test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
-+	test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
- 
- 	AC_CACHE_CHECK(whether to use struct dirent64, cf_cv_struct_dirent64,[
- 		AC_TRY_COMPILE([
-@@ -1816,6 +1949,48 @@
- ])
- ])
- dnl ---------------------------------------------------------------------------
-+dnl CF_LDFLAGS_STATIC version: 2 updated: 2007/04/28 15:25:27
-+dnl -----------------
-+dnl Check for compiler/linker flags used to temporarily force usage of static
-+dnl libraries.  This depends on the compiler and platform.  Use this to help
-+dnl ensure that the linker picks up a given library based on its position in
-+dnl the list of linker options and libraries.
-+AC_DEFUN([CF_LDFLAGS_STATIC],[
-+
-+if test "$GCC" = yes ; then
-+	LDFLAGS_STATIC=-static
-+	LDFLAGS_SHARED=-dynamic
-+else
-+	case $cf_cv_system_name in #(
-+	aix[[45]]*) 	#( from ld manpage
-+		LDFLAGS_STATIC=-bstatic
-+		LDFLAGS_SHARED=-bdynamic
-+		;;
-+	hpux*)		#( from ld manpage for hpux10.20, hpux11.11
-+		# We could also use just "archive" and "shared".
-+		LDFLAGS_STATIC=-Wl,-a,archive_shared
-+		LDFLAGS_SHARED=-Wl,-a,shared_archive
-+		;;
-+	irix*)		#( from ld manpage IRIX64
-+		LDFLAGS_STATIC=-Bstatic
-+		LDFLAGS_SHARED=-Bdynamic
-+		;;
-+	osf[[45]]*)	#( from ld manpage osf4.0d, osf5.1
-+		# alternative "-oldstyle_liblookup" (not in cc manpage)
-+		LDFLAGS_STATIC=-noso 
-+		LDFLAGS_SHARED=-so_archive
-+		;;
-+	solaris2*)
-+		LDFLAGS_STATIC=-Bstatic
-+		LDFLAGS_SHARED=-Bdynamic
-+		;;
-+	esac
-+fi
-+
-+AC_SUBST(LDFLAGS_STATIC)
-+AC_SUBST(LDFLAGS_SHARED)
-+])
-+dnl ---------------------------------------------------------------------------
- dnl CF_LIBUTF8 version: 2 updated: 2002/01/19 22:51:32
- dnl ----------
- dnl Check for libutf8
-@@ -1852,11 +2027,11 @@
- 	AC_SUBST(LIB_PREFIX)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_LIB_RULES version: 40 updated: 2006/10/14 15:23:15
-+dnl CF_LIB_RULES version: 50 updated: 2007/03/24 18:26:59
- dnl ------------
- dnl Append definitions and rules for the given models to the subdirectory
- dnl Makefiles, and the recursion rule for the top-level Makefile.  If the
--dnl subdirectory is a library-source directory, modify the LIBRARIES list in
-+dnl subdirectory is a library-source directory, modify the LIBS_TO_MAKE list in
- dnl the corresponding makefile to list the models that we'll generate.
- dnl
- dnl For shared libraries, make a list of symbolic links to construct when
-@@ -1875,7 +2050,6 @@
- 		continue
- 	elif test -f $srcdir/$cf_dir/modules; then
- 
--		IMPORT_LIB=
- 		SHARED_LIB=
- 		LIBS_TO_MAKE=
- 		for cf_item in $cf_LIST_MODELS
-@@ -1922,9 +2096,7 @@
- 			# use autodetected ${cf_prefix} for import lib and static lib, but
- 			# use 'cyg' prefix for shared lib.
- 			if test $cf_cv_shlib_version = cygdll ; then
--				SHARED_LIB="cyg${cf_dir}\${ABI_VERSION}.dll"
--				IMPORT_LIB="${cf_prefix}${cf_dir}.dll.a"
--				LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/\${SHARED_LIB} ../lib/\${IMPORT_LIB}"
-+				LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/cyg${cf_dir}\${ABI_VERSION}.dll"
- 				continue
- 			fi
- 			fi
-@@ -1933,17 +2105,34 @@
- 
- 		if test $cf_dir = ncurses ; then
- 			cf_subsets="$LIB_SUBSETS"
--			cf_termlib=`echo "$cf_subsets" |sed -e 's/ .*$//'`
--			if test "$cf_termlib" != "$cf_subsets" ; then
--				cf_item=`echo $LIBS_TO_MAKE |sed -e s%${LIB_NAME}${LIB_SUFFIX}%${TINFO_LIB_SUFFIX}%g`
--				LIBS_TO_MAKE="$cf_item $LIBS_TO_MAKE"
--			fi
-+			cf_r_parts="$cf_subsets"
-+
-+			while test -n "$cf_r_parts"
-+			do
-+				cf_l_parts=`echo "$cf_r_parts" |sed -e 's/ .*$//'`
-+				cf_r_parts=`echo "$cf_r_parts" |sed -e 's/^[[^ ]]* //'`
-+				if test "$cf_l_parts" != "$cf_r_parts" ; then
-+					case $cf_l_parts in #(vi
-+					*termlib*) #(vi
-+						cf_item=`echo $LIBS_TO_MAKE |sed -e s%${LIB_NAME}${LIB_SUFFIX}%${TINFO_LIB_SUFFIX}%g`
-+						;;
-+					*ticlib*)
-+						cf_item=`echo $LIBS_TO_MAKE |sed -e s%${LIB_NAME}${LIB_SUFFIX}%${TICS_LIB_SUFFIX}%g`
-+						;;
-+					*)
-+						break
-+						;;
-+					esac
-+					LIBS_TO_MAKE="$cf_item $LIBS_TO_MAKE"
-+				else
-+					break
-+				fi
-+			done
- 		else
- 			cf_subsets=`echo "$LIB_SUBSETS" | sed -e 's/^termlib.* //'`
- 		fi
- 
- 		sed -e "s%@LIBS_TO_MAKE@%$LIBS_TO_MAKE%" \
--		    -e "s%@IMPORT_LIB@%$IMPORT_LIB%" \
- 		    -e "s%@SHARED_LIB@%$SHARED_LIB%" \
- 			$cf_dir/Makefile >$cf_dir/Makefile.out
- 		mv $cf_dir/Makefile.out $cf_dir/Makefile
-@@ -1968,13 +2157,20 @@
- 				case $cf_subset in
- 				*base*)
- 					;;
--				termlib*)
-+				*termlib*)
- 					cf_libname=$TINFO_LIB_SUFFIX
- 					if test -n "${DFT_ARG_SUFFIX}" ; then
- 						# undo $LIB_SUFFIX add-on in CF_LIB_SUFFIX
- 						cf_suffix=`echo $cf_suffix |sed -e "s%^${LIB_SUFFIX}%%"`
- 					fi
--				;;
-+					;;
-+				ticlib*)
-+					cf_libname=$TICS_LIB_SUFFIX
-+					if test -n "${DFT_ARG_SUFFIX}" ; then
-+						# undo $LIB_SUFFIX add-on in CF_LIB_SUFFIX
-+						cf_suffix=`echo $cf_suffix |sed -e "s%^${LIB_SUFFIX}%%"`
-+					fi
-+					;;
- 				esac
- 			fi
- 
-@@ -2015,8 +2211,11 @@
- 				prefix=$cf_prefix \
- 				suffix=$cf_suffix \
- 				subset=$cf_subset \
-+				TermlibRoot=$TINFO_NAME \
-+				TermlibSuffix=$TINFO_SUFFIX \
- 				ShlibVer=$cf_cv_shlib_version \
- 				ShlibVerInfix=$cf_cv_shlib_version_infix \
-+				ReLink=${cf_cv_do_relink-no} \
- 				DoLinks=$cf_cv_do_symlinks \
- 				rmSoLocs=$cf_cv_rm_so_locs \
- 				ldconfig="$LDCONFIG" \
-@@ -2103,8 +2302,8 @@
- 
- cat >> Makefile <<CF_EOF
- 
--install.data \\
--uninstall.data ::
-+install.libs uninstall.libs \\
-+install.data uninstall.data ::
- $MAKE_TERMINFO	cd misc && \${MAKE} \${CF_MFLAGS} \[$]@
- 
- install.man \\
-@@ -2113,7 +2312,7 @@
- 
- distclean ::
- 	rm -f config.cache config.log config.status Makefile include/ncurses_cfg.h
--	rm -f headers.sh headers.sed
-+	rm -f headers.sh headers.sed mk_shared_lib.sh
- 	rm -rf \${DIRS_TO_MAKE}
- CF_EOF
- 
-@@ -2224,41 +2423,10 @@
- 	fi
- 
- 	if test -f $srcdir/$cf_dir/headers; then
--	cat >>$cf_dir/Makefile <<CF_EOF
--\${DESTDIR}\${includedir} :
--	sh \${srcdir}/../mkinstalldirs \[$]@
--
--install \\
--install.libs \\
--install.includes :: \${AUTO_SRC} \${DESTDIR}\${includedir} \\
--CF_EOF
--		j=""
--		for i in `cat $srcdir/$cf_dir/headers |fgrep -v "#"`
--		do
--			test -n "$j" && echo "		$j \\" >>$cf_dir/Makefile
--			j=$i
--		done
--
--		echo "		$j" >>$cf_dir/Makefile
--
--		for i in `cat $srcdir/$cf_dir/headers |fgrep -v "#"`
--		do
--			echo "	@ (cd \${DESTDIR}\${includedir} && rm -f `basename $i`) ; ../headers.sh \${INSTALL_DATA} \${DESTDIR}\${includedir} \${srcdir} $i" >>$cf_dir/Makefile
--			test $i = curses.h && test $WITH_CURSES_H = yes && echo "	@ (cd \${DESTDIR}\${includedir} && rm -f ncurses.h && \${LN_S} curses.h ncurses.h)" >>$cf_dir/Makefile
--		done
--
--	cat >>$cf_dir/Makefile <<CF_EOF
--
--uninstall \\
--uninstall.libs \\
--uninstall.includes ::
--CF_EOF
--		for i in `cat $srcdir/$cf_dir/headers |fgrep -v "#"`
--		do
--			i=`basename $i`
--			echo "	-@ (cd \${DESTDIR}\${includedir} && rm -f $i)" >>$cf_dir/Makefile
--			test $i = curses.h && echo "	-@ (cd \${DESTDIR}\${includedir} && rm -f ncurses.h)" >>$cf_dir/Makefile
--		done
-+		$AWK -f $srcdir/mk-hdr.awk \
-+			subset="$LIB_SUBSETS" \
-+			compat="$WITH_CURSES_H" \
-+			$srcdir/$cf_dir/headers >>$cf_dir/Makefile
- 	fi
- 
- 	if test -f $srcdir/$cf_dir/modules; then
-@@ -2776,7 +2944,7 @@
- AC_MSG_RESULT($MANPAGE_TBL)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_MAN_PAGES version: 31 updated: 2006/12/09 12:27:08
-+dnl CF_MAN_PAGES version: 35 updated: 2007/03/31 11:47:29
- dnl ------------
- dnl Try to determine if the man-pages on the system are compressed, and if
- dnl so, what format is used.  Use this information to construct a script that
-@@ -2826,6 +2994,7 @@
- esac
- 
- cf_edit_man=./edit_man.sh
-+cf_man_alias=`pwd`/man_alias.sed
- 
- cat >$cf_edit_man <<CF_EOF
- #! /bin/sh
-@@ -2841,7 +3010,7 @@
- NCURSES_OSPEED="$NCURSES_OSPEED"
- TERMINFO="$TERMINFO"
- 
--MKDIRS="sh `cd $srcdir && pwd`/mkinstalldirs"
-+MKDIRS="sh `cd $srcdir && pwd`/mkdirs.sh"
- 
- INSTALL="$INSTALL"
- INSTALL_DATA="$INSTALL_DATA"
-@@ -2889,6 +3058,32 @@
- 		\$MKDIRS \$cf_subdir\$section
- 	fi
- 	fi
-+
-+	# replace variables in man page
-+	if test ! -f $cf_man_alias ; then
-+cat >>$cf_man_alias <<-CF_EOF2
-+		s,@DATADIR@,\$datadir,g
-+		s,@TERMINFO@,\$TERMINFO,g
-+		s,@NCURSES_MAJOR@,\$NCURSES_MAJOR,g
-+		s,@NCURSES_MINOR@,\$NCURSES_MINOR,g
-+		s,@NCURSES_PATCH@,\$NCURSES_PATCH,g
-+		s,@NCURSES_OSPEED@,\$NCURSES_OSPEED,g
-+CF_EOF
-+	ifelse($1,,,[
-+	for cf_name in $1
-+	do
-+		cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-+		cf_name=`echo $cf_name|sed "$program_transform_name"`
-+cat >>$cf_edit_man <<-CF_EOF
-+		s,@$cf_NAME@,$cf_name,
-+CF_EOF
-+	done
-+	])
-+cat >>$cf_edit_man <<CF_EOF
-+CF_EOF2
-+		echo "...made $cf_man_alias"
-+	fi
-+
- 	aliases=
- 	cf_source=\`basename \$i\`
- 	inalias=\$cf_source
-@@ -2901,7 +3096,7 @@
- 
- if test "$MANPAGE_ALIASES" != no ; then
- cat >>$cf_edit_man <<CF_EOF
--	aliases=\`sed -f \$top_srcdir/man/manlinks.sed \$inalias | sort -u\`
-+	aliases=\`sed -f \$top_srcdir/man/manlinks.sed \$inalias |sed -f $cf_man_alias | sort -u\`
- CF_EOF
- fi
- 
-@@ -2922,36 +3117,13 @@
- 		cf_target="\$cf_source"
- 	fi
- 	cf_target="\$cf_subdir\${section}/\${cf_target}"
--CF_EOF
--fi
- 
--	# replace variables in man page
--	ifelse($1,,,[
--	for cf_name in $1
--	do
--cat >>$cf_edit_man <<CF_EOF
--	prog_$cf_name=\`echo $cf_name|sed "\${transform}"\`
--CF_EOF
--	done
--	])
--cat >>$cf_edit_man <<CF_EOF
--	sed	-e "s,@DATADIR@,\$datadir," \\
--		-e "s,@TERMINFO@,\$TERMINFO," \\
--		-e "s,@NCURSES_MAJOR@,\$NCURSES_MAJOR," \\
--		-e "s,@NCURSES_MINOR@,\$NCURSES_MINOR," \\
--		-e "s,@NCURSES_PATCH@,\$NCURSES_PATCH," \\
--		-e "s,@NCURSES_OSPEED@,\$NCURSES_OSPEED," \\
- CF_EOF
-+fi
- 
--	ifelse($1,,,[
--	for cf_name in $1
--	do
--		cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
- cat >>$cf_edit_man <<CF_EOF
--		-e "s,@$cf_NAME@,\$prog_$cf_name," \\
-+	sed	-f $cf_man_alias \\
- CF_EOF
--	done
--	])
- 
- if test -f $MANPAGE_RENAMES ; then
- cat >>$cf_edit_man <<CF_EOF
-@@ -3012,6 +3184,7 @@
- 	if test \$verb = installing ; then
- 		echo \$verb \$cf_target
- 		\$INSTALL_DATA \$TMP \$cf_target
-+		test -d \$cf_subdir\${section} &&
- 		test -n "\$aliases" && (
- 			cd \$cf_subdir\${section} && (
- 				cf_source=\`echo \$cf_target |sed -e 's%^.*/\([[^/]][[^/]]*/[[^/]][[^/]]*$\)%\1%'\`
-@@ -3053,8 +3226,11 @@
- 			)
- 		)
- 	elif test \$verb = removing ; then
--		echo \$verb \$cf_target
--		rm -f \$cf_target
-+		test -f \$cf_target && (
-+			echo \$verb \$cf_target
-+			rm -f \$cf_target
-+		)
-+		test -d \$cf_subdir\${section} &&
- 		test -n "\$aliases" && (
- 			cd \$cf_subdir\${section} && (
- 				for cf_alias in \$aliases
-@@ -3192,12 +3368,12 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_MSG_LOG version: 3 updated: 1997/09/07 14:05:52
-+dnl CF_MSG_LOG version: 4 updated: 2007/07/29 09:55:12
- dnl ----------
- dnl Write a debug message to config.log, along with the line number in the
- dnl configure script.
- AC_DEFUN([CF_MSG_LOG],[
--echo "(line __oline__) testing $* ..." 1>&AC_FD_CC
-+echo "${as_me-configure}:__oline__: testing $* ..." 1>&AC_FD_CC
- ])dnl
- dnl ---------------------------------------------------------------------------
- dnl CF_NCURSES_ABI_6 version: 1 updated: 2005/09/17 18:42:49
-@@ -3297,7 +3473,7 @@
- 	AC_SUBST(PATHSEP)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_PATH_SYNTAX version: 11 updated: 2006/09/02 08:55:46
-+dnl CF_PATH_SYNTAX version: 12 updated: 2008/03/23 14:45:59
- dnl --------------
- dnl Check the argument to see that it looks like a pathname.  Rewrite it if it
- dnl begins with one of the prefix/exec_prefix variables, and then again if the
-@@ -3329,7 +3505,7 @@
-   $1=`echo [$]$1 | sed -e s%NONE%$cf_path_syntax%`
-   ;;
- *)
--  ifelse($2,,[AC_ERROR([expected a pathname, not \"[$]$1\"])],$2)
-+  ifelse($2,,[AC_MSG_ERROR([expected a pathname, not \"[$]$1\"])],$2)
-   ;;
- esac
- ])dnl
-@@ -3680,7 +3856,73 @@
- 		-e 's/-[[UD]]$3\(=[[^ 	]]*\)\?[$]//g'`
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_SHARED_OPTS version: 41 updated: 2006/12/09 12:32:00
-+dnl CF_REMOVE_LIB version: 1 updated: 2007/02/17 14:11:52
-+dnl -------------
-+dnl Remove the given library from the symbol
-+dnl
-+dnl $1 = target (which could be the same as the source variable)
-+dnl $2 = source (including '$')
-+dnl $3 = library to remove
-+define([CF_REMOVE_LIB],
-+[
-+# remove $3 library from $2
-+$1=`echo "$2" | sed -e 's/-l$3[[ 	]]//g' -e 's/-l$3[$]//'`
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_RPATH_HACK version: 3 updated: 2007/12/01 11:14:13
-+dnl -------------
-+AC_DEFUN([CF_RPATH_HACK],
-+[
-+AC_REQUIRE([CF_SHARED_OPTS])
-+AC_MSG_CHECKING(for updated LDFLAGS)
-+if test -n "$LDFLAGS" ; then
-+AC_MSG_RESULT(maybe)
-+CF_VERBOSE(...checking LDFLAGS $LDFLAGS)
-+CF_VERBOSE(...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS)
-+case "$EXTRA_LDFLAGS" in #(vi
-+-Wl,-rpath,*) #(vi
-+    cf_rpath_hack="-Wl,-rpath,"
-+    ;;
-+-R\ *)
-+    cf_rpath_hack="-R "
-+    ;;
-+-R*)
-+    cf_rpath_hack="-R"
-+    ;;
-+*)
-+    cf_rpath_hack=
-+    ;;
-+esac
-+if test -n "$cf_rpath_hack" ; then
-+    cf_rpath_dst=
-+    for cf_rpath_src in $LDFLAGS
-+    do
-+        CF_VERBOSE(Filtering $cf_rpath_src)
-+        case $cf_rpath_src in #(vi
-+        -L*) #(vi
-+            if test "$cf_rpath_hack" = "-R " ; then
-+                cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e 's%-L%-R %'`
-+            else
-+                cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e s%-L%$cf_rpath_hack%`
-+            fi
-+            CF_VERBOSE(...Filter $cf_rpath_tmp)
-+            EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
-+            ;;
-+        *)
-+            cf_rpath_dst="$cf_rpath_dst $cf_rpath_src"
-+            ;;
-+        esac
-+    done
-+    LDFLAGS=$cf_rpath_dst
-+    CF_VERBOSE(...checked LDFLAGS $LDFLAGS)
-+    CF_VERBOSE(...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS)
-+fi
-+else
-+AC_MSG_RESULT(no)
-+fi
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_SHARED_OPTS version: 48 updated: 2008/06/14 15:08:17
- dnl --------------
- dnl --------------
- dnl Attempt to determine the appropriate CC/LD options for creating a shared
-@@ -3726,7 +3968,7 @@
- 		cf_cv_shlib_version=$withval
- 		;;
- 	*)
--		AC_ERROR([option value must be one of: rel, abi, auto or no])
-+		AC_MSG_ERROR([option value must be one of: rel, abi, auto or no])
- 		;;
- 	esac
- 	],[cf_cv_shlib_version=auto])
-@@ -3757,14 +3999,27 @@
- 		;;
- 	cygwin*)
- 		CC_SHARED_OPTS=
--		MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,--out-implib=../lib/${IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/${SHARED_LIB}'
-+		MK_SHARED_LIB='sh ../mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
- 		cf_cv_shlib_version=cygdll
- 		cf_cv_shlib_version_infix=cygdll
-+		cat >mk_shared_lib.sh <<-CF_EOF
-+		#!/bin/sh
-+		SHARED_LIB=\[$]1
-+		IMPORT_LIB=\`echo "\[$]1" | sed -e 's/cyg/lib/' -e 's/[[0-9]]*\.dll[$]/.dll.a/'\`
-+		shift
-+		cat <<-EOF
-+		Linking shared library
-+		** SHARED_LIB \[$]SHARED_LIB
-+		** IMPORT_LIB \[$]IMPORT_LIB
-+EOF
-+		exec \[$]* -shared -Wl,--out-implib=../lib/\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\[$]{SHARED_LIB}
-+CF_EOF
-+		chmod +x mk_shared_lib.sh 
- 		;;
- 	darwin*)
- 		EXTRA_CFLAGS="-no-cpp-precomp"
- 		CC_SHARED_OPTS="-dynamic"
--		MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${DESTDIR}${libdir}/`basename $[@]` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $[@]'
-+		MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $[@]` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $[@]'
- 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
- 		cf_cv_shlib_version_infix=yes
- 		AC_CACHE_CHECK([if ld -search_paths_first works], cf_cv_ldflags_search_paths_first, [
-@@ -3818,11 +4073,11 @@
- 		CF_SHARED_SONAME
- 		MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_shared_soname',-stats,-lc -o $[@]'
- 		;;
--	openbsd2*)
-+	openbsd[[2-9]].*)
- 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
- 		MK_SHARED_LIB='${LD} -Bshareable -soname,`basename $[@].${ABI_VERSION}` -o $[@]'
- 		;;
--	openbsd*|freebsd[[23]]*)
-+	openbsd*|freebsd[[12]].*)
- 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
- 		MK_SHARED_LIB='${LD} -Bshareable -o $[@]'
- 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
-@@ -3903,9 +4158,7 @@
- 		;;
- 	solaris2*)
- 		# tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2
--		if test "$GCC" != yes; then
--			CC_SHARED_OPTS='-KPIC'
--		fi
-+		# tested with SunOS 5.10 (solaris 10) and gcc 3.4.3
- 		if test "$DFT_LWR_MODEL" = "shared" ; then
- 			LOCAL_LDFLAGS="-R \$(LOCAL_LIBDIR):\${libdir}"
- 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
-@@ -3915,7 +4168,12 @@
- 			EXTRA_LDFLAGS="$LOCAL_LDFLAGS $EXTRA_LDFLAGS"
- 		fi
- 		CF_SHARED_SONAME
--		MK_SHARED_LIB='${CC} -dy -G -h '$cf_shared_soname' -o $[@]'
-+		if test "$GCC" != yes; then
-+			CC_SHARED_OPTS='-xcode=pic32'
-+			MK_SHARED_LIB='${CC} -dy -G -h '$cf_shared_soname' -o $[@]'
-+		else
-+			MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_shared_soname' -o $[@]'
-+		fi
- 		;;
- 	sysv5uw7*|unix_sv*)
- 		# tested with UnixWare 7.1.0 (gcc 2.95.2 and cc)
-@@ -4043,6 +4301,41 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_SIG_ATOMIC_T version: 2 updated: 2005/09/18 17:27:12
-+dnl ---------------
-+dnl signal handler, but there are some gcc depedencies in that recommendation.
-+dnl Try anyway.
-+AC_DEFUN([CF_SIG_ATOMIC_T],
-+[
-+AC_MSG_CHECKING(for signal global datatype)
-+AC_CACHE_VAL(cf_cv_sig_atomic_t,[
-+	for cf_type in \
-+		"volatile sig_atomic_t" \
-+		"sig_atomic_t" \
-+		"int"
-+	do
-+	AC_TRY_COMPILE([
-+#include <sys/types.h>
-+#include <signal.h>
-+#include <stdio.h>
-+
-+extern $cf_type x;
-+$cf_type x;
-+static void handler(int sig)
-+{
-+	x = 5;
-+}],
-+		[signal(SIGINT, handler);
-+		 x = 1],
-+		[cf_cv_sig_atomic_t=$cf_type],
-+		[cf_cv_sig_atomic_t=no])
-+		test "$cf_cv_sig_atomic_t" != no && break
-+	done
-+	])
-+AC_MSG_RESULT($cf_cv_sig_atomic_t)
-+test "$cf_cv_sig_atomic_t" != no && AC_DEFINE_UNQUOTED(SIG_ATOMIC_T, $cf_cv_sig_atomic_t)
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_SIZECHANGE version: 8 updated: 2000/11/04 12:22:16
- dnl -------------
- dnl Check for definitions & structures needed for window size-changing
-@@ -4503,11 +4796,12 @@
- $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_VERBOSE version: 2 updated: 1997/09/05 10:45:14
-+dnl CF_VERBOSE version: 3 updated: 2007/07/29 09:55:12
- dnl ----------
- dnl Use AC_VERBOSE w/o the warnings
- AC_DEFUN([CF_VERBOSE],
- [test -n "$verbose" && echo "	$1" 1>&AC_FD_MSG
-+CF_MSG_LOG([$1])
- ])dnl
- dnl ---------------------------------------------------------------------------
- dnl CF_WCHAR_TYPE version: 2 updated: 2004/01/17 19:18:20
-@@ -4610,7 +4904,7 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_WITH_GPM version: 6 updated: 2006/12/17 11:12:09
-+dnl CF_WITH_GPM version: 7 updated: 2008/03/23 14:48:54
- dnl -----------
- dnl
- dnl The option parameter (if neither yes/no) is assumed to be the name of
-@@ -4632,7 +4926,7 @@
- 			AC_DEFINE(HAVE_LIBGPM)
- 		else
- 			AC_CHECK_LIB(gpm,Gpm_Open,[:],[
--				AC_ERROR(Cannot link with GPM library)
-+				AC_MSG_ERROR(Cannot link with GPM library)
- 		fi
- 		with_gpm=yes
- 		])
-@@ -4643,7 +4937,7 @@
- fi
- ])
- dnl ---------------------------------------------------------------------------
--dnl CF_WITH_LIBTOOL version: 10 updated: 2006/10/14 15:23:15
-+dnl CF_WITH_LIBTOOL version: 19 updated: 2008/03/29 15:46:43
- dnl ---------------
- dnl Provide a configure option to incorporate libtool.  Define several useful
- dnl symbols for the makefile rules.
-@@ -4692,7 +4986,7 @@
- # doing:
- LIB_CLEAN=
- LIB_COMPILE=
--LIB_LINK=
-+LIB_LINK='${CC}'
- LIB_INSTALL=
- LIB_UNINSTALL=
- 
-@@ -4718,12 +5012,12 @@
-  		AC_MSG_ERROR(Cannot find libtool)
-  	fi
- ])dnl
--	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` -o'
--	LIB_OBJECT='${OBJECTS}.o=.lo)'
-+	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
-+	LIB_OBJECT='${OBJECTS:.o=.lo}'
- 	LIB_SUFFIX=.la
- 	LIB_CLEAN='${LIBTOOL} --mode=clean'
- 	LIB_COMPILE='${LIBTOOL} --mode=compile'
--	LIB_LINK='${LIBTOOL} --mode=link'
-+	LIB_LINK='${LIBTOOL} --mode=link ${CC} ${LIBTOOL_OPTS}'
- 	LIB_INSTALL='${LIBTOOL} --mode=install'
- 	LIB_UNINSTALL='${LIBTOOL} --mode=uninstall'
- 	LIB_PREP=:
-@@ -4734,16 +5028,17 @@
- 	# Save the version in a cache variable - this is not entirely a good
- 	# thing, but the version string from libtool is very ugly, and for
- 	# bug reports it might be useful to have the original string.
--	cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '2,$d' -e 's/([[^)]]*)//g' -e 's/^[[^1-9]]*//' -e 's/[[^0-9.]].*//'`
-+	cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([[^)]]*)//g' -e 's/^[[^1-9]]*//' -e 's/[[^0-9.]].*//'`
- 	AC_MSG_RESULT($cf_cv_libtool_version)
- 	if test -z "$cf_cv_libtool_version" ; then
--		AC_MSG_ERROR(This is not libtool)
-+		AC_MSG_ERROR(This is not GNU libtool)
- 	fi
- 
- 	# special hack to add --tag option for C++ compiler
- 	case $cf_cv_libtool_version in
- 	1.[[5-9]]*|[[2-9]]*)
- 		LIBTOOL_CXX="$LIBTOOL --tag=CXX"
-+		LIBTOOL="$LIBTOOL --tag=CC"
- 		;;
- 	*)
- 		LIBTOOL_CXX="$LIBTOOL"
-@@ -4758,6 +5053,7 @@
- 
- AC_SUBST(LIBTOOL)
- AC_SUBST(LIBTOOL_CXX)
-+AC_SUBST(LIBTOOL_OPTS)
- 
- AC_SUBST(LIB_CREATE)
- AC_SUBST(LIB_OBJECT)
-@@ -4772,7 +5068,7 @@
- 
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_WITH_PATH version: 7 updated: 2006/08/03 15:20:08
-+dnl CF_WITH_PATH version: 8 updated: 2007/05/13 13:16:35
- dnl ------------
- dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just
- dnl defaulting to yes/no.
-@@ -4786,7 +5082,9 @@
- AC_DEFUN([CF_WITH_PATH],
- [AC_ARG_WITH($1,[$2 ](default: ifelse($4,,empty,$4)),,
- ifelse($4,,[withval="${$3}"],[withval="${$3-ifelse($5,,$4,$5)}"]))dnl
-+if ifelse($5,,true,[test -n "$5"]) ; then
- CF_PATH_SYNTAX(withval)
-+fi
- $3="$withval"
- AC_SUBST($3)dnl
- ])dnl
-@@ -4833,6 +5131,32 @@
- 
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_WITH_PTHREAD version: 1 updated: 2008/03/29 13:42:21
-+dnl ---------------
-+dnl Check for POSIX thread library.
-+AC_DEFUN([CF_WITH_PTHREAD],
-+[
-+AC_MSG_CHECKING(if you want to link with the pthread library)
-+AC_ARG_WITH(pthread,
-+    [  --with-pthread          use POSIX thread library],
-+    [with_pthread=$withval],
-+    [with_pthread=no])
-+AC_MSG_RESULT($with_pthread)
-+
-+if test "$with_pthread" != no ; then
-+    AC_CHECK_HEADER(pthread.h,[
-+        AC_DEFINE(HAVE_PTHREADS_H)
-+        AC_CHECK_LIB(pthread,pthread_create,[
-+            LIBS="-lpthread $LIBS"
-+            AC_DEFINE(HAVE_LIBPTHREADS)
-+            with_pthread=yes
-+        ],[
-+            AC_MSG_ERROR(Cannot link with pthread library)
-+        ])
-+    ])
-+fi
-+])
-+dnl ---------------------------------------------------------------------------
- dnl CF_WITH_REL_VERSION version: 1 updated: 2003/09/20 18:12:49
- dnl -------------------
- dnl Allow library's release-version to be overridden.  Generally this happens when a
-@@ -4896,7 +5220,7 @@
- 	[USE_VALGRIND])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_XOPEN_SOURCE version: 24 updated: 2006/04/02 16:41:09
-+dnl CF_XOPEN_SOURCE version: 25 updated: 2007/01/29 18:36:38
- dnl ---------------
- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
- dnl or adapt to the vendor's definitions to get equivalent functionality,
-@@ -4930,7 +5254,7 @@
- irix[[56]].*) #(vi
- 	CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
- 	;;
--linux*|gnu*) #(vi
-+linux*|gnu*|k*bsd*-gnu) #(vi
- 	CF_GNU_SOURCE
- 	;;
- mirbsd*) #(vi
-diff -Naur ncurses-5.6.orig/c++/Makefile.in ncurses-5.6/c++/Makefile.in
---- ncurses-5.6.orig/c++/Makefile.in	2006-10-21 13:07:49.000000000 -0400
-+++ ncurses-5.6/c++/Makefile.in	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
--# $Id: Makefile.in,v 1.78 2006/10/21 17:07:49 tom Exp $
-+# $Id: Makefile.in,v 1.84 2007/04/28 15:29:12 tom Exp $
- ##############################################################################
--# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -57,6 +57,7 @@
- LIBTOOL_UNINSTALL = @LIB_UNINSTALL@
- 
- INSTALL		= @INSTALL@
-+INSTALL_LIB	= @INSTALL@ @INSTALL_LIB@
- INSTALL_DATA	= @INSTALL_DATA@
- 
- AR		= @AR@
-@@ -74,6 +75,7 @@
- INCDIR		= ../include
- CPPFLAGS	= -I../c++ -I$(INCDIR) -I$(srcdir) -DHAVE_CONFIG_H @CPPFLAGS@
- 
-+CC		= ${CXX}
- CCFLAGS		= $(CPPFLAGS) $(CXXFLAGS)
- 
- CFLAGS_LIBTOOL	= $(CCFLAGS)
-@@ -91,7 +93,7 @@
- 
- LOCAL_LIBDIR	= @top_builddir@/lib
- 
--LINK		= @LINK_PROGS@ $(LIBTOOL_LINK) $(CXX) @CXXLDFLAGS@
-+LINK		= @LINK_PROGS@ $(LIBTOOL_LINK) @CXXLDFLAGS@
- SHLIB_DIRS	= -L../lib
- SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
- 
-@@ -109,7 +111,9 @@
- LINK_PROFILE	= $(LINK_FLAGS)
- LINK_SHARED	= $(LINK_FLAGS)
- 
--LDFLAGS		= @TEST_ARGS@ @LDFLAGS@ \
-+TEST_ARGS	= @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@ 
-+
-+LDFLAGS		= $(TEST_ARGS) @LDFLAGS@ \
- 	@LD_MODEL@ @LIBS@ @LOCAL_LDFLAGS@ $(CXXLIBS)
- 
- LDFLAGS_LIBTOOL	= $(LDFLAGS) $(CFLAGS_LIBTOOL)
-@@ -173,11 +177,11 @@
- 	sh $(srcdir)/edit_cfg.sh ../include/ncurses_cfg.h $@
- 
- $(DESTDIR)$(libdir) :
--	sh $(srcdir)/../mkinstalldirs $@
-+	sh $(srcdir)/../mkdirs.sh $@
- 
- install \
- install.libs:: ../lib/$(LIBNAME) $(DESTDIR)$(libdir)
--	$(LIBTOOL_INSTALL) $(INSTALL) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)/$(LIBNAME)
-+	$(LIBTOOL_INSTALL) $(INSTALL_LIB) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)/$(LIBNAME)
- 
- uninstall \
- uninstall.libs::
-diff -Naur ncurses-5.6.orig/c++/README-first ncurses-5.6/c++/README-first
---- ncurses-5.6.orig/c++/README-first	2006-04-22 18:19:37.000000000 -0400
-+++ ncurses-5.6/c++/README-first	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- -------------------------------------------------------------------------------
---- Copyright (c) 1998-2003,2006 Free Software Foundation, Inc.               --
-+-- Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.               --
- --                                                                           --
- -- Permission is hereby granted, free of charge, to any person obtaining a   --
- -- copy of this software and associated documentation files (the             --
-@@ -25,38 +25,38 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: README-first,v 1.8 2006/04/22 22:19:37 tom Exp $
-+-- $Id: README-first,v 1.9 2007/01/27 18:27:09 tom Exp $
- -------------------------------------------------------------------------------
-                   C++ interface to ncurses routines
- -----------------------------------------------------------------------
- 
- This directory contains the source code for several C++ classes which
--ease the use of writing ncurses-based programs.  The code is derived
--from the libg++ CursesWindow class but enhanced for ncurses.
-+ease the use of writing ncurses-based programs.  The code was originally
-+derived from the libg++ CursesWindow class, but rewritten for ncurses.
- 
- The classes simplify the use of window specific functions by
- encapsulating them in the window object.  Function overloading is
--used in order to narrow the interface.  E.g. you don't have the
-+used in order to narrow the interface.  For example, you do not have the
- distinction between `printw' and `mvprintw' anymore.
- 
- A second benefit is the removal of all #defines which are included in
- the curses.h file.  This is a steady cause of trouble because many
- common identifiers are used.  Instead now all #defines are inline
--functions which also allows strict type checking of arguments.
-+functions, which also allows strict type checking of arguments.
- 
- The next enhancement is color support. It was originally provided by a 
--derived class. This caused some trouble if you think about Panels or
--Menus and Forms with colors. We decided to put color support into the
-+derived class.  This caused some trouble if you think about Panels or
-+Menus and Forms with colors.  We decided to put color support into the
- base class so that any derived class may use color support also.
- The implementation chosen here is directed to unrestricted use
--of mixes of color and monochrome windows. The original NCursesColorWindow
-+of mixes of color and monochrome windows.  The original NCursesColorWindow
- class is maintained for compatibility reasons.
- 
- The last point to mention is the support of other packages that are
--distributed with the ncurses package: the panels library, the menu library
--and the form library. This support is provided by the NCursesPanel class, 
-+distributed with the ncurses package:  the panels library, the menu library
-+and the form library.  This support is provided by the NCursesPanel class,
- which is also derived from the NCursesWindow class and the NCursesMenu
--and NCursesForm classes which are derived from NCursesPanel. This allows 
-+and NCursesForm classes which are derived from NCursesPanel.  This allows
- building interfaces with windows.
- 
- Please see the example program for a quick introduction.
-@@ -68,14 +68,6 @@
- Suggestions for enhancements and contributions of code (and docs) are
- welcome.  Please let us know which functionality you miss.
- 
--	ATTENTION LINUX USERS:  There is currently some discussion of
--	replacing the BSD curses in the Linux libc with ncurses.  If
--	this is done we could perhaps include these classes in the Linux
--	libg++ replacing the original CursesWindow class (and renaming it
--	to CursesWindow).  This could be done because NCursesWindow can
--	be made easily to a superset of the CursesWindow class.
--
--
- Original author:
-      Eric Newton         <newton@rocky.oswego.edu> for FSF's libg++
- 
-@@ -83,5 +75,6 @@
-      Ulrich Drepper      <drepper@ira.uka.de>
-  and Anatoly Ivasyuk     <anatoly@nick.csh.rit.edu>
- 
--Author of this release:
-+Authors of this release:
-      Juergen Pfeifer
-+     Thomas E. Dickey
-diff -Naur ncurses-5.6.orig/c++/cursesapp.cc ncurses-5.6/c++/cursesapp.cc
---- ncurses-5.6.orig/c++/cursesapp.cc	2005-04-03 08:25:23.000000000 -0400
-+++ ncurses-5.6/c++/cursesapp.cc	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
- // * this is for making emacs happy: -*-Mode: C++;-*-
- /****************************************************************************
-- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -34,7 +34,7 @@
- #include "internal.h"
- #include "cursesapp.h"
- 
--MODULE_ID("$Id: cursesapp.cc,v 1.13 2005/04/03 12:25:23 tom Exp $")
-+MODULE_ID("$Id: cursesapp.cc,v 1.14 2007/01/27 20:16:42 tom Exp $")
- 
- void
- NCursesApplication::init(bool bColors)
-@@ -72,11 +72,16 @@
-   Soft_Label_Key_Set* S;
- 
-   delete titleWindow;
-+  titleWindow = 0;
-+
-   while( (S=top()) ) {
-     pop();
-     delete S;
-   }
-+
-   delete Root_Window;
-+  Root_Window = 0;
-+
-   ::endwin();
- }
- 
-diff -Naur ncurses-5.6.orig/c++/cursesmain.cc ncurses-5.6/c++/cursesmain.cc
---- ncurses-5.6.orig/c++/cursesmain.cc	2003-10-25 10:53:13.000000000 -0400
-+++ ncurses-5.6/c++/cursesmain.cc	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
- // * this is for making emacs happy: -*-Mode: C++;-*-
- /****************************************************************************
-- * Copyright (c) 1998-2002,2003 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2003,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -34,7 +34,14 @@
- #include "internal.h"
- #include "cursesapp.h"
- 
--MODULE_ID("$Id: cursesmain.cc,v 1.11 2003/10/25 14:53:13 tom Exp $")
-+#if CPP_HAS_TRY_CATCH && HAVE_IOSTREAM
-+#include <iostream>
-+#else
-+#undef CPP_HAS_TRY_CATCH
-+#define CPP_HAS_TRY_CATCH 0
-+#endif
-+
-+MODULE_ID("$Id: cursesmain.cc,v 1.14 2007/04/07 17:10:11 tom Exp $")
- 
- #if HAVE_LOCALE_H
- #include <locale.h>
-@@ -42,6 +49,10 @@
- #define setlocale(name,string) /* nothing */
- #endif
- 
-+#if NO_LEAKS
-+#include <nc_alloc.h>
-+#endif
-+
- /* This is the default implementation of main() for a NCursesApplication.
-  * You only have to instantiate a static NCursesApplication object in your
-  * main application source file and link this module with your application.
-@@ -58,8 +69,25 @@
- 
-     A->handleArgs(argc,argv);
-     ::endwin();
-+#if CPP_HAS_TRY_CATCH
-+    try {
-+      res = (*A)();
-+      ::endwin();
-+    }
-+    catch(const NCursesException &e) {
-+      ::endwin();
-+      std::cerr << e.message << std::endl;
-+      res = e.errorno;
-+    }
-+#else
-     res = (*A)();
-     ::endwin();
-+#endif
-+#if NO_LEAKS
-+    delete A;
-+    _nc_free_and_exit(res);
-+#else
-     return(res);
-+#endif
-   }
- }
-diff -Naur ncurses-5.6.orig/c++/cursesp.h ncurses-5.6/c++/cursesp.h
---- ncurses-5.6.orig/c++/cursesp.h	2005-08-13 14:09:21.000000000 -0400
-+++ ncurses-5.6/c++/cursesp.h	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
- // * This makes emacs happy -*-Mode: C++;-*-
- /****************************************************************************
-- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -34,7 +34,7 @@
- #ifndef NCURSES_CURSESP_H_incl
- #define NCURSES_CURSESP_H_incl 1
- 
--// $Id: cursesp.h,v 1.26 2005/08/13 18:09:21 tom Exp $
-+// $Id: cursesp.h,v 1.27 2007/04/07 17:12:54 tom Exp $
- 
- #include <cursesw.h>
- 
-@@ -83,7 +83,7 @@
-     return uptr->m_user;
-   }
- 
--  void OnError (int err) const THROWS((NCursesPanelException))
-+  void OnError (int err) const THROWS(NCursesPanelException)
-   {
-     if (err==ERR)
-       THROW(new NCursesPanelException (this, err));
-diff -Naur ncurses-5.6.orig/c++/cursespad.cc ncurses-5.6/c++/cursespad.cc
---- ncurses-5.6.orig/c++/cursespad.cc	2005-07-23 16:51:23.000000000 -0400
-+++ ncurses-5.6/c++/cursespad.cc	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
- // * this is for making emacs happy: -*-Mode: C++;-*-
- /****************************************************************************
-- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -33,12 +33,10 @@
- 
- #include "internal.h"
- 
--#include <stdio.h>
-+#include <etip.h>
-+#include <cursesw.h>
- 
--#include "etip.h"
--#include "cursesw.h"
--
--MODULE_ID("$Id: cursespad.cc,v 1.11 2005/07/23 20:51:23 tom Exp $")
-+MODULE_ID("$Id: cursespad.cc,v 1.12 2007/04/07 18:43:54 tom Exp $")
- 
- NCursesPad::NCursesPad(int nlines, int ncols)
-   : NCursesWindow(),
-diff -Naur ncurses-5.6.orig/c++/cursesw.cc ncurses-5.6/c++/cursesw.cc
---- ncurses-5.6.orig/c++/cursesw.cc	2005-08-13 14:12:17.000000000 -0400
-+++ ncurses-5.6/c++/cursesw.cc	2008-06-18 06:49:45.000000000 -0400
-@@ -1,77 +1,83 @@
- // * this is for making emacs happy: -*-Mode: C++;-*-
-+/****************************************************************************
-+ * Copyright (c) 2007 Free Software Foundation, Inc.                        *
-+ *                                                                          *
-+ * Permission is hereby granted, free of charge, to any person obtaining a  *
-+ * copy of this software and associated documentation files (the            *
-+ * "Software"), to deal in the Software without restriction, including      *
-+ * without limitation the rights to use, copy, modify, merge, publish,      *
-+ * distribute, distribute with modifications, sublicense, and/or sell       *
-+ * copies of the Software, and to permit persons to whom the Software is    *
-+ * furnished to do so, subject to the following conditions:                 *
-+ *                                                                          *
-+ * The above copyright notice and this permission notice shall be included  *
-+ * in all copies or substantial portions of the Software.                   *
-+ *                                                                          *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-+ *                                                                          *
-+ * Except as contained in this notice, the name(s) of the above copyright   *
-+ * holders shall not be used in advertising or otherwise to promote the     *
-+ * sale, use or other dealings in this Software without prior written       *
-+ * authorization.                                                           *
-+ ****************************************************************************/
- 
- /*
--  Copyright (C) 1989 Free Software Foundation
--  written by Eric Newton (newton@rocky.oswego.edu)
--
--  This file is part of the GNU C++ Library.  This library is free
--  software; you can redistribute it and/or modify it under the terms of
--  the GNU Library General Public License as published by the Free
--  Software Foundation; either version 2 of the License, or (at your
--  option) any later version.  This library is distributed in the hope
--  that it will be useful, but WITHOUT ANY WARRANTY; without even the
--  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
--  PURPOSE.  See the GNU Library General Public License for more details.
--  You should have received a copy of the GNU Library General Public
--  License along with this library; if not, write to the Free Software
--  Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
--
--  modified by Ulrich Drepper  (drepper@karlsruhe.gmd.de)
--          and Anatoly Ivasyuk (anatoly@nick.csh.rit.edu)
--
--  modified by Juergen Pfeifer
--  and Thomas Dickey (noting that more than 70% of this file has been changed)
--*/
-+ * Authors:
-+ *	Thomas E. Dickey
-+ *	Juergen Pfeifer
-+ *
-+ * The NCursesWindow class was originally based on a file written by
-+ * Eric Newton, later modified by Ulrich Drepper and Anatoly Ivasyuk.
-+ * However, aside from the compatible interface definition, no trace
-+ * of the original code remains in this version: it consists only of
-+ * changes introduced since 1995.
-+ */
- 
- #include "internal.h"
- #include "cursesw.h"
- 
--MODULE_ID("$Id: cursesw.cc,v 1.32 2005/08/13 18:12:17 tom Exp $")
-+MODULE_ID("$Id: cursesw.cc,v 1.49 2007/12/15 23:01:57 tom Exp $")
- 
- #define COLORS_NEED_INITIALIZATION  -1
- #define COLORS_NOT_INITIALIZED       0
- #define COLORS_MONOCHROME            1
- #define COLORS_ARE_REALLY_THERE      2
- 
-+#define HaveColors() (colorInitialized == COLORS_ARE_REALLY_THERE)
-+
- // declare static variables for the class
- long NCursesWindow::count = 0L;
- bool NCursesWindow::b_initialized = FALSE;
- 
--/*
-- * The ncurses library has a fallback for vsscanf(), which may work...
-- */
--#if !(USE_STRSTREAM_VSCAN || USE_STRSTREAM_VSCAN_CAST)
--#  undef  USE_STDIO_VSCAN
--#  define USE_STDIO_VSCAN 1
--#endif
-+int
-+NCursesWindow::scanw(const char* fmt, ...)
-+{
-+    int result = ERR;
-+
-+    va_list args;
-+    va_start(args, fmt);
-+    result = ::vw_scanw (w, const_cast<NCURSES_CONST char *>(fmt), args);
-+    va_end(args);
-+
-+    return result;
-+}
- 
--#if defined(__GNUG__)
--#  ifndef _IO_va_list
--#    define _IO_va_list char *
--#  endif
--#endif
- 
- int
--NCursesWindow::scanw(const char* fmt, ...)
-+NCursesWindow::scanw(int y, int x, const char* fmt, ...)
- {
-     int result = ERR;
--    char buf[BUFSIZ];
- 
--    if (::wgetnstr(w, buf, sizeof(buf)) != ERR) {
-+    if (::wmove(w, y, x) != ERR) {
- 	va_list args;
- 	va_start(args, fmt);
--#if USE_STDIO_VSCAN
--	if (::vsscanf(buf, fmt, args) != -1)
--	    result = OK;
--#elif USE_STRSTREAM_VSCAN	/* powerpc, os390 */
--	strstreambuf ss(buf, sizeof(buf));
--	if (ss.vscan(fmt, args) != -1)
--	    result = OK;
--#elif USE_STRSTREAM_VSCAN_CAST	/* pre-gcc 3.0 */
--	strstreambuf ss(buf, sizeof(buf));
--	if (ss.vscan(fmt, (_IO_va_list)args) != -1)
--	    result = OK;
--#endif
-+	result = ::vw_scanw (w, const_cast<NCURSES_CONST char *>(fmt), args);
- 	va_end(args);
-     }
-     return result;
-@@ -79,29 +85,23 @@
- 
- 
- int
--NCursesWindow::scanw(int y, int x, const char* fmt, ...)
-+NCursesWindow::scanw(const char* fmt, va_list args)
-+{
-+    int result = ERR;
-+
-+    result = ::vw_scanw (w, const_cast<NCURSES_CONST char *>(fmt), args);
-+
-+    return result;
-+}
-+
-+
-+int
-+NCursesWindow::scanw(int y, int x, const char* fmt, va_list args)
- {
-     int result = ERR;
--    char buf[BUFSIZ];
- 
-     if (::wmove(w, y, x) != ERR) {
--	if (::wgetnstr(w, buf, sizeof(buf)) != ERR) {
--	    va_list args;
--	    va_start(args, fmt);
--#if USE_STDIO_VSCAN
--	    if (::vsscanf(buf, fmt, args) != -1)
--		result = OK;
--#elif USE_STRSTREAM_VSCAN	/* powerpc, os390 */
--	    strstreambuf ss(buf, sizeof(buf));
--	    if (ss.vscan(fmt, args) != -1)
--		result = OK;
--#elif USE_STRSTREAM_VSCAN_CAST	/* pre-gcc 3.0 */
--	    strstreambuf ss(buf, sizeof(buf));
--	    if (ss.vscan(fmt, (_IO_va_list)args) != -1)
--		result = OK;
--#endif
--	    va_end(args);
--	}
-+	result = ::vw_scanw (w, const_cast<NCURSES_CONST char *>(fmt), args);
-     }
-     return result;
- }
-@@ -112,10 +112,9 @@
- {
-     va_list args;
-     va_start(args, fmt);
--    char buf[BUFSIZ];
--    ::vsprintf(buf, fmt, args);
-+    int result = ::vw_printw(w, fmt, args);
-     va_end(args);
--    return waddstr(w, buf);
-+    return result;
- }
- 
- 
-@@ -126,21 +125,37 @@
-     va_start(args, fmt);
-     int result = ::wmove(w, y, x);
-     if (result == OK) {
--	char buf[BUFSIZ];
--	::vsprintf(buf, fmt, args);
--	result = waddstr(w, buf);
-+	result = ::vw_printw(w, fmt, args);
-     }
-     va_end(args);
-     return result;
- }
- 
- 
-+int
-+NCursesWindow::printw(const char * fmt, va_list args)
-+{
-+    int result = ::vw_printw(w, fmt, args);
-+    return result;
-+}
-+
-+
-+int
-+NCursesWindow::printw(int y, int x, const char * fmt, va_list args)
-+{
-+    int result = ::wmove(w, y, x);
-+    if (result == OK) {
-+	result = ::vw_printw(w, fmt, args);
-+    }
-+    return result;
-+}
-+
-+
- void
--NCursesWindow::init(void)
-+NCursesWindow::set_keyboard(void)
- {
--    leaveok(0);
--    keypad(1);
--    meta(1);
-+    keypad(TRUE);
-+    meta(TRUE);
- }
- 
- void
-@@ -152,73 +167,73 @@
- void
- NCursesWindow::initialize()
- {
--  if (!b_initialized) {
--    ::initscr();
--    b_initialized = TRUE;
--    if (colorInitialized==COLORS_NEED_INITIALIZATION) {
--      colorInitialized=COLORS_NOT_INITIALIZED;
--      useColors();
--    }
--    ::noecho();
--    ::cbreak();
--  }
-+    if (!b_initialized) {
-+	::initscr();
-+	b_initialized = TRUE;
-+	if (colorInitialized == COLORS_NEED_INITIALIZATION) {
-+	    colorInitialized = COLORS_NOT_INITIALIZED;
-+	    useColors();
-+	}
-+	::noecho();
-+	::cbreak();
-+    }
-+}
-+
-+void
-+NCursesWindow::constructing()
-+{
-+    initialize();
-+    ++count;
- }
- 
- NCursesWindow::NCursesWindow()
--  : w(0), alloced(0), par(0), subwins(0), sib(0)
-+  : w(0), alloced(FALSE), par(0), subwins(0), sib(0)
- {
--  initialize();
-+    constructing();
- 
--  w = static_cast<WINDOW *>(0);
--  init();
--  alloced = FALSE;
--  subwins = par = sib = 0;
--  count++;
-+    w = static_cast<WINDOW *>(0);
-+    set_keyboard();
- }
- 
- NCursesWindow::NCursesWindow(int nlines, int ncols, int begin_y, int begin_x)
--  : w(0), alloced(0), par(0), subwins(0), sib(0)
-+  : w(0), alloced(TRUE), par(0), subwins(0), sib(0)
- {
--    initialize();
-+    constructing();
- 
-     w = ::newwin(nlines, ncols, begin_y, begin_x);
-     if (w == 0) {
- 	err_handler("Cannot construct window");
-     }
--    init();
--
--    alloced = TRUE;
--    subwins = par = sib = 0;
--    count++;
-+    set_keyboard();
- }
- 
--NCursesWindow::NCursesWindow(WINDOW* &window)
--  : w(0), alloced(0), par(0), subwins(0), sib(0)
-+NCursesWindow::NCursesWindow(WINDOW* window)
-+  : w(0), alloced(FALSE), par(0), subwins(0), sib(0)
- {
--    initialize();
-+    constructing();
- 
--    w = window;
--    init();
--    alloced = FALSE;
--    subwins = par = sib = 0;
--    count++;
-+    // We used to use a reference on the "window" parameter, but we cannot do
-+    // that with an opaque pointer (see NCURSES_OPAQUE).  If the parameter was
-+    // "::stdscr", that is first set via the "constructing() call, and is null
-+    // up to that point.  So we allow a null pointer here as meaning the "same"
-+    // as "::stdscr".
-+    w = window ? window : ::stdscr;
-+    set_keyboard();
- }
- 
--NCursesWindow::NCursesWindow(NCursesWindow& win, int l, int c,
-+NCursesWindow::NCursesWindow(NCursesWindow& win, int ny, int nx,
- 			     int begin_y, int begin_x, char absrel)
--  : w(0), alloced(0), par(0), subwins(0), sib(0)
-+  : w(0), alloced(TRUE), par(0), subwins(0), sib(0)
- {
--    initialize();
--    if (absrel == 'a') { // absolute origin
-+    constructing();
-+    if (absrel == 'a') {	// absolute origin
- 	begin_y -= win.begy();
- 	begin_x -= win.begx();
-     }
- 
--    // Even though we treat subwindows as a tree, the standard curses
--    // library needs the `subwin' call to link to the parent in
--    // order to correctly perform refreshes, etc.
--    // Friendly enough, this also works for pads.
--    w = ::derwin(win.w, l, c, begin_y, begin_x);
-+    // Link this window into its parent's list of subwindows.
-+    // We use derwin(), since this also works for pads.
-+    w = ::derwin(win.w, ny, nx, begin_y, begin_x);
-     if (w == 0) {
- 	err_handler("Cannot construct subwindow");
-     }
-@@ -226,45 +241,40 @@
-     par = &win;
-     sib = win.subwins;
-     win.subwins = this;
--    subwins = 0;
--    alloced = TRUE;
--    count++;
- }
- 
- NCursesWindow::NCursesWindow(NCursesWindow& win,
- 				bool do_box NCURSES_PARAM_INIT(TRUE))
--  : w(0), alloced(0), par(0), subwins(0), sib(0)
-+  : w(0), alloced(TRUE), par(0), subwins(0), sib(0)
- {
--  initialize();
--  int myHeight = win.height();
--  int myWidth  = win.width();
--  w = :: derwin(win.w, myHeight - 2, myWidth - 2, 1, 1);
--  if (w == 0) {
--    err_handler("Cannot construct subwindow");
--  }
--
--  par = &win;
--  sib = win.subwins;
--  win.subwins = this;
--  subwins = 0;
--  alloced = TRUE;
--  count++;
--
--  if (do_box) {
--    win.box();
--    win.touchwin();
--  }
-+    constructing();
-+    int myHeight = win.height();
-+    int myWidth  = win.width();
-+    w = :: derwin(win.w, myHeight - 2, myWidth - 2, 1, 1);
-+    if (w == 0) {
-+	err_handler("Cannot construct subwindow");
-+    }
-+
-+    par = &win;
-+    sib = win.subwins;
-+    win.subwins = this;
-+    subwins = 0;
-+
-+    if (do_box) {
-+	win.box();
-+	win.touchwin();
-+    }
- }
- 
- NCursesWindow NCursesWindow::Clone()
- {
--  WINDOW *d = ::dupwin(w);
--  NCursesWindow W(d);
--  W.subwins = subwins;
--  W.sib = sib;
--  W.par = par;
--  W.alloced = alloced;
--  return W;
-+    WINDOW *d = ::dupwin(w);
-+    NCursesWindow W(d);
-+    W.subwins = subwins;
-+    W.sib = sib;
-+    W.par = par;
-+    W.alloced = alloced;
-+    return W;
- }
- 
- typedef int (*RIPOFFINIT)(NCursesWindow&);
-@@ -273,62 +283,64 @@
- static RIPOFFINIT* prip = R_INIT;
- 
- NCursesWindow::NCursesWindow(WINDOW *win, int ncols)
--  : w(0), alloced(0), par(0), subwins(0), sib(0)
-+  : w(0), alloced(FALSE), par(0), subwins(0), sib(0)
- {
--  initialize();
--  w = win;
--  assert((w->_maxx+1)==ncols);
--  alloced = FALSE;
--  subwins = par = sib = 0;
-+    initialize();
-+    w = win;
-+    assert((w->_maxx +1 ) == ncols);
- }
- 
- int _nc_xx_ripoff_init(WINDOW *w, int ncols)
- {
--  int res = ERR;
-+    int res = ERR;
- 
--  RIPOFFINIT init = *prip++;
--  if (init) {
--    NCursesWindow* W = new NCursesWindow(w,ncols);
--    res = init(*W);
--  }
--  return res;
-+    RIPOFFINIT init = *prip++;
-+    if (init) {
-+	NCursesWindow* W = new NCursesWindow(w,ncols);
-+	res = init(*W);
-+    }
-+    return res;
- }
- 
- int NCursesWindow::ripoffline(int ripoff_lines,
- 			      int (*init)(NCursesWindow& win))
- {
--  int code = ::_nc_ripoffline(ripoff_lines,_nc_xx_ripoff_init);
--  if (code==OK && init && ripoff_lines) {
--    R_INIT[r_init_idx++] = init;
--  }
--  return code;
-+    int code = ::_nc_ripoffline(ripoff_lines,_nc_xx_ripoff_init);
-+    if (code == OK && init && ripoff_lines) {
-+	R_INIT[r_init_idx++] = init;
-+    }
-+    return code;
- }
- 
- bool
- NCursesWindow::isDescendant(NCursesWindow& win)
- {
--  for (NCursesWindow* p = subwins; p != NULL; p = p->sib) {
--    if (p==&win)
--      return TRUE;
--    else {
--      if (p->isDescendant(win))
--	return TRUE;
-+    bool result = FALSE;
-+
-+    for (NCursesWindow* p = subwins; p != NULL; p = p->sib) {
-+	if (p == &win || p->isDescendant(win)) {
-+	    result = TRUE;
-+	    break;
-+	}
-     }
--  }
--  return FALSE;
-+    return result;
- }
- 
- void
- NCursesWindow::kill_subwindows()
- {
--    for (NCursesWindow* p = subwins; p != 0; p = p->sib) {
-+    NCursesWindow* p = subwins;
-+
-+    subwins = 0;
-+    while (p != 0) {
-+	NCursesWindow* q = p->sib;
- 	p->kill_subwindows();
- 	if (p->alloced) {
- 	    if (p->w != 0)
- 		::delwin(p->w);
--	    p->alloced = FALSE;
- 	}
--	p->w = 0; // cause a run-time error if anyone attempts to use...
-+	delete p;
-+	p = q;
-     }
- }
- 
-@@ -337,22 +349,21 @@
- {
-     kill_subwindows();
- 
--    if (par != 0) {  // Snip us from the parent's list of subwindows.
--	NCursesWindow * win = par->subwins;
--	NCursesWindow * trail = 0;
--	for (;;) {
--	    if (win == 0)
-+    if (par != 0) {
-+	// Remove this window from the parent's list of subwindows.
-+	NCursesWindow * next = par->subwins;
-+	NCursesWindow * prev = 0;
-+	while (next != 0) {
-+	    if (next == this) {
-+		if (prev != 0) {
-+		    prev->sib = next->sib;
-+		} else {
-+		    par->subwins = next->sib;
-+		}
- 		break;
--	    else if (win == this) {
--		if (trail != 0)
--		    trail->sib = win->sib;
--		else
--		    par->subwins = win->sib;
--		break;
--	    } else {
--		trail = win;
--		win = win->sib;
- 	    }
-+	    prev = next;
-+	    next = next->sib;
- 	}
-     }
- 
-@@ -360,13 +371,12 @@
- 	::delwin(w);
- 
-     if (alloced) {
--      --count;
--      if (count == 0) {
--	::endwin();
--      }
--      else if (count < 0) { // cannot happen!
--	err_handler("Too many windows destroyed");
--      }
-+	--count;
-+	if (count == 0) {
-+	    ::endwin();
-+	} else if (count < 0) { // cannot happen!
-+	    err_handler("Too many windows destroyed");
-+	}
-     }
- }
- 
-@@ -379,89 +389,82 @@
- NCursesWindow::useColors(void)
- {
-     if (colorInitialized == COLORS_NOT_INITIALIZED) {
--      if (b_initialized) {
--	if (::has_colors()) {
--	  ::start_color();
--	  colorInitialized = COLORS_ARE_REALLY_THERE;
-+	if (b_initialized) {
-+	    if (::has_colors()) {
-+		::start_color();
-+		colorInitialized = COLORS_ARE_REALLY_THERE;
-+	    } else {
-+		colorInitialized = COLORS_MONOCHROME;
-+	    }
-+	} else {
-+	    colorInitialized = COLORS_NEED_INITIALIZATION;
- 	}
--	else
--	  colorInitialized = COLORS_MONOCHROME;
--      }
--      else
--	colorInitialized = COLORS_NEED_INITIALIZATION;
-     }
- }
- 
- short
-+NCursesWindow::getPair() const
-+{
-+    return static_cast<short>(PAIR_NUMBER(getattrs(w)));
-+}
-+
-+short
- NCursesWindow::getcolor(int getback) const
- {
-     short fore, back;
- 
--    if (colorInitialized==COLORS_ARE_REALLY_THERE) {
--      if (::pair_content(static_cast<short>(PAIR_NUMBER(w->_attrs)), &fore, &back))
--	err_handler("Can't get color pair");
--    }
--    else {
--      // Monochrome means white on black
--      back = COLOR_BLACK;
--      fore = COLOR_WHITE;
-+    if (HaveColors()) {
-+	if (::pair_content(getPair(), &fore, &back) == ERR)
-+	    err_handler("Can't get color pair");
-+    } else {
-+	// Monochrome means white on black
-+	back = COLOR_BLACK;
-+	fore = COLOR_WHITE;
-     }
-     return getback ? back : fore;
- }
- 
- int NCursesWindow::NumberOfColors()
- {
--  if (colorInitialized==COLORS_ARE_REALLY_THERE)
--    return COLORS;
--  else
--    return 1; // monochrome (actually there are two ;-)
-+    return (HaveColors()) ? COLORS : 1;
- }
- 
- short
- NCursesWindow::getcolor() const
- {
--  if (colorInitialized==COLORS_ARE_REALLY_THERE)
--    return PAIR_NUMBER(w->_attrs);
--  else
--    return 0; // we only have pair zero
-+    return (HaveColors()) ? getPair() : 0;
- }
- 
- int
- NCursesWindow::setpalette(short fore, short back, short pair)
- {
--  if (colorInitialized==COLORS_ARE_REALLY_THERE)
--    return ::init_pair(pair, fore, back);
--  else
--    return OK;
-+    return (HaveColors()) ? ::init_pair(pair, fore, back) : OK;
- }
- 
- int
- NCursesWindow::setpalette(short fore, short back)
- {
--  if (colorInitialized==COLORS_ARE_REALLY_THERE)
--    return setpalette(fore, back, static_cast<short>(PAIR_NUMBER(w->_attrs)));
--  else
--    return OK;
-+    return setpalette(fore, back, getPair());
- }
- 
- 
- int
- NCursesWindow::setcolor(short pair)
- {
--  if (colorInitialized==COLORS_ARE_REALLY_THERE) {
--    if ((pair < 1) || (pair > COLOR_PAIRS))
--      err_handler("Can't set color pair");
--
--    attroff(A_COLOR);
--    attrset(COLOR_PAIR(pair));
--  }
--  return OK;
-+    if (HaveColors()) {
-+	if ((pair < 1) || (pair > COLOR_PAIRS))
-+	    err_handler("Can't set color pair");
-+
-+	attroff(A_COLOR);
-+	attrset(COLOR_PAIR(pair));
-+    }
-+    return OK;
- }
- 
- #if HAVE_HAS_KEY
- bool NCursesWindow::has_mouse() const
- {
--  return ((::has_key(KEY_MOUSE) || ::_nc_has_mouse())
--	  ? TRUE : FALSE);
-+    return ((::has_key(KEY_MOUSE) || ::_nc_has_mouse())
-+	     ? TRUE : FALSE);
- }
- #endif
-diff -Naur ncurses-5.6.orig/c++/cursesw.h ncurses-5.6/c++/cursesw.h
---- ncurses-5.6.orig/c++/cursesw.h	2005-07-23 16:51:39.000000000 -0400
-+++ ncurses-5.6/c++/cursesw.h	2008-06-18 06:49:46.000000000 -0400
-@@ -1,6 +1,7 @@
- // * This makes emacs happy -*-Mode: C++;-*-
-+// vile:cppmode
- /****************************************************************************
-- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -30,17 +31,10 @@
- #ifndef NCURSES_CURSESW_H_incl
- #define NCURSES_CURSESW_H_incl 1
- 
--// $Id: cursesw.h,v 1.38 2005/07/23 20:51:39 tom Exp $
--
--#include <stdarg.h>
--#include <stdio.h>
-+// $Id: cursesw.h,v 1.48 2008/01/19 21:09:10 tom Exp $
- 
- #include <etip.h>
- 
--#if HAVE_STRSTREAM_H && (USE_STRSTREAM_VSCAN||USE_STRSTREAM_VSCAN_CAST)
--#include <strstream.h>
--#endif
--
- extern "C" {
- #  include   <curses.h>
- }
-@@ -61,16 +55,17 @@
- #define addch UNDEF(addch)
- #endif
- 
--#ifdef echochar
--inline int UNDEF(echochar)(chtype ch)  { return echochar(ch); }
--#undef echochar
--#define echochar UNDEF(echochar)
-+#ifdef addchstr
-+inline int UNDEF(addchstr)(chtype *at) { return addchstr(at); }
-+#undef addchstr
-+#define addchstr UNDEF(addchstr)
- #endif
- 
--#ifdef insdelln
--inline int UNDEF(insdelln)(int n)  { return insdelln(n); }
--#undef insdelln
--#define insdelln UNDEF(insdelln)
-+#ifdef addnstr
-+inline int UNDEF(addnstr)(const char *str, int n)
-+{ return addnstr(str, n); }
-+#undef addnstr
-+#define addnstr UNDEF(addnstr)
- #endif
- 
- #ifdef addstr
-@@ -79,28 +74,34 @@
- #define addstr UNDEF(addstr)
- #endif
- 
--#ifdef attron
--inline int UNDEF(attron)(chtype at) { return attron(at); }
--#undef attron
--#define attron UNDEF(attron)
--#endif
--
- #ifdef attroff
- inline int UNDEF(attroff)(chtype at) { return attroff(at); }
- #undef attroff
- #define attroff UNDEF(attroff)
- #endif
- 
-+#ifdef attron
-+inline int UNDEF(attron)(chtype at) { return attron(at); }
-+#undef attron
-+#define attron UNDEF(attron)
-+#endif
-+
- #ifdef attrset
- inline chtype UNDEF(attrset)(chtype at) { return attrset(at); }
- #undef attrset
- #define attrset UNDEF(attrset)
- #endif
- 
--#ifdef color_set
--inline chtype UNDEF(color_set)(short p, void* opts) { return color_set(p, opts); }
--#undef color_set
--#define color_set UNDEF(color_set)
-+#ifdef bkgd
-+inline int UNDEF(bkgd)(chtype ch) { return bkgd(ch); }
-+#undef bkgd
-+#define bkgd UNDEF(bkgd)
-+#endif
-+
-+#ifdef bkgdset
-+inline void UNDEF(bkgdset)(chtype ch) { bkgdset(ch); }
-+#undef bkgdset
-+#define bkgdset UNDEF(bkgdset)
- #endif
- 
- #ifdef border
-@@ -116,18 +117,11 @@
- #define box UNDEF(box)
- #endif
- 
--#ifdef mvwhline
--inline int UNDEF(mvwhline)(WINDOW *win, int y, int x, chtype c, int n) {
--  return mvwhline(win, y, x, c, n); }
--#undef mvwhline
--#define mvwhline UNDEF(mvwhline)
--#endif
--
--#ifdef mvwvline
--inline int UNDEF(mvwvline)(WINDOW *win, int y, int x, chtype c, int n) {
--  return mvwvline(win, y, x, c, n); }
--#undef mvwvline
--#define mvwvline UNDEF(mvwvline)
-+#ifdef chgat
-+inline int UNDEF(chgat)(int n, attr_t attr, short color, const void *opts) {
-+  return chgat(n, attr, color, opts); }
-+#undef chgat
-+#define chgat UNDEF(chgat)
- #endif
- 
- #ifdef clear
-@@ -156,6 +150,18 @@
- #define clrtoeol UNDEF(clrtoeol)
- #endif
- 
-+#ifdef color_set
-+inline chtype UNDEF(color_set)(short p, void* opts) { return color_set(p, opts); }
-+#undef color_set
-+#define color_set UNDEF(color_set)
-+#endif
-+
-+#ifdef crmode
-+inline int UNDEF(crmode)(void) { return crmode(); }
-+#undef crmode
-+#define crmode UNDEF(crmode)
-+#endif
-+
- #ifdef delch
- inline int UNDEF(delch)()  { return delch(); }
- #undef delch
-@@ -168,12 +174,24 @@
- #define deleteln UNDEF(deleteln)
- #endif
- 
-+#ifdef echochar
-+inline int UNDEF(echochar)(chtype ch)  { return echochar(ch); }
-+#undef echochar
-+#define echochar UNDEF(echochar)
-+#endif
-+
- #ifdef erase
- inline int UNDEF(erase)()  { return erase(); }
- #undef erase
- #define erase UNDEF(erase)
- #endif
- 
-+#ifdef fixterm
-+inline int UNDEF(fixterm)(void) { return fixterm(); }
-+#undef fixterm
-+#define fixterm UNDEF(fixterm)
-+#endif
-+
- #ifdef flushok
- inline int UNDEF(flushok)(WINDOW* _win, bool _bf)  {
-   return flushok(_win, _bf); }
-@@ -183,91 +201,34 @@
- #define _no_flushok
- #endif
- 
--#ifdef getch
--inline int UNDEF(getch)()  { return getch(); }
--#undef getch
--#define getch UNDEF(getch)
--#endif
--
--#ifdef getstr
--inline int UNDEF(getstr)(char *_str)  { return getstr(_str); }
--#undef getstr
--#define getstr UNDEF(getstr)
--#endif
--
--#ifdef instr
--inline int UNDEF(instr)(char *_str)  { return instr(_str); }
--#undef instr
--#define instr UNDEF(instr)
--#endif
--
--#ifdef innstr
--inline int UNDEF(innstr)(char *_str, int n)  { return innstr(_str, n); }
--#undef innstr
--#define innstr UNDEF(innstr)
--#endif
--
--#ifdef mvwinnstr
--inline int UNDEF(mvwinnstr)(WINDOW *win, int y, int x, char *_str, int n) {
--  return mvwinnstr(win, y, x, _str, n); }
--#undef mvwinnstr
--#define mvwinnstr UNDEF(mvwinnstr)
--#endif
--
--#ifdef mvinnstr
--inline int UNDEF(mvinnstr)(int y, int x, char *_str, int n) {
--  return mvinnstr(y, x, _str, n); }
--#undef mvinnstr
--#define mvinnstr UNDEF(mvinnstr)
--#endif
--
--#ifdef winsstr
--inline int UNDEF(winsstr)(WINDOW *w, const char *_str)  {
--  return winsstr(w, _str); }
--#undef winsstr
--#define winsstr UNDEF(winsstr)
--#endif
--
--#ifdef mvwinsstr
--inline int UNDEF(mvwinsstr)(WINDOW *w, int y, int x,  const char *_str)  {
--  return mvwinsstr(w, y, x, _str); }
--#undef mvwinsstr
--#define mvwinsstr UNDEF(mvwinsstr)
--#endif
--
--#ifdef insstr
--inline int UNDEF(insstr)(const char *_str)  {
--  return insstr(_str); }
--#undef insstr
--#define insstr UNDEF(insstr)
-+#ifdef getattrs
-+inline int UNDEF(getattrs)(WINDOW *win) { return getattrs(win); }
-+#undef getattrs
-+#define getattrs UNDEF(getattrs)
- #endif
- 
--#ifdef mvinsstr
--inline int UNDEF(mvinsstr)(int y, int x, const char *_str)  {
--  return mvinsstr(y, x, _str); }
--#undef mvinsstr
--#define mvinsstr UNDEF(mvinsstr)
-+#ifdef getbegyx
-+inline void UNDEF(getbegyx)(WINDOW* win, int& y, int& x) { getbegyx(win, y, x); }
-+#undef getbegyx
-+#define getbegyx UNDEF(getbegyx)
- #endif
- 
--#ifdef insnstr
--inline int UNDEF(insnstr)(const char *_str, int n)  {
--  return insnstr(_str, n); }
--#undef insnstr
--#define insnstr UNDEF(insnstr)
-+#ifdef getbkgd
-+inline chtype UNDEF(getbkgd)(const WINDOW *win) { return getbkgd(win); }
-+#undef getbkgd
-+#define getbkgd UNDEF(getbkgd)
- #endif
- 
--#ifdef mvwinsnstr
--inline int UNDEF(mvwinsnstr)(WINDOW *w, int y, int x, const char *_str, int n) {
--  return mvwinsnstr(w, y, x, _str, n); }
--#undef mvwinsnstr
--#define mvwinsnstr UNDEF(mvwinsnstr)
-+#ifdef getch
-+inline int UNDEF(getch)()  { return getch(); }
-+#undef getch
-+#define getch UNDEF(getch)
- #endif
- 
--#ifdef mvinsnstr
--inline int UNDEF(mvinsnstr)(int y, int x, const char *_str, int n) {
--  return mvinsnstr(y, x, _str, n); }
--#undef mvinsnstr
--#define mvinsnstr UNDEF(mvinsnstr)
-+#ifdef getmaxyx
-+inline void UNDEF(getmaxyx)(WINDOW* win, int& y, int& x) { getmaxyx(win, y, x); }
-+#undef getmaxyx
-+#define getmaxyx UNDEF(getmaxyx)
- #endif
- 
- #ifdef getnstr
-@@ -276,6 +237,18 @@
- #define getnstr UNDEF(getnstr)
- #endif
- 
-+#ifdef getparyx
-+inline void UNDEF(getparyx)(WINDOW* win, int& y, int& x) { getparyx(win, y, x); }
-+#undef getparyx
-+#define getparyx UNDEF(getparyx)
-+#endif
-+
-+#ifdef getstr
-+inline int UNDEF(getstr)(char *_str)  { return getstr(_str); }
-+#undef getstr
-+#define getstr UNDEF(getstr)
-+#endif
-+
- #ifdef getyx
- inline void UNDEF(getyx)(const WINDOW* win, int& y, int& x) {
-   getyx(win, y, x); }
-@@ -283,18 +256,6 @@
- #define getyx UNDEF(getyx)
- #endif
- 
--#ifdef getbegyx
--inline void UNDEF(getbegyx)(WINDOW* win, int& y, int& x) { getbegyx(win, y, x); }
--#undef getbegyx
--#define getbegyx UNDEF(getbegyx)
--#endif
--
--#ifdef getmaxyx
--inline void UNDEF(getmaxyx)(WINDOW* win, int& y, int& x) { getmaxyx(win, y, x); }
--#undef getmaxyx
--#define getmaxyx UNDEF(getmaxyx)
--#endif
--
- #ifdef hline
- inline int UNDEF(hline)(chtype ch, int n) { return hline(ch, n); }
- #undef hline
-@@ -307,18 +268,62 @@
- #define inch UNDEF(inch)
- #endif
- 
-+#ifdef inchstr
-+inline int UNDEF(inchstr)(chtype *str)  { return inchstr(str); }
-+#undef inchstr
-+#define inchstr UNDEF(inchstr)
-+#endif
-+
-+#ifdef innstr
-+inline int UNDEF(innstr)(char *_str, int n)  { return innstr(_str, n); }
-+#undef innstr
-+#define innstr UNDEF(innstr)
-+#endif
-+
- #ifdef insch
- inline int UNDEF(insch)(chtype c)  { return insch(c); }
- #undef insch
- #define insch UNDEF(insch)
- #endif
- 
-+#ifdef insdelln
-+inline int UNDEF(insdelln)(int n)  { return insdelln(n); }
-+#undef insdelln
-+#define insdelln UNDEF(insdelln)
-+#endif
-+
- #ifdef insertln
- inline int UNDEF(insertln)()  { return insertln(); }
- #undef insertln
- #define insertln UNDEF(insertln)
- #endif
- 
-+#ifdef insnstr
-+inline int UNDEF(insnstr)(const char *_str, int n)  {
-+  return insnstr(_str, n); }
-+#undef insnstr
-+#define insnstr UNDEF(insnstr)
-+#endif
-+
-+#ifdef insstr
-+inline int UNDEF(insstr)(const char *_str)  {
-+  return insstr(_str); }
-+#undef insstr
-+#define insstr UNDEF(insstr)
-+#endif
-+
-+#ifdef instr
-+inline int UNDEF(instr)(char *_str)  { return instr(_str); }
-+#undef instr
-+#define instr UNDEF(instr)
-+#endif
-+
-+#ifdef intrflush
-+inline void UNDEF(intrflush)(WINDOW *win, bool bf) { intrflush(); }
-+#undef intrflush
-+#define intrflush UNDEF(intrflush)
-+#endif
-+
- #ifdef leaveok
- inline int UNDEF(leaveok)(WINDOW* win, bool bf)  { return leaveok(win, bf); }
- #undef leaveok
-@@ -333,142 +338,127 @@
- #define move UNDEF(move)
- #endif
- 
--#ifdef refresh
--inline int UNDEF(refresh)()  { return refresh(); }
--#undef refresh
--#define refresh UNDEF(refresh)
--#endif
--
--#ifdef redrawwin
--inline int UNDEF(redrawwin)(WINDOW *win)  { return redrawwin(win); }
--#undef redrawwin
--#define redrawwin UNDEF(redrawwin)
-+#ifdef mvaddch
-+inline int UNDEF(mvaddch)(int y, int x, chtype ch)
-+{ return mvaddch(y, x, ch); }
-+#undef mvaddch
-+#define mvaddch UNDEF(mvaddch)
- #endif
- 
--#ifdef scrl
--inline int UNDEF(scrl)(int l) { return scrl(l); }
--#undef scrl
--#define scrl UNDEF(scrl)
-+#ifdef mvaddnstr
-+inline int UNDEF(mvaddnstr)(int y, int x, const char *str, int n)
-+{ return mvaddnstr(y, x, str, n); }
-+#undef mvaddnstr
-+#define mvaddnstr UNDEF(mvaddnstr)
- #endif
- 
--#ifdef scroll
--inline int UNDEF(scroll)(WINDOW *win) { return scroll(win); }
--#undef scroll
--#define scroll UNDEF(scroll)
--#endif
--
--#ifdef scrollok
--inline int UNDEF(scrollok)(WINDOW* win, bool bf)  { return scrollok(win, bf); }
--#undef scrollok
--#define scrollok UNDEF(scrollok)
--#else
--#if	defined(__NCURSES_H)
--extern "C" NCURSES_IMPEXP int NCURSES_API scrollok(WINDOW*, bool);
--#else
--extern "C" NCURSES_IMPEXP int NCURSES_API scrollok(WINDOW*, char);
--#endif
--#endif
--
--#ifdef setscrreg
--inline int UNDEF(setscrreg)(int t, int b) { return setscrreg(t, b); }
--#undef setscrreg
--#define setscrreg UNDEF(setscrreg)
-+#ifdef mvaddstr
-+inline int UNDEF(mvaddstr)(int y, int x, const char * str)
-+{ return mvaddstr(y, x, str); }
-+#undef mvaddstr
-+#define mvaddstr UNDEF(mvaddstr)
- #endif
- 
--#ifdef standend
--inline int UNDEF(standend)()  { return standend(); }
--#undef standend
--#define standend UNDEF(standend)
-+#ifdef mvchgat
-+inline int UNDEF(mvchgat)(int y, int x, int n,
-+			  attr_t attr, short color, const void *opts) {
-+  return mvchgat(y, x, n, attr, color, opts); }
-+#undef mvchgat
-+#define mvchgat UNDEF(mvchgat)
- #endif
- 
--#ifdef standout
--inline int UNDEF(standout)()  { return standout(); }
--#undef standout
--#define standout UNDEF(standout)
-+#ifdef mvdelch
-+inline int UNDEF(mvdelch)(int y, int x) { return mvdelch(y, x);}
-+#undef mvdelch
-+#define mvdelch UNDEF(mvdelch)
- #endif
- 
--#ifdef subpad
--inline WINDOW *UNDEF(subpad)(WINDOW *p, int l, int c, int y, int x)
--{ return derwin(p, l, c, y, x); }
--#undef subpad
--#define subpad UNDEF(subpad)
-+#ifdef mvgetch
-+inline int UNDEF(mvgetch)(int y, int x) { return mvgetch(y, x);}
-+#undef mvgetch
-+#define mvgetch UNDEF(mvgetch)
- #endif
- 
--#ifdef timeout
--inline void UNDEF(timeout)(int delay) { timeout(delay); }
--#undef timeout
--#define timeout UNDEF(timeout)
-+#ifdef mvgetnstr
-+inline int UNDEF(mvgetnstr)(int y, int x, char *str, int n) {
-+  return mvgetnstr(y, x, str, n);}
-+#undef mvgetnstr
-+#define mvgetnstr UNDEF(mvgetnstr)
- #endif
- 
--#ifdef touchline
--inline int UNDEF(touchline)(WINDOW *win, int s, int c)
--{ return touchline(win, s, c); }
--#undef touchline
--#define touchline UNDEF(touchline)
-+#ifdef mvgetstr
-+inline int UNDEF(mvgetstr)(int y, int x, char *str) {return mvgetstr(y, x, str);}
-+#undef mvgetstr
-+#define mvgetstr UNDEF(mvgetstr)
- #endif
- 
--#ifdef touchwin
--inline int UNDEF(touchwin)(WINDOW *win) { return touchwin(win); }
--#undef touchwin
--#define touchwin UNDEF(touchwin)
-+#ifdef mvinch
-+inline chtype UNDEF(mvinch)(int y, int x) { return mvinch(y, x);}
-+#undef mvinch
-+#define mvinch UNDEF(mvinch)
- #endif
- 
--#ifdef untouchwin
--inline int UNDEF(untouchwin)(WINDOW *win) { return untouchwin(win); }
--#undef untouchwin
--#define untouchwin UNDEF(untouchwin)
-+#ifdef mvinnstr
-+inline int UNDEF(mvinnstr)(int y, int x, char *_str, int n) {
-+  return mvinnstr(y, x, _str, n); }
-+#undef mvinnstr
-+#define mvinnstr UNDEF(mvinnstr)
- #endif
- 
--#ifdef vline
--inline int UNDEF(vline)(chtype ch, int n) { return vline(ch, n); }
--#undef vline
--#define vline UNDEF(vline)
-+#ifdef mvinsch
-+inline int UNDEF(mvinsch)(int y, int x, chtype c)
-+{ return mvinsch(y, x, c); }
-+#undef mvinsch
-+#define mvinsch UNDEF(mvinsch)
- #endif
- 
--#ifdef waddstr
--inline int UNDEF(waddstr)(WINDOW *win, char *str) { return waddstr(win, str); }
--#undef waddstr
--#define waddstr UNDEF(waddstr)
-+#ifdef mvinsnstr
-+inline int UNDEF(mvinsnstr)(int y, int x, const char *_str, int n) {
-+  return mvinsnstr(y, x, _str, n); }
-+#undef mvinsnstr
-+#define mvinsnstr UNDEF(mvinsnstr)
- #endif
- 
--#ifdef waddchstr
--inline int UNDEF(waddchstr)(WINDOW *win, chtype *at) { return waddchstr(win, at); }
--#undef waddchstr
--#define waddchstr UNDEF(waddchstr)
-+#ifdef mvinsstr
-+inline int UNDEF(mvinsstr)(int y, int x, const char *_str)  {
-+  return mvinsstr(y, x, _str); }
-+#undef mvinsstr
-+#define mvinsstr UNDEF(mvinsstr)
- #endif
- 
--#ifdef wstandend
--inline int UNDEF(wstandend)(WINDOW *win)  { return wstandend(win); }
--#undef wstandend
--#define wstandend UNDEF(wstandend)
-+#ifdef mvwaddch
-+inline int UNDEF(mvwaddch)(WINDOW *win, int y, int x, const chtype ch)
-+{ return mvwaddch(win, y, x, ch); }
-+#undef mvwaddch
-+#define mvwaddch UNDEF(mvwaddch)
- #endif
- 
--#ifdef wstandout
--inline int UNDEF(wstandout)(WINDOW *win)  { return wstandout(win); }
--#undef wstandout
--#define wstandout UNDEF(wstandout)
-+#ifdef mvwaddchnstr
-+inline int UNDEF(mvwaddchnstr)(WINDOW *win, int y, int x, const chtype *str, int n)
-+{ return mvwaddchnstr(win, y, x, str, n); }
-+#undef mvwaddchnstr
-+#define mvwaddchnstr UNDEF(mvwaddchnstr)
- #endif
- 
--
--#ifdef wattroff
--inline int UNDEF(wattroff)(WINDOW *win, int att) { return wattroff(win, att); }
--#undef wattroff
--#define wattroff UNDEF(wattroff)
-+#ifdef mvwaddchstr
-+inline int UNDEF(mvwaddchstr)(WINDOW *win, int y, int x, const chtype *str)
-+{ return mvwaddchstr(win, y, x, str); }
-+#undef mvwaddchstr
-+#define mvwaddchstr UNDEF(mvwaddchstr)
- #endif
- 
--#ifdef chgat
--inline int UNDEF(chgat)(int n, attr_t attr, short color, const void *opts) {
--  return chgat(n, attr, color, opts); }
--#undef chgat
--#define chgat UNDEF(chgat)
-+#ifdef mvwaddnstr
-+inline int UNDEF(mvwaddnstr)(WINDOW *win, int y, int x, const char *str, int n)
-+{ return mvwaddnstr(win, y, x, str, n); }
-+#undef mvwaddnstr
-+#define mvwaddnstr UNDEF(mvwaddnstr)
- #endif
- 
--#ifdef mvchgat
--inline int UNDEF(mvchgat)(int y, int x, int n,
--			  attr_t attr, short color, const void *opts) {
--  return mvchgat(y, x, n, attr, color, opts); }
--#undef mvchgat
--#define mvchgat UNDEF(mvchgat)
-+#ifdef mvwaddstr
-+inline int UNDEF(mvwaddstr)(WINDOW *win, int y, int x, const char * str)
-+{ return mvwaddstr(win, y, x, str); }
-+#undef mvwaddstr
-+#define mvwaddstr UNDEF(mvwaddstr)
- #endif
- 
- #ifdef mvwchgat
-@@ -479,212 +469,275 @@
- #define mvwchgat UNDEF(mvwchgat)
- #endif
- 
--#ifdef wattrset
--inline int UNDEF(wattrset)(WINDOW *win, int att) { return wattrset(win, att); }
--#undef wattrset
--#define wattrset UNDEF(wattrset)
-+#ifdef mvwdelch
-+inline int UNDEF(mvwdelch)(WINDOW *win, int y, int x)
-+{ return mvwdelch(win, y, x); }
-+#undef mvwdelch
-+#define mvwdelch UNDEF(mvwdelch)
- #endif
- 
--#ifdef winch
--inline chtype UNDEF(winch)(const WINDOW* win) { return winch(win); }
--#undef winch
--#define winch UNDEF(winch)
-+#ifdef mvwgetch
-+inline int UNDEF(mvwgetch)(WINDOW *win, int y, int x) { return mvwgetch(win, y, x);}
-+#undef mvwgetch
-+#define mvwgetch UNDEF(mvwgetch)
- #endif
- 
--#ifdef mvwaddch
--inline int UNDEF(mvwaddch)(WINDOW *win, int y, int x, const chtype ch)
--{ return mvwaddch(win, y, x, ch); }
--#undef mvwaddch
--#define mvwaddch UNDEF(mvwaddch)
-+#ifdef mvwgetnstr
-+inline int UNDEF(mvwgetnstr)(WINDOW *win, int y, int x, char *str, int n)
-+{return mvwgetnstr(win, y, x, str, n);}
-+#undef mvwgetnstr
-+#define mvwgetnstr UNDEF(mvwgetnstr)
- #endif
- 
--#ifdef mvwaddchnstr
--inline int UNDEF(mvwaddchnstr)(WINDOW *win, int y, int x, chtype *str, int n)
--{ return mvwaddchnstr(win, y, x, str, n); }
--#undef mvwaddchnstr
--#define mvwaddchnstr UNDEF(mvwaddchnstr)
-+#ifdef mvwgetstr
-+inline int UNDEF(mvwgetstr)(WINDOW *win, int y, int x, char *str)
-+{return mvwgetstr(win, y, x, str);}
-+#undef mvwgetstr
-+#define mvwgetstr UNDEF(mvwgetstr)
- #endif
- 
--#ifdef mvwaddchstr
--inline int UNDEF(mvwaddchstr)(WINDOW *win, int y, int x, chtype *str)
--{ return mvwaddchstr(win, y, x, str); }
--#undef mvwaddchstr
--#define mvwaddchstr UNDEF(mvwaddchstr)
-+#ifdef mvwhline
-+inline int UNDEF(mvwhline)(WINDOW *win, int y, int x, chtype c, int n) {
-+  return mvwhline(win, y, x, c, n); }
-+#undef mvwhline
-+#define mvwhline UNDEF(mvwhline)
- #endif
- 
--#ifdef addnstr
--inline int UNDEF(addnstr)(const char *str, int n)
--{ return addnstr(str, n); }
--#undef addnstr
--#define addnstr UNDEF(addnstr)
-+#ifdef mvwinch
-+inline chtype UNDEF(mvwinch)(WINDOW *win, int y, int x) {
-+  return mvwinch(win, y, x);}
-+#undef mvwinch
-+#define mvwinch UNDEF(mvwinch)
-+#endif
-+
-+#ifdef mvwinchnstr
-+inline int UNDEF(mvwinchnstr)(WINDOW *win, int y, int x, chtype *str, int n)  { return mvwinchnstr(win, y, x, str, n); }
-+#undef mvwinchnstr
-+#define mvwinchnstr UNDEF(mvwinchnstr)
-+#endif
-+
-+#ifdef mvwinchstr
-+inline int UNDEF(mvwinchstr)(WINDOW *win, int y, int x, chtype *str)  { return mvwinchstr(win, y, x, str); }
-+#undef mvwinchstr
-+#define mvwinchstr UNDEF(mvwinchstr)
-+#endif
-+
-+#ifdef mvwinnstr
-+inline int UNDEF(mvwinnstr)(WINDOW *win, int y, int x, char *_str, int n) {
-+  return mvwinnstr(win, y, x, _str, n); }
-+#undef mvwinnstr
-+#define mvwinnstr UNDEF(mvwinnstr)
-+#endif
-+
-+#ifdef mvwinsch
-+inline int UNDEF(mvwinsch)(WINDOW *win, int y, int x, chtype c)
-+{ return mvwinsch(win, y, x, c); }
-+#undef mvwinsch
-+#define mvwinsch UNDEF(mvwinsch)
-+#endif
-+
-+#ifdef mvwinsnstr
-+inline int UNDEF(mvwinsnstr)(WINDOW *w, int y, int x, const char *_str, int n) {
-+  return mvwinsnstr(w, y, x, _str, n); }
-+#undef mvwinsnstr
-+#define mvwinsnstr UNDEF(mvwinsnstr)
-+#endif
-+
-+#ifdef mvwinsstr
-+inline int UNDEF(mvwinsstr)(WINDOW *w, int y, int x,  const char *_str)  {
-+  return mvwinsstr(w, y, x, _str); }
-+#undef mvwinsstr
-+#define mvwinsstr UNDEF(mvwinsstr)
-+#endif
-+
-+#ifdef mvwvline
-+inline int UNDEF(mvwvline)(WINDOW *win, int y, int x, chtype c, int n) {
-+  return mvwvline(win, y, x, c, n); }
-+#undef mvwvline
-+#define mvwvline UNDEF(mvwvline)
-+#endif
-+
-+#ifdef napms
-+inline void UNDEF(napms)(unsigned long x) { napms(x); }
-+#undef napms
-+#define napms UNDEF(napms)
-+#endif
-+
-+#ifdef nocrmode
-+inline int UNDEF(nocrmode)(void) { return nocrmode(); }
-+#undef nocrmode
-+#define nocrmode UNDEF(nocrmode)
-+#endif
-+
-+#ifdef nodelay
-+inline void UNDEF(nodelay)() { nodelay(); }
-+#undef nodelay
-+#define nodelay UNDEF(nodelay)
- #endif
- 
--#ifdef mvwaddnstr
--inline int UNDEF(mvwaddnstr)(WINDOW *win, int y, int x, const char *str, int n)
--{ return mvwaddnstr(win, y, x, str, n); }
--#undef mvwaddnstr
--#define mvwaddnstr UNDEF(mvwaddnstr)
-+#ifdef redrawwin
-+inline int UNDEF(redrawwin)(WINDOW *win)  { return redrawwin(win); }
-+#undef redrawwin
-+#define redrawwin UNDEF(redrawwin)
- #endif
- 
--#ifdef mvwaddstr
--inline int UNDEF(mvwaddstr)(WINDOW *win, int y, int x, const char * str)
--{ return mvwaddstr(win, y, x, str); }
--#undef mvwaddstr
--#define mvwaddstr UNDEF(mvwaddstr)
-+#ifdef refresh
-+inline int UNDEF(refresh)()  { return refresh(); }
-+#undef refresh
-+#define refresh UNDEF(refresh)
- #endif
- 
--#ifdef mvwdelch
--inline int UNDEF(mvwdelch)(WINDOW *win, int y, int x)
--{ return mvwdelch(win, y, x); }
--#undef mvwdelch
--#define mvwdelch UNDEF(mvwdelch)
-+#ifdef resetterm
-+inline int UNDEF(resetterm)(void) { return resetterm(); }
-+#undef resetterm
-+#define resetterm UNDEF(resetterm)
- #endif
- 
--#ifdef mvwgetch
--inline int UNDEF(mvwgetch)(WINDOW *win, int y, int x) { return mvwgetch(win, y, x);}
--#undef mvwgetch
--#define mvwgetch UNDEF(mvwgetch)
-+#ifdef saveterm
-+inline int UNDEF(saveterm)(void) { return saveterm(); }
-+#undef saveterm
-+#define saveterm UNDEF(saveterm)
- #endif
- 
--#ifdef mvwgetstr
--inline int UNDEF(mvwgetstr)(WINDOW *win, int y, int x, char *str)
--{return mvwgetstr(win, y, x, str);}
--#undef mvwgetstr
--#define mvwgetstr UNDEF(mvwgetstr)
-+#ifdef scrl
-+inline int UNDEF(scrl)(int l) { return scrl(l); }
-+#undef scrl
-+#define scrl UNDEF(scrl)
- #endif
- 
--#ifdef mvwgetnstr
--inline int UNDEF(mvwgetnstr)(WINDOW *win, int y, int x, char *str, int n)
--{return mvwgetnstr(win, y, x, str, n);}
--#undef mvwgetnstr
--#define mvwgetnstr UNDEF(mvwgetnstr)
-+#ifdef scroll
-+inline int UNDEF(scroll)(WINDOW *win) { return scroll(win); }
-+#undef scroll
-+#define scroll UNDEF(scroll)
- #endif
- 
--#ifdef mvwinch
--inline chtype UNDEF(mvwinch)(WINDOW *win, int y, int x) {
--  return mvwinch(win, y, x);}
--#undef mvwinch
--#define mvwinch UNDEF(mvwinch)
-+#ifdef scrollok
-+inline int UNDEF(scrollok)(WINDOW* win, bool bf)  { return scrollok(win, bf); }
-+#undef scrollok
-+#define scrollok UNDEF(scrollok)
-+#else
-+#if	defined(__NCURSES_H)
-+extern "C" NCURSES_IMPEXP int NCURSES_API scrollok(WINDOW*, bool);
-+#else
-+extern "C" NCURSES_IMPEXP int NCURSES_API scrollok(WINDOW*, char);
-+#endif
- #endif
- 
--#ifdef mvwinsch
--inline int UNDEF(mvwinsch)(WINDOW *win, int y, int x, chtype c)
--{ return mvwinsch(win, y, x, c); }
--#undef mvwinsch
--#define mvwinsch UNDEF(mvwinsch)
-+#ifdef setscrreg
-+inline int UNDEF(setscrreg)(int t, int b) { return setscrreg(t, b); }
-+#undef setscrreg
-+#define setscrreg UNDEF(setscrreg)
- #endif
- 
--#ifdef mvaddch
--inline int UNDEF(mvaddch)(int y, int x, chtype ch)
--{ return mvaddch(y, x, ch); }
--#undef mvaddch
--#define mvaddch UNDEF(mvaddch)
-+#ifdef standend
-+inline int UNDEF(standend)()  { return standend(); }
-+#undef standend
-+#define standend UNDEF(standend)
- #endif
- 
--#ifdef mvaddnstr
--inline int UNDEF(mvaddnstr)(int y, int x, const char *str, int n)
--{ return mvaddnstr(y, x, str, n); }
--#undef mvaddnstr
--#define mvaddnstr UNDEF(mvaddnstr)
-+#ifdef standout
-+inline int UNDEF(standout)()  { return standout(); }
-+#undef standout
-+#define standout UNDEF(standout)
- #endif
- 
--#ifdef mvaddstr
--inline int UNDEF(mvaddstr)(int y, int x, const char * str)
--{ return mvaddstr(y, x, str); }
--#undef mvaddstr
--#define mvaddstr UNDEF(mvaddstr)
-+#ifdef subpad
-+inline WINDOW *UNDEF(subpad)(WINDOW *p, int l, int c, int y, int x)
-+{ return derwin(p, l, c, y, x); }
-+#undef subpad
-+#define subpad UNDEF(subpad)
- #endif
- 
--#ifdef mvdelch
--inline int UNDEF(mvdelch)(int y, int x) { return mvdelch(y, x);}
--#undef mvdelch
--#define mvdelch UNDEF(mvdelch)
-+#ifdef timeout
-+inline void UNDEF(timeout)(int delay) { timeout(delay); }
-+#undef timeout
-+#define timeout UNDEF(timeout)
- #endif
- 
--#ifdef mvgetch
--inline int UNDEF(mvgetch)(int y, int x) { return mvgetch(y, x);}
--#undef mvgetch
--#define mvgetch UNDEF(mvgetch)
-+#ifdef touchline
-+inline int UNDEF(touchline)(WINDOW *win, int s, int c)
-+{ return touchline(win, s, c); }
-+#undef touchline
-+#define touchline UNDEF(touchline)
- #endif
- 
--#ifdef mvgetstr
--inline int UNDEF(mvgetstr)(int y, int x, char *str) {return mvgetstr(y, x, str);}
--#undef mvgetstr
--#define mvgetstr UNDEF(mvgetstr)
-+#ifdef touchwin
-+inline int UNDEF(touchwin)(WINDOW *win) { return touchwin(win); }
-+#undef touchwin
-+#define touchwin UNDEF(touchwin)
- #endif
- 
--#ifdef mvgetnstr
--inline int UNDEF(mvgetnstr)(int y, int x, char *str, int n) {
--  return mvgetnstr(y, x, str, n);}
--#undef mvgetnstr
--#define mvgetnstr UNDEF(mvgetnstr)
-+#ifdef untouchwin
-+inline int UNDEF(untouchwin)(WINDOW *win) { return untouchwin(win); }
-+#undef untouchwin
-+#define untouchwin UNDEF(untouchwin)
- #endif
- 
--#ifdef mvinch
--inline chtype UNDEF(mvinch)(int y, int x) { return mvinch(y, x);}
--#undef mvinch
--#define mvinch UNDEF(mvinch)
-+#ifdef vline
-+inline int UNDEF(vline)(chtype ch, int n) { return vline(ch, n); }
-+#undef vline
-+#define vline UNDEF(vline)
- #endif
- 
--#ifdef mvinsch
--inline int UNDEF(mvinsch)(int y, int x, chtype c)
--{ return mvinsch(y, x, c); }
--#undef mvinsch
--#define mvinsch UNDEF(mvinsch)
-+#ifdef waddchstr
-+inline int UNDEF(waddchstr)(WINDOW *win, chtype *at) { return waddchstr(win, at); }
-+#undef waddchstr
-+#define waddchstr UNDEF(waddchstr)
- #endif
- 
--#ifdef napms
--inline void UNDEF(napms)(unsigned long x) { napms(x); }
--#undef napms
--#define napms UNDEF(napms)
-+#ifdef waddstr
-+inline int UNDEF(waddstr)(WINDOW *win, char *str) { return waddstr(win, str); }
-+#undef waddstr
-+#define waddstr UNDEF(waddstr)
- #endif
- 
--#ifdef fixterm
--inline int UNDEF(fixterm)(void) { return fixterm(); }
--#undef fixterm
--#define fixterm UNDEF(fixterm)
-+#ifdef wattroff
-+inline int UNDEF(wattroff)(WINDOW *win, int att) { return wattroff(win, att); }
-+#undef wattroff
-+#define wattroff UNDEF(wattroff)
- #endif
- 
--#ifdef resetterm
--inline int UNDEF(resetterm)(void) { return resetterm(); }
--#undef resetterm
--#define resetterm UNDEF(resetterm)
-+#ifdef wattrset
-+inline int UNDEF(wattrset)(WINDOW *win, int att) { return wattrset(win, att); }
-+#undef wattrset
-+#define wattrset UNDEF(wattrset)
- #endif
- 
--#ifdef saveterm
--inline int UNDEF(saveterm)(void) { return saveterm(); }
--#undef saveterm
--#define saveterm UNDEF(saveterm)
-+#ifdef winch
-+inline chtype UNDEF(winch)(const WINDOW* win) { return winch(win); }
-+#undef winch
-+#define winch UNDEF(winch)
- #endif
- 
--#ifdef crmode
--inline int UNDEF(crmode)(void) { return crmode(); }
--#undef crmode
--#define crmode UNDEF(crmode)
-+#ifdef winchnstr
-+inline int UNDEF(winchnstr)(WINDOW *win, chtype *str, int n)  { return winchnstr(win, str, n); }
-+#undef winchnstr
-+#define winchnstr UNDEF(winchnstr)
- #endif
- 
--#ifdef nocrmode
--inline int UNDEF(nocrmode)(void) { return nocrmode(); }
--#undef nocrmode
--#define nocrmode UNDEF(nocrmode)
-+#ifdef winchstr
-+inline int UNDEF(winchstr)(WINDOW *win, chtype *str)  { return winchstr(win, str); }
-+#undef winchstr
-+#define winchstr UNDEF(winchstr)
- #endif
- 
--#ifdef getbkgd
--inline chtype UNDEF(getbkgd)(const WINDOW *win) { return getbkgd(win); }
--#undef getbkgd
--#define getbkgd UNDEF(getbkgd)
-+#ifdef winsstr
-+inline int UNDEF(winsstr)(WINDOW *w, const char *_str)  {
-+  return winsstr(w, _str); }
-+#undef winsstr
-+#define winsstr UNDEF(winsstr)
- #endif
- 
--#ifdef bkgd
--inline int UNDEF(bkgd)(chtype ch) { return bkgd(ch); }
--#undef bkgd
--#define bkgd UNDEF(bkgd)
-+#ifdef wstandend
-+inline int UNDEF(wstandend)(WINDOW *win)  { return wstandend(win); }
-+#undef wstandend
-+#define wstandend UNDEF(wstandend)
- #endif
- 
--#ifdef bkgdset
--inline void UNDEF(bkgdset)(chtype ch) { bkgdset(ch); }
--#undef bkgdset
--#define bkgdset UNDEF(bkgdset)
-+#ifdef wstandout
-+inline int UNDEF(wstandout)(WINDOW *win)  { return wstandout(win); }
-+#undef wstandout
-+#define wstandout UNDEF(wstandout)
- #endif
- 
- /*
-@@ -705,11 +758,13 @@
- private:
-   static bool    b_initialized;
-   static void    initialize();
-+  void           constructing();
-   friend int     _nc_xx_ripoff_init(WINDOW *, int);
- 
--  void           init();
-+  void           set_keyboard();
- 
-   short          getcolor(int getback) const;
-+  short          getPair() const;
- 
-   static int     setpalette(short fore, short back, short pair);
-   static int     colorInitialized;
-@@ -743,7 +798,7 @@
-   NCursesWindow();
- 
- public:
--  NCursesWindow(WINDOW* &window);  // useful only for stdscr
-+  NCursesWindow(WINDOW* window);   // useful only for stdscr
- 
-   NCursesWindow(int nlines,        // number of lines
- 		int ncols,         // number of columns
-@@ -823,16 +878,22 @@
-   int            width() const { return maxx() + 1; }
-   // Number of columns in this window
- 
--  int            begx() const { return w->_begx; }
-+  int            begx() const { return getbegx(w); }
-+  // Column of top left corner relative to stdscr
-+
-+  int            begy() const { return getbegy(w); }
-+  // Line of top left corner relative to stdscr
-+
-+  int            curx() const { return getcurx(w); }
-   // Column of top left corner relative to stdscr
- 
--  int            begy() const { return w->_begy; }
-+  int            cury() const { return getcury(w); }
-   // Line of top left corner relative to stdscr
- 
--  int            maxx() const { return w->_maxx; }
-+  int            maxx() const { return getmaxx(w) == ERR ? ERR : getmaxx(w)-1; }
-   // Largest x coord in window
- 
--  int            maxy() const { return w->_maxy; }
-+  int            maxy() const { return getmaxy(w) == ERR ? ERR : getmaxy(w)-1; }
-   // Largest y coord in window
- 
-   short          getcolor() const;
-@@ -867,6 +928,15 @@
-   void           getyx(int& y, int& x) const { ::getyx(w, y, x); }
-   // Get current position of the cursor
- 
-+  void           getbegyx(int& y, int& x) const { ::getbegyx(w, y, x); }
-+  // Get beginning of the window
-+
-+  void           getmaxyx(int& y, int& x) const { ::getmaxyx(w, y, x); }
-+  // Get size of the window
-+
-+  void           getparyx(int& y, int& x) const { ::getparyx(w, y, x); }
-+  // Get parent's beginning of the window
-+
-   int            mvcur(int oldrow, int oldcol, int newrow, int newcol) const {
-     return ::mvcur(oldrow, oldcol, newrow, newcol); }
-   // Perform lowlevel cursor motion that takes effect immediately.
-@@ -909,6 +979,9 @@
-   ;
- #endif
- 
-+  int            scanw(const char*, va_list);
-+    // Perform a scanw function from the window.
-+
-   int            scanw(int y, int x, const char* fmt, ...)
-     // Move the cursor to the requested position and then perform a scanw
-     // from the window.
-@@ -918,6 +991,10 @@
-   ;
- #endif
- 
-+  int            scanw(int y, int x, const char* fmt, va_list);
-+    // Move the cursor to the requested position and then perform a scanw
-+    // from the window.
-+
-   // -------------------------------------------------------------------------
-   // output
-   // -------------------------------------------------------------------------
-@@ -939,7 +1016,17 @@
- 
-   int            addstr(int y, int x, const char * str, int n=-1) {
-     return ::mvwaddnstr(w, y, x, str, n); }
--  // Move the cursor to the requested position and then perform the addstr
-+  // Move the cursor to the requested position and then perform the addchstr
-+  // as described above.
-+
-+  int            addchstr(const chtype* str, int n=-1) {
-+    return ::waddchnstr(w, str, n); }
-+  // Write the string str to the window, stop writing if the terminating
-+  // NUL or the limit n is reached. If n is negative, it is ignored.
-+
-+  int            addchstr(int y, int x, const chtype * str, int n=-1) {
-+    return ::mvwaddchnstr(w, y, x, str, n); }
-+  // Move the cursor to the requested position and then perform the addchstr
-   // as described above.
- 
-   int            printw(const char* fmt, ...)
-@@ -958,6 +1045,12 @@
-   ;
- #endif
- 
-+  int            printw(const char* fmt, va_list args);
-+    // Do a formatted print to the window.
-+
-+  int            printw(int y, int x, const char * fmt, va_list args);
-+    // Move the cursor and then do a formatted print to the window.
-+
-   chtype         inch() const { return ::winch(w); }
-   // Retrieve attributed character under the current cursor position.
- 
-@@ -965,6 +1058,16 @@
-   // Move cursor to requested position and then retrieve attributed character
-   // at this position.
- 
-+  int            inchstr(chtype* str, int n=-1) {
-+    return ::winchnstr(w, str, n); }
-+  // Read the string str from the window, stop reading if the terminating
-+  // NUL or the limit n is reached. If n is negative, it is ignored.
-+
-+  int            inchstr(int y, int x, chtype * str, int n=-1) {
-+    return ::mvwinchnstr(w, y, x, str, n); }
-+  // Move the cursor to the requested position and then perform the inchstr
-+  // as described above.
-+
-   int            insch(chtype ch) { return ::winsch(w, ch); }
-   // Insert attributed character into the window before current cursor
-   // position.
-@@ -1001,6 +1104,9 @@
-   int            attrset(chtype at) { return ::wattrset(w, static_cast<int>(at)); }
-   // Set the window attributes;
- 
-+  chtype         attrget() { return ::getattrs(w); }
-+  // Get the window attributes;
-+
-   int            color_set(short color_pair_number, void* opts=NULL) {
-     return ::wcolor_set(w, color_pair_number, opts); }
-   // Set the window color attribute;
-@@ -1116,11 +1222,13 @@
-   // If bf is TRUE, use insert/delete line hardware support if possible.
-   // Otherwise do it in software.
- 
--
-   void           idcok(bool bf) { ::idcok(w, bf); }
-   // If bf is TRUE, use insert/delete character hardware support if possible.
-   // Otherwise do it in software.
- 
-+  int            touchline(int s, int c) { return ::touchline(w, s, c); }
-+  // Mark the given lines as modified.
-+
-   int            touchwin()   { return ::wtouchln(w, 0, height(), 1); }
-   // Mark the whole window as modified.
- 
-@@ -1173,9 +1281,13 @@
-   // If called with bf=TRUE, any change in the window will cause an
-   // automatic immediate refresh()
- 
-+  int            intrflush(bool bf) { return ::intrflush(w, bf); }
-+
-   int            keypad(bool bf) { return ::keypad(w, bf); }
-   // If called with bf=TRUE, the application will interpret function keys.
- 
-+  int            nodelay(bool bf) { return ::nodelay(w, bf); }
-+
-   int            meta(bool bf) { return ::meta(w, bf); }
-   // If called with bf=TRUE, keys may generate 8-Bit characters. Otherwise
-   // 7-Bit characters are generated.
-@@ -1220,6 +1332,14 @@
-   // sminrow,smincol.
- 
-   // -------------------------------------------------------------------------
-+  // Extended functions
-+  // -------------------------------------------------------------------------
-+#if defined(NCURSES_EXT_FUNCS) && (NCURSES_EXT_FUNCS != 0)
-+  int            wresize(int newLines, int newColumns) {
-+    return ::wresize(w, newLines, newColumns); }
-+#endif
-+
-+  // -------------------------------------------------------------------------
-   // Mouse related
-   // -------------------------------------------------------------------------
-   bool has_mouse() const;
-diff -Naur ncurses-5.6.orig/c++/demo.cc ncurses-5.6/c++/demo.cc
---- ncurses-5.6.orig/c++/demo.cc	2006-04-22 18:38:57.000000000 -0400
-+++ ncurses-5.6/c++/demo.cc	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
- // * This makes emacs happy -*-Mode: C++;-*-
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -35,7 +35,7 @@
-  *   Demo code for NCursesMenu and NCursesForm written by
-  *   Juergen Pfeifer
-  *
-- * $Id: demo.cc,v 1.34 2006/04/22 22:38:57 tom Exp $
-+ * $Id: demo.cc,v 1.36 2007/04/07 20:24:49 tom Exp $
-  */
- 
- #include "internal.h"
-@@ -55,30 +55,30 @@
-   public:
-   void run(int sleeptime) {
- 
--    NCursesPanel *std = new NCursesPanel();
-+    NCursesPanel *mystd = new NCursesPanel();
- 
-     //  Make a few small demo panels
- 
--    NCursesPanel *u = new NCursesPanel(8,20,12,4);
--    NCursesPanel *v = new NCursesPanel(8,20,10,6);
--    NCursesPanel *w = new NCursesPanel(8,20,8,8);
--    NCursesPanel *x = new NCursesPanel(8,20,6,10);
--    NCursesPanel *y = new NCursesPanel(8,20,4,12);
--    NCursesPanel *z = new NCursesPanel(8,30,2,14);
-+    NCursesPanel *u = new NCursesPanel(8, 20, 12, 4);
-+    NCursesPanel *v = new NCursesPanel(8, 20, 10, 6);
-+    NCursesPanel *w = new NCursesPanel(8, 20, 8, 8);
-+    NCursesPanel *x = new NCursesPanel(8, 20, 6, 10);
-+    NCursesPanel *y = new NCursesPanel(8, 20, 4, 12);
-+    NCursesPanel *z = new NCursesPanel(8, 30, 2, 14);
- 
-     //  Draw something on the main screen, so we can see what happens
-     //  when panels get moved or deleted.
- 
--    std->box();
--    std->move(std->height()/2,1);
--    std->hline(std->width()-2);
--    std->move(1,std->width()/2);
--    std->vline(std->height()-2);
--    std->addch(0,std->width()/2,ACS_TTEE);
--    std->addch(std->height()-1,std->width()/2,ACS_BTEE);
--    std->addch(std->height()/2,0,ACS_LTEE);
--    std->addch(std->height()/2,std->width()-1,ACS_RTEE);
--    std->addch(std->height()/2,std->width()/2,ACS_PLUS);
-+    mystd->box();
-+    mystd->move(mystd->height()/2, 1);
-+    mystd->hline(mystd->width()-2);
-+    mystd->move(1, mystd->width()/2);
-+    mystd->vline(mystd->height()-2);
-+    mystd->addch(0, mystd->width()/2, ACS_TTEE);
-+    mystd->addch(mystd->height()-1, mystd->width()/2, ACS_BTEE);
-+    mystd->addch(mystd->height()/2, 0, ACS_LTEE);
-+    mystd->addch(mystd->height()/2, mystd->width()-1, ACS_RTEE);
-+    mystd->addch(mystd->height()/2, mystd->width()/2, ACS_PLUS);
- 
-     //  Draw frames with titles around panels so that we can see where
-     //  the panels are located.
-@@ -98,56 +98,56 @@
-     }
- 
-     //  A refresh to any valid panel updates all panels and refreshes
--    //  the screen.  Using std is just convenient - We know it's always
-+    //  the screen.  Using mystd is just convenient - We know it's always
-     //  valid until the end of the program.
- 
--    std->refresh();
-+    mystd->refresh();
-     sleep(sleeptime);
- 
-     //  Show what happens when panels are deleted and moved.
- 
-     sleep(sleeptime);
-     delete u;
--    std->refresh();
-+    mystd->refresh();
- 
-     sleep(sleeptime);
-     delete z;
--    std->refresh();
-+    mystd->refresh();
- 
-     sleep(sleeptime);
-     delete v;
--    std->refresh();
-+    mystd->refresh();
- 
-     // show how it looks when a panel moves
-     sleep(sleeptime);
--    y->mvwin(5,30);
--    std->refresh();
-+    y->mvwin(5, 30);
-+    mystd->refresh();
- 
-     sleep(sleeptime);
-     delete y;
--    std->refresh();
-+    mystd->refresh();
- 
-     // show how it looks when you raise a panel
-     sleep(sleeptime);
-     w->top();
--    std->refresh();
-+    mystd->refresh();
- 
-     sleep(sleeptime);
-     delete w;
--    std->refresh();
-+    mystd->refresh();
- 
-     sleep(sleeptime);
-     delete x;
- 
--    std->clear();
--    std->refresh();
-+    mystd->clear();
-+    mystd->refresh();
- 
-     //  Don't forget to clean up the main screen.  Since this is the
-     //  last thing using NCursesWindow, this has the effect of
-     //  shutting down ncurses and restoring the terminal state.
- 
-     sleep(sleeptime);
--    delete std;
-+    delete mystd;
-   }
- };
- 
-@@ -247,21 +247,21 @@
- 
-     F     = new NCursesFormField*[10];
-     mft   = new MyFieldType('X');
--    ift   = new Integer_Field(0,1,10);
-+    ift   = new Integer_Field(0, 1, 10);
-     eft   = new Enumeration_Field(weekdays);
- 
--    F[0]  = new Label("Demo Entry Form",0,16);
--    F[1]  = new Label("Weekday Enum",2,1);
--    F[2]  = new Label("Number(1-10)",2,21);
--    F[3]  = new Label("Only 'X'",2,35);
--    F[4]  = new Label("Multiline Field (Dynamic and Scrollable)",5,1);
--    F[5]  = new NCursesFormField(1,18,3,1);
--    F[6]  = new NCursesFormField(1,12,3,21);
--    F[7]  = new NCursesFormField(1,12,3,35);
--    F[8]  = new NCursesFormField(4,46,6,1,2);
-+    F[0]  = new Label("Demo Entry Form", 0, 16);
-+    F[1]  = new Label("Weekday Enum", 2, 1);
-+    F[2]  = new Label("Number(1-10)", 2, 21);
-+    F[3]  = new Label("Only 'X'", 2, 35);
-+    F[4]  = new Label("Multiline Field (Dynamic and Scrollable)", 5, 1);
-+    F[5]  = new NCursesFormField(1, 18, 3, 1);
-+    F[6]  = new NCursesFormField(1, 12, 3, 21);
-+    F[7]  = new NCursesFormField(1, 12, 3, 35);
-+    F[8]  = new NCursesFormField(4, 46, 6, 1, 2);
-     F[9]  = new NCursesFormField();
- 
--    InitForm(F,TRUE,TRUE);
-+    InitForm(F, TRUE, TRUE);
-     boldframe();
- 
-     F[5]->set_fieldtype(*eft);
-@@ -312,7 +312,7 @@
-     Soft_Label_Key_Set* S = new Soft_Label_Key_Set;
-     for(int i=1; i <= S->labels(); i++) {
-       char buf[8];
--      ::sprintf(buf,"Frm%02d",i);
-+      ::sprintf(buf, "Frm%02d", i);
-       (*S)[i] = buf;                                      // Text
-       (*S)[i] = Soft_Label_Key_Set::Soft_Label_Key::Left; // Justification
-     }
-@@ -336,9 +336,9 @@
-     const int PADSIZE  = 200;
-     unsigned gridcount = 0;
- 
--    NCursesPanel std;
--    NCursesPanel P(std.lines()-2,std.cols()-2,1,1);
--    NCursesFramedPad FP(P,PADSIZE,PADSIZE);
-+    NCursesPanel mystd;
-+    NCursesPanel P(mystd.lines()-2, mystd.cols()-2, 1, 1);
-+    NCursesFramedPad FP(P, PADSIZE, PADSIZE);
- 
-     for (int i=0; i < PADSIZE; i++) {
-       for (int j=0; j < PADSIZE; j++) {
-@@ -357,7 +357,7 @@
-       }
-     }
- 
--    P.label("Pad Demo",NULL);
-+    P.label("Pad Demo", NULL);
-     FP();
-     P.clear();
-     return FALSE;
-@@ -385,9 +385,9 @@
-   }
- 
-   bool action() {
--    NCursesPanel *std = new NCursesPanel();
-+    NCursesPanel *mystd = new NCursesPanel();
- 
--    NCursesPanel *w = new NCursesPanel(std->lines() - 2, std->cols() - 2, 1, 1);
-+    NCursesPanel *w = new NCursesPanel(mystd->lines() - 2, mystd->cols() - 2, 1, 1);
-     w->box();
-     w->refresh();
- 
-@@ -411,7 +411,7 @@
- 
-     delete s;
-     delete w;
--    delete std;
-+    delete mystd;
-     ::noecho();
-     return FALSE;
-   }
-@@ -444,10 +444,10 @@
-     I[6] = new QuitItem();
-     I[7] = new NCursesMenuItem(); // Terminating empty item
- 
--    InitMenu(I,TRUE,TRUE);
-+    InitMenu(I, TRUE, TRUE);
- 
--    P = new NCursesPanel(1,n_items,LINES-1,1);
--    boldframe("Demo","Silly");
-+    P = new NCursesPanel(1, n_items, LINES-1, 1);
-+    boldframe("Demo", "Silly");
-     P->show();
-   }
- 
-@@ -474,7 +474,7 @@
-   virtual void On_Menu_Init()
-   {
-     NCursesWindow W(::stdscr);
--    P->move(0,0);
-+    P->move(0, 0);
-     P->clrtoeol();
-     for(int i=1; i<=count(); i++)
-       P->addch('0' + i);
-@@ -484,25 +484,25 @@
- 
-   virtual void On_Menu_Termination()
-   {
--    P->move(0,0);
-+    P->move(0, 0);
-     P->clrtoeol();
-     refresh();
-   }
- 
-   virtual void On_Item_Init(NCursesMenuItem& item)
-   {
--    P->move(0,item.index());
-+    P->move(0, item.index());
-     P->attron(A_REVERSE);
--    P->printw("%1d",1+item.index());
-+    P->printw("%1d", 1+item.index());
-     P->attroff(A_REVERSE);
-     refresh();
-   }
- 
-   virtual void On_Item_Termination(NCursesMenuItem& item)
-   {
--    P->move(0,item.index());
-+    P->move(0, item.index());
-     P->attroff(A_REVERSE);
--    P->printw("%1d",1+item.index());
-+    P->printw("%1d", 1+item.index());
-     refresh();
-   }
- };
-@@ -530,7 +530,7 @@
- {
-   for(int i=1; i <= S.labels(); i++) {
-     char buf[8];
--    ::sprintf(buf,"Key%02d",i);
-+    ::sprintf(buf, "Key%02d", i);
-     S[i] = buf;                                      // Text
-     S[i] = Soft_Label_Key_Set::Soft_Label_Key::Left; // Justification
-   }
-@@ -542,7 +542,7 @@
-   const int len = ::strlen(titleText);
- 
-   titleWindow->bkgd(screen_titles());
--  titleWindow->addstr(0,(titleWindow->cols() - len)/2, titleText);
-+  titleWindow->addstr(0, (titleWindow->cols() - len)/2, titleText);
-   titleWindow->noutrefresh();
- }
- 
-@@ -557,4 +557,4 @@
- //
- // -------------------------------------------------------------------------
- //
--static TestApplication Demo;
-+static TestApplication *Demo = new TestApplication();
-diff -Naur ncurses-5.6.orig/c++/edit_cfg.sh ncurses-5.6/c++/edit_cfg.sh
---- ncurses-5.6.orig/c++/edit_cfg.sh	2005-04-30 17:00:22.000000000 -0400
-+++ ncurses-5.6/c++/edit_cfg.sh	2008-06-18 06:49:44.000000000 -0400
-@@ -1,7 +1,7 @@
- #!/bin/sh
--# $Id: edit_cfg.sh,v 1.14 2005/04/30 21:00:22 tom Exp $
-+# $Id: edit_cfg.sh,v 1.16 2007/04/07 19:08:49 tom Exp $
- ##############################################################################
--# Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -28,7 +28,7 @@
- # authorization.                                                             #
- ##############################################################################
- #
--# Author: Thomas E. Dickey 1997
-+# Author: Thomas E. Dickey 1997-on
- #
- # Edit the default value of the etip.h file based on the autoconf-generated
- # values:
-@@ -45,11 +45,9 @@
- 	HAVE_BUILTIN_H \
- 	HAVE_GPP_BUILTIN_H \
- 	HAVE_GXX_BUILTIN_H \
--	HAVE_STRSTREAM_H \
-+	HAVE_IOSTREAM \
- 	HAVE_TYPEINFO \
--	HAVE_VALUES_H \
--	USE_STRSTREAM_VSCAN \
--	USE_STRSTREAM_VSCAN_CAST
-+	HAVE_VALUES_H
- do
- 	rm -f $2.bak
- 	mv $2 $2.bak
-diff -Naur ncurses-5.6.orig/c++/etip.h.in ncurses-5.6/c++/etip.h.in
---- ncurses-5.6.orig/c++/etip.h.in	2005-08-06 15:55:57.000000000 -0400
-+++ ncurses-5.6/c++/etip.h.in	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
- // * This makes emacs happy -*-Mode: C++;-*-
- /****************************************************************************
-- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -31,7 +31,7 @@
-  *   Author: Juergen Pfeifer, 1997                                          *
-  ****************************************************************************/
- 
--// $Id: etip.h.in,v 1.32 2005/08/06 19:55:57 tom Exp $
-+// $Id: etip.h.in,v 1.36 2007/04/07 18:56:32 tom Exp $
- 
- #ifndef NCURSES_ETIP_H_incl
- #define NCURSES_ETIP_H_incl 1
-@@ -49,8 +49,8 @@
- #define HAVE_GPP_BUILTIN_H 0
- #endif
- 
--#ifndef HAVE_STRSTREAM_H
--#define HAVE_STRSTREAM_H 0
-+#ifndef HAVE_IOSTREAM
-+#define HAVE_IOSTREAM 0
- #endif
- 
- #ifndef HAVE_TYPEINFO
-@@ -77,14 +77,6 @@
- #define CPP_HAS_STATIC_CAST 0	// workaround for g++ 2.95.3
- #endif
- 
--#ifndef USE_STRSTREAM_VSCAN
--#define USE_STRSTREAM_VSCAN 0
--#endif
--
--#ifndef USE_STRSTREAM_VSCAN_CAST
--#define USE_STRSTREAM_VSCAN_CAST 0
--#endif
--
- #ifdef __GNUG__
- #  if ((__GNUG__ <= 2) && (__GNUC_MINOR__ < 8))
- #    if HAVE_TYPEINFO
-@@ -335,30 +327,46 @@
- };
- 
- #if !((defined(__GNUG__) && defined(__EXCEPTIONS)) || defined(__SUNPRO_CC))
--#  include <iostream.h>
-+#  if HAVE_IOSTREAM
-+#     include <iostream>
-+using std::cerr;
-+using std::endl;
-+#  else
-+#     include <iostream.h>
-+#  endif
-    extern "C" void exit(int);
- #endif
- 
- inline void THROW(const NCursesException *e) {
- #if defined(__GNUG__) && defined(__EXCEPTIONS)
- #  if ((__GNUG__ <= 2) && (__GNUC_MINOR__ < 8))
--      (*lib_error_handler)(e?e->classname():"",e?e->message:"");
-+      (*lib_error_handler)(e ? e->classname() : "", e ? e->message : "");
- #else
--      throw *e;
-+#define CPP_HAS_TRY_CATCH 1
- #endif
- #elif defined(__SUNPRO_CC)
- #  if !defined(__SUNPRO_CC_COMPAT) || (__SUNPRO_CC_COMPAT < 5)
-   genericerror(1, ((e != 0) ? (char *)(e->message) : ""));
- #else
--  throw *e;
-+#define CPP_HAS_TRY_CATCH 1
- #endif
- #else
-   if (e)
-     cerr << e->message << endl;
-   exit(0);
- #endif
--}
- 
--#define THROWS(s)
-+#ifndef CPP_HAS_TRY_CATCH
-+#define CPP_HAS_TRY_CATCH 0
-+#define NCURSES_CPP_TRY		/* nothing */
-+#define NCURSES_CPP_CATCH(e)	if (false)
-+#define THROWS(s)		/* nothing */
-+#elif CPP_HAS_TRY_CATCH
-+  throw *e;
-+#define NCURSES_CPP_TRY		try
-+#define NCURSES_CPP_CATCH(e)	catch(e)
-+#define THROWS(s)		throw(s)
-+#endif
-+}
- 
- #endif /* NCURSES_ETIP_H_incl */
-diff -Naur ncurses-5.6.orig/c++/headers ncurses-5.6/c++/headers
---- ncurses-5.6.orig/c++/headers	1998-02-11 07:13:40.000000000 -0500
-+++ ncurses-5.6/c++/headers	2008-06-18 06:49:44.000000000 -0400
-@@ -1,7 +1,7 @@
- # C++ headers
--# $Id: headers,v 1.2 1998/02/11 12:13:40 tom Exp $
-+# $Id: headers,v 1.3 2006/12/24 16:25:45 tom Exp $
- ##############################################################################
--# Copyright (c) 1998 Free Software Foundation, Inc.                          #
-+# Copyright (c) 1998,2006 Free Software Foundation, Inc.                     #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -37,3 +37,4 @@
- $(srcdir)/cursesw.h
- $(srcdir)/cursslk.h
- etip.h
-+# vile:makemode
-diff -Naur ncurses-5.6.orig/c++/internal.h ncurses-5.6/c++/internal.h
---- ncurses-5.6.orig/c++/internal.h	2006-09-30 17:59:57.000000000 -0400
-+++ ncurses-5.6/c++/internal.h	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
- // * This makes emacs happy -*-Mode: C++;-*-
- /****************************************************************************
-- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -31,13 +31,15 @@
-  *   Author: Juergen Pfeifer, 1997                                          *
-  ****************************************************************************/
- 
--// $Id: internal.h,v 1.13 2006/09/30 21:59:57 tom Exp $
-+// $Id: internal.h,v 1.15 2007/06/02 15:58:00 tom Exp $
- 
- #ifndef NCURSES_CPLUS_INTERNAL_H
- #define NCURSES_CPLUS_INTERNAL_H 1
- 
- #include <ncurses_cfg.h>
- 
-+#include <stdlib.h>
-+
- #if USE_RCS_IDS
- #define MODULE_ID(id) static const char Ident[] = id;
- #else
-diff -Naur ncurses-5.6.orig/c++/modules ncurses-5.6/c++/modules
---- ncurses-5.6.orig/c++/modules	1999-07-31 05:46:54.000000000 -0400
-+++ ncurses-5.6/c++/modules	2008-06-18 06:49:44.000000000 -0400
-@@ -1,7 +1,7 @@
- # Program modules
--# $Id: modules,v 1.6 1999/07/31 09:46:54 juergen Exp $
-+# $Id: modules,v 1.7 2006/12/24 00:53:08 tom Exp $
- ##############################################################################
--# Copyright (c) 1998 Free Software Foundation, Inc.                          #
-+# Copyright (c) 1998,2006 Free Software Foundation, Inc.                     #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -28,7 +28,7 @@
- # authorization.                                                             #
- ##############################################################################
- #
--# Author: Thomas E. Dickey <dickey@clark.net> 1995,1997
-+# Author: Thomas E. Dickey	1995-on
- #
- 
- @ base
-@@ -41,3 +41,5 @@
- cursesapp	c++		$(srcdir)	$(cursesapp_h)
- cursesmain	c++		$(srcdir)	$(cursesapp_h)
- demo		c++		$(srcdir)	$(cursesf_h) $(cursesm_h) $(cursesapp_h)
-+
-+# vile:makemode
-diff -Naur ncurses-5.6.orig/config.guess ncurses-5.6/config.guess
---- ncurses-5.6.orig/config.guess	2006-07-22 11:57:37.000000000 -0400
-+++ ncurses-5.6/config.guess	2008-06-18 06:49:49.000000000 -0400
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
--#   Inc.
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+#   Free Software Foundation, Inc.
- 
--timestamp='2006-07-02'
-+timestamp='2008-03-12'
- 
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -56,8 +56,8 @@
- GNU config.guess ($timestamp)
- 
- Originally written by Per Bothner.
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
--Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- 
- This is free software; see the source for copying conditions.  There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -161,6 +161,7 @@
- 	    arm*) machine=arm-unknown ;;
- 	    sh3el) machine=shl-unknown ;;
- 	    sh3eb) machine=sh-unknown ;;
-+	    sh5el) machine=sh5le-unknown ;;
- 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
- 	esac
- 	# The Operating System including object format, if it has switched
-@@ -179,7 +180,7 @@
- 		fi
- 		;;
- 	    *)
--	        os=netbsd
-+		os=netbsd
- 		;;
- 	esac
- 	# The OS release
-@@ -218,11 +219,11 @@
- 	exit ;;
-     alpha:OSF1:*:*)
- 	case $UNAME_RELEASE in
--	*4.0)
-+	    *4.0)
- 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
- 		;;
--	*5.*)
--	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-+	    *5.*)
-+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
- 		;;
- 	esac
- 	# According to Compaq, /usr/sbin/psrinfo has been available on
-@@ -294,7 +295,7 @@
- 	echo s390-ibm-zvmoe
- 	exit ;;
-     *:OS400:*:*)
--        echo powerpc-ibm-os400
-+	echo powerpc-ibm-os400
- 	exit ;;
-     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
- 	echo arm-acorn-riscix${UNAME_RELEASE}
-@@ -329,7 +330,7 @@
-     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- 	exit ;;
--    i86pc:SunOS:5.*:*)
-+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- 	exit ;;
-     sun4*:SunOS:6*:*)
-@@ -374,23 +375,23 @@
-     # MiNT.  But MiNT is downward compatible to TOS, so this should
-     # be no problem.
-     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
--        echo m68k-atari-mint${UNAME_RELEASE}
-+	echo m68k-atari-mint${UNAME_RELEASE}
- 	exit ;;
-     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- 	echo m68k-atari-mint${UNAME_RELEASE}
--        exit ;;
-+	exit ;;
-     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
--        echo m68k-atari-mint${UNAME_RELEASE}
-+	echo m68k-atari-mint${UNAME_RELEASE}
- 	exit ;;
-     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
--        echo m68k-milan-mint${UNAME_RELEASE}
--        exit ;;
-+	echo m68k-milan-mint${UNAME_RELEASE}
-+	exit ;;
-     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
--        echo m68k-hades-mint${UNAME_RELEASE}
--        exit ;;
-+	echo m68k-hades-mint${UNAME_RELEASE}
-+	exit ;;
-     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
--        echo m68k-unknown-mint${UNAME_RELEASE}
--        exit ;;
-+	echo m68k-unknown-mint${UNAME_RELEASE}
-+	exit ;;
-     m68k:machten:*:*)
- 	echo m68k-apple-machten${UNAME_RELEASE}
- 	exit ;;
-@@ -460,8 +461,8 @@
- 	echo m88k-motorola-sysv3
- 	exit ;;
-     AViiON:dgux:*:*)
--        # DG/UX returns AViiON for all architectures
--        UNAME_PROCESSOR=`/usr/bin/uname -p`
-+	# DG/UX returns AViiON for all architectures
-+	UNAME_PROCESSOR=`/usr/bin/uname -p`
- 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
- 	then
- 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-@@ -531,7 +532,7 @@
- 		echo rs6000-ibm-aix3.2
- 	fi
- 	exit ;;
--    *:AIX:*:[45])
-+    *:AIX:*:[456])
- 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
- 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
- 		IBM_ARCH=rs6000
-@@ -574,8 +575,8 @@
- 	    9000/[678][0-9][0-9])
- 		if [ -x /usr/bin/getconf ]; then
- 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
--                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
--                    case "${sc_cpu_version}" in
-+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-+		    case "${sc_cpu_version}" in
-                       523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                       528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                       532)                      # CPU_PA_RISC2_0
-@@ -710,22 +711,22 @@
- 	exit ;;
-     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
- 	echo c1-convex-bsd
--        exit ;;
-+	exit ;;
-     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
- 	if getsysinfo -f scalar_acc
- 	then echo c32-convex-bsd
- 	else echo c2-convex-bsd
- 	fi
--        exit ;;
-+	exit ;;
-     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
- 	echo c34-convex-bsd
--        exit ;;
-+	exit ;;
-     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
- 	echo c38-convex-bsd
--        exit ;;
-+	exit ;;
-     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
- 	echo c4-convex-bsd
--        exit ;;
-+	exit ;;
-     CRAY*Y-MP:*:*:*)
- 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- 	exit ;;
-@@ -749,14 +750,14 @@
- 	exit ;;
-     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
- 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
--        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
--        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
--        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
--        exit ;;
-+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+	exit ;;
-     5000:UNIX_System_V:4.*:*)
--        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
--        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
--        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- 	exit ;;
-     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
- 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-@@ -780,22 +781,28 @@
-     i*:CYGWIN*:*)
- 	echo ${UNAME_MACHINE}-pc-cygwin
- 	exit ;;
--    i*:MINGW*:*)
-+    *:MINGW*:*)
- 	echo ${UNAME_MACHINE}-pc-mingw32
- 	exit ;;
-     i*:windows32*:*)
--    	# uname -m includes "-pc" on this system.
--    	echo ${UNAME_MACHINE}-mingw32
-+	# uname -m includes "-pc" on this system.
-+	echo ${UNAME_MACHINE}-mingw32
- 	exit ;;
-     i*:PW*:*)
- 	echo ${UNAME_MACHINE}-pc-pw32
- 	exit ;;
--    x86:Interix*:[3456]*)
--	echo i586-pc-interix${UNAME_RELEASE}
--	exit ;;
--    EM64T:Interix*:[3456]*)
--	echo x86_64-unknown-interix${UNAME_RELEASE}
--	exit ;;
-+    *:Interix*:[3456]*)
-+	case ${UNAME_MACHINE} in
-+	    x86)
-+		echo i586-pc-interix${UNAME_RELEASE}
-+		exit ;;
-+	    EM64T | authenticamd)
-+		echo x86_64-unknown-interix${UNAME_RELEASE}
-+		exit ;;
-+	    IA64)
-+	    	echo ia64-unknown-interix${UNAME_RELEASE}
-+	    	exit ;;
-+	esac ;;
-     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- 	echo i${UNAME_MACHINE}-pc-mks
- 	exit ;;
-@@ -829,7 +836,13 @@
- 	echo ${UNAME_MACHINE}-pc-minix
- 	exit ;;
-     arm*:Linux:*:*)
--	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	eval $set_cc_for_build
-+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null | grep -q __ARM_EABI__
-+	then
-+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	else
-+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-+	fi
- 	exit ;;
-     avr32*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-@@ -841,7 +854,7 @@
- 	echo crisv32-axis-linux-gnu
- 	exit ;;
-     frv:Linux:*:*)
--    	echo frv-unknown-linux-gnu
-+	echo frv-unknown-linux-gnu
- 	exit ;;
-     ia64:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-@@ -869,10 +882,10 @@
- 	#endif
- EOF
- 	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
--	    /^CPU/{
--		s: ::g
--		p
--	    }'`"
-+		/^CPU/{
-+			s: ::g
-+			p
-+		}'`"
- 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- 	;;
-     mips64:Linux:*:*)
-@@ -892,15 +905,15 @@
- 	#endif
- EOF
- 	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
--	    /^CPU/{
--		s: ::g
--		p
--	    }'`"
-+		/^CPU/{
-+			s: ::g
-+			p
-+		}'`"
- 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
- 	;;
-     or32:Linux:*:*)
--	echo or32-unknown-linux-gnu
--	exit ;;
-+    	echo or32-unknown-linux-gnu
-+    	exit ;;
-     ppc:Linux:*:*)
- 	echo powerpc-unknown-linux-gnu
- 	exit ;;
-@@ -916,7 +929,7 @@
- 	  EV6)   UNAME_MACHINE=alphaev6 ;;
- 	  EV67)  UNAME_MACHINE=alphaev67 ;;
- 	  EV68*) UNAME_MACHINE=alphaev68 ;;
--        esac
-+	esac
- 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
- 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-@@ -936,7 +949,7 @@
- 	echo ${UNAME_MACHINE}-ibm-linux
- 	exit ;;
-     sh64*:Linux:*:*)
--    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
-     sh*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
-@@ -950,6 +963,9 @@
-     x86_64:Linux:*:*)
- 	echo x86_64-unknown-linux-gnu
- 	exit ;;
-+    xtensa*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-     i*86:Linux:*:*)
- 	# The BFD linker knows what the default object file format is, so
- 	# first see if it will tell us. cd to the root directory to prevent
-@@ -961,7 +977,7 @@
- 				    s/.*supported targets: *//
- 				    s/ .*//
- 				    p'`
--        case "$ld_supported_targets" in
-+	case "$ld_supported_targets" in
- 	  elf32-i386)
- 		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- 		;;
-@@ -1003,10 +1019,10 @@
- 	#endif
- EOF
- 	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
--	    /^LIBC/{
--		s: ::g
--		p
--	    }'`"
-+		/^LIBC/{
-+			s: ::g
-+			p
-+		}'`"
- 	test x"${LIBC}" != x && {
- 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
- 		exit
-@@ -1020,11 +1036,11 @@
- 	echo i386-sequent-sysv4
- 	exit ;;
-     i*86:UNIX_SV:4.2MP:2.*)
--        # Unixware is an offshoot of SVR4, but it has its own version
--        # number series starting with 2...
--        # I am not positive that other SVR4 systems won't match this,
-+	# Unixware is an offshoot of SVR4, but it has its own version
-+	# number series starting with 2...
-+	# I am not positive that other SVR4 systems won't match this,
- 	# I just have to hope.  -- rms.
--        # Use sysv4.2uw... so that sysv4* matches it.
-+	# Use sysv4.2uw... so that sysv4* matches it.
- 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
- 	exit ;;
-     i*86:OS/2:*:*)
-@@ -1056,7 +1072,7 @@
- 	fi
- 	exit ;;
-     i*86:*:5:[678]*)
--    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
- 	case `/bin/uname -X | grep "^Machine"` in
- 	    *486*)	     UNAME_MACHINE=i486 ;;
- 	    *Pentium)	     UNAME_MACHINE=i586 ;;
-@@ -1084,10 +1100,10 @@
- 	exit ;;
-     pc:*:*:*)
- 	# Left here for compatibility:
--        # uname -m prints for DJGPP always 'pc', but it prints nothing about
--        # the processor, so we play safe by assuming i386.
-+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
-+	# the processor, so we play safe by assuming i386.
- 	echo i386-pc-msdosdjgpp
--        exit ;;
-+	exit ;;
-     Intel:Mach:3*:*)
- 	echo i386-pc-mach3
- 	exit ;;
-@@ -1122,8 +1138,8 @@
- 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
--        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
--          && { echo i486-ncr-sysv4; exit; } ;;
-+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+	   && { echo i486-ncr-sysv4; exit; } ;;
-     m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
- 	echo m68k-unknown-lynxos${UNAME_RELEASE}
- 	exit ;;
-@@ -1157,9 +1173,9 @@
- 	fi
- 	exit ;;
-     PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
--                      # says <Richard.M.Bartel@ccMail.Census.GOV>
--        echo i586-unisys-sysv4
--        exit ;;
-+	              # says <Richard.M.Bartel@ccMail.Census.GOV>
-+	echo i586-unisys-sysv4
-+	exit ;;
-     *:UNIX_System_V:4*:FTX*)
- 	# From Gerald Hewes <hewes@openmarket.com>.
- 	# How about differentiating between stratus architectures? -djm
-@@ -1189,7 +1205,7 @@
- 	else
- 	        echo mips-unknown-sysv${UNAME_RELEASE}
- 	fi
--        exit ;;
-+	exit ;;
-     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
- 	echo powerpc-be-beos
- 	exit ;;
-@@ -1199,6 +1215,9 @@
-     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
- 	echo i586-pc-beos
- 	exit ;;
-+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-+	echo i586-pc-haiku
-+	exit ;;
-     SX-4:SUPER-UX:*:*)
- 	echo sx4-nec-superux${UNAME_RELEASE}
- 	exit ;;
-@@ -1208,6 +1227,15 @@
-     SX-6:SUPER-UX:*:*)
- 	echo sx6-nec-superux${UNAME_RELEASE}
- 	exit ;;
-+    SX-7:SUPER-UX:*:*)
-+	echo sx7-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-8:SUPER-UX:*:*)
-+	echo sx8-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-8R:SUPER-UX:*:*)
-+	echo sx8r-nec-superux${UNAME_RELEASE}
-+	exit ;;
-     Power*:Rhapsody:*:*)
- 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
- 	exit ;;
-@@ -1224,8 +1252,8 @@
-     *:procnto*:*:* | *:QNX:[0123456789]*:*)
- 	UNAME_PROCESSOR=`uname -p`
- 	if test "$UNAME_PROCESSOR" = "x86"; then
--		UNAME_PROCESSOR=i386
--		UNAME_MACHINE=pc
-+	    UNAME_PROCESSOR=i386
-+	    UNAME_MACHINE=pc
- 	fi
- 	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
- 	exit ;;
-@@ -1277,13 +1305,13 @@
- 	echo pdp10-unknown-its
- 	exit ;;
-     SEI:*:*:SEIUX)
--        echo mips-sei-seiux${UNAME_RELEASE}
-+	echo mips-sei-seiux${UNAME_RELEASE}
- 	exit ;;
-     *:DragonFly:*:*)
- 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- 	exit ;;
-     *:*VMS:*:*)
--    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
- 	case "${UNAME_MACHINE}" in
- 	    A*) echo alpha-dec-vms ; exit ;;
- 	    I*) echo ia64-dec-vms ; exit ;;
-@@ -1458,9 +1486,9 @@
- the operating system you are using. It is advised that you
- download the most up to date version of the config scripts from
- 
--  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
-+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
- and
--  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
-+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
- 
- If the version you run ($0) is already up to date, please
- send the following data and any information you think might be
-diff -Naur ncurses-5.6.orig/config.sub ncurses-5.6/config.sub
---- ncurses-5.6.orig/config.sub	2006-08-14 12:00:00.000000000 -0400
-+++ ncurses-5.6/config.sub	2008-06-18 06:49:49.000000000 -0400
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
--#   Inc.
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+#   Free Software Foundation, Inc.
- 
--timestamp='2006-08-14'
-+timestamp='2008-03-08'
- 
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -72,8 +72,8 @@
- version="\
- GNU config.sub ($timestamp)
- 
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
--Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- 
- This is free software; see the source for copying conditions.  There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -245,17 +245,19 @@
- 	| bfin \
- 	| c4x | clipper \
- 	| d10v | d30v | dlx | dsp16xx \
--	| fr30 | frv \
-+	| fido | fr30 | frv \
- 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
- 	| i370 | i860 | i960 | ia64 \
- 	| ip2k | iq2000 \
- 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
--	| maxq | mb | microblaze | mcore \
-+	| maxq | mb | microblaze | mcore | mep \
- 	| mips | mipsbe | mipseb | mipsel | mipsle \
- 	| mips16 \
- 	| mips64 | mips64el \
--	| mips64vr | mips64vrel \
-+	| mips64octeon | mips64octeonel \
- 	| mips64orion | mips64orionel \
-+	| mips64r5900 | mips64r5900el \
-+	| mips64vr | mips64vrel \
- 	| mips64vr4100 | mips64vr4100el \
- 	| mips64vr4300 | mips64vr4300el \
- 	| mips64vr5000 | mips64vr5000el \
-@@ -276,6 +278,7 @@
- 	| pdp10 | pdp11 | pj | pjl \
- 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
- 	| pyramid \
-+	| score \
- 	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
- 	| sh64 | sh64le \
- 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-@@ -303,8 +306,8 @@
- 	# because (1) that's what they normally are, and
- 	# (2) the word "unknown" tends to confuse beginning users.
- 	i*86 | x86_64)
--	  basic_machine=$basic_machine-pc
--	  ;;
-+		basic_machine=$basic_machine-pc
-+		;;
- 	# Object if more than one company name word.
- 	*-*-*)
- 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-@@ -323,19 +326,21 @@
- 	| clipper-* | craynv-* | cydra-* \
- 	| d10v-* | d30v-* | dlx-* \
- 	| elxsi-* \
--	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
- 	| h8300-* | h8500-* \
- 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
- 	| i*86-* | i860-* | i960-* | ia64-* \
- 	| ip2k-* | iq2000-* \
--	| m32c-* | m32r-* | m32rle-* \
-+	| m32c- | m32r-* | m32rle-* \
- 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- 	| m88110-* | m88k-* | maxq-* | mcore-* \
- 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
- 	| mips16-* \
- 	| mips64-* | mips64el-* \
--	| mips64vr-* | mips64vrel-* \
-+	| mips64octeon-* | mips64octeonel-* \
- 	| mips64orion-* | mips64orionel-* \
-+	| mips64r5900-* | mips64r5900el-* \
-+	| mips64vr-* | mips64vrel-* \
- 	| mips64vr4100-* | mips64vr4100el-* \
- 	| mips64vr4300-* | mips64vr4300el-* \
- 	| mips64vr5000-* | mips64vr5000el-* \
-@@ -363,15 +368,19 @@
- 	| sparclite-* \
- 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
- 	| tahoe-* | thumb-* \
--	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
- 	| tron-* \
- 	| v850-* | v850e-* | vax-* \
- 	| we32k-* \
- 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
--	| xstormy16-* | xtensa-* \
-+	| xstormy16-* | xtensa*-* \
- 	| ymp-* \
- 	| z8k-*)
- 		;;
-+	# Recognize the basic CPU types without company name, with glob match.
-+	xtensa*)
-+		basic_machine=$basic_machine-unknown
-+		;;
- 	# Recognize the various machine names and aliases which stand
- 	# for a CPU type and a company and sometimes even an OS.
- 	386bsd)
-@@ -388,7 +397,7 @@
- 		basic_machine=a29k-amd
- 		os=-udi
- 		;;
--    	abacus)
-+	abacus)
- 		basic_machine=abacus-unknown
- 		;;
- 	adobe68k)
-@@ -442,6 +451,14 @@
- 		basic_machine=ns32k-sequent
- 		os=-dynix
- 		;;
-+	blackfin)
-+		basic_machine=bfin-unknown
-+		os=-linux
-+		;;
-+	blackfin-*)
-+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
- 	c90)
- 		basic_machine=c90-cray
- 		os=-unicos
-@@ -474,8 +491,8 @@
- 		basic_machine=craynv-cray
- 		os=-unicosmp
- 		;;
--	cr16c)
--		basic_machine=cr16c-unknown
-+	cr16)
-+		basic_machine=cr16-unknown
- 		os=-elf
- 		;;
- 	crds | unos)
-@@ -667,6 +684,14 @@
- 		basic_machine=m68k-isi
- 		os=-sysv
- 		;;
-+	m68knommu)
-+		basic_machine=m68k-unknown
-+		os=-linux
-+		;;
-+	m68knommu-*)
-+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
- 	m88k-omron*)
- 		basic_machine=m88k-omron
- 		;;
-@@ -682,6 +707,10 @@
- 		basic_machine=i386-pc
- 		os=-mingw32
- 		;;
-+	mingw32ce)
-+		basic_machine=arm-unknown
-+		os=-mingw32ce
-+		;;
- 	miniframe)
- 		basic_machine=m68000-convergent
- 		;;
-@@ -808,6 +837,14 @@
- 		basic_machine=i860-intel
- 		os=-osf
- 		;;
-+	parisc)
-+		basic_machine=hppa-unknown
-+		os=-linux
-+		;;
-+	parisc-*)
-+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
- 	pbd)
- 		basic_machine=sparc-tti
- 		;;
-@@ -924,6 +961,9 @@
- 		basic_machine=sh-hitachi
- 		os=-hms
- 		;;
-+	sh5el)
-+		basic_machine=sh5le-unknown
-+		;;
- 	sh64)
- 		basic_machine=sh64-unknown
- 		;;
-@@ -1013,6 +1053,10 @@
- 		basic_machine=tic6x-unknown
- 		os=-coff
- 		;;
-+	tile*)
-+		basic_machine=tile-unknown
-+		os=-linux-gnu
-+		;;
- 	tx39)
- 		basic_machine=mipstx39-unknown
- 		;;
-@@ -1173,8 +1217,8 @@
- if [ x"$os" != x"" ]
- then
- case $os in
--        # First match some system type aliases
--        # that might get confused with valid system types.
-+	# First match some system type aliases
-+	# that might get confused with valid system types.
- 	# -solaris* is a basic system type, with this one exception.
- 	-solaris1 | -solaris1.*)
- 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-@@ -1218,7 +1262,7 @@
- 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
- 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
--	      | -skyos* | -haiku* | -rdos* | -toppers*)
-+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
- 	# Remember, each alternative MUST END IN *, to match a version number.
- 		;;
- 	-qnx*)
-@@ -1257,7 +1301,7 @@
- 	-opened*)
- 		os=-openedition
- 		;;
--        -os400*)
-+	-os400*)
- 		os=-os400
- 		;;
- 	-wince*)
-@@ -1306,7 +1350,7 @@
- 	-sinix*)
- 		os=-sysv4
- 		;;
--        -tpf*)
-+	-tpf*)
- 		os=-tpf
- 		;;
- 	-triton*)
-@@ -1370,7 +1414,10 @@
- # system, and we'll never get to this point.
- 
- case $basic_machine in
--        spu-*)
-+	score-*)
-+		os=-elf
-+		;;
-+	spu-*)
- 		os=-elf
- 		;;
- 	*-acorn)
-@@ -1382,8 +1429,8 @@
- 	arm*-semi)
- 		os=-aout
- 		;;
--        c4x-* | tic4x-*)
--        	os=-coff
-+	c4x-* | tic4x-*)
-+		os=-coff
- 		;;
- 	# This must come before the *-dec entry.
- 	pdp10-*)
-@@ -1410,6 +1457,9 @@
- 	m68*-cisco)
- 		os=-aout
- 		;;
-+	mep-*)
-+		os=-elf
-+		;;
- 	mips*-cisco)
- 		os=-elf
- 		;;
-@@ -1434,7 +1484,7 @@
- 	*-ibm)
- 		os=-aix
- 		;;
--    	*-knuth)
-+	*-knuth)
- 		os=-mmixware
- 		;;
- 	*-wec)
-diff -Naur ncurses-5.6.orig/configure ncurses-5.6/configure
---- ncurses-5.6.orig/configure	2006-12-17 11:33:38.000000000 -0500
-+++ ncurses-5.6/configure	2008-06-18 06:49:52.000000000 -0400
-@@ -1,7 +1,7 @@
- #! /bin/sh
--# From configure.in Revision: 1.383 .
-+# From configure.in Revision: 1.434 .
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by Autoconf 2.52.20061216.
-+# Generated by Autoconf 2.52.20080325.
- #
- # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
- # Free Software Foundation, Inc.
-@@ -699,6 +699,7 @@
-   --without-ada           suppress check for Ada95, don't build demo
-   --without-progs         suppress build with programs (e.g., tic)
-   --without-curses-h      install curses.h as ncurses.h only
-+  --enable-mixed-case     tic should assume mixed-case filenames
-   --with-install-prefix   prefixes actual install-location ($DESTDIR)
- Build-Tools Needed to Compile Temporary Applications for Cross-compiling:
-   --with-build-cc=XXX     the build C compiler ($BUILD_CC)
-@@ -714,10 +715,12 @@
-   --with-debug            generate debug-libraries (default)
-   --with-profile          generate profile-libraries
-   --with-termlib          generate separate terminfo library
-+  --with-ticlib           generate separate tic library
-   --with-gpm              use Alessandro Rubini's GPM library
-   --without-dlsym         do not use dlsym() to load GPM dynamically
-   --with-sysmouse         use sysmouse (FreeBSD console)
-   --enable-rpath          use rpath option when generating shared libraries
-+  --disable-relink        relink shared libraries during install
-   --with-shlib-version=X  Specify rel or abi version for shared libs
- Fine-Tuning Your Configuration:
-   --disable-overwrite     leave out the link to -lcurses
-@@ -729,6 +732,7 @@
-   --with-terminfo-dirs=XXX specify list of terminfo directories (default: DATADIR/terminfo)
-   --with-default-terminfo-dir=DIR default terminfo directory (default: DATADIR/terminfo)
-   --disable-big-core      assume machine has little memory
-+  --disable-big-strings   assume compiler has only standard-size strings
-   --enable-termcap        compile in termcap fallback support
-   --with-termpath=XXX     specify list of termcap files (default: /etc/termcap:/usr/share/misc/termcap)
-   --enable-getcap         fast termcap load, no xrefs to terminfo
-@@ -758,8 +762,10 @@
- Extensions:
-   --disable-ext-funcs     disable function-extensions
-   --enable-const          compile with extra/non-standard const
-+  --enable-ext-colors     compile for 256-color support
-+  --enable-ext-mouse      compile for extended mouse-encoding
-   --enable-no-padding     compile with $NCURSES_NO_PADDING code
--  --enable-signed-char    compile with SIGWINCH handler
-+  --enable-signed-char    compile using signed Boolean's in term.h
-   --enable-sigwinch       compile with SIGWINCH handler
-   --enable-tcap-names     compile with user-definable terminal capabilities
- Development Code:
-@@ -770,8 +776,8 @@
-   --disable-assumed-color do not assume anything about default-colors
-   --disable-hashmap       compile without hashmap scrolling-optimization
-   --enable-colorfgbg      compile with $COLORFGBG code
--  --enable-ext-colors     compile for experimental 256-color support
--  --enable-ext-mouse      compile for experimental mouse-encoding
-+  --with-pthread          use POSIX thread library
-+  --enable-reentrant      compile with experimental reentrant code
-   --enable-safe-sprintf   compile with experimental safe-sprintf code
-   --disable-scroll-hints  compile without scroll-hints code
-   --enable-wgetch-events  compile with experimental wgetch-events code
-@@ -862,7 +868,7 @@
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by $as_me, which was
--generated by GNU Autoconf 2.52.20061216.  Invocation command line was
-+generated by GNU Autoconf 2.52.20080325.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -986,7 +992,7 @@
- fi
- for ac_site_file in $CONFIG_SITE; do
-   if test -r "$ac_site_file"; then
--    { echo "$as_me:989: loading site script $ac_site_file" >&5
-+    { echo "$as_me:995: loading site script $ac_site_file" >&5
- echo "$as_me: loading site script $ac_site_file" >&6;}
-     cat "$ac_site_file" >&5
-     . "$ac_site_file"
-@@ -997,7 +1003,7 @@
-   # Some versions of bash will fail to source /dev/null (special
-   # files actually), so we avoid doing that.
-   if test -f "$cache_file"; then
--    { echo "$as_me:1000: loading cache $cache_file" >&5
-+    { echo "$as_me:1006: loading cache $cache_file" >&5
- echo "$as_me: loading cache $cache_file" >&6;}
-     case $cache_file in
-       [\\/]* | ?:[\\/]* ) . $cache_file;;
-@@ -1005,7 +1011,7 @@
-     esac
-   fi
- else
--  { echo "$as_me:1008: creating cache $cache_file" >&5
-+  { echo "$as_me:1014: creating cache $cache_file" >&5
- echo "$as_me: creating cache $cache_file" >&6;}
-   >$cache_file
- fi
-@@ -1021,21 +1027,21 @@
-   eval ac_new_val="\$ac_env_${ac_var}_value"
-   case $ac_old_set,$ac_new_set in
-     set,)
--      { echo "$as_me:1024: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-+      { echo "$as_me:1030: 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)
--      { echo "$as_me:1028: error: \`$ac_var' was not set in the previous run" >&5
-+      { echo "$as_me:1034: 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
--        { echo "$as_me:1034: error: \`$ac_var' has changed since the previous run:" >&5
-+        { echo "$as_me:1040: 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:1036:   former value:  $ac_old_val" >&5
-+        { echo "$as_me:1042:   former value:  $ac_old_val" >&5
- echo "$as_me:   former value:  $ac_old_val" >&2;}
--        { echo "$as_me:1038:   current value: $ac_new_val" >&5
-+        { echo "$as_me:1044:   current value: $ac_new_val" >&5
- echo "$as_me:   current value: $ac_new_val" >&2;}
-         ac_cache_corrupted=:
-       fi;;
-@@ -1054,9 +1060,9 @@
-   fi
- done
- if $ac_cache_corrupted; then
--  { echo "$as_me:1057: error: changes in the environment can compromise the build" >&5
-+  { echo "$as_me:1063: 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:1059: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-+  { { echo "$as_me:1065: 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
-@@ -1077,10 +1083,10 @@
- echo "#! $SHELL" >conftest.sh
- echo  "exit 0"   >>conftest.sh
- chmod +x conftest.sh
--if { (echo "$as_me:1080: PATH=\".;.\"; conftest.sh") >&5
-+if { (echo "$as_me:1086: PATH=\".;.\"; conftest.sh") >&5
-   (PATH=".;."; conftest.sh) 2>&5
-   ac_status=$?
--  echo "$as_me:1083: \$? = $ac_status" >&5
-+  echo "$as_me:1089: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   ac_path_separator=';'
- else
-@@ -1093,7 +1099,7 @@
- 
- top_builddir=`pwd`
- 
--echo "$as_me:1096: checking for egrep" >&5
-+echo "$as_me:1102: checking for egrep" >&5
- echo $ECHO_N "checking for egrep... $ECHO_C" >&6
- if test "${ac_cv_prog_egrep+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1103,11 +1109,11 @@
-     else ac_cv_prog_egrep='egrep'
-     fi
- fi
--echo "$as_me:1106: result: $ac_cv_prog_egrep" >&5
-+echo "$as_me:1112: result: $ac_cv_prog_egrep" >&5
- echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-  EGREP=$ac_cv_prog_egrep
- 
--test -z "$EGREP" && { { echo "$as_me:1110: error: No egrep program found" >&5
-+test -z "$EGREP" && { { echo "$as_me:1116: error: No egrep program found" >&5
- echo "$as_me: error: No egrep program found" >&2;}
-    { (exit 1); exit 1; }; }
- 
-@@ -1117,7 +1123,7 @@
- cf_cv_abi_version=${NCURSES_MAJOR}
- cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
- cf_cv_timestamp=`date`
--echo "$as_me:1120: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
-+echo "$as_me:1126: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
- echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
- 
- test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0
-@@ -1125,7 +1131,7 @@
- # Check whether --with-rel-version or --without-rel-version was given.
- if test "${with_rel_version+set}" = set; then
-   withval="$with_rel_version"
--  { echo "$as_me:1128: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
-+  { echo "$as_me:1134: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
- echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;}
-  cf_cv_rel_version=$withval
- fi;
-@@ -1138,13 +1144,13 @@
-   [0-9]*) #(vi
-  	;;
-   *)
--	{ { echo "$as_me:1141: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
-+	{ { echo "$as_me:1147: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
- echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;}
-    { (exit 1); exit 1; }; }
-  	;;
-   esac
- else
--  { { echo "$as_me:1147: error: Release major-version value is empty" >&5
-+  { { echo "$as_me:1153: error: Release major-version value is empty" >&5
- echo "$as_me: error: Release major-version value is empty" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -1154,13 +1160,13 @@
-   [0-9]*) #(vi
-  	;;
-   *)
--	{ { echo "$as_me:1157: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
-+	{ { echo "$as_me:1163: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
- echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;}
-    { (exit 1); exit 1; }; }
-  	;;
-   esac
- else
--  { { echo "$as_me:1163: error: Release minor-version value is empty" >&5
-+  { { echo "$as_me:1169: error: Release minor-version value is empty" >&5
- echo "$as_me: error: Release minor-version value is empty" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -1170,7 +1176,7 @@
- # Check whether --with-abi-version or --without-abi-version was given.
- if test "${with_abi_version+set}" = set; then
-   withval="$with_abi_version"
--  { echo "$as_me:1173: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
-+  { echo "$as_me:1179: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
- echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;}
-  cf_cv_abi_version=$withval
- fi;
-@@ -1180,13 +1186,13 @@
-   [0-9]*) #(vi
-  	;;
-   *)
--	{ { echo "$as_me:1183: error: ABI version is not a number: $cf_cv_abi_version" >&5
-+	{ { echo "$as_me:1189: error: ABI version is not a number: $cf_cv_abi_version" >&5
- echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;}
-    { (exit 1); exit 1; }; }
-  	;;
-   esac
- else
--  { { echo "$as_me:1189: error: ABI version value is empty" >&5
-+  { { echo "$as_me:1195: error: ABI version value is empty" >&5
- echo "$as_me: error: ABI version value is empty" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -1208,7 +1214,7 @@
-   fi
- done
- if test -z "$ac_aux_dir"; then
--  { { echo "$as_me:1211: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-+  { { echo "$as_me:1217: 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
-@@ -1218,11 +1224,11 @@
- 
- # Make sure we can run config.sub.
- $ac_config_sub sun4 >/dev/null 2>&1 ||
--  { { echo "$as_me:1221: error: cannot run $ac_config_sub" >&5
-+  { { echo "$as_me:1227: error: cannot run $ac_config_sub" >&5
- echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-    { (exit 1); exit 1; }; }
- 
--echo "$as_me:1225: checking build system type" >&5
-+echo "$as_me:1231: checking build system type" >&5
- echo $ECHO_N "checking build system type... $ECHO_C" >&6
- if test "${ac_cv_build+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1231,23 +1237,23 @@
- test -z "$ac_cv_build_alias" &&
-   ac_cv_build_alias=`$ac_config_guess`
- test -z "$ac_cv_build_alias" &&
--  { { echo "$as_me:1234: error: cannot guess build type; you must specify one" >&5
-+  { { echo "$as_me:1240: error: cannot guess build type; you must specify one" >&5
- echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-    { (exit 1); exit 1; }; }
- ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
--  { { echo "$as_me:1238: error: $ac_config_sub $ac_cv_build_alias failed." >&5
-+  { { echo "$as_me:1244: error: $ac_config_sub $ac_cv_build_alias failed." >&5
- echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:1243: result: $ac_cv_build" >&5
-+echo "$as_me:1249: result: $ac_cv_build" >&5
- echo "${ECHO_T}$ac_cv_build" >&6
- build=$ac_cv_build
- build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
- build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
- build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
- 
--echo "$as_me:1250: checking host system type" >&5
-+echo "$as_me:1256: checking host system type" >&5
- echo $ECHO_N "checking host system type... $ECHO_C" >&6
- if test "${ac_cv_host+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1256,12 +1262,12 @@
- test -z "$ac_cv_host_alias" &&
-   ac_cv_host_alias=$ac_cv_build_alias
- ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
--  { { echo "$as_me:1259: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-+  { { echo "$as_me:1265: error: $ac_config_sub $ac_cv_host_alias failed" >&5
- echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:1264: result: $ac_cv_host" >&5
-+echo "$as_me:1270: result: $ac_cv_host" >&5
- echo "${ECHO_T}$ac_cv_host" >&6
- host=$ac_cv_host
- host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-@@ -1269,7 +1275,7 @@
- host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
- 
- if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
--	echo "$as_me:1272: checking target system type" >&5
-+	echo "$as_me:1278: checking target system type" >&5
- echo $ECHO_N "checking target system type... $ECHO_C" >&6
- if test "${ac_cv_target+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1278,12 +1284,12 @@
- test "x$ac_cv_target_alias" = "x" &&
-   ac_cv_target_alias=$ac_cv_host_alias
- ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
--  { { echo "$as_me:1281: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-+  { { echo "$as_me:1287: error: $ac_config_sub $ac_cv_target_alias failed" >&5
- echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
-    { (exit 1); exit 1; }; }
- 
- fi
--echo "$as_me:1286: result: $ac_cv_target" >&5
-+echo "$as_me:1292: result: $ac_cv_target" >&5
- echo "${ECHO_T}$ac_cv_target" >&6
- target=$ac_cv_target
- target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-@@ -1314,13 +1320,13 @@
- fi
- 
- test -z "$system_name" && system_name="$cf_cv_system_name"
--test -n "$cf_cv_system_name" && echo "$as_me:1317: result: Configuring for $cf_cv_system_name" >&5
-+test -n "$cf_cv_system_name" && echo "$as_me:1323: result: Configuring for $cf_cv_system_name" >&5
- echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
- 
- if test ".$system_name" != ".$cf_cv_system_name" ; then
--	echo "$as_me:1321: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
-+	echo "$as_me:1327: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
- echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
--	{ { echo "$as_me:1323: error: \"Please remove config.cache and try again.\"" >&5
-+	{ { echo "$as_me:1329: error: \"Please remove config.cache and try again.\"" >&5
- echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -1328,7 +1334,7 @@
- # Check whether --with-system-type or --without-system-type was given.
- if test "${with_system_type+set}" = set; then
-   withval="$with_system_type"
--  { echo "$as_me:1331: WARNING: overriding system type to $withval" >&5
-+  { echo "$as_me:1337: WARNING: overriding system type to $withval" >&5
- echo "$as_me: WARNING: overriding system type to $withval" >&2;}
-  cf_cv_system_name=$withval
- fi;
-@@ -1338,7 +1344,7 @@
- 
- ###	Default install-location
- 
--echo "$as_me:1341: checking for prefix" >&5
-+echo "$as_me:1347: checking for prefix" >&5
- echo $ECHO_N "checking for prefix... $ECHO_C" >&6
- if test "x$prefix" = "xNONE" ; then
- 	case "$cf_cv_system_name" in
-@@ -1350,11 +1356,11 @@
- 		;;
- 	esac
- fi
--echo "$as_me:1353: result: $prefix" >&5
-+echo "$as_me:1359: result: $prefix" >&5
- echo "${ECHO_T}$prefix" >&6
- 
- if test "x$prefix" = "xNONE" ; then
--echo "$as_me:1357: checking for default include-directory" >&5
-+echo "$as_me:1363: checking for default include-directory" >&5
- echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
- test -n "$verbose" && echo 1>&6
- for cf_symbol in \
-@@ -1377,7 +1383,7 @@
- 	fi
- 	test -n "$verbose"  && echo "	tested $cf_dir" 1>&6
- done
--echo "$as_me:1380: result: $includedir" >&5
-+echo "$as_me:1386: result: $includedir" >&5
- echo "${ECHO_T}$includedir" >&6
- fi
- 
-@@ -1391,7 +1397,7 @@
- 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
--echo "$as_me:1394: checking for $ac_word" >&5
-+echo "$as_me:1400: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1406,7 +1412,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
--echo "$as_me:1409: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1415: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1414,10 +1420,10 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  echo "$as_me:1417: result: $CC" >&5
-+  echo "$as_me:1423: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
--  echo "$as_me:1420: result: no" >&5
-+  echo "$as_me:1426: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1426,7 +1432,7 @@
-   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
--echo "$as_me:1429: checking for $ac_word" >&5
-+echo "$as_me:1435: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1441,7 +1447,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_CC="gcc"
--echo "$as_me:1444: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1450: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1449,10 +1455,10 @@
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  echo "$as_me:1452: result: $ac_ct_CC" >&5
-+  echo "$as_me:1458: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6
- else
--  echo "$as_me:1455: result: no" >&5
-+  echo "$as_me:1461: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1465,7 +1471,7 @@
-   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
--echo "$as_me:1468: checking for $ac_word" >&5
-+echo "$as_me:1474: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1480,7 +1486,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_CC="${ac_tool_prefix}cc"
--echo "$as_me:1483: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1489: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1488,10 +1494,10 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  echo "$as_me:1491: result: $CC" >&5
-+  echo "$as_me:1497: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
--  echo "$as_me:1494: result: no" >&5
-+  echo "$as_me:1500: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1500,7 +1506,7 @@
-   ac_ct_CC=$CC
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
--echo "$as_me:1503: checking for $ac_word" >&5
-+echo "$as_me:1509: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1515,7 +1521,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_CC="cc"
--echo "$as_me:1518: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1524: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1523,10 +1529,10 @@
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  echo "$as_me:1526: result: $ac_ct_CC" >&5
-+  echo "$as_me:1532: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6
- else
--  echo "$as_me:1529: result: no" >&5
-+  echo "$as_me:1535: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1539,7 +1545,7 @@
- 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
--echo "$as_me:1542: checking for $ac_word" >&5
-+echo "$as_me:1548: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1559,7 +1565,7 @@
-   continue
- fi
- ac_cv_prog_CC="cc"
--echo "$as_me:1562: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1568: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1581,10 +1587,10 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  echo "$as_me:1584: result: $CC" >&5
-+  echo "$as_me:1590: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
--  echo "$as_me:1587: result: no" >&5
-+  echo "$as_me:1593: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1595,7 +1601,7 @@
-   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
--echo "$as_me:1598: checking for $ac_word" >&5
-+echo "$as_me:1604: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1610,7 +1616,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
--echo "$as_me:1613: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1619: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1618,10 +1624,10 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  echo "$as_me:1621: result: $CC" >&5
-+  echo "$as_me:1627: result: $CC" >&5
- echo "${ECHO_T}$CC" >&6
- else
--  echo "$as_me:1624: result: no" >&5
-+  echo "$as_me:1630: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1634,7 +1640,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:1637: checking for $ac_word" >&5
-+echo "$as_me:1643: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1649,7 +1655,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_CC="$ac_prog"
--echo "$as_me:1652: found $ac_dir/$ac_word" >&5
-+echo "$as_me:1658: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -1657,10 +1663,10 @@
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  echo "$as_me:1660: result: $ac_ct_CC" >&5
-+  echo "$as_me:1666: result: $ac_ct_CC" >&5
- echo "${ECHO_T}$ac_ct_CC" >&6
- else
--  echo "$as_me:1663: result: no" >&5
-+  echo "$as_me:1669: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -1672,32 +1678,32 @@
- 
- fi
- 
--test -z "$CC" && { { echo "$as_me:1675: error: no acceptable cc found in \$PATH" >&5
-+test -z "$CC" && { { echo "$as_me:1681: error: no acceptable cc found in \$PATH" >&5
- echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
-    { (exit 1); exit 1; }; }
- 
- # Provide some information about the compiler.
--echo "$as_me:1680:" \
-+echo "$as_me:1686:" \
-      "checking for C compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:1683: \"$ac_compiler --version </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:1689: \"$ac_compiler --version </dev/null >&5\"") >&5
-   (eval $ac_compiler --version </dev/null >&5) 2>&5
-   ac_status=$?
--  echo "$as_me:1686: \$? = $ac_status" >&5
-+  echo "$as_me:1692: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:1688: \"$ac_compiler -v </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:1694: \"$ac_compiler -v </dev/null >&5\"") >&5
-   (eval $ac_compiler -v </dev/null >&5) 2>&5
-   ac_status=$?
--  echo "$as_me:1691: \$? = $ac_status" >&5
-+  echo "$as_me:1697: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:1693: \"$ac_compiler -V </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:1699: \"$ac_compiler -V </dev/null >&5\"") >&5
-   (eval $ac_compiler -V </dev/null >&5) 2>&5
-   ac_status=$?
--  echo "$as_me:1696: \$? = $ac_status" >&5
-+  echo "$as_me:1702: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 1700 "configure"
-+#line 1706 "configure"
- #include "confdefs.h"
- 
- int
-@@ -1713,13 +1719,13 @@
- # 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.
--echo "$as_me:1716: checking for C compiler default output" >&5
-+echo "$as_me:1722: checking for C compiler default output" >&5
- echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
- ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
--if { (eval echo "$as_me:1719: \"$ac_link_default\"") >&5
-+if { (eval echo "$as_me:1725: \"$ac_link_default\"") >&5
-   (eval $ac_link_default) 2>&5
-   ac_status=$?
--  echo "$as_me:1722: \$? = $ac_status" >&5
-+  echo "$as_me:1728: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   # Find the output, starting from the most likely.  This scheme is
- # not robust to junk in `.', hence go to wildcards (a.*) only as a last
-@@ -1742,34 +1748,34 @@
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--{ { echo "$as_me:1745: error: C compiler cannot create executables" >&5
-+{ { echo "$as_me:1751: error: C compiler cannot create executables" >&5
- echo "$as_me: error: C compiler cannot create executables" >&2;}
-    { (exit 77); exit 77; }; }
- fi
- 
- ac_exeext=$ac_cv_exeext
--echo "$as_me:1751: result: $ac_file" >&5
-+echo "$as_me:1757: result: $ac_file" >&5
- echo "${ECHO_T}$ac_file" >&6
- 
- # Check the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:1756: checking whether the C compiler works" >&5
-+echo "$as_me:1762: 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
-   if { ac_try='./$ac_file'
--  { (eval echo "$as_me:1762: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1768: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1765: \$? = $ac_status" >&5
-+  echo "$as_me:1771: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-     cross_compiling=no
-   else
-     if test "$cross_compiling" = maybe; then
- 	cross_compiling=yes
-     else
--	{ { echo "$as_me:1772: error: cannot run C compiled programs.
-+	{ { echo "$as_me:1778: error: cannot run C compiled programs.
- If you meant to cross compile, use \`--host'." >&5
- echo "$as_me: error: cannot run C compiled programs.
- If you meant to cross compile, use \`--host'." >&2;}
-@@ -1777,24 +1783,24 @@
-     fi
-   fi
- fi
--echo "$as_me:1780: result: yes" >&5
-+echo "$as_me:1786: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- 
- rm -f a.out a.exe conftest$ac_cv_exeext
- ac_clean_files=$ac_clean_files_save
- # Check the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:1787: checking whether we are cross compiling" >&5
-+echo "$as_me:1793: checking whether we are cross compiling" >&5
- echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
--echo "$as_me:1789: result: $cross_compiling" >&5
-+echo "$as_me:1795: result: $cross_compiling" >&5
- echo "${ECHO_T}$cross_compiling" >&6
- 
--echo "$as_me:1792: checking for executable suffix" >&5
-+echo "$as_me:1798: checking for executable suffix" >&5
- echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
--if { (eval echo "$as_me:1794: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:1800: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:1797: \$? = $ac_status" >&5
-+  echo "$as_me:1803: \$? = $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
-@@ -1810,25 +1816,25 @@
-   esac
- done
- else
--  { { echo "$as_me:1813: error: cannot compute EXEEXT: cannot compile and link" >&5
-+  { { echo "$as_me:1819: error: cannot compute EXEEXT: cannot compile and link" >&5
- echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- rm -f conftest$ac_cv_exeext
--echo "$as_me:1819: result: $ac_cv_exeext" >&5
-+echo "$as_me:1825: result: $ac_cv_exeext" >&5
- echo "${ECHO_T}$ac_cv_exeext" >&6
- 
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
--echo "$as_me:1825: checking for object suffix" >&5
-+echo "$as_me:1831: checking for object suffix" >&5
- echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
- if test "${ac_cv_objext+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1831 "configure"
-+#line 1837 "configure"
- #include "confdefs.h"
- 
- int
-@@ -1840,10 +1846,10 @@
- }
- _ACEOF
- rm -f conftest.o conftest.obj
--if { (eval echo "$as_me:1843: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1849: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1846: \$? = $ac_status" >&5
-+  echo "$as_me:1852: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
-   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-   case $ac_file in
-@@ -1855,24 +1861,24 @@
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
--{ { echo "$as_me:1858: error: cannot compute OBJEXT: cannot compile" >&5
-+{ { echo "$as_me:1864: error: cannot compute OBJEXT: cannot compile" >&5
- echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- 
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
--echo "$as_me:1865: result: $ac_cv_objext" >&5
-+echo "$as_me:1871: result: $ac_cv_objext" >&5
- echo "${ECHO_T}$ac_cv_objext" >&6
- OBJEXT=$ac_cv_objext
- ac_objext=$OBJEXT
--echo "$as_me:1869: checking whether we are using the GNU C compiler" >&5
-+echo "$as_me:1875: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1875 "configure"
-+#line 1881 "configure"
- #include "confdefs.h"
- 
- int
-@@ -1887,16 +1893,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1890: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1896: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1893: \$? = $ac_status" >&5
-+  echo "$as_me:1899: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:1896: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1902: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1899: \$? = $ac_status" >&5
-+  echo "$as_me:1905: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_compiler_gnu=yes
- else
-@@ -1908,19 +1914,19 @@
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
- 
- fi
--echo "$as_me:1911: result: $ac_cv_c_compiler_gnu" >&5
-+echo "$as_me:1917: 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
- CFLAGS="-g"
--echo "$as_me:1917: checking whether $CC accepts -g" >&5
-+echo "$as_me:1923: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 1923 "configure"
-+#line 1929 "configure"
- #include "confdefs.h"
- 
- int
-@@ -1932,16 +1938,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1935: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1941: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1938: \$? = $ac_status" >&5
-+  echo "$as_me:1944: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:1941: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1947: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1944: \$? = $ac_status" >&5
-+  echo "$as_me:1950: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_prog_cc_g=yes
- else
-@@ -1951,7 +1957,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:1954: result: $ac_cv_prog_cc_g" >&5
-+echo "$as_me:1960: 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
-@@ -1978,16 +1984,16 @@
- #endif
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:1981: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:1987: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:1984: \$? = $ac_status" >&5
-+  echo "$as_me:1990: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:1987: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:1993: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:1990: \$? = $ac_status" >&5
-+  echo "$as_me:1996: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   for ac_declaration in \
-    ''\
-@@ -1999,7 +2005,7 @@
-    'void exit (int);'
- do
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2002 "configure"
-+#line 2008 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- $ac_declaration
-@@ -2012,16 +2018,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2015: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2021: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:2018: \$? = $ac_status" >&5
-+  echo "$as_me:2024: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:2021: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2027: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2024: \$? = $ac_status" >&5
-+  echo "$as_me:2030: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -2031,7 +2037,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2034 "configure"
-+#line 2040 "configure"
- #include "confdefs.h"
- $ac_declaration
- int
-@@ -2043,16 +2049,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2046: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2052: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:2049: \$? = $ac_status" >&5
-+  echo "$as_me:2055: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:2052: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2058: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2055: \$? = $ac_status" >&5
-+  echo "$as_me:2061: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -2082,11 +2088,11 @@
- 
- GCC_VERSION=none
- if test "$GCC" = yes ; then
--	echo "$as_me:2085: checking version of $CC" >&5
-+	echo "$as_me:2091: checking version of $CC" >&5
- echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
- 	GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
- 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
--	echo "$as_me:2089: result: $GCC_VERSION" >&5
-+	echo "$as_me:2095: result: $GCC_VERSION" >&5
- echo "${ECHO_T}$GCC_VERSION" >&6
- fi
- 
-@@ -2096,7 +2102,7 @@
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ac_main_return=return
--echo "$as_me:2099: checking how to run the C preprocessor" >&5
-+echo "$as_me:2105: 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
-@@ -2117,18 +2123,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2120 "configure"
-+#line 2126 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:2125: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:2131: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:2131: \$? = $ac_status" >&5
-+  echo "$as_me:2137: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -2151,17 +2157,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2154 "configure"
-+#line 2160 "configure"
- #include "confdefs.h"
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:2158: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:2164: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:2164: \$? = $ac_status" >&5
-+  echo "$as_me:2170: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -2198,7 +2204,7 @@
- else
-   ac_cv_prog_CPP=$CPP
- fi
--echo "$as_me:2201: result: $CPP" >&5
-+echo "$as_me:2207: result: $CPP" >&5
- echo "${ECHO_T}$CPP" >&6
- ac_preproc_ok=false
- for ac_c_preproc_warn_flag in '' yes
-@@ -2208,18 +2214,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2211 "configure"
-+#line 2217 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:2216: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:2222: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:2222: \$? = $ac_status" >&5
-+  echo "$as_me:2228: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -2242,17 +2248,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2245 "configure"
-+#line 2251 "configure"
- #include "confdefs.h"
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:2249: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:2255: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:2255: \$? = $ac_status" >&5
-+  echo "$as_me:2261: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -2280,7 +2286,7 @@
- if $ac_preproc_ok; then
-   :
- else
--  { { echo "$as_me:2283: error: C preprocessor \"$CPP\" fails sanity check" >&5
-+  { { echo "$as_me:2289: error: C preprocessor \"$CPP\" fails sanity check" >&5
- echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -2293,14 +2299,14 @@
- ac_main_return=return
- 
- if test $ac_cv_c_compiler_gnu = yes; then
--    echo "$as_me:2296: checking whether $CC needs -traditional" >&5
-+    echo "$as_me:2302: checking whether $CC needs -traditional" >&5
- echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
- if test "${ac_cv_prog_gcc_traditional+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-     ac_pattern="Autoconf.*'x'"
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2303 "configure"
-+#line 2309 "configure"
- #include "confdefs.h"
- #include <sgtty.h>
- int Autoconf = TIOCGETP;
-@@ -2315,7 +2321,7 @@
- 
-   if test $ac_cv_prog_gcc_traditional = no; then
-     cat >conftest.$ac_ext <<_ACEOF
--#line 2318 "configure"
-+#line 2324 "configure"
- #include "confdefs.h"
- #include <termio.h>
- int Autoconf = TCGETA;
-@@ -2328,14 +2334,14 @@
- 
-   fi
- fi
--echo "$as_me:2331: result: $ac_cv_prog_gcc_traditional" >&5
-+echo "$as_me:2337: result: $ac_cv_prog_gcc_traditional" >&5
- echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
-   if test $ac_cv_prog_gcc_traditional = yes; then
-     CC="$CC -traditional"
-   fi
- fi
- 
--echo "$as_me:2338: checking whether $CC understands -c and -o together" >&5
-+echo "$as_me:2344: checking whether $CC understands -c and -o together" >&5
- echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6
- if test "${cf_cv_prog_CC_c_o+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2351,15 +2357,15 @@
- # We do the test twice because some compilers refuse to overwrite an
- # existing .o file with -o, though they will create one.
- ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
--if { (eval echo "$as_me:2354: \"$ac_try\"") >&5
-+if { (eval echo "$as_me:2360: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2357: \$? = $ac_status" >&5
-+  echo "$as_me:2363: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--  test -f conftest2.$ac_objext && { (eval echo "$as_me:2359: \"$ac_try\"") >&5
-+  test -f conftest2.$ac_objext && { (eval echo "$as_me:2365: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2362: \$? = $ac_status" >&5
-+  echo "$as_me:2368: \$? = $ac_status" >&5
-   (exit $ac_status); };
- then
-   eval cf_cv_prog_CC_c_o=yes
-@@ -2370,19 +2376,19 @@
- 
- fi
- if test $cf_cv_prog_CC_c_o = yes; then
--  echo "$as_me:2373: result: yes" >&5
-+  echo "$as_me:2379: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--  echo "$as_me:2376: result: no" >&5
-+  echo "$as_me:2382: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:2380: checking for POSIXized ISC" >&5
-+echo "$as_me:2386: checking for POSIXized ISC" >&5
- echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
- if test -d /etc/conf/kconfig.d &&
-    grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
- then
--  echo "$as_me:2385: result: yes" >&5
-+  echo "$as_me:2391: result: yes" >&5
- echo "${ECHO_T}yes" >&6
-   ISC=yes # If later tests want to check for ISC.
- 
-@@ -2396,12 +2402,12 @@
-     CC="$CC -Xp"
-   fi
- else
--  echo "$as_me:2399: result: no" >&5
-+  echo "$as_me:2405: result: no" >&5
- echo "${ECHO_T}no" >&6
-   ISC=
- fi
- 
--echo "$as_me:2404: checking for ${CC-cc} option to accept ANSI C" >&5
-+echo "$as_me:2410: checking for ${CC-cc} option to accept ANSI C" >&5
- echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
- if test "${cf_cv_ansi_cc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2495,7 +2501,7 @@
- fi
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 2498 "configure"
-+#line 2504 "configure"
- #include "confdefs.h"
- 
- #ifndef CC_HAS_PROTOS
-@@ -2516,16 +2522,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2519: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2525: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:2522: \$? = $ac_status" >&5
-+  echo "$as_me:2528: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:2525: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2531: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2528: \$? = $ac_status" >&5
-+  echo "$as_me:2534: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ansi_cc="$cf_arg"; break
- else
-@@ -2538,7 +2544,7 @@
- CPPFLAGS="$cf_save_CPPFLAGS"
- 
- fi
--echo "$as_me:2541: result: $cf_cv_ansi_cc" >&5
-+echo "$as_me:2547: result: $cf_cv_ansi_cc" >&5
- echo "${ECHO_T}$cf_cv_ansi_cc" >&6
- 
- if test "$cf_cv_ansi_cc" != "no"; then
-@@ -2621,7 +2627,7 @@
- fi
- 
- if test "$cf_cv_ansi_cc" = "no"; then
--	{ { echo "$as_me:2624: error: Your compiler does not appear to recognize prototypes.
-+	{ { echo "$as_me:2630: error: Your compiler does not appear to recognize prototypes.
- You have the following choices:
- 	a. adjust your compiler options
- 	b. get an up-to-date compiler
-@@ -2661,7 +2667,7 @@
- *) LDPATH=$PATH:/sbin:/usr/sbin
-   # Extract the first word of "ldconfig", so it can be a program name with args.
- set dummy ldconfig; ac_word=$2
--echo "$as_me:2664: checking for $ac_word" >&5
-+echo "$as_me:2670: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_LDCONFIG+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2678,7 +2684,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   if $as_executable_p "$ac_dir/$ac_word"; then
-    ac_cv_path_LDCONFIG="$ac_dir/$ac_word"
--   echo "$as_me:2681: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:2687: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -2689,10 +2695,10 @@
- LDCONFIG=$ac_cv_path_LDCONFIG
- 
- if test -n "$LDCONFIG"; then
--  echo "$as_me:2692: result: $LDCONFIG" >&5
-+  echo "$as_me:2698: result: $LDCONFIG" >&5
- echo "${ECHO_T}$LDCONFIG" >&6
- else
--  echo "$as_me:2695: result: no" >&5
-+  echo "$as_me:2701: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2700,7 +2706,7 @@
- esac
- fi
- 
--echo "$as_me:2703: checking if you want to ensure bool is consistent with C++" >&5
-+echo "$as_me:2709: checking if you want to ensure bool is consistent with C++" >&5
- echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6
- 
- # Check whether --with-cxx or --without-cxx was given.
-@@ -2710,7 +2716,7 @@
- else
-   cf_with_cxx=yes
- fi;
--echo "$as_me:2713: result: $cf_with_cxx" >&5
-+echo "$as_me:2719: result: $cf_with_cxx" >&5
- echo "${ECHO_T}$cf_with_cxx" >&6
- if test "X$cf_with_cxx" = Xno ; then
- 	CXX=""
-@@ -2728,7 +2734,7 @@
-   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
--echo "$as_me:2731: checking for $ac_word" >&5
-+echo "$as_me:2737: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_CXX+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2743,7 +2749,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
--echo "$as_me:2746: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2752: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -2751,10 +2757,10 @@
- fi
- CXX=$ac_cv_prog_CXX
- if test -n "$CXX"; then
--  echo "$as_me:2754: result: $CXX" >&5
-+  echo "$as_me:2760: result: $CXX" >&5
- echo "${ECHO_T}$CXX" >&6
- else
--  echo "$as_me:2757: result: no" >&5
-+  echo "$as_me:2763: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2767,7 +2773,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:2770: checking for $ac_word" >&5
-+echo "$as_me:2776: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2782,7 +2788,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_CXX="$ac_prog"
--echo "$as_me:2785: found $ac_dir/$ac_word" >&5
-+echo "$as_me:2791: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -2790,10 +2796,10 @@
- fi
- ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
- if test -n "$ac_ct_CXX"; then
--  echo "$as_me:2793: result: $ac_ct_CXX" >&5
-+  echo "$as_me:2799: result: $ac_ct_CXX" >&5
- echo "${ECHO_T}$ac_ct_CXX" >&6
- else
--  echo "$as_me:2796: result: no" >&5
-+  echo "$as_me:2802: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -2805,32 +2811,32 @@
- fi
- 
- # Provide some information about the compiler.
--echo "$as_me:2808:" \
-+echo "$as_me:2814:" \
-      "checking for C++ compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:2811: \"$ac_compiler --version </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:2817: \"$ac_compiler --version </dev/null >&5\"") >&5
-   (eval $ac_compiler --version </dev/null >&5) 2>&5
-   ac_status=$?
--  echo "$as_me:2814: \$? = $ac_status" >&5
-+  echo "$as_me:2820: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:2816: \"$ac_compiler -v </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:2822: \"$ac_compiler -v </dev/null >&5\"") >&5
-   (eval $ac_compiler -v </dev/null >&5) 2>&5
-   ac_status=$?
--  echo "$as_me:2819: \$? = $ac_status" >&5
-+  echo "$as_me:2825: \$? = $ac_status" >&5
-   (exit $ac_status); }
--{ (eval echo "$as_me:2821: \"$ac_compiler -V </dev/null >&5\"") >&5
-+{ (eval echo "$as_me:2827: \"$ac_compiler -V </dev/null >&5\"") >&5
-   (eval $ac_compiler -V </dev/null >&5) 2>&5
-   ac_status=$?
--  echo "$as_me:2824: \$? = $ac_status" >&5
-+  echo "$as_me:2830: \$? = $ac_status" >&5
-   (exit $ac_status); }
- 
--echo "$as_me:2827: checking whether we are using the GNU C++ compiler" >&5
-+echo "$as_me:2833: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2833 "configure"
-+#line 2839 "configure"
- #include "confdefs.h"
- 
- int
-@@ -2845,16 +2851,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2848: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2854: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:2851: \$? = $ac_status" >&5
-+  echo "$as_me:2857: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:2854: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2860: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2857: \$? = $ac_status" >&5
-+  echo "$as_me:2863: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_compiler_gnu=yes
- else
-@@ -2866,19 +2872,19 @@
- ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
- 
- fi
--echo "$as_me:2869: result: $ac_cv_cxx_compiler_gnu" >&5
-+echo "$as_me:2875: 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
- CXXFLAGS="-g"
--echo "$as_me:2875: checking whether $CXX accepts -g" >&5
-+echo "$as_me:2881: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2881 "configure"
-+#line 2887 "configure"
- #include "confdefs.h"
- 
- int
-@@ -2890,16 +2896,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2893: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2899: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:2896: \$? = $ac_status" >&5
-+  echo "$as_me:2902: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:2899: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2905: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2902: \$? = $ac_status" >&5
-+  echo "$as_me:2908: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_prog_cxx_g=yes
- else
-@@ -2909,7 +2915,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:2912: result: $ac_cv_prog_cxx_g" >&5
-+echo "$as_me:2918: 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
-@@ -2936,7 +2942,7 @@
-    'void exit (int);'
- do
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2939 "configure"
-+#line 2945 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- $ac_declaration
-@@ -2949,16 +2955,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2952: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2958: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:2955: \$? = $ac_status" >&5
-+  echo "$as_me:2961: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:2958: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2964: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2961: \$? = $ac_status" >&5
-+  echo "$as_me:2967: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -2968,7 +2974,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 2971 "configure"
-+#line 2977 "configure"
- #include "confdefs.h"
- $ac_declaration
- int
-@@ -2980,16 +2986,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:2983: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:2989: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:2986: \$? = $ac_status" >&5
-+  echo "$as_me:2992: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:2989: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:2995: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:2992: \$? = $ac_status" >&5
-+  echo "$as_me:2998: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -3016,7 +3022,7 @@
- 	if test "$CXX" = "g++" ; then
- 		# Extract the first word of "g++", so it can be a program name with args.
- set dummy g++; ac_word=$2
--echo "$as_me:3019: checking for $ac_word" >&5
-+echo "$as_me:3025: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_CXX+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3033,7 +3039,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   if $as_executable_p "$ac_dir/$ac_word"; then
-    ac_cv_path_CXX="$ac_dir/$ac_word"
--   echo "$as_me:3036: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:3042: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -3044,16 +3050,16 @@
- CXX=$ac_cv_path_CXX
- 
- if test -n "$CXX"; then
--  echo "$as_me:3047: result: $CXX" >&5
-+  echo "$as_me:3053: result: $CXX" >&5
- echo "${ECHO_T}$CXX" >&6
- else
--  echo "$as_me:3050: result: no" >&5
-+  echo "$as_me:3056: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
- 	fi
- 	if test "$CXX" = "g++" ; then
--		{ echo "$as_me:3056: WARNING: ignoring hardcoded g++" >&5
-+		{ echo "$as_me:3062: WARNING: ignoring hardcoded g++" >&5
- echo "$as_me: WARNING: ignoring hardcoded g++" >&2;}
- 		cf_with_cxx=no; CXX=""; GXX="";
- 	fi
-@@ -3061,11 +3067,11 @@
- 
- GXX_VERSION=none
- if test "$GXX" = yes; then
--	echo "$as_me:3064: checking version of g++" >&5
-+	echo "$as_me:3070: checking version of g++" >&5
- echo $ECHO_N "checking version of g++... $ECHO_C" >&6
- 	GXX_VERSION="`${CXX-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
- 	test -z "$GXX_VERSION" && GXX_VERSION=unknown
--	echo "$as_me:3068: result: $GXX_VERSION" >&5
-+	echo "$as_me:3074: result: $GXX_VERSION" >&5
- echo "${ECHO_T}$GXX_VERSION" >&6
- fi
- 
-@@ -3073,12 +3079,12 @@
- 1*|2.[0-6]*)
- 	# GXX=""; CXX=""; ac_cv_prog_gxx=no
- 	# cf_cxx_library=no
--	{ echo "$as_me:3076: WARNING: templates do not work" >&5
-+	{ echo "$as_me:3082: WARNING: templates do not work" >&5
- echo "$as_me: WARNING: templates do not work" >&2;}
- 	;;
- esac
- 
--echo "$as_me:3081: checking if you want to build C++ binding and demo" >&5
-+echo "$as_me:3087: checking if you want to build C++ binding and demo" >&5
- echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6
- 
- # Check whether --with-cxx-binding or --without-cxx-binding was given.
-@@ -3088,10 +3094,10 @@
- else
-   cf_with_cxx_binding=$cf_with_cxx
- fi;
--echo "$as_me:3091: result: $cf_with_cxx_binding" >&5
-+echo "$as_me:3097: result: $cf_with_cxx_binding" >&5
- echo "${ECHO_T}$cf_with_cxx_binding" >&6
- 
--echo "$as_me:3094: checking if you want to build with Ada95" >&5
-+echo "$as_me:3100: checking if you want to build with Ada95" >&5
- echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6
- 
- # Check whether --with-ada or --without-ada was given.
-@@ -3101,10 +3107,10 @@
- else
-   cf_with_ada=yes
- fi;
--echo "$as_me:3104: result: $cf_with_ada" >&5
-+echo "$as_me:3110: result: $cf_with_ada" >&5
- echo "${ECHO_T}$cf_with_ada" >&6
- 
--echo "$as_me:3107: checking if you want to build programs such as tic" >&5
-+echo "$as_me:3113: checking if you want to build programs such as tic" >&5
- echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6
- 
- # Check whether --with-progs or --without-progs was given.
-@@ -3114,10 +3120,10 @@
- else
-   cf_with_progs=yes
- fi;
--echo "$as_me:3117: result: $cf_with_progs" >&5
-+echo "$as_me:3123: result: $cf_with_progs" >&5
- echo "${ECHO_T}$cf_with_progs" >&6
- 
--echo "$as_me:3120: checking if you wish to install curses.h" >&5
-+echo "$as_me:3126: checking if you wish to install curses.h" >&5
- echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6
- 
- # Check whether --with-curses-h or --without-curses-h was given.
-@@ -3127,7 +3133,7 @@
- else
-   with_curses_h=yes
- fi;
--echo "$as_me:3130: result: $with_curses_h" >&5
-+echo "$as_me:3136: result: $with_curses_h" >&5
- echo "${ECHO_T}$with_curses_h" >&6
- 
- modules_to_build="ncurses"
-@@ -3153,7 +3159,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:3156: checking for $ac_word" >&5
-+echo "$as_me:3162: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_AWK+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3168,7 +3174,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_AWK="$ac_prog"
--echo "$as_me:3171: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3177: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3176,21 +3182,21 @@
- fi
- AWK=$ac_cv_prog_AWK
- if test -n "$AWK"; then
--  echo "$as_me:3179: result: $AWK" >&5
-+  echo "$as_me:3185: result: $AWK" >&5
- echo "${ECHO_T}$AWK" >&6
- else
--  echo "$as_me:3182: result: no" >&5
-+  echo "$as_me:3188: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-   test -n "$AWK" && break
- done
- 
--test -z "$AWK" && { { echo "$as_me:3189: error: No awk program found" >&5
-+test -z "$AWK" && { { echo "$as_me:3195: error: No awk program found" >&5
- echo "$as_me: error: No awk program found" >&2;}
-    { (exit 1); exit 1; }; }
- 
--echo "$as_me:3193: checking for egrep" >&5
-+echo "$as_me:3199: checking for egrep" >&5
- echo $ECHO_N "checking for egrep... $ECHO_C" >&6
- if test "${ac_cv_prog_egrep+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3200,11 +3206,11 @@
-     else ac_cv_prog_egrep='egrep'
-     fi
- fi
--echo "$as_me:3203: result: $ac_cv_prog_egrep" >&5
-+echo "$as_me:3209: result: $ac_cv_prog_egrep" >&5
- echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-  EGREP=$ac_cv_prog_egrep
- 
--test -z "$EGREP" && { { echo "$as_me:3207: error: No egrep program found" >&5
-+test -z "$EGREP" && { { echo "$as_me:3213: error: No egrep program found" >&5
- echo "$as_me: error: No egrep program found" >&2;}
-    { (exit 1); exit 1; }; }
- 
-@@ -3220,7 +3226,7 @@
- # AFS /usr/afsws/bin/install, which mishandles nonexistent args
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
--echo "$as_me:3223: checking for a BSD compatible install" >&5
-+echo "$as_me:3229: 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
-@@ -3269,7 +3275,7 @@
-     INSTALL=$ac_install_sh
-   fi
- fi
--echo "$as_me:3272: result: $INSTALL" >&5
-+echo "$as_me:3278: result: $INSTALL" >&5
- echo "${ECHO_T}$INSTALL" >&6
- 
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -3294,7 +3300,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:3297: checking for $ac_word" >&5
-+echo "$as_me:3303: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_LINT+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3309,7 +3315,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_LINT="$ac_prog"
--echo "$as_me:3312: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3318: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3317,57 +3323,91 @@
- fi
- LINT=$ac_cv_prog_LINT
- if test -n "$LINT"; then
--  echo "$as_me:3320: result: $LINT" >&5
-+  echo "$as_me:3326: result: $LINT" >&5
- echo "${ECHO_T}$LINT" >&6
- else
--  echo "$as_me:3323: result: no" >&5
-+  echo "$as_me:3329: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-   test -n "$LINT" && break
- done
- 
--echo "$as_me:3330: checking whether ln -s works" >&5
-+echo "$as_me:3336: checking whether ln -s works" >&5
- echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
- LN_S=$as_ln_s
- if test "$LN_S" = "ln -s"; then
--  echo "$as_me:3334: result: yes" >&5
-+  echo "$as_me:3340: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--  echo "$as_me:3337: result: no, using $LN_S" >&5
-+  echo "$as_me:3343: result: no, using $LN_S" >&5
- echo "${ECHO_T}no, using $LN_S" >&6
- fi
- 
--echo "$as_me:3341: checking whether ${MAKE-make} sets \${MAKE}" >&5
--echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
--set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
--if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-+echo "$as_me:3347: checking for long file names" >&5
-+echo $ECHO_N "checking for long file names... $ECHO_C" >&6
-+if test "${ac_cv_sys_long_file_names+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  cat >conftest.make <<\EOF
--all:
--	@echo 'ac_maketemp="${MAKE}"'
--EOF
--# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
--eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
--if test -n "$ac_maketemp"; then
--  eval ac_cv_prog_make_${ac_make}_set=yes
-+  ac_cv_sys_long_file_names=yes
-+# Test for long file names in all the places we know might matter:
-+#      .		the current directory, where building will happen
-+#      $prefix/lib	where we will be installing things
-+#      $exec_prefix/lib	likewise
-+# eval it to expand exec_prefix.
-+#      $TMPDIR		if set, where it might want to write temporary files
-+# if $TMPDIR is not set:
-+#      /tmp		where it might want to write temporary files
-+#      /var/tmp		likewise
-+#      /usr/tmp		likewise
-+if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then
-+  ac_tmpdirs=$TMPDIR
- else
--  eval ac_cv_prog_make_${ac_make}_set=no
-+  ac_tmpdirs='/tmp /var/tmp /usr/tmp'
- fi
--rm -f conftest.make
-+for ac_dir in  . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do
-+  test -d $ac_dir || continue
-+  test -w $ac_dir || continue # It is less confusing to not echo anything here.
-+  ac_xdir=$ac_dir/cf$$
-+  (umask 077 && mkdir $ac_xdir 2>/dev/null) || continue
-+  ac_tf1=$ac_xdir/conftest9012345
-+  ac_tf2=$ac_xdir/conftest9012346
-+  (echo 1 >$ac_tf1) 2>/dev/null
-+  (echo 2 >$ac_tf2) 2>/dev/null
-+  ac_val=`cat $ac_tf1 2>/dev/null`
-+  if test ! -f $ac_tf1 || test "$ac_val" != 1; then
-+    ac_cv_sys_long_file_names=no
-+    rm -rf $ac_xdir 2>/dev/null
-+    break
-+  fi
-+  rm -rf $ac_xdir 2>/dev/null
-+done
- fi
--if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
--  echo "$as_me:3361: result: yes" >&5
--echo "${ECHO_T}yes" >&6
--  SET_MAKE=
--else
--  echo "$as_me:3365: result: no" >&5
--echo "${ECHO_T}no" >&6
--  SET_MAKE="MAKE=${MAKE-make}"
-+echo "$as_me:3386: result: $ac_cv_sys_long_file_names" >&5
-+echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
-+if test $ac_cv_sys_long_file_names = yes; then
-+
-+cat >>confdefs.h <<\EOF
-+#define HAVE_LONG_FILE_NAMES 1
-+EOF
-+
- fi
- 
--echo "$as_me:3370: checking if filesystem supports mixed-case filenames" >&5
-+echo "$as_me:3396: checking if we should assume mixed-case filenames" >&5
-+echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6
-+
-+# Check whether --enable-mixed-case or --disable-mixed-case was given.
-+if test "${enable_mixed_case+set}" = set; then
-+  enableval="$enable_mixed_case"
-+  enable_mixedcase=$enableval
-+else
-+  enable_mixedcase=auto
-+fi;
-+echo "$as_me:3406: result: $enable_mixedcase" >&5
-+echo "${ECHO_T}$enable_mixedcase" >&6
-+if test "$enable_mixedcase" = "auto" ; then
-+
-+echo "$as_me:3410: checking if filesystem supports mixed-case filenames" >&5
- echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
- if test "${cf_cv_mixedcase+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3394,15 +3434,55 @@
- fi
- 
- fi
--echo "$as_me:3397: result: $cf_cv_mixedcase" >&5
-+echo "$as_me:3437: result: $cf_cv_mixedcase" >&5
- echo "${ECHO_T}$cf_cv_mixedcase" >&6
- test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF
- #define MIXEDCASE_FILENAMES 1
- EOF
- 
-+else
-+    cf_cv_mixedcase=$enable_mixedcase
-+    if test "$enable_mixedcase" = "yes" ; then
-+        cat >>confdefs.h <<\EOF
-+#define MIXEDCASE_FILENAMES 1
-+EOF
-+
-+    fi
-+fi
-+
-+# do this after mixed-case option (tags/TAGS is not as important as tic).
-+echo "$as_me:3454: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
-+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
-+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.make <<\EOF
-+all:
-+	@echo 'ac_maketemp="${MAKE}"'
-+EOF
-+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-+if test -n "$ac_maketemp"; then
-+  eval ac_cv_prog_make_${ac_make}_set=yes
-+else
-+  eval ac_cv_prog_make_${ac_make}_set=no
-+fi
-+rm -f conftest.make
-+fi
-+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-+  echo "$as_me:3474: result: yes" >&5
-+echo "${ECHO_T}yes" >&6
-+  SET_MAKE=
-+else
-+  echo "$as_me:3478: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+  SET_MAKE="MAKE=${MAKE-make}"
-+fi
-+
- # Extract the first word of "ctags", so it can be a program name with args.
- set dummy ctags; ac_word=$2
--echo "$as_me:3405: checking for $ac_word" >&5
-+echo "$as_me:3485: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3417,7 +3497,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_MAKE_LOWER_TAGS="yes"
--echo "$as_me:3420: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3500: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3426,17 +3506,17 @@
- fi
- MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
- if test -n "$MAKE_LOWER_TAGS"; then
--  echo "$as_me:3429: result: $MAKE_LOWER_TAGS" >&5
-+  echo "$as_me:3509: result: $MAKE_LOWER_TAGS" >&5
- echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
- else
--  echo "$as_me:3432: result: no" >&5
-+  echo "$as_me:3512: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
- if test "$cf_cv_mixedcase" = yes ; then
- 	# Extract the first word of "etags", so it can be a program name with args.
- set dummy etags; ac_word=$2
--echo "$as_me:3439: checking for $ac_word" >&5
-+echo "$as_me:3519: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3451,7 +3531,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_MAKE_UPPER_TAGS="yes"
--echo "$as_me:3454: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3534: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3460,10 +3540,10 @@
- fi
- MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
- if test -n "$MAKE_UPPER_TAGS"; then
--  echo "$as_me:3463: result: $MAKE_UPPER_TAGS" >&5
-+  echo "$as_me:3543: result: $MAKE_UPPER_TAGS" >&5
- echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
- else
--  echo "$as_me:3466: result: no" >&5
-+  echo "$as_me:3546: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3483,7 +3563,7 @@
- 	MAKE_LOWER_TAGS="#"
- fi
- 
--echo "$as_me:3486: checking for makeflags variable" >&5
-+echo "$as_me:3566: checking for makeflags variable" >&5
- echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
- if test "${cf_cv_makeflags+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3517,95 +3597,13 @@
- 	rm -f cf_makeflags.tmp
- 
- fi
--echo "$as_me:3520: result: $cf_cv_makeflags" >&5
-+echo "$as_me:3600: result: $cf_cv_makeflags" >&5
- echo "${ECHO_T}$cf_cv_makeflags" >&6
- 
--echo "$as_me:3523: checking for long file names" >&5
--echo $ECHO_N "checking for long file names... $ECHO_C" >&6
--if test "${ac_cv_sys_long_file_names+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_cv_sys_long_file_names=yes
--# Test for long file names in all the places we know might matter:
--#      .		the current directory, where building will happen
--#      $prefix/lib	where we will be installing things
--#      $exec_prefix/lib	likewise
--# eval it to expand exec_prefix.
--#      $TMPDIR		if set, where it might want to write temporary files
--# if $TMPDIR is not set:
--#      /tmp		where it might want to write temporary files
--#      /var/tmp		likewise
--#      /usr/tmp		likewise
--if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then
--  ac_tmpdirs=$TMPDIR
--else
--  ac_tmpdirs='/tmp /var/tmp /usr/tmp'
--fi
--for ac_dir in  . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do
--  test -d $ac_dir || continue
--  test -w $ac_dir || continue # It is less confusing to not echo anything here.
--  ac_xdir=$ac_dir/cf$$
--  (umask 077 && mkdir $ac_xdir 2>/dev/null) || continue
--  ac_tf1=$ac_xdir/conftest9012345
--  ac_tf2=$ac_xdir/conftest9012346
--  (echo 1 >$ac_tf1) 2>/dev/null
--  (echo 2 >$ac_tf2) 2>/dev/null
--  ac_val=`cat $ac_tf1 2>/dev/null`
--  if test ! -f $ac_tf1 || test "$ac_val" != 1; then
--    ac_cv_sys_long_file_names=no
--    rm -rf $ac_xdir 2>/dev/null
--    break
--  fi
--  rm -rf $ac_xdir 2>/dev/null
--done
--fi
--echo "$as_me:3562: result: $ac_cv_sys_long_file_names" >&5
--echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
--if test $ac_cv_sys_long_file_names = yes; then
--
--cat >>confdefs.h <<\EOF
--#define HAVE_LONG_FILE_NAMES 1
--EOF
--
--fi
--
--echo "$as_me:3572: checking if filesystem supports mixed-case filenames" >&5
--echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
--if test "${cf_cv_mixedcase+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
--if test "$cross_compiling" = yes ; then
--	case $target_alias in #(vi
--	*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-mingw32*|*-uwin*) #(vi
--		cf_cv_mixedcase=no
--		;;
--	*)
--		cf_cv_mixedcase=yes
--		;;
--	esac
--else
--	rm -f conftest CONFTEST
--	echo test >conftest
--	if test -f CONFTEST ; then
--		cf_cv_mixedcase=no
--	else
--		cf_cv_mixedcase=yes
--	fi
--	rm -f conftest CONFTEST
--fi
--
--fi
--echo "$as_me:3599: result: $cf_cv_mixedcase" >&5
--echo "${ECHO_T}$cf_cv_mixedcase" >&6
--test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF
--#define MIXEDCASE_FILENAMES 1
--EOF
--
- 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
--echo "$as_me:3608: checking for $ac_word" >&5
-+echo "$as_me:3606: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_RANLIB+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3620,7 +3618,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
--echo "$as_me:3623: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3621: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3628,10 +3626,10 @@
- fi
- RANLIB=$ac_cv_prog_RANLIB
- if test -n "$RANLIB"; then
--  echo "$as_me:3631: result: $RANLIB" >&5
-+  echo "$as_me:3629: result: $RANLIB" >&5
- echo "${ECHO_T}$RANLIB" >&6
- else
--  echo "$as_me:3634: result: no" >&5
-+  echo "$as_me:3632: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3640,7 +3638,7 @@
-   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
--echo "$as_me:3643: checking for $ac_word" >&5
-+echo "$as_me:3641: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3655,7 +3653,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_RANLIB="ranlib"
--echo "$as_me:3658: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3656: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3664,10 +3662,10 @@
- fi
- ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
- if test -n "$ac_ct_RANLIB"; then
--  echo "$as_me:3667: result: $ac_ct_RANLIB" >&5
-+  echo "$as_me:3665: result: $ac_ct_RANLIB" >&5
- echo "${ECHO_T}$ac_ct_RANLIB" >&6
- else
--  echo "$as_me:3670: result: no" >&5
-+  echo "$as_me:3668: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3679,7 +3677,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ld; ac_word=$2
--echo "$as_me:3682: checking for $ac_word" >&5
-+echo "$as_me:3680: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_LD+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3694,7 +3692,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_LD="${ac_tool_prefix}ld"
--echo "$as_me:3697: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3695: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3702,10 +3700,10 @@
- fi
- LD=$ac_cv_prog_LD
- if test -n "$LD"; then
--  echo "$as_me:3705: result: $LD" >&5
-+  echo "$as_me:3703: result: $LD" >&5
- echo "${ECHO_T}$LD" >&6
- else
--  echo "$as_me:3708: result: no" >&5
-+  echo "$as_me:3706: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3714,7 +3712,7 @@
-   ac_ct_LD=$LD
-   # Extract the first word of "ld", so it can be a program name with args.
- set dummy ld; ac_word=$2
--echo "$as_me:3717: checking for $ac_word" >&5
-+echo "$as_me:3715: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3729,7 +3727,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_LD="ld"
--echo "$as_me:3732: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3730: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3738,10 +3736,10 @@
- fi
- ac_ct_LD=$ac_cv_prog_ac_ct_LD
- if test -n "$ac_ct_LD"; then
--  echo "$as_me:3741: result: $ac_ct_LD" >&5
-+  echo "$as_me:3739: result: $ac_ct_LD" >&5
- echo "${ECHO_T}$ac_ct_LD" >&6
- else
--  echo "$as_me:3744: result: no" >&5
-+  echo "$as_me:3742: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3753,7 +3751,7 @@
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ar; ac_word=$2
--echo "$as_me:3756: checking for $ac_word" >&5
-+echo "$as_me:3754: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_AR+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3768,7 +3766,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_AR="${ac_tool_prefix}ar"
--echo "$as_me:3771: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3769: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3776,10 +3774,10 @@
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
--  echo "$as_me:3779: result: $AR" >&5
-+  echo "$as_me:3777: result: $AR" >&5
- echo "${ECHO_T}$AR" >&6
- else
--  echo "$as_me:3782: result: no" >&5
-+  echo "$as_me:3780: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3788,7 +3786,7 @@
-   ac_ct_AR=$AR
-   # Extract the first word of "ar", so it can be a program name with args.
- set dummy ar; ac_word=$2
--echo "$as_me:3791: checking for $ac_word" >&5
-+echo "$as_me:3789: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3803,7 +3801,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_ac_ct_AR="ar"
--echo "$as_me:3806: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3804: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3812,10 +3810,10 @@
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
- if test -n "$ac_ct_AR"; then
--  echo "$as_me:3815: result: $ac_ct_AR" >&5
-+  echo "$as_me:3813: result: $ac_ct_AR" >&5
- echo "${ECHO_T}$ac_ct_AR" >&6
- else
--  echo "$as_me:3818: result: no" >&5
-+  echo "$as_me:3816: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3828,7 +3826,7 @@
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--echo "$as_me:3831: checking for archiver options (symbol AR_OPTS)" >&5
-+echo "$as_me:3829: checking for archiver options (symbol AR_OPTS)" >&5
- echo $ECHO_N "checking for archiver options (symbol AR_OPTS)... $ECHO_C" >&6
- 
- if test -z "$AR_OPTS" ; then
-@@ -3837,12 +3835,12 @@
- fi
- 
- cf_cv_subst_AR_OPTS=$AR_OPTS
--echo "$as_me:3840: result: $AR_OPTS" >&5
-+echo "$as_me:3838: result: $AR_OPTS" >&5
- echo "${ECHO_T}$AR_OPTS" >&6
- 
- fi
- 
--echo "$as_me:3845: checking if you have specified an install-prefix" >&5
-+echo "$as_me:3843: checking if you have specified an install-prefix" >&5
- echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
- 
- # Check whether --with-install-prefix or --without-install-prefix was given.
-@@ -3855,7 +3853,7 @@
- 		;;
- 	esac
- fi;
--echo "$as_me:3858: result: $DESTDIR" >&5
-+echo "$as_me:3856: result: $DESTDIR" >&5
- echo "${ECHO_T}$DESTDIR" >&6
- 
- ###############################################################################
-@@ -3883,7 +3881,7 @@
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:3886: checking for $ac_word" >&5
-+echo "$as_me:3884: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_BUILD_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3898,7 +3896,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_BUILD_CC="$ac_prog"
--echo "$as_me:3901: found $ac_dir/$ac_word" >&5
-+echo "$as_me:3899: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -3906,10 +3904,10 @@
- fi
- BUILD_CC=$ac_cv_prog_BUILD_CC
- if test -n "$BUILD_CC"; then
--  echo "$as_me:3909: result: $BUILD_CC" >&5
-+  echo "$as_me:3907: result: $BUILD_CC" >&5
- echo "${ECHO_T}$BUILD_CC" >&6
- else
--  echo "$as_me:3912: result: no" >&5
-+  echo "$as_me:3910: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -3917,12 +3915,12 @@
- done
- 
- fi;
--	echo "$as_me:3920: checking for native build C compiler" >&5
-+	echo "$as_me:3918: checking for native build C compiler" >&5
- echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
--	echo "$as_me:3922: result: $BUILD_CC" >&5
-+	echo "$as_me:3920: result: $BUILD_CC" >&5
- echo "${ECHO_T}$BUILD_CC" >&6
- 
--	echo "$as_me:3925: checking for native build C preprocessor" >&5
-+	echo "$as_me:3923: checking for native build C preprocessor" >&5
- echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
- 
- # Check whether --with-build-cpp or --without-build-cpp was given.
-@@ -3932,10 +3930,10 @@
- else
-   BUILD_CPP='${BUILD_CC} -E'
- fi;
--	echo "$as_me:3935: result: $BUILD_CPP" >&5
-+	echo "$as_me:3933: result: $BUILD_CPP" >&5
- echo "${ECHO_T}$BUILD_CPP" >&6
- 
--	echo "$as_me:3938: checking for native build C flags" >&5
-+	echo "$as_me:3936: checking for native build C flags" >&5
- echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
- 
- # Check whether --with-build-cflags or --without-build-cflags was given.
-@@ -3943,10 +3941,10 @@
-   withval="$with_build_cflags"
-   BUILD_CFLAGS="$withval"
- fi;
--	echo "$as_me:3946: result: $BUILD_CFLAGS" >&5
-+	echo "$as_me:3944: result: $BUILD_CFLAGS" >&5
- echo "${ECHO_T}$BUILD_CFLAGS" >&6
- 
--	echo "$as_me:3949: checking for native build C preprocessor-flags" >&5
-+	echo "$as_me:3947: checking for native build C preprocessor-flags" >&5
- echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
- 
- # Check whether --with-build-cppflags or --without-build-cppflags was given.
-@@ -3954,10 +3952,10 @@
-   withval="$with_build_cppflags"
-   BUILD_CPPFLAGS="$withval"
- fi;
--	echo "$as_me:3957: result: $BUILD_CPPFLAGS" >&5
-+	echo "$as_me:3955: result: $BUILD_CPPFLAGS" >&5
- echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
- 
--	echo "$as_me:3960: checking for native build linker-flags" >&5
-+	echo "$as_me:3958: checking for native build linker-flags" >&5
- echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
- 
- # Check whether --with-build-ldflags or --without-build-ldflags was given.
-@@ -3965,10 +3963,10 @@
-   withval="$with_build_ldflags"
-   BUILD_LDFLAGS="$withval"
- fi;
--	echo "$as_me:3968: result: $BUILD_LDFLAGS" >&5
-+	echo "$as_me:3966: result: $BUILD_LDFLAGS" >&5
- echo "${ECHO_T}$BUILD_LDFLAGS" >&6
- 
--	echo "$as_me:3971: checking for native build linker-libraries" >&5
-+	echo "$as_me:3969: checking for native build linker-libraries" >&5
- echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
- 
- # Check whether --with-build-libs or --without-build-libs was given.
-@@ -3976,7 +3974,7 @@
-   withval="$with_build_libs"
-   BUILD_LIBS="$withval"
- fi;
--	echo "$as_me:3979: result: $BUILD_LIBS" >&5
-+	echo "$as_me:3977: result: $BUILD_LIBS" >&5
- echo "${ECHO_T}$BUILD_LIBS" >&6
- 
- 	# this assumes we're on Unix.
-@@ -3986,7 +3984,7 @@
- 	: ${BUILD_CC:='${CC}'}
- 
- 	if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
--		{ { echo "$as_me:3989: error: Cross-build requires two compilers.
-+		{ { echo "$as_me:3987: error: Cross-build requires two compilers.
- Use --with-build-cc to specify the native compiler." >&5
- echo "$as_me: error: Cross-build requires two compilers.
- Use --with-build-cc to specify the native compiler." >&2;}
-@@ -4023,11 +4021,11 @@
- # doing:
- LIB_CLEAN=
- LIB_COMPILE=
--LIB_LINK=
-+LIB_LINK='${CC}'
- LIB_INSTALL=
- LIB_UNINSTALL=
- 
--echo "$as_me:4030: checking if you want to build libraries with libtool" >&5
-+echo "$as_me:4028: checking if you want to build libraries with libtool" >&5
- echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6
- 
- # Check whether --with-libtool or --without-libtool was given.
-@@ -4037,7 +4035,7 @@
- else
-   with_libtool=no
- fi;
--echo "$as_me:4040: result: $with_libtool" >&5
-+echo "$as_me:4038: result: $with_libtool" >&5
- echo "${ECHO_T}$with_libtool" >&6
- if test "$with_libtool" != "no"; then
- 
-@@ -4068,7 +4066,7 @@
-   with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%`
-   ;;
- *)
--  { { echo "$as_me:4071: error: expected a pathname, not \"$with_libtool\"" >&5
-+  { { echo "$as_me:4069: error: expected a pathname, not \"$with_libtool\"" >&5
- echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
-    { (exit 1); exit 1; }; }
-   ;;
-@@ -4078,7 +4076,7 @@
- 	else
-  		# Extract the first word of "libtool", so it can be a program name with args.
- set dummy libtool; ac_word=$2
--echo "$as_me:4081: checking for $ac_word" >&5
-+echo "$as_me:4079: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_path_LIBTOOL+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4095,7 +4093,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   if $as_executable_p "$ac_dir/$ac_word"; then
-    ac_cv_path_LIBTOOL="$ac_dir/$ac_word"
--   echo "$as_me:4098: found $ac_dir/$ac_word" >&5
-+   echo "$as_me:4096: found $ac_dir/$ac_word" >&5
-    break
- fi
- done
-@@ -4106,42 +4104,42 @@
- LIBTOOL=$ac_cv_path_LIBTOOL
- 
- if test -n "$LIBTOOL"; then
--  echo "$as_me:4109: result: $LIBTOOL" >&5
-+  echo "$as_me:4107: result: $LIBTOOL" >&5
- echo "${ECHO_T}$LIBTOOL" >&6
- else
--  echo "$as_me:4112: result: no" >&5
-+  echo "$as_me:4110: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-  	fi
-  	if test -z "$LIBTOOL" ; then
-- 		{ { echo "$as_me:4118: error: Cannot find libtool" >&5
-+ 		{ { echo "$as_me:4116: error: Cannot find libtool" >&5
- echo "$as_me: error: Cannot find libtool" >&2;}
-    { (exit 1); exit 1; }; }
-  	fi
--	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` -o'
--	LIB_OBJECT='${OBJECTS}.o=.lo)'
-+	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
-+	LIB_OBJECT='${OBJECTS:.o=.lo}'
- 	LIB_SUFFIX=.la
- 	LIB_CLEAN='${LIBTOOL} --mode=clean'
- 	LIB_COMPILE='${LIBTOOL} --mode=compile'
--	LIB_LINK='${LIBTOOL} --mode=link'
-+	LIB_LINK='${LIBTOOL} --mode=link ${CC} ${LIBTOOL_OPTS}'
- 	LIB_INSTALL='${LIBTOOL} --mode=install'
- 	LIB_UNINSTALL='${LIBTOOL} --mode=uninstall'
- 	LIB_PREP=:
- 
- 	# Show the version of libtool
--	echo "$as_me:4133: checking version of libtool" >&5
-+	echo "$as_me:4131: checking version of libtool" >&5
- echo $ECHO_N "checking version of libtool... $ECHO_C" >&6
- 
- 	# Save the version in a cache variable - this is not entirely a good
- 	# thing, but the version string from libtool is very ugly, and for
- 	# bug reports it might be useful to have the original string.
--	cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '2,$d' -e 's/([^)]*)//g' -e 's/^[^1-9]*//' -e 's/[^0-9.].*//'`
--	echo "$as_me:4140: result: $cf_cv_libtool_version" >&5
-+	cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([^)]*)//g' -e 's/^[^1-9]*//' -e 's/[^0-9.].*//'`
-+	echo "$as_me:4138: result: $cf_cv_libtool_version" >&5
- echo "${ECHO_T}$cf_cv_libtool_version" >&6
- 	if test -z "$cf_cv_libtool_version" ; then
--		{ { echo "$as_me:4143: error: This is not libtool" >&5
--echo "$as_me: error: This is not libtool" >&2;}
-+		{ { echo "$as_me:4141: error: This is not GNU libtool" >&5
-+echo "$as_me: error: This is not GNU libtool" >&2;}
-    { (exit 1); exit 1; }; }
- 	fi
- 
-@@ -4149,6 +4147,7 @@
- 	case $cf_cv_libtool_version in
- 	1.[5-9]*|[2-9]*)
- 		LIBTOOL_CXX="$LIBTOOL --tag=CXX"
-+		LIBTOOL="$LIBTOOL --tag=CC"
- 		;;
- 	*)
- 		LIBTOOL_CXX="$LIBTOOL"
-@@ -4167,7 +4166,7 @@
- 
- else
- 
--echo "$as_me:4170: checking if you want to build shared libraries" >&5
-+echo "$as_me:4169: checking if you want to build shared libraries" >&5
- echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6
- 
- # Check whether --with-shared or --without-shared was given.
-@@ -4177,11 +4176,11 @@
- else
-   with_shared=no
- fi;
--echo "$as_me:4180: result: $with_shared" >&5
-+echo "$as_me:4179: result: $with_shared" >&5
- echo "${ECHO_T}$with_shared" >&6
- test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
- 
--echo "$as_me:4184: checking if you want to build static libraries" >&5
-+echo "$as_me:4183: checking if you want to build static libraries" >&5
- echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6
- 
- # Check whether --with-normal or --without-normal was given.
-@@ -4191,11 +4190,11 @@
- else
-   with_normal=yes
- fi;
--echo "$as_me:4194: result: $with_normal" >&5
-+echo "$as_me:4193: result: $with_normal" >&5
- echo "${ECHO_T}$with_normal" >&6
- test "$with_normal" = "yes" && cf_list_models="$cf_list_models normal"
- 
--echo "$as_me:4198: checking if you want to build debug libraries" >&5
-+echo "$as_me:4197: checking if you want to build debug libraries" >&5
- echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6
- 
- # Check whether --with-debug or --without-debug was given.
-@@ -4205,11 +4204,11 @@
- else
-   with_debug=yes
- fi;
--echo "$as_me:4208: result: $with_debug" >&5
-+echo "$as_me:4207: result: $with_debug" >&5
- echo "${ECHO_T}$with_debug" >&6
- test "$with_debug" = "yes" && cf_list_models="$cf_list_models debug"
- 
--echo "$as_me:4212: checking if you want to build profiling libraries" >&5
-+echo "$as_me:4211: checking if you want to build profiling libraries" >&5
- echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6
- 
- # Check whether --with-profile or --without-profile was given.
-@@ -4219,7 +4218,7 @@
- else
-   with_profile=no
- fi;
--echo "$as_me:4222: result: $with_profile" >&5
-+echo "$as_me:4221: result: $with_profile" >&5
- echo "${ECHO_T}$with_profile" >&6
- test "$with_profile" = "yes" && cf_list_models="$cf_list_models profile"
- 
-@@ -4227,23 +4226,25 @@
- 
- ###############################################################################
- 
--echo "$as_me:4230: checking for specified models" >&5
-+echo "$as_me:4229: checking for specified models" >&5
- echo $ECHO_N "checking for specified models... $ECHO_C" >&6
- test -z "$cf_list_models" && cf_list_models=normal
- test "$with_libtool" != "no" && cf_list_models=libtool
--echo "$as_me:4234: result: $cf_list_models" >&5
-+echo "$as_me:4233: result: $cf_list_models" >&5
- echo "${ECHO_T}$cf_list_models" >&6
- 
- ### Use the first model as the default, and save its suffix for use in building
- ### up test-applications.
--echo "$as_me:4239: checking for default model" >&5
-+echo "$as_me:4238: checking for default model" >&5
- echo $ECHO_N "checking for default model... $ECHO_C" >&6
- DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'`
--echo "$as_me:4242: result: $DFT_LWR_MODEL" >&5
-+echo "$as_me:4241: result: $DFT_LWR_MODEL" >&5
- echo "${ECHO_T}$DFT_LWR_MODEL" >&6
- 
- DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
- 
-+TICS_NAME=tic
-+
- TINFO_NAME=tinfo
- 
- LIB_NAME=ncurses
-@@ -4264,7 +4265,7 @@
- 
- ###############################################################################
- 
--echo "$as_me:4267: checking if you want to build a separate terminfo library" >&5
-+echo "$as_me:4268: checking if you want to build a separate terminfo library" >&5
- echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6
- 
- # Check whether --with-termlib or --without-termlib was given.
-@@ -4274,13 +4275,26 @@
- else
-   with_termlib=no
- fi;
--echo "$as_me:4277: result: $with_termlib" >&5
-+echo "$as_me:4278: result: $with_termlib" >&5
- echo "${ECHO_T}$with_termlib" >&6
- 
-+echo "$as_me:4281: checking if you want to build a separate tic library" >&5
-+echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6
-+
-+# Check whether --with-ticlib or --without-ticlib was given.
-+if test "${with_ticlib+set}" = set; then
-+  withval="$with_ticlib"
-+  with_ticlib=$withval
-+else
-+  with_ticlib=no
-+fi;
-+echo "$as_me:4291: result: $with_ticlib" >&5
-+echo "${ECHO_T}$with_ticlib" >&6
-+
- ### Checks for special libraries, must be done up-front.
- SHLIB_LIST=""
- 
--echo "$as_me:4283: checking if you want to link with the GPM mouse library" >&5
-+echo "$as_me:4297: checking if you want to link with the GPM mouse library" >&5
- echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6
- 
- # Check whether --with-gpm or --without-gpm was given.
-@@ -4290,27 +4304,27 @@
- else
-   with_gpm=maybe
- fi;
--echo "$as_me:4293: result: $with_gpm" >&5
-+echo "$as_me:4307: result: $with_gpm" >&5
- echo "${ECHO_T}$with_gpm" >&6
- 
- if test "$with_gpm" != no ; then
--	echo "$as_me:4297: checking for gpm.h" >&5
-+	echo "$as_me:4311: checking for gpm.h" >&5
- echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6
- if test "${ac_cv_header_gpm_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 4303 "configure"
-+#line 4317 "configure"
- #include "confdefs.h"
- #include <gpm.h>
- _ACEOF
--if { (eval echo "$as_me:4307: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:4321: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:4313: \$? = $ac_status" >&5
-+  echo "$as_me:4327: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -4329,7 +4343,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:4332: result: $ac_cv_header_gpm_h" >&5
-+echo "$as_me:4346: result: $ac_cv_header_gpm_h" >&5
- echo "${ECHO_T}$ac_cv_header_gpm_h" >&6
- if test $ac_cv_header_gpm_h = yes; then
- 
-@@ -4340,12 +4354,14 @@
- 		if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then
- 			test -n "$verbose" && echo "	assuming we really have GPM library" 1>&6
- 
-+echo "${as_me-configure}:4357: testing assuming we really have GPM library ..." 1>&5
-+
- 			cat >>confdefs.h <<\EOF
- #define HAVE_LIBGPM 1
- EOF
- 
- 		else
--			echo "$as_me:4348: checking for Gpm_Open in -lgpm" >&5
-+			echo "$as_me:4364: checking for Gpm_Open in -lgpm" >&5
- echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
- if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4353,7 +4369,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 4356 "configure"
-+#line 4372 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -4372,16 +4388,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4375: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4391: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4378: \$? = $ac_status" >&5
-+  echo "$as_me:4394: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4381: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4397: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4384: \$? = $ac_status" >&5
-+  echo "$as_me:4400: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Open=yes
- else
-@@ -4392,13 +4408,13 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:4395: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-+echo "$as_me:4411: result: $ac_cv_lib_gpm_Gpm_Open" >&5
- echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
- if test $ac_cv_lib_gpm_Gpm_Open = yes; then
-   :
- else
- 
--				{ { echo "$as_me:4401: error: Cannot link with GPM library" >&5
-+				{ { echo "$as_me:4417: error: Cannot link with GPM library" >&5
- echo "$as_me: error: Cannot link with GPM library" >&2;}
-    { (exit 1); exit 1; }; }
- 		fi
-@@ -4408,7 +4424,7 @@
- 
- else
- 
--		test "$with_gpm" != maybe && { echo "$as_me:4411: WARNING: Cannot find GPM header" >&5
-+		test "$with_gpm" != maybe && { echo "$as_me:4427: WARNING: Cannot find GPM header" >&5
- echo "$as_me: WARNING: Cannot find GPM header" >&2;}
- 		with_gpm=no
- 
-@@ -4417,7 +4433,7 @@
- fi
- 
- if test "$with_gpm" != no ; then
--	echo "$as_me:4420: checking if you want to load GPM dynamically" >&5
-+	echo "$as_me:4436: checking if you want to load GPM dynamically" >&5
- echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6
- 
- # Check whether --with-dlsym or --without-dlsym was given.
-@@ -4427,18 +4443,18 @@
- else
-   with_dlsym=yes
- fi;
--	echo "$as_me:4430: result: $with_dlsym" >&5
-+	echo "$as_me:4446: result: $with_dlsym" >&5
- echo "${ECHO_T}$with_dlsym" >&6
- 	if test "$with_dlsym" = yes ; then
- 
- cf_have_dlsym=no
--echo "$as_me:4435: checking for dlsym" >&5
-+echo "$as_me:4451: checking for dlsym" >&5
- echo $ECHO_N "checking for dlsym... $ECHO_C" >&6
- if test "${ac_cv_func_dlsym+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 4441 "configure"
-+#line 4457 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char dlsym (); below.  */
-@@ -4469,16 +4485,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4472: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4488: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4475: \$? = $ac_status" >&5
-+  echo "$as_me:4491: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4478: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4494: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4481: \$? = $ac_status" >&5
-+  echo "$as_me:4497: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_dlsym=yes
- else
-@@ -4488,14 +4504,14 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:4491: result: $ac_cv_func_dlsym" >&5
-+echo "$as_me:4507: result: $ac_cv_func_dlsym" >&5
- echo "${ECHO_T}$ac_cv_func_dlsym" >&6
- if test $ac_cv_func_dlsym = yes; then
-   cf_have_dlsym=yes
- else
- 
- cf_have_libdl=no
--echo "$as_me:4498: checking for dlsym in -ldl" >&5
-+echo "$as_me:4514: checking for dlsym in -ldl" >&5
- echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
- if test "${ac_cv_lib_dl_dlsym+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4503,7 +4519,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 4506 "configure"
-+#line 4522 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -4522,16 +4538,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4525: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4541: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4528: \$? = $ac_status" >&5
-+  echo "$as_me:4544: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4531: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4547: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4534: \$? = $ac_status" >&5
-+  echo "$as_me:4550: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dl_dlsym=yes
- else
-@@ -4542,7 +4558,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:4545: result: $ac_cv_lib_dl_dlsym" >&5
-+echo "$as_me:4561: result: $ac_cv_lib_dl_dlsym" >&5
- echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
- if test $ac_cv_lib_dl_dlsym = yes; then
- 
-@@ -4555,10 +4571,10 @@
- if test "$cf_have_dlsym" = yes ; then
- 	test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS"
- 
--	echo "$as_me:4558: checking whether able to link to dl*() functions" >&5
-+	echo "$as_me:4574: checking whether able to link to dl*() functions" >&5
- echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 4561 "configure"
-+#line 4577 "configure"
- #include "confdefs.h"
- #include <dlfcn.h>
- int
-@@ -4576,16 +4592,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4579: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4595: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4582: \$? = $ac_status" >&5
-+  echo "$as_me:4598: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4585: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4601: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4588: \$? = $ac_status" >&5
-+  echo "$as_me:4604: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 		cat >>confdefs.h <<\EOF
-@@ -4596,15 +4612,15 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- 
--		{ { echo "$as_me:4599: error: Cannot link test program for libdl" >&5
-+		{ { echo "$as_me:4615: error: Cannot link test program for libdl" >&5
- echo "$as_me: error: Cannot link test program for libdl" >&2;}
-    { (exit 1); exit 1; }; }
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--	echo "$as_me:4604: result: ok" >&5
-+	echo "$as_me:4620: result: ok" >&5
- echo "${ECHO_T}ok" >&6
- else
--	{ { echo "$as_me:4607: error: Cannot find dlsym function" >&5
-+	{ { echo "$as_me:4623: error: Cannot find dlsym function" >&5
- echo "$as_me: error: Cannot find dlsym function" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -4612,10 +4628,12 @@
- 		if test "$with_gpm" != yes ; then
- 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
- 
-+echo "${as_me-configure}:4631: testing assuming soname for gpm is $with_gpm ..." 1>&5
-+
- 			cf_cv_gpm_soname="$with_gpm"
- 		else
- 
--echo "$as_me:4618: checking for soname of gpm library" >&5
-+echo "$as_me:4636: checking for soname of gpm library" >&5
- echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6
- if test "${cf_cv_gpm_soname+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4633,15 +4651,15 @@
- CF_EOF
- cf_save_LIBS="$LIBS"
- 	LIBS="-lgpm $LIBS"
--	if { (eval echo "$as_me:4636: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:4654: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4639: \$? = $ac_status" >&5
-+  echo "$as_me:4657: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
--		if { (eval echo "$as_me:4641: \"$ac_link\"") >&5
-+		if { (eval echo "$as_me:4659: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4644: \$? = $ac_status" >&5
-+  echo "$as_me:4662: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 			cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.`
- 			test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
-@@ -4652,7 +4670,7 @@
- fi
- 
- fi
--echo "$as_me:4655: result: $cf_cv_gpm_soname" >&5
-+echo "$as_me:4673: result: $cf_cv_gpm_soname" >&5
- echo "${ECHO_T}$cf_cv_gpm_soname" >&6
- 
- 		fi
-@@ -4668,7 +4686,7 @@
- #define HAVE_LIBGPM 1
- EOF
- 
--	echo "$as_me:4671: checking for Gpm_Wgetch in -lgpm" >&5
-+echo "$as_me:4689: checking for Gpm_Wgetch in -lgpm" >&5
- echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6
- if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4676,7 +4694,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lgpm  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 4679 "configure"
-+#line 4697 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -4695,16 +4713,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4698: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:4716: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4701: \$? = $ac_status" >&5
-+  echo "$as_me:4719: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4704: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4722: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4707: \$? = $ac_status" >&5
-+  echo "$as_me:4725: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_gpm_Gpm_Wgetch=yes
- else
-@@ -4715,12 +4733,61 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:4718: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
-+echo "$as_me:4736: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
- echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6
- if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then
- 
--		{ echo "$as_me:4722: WARNING: GPM library is already linked with curses - read the FAQ" >&5
-+echo "$as_me:4740: checking if GPM is weakly bound to curses library" >&5
-+echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6
-+if test "${cf_cv_check_gpm_wgetch+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+cf_cv_check_gpm_wgetch=unknown
-+if test "$cross_compiling" != yes ; then
-+
-+cat >conftest.$ac_ext <<CF_EOF
-+#include <gpm.h>
-+int main()
-+{
-+	Gpm_Wgetch();
-+	${cf_cv_main_return:-return}(0);
-+}
-+CF_EOF
-+
-+	cf_save_LIBS="$LIBS"
-+	# This only works if we can look at the symbol table.  If a shared
-+	# library is stripped for install, we cannot use that.  So we're forced
-+	# to rely on the static library, noting that some packagers may not
-+	# include it.
-+	LIBS="-static -lgpm -dynamic $LIBS"
-+	if { (eval echo "$as_me:4764: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:4767: \$? = $ac_status" >&5
-+  (exit $ac_status); } ; then
-+		if { (eval echo "$as_me:4769: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:4772: \$? = $ac_status" >&5
-+  (exit $ac_status); } ; then
-+			cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[vVwW]\>'`
-+			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
-+			test -z "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=no
-+		fi
-+	fi
-+	rm -f conftest*
-+	LIBS="$cf_save_LIBS"
-+fi
-+
-+fi
-+echo "$as_me:4784: result: $cf_cv_check_gpm_wgetch" >&5
-+echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6
-+
-+if test "$cf_cv_check_gpm_wgetch" != yes ; then
-+	{ echo "$as_me:4788: WARNING: GPM library is already linked with curses - read the FAQ" >&5
- echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;}
-+fi
- 
- fi
- 
-@@ -4728,7 +4795,7 @@
- 
- # not everyone has "test -c"
- if test -c /dev/sysmouse 2>/dev/null ; then
--echo "$as_me:4731: checking if you want to use sysmouse" >&5
-+echo "$as_me:4798: checking if you want to use sysmouse" >&5
- echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6
- 
- # Check whether --with-sysmouse or --without-sysmouse was given.
-@@ -4740,7 +4807,7 @@
- fi;
- 	if test "$cf_with_sysmouse" != no ; then
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 4743 "configure"
-+#line 4810 "configure"
- #include "confdefs.h"
- 
- #include <osreldate.h>
-@@ -4763,16 +4830,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4766: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4833: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4769: \$? = $ac_status" >&5
-+  echo "$as_me:4836: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:4772: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4839: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4775: \$? = $ac_status" >&5
-+  echo "$as_me:4842: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_with_sysmouse=yes
- else
-@@ -4782,7 +4849,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	fi
--echo "$as_me:4785: result: $cf_with_sysmouse" >&5
-+echo "$as_me:4852: result: $cf_with_sysmouse" >&5
- echo "${ECHO_T}$cf_with_sysmouse" >&6
- test "$cf_with_sysmouse" = yes && cat >>confdefs.h <<\EOF
- #define USE_SYSMOUSE 1
-@@ -4800,7 +4867,7 @@
- 	test -n "$GXX" && test "${ac_cv_prog_cxx_g}" != yes && CXX_G_OPT=''
- fi
- 
--echo "$as_me:4803: checking for default loader flags" >&5
-+echo "$as_me:4870: checking for default loader flags" >&5
- echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
- case $DFT_LWR_MODEL in
- libtool) LD_MODEL=''   ;;
-@@ -4809,10 +4876,12 @@
- profile) LD_MODEL='-pg';;
- shared)  LD_MODEL=''   ;;
- esac
--echo "$as_me:4812: result: $LD_MODEL" >&5
-+echo "$as_me:4879: result: $LD_MODEL" >&5
- echo "${ECHO_T}$LD_MODEL" >&6
- 
--echo "$as_me:4815: checking if rpath option should be used" >&5
-+case $DFT_LWR_MODEL in
-+shared)
-+echo "$as_me:4884: checking if rpath option should be used" >&5
- echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6
- 
- # Check whether --enable-rpath or --disable-rpath was given.
-@@ -4822,8 +4891,22 @@
- else
-   cf_cv_ld_rpath=no
- fi;
--echo "$as_me:4825: result: $cf_cv_ld_rpath" >&5
-+echo "$as_me:4894: result: $cf_cv_ld_rpath" >&5
- echo "${ECHO_T}$cf_cv_ld_rpath" >&6
-+echo "$as_me:4896: checking if shared libraries should be relinked during install" >&5
-+echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6
-+
-+# Check whether --enable-relink or --disable-relink was given.
-+if test "${enable_relink+set}" = set; then
-+  enableval="$enable_relink"
-+  cf_cv_do_relink=$enableval
-+else
-+  cf_cv_do_relink=yes
-+fi;
-+echo "$as_me:4906: result: $cf_cv_do_relink" >&5
-+echo "${ECHO_T}$cf_cv_do_relink" >&6
-+	;;
-+esac
- 
- 	LOCAL_LDFLAGS=
- 	LOCAL_LDFLAGS2=
-@@ -4832,7 +4915,7 @@
- 
- 	cf_cv_do_symlinks=no
- 
--	echo "$as_me:4835: checking if release/abi version should be used for shared libs" >&5
-+	echo "$as_me:4918: checking if release/abi version should be used for shared libs" >&5
- echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
- 
- # Check whether --with-shlib-version or --without-shlib-version was given.
-@@ -4847,7 +4930,7 @@
- 		cf_cv_shlib_version=$withval
- 		;;
- 	*)
--		{ { echo "$as_me:4850: error: option value must be one of: rel, abi, auto or no" >&5
-+		{ { echo "$as_me:4933: error: option value must be one of: rel, abi, auto or no" >&5
- echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;}
-    { (exit 1); exit 1; }; }
- 		;;
-@@ -4856,7 +4939,7 @@
- else
-   cf_cv_shlib_version=auto
- fi;
--	echo "$as_me:4859: result: $cf_cv_shlib_version" >&5
-+	echo "$as_me:4942: result: $cf_cv_shlib_version" >&5
- echo "${ECHO_T}$cf_cv_shlib_version" >&6
- 
- 	cf_cv_rm_so_locs=no
-@@ -4865,14 +4948,14 @@
- 	CC_SHARED_OPTS=
- 	if test "$GCC" = yes
- 	then
--		echo "$as_me:4868: checking which $CC option to use" >&5
-+		echo "$as_me:4951: checking which $CC option to use" >&5
- echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CFLAGS"
- 		for CC_SHARED_OPTS in -fPIC -fpic ''
- 		do
- 			CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 4875 "configure"
-+#line 4958 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -4884,16 +4967,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:4887: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:4970: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:4890: \$? = $ac_status" >&5
-+  echo "$as_me:4973: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:4893: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:4976: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4896: \$? = $ac_status" >&5
-+  echo "$as_me:4979: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -4902,7 +4985,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		done
--		echo "$as_me:4905: result: $CC_SHARED_OPTS" >&5
-+		echo "$as_me:4988: result: $CC_SHARED_OPTS" >&5
- echo "${ECHO_T}$CC_SHARED_OPTS" >&6
- 		CFLAGS="$cf_save_CFLAGS"
- 	fi
-@@ -4915,17 +4998,30 @@
- 		;;
- 	cygwin*)
- 		CC_SHARED_OPTS=
--		MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,--out-implib=../lib/${IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/${SHARED_LIB}'
-+		MK_SHARED_LIB='sh ../mk_shared_lib.sh $@ ${CC} ${CFLAGS}'
- 		cf_cv_shlib_version=cygdll
- 		cf_cv_shlib_version_infix=cygdll
-+		cat >mk_shared_lib.sh <<-CF_EOF
-+		#!/bin/sh
-+		SHARED_LIB=\$1
-+		IMPORT_LIB=\`echo "\$1" | sed -e 's/cyg/lib/' -e 's/[0-9]*\.dll$/.dll.a/'\`
-+		shift
-+		cat <<-EOF
-+		Linking shared library
-+		** SHARED_LIB \$SHARED_LIB
-+		** IMPORT_LIB \$IMPORT_LIB
-+EOF
-+		exec \$* -shared -Wl,--out-implib=../lib/\${IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\${SHARED_LIB}
-+CF_EOF
-+		chmod +x mk_shared_lib.sh
- 		;;
- 	darwin*)
- 		EXTRA_CFLAGS="-no-cpp-precomp"
- 		CC_SHARED_OPTS="-dynamic"
--		MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${DESTDIR}${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
-+		MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
- 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
- 		cf_cv_shlib_version_infix=yes
--		echo "$as_me:4928: checking if ld -search_paths_first works" >&5
-+		echo "$as_me:5024: checking if ld -search_paths_first works" >&5
- echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
- if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -4934,7 +5030,7 @@
- 			cf_save_LDFLAGS=$LDFLAGS
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
- 			cat >conftest.$ac_ext <<_ACEOF
--#line 4937 "configure"
-+#line 5033 "configure"
- #include "confdefs.h"
- 
- int
-@@ -4946,16 +5042,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:4949: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5045: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:4952: \$? = $ac_status" >&5
-+  echo "$as_me:5048: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:4955: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5051: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:4958: \$? = $ac_status" >&5
-+  echo "$as_me:5054: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_ldflags_search_paths_first=yes
- else
-@@ -4966,7 +5062,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 				LDFLAGS=$cf_save_LDFLAGS
- fi
--echo "$as_me:4969: result: $cf_cv_ldflags_search_paths_first" >&5
-+echo "$as_me:5065: result: $cf_cv_ldflags_search_paths_first" >&5
- echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
- 		if test $cf_cv_ldflags_search_paths_first = yes; then
- 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
-@@ -5021,11 +5117,11 @@
- 
- 		MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_shared_soname',-stats,-lc -o $@'
- 		;;
--	openbsd2*)
-+	openbsd[2-9].*)
- 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
- 		MK_SHARED_LIB='${LD} -Bshareable -soname,`basename $@.${ABI_VERSION}` -o $@'
- 		;;
--	openbsd*|freebsd[23]*)
-+	openbsd*|freebsd[12].*)
- 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
- 		MK_SHARED_LIB='${LD} -Bshareable -o $@'
- 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
-@@ -5120,9 +5216,7 @@
- 		;;
- 	solaris2*)
- 		# tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2
--		if test "$GCC" != yes; then
--			CC_SHARED_OPTS='-KPIC'
--		fi
-+		# tested with SunOS 5.10 (solaris 10) and gcc 3.4.3
- 		if test "$DFT_LWR_MODEL" = "shared" ; then
- 			LOCAL_LDFLAGS="-R \$(LOCAL_LIBDIR):\${libdir}"
- 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
-@@ -5139,7 +5233,12 @@
- 		cf_shared_soname='`basename $@`'
- 	fi
- 
--		MK_SHARED_LIB='${CC} -dy -G -h '$cf_shared_soname' -o $@'
-+		if test "$GCC" != yes; then
-+			CC_SHARED_OPTS='-xcode=pic32'
-+			MK_SHARED_LIB='${CC} -dy -G -h '$cf_shared_soname' -o $@'
-+		else
-+			MK_SHARED_LIB='${CC} -shared -dy -G -h '$cf_shared_soname' -o $@'
-+		fi
- 		;;
- 	sysv5uw7*|unix_sv*)
- 		# tested with UnixWare 7.1.0 (gcc 2.95.2 and cc)
-@@ -5162,7 +5261,7 @@
- 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
- 			;;
- 		*)
--			{ echo "$as_me:5165: WARNING: ignored --with-shlib-version" >&5
-+			{ echo "$as_me:5264: WARNING: ignored --with-shlib-version" >&5
- echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
- 			;;
- 		esac
-@@ -5170,12 +5269,12 @@
- 	esac
- 
- 	if test -n "$cf_ld_rpath_opt" ; then
--		echo "$as_me:5173: checking if we need a space after rpath option" >&5
-+		echo "$as_me:5272: checking if we need a space after rpath option" >&5
- echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
- 		cf_save_LIBS="$LIBS"
- 		LIBS="$LIBS ${cf_ld_rpath_opt}$libdir"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 5178 "configure"
-+#line 5277 "configure"
- #include "confdefs.h"
- 
- int
-@@ -5187,16 +5286,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5190: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5289: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5193: \$? = $ac_status" >&5
-+  echo "$as_me:5292: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5196: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5295: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5199: \$? = $ac_status" >&5
-+  echo "$as_me:5298: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_rpath_space=no
- else
-@@ -5206,7 +5305,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 		LIBS="$cf_save_LIBS"
--		echo "$as_me:5209: result: $cf_rpath_space" >&5
-+		echo "$as_me:5308: result: $cf_rpath_space" >&5
- echo "${ECHO_T}$cf_rpath_space" >&6
- 		test "$cf_rpath_space" = yes && cf_ld_rpath_opt="$cf_ld_rpath_opt "
- 		MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}"
-@@ -5215,7 +5314,7 @@
- if test "$CC_SHARED_OPTS" = "unknown"; then
- 	for model in $cf_list_models; do
- 		if test "$model" = "shared"; then
--			{ { echo "$as_me:5218: error: Shared libraries are not supported in this version" >&5
-+			{ { echo "$as_me:5317: error: Shared libraries are not supported in this version" >&5
- echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
-    { (exit 1); exit 1; }; }
- 		fi
-@@ -5225,7 +5324,7 @@
- ###############################################################################
- 
- ###	use option --disable-overwrite to leave out the link to -lcurses
--echo "$as_me:5228: checking if you wish to install ncurses overwriting curses" >&5
-+echo "$as_me:5327: checking if you wish to install ncurses overwriting curses" >&5
- echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6
- 
- # Check whether --enable-overwrite or --disable-overwrite was given.
-@@ -5235,10 +5334,10 @@
- else
-   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
- fi;
--echo "$as_me:5238: result: $with_overwrite" >&5
-+echo "$as_me:5337: result: $with_overwrite" >&5
- echo "${ECHO_T}$with_overwrite" >&6
- 
--echo "$as_me:5241: checking if external terminfo-database is used" >&5
-+echo "$as_me:5340: checking if external terminfo-database is used" >&5
- echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
- 
- # Check whether --enable-database or --disable-database was given.
-@@ -5248,7 +5347,7 @@
- else
-   use_database=yes
- fi;
--echo "$as_me:5251: result: $use_database" >&5
-+echo "$as_me:5350: result: $use_database" >&5
- echo "${ECHO_T}$use_database" >&6
- 
- case $host_os in #(vi
-@@ -5270,7 +5369,7 @@
- #define USE_DATABASE 1
- EOF
- 
--	echo "$as_me:5273: checking which terminfo source-file will be installed" >&5
-+	echo "$as_me:5372: checking which terminfo source-file will be installed" >&5
- echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
- 
- # Check whether --enable-database or --disable-database was given.
-@@ -5278,10 +5377,10 @@
-   enableval="$enable_database"
-   TERMINFO_SRC=$withval
- fi;
--	echo "$as_me:5281: result: $TERMINFO_SRC" >&5
-+	echo "$as_me:5380: result: $TERMINFO_SRC" >&5
- echo "${ECHO_T}$TERMINFO_SRC" >&6
- 
--	echo "$as_me:5284: checking whether to use hashed database instead of directory/tree" >&5
-+	echo "$as_me:5383: checking whether to use hashed database instead of directory/tree" >&5
- echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6
- 
- # Check whether --with-hashed-db or --without-hashed-db was given.
-@@ -5291,11 +5390,11 @@
- else
-   with_hashed_db=no
- fi;
--	echo "$as_me:5294: result: $with_hashed_db" >&5
-+	echo "$as_me:5393: result: $with_hashed_db" >&5
- echo "${ECHO_T}$with_hashed_db" >&6
- fi
- 
--echo "$as_me:5298: checking for list of fallback descriptions" >&5
-+echo "$as_me:5397: checking for list of fallback descriptions" >&5
- echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6
- 
- # Check whether --with-fallbacks or --without-fallbacks was given.
-@@ -5305,11 +5404,11 @@
- else
-   with_fallback=
- fi;
--echo "$as_me:5308: result: $with_fallback" >&5
-+echo "$as_me:5407: result: $with_fallback" >&5
- echo "${ECHO_T}$with_fallback" >&6
- FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'`
- 
--echo "$as_me:5312: checking if you want modern xterm or antique" >&5
-+echo "$as_me:5411: checking if you want modern xterm or antique" >&5
- echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
- 
- # Check whether --with-xterm-new or --without-xterm-new was given.
-@@ -5323,7 +5422,7 @@
- no)	with_xterm_new=xterm-old;;
- *)	with_xterm_new=xterm-new;;
- esac
--echo "$as_me:5326: result: $with_xterm_new" >&5
-+echo "$as_me:5425: result: $with_xterm_new" >&5
- echo "${ECHO_T}$with_xterm_new" >&6
- WHICH_XTERM=$with_xterm_new
- 
-@@ -5333,7 +5432,7 @@
- 	MAKE_TERMINFO="#"
- else
- 
--echo "$as_me:5336: checking for list of terminfo directories" >&5
-+echo "$as_me:5435: checking for list of terminfo directories" >&5
- echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6
- 
- # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given.
-@@ -5373,7 +5472,7 @@
-   cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
-   ;;
- *)
--  { { echo "$as_me:5376: error: expected a pathname, not \"$cf_src_path\"" >&5
-+  { { echo "$as_me:5475: error: expected a pathname, not \"$cf_src_path\"" >&5
- echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
-    { (exit 1); exit 1; }; }
-   ;;
-@@ -5386,13 +5485,13 @@
- 
- eval 'TERMINFO_DIRS="$cf_dst_path"'
- 
--echo "$as_me:5389: result: $TERMINFO_DIRS" >&5
-+echo "$as_me:5488: result: $TERMINFO_DIRS" >&5
- echo "${ECHO_T}$TERMINFO_DIRS" >&6
- test -n "$TERMINFO_DIRS" && cat >>confdefs.h <<EOF
- #define TERMINFO_DIRS "$TERMINFO_DIRS"
- EOF
- 
--echo "$as_me:5395: checking for default terminfo directory" >&5
-+echo "$as_me:5494: checking for default terminfo directory" >&5
- echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6
- 
- # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given.
-@@ -5401,7 +5500,8 @@
- 
- else
-   withval="${TERMINFO-${datadir}/terminfo}"
--fi;
-+fi; if test -n "${datadir}/terminfo" ; then
-+
- if test "x$prefix" != xNONE; then
-   cf_path_syntax="$prefix"
- else
-@@ -5427,15 +5527,16 @@
-   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
-   ;;
- *)
--  { { echo "$as_me:5430: error: expected a pathname, not \"$withval\"" >&5
-+  { { echo "$as_me:5530: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
-   ;;
- esac
- 
-+fi
- TERMINFO="$withval"
- 
--echo "$as_me:5438: result: $TERMINFO" >&5
-+echo "$as_me:5539: result: $TERMINFO" >&5
- echo "${ECHO_T}$TERMINFO" >&6
- cat >>confdefs.h <<EOF
- #define TERMINFO "$TERMINFO"
-@@ -5445,7 +5546,7 @@
- 
- ###	use option --disable-big-core to make tic run on small machines
- ###	We need 4Mb, check if we can allocate 50% more than that.
--echo "$as_me:5448: checking if big-core option selected" >&5
-+echo "$as_me:5549: checking if big-core option selected" >&5
- echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6
- 
- # Check whether --enable-big-core or --disable-big-core was given.
-@@ -5457,7 +5558,7 @@
-   with_big_core=no
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5460 "configure"
-+#line 5561 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -5471,15 +5572,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:5474: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5575: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5477: \$? = $ac_status" >&5
-+  echo "$as_me:5578: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:5479: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5580: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5482: \$? = $ac_status" >&5
-+  echo "$as_me:5583: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   with_big_core=yes
- else
-@@ -5491,14 +5592,32 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi;
--echo "$as_me:5494: result: $with_big_core" >&5
-+echo "$as_me:5595: result: $with_big_core" >&5
- echo "${ECHO_T}$with_big_core" >&6
- test "$with_big_core" = "yes" && cat >>confdefs.h <<\EOF
- #define HAVE_BIG_CORE 1
- EOF
- 
-+### ISO C only guarantees 512-char strings, we have tables which load faster
-+### when constructed using "big" strings.
-+echo "$as_me:5603: checking if big-strings option selected" >&5
-+echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6
-+
-+# Check whether --enable-big-strings or --disable-big-strings was given.
-+if test "${enable_big_strings+set}" = set; then
-+  enableval="$enable_big_strings"
-+  with_big_strings=no
-+else
-+  with_big_strings=yes
-+fi;
-+echo "$as_me:5613: result: $with_big_strings" >&5
-+echo "${ECHO_T}$with_big_strings" >&6
-+
-+USE_BIG_STRINGS=0
-+test "$with_big_strings" = "yes" && USE_BIG_STRINGS=1
-+
- ###	use option --enable-termcap to compile in the termcap fallback support
--echo "$as_me:5501: checking if you want termcap-fallback support" >&5
-+echo "$as_me:5620: checking if you want termcap-fallback support" >&5
- echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6
- 
- # Check whether --enable-termcap or --disable-termcap was given.
-@@ -5508,13 +5627,13 @@
- else
-   with_termcap=no
- fi;
--echo "$as_me:5511: result: $with_termcap" >&5
-+echo "$as_me:5630: result: $with_termcap" >&5
- echo "${ECHO_T}$with_termcap" >&6
- 
- if test "$with_termcap" != "yes" ; then
- 	if test "$use_database" = no ; then
- 		if test -z "$with_fallback" ; then
--			{ { echo "$as_me:5517: error: You have disabled the database w/o specifying fallbacks" >&5
-+			{ { echo "$as_me:5636: error: You have disabled the database w/o specifying fallbacks" >&5
- echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;}
-    { (exit 1); exit 1; }; }
- 		fi
-@@ -5525,11 +5644,17 @@
- 
- else
- 
-+if test "$with_ticlib" != no ; then
-+	{ { echo "$as_me:5648: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
-+echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
- cat >>confdefs.h <<\EOF
- #define USE_TERMCAP 1
- EOF
- 
--echo "$as_me:5532: checking for list of termcap files" >&5
-+echo "$as_me:5657: checking for list of termcap files" >&5
- echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6
- 
- # Check whether --with-termpath or --without-termpath was given.
-@@ -5569,7 +5694,7 @@
-   cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
-   ;;
- *)
--  { { echo "$as_me:5572: error: expected a pathname, not \"$cf_src_path\"" >&5
-+  { { echo "$as_me:5697: error: expected a pathname, not \"$cf_src_path\"" >&5
- echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
-    { (exit 1); exit 1; }; }
-   ;;
-@@ -5582,14 +5707,14 @@
- 
- eval 'TERMPATH="$cf_dst_path"'
- 
--echo "$as_me:5585: result: $TERMPATH" >&5
-+echo "$as_me:5710: result: $TERMPATH" >&5
- echo "${ECHO_T}$TERMPATH" >&6
- test -n "$TERMPATH" && cat >>confdefs.h <<EOF
- #define TERMPATH "$TERMPATH"
- EOF
- 
- ###	use option --enable-getcap to use a hacked getcap for reading termcaps
--echo "$as_me:5592: checking if fast termcap-loader is needed" >&5
-+echo "$as_me:5717: checking if fast termcap-loader is needed" >&5
- echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6
- 
- # Check whether --enable-getcap or --disable-getcap was given.
-@@ -5599,13 +5724,13 @@
- else
-   with_getcap=no
- fi;
--echo "$as_me:5602: result: $with_getcap" >&5
-+echo "$as_me:5727: result: $with_getcap" >&5
- echo "${ECHO_T}$with_getcap" >&6
- test "$with_getcap" = "yes" && cat >>confdefs.h <<\EOF
- #define USE_GETCAP 1
- EOF
- 
--echo "$as_me:5608: checking if translated termcaps will be cached in ~/.terminfo" >&5
-+echo "$as_me:5733: checking if translated termcaps will be cached in ~/.terminfo" >&5
- echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6
- 
- # Check whether --enable-getcap-cache or --disable-getcap-cache was given.
-@@ -5615,7 +5740,7 @@
- else
-   with_getcap_cache=no
- fi;
--echo "$as_me:5618: result: $with_getcap_cache" >&5
-+echo "$as_me:5743: result: $with_getcap_cache" >&5
- echo "${ECHO_T}$with_getcap_cache" >&6
- test "$with_getcap_cache" = "yes" && cat >>confdefs.h <<\EOF
- #define USE_GETCAP_CACHE 1
-@@ -5624,7 +5749,7 @@
- fi
- 
- ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
--echo "$as_me:5627: checking if ~/.terminfo is wanted" >&5
-+echo "$as_me:5752: checking if ~/.terminfo is wanted" >&5
- echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6
- 
- # Check whether --enable-home-terminfo or --disable-home-terminfo was given.
-@@ -5634,13 +5759,13 @@
- else
-   with_home_terminfo=yes
- fi;
--echo "$as_me:5637: result: $with_home_terminfo" >&5
-+echo "$as_me:5762: result: $with_home_terminfo" >&5
- echo "${ECHO_T}$with_home_terminfo" >&6
- test "$with_home_terminfo" = "yes" && cat >>confdefs.h <<\EOF
- #define USE_HOME_TERMINFO 1
- EOF
- 
--echo "$as_me:5643: checking if you want to use restricted environment when running as root" >&5
-+echo "$as_me:5768: checking if you want to use restricted environment when running as root" >&5
- echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6
- 
- # Check whether --enable-root-environ or --disable-root-environ was given.
-@@ -5650,7 +5775,7 @@
- else
-   with_root_environ=yes
- fi;
--echo "$as_me:5653: result: $with_root_environ" >&5
-+echo "$as_me:5778: result: $with_root_environ" >&5
- echo "${ECHO_T}$with_root_environ" >&6
- test "$with_root_environ" = yes && cat >>confdefs.h <<\EOF
- #define USE_ROOT_ENVIRON 1
-@@ -5664,13 +5789,13 @@
- 	unlink
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:5667: checking for $ac_func" >&5
-+echo "$as_me:5792: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5673 "configure"
-+#line 5798 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -5701,16 +5826,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5704: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5829: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5707: \$? = $ac_status" >&5
-+  echo "$as_me:5832: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5710: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5835: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5713: \$? = $ac_status" >&5
-+  echo "$as_me:5838: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -5720,7 +5845,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:5723: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:5848: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -5737,13 +5862,13 @@
- 		symlink
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:5740: checking for $ac_func" >&5
-+echo "$as_me:5865: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5746 "configure"
-+#line 5871 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -5774,16 +5899,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:5777: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5902: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5780: \$? = $ac_status" >&5
-+  echo "$as_me:5905: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:5783: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5908: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5786: \$? = $ac_status" >&5
-+  echo "$as_me:5911: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -5793,7 +5918,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:5796: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:5921: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -5804,7 +5929,7 @@
- done
- 
- else
--	echo "$as_me:5807: checking if link/symlink functions work" >&5
-+	echo "$as_me:5932: checking if link/symlink functions work" >&5
- echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6
- if test "${cf_cv_link_funcs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5817,7 +5942,7 @@
- 			eval 'ac_cv_func_'$cf_func'=error'
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 5820 "configure"
-+#line 5945 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -5847,15 +5972,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:5850: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:5975: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:5853: \$? = $ac_status" >&5
-+  echo "$as_me:5978: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:5855: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:5980: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:5858: \$? = $ac_status" >&5
-+  echo "$as_me:5983: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
-@@ -5873,7 +5998,7 @@
- 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
- 
- fi
--echo "$as_me:5876: result: $cf_cv_link_funcs" >&5
-+echo "$as_me:6001: result: $cf_cv_link_funcs" >&5
- echo "${ECHO_T}$cf_cv_link_funcs" >&6
- 	test "$ac_cv_func_link"    = yes && cat >>confdefs.h <<\EOF
- #define HAVE_LINK 1
-@@ -5891,7 +6016,7 @@
- # soft links (symbolic links) are useful for some systems where hard links do
- # not work, or to make it simpler to copy terminfo trees around.
- if test "$ac_cv_func_symlink" = yes ; then
--    echo "$as_me:5894: checking if tic should use symbolic links" >&5
-+    echo "$as_me:6019: checking if tic should use symbolic links" >&5
- echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6
- 
- # Check whether --enable-symlinks or --disable-symlinks was given.
-@@ -5901,21 +6026,21 @@
- else
-   with_symlinks=no
- fi;
--    echo "$as_me:5904: result: $with_symlinks" >&5
-+    echo "$as_me:6029: result: $with_symlinks" >&5
- echo "${ECHO_T}$with_symlinks" >&6
- fi
- 
- # If we have hard links and did not choose to use soft links instead, there is
- # no reason to make this choice optional - use the hard links.
- if test "$with_symlinks" = no ; then
--    echo "$as_me:5911: checking if tic should use hard links" >&5
-+    echo "$as_me:6036: checking if tic should use hard links" >&5
- echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
-     if test "$ac_cv_func_link" = yes ; then
- 	with_links=yes
-     else
- 	with_links=no
-     fi
--    echo "$as_me:5918: result: $with_links" >&5
-+    echo "$as_me:6043: result: $with_links" >&5
- echo "${ECHO_T}$with_links" >&6
- fi
- 
-@@ -5928,7 +6053,7 @@
- EOF
- 
- ###   use option --enable-broken-linker to force on use of broken-linker support
--echo "$as_me:5931: checking if you want broken-linker support code" >&5
-+echo "$as_me:6056: checking if you want broken-linker support code" >&5
- echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
- 
- # Check whether --enable-broken_linker or --disable-broken_linker was given.
-@@ -5938,7 +6063,7 @@
- else
-   with_broken_linker=${BROKEN_LINKER-no}
- fi;
--echo "$as_me:5941: result: $with_broken_linker" >&5
-+echo "$as_me:6066: result: $with_broken_linker" >&5
- echo "${ECHO_T}$with_broken_linker" >&6
- 
- BROKEN_LINKER=0
-@@ -5958,12 +6083,14 @@
- 		BROKEN_LINKER=1
- 		test -n "$verbose" && echo "	cygwin linker is broken anyway" 1>&6
- 
-+echo "${as_me-configure}:6086: testing cygwin linker is broken anyway ..." 1>&5
-+
- 		;;
- 	esac
- fi
- 
- ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
--echo "$as_me:5966: checking if tputs should process BSD-style prefix padding" >&5
-+echo "$as_me:6093: checking if tputs should process BSD-style prefix padding" >&5
- echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6
- 
- # Check whether --enable-bsdpad or --disable-bsdpad was given.
-@@ -5973,7 +6100,7 @@
- else
-   with_bsdpad=no
- fi;
--echo "$as_me:5976: result: $with_bsdpad" >&5
-+echo "$as_me:6103: result: $with_bsdpad" >&5
- echo "${ECHO_T}$with_bsdpad" >&6
- test "$with_bsdpad" = yes && cat >>confdefs.h <<\EOF
- #define BSD_TPUTS 1
-@@ -5990,7 +6117,7 @@
- 
- # Check to define _XOPEN_SOURCE "automatically"
- 
--echo "$as_me:5993: checking if $CC -U and -D options work together" >&5
-+echo "$as_me:6120: checking if $CC -U and -D options work together" >&5
- echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6
- if test "${cf_cv_cc_u_d_options+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5999,7 +6126,7 @@
- 	cf_save_CPPFLAGS="$CPPFLAGS"
- 	CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 6002 "configure"
-+#line 6129 "configure"
- #include "confdefs.h"
- 
- int
-@@ -6018,16 +6145,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6021: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6148: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6024: \$? = $ac_status" >&5
-+  echo "$as_me:6151: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6027: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6154: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6030: \$? = $ac_status" >&5
-+  echo "$as_me:6157: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_cc_u_d_options=yes
-@@ -6041,7 +6168,7 @@
- 	CPPFLAGS="$cf_save_CPPFLAGS"
- 
- fi
--echo "$as_me:6044: result: $cf_cv_cc_u_d_options" >&5
-+echo "$as_me:6171: result: $cf_cv_cc_u_d_options" >&5
- echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6
- 
- cf_XOPEN_SOURCE=500
-@@ -6065,16 +6192,16 @@
- irix[56].*) #(vi
- 	CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
- 	;;
--linux*|gnu*) #(vi
-+linux*|gnu*|k*bsd*-gnu) #(vi
- 
--echo "$as_me:6070: checking if we must define _GNU_SOURCE" >&5
-+echo "$as_me:6197: checking if we must define _GNU_SOURCE" >&5
- echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_gnu_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 6077 "configure"
-+#line 6204 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -6089,16 +6216,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6092: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6219: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6095: \$? = $ac_status" >&5
-+  echo "$as_me:6222: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6098: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6225: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6101: \$? = $ac_status" >&5
-+  echo "$as_me:6228: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -6107,7 +6234,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 6110 "configure"
-+#line 6237 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -6122,16 +6249,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6125: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6252: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6128: \$? = $ac_status" >&5
-+  echo "$as_me:6255: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6131: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6258: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6134: \$? = $ac_status" >&5
-+  echo "$as_me:6261: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_gnu_source=no
- else
-@@ -6146,7 +6273,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:6149: result: $cf_cv_gnu_source" >&5
-+echo "$as_me:6276: result: $cf_cv_gnu_source" >&5
- echo "${ECHO_T}$cf_cv_gnu_source" >&6
- test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 
-@@ -6173,14 +6300,14 @@
- 	CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
- 	;;
- *)
--	echo "$as_me:6176: checking if we should define _XOPEN_SOURCE" >&5
-+	echo "$as_me:6303: checking if we should define _XOPEN_SOURCE" >&5
- echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_xopen_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 6183 "configure"
-+#line 6310 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -6195,16 +6322,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6198: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6325: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6201: \$? = $ac_status" >&5
-+  echo "$as_me:6328: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6204: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6331: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6207: \$? = $ac_status" >&5
-+  echo "$as_me:6334: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -6213,7 +6340,7 @@
- cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 6216 "configure"
-+#line 6343 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -6228,16 +6355,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6231: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6358: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6234: \$? = $ac_status" >&5
-+  echo "$as_me:6361: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6237: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6364: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6240: \$? = $ac_status" >&5
-+  echo "$as_me:6367: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_xopen_source=no
- else
-@@ -6252,7 +6379,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:6255: result: $cf_cv_xopen_source" >&5
-+echo "$as_me:6382: result: $cf_cv_xopen_source" >&5
- echo "${ECHO_T}$cf_cv_xopen_source" >&6
- 	if test "$cf_cv_xopen_source" != no ; then
- 
-@@ -6286,16 +6413,16 @@
- 	sed	-e 's/-[UD]_POSIX_C_SOURCE\(=[^ 	]*\)\?[ 	]/ /g' \
- 		-e 's/-[UD]_POSIX_C_SOURCE\(=[^ 	]*\)\?$//g'`
- 
--echo "$as_me:6289: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "$as_me:6416: checking if we should define _POSIX_C_SOURCE" >&5
- echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
- if test "${cf_cv_posix_c_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--echo "(line 6295) testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me-configure}:6422: testing if the symbol is already defined go no further ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 6298 "configure"
-+#line 6425 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -6310,16 +6437,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6313: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6440: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6316: \$? = $ac_status" >&5
-+  echo "$as_me:6443: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6319: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6446: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6322: \$? = $ac_status" >&5
-+  echo "$as_me:6449: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_posix_c_source=no
- else
-@@ -6340,7 +6467,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 6343 "configure"
-+#line 6470 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -6355,16 +6482,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6358: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6485: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6361: \$? = $ac_status" >&5
-+  echo "$as_me:6488: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6364: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6491: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6367: \$? = $ac_status" >&5
-+  echo "$as_me:6494: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -6375,15 +6502,15 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 	 fi
- 
--echo "(line 6378) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me-configure}:6505: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
- 
- 	 CFLAGS="$cf_trim_CFLAGS"
- 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
- 
--echo "(line 6383) testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me-configure}:6510: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
- 	 cat >conftest.$ac_ext <<_ACEOF
--#line 6386 "configure"
-+#line 6513 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int
-@@ -6398,16 +6525,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6401: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6528: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6404: \$? = $ac_status" >&5
-+  echo "$as_me:6531: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6407: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6534: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6410: \$? = $ac_status" >&5
-+  echo "$as_me:6537: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -6423,7 +6550,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:6426: result: $cf_cv_posix_c_source" >&5
-+echo "$as_me:6553: result: $cf_cv_posix_c_source" >&5
- echo "${ECHO_T}$cf_cv_posix_c_source" >&6
- 
- if test "$cf_cv_posix_c_source" != no ; then
-@@ -6442,14 +6569,14 @@
- 
- # Work around breakage on OS X
- 
--echo "$as_me:6445: checking if SIGWINCH is defined" >&5
-+echo "$as_me:6572: checking if SIGWINCH is defined" >&5
- echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
- if test "${cf_cv_define_sigwinch+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 6452 "configure"
-+#line 6579 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -6464,23 +6591,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6467: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6594: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6470: \$? = $ac_status" >&5
-+  echo "$as_me:6597: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6473: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6600: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6476: \$? = $ac_status" >&5
-+  echo "$as_me:6603: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_define_sigwinch=yes
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 6483 "configure"
-+#line 6610 "configure"
- #include "confdefs.h"
- 
- #undef _XOPEN_SOURCE
-@@ -6498,16 +6625,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6501: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6628: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6504: \$? = $ac_status" >&5
-+  echo "$as_me:6631: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6507: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6634: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6510: \$? = $ac_status" >&5
-+  echo "$as_me:6637: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_define_sigwinch=maybe
- else
-@@ -6521,11 +6648,11 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:6524: result: $cf_cv_define_sigwinch" >&5
-+echo "$as_me:6651: result: $cf_cv_define_sigwinch" >&5
- echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
- 
- if test "$cf_cv_define_sigwinch" = maybe ; then
--echo "$as_me:6528: checking for actual SIGWINCH definition" >&5
-+echo "$as_me:6655: checking for actual SIGWINCH definition" >&5
- echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
- if test "${cf_cv_fixup_sigwinch+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6536,7 +6663,7 @@
- while test $cf_sigwinch != 1
- do
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 6539 "configure"
-+#line 6666 "configure"
- #include "confdefs.h"
- 
- #undef _XOPEN_SOURCE
-@@ -6558,16 +6685,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6561: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6688: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6564: \$? = $ac_status" >&5
-+  echo "$as_me:6691: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6567: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6694: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6570: \$? = $ac_status" >&5
-+  echo "$as_me:6697: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_fixup_sigwinch=$cf_sigwinch
- 	 break
-@@ -6581,7 +6708,7 @@
- done
- 
- fi
--echo "$as_me:6584: result: $cf_cv_fixup_sigwinch" >&5
-+echo "$as_me:6711: result: $cf_cv_fixup_sigwinch" >&5
- echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
- 
- 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
-@@ -6591,13 +6718,13 @@
- 
- # Checks for CODESET support.
- 
--  echo "$as_me:6594: checking for nl_langinfo and CODESET" >&5
-+  echo "$as_me:6721: checking for nl_langinfo and CODESET" >&5
- echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
- if test "${am_cv_langinfo_codeset+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6600 "configure"
-+#line 6727 "configure"
- #include "confdefs.h"
- #include <langinfo.h>
- int
-@@ -6609,16 +6736,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6612: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6739: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6615: \$? = $ac_status" >&5
-+  echo "$as_me:6742: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6618: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6745: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6621: \$? = $ac_status" >&5
-+  echo "$as_me:6748: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   am_cv_langinfo_codeset=yes
- else
-@@ -6629,7 +6756,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:6632: result: $am_cv_langinfo_codeset" >&5
-+echo "$as_me:6759: result: $am_cv_langinfo_codeset" >&5
- echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
-   if test $am_cv_langinfo_codeset = yes; then
- 
-@@ -6643,7 +6770,7 @@
- NCURSES_OK_WCHAR_T=
- NCURSES_OK_WINT_T=
- 
--echo "$as_me:6646: checking if you want wide-character code" >&5
-+echo "$as_me:6773: checking if you want wide-character code" >&5
- echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
- 
- # Check whether --enable-widec or --disable-widec was given.
-@@ -6653,7 +6780,7 @@
- else
-   with_widec=no
- fi;
--echo "$as_me:6656: result: $with_widec" >&5
-+echo "$as_me:6783: result: $with_widec" >&5
- echo "${ECHO_T}$with_widec" >&6
- if test "$with_widec" = yes ; then
- 	LIB_SUFFIX="w${LIB_SUFFIX}"
-@@ -6661,10 +6788,10 @@
- #define USE_WIDEC_SUPPORT 1
- EOF
- 
--echo "$as_me:6664: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
-+echo "$as_me:6791: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
- echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 6667 "configure"
-+#line 6794 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- 
-@@ -6680,16 +6807,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6683: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6810: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6686: \$? = $ac_status" >&5
-+  echo "$as_me:6813: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6689: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6816: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6692: \$? = $ac_status" >&5
-+  echo "$as_me:6819: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=no
- else
-@@ -6698,16 +6825,16 @@
- cf_result=yes
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:6701: result: $cf_result" >&5
-+echo "$as_me:6828: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 
- if test "$cf_result" = yes ; then
- 	CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
- elif test "x" != "x" ; then
--	echo "$as_me:6707: checking checking for compatible value versus " >&5
-+	echo "$as_me:6834: checking checking for compatible value versus " >&5
- echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 6710 "configure"
-+#line 6837 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- 
-@@ -6723,16 +6850,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6726: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:6853: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6729: \$? = $ac_status" >&5
-+  echo "$as_me:6856: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6732: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6859: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6735: \$? = $ac_status" >&5
-+  echo "$as_me:6862: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_result=yes
- else
-@@ -6741,7 +6868,7 @@
- cf_result=no
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:6744: result: $cf_result" >&5
-+	echo "$as_me:6871: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- 	if test "$cf_result" = no ; then
- 		# perhaps we can override it - try...
-@@ -6755,13 +6882,13 @@
- for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:6758: checking for $ac_func" >&5
-+echo "$as_me:6885: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 6764 "configure"
-+#line 6891 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -6792,16 +6919,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6795: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6922: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6798: \$? = $ac_status" >&5
-+  echo "$as_me:6925: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6801: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6928: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6804: \$? = $ac_status" >&5
-+  echo "$as_me:6931: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -6811,7 +6938,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:6814: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:6941: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -6823,7 +6950,7 @@
- 
- 	if test "$ac_cv_func_putwc" != yes ; then
- 
--echo "$as_me:6826: checking for putwc in libutf8" >&5
-+echo "$as_me:6953: checking for putwc in libutf8" >&5
- echo $ECHO_N "checking for putwc in libutf8... $ECHO_C" >&6
- if test "${cf_cv_libutf8+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6832,7 +6959,7 @@
- 	cf_save_LIBS="$LIBS"
- 	LIBS="-lutf8 $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 6835 "configure"
-+#line 6962 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -6845,16 +6972,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:6848: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:6975: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:6851: \$? = $ac_status" >&5
-+  echo "$as_me:6978: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:6854: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:6981: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6857: \$? = $ac_status" >&5
-+  echo "$as_me:6984: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_libutf8=yes
- else
-@@ -6866,7 +6993,7 @@
- 	LIBS="$cf_save_LIBS"
- 
- fi
--echo "$as_me:6869: result: $cf_cv_libutf8" >&5
-+echo "$as_me:6996: result: $cf_cv_libutf8" >&5
- echo "${ECHO_T}$cf_cv_libutf8" >&6
- 
- if test "$cf_cv_libutf8" = yes ; then
-@@ -6883,14 +7010,14 @@
- 	fi
- 
- # This is needed on Tru64 5.0 to declare mbstate_t
--echo "$as_me:6886: checking if we must include wchar.h to declare mbstate_t" >&5
-+echo "$as_me:7013: checking if we must include wchar.h to declare mbstate_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
- if test "${cf_cv_mbstate_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 6893 "configure"
-+#line 7020 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -6908,23 +7035,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6911: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7038: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6914: \$? = $ac_status" >&5
-+  echo "$as_me:7041: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6917: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7044: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6920: \$? = $ac_status" >&5
-+  echo "$as_me:7047: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 6927 "configure"
-+#line 7054 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -6943,16 +7070,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:6946: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7073: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:6949: \$? = $ac_status" >&5
-+  echo "$as_me:7076: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:6952: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7079: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:6955: \$? = $ac_status" >&5
-+  echo "$as_me:7082: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_mbstate_t=yes
- else
-@@ -6964,7 +7091,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:6967: result: $cf_cv_mbstate_t" >&5
-+echo "$as_me:7094: result: $cf_cv_mbstate_t" >&5
- echo "${ECHO_T}$cf_cv_mbstate_t" >&6
- 
- if test "$cf_cv_mbstate_t" = yes ; then
-@@ -6981,14 +7108,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wchar_t
--echo "$as_me:6984: checking if we must include wchar.h to declare wchar_t" >&5
-+echo "$as_me:7111: checking if we must include wchar.h to declare wchar_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
- if test "${cf_cv_wchar_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 6991 "configure"
-+#line 7118 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -7006,23 +7133,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7009: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7136: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7012: \$? = $ac_status" >&5
-+  echo "$as_me:7139: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7015: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7142: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7018: \$? = $ac_status" >&5
-+  echo "$as_me:7145: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 7025 "configure"
-+#line 7152 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -7041,16 +7168,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7044: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7171: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7047: \$? = $ac_status" >&5
-+  echo "$as_me:7174: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7050: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7177: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7053: \$? = $ac_status" >&5
-+  echo "$as_me:7180: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wchar_t=yes
- else
-@@ -7062,7 +7189,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:7065: result: $cf_cv_wchar_t" >&5
-+echo "$as_me:7192: result: $cf_cv_wchar_t" >&5
- echo "${ECHO_T}$cf_cv_wchar_t" >&6
- 
- if test "$cf_cv_wchar_t" = yes ; then
-@@ -7084,14 +7211,14 @@
- fi
- 
- # This is needed on Tru64 5.0 to declare wint_t
--echo "$as_me:7087: checking if we must include wchar.h to declare wint_t" >&5
-+echo "$as_me:7214: checking if we must include wchar.h to declare wint_t" >&5
- echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
- if test "${cf_cv_wint_t+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 7094 "configure"
-+#line 7221 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -7109,23 +7236,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7112: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7239: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7115: \$? = $ac_status" >&5
-+  echo "$as_me:7242: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7118: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7245: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7121: \$? = $ac_status" >&5
-+  echo "$as_me:7248: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=no
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 7128 "configure"
-+#line 7255 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -7144,16 +7271,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7147: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7274: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7150: \$? = $ac_status" >&5
-+  echo "$as_me:7277: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7153: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7280: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7156: \$? = $ac_status" >&5
-+  echo "$as_me:7283: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_wint_t=yes
- else
-@@ -7165,7 +7292,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:7168: result: $cf_cv_wint_t" >&5
-+echo "$as_me:7295: result: $cf_cv_wint_t" >&5
- echo "${ECHO_T}$cf_cv_wint_t" >&6
- 
- if test "$cf_cv_wint_t" = yes ; then
-@@ -7204,7 +7331,7 @@
- 	;;
- esac
- 
--echo "$as_me:7207: checking whether to enable _LP64 definition in curses.h" >&5
-+echo "$as_me:7334: checking whether to enable _LP64 definition in curses.h" >&5
- echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6
- 
- # Check whether --enable-lp64 or --disable-lp64 was given.
-@@ -7214,7 +7341,7 @@
- else
-   with_lp64=$default_with_lp64
- fi;
--echo "$as_me:7217: result: $with_lp64" >&5
-+echo "$as_me:7344: result: $with_lp64" >&5
- echo "${ECHO_T}$with_lp64" >&6
- 
- if test "$with_lp64" = yes ; then
-@@ -7230,7 +7357,7 @@
- fi;
- if test "$enable_largefile" != no; then
- 
--  echo "$as_me:7233: checking for special C compiler options needed for large files" >&5
-+  echo "$as_me:7360: checking for special C compiler options needed for large files" >&5
- echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_largefile_CC+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7242,7 +7369,7 @@
-      	 # IRIX 6.2 and later do not support large files by default,
-      	 # so use the C compiler's -n32 option if that helps.
-          cat >conftest.$ac_ext <<_ACEOF
--#line 7245 "configure"
-+#line 7372 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -7262,16 +7389,16 @@
- }
- _ACEOF
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7265: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7392: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7268: \$? = $ac_status" >&5
-+  echo "$as_me:7395: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7271: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7398: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7274: \$? = $ac_status" >&5
-+  echo "$as_me:7401: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -7281,16 +7408,16 @@
- rm -f conftest.$ac_objext
-      	 CC="$CC -n32"
-      	 rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7284: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7411: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7287: \$? = $ac_status" >&5
-+  echo "$as_me:7414: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7290: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7417: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7293: \$? = $ac_status" >&5
-+  echo "$as_me:7420: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_CC=' -n32'; break
- else
-@@ -7304,13 +7431,13 @@
-        rm -f conftest.$ac_ext
-     fi
- fi
--echo "$as_me:7307: result: $ac_cv_sys_largefile_CC" >&5
-+echo "$as_me:7434: result: $ac_cv_sys_largefile_CC" >&5
- echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
-   if test "$ac_cv_sys_largefile_CC" != no; then
-     CC=$CC$ac_cv_sys_largefile_CC
-   fi
- 
--  echo "$as_me:7313: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+  echo "$as_me:7440: checking for _FILE_OFFSET_BITS value needed for large files" >&5
- echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_file_offset_bits+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7318,7 +7445,7 @@
-   while :; do
-   ac_cv_sys_file_offset_bits=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7321 "configure"
-+#line 7448 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -7338,16 +7465,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7341: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7468: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7344: \$? = $ac_status" >&5
-+  echo "$as_me:7471: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7347: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7474: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7350: \$? = $ac_status" >&5
-+  echo "$as_me:7477: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -7356,7 +7483,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7359 "configure"
-+#line 7486 "configure"
- #include "confdefs.h"
- #define _FILE_OFFSET_BITS 64
- #include <sys/types.h>
-@@ -7377,16 +7504,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7380: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7507: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7383: \$? = $ac_status" >&5
-+  echo "$as_me:7510: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7386: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7513: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7389: \$? = $ac_status" >&5
-+  echo "$as_me:7516: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_file_offset_bits=64; break
- else
-@@ -7397,7 +7524,7 @@
-   break
- done
- fi
--echo "$as_me:7400: result: $ac_cv_sys_file_offset_bits" >&5
-+echo "$as_me:7527: result: $ac_cv_sys_file_offset_bits" >&5
- echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
- if test "$ac_cv_sys_file_offset_bits" != no; then
- 
-@@ -7407,7 +7534,7 @@
- 
- fi
- rm -f conftest*
--  echo "$as_me:7410: checking for _LARGE_FILES value needed for large files" >&5
-+  echo "$as_me:7537: checking for _LARGE_FILES value needed for large files" >&5
- echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_large_files+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7415,7 +7542,7 @@
-   while :; do
-   ac_cv_sys_large_files=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7418 "configure"
-+#line 7545 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
-  /* Check that off_t can represent 2**63 - 1 correctly.
-@@ -7435,16 +7562,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7438: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7565: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7441: \$? = $ac_status" >&5
-+  echo "$as_me:7568: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7444: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7571: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7447: \$? = $ac_status" >&5
-+  echo "$as_me:7574: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -7453,7 +7580,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7456 "configure"
-+#line 7583 "configure"
- #include "confdefs.h"
- #define _LARGE_FILES 1
- #include <sys/types.h>
-@@ -7474,16 +7601,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7477: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7604: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7480: \$? = $ac_status" >&5
-+  echo "$as_me:7607: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7483: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7610: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7486: \$? = $ac_status" >&5
-+  echo "$as_me:7613: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_large_files=1; break
- else
-@@ -7494,7 +7621,7 @@
-   break
- done
- fi
--echo "$as_me:7497: result: $ac_cv_sys_large_files" >&5
-+echo "$as_me:7624: result: $ac_cv_sys_large_files" >&5
- echo "${ECHO_T}$ac_cv_sys_large_files" >&6
- if test "$ac_cv_sys_large_files" != no; then
- 
-@@ -7507,7 +7634,7 @@
- fi
- 
-     if test "$enable_largefile" != no ; then
--	echo "$as_me:7510: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-+	echo "$as_me:7637: checking for _LARGEFILE_SOURCE value needed for large files" >&5
- echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
- if test "${ac_cv_sys_largefile_source+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7515,7 +7642,7 @@
-   while :; do
-   ac_cv_sys_largefile_source=no
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7518 "configure"
-+#line 7645 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -7527,16 +7654,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7530: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7657: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7533: \$? = $ac_status" >&5
-+  echo "$as_me:7660: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7536: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7663: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7539: \$? = $ac_status" >&5
-+  echo "$as_me:7666: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   break
- else
-@@ -7545,7 +7672,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7548 "configure"
-+#line 7675 "configure"
- #include "confdefs.h"
- #define _LARGEFILE_SOURCE 1
- #include <stdio.h>
-@@ -7558,16 +7685,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7561: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7688: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7564: \$? = $ac_status" >&5
-+  echo "$as_me:7691: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7567: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7694: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7570: \$? = $ac_status" >&5
-+  echo "$as_me:7697: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sys_largefile_source=1; break
- else
-@@ -7578,7 +7705,7 @@
-   break
- done
- fi
--echo "$as_me:7581: result: $ac_cv_sys_largefile_source" >&5
-+echo "$as_me:7708: result: $ac_cv_sys_largefile_source" >&5
- echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
- if test "$ac_cv_sys_largefile_source" != no; then
- 
-@@ -7592,13 +7719,13 @@
- # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
- # in glibc 2.1.3, but that breaks too many other things.
- # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
--echo "$as_me:7595: checking for fseeko" >&5
-+echo "$as_me:7722: checking for fseeko" >&5
- echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
- if test "${ac_cv_func_fseeko+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 7601 "configure"
-+#line 7728 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int
-@@ -7610,16 +7737,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:7613: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:7740: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:7616: \$? = $ac_status" >&5
-+  echo "$as_me:7743: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:7619: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7746: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7622: \$? = $ac_status" >&5
-+  echo "$as_me:7749: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_fseeko=yes
- else
-@@ -7629,7 +7756,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:7632: result: $ac_cv_func_fseeko" >&5
-+echo "$as_me:7759: result: $ac_cv_func_fseeko" >&5
- echo "${ECHO_T}$ac_cv_func_fseeko" >&6
- if test $ac_cv_func_fseeko = yes; then
- 
-@@ -7648,15 +7775,16 @@
- 	# the config.h
- 	test "$ac_cv_sys_large_files"      != no && CPPFLAGS="$CPPFLAGS -D_LARGE_FILES "
- 	test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
-+	test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
- 
--	echo "$as_me:7652: checking whether to use struct dirent64" >&5
-+	echo "$as_me:7780: checking whether to use struct dirent64" >&5
- echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
- if test "${cf_cv_struct_dirent64+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 7659 "configure"
-+#line 7787 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -7677,16 +7805,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:7680: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:7808: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:7683: \$? = $ac_status" >&5
-+  echo "$as_me:7811: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:7686: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:7814: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:7689: \$? = $ac_status" >&5
-+  echo "$as_me:7817: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_struct_dirent64=yes
- else
-@@ -7697,7 +7825,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:7700: result: $cf_cv_struct_dirent64" >&5
-+echo "$as_me:7828: result: $cf_cv_struct_dirent64" >&5
- echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
- 	test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF
- #define HAVE_STRUCT_DIRENT64 1
-@@ -7706,7 +7834,7 @@
-     fi
- 
- ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
--echo "$as_me:7709: checking if you want tparm not to use X/Open fixed-parameter list" >&5
-+echo "$as_me:7837: checking if you want tparm not to use X/Open fixed-parameter list" >&5
- echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6
- 
- # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given.
-@@ -7716,13 +7844,13 @@
- else
-   with_tparm_varargs=yes
- fi;
--echo "$as_me:7719: result: $with_tparm_varargs" >&5
-+echo "$as_me:7847: result: $with_tparm_varargs" >&5
- echo "${ECHO_T}$with_tparm_varargs" >&6
- NCURSES_TPARM_VARARGS=0
- test "$with_tparm_varargs" = yes && NCURSES_TPARM_VARARGS=1
- 
- ###   use option --with-bool to override bool's type
--echo "$as_me:7725: checking for type of bool" >&5
-+echo "$as_me:7853: checking for type of bool" >&5
- echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
- 
- # Check whether --with-bool or --without-bool was given.
-@@ -7732,10 +7860,10 @@
- else
-   NCURSES_BOOL=auto
- fi;
--echo "$as_me:7735: result: $NCURSES_BOOL" >&5
-+echo "$as_me:7863: result: $NCURSES_BOOL" >&5
- echo "${ECHO_T}$NCURSES_BOOL" >&6
- 
--echo "$as_me:7738: checking for alternate terminal capabilities file" >&5
-+echo "$as_me:7866: checking for alternate terminal capabilities file" >&5
- echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6
- 
- # Check whether --with-caps or --without-caps was given.
-@@ -7746,11 +7874,11 @@
-   TERMINFO_CAPS=Caps
- fi;
- test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
--echo "$as_me:7749: result: $TERMINFO_CAPS" >&5
-+echo "$as_me:7877: result: $TERMINFO_CAPS" >&5
- echo "${ECHO_T}$TERMINFO_CAPS" >&6
- 
- ###   use option --with-chtype to override chtype's type
--echo "$as_me:7753: checking for type of chtype" >&5
-+echo "$as_me:7881: checking for type of chtype" >&5
- echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
- 
- # Check whether --with-chtype or --without-chtype was given.
-@@ -7760,11 +7888,11 @@
- else
-   NCURSES_CHTYPE=auto
- fi;
--echo "$as_me:7763: result: $NCURSES_CHTYPE" >&5
-+echo "$as_me:7891: result: $NCURSES_CHTYPE" >&5
- echo "${ECHO_T}$NCURSES_CHTYPE" >&6
- 
- ###   use option --with-ospeed to override ospeed's type
--echo "$as_me:7767: checking for type of ospeed" >&5
-+echo "$as_me:7895: checking for type of ospeed" >&5
- echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6
- 
- # Check whether --with-ospeed or --without-ospeed was given.
-@@ -7774,11 +7902,11 @@
- else
-   NCURSES_OSPEED=short
- fi;
--echo "$as_me:7777: result: $NCURSES_OSPEED" >&5
-+echo "$as_me:7905: result: $NCURSES_OSPEED" >&5
- echo "${ECHO_T}$NCURSES_OSPEED" >&6
- 
- ###   use option --with-mmask-t to override mmask_t's type
--echo "$as_me:7781: checking for type of mmask_t" >&5
-+echo "$as_me:7909: checking for type of mmask_t" >&5
- echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6
- 
- # Check whether --with-mmask-t or --without-mmask-t was given.
-@@ -7788,11 +7916,11 @@
- else
-   NCURSES_MMASK_T=auto
- fi;
--echo "$as_me:7791: result: $NCURSES_MMASK_T" >&5
-+echo "$as_me:7919: result: $NCURSES_MMASK_T" >&5
- echo "${ECHO_T}$NCURSES_MMASK_T" >&6
- 
- ### Enable compiling-in rcs id's
--echo "$as_me:7795: checking if RCS identifiers should be compiled-in" >&5
-+echo "$as_me:7923: checking if RCS identifiers should be compiled-in" >&5
- echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
- 
- # Check whether --with-rcs-ids or --without-rcs-ids was given.
-@@ -7802,7 +7930,7 @@
- else
-   with_rcs_ids=no
- fi;
--echo "$as_me:7805: result: $with_rcs_ids" >&5
-+echo "$as_me:7933: result: $with_rcs_ids" >&5
- echo "${ECHO_T}$with_rcs_ids" >&6
- test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF
- #define USE_RCS_IDS 1
-@@ -7810,7 +7938,7 @@
- 
- ###############################################################################
- 
--echo "$as_me:7813: checking format of man-pages" >&5
-+echo "$as_me:7941: checking format of man-pages" >&5
- echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6
- 
- # Check whether --with-manpage-format or --without-manpage-format was given.
-@@ -7899,14 +8027,14 @@
-   ;;
- esac
- 
--echo "$as_me:7902: result: $MANPAGE_FORMAT" >&5
-+echo "$as_me:8030: result: $MANPAGE_FORMAT" >&5
- echo "${ECHO_T}$MANPAGE_FORMAT" >&6
- if test -n "$cf_unknown" ; then
--  { echo "$as_me:7905: WARNING: Unexpected manpage-format $cf_unknown" >&5
-+  { echo "$as_me:8033: WARNING: Unexpected manpage-format $cf_unknown" >&5
- echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
- fi
- 
--echo "$as_me:7909: checking for manpage renaming" >&5
-+echo "$as_me:8037: checking for manpage renaming" >&5
- echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6
- 
- # Check whether --with-manpage-renames or --without-manpage-renames was given.
-@@ -7934,7 +8062,7 @@
-   if test -f $srcdir/man/$MANPAGE_RENAMES ; then
-     MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES
-   elif test ! -f $MANPAGE_RENAMES ; then
--    { { echo "$as_me:7937: error: not a filename: $MANPAGE_RENAMES" >&5
-+    { { echo "$as_me:8065: error: not a filename: $MANPAGE_RENAMES" >&5
- echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
-    { (exit 1); exit 1; }; }
-   fi
-@@ -7948,10 +8076,10 @@
-   fi
- fi
- 
--echo "$as_me:7951: result: $MANPAGE_RENAMES" >&5
-+echo "$as_me:8079: result: $MANPAGE_RENAMES" >&5
- echo "${ECHO_T}$MANPAGE_RENAMES" >&6
- 
--echo "$as_me:7954: checking if manpage aliases will be installed" >&5
-+echo "$as_me:8082: checking if manpage aliases will be installed" >&5
- echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6
- 
- # Check whether --with-manpage-aliases or --without-manpage-aliases was given.
-@@ -7962,7 +8090,7 @@
-   MANPAGE_ALIASES=yes
- fi;
- 
--echo "$as_me:7965: result: $MANPAGE_ALIASES" >&5
-+echo "$as_me:8093: result: $MANPAGE_ALIASES" >&5
- echo "${ECHO_T}$MANPAGE_ALIASES" >&6
- 
- if test "$LN_S" = "ln -s"; then
-@@ -7973,7 +8101,7 @@
- 
- MANPAGE_SYMLINKS=no
- if test "$MANPAGE_ALIASES" = yes ; then
--echo "$as_me:7976: checking if manpage symlinks should be used" >&5
-+echo "$as_me:8104: checking if manpage symlinks should be used" >&5
- echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6
- 
- # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given.
-@@ -7986,17 +8114,17 @@
- 
- if test "$$cf_use_symlinks" = no; then
- if test "$MANPAGE_SYMLINKS" = yes ; then
--	{ echo "$as_me:7989: WARNING: cannot make symlinks" >&5
-+	{ echo "$as_me:8117: WARNING: cannot make symlinks" >&5
- echo "$as_me: WARNING: cannot make symlinks" >&2;}
- 	MANPAGE_SYMLINKS=no
- fi
- fi
- 
--echo "$as_me:7995: result: $MANPAGE_SYMLINKS" >&5
-+echo "$as_me:8123: result: $MANPAGE_SYMLINKS" >&5
- echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
- fi
- 
--echo "$as_me:7999: checking for manpage tbl" >&5
-+echo "$as_me:8127: checking for manpage tbl" >&5
- echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6
- 
- # Check whether --with-manpage-tbl or --without-manpage-tbl was given.
-@@ -8007,7 +8135,7 @@
-   MANPAGE_TBL=no
- fi;
- 
--echo "$as_me:8010: result: $MANPAGE_TBL" >&5
-+echo "$as_me:8138: result: $MANPAGE_TBL" >&5
- echo "${ECHO_T}$MANPAGE_TBL" >&6
- 
-   if test "$prefix" = "NONE" ; then
-@@ -8047,6 +8175,7 @@
- esac
- 
- cf_edit_man=./edit_man.sh
-+cf_man_alias=`pwd`/man_alias.sed
- 
- cat >$cf_edit_man <<CF_EOF
- #! /bin/sh
-@@ -8062,7 +8191,7 @@
- NCURSES_OSPEED="$NCURSES_OSPEED"
- TERMINFO="$TERMINFO"
- 
--MKDIRS="sh `cd $srcdir && pwd`/mkinstalldirs"
-+MKDIRS="sh `cd $srcdir && pwd`/mkdirs.sh"
- 
- INSTALL="$INSTALL"
- INSTALL_DATA="$INSTALL_DATA"
-@@ -8110,6 +8239,32 @@
- 		\$MKDIRS \$cf_subdir\$section
- 	fi
- 	fi
-+
-+	# replace variables in man page
-+	if test ! -f $cf_man_alias ; then
-+cat >>$cf_man_alias <<-CF_EOF2
-+		s,@DATADIR@,\$datadir,g
-+		s,@TERMINFO@,\$TERMINFO,g
-+		s,@NCURSES_MAJOR@,\$NCURSES_MAJOR,g
-+		s,@NCURSES_MINOR@,\$NCURSES_MINOR,g
-+		s,@NCURSES_PATCH@,\$NCURSES_PATCH,g
-+		s,@NCURSES_OSPEED@,\$NCURSES_OSPEED,g
-+CF_EOF
-+
-+	for cf_name in  captoinfo clear infocmp infotocap tic toe tput
-+	do
-+		cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-+		cf_name=`echo $cf_name|sed "$program_transform_name"`
-+cat >>$cf_edit_man <<-CF_EOF
-+		s,@$cf_NAME@,$cf_name,
-+CF_EOF
-+	done
-+
-+cat >>$cf_edit_man <<CF_EOF
-+CF_EOF2
-+		echo "...made $cf_man_alias"
-+	fi
-+
- 	aliases=
- 	cf_source=\`basename \$i\`
- 	inalias=\$cf_source
-@@ -8122,7 +8277,7 @@
- 
- if test "$MANPAGE_ALIASES" != no ; then
- cat >>$cf_edit_man <<CF_EOF
--	aliases=\`sed -f \$top_srcdir/man/manlinks.sed \$inalias | sort -u\`
-+	aliases=\`sed -f \$top_srcdir/man/manlinks.sed \$inalias |sed -f $cf_man_alias | sort -u\`
- CF_EOF
- fi
- 
-@@ -8143,34 +8298,13 @@
- 		cf_target="\$cf_source"
- 	fi
- 	cf_target="\$cf_subdir\${section}/\${cf_target}"
--CF_EOF
--fi
--
--	# replace variables in man page
--
--	for cf_name in  captoinfo clear infocmp infotocap tic toe tput
--	do
--cat >>$cf_edit_man <<CF_EOF
--	prog_$cf_name=\`echo $cf_name|sed "\${transform}"\`
--CF_EOF
--	done
- 
--cat >>$cf_edit_man <<CF_EOF
--	sed	-e "s,@DATADIR@,\$datadir," \\
--		-e "s,@TERMINFO@,\$TERMINFO," \\
--		-e "s,@NCURSES_MAJOR@,\$NCURSES_MAJOR," \\
--		-e "s,@NCURSES_MINOR@,\$NCURSES_MINOR," \\
--		-e "s,@NCURSES_PATCH@,\$NCURSES_PATCH," \\
--		-e "s,@NCURSES_OSPEED@,\$NCURSES_OSPEED," \\
- CF_EOF
-+fi
- 
--	for cf_name in  captoinfo clear infocmp infotocap tic toe tput
--	do
--		cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
- cat >>$cf_edit_man <<CF_EOF
--		-e "s,@$cf_NAME@,\$prog_$cf_name," \\
-+	sed	-f $cf_man_alias \\
- CF_EOF
--	done
- 
- if test -f $MANPAGE_RENAMES ; then
- cat >>$cf_edit_man <<CF_EOF
-@@ -8231,6 +8365,7 @@
- 	if test \$verb = installing ; then
- 		echo \$verb \$cf_target
- 		\$INSTALL_DATA \$TMP \$cf_target
-+		test -d \$cf_subdir\${section} &&
- 		test -n "\$aliases" && (
- 			cd \$cf_subdir\${section} && (
- 				cf_source=\`echo \$cf_target |sed -e 's%^.*/\([^/][^/]*/[^/][^/]*$\)%\1%'\`
-@@ -8272,8 +8407,11 @@
- 			)
- 		)
- 	elif test \$verb = removing ; then
--		echo \$verb \$cf_target
--		rm -f \$cf_target
-+		test -f \$cf_target && (
-+			echo \$verb \$cf_target
-+			rm -f \$cf_target
-+		)
-+		test -d \$cf_subdir\${section} &&
- 		test -n "\$aliases" && (
- 			cd \$cf_subdir\${section} && (
- 				for cf_alias in \$aliases
-@@ -8308,7 +8446,7 @@
- ###############################################################################
- 
- ### Note that some functions (such as const) are normally disabled anyway.
--echo "$as_me:8311: checking if you want to build with function extensions" >&5
-+echo "$as_me:8449: checking if you want to build with function extensions" >&5
- echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
- 
- # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
-@@ -8318,7 +8456,7 @@
- else
-   with_ext_funcs=yes
- fi;
--echo "$as_me:8321: result: $with_ext_funcs" >&5
-+echo "$as_me:8459: result: $with_ext_funcs" >&5
- echo "${ECHO_T}$with_ext_funcs" >&6
- if test "$with_ext_funcs" = yes ; then
- 	NCURSES_EXT_FUNCS=1
-@@ -8355,7 +8493,7 @@
- fi
- 
- ###   use option --enable-const to turn on use of const beyond that in XSI.
--echo "$as_me:8358: checking for extended use of const keyword" >&5
-+echo "$as_me:8496: checking for extended use of const keyword" >&5
- echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
- 
- # Check whether --enable-const or --disable-const was given.
-@@ -8365,14 +8503,85 @@
- else
-   with_ext_const=no
- fi;
--echo "$as_me:8368: result: $with_ext_const" >&5
-+echo "$as_me:8506: result: $with_ext_const" >&5
- echo "${ECHO_T}$with_ext_const" >&6
- NCURSES_CONST='/*nothing*/'
- if test "$with_ext_const" = yes ; then
- 	NCURSES_CONST=const
- fi
- 
--echo "$as_me:8375: checking if you want \$NCURSES_NO_PADDING code" >&5
-+###   use option --enable-ext-colors to turn on use of colors beyond 16.
-+echo "$as_me:8514: checking if you want to use extended colors" >&5
-+echo $ECHO_N "checking if you want to use extended colors... $ECHO_C" >&6
-+
-+# Check whether --enable-ext-colors or --disable-ext-colors was given.
-+if test "${enable_ext_colors+set}" = set; then
-+  enableval="$enable_ext_colors"
-+  with_ext_colors=$enableval
-+else
-+  with_ext_colors=no
-+fi;
-+echo "$as_me:8524: result: $with_ext_colors" >&5
-+echo "${ECHO_T}$with_ext_colors" >&6
-+NCURSES_EXT_COLORS=0
-+if test "$with_ext_colors" = yes ; then
-+	if test "$with_widec" != yes ; then
-+		{ { echo "$as_me:8529: error: This option applies only to wide-character library" >&5
-+echo "$as_me: error: This option applies only to wide-character library" >&2;}
-+   { (exit 1); exit 1; }; }
-+	else
-+		# cannot be ABI 5 since it changes sizeof(cchar_t)
-+
-+if test "${with_abi_version+set}" != set; then
-+	case $cf_cv_rel_version in
-+	5.*)
-+		cf_cv_rel_version=6.0
-+		cf_cv_abi_version=6
-+		{ echo "$as_me:8540: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
-+echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
-+		;;
-+	esac
-+fi
-+
-+	fi
-+	NCURSES_EXT_COLORS=1
-+	cat >>confdefs.h <<\EOF
-+#define NCURSES_EXT_COLORS 1
-+EOF
-+
-+fi
-+
-+###   use option --enable-ext-mouse to modify coding to support 5-button mice
-+echo "$as_me:8555: checking if you want to use extended mouse encoding" >&5
-+echo $ECHO_N "checking if you want to use extended mouse encoding... $ECHO_C" >&6
-+
-+# Check whether --enable-ext-mouse or --disable-ext-mouse was given.
-+if test "${enable_ext_mouse+set}" = set; then
-+  enableval="$enable_ext_mouse"
-+  with_ext_mouse=$enableval
-+else
-+  with_ext_mouse=no
-+fi;
-+echo "$as_me:8565: result: $with_ext_mouse" >&5
-+echo "${ECHO_T}$with_ext_mouse" >&6
-+NCURSES_MOUSE_VERSION=1
-+if test "$with_ext_mouse" = yes ; then
-+	NCURSES_MOUSE_VERSION=2
-+
-+if test "${with_abi_version+set}" != set; then
-+	case $cf_cv_rel_version in
-+	5.*)
-+		cf_cv_rel_version=6.0
-+		cf_cv_abi_version=6
-+		{ echo "$as_me:8576: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
-+echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
-+		;;
-+	esac
-+fi
-+
-+fi
-+
-+echo "$as_me:8584: checking if you want \$NCURSES_NO_PADDING code" >&5
- echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6
- 
- # Check whether --enable-no-padding or --disable-no-padding was given.
-@@ -8382,19 +8591,19 @@
- else
-   with_no_padding=$with_ext_funcs
- fi;
--echo "$as_me:8385: result: $with_no_padding" >&5
-+echo "$as_me:8594: result: $with_no_padding" >&5
- echo "${ECHO_T}$with_no_padding" >&6
- test "$with_no_padding" = yes && cat >>confdefs.h <<\EOF
- #define NCURSES_NO_PADDING 1
- EOF
- 
--echo "$as_me:8391: checking for ANSI C header files" >&5
-+echo "$as_me:8600: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8397 "configure"
-+#line 8606 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -8402,13 +8611,13 @@
- #include <float.h>
- 
- _ACEOF
--if { (eval echo "$as_me:8405: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:8614: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:8411: \$? = $ac_status" >&5
-+  echo "$as_me:8620: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -8430,7 +8639,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8433 "configure"
-+#line 8642 "configure"
- #include "confdefs.h"
- #include <string.h>
- 
-@@ -8448,7 +8657,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8451 "configure"
-+#line 8660 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- 
-@@ -8469,7 +8678,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8472 "configure"
-+#line 8681 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #if ((' ' & 0x0FF) == 0x020)
-@@ -8495,15 +8704,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:8498: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8707: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8501: \$? = $ac_status" >&5
-+  echo "$as_me:8710: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:8503: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8712: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8506: \$? = $ac_status" >&5
-+  echo "$as_me:8715: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -8516,7 +8725,7 @@
- fi
- fi
- fi
--echo "$as_me:8519: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:8728: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
-@@ -8532,28 +8741,28 @@
-                   inttypes.h stdint.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:8535: checking for $ac_header" >&5
-+echo "$as_me:8744: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8541 "configure"
-+#line 8750 "configure"
- #include "confdefs.h"
- $ac_includes_default
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8547: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8756: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8550: \$? = $ac_status" >&5
-+  echo "$as_me:8759: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8553: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8762: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8556: \$? = $ac_status" >&5
-+  echo "$as_me:8765: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -8563,7 +8772,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:8566: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:8775: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -8573,13 +8782,13 @@
- fi
- done
- 
--echo "$as_me:8576: checking for signed char" >&5
-+echo "$as_me:8785: checking for signed char" >&5
- echo $ECHO_N "checking for signed char... $ECHO_C" >&6
- if test "${ac_cv_type_signed_char+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8582 "configure"
-+#line 8791 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -8594,16 +8803,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8597: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8806: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8600: \$? = $ac_status" >&5
-+  echo "$as_me:8809: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8603: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8812: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8606: \$? = $ac_status" >&5
-+  echo "$as_me:8815: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_signed_char=yes
- else
-@@ -8613,10 +8822,10 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:8616: result: $ac_cv_type_signed_char" >&5
-+echo "$as_me:8825: result: $ac_cv_type_signed_char" >&5
- echo "${ECHO_T}$ac_cv_type_signed_char" >&6
- 
--echo "$as_me:8619: checking size of signed char" >&5
-+echo "$as_me:8828: checking size of signed char" >&5
- echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
- if test "${ac_cv_sizeof_signed_char+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -8625,7 +8834,7 @@
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
--#line 8628 "configure"
-+#line 8837 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -8637,21 +8846,21 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8640: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8849: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8643: \$? = $ac_status" >&5
-+  echo "$as_me:8852: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8646: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8855: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8649: \$? = $ac_status" >&5
-+  echo "$as_me:8858: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 8654 "configure"
-+#line 8863 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -8663,16 +8872,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8666: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8875: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8669: \$? = $ac_status" >&5
-+  echo "$as_me:8878: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8672: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8881: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8675: \$? = $ac_status" >&5
-+  echo "$as_me:8884: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid; break
- else
-@@ -8688,7 +8897,7 @@
- ac_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
--#line 8691 "configure"
-+#line 8900 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -8700,16 +8909,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8703: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8912: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8706: \$? = $ac_status" >&5
-+  echo "$as_me:8915: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8709: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8918: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8712: \$? = $ac_status" >&5
-+  echo "$as_me:8921: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_lo=$ac_mid; break
- else
-@@ -8725,7 +8934,7 @@
- while test "x$ac_lo" != "x$ac_hi"; do
-   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8728 "configure"
-+#line 8937 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -8737,16 +8946,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:8740: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:8949: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:8743: \$? = $ac_status" >&5
-+  echo "$as_me:8952: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:8746: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8955: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8749: \$? = $ac_status" >&5
-+  echo "$as_me:8958: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_hi=$ac_mid
- else
-@@ -8759,12 +8968,12 @@
- ac_cv_sizeof_signed_char=$ac_lo
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:8762: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:8971: error: cannot run test program while cross compiling" >&5
- echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 8767 "configure"
-+#line 8976 "configure"
- #include "confdefs.h"
- $ac_includes_default
- int
-@@ -8780,15 +8989,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:8783: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:8992: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:8786: \$? = $ac_status" >&5
-+  echo "$as_me:8995: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:8788: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:8997: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:8791: \$? = $ac_status" >&5
-+  echo "$as_me:9000: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_sizeof_signed_char=`cat conftest.val`
- else
-@@ -8804,7 +9013,7 @@
-   ac_cv_sizeof_signed_char=0
- fi
- fi
--echo "$as_me:8807: result: $ac_cv_sizeof_signed_char" >&5
-+echo "$as_me:9016: result: $ac_cv_sizeof_signed_char" >&5
- echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
- cat >>confdefs.h <<EOF
- #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
-@@ -8815,7 +9024,7 @@
- else
- 	NCURSES_SBOOL="char"
- fi
--echo "$as_me:8818: checking if you want to use signed Boolean array in term.h" >&5
-+echo "$as_me:9027: checking if you want to use signed Boolean array in term.h" >&5
- echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6
- 
- # Check whether --enable-signed-char or --disable-signed-char was given.
-@@ -8825,12 +9034,12 @@
- else
-   with_signed_char=no
- fi;
--echo "$as_me:8828: result: $with_signed_char" >&5
-+echo "$as_me:9037: result: $with_signed_char" >&5
- echo "${ECHO_T}$with_signed_char" >&6
- test "$with_signed_char" != yes && NCURSES_SBOOL="char"
- 
- ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
--echo "$as_me:8833: checking if you want SIGWINCH handler" >&5
-+echo "$as_me:9042: checking if you want SIGWINCH handler" >&5
- echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6
- 
- # Check whether --enable-sigwinch or --disable-sigwinch was given.
-@@ -8840,14 +9049,14 @@
- else
-   with_sigwinch=$with_ext_funcs
- fi;
--echo "$as_me:8843: result: $with_sigwinch" >&5
-+echo "$as_me:9052: result: $with_sigwinch" >&5
- echo "${ECHO_T}$with_sigwinch" >&6
- test "$with_sigwinch" = yes && cat >>confdefs.h <<\EOF
- #define USE_SIGWINCH 1
- EOF
- 
- ###   use option --enable-tcap-names to allow user to define new capabilities
--echo "$as_me:8850: checking if you want user-definable terminal capabilities like termcap" >&5
-+echo "$as_me:9059: checking if you want user-definable terminal capabilities like termcap" >&5
- echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6
- 
- # Check whether --enable-tcap-names or --disable-tcap-names was given.
-@@ -8857,7 +9066,7 @@
- else
-   with_tcap_names=$with_ext_funcs
- fi;
--echo "$as_me:8860: result: $with_tcap_names" >&5
-+echo "$as_me:9069: result: $with_tcap_names" >&5
- echo "${ECHO_T}$with_tcap_names" >&6
- NCURSES_XNAMES=0
- test "$with_tcap_names" = yes && NCURSES_XNAMES=1
-@@ -8865,7 +9074,7 @@
- ###############################################################################
- # These options are relatively safe to experiment with.
- 
--echo "$as_me:8868: checking if you want all development code" >&5
-+echo "$as_me:9077: checking if you want all development code" >&5
- echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
- 
- # Check whether --with-develop or --without-develop was given.
-@@ -8875,11 +9084,11 @@
- else
-   with_develop=no
- fi;
--echo "$as_me:8878: result: $with_develop" >&5
-+echo "$as_me:9087: result: $with_develop" >&5
- echo "${ECHO_T}$with_develop" >&6
- 
- ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
--echo "$as_me:8882: checking if you want hard-tabs code" >&5
-+echo "$as_me:9091: checking if you want hard-tabs code" >&5
- echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6
- 
- # Check whether --enable-hard-tabs or --disable-hard-tabs was given.
-@@ -8889,14 +9098,14 @@
- else
-   enable_hard_tabs=$with_develop
- fi;
--echo "$as_me:8892: result: $enable_hard_tabs" >&5
-+echo "$as_me:9101: result: $enable_hard_tabs" >&5
- echo "${ECHO_T}$enable_hard_tabs" >&6
- test "$enable_hard_tabs" = yes && cat >>confdefs.h <<\EOF
- #define USE_HARD_TABS 1
- EOF
- 
- ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
--echo "$as_me:8899: checking if you want limited support for xmc" >&5
-+echo "$as_me:9108: checking if you want limited support for xmc" >&5
- echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6
- 
- # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
-@@ -8906,7 +9115,7 @@
- else
-   enable_xmc_glitch=$with_develop
- fi;
--echo "$as_me:8909: result: $enable_xmc_glitch" >&5
-+echo "$as_me:9118: result: $enable_xmc_glitch" >&5
- echo "${ECHO_T}$enable_xmc_glitch" >&6
- test "$enable_xmc_glitch" = yes && cat >>confdefs.h <<\EOF
- #define USE_XMC_SUPPORT 1
-@@ -8915,7 +9124,7 @@
- ###############################################################################
- # These are just experimental, probably should not be in a package:
- 
--echo "$as_me:8918: checking if you do not want to assume colors are white-on-black" >&5
-+echo "$as_me:9127: checking if you do not want to assume colors are white-on-black" >&5
- echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6
- 
- # Check whether --enable-assumed-color or --disable-assumed-color was given.
-@@ -8925,14 +9134,14 @@
- else
-   with_assumed_color=yes
- fi;
--echo "$as_me:8928: result: $with_assumed_color" >&5
-+echo "$as_me:9137: result: $with_assumed_color" >&5
- echo "${ECHO_T}$with_assumed_color" >&6
- test "$with_assumed_color" = yes && cat >>confdefs.h <<\EOF
- #define USE_ASSUMED_COLOR 1
- EOF
- 
- ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
--echo "$as_me:8935: checking if you want hashmap scrolling-optimization code" >&5
-+echo "$as_me:9144: checking if you want hashmap scrolling-optimization code" >&5
- echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6
- 
- # Check whether --enable-hashmap or --disable-hashmap was given.
-@@ -8942,14 +9151,14 @@
- else
-   with_hashmap=yes
- fi;
--echo "$as_me:8945: result: $with_hashmap" >&5
-+echo "$as_me:9154: result: $with_hashmap" >&5
- echo "${ECHO_T}$with_hashmap" >&6
- test "$with_hashmap" = yes && cat >>confdefs.h <<\EOF
- #define USE_HASHMAP 1
- EOF
- 
- ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
--echo "$as_me:8952: checking if you want colorfgbg code" >&5
-+echo "$as_me:9161: checking if you want colorfgbg code" >&5
- echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6
- 
- # Check whether --enable-colorfgbg or --disable-colorfgbg was given.
-@@ -8959,83 +9168,195 @@
- else
-   with_colorfgbg=no
- fi;
--echo "$as_me:8962: result: $with_colorfgbg" >&5
-+echo "$as_me:9171: result: $with_colorfgbg" >&5
- echo "${ECHO_T}$with_colorfgbg" >&6
- test "$with_colorfgbg" = yes && cat >>confdefs.h <<\EOF
- #define USE_COLORFGBG 1
- EOF
- 
--###   use option --enable-ext-colors to turn on use of colors beyond 16.
--echo "$as_me:8969: checking if you want to use experimental extended colors" >&5
--echo $ECHO_N "checking if you want to use experimental extended colors... $ECHO_C" >&6
-+# This is still experimental (20080329), but should ultimately be moved to
-+# the script-block --with-normal, etc.
- 
--# Check whether --enable-ext-colors or --disable-ext-colors was given.
--if test "${enable_ext_colors+set}" = set; then
--  enableval="$enable_ext_colors"
--  with_ext_colors=$enableval
--else
--  with_ext_colors=no
--fi;
--echo "$as_me:8979: result: $with_ext_colors" >&5
--echo "${ECHO_T}$with_ext_colors" >&6
--NCURSES_EXT_COLORS=0
--if test "$with_ext_colors" = yes ; then
--	if test "$with_widec" != yes ; then
--		{ echo "$as_me:8984: WARNING: This option applies only to wide-character library" >&5
--echo "$as_me: WARNING: This option applies only to wide-character library" >&2;}
--	else
--		# cannot be ABI 5 since it changes sizeof(cchar_t)
-+echo "$as_me:9180: checking if you want to link with the pthread library" >&5
-+echo $ECHO_N "checking if you want to link with the pthread library... $ECHO_C" >&6
- 
--if test "${with_abi_version+set}" != set; then
--	case $cf_cv_rel_version in
--	5.*)
--		cf_cv_rel_version=6.0
--		cf_cv_abi_version=6
--		{ echo "$as_me:8994: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
--echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
--		;;
--	esac
-+# Check whether --with-pthread or --without-pthread was given.
-+if test "${with_pthread+set}" = set; then
-+  withval="$with_pthread"
-+  with_pthread=$withval
-+else
-+  with_pthread=no
-+fi;
-+echo "$as_me:9190: result: $with_pthread" >&5
-+echo "${ECHO_T}$with_pthread" >&6
-+
-+if test "$with_pthread" != no ; then
-+    echo "$as_me:9194: checking for pthread.h" >&5
-+echo $ECHO_N "checking for pthread.h... $ECHO_C" >&6
-+if test "${ac_cv_header_pthread_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line 9200 "configure"
-+#include "confdefs.h"
-+#include <pthread.h>
-+_ACEOF
-+if { (eval echo "$as_me:9204: \"$ac_cpp conftest.$ac_ext\"") >&5
-+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+  ac_status=$?
-+  egrep -v '^ *\+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:9210: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  ac_cv_header_pthread_h=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  ac_cv_header_pthread_h=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
- fi
-+echo "$as_me:9229: result: $ac_cv_header_pthread_h" >&5
-+echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
-+if test $ac_cv_header_pthread_h = yes; then
- 
--	fi
--	NCURSES_EXT_COLORS=1
--	cat >>confdefs.h <<\EOF
--#define NCURSES_EXT_COLORS 1
-+        cat >>confdefs.h <<\EOF
-+#define HAVE_PTHREADS_H 1
- EOF
- 
-+        echo "$as_me:9237: checking for pthread_create in -lpthread" >&5
-+echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-+if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lpthread  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 9245 "configure"
-+#include "confdefs.h"
-+
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char pthread_create ();
-+int
-+main ()
-+{
-+pthread_create ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:9264: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:9267: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:9270: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:9273: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_pthread_pthread_create=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_lib_pthread_pthread_create=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
- fi
-+echo "$as_me:9284: result: $ac_cv_lib_pthread_pthread_create" >&5
-+echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
-+if test $ac_cv_lib_pthread_pthread_create = yes; then
- 
--###   use option --enable-ext-mouse to modify coding to support 5-button mice
--echo "$as_me:9009: checking if you want to use experimental extended mouse encoding" >&5
--echo $ECHO_N "checking if you want to use experimental extended mouse encoding... $ECHO_C" >&6
-+            LIBS="-lpthread $LIBS"
-+            cat >>confdefs.h <<\EOF
-+#define HAVE_LIBPTHREADS 1
-+EOF
-+
-+            with_pthread=yes
- 
--# Check whether --enable-ext-mouse or --disable-ext-mouse was given.
--if test "${enable_ext_mouse+set}" = set; then
--  enableval="$enable_ext_mouse"
--  with_ext_mouse=$enableval
- else
--  with_ext_mouse=no
--fi;
--echo "$as_me:9019: result: $with_ext_mouse" >&5
--echo "${ECHO_T}$with_ext_mouse" >&6
--NCURSES_MOUSE_VERSION=1
--if test "$with_ext_mouse" = yes ; then
--	NCURSES_MOUSE_VERSION=2
-+
-+            { { echo "$as_me:9297: error: Cannot link with pthread library" >&5
-+echo "$as_me: error: Cannot link with pthread library" >&2;}
-+   { (exit 1); exit 1; }; }
-+
-+fi
-+
-+fi
-+
-+fi
-+
-+if test "$with_pthread" = "yes" ; then
-+    cat >>confdefs.h <<\EOF
-+#define USE_PTHREADS 1
-+EOF
-+
-+    enable_reentrant=yes
-+fi
-+
-+# Reentrant code has to be opaque; there's little advantage to making ncurses
-+# opaque outside of that, so there is no --enable-opaque option.  We can use
-+# this option without --with-pthreads, but this will be always set for
-+# pthreads.
-+echo "$as_me:9319: checking if you want experimental reentrant code" >&5
-+echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6
-+
-+# Check whether --enable-reentrant or --disable-reentrant was given.
-+if test "${enable_reentrant+set}" = set; then
-+  enableval="$enable_reentrant"
-+  with_reentrant=$enableval
-+else
-+  with_reentrant=no
-+fi;
-+echo "$as_me:9329: result: $with_reentrant" >&5
-+echo "${ECHO_T}$with_reentrant" >&6
-+if test "$with_reentrant" = yes ; then
-+	cf_cv_enable_reentrant=1
-+	cf_cv_enable_opaque="NCURSES_INTERNALS"
-+	NCURSES_OPAQUE=1
-+	NCURSES_SIZE_T=int
-+	LIB_SUFFIX="t${LIB_SUFFIX}"
-+	cat >>confdefs.h <<\EOF
-+#define USE_REENTRANT 1
-+EOF
- 
- if test "${with_abi_version+set}" != set; then
- 	case $cf_cv_rel_version in
- 	5.*)
- 		cf_cv_rel_version=6.0
- 		cf_cv_abi_version=6
--		{ echo "$as_me:9030: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
-+		{ echo "$as_me:9346: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
- echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
- 		;;
- 	esac
- fi
- 
-+else
-+	cf_cv_enable_reentrant=0
-+	cf_cv_enable_opaque="NCURSES_OPAQUE"
-+	NCURSES_OPAQUE=0
-+	NCURSES_SIZE_T=short
- fi
- 
--echo "$as_me:9038: checking if you want experimental safe-sprintf code" >&5
-+echo "$as_me:9359: checking if you want experimental safe-sprintf code" >&5
- echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6
- 
- # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given.
-@@ -9045,7 +9366,7 @@
- else
-   with_safe_sprintf=no
- fi;
--echo "$as_me:9048: result: $with_safe_sprintf" >&5
-+echo "$as_me:9369: result: $with_safe_sprintf" >&5
- echo "${ECHO_T}$with_safe_sprintf" >&6
- test "$with_safe_sprintf" = yes && cat >>confdefs.h <<\EOF
- #define USE_SAFE_SPRINTF 1
-@@ -9054,7 +9375,7 @@
- ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
- # when hashmap is used scroll hints are useless
- if test "$with_hashmap" = no ; then
--echo "$as_me:9057: checking if you want to experiment without scrolling-hints code" >&5
-+echo "$as_me:9378: checking if you want to experiment without scrolling-hints code" >&5
- echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6
- 
- # Check whether --enable-scroll-hints or --disable-scroll-hints was given.
-@@ -9064,7 +9385,7 @@
- else
-   with_scroll_hints=yes
- fi;
--echo "$as_me:9067: result: $with_scroll_hints" >&5
-+echo "$as_me:9388: result: $with_scroll_hints" >&5
- echo "${ECHO_T}$with_scroll_hints" >&6
- test "$with_scroll_hints" = yes && cat >>confdefs.h <<\EOF
- #define USE_SCROLL_HINTS 1
-@@ -9072,7 +9393,7 @@
- 
- fi
- 
--echo "$as_me:9075: checking if you want experimental wgetch-events code" >&5
-+echo "$as_me:9396: checking if you want experimental wgetch-events code" >&5
- echo $ECHO_N "checking if you want experimental wgetch-events code... $ECHO_C" >&6
- 
- # Check whether --enable-wgetch-events or --disable-wgetch-events was given.
-@@ -9082,7 +9403,7 @@
- else
-   with_wgetch_events=no
- fi;
--echo "$as_me:9085: result: $with_wgetch_events" >&5
-+echo "$as_me:9406: result: $with_wgetch_events" >&5
- echo "${ECHO_T}$with_wgetch_events" >&6
- test "$with_wgetch_events" = yes && cat >>confdefs.h <<\EOF
- #define NCURSES_WGETCH_EVENTS 1
-@@ -9091,7 +9412,7 @@
- ###############################################################################
- 
- ###	use option --disable-echo to suppress full display compiling commands
--echo "$as_me:9094: checking if you want to display full commands during build" >&5
-+echo "$as_me:9415: checking if you want to display full commands during build" >&5
- echo $ECHO_N "checking if you want to display full commands during build... $ECHO_C" >&6
- 
- # Check whether --enable-echo or --disable-echo was given.
-@@ -9106,12 +9427,13 @@
- else
- 	ECHO_LINK='@ echo linking $@ ... ;'
- 	test -n "$LIBTOOL" && LIBTOOL="$LIBTOOL --silent"
-+	test -n "$LIBTOOL_CXX" && LIBTOOL_CXX="$LIBTOOL_CXX --silent"
- fi
--echo "$as_me:9110: result: $with_echo" >&5
-+echo "$as_me:9432: result: $with_echo" >&5
- echo "${ECHO_T}$with_echo" >&6
- 
- ###	use option --enable-warnings to turn on all gcc warnings
--echo "$as_me:9114: checking if you want to see compiler warnings" >&5
-+echo "$as_me:9436: checking if you want to see compiler warnings" >&5
- echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
- 
- # Check whether --enable-warnings or --disable-warnings was given.
-@@ -9119,10 +9441,10 @@
-   enableval="$enable_warnings"
-   with_warnings=$enableval
- fi;
--echo "$as_me:9122: result: $with_warnings" >&5
-+echo "$as_me:9444: result: $with_warnings" >&5
- echo "${ECHO_T}$with_warnings" >&6
- 
--if test -n "$with_warnings"; then
-+if test "x$with_warnings" = "xyes"; then
-  	ADAFLAGS="$ADAFLAGS -gnatg"
- 
- INTEL_COMPILER=no
-@@ -9130,12 +9452,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	linux*|gnu*)
--		echo "$as_me:9133: checking if this is really Intel C compiler" >&5
-+		echo "$as_me:9455: checking if this is really Intel C compiler" >&5
- echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CFLAGS"
- 		CFLAGS="$CFLAGS -no-gcc"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 9138 "configure"
-+#line 9460 "configure"
- #include "confdefs.h"
- 
- int
-@@ -9152,16 +9474,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9155: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9477: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9158: \$? = $ac_status" >&5
-+  echo "$as_me:9480: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9161: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9483: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9164: \$? = $ac_status" >&5
-+  echo "$as_me:9486: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   INTEL_COMPILER=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
-@@ -9172,14 +9494,14 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:9175: result: $INTEL_COMPILER" >&5
-+		echo "$as_me:9497: result: $INTEL_COMPILER" >&5
- echo "${ECHO_T}$INTEL_COMPILER" >&6
- 		;;
- 	esac
- fi
- 
- cat > conftest.$ac_ext <<EOF
--#line 9182 "configure"
-+#line 9504 "${as_me-configure}"
- int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
- EOF
- 
-@@ -9197,11 +9519,11 @@
- # remark #981: operands are evaluated in unspecified order
- # warning #269: invalid format string conversion
- 
--	{ echo "$as_me:9200: checking for $CC warning options..." >&5
-+	{ echo "$as_me:9522: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS="-Wall"
--	for cf_opt in  \
-+	for cf_opt in \
- 		wd1419 \
- 		wd1682 \
- 		wd1683 \
-@@ -9214,12 +9536,12 @@
- 		wd981
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:9217: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:9539: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9220: \$? = $ac_status" >&5
-+  echo "$as_me:9542: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:9222: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:9544: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
- 		fi
-@@ -9228,7 +9550,7 @@
- 
- elif test "$GCC" = yes
- then
--	{ echo "$as_me:9231: checking for $CC warning options..." >&5
-+	{ echo "$as_me:9553: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS="-W -Wall"
-@@ -9245,15 +9567,15 @@
- 		Wpointer-arith \
- 		Wshadow \
- 		Wstrict-prototypes \
--		Wundef $cf_warn_CONST
-+		Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum
- 	do
- 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo "$as_me:9251: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:9573: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9254: \$? = $ac_status" >&5
-+  echo "$as_me:9576: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:9256: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:9578: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			case $cf_opt in #(vi
- 			Wcast-qual) #(vi
-@@ -9264,6 +9586,8 @@
- 				3.3*)
- 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
- 
-+echo "${as_me-configure}:9589: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+
- 					continue;;
- 				esac
- 				;;
-@@ -9282,12 +9606,12 @@
- if test "$GCC" = yes ; then
- 	case $host_os in
- 	linux*|gnu*)
--		echo "$as_me:9285: checking if this is really Intel C++ compiler" >&5
-+		echo "$as_me:9609: checking if this is really Intel C++ compiler" >&5
- echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6
- 		cf_save_CFLAGS="$CXXFLAGS"
- 		CXXFLAGS="$CXXFLAGS -no-gcc"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 9290 "configure"
-+#line 9614 "configure"
- #include "confdefs.h"
- 
- int
-@@ -9304,16 +9628,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:9307: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:9631: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9310: \$? = $ac_status" >&5
-+  echo "$as_me:9634: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:9313: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:9637: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9316: \$? = $ac_status" >&5
-+  echo "$as_me:9640: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   INTEL_CPLUSPLUS=yes
- cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
-@@ -9324,7 +9648,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- 		CXXFLAGS="$cf_save_CFLAGS"
--		echo "$as_me:9327: result: $INTEL_CPLUSPLUS" >&5
-+		echo "$as_me:9651: result: $INTEL_CPLUSPLUS" >&5
- echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
- 		;;
- 	esac
-@@ -9338,7 +9662,7 @@
- ac_main_return=return
- 
- cat > conftest.$ac_ext <<EOF
--#line 9341 "configure"
-+#line 9665 "configure"
- int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
- EOF
- 
-@@ -9356,7 +9680,7 @@
- # remark #981: operands are evaluated in unspecified order
- # warning #269: invalid format string conversion
- 
--	{ echo "$as_me:9359: checking for $CC warning options..." >&5
-+	{ echo "$as_me:9683: checking for $CC warning options..." >&5
- echo "$as_me: checking for $CC warning options..." >&6;}
- 	cf_save_CXXFLAGS="$CXXFLAGS"
- 	EXTRA_CXXFLAGS="-Wall"
-@@ -9373,12 +9697,12 @@
- 		wd981
- 	do
- 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
--		if { (eval echo "$as_me:9376: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:9700: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9379: \$? = $ac_status" >&5
-+  echo "$as_me:9703: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:9381: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:9705: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
- 		fi
-@@ -9387,7 +9711,7 @@
- 
- elif test "$GXX" = yes
- then
--	{ echo "$as_me:9390: checking for $CXX warning options..." >&5
-+	{ echo "$as_me:9714: checking for $CXX warning options..." >&5
- echo "$as_me: checking for $CXX warning options..." >&6;}
- 	cf_save_CXXFLAGS="$CXXFLAGS"
- 	EXTRA_CXXFLAGS="-W -Wall"
-@@ -9416,16 +9740,16 @@
- 		Wundef $cf_gxx_extra_warnings Wno-unused
- 	do
- 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
--		if { (eval echo "$as_me:9419: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:9743: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9422: \$? = $ac_status" >&5
-+  echo "$as_me:9746: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:9424: result: ... -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:9748: result: ... -$cf_opt" >&5
- echo "${ECHO_T}... -$cf_opt" >&6
- 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
- 		else
--			test -n "$verbose" && echo "$as_me:9428: result: ... no -$cf_opt" >&5
-+			test -n "$verbose" && echo "$as_me:9752: result: ... no -$cf_opt" >&5
- echo "${ECHO_T}... no -$cf_opt" >&6
- 		fi
- 	done
-@@ -9461,10 +9785,10 @@
- EOF
- if test "$GCC" = yes
- then
--	{ echo "$as_me:9464: checking for $CC __attribute__ directives..." >&5
-+	{ echo "$as_me:9788: checking for $CC __attribute__ directives..." >&5
- echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
- cat > conftest.$ac_ext <<EOF
--#line 9467 "configure"
-+#line 9791 "${as_me-configure}"
- #include "confdefs.h"
- #include "conftest.h"
- #include "conftest.i"
-@@ -9502,12 +9826,12 @@
- EOF
- 			;;
- 		esac
--		if { (eval echo "$as_me:9505: \"$ac_compile\"") >&5
-+		if { (eval echo "$as_me:9829: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:9508: \$? = $ac_status" >&5
-+  echo "$as_me:9832: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
--			test -n "$verbose" && echo "$as_me:9510: result: ... $cf_attribute" >&5
-+			test -n "$verbose" && echo "$as_me:9834: result: ... $cf_attribute" >&5
- echo "${ECHO_T}... $cf_attribute" >&6
- 			cat conftest.h >>confdefs.h
- 		fi
-@@ -9519,7 +9843,7 @@
- fi
- 
- ###	use option --enable-assertions to turn on generation of assertion code
--echo "$as_me:9522: checking if you want to enable runtime assertions" >&5
-+echo "$as_me:9846: checking if you want to enable runtime assertions" >&5
- echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
- 
- # Check whether --enable-assertions or --disable-assertions was given.
-@@ -9529,7 +9853,7 @@
- else
-   with_assertions=no
- fi;
--echo "$as_me:9532: result: $with_assertions" >&5
-+echo "$as_me:9856: result: $with_assertions" >&5
- echo "${ECHO_T}$with_assertions" >&6
- if test -n "$GCC"
- then
-@@ -9547,7 +9871,7 @@
- 
- ###	use option --disable-leaks to suppress "permanent" leaks, for testing
- 
--echo "$as_me:9550: checking if you want to use dmalloc for testing" >&5
-+echo "$as_me:9874: checking if you want to use dmalloc for testing" >&5
- echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
- 
- # Check whether --with-dmalloc or --without-dmalloc was given.
-@@ -9563,7 +9887,7 @@
- else
-   with_dmalloc=
- fi;
--echo "$as_me:9566: result: ${with_dmalloc:-no}" >&5
-+echo "$as_me:9890: result: ${with_dmalloc:-no}" >&5
- echo "${ECHO_T}${with_dmalloc:-no}" >&6
- 
- case .$with_cflags in #(vi
-@@ -9647,23 +9971,23 @@
- esac
- 
- if test "$with_dmalloc" = yes ; then
--	echo "$as_me:9650: checking for dmalloc.h" >&5
-+	echo "$as_me:9974: checking for dmalloc.h" >&5
- echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
- if test "${ac_cv_header_dmalloc_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9656 "configure"
-+#line 9980 "configure"
- #include "confdefs.h"
- #include <dmalloc.h>
- _ACEOF
--if { (eval echo "$as_me:9660: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:9984: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:9666: \$? = $ac_status" >&5
-+  echo "$as_me:9990: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -9682,11 +10006,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:9685: result: $ac_cv_header_dmalloc_h" >&5
-+echo "$as_me:10009: result: $ac_cv_header_dmalloc_h" >&5
- echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
- if test $ac_cv_header_dmalloc_h = yes; then
- 
--echo "$as_me:9689: checking for dmalloc_debug in -ldmalloc" >&5
-+echo "$as_me:10013: checking for dmalloc_debug in -ldmalloc" >&5
- echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
- if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9694,7 +10018,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 9697 "configure"
-+#line 10021 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -9713,16 +10037,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9716: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10040: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9719: \$? = $ac_status" >&5
-+  echo "$as_me:10043: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9722: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10046: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9725: \$? = $ac_status" >&5
-+  echo "$as_me:10049: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dmalloc_dmalloc_debug=yes
- else
-@@ -9733,7 +10057,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:9736: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
-+echo "$as_me:10060: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
- echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
- if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
-   cat >>confdefs.h <<EOF
-@@ -9748,7 +10072,7 @@
- 
- fi
- 
--echo "$as_me:9751: checking if you want to use dbmalloc for testing" >&5
-+echo "$as_me:10075: checking if you want to use dbmalloc for testing" >&5
- echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
- 
- # Check whether --with-dbmalloc or --without-dbmalloc was given.
-@@ -9764,7 +10088,7 @@
- else
-   with_dbmalloc=
- fi;
--echo "$as_me:9767: result: ${with_dbmalloc:-no}" >&5
-+echo "$as_me:10091: result: ${with_dbmalloc:-no}" >&5
- echo "${ECHO_T}${with_dbmalloc:-no}" >&6
- 
- case .$with_cflags in #(vi
-@@ -9848,23 +10172,23 @@
- esac
- 
- if test "$with_dbmalloc" = yes ; then
--	echo "$as_me:9851: checking for dbmalloc.h" >&5
-+	echo "$as_me:10175: checking for dbmalloc.h" >&5
- echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
- if test "${ac_cv_header_dbmalloc_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 9857 "configure"
-+#line 10181 "configure"
- #include "confdefs.h"
- #include <dbmalloc.h>
- _ACEOF
--if { (eval echo "$as_me:9861: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:10185: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:9867: \$? = $ac_status" >&5
-+  echo "$as_me:10191: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -9883,11 +10207,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:9886: result: $ac_cv_header_dbmalloc_h" >&5
-+echo "$as_me:10210: result: $ac_cv_header_dbmalloc_h" >&5
- echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
- if test $ac_cv_header_dbmalloc_h = yes; then
- 
--echo "$as_me:9890: checking for debug_malloc in -ldbmalloc" >&5
-+echo "$as_me:10214: checking for debug_malloc in -ldbmalloc" >&5
- echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
- if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9895,7 +10219,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldbmalloc  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 9898 "configure"
-+#line 10222 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -9914,16 +10238,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:9917: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10241: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:9920: \$? = $ac_status" >&5
-+  echo "$as_me:10244: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:9923: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10247: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:9926: \$? = $ac_status" >&5
-+  echo "$as_me:10250: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dbmalloc_debug_malloc=yes
- else
-@@ -9934,7 +10258,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:9937: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
-+echo "$as_me:10261: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
- echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
- if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
-   cat >>confdefs.h <<EOF
-@@ -9949,7 +10273,7 @@
- 
- fi
- 
--echo "$as_me:9952: checking if you want to use valgrind for testing" >&5
-+echo "$as_me:10276: checking if you want to use valgrind for testing" >&5
- echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
- 
- # Check whether --with-valgrind or --without-valgrind was given.
-@@ -9965,7 +10289,7 @@
- else
-   with_valgrind=
- fi;
--echo "$as_me:9968: result: ${with_valgrind:-no}" >&5
-+echo "$as_me:10292: result: ${with_valgrind:-no}" >&5
- echo "${ECHO_T}${with_valgrind:-no}" >&6
- 
- case .$with_cflags in #(vi
-@@ -10048,7 +10372,7 @@
- 	;;
- esac
- 
--echo "$as_me:10051: checking if you want to perform memory-leak testing" >&5
-+echo "$as_me:10375: checking if you want to perform memory-leak testing" >&5
- echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
- 
- # Check whether --enable-leaks or --disable-leaks was given.
-@@ -10058,7 +10382,7 @@
- else
-   : ${with_no_leaks:=no}
- fi;
--echo "$as_me:10061: result: $with_no_leaks" >&5
-+echo "$as_me:10385: result: $with_no_leaks" >&5
- echo "${ECHO_T}$with_no_leaks" >&6
- 
- if test "$with_no_leaks" = yes ; then
-@@ -10103,7 +10427,7 @@
- 	;;
- esac
- 
--echo "$as_me:10106: checking whether to add trace feature to all models" >&5
-+echo "$as_me:10430: checking whether to add trace feature to all models" >&5
- echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
- 
- # Check whether --with-trace or --without-trace was given.
-@@ -10113,7 +10437,7 @@
- else
-   cf_with_trace=$cf_all_traces
- fi;
--echo "$as_me:10116: result: $cf_with_trace" >&5
-+echo "$as_me:10440: result: $cf_with_trace" >&5
- echo "${ECHO_T}$cf_with_trace" >&6
- 
- if test "$cf_with_trace" = yes ; then
-@@ -10194,13 +10518,13 @@
- fi
- 
- ###	Checks for libraries.
--echo "$as_me:10197: checking for gettimeofday" >&5
-+echo "$as_me:10521: checking for gettimeofday" >&5
- echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
- if test "${ac_cv_func_gettimeofday+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10203 "configure"
-+#line 10527 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char gettimeofday (); below.  */
-@@ -10231,16 +10555,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10234: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10558: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10237: \$? = $ac_status" >&5
-+  echo "$as_me:10561: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10240: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10564: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10243: \$? = $ac_status" >&5
-+  echo "$as_me:10567: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_gettimeofday=yes
- else
-@@ -10250,7 +10574,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:10253: result: $ac_cv_func_gettimeofday" >&5
-+echo "$as_me:10577: result: $ac_cv_func_gettimeofday" >&5
- echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
- if test $ac_cv_func_gettimeofday = yes; then
-   cat >>confdefs.h <<\EOF
-@@ -10259,7 +10583,7 @@
- 
- else
- 
--echo "$as_me:10262: checking for gettimeofday in -lbsd" >&5
-+echo "$as_me:10586: checking for gettimeofday in -lbsd" >&5
- echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
- if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10267,7 +10591,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lbsd  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 10270 "configure"
-+#line 10594 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -10286,16 +10610,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10289: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10613: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10292: \$? = $ac_status" >&5
-+  echo "$as_me:10616: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10295: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10619: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10298: \$? = $ac_status" >&5
-+  echo "$as_me:10622: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_bsd_gettimeofday=yes
- else
-@@ -10306,7 +10630,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:10309: result: $ac_cv_lib_bsd_gettimeofday" >&5
-+echo "$as_me:10633: result: $ac_cv_lib_bsd_gettimeofday" >&5
- echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
- if test $ac_cv_lib_bsd_gettimeofday = yes; then
-   cat >>confdefs.h <<\EOF
-@@ -10318,14 +10642,14 @@
- 
- fi
- 
--echo "$as_me:10321: checking if -lm needed for math functions" >&5
-+echo "$as_me:10645: checking if -lm needed for math functions" >&5
- echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
- if test "${cf_cv_need_libm+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 10328 "configure"
-+#line 10652 "configure"
- #include "confdefs.h"
- 
- 	#include <stdio.h>
-@@ -10340,16 +10664,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10343: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10667: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10346: \$? = $ac_status" >&5
-+  echo "$as_me:10670: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10349: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10673: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10352: \$? = $ac_status" >&5
-+  echo "$as_me:10676: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_need_libm=no
- else
-@@ -10359,7 +10683,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:10362: result: $cf_cv_need_libm" >&5
-+echo "$as_me:10686: result: $cf_cv_need_libm" >&5
- echo "${ECHO_T}$cf_cv_need_libm" >&6
- if test "$cf_cv_need_libm" = yes
- then
-@@ -10367,13 +10691,13 @@
- fi
- 
- ###	Checks for header files.
--echo "$as_me:10370: checking for ANSI C header files" >&5
-+echo "$as_me:10694: 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
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10376 "configure"
-+#line 10700 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -10381,13 +10705,13 @@
- #include <float.h>
- 
- _ACEOF
--if { (eval echo "$as_me:10384: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:10708: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:10390: \$? = $ac_status" >&5
-+  echo "$as_me:10714: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -10409,7 +10733,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10412 "configure"
-+#line 10736 "configure"
- #include "confdefs.h"
- #include <string.h>
- 
-@@ -10427,7 +10751,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10430 "configure"
-+#line 10754 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- 
-@@ -10448,7 +10772,7 @@
-   :
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10451 "configure"
-+#line 10775 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #if ((' ' & 0x0FF) == 0x020)
-@@ -10474,15 +10798,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:10477: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10801: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10480: \$? = $ac_status" >&5
-+  echo "$as_me:10804: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:10482: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10806: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10485: \$? = $ac_status" >&5
-+  echo "$as_me:10809: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   :
- else
-@@ -10495,7 +10819,7 @@
- fi
- fi
- fi
--echo "$as_me:10498: result: $ac_cv_header_stdc" >&5
-+echo "$as_me:10822: result: $ac_cv_header_stdc" >&5
- echo "${ECHO_T}$ac_cv_header_stdc" >&6
- if test $ac_cv_header_stdc = yes; then
- 
-@@ -10508,13 +10832,13 @@
- ac_header_dirent=no
- for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
--echo "$as_me:10511: checking for $ac_hdr that defines DIR" >&5
-+echo "$as_me:10835: checking for $ac_hdr that defines DIR" >&5
- echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10517 "configure"
-+#line 10841 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <$ac_hdr>
-@@ -10529,16 +10853,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10532: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:10856: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10535: \$? = $ac_status" >&5
-+  echo "$as_me:10859: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10538: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10862: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10541: \$? = $ac_status" >&5
-+  echo "$as_me:10865: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_Header=yes"
- else
-@@ -10548,7 +10872,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:10551: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:10875: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -10561,7 +10885,7 @@
- done
- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
- if test $ac_header_dirent = dirent.h; then
--  echo "$as_me:10564: checking for opendir in -ldir" >&5
-+  echo "$as_me:10888: checking for opendir in -ldir" >&5
- echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
- if test "${ac_cv_lib_dir_opendir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10569,7 +10893,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldir  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 10572 "configure"
-+#line 10896 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -10588,16 +10912,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10591: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10915: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10594: \$? = $ac_status" >&5
-+  echo "$as_me:10918: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10597: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10921: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10600: \$? = $ac_status" >&5
-+  echo "$as_me:10924: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_dir_opendir=yes
- else
-@@ -10608,14 +10932,14 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:10611: result: $ac_cv_lib_dir_opendir" >&5
-+echo "$as_me:10935: result: $ac_cv_lib_dir_opendir" >&5
- echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
- if test $ac_cv_lib_dir_opendir = yes; then
-   LIBS="$LIBS -ldir"
- fi
- 
- else
--  echo "$as_me:10618: checking for opendir in -lx" >&5
-+  echo "$as_me:10942: checking for opendir in -lx" >&5
- echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
- if test "${ac_cv_lib_x_opendir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10623,7 +10947,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lx  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 10626 "configure"
-+#line 10950 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -10642,16 +10966,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10645: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:10969: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10648: \$? = $ac_status" >&5
-+  echo "$as_me:10972: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10651: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:10975: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10654: \$? = $ac_status" >&5
-+  echo "$as_me:10978: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_x_opendir=yes
- else
-@@ -10662,7 +10986,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:10665: result: $ac_cv_lib_x_opendir" >&5
-+echo "$as_me:10989: result: $ac_cv_lib_x_opendir" >&5
- echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
- if test $ac_cv_lib_x_opendir = yes; then
-   LIBS="$LIBS -lx"
-@@ -10670,13 +10994,13 @@
- 
- fi
- 
--echo "$as_me:10673: checking whether time.h and sys/time.h may both be included" >&5
-+echo "$as_me:10997: checking whether time.h and sys/time.h may both be included" >&5
- echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
- if test "${ac_cv_header_time+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10679 "configure"
-+#line 11003 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/time.h>
-@@ -10692,16 +11016,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:10695: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11019: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:10698: \$? = $ac_status" >&5
-+  echo "$as_me:11022: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:10701: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11025: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10704: \$? = $ac_status" >&5
-+  echo "$as_me:11028: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_header_time=yes
- else
-@@ -10711,7 +11035,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:10714: result: $ac_cv_header_time" >&5
-+echo "$as_me:11038: result: $ac_cv_header_time" >&5
- echo "${ECHO_T}$ac_cv_header_time" >&6
- if test $ac_cv_header_time = yes; then
- 
-@@ -10721,14 +11045,14 @@
- 
- fi
- 
--echo "$as_me:10724: checking for regular-expression headers" >&5
-+echo "$as_me:11048: checking for regular-expression headers" >&5
- echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
- if test "${cf_cv_regex+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 10731 "configure"
-+#line 11055 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <regex.h>
-@@ -10746,16 +11070,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10749: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11073: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10752: \$? = $ac_status" >&5
-+  echo "$as_me:11076: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10755: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11079: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10758: \$? = $ac_status" >&5
-+  echo "$as_me:11082: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_regex="regex.h"
- else
-@@ -10763,7 +11087,7 @@
- cat conftest.$ac_ext >&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 10766 "configure"
-+#line 11090 "configure"
- #include "confdefs.h"
- #include <regexp.h>
- int
-@@ -10778,16 +11102,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10781: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11105: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10784: \$? = $ac_status" >&5
-+  echo "$as_me:11108: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10787: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11111: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10790: \$? = $ac_status" >&5
-+  echo "$as_me:11114: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_regex="regexp.h"
- else
-@@ -10797,7 +11121,7 @@
- 		cf_save_LIBS="$LIBS"
- 		LIBS="-lgen $LIBS"
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 10800 "configure"
-+#line 11124 "configure"
- #include "confdefs.h"
- #include <regexpr.h>
- int
-@@ -10812,16 +11136,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10815: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11139: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10818: \$? = $ac_status" >&5
-+  echo "$as_me:11142: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10821: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11145: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10824: \$? = $ac_status" >&5
-+  echo "$as_me:11148: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_regex="regexpr.h"
- else
-@@ -10837,7 +11161,7 @@
- 
- fi
- 
--echo "$as_me:10840: result: $cf_cv_regex" >&5
-+echo "$as_me:11164: result: $cf_cv_regex" >&5
- echo "${ECHO_T}$cf_cv_regex" >&6
- case $cf_cv_regex in
- 	regex.h)   cat >>confdefs.h <<\EOF
-@@ -10873,23 +11197,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:10876: checking for $ac_header" >&5
-+echo "$as_me:11200: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 10882 "configure"
-+#line 11206 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:10886: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:11210: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:10892: \$? = $ac_status" >&5
-+  echo "$as_me:11216: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -10908,7 +11232,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:10911: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:11235: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -10922,7 +11246,7 @@
- # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
- if test "$ISC" = yes ; then
- 
--echo "$as_me:10925: checking for main in -lcposix" >&5
-+echo "$as_me:11249: checking for main in -lcposix" >&5
- echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6
- if test "${ac_cv_lib_cposix_main+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10930,7 +11254,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lcposix  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 10933 "configure"
-+#line 11257 "configure"
- #include "confdefs.h"
- 
- int
-@@ -10942,16 +11266,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:10945: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11269: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:10948: \$? = $ac_status" >&5
-+  echo "$as_me:11272: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:10951: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11275: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:10954: \$? = $ac_status" >&5
-+  echo "$as_me:11278: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_cposix_main=yes
- else
-@@ -10962,7 +11286,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:10965: result: $ac_cv_lib_cposix_main" >&5
-+echo "$as_me:11289: result: $ac_cv_lib_cposix_main" >&5
- echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6
- if test $ac_cv_lib_cposix_main = yes; then
-   cat >>confdefs.h <<EOF
-@@ -10973,7 +11297,7 @@
- 
- fi
- 
--	echo "$as_me:10976: checking for bzero in -linet" >&5
-+	echo "$as_me:11300: checking for bzero in -linet" >&5
- echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6
- if test "${ac_cv_lib_inet_bzero+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10981,7 +11305,7 @@
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-linet  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
--#line 10984 "configure"
-+#line 11308 "configure"
- #include "confdefs.h"
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -11000,16 +11324,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11003: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11327: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11006: \$? = $ac_status" >&5
-+  echo "$as_me:11330: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11009: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11333: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11012: \$? = $ac_status" >&5
-+  echo "$as_me:11336: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_lib_inet_bzero=yes
- else
-@@ -11020,21 +11344,21 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:11023: result: $ac_cv_lib_inet_bzero" >&5
-+echo "$as_me:11347: result: $ac_cv_lib_inet_bzero" >&5
- echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
- if test $ac_cv_lib_inet_bzero = yes; then
-   LIBS="$LIBS -linet"
- fi
- fi
- 
--echo "$as_me:11030: checking if sys/time.h works with sys/select.h" >&5
-+echo "$as_me:11354: checking if sys/time.h works with sys/select.h" >&5
- echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
- if test "${cf_cv_sys_time_select+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 11037 "configure"
-+#line 11361 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -11054,16 +11378,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11057: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11381: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11060: \$? = $ac_status" >&5
-+  echo "$as_me:11384: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11063: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11387: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11066: \$? = $ac_status" >&5
-+  echo "$as_me:11390: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sys_time_select=yes
- else
-@@ -11075,7 +11399,7 @@
- 
- fi
- 
--echo "$as_me:11078: result: $cf_cv_sys_time_select" >&5
-+echo "$as_me:11402: result: $cf_cv_sys_time_select" >&5
- echo "${ECHO_T}$cf_cv_sys_time_select" >&6
- test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF
- #define HAVE_SYS_TIME_SELECT 1
-@@ -11089,7 +11413,7 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- ac_main_return=return
- 
--echo "$as_me:11092: checking for $CC option to accept ANSI C" >&5
-+echo "$as_me:11416: checking for $CC option to accept ANSI C" >&5
- echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
- if test "${ac_cv_prog_cc_stdc+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -11097,7 +11421,7 @@
-   ac_cv_prog_cc_stdc=no
- ac_save_CC=$CC
- cat >conftest.$ac_ext <<_ACEOF
--#line 11100 "configure"
-+#line 11424 "configure"
- #include "confdefs.h"
- #include <stdarg.h>
- #include <stdio.h>
-@@ -11146,16 +11470,16 @@
- do
-   CC="$ac_save_CC $ac_arg"
-   rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11149: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11473: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11152: \$? = $ac_status" >&5
-+  echo "$as_me:11476: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11155: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11479: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11158: \$? = $ac_status" >&5
-+  echo "$as_me:11482: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_prog_cc_stdc=$ac_arg
- break
-@@ -11172,21 +11496,21 @@
- 
- case "x$ac_cv_prog_cc_stdc" in
-   x|xno)
--    echo "$as_me:11175: result: none needed" >&5
-+    echo "$as_me:11499: result: none needed" >&5
- echo "${ECHO_T}none needed" >&6 ;;
-   *)
--    echo "$as_me:11178: result: $ac_cv_prog_cc_stdc" >&5
-+    echo "$as_me:11502: result: $ac_cv_prog_cc_stdc" >&5
- echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-     CC="$CC $ac_cv_prog_cc_stdc" ;;
- esac
- 
--echo "$as_me:11183: checking for an ANSI C-conforming const" >&5
-+echo "$as_me:11507: checking for an ANSI C-conforming const" >&5
- echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
- if test "${ac_cv_c_const+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11189 "configure"
-+#line 11513 "configure"
- #include "confdefs.h"
- 
- int
-@@ -11244,16 +11568,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11247: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11571: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11250: \$? = $ac_status" >&5
-+  echo "$as_me:11574: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11253: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11577: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11256: \$? = $ac_status" >&5
-+  echo "$as_me:11580: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_const=yes
- else
-@@ -11263,7 +11587,7 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:11266: result: $ac_cv_c_const" >&5
-+echo "$as_me:11590: result: $ac_cv_c_const" >&5
- echo "${ECHO_T}$ac_cv_c_const" >&6
- if test $ac_cv_c_const = no; then
- 
-@@ -11273,7 +11597,7 @@
- 
- fi
- 
--echo "$as_me:11276: checking for inline" >&5
-+echo "$as_me:11600: checking for inline" >&5
- echo $ECHO_N "checking for inline... $ECHO_C" >&6
- if test "${ac_cv_c_inline+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -11281,7 +11605,7 @@
-   ac_cv_c_inline=no
- for ac_kw in inline __inline__ __inline; do
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11284 "configure"
-+#line 11608 "configure"
- #include "confdefs.h"
- #ifndef __cplusplus
- static $ac_kw int static_foo () {return 0; }
-@@ -11290,16 +11614,16 @@
- 
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11293: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11617: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11296: \$? = $ac_status" >&5
-+  echo "$as_me:11620: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11299: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11623: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11302: \$? = $ac_status" >&5
-+  echo "$as_me:11626: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_c_inline=$ac_kw; break
- else
-@@ -11310,7 +11634,7 @@
- done
- 
- fi
--echo "$as_me:11313: result: $ac_cv_c_inline" >&5
-+echo "$as_me:11637: result: $ac_cv_c_inline" >&5
- echo "${ECHO_T}$ac_cv_c_inline" >&6
- case $ac_cv_c_inline in
-   inline | yes) ;;
-@@ -11327,69 +11651,250 @@
- 
- NCURSES_INLINE=
- if test "$ac_cv_c_inline" != no ; then
--	cat >>confdefs.h <<\EOF
--#define CC_HAS_INLINE_FUNCS 1
--EOF
--
--	NCURSES_INLINE=inline
--fi
--
--if test $NCURSES_CHTYPE = auto ; then
--
--echo "$as_me:11339: checking for type of chtype" >&5
--echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
--if test "${cf_cv_typeof_chtype+set}" = set; then
-+  NCURSES_INLINE=inline
-+  if test "$INTEL_COMPILER" = yes
-+  then
-+    :
-+  elif test "$GCC" = yes
-+  then
-+    echo "$as_me:11660: checking if gcc supports options to tune inlining" >&5
-+echo $ECHO_N "checking if gcc supports options to tune inlining... $ECHO_C" >&6
-+if test "${cf_cv_gcc_inline+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
--		if test "$cross_compiling" = yes; then
--  cf_cv_typeof_chtype=long
--else
--  cat >conftest.$ac_ext <<_ACEOF
--#line 11349 "configure"
-+      cf_save_CFLAGS=$CFLAGS
-+      CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
-+      cat >conftest.$ac_ext <<_ACEOF
-+#line 11669 "configure"
- #include "confdefs.h"
--
--#define WANT_BITS 31
--#include <stdio.h>
--int main()
-+inline int foo(void) { return 1; }
-+int
-+main ()
- {
--	FILE *fp = fopen("cf_test.out", "w");
--	if (fp != 0) {
--		char *result = "long";
--		if (sizeof(unsigned long) > sizeof(unsigned int)) {
--			int n;
--			unsigned int x, y;
--			for (n = 0; n < WANT_BITS; n++) {
--				x = (1 << n);
--				y = (x >> n);
--				if (y != 1 || x == 0) {
--					x = 0;
--					break;
--				}
--			}
--			/*
--			 * If x is nonzero, an int is big enough for the bits
--			 * that we want.
--			 */
--			result = (x != 0) ? "int" : "long";
--		}
--		fputs(result, fp);
--		fclose(fp);
--	}
--	${cf_cv_main_return:-return}(0);
-+${cf_cv_main_return:-return} foo()
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:11681: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:11684: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:11687: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:11690: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  cf_cv_gcc_inline=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+cf_cv_gcc_inline=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+      CFLAGS=$cf_save_CFLAGS
-+
-+fi
-+echo "$as_me:11702: result: $cf_cv_gcc_inline" >&5
-+echo "${ECHO_T}$cf_cv_gcc_inline" >&6
-+    if test "$cf_cv_gcc_inline" = yes ; then
-+
-+cf_fix_cppflags=no
-+cf_new_cflags=
-+cf_new_cppflags=
-+cf_new_extra_cppflags=
-+
-+for cf_add_cflags in --param max-inline-insns-single=1200
-+do
-+case $cf_fix_cppflags in
-+no)
-+	case $cf_add_cflags in #(vi
-+	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
-+		case $cf_add_cflags in
-+		-D*)
-+			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
-+
-+			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
-+			&& test -z "${cf_tst_cflags}" \
-+			&& cf_fix_cppflags=yes
-+
-+			if test $cf_fix_cppflags = yes ; then
-+				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
-+				continue
-+			elif test "${cf_tst_cflags}" = "\"'" ; then
-+				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
-+				continue
-+			fi
-+			;;
-+		esac
-+		case "$CPPFLAGS" in
-+		*$cf_add_cflags) #(vi
-+			;;
-+		*) #(vi
-+			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
-+			;;
-+		esac
-+		;;
-+	*)
-+		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
-+		;;
-+	esac
-+	;;
-+yes)
-+	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
-+
-+	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
-+
-+	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
-+	&& test -z "${cf_tst_cflags}" \
-+	&& cf_fix_cppflags=no
-+	;;
-+esac
-+done
-+
-+if test -n "$cf_new_cflags" ; then
-+
-+	CFLAGS="$CFLAGS $cf_new_cflags"
-+fi
-+
-+if test -n "$cf_new_cppflags" ; then
-+
-+	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
-+fi
-+
-+if test -n "$cf_new_extra_cppflags" ; then
-+
-+	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
-+fi
-+
-+    fi
-+  fi
-+fi
-+
-+echo "$as_me:11778: checking for signal global datatype" >&5
-+echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
-+if test "${cf_cv_sig_atomic_t+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+	for cf_type in \
-+		"volatile sig_atomic_t" \
-+		"sig_atomic_t" \
-+		"int"
-+	do
-+	cat >conftest.$ac_ext <<_ACEOF
-+#line 11790 "configure"
-+#include "confdefs.h"
-+
-+#include <sys/types.h>
-+#include <signal.h>
-+#include <stdio.h>
-+
-+extern $cf_type x;
-+$cf_type x;
-+static void handler(int sig)
-+{
-+	x = 5;
-+}
-+int
-+main ()
-+{
-+signal(SIGINT, handler);
-+		 x = 1
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:11813: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:11816: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:11819: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:11822: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  cf_cv_sig_atomic_t=$cf_type
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+cf_cv_sig_atomic_t=no
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+		test "$cf_cv_sig_atomic_t" != no && break
-+	done
-+
-+fi
-+
-+echo "$as_me:11836: result: $cf_cv_sig_atomic_t" >&5
-+echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
-+test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <<EOF
-+#define SIG_ATOMIC_T $cf_cv_sig_atomic_t
-+EOF
-+
-+if test $NCURSES_CHTYPE = auto ; then
-+
-+echo "$as_me:11844: checking for type of chtype" >&5
-+echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
-+if test "${cf_cv_typeof_chtype+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+		if test "$cross_compiling" = yes; then
-+  cf_cv_typeof_chtype=long
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+#line 11854 "configure"
-+#include "confdefs.h"
-+
-+#define WANT_BITS 31
-+#include <stdio.h>
-+int main()
-+{
-+	FILE *fp = fopen("cf_test.out", "w");
-+	if (fp != 0) {
-+		char *result = "long";
-+		if (sizeof(unsigned long) > sizeof(unsigned int)) {
-+			int n;
-+			unsigned int x, y;
-+			for (n = 0; n < WANT_BITS; n++) {
-+				x = (1 << n);
-+				y = (x >> n);
-+				if (y != 1 || x == 0) {
-+					x = 0;
-+					break;
-+				}
-+			}
-+			/*
-+			 * If x is nonzero, an int is big enough for the bits
-+			 * that we want.
-+			 */
-+			result = (x != 0) ? "int" : "long";
-+		}
-+		fputs(result, fp);
-+		fclose(fp);
-+	}
-+	${cf_cv_main_return:-return}(0);
- }
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:11384: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:11889: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11387: \$? = $ac_status" >&5
-+  echo "$as_me:11892: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:11389: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11894: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11392: \$? = $ac_status" >&5
-+  echo "$as_me:11897: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_typeof_chtype=`cat cf_test.out`
- else
-@@ -11404,7 +11909,7 @@
- 
- fi
- 
--echo "$as_me:11407: result: $cf_cv_typeof_chtype" >&5
-+echo "$as_me:11912: result: $cf_cv_typeof_chtype" >&5
- echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
- 
- cat >>confdefs.h <<EOF
-@@ -11414,15 +11919,16 @@
- else
- 	cf_cv_typeof_chtype=$NCURSES_CHTYPE
- fi
-+test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
- 
--echo "$as_me:11418: checking if unsigned literals are legal" >&5
-+echo "$as_me:11924: checking if unsigned literals are legal" >&5
- echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6
- if test "${cf_cv_unsigned_literals+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 11425 "configure"
-+#line 11931 "configure"
- #include "confdefs.h"
- 
- int
-@@ -11434,16 +11940,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11437: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:11943: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11440: \$? = $ac_status" >&5
-+  echo "$as_me:11946: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11443: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:11949: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11446: \$? = $ac_status" >&5
-+  echo "$as_me:11952: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_unsigned_literals=yes
- else
-@@ -11455,29 +11961,30 @@
- 
- fi
- 
--echo "$as_me:11458: result: $cf_cv_unsigned_literals" >&5
-+echo "$as_me:11964: result: $cf_cv_unsigned_literals" >&5
- echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
- 
- cf_cv_1UL="1"
--test "$cf_cv_unsigned_literals" = yes && cf_cv_1UL="${cf_cv_1UL}U"
--test "$cf_cv_typeof_chtype"    = long && cf_cv_1UL="${cf_cv_1UL}L"
-+test ".$cf_cv_unsigned_literals" = .yes && cf_cv_1UL="${cf_cv_1UL}U"
-+test ".$cf_cv_typeof_chtype"    = .long && cf_cv_1UL="${cf_cv_1UL}L"
- 
- if test $NCURSES_MMASK_T = auto ; then
- 	cf_cv_typeof_mmask_t=long
- else
- 	cf_cv_typeof_mmask_t=$NCURSES_MMASK_T
- fi
-+test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
- 
- ###	Checks for external-data
- 
--echo "$as_me:11473: checking if external errno is declared" >&5
-+echo "$as_me:11980: checking if external errno is declared" >&5
- echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
- if test "${cf_cv_dcl_errno+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-     cat >conftest.$ac_ext <<_ACEOF
--#line 11480 "configure"
-+#line 11987 "configure"
- #include "confdefs.h"
- 
- #ifdef HAVE_STDLIB_H
-@@ -11495,16 +12002,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11498: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12005: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11501: \$? = $ac_status" >&5
-+  echo "$as_me:12008: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11504: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12011: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11507: \$? = $ac_status" >&5
-+  echo "$as_me:12014: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_dcl_errno=yes
- else
-@@ -11515,7 +12022,7 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- 
- fi
--echo "$as_me:11518: result: $cf_cv_dcl_errno" >&5
-+echo "$as_me:12025: result: $cf_cv_dcl_errno" >&5
- echo "${ECHO_T}$cf_cv_dcl_errno" >&6
- 
- if test "$cf_cv_dcl_errno" = no ; then
-@@ -11530,14 +12037,14 @@
- 
- # It's possible (for near-UNIX clones) that the data doesn't exist
- 
--echo "$as_me:11533: checking if external errno exists" >&5
-+echo "$as_me:12040: checking if external errno exists" >&5
- echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
- if test "${cf_cv_have_errno+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
-     cat >conftest.$ac_ext <<_ACEOF
--#line 11540 "configure"
-+#line 12047 "configure"
- #include "confdefs.h"
- 
- #undef errno
-@@ -11552,16 +12059,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11555: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12062: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11558: \$? = $ac_status" >&5
-+  echo "$as_me:12065: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11561: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12068: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11564: \$? = $ac_status" >&5
-+  echo "$as_me:12071: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_errno=yes
- else
-@@ -11572,7 +12079,7 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:11575: result: $cf_cv_have_errno" >&5
-+echo "$as_me:12082: result: $cf_cv_have_errno" >&5
- echo "${ECHO_T}$cf_cv_have_errno" >&6
- 
- if test "$cf_cv_have_errno" = yes ; then
-@@ -11585,7 +12092,7 @@
- 
- fi
- 
--echo "$as_me:11588: checking if data-only library module links" >&5
-+echo "$as_me:12095: checking if data-only library module links" >&5
- echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
- if test "${cf_cv_link_dataonly+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -11593,20 +12100,20 @@
- 
- 	rm -f conftest.a
- 	cat >conftest.$ac_ext <<EOF
--#line 11596 "configure"
-+#line 12103 "configure"
- int	testdata[3] = { 123, 456, 789 };
- EOF
--	if { (eval echo "$as_me:11599: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:12106: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11602: \$? = $ac_status" >&5
-+  echo "$as_me:12109: \$? = $ac_status" >&5
-   (exit $ac_status); } ; then
- 		mv conftest.o data.o && \
- 		( $AR $AR_OPTS conftest.a data.o ) 2>&5 1>/dev/null
- 	fi
- 	rm -f conftest.$ac_ext data.o
- 	cat >conftest.$ac_ext <<EOF
--#line 11609 "configure"
-+#line 12116 "configure"
- int	testfunc()
- {
- #if defined(NeXT)
-@@ -11619,10 +12126,10 @@
- #endif
- }
- EOF
--	if { (eval echo "$as_me:11622: \"$ac_compile\"") >&5
-+	if { (eval echo "$as_me:12129: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11625: \$? = $ac_status" >&5
-+  echo "$as_me:12132: \$? = $ac_status" >&5
-   (exit $ac_status); }; then
- 		mv conftest.o func.o && \
- 		( $AR $AR_OPTS conftest.a func.o ) 2>&5 1>/dev/null
-@@ -11635,7 +12142,7 @@
-   cf_cv_link_dataonly=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11638 "configure"
-+#line 12145 "configure"
- #include "confdefs.h"
- 
- 	int main()
-@@ -11646,15 +12153,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:11649: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12156: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11652: \$? = $ac_status" >&5
-+  echo "$as_me:12159: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:11654: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12161: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11657: \$? = $ac_status" >&5
-+  echo "$as_me:12164: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_link_dataonly=yes
- else
-@@ -11669,7 +12176,7 @@
- 
- fi
- 
--echo "$as_me:11672: result: $cf_cv_link_dataonly" >&5
-+echo "$as_me:12179: result: $cf_cv_link_dataonly" >&5
- echo "${ECHO_T}$cf_cv_link_dataonly" >&6
- 
- if test "$cf_cv_link_dataonly" = no ; then
-@@ -11704,13 +12211,13 @@
- 
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:11707: checking for $ac_func" >&5
-+echo "$as_me:12214: checking for $ac_func" >&5
- echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
- if eval "test \"\${$as_ac_var+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11713 "configure"
-+#line 12220 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func (); below.  */
-@@ -11741,16 +12248,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11744: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12251: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11747: \$? = $ac_status" >&5
-+  echo "$as_me:12254: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11750: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12257: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11753: \$? = $ac_status" >&5
-+  echo "$as_me:12260: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   eval "$as_ac_var=yes"
- else
-@@ -11760,7 +12267,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:11763: result: `eval echo '${'$as_ac_var'}'`" >&5
-+echo "$as_me:12270: result: `eval echo '${'$as_ac_var'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
- if test `eval echo '${'$as_ac_var'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -11772,14 +12279,14 @@
- 
- if test "$with_getcap" = "yes" ; then
- 
--echo "$as_me:11775: checking for terminal-capability database functions" >&5
-+echo "$as_me:12282: checking for terminal-capability database functions" >&5
- echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6
- if test "${cf_cv_cgetent+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 11782 "configure"
-+#line 12289 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -11799,16 +12306,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11802: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12309: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11805: \$? = $ac_status" >&5
-+  echo "$as_me:12312: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11808: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12315: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11811: \$? = $ac_status" >&5
-+  echo "$as_me:12318: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cgetent=yes
- else
-@@ -11820,7 +12327,7 @@
- 
- fi
- 
--echo "$as_me:11823: result: $cf_cv_cgetent" >&5
-+echo "$as_me:12330: result: $cf_cv_cgetent" >&5
- echo "${ECHO_T}$cf_cv_cgetent" >&6
- test "$cf_cv_cgetent" = yes && cat >>confdefs.h <<\EOF
- #define HAVE_BSD_CGETENT 1
-@@ -11828,14 +12335,14 @@
- 
- fi
- 
--echo "$as_me:11831: checking for isascii" >&5
-+echo "$as_me:12338: checking for isascii" >&5
- echo $ECHO_N "checking for isascii... $ECHO_C" >&6
- if test "${cf_cv_have_isascii+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 11838 "configure"
-+#line 12345 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- int
-@@ -11847,16 +12354,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:11850: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12357: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11853: \$? = $ac_status" >&5
-+  echo "$as_me:12360: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:11856: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12363: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11859: \$? = $ac_status" >&5
-+  echo "$as_me:12366: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_isascii=yes
- else
-@@ -11867,17 +12374,17 @@
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 
- fi
--echo "$as_me:11870: result: $cf_cv_have_isascii" >&5
-+echo "$as_me:12377: result: $cf_cv_have_isascii" >&5
- echo "${ECHO_T}$cf_cv_have_isascii" >&6
- test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF
- #define HAVE_ISASCII 1
- EOF
- 
- if test "$ac_cv_func_sigaction" = yes; then
--echo "$as_me:11877: checking whether sigaction needs _POSIX_SOURCE" >&5
-+echo "$as_me:12384: checking whether sigaction needs _POSIX_SOURCE" >&5
- echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
- cat >conftest.$ac_ext <<_ACEOF
--#line 11880 "configure"
-+#line 12387 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -11891,16 +12398,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11894: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12401: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11897: \$? = $ac_status" >&5
-+  echo "$as_me:12404: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11900: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12407: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11903: \$? = $ac_status" >&5
-+  echo "$as_me:12410: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   sigact_bad=no
- else
-@@ -11908,7 +12415,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 11911 "configure"
-+#line 12418 "configure"
- #include "confdefs.h"
- 
- #define _POSIX_SOURCE
-@@ -11923,16 +12430,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:11926: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12433: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:11929: \$? = $ac_status" >&5
-+  echo "$as_me:12436: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:11932: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12439: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11935: \$? = $ac_status" >&5
-+  echo "$as_me:12442: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   sigact_bad=yes
- 	 cat >>confdefs.h <<\EOF
-@@ -11947,11 +12454,11 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:11950: result: $sigact_bad" >&5
-+echo "$as_me:12457: result: $sigact_bad" >&5
- echo "${ECHO_T}$sigact_bad" >&6
- fi
- 
--echo "$as_me:11954: checking if nanosleep really works" >&5
-+echo "$as_me:12461: checking if nanosleep really works" >&5
- echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6
- if test "${cf_cv_func_nanosleep+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -11961,7 +12468,7 @@
-   cf_cv_func_nanosleep=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 11964 "configure"
-+#line 12471 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -11986,15 +12493,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:11989: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12496: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:11992: \$? = $ac_status" >&5
-+  echo "$as_me:12499: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:11994: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12501: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:11997: \$? = $ac_status" >&5
-+  echo "$as_me:12504: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_nanosleep=yes
- else
-@@ -12006,7 +12513,7 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:12009: result: $cf_cv_func_nanosleep" >&5
-+echo "$as_me:12516: result: $cf_cv_func_nanosleep" >&5
- echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
- 
- test "$cf_cv_func_nanosleep" = "yes" && cat >>confdefs.h <<\EOF
-@@ -12020,23 +12527,23 @@
- 
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:12023: checking for $ac_header" >&5
-+echo "$as_me:12530: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12029 "configure"
-+#line 12536 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:12033: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:12540: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:12039: \$? = $ac_status" >&5
-+  echo "$as_me:12546: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -12055,7 +12562,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:12058: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:12565: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -12070,23 +12577,23 @@
- for ac_header in sys/termio.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:12073: checking for $ac_header" >&5
-+echo "$as_me:12580: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12079 "configure"
-+#line 12586 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:12083: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:12590: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:12089: \$? = $ac_status" >&5
-+  echo "$as_me:12596: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -12105,7 +12612,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:12108: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:12615: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -12123,10 +12630,10 @@
- 	*)	termios_bad=maybe ;;
- 	esac
- 	if test "$termios_bad" = maybe ; then
--	echo "$as_me:12126: checking whether termios.h needs _POSIX_SOURCE" >&5
-+	echo "$as_me:12633: checking whether termios.h needs _POSIX_SOURCE" >&5
- echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 12129 "configure"
-+#line 12636 "configure"
- #include "confdefs.h"
- #include <termios.h>
- int
-@@ -12138,16 +12645,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12141: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12648: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12144: \$? = $ac_status" >&5
-+  echo "$as_me:12651: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12147: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12654: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12150: \$? = $ac_status" >&5
-+  echo "$as_me:12657: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   termios_bad=no
- else
-@@ -12155,7 +12662,7 @@
- cat conftest.$ac_ext >&5
- 
- 		cat >conftest.$ac_ext <<_ACEOF
--#line 12158 "configure"
-+#line 12665 "configure"
- #include "confdefs.h"
- 
- #define _POSIX_SOURCE
-@@ -12169,16 +12676,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12172: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:12679: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12175: \$? = $ac_status" >&5
-+  echo "$as_me:12682: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12178: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12685: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12181: \$? = $ac_status" >&5
-+  echo "$as_me:12688: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   termios_bad=unknown
- else
-@@ -12193,19 +12700,19 @@
- 
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
--	echo "$as_me:12196: result: $termios_bad" >&5
-+	echo "$as_me:12703: result: $termios_bad" >&5
- echo "${ECHO_T}$termios_bad" >&6
- 	fi
- fi
- 
--echo "$as_me:12201: checking for tcgetattr" >&5
-+echo "$as_me:12708: checking for tcgetattr" >&5
- echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6
- if test "${cf_cv_have_tcgetattr+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 12208 "configure"
-+#line 12715 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -12233,16 +12740,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12236: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12743: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12239: \$? = $ac_status" >&5
-+  echo "$as_me:12746: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12242: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12749: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12245: \$? = $ac_status" >&5
-+  echo "$as_me:12752: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_have_tcgetattr=yes
- else
-@@ -12252,20 +12759,20 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:12255: result: $cf_cv_have_tcgetattr" >&5
-+echo "$as_me:12762: result: $cf_cv_have_tcgetattr" >&5
- echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6
- test "$cf_cv_have_tcgetattr" = yes && cat >>confdefs.h <<\EOF
- #define HAVE_TCGETATTR 1
- EOF
- 
--echo "$as_me:12261: checking for vsscanf function or workaround" >&5
-+echo "$as_me:12768: checking for vsscanf function or workaround" >&5
- echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6
- if test "${cf_cv_func_vsscanf+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 12268 "configure"
-+#line 12775 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -12281,16 +12788,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12284: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12791: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12287: \$? = $ac_status" >&5
-+  echo "$as_me:12794: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12290: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12797: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12293: \$? = $ac_status" >&5
-+  echo "$as_me:12800: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=vsscanf
- else
-@@ -12298,7 +12805,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 12301 "configure"
-+#line 12808 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -12320,16 +12827,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12323: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12830: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12326: \$? = $ac_status" >&5
-+  echo "$as_me:12833: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12329: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12836: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12332: \$? = $ac_status" >&5
-+  echo "$as_me:12839: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=vfscanf
- else
-@@ -12337,7 +12844,7 @@
- cat conftest.$ac_ext >&5
- 
- cat >conftest.$ac_ext <<_ACEOF
--#line 12340 "configure"
-+#line 12847 "configure"
- #include "confdefs.h"
- 
- #include <stdarg.h>
-@@ -12359,16 +12866,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12362: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12869: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12365: \$? = $ac_status" >&5
-+  echo "$as_me:12872: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12368: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12875: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12371: \$? = $ac_status" >&5
-+  echo "$as_me:12878: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_vsscanf=_doscan
- else
-@@ -12383,7 +12890,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:12386: result: $cf_cv_func_vsscanf" >&5
-+echo "$as_me:12893: result: $cf_cv_func_vsscanf" >&5
- echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
- 
- case $cf_cv_func_vsscanf in #(vi
-@@ -12401,7 +12908,7 @@
- ;;
- esac
- 
--echo "$as_me:12404: checking for working mkstemp" >&5
-+echo "$as_me:12911: checking for working mkstemp" >&5
- echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
- if test "${cf_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12409,13 +12916,13 @@
- 
- rm -f conftest*
- if test "$cross_compiling" = yes; then
--  echo "$as_me:12412: checking for mkstemp" >&5
-+  echo "$as_me:12919: checking for mkstemp" >&5
- echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
- if test "${ac_cv_func_mkstemp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12418 "configure"
-+#line 12925 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char mkstemp (); below.  */
-@@ -12446,16 +12953,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12449: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:12956: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12452: \$? = $ac_status" >&5
-+  echo "$as_me:12959: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12455: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:12962: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12458: \$? = $ac_status" >&5
-+  echo "$as_me:12965: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_mkstemp=yes
- else
-@@ -12465,12 +12972,12 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:12468: result: $ac_cv_func_mkstemp" >&5
-+echo "$as_me:12975: result: $ac_cv_func_mkstemp" >&5
- echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12473 "configure"
-+#line 12980 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -12508,15 +13015,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:12511: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13018: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12514: \$? = $ac_status" >&5
-+  echo "$as_me:13021: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:12516: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13023: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12519: \$? = $ac_status" >&5
-+  echo "$as_me:13026: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_func_mkstemp=yes
- 
-@@ -12531,7 +13038,7 @@
- fi
- 
- fi
--echo "$as_me:12534: result: $cf_cv_func_mkstemp" >&5
-+echo "$as_me:13041: result: $cf_cv_func_mkstemp" >&5
- echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
- if test "$cf_cv_func_mkstemp" = yes ; then
- 	cat >>confdefs.h <<\EOF
-@@ -12549,21 +13056,21 @@
- fi
- 
- if test "$cross_compiling" = yes ; then
--	{ echo "$as_me:12552: WARNING: cross compiling: assume setvbuf params not reversed" >&5
-+	{ echo "$as_me:13059: WARNING: cross compiling: assume setvbuf params not reversed" >&5
- echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;}
- else
--	echo "$as_me:12555: checking whether setvbuf arguments are reversed" >&5
-+	echo "$as_me:13062: checking whether setvbuf arguments are reversed" >&5
- echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
- if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   if test "$cross_compiling" = yes; then
--  { { echo "$as_me:12561: error: cannot run test program while cross compiling" >&5
-+  { { echo "$as_me:13068: error: cannot run test program while cross compiling" >&5
- echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-    { (exit 1); exit 1; }; }
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12566 "configure"
-+#line 13073 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- /* If setvbuf has the reversed format, exit 0. */
-@@ -12580,15 +13087,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:12583: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13090: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12586: \$? = $ac_status" >&5
-+  echo "$as_me:13093: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:12588: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13095: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12591: \$? = $ac_status" >&5
-+  echo "$as_me:13098: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_setvbuf_reversed=yes
- else
-@@ -12601,7 +13108,7 @@
- fi
- rm -f core core.* *.core
- fi
--echo "$as_me:12604: result: $ac_cv_func_setvbuf_reversed" >&5
-+echo "$as_me:13111: result: $ac_cv_func_setvbuf_reversed" >&5
- echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
- if test $ac_cv_func_setvbuf_reversed = yes; then
- 
-@@ -12612,13 +13119,13 @@
- fi
- 
- fi
--echo "$as_me:12615: checking return type of signal handlers" >&5
-+echo "$as_me:13122: checking return type of signal handlers" >&5
- echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
- if test "${ac_cv_type_signal+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12621 "configure"
-+#line 13128 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <signal.h>
-@@ -12640,16 +13147,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12643: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13150: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12646: \$? = $ac_status" >&5
-+  echo "$as_me:13153: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12649: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13156: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12652: \$? = $ac_status" >&5
-+  echo "$as_me:13159: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_type_signal=void
- else
-@@ -12659,21 +13166,21 @@
- fi
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:12662: result: $ac_cv_type_signal" >&5
-+echo "$as_me:13169: result: $ac_cv_type_signal" >&5
- echo "${ECHO_T}$ac_cv_type_signal" >&6
- 
- cat >>confdefs.h <<EOF
- #define RETSIGTYPE $ac_cv_type_signal
- EOF
- 
--echo "$as_me:12669: checking for type sigaction_t" >&5
-+echo "$as_me:13176: checking for type sigaction_t" >&5
- echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6
- if test "${cf_cv_type_sigaction+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 12676 "configure"
-+#line 13183 "configure"
- #include "confdefs.h"
- 
- #include <signal.h>
-@@ -12686,16 +13193,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12689: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13196: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12692: \$? = $ac_status" >&5
-+  echo "$as_me:13199: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12695: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13202: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12698: \$? = $ac_status" >&5
-+  echo "$as_me:13205: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_sigaction=yes
- else
-@@ -12706,13 +13213,13 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- fi
- 
--echo "$as_me:12709: result: $cf_cv_type_sigaction" >&5
-+echo "$as_me:13216: result: $cf_cv_type_sigaction" >&5
- echo "${ECHO_T}$cf_cv_type_sigaction" >&6
- test "$cf_cv_type_sigaction" = yes && cat >>confdefs.h <<\EOF
- #define HAVE_TYPE_SIGACTION 1
- EOF
- 
--echo "$as_me:12715: checking declaration of size-change" >&5
-+echo "$as_me:13222: checking declaration of size-change" >&5
- echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6
- if test "${cf_cv_sizechange+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12727,7 +13234,7 @@
-     CPPFLAGS="$cf_save_CPPFLAGS"
-     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
-     cat >conftest.$ac_ext <<_ACEOF
--#line 12730 "configure"
-+#line 13237 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #ifdef HAVE_TERMIOS_H
-@@ -12771,16 +13278,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:12774: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13281: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:12777: \$? = $ac_status" >&5
-+  echo "$as_me:13284: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:12780: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13287: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12783: \$? = $ac_status" >&5
-+  echo "$as_me:13290: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_sizechange=yes
- else
-@@ -12799,7 +13306,7 @@
- done
- 
- fi
--echo "$as_me:12802: result: $cf_cv_sizechange" >&5
-+echo "$as_me:13309: result: $cf_cv_sizechange" >&5
- echo "${ECHO_T}$cf_cv_sizechange" >&6
- if test "$cf_cv_sizechange" != no ; then
- 	cat >>confdefs.h <<\EOF
-@@ -12816,13 +13323,13 @@
- 	esac
- fi
- 
--echo "$as_me:12819: checking for memmove" >&5
-+echo "$as_me:13326: checking for memmove" >&5
- echo $ECHO_N "checking for memmove... $ECHO_C" >&6
- if test "${ac_cv_func_memmove+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12825 "configure"
-+#line 13332 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char memmove (); below.  */
-@@ -12853,16 +13360,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12856: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13363: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12859: \$? = $ac_status" >&5
-+  echo "$as_me:13366: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12862: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13369: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12865: \$? = $ac_status" >&5
-+  echo "$as_me:13372: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_memmove=yes
- else
-@@ -12872,19 +13379,19 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:12875: result: $ac_cv_func_memmove" >&5
-+echo "$as_me:13382: result: $ac_cv_func_memmove" >&5
- echo "${ECHO_T}$ac_cv_func_memmove" >&6
- if test $ac_cv_func_memmove = yes; then
-   :
- else
- 
--echo "$as_me:12881: checking for bcopy" >&5
-+echo "$as_me:13388: checking for bcopy" >&5
- echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
- if test "${ac_cv_func_bcopy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12887 "configure"
-+#line 13394 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char bcopy (); below.  */
-@@ -12915,16 +13422,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:12918: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13425: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12921: \$? = $ac_status" >&5
-+  echo "$as_me:13428: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:12924: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13431: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12927: \$? = $ac_status" >&5
-+  echo "$as_me:13434: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   ac_cv_func_bcopy=yes
- else
-@@ -12934,11 +13441,11 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- fi
--echo "$as_me:12937: result: $ac_cv_func_bcopy" >&5
-+echo "$as_me:13444: result: $ac_cv_func_bcopy" >&5
- echo "${ECHO_T}$ac_cv_func_bcopy" >&6
- if test $ac_cv_func_bcopy = yes; then
- 
--	echo "$as_me:12941: checking if bcopy does overlapping moves" >&5
-+	echo "$as_me:13448: checking if bcopy does overlapping moves" >&5
- echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6
- if test "${cf_cv_good_bcopy+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12948,7 +13455,7 @@
-   cf_cv_good_bcopy=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 12951 "configure"
-+#line 13458 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -12962,15 +13469,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:12965: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13472: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:12968: \$? = $ac_status" >&5
-+  echo "$as_me:13475: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:12970: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13477: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:12973: \$? = $ac_status" >&5
-+  echo "$as_me:13480: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_good_bcopy=yes
- else
-@@ -12983,7 +13490,7 @@
- fi
- 
- fi
--echo "$as_me:12986: result: $cf_cv_good_bcopy" >&5
-+echo "$as_me:13493: result: $cf_cv_good_bcopy" >&5
- echo "${ECHO_T}$cf_cv_good_bcopy" >&6
- 
- else
-@@ -13004,7 +13511,7 @@
- 
- fi
- 
--echo "$as_me:13007: checking if poll really works" >&5
-+echo "$as_me:13514: checking if poll really works" >&5
- echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
- if test "${cf_cv_working_poll+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13014,7 +13521,7 @@
-   cf_cv_working_poll=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13017 "configure"
-+#line 13524 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -13035,15 +13542,15 @@
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:13038: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:13545: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13041: \$? = $ac_status" >&5
-+  echo "$as_me:13548: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:13043: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13550: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13046: \$? = $ac_status" >&5
-+  echo "$as_me:13553: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_working_poll=yes
- else
-@@ -13055,34 +13562,276 @@
- rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- fi
--echo "$as_me:13058: result: $cf_cv_working_poll" >&5
-+echo "$as_me:13565: result: $cf_cv_working_poll" >&5
- echo "${ECHO_T}$cf_cv_working_poll" >&6
- test "$cf_cv_working_poll" = "yes" && cat >>confdefs.h <<\EOF
- #define HAVE_WORKING_POLL 1
- EOF
- 
-+# special check for test/ditto.c
-+
-+echo "$as_me:13573: checking for openpty in -lutil" >&5
-+echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
-+if test "${ac_cv_lib_util_openpty+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lutil  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+#line 13581 "configure"
-+#include "confdefs.h"
-+
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char openpty ();
-+int
-+main ()
-+{
-+openpty ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:13600: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:13603: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:13606: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:13609: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_util_openpty=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+ac_cv_lib_util_openpty=no
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:13620: result: $ac_cv_lib_util_openpty" >&5
-+echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
-+if test $ac_cv_lib_util_openpty = yes; then
-+  cf_cv_lib_util=yes
-+else
-+  cf_cv_lib_util=no
-+fi
-+
-+echo "$as_me:13628: checking for openpty header" >&5
-+echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
-+if test "${cf_cv_func_openpty+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+    cf_save_LIBS="$LIBS"
-+    test $cf_cv_lib_util = yes && LIBS="-lutil $LIBS"
-+    for cf_header in pty.h libutil.h util.h
-+    do
-+    cat >conftest.$ac_ext <<_ACEOF
-+#line 13639 "configure"
-+#include "confdefs.h"
-+
-+#include <$cf_header>
-+
-+int
-+main ()
-+{
-+
-+    int x = openpty((int *)0, (int *)0, (char *)0,
-+                   (struct termios *)0, (struct winsize *)0);
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:13656: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>&5
-+  ac_status=$?
-+  echo "$as_me:13659: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:13662: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:13665: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+
-+        cf_cv_func_openpty=$cf_header
-+        break
-+
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+
-+        cf_cv_func_openpty=no
-+
-+fi
-+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+    done
-+    LIBS="$cf_save_LIBS"
-+
-+fi
-+echo "$as_me:13683: result: $cf_cv_func_openpty" >&5
-+echo "${ECHO_T}$cf_cv_func_openpty" >&6
-+
-+if test "$cf_cv_func_openpty" != no ; then
-+    cat >>confdefs.h <<EOF
-+#define USE_OPENPTY_HEADER <$cf_cv_func_openpty>
-+EOF
-+
-+    cat >>confdefs.h <<\EOF
-+#define USE_XTERM_PTY 1
-+EOF
-+
-+    if test "$cf_cv_lib_util" = yes ; then
-+        TEST_LIBS="-lutil $TEST_LIBS"
-+    fi
-+fi
-+
- if test "$with_hashed_db" != no ; then
- 	cat >>confdefs.h <<\EOF
- #define USE_HASHED_DB 1
- EOF
- 
--echo "$as_me:13069: checking for db.h" >&5
-+case $with_hashed_db in #(vi
-+yes|*able*) #(vi
-+    ;;
-+*)
-+    if test -d "$with_hashed_db" ; then
-+
-+if test -n "$with_hashed_db/include" ; then
-+  for cf_add_incdir in $with_hashed_db/include
-+  do
-+	while test $cf_add_incdir != /usr/include
-+	do
-+	  if test -d $cf_add_incdir
-+	  then
-+		cf_have_incdir=no
-+		if test -n "$CFLAGS$CPPFLAGS" ; then
-+		  # a loop is needed to ensure we can add subdirs of existing dirs
-+		  for cf_test_incdir in $CFLAGS $CPPFLAGS ; do
-+			if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then
-+			  cf_have_incdir=yes; break
-+			fi
-+		  done
-+		fi
-+
-+		if test "$cf_have_incdir" = no ; then
-+          if test "$cf_add_incdir" = /usr/local/include ; then
-+			if test "$GCC" = yes
-+			then
-+			  cf_save_CPPFLAGS=$CPPFLAGS
-+			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
-+			  cat >conftest.$ac_ext <<_ACEOF
-+#line 13735 "configure"
-+#include "confdefs.h"
-+#include <stdio.h>
-+int
-+main ()
-+{
-+printf("Hello")
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (eval echo "$as_me:13747: \"$ac_compile\"") >&5
-+  (eval $ac_compile) 2>&5
-+  ac_status=$?
-+  echo "$as_me:13750: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+         { ac_try='test -s conftest.$ac_objext'
-+  { (eval echo "$as_me:13753: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:13756: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  :
-+else
-+  echo "$as_me: failed program was:" >&5
-+cat conftest.$ac_ext >&5
-+cf_have_incdir=yes
-+fi
-+rm -f conftest.$ac_objext conftest.$ac_ext
-+			  CPPFLAGS=$cf_save_CPPFLAGS
-+			fi
-+		  fi
-+		fi
-+
-+		if test "$cf_have_incdir" = no ; then
-+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
-+
-+echo "${as_me-configure}:13773: testing adding $cf_add_incdir to include-path ..." 1>&5
-+
-+		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
-+
-+          cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
-+          test "$cf_top_incdir" = "$cf_add_incdir" && break
-+          cf_add_incdir="$cf_top_incdir"
-+		else
-+		  break
-+		fi
-+	  fi
-+	done
-+  done
-+fi
-+
-+if test -n "$with_hashed_db/lib" ; then
-+  for cf_add_libdir in $with_hashed_db/lib
-+  do
-+    if test $cf_add_libdir = /usr/lib ; then
-+      :
-+    elif test -d $cf_add_libdir
-+    then
-+      cf_have_libdir=no
-+      if test -n "$LDFLAGS$LIBS" ; then
-+        # a loop is needed to ensure we can add subdirs of existing dirs
-+        for cf_test_libdir in $LDFLAGS $LIBS ; do
-+          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-+            cf_have_libdir=yes; break
-+          fi
-+        done
-+      fi
-+      if test "$cf_have_libdir" = no ; then
-+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
-+
-+echo "${as_me-configure}:13807: testing adding $cf_add_libdir to library-path ..." 1>&5
-+
-+        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-+      fi
-+    fi
-+  done
-+fi
-+
-+    fi
-+esac
-+
-+echo "$as_me:13818: checking for db.h" >&5
- echo $ECHO_N "checking for db.h... $ECHO_C" >&6
- if test "${ac_cv_header_db_h+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13075 "configure"
-+#line 13824 "configure"
- #include "confdefs.h"
- #include <db.h>
- _ACEOF
--if { (eval echo "$as_me:13079: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:13828: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:13085: \$? = $ac_status" >&5
-+  echo "$as_me:13834: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_c_preproc_warn_flag
-@@ -13101,11 +13850,11 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:13104: result: $ac_cv_header_db_h" >&5
-+echo "$as_me:13853: result: $ac_cv_header_db_h" >&5
- echo "${ECHO_T}$ac_cv_header_db_h" >&6
- if test $ac_cv_header_db_h = yes; then
- 
--echo "$as_me:13108: checking for version of db" >&5
-+echo "$as_me:13857: checking for version of db" >&5
- echo $ECHO_N "checking for version of db... $ECHO_C" >&6
- if test "${cf_cv_hashed_db_version+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13113,13 +13862,13 @@
- 
- cf_cv_hashed_db_version=unknown
- 
--for cf_db_version in 1 2 3 4
-+for cf_db_version in 1 2 3 4 5
- do
- 
--echo "(line 13119) testing checking for db version $cf_db_version ..." 1>&5
-+echo "${as_me-configure}:13868: testing checking for db version $cf_db_version ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 13122 "configure"
-+#line 13871 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -13149,16 +13898,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13152: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:13901: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13155: \$? = $ac_status" >&5
-+  echo "$as_me:13904: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13158: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:13907: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13161: \$? = $ac_status" >&5
-+  echo "$as_me:13910: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	cf_cv_hashed_db_version=$cf_db_version
-@@ -13172,33 +13921,33 @@
- done
- 
- fi
--echo "$as_me:13175: result: $cf_cv_hashed_db_version" >&5
-+echo "$as_me:13924: result: $cf_cv_hashed_db_version" >&5
- echo "${ECHO_T}$cf_cv_hashed_db_version" >&6
- 
- if test "$cf_cv_hashed_db_version" = unknown ; then
--	{ { echo "$as_me:13179: error: Cannot determine version of db" >&5
-+	{ { echo "$as_me:13928: error: Cannot determine version of db" >&5
- echo "$as_me: error: Cannot determine version of db" >&2;}
-    { (exit 1); exit 1; }; }
- else
- 
--echo "$as_me:13184: checking for db libraries" >&5
-+echo "$as_me:13933: checking for db libraries" >&5
- echo $ECHO_N "checking for db libraries... $ECHO_C" >&6
- if test "${cf_cv_hashed_db_libs+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- 
- cf_cv_hashed_db_libs=unknown
--for cf_db_libs in db$cf_cv_hashed_db_version db ''
-+for cf_db_libs in db$cf_cv_hashed_db_version db-$cf_cv_hashed_db_version db ''
- do
- 	cf_save_libs="$LIBS"
- 	if test -n "$cf_db_libs"; then
- 		LIBS="-l$cf_db_libs $LIBS"
- 	fi
- 
--echo "(line 13198) testing checking for library "$cf_db_libs" ..." 1>&5
-+echo "${as_me-configure}:13947: testing checking for library "$cf_db_libs" ..." 1>&5
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 13201 "configure"
-+#line 13950 "configure"
- #include "confdefs.h"
- 
- $ac_includes_default
-@@ -13253,16 +14002,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13256: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14005: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13259: \$? = $ac_status" >&5
-+  echo "$as_me:14008: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13262: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14011: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13265: \$? = $ac_status" >&5
-+  echo "$as_me:14014: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	if test -n "$cf_db_libs" ; then
-@@ -13282,11 +14031,11 @@
- done
- 
- fi
--echo "$as_me:13285: result: $cf_cv_hashed_db_libs" >&5
-+echo "$as_me:14034: result: $cf_cv_hashed_db_libs" >&5
- echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6
- 
- 	if test "$cf_cv_hashed_db_libs" = unknown ; then
--		{ { echo "$as_me:13289: error: Cannot determine library for db" >&5
-+		{ { echo "$as_me:14038: error: Cannot determine library for db" >&5
- echo "$as_me: error: Cannot determine library for db" >&2;}
-    { (exit 1); exit 1; }; }
- 	elif test "$cf_cv_hashed_db_libs" != default ; then
-@@ -13296,7 +14045,7 @@
- 
- else
- 
--	{ { echo "$as_me:13299: error: Cannot find db.h" >&5
-+	{ { echo "$as_me:14048: error: Cannot find db.h" >&5
- echo "$as_me: error: Cannot find db.h" >&2;}
-    { (exit 1); exit 1; }; }
- 
-@@ -13311,7 +14060,7 @@
- 
- # Just in case, check if the C compiler has a bool type.
- 
--echo "$as_me:13314: checking if we should include stdbool.h" >&5
-+echo "$as_me:14063: checking if we should include stdbool.h" >&5
- echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
- 
- if test "${cf_cv_header_stdbool_h+set}" = set; then
-@@ -13319,7 +14068,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 13322 "configure"
-+#line 14071 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13331,23 +14080,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13334: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14083: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13337: \$? = $ac_status" >&5
-+  echo "$as_me:14086: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13340: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14089: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13343: \$? = $ac_status" >&5
-+  echo "$as_me:14092: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=0
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 13350 "configure"
-+#line 14099 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -13363,16 +14112,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13366: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14115: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13369: \$? = $ac_status" >&5
-+  echo "$as_me:14118: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13372: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14121: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13375: \$? = $ac_status" >&5
-+  echo "$as_me:14124: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=1
- else
-@@ -13386,13 +14135,13 @@
- fi
- 
- if test "$cf_cv_header_stdbool_h" = 1
--then	echo "$as_me:13389: result: yes" >&5
-+then	echo "$as_me:14138: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:13391: result: no" >&5
-+else	echo "$as_me:14140: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:13395: checking for builtin bool type" >&5
-+echo "$as_me:14144: checking for builtin bool type" >&5
- echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
- 
- if test "${cf_cv_cc_bool_type+set}" = set; then
-@@ -13400,7 +14149,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 13403 "configure"
-+#line 14152 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -13415,16 +14164,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13418: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14167: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13421: \$? = $ac_status" >&5
-+  echo "$as_me:14170: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13424: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14173: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13427: \$? = $ac_status" >&5
-+  echo "$as_me:14176: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cc_bool_type=1
- else
-@@ -13437,9 +14186,9 @@
- fi
- 
- if test "$cf_cv_cc_bool_type" = 1
--then	echo "$as_me:13440: result: yes" >&5
-+then	echo "$as_me:14189: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:13442: result: no" >&5
-+else	echo "$as_me:14191: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -13461,7 +14210,7 @@
- 	cf_stdcpp_libname=stdc++
- 	;;
- esac
--echo "$as_me:13464: checking for library $cf_stdcpp_libname" >&5
-+echo "$as_me:14213: checking for library $cf_stdcpp_libname" >&5
- echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
- if test "${cf_cv_libstdcpp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13470,7 +14219,7 @@
- 	cf_save="$LIBS"
- 	LIBS="$LIBS -l$cf_stdcpp_libname"
- cat >conftest.$ac_ext <<_ACEOF
--#line 13473 "configure"
-+#line 14222 "configure"
- #include "confdefs.h"
- 
- #include <strstream.h>
-@@ -13486,16 +14235,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13489: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14238: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13492: \$? = $ac_status" >&5
-+  echo "$as_me:14241: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13495: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14244: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13498: \$? = $ac_status" >&5
-+  echo "$as_me:14247: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_libstdcpp=yes
- else
-@@ -13507,12 +14256,12 @@
- 	LIBS="$cf_save"
- 
- fi
--echo "$as_me:13510: result: $cf_cv_libstdcpp" >&5
-+echo "$as_me:14259: result: $cf_cv_libstdcpp" >&5
- echo "${ECHO_T}$cf_cv_libstdcpp" >&6
- test "$cf_cv_libstdcpp" = yes && CXXLIBS="$CXXLIBS -l$cf_stdcpp_libname"
- fi
- 
--	echo "$as_me:13515: checking whether $CXX understands -c and -o together" >&5
-+	echo "$as_me:14264: checking whether $CXX understands -c and -o together" >&5
- echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
- if test "${cf_cv_prog_CXX_c_o+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -13528,15 +14277,15 @@
- # We do the test twice because some compilers refuse to overwrite an
- # existing .o file with -o, though they will create one.
- ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
--if { (eval echo "$as_me:13531: \"$ac_try\"") >&5
-+if { (eval echo "$as_me:14280: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13534: \$? = $ac_status" >&5
-+  echo "$as_me:14283: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--  test -f conftest2.$ac_objext && { (eval echo "$as_me:13536: \"$ac_try\"") >&5
-+  test -f conftest2.$ac_objext && { (eval echo "$as_me:14285: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13539: \$? = $ac_status" >&5
-+  echo "$as_me:14288: \$? = $ac_status" >&5
-   (exit $ac_status); };
- then
-   eval cf_cv_prog_CXX_c_o=yes
-@@ -13547,10 +14296,10 @@
- 
- fi
- if test $cf_cv_prog_CXX_c_o = yes; then
--  echo "$as_me:13550: result: yes" >&5
-+  echo "$as_me:14299: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
--  echo "$as_me:13553: result: no" >&5
-+  echo "$as_me:14302: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -13570,12 +14319,12 @@
- 	;;
- esac
- if test "$GXX" = yes; then
--	echo "$as_me:13573: checking for lib$cf_gpp_libname" >&5
-+	echo "$as_me:14322: checking for lib$cf_gpp_libname" >&5
- echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
- 	cf_save="$LIBS"
- 	LIBS="$LIBS -l$cf_gpp_libname"
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 13578 "configure"
-+#line 14327 "configure"
- #include "confdefs.h"
- 
- #include <$cf_gpp_libname/builtin.h>
-@@ -13589,16 +14338,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13592: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14341: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13595: \$? = $ac_status" >&5
-+  echo "$as_me:14344: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13598: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14347: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13601: \$? = $ac_status" >&5
-+  echo "$as_me:14350: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 	 CXXLIBS="$CXXLIBS -l$cf_gpp_libname"
-@@ -13617,7 +14366,7 @@
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 13620 "configure"
-+#line 14369 "configure"
- #include "confdefs.h"
- 
- #include <builtin.h>
-@@ -13631,16 +14380,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:13634: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14383: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:13637: \$? = $ac_status" >&5
-+  echo "$as_me:14386: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:13640: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14389: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13643: \$? = $ac_status" >&5
-+  echo "$as_me:14392: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cxx_library=yes
- 	 CXXLIBS="$CXXLIBS -l$cf_gpp_libname"
-@@ -13657,7 +14406,7 @@
- fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
- 	LIBS="$cf_save"
--	echo "$as_me:13660: result: $cf_cxx_library" >&5
-+	echo "$as_me:14409: result: $cf_cxx_library" >&5
- echo "${ECHO_T}$cf_cxx_library" >&6
- fi
- 
-@@ -13673,7 +14422,7 @@
- ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- ac_main_return=return
--echo "$as_me:13676: checking how to run the C++ preprocessor" >&5
-+echo "$as_me:14425: 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
-@@ -13690,18 +14439,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13693 "configure"
-+#line 14442 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:13698: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:14447: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:13704: \$? = $ac_status" >&5
-+  echo "$as_me:14453: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -13724,17 +14473,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13727 "configure"
-+#line 14476 "configure"
- #include "confdefs.h"
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:13731: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:14480: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:13737: \$? = $ac_status" >&5
-+  echo "$as_me:14486: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -13771,7 +14520,7 @@
- else
-   ac_cv_prog_CXXCPP=$CXXCPP
- fi
--echo "$as_me:13774: result: $CXXCPP" >&5
-+echo "$as_me:14523: result: $CXXCPP" >&5
- echo "${ECHO_T}$CXXCPP" >&6
- ac_preproc_ok=false
- for ac_cxx_preproc_warn_flag in '' yes
-@@ -13781,18 +14530,18 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13784 "configure"
-+#line 14533 "configure"
- #include "confdefs.h"
- #include <assert.h>
-                      Syntax error
- _ACEOF
--if { (eval echo "$as_me:13789: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:14538: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:13795: \$? = $ac_status" >&5
-+  echo "$as_me:14544: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -13815,17 +14564,17 @@
-   # OK, works on sane cases.  Now check whether non-existent headers
-   # can be detected and how.
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13818 "configure"
-+#line 14567 "configure"
- #include "confdefs.h"
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:13822: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:14571: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:13828: \$? = $ac_status" >&5
-+  echo "$as_me:14577: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -13853,7 +14602,7 @@
- if $ac_preproc_ok; then
-   :
- else
--  { { echo "$as_me:13856: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
-+  { { echo "$as_me:14605: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
- echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
-    { (exit 1); exit 1; }; }
- fi
-@@ -13865,26 +14614,26 @@
- ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- ac_main_return=return
- 
--for ac_header in typeinfo
-+for ac_header in iostream typeinfo
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:13871: checking for $ac_header" >&5
-+echo "$as_me:14620: checking for $ac_header" >&5
- echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 13877 "configure"
-+#line 14626 "configure"
- #include "confdefs.h"
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:13881: \"$ac_cpp conftest.$ac_ext\"") >&5
-+if { (eval echo "$as_me:14630: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   egrep -v '^ *\+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:13887: \$? = $ac_status" >&5
-+  echo "$as_me:14636: \$? = $ac_status" >&5
-   (exit $ac_status); } >/dev/null; then
-   if test -s conftest.err; then
-     ac_cpp_err=$ac_cxx_preproc_warn_flag
-@@ -13903,7 +14652,7 @@
- fi
- rm -f conftest.err conftest.$ac_ext
- fi
--echo "$as_me:13906: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+echo "$as_me:14655: result: `eval echo '${'$as_ac_Header'}'`" >&5
- echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<EOF
-@@ -13913,7 +14662,7 @@
- fi
- done
- 
--echo "$as_me:13916: checking if we should include stdbool.h" >&5
-+echo "$as_me:14665: checking if we should include stdbool.h" >&5
- echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
- 
- if test "${cf_cv_header_stdbool_h+set}" = set; then
-@@ -13921,7 +14670,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 13924 "configure"
-+#line 14673 "configure"
- #include "confdefs.h"
- 
- int
-@@ -13933,23 +14682,23 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13936: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14685: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13939: \$? = $ac_status" >&5
-+  echo "$as_me:14688: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13942: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14691: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13945: \$? = $ac_status" >&5
-+  echo "$as_me:14694: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=0
- else
-   echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
- cat >conftest.$ac_ext <<_ACEOF
--#line 13952 "configure"
-+#line 14701 "configure"
- #include "confdefs.h"
- 
- #ifndef __BEOS__
-@@ -13965,16 +14714,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:13968: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14717: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:13971: \$? = $ac_status" >&5
-+  echo "$as_me:14720: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:13974: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14723: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:13977: \$? = $ac_status" >&5
-+  echo "$as_me:14726: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_header_stdbool_h=1
- else
-@@ -13988,13 +14737,13 @@
- fi
- 
- if test "$cf_cv_header_stdbool_h" = 1
--then	echo "$as_me:13991: result: yes" >&5
-+then	echo "$as_me:14740: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:13993: result: no" >&5
-+else	echo "$as_me:14742: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:13997: checking for builtin bool type" >&5
-+echo "$as_me:14746: checking for builtin bool type" >&5
- echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
- 
- if test "${cf_cv_builtin_bool+set}" = set; then
-@@ -14002,7 +14751,7 @@
- else
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 14005 "configure"
-+#line 14754 "configure"
- #include "confdefs.h"
- 
- #include <stdio.h>
-@@ -14017,16 +14766,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14020: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14769: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14023: \$? = $ac_status" >&5
-+  echo "$as_me:14772: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14026: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14775: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14029: \$? = $ac_status" >&5
-+  echo "$as_me:14778: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_builtin_bool=1
- else
-@@ -14039,13 +14788,13 @@
- fi
- 
- if test "$cf_cv_builtin_bool" = 1
--then	echo "$as_me:14042: result: yes" >&5
-+then	echo "$as_me:14791: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--else	echo "$as_me:14044: result: no" >&5
-+else	echo "$as_me:14793: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
--echo "$as_me:14048: checking for size of bool" >&5
-+echo "$as_me:14797: checking for size of bool" >&5
- echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
- if test "${cf_cv_type_of_bool+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14056,7 +14805,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14059 "configure"
-+#line 14808 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -14098,15 +14847,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:14101: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14850: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14104: \$? = $ac_status" >&5
-+  echo "$as_me:14853: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:14106: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14855: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14109: \$? = $ac_status" >&5
-+  echo "$as_me:14858: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_of_bool=`cat cf_test.out`
- 		 if test -z "$cf_cv_type_of_bool"; then
-@@ -14124,18 +14873,18 @@
- fi
- 
- 	rm -f cf_test.out
--echo "$as_me:14127: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:14876: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- if test "$cf_cv_type_of_bool" = unknown ; then
- 	case .$NCURSES_BOOL in #(vi
- 	.auto|.) NCURSES_BOOL=unsigned;;
- 	esac
--	{ echo "$as_me:14133: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+	{ echo "$as_me:14882: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
- echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
- 	cf_cv_type_of_bool=$NCURSES_BOOL
- fi
- 
--echo "$as_me:14138: checking for special defines needed for etip.h" >&5
-+echo "$as_me:14887: checking for special defines needed for etip.h" >&5
- echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
- cf_save_CXXFLAGS="$CXXFLAGS"
- cf_result="none"
-@@ -14147,7 +14896,7 @@
- 	test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
- 	test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
- cat >conftest.$ac_ext <<_ACEOF
--#line 14150 "configure"
-+#line 14899 "configure"
- #include "confdefs.h"
- 
- #include <etip.h.in>
-@@ -14161,16 +14910,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14164: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:14913: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14167: \$? = $ac_status" >&5
-+  echo "$as_me:14916: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14170: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14919: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14173: \$? = $ac_status" >&5
-+  echo "$as_me:14922: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
- 
- 	test -n "$cf_math" && cat >>confdefs.h <<EOF
-@@ -14191,12 +14940,12 @@
- rm -f conftest.$ac_objext conftest.$ac_ext
- done
- done
--echo "$as_me:14194: result: $cf_result" >&5
-+echo "$as_me:14943: result: $cf_result" >&5
- echo "${ECHO_T}$cf_result" >&6
- CXXFLAGS="$cf_save_CXXFLAGS"
- 
- if test -n "$CXX"; then
--echo "$as_me:14199: checking if $CXX accepts parameter initialization" >&5
-+echo "$as_me:14948: checking if $CXX accepts parameter initialization" >&5
- echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
- if test "${cf_cv_cpp_param_init+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14213,7 +14962,7 @@
-   cf_cv_cpp_param_init=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14216 "configure"
-+#line 14965 "configure"
- #include "confdefs.h"
- 
- class TEST {
-@@ -14232,15 +14981,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:14235: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:14984: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14238: \$? = $ac_status" >&5
-+  echo "$as_me:14987: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:14240: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:14989: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14243: \$? = $ac_status" >&5
-+  echo "$as_me:14992: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cpp_param_init=yes
- else
-@@ -14259,7 +15008,7 @@
- ac_main_return=return
- 
- fi
--echo "$as_me:14262: result: $cf_cv_cpp_param_init" >&5
-+echo "$as_me:15011: result: $cf_cv_cpp_param_init" >&5
- echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
- fi
- test "$cf_cv_cpp_param_init" = yes && cat >>confdefs.h <<\EOF
-@@ -14268,7 +15017,7 @@
- 
- if test -n "$CXX"; then
- 
--echo "$as_me:14271: checking if $CXX accepts static_cast" >&5
-+echo "$as_me:15020: checking if $CXX accepts static_cast" >&5
- echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
- if test "${cf_cv_cpp_static_cast+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14282,7 +15031,7 @@
- ac_main_return=return
- 
- 	cat >conftest.$ac_ext <<_ACEOF
--#line 14285 "configure"
-+#line 15034 "configure"
- #include "confdefs.h"
- 
- class NCursesPanel
-@@ -14326,16 +15075,16 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:14329: \"$ac_compile\"") >&5
-+if { (eval echo "$as_me:15078: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  echo "$as_me:14332: \$? = $ac_status" >&5
-+  echo "$as_me:15081: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
-          { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:14335: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15084: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14338: \$? = $ac_status" >&5
-+  echo "$as_me:15087: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_cpp_static_cast=yes
- else
-@@ -14353,7 +15102,7 @@
- ac_main_return=return
- 
- fi
--echo "$as_me:14356: result: $cf_cv_cpp_static_cast" >&5
-+echo "$as_me:15105: result: $cf_cv_cpp_static_cast" >&5
- echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
- 
- fi
-@@ -14362,189 +15111,6 @@
- #define CPP_HAS_STATIC_CAST 1
- EOF
- 
--if test -n "$CXX"; then
--
--ac_ext=cc
--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
--ac_main_return=return
--
--for ac_header in strstream.h
--do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--echo "$as_me:14377: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--#line 14383 "configure"
--#include "confdefs.h"
--#include <$ac_header>
--_ACEOF
--if { (eval echo "$as_me:14387: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
--  ac_status=$?
--  egrep -v '^ *\+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:14393: \$? = $ac_status" >&5
--  (exit $ac_status); } >/dev/null; then
--  if test -s conftest.err; then
--    ac_cpp_err=$ac_cxx_preproc_warn_flag
--  else
--    ac_cpp_err=
--  fi
--else
--  ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
--  eval "$as_ac_Header=yes"
--else
--  echo "$as_me: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  eval "$as_ac_Header=no"
--fi
--rm -f conftest.err conftest.$ac_ext
--fi
--echo "$as_me:14412: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
--  cat >>confdefs.h <<EOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--EOF
--
--fi
--done
--
--echo "$as_me:14422: checking if $CXX supports vscan function" >&5
--echo $ECHO_N "checking if $CXX supports vscan function... $ECHO_C" >&6
--if test "${cf_cv_cpp_vscan_func+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
--	for cf_vscan_func in strstream strstream_cast stdio
--	do
--	case $cf_vscan_func in #(vi
--	stdio)		cf_vscan_defs=USE_STDIO_VSCAN ;; #(vi
--	strstream)	cf_vscan_defs=USE_STRSTREAM_VSCAN ;;
--	strstream_cast)	cf_vscan_defs=USE_STRSTREAM_VSCAN_CAST ;;
--	esac
--	cat >conftest.$ac_ext <<_ACEOF
--#line 14436 "configure"
--#include "confdefs.h"
--
--#include <stdio.h>
--#include <stdarg.h>
--#define $cf_vscan_defs 1
--#if defined(USE_STDIO_VSCAN)
--#elif defined(HAVE_STRSTREAM_H) && defined(USE_STRSTREAM_VSCAN)
--#include <strstream.h>
--#endif
--
--int scanw(const char* fmt, ...)
--{
--    int result = -1;
--    char buf[BUFSIZ];
--
--    va_list args;
--    va_start(args, fmt);
--#if defined(USE_STDIO_VSCAN)
--    if (::vsscanf(buf, fmt, args) != -1)
--	result = 0;
--#elif defined(USE_STRSTREAM_VSCAN)
--    strstreambuf ss(buf, sizeof(buf));
--    if (ss.vscan(fmt, args) != -1)
--	result = 0;
--#elif defined(USE_STRSTREAM_VSCAN_CAST)
--    strstreambuf ss(buf, sizeof(buf));
--    if (ss.vscan(fmt, (_IO_va_list)args) != -1)
--	result = 0;
--#else
--#error case $cf_vscan_func failed
--#endif
--    va_end(args);
--    return result;
--}
--
--int
--main ()
--{
--int tmp, foo = scanw("%d", &tmp)
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:14481: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:14484: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--         { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:14487: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:14490: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  cf_cv_cpp_vscan_func=$cf_vscan_func; break
--else
--  echo "$as_me: failed program was:" >&5
--cat conftest.$ac_ext >&5
--cf_cv_cpp_vscan_func=no
--fi
--rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
--	test "$cf_cv_cpp_vscan_func" != no && break
--	done
--
--fi
--echo "$as_me:14503: result: $cf_cv_cpp_vscan_func" >&5
--echo "${ECHO_T}$cf_cv_cpp_vscan_func" >&6
--
--ac_ext=cc
--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
--ac_main_return=return
--
--fi
--
--case $cf_cv_cpp_vscan_func in #(vi
--stdio) #(vi
--	cat >>confdefs.h <<\EOF
--#define CPP_HAS_VSCAN_FUNC 1
--EOF
--
--	cat >>confdefs.h <<\EOF
--#define USE_STDIO_VSCAN 1
--EOF
--
--	;;
--strstream)
--	cat >>confdefs.h <<\EOF
--#define CPP_HAS_VSCAN_FUNC 1
--EOF
--
--	cat >>confdefs.h <<\EOF
--#define USE_STRSTREAM_VSCAN 1
--EOF
--
--	;;
--strstream_cast)
--	cat >>confdefs.h <<\EOF
--#define CPP_HAS_VSCAN_FUNC 1
--EOF
--
--	cat >>confdefs.h <<\EOF
--#define USE_STRSTREAM_VSCAN_CAST 1
--EOF
--
--	;;
--esac
--
- 	CXX_AR='$(AR)'
- 	CXX_AR_OPTS='$(AR_OPTS)'
- 	case $cf_cv_system_name in #(vi
-@@ -14584,7 +15150,7 @@
- 	else
- 		if test "$cf_cv_header_stdbool_h" = 1 ; then
- 
--echo "$as_me:14587: checking for size of bool" >&5
-+echo "$as_me:15153: checking for size of bool" >&5
- echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
- if test "${cf_cv_type_of_bool+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14595,7 +15161,7 @@
-   cf_cv_type_of_bool=unknown
- else
-   cat >conftest.$ac_ext <<_ACEOF
--#line 14598 "configure"
-+#line 15164 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -14637,15 +15203,15 @@
- 
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:14640: \"$ac_link\"") >&5
-+if { (eval echo "$as_me:15206: \"$ac_link\"") >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  echo "$as_me:14643: \$? = $ac_status" >&5
-+  echo "$as_me:15209: \$? = $ac_status" >&5
-   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--  { (eval echo "$as_me:14645: \"$ac_try\"") >&5
-+  { (eval echo "$as_me:15211: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
--  echo "$as_me:14648: \$? = $ac_status" >&5
-+  echo "$as_me:15214: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-   cf_cv_type_of_bool=`cat cf_test.out`
- 		 if test -z "$cf_cv_type_of_bool"; then
-@@ -14663,25 +15229,25 @@
- fi
- 
- 	rm -f cf_test.out
--echo "$as_me:14666: result: $cf_cv_type_of_bool" >&5
-+echo "$as_me:15232: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- if test "$cf_cv_type_of_bool" = unknown ; then
- 	case .$NCURSES_BOOL in #(vi
- 	.auto|.) NCURSES_BOOL=unsigned;;
- 	esac
--	{ echo "$as_me:14672: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+	{ echo "$as_me:15238: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
- echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
- 	cf_cv_type_of_bool=$NCURSES_BOOL
- fi
- 
- 		else
--			echo "$as_me:14678: checking for fallback type of bool" >&5
-+			echo "$as_me:15244: checking for fallback type of bool" >&5
- echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
- 			case "$host_cpu" in #(vi
- 			i?86)	cf_cv_type_of_bool=char	;; #(vi
- 			*)	cf_cv_type_of_bool=int	;;
- 			esac
--			echo "$as_me:14684: result: $cf_cv_type_of_bool" >&5
-+			echo "$as_me:15250: result: $cf_cv_type_of_bool" >&5
- echo "${ECHO_T}$cf_cv_type_of_bool" >&6
- 		fi
- 	fi
-@@ -14707,11 +15273,20 @@
- fi
- 
- if test -f "${srcdir}/Ada95/Makefile.in" ; then
-+
-+if test "$cf_with_ada" != "no" ; then
-+    if test "$with_libtool" != "no"; then
-+	{ echo "$as_me:15279: WARNING: libtool does not support Ada - disabling feature" >&5
-+echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
-+	cf_with_ada=no
-+    fi
-+fi
-+
- if test "$cf_with_ada" != "no" ; then
- cf_ada_make=gnatmake
- # Extract the first word of "$cf_ada_make", so it can be a program name with args.
- set dummy $cf_ada_make; ac_word=$2
--echo "$as_me:14714: checking for $ac_word" >&5
-+echo "$as_me:15289: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_gnat_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14726,7 +15301,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_gnat_exists="yes"
--echo "$as_me:14729: found $ac_dir/$ac_word" >&5
-+echo "$as_me:15304: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -14735,10 +15310,10 @@
- fi
- gnat_exists=$ac_cv_prog_gnat_exists
- if test -n "$gnat_exists"; then
--  echo "$as_me:14738: result: $gnat_exists" >&5
-+  echo "$as_me:15313: result: $gnat_exists" >&5
- echo "${ECHO_T}$gnat_exists" >&6
- else
--  echo "$as_me:14741: result: no" >&5
-+  echo "$as_me:15316: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -14746,11 +15321,11 @@
-    cf_ada_make=
- else
- 
--echo "$as_me:14749: checking for gnat version" >&5
-+echo "$as_me:15324: checking for gnat version" >&5
- echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
- cf_gnat_version=`${cf_ada_make-gnatmake} -v 2>&1 | grep '[0-9].[0-9][0-9]*' |\
-   sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
--echo "$as_me:14753: result: $cf_gnat_version" >&5
-+echo "$as_me:15328: result: $cf_gnat_version" >&5
- echo "${ECHO_T}$cf_gnat_version" >&6
- 
- case $cf_gnat_version in
-@@ -14773,7 +15348,7 @@
- 
-    # Extract the first word of "m4", so it can be a program name with args.
- set dummy m4; ac_word=$2
--echo "$as_me:14776: checking for $ac_word" >&5
-+echo "$as_me:15351: checking for $ac_word" >&5
- echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
- if test "${ac_cv_prog_M4_exists+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14788,7 +15363,7 @@
-   test -z "$ac_dir" && ac_dir=.
-   $as_executable_p "$ac_dir/$ac_word" || continue
- ac_cv_prog_M4_exists="yes"
--echo "$as_me:14791: found $ac_dir/$ac_word" >&5
-+echo "$as_me:15366: found $ac_dir/$ac_word" >&5
- break
- done
- 
-@@ -14797,10 +15372,10 @@
- fi
- M4_exists=$ac_cv_prog_M4_exists
- if test -n "$M4_exists"; then
--  echo "$as_me:14800: result: $M4_exists" >&5
-+  echo "$as_me:15375: result: $M4_exists" >&5
- echo "${ECHO_T}$M4_exists" >&6
- else
--  echo "$as_me:14803: result: no" >&5
-+  echo "$as_me:15378: result: no" >&5
- echo "${ECHO_T}no" >&6
- fi
- 
-@@ -14809,7 +15384,7 @@
-       echo Ada95 binding required program m4 not found. Ada95 binding disabled.
-    fi
-    if test "$cf_cv_prog_gnat_correct" = yes; then
--      echo "$as_me:14812: checking if GNAT works" >&5
-+      echo "$as_me:15387: checking if GNAT works" >&5
- echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
- 
- rm -f conftest*
-@@ -14837,14 +15412,14 @@
- fi
- rm -f conftest*
- 
--      echo "$as_me:14840: result: $cf_cv_prog_gnat_correct" >&5
-+      echo "$as_me:15415: result: $cf_cv_prog_gnat_correct" >&5
- echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
-    fi
- fi
- if test	"$cf_cv_prog_gnat_correct" = yes; then
-    ADAFLAGS="-O3 -gnatpn $ADAFLAGS"
- 
--   echo "$as_me:14847: checking if GNAT pragma Unreferenced works" >&5
-+   echo "$as_me:15422: checking if GNAT pragma Unreferenced works" >&5
- echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6
- 
- rm -f conftest*
-@@ -14871,7 +15446,7 @@
- fi
- rm -f conftest*
- 
--   echo "$as_me:14874: result: $cf_cv_pragma_unreferenced" >&5
-+   echo "$as_me:15449: result: $cf_cv_pragma_unreferenced" >&5
- echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6
- 
-    # if the pragma is supported, use it (needed in the Trace code).
-@@ -14897,7 +15472,8 @@
- 
- else
-   withval="${ADA_INCLUDE-$prefix/lib/ada/adainclude}"
--fi;
-+fi; if test -n "$prefix/lib/ada/adainclude" ; then
-+
- if test "x$prefix" != xNONE; then
-   cf_path_syntax="$prefix"
- else
-@@ -14923,12 +15499,13 @@
-   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
-   ;;
- *)
--  { { echo "$as_me:14926: error: expected a pathname, not \"$withval\"" >&5
-+  { { echo "$as_me:15502: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
-   ;;
- esac
- 
-+fi
- ADA_INCLUDE="$withval"
- 
- # Check whether --with-ada-objects or --without-ada-objects was given.
-@@ -14937,7 +15514,8 @@
- 
- else
-   withval="${ADA_OBJECTS-$prefix/lib/ada/adalib}"
--fi;
-+fi; if test -n "$prefix/lib/ada/adalib" ; then
-+
- if test "x$prefix" != xNONE; then
-   cf_path_syntax="$prefix"
- else
-@@ -14963,34 +15541,57 @@
-   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
-   ;;
- *)
--  { { echo "$as_me:14966: error: expected a pathname, not \"$withval\"" >&5
-+  { { echo "$as_me:15544: error: expected a pathname, not \"$withval\"" >&5
- echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-    { (exit 1); exit 1; }; }
-   ;;
- esac
- 
-+fi
- ADA_OBJECTS="$withval"
- 
- fi
- fi
-+else
-+   cf_with_ada=no
- fi
- 
--### Construct the library-subsets, if any, from this set of keywords:
--### none, base, ext_funcs, ext_tinfo, termlib, widechar (see CF_LIB_RULES).
--echo "$as_me:14980: checking for library subsets" >&5
-+### Construct the ncurses library-subsets, if any, from this set of keywords:
-+###	none, base, ext_funcs, ext_tinfo, ticlib, termlib, widechar
-+###
-+### ticlib modules may be a separate library, otherwise contained in termlib.
-+### termlib modules may be a separate library, otherwise contained in ncurses.
-+###
-+### The of "+" or " " between the tokens controls the way the script
-+### chooses to split module lists into libraries.
-+###
-+### (see CF_LIB_RULES).
-+echo "$as_me:15569: checking for library subsets" >&5
- echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
-+LIB_SUBSETS=
-+
-+if test "$cf_with_progs" = yes || test "$with_ticlib" != no || test "$with_termcap" != no; then
-+	LIB_SUBSETS="${LIB_SUBSETS}ticlib"
-+	if test "$with_ticlib" != no ; then
-+		LIB_SUBSETS="${LIB_SUBSETS} "
-+	else
-+		LIB_SUBSETS="${LIB_SUBSETS}+"
-+	fi
-+fi
-+
-+LIB_SUBSETS="${LIB_SUBSETS}termlib"
-+test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_tinfo"
- if test "$with_termlib" != no ; then
--	LIB_SUBSETS="termlib"
--	test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_tinfo"
- 	LIB_SUBSETS="${LIB_SUBSETS} "
- else
--	LIB_SUBSETS="termlib+"
--	test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}ext_tinfo+"
-+	LIB_SUBSETS="${LIB_SUBSETS}+"
- fi
-+
- LIB_SUBSETS="${LIB_SUBSETS}base"
- test "$with_widec"     = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
- test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
--echo "$as_me:14993: result: $LIB_SUBSETS" >&5
-+
-+echo "$as_me:15594: result: $LIB_SUBSETS" >&5
- echo "${ECHO_T}$LIB_SUBSETS" >&6
- 
- ### Construct the list of include-directories to be generated
-@@ -15028,7 +15629,7 @@
- fi
- 
- ### Build up pieces for makefile rules
--echo "$as_me:15031: checking default library suffix" >&5
-+echo "$as_me:15632: checking default library suffix" >&5
- echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -15039,10 +15640,10 @@
- 	shared)  DFT_ARG_SUFFIX=''   ;;
- 	esac
- 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
--echo "$as_me:15042: result: $DFT_ARG_SUFFIX" >&5
-+echo "$as_me:15643: result: $DFT_ARG_SUFFIX" >&5
- echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
- 
--echo "$as_me:15045: checking default library-dependency suffix" >&5
-+echo "$as_me:15646: checking default library-dependency suffix" >&5
- echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -15064,17 +15665,19 @@
- 		esac
- 	esac
- 	test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}"
-+DFT_LIB_SUFFIX=$DFT_DEP_SUFFIX
- if test $DFT_LWR_MODEL = shared ; then
- 	case $cf_cv_system_name in #(vi
- 	cygwin*)
- 		DFT_DEP_SUFFIX=".dll.a"
-+		DFT_LIB_SUFFIX=".dll"
- 		;;
- 	esac
- fi
--echo "$as_me:15074: result: $DFT_DEP_SUFFIX" >&5
-+echo "$as_me:15677: result: $DFT_DEP_SUFFIX" >&5
- echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
- 
--echo "$as_me:15077: checking default object directory" >&5
-+echo "$as_me:15680: checking default object directory" >&5
- echo $ECHO_N "checking default object directory... $ECHO_C" >&6
- 
- 	case $DFT_LWR_MODEL in
-@@ -15090,12 +15693,12 @@
- 			DFT_OBJ_SUBDIR='obj_s' ;;
- 		esac
- 	esac
--echo "$as_me:15093: result: $DFT_OBJ_SUBDIR" >&5
-+echo "$as_me:15696: result: $DFT_OBJ_SUBDIR" >&5
- echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
- 
- # libtool thinks it can make c++ shared libraries (perhaps only g++)
- if test "$cf_with_cxx" = yes ; then
--echo "$as_me:15098: checking c++ library-dependency suffix" >&5
-+echo "$as_me:15701: checking c++ library-dependency suffix" >&5
- echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
- if test "$with_libtool" != "no"; then
- 	CXX_LIB_SUFFIX=$DFT_DEP_SUFFIX
-@@ -15121,21 +15724,60 @@
- 	esac
- 	test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}"
- fi
--echo "$as_me:15124: result: $CXX_LIB_SUFFIX" >&5
-+echo "$as_me:15727: result: $CXX_LIB_SUFFIX" >&5
- echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
- 
- fi
- 
-+# do not want -ldl in build except as needed for -lncurses dependency
-+if test "$with_dlsym" = yes ; then
-+if test $DFT_LWR_MODEL = shared || \
-+   test $DFT_LWR_MODEL = libtool ; then
-+
-+# remove dl library from $LIBS
-+LIBS=`echo "$LIBS" | sed -e 's/-ldl[ 	]//g' -e 's/-ldl$//'`
-+
-+fi
-+fi
- ### Set up low-level terminfo dependencies for makefiles.
--TINFO_LIST="$SHLIB_LIST"
-+
-+# TICS_LIST and TINFO_LIST are needed to build libtic.so and libterm.so, but
-+# do not need libdl
-+TICS_LIST=
-+if test "$with_dlsym" = yes ; then
-+
-+# remove dl library from $SHLIB_LIST
-+TINFO_LIST=`echo "$SHLIB_LIST" | sed -e 's/-ldl[ 	]//g' -e 's/-ldl$//'`
-+
-+fi
-+
-+if test "$with_ticlib" != no ; then
-+
-+	if test "$with_ticlib" != yes ; then
-+		TICS_NAME=$with_ticlib
-+		TICS_ARG_SUFFIX="${with_ticlib}`echo ${DFT_ARG_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
-+		TICS_DEP_SUFFIX="${with_ticlib}`echo ${DFT_DEP_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
-+		TICS_LIB_SUFFIX="${with_ticlib}"
-+	else
-+		TICS_ARG_SUFFIX="${TICS_NAME}${DFT_ARG_SUFFIX}"
-+		TICS_DEP_SUFFIX="${TICS_NAME}${DFT_DEP_SUFFIX}"
-+		TICS_LIB_SUFFIX="${TICS_NAME}${LIB_SUFFIX}"
-+	fi
-+	TICS_ARGS="-L${LIB_DIR} -l${TICS_LIB_SUFFIX}"
-+else
-+	TICS_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
-+fi
-+
- if test "$with_termlib" != no ; then
- 
- 	if test "$with_termlib" != yes ; then
- 		TINFO_NAME=$with_termlib
-+		TINFO_SUFFIX="`echo ${DFT_LIB_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
- 		TINFO_ARG_SUFFIX="${with_termlib}`echo ${DFT_ARG_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
- 		TINFO_DEP_SUFFIX="${with_termlib}`echo ${DFT_DEP_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
- 		TINFO_LIB_SUFFIX="${with_termlib}"
- 	else
-+		TINFO_SUFFIX=${DFT_LIB_SUFFIX}
- 		TINFO_ARG_SUFFIX="${TINFO_NAME}${DFT_ARG_SUFFIX}"
- 		TINFO_DEP_SUFFIX="${TINFO_NAME}${DFT_DEP_SUFFIX}"
- 		TINFO_LIB_SUFFIX="${TINFO_NAME}${LIB_SUFFIX}"
-@@ -15150,22 +15792,85 @@
- 	else
- 		TEST_ARGS="-l${TINFO_ARG_SUFFIX}"
- 		TEST_ARG2="-l${TINFO_ARG_SUFFIX}"
-+		TICS_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
- 		TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS"
- 		SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
- 	fi
- else
-+	# the next lines are needed for linking libtic over libncurses
-+	TINFO_NAME=${LIB_NAME}
-+	TINFO_SUFFIX=${DFT_LIB_SUFFIX}
-+	TINFO_ARG_SUFFIX=${LIB_NAME}${DFT_ARG_SUFFIX}
-+	TICS_LIST="$SHLIB_LIST -l${LIB_NAME}${DFT_ARG_SUFFIX}"
-+
- 	TINFO_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
- fi
- 
-+if test "$DFT_LWR_MODEL" = shared ; then
-+	case $cf_cv_system_name in #(vi
-+	cygwin*)
-+		# "lib" files have ".dll.a" suffix, "cyg" files have ".dll"
-+		TINFO_SUFFIX=.dll
-+		;;
-+	esac
-+fi
-+
-+if test "$with_dlsym" = yes ; then
-+
-+# remove dl library from $TICS_LIST
-+TICS_LIST=`echo "$TICS_LIST" | sed -e 's/-ldl[ 	]//g' -e 's/-ldl$//'`
-+
-+fi
-+
-+if test "$DFT_LWR_MODEL" = "libtool"; then
-+    OBJEXT=lo
-+fi
-+
- # needed for Ada95
- TINFO_ARGS2=`echo "$TINFO_ARGS" | sed -e 's,-L\.\./,-L../../,'`
- 
--echo "$as_me:15163: checking where we will install curses.h" >&5
-+case $DFT_LWR_MODEL in
-+normal|debug|profile)
-+
-+if test "$GCC" = yes ; then
-+	LDFLAGS_STATIC=-static
-+	LDFLAGS_SHARED=-dynamic
-+else
-+	case $cf_cv_system_name in #(
-+	aix[45]*) 	#( from ld manpage
-+		LDFLAGS_STATIC=-bstatic
-+		LDFLAGS_SHARED=-bdynamic
-+		;;
-+	hpux*)		#( from ld manpage for hpux10.20, hpux11.11
-+		# We could also use just "archive" and "shared".
-+		LDFLAGS_STATIC=-Wl,-a,archive_shared
-+		LDFLAGS_SHARED=-Wl,-a,shared_archive
-+		;;
-+	irix*)		#( from ld manpage IRIX64
-+		LDFLAGS_STATIC=-Bstatic
-+		LDFLAGS_SHARED=-Bdynamic
-+		;;
-+	osf[45]*)	#( from ld manpage osf4.0d, osf5.1
-+		# alternative "-oldstyle_liblookup" (not in cc manpage)
-+		LDFLAGS_STATIC=-noso
-+		LDFLAGS_SHARED=-so_archive
-+		;;
-+	solaris2*)
-+		LDFLAGS_STATIC=-Bstatic
-+		LDFLAGS_SHARED=-Bdynamic
-+		;;
-+	esac
-+fi
-+
-+	;;
-+esac
-+
-+echo "$as_me:15868: checking where we will install curses.h" >&5
- echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
- test "$with_overwrite" = no && \
- test "x$includedir" = 'x${prefix}/include' && \
- 	includedir='${prefix}/include/ncurses'${LIB_SUFFIX}
--echo "$as_me:15168: result: $includedir" >&5
-+echo "$as_me:15873: result: $includedir" >&5
- echo "${ECHO_T}$includedir" >&6
- 
- ### Resolve a conflict between normal and wide-curses by forcing applications
-@@ -15173,11 +15878,14 @@
- if test "$with_overwrite" != no ; then
- if test "$NCURSES_LIBUTF8" = 1 ; then
- 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
--	{ echo "$as_me:15176: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
-+	{ echo "$as_me:15881: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
- echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
- fi
- fi
- 
-+# used to separate tack out of the tree
-+NCURSES_TREE=
-+
- ### predefined stuff for the test programs
- cat >>confdefs.h <<\EOF
- #define HAVE_SLK_COLOR 1
-@@ -15186,7 +15894,7 @@
- ### Construct the list of subdirectories for which we'll customize makefiles
- ### with the appropriate compile-rules.
- 
--echo "$as_me:15189: checking for src modules" >&5
-+echo "$as_me:15897: checking for src modules" >&5
- echo $ECHO_N "checking for src modules... $ECHO_C" >&6
- 
- # dependencies and linker-arguments for test-programs
-@@ -15249,7 +15957,7 @@
- 		fi
- 	fi
- done
--echo "$as_me:15252: result: $cf_cv_src_modules" >&5
-+echo "$as_me:15960: result: $cf_cv_src_modules" >&5
- echo "${ECHO_T}$cf_cv_src_modules" >&6
- 
- TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
-@@ -15284,6 +15992,10 @@
- 
- fi
- 
-+if test "$cf_with_ada" != "no" && test "$cf_cv_prog_gnat_correct" != "no"; then
-+   SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses-config"
-+fi
-+
- DIRS_TO_MAKE="lib"
- for cf_item in $cf_list_models
- do
-@@ -15391,6 +16103,79 @@
- 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
- fi
- 
-+### If we're building with rpath, try to link non-standard libs that way too.
-+if test "$DFT_LWR_MODEL" = "shared"; then
-+
-+echo "$as_me:16109: checking for updated LDFLAGS" >&5
-+echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
-+if test -n "$LDFLAGS" ; then
-+echo "$as_me:16112: result: maybe" >&5
-+echo "${ECHO_T}maybe" >&6
-+test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
-+
-+echo "${as_me-configure}:16116: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
-+
-+test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
-+
-+echo "${as_me-configure}:16120: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+
-+case "$EXTRA_LDFLAGS" in #(vi
-+-Wl,-rpath,*) #(vi
-+    cf_rpath_hack="-Wl,-rpath,"
-+    ;;
-+-R\ *)
-+    cf_rpath_hack="-R "
-+    ;;
-+-R*)
-+    cf_rpath_hack="-R"
-+    ;;
-+*)
-+    cf_rpath_hack=
-+    ;;
-+esac
-+if test -n "$cf_rpath_hack" ; then
-+    cf_rpath_dst=
-+    for cf_rpath_src in $LDFLAGS
-+    do
-+        test -n "$verbose" && echo "	Filtering $cf_rpath_src" 1>&6
-+
-+echo "${as_me-configure}:16142: testing Filtering $cf_rpath_src ..." 1>&5
-+
-+        case $cf_rpath_src in #(vi
-+        -L*) #(vi
-+            if test "$cf_rpath_hack" = "-R " ; then
-+                cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e 's%-L%-R %'`
-+            else
-+                cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e s%-L%$cf_rpath_hack%`
-+            fi
-+            test -n "$verbose" && echo "	...Filter $cf_rpath_tmp" 1>&6
-+
-+echo "${as_me-configure}:16153: testing ...Filter $cf_rpath_tmp ..." 1>&5
-+
-+            EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
-+            ;;
-+        *)
-+            cf_rpath_dst="$cf_rpath_dst $cf_rpath_src"
-+            ;;
-+        esac
-+    done
-+    LDFLAGS=$cf_rpath_dst
-+    test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
-+
-+echo "${as_me-configure}:16165: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
-+
-+    test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
-+
-+echo "${as_me-configure}:16169: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-+
-+fi
-+else
-+echo "$as_me:16173: result: no" >&5
-+echo "${ECHO_T}no" >&6
-+fi
-+
-+fi
-+
- ### Define substitutions for header files to avoid name-pollution
- 
- if test "$cf_cv_have_tcgetattr" = yes ; then
-@@ -15495,7 +16280,7 @@
- : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ echo "$as_me:15498: creating $CONFIG_STATUS" >&5
-+{ echo "$as_me:16283: creating $CONFIG_STATUS" >&5
- echo "$as_me: creating $CONFIG_STATUS" >&6;}
- cat >$CONFIG_STATUS <<_ACEOF
- #! $SHELL
-@@ -15627,7 +16412,7 @@
- cat >>$CONFIG_STATUS <<EOF
- ac_cs_version="\\
- config.status
--configured by $0, generated by GNU Autoconf 2.52.20061216,
-+configured by $0, generated by GNU Autoconf 2.52.20080325,
-   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
- 
- Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-@@ -15671,7 +16456,7 @@
-     echo "$ac_cs_version"; exit 0 ;;
-   --he | --h)
-     # Conflict between --help and --header
--    { { echo "$as_me:15674: error: ambiguous option: $1
-+    { { echo "$as_me:16459: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: ambiguous option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -15690,7 +16475,7 @@
-     ac_need_defaults=false;;
- 
-   # This is an error.
--  -*) { { echo "$as_me:15693: error: unrecognized option: $1
-+  -*) { { echo "$as_me:16478: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&5
- echo "$as_me: error: unrecognized option: $1
- Try \`$0 --help' for more information." >&2;}
-@@ -15709,7 +16494,7 @@
- ## Running config.status.  ##
- ## ----------------------- ##
- 
--This file was extended by $as_me 2.52.20061216, executed with
-+This file was extended by $as_me 2.52.20080325, executed with
-   CONFIG_FILES    = $CONFIG_FILES
-   CONFIG_HEADERS  = $CONFIG_HEADERS
-   CONFIG_LINKS    = $CONFIG_LINKS
-@@ -15747,13 +16532,19 @@
- TINFO_ARG_SUFFIX="$TINFO_ARG_SUFFIX"
- TINFO_LIB_SUFFIX="$TINFO_LIB_SUFFIX"
- TINFO_NAME="$TINFO_NAME"
-+TINFO_SUFFIX="$TINFO_SUFFIX"
-+TICS_ARG_SUFFIX="$TICS_ARG_SUFFIX"
-+TICS_LIB_SUFFIX="$TICS_LIB_SUFFIX"
-+TICS_NAME="$TICS_NAME"
- WITH_CURSES_H="$with_curses_h"
- WITH_ECHO="$with_echo"
- WITH_OVERWRITE="$with_overwrite"
- cf_LIST_MODELS="$cf_list_models"
- cf_cv_abi_version="$cf_cv_abi_version"
-+cf_cv_do_relink="$cf_cv_do_relink"
- cf_cv_do_symlinks="$cf_cv_do_symlinks"
- cf_cv_enable_lp64="$cf_cv_enable_lp64"
-+cf_cv_enable_opaque="$cf_cv_enable_opaque"
- cf_cv_prog_CC_c_o=$cf_cv_prog_CC_c_o
- cf_cv_prog_CXX_c_o=$cf_cv_prog_CXX_c_o
- cf_cv_rel_version="$cf_cv_rel_version"
-@@ -15780,7 +16571,7 @@
-   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
--  *) { { echo "$as_me:15783: error: invalid argument: $ac_config_target" >&5
-+  *) { { echo "$as_me:16574: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-    { (exit 1); exit 1; }; };;
-   esac
-@@ -15928,6 +16719,7 @@
- s,@cf_list_models@,$cf_list_models,;t t
- s,@LIBTOOL@,$LIBTOOL,;t t
- s,@LIBTOOL_CXX@,$LIBTOOL_CXX,;t t
-+s,@LIBTOOL_OPTS@,$LIBTOOL_OPTS,;t t
- s,@LIB_CREATE@,$LIB_CREATE,;t t
- s,@LIB_OBJECT@,$LIB_OBJECT,;t t
- s,@LIB_SUFFIX@,$LIB_SUFFIX,;t t
-@@ -15939,6 +16731,7 @@
- s,@LIB_UNINSTALL@,$LIB_UNINSTALL,;t t
- s,@DFT_LWR_MODEL@,$DFT_LWR_MODEL,;t t
- s,@DFT_UPR_MODEL@,$DFT_UPR_MODEL,;t t
-+s,@TICS_NAME@,$TICS_NAME,;t t
- s,@TINFO_NAME@,$TINFO_NAME,;t t
- s,@LIB_NAME@,$LIB_NAME,;t t
- s,@LIB_PREFIX@,$LIB_PREFIX,;t t
-@@ -15961,6 +16754,7 @@
- s,@TERMINFO_DIRS@,$TERMINFO_DIRS,;t t
- s,@TERMINFO@,$TERMINFO,;t t
- s,@MAKE_TERMINFO@,$MAKE_TERMINFO,;t t
-+s,@USE_BIG_STRINGS@,$USE_BIG_STRINGS,;t t
- s,@TERMPATH@,$TERMPATH,;t t
- s,@BROKEN_LINKER@,$BROKEN_LINKER,;t t
- s,@NCURSES_CH_T@,$NCURSES_CH_T,;t t
-@@ -15979,10 +16773,14 @@
- s,@MANPAGE_RENAMES@,$MANPAGE_RENAMES,;t t
- s,@NCURSES_EXT_FUNCS@,$NCURSES_EXT_FUNCS,;t t
- s,@NCURSES_CONST@,$NCURSES_CONST,;t t
--s,@NCURSES_SBOOL@,$NCURSES_SBOOL,;t t
--s,@NCURSES_XNAMES@,$NCURSES_XNAMES,;t t
- s,@NCURSES_EXT_COLORS@,$NCURSES_EXT_COLORS,;t t
- s,@NCURSES_MOUSE_VERSION@,$NCURSES_MOUSE_VERSION,;t t
-+s,@NCURSES_SBOOL@,$NCURSES_SBOOL,;t t
-+s,@NCURSES_XNAMES@,$NCURSES_XNAMES,;t t
-+s,@cf_cv_enable_reentrant@,$cf_cv_enable_reentrant,;t t
-+s,@cf_cv_enable_opaque@,$cf_cv_enable_opaque,;t t
-+s,@NCURSES_OPAQUE@,$NCURSES_OPAQUE,;t t
-+s,@NCURSES_SIZE_T@,$NCURSES_SIZE_T,;t t
- s,@ECHO_LINK@,$ECHO_LINK,;t t
- s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t
- s,@EXTRA_CXXFLAGS@,$EXTRA_CXXFLAGS,;t t
-@@ -15993,6 +16791,7 @@
- s,@cf_cv_1UL@,$cf_cv_1UL,;t t
- s,@cf_cv_typeof_mmask_t@,$cf_cv_typeof_mmask_t,;t t
- s,@HAVE_VSSCANF@,$HAVE_VSSCANF,;t t
-+s,@TEST_LIBS@,$TEST_LIBS,;t t
- s,@CXXCPP@,$CXXCPP,;t t
- s,@CXXLDFLAGS@,$CXXLDFLAGS,;t t
- s,@CXX_AR@,$CXX_AR,;t t
-@@ -16015,14 +16814,22 @@
- s,@DFT_DEP_SUFFIX@,$DFT_DEP_SUFFIX,;t t
- s,@DFT_OBJ_SUBDIR@,$DFT_OBJ_SUBDIR,;t t
- s,@CXX_LIB_SUFFIX@,$CXX_LIB_SUFFIX,;t t
-+s,@TICS_ARG_SUFFIX@,$TICS_ARG_SUFFIX,;t t
-+s,@TICS_DEP_SUFFIX@,$TICS_DEP_SUFFIX,;t t
-+s,@TICS_LIB_SUFFIX@,$TICS_LIB_SUFFIX,;t t
-+s,@TICS_ARGS@,$TICS_ARGS,;t t
- s,@TINFO_ARG_SUFFIX@,$TINFO_ARG_SUFFIX,;t t
- s,@TINFO_DEP_SUFFIX@,$TINFO_DEP_SUFFIX,;t t
- s,@TINFO_LIB_SUFFIX@,$TINFO_LIB_SUFFIX,;t t
- s,@TINFO_ARGS@,$TINFO_ARGS,;t t
- s,@TINFO_ARGS2@,$TINFO_ARGS2,;t t
-+s,@LDFLAGS_STATIC@,$LDFLAGS_STATIC,;t t
-+s,@LDFLAGS_SHARED@,$LDFLAGS_SHARED,;t t
- s,@WITH_OVERWRITE@,$WITH_OVERWRITE,;t t
-+s,@TICS_LIST@,$TICS_LIST,;t t
- s,@TINFO_LIST@,$TINFO_LIST,;t t
- s,@SHLIB_LIST@,$SHLIB_LIST,;t t
-+s,@NCURSES_TREE@,$NCURSES_TREE,;t t
- s,@TEST_ARGS@,$TEST_ARGS,;t t
- s,@TEST_DEPS@,$TEST_DEPS,;t t
- s,@TEST_ARG2@,$TEST_ARG2,;t t
-@@ -16146,7 +16953,7 @@
-   esac
- 
-   if test x"$ac_file" != x-; then
--    { echo "$as_me:16149: creating $ac_file" >&5
-+    { echo "$as_me:16956: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
-     rm -f "$ac_file"
-   fi
-@@ -16164,7 +16971,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:16167: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:16974: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -16177,7 +16984,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:16180: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:16987: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -16243,7 +17050,7 @@
-   * )   ac_file_in=$ac_file.in ;;
-   esac
- 
--  test x"$ac_file" != x- && { echo "$as_me:16246: creating $ac_file" >&5
-+  test x"$ac_file" != x- && { echo "$as_me:17053: creating $ac_file" >&5
- echo "$as_me: creating $ac_file" >&6;}
- 
-   # First look for the input files in the build tree, otherwise in the
-@@ -16254,7 +17061,7 @@
-       -) echo $tmp/stdin ;;
-       [\\/$]*)
-          # Absolute (can't be DOS-style, as IFS=:)
--         test -f "$f" || { { echo "$as_me:16257: error: cannot find input file: $f" >&5
-+         test -f "$f" || { { echo "$as_me:17064: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          echo $f;;
-@@ -16267,7 +17074,7 @@
-            echo $srcdir/$f
-          else
-            # /dev/null tree
--           { { echo "$as_me:16270: error: cannot find input file: $f" >&5
-+           { { echo "$as_me:17077: error: cannot find input file: $f" >&5
- echo "$as_me: error: cannot find input file: $f" >&2;}
-    { (exit 1); exit 1; }; }
-          fi;;
-@@ -16325,7 +17132,7 @@
-   rm -f $tmp/in
-   if test x"$ac_file" != x-; then
-     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
--      { echo "$as_me:16328: $ac_file is unchanged" >&5
-+      { echo "$as_me:17135: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-@@ -16400,7 +17207,6 @@
- 		continue
- 	elif test -f $srcdir/$cf_dir/modules; then
- 
--		IMPORT_LIB=
- 		SHARED_LIB=
- 		LIBS_TO_MAKE=
- 		for cf_item in $cf_LIST_MODELS
-@@ -16467,9 +17273,7 @@
- 			# use autodetected ${cf_prefix} for import lib and static lib, but
- 			# use 'cyg' prefix for shared lib.
- 			if test $cf_cv_shlib_version = cygdll ; then
--				SHARED_LIB="cyg${cf_dir}\${ABI_VERSION}.dll"
--				IMPORT_LIB="${cf_prefix}${cf_dir}.dll.a"
--				LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/\${SHARED_LIB} ../lib/\${IMPORT_LIB}"
-+				LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/cyg${cf_dir}\${ABI_VERSION}.dll"
- 				continue
- 			fi
- 			fi
-@@ -16478,17 +17282,34 @@
- 
- 		if test $cf_dir = ncurses ; then
- 			cf_subsets="$LIB_SUBSETS"
--			cf_termlib=`echo "$cf_subsets" |sed -e 's/ .*$//'`
--			if test "$cf_termlib" != "$cf_subsets" ; then
--				cf_item=`echo $LIBS_TO_MAKE |sed -e s%${LIB_NAME}${LIB_SUFFIX}%${TINFO_LIB_SUFFIX}%g`
--				LIBS_TO_MAKE="$cf_item $LIBS_TO_MAKE"
--			fi
-+			cf_r_parts="$cf_subsets"
-+
-+			while test -n "$cf_r_parts"
-+			do
-+				cf_l_parts=`echo "$cf_r_parts" |sed -e 's/ .*$//'`
-+				cf_r_parts=`echo "$cf_r_parts" |sed -e 's/^[^ ]* //'`
-+				if test "$cf_l_parts" != "$cf_r_parts" ; then
-+					case $cf_l_parts in #(vi
-+					*termlib*) #(vi
-+						cf_item=`echo $LIBS_TO_MAKE |sed -e s%${LIB_NAME}${LIB_SUFFIX}%${TINFO_LIB_SUFFIX}%g`
-+						;;
-+					*ticlib*)
-+						cf_item=`echo $LIBS_TO_MAKE |sed -e s%${LIB_NAME}${LIB_SUFFIX}%${TICS_LIB_SUFFIX}%g`
-+						;;
-+					*)
-+						break
-+						;;
-+					esac
-+					LIBS_TO_MAKE="$cf_item $LIBS_TO_MAKE"
-+				else
-+					break
-+				fi
-+			done
- 		else
- 			cf_subsets=`echo "$LIB_SUBSETS" | sed -e 's/^termlib.* //'`
- 		fi
- 
- 		sed -e "s%@LIBS_TO_MAKE@%$LIBS_TO_MAKE%" \
--		    -e "s%@IMPORT_LIB@%$IMPORT_LIB%" \
- 		    -e "s%@SHARED_LIB@%$SHARED_LIB%" \
- 			$cf_dir/Makefile >$cf_dir/Makefile.out
- 		mv $cf_dir/Makefile.out $cf_dir/Makefile
-@@ -16546,13 +17367,20 @@
- 				case $cf_subset in
- 				*base*)
- 					;;
--				termlib*)
-+				*termlib*)
- 					cf_libname=$TINFO_LIB_SUFFIX
- 					if test -n "${DFT_ARG_SUFFIX}" ; then
- 						# undo $LIB_SUFFIX add-on in CF_LIB_SUFFIX
- 						cf_suffix=`echo $cf_suffix |sed -e "s%^${LIB_SUFFIX}%%"`
- 					fi
--				;;
-+					;;
-+				ticlib*)
-+					cf_libname=$TICS_LIB_SUFFIX
-+					if test -n "${DFT_ARG_SUFFIX}" ; then
-+						# undo $LIB_SUFFIX add-on in CF_LIB_SUFFIX
-+						cf_suffix=`echo $cf_suffix |sed -e "s%^${LIB_SUFFIX}%%"`
-+					fi
-+					;;
- 				esac
- 			fi
- 
-@@ -16593,8 +17421,11 @@
- 				prefix=$cf_prefix \
- 				suffix=$cf_suffix \
- 				subset=$cf_subset \
-+				TermlibRoot=$TINFO_NAME \
-+				TermlibSuffix=$TINFO_SUFFIX \
- 				ShlibVer=$cf_cv_shlib_version \
- 				ShlibVerInfix=$cf_cv_shlib_version_infix \
-+				ReLink=${cf_cv_do_relink-no} \
- 				DoLinks=$cf_cv_do_symlinks \
- 				rmSoLocs=$cf_cv_rm_so_locs \
- 				ldconfig="$LDCONFIG" \
-@@ -16681,8 +17512,8 @@
- 
- cat >> Makefile <<CF_EOF
- 
--install.data \\
--uninstall.data ::
-+install.libs uninstall.libs \\
-+install.data uninstall.data ::
- $MAKE_TERMINFO	cd misc && \${MAKE} \${CF_MFLAGS} \$@
- 
- install.man \\
-@@ -16691,7 +17522,7 @@
- 
- distclean ::
- 	rm -f config.cache config.log config.status Makefile include/ncurses_cfg.h
--	rm -f headers.sh headers.sed
-+	rm -f headers.sh headers.sed mk_shared_lib.sh
- 	rm -rf \${DIRS_TO_MAKE}
- CF_EOF
- 
-@@ -16795,41 +17626,10 @@
- 	fi
- 
- 	if test -f $srcdir/$cf_dir/headers; then
--	cat >>$cf_dir/Makefile <<CF_EOF
--\${DESTDIR}\${includedir} :
--	sh \${srcdir}/../mkinstalldirs \$@
--
--install \\
--install.libs \\
--install.includes :: \${AUTO_SRC} \${DESTDIR}\${includedir} \\
--CF_EOF
--		j=""
--		for i in `cat $srcdir/$cf_dir/headers |fgrep -v "#"`
--		do
--			test -n "$j" && echo "		$j \\" >>$cf_dir/Makefile
--			j=$i
--		done
--
--		echo "		$j" >>$cf_dir/Makefile
--
--		for i in `cat $srcdir/$cf_dir/headers |fgrep -v "#"`
--		do
--			echo "	@ (cd \${DESTDIR}\${includedir} && rm -f `basename $i`) ; ../headers.sh \${INSTALL_DATA} \${DESTDIR}\${includedir} \${srcdir} $i" >>$cf_dir/Makefile
--			test $i = curses.h && test $WITH_CURSES_H = yes && echo "	@ (cd \${DESTDIR}\${includedir} && rm -f ncurses.h && \${LN_S} curses.h ncurses.h)" >>$cf_dir/Makefile
--		done
--
--	cat >>$cf_dir/Makefile <<CF_EOF
--
--uninstall \\
--uninstall.libs \\
--uninstall.includes ::
--CF_EOF
--		for i in `cat $srcdir/$cf_dir/headers |fgrep -v "#"`
--		do
--			i=`basename $i`
--			echo "	-@ (cd \${DESTDIR}\${includedir} && rm -f $i)" >>$cf_dir/Makefile
--			test $i = curses.h && echo "	-@ (cd \${DESTDIR}\${includedir} && rm -f ncurses.h)" >>$cf_dir/Makefile
--		done
-+		$AWK -f $srcdir/mk-hdr.awk \
-+			subset="$LIB_SUBSETS" \
-+			compat="$WITH_CURSES_H" \
-+			$srcdir/$cf_dir/headers >>$cf_dir/Makefile
- 	fi
- 
- 	if test -f $srcdir/$cf_dir/modules; then
-diff -Naur ncurses-5.6.orig/configure.in ncurses-5.6/configure.in
---- ncurses-5.6.orig/configure.in	2006-12-16 20:26:06.000000000 -0500
-+++ ncurses-5.6/configure.in	2008-06-18 06:49:50.000000000 -0400
-@@ -1,5 +1,5 @@
- dnl***************************************************************************
--dnl Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+dnl Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
- dnl                                                                          *
- dnl Permission is hereby granted, free of charge, to any person obtaining a  *
- dnl copy of this software and associated documentation files (the            *
-@@ -28,14 +28,14 @@
- dnl
- dnl Author: Thomas E. Dickey 1995-on
- dnl
--dnl $Id: configure.in,v 1.383 2006/12/17 01:26:06 tom Exp $
-+dnl $Id: configure.in,v 1.434 2008/05/17 19:50:19 tom Exp $
- dnl Process this file with autoconf to produce a configure script.
- dnl
- dnl See http://invisible-island.net/autoconf/ for additional information.
- dnl
- dnl ---------------------------------------------------------------------------
- AC_PREREQ(2.13.20020210)
--AC_REVISION($Revision: 1.383 $)
-+AC_REVISION($Revision: 1.434 $)
- AC_INIT(ncurses/base/lib_initscr.c)
- AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
- 
-@@ -150,13 +150,28 @@
- CF_PROG_LINT
- AC_PROG_LN_S
- 
-+AC_SYS_LONG_FILE_NAMES
-+
-+AC_MSG_CHECKING(if we should assume mixed-case filenames)
-+AC_ARG_ENABLE(mixed-case,
-+	[  --enable-mixed-case     tic should assume mixed-case filenames],
-+	[enable_mixedcase=$enableval],
-+	[enable_mixedcase=auto])
-+AC_MSG_RESULT($enable_mixedcase)
-+if test "$enable_mixedcase" = "auto" ; then
-+    CF_MIXEDCASE_FILENAMES
-+else
-+    cf_cv_mixedcase=$enable_mixedcase
-+    if test "$enable_mixedcase" = "yes" ; then
-+        AC_DEFINE(MIXEDCASE_FILENAMES)
-+    fi
-+fi
-+
-+# do this after mixed-case option (tags/TAGS is not as important as tic).
- AC_PROG_MAKE_SET
- CF_MAKE_TAGS
- CF_MAKEFLAGS
- 
--AC_SYS_LONG_FILE_NAMES
--CF_MIXEDCASE_FILENAMES
--
- dnl These are standard among *NIX systems, but not when cross-compiling
- AC_CHECK_TOOL(RANLIB, ranlib, ':')
- AC_CHECK_TOOL(LD, ld, ld)
-@@ -255,6 +270,9 @@
- AC_SUBST(DFT_LWR_MODEL)dnl	the default model ("normal")
- AC_SUBST(DFT_UPR_MODEL)dnl	the default model ("NORMAL")
- 
-+TICS_NAME=tic
-+AC_SUBST(TICS_NAME)
-+
- TINFO_NAME=tinfo
- AC_SUBST(TINFO_NAME)
- 
-@@ -280,6 +298,13 @@
- 	[with_termlib=no])
- AC_MSG_RESULT($with_termlib)
- 
-+AC_MSG_CHECKING(if you want to build a separate tic library)
-+AC_ARG_WITH(ticlib,
-+	[  --with-ticlib           generate separate tic library],
-+	[with_ticlib=$withval],
-+	[with_ticlib=no])
-+AC_MSG_RESULT($with_ticlib)
-+
- ### Checks for special libraries, must be done up-front.
- SHLIB_LIST=""
- CF_WITH_GPM
-@@ -304,9 +329,7 @@
- 		SHLIB_LIST="-lgpm $SHLIB_LIST"
- 	fi
- 	AC_DEFINE(HAVE_LIBGPM)
--	AC_CHECK_LIB(gpm,Gpm_Wgetch,[
--		AC_MSG_WARN(GPM library is already linked with curses - read the FAQ)
--	])
-+	CF_CHECK_GPM_WGETCH
- fi
- 
- CF_WITH_SYSMOUSE
-@@ -336,12 +359,22 @@
- AC_SUBST(LD_MODEL)dnl		the type of link (e.g., -g or -pg)
- AC_MSG_RESULT($LD_MODEL)
- 
-+case $DFT_LWR_MODEL in
-+shared)
- AC_MSG_CHECKING(if rpath option should be used)
- AC_ARG_ENABLE(rpath,
- [  --enable-rpath          use rpath option when generating shared libraries],
- [cf_cv_ld_rpath=$enableval],
- [cf_cv_ld_rpath=no])
- AC_MSG_RESULT($cf_cv_ld_rpath)
-+AC_MSG_CHECKING(if shared libraries should be relinked during install)
-+AC_ARG_ENABLE(relink,
-+[  --disable-relink        relink shared libraries during install],
-+[cf_cv_do_relink=$enableval],
-+[cf_cv_do_relink=yes])
-+AC_MSG_RESULT($cf_cv_do_relink)
-+	;;
-+esac
- 
- CF_SHARED_OPTS
- if test "$CC_SHARED_OPTS" = "unknown"; then
-@@ -470,6 +503,19 @@
- AC_MSG_RESULT($with_big_core)
- test "$with_big_core" = "yes" && AC_DEFINE(HAVE_BIG_CORE)
- 
-+### ISO C only guarantees 512-char strings, we have tables which load faster
-+### when constructed using "big" strings.
-+AC_MSG_CHECKING(if big-strings option selected)
-+AC_ARG_ENABLE(big-strings,
-+	[  --disable-big-strings   assume compiler has only standard-size strings],
-+	[with_big_strings=no],
-+	[with_big_strings=yes])
-+AC_MSG_RESULT($with_big_strings)
-+
-+USE_BIG_STRINGS=0
-+test "$with_big_strings" = "yes" && USE_BIG_STRINGS=1
-+AC_SUBST(USE_BIG_STRINGS)
-+
- ###	use option --enable-termcap to compile in the termcap fallback support
- AC_MSG_CHECKING(if you want termcap-fallback support)
- AC_ARG_ENABLE(termcap,
-@@ -487,6 +533,10 @@
- 	AC_DEFINE(PURE_TERMINFO)
- else
- 
-+if test "$with_ticlib" != no ; then
-+	AC_ERROR(Options --with-ticlib and --enable-termcap cannot be combined)
-+fi
-+
- AC_DEFINE(USE_TERMCAP)
- AC_MSG_CHECKING(for list of termcap files)
- CF_WITH_PATHLIST(termpath,
-@@ -683,7 +733,7 @@
- 
- CF_LARGEFILE
- 
--###   use option --disable-tparm-varargs to make tparm() conform to X/Open 
-+###   use option --disable-tparm-varargs to make tparm() conform to X/Open
- AC_MSG_CHECKING(if you want tparm not to use X/Open fixed-parameter list)
- AC_ARG_ENABLE(tparm-varargs,
- 	[  --disable-tparm-varargs compile tparm() without varargs interface],
-@@ -786,6 +836,40 @@
- fi
- AC_SUBST(NCURSES_CONST)
- 
-+###   use option --enable-ext-colors to turn on use of colors beyond 16.
-+AC_MSG_CHECKING(if you want to use extended colors)
-+AC_ARG_ENABLE(ext-colors,
-+	[  --enable-ext-colors     compile for 256-color support],
-+	[with_ext_colors=$enableval],
-+	[with_ext_colors=no])
-+AC_MSG_RESULT($with_ext_colors)
-+NCURSES_EXT_COLORS=0
-+if test "$with_ext_colors" = yes ; then
-+	if test "$with_widec" != yes ; then
-+		AC_MSG_ERROR(This option applies only to wide-character library)
-+	else
-+		# cannot be ABI 5 since it changes sizeof(cchar_t)
-+		CF_NCURSES_ABI_6
-+	fi
-+	NCURSES_EXT_COLORS=1
-+	AC_DEFINE(NCURSES_EXT_COLORS)
-+fi
-+AC_SUBST(NCURSES_EXT_COLORS)
-+
-+###   use option --enable-ext-mouse to modify coding to support 5-button mice
-+AC_MSG_CHECKING(if you want to use extended mouse encoding)
-+AC_ARG_ENABLE(ext-mouse,
-+	[  --enable-ext-mouse      compile for extended mouse-encoding],
-+	[with_ext_mouse=$enableval],
-+	[with_ext_mouse=no])
-+AC_MSG_RESULT($with_ext_mouse)
-+NCURSES_MOUSE_VERSION=1
-+if test "$with_ext_mouse" = yes ; then
-+	NCURSES_MOUSE_VERSION=2
-+	CF_NCURSES_ABI_6
-+fi
-+AC_SUBST(NCURSES_MOUSE_VERSION)
-+
- AC_MSG_CHECKING(if you want \$NCURSES_NO_PADDING code)
- AC_ARG_ENABLE(no-padding,
- 	[  --enable-no-padding     compile with $NCURSES_NO_PADDING code],
-@@ -802,7 +886,7 @@
- fi
- AC_MSG_CHECKING(if you want to use signed Boolean array in term.h)
- AC_ARG_ENABLE(signed-char,
--	[  --enable-signed-char    compile with SIGWINCH handler],
-+	[  --enable-signed-char    compile using signed Boolean's in term.h],
- 	[with_signed_char=$enableval],
- 	[with_signed_char=no])
- AC_MSG_RESULT($with_signed_char)
-@@ -885,39 +969,42 @@
- AC_MSG_RESULT($with_colorfgbg)
- test "$with_colorfgbg" = yes && AC_DEFINE(USE_COLORFGBG)
- 
--###   use option --enable-ext-colors to turn on use of colors beyond 16.
--AC_MSG_CHECKING(if you want to use experimental extended colors)
--AC_ARG_ENABLE(ext-colors,
--	[  --enable-ext-colors     compile for experimental 256-color support],
--	[with_ext_colors=$enableval],
--	[with_ext_colors=no])
--AC_MSG_RESULT($with_ext_colors)
--NCURSES_EXT_COLORS=0
--if test "$with_ext_colors" = yes ; then
--	if test "$with_widec" != yes ; then
--		AC_MSG_WARN(This option applies only to wide-character library)
--	else
--		# cannot be ABI 5 since it changes sizeof(cchar_t)
--		CF_NCURSES_ABI_6
--	fi
--	NCURSES_EXT_COLORS=1
--	AC_DEFINE(NCURSES_EXT_COLORS)
--fi
--AC_SUBST(NCURSES_EXT_COLORS)
--
--###   use option --enable-ext-mouse to modify coding to support 5-button mice
--AC_MSG_CHECKING(if you want to use experimental extended mouse encoding)
--AC_ARG_ENABLE(ext-mouse,
--	[  --enable-ext-mouse      compile for experimental mouse-encoding],
--	[with_ext_mouse=$enableval],
--	[with_ext_mouse=no])
--AC_MSG_RESULT($with_ext_mouse)
--NCURSES_MOUSE_VERSION=1
--if test "$with_ext_mouse" = yes ; then
--	NCURSES_MOUSE_VERSION=2
-+# This is still experimental (20080329), but should ultimately be moved to
-+# the script-block --with-normal, etc.
-+CF_WITH_PTHREAD
-+if test "$with_pthread" = "yes" ; then
-+    AC_DEFINE(USE_PTHREADS)
-+    enable_reentrant=yes
-+fi
-+
-+# Reentrant code has to be opaque; there's little advantage to making ncurses
-+# opaque outside of that, so there is no --enable-opaque option.  We can use
-+# this option without --with-pthreads, but this will be always set for
-+# pthreads.
-+AC_MSG_CHECKING(if you want experimental reentrant code)
-+AC_ARG_ENABLE(reentrant,
-+	[  --enable-reentrant      compile with experimental reentrant code],
-+	[with_reentrant=$enableval],
-+	[with_reentrant=no])
-+AC_MSG_RESULT($with_reentrant)
-+if test "$with_reentrant" = yes ; then
-+	cf_cv_enable_reentrant=1
-+	cf_cv_enable_opaque="NCURSES_INTERNALS"
-+	NCURSES_OPAQUE=1
-+	NCURSES_SIZE_T=int
-+	LIB_SUFFIX="t${LIB_SUFFIX}"
-+	AC_DEFINE(USE_REENTRANT)
- 	CF_NCURSES_ABI_6
--fi
--AC_SUBST(NCURSES_MOUSE_VERSION)
-+else
-+	cf_cv_enable_reentrant=0
-+	cf_cv_enable_opaque="NCURSES_OPAQUE"
-+	NCURSES_OPAQUE=0
-+	NCURSES_SIZE_T=short
-+fi
-+AC_SUBST(cf_cv_enable_reentrant)
-+AC_SUBST(cf_cv_enable_opaque)
-+AC_SUBST(NCURSES_OPAQUE)
-+AC_SUBST(NCURSES_SIZE_T)
- 
- AC_MSG_CHECKING(if you want experimental safe-sprintf code)
- AC_ARG_ENABLE(safe-sprintf,
-@@ -961,6 +1048,7 @@
- else
- 	ECHO_LINK='@ echo linking $@ ... ;'
- 	test -n "$LIBTOOL" && LIBTOOL="$LIBTOOL --silent"
-+	test -n "$LIBTOOL_CXX" && LIBTOOL_CXX="$LIBTOOL_CXX --silent"
- fi
- AC_MSG_RESULT($with_echo)
- AC_SUBST(ECHO_LINK)
-@@ -972,9 +1060,9 @@
- 	[with_warnings=$enableval])
- AC_MSG_RESULT($with_warnings)
- 
--if test -n "$with_warnings"; then
-+if test "x$with_warnings" = "xyes"; then
-  	ADAFLAGS="$ADAFLAGS -gnatg"
--	CF_GCC_WARNINGS
-+	CF_GCC_WARNINGS(Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum)
- 	if test "$cf_with_cxx" = yes ; then
- 		CF_GXX_WARNINGS(Wno-unused)
- 	fi
-@@ -1088,26 +1176,21 @@
- ###	checks for compiler characteristics
- AC_LANG_C
- AC_C_CONST
--AC_C_INLINE
--
--NCURSES_INLINE=
--if test "$ac_cv_c_inline" != no ; then
--	AC_DEFINE(CC_HAS_INLINE_FUNCS)
--	NCURSES_INLINE=inline
--fi
--AC_SUBST(NCURSES_INLINE)
-+CF_C_INLINE(NCURSES_INLINE,1200)
-+CF_SIG_ATOMIC_T
- 
- if test $NCURSES_CHTYPE = auto ; then
- 	CF_TYPEOF_CHTYPE
- else
- 	cf_cv_typeof_chtype=$NCURSES_CHTYPE
- fi
-+test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
- AC_SUBST(cf_cv_typeof_chtype)
- 
- CF_UNSIGNED_LITERALS
- cf_cv_1UL="1"
--test "$cf_cv_unsigned_literals" = yes && cf_cv_1UL="${cf_cv_1UL}U"
--test "$cf_cv_typeof_chtype"    = long && cf_cv_1UL="${cf_cv_1UL}L"
-+test ".$cf_cv_unsigned_literals" = .yes && cf_cv_1UL="${cf_cv_1UL}U"
-+test ".$cf_cv_typeof_chtype"    = .long && cf_cv_1UL="${cf_cv_1UL}L"
- AC_SUBST(cf_cv_1UL)
- 
- if test $NCURSES_MMASK_T = auto ; then
-@@ -1115,6 +1198,7 @@
- else
- 	cf_cv_typeof_mmask_t=$NCURSES_MMASK_T
- fi
-+test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
- AC_SUBST(cf_cv_typeof_mmask_t)
- 
- ###	Checks for external-data
-@@ -1168,9 +1252,20 @@
- CF_FUNC_MEMMOVE
- CF_FUNC_POLL
- 
-+# special check for test/ditto.c
-+CF_FUNC_OPENPTY
-+if test "$cf_cv_func_openpty" != no ; then
-+    AC_DEFINE_UNQUOTED(USE_OPENPTY_HEADER,<$cf_cv_func_openpty>)
-+    AC_DEFINE(USE_XTERM_PTY)
-+    if test "$cf_cv_lib_util" = yes ; then
-+        TEST_LIBS="-lutil $TEST_LIBS"
-+    fi
-+fi
-+AC_SUBST(TEST_LIBS)
-+
- if test "$with_hashed_db" != no ; then
- 	AC_DEFINE(USE_HASHED_DB)
--	CF_HASHED_DB
-+	CF_HASHED_DB($with_hashed_db)
- fi
- 
- dnl We'll do our own -g libraries, unless the user's overridden via $CFLAGS
-@@ -1200,14 +1295,13 @@
- 		;;
- 	esac
- 
--	AC_CHECK_HEADERS(typeinfo)
-+	AC_CHECK_HEADERS(iostream typeinfo)
- 
- 	CF_BOOL_DECL
- 	CF_BOOL_SIZE
- 	CF_ETIP_DEFINES
- 	CF_CPP_PARAM_INIT
- 	CF_CPP_STATIC_CAST
--	CF_CPP_VSCAN_FUNC
- 
- 	CXX_AR='$(AR)'
- 	CXX_AR_OPTS='$(AR_OPTS)'
-@@ -1284,9 +1378,22 @@
- 
- CF_HELP_MESSAGE(Ada95 Binding Options:)
- 
-+dnl If the Ada95 source-tree is present, add that to the build unless it will
-+dnl not work, or was not requested.
-+if test -f "${srcdir}/Ada95/Makefile.in" ; then
-+
-+dnl libtool does not know anything about GNAT, though a change made in 1998
-+dnl provided for it "someday".  Disable the ada subtree if we are using
-+dnl libtool -TD 20070714
-+if test "$cf_with_ada" != "no" ; then
-+    if test "$with_libtool" != "no"; then
-+	AC_MSG_WARN(libtool does not support Ada - disabling feature)
-+	cf_with_ada=no
-+    fi
-+fi
-+
- dnl Check for availability of GNU Ada Translator (GNAT).
- dnl At the moment we support no other Ada95 compiler.
--if test -f "${srcdir}/Ada95/Makefile.in" ; then
- if test "$cf_with_ada" != "no" ; then
- cf_ada_make=gnatmake
- AC_CHECK_PROG(gnat_exists, $cf_ada_make, yes, no)
-@@ -1369,22 +1476,44 @@
- 
- fi
- fi
-+else
-+   cf_with_ada=no
- fi
- 
--### Construct the library-subsets, if any, from this set of keywords:
--### none, base, ext_funcs, ext_tinfo, termlib, widechar (see CF_LIB_RULES).
-+### Construct the ncurses library-subsets, if any, from this set of keywords:
-+###	none, base, ext_funcs, ext_tinfo, ticlib, termlib, widechar
-+###
-+### ticlib modules may be a separate library, otherwise contained in termlib.
-+### termlib modules may be a separate library, otherwise contained in ncurses.
-+###
-+### The of "+" or " " between the tokens controls the way the script
-+### chooses to split module lists into libraries.
-+###
-+### (see CF_LIB_RULES).
- AC_MSG_CHECKING(for library subsets)
-+LIB_SUBSETS=
-+
-+if test "$cf_with_progs" = yes || test "$with_ticlib" != no || test "$with_termcap" != no; then
-+	LIB_SUBSETS="${LIB_SUBSETS}ticlib"
-+	if test "$with_ticlib" != no ; then
-+		LIB_SUBSETS="${LIB_SUBSETS} "
-+	else
-+		LIB_SUBSETS="${LIB_SUBSETS}+"
-+	fi
-+fi
-+
-+LIB_SUBSETS="${LIB_SUBSETS}termlib"
-+test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_tinfo"
- if test "$with_termlib" != no ; then
--	LIB_SUBSETS="termlib"
--	test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_tinfo"
- 	LIB_SUBSETS="${LIB_SUBSETS} "
- else
--	LIB_SUBSETS="termlib+"
--	test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}ext_tinfo+"
-+	LIB_SUBSETS="${LIB_SUBSETS}+"
- fi
-+
- LIB_SUBSETS="${LIB_SUBSETS}base"
- test "$with_widec"     = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
- test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
-+
- AC_MSG_RESULT($LIB_SUBSETS)
- 
- ### Construct the list of include-directories to be generated
-@@ -1399,10 +1528,12 @@
- 
- AC_MSG_CHECKING(default library-dependency suffix)
- CF_LIB_SUFFIX($DFT_LWR_MODEL,DFT_DEP_SUFFIX)dnl
-+DFT_LIB_SUFFIX=$DFT_DEP_SUFFIX
- if test $DFT_LWR_MODEL = shared ; then
- 	case $cf_cv_system_name in #(vi
- 	cygwin*)
- 		DFT_DEP_SUFFIX=".dll.a"
-+		DFT_LIB_SUFFIX=".dll"
- 		;;
- 	esac
- fi
-@@ -1426,16 +1557,53 @@
- AC_SUBST(CXX_LIB_SUFFIX)
- fi
- 
-+# do not want -ldl in build except as needed for -lncurses dependency
-+if test "$with_dlsym" = yes ; then
-+if test $DFT_LWR_MODEL = shared || \
-+   test $DFT_LWR_MODEL = libtool ; then
-+	CF_REMOVE_LIB(LIBS,$LIBS,dl)
-+fi
-+fi
- ### Set up low-level terminfo dependencies for makefiles.
--TINFO_LIST="$SHLIB_LIST"
-+
-+# TICS_LIST and TINFO_LIST are needed to build libtic.so and libterm.so, but
-+# do not need libdl
-+TICS_LIST=
-+if test "$with_dlsym" = yes ; then
-+	CF_REMOVE_LIB(TINFO_LIST,$SHLIB_LIST,dl)
-+fi
-+
-+if test "$with_ticlib" != no ; then
-+
-+	if test "$with_ticlib" != yes ; then
-+		TICS_NAME=$with_ticlib
-+		TICS_ARG_SUFFIX="${with_ticlib}`echo ${DFT_ARG_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
-+		TICS_DEP_SUFFIX="${with_ticlib}`echo ${DFT_DEP_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
-+		TICS_LIB_SUFFIX="${with_ticlib}"
-+	else
-+		TICS_ARG_SUFFIX="${TICS_NAME}${DFT_ARG_SUFFIX}"
-+		TICS_DEP_SUFFIX="${TICS_NAME}${DFT_DEP_SUFFIX}"
-+		TICS_LIB_SUFFIX="${TICS_NAME}${LIB_SUFFIX}"
-+	fi
-+	TICS_ARGS="-L${LIB_DIR} -l${TICS_LIB_SUFFIX}"
-+else
-+	TICS_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
-+fi
-+AC_SUBST(TICS_ARG_SUFFIX)
-+AC_SUBST(TICS_DEP_SUFFIX)
-+AC_SUBST(TICS_LIB_SUFFIX)
-+AC_SUBST(TICS_ARGS)
-+
- if test "$with_termlib" != no ; then
- 
- 	if test "$with_termlib" != yes ; then
- 		TINFO_NAME=$with_termlib
-+		TINFO_SUFFIX="`echo ${DFT_LIB_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
- 		TINFO_ARG_SUFFIX="${with_termlib}`echo ${DFT_ARG_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
- 		TINFO_DEP_SUFFIX="${with_termlib}`echo ${DFT_DEP_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
- 		TINFO_LIB_SUFFIX="${with_termlib}"
- 	else
-+		TINFO_SUFFIX=${DFT_LIB_SUFFIX}
- 		TINFO_ARG_SUFFIX="${TINFO_NAME}${DFT_ARG_SUFFIX}"
- 		TINFO_DEP_SUFFIX="${TINFO_NAME}${DFT_DEP_SUFFIX}"
- 		TINFO_LIB_SUFFIX="${TINFO_NAME}${LIB_SUFFIX}"
-@@ -1450,21 +1618,52 @@
- 	else
- 		TEST_ARGS="-l${TINFO_ARG_SUFFIX}"
- 		TEST_ARG2="-l${TINFO_ARG_SUFFIX}"
-+		TICS_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
- 		TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS"
- 		SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
- 	fi
- else
-+	# the next lines are needed for linking libtic over libncurses
-+	TINFO_NAME=${LIB_NAME}
-+	TINFO_SUFFIX=${DFT_LIB_SUFFIX}
-+	TINFO_ARG_SUFFIX=${LIB_NAME}${DFT_ARG_SUFFIX}
-+	TICS_LIST="$SHLIB_LIST -l${LIB_NAME}${DFT_ARG_SUFFIX}"
-+
- 	TINFO_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
- fi
-+
-+if test "$DFT_LWR_MODEL" = shared ; then
-+	case $cf_cv_system_name in #(vi
-+	cygwin*)
-+		# "lib" files have ".dll.a" suffix, "cyg" files have ".dll"
-+		TINFO_SUFFIX=.dll
-+		;;
-+	esac
-+fi
-+
- AC_SUBST(TINFO_ARG_SUFFIX)
- AC_SUBST(TINFO_DEP_SUFFIX)
- AC_SUBST(TINFO_LIB_SUFFIX)
- AC_SUBST(TINFO_ARGS)
- 
-+if test "$with_dlsym" = yes ; then
-+	CF_REMOVE_LIB(TICS_LIST,$TICS_LIST,dl)
-+fi
-+
-+if test "$DFT_LWR_MODEL" = "libtool"; then
-+    OBJEXT=lo
-+fi
-+
- # needed for Ada95
- TINFO_ARGS2=`echo "$TINFO_ARGS" | sed -e 's,-L\.\./,-L../../,'`
- AC_SUBST(TINFO_ARGS2)
- 
-+case $DFT_LWR_MODEL in
-+normal|debug|profile)
-+	CF_LDFLAGS_STATIC
-+	;;
-+esac
-+
- AC_MSG_CHECKING(where we will install curses.h)
- test "$with_overwrite" = no && \
- test "x$includedir" = 'x${prefix}/include' && \
-@@ -1481,9 +1680,14 @@
- fi
- 
- AC_SUBST(WITH_OVERWRITE)
-+AC_SUBST(TICS_LIST)
- AC_SUBST(TINFO_LIST)
- AC_SUBST(SHLIB_LIST)
- 
-+# used to separate tack out of the tree
-+NCURSES_TREE=
-+AC_SUBST(NCURSES_TREE)
-+
- ### predefined stuff for the test programs
- AC_DEFINE(HAVE_SLK_COLOR)
- 
-@@ -1491,6 +1695,11 @@
- ### with the appropriate compile-rules.
- 
- CF_SRC_MODULES($modules_to_build)
-+
-+if test "$cf_with_ada" != "no" && test "$cf_cv_prog_gnat_correct" != "no"; then
-+   SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses-config"
-+fi
-+
- CF_DIRS_TO_MAKE
- 
- AC_DEFINE_UNQUOTED(NCURSES_PATHSEP,'$PATHSEP')
-@@ -1500,6 +1709,11 @@
- ### Now that we're done running tests, add the compiler-warnings, if any
- CF_ADD_CFLAGS($EXTRA_CFLAGS)
- 
-+### If we're building with rpath, try to link non-standard libs that way too.
-+if test "$DFT_LWR_MODEL" = "shared"; then
-+  CF_RPATH_HACK
-+fi
-+
- ### Define substitutions for header files to avoid name-pollution
- CF_SUBST_IF(["$cf_cv_have_tcgetattr" = yes], HAVE_TCGETATTR, 1, 0)
- CF_SUBST_IF(["$ac_cv_header_termio_h" = yes], HAVE_TERMIO_H, 1, 0)
-@@ -1540,13 +1754,19 @@
- TINFO_ARG_SUFFIX="$TINFO_ARG_SUFFIX"
- TINFO_LIB_SUFFIX="$TINFO_LIB_SUFFIX"
- TINFO_NAME="$TINFO_NAME"
-+TINFO_SUFFIX="$TINFO_SUFFIX"
-+TICS_ARG_SUFFIX="$TICS_ARG_SUFFIX"
-+TICS_LIB_SUFFIX="$TICS_LIB_SUFFIX"
-+TICS_NAME="$TICS_NAME"
- WITH_CURSES_H="$with_curses_h"
- WITH_ECHO="$with_echo"
- WITH_OVERWRITE="$with_overwrite"
- cf_LIST_MODELS="$cf_list_models"
- cf_cv_abi_version="$cf_cv_abi_version"
-+cf_cv_do_relink="$cf_cv_do_relink"
- cf_cv_do_symlinks="$cf_cv_do_symlinks"
- cf_cv_enable_lp64="$cf_cv_enable_lp64"
-+cf_cv_enable_opaque="$cf_cv_enable_opaque"
- cf_cv_prog_CC_c_o=$cf_cv_prog_CC_c_o
- cf_cv_prog_CXX_c_o=$cf_cv_prog_CXX_c_o
- cf_cv_rel_version="$cf_cv_rel_version"
-diff -Naur ncurses-5.6.orig/dist.mk ncurses-5.6/dist.mk
---- ncurses-5.6.orig/dist.mk	2006-12-17 14:58:35.000000000 -0500
-+++ ncurses-5.6/dist.mk	2008-06-18 06:49:52.000000000 -0400
-@@ -1,5 +1,5 @@
- ##############################################################################
--# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: dist.mk,v 1.567 2006/12/17 19:58:35 tom Exp $
-+# $Id: dist.mk,v 1.646 2008/06/14 18:11:41 tom Exp $
- # Makefile for creating ncurses distributions.
- #
- # This only needs to be used directly as a makefile by developers, but
-@@ -37,7 +37,7 @@
- # These define the major/minor/patch versions of ncurses.
- NCURSES_MAJOR = 5
- NCURSES_MINOR = 6
--NCURSES_PATCH = 20061217
-+NCURSES_PATCH = 20080614
- 
- # We don't append the patch to the version, since this only applies to releases
- VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-@@ -106,6 +106,7 @@
- 	   fi ;\
- 	done
- 	# change some things to make weblint happy:
-+	@cat man_alias.sed           >> subst.tmp
- 	@echo 's/<B>/<STRONG>/g'     >> subst.tmp
- 	@echo 's/<\/B>/<\/STRONG>/g' >> subst.tmp
- 	@echo 's/<I>/<EM>/g'         >> subst.tmp
-diff -Naur ncurses-5.6.orig/doc/hackguide.doc ncurses-5.6/doc/hackguide.doc
---- ncurses-5.6.orig/doc/hackguide.doc	2005-12-24 10:44:52.000000000 -0500
-+++ ncurses-5.6/doc/hackguide.doc	2008-06-18 06:49:44.000000000 -0400
-@@ -261,7 +261,7 @@
-      lib_tracedmp.c lib_tracemse.c trace_buf.c
- 
-    It  is  rather unlikely you will ever need to change these, unless you
--   want to introduce a new debug trace level for some reasoon.
-+   want to introduce a new debug trace level for some reason.
- 
-    There  is  another  group  of  files  that  do direct I/O via tputs(),
-    computations  on  the  terminal  capabilities,  or  queries  to the OS
-diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/A.htm ncurses-5.6/doc/html/ada/funcs/A.htm
---- ncurses-5.6.orig/doc/html/ada/funcs/A.htm	2005-05-14 13:34:32.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/funcs/A.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -4,6 +4,21 @@
- <H2>Functions - A</H2>
- <A HREF="../funcs.htm" TARGET="_self">[index]</A>
- <UL COMPACT TYPE=DISC>
-+<LI><A HREF="../terminal_interface-curses-panels__ads.htm#ref_129_13" TARGET="main">Above</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_523_14" TARGET="main">Add -  terminal_interface-curses.ads:523</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_528_14" TARGET="main">Add -  terminal_interface-curses.ads:528</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_534_14" TARGET="main">Add -  terminal_interface-curses.ads:534</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_542_14" TARGET="main">Add -  terminal_interface-curses.ads:542</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_653_14" TARGET="main">Add -  terminal_interface-curses.ads:653</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_662_14" TARGET="main">Add -  terminal_interface-curses.ads:662</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_677_14" TARGET="main">Add -  terminal_interface-curses.ads:677</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_686_14" TARGET="main">Add -  terminal_interface-curses.ads:686</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1307_14" TARGET="main">Add_Character_To_Pad_And_Echo_It -  terminal_interface-curses.ads:1307</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1312_14" TARGET="main">Add_Character_To_Pad_And_Echo_It -  terminal_interface-curses.ads:1312</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_551_14" TARGET="main">Add_With_Immediate_Echo -  terminal_interface-curses.ads:551</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_557_14" TARGET="main">Add_With_Immediate_Echo -  terminal_interface-curses.ads:557</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_959_16" TARGET="main">Ahead</A>
- <LI><A HREF="../terminal_interface-curses-forms-field_types-user__adb.htm#ref_53_16" TARGET="main">Allocate_Arg</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1016_14" TARGET="main">Allow_Scrolling</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1836_14" TARGET="main">Assume_Default_Colors</A>
- </UL></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/B.htm ncurses-5.6/doc/html/ada/funcs/B.htm
---- ncurses-5.6.orig/doc/html/ada/funcs/B.htm	2006-09-23 16:31:30.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/funcs/B.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -4,8 +4,18 @@
- <H2>Functions - B</H2>
- <A HREF="../funcs.htm" TARGET="_self">[index]</A>
- <UL COMPACT TYPE=DISC>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2085_16" TARGET="main">Baud</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_804_16" TARGET="main">Beeper</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_454_14" TARGET="main">Background -  terminal_interface-curses-forms.ads:454</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_459_14" TARGET="main">Background -  terminal_interface-curses-forms.ads:459</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_451_14" TARGET="main">Background -  terminal_interface-curses-menus.ads:451</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_456_14" TARGET="main">Background -  terminal_interface-curses-menus.ads:456</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2052_16" TARGET="main">Baud</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1647_13" TARGET="main">Baudrate</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_870_14" TARGET="main">Beep</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_751_16" TARGET="main">Beeper</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_975_16" TARGET="main">Behind</A>
-+<LI><A HREF="../terminal_interface-curses-panels__ads.htm#ref_134_13" TARGET="main">Below</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_704_14" TARGET="main">Border</A>
-+<LI><A HREF="../terminal_interface-curses-panels__ads.htm#ref_77_14" TARGET="main">Bottom</A>
- <LI><A HREF="../terminal_interface-curses-panels__adb.htm#ref_65_16" TARGET="main">Bottompanel</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_720_14" TARGET="main">Box</A>
- </UL></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/C.htm ncurses-5.6/doc/html/ada/funcs/C.htm
---- ncurses-5.6.orig/doc/html/ada/funcs/C.htm	2006-09-23 16:31:30.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/funcs/C.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -4,24 +4,53 @@
- <H2>Functions - C</H2>
- <A HREF="../funcs.htm" TARGET="_self">[index]</A>
- <UL COMPACT TYPE=DISC>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2245_16" TARGET="main">Canchangecolor</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_824_16" TARGET="main">Cbreak</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1021_16" TARGET="main">Clear_Ok</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2212_16" TARGET="main">Canchangecolor</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1739_13" TARGET="main">Can_Change_Color</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_771_16" TARGET="main">Cbreak</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_382_13" TARGET="main">Changed</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_845_14" TARGET="main">Change_Attributes -  terminal_interface-curses.ads:845</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_854_14" TARGET="main">Change_Attributes -  terminal_interface-curses.ads:854</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1116_14" TARGET="main">Change_Background</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1152_14" TARGET="main">Change_Lines_Status</A>
-+<LI><A HREF="../terminal_interface-curses-forms-field_types__ads.htm#ref_185_13" TARGET="main">Char_Check_Router</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1080_14" TARGET="main">Clear</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_968_16" TARGET="main">Clear_Ok</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_981_14" TARGET="main">Clear_On_Next_Update</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1533_14" TARGET="main">Clear_Soft_Label_Keys</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1094_14" TARGET="main">Clear_To_End_Of_Line</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1087_14" TARGET="main">Clear_To_End_Of_Screen</A>
- <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_98_13" TARGET="main">Col -  terminal_interface-curses-text_io.ads:98</A>
- <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_99_13" TARGET="main">Col -  terminal_interface-curses-text_io.ads:99</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2262_16" TARGET="main">Colorcontent</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1322_16" TARGET="main">Copywin</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2229_16" TARGET="main">Colorcontent</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1744_14" TARGET="main">Color_Content</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_415_13" TARGET="main">Columns</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1174_14" TARGET="main">Copy</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1267_16" TARGET="main">Copywin</A>
-+<LI><A HREF="../terminal_interface-curses-forms-field_types__ads.htm#ref_167_13" TARGET="main">Copy_Arg</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_774_16" TARGET="main">Count -  terminal_interface-curses-forms.adb:774</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_912_16" TARGET="main">Count -  terminal_interface-curses-menus.adb:912</A>
- <LI><A HREF="../terminal_interface-curses-forms-field_types-enumeration-ada__ads.htm#ref_48_13" TARGET="main">Create -  terminal_interface-curses-forms-field_types-enumeration-ada.ads:48</A>
- <LI><A HREF="../terminal_interface-curses-forms-field_types-enumeration__ads.htm#ref_64_13" TARGET="main">Create -  terminal_interface-curses-forms-field_types-enumeration.ads:64</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_293_13" TARGET="main">Create -  terminal_interface-curses-forms.ads:293</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_623_13" TARGET="main">Create -  terminal_interface-curses-forms.ads:623</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_191_13" TARGET="main">Create -  terminal_interface-curses-menus.ads:191</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_638_13" TARGET="main">Create -  terminal_interface-curses-menus.ads:638</A>
-+<LI><A HREF="../terminal_interface-curses-panels__ads.htm#ref_67_13" TARGET="main">Create -  terminal_interface-curses-panels.ads:67</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_569_13" TARGET="main">Create -  terminal_interface-curses.ads:569</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_729_13" TARGET="main">Current -  terminal_interface-curses-forms.ads:729</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_294_13" TARGET="main">Current -  terminal_interface-curses-menus.ads:294</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_1040_16" TARGET="main">Current_Fld</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_481_13" TARGET="main">Current_Window</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_300_16" TARGET="main">Curr_Item</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2475_16" TARGET="main">curses_versionC</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2349_16" TARGET="main">Curs_Set</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2461_16" TARGET="main">C_Assume_Default_Colors</A>
--<LI><A HREF="../terminal_interface-curses-forms-field_types__ads.htm#ref_149_13" TARGET="main">C_Builtin_Router</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2459_17" TARGET="main">curses_freeall</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1859_14" TARGET="main">Curses_Free_All</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1846_13" TARGET="main">Curses_Version</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2451_16" TARGET="main">curses_versionC</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2316_16" TARGET="main">Curs_Set</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2437_16" TARGET="main">C_Assume_Default_Colors</A>
-+<LI><A HREF="../terminal_interface-curses-forms-field_types__ads.htm#ref_148_13" TARGET="main">C_Builtin_Router</A>
-+<LI><A HREF="../terminal_interface-curses-forms-field_types__ads.htm#ref_149_13" TARGET="main">C_Choice_Router</A>
- <LI><A HREF="../terminal_interface-curses-forms-field_types-user-choice__ads.htm#ref_80_13" TARGET="main">C_Generic_Choice</A>
- <LI><A HREF="../terminal_interface-curses-forms-field_types-user__ads.htm#ref_81_13" TARGET="main">C_Generic_Type</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2449_16" TARGET="main">C_Use_Default_Colors</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2425_16" TARGET="main">C_Use_Default_Colors</A>
- </UL></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/D.htm ncurses-5.6/doc/html/ada/funcs/D.htm
---- ncurses-5.6.orig/doc/html/ada/funcs/D.htm	2006-09-23 16:31:30.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/funcs/D.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -4,19 +4,44 @@
- <H2>Functions - D</H2>
- <A HREF="../funcs.htm" TARGET="_self">[index]</A>
- <UL COMPACT TYPE=DISC>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2033_16" TARGET="main">Defkey</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2281_16" TARGET="main">Def_Prog_Mode</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2283_16" TARGET="main">Def_Shell_Mode</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2065_16" TARGET="main">Delayoutput</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_692_13" TARGET="main">Data_Ahead</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_697_13" TARGET="main">Data_Behind</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_102_13" TARGET="main">Default_Field_Options</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_125_13" TARGET="main">Default_Form_Options</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_168_13" TARGET="main">Default_Item_Options</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_146_13" TARGET="main">Default_Menu_Options</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1596_14" TARGET="main">Define_Key</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2000_16" TARGET="main">Defkey</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2248_16" TARGET="main">Def_Prog_Mode</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2250_16" TARGET="main">Def_Shell_Mode</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2032_16" TARGET="main">Delayoutput</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1633_14" TARGET="main">Delay_Output</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_315_14" TARGET="main">Delete -  terminal_interface-curses-forms.ads:315</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_634_14" TARGET="main">Delete -  terminal_interface-curses-forms.ads:634</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_203_14" TARGET="main">Delete -  terminal_interface-curses-menus.ads:203</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_645_14" TARGET="main">Delete -  terminal_interface-curses-menus.ads:645</A>
-+<LI><A HREF="../terminal_interface-curses-panels__ads.htm#ref_139_14" TARGET="main">Delete -  terminal_interface-curses-panels.ads:139</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_588_14" TARGET="main">Delete -  terminal_interface-curses.ads:588</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1334_14" TARGET="main">Delete_Character -  terminal_interface-curses.ads:1334</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1339_14" TARGET="main">Delete_Character -  terminal_interface-curses.ads:1339</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1212_14" TARGET="main">Delete_Line</A>
- <LI><A HREF="../terminal_interface-curses-panels__adb.htm#ref_156_16" TARGET="main">Del_Panel</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_351_16" TARGET="main">Derwin</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_604_13" TARGET="main">Derived_Window</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_298_16" TARGET="main">Derwin</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_126_16" TARGET="main">Descname -  terminal_interface-curses-menus.adb:126</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_270_16" TARGET="main">Descname -  terminal_interface-curses-menus.adb:270</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_278_16" TARGET="main">Descname -  terminal_interface-curses-menus.adb:278</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_274_14" TARGET="main">Description -  terminal_interface-curses-menus.ads:274</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_278_14" TARGET="main">Description -  terminal_interface-curses-menus.ads:278</A>
- <LI><A HREF="../terminal_interface-curses-mouse__adb.htm#ref_134_14" TARGET="main">Dispatch_Event</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1114_16" TARGET="main">Do_Update</A>
--<LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_973_16" TARGET="main">Driver</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_374_16" TARGET="main">Dupwin</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1059_16" TARGET="main">Do_Update</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_711_13" TARGET="main">Driver -  terminal_interface-curses-forms.ads:711</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_660_13" TARGET="main">Driver -  terminal_interface-curses-menus.ads:660</A>
-+<LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_973_16" TARGET="main">Driver -  terminal_interface-curses-menus.adb:973</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_321_13" TARGET="main">Duplicate -  terminal_interface-curses-forms.ads:321</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_614_13" TARGET="main">Duplicate -  terminal_interface-curses.ads:614</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_321_16" TARGET="main">Dupwin</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_151_16" TARGET="main">Dup_Field</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_493_14" TARGET="main">Dynamic_Info</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_559_16" TARGET="main">Dyn_Info</A>
- </UL></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/E.htm ncurses-5.6/doc/html/ada/funcs/E.htm
---- ncurses-5.6.orig/doc/html/ada/funcs/E.htm	2006-09-23 16:31:30.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/funcs/E.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -4,7 +4,15 @@
- <H2>Functions - E</H2>
- <A HREF="../funcs.htm" TARGET="_self">[index]</A>
- <UL COMPACT TYPE=DISC>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_862_16" TARGET="main">Echo</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_166_16" TARGET="main">Endwin</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2093_16" TARGET="main">Erasechar</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_809_16" TARGET="main">Echo</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1586_14" TARGET="main">Enable_Key</A>
-+<LI><A HREF="../terminal_interface-curses-mouse__ads.htm#ref_154_13" TARGET="main">Enclosed_In_Window</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_113_16" TARGET="main">Endwin</A>
-+<LI><A HREF="../terminal_interface-curses-mouse__ads.htm#ref_128_14" TARGET="main">End_Mouse</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_497_14" TARGET="main">End_Screen</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_495_14" TARGET="main">End_Windows</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1074_14" TARGET="main">Erase</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2060_16" TARGET="main">Erasechar</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1652_13" TARGET="main">Erase_Character</A>
-+<LI><A HREF="../terminal_interface-curses-aux__ads.htm#ref_96_14" TARGET="main">Eti_Exception</A>
- </UL></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/F.htm ncurses-5.6/doc/html/ada/funcs/F.htm
---- ncurses-5.6.orig/doc/html/ada/funcs/F.htm	2006-09-23 16:31:30.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/funcs/F.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -4,10 +4,13 @@
- <H2>Functions - F</H2>
- <A HREF="../funcs.htm" TARGET="_self">[index]</A>
- <UL COMPACT TYPE=DISC>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_601_13" TARGET="main">Fields</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_468_16" TARGET="main">Field_Back -  terminal_interface-curses-forms.adb:468</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_478_16" TARGET="main">Field_Back -  terminal_interface-curses-forms.adb:478</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_255_16" TARGET="main">Field_Buffer -  terminal_interface-curses-forms.adb:255</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_266_16" TARGET="main">Field_Buffer -  terminal_interface-curses-forms.adb:266</A>
-+<LI><A HREF="../terminal_interface-curses-forms-field_types__ads.htm#ref_177_13" TARGET="main">Field_Check_Router</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_607_13" TARGET="main">Field_Count</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_424_16" TARGET="main">Field_Fore -  terminal_interface-curses-forms.adb:424</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_434_16" TARGET="main">Field_Fore -  terminal_interface-curses-forms.adb:434</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_213_16" TARGET="main">Field_Just</A>
-@@ -17,11 +20,20 @@
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_507_16" TARGET="main">Field_Pad</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_293_16" TARGET="main">Field_Status</A>
- <LI><A HREF="../terminal_interface-curses-forms-field_user_data__adb.htm#ref_72_16" TARGET="main">Field_Userptr</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_814_16" TARGET="main">Flash</A>
-+<LI><A HREF="../terminal_interface-curses-aux__ads.htm#ref_116_14" TARGET="main">Fill_String -  terminal_interface-curses-aux.ads:116</A>
-+<LI><A HREF="../terminal_interface-curses-aux__ads.htm#ref_121_13" TARGET="main">Fill_String -  terminal_interface-curses-aux.ads:121</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_761_16" TARGET="main">Flash</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_875_14" TARGET="main">Flash_Screen</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_528_16" TARGET="main">Fld_Info</A>
- <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_65_14" TARGET="main">Flush -  terminal_interface-curses-text_io.ads:65</A>
- <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_66_14" TARGET="main">Flush -  terminal_interface-curses-text_io.ads:66</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2075_16" TARGET="main">Flushinp</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2042_16" TARGET="main">Flushinp</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1638_14" TARGET="main">Flush_Input</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_434_14" TARGET="main">Foreground -  terminal_interface-curses-forms.ads:434</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_439_14" TARGET="main">Foreground -  terminal_interface-curses-forms.ads:439</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_431_14" TARGET="main">Foreground -  terminal_interface-curses-menus.ads:431</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_436_14" TARGET="main">Foreground -  terminal_interface-curses-menus.ads:436</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_551_14" TARGET="main">Format</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_889_16" TARGET="main">Form_Opts</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_867_16" TARGET="main">Form_Opts_Off</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_864_16" TARGET="main">Form_Opts_On</A>
-@@ -30,9 +42,14 @@
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_628_16" TARGET="main">Form_Sub</A>
- <LI><A HREF="../terminal_interface-curses-forms-form_user_data__adb.htm#ref_73_16" TARGET="main">Form_Userptr</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_600_16" TARGET="main">Form_Win</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_136_14" TARGET="main">Free -  terminal_interface-curses-forms.ads:136</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_180_14" TARGET="main">Free -  terminal_interface-curses-menus.ads:180</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_825_16" TARGET="main">Free -  terminal_interface-curses-forms.adb:825</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_958_16" TARGET="main">Free -  terminal_interface-curses-menus.adb:958</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_131_16" TARGET="main">Freeitem</A>
-+<LI><A HREF="../terminal_interface-curses-forms-field_types__ads.htm#ref_172_14" TARGET="main">Free_Arg</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_133_16" TARGET="main">Free_Field</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_996_16" TARGET="main">Frm_Driver</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_781_13" TARGET="main">Function_Key</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_786_13" TARGET="main">Function_Key_Code</A>
- </UL></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/G.htm ncurses-5.6/doc/html/ada/funcs/G.htm
---- ncurses-5.6.orig/doc/html/ada/funcs/G.htm	2006-09-23 16:31:30.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/funcs/G.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -8,26 +8,89 @@
- <LI><A HREF="../terminal_interface-curses-forms-field_types-user__ads.htm#ref_83_13" TARGET="main">Generic_Field_Check</A>
- <LI><A HREF="../terminal_interface-curses-forms-field_types-user-choice__ads.htm#ref_82_13" TARGET="main">Generic_Next</A>
- <LI><A HREF="../terminal_interface-curses-forms-field_types-user-choice__ads.htm#ref_89_13" TARGET="main">Generic_Prev</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1463_14" TARGET="main">Get -  terminal_interface-curses.ads:1463</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1474_14" TARGET="main">Get -  terminal_interface-curses.ads:1474</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1370_16" TARGET="main">GetBegX</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1367_16" TARGET="main">GetBegY</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1388_16" TARGET="main">GetCurX</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1385_16" TARGET="main">GetCurY</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1350_16" TARGET="main">GetMaxX</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1347_16" TARGET="main">GetMaxY</A>
- <LI><A HREF="../terminal_interface-curses-mouse__adb.htm#ref_69_16" TARGET="main">Getmouse</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1407_16" TARGET="main">GetParX</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1404_16" TARGET="main">GetParY</A>
- <LI><A HREF="../terminal_interface-curses-putwin__adb.htm#ref_65_16" TARGET="main">getwin</A>
- <LI><A HREF="../terminal_interface-curses-forms-field_types__adb.htm#ref_64_13" TARGET="main">Get_Arg</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1125_13" TARGET="main">Get_Background</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_362_14" TARGET="main">Get_Buffer -  terminal_interface-curses-forms.ads:362</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_368_13" TARGET="main">Get_Buffer -  terminal_interface-curses-forms.ads:368</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_826_13" TARGET="main">Get_Character_Attribute -  terminal_interface-curses.ads:826</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_832_13" TARGET="main">Get_Character_Attribute -  terminal_interface-curses.ads:832</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1244_14" TARGET="main">Get_Cursor_Position</A>
- <LI><A HREF="../terminal_interface-curses-termcap__ads.htm#ref_59_13" TARGET="main">Get_Entry</A>
-+<LI><A HREF="../terminal_interface-curses-mouse__ads.htm#ref_137_14" TARGET="main">Get_Event</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_1084_16" TARGET="main">Get_Fieldindex</A>
- <LI><A HREF="../terminal_interface-curses-forms-field_types__adb.htm#ref_61_13" TARGET="main">Get_Fieldtype</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_565_13" TARGET="main">Get_Field_Init_Hook</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_570_13" TARGET="main">Get_Field_Term_Hook</A>
- <LI><A HREF="../terminal_interface-curses-termcap__ads.htm#ref_63_13" TARGET="main">Get_Flag -  terminal_interface-curses-termcap.ads:63</A>
- <LI><A HREF="../terminal_interface-curses-terminfo__ads.htm#ref_64_13" TARGET="main">Get_Flag -  terminal_interface-curses-terminfo.ads:64</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_93_13" TARGET="main">Get_Flag -  terminal_interface-curses.adb:93</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_575_13" TARGET="main">Get_Form_Init_Hook</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_580_13" TARGET="main">Get_Form_Term_Hook</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_745_13" TARGET="main">Get_Index -  terminal_interface-curses-forms.ads:745</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_310_13" TARGET="main">Get_Index -  terminal_interface-curses-menus.ads:310</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_340_16" TARGET="main">Get_Itemindex</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_589_13" TARGET="main">Get_Item_Init_Hook</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_594_13" TARGET="main">Get_Item_Term_Hook</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_345_13" TARGET="main">Get_Justification</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_915_13" TARGET="main">Get_KeyPad_Mode</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_751_13" TARGET="main">Get_Keystroke</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_599_13" TARGET="main">Get_Menu_Init_Hook</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_532_16" TARGET="main">Get_Menu_Mark -  terminal_interface-curses-menus.adb:532</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_540_16" TARGET="main">Get_Menu_Mark -  terminal_interface-curses-menus.adb:540</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_604_13" TARGET="main">Get_Menu_Term_Hook</A>
-+<LI><A HREF="../terminal_interface-curses-mouse__ads.htm#ref_133_13" TARGET="main">Get_Mouse</A>
- <LI><A HREF="../terminal_interface-curses-termcap__ads.htm#ref_67_14" TARGET="main">Get_Number -  terminal_interface-curses-termcap.ads:67</A>
- <LI><A HREF="../terminal_interface-curses-terminfo__ads.htm#ref_68_13" TARGET="main">Get_Number -  terminal_interface-curses-terminfo.ads:68</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_411_14" TARGET="main">Get_Options -  terminal_interface-curses-forms.ads:411</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_416_13" TARGET="main">Get_Options -  terminal_interface-curses-forms.ads:416</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_658_14" TARGET="main">Get_Options -  terminal_interface-curses-forms.ads:658</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_663_13" TARGET="main">Get_Options -  terminal_interface-curses-forms.ads:663</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_251_14" TARGET="main">Get_Options -  terminal_interface-curses-menus.ads:251</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_256_13" TARGET="main">Get_Options -  terminal_interface-curses-menus.ads:256</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_347_14" TARGET="main">Get_Options -  terminal_interface-curses-menus.ads:347</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_352_13" TARGET="main">Get_Options -  terminal_interface-curses-menus.ads:352</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1252_14" TARGET="main">Get_Origin_Relative_To_Parent</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_1070_16" TARGET="main">Get_Page</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_758_16" TARGET="main">Get_Pattern</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1228_14" TARGET="main">Get_Size</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1522_14" TARGET="main">Get_Soft_Label_Key -  terminal_interface-curses.ads:1522</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1527_13" TARGET="main">Get_Soft_Label_Key -  terminal_interface-curses.ads:1527</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1563_13" TARGET="main">Get_Soft_Label_Key_Attributes -  terminal_interface-curses.ads:1563</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1567_13" TARGET="main">Get_Soft_Label_Key_Attributes -  terminal_interface-curses.ads:1567</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_713_16" TARGET="main">Get_Spacing</A>
- <LI><A HREF="../terminal_interface-curses-termcap__ads.htm#ref_73_14" TARGET="main">Get_String -  terminal_interface-curses-termcap.ads:73</A>
- <LI><A HREF="../terminal_interface-curses-termcap__ads.htm#ref_76_13" TARGET="main">Get_String -  terminal_interface-curses-termcap.ads:76</A>
- <LI><A HREF="../terminal_interface-curses-terminfo__ads.htm#ref_57_14" TARGET="main">Get_String -  terminal_interface-curses-terminfo.ads:57</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_522_13" TARGET="main">Get_Sub_Window -  terminal_interface-curses-forms.ads:522</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_378_13" TARGET="main">Get_Sub_Window -  terminal_interface-curses-menus.ads:378</A>
-+<LI><A HREF="../terminal_interface-curses-forms-field_types__ads.htm#ref_79_13" TARGET="main">Get_Type</A>
-+<LI><A HREF="../terminal_interface-curses-forms-field_user_data__ads.htm#ref_59_14" TARGET="main">Get_User_Data -  terminal_interface-curses-forms-field_user_data.ads:59</A>
-+<LI><A HREF="../terminal_interface-curses-forms-field_user_data__ads.htm#ref_64_13" TARGET="main">Get_User_Data -  terminal_interface-curses-forms-field_user_data.ads:64</A>
-+<LI><A HREF="../terminal_interface-curses-forms-form_user_data__ads.htm#ref_59_14" TARGET="main">Get_User_Data -  terminal_interface-curses-forms-form_user_data.ads:59</A>
-+<LI><A HREF="../terminal_interface-curses-forms-form_user_data__ads.htm#ref_64_13" TARGET="main">Get_User_Data -  terminal_interface-curses-forms-form_user_data.ads:64</A>
-+<LI><A HREF="../terminal_interface-curses-menus-item_user_data__ads.htm#ref_64_14" TARGET="main">Get_User_Data -  terminal_interface-curses-menus-item_user_data.ads:64</A>
-+<LI><A HREF="../terminal_interface-curses-menus-item_user_data__ads.htm#ref_69_13" TARGET="main">Get_User_Data -  terminal_interface-curses-menus-item_user_data.ads:69</A>
-+<LI><A HREF="../terminal_interface-curses-menus-menu_user_data__ads.htm#ref_59_14" TARGET="main">Get_User_Data -  terminal_interface-curses-menus-menu_user_data.ads:59</A>
-+<LI><A HREF="../terminal_interface-curses-menus-menu_user_data__ads.htm#ref_64_13" TARGET="main">Get_User_Data -  terminal_interface-curses-menus-menu_user_data.ads:64</A>
-+<LI><A HREF="../terminal_interface-curses-panels-user_data__ads.htm#ref_59_14" TARGET="main">Get_User_Data -  terminal_interface-curses-panels-user_data.ads:59</A>
-+<LI><A HREF="../terminal_interface-curses-panels-user_data__ads.htm#ref_64_13" TARGET="main">Get_User_Data -  terminal_interface-curses-panels-user_data.ads:64</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_511_13" TARGET="main">Get_Window -  terminal_interface-curses-forms.ads:511</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_367_13" TARGET="main">Get_Window -  terminal_interface-curses-menus.ads:367</A>
-+<LI><A HREF="../terminal_interface-curses-panels__ads.htm#ref_102_13" TARGET="main">Get_Window -  terminal_interface-curses-panels.ads:102</A>
- <LI><A HREF="../terminal_interface-curses-putwin__ads.htm#ref_48_13" TARGET="main">Get_Window -  terminal_interface-curses-putwin.ads:48</A>
- <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_62_13" TARGET="main">Get_Window -  terminal_interface-curses-text_io.ads:62</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1236_14" TARGET="main">Get_Window_Position</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_471_14" TARGET="main">Grey -  terminal_interface-curses-menus.ads:471</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_476_14" TARGET="main">Grey -  terminal_interface-curses-menus.ads:476</A>
- </UL></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/H.htm ncurses-5.6/doc/html/ada/funcs/H.htm
---- ncurses-5.6.orig/doc/html/ada/funcs/H.htm	2006-09-23 16:31:30.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/funcs/H.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -4,11 +4,19 @@
- <H2>Functions - H</H2>
- <A HREF="../funcs.htm" TARGET="_self">[index]</A>
- <UL COMPACT TYPE=DISC>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_910_16" TARGET="main">Halfdelay</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2216_16" TARGET="main">Hascolors</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_600_16" TARGET="main">Haskey</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2109_16" TARGET="main">Has_Ic</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2121_16" TARGET="main">Has_Il</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_859_16" TARGET="main">Halfdelay</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_923_14" TARGET="main">Half_Delay</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2183_16" TARGET="main">Hascolors</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_547_16" TARGET="main">Haskey</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1726_13" TARGET="main">Has_Colors</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2076_16" TARGET="main">Has_Ic</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2088_16" TARGET="main">Has_Il</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1662_13" TARGET="main">Has_Insert_Character</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1667_13" TARGET="main">Has_Insert_Line</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_767_13" TARGET="main">Has_Key</A>
-+<LI><A HREF="../terminal_interface-curses-mouse__ads.htm#ref_98_13" TARGET="main">Has_Mouse</A>
- <LI><A HREF="../terminal_interface-curses-terminfo__ads.htm#ref_60_13" TARGET="main">Has_String</A>
-+<LI><A HREF="../terminal_interface-curses-panels__ads.htm#ref_97_14" TARGET="main">Hide</A>
- <LI><A HREF="../terminal_interface-curses-panels__adb.htm#ref_95_16" TARGET="main">Hidepanel</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_728_14" TARGET="main">Horizontal_Line</A>
- </UL></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/I.htm ncurses-5.6/doc/html/ada/funcs/I.htm
---- ncurses-5.6.orig/doc/html/ada/funcs/I.htm	2006-09-23 16:31:30.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/funcs/I.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -4,19 +4,42 @@
- <H2>Functions - I</H2>
- <A HREF="../funcs.htm" TARGET="_self">[index]</A>
- <UL COMPACT TYPE=DISC>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1045_16" TARGET="main">IDC_Ok</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1033_16" TARGET="main">IDL_Ok</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1069_16" TARGET="main">Immedok</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2231_16" TARGET="main">Initcolor</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2177_16" TARGET="main">Initpair</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_153_16" TARGET="main">Initscr</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_922_16" TARGET="main">Intrflush</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_176_16" TARGET="main">Isendwin</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_992_17" TARGET="main">IDC_Ok</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_980_16" TARGET="main">IDL_Ok</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1009_14" TARGET="main">Immediate_Update_Mode</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1014_17" TARGET="main">Immedok</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_482_14" TARGET="main">Info</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2198_16" TARGET="main">Initcolor</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2144_16" TARGET="main">Initpair</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_100_16" TARGET="main">Initscr</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1731_14" TARGET="main">Init_Color</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1712_14" TARGET="main">Init_Pair</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_486_14" TARGET="main">Init_Screen</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1499_14" TARGET="main">Init_Soft_Label_Keys</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_489_14" TARGET="main">Init_Windows</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1371_14" TARGET="main">Insert -  terminal_interface-curses.ads:1371</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1377_14" TARGET="main">Insert -  terminal_interface-curses.ads:1377</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1389_14" TARGET="main">Insert -  terminal_interface-curses.ads:1389</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1398_14" TARGET="main">Insert -  terminal_interface-curses.ads:1398</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1204_14" TARGET="main">Insert_Delete_Lines</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1218_14" TARGET="main">Insert_Line</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_871_16" TARGET="main">Intrflush</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_123_16" TARGET="main">Isendwin</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_502_13" TARGET="main">Is_End_Window</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_774_13" TARGET="main">Is_Function_Key</A>
-+<LI><A HREF="../terminal_interface-curses-panels__ads.htm#ref_124_13" TARGET="main">Is_Hidden</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_851_16" TARGET="main">Is_Keypad</A>
- <LI><A HREF="../terminal_interface-curses-terminfo__adb.htm#ref_50_13" TARGET="main">Is_MinusOne_Pointer</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_1119_16" TARGET="main">Is_New</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_763_13" TARGET="main">Is_New_Page</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1035_16" TARGET="main">Is_Scroll_Ok</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1160_13" TARGET="main">Is_Touched -  terminal_interface-curses.ads:1160</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1165_13" TARGET="main">Is_Touched -  terminal_interface-curses.ads:1165</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_128_16" TARGET="main">Itemname -  terminal_interface-curses-menus.adb:128</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_253_16" TARGET="main">Itemname -  terminal_interface-curses-menus.adb:253</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_261_16" TARGET="main">Itemname -  terminal_interface-curses-menus.adb:261</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_623_13" TARGET="main">Items</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_629_13" TARGET="main">Item_Count</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_860_16" TARGET="main">Item_Init</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_234_16" TARGET="main">Item_Opts</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_214_16" TARGET="main">Item_Opts_Off</A>
-diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/K.htm ncurses-5.6/doc/html/ada/funcs/K.htm
---- ncurses-5.6.orig/doc/html/ada/funcs/K.htm	2006-09-23 16:31:30.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/funcs/K.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -4,8 +4,11 @@
- <H2>Functions - K</H2>
- <A HREF="../funcs.htm" TARGET="_self">[index]</A>
- <UL COMPACT TYPE=DISC>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_117_16" TARGET="main">Keyname</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2020_16" TARGET="main">Keyok</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_893_16" TARGET="main">Keypad</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2101_16" TARGET="main">Killchar</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_64_16" TARGET="main">Keyname</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1987_16" TARGET="main">Keyok</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_840_16" TARGET="main">Keypad</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1610_14" TARGET="main">Key_Name -  terminal_interface-curses.ads:1610</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1616_13" TARGET="main">Key_Name -  terminal_interface-curses.ads:1616</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2068_16" TARGET="main">Killchar</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1657_13" TARGET="main">Kill_Character</A>
- </UL></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/L.htm ncurses-5.6/doc/html/ada/funcs/L.htm
---- ncurses-5.6.orig/doc/html/ada/funcs/L.htm	2006-09-23 16:31:30.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/funcs/L.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -4,12 +4,17 @@
- <H2>Functions - L</H2>
- <A HREF="../funcs.htm" TARGET="_self">[index]</A>
- <UL COMPACT TYPE=DISC>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1057_16" TARGET="main">Leave_Ok</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1002_14" TARGET="main">Leave_Cursor_After_Update</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1002_16" TARGET="main">Leave_Ok</A>
- <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_101_13" TARGET="main">Line -  terminal_interface-curses-text_io.ads:101</A>
- <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_102_13" TARGET="main">Line -  terminal_interface-curses-text_io.ads:102</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_412_13" TARGET="main">Lines</A>
- <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_77_13" TARGET="main">Line_Length -  terminal_interface-curses-text_io.ads:77</A>
- <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_78_13" TARGET="main">Line_Length -  terminal_interface-curses-text_io.ads:78</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_328_13" TARGET="main">Link</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_172_16" TARGET="main">Lnk_Field</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2143_16" TARGET="main">Longname -  terminal_interface-curses.adb:2143</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2151_16" TARGET="main">Longname -  terminal_interface-curses.adb:2151</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2110_16" TARGET="main">Longname -  terminal_interface-curses.adb:2110</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2118_16" TARGET="main">Longname -  terminal_interface-curses.adb:2118</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1677_14" TARGET="main">Long_Name -  terminal_interface-curses.ads:1677</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1681_13" TARGET="main">Long_Name -  terminal_interface-curses.ads:1681</A>
- </UL></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/M.htm ncurses-5.6/doc/html/ada/funcs/M.htm
---- ncurses-5.6.orig/doc/html/ada/funcs/M.htm	2006-09-23 16:31:30.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/funcs/M.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -4,6 +4,9 @@
- <H2>Functions - M</H2>
- <A HREF="../funcs.htm" TARGET="_self">[index]</A>
- <UL COMPACT TYPE=DISC>
-+<LI><A HREF="../terminal_interface-curses-forms-field_types__ads.htm#ref_162_13" TARGET="main">Make_Arg</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_409_14" TARGET="main">Mark -  terminal_interface-curses-menus.ads:409</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_413_14" TARGET="main">Mark -  terminal_interface-curses-menus.ads:413</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_608_16" TARGET="main">Menu_Back -  terminal_interface-curses-menus.adb:608</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_618_16" TARGET="main">Menu_Back -  terminal_interface-curses-menus.adb:618</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_787_16" TARGET="main">Menu_Fmt</A>
-@@ -20,19 +23,25 @@
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_884_16" TARGET="main">Menu_Term</A>
- <LI><A HREF="../terminal_interface-curses-menus-menu_user_data__adb.htm#ref_63_16" TARGET="main">Menu_Userptr</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_446_16" TARGET="main">Menu_Win</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_882_16" TARGET="main">Meta</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_829_16" TARGET="main">Meta</A>
- <LI><A HREF="../terminal_interface-curses-mouse__adb.htm#ref_113_16" TARGET="main">MMask</A>
- <LI><A HREF="../terminal_interface-curses-mouse__adb.htm#ref_214_16" TARGET="main">Mouseinterval</A>
- <LI><A HREF="../terminal_interface-curses-mouse__adb.htm#ref_55_16" TARGET="main">Mouse_Avail</A>
-+<LI><A HREF="../terminal_interface-curses-mouse__ads.htm#ref_161_13" TARGET="main">Mouse_Interval</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_612_14" TARGET="main">Move -  terminal_interface-curses-forms.ads:612</A>
-+<LI><A HREF="../terminal_interface-curses-panels__ads.htm#ref_117_14" TARGET="main">Move -  terminal_interface-curses-panels.ads:117</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_786_16" TARGET="main">Move -  terminal_interface-curses-forms.adb:786</A>
- <LI><A HREF="../terminal_interface-curses-panels__adb.htm#ref_132_16" TARGET="main">Move -  terminal_interface-curses-panels.adb:132</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_403_16" TARGET="main">Mvderwin</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_229_16" TARGET="main">mvwaddch</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1613_16" TARGET="main">Mvwdelch</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_389_16" TARGET="main">Mvwin</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1637_16" TARGET="main">Mvwinch</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1662_16" TARGET="main">Mvwinsch</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1701_16" TARGET="main">Mvwinsnstr</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_511_14" TARGET="main">Move_Cursor</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_626_14" TARGET="main">Move_Derived_Window</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_619_14" TARGET="main">Move_Window</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_350_16" TARGET="main">Mvderwin</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_176_16" TARGET="main">mvwaddch</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1580_16" TARGET="main">Mvwdelch</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_336_16" TARGET="main">Mvwin</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1604_16" TARGET="main">Mvwinch</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1629_16" TARGET="main">Mvwinsch</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1668_16" TARGET="main">Mvwinsnstr</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_916_16" TARGET="main">M_Post -  terminal_interface-curses-forms.adb:916</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_354_16" TARGET="main">M_Post -  terminal_interface-curses-menus.adb:354</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_643_16" TARGET="main">M_Scale -  terminal_interface-curses-forms.adb:643</A>
-diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/N.htm ncurses-5.6/doc/html/ada/funcs/N.htm
---- ncurses-5.6.orig/doc/html/ada/funcs/N.htm	2006-09-23 16:31:30.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/funcs/N.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -4,24 +4,32 @@
- <H2>Functions - N</H2>
- <A HREF="../funcs.htm" TARGET="_self">[index]</A>
- <UL COMPACT TYPE=DISC>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2362_16" TARGET="main">Napms</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_265_14" TARGET="main">Name -  terminal_interface-curses-menus.ads:265</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_268_14" TARGET="main">Name -  terminal_interface-curses-menus.ads:268</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2329_16" TARGET="main">Napms</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1806_14" TARGET="main">Nap_Milli_Seconds</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_116_16" TARGET="main">Newfield</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_804_16" TARGET="main">NewForm</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_98_16" TARGET="main">Newitem</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_939_16" TARGET="main">Newmenu</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1460_16" TARGET="main">Newpad</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1427_16" TARGET="main">Newpad</A>
- <LI><A HREF="../terminal_interface-curses-panels__adb.htm#ref_51_16" TARGET="main">Newpanel</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_287_16" TARGET="main">Newwin</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_234_16" TARGET="main">Newwin</A>
-+<LI><A HREF="../terminal_interface-curses-forms-field_types__ads.htm#ref_222_13" TARGET="main">New_Fieldtype</A>
- <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_86_14" TARGET="main">New_Line -  terminal_interface-curses-text_io.ads:86</A>
- <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_87_14" TARGET="main">New_Line -  terminal_interface-curses-text_io.ads:87</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1267_13" TARGET="main">New_Pad</A>
- <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_89_14" TARGET="main">New_Page -  terminal_interface-curses-text_io.ads:89</A>
- <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_90_14" TARGET="main">New_Page -  terminal_interface-curses-text_io.ads:90</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1000_16" TARGET="main">NL</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_826_16" TARGET="main">NoCbreak</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_953_16" TARGET="main">Nodelay</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_864_16" TARGET="main">NoEcho</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1002_16" TARGET="main">NoNL</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_845_16" TARGET="main">NoRaw</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_988_16" TARGET="main">Notimeout</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_936_17" TARGET="main">No_Qiflush</A>
-+<LI><A HREF="../terminal_interface-curses-forms-field_types__ads.htm#ref_193_13" TARGET="main">Next_Router</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_947_16" TARGET="main">NL</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_773_16" TARGET="main">NoCbreak</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_902_16" TARGET="main">Nodelay</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_811_16" TARGET="main">NoEcho</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_949_16" TARGET="main">NoNL</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_792_16" TARGET="main">NoRaw</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_935_16" TARGET="main">Notimeout</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_885_17" TARGET="main">No_Qiflush</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_421_13" TARGET="main">Number_Of_Colors</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_424_13" TARGET="main">Number_Of_Color_Pairs</A>
- </UL></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/O.htm ncurses-5.6/doc/html/ada/funcs/O.htm
---- ncurses-5.6.orig/doc/html/ada/funcs/O.htm	2006-09-23 16:31:30.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/funcs/O.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -5,6 +5,8 @@
- <A HREF="../funcs.htm" TARGET="_self">[index]</A>
- <UL COMPACT TYPE=DISC>
- <LI><A HREF="../terminal_interface-curses-text_io-aux__adb.htm#ref_59_17" TARGET="main">Output</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1363_16" TARGET="main">Overlay</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1351_16" TARGET="main">Overwrite</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1194_14" TARGET="main">Overlay -  terminal_interface-curses.ads:1194</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1308_16" TARGET="main">Overlay -  terminal_interface-curses.adb:1308</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1188_14" TARGET="main">Overwrite -  terminal_interface-curses.ads:1188</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1296_16" TARGET="main">Overwrite -  terminal_interface-curses.adb:1296</A>
- </UL></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/P.htm ncurses-5.6/doc/html/ada/funcs/P.htm
---- ncurses-5.6.orig/doc/html/ada/funcs/P.htm	2006-09-23 16:31:30.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/funcs/P.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -4,17 +4,33 @@
- <H2>Functions - P</H2>
- <A HREF="../funcs.htm" TARGET="_self">[index]</A>
- <UL COMPACT TYPE=DISC>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_472_14" TARGET="main">Pad_Character -  terminal_interface-curses-forms.ads:472</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_490_14" TARGET="main">Pad_Character -  terminal_interface-curses-menus.ads:490</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_740_13" TARGET="main">Page</A>
- <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_80_13" TARGET="main">Page_Length -  terminal_interface-curses-text_io.ads:80</A>
- <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_81_13" TARGET="main">Page_Length -  terminal_interface-curses-text_io.ads:81</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2199_16" TARGET="main">Paircontent</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2166_16" TARGET="main">Paircontent</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1719_14" TARGET="main">Pair_Content</A>
- <LI><A HREF="../terminal_interface-curses-panels__adb.htm#ref_144_16" TARGET="main">Panel_Hidden</A>
- <LI><A HREF="../terminal_interface-curses-panels-user_data__adb.htm#ref_65_16" TARGET="main">Panel_Userptr</A>
- <LI><A HREF="../terminal_interface-curses-panels__adb.htm#ref_105_16" TARGET="main">Panel_Win</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1564_16" TARGET="main">Pechochar</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1539_16" TARGET="main">Pnoutrefresh</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_527_14" TARGET="main">Pattern</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1531_16" TARGET="main">Pechochar</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1352_13" TARGET="main">Peek -  terminal_interface-curses.ads:1352</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1358_13" TARGET="main">Peek -  terminal_interface-curses.ads:1358</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1414_14" TARGET="main">Peek -  terminal_interface-curses.ads:1414</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1423_14" TARGET="main">Peek -  terminal_interface-curses.ads:1423</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1438_14" TARGET="main">Peek -  terminal_interface-curses.ads:1438</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1447_14" TARGET="main">Peek -  terminal_interface-curses.ads:1447</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1506_16" TARGET="main">Pnoutrefresh</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_683_14" TARGET="main">Position_Cursor -  terminal_interface-curses-forms.ads:683</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_394_14" TARGET="main">Position_Cursor -  terminal_interface-curses-menus.ads:394</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_672_14" TARGET="main">Post -  terminal_interface-curses-forms.ads:672</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_322_14" TARGET="main">Post -  terminal_interface-curses-menus.ads:322</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_941_16" TARGET="main">Pos_Form_Cursor</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_499_16" TARGET="main">Pos_Menu_Cursor</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1509_16" TARGET="main">Prefresh</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1476_16" TARGET="main">Prefresh</A>
-+<LI><A HREF="../terminal_interface-curses-forms-field_types__ads.htm#ref_201_13" TARGET="main">Prev_Router</A>
- <LI><A HREF="../terminal_interface-curses-text_io-complex_io__ads.htm#ref_54_14" TARGET="main">Put -  terminal_interface-curses-text_io-complex_io.ads:54</A>
- <LI><A HREF="../terminal_interface-curses-text_io-complex_io__ads.htm#ref_61_14" TARGET="main">Put -  terminal_interface-curses-text_io-complex_io.ads:61</A>
- <LI><A HREF="../terminal_interface-curses-text_io-decimal_io__ads.htm#ref_50_14" TARGET="main">Put -  terminal_interface-curses-text_io-decimal_io.ads:50</A>
-diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/Q.htm ncurses-5.6/doc/html/ada/funcs/Q.htm
---- ncurses-5.6.orig/doc/html/ada/funcs/Q.htm	2005-05-14 13:34:32.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/funcs/Q.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -4,5 +4,5 @@
- <H2>Functions - Q</H2>
- <A HREF="../funcs.htm" TARGET="_self">[index]</A>
- <UL COMPACT TYPE=DISC>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_934_17" TARGET="main">Qiflush</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_883_17" TARGET="main">Qiflush</A>
- </UL></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/R.htm ncurses-5.6/doc/html/ada/funcs/R.htm
---- ncurses-5.6.orig/doc/html/ada/funcs/R.htm	2006-09-23 16:31:30.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/funcs/R.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -4,14 +4,36 @@
- <H2>Functions - R</H2>
- <A HREF="../funcs.htm" TARGET="_self">[index]</A>
- <UL COMPACT TYPE=DISC>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_843_16" TARGET="main">Raw</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1145_16" TARGET="main">Redrawwin</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_790_16" TARGET="main">Raw</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_589_14" TARGET="main">Redefine -  terminal_interface-curses-forms.ads:589</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_613_14" TARGET="main">Redefine -  terminal_interface-curses-menus.ads:613</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1059_14" TARGET="main">Redraw -  terminal_interface-curses.ads:1059</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1063_14" TARGET="main">Redraw -  terminal_interface-curses.ads:1063</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1090_16" TARGET="main">Redrawwin</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1045_14" TARGET="main">Refresh -  terminal_interface-curses.ads:1045</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1283_14" TARGET="main">Refresh -  terminal_interface-curses.ads:1283</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1512_14" TARGET="main">Refresh_Soft_Label_Keys</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1517_14" TARGET="main">Refresh_Soft_Label_Keys_Without_Update</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1052_14" TARGET="main">Refresh_Without_Update -  terminal_interface-curses.ads:1052</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1295_14" TARGET="main">Refresh_Without_Update -  terminal_interface-curses.ads:1295</A>
-+<LI><A HREF="../terminal_interface-curses-mouse__ads.htm#ref_101_14" TARGET="main">Register_Reportable_Event</A>
-+<LI><A HREF="../terminal_interface-curses-mouse__ads.htm#ref_110_14" TARGET="main">Register_Reportable_Events</A>
- <LI><A HREF="../terminal_interface-curses-forms-field_types-enumeration__ads.htm#ref_77_14" TARGET="main">Release</A>
-+<LI><A HREF="../terminal_interface-curses-panels__ads.htm#ref_111_14" TARGET="main">Replace</A>
- <LI><A HREF="../terminal_interface-curses-panels__adb.htm#ref_119_16" TARGET="main">Replace_Pan</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_276_14" TARGET="main">Request_Name -  terminal_interface-curses-forms.ads:276</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_279_14" TARGET="main">Request_Name -  terminal_interface-curses-forms.ads:279</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_106_14" TARGET="main">Request_Name -  terminal_interface-curses-menus.ads:106</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_109_14" TARGET="main">Request_Name -  terminal_interface-curses-menus.ads:109</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_80_16" TARGET="main">Request_Name -  terminal_interface-curses-menus.adb:80</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_88_16" TARGET="main">Request_Name -  terminal_interface-curses-menus.adb:88</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2327_16" TARGET="main">Resetty</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2299_16" TARGET="main">Reset_Prog_Mode</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2301_16" TARGET="main">Reset_Shell_Mode</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2338_16" TARGET="main">Ripoffline</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2294_16" TARGET="main">Resetty</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1765_14" TARGET="main">Reset_Curses_Mode</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2266_16" TARGET="main">Reset_Prog_Mode</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2268_16" TARGET="main">Reset_Shell_Mode</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1776_14" TARGET="main">Reset_Terminal_State</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1911_14" TARGET="main">Resize</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1538_14" TARGET="main">Restore_Soft_Label_Keys</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2305_16" TARGET="main">Ripoffline</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1789_14" TARGET="main">Rip_Off_Lines</A>
- </UL></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/S.htm ncurses-5.6/doc/html/ada/funcs/S.htm
---- ncurses-5.6.orig/doc/html/ada/funcs/S.htm	2006-09-23 16:31:30.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/funcs/S.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -4,24 +4,51 @@
- <H2>Functions - S</H2>
- <A HREF="../funcs.htm" TARGET="_self">[index]</A>
- <UL COMPACT TYPE=DISC>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2317_16" TARGET="main">Savetty</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1081_16" TARGET="main">Scrollok</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2499_16" TARGET="main">scr_dump</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2525_16" TARGET="main">scr_init</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2512_16" TARGET="main">scr_restore</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2538_16" TARGET="main">scr_set</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2284_16" TARGET="main">Savetty</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1759_14" TARGET="main">Save_Curses_Mode</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1771_14" TARGET="main">Save_Terminal_State</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_527_14" TARGET="main">Scale -  terminal_interface-curses-forms.ads:527</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_383_14" TARGET="main">Scale -  terminal_interface-curses-menus.ads:383</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1867_14" TARGET="main">Screen_Dump_To_File</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1875_14" TARGET="main">Screen_Init_From_File</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1871_14" TARGET="main">Screen_Restore_From_File</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1879_14" TARGET="main">Screen_Set_File</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1322_14" TARGET="main">Scroll</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1022_13" TARGET="main">Scrolling_Allowed</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1024_16" TARGET="main">Scrollok</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2489_16" TARGET="main">scr_dump</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2515_16" TARGET="main">scr_init</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2502_16" TARGET="main">scr_restore</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2528_16" TARGET="main">scr_set</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_446_14" TARGET="main">Set_Background -  terminal_interface-curses-forms.ads:446</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_443_14" TARGET="main">Set_Background -  terminal_interface-curses-menus.ads:443</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1108_14" TARGET="main">Set_Background -  terminal_interface-curses.ads:1108</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_354_14" TARGET="main">Set_Buffer</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_886_14" TARGET="main">Set_Cbreak_Mode</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_817_14" TARGET="main">Set_Character_Attributes</A>
- <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_92_14" TARGET="main">Set_Col -  terminal_interface-curses-text_io.ads:92</A>
- <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_93_14" TARGET="main">Set_Col -  terminal_interface-curses-text_io.ads:93</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_838_14" TARGET="main">Set_Color</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_723_14" TARGET="main">Set_Current -  terminal_interface-curses-forms.ads:723</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_288_14" TARGET="main">Set_Current -  terminal_interface-curses-menus.ads:288</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_1026_16" TARGET="main">Set_Current_Fld</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_287_16" TARGET="main">Set_Curr_Item</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1801_14" TARGET="main">Set_Cursor_Visibility</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_898_14" TARGET="main">Set_Echo_Mode</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_964_14" TARGET="main">Set_Escape_Timer_Mode</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_595_14" TARGET="main">Set_Fields</A>
-+<LI><A HREF="../terminal_interface-curses-forms-field_types__ads.htm#ref_227_13" TARGET="main">Set_Fieldtype_Arg</A>
-+<LI><A HREF="../terminal_interface-curses-forms-field_types__ads.htm#ref_234_13" TARGET="main">Set_Fieldtype_Choice</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_448_16" TARGET="main">Set_Field_Back</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_404_16" TARGET="main">Set_Field_Fore</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_665_16" TARGET="main">Set_Field_Init</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_541_14" TARGET="main">Set_Field_Init_Hook</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_196_16" TARGET="main">Set_Field_Just</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_310_16" TARGET="main">Set_Field_Max</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_330_16" TARGET="main">Set_Field_Opts</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_490_16" TARGET="main">Set_Field_Pad</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_681_16" TARGET="main">Set_Field_Term</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_547_14" TARGET="main">Set_Field_Term_Hook</A>
- <LI><A HREF="../terminal_interface-curses-forms-field_types-alpha__ads.htm#ref_49_14" TARGET="main">Set_Field_Type -  terminal_interface-curses-forms-field_types-alpha.ads:49</A>
- <LI><A HREF="../terminal_interface-curses-forms-field_types-alphanumeric__ads.htm#ref_50_14" TARGET="main">Set_Field_Type -  terminal_interface-curses-forms-field_types-alphanumeric.ads:50</A>
- <LI><A HREF="../terminal_interface-curses-forms-field_types-enumeration__ads.htm#ref_84_14" TARGET="main">Set_Field_Type -  terminal_interface-curses-forms-field_types-enumeration.ads:84</A>
-@@ -41,58 +68,124 @@
- <LI><A HREF="../terminal_interface-curses-forms-field_types-numeric__adb.htm#ref_56_16" TARGET="main">Set_Fld_Type -  terminal_interface-curses-forms-field_types-numeric.adb:56</A>
- <LI><A HREF="../terminal_interface-curses-forms-field_types-user__adb.htm#ref_56_16" TARGET="main">Set_Fld_Type -  terminal_interface-curses-forms-field_types-user.adb:56</A>
- <LI><A HREF="../terminal_interface-curses-forms-field_types__adb.htm#ref_153_16" TARGET="main">Set_Fld_Type -  terminal_interface-curses-forms-field_types.adb:153</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_928_14" TARGET="main">Set_Flush_On_Interrupt_Mode</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_426_14" TARGET="main">Set_Foreground -  terminal_interface-curses-forms.ads:426</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_423_14" TARGET="main">Set_Foreground -  terminal_interface-curses-menus.ads:423</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_537_14" TARGET="main">Set_Format</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_697_16" TARGET="main">Set_Form_Init</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_553_14" TARGET="main">Set_Form_Init_Hook</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_845_16" TARGET="main">Set_Form_Opts</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_613_16" TARGET="main">Set_Form_Sub</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_713_16" TARGET="main">Set_Form_Term</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_559_14" TARGET="main">Set_Form_Term_Hook</A>
- <LI><A HREF="../terminal_interface-curses-forms-form_user_data__adb.htm#ref_58_16" TARGET="main">Set_Form_Userptr</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_585_16" TARGET="main">Set_Form_Win</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_733_16" TARGET="main">Set_Frm_Fields</A>
- <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_1056_16" TARGET="main">Set_Frm_Page</A>
- <LI><A HREF="../terminal_interface-curses-forms-field_types-regexp__adb.htm#ref_54_16" TARGET="main">Set_Ftyp</A>
--<LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_893_16" TARGET="main">Set_Items</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_463_14" TARGET="main">Set_Grey</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_618_14" TARGET="main">Set_Items -  terminal_interface-curses-menus.ads:618</A>
-+<LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_893_16" TARGET="main">Set_Items -  terminal_interface-curses-menus.adb:893</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_805_16" TARGET="main">Set_Item_Init</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_565_14" TARGET="main">Set_Item_Init_Hook</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_194_16" TARGET="main">Set_Item_Opts</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_819_16" TARGET="main">Set_Item_Term</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_571_14" TARGET="main">Set_Item_Term_Hook</A>
- <LI><A HREF="../terminal_interface-curses-menus-item_user_data__adb.htm#ref_51_16" TARGET="main">Set_Item_Userptr</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_155_16" TARGET="main">Set_Item_Val</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_339_14" TARGET="main">Set_Justification</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_910_14" TARGET="main">Set_KeyPad_Mode</A>
- <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_95_14" TARGET="main">Set_Line -  terminal_interface-curses-text_io.ads:95</A>
- <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_96_14" TARGET="main">Set_Line -  terminal_interface-curses-text_io.ads:96</A>
--<LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_514_16" TARGET="main">Set_Mark</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_403_14" TARGET="main">Set_Mark -  terminal_interface-curses-menus.ads:403</A>
-+<LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_514_16" TARGET="main">Set_Mark -  terminal_interface-curses-menus.adb:514</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_387_14" TARGET="main">Set_Maximum_Size</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_591_16" TARGET="main">Set_Menu_Back</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_768_16" TARGET="main">Set_Menu_Fmt</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_552_16" TARGET="main">Set_Menu_Fore</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_629_16" TARGET="main">Set_Menu_Grey</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_833_16" TARGET="main">Set_Menu_Init</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_577_14" TARGET="main">Set_Menu_Init_Hook</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_374_16" TARGET="main">Set_Menu_Opts</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_667_16" TARGET="main">Set_Menu_Pad</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_457_16" TARGET="main">Set_Menu_Sub</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_847_16" TARGET="main">Set_Menu_Term</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_583_14" TARGET="main">Set_Menu_Term_Hook</A>
- <LI><A HREF="../terminal_interface-curses-menus-menu_user_data__adb.htm#ref_50_16" TARGET="main">Set_Menu_Userptr</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_433_16" TARGET="main">Set_Menu_Win</A>
--<LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_1105_16" TARGET="main">Set_Page</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_904_14" TARGET="main">Set_Meta_Mode</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_757_14" TARGET="main">Set_New_Page</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_975_14" TARGET="main">Set_NL_Mode</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_943_14" TARGET="main">Set_NoDelay_Mode</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_397_14" TARGET="main">Set_Options -  terminal_interface-curses-forms.ads:397</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_644_14" TARGET="main">Set_Options -  terminal_interface-curses-forms.ads:644</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_236_14" TARGET="main">Set_Options -  terminal_interface-curses-menus.ads:236</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_333_14" TARGET="main">Set_Options -  terminal_interface-curses-menus.ads:333</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_466_14" TARGET="main">Set_Pad_Character -  terminal_interface-curses-forms.ads:466</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_484_14" TARGET="main">Set_Pad_Character -  terminal_interface-curses-menus.ads:484</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_734_14" TARGET="main">Set_Page -  terminal_interface-curses-forms.ads:734</A>
-+<LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_1105_16" TARGET="main">Set_Page -  terminal_interface-curses-forms.adb:1105</A>
- <LI><A HREF="../terminal_interface-curses-panels-user_data__adb.htm#ref_54_16" TARGET="main">Set_Panel_Userptr</A>
--<LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_736_16" TARGET="main">Set_Pattern</A>
--<LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_693_16" TARGET="main">Set_Spacing</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_520_13" TARGET="main">Set_Pattern -  terminal_interface-curses-menus.ads:520</A>
-+<LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_736_16" TARGET="main">Set_Pattern -  terminal_interface-curses-menus.adb:736</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_935_14" TARGET="main">Set_Queue_Interrupt_Mode</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_892_14" TARGET="main">Set_Raw_Mode</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1027_14" TARGET="main">Set_Scroll_Region</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1505_14" TARGET="main">Set_Soft_Label_Key</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1556_14" TARGET="main">Set_Soft_Label_Key_Attributes</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1572_14" TARGET="main">Set_Soft_Label_Key_Color</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_500_14" TARGET="main">Set_Spacing -  terminal_interface-curses-menus.ads:500</A>
-+<LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_693_16" TARGET="main">Set_Spacing -  terminal_interface-curses-menus.adb:693</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_376_14" TARGET="main">Set_Status</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_516_14" TARGET="main">Set_Sub_Window -  terminal_interface-curses-forms.ads:516</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_372_14" TARGET="main">Set_Sub_Window -  terminal_interface-curses-menus.ads:372</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_643_14" TARGET="main">Set_Synch_Mode</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_952_14" TARGET="main">Set_Timeout_Mode</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_314_16" TARGET="main">Set_Toprow</A>
--<LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_59_14" TARGET="main">Set_Window</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_299_14" TARGET="main">Set_Top_Row</A>
-+<LI><A HREF="../terminal_interface-curses-forms-field_user_data__ads.htm#ref_53_14" TARGET="main">Set_User_Data -  terminal_interface-curses-forms-field_user_data.ads:53</A>
-+<LI><A HREF="../terminal_interface-curses-forms-form_user_data__ads.htm#ref_53_14" TARGET="main">Set_User_Data -  terminal_interface-curses-forms-form_user_data.ads:53</A>
-+<LI><A HREF="../terminal_interface-curses-menus-item_user_data__ads.htm#ref_58_14" TARGET="main">Set_User_Data -  terminal_interface-curses-menus-item_user_data.ads:58</A>
-+<LI><A HREF="../terminal_interface-curses-menus-menu_user_data__ads.htm#ref_53_14" TARGET="main">Set_User_Data -  terminal_interface-curses-menus-menu_user_data.ads:53</A>
-+<LI><A HREF="../terminal_interface-curses-panels-user_data__ads.htm#ref_53_14" TARGET="main">Set_User_Data -  terminal_interface-curses-panels-user_data.ads:53</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_212_14" TARGET="main">Set_Value</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_505_14" TARGET="main">Set_Window -  terminal_interface-curses-forms.ads:505</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_361_14" TARGET="main">Set_Window -  terminal_interface-curses-menus.ads:361</A>
-+<LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_59_14" TARGET="main">Set_Window -  terminal_interface-curses-text_io.ads:59</A>
-+<LI><A HREF="../terminal_interface-curses-panels__ads.htm#ref_87_14" TARGET="main">Show</A>
- <LI><A HREF="../terminal_interface-curses-panels__adb.htm#ref_85_16" TARGET="main">Showpanel</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1988_16" TARGET="main">Slk_Attr -  terminal_interface-curses.adb:1988</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1998_16" TARGET="main">Slk_Attr -  terminal_interface-curses.adb:1998</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1952_16" TARGET="main">Slk_Attroff</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1950_16" TARGET="main">Slk_Attron</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1974_16" TARGET="main">Slk_Attrset</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1918_16" TARGET="main">Slk_Clear</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2008_16" TARGET="main">Slk_Color</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1852_16" TARGET="main">Slk_Init</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1902_16" TARGET="main">Slk_Label -  terminal_interface-curses.adb:1902</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1910_16" TARGET="main">Slk_Label -  terminal_interface-curses.adb:1910</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1891_16" TARGET="main">Slk_Noutrefresh</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1881_16" TARGET="main">Slk_Refresh</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1928_16" TARGET="main">Slk_Restore</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1864_16" TARGET="main">Slk_Set</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1938_16" TARGET="main">Slk_Touch</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1479_16" TARGET="main">Subpad</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_323_16" TARGET="main">Subwin</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_416_16" TARGET="main">Syncok</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1955_16" TARGET="main">Slk_Attr -  terminal_interface-curses.adb:1955</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1965_16" TARGET="main">Slk_Attr -  terminal_interface-curses.adb:1965</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1919_16" TARGET="main">Slk_Attroff</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1917_16" TARGET="main">Slk_Attron</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1941_16" TARGET="main">Slk_Attrset</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1885_16" TARGET="main">Slk_Clear</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1975_16" TARGET="main">Slk_Color</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1819_16" TARGET="main">Slk_Init</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1869_16" TARGET="main">Slk_Label -  terminal_interface-curses.adb:1869</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1877_16" TARGET="main">Slk_Label -  terminal_interface-curses.adb:1877</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1858_16" TARGET="main">Slk_Noutrefresh</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1848_16" TARGET="main">Slk_Refresh</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1895_16" TARGET="main">Slk_Restore</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1831_16" TARGET="main">Slk_Set</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1905_16" TARGET="main">Slk_Touch</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_508_14" TARGET="main">Spacing</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_476_13" TARGET="main">Standard_Window</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_800_14" TARGET="main">Standout</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1707_14" TARGET="main">Start_Color</A>
-+<LI><A HREF="../terminal_interface-curses-mouse__ads.htm#ref_123_13" TARGET="main">Start_Mouse</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1446_16" TARGET="main">Subpad</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_270_16" TARGET="main">Subwin</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1273_13" TARGET="main">Sub_Pad</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_594_13" TARGET="main">Sub_Window</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1672_13" TARGET="main">Supported_Attributes</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_806_14" TARGET="main">Switch_Character_Attribute</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_403_14" TARGET="main">Switch_Options -  terminal_interface-curses-forms.ads:403</A>
-+<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_650_14" TARGET="main">Switch_Options -  terminal_interface-curses-forms.ads:650</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_242_14" TARGET="main">Switch_Options -  terminal_interface-curses-menus.ads:242</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_339_14" TARGET="main">Switch_Options -  terminal_interface-curses-menus.ads:339</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1548_14" TARGET="main">Switch_Soft_Label_Key_Attributes</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_638_14" TARGET="main">Synchronize_Downwards</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_633_14" TARGET="main">Synchronize_Upwards</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_363_16" TARGET="main">Syncok</A>
- </UL></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/T.htm ncurses-5.6/doc/html/ada/funcs/T.htm
---- ncurses-5.6.orig/doc/html/ada/funcs/T.htm	2006-09-23 16:31:30.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/funcs/T.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -4,9 +4,12 @@
- <H2>Functions - T</H2>
- <A HREF="../funcs.htm" TARGET="_self">[index]</A>
- <UL COMPACT TYPE=DISC>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2133_16" TARGET="main">Termattrs</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2159_16" TARGET="main">Termname -  terminal_interface-curses.adb:2159</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2167_16" TARGET="main">Termname -  terminal_interface-curses.adb:2167</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_418_13" TARGET="main">Tab_Size</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2100_16" TARGET="main">Termattrs</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1687_14" TARGET="main">Terminal_Name -  terminal_interface-curses.ads:1687</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1691_13" TARGET="main">Terminal_Name -  terminal_interface-curses.ads:1691</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2126_16" TARGET="main">Termname -  terminal_interface-curses.adb:2126</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2134_16" TARGET="main">Termname -  terminal_interface-curses.adb:2134</A>
- <LI><A HREF="../terminal_interface-curses-termcap__adb.htm#ref_51_16" TARGET="main">tgetent</A>
- <LI><A HREF="../terminal_interface-curses-termcap__adb.htm#ref_71_16" TARGET="main">tgetflag</A>
- <LI><A HREF="../terminal_interface-curses-termcap__adb.htm#ref_89_16" TARGET="main">tgetnum</A>
-@@ -18,8 +21,16 @@
- <LI><A HREF="../terminal_interface-curses-terminfo__adb.htm#ref_87_16" TARGET="main">tigetstr -  terminal_interface-curses-terminfo.adb:87</A>
- <LI><A HREF="../terminal_interface-curses-terminfo__adb.htm#ref_108_16" TARGET="main">tigetstr -  terminal_interface-curses-terminfo.adb:108</A>
- <LI><A HREF="../terminal_interface-curses-terminfo__adb.htm#ref_127_16" TARGET="main">tigetstr -  terminal_interface-curses-terminfo.adb:127</A>
-+<LI><A HREF="../terminal_interface-curses-panels__ads.htm#ref_82_14" TARGET="main">Top</A>
- <LI><A HREF="../terminal_interface-curses-panels__adb.htm#ref_75_16" TARGET="main">Toppanel</A>
- <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_327_16" TARGET="main">Toprow</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_305_13" TARGET="main">Top_Row</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1141_14" TARGET="main">Touch -  terminal_interface-curses.ads:1141</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1145_14" TARGET="main">Touch -  terminal_interface-curses.ads:1145</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1543_14" TARGET="main">Touch_Soft_Label_Keys</A>
- <LI><A HREF="../terminal_interface-curses-terminfo__adb.htm#ref_140_16" TARGET="main">tputs</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2426_16" TARGET="main">Transform</A>
-+<LI><A HREF="../terminal_interface-curses-trace__ads.htm#ref_102_14" TARGET="main">Trace_On</A>
-+<LI><A HREF="../terminal_interface-curses-trace__ads.htm#ref_106_14" TARGET="main">Trace_Put</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2402_16" TARGET="main">Transform</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1814_14" TARGET="main">Transform_Coordinates</A>
- </UL></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/U.htm ncurses-5.6/doc/html/ada/funcs/U.htm
---- ncurses-5.6.orig/doc/html/ada/funcs/U.htm	2006-09-23 16:31:30.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/funcs/U.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -4,9 +4,20 @@
- <H2>Functions - U</H2>
- <A HREF="../funcs.htm" TARGET="_self">[index]</A>
- <UL COMPACT TYPE=DISC>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2049_16" TARGET="main">Unctrl -  terminal_interface-curses.adb:2049</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2057_16" TARGET="main">Unctrl -  terminal_interface-curses.adb:2057</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_590_16" TARGET="main">Ungetch</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2016_16" TARGET="main">Unctrl -  terminal_interface-curses.adb:2016</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2024_16" TARGET="main">Unctrl -  terminal_interface-curses.adb:2024</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_762_14" TARGET="main">Undo_Keystroke</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_537_16" TARGET="main">Ungetch</A>
- <LI><A HREF="../terminal_interface-curses-mouse__adb.htm#ref_189_16" TARGET="main">Ungetmouse</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2484_16" TARGET="main">use_extended_namesC</A>
-+<LI><A HREF="../terminal_interface-curses-mouse__ads.htm#ref_149_14" TARGET="main">Unget_Mouse</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1136_14" TARGET="main">Untouch</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1622_14" TARGET="main">Un_Control -  terminal_interface-curses.ads:1622</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1627_13" TARGET="main">Un_Control -  terminal_interface-curses.ads:1627</A>
-+<LI><A HREF="../terminal_interface-curses-panels__ads.htm#ref_92_14" TARGET="main">Update_Panels</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1040_14" TARGET="main">Update_Screen</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1831_14" TARGET="main">Use_Default_Colors</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1851_13" TARGET="main">Use_Extended_Names</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2474_16" TARGET="main">use_extended_namesC</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_995_14" TARGET="main">Use_Insert_Delete_Character</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_988_14" TARGET="main">Use_Insert_Delete_Line</A>
- </UL></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/V.htm ncurses-5.6/doc/html/ada/funcs/V.htm
---- ncurses-5.6.orig/doc/html/ada/funcs/V.htm	2005-05-14 13:34:32.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/funcs/V.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -4,5 +4,8 @@
- <H2>Functions - V</H2>
- <A HREF="../funcs.htm" TARGET="_self">[index]</A>
- <UL COMPACT TYPE=DISC>
--<LI><A HREF="../terminal_interface-curses-forms-field_types-enumeration-ada__ads.htm#ref_53_13" TARGET="main">Value</A>
-+<LI><A HREF="../terminal_interface-curses-forms-field_types-enumeration-ada__ads.htm#ref_53_13" TARGET="main">Value -  terminal_interface-curses-forms-field_types-enumeration-ada.ads:53</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_218_13" TARGET="main">Value -  terminal_interface-curses-menus.ads:218</A>
-+<LI><A HREF="../terminal_interface-curses__ads.htm#ref_737_14" TARGET="main">Vertical_Line</A>
-+<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_227_13" TARGET="main">Visible</A>
- </UL></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/funcs/W.htm ncurses-5.6/doc/html/ada/funcs/W.htm
---- ncurses-5.6.orig/doc/html/ada/funcs/W.htm	2006-09-23 16:31:30.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/funcs/W.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -4,50 +4,50 @@
- <H2>Functions - W</H2>
- <A HREF="../funcs.htm" TARGET="_self">[index]</A>
- <UL COMPACT TYPE=DISC>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_204_16" TARGET="main">Waddch</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_460_16" TARGET="main">Waddchnstr</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_429_16" TARGET="main">Waddnstr</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_708_16" TARGET="main">Wattrget -  terminal_interface-curses.adb:708</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_731_16" TARGET="main">Wattrget -  terminal_interface-curses.adb:731</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_667_16" TARGET="main">Wattroff</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_664_16" TARGET="main">Wattron</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_692_16" TARGET="main">Wattrset</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1214_17" TARGET="main">WBackground</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_501_16" TARGET="main">Wborder</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1224_16" TARGET="main">WChangeBkgd</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_772_16" TARGET="main">Wchgat</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1182_16" TARGET="main">Wclear</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1192_16" TARGET="main">Wclearbot</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1202_16" TARGET="main">Wcleareol</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1600_16" TARGET="main">Wdelch</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_307_16" TARGET="main">Wdelwin</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_261_16" TARGET="main">Wechochar</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_151_16" TARGET="main">Waddch</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_407_16" TARGET="main">Waddchnstr</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_376_16" TARGET="main">Waddnstr</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_655_16" TARGET="main">Wattrget -  terminal_interface-curses.adb:655</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_678_16" TARGET="main">Wattrget -  terminal_interface-curses.adb:678</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_614_16" TARGET="main">Wattroff</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_611_16" TARGET="main">Wattron</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_639_16" TARGET="main">Wattrset</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1159_17" TARGET="main">WBackground</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_448_16" TARGET="main">Wborder</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1169_16" TARGET="main">WChangeBkgd</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_719_16" TARGET="main">Wchgat</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1127_16" TARGET="main">Wclear</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1137_16" TARGET="main">Wclearbot</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1147_16" TARGET="main">Wcleareol</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1567_16" TARGET="main">Wdelch</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_254_16" TARGET="main">Wdelwin</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_208_16" TARGET="main">Wechochar</A>
- <LI><A HREF="../terminal_interface-curses-mouse__adb.htm#ref_200_16" TARGET="main">Wenclose</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1172_16" TARGET="main">Werase</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1235_16" TARGET="main">Wgetbkgd</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_576_16" TARGET="main">Wgetch</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1812_16" TARGET="main">Wgetnstr</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_543_16" TARGET="main">Whline</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1626_16" TARGET="main">Winch</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1764_16" TARGET="main">Winchnstr</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1722_16" TARGET="main">Winnstr</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1648_16" TARGET="main">Winsch</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1376_16" TARGET="main">Winsdelln</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1680_16" TARGET="main">Winsnstr</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1288_16" TARGET="main">WLineTouched</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_190_16" TARGET="main">Wmove</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1135_16" TARGET="main">Wnoutrefresh</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1158_16" TARGET="main">Wredrawln</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1124_16" TARGET="main">Wrefresh</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2552_16" TARGET="main">wresize</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1588_16" TARGET="main">Wscrl</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1101_16" TARGET="main">Wsetscrreg</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_754_16" TARGET="main">Wset_Color</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_644_16" TARGET="main">wstandend</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_642_16" TARGET="main">wstandout</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_965_16" TARGET="main">Wtimeout</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1246_16" TARGET="main">Wtouchln</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_560_16" TARGET="main">Wvline</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1301_16" TARGET="main">WWinTouched</A>
--<LI><A HREF="../terminal_interface-curses__adb.htm#ref_66_13" TARGET="main">W_Get_Element</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1117_16" TARGET="main">Werase</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1180_16" TARGET="main">Wgetbkgd</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_523_16" TARGET="main">Wgetch</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1779_16" TARGET="main">Wgetnstr</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_490_16" TARGET="main">Whline</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1593_16" TARGET="main">Winch</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1731_16" TARGET="main">Winchnstr</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1689_16" TARGET="main">Winnstr</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1615_16" TARGET="main">Winsch</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1321_16" TARGET="main">Winsdelln</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1647_16" TARGET="main">Winsnstr</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1233_16" TARGET="main">WLineTouched</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_137_16" TARGET="main">Wmove</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1080_16" TARGET="main">Wnoutrefresh</A>
-+<LI><A HREF="../terminal_interface-curses-forms-field_types__ads.htm#ref_151_14" TARGET="main">Wrap_Builtin</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1103_16" TARGET="main">Wredrawln</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1069_16" TARGET="main">Wrefresh</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2542_16" TARGET="main">wresize</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1555_16" TARGET="main">Wscrl</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1046_16" TARGET="main">Wsetscrreg</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_701_16" TARGET="main">Wset_Color</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_591_16" TARGET="main">wstandend</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_589_16" TARGET="main">wstandout</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_914_17" TARGET="main">Wtimeout</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1191_16" TARGET="main">Wtouchln</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_507_16" TARGET="main">Wvline</A>
-+<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1246_16" TARGET="main">WWinTouched</A>
- </UL></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/table.html ncurses-5.6/doc/html/ada/table.html
---- ncurses-5.6.orig/doc/html/ada/table.html	2000-12-02 18:38:22.000000000 -0500
-+++ ncurses-5.6/doc/html/ada/table.html	2008-06-18 06:49:44.000000000 -0400
-@@ -10,36 +10,38 @@
- <TABLE ALIGN=CENTER BORDER>
- <TR ALIGN=LEFT>
- <TH>C name</TH><TH>Ada name</TH><TH>man page</TH></TR>
-+<TR><TD>_nc_freeall()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_159">Curses_Free_All</A></TD><TD><A HREF="../man/curs_trace.3x.html">curs_trace.3x</A></TD></TR>
- <TR><TD>_tracef()</TD><TD><A HREF="terminal_interface-curses-trace__ads.htm#AFU_2">Trace_Put</A></TD><TD><A HREF="../man/curs_trace.3x.html">curs_trace.3x</A></TD></TR>
--<TR><TD>assume_default_colors()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_155">Assume_Default_Colors</A></TD><TD><A HREF="../man/dft_fgbg.3x.html">dft_fgbg.3x</A></TD></TR>
--<TR><TD>baudrate()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_130">Baudrate</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
--<TR><TD>beep()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_39">Beep</A></TD><TD><A HREF="../man/curs_beep.3x.html">curs_beep.3x</A></TD></TR>
-+<TR><TD>assume_default_colors()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_156">Assume_Default_Colors</A></TD><TD><A HREF="../man/default_colors.3x.html">default_colors.3x</A></TD></TR>
-+<TR><TD>baudrate()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_131">Baudrate</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
-+<TR><TD>beep()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_40">Beep</A></TD><TD><A HREF="../man/curs_beep.3x.html">curs_beep.3x</A></TD></TR>
- <TR><TD>bottom_panel()</TD><TD><A HREF="terminal_interface-curses-panels__ads.htm#AFU_3">Bottom</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
--<TR><TD>box()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_25">Box</A></TD><TD><A HREF="../man/curs_border.3x.html">curs_border.3x</A></TD></TR>
--<TR><TD>can_change_color()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_145">Can_Change_Color</A></TD><TD><A HREF="../man/curs_color.3x.html">curs_color.3x</A></TD></TR>
--<TR><TD>cbreak()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_41">Set_Cbreak_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
--<TR><TD>clearok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_53">Clear_On_Next_Update</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
--<TR><TD>color_content()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_146">Color_Content</A></TD><TD><A HREF="../man/curs_color.3x.html">curs_color.3x</A></TD></TR>
--<TR><TD>copywin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_78">Copy</A></TD><TD><A HREF="../man/curs_overlay.3x.html">curs_overlay.3x</A></TD></TR>
-+<TR><TD>box()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_26">Box</A></TD><TD><A HREF="../man/curs_border.3x.html">curs_border.3x</A></TD></TR>
-+<TR><TD>can_change_color()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_146">Can_Change_Color</A></TD><TD><A HREF="../man/curs_color.3x.html">curs_color.3x</A></TD></TR>
-+<TR><TD>cbreak()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_42">Set_Cbreak_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-+<TR><TD>clearok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_54">Clear_On_Next_Update</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
-+<TR><TD>color_content()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_147">Color_Content</A></TD><TD><A HREF="../man/curs_color.3x.html">curs_color.3x</A></TD></TR>
-+<TR><TD>copywin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_79">Copy</A></TD><TD><A HREF="../man/curs_overlay.3x.html">curs_overlay.3x</A></TD></TR>
- <TR><TD>current_field()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_58">Current</A></TD><TD><A HREF="../man/form_page.3x.html">form_page.3x</A></TD></TR>
- <TR><TD>current_item()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_14">Current</A></TD><TD><A HREF="../man/mitem_current.3x.html">mitem_current.3x</A></TD></TR>
--<TR><TD>curs_set()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_152">Set_Cursor_Visibility</A></TD><TD><A HREF="../man/curs_kernel.3x.html">curs_kernel.3x</A></TD></TR>
--<TR><TD>curses_version()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_156">Curses_Version</A></TD><TD><A HREF="../man/curs_extend.3x.html">curs_extend.3x</A></TD></TR>
-+<TR><TD>curs_set()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_153">Set_Cursor_Visibility</A></TD><TD><A HREF="../man/curs_kernel.3x.html">curs_kernel.3x</A></TD></TR>
-+<TR><TD>curscr</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_2">Current_Window</A></TD><TD><A HREF="../man/curs_initscr.3x.html">curs_initscr.3x</A></TD></TR>
-+<TR><TD>curses_version()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_157">Curses_Version</A></TD><TD><A HREF="../man/curs_extend.3x.html">curs_extend.3x</A></TD></TR>
- <TR><TD>data_ahead()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_54">Data_Ahead</A></TD><TD><A HREF="../man/form_data.3x.html">form_data.3x</A></TD></TR>
- <TR><TD>data_behind()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_55">Data_Behind</A></TD><TD><A HREF="../man/form_data.3x.html">form_data.3x</A></TD></TR>
--<TR><TD>def_prog_mode()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_147">Save_Curses_Mode</A></TD><TD><A HREF="../man/curs_kernel.3x.html">curs_kernel.3x</A></TD></TR>
--<TR><TD>define_key()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_123">Define_Key</A></TD><TD><A HREF="../man/define_key.3x.html">define_key.3x</A></TD></TR>
-+<TR><TD>def_prog_mode()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_148">Save_Curses_Mode</A></TD><TD><A HREF="../man/curs_kernel.3x.html">curs_kernel.3x</A></TD></TR>
-+<TR><TD>define_key()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_124">Define_Key</A></TD><TD><A HREF="../man/define_key.3x.html">define_key.3x</A></TD></TR>
- <TR><TD>del_panel()</TD><TD><A HREF="terminal_interface-curses-panels__ads.htm#AFU_15">Delete</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
--<TR><TD>delay_output()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_128">Delay_Output</A></TD><TD><A HREF="../man/curs_util.3x.html">curs_util.3x</A></TD></TR>
--<TR><TD>delwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_11">Delete</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
--<TR><TD>derwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_13">Derived_Window</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
--<TR><TD>doupdate()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_60">Update_Screen</A></TD><TD><A HREF="../man/curs_refresh.3x.html">curs_refresh.3x</A></TD></TR>
-+<TR><TD>delay_output()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_129">Delay_Output</A></TD><TD><A HREF="../man/curs_util.3x.html">curs_util.3x</A></TD></TR>
-+<TR><TD>delwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_12">Delete</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
-+<TR><TD>derwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_14">Derived_Window</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
-+<TR><TD>doupdate()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_61">Update_Screen</A></TD><TD><A HREF="../man/curs_refresh.3x.html">curs_refresh.3x</A></TD></TR>
- <TR><TD>dup_field()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_4">Duplicate</A></TD><TD><A HREF="../man/form_field_new.3x.html">form_field_new.3x</A></TD></TR>
--<TR><TD>dupwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_14">Duplicate</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
-+<TR><TD>dupwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_15">Duplicate</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
- <TR><TD>dynamic_field_info()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_26">Dynamic_Info</A></TD><TD><A HREF="../man/form_field_info.3x.html">form_field_info.3x</A></TD></TR>
--<TR><TD>echo()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_43">Set_Echo_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
--<TR><TD>endwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_4">End_Windows</A></TD><TD><A HREF="../man/curs_initscr.3x.html">curs_initscr.3x</A></TD></TR>
--<TR><TD>erasechar()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_131">Erase_Character</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
-+<TR><TD>echo()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_44">Set_Echo_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-+<TR><TD>endwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_5">End_Windows</A></TD><TD><A HREF="../man/curs_initscr.3x.html">curs_initscr.3x</A></TD></TR>
-+<TR><TD>erasechar()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_132">Erase_Character</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
- <TR><TD>field_back()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_21">Background</A></TD><TD><A HREF="../man/form_field_attributes.3x.html">form_field_attributes.3x</A></TD></TR>
- <TR><TD>field_back()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_22">Background</A></TD><TD><A HREF="../man/form_field_attributes.3x.html">form_field_attributes.3x</A></TD></TR>
- <TR><TD>field_buffer()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_9">Get_Buffer</A></TD><TD><A HREF="../man/form_field_buffer.3x.html">form_field_buffer.3x</A></TD></TR>
-@@ -59,8 +61,8 @@
- <TR><TD>field_type()</TD><TD><A HREF="terminal_interface-curses-forms-field_user_data__ads.htm#AFU_2">Get_Type</A></TD><TD><A HREF="../man/form_field_validation.3x.html">form_field_validation.3x</A></TD></TR>
- <TR><TD>field_userptr</TD><TD><A HREF="terminal_interface-curses-forms-field_user_data__ads.htm#AFU_2">Get_User_Data</A></TD><TD><A HREF="../man/form_field_userptr.3x.html">form_field_userptr.3x</A></TD></TR>
- <TR><TD>field_userptr</TD><TD><A HREF="terminal_interface-curses-forms-field_user_data__ads.htm#AFU_3">Get_User_Data</A></TD><TD><A HREF="../man/form_field_userptr.3x.html">form_field_userptr.3x</A></TD></TR>
--<TR><TD>flash()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_40">Flash_Screen</A></TD><TD><A HREF="../man/curs_beep.3x.html">curs_beep.3x</A></TD></TR>
--<TR><TD>flushinp()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_129">Flush_Input</A></TD><TD><A HREF="../man/curs_util.3x.html">curs_util.3x</A></TD></TR>
-+<TR><TD>flash()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_41">Flash_Screen</A></TD><TD><A HREF="../man/curs_beep.3x.html">curs_beep.3x</A></TD></TR>
-+<TR><TD>flushinp()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_130">Flush_Input</A></TD><TD><A HREF="../man/curs_util.3x.html">curs_util.3x</A></TD></TR>
- <TR><TD>form_driver()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_56">Driver</A></TD><TD><A HREF="../man/form_driver.3x.html">form_driver.3x</A></TD></TR>
- <TR><TD>form_fields()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_42">Fields</A></TD><TD><A HREF="../man/form_field.3x.html">form_field.3x</A></TD></TR>
- <TR><TD>form_init()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_38">Get_Form_Init_Hook</A></TD><TD><A HREF="../man/form_hook.3x.html">form_hook.3x</A></TD></TR>
-@@ -77,28 +79,28 @@
- <TR><TD>free_form()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_47">Delete</A></TD><TD><A HREF="../man/form_new.3x.html">form_new.3x</A></TD></TR>
- <TR><TD>free_item()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_3">Delete</A></TD><TD><A HREF="../man/mitem_new.3x.html">mitem_new.3x</A></TD></TR>
- <TR><TD>free_menu()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_60">Delete</A></TD><TD><A HREF="../man/menu_new.3x.html">menu_new.3x</A></TD></TR>
--<TR><TD>getbegyx()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_85">Get_Window_Position</A></TD><TD><A HREF="../man/curs_getyx.3x.html">curs_getyx.3x</A></TD></TR>
--<TR><TD>getmaxyx()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_84">Get_Size</A></TD><TD><A HREF="../man/curs_getyx.3x.html">curs_getyx.3x</A></TD></TR>
-+<TR><TD>getbegyx()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_86">Get_Window_Position</A></TD><TD><A HREF="../man/curs_getyx.3x.html">curs_getyx.3x</A></TD></TR>
-+<TR><TD>getmaxyx()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_85">Get_Size</A></TD><TD><A HREF="../man/curs_getyx.3x.html">curs_getyx.3x</A></TD></TR>
- <TR><TD>getmouse()</TD><TD><A HREF="terminal_interface-curses-mouse__ads.htm#AFU_2">Get_Mouse</A></TD><TD><A HREF="../man/curs_mouse.3x.html">curs_mouse.3x</A></TD></TR>
--<TR><TD>getparyx()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_87">Get_Origin_Relative_To_Parent</A></TD><TD><A HREF="../man/curs_getyx.3x.html">curs_getyx.3x</A></TD></TR>
--<TR><TD>getyx()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_86">Get_Cursor_Position</A></TD><TD><A HREF="../man/curs_getyx.3x.html">curs_getyx.3x</A></TD></TR>
--<TR><TD>halfdelay()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_46">Half_Delay</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
--<TR><TD>has_colors()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_143">Has_Colors</A></TD><TD><A HREF="../man/curs_color.3x.html">curs_color.3x</A></TD></TR>
--<TR><TD>has_ic()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_133">Has_Insert_Character</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
--<TR><TD>has_il()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_134">Has_Insert_Line</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
--<TR><TD>has_key()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_30">Has_Key</A></TD><TD><A HREF="../man/curs_getch.3x.html">curs_getch.3x</A></TD></TR>
-+<TR><TD>getparyx()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_88">Get_Origin_Relative_To_Parent</A></TD><TD><A HREF="../man/curs_getyx.3x.html">curs_getyx.3x</A></TD></TR>
-+<TR><TD>getyx()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_87">Get_Cursor_Position</A></TD><TD><A HREF="../man/curs_getyx.3x.html">curs_getyx.3x</A></TD></TR>
-+<TR><TD>halfdelay()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_47">Half_Delay</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-+<TR><TD>has_colors()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_144">Has_Colors</A></TD><TD><A HREF="../man/curs_color.3x.html">curs_color.3x</A></TD></TR>
-+<TR><TD>has_ic()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_134">Has_Insert_Character</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
-+<TR><TD>has_il()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_135">Has_Insert_Line</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
-+<TR><TD>has_key()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_31">Has_Key</A></TD><TD><A HREF="../man/curs_getch.3x.html">curs_getch.3x</A></TD></TR>
- <TR><TD>hide_panel()</TD><TD><A HREF="terminal_interface-curses-panels__ads.htm#AFU_7">Hide</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
--<TR><TD>idcok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_55">Use_Insert_Delete_Character</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
--<TR><TD>idlok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_54">Use_Insert_Delete_Line</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
--<TR><TD>immedok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_57">Immediate_Update_Mode</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
--<TR><TD>init_color()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_144">Init_Color</A></TD><TD><A HREF="../man/curs_color.3x.html">curs_color.3x</A></TD></TR>
--<TR><TD>init_pair()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_141">Init_Pair</A></TD><TD><A HREF="../man/curs_color.3x.html">curs_color.3x</A></TD></TR>
--<TR><TD>initscr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_2">Init_Screen</A></TD><TD><A HREF="../man/curs_initscr.3x.html">curs_initscr.3x</A></TD></TR>
--<TR><TD>initscr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_3">Init_Windows</A></TD><TD><A HREF="../man/curs_initscr.3x.html">curs_initscr.3x</A></TD></TR>
--<TR><TD>intrflush()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_47">Set_Flush_On_Interrupt_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
--<TR><TD>is_linetouched()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_76">Is_Touched</A></TD><TD><A HREF="../man/curs_touch.3x.html">curs_touch.3x</A></TD></TR>
--<TR><TD>is_wintouched()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_77">Is_Touched</A></TD><TD><A HREF="../man/curs_touch.3x.html">curs_touch.3x</A></TD></TR>
--<TR><TD>isendwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_5">Is_End_Window</A></TD><TD><A HREF="../man/curs_initscr.3x.html">curs_initscr.3x</A></TD></TR>
-+<TR><TD>idcok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_56">Use_Insert_Delete_Character</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
-+<TR><TD>idlok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_55">Use_Insert_Delete_Line</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
-+<TR><TD>immedok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_58">Immediate_Update_Mode</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
-+<TR><TD>init_color()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_145">Init_Color</A></TD><TD><A HREF="../man/curs_color.3x.html">curs_color.3x</A></TD></TR>
-+<TR><TD>init_pair()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_142">Init_Pair</A></TD><TD><A HREF="../man/curs_color.3x.html">curs_color.3x</A></TD></TR>
-+<TR><TD>initscr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_3">Init_Screen</A></TD><TD><A HREF="../man/curs_initscr.3x.html">curs_initscr.3x</A></TD></TR>
-+<TR><TD>initscr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_4">Init_Windows</A></TD><TD><A HREF="../man/curs_initscr.3x.html">curs_initscr.3x</A></TD></TR>
-+<TR><TD>intrflush()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_48">Set_Flush_On_Interrupt_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-+<TR><TD>is_linetouched()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_77">Is_Touched</A></TD><TD><A HREF="../man/curs_touch.3x.html">curs_touch.3x</A></TD></TR>
-+<TR><TD>is_wintouched()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_78">Is_Touched</A></TD><TD><A HREF="../man/curs_touch.3x.html">curs_touch.3x</A></TD></TR>
-+<TR><TD>isendwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_6">Is_End_Window</A></TD><TD><A HREF="../man/curs_initscr.3x.html">curs_initscr.3x</A></TD></TR>
- <TR><TD>item_count()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_58">Item_Count</A></TD><TD><A HREF="../man/menu_items.3x.html">menu_items.3x</A></TD></TR>
- <TR><TD>item_description();</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_12">Description</A></TD><TD><A HREF="../man/mitem_name.3x.html">mitem_name.3x</A></TD></TR>
- <TR><TD>item_index()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_17">Get_Index</A></TD><TD><A HREF="../man/mitem_current.3x.html">mitem_current.3x</A></TD></TR>
-@@ -112,30 +114,30 @@
- <TR><TD>item_userptr</TD><TD><A HREF="terminal_interface-curses-menus-item_user_data__ads.htm#AFU_3">Get_User_Data</A></TD><TD><A HREF="../man/mitem_userptr.3x.html">mitem_userptr.3x</A></TD></TR>
- <TR><TD>item_value()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_5">Value</A></TD><TD><A HREF="../man/mitem_value.3x.html">mitem_value.3x</A></TD></TR>
- <TR><TD>item_visible()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_6">Visible</A></TD><TD><A HREF="../man/mitem_visible.3x.html">mitem_visible.3x</A></TD></TR>
--<TR><TD>keyname()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_124">Key_Name</A></TD><TD><A HREF="../man/curs_util.3x.html">curs_util.3x</A></TD></TR>
- <TR><TD>keyname()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_125">Key_Name</A></TD><TD><A HREF="../man/curs_util.3x.html">curs_util.3x</A></TD></TR>
--<TR><TD>keyok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_122">Enable_Key</A></TD><TD><A HREF="../man/keyok.3x.html">keyok.3x</A></TD></TR>
--<TR><TD>keypad()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_45">Set_KeyPad_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
--<TR><TD>killchar()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_132">Kill_Character</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
--<TR><TD>leaveok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_56">Leave_Cursor_After_Update</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
-+<TR><TD>keyname()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_126">Key_Name</A></TD><TD><A HREF="../man/curs_util.3x.html">curs_util.3x</A></TD></TR>
-+<TR><TD>keyok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_123">Enable_Key</A></TD><TD><A HREF="../man/keyok.3x.html">keyok.3x</A></TD></TR>
-+<TR><TD>keypad()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_46">Set_KeyPad_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-+<TR><TD>killchar()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_133">Kill_Character</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
-+<TR><TD>leaveok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_57">Leave_Cursor_After_Update</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
- <TR><TD>link_field()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_5">Link</A></TD><TD><A HREF="../man/form_field_new.3x.html">form_field_new.3x</A></TD></TR>
--<TR><TD>longname()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_136">Long_Name</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
- <TR><TD>longname()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_137">Long_Name</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
--<TR><TD>menu_back()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_35">Background</A></TD><TD><A HREF="../man/menu_attribs.3x.html">menu_attribs.3x</A></TD></TR>
--<TR><TD>menu_back()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_36">Background</A></TD><TD><A HREF="../man/menu_attribs.3x.html">menu_attribs.3x</A></TD></TR>
-+<TR><TD>longname()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_138">Long_Name</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
-+<TR><TD>menu_back()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_35">Background</A></TD><TD><A HREF="../man/menu_attributes.3x.html">menu_attributes.3x</A></TD></TR>
-+<TR><TD>menu_back()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_36">Background</A></TD><TD><A HREF="../man/menu_attributes.3x.html">menu_attributes.3x</A></TD></TR>
- <TR><TD>menu_driver()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_61">Driver</A></TD><TD><A HREF="../man/menu_driver.3x.html">menu_driver.3x</A></TD></TR>
--<TR><TD>menu_fore()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_32">Foreground</A></TD><TD><A HREF="../man/menu_attribs.3x.html">menu_attribs.3x</A></TD></TR>
--<TR><TD>menu_fore()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_33">Foreground</A></TD><TD><A HREF="../man/menu_attribs.3x.html">menu_attribs.3x</A></TD></TR>
-+<TR><TD>menu_fore()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_32">Foreground</A></TD><TD><A HREF="../man/menu_attributes.3x.html">menu_attributes.3x</A></TD></TR>
-+<TR><TD>menu_fore()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_33">Foreground</A></TD><TD><A HREF="../man/menu_attributes.3x.html">menu_attributes.3x</A></TD></TR>
- <TR><TD>menu_format()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_47">Format</A></TD><TD><A HREF="../man/menu_format.3x.html">menu_format.3x</A></TD></TR>
--<TR><TD>menu_grey()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_38">Grey</A></TD><TD><A HREF="../man/menu_attribs.3x.html">menu_attribs.3x</A></TD></TR>
--<TR><TD>menu_grey()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_39">Grey</A></TD><TD><A HREF="../man/menu_attribs.3x.html">menu_attribs.3x</A></TD></TR>
-+<TR><TD>menu_grey()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_38">Grey</A></TD><TD><A HREF="../man/menu_attributes.3x.html">menu_attributes.3x</A></TD></TR>
-+<TR><TD>menu_grey()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_39">Grey</A></TD><TD><A HREF="../man/menu_attributes.3x.html">menu_attributes.3x</A></TD></TR>
- <TR><TD>menu_init()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_54">Get_Menu_Init_Hook</A></TD><TD><A HREF="../man/menu_hook.3x.html">menu_hook.3x</A></TD></TR>
- <TR><TD>menu_items()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_57">Items</A></TD><TD><A HREF="../man/menu_items.3x.html">menu_items.3x</A></TD></TR>
- <TR><TD>menu_mark()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_30">Mark</A></TD><TD><A HREF="../man/menu_mark.3x.html">menu_mark.3x</A></TD></TR>
- <TR><TD>menu_opts()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_21">Get_Options</A></TD><TD><A HREF="../man/menu_opts.3x.html">menu_opts.3x</A></TD></TR>
- <TR><TD>menu_opts()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_22">Get_Options</A></TD><TD><A HREF="../man/menu_opts.3x.html">menu_opts.3x</A></TD></TR>
- <TR><TD>menu_opts_on()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_20">Switch_Options</A></TD><TD><A HREF="../man/menu_opts.3x.html">menu_opts.3x</A></TD></TR>
--<TR><TD>menu_pad()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_41">Pad_Character</A></TD><TD><A HREF="../man/menu_attribs.3x.html">menu_attribs.3x</A></TD></TR>
-+<TR><TD>menu_pad()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_41">Pad_Character</A></TD><TD><A HREF="../man/menu_attributes.3x.html">menu_attributes.3x</A></TD></TR>
- <TR><TD>menu_pattern()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_45">Pattern</A></TD><TD><A HREF="../man/menu_pattern.3x.html">menu_pattern.3x</A></TD></TR>
- <TR><TD>menu_requestname.3x</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_62"></A></TD><TD><A HREF="../man/menu_driver.3x.html">menu_driver.3x</A></TD></TR>
- <TR><TD>menu_spacing()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_43">Spacing</A></TD><TD><A HREF="../man/menu_spacing.3x.html">menu_spacing.3x</A></TD></TR>
-@@ -144,25 +146,25 @@
- <TR><TD>menu_userptr</TD><TD><A HREF="terminal_interface-curses-menus-menu_user_data__ads.htm#AFU_2">Get_User_Data</A></TD><TD><A HREF="../man/menu_userptr.3x.html">menu_userptr.3x</A></TD></TR>
- <TR><TD>menu_userptr</TD><TD><A HREF="terminal_interface-curses-menus-menu_user_data__ads.htm#AFU_3">Get_User_Data</A></TD><TD><A HREF="../man/menu_userptr.3x.html">menu_userptr.3x</A></TD></TR>
- <TR><TD>menu_win()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_24">Get_Window</A></TD><TD><A HREF="../man/menu_win.3x.html">menu_win.3x</A></TD></TR>
--<TR><TD>meta()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_44">Set_Meta_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-+<TR><TD>meta()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_45">Set_Meta_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
- <TR><TD>mouseinterval()</TD><TD><A HREF="terminal_interface-curses-mouse__ads.htm#AFU_5">Mouse_Interval</A></TD><TD><A HREF="../man/curs_mouse.3x.html">curs_mouse.3x</A></TD></TR>
- <TR><TD>mousemask()</TD><TD><A HREF="terminal_interface-curses-mouse__ads.htm#AFU_1">Start_Mouse</A></TD><TD><A HREF="../man/curs_mouse.3x.html">curs_mouse.3x</A></TD></TR>
- <TR><TD>move_field()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_44">Move</A></TD><TD><A HREF="../man/form_field.3x.html">form_field.3x</A></TD></TR>
- <TR><TD>move_panel()</TD><TD><A HREF="terminal_interface-curses-panels__ads.htm#AFU_11">Move</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
--<TR><TD>mvderwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_16">Move_Derived_Window</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
--<TR><TD>mvwaddch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_8">Add</A></TD><TD><A HREF="../man/curs_addch.3x.html">curs_addch.3x</A></TD></TR>
--<TR><TD>mvwaddchnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_23">Add</A></TD><TD><A HREF="../man/curs_addchstr.3x.html">curs_addchstr.3x</A></TD></TR>
--<TR><TD>mvwaddnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_21">Add</A></TD><TD><A HREF="../man/curs_addstr.3x.html">curs_addstr.3x</A></TD></TR>
--<TR><TD>mvwchgat()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_38">Change_Attributes</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
--<TR><TD>mvwdelch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_95">Delete_Character</A></TD><TD><A HREF="../man/curs_delch.3x.html">curs_delch.3x</A></TD></TR>
--<TR><TD>mvwgetnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_107">Get</A></TD><TD><A HREF="../man/curs_getstr.3x.html">curs_getstr.3x</A></TD></TR>
--<TR><TD>mvwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_15">Move_Window</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
--<TR><TD>mvwinch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_97">Peek</A></TD><TD><A HREF="../man/curs_inch.3x.html">curs_inch.3x</A></TD></TR>
--<TR><TD>mvwinchnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_105">Peek</A></TD><TD><A HREF="../man/curs_inchstr.3x.html">curs_inchstr.3x</A></TD></TR>
--<TR><TD>mvwinnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_103">Peek</A></TD><TD><A HREF="../man/curs_instr.3x.html">curs_instr.3x</A></TD></TR>
--<TR><TD>mvwinsch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_99">Insert</A></TD><TD><A HREF="../man/curs_insch.3x.html">curs_insch.3x</A></TD></TR>
--<TR><TD>mvwinsnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_101">Insert</A></TD><TD><A HREF="../man/curs_insstr.3x.html">curs_insstr.3x</A></TD></TR>
--<TR><TD>napms()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_153">Nap_Milli_Seconds</A></TD><TD><A HREF="../man/curs_kernel.3x.html">curs_kernel.3x</A></TD></TR>
-+<TR><TD>mvderwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_17">Move_Derived_Window</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
-+<TR><TD>mvwaddch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_9">Add</A></TD><TD><A HREF="../man/curs_addch.3x.html">curs_addch.3x</A></TD></TR>
-+<TR><TD>mvwaddchnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_24">Add</A></TD><TD><A HREF="../man/curs_addchstr.3x.html">curs_addchstr.3x</A></TD></TR>
-+<TR><TD>mvwaddnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_22">Add</A></TD><TD><A HREF="../man/curs_addstr.3x.html">curs_addstr.3x</A></TD></TR>
-+<TR><TD>mvwchgat()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_39">Change_Attributes</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
-+<TR><TD>mvwdelch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_96">Delete_Character</A></TD><TD><A HREF="../man/curs_delch.3x.html">curs_delch.3x</A></TD></TR>
-+<TR><TD>mvwgetnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_108">Get</A></TD><TD><A HREF="../man/curs_getstr.3x.html">curs_getstr.3x</A></TD></TR>
-+<TR><TD>mvwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_16">Move_Window</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
-+<TR><TD>mvwinch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_98">Peek</A></TD><TD><A HREF="../man/curs_inch.3x.html">curs_inch.3x</A></TD></TR>
-+<TR><TD>mvwinchnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_106">Peek</A></TD><TD><A HREF="../man/curs_inchstr.3x.html">curs_inchstr.3x</A></TD></TR>
-+<TR><TD>mvwinnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_104">Peek</A></TD><TD><A HREF="../man/curs_instr.3x.html">curs_instr.3x</A></TD></TR>
-+<TR><TD>mvwinsch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_100">Insert</A></TD><TD><A HREF="../man/curs_insch.3x.html">curs_insch.3x</A></TD></TR>
-+<TR><TD>mvwinsnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_102">Insert</A></TD><TD><A HREF="../man/curs_insstr.3x.html">curs_insstr.3x</A></TD></TR>
-+<TR><TD>napms()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_154">Nap_Milli_Seconds</A></TD><TD><A HREF="../man/curs_kernel.3x.html">curs_kernel.3x</A></TD></TR>
- <TR><TD>new_field()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_1">Create</A></TD><TD><A HREF="../man/form_field_new.3x.html">form_field_new.3x</A></TD></TR>
- <TR><TD>new_field()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_2">New_Field</A></TD><TD><A HREF="../man/form_field_new.3x.html">form_field_new.3x</A></TD></TR>
- <TR><TD>new_form()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_45">Create</A></TD><TD><A HREF="../man/form_new.3x.html">form_new.3x</A></TD></TR>
-@@ -173,14 +175,14 @@
- <TR><TD>new_page()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_63">Is_New_Page</A></TD><TD><A HREF="../man/form_new_page.3x.html">form_new_page.3x</A></TD></TR>
- <TR><TD>new_panel()</TD><TD><A HREF="terminal_interface-curses-panels__ads.htm#AFU_1">Create</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
- <TR><TD>new_panel()</TD><TD><A HREF="terminal_interface-curses-panels__ads.htm#AFU_2">New_Panel</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
--<TR><TD>newpad()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_88">New_Pad</A></TD><TD><A HREF="../man/curs_pad.3x.html">curs_pad.3x</A></TD></TR>
--<TR><TD>newwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_10">Create</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
--<TR><TD>nl()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_52">Set_NL_Mode</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
--<TR><TD>nodelay()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_49">Set_NoDelay_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
--<TR><TD>notimeout()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_51">Set_Escape_Time_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
--<TR><TD>overlay()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_80">Overlay</A></TD><TD><A HREF="../man/curs_overlay.3x.html">curs_overlay.3x</A></TD></TR>
--<TR><TD>overwrite()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_79">Overwrite</A></TD><TD><A HREF="../man/curs_overlay.3x.html">curs_overlay.3x</A></TD></TR>
--<TR><TD>pair_content()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_142">Pair_Content</A></TD><TD><A HREF="../man/curs_color.3x.html">curs_color.3x</A></TD></TR>
-+<TR><TD>newpad()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_89">New_Pad</A></TD><TD><A HREF="../man/curs_pad.3x.html">curs_pad.3x</A></TD></TR>
-+<TR><TD>newwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_11">Create</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
-+<TR><TD>nl()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_53">Set_NL_Mode</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
-+<TR><TD>nodelay()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_50">Set_NoDelay_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-+<TR><TD>notimeout()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_52">Set_Escape_Time_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-+<TR><TD>overlay()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_81">Overlay</A></TD><TD><A HREF="../man/curs_overlay.3x.html">curs_overlay.3x</A></TD></TR>
-+<TR><TD>overwrite()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_80">Overwrite</A></TD><TD><A HREF="../man/curs_overlay.3x.html">curs_overlay.3x</A></TD></TR>
-+<TR><TD>pair_content()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_143">Pair_Content</A></TD><TD><A HREF="../man/curs_color.3x.html">curs_color.3x</A></TD></TR>
- <TR><TD>panel_above()</TD><TD><A HREF="terminal_interface-curses-panels__ads.htm#AFU_13">Above</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
- <TR><TD>panel_below()</TD><TD><A HREF="terminal_interface-curses-panels__ads.htm#AFU_14">Below</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
- <TR><TD>panel_hidden()</TD><TD><A HREF="terminal_interface-curses-panels__ads.htm#AFU_12">Is_Hidden</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
-@@ -188,28 +190,28 @@
- <TR><TD>panel_userptr</TD><TD><A HREF="terminal_interface-curses-panels-user_data__ads.htm#AFU_3">Get_User_Data</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
- <TR><TD>panel_window()</TD><TD><A HREF="terminal_interface-curses-panels__ads.htm#AFU_8">Get_Window</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
- <TR><TD>panel_window()</TD><TD><A HREF="terminal_interface-curses-panels__ads.htm#AFU_9">Panel_Window</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
--<TR><TD>pechochar()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_92">Add_Character_To_Pad_And_Echo_It</A></TD><TD><A HREF="../man/curs_pad.3x.html">curs_pad.3x</A></TD></TR>
--<TR><TD>pnoutrefresh()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_91">Refresh_Without_Update</A></TD><TD><A HREF="../man/curs_pad.3x.html">curs_pad.3x</A></TD></TR>
-+<TR><TD>pechochar()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_93">Add_Character_To_Pad_And_Echo_It</A></TD><TD><A HREF="../man/curs_pad.3x.html">curs_pad.3x</A></TD></TR>
-+<TR><TD>pnoutrefresh()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_92">Refresh_Without_Update</A></TD><TD><A HREF="../man/curs_pad.3x.html">curs_pad.3x</A></TD></TR>
- <TR><TD>pos_form_cursor()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_53">Position_Cursor</A></TD><TD><A HREF="../man/form_cursor.3x.html">form_cursor.3x</A></TD></TR>
- <TR><TD>pos_menu_cursor()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_28">Position_Cursor</A></TD><TD><A HREF="../man/menu_cursor.3x.html">menu_cursor.3x</A></TD></TR>
- <TR><TD>post_form()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_52">Post</A></TD><TD><A HREF="../man/form_post.3x.html">form_post.3x</A></TD></TR>
- <TR><TD>post_menu()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_18">Post</A></TD><TD><A HREF="../man/menu_post.3x.html">menu_post.3x</A></TD></TR>
--<TR><TD>prefresh()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_90">Refresh</A></TD><TD><A HREF="../man/curs_pad.3x.html">curs_pad.3x</A></TD></TR>
--<TR><TD>qiflush()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_48">Set_Queue_Interrupt_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
--<TR><TD>raw()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_42">Set_Raw_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
--<TR><TD>redrawwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_63">Redraw</A></TD><TD><A HREF="../man/curs_refresh.3x.html">curs_refresh.3x</A></TD></TR>
-+<TR><TD>prefresh()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_91">Refresh</A></TD><TD><A HREF="../man/curs_pad.3x.html">curs_pad.3x</A></TD></TR>
-+<TR><TD>qiflush()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_49">Set_Queue_Interrupt_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-+<TR><TD>raw()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_43">Set_Raw_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-+<TR><TD>redrawwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_64">Redraw</A></TD><TD><A HREF="../man/curs_refresh.3x.html">curs_refresh.3x</A></TD></TR>
- <TR><TD>replace_panel()</TD><TD><A HREF="terminal_interface-curses-panels__ads.htm#AFU_10">Replace</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
--<TR><TD>reset_prog_mode()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_148">Reset_Curses_Mode</A></TD><TD><A HREF="../man/curs_kernel.3x.html">curs_kernel.3x</A></TD></TR>
--<TR><TD>resetty();</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_150">Reset_Terminal_State</A></TD><TD><A HREF="../man/curs_kernel.3x.html">curs_kernel.3x</A></TD></TR>
--<TR><TD>ripoffline()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_151">Rip_Off_Lines</A></TD><TD><A HREF="../man/curs_kernel.3x.html">curs_kernel.3x</A></TD></TR>
--<TR><TD>savetty()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_149">Save_Terminal_State</A></TD><TD><A HREF="../man/curs_kernel.3x.html">curs_kernel.3x</A></TD></TR>
-+<TR><TD>reset_prog_mode()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_149">Reset_Curses_Mode</A></TD><TD><A HREF="../man/curs_kernel.3x.html">curs_kernel.3x</A></TD></TR>
-+<TR><TD>resetty();</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_151">Reset_Terminal_State</A></TD><TD><A HREF="../man/curs_kernel.3x.html">curs_kernel.3x</A></TD></TR>
-+<TR><TD>ripoffline()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_152">Rip_Off_Lines</A></TD><TD><A HREF="../man/curs_kernel.3x.html">curs_kernel.3x</A></TD></TR>
-+<TR><TD>savetty()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_150">Save_Terminal_State</A></TD><TD><A HREF="../man/curs_kernel.3x.html">curs_kernel.3x</A></TD></TR>
- <TR><TD>scale_form()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_31">Scale</A></TD><TD><A HREF="../man/form_win.3x.html">form_win.3x</A></TD></TR>
- <TR><TD>scale_menu()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_27">Scale</A></TD><TD><A HREF="../man/menu_win.3x.html">menu_win.3x</A></TD></TR>
--<TR><TD>scr_dump()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_158">Screen_Dump_To_File</A></TD><TD><A HREF="../man/curs_scr_dump.3x.html">curs_scr_dump.3x</A></TD></TR>
--<TR><TD>scr_init()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_160">Screen_Init_From_File</A></TD><TD><A HREF="../man/curs_scr_dump.3x.html">curs_scr_dump.3x</A></TD></TR>
--<TR><TD>scr_restore()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_159">Screen_Restore_From_File</A></TD><TD><A HREF="../man/curs_scr_dump.3x.html">curs_scr_dump.3x</A></TD></TR>
--<TR><TD>scr_set()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_161">Screen_Set_File</A></TD><TD><A HREF="../man/curs_scr_dump.3x.html">curs_scr_dump.3x</A></TD></TR>
--<TR><TD>scrollok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_58">Allow_Scrolling</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
-+<TR><TD>scr_dump()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_160">Screen_Dump_To_File</A></TD><TD><A HREF="../man/curs_scr_dump.3x.html">curs_scr_dump.3x</A></TD></TR>
-+<TR><TD>scr_init()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_162">Screen_Init_From_File</A></TD><TD><A HREF="../man/curs_scr_dump.3x.html">curs_scr_dump.3x</A></TD></TR>
-+<TR><TD>scr_restore()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_161">Screen_Restore_From_File</A></TD><TD><A HREF="../man/curs_scr_dump.3x.html">curs_scr_dump.3x</A></TD></TR>
-+<TR><TD>scr_set()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_163">Screen_Set_File</A></TD><TD><A HREF="../man/curs_scr_dump.3x.html">curs_scr_dump.3x</A></TD></TR>
-+<TR><TD>scrollok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_59">Allow_Scrolling</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
- <TR><TD>set_current_field()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_57">Set_Current</A></TD><TD><A HREF="../man/form_page.3x.html">form_page.3x</A></TD></TR>
- <TR><TD>set_current_item()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_13">Set_Current</A></TD><TD><A HREF="../man/mitem_current.3x.html">mitem_current.3x</A></TD></TR>
- <TR><TD>set_field_back()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_20">Set_Background</A></TD><TD><A HREF="../man/form_field_attributes.3x.html">form_field_attributes.3x</A></TD></TR>
-@@ -238,15 +240,15 @@
- <TR><TD>set_item_term()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_49">Set_Item_Term_Hook</A></TD><TD><A HREF="../man/menu_hook.3x.html">menu_hook.3x</A></TD></TR>
- <TR><TD>set_item_userptr</TD><TD><A HREF="terminal_interface-curses-menus-item_user_data__ads.htm#AFU_1">Set_User_Data</A></TD><TD><A HREF="../man/mitem_userptr.3x.html">mitem_userptr.3x</A></TD></TR>
- <TR><TD>set_item_value()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_4">Set_Value</A></TD><TD><A HREF="../man/mitem_value.3x.html">mitem_value.3x</A></TD></TR>
--<TR><TD>set_menu_back()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_34">Set_Background</A></TD><TD><A HREF="../man/menu_attribs.3x.html">menu_attribs.3x</A></TD></TR>
--<TR><TD>set_menu_fore()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_31">Set_Foreground</A></TD><TD><A HREF="../man/menu_attribs.3x.html">menu_attribs.3x</A></TD></TR>
-+<TR><TD>set_menu_back()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_34">Set_Background</A></TD><TD><A HREF="../man/menu_attributes.3x.html">menu_attributes.3x</A></TD></TR>
-+<TR><TD>set_menu_fore()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_31">Set_Foreground</A></TD><TD><A HREF="../man/menu_attributes.3x.html">menu_attributes.3x</A></TD></TR>
- <TR><TD>set_menu_format()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_46">Set_Format</A></TD><TD><A HREF="../man/menu_format.3x.html">menu_format.3x</A></TD></TR>
--<TR><TD>set_menu_grey()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_37">Set_Grey</A></TD><TD><A HREF="../man/menu_attribs.3x.html">menu_attribs.3x</A></TD></TR>
-+<TR><TD>set_menu_grey()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_37">Set_Grey</A></TD><TD><A HREF="../man/menu_attributes.3x.html">menu_attributes.3x</A></TD></TR>
- <TR><TD>set_menu_init()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_50">Set_Menu_Init_Hook</A></TD><TD><A HREF="../man/menu_hook.3x.html">menu_hook.3x</A></TD></TR>
- <TR><TD>set_menu_items()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_56">Redefine</A></TD><TD><A HREF="../man/menu_items.3x.html">menu_items.3x</A></TD></TR>
- <TR><TD>set_menu_mark()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_29">Set_Mark</A></TD><TD><A HREF="../man/menu_mark.3x.html">menu_mark.3x</A></TD></TR>
- <TR><TD>set_menu_opts()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_19">Set_Options</A></TD><TD><A HREF="../man/menu_opts.3x.html">menu_opts.3x</A></TD></TR>
--<TR><TD>set_menu_pad()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_40">Set_Pad_Character</A></TD><TD><A HREF="../man/menu_attribs.3x.html">menu_attribs.3x</A></TD></TR>
-+<TR><TD>set_menu_pad()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_40">Set_Pad_Character</A></TD><TD><A HREF="../man/menu_attributes.3x.html">menu_attributes.3x</A></TD></TR>
- <TR><TD>set_menu_pattern()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_44">Set_Pattern</A></TD><TD><A HREF="../man/menu_pattern.3x.html">menu_pattern.3x</A></TD></TR>
- <TR><TD>set_menu_spacing()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_42">Set_Spacing</A></TD><TD><A HREF="../man/menu_spacing.3x.html">menu_spacing.3x</A></TD></TR>
- <TR><TD>set_menu_sub()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_25">Set_Sub_Window</A></TD><TD><A HREF="../man/menu_win.3x.html">menu_win.3x</A></TD></TR>
-@@ -257,83 +259,83 @@
- <TR><TD>set_panel_userptr</TD><TD><A HREF="terminal_interface-curses-panels-user_data__ads.htm#AFU_1">Set_User_Data</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
- <TR><TD>set_top_row()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_15">Set_Top_Row</A></TD><TD><A HREF="../man/mitem_current.3x.html">mitem_current.3x</A></TD></TR>
- <TR><TD>show_panel()</TD><TD><A HREF="terminal_interface-curses-panels__ads.htm#AFU_5">Show</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
--<TR><TD>slk_attr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_119">Get_Soft_Label_Key_Attributes</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
- <TR><TD>slk_attr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_120">Get_Soft_Label_Key_Attributes</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
--<TR><TD>slk_attron()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_117">Switch_Soft_Label_Key_Attributes</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
--<TR><TD>slk_attrset()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_118">Set_Soft_Label_Key_Attributes</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
--<TR><TD>slk_clear()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_114">Clear_Soft_Label_Keys</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
--<TR><TD>slk_color()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_121">Set_Soft_Label_Key_Color</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
--<TR><TD>slk_init()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_108">Init_Soft_Label_Keys</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
--<TR><TD>slk_label()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_112">Get_Soft_Label_Key</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-+<TR><TD>slk_attr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_121">Get_Soft_Label_Key_Attributes</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-+<TR><TD>slk_attron()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_118">Switch_Soft_Label_Key_Attributes</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-+<TR><TD>slk_attrset()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_119">Set_Soft_Label_Key_Attributes</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-+<TR><TD>slk_clear()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_115">Clear_Soft_Label_Keys</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-+<TR><TD>slk_color()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_122">Set_Soft_Label_Key_Color</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-+<TR><TD>slk_init()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_109">Init_Soft_Label_Keys</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
- <TR><TD>slk_label()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_113">Get_Soft_Label_Key</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
--<TR><TD>slk_noutrefresh()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_111">Refresh_Soft_Label_Keys_Without_Update</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
--<TR><TD>slk_refresh()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_110">Refresh_Soft_Label_Key</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
--<TR><TD>slk_restore()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_115">Restore_Soft_Label_Keys</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
--<TR><TD>slk_set()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_109">Set_Soft_Label_Key</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
--<TR><TD>slk_touch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_116">Touch_Soft_Label_Keys</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
--<TR><TD>standout()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_31">Standout</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
--<TR><TD>start_color()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_140">Start_Color</A></TD><TD><A HREF="../man/curs_color.3x.html">curs_color.3x</A></TD></TR>
-+<TR><TD>slk_label()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_114">Get_Soft_Label_Key</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-+<TR><TD>slk_noutrefresh()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_112">Refresh_Soft_Label_Keys_Without_Update</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-+<TR><TD>slk_refresh()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_111">Refresh_Soft_Label_Key</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-+<TR><TD>slk_restore()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_116">Restore_Soft_Label_Keys</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-+<TR><TD>slk_set()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_110">Set_Soft_Label_Key</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-+<TR><TD>slk_touch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_117">Touch_Soft_Label_Keys</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-+<TR><TD>standout()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_32">Standout</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
-+<TR><TD>start_color()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_141">Start_Color</A></TD><TD><A HREF="../man/curs_color.3x.html">curs_color.3x</A></TD></TR>
- <TR><TD>stdscr</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_1">Standard_Window</A></TD><TD><A HREF="../man/curs_initscr.3x.html">curs_initscr.3x</A></TD></TR>
--<TR><TD>subpad()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_89">Sub_Pad</A></TD><TD><A HREF="../man/curs_pad.3x.html">curs_pad.3x</A></TD></TR>
--<TR><TD>subwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_12">Sub_Window</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
--<TR><TD>syncok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_19">Set_Synch_Mode</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
--<TR><TD>termattrs()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_135">Supported_Attributes</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
--<TR><TD>termname()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_138">Terminal_Name</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
-+<TR><TD>subpad()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_90">Sub_Pad</A></TD><TD><A HREF="../man/curs_pad.3x.html">curs_pad.3x</A></TD></TR>
-+<TR><TD>subwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_13">Sub_Window</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
-+<TR><TD>syncok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_20">Set_Synch_Mode</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
-+<TR><TD>termattrs()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_136">Supported_Attributes</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
- <TR><TD>termname()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_139">Terminal_Name</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
-+<TR><TD>termname()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_140">Terminal_Name</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
- <TR><TD>top_panel()</TD><TD><A HREF="terminal_interface-curses-panels__ads.htm#AFU_4">Top</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
- <TR><TD>top_row()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_16">Top_Row</A></TD><TD><A HREF="../man/mitem_current.3x.html">mitem_current.3x</A></TD></TR>
--<TR><TD>touchline()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_74">Touch</A></TD><TD><A HREF="../man/curs_touch.3x.html">curs_touch.3x</A></TD></TR>
--<TR><TD>touchwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_73">Touch</A></TD><TD><A HREF="../man/curs_touch.3x.html">curs_touch.3x</A></TD></TR>
-+<TR><TD>touchline()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_75">Touch</A></TD><TD><A HREF="../man/curs_touch.3x.html">curs_touch.3x</A></TD></TR>
-+<TR><TD>touchwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_74">Touch</A></TD><TD><A HREF="../man/curs_touch.3x.html">curs_touch.3x</A></TD></TR>
- <TR><TD>trace()</TD><TD><A HREF="terminal_interface-curses-trace__ads.htm#AFU_1">Trace_on</A></TD><TD><A HREF="../man/curs_trace.3x.html">curs_trace.3x</A></TD></TR>
--<TR><TD>unctrl()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_126">Un_Control</A></TD><TD><A HREF="../man/curs_util.3x.html">curs_util.3x</A></TD></TR>
- <TR><TD>unctrl()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_127">Un_Control</A></TD><TD><A HREF="../man/curs_util.3x.html">curs_util.3x</A></TD></TR>
--<TR><TD>ungetch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_29">Undo_Keystroke</A></TD><TD><A HREF="../man/curs_getch.3x.html">curs_getch.3x</A></TD></TR>
-+<TR><TD>unctrl()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_128">Un_Control</A></TD><TD><A HREF="../man/curs_util.3x.html">curs_util.3x</A></TD></TR>
-+<TR><TD>ungetch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_30">Undo_Keystroke</A></TD><TD><A HREF="../man/curs_getch.3x.html">curs_getch.3x</A></TD></TR>
- <TR><TD>ungetmouse()</TD><TD><A HREF="terminal_interface-curses-mouse__ads.htm#AFU_3">Unget_Mouse</A></TD><TD><A HREF="../man/curs_mouse.3x.html">curs_mouse.3x</A></TD></TR>
--<TR><TD>untouchwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_72">Untouch</A></TD><TD><A HREF="../man/curs_touch.3x.html">curs_touch.3x</A></TD></TR>
-+<TR><TD>untouchwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_73">Untouch</A></TD><TD><A HREF="../man/curs_touch.3x.html">curs_touch.3x</A></TD></TR>
- <TR><TD>update_panels()</TD><TD><A HREF="terminal_interface-curses-panels__ads.htm#AFU_6">Update_Panels</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
--<TR><TD>use_default_colors()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_154">Use_Default_Colors</A></TD><TD><A HREF="../man/dft_fgbg.3x.html">dft_fgbg.3x</A></TD></TR>
--<TR><TD>use_extended_names()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_157">Use_Extended_Names</A></TD><TD><A HREF="../man/curs_extend.3x.html">curs_extend.3x</A></TD></TR>
--<TR><TD>waddch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_7">Add</A></TD><TD><A HREF="../man/curs_addch.3x.html">curs_addch.3x</A></TD></TR>
--<TR><TD>waddchnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_22">Add</A></TD><TD><A HREF="../man/curs_addchstr.3x.html">curs_addchstr.3x</A></TD></TR>
--<TR><TD>waddnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_20">Add</A></TD><TD><A HREF="../man/curs_addstr.3x.html">curs_addstr.3x</A></TD></TR>
--<TR><TD>wattr_get()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_34">Get_Character_Attributes</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
--<TR><TD>wattr_get()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_35">Get_Character_Attribute</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
--<TR><TD>wattron()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_32">Switch_Character_Attribute</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
--<TR><TD>wattrset()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_33">Set_Character_Attributes</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
--<TR><TD>wbkgd()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_70">Change_Background</A></TD><TD><A HREF="../man/curs_bkgd.3x.html">curs_bkgd.3x</A></TD></TR>
--<TR><TD>wbkgdget()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_71">Get_Background</A></TD><TD><A HREF="../man/curs_bkgd.3x.html">curs_bkgd.3x</A></TD></TR>
--<TR><TD>wbkgdset()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_69">Set_Background</A></TD><TD><A HREF="../man/curs_bkgd.3x.html">curs_bkgd.3x</A></TD></TR>
--<TR><TD>wborder()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_24">Border</A></TD><TD><A HREF="../man/curs_border.3x.html">curs_border.3x</A></TD></TR>
--<TR><TD>wchgat()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_37">Change_Attributes</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
--<TR><TD>wclear()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_66">Clear</A></TD><TD><A HREF="../man/curs_clear.3x.html">curs_clear.3x</A></TD></TR>
--<TR><TD>wclrtobot()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_67">Clear_To_End_Of_Screen</A></TD><TD><A HREF="../man/curs_clear.3x.html">curs_clear.3x</A></TD></TR>
--<TR><TD>wclrtoeol()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_68">Clear_To_End_Of_Line</A></TD><TD><A HREF="../man/curs_clear.3x.html">curs_clear.3x</A></TD></TR>
--<TR><TD>wcolor_set()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_36">Set_Color</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
--<TR><TD>wdelch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_94">Delete_Character</A></TD><TD><A HREF="../man/curs_delch.3x.html">curs_delch.3x</A></TD></TR>
--<TR><TD>wdeleteln()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_82">Delete_Line</A></TD><TD><A HREF="../man/curs_deleteln.3x.html">curs_deleteln.3x</A></TD></TR>
--<TR><TD>wechochar()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_9">Add_With_Immediate_Echo</A></TD><TD><A HREF="../man/curs_addch.3x.html">curs_addch.3x</A></TD></TR>
-+<TR><TD>use_default_colors()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_155">Use_Default_Colors</A></TD><TD><A HREF="../man/default_colors.3x.html">default_colors.3x</A></TD></TR>
-+<TR><TD>use_extended_names()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_158">Use_Extended_Names</A></TD><TD><A HREF="../man/curs_extend.3x.html">curs_extend.3x</A></TD></TR>
-+<TR><TD>waddch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_8">Add</A></TD><TD><A HREF="../man/curs_addch.3x.html">curs_addch.3x</A></TD></TR>
-+<TR><TD>waddchnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_23">Add</A></TD><TD><A HREF="../man/curs_addchstr.3x.html">curs_addchstr.3x</A></TD></TR>
-+<TR><TD>waddnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_21">Add</A></TD><TD><A HREF="../man/curs_addstr.3x.html">curs_addstr.3x</A></TD></TR>
-+<TR><TD>wattr_get()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_35">Get_Character_Attributes</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
-+<TR><TD>wattr_get()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_36">Get_Character_Attribute</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
-+<TR><TD>wattron()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_33">Switch_Character_Attribute</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
-+<TR><TD>wattrset()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_34">Set_Character_Attributes</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
-+<TR><TD>wbkgd()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_71">Change_Background</A></TD><TD><A HREF="../man/curs_bkgd.3x.html">curs_bkgd.3x</A></TD></TR>
-+<TR><TD>wbkgdget()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_72">Get_Background</A></TD><TD><A HREF="../man/curs_bkgd.3x.html">curs_bkgd.3x</A></TD></TR>
-+<TR><TD>wbkgdset()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_70">Set_Background</A></TD><TD><A HREF="../man/curs_bkgd.3x.html">curs_bkgd.3x</A></TD></TR>
-+<TR><TD>wborder()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_25">Border</A></TD><TD><A HREF="../man/curs_border.3x.html">curs_border.3x</A></TD></TR>
-+<TR><TD>wchgat()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_38">Change_Attributes</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
-+<TR><TD>wclear()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_67">Clear</A></TD><TD><A HREF="../man/curs_clear.3x.html">curs_clear.3x</A></TD></TR>
-+<TR><TD>wclrtobot()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_68">Clear_To_End_Of_Screen</A></TD><TD><A HREF="../man/curs_clear.3x.html">curs_clear.3x</A></TD></TR>
-+<TR><TD>wclrtoeol()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_69">Clear_To_End_Of_Line</A></TD><TD><A HREF="../man/curs_clear.3x.html">curs_clear.3x</A></TD></TR>
-+<TR><TD>wcolor_set()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_37">Set_Color</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
-+<TR><TD>wdelch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_95">Delete_Character</A></TD><TD><A HREF="../man/curs_delch.3x.html">curs_delch.3x</A></TD></TR>
-+<TR><TD>wdeleteln()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_83">Delete_Line</A></TD><TD><A HREF="../man/curs_deleteln.3x.html">curs_deleteln.3x</A></TD></TR>
-+<TR><TD>wechochar()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_10">Add_With_Immediate_Echo</A></TD><TD><A HREF="../man/curs_addch.3x.html">curs_addch.3x</A></TD></TR>
- <TR><TD>wenclose()</TD><TD><A HREF="terminal_interface-curses-mouse__ads.htm#AFU_4">Enclosed_In_Window</A></TD><TD><A HREF="../man/curs_mouse.3x.html">curs_mouse.3x</A></TD></TR>
--<TR><TD>werase()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_65">Erase</A></TD><TD><A HREF="../man/curs_clear.3x.html">curs_clear.3x</A></TD></TR>
--<TR><TD>wgetch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_28">Get_Keystroke</A></TD><TD><A HREF="../man/curs_getch.3x.html">curs_getch.3x</A></TD></TR>
--<TR><TD>wgetnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_106">Get</A></TD><TD><A HREF="../man/curs_getstr.3x.html">curs_getstr.3x</A></TD></TR>
--<TR><TD>whline()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_26">Horizontal_Line</A></TD><TD><A HREF="../man/curs_border.3x.html">curs_border.3x</A></TD></TR>
--<TR><TD>winch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_96">Peek</A></TD><TD><A HREF="../man/curs_inch.3x.html">curs_inch.3x</A></TD></TR>
--<TR><TD>winchnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_104">Peek</A></TD><TD><A HREF="../man/curs_inchstr.3x.html">curs_inchstr.3x</A></TD></TR>
--<TR><TD>winnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_102">Peek</A></TD><TD><A HREF="../man/curs_instr.3x.html">curs_instr.3x</A></TD></TR>
--<TR><TD>winsch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_98">Insert</A></TD><TD><A HREF="../man/curs_insch.3x.html">curs_insch.3x</A></TD></TR>
--<TR><TD>winsdelln()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_81">Insert_Delete_Lines</A></TD><TD><A HREF="../man/curs_deleteln.3x.html">curs_deleteln.3x</A></TD></TR>
--<TR><TD>winsertln()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_83">Insert_Line</A></TD><TD><A HREF="../man/curs_deleteln.3x.html">curs_deleteln.3x</A></TD></TR>
--<TR><TD>winsnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_100">Insert</A></TD><TD><A HREF="../man/curs_insstr.3x.html">curs_insstr.3x</A></TD></TR>
--<TR><TD>wmove()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_6">Move_Cursor</A></TD><TD><A HREF="../man/curs_move.3x.html">curs_move.3x</A></TD></TR>
--<TR><TD>wnoutrefresh()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_62">Refresh_Without_Update</A></TD><TD><A HREF="../man/curs_refresh.3x.html">curs_refresh.3x</A></TD></TR>
--<TR><TD>wredrawln()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_64">Redraw</A></TD><TD><A HREF="../man/curs_refresh.3x.html">curs_refresh.3x</A></TD></TR>
--<TR><TD>wrefresh()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_61">Refresh</A></TD><TD><A HREF="../man/curs_refresh.3x.html">curs_refresh.3x</A></TD></TR>
--<TR><TD>wresize()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_162">Resize</A></TD><TD><A HREF="../man/wresize.3x.html">wresize.3x</A></TD></TR>
--<TR><TD>wscrl()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_93">Scroll</A></TD><TD><A HREF="../man/curs_scroll.3x.html">curs_scroll.3x</A></TD></TR>
--<TR><TD>wsetscrreg()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_59">Set_Scroll_Region</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
--<TR><TD>wsyncdown()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_18">Synchronize_Downwards</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
--<TR><TD>wsyncup()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_17">Synchronize_Upwards</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
--<TR><TD>wtimeout()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_50">Set_Timeout_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
--<TR><TD>wtouchln()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_75">Change_Line_Status</A></TD><TD><A HREF="../man/curs_touch.3x.html">curs_touch.3x</A></TD></TR>
--<TR><TD>wvline()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_27">Vertical_Line</A></TD><TD><A HREF="../man/curs_border.3x.html">curs_border.3x</A></TD></TR>
-+<TR><TD>werase()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_66">Erase</A></TD><TD><A HREF="../man/curs_clear.3x.html">curs_clear.3x</A></TD></TR>
-+<TR><TD>wgetch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_29">Get_Keystroke</A></TD><TD><A HREF="../man/curs_getch.3x.html">curs_getch.3x</A></TD></TR>
-+<TR><TD>wgetnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_107">Get</A></TD><TD><A HREF="../man/curs_getstr.3x.html">curs_getstr.3x</A></TD></TR>
-+<TR><TD>whline()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_27">Horizontal_Line</A></TD><TD><A HREF="../man/curs_border.3x.html">curs_border.3x</A></TD></TR>
-+<TR><TD>winch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_97">Peek</A></TD><TD><A HREF="../man/curs_inch.3x.html">curs_inch.3x</A></TD></TR>
-+<TR><TD>winchnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_105">Peek</A></TD><TD><A HREF="../man/curs_inchstr.3x.html">curs_inchstr.3x</A></TD></TR>
-+<TR><TD>winnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_103">Peek</A></TD><TD><A HREF="../man/curs_instr.3x.html">curs_instr.3x</A></TD></TR>
-+<TR><TD>winsch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_99">Insert</A></TD><TD><A HREF="../man/curs_insch.3x.html">curs_insch.3x</A></TD></TR>
-+<TR><TD>winsdelln()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_82">Insert_Delete_Lines</A></TD><TD><A HREF="../man/curs_deleteln.3x.html">curs_deleteln.3x</A></TD></TR>
-+<TR><TD>winsertln()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_84">Insert_Line</A></TD><TD><A HREF="../man/curs_deleteln.3x.html">curs_deleteln.3x</A></TD></TR>
-+<TR><TD>winsnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_101">Insert</A></TD><TD><A HREF="../man/curs_insstr.3x.html">curs_insstr.3x</A></TD></TR>
-+<TR><TD>wmove()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_7">Move_Cursor</A></TD><TD><A HREF="../man/curs_move.3x.html">curs_move.3x</A></TD></TR>
-+<TR><TD>wnoutrefresh()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_63">Refresh_Without_Update</A></TD><TD><A HREF="../man/curs_refresh.3x.html">curs_refresh.3x</A></TD></TR>
-+<TR><TD>wredrawln()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_65">Redraw</A></TD><TD><A HREF="../man/curs_refresh.3x.html">curs_refresh.3x</A></TD></TR>
-+<TR><TD>wrefresh()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_62">Refresh</A></TD><TD><A HREF="../man/curs_refresh.3x.html">curs_refresh.3x</A></TD></TR>
-+<TR><TD>wresize()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_164">Resize</A></TD><TD><A HREF="../man/wresize.3x.html">wresize.3x</A></TD></TR>
-+<TR><TD>wscrl()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_94">Scroll</A></TD><TD><A HREF="../man/curs_scroll.3x.html">curs_scroll.3x</A></TD></TR>
-+<TR><TD>wsetscrreg()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_60">Set_Scroll_Region</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
-+<TR><TD>wsyncdown()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_19">Synchronize_Downwards</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
-+<TR><TD>wsyncup()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_18">Synchronize_Upwards</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
-+<TR><TD>wtimeout()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_51">Set_Timeout_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-+<TR><TD>wtouchln()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_76">Change_Line_Status</A></TD><TD><A HREF="../man/curs_touch.3x.html">curs_touch.3x</A></TD></TR>
-+<TR><TD>wvline()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_28">Vertical_Line</A></TD><TD><A HREF="../man/curs_border.3x.html">curs_border.3x</A></TD></TR>
- </TABLE></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-aux__ads.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-aux__ads.htm
---- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-aux__ads.htm	2006-09-23 16:31:30.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/terminal_interface-curses-aux__ads.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -3,7 +3,6 @@
- <BODY>
- <HR><DIV ALIGN="center"><H1> File : terminal_interface-curses-aux.ads </H1></DIV><HR>
- <PRE>
--
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
- <FONT COLOR=green><EM>--                           <A HREF="http://www.gnat.com">GNAT</A> ncurses Binding                           --</EM></FONT>
-@@ -48,84 +47,84 @@
- <FONT COLOR=green><EM>--  This module is generated. Please don't change it manually!</EM></FONT>
- <FONT COLOR=green><EM>--  Run the generator instead.</EM></FONT>
- <FONT COLOR=green><EM>--  |</EM></FONT>
--<b>with</b> <A HREF="interfac__ads.htm#ref_38_9">System</A>;
-+<b>with</b> System;
- <b>with</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C;
--<b>with</b> <A HREF="unchconv__ads.htm#ref_20_10">Interfaces</A>.C.Strings; <b>use</b> Interfaces.C.Strings;
--<b>with</b> Unchecked_Conversion;
-+<b>with</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.Strings; <b>use</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.Strings;
-+<b>with</b> <A HREF="unchconv__ads.htm#ref_20_10">Unchecked_Conversion</A>;
- 
--<b>package</b> Terminal_Interface.Curses.Aux <b>is</b>
--   <b>pragma</b> Preelaborate (Terminal_Interface.Curses.Aux);
-+<b>package</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<FONT COLOR=red><A NAME="ref_50_35" HREF="terminal_interface-curses-aux__adb.htm#ref_41_40">Aux</A></FONT> <b>is</b>
-+   <b>pragma</b> Preelaborate (<A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-aux__ads.htm#ref_50_35">Aux</A>);
- 
--   <b>use</b> <b>type</b> Interfaces.C.int;
-+   <b>use</b> <b>type</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.int;
- 
--   <b>subtype</b> <FONT COLOR=red><A NAME="ref_56_12">C_Int</A></FONT>      <b>is</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.int;
--   <b>subtype</b> <FONT COLOR=red><A NAME="ref_57_12">C_Short</A></FONT>    <b>is</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.short;
--   <b>subtype</b> <FONT COLOR=red><A NAME="ref_58_12">C_Long_Int</A></FONT> <b>is</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.long;
--   <b>subtype</b> <FONT COLOR=red><A NAME="ref_59_12">C_Size_T</A></FONT>   <b>is</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.size_t;
--   <b>subtype</b> <FONT COLOR=red><A NAME="ref_60_12">C_UInt</A></FONT>     <b>is</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.unsigned;
--   <b>subtype</b> <FONT COLOR=red><A NAME="ref_61_12">C_ULong</A></FONT>    <b>is</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.unsigned_long;
--   <b>subtype</b> <FONT COLOR=red><A NAME="ref_62_12">C_Char_Ptr</A></FONT> <b>is</b> Interfaces.C.Strings.chars_ptr;
--   <b>type</b>    <FONT COLOR=red><A NAME="ref_63_12">C_Void_Ptr</A></FONT> <b>is</b> <b>new</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_60_12">System</A>.Address;
--   <b>type</b>    <FONT COLOR=red><A NAME="ref_64_12">C_Chtype</A></FONT>   <b>is</b> <b>new</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_60_12">C_ULong</A>;
--   <b>type</b>    C_AttrType <b>is</b> <b>new</b> C_ULong;
-+   <b>subtype</b> <FONT COLOR=red><A NAME="ref_55_12">C_Int</A></FONT>      <b>is</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.int;
-+   <b>subtype</b> <FONT COLOR=red><A NAME="ref_56_12">C_Short</A></FONT>    <b>is</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.short;
-+   <b>subtype</b> <FONT COLOR=red><A NAME="ref_57_12">C_Long_Int</A></FONT> <b>is</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.long;
-+   <b>subtype</b> <FONT COLOR=red><A NAME="ref_58_12">C_Size_T</A></FONT>   <b>is</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.size_t;
-+   <b>subtype</b> <FONT COLOR=red><A NAME="ref_59_12">C_UInt</A></FONT>     <b>is</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.unsigned;
-+   <b>subtype</b> <FONT COLOR=red><A NAME="ref_60_12">C_ULong</A></FONT>    <b>is</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.unsigned_long;
-+   <b>subtype</b> <FONT COLOR=red><A NAME="ref_61_12">C_Char_Ptr</A></FONT> <b>is</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.Strings.chars_ptr;
-+   <b>type</b>    <FONT COLOR=red><A NAME="ref_62_12">C_Void_Ptr</A></FONT> <b>is</b> <b>new</b> System.Address;
-+   <b>type</b>    <FONT COLOR=red><A NAME="ref_63_12">C_Chtype</A></FONT>   <b>is</b> <b>new</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_60_12">C_ULong</A>;
-+   <b>type</b>    <FONT COLOR=red><A NAME="ref_64_12">C_AttrType</A></FONT> <b>is</b> <b>new</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_60_12">C_ULong</A>;
- 
-    <FONT COLOR=green><EM>--  This is how those constants are defined in ncurses. I see them also</EM></FONT>
-    <FONT COLOR=green><EM>--  exactly like this in all ETI implementations I ever tested. So it</EM></FONT>
-    <FONT COLOR=green><EM>--  could be that this is quite general, but please check with your curses.</EM></FONT>
-    <FONT COLOR=green><EM>--  This is critical, because curses sometime mixes boolean returns with</EM></FONT>
-    <FONT COLOR=green><EM>--  returning an error status.</EM></FONT>
--   <FONT COLOR=red><A NAME="ref_72_4">Curses_Ok</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := 0;
--   Curses_Err   : <b>constant</b> C_Int := -1;
-+   <FONT COLOR=red><A NAME="ref_71_4">Curses_Ok</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := 0;
-+   <FONT COLOR=red><A NAME="ref_72_4">Curses_Err</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := -1;
- 
--   <FONT COLOR=red><A NAME="ref_75_4">Curses_True</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := 1;
--   Curses_False : <b>constant</b> C_Int := 0;
-+   <FONT COLOR=red><A NAME="ref_74_4">Curses_True</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := 1;
-+   <FONT COLOR=red><A NAME="ref_75_4">Curses_False</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := 0;
- 
-    <FONT COLOR=green><EM>--  Eti_Error: type for error codes returned by the menu and form subsystem</EM></FONT>
--   <b>subtype</b> Eti_Error <b>is</b> C_Int <b>range</b> -14 .. 0;
-+   <b>subtype</b> <FONT COLOR=red><A NAME="ref_78_12">Eti_Error</A></FONT> <b>is</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> <b>range</b> -14 .. 0;
- 
--   <FONT COLOR=red><A NAME="ref_81_4">E_Ok</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := 0;
--   <FONT COLOR=red><A NAME="ref_82_4">E_System_Error</A></FONT>     : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -1;
--   <FONT COLOR=red><A NAME="ref_83_4">E_Bad_Argument</A></FONT>     : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -2;
--   <FONT COLOR=red><A NAME="ref_84_4">E_Posted</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -3;
--   <FONT COLOR=red><A NAME="ref_85_4">E_Connected</A></FONT>        : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -4;
--   <FONT COLOR=red><A NAME="ref_86_4">E_Bad_State</A></FONT>        : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -5;
--   <FONT COLOR=red><A NAME="ref_87_4">E_No_Room</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -6;
--   <FONT COLOR=red><A NAME="ref_88_4">E_Not_Posted</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -7;
--   <FONT COLOR=red><A NAME="ref_89_4">E_Unknown_Command</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -8;
--   <FONT COLOR=red><A NAME="ref_90_4">E_No_Match</A></FONT>         : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -9;
--   <FONT COLOR=red><A NAME="ref_91_4">E_Not_Selectable</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -10;
--   <FONT COLOR=red><A NAME="ref_92_4">E_Not_Connected</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -11;
--   <FONT COLOR=red><A NAME="ref_93_4">E_Request_Denied</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -12;
--   <FONT COLOR=red><A NAME="ref_94_4">E_Invalid_Field</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -13;
--   E_Current          : <b>constant</b> Eti_Error := -14;
-+   <FONT COLOR=red><A NAME="ref_80_4">E_Ok</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := 0;
-+   <FONT COLOR=red><A NAME="ref_81_4">E_System_Error</A></FONT>     : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -1;
-+   <FONT COLOR=red><A NAME="ref_82_4">E_Bad_Argument</A></FONT>     : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -2;
-+   <FONT COLOR=red><A NAME="ref_83_4">E_Posted</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -3;
-+   <FONT COLOR=red><A NAME="ref_84_4">E_Connected</A></FONT>        : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -4;
-+   <FONT COLOR=red><A NAME="ref_85_4">E_Bad_State</A></FONT>        : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -5;
-+   <FONT COLOR=red><A NAME="ref_86_4">E_No_Room</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -6;
-+   <FONT COLOR=red><A NAME="ref_87_4">E_Not_Posted</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -7;
-+   <FONT COLOR=red><A NAME="ref_88_4">E_Unknown_Command</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -8;
-+   <FONT COLOR=red><A NAME="ref_89_4">E_No_Match</A></FONT>         : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -9;
-+   <FONT COLOR=red><A NAME="ref_90_4">E_Not_Selectable</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -10;
-+   <FONT COLOR=red><A NAME="ref_91_4">E_Not_Connected</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -11;
-+   <FONT COLOR=red><A NAME="ref_92_4">E_Request_Denied</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -12;
-+   <FONT COLOR=red><A NAME="ref_93_4">E_Invalid_Field</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -13;
-+   <FONT COLOR=red><A NAME="ref_94_4">E_Current</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -14;
- 
--   <b>procedure</b> Eti_Exception (Code : Eti_Error);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_96_14" HREF="terminal_interface-curses-aux__adb.htm#ref_94_14">Eti_Exception</A></FONT> (<FONT COLOR=red><A NAME="ref_96_29" HREF="terminal_interface-curses-aux__adb.htm#ref_94_29">Code</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A>);
-    <FONT COLOR=green><EM>--  Dispatch the error code and raise the appropriate exception</EM></FONT>
-    <FONT COLOR=green><EM>--</EM></FONT>
-    <FONT COLOR=green><EM>--</EM></FONT>
-    <FONT COLOR=green><EM>--  Some helpers</EM></FONT>
-    <b>function</b> Chtype_To_AttrChar <b>is</b> <b>new</b>
--     Unchecked_Conversion (<A HREF="unchconv__ads.htm#ref_18_9">Source</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_352_9">C_Chtype</A>,
--                           Target =&gt; Attributed_Character);
-+     <A HREF="unchconv__ads.htm#ref_20_10">Unchecked_Conversion</A> (<A HREF="unchconv__ads.htm#ref_17_9">Source</A> =&gt; <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>,
-+                           <A HREF="unchconv__ads.htm#ref_18_9">Target</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>);
-    <b>function</b> AttrChar_To_Chtype <b>is</b> <b>new</b>
--     Unchecked_Conversion (<A HREF="unchconv__ads.htm#ref_18_9">Source</A> =&gt; <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">Attributed_Character</A>,
--                           Target =&gt; C_Chtype);
-+     <A HREF="unchconv__ads.htm#ref_20_10">Unchecked_Conversion</A> (<A HREF="unchconv__ads.htm#ref_17_9">Source</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>,
-+                           <A HREF="unchconv__ads.htm#ref_18_9">Target</A> =&gt; <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>);
- 
-    <b>function</b> AttrChar_To_AttrType <b>is</b> <b>new</b>
--     Unchecked_Conversion (<A HREF="unchconv__ads.htm#ref_18_9">Source</A> =&gt; <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">Attributed_Character</A>,
--                           Target =&gt; C_AttrType);
-+     <A HREF="unchconv__ads.htm#ref_20_10">Unchecked_Conversion</A> (<A HREF="unchconv__ads.htm#ref_17_9">Source</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>,
-+                           <A HREF="unchconv__ads.htm#ref_18_9">Target</A> =&gt; <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>);
- 
-    <b>function</b> AttrType_To_AttrChar <b>is</b> <b>new</b>
--     Unchecked_Conversion (<A HREF="unchconv__ads.htm#ref_18_9">Source</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_352_9">C_AttrType</A>,
--                           Target =&gt; Attributed_Character);
-+     <A HREF="unchconv__ads.htm#ref_20_10">Unchecked_Conversion</A> (<A HREF="unchconv__ads.htm#ref_17_9">Source</A> =&gt; <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>,
-+                           <A HREF="unchconv__ads.htm#ref_18_9">Target</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>);
- 
--   <b>procedure</b> Fill_String (<FONT COLOR=red><A NAME="ref_117_27" HREF="terminal_interface-curses-aux__adb.htm#ref_45_27">Cp</A></FONT>  : <b>in</b>  chars_ptr;
--                          Str : <b>out</b> String);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_116_14" HREF="terminal_interface-curses-aux__adb.htm#ref_44_14">Fill_String</A></FONT> (<FONT COLOR=red><A NAME="ref_116_27" HREF="terminal_interface-curses-aux__adb.htm#ref_44_27">Cp</A></FONT>  : <b>in</b>  chars_ptr;
-+                          <FONT COLOR=red><A NAME="ref_117_27" HREF="terminal_interface-curses-aux__adb.htm#ref_45_27">Str</A></FONT> : <b>out</b> String);
-    <FONT COLOR=green><EM>--  Fill the Str parameter with the string denoted by the chars_ptr</EM></FONT>
-    <FONT COLOR=green><EM>--  C-Style string.</EM></FONT>
- 
--   <b>function</b> Fill_String (Cp : chars_ptr) <b>return</b> String;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_121_13" HREF="terminal_interface-curses-aux__adb.htm#ref_73_13">Fill_String</A></FONT> (<FONT COLOR=red><A NAME="ref_121_26" HREF="terminal_interface-curses-aux__adb.htm#ref_73_26">Cp</A></FONT> : chars_ptr) <b>return</b> String;
-    <FONT COLOR=green><EM>--  Same but as function.</EM></FONT>
- 
--<b>end</b> Terminal_Interface.Curses.Aux;
-+<b>end</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-aux__ads.htm#ref_50_35">Aux</A>;
- </PRE></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-forms-field_types__ads.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-forms-field_types__ads.htm
---- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-forms-field_types__ads.htm	2006-09-23 16:31:31.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/terminal_interface-curses-forms-field_types__ads.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -3,7 +3,6 @@
- <BODY>
- <HR><DIV ALIGN="center"><H1> File : terminal_interface-curses-forms-field_types.ads </H1></DIV><HR>
- <PRE>
--
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
- <FONT COLOR=green><EM>--                           <A HREF="http://www.gnat.com">GNAT</A> ncurses Binding                           --</EM></FONT>
-@@ -44,18 +43,18 @@
- <FONT COLOR=green><EM>--  @Revision: 1.14 @</EM></FONT>
- <FONT COLOR=green><EM>--  Binding Version 01.00</EM></FONT>
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--<b>with</b> Interfaces.C;
-+<b>with</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C;
- 
--<b>package</b> Terminal_Interface.Curses.Forms.Field_Types <b>is</b>
--   <b>pragma</b> Preelaborate (Terminal_Interface.Curses.Forms.Field_Types);
--   <b>use</b> <b>type</b><FONT COLOR=red><A NAME="ref_46_12"> </A></FONT>Interfaces.C.int;
--   <b>subtype</b> C_Int <b>is</b> Interfaces.C.int;
-+<b>package</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-forms__ads.htm#ref_49_35">Forms</A>.<FONT COLOR=red><A NAME="ref_43_41" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_51_46">Field_Types</A></FONT> <b>is</b>
-+   <b>pragma</b> Preelaborate (<A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-forms__ads.htm#ref_49_35">Forms</A>.<A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_43_41">Field_Types</A>);
-+   <b>use</b> <b>type</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.int;
-+   <b>subtype</b> <FONT COLOR=red><A NAME="ref_46_12">C_Int</A></FONT> <b>is</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.int;
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_fieldtype.3x.html">form_fieldtype.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <b>type</b> Field_Type <b>is</b> <b>abstract</b> <b>tagged</b> <b>null</b> <b>record</b>;
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_52_9">Field_Type</A></FONT> <b>is</b> <b>abstract</b> <b>tagged</b> <b>null</b> <b>record</b>;
-    <FONT COLOR=green><EM>--  Abstract base type for all field types. A concrete field type</EM></FONT>
-    <FONT COLOR=green><EM>--  is an extension that adds some data elements describing formats or</EM></FONT>
-    <FONT COLOR=green><EM>--  boundary values for the type and validation routines.</EM></FONT>
-@@ -66,11 +65,11 @@
-    <FONT COLOR=green><EM>--  how to create you own child packages for low-level field types that</EM></FONT>
-    <FONT COLOR=green><EM>--  you may have already written in C.</EM></FONT>
- 
--   <b>type</b> Field_Type_Access <b>is</b> <b>access</b> <b>all</b> Field_Type'Class;
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_63_9">Field_Type_Access</A></FONT> <b>is</b> <b>access</b> <b>all</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_52_9">Field_Type</A>'Class;
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_1"#2|</EM></FONT>
--   <b>procedure</b> Set_Field_Type (<FONT COLOR=red><A NAME="ref_67_30" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_66_14">Fld</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_52_9">Field</A>;
--                             Fld_Type : <b>in</b> Field_Type) <b>is</b> <b>abstract</b>;
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_66_14">Set_Field_Type</A></FONT> (<FONT COLOR=red><A NAME="ref_66_30" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_66_14">Fld</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+                             <FONT COLOR=red><A NAME="ref_67_30" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_66_14">Fld_Type</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_52_9">Field_Type</A>) <b>is</b> <b>abstract</b>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_fieldtype.3x.html">set_field_type()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  But: we hide the vararg mechanism of the C interface. You always</EM></FONT>
-    <FONT COLOR=green><EM>--       have to pass a single Field_Type parameter.</EM></FONT>
-@@ -82,7 +81,7 @@
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_2"#2|</EM></FONT>
--   <b>function</b> Get_Type (Fld : <b>in</b> Field) <b>return</b> Field_Type_Access;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_79_13" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_73_13">Get_Type</A></FONT> (<FONT COLOR=red><A NAME="ref_79_23" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_73_23">Fld</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>) <b>return</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_63_9">Field_Type_Access</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_validation.3x.html">field_type()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: field_arg()</EM></FONT>
-    <FONT COLOR=green><EM>--  In Ada95 we can combine these. If you try to retrieve the field type</EM></FONT>
-@@ -95,68 +94,68 @@
-    <FONT COLOR=green><EM>--  | Most of this is used by the implementations of the child packages.</EM></FONT>
-    <FONT COLOR=green><EM>--  |</EM></FONT>
- <b>private</b>
--   <b>type</b> Makearg_Function <b>is</b> <b>access</b>
--     <b>function</b> (Args : System.Address) <b>return</b> System.Address;
--   <b>pragma</b> Convention (C, Makearg_Function);
--
--   <b>type</b> Copyarg_Function <b>is</b> <b>access</b>
--     <b>function</b> (Usr : System.Address) <b>return</b> System.Address;
--   <b>pragma</b> Convention (C, Copyarg_Function);
--
--   <b>type</b> Freearg_Function <b>is</b> <b>access</b>
--     <b>procedure</b> (Usr : System.Address);
--   <b>pragma</b> Convention (C, Freearg_Function);
--
--   <b>type</b> Field_Check_Function<FONT COLOR=red><A NAME="ref_105_29"> </A></FONT><b>is</b> <b>access</b>
--     <b>function</b> (Fld : Field; Usr : System.Address) <b>return</b> C_Int;
--   <b>pragma</b> Convention (C, Field_Check_Function);
--
--   <b>type</b> Char_Check_Function<FONT COLOR=red><A NAME="ref_109_28"> </A></FONT><b>is</b> <b>access</b>
--     <b>function</b> (Ch : C_Int<A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_108_9">;</A> Usr : System.Address) <b>return</b> C_Int;
--   <b>pragma</b> Convention (C, Char_Check_Function);
--
--   <b>type</b> Choice_Function <b>is</b> <b>access</b>
--     <b>function</b> (Fld : Field; Usr : System.Address) <b>return</b> C_Int;
--   <b>pragma</b> Convention (C, Choice_Function);
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_92_9">Makearg_Function</A></FONT> <b>is</b> <b>access</b>
-+     <b>function</b> (<FONT COLOR=red><A NAME="ref_93_16">Args</A></FONT> : System.Address) <b>return</b> System.Address;
-+   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_92_9">Makearg_Function</A>);
-+
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_96_9">Copyarg_Function</A></FONT> <b>is</b> <b>access</b>
-+     <b>function</b> (<FONT COLOR=red><A NAME="ref_97_16">Usr</A></FONT> : System.Address) <b>return</b> System.Address;
-+   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_96_9">Copyarg_Function</A>);
-+
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_100_9">Freearg_Function</A></FONT> <b>is</b> <b>access</b>
-+     <b>procedure</b> (<FONT COLOR=red><A NAME="ref_101_17">Usr</A></FONT> : System.Address);
-+   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_100_9">Freearg_Function</A>);
-+
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_104_9">Field_Check_Function</A></FONT> <b>is</b> <b>access</b>
-+     <b>function</b> (<FONT COLOR=red><A NAME="ref_105_16">Fld</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>; <FONT COLOR=red><A NAME="ref_105_29">Usr</A></FONT> : System.Address) <b>return</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_46_12">C_Int</A>;
-+   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_104_9">Field_Check_Function</A>);
-+
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_108_9">Char_Check_Function</A></FONT> <b>is</b> <b>access</b>
-+     <b>function</b> (<FONT COLOR=red><A NAME="ref_109_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_46_12">C_Int</A>; <FONT COLOR=red><A NAME="ref_109_28">Usr</A></FONT> : System.Address) <b>return</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_46_12">C_Int</A>;
-+   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_108_9">Char_Check_Function</A>);
-+
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_112_9">Choice_Function</A></FONT> <b>is</b> <b>access</b>
-+     <b>function</b> (<FONT COLOR=red><A NAME="ref_113_16">Fld</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>; <FONT COLOR=red><A NAME="ref_113_29">Usr</A></FONT> : System.Address) <b>return</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_46_12">C_Int</A>;
-+   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_112_9">Choice_Function</A>);
- 
-    <FONT COLOR=green><EM>--  +----------------------------------------------------------------------</EM></FONT>
-    <FONT COLOR=green><EM>--  | This must be in sync with the FIELDTYPE structure in form.h</EM></FONT>
-    <FONT COLOR=green><EM>--  |</EM></FONT>
--   <b>type</b> Low_Level_Field_Type <b>is</b>
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_119_9">Low_Level_Field_Type</A></FONT> <b>is</b>
-       <b>record</b>
--         <FONT COLOR=red><A NAME="ref_122_10">Status</A></FONT> :              <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.short;
--         <FONT COLOR=red><A NAME="ref_123_10">Ref_Count</A></FONT> :           Interfaces.C.long;
--         <FONT COLOR=red><A NAME="ref_124_10">Left</A></FONT>, Right :         <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_92_9">System</A>.Address;
--         <FONT COLOR=red><A NAME="ref_125_10">Makearg</A></FONT> :             <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_96_9">Makearg_Function</A>;
--         <FONT COLOR=red><A NAME="ref_126_10">Copyarg</A></FONT> :             <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_100_9">Copyarg_Function</A>;
--         <FONT COLOR=red><A NAME="ref_127_10">Freearg</A></FONT> :             <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_104_9">Freearg_Function</A>;
--         <FONT COLOR=red><A NAME="ref_128_10">Fcheck</A></FONT> :              <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_108_9">Field_Check_Function</A>;
--         <FONT COLOR=red><A NAME="ref_129_10">Ccheck</A></FONT><FONT COLOR=red><A NAME="ref_129_16"> </A></FONT>:              <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_112_9">Char_Check_Function</A>;
--         Next, Prev :          Choice_Function;
-+         <FONT COLOR=red><A NAME="ref_121_10">Status</A></FONT> :              <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.short;
-+         <FONT COLOR=red><A NAME="ref_122_10">Ref_Count</A></FONT> :           <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.long;
-+         <FONT COLOR=red><A NAME="ref_123_10">Left</A></FONT>, <FONT COLOR=red><A NAME="ref_123_16">Right</A></FONT> :         System.Address;
-+         <FONT COLOR=red><A NAME="ref_124_10">Makearg</A></FONT> :             <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_92_9">Makearg_Function</A>;
-+         <FONT COLOR=red><A NAME="ref_125_10">Copyarg</A></FONT> :             <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_96_9">Copyarg_Function</A>;
-+         <FONT COLOR=red><A NAME="ref_126_10">Freearg</A></FONT> :             <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_100_9">Freearg_Function</A>;
-+         <FONT COLOR=red><A NAME="ref_127_10">Fcheck</A></FONT> :              <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_104_9">Field_Check_Function</A>;
-+         <FONT COLOR=red><A NAME="ref_128_10">Ccheck</A></FONT> :              <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_108_9">Char_Check_Function</A>;
-+         <FONT COLOR=red><A NAME="ref_129_10">Next</A></FONT>, <FONT COLOR=red><A NAME="ref_129_16">Prev</A></FONT> :          <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_112_9">Choice_Function</A>;
-       <b>end</b> <b>record</b>;
--   <b>pragma</b> Convention (C, Low_Level_Field_Type);
--   <b>type</b> C_Field_Type <b>is</b> <b>access</b> <b>all</b> Low_Level_Field_Type;
-+   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_119_9">Low_Level_Field_Type</A>);
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_132_9">C_Field_Type</A></FONT> <b>is</b> <b>access</b> <b>all</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_119_9">Low_Level_Field_Type</A>;
- 
--   Null_Field_Type   : <b>constant</b> C_Field_Type := <b>null</b>;
-+   <FONT COLOR=red><A NAME="ref_134_4">Null_Field_Type</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A> := <b>null</b>;
- 
-    <FONT COLOR=green><EM>--  +----------------------------------------------------------------------</EM></FONT>
-    <FONT COLOR=green><EM>--  | This four low-level fieldtypes are the ones associated with</EM></FONT>
-    <FONT COLOR=green><EM>--  | fieldtypes handled by this binding. Any other low-level fieldtype</EM></FONT>
-    <FONT COLOR=green><EM>--  | will result in a Form_Exception is function Get_Type.</EM></FONT>
-    <FONT COLOR=green><EM>--  |</EM></FONT>
--   <FONT COLOR=red><A NAME="ref_142_4">M_Generic_Type</A></FONT>   : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A> := <b>null</b>;
--   <FONT COLOR=red><A NAME="ref_143_4">M_Generic_Choice</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A> := <b>null</b>;
--   <FONT COLOR=red><A NAME="ref_144_4">M_Builtin_Router</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A> := <b>null</b>;
--   M_Choice_Router  : C_Field_Type := <b>null</b>;
-+   <FONT COLOR=red><A NAME="ref_141_4">M_Generic_Type</A></FONT>   : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A> := <b>null</b>;
-+   <FONT COLOR=red><A NAME="ref_142_4">M_Generic_Choice</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A> := <b>null</b>;
-+   <FONT COLOR=red><A NAME="ref_143_4">M_Builtin_Router</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A> := <b>null</b>;
-+   <FONT COLOR=red><A NAME="ref_144_4">M_Choice_Router</A></FONT>  : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A> := <b>null</b>;
- 
-    <FONT COLOR=green><EM>--  Two wrapper functions to access those low-level fieldtypes defined</EM></FONT>
-    <FONT COLOR=green><EM>--  in this package.</EM></FONT>
--   <b>function</b> <FONT COLOR=red><A NAME="ref_149_13" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_266_13">C_Builtin_Router</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A>;
--   <b>function</b> C_Choice_Router  <b>return</b> C_Field_Type;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_148_13" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_239_13">C_Builtin_Router</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A>;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_149_13" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_266_13">C_Choice_Router</A></FONT>  <b>return</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A>;
- 
--   <b>procedure</b> Wrap_Builtin (<FONT COLOR=red><A NAME="ref_152_28" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_146_28">Fld</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_52_9">Field</A>;
--                           <FONT COLOR=red><A NAME="ref_153_28" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_147_28">Typ</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">Field_Type</A>'Class<A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_148_13">;</A>
--                           Cft : C_Field_Type := C_Builtin_Router);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_151_14" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_145_14">Wrap_Builtin</A></FONT> (<FONT COLOR=red><A NAME="ref_151_28" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_145_28">Fld</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+                           <FONT COLOR=red><A NAME="ref_152_28" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_146_28">Typ</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_52_9">Field_Type</A>'Class;
-+                           <FONT COLOR=red><A NAME="ref_153_28" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_147_28">Cft</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A> := <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_148_13">C_Builtin_Router</A>);
-    <FONT COLOR=green><EM>--  This procedure has to be called by the Set_Field_Type implementation</EM></FONT>
-    <FONT COLOR=green><EM>--  for builtin low-level fieldtypes to replace it by an Ada95</EM></FONT>
-    <FONT COLOR=green><EM>--  conformant Field_Type object.</EM></FONT>
-@@ -165,48 +164,48 @@
-    <FONT COLOR=green><EM>--  low-level fieldtypes witch choice functions (like TYP_ENUM).</EM></FONT>
-    <FONT COLOR=green><EM>--  Any other value will raise a Form_Exception.</EM></FONT>
- 
--   <b>function</b> Make_Arg (Args : System.Address) <b>return</b> System.Address;
--   <b>pragma</b> Convention (C, Make_Arg);
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_162_13" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_97_13">Make_Arg</A></FONT> (<FONT COLOR=red><A NAME="ref_162_23" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_97_23">Args</A></FONT> : System.Address) <b>return</b> System.Address;
-+   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_162_13">Make_Arg</A>);
-    <FONT COLOR=green><EM>--  This is the Makearg_Function for the internal low-level types</EM></FONT>
-    <FONT COLOR=green><EM>--  introduced by this binding.</EM></FONT>
- 
--   <b>function</b> Copy_Arg (Usr<A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_167_13"> </A>: System.Address) <b>return</b> System.Address;
--   <b>pragma</b> Convention (C, Copy_Arg);
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_167_13" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_115_13">Copy_Arg</A></FONT> (<FONT COLOR=red><A NAME="ref_167_23" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_115_23">Usr</A></FONT> : System.Address) <b>return</b> System.Address;
-+   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_167_13">Copy_Arg</A>);
-    <FONT COLOR=green><EM>--  This is the Copyarg_Function for the internal low-level types</EM></FONT>
-    <FONT COLOR=green><EM>--  introduced by this binding.</EM></FONT>
- 
--   <b>procedure</b> Free_Arg (Usr : System.Address);
--   <b>pragma</b> Convention (C, Free_Arg);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_172_14" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_121_14">Free_Arg</A></FONT> (<FONT COLOR=red><A NAME="ref_172_24" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_121_24">Usr</A></FONT> : System.Address);
-+   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_172_14">Free_Arg</A>);
-    <FONT COLOR=green><EM>--  This is the Freearg_Function for the internal low-level types</EM></FONT>
-    <FONT COLOR=green><EM>--  introduced by this binding.</EM></FONT>
- 
--   <b>function</b> Field_Check_Router (<FONT COLOR=red><A NAME="ref_178_33" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_182_33">Fld</A></FONT> : Field;
--                         <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_177_13"> </A>      Usr : System.Address) <b>return</b> C_Int;
--   <b>pragma</b> Convention (C, Field_Check_Router);
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_177_13" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_181_13">Field_Check_Router</A></FONT> (<FONT COLOR=red><A NAME="ref_177_33" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_181_33">Fld</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+                                <FONT COLOR=red><A NAME="ref_178_33" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_182_33">Usr</A></FONT> : System.Address) <b>return</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_46_12">C_Int</A>;
-+   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_177_13">Field_Check_Router</A>);
-    <FONT COLOR=green><EM>--  This is the Field_Check_Function for the internal low-level types</EM></FONT>
-    <FONT COLOR=green><EM>--  introduced to wrap the low-level types by a Field_Type derived</EM></FONT>
-    <FONT COLOR=green><EM>--  type. It routes the call to the corresponding low-level validation</EM></FONT>
-    <FONT COLOR=green><EM>--  function.</EM></FONT>
- 
--   <b>function</b> Char_Check_Router (<FONT COLOR=red><A NAME="ref_186_32" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_196_32">Ch</A></FONT> : C_Int;
--                         <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_185_13"> </A>     Usr : System.Address) <b>return</b> C_Int;
--   <b>pragma</b> Convention (C, Char_Check_Router);
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_185_13" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_195_13">Char_Check_Router</A></FONT> (<FONT COLOR=red><A NAME="ref_185_32" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_195_32">Ch</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_46_12">C_Int</A>;
-+                               <FONT COLOR=red><A NAME="ref_186_32" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_196_32">Usr</A></FONT> : System.Address) <b>return</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_46_12">C_Int</A>;
-+   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_185_13">Char_Check_Router</A>);
-    <FONT COLOR=green><EM>--  This is the Char_Check_Function for the internal low-level types</EM></FONT>
-    <FONT COLOR=green><EM>--  introduced to wrap the low-level types by a Field_Type derived</EM></FONT>
-    <FONT COLOR=green><EM>--  type. It routes the call to the corresponding low-level validation</EM></FONT>
-    <FONT COLOR=green><EM>--  function.</EM></FONT>
- 
--   <b>function</b> Next_Router (<FONT COLOR=red><A NAME="ref_194_26" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_210_26">Fld</A></FONT> : Field;
--                         <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_193_13">Usr</A> : System.Address) <b>return</b> C_Int;
--   <b>pragma</b> Convention (C, Next_Router);
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_193_13" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_209_13">Next_Router</A></FONT> (<FONT COLOR=red><A NAME="ref_193_26" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_209_26">Fld</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+                         <FONT COLOR=red><A NAME="ref_194_26" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_210_26">Usr</A></FONT> : System.Address) <b>return</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_46_12">C_Int</A>;
-+   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_193_13">Next_Router</A>);
-    <FONT COLOR=green><EM>--  This is the Choice_Function for the internal low-level types</EM></FONT>
-    <FONT COLOR=green><EM>--  introduced to wrap the low-level types by a Field_Type derived</EM></FONT>
-    <FONT COLOR=green><EM>--  type. It routes the call to the corresponding low-level next_choice</EM></FONT>
-    <FONT COLOR=green><EM>--  function.</EM></FONT>
- 
--   <b>function</b> Prev_Router (<FONT COLOR=red><A NAME="ref_202_26" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_224_26">Fld</A></FONT> : Field;
--                         <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_201_13">Usr</A> : System.Address) <b>return</b> C_Int;
--   <b>pragma</b> Convention (C, Prev_Router);
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_201_13" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_223_13">Prev_Router</A></FONT> (<FONT COLOR=red><A NAME="ref_201_26" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_223_26">Fld</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+                         <FONT COLOR=red><A NAME="ref_202_26" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_224_26">Usr</A></FONT> : System.Address) <b>return</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_46_12">C_Int</A>;
-+   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_201_13">Prev_Router</A>);
-    <FONT COLOR=green><EM>--  This is the Choice_Function for the internal low-level types</EM></FONT>
-    <FONT COLOR=green><EM>--  introduced to wrap the low-level types by a Field_Type derived</EM></FONT>
-    <FONT COLOR=green><EM>--  type. It routes the call to the corresponding low-level prev_choice</EM></FONT>
-@@ -214,33 +213,33 @@
- 
-    <FONT COLOR=green><EM>--  This is the Argument structure maintained by all low-level field types</EM></FONT>
-    <FONT COLOR=green><EM>--  introduced by this binding.</EM></FONT>
--   <b>type</b> Argument <b>is</b> <b>record</b>
--      <FONT COLOR=red><A NAME="ref_213_7">Typ</A></FONT> : Field_Type_Access;   <FONT COLOR=green><EM>--  the Field_Type creating this record</EM></FONT>
--      <FONT COLOR=red><A NAME="ref_214_7">Usr</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">System</A>.Address;      <FONT COLOR=green><EM>--  original arg for builtin low-level types</EM></FONT>
--      Cft : C_Field_Type;        <FONT COLOR=green><EM>--  the original low-level type</EM></FONT>
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_211_9">Argument</A></FONT> <b>is</b> <b>record</b>
-+      <FONT COLOR=red><A NAME="ref_212_7">Typ</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_63_9">Field_Type_Access</A>;   <FONT COLOR=green><EM>--  the Field_Type creating this record</EM></FONT>
-+      <FONT COLOR=red><A NAME="ref_213_7">Usr</A></FONT> : System.Address;      <FONT COLOR=green><EM>--  original arg for builtin low-level types</EM></FONT>
-+      <FONT COLOR=red><A NAME="ref_214_7">Cft</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A>;        <FONT COLOR=green><EM>--  the original low-level type</EM></FONT>
-    <b>end</b> <b>record</b>;
--   <b>type</b> Argument_Access <b>is</b> <b>access</b> <b>all</b> Argument;
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_216_9">Argument_Access</A></FONT> <b>is</b> <b>access</b> <b>all</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_211_9">Argument</A>;
- 
-    <FONT COLOR=green><EM>--  +----------------------------------------------------------------------</EM></FONT>
-    <FONT COLOR=green><EM>--  |</EM></FONT>
-    <FONT COLOR=green><EM>--  | Some Imports of libform routines to deal with low-level fieldtypes.</EM></FONT>
-    <FONT COLOR=green><EM>--  |</EM></FONT>
--   <b>function</b> New_Fieldtype (<FONT COLOR=red><A NAME="ref_223_28" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_222_13">Fcheck</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_108_9">Field_Check_Function</A>;
--            <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9"> </A>              Ccheck : Char_Check_Function)
--     <b>return</b> C_Field_Type;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_222_13">New_Fieldtype</A></FONT> (<FONT COLOR=red><A NAME="ref_222_28" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_222_13">Fcheck</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_104_9">Field_Check_Function</A>;
-+                           <FONT COLOR=red><A NAME="ref_223_28" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_222_13">Ccheck</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_108_9">Char_Check_Function</A>)
-+     <b>return</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A>;
-    <b>pragma</b> Import (C, New_Fieldtype, "new_fieldtype");
- 
--   <b>function</b> Set_Fieldtype_Arg (<FONT COLOR=red><A NAME="ref_228_32" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_227_13">Cft</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_92_9">C_Field_Type</A>;
--                               <FONT COLOR=red><A NAME="ref_229_32" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_227_13">Mak</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_96_9">Makearg_Function</A> := <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_167_13">Make_Arg</A>'<b>Access</b>;
--                               <FONT COLOR=red><A NAME="ref_230_32" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_227_13">Cop</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_100_9">Copyarg_Function</A> := <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_172_14">Copy_Arg</A>'<b>Access</b>;
--            <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_46_12"> </A>                  Fre : Freearg_Function := Free_Arg'<b>Access</b>)
--     <b>return</b> C_Int;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_227_13">Set_Fieldtype_Arg</A></FONT> (<FONT COLOR=red><A NAME="ref_227_32" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_227_13">Cft</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A>;
-+                               <FONT COLOR=red><A NAME="ref_228_32" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_227_13">Mak</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_92_9">Makearg_Function</A> := <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_162_13">Make_Arg</A>'<b>Access</b>;
-+                               <FONT COLOR=red><A NAME="ref_229_32" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_227_13">Cop</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_96_9">Copyarg_Function</A> := <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_167_13">Copy_Arg</A>'<b>Access</b>;
-+                               <FONT COLOR=red><A NAME="ref_230_32" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_227_13">Fre</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_100_9">Freearg_Function</A> := <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_172_14">Free_Arg</A>'<b>Access</b>)
-+     <b>return</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_46_12">C_Int</A>;
-    <b>pragma</b> Import (C, Set_Fieldtype_Arg, "set_fieldtype_arg");
- 
--   <b>function</b> Set_Fieldtype_Choice (<FONT COLOR=red><A NAME="ref_235_35" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_234_13">Cft</A></FONT> : <FONT COLOR=red><A NAME="ref_235_41" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_234_13">C_Field_Type</A></FONT>;
--            <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_46_12"> </A>                     Next, Prev : Choice_Function)
--     <b>return</b> C_Int;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_234_13">Set_Fieldtype_Choice</A></FONT> (<FONT COLOR=red><A NAME="ref_234_35" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_234_13">Cft</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A>;
-+                                  <FONT COLOR=red><A NAME="ref_235_35" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_234_13">Next</A></FONT>, <FONT COLOR=red><A NAME="ref_235_41" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_234_13">Prev</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_112_9">Choice_Function</A>)
-+     <b>return</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_46_12">C_Int</A>;
-    <b>pragma</b> Import (C, Set_Fieldtype_Choice, "set_fieldtype_choice");
- 
--<b>end</b> Terminal_Interface.Curses.Forms.Field_Types;
-+<b>end</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-forms__ads.htm#ref_49_35">Forms</A>.<A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_43_41">Field_Types</A>;
- </PRE></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-forms-field_user_data__ads.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-forms-field_user_data__ads.htm
---- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-forms-field_user_data__ads.htm	2006-09-23 16:31:31.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/terminal_interface-curses-forms-field_user_data__ads.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -3,7 +3,6 @@
- <BODY>
- <HR><DIV ALIGN="center"><H1> File : terminal_interface-curses-forms-field_user_data.ads </H1></DIV><HR>
- <PRE>
--
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
- <FONT COLOR=green><EM>--                           <A HREF="http://www.gnat.com">GNAT</A> ncurses Binding                           --</EM></FONT>
-@@ -46,31 +45,31 @@
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- 
- <b>generic</b>
--   <b>type</b> <FONT COLOR=red><A NAME="ref_44_9" HREF="terminal_interface-curses-forms-field_user_data__ads.htm#ref_45_41">User</A></FONT> <b>is</b> <b>limited</b> <b>private</b>;
--   <b>type</b> <A HREF="terminal_interface__ads.htm#ref_42_9">User_Access</A> <b>is</b> <b>access</b> User<A HREF="terminal_interface-curses-forms__ads.htm#ref_49_35">;</A>
--<b>package</b> Terminal_Interface.Curses.Forms.Field_User_Data <b>is</b>
--   <b>pragma</b> Preelaborate (Terminal_Interface.Curses.Forms.Field_User_Data);
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_43_9" HREF="terminal_interface-curses-forms-field_user_data__ads.htm#ref_45_41">User</A></FONT> <b>is</b> <b>limited</b> <b>private</b>;
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_44_9" HREF="terminal_interface-curses-forms-field_user_data__ads.htm#ref_45_41">User_Access</A></FONT> <b>is</b> <b>access</b> <A HREF="terminal_interface-curses-forms-field_user_data__ads.htm#ref_43_9">User</A>;
-+<b>package</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-forms__ads.htm#ref_49_35">Forms</A>.<FONT COLOR=red><A NAME="ref_45_41" HREF="terminal_interface-curses-forms-field_user_data__adb.htm#ref_48_46">Field_User_Data</A></FONT> <b>is</b>
-+   <b>pragma</b> Preelaborate (<A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-forms__ads.htm#ref_49_35">Forms</A>.<A HREF="terminal_interface-curses-forms-field_user_data__ads.htm#ref_45_41">Field_User_Data</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_field_userptr.3x.html">form_field_userptr.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_1"#2|</EM></FONT>
--   <b>procedure</b> Set_User_Data (<FONT COLOR=red><A NAME="ref_54_29" HREF="terminal_interface-curses-forms-field_user_data__adb.htm#ref_55_29">Fld</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms-field_user_data__ads.htm#ref_44_9">Field</A>;
--                            Data : <b>in</b> User_Access);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_53_14" HREF="terminal_interface-curses-forms-field_user_data__adb.htm#ref_54_14">Set_User_Data</A></FONT> (<FONT COLOR=red><A NAME="ref_53_29" HREF="terminal_interface-curses-forms-field_user_data__adb.htm#ref_54_29">Fld</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+                            <FONT COLOR=red><A NAME="ref_54_29" HREF="terminal_interface-curses-forms-field_user_data__adb.htm#ref_55_29">Data</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms-field_user_data__ads.htm#ref_44_9">User_Access</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_userptr.3x.html">set_field_userptr</A></EM></FONT>
--   <b>pragma</b> Inline (Set_User_Data);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms-field_user_data__ads.htm#ref_53_14">Set_User_Data</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_2"#2|</EM></FONT>
--   <b>procedure</b> Get_User_Data (<FONT COLOR=red><A NAME="ref_60_29" HREF="terminal_interface-curses-forms-field_user_data__adb.htm#ref_79_29">Fld</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-forms-field_user_data__ads.htm#ref_44_9">Field</A>;
--                            Data : <b>out</b> User_Access);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_59_14" HREF="terminal_interface-curses-forms-field_user_data__adb.htm#ref_78_14">Get_User_Data</A></FONT> (<FONT COLOR=red><A NAME="ref_59_29" HREF="terminal_interface-curses-forms-field_user_data__adb.htm#ref_78_29">Fld</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+                            <FONT COLOR=red><A NAME="ref_60_29" HREF="terminal_interface-curses-forms-field_user_data__adb.htm#ref_79_29">Data</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses-forms-field_user_data__ads.htm#ref_44_9">User_Access</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_userptr.3x.html">field_userptr</A></EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_3"#2|</EM></FONT>
--   <b>function</b> Get_User_Data (Fld  : <b>in</b>  Field) <b>return</b> User_Access;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_64_13" HREF="terminal_interface-curses-forms-field_user_data__adb.htm#ref_70_13">Get_User_Data</A></FONT> (<FONT COLOR=red><A NAME="ref_64_28" HREF="terminal_interface-curses-forms-field_user_data__adb.htm#ref_70_28">Fld</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>) <b>return</b> <A HREF="terminal_interface-curses-forms-field_user_data__ads.htm#ref_44_9">User_Access</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_userptr.3x.html">field_userptr</A></EM></FONT>
-    <FONT COLOR=green><EM>--  Sama as function</EM></FONT>
-    <b>pragma</b> Inline (Get_User_Data);
- 
--<b>end</b> Terminal_Interface.Curses.Forms.Field_User_Data;
-+<b>end</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-forms__ads.htm#ref_49_35">Forms</A>.<A HREF="terminal_interface-curses-forms-field_user_data__ads.htm#ref_45_41">Field_User_Data</A>;
- </PRE></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-forms-form_user_data__ads.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-forms-form_user_data__ads.htm
---- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-forms-form_user_data__ads.htm	2006-09-23 16:31:31.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/terminal_interface-curses-forms-form_user_data__ads.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -3,7 +3,6 @@
- <BODY>
- <HR><DIV ALIGN="center"><H1> File : terminal_interface-curses-forms-form_user_data.ads </H1></DIV><HR>
- <PRE>
--
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
- <FONT COLOR=green><EM>--                           <A HREF="http://www.gnat.com">GNAT</A> ncurses Binding                           --</EM></FONT>
-@@ -46,31 +45,31 @@
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- 
- <b>generic</b>
--   <b>type</b> <FONT COLOR=red><A NAME="ref_44_9" HREF="terminal_interface-curses-forms-form_user_data__ads.htm#ref_45_41">User</A></FONT> <b>is</b> <b>limited</b> <b>private</b>;
--   <b>type</b> <A HREF="terminal_interface__ads.htm#ref_42_9">User_Access</A> <b>is</b> <b>access</b> User<A HREF="terminal_interface-curses-forms__ads.htm#ref_49_35">;</A>
--<b>package</b> Terminal_Interface.Curses.Forms.Form_User_Data <b>is</b>
--   <b>pragma</b> Preelaborate (Terminal_Interface.Curses.Forms.Form_User_Data);
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_43_9" HREF="terminal_interface-curses-forms-form_user_data__ads.htm#ref_45_41">User</A></FONT> <b>is</b> <b>limited</b> <b>private</b>;
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_44_9" HREF="terminal_interface-curses-forms-form_user_data__ads.htm#ref_45_41">User_Access</A></FONT> <b>is</b> <b>access</b> <A HREF="terminal_interface-curses-forms-form_user_data__ads.htm#ref_43_9">User</A>;
-+<b>package</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-forms__ads.htm#ref_49_35">Forms</A>.<FONT COLOR=red><A NAME="ref_45_41" HREF="terminal_interface-curses-forms-form_user_data__adb.htm#ref_48_46">Form_User_Data</A></FONT> <b>is</b>
-+   <b>pragma</b> Preelaborate (<A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-forms__ads.htm#ref_49_35">Forms</A>.<A HREF="terminal_interface-curses-forms-form_user_data__ads.htm#ref_45_41">Form_User_Data</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_userptr.3x.html">form_userptr.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_1"#2|</EM></FONT>
--   <b>procedure</b> Set_User_Data (<FONT COLOR=red><A NAME="ref_54_29" HREF="terminal_interface-curses-forms-form_user_data__adb.htm#ref_56_29">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms-form_user_data__ads.htm#ref_44_9">Form</A>;
--                            Data : <b>in</b> User_Access);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_53_14" HREF="terminal_interface-curses-forms-form_user_data__adb.htm#ref_55_14">Set_User_Data</A></FONT> (<FONT COLOR=red><A NAME="ref_53_29" HREF="terminal_interface-curses-forms-form_user_data__adb.htm#ref_55_29">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-+                            <FONT COLOR=red><A NAME="ref_54_29" HREF="terminal_interface-curses-forms-form_user_data__adb.htm#ref_56_29">Data</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms-form_user_data__ads.htm#ref_44_9">User_Access</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_userptr.3x.html">set_form_userptr</A></EM></FONT>
--   <b>pragma</b> Inline (Set_User_Data);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms-form_user_data__ads.htm#ref_53_14">Set_User_Data</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_2"#2|</EM></FONT>
--   <b>procedure</b> Get_User_Data (<FONT COLOR=red><A NAME="ref_60_29" HREF="terminal_interface-curses-forms-form_user_data__adb.htm#ref_80_29">Frm</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-forms-form_user_data__ads.htm#ref_44_9">Form</A>;
--                            Data : <b>out</b> User_Access);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_59_14" HREF="terminal_interface-curses-forms-form_user_data__adb.htm#ref_79_14">Get_User_Data</A></FONT> (<FONT COLOR=red><A NAME="ref_59_29" HREF="terminal_interface-curses-forms-form_user_data__adb.htm#ref_79_29">Frm</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-+                            <FONT COLOR=red><A NAME="ref_60_29" HREF="terminal_interface-curses-forms-form_user_data__adb.htm#ref_80_29">Data</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses-forms-form_user_data__ads.htm#ref_44_9">User_Access</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_userptr.3x.html">form_userptr</A></EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_3"#2|</EM></FONT>
--   <b>function</b> Get_User_Data (Frm  : <b>in</b>  Form) <b>return</b> User_Access;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_64_13" HREF="terminal_interface-curses-forms-form_user_data__adb.htm#ref_71_13">Get_User_Data</A></FONT> (<FONT COLOR=red><A NAME="ref_64_28" HREF="terminal_interface-curses-forms-form_user_data__adb.htm#ref_71_28">Frm</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>) <b>return</b> <A HREF="terminal_interface-curses-forms-form_user_data__ads.htm#ref_44_9">User_Access</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_userptr.3x.html">form_userptr</A></EM></FONT>
-    <FONT COLOR=green><EM>--  Same as function</EM></FONT>
-    <b>pragma</b> Inline (Get_User_Data);
- 
--<b>end</b> Terminal_Interface.Curses.Forms.Form_User_Data;
-+<b>end</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-forms__ads.htm#ref_49_35">Forms</A>.<A HREF="terminal_interface-curses-forms-form_user_data__ads.htm#ref_45_41">Form_User_Data</A>;
- </PRE></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-forms__ads.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-forms__ads.htm
---- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-forms__ads.htm	2006-09-23 16:31:31.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/terminal_interface-curses-forms__ads.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -3,7 +3,6 @@
- <BODY>
- <HR><DIV ALIGN="center"><H1> File : terminal_interface-curses-forms.ads </H1></DIV><HR>
- <PRE>
--
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
- <FONT COLOR=green><EM>--                           <A HREF="http://www.gnat.com">GNAT</A> ncurses Binding                           --</EM></FONT>
-@@ -52,41 +51,41 @@
- <b>with</b> System;
- <b>with</b> Ada.Characters.Latin_1;
- 
--<b>package</b> Terminal_Interface.Curses.Forms <b>is</b>
--   <b>pragma</b> Preelaborate (Terminal_Interface.Curses.Forms);
-+<b>package</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<FONT COLOR=red><A NAME="ref_49_35" HREF="terminal_interface-curses-forms__adb.htm#ref_51_40">Forms</A></FONT> <b>is</b>
-+   <b>pragma</b> Preelaborate (<A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-forms__ads.htm#ref_49_35">Forms</A>);
-    <b>pragma</b> Linker_Options ("-lform");
-    <b>pragma</b> Linker_Options ("-lncurses");
- 
-    Space : Character <b>renames</b> Ada.Characters.Latin_1.Space;
- 
--   <b>type</b> <FONT COLOR=red><A NAME="ref_57_9">Field</A></FONT>        <b>is</b> <b>private</b>;
--   <b>type</b> Form         <b>is</b> <b>private</b>;
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_56_9">Field</A></FONT>        <b>is</b> <b>private</b>;
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_57_9">Form</A></FONT>         <b>is</b> <b>private</b>;
- 
--   <FONT COLOR=red><A NAME="ref_60_4">Null_Field</A></FONT>        : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Field</A>;
--   Null_Form         : <b>constant</b> Form;
-+   <FONT COLOR=red><A NAME="ref_59_4">Null_Field</A></FONT>        : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+   <FONT COLOR=red><A NAME="ref_60_4">Null_Form</A></FONT>         : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
- 
--   <b>type</b> Field_Justification <b>is</b> (<FONT COLOR=red><A NAME="ref_63_33">None</A></FONT>,
--                                <FONT COLOR=red><A NAME="ref_64_33">Left</A></FONT>,
--                                <FONT COLOR=red><A NAME="ref_65_33">Center</A></FONT>,
--                                Right);
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_62_9">Field_Justification</A></FONT> <b>is</b> (<FONT COLOR=red><A NAME="ref_62_33">None</A></FONT>,
-+                                <FONT COLOR=red><A NAME="ref_63_33">Left</A></FONT>,
-+                                <FONT COLOR=red><A NAME="ref_64_33">Center</A></FONT>,
-+                                <FONT COLOR=red><A NAME="ref_65_33">Right</A></FONT>);
- 
-    <b>pragma</b> Warnings (Off);
--   <b>type</b> Field_Option_Set <b>is</b>
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_68_9">Field_Option_Set</A></FONT> <b>is</b>
-       <b>record</b>
--         <FONT COLOR=red><A NAME="ref_71_10">Visible</A></FONT>     : Boolean;
--         <FONT COLOR=red><A NAME="ref_72_10">Active</A></FONT>      : Boolean;
--         <FONT COLOR=red><A NAME="ref_73_10">Public</A></FONT>      : Boolean;
--         <FONT COLOR=red><A NAME="ref_74_10">Edit</A></FONT>        : Boolean;
--         <FONT COLOR=red><A NAME="ref_75_10">Wrap</A></FONT>        : Boolean;
--         <FONT COLOR=red><A NAME="ref_76_10">Blank</A></FONT>       : Boolean;
--         <FONT COLOR=red><A NAME="ref_77_10">Auto_Skip</A></FONT>   : Boolean;
--         <FONT COLOR=red><A NAME="ref_78_10">Null_Ok</A></FONT>     : Boolean;
--         <FONT COLOR=red><A NAME="ref_79_10">Pass_Ok</A></FONT>     : Boolean;
--         Static      : Boolean;
-+         <FONT COLOR=red><A NAME="ref_70_10">Visible</A></FONT>     : Boolean;
-+         <FONT COLOR=red><A NAME="ref_71_10">Active</A></FONT>      : Boolean;
-+         <FONT COLOR=red><A NAME="ref_72_10">Public</A></FONT>      : Boolean;
-+         <FONT COLOR=red><A NAME="ref_73_10">Edit</A></FONT>        : Boolean;
-+         <FONT COLOR=red><A NAME="ref_74_10">Wrap</A></FONT>        : Boolean;
-+         <FONT COLOR=red><A NAME="ref_75_10">Blank</A></FONT>       : Boolean;
-+         <FONT COLOR=red><A NAME="ref_76_10">Auto_Skip</A></FONT>   : Boolean;
-+         <FONT COLOR=red><A NAME="ref_77_10">Null_Ok</A></FONT>     : Boolean;
-+         <FONT COLOR=red><A NAME="ref_78_10">Pass_Ok</A></FONT>     : Boolean;
-+         <FONT COLOR=red><A NAME="ref_79_10">Static</A></FONT>      : Boolean;
-       <b>end</b> <b>record</b>;
--   <b>pragma</b> Convention (C, Field_Option_Set);
-+   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms__ads.htm#ref_68_9">Field_Option_Set</A>);
- 
--   <b>for</b> Field_Option_Set <b>use</b>
-+   <b>for</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_68_9">Field_Option_Set</A> <b>use</b>
-       <b>record</b>
-          Visible     <b>at</b> 0 <b>range</b>  0 ..  0;
-          Active      <b>at</b> 0 <b>range</b>  1 ..  1;
-@@ -99,328 +98,328 @@
-          Pass_Ok     <b>at</b> 0 <b>range</b>  8 ..  8;
-          Static      <b>at</b> 0 <b>range</b>  9 ..  9;
-       <b>end</b> <b>record</b>;
--   <b>for</b> Field_Option_Set'Size <b>use</b> 32;
-+   <b>for</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_68_9">Field_Option_Set</A>'Size <b>use</b> 32;
-    <FONT COLOR=green><EM>--  Please note: this rep. clause is generated and may be</EM></FONT>
-    <FONT COLOR=green><EM>--               different on your system.Dnl</EM></FONT>
- 
-    <b>pragma</b> Warnings (On);
- 
--   <b>function</b> Default_Field_Options <b>return</b> Field_Option_Set;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_102_13" HREF="terminal_interface-curses-forms__adb.htm#ref_1149_13">Default_Field_Options</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_68_9">Field_Option_Set</A>;
-    <FONT COLOR=green><EM>--  The initial defaults for the field options.</EM></FONT>
--   <b>pragma</b> Inline (Default_Field_Options);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_102_13">Default_Field_Options</A>);
- 
-    <b>pragma</b> Warnings (Off);
--   <b>type</b> Form_Option_Set <b>is</b>
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_107_9">Form_Option_Set</A></FONT> <b>is</b>
-       <b>record</b>
--         <FONT COLOR=red><A NAME="ref_110_10">NL_Overload</A></FONT> : Boolean;
--         BS_Overload : Boolean;
-+         <FONT COLOR=red><A NAME="ref_109_10">NL_Overload</A></FONT> : Boolean;
-+         <FONT COLOR=red><A NAME="ref_110_10">BS_Overload</A></FONT> : Boolean;
-       <b>end</b> <b>record</b>;
--   <b>pragma</b> Convention (C, Form_Option_Set);
-+   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms__ads.htm#ref_107_9">Form_Option_Set</A>);
- 
--   <b>for</b> Form_Option_Set <b>use</b>
-+   <b>for</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_107_9">Form_Option_Set</A> <b>use</b>
-       <b>record</b>
-          NL_Overload <b>at</b> 0 <b>range</b>  0 ..  0;
-          BS_Overload <b>at</b> 0 <b>range</b>  1 ..  1;
-       <b>end</b> <b>record</b>;
--   <b>for</b> Form_Option_Set'Size <b>use</b> 32;
-+   <b>for</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_107_9">Form_Option_Set</A>'Size <b>use</b> 32;
-    <FONT COLOR=green><EM>--  Please note: this rep. clause is generated and may be</EM></FONT>
-    <FONT COLOR=green><EM>--               different on your system.Dnl</EM></FONT>
- 
-    <b>pragma</b> Warnings (On);
- 
--   <b>function</b> Default_Form_Options <b>return</b> Form_Option_Set;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_125_13" HREF="terminal_interface-curses-forms__adb.htm#ref_1155_13">Default_Form_Options</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_107_9">Form_Option_Set</A>;
-    <FONT COLOR=green><EM>--  The initial defaults for the form options.</EM></FONT>
--   <b>pragma</b> Inline (Default_Form_Options);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_125_13">Default_Form_Options</A>);
- 
--   <b>type</b> Buffer_Number <b>is</b> <b>new</b> Natural;
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_129_9">Buffer_Number</A></FONT> <b>is</b> <b>new</b> Natural;
- 
--   <b>type</b> Field_Array <b>is</b> <b>array</b> (Positive <b>range</b> &lt;&gt;) <b>of</b> <b>aliased</b> Field;
--   <b>pragma</b> Convention (C, Field_Array);
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_131_9">Field_Array</A></FONT> <b>is</b> <b>array</b> (Positive <b>range</b> &lt;&gt;) <b>of</b> <b>aliased</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms__ads.htm#ref_131_9">Field_Array</A>);
- 
--   <b>type</b> Field_Array_Access <b>is</b> <b>access</b> Field_Array;
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_134_9">Field_Array_Access</A></FONT> <b>is</b> <b>access</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_131_9">Field_Array</A>;
- 
--   <b>procedure</b> Free (<FONT COLOR=red><A NAME="ref_137_20" HREF="terminal_interface-curses-forms__adb.htm#ref_1132_20">FA</A></FONT>          : <b>in</b> <b>out</b> Field_Array_Access;
--                   Free_Fields : <b>in</b> Boolean := False);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_136_14" HREF="terminal_interface-curses-forms__adb.htm#ref_1131_14">Free</A></FONT> (<FONT COLOR=red><A NAME="ref_136_20" HREF="terminal_interface-curses-forms__adb.htm#ref_1131_20">FA</A></FONT>          : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_134_9">Field_Array_Access</A>;
-+                   <FONT COLOR=red><A NAME="ref_137_20" HREF="terminal_interface-curses-forms__adb.htm#ref_1132_20">Free_Fields</A></FONT> : <b>in</b> Boolean := False);
-    <FONT COLOR=green><EM>--  Release the memory for an allocated field array</EM></FONT>
-    <FONT COLOR=green><EM>--  If Free_Fields is True, call Delete() for all the fields in</EM></FONT>
-    <FONT COLOR=green><EM>--  the array.</EM></FONT>
- 
--   <b>subtype</b> Form_Request_Code <b>is</b> Key_Code <b>range</b> (Key_Max + 1) .. (Key_Max + 57);
-+   <b>subtype</b> <FONT COLOR=red><A NAME="ref_142_12">Form_Request_Code</A></FONT> <b>is</b> <A HREF="terminal_interface-curses__ads.htm#ref_68_9">Key_Code</A> <b>range</b> (<A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 1) .. (<A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 57);
- 
-    <FONT COLOR=green><EM>--  The prefix F_ stands for "Form Request"</EM></FONT>
--   <FONT COLOR=red><A NAME="ref_146_4">F_Next_Page</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 1;
--   <FONT COLOR=red><A NAME="ref_147_4">F_Previous_Page</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 2;
--   <FONT COLOR=red><A NAME="ref_148_4">F_First_Page</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 3;
--   F_Last_Page                : <b>constant</b> Form_Request_Code := Key_Max + 4;
--
--   <FONT COLOR=red><A NAME="ref_151_4">F_Next_Field</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 5;
--   <FONT COLOR=red><A NAME="ref_152_4">F_Previous_Field</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 6;
--   <FONT COLOR=red><A NAME="ref_153_4">F_First_Field</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 7;
--   <FONT COLOR=red><A NAME="ref_154_4">F_Last_Field</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 8;
--   <FONT COLOR=red><A NAME="ref_155_4">F_Sorted_Next_Field</A></FONT>        : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 9;
--   <FONT COLOR=red><A NAME="ref_156_4">F_Sorted_Previous_Field</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 10;
--   <FONT COLOR=red><A NAME="ref_157_4">F_Sorted_First_Field</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 11;
--   <FONT COLOR=red><A NAME="ref_158_4">F_Sorted_Last_Field</A></FONT>        : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 12;
--   <FONT COLOR=red><A NAME="ref_159_4">F_Left_Field</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 13;
--   <FONT COLOR=red><A NAME="ref_160_4">F_Right_Field</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 14;
--   <FONT COLOR=red><A NAME="ref_161_4">F_Up_Field</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 15;
--   F_Down_Field               : <b>constant</b> Form_Request_Code := Key_Max + 16;
--
--   <FONT COLOR=red><A NAME="ref_164_4">F_Next_Char</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 17;
--   <FONT COLOR=red><A NAME="ref_165_4">F_Previous_Char</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 18;
--   <FONT COLOR=red><A NAME="ref_166_4">F_Next_Line</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 19;
--   <FONT COLOR=red><A NAME="ref_167_4">F_Previous_Line</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 20;
--   <FONT COLOR=red><A NAME="ref_168_4">F_Next_Word</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 21;
--   <FONT COLOR=red><A NAME="ref_169_4">F_Previous_Word</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 22;
--   <FONT COLOR=red><A NAME="ref_170_4">F_Begin_Field</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 23;
--   <FONT COLOR=red><A NAME="ref_171_4">F_End_Field</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 24;
--   <FONT COLOR=red><A NAME="ref_172_4">F_Begin_Line</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 25;
--   <FONT COLOR=red><A NAME="ref_173_4">F_End_Line</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 26;
--   <FONT COLOR=red><A NAME="ref_174_4">F_Left_Char</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 27;
--   <FONT COLOR=red><A NAME="ref_175_4">F_Right_Char</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 28;
--   <FONT COLOR=red><A NAME="ref_176_4">F_Up_Char</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 29;
--   F_Down_Char                : <b>constant</b> Form_Request_Code := Key_Max + 30;
--
--   <FONT COLOR=red><A NAME="ref_179_4">F_New_Line</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 31;
--   <FONT COLOR=red><A NAME="ref_180_4">F_Insert_Char</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 32;
--   <FONT COLOR=red><A NAME="ref_181_4">F_Insert_Line</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 33;
--   <FONT COLOR=red><A NAME="ref_182_4">F_Delete_Char</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 34;
--   <FONT COLOR=red><A NAME="ref_183_4">F_Delete_Previous</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 35;
--   <FONT COLOR=red><A NAME="ref_184_4">F_Delete_Line</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 36;
--   <FONT COLOR=red><A NAME="ref_185_4">F_Delete_Word</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 37;
--   <FONT COLOR=red><A NAME="ref_186_4">F_Clear_EOL</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 38;
--   <FONT COLOR=red><A NAME="ref_187_4">F_Clear_EOF</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 39;
--   <FONT COLOR=red><A NAME="ref_188_4">F_Clear_Field</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 40;
--   <FONT COLOR=red><A NAME="ref_189_4">F_Overlay_Mode</A></FONT>             : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 41;
--   F_Insert_Mode              : <b>constant</b> Form_Request_Code := Key_Max + 42;
-+   <FONT COLOR=red><A NAME="ref_145_4">F_Next_Page</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 1;
-+   <FONT COLOR=red><A NAME="ref_146_4">F_Previous_Page</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 2;
-+   <FONT COLOR=red><A NAME="ref_147_4">F_First_Page</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 3;
-+   <FONT COLOR=red><A NAME="ref_148_4">F_Last_Page</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 4;
-+
-+   <FONT COLOR=red><A NAME="ref_150_4">F_Next_Field</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 5;
-+   <FONT COLOR=red><A NAME="ref_151_4">F_Previous_Field</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 6;
-+   <FONT COLOR=red><A NAME="ref_152_4">F_First_Field</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 7;
-+   <FONT COLOR=red><A NAME="ref_153_4">F_Last_Field</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 8;
-+   <FONT COLOR=red><A NAME="ref_154_4">F_Sorted_Next_Field</A></FONT>        : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 9;
-+   <FONT COLOR=red><A NAME="ref_155_4">F_Sorted_Previous_Field</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 10;
-+   <FONT COLOR=red><A NAME="ref_156_4">F_Sorted_First_Field</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 11;
-+   <FONT COLOR=red><A NAME="ref_157_4">F_Sorted_Last_Field</A></FONT>        : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 12;
-+   <FONT COLOR=red><A NAME="ref_158_4">F_Left_Field</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 13;
-+   <FONT COLOR=red><A NAME="ref_159_4">F_Right_Field</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 14;
-+   <FONT COLOR=red><A NAME="ref_160_4">F_Up_Field</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 15;
-+   <FONT COLOR=red><A NAME="ref_161_4">F_Down_Field</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 16;
-+
-+   <FONT COLOR=red><A NAME="ref_163_4">F_Next_Char</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 17;
-+   <FONT COLOR=red><A NAME="ref_164_4">F_Previous_Char</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 18;
-+   <FONT COLOR=red><A NAME="ref_165_4">F_Next_Line</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 19;
-+   <FONT COLOR=red><A NAME="ref_166_4">F_Previous_Line</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 20;
-+   <FONT COLOR=red><A NAME="ref_167_4">F_Next_Word</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 21;
-+   <FONT COLOR=red><A NAME="ref_168_4">F_Previous_Word</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 22;
-+   <FONT COLOR=red><A NAME="ref_169_4">F_Begin_Field</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 23;
-+   <FONT COLOR=red><A NAME="ref_170_4">F_End_Field</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 24;
-+   <FONT COLOR=red><A NAME="ref_171_4">F_Begin_Line</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 25;
-+   <FONT COLOR=red><A NAME="ref_172_4">F_End_Line</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 26;
-+   <FONT COLOR=red><A NAME="ref_173_4">F_Left_Char</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 27;
-+   <FONT COLOR=red><A NAME="ref_174_4">F_Right_Char</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 28;
-+   <FONT COLOR=red><A NAME="ref_175_4">F_Up_Char</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 29;
-+   <FONT COLOR=red><A NAME="ref_176_4">F_Down_Char</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 30;
-+
-+   <FONT COLOR=red><A NAME="ref_178_4">F_New_Line</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 31;
-+   <FONT COLOR=red><A NAME="ref_179_4">F_Insert_Char</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 32;
-+   <FONT COLOR=red><A NAME="ref_180_4">F_Insert_Line</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 33;
-+   <FONT COLOR=red><A NAME="ref_181_4">F_Delete_Char</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 34;
-+   <FONT COLOR=red><A NAME="ref_182_4">F_Delete_Previous</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 35;
-+   <FONT COLOR=red><A NAME="ref_183_4">F_Delete_Line</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 36;
-+   <FONT COLOR=red><A NAME="ref_184_4">F_Delete_Word</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 37;
-+   <FONT COLOR=red><A NAME="ref_185_4">F_Clear_EOL</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 38;
-+   <FONT COLOR=red><A NAME="ref_186_4">F_Clear_EOF</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 39;
-+   <FONT COLOR=red><A NAME="ref_187_4">F_Clear_Field</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 40;
-+   <FONT COLOR=red><A NAME="ref_188_4">F_Overlay_Mode</A></FONT>             : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 41;
-+   <FONT COLOR=red><A NAME="ref_189_4">F_Insert_Mode</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 42;
- 
-    <FONT COLOR=green><EM>--  Vertical Scrolling</EM></FONT>
--   <FONT COLOR=red><A NAME="ref_193_4">F_ScrollForward_Line</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 43;
--   <FONT COLOR=red><A NAME="ref_194_4">F_ScrollBackward_Line</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 44;
--   <FONT COLOR=red><A NAME="ref_195_4">F_ScrollForward_Page</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 45;
--   <FONT COLOR=red><A NAME="ref_196_4">F_ScrollBackward_Page</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 46;
--   <FONT COLOR=red><A NAME="ref_197_4">F_ScrollForward_HalfPage</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 47;
--   F_ScrollBackward_HalfPage  : <b>constant</b> Form_Request_Code := Key_Max + 48;
-+   <FONT COLOR=red><A NAME="ref_192_4">F_ScrollForward_Line</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 43;
-+   <FONT COLOR=red><A NAME="ref_193_4">F_ScrollBackward_Line</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 44;
-+   <FONT COLOR=red><A NAME="ref_194_4">F_ScrollForward_Page</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 45;
-+   <FONT COLOR=red><A NAME="ref_195_4">F_ScrollBackward_Page</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 46;
-+   <FONT COLOR=red><A NAME="ref_196_4">F_ScrollForward_HalfPage</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 47;
-+   <FONT COLOR=red><A NAME="ref_197_4">F_ScrollBackward_HalfPage</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 48;
- 
-    <FONT COLOR=green><EM>--  Horizontal Scrolling</EM></FONT>
--   <FONT COLOR=red><A NAME="ref_201_4">F_HScrollForward_Char</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 49;
--   <FONT COLOR=red><A NAME="ref_202_4">F_HScrollBackward_Char</A></FONT>     : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 50;
--   <FONT COLOR=red><A NAME="ref_203_4">F_HScrollForward_Line</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 51;
--   <FONT COLOR=red><A NAME="ref_204_4">F_HScrollBackward_Line</A></FONT>     : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 52;
--   <FONT COLOR=red><A NAME="ref_205_4">F_HScrollForward_HalfLine</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 53;
--   F_HScrollBackward_HalfLine : <b>constant</b> Form_Request_Code := Key_Max + 54;
--
--   <FONT COLOR=red><A NAME="ref_208_4">F_Validate_Field</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 55;
--   <FONT COLOR=red><A NAME="ref_209_4">F_Next_Choice</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 56;
--   F_Previous_Choice          : <b>constant</b> Form_Request_Code := Key_Max + 57;
-+   <FONT COLOR=red><A NAME="ref_200_4">F_HScrollForward_Char</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 49;
-+   <FONT COLOR=red><A NAME="ref_201_4">F_HScrollBackward_Char</A></FONT>     : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 50;
-+   <FONT COLOR=red><A NAME="ref_202_4">F_HScrollForward_Line</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 51;
-+   <FONT COLOR=red><A NAME="ref_203_4">F_HScrollBackward_Line</A></FONT>     : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 52;
-+   <FONT COLOR=red><A NAME="ref_204_4">F_HScrollForward_HalfLine</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 53;
-+   <FONT COLOR=red><A NAME="ref_205_4">F_HScrollBackward_HalfLine</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 54;
-+
-+   <FONT COLOR=red><A NAME="ref_207_4">F_Validate_Field</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 55;
-+   <FONT COLOR=red><A NAME="ref_208_4">F_Next_Choice</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 56;
-+   <FONT COLOR=red><A NAME="ref_209_4">F_Previous_Choice</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 57;
- 
-    <FONT COLOR=green><EM>--  For those who like the old 'C' style request names</EM></FONT>
--   REQ_NEXT_PAGE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_146_4">F_Next_Page</A>;
--   REQ_PREV_PAGE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_147_4">F_Previous_Page</A>;
--   REQ_FIRST_PAGE   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_148_4">F_First_Page</A>;
--   REQ_LAST_PAGE    : Form_Request_Code <b>renames</b> F_Last_Page;
--
--   REQ_NEXT_FIELD   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_151_4">F_Next_Field</A>;
--   REQ_PREV_FIELD   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_152_4">F_Previous_Field</A>;
--   REQ_FIRST_FIELD  : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_153_4">F_First_Field</A>;
--   REQ_LAST_FIELD   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_154_4">F_Last_Field</A>;
--   REQ_SNEXT_FIELD  : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_155_4">F_Sorted_Next_Field</A>;
--   REQ_SPREV_FIELD  : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_156_4">F_Sorted_Previous_Field</A>;
--   REQ_SFIRST_FIELD : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_157_4">F_Sorted_First_Field</A>;
--   REQ_SLAST_FIELD  : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_158_4">F_Sorted_Last_Field</A>;
--   REQ_LEFT_FIELD   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_159_4">F_Left_Field</A>;
--   REQ_RIGHT_FIELD  : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_160_4">F_Right_Field</A>;
--   REQ_UP_FIELD     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_161_4">F_Up_Field</A>;
--   REQ_DOWN_FIELD   : Form_Request_Code <b>renames</b> F_Down_Field;
--
--   REQ_NEXT_CHAR    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_164_4">F_Next_Char</A>;
--   REQ_PREV_CHAR    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_165_4">F_Previous_Char</A>;
--   REQ_NEXT_LINE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_166_4">F_Next_Line</A>;
--   REQ_PREV_LINE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_167_4">F_Previous_Line</A>;
--   REQ_NEXT_WORD    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_168_4">F_Next_Word</A>;
--   REQ_PREV_WORD    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_169_4">F_Previous_Word</A>;
--   REQ_BEG_FIELD    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_170_4">F_Begin_Field</A>;
--   REQ_END_FIELD    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_171_4">F_End_Field</A>;
--   REQ_BEG_LINE     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_172_4">F_Begin_Line</A>;
--   REQ_END_LINE     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_173_4">F_End_Line</A>;
--   REQ_LEFT_CHAR    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_174_4">F_Left_Char</A>;
--   REQ_RIGHT_CHAR   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_175_4">F_Right_Char</A>;
--   REQ_UP_CHAR      : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_176_4">F_Up_Char</A>;
--   REQ_DOWN_CHAR    : Form_Request_Code <b>renames</b> F_Down_Char;
--
--   REQ_NEW_LINE     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_179_4">F_New_Line</A>;
--   REQ_INS_CHAR     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_180_4">F_Insert_Char</A>;
--   REQ_INS_LINE     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_181_4">F_Insert_Line</A>;
--   REQ_DEL_CHAR     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_182_4">F_Delete_Char</A>;
--   REQ_DEL_PREV     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_183_4">F_Delete_Previous</A>;
--   REQ_DEL_LINE     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_184_4">F_Delete_Line</A>;
--   REQ_DEL_WORD     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_185_4">F_Delete_Word</A>;
--   REQ_CLR_EOL      : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_186_4">F_Clear_EOL</A>;
--   REQ_CLR_EOF      : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_187_4">F_Clear_EOF</A>;
--   REQ_CLR_FIELD    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_188_4">F_Clear_Field</A>;
--   REQ_OVL_MODE     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_189_4">F_Overlay_Mode</A>;
--   REQ_INS_MODE     : Form_Request_Code <b>renames</b> F_Insert_Mode;
--
--   REQ_SCR_FLINE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_193_4">F_ScrollForward_Line</A>;
--   REQ_SCR_BLINE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_194_4">F_ScrollBackward_Line</A>;
--   REQ_SCR_FPAGE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_195_4">F_ScrollForward_Page</A>;
--   REQ_SCR_BPAGE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_196_4">F_ScrollBackward_Page</A>;
--   REQ_SCR_FHPAGE   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_197_4">F_ScrollForward_HalfPage</A>;
--   REQ_SCR_BHPAGE   : Form_Request_Code <b>renames</b> F_ScrollBackward_HalfPage;
--
--   REQ_SCR_FCHAR    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_201_4">F_HScrollForward_Char</A>;
--   REQ_SCR_BCHAR    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_202_4">F_HScrollBackward_Char</A>;
--   REQ_SCR_HFLINE   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_203_4">F_HScrollForward_Line</A>;
--   REQ_SCR_HBLINE   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_204_4">F_HScrollBackward_Line</A>;
--   REQ_SCR_HFHALF   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_205_4">F_HScrollForward_HalfLine</A>;
--   REQ_SCR_HBHALF   : Form_Request_Code <b>renames</b> F_HScrollBackward_HalfLine;
--
--   REQ_VALIDATION   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_208_4">F_Validate_Field</A>;
--   REQ_NEXT_CHOICE  : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_209_4">F_Next_Choice</A>;
--   REQ_PREV_CHOICE  : Form_Request_Code <b>renames</b> F_Previous_Choice;
-+   REQ_NEXT_PAGE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_145_4">F_Next_Page</A>;
-+   REQ_PREV_PAGE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_146_4">F_Previous_Page</A>;
-+   REQ_FIRST_PAGE   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_147_4">F_First_Page</A>;
-+   REQ_LAST_PAGE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_148_4">F_Last_Page</A>;
-+
-+   REQ_NEXT_FIELD   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_150_4">F_Next_Field</A>;
-+   REQ_PREV_FIELD   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_151_4">F_Previous_Field</A>;
-+   REQ_FIRST_FIELD  : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_152_4">F_First_Field</A>;
-+   REQ_LAST_FIELD   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_153_4">F_Last_Field</A>;
-+   REQ_SNEXT_FIELD  : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_154_4">F_Sorted_Next_Field</A>;
-+   REQ_SPREV_FIELD  : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_155_4">F_Sorted_Previous_Field</A>;
-+   REQ_SFIRST_FIELD : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_156_4">F_Sorted_First_Field</A>;
-+   REQ_SLAST_FIELD  : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_157_4">F_Sorted_Last_Field</A>;
-+   REQ_LEFT_FIELD   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_158_4">F_Left_Field</A>;
-+   REQ_RIGHT_FIELD  : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_159_4">F_Right_Field</A>;
-+   REQ_UP_FIELD     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_160_4">F_Up_Field</A>;
-+   REQ_DOWN_FIELD   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_161_4">F_Down_Field</A>;
-+
-+   REQ_NEXT_CHAR    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_163_4">F_Next_Char</A>;
-+   REQ_PREV_CHAR    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_164_4">F_Previous_Char</A>;
-+   REQ_NEXT_LINE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_165_4">F_Next_Line</A>;
-+   REQ_PREV_LINE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_166_4">F_Previous_Line</A>;
-+   REQ_NEXT_WORD    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_167_4">F_Next_Word</A>;
-+   REQ_PREV_WORD    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_168_4">F_Previous_Word</A>;
-+   REQ_BEG_FIELD    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_169_4">F_Begin_Field</A>;
-+   REQ_END_FIELD    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_170_4">F_End_Field</A>;
-+   REQ_BEG_LINE     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_171_4">F_Begin_Line</A>;
-+   REQ_END_LINE     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_172_4">F_End_Line</A>;
-+   REQ_LEFT_CHAR    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_173_4">F_Left_Char</A>;
-+   REQ_RIGHT_CHAR   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_174_4">F_Right_Char</A>;
-+   REQ_UP_CHAR      : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_175_4">F_Up_Char</A>;
-+   REQ_DOWN_CHAR    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_176_4">F_Down_Char</A>;
-+
-+   REQ_NEW_LINE     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_178_4">F_New_Line</A>;
-+   REQ_INS_CHAR     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_179_4">F_Insert_Char</A>;
-+   REQ_INS_LINE     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_180_4">F_Insert_Line</A>;
-+   REQ_DEL_CHAR     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_181_4">F_Delete_Char</A>;
-+   REQ_DEL_PREV     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_182_4">F_Delete_Previous</A>;
-+   REQ_DEL_LINE     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_183_4">F_Delete_Line</A>;
-+   REQ_DEL_WORD     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_184_4">F_Delete_Word</A>;
-+   REQ_CLR_EOL      : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_185_4">F_Clear_EOL</A>;
-+   REQ_CLR_EOF      : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_186_4">F_Clear_EOF</A>;
-+   REQ_CLR_FIELD    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_187_4">F_Clear_Field</A>;
-+   REQ_OVL_MODE     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_188_4">F_Overlay_Mode</A>;
-+   REQ_INS_MODE     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_189_4">F_Insert_Mode</A>;
-+
-+   REQ_SCR_FLINE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_192_4">F_ScrollForward_Line</A>;
-+   REQ_SCR_BLINE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_193_4">F_ScrollBackward_Line</A>;
-+   REQ_SCR_FPAGE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_194_4">F_ScrollForward_Page</A>;
-+   REQ_SCR_BPAGE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_195_4">F_ScrollBackward_Page</A>;
-+   REQ_SCR_FHPAGE   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_196_4">F_ScrollForward_HalfPage</A>;
-+   REQ_SCR_BHPAGE   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_197_4">F_ScrollBackward_HalfPage</A>;
-+
-+   REQ_SCR_FCHAR    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_200_4">F_HScrollForward_Char</A>;
-+   REQ_SCR_BCHAR    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_201_4">F_HScrollBackward_Char</A>;
-+   REQ_SCR_HFLINE   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_202_4">F_HScrollForward_Line</A>;
-+   REQ_SCR_HBLINE   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_203_4">F_HScrollBackward_Line</A>;
-+   REQ_SCR_HFHALF   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_204_4">F_HScrollForward_HalfLine</A>;
-+   REQ_SCR_HBHALF   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_205_4">F_HScrollBackward_HalfLine</A>;
-+
-+   REQ_VALIDATION   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_207_4">F_Validate_Field</A>;
-+   REQ_NEXT_CHOICE  : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_208_4">F_Next_Choice</A>;
-+   REQ_PREV_CHOICE  : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_209_4">F_Previous_Choice</A>;
- 
--   <b>procedure</b> Request_Name (<FONT COLOR=red><A NAME="ref_277_28" HREF="terminal_interface-curses-forms__adb.htm#ref_82_33">Key</A></FONT>  : <b>in</b> Form_Request_Code;
--                           Name : <b>out</b> String);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_276_14" HREF="terminal_interface-curses-forms__adb.htm#ref_81_14">Request_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_276_28" HREF="terminal_interface-curses-forms__adb.htm#ref_81_28">Key</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A>;
-+                           <FONT COLOR=red><A NAME="ref_277_28" HREF="terminal_interface-curses-forms__adb.htm#ref_82_33">Name</A></FONT> : <b>out</b> String);
- 
--   <b>function</b>  Request_Name (Key : Form_Request_Code) <b>return</b> String;
-+   <b>function</b>  <FONT COLOR=red><A NAME="ref_279_14" HREF="terminal_interface-curses-forms__adb.htm#ref_90_13">Request_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_279_28" HREF="terminal_interface-curses-forms__adb.htm#ref_90_27">Key</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A>) <b>return</b> String;
-    <FONT COLOR=green><EM>--  Same as function</EM></FONT>
-    <b>pragma</b> Inline (Request_Name);
- 
-    <FONT COLOR=green><EM>------------------</EM></FONT>
-    <FONT COLOR=green><EM>--  Exceptions  --</EM></FONT>
-    <FONT COLOR=green><EM>------------------</EM></FONT>
--   Form_Exception : <b>exception</b>;
-+   <FONT COLOR=red><A NAME="ref_286_4">Form_Exception</A></FONT> : <b>exception</b>;
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_field_new.3x.html">form_field_new.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_1"#2|</EM></FONT>
--   <b>function</b> Create (<FONT COLOR=red><A NAME="ref_294_21" HREF="terminal_interface-curses-forms__adb.htm#ref_109_21">Height</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
--                    <FONT COLOR=red><A NAME="ref_295_21" HREF="terminal_interface-curses-forms__adb.htm#ref_110_21">Width</A></FONT>        : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Count</A>;
--                    <FONT COLOR=red><A NAME="ref_296_21" HREF="terminal_interface-curses-forms__adb.htm#ref_111_21">Top</A></FONT>          : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--                    <FONT COLOR=red><A NAME="ref_297_21" HREF="terminal_interface-curses-forms__adb.htm#ref_112_21">Left</A></FONT>         : Column_Position;
--                    <FONT COLOR=red><A NAME="ref_298_21" HREF="terminal_interface-curses-forms__adb.htm#ref_113_21">Off_Screen</A></FONT>   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Natural</A> := 0;
--                    More_Buffers : Buffer_Number := Buffer_Number'First)
--                    <b>return</b> Field;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_293_13" HREF="terminal_interface-curses-forms__adb.htm#ref_108_13">Create</A></FONT> (<FONT COLOR=red><A NAME="ref_293_21" HREF="terminal_interface-curses-forms__adb.htm#ref_108_21">Height</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+                    <FONT COLOR=red><A NAME="ref_294_21" HREF="terminal_interface-curses-forms__adb.htm#ref_109_21">Width</A></FONT>        : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-+                    <FONT COLOR=red><A NAME="ref_295_21" HREF="terminal_interface-curses-forms__adb.htm#ref_110_21">Top</A></FONT>          : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+                    <FONT COLOR=red><A NAME="ref_296_21" HREF="terminal_interface-curses-forms__adb.htm#ref_111_21">Left</A></FONT>         : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+                    <FONT COLOR=red><A NAME="ref_297_21" HREF="terminal_interface-curses-forms__adb.htm#ref_112_21">Off_Screen</A></FONT>   : Natural := 0;
-+                    <FONT COLOR=red><A NAME="ref_298_21" HREF="terminal_interface-curses-forms__adb.htm#ref_113_21">More_Buffers</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Buffer_Number</A> := <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Buffer_Number</A>'First)
-+                    <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_new.3x.html">new_field()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  An overloaded Create is defined later. Pragma Inline appears there.</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_2"#2|</EM></FONT>
--   <b>function</b> New_Field (<FONT COLOR=red><A NAME="ref_305_24">Height</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
--                       <FONT COLOR=red><A NAME="ref_306_24">Width</A></FONT>        : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Count</A>;
--                       <FONT COLOR=red><A NAME="ref_307_24">Top</A></FONT>          : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--                       <FONT COLOR=red><A NAME="ref_308_24">Left</A></FONT>         : Column_Position;
--                       <FONT COLOR=red><A NAME="ref_309_24">Off_Screen</A></FONT>   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Natural</A> := 0;
--                       More_Buffers : Buffer_Number := Buffer_Number'First)
--                       <b>return</b> Field <b>renames</b> Create;
-+   <b>function</b> New_Field (<FONT COLOR=red><A NAME="ref_304_24">Height</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+                       <FONT COLOR=red><A NAME="ref_305_24">Width</A></FONT>        : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-+                       <FONT COLOR=red><A NAME="ref_306_24">Top</A></FONT>          : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+                       <FONT COLOR=red><A NAME="ref_307_24">Left</A></FONT>         : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+                       <FONT COLOR=red><A NAME="ref_308_24">Off_Screen</A></FONT>   : Natural := 0;
-+                       <FONT COLOR=red><A NAME="ref_309_24">More_Buffers</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Buffer_Number</A> := <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Buffer_Number</A>'First)
-+                       <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_293_13">Create</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_new.3x.html">new_field()</A></EM></FONT>
-    <b>pragma</b> Inline (New_Field);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_3"#2|</EM></FONT>
--   <b>procedure</b> Delete (Fld : <b>in</b> <b>out</b> Field);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_315_14" HREF="terminal_interface-curses-forms__adb.htm#ref_131_14">Delete</A></FONT> (<FONT COLOR=red><A NAME="ref_315_22" HREF="terminal_interface-curses-forms__adb.htm#ref_131_22">Fld</A></FONT> : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_new.3x.html">free_field()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  Reset Fld to Null_Field</EM></FONT>
-    <FONT COLOR=green><EM>--  An overloaded Delete is defined later. Pragma Inline appears there.</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_4"#2|</EM></FONT>
--   <b>function</b> Duplicate (<FONT COLOR=red><A NAME="ref_322_24" HREF="terminal_interface-curses-forms__adb.htm#ref_148_24">Fld</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Field</A>;
--                       <FONT COLOR=red><A NAME="ref_323_24" HREF="terminal_interface-curses-forms__adb.htm#ref_149_24">Top</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--                       Left : Column_Position) <b>return</b> Field;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_321_13" HREF="terminal_interface-curses-forms__adb.htm#ref_147_13">Duplicate</A></FONT> (<FONT COLOR=red><A NAME="ref_321_24" HREF="terminal_interface-curses-forms__adb.htm#ref_147_24">Fld</A></FONT>  : <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+                       <FONT COLOR=red><A NAME="ref_322_24" HREF="terminal_interface-curses-forms__adb.htm#ref_148_24">Top</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+                       <FONT COLOR=red><A NAME="ref_323_24" HREF="terminal_interface-curses-forms__adb.htm#ref_149_24">Left</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_new.3x.html">dup_field()</A></EM></FONT>
-    <b>pragma</b> Inline (Duplicate);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_5"#2|</EM></FONT>
--   <b>function</b> Link (<FONT COLOR=red><A NAME="ref_329_19" HREF="terminal_interface-curses-forms__adb.htm#ref_169_19">Fld</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Field</A>;
--                  <FONT COLOR=red><A NAME="ref_330_19" HREF="terminal_interface-curses-forms__adb.htm#ref_170_19">Top</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--                  Left : Column_Position) <b>return</b> Field;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_328_13" HREF="terminal_interface-curses-forms__adb.htm#ref_168_13">Link</A></FONT> (<FONT COLOR=red><A NAME="ref_328_19" HREF="terminal_interface-curses-forms__adb.htm#ref_168_19">Fld</A></FONT>  : <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+                  <FONT COLOR=red><A NAME="ref_329_19" HREF="terminal_interface-curses-forms__adb.htm#ref_169_19">Top</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+                  <FONT COLOR=red><A NAME="ref_330_19" HREF="terminal_interface-curses-forms__adb.htm#ref_170_19">Left</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_new.3x.html">link_field()</A></EM></FONT>
--   <b>pragma</b> Inline (Link);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_328_13">Link</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_field_just.3x.html">form_field_just.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_6"#2|</EM></FONT>
--   <b>procedure</b> Set_Justification (<FONT COLOR=red><A NAME="ref_340_33" HREF="terminal_interface-curses-forms__adb.htm#ref_194_33">Fld</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_62_9">Field</A>;
--                                Just : <b>in</b> Field_Justification := None);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_339_14" HREF="terminal_interface-curses-forms__adb.htm#ref_193_14">Set_Justification</A></FONT> (<FONT COLOR=red><A NAME="ref_339_33" HREF="terminal_interface-curses-forms__adb.htm#ref_193_33">Fld</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+                                <FONT COLOR=red><A NAME="ref_340_33" HREF="terminal_interface-curses-forms__adb.htm#ref_194_33">Just</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_62_9">Field_Justification</A> := <A HREF="terminal_interface-curses-forms__ads.htm#ref_62_33">None</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_just.3x.html">set_field_just()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Justification);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_339_14">Set_Justification</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_7"#2|</EM></FONT>
--   <b>function</b> Get_Justification (Fld : Field) <b>return</b> Field_Justification;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_345_13" HREF="terminal_interface-curses-forms__adb.htm#ref_211_13">Get_Justification</A></FONT> (<FONT COLOR=red><A NAME="ref_345_32" HREF="terminal_interface-curses-forms__adb.htm#ref_211_32">Fld</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>) <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_62_9">Field_Justification</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_just.3x.html">field_just()</A></EM></FONT>
--   <b>pragma</b> Inline (Get_Justification);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_345_13">Get_Justification</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_field_buffer.3x.html">form_field_buffer.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_8"#2|</EM></FONT>
--   <b>procedure</b> Set_Buffer
--     (<FONT COLOR=red><A NAME="ref_356_7" HREF="terminal_interface-curses-forms__adb.htm#ref_227_7">Fld</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Field</A>;
--      <FONT COLOR=red><A NAME="ref_357_7" HREF="terminal_interface-curses-forms__adb.htm#ref_228_7">Buffer</A></FONT> : <b>in</b> Buffer_Number := Buffer_Number'First;
--      Str    : <b>in</b> String);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_354_14" HREF="terminal_interface-curses-forms__adb.htm#ref_225_14">Set_Buffer</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_355_7" HREF="terminal_interface-curses-forms__adb.htm#ref_226_7">Fld</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+      <FONT COLOR=red><A NAME="ref_356_7" HREF="terminal_interface-curses-forms__adb.htm#ref_227_7">Buffer</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Buffer_Number</A> := <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Buffer_Number</A>'First;
-+      <FONT COLOR=red><A NAME="ref_357_7" HREF="terminal_interface-curses-forms__adb.htm#ref_228_7">Str</A></FONT>    : <b>in</b> String);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_buffer.3x.html">set_field_buffer()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  Not inlined</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_9"#2|</EM></FONT>
--   <b>procedure</b> Get_Buffer
--     (<FONT COLOR=red><A NAME="ref_364_7" HREF="terminal_interface-curses-forms__adb.htm#ref_252_7">Fld</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Field</A>;
--      <FONT COLOR=red><A NAME="ref_365_7" HREF="terminal_interface-curses-forms__adb.htm#ref_253_7">Buffer</A></FONT> : <b>in</b> Buffer_Number := Buffer_Number'First;
--      Str    : <b>out</b> String);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_362_14" HREF="terminal_interface-curses-forms__adb.htm#ref_250_14">Get_Buffer</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_363_7" HREF="terminal_interface-curses-forms__adb.htm#ref_251_7">Fld</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+      <FONT COLOR=red><A NAME="ref_364_7" HREF="terminal_interface-curses-forms__adb.htm#ref_252_7">Buffer</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Buffer_Number</A> := <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Buffer_Number</A>'First;
-+      <FONT COLOR=red><A NAME="ref_365_7" HREF="terminal_interface-curses-forms__adb.htm#ref_253_7">Str</A></FONT>    : <b>out</b> String);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_buffer.3x.html">field_buffer()</A></EM></FONT>
- 
--   <b>function</b> Get_Buffer
--     (<FONT COLOR=red><A NAME="ref_370_7" HREF="terminal_interface-curses-forms__adb.htm#ref_264_7">Fld</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Field</A>;
--      Buffer : <b>in</b> Buffer_Number := Buffer_Number'First) <b>return</b> String;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_368_13" HREF="terminal_interface-curses-forms__adb.htm#ref_262_13">Get_Buffer</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_369_7" HREF="terminal_interface-curses-forms__adb.htm#ref_263_7">Fld</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+      <FONT COLOR=red><A NAME="ref_370_7" HREF="terminal_interface-curses-forms__adb.htm#ref_264_7">Buffer</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Buffer_Number</A> := <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Buffer_Number</A>'First) <b>return</b> String;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_buffer.3x.html">field_buffer()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  Same but as function</EM></FONT>
-    <b>pragma</b> Inline (Get_Buffer);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_10"#2|</EM></FONT>
--   <b>procedure</b> Set_Status (<FONT COLOR=red><A NAME="ref_377_26" HREF="terminal_interface-curses-forms__adb.htm#ref_276_26">Fld</A></FONT>    : <b>in</b> Field;
--                         Status : <b>in</b> Boolean := True);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_376_14" HREF="terminal_interface-curses-forms__adb.htm#ref_275_14">Set_Status</A></FONT> (<FONT COLOR=red><A NAME="ref_376_26" HREF="terminal_interface-curses-forms__adb.htm#ref_275_26">Fld</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+                         <FONT COLOR=red><A NAME="ref_377_26" HREF="terminal_interface-curses-forms__adb.htm#ref_276_26">Status</A></FONT> : <b>in</b> Boolean := True);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_buffer.3x.html">set_field_status()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Status);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_376_14">Set_Status</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_11"#2|</EM></FONT>
--   <b>function</b> Changed (Fld : Field) <b>return</b> Boolean;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_382_13" HREF="terminal_interface-curses-forms__adb.htm#ref_291_13">Changed</A></FONT> (<FONT COLOR=red><A NAME="ref_382_22" HREF="terminal_interface-curses-forms__adb.htm#ref_291_22">Fld</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>) <b>return</b> Boolean;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_buffer.3x.html">field_status()</A></EM></FONT>
--   <b>pragma</b> Inline (Changed);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_382_13">Changed</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_12"#2|</EM></FONT>
--   <b>procedure</b> Set_Maximum_Size (<FONT COLOR=red><A NAME="ref_388_32" HREF="terminal_interface-curses-forms__adb.htm#ref_308_32">Fld</A></FONT> : <b>in</b> Field;
--                               Max : <b>in</b> Natural := 0);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_387_14" HREF="terminal_interface-curses-forms__adb.htm#ref_307_14">Set_Maximum_Size</A></FONT> (<FONT COLOR=red><A NAME="ref_387_32" HREF="terminal_interface-curses-forms__adb.htm#ref_307_32">Fld</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+                               <FONT COLOR=red><A NAME="ref_388_32" HREF="terminal_interface-curses-forms__adb.htm#ref_308_32">Max</A></FONT> : <b>in</b> Natural := 0);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_buffer.3x.html">set_field_max()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Maximum_Size);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_387_14">Set_Maximum_Size</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_field_opts.3x.html">form_field_opts.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_13"#2|</EM></FONT>
--   <b>procedure</b> Set_Options (<FONT COLOR=red><A NAME="ref_398_27" HREF="terminal_interface-curses-forms__adb.htm#ref_328_27">Fld</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_68_9">Field</A>;
--                          Options : <b>in</b> Field_Option_Set);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_397_14" HREF="terminal_interface-curses-forms__adb.htm#ref_327_14">Set_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_397_27" HREF="terminal_interface-curses-forms__adb.htm#ref_327_27">Fld</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+                          <FONT COLOR=red><A NAME="ref_398_27" HREF="terminal_interface-curses-forms__adb.htm#ref_328_27">Options</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_68_9">Field_Option_Set</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_opts.3x.html">set_field_opts()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  An overloaded version is defined later. Pragma Inline appears there</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_14"#2|</EM></FONT>
--   <b>procedure</b> Switch_Options (<FONT COLOR=red><A NAME="ref_404_30" HREF="terminal_interface-curses-forms__adb.htm#ref_346_30">Fld</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_68_9">Field</A>;
--                             <FONT COLOR=red><A NAME="ref_405_30" HREF="terminal_interface-curses-forms__adb.htm#ref_347_30">Options</A></FONT> : <b>in</b> Field_Option_Set;
--                             On      : Boolean := True);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_403_14" HREF="terminal_interface-curses-forms__adb.htm#ref_345_14">Switch_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_403_30" HREF="terminal_interface-curses-forms__adb.htm#ref_345_30">Fld</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+                             <FONT COLOR=red><A NAME="ref_404_30" HREF="terminal_interface-curses-forms__adb.htm#ref_346_30">Options</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_68_9">Field_Option_Set</A>;
-+                             <FONT COLOR=red><A NAME="ref_405_30" HREF="terminal_interface-curses-forms__adb.htm#ref_347_30">On</A></FONT>      : Boolean := True);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_opts.3x.html">field_opts_on()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: field_opts_off()</EM></FONT>
-    <FONT COLOR=green><EM>--  An overloaded version is defined later. Pragma Inline appears there</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_15"#2|</EM></FONT>
--   <b>procedure</b> Get_Options (<FONT COLOR=red><A NAME="ref_412_27" HREF="terminal_interface-curses-forms__adb.htm#ref_372_27">Fld</A></FONT>     : <b>in</b>  <A HREF="terminal_interface-curses-forms__ads.htm#ref_68_9">Field</A>;
--                          Options : <b>out</b> Field_Option_Set);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_411_14" HREF="terminal_interface-curses-forms__adb.htm#ref_371_14">Get_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_411_27" HREF="terminal_interface-curses-forms__adb.htm#ref_371_27">Fld</A></FONT>     : <b>in</b>  <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+                          <FONT COLOR=red><A NAME="ref_412_27" HREF="terminal_interface-curses-forms__adb.htm#ref_372_27">Options</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_68_9">Field_Option_Set</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_opts.3x.html">field_opts()</A></EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_16"#2|</EM></FONT>
--   <b>function</b> Get_Options (Fld : Field := Null_Field)
--                         <b>return</b> Field_Option_Set;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_416_13" HREF="terminal_interface-curses-forms__adb.htm#ref_384_13">Get_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_416_26" HREF="terminal_interface-curses-forms__adb.htm#ref_384_26">Fld</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A> := <A HREF="terminal_interface-curses-forms__ads.htm#ref_59_4">Null_Field</A>)
-+                         <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_68_9">Field_Option_Set</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_opts.3x.html">field_opts()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  An overloaded version is defined later. Pragma Inline appears there</EM></FONT>
- 
-@@ -429,161 +428,161 @@
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_17"#2|</EM></FONT>
--   <b>procedure</b> Set_Foreground
--     (<FONT COLOR=red><A NAME="ref_428_7" HREF="terminal_interface-curses-forms__adb.htm#ref_401_7">Fld</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Field</A>;
--      <FONT COLOR=red><A NAME="ref_429_7" HREF="terminal_interface-curses-forms__adb.htm#ref_402_7">Fore</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character_Attribute_Set</A> := Normal_Video;
--      Color : <b>in</b> Color_Pair := Color_Pair'First);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_426_14" HREF="terminal_interface-curses-forms__adb.htm#ref_399_14">Set_Foreground</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_427_7" HREF="terminal_interface-curses-forms__adb.htm#ref_400_7">Fld</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+      <FONT COLOR=red><A NAME="ref_428_7" HREF="terminal_interface-curses-forms__adb.htm#ref_401_7">Fore</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-+      <FONT COLOR=red><A NAME="ref_429_7" HREF="terminal_interface-curses-forms__adb.htm#ref_402_7">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_attributes.3x.html">set_field_fore()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Foreground);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_426_14">Set_Foreground</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_18"#2|</EM></FONT>
--   <b>procedure</b> Foreground (<FONT COLOR=red><A NAME="ref_435_26" HREF="terminal_interface-curses-forms__adb.htm#ref_422_26">Fld</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Field</A>;
--                         Fore : <b>out</b> Character_Attribute_Set);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_434_14" HREF="terminal_interface-curses-forms__adb.htm#ref_421_14">Foreground</A></FONT> (<FONT COLOR=red><A NAME="ref_434_26" HREF="terminal_interface-curses-forms__adb.htm#ref_421_26">Fld</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+                         <FONT COLOR=red><A NAME="ref_435_26" HREF="terminal_interface-curses-forms__adb.htm#ref_422_26">Fore</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_attributes.3x.html">field_fore()</A></EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_19"#2|</EM></FONT>
--   <b>procedure</b> Foreground (<FONT COLOR=red><A NAME="ref_440_26" HREF="terminal_interface-curses-forms__adb.htm#ref_431_26">Fld</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Field</A>;
--                         <FONT COLOR=red><A NAME="ref_441_26" HREF="terminal_interface-curses-forms__adb.htm#ref_432_26">Fore</A></FONT>  : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character_Attribute_Set</A>;
--                         Color : <b>out</b> Color_Pair);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_439_14" HREF="terminal_interface-curses-forms__adb.htm#ref_430_14">Foreground</A></FONT> (<FONT COLOR=red><A NAME="ref_439_26" HREF="terminal_interface-curses-forms__adb.htm#ref_430_26">Fld</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+                         <FONT COLOR=red><A NAME="ref_440_26" HREF="terminal_interface-curses-forms__adb.htm#ref_431_26">Fore</A></FONT>  : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>;
-+                         <FONT COLOR=red><A NAME="ref_441_26" HREF="terminal_interface-curses-forms__adb.htm#ref_432_26">Color</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_attributes.3x.html">field_fore()</A></EM></FONT>
-    <b>pragma</b> Inline (Foreground);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_20"#2|</EM></FONT>
--   <b>procedure</b> Set_Background
--     (<FONT COLOR=red><A NAME="ref_448_7" HREF="terminal_interface-curses-forms__adb.htm#ref_445_7">Fld</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Field</A>;
--      <FONT COLOR=red><A NAME="ref_449_7" HREF="terminal_interface-curses-forms__adb.htm#ref_446_7">Back</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character_Attribute_Set</A> := Normal_Video;
--      Color : <b>in</b> Color_Pair := Color_Pair'First);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_446_14" HREF="terminal_interface-curses-forms__adb.htm#ref_443_14">Set_Background</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_447_7" HREF="terminal_interface-curses-forms__adb.htm#ref_444_7">Fld</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+      <FONT COLOR=red><A NAME="ref_448_7" HREF="terminal_interface-curses-forms__adb.htm#ref_445_7">Back</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-+      <FONT COLOR=red><A NAME="ref_449_7" HREF="terminal_interface-curses-forms__adb.htm#ref_446_7">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_attributes.3x.html">set_field_back()</A></EM></FONT>
-    <b>pragma</b> Inline (Set_Background);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_21"#2|</EM></FONT>
--   <b>procedure</b> Background (<FONT COLOR=red><A NAME="ref_455_26" HREF="terminal_interface-curses-forms__adb.htm#ref_466_26">Fld</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Field</A>;
--                         Back : <b>out</b> Character_Attribute_Set);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_454_14" HREF="terminal_interface-curses-forms__adb.htm#ref_465_14">Background</A></FONT> (<FONT COLOR=red><A NAME="ref_454_26" HREF="terminal_interface-curses-forms__adb.htm#ref_465_26">Fld</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+                         <FONT COLOR=red><A NAME="ref_455_26" HREF="terminal_interface-curses-forms__adb.htm#ref_466_26">Back</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_attributes.3x.html">field_back()</A></EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_22"#2|</EM></FONT>
--   <b>procedure</b> Background (<FONT COLOR=red><A NAME="ref_460_26" HREF="terminal_interface-curses-forms__adb.htm#ref_475_26">Fld</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Field</A>;
--                         <FONT COLOR=red><A NAME="ref_461_26" HREF="terminal_interface-curses-forms__adb.htm#ref_476_26">Back</A></FONT>  : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character_Attribute_Set</A>;
--                         Color : <b>out</b> Color_Pair);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_459_14" HREF="terminal_interface-curses-forms__adb.htm#ref_474_14">Background</A></FONT> (<FONT COLOR=red><A NAME="ref_459_26" HREF="terminal_interface-curses-forms__adb.htm#ref_474_26">Fld</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+                         <FONT COLOR=red><A NAME="ref_460_26" HREF="terminal_interface-curses-forms__adb.htm#ref_475_26">Back</A></FONT>  : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>;
-+                         <FONT COLOR=red><A NAME="ref_461_26" HREF="terminal_interface-curses-forms__adb.htm#ref_476_26">Color</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_attributes.3x.html">field_back()</A></EM></FONT>
-    <b>pragma</b> Inline (Background);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_23"#2|</EM></FONT>
--   <b>procedure</b> Set_Pad_Character (<FONT COLOR=red><A NAME="ref_467_33" HREF="terminal_interface-curses-forms__adb.htm#ref_488_33">Fld</A></FONT> : <b>in</b> Field;
--                                Pad : <b>in</b> Character := Space);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_466_14" HREF="terminal_interface-curses-forms__adb.htm#ref_487_14">Set_Pad_Character</A></FONT> (<FONT COLOR=red><A NAME="ref_466_33" HREF="terminal_interface-curses-forms__adb.htm#ref_487_33">Fld</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+                                <FONT COLOR=red><A NAME="ref_467_33" HREF="terminal_interface-curses-forms__adb.htm#ref_488_33">Pad</A></FONT> : <b>in</b> Character := Space);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_attributes.3x.html">set_field_pad()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Pad_Character);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_466_14">Set_Pad_Character</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_24"#2|</EM></FONT>
--   <b>procedure</b> Pad_Character (<FONT COLOR=red><A NAME="ref_473_29" HREF="terminal_interface-curses-forms__adb.htm#ref_505_29">Fld</A></FONT> : <b>in</b>  Field;
--                            Pad : <b>out</b> Character);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_472_14" HREF="terminal_interface-curses-forms__adb.htm#ref_504_14">Pad_Character</A></FONT> (<FONT COLOR=red><A NAME="ref_472_29" HREF="terminal_interface-curses-forms__adb.htm#ref_504_29">Fld</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+                            <FONT COLOR=red><A NAME="ref_473_29" HREF="terminal_interface-curses-forms__adb.htm#ref_505_29">Pad</A></FONT> : <b>out</b> Character);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_attributes.3x.html">field_pad()</A></EM></FONT>
--   <b>pragma</b> Inline (Pad_Character);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_472_14">Pad_Character</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_field_info.3x.html">form_field_info.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_25"#2|</EM></FONT>
--   <b>procedure</b> Info (<FONT COLOR=red><A NAME="ref_483_20" HREF="terminal_interface-curses-forms__adb.htm#ref_520_20">Fld</A></FONT>                : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Field</A>;
--                   <FONT COLOR=red><A NAME="ref_484_20" HREF="terminal_interface-curses-forms__adb.htm#ref_521_20">Lines</A></FONT>              : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
--                   <FONT COLOR=red><A NAME="ref_485_20" HREF="terminal_interface-curses-forms__adb.htm#ref_522_20">Columns</A></FONT>            : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Count</A>;
--                   <FONT COLOR=red><A NAME="ref_486_20" HREF="terminal_interface-curses-forms__adb.htm#ref_523_20">First_Row</A></FONT>          : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--                   <FONT COLOR=red><A NAME="ref_487_20" HREF="terminal_interface-curses-forms__adb.htm#ref_524_20">First_Column</A></FONT>       : <b>out</b> Column_Position;
--                   <FONT COLOR=red><A NAME="ref_488_20" HREF="terminal_interface-curses-forms__adb.htm#ref_525_20">Off_Screen</A></FONT>         : <b>out</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Natural</A>;
--                   Additional_Buffers : <b>out</b> Buffer_Number);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_482_14" HREF="terminal_interface-curses-forms__adb.htm#ref_519_14">Info</A></FONT> (<FONT COLOR=red><A NAME="ref_482_20" HREF="terminal_interface-curses-forms__adb.htm#ref_519_20">Fld</A></FONT>                : <b>in</b>  <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+                   <FONT COLOR=red><A NAME="ref_483_20" HREF="terminal_interface-curses-forms__adb.htm#ref_520_20">Lines</A></FONT>              : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+                   <FONT COLOR=red><A NAME="ref_484_20" HREF="terminal_interface-curses-forms__adb.htm#ref_521_20">Columns</A></FONT>            : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-+                   <FONT COLOR=red><A NAME="ref_485_20" HREF="terminal_interface-curses-forms__adb.htm#ref_522_20">First_Row</A></FONT>          : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+                   <FONT COLOR=red><A NAME="ref_486_20" HREF="terminal_interface-curses-forms__adb.htm#ref_523_20">First_Column</A></FONT>       : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+                   <FONT COLOR=red><A NAME="ref_487_20" HREF="terminal_interface-curses-forms__adb.htm#ref_524_20">Off_Screen</A></FONT>         : <b>out</b> Natural;
-+                   <FONT COLOR=red><A NAME="ref_488_20" HREF="terminal_interface-curses-forms__adb.htm#ref_525_20">Additional_Buffers</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Buffer_Number</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_info.3x.html">field_info()</A></EM></FONT>
--   <b>pragma</b> Inline (Info);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_482_14">Info</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_26"#2|</EM></FONT>
--   <b>procedure</b> Dynamic_Info (<FONT COLOR=red><A NAME="ref_494_28" HREF="terminal_interface-curses-forms__adb.htm#ref_554_28">Fld</A></FONT>     : <b>in</b> Field;
--                           <FONT COLOR=red><A NAME="ref_495_28" HREF="terminal_interface-curses-forms__adb.htm#ref_555_28">Lines</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
--                           <FONT COLOR=red><A NAME="ref_496_28" HREF="terminal_interface-curses-forms__adb.htm#ref_556_28">Columns</A></FONT> : <b>out</b> Column_Count;
--                           Max     : <b>out</b> Natural);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_493_14" HREF="terminal_interface-curses-forms__adb.htm#ref_553_14">Dynamic_Info</A></FONT> (<FONT COLOR=red><A NAME="ref_493_28" HREF="terminal_interface-curses-forms__adb.htm#ref_553_28">Fld</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+                           <FONT COLOR=red><A NAME="ref_494_28" HREF="terminal_interface-curses-forms__adb.htm#ref_554_28">Lines</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+                           <FONT COLOR=red><A NAME="ref_495_28" HREF="terminal_interface-curses-forms__adb.htm#ref_555_28">Columns</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-+                           <FONT COLOR=red><A NAME="ref_496_28" HREF="terminal_interface-curses-forms__adb.htm#ref_556_28">Max</A></FONT>     : <b>out</b> Natural);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_info.3x.html">dynamic_field_info()</A></EM></FONT>
--   <b>pragma</b> Inline (Dynamic_Info);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_493_14">Dynamic_Info</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_win.3x.html">form_win.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_27"#2|</EM></FONT>
--   <b>procedure</b> Set_Window (<FONT COLOR=red><A NAME="ref_506_26" HREF="terminal_interface-curses-forms__adb.htm#ref_583_26">Frm</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Form</A>;
--                         Win : <b>in</b> Window);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_505_14" HREF="terminal_interface-curses-forms__adb.htm#ref_582_14">Set_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_505_26" HREF="terminal_interface-curses-forms__adb.htm#ref_582_26">Frm</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-+                         <FONT COLOR=red><A NAME="ref_506_26" HREF="terminal_interface-curses-forms__adb.htm#ref_583_26">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_win.3x.html">set_form_win()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Window);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_505_14">Set_Window</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_28"#2|</EM></FONT>
--   <b>function</b> Get_Window (Frm : Form) <b>return</b> Window;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_511_13" HREF="terminal_interface-curses-forms__adb.htm#ref_598_13">Get_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_511_25" HREF="terminal_interface-curses-forms__adb.htm#ref_598_25">Frm</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_win.3x.html">form_win()</A></EM></FONT>
--   <b>pragma</b> Inline (Get_Window);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_511_13">Get_Window</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_29"#2|</EM></FONT>
--   <b>procedure</b> Set_Sub_Window (<FONT COLOR=red><A NAME="ref_517_30" HREF="terminal_interface-curses-forms__adb.htm#ref_611_30">Frm</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Form</A>;
--                             Win : <b>in</b> Window);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_516_14" HREF="terminal_interface-curses-forms__adb.htm#ref_610_14">Set_Sub_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_516_30" HREF="terminal_interface-curses-forms__adb.htm#ref_610_30">Frm</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-+                             <FONT COLOR=red><A NAME="ref_517_30" HREF="terminal_interface-curses-forms__adb.htm#ref_611_30">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_win.3x.html">set_form_sub()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Sub_Window);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_516_14">Set_Sub_Window</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_30"#2|</EM></FONT>
--   <b>function</b> Get_Sub_Window (Frm : Form) <b>return</b> Window;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_522_13" HREF="terminal_interface-curses-forms__adb.htm#ref_626_13">Get_Sub_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_522_29" HREF="terminal_interface-curses-forms__adb.htm#ref_626_29">Frm</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_win.3x.html">form_sub()</A></EM></FONT>
--   <b>pragma</b> Inline (Get_Sub_Window);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_522_13">Get_Sub_Window</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_31"#2|</EM></FONT>
--   <b>procedure</b> Scale (<FONT COLOR=red><A NAME="ref_528_21" HREF="terminal_interface-curses-forms__adb.htm#ref_639_21">Frm</A></FONT>     : <b>in</b> Form;
--                    <FONT COLOR=red><A NAME="ref_529_21" HREF="terminal_interface-curses-forms__adb.htm#ref_640_21">Lines</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
--                    Columns : <b>out</b> Column_Count);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_527_14" HREF="terminal_interface-curses-forms__adb.htm#ref_638_14">Scale</A></FONT> (<FONT COLOR=red><A NAME="ref_527_21" HREF="terminal_interface-curses-forms__adb.htm#ref_638_21">Frm</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-+                    <FONT COLOR=red><A NAME="ref_528_21" HREF="terminal_interface-curses-forms__adb.htm#ref_639_21">Lines</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+                    <FONT COLOR=red><A NAME="ref_529_21" HREF="terminal_interface-curses-forms__adb.htm#ref_640_21">Columns</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_win.3x.html">scale_form()</A></EM></FONT>
--   <b>pragma</b> Inline (Scale);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_527_14">Scale</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_hook.3x.html">form_hook.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <b>type</b> Form_Hook_Function <b>is</b> <b>access</b> <b>procedure</b> (Frm : <b>in</b> Form);
--   <b>pragma</b> Convention (C, Form_Hook_Function);
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_537_9">Form_Hook_Function</A></FONT> <b>is</b> <b>access</b> <b>procedure</b> (<FONT COLOR=red><A NAME="ref_537_49">Frm</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>);
-+   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms__ads.htm#ref_537_9">Form_Hook_Function</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_32"#2|</EM></FONT>
--   <b>procedure</b> Set_Field_Init_Hook (<FONT COLOR=red><A NAME="ref_542_35" HREF="terminal_interface-curses-forms__adb.htm#ref_663_35">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_537_9">Form</A>;
--                                  Proc : <b>in</b> Form_Hook_Function);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_541_14" HREF="terminal_interface-curses-forms__adb.htm#ref_662_14">Set_Field_Init_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_541_35" HREF="terminal_interface-curses-forms__adb.htm#ref_662_35">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-+                                  <FONT COLOR=red><A NAME="ref_542_35" HREF="terminal_interface-curses-forms__adb.htm#ref_663_35">Proc</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_537_9">Form_Hook_Function</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_hook.3x.html">set_field_init()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Field_Init_Hook);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_541_14">Set_Field_Init_Hook</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_33"#2|</EM></FONT>
--   <b>procedure</b> Set_Field_Term_Hook (<FONT COLOR=red><A NAME="ref_548_35" HREF="terminal_interface-curses-forms__adb.htm#ref_679_35">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_537_9">Form</A>;
--                                  Proc : <b>in</b> Form_Hook_Function);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_547_14" HREF="terminal_interface-curses-forms__adb.htm#ref_678_14">Set_Field_Term_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_547_35" HREF="terminal_interface-curses-forms__adb.htm#ref_678_35">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-+                                  <FONT COLOR=red><A NAME="ref_548_35" HREF="terminal_interface-curses-forms__adb.htm#ref_679_35">Proc</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_537_9">Form_Hook_Function</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_hook.3x.html">set_field_term()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Field_Term_Hook);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_547_14">Set_Field_Term_Hook</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_34"#2|</EM></FONT>
--   <b>procedure</b> Set_Form_Init_Hook (<FONT COLOR=red><A NAME="ref_554_34" HREF="terminal_interface-curses-forms__adb.htm#ref_695_34">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_537_9">Form</A>;
--                                 Proc : <b>in</b> Form_Hook_Function);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_553_14" HREF="terminal_interface-curses-forms__adb.htm#ref_694_14">Set_Form_Init_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_553_34" HREF="terminal_interface-curses-forms__adb.htm#ref_694_34">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-+                                 <FONT COLOR=red><A NAME="ref_554_34" HREF="terminal_interface-curses-forms__adb.htm#ref_695_34">Proc</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_537_9">Form_Hook_Function</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_hook.3x.html">set_form_init()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Form_Init_Hook);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_553_14">Set_Form_Init_Hook</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_35"#2|</EM></FONT>
--   <b>procedure</b> Set_Form_Term_Hook (<FONT COLOR=red><A NAME="ref_560_34" HREF="terminal_interface-curses-forms__adb.htm#ref_711_34">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_537_9">Form</A>;
--                                 Proc : <b>in</b> Form_Hook_Function);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_559_14" HREF="terminal_interface-curses-forms__adb.htm#ref_710_14">Set_Form_Term_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_559_34" HREF="terminal_interface-curses-forms__adb.htm#ref_710_34">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-+                                 <FONT COLOR=red><A NAME="ref_560_34" HREF="terminal_interface-curses-forms__adb.htm#ref_711_34">Proc</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_537_9">Form_Hook_Function</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_hook.3x.html">set_form_term()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Form_Term_Hook);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_559_14">Set_Form_Term_Hook</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_36"#2|</EM></FONT>
--   <b>function</b> Get_Field_Init_Hook (Frm : Form) <b>return</b> Form_Hook_Function;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_565_13">Get_Field_Init_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_565_34" HREF="terminal_interface-curses-forms__ads.htm#ref_565_13">Frm</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>) <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_537_9">Form_Hook_Function</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_hook.3x.html">field_init()</A></EM></FONT>
-    <b>pragma</b> Import (C, Get_Field_Init_Hook, "field_init");
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_37"#2|</EM></FONT>
--   <b>function</b> Get_Field_Term_Hook (Frm : Form) <b>return</b> Form_Hook_Function;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_570_13">Get_Field_Term_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_570_34" HREF="terminal_interface-curses-forms__ads.htm#ref_570_13">Frm</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>) <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_537_9">Form_Hook_Function</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_hook.3x.html">field_term()</A></EM></FONT>
-    <b>pragma</b> Import (C, Get_Field_Term_Hook, "field_term");
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_38"#2|</EM></FONT>
--   <b>function</b> Get_Form_Init_Hook (Frm : Form) <b>return</b> Form_Hook_Function;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_575_13">Get_Form_Init_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_575_33" HREF="terminal_interface-curses-forms__ads.htm#ref_575_13">Frm</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>) <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_537_9">Form_Hook_Function</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_hook.3x.html">form_init()</A></EM></FONT>
-    <b>pragma</b> Import (C, Get_Form_Init_Hook, "form_init");
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_39"#2|</EM></FONT>
--   <b>function</b> Get_Form_Term_Hook (Frm : Form) <b>return</b> Form_Hook_Function;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_580_13">Get_Form_Term_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_580_33" HREF="terminal_interface-curses-forms__ads.htm#ref_580_13">Frm</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>) <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_537_9">Form_Hook_Function</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_hook.3x.html">form_term()</A></EM></FONT>
-    <b>pragma</b> Import (C, Get_Form_Term_Hook, "form_term");
- 
-@@ -592,52 +591,52 @@
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_40"#2|</EM></FONT>
--   <b>procedure</b> Redefine (<FONT COLOR=red><A NAME="ref_590_24" HREF="terminal_interface-curses-forms__adb.htm#ref_731_24">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_134_9">Form</A>;
--                       Flds : <b>in</b> Field_Array_Access);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_589_14" HREF="terminal_interface-curses-forms__adb.htm#ref_730_14">Redefine</A></FONT> (<FONT COLOR=red><A NAME="ref_589_24" HREF="terminal_interface-curses-forms__adb.htm#ref_730_24">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-+                       <FONT COLOR=red><A NAME="ref_590_24" HREF="terminal_interface-curses-forms__adb.htm#ref_731_24">Flds</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_134_9">Field_Array_Access</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field.3x.html">set_form_fields()</A></EM></FONT>
--   <b>pragma</b> Inline (Redefine);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_589_14">Redefine</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_41"#2|</EM></FONT>
--   <b>procedure</b> Set_Fields (<FONT COLOR=red><A NAME="ref_596_26">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_134_9">Form</A>;
--                         Flds : <b>in</b> Field_Array_Access) <b>renames</b> Redefine;
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_595_14">Set_Fields</A></FONT> (<FONT COLOR=red><A NAME="ref_595_26">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-+                         <FONT COLOR=red><A NAME="ref_596_26">Flds</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_134_9">Field_Array_Access</A>) <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_589_14">Redefine</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field.3x.html">set_form_fields()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  pragma Inline (Set_Fields);</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_42"#2|</EM></FONT>
--   <b>function</b> Fields (<FONT COLOR=red><A NAME="ref_602_21" HREF="terminal_interface-curses-forms__adb.htm#ref_753_21">Frm</A></FONT>   : Form;
--                    Index : Positive) <b>return</b> Field;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_601_13" HREF="terminal_interface-curses-forms__adb.htm#ref_752_13">Fields</A></FONT> (<FONT COLOR=red><A NAME="ref_601_21" HREF="terminal_interface-curses-forms__adb.htm#ref_752_21">Frm</A></FONT>   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-+                    <FONT COLOR=red><A NAME="ref_602_21" HREF="terminal_interface-curses-forms__adb.htm#ref_753_21">Index</A></FONT> : Positive) <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field.3x.html">form_fields()</A></EM></FONT>
--   <b>pragma</b> Inline (Fields);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_601_13">Fields</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_43"#2|</EM></FONT>
--   <b>function</b> Field_Count (Frm : Form) <b>return</b> Natural;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_607_13" HREF="terminal_interface-curses-forms__adb.htm#ref_772_13">Field_Count</A></FONT> (<FONT COLOR=red><A NAME="ref_607_26" HREF="terminal_interface-curses-forms__adb.htm#ref_772_26">Frm</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>) <b>return</b> Natural;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field.3x.html">field_count()</A></EM></FONT>
--   <b>pragma</b> Inline (Field_Count);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_607_13">Field_Count</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_44"#2|</EM></FONT>
--   <b>procedure</b> Move (<FONT COLOR=red><A NAME="ref_613_20" HREF="terminal_interface-curses-forms__adb.htm#ref_783_20">Fld</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Field</A>;
--                   <FONT COLOR=red><A NAME="ref_614_20" HREF="terminal_interface-curses-forms__adb.htm#ref_784_20">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--                   Column : <b>in</b> Column_Position);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_612_14" HREF="terminal_interface-curses-forms__adb.htm#ref_782_14">Move</A></FONT> (<FONT COLOR=red><A NAME="ref_612_20" HREF="terminal_interface-curses-forms__adb.htm#ref_782_20">Fld</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+                   <FONT COLOR=red><A NAME="ref_613_20" HREF="terminal_interface-curses-forms__adb.htm#ref_783_20">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+                   <FONT COLOR=red><A NAME="ref_614_20" HREF="terminal_interface-curses-forms__adb.htm#ref_784_20">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field.3x.html">move_field()</A></EM></FONT>
--   <b>pragma</b> Inline (Move);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_612_14">Move</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_new.3x.html">form_new.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_45"#2|</EM></FONT>
--   <b>function</b> Create (Fields : Field_Array_Access) <b>return</b> Form;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_623_13" HREF="terminal_interface-curses-forms__adb.htm#ref_802_13">Create</A></FONT> (<FONT COLOR=red><A NAME="ref_623_21" HREF="terminal_interface-curses-forms__adb.htm#ref_802_21">Fields</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_134_9">Field_Array_Access</A>) <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_new.3x.html">new_form()</A></EM></FONT>
-    <b>pragma</b> Inline (Create);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_46"#2|</EM></FONT>
--   <b>function</b> New_Form (Fields : Field_Array_Access) <b>return</b> Form
--     <b>renames</b> Create;
-+   <b>function</b> New_Form (<FONT COLOR=red><A NAME="ref_628_23">Fields</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_134_9">Field_Array_Access</A>) <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>
-+     <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_623_13">Create</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_new.3x.html">new_form()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  pragma Inline (New_Form);</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_47"#2|</EM></FONT>
--   <b>procedure</b> Delete (Frm : <b>in</b> <b>out</b> Form);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_634_14" HREF="terminal_interface-curses-forms__adb.htm#ref_823_14">Delete</A></FONT> (<FONT COLOR=red><A NAME="ref_634_22" HREF="terminal_interface-curses-forms__adb.htm#ref_823_22">Frm</A></FONT> : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_new.3x.html">free_form()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  Reset Frm to Null_Form</EM></FONT>
-    <b>pragma</b> Inline (Delete);
-@@ -647,26 +646,26 @@
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_48"#2|</EM></FONT>
--   <b>procedure</b> Set_Options (<FONT COLOR=red><A NAME="ref_645_27" HREF="terminal_interface-curses-forms__adb.htm#ref_843_27">Frm</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_107_9">Form</A>;
--                          Options : <b>in</b> Form_Option_Set);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_644_14" HREF="terminal_interface-curses-forms__adb.htm#ref_842_14">Set_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_644_27" HREF="terminal_interface-curses-forms__adb.htm#ref_842_27">Frm</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-+                          <FONT COLOR=red><A NAME="ref_645_27" HREF="terminal_interface-curses-forms__adb.htm#ref_843_27">Options</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_107_9">Form_Option_Set</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_opts.3x.html">set_form_opts()</A></EM></FONT>
-    <b>pragma</b> Inline (Set_Options);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_49"#2|</EM></FONT>
--   <b>procedure</b> Switch_Options (<FONT COLOR=red><A NAME="ref_651_30" HREF="terminal_interface-curses-forms__adb.htm#ref_861_30">Frm</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_107_9">Form</A>;
--                             <FONT COLOR=red><A NAME="ref_652_30" HREF="terminal_interface-curses-forms__adb.htm#ref_862_30">Options</A></FONT> : <b>in</b> Form_Option_Set;
--                             On      : Boolean := True);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_650_14" HREF="terminal_interface-curses-forms__adb.htm#ref_860_14">Switch_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_650_30" HREF="terminal_interface-curses-forms__adb.htm#ref_860_30">Frm</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-+                             <FONT COLOR=red><A NAME="ref_651_30" HREF="terminal_interface-curses-forms__adb.htm#ref_861_30">Options</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_107_9">Form_Option_Set</A>;
-+                             <FONT COLOR=red><A NAME="ref_652_30" HREF="terminal_interface-curses-forms__adb.htm#ref_862_30">On</A></FONT>      : Boolean := True);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_opts.3x.html">form_opts_on()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: form_opts_off()</EM></FONT>
-    <b>pragma</b> Inline (Switch_Options);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_50"#2|</EM></FONT>
--   <b>procedure</b> Get_Options (<FONT COLOR=red><A NAME="ref_659_27" HREF="terminal_interface-curses-forms__adb.htm#ref_887_27">Frm</A></FONT>     : <b>in</b>  <A HREF="terminal_interface-curses-forms__ads.htm#ref_107_9">Form</A>;
--                          Options : <b>out</b> Form_Option_Set);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_658_14" HREF="terminal_interface-curses-forms__adb.htm#ref_886_14">Get_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_658_27" HREF="terminal_interface-curses-forms__adb.htm#ref_886_27">Frm</A></FONT>     : <b>in</b>  <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-+                          <FONT COLOR=red><A NAME="ref_659_27" HREF="terminal_interface-curses-forms__adb.htm#ref_887_27">Options</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_107_9">Form_Option_Set</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_opts.3x.html">form_opts()</A></EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_51"#2|</EM></FONT>
--   <b>function</b> Get_Options (Frm : Form := Null_Form) <b>return</b> Form_Option_Set;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_663_13" HREF="terminal_interface-curses-forms__adb.htm#ref_899_13">Get_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_663_26" HREF="terminal_interface-curses-forms__adb.htm#ref_899_26">Frm</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A> := <A HREF="terminal_interface-curses-forms__ads.htm#ref_60_4">Null_Form</A>) <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_107_9">Form_Option_Set</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_opts.3x.html">form_opts()</A></EM></FONT>
-    <b>pragma</b> Inline (Get_Options);
- 
-@@ -675,47 +674,47 @@
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_52"#2|</EM></FONT>
--   <b>procedure</b> Post (<FONT COLOR=red><A NAME="ref_673_20" HREF="terminal_interface-curses-forms__adb.htm#ref_914_20">Frm</A></FONT>  : <b>in</b> Form;
--                   Post : <b>in</b> Boolean := True);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_672_14" HREF="terminal_interface-curses-forms__adb.htm#ref_913_14">Post</A></FONT> (<FONT COLOR=red><A NAME="ref_672_20" HREF="terminal_interface-curses-forms__adb.htm#ref_913_20">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-+                   <FONT COLOR=red><A NAME="ref_673_20" HREF="terminal_interface-curses-forms__adb.htm#ref_914_20">Post</A></FONT> : <b>in</b> Boolean := True);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_post.3x.html">post_form()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: unpost_form()</EM></FONT>
--   <b>pragma</b> Inline (Post);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_672_14">Post</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_cursor.3x.html">form_cursor.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_53"#2|</EM></FONT>
--   <b>procedure</b> Position_Cursor (Frm : Form);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_683_14" HREF="terminal_interface-curses-forms__adb.htm#ref_939_14">Position_Cursor</A></FONT> (<FONT COLOR=red><A NAME="ref_683_31" HREF="terminal_interface-curses-forms__adb.htm#ref_939_31">Frm</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_cursor.3x.html">pos_form_cursor()</A></EM></FONT>
--   <b>pragma</b> Inline (Position_Cursor);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_683_14">Position_Cursor</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_data.3x.html">form_data.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_54"#2|</EM></FONT>
--   <b>function</b> Data_Ahead (Frm : Form) <b>return</b> Boolean;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_692_13" HREF="terminal_interface-curses-forms__adb.htm#ref_957_13">Data_Ahead</A></FONT> (<FONT COLOR=red><A NAME="ref_692_25" HREF="terminal_interface-curses-forms__adb.htm#ref_957_25">Frm</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>) <b>return</b> Boolean;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_data.3x.html">data_ahead()</A></EM></FONT>
--   <b>pragma</b> Inline (Data_Ahead);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_692_13">Data_Ahead</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_55"#2|</EM></FONT>
--   <b>function</b> Data_Behind (Frm : Form) <b>return</b> Boolean;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_697_13" HREF="terminal_interface-curses-forms__adb.htm#ref_973_13">Data_Behind</A></FONT> (<FONT COLOR=red><A NAME="ref_697_26" HREF="terminal_interface-curses-forms__adb.htm#ref_973_26">Frm</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>) <b>return</b> Boolean;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_data.3x.html">data_behind()</A></EM></FONT>
--   <b>pragma</b> Inline (Data_Behind);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_697_13">Data_Behind</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_driver.3x.html">form_driver.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <b>type</b> Driver_Result <b>is</b> (<FONT COLOR=red><A NAME="ref_706_27">Form_Ok</A></FONT>,
--                          <FONT COLOR=red><A NAME="ref_707_27">Request_Denied</A></FONT>,
--                          <FONT COLOR=red><A NAME="ref_708_27">Unknown_Request</A></FONT>,
--                          Invalid_Field);
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_705_9">Driver_Result</A></FONT> <b>is</b> (<FONT COLOR=red><A NAME="ref_705_27">Form_Ok</A></FONT>,
-+                          <FONT COLOR=red><A NAME="ref_706_27">Request_Denied</A></FONT>,
-+                          <FONT COLOR=red><A NAME="ref_707_27">Unknown_Request</A></FONT>,
-+                          <FONT COLOR=red><A NAME="ref_708_27">Invalid_Field</A></FONT>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_56"#2|</EM></FONT>
--   <b>function</b> Driver (<FONT COLOR=red><A NAME="ref_712_21" HREF="terminal_interface-curses-forms__adb.htm#ref_994_21">Frm</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_68_9">Form</A>;
--                    Key : Key_Code) <b>return</b> Driver_Result;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_711_13" HREF="terminal_interface-curses-forms__adb.htm#ref_993_13">Driver</A></FONT> (<FONT COLOR=red><A NAME="ref_711_21" HREF="terminal_interface-curses-forms__adb.htm#ref_993_21">Frm</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-+                    <FONT COLOR=red><A NAME="ref_712_21" HREF="terminal_interface-curses-forms__adb.htm#ref_994_21">Key</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_68_9">Key_Code</A>) <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_705_9">Driver_Result</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_driver.3x.html">form_driver()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  Driver not inlined</EM></FONT>
- 
-@@ -723,52 +722,52 @@
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_page.3x.html">form_page.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <b>type</b> Page_Number <b>is</b> <b>new</b> Natural;
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_720_9">Page_Number</A></FONT> <b>is</b> <b>new</b> Natural;
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_57"#2|</EM></FONT>
--   <b>procedure</b> Set_Current (<FONT COLOR=red><A NAME="ref_724_27" HREF="terminal_interface-curses-forms__adb.htm#ref_1024_27">Frm</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Form</A>;
--                          Fld : <b>in</b> Field);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_723_14" HREF="terminal_interface-curses-forms__adb.htm#ref_1023_14">Set_Current</A></FONT> (<FONT COLOR=red><A NAME="ref_723_27" HREF="terminal_interface-curses-forms__adb.htm#ref_1023_27">Frm</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-+                          <FONT COLOR=red><A NAME="ref_724_27" HREF="terminal_interface-curses-forms__adb.htm#ref_1024_27">Fld</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_page.3x.html">set_current_field()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Current);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_723_14">Set_Current</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_58"#2|</EM></FONT>
--   <b>function</b> Current (Frm : <b>in</b> Form) <b>return</b> Field;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_729_13" HREF="terminal_interface-curses-forms__adb.htm#ref_1038_13">Current</A></FONT> (<FONT COLOR=red><A NAME="ref_729_22" HREF="terminal_interface-curses-forms__adb.htm#ref_1038_22">Frm</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>) <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_page.3x.html">current_field()</A></EM></FONT>
--   <b>pragma</b> Inline (Current);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_729_13">Current</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_59"#2|</EM></FONT>
--   <b>procedure</b> Set_Page (<FONT COLOR=red><A NAME="ref_735_24" HREF="terminal_interface-curses-forms__adb.htm#ref_1054_24">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_720_9">Form</A>;
--                       Page : <b>in</b> Page_Number := Page_Number'First);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_734_14" HREF="terminal_interface-curses-forms__adb.htm#ref_1053_14">Set_Page</A></FONT> (<FONT COLOR=red><A NAME="ref_734_24" HREF="terminal_interface-curses-forms__adb.htm#ref_1053_24">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-+                       <FONT COLOR=red><A NAME="ref_735_24" HREF="terminal_interface-curses-forms__adb.htm#ref_1054_24">Page</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_720_9">Page_Number</A> := <A HREF="terminal_interface-curses-forms__ads.htm#ref_720_9">Page_Number</A>'First);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_page.3x.html">set_form_page()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Page);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_734_14">Set_Page</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_60"#2|</EM></FONT>
--   <b>function</b> Page (Frm : Form) <b>return</b> Page_Number;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_740_13" HREF="terminal_interface-curses-forms__adb.htm#ref_1068_13">Page</A></FONT> (<FONT COLOR=red><A NAME="ref_740_19" HREF="terminal_interface-curses-forms__adb.htm#ref_1068_19">Frm</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>) <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_720_9">Page_Number</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_page.3x.html">form_page()</A></EM></FONT>
--   <b>pragma</b> Inline (Page);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_740_13">Page</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_61"#2|</EM></FONT>
--   <b>function</b> Get_Index (Fld : Field) <b>return</b> Positive;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_745_13" HREF="terminal_interface-curses-forms__adb.htm#ref_1082_13">Get_Index</A></FONT> (<FONT COLOR=red><A NAME="ref_745_24" HREF="terminal_interface-curses-forms__adb.htm#ref_1082_24">Fld</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>) <b>return</b> Positive;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_page.3x.html">field_index()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  Please note that in this binding we start the numbering of fields</EM></FONT>
-    <FONT COLOR=green><EM>--  with 1. So this is number is one more than you get from the low</EM></FONT>
-    <FONT COLOR=green><EM>--  level call.</EM></FONT>
--   <b>pragma</b> Inline (Get_Index);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_745_13">Get_Index</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_new_page.3x.html">form_new_page.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_62"#2|</EM></FONT>
--   <b>procedure</b> Set_New_Page (<FONT COLOR=red><A NAME="ref_758_28" HREF="terminal_interface-curses-forms__adb.htm#ref_1103_28">Fld</A></FONT>      : <b>in</b> Field;
--                           New_Page : <b>in</b> Boolean := True);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_757_14" HREF="terminal_interface-curses-forms__adb.htm#ref_1102_14">Set_New_Page</A></FONT> (<FONT COLOR=red><A NAME="ref_757_28" HREF="terminal_interface-curses-forms__adb.htm#ref_1102_28">Fld</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+                           <FONT COLOR=red><A NAME="ref_758_28" HREF="terminal_interface-curses-forms__adb.htm#ref_1103_28">New_Page</A></FONT> : <b>in</b> Boolean := True);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_new_page.3x.html">set_new_page()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_New_Page);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_757_14">Set_New_Page</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_63"#2|</EM></FONT>
--   <b>function</b> Is_New_Page (Fld : Field) <b>return</b> Boolean;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_763_13" HREF="terminal_interface-curses-forms__adb.htm#ref_1117_13">Is_New_Page</A></FONT> (<FONT COLOR=red><A NAME="ref_763_26" HREF="terminal_interface-curses-forms__adb.htm#ref_1117_26">Fld</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>) <b>return</b> Boolean;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_new_page.3x.html">new_page()</A></EM></FONT>
--   <b>pragma</b> Inline (Is_New_Page);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_763_13">Is_New_Page</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_requestname.3x.html">form_requestname.3x</A></EM></FONT>
-@@ -777,11 +776,11 @@
- 
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- <b>private</b>
--   <b>type</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Field</A> <b>is</b> <b>new</b> System.Storage_Elements.Integer_Address;
--   <b>type</b> Form  <b>is</b> <b>new</b> System.Storage_Elements.Integer_Address;
-+   <b>type</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A> <b>is</b> <b>new</b> System.Storage_Elements.Integer_Address;
-+   <b>type</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>  <b>is</b> <b>new</b> System.Storage_Elements.Integer_Address;
- 
--   <A HREF="terminal_interface-curses-forms__ads.htm#ref_60_4">Null_Field</A> : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Field</A> := 0;
--   Null_Form  : <b>constant</b> Form  := 0;
-+   <A HREF="terminal_interface-curses-forms__ads.htm#ref_59_4">Null_Field</A> : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A> := 0;
-+   <A HREF="terminal_interface-curses-forms__ads.htm#ref_60_4">Null_Form</A>  : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>  := 0;
- 
--<b>end</b> Terminal_Interface.Curses.Forms;
-+<b>end</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-forms__ads.htm#ref_49_35">Forms</A>;
- </PRE></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-menus-item_user_data__ads.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-menus-item_user_data__ads.htm
---- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-menus-item_user_data__ads.htm	2006-09-23 16:31:31.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/terminal_interface-curses-menus-item_user_data__ads.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -3,7 +3,6 @@
- <BODY>
- <HR><DIV ALIGN="center"><H1> File : terminal_interface-curses-menus-item_user_data.ads </H1></DIV><HR>
- <PRE>
--
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
- <FONT COLOR=green><EM>--                           <A HREF="http://www.gnat.com">GNAT</A> ncurses Binding                           --</EM></FONT>
-@@ -47,10 +46,10 @@
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- 
- <b>generic</b>
--   <b>type</b> <FONT COLOR=red><A NAME="ref_45_9" HREF="terminal_interface-curses-menus-item_user_data__ads.htm#ref_46_41">User</A></FONT> <b>is</b> <b>limited</b> <b>private</b>;
--   <b>type</b> <A HREF="terminal_interface__ads.htm#ref_42_9">User_Access</A> <b>is</b> <b>access</b> User<A HREF="terminal_interface-curses-menus__ads.htm#ref_49_35">;</A>
--<b>package</b> Terminal_Interface.Curses.Menus.Item_User_Data <b>is</b>
--   <b>pragma</b> Preelaborate (Terminal_Interface.Curses.Menus.Item_User_Data);
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_44_9" HREF="terminal_interface-curses-menus-item_user_data__ads.htm#ref_46_41">User</A></FONT> <b>is</b> <b>limited</b> <b>private</b>;
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_45_9" HREF="terminal_interface-curses-menus-item_user_data__ads.htm#ref_46_41">User_Access</A></FONT> <b>is</b> <b>access</b> <A HREF="terminal_interface-curses-menus-item_user_data__ads.htm#ref_44_9">User</A>;
-+<b>package</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-menus__ads.htm#ref_49_35">Menus</A>.<FONT COLOR=red><A NAME="ref_46_41" HREF="terminal_interface-curses-menus-item_user_data__adb.htm#ref_44_46">Item_User_Data</A></FONT> <b>is</b>
-+   <b>pragma</b> Preelaborate (<A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-menus__ads.htm#ref_49_35">Menus</A>.<A HREF="terminal_interface-curses-menus-item_user_data__ads.htm#ref_46_41">Item_User_Data</A>);
- 
-    <FONT COLOR=green><EM>--  The binding uses the same user pointer for menu items</EM></FONT>
-    <FONT COLOR=green><EM>--  as the low level C implementation. So you can safely</EM></FONT>
-@@ -61,21 +60,21 @@
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_1"#2|</EM></FONT>
--   <b>procedure</b> Set_User_Data (<FONT COLOR=red><A NAME="ref_59_29" HREF="terminal_interface-curses-menus-item_user_data__adb.htm#ref_49_29">Itm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus-item_user_data__ads.htm#ref_45_9">Item</A>;
--                            Data : <b>in</b> User_Access);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_58_14" HREF="terminal_interface-curses-menus-item_user_data__adb.htm#ref_48_14">Set_User_Data</A></FONT> (<FONT COLOR=red><A NAME="ref_58_29" HREF="terminal_interface-curses-menus-item_user_data__adb.htm#ref_48_29">Itm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>;
-+                            <FONT COLOR=red><A NAME="ref_59_29" HREF="terminal_interface-curses-menus-item_user_data__adb.htm#ref_49_29">Data</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus-item_user_data__ads.htm#ref_45_9">User_Access</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_userptr.3x.html">set_item_userptr</A></EM></FONT>
--   <b>pragma</b> Inline (Set_User_Data);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus-item_user_data__ads.htm#ref_58_14">Set_User_Data</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_2"#2|</EM></FONT>
--   <b>procedure</b> Get_User_Data (<FONT COLOR=red><A NAME="ref_65_29" HREF="terminal_interface-curses-menus-item_user_data__adb.htm#ref_71_29">Itm</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-menus-item_user_data__ads.htm#ref_45_9">Item</A>;
--                            Data : <b>out</b> User_Access);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_64_14" HREF="terminal_interface-curses-menus-item_user_data__adb.htm#ref_70_14">Get_User_Data</A></FONT> (<FONT COLOR=red><A NAME="ref_64_29" HREF="terminal_interface-curses-menus-item_user_data__adb.htm#ref_70_29">Itm</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>;
-+                            <FONT COLOR=red><A NAME="ref_65_29" HREF="terminal_interface-curses-menus-item_user_data__adb.htm#ref_71_29">Data</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses-menus-item_user_data__ads.htm#ref_45_9">User_Access</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_userptr.3x.html">item_userptr</A></EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_3"#2|</EM></FONT>
--   <b>function</b> Get_User_Data (Itm  : <b>in</b>  Item) <b>return</b> User_Access;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_69_13" HREF="terminal_interface-curses-menus-item_user_data__adb.htm#ref_62_13">Get_User_Data</A></FONT> (<FONT COLOR=red><A NAME="ref_69_28" HREF="terminal_interface-curses-menus-item_user_data__adb.htm#ref_62_28">Itm</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>) <b>return</b> <A HREF="terminal_interface-curses-menus-item_user_data__ads.htm#ref_45_9">User_Access</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_userptr.3x.html">item_userptr</A></EM></FONT>
-    <FONT COLOR=green><EM>--  Same as function</EM></FONT>
-    <b>pragma</b> Inline (Get_User_Data);
- 
--<b>end</b> Terminal_Interface.Curses.Menus.Item_User_Data;
-+<b>end</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-menus__ads.htm#ref_49_35">Menus</A>.<A HREF="terminal_interface-curses-menus-item_user_data__ads.htm#ref_46_41">Item_User_Data</A>;
- </PRE></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-menus-menu_user_data__ads.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-menus-menu_user_data__ads.htm
---- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-menus-menu_user_data__ads.htm	2006-09-23 16:31:31.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/terminal_interface-curses-menus-menu_user_data__ads.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -3,7 +3,6 @@
- <BODY>
- <HR><DIV ALIGN="center"><H1> File : terminal_interface-curses-menus-menu_user_data.ads </H1></DIV><HR>
- <PRE>
--
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
- <FONT COLOR=green><EM>--                           <A HREF="http://www.gnat.com">GNAT</A> ncurses Binding                           --</EM></FONT>
-@@ -46,31 +45,31 @@
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- 
- <b>generic</b>
--   <b>type</b> <FONT COLOR=red><A NAME="ref_44_9" HREF="terminal_interface-curses-menus-menu_user_data__ads.htm#ref_45_41">User</A></FONT> <b>is</b> <b>limited</b> <b>private</b>;
--   <b>type</b> <A HREF="terminal_interface__ads.htm#ref_42_9">User_Access</A> <b>is</b> <b>access</b> User<A HREF="terminal_interface-curses-menus__ads.htm#ref_49_35">;</A>
--<b>package</b> Terminal_Interface.Curses.Menus.Menu_User_Data <b>is</b>
--   <b>pragma</b> Preelaborate (Terminal_Interface.Curses.Menus.Menu_User_Data);
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_43_9" HREF="terminal_interface-curses-menus-menu_user_data__ads.htm#ref_45_41">User</A></FONT> <b>is</b> <b>limited</b> <b>private</b>;
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_44_9" HREF="terminal_interface-curses-menus-menu_user_data__ads.htm#ref_45_41">User_Access</A></FONT> <b>is</b> <b>access</b> <A HREF="terminal_interface-curses-menus-menu_user_data__ads.htm#ref_43_9">User</A>;
-+<b>package</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-menus__ads.htm#ref_49_35">Menus</A>.<FONT COLOR=red><A NAME="ref_45_41" HREF="terminal_interface-curses-menus-menu_user_data__adb.htm#ref_43_46">Menu_User_Data</A></FONT> <b>is</b>
-+   <b>pragma</b> Preelaborate (<A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-menus__ads.htm#ref_49_35">Menus</A>.<A HREF="terminal_interface-curses-menus-menu_user_data__ads.htm#ref_45_41">Menu_User_Data</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/menu_userptr.3x.html">menu_userptr.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_1"#2|</EM></FONT>
--   <b>procedure</b> Set_User_Data (<FONT COLOR=red><A NAME="ref_54_29" HREF="terminal_interface-curses-menus-menu_user_data__adb.htm#ref_48_29">Men</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus-menu_user_data__ads.htm#ref_44_9">Menu</A>;
--                            Data : <b>in</b> User_Access);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_53_14" HREF="terminal_interface-curses-menus-menu_user_data__adb.htm#ref_47_14">Set_User_Data</A></FONT> (<FONT COLOR=red><A NAME="ref_53_29" HREF="terminal_interface-curses-menus-menu_user_data__adb.htm#ref_47_29">Men</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                            <FONT COLOR=red><A NAME="ref_54_29" HREF="terminal_interface-curses-menus-menu_user_data__adb.htm#ref_48_29">Data</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus-menu_user_data__ads.htm#ref_44_9">User_Access</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_userptr.3x.html">set_menu_userptr</A></EM></FONT>
--   <b>pragma</b> Inline (Set_User_Data);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus-menu_user_data__ads.htm#ref_53_14">Set_User_Data</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_2"#2|</EM></FONT>
--   <b>procedure</b> Get_User_Data (<FONT COLOR=red><A NAME="ref_60_29" HREF="terminal_interface-curses-menus-menu_user_data__adb.htm#ref_70_29">Men</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-menus-menu_user_data__ads.htm#ref_44_9">Menu</A>;
--                            Data : <b>out</b> User_Access);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_59_14" HREF="terminal_interface-curses-menus-menu_user_data__adb.htm#ref_69_14">Get_User_Data</A></FONT> (<FONT COLOR=red><A NAME="ref_59_29" HREF="terminal_interface-curses-menus-menu_user_data__adb.htm#ref_69_29">Men</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                            <FONT COLOR=red><A NAME="ref_60_29" HREF="terminal_interface-curses-menus-menu_user_data__adb.htm#ref_70_29">Data</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses-menus-menu_user_data__ads.htm#ref_44_9">User_Access</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_userptr.3x.html">menu_userptr</A></EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_3"#2|</EM></FONT>
--   <b>function</b> Get_User_Data (Men  : <b>in</b>  Menu) <b>return</b> User_Access;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_64_13" HREF="terminal_interface-curses-menus-menu_user_data__adb.htm#ref_61_13">Get_User_Data</A></FONT> (<FONT COLOR=red><A NAME="ref_64_28" HREF="terminal_interface-curses-menus-menu_user_data__adb.htm#ref_61_28">Men</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>) <b>return</b> <A HREF="terminal_interface-curses-menus-menu_user_data__ads.htm#ref_44_9">User_Access</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_userptr.3x.html">menu_userptr</A></EM></FONT>
-    <FONT COLOR=green><EM>--  Same as function</EM></FONT>
-    <b>pragma</b> Inline (Get_User_Data);
- 
--<b>end</b> Terminal_Interface.Curses.Menus.Menu_User_Data;
-+<b>end</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-menus__ads.htm#ref_49_35">Menus</A>.<A HREF="terminal_interface-curses-menus-menu_user_data__ads.htm#ref_45_41">Menu_User_Data</A>;
- </PRE></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-menus__ads.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-menus__ads.htm
---- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-menus__ads.htm	2006-09-23 16:31:31.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/terminal_interface-curses-menus__ads.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -3,7 +3,6 @@
- <BODY>
- <HR><DIV ALIGN="center"><H1> File : terminal_interface-curses-menus.ads </H1></DIV><HR>
- <PRE>
--
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
- <FONT COLOR=green><EM>--                           <A HREF="http://www.gnat.com">GNAT</A> ncurses Binding                           --</EM></FONT>
-@@ -41,8 +40,8 @@
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- <FONT COLOR=green><EM>--  Author:  Juergen Pfeifer, 1996</EM></FONT>
- <FONT COLOR=green><EM>--  Version Control:</EM></FONT>
--<FONT COLOR=green><EM>--  @Revision: 1.26 @</EM></FONT>
--<FONT COLOR=green><EM>--  @Date: 2006/06/25 14:30:22 @</EM></FONT>
-+<FONT COLOR=green><EM>--  @Revision: 1.27 @</EM></FONT>
-+<FONT COLOR=green><EM>--  @Date: 2007/05/05 20:20:52 @</EM></FONT>
- <FONT COLOR=green><EM>--  Binding Version 01.00</EM></FONT>
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- <FONT COLOR=green><EM>--  menu binding.</EM></FONT>
-@@ -52,90 +51,90 @@
- <b>with</b> System;
- <b>with</b> Ada.Characters.Latin_1;
- 
--<b>package</b> Terminal_Interface.Curses.Menus <b>is</b>
--   <b>pragma</b> Preelaborate (Terminal_Interface.Curses.Menus);
-+<b>package</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<FONT COLOR=red><A NAME="ref_49_35" HREF="terminal_interface-curses-menus__adb.htm#ref_51_40">Menus</A></FONT> <b>is</b>
-+   <b>pragma</b> Preelaborate (<A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-menus__ads.htm#ref_49_35">Menus</A>);
-    <b>pragma</b> Linker_Options ("-lmenu");
-    <b>pragma</b> Linker_Options ("-lncurses");
- 
-    Space : Character <b>renames</b> Ada.Characters.Latin_1.Space;
- 
--   <b>type</b> <FONT COLOR=red><A NAME="ref_57_9">Item</A></FONT> <b>is</b> <b>private</b>;
--   <b>type</b> Menu <b>is</b> <b>private</b>;
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_56_9">Item</A></FONT> <b>is</b> <b>private</b>;
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_57_9">Menu</A></FONT> <b>is</b> <b>private</b>;
- 
-    <FONT COLOR=green><EM>---------------------------</EM></FONT>
-    <FONT COLOR=green><EM>--  Interface constants  --</EM></FONT>
-    <FONT COLOR=green><EM>---------------------------</EM></FONT>
--   <FONT COLOR=red><A NAME="ref_63_4">Null_Item</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Item</A>;
--   Null_Menu : <b>constant</b> Menu;
-+   <FONT COLOR=red><A NAME="ref_62_4">Null_Item</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>;
-+   <FONT COLOR=red><A NAME="ref_63_4">Null_Menu</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
- 
--   <b>subtype</b> Menu_Request_Code <b>is</b> Key_Code
--     <b>range</b> (Key_Max + 1) .. (Key_Max + 17);
-+   <b>subtype</b> <FONT COLOR=red><A NAME="ref_65_12">Menu_Request_Code</A></FONT> <b>is</b> <A HREF="terminal_interface-curses__ads.htm#ref_68_9">Key_Code</A>
-+     <b>range</b> (<A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 1) .. (<A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 17);
- 
-    <FONT COLOR=green><EM>--  The prefix M_ stands for "Menu Request"</EM></FONT>
--   <FONT COLOR=red><A NAME="ref_70_4">M_Left_Item</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 1;
--   <FONT COLOR=red><A NAME="ref_71_4">M_Right_Item</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 2;
--   <FONT COLOR=red><A NAME="ref_72_4">M_Up_Item</A></FONT>         : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 3;
--   <FONT COLOR=red><A NAME="ref_73_4">M_Down_Item</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 4;
--   <FONT COLOR=red><A NAME="ref_74_4">M_ScrollUp_Line</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 5;
--   <FONT COLOR=red><A NAME="ref_75_4">M_ScrollDown_Line</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 6;
--   <FONT COLOR=red><A NAME="ref_76_4">M_ScrollDown_Page</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 7;
--   <FONT COLOR=red><A NAME="ref_77_4">M_ScrollUp_Page</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 8;
--   <FONT COLOR=red><A NAME="ref_78_4">M_First_Item</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 9;
--   <FONT COLOR=red><A NAME="ref_79_4">M_Last_Item</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 10;
--   <FONT COLOR=red><A NAME="ref_80_4">M_Next_Item</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 11;
--   <FONT COLOR=red><A NAME="ref_81_4">M_Previous_Item</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 12;
--   <FONT COLOR=red><A NAME="ref_82_4">M_Toggle_Item</A></FONT>     : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 13;
--   <FONT COLOR=red><A NAME="ref_83_4">M_Clear_Pattern</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 14;
--   <FONT COLOR=red><A NAME="ref_84_4">M_Back_Pattern</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 15;
--   <FONT COLOR=red><A NAME="ref_85_4">M_Next_Match</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 16;
--   M_Previous_Match  : <b>constant</b> Menu_Request_Code := Key_Max + 17;
-+   <FONT COLOR=red><A NAME="ref_69_4">M_Left_Item</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 1;
-+   <FONT COLOR=red><A NAME="ref_70_4">M_Right_Item</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 2;
-+   <FONT COLOR=red><A NAME="ref_71_4">M_Up_Item</A></FONT>         : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 3;
-+   <FONT COLOR=red><A NAME="ref_72_4">M_Down_Item</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 4;
-+   <FONT COLOR=red><A NAME="ref_73_4">M_ScrollUp_Line</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 5;
-+   <FONT COLOR=red><A NAME="ref_74_4">M_ScrollDown_Line</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 6;
-+   <FONT COLOR=red><A NAME="ref_75_4">M_ScrollDown_Page</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 7;
-+   <FONT COLOR=red><A NAME="ref_76_4">M_ScrollUp_Page</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 8;
-+   <FONT COLOR=red><A NAME="ref_77_4">M_First_Item</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 9;
-+   <FONT COLOR=red><A NAME="ref_78_4">M_Last_Item</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 10;
-+   <FONT COLOR=red><A NAME="ref_79_4">M_Next_Item</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 11;
-+   <FONT COLOR=red><A NAME="ref_80_4">M_Previous_Item</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 12;
-+   <FONT COLOR=red><A NAME="ref_81_4">M_Toggle_Item</A></FONT>     : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 13;
-+   <FONT COLOR=red><A NAME="ref_82_4">M_Clear_Pattern</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 14;
-+   <FONT COLOR=red><A NAME="ref_83_4">M_Back_Pattern</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 15;
-+   <FONT COLOR=red><A NAME="ref_84_4">M_Next_Match</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 16;
-+   <FONT COLOR=red><A NAME="ref_85_4">M_Previous_Match</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 17;
- 
-    <FONT COLOR=green><EM>--  For those who like the old 'C' names for the request codes</EM></FONT>
--   REQ_LEFT_ITEM     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_70_4">M_Left_Item</A>;
--   REQ_RIGHT_ITEM    : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_71_4">M_Right_Item</A>;
--   REQ_UP_ITEM       : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_72_4">M_Up_Item</A>;
--   REQ_DOWN_ITEM     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_73_4">M_Down_Item</A>;
--   REQ_SCR_ULINE     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_74_4">M_ScrollUp_Line</A>;
--   REQ_SCR_DLINE     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_75_4">M_ScrollDown_Line</A>;
--   REQ_SCR_DPAGE     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_76_4">M_ScrollDown_Page</A>;
--   REQ_SCR_UPAGE     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_77_4">M_ScrollUp_Page</A>;
--   REQ_FIRST_ITEM    : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_78_4">M_First_Item</A>;
--   REQ_LAST_ITEM     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_79_4">M_Last_Item</A>;
--   REQ_NEXT_ITEM     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_80_4">M_Next_Item</A>;
--   REQ_PREV_ITEM     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_81_4">M_Previous_Item</A>;
--   REQ_TOGGLE_ITEM   : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_82_4">M_Toggle_Item</A>;
--   REQ_CLEAR_PATTERN : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_83_4">M_Clear_Pattern</A>;
--   REQ_BACK_PATTERN  : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_84_4">M_Back_Pattern</A>;
--   REQ_NEXT_MATCH    : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_85_4">M_Next_Match</A>;
--   REQ_PREV_MATCH    : Menu_Request_Code <b>renames</b> M_Previous_Match;
-+   REQ_LEFT_ITEM     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_69_4">M_Left_Item</A>;
-+   REQ_RIGHT_ITEM    : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_70_4">M_Right_Item</A>;
-+   REQ_UP_ITEM       : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_71_4">M_Up_Item</A>;
-+   REQ_DOWN_ITEM     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_72_4">M_Down_Item</A>;
-+   REQ_SCR_ULINE     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_73_4">M_ScrollUp_Line</A>;
-+   REQ_SCR_DLINE     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_74_4">M_ScrollDown_Line</A>;
-+   REQ_SCR_DPAGE     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_75_4">M_ScrollDown_Page</A>;
-+   REQ_SCR_UPAGE     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_76_4">M_ScrollUp_Page</A>;
-+   REQ_FIRST_ITEM    : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_77_4">M_First_Item</A>;
-+   REQ_LAST_ITEM     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_78_4">M_Last_Item</A>;
-+   REQ_NEXT_ITEM     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_79_4">M_Next_Item</A>;
-+   REQ_PREV_ITEM     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_80_4">M_Previous_Item</A>;
-+   REQ_TOGGLE_ITEM   : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_81_4">M_Toggle_Item</A>;
-+   REQ_CLEAR_PATTERN : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_82_4">M_Clear_Pattern</A>;
-+   REQ_BACK_PATTERN  : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_83_4">M_Back_Pattern</A>;
-+   REQ_NEXT_MATCH    : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_84_4">M_Next_Match</A>;
-+   REQ_PREV_MATCH    : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_85_4">M_Previous_Match</A>;
- 
--   <b>procedure</b> Request_Name (<FONT COLOR=red><A NAME="ref_107_28" HREF="terminal_interface-curses-menus__adb.htm#ref_78_28">Key</A></FONT>  : <b>in</b> Menu_Request_Code;
--                           Name : <b>out</b> String);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_106_14" HREF="terminal_interface-curses-menus__adb.htm#ref_77_14">Request_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_106_28" HREF="terminal_interface-curses-menus__adb.htm#ref_77_28">Key</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A>;
-+                           <FONT COLOR=red><A NAME="ref_107_28" HREF="terminal_interface-curses-menus__adb.htm#ref_78_28">Name</A></FONT> : <b>out</b> String);
- 
--   <b>function</b>  Request_Name (Key : Menu_Request_Code) <b>return</b> String;
-+   <b>function</b>  <FONT COLOR=red><A NAME="ref_109_14" HREF="terminal_interface-curses-menus__adb.htm#ref_86_13">Request_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_109_28" HREF="terminal_interface-curses-menus__adb.htm#ref_86_27">Key</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A>) <b>return</b> String;
-    <FONT COLOR=green><EM>--  Same as function</EM></FONT>
- 
-    <FONT COLOR=green><EM>------------------</EM></FONT>
-    <FONT COLOR=green><EM>--  Exceptions  --</EM></FONT>
-    <FONT COLOR=green><EM>------------------</EM></FONT>
- 
--   Menu_Exception : <b>exception</b>;
-+   <FONT COLOR=red><A NAME="ref_116_4">Menu_Exception</A></FONT> : <b>exception</b>;
-    <FONT COLOR=green><EM>--</EM></FONT>
-    <FONT COLOR=green><EM>--  Menu options</EM></FONT>
-    <FONT COLOR=green><EM>--</EM></FONT>
-    <b>pragma</b> Warnings (Off);
--   <b>type</b> Menu_Option_Set <b>is</b>
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_121_9">Menu_Option_Set</A></FONT> <b>is</b>
-       <b>record</b>
--         <FONT COLOR=red><A NAME="ref_124_10">One_Valued</A></FONT>        : Boolean;
--         <FONT COLOR=red><A NAME="ref_125_10">Show_Descriptions</A></FONT> : Boolean;
--         <FONT COLOR=red><A NAME="ref_126_10">Row_Major_Order</A></FONT>   : Boolean;
--         <FONT COLOR=red><A NAME="ref_127_10">Ignore_Case</A></FONT>       : Boolean;
--         <FONT COLOR=red><A NAME="ref_128_10">Show_Matches</A></FONT>      : Boolean;
--         Non_Cyclic        : Boolean;
-+         <FONT COLOR=red><A NAME="ref_123_10">One_Valued</A></FONT>        : Boolean;
-+         <FONT COLOR=red><A NAME="ref_124_10">Show_Descriptions</A></FONT> : Boolean;
-+         <FONT COLOR=red><A NAME="ref_125_10">Row_Major_Order</A></FONT>   : Boolean;
-+         <FONT COLOR=red><A NAME="ref_126_10">Ignore_Case</A></FONT>       : Boolean;
-+         <FONT COLOR=red><A NAME="ref_127_10">Show_Matches</A></FONT>      : Boolean;
-+         <FONT COLOR=red><A NAME="ref_128_10">Non_Cyclic</A></FONT>        : Boolean;
-       <b>end</b> <b>record</b>;
--   <b>pragma</b> Convention (C, Menu_Option_Set);
-+   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-menus__ads.htm#ref_121_9">Menu_Option_Set</A>);
- 
--   <b>for</b> Menu_Option_Set <b>use</b>
-+   <b>for</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_121_9">Menu_Option_Set</A> <b>use</b>
-       <b>record</b>
-          One_Valued        <b>at</b> 0 <b>range</b>  0 ..  0;
-          Show_Descriptions <b>at</b> 0 <b>range</b>  1 ..  1;
-@@ -144,47 +143,47 @@
-          Show_Matches      <b>at</b> 0 <b>range</b>  4 ..  4;
-          Non_Cyclic        <b>at</b> 0 <b>range</b>  5 ..  5;
-       <b>end</b> <b>record</b>;
--   <b>for</b> Menu_Option_Set'Size <b>use</b> 32;
-+   <b>for</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_121_9">Menu_Option_Set</A>'Size <b>use</b> 32;
-    <FONT COLOR=green><EM>--  Please note: this rep. clause is generated and may be</EM></FONT>
-    <FONT COLOR=green><EM>--               different on your system.</EM></FONT>
-    <b>pragma</b> Warnings (On);
- 
--   <b>function</b> Default_Menu_Options <b>return</b> Menu_Option_Set;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_146_13" HREF="terminal_interface-curses-menus__adb.htm#ref_1009_13">Default_Menu_Options</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_121_9">Menu_Option_Set</A>;
-    <FONT COLOR=green><EM>--  Initial default options for a menu.</EM></FONT>
--   <b>pragma</b> Inline (Default_Menu_Options);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_146_13">Default_Menu_Options</A>);
-    <FONT COLOR=green><EM>--</EM></FONT>
-    <FONT COLOR=green><EM>--  Item options</EM></FONT>
-    <FONT COLOR=green><EM>--</EM></FONT>
-    <b>pragma</b> Warnings (Off);
--   <b>type</b> Item_Option_Set <b>is</b>
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_153_9">Item_Option_Set</A></FONT> <b>is</b>
-       <b>record</b>
--         Selectable  : Boolean;
-+         <FONT COLOR=red><A NAME="ref_155_10">Selectable</A></FONT>  : Boolean;
-       <b>end</b> <b>record</b>;
--   <b>pragma</b> Convention (C, Item_Option_Set);
-+   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-menus__ads.htm#ref_153_9">Item_Option_Set</A>);
- 
--   <b>for</b> Item_Option_Set <b>use</b>
-+   <b>for</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_153_9">Item_Option_Set</A> <b>use</b>
-       <b>record</b>
-          Selectable  <b>at</b> 0 <b>range</b>  0 ..  0;
-       <b>end</b> <b>record</b>;
--   <b>for</b> Item_Option_Set'Size <b>use</b> 32;
-+   <b>for</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_153_9">Item_Option_Set</A>'Size <b>use</b> 32;
-    <FONT COLOR=green><EM>--  Please note: this rep. clause is generated and may be</EM></FONT>
-    <FONT COLOR=green><EM>--               different on your system.</EM></FONT>
-    <b>pragma</b> Warnings (On);
- 
--   <b>function</b> Default_Item_Options <b>return</b> Item_Option_Set;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_168_13" HREF="terminal_interface-curses-menus__adb.htm#ref_1015_13">Default_Item_Options</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_153_9">Item_Option_Set</A>;
-    <FONT COLOR=green><EM>--  Initial default options for an item.</EM></FONT>
--   <b>pragma</b> Inline (Default_Item_Options);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_168_13">Default_Item_Options</A>);
- 
-    <FONT COLOR=green><EM>--</EM></FONT>
-    <FONT COLOR=green><EM>--  Item Array</EM></FONT>
-    <FONT COLOR=green><EM>--</EM></FONT>
--   <b>type</b> Item_Array <b>is</b> <b>array</b> (Positive <b>range</b> &lt;&gt;) <b>of</b> <b>aliased</b> Item;
--   <b>pragma</b> Convention (C, Item_Array);
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_175_9">Item_Array</A></FONT> <b>is</b> <b>array</b> (Positive <b>range</b> &lt;&gt;) <b>of</b> <b>aliased</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>;
-+   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-menus__ads.htm#ref_175_9">Item_Array</A>);
- 
--   <b>type</b> Item_Array_Access <b>is</b> <b>access</b> Item_Array;
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_178_9">Item_Array_Access</A></FONT> <b>is</b> <b>access</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_175_9">Item_Array</A>;
- 
--   <b>procedure</b> Free (<FONT COLOR=red><A NAME="ref_181_20" HREF="terminal_interface-curses-menus__adb.htm#ref_993_20">IA</A></FONT>         : <b>in</b> <b>out</b> Item_Array_Access;
--                   Free_Items : Boolean := False);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_180_14" HREF="terminal_interface-curses-menus__adb.htm#ref_992_14">Free</A></FONT> (<FONT COLOR=red><A NAME="ref_180_20" HREF="terminal_interface-curses-menus__adb.htm#ref_992_20">IA</A></FONT>         : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_178_9">Item_Array_Access</A>;
-+                   <FONT COLOR=red><A NAME="ref_181_20" HREF="terminal_interface-curses-menus__adb.htm#ref_993_20">Free_Items</A></FONT> : Boolean := False);
-    <FONT COLOR=green><EM>--  Release the memory for an allocated item array</EM></FONT>
-    <FONT COLOR=green><EM>--  If Free_Items is True, call Delete() for all the items in</EM></FONT>
-    <FONT COLOR=green><EM>--  the array.</EM></FONT>
-@@ -194,19 +193,19 @@
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_1"#2|</EM></FONT>
--   <b>function</b> Create (<FONT COLOR=red><A NAME="ref_192_21" HREF="terminal_interface-curses-menus__adb.htm#ref_95_21">Name</A></FONT>        : String;
--                    Description : String := "") <b>return</b> Item;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_191_13" HREF="terminal_interface-curses-menus__adb.htm#ref_94_13">Create</A></FONT> (<FONT COLOR=red><A NAME="ref_191_21" HREF="terminal_interface-curses-menus__adb.htm#ref_94_21">Name</A></FONT>        : String;
-+                    <FONT COLOR=red><A NAME="ref_192_21" HREF="terminal_interface-curses-menus__adb.htm#ref_95_21">Description</A></FONT> : String := "") <b>return</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_new.3x.html">new_item()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  Not inlined.</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_2"#2|</EM></FONT>
--   <b>function</b> New_Item (<FONT COLOR=red><A NAME="ref_198_23">Name</A></FONT>        : String;
--             <A HREF="terminal_interface-curses-menus__ads.htm#ref_191_13"> </A>        Description : String := "") <b>return</b> Item
--     <b>renames</b> Create;
-+   <b>function</b> New_Item (<FONT COLOR=red><A NAME="ref_197_23">Name</A></FONT>        : String;
-+                      <FONT COLOR=red><A NAME="ref_198_23">Description</A></FONT> : String := "") <b>return</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>
-+     <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_191_13">Create</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_new.3x.html">new_item()</A></EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_3"#2|</EM></FONT>
--   <b>procedure</b> Delete (Itm : <b>in</b> <b>out</b> Item);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_203_14" HREF="terminal_interface-curses-menus__adb.htm#ref_124_14">Delete</A></FONT> (<FONT COLOR=red><A NAME="ref_203_22" HREF="terminal_interface-curses-menus__adb.htm#ref_124_22">Itm</A></FONT> : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_new.3x.html">free_item()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  Resets Itm to Null_Item</EM></FONT>
- 
-@@ -215,51 +214,51 @@
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_4"#2|</EM></FONT>
--   <b>procedure</b> Set_Value (<FONT COLOR=red><A NAME="ref_213_25" HREF="terminal_interface-curses-menus__adb.htm#ref_153_25">Itm</A></FONT>   : <b>in</b> Item;
--                        Value : <b>in</b> Boolean := True);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_212_14" HREF="terminal_interface-curses-menus__adb.htm#ref_152_14">Set_Value</A></FONT> (<FONT COLOR=red><A NAME="ref_212_25" HREF="terminal_interface-curses-menus__adb.htm#ref_152_25">Itm</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>;
-+                        <FONT COLOR=red><A NAME="ref_213_25" HREF="terminal_interface-curses-menus__adb.htm#ref_153_25">Value</A></FONT> : <b>in</b> Boolean := True);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_value.3x.html">set_item_value()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Value);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_212_14">Set_Value</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_5"#2|</EM></FONT>
--   <b>function</b> Value (Itm : Item) <b>return</b> Boolean;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_218_13" HREF="terminal_interface-curses-menus__adb.htm#ref_166_13">Value</A></FONT> (<FONT COLOR=red><A NAME="ref_218_20" HREF="terminal_interface-curses-menus__adb.htm#ref_166_20">Itm</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>) <b>return</b> Boolean;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_value.3x.html">item_value()</A></EM></FONT>
--   <b>pragma</b> Inline (Value);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_218_13">Value</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/mitem_visible.3x.html">mitem_visible.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_6"#2|</EM></FONT>
--   <b>function</b> Visible (Itm : Item) <b>return</b> Boolean;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_227_13" HREF="terminal_interface-curses-menus__adb.htm#ref_179_13">Visible</A></FONT> (<FONT COLOR=red><A NAME="ref_227_22" HREF="terminal_interface-curses-menus__adb.htm#ref_179_22">Itm</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>) <b>return</b> Boolean;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_visible.3x.html">item_visible()</A></EM></FONT>
--   <b>pragma</b> Inline (Visible);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_227_13">Visible</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/mitem_opts.3x.html">mitem_opts.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_7"#2|</EM></FONT>
--   <b>procedure</b> Set_Options (<FONT COLOR=red><A NAME="ref_237_27" HREF="terminal_interface-curses-menus__adb.htm#ref_192_27">Itm</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_153_9">Item</A>;
--                          Options : <b>in</b> Item_Option_Set);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_236_14" HREF="terminal_interface-curses-menus__adb.htm#ref_191_14">Set_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_236_27" HREF="terminal_interface-curses-menus__adb.htm#ref_191_27">Itm</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>;
-+                          <FONT COLOR=red><A NAME="ref_237_27" HREF="terminal_interface-curses-menus__adb.htm#ref_192_27">Options</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_153_9">Item_Option_Set</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_opts.3x.html">set_item_opts()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  An overloaded Set_Options is defined later. Pragma Inline appears there</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_8"#2|</EM></FONT>
--   <b>procedure</b> Switch_Options (<FONT COLOR=red><A NAME="ref_243_30" HREF="terminal_interface-curses-menus__adb.htm#ref_208_30">Itm</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_153_9">Item</A>;
--                             <FONT COLOR=red><A NAME="ref_244_30" HREF="terminal_interface-curses-menus__adb.htm#ref_209_30">Options</A></FONT> : <b>in</b> Item_Option_Set;
--                             On      : Boolean := True);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_242_14" HREF="terminal_interface-curses-menus__adb.htm#ref_207_14">Switch_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_242_30" HREF="terminal_interface-curses-menus__adb.htm#ref_207_30">Itm</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>;
-+                             <FONT COLOR=red><A NAME="ref_243_30" HREF="terminal_interface-curses-menus__adb.htm#ref_208_30">Options</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_153_9">Item_Option_Set</A>;
-+                             <FONT COLOR=red><A NAME="ref_244_30" HREF="terminal_interface-curses-menus__adb.htm#ref_209_30">On</A></FONT>      : Boolean := True);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_opts.3x.html">item_opts_on()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: item_opts_off()</EM></FONT>
-    <FONT COLOR=green><EM>--  An overloaded Switch_Options is defined later.</EM></FONT>
-    <FONT COLOR=green><EM>--  Pragma Inline appears there</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_9"#2|</EM></FONT>
--   <b>procedure</b> Get_Options (<FONT COLOR=red><A NAME="ref_252_27" HREF="terminal_interface-curses-menus__adb.htm#ref_232_27">Itm</A></FONT>     : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_153_9">Item</A>;
--                          Options : <b>out</b> Item_Option_Set);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_251_14" HREF="terminal_interface-curses-menus__adb.htm#ref_231_14">Get_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_251_27" HREF="terminal_interface-curses-menus__adb.htm#ref_231_27">Itm</A></FONT>     : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>;
-+                          <FONT COLOR=red><A NAME="ref_252_27" HREF="terminal_interface-curses-menus__adb.htm#ref_232_27">Options</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_153_9">Item_Option_Set</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_opts.3x.html">item_opts()</A></EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_10"#2|</EM></FONT>
--   <b>function</b> Get_Options (Itm : Item := Null_Item) <b>return</b> Item_Option_Set;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_256_13" HREF="terminal_interface-curses-menus__adb.htm#ref_242_13">Get_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_256_26" HREF="terminal_interface-curses-menus__adb.htm#ref_242_26">Itm</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A> := <A HREF="terminal_interface-curses-menus__ads.htm#ref_62_4">Null_Item</A>) <b>return</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_153_9">Item_Option_Set</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_opts.3x.html">item_opts()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  An overloaded Get_Options is defined later. Pragma Inline appears there</EM></FONT>
- 
-@@ -268,20 +267,20 @@
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_11"#2|</EM></FONT>
--   <b>procedure</b> Name (<FONT COLOR=red><A NAME="ref_266_20" HREF="terminal_interface-curses-menus__adb.htm#ref_251_20">Itm</A></FONT>  : <b>in</b> Item;
--                   Name : <b>out</b> String);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_265_14" HREF="terminal_interface-curses-menus__adb.htm#ref_250_14">Name</A></FONT> (<FONT COLOR=red><A NAME="ref_265_20" HREF="terminal_interface-curses-menus__adb.htm#ref_250_20">Itm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>;
-+                   <FONT COLOR=red><A NAME="ref_266_20" HREF="terminal_interface-curses-menus__adb.htm#ref_251_20">Name</A></FONT> : <b>out</b> String);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_name.3x.html">item_name()</A></EM></FONT>
--   <b>function</b>  Name (Itm : Item) <b>return</b> String;
-+   <b>function</b>  <FONT COLOR=red><A NAME="ref_268_14" HREF="terminal_interface-curses-menus__adb.htm#ref_259_13">Name</A></FONT> (<FONT COLOR=red><A NAME="ref_268_20" HREF="terminal_interface-curses-menus__adb.htm#ref_259_19">Itm</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>) <b>return</b> String;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_name.3x.html">item_name()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  Implemented as function</EM></FONT>
-    <b>pragma</b> Inline (Name);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_12"#2|</EM></FONT>
--   <b>procedure</b> Description (<FONT COLOR=red><A NAME="ref_275_27" HREF="terminal_interface-curses-menus__adb.htm#ref_268_27">Itm</A></FONT>         : <b>in</b> Item;
--                          Description : <b>out</b> String);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_274_14" HREF="terminal_interface-curses-menus__adb.htm#ref_267_14">Description</A></FONT> (<FONT COLOR=red><A NAME="ref_274_27" HREF="terminal_interface-curses-menus__adb.htm#ref_267_27">Itm</A></FONT>         : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>;
-+                          <FONT COLOR=red><A NAME="ref_275_27" HREF="terminal_interface-curses-menus__adb.htm#ref_268_27">Description</A></FONT> : <b>out</b> String);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_name.3x.html">item_description();</A></EM></FONT>
- 
--   <b>function</b>  Description (Itm : Item) <b>return</b> String;
-+   <b>function</b>  <FONT COLOR=red><A NAME="ref_278_14" HREF="terminal_interface-curses-menus__adb.htm#ref_276_13">Description</A></FONT> (<FONT COLOR=red><A NAME="ref_278_27" HREF="terminal_interface-curses-menus__adb.htm#ref_276_26">Itm</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>) <b>return</b> String;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_name.3x.html">item_description();</A></EM></FONT>
-    <FONT COLOR=green><EM>--  Implemented as function</EM></FONT>
-    <b>pragma</b> Inline (Description);
-@@ -291,71 +290,71 @@
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_13"#2|</EM></FONT>
--   <b>procedure</b> Set_Current (<FONT COLOR=red><A NAME="ref_289_27" HREF="terminal_interface-curses-menus__adb.htm#ref_285_27">Men</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Menu</A>;
--                          Itm : <b>in</b> Item);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_288_14" HREF="terminal_interface-curses-menus__adb.htm#ref_284_14">Set_Current</A></FONT> (<FONT COLOR=red><A NAME="ref_288_27" HREF="terminal_interface-curses-menus__adb.htm#ref_284_27">Men</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                          <FONT COLOR=red><A NAME="ref_289_27" HREF="terminal_interface-curses-menus__adb.htm#ref_285_27">Itm</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_current.3x.html">set_current_item()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Current);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_288_14">Set_Current</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_14"#2|</EM></FONT>
--   <b>function</b> Current (Men : Menu) <b>return</b> Item;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_294_13" HREF="terminal_interface-curses-menus__adb.htm#ref_298_13">Current</A></FONT> (<FONT COLOR=red><A NAME="ref_294_22" HREF="terminal_interface-curses-menus__adb.htm#ref_298_22">Men</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>) <b>return</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_current.3x.html">current_item()</A></EM></FONT>
--   <b>pragma</b> Inline (Current);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_294_13">Current</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_15"#2|</EM></FONT>
--   <b>procedure</b> Set_Top_Row (<FONT COLOR=red><A NAME="ref_300_27" HREF="terminal_interface-curses-menus__adb.htm#ref_312_27">Men</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Menu</A>;
--                          Line : <b>in</b> Line_Position);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_299_14" HREF="terminal_interface-curses-menus__adb.htm#ref_311_14">Set_Top_Row</A></FONT> (<FONT COLOR=red><A NAME="ref_299_27" HREF="terminal_interface-curses-menus__adb.htm#ref_311_27">Men</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                          <FONT COLOR=red><A NAME="ref_300_27" HREF="terminal_interface-curses-menus__adb.htm#ref_312_27">Line</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_current.3x.html">set_top_row()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Top_Row);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_299_14">Set_Top_Row</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_16"#2|</EM></FONT>
--   <b>function</b> Top_Row (Men : Menu) <b>return</b> Line_Position;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_305_13" HREF="terminal_interface-curses-menus__adb.htm#ref_325_13">Top_Row</A></FONT> (<FONT COLOR=red><A NAME="ref_305_22" HREF="terminal_interface-curses-menus__adb.htm#ref_325_22">Men</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_current.3x.html">top_row()</A></EM></FONT>
--   <b>pragma</b> Inline (Top_Row);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_305_13">Top_Row</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_17"#2|</EM></FONT>
--   <b>function</b> Get_Index (Itm : Item) <b>return</b> Positive;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_310_13" HREF="terminal_interface-curses-menus__adb.htm#ref_338_13">Get_Index</A></FONT> (<FONT COLOR=red><A NAME="ref_310_24" HREF="terminal_interface-curses-menus__adb.htm#ref_338_24">Itm</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>) <b>return</b> Positive;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_current.3x.html">item_index()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  Please note that in this binding we start the numbering of items</EM></FONT>
-    <FONT COLOR=green><EM>--  with 1. So this is number is one more than you get from the low</EM></FONT>
-    <FONT COLOR=green><EM>--  level call.</EM></FONT>
--   <b>pragma</b> Inline (Get_Index);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_310_13">Get_Index</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/menu_post.3x.html">menu_post.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_18"#2|</EM></FONT>
--   <b>procedure</b> Post (<FONT COLOR=red><A NAME="ref_323_20" HREF="terminal_interface-curses-menus__adb.htm#ref_352_20">Men</A></FONT>  : <b>in</b> Menu;
--                   Post : <b>in</b> Boolean := True);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_322_14" HREF="terminal_interface-curses-menus__adb.htm#ref_351_14">Post</A></FONT> (<FONT COLOR=red><A NAME="ref_322_20" HREF="terminal_interface-curses-menus__adb.htm#ref_351_20">Men</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                   <FONT COLOR=red><A NAME="ref_323_20" HREF="terminal_interface-curses-menus__adb.htm#ref_352_20">Post</A></FONT> : <b>in</b> Boolean := True);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_post.3x.html">post_menu()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: unpost_menu()</EM></FONT>
--   <b>pragma</b> Inline (Post);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_322_14">Post</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/menu_opts.3x.html">menu_opts.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_19"#2|</EM></FONT>
--   <b>procedure</b> Set_Options (<FONT COLOR=red><A NAME="ref_334_27" HREF="terminal_interface-curses-menus__adb.htm#ref_372_27">Men</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_121_9">Menu</A>;
--                          Options : <b>in</b> Menu_Option_Set);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_333_14" HREF="terminal_interface-curses-menus__adb.htm#ref_371_14">Set_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_333_27" HREF="terminal_interface-curses-menus__adb.htm#ref_371_27">Men</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                          <FONT COLOR=red><A NAME="ref_334_27" HREF="terminal_interface-curses-menus__adb.htm#ref_372_27">Options</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_121_9">Menu_Option_Set</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_opts.3x.html">set_menu_opts()</A></EM></FONT>
-    <b>pragma</b> Inline (Set_Options);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_20"#2|</EM></FONT>
--   <b>procedure</b> Switch_Options (<FONT COLOR=red><A NAME="ref_340_30" HREF="terminal_interface-curses-menus__adb.htm#ref_388_30">Men</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_121_9">Menu</A>;
--                             <FONT COLOR=red><A NAME="ref_341_30" HREF="terminal_interface-curses-menus__adb.htm#ref_389_30">Options</A></FONT> : <b>in</b> Menu_Option_Set;
--                             On      : Boolean := True);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_339_14" HREF="terminal_interface-curses-menus__adb.htm#ref_387_14">Switch_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_339_30" HREF="terminal_interface-curses-menus__adb.htm#ref_387_30">Men</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                             <FONT COLOR=red><A NAME="ref_340_30" HREF="terminal_interface-curses-menus__adb.htm#ref_388_30">Options</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_121_9">Menu_Option_Set</A>;
-+                             <FONT COLOR=red><A NAME="ref_341_30" HREF="terminal_interface-curses-menus__adb.htm#ref_389_30">On</A></FONT>      : Boolean := True);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_opts.3x.html">menu_opts_on()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: menu_opts_off()</EM></FONT>
-    <b>pragma</b> Inline (Switch_Options);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_21"#2|</EM></FONT>
--   <b>procedure</b> Get_Options (<FONT COLOR=red><A NAME="ref_348_27" HREF="terminal_interface-curses-menus__adb.htm#ref_412_32">Men</A></FONT>     : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_121_9">Menu</A>;
--                          Options : <b>out</b> Menu_Option_Set);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_347_14" HREF="terminal_interface-curses-menus__adb.htm#ref_411_14">Get_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_347_27" HREF="terminal_interface-curses-menus__adb.htm#ref_411_27">Men</A></FONT>     : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                          <FONT COLOR=red><A NAME="ref_348_27" HREF="terminal_interface-curses-menus__adb.htm#ref_412_32">Options</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_121_9">Menu_Option_Set</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_opts.3x.html">menu_opts()</A></EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_22"#2|</EM></FONT>
--   <b>function</b> Get_Options (Men : Menu := Null_Menu) <b>return</b> Menu_Option_Set;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_352_13" HREF="terminal_interface-curses-menus__adb.htm#ref_422_13">Get_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_352_26" HREF="terminal_interface-curses-menus__adb.htm#ref_422_26">Men</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A> := <A HREF="terminal_interface-curses-menus__ads.htm#ref_63_4">Null_Menu</A>) <b>return</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_121_9">Menu_Option_Set</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_opts.3x.html">menu_opts()</A></EM></FONT>
-    <b>pragma</b> Inline (Get_Options);
- 
-@@ -364,185 +363,185 @@
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_23"#2|</EM></FONT>
--   <b>procedure</b> Set_Window (<FONT COLOR=red><A NAME="ref_362_26" HREF="terminal_interface-curses-menus__adb.htm#ref_431_26">Men</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Menu</A>;
--                         Win : <b>in</b> Window);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_361_14" HREF="terminal_interface-curses-menus__adb.htm#ref_430_14">Set_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_361_26" HREF="terminal_interface-curses-menus__adb.htm#ref_430_26">Men</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                         <FONT COLOR=red><A NAME="ref_362_26" HREF="terminal_interface-curses-menus__adb.htm#ref_431_26">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_win.3x.html">set_menu_win()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Window);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_361_14">Set_Window</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_24"#2|</EM></FONT>
--   <b>function</b> Get_Window (Men : Menu) <b>return</b> Window;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_367_13" HREF="terminal_interface-curses-menus__adb.htm#ref_444_13">Get_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_367_25" HREF="terminal_interface-curses-menus__adb.htm#ref_444_25">Men</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_win.3x.html">menu_win()</A></EM></FONT>
--   <b>pragma</b> Inline (Get_Window);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_367_13">Get_Window</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_25"#2|</EM></FONT>
--   <b>procedure</b> Set_Sub_Window (<FONT COLOR=red><A NAME="ref_373_30" HREF="terminal_interface-curses-menus__adb.htm#ref_455_30">Men</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Menu</A>;
--                             Win : <b>in</b> Window);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_372_14" HREF="terminal_interface-curses-menus__adb.htm#ref_454_14">Set_Sub_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_372_30" HREF="terminal_interface-curses-menus__adb.htm#ref_454_30">Men</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                             <FONT COLOR=red><A NAME="ref_373_30" HREF="terminal_interface-curses-menus__adb.htm#ref_455_30">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_win.3x.html">set_menu_sub()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Sub_Window);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_372_14">Set_Sub_Window</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_26"#2|</EM></FONT>
--   <b>function</b> Get_Sub_Window (Men : Menu) <b>return</b> Window;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_378_13" HREF="terminal_interface-curses-menus__adb.htm#ref_468_13">Get_Sub_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_378_29" HREF="terminal_interface-curses-menus__adb.htm#ref_468_29">Men</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_win.3x.html">menu_sub()</A></EM></FONT>
--   <b>pragma</b> Inline (Get_Sub_Window);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_378_13">Get_Sub_Window</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_27"#2|</EM></FONT>
--   <b>procedure</b> Scale (<FONT COLOR=red><A NAME="ref_384_21" HREF="terminal_interface-curses-menus__adb.htm#ref_479_21">Men</A></FONT>     : <b>in</b> Menu;
--                    <FONT COLOR=red><A NAME="ref_385_21" HREF="terminal_interface-curses-menus__adb.htm#ref_480_21">Lines</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
--                    Columns : <b>out</b> Column_Count);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_383_14" HREF="terminal_interface-curses-menus__adb.htm#ref_478_14">Scale</A></FONT> (<FONT COLOR=red><A NAME="ref_383_21" HREF="terminal_interface-curses-menus__adb.htm#ref_478_21">Men</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                    <FONT COLOR=red><A NAME="ref_384_21" HREF="terminal_interface-curses-menus__adb.htm#ref_479_21">Lines</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+                    <FONT COLOR=red><A NAME="ref_385_21" HREF="terminal_interface-curses-menus__adb.htm#ref_480_21">Columns</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_win.3x.html">scale_menu()</A></EM></FONT>
--   <b>pragma</b> Inline (Scale);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_383_14">Scale</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/menu_cursor.3x.html">menu_cursor.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_28"#2|</EM></FONT>
--   <b>procedure</b> Position_Cursor (Men : Menu);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_394_14" HREF="terminal_interface-curses-menus__adb.htm#ref_497_14">Position_Cursor</A></FONT> (<FONT COLOR=red><A NAME="ref_394_31" HREF="terminal_interface-curses-menus__adb.htm#ref_497_31">Men</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_cursor.3x.html">pos_menu_cursor()</A></EM></FONT>
--   <b>pragma</b> Inline (Position_Cursor);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_394_14">Position_Cursor</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/menu_mark.3x.html">menu_mark.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_29"#2|</EM></FONT>
--   <b>procedure</b> Set_Mark (<FONT COLOR=red><A NAME="ref_404_24" HREF="terminal_interface-curses-menus__adb.htm#ref_511_24">Men</A></FONT>  : <b>in</b> Menu;
--                       Mark : <b>in</b> String);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_403_14" HREF="terminal_interface-curses-menus__adb.htm#ref_510_14">Set_Mark</A></FONT> (<FONT COLOR=red><A NAME="ref_403_24" HREF="terminal_interface-curses-menus__adb.htm#ref_510_24">Men</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                       <FONT COLOR=red><A NAME="ref_404_24" HREF="terminal_interface-curses-menus__adb.htm#ref_511_24">Mark</A></FONT> : <b>in</b> String);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_mark.3x.html">set_menu_mark()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Mark);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_403_14">Set_Mark</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_30"#2|</EM></FONT>
--   <b>procedure</b> Mark (<FONT COLOR=red><A NAME="ref_410_20" HREF="terminal_interface-curses-menus__adb.htm#ref_530_20">Men</A></FONT>  : <b>in</b>  Menu;
--                   Mark : <b>out</b> String);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_409_14" HREF="terminal_interface-curses-menus__adb.htm#ref_529_14">Mark</A></FONT> (<FONT COLOR=red><A NAME="ref_409_20" HREF="terminal_interface-curses-menus__adb.htm#ref_529_20">Men</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                   <FONT COLOR=red><A NAME="ref_410_20" HREF="terminal_interface-curses-menus__adb.htm#ref_530_20">Mark</A></FONT> : <b>out</b> String);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_mark.3x.html">menu_mark()</A></EM></FONT>
- 
--   <b>function</b>  Mark (Men : Menu) <b>return</b> String;
-+   <b>function</b>  <FONT COLOR=red><A NAME="ref_413_14" HREF="terminal_interface-curses-menus__adb.htm#ref_538_13">Mark</A></FONT> (<FONT COLOR=red><A NAME="ref_413_20" HREF="terminal_interface-curses-menus__adb.htm#ref_538_19">Men</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>) <b>return</b> String;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_mark.3x.html">menu_mark()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  Implemented as function</EM></FONT>
-    <b>pragma</b> Inline (Mark);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
--   <FONT COLOR=green><EM>--  | Man page <A HREF="../man/menu_attribs.3x.html">menu_attribs.3x</A></EM></FONT>
-+   <FONT COLOR=green><EM>--  | Man page <A HREF="../man/menu_attributes.3x.html">menu_attributes.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_31"#2|</EM></FONT>
--   <b>procedure</b> Set_Foreground
--     (<FONT COLOR=red><A NAME="ref_425_7" HREF="terminal_interface-curses-menus__adb.htm#ref_549_7">Men</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Menu</A>;
--      <FONT COLOR=red><A NAME="ref_426_7" HREF="terminal_interface-curses-menus__adb.htm#ref_550_7">Fore</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character_Attribute_Set</A> := Normal_Video;
--      Color : <b>in</b> Color_Pair := Color_Pair'First);
--   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attribs.3x.html">set_menu_fore()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Foreground);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_423_14" HREF="terminal_interface-curses-menus__adb.htm#ref_547_14">Set_Foreground</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_424_7" HREF="terminal_interface-curses-menus__adb.htm#ref_548_7">Men</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+      <FONT COLOR=red><A NAME="ref_425_7" HREF="terminal_interface-curses-menus__adb.htm#ref_549_7">Fore</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-+      <FONT COLOR=red><A NAME="ref_426_7" HREF="terminal_interface-curses-menus__adb.htm#ref_550_7">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First);
-+   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attributes.3x.html">set_menu_fore()</A></EM></FONT>
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_423_14">Set_Foreground</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_32"#2|</EM></FONT>
--   <b>procedure</b> Foreground (<FONT COLOR=red><A NAME="ref_432_26" HREF="terminal_interface-curses-menus__adb.htm#ref_567_26">Men</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Menu</A>;
--                         Fore  : <b>out</b> Character_Attribute_Set);
--   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attribs.3x.html">menu_fore()</A></EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_431_14" HREF="terminal_interface-curses-menus__adb.htm#ref_566_14">Foreground</A></FONT> (<FONT COLOR=red><A NAME="ref_431_26" HREF="terminal_interface-curses-menus__adb.htm#ref_566_26">Men</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                         <FONT COLOR=red><A NAME="ref_432_26" HREF="terminal_interface-curses-menus__adb.htm#ref_567_26">Fore</A></FONT>  : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>);
-+   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attributes.3x.html">menu_fore()</A></EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_33"#2|</EM></FONT>
--   <b>procedure</b> Foreground (<FONT COLOR=red><A NAME="ref_437_26" HREF="terminal_interface-curses-menus__adb.htm#ref_576_26">Men</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Menu</A>;
--                         <FONT COLOR=red><A NAME="ref_438_26" HREF="terminal_interface-curses-menus__adb.htm#ref_577_26">Fore</A></FONT>  : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character_Attribute_Set</A>;
--                         Color : <b>out</b> Color_Pair);
--   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attribs.3x.html">menu_fore()</A></EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_436_14" HREF="terminal_interface-curses-menus__adb.htm#ref_575_14">Foreground</A></FONT> (<FONT COLOR=red><A NAME="ref_436_26" HREF="terminal_interface-curses-menus__adb.htm#ref_575_26">Men</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                         <FONT COLOR=red><A NAME="ref_437_26" HREF="terminal_interface-curses-menus__adb.htm#ref_576_26">Fore</A></FONT>  : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>;
-+                         <FONT COLOR=red><A NAME="ref_438_26" HREF="terminal_interface-curses-menus__adb.htm#ref_577_26">Color</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>);
-+   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attributes.3x.html">menu_fore()</A></EM></FONT>
-    <b>pragma</b> Inline (Foreground);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_34"#2|</EM></FONT>
--   <b>procedure</b> Set_Background
--     (<FONT COLOR=red><A NAME="ref_445_7" HREF="terminal_interface-curses-menus__adb.htm#ref_588_7">Men</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Menu</A>;
--      <FONT COLOR=red><A NAME="ref_446_7" HREF="terminal_interface-curses-menus__adb.htm#ref_589_7">Back</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character_Attribute_Set</A> := Normal_Video;
--      Color : <b>in</b> Color_Pair := Color_Pair'First);
--   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attribs.3x.html">set_menu_back()</A></EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_443_14" HREF="terminal_interface-curses-menus__adb.htm#ref_586_14">Set_Background</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_444_7" HREF="terminal_interface-curses-menus__adb.htm#ref_587_7">Men</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+      <FONT COLOR=red><A NAME="ref_445_7" HREF="terminal_interface-curses-menus__adb.htm#ref_588_7">Back</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-+      <FONT COLOR=red><A NAME="ref_446_7" HREF="terminal_interface-curses-menus__adb.htm#ref_589_7">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First);
-+   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attributes.3x.html">set_menu_back()</A></EM></FONT>
-    <b>pragma</b> Inline (Set_Background);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_35"#2|</EM></FONT>
--   <b>procedure</b> Background (<FONT COLOR=red><A NAME="ref_452_26" HREF="terminal_interface-curses-menus__adb.htm#ref_606_26">Men</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Menu</A>;
--                         Back : <b>out</b> Character_Attribute_Set);
--   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attribs.3x.html">menu_back()</A></EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_451_14" HREF="terminal_interface-curses-menus__adb.htm#ref_605_14">Background</A></FONT> (<FONT COLOR=red><A NAME="ref_451_26" HREF="terminal_interface-curses-menus__adb.htm#ref_605_26">Men</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                         <FONT COLOR=red><A NAME="ref_452_26" HREF="terminal_interface-curses-menus__adb.htm#ref_606_26">Back</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>);
-+   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attributes.3x.html">menu_back()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_36"#2|</EM></FONT>
- 
--   <b>procedure</b> Background (<FONT COLOR=red><A NAME="ref_457_26" HREF="terminal_interface-curses-menus__adb.htm#ref_615_26">Men</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Menu</A>;
--                         <FONT COLOR=red><A NAME="ref_458_26" HREF="terminal_interface-curses-menus__adb.htm#ref_616_26">Back</A></FONT>  : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character_Attribute_Set</A>;
--                         Color : <b>out</b> Color_Pair);
--   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attribs.3x.html">menu_back()</A></EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_456_14" HREF="terminal_interface-curses-menus__adb.htm#ref_614_14">Background</A></FONT> (<FONT COLOR=red><A NAME="ref_456_26" HREF="terminal_interface-curses-menus__adb.htm#ref_614_26">Men</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                         <FONT COLOR=red><A NAME="ref_457_26" HREF="terminal_interface-curses-menus__adb.htm#ref_615_26">Back</A></FONT>  : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>;
-+                         <FONT COLOR=red><A NAME="ref_458_26" HREF="terminal_interface-curses-menus__adb.htm#ref_616_26">Color</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>);
-+   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attributes.3x.html">menu_back()</A></EM></FONT>
-    <b>pragma</b> Inline (Background);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_37"#2|</EM></FONT>
--   <b>procedure</b> Set_Grey
--     (<FONT COLOR=red><A NAME="ref_465_7" HREF="terminal_interface-curses-menus__adb.htm#ref_626_24">Men</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Menu</A>;
--      <FONT COLOR=red><A NAME="ref_466_7" HREF="terminal_interface-curses-menus__adb.htm#ref_627_24">Grey</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character_Attribute_Set</A> := Normal_Video;
--      Color : <b>in</b> Color_Pair := Color_Pair'First);
--   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attribs.3x.html">set_menu_grey()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Grey);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_463_14" HREF="terminal_interface-curses-menus__adb.htm#ref_625_14">Set_Grey</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_464_7" HREF="terminal_interface-curses-menus__adb.htm#ref_625_24">Men</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+      <FONT COLOR=red><A NAME="ref_465_7" HREF="terminal_interface-curses-menus__adb.htm#ref_626_24">Grey</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-+      <FONT COLOR=red><A NAME="ref_466_7" HREF="terminal_interface-curses-menus__adb.htm#ref_627_24">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First);
-+   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attributes.3x.html">set_menu_grey()</A></EM></FONT>
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_463_14">Set_Grey</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_38"#2|</EM></FONT>
--   <b>procedure</b> Grey (<FONT COLOR=red><A NAME="ref_472_20" HREF="terminal_interface-curses-menus__adb.htm#ref_645_20">Men</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Menu</A>;
--                   Grey : <b>out</b> Character_Attribute_Set);
--   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attribs.3x.html">menu_grey()</A></EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_471_14" HREF="terminal_interface-curses-menus__adb.htm#ref_644_14">Grey</A></FONT> (<FONT COLOR=red><A NAME="ref_471_20" HREF="terminal_interface-curses-menus__adb.htm#ref_644_20">Men</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                   <FONT COLOR=red><A NAME="ref_472_20" HREF="terminal_interface-curses-menus__adb.htm#ref_645_20">Grey</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>);
-+   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attributes.3x.html">menu_grey()</A></EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_39"#2|</EM></FONT>
--   <b>procedure</b> Grey
--     (<FONT COLOR=red><A NAME="ref_478_7" HREF="terminal_interface-curses-menus__adb.htm#ref_654_20">Men</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Menu</A>;
--      <FONT COLOR=red><A NAME="ref_479_7" HREF="terminal_interface-curses-menus__adb.htm#ref_655_20">Grey</A></FONT>  : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character_Attribute_Set</A>;
--      Color : <b>out</b> Color_Pair);
--   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attribs.3x.html">menu_grey()</A></EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_476_14" HREF="terminal_interface-curses-menus__adb.htm#ref_653_14">Grey</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_477_7" HREF="terminal_interface-curses-menus__adb.htm#ref_653_20">Men</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+      <FONT COLOR=red><A NAME="ref_478_7" HREF="terminal_interface-curses-menus__adb.htm#ref_654_20">Grey</A></FONT>  : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>;
-+      <FONT COLOR=red><A NAME="ref_479_7" HREF="terminal_interface-curses-menus__adb.htm#ref_655_20">Color</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>);
-+   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attributes.3x.html">menu_grey()</A></EM></FONT>
-    <b>pragma</b> Inline (Grey);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_40"#2|</EM></FONT>
--   <b>procedure</b> Set_Pad_Character (<FONT COLOR=red><A NAME="ref_485_33" HREF="terminal_interface-curses-menus__adb.htm#ref_665_33">Men</A></FONT> : <b>in</b> Menu;
--                                Pad : <b>in</b> Character := Space);
--   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attribs.3x.html">set_menu_pad()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Pad_Character);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_484_14" HREF="terminal_interface-curses-menus__adb.htm#ref_664_14">Set_Pad_Character</A></FONT> (<FONT COLOR=red><A NAME="ref_484_33" HREF="terminal_interface-curses-menus__adb.htm#ref_664_33">Men</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                                <FONT COLOR=red><A NAME="ref_485_33" HREF="terminal_interface-curses-menus__adb.htm#ref_665_33">Pad</A></FONT> : <b>in</b> Character := Space);
-+   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attributes.3x.html">set_menu_pad()</A></EM></FONT>
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_484_14">Set_Pad_Character</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_41"#2|</EM></FONT>
--   <b>procedure</b> Pad_Character (<FONT COLOR=red><A NAME="ref_491_29" HREF="terminal_interface-curses-menus__adb.htm#ref_680_29">Men</A></FONT> : <b>in</b>  Menu;
--                            Pad : <b>out</b> Character);
--   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attribs.3x.html">menu_pad()</A></EM></FONT>
--   <b>pragma</b> Inline (Pad_Character);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_490_14" HREF="terminal_interface-curses-menus__adb.htm#ref_679_14">Pad_Character</A></FONT> (<FONT COLOR=red><A NAME="ref_490_29" HREF="terminal_interface-curses-menus__adb.htm#ref_679_29">Men</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                            <FONT COLOR=red><A NAME="ref_491_29" HREF="terminal_interface-curses-menus__adb.htm#ref_680_29">Pad</A></FONT> : <b>out</b> Character);
-+   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attributes.3x.html">menu_pad()</A></EM></FONT>
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_490_14">Pad_Character</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/menu_spacing.3x.html">menu_spacing.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_42"#2|</EM></FONT>
--   <b>procedure</b> Set_Spacing (<FONT COLOR=red><A NAME="ref_501_27" HREF="terminal_interface-curses-menus__adb.htm#ref_689_27">Men</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Menu</A>;
--                          <FONT COLOR=red><A NAME="ref_502_27" HREF="terminal_interface-curses-menus__adb.htm#ref_690_27">Descr</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Position</A> := 0;
--                          <FONT COLOR=red><A NAME="ref_503_27" HREF="terminal_interface-curses-menus__adb.htm#ref_691_27">Row</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>   := 0;
--                          Col   : <b>in</b> Column_Position := 0);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_500_14" HREF="terminal_interface-curses-menus__adb.htm#ref_688_14">Set_Spacing</A></FONT> (<FONT COLOR=red><A NAME="ref_500_27" HREF="terminal_interface-curses-menus__adb.htm#ref_688_27">Men</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                          <FONT COLOR=red><A NAME="ref_501_27" HREF="terminal_interface-curses-menus__adb.htm#ref_689_27">Descr</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> := 0;
-+                          <FONT COLOR=red><A NAME="ref_502_27" HREF="terminal_interface-curses-menus__adb.htm#ref_690_27">Row</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>   := 0;
-+                          <FONT COLOR=red><A NAME="ref_503_27" HREF="terminal_interface-curses-menus__adb.htm#ref_691_27">Col</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> := 0);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_spacing.3x.html">set_menu_spacing()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Spacing);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_500_14">Set_Spacing</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_43"#2|</EM></FONT>
--   <b>procedure</b> Spacing (<FONT COLOR=red><A NAME="ref_509_23" HREF="terminal_interface-curses-menus__adb.htm#ref_708_23">Men</A></FONT>   : <b>in</b> Menu;
--                      <FONT COLOR=red><A NAME="ref_510_23" HREF="terminal_interface-curses-menus__adb.htm#ref_709_23">Descr</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Position</A>;
--                      <FONT COLOR=red><A NAME="ref_511_23" HREF="terminal_interface-curses-menus__adb.htm#ref_710_23">Row</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--                      Col   : <b>out</b> Column_Position);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_508_14" HREF="terminal_interface-curses-menus__adb.htm#ref_707_14">Spacing</A></FONT> (<FONT COLOR=red><A NAME="ref_508_23" HREF="terminal_interface-curses-menus__adb.htm#ref_707_23">Men</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                      <FONT COLOR=red><A NAME="ref_509_23" HREF="terminal_interface-curses-menus__adb.htm#ref_708_23">Descr</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+                      <FONT COLOR=red><A NAME="ref_510_23" HREF="terminal_interface-curses-menus__adb.htm#ref_709_23">Row</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+                      <FONT COLOR=red><A NAME="ref_511_23" HREF="terminal_interface-curses-menus__adb.htm#ref_710_23">Col</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_spacing.3x.html">menu_spacing()</A></EM></FONT>
--   <b>pragma</b> Inline (Spacing);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_508_14">Spacing</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/menu_pattern.3x.html">menu_pattern.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_44"#2|</EM></FONT>
--   <b>function</b> Set_Pattern (<FONT COLOR=red><A NAME="ref_521_26" HREF="terminal_interface-curses-menus__adb.htm#ref_733_26">Men</A></FONT>  : Menu;
--                         Text : String) <b>return</b> Boolean;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_520_13" HREF="terminal_interface-curses-menus__adb.htm#ref_732_13">Set_Pattern</A></FONT> (<FONT COLOR=red><A NAME="ref_520_26" HREF="terminal_interface-curses-menus__adb.htm#ref_732_26">Men</A></FONT>  : <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                         <FONT COLOR=red><A NAME="ref_521_26" HREF="terminal_interface-curses-menus__adb.htm#ref_733_26">Text</A></FONT> : String) <b>return</b> Boolean;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_pattern.3x.html">set_menu_pattern()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  Return TRUE if the pattern matches, FALSE otherwise</EM></FONT>
--   <b>pragma</b> Inline (Set_Pattern);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_520_13">Set_Pattern</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_45"#2|</EM></FONT>
--   <b>procedure</b> Pattern (<FONT COLOR=red><A NAME="ref_528_23" HREF="terminal_interface-curses-menus__adb.htm#ref_756_23">Men</A></FONT>  : <b>in</b>  Menu;
--                      Text : <b>out</b> String);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_527_14" HREF="terminal_interface-curses-menus__adb.htm#ref_755_14">Pattern</A></FONT> (<FONT COLOR=red><A NAME="ref_527_23" HREF="terminal_interface-curses-menus__adb.htm#ref_755_23">Men</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                      <FONT COLOR=red><A NAME="ref_528_23" HREF="terminal_interface-curses-menus__adb.htm#ref_756_23">Text</A></FONT> : <b>out</b> String);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_pattern.3x.html">menu_pattern()</A></EM></FONT>
--   <b>pragma</b> Inline (Pattern);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_527_14">Pattern</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/menu_format.3x.html">menu_format.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_46"#2|</EM></FONT>
--   <b>procedure</b> Set_Format (<FONT COLOR=red><A NAME="ref_538_26" HREF="terminal_interface-curses-menus__adb.htm#ref_765_26">Men</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Menu</A>;
--                         <FONT COLOR=red><A NAME="ref_539_26" HREF="terminal_interface-curses-menus__adb.htm#ref_766_26">Lines</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
--                         Columns : <b>in</b> Column_Count);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_537_14" HREF="terminal_interface-curses-menus__adb.htm#ref_764_14">Set_Format</A></FONT> (<FONT COLOR=red><A NAME="ref_537_26" HREF="terminal_interface-curses-menus__adb.htm#ref_764_26">Men</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                         <FONT COLOR=red><A NAME="ref_538_26" HREF="terminal_interface-curses-menus__adb.htm#ref_765_26">Lines</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+                         <FONT COLOR=red><A NAME="ref_539_26" HREF="terminal_interface-curses-menus__adb.htm#ref_766_26">Columns</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>);
-    <FONT COLOR=green><EM>--  Not implemented: 0 argument for Lines or Columns;</EM></FONT>
-    <FONT COLOR=green><EM>--  instead use Format to get the current sizes</EM></FONT>
-    <FONT COLOR=green><EM>--      The  default  format  is  16  rows,  1  column.    Calling</EM></FONT>
-@@ -551,104 +550,104 @@
-    <FONT COLOR=green><EM>--      is  interpreted  as  a  request  not to change the current</EM></FONT>
-    <FONT COLOR=green><EM>--      value.</EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_format.3x.html">set_menu_format()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Format);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_537_14">Set_Format</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_47"#2|</EM></FONT>
--   <b>procedure</b> Format (<FONT COLOR=red><A NAME="ref_552_22" HREF="terminal_interface-curses-menus__adb.htm#ref_783_22">Men</A></FONT>     : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Menu</A>;
--                     <FONT COLOR=red><A NAME="ref_553_22" HREF="terminal_interface-curses-menus__adb.htm#ref_784_22">Lines</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
--                     Columns : <b>out</b> Column_Count);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_551_14" HREF="terminal_interface-curses-menus__adb.htm#ref_782_14">Format</A></FONT> (<FONT COLOR=red><A NAME="ref_551_22" HREF="terminal_interface-curses-menus__adb.htm#ref_782_22">Men</A></FONT>     : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                     <FONT COLOR=red><A NAME="ref_552_22" HREF="terminal_interface-curses-menus__adb.htm#ref_783_22">Lines</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+                     <FONT COLOR=red><A NAME="ref_553_22" HREF="terminal_interface-curses-menus__adb.htm#ref_784_22">Columns</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_format.3x.html">menu_format()</A></EM></FONT>
--   <b>pragma</b> Inline (Format);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_551_14">Format</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/menu_hook.3x.html">menu_hook.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <b>type</b> Menu_Hook_Function <b>is</b> <b>access</b> <b>procedure</b> (Men : <b>in</b> Menu);
--   <b>pragma</b> Convention (C, Menu_Hook_Function);
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_561_9">Menu_Hook_Function</A></FONT> <b>is</b> <b>access</b> <b>procedure</b> (<FONT COLOR=red><A NAME="ref_561_49">Men</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>);
-+   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-menus__ads.htm#ref_561_9">Menu_Hook_Function</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_48"#2|</EM></FONT>
--   <b>procedure</b> Set_Item_Init_Hook (<FONT COLOR=red><A NAME="ref_566_34" HREF="terminal_interface-curses-menus__adb.htm#ref_803_34">Men</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_561_9">Menu</A>;
--                                 Proc : <b>in</b> Menu_Hook_Function);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_565_14" HREF="terminal_interface-curses-menus__adb.htm#ref_802_14">Set_Item_Init_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_565_34" HREF="terminal_interface-curses-menus__adb.htm#ref_802_34">Men</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                                 <FONT COLOR=red><A NAME="ref_566_34" HREF="terminal_interface-curses-menus__adb.htm#ref_803_34">Proc</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_561_9">Menu_Hook_Function</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_hook.3x.html">set_item_init()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Item_Init_Hook);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_565_14">Set_Item_Init_Hook</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_49"#2|</EM></FONT>
--   <b>procedure</b> Set_Item_Term_Hook (<FONT COLOR=red><A NAME="ref_572_34" HREF="terminal_interface-curses-menus__adb.htm#ref_817_34">Men</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_561_9">Menu</A>;
--                                 Proc : <b>in</b> Menu_Hook_Function);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_571_14" HREF="terminal_interface-curses-menus__adb.htm#ref_816_14">Set_Item_Term_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_571_34" HREF="terminal_interface-curses-menus__adb.htm#ref_816_34">Men</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                                 <FONT COLOR=red><A NAME="ref_572_34" HREF="terminal_interface-curses-menus__adb.htm#ref_817_34">Proc</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_561_9">Menu_Hook_Function</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_hook.3x.html">set_item_term()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Item_Term_Hook);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_571_14">Set_Item_Term_Hook</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_50"#2|</EM></FONT>
--   <b>procedure</b> Set_Menu_Init_Hook (<FONT COLOR=red><A NAME="ref_578_34" HREF="terminal_interface-curses-menus__adb.htm#ref_831_34">Men</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_561_9">Menu</A>;
--                                 Proc : <b>in</b> Menu_Hook_Function);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_577_14" HREF="terminal_interface-curses-menus__adb.htm#ref_830_14">Set_Menu_Init_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_577_34" HREF="terminal_interface-curses-menus__adb.htm#ref_830_34">Men</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                                 <FONT COLOR=red><A NAME="ref_578_34" HREF="terminal_interface-curses-menus__adb.htm#ref_831_34">Proc</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_561_9">Menu_Hook_Function</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_hook.3x.html">set_menu_init()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Menu_Init_Hook);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_577_14">Set_Menu_Init_Hook</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_51"#2|</EM></FONT>
--   <b>procedure</b> Set_Menu_Term_Hook (<FONT COLOR=red><A NAME="ref_584_34" HREF="terminal_interface-curses-menus__adb.htm#ref_845_34">Men</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_561_9">Menu</A>;
--                                 Proc : <b>in</b> Menu_Hook_Function);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_583_14" HREF="terminal_interface-curses-menus__adb.htm#ref_844_14">Set_Menu_Term_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_583_34" HREF="terminal_interface-curses-menus__adb.htm#ref_844_34">Men</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                                 <FONT COLOR=red><A NAME="ref_584_34" HREF="terminal_interface-curses-menus__adb.htm#ref_845_34">Proc</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_561_9">Menu_Hook_Function</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_hook.3x.html">set_menu_term()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Menu_Term_Hook);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_583_14">Set_Menu_Term_Hook</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_52"#2|</EM></FONT>
--   <b>function</b> Get_Item_Init_Hook (Men : Menu) <b>return</b> Menu_Hook_Function;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_589_13" HREF="terminal_interface-curses-menus__adb.htm#ref_858_13">Get_Item_Init_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_589_33" HREF="terminal_interface-curses-menus__adb.htm#ref_858_33">Men</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>) <b>return</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_561_9">Menu_Hook_Function</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_hook.3x.html">item_init()</A></EM></FONT>
--   <b>pragma</b> Inline (Get_Item_Init_Hook);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_589_13">Get_Item_Init_Hook</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_53"#2|</EM></FONT>
--   <b>function</b> Get_Item_Term_Hook (Men : Menu) <b>return</b> Menu_Hook_Function;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_594_13" HREF="terminal_interface-curses-menus__adb.htm#ref_866_13">Get_Item_Term_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_594_33" HREF="terminal_interface-curses-menus__adb.htm#ref_866_33">Men</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>) <b>return</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_561_9">Menu_Hook_Function</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_hook.3x.html">item_term()</A></EM></FONT>
--   <b>pragma</b> Inline (Get_Item_Term_Hook);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_594_13">Get_Item_Term_Hook</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_54"#2|</EM></FONT>
--   <b>function</b> Get_Menu_Init_Hook (Men : Menu) <b>return</b> Menu_Hook_Function;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_599_13" HREF="terminal_interface-curses-menus__adb.htm#ref_874_13">Get_Menu_Init_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_599_33" HREF="terminal_interface-curses-menus__adb.htm#ref_874_33">Men</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>) <b>return</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_561_9">Menu_Hook_Function</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_hook.3x.html">menu_init()</A></EM></FONT>
--   <b>pragma</b> Inline (Get_Menu_Init_Hook);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_599_13">Get_Menu_Init_Hook</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_55"#2|</EM></FONT>
--   <b>function</b> Get_Menu_Term_Hook (Men : Menu) <b>return</b> Menu_Hook_Function;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_604_13" HREF="terminal_interface-curses-menus__adb.htm#ref_882_13">Get_Menu_Term_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_604_33" HREF="terminal_interface-curses-menus__adb.htm#ref_882_33">Men</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>) <b>return</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_561_9">Menu_Hook_Function</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_hook.3x.html">menu_term()</A></EM></FONT>
--   <b>pragma</b> Inline (Get_Menu_Term_Hook);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_604_13">Get_Menu_Term_Hook</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/menu_items.3x.html">menu_items.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_56"#2|</EM></FONT>
--   <b>procedure</b> Redefine (<FONT COLOR=red><A NAME="ref_614_24" HREF="terminal_interface-curses-menus__adb.htm#ref_891_24">Men</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_178_9">Menu</A>;
--                       Items : <b>in</b> Item_Array_Access);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_613_14" HREF="terminal_interface-curses-menus__adb.htm#ref_890_14">Redefine</A></FONT> (<FONT COLOR=red><A NAME="ref_613_24" HREF="terminal_interface-curses-menus__adb.htm#ref_890_24">Men</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                       <FONT COLOR=red><A NAME="ref_614_24" HREF="terminal_interface-curses-menus__adb.htm#ref_891_24">Items</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_178_9">Item_Array_Access</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_items.3x.html">set_menu_items()</A></EM></FONT>
--   <b>pragma</b> Inline (Redefine);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_613_14">Redefine</A>);
- 
--   <b>procedure</b> Set_Items (<FONT COLOR=red><A NAME="ref_619_25">Men</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_178_9">Menu</A>;
--                        Items : <b>in</b> Item_Array_Access) <b>renames</b> Redefine;
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_618_14">Set_Items</A></FONT> (<FONT COLOR=red><A NAME="ref_618_25">Men</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                        <FONT COLOR=red><A NAME="ref_619_25">Items</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_178_9">Item_Array_Access</A>) <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_613_14">Redefine</A>;
-    <FONT COLOR=green><EM>--  pragma Inline (Set_Items);</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_57"#2|</EM></FONT>
--   <b>function</b> Items (<FONT COLOR=red><A NAME="ref_624_20" HREF="terminal_interface-curses-menus__adb.htm#ref_919_20">Men</A></FONT>   : Menu;
--                   Index : Positive) <b>return</b> Item;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_623_13" HREF="terminal_interface-curses-menus__adb.htm#ref_918_13">Items</A></FONT> (<FONT COLOR=red><A NAME="ref_623_20" HREF="terminal_interface-curses-menus__adb.htm#ref_918_20">Men</A></FONT>   : <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                   <FONT COLOR=red><A NAME="ref_624_20" HREF="terminal_interface-curses-menus__adb.htm#ref_919_20">Index</A></FONT> : Positive) <b>return</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_items.3x.html">menu_items()</A></EM></FONT>
--   <b>pragma</b> Inline (Items);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_623_13">Items</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_58"#2|</EM></FONT>
--   <b>function</b> Item_Count (Men : Menu) <b>return</b> Natural;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_629_13" HREF="terminal_interface-curses-menus__adb.htm#ref_910_13">Item_Count</A></FONT> (<FONT COLOR=red><A NAME="ref_629_25" HREF="terminal_interface-curses-menus__adb.htm#ref_910_25">Men</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>) <b>return</b> Natural;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_items.3x.html">item_count()</A></EM></FONT>
--   <b>pragma</b> Inline (Item_Count);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_629_13">Item_Count</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/menu_new.3x.html">menu_new.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_59"#2|</EM></FONT>
--   <b>function</b> Create (Items : Item_Array_Access) <b>return</b> Menu;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_638_13" HREF="terminal_interface-curses-menus__adb.htm#ref_937_13">Create</A></FONT> (<FONT COLOR=red><A NAME="ref_638_21" HREF="terminal_interface-curses-menus__adb.htm#ref_937_21">Items</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_178_9">Item_Array_Access</A>) <b>return</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_new.3x.html">new_menu()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  Not inlined</EM></FONT>
- 
--   <b>function</b> New_Menu (Items : Item_Array_Access) <b>return</b> Menu <b>renames</b> Create;
-+   <b>function</b> New_Menu (<FONT COLOR=red><A NAME="ref_642_23">Items</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_178_9">Item_Array_Access</A>) <b>return</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_638_13">Create</A>;
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_60"#2|</EM></FONT>
--   <b>procedure</b> Delete (Men : <b>in</b> <b>out</b> Menu);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_645_14" HREF="terminal_interface-curses-menus__adb.htm#ref_956_14">Delete</A></FONT> (<FONT COLOR=red><A NAME="ref_645_22" HREF="terminal_interface-curses-menus__adb.htm#ref_956_22">Men</A></FONT> : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_new.3x.html">free_menu()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  Reset Men to Null_Menu</EM></FONT>
-    <FONT COLOR=green><EM>--  Not inlined</EM></FONT>
-@@ -657,14 +656,14 @@
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/menu_driver.3x.html">menu_driver.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <b>type</b> Driver_Result <b>is</b> (<FONT COLOR=red><A NAME="ref_655_27">Menu_Ok</A></FONT>,
--                          <FONT COLOR=red><A NAME="ref_656_27">Request_Denied</A></FONT>,
--                          <FONT COLOR=red><A NAME="ref_657_27">Unknown_Request</A></FONT>,
--                          No_Match);
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_654_9">Driver_Result</A></FONT> <b>is</b> (<FONT COLOR=red><A NAME="ref_654_27">Menu_Ok</A></FONT>,
-+                          <FONT COLOR=red><A NAME="ref_655_27">Request_Denied</A></FONT>,
-+                          <FONT COLOR=red><A NAME="ref_656_27">Unknown_Request</A></FONT>,
-+                          <FONT COLOR=red><A NAME="ref_657_27">No_Match</A></FONT>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_61"#2|</EM></FONT>
--   <b>function</b> Driver (<FONT COLOR=red><A NAME="ref_661_21" HREF="terminal_interface-curses-menus__adb.htm#ref_971_21">Men</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_68_9">Menu</A>;
--                    Key : Key_Code) <b>return</b> Driver_Result;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_660_13" HREF="terminal_interface-curses-menus__adb.htm#ref_970_13">Driver</A></FONT> (<FONT COLOR=red><A NAME="ref_660_21" HREF="terminal_interface-curses-menus__adb.htm#ref_970_21">Men</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+                    <FONT COLOR=red><A NAME="ref_661_21" HREF="terminal_interface-curses-menus__adb.htm#ref_971_21">Key</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_68_9">Key_Code</A>) <b>return</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_654_9">Driver_Result</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_driver.3x.html">menu_driver()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  Driver is not inlined</EM></FONT>
- 
-@@ -672,11 +671,11 @@
-    <FONT COLOR=green><EM>--  Not Implemented: menu_request_name, menu_request_by_name</EM></FONT>
- <FONT COLOR=green><EM>-------------------------------------------------------------------------------</EM></FONT>
- <b>private</b>
--   <b>type</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Item</A>   <b>is</b> <b>new</b> System.Storage_Elements.Integer_Address;
--   <b>type</b> Menu   <b>is</b> <b>new</b> System.Storage_Elements.Integer_Address;
-+   <b>type</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>   <b>is</b> <b>new</b> System.Storage_Elements.Integer_Address;
-+   <b>type</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>   <b>is</b> <b>new</b> System.Storage_Elements.Integer_Address;
- 
--   <A HREF="terminal_interface-curses-menus__ads.htm#ref_63_4">Null_Item</A> : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Item</A> := 0;
--   Null_Menu : <b>constant</b> Menu := 0;
-+   <A HREF="terminal_interface-curses-menus__ads.htm#ref_62_4">Null_Item</A> : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A> := 0;
-+   <A HREF="terminal_interface-curses-menus__ads.htm#ref_63_4">Null_Menu</A> : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A> := 0;
- 
--<b>end</b> Terminal_Interface.Curses.Menus;
-+<b>end</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-menus__ads.htm#ref_49_35">Menus</A>;
- </PRE></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-mouse__adb.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-mouse__adb.htm
---- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-mouse__adb.htm	2006-09-23 16:31:31.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/terminal_interface-curses-mouse__adb.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -60,7 +60,7 @@
-       <b>function</b> <FONT COLOR=red><A NAME="ref_55_16">Mouse_Avail</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Mouse_Avail, "_nc_has_mouse");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_761_13">Has_Key</A> (<A HREF="terminal_interface-curses__ads.htm#ref_204_4">Key_Mouse</A>) <b>or</b> <b>else</b> <A HREF="terminal_interface-curses-mouse__adb.htm#ref_55_16">Mouse_Avail</A> /= 0 <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_767_13">Has_Key</A> (<A HREF="terminal_interface-curses__ads.htm#ref_204_4">Key_Mouse</A>) <b>or</b> <b>else</b> <A HREF="terminal_interface-curses-mouse__adb.htm#ref_55_16">Mouse_Avail</A> /= 0 <b>then</b>
-          <b>return</b> True;
-       <b>else</b>
-          <b>return</b> False;
-@@ -123,7 +123,7 @@
-    <b>begin</b>
-       <A HREF="terminal_interface-curses-mouse__adb.htm#ref_116_7">R</A> := <A HREF="terminal_interface-curses-mouse__adb.htm#ref_113_16">MMask</A> (<A HREF="terminal_interface-curses-mouse__ads.htm#ref_123_26">Mask</A>, <A HREF="terminal_interface-curses-mouse__adb.htm#ref_117_7">Old</A>'<b>Access</b>);
-       <b>if</b> <A HREF="terminal_interface-curses-mouse__adb.htm#ref_116_7">R</A> = <A HREF="terminal_interface-curses-mouse__ads.htm#ref_65_4">No_Events</A> <b>then</b>
--         <A HREF="terminal_interface-curses__ads.htm#ref_864_14">Beep</A>;
-+         <A HREF="terminal_interface-curses__ads.htm#ref_870_14">Beep</A>;
-       <b>end</b> <b>if</b>;
-       <b>return</b> <A HREF="terminal_interface-curses-mouse__adb.htm#ref_117_7">Old</A>;
-    <b>end</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_123_13">Start_Mouse</A>;
-@@ -132,7 +132,7 @@
-    <b>is</b>
-    <b>begin</b>
-       <b>if</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_128_25">Mask</A> /= <A HREF="terminal_interface-curses-mouse__ads.htm#ref_65_4">No_Events</A> <b>then</b>
--         <A HREF="terminal_interface-curses__ads.htm#ref_864_14">Beep</A>;
-+         <A HREF="terminal_interface-curses__ads.htm#ref_870_14">Beep</A>;
-       <b>end</b> <b>if</b>;
-    <b>end</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_128_14">End_Mouse</A>;
- 
-@@ -199,15 +199,15 @@
-       <b>end</b> <b>if</b>;
-    <b>end</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_149_14">Unget_Mouse</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_197_13" HREF="terminal_interface-curses-mouse__ads.htm#ref_154_13">Enclosed_In_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_197_33" HREF="terminal_interface-curses-mouse__ads.htm#ref_154_33">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_197_13" HREF="terminal_interface-curses-mouse__ads.htm#ref_154_13">Enclosed_In_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_197_33" HREF="terminal_interface-curses-mouse__ads.htm#ref_154_33">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-                                 <FONT COLOR=red><A NAME="ref_198_33" HREF="terminal_interface-curses-mouse__ads.htm#ref_155_33">Event</A></FONT>  : <A HREF="terminal_interface-curses-mouse__ads.htm#ref_92_9">Mouse_Event</A>) <b>return</b> Boolean
-    <b>is</b>
-       <b>function</b> <FONT COLOR=red><A NAME="ref_200_16">Wenclose</A></FONT> (<FONT COLOR=red><A NAME="ref_200_26" HREF="terminal_interface-curses-mouse__adb.htm#ref_200_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_200_40" HREF="terminal_interface-curses-mouse__adb.htm#ref_200_16">Y</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>; <FONT COLOR=red><A NAME="ref_200_51" HREF="terminal_interface-curses-mouse__adb.htm#ref_200_16">X</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>)
--                         <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>;
-+                         <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>;
-       <b>pragma</b> Import (C, Wenclose, "wenclose");
-    <b>begin</b>
-       <b>if</b> <A HREF="terminal_interface-curses-mouse__adb.htm#ref_200_16">Wenclose</A> (<A HREF="terminal_interface-curses-mouse__ads.htm#ref_154_33">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses-mouse__ads.htm#ref_155_33">Event</A>.<A HREF="terminal_interface-curses-mouse__ads.htm#ref_172_13">Y</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses-mouse__ads.htm#ref_155_33">Event</A>.<A HREF="terminal_interface-curses-mouse__ads.htm#ref_172_10">X</A>))
--        = <A HREF="terminal_interface-curses__ads.htm#ref_1931_4">Curses_Bool_False</A> <b>then</b>
-+        = <A HREF="terminal_interface-curses__ads.htm#ref_1927_4">Curses_Bool_False</A> <b>then</b>
-          <b>return</b> False;
-       <b>else</b>
-          <b>return</b> True;
-diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-mouse__ads.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-mouse__ads.htm
---- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-mouse__ads.htm	2006-09-23 16:31:31.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/terminal_interface-curses-mouse__ads.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -3,7 +3,6 @@
- <BODY>
- <HR><DIV ALIGN="center"><H1> File : terminal_interface-curses-mouse.ads </H1></DIV><HR>
- <PRE>
--
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
- <FONT COLOR=green><EM>--                           <A HREF="http://www.gnat.com">GNAT</A> ncurses Binding                           --</EM></FONT>
-@@ -51,8 +50,8 @@
- <FONT COLOR=green><EM>--  |</EM></FONT>
- <b>with</b> System;
- 
--<b>package</b> Terminal_Interface.Curses.Mouse <b>is</b>
--   <b>pragma</b> Preelaborate (Terminal_Interface.Curses.Mouse);
-+<b>package</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<FONT COLOR=red><A NAME="ref_48_35" HREF="terminal_interface-curses-mouse__adb.htm#ref_48_40">Mouse</A></FONT> <b>is</b>
-+   <b>pragma</b> Preelaborate (<A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-mouse__ads.htm#ref_48_35">Mouse</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_mouse.3x.html">curs_mouse.3x</A></EM></FONT>
-@@ -67,56 +66,56 @@
-    <FONT COLOR=green><EM>--  Not implemented:</EM></FONT>
-    <FONT COLOR=green><EM>--  REPORT_MOUSE_POSITION (i.e. as a parameter to Register_Reportable_Event</EM></FONT>
-    <FONT COLOR=green><EM>--  or Start_Mouse)</EM></FONT>
--   <b>type</b> Event_Mask <b>is</b> <b>private</b>;
--   <FONT COLOR=red><A NAME="ref_66_4">No_Events</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A>;
--   All_Events : <b>constant</b> Event_Mask;
--
--   <b>type</b> Mouse_Button <b>is</b> (<FONT COLOR=red><A NAME="ref_69_26">Left</A></FONT>,     <FONT COLOR=green><EM>-- aka: Button 1</EM></FONT>
--                         <FONT COLOR=red><A NAME="ref_70_26">Middle</A></FONT>,   <FONT COLOR=green><EM>-- aka: Button 2</EM></FONT>
--                         <FONT COLOR=red><A NAME="ref_71_26">Right</A></FONT>,    <FONT COLOR=green><EM>-- aka: Button 3</EM></FONT>
--                         <FONT COLOR=red><A NAME="ref_72_26">Button4</A></FONT>,  <FONT COLOR=green><EM>-- aka: Button 4</EM></FONT>
--                         <FONT COLOR=red><A NAME="ref_73_26">Control</A></FONT>,  <FONT COLOR=green><EM>-- Control Key</EM></FONT>
--                         <FONT COLOR=red><A NAME="ref_74_26">Shift</A></FONT>,    <FONT COLOR=green><EM>-- Shift Key</EM></FONT>
--                         Alt);     <FONT COLOR=green><EM>-- ALT Key</EM></FONT>
--
--   <b>subtype</b> <FONT COLOR=red><A NAME="ref_77_12">Real_Buttons</A></FONT>  <b>is</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_68_9">Mouse_Button</A> <b>range</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_72_26">Left</A> .. Button4;
--   <b>subtype</b> Modifier_Keys <b>is</b> Mouse_Button <b>range</b> Control .. Alt;
--
--   <b>type</b> Button_State <b>is</b> (<FONT COLOR=red><A NAME="ref_80_26">Released</A></FONT>,
--                         <FONT COLOR=red><A NAME="ref_81_26">Pressed</A></FONT>,
--                         <FONT COLOR=red><A NAME="ref_82_26">Clicked</A></FONT>,
--                         <FONT COLOR=red><A NAME="ref_83_26">Double_Clicked</A></FONT>,
--                         Triple_Clicked);
--
--   <b>type</b> Button_States <b>is</b> <b>array</b> (Button_State) <b>of</b> Boolean;
--   <b>pragma</b> Pack (Button_States);
--
--   All_Clicks : <b>constant</b> Button_States := (Clicked .. Triple_Clicked =&gt; True,
--   <FONT COLOR=red><A NAME="ref_90_4"> </A></FONT>                     <A HREF="terminal_interface-curses-mouse__ads.htm#ref_85_9"> </A>                 <b>others</b> =&gt; False);
--   All_States : <b>constant</b> Button_States := (<b>others</b> =&gt; True);
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_64_9">Event_Mask</A></FONT> <b>is</b> <b>private</b>;
-+   <FONT COLOR=red><A NAME="ref_65_4">No_Events</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A>;
-+   <FONT COLOR=red><A NAME="ref_66_4">All_Events</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A>;
-+
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_68_9">Mouse_Button</A></FONT> <b>is</b> (<FONT COLOR=red><A NAME="ref_68_26">Left</A></FONT>,     <FONT COLOR=green><EM>-- aka: Button 1</EM></FONT>
-+                         <FONT COLOR=red><A NAME="ref_69_26">Middle</A></FONT>,   <FONT COLOR=green><EM>-- aka: Button 2</EM></FONT>
-+                         <FONT COLOR=red><A NAME="ref_70_26">Right</A></FONT>,    <FONT COLOR=green><EM>-- aka: Button 3</EM></FONT>
-+                         <FONT COLOR=red><A NAME="ref_71_26">Button4</A></FONT>,  <FONT COLOR=green><EM>-- aka: Button 4</EM></FONT>
-+                         <FONT COLOR=red><A NAME="ref_72_26">Control</A></FONT>,  <FONT COLOR=green><EM>-- Control Key</EM></FONT>
-+                         <FONT COLOR=red><A NAME="ref_73_26">Shift</A></FONT>,    <FONT COLOR=green><EM>-- Shift Key</EM></FONT>
-+                         <FONT COLOR=red><A NAME="ref_74_26">Alt</A></FONT>);     <FONT COLOR=green><EM>-- ALT Key</EM></FONT>
-+
-+   <b>subtype</b> <FONT COLOR=red><A NAME="ref_76_12">Real_Buttons</A></FONT>  <b>is</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_68_9">Mouse_Button</A> <b>range</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_68_26">Left</A> .. <A HREF="terminal_interface-curses-mouse__ads.htm#ref_71_26">Button4</A>;
-+   <b>subtype</b> <FONT COLOR=red><A NAME="ref_77_12">Modifier_Keys</A></FONT> <b>is</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_68_9">Mouse_Button</A> <b>range</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_72_26">Control</A> .. <A HREF="terminal_interface-curses-mouse__ads.htm#ref_74_26">Alt</A>;
-+
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_79_9">Button_State</A></FONT> <b>is</b> (<FONT COLOR=red><A NAME="ref_79_26">Released</A></FONT>,
-+                         <FONT COLOR=red><A NAME="ref_80_26">Pressed</A></FONT>,
-+                         <FONT COLOR=red><A NAME="ref_81_26">Clicked</A></FONT>,
-+                         <FONT COLOR=red><A NAME="ref_82_26">Double_Clicked</A></FONT>,
-+                         <FONT COLOR=red><A NAME="ref_83_26">Triple_Clicked</A></FONT>);
-+
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_85_9">Button_States</A></FONT> <b>is</b> <b>array</b> (<A HREF="terminal_interface-curses-mouse__ads.htm#ref_79_9">Button_State</A>) <b>of</b> Boolean;
-+   <b>pragma</b> Pack (<A HREF="terminal_interface-curses-mouse__ads.htm#ref_85_9">Button_States</A>);
-+
-+   <FONT COLOR=red><A NAME="ref_88_4">All_Clicks</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_85_9">Button_States</A> := (<A HREF="terminal_interface-curses-mouse__ads.htm#ref_81_26">Clicked</A> .. <A HREF="terminal_interface-curses-mouse__ads.htm#ref_83_26">Triple_Clicked</A> =&gt; True,
-+                                           <b>others</b> =&gt; False);
-+   <FONT COLOR=red><A NAME="ref_90_4">All_States</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_85_9">Button_States</A> := (<b>others</b> =&gt; True);
- 
--   <b>type</b> Mouse_Event <b>is</b> <b>private</b>;
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_92_9">Mouse_Event</A></FONT> <b>is</b> <b>private</b>;
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_mouse.3x.html">curs_mouse.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <b>function</b> Has_Mouse <b>return</b> Boolean;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_98_13" HREF="terminal_interface-curses-mouse__adb.htm#ref_53_13">Has_Mouse</A></FONT> <b>return</b> Boolean;
-    <FONT COLOR=green><EM>--  Return true if a mouse device is supported, false otherwise.</EM></FONT>
- 
--   <b>procedure</b> Register_Reportable_Event
--     (<FONT COLOR=red><A NAME="ref_103_7" HREF="terminal_interface-curses-mouse__adb.htm#ref_81_41">Button</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_79_9">Mouse_Button</A>;
--      <FONT COLOR=red><A NAME="ref_104_7" HREF="terminal_interface-curses-mouse__adb.htm#ref_82_41">State</A></FONT>  : <b>in</b> Button_State;
--      Mask   : <b>in</b> <b>out</b> Event_Mask);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_101_14" HREF="terminal_interface-curses-mouse__adb.htm#ref_80_14">Register_Reportable_Event</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_102_7" HREF="terminal_interface-curses-mouse__adb.htm#ref_80_41">Button</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_68_9">Mouse_Button</A>;
-+      <FONT COLOR=red><A NAME="ref_103_7" HREF="terminal_interface-curses-mouse__adb.htm#ref_81_41">State</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_79_9">Button_State</A>;
-+      <FONT COLOR=red><A NAME="ref_104_7" HREF="terminal_interface-curses-mouse__adb.htm#ref_82_41">Mask</A></FONT>   : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A>);
-    <FONT COLOR=green><EM>--  Stores the event described by the button and the state in the mask.</EM></FONT>
-    <FONT COLOR=green><EM>--  Before you call this the first time, you should init the mask</EM></FONT>
-    <FONT COLOR=green><EM>--  with the Empty_Mask constant</EM></FONT>
--   <b>pragma</b> Inline (Register_Reportable_Event);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-mouse__ads.htm#ref_101_14">Register_Reportable_Event</A>);
- 
--   <b>procedure</b> Register_Reportable_Events
--     (<FONT COLOR=red><A NAME="ref_112_7" HREF="terminal_interface-curses-mouse__adb.htm#ref_99_42">Button</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_85_9">Mouse_Button</A>;
--      <FONT COLOR=red><A NAME="ref_113_7" HREF="terminal_interface-curses-mouse__adb.htm#ref_100_42">State</A></FONT>  : <b>in</b> Button_States;
--      Mask   : <b>in</b> <b>out</b> Event_Mask);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_110_14" HREF="terminal_interface-curses-mouse__adb.htm#ref_98_14">Register_Reportable_Events</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_111_7" HREF="terminal_interface-curses-mouse__adb.htm#ref_98_42">Button</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_68_9">Mouse_Button</A>;
-+      <FONT COLOR=red><A NAME="ref_112_7" HREF="terminal_interface-curses-mouse__adb.htm#ref_99_42">State</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_85_9">Button_States</A>;
-+      <FONT COLOR=red><A NAME="ref_113_7" HREF="terminal_interface-curses-mouse__adb.htm#ref_100_42">Mask</A></FONT>   : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A>);
-    <FONT COLOR=green><EM>--  Register all events described by the Button and the State bitmap.</EM></FONT>
-    <FONT COLOR=green><EM>--  Before you call this the first time, you should init the mask</EM></FONT>
-    <FONT COLOR=green><EM>--  with the Empty_Mask constant</EM></FONT>
-@@ -126,62 +125,62 @@
-    <FONT COLOR=green><EM>--  old mask, that means the event mask value before this call.</EM></FONT>
-    <FONT COLOR=green><EM>--  Not Implemented: The library version</EM></FONT>
-    <FONT COLOR=green><EM>--  returns a Mouse_Mask that tells which events are reported.</EM></FONT>
--   <b>function</b> Start_Mouse (Mask : <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := All_Events)
--                         <b>return</b> Event_Mask;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_123_13" HREF="terminal_interface-curses-mouse__adb.htm#ref_110_13">Start_Mouse</A></FONT> (<FONT COLOR=red><A NAME="ref_123_26" HREF="terminal_interface-curses-mouse__adb.htm#ref_110_26">Mask</A></FONT> : <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := <A HREF="terminal_interface-curses-mouse__ads.htm#ref_66_4">All_Events</A>)
-+                         <b>return</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_mouse.3x.html">mousemask()</A></EM></FONT>
--   <b>pragma</b> Inline (Start_Mouse);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-mouse__ads.htm#ref_123_13">Start_Mouse</A>);
- 
--   <b>procedure</b> End_Mouse (Mask : <b>in</b> Event_Mask := No_Events);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_128_14" HREF="terminal_interface-curses-mouse__adb.htm#ref_126_14">End_Mouse</A></FONT> (<FONT COLOR=red><A NAME="ref_128_25" HREF="terminal_interface-curses-mouse__adb.htm#ref_126_25">Mask</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := <A HREF="terminal_interface-curses-mouse__ads.htm#ref_65_4">No_Events</A>);
-    <FONT COLOR=green><EM>--  Terminates the mouse, restores the specified event mask</EM></FONT>
--   <b>pragma</b> Inline (End_Mouse);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-mouse__ads.htm#ref_128_14">End_Mouse</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_2"#2|</EM></FONT>
--   <b>function</b> Get_Mouse <b>return</b> Mouse_Event;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_133_13" HREF="terminal_interface-curses-mouse__adb.htm#ref_65_13">Get_Mouse</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_92_9">Mouse_Event</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_mouse.3x.html">getmouse()</A></EM></FONT>
--   <b>pragma</b> Inline (Get_Mouse);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-mouse__ads.htm#ref_133_13">Get_Mouse</A>);
- 
--   <b>procedure</b> Get_Event (<FONT COLOR=red><A NAME="ref_138_25" HREF="terminal_interface-curses-mouse__adb.htm#ref_175_25">Event</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Mouse_Event</A>;
--                        <FONT COLOR=red><A NAME="ref_139_25" HREF="terminal_interface-curses-mouse__adb.htm#ref_176_25">Y</A></FONT>      : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--                        <FONT COLOR=red><A NAME="ref_140_25" HREF="terminal_interface-curses-mouse__adb.htm#ref_177_25">X</A></FONT>      : <b>out</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_68_9">Column_Position</A>;
--                        <FONT COLOR=red><A NAME="ref_141_25" HREF="terminal_interface-curses-mouse__adb.htm#ref_178_25">Button</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_79_9">Mouse_Button</A>;
--                        State  : <b>out</b> Button_State);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_137_14" HREF="terminal_interface-curses-mouse__adb.htm#ref_174_14">Get_Event</A></FONT> (<FONT COLOR=red><A NAME="ref_137_25" HREF="terminal_interface-curses-mouse__adb.htm#ref_174_25">Event</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-mouse__ads.htm#ref_92_9">Mouse_Event</A>;
-+                        <FONT COLOR=red><A NAME="ref_138_25" HREF="terminal_interface-curses-mouse__adb.htm#ref_175_25">Y</A></FONT>      : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+                        <FONT COLOR=red><A NAME="ref_139_25" HREF="terminal_interface-curses-mouse__adb.htm#ref_176_25">X</A></FONT>      : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+                        <FONT COLOR=red><A NAME="ref_140_25" HREF="terminal_interface-curses-mouse__adb.htm#ref_177_25">Button</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_68_9">Mouse_Button</A>;
-+                        <FONT COLOR=red><A NAME="ref_141_25" HREF="terminal_interface-curses-mouse__adb.htm#ref_178_25">State</A></FONT>  : <b>out</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_79_9">Button_State</A>);
-    <FONT COLOR=green><EM>--  !!! Warning: X and Y are screen coordinates. Due to ripped of lines they</EM></FONT>
-    <FONT COLOR=green><EM>--  may not be identical to window coordinates.</EM></FONT>
-    <FONT COLOR=green><EM>--  Not Implemented: Get_Event only reports one event, the C library</EM></FONT>
-    <FONT COLOR=green><EM>--  version supports multiple events, e.g. {click-1, click-3}</EM></FONT>
--   <b>pragma</b> Inline (Get_Event);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-mouse__ads.htm#ref_137_14">Get_Event</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_3"#2|</EM></FONT>
--   <b>procedure</b> Unget_Mouse (Event : <b>in</b> Mouse_Event);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_149_14" HREF="terminal_interface-curses-mouse__adb.htm#ref_187_14">Unget_Mouse</A></FONT> (<FONT COLOR=red><A NAME="ref_149_27" HREF="terminal_interface-curses-mouse__adb.htm#ref_187_27">Event</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_92_9">Mouse_Event</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_mouse.3x.html">ungetmouse()</A></EM></FONT>
--   <b>pragma</b> Inline (Unget_Mouse);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-mouse__ads.htm#ref_149_14">Unget_Mouse</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_4"#2|</EM></FONT>
--   <b>function</b> Enclosed_In_Window (<FONT COLOR=red><A NAME="ref_155_33" HREF="terminal_interface-curses-mouse__adb.htm#ref_198_33">Win</A></FONT>    : <A HREF="terminal_interface-curses-mouse__ads.htm#ref_92_9">Window</A> := Standard_Window;
--                                Event  : Mouse_Event) <b>return</b> Boolean;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_154_13" HREF="terminal_interface-curses-mouse__adb.htm#ref_197_13">Enclosed_In_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_154_33" HREF="terminal_interface-curses-mouse__adb.htm#ref_197_33">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                                <FONT COLOR=red><A NAME="ref_155_33" HREF="terminal_interface-curses-mouse__adb.htm#ref_198_33">Event</A></FONT>  : <A HREF="terminal_interface-curses-mouse__ads.htm#ref_92_9">Mouse_Event</A>) <b>return</b> Boolean;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_mouse.3x.html">wenclose()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  But : use event instead of screen coordinates.</EM></FONT>
--   <b>pragma</b> Inline (Enclosed_In_Window);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-mouse__ads.htm#ref_154_13">Enclosed_In_Window</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_5"#2|</EM></FONT>
--   <b>function</b> Mouse_Interval (Msec : Natural := 200) <b>return</b> Natural;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_161_13" HREF="terminal_interface-curses-mouse__adb.htm#ref_212_13">Mouse_Interval</A></FONT> (<FONT COLOR=red><A NAME="ref_161_29" HREF="terminal_interface-curses-mouse__adb.htm#ref_212_29">Msec</A></FONT> : Natural := 200) <b>return</b> Natural;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_mouse.3x.html">mouseinterval()</A></EM></FONT>
--   <b>pragma</b> Inline (Mouse_Interval);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-mouse__ads.htm#ref_161_13">Mouse_Interval</A>);
- 
- <b>private</b>
--   <b>type</b> Event_Mask <b>is</b> <b>new</b> Interfaces.C.unsigned_long;
-+   <b>type</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> <b>is</b> <b>new</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.unsigned_long;
- 
--   <b>type</b> Mouse_Event <b>is</b>
-+   <b>type</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_92_9">Mouse_Event</A> <b>is</b>
-       <b>record</b>
--         Id      : Integer <b>range</b> Integer (<A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.short'First) ..
--         <FONT COLOR=red><A NAME="ref_172_10"> </A></FONT>  <FONT COLOR=red><A NAME="ref_172_13"> </A></FONT>  <FONT COLOR=red><A NAME="ref_172_16"> </A></FONT>                 Integer (<A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.short'Last);
--         X, Y, Z : Integer <b>range</b> Integer (<A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.int'First) ..
--         <FONT COLOR=red><A NAME="ref_174_10"> </A></FONT>         <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9"> </A>             Integer (Interfaces.C.int'Last);
--         Bstate  : Event_Mask;
-+         <FONT COLOR=red><A NAME="ref_170_10">Id</A></FONT>      : Integer <b>range</b> Integer (<A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.short'First) ..
-+                                 Integer (<A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.short'Last);
-+         <FONT COLOR=red><A NAME="ref_172_10">X</A></FONT>, <FONT COLOR=red><A NAME="ref_172_13">Y</A></FONT>, <FONT COLOR=red><A NAME="ref_172_16">Z</A></FONT> : Integer <b>range</b> Integer (<A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.int'First) ..
-+                                 Integer (<A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.int'Last);
-+         <FONT COLOR=red><A NAME="ref_174_10">Bstate</A></FONT>  : <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A>;
-       <b>end</b> <b>record</b>;
--   <b>pragma</b> Convention (C, Mouse_Event);
-+   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-mouse__ads.htm#ref_92_9">Mouse_Event</A>);
- 
--   <b>for</b> Mouse_Event <b>use</b>
-+   <b>for</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_92_9">Mouse_Event</A> <b>use</b>
-       <b>record</b>
-          Id      <b>at</b> 0 <b>range</b>   0 ..  15;
-          X       <b>at</b> 0 <b>range</b>  32 ..  63;
-@@ -192,45 +191,45 @@
-       <FONT COLOR=green><EM>--  Please note: this rep. clause is generated and may be</EM></FONT>
-       <FONT COLOR=green><EM>--               different on your system.</EM></FONT>
- 
--   Generation_Bit_Order : <b>constant</b> System.Bit_Order := System.Low_Order_First;
-+   <FONT COLOR=red><A NAME="ref_189_4">Generation_Bit_Order</A></FONT> : <b>constant</b> System.Bit_Order := System.Low_Order_First;
-    <FONT COLOR=green><EM>--  This constant may be different on your system.</EM></FONT>
- 
--   <FONT COLOR=red><A NAME="ref_193_4">BUTTON1_RELEASED</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000001#;
--   <FONT COLOR=red><A NAME="ref_194_4">BUTTON1_PRESSED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000002#;
--   <FONT COLOR=red><A NAME="ref_195_4">BUTTON1_CLICKED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000004#;
--   <FONT COLOR=red><A NAME="ref_196_4">BUTTON1_DOUBLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000010#;
--   <FONT COLOR=red><A NAME="ref_197_4">BUTTON1_TRIPLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000020#;
--   <FONT COLOR=red><A NAME="ref_198_4">BUTTON1_RESERVED_EVENT</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000040#;
--   <FONT COLOR=red><A NAME="ref_199_4">BUTTON2_RELEASED</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000100#;
--   <FONT COLOR=red><A NAME="ref_200_4">BUTTON2_PRESSED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000200#;
--   <FONT COLOR=red><A NAME="ref_201_4">BUTTON2_CLICKED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000400#;
--   <FONT COLOR=red><A NAME="ref_202_4">BUTTON2_DOUBLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000001000#;
--   <FONT COLOR=red><A NAME="ref_203_4">BUTTON2_TRIPLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000002000#;
--   <FONT COLOR=red><A NAME="ref_204_4">BUTTON2_RESERVED_EVENT</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000004000#;
--   <FONT COLOR=red><A NAME="ref_205_4">BUTTON3_RELEASED</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000010000#;
--   <FONT COLOR=red><A NAME="ref_206_4">BUTTON3_PRESSED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000020000#;
--   <FONT COLOR=red><A NAME="ref_207_4">BUTTON3_CLICKED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000040000#;
--   <FONT COLOR=red><A NAME="ref_208_4">BUTTON3_DOUBLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000100000#;
--   <FONT COLOR=red><A NAME="ref_209_4">BUTTON3_TRIPLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000200000#;
--   <FONT COLOR=red><A NAME="ref_210_4">BUTTON3_RESERVED_EVENT</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000400000#;
--   <FONT COLOR=red><A NAME="ref_211_4">BUTTON4_RELEASED</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00001000000#;
--   <FONT COLOR=red><A NAME="ref_212_4">BUTTON4_PRESSED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00002000000#;
--   <FONT COLOR=red><A NAME="ref_213_4">BUTTON4_CLICKED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00004000000#;
--   <FONT COLOR=red><A NAME="ref_214_4">BUTTON4_DOUBLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00010000000#;
--   <FONT COLOR=red><A NAME="ref_215_4">BUTTON4_TRIPLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00020000000#;
--   <FONT COLOR=red><A NAME="ref_216_4">BUTTON4_RESERVED_EVENT</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00040000000#;
--   <FONT COLOR=red><A NAME="ref_217_4">BUTTON_CTRL</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00100000000#;
--   <FONT COLOR=red><A NAME="ref_218_4">BUTTON_SHIFT</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00200000000#;
--   <FONT COLOR=red><A NAME="ref_219_4">BUTTON_ALT</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00400000000#;
--   <FONT COLOR=red><A NAME="ref_220_4">REPORT_MOUSE_POSITION</A></FONT>     : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#01000000000#;
--   <FONT COLOR=red><A NAME="ref_221_4">ALL_MOUSE_EVENTS</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00777777777#;
--   <FONT COLOR=red><A NAME="ref_222_4">BUTTON1_EVENTS</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000077#;
--   <FONT COLOR=red><A NAME="ref_223_4">BUTTON2_EVENTS</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000007700#;
--   <FONT COLOR=red><A NAME="ref_224_4">BUTTON3_EVENTS</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000770000#;
--   BUTTON4_EVENTS            : <b>constant</b> Event_Mask := 8#00077000000#;
-+   <FONT COLOR=red><A NAME="ref_192_4">BUTTON1_RELEASED</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000001#;
-+   <FONT COLOR=red><A NAME="ref_193_4">BUTTON1_PRESSED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000002#;
-+   <FONT COLOR=red><A NAME="ref_194_4">BUTTON1_CLICKED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000004#;
-+   <FONT COLOR=red><A NAME="ref_195_4">BUTTON1_DOUBLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000010#;
-+   <FONT COLOR=red><A NAME="ref_196_4">BUTTON1_TRIPLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000020#;
-+   <FONT COLOR=red><A NAME="ref_197_4">BUTTON1_RESERVED_EVENT</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000040#;
-+   <FONT COLOR=red><A NAME="ref_198_4">BUTTON2_RELEASED</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000100#;
-+   <FONT COLOR=red><A NAME="ref_199_4">BUTTON2_PRESSED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000200#;
-+   <FONT COLOR=red><A NAME="ref_200_4">BUTTON2_CLICKED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000400#;
-+   <FONT COLOR=red><A NAME="ref_201_4">BUTTON2_DOUBLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000001000#;
-+   <FONT COLOR=red><A NAME="ref_202_4">BUTTON2_TRIPLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000002000#;
-+   <FONT COLOR=red><A NAME="ref_203_4">BUTTON2_RESERVED_EVENT</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000004000#;
-+   <FONT COLOR=red><A NAME="ref_204_4">BUTTON3_RELEASED</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000010000#;
-+   <FONT COLOR=red><A NAME="ref_205_4">BUTTON3_PRESSED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000020000#;
-+   <FONT COLOR=red><A NAME="ref_206_4">BUTTON3_CLICKED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000040000#;
-+   <FONT COLOR=red><A NAME="ref_207_4">BUTTON3_DOUBLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000100000#;
-+   <FONT COLOR=red><A NAME="ref_208_4">BUTTON3_TRIPLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000200000#;
-+   <FONT COLOR=red><A NAME="ref_209_4">BUTTON3_RESERVED_EVENT</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000400000#;
-+   <FONT COLOR=red><A NAME="ref_210_4">BUTTON4_RELEASED</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00001000000#;
-+   <FONT COLOR=red><A NAME="ref_211_4">BUTTON4_PRESSED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00002000000#;
-+   <FONT COLOR=red><A NAME="ref_212_4">BUTTON4_CLICKED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00004000000#;
-+   <FONT COLOR=red><A NAME="ref_213_4">BUTTON4_DOUBLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00010000000#;
-+   <FONT COLOR=red><A NAME="ref_214_4">BUTTON4_TRIPLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00020000000#;
-+   <FONT COLOR=red><A NAME="ref_215_4">BUTTON4_RESERVED_EVENT</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00040000000#;
-+   <FONT COLOR=red><A NAME="ref_216_4">BUTTON_CTRL</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00100000000#;
-+   <FONT COLOR=red><A NAME="ref_217_4">BUTTON_SHIFT</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00200000000#;
-+   <FONT COLOR=red><A NAME="ref_218_4">BUTTON_ALT</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00400000000#;
-+   <FONT COLOR=red><A NAME="ref_219_4">REPORT_MOUSE_POSITION</A></FONT>     : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#01000000000#;
-+   <FONT COLOR=red><A NAME="ref_220_4">ALL_MOUSE_EVENTS</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00777777777#;
-+   <FONT COLOR=red><A NAME="ref_221_4">BUTTON1_EVENTS</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000077#;
-+   <FONT COLOR=red><A NAME="ref_222_4">BUTTON2_EVENTS</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000007700#;
-+   <FONT COLOR=red><A NAME="ref_223_4">BUTTON3_EVENTS</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000770000#;
-+   <FONT COLOR=red><A NAME="ref_224_4">BUTTON4_EVENTS</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00077000000#;
- 
--   <A HREF="terminal_interface-curses-mouse__ads.htm#ref_66_4">No_Events</A>  : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := <A HREF="terminal_interface-curses-mouse__ads.htm#ref_220_4">0</A>;
--   All_Events : <b>constant</b> Event_Mask := ALL_MOUSE_EVENTS;
-+   <A HREF="terminal_interface-curses-mouse__ads.htm#ref_65_4">No_Events</A>  : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 0;
-+   <A HREF="terminal_interface-curses-mouse__ads.htm#ref_66_4">All_Events</A> : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := <A HREF="terminal_interface-curses-mouse__ads.htm#ref_220_4">ALL_MOUSE_EVENTS</A>;
- 
--<b>end</b> Terminal_Interface.Curses.Mouse;
-+<b>end</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-mouse__ads.htm#ref_48_35">Mouse</A>;
- </PRE></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-panels-user_data__ads.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-panels-user_data__ads.htm
---- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-panels-user_data__ads.htm	2006-09-23 16:31:31.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/terminal_interface-curses-panels-user_data__ads.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -3,7 +3,6 @@
- <BODY>
- <HR><DIV ALIGN="center"><H1> File : terminal_interface-curses-panels-user_data.ads </H1></DIV><HR>
- <PRE>
--
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
- <FONT COLOR=green><EM>--                           <A HREF="http://www.gnat.com">GNAT</A> ncurses Binding                           --</EM></FONT>
-@@ -46,31 +45,31 @@
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- 
- <b>generic</b>
--   <b>type</b> <FONT COLOR=red><A NAME="ref_44_9" HREF="terminal_interface-curses-panels-user_data__ads.htm#ref_45_42">User</A></FONT> <b>is</b> <b>limited</b> <b>private</b>;
--   <b>type</b> <A HREF="terminal_interface__ads.htm#ref_42_9">User_Access</A> <b>is</b> <b>access</b> <b>all</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_44_35">User</A>;
--<b>package</b> Terminal_Interface.Curses.Panels.User_Data<A HREF="terminal_interface-curses-panels__ads.htm#ref_44_35"> </A><b>is</b>
--   <b>pragma</b> Preelaborate (Terminal_Interface.Curses.Panels.User_Data);
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_43_9" HREF="terminal_interface-curses-panels-user_data__ads.htm#ref_45_42">User</A></FONT> <b>is</b> <b>limited</b> <b>private</b>;
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_44_9" HREF="terminal_interface-curses-panels-user_data__ads.htm#ref_45_42">User_Access</A></FONT> <b>is</b> <b>access</b> <b>all</b> <A HREF="terminal_interface-curses-panels-user_data__ads.htm#ref_43_9">User</A>;
-+<b>package</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-panels__ads.htm#ref_44_35">Panels</A>.<FONT COLOR=red><A NAME="ref_45_42" HREF="terminal_interface-curses-panels-user_data__adb.htm#ref_47_47">User_Data</A></FONT> <b>is</b>
-+   <b>pragma</b> Preelaborate (<A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-panels__ads.htm#ref_44_35">Panels</A>.<A HREF="terminal_interface-curses-panels-user_data__ads.htm#ref_45_42">User_Data</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/panel.3x.html">panel.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_1"#2|</EM></FONT>
--   <b>procedure</b> Set_User_Data (<FONT COLOR=red><A NAME="ref_54_29" HREF="terminal_interface-curses-panels-user_data__adb.htm#ref_52_29">Pan</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-panels-user_data__ads.htm#ref_44_9">Panel</A>;
--                            Data : <b>in</b> User_Access);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_53_14" HREF="terminal_interface-curses-panels-user_data__adb.htm#ref_51_14">Set_User_Data</A></FONT> (<FONT COLOR=red><A NAME="ref_53_29" HREF="terminal_interface-curses-panels-user_data__adb.htm#ref_51_29">Pan</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>;
-+                            <FONT COLOR=red><A NAME="ref_54_29" HREF="terminal_interface-curses-panels-user_data__adb.htm#ref_52_29">Data</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-panels-user_data__ads.htm#ref_44_9">User_Access</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">set_panel_userptr</A></EM></FONT>
--   <b>pragma</b> Inline (Set_User_Data);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-panels-user_data__ads.htm#ref_53_14">Set_User_Data</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_2"#2|</EM></FONT>
--   <b>procedure</b> Get_User_Data (<FONT COLOR=red><A NAME="ref_60_29" HREF="terminal_interface-curses-panels-user_data__adb.htm#ref_72_29">Pan</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-panels-user_data__ads.htm#ref_44_9">Panel</A>;
--                            Data : <b>out</b> User_Access);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_59_14" HREF="terminal_interface-curses-panels-user_data__adb.htm#ref_71_14">Get_User_Data</A></FONT> (<FONT COLOR=red><A NAME="ref_59_29" HREF="terminal_interface-curses-panels-user_data__adb.htm#ref_71_29">Pan</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>;
-+                            <FONT COLOR=red><A NAME="ref_60_29" HREF="terminal_interface-curses-panels-user_data__adb.htm#ref_72_29">Data</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses-panels-user_data__ads.htm#ref_44_9">User_Access</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">panel_userptr</A></EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_3"#2|</EM></FONT>
--   <b>function</b> Get_User_Data (Pan  : <b>in</b>  Panel) <b>return</b> User_Access;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_64_13" HREF="terminal_interface-curses-panels-user_data__adb.htm#ref_63_13">Get_User_Data</A></FONT> (<FONT COLOR=red><A NAME="ref_64_28" HREF="terminal_interface-curses-panels-user_data__adb.htm#ref_63_28">Pan</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>) <b>return</b> <A HREF="terminal_interface-curses-panels-user_data__ads.htm#ref_44_9">User_Access</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">panel_userptr</A></EM></FONT>
-    <FONT COLOR=green><EM>--  Same as function</EM></FONT>
-    <b>pragma</b> Inline (Get_User_Data);
- 
--<b>end</b> Terminal_Interface.Curses.Panels.User_Data;
-+<b>end</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-panels__ads.htm#ref_44_35">Panels</A>.<A HREF="terminal_interface-curses-panels-user_data__ads.htm#ref_45_42">User_Data</A>;
- </PRE></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-panels__ads.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-panels__ads.htm
---- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-panels__ads.htm	2006-09-23 16:31:32.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/terminal_interface-curses-panels__ads.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -3,7 +3,6 @@
- <BODY>
- <HR><DIV ALIGN="center"><H1> File : terminal_interface-curses-panels.ads </H1></DIV><HR>
- <PRE>
--
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
- <FONT COLOR=green><EM>--                           <A HREF="http://www.gnat.com">GNAT</A> ncurses Binding                           --</EM></FONT>
-@@ -47,108 +46,108 @@
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- <b>with</b> System;
- 
--<b>package</b> Terminal_Interface.Curses.Panels <b>is</b>
--   <b>pragma</b> Preelaborate (Terminal_Interface.Curses.Panels);
-+<b>package</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<FONT COLOR=red><A NAME="ref_44_35" HREF="terminal_interface-curses-panels__adb.htm#ref_45_40">Panels</A></FONT> <b>is</b>
-+   <b>pragma</b> Preelaborate (<A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-panels__ads.htm#ref_44_35">Panels</A>);
-    <b>pragma</b> Linker_Options ("-lpanel");
-    <b>pragma</b> Linker_Options ("-lncurses");
- 
--   <b>type</b> Panel <b>is</b> <b>private</b>;
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_49_9">Panel</A></FONT> <b>is</b> <b>private</b>;
- 
-    <FONT COLOR=green><EM>---------------------------</EM></FONT>
-    <FONT COLOR=green><EM>--  Interface constants  --</EM></FONT>
-    <FONT COLOR=green><EM>---------------------------</EM></FONT>
--   Null_Panel : <b>constant</b> Panel;
-+   <FONT COLOR=red><A NAME="ref_54_4">Null_Panel</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>;
- 
-    <FONT COLOR=green><EM>-------------------</EM></FONT>
-    <FONT COLOR=green><EM>--  Exceptions   --</EM></FONT>
-    <FONT COLOR=green><EM>-------------------</EM></FONT>
- 
--   Panel_Exception : <b>exception</b>;
-+   <FONT COLOR=red><A NAME="ref_60_4">Panel_Exception</A></FONT> : <b>exception</b>;
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/panel.3x.html">panel.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_1"#2|</EM></FONT>
--   <b>function</b> Create (Win : Window) <b>return</b> Panel;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_67_13" HREF="terminal_interface-curses-panels__adb.htm#ref_49_13">Create</A></FONT> (<FONT COLOR=red><A NAME="ref_67_21" HREF="terminal_interface-curses-panels__adb.htm#ref_49_21">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">new_panel()</A></EM></FONT>
-    <b>pragma</b> Inline (Create);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_2"#2|</EM></FONT>
--   <b>function</b> New_Panel (Win : Window) <b>return</b> Panel <b>renames</b> Create;
-+   <b>function</b> New_Panel (<FONT COLOR=red><A NAME="ref_72_24">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A> <b>renames</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_67_13">Create</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">new_panel()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  pragma Inline (New_Panel);</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_3"#2|</EM></FONT>
--   <b>procedure</b> Bottom (Pan : <b>in</b> Panel);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_77_14" HREF="terminal_interface-curses-panels__adb.htm#ref_63_14">Bottom</A></FONT> (<FONT COLOR=red><A NAME="ref_77_22" HREF="terminal_interface-curses-panels__adb.htm#ref_63_22">Pan</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">bottom_panel()</A></EM></FONT>
--   <b>pragma</b> Inline (Bottom);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-panels__ads.htm#ref_77_14">Bottom</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_4"#2|</EM></FONT>
--   <b>procedure</b> Top (Pan : <b>in</b> Panel);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_82_14" HREF="terminal_interface-curses-panels__adb.htm#ref_73_14">Top</A></FONT> (<FONT COLOR=red><A NAME="ref_82_19" HREF="terminal_interface-curses-panels__adb.htm#ref_73_19">Pan</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">top_panel()</A></EM></FONT>
--   <b>pragma</b> Inline (Top);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-panels__ads.htm#ref_82_14">Top</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_5"#2|</EM></FONT>
--   <b>procedure</b> Show (Pan : <b>in</b> Panel);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_87_14" HREF="terminal_interface-curses-panels__adb.htm#ref_83_14">Show</A></FONT> (<FONT COLOR=red><A NAME="ref_87_20" HREF="terminal_interface-curses-panels__adb.htm#ref_83_20">Pan</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">show_panel()</A></EM></FONT>
--   <b>pragma</b> Inline (Show);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-panels__ads.htm#ref_87_14">Show</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_6"#2|</EM></FONT>
--   <b>procedure</b> Update_Panels;
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_92_14">Update_Panels</A></FONT>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">update_panels()</A></EM></FONT>
-    <b>pragma</b> Import (C, Update_Panels, "update_panels");
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_7"#2|</EM></FONT>
--   <b>procedure</b> Hide (Pan : <b>in</b> Panel);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_97_14" HREF="terminal_interface-curses-panels__adb.htm#ref_93_14">Hide</A></FONT> (<FONT COLOR=red><A NAME="ref_97_20" HREF="terminal_interface-curses-panels__adb.htm#ref_93_20">Pan</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">hide_panel()</A></EM></FONT>
--   <b>pragma</b> Inline (Hide);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-panels__ads.htm#ref_97_14">Hide</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_8"#2|</EM></FONT>
--   <b>function</b> Get_Window (Pan : Panel) <b>return</b> Window;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_102_13" HREF="terminal_interface-curses-panels__adb.htm#ref_103_13">Get_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_102_25" HREF="terminal_interface-curses-panels__adb.htm#ref_103_25">Pan</A></FONT> : <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">panel_window()</A></EM></FONT>
--   <b>pragma</b> Inline (Get_Window);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-panels__ads.htm#ref_102_13">Get_Window</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_9"#2|</EM></FONT>
--   <b>function</b> Panel_Window (Pan : Panel) <b>return</b> Window <b>renames</b> Get_Window;
-+   <b>function</b> Panel_Window (<FONT COLOR=red><A NAME="ref_107_27">Pan</A></FONT> : <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> <b>renames</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_102_13">Get_Window</A>;
-    <FONT COLOR=green><EM>--  pragma Inline (Panel_Window);</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_10"#2|</EM></FONT>
--   <b>procedure</b> Replace (<FONT COLOR=red><A NAME="ref_112_23" HREF="terminal_interface-curses-panels__adb.htm#ref_117_23">Pan</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Panel</A>;
--                      Win : <b>in</b> Window);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_111_14" HREF="terminal_interface-curses-panels__adb.htm#ref_116_14">Replace</A></FONT> (<FONT COLOR=red><A NAME="ref_111_23" HREF="terminal_interface-curses-panels__adb.htm#ref_116_23">Pan</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>;
-+                      <FONT COLOR=red><A NAME="ref_112_23" HREF="terminal_interface-curses-panels__adb.htm#ref_117_23">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">replace_panel()</A></EM></FONT>
--   <b>pragma</b> Inline (Replace);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-panels__ads.htm#ref_111_14">Replace</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_11"#2|</EM></FONT>
--   <b>procedure</b> Move (<FONT COLOR=red><A NAME="ref_118_20" HREF="terminal_interface-curses-panels__adb.htm#ref_129_20">Pan</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Panel</A>;
--                   <FONT COLOR=red><A NAME="ref_119_20" HREF="terminal_interface-curses-panels__adb.htm#ref_130_20">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--                   Column : <b>in</b> Column_Position);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_117_14" HREF="terminal_interface-curses-panels__adb.htm#ref_128_14">Move</A></FONT> (<FONT COLOR=red><A NAME="ref_117_20" HREF="terminal_interface-curses-panels__adb.htm#ref_128_20">Pan</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>;
-+                   <FONT COLOR=red><A NAME="ref_118_20" HREF="terminal_interface-curses-panels__adb.htm#ref_129_20">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+                   <FONT COLOR=red><A NAME="ref_119_20" HREF="terminal_interface-curses-panels__adb.htm#ref_130_20">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">move_panel()</A></EM></FONT>
--   <b>pragma</b> Inline (Move);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-panels__ads.htm#ref_117_14">Move</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_12"#2|</EM></FONT>
--   <b>function</b> Is_Hidden (Pan : Panel) <b>return</b> Boolean;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_124_13" HREF="terminal_interface-curses-panels__adb.htm#ref_142_13">Is_Hidden</A></FONT> (<FONT COLOR=red><A NAME="ref_124_24" HREF="terminal_interface-curses-panels__adb.htm#ref_142_24">Pan</A></FONT> : <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>) <b>return</b> Boolean;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">panel_hidden()</A></EM></FONT>
--   <b>pragma</b> Inline (Is_Hidden);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-panels__ads.htm#ref_124_13">Is_Hidden</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_13"#2|</EM></FONT>
--   <b>function</b> Above (Pan : Panel) <b>return</b> Panel;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_129_13">Above</A></FONT> (<FONT COLOR=red><A NAME="ref_129_20" HREF="terminal_interface-curses-panels__ads.htm#ref_129_13">Pan</A></FONT> : <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>) <b>return</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">panel_above()</A></EM></FONT>
-    <b>pragma</b> Import (C, Above, "panel_above");
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_14"#2|</EM></FONT>
--   <b>function</b> Below (Pan : Panel) <b>return</b> Panel;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_134_13">Below</A></FONT> (<FONT COLOR=red><A NAME="ref_134_20" HREF="terminal_interface-curses-panels__ads.htm#ref_134_13">Pan</A></FONT> : <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>) <b>return</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">panel_below()</A></EM></FONT>
-    <b>pragma</b> Import (C, Below, "panel_below");
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_15"#2|</EM></FONT>
--   <b>procedure</b> Delete (Pan : <b>in</b> <b>out</b> Panel);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_139_14" HREF="terminal_interface-curses-panels__adb.htm#ref_154_14">Delete</A></FONT> (<FONT COLOR=red><A NAME="ref_139_22" HREF="terminal_interface-curses-panels__adb.htm#ref_154_22">Pan</A></FONT> : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">del_panel()</A></EM></FONT>
-    <b>pragma</b> Inline (Delete);
- 
- <b>private</b>
--      <b>type</b> Panel <b>is</b> <b>new</b> System.Storage_Elements.Integer_Address;
--      Null_Panel : <b>constant</b> Panel := 0;
-+      <b>type</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A> <b>is</b> <b>new</b> System.Storage_Elements.Integer_Address;
-+      <A HREF="terminal_interface-curses-panels__ads.htm#ref_54_4">Null_Panel</A> : <b>constant</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A> := 0;
- 
--<b>end</b> Terminal_Interface.Curses.Panels;
-+<b>end</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-panels__ads.htm#ref_44_35">Panels</A>;
- </PRE></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-terminfo__adb.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-terminfo__adb.htm
---- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-terminfo__adb.htm	2006-09-23 16:31:32.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/terminal_interface-curses-terminfo__adb.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -71,13 +71,13 @@
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-    <b>function</b> <FONT COLOR=red><A NAME="ref_67_13" HREF="terminal_interface-curses-terminfo__ads.htm#ref_64_13">Get_Flag</A></FONT> (<FONT COLOR=red><A NAME="ref_67_23" HREF="terminal_interface-curses-terminfo__ads.htm#ref_64_23">Name</A></FONT> : String) <b>return</b> Boolean
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_69_16">tigetflag</A></FONT> (<FONT COLOR=red><A NAME="ref_69_27" HREF="terminal_interface-curses-terminfo__adb.htm#ref_69_16">id</A></FONT> : char_array) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_69_16">tigetflag</A></FONT> (<FONT COLOR=red><A NAME="ref_69_27" HREF="terminal_interface-curses-terminfo__adb.htm#ref_69_16">id</A></FONT> : char_array) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>;
-       <b>pragma</b> Import (C, tigetflag);
-       <FONT COLOR=red><A NAME="ref_71_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses-terminfo__ads.htm#ref_64_23">Name</A>'Length);
-       <FONT COLOR=red><A NAME="ref_72_7">Length</A></FONT> : size_t;
-    <b>begin</b>
-       To_C (<A HREF="terminal_interface-curses-terminfo__ads.htm#ref_64_23">Name</A>, <A HREF="terminal_interface-curses-terminfo__adb.htm#ref_71_7">Txt</A>, <A HREF="terminal_interface-curses-terminfo__adb.htm#ref_72_7">Length</A>);
--      <b>if</b> <A HREF="terminal_interface-curses-terminfo__adb.htm#ref_69_16">tigetflag</A> (<A HREF="terminal_interface-curses-terminfo__adb.htm#ref_71_7">Txt</A>) = <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_74_4">Curses_True</A>) <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses-terminfo__adb.htm#ref_69_16">tigetflag</A> (<A HREF="terminal_interface-curses-terminfo__adb.htm#ref_71_7">Txt</A>) = <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_74_4">Curses_True</A>) <b>then</b>
-          <b>return</b> True;
-       <b>else</b>
-          <b>return</b> False;
-diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-text_io-aux__adb.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-text_io-aux__adb.htm
---- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-text_io-aux__adb.htm	2006-09-23 16:31:32.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/terminal_interface-curses-text_io-aux__adb.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -76,7 +76,7 @@
-             <b>end</b> <b>if</b>;
- 
-             <b>pragma</b> Assert (<A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_52_7">Len</A> &lt;= <A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_53_7">W</A>);
--            <A HREF="terminal_interface-curses__ads.htm#ref_1222_14">Get_Size</A> (<A HREF="terminal_interface-curses-text_io-aux__ads.htm#ref_49_7">Win</A>, <A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_54_7">LC</A>, <A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_55_7">CC</A>);
-+            <A HREF="terminal_interface-curses__ads.htm#ref_1228_14">Get_Size</A> (<A HREF="terminal_interface-curses-text_io-aux__ads.htm#ref_49_7">Win</A>, <A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_54_7">LC</A>, <A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_55_7">CC</A>);
-             <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A> (<A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_52_7">Len</A>) &gt; <A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_55_7">CC</A> <b>then</b>
-                <b>if</b> <A HREF="terminal_interface-curses-text_io-aux__ads.htm#ref_52_7">Signal</A> <b>then</b>
-                   <b>raise</b> <A HREF="terminal_interface-curses-text_io__ads.htm#ref_134_4">Layout_Error</A>;
-@@ -92,7 +92,7 @@
-                      <A HREF="terminal_interface-curses-text_io__ads.htm#ref_115_14">Put</A> (<A HREF="terminal_interface-curses-text_io-aux__ads.htm#ref_49_7">Win</A>, <A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_84_22">Filler</A>);
-                   <b>end</b>;
-                <b>end</b> <b>if</b>;
--               <A HREF="terminal_interface-curses__ads.htm#ref_1238_14">Get_Cursor_Position</A> (<A HREF="terminal_interface-curses-text_io-aux__ads.htm#ref_49_7">Win</A>, <A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_56_7">Y</A>, <A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_57_7">X</A>);
-+               <A HREF="terminal_interface-curses__ads.htm#ref_1244_14">Get_Cursor_Position</A> (<A HREF="terminal_interface-curses-text_io-aux__ads.htm#ref_49_7">Win</A>, <A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_56_7">Y</A>, <A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_57_7">X</A>);
-                <b>if</b> (<A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_57_7">X</A> + <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> (<A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_52_7">Len</A>)) &gt; <A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_55_7">CC</A> <b>then</b>
-                   <A HREF="terminal_interface-curses-text_io__ads.htm#ref_86_14">New_Line</A> (<A HREF="terminal_interface-curses-text_io-aux__ads.htm#ref_49_7">Win</A>);
-                <b>end</b> <b>if</b>;
-diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-text_io__adb.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-text_io__adb.htm
---- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-text_io__adb.htm	2006-09-23 16:31:32.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/terminal_interface-curses-text_io__adb.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -58,7 +58,7 @@
-    <b>is</b>
-    <b>begin</b>
-       <b>if</b> <A HREF="terminal_interface-curses-text_io__adb.htm#ref_44_4">Default_Window</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
--         <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+         <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-       <b>else</b>
-          <b>return</b> <A HREF="terminal_interface-curses-text_io__adb.htm#ref_44_4">Default_Window</A>;
-       <b>end</b> <b>if</b>;
-@@ -68,7 +68,7 @@
-    <b>procedure</b> <FONT COLOR=red><A NAME="ref_63_14" HREF="terminal_interface-curses-text_io__ads.htm#ref_65_14">Flush</A></FONT> (<FONT COLOR=red><A NAME="ref_63_21" HREF="terminal_interface-curses-text_io__ads.htm#ref_65_21">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>)
-    <b>is</b>
-    <b>begin</b>
--      <A HREF="terminal_interface-curses__ads.htm#ref_1039_14">Refresh</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_65_21">Win</A>);
-+      <A HREF="terminal_interface-curses__ads.htm#ref_1045_14">Refresh</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_65_21">Win</A>);
-    <b>end</b> <A HREF="terminal_interface-curses-text_io__ads.htm#ref_65_14">Flush</A>;
- 
-    <b>procedure</b> <FONT COLOR=red><A NAME="ref_69_14" HREF="terminal_interface-curses-text_io__ads.htm#ref_66_14">Flush</A></FONT>
-@@ -91,7 +91,7 @@
-       <FONT COLOR=red><A NAME="ref_86_7">N_Lines</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-       <FONT COLOR=red><A NAME="ref_87_7">N_Cols</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-    <b>begin</b>
--      <A HREF="terminal_interface-curses__ads.htm#ref_1222_14">Get_Size</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_77_26">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_86_7">N_Lines</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_87_7">N_Cols</A>);
-+      <A HREF="terminal_interface-curses__ads.htm#ref_1228_14">Get_Size</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_77_26">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_86_7">N_Lines</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_87_7">N_Cols</A>);
-       <FONT COLOR=green><EM>--  if Natural (N_Cols) &gt; Natural (Count'Last) then</EM></FONT>
-       <FONT COLOR=green><EM>--     raise Layout_Error;</EM></FONT>
-       <FONT COLOR=green><EM>--  end if;</EM></FONT>
-@@ -109,10 +109,10 @@
-       <FONT COLOR=red><A NAME="ref_104_7">N_Lines</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-       <FONT COLOR=red><A NAME="ref_105_7">N_Cols</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_1016_13">Scrolling_Allowed</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_80_26">Win</A>) <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_1022_13">Scrolling_Allowed</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_80_26">Win</A>) <b>then</b>
-          <b>return</b> 0;
-       <b>else</b>
--         <A HREF="terminal_interface-curses__ads.htm#ref_1222_14">Get_Size</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_80_26">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_104_7">N_Lines</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_105_7">N_Cols</A>);
-+         <A HREF="terminal_interface-curses__ads.htm#ref_1228_14">Get_Size</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_80_26">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_104_7">N_Lines</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_105_7">N_Cols</A>);
-          <FONT COLOR=green><EM>--  if Natural (N_Lines) &gt; Natural (Count'Last) then</EM></FONT>
-          <FONT COLOR=green><EM>--     raise Layout_Error;</EM></FONT>
-          <FONT COLOR=green><EM>--  end if;</EM></FONT>
-@@ -141,7 +141,7 @@
-          <b>if</b> <A HREF="terminal_interface-curses-text_io__adb.htm#ref_129_7">P_Size</A> &gt; 0 <b>and</b> <b>then</b> <A HREF="terminal_interface-curses-text_io__ads.htm#ref_101_13">Line</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_86_24">Win</A>) &gt;= <A HREF="terminal_interface-curses-text_io__adb.htm#ref_129_7">P_Size</A> <b>then</b>
-             <A HREF="terminal_interface-curses-text_io__ads.htm#ref_89_14">New_Page</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_86_24">Win</A>);
-          <b>else</b>
--            <A HREF="terminal_interface-curses__ads.htm#ref_522_14">Add</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_86_24">Win</A>, ASCII.LF);
-+            <A HREF="terminal_interface-curses__ads.htm#ref_528_14">Add</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_86_24">Win</A>, ASCII.LF);
-          <b>end</b> <b>if</b>;
-       <b>end</b> <b>loop</b>;
-    <b>end</b> <A HREF="terminal_interface-curses-text_io__ads.htm#ref_86_14">New_Line</A>;
-@@ -155,7 +155,7 @@
-    <b>procedure</b> <FONT COLOR=red><A NAME="ref_150_14" HREF="terminal_interface-curses-text_io__ads.htm#ref_89_14">New_Page</A></FONT> (<FONT COLOR=red><A NAME="ref_150_24" HREF="terminal_interface-curses-text_io__ads.htm#ref_89_24">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>)
-    <b>is</b>
-    <b>begin</b>
--      <A HREF="terminal_interface-curses__ads.htm#ref_1074_14">Clear</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_89_24">Win</A>);
-+      <A HREF="terminal_interface-curses__ads.htm#ref_1080_14">Clear</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_89_24">Win</A>);
-    <b>end</b> <A HREF="terminal_interface-curses-text_io__ads.htm#ref_89_14">New_Page</A>;
- 
-    <b>procedure</b> <FONT COLOR=red><A NAME="ref_156_14" HREF="terminal_interface-curses-text_io__ads.htm#ref_90_14">New_Page</A></FONT>
-@@ -175,7 +175,7 @@
-          <b>raise</b> Constraint_Error;
-       <b>end</b> <b>if</b>;
- 
--      <A HREF="terminal_interface-curses__ads.htm#ref_1238_14">Get_Cursor_Position</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_92_23">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_164_7">Y</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_165_7">X1</A>);
-+      <A HREF="terminal_interface-curses__ads.htm#ref_1244_14">Get_Cursor_Position</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_92_23">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_164_7">Y</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_165_7">X1</A>);
-       <A HREF="terminal_interface-curses-text_io__adb.htm#ref_167_7">N</A>  := Natural (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_92_41">To</A>); <A HREF="terminal_interface-curses-text_io__adb.htm#ref_167_7">N</A> := <A HREF="terminal_interface-curses-text_io__adb.htm#ref_167_7">N</A> - 1;
-       <A HREF="terminal_interface-curses-text_io__adb.htm#ref_166_7">X2</A> := <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> (<A HREF="terminal_interface-curses-text_io__adb.htm#ref_167_7">N</A>);
-       <b>if</b> <A HREF="terminal_interface-curses-text_io__adb.htm#ref_165_7">X1</A> &gt; <A HREF="terminal_interface-curses-text_io__adb.htm#ref_166_7">X2</A> <b>then</b>
-@@ -209,7 +209,7 @@
-          <b>raise</b> Constraint_Error;
-       <b>end</b> <b>if</b>;
- 
--      <A HREF="terminal_interface-curses__ads.htm#ref_1238_14">Get_Cursor_Position</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_95_24">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_198_7">Y1</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_200_7">X</A>);
-+      <A HREF="terminal_interface-curses__ads.htm#ref_1244_14">Get_Cursor_Position</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_95_24">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_198_7">Y1</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_200_7">X</A>);
-       <A HREF="terminal_interface-curses-text_io__adb.htm#ref_201_7">N</A>  := Natural (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_95_41">To</A>); <A HREF="terminal_interface-curses-text_io__adb.htm#ref_201_7">N</A> := <A HREF="terminal_interface-curses-text_io__adb.htm#ref_201_7">N</A> - 1;
-       <A HREF="terminal_interface-curses-text_io__adb.htm#ref_199_7">Y2</A> := <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A> (<A HREF="terminal_interface-curses-text_io__adb.htm#ref_201_7">N</A>);
-       <b>if</b> <A HREF="terminal_interface-curses-text_io__adb.htm#ref_199_7">Y2</A> &lt; <A HREF="terminal_interface-curses-text_io__adb.htm#ref_198_7">Y1</A> <b>then</b>
-@@ -233,7 +233,7 @@
-       <FONT COLOR=red><A NAME="ref_228_7">X</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-       <FONT COLOR=red><A NAME="ref_229_7">N</A></FONT> : Natural;
-    <b>begin</b>
--      <A HREF="terminal_interface-curses__ads.htm#ref_1238_14">Get_Cursor_Position</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_98_18">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_227_7">Y</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_228_7">X</A>);
-+      <A HREF="terminal_interface-curses__ads.htm#ref_1244_14">Get_Cursor_Position</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_98_18">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_227_7">Y</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_228_7">X</A>);
-       <A HREF="terminal_interface-curses-text_io__adb.htm#ref_229_7">N</A> := Natural (<A HREF="terminal_interface-curses-text_io__adb.htm#ref_228_7">X</A>); <A HREF="terminal_interface-curses-text_io__adb.htm#ref_229_7">N</A> := <A HREF="terminal_interface-curses-text_io__adb.htm#ref_229_7">N</A> + 1;
-       <FONT COLOR=green><EM>--  if N &gt; Natural (Count'Last) then</EM></FONT>
-       <FONT COLOR=green><EM>--     raise Layout_Error;</EM></FONT>
-@@ -253,7 +253,7 @@
-       <FONT COLOR=red><A NAME="ref_248_7">X</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-       <FONT COLOR=red><A NAME="ref_249_7">N</A></FONT> : Natural;
-    <b>begin</b>
--      <A HREF="terminal_interface-curses__ads.htm#ref_1238_14">Get_Cursor_Position</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_101_19">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_247_7">Y</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_248_7">X</A>);
-+      <A HREF="terminal_interface-curses__ads.htm#ref_1244_14">Get_Cursor_Position</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_101_19">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_247_7">Y</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_248_7">X</A>);
-       <A HREF="terminal_interface-curses-text_io__adb.htm#ref_249_7">N</A> := Natural (<A HREF="terminal_interface-curses-text_io__adb.htm#ref_247_7">Y</A>); <A HREF="terminal_interface-curses-text_io__adb.htm#ref_249_7">N</A> := <A HREF="terminal_interface-curses-text_io__adb.htm#ref_249_7">N</A> + 1;
-       <FONT COLOR=green><EM>--  if N &gt; Natural (Count'Last) then</EM></FONT>
-       <FONT COLOR=green><EM>--     raise Layout_Error;</EM></FONT>
-@@ -280,13 +280,13 @@
-       <FONT COLOR=red><A NAME="ref_275_7">C</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-    <b>begin</b>
-       <b>if</b> <A HREF="terminal_interface-curses-text_io__adb.htm#ref_271_7">P_Size</A> &gt; 0 <b>then</b>
--         <A HREF="terminal_interface-curses__ads.htm#ref_1238_14">Get_Cursor_Position</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_108_19">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_272_7">Y</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_273_7">X</A>);
--         <A HREF="terminal_interface-curses__ads.htm#ref_1222_14">Get_Size</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_108_19">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_274_7">L</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_275_7">C</A>);
-+         <A HREF="terminal_interface-curses__ads.htm#ref_1244_14">Get_Cursor_Position</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_108_19">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_272_7">Y</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_273_7">X</A>);
-+         <A HREF="terminal_interface-curses__ads.htm#ref_1228_14">Get_Size</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_108_19">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_274_7">L</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_275_7">C</A>);
-          <b>if</b> (<A HREF="terminal_interface-curses-text_io__adb.htm#ref_272_7">Y</A> + 1) = <A HREF="terminal_interface-curses-text_io__adb.htm#ref_274_7">L</A> <b>and</b> <b>then</b> (<A HREF="terminal_interface-curses-text_io__adb.htm#ref_273_7">X</A> + 1) = <A HREF="terminal_interface-curses-text_io__adb.htm#ref_275_7">C</A> <b>then</b>
-             <A HREF="terminal_interface-curses-text_io__ads.htm#ref_89_14">New_Page</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_108_19">Win</A>);
-          <b>end</b> <b>if</b>;
-       <b>end</b> <b>if</b>;
--      <A HREF="terminal_interface-curses__ads.htm#ref_522_14">Add</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_108_19">Win</A>, <A HREF="terminal_interface-curses-text_io__ads.htm#ref_108_37">Item</A>);
-+      <A HREF="terminal_interface-curses__ads.htm#ref_528_14">Add</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_108_19">Win</A>, <A HREF="terminal_interface-curses-text_io__ads.htm#ref_108_37">Item</A>);
-    <b>end</b> <A HREF="terminal_interface-curses-text_io__ads.htm#ref_108_14">Put</A>;
- 
-    <b>procedure</b> <FONT COLOR=red><A NAME="ref_287_14" HREF="terminal_interface-curses-text_io__ads.htm#ref_109_14">Put</A></FONT> (<FONT COLOR=red><A NAME="ref_287_19" HREF="terminal_interface-curses-text_io__ads.htm#ref_109_19">Item</A></FONT> : <b>in</b> Character)
-@@ -308,13 +308,13 @@
-       <FONT COLOR=red><A NAME="ref_303_7">C</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-    <b>begin</b>
-       <b>if</b> <A HREF="terminal_interface-curses-text_io__adb.htm#ref_299_7">P_Size</A> &gt; 0 <b>then</b>
--         <A HREF="terminal_interface-curses__ads.htm#ref_1238_14">Get_Cursor_Position</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_115_19">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_300_7">Y</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_301_7">X</A>);
--         <A HREF="terminal_interface-curses__ads.htm#ref_1222_14">Get_Size</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_115_19">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_302_7">L</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_303_7">C</A>);
-+         <A HREF="terminal_interface-curses__ads.htm#ref_1244_14">Get_Cursor_Position</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_115_19">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_300_7">Y</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_301_7">X</A>);
-+         <A HREF="terminal_interface-curses__ads.htm#ref_1228_14">Get_Size</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_115_19">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_302_7">L</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_303_7">C</A>);
-          <b>if</b> (<A HREF="terminal_interface-curses-text_io__adb.htm#ref_300_7">Y</A> + 1) = <A HREF="terminal_interface-curses-text_io__adb.htm#ref_302_7">L</A> <b>and</b> <b>then</b> (<A HREF="terminal_interface-curses-text_io__adb.htm#ref_301_7">X</A> + 1 + <A HREF="terminal_interface-curses-text_io__ads.htm#ref_115_37">Item</A>'Length) &gt;= <A HREF="terminal_interface-curses-text_io__adb.htm#ref_303_7">C</A> <b>then</b>
-             <A HREF="terminal_interface-curses-text_io__ads.htm#ref_89_14">New_Page</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_115_19">Win</A>);
-          <b>end</b> <b>if</b>;
-       <b>end</b> <b>if</b>;
--      <A HREF="terminal_interface-curses__ads.htm#ref_647_14">Add</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_115_19">Win</A>, <A HREF="terminal_interface-curses-text_io__ads.htm#ref_115_37">Item</A>);
-+      <A HREF="terminal_interface-curses__ads.htm#ref_653_14">Add</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_115_19">Win</A>, <A HREF="terminal_interface-curses-text_io__ads.htm#ref_115_37">Item</A>);
-    <b>end</b> <A HREF="terminal_interface-curses-text_io__ads.htm#ref_115_14">Put</A>;
- 
-    <b>procedure</b> <FONT COLOR=red><A NAME="ref_315_14" HREF="terminal_interface-curses-text_io__ads.htm#ref_116_14">Put</A></FONT> (<FONT COLOR=red><A NAME="ref_315_19" HREF="terminal_interface-curses-text_io__ads.htm#ref_116_19">Item</A></FONT> : <b>in</b> String)
-diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-trace__ads.htm ncurses-5.6/doc/html/ada/terminal_interface-curses-trace__ads.htm
---- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses-trace__ads.htm	2006-09-23 16:31:32.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/terminal_interface-curses-trace__ads.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -3,7 +3,6 @@
- <BODY>
- <HR><DIV ALIGN="center"><H1> File : terminal_interface-curses-trace.ads </H1></DIV><HR>
- <PRE>
--
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
- <FONT COLOR=green><EM>--                           <A HREF="http://www.gnat.com">GNAT</A> ncurses Binding                           --</EM></FONT>
-@@ -45,28 +44,28 @@
- <FONT COLOR=green><EM>--  Binding Version 01.00</EM></FONT>
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- 
--<b>package</b> Terminal_Interface.Curses.Trace <b>is</b>
--   <b>pragma</b> Preelaborate (Terminal_Interface.Curses.Trace);
-+<b>package</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<FONT COLOR=red><A NAME="ref_42_35" HREF="terminal_interface-curses-trace__adb.htm#ref_42_40">Trace</A></FONT> <b>is</b>
-+   <b>pragma</b> Preelaborate (<A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-trace__ads.htm#ref_42_35">Trace</A>);
- 
-    <b>pragma</b> Warnings (Off);
--   <b>type</b> Trace_Attribute_Set <b>is</b>
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_46_9">Trace_Attribute_Set</A></FONT> <b>is</b>
-       <b>record</b>
--         <FONT COLOR=red><A NAME="ref_49_10">Times</A></FONT>            : Boolean;
--         <FONT COLOR=red><A NAME="ref_50_10">Tputs</A></FONT>            : Boolean;
--         <FONT COLOR=red><A NAME="ref_51_10">Update</A></FONT>           : Boolean;
--         <FONT COLOR=red><A NAME="ref_52_10">Cursor_Move</A></FONT>      : Boolean;
--         <FONT COLOR=red><A NAME="ref_53_10">Character_Output</A></FONT> : Boolean;
--         <FONT COLOR=red><A NAME="ref_54_10">Calls</A></FONT>            : Boolean;
--         <FONT COLOR=red><A NAME="ref_55_10">Virtual_Puts</A></FONT>     : Boolean;
--         <FONT COLOR=red><A NAME="ref_56_10">Input_Events</A></FONT>     : Boolean;
--         <FONT COLOR=red><A NAME="ref_57_10">TTY_State</A></FONT>        : Boolean;
--         <FONT COLOR=red><A NAME="ref_58_10">Internal_Calls</A></FONT>   : Boolean;
--         <FONT COLOR=red><A NAME="ref_59_10">Character_Calls</A></FONT>  : Boolean;
--         Termcap_TermInfo : Boolean;
-+         <FONT COLOR=red><A NAME="ref_48_10">Times</A></FONT>            : Boolean;
-+         <FONT COLOR=red><A NAME="ref_49_10">Tputs</A></FONT>            : Boolean;
-+         <FONT COLOR=red><A NAME="ref_50_10">Update</A></FONT>           : Boolean;
-+         <FONT COLOR=red><A NAME="ref_51_10">Cursor_Move</A></FONT>      : Boolean;
-+         <FONT COLOR=red><A NAME="ref_52_10">Character_Output</A></FONT> : Boolean;
-+         <FONT COLOR=red><A NAME="ref_53_10">Calls</A></FONT>            : Boolean;
-+         <FONT COLOR=red><A NAME="ref_54_10">Virtual_Puts</A></FONT>     : Boolean;
-+         <FONT COLOR=red><A NAME="ref_55_10">Input_Events</A></FONT>     : Boolean;
-+         <FONT COLOR=red><A NAME="ref_56_10">TTY_State</A></FONT>        : Boolean;
-+         <FONT COLOR=red><A NAME="ref_57_10">Internal_Calls</A></FONT>   : Boolean;
-+         <FONT COLOR=red><A NAME="ref_58_10">Character_Calls</A></FONT>  : Boolean;
-+         <FONT COLOR=red><A NAME="ref_59_10">Termcap_TermInfo</A></FONT> : Boolean;
-       <b>end</b> <b>record</b>;
--   <b>pragma</b> Convention (C, Trace_Attribute_Set);
-+   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-trace__ads.htm#ref_46_9">Trace_Attribute_Set</A>);
- 
--   <b>for</b> Trace_Attribute_Set <b>use</b>
-+   <b>for</b> <A HREF="terminal_interface-curses-trace__ads.htm#ref_46_9">Trace_Attribute_Set</A> <b>use</b>
-       <b>record</b>
-          Times            <b>at</b> 0 <b>range</b>  0 ..  0;
-          Tputs            <b>at</b> 0 <b>range</b>  1 ..  1;
-@@ -81,22 +80,22 @@
-          Character_Calls  <b>at</b> 0 <b>range</b> 10 .. 10;
-          Termcap_TermInfo <b>at</b> 0 <b>range</b> 11 .. 11;
-       <b>end</b> <b>record</b>;
--   <b>for</b> Trace_Attribute_Set'Size <b>use</b> 32;
-+   <b>for</b> <A HREF="terminal_interface-curses-trace__ads.htm#ref_46_9">Trace_Attribute_Set</A>'Size <b>use</b> 32;
-    <FONT COLOR=green><EM>--  Please note: this rep. clause is generated and may be</EM></FONT>
-    <FONT COLOR=green><EM>--               different on your system.</EM></FONT>
- 
-    <b>pragma</b> Warnings (On);
- 
--   Trace_Disable  : <b>constant</b> Trace_Attribute_Set := (<b>others</b> =&gt; False);
-+   <FONT COLOR=red><A NAME="ref_84_4">Trace_Disable</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses-trace__ads.htm#ref_46_9">Trace_Attribute_Set</A> := (<b>others</b> =&gt; False);
- 
--   Trace_Ordinary : <b>constant</b> Trace_Attribute_Set :=
--     (<A HREF="terminal_interface-curses-trace__ads.htm#ref_49_10">Times</A>            =&gt; True,
--      <A HREF="terminal_interface-curses-trace__ads.htm#ref_50_10">Tputs</A>            =&gt; True,
--      <A HREF="terminal_interface-curses-trace__ads.htm#ref_51_10">Update</A>           =&gt; True,
--      <A HREF="terminal_interface-curses-trace__ads.htm#ref_52_10">Cursor_Move</A>      =&gt; True,
--      Character_Output =&gt; True,
--   <FONT COLOR=red><A NAME="ref_93_4"> </A></FONT>  <b>others</b>           =&gt; False);
--   Trace_Maximum : <b>constant</b> Trace_Attribute_Set := (<b>others</b> =&gt; True);
-+   <FONT COLOR=red><A NAME="ref_86_4">Trace_Ordinary</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-trace__ads.htm#ref_46_9">Trace_Attribute_Set</A> :=
-+     (<A HREF="terminal_interface-curses-trace__ads.htm#ref_48_10">Times</A>            =&gt; True,
-+      <A HREF="terminal_interface-curses-trace__ads.htm#ref_49_10">Tputs</A>            =&gt; True,
-+      <A HREF="terminal_interface-curses-trace__ads.htm#ref_50_10">Update</A>           =&gt; True,
-+      <A HREF="terminal_interface-curses-trace__ads.htm#ref_51_10">Cursor_Move</A>      =&gt; True,
-+      <A HREF="terminal_interface-curses-trace__ads.htm#ref_52_10">Character_Output</A> =&gt; True,
-+      <b>others</b>           =&gt; False);
-+   <FONT COLOR=red><A NAME="ref_93_4">Trace_Maximum</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-trace__ads.htm#ref_46_9">Trace_Attribute_Set</A> := (<b>others</b> =&gt; True);
- 
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- 
-@@ -105,15 +104,15 @@
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_1"#2|</EM></FONT>
--   <b>procedure</b> Trace_On (x : Trace_Attribute_Set);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_102_14" HREF="terminal_interface-curses-trace__adb.htm#ref_44_14">Trace_On</A></FONT> (<FONT COLOR=red><A NAME="ref_102_24" HREF="terminal_interface-curses-trace__adb.htm#ref_44_24">x</A></FONT> : <A HREF="terminal_interface-curses-trace__ads.htm#ref_46_9">Trace_Attribute_Set</A>);
-    <FONT COLOR=green><EM>--  The debugging library has trace.</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_2"#2|</EM></FONT>
--   <b>procedure</b> Trace_Put (str : String);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_106_14" HREF="terminal_interface-curses-trace__adb.htm#ref_50_14">Trace_Put</A></FONT> (<FONT COLOR=red><A NAME="ref_106_25" HREF="terminal_interface-curses-trace__adb.htm#ref_50_25">str</A></FONT> : String);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_trace.3x.html">_tracef()</A></EM></FONT>
- 
--   Current_Trace_Setting : Trace_Attribute_Set;
--   <b>pragma</b> Import (C, Current_Trace_Setting, "_nc_tracing");
-+   <FONT COLOR=red><A NAME="ref_109_4">Current_Trace_Setting</A></FONT> : <A HREF="terminal_interface-curses-trace__ads.htm#ref_46_9">Trace_Attribute_Set</A>;
-+   <b>pragma</b> Import (C, <A HREF="terminal_interface-curses-trace__ads.htm#ref_109_4">Current_Trace_Setting</A>, "_nc_tracing");
- 
--<b>end</b> Terminal_Interface.Curses.Trace;
-+<b>end</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-trace__ads.htm#ref_42_35">Trace</A>;
- </PRE></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses__adb.htm ncurses-5.6/doc/html/ada/terminal_interface-curses__adb.htm
---- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses__adb.htm	2006-09-23 16:31:33.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/terminal_interface-curses__adb.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -12,7 +12,7 @@
- <FONT COLOR=green><EM>--                                 B O D Y                                  --</EM></FONT>
- <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--<FONT COLOR=green><EM>-- Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.              --</EM></FONT>
-+<FONT COLOR=green><EM>-- Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              --</EM></FONT>
- <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
- <FONT COLOR=green><EM>-- Permission is hereby granted, free of charge, to any person obtaining a  --</EM></FONT>
- <FONT COLOR=green><EM>-- copy of this software and associated documentation files (the            --</EM></FONT>
-@@ -40,8 +40,8 @@
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- <FONT COLOR=green><EM>--  Author: Juergen Pfeifer, 1996</EM></FONT>
- <FONT COLOR=green><EM>--  Version Control:</EM></FONT>
--<FONT COLOR=green><EM>--  @Revision: 1.34 @</EM></FONT>
--<FONT COLOR=green><EM>--  @Date: 2006/06/25 14:30:22 @</EM></FONT>
-+<FONT COLOR=green><EM>--  @Revision: 1.4 @</EM></FONT>
-+<FONT COLOR=green><EM>--  @Date: 2007/05/05 20:09:10 @</EM></FONT>
- <FONT COLOR=green><EM>--  Binding Version 01.00</EM></FONT>
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- <b>with</b> System;
-@@ -49,2522 +49,2512 @@
- <b>with</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-aux__ads.htm#ref_50_35">Aux</A>;
- <b>with</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C;                  <b>use</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C;
- <b>with</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.Strings;          <b>use</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.Strings;
--<b>with</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.Pointers;
- <b>with</b> Ada.Characters.Handling;       <b>use</b> Ada.Characters.Handling;
- <b>with</b> Ada.Strings.Fixed;
--<b>with</b> Ada.Unchecked_Conversion;
- 
--<b>package</b> <b>body</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<FONT COLOR=red><A NAME="ref_52_33" HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A></FONT> <b>is</b>
-+<b>package</b> <b>body</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<FONT COLOR=red><A NAME="ref_50_33" HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A></FONT> <b>is</b>
- 
-    <b>use</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_50_35">Aux</A>;
-    <b>use</b> <b>type</b> System.Bit_Order;
- 
--   <b>package</b> <FONT COLOR=red><A NAME="ref_57_12">ASF</A></FONT> <b>renames</b> Ada.Strings.Fixed;
-+   <b>package</b> <FONT COLOR=red><A NAME="ref_55_12">ASF</A></FONT> <b>renames</b> Ada.Strings.Fixed;
- 
--   <b>type</b> <FONT COLOR=red><A NAME="ref_59_9">chtype_array</A></FONT> <b>is</b> <b>array</b> (size_t <b>range</b> &lt;&gt;)
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_57_9">chtype_array</A></FONT> <b>is</b> <b>array</b> (size_t <b>range</b> &lt;&gt;)
-       <b>of</b> <b>aliased</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>;
--   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses__adb.htm#ref_59_9">chtype_array</A>);
-+   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses__adb.htm#ref_57_9">chtype_array</A>);
- 
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>generic</b>
--      <b>type</b> <FONT COLOR=red><A NAME="ref_65_12">Element</A></FONT> <b>is</b> (&lt;&gt;);
--   <b>function</b> <FONT COLOR=red><A NAME="ref_66_13" HREF="terminal_interface-curses__adb.htm#ref_69_13">W_Get_Element</A></FONT> (<FONT COLOR=red><A NAME="ref_66_28" HREF="terminal_interface-curses__adb.htm#ref_69_28">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                           <FONT COLOR=red><A NAME="ref_67_28" HREF="terminal_interface-curses__adb.htm#ref_70_28">Offset</A></FONT> : <b>in</b> Natural) <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_65_12">Element</A>;
--
--   <b>function</b> <FONT COLOR=red><A NAME="ref_69_13" HREF="terminal_interface-curses__adb.htm#ref_66_13">W_Get_Element</A></FONT> (<FONT COLOR=red><A NAME="ref_69_28" HREF="terminal_interface-curses__adb.htm#ref_66_28">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                           <FONT COLOR=red><A NAME="ref_70_28" HREF="terminal_interface-curses__adb.htm#ref_67_28">Offset</A></FONT> : <b>in</b> Natural) <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_65_12">Element</A> <b>is</b>
--      <b>type</b> <FONT COLOR=red><A NAME="ref_71_12">E_Array</A></FONT> <b>is</b> <b>array</b> (Natural <b>range</b> &lt;&gt;) <b>of</b> <b>aliased</b> <A HREF="terminal_interface-curses__adb.htm#ref_65_12">Element</A>;
--      <b>package</b> C_E_Array <b>is</b> <b>new</b>
--        <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.Pointers (Natural, <A HREF="terminal_interface-curses__adb.htm#ref_65_12">Element</A>, <A HREF="terminal_interface-curses__adb.htm#ref_71_12">E_Array</A>, <A HREF="terminal_interface-curses__adb.htm#ref_65_12">Element</A>'Val (0));
--      <b>use</b> C_E_Array;
--
--      <b>function</b> To_Pointer <b>is</b> <b>new</b>
--        Ada.Unchecked_Conversion (<A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>, Pointer);
--
--      P : Pointer := To_Pointer (<A HREF="terminal_interface-curses__adb.htm#ref_66_28">Win</A>);
--   <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_66_28">Win</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
--         <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
--      <b>else</b>
--         P := P + ptrdiff_t (<A HREF="terminal_interface-curses__adb.htm#ref_67_28">Offset</A>);
--         <b>return</b> P.<b>all</b>;
--      <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__adb.htm#ref_66_13">W_Get_Element</A>;
--
--   <b>function</b> W_Get_Int   <b>is</b> <b>new</b> <A HREF="terminal_interface-curses__adb.htm#ref_66_13">W_Get_Element</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>);
--   <b>function</b> W_Get_Short <b>is</b> <b>new</b> <A HREF="terminal_interface-curses__adb.htm#ref_66_13">W_Get_Element</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>);
--   <b>function</b> W_Get_Byte  <b>is</b> <b>new</b> <A HREF="terminal_interface-curses__adb.htm#ref_66_13">W_Get_Element</A> (<A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.unsigned_char);
--
--   <b>function</b> <FONT COLOR=red><A NAME="ref_93_13" HREF="terminal_interface-curses__adb.htm#ref_96_13">Get_Flag</A></FONT> (<FONT COLOR=red><A NAME="ref_93_23" HREF="terminal_interface-curses__adb.htm#ref_96_23">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                      <FONT COLOR=red><A NAME="ref_94_23" HREF="terminal_interface-curses__adb.htm#ref_97_23">Offset</A></FONT> : Natural) <b>return</b> Boolean;
--
--   <b>function</b> <FONT COLOR=red><A NAME="ref_96_13" HREF="terminal_interface-curses__adb.htm#ref_93_13">Get_Flag</A></FONT> (<FONT COLOR=red><A NAME="ref_96_23" HREF="terminal_interface-curses__adb.htm#ref_93_23">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                      <FONT COLOR=red><A NAME="ref_97_23" HREF="terminal_interface-curses__adb.htm#ref_94_23">Offset</A></FONT> : Natural) <b>return</b> Boolean
--   <b>is</b>
--      <FONT COLOR=red><A NAME="ref_99_7">Res</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--   <b>begin</b>
--      <b>case</b> <A HREF="terminal_interface-curses__ads.htm#ref_1927_4">Sizeof_bool</A> <b>is</b>
--         <b>when</b> 1 =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_99_7">Res</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (W_Get_Byte  (<A HREF="terminal_interface-curses__adb.htm#ref_93_23">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_94_23">Offset</A>));
--         <b>when</b> 2 =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_99_7">Res</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (W_Get_Short (<A HREF="terminal_interface-curses__adb.htm#ref_93_23">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_94_23">Offset</A>));
--         <b>when</b> 4 =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_99_7">Res</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (W_Get_Int   (<A HREF="terminal_interface-curses__adb.htm#ref_93_23">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_94_23">Offset</A>));
--         <b>when</b> <b>others</b> =&gt; <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
--      <b>end</b> <b>case</b>;
--
--      <b>case</b> <A HREF="terminal_interface-curses__adb.htm#ref_99_7">Res</A> <b>is</b>
--         <b>when</b> 0       =&gt; <b>return</b> False;
--         <b>when</b> <b>others</b>  =&gt; <b>return</b> True;
--      <b>end</b> <b>case</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__adb.htm#ref_93_13">Get_Flag</A>;
--
--<FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>function</b> <FONT COLOR=red><A NAME="ref_115_13" HREF="terminal_interface-curses__ads.htm#ref_1610_13">Key_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_115_23" HREF="terminal_interface-curses__ads.htm#ref_1610_23">Key</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>) <b>return</b> String
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_62_13" HREF="terminal_interface-curses__ads.htm#ref_1616_13">Key_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_62_23" HREF="terminal_interface-curses__ads.htm#ref_1616_23">Key</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>) <b>return</b> String
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_117_16">Keyname</A></FONT> (<FONT COLOR=red><A NAME="ref_117_25" HREF="terminal_interface-curses__adb.htm#ref_117_16">K</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> chars_ptr;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_64_16">Keyname</A></FONT> (<FONT COLOR=red><A NAME="ref_64_25" HREF="terminal_interface-curses__adb.htm#ref_64_16">K</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> chars_ptr;
-       <b>pragma</b> Import (C, Keyname, "keyname");
- 
--      <FONT COLOR=red><A NAME="ref_120_7">Ch</A></FONT> : Character;
-+      <FONT COLOR=red><A NAME="ref_67_7">Ch</A></FONT> : Character;
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_1610_23">Key</A> &lt;= Character'Pos (Character'Last) <b>then</b>
--         <A HREF="terminal_interface-curses__adb.htm#ref_120_7">Ch</A> := Character'Val (<A HREF="terminal_interface-curses__ads.htm#ref_1610_23">Key</A>);
--         <b>if</b> Is_Control (<A HREF="terminal_interface-curses__adb.htm#ref_120_7">Ch</A>) <b>then</b>
--            <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1621_13">Un_Control</A> (<A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>'(<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_120_7">Ch</A>,
-+      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_1616_23">Key</A> &lt;= Character'Pos (Character'Last) <b>then</b>
-+         <A HREF="terminal_interface-curses__adb.htm#ref_67_7">Ch</A> := Character'Val (<A HREF="terminal_interface-curses__ads.htm#ref_1616_23">Key</A>);
-+         <b>if</b> Is_Control (<A HREF="terminal_interface-curses__adb.htm#ref_67_7">Ch</A>) <b>then</b>
-+            <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1627_13">Un_Control</A> (<A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>'(<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_67_7">Ch</A>,
-                                                      <A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First,
-                                                      <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>  =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>));
--         <b>elsif</b> Is_Graphic (<A HREF="terminal_interface-curses__adb.htm#ref_120_7">Ch</A>) <b>then</b>
-+         <b>elsif</b> Is_Graphic (<A HREF="terminal_interface-curses__adb.htm#ref_67_7">Ch</A>) <b>then</b>
-             <b>declare</b>
--               <FONT COLOR=red><A NAME="ref_130_16">S</A></FONT> : String (1 .. 1);
-+               <FONT COLOR=red><A NAME="ref_77_16">S</A></FONT> : String (1 .. 1);
-             <b>begin</b>
--               <A HREF="terminal_interface-curses__adb.htm#ref_130_16">S</A> (1) := <A HREF="terminal_interface-curses__adb.htm#ref_120_7">Ch</A>;
--               <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_130_16">S</A>;
-+               <A HREF="terminal_interface-curses__adb.htm#ref_77_16">S</A> (1) := <A HREF="terminal_interface-curses__adb.htm#ref_67_7">Ch</A>;
-+               <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_77_16">S</A>;
-             <b>end</b>;
-          <b>else</b>
-             <b>return</b> "";
-          <b>end</b> <b>if</b>;
-       <b>else</b>
--         <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_121_13">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_117_16">Keyname</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1610_23">Key</A>)));
-+         <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_121_13">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_64_16">Keyname</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1616_23">Key</A>)));
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1610_13">Key_Name</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1616_13">Key_Name</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_143_14" HREF="terminal_interface-curses__ads.htm#ref_1604_14">Key_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_143_24" HREF="terminal_interface-curses__ads.htm#ref_1604_24">Key</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>;
--                       <FONT COLOR=red><A NAME="ref_144_24" HREF="terminal_interface-curses__ads.htm#ref_1605_24">Name</A></FONT> : <b>out</b> String)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_90_14" HREF="terminal_interface-curses__ads.htm#ref_1610_14">Key_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_90_24" HREF="terminal_interface-curses__ads.htm#ref_1610_24">Key</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>;
-+                       <FONT COLOR=red><A NAME="ref_91_24" HREF="terminal_interface-curses__ads.htm#ref_1611_24">Name</A></FONT> : <b>out</b> String)
-    <b>is</b>
-    <b>begin</b>
--      <A HREF="terminal_interface-curses__adb.htm#ref_57_12">ASF</A>.Move (<A HREF="terminal_interface-curses__ads.htm#ref_1610_13">Key_Name</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1604_24">Key</A>), <A HREF="terminal_interface-curses__ads.htm#ref_1605_24">Name</A>);
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1604_14">Key_Name</A>;
-+      <A HREF="terminal_interface-curses__adb.htm#ref_55_12">ASF</A>.Move (<A HREF="terminal_interface-curses__ads.htm#ref_1616_13">Key_Name</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1610_24">Key</A>), <A HREF="terminal_interface-curses__ads.htm#ref_1611_24">Name</A>);
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1610_14">Key_Name</A>;
- 
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_151_14" HREF="terminal_interface-curses__ads.htm#ref_480_14">Init_Screen</A></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_98_14" HREF="terminal_interface-curses__ads.htm#ref_486_14">Init_Screen</A></FONT>
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_153_16">Initscr</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_100_16">Initscr</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-       <b>pragma</b> Import (C, Initscr, "initscr");
- 
--      <FONT COLOR=red><A NAME="ref_156_7">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+      <FONT COLOR=red><A NAME="ref_103_7">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-    <b>begin</b>
--      <A HREF="terminal_interface-curses__adb.htm#ref_156_7">W</A> := <A HREF="terminal_interface-curses__adb.htm#ref_153_16">Initscr</A>;
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_156_7">W</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-+      <A HREF="terminal_interface-curses__adb.htm#ref_103_7">W</A> := <A HREF="terminal_interface-curses__adb.htm#ref_100_16">Initscr</A>;
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_103_7">W</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_480_14">Init_Screen</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_486_14">Init_Screen</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_164_14" HREF="terminal_interface-curses__ads.htm#ref_489_14">End_Windows</A></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_111_14" HREF="terminal_interface-curses__ads.htm#ref_495_14">End_Windows</A></FONT>
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_166_16">Endwin</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_113_16">Endwin</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Endwin, "endwin");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_166_16">Endwin</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_113_16">Endwin</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_489_14">End_Windows</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_495_14">End_Windows</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_174_13" HREF="terminal_interface-curses__ads.htm#ref_496_13">Is_End_Window</A></FONT> <b>return</b> Boolean
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_121_13" HREF="terminal_interface-curses__ads.htm#ref_502_13">Is_End_Window</A></FONT> <b>return</b> Boolean
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_176_16">Isendwin</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_123_16">Isendwin</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>;
-       <b>pragma</b> Import (C, Isendwin, "isendwin");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_176_16">Isendwin</A> = <A HREF="terminal_interface-curses__ads.htm#ref_1931_4">Curses_Bool_False</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_123_16">Isendwin</A> = <A HREF="terminal_interface-curses__ads.htm#ref_1927_4">Curses_Bool_False</A> <b>then</b>
-          <b>return</b> False;
-       <b>else</b>
-          <b>return</b> True;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_496_13">Is_End_Window</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_502_13">Is_End_Window</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_186_14" HREF="terminal_interface-curses__ads.htm#ref_505_14">Move_Cursor</A></FONT> (<FONT COLOR=red><A NAME="ref_186_27" HREF="terminal_interface-curses__ads.htm#ref_505_27">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--                          <FONT COLOR=red><A NAME="ref_187_27" HREF="terminal_interface-curses__ads.htm#ref_506_27">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--                          <FONT COLOR=red><A NAME="ref_188_27" HREF="terminal_interface-curses__ads.htm#ref_507_27">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
--   <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_190_16">Wmove</A></FONT> (<FONT COLOR=red><A NAME="ref_190_23" HREF="terminal_interface-curses__adb.htm#ref_190_16">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                      <FONT COLOR=red><A NAME="ref_191_23" HREF="terminal_interface-curses__adb.htm#ref_190_16">Line</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--                      <FONT COLOR=red><A NAME="ref_192_23" HREF="terminal_interface-curses__adb.htm#ref_190_16">Column</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_133_14" HREF="terminal_interface-curses__ads.htm#ref_511_14">Move_Cursor</A></FONT> (<FONT COLOR=red><A NAME="ref_133_27" HREF="terminal_interface-curses__ads.htm#ref_511_27">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                          <FONT COLOR=red><A NAME="ref_134_27" HREF="terminal_interface-curses__ads.htm#ref_512_27">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+                          <FONT COLOR=red><A NAME="ref_135_27" HREF="terminal_interface-curses__ads.htm#ref_513_27">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
-+   <b>is</b>
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_137_16">Wmove</A></FONT> (<FONT COLOR=red><A NAME="ref_137_23" HREF="terminal_interface-curses__adb.htm#ref_137_16">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                      <FONT COLOR=red><A NAME="ref_138_23" HREF="terminal_interface-curses__adb.htm#ref_137_16">Line</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+                      <FONT COLOR=red><A NAME="ref_139_23" HREF="terminal_interface-curses__adb.htm#ref_137_16">Column</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>
-                      ) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Wmove, "wmove");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_190_16">Wmove</A> (<A HREF="terminal_interface-curses__ads.htm#ref_505_27">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_506_27">Line</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_507_27">Column</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_137_16">Wmove</A> (<A HREF="terminal_interface-curses__ads.htm#ref_511_27">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_512_27">Line</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_513_27">Column</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_505_14">Move_Cursor</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_511_14">Move_Cursor</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_201_14" HREF="terminal_interface-curses__ads.htm#ref_517_14">Add</A></FONT> (<FONT COLOR=red><A NAME="ref_201_19" HREF="terminal_interface-curses__ads.htm#ref_517_19">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--                  <FONT COLOR=red><A NAME="ref_202_19" HREF="terminal_interface-curses__ads.htm#ref_518_19">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_148_14" HREF="terminal_interface-curses__ads.htm#ref_523_14">Add</A></FONT> (<FONT COLOR=red><A NAME="ref_148_19" HREF="terminal_interface-curses__ads.htm#ref_523_19">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                  <FONT COLOR=red><A NAME="ref_149_19" HREF="terminal_interface-curses__ads.htm#ref_524_19">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_204_16">Waddch</A></FONT> (<FONT COLOR=red><A NAME="ref_204_24" HREF="terminal_interface-curses__adb.htm#ref_204_16">W</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                       <FONT COLOR=red><A NAME="ref_205_24" HREF="terminal_interface-curses__adb.htm#ref_204_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_151_16">Waddch</A></FONT> (<FONT COLOR=red><A NAME="ref_151_24" HREF="terminal_interface-curses__adb.htm#ref_151_16">W</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                       <FONT COLOR=red><A NAME="ref_152_24" HREF="terminal_interface-curses__adb.htm#ref_151_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Waddch, "waddch");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_204_16">Waddch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_517_19">Win</A>, AttrChar_To_Chtype (<A HREF="terminal_interface-curses__ads.htm#ref_518_19">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_151_16">Waddch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_523_19">Win</A>, AttrChar_To_Chtype (<A HREF="terminal_interface-curses__ads.htm#ref_524_19">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_517_14">Add</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_523_14">Add</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_213_14" HREF="terminal_interface-curses__ads.htm#ref_522_14">Add</A></FONT> (<FONT COLOR=red><A NAME="ref_213_19" HREF="terminal_interface-curses__ads.htm#ref_522_19">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--                  <FONT COLOR=red><A NAME="ref_214_19" HREF="terminal_interface-curses__ads.htm#ref_523_19">Ch</A></FONT>  : <b>in</b> Character)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_160_14" HREF="terminal_interface-curses__ads.htm#ref_528_14">Add</A></FONT> (<FONT COLOR=red><A NAME="ref_160_19" HREF="terminal_interface-curses__ads.htm#ref_528_19">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                  <FONT COLOR=red><A NAME="ref_161_19" HREF="terminal_interface-curses__ads.htm#ref_529_19">Ch</A></FONT>  : <b>in</b> Character)
-    <b>is</b>
-    <b>begin</b>
--      <A HREF="terminal_interface-curses__ads.htm#ref_517_14">Add</A> (<A HREF="terminal_interface-curses__ads.htm#ref_522_19">Win</A>,
--           <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>'(<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_523_19">Ch</A>,
-+      <A HREF="terminal_interface-curses__ads.htm#ref_523_14">Add</A> (<A HREF="terminal_interface-curses__ads.htm#ref_528_19">Win</A>,
-+           <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>'(<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_529_19">Ch</A>,
-                                  <A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First,
-                                  <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>  =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>));
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_522_14">Add</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_528_14">Add</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_223_14" HREF="terminal_interface-curses__ads.htm#ref_528_14">Add</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_224_7" HREF="terminal_interface-curses__ads.htm#ref_529_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_225_7" HREF="terminal_interface-curses__ads.htm#ref_530_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_226_7" HREF="terminal_interface-curses__ads.htm#ref_531_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
--      <FONT COLOR=red><A NAME="ref_227_7" HREF="terminal_interface-curses__ads.htm#ref_532_7">Ch</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
--   <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_229_16">mvwaddch</A></FONT> (<FONT COLOR=red><A NAME="ref_229_26" HREF="terminal_interface-curses__adb.htm#ref_229_16">W</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                         <FONT COLOR=red><A NAME="ref_230_26" HREF="terminal_interface-curses__adb.htm#ref_229_16">Y</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--                         <FONT COLOR=red><A NAME="ref_231_26" HREF="terminal_interface-curses__adb.htm#ref_229_16">X</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--                         <FONT COLOR=red><A NAME="ref_232_26" HREF="terminal_interface-curses__adb.htm#ref_229_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_170_14" HREF="terminal_interface-curses__ads.htm#ref_534_14">Add</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_171_7" HREF="terminal_interface-curses__ads.htm#ref_535_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_172_7" HREF="terminal_interface-curses__ads.htm#ref_536_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_173_7" HREF="terminal_interface-curses__ads.htm#ref_537_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_174_7" HREF="terminal_interface-curses__ads.htm#ref_538_7">Ch</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
-+   <b>is</b>
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_176_16">mvwaddch</A></FONT> (<FONT COLOR=red><A NAME="ref_176_26" HREF="terminal_interface-curses__adb.htm#ref_176_16">W</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                         <FONT COLOR=red><A NAME="ref_177_26" HREF="terminal_interface-curses__adb.htm#ref_176_16">Y</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+                         <FONT COLOR=red><A NAME="ref_178_26" HREF="terminal_interface-curses__adb.htm#ref_176_16">X</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+                         <FONT COLOR=red><A NAME="ref_179_26" HREF="terminal_interface-curses__adb.htm#ref_176_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, mvwaddch, "mvwaddch");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_229_16">mvwaddch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_529_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_530_7">Line</A>),
--                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_531_7">Column</A>),
--                   AttrChar_To_Chtype (<A HREF="terminal_interface-curses__ads.htm#ref_532_7">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_176_16">mvwaddch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_535_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_536_7">Line</A>),
-+                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_537_7">Column</A>),
-+                   AttrChar_To_Chtype (<A HREF="terminal_interface-curses__ads.htm#ref_538_7">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_528_14">Add</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_534_14">Add</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_242_14" HREF="terminal_interface-curses__ads.htm#ref_536_14">Add</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_243_7" HREF="terminal_interface-curses__ads.htm#ref_537_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_244_7" HREF="terminal_interface-curses__ads.htm#ref_538_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_245_7" HREF="terminal_interface-curses__ads.htm#ref_539_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
--      <FONT COLOR=red><A NAME="ref_246_7" HREF="terminal_interface-curses__ads.htm#ref_540_7">Ch</A></FONT>     : <b>in</b> Character)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_189_14" HREF="terminal_interface-curses__ads.htm#ref_542_14">Add</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_190_7" HREF="terminal_interface-curses__ads.htm#ref_543_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_191_7" HREF="terminal_interface-curses__ads.htm#ref_544_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_192_7" HREF="terminal_interface-curses__ads.htm#ref_545_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_193_7" HREF="terminal_interface-curses__ads.htm#ref_546_7">Ch</A></FONT>     : <b>in</b> Character)
-    <b>is</b>
-    <b>begin</b>
--      <A HREF="terminal_interface-curses__ads.htm#ref_528_14">Add</A> (<A HREF="terminal_interface-curses__ads.htm#ref_537_7">Win</A>,
--           <A HREF="terminal_interface-curses__ads.htm#ref_538_7">Line</A>,
--           <A HREF="terminal_interface-curses__ads.htm#ref_539_7">Column</A>,
--           <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>'(<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_540_7">Ch</A>,
-+      <A HREF="terminal_interface-curses__ads.htm#ref_534_14">Add</A> (<A HREF="terminal_interface-curses__ads.htm#ref_543_7">Win</A>,
-+           <A HREF="terminal_interface-curses__ads.htm#ref_544_7">Line</A>,
-+           <A HREF="terminal_interface-curses__ads.htm#ref_545_7">Column</A>,
-+           <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>'(<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_546_7">Ch</A>,
-                                  <A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First,
-                                  <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>  =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>));
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_536_14">Add</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_542_14">Add</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_257_14" HREF="terminal_interface-curses__ads.htm#ref_545_14">Add_With_Immediate_Echo</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_258_7" HREF="terminal_interface-curses__ads.htm#ref_546_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_259_7" HREF="terminal_interface-curses__ads.htm#ref_547_7">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_204_14" HREF="terminal_interface-curses__ads.htm#ref_551_14">Add_With_Immediate_Echo</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_205_7" HREF="terminal_interface-curses__ads.htm#ref_552_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_206_7" HREF="terminal_interface-curses__ads.htm#ref_553_7">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_261_16">Wechochar</A></FONT> (<FONT COLOR=red><A NAME="ref_261_27" HREF="terminal_interface-curses__adb.htm#ref_261_16">W</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                          <FONT COLOR=red><A NAME="ref_262_27" HREF="terminal_interface-curses__adb.htm#ref_261_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_208_16">Wechochar</A></FONT> (<FONT COLOR=red><A NAME="ref_208_27" HREF="terminal_interface-curses__adb.htm#ref_208_16">W</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                          <FONT COLOR=red><A NAME="ref_209_27" HREF="terminal_interface-curses__adb.htm#ref_208_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Wechochar, "wechochar");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_261_16">Wechochar</A> (<A HREF="terminal_interface-curses__ads.htm#ref_546_7">Win</A>, AttrChar_To_Chtype (<A HREF="terminal_interface-curses__ads.htm#ref_547_7">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_208_16">Wechochar</A> (<A HREF="terminal_interface-curses__ads.htm#ref_552_7">Win</A>, AttrChar_To_Chtype (<A HREF="terminal_interface-curses__ads.htm#ref_553_7">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_545_14">Add_With_Immediate_Echo</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_551_14">Add_With_Immediate_Echo</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_270_14" HREF="terminal_interface-curses__ads.htm#ref_551_14">Add_With_Immediate_Echo</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_271_7" HREF="terminal_interface-curses__ads.htm#ref_552_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_272_7" HREF="terminal_interface-curses__ads.htm#ref_553_7">Ch</A></FONT>  : <b>in</b> Character)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_217_14" HREF="terminal_interface-curses__ads.htm#ref_557_14">Add_With_Immediate_Echo</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_218_7" HREF="terminal_interface-curses__ads.htm#ref_558_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_219_7" HREF="terminal_interface-curses__ads.htm#ref_559_7">Ch</A></FONT>  : <b>in</b> Character)
-    <b>is</b>
-    <b>begin</b>
--      <A HREF="terminal_interface-curses__ads.htm#ref_545_14">Add_With_Immediate_Echo</A>
--        (<A HREF="terminal_interface-curses__ads.htm#ref_552_7">Win</A>,
--         <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>'(<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_553_7">Ch</A>,
-+      <A HREF="terminal_interface-curses__ads.htm#ref_551_14">Add_With_Immediate_Echo</A>
-+        (<A HREF="terminal_interface-curses__ads.htm#ref_558_7">Win</A>,
-+         <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>'(<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_559_7">Ch</A>,
-                                <A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First,
-                                <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>  =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>));
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_551_14">Add_With_Immediate_Echo</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_557_14">Add_With_Immediate_Echo</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>function</b> <FONT COLOR=red><A NAME="ref_282_13" HREF="terminal_interface-curses__ads.htm#ref_563_13">Create</A></FONT> (<FONT COLOR=red><A NAME="ref_282_21" HREF="terminal_interface-curses__ads.htm#ref_564_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
--                    <FONT COLOR=red><A NAME="ref_283_21" HREF="terminal_interface-curses__ads.htm#ref_565_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
--                    <FONT COLOR=red><A NAME="ref_284_21" HREF="terminal_interface-curses__ads.htm#ref_566_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--                    <FONT COLOR=red><A NAME="ref_285_21" HREF="terminal_interface-curses__ads.htm#ref_567_7">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
--   <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_287_16">Newwin</A></FONT> (<FONT COLOR=red><A NAME="ref_287_24" HREF="terminal_interface-curses__adb.htm#ref_287_16">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--                       <FONT COLOR=red><A NAME="ref_288_24" HREF="terminal_interface-curses__adb.htm#ref_287_16">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--                       <FONT COLOR=red><A NAME="ref_289_24" HREF="terminal_interface-curses__adb.htm#ref_287_16">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--                       <FONT COLOR=red><A NAME="ref_290_24" HREF="terminal_interface-curses__adb.htm#ref_287_16">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_229_13" HREF="terminal_interface-curses__ads.htm#ref_569_13">Create</A></FONT> (<FONT COLOR=red><A NAME="ref_229_21" HREF="terminal_interface-curses__ads.htm#ref_570_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+                    <FONT COLOR=red><A NAME="ref_230_21" HREF="terminal_interface-curses__ads.htm#ref_571_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-+                    <FONT COLOR=red><A NAME="ref_231_21" HREF="terminal_interface-curses__ads.htm#ref_572_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+                    <FONT COLOR=red><A NAME="ref_232_21" HREF="terminal_interface-curses__ads.htm#ref_573_7">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
-+   <b>is</b>
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_234_16">Newwin</A></FONT> (<FONT COLOR=red><A NAME="ref_234_24" HREF="terminal_interface-curses__adb.htm#ref_234_16">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+                       <FONT COLOR=red><A NAME="ref_235_24" HREF="terminal_interface-curses__adb.htm#ref_234_16">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+                       <FONT COLOR=red><A NAME="ref_236_24" HREF="terminal_interface-curses__adb.htm#ref_234_16">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+                       <FONT COLOR=red><A NAME="ref_237_24" HREF="terminal_interface-curses__adb.htm#ref_234_16">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-       <b>pragma</b> Import (C, Newwin, "newwin");
- 
--      <FONT COLOR=red><A NAME="ref_293_7">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+      <FONT COLOR=red><A NAME="ref_240_7">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-    <b>begin</b>
--      <A HREF="terminal_interface-curses__adb.htm#ref_293_7">W</A> := <A HREF="terminal_interface-curses__adb.htm#ref_287_16">Newwin</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_564_7">Number_Of_Lines</A>),
--                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_565_7">Number_Of_Columns</A>),
--                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_566_7">First_Line_Position</A>),
--                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_567_7">First_Column_Position</A>));
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_293_7">W</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-+      <A HREF="terminal_interface-curses__adb.htm#ref_240_7">W</A> := <A HREF="terminal_interface-curses__adb.htm#ref_234_16">Newwin</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_570_7">Number_Of_Lines</A>),
-+                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_571_7">Number_Of_Columns</A>),
-+                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_572_7">First_Line_Position</A>),
-+                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_573_7">First_Column_Position</A>));
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_240_7">W</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_293_7">W</A>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_563_13">Create</A>;
-+      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_240_7">W</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_569_13">Create</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_305_14" HREF="terminal_interface-curses__ads.htm#ref_582_14">Delete</A></FONT> (<FONT COLOR=red><A NAME="ref_305_22" HREF="terminal_interface-curses__ads.htm#ref_582_22">Win</A></FONT> : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_252_14" HREF="terminal_interface-curses__ads.htm#ref_588_14">Delete</A></FONT> (<FONT COLOR=red><A NAME="ref_252_22" HREF="terminal_interface-curses__ads.htm#ref_588_22">Win</A></FONT> : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_307_16">Wdelwin</A></FONT> (<FONT COLOR=red><A NAME="ref_307_25" HREF="terminal_interface-curses__adb.htm#ref_307_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_254_16">Wdelwin</A></FONT> (<FONT COLOR=red><A NAME="ref_254_25" HREF="terminal_interface-curses__adb.htm#ref_254_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Wdelwin, "delwin");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_307_16">Wdelwin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_582_22">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_254_16">Wdelwin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_588_22">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--      <A HREF="terminal_interface-curses__ads.htm#ref_582_22">Win</A> := <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_582_14">Delete</A>;
-+      <A HREF="terminal_interface-curses__ads.htm#ref_588_22">Win</A> := <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_588_14">Delete</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_316_13" HREF="terminal_interface-curses__ads.htm#ref_588_13">Sub_Window</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_317_7" HREF="terminal_interface-curses__ads.htm#ref_589_7">Win</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_318_7" HREF="terminal_interface-curses__ads.htm#ref_590_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
--      <FONT COLOR=red><A NAME="ref_319_7" HREF="terminal_interface-curses__ads.htm#ref_591_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
--      <FONT COLOR=red><A NAME="ref_320_7" HREF="terminal_interface-curses__ads.htm#ref_592_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_321_7" HREF="terminal_interface-curses__ads.htm#ref_593_7">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
--   <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_323_16">Subwin</A></FONT>
--        (<FONT COLOR=red><A NAME="ref_324_10" HREF="terminal_interface-curses__adb.htm#ref_323_16">Win</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--         <FONT COLOR=red><A NAME="ref_325_10" HREF="terminal_interface-curses__adb.htm#ref_323_16">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--         <FONT COLOR=red><A NAME="ref_326_10" HREF="terminal_interface-curses__adb.htm#ref_323_16">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--         <FONT COLOR=red><A NAME="ref_327_10" HREF="terminal_interface-curses__adb.htm#ref_323_16">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--         <FONT COLOR=red><A NAME="ref_328_10" HREF="terminal_interface-curses__adb.htm#ref_323_16">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_263_13" HREF="terminal_interface-curses__ads.htm#ref_594_13">Sub_Window</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_264_7" HREF="terminal_interface-curses__ads.htm#ref_595_7">Win</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_265_7" HREF="terminal_interface-curses__ads.htm#ref_596_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+      <FONT COLOR=red><A NAME="ref_266_7" HREF="terminal_interface-curses__ads.htm#ref_597_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-+      <FONT COLOR=red><A NAME="ref_267_7" HREF="terminal_interface-curses__ads.htm#ref_598_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_268_7" HREF="terminal_interface-curses__ads.htm#ref_599_7">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
-+   <b>is</b>
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_270_16">Subwin</A></FONT>
-+        (<FONT COLOR=red><A NAME="ref_271_10" HREF="terminal_interface-curses__adb.htm#ref_270_16">Win</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+         <FONT COLOR=red><A NAME="ref_272_10" HREF="terminal_interface-curses__adb.htm#ref_270_16">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+         <FONT COLOR=red><A NAME="ref_273_10" HREF="terminal_interface-curses__adb.htm#ref_270_16">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+         <FONT COLOR=red><A NAME="ref_274_10" HREF="terminal_interface-curses__adb.htm#ref_270_16">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+         <FONT COLOR=red><A NAME="ref_275_10" HREF="terminal_interface-curses__adb.htm#ref_270_16">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-       <b>pragma</b> Import (C, Subwin, "subwin");
- 
--      <FONT COLOR=red><A NAME="ref_331_7">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+      <FONT COLOR=red><A NAME="ref_278_7">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-    <b>begin</b>
--      <A HREF="terminal_interface-curses__adb.htm#ref_331_7">W</A> := <A HREF="terminal_interface-curses__adb.htm#ref_323_16">Subwin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_589_7">Win</A>,
--                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_590_7">Number_Of_Lines</A>),
--                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_591_7">Number_Of_Columns</A>),
--                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_592_7">First_Line_Position</A>),
--                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_593_7">First_Column_Position</A>));
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_331_7">W</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
--         <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
--      <b>end</b> <b>if</b>;
--      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_331_7">W</A>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_588_13">Sub_Window</A>;
--
--   <b>function</b> <FONT COLOR=red><A NAME="ref_344_13" HREF="terminal_interface-curses__ads.htm#ref_598_13">Derived_Window</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_345_7" HREF="terminal_interface-curses__ads.htm#ref_599_7">Win</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_346_7" HREF="terminal_interface-curses__ads.htm#ref_600_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
--      <FONT COLOR=red><A NAME="ref_347_7" HREF="terminal_interface-curses__ads.htm#ref_601_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
--      <FONT COLOR=red><A NAME="ref_348_7" HREF="terminal_interface-curses__ads.htm#ref_602_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_349_7" HREF="terminal_interface-curses__ads.htm#ref_603_7">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
--   <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_351_16">Derwin</A></FONT>
--        (<FONT COLOR=red><A NAME="ref_352_10" HREF="terminal_interface-curses__adb.htm#ref_351_16">Win</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--         <FONT COLOR=red><A NAME="ref_353_10" HREF="terminal_interface-curses__adb.htm#ref_351_16">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--         <FONT COLOR=red><A NAME="ref_354_10" HREF="terminal_interface-curses__adb.htm#ref_351_16">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--         <FONT COLOR=red><A NAME="ref_355_10" HREF="terminal_interface-curses__adb.htm#ref_351_16">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--         <FONT COLOR=red><A NAME="ref_356_10" HREF="terminal_interface-curses__adb.htm#ref_351_16">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+      <A HREF="terminal_interface-curses__adb.htm#ref_278_7">W</A> := <A HREF="terminal_interface-curses__adb.htm#ref_270_16">Subwin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_595_7">Win</A>,
-+                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_596_7">Number_Of_Lines</A>),
-+                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_597_7">Number_Of_Columns</A>),
-+                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_598_7">First_Line_Position</A>),
-+                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_599_7">First_Column_Position</A>));
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_278_7">W</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-+         <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+      <b>end</b> <b>if</b>;
-+      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_278_7">W</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_594_13">Sub_Window</A>;
-+
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_291_13" HREF="terminal_interface-curses__ads.htm#ref_604_13">Derived_Window</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_292_7" HREF="terminal_interface-curses__ads.htm#ref_605_7">Win</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_293_7" HREF="terminal_interface-curses__ads.htm#ref_606_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+      <FONT COLOR=red><A NAME="ref_294_7" HREF="terminal_interface-curses__ads.htm#ref_607_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-+      <FONT COLOR=red><A NAME="ref_295_7" HREF="terminal_interface-curses__ads.htm#ref_608_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_296_7" HREF="terminal_interface-curses__ads.htm#ref_609_7">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
-+   <b>is</b>
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_298_16">Derwin</A></FONT>
-+        (<FONT COLOR=red><A NAME="ref_299_10" HREF="terminal_interface-curses__adb.htm#ref_298_16">Win</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+         <FONT COLOR=red><A NAME="ref_300_10" HREF="terminal_interface-curses__adb.htm#ref_298_16">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+         <FONT COLOR=red><A NAME="ref_301_10" HREF="terminal_interface-curses__adb.htm#ref_298_16">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+         <FONT COLOR=red><A NAME="ref_302_10" HREF="terminal_interface-curses__adb.htm#ref_298_16">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+         <FONT COLOR=red><A NAME="ref_303_10" HREF="terminal_interface-curses__adb.htm#ref_298_16">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-       <b>pragma</b> Import (C, Derwin, "derwin");
- 
--      <FONT COLOR=red><A NAME="ref_359_7">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+      <FONT COLOR=red><A NAME="ref_306_7">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-    <b>begin</b>
--      <A HREF="terminal_interface-curses__adb.htm#ref_359_7">W</A> := <A HREF="terminal_interface-curses__adb.htm#ref_351_16">Derwin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_599_7">Win</A>,
--                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_600_7">Number_Of_Lines</A>),
--                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_601_7">Number_Of_Columns</A>),
--                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_602_7">First_Line_Position</A>),
--                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_603_7">First_Column_Position</A>));
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_359_7">W</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-+      <A HREF="terminal_interface-curses__adb.htm#ref_306_7">W</A> := <A HREF="terminal_interface-curses__adb.htm#ref_298_16">Derwin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_605_7">Win</A>,
-+                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_606_7">Number_Of_Lines</A>),
-+                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_607_7">Number_Of_Columns</A>),
-+                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_608_7">First_Line_Position</A>),
-+                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_609_7">First_Column_Position</A>));
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_306_7">W</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_359_7">W</A>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_598_13">Derived_Window</A>;
-+      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_306_7">W</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_604_13">Derived_Window</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_372_13" HREF="terminal_interface-curses__ads.htm#ref_608_13">Duplicate</A></FONT> (<FONT COLOR=red><A NAME="ref_372_24" HREF="terminal_interface-curses__ads.htm#ref_608_24">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_319_13" HREF="terminal_interface-curses__ads.htm#ref_614_13">Duplicate</A></FONT> (<FONT COLOR=red><A NAME="ref_319_24" HREF="terminal_interface-curses__ads.htm#ref_614_24">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_374_16">Dupwin</A></FONT> (<FONT COLOR=red><A NAME="ref_374_24" HREF="terminal_interface-curses__adb.htm#ref_374_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_321_16">Dupwin</A></FONT> (<FONT COLOR=red><A NAME="ref_321_24" HREF="terminal_interface-curses__adb.htm#ref_321_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-       <b>pragma</b> Import (C, Dupwin, "dupwin");
- 
--      <FONT COLOR=red><A NAME="ref_377_7">W</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__adb.htm#ref_374_16">Dupwin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_608_24">Win</A>);
-+      <FONT COLOR=red><A NAME="ref_324_7">W</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__adb.htm#ref_321_16">Dupwin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_614_24">Win</A>);
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_377_7">W</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_324_7">W</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_377_7">W</A>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_608_13">Duplicate</A>;
-+      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_324_7">W</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_614_13">Duplicate</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_385_14" HREF="terminal_interface-curses__ads.htm#ref_613_14">Move_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_385_27" HREF="terminal_interface-curses__ads.htm#ref_613_27">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                          <FONT COLOR=red><A NAME="ref_386_27" HREF="terminal_interface-curses__ads.htm#ref_614_27">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--                          <FONT COLOR=red><A NAME="ref_387_27" HREF="terminal_interface-curses__ads.htm#ref_615_27">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_332_14" HREF="terminal_interface-curses__ads.htm#ref_619_14">Move_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_332_27" HREF="terminal_interface-curses__ads.htm#ref_619_27">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                          <FONT COLOR=red><A NAME="ref_333_27" HREF="terminal_interface-curses__ads.htm#ref_620_27">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+                          <FONT COLOR=red><A NAME="ref_334_27" HREF="terminal_interface-curses__ads.htm#ref_621_27">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_389_16">Mvwin</A></FONT> (<FONT COLOR=red><A NAME="ref_389_23" HREF="terminal_interface-curses__adb.htm#ref_389_16">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                      <FONT COLOR=red><A NAME="ref_390_23" HREF="terminal_interface-curses__adb.htm#ref_389_16">Line</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--                      <FONT COLOR=red><A NAME="ref_391_23" HREF="terminal_interface-curses__adb.htm#ref_389_16">Column</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_336_16">Mvwin</A></FONT> (<FONT COLOR=red><A NAME="ref_336_23" HREF="terminal_interface-curses__adb.htm#ref_336_16">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                      <FONT COLOR=red><A NAME="ref_337_23" HREF="terminal_interface-curses__adb.htm#ref_336_16">Line</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+                      <FONT COLOR=red><A NAME="ref_338_23" HREF="terminal_interface-curses__adb.htm#ref_336_16">Column</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Mvwin, "mvwin");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_389_16">Mvwin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_613_27">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_614_27">Line</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_615_27">Column</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_336_16">Mvwin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_619_27">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_620_27">Line</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_621_27">Column</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_613_14">Move_Window</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_619_14">Move_Window</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_399_14" HREF="terminal_interface-curses__ads.htm#ref_620_14">Move_Derived_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_399_35" HREF="terminal_interface-curses__ads.htm#ref_620_35">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                                  <FONT COLOR=red><A NAME="ref_400_35" HREF="terminal_interface-curses__ads.htm#ref_621_35">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--                                  <FONT COLOR=red><A NAME="ref_401_35" HREF="terminal_interface-curses__ads.htm#ref_622_35">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_346_14" HREF="terminal_interface-curses__ads.htm#ref_626_14">Move_Derived_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_346_35" HREF="terminal_interface-curses__ads.htm#ref_626_35">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                                  <FONT COLOR=red><A NAME="ref_347_35" HREF="terminal_interface-curses__ads.htm#ref_627_35">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+                                  <FONT COLOR=red><A NAME="ref_348_35" HREF="terminal_interface-curses__ads.htm#ref_628_35">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_403_16">Mvderwin</A></FONT> (<FONT COLOR=red><A NAME="ref_403_26" HREF="terminal_interface-curses__adb.htm#ref_403_16">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                         <FONT COLOR=red><A NAME="ref_404_26" HREF="terminal_interface-curses__adb.htm#ref_403_16">Line</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--                         <FONT COLOR=red><A NAME="ref_405_26" HREF="terminal_interface-curses__adb.htm#ref_403_16">Column</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_350_16">Mvderwin</A></FONT> (<FONT COLOR=red><A NAME="ref_350_26" HREF="terminal_interface-curses__adb.htm#ref_350_16">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                         <FONT COLOR=red><A NAME="ref_351_26" HREF="terminal_interface-curses__adb.htm#ref_350_16">Line</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+                         <FONT COLOR=red><A NAME="ref_352_26" HREF="terminal_interface-curses__adb.htm#ref_350_16">Column</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Mvderwin, "mvderwin");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_403_16">Mvderwin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_620_35">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_621_35">Line</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_622_35">Column</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_350_16">Mvderwin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_626_35">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_627_35">Line</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_628_35">Column</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_620_14">Move_Derived_Window</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_626_14">Move_Derived_Window</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_413_14" HREF="terminal_interface-curses__ads.htm#ref_637_14">Set_Synch_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_413_30" HREF="terminal_interface-curses__ads.htm#ref_637_30">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>  := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--                             <FONT COLOR=red><A NAME="ref_414_30" HREF="terminal_interface-curses__ads.htm#ref_638_30">Mode</A></FONT> : <b>in</b> Boolean := False)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_360_14" HREF="terminal_interface-curses__ads.htm#ref_643_14">Set_Synch_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_360_30" HREF="terminal_interface-curses__ads.htm#ref_643_30">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>  := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                             <FONT COLOR=red><A NAME="ref_361_30" HREF="terminal_interface-curses__ads.htm#ref_644_30">Mode</A></FONT> : <b>in</b> Boolean := False)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_416_16">Syncok</A></FONT> (<FONT COLOR=red><A NAME="ref_416_24" HREF="terminal_interface-curses__adb.htm#ref_416_16">Win</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                       <FONT COLOR=red><A NAME="ref_417_24" HREF="terminal_interface-curses__adb.htm#ref_416_16">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_363_16">Syncok</A></FONT> (<FONT COLOR=red><A NAME="ref_363_24" HREF="terminal_interface-curses__adb.htm#ref_363_16">Win</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                       <FONT COLOR=red><A NAME="ref_364_24" HREF="terminal_interface-curses__adb.htm#ref_363_16">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Syncok, "syncok");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_416_16">Syncok</A> (<A HREF="terminal_interface-curses__ads.htm#ref_637_30">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_638_30">Mode</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_363_16">Syncok</A> (<A HREF="terminal_interface-curses__ads.htm#ref_643_30">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_644_30">Mode</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_637_14">Set_Synch_Mode</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_643_14">Set_Synch_Mode</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_425_14" HREF="terminal_interface-curses__ads.htm#ref_647_14">Add</A></FONT> (<FONT COLOR=red><A NAME="ref_425_19" HREF="terminal_interface-curses__ads.htm#ref_647_19">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--                  <FONT COLOR=red><A NAME="ref_426_19" HREF="terminal_interface-curses__ads.htm#ref_648_19">Str</A></FONT> : <b>in</b> String;
--                  <FONT COLOR=red><A NAME="ref_427_19" HREF="terminal_interface-curses__ads.htm#ref_649_19">Len</A></FONT> : <b>in</b> Integer := -1)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_372_14" HREF="terminal_interface-curses__ads.htm#ref_653_14">Add</A></FONT> (<FONT COLOR=red><A NAME="ref_372_19" HREF="terminal_interface-curses__ads.htm#ref_653_19">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                  <FONT COLOR=red><A NAME="ref_373_19" HREF="terminal_interface-curses__ads.htm#ref_654_19">Str</A></FONT> : <b>in</b> String;
-+                  <FONT COLOR=red><A NAME="ref_374_19" HREF="terminal_interface-curses__ads.htm#ref_655_19">Len</A></FONT> : <b>in</b> Integer := -1)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_429_16">Waddnstr</A></FONT> (<FONT COLOR=red><A NAME="ref_429_26" HREF="terminal_interface-curses__adb.htm#ref_429_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                         <FONT COLOR=red><A NAME="ref_430_26" HREF="terminal_interface-curses__adb.htm#ref_429_16">Str</A></FONT> : char_array;
--                         <FONT COLOR=red><A NAME="ref_431_26" HREF="terminal_interface-curses__adb.htm#ref_429_16">Len</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := -1) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_376_16">Waddnstr</A></FONT> (<FONT COLOR=red><A NAME="ref_376_26" HREF="terminal_interface-curses__adb.htm#ref_376_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                         <FONT COLOR=red><A NAME="ref_377_26" HREF="terminal_interface-curses__adb.htm#ref_376_16">Str</A></FONT> : char_array;
-+                         <FONT COLOR=red><A NAME="ref_378_26" HREF="terminal_interface-curses__adb.htm#ref_376_16">Len</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := -1) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Waddnstr, "waddnstr");
- 
--      <FONT COLOR=red><A NAME="ref_434_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_648_19">Str</A>'Length);
--      <FONT COLOR=red><A NAME="ref_435_7">Length</A></FONT> : size_t;
-+      <FONT COLOR=red><A NAME="ref_381_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_654_19">Str</A>'Length);
-+      <FONT COLOR=red><A NAME="ref_382_7">Length</A></FONT> : size_t;
-    <b>begin</b>
--      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_648_19">Str</A>, <A HREF="terminal_interface-curses__adb.htm#ref_434_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_435_7">Length</A>);
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_429_16">Waddnstr</A> (<A HREF="terminal_interface-curses__ads.htm#ref_647_19">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_434_7">Txt</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_649_19">Len</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_654_19">Str</A>, <A HREF="terminal_interface-curses__adb.htm#ref_381_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_382_7">Length</A>);
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_376_16">Waddnstr</A> (<A HREF="terminal_interface-curses__ads.htm#ref_653_19">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_381_7">Txt</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_655_19">Len</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_647_14">Add</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_653_14">Add</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_443_14" HREF="terminal_interface-curses__ads.htm#ref_656_14">Add</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_444_7" HREF="terminal_interface-curses__ads.htm#ref_656_19">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_445_7" HREF="terminal_interface-curses__ads.htm#ref_657_19">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_446_7" HREF="terminal_interface-curses__ads.htm#ref_658_19">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
--      <FONT COLOR=red><A NAME="ref_447_7" HREF="terminal_interface-curses__ads.htm#ref_659_19">Str</A></FONT>    : <b>in</b> String;
--      <FONT COLOR=red><A NAME="ref_448_7" HREF="terminal_interface-curses__ads.htm#ref_660_19">Len</A></FONT>    : <b>in</b> Integer := -1)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_390_14" HREF="terminal_interface-curses__ads.htm#ref_662_14">Add</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_391_7" HREF="terminal_interface-curses__ads.htm#ref_662_19">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_392_7" HREF="terminal_interface-curses__ads.htm#ref_663_19">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_393_7" HREF="terminal_interface-curses__ads.htm#ref_664_19">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_394_7" HREF="terminal_interface-curses__ads.htm#ref_665_19">Str</A></FONT>    : <b>in</b> String;
-+      <FONT COLOR=red><A NAME="ref_395_7" HREF="terminal_interface-curses__ads.htm#ref_666_19">Len</A></FONT>    : <b>in</b> Integer := -1)
-    <b>is</b>
-    <b>begin</b>
--      <A HREF="terminal_interface-curses__ads.htm#ref_505_14">Move_Cursor</A> (<A HREF="terminal_interface-curses__ads.htm#ref_656_19">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_657_19">Line</A>, <A HREF="terminal_interface-curses__ads.htm#ref_658_19">Column</A>);
--      <A HREF="terminal_interface-curses__ads.htm#ref_647_14">Add</A> (<A HREF="terminal_interface-curses__ads.htm#ref_656_19">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_659_19">Str</A>, <A HREF="terminal_interface-curses__ads.htm#ref_660_19">Len</A>);
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_656_14">Add</A>;
-+      <A HREF="terminal_interface-curses__ads.htm#ref_511_14">Move_Cursor</A> (<A HREF="terminal_interface-curses__ads.htm#ref_662_19">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_663_19">Line</A>, <A HREF="terminal_interface-curses__ads.htm#ref_664_19">Column</A>);
-+      <A HREF="terminal_interface-curses__ads.htm#ref_653_14">Add</A> (<A HREF="terminal_interface-curses__ads.htm#ref_662_19">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_665_19">Str</A>, <A HREF="terminal_interface-curses__ads.htm#ref_666_19">Len</A>);
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_662_14">Add</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_455_14" HREF="terminal_interface-curses__ads.htm#ref_671_14">Add</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_456_7" HREF="terminal_interface-curses__ads.htm#ref_671_19">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_457_7" HREF="terminal_interface-curses__ads.htm#ref_672_19">Str</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Attributed_String</A>;
--      <FONT COLOR=red><A NAME="ref_458_7" HREF="terminal_interface-curses__ads.htm#ref_673_19">Len</A></FONT> : <b>in</b> Integer := -1)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_402_14" HREF="terminal_interface-curses__ads.htm#ref_677_14">Add</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_403_7" HREF="terminal_interface-curses__ads.htm#ref_677_19">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_404_7" HREF="terminal_interface-curses__ads.htm#ref_678_19">Str</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Attributed_String</A>;
-+      <FONT COLOR=red><A NAME="ref_405_7" HREF="terminal_interface-curses__ads.htm#ref_679_19">Len</A></FONT> : <b>in</b> Integer := -1)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_460_16">Waddchnstr</A></FONT> (<FONT COLOR=red><A NAME="ref_460_28" HREF="terminal_interface-curses__adb.htm#ref_460_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                           <FONT COLOR=red><A NAME="ref_461_28" HREF="terminal_interface-curses__adb.htm#ref_460_16">Str</A></FONT> : <A HREF="terminal_interface-curses__adb.htm#ref_59_9">chtype_array</A>;
--                           <FONT COLOR=red><A NAME="ref_462_28" HREF="terminal_interface-curses__adb.htm#ref_460_16">Len</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := -1) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_407_16">Waddchnstr</A></FONT> (<FONT COLOR=red><A NAME="ref_407_28" HREF="terminal_interface-curses__adb.htm#ref_407_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                           <FONT COLOR=red><A NAME="ref_408_28" HREF="terminal_interface-curses__adb.htm#ref_407_16">Str</A></FONT> : <A HREF="terminal_interface-curses__adb.htm#ref_57_9">chtype_array</A>;
-+                           <FONT COLOR=red><A NAME="ref_409_28" HREF="terminal_interface-curses__adb.htm#ref_407_16">Len</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := -1) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Waddchnstr, "waddchnstr");
- 
--      <FONT COLOR=red><A NAME="ref_465_7">Txt</A></FONT> : <A HREF="terminal_interface-curses__adb.htm#ref_59_9">chtype_array</A> (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_672_19">Str</A>'Length);
-+      <FONT COLOR=red><A NAME="ref_412_7">Txt</A></FONT> : <A HREF="terminal_interface-curses__adb.htm#ref_57_9">chtype_array</A> (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_678_19">Str</A>'Length);
-    <b>begin</b>
--      <b>for</b> <FONT COLOR=red><A NAME="ref_467_11">Length</A></FONT> <b>in</b> 1 .. size_t (<A HREF="terminal_interface-curses__ads.htm#ref_672_19">Str</A>'Length) <b>loop</b>
--         <A HREF="terminal_interface-curses__adb.htm#ref_465_7">Txt</A> (<A HREF="terminal_interface-curses__adb.htm#ref_467_11">Length</A> - 1) := <A HREF="terminal_interface-curses__ads.htm#ref_672_19">Str</A> (Natural (<A HREF="terminal_interface-curses__adb.htm#ref_467_11">Length</A>));
-+      <b>for</b> <FONT COLOR=red><A NAME="ref_414_11">Length</A></FONT> <b>in</b> 1 .. size_t (<A HREF="terminal_interface-curses__ads.htm#ref_678_19">Str</A>'Length) <b>loop</b>
-+         <A HREF="terminal_interface-curses__adb.htm#ref_412_7">Txt</A> (<A HREF="terminal_interface-curses__adb.htm#ref_414_11">Length</A> - 1) := <A HREF="terminal_interface-curses__ads.htm#ref_678_19">Str</A> (Natural (<A HREF="terminal_interface-curses__adb.htm#ref_414_11">Length</A>));
-       <b>end</b> <b>loop</b>;
--      <A HREF="terminal_interface-curses__adb.htm#ref_465_7">Txt</A> (<A HREF="terminal_interface-curses__ads.htm#ref_672_19">Str</A>'Length) := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_460_16">Waddchnstr</A> (<A HREF="terminal_interface-curses__ads.htm#ref_671_19">Win</A>,
--                     <A HREF="terminal_interface-curses__adb.htm#ref_465_7">Txt</A>,
--                     <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_673_19">Len</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
--         <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
--      <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_671_14">Add</A>;
--
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_478_14" HREF="terminal_interface-curses__ads.htm#ref_680_14">Add</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_479_7" HREF="terminal_interface-curses__ads.htm#ref_680_19">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_480_7" HREF="terminal_interface-curses__ads.htm#ref_681_19">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_481_7" HREF="terminal_interface-curses__ads.htm#ref_682_19">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
--      <FONT COLOR=red><A NAME="ref_482_7" HREF="terminal_interface-curses__ads.htm#ref_683_19">Str</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Attributed_String</A>;
--      <FONT COLOR=red><A NAME="ref_483_7" HREF="terminal_interface-curses__ads.htm#ref_684_19">Len</A></FONT>    : <b>in</b> Integer := -1)
--   <b>is</b>
--   <b>begin</b>
--      <A HREF="terminal_interface-curses__ads.htm#ref_505_14">Move_Cursor</A> (<A HREF="terminal_interface-curses__ads.htm#ref_680_19">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_681_19">Line</A>, <A HREF="terminal_interface-curses__ads.htm#ref_682_19">Column</A>);
--      <A HREF="terminal_interface-curses__ads.htm#ref_671_14">Add</A> (<A HREF="terminal_interface-curses__ads.htm#ref_680_19">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_683_19">Str</A>, <A HREF="terminal_interface-curses__ads.htm#ref_684_19">Len</A>);
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_680_14">Add</A>;
--<FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_490_14" HREF="terminal_interface-curses__ads.htm#ref_698_14">Border</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_491_7" HREF="terminal_interface-curses__ads.htm#ref_699_7">Win</A></FONT>                       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_492_7" HREF="terminal_interface-curses__ads.htm#ref_700_7">Left_Side_Symbol</A></FONT>          : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
--      <FONT COLOR=red><A NAME="ref_493_7" HREF="terminal_interface-curses__ads.htm#ref_701_7">Right_Side_Symbol</A></FONT>         : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
--      <FONT COLOR=red><A NAME="ref_494_7" HREF="terminal_interface-curses__ads.htm#ref_702_7">Top_Side_Symbol</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
--      <FONT COLOR=red><A NAME="ref_495_7" HREF="terminal_interface-curses__ads.htm#ref_703_7">Bottom_Side_Symbol</A></FONT>        : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
--      <FONT COLOR=red><A NAME="ref_496_7" HREF="terminal_interface-curses__ads.htm#ref_704_7">Upper_Left_Corner_Symbol</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
--      <FONT COLOR=red><A NAME="ref_497_7" HREF="terminal_interface-curses__ads.htm#ref_705_7">Upper_Right_Corner_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
--      <FONT COLOR=red><A NAME="ref_498_7" HREF="terminal_interface-curses__ads.htm#ref_706_7">Lower_Left_Corner_Symbol</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
--      <FONT COLOR=red><A NAME="ref_499_7" HREF="terminal_interface-curses__ads.htm#ref_707_7">Lower_Right_Corner_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>)
--   <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_501_16">Wborder</A></FONT> (<FONT COLOR=red><A NAME="ref_501_25" HREF="terminal_interface-curses__adb.htm#ref_501_16">W</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                        <FONT COLOR=red><A NAME="ref_502_25" HREF="terminal_interface-curses__adb.htm#ref_501_16">LS</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
--                        <FONT COLOR=red><A NAME="ref_503_25" HREF="terminal_interface-curses__adb.htm#ref_501_16">RS</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
--                        <FONT COLOR=red><A NAME="ref_504_25" HREF="terminal_interface-curses__adb.htm#ref_501_16">TS</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
--                        <FONT COLOR=red><A NAME="ref_505_25" HREF="terminal_interface-curses__adb.htm#ref_501_16">BS</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
--                        <FONT COLOR=red><A NAME="ref_506_25" HREF="terminal_interface-curses__adb.htm#ref_501_16">ULC</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
--                        <FONT COLOR=red><A NAME="ref_507_25" HREF="terminal_interface-curses__adb.htm#ref_501_16">URC</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
--                        <FONT COLOR=red><A NAME="ref_508_25" HREF="terminal_interface-curses__adb.htm#ref_501_16">LLC</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
--                        <FONT COLOR=red><A NAME="ref_509_25" HREF="terminal_interface-curses__adb.htm#ref_501_16">LRC</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <A HREF="terminal_interface-curses__adb.htm#ref_412_7">Txt</A> (<A HREF="terminal_interface-curses__ads.htm#ref_678_19">Str</A>'Length) := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_407_16">Waddchnstr</A> (<A HREF="terminal_interface-curses__ads.htm#ref_677_19">Win</A>,
-+                     <A HREF="terminal_interface-curses__adb.htm#ref_412_7">Txt</A>,
-+                     <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_679_19">Len</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+         <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+      <b>end</b> <b>if</b>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_677_14">Add</A>;
-+
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_425_14" HREF="terminal_interface-curses__ads.htm#ref_686_14">Add</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_426_7" HREF="terminal_interface-curses__ads.htm#ref_686_19">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_427_7" HREF="terminal_interface-curses__ads.htm#ref_687_19">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_428_7" HREF="terminal_interface-curses__ads.htm#ref_688_19">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_429_7" HREF="terminal_interface-curses__ads.htm#ref_689_19">Str</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Attributed_String</A>;
-+      <FONT COLOR=red><A NAME="ref_430_7" HREF="terminal_interface-curses__ads.htm#ref_690_19">Len</A></FONT>    : <b>in</b> Integer := -1)
-+   <b>is</b>
-+   <b>begin</b>
-+      <A HREF="terminal_interface-curses__ads.htm#ref_511_14">Move_Cursor</A> (<A HREF="terminal_interface-curses__ads.htm#ref_686_19">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_687_19">Line</A>, <A HREF="terminal_interface-curses__ads.htm#ref_688_19">Column</A>);
-+      <A HREF="terminal_interface-curses__ads.htm#ref_677_14">Add</A> (<A HREF="terminal_interface-curses__ads.htm#ref_686_19">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_689_19">Str</A>, <A HREF="terminal_interface-curses__ads.htm#ref_690_19">Len</A>);
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_686_14">Add</A>;
-+<FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_437_14" HREF="terminal_interface-curses__ads.htm#ref_704_14">Border</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_438_7" HREF="terminal_interface-curses__ads.htm#ref_705_7">Win</A></FONT>                       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_439_7" HREF="terminal_interface-curses__ads.htm#ref_706_7">Left_Side_Symbol</A></FONT>          : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+      <FONT COLOR=red><A NAME="ref_440_7" HREF="terminal_interface-curses__ads.htm#ref_707_7">Right_Side_Symbol</A></FONT>         : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+      <FONT COLOR=red><A NAME="ref_441_7" HREF="terminal_interface-curses__ads.htm#ref_708_7">Top_Side_Symbol</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+      <FONT COLOR=red><A NAME="ref_442_7" HREF="terminal_interface-curses__ads.htm#ref_709_7">Bottom_Side_Symbol</A></FONT>        : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+      <FONT COLOR=red><A NAME="ref_443_7" HREF="terminal_interface-curses__ads.htm#ref_710_7">Upper_Left_Corner_Symbol</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+      <FONT COLOR=red><A NAME="ref_444_7" HREF="terminal_interface-curses__ads.htm#ref_711_7">Upper_Right_Corner_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+      <FONT COLOR=red><A NAME="ref_445_7" HREF="terminal_interface-curses__ads.htm#ref_712_7">Lower_Left_Corner_Symbol</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+      <FONT COLOR=red><A NAME="ref_446_7" HREF="terminal_interface-curses__ads.htm#ref_713_7">Lower_Right_Corner_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>)
-+   <b>is</b>
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_448_16">Wborder</A></FONT> (<FONT COLOR=red><A NAME="ref_448_25" HREF="terminal_interface-curses__adb.htm#ref_448_16">W</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                        <FONT COLOR=red><A NAME="ref_449_25" HREF="terminal_interface-curses__adb.htm#ref_448_16">LS</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-+                        <FONT COLOR=red><A NAME="ref_450_25" HREF="terminal_interface-curses__adb.htm#ref_448_16">RS</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-+                        <FONT COLOR=red><A NAME="ref_451_25" HREF="terminal_interface-curses__adb.htm#ref_448_16">TS</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-+                        <FONT COLOR=red><A NAME="ref_452_25" HREF="terminal_interface-curses__adb.htm#ref_448_16">BS</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-+                        <FONT COLOR=red><A NAME="ref_453_25" HREF="terminal_interface-curses__adb.htm#ref_448_16">ULC</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-+                        <FONT COLOR=red><A NAME="ref_454_25" HREF="terminal_interface-curses__adb.htm#ref_448_16">URC</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-+                        <FONT COLOR=red><A NAME="ref_455_25" HREF="terminal_interface-curses__adb.htm#ref_448_16">LLC</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-+                        <FONT COLOR=red><A NAME="ref_456_25" HREF="terminal_interface-curses__adb.htm#ref_448_16">LRC</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Wborder, "wborder");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_501_16">Wborder</A> (<A HREF="terminal_interface-curses__ads.htm#ref_699_7">Win</A>,
--                  AttrChar_To_Chtype (<A HREF="terminal_interface-curses__ads.htm#ref_700_7">Left_Side_Symbol</A>),
--                  AttrChar_To_Chtype (<A HREF="terminal_interface-curses__ads.htm#ref_701_7">Right_Side_Symbol</A>),
--                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_702_7">Top_Side_Symbol</A>),
--                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_703_7">Bottom_Side_Symbol</A>),
--                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_704_7">Upper_Left_Corner_Symbol</A>),
--                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_705_7">Upper_Right_Corner_Symbol</A>),
--                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_706_7">Lower_Left_Corner_Symbol</A>),
--                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_707_7">Lower_Right_Corner_Symbol</A>)
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_448_16">Wborder</A> (<A HREF="terminal_interface-curses__ads.htm#ref_705_7">Win</A>,
-+                  AttrChar_To_Chtype (<A HREF="terminal_interface-curses__ads.htm#ref_706_7">Left_Side_Symbol</A>),
-+                  AttrChar_To_Chtype (<A HREF="terminal_interface-curses__ads.htm#ref_707_7">Right_Side_Symbol</A>),
-+                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_708_7">Top_Side_Symbol</A>),
-+                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_709_7">Bottom_Side_Symbol</A>),
-+                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_710_7">Upper_Left_Corner_Symbol</A>),
-+                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_711_7">Upper_Right_Corner_Symbol</A>),
-+                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_712_7">Lower_Left_Corner_Symbol</A>),
-+                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_713_7">Lower_Right_Corner_Symbol</A>)
-                   ) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A>
-       <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_698_14">Border</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_704_14">Border</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_527_14" HREF="terminal_interface-curses__ads.htm#ref_714_14">Box</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_528_7" HREF="terminal_interface-curses__ads.htm#ref_715_7">Win</A></FONT>               : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_529_7" HREF="terminal_interface-curses__ads.htm#ref_716_7">Vertical_Symbol</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
--      <FONT COLOR=red><A NAME="ref_530_7" HREF="terminal_interface-curses__ads.htm#ref_717_7">Horizontal_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>)
--   <b>is</b>
--   <b>begin</b>
--      <A HREF="terminal_interface-curses__ads.htm#ref_698_14">Border</A> (<A HREF="terminal_interface-curses__ads.htm#ref_715_7">Win</A>,
--              <A HREF="terminal_interface-curses__ads.htm#ref_716_7">Vertical_Symbol</A>, <A HREF="terminal_interface-curses__ads.htm#ref_716_7">Vertical_Symbol</A>,
--              <A HREF="terminal_interface-curses__ads.htm#ref_717_7">Horizontal_Symbol</A>, <A HREF="terminal_interface-curses__ads.htm#ref_717_7">Horizontal_Symbol</A>);
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_714_14">Box</A>;
--
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_538_14" HREF="terminal_interface-curses__ads.htm#ref_722_14">Horizontal_Line</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_539_7" HREF="terminal_interface-curses__ads.htm#ref_723_7">Win</A></FONT>         : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_540_7" HREF="terminal_interface-curses__ads.htm#ref_724_7">Line_Size</A></FONT>   : <b>in</b> Natural;
--      <FONT COLOR=red><A NAME="ref_541_7" HREF="terminal_interface-curses__ads.htm#ref_725_7">Line_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>)
--   <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_543_16">Whline</A></FONT> (<FONT COLOR=red><A NAME="ref_543_24" HREF="terminal_interface-curses__adb.htm#ref_543_16">W</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                       <FONT COLOR=red><A NAME="ref_544_24" HREF="terminal_interface-curses__adb.htm#ref_543_16">Ch</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
--                       <FONT COLOR=red><A NAME="ref_545_24" HREF="terminal_interface-curses__adb.htm#ref_543_16">Len</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_474_14" HREF="terminal_interface-curses__ads.htm#ref_720_14">Box</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_475_7" HREF="terminal_interface-curses__ads.htm#ref_721_7">Win</A></FONT>               : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_476_7" HREF="terminal_interface-curses__ads.htm#ref_722_7">Vertical_Symbol</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+      <FONT COLOR=red><A NAME="ref_477_7" HREF="terminal_interface-curses__ads.htm#ref_723_7">Horizontal_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>)
-+   <b>is</b>
-+   <b>begin</b>
-+      <A HREF="terminal_interface-curses__ads.htm#ref_704_14">Border</A> (<A HREF="terminal_interface-curses__ads.htm#ref_721_7">Win</A>,
-+              <A HREF="terminal_interface-curses__ads.htm#ref_722_7">Vertical_Symbol</A>, <A HREF="terminal_interface-curses__ads.htm#ref_722_7">Vertical_Symbol</A>,
-+              <A HREF="terminal_interface-curses__ads.htm#ref_723_7">Horizontal_Symbol</A>, <A HREF="terminal_interface-curses__ads.htm#ref_723_7">Horizontal_Symbol</A>);
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_720_14">Box</A>;
-+
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_485_14" HREF="terminal_interface-curses__ads.htm#ref_728_14">Horizontal_Line</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_486_7" HREF="terminal_interface-curses__ads.htm#ref_729_7">Win</A></FONT>         : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_487_7" HREF="terminal_interface-curses__ads.htm#ref_730_7">Line_Size</A></FONT>   : <b>in</b> Natural;
-+      <FONT COLOR=red><A NAME="ref_488_7" HREF="terminal_interface-curses__ads.htm#ref_731_7">Line_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>)
-+   <b>is</b>
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_490_16">Whline</A></FONT> (<FONT COLOR=red><A NAME="ref_490_24" HREF="terminal_interface-curses__adb.htm#ref_490_16">W</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                       <FONT COLOR=red><A NAME="ref_491_24" HREF="terminal_interface-curses__adb.htm#ref_490_16">Ch</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-+                       <FONT COLOR=red><A NAME="ref_492_24" HREF="terminal_interface-curses__adb.htm#ref_490_16">Len</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Whline, "whline");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_543_16">Whline</A> (<A HREF="terminal_interface-curses__ads.htm#ref_723_7">Win</A>,
--                 <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_725_7">Line_Symbol</A>),
--                 <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_724_7">Line_Size</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_490_16">Whline</A> (<A HREF="terminal_interface-curses__ads.htm#ref_729_7">Win</A>,
-+                 <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_731_7">Line_Symbol</A>),
-+                 <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_730_7">Line_Size</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_722_14">Horizontal_Line</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_728_14">Horizontal_Line</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_555_14" HREF="terminal_interface-curses__ads.htm#ref_731_14">Vertical_Line</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_556_7" HREF="terminal_interface-curses__ads.htm#ref_732_7">Win</A></FONT>         : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_557_7" HREF="terminal_interface-curses__ads.htm#ref_733_7">Line_Size</A></FONT>   : <b>in</b> Natural;
--      <FONT COLOR=red><A NAME="ref_558_7" HREF="terminal_interface-curses__ads.htm#ref_734_7">Line_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_502_14" HREF="terminal_interface-curses__ads.htm#ref_737_14">Vertical_Line</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_503_7" HREF="terminal_interface-curses__ads.htm#ref_738_7">Win</A></FONT>         : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_504_7" HREF="terminal_interface-curses__ads.htm#ref_739_7">Line_Size</A></FONT>   : <b>in</b> Natural;
-+      <FONT COLOR=red><A NAME="ref_505_7" HREF="terminal_interface-curses__ads.htm#ref_740_7">Line_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_560_16">Wvline</A></FONT> (<FONT COLOR=red><A NAME="ref_560_24" HREF="terminal_interface-curses__adb.htm#ref_560_16">W</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                       <FONT COLOR=red><A NAME="ref_561_24" HREF="terminal_interface-curses__adb.htm#ref_560_16">Ch</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
--                       <FONT COLOR=red><A NAME="ref_562_24" HREF="terminal_interface-curses__adb.htm#ref_560_16">Len</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_507_16">Wvline</A></FONT> (<FONT COLOR=red><A NAME="ref_507_24" HREF="terminal_interface-curses__adb.htm#ref_507_16">W</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                       <FONT COLOR=red><A NAME="ref_508_24" HREF="terminal_interface-curses__adb.htm#ref_507_16">Ch</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-+                       <FONT COLOR=red><A NAME="ref_509_24" HREF="terminal_interface-curses__adb.htm#ref_507_16">Len</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Wvline, "wvline");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_560_16">Wvline</A> (<A HREF="terminal_interface-curses__ads.htm#ref_732_7">Win</A>,
--                 <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_734_7">Line_Symbol</A>),
--                 <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_733_7">Line_Size</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_507_16">Wvline</A> (<A HREF="terminal_interface-curses__ads.htm#ref_738_7">Win</A>,
-+                 <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_740_7">Line_Symbol</A>),
-+                 <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_739_7">Line_Size</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_731_14">Vertical_Line</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_737_14">Vertical_Line</A>;
- 
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>function</b> <FONT COLOR=red><A NAME="ref_573_13" HREF="terminal_interface-curses__ads.htm#ref_745_13">Get_Keystroke</A></FONT> (<FONT COLOR=red><A NAME="ref_573_28" HREF="terminal_interface-curses__ads.htm#ref_745_28">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_520_13" HREF="terminal_interface-curses__ads.htm#ref_751_13">Get_Keystroke</A></FONT> (<FONT COLOR=red><A NAME="ref_520_28" HREF="terminal_interface-curses__ads.htm#ref_751_28">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-      <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_576_16">Wgetch</A></FONT> (<FONT COLOR=red><A NAME="ref_576_24" HREF="terminal_interface-curses__adb.htm#ref_576_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_523_16">Wgetch</A></FONT> (<FONT COLOR=red><A NAME="ref_523_24" HREF="terminal_interface-curses__adb.htm#ref_523_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Wgetch, "wgetch");
- 
--      <FONT COLOR=red><A NAME="ref_579_7">C</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses__adb.htm#ref_576_16">Wgetch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_745_28">Win</A>);
-+      <FONT COLOR=red><A NAME="ref_526_7">C</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses__adb.htm#ref_523_16">Wgetch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_751_28">Win</A>);
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_579_7">C</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_526_7">C</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_88_4">Key_None</A>;
-       <b>else</b>
--         <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A> (<A HREF="terminal_interface-curses__adb.htm#ref_579_7">C</A>);
-+         <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A> (<A HREF="terminal_interface-curses__adb.htm#ref_526_7">C</A>);
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_745_13">Get_Keystroke</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_751_13">Get_Keystroke</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_588_14" HREF="terminal_interface-curses__ads.htm#ref_756_14">Undo_Keystroke</A></FONT> (<FONT COLOR=red><A NAME="ref_588_30" HREF="terminal_interface-curses__ads.htm#ref_756_30">Key</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_535_14" HREF="terminal_interface-curses__ads.htm#ref_762_14">Undo_Keystroke</A></FONT> (<FONT COLOR=red><A NAME="ref_535_30" HREF="terminal_interface-curses__ads.htm#ref_762_30">Key</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_590_16">Ungetch</A></FONT> (<FONT COLOR=red><A NAME="ref_590_25" HREF="terminal_interface-curses__adb.htm#ref_590_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_537_16">Ungetch</A></FONT> (<FONT COLOR=red><A NAME="ref_537_25" HREF="terminal_interface-curses__adb.htm#ref_537_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Ungetch, "ungetch");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_590_16">Ungetch</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_756_30">Key</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_537_16">Ungetch</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_762_30">Key</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_756_14">Undo_Keystroke</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_762_14">Undo_Keystroke</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_598_13" HREF="terminal_interface-curses__ads.htm#ref_761_13">Has_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_598_22" HREF="terminal_interface-curses__ads.htm#ref_761_22">Key</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>) <b>return</b> Boolean
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_545_13" HREF="terminal_interface-curses__ads.htm#ref_767_13">Has_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_545_22" HREF="terminal_interface-curses__ads.htm#ref_767_22">Key</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>) <b>return</b> Boolean
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_600_16">Haskey</A></FONT> (<FONT COLOR=red><A NAME="ref_600_24" HREF="terminal_interface-curses__adb.htm#ref_600_16">Key</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_547_16">Haskey</A></FONT> (<FONT COLOR=red><A NAME="ref_547_24" HREF="terminal_interface-curses__adb.htm#ref_547_16">Key</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Haskey, "has_key");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_600_16">Haskey</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_761_22">Key</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">Curses_False</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_547_16">Haskey</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_767_22">Key</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">Curses_False</A> <b>then</b>
-          <b>return</b> False;
-       <b>else</b>
-          <b>return</b> True;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_761_13">Has_Key</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_767_13">Has_Key</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_610_13" HREF="terminal_interface-curses__ads.htm#ref_768_13">Is_Function_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_610_30" HREF="terminal_interface-curses__ads.htm#ref_768_30">Key</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>) <b>return</b> Boolean
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_557_13" HREF="terminal_interface-curses__ads.htm#ref_774_13">Is_Function_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_557_30" HREF="terminal_interface-curses__ads.htm#ref_774_30">Key</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>) <b>return</b> Boolean
-    <b>is</b>
--      <FONT COLOR=red><A NAME="ref_612_7">L</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>  := <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> (Natural (<A HREF="terminal_interface-curses__ads.htm#ref_98_4">Key_F0</A>) +
--        Natural (<A HREF="terminal_interface-curses__ads.htm#ref_772_12">Function_Key_Number</A>'Last));
-+      <FONT COLOR=red><A NAME="ref_559_7">L</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>  := <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> (Natural (<A HREF="terminal_interface-curses__ads.htm#ref_98_4">Key_F0</A>) +
-+        Natural (<A HREF="terminal_interface-curses__ads.htm#ref_778_12">Function_Key_Number</A>'Last));
-    <b>begin</b>
--      <b>if</b> (<A HREF="terminal_interface-curses__ads.htm#ref_768_30">Key</A> &gt;= <A HREF="terminal_interface-curses__ads.htm#ref_98_4">Key_F0</A>) <b>and</b> <b>then</b> (<A HREF="terminal_interface-curses__ads.htm#ref_768_30">Key</A> &lt;= <A HREF="terminal_interface-curses__adb.htm#ref_612_7">L</A>) <b>then</b>
-+      <b>if</b> (<A HREF="terminal_interface-curses__ads.htm#ref_774_30">Key</A> &gt;= <A HREF="terminal_interface-curses__ads.htm#ref_98_4">Key_F0</A>) <b>and</b> <b>then</b> (<A HREF="terminal_interface-curses__ads.htm#ref_774_30">Key</A> &lt;= <A HREF="terminal_interface-curses__adb.htm#ref_559_7">L</A>) <b>then</b>
-          <b>return</b> True;
-       <b>else</b>
-          <b>return</b> False;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_768_13">Is_Function_Key</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_774_13">Is_Function_Key</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_622_13" HREF="terminal_interface-curses__ads.htm#ref_775_13">Function_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_622_27" HREF="terminal_interface-curses__ads.htm#ref_775_27">Key</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>)
--                          <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_772_12">Function_Key_Number</A>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_569_13" HREF="terminal_interface-curses__ads.htm#ref_781_13">Function_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_569_27" HREF="terminal_interface-curses__ads.htm#ref_781_27">Key</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>)
-+                          <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_778_12">Function_Key_Number</A>
-    <b>is</b>
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_768_13">Is_Function_Key</A> (<A HREF="terminal_interface-curses__ads.htm#ref_775_27">Key</A>) <b>then</b>
--         <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_772_12">Function_Key_Number</A> (<A HREF="terminal_interface-curses__ads.htm#ref_775_27">Key</A> - <A HREF="terminal_interface-curses__ads.htm#ref_98_4">Key_F0</A>);
-+      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_774_13">Is_Function_Key</A> (<A HREF="terminal_interface-curses__ads.htm#ref_781_27">Key</A>) <b>then</b>
-+         <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_778_12">Function_Key_Number</A> (<A HREF="terminal_interface-curses__ads.htm#ref_781_27">Key</A> - <A HREF="terminal_interface-curses__ads.htm#ref_98_4">Key_F0</A>);
-       <b>else</b>
-          <b>raise</b> Constraint_Error;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_775_13">Function_Key</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_781_13">Function_Key</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_633_13" HREF="terminal_interface-curses__ads.htm#ref_780_13">Function_Key_Code</A></FONT> (<FONT COLOR=red><A NAME="ref_633_32" HREF="terminal_interface-curses__ads.htm#ref_780_32">Key</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_772_12">Function_Key_Number</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_580_13" HREF="terminal_interface-curses__ads.htm#ref_786_13">Function_Key_Code</A></FONT> (<FONT COLOR=red><A NAME="ref_580_32" HREF="terminal_interface-curses__ads.htm#ref_786_32">Key</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_778_12">Function_Key_Number</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>
-    <b>is</b>
-    <b>begin</b>
--      <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A> (Natural (<A HREF="terminal_interface-curses__ads.htm#ref_98_4">Key_F0</A>) + Natural (<A HREF="terminal_interface-curses__ads.htm#ref_780_32">Key</A>));
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_780_13">Function_Key_Code</A>;
-+      <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A> (Natural (<A HREF="terminal_interface-curses__ads.htm#ref_98_4">Key_F0</A>) + Natural (<A HREF="terminal_interface-curses__ads.htm#ref_786_32">Key</A>));
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_786_13">Function_Key_Code</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_639_14" HREF="terminal_interface-curses__ads.htm#ref_794_14">Standout</A></FONT> (<FONT COLOR=red><A NAME="ref_639_24" HREF="terminal_interface-curses__ads.htm#ref_794_24">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>  := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--                       <FONT COLOR=red><A NAME="ref_640_24" HREF="terminal_interface-curses__ads.htm#ref_795_24">On</A></FONT>  : Boolean := True)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_586_14" HREF="terminal_interface-curses__ads.htm#ref_800_14">Standout</A></FONT> (<FONT COLOR=red><A NAME="ref_586_24" HREF="terminal_interface-curses__ads.htm#ref_800_24">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>  := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                       <FONT COLOR=red><A NAME="ref_587_24" HREF="terminal_interface-curses__ads.htm#ref_801_24">On</A></FONT>  : Boolean := True)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_642_16">wstandout</A></FONT> (<FONT COLOR=red><A NAME="ref_642_27" HREF="terminal_interface-curses__adb.htm#ref_642_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_589_16">wstandout</A></FONT> (<FONT COLOR=red><A NAME="ref_589_27" HREF="terminal_interface-curses__adb.htm#ref_589_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, wstandout, "wstandout");
--      <b>function</b> <FONT COLOR=red><A NAME="ref_644_16">wstandend</A></FONT> (<FONT COLOR=red><A NAME="ref_644_27" HREF="terminal_interface-curses__adb.htm#ref_644_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_591_16">wstandend</A></FONT> (<FONT COLOR=red><A NAME="ref_591_27" HREF="terminal_interface-curses__adb.htm#ref_591_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, wstandend, "wstandend");
- 
--      <FONT COLOR=red><A NAME="ref_647_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <FONT COLOR=red><A NAME="ref_594_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_795_24">On</A> <b>then</b>
--         <A HREF="terminal_interface-curses__adb.htm#ref_647_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_642_16">wstandout</A> (<A HREF="terminal_interface-curses__ads.htm#ref_794_24">Win</A>);
-+      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_801_24">On</A> <b>then</b>
-+         <A HREF="terminal_interface-curses__adb.htm#ref_594_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_589_16">wstandout</A> (<A HREF="terminal_interface-curses__ads.htm#ref_800_24">Win</A>);
-       <b>else</b>
--         <A HREF="terminal_interface-curses__adb.htm#ref_647_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_644_16">wstandend</A> (<A HREF="terminal_interface-curses__ads.htm#ref_794_24">Win</A>);
-+         <A HREF="terminal_interface-curses__adb.htm#ref_594_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_591_16">wstandend</A> (<A HREF="terminal_interface-curses__ads.htm#ref_800_24">Win</A>);
-       <b>end</b> <b>if</b>;
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_647_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_594_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_794_14">Standout</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_800_14">Standout</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_659_14" HREF="terminal_interface-curses__ads.htm#ref_800_14">Switch_Character_Attribute</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_660_7" HREF="terminal_interface-curses__ads.htm#ref_801_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_661_7" HREF="terminal_interface-curses__ads.htm#ref_802_7">Attr</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
--      <FONT COLOR=red><A NAME="ref_662_7" HREF="terminal_interface-curses__ads.htm#ref_803_7">On</A></FONT>   : <b>in</b> Boolean := True)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_606_14" HREF="terminal_interface-curses__ads.htm#ref_806_14">Switch_Character_Attribute</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_607_7" HREF="terminal_interface-curses__ads.htm#ref_807_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_608_7" HREF="terminal_interface-curses__ads.htm#ref_808_7">Attr</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-+      <FONT COLOR=red><A NAME="ref_609_7" HREF="terminal_interface-curses__ads.htm#ref_809_7">On</A></FONT>   : <b>in</b> Boolean := True)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_664_16">Wattron</A></FONT> (<FONT COLOR=red><A NAME="ref_664_25" HREF="terminal_interface-curses__adb.htm#ref_664_16">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                        <FONT COLOR=red><A NAME="ref_665_25" HREF="terminal_interface-curses__adb.htm#ref_664_16">C_Attr</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_611_16">Wattron</A></FONT> (<FONT COLOR=red><A NAME="ref_611_25" HREF="terminal_interface-curses__adb.htm#ref_611_16">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                        <FONT COLOR=red><A NAME="ref_612_25" HREF="terminal_interface-curses__adb.htm#ref_611_16">C_Attr</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Wattron, "wattr_on");
--      <b>function</b> <FONT COLOR=red><A NAME="ref_667_16">Wattroff</A></FONT> (<FONT COLOR=red><A NAME="ref_667_26" HREF="terminal_interface-curses__adb.htm#ref_667_16">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                         <FONT COLOR=red><A NAME="ref_668_26" HREF="terminal_interface-curses__adb.htm#ref_667_16">C_Attr</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_614_16">Wattroff</A></FONT> (<FONT COLOR=red><A NAME="ref_614_26" HREF="terminal_interface-curses__adb.htm#ref_614_16">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                         <FONT COLOR=red><A NAME="ref_615_26" HREF="terminal_interface-curses__adb.htm#ref_614_16">C_Attr</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Wattroff, "wattr_off");
-       <FONT COLOR=green><EM>--  In Ada we use the On Boolean to control whether or not we want to</EM></FONT>
-       <FONT COLOR=green><EM>--  switch on or off the attributes in the set.</EM></FONT>
--      <FONT COLOR=red><A NAME="ref_672_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--      <FONT COLOR=red><A NAME="ref_673_7">AC</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := (<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; Character'First,
-+      <FONT COLOR=red><A NAME="ref_619_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <FONT COLOR=red><A NAME="ref_620_7">AC</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := (<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; Character'First,
-                                               <A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First,
--                                              <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>  =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_802_7">Attr</A>);
-+                                              <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>  =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_808_7">Attr</A>);
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_803_7">On</A> <b>then</b>
--         <A HREF="terminal_interface-curses__adb.htm#ref_672_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_664_16">Wattron</A>  (<A HREF="terminal_interface-curses__ads.htm#ref_801_7">Win</A>, AttrChar_To_AttrType (<A HREF="terminal_interface-curses__adb.htm#ref_673_7">AC</A>));
-+      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_809_7">On</A> <b>then</b>
-+         <A HREF="terminal_interface-curses__adb.htm#ref_619_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_611_16">Wattron</A>  (<A HREF="terminal_interface-curses__ads.htm#ref_807_7">Win</A>, AttrChar_To_AttrType (<A HREF="terminal_interface-curses__adb.htm#ref_620_7">AC</A>));
-       <b>else</b>
--         <A HREF="terminal_interface-curses__adb.htm#ref_672_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_667_16">Wattroff</A> (<A HREF="terminal_interface-curses__ads.htm#ref_801_7">Win</A>, AttrChar_To_AttrType (<A HREF="terminal_interface-curses__adb.htm#ref_673_7">AC</A>));
-+         <A HREF="terminal_interface-curses__adb.htm#ref_619_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_614_16">Wattroff</A> (<A HREF="terminal_interface-curses__ads.htm#ref_807_7">Win</A>, AttrChar_To_AttrType (<A HREF="terminal_interface-curses__adb.htm#ref_620_7">AC</A>));
-       <b>end</b> <b>if</b>;
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_672_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_619_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_800_14">Switch_Character_Attribute</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_806_14">Switch_Character_Attribute</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_687_14" HREF="terminal_interface-curses__ads.htm#ref_811_14">Set_Character_Attributes</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_688_7" HREF="terminal_interface-curses__ads.htm#ref_812_7">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_689_7" HREF="terminal_interface-curses__ads.htm#ref_813_7">Attr</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
--      <FONT COLOR=red><A NAME="ref_690_7" HREF="terminal_interface-curses__ads.htm#ref_814_7">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_634_14" HREF="terminal_interface-curses__ads.htm#ref_817_14">Set_Character_Attributes</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_635_7" HREF="terminal_interface-curses__ads.htm#ref_818_7">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_636_7" HREF="terminal_interface-curses__ads.htm#ref_819_7">Attr</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-+      <FONT COLOR=red><A NAME="ref_637_7" HREF="terminal_interface-curses__ads.htm#ref_820_7">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_692_16">Wattrset</A></FONT> (<FONT COLOR=red><A NAME="ref_692_26" HREF="terminal_interface-curses__adb.htm#ref_692_16">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                         <FONT COLOR=red><A NAME="ref_693_26" HREF="terminal_interface-curses__adb.htm#ref_692_16">C_Attr</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_639_16">Wattrset</A></FONT> (<FONT COLOR=red><A NAME="ref_639_26" HREF="terminal_interface-curses__adb.htm#ref_639_16">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                         <FONT COLOR=red><A NAME="ref_640_26" HREF="terminal_interface-curses__adb.htm#ref_639_16">C_Attr</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Wattrset, "wattrset"); <FONT COLOR=green><EM>-- ??? wattr_set</EM></FONT>
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_692_16">Wattrset</A> (<A HREF="terminal_interface-curses__ads.htm#ref_812_7">Win</A>,
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_639_16">Wattrset</A> (<A HREF="terminal_interface-curses__ads.htm#ref_818_7">Win</A>,
-                    AttrChar_To_AttrType (<A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>'
-                                          (<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; Character'First,
--                                          <A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_814_7">Color</A>,
--                                          <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>  =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_813_7">Attr</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+                                          <A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_820_7">Color</A>,
-+                                          <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>  =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_819_7">Attr</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_811_14">Set_Character_Attributes</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_817_14">Set_Character_Attributes</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_705_13" HREF="terminal_interface-curses__ads.htm#ref_820_13">Get_Character_Attribute</A></FONT> (<FONT COLOR=red><A NAME="ref_705_38" HREF="terminal_interface-curses__ads.htm#ref_821_7">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_652_13" HREF="terminal_interface-curses__ads.htm#ref_826_13">Get_Character_Attribute</A></FONT> (<FONT COLOR=red><A NAME="ref_652_38" HREF="terminal_interface-curses__ads.htm#ref_827_7">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-                                      <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_708_16">Wattrget</A></FONT> (<FONT COLOR=red><A NAME="ref_708_26" HREF="terminal_interface-curses__adb.htm#ref_708_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                         <FONT COLOR=red><A NAME="ref_709_26" HREF="terminal_interface-curses__adb.htm#ref_708_16">Atr</A></FONT> : <b>access</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>;
--                         <FONT COLOR=red><A NAME="ref_710_26" HREF="terminal_interface-curses__adb.htm#ref_708_16">Col</A></FONT> : <b>access</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
--                         <FONT COLOR=red><A NAME="ref_711_26" HREF="terminal_interface-curses__adb.htm#ref_708_16">Opt</A></FONT> : System.Address) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_655_16">Wattrget</A></FONT> (<FONT COLOR=red><A NAME="ref_655_26" HREF="terminal_interface-curses__adb.htm#ref_655_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                         <FONT COLOR=red><A NAME="ref_656_26" HREF="terminal_interface-curses__adb.htm#ref_655_16">Atr</A></FONT> : <b>access</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>;
-+                         <FONT COLOR=red><A NAME="ref_657_26" HREF="terminal_interface-curses__adb.htm#ref_655_16">Col</A></FONT> : <b>access</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+                         <FONT COLOR=red><A NAME="ref_658_26" HREF="terminal_interface-curses__adb.htm#ref_655_16">Opt</A></FONT> : System.Address) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Wattrget, "wattr_get");
- 
--      <FONT COLOR=red><A NAME="ref_714_7">Attr</A></FONT> : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>;
--      <FONT COLOR=red><A NAME="ref_715_7">Col</A></FONT>  : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
--      <FONT COLOR=red><A NAME="ref_716_7">Res</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses__adb.htm#ref_708_16">Wattrget</A> (<A HREF="terminal_interface-curses__ads.htm#ref_821_7">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_714_7">Attr</A>'<b>Access</b>, <A HREF="terminal_interface-curses__adb.htm#ref_715_7">Col</A>'<b>Access</b>,
-+      <FONT COLOR=red><A NAME="ref_661_7">Attr</A></FONT> : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>;
-+      <FONT COLOR=red><A NAME="ref_662_7">Col</A></FONT>  : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+      <FONT COLOR=red><A NAME="ref_663_7">Res</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses__adb.htm#ref_655_16">Wattrget</A> (<A HREF="terminal_interface-curses__ads.htm#ref_827_7">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_661_7">Attr</A>'<b>Access</b>, <A HREF="terminal_interface-curses__adb.htm#ref_662_7">Col</A>'<b>Access</b>,
-                                          System.Null_Address);
--      <FONT COLOR=red><A NAME="ref_718_7">Ch</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>;
-+      <FONT COLOR=red><A NAME="ref_665_7">Ch</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>;
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_716_7">Res</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_71_4">Curses_Ok</A> <b>then</b>
--         <A HREF="terminal_interface-curses__adb.htm#ref_718_7">Ch</A> := AttrType_To_AttrChar (<A HREF="terminal_interface-curses__adb.htm#ref_714_7">Attr</A>);
--         <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_718_7">Ch</A>.<A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>;
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_663_7">Res</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_71_4">Curses_Ok</A> <b>then</b>
-+         <A HREF="terminal_interface-curses__adb.htm#ref_665_7">Ch</A> := AttrType_To_AttrChar (<A HREF="terminal_interface-curses__adb.htm#ref_661_7">Attr</A>);
-+         <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_665_7">Ch</A>.<A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>;
-       <b>else</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_820_13">Get_Character_Attribute</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_826_13">Get_Character_Attribute</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_728_13" HREF="terminal_interface-curses__ads.htm#ref_826_13">Get_Character_Attribute</A></FONT> (<FONT COLOR=red><A NAME="ref_728_38" HREF="terminal_interface-curses__ads.htm#ref_827_7">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_675_13" HREF="terminal_interface-curses__ads.htm#ref_832_13">Get_Character_Attribute</A></FONT> (<FONT COLOR=red><A NAME="ref_675_38" HREF="terminal_interface-curses__ads.htm#ref_833_7">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-                                      <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_731_16">Wattrget</A></FONT> (<FONT COLOR=red><A NAME="ref_731_26" HREF="terminal_interface-curses__adb.htm#ref_731_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                         <FONT COLOR=red><A NAME="ref_732_26" HREF="terminal_interface-curses__adb.htm#ref_731_16">Atr</A></FONT> : <b>access</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>;
--                         <FONT COLOR=red><A NAME="ref_733_26" HREF="terminal_interface-curses__adb.htm#ref_731_16">Col</A></FONT> : <b>access</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
--                         <FONT COLOR=red><A NAME="ref_734_26" HREF="terminal_interface-curses__adb.htm#ref_731_16">Opt</A></FONT> : System.Address) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_678_16">Wattrget</A></FONT> (<FONT COLOR=red><A NAME="ref_678_26" HREF="terminal_interface-curses__adb.htm#ref_678_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                         <FONT COLOR=red><A NAME="ref_679_26" HREF="terminal_interface-curses__adb.htm#ref_678_16">Atr</A></FONT> : <b>access</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>;
-+                         <FONT COLOR=red><A NAME="ref_680_26" HREF="terminal_interface-curses__adb.htm#ref_678_16">Col</A></FONT> : <b>access</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+                         <FONT COLOR=red><A NAME="ref_681_26" HREF="terminal_interface-curses__adb.htm#ref_678_16">Opt</A></FONT> : System.Address) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Wattrget, "wattr_get");
- 
--      <FONT COLOR=red><A NAME="ref_737_7">Attr</A></FONT> : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>;
--      <FONT COLOR=red><A NAME="ref_738_7">Col</A></FONT>  : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
--      <FONT COLOR=red><A NAME="ref_739_7">Res</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses__adb.htm#ref_731_16">Wattrget</A> (<A HREF="terminal_interface-curses__ads.htm#ref_827_7">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_737_7">Attr</A>'<b>Access</b>, <A HREF="terminal_interface-curses__adb.htm#ref_738_7">Col</A>'<b>Access</b>,
-+      <FONT COLOR=red><A NAME="ref_684_7">Attr</A></FONT> : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>;
-+      <FONT COLOR=red><A NAME="ref_685_7">Col</A></FONT>  : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+      <FONT COLOR=red><A NAME="ref_686_7">Res</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses__adb.htm#ref_678_16">Wattrget</A> (<A HREF="terminal_interface-curses__ads.htm#ref_833_7">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_684_7">Attr</A>'<b>Access</b>, <A HREF="terminal_interface-curses__adb.htm#ref_685_7">Col</A>'<b>Access</b>,
-                                          System.Null_Address);
--      <FONT COLOR=red><A NAME="ref_741_7">Ch</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>;
-+      <FONT COLOR=red><A NAME="ref_688_7">Ch</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>;
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_739_7">Res</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_71_4">Curses_Ok</A> <b>then</b>
--         <A HREF="terminal_interface-curses__adb.htm#ref_741_7">Ch</A> := AttrType_To_AttrChar (<A HREF="terminal_interface-curses__adb.htm#ref_737_7">Attr</A>);
--         <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_741_7">Ch</A>.<A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A>;
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_686_7">Res</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_71_4">Curses_Ok</A> <b>then</b>
-+         <A HREF="terminal_interface-curses__adb.htm#ref_688_7">Ch</A> := AttrType_To_AttrChar (<A HREF="terminal_interface-curses__adb.htm#ref_684_7">Attr</A>);
-+         <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_688_7">Ch</A>.<A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A>;
-       <b>else</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_826_13">Get_Character_Attribute</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_832_13">Get_Character_Attribute</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_751_14" HREF="terminal_interface-curses__ads.htm#ref_832_14">Set_Color</A></FONT> (<FONT COLOR=red><A NAME="ref_751_25" HREF="terminal_interface-curses__ads.htm#ref_832_25">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--                        <FONT COLOR=red><A NAME="ref_752_25" HREF="terminal_interface-curses__ads.htm#ref_833_25">Pair</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_698_14" HREF="terminal_interface-curses__ads.htm#ref_838_14">Set_Color</A></FONT> (<FONT COLOR=red><A NAME="ref_698_25" HREF="terminal_interface-curses__ads.htm#ref_838_25">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                        <FONT COLOR=red><A NAME="ref_699_25" HREF="terminal_interface-curses__ads.htm#ref_839_25">Pair</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_754_16">Wset_Color</A></FONT> (<FONT COLOR=red><A NAME="ref_754_28" HREF="terminal_interface-curses__adb.htm#ref_754_16">Win</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                           <FONT COLOR=red><A NAME="ref_755_28" HREF="terminal_interface-curses__adb.htm#ref_754_16">Color</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
--                           <FONT COLOR=red><A NAME="ref_756_28" HREF="terminal_interface-curses__adb.htm#ref_754_16">Opts</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_62_12">C_Void_Ptr</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_701_16">Wset_Color</A></FONT> (<FONT COLOR=red><A NAME="ref_701_28" HREF="terminal_interface-curses__adb.htm#ref_701_16">Win</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                           <FONT COLOR=red><A NAME="ref_702_28" HREF="terminal_interface-curses__adb.htm#ref_701_16">Color</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+                           <FONT COLOR=red><A NAME="ref_703_28" HREF="terminal_interface-curses__adb.htm#ref_701_16">Opts</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_62_12">C_Void_Ptr</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Wset_Color, "wcolor_set");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_754_16">Wset_Color</A> (<A HREF="terminal_interface-curses__ads.htm#ref_832_25">Win</A>,
--                     <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_833_25">Pair</A>),
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_701_16">Wset_Color</A> (<A HREF="terminal_interface-curses__ads.htm#ref_838_25">Win</A>,
-+                     <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_839_25">Pair</A>),
-                      <A HREF="terminal_interface-curses-aux__ads.htm#ref_62_12">C_Void_Ptr</A> (System.Null_Address)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_832_14">Set_Color</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_838_14">Set_Color</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_766_14" HREF="terminal_interface-curses__ads.htm#ref_839_14">Change_Attributes</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_767_7" HREF="terminal_interface-curses__ads.htm#ref_840_7">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_768_7" HREF="terminal_interface-curses__ads.htm#ref_841_7">Count</A></FONT> : <b>in</b> Integer := -1;
--      <FONT COLOR=red><A NAME="ref_769_7" HREF="terminal_interface-curses__ads.htm#ref_842_7">Attr</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
--      <FONT COLOR=red><A NAME="ref_770_7" HREF="terminal_interface-curses__ads.htm#ref_843_7">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First)
--   <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_772_16">Wchgat</A></FONT> (<FONT COLOR=red><A NAME="ref_772_24" HREF="terminal_interface-curses__adb.htm#ref_772_16">Win</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                       <FONT COLOR=red><A NAME="ref_773_24" HREF="terminal_interface-curses__adb.htm#ref_772_16">Cnt</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--                       <FONT COLOR=red><A NAME="ref_774_24" HREF="terminal_interface-curses__adb.htm#ref_772_16">Attr</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>;
--                       <FONT COLOR=red><A NAME="ref_775_24" HREF="terminal_interface-curses__adb.htm#ref_772_16">Color</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
--                       <FONT COLOR=red><A NAME="ref_776_24" HREF="terminal_interface-curses__adb.htm#ref_772_16">Opts</A></FONT>  : System.Address := System.Null_Address)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_713_14" HREF="terminal_interface-curses__ads.htm#ref_845_14">Change_Attributes</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_714_7" HREF="terminal_interface-curses__ads.htm#ref_846_7">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_715_7" HREF="terminal_interface-curses__ads.htm#ref_847_7">Count</A></FONT> : <b>in</b> Integer := -1;
-+      <FONT COLOR=red><A NAME="ref_716_7" HREF="terminal_interface-curses__ads.htm#ref_848_7">Attr</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-+      <FONT COLOR=red><A NAME="ref_717_7" HREF="terminal_interface-curses__ads.htm#ref_849_7">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First)
-+   <b>is</b>
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_719_16">Wchgat</A></FONT> (<FONT COLOR=red><A NAME="ref_719_24" HREF="terminal_interface-curses__adb.htm#ref_719_16">Win</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                       <FONT COLOR=red><A NAME="ref_720_24" HREF="terminal_interface-curses__adb.htm#ref_719_16">Cnt</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+                       <FONT COLOR=red><A NAME="ref_721_24" HREF="terminal_interface-curses__adb.htm#ref_719_16">Attr</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>;
-+                       <FONT COLOR=red><A NAME="ref_722_24" HREF="terminal_interface-curses__adb.htm#ref_719_16">Color</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+                       <FONT COLOR=red><A NAME="ref_723_24" HREF="terminal_interface-curses__adb.htm#ref_719_16">Opts</A></FONT>  : System.Address := System.Null_Address)
-                        <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Wchgat, "wchgat");
- 
--      <FONT COLOR=red><A NAME="ref_780_7">Ch</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> :=
--        (<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A> =&gt; Character'First, <A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First, <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_842_7">Attr</A>);
-+      <FONT COLOR=red><A NAME="ref_727_7">Ch</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> :=
-+        (<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A> =&gt; Character'First, <A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First, <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_848_7">Attr</A>);
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_772_16">Wchgat</A> (<A HREF="terminal_interface-curses__ads.htm#ref_840_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_841_7">Count</A>), AttrChar_To_AttrType (<A HREF="terminal_interface-curses__adb.htm#ref_780_7">Ch</A>),
--                 <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_843_7">Color</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_719_16">Wchgat</A> (<A HREF="terminal_interface-curses__ads.htm#ref_846_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_847_7">Count</A>), AttrChar_To_AttrType (<A HREF="terminal_interface-curses__adb.htm#ref_727_7">Ch</A>),
-+                 <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_849_7">Color</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_839_14">Change_Attributes</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_845_14">Change_Attributes</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_789_14" HREF="terminal_interface-curses__ads.htm#ref_848_14">Change_Attributes</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_790_7" HREF="terminal_interface-curses__ads.htm#ref_849_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_791_7" HREF="terminal_interface-curses__ads.htm#ref_850_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A> := <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>'First;
--      <FONT COLOR=red><A NAME="ref_792_7" HREF="terminal_interface-curses__ads.htm#ref_851_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> := <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>'First;
--      <FONT COLOR=red><A NAME="ref_793_7" HREF="terminal_interface-curses__ads.htm#ref_852_7">Count</A></FONT>  : <b>in</b> Integer := -1;
--      <FONT COLOR=red><A NAME="ref_794_7" HREF="terminal_interface-curses__ads.htm#ref_853_7">Attr</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
--      <FONT COLOR=red><A NAME="ref_795_7" HREF="terminal_interface-curses__ads.htm#ref_854_7">Color</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_736_14" HREF="terminal_interface-curses__ads.htm#ref_854_14">Change_Attributes</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_737_7" HREF="terminal_interface-curses__ads.htm#ref_855_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_738_7" HREF="terminal_interface-curses__ads.htm#ref_856_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A> := <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>'First;
-+      <FONT COLOR=red><A NAME="ref_739_7" HREF="terminal_interface-curses__ads.htm#ref_857_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> := <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>'First;
-+      <FONT COLOR=red><A NAME="ref_740_7" HREF="terminal_interface-curses__ads.htm#ref_858_7">Count</A></FONT>  : <b>in</b> Integer := -1;
-+      <FONT COLOR=red><A NAME="ref_741_7" HREF="terminal_interface-curses__ads.htm#ref_859_7">Attr</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-+      <FONT COLOR=red><A NAME="ref_742_7" HREF="terminal_interface-curses__ads.htm#ref_860_7">Color</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First)
-    <b>is</b>
-    <b>begin</b>
--      <A HREF="terminal_interface-curses__ads.htm#ref_505_14">Move_Cursor</A> (<A HREF="terminal_interface-curses__ads.htm#ref_849_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_850_7">Line</A>, <A HREF="terminal_interface-curses__ads.htm#ref_851_7">Column</A>);
--      <A HREF="terminal_interface-curses__ads.htm#ref_839_14">Change_Attributes</A> (<A HREF="terminal_interface-curses__ads.htm#ref_849_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_852_7">Count</A>, <A HREF="terminal_interface-curses__ads.htm#ref_853_7">Attr</A>, <A HREF="terminal_interface-curses__ads.htm#ref_854_7">Color</A>);
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_848_14">Change_Attributes</A>;
-+      <A HREF="terminal_interface-curses__ads.htm#ref_511_14">Move_Cursor</A> (<A HREF="terminal_interface-curses__ads.htm#ref_855_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_856_7">Line</A>, <A HREF="terminal_interface-curses__ads.htm#ref_857_7">Column</A>);
-+      <A HREF="terminal_interface-curses__ads.htm#ref_845_14">Change_Attributes</A> (<A HREF="terminal_interface-curses__ads.htm#ref_855_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_858_7">Count</A>, <A HREF="terminal_interface-curses__ads.htm#ref_859_7">Attr</A>, <A HREF="terminal_interface-curses__ads.htm#ref_860_7">Color</A>);
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_854_14">Change_Attributes</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_802_14" HREF="terminal_interface-curses__ads.htm#ref_864_14">Beep</A></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_749_14" HREF="terminal_interface-curses__ads.htm#ref_870_14">Beep</A></FONT>
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_804_16">Beeper</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_751_16">Beeper</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Beeper, "beep");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_804_16">Beeper</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_751_16">Beeper</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_864_14">Beep</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_870_14">Beep</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_812_14" HREF="terminal_interface-curses__ads.htm#ref_869_14">Flash_Screen</A></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_759_14" HREF="terminal_interface-curses__ads.htm#ref_875_14">Flash_Screen</A></FONT>
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_814_16">Flash</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_761_16">Flash</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Flash, "flash");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_814_16">Flash</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_761_16">Flash</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_869_14">Flash_Screen</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_875_14">Flash_Screen</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_822_14" HREF="terminal_interface-curses__ads.htm#ref_880_14">Set_Cbreak_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_822_31" HREF="terminal_interface-curses__ads.htm#ref_880_31">SwitchOn</A></FONT> : <b>in</b> Boolean := True)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_769_14" HREF="terminal_interface-curses__ads.htm#ref_886_14">Set_Cbreak_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_769_31" HREF="terminal_interface-curses__ads.htm#ref_886_31">SwitchOn</A></FONT> : <b>in</b> Boolean := True)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_824_16">Cbreak</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_771_16">Cbreak</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Cbreak, "cbreak");
--      <b>function</b> <FONT COLOR=red><A NAME="ref_826_16">NoCbreak</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_773_16">NoCbreak</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, NoCbreak, "nocbreak");
- 
--      <FONT COLOR=red><A NAME="ref_829_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <FONT COLOR=red><A NAME="ref_776_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_880_31">SwitchOn</A> <b>then</b>
--         <A HREF="terminal_interface-curses__adb.htm#ref_829_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_824_16">Cbreak</A>;
-+      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_886_31">SwitchOn</A> <b>then</b>
-+         <A HREF="terminal_interface-curses__adb.htm#ref_776_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_771_16">Cbreak</A>;
-       <b>else</b>
--         <A HREF="terminal_interface-curses__adb.htm#ref_829_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_826_16">NoCbreak</A>;
-+         <A HREF="terminal_interface-curses__adb.htm#ref_776_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_773_16">NoCbreak</A>;
-       <b>end</b> <b>if</b>;
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_829_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_776_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_880_14">Set_Cbreak_Mode</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_886_14">Set_Cbreak_Mode</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_841_14" HREF="terminal_interface-curses__ads.htm#ref_886_14">Set_Raw_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_841_28" HREF="terminal_interface-curses__ads.htm#ref_886_28">SwitchOn</A></FONT> : <b>in</b> Boolean := True)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_788_14" HREF="terminal_interface-curses__ads.htm#ref_892_14">Set_Raw_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_788_28" HREF="terminal_interface-curses__ads.htm#ref_892_28">SwitchOn</A></FONT> : <b>in</b> Boolean := True)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_843_16">Raw</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_790_16">Raw</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Raw, "raw");
--      <b>function</b> <FONT COLOR=red><A NAME="ref_845_16">NoRaw</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_792_16">NoRaw</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, NoRaw, "noraw");
- 
--      <FONT COLOR=red><A NAME="ref_848_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <FONT COLOR=red><A NAME="ref_795_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_886_28">SwitchOn</A> <b>then</b>
--         <A HREF="terminal_interface-curses__adb.htm#ref_848_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_843_16">Raw</A>;
-+      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_892_28">SwitchOn</A> <b>then</b>
-+         <A HREF="terminal_interface-curses__adb.htm#ref_795_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_790_16">Raw</A>;
-       <b>else</b>
--         <A HREF="terminal_interface-curses__adb.htm#ref_848_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_845_16">NoRaw</A>;
-+         <A HREF="terminal_interface-curses__adb.htm#ref_795_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_792_16">NoRaw</A>;
-       <b>end</b> <b>if</b>;
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_848_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_795_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_886_14">Set_Raw_Mode</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_892_14">Set_Raw_Mode</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_860_14" HREF="terminal_interface-curses__ads.htm#ref_892_14">Set_Echo_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_860_29" HREF="terminal_interface-curses__ads.htm#ref_892_29">SwitchOn</A></FONT> : <b>in</b> Boolean := True)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_807_14" HREF="terminal_interface-curses__ads.htm#ref_898_14">Set_Echo_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_807_29" HREF="terminal_interface-curses__ads.htm#ref_898_29">SwitchOn</A></FONT> : <b>in</b> Boolean := True)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_862_16">Echo</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_809_16">Echo</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Echo, "echo");
--      <b>function</b> <FONT COLOR=red><A NAME="ref_864_16">NoEcho</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_811_16">NoEcho</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, NoEcho, "noecho");
- 
--      <FONT COLOR=red><A NAME="ref_867_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <FONT COLOR=red><A NAME="ref_814_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_892_29">SwitchOn</A> <b>then</b>
--         <A HREF="terminal_interface-curses__adb.htm#ref_867_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_862_16">Echo</A>;
-+      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_898_29">SwitchOn</A> <b>then</b>
-+         <A HREF="terminal_interface-curses__adb.htm#ref_814_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_809_16">Echo</A>;
-       <b>else</b>
--         <A HREF="terminal_interface-curses__adb.htm#ref_867_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_864_16">NoEcho</A>;
-+         <A HREF="terminal_interface-curses__adb.htm#ref_814_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_811_16">NoEcho</A>;
-       <b>end</b> <b>if</b>;
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_867_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_814_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_892_14">Set_Echo_Mode</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_898_14">Set_Echo_Mode</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_879_14" HREF="terminal_interface-curses__ads.htm#ref_898_14">Set_Meta_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_879_29" HREF="terminal_interface-curses__ads.htm#ref_898_29">Win</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--                            <FONT COLOR=red><A NAME="ref_880_29" HREF="terminal_interface-curses__ads.htm#ref_899_29">SwitchOn</A></FONT> : <b>in</b> Boolean := True)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_826_14" HREF="terminal_interface-curses__ads.htm#ref_904_14">Set_Meta_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_826_29" HREF="terminal_interface-curses__ads.htm#ref_904_29">Win</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                            <FONT COLOR=red><A NAME="ref_827_29" HREF="terminal_interface-curses__ads.htm#ref_905_29">SwitchOn</A></FONT> : <b>in</b> Boolean := True)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_882_16">Meta</A></FONT> (<FONT COLOR=red><A NAME="ref_882_22" HREF="terminal_interface-curses__adb.htm#ref_882_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_882_34" HREF="terminal_interface-curses__adb.htm#ref_882_16">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_829_16">Meta</A></FONT> (<FONT COLOR=red><A NAME="ref_829_22" HREF="terminal_interface-curses__adb.htm#ref_829_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_829_34" HREF="terminal_interface-curses__adb.htm#ref_829_16">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Meta, "meta");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_882_16">Meta</A> (<A HREF="terminal_interface-curses__ads.htm#ref_898_29">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_899_29">SwitchOn</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_829_16">Meta</A> (<A HREF="terminal_interface-curses__ads.htm#ref_904_29">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_905_29">SwitchOn</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_898_14">Set_Meta_Mode</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_904_14">Set_Meta_Mode</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_890_14" HREF="terminal_interface-curses__ads.htm#ref_904_14">Set_KeyPad_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_890_31" HREF="terminal_interface-curses__ads.htm#ref_904_31">Win</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--                              <FONT COLOR=red><A NAME="ref_891_31" HREF="terminal_interface-curses__ads.htm#ref_905_31">SwitchOn</A></FONT> : <b>in</b> Boolean := True)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_837_14" HREF="terminal_interface-curses__ads.htm#ref_910_14">Set_KeyPad_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_837_31" HREF="terminal_interface-curses__ads.htm#ref_910_31">Win</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                              <FONT COLOR=red><A NAME="ref_838_31" HREF="terminal_interface-curses__ads.htm#ref_911_31">SwitchOn</A></FONT> : <b>in</b> Boolean := True)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_893_16">Keypad</A></FONT> (<FONT COLOR=red><A NAME="ref_893_24" HREF="terminal_interface-curses__adb.htm#ref_893_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_893_36" HREF="terminal_interface-curses__adb.htm#ref_893_16">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_840_16">Keypad</A></FONT> (<FONT COLOR=red><A NAME="ref_840_24" HREF="terminal_interface-curses__adb.htm#ref_840_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_840_36" HREF="terminal_interface-curses__adb.htm#ref_840_16">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Keypad, "keypad");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_893_16">Keypad</A> (<A HREF="terminal_interface-curses__ads.htm#ref_904_31">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_905_31">SwitchOn</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_840_16">Keypad</A> (<A HREF="terminal_interface-curses__ads.htm#ref_910_31">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_911_31">SwitchOn</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_904_14">Set_KeyPad_Mode</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_910_14">Set_KeyPad_Mode</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_901_13" HREF="terminal_interface-curses__ads.htm#ref_909_13">Get_KeyPad_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_901_30" HREF="terminal_interface-curses__ads.htm#ref_909_30">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_848_13" HREF="terminal_interface-curses__ads.htm#ref_915_13">Get_KeyPad_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_848_30" HREF="terminal_interface-curses__ads.htm#ref_915_30">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-                              <b>return</b> Boolean
-    <b>is</b>
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_851_16">Is_Keypad</A></FONT> (<FONT COLOR=red><A NAME="ref_851_27" HREF="terminal_interface-curses__adb.htm#ref_851_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>;
-+      <b>pragma</b> Import (C, Is_Keypad, "is_keypad");
-    <b>begin</b>
--      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_93_13">Get_Flag</A> (<A HREF="terminal_interface-curses__ads.htm#ref_909_30">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1926_4">Offset_use_keypad</A>);
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_909_13">Get_KeyPad_Mode</A>;
-+      <b>return</b> (<A HREF="terminal_interface-curses__adb.htm#ref_851_16">Is_Keypad</A> (<A HREF="terminal_interface-curses__ads.htm#ref_915_30">Win</A>) /= <A HREF="terminal_interface-curses__ads.htm#ref_1927_4">Curses_Bool_False</A>);
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_915_13">Get_KeyPad_Mode</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_908_14" HREF="terminal_interface-curses__ads.htm#ref_917_14">Half_Delay</A></FONT> (<FONT COLOR=red><A NAME="ref_908_26" HREF="terminal_interface-curses__ads.htm#ref_917_26">Amount</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_914_9">Half_Delay_Amount</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_857_14" HREF="terminal_interface-curses__ads.htm#ref_923_14">Half_Delay</A></FONT> (<FONT COLOR=red><A NAME="ref_857_26" HREF="terminal_interface-curses__ads.htm#ref_923_26">Amount</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_920_9">Half_Delay_Amount</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_910_16">Halfdelay</A></FONT> (<FONT COLOR=red><A NAME="ref_910_27" HREF="terminal_interface-curses__adb.htm#ref_910_16">Amount</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_859_16">Halfdelay</A></FONT> (<FONT COLOR=red><A NAME="ref_859_27" HREF="terminal_interface-curses__adb.htm#ref_859_16">Amount</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Halfdelay, "halfdelay");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_910_16">Halfdelay</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_917_26">Amount</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_859_16">Halfdelay</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_923_26">Amount</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_917_14">Half_Delay</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_923_14">Half_Delay</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_918_14" HREF="terminal_interface-curses__ads.htm#ref_922_14">Set_Flush_On_Interrupt_Mode</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_919_7" HREF="terminal_interface-curses__ads.htm#ref_923_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_920_7" HREF="terminal_interface-curses__ads.htm#ref_924_7">Mode</A></FONT> : <b>in</b> Boolean := True)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_867_14" HREF="terminal_interface-curses__ads.htm#ref_928_14">Set_Flush_On_Interrupt_Mode</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_868_7" HREF="terminal_interface-curses__ads.htm#ref_929_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_869_7" HREF="terminal_interface-curses__ads.htm#ref_930_7">Mode</A></FONT> : <b>in</b> Boolean := True)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_922_16">Intrflush</A></FONT> (<FONT COLOR=red><A NAME="ref_922_27" HREF="terminal_interface-curses__adb.htm#ref_922_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_922_41" HREF="terminal_interface-curses__adb.htm#ref_922_16">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_871_16">Intrflush</A></FONT> (<FONT COLOR=red><A NAME="ref_871_27" HREF="terminal_interface-curses__adb.htm#ref_871_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_871_41" HREF="terminal_interface-curses__adb.htm#ref_871_16">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Intrflush, "intrflush");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_922_16">Intrflush</A> (<A HREF="terminal_interface-curses__ads.htm#ref_923_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_924_7">Mode</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_871_16">Intrflush</A> (<A HREF="terminal_interface-curses__ads.htm#ref_929_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_930_7">Mode</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_922_14">Set_Flush_On_Interrupt_Mode</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_928_14">Set_Flush_On_Interrupt_Mode</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_930_14" HREF="terminal_interface-curses__ads.htm#ref_929_14">Set_Queue_Interrupt_Mode</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_931_7" HREF="terminal_interface-curses__ads.htm#ref_930_7">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_932_7" HREF="terminal_interface-curses__ads.htm#ref_931_7">Flush</A></FONT> : <b>in</b> Boolean := True)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_879_14" HREF="terminal_interface-curses__ads.htm#ref_935_14">Set_Queue_Interrupt_Mode</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_880_7" HREF="terminal_interface-curses__ads.htm#ref_936_7">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_881_7" HREF="terminal_interface-curses__ads.htm#ref_937_7">Flush</A></FONT> : <b>in</b> Boolean := True)
-    <b>is</b>
--      <b>procedure</b> <FONT COLOR=red><A NAME="ref_934_17">Qiflush</A></FONT>;
-+      <b>procedure</b> <FONT COLOR=red><A NAME="ref_883_17">Qiflush</A></FONT>;
-       <b>pragma</b> Import (C, Qiflush, "qiflush");
--      <b>procedure</b> <FONT COLOR=red><A NAME="ref_936_17">No_Qiflush</A></FONT>;
-+      <b>procedure</b> <FONT COLOR=red><A NAME="ref_885_17">No_Qiflush</A></FONT>;
-       <b>pragma</b> Import (C, No_Qiflush, "noqiflush");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_930_7">Win</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_936_7">Win</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_931_7">Flush</A> <b>then</b>
--         <A HREF="terminal_interface-curses__adb.htm#ref_934_17">Qiflush</A>;
-+      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_937_7">Flush</A> <b>then</b>
-+         <A HREF="terminal_interface-curses__adb.htm#ref_883_17">Qiflush</A>;
-       <b>else</b>
--         <A HREF="terminal_interface-curses__adb.htm#ref_936_17">No_Qiflush</A>;
-+         <A HREF="terminal_interface-curses__adb.htm#ref_885_17">No_Qiflush</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_929_14">Set_Queue_Interrupt_Mode</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_935_14">Set_Queue_Interrupt_Mode</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_949_14" HREF="terminal_interface-curses__ads.htm#ref_937_14">Set_NoDelay_Mode</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_950_7" HREF="terminal_interface-curses__ads.htm#ref_938_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_951_7" HREF="terminal_interface-curses__ads.htm#ref_939_7">Mode</A></FONT> : <b>in</b> Boolean := False)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_898_14" HREF="terminal_interface-curses__ads.htm#ref_943_14">Set_NoDelay_Mode</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_899_7" HREF="terminal_interface-curses__ads.htm#ref_944_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_900_7" HREF="terminal_interface-curses__ads.htm#ref_945_7">Mode</A></FONT> : <b>in</b> Boolean := False)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_953_16">Nodelay</A></FONT> (<FONT COLOR=red><A NAME="ref_953_25" HREF="terminal_interface-curses__adb.htm#ref_953_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_953_39" HREF="terminal_interface-curses__adb.htm#ref_953_16">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_902_16">Nodelay</A></FONT> (<FONT COLOR=red><A NAME="ref_902_25" HREF="terminal_interface-curses__adb.htm#ref_902_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_902_39" HREF="terminal_interface-curses__adb.htm#ref_902_16">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Nodelay, "nodelay");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_953_16">Nodelay</A> (<A HREF="terminal_interface-curses__ads.htm#ref_938_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_939_7">Mode</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_902_16">Nodelay</A> (<A HREF="terminal_interface-curses__ads.htm#ref_944_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_945_7">Mode</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_937_14">Set_NoDelay_Mode</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_943_14">Set_NoDelay_Mode</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_961_14" HREF="terminal_interface-curses__ads.htm#ref_946_14">Set_Timeout_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_961_32" HREF="terminal_interface-curses__ads.htm#ref_946_32">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--                               <FONT COLOR=red><A NAME="ref_962_32" HREF="terminal_interface-curses__ads.htm#ref_947_32">Mode</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_943_9">Timeout_Mode</A>;
--                               <FONT COLOR=red><A NAME="ref_963_32" HREF="terminal_interface-curses__ads.htm#ref_948_32">Amount</A></FONT> : <b>in</b> Natural)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_910_14" HREF="terminal_interface-curses__ads.htm#ref_952_14">Set_Timeout_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_910_32" HREF="terminal_interface-curses__ads.htm#ref_952_32">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                               <FONT COLOR=red><A NAME="ref_911_32" HREF="terminal_interface-curses__ads.htm#ref_953_32">Mode</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_949_9">Timeout_Mode</A>;
-+                               <FONT COLOR=red><A NAME="ref_912_32" HREF="terminal_interface-curses__ads.htm#ref_954_32">Amount</A></FONT> : <b>in</b> Natural)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_965_16">Wtimeout</A></FONT> (<FONT COLOR=red><A NAME="ref_965_26" HREF="terminal_interface-curses__adb.htm#ref_965_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_965_40" HREF="terminal_interface-curses__adb.htm#ref_965_16">Amount</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>procedure</b> <FONT COLOR=red><A NAME="ref_914_17">Wtimeout</A></FONT> (<FONT COLOR=red><A NAME="ref_914_27" HREF="terminal_interface-curses__adb.htm#ref_914_17">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_914_41" HREF="terminal_interface-curses__adb.htm#ref_914_17">Amount</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>);
-       <b>pragma</b> Import (C, Wtimeout, "wtimeout");
- 
--      <FONT COLOR=red><A NAME="ref_968_7">Time</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <FONT COLOR=red><A NAME="ref_917_7">Time</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-    <b>begin</b>
--      <b>case</b> <A HREF="terminal_interface-curses__ads.htm#ref_947_32">Mode</A> <b>is</b>
--         <b>when</b> <A HREF="terminal_interface-curses__ads.htm#ref_943_26">Blocking</A>     =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_968_7">Time</A> := -1;
--         <b>when</b> <A HREF="terminal_interface-curses__ads.htm#ref_943_36">Non_Blocking</A> =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_968_7">Time</A> := 0;
--         <b>when</b> <A HREF="terminal_interface-curses__ads.htm#ref_943_50">Delayed</A>      =&gt;
--            <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_948_32">Amount</A> = 0 <b>then</b>
-+      <b>case</b> <A HREF="terminal_interface-curses__ads.htm#ref_953_32">Mode</A> <b>is</b>
-+         <b>when</b> <A HREF="terminal_interface-curses__ads.htm#ref_949_26">Blocking</A>     =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_917_7">Time</A> := -1;
-+         <b>when</b> <A HREF="terminal_interface-curses__ads.htm#ref_949_36">Non_Blocking</A> =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_917_7">Time</A> := 0;
-+         <b>when</b> <A HREF="terminal_interface-curses__ads.htm#ref_949_50">Delayed</A>      =&gt;
-+            <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_954_32">Amount</A> = 0 <b>then</b>
-                <b>raise</b> Constraint_Error;
-             <b>end</b> <b>if</b>;
--            <A HREF="terminal_interface-curses__adb.htm#ref_968_7">Time</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_948_32">Amount</A>);
-+            <A HREF="terminal_interface-curses__adb.htm#ref_917_7">Time</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_954_32">Amount</A>);
-       <b>end</b> <b>case</b>;
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_965_16">Wtimeout</A> (<A HREF="terminal_interface-curses__ads.htm#ref_946_32">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_968_7">Time</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
--         <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
--      <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_946_14">Set_Timeout_Mode</A>;
-+      <A HREF="terminal_interface-curses__adb.htm#ref_914_17">Wtimeout</A> (<A HREF="terminal_interface-curses__ads.htm#ref_952_32">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_917_7">Time</A>);
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_952_14">Set_Timeout_Mode</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_984_14" HREF="terminal_interface-curses__ads.htm#ref_958_14">Set_Escape_Timer_Mode</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_985_7" HREF="terminal_interface-curses__ads.htm#ref_959_7">Win</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_986_7" HREF="terminal_interface-curses__ads.htm#ref_960_7">Timer_Off</A></FONT> : <b>in</b> Boolean := False)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_931_14" HREF="terminal_interface-curses__ads.htm#ref_964_14">Set_Escape_Timer_Mode</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_932_7" HREF="terminal_interface-curses__ads.htm#ref_965_7">Win</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_933_7" HREF="terminal_interface-curses__ads.htm#ref_966_7">Timer_Off</A></FONT> : <b>in</b> Boolean := False)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_988_16">Notimeout</A></FONT> (<FONT COLOR=red><A NAME="ref_988_27" HREF="terminal_interface-curses__adb.htm#ref_988_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_988_41" HREF="terminal_interface-curses__adb.htm#ref_988_16">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_935_16">Notimeout</A></FONT> (<FONT COLOR=red><A NAME="ref_935_27" HREF="terminal_interface-curses__adb.htm#ref_935_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_935_41" HREF="terminal_interface-curses__adb.htm#ref_935_16">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Notimeout, "notimeout");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_988_16">Notimeout</A> (<A HREF="terminal_interface-curses__ads.htm#ref_959_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_960_7">Timer_Off</A>)))
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_935_16">Notimeout</A> (<A HREF="terminal_interface-curses__ads.htm#ref_965_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_966_7">Timer_Off</A>)))
-         = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_958_14">Set_Escape_Timer_Mode</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_964_14">Set_Escape_Timer_Mode</A>;
- 
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_998_14" HREF="terminal_interface-curses__ads.htm#ref_969_14">Set_NL_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_998_27" HREF="terminal_interface-curses__ads.htm#ref_969_27">SwitchOn</A></FONT> : <b>in</b> Boolean := True)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_945_14" HREF="terminal_interface-curses__ads.htm#ref_975_14">Set_NL_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_945_27" HREF="terminal_interface-curses__ads.htm#ref_975_27">SwitchOn</A></FONT> : <b>in</b> Boolean := True)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1000_16">NL</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_947_16">NL</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, NL, "nl");
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1002_16">NoNL</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_949_16">NoNL</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, NoNL, "nonl");
- 
--      <FONT COLOR=red><A NAME="ref_1005_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <FONT COLOR=red><A NAME="ref_952_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_969_27">SwitchOn</A> <b>then</b>
--         <A HREF="terminal_interface-curses__adb.htm#ref_1005_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1000_16">NL</A>;
-+      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_975_27">SwitchOn</A> <b>then</b>
-+         <A HREF="terminal_interface-curses__adb.htm#ref_952_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_947_16">NL</A>;
-       <b>else</b>
--         <A HREF="terminal_interface-curses__adb.htm#ref_1005_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1002_16">NoNL</A>;
-+         <A HREF="terminal_interface-curses__adb.htm#ref_952_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_949_16">NoNL</A>;
-       <b>end</b> <b>if</b>;
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1005_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_952_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_969_14">Set_NL_Mode</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_975_14">Set_NL_Mode</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1017_14" HREF="terminal_interface-curses__ads.htm#ref_975_14">Clear_On_Next_Update</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1018_7" HREF="terminal_interface-curses__ads.htm#ref_976_7">Win</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_1019_7" HREF="terminal_interface-curses__ads.htm#ref_977_7">Do_Clear</A></FONT> : <b>in</b> Boolean := True)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_964_14" HREF="terminal_interface-curses__ads.htm#ref_981_14">Clear_On_Next_Update</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_965_7" HREF="terminal_interface-curses__ads.htm#ref_982_7">Win</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_966_7" HREF="terminal_interface-curses__ads.htm#ref_983_7">Do_Clear</A></FONT> : <b>in</b> Boolean := True)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1021_16">Clear_Ok</A></FONT> (<FONT COLOR=red><A NAME="ref_1021_26" HREF="terminal_interface-curses__adb.htm#ref_1021_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1021_38" HREF="terminal_interface-curses__adb.htm#ref_1021_16">Flag</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_968_16">Clear_Ok</A></FONT> (<FONT COLOR=red><A NAME="ref_968_26" HREF="terminal_interface-curses__adb.htm#ref_968_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_968_38" HREF="terminal_interface-curses__adb.htm#ref_968_16">Flag</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Clear_Ok, "clearok");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1021_16">Clear_Ok</A> (<A HREF="terminal_interface-curses__ads.htm#ref_976_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_977_7">Do_Clear</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_968_16">Clear_Ok</A> (<A HREF="terminal_interface-curses__ads.htm#ref_982_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_983_7">Do_Clear</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_975_14">Clear_On_Next_Update</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_981_14">Clear_On_Next_Update</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1029_14" HREF="terminal_interface-curses__ads.htm#ref_982_14">Use_Insert_Delete_Line</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1030_7" HREF="terminal_interface-curses__ads.htm#ref_983_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_1031_7" HREF="terminal_interface-curses__ads.htm#ref_984_7">Do_Idl</A></FONT> : <b>in</b> Boolean := True)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_976_14" HREF="terminal_interface-curses__ads.htm#ref_988_14">Use_Insert_Delete_Line</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_977_7" HREF="terminal_interface-curses__ads.htm#ref_989_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_978_7" HREF="terminal_interface-curses__ads.htm#ref_990_7">Do_Idl</A></FONT> : <b>in</b> Boolean := True)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1033_16">IDL_Ok</A></FONT> (<FONT COLOR=red><A NAME="ref_1033_24" HREF="terminal_interface-curses__adb.htm#ref_1033_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1033_36" HREF="terminal_interface-curses__adb.htm#ref_1033_16">Flag</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_980_16">IDL_Ok</A></FONT> (<FONT COLOR=red><A NAME="ref_980_24" HREF="terminal_interface-curses__adb.htm#ref_980_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_980_36" HREF="terminal_interface-curses__adb.htm#ref_980_16">Flag</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, IDL_Ok, "idlok");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1033_16">IDL_Ok</A> (<A HREF="terminal_interface-curses__ads.htm#ref_983_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_984_7">Do_Idl</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_980_16">IDL_Ok</A> (<A HREF="terminal_interface-curses__ads.htm#ref_989_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_990_7">Do_Idl</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_982_14">Use_Insert_Delete_Line</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_988_14">Use_Insert_Delete_Line</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1041_14" HREF="terminal_interface-curses__ads.htm#ref_989_14">Use_Insert_Delete_Character</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1042_7" HREF="terminal_interface-curses__ads.htm#ref_990_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_1043_7" HREF="terminal_interface-curses__ads.htm#ref_991_7">Do_Idc</A></FONT> : <b>in</b> Boolean := True)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_988_14" HREF="terminal_interface-curses__ads.htm#ref_995_14">Use_Insert_Delete_Character</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_989_7" HREF="terminal_interface-curses__ads.htm#ref_996_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_990_7" HREF="terminal_interface-curses__ads.htm#ref_997_7">Do_Idc</A></FONT> : <b>in</b> Boolean := True)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1045_16">IDC_Ok</A></FONT> (<FONT COLOR=red><A NAME="ref_1045_24" HREF="terminal_interface-curses__adb.htm#ref_1045_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1045_36" HREF="terminal_interface-curses__adb.htm#ref_1045_16">Flag</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>procedure</b> <FONT COLOR=red><A NAME="ref_992_17">IDC_Ok</A></FONT> (<FONT COLOR=red><A NAME="ref_992_25" HREF="terminal_interface-curses__adb.htm#ref_992_17">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_992_37" HREF="terminal_interface-curses__adb.htm#ref_992_17">Flag</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>);
-       <b>pragma</b> Import (C, IDC_Ok, "idcok");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1045_16">IDC_Ok</A> (<A HREF="terminal_interface-curses__ads.htm#ref_990_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_991_7">Do_Idc</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
--         <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
--      <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_989_14">Use_Insert_Delete_Character</A>;
-+      <A HREF="terminal_interface-curses__adb.htm#ref_992_17">IDC_Ok</A> (<A HREF="terminal_interface-curses__ads.htm#ref_996_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_997_7">Do_Idc</A>)));
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_995_14">Use_Insert_Delete_Character</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1053_14" HREF="terminal_interface-curses__ads.htm#ref_996_14">Leave_Cursor_After_Update</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1054_7" HREF="terminal_interface-curses__ads.htm#ref_997_7">Win</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_1055_7" HREF="terminal_interface-curses__ads.htm#ref_998_7">Do_Leave</A></FONT> : <b>in</b> Boolean := True)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_998_14" HREF="terminal_interface-curses__ads.htm#ref_1002_14">Leave_Cursor_After_Update</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_999_7" HREF="terminal_interface-curses__ads.htm#ref_1003_7">Win</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1000_7" HREF="terminal_interface-curses__ads.htm#ref_1004_7">Do_Leave</A></FONT> : <b>in</b> Boolean := True)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1057_16">Leave_Ok</A></FONT> (<FONT COLOR=red><A NAME="ref_1057_26" HREF="terminal_interface-curses__adb.htm#ref_1057_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1057_38" HREF="terminal_interface-curses__adb.htm#ref_1057_16">Flag</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1002_16">Leave_Ok</A></FONT> (<FONT COLOR=red><A NAME="ref_1002_26" HREF="terminal_interface-curses__adb.htm#ref_1002_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1002_38" HREF="terminal_interface-curses__adb.htm#ref_1002_16">Flag</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Leave_Ok, "leaveok");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1057_16">Leave_Ok</A> (<A HREF="terminal_interface-curses__ads.htm#ref_997_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_998_7">Do_Leave</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1002_16">Leave_Ok</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1003_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1004_7">Do_Leave</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_996_14">Leave_Cursor_After_Update</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1002_14">Leave_Cursor_After_Update</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1065_14" HREF="terminal_interface-curses__ads.htm#ref_1003_14">Immediate_Update_Mode</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1066_7" HREF="terminal_interface-curses__ads.htm#ref_1004_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_1067_7" HREF="terminal_interface-curses__ads.htm#ref_1005_7">Mode</A></FONT> : <b>in</b> Boolean := False)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1010_14" HREF="terminal_interface-curses__ads.htm#ref_1009_14">Immediate_Update_Mode</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1011_7" HREF="terminal_interface-curses__ads.htm#ref_1010_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1012_7" HREF="terminal_interface-curses__ads.htm#ref_1011_7">Mode</A></FONT> : <b>in</b> Boolean := False)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1069_16">Immedok</A></FONT> (<FONT COLOR=red><A NAME="ref_1069_25" HREF="terminal_interface-curses__adb.htm#ref_1069_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1069_39" HREF="terminal_interface-curses__adb.htm#ref_1069_16">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>procedure</b> <FONT COLOR=red><A NAME="ref_1014_17">Immedok</A></FONT> (<FONT COLOR=red><A NAME="ref_1014_26" HREF="terminal_interface-curses__adb.htm#ref_1014_17">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1014_40" HREF="terminal_interface-curses__adb.htm#ref_1014_17">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>);
-       <b>pragma</b> Import (C, Immedok, "immedok");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1069_16">Immedok</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1004_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1005_7">Mode</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
--         <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
--      <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1003_14">Immediate_Update_Mode</A>;
-+      <A HREF="terminal_interface-curses__adb.htm#ref_1014_17">Immedok</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1010_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1011_7">Mode</A>)));
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1009_14">Immediate_Update_Mode</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1077_14" HREF="terminal_interface-curses__ads.htm#ref_1010_14">Allow_Scrolling</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1078_7" HREF="terminal_interface-curses__ads.htm#ref_1011_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>  := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_1079_7" HREF="terminal_interface-curses__ads.htm#ref_1012_7">Mode</A></FONT> : <b>in</b> Boolean := False)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1020_14" HREF="terminal_interface-curses__ads.htm#ref_1016_14">Allow_Scrolling</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1021_7" HREF="terminal_interface-curses__ads.htm#ref_1017_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>  := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1022_7" HREF="terminal_interface-curses__ads.htm#ref_1018_7">Mode</A></FONT> : <b>in</b> Boolean := False)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1081_16">Scrollok</A></FONT> (<FONT COLOR=red><A NAME="ref_1081_26" HREF="terminal_interface-curses__adb.htm#ref_1081_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1081_40" HREF="terminal_interface-curses__adb.htm#ref_1081_16">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1024_16">Scrollok</A></FONT> (<FONT COLOR=red><A NAME="ref_1024_26" HREF="terminal_interface-curses__adb.htm#ref_1024_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1024_40" HREF="terminal_interface-curses__adb.htm#ref_1024_16">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Scrollok, "scrollok");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1081_16">Scrollok</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1011_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1012_7">Mode</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1024_16">Scrollok</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1017_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1018_7">Mode</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1010_14">Allow_Scrolling</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1016_14">Allow_Scrolling</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_1089_13" HREF="terminal_interface-curses__ads.htm#ref_1016_13">Scrolling_Allowed</A></FONT> (<FONT COLOR=red><A NAME="ref_1089_32" HREF="terminal_interface-curses__ads.htm#ref_1016_32">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1032_13" HREF="terminal_interface-curses__ads.htm#ref_1022_13">Scrolling_Allowed</A></FONT> (<FONT COLOR=red><A NAME="ref_1032_32" HREF="terminal_interface-curses__ads.htm#ref_1022_32">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-                                <b>return</b> Boolean
-    <b>is</b>
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1035_16">Is_Scroll_Ok</A></FONT> (<FONT COLOR=red><A NAME="ref_1035_30" HREF="terminal_interface-curses__adb.htm#ref_1035_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>;
-+      <b>pragma</b> Import (C, Is_Scroll_Ok, "is_scrollok");
-    <b>begin</b>
--      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_93_13">Get_Flag</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1016_32">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1921_4">Offset_scroll</A>);
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1016_13">Scrolling_Allowed</A>;
-+      <b>return</b> (<A HREF="terminal_interface-curses__adb.htm#ref_1035_16">Is_Scroll_Ok</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1022_32">Win</A>) /= <A HREF="terminal_interface-curses__ads.htm#ref_1927_4">Curses_Bool_False</A>);
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1022_13">Scrolling_Allowed</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1096_14" HREF="terminal_interface-curses__ads.htm#ref_1021_14">Set_Scroll_Region</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1097_7" HREF="terminal_interface-curses__ads.htm#ref_1022_7">Win</A></FONT>         : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_1098_7" HREF="terminal_interface-curses__ads.htm#ref_1023_7">Top_Line</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1099_7" HREF="terminal_interface-curses__ads.htm#ref_1024_7">Bottom_Line</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>)
--   <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1101_16">Wsetscrreg</A></FONT> (<FONT COLOR=red><A NAME="ref_1101_28" HREF="terminal_interface-curses__adb.htm#ref_1101_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                           <FONT COLOR=red><A NAME="ref_1102_28" HREF="terminal_interface-curses__adb.htm#ref_1101_16">Lin</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--                           <FONT COLOR=red><A NAME="ref_1103_28" HREF="terminal_interface-curses__adb.htm#ref_1101_16">Col</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1041_14" HREF="terminal_interface-curses__ads.htm#ref_1027_14">Set_Scroll_Region</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1042_7" HREF="terminal_interface-curses__ads.htm#ref_1028_7">Win</A></FONT>         : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1043_7" HREF="terminal_interface-curses__ads.htm#ref_1029_7">Top_Line</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1044_7" HREF="terminal_interface-curses__ads.htm#ref_1030_7">Bottom_Line</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>)
-+   <b>is</b>
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1046_16">Wsetscrreg</A></FONT> (<FONT COLOR=red><A NAME="ref_1046_28" HREF="terminal_interface-curses__adb.htm#ref_1046_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                           <FONT COLOR=red><A NAME="ref_1047_28" HREF="terminal_interface-curses__adb.htm#ref_1046_16">Lin</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+                           <FONT COLOR=red><A NAME="ref_1048_28" HREF="terminal_interface-curses__adb.htm#ref_1046_16">Col</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Wsetscrreg, "wsetscrreg");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1101_16">Wsetscrreg</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1022_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1023_7">Top_Line</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1024_7">Bottom_Line</A>))
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1046_16">Wsetscrreg</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1028_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1029_7">Top_Line</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1030_7">Bottom_Line</A>))
-         = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1021_14">Set_Scroll_Region</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1027_14">Set_Scroll_Region</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1112_14" HREF="terminal_interface-curses__ads.htm#ref_1034_14">Update_Screen</A></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1057_14" HREF="terminal_interface-curses__ads.htm#ref_1040_14">Update_Screen</A></FONT>
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1114_16">Do_Update</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1059_16">Do_Update</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Do_Update, "doupdate");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1114_16">Do_Update</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1059_16">Do_Update</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1034_14">Update_Screen</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1040_14">Update_Screen</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1122_14" HREF="terminal_interface-curses__ads.htm#ref_1039_14">Refresh</A></FONT> (<FONT COLOR=red><A NAME="ref_1122_23" HREF="terminal_interface-curses__ads.htm#ref_1039_23">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1067_14" HREF="terminal_interface-curses__ads.htm#ref_1045_14">Refresh</A></FONT> (<FONT COLOR=red><A NAME="ref_1067_23" HREF="terminal_interface-curses__ads.htm#ref_1045_23">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1124_16">Wrefresh</A></FONT> (<FONT COLOR=red><A NAME="ref_1124_26" HREF="terminal_interface-curses__adb.htm#ref_1124_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1069_16">Wrefresh</A></FONT> (<FONT COLOR=red><A NAME="ref_1069_26" HREF="terminal_interface-curses__adb.htm#ref_1069_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Wrefresh, "wrefresh");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1124_16">Wrefresh</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1039_23">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1069_16">Wrefresh</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1045_23">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1039_14">Refresh</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1045_14">Refresh</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1132_14" HREF="terminal_interface-curses__ads.htm#ref_1046_14">Refresh_Without_Update</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1133_7" HREF="terminal_interface-curses__ads.htm#ref_1047_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1077_14" HREF="terminal_interface-curses__ads.htm#ref_1052_14">Refresh_Without_Update</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1078_7" HREF="terminal_interface-curses__ads.htm#ref_1053_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1135_16">Wnoutrefresh</A></FONT> (<FONT COLOR=red><A NAME="ref_1135_30" HREF="terminal_interface-curses__adb.htm#ref_1135_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1080_16">Wnoutrefresh</A></FONT> (<FONT COLOR=red><A NAME="ref_1080_30" HREF="terminal_interface-curses__adb.htm#ref_1080_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Wnoutrefresh, "wnoutrefresh");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1135_16">Wnoutrefresh</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1047_7">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1080_16">Wnoutrefresh</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1053_7">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1046_14">Refresh_Without_Update</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1052_14">Refresh_Without_Update</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1143_14" HREF="terminal_interface-curses__ads.htm#ref_1053_14">Redraw</A></FONT> (<FONT COLOR=red><A NAME="ref_1143_22" HREF="terminal_interface-curses__ads.htm#ref_1053_22">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1088_14" HREF="terminal_interface-curses__ads.htm#ref_1059_14">Redraw</A></FONT> (<FONT COLOR=red><A NAME="ref_1088_22" HREF="terminal_interface-curses__ads.htm#ref_1059_22">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1145_16">Redrawwin</A></FONT> (<FONT COLOR=red><A NAME="ref_1145_27" HREF="terminal_interface-curses__adb.htm#ref_1145_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1090_16">Redrawwin</A></FONT> (<FONT COLOR=red><A NAME="ref_1090_27" HREF="terminal_interface-curses__adb.htm#ref_1090_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Redrawwin, "redrawwin");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1145_16">Redrawwin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1053_22">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1090_16">Redrawwin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1059_22">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1053_14">Redraw</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1059_14">Redraw</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1153_14" HREF="terminal_interface-curses__ads.htm#ref_1057_14">Redraw</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1154_7" HREF="terminal_interface-curses__ads.htm#ref_1057_22">Win</A></FONT>        : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_1155_7" HREF="terminal_interface-curses__ads.htm#ref_1058_22">Begin_Line</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1156_7" HREF="terminal_interface-curses__ads.htm#ref_1059_22">Line_Count</A></FONT> : <b>in</b> Positive)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1098_14" HREF="terminal_interface-curses__ads.htm#ref_1063_14">Redraw</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1099_7" HREF="terminal_interface-curses__ads.htm#ref_1063_22">Win</A></FONT>        : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1100_7" HREF="terminal_interface-curses__ads.htm#ref_1064_22">Begin_Line</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1101_7" HREF="terminal_interface-curses__ads.htm#ref_1065_22">Line_Count</A></FONT> : <b>in</b> Positive)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1158_16">Wredrawln</A></FONT> (<FONT COLOR=red><A NAME="ref_1158_27" HREF="terminal_interface-curses__adb.htm#ref_1158_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1158_41" HREF="terminal_interface-curses__adb.htm#ref_1158_16">First</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>; <FONT COLOR=red><A NAME="ref_1158_56" HREF="terminal_interface-curses__adb.htm#ref_1158_16">Cnt</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>)
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1103_16">Wredrawln</A></FONT> (<FONT COLOR=red><A NAME="ref_1103_27" HREF="terminal_interface-curses__adb.htm#ref_1103_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1103_41" HREF="terminal_interface-curses__adb.htm#ref_1103_16">First</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>; <FONT COLOR=red><A NAME="ref_1103_56" HREF="terminal_interface-curses__adb.htm#ref_1103_16">Cnt</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>)
-                           <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Wredrawln, "wredrawln");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1158_16">Wredrawln</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1057_22">Win</A>,
--                    <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1058_22">Begin_Line</A>),
--                    <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1059_22">Line_Count</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1103_16">Wredrawln</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1063_22">Win</A>,
-+                    <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1064_22">Begin_Line</A>),
-+                    <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1065_22">Line_Count</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1057_14">Redraw</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1063_14">Redraw</A>;
- 
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1170_14" HREF="terminal_interface-curses__ads.htm#ref_1068_14">Erase</A></FONT> (<FONT COLOR=red><A NAME="ref_1170_21" HREF="terminal_interface-curses__ads.htm#ref_1068_21">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1115_14" HREF="terminal_interface-curses__ads.htm#ref_1074_14">Erase</A></FONT> (<FONT COLOR=red><A NAME="ref_1115_21" HREF="terminal_interface-curses__ads.htm#ref_1074_21">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1172_16">Werase</A></FONT> (<FONT COLOR=red><A NAME="ref_1172_24" HREF="terminal_interface-curses__adb.htm#ref_1172_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1117_16">Werase</A></FONT> (<FONT COLOR=red><A NAME="ref_1117_24" HREF="terminal_interface-curses__adb.htm#ref_1117_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Werase, "werase");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1172_16">Werase</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1068_21">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1117_16">Werase</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1074_21">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1068_14">Erase</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1074_14">Erase</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1180_14" HREF="terminal_interface-curses__ads.htm#ref_1074_14">Clear</A></FONT> (<FONT COLOR=red><A NAME="ref_1180_21" HREF="terminal_interface-curses__ads.htm#ref_1075_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1125_14" HREF="terminal_interface-curses__ads.htm#ref_1080_14">Clear</A></FONT> (<FONT COLOR=red><A NAME="ref_1125_21" HREF="terminal_interface-curses__ads.htm#ref_1081_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1182_16">Wclear</A></FONT> (<FONT COLOR=red><A NAME="ref_1182_24" HREF="terminal_interface-curses__adb.htm#ref_1182_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1127_16">Wclear</A></FONT> (<FONT COLOR=red><A NAME="ref_1127_24" HREF="terminal_interface-curses__adb.htm#ref_1127_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Wclear, "wclear");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1182_16">Wclear</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1075_7">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1127_16">Wclear</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1081_7">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1074_14">Clear</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1080_14">Clear</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1190_14" HREF="terminal_interface-curses__ads.htm#ref_1081_14">Clear_To_End_Of_Screen</A></FONT> (<FONT COLOR=red><A NAME="ref_1190_38" HREF="terminal_interface-curses__ads.htm#ref_1082_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1135_14" HREF="terminal_interface-curses__ads.htm#ref_1087_14">Clear_To_End_Of_Screen</A></FONT> (<FONT COLOR=red><A NAME="ref_1135_38" HREF="terminal_interface-curses__ads.htm#ref_1088_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1192_16">Wclearbot</A></FONT> (<FONT COLOR=red><A NAME="ref_1192_27" HREF="terminal_interface-curses__adb.htm#ref_1192_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1137_16">Wclearbot</A></FONT> (<FONT COLOR=red><A NAME="ref_1137_27" HREF="terminal_interface-curses__adb.htm#ref_1137_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Wclearbot, "wclrtobot");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1192_16">Wclearbot</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1082_7">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1137_16">Wclearbot</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1088_7">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1081_14">Clear_To_End_Of_Screen</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1087_14">Clear_To_End_Of_Screen</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1200_14" HREF="terminal_interface-curses__ads.htm#ref_1088_14">Clear_To_End_Of_Line</A></FONT> (<FONT COLOR=red><A NAME="ref_1200_36" HREF="terminal_interface-curses__ads.htm#ref_1089_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1145_14" HREF="terminal_interface-curses__ads.htm#ref_1094_14">Clear_To_End_Of_Line</A></FONT> (<FONT COLOR=red><A NAME="ref_1145_36" HREF="terminal_interface-curses__ads.htm#ref_1095_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1202_16">Wcleareol</A></FONT> (<FONT COLOR=red><A NAME="ref_1202_27" HREF="terminal_interface-curses__adb.htm#ref_1202_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1147_16">Wcleareol</A></FONT> (<FONT COLOR=red><A NAME="ref_1147_27" HREF="terminal_interface-curses__adb.htm#ref_1147_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Wcleareol, "wclrtoeol");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1202_16">Wcleareol</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1089_7">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1147_16">Wcleareol</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1095_7">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1088_14">Clear_To_End_Of_Line</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1094_14">Clear_To_End_Of_Line</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1210_14" HREF="terminal_interface-curses__ads.htm#ref_1102_14">Set_Background</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1211_7" HREF="terminal_interface-curses__ads.htm#ref_1103_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_1212_7" HREF="terminal_interface-curses__ads.htm#ref_1104_7">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1155_14" HREF="terminal_interface-curses__ads.htm#ref_1108_14">Set_Background</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1156_7" HREF="terminal_interface-curses__ads.htm#ref_1109_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1157_7" HREF="terminal_interface-curses__ads.htm#ref_1110_7">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
-    <b>is</b>
--      <b>procedure</b> <FONT COLOR=red><A NAME="ref_1214_17">WBackground</A></FONT> (<FONT COLOR=red><A NAME="ref_1214_30" HREF="terminal_interface-curses__adb.htm#ref_1214_17">W</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1214_45" HREF="terminal_interface-curses__adb.htm#ref_1214_17">Ch</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>);
-+      <b>procedure</b> <FONT COLOR=red><A NAME="ref_1159_17">WBackground</A></FONT> (<FONT COLOR=red><A NAME="ref_1159_30" HREF="terminal_interface-curses__adb.htm#ref_1159_17">W</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1159_45" HREF="terminal_interface-curses__adb.htm#ref_1159_17">Ch</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>);
-       <b>pragma</b> Import (C, WBackground, "wbkgdset");
-    <b>begin</b>
--      <A HREF="terminal_interface-curses__adb.htm#ref_1214_17">WBackground</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1103_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1104_7">Ch</A>));
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1102_14">Set_Background</A>;
-+      <A HREF="terminal_interface-curses__adb.htm#ref_1159_17">WBackground</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1109_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1110_7">Ch</A>));
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1108_14">Set_Background</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1220_14" HREF="terminal_interface-curses__ads.htm#ref_1110_14">Change_Background</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1221_7" HREF="terminal_interface-curses__ads.htm#ref_1111_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_1222_7" HREF="terminal_interface-curses__ads.htm#ref_1112_7">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1165_14" HREF="terminal_interface-curses__ads.htm#ref_1116_14">Change_Background</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1166_7" HREF="terminal_interface-curses__ads.htm#ref_1117_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1167_7" HREF="terminal_interface-curses__ads.htm#ref_1118_7">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1224_16">WChangeBkgd</A></FONT> (<FONT COLOR=red><A NAME="ref_1224_29" HREF="terminal_interface-curses__adb.htm#ref_1224_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1224_41" HREF="terminal_interface-curses__adb.htm#ref_1224_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1169_16">WChangeBkgd</A></FONT> (<FONT COLOR=red><A NAME="ref_1169_29" HREF="terminal_interface-curses__adb.htm#ref_1169_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1169_41" HREF="terminal_interface-curses__adb.htm#ref_1169_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, WChangeBkgd, "wbkgd");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1224_16">WChangeBkgd</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1111_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1112_7">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1169_16">WChangeBkgd</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1117_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1118_7">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1110_14">Change_Background</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1116_14">Change_Background</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_1232_13" HREF="terminal_interface-curses__ads.htm#ref_1119_13">Get_Background</A></FONT> (<FONT COLOR=red><A NAME="ref_1232_29" HREF="terminal_interface-curses__ads.htm#ref_1119_29">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1177_13" HREF="terminal_interface-curses__ads.htm#ref_1125_13">Get_Background</A></FONT> (<FONT COLOR=red><A NAME="ref_1177_29" HREF="terminal_interface-curses__ads.htm#ref_1125_29">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-      <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1235_16">Wgetbkgd</A></FONT> (<FONT COLOR=red><A NAME="ref_1235_26" HREF="terminal_interface-curses__adb.htm#ref_1235_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1180_16">Wgetbkgd</A></FONT> (<FONT COLOR=red><A NAME="ref_1180_26" HREF="terminal_interface-curses__adb.htm#ref_1180_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-       <b>pragma</b> Import (C, Wgetbkgd, "getbkgd");
-    <b>begin</b>
--      <b>return</b> Chtype_To_AttrChar (<A HREF="terminal_interface-curses__adb.htm#ref_1235_16">Wgetbkgd</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1119_29">Win</A>));
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1119_13">Get_Background</A>;
-+      <b>return</b> Chtype_To_AttrChar (<A HREF="terminal_interface-curses__adb.htm#ref_1180_16">Wgetbkgd</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1125_29">Win</A>));
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1125_13">Get_Background</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1241_14" HREF="terminal_interface-curses__ads.htm#ref_1146_14">Change_Lines_Status</A></FONT> (<FONT COLOR=red><A NAME="ref_1241_35" HREF="terminal_interface-curses__ads.htm#ref_1146_35">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--                                  <FONT COLOR=red><A NAME="ref_1242_35" HREF="terminal_interface-curses__ads.htm#ref_1147_35">Start</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--                                  <FONT COLOR=red><A NAME="ref_1243_35" HREF="terminal_interface-curses__ads.htm#ref_1148_35">Count</A></FONT> : <b>in</b> Positive;
--                                  <FONT COLOR=red><A NAME="ref_1244_35" HREF="terminal_interface-curses__ads.htm#ref_1149_35">State</A></FONT> : <b>in</b> Boolean)
--   <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1246_16">Wtouchln</A></FONT> (<FONT COLOR=red><A NAME="ref_1246_26" HREF="terminal_interface-curses__adb.htm#ref_1246_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                         <FONT COLOR=red><A NAME="ref_1247_26" HREF="terminal_interface-curses__adb.htm#ref_1246_16">Sta</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--                         <FONT COLOR=red><A NAME="ref_1248_26" HREF="terminal_interface-curses__adb.htm#ref_1246_16">Cnt</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--                         <FONT COLOR=red><A NAME="ref_1249_26" HREF="terminal_interface-curses__adb.htm#ref_1246_16">Chg</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1186_14" HREF="terminal_interface-curses__ads.htm#ref_1152_14">Change_Lines_Status</A></FONT> (<FONT COLOR=red><A NAME="ref_1186_35" HREF="terminal_interface-curses__ads.htm#ref_1152_35">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                                  <FONT COLOR=red><A NAME="ref_1187_35" HREF="terminal_interface-curses__ads.htm#ref_1153_35">Start</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+                                  <FONT COLOR=red><A NAME="ref_1188_35" HREF="terminal_interface-curses__ads.htm#ref_1154_35">Count</A></FONT> : <b>in</b> Positive;
-+                                  <FONT COLOR=red><A NAME="ref_1189_35" HREF="terminal_interface-curses__ads.htm#ref_1155_35">State</A></FONT> : <b>in</b> Boolean)
-+   <b>is</b>
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1191_16">Wtouchln</A></FONT> (<FONT COLOR=red><A NAME="ref_1191_26" HREF="terminal_interface-curses__adb.htm#ref_1191_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                         <FONT COLOR=red><A NAME="ref_1192_26" HREF="terminal_interface-curses__adb.htm#ref_1191_16">Sta</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+                         <FONT COLOR=red><A NAME="ref_1193_26" HREF="terminal_interface-curses__adb.htm#ref_1191_16">Cnt</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+                         <FONT COLOR=red><A NAME="ref_1194_26" HREF="terminal_interface-curses__adb.htm#ref_1191_16">Chg</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Wtouchln, "wtouchln");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1246_16">Wtouchln</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1146_35">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1147_35">Start</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1148_35">Count</A>),
--                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1149_35">State</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1191_16">Wtouchln</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1152_35">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1153_35">Start</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1154_35">Count</A>),
-+                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1155_35">State</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1146_14">Change_Lines_Status</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1152_14">Change_Lines_Status</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1258_14" HREF="terminal_interface-curses__ads.htm#ref_1135_14">Touch</A></FONT> (<FONT COLOR=red><A NAME="ref_1258_21" HREF="terminal_interface-curses__ads.htm#ref_1135_21">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1203_14" HREF="terminal_interface-curses__ads.htm#ref_1141_14">Touch</A></FONT> (<FONT COLOR=red><A NAME="ref_1203_21" HREF="terminal_interface-curses__ads.htm#ref_1141_21">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-    <b>is</b>
--      <FONT COLOR=red><A NAME="ref_1260_7">Y</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1261_7">X</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1205_7">Y</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1206_7">X</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-    <b>begin</b>
--      <A HREF="terminal_interface-curses__ads.htm#ref_1222_14">Get_Size</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1135_21">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1260_7">Y</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1261_7">X</A>);
--      <A HREF="terminal_interface-curses__ads.htm#ref_1146_14">Change_Lines_Status</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1135_21">Win</A>, 0, Positive (<A HREF="terminal_interface-curses__adb.htm#ref_1260_7">Y</A>), True);
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1135_14">Touch</A>;
-+      <A HREF="terminal_interface-curses__ads.htm#ref_1228_14">Get_Size</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1141_21">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1205_7">Y</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1206_7">X</A>);
-+      <A HREF="terminal_interface-curses__ads.htm#ref_1152_14">Change_Lines_Status</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1141_21">Win</A>, 0, Positive (<A HREF="terminal_interface-curses__adb.htm#ref_1205_7">Y</A>), True);
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1141_14">Touch</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1267_14" HREF="terminal_interface-curses__ads.htm#ref_1130_14">Untouch</A></FONT> (<FONT COLOR=red><A NAME="ref_1267_23" HREF="terminal_interface-curses__ads.htm#ref_1130_23">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1212_14" HREF="terminal_interface-curses__ads.htm#ref_1136_14">Untouch</A></FONT> (<FONT COLOR=red><A NAME="ref_1212_23" HREF="terminal_interface-curses__ads.htm#ref_1136_23">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-    <b>is</b>
--      <FONT COLOR=red><A NAME="ref_1269_7">Y</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1270_7">X</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1214_7">Y</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1215_7">X</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-    <b>begin</b>
--      <A HREF="terminal_interface-curses__ads.htm#ref_1222_14">Get_Size</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1130_23">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1269_7">Y</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1270_7">X</A>);
--      <A HREF="terminal_interface-curses__ads.htm#ref_1146_14">Change_Lines_Status</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1130_23">Win</A>, 0, Positive (<A HREF="terminal_interface-curses__adb.htm#ref_1269_7">Y</A>), False);
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1130_14">Untouch</A>;
-+      <A HREF="terminal_interface-curses__ads.htm#ref_1228_14">Get_Size</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1136_23">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1214_7">Y</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1215_7">X</A>);
-+      <A HREF="terminal_interface-curses__ads.htm#ref_1152_14">Change_Lines_Status</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1136_23">Win</A>, 0, Positive (<A HREF="terminal_interface-curses__adb.htm#ref_1214_7">Y</A>), False);
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1136_14">Untouch</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1276_14" HREF="terminal_interface-curses__ads.htm#ref_1139_14">Touch</A></FONT> (<FONT COLOR=red><A NAME="ref_1276_21" HREF="terminal_interface-curses__ads.htm#ref_1139_21">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--                    <FONT COLOR=red><A NAME="ref_1277_21" HREF="terminal_interface-curses__ads.htm#ref_1140_21">Start</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--                    <FONT COLOR=red><A NAME="ref_1278_21" HREF="terminal_interface-curses__ads.htm#ref_1141_21">Count</A></FONT> : <b>in</b> Positive)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1221_14" HREF="terminal_interface-curses__ads.htm#ref_1145_14">Touch</A></FONT> (<FONT COLOR=red><A NAME="ref_1221_21" HREF="terminal_interface-curses__ads.htm#ref_1145_21">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                    <FONT COLOR=red><A NAME="ref_1222_21" HREF="terminal_interface-curses__ads.htm#ref_1146_21">Start</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+                    <FONT COLOR=red><A NAME="ref_1223_21" HREF="terminal_interface-curses__ads.htm#ref_1147_21">Count</A></FONT> : <b>in</b> Positive)
-    <b>is</b>
-    <b>begin</b>
--      <A HREF="terminal_interface-curses__ads.htm#ref_1146_14">Change_Lines_Status</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1139_21">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1140_21">Start</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1141_21">Count</A>, True);
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1139_14">Touch</A>;
-+      <A HREF="terminal_interface-curses__ads.htm#ref_1152_14">Change_Lines_Status</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1145_21">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1146_21">Start</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1147_21">Count</A>, True);
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1145_14">Touch</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_1284_13" HREF="terminal_interface-curses__ads.htm#ref_1154_13">Is_Touched</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1285_7" HREF="terminal_interface-curses__ads.htm#ref_1154_25">Win</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_1286_7" HREF="terminal_interface-curses__ads.htm#ref_1155_25">Line</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>) <b>return</b> Boolean
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1229_13" HREF="terminal_interface-curses__ads.htm#ref_1160_13">Is_Touched</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1230_7" HREF="terminal_interface-curses__ads.htm#ref_1160_25">Win</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1231_7" HREF="terminal_interface-curses__ads.htm#ref_1161_25">Line</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>) <b>return</b> Boolean
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1288_16">WLineTouched</A></FONT> (<FONT COLOR=red><A NAME="ref_1288_30" HREF="terminal_interface-curses__adb.htm#ref_1288_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1288_42" HREF="terminal_interface-curses__adb.htm#ref_1288_16">L</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1233_16">WLineTouched</A></FONT> (<FONT COLOR=red><A NAME="ref_1233_30" HREF="terminal_interface-curses__adb.htm#ref_1233_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1233_42" HREF="terminal_interface-curses__adb.htm#ref_1233_16">L</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>;
-       <b>pragma</b> Import (C, WLineTouched, "is_linetouched");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1288_16">WLineTouched</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1154_25">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1155_25">Line</A>)) = <A HREF="terminal_interface-curses__ads.htm#ref_1931_4">Curses_Bool_False</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1233_16">WLineTouched</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1160_25">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1161_25">Line</A>)) = <A HREF="terminal_interface-curses__ads.htm#ref_1927_4">Curses_Bool_False</A> <b>then</b>
-          <b>return</b> False;
-       <b>else</b>
-          <b>return</b> True;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1154_13">Is_Touched</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1160_13">Is_Touched</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_1298_13" HREF="terminal_interface-curses__ads.htm#ref_1159_13">Is_Touched</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1299_7" HREF="terminal_interface-curses__ads.htm#ref_1159_25">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>) <b>return</b> Boolean
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1243_13" HREF="terminal_interface-curses__ads.htm#ref_1165_13">Is_Touched</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1244_7" HREF="terminal_interface-curses__ads.htm#ref_1165_25">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>) <b>return</b> Boolean
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1301_16">WWinTouched</A></FONT> (<FONT COLOR=red><A NAME="ref_1301_29" HREF="terminal_interface-curses__adb.htm#ref_1301_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1246_16">WWinTouched</A></FONT> (<FONT COLOR=red><A NAME="ref_1246_29" HREF="terminal_interface-curses__adb.htm#ref_1246_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>;
-       <b>pragma</b> Import (C, WWinTouched, "is_wintouched");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1301_16">WWinTouched</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1159_25">Win</A>) = <A HREF="terminal_interface-curses__ads.htm#ref_1931_4">Curses_Bool_False</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1246_16">WWinTouched</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1165_25">Win</A>) = <A HREF="terminal_interface-curses__ads.htm#ref_1927_4">Curses_Bool_False</A> <b>then</b>
-          <b>return</b> False;
-       <b>else</b>
-          <b>return</b> True;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1159_13">Is_Touched</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1165_13">Is_Touched</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1311_14" HREF="terminal_interface-curses__ads.htm#ref_1168_14">Copy</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1312_7" HREF="terminal_interface-curses__ads.htm#ref_1169_7">Source_Window</A></FONT>            : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--      <FONT COLOR=red><A NAME="ref_1313_7" HREF="terminal_interface-curses__ads.htm#ref_1170_7">Destination_Window</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--      <FONT COLOR=red><A NAME="ref_1314_7" HREF="terminal_interface-curses__ads.htm#ref_1171_7">Source_Top_Row</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1315_7" HREF="terminal_interface-curses__ads.htm#ref_1172_7">Source_Left_Column</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1316_7" HREF="terminal_interface-curses__ads.htm#ref_1173_7">Destination_Top_Row</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1317_7" HREF="terminal_interface-curses__ads.htm#ref_1174_7">Destination_Left_Column</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1318_7" HREF="terminal_interface-curses__ads.htm#ref_1175_7">Destination_Bottom_Row</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1319_7" HREF="terminal_interface-curses__ads.htm#ref_1176_7">Destination_Right_Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1320_7" HREF="terminal_interface-curses__ads.htm#ref_1177_7">Non_Destructive_Mode</A></FONT>     : <b>in</b> Boolean := True)
--   <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1322_16">Copywin</A></FONT> (<FONT COLOR=red><A NAME="ref_1322_25" HREF="terminal_interface-curses__adb.htm#ref_1322_16">Src</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                        <FONT COLOR=red><A NAME="ref_1323_25" HREF="terminal_interface-curses__adb.htm#ref_1322_16">Dst</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                        <FONT COLOR=red><A NAME="ref_1324_25" HREF="terminal_interface-curses__adb.htm#ref_1322_16">Str</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--                        <FONT COLOR=red><A NAME="ref_1325_25" HREF="terminal_interface-curses__adb.htm#ref_1322_16">Slc</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--                        <FONT COLOR=red><A NAME="ref_1326_25" HREF="terminal_interface-curses__adb.htm#ref_1322_16">Dtr</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--                        <FONT COLOR=red><A NAME="ref_1327_25" HREF="terminal_interface-curses__adb.htm#ref_1322_16">Dlc</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--                        <FONT COLOR=red><A NAME="ref_1328_25" HREF="terminal_interface-curses__adb.htm#ref_1322_16">Dbr</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--                        <FONT COLOR=red><A NAME="ref_1329_25" HREF="terminal_interface-curses__adb.htm#ref_1322_16">Drc</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--                        <FONT COLOR=red><A NAME="ref_1330_25" HREF="terminal_interface-curses__adb.htm#ref_1322_16">Ndm</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1256_14" HREF="terminal_interface-curses__ads.htm#ref_1174_14">Copy</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1257_7" HREF="terminal_interface-curses__ads.htm#ref_1175_7">Source_Window</A></FONT>            : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1258_7" HREF="terminal_interface-curses__ads.htm#ref_1176_7">Destination_Window</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1259_7" HREF="terminal_interface-curses__ads.htm#ref_1177_7">Source_Top_Row</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1260_7" HREF="terminal_interface-curses__ads.htm#ref_1178_7">Source_Left_Column</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1261_7" HREF="terminal_interface-curses__ads.htm#ref_1179_7">Destination_Top_Row</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1262_7" HREF="terminal_interface-curses__ads.htm#ref_1180_7">Destination_Left_Column</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1263_7" HREF="terminal_interface-curses__ads.htm#ref_1181_7">Destination_Bottom_Row</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1264_7" HREF="terminal_interface-curses__ads.htm#ref_1182_7">Destination_Right_Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1265_7" HREF="terminal_interface-curses__ads.htm#ref_1183_7">Non_Destructive_Mode</A></FONT>     : <b>in</b> Boolean := True)
-+   <b>is</b>
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1267_16">Copywin</A></FONT> (<FONT COLOR=red><A NAME="ref_1267_25" HREF="terminal_interface-curses__adb.htm#ref_1267_16">Src</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                        <FONT COLOR=red><A NAME="ref_1268_25" HREF="terminal_interface-curses__adb.htm#ref_1267_16">Dst</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                        <FONT COLOR=red><A NAME="ref_1269_25" HREF="terminal_interface-curses__adb.htm#ref_1267_16">Str</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+                        <FONT COLOR=red><A NAME="ref_1270_25" HREF="terminal_interface-curses__adb.htm#ref_1267_16">Slc</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+                        <FONT COLOR=red><A NAME="ref_1271_25" HREF="terminal_interface-curses__adb.htm#ref_1267_16">Dtr</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+                        <FONT COLOR=red><A NAME="ref_1272_25" HREF="terminal_interface-curses__adb.htm#ref_1267_16">Dlc</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+                        <FONT COLOR=red><A NAME="ref_1273_25" HREF="terminal_interface-curses__adb.htm#ref_1267_16">Dbr</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+                        <FONT COLOR=red><A NAME="ref_1274_25" HREF="terminal_interface-curses__adb.htm#ref_1267_16">Drc</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+                        <FONT COLOR=red><A NAME="ref_1275_25" HREF="terminal_interface-curses__adb.htm#ref_1267_16">Ndm</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Copywin, "copywin");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1322_16">Copywin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1169_7">Source_Window</A>,
--                  <A HREF="terminal_interface-curses__ads.htm#ref_1170_7">Destination_Window</A>,
--                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1171_7">Source_Top_Row</A>),
--                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1172_7">Source_Left_Column</A>),
--                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1173_7">Destination_Top_Row</A>),
--                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1174_7">Destination_Left_Column</A>),
--                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1175_7">Destination_Bottom_Row</A>),
--                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1176_7">Destination_Right_Column</A>),
--                  Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1177_7">Non_Destructive_Mode</A>)
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1267_16">Copywin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1175_7">Source_Window</A>,
-+                  <A HREF="terminal_interface-curses__ads.htm#ref_1176_7">Destination_Window</A>,
-+                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1177_7">Source_Top_Row</A>),
-+                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1178_7">Source_Left_Column</A>),
-+                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1179_7">Destination_Top_Row</A>),
-+                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1180_7">Destination_Left_Column</A>),
-+                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1181_7">Destination_Bottom_Row</A>),
-+                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1182_7">Destination_Right_Column</A>),
-+                  Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1183_7">Non_Destructive_Mode</A>)
-                 ) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1168_14">Copy</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1174_14">Copy</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1347_14" HREF="terminal_interface-curses__ads.htm#ref_1182_14">Overwrite</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1348_7" HREF="terminal_interface-curses__ads.htm#ref_1182_25">Source_Window</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--      <FONT COLOR=red><A NAME="ref_1349_7" HREF="terminal_interface-curses__ads.htm#ref_1183_25">Destination_Window</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1292_14" HREF="terminal_interface-curses__ads.htm#ref_1188_14">Overwrite</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1293_7" HREF="terminal_interface-curses__ads.htm#ref_1188_25">Source_Window</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1294_7" HREF="terminal_interface-curses__ads.htm#ref_1189_25">Destination_Window</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1351_16">Overwrite</A></FONT> (<FONT COLOR=red><A NAME="ref_1351_27" HREF="terminal_interface-curses__adb.htm#ref_1351_16">Src</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1351_41" HREF="terminal_interface-curses__adb.htm#ref_1351_16">Dst</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1296_16">Overwrite</A></FONT> (<FONT COLOR=red><A NAME="ref_1296_27" HREF="terminal_interface-curses__adb.htm#ref_1296_16">Src</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1296_41" HREF="terminal_interface-curses__adb.htm#ref_1296_16">Dst</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Overwrite, "overwrite");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1351_16">Overwrite</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1182_25">Source_Window</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1183_25">Destination_Window</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1296_16">Overwrite</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1188_25">Source_Window</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1189_25">Destination_Window</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1182_14">Overwrite</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1188_14">Overwrite</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1359_14" HREF="terminal_interface-curses__ads.htm#ref_1188_14">Overlay</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1360_7" HREF="terminal_interface-curses__ads.htm#ref_1188_23">Source_Window</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--      <FONT COLOR=red><A NAME="ref_1361_7" HREF="terminal_interface-curses__ads.htm#ref_1189_23">Destination_Window</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1304_14" HREF="terminal_interface-curses__ads.htm#ref_1194_14">Overlay</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1305_7" HREF="terminal_interface-curses__ads.htm#ref_1194_23">Source_Window</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1306_7" HREF="terminal_interface-curses__ads.htm#ref_1195_23">Destination_Window</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1363_16">Overlay</A></FONT> (<FONT COLOR=red><A NAME="ref_1363_25" HREF="terminal_interface-curses__adb.htm#ref_1363_16">Src</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1363_39" HREF="terminal_interface-curses__adb.htm#ref_1363_16">Dst</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1308_16">Overlay</A></FONT> (<FONT COLOR=red><A NAME="ref_1308_25" HREF="terminal_interface-curses__adb.htm#ref_1308_16">Src</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1308_39" HREF="terminal_interface-curses__adb.htm#ref_1308_16">Dst</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Overlay, "overlay");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1363_16">Overlay</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1188_23">Source_Window</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1189_23">Destination_Window</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1308_16">Overlay</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1194_23">Source_Window</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1195_23">Destination_Window</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1188_14">Overlay</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1194_14">Overlay</A>;
- 
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1372_14" HREF="terminal_interface-curses__ads.htm#ref_1198_14">Insert_Delete_Lines</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1373_7" HREF="terminal_interface-curses__ads.htm#ref_1199_7">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_1374_7" HREF="terminal_interface-curses__ads.htm#ref_1200_7">Lines</A></FONT> : <b>in</b> Integer       := 1) <FONT COLOR=green><EM>-- default is to insert one line above</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1317_14" HREF="terminal_interface-curses__ads.htm#ref_1204_14">Insert_Delete_Lines</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1318_7" HREF="terminal_interface-curses__ads.htm#ref_1205_7">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1319_7" HREF="terminal_interface-curses__ads.htm#ref_1206_7">Lines</A></FONT> : <b>in</b> Integer       := 1) <FONT COLOR=green><EM>-- default is to insert one line above</EM></FONT>
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1376_16">Winsdelln</A></FONT> (<FONT COLOR=red><A NAME="ref_1376_27" HREF="terminal_interface-curses__adb.htm#ref_1376_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1376_39" HREF="terminal_interface-curses__adb.htm#ref_1376_16">N</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1321_16">Winsdelln</A></FONT> (<FONT COLOR=red><A NAME="ref_1321_27" HREF="terminal_interface-curses__adb.htm#ref_1321_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1321_39" HREF="terminal_interface-curses__adb.htm#ref_1321_16">N</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Winsdelln, "winsdelln");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1376_16">Winsdelln</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1199_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1200_7">Lines</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1321_16">Winsdelln</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1205_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1206_7">Lines</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1198_14">Insert_Delete_Lines</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1204_14">Insert_Delete_Lines</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1384_14" HREF="terminal_interface-curses__ads.htm#ref_1206_14">Delete_Line</A></FONT> (<FONT COLOR=red><A NAME="ref_1384_27" HREF="terminal_interface-curses__ads.htm#ref_1206_27">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1329_14" HREF="terminal_interface-curses__ads.htm#ref_1212_14">Delete_Line</A></FONT> (<FONT COLOR=red><A NAME="ref_1329_27" HREF="terminal_interface-curses__ads.htm#ref_1212_27">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-    <b>is</b>
-    <b>begin</b>
--      <A HREF="terminal_interface-curses__ads.htm#ref_1198_14">Insert_Delete_Lines</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1206_27">Win</A>, -1);
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1206_14">Delete_Line</A>;
-+      <A HREF="terminal_interface-curses__ads.htm#ref_1204_14">Insert_Delete_Lines</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1212_27">Win</A>, -1);
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1212_14">Delete_Line</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1390_14" HREF="terminal_interface-curses__ads.htm#ref_1212_14">Insert_Line</A></FONT> (<FONT COLOR=red><A NAME="ref_1390_27" HREF="terminal_interface-curses__ads.htm#ref_1212_27">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1335_14" HREF="terminal_interface-curses__ads.htm#ref_1218_14">Insert_Line</A></FONT> (<FONT COLOR=red><A NAME="ref_1335_27" HREF="terminal_interface-curses__ads.htm#ref_1218_27">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-    <b>is</b>
-    <b>begin</b>
--      <A HREF="terminal_interface-curses__ads.htm#ref_1198_14">Insert_Delete_Lines</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1212_27">Win</A>, 1);
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1212_14">Insert_Line</A>;
-+      <A HREF="terminal_interface-curses__ads.htm#ref_1204_14">Insert_Delete_Lines</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1218_27">Win</A>, 1);
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1218_14">Insert_Line</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1397_14" HREF="terminal_interface-curses__ads.htm#ref_1222_14">Get_Size</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1398_7" HREF="terminal_interface-curses__ads.htm#ref_1223_7">Win</A></FONT>               : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_1399_7" HREF="terminal_interface-curses__ads.htm#ref_1224_7">Number_Of_Lines</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
--      <FONT COLOR=red><A NAME="ref_1400_7" HREF="terminal_interface-curses__ads.htm#ref_1225_7">Number_Of_Columns</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1342_14" HREF="terminal_interface-curses__ads.htm#ref_1228_14">Get_Size</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1343_7" HREF="terminal_interface-curses__ads.htm#ref_1229_7">Win</A></FONT>               : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1344_7" HREF="terminal_interface-curses__ads.htm#ref_1230_7">Number_Of_Lines</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+      <FONT COLOR=red><A NAME="ref_1345_7" HREF="terminal_interface-curses__ads.htm#ref_1231_7">Number_Of_Columns</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>)
-    <b>is</b>
--      <FONT COLOR=green><EM>--  Please note: in ncurses they are one off.</EM></FONT>
--      <FONT COLOR=green><EM>--  This might be different in other implementations of curses</EM></FONT>
--      <FONT COLOR=red><A NAME="ref_1404_7">Y</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (W_Get_Short (<A HREF="terminal_interface-curses__ads.htm#ref_1223_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1909_4">Offset_maxy</A>))
--                          + <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1928_4">Offset_XY</A>);
--      <FONT COLOR=red><A NAME="ref_1406_7">X</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (W_Get_Short (<A HREF="terminal_interface-curses__ads.htm#ref_1223_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1910_4">Offset_maxx</A>))
--                          + <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1928_4">Offset_XY</A>);
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1347_16">GetMaxY</A></FONT> (<FONT COLOR=red><A NAME="ref_1347_25" HREF="terminal_interface-curses__adb.htm#ref_1347_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>pragma</b> Import (C, GetMaxY, "getmaxy");
-+
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1350_16">GetMaxX</A></FONT> (<FONT COLOR=red><A NAME="ref_1350_25" HREF="terminal_interface-curses__adb.htm#ref_1350_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>pragma</b> Import (C, GetMaxX, "getmaxx");
-+
-+      <FONT COLOR=red><A NAME="ref_1353_7">Y</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1347_16">GetMaxY</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1229_7">Win</A>)
-+                          + <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1924_4">Offset_XY</A>);
-+      <FONT COLOR=red><A NAME="ref_1355_7">X</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1350_16">GetMaxX</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1229_7">Win</A>)
-+                          + <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1924_4">Offset_XY</A>);
-    <b>begin</b>
--      <A HREF="terminal_interface-curses__ads.htm#ref_1224_7">Number_Of_Lines</A>   := <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1404_7">Y</A>);
--      <A HREF="terminal_interface-curses__ads.htm#ref_1225_7">Number_Of_Columns</A> := <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1406_7">X</A>);
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1222_14">Get_Size</A>;
-+      <A HREF="terminal_interface-curses__ads.htm#ref_1230_7">Number_Of_Lines</A>   := <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1353_7">Y</A>);
-+      <A HREF="terminal_interface-curses__ads.htm#ref_1231_7">Number_Of_Columns</A> := <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1355_7">X</A>);
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1228_14">Get_Size</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1413_14" HREF="terminal_interface-curses__ads.htm#ref_1230_14">Get_Window_Position</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1414_7" HREF="terminal_interface-curses__ads.htm#ref_1231_7">Win</A></FONT>             : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_1415_7" HREF="terminal_interface-curses__ads.htm#ref_1232_7">Top_Left_Line</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1416_7" HREF="terminal_interface-curses__ads.htm#ref_1233_7">Top_Left_Column</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1362_14" HREF="terminal_interface-curses__ads.htm#ref_1236_14">Get_Window_Position</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1363_7" HREF="terminal_interface-curses__ads.htm#ref_1237_7">Win</A></FONT>             : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1364_7" HREF="terminal_interface-curses__ads.htm#ref_1238_7">Top_Left_Line</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1365_7" HREF="terminal_interface-curses__ads.htm#ref_1239_7">Top_Left_Column</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
-    <b>is</b>
--      <FONT COLOR=red><A NAME="ref_1418_7">Y</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> := W_Get_Short (<A HREF="terminal_interface-curses__ads.htm#ref_1231_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1911_4">Offset_begy</A>);
--      <FONT COLOR=red><A NAME="ref_1419_7">X</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> := W_Get_Short (<A HREF="terminal_interface-curses__ads.htm#ref_1231_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1912_4">Offset_begx</A>);
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1367_16">GetBegY</A></FONT> (<FONT COLOR=red><A NAME="ref_1367_25" HREF="terminal_interface-curses__adb.htm#ref_1367_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>pragma</b> Import (C, GetBegY, "getbegy");
-+
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1370_16">GetBegX</A></FONT> (<FONT COLOR=red><A NAME="ref_1370_25" HREF="terminal_interface-curses__adb.htm#ref_1370_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>pragma</b> Import (C, GetBegX, "getbegx");
-+
-+      <FONT COLOR=red><A NAME="ref_1373_7">Y</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1367_16">GetBegY</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1237_7">Win</A>));
-+      <FONT COLOR=red><A NAME="ref_1374_7">X</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1370_16">GetBegX</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1237_7">Win</A>));
-    <b>begin</b>
--      <A HREF="terminal_interface-curses__ads.htm#ref_1232_7">Top_Left_Line</A>   := <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1418_7">Y</A>);
--      <A HREF="terminal_interface-curses__ads.htm#ref_1233_7">Top_Left_Column</A> := <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1419_7">X</A>);
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1230_14">Get_Window_Position</A>;
-+      <A HREF="terminal_interface-curses__ads.htm#ref_1238_7">Top_Left_Line</A>   := <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1373_7">Y</A>);
-+      <A HREF="terminal_interface-curses__ads.htm#ref_1239_7">Top_Left_Column</A> := <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1374_7">X</A>);
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1236_14">Get_Window_Position</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1425_14" HREF="terminal_interface-curses__ads.htm#ref_1238_14">Get_Cursor_Position</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1426_7" HREF="terminal_interface-curses__ads.htm#ref_1239_7">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_1427_7" HREF="terminal_interface-curses__ads.htm#ref_1240_7">Line</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1428_7" HREF="terminal_interface-curses__ads.htm#ref_1241_7">Column</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1380_14" HREF="terminal_interface-curses__ads.htm#ref_1244_14">Get_Cursor_Position</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1381_7" HREF="terminal_interface-curses__ads.htm#ref_1245_7">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1382_7" HREF="terminal_interface-curses__ads.htm#ref_1246_7">Line</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1383_7" HREF="terminal_interface-curses__ads.htm#ref_1247_7">Column</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
-    <b>is</b>
--      <FONT COLOR=red><A NAME="ref_1430_7">Y</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> := W_Get_Short (<A HREF="terminal_interface-curses__ads.htm#ref_1239_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1913_4">Offset_cury</A>);
--      <FONT COLOR=red><A NAME="ref_1431_7">X</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> := <A HREF="terminal_interface-curses__adb.htm#ref_71_12">W_Get_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1239_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1914_4">Offset_curx</A>);
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1385_16">GetCurY</A></FONT> (<FONT COLOR=red><A NAME="ref_1385_25" HREF="terminal_interface-curses__adb.htm#ref_1385_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>pragma</b> Import (C, GetCurY, "getcury");
-+
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1388_16">GetCurX</A></FONT> (<FONT COLOR=red><A NAME="ref_1388_25" HREF="terminal_interface-curses__adb.htm#ref_1388_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>pragma</b> Import (C, GetCurX, "getcurx");
-+
-+      <FONT COLOR=red><A NAME="ref_1391_7">Y</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1385_16">GetCurY</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1245_7">Win</A>));
-+      <FONT COLOR=red><A NAME="ref_1392_7">X</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1388_16">GetCurX</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1245_7">Win</A>));
-    <b>begin</b>
--      <A HREF="terminal_interface-curses__ads.htm#ref_1240_7">Line</A>   := <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1430_7">Y</A>);
--      <A HREF="terminal_interface-curses__ads.htm#ref_1241_7">Column</A> := <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1431_7">X</A>);
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1238_14">Get_Cursor_Position</A>;
-+      <A HREF="terminal_interface-curses__ads.htm#ref_1246_7">Line</A>   := <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1391_7">Y</A>);
-+      <A HREF="terminal_interface-curses__ads.htm#ref_1247_7">Column</A> := <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1392_7">X</A>);
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1244_14">Get_Cursor_Position</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1437_14" HREF="terminal_interface-curses__ads.htm#ref_1246_14">Get_Origin_Relative_To_Parent</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1438_7" HREF="terminal_interface-curses__ads.htm#ref_1247_7">Win</A></FONT>                : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--      <FONT COLOR=red><A NAME="ref_1439_7" HREF="terminal_interface-curses__ads.htm#ref_1248_7">Top_Left_Line</A></FONT>      : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1440_7" HREF="terminal_interface-curses__ads.htm#ref_1249_7">Top_Left_Column</A></FONT>    : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1441_7" HREF="terminal_interface-curses__ads.htm#ref_1250_7">Is_Not_A_Subwindow</A></FONT> : <b>out</b> Boolean)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1398_14" HREF="terminal_interface-curses__ads.htm#ref_1252_14">Get_Origin_Relative_To_Parent</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1399_7" HREF="terminal_interface-curses__ads.htm#ref_1253_7">Win</A></FONT>                : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1400_7" HREF="terminal_interface-curses__ads.htm#ref_1254_7">Top_Left_Line</A></FONT>      : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1401_7" HREF="terminal_interface-curses__ads.htm#ref_1255_7">Top_Left_Column</A></FONT>    : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1402_7" HREF="terminal_interface-curses__ads.htm#ref_1256_7">Is_Not_A_Subwindow</A></FONT> : <b>out</b> Boolean)
-    <b>is</b>
--      <FONT COLOR=red><A NAME="ref_1443_7">Y</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := W_Get_Int (<A HREF="terminal_interface-curses__ads.htm#ref_1247_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1916_4">Offset_pary</A>);
--      <FONT COLOR=red><A NAME="ref_1444_7">X</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := W_Get_Int (<A HREF="terminal_interface-curses__ads.htm#ref_1247_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1917_4">Offset_parx</A>);
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1404_16">GetParY</A></FONT> (<FONT COLOR=red><A NAME="ref_1404_25" HREF="terminal_interface-curses__adb.htm#ref_1404_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>pragma</b> Import (C, GetParY, "getpary");
-+
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1407_16">GetParX</A></FONT> (<FONT COLOR=red><A NAME="ref_1407_25" HREF="terminal_interface-curses__adb.htm#ref_1407_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>pragma</b> Import (C, GetParX, "getparx");
-+
-+      <FONT COLOR=red><A NAME="ref_1410_7">Y</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1404_16">GetParY</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1253_7">Win</A>);
-+      <FONT COLOR=red><A NAME="ref_1411_7">X</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1407_16">GetParX</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1253_7">Win</A>);
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1443_7">Y</A> = -1 <b>then</b>
--         <A HREF="terminal_interface-curses__ads.htm#ref_1248_7">Top_Left_Line</A>   := <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>'Last;
--         <A HREF="terminal_interface-curses__ads.htm#ref_1249_7">Top_Left_Column</A> := <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>'Last;
--         <A HREF="terminal_interface-curses__ads.htm#ref_1250_7">Is_Not_A_Subwindow</A> := True;
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1410_7">Y</A> = -1 <b>then</b>
-+         <A HREF="terminal_interface-curses__ads.htm#ref_1254_7">Top_Left_Line</A>   := <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>'Last;
-+         <A HREF="terminal_interface-curses__ads.htm#ref_1255_7">Top_Left_Column</A> := <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>'Last;
-+         <A HREF="terminal_interface-curses__ads.htm#ref_1256_7">Is_Not_A_Subwindow</A> := True;
-       <b>else</b>
--         <A HREF="terminal_interface-curses__ads.htm#ref_1248_7">Top_Left_Line</A>   := <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1443_7">Y</A>);
--         <A HREF="terminal_interface-curses__ads.htm#ref_1249_7">Top_Left_Column</A> := <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1444_7">X</A>);
--         <A HREF="terminal_interface-curses__ads.htm#ref_1250_7">Is_Not_A_Subwindow</A> := False;
-+         <A HREF="terminal_interface-curses__ads.htm#ref_1254_7">Top_Left_Line</A>   := <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1410_7">Y</A>);
-+         <A HREF="terminal_interface-curses__ads.htm#ref_1255_7">Top_Left_Column</A> := <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1411_7">X</A>);
-+         <A HREF="terminal_interface-curses__ads.htm#ref_1256_7">Is_Not_A_Subwindow</A> := False;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1246_14">Get_Origin_Relative_To_Parent</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1252_14">Get_Origin_Relative_To_Parent</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>function</b> <FONT COLOR=red><A NAME="ref_1457_13" HREF="terminal_interface-curses__ads.htm#ref_1261_13">New_Pad</A></FONT> (<FONT COLOR=red><A NAME="ref_1457_22" HREF="terminal_interface-curses__ads.htm#ref_1261_22">Lines</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
--                     <FONT COLOR=red><A NAME="ref_1458_22" HREF="terminal_interface-curses__ads.htm#ref_1262_22">Columns</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1424_13" HREF="terminal_interface-curses__ads.htm#ref_1267_13">New_Pad</A></FONT> (<FONT COLOR=red><A NAME="ref_1424_22" HREF="terminal_interface-curses__ads.htm#ref_1267_22">Lines</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+                     <FONT COLOR=red><A NAME="ref_1425_22" HREF="terminal_interface-curses__ads.htm#ref_1268_22">Columns</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1460_16">Newpad</A></FONT> (<FONT COLOR=red><A NAME="ref_1460_24" HREF="terminal_interface-curses__adb.htm#ref_1460_16">Lines</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>; <FONT COLOR=red><A NAME="ref_1460_39" HREF="terminal_interface-curses__adb.htm#ref_1460_16">Columns</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1427_16">Newpad</A></FONT> (<FONT COLOR=red><A NAME="ref_1427_24" HREF="terminal_interface-curses__adb.htm#ref_1427_16">Lines</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>; <FONT COLOR=red><A NAME="ref_1427_39" HREF="terminal_interface-curses__adb.htm#ref_1427_16">Columns</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-       <b>pragma</b> Import (C, Newpad, "newpad");
- 
--      <FONT COLOR=red><A NAME="ref_1463_7">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1430_7">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-    <b>begin</b>
--      <A HREF="terminal_interface-curses__adb.htm#ref_1463_7">W</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1460_16">Newpad</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1261_22">Lines</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1262_22">Columns</A>));
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1463_7">W</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-+      <A HREF="terminal_interface-curses__adb.htm#ref_1430_7">W</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1427_16">Newpad</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1267_22">Lines</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1268_22">Columns</A>));
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1430_7">W</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_1463_7">W</A>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1261_13">New_Pad</A>;
-+      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_1430_7">W</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1267_13">New_Pad</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_1472_13" HREF="terminal_interface-curses__ads.htm#ref_1267_13">Sub_Pad</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1473_7" HREF="terminal_interface-curses__ads.htm#ref_1268_7">Pad</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--      <FONT COLOR=red><A NAME="ref_1474_7" HREF="terminal_interface-curses__ads.htm#ref_1269_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
--      <FONT COLOR=red><A NAME="ref_1475_7" HREF="terminal_interface-curses__ads.htm#ref_1270_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
--      <FONT COLOR=red><A NAME="ref_1476_7" HREF="terminal_interface-curses__ads.htm#ref_1271_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1477_7" HREF="terminal_interface-curses__ads.htm#ref_1272_7">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
--   <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1479_16">Subpad</A></FONT>
--        (<FONT COLOR=red><A NAME="ref_1480_10" HREF="terminal_interface-curses__adb.htm#ref_1479_16">Pad</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--         <FONT COLOR=red><A NAME="ref_1481_10" HREF="terminal_interface-curses__adb.htm#ref_1479_16">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--         <FONT COLOR=red><A NAME="ref_1482_10" HREF="terminal_interface-curses__adb.htm#ref_1479_16">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--         <FONT COLOR=red><A NAME="ref_1483_10" HREF="terminal_interface-curses__adb.htm#ref_1479_16">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--         <FONT COLOR=red><A NAME="ref_1484_10" HREF="terminal_interface-curses__adb.htm#ref_1479_16">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1439_13" HREF="terminal_interface-curses__ads.htm#ref_1273_13">Sub_Pad</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1440_7" HREF="terminal_interface-curses__ads.htm#ref_1274_7">Pad</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1441_7" HREF="terminal_interface-curses__ads.htm#ref_1275_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+      <FONT COLOR=red><A NAME="ref_1442_7" HREF="terminal_interface-curses__ads.htm#ref_1276_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-+      <FONT COLOR=red><A NAME="ref_1443_7" HREF="terminal_interface-curses__ads.htm#ref_1277_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1444_7" HREF="terminal_interface-curses__ads.htm#ref_1278_7">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
-+   <b>is</b>
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1446_16">Subpad</A></FONT>
-+        (<FONT COLOR=red><A NAME="ref_1447_10" HREF="terminal_interface-curses__adb.htm#ref_1446_16">Pad</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+         <FONT COLOR=red><A NAME="ref_1448_10" HREF="terminal_interface-curses__adb.htm#ref_1446_16">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+         <FONT COLOR=red><A NAME="ref_1449_10" HREF="terminal_interface-curses__adb.htm#ref_1446_16">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+         <FONT COLOR=red><A NAME="ref_1450_10" HREF="terminal_interface-curses__adb.htm#ref_1446_16">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+         <FONT COLOR=red><A NAME="ref_1451_10" HREF="terminal_interface-curses__adb.htm#ref_1446_16">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-       <b>pragma</b> Import (C, Subpad, "subpad");
- 
--      <FONT COLOR=red><A NAME="ref_1487_7">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1454_7">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-    <b>begin</b>
--      <A HREF="terminal_interface-curses__adb.htm#ref_1487_7">W</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1479_16">Subpad</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1268_7">Pad</A>,
--                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1269_7">Number_Of_Lines</A>),
--                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1270_7">Number_Of_Columns</A>),
--                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1271_7">First_Line_Position</A>),
--                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1272_7">First_Column_Position</A>));
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1487_7">W</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
--         <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
--      <b>end</b> <b>if</b>;
--      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_1487_7">W</A>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1267_13">Sub_Pad</A>;
--
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1500_14" HREF="terminal_interface-curses__ads.htm#ref_1277_14">Refresh</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1501_7" HREF="terminal_interface-curses__ads.htm#ref_1278_7">Pad</A></FONT>                      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--      <FONT COLOR=red><A NAME="ref_1502_7" HREF="terminal_interface-curses__ads.htm#ref_1279_7">Source_Top_Row</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1503_7" HREF="terminal_interface-curses__ads.htm#ref_1280_7">Source_Left_Column</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1504_7" HREF="terminal_interface-curses__ads.htm#ref_1281_7">Destination_Top_Row</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1505_7" HREF="terminal_interface-curses__ads.htm#ref_1282_7">Destination_Left_Column</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1506_7" HREF="terminal_interface-curses__ads.htm#ref_1283_7">Destination_Bottom_Row</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1507_7" HREF="terminal_interface-curses__ads.htm#ref_1284_7">Destination_Right_Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
--   <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1509_16">Prefresh</A></FONT>
--        (<FONT COLOR=red><A NAME="ref_1510_10" HREF="terminal_interface-curses__adb.htm#ref_1509_16">Pad</A></FONT>                      : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--         <FONT COLOR=red><A NAME="ref_1511_10" HREF="terminal_interface-curses__adb.htm#ref_1509_16">Source_Top_Row</A></FONT>           : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--         <FONT COLOR=red><A NAME="ref_1512_10" HREF="terminal_interface-curses__adb.htm#ref_1509_16">Source_Left_Column</A></FONT>       : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--         <FONT COLOR=red><A NAME="ref_1513_10" HREF="terminal_interface-curses__adb.htm#ref_1509_16">Destination_Top_Row</A></FONT>      : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--         <FONT COLOR=red><A NAME="ref_1514_10" HREF="terminal_interface-curses__adb.htm#ref_1509_16">Destination_Left_Column</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--         <FONT COLOR=red><A NAME="ref_1515_10" HREF="terminal_interface-curses__adb.htm#ref_1509_16">Destination_Bottom_Row</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--         <FONT COLOR=red><A NAME="ref_1516_10" HREF="terminal_interface-curses__adb.htm#ref_1509_16">Destination_Right_Column</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <A HREF="terminal_interface-curses__adb.htm#ref_1454_7">W</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1446_16">Subpad</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1274_7">Pad</A>,
-+                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1275_7">Number_Of_Lines</A>),
-+                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1276_7">Number_Of_Columns</A>),
-+                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1277_7">First_Line_Position</A>),
-+                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1278_7">First_Column_Position</A>));
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1454_7">W</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-+         <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+      <b>end</b> <b>if</b>;
-+      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_1454_7">W</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1273_13">Sub_Pad</A>;
-+
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1467_14" HREF="terminal_interface-curses__ads.htm#ref_1283_14">Refresh</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1468_7" HREF="terminal_interface-curses__ads.htm#ref_1284_7">Pad</A></FONT>                      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1469_7" HREF="terminal_interface-curses__ads.htm#ref_1285_7">Source_Top_Row</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1470_7" HREF="terminal_interface-curses__ads.htm#ref_1286_7">Source_Left_Column</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1471_7" HREF="terminal_interface-curses__ads.htm#ref_1287_7">Destination_Top_Row</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1472_7" HREF="terminal_interface-curses__ads.htm#ref_1288_7">Destination_Left_Column</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1473_7" HREF="terminal_interface-curses__ads.htm#ref_1289_7">Destination_Bottom_Row</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1474_7" HREF="terminal_interface-curses__ads.htm#ref_1290_7">Destination_Right_Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
-+   <b>is</b>
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1476_16">Prefresh</A></FONT>
-+        (<FONT COLOR=red><A NAME="ref_1477_10" HREF="terminal_interface-curses__adb.htm#ref_1476_16">Pad</A></FONT>                      : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+         <FONT COLOR=red><A NAME="ref_1478_10" HREF="terminal_interface-curses__adb.htm#ref_1476_16">Source_Top_Row</A></FONT>           : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+         <FONT COLOR=red><A NAME="ref_1479_10" HREF="terminal_interface-curses__adb.htm#ref_1476_16">Source_Left_Column</A></FONT>       : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+         <FONT COLOR=red><A NAME="ref_1480_10" HREF="terminal_interface-curses__adb.htm#ref_1476_16">Destination_Top_Row</A></FONT>      : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+         <FONT COLOR=red><A NAME="ref_1481_10" HREF="terminal_interface-curses__adb.htm#ref_1476_16">Destination_Left_Column</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+         <FONT COLOR=red><A NAME="ref_1482_10" HREF="terminal_interface-curses__adb.htm#ref_1476_16">Destination_Bottom_Row</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+         <FONT COLOR=red><A NAME="ref_1483_10" HREF="terminal_interface-curses__adb.htm#ref_1476_16">Destination_Right_Column</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Prefresh, "prefresh");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1509_16">Prefresh</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1278_7">Pad</A>,
--                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1279_7">Source_Top_Row</A>),
--                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1280_7">Source_Left_Column</A>),
--                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1281_7">Destination_Top_Row</A>),
--                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1282_7">Destination_Left_Column</A>),
--                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1283_7">Destination_Bottom_Row</A>),
--                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1284_7">Destination_Right_Column</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
--         <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
--      <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1277_14">Refresh</A>;
--
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1530_14" HREF="terminal_interface-curses__ads.htm#ref_1289_14">Refresh_Without_Update</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1531_7" HREF="terminal_interface-curses__ads.htm#ref_1290_7">Pad</A></FONT>                      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--      <FONT COLOR=red><A NAME="ref_1532_7" HREF="terminal_interface-curses__ads.htm#ref_1291_7">Source_Top_Row</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1533_7" HREF="terminal_interface-curses__ads.htm#ref_1292_7">Source_Left_Column</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1534_7" HREF="terminal_interface-curses__ads.htm#ref_1293_7">Destination_Top_Row</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1535_7" HREF="terminal_interface-curses__ads.htm#ref_1294_7">Destination_Left_Column</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1536_7" HREF="terminal_interface-curses__ads.htm#ref_1295_7">Destination_Bottom_Row</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1537_7" HREF="terminal_interface-curses__ads.htm#ref_1296_7">Destination_Right_Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
--   <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1539_16">Pnoutrefresh</A></FONT>
--        (<FONT COLOR=red><A NAME="ref_1540_10" HREF="terminal_interface-curses__adb.htm#ref_1539_16">Pad</A></FONT>                      : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--         <FONT COLOR=red><A NAME="ref_1541_10" HREF="terminal_interface-curses__adb.htm#ref_1539_16">Source_Top_Row</A></FONT>           : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--         <FONT COLOR=red><A NAME="ref_1542_10" HREF="terminal_interface-curses__adb.htm#ref_1539_16">Source_Left_Column</A></FONT>       : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--         <FONT COLOR=red><A NAME="ref_1543_10" HREF="terminal_interface-curses__adb.htm#ref_1539_16">Destination_Top_Row</A></FONT>      : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--         <FONT COLOR=red><A NAME="ref_1544_10" HREF="terminal_interface-curses__adb.htm#ref_1539_16">Destination_Left_Column</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--         <FONT COLOR=red><A NAME="ref_1545_10" HREF="terminal_interface-curses__adb.htm#ref_1539_16">Destination_Bottom_Row</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--         <FONT COLOR=red><A NAME="ref_1546_10" HREF="terminal_interface-curses__adb.htm#ref_1539_16">Destination_Right_Column</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1476_16">Prefresh</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1284_7">Pad</A>,
-+                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1285_7">Source_Top_Row</A>),
-+                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1286_7">Source_Left_Column</A>),
-+                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1287_7">Destination_Top_Row</A>),
-+                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1288_7">Destination_Left_Column</A>),
-+                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1289_7">Destination_Bottom_Row</A>),
-+                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1290_7">Destination_Right_Column</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+         <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+      <b>end</b> <b>if</b>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1283_14">Refresh</A>;
-+
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1497_14" HREF="terminal_interface-curses__ads.htm#ref_1295_14">Refresh_Without_Update</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1498_7" HREF="terminal_interface-curses__ads.htm#ref_1296_7">Pad</A></FONT>                      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1499_7" HREF="terminal_interface-curses__ads.htm#ref_1297_7">Source_Top_Row</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1500_7" HREF="terminal_interface-curses__ads.htm#ref_1298_7">Source_Left_Column</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1501_7" HREF="terminal_interface-curses__ads.htm#ref_1299_7">Destination_Top_Row</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1502_7" HREF="terminal_interface-curses__ads.htm#ref_1300_7">Destination_Left_Column</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1503_7" HREF="terminal_interface-curses__ads.htm#ref_1301_7">Destination_Bottom_Row</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1504_7" HREF="terminal_interface-curses__ads.htm#ref_1302_7">Destination_Right_Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
-+   <b>is</b>
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1506_16">Pnoutrefresh</A></FONT>
-+        (<FONT COLOR=red><A NAME="ref_1507_10" HREF="terminal_interface-curses__adb.htm#ref_1506_16">Pad</A></FONT>                      : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+         <FONT COLOR=red><A NAME="ref_1508_10" HREF="terminal_interface-curses__adb.htm#ref_1506_16">Source_Top_Row</A></FONT>           : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+         <FONT COLOR=red><A NAME="ref_1509_10" HREF="terminal_interface-curses__adb.htm#ref_1506_16">Source_Left_Column</A></FONT>       : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+         <FONT COLOR=red><A NAME="ref_1510_10" HREF="terminal_interface-curses__adb.htm#ref_1506_16">Destination_Top_Row</A></FONT>      : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+         <FONT COLOR=red><A NAME="ref_1511_10" HREF="terminal_interface-curses__adb.htm#ref_1506_16">Destination_Left_Column</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+         <FONT COLOR=red><A NAME="ref_1512_10" HREF="terminal_interface-curses__adb.htm#ref_1506_16">Destination_Bottom_Row</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+         <FONT COLOR=red><A NAME="ref_1513_10" HREF="terminal_interface-curses__adb.htm#ref_1506_16">Destination_Right_Column</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Pnoutrefresh, "pnoutrefresh");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1539_16">Pnoutrefresh</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1290_7">Pad</A>,
--                       <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1291_7">Source_Top_Row</A>),
--                       <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1292_7">Source_Left_Column</A>),
--                       <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1293_7">Destination_Top_Row</A>),
--                       <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1294_7">Destination_Left_Column</A>),
--                       <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1295_7">Destination_Bottom_Row</A>),
--                       <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1296_7">Destination_Right_Column</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
--         <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
--      <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1289_14">Refresh_Without_Update</A>;
--
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1560_14" HREF="terminal_interface-curses__ads.htm#ref_1301_14">Add_Character_To_Pad_And_Echo_It</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1561_7" HREF="terminal_interface-curses__ads.htm#ref_1302_7">Pad</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--      <FONT COLOR=red><A NAME="ref_1562_7" HREF="terminal_interface-curses__ads.htm#ref_1303_7">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1506_16">Pnoutrefresh</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1296_7">Pad</A>,
-+                       <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1297_7">Source_Top_Row</A>),
-+                       <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1298_7">Source_Left_Column</A>),
-+                       <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1299_7">Destination_Top_Row</A>),
-+                       <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1300_7">Destination_Left_Column</A>),
-+                       <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1301_7">Destination_Bottom_Row</A>),
-+                       <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1302_7">Destination_Right_Column</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+         <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+      <b>end</b> <b>if</b>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1295_14">Refresh_Without_Update</A>;
-+
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1527_14" HREF="terminal_interface-curses__ads.htm#ref_1307_14">Add_Character_To_Pad_And_Echo_It</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1528_7" HREF="terminal_interface-curses__ads.htm#ref_1308_7">Pad</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1529_7" HREF="terminal_interface-curses__ads.htm#ref_1309_7">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1564_16">Pechochar</A></FONT> (<FONT COLOR=red><A NAME="ref_1564_27" HREF="terminal_interface-curses__adb.htm#ref_1564_16">Pad</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1564_41" HREF="terminal_interface-curses__adb.htm#ref_1564_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>)
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1531_16">Pechochar</A></FONT> (<FONT COLOR=red><A NAME="ref_1531_27" HREF="terminal_interface-curses__adb.htm#ref_1531_16">Pad</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1531_41" HREF="terminal_interface-curses__adb.htm#ref_1531_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>)
-                           <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Pechochar, "pechochar");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1564_16">Pechochar</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1302_7">Pad</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1303_7">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1531_16">Pechochar</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1308_7">Pad</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1309_7">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1301_14">Add_Character_To_Pad_And_Echo_It</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1307_14">Add_Character_To_Pad_And_Echo_It</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1573_14" HREF="terminal_interface-curses__ads.htm#ref_1306_14">Add_Character_To_Pad_And_Echo_It</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1574_7" HREF="terminal_interface-curses__ads.htm#ref_1307_7">Pad</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--      <FONT COLOR=red><A NAME="ref_1575_7" HREF="terminal_interface-curses__ads.htm#ref_1308_7">Ch</A></FONT>  : <b>in</b> Character)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1540_14" HREF="terminal_interface-curses__ads.htm#ref_1312_14">Add_Character_To_Pad_And_Echo_It</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1541_7" HREF="terminal_interface-curses__ads.htm#ref_1313_7">Pad</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1542_7" HREF="terminal_interface-curses__ads.htm#ref_1314_7">Ch</A></FONT>  : <b>in</b> Character)
-    <b>is</b>
-    <b>begin</b>
--      <A HREF="terminal_interface-curses__ads.htm#ref_1301_14">Add_Character_To_Pad_And_Echo_It</A>
--        (<A HREF="terminal_interface-curses__ads.htm#ref_1307_7">Pad</A>,
--         <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>'(<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_1308_7">Ch</A>,
-+      <A HREF="terminal_interface-curses__ads.htm#ref_1307_14">Add_Character_To_Pad_And_Echo_It</A>
-+        (<A HREF="terminal_interface-curses__ads.htm#ref_1313_7">Pad</A>,
-+         <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>'(<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_1314_7">Ch</A>,
-                                <A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First,
-                                <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>  =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>));
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1306_14">Add_Character_To_Pad_And_Echo_It</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1312_14">Add_Character_To_Pad_And_Echo_It</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1585_14" HREF="terminal_interface-curses__ads.htm#ref_1316_14">Scroll</A></FONT> (<FONT COLOR=red><A NAME="ref_1585_22" HREF="terminal_interface-curses__ads.htm#ref_1316_22">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--                     <FONT COLOR=red><A NAME="ref_1586_22" HREF="terminal_interface-curses__ads.htm#ref_1317_22">Amount</A></FONT> : <b>in</b> Integer := 1)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1552_14" HREF="terminal_interface-curses__ads.htm#ref_1322_14">Scroll</A></FONT> (<FONT COLOR=red><A NAME="ref_1552_22" HREF="terminal_interface-curses__ads.htm#ref_1322_22">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                     <FONT COLOR=red><A NAME="ref_1553_22" HREF="terminal_interface-curses__ads.htm#ref_1323_22">Amount</A></FONT> : <b>in</b> Integer := 1)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1588_16">Wscrl</A></FONT> (<FONT COLOR=red><A NAME="ref_1588_23" HREF="terminal_interface-curses__adb.htm#ref_1588_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1588_37" HREF="terminal_interface-curses__adb.htm#ref_1588_16">N</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1555_16">Wscrl</A></FONT> (<FONT COLOR=red><A NAME="ref_1555_23" HREF="terminal_interface-curses__adb.htm#ref_1555_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1555_37" HREF="terminal_interface-curses__adb.htm#ref_1555_16">N</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Wscrl, "wscrl");
- 
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1588_16">Wscrl</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1316_22">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1317_22">Amount</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1555_16">Wscrl</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1322_22">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1323_22">Amount</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1316_14">Scroll</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1322_14">Scroll</A>;
- 
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1598_14" HREF="terminal_interface-curses__ads.htm#ref_1328_14">Delete_Character</A></FONT> (<FONT COLOR=red><A NAME="ref_1598_32" HREF="terminal_interface-curses__ads.htm#ref_1328_32">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1565_14" HREF="terminal_interface-curses__ads.htm#ref_1334_14">Delete_Character</A></FONT> (<FONT COLOR=red><A NAME="ref_1565_32" HREF="terminal_interface-curses__ads.htm#ref_1334_32">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1600_16">Wdelch</A></FONT> (<FONT COLOR=red><A NAME="ref_1600_24" HREF="terminal_interface-curses__adb.htm#ref_1600_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1567_16">Wdelch</A></FONT> (<FONT COLOR=red><A NAME="ref_1567_24" HREF="terminal_interface-curses__adb.htm#ref_1567_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Wdelch, "wdelch");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1600_16">Wdelch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1328_32">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1567_16">Wdelch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1334_32">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1328_14">Delete_Character</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1334_14">Delete_Character</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1608_14" HREF="terminal_interface-curses__ads.htm#ref_1333_14">Delete_Character</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1609_7" HREF="terminal_interface-curses__ads.htm#ref_1334_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_1610_7" HREF="terminal_interface-curses__ads.htm#ref_1335_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1611_7" HREF="terminal_interface-curses__ads.htm#ref_1336_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1575_14" HREF="terminal_interface-curses__ads.htm#ref_1339_14">Delete_Character</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1576_7" HREF="terminal_interface-curses__ads.htm#ref_1340_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1577_7" HREF="terminal_interface-curses__ads.htm#ref_1341_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1578_7" HREF="terminal_interface-curses__ads.htm#ref_1342_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1613_16">Mvwdelch</A></FONT> (<FONT COLOR=red><A NAME="ref_1613_26" HREF="terminal_interface-curses__adb.htm#ref_1613_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                         <FONT COLOR=red><A NAME="ref_1614_26" HREF="terminal_interface-curses__adb.htm#ref_1613_16">Lin</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--                         <FONT COLOR=red><A NAME="ref_1615_26" HREF="terminal_interface-curses__adb.htm#ref_1613_16">Col</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1580_16">Mvwdelch</A></FONT> (<FONT COLOR=red><A NAME="ref_1580_26" HREF="terminal_interface-curses__adb.htm#ref_1580_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                         <FONT COLOR=red><A NAME="ref_1581_26" HREF="terminal_interface-curses__adb.htm#ref_1580_16">Lin</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+                         <FONT COLOR=red><A NAME="ref_1582_26" HREF="terminal_interface-curses__adb.htm#ref_1580_16">Col</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Mvwdelch, "mvwdelch");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1613_16">Mvwdelch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1334_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1335_7">Line</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1336_7">Column</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1580_16">Mvwdelch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1340_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1341_7">Line</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1342_7">Column</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1333_14">Delete_Character</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1339_14">Delete_Character</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>function</b> <FONT COLOR=red><A NAME="ref_1623_13" HREF="terminal_interface-curses__ads.htm#ref_1346_13">Peek</A></FONT> (<FONT COLOR=red><A NAME="ref_1623_19" HREF="terminal_interface-curses__ads.htm#ref_1346_19">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1590_13" HREF="terminal_interface-curses__ads.htm#ref_1352_13">Peek</A></FONT> (<FONT COLOR=red><A NAME="ref_1590_19" HREF="terminal_interface-curses__ads.htm#ref_1352_19">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-      <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1626_16">Winch</A></FONT> (<FONT COLOR=red><A NAME="ref_1626_23" HREF="terminal_interface-curses__adb.htm#ref_1626_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1593_16">Winch</A></FONT> (<FONT COLOR=red><A NAME="ref_1593_23" HREF="terminal_interface-curses__adb.htm#ref_1593_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-       <b>pragma</b> Import (C, Winch, "winch");
-    <b>begin</b>
--      <b>return</b> Chtype_To_AttrChar (<A HREF="terminal_interface-curses__adb.htm#ref_1626_16">Winch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1346_19">Win</A>));
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1346_13">Peek</A>;
-+      <b>return</b> Chtype_To_AttrChar (<A HREF="terminal_interface-curses__adb.htm#ref_1593_16">Winch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1352_19">Win</A>));
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1352_13">Peek</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_1632_13" HREF="terminal_interface-curses__ads.htm#ref_1352_13">Peek</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1633_7" HREF="terminal_interface-curses__ads.htm#ref_1353_7">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_1634_7" HREF="terminal_interface-curses__ads.htm#ref_1354_7">Line</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1635_7" HREF="terminal_interface-curses__ads.htm#ref_1355_7">Column</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>
--   <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1637_16">Mvwinch</A></FONT> (<FONT COLOR=red><A NAME="ref_1637_25" HREF="terminal_interface-curses__adb.htm#ref_1637_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                        <FONT COLOR=red><A NAME="ref_1638_25" HREF="terminal_interface-curses__adb.htm#ref_1637_16">Lin</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--                        <FONT COLOR=red><A NAME="ref_1639_25" HREF="terminal_interface-curses__adb.htm#ref_1637_16">Col</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1599_13" HREF="terminal_interface-curses__ads.htm#ref_1358_13">Peek</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1600_7" HREF="terminal_interface-curses__ads.htm#ref_1359_7">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1601_7" HREF="terminal_interface-curses__ads.htm#ref_1360_7">Line</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1602_7" HREF="terminal_interface-curses__ads.htm#ref_1361_7">Column</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>
-+   <b>is</b>
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1604_16">Mvwinch</A></FONT> (<FONT COLOR=red><A NAME="ref_1604_25" HREF="terminal_interface-curses__adb.htm#ref_1604_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                        <FONT COLOR=red><A NAME="ref_1605_25" HREF="terminal_interface-curses__adb.htm#ref_1604_16">Lin</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+                        <FONT COLOR=red><A NAME="ref_1606_25" HREF="terminal_interface-curses__adb.htm#ref_1604_16">Col</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-       <b>pragma</b> Import (C, Mvwinch, "mvwinch");
-    <b>begin</b>
--      <b>return</b> Chtype_To_AttrChar (<A HREF="terminal_interface-curses__adb.htm#ref_1637_16">Mvwinch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1353_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1354_7">Line</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1355_7">Column</A>)));
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1352_13">Peek</A>;
-+      <b>return</b> Chtype_To_AttrChar (<A HREF="terminal_interface-curses__adb.htm#ref_1604_16">Mvwinch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1359_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1360_7">Line</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1361_7">Column</A>)));
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1358_13">Peek</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1645_14" HREF="terminal_interface-curses__ads.htm#ref_1365_14">Insert</A></FONT> (<FONT COLOR=red><A NAME="ref_1645_22" HREF="terminal_interface-curses__ads.htm#ref_1365_22">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--                     <FONT COLOR=red><A NAME="ref_1646_22" HREF="terminal_interface-curses__ads.htm#ref_1366_22">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1612_14" HREF="terminal_interface-curses__ads.htm#ref_1371_14">Insert</A></FONT> (<FONT COLOR=red><A NAME="ref_1612_22" HREF="terminal_interface-curses__ads.htm#ref_1371_22">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                     <FONT COLOR=red><A NAME="ref_1613_22" HREF="terminal_interface-curses__ads.htm#ref_1372_22">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1648_16">Winsch</A></FONT> (<FONT COLOR=red><A NAME="ref_1648_24" HREF="terminal_interface-curses__adb.htm#ref_1648_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1648_38" HREF="terminal_interface-curses__adb.htm#ref_1648_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1615_16">Winsch</A></FONT> (<FONT COLOR=red><A NAME="ref_1615_24" HREF="terminal_interface-curses__adb.htm#ref_1615_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1615_38" HREF="terminal_interface-curses__adb.htm#ref_1615_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Winsch, "winsch");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1648_16">Winsch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1365_22">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1366_22">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1615_16">Winsch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1371_22">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1372_22">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1365_14">Insert</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1371_14">Insert</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1656_14" HREF="terminal_interface-curses__ads.htm#ref_1371_14">Insert</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1657_7" HREF="terminal_interface-curses__ads.htm#ref_1371_22">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_1658_7" HREF="terminal_interface-curses__ads.htm#ref_1372_22">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1659_7" HREF="terminal_interface-curses__ads.htm#ref_1373_22">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1660_7" HREF="terminal_interface-curses__ads.htm#ref_1374_22">Ch</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
--   <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1662_16">Mvwinsch</A></FONT> (<FONT COLOR=red><A NAME="ref_1662_26" HREF="terminal_interface-curses__adb.htm#ref_1662_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                         <FONT COLOR=red><A NAME="ref_1663_26" HREF="terminal_interface-curses__adb.htm#ref_1662_16">Lin</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--                         <FONT COLOR=red><A NAME="ref_1664_26" HREF="terminal_interface-curses__adb.htm#ref_1662_16">Col</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--                         <FONT COLOR=red><A NAME="ref_1665_26" HREF="terminal_interface-curses__adb.htm#ref_1662_16">Ch</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1623_14" HREF="terminal_interface-curses__ads.htm#ref_1377_14">Insert</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1624_7" HREF="terminal_interface-curses__ads.htm#ref_1377_22">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1625_7" HREF="terminal_interface-curses__ads.htm#ref_1378_22">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1626_7" HREF="terminal_interface-curses__ads.htm#ref_1379_22">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1627_7" HREF="terminal_interface-curses__ads.htm#ref_1380_22">Ch</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
-+   <b>is</b>
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1629_16">Mvwinsch</A></FONT> (<FONT COLOR=red><A NAME="ref_1629_26" HREF="terminal_interface-curses__adb.htm#ref_1629_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                         <FONT COLOR=red><A NAME="ref_1630_26" HREF="terminal_interface-curses__adb.htm#ref_1629_16">Lin</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+                         <FONT COLOR=red><A NAME="ref_1631_26" HREF="terminal_interface-curses__adb.htm#ref_1629_16">Col</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+                         <FONT COLOR=red><A NAME="ref_1632_26" HREF="terminal_interface-curses__adb.htm#ref_1629_16">Ch</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Mvwinsch, "mvwinsch");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1662_16">Mvwinsch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1371_22">Win</A>,
--                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1372_22">Line</A>),
--                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1373_22">Column</A>),
--                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1374_22">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1629_16">Mvwinsch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1377_22">Win</A>,
-+                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1378_22">Line</A>),
-+                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1379_22">Column</A>),
-+                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1380_22">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1371_14">Insert</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1377_14">Insert</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1676_14" HREF="terminal_interface-curses__ads.htm#ref_1383_14">Insert</A></FONT> (<FONT COLOR=red><A NAME="ref_1676_22" HREF="terminal_interface-curses__ads.htm#ref_1383_22">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--                     <FONT COLOR=red><A NAME="ref_1677_22" HREF="terminal_interface-curses__ads.htm#ref_1384_22">Str</A></FONT> : <b>in</b> String;
--                     <FONT COLOR=red><A NAME="ref_1678_22" HREF="terminal_interface-curses__ads.htm#ref_1385_22">Len</A></FONT> : <b>in</b> Integer := -1)
--   <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1680_16">Winsnstr</A></FONT> (<FONT COLOR=red><A NAME="ref_1680_26" HREF="terminal_interface-curses__adb.htm#ref_1680_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                         <FONT COLOR=red><A NAME="ref_1681_26" HREF="terminal_interface-curses__adb.htm#ref_1680_16">Str</A></FONT> : char_array;
--                         <FONT COLOR=red><A NAME="ref_1682_26" HREF="terminal_interface-curses__adb.htm#ref_1680_16">Len</A></FONT> : Integer := -1) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1643_14" HREF="terminal_interface-curses__ads.htm#ref_1389_14">Insert</A></FONT> (<FONT COLOR=red><A NAME="ref_1643_22" HREF="terminal_interface-curses__ads.htm#ref_1389_22">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                     <FONT COLOR=red><A NAME="ref_1644_22" HREF="terminal_interface-curses__ads.htm#ref_1390_22">Str</A></FONT> : <b>in</b> String;
-+                     <FONT COLOR=red><A NAME="ref_1645_22" HREF="terminal_interface-curses__ads.htm#ref_1391_22">Len</A></FONT> : <b>in</b> Integer := -1)
-+   <b>is</b>
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1647_16">Winsnstr</A></FONT> (<FONT COLOR=red><A NAME="ref_1647_26" HREF="terminal_interface-curses__adb.htm#ref_1647_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                         <FONT COLOR=red><A NAME="ref_1648_26" HREF="terminal_interface-curses__adb.htm#ref_1647_16">Str</A></FONT> : char_array;
-+                         <FONT COLOR=red><A NAME="ref_1649_26" HREF="terminal_interface-curses__adb.htm#ref_1647_16">Len</A></FONT> : Integer := -1) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Winsnstr, "winsnstr");
- 
--      <FONT COLOR=red><A NAME="ref_1685_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1384_22">Str</A>'Length);
--      <FONT COLOR=red><A NAME="ref_1686_7">Length</A></FONT> : size_t;
-+      <FONT COLOR=red><A NAME="ref_1652_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1390_22">Str</A>'Length);
-+      <FONT COLOR=red><A NAME="ref_1653_7">Length</A></FONT> : size_t;
-    <b>begin</b>
--      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1384_22">Str</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1685_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1686_7">Length</A>);
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1680_16">Winsnstr</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1383_22">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1685_7">Txt</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1385_22">Len</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1390_22">Str</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1652_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1653_7">Length</A>);
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1647_16">Winsnstr</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1389_22">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1652_7">Txt</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1391_22">Len</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1383_14">Insert</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1389_14">Insert</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1694_14" HREF="terminal_interface-curses__ads.htm#ref_1392_14">Insert</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1695_7" HREF="terminal_interface-curses__ads.htm#ref_1392_22">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_1696_7" HREF="terminal_interface-curses__ads.htm#ref_1393_22">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1697_7" HREF="terminal_interface-curses__ads.htm#ref_1394_22">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1698_7" HREF="terminal_interface-curses__ads.htm#ref_1395_22">Str</A></FONT>    : <b>in</b> String;
--      <FONT COLOR=red><A NAME="ref_1699_7" HREF="terminal_interface-curses__ads.htm#ref_1396_22">Len</A></FONT>    : <b>in</b> Integer := -1)
--   <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1701_16">Mvwinsnstr</A></FONT> (<FONT COLOR=red><A NAME="ref_1701_28" HREF="terminal_interface-curses__adb.htm#ref_1701_16">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                           <FONT COLOR=red><A NAME="ref_1702_28" HREF="terminal_interface-curses__adb.htm#ref_1701_16">Line</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--                           <FONT COLOR=red><A NAME="ref_1703_28" HREF="terminal_interface-curses__adb.htm#ref_1701_16">Column</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--                           <FONT COLOR=red><A NAME="ref_1704_28" HREF="terminal_interface-curses__adb.htm#ref_1701_16">Str</A></FONT>    : char_array;
--                           <FONT COLOR=red><A NAME="ref_1705_28" HREF="terminal_interface-curses__adb.htm#ref_1701_16">Len</A></FONT>    : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1661_14" HREF="terminal_interface-curses__ads.htm#ref_1398_14">Insert</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1662_7" HREF="terminal_interface-curses__ads.htm#ref_1398_22">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1663_7" HREF="terminal_interface-curses__ads.htm#ref_1399_22">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1664_7" HREF="terminal_interface-curses__ads.htm#ref_1400_22">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1665_7" HREF="terminal_interface-curses__ads.htm#ref_1401_22">Str</A></FONT>    : <b>in</b> String;
-+      <FONT COLOR=red><A NAME="ref_1666_7" HREF="terminal_interface-curses__ads.htm#ref_1402_22">Len</A></FONT>    : <b>in</b> Integer := -1)
-+   <b>is</b>
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1668_16">Mvwinsnstr</A></FONT> (<FONT COLOR=red><A NAME="ref_1668_28" HREF="terminal_interface-curses__adb.htm#ref_1668_16">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                           <FONT COLOR=red><A NAME="ref_1669_28" HREF="terminal_interface-curses__adb.htm#ref_1668_16">Line</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+                           <FONT COLOR=red><A NAME="ref_1670_28" HREF="terminal_interface-curses__adb.htm#ref_1668_16">Column</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+                           <FONT COLOR=red><A NAME="ref_1671_28" HREF="terminal_interface-curses__adb.htm#ref_1668_16">Str</A></FONT>    : char_array;
-+                           <FONT COLOR=red><A NAME="ref_1672_28" HREF="terminal_interface-curses__adb.htm#ref_1668_16">Len</A></FONT>    : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Mvwinsnstr, "mvwinsnstr");
- 
--      <FONT COLOR=red><A NAME="ref_1708_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1395_22">Str</A>'Length);
--      <FONT COLOR=red><A NAME="ref_1709_7">Length</A></FONT> : size_t;
-+      <FONT COLOR=red><A NAME="ref_1675_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1401_22">Str</A>'Length);
-+      <FONT COLOR=red><A NAME="ref_1676_7">Length</A></FONT> : size_t;
-    <b>begin</b>
--      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1395_22">Str</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1708_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1709_7">Length</A>);
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1701_16">Mvwinsnstr</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1392_22">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1393_22">Line</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1394_22">Column</A>), <A HREF="terminal_interface-curses__adb.htm#ref_1708_7">Txt</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1396_22">Len</A>))
-+      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1401_22">Str</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1675_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1676_7">Length</A>);
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1668_16">Mvwinsnstr</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1398_22">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1399_22">Line</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1400_22">Column</A>), <A HREF="terminal_interface-curses__adb.htm#ref_1675_7">Txt</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1402_22">Len</A>))
-         = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1392_14">Insert</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1398_14">Insert</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1718_14" HREF="terminal_interface-curses__ads.htm#ref_1408_14">Peek</A></FONT> (<FONT COLOR=red><A NAME="ref_1718_20" HREF="terminal_interface-curses__ads.htm#ref_1408_20">Win</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--                   <FONT COLOR=red><A NAME="ref_1719_20" HREF="terminal_interface-curses__ads.htm#ref_1409_20">Str</A></FONT> : <b>out</b> String;
--                   <FONT COLOR=red><A NAME="ref_1720_20" HREF="terminal_interface-curses__ads.htm#ref_1410_20">Len</A></FONT> : <b>in</b>  Integer := -1)
--   <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1722_16">Winnstr</A></FONT> (<FONT COLOR=red><A NAME="ref_1722_25" HREF="terminal_interface-curses__adb.htm#ref_1722_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                        <FONT COLOR=red><A NAME="ref_1723_25" HREF="terminal_interface-curses__adb.htm#ref_1722_16">Str</A></FONT> : char_array;
--                        <FONT COLOR=red><A NAME="ref_1724_25" HREF="terminal_interface-curses__adb.htm#ref_1722_16">Len</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1685_14" HREF="terminal_interface-curses__ads.htm#ref_1414_14">Peek</A></FONT> (<FONT COLOR=red><A NAME="ref_1685_20" HREF="terminal_interface-curses__ads.htm#ref_1414_20">Win</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                   <FONT COLOR=red><A NAME="ref_1686_20" HREF="terminal_interface-curses__ads.htm#ref_1415_20">Str</A></FONT> : <b>out</b> String;
-+                   <FONT COLOR=red><A NAME="ref_1687_20" HREF="terminal_interface-curses__ads.htm#ref_1416_20">Len</A></FONT> : <b>in</b>  Integer := -1)
-+   <b>is</b>
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1689_16">Winnstr</A></FONT> (<FONT COLOR=red><A NAME="ref_1689_25" HREF="terminal_interface-curses__adb.htm#ref_1689_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                        <FONT COLOR=red><A NAME="ref_1690_25" HREF="terminal_interface-curses__adb.htm#ref_1689_16">Str</A></FONT> : char_array;
-+                        <FONT COLOR=red><A NAME="ref_1691_25" HREF="terminal_interface-curses__adb.htm#ref_1689_16">Len</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Winnstr, "winnstr");
- 
--      <FONT COLOR=red><A NAME="ref_1727_7">N</A></FONT>   : Integer := <A HREF="terminal_interface-curses__ads.htm#ref_1410_20">Len</A>;
--      <FONT COLOR=red><A NAME="ref_1728_7">Txt</A></FONT> : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1409_20">Str</A>'Length);
--      <FONT COLOR=red><A NAME="ref_1729_7">Cnt</A></FONT> : Natural;
-+      <FONT COLOR=red><A NAME="ref_1694_7">N</A></FONT>   : Integer := <A HREF="terminal_interface-curses__ads.htm#ref_1416_20">Len</A>;
-+      <FONT COLOR=red><A NAME="ref_1695_7">Txt</A></FONT> : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1415_20">Str</A>'Length);
-+      <FONT COLOR=red><A NAME="ref_1696_7">Cnt</A></FONT> : Natural;
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1727_7">N</A> &lt; 0 <b>then</b>
--         <A HREF="terminal_interface-curses__adb.htm#ref_1727_7">N</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1409_20">Str</A>'Length;
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1694_7">N</A> &lt; 0 <b>then</b>
-+         <A HREF="terminal_interface-curses__adb.htm#ref_1694_7">N</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1415_20">Str</A>'Length;
-       <b>end</b> <b>if</b>;
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1727_7">N</A> &gt; <A HREF="terminal_interface-curses__ads.htm#ref_1409_20">Str</A>'Length <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1694_7">N</A> &gt; <A HREF="terminal_interface-curses__ads.htm#ref_1415_20">Str</A>'Length <b>then</b>
-          <b>raise</b> Constraint_Error;
-       <b>end</b> <b>if</b>;
--      <A HREF="terminal_interface-curses__adb.htm#ref_1728_7">Txt</A> (0) := <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.char'First;
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1722_16">Winnstr</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1408_20">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1728_7">Txt</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1727_7">N</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <A HREF="terminal_interface-curses__adb.htm#ref_1695_7">Txt</A> (0) := <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.char'First;
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1689_16">Winnstr</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1414_20">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1695_7">Txt</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1694_7">N</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--      To_Ada (<A HREF="terminal_interface-curses__adb.htm#ref_1728_7">Txt</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1409_20">Str</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1729_7">Cnt</A>, True);
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1729_7">Cnt</A> &lt; <A HREF="terminal_interface-curses__ads.htm#ref_1409_20">Str</A>'Length <b>then</b>
--         <A HREF="terminal_interface-curses__ads.htm#ref_1409_20">Str</A> ((<A HREF="terminal_interface-curses__ads.htm#ref_1409_20">Str</A>'First + <A HREF="terminal_interface-curses__adb.htm#ref_1729_7">Cnt</A>) .. <A HREF="terminal_interface-curses__ads.htm#ref_1409_20">Str</A>'Last) := (<b>others</b> =&gt; ' ');
-+      To_Ada (<A HREF="terminal_interface-curses__adb.htm#ref_1695_7">Txt</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1415_20">Str</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1696_7">Cnt</A>, True);
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1696_7">Cnt</A> &lt; <A HREF="terminal_interface-curses__ads.htm#ref_1415_20">Str</A>'Length <b>then</b>
-+         <A HREF="terminal_interface-curses__ads.htm#ref_1415_20">Str</A> ((<A HREF="terminal_interface-curses__ads.htm#ref_1415_20">Str</A>'First + <A HREF="terminal_interface-curses__adb.htm#ref_1696_7">Cnt</A>) .. <A HREF="terminal_interface-curses__ads.htm#ref_1415_20">Str</A>'Last) := (<b>others</b> =&gt; ' ');
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1408_14">Peek</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1414_14">Peek</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1747_14" HREF="terminal_interface-curses__ads.htm#ref_1417_14">Peek</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1748_7" HREF="terminal_interface-curses__ads.htm#ref_1417_20">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_1749_7" HREF="terminal_interface-curses__ads.htm#ref_1418_20">Line</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1750_7" HREF="terminal_interface-curses__ads.htm#ref_1419_20">Column</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1751_7" HREF="terminal_interface-curses__ads.htm#ref_1420_20">Str</A></FONT>    : <b>out</b> String;
--      <FONT COLOR=red><A NAME="ref_1752_7" HREF="terminal_interface-curses__ads.htm#ref_1421_20">Len</A></FONT>    : <b>in</b>  Integer := -1)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1714_14" HREF="terminal_interface-curses__ads.htm#ref_1423_14">Peek</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1715_7" HREF="terminal_interface-curses__ads.htm#ref_1423_20">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1716_7" HREF="terminal_interface-curses__ads.htm#ref_1424_20">Line</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1717_7" HREF="terminal_interface-curses__ads.htm#ref_1425_20">Column</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1718_7" HREF="terminal_interface-curses__ads.htm#ref_1426_20">Str</A></FONT>    : <b>out</b> String;
-+      <FONT COLOR=red><A NAME="ref_1719_7" HREF="terminal_interface-curses__ads.htm#ref_1427_20">Len</A></FONT>    : <b>in</b>  Integer := -1)
-    <b>is</b>
-    <b>begin</b>
--      <A HREF="terminal_interface-curses__ads.htm#ref_505_14">Move_Cursor</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1417_20">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1418_20">Line</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1419_20">Column</A>);
--      <A HREF="terminal_interface-curses__ads.htm#ref_1408_14">Peek</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1417_20">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1420_20">Str</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1421_20">Len</A>);
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1417_14">Peek</A>;
-+      <A HREF="terminal_interface-curses__ads.htm#ref_511_14">Move_Cursor</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1423_20">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1424_20">Line</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1425_20">Column</A>);
-+      <A HREF="terminal_interface-curses__ads.htm#ref_1414_14">Peek</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1423_20">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1426_20">Str</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1427_20">Len</A>);
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1423_14">Peek</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1759_14" HREF="terminal_interface-curses__ads.htm#ref_1432_14">Peek</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1760_7" HREF="terminal_interface-curses__ads.htm#ref_1432_20">Win</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_1761_7" HREF="terminal_interface-curses__ads.htm#ref_1433_20">Str</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Attributed_String</A>;
--      <FONT COLOR=red><A NAME="ref_1762_7" HREF="terminal_interface-curses__ads.htm#ref_1434_20">Len</A></FONT> : <b>in</b>  Integer := -1)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1726_14" HREF="terminal_interface-curses__ads.htm#ref_1438_14">Peek</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1727_7" HREF="terminal_interface-curses__ads.htm#ref_1438_20">Win</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1728_7" HREF="terminal_interface-curses__ads.htm#ref_1439_20">Str</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Attributed_String</A>;
-+      <FONT COLOR=red><A NAME="ref_1729_7" HREF="terminal_interface-curses__ads.htm#ref_1440_20">Len</A></FONT> : <b>in</b>  Integer := -1)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1764_16">Winchnstr</A></FONT> (<FONT COLOR=red><A NAME="ref_1764_27" HREF="terminal_interface-curses__adb.htm#ref_1764_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                          <FONT COLOR=red><A NAME="ref_1765_27" HREF="terminal_interface-curses__adb.htm#ref_1764_16">Str</A></FONT> : <A HREF="terminal_interface-curses__adb.htm#ref_59_9">chtype_array</A>;             <FONT COLOR=green><EM>-- out</EM></FONT>
--                          <FONT COLOR=red><A NAME="ref_1766_27" HREF="terminal_interface-curses__adb.htm#ref_1764_16">Len</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1731_16">Winchnstr</A></FONT> (<FONT COLOR=red><A NAME="ref_1731_27" HREF="terminal_interface-curses__adb.htm#ref_1731_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                          <FONT COLOR=red><A NAME="ref_1732_27" HREF="terminal_interface-curses__adb.htm#ref_1731_16">Str</A></FONT> : <A HREF="terminal_interface-curses__adb.htm#ref_57_9">chtype_array</A>;             <FONT COLOR=green><EM>-- out</EM></FONT>
-+                          <FONT COLOR=red><A NAME="ref_1733_27" HREF="terminal_interface-curses__adb.htm#ref_1731_16">Len</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Winchnstr, "winchnstr");
- 
--      <FONT COLOR=red><A NAME="ref_1769_7">N</A></FONT>   : Integer := <A HREF="terminal_interface-curses__ads.htm#ref_1434_20">Len</A>;
--      <FONT COLOR=red><A NAME="ref_1770_7">Txt</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__adb.htm#ref_59_9">chtype_array</A> (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1433_20">Str</A>'Length)
-+      <FONT COLOR=red><A NAME="ref_1736_7">N</A></FONT>   : Integer := <A HREF="terminal_interface-curses__ads.htm#ref_1440_20">Len</A>;
-+      <FONT COLOR=red><A NAME="ref_1737_7">Txt</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__adb.htm#ref_57_9">chtype_array</A> (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1439_20">Str</A>'Length)
-           := (0 =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>);
--      <FONT COLOR=red><A NAME="ref_1772_7">Cnt</A></FONT> : Natural := 0;
-+      <FONT COLOR=red><A NAME="ref_1739_7">Cnt</A></FONT> : Natural := 0;
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1769_7">N</A> &lt; 0 <b>then</b>
--         <A HREF="terminal_interface-curses__adb.htm#ref_1769_7">N</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1433_20">Str</A>'Length;
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1736_7">N</A> &lt; 0 <b>then</b>
-+         <A HREF="terminal_interface-curses__adb.htm#ref_1736_7">N</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1439_20">Str</A>'Length;
-       <b>end</b> <b>if</b>;
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1769_7">N</A> &gt; <A HREF="terminal_interface-curses__ads.htm#ref_1433_20">Str</A>'Length <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1736_7">N</A> &gt; <A HREF="terminal_interface-curses__ads.htm#ref_1439_20">Str</A>'Length <b>then</b>
-          <b>raise</b> Constraint_Error;
-       <b>end</b> <b>if</b>;
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1764_16">Winchnstr</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1432_20">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1770_7">Txt</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1769_7">N</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1731_16">Winchnstr</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1438_20">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1737_7">Txt</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1736_7">N</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--      <b>for</b> <FONT COLOR=red><A NAME="ref_1783_11">To</A></FONT> <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1433_20">Str</A>'<b>Range</b> <b>loop</b>
--         <b>exit</b> <b>when</b> <A HREF="terminal_interface-curses__adb.htm#ref_1770_7">Txt</A> (size_t (<A HREF="terminal_interface-curses__adb.htm#ref_1772_7">Cnt</A>)) = <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
--         <A HREF="terminal_interface-curses__ads.htm#ref_1433_20">Str</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1783_11">To</A>) := <A HREF="terminal_interface-curses__adb.htm#ref_1770_7">Txt</A> (size_t (<A HREF="terminal_interface-curses__adb.htm#ref_1772_7">Cnt</A>));
--         <A HREF="terminal_interface-curses__adb.htm#ref_1772_7">Cnt</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1772_7">Cnt</A> + 1;
-+      <b>for</b> <FONT COLOR=red><A NAME="ref_1750_11">To</A></FONT> <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1439_20">Str</A>'<b>Range</b> <b>loop</b>
-+         <b>exit</b> <b>when</b> <A HREF="terminal_interface-curses__adb.htm#ref_1737_7">Txt</A> (size_t (<A HREF="terminal_interface-curses__adb.htm#ref_1739_7">Cnt</A>)) = <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+         <A HREF="terminal_interface-curses__ads.htm#ref_1439_20">Str</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1750_11">To</A>) := <A HREF="terminal_interface-curses__adb.htm#ref_1737_7">Txt</A> (size_t (<A HREF="terminal_interface-curses__adb.htm#ref_1739_7">Cnt</A>));
-+         <A HREF="terminal_interface-curses__adb.htm#ref_1739_7">Cnt</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1739_7">Cnt</A> + 1;
-       <b>end</b> <b>loop</b>;
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1772_7">Cnt</A> &lt; <A HREF="terminal_interface-curses__ads.htm#ref_1433_20">Str</A>'Length <b>then</b>
--         <A HREF="terminal_interface-curses__ads.htm#ref_1433_20">Str</A> ((<A HREF="terminal_interface-curses__ads.htm#ref_1433_20">Str</A>'First + <A HREF="terminal_interface-curses__adb.htm#ref_1772_7">Cnt</A>) .. <A HREF="terminal_interface-curses__ads.htm#ref_1433_20">Str</A>'Last) :=
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1739_7">Cnt</A> &lt; <A HREF="terminal_interface-curses__ads.htm#ref_1439_20">Str</A>'Length <b>then</b>
-+         <A HREF="terminal_interface-curses__ads.htm#ref_1439_20">Str</A> ((<A HREF="terminal_interface-curses__ads.htm#ref_1439_20">Str</A>'First + <A HREF="terminal_interface-curses__adb.htm#ref_1739_7">Cnt</A>) .. <A HREF="terminal_interface-curses__ads.htm#ref_1439_20">Str</A>'Last) :=
-            (<b>others</b> =&gt; (<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A> =&gt; ' ',
-                        <A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First,
-                        <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>));
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1432_14">Peek</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1438_14">Peek</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1796_14" HREF="terminal_interface-curses__ads.htm#ref_1441_14">Peek</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1797_7" HREF="terminal_interface-curses__ads.htm#ref_1441_20">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_1798_7" HREF="terminal_interface-curses__ads.htm#ref_1442_20">Line</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1799_7" HREF="terminal_interface-curses__ads.htm#ref_1443_20">Column</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1800_7" HREF="terminal_interface-curses__ads.htm#ref_1444_20">Str</A></FONT>    : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Attributed_String</A>;
--      <FONT COLOR=red><A NAME="ref_1801_7" HREF="terminal_interface-curses__ads.htm#ref_1445_20">Len</A></FONT>    : <b>in</b> Integer := -1)
--   <b>is</b>
--   <b>begin</b>
--      <A HREF="terminal_interface-curses__ads.htm#ref_505_14">Move_Cursor</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1441_20">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1442_20">Line</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1443_20">Column</A>);
--      <A HREF="terminal_interface-curses__ads.htm#ref_1432_14">Peek</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1441_20">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1444_20">Str</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1445_20">Len</A>);
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1441_14">Peek</A>;
--<FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1808_14" HREF="terminal_interface-curses__ads.htm#ref_1457_14">Get</A></FONT> (<FONT COLOR=red><A NAME="ref_1808_19" HREF="terminal_interface-curses__ads.htm#ref_1457_19">Win</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--                  <FONT COLOR=red><A NAME="ref_1809_19" HREF="terminal_interface-curses__ads.htm#ref_1458_19">Str</A></FONT> : <b>out</b> String;
--                  <FONT COLOR=red><A NAME="ref_1810_19" HREF="terminal_interface-curses__ads.htm#ref_1459_19">Len</A></FONT> : <b>in</b>  Integer := -1)
--   <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1812_16">Wgetnstr</A></FONT> (<FONT COLOR=red><A NAME="ref_1812_26" HREF="terminal_interface-curses__adb.htm#ref_1812_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                         <FONT COLOR=red><A NAME="ref_1813_26" HREF="terminal_interface-curses__adb.htm#ref_1812_16">Str</A></FONT> : char_array;
--                         <FONT COLOR=red><A NAME="ref_1814_26" HREF="terminal_interface-curses__adb.htm#ref_1812_16">Len</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1763_14" HREF="terminal_interface-curses__ads.htm#ref_1447_14">Peek</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1764_7" HREF="terminal_interface-curses__ads.htm#ref_1447_20">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1765_7" HREF="terminal_interface-curses__ads.htm#ref_1448_20">Line</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1766_7" HREF="terminal_interface-curses__ads.htm#ref_1449_20">Column</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1767_7" HREF="terminal_interface-curses__ads.htm#ref_1450_20">Str</A></FONT>    : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Attributed_String</A>;
-+      <FONT COLOR=red><A NAME="ref_1768_7" HREF="terminal_interface-curses__ads.htm#ref_1451_20">Len</A></FONT>    : <b>in</b> Integer := -1)
-+   <b>is</b>
-+   <b>begin</b>
-+      <A HREF="terminal_interface-curses__ads.htm#ref_511_14">Move_Cursor</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1447_20">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1448_20">Line</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1449_20">Column</A>);
-+      <A HREF="terminal_interface-curses__ads.htm#ref_1438_14">Peek</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1447_20">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1450_20">Str</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1451_20">Len</A>);
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1447_14">Peek</A>;
-+<FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1775_14" HREF="terminal_interface-curses__ads.htm#ref_1463_14">Get</A></FONT> (<FONT COLOR=red><A NAME="ref_1775_19" HREF="terminal_interface-curses__ads.htm#ref_1463_19">Win</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                  <FONT COLOR=red><A NAME="ref_1776_19" HREF="terminal_interface-curses__ads.htm#ref_1464_19">Str</A></FONT> : <b>out</b> String;
-+                  <FONT COLOR=red><A NAME="ref_1777_19" HREF="terminal_interface-curses__ads.htm#ref_1465_19">Len</A></FONT> : <b>in</b>  Integer := -1)
-+   <b>is</b>
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1779_16">Wgetnstr</A></FONT> (<FONT COLOR=red><A NAME="ref_1779_26" HREF="terminal_interface-curses__adb.htm#ref_1779_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                         <FONT COLOR=red><A NAME="ref_1780_26" HREF="terminal_interface-curses__adb.htm#ref_1779_16">Str</A></FONT> : char_array;
-+                         <FONT COLOR=red><A NAME="ref_1781_26" HREF="terminal_interface-curses__adb.htm#ref_1779_16">Len</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Wgetnstr, "wgetnstr");
- 
--      <FONT COLOR=red><A NAME="ref_1817_7">N</A></FONT>   : Integer := <A HREF="terminal_interface-curses__ads.htm#ref_1459_19">Len</A>;
--      <FONT COLOR=red><A NAME="ref_1818_7">Txt</A></FONT> : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1458_19">Str</A>'Length);
--      <FONT COLOR=red><A NAME="ref_1819_7">Cnt</A></FONT> : Natural;
-+      <FONT COLOR=red><A NAME="ref_1784_7">N</A></FONT>   : Integer := <A HREF="terminal_interface-curses__ads.htm#ref_1465_19">Len</A>;
-+      <FONT COLOR=red><A NAME="ref_1785_7">Txt</A></FONT> : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1464_19">Str</A>'Length);
-+      <FONT COLOR=red><A NAME="ref_1786_7">Cnt</A></FONT> : Natural;
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1817_7">N</A> &lt; 0 <b>then</b>
--         <A HREF="terminal_interface-curses__adb.htm#ref_1817_7">N</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1458_19">Str</A>'Length;
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1784_7">N</A> &lt; 0 <b>then</b>
-+         <A HREF="terminal_interface-curses__adb.htm#ref_1784_7">N</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1464_19">Str</A>'Length;
-       <b>end</b> <b>if</b>;
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1817_7">N</A> &gt; <A HREF="terminal_interface-curses__ads.htm#ref_1458_19">Str</A>'Length <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1784_7">N</A> &gt; <A HREF="terminal_interface-curses__ads.htm#ref_1464_19">Str</A>'Length <b>then</b>
-          <b>raise</b> Constraint_Error;
-       <b>end</b> <b>if</b>;
--      <A HREF="terminal_interface-curses__adb.htm#ref_1818_7">Txt</A> (0) := <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.char'First;
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1812_16">Wgetnstr</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1457_19">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1818_7">Txt</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1817_7">N</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <A HREF="terminal_interface-curses__adb.htm#ref_1785_7">Txt</A> (0) := <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.char'First;
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1779_16">Wgetnstr</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1463_19">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1785_7">Txt</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1784_7">N</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--      To_Ada (<A HREF="terminal_interface-curses__adb.htm#ref_1818_7">Txt</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1458_19">Str</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1819_7">Cnt</A>, True);
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1819_7">Cnt</A> &lt; <A HREF="terminal_interface-curses__ads.htm#ref_1458_19">Str</A>'Length <b>then</b>
--         <A HREF="terminal_interface-curses__ads.htm#ref_1458_19">Str</A> ((<A HREF="terminal_interface-curses__ads.htm#ref_1458_19">Str</A>'First + <A HREF="terminal_interface-curses__adb.htm#ref_1819_7">Cnt</A>) .. <A HREF="terminal_interface-curses__ads.htm#ref_1458_19">Str</A>'Last) := (<b>others</b> =&gt; ' ');
-+      To_Ada (<A HREF="terminal_interface-curses__adb.htm#ref_1785_7">Txt</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1464_19">Str</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1786_7">Cnt</A>, True);
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1786_7">Cnt</A> &lt; <A HREF="terminal_interface-curses__ads.htm#ref_1464_19">Str</A>'Length <b>then</b>
-+         <A HREF="terminal_interface-curses__ads.htm#ref_1464_19">Str</A> ((<A HREF="terminal_interface-curses__ads.htm#ref_1464_19">Str</A>'First + <A HREF="terminal_interface-curses__adb.htm#ref_1786_7">Cnt</A>) .. <A HREF="terminal_interface-curses__ads.htm#ref_1464_19">Str</A>'Last) := (<b>others</b> =&gt; ' ');
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1457_14">Get</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1463_14">Get</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1837_14" HREF="terminal_interface-curses__ads.htm#ref_1468_14">Get</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1838_7" HREF="terminal_interface-curses__ads.htm#ref_1468_19">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_1839_7" HREF="terminal_interface-curses__ads.htm#ref_1469_19">Line</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1840_7" HREF="terminal_interface-curses__ads.htm#ref_1470_19">Column</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1841_7" HREF="terminal_interface-curses__ads.htm#ref_1471_19">Str</A></FONT>    : <b>out</b> String;
--      <FONT COLOR=red><A NAME="ref_1842_7" HREF="terminal_interface-curses__ads.htm#ref_1472_19">Len</A></FONT>    : <b>in</b>  Integer := -1)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1804_14" HREF="terminal_interface-curses__ads.htm#ref_1474_14">Get</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1805_7" HREF="terminal_interface-curses__ads.htm#ref_1474_19">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1806_7" HREF="terminal_interface-curses__ads.htm#ref_1475_19">Line</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1807_7" HREF="terminal_interface-curses__ads.htm#ref_1476_19">Column</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1808_7" HREF="terminal_interface-curses__ads.htm#ref_1477_19">Str</A></FONT>    : <b>out</b> String;
-+      <FONT COLOR=red><A NAME="ref_1809_7" HREF="terminal_interface-curses__ads.htm#ref_1478_19">Len</A></FONT>    : <b>in</b>  Integer := -1)
-    <b>is</b>
-    <b>begin</b>
--      <A HREF="terminal_interface-curses__ads.htm#ref_505_14">Move_Cursor</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1468_19">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1469_19">Line</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1470_19">Column</A>);
--      <A HREF="terminal_interface-curses__ads.htm#ref_1457_14">Get</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1468_19">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1471_19">Str</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1472_19">Len</A>);
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1468_14">Get</A>;
-+      <A HREF="terminal_interface-curses__ads.htm#ref_511_14">Move_Cursor</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1474_19">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1475_19">Line</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1476_19">Column</A>);
-+      <A HREF="terminal_interface-curses__ads.htm#ref_1463_14">Get</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1474_19">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1477_19">Str</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1478_19">Len</A>);
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1474_14">Get</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1849_14" HREF="terminal_interface-curses__ads.htm#ref_1493_14">Init_Soft_Label_Keys</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1850_7" HREF="terminal_interface-curses__ads.htm#ref_1494_7">Format</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1485_9">Soft_Label_Key_Format</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1485_35">Three_Two_Three</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1816_14" HREF="terminal_interface-curses__ads.htm#ref_1499_14">Init_Soft_Label_Keys</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1817_7" HREF="terminal_interface-curses__ads.htm#ref_1500_7">Format</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1491_9">Soft_Label_Key_Format</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1491_35">Three_Two_Three</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1852_16">Slk_Init</A></FONT> (<FONT COLOR=red><A NAME="ref_1852_26" HREF="terminal_interface-curses__adb.htm#ref_1852_16">Fmt</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1819_16">Slk_Init</A></FONT> (<FONT COLOR=red><A NAME="ref_1819_26" HREF="terminal_interface-curses__adb.htm#ref_1819_16">Fmt</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Slk_Init, "slk_init");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1852_16">Slk_Init</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1485_9">Soft_Label_Key_Format</A>'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1494_7">Format</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1819_16">Slk_Init</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1491_9">Soft_Label_Key_Format</A>'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1500_7">Format</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1493_14">Init_Soft_Label_Keys</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1499_14">Init_Soft_Label_Keys</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1860_14" HREF="terminal_interface-curses__ads.htm#ref_1499_14">Set_Soft_Label_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_1860_34" HREF="terminal_interface-curses__ads.htm#ref_1499_34">Label</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1489_9">Label_Number</A>;
--                                 <FONT COLOR=red><A NAME="ref_1861_34" HREF="terminal_interface-curses__ads.htm#ref_1500_34">Text</A></FONT>  : <b>in</b> String;
--                                 <FONT COLOR=red><A NAME="ref_1862_34" HREF="terminal_interface-curses__ads.htm#ref_1501_34">Fmt</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1490_9">Label_Justification</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1490_33">Left</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1827_14" HREF="terminal_interface-curses__ads.htm#ref_1505_14">Set_Soft_Label_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_1827_34" HREF="terminal_interface-curses__ads.htm#ref_1505_34">Label</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1495_9">Label_Number</A>;
-+                                 <FONT COLOR=red><A NAME="ref_1828_34" HREF="terminal_interface-curses__ads.htm#ref_1506_34">Text</A></FONT>  : <b>in</b> String;
-+                                 <FONT COLOR=red><A NAME="ref_1829_34" HREF="terminal_interface-curses__ads.htm#ref_1507_34">Fmt</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1496_9">Label_Justification</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1496_33">Left</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1864_16">Slk_Set</A></FONT> (<FONT COLOR=red><A NAME="ref_1864_25" HREF="terminal_interface-curses__adb.htm#ref_1864_16">Label</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--                        <FONT COLOR=red><A NAME="ref_1865_25" HREF="terminal_interface-curses__adb.htm#ref_1864_16">Txt</A></FONT>   : char_array;
--                        <FONT COLOR=red><A NAME="ref_1866_25" HREF="terminal_interface-curses__adb.htm#ref_1864_16">Fmt</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1831_16">Slk_Set</A></FONT> (<FONT COLOR=red><A NAME="ref_1831_25" HREF="terminal_interface-curses__adb.htm#ref_1831_16">Label</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+                        <FONT COLOR=red><A NAME="ref_1832_25" HREF="terminal_interface-curses__adb.htm#ref_1831_16">Txt</A></FONT>   : char_array;
-+                        <FONT COLOR=red><A NAME="ref_1833_25" HREF="terminal_interface-curses__adb.htm#ref_1831_16">Fmt</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Slk_Set, "slk_set");
- 
--      <FONT COLOR=red><A NAME="ref_1869_7">Txt</A></FONT> : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1500_34">Text</A>'Length);
--      <FONT COLOR=red><A NAME="ref_1870_7">Len</A></FONT> : size_t;
-+      <FONT COLOR=red><A NAME="ref_1836_7">Txt</A></FONT> : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1506_34">Text</A>'Length);
-+      <FONT COLOR=red><A NAME="ref_1837_7">Len</A></FONT> : size_t;
-    <b>begin</b>
--      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1500_34">Text</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1869_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1870_7">Len</A>);
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1864_16">Slk_Set</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1499_34">Label</A>), <A HREF="terminal_interface-curses__adb.htm#ref_1869_7">Txt</A>,
--                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1490_9">Label_Justification</A>'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1501_34">Fmt</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1506_34">Text</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1836_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1837_7">Len</A>);
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1831_16">Slk_Set</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1505_34">Label</A>), <A HREF="terminal_interface-curses__adb.htm#ref_1836_7">Txt</A>,
-+                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1496_9">Label_Justification</A>'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1507_34">Fmt</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1499_14">Set_Soft_Label_Key</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1505_14">Set_Soft_Label_Key</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1879_14" HREF="terminal_interface-curses__ads.htm#ref_1506_14">Refresh_Soft_Label_Keys</A></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1846_14" HREF="terminal_interface-curses__ads.htm#ref_1512_14">Refresh_Soft_Label_Keys</A></FONT>
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1881_16">Slk_Refresh</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1848_16">Slk_Refresh</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Slk_Refresh, "slk_refresh");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1881_16">Slk_Refresh</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1848_16">Slk_Refresh</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1506_14">Refresh_Soft_Label_Keys</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1512_14">Refresh_Soft_Label_Keys</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1889_14" HREF="terminal_interface-curses__ads.htm#ref_1511_14">Refresh_Soft_Label_Keys_Without_Update</A></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1856_14" HREF="terminal_interface-curses__ads.htm#ref_1517_14">Refresh_Soft_Label_Keys_Without_Update</A></FONT>
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1891_16">Slk_Noutrefresh</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1858_16">Slk_Noutrefresh</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Slk_Noutrefresh, "slk_noutrefresh");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1891_16">Slk_Noutrefresh</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1858_16">Slk_Noutrefresh</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1511_14">Refresh_Soft_Label_Keys_Without_Update</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1517_14">Refresh_Soft_Label_Keys_Without_Update</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1899_14" HREF="terminal_interface-curses__ads.htm#ref_1516_14">Get_Soft_Label_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_1899_34" HREF="terminal_interface-curses__ads.htm#ref_1516_34">Label</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1489_9">Label_Number</A>;
--                                 <FONT COLOR=red><A NAME="ref_1900_34" HREF="terminal_interface-curses__ads.htm#ref_1517_34">Text</A></FONT>  : <b>out</b> String)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1866_14" HREF="terminal_interface-curses__ads.htm#ref_1522_14">Get_Soft_Label_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_1866_34" HREF="terminal_interface-curses__ads.htm#ref_1522_34">Label</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1495_9">Label_Number</A>;
-+                                 <FONT COLOR=red><A NAME="ref_1867_34" HREF="terminal_interface-curses__ads.htm#ref_1523_34">Text</A></FONT>  : <b>out</b> String)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1902_16">Slk_Label</A></FONT> (<FONT COLOR=red><A NAME="ref_1902_27" HREF="terminal_interface-curses__adb.htm#ref_1902_16">Label</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> chars_ptr;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1869_16">Slk_Label</A></FONT> (<FONT COLOR=red><A NAME="ref_1869_27" HREF="terminal_interface-curses__adb.htm#ref_1869_16">Label</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> chars_ptr;
-       <b>pragma</b> Import (C, Slk_Label, "slk_label");
-    <b>begin</b>
--      <A HREF="terminal_interface-curses-aux__ads.htm#ref_116_14">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1902_16">Slk_Label</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1516_34">Label</A>)), <A HREF="terminal_interface-curses__ads.htm#ref_1517_34">Text</A>);
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1516_14">Get_Soft_Label_Key</A>;
-+      <A HREF="terminal_interface-curses-aux__ads.htm#ref_116_14">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1869_16">Slk_Label</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1522_34">Label</A>)), <A HREF="terminal_interface-curses__ads.htm#ref_1523_34">Text</A>);
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1522_14">Get_Soft_Label_Key</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_1908_13" HREF="terminal_interface-curses__ads.htm#ref_1521_13">Get_Soft_Label_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_1908_33" HREF="terminal_interface-curses__ads.htm#ref_1521_33">Label</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1489_9">Label_Number</A>) <b>return</b> String
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1875_13" HREF="terminal_interface-curses__ads.htm#ref_1527_13">Get_Soft_Label_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_1875_33" HREF="terminal_interface-curses__ads.htm#ref_1527_33">Label</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1495_9">Label_Number</A>) <b>return</b> String
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1910_16">Slk_Label</A></FONT> (<FONT COLOR=red><A NAME="ref_1910_27" HREF="terminal_interface-curses__adb.htm#ref_1910_16">Label</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> chars_ptr;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1877_16">Slk_Label</A></FONT> (<FONT COLOR=red><A NAME="ref_1877_27" HREF="terminal_interface-curses__adb.htm#ref_1877_16">Label</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> chars_ptr;
-       <b>pragma</b> Import (C, Slk_Label, "slk_label");
-    <b>begin</b>
--      <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_121_13">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1910_16">Slk_Label</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1521_33">Label</A>)));
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1521_13">Get_Soft_Label_Key</A>;
-+      <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_121_13">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1877_16">Slk_Label</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1527_33">Label</A>)));
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1527_13">Get_Soft_Label_Key</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1916_14" HREF="terminal_interface-curses__ads.htm#ref_1527_14">Clear_Soft_Label_Keys</A></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1883_14" HREF="terminal_interface-curses__ads.htm#ref_1533_14">Clear_Soft_Label_Keys</A></FONT>
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1918_16">Slk_Clear</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1885_16">Slk_Clear</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Slk_Clear, "slk_clear");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1918_16">Slk_Clear</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1885_16">Slk_Clear</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1527_14">Clear_Soft_Label_Keys</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1533_14">Clear_Soft_Label_Keys</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1926_14" HREF="terminal_interface-curses__ads.htm#ref_1532_14">Restore_Soft_Label_Keys</A></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1893_14" HREF="terminal_interface-curses__ads.htm#ref_1538_14">Restore_Soft_Label_Keys</A></FONT>
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1928_16">Slk_Restore</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1895_16">Slk_Restore</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Slk_Restore, "slk_restore");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1928_16">Slk_Restore</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1895_16">Slk_Restore</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1532_14">Restore_Soft_Label_Keys</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1538_14">Restore_Soft_Label_Keys</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1936_14" HREF="terminal_interface-curses__ads.htm#ref_1537_14">Touch_Soft_Label_Keys</A></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1903_14" HREF="terminal_interface-curses__ads.htm#ref_1543_14">Touch_Soft_Label_Keys</A></FONT>
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1938_16">Slk_Touch</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1905_16">Slk_Touch</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Slk_Touch, "slk_touch");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1938_16">Slk_Touch</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1905_16">Slk_Touch</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1537_14">Touch_Soft_Label_Keys</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1543_14">Touch_Soft_Label_Keys</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1946_14" HREF="terminal_interface-curses__ads.htm#ref_1542_14">Switch_Soft_Label_Key_Attributes</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1947_7" HREF="terminal_interface-curses__ads.htm#ref_1543_7">Attr</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>;
--      <FONT COLOR=red><A NAME="ref_1948_7" HREF="terminal_interface-curses__ads.htm#ref_1544_7">On</A></FONT>   : <b>in</b> Boolean := True)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1913_14" HREF="terminal_interface-curses__ads.htm#ref_1548_14">Switch_Soft_Label_Key_Attributes</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1914_7" HREF="terminal_interface-curses__ads.htm#ref_1549_7">Attr</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>;
-+      <FONT COLOR=red><A NAME="ref_1915_7" HREF="terminal_interface-curses__ads.htm#ref_1550_7">On</A></FONT>   : <b>in</b> Boolean := True)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1950_16">Slk_Attron</A></FONT> (<FONT COLOR=red><A NAME="ref_1950_28" HREF="terminal_interface-curses__adb.htm#ref_1950_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1917_16">Slk_Attron</A></FONT> (<FONT COLOR=red><A NAME="ref_1917_28" HREF="terminal_interface-curses__adb.htm#ref_1917_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Slk_Attron, "slk_attron");
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1952_16">Slk_Attroff</A></FONT> (<FONT COLOR=red><A NAME="ref_1952_29" HREF="terminal_interface-curses__adb.htm#ref_1952_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1919_16">Slk_Attroff</A></FONT> (<FONT COLOR=red><A NAME="ref_1919_29" HREF="terminal_interface-curses__adb.htm#ref_1919_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Slk_Attroff, "slk_attroff");
- 
--      <FONT COLOR=red><A NAME="ref_1955_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--      <FONT COLOR=red><A NAME="ref_1956_7">Ch</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := (<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; Character'First,
--                                              <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>  =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_1543_7">Attr</A>,
-+      <FONT COLOR=red><A NAME="ref_1922_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <FONT COLOR=red><A NAME="ref_1923_7">Ch</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := (<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; Character'First,
-+                                              <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>  =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_1549_7">Attr</A>,
-                                               <A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First);
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_1544_7">On</A> <b>then</b>
--         <A HREF="terminal_interface-curses__adb.htm#ref_1955_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1950_16">Slk_Attron</A>  (<A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1956_7">Ch</A>));
-+      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_1550_7">On</A> <b>then</b>
-+         <A HREF="terminal_interface-curses__adb.htm#ref_1922_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1917_16">Slk_Attron</A>  (<A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1923_7">Ch</A>));
-       <b>else</b>
--         <A HREF="terminal_interface-curses__adb.htm#ref_1955_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1952_16">Slk_Attroff</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1956_7">Ch</A>));
-+         <A HREF="terminal_interface-curses__adb.htm#ref_1922_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1919_16">Slk_Attroff</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1923_7">Ch</A>));
-       <b>end</b> <b>if</b>;
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1955_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1922_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1542_14">Switch_Soft_Label_Key_Attributes</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1548_14">Switch_Soft_Label_Key_Attributes</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1970_14" HREF="terminal_interface-curses__ads.htm#ref_1550_14">Set_Soft_Label_Key_Attributes</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_1971_7" HREF="terminal_interface-curses__ads.htm#ref_1551_7">Attr</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
--      <FONT COLOR=red><A NAME="ref_1972_7" HREF="terminal_interface-curses__ads.htm#ref_1552_7">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1937_14" HREF="terminal_interface-curses__ads.htm#ref_1556_14">Set_Soft_Label_Key_Attributes</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1938_7" HREF="terminal_interface-curses__ads.htm#ref_1557_7">Attr</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-+      <FONT COLOR=red><A NAME="ref_1939_7" HREF="terminal_interface-curses__ads.htm#ref_1558_7">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1974_16">Slk_Attrset</A></FONT> (<FONT COLOR=red><A NAME="ref_1974_29" HREF="terminal_interface-curses__adb.htm#ref_1974_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1941_16">Slk_Attrset</A></FONT> (<FONT COLOR=red><A NAME="ref_1941_29" HREF="terminal_interface-curses__adb.htm#ref_1941_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Slk_Attrset, "slk_attrset");
- 
--      <FONT COLOR=red><A NAME="ref_1977_7">Ch</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := (<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; Character'First,
--                                             <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>  =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_1551_7">Attr</A>,
--                                             <A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_1552_7">Color</A>);
-+      <FONT COLOR=red><A NAME="ref_1944_7">Ch</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := (<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; Character'First,
-+                                             <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>  =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_1557_7">Attr</A>,
-+                                             <A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_1558_7">Color</A>);
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1974_16">Slk_Attrset</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1977_7">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1941_16">Slk_Attrset</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1944_7">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1550_14">Set_Soft_Label_Key_Attributes</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1556_14">Set_Soft_Label_Key_Attributes</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_1986_13" HREF="terminal_interface-curses__ads.htm#ref_1557_13">Get_Soft_Label_Key_Attributes</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1953_13" HREF="terminal_interface-curses__ads.htm#ref_1563_13">Get_Soft_Label_Key_Attributes</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1988_16">Slk_Attr</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1955_16">Slk_Attr</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-       <b>pragma</b> Import (C, Slk_Attr, "slk_attr");
- 
--      <FONT COLOR=red><A NAME="ref_1991_7">Attr</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1988_16">Slk_Attr</A>;
-+      <FONT COLOR=red><A NAME="ref_1958_7">Attr</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1955_16">Slk_Attr</A>;
-    <b>begin</b>
--      <b>return</b> Chtype_To_AttrChar (<A HREF="terminal_interface-curses__adb.htm#ref_1991_7">Attr</A>).<A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1557_13">Get_Soft_Label_Key_Attributes</A>;
-+      <b>return</b> Chtype_To_AttrChar (<A HREF="terminal_interface-curses__adb.htm#ref_1958_7">Attr</A>).<A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1563_13">Get_Soft_Label_Key_Attributes</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_1996_13" HREF="terminal_interface-curses__ads.htm#ref_1561_13">Get_Soft_Label_Key_Attributes</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1963_13" HREF="terminal_interface-curses__ads.htm#ref_1567_13">Get_Soft_Label_Key_Attributes</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_1998_16">Slk_Attr</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1965_16">Slk_Attr</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-       <b>pragma</b> Import (C, Slk_Attr, "slk_attr");
- 
--      <FONT COLOR=red><A NAME="ref_2001_7">Attr</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1998_16">Slk_Attr</A>;
-+      <FONT COLOR=red><A NAME="ref_1968_7">Attr</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1965_16">Slk_Attr</A>;
-    <b>begin</b>
--      <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">Chtype_To_AttrChar</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2001_7">Attr</A>).<A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1561_13">Get_Soft_Label_Key_Attributes</A>;
-+      <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">Chtype_To_AttrChar</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1968_7">Attr</A>).<A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1567_13">Get_Soft_Label_Key_Attributes</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2006_14" HREF="terminal_interface-curses__ads.htm#ref_1566_14">Set_Soft_Label_Key_Color</A></FONT> (<FONT COLOR=red><A NAME="ref_2006_40" HREF="terminal_interface-curses__ads.htm#ref_1566_40">Pair</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1973_14" HREF="terminal_interface-curses__ads.htm#ref_1572_14">Set_Soft_Label_Key_Color</A></FONT> (<FONT COLOR=red><A NAME="ref_1973_40" HREF="terminal_interface-curses__ads.htm#ref_1572_40">Pair</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2008_16">Slk_Color</A></FONT> (<FONT COLOR=red><A NAME="ref_2008_27" HREF="terminal_interface-curses__adb.htm#ref_2008_16">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1975_16">Slk_Color</A></FONT> (<FONT COLOR=red><A NAME="ref_1975_27" HREF="terminal_interface-curses__adb.htm#ref_1975_16">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Slk_Color, "slk_color");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2008_16">Slk_Color</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1566_40">Pair</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1975_16">Slk_Color</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1572_40">Pair</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1566_14">Set_Soft_Label_Key_Color</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1572_14">Set_Soft_Label_Key_Color</A>;
- 
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2017_14" HREF="terminal_interface-curses__ads.htm#ref_1580_14">Enable_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_2017_26" HREF="terminal_interface-curses__ads.htm#ref_1580_26">Key</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>;
--                         <FONT COLOR=red><A NAME="ref_2018_26" HREF="terminal_interface-curses__ads.htm#ref_1581_26">Enable</A></FONT> : <b>in</b> Boolean := True)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1984_14" HREF="terminal_interface-curses__ads.htm#ref_1586_14">Enable_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_1984_26" HREF="terminal_interface-curses__ads.htm#ref_1586_26">Key</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>;
-+                         <FONT COLOR=red><A NAME="ref_1985_26" HREF="terminal_interface-curses__ads.htm#ref_1587_26">Enable</A></FONT> : <b>in</b> Boolean := True)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2020_16">Keyok</A></FONT> (<FONT COLOR=red><A NAME="ref_2020_23" HREF="terminal_interface-curses__adb.htm#ref_2020_16">Keycode</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--                      <FONT COLOR=red><A NAME="ref_2021_23" HREF="terminal_interface-curses__adb.htm#ref_2020_16">On_Off</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_1987_16">Keyok</A></FONT> (<FONT COLOR=red><A NAME="ref_1987_23" HREF="terminal_interface-curses__adb.htm#ref_1987_16">Keycode</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+                      <FONT COLOR=red><A NAME="ref_1988_23" HREF="terminal_interface-curses__adb.htm#ref_1987_16">On_Off</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Keyok, "keyok");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2020_16">Keyok</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1580_26">Key</A>), <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1581_26">Enable</A>)))
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1987_16">Keyok</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1586_26">Key</A>), <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1587_26">Enable</A>)))
-         = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1580_14">Enable_Key</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1586_14">Enable_Key</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2030_14" HREF="terminal_interface-curses__ads.htm#ref_1590_14">Define_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_2030_26" HREF="terminal_interface-curses__ads.htm#ref_1590_26">Definition</A></FONT> : <b>in</b> String;
--                         <FONT COLOR=red><A NAME="ref_2031_26" HREF="terminal_interface-curses__ads.htm#ref_1591_26">Key</A></FONT>        : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1997_14" HREF="terminal_interface-curses__ads.htm#ref_1596_14">Define_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_1997_26" HREF="terminal_interface-curses__ads.htm#ref_1596_26">Definition</A></FONT> : <b>in</b> String;
-+                         <FONT COLOR=red><A NAME="ref_1998_26" HREF="terminal_interface-curses__ads.htm#ref_1597_26">Key</A></FONT>        : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2033_16">Defkey</A></FONT> (<FONT COLOR=red><A NAME="ref_2033_24" HREF="terminal_interface-curses__adb.htm#ref_2033_16">Def</A></FONT> : char_array;
--                       <FONT COLOR=red><A NAME="ref_2034_24" HREF="terminal_interface-curses__adb.htm#ref_2033_16">Key</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2000_16">Defkey</A></FONT> (<FONT COLOR=red><A NAME="ref_2000_24" HREF="terminal_interface-curses__adb.htm#ref_2000_16">Def</A></FONT> : char_array;
-+                       <FONT COLOR=red><A NAME="ref_2001_24" HREF="terminal_interface-curses__adb.htm#ref_2000_16">Key</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Defkey, "define_key");
- 
--      <FONT COLOR=red><A NAME="ref_2037_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1590_26">Definition</A>'Length);
--      <FONT COLOR=red><A NAME="ref_2038_7">Length</A></FONT> : size_t;
-+      <FONT COLOR=red><A NAME="ref_2004_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1596_26">Definition</A>'Length);
-+      <FONT COLOR=red><A NAME="ref_2005_7">Length</A></FONT> : size_t;
-    <b>begin</b>
--      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1590_26">Definition</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2037_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2038_7">Length</A>);
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2033_16">Defkey</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2037_7">Txt</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1591_26">Key</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1596_26">Definition</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2004_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2005_7">Length</A>);
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2000_16">Defkey</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2004_7">Txt</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1597_26">Key</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1590_14">Define_Key</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1596_14">Define_Key</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2046_14" HREF="terminal_interface-curses__ads.htm#ref_1616_14">Un_Control</A></FONT> (<FONT COLOR=red><A NAME="ref_2046_26" HREF="terminal_interface-curses__ads.htm#ref_1616_26">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>;
--                         <FONT COLOR=red><A NAME="ref_2047_26" HREF="terminal_interface-curses__ads.htm#ref_1617_26">Str</A></FONT> : <b>out</b> String)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2013_14" HREF="terminal_interface-curses__ads.htm#ref_1622_14">Un_Control</A></FONT> (<FONT COLOR=red><A NAME="ref_2013_26" HREF="terminal_interface-curses__ads.htm#ref_1622_26">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>;
-+                         <FONT COLOR=red><A NAME="ref_2014_26" HREF="terminal_interface-curses__ads.htm#ref_1623_26">Str</A></FONT> : <b>out</b> String)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2049_16">Unctrl</A></FONT> (<FONT COLOR=red><A NAME="ref_2049_24" HREF="terminal_interface-curses__adb.htm#ref_2049_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> chars_ptr;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2016_16">Unctrl</A></FONT> (<FONT COLOR=red><A NAME="ref_2016_24" HREF="terminal_interface-curses__adb.htm#ref_2016_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> chars_ptr;
-       <b>pragma</b> Import (C, Unctrl, "unctrl");
-    <b>begin</b>
--      <A HREF="terminal_interface-curses-aux__ads.htm#ref_116_14">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2049_16">Unctrl</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1616_26">Ch</A>)), <A HREF="terminal_interface-curses__ads.htm#ref_1617_26">Str</A>);
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1616_14">Un_Control</A>;
-+      <A HREF="terminal_interface-curses-aux__ads.htm#ref_116_14">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2016_16">Unctrl</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1622_26">Ch</A>)), <A HREF="terminal_interface-curses__ads.htm#ref_1623_26">Str</A>);
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1622_14">Un_Control</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_2055_13" HREF="terminal_interface-curses__ads.htm#ref_1621_13">Un_Control</A></FONT> (<FONT COLOR=red><A NAME="ref_2055_25" HREF="terminal_interface-curses__ads.htm#ref_1621_25">Ch</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>) <b>return</b> String
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_2022_13" HREF="terminal_interface-curses__ads.htm#ref_1627_13">Un_Control</A></FONT> (<FONT COLOR=red><A NAME="ref_2022_25" HREF="terminal_interface-curses__ads.htm#ref_1627_25">Ch</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>) <b>return</b> String
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2057_16">Unctrl</A></FONT> (<FONT COLOR=red><A NAME="ref_2057_24" HREF="terminal_interface-curses__adb.htm#ref_2057_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> chars_ptr;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2024_16">Unctrl</A></FONT> (<FONT COLOR=red><A NAME="ref_2024_24" HREF="terminal_interface-curses__adb.htm#ref_2024_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> chars_ptr;
-       <b>pragma</b> Import (C, Unctrl, "unctrl");
-    <b>begin</b>
--      <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_121_13">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2057_16">Unctrl</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1621_25">Ch</A>)));
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1621_13">Un_Control</A>;
-+      <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_121_13">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2024_16">Unctrl</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1627_25">Ch</A>)));
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1627_13">Un_Control</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2063_14" HREF="terminal_interface-curses__ads.htm#ref_1627_14">Delay_Output</A></FONT> (<FONT COLOR=red><A NAME="ref_2063_28" HREF="terminal_interface-curses__ads.htm#ref_1627_28">Msecs</A></FONT> : <b>in</b> Natural)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2030_14" HREF="terminal_interface-curses__ads.htm#ref_1633_14">Delay_Output</A></FONT> (<FONT COLOR=red><A NAME="ref_2030_28" HREF="terminal_interface-curses__ads.htm#ref_1633_28">Msecs</A></FONT> : <b>in</b> Natural)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2065_16">Delayoutput</A></FONT> (<FONT COLOR=red><A NAME="ref_2065_29" HREF="terminal_interface-curses__adb.htm#ref_2065_16">Msecs</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2032_16">Delayoutput</A></FONT> (<FONT COLOR=red><A NAME="ref_2032_29" HREF="terminal_interface-curses__adb.htm#ref_2032_16">Msecs</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Delayoutput, "delay_output");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2065_16">Delayoutput</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1627_28">Msecs</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2032_16">Delayoutput</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1633_28">Msecs</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1627_14">Delay_Output</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1633_14">Delay_Output</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2073_14" HREF="terminal_interface-curses__ads.htm#ref_1632_14">Flush_Input</A></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2040_14" HREF="terminal_interface-curses__ads.htm#ref_1638_14">Flush_Input</A></FONT>
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2075_16">Flushinp</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2042_16">Flushinp</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Flushinp, "flushinp");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2075_16">Flushinp</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>  <FONT COLOR=green><EM>-- docu says that never happens, but...</EM></FONT>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2042_16">Flushinp</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>  <FONT COLOR=green><EM>-- docu says that never happens, but...</EM></FONT>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1632_14">Flush_Input</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1638_14">Flush_Input</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>function</b> <FONT COLOR=red><A NAME="ref_2083_13" HREF="terminal_interface-curses__ads.htm#ref_1641_13">Baudrate</A></FONT> <b>return</b> Natural
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_2050_13" HREF="terminal_interface-curses__ads.htm#ref_1647_13">Baudrate</A></FONT> <b>return</b> Natural
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2085_16">Baud</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2052_16">Baud</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Baud, "baudrate");
-    <b>begin</b>
--      <b>return</b> Natural (<A HREF="terminal_interface-curses__adb.htm#ref_2085_16">Baud</A>);
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1641_13">Baudrate</A>;
-+      <b>return</b> Natural (<A HREF="terminal_interface-curses__adb.htm#ref_2052_16">Baud</A>);
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1647_13">Baudrate</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_2091_13" HREF="terminal_interface-curses__ads.htm#ref_1646_13">Erase_Character</A></FONT> <b>return</b> Character
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_2058_13" HREF="terminal_interface-curses__ads.htm#ref_1652_13">Erase_Character</A></FONT> <b>return</b> Character
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2093_16">Erasechar</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2060_16">Erasechar</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Erasechar, "erasechar");
-    <b>begin</b>
--      <b>return</b> Character'Val (<A HREF="terminal_interface-curses__adb.htm#ref_2093_16">Erasechar</A>);
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1646_13">Erase_Character</A>;
-+      <b>return</b> Character'Val (<A HREF="terminal_interface-curses__adb.htm#ref_2060_16">Erasechar</A>);
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1652_13">Erase_Character</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_2099_13" HREF="terminal_interface-curses__ads.htm#ref_1651_13">Kill_Character</A></FONT> <b>return</b> Character
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_2066_13" HREF="terminal_interface-curses__ads.htm#ref_1657_13">Kill_Character</A></FONT> <b>return</b> Character
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2101_16">Killchar</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2068_16">Killchar</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Killchar, "killchar");
-    <b>begin</b>
--      <b>return</b> Character'Val (<A HREF="terminal_interface-curses__adb.htm#ref_2101_16">Killchar</A>);
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1651_13">Kill_Character</A>;
-+      <b>return</b> Character'Val (<A HREF="terminal_interface-curses__adb.htm#ref_2068_16">Killchar</A>);
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1657_13">Kill_Character</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_2107_13" HREF="terminal_interface-curses__ads.htm#ref_1656_13">Has_Insert_Character</A></FONT> <b>return</b> Boolean
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_2074_13" HREF="terminal_interface-curses__ads.htm#ref_1662_13">Has_Insert_Character</A></FONT> <b>return</b> Boolean
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2109_16">Has_Ic</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2076_16">Has_Ic</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>;
-       <b>pragma</b> Import (C, Has_Ic, "has_ic");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2109_16">Has_Ic</A> = <A HREF="terminal_interface-curses__ads.htm#ref_1931_4">Curses_Bool_False</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2076_16">Has_Ic</A> = <A HREF="terminal_interface-curses__ads.htm#ref_1927_4">Curses_Bool_False</A> <b>then</b>
-          <b>return</b> False;
-       <b>else</b>
-          <b>return</b> True;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1656_13">Has_Insert_Character</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1662_13">Has_Insert_Character</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_2119_13" HREF="terminal_interface-curses__ads.htm#ref_1661_13">Has_Insert_Line</A></FONT> <b>return</b> Boolean
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_2086_13" HREF="terminal_interface-curses__ads.htm#ref_1667_13">Has_Insert_Line</A></FONT> <b>return</b> Boolean
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2121_16">Has_Il</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2088_16">Has_Il</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>;
-       <b>pragma</b> Import (C, Has_Il, "has_il");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2121_16">Has_Il</A> = <A HREF="terminal_interface-curses__ads.htm#ref_1931_4">Curses_Bool_False</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2088_16">Has_Il</A> = <A HREF="terminal_interface-curses__ads.htm#ref_1927_4">Curses_Bool_False</A> <b>then</b>
-          <b>return</b> False;
-       <b>else</b>
-          <b>return</b> True;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1661_13">Has_Insert_Line</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1667_13">Has_Insert_Line</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_2131_13" HREF="terminal_interface-curses__ads.htm#ref_1666_13">Supported_Attributes</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_2098_13" HREF="terminal_interface-curses__ads.htm#ref_1672_13">Supported_Attributes</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2133_16">Termattrs</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2100_16">Termattrs</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-       <b>pragma</b> Import (C, Termattrs, "termattrs");
- 
--      <FONT COLOR=red><A NAME="ref_2136_7">Ch</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">Chtype_To_AttrChar</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2133_16">Termattrs</A>);
-+      <FONT COLOR=red><A NAME="ref_2103_7">Ch</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">Chtype_To_AttrChar</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2100_16">Termattrs</A>);
-    <b>begin</b>
--      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_2136_7">Ch</A>.<A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1666_13">Supported_Attributes</A>;
-+      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_2103_7">Ch</A>.<A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1672_13">Supported_Attributes</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2141_14" HREF="terminal_interface-curses__ads.htm#ref_1671_14">Long_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_2141_25" HREF="terminal_interface-curses__ads.htm#ref_1671_25">Name</A></FONT> : <b>out</b> String)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2108_14" HREF="terminal_interface-curses__ads.htm#ref_1677_14">Long_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_2108_25" HREF="terminal_interface-curses__ads.htm#ref_1677_25">Name</A></FONT> : <b>out</b> String)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2143_16">Longname</A></FONT> <b>return</b> chars_ptr;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2110_16">Longname</A></FONT> <b>return</b> chars_ptr;
-       <b>pragma</b> Import (C, Longname, "longname");
-    <b>begin</b>
--      <A HREF="terminal_interface-curses-aux__ads.htm#ref_116_14">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2143_16">Longname</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1671_25">Name</A>);
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1671_14">Long_Name</A>;
-+      <A HREF="terminal_interface-curses-aux__ads.htm#ref_116_14">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2110_16">Longname</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1677_25">Name</A>);
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1677_14">Long_Name</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_2149_13" HREF="terminal_interface-curses__ads.htm#ref_1675_13">Long_Name</A></FONT> <b>return</b> String
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_2116_13" HREF="terminal_interface-curses__ads.htm#ref_1681_13">Long_Name</A></FONT> <b>return</b> String
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2151_16">Longname</A></FONT> <b>return</b> chars_ptr;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2118_16">Longname</A></FONT> <b>return</b> chars_ptr;
-       <b>pragma</b> Import (C, Longname, "longname");
-    <b>begin</b>
--      <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_121_13">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2151_16">Longname</A>);
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1675_13">Long_Name</A>;
-+      <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_121_13">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2118_16">Longname</A>);
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1681_13">Long_Name</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2157_14" HREF="terminal_interface-curses__ads.htm#ref_1681_14">Terminal_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_2157_29" HREF="terminal_interface-curses__ads.htm#ref_1681_29">Name</A></FONT> : <b>out</b> String)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2124_14" HREF="terminal_interface-curses__ads.htm#ref_1687_14">Terminal_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_2124_29" HREF="terminal_interface-curses__ads.htm#ref_1687_29">Name</A></FONT> : <b>out</b> String)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2159_16">Termname</A></FONT> <b>return</b> chars_ptr;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2126_16">Termname</A></FONT> <b>return</b> chars_ptr;
-       <b>pragma</b> Import (C, Termname, "termname");
-    <b>begin</b>
--      <A HREF="terminal_interface-curses-aux__ads.htm#ref_116_14">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2159_16">Termname</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1681_29">Name</A>);
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1681_14">Terminal_Name</A>;
-+      <A HREF="terminal_interface-curses-aux__ads.htm#ref_116_14">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2126_16">Termname</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1687_29">Name</A>);
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1687_14">Terminal_Name</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_2165_13" HREF="terminal_interface-curses__ads.htm#ref_1685_13">Terminal_Name</A></FONT> <b>return</b> String
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_2132_13" HREF="terminal_interface-curses__ads.htm#ref_1691_13">Terminal_Name</A></FONT> <b>return</b> String
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2167_16">Termname</A></FONT> <b>return</b> chars_ptr;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2134_16">Termname</A></FONT> <b>return</b> chars_ptr;
-       <b>pragma</b> Import (C, Termname, "termname");
-    <b>begin</b>
--      <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_121_13">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2167_16">Termname</A>);
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1685_13">Terminal_Name</A>;
-+      <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_121_13">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2134_16">Termname</A>);
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1691_13">Terminal_Name</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2173_14" HREF="terminal_interface-curses__ads.htm#ref_1706_14">Init_Pair</A></FONT> (<FONT COLOR=red><A NAME="ref_2173_25" HREF="terminal_interface-curses__ads.htm#ref_1706_25">Pair</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_301_12">Redefinable_Color_Pair</A>;
--                        <FONT COLOR=red><A NAME="ref_2174_25" HREF="terminal_interface-curses__ads.htm#ref_1707_25">Fore</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>;
--                        <FONT COLOR=red><A NAME="ref_2175_25" HREF="terminal_interface-curses__ads.htm#ref_1708_25">Back</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>)
--   <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2177_16">Initpair</A></FONT> (<FONT COLOR=red><A NAME="ref_2177_26" HREF="terminal_interface-curses__adb.htm#ref_2177_16">Pair</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
--                         <FONT COLOR=red><A NAME="ref_2178_26" HREF="terminal_interface-curses__adb.htm#ref_2177_16">Fore</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
--                         <FONT COLOR=red><A NAME="ref_2179_26" HREF="terminal_interface-curses__adb.htm#ref_2177_16">Back</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2140_14" HREF="terminal_interface-curses__ads.htm#ref_1712_14">Init_Pair</A></FONT> (<FONT COLOR=red><A NAME="ref_2140_25" HREF="terminal_interface-curses__ads.htm#ref_1712_25">Pair</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_301_12">Redefinable_Color_Pair</A>;
-+                        <FONT COLOR=red><A NAME="ref_2141_25" HREF="terminal_interface-curses__ads.htm#ref_1713_25">Fore</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>;
-+                        <FONT COLOR=red><A NAME="ref_2142_25" HREF="terminal_interface-curses__ads.htm#ref_1714_25">Back</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>)
-+   <b>is</b>
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2144_16">Initpair</A></FONT> (<FONT COLOR=red><A NAME="ref_2144_26" HREF="terminal_interface-curses__adb.htm#ref_2144_16">Pair</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+                         <FONT COLOR=red><A NAME="ref_2145_26" HREF="terminal_interface-curses__adb.htm#ref_2144_16">Fore</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+                         <FONT COLOR=red><A NAME="ref_2146_26" HREF="terminal_interface-curses__adb.htm#ref_2144_16">Back</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Initpair, "init_pair");
-    <b>begin</b>
--      <b>if</b> Integer (<A HREF="terminal_interface-curses__ads.htm#ref_1706_25">Pair</A>) &gt;= <A HREF="terminal_interface-curses__ads.htm#ref_424_13">Number_Of_Color_Pairs</A> <b>then</b>
-+      <b>if</b> Integer (<A HREF="terminal_interface-curses__ads.htm#ref_1712_25">Pair</A>) &gt;= <A HREF="terminal_interface-curses__ads.htm#ref_424_13">Number_Of_Color_Pairs</A> <b>then</b>
-          <b>raise</b> Constraint_Error;
-       <b>end</b> <b>if</b>;
--      <b>if</b> Integer (<A HREF="terminal_interface-curses__ads.htm#ref_1707_25">Fore</A>) &gt;= <A HREF="terminal_interface-curses__ads.htm#ref_421_13">Number_Of_Colors</A> <b>or</b> <b>else</b>
--        Integer (<A HREF="terminal_interface-curses__ads.htm#ref_1708_25">Back</A>) &gt;= <A HREF="terminal_interface-curses__ads.htm#ref_421_13">Number_Of_Colors</A> <b>then</b> <b>raise</b> Constraint_Error;
-+      <b>if</b> Integer (<A HREF="terminal_interface-curses__ads.htm#ref_1713_25">Fore</A>) &gt;= <A HREF="terminal_interface-curses__ads.htm#ref_421_13">Number_Of_Colors</A> <b>or</b> <b>else</b>
-+        Integer (<A HREF="terminal_interface-curses__ads.htm#ref_1714_25">Back</A>) &gt;= <A HREF="terminal_interface-curses__ads.htm#ref_421_13">Number_Of_Colors</A> <b>then</b> <b>raise</b> Constraint_Error;
-       <b>end</b> <b>if</b>;
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2177_16">Initpair</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1706_25">Pair</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1707_25">Fore</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1708_25">Back</A>))
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2144_16">Initpair</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1712_25">Pair</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1713_25">Fore</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1714_25">Back</A>))
-         = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1706_14">Init_Pair</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1712_14">Init_Pair</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2194_14" HREF="terminal_interface-curses__ads.htm#ref_1713_14">Pair_Content</A></FONT> (<FONT COLOR=red><A NAME="ref_2194_28" HREF="terminal_interface-curses__ads.htm#ref_1713_28">Pair</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>;
--                           <FONT COLOR=red><A NAME="ref_2195_28" HREF="terminal_interface-curses__ads.htm#ref_1714_28">Fore</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>;
--                           <FONT COLOR=red><A NAME="ref_2196_28" HREF="terminal_interface-curses__ads.htm#ref_1715_28">Back</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>)
--   <b>is</b>
--      <b>type</b> <FONT COLOR=red><A NAME="ref_2198_12">C_Short_Access</A></FONT> <b>is</b> <b>access</b> <b>all</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2199_16">Paircontent</A></FONT> (<FONT COLOR=red><A NAME="ref_2199_29" HREF="terminal_interface-curses__adb.htm#ref_2199_16">Pair</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
--                            <FONT COLOR=red><A NAME="ref_2200_29" HREF="terminal_interface-curses__adb.htm#ref_2199_16">Fp</A></FONT>   : <A HREF="terminal_interface-curses__adb.htm#ref_2198_12">C_Short_Access</A>;
--                            <FONT COLOR=red><A NAME="ref_2201_29" HREF="terminal_interface-curses__adb.htm#ref_2199_16">Bp</A></FONT>   : <A HREF="terminal_interface-curses__adb.htm#ref_2198_12">C_Short_Access</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2161_14" HREF="terminal_interface-curses__ads.htm#ref_1719_14">Pair_Content</A></FONT> (<FONT COLOR=red><A NAME="ref_2161_28" HREF="terminal_interface-curses__ads.htm#ref_1719_28">Pair</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>;
-+                           <FONT COLOR=red><A NAME="ref_2162_28" HREF="terminal_interface-curses__ads.htm#ref_1720_28">Fore</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>;
-+                           <FONT COLOR=red><A NAME="ref_2163_28" HREF="terminal_interface-curses__ads.htm#ref_1721_28">Back</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>)
-+   <b>is</b>
-+      <b>type</b> <FONT COLOR=red><A NAME="ref_2165_12">C_Short_Access</A></FONT> <b>is</b> <b>access</b> <b>all</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2166_16">Paircontent</A></FONT> (<FONT COLOR=red><A NAME="ref_2166_29" HREF="terminal_interface-curses__adb.htm#ref_2166_16">Pair</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+                            <FONT COLOR=red><A NAME="ref_2167_29" HREF="terminal_interface-curses__adb.htm#ref_2166_16">Fp</A></FONT>   : <A HREF="terminal_interface-curses__adb.htm#ref_2165_12">C_Short_Access</A>;
-+                            <FONT COLOR=red><A NAME="ref_2168_29" HREF="terminal_interface-curses__adb.htm#ref_2166_16">Bp</A></FONT>   : <A HREF="terminal_interface-curses__adb.htm#ref_2165_12">C_Short_Access</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Paircontent, "pair_content");
- 
--      <FONT COLOR=red><A NAME="ref_2204_7">F</A></FONT>, <FONT COLOR=red><A NAME="ref_2204_10">B</A></FONT> : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+      <FONT COLOR=red><A NAME="ref_2171_7">F</A></FONT>, <FONT COLOR=red><A NAME="ref_2171_10">B</A></FONT> : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2199_16">Paircontent</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1713_28">Pair</A>), <A HREF="terminal_interface-curses__adb.htm#ref_2204_7">F</A>'<b>Access</b>, <A HREF="terminal_interface-curses__adb.htm#ref_2204_10">B</A>'<b>Access</b>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2166_16">Paircontent</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1719_28">Pair</A>), <A HREF="terminal_interface-curses__adb.htm#ref_2171_7">F</A>'<b>Access</b>, <A HREF="terminal_interface-curses__adb.htm#ref_2171_10">B</A>'<b>Access</b>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>else</b>
--         <A HREF="terminal_interface-curses__ads.htm#ref_1714_28">Fore</A> := <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2204_7">F</A>);
--         <A HREF="terminal_interface-curses__ads.htm#ref_1715_28">Back</A> := <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2204_10">B</A>);
-+         <A HREF="terminal_interface-curses__ads.htm#ref_1720_28">Fore</A> := <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2171_7">F</A>);
-+         <A HREF="terminal_interface-curses__ads.htm#ref_1721_28">Back</A> := <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2171_10">B</A>);
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1713_14">Pair_Content</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1719_14">Pair_Content</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_2214_13" HREF="terminal_interface-curses__ads.htm#ref_1720_13">Has_Colors</A></FONT> <b>return</b> Boolean
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_2181_13" HREF="terminal_interface-curses__ads.htm#ref_1726_13">Has_Colors</A></FONT> <b>return</b> Boolean
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2216_16">Hascolors</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2183_16">Hascolors</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>;
-       <b>pragma</b> Import (C, Hascolors, "has_colors");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2216_16">Hascolors</A> = <A HREF="terminal_interface-curses__ads.htm#ref_1931_4">Curses_Bool_False</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2183_16">Hascolors</A> = <A HREF="terminal_interface-curses__ads.htm#ref_1927_4">Curses_Bool_False</A> <b>then</b>
-          <b>return</b> False;
-       <b>else</b>
-          <b>return</b> True;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1720_13">Has_Colors</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1726_13">Has_Colors</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2226_14" HREF="terminal_interface-curses__ads.htm#ref_1725_14">Init_Color</A></FONT> (<FONT COLOR=red><A NAME="ref_2226_26" HREF="terminal_interface-curses__ads.htm#ref_1725_26">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>;
--                         <FONT COLOR=red><A NAME="ref_2227_26" HREF="terminal_interface-curses__ads.htm#ref_1726_26">Red</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
--                         <FONT COLOR=red><A NAME="ref_2228_26" HREF="terminal_interface-curses__ads.htm#ref_1727_26">Green</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
--                         <FONT COLOR=red><A NAME="ref_2229_26" HREF="terminal_interface-curses__ads.htm#ref_1728_26">Blue</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>)
--   <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2231_16">Initcolor</A></FONT> (<FONT COLOR=red><A NAME="ref_2231_27" HREF="terminal_interface-curses__adb.htm#ref_2231_16">Col</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
--                          <FONT COLOR=red><A NAME="ref_2232_27" HREF="terminal_interface-curses__adb.htm#ref_2231_16">Red</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
--                          <FONT COLOR=red><A NAME="ref_2233_27" HREF="terminal_interface-curses__adb.htm#ref_2231_16">Green</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
--                          <FONT COLOR=red><A NAME="ref_2234_27" HREF="terminal_interface-curses__adb.htm#ref_2231_16">Blue</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2193_14" HREF="terminal_interface-curses__ads.htm#ref_1731_14">Init_Color</A></FONT> (<FONT COLOR=red><A NAME="ref_2193_26" HREF="terminal_interface-curses__ads.htm#ref_1731_26">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>;
-+                         <FONT COLOR=red><A NAME="ref_2194_26" HREF="terminal_interface-curses__ads.htm#ref_1732_26">Red</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
-+                         <FONT COLOR=red><A NAME="ref_2195_26" HREF="terminal_interface-curses__ads.htm#ref_1733_26">Green</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
-+                         <FONT COLOR=red><A NAME="ref_2196_26" HREF="terminal_interface-curses__ads.htm#ref_1734_26">Blue</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>)
-+   <b>is</b>
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2198_16">Initcolor</A></FONT> (<FONT COLOR=red><A NAME="ref_2198_27" HREF="terminal_interface-curses__adb.htm#ref_2198_16">Col</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+                          <FONT COLOR=red><A NAME="ref_2199_27" HREF="terminal_interface-curses__adb.htm#ref_2198_16">Red</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+                          <FONT COLOR=red><A NAME="ref_2200_27" HREF="terminal_interface-curses__adb.htm#ref_2198_16">Green</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+                          <FONT COLOR=red><A NAME="ref_2201_27" HREF="terminal_interface-curses__adb.htm#ref_2198_16">Blue</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Initcolor, "init_color");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2231_16">Initcolor</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1725_26">Color</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1726_26">Red</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1727_26">Green</A>),
--                    <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1728_26">Blue</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2198_16">Initcolor</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1731_26">Color</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1732_26">Red</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1733_26">Green</A>),
-+                    <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1734_26">Blue</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-             <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1725_14">Init_Color</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1731_14">Init_Color</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_2243_13" HREF="terminal_interface-curses__ads.htm#ref_1733_13">Can_Change_Color</A></FONT> <b>return</b> Boolean
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_2210_13" HREF="terminal_interface-curses__ads.htm#ref_1739_13">Can_Change_Color</A></FONT> <b>return</b> Boolean
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2245_16">Canchangecolor</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2212_16">Canchangecolor</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>;
-       <b>pragma</b> Import (C, Canchangecolor, "can_change_color");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2245_16">Canchangecolor</A> = <A HREF="terminal_interface-curses__ads.htm#ref_1931_4">Curses_Bool_False</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2212_16">Canchangecolor</A> = <A HREF="terminal_interface-curses__ads.htm#ref_1927_4">Curses_Bool_False</A> <b>then</b>
-          <b>return</b> False;
-       <b>else</b>
-          <b>return</b> True;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1733_13">Can_Change_Color</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1739_13">Can_Change_Color</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2255_14" HREF="terminal_interface-curses__ads.htm#ref_1738_14">Color_Content</A></FONT> (<FONT COLOR=red><A NAME="ref_2255_29" HREF="terminal_interface-curses__ads.htm#ref_1738_29">Color</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>;
--                            <FONT COLOR=red><A NAME="ref_2256_29" HREF="terminal_interface-curses__ads.htm#ref_1739_29">Red</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
--                            <FONT COLOR=red><A NAME="ref_2257_29" HREF="terminal_interface-curses__ads.htm#ref_1740_29">Green</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
--                            <FONT COLOR=red><A NAME="ref_2258_29" HREF="terminal_interface-curses__ads.htm#ref_1741_29">Blue</A></FONT>  : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2222_14" HREF="terminal_interface-curses__ads.htm#ref_1744_14">Color_Content</A></FONT> (<FONT COLOR=red><A NAME="ref_2222_29" HREF="terminal_interface-curses__ads.htm#ref_1744_29">Color</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>;
-+                            <FONT COLOR=red><A NAME="ref_2223_29" HREF="terminal_interface-curses__ads.htm#ref_1745_29">Red</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
-+                            <FONT COLOR=red><A NAME="ref_2224_29" HREF="terminal_interface-curses__ads.htm#ref_1746_29">Green</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
-+                            <FONT COLOR=red><A NAME="ref_2225_29" HREF="terminal_interface-curses__ads.htm#ref_1747_29">Blue</A></FONT>  : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>)
-    <b>is</b>
--      <b>type</b> <FONT COLOR=red><A NAME="ref_2260_12">C_Short_Access</A></FONT> <b>is</b> <b>access</b> <b>all</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+      <b>type</b> <FONT COLOR=red><A NAME="ref_2227_12">C_Short_Access</A></FONT> <b>is</b> <b>access</b> <b>all</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
- 
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2262_16">Colorcontent</A></FONT> (<FONT COLOR=red><A NAME="ref_2262_30" HREF="terminal_interface-curses__adb.htm#ref_2262_16">Color</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>; <FONT COLOR=red><A NAME="ref_2262_47" HREF="terminal_interface-curses__adb.htm#ref_2262_16">R</A></FONT>, <FONT COLOR=red><A NAME="ref_2262_50" HREF="terminal_interface-curses__adb.htm#ref_2262_16">G</A></FONT>, <FONT COLOR=red><A NAME="ref_2262_53" HREF="terminal_interface-curses__adb.htm#ref_2262_16">B</A></FONT> : <A HREF="terminal_interface-curses__adb.htm#ref_2260_12">C_Short_Access</A>)
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2229_16">Colorcontent</A></FONT> (<FONT COLOR=red><A NAME="ref_2229_30" HREF="terminal_interface-curses__adb.htm#ref_2229_16">Color</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>; <FONT COLOR=red><A NAME="ref_2229_47" HREF="terminal_interface-curses__adb.htm#ref_2229_16">R</A></FONT>, <FONT COLOR=red><A NAME="ref_2229_50" HREF="terminal_interface-curses__adb.htm#ref_2229_16">G</A></FONT>, <FONT COLOR=red><A NAME="ref_2229_53" HREF="terminal_interface-curses__adb.htm#ref_2229_16">B</A></FONT> : <A HREF="terminal_interface-curses__adb.htm#ref_2227_12">C_Short_Access</A>)
-                              <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Colorcontent, "color_content");
- 
--      <FONT COLOR=red><A NAME="ref_2266_7">R</A></FONT>, <FONT COLOR=red><A NAME="ref_2266_10">G</A></FONT>, <FONT COLOR=red><A NAME="ref_2266_13">B</A></FONT> : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+      <FONT COLOR=red><A NAME="ref_2233_7">R</A></FONT>, <FONT COLOR=red><A NAME="ref_2233_10">G</A></FONT>, <FONT COLOR=red><A NAME="ref_2233_13">B</A></FONT> : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2262_16">Colorcontent</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1738_29">Color</A>), <A HREF="terminal_interface-curses__adb.htm#ref_2266_7">R</A>'<b>Access</b>, <A HREF="terminal_interface-curses__adb.htm#ref_2266_10">G</A>'<b>Access</b>, <A HREF="terminal_interface-curses__adb.htm#ref_2266_13">B</A>'<b>Access</b>) =
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2229_16">Colorcontent</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1744_29">Color</A>), <A HREF="terminal_interface-curses__adb.htm#ref_2233_7">R</A>'<b>Access</b>, <A HREF="terminal_interface-curses__adb.htm#ref_2233_10">G</A>'<b>Access</b>, <A HREF="terminal_interface-curses__adb.htm#ref_2233_13">B</A>'<b>Access</b>) =
-         <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>else</b>
--         <A HREF="terminal_interface-curses__ads.htm#ref_1739_29">Red</A>   := <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2266_7">R</A>);
--         <A HREF="terminal_interface-curses__ads.htm#ref_1740_29">Green</A> := <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2266_10">G</A>);
--         <A HREF="terminal_interface-curses__ads.htm#ref_1741_29">Blue</A>  := <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2266_13">B</A>);
-+         <A HREF="terminal_interface-curses__ads.htm#ref_1745_29">Red</A>   := <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2233_7">R</A>);
-+         <A HREF="terminal_interface-curses__ads.htm#ref_1746_29">Green</A> := <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2233_10">G</A>);
-+         <A HREF="terminal_interface-curses__ads.htm#ref_1747_29">Blue</A>  := <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2233_13">B</A>);
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1738_14">Color_Content</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1744_14">Color_Content</A>;
- 
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2279_14" HREF="terminal_interface-curses__ads.htm#ref_1753_14">Save_Curses_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_2279_32" HREF="terminal_interface-curses__ads.htm#ref_1753_32">Mode</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1750_9">Curses_Mode</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2246_14" HREF="terminal_interface-curses__ads.htm#ref_1759_14">Save_Curses_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_2246_32" HREF="terminal_interface-curses__ads.htm#ref_1759_32">Mode</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1756_9">Curses_Mode</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2281_16">Def_Prog_Mode</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2248_16">Def_Prog_Mode</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Def_Prog_Mode, "def_prog_mode");
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2283_16">Def_Shell_Mode</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2250_16">Def_Shell_Mode</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Def_Shell_Mode, "def_shell_mode");
- 
--      <FONT COLOR=red><A NAME="ref_2286_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <FONT COLOR=red><A NAME="ref_2253_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-    <b>begin</b>
--      <b>case</b> <A HREF="terminal_interface-curses__ads.htm#ref_1753_32">Mode</A> <b>is</b>
--         <b>when</b> <A HREF="terminal_interface-curses__ads.htm#ref_1750_25">Curses</A> =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_2286_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2281_16">Def_Prog_Mode</A>;
--         <b>when</b> <A HREF="terminal_interface-curses__ads.htm#ref_1750_33">Shell</A>  =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_2286_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2283_16">Def_Shell_Mode</A>;
-+      <b>case</b> <A HREF="terminal_interface-curses__ads.htm#ref_1759_32">Mode</A> <b>is</b>
-+         <b>when</b> <A HREF="terminal_interface-curses__ads.htm#ref_1756_25">Curses</A> =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_2253_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2248_16">Def_Prog_Mode</A>;
-+         <b>when</b> <A HREF="terminal_interface-curses__ads.htm#ref_1756_33">Shell</A>  =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_2253_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2250_16">Def_Shell_Mode</A>;
-       <b>end</b> <b>case</b>;
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2286_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2253_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1753_14">Save_Curses_Mode</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1759_14">Save_Curses_Mode</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2297_14" HREF="terminal_interface-curses__ads.htm#ref_1759_14">Reset_Curses_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_2297_33" HREF="terminal_interface-curses__ads.htm#ref_1759_33">Mode</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1750_9">Curses_Mode</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2264_14" HREF="terminal_interface-curses__ads.htm#ref_1765_14">Reset_Curses_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_2264_33" HREF="terminal_interface-curses__ads.htm#ref_1765_33">Mode</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1756_9">Curses_Mode</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2299_16">Reset_Prog_Mode</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2266_16">Reset_Prog_Mode</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Reset_Prog_Mode, "reset_prog_mode");
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2301_16">Reset_Shell_Mode</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2268_16">Reset_Shell_Mode</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Reset_Shell_Mode, "reset_shell_mode");
- 
--      <FONT COLOR=red><A NAME="ref_2304_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <FONT COLOR=red><A NAME="ref_2271_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-    <b>begin</b>
--      <b>case</b> <A HREF="terminal_interface-curses__ads.htm#ref_1759_33">Mode</A> <b>is</b>
--         <b>when</b> <A HREF="terminal_interface-curses__ads.htm#ref_1750_25">Curses</A> =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_2304_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2299_16">Reset_Prog_Mode</A>;
--         <b>when</b> <A HREF="terminal_interface-curses__ads.htm#ref_1750_33">Shell</A>  =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_2304_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2301_16">Reset_Shell_Mode</A>;
-+      <b>case</b> <A HREF="terminal_interface-curses__ads.htm#ref_1765_33">Mode</A> <b>is</b>
-+         <b>when</b> <A HREF="terminal_interface-curses__ads.htm#ref_1756_25">Curses</A> =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_2271_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2266_16">Reset_Prog_Mode</A>;
-+         <b>when</b> <A HREF="terminal_interface-curses__ads.htm#ref_1756_33">Shell</A>  =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_2271_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2268_16">Reset_Shell_Mode</A>;
-       <b>end</b> <b>case</b>;
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2304_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2271_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1759_14">Reset_Curses_Mode</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1765_14">Reset_Curses_Mode</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2315_14" HREF="terminal_interface-curses__ads.htm#ref_1765_14">Save_Terminal_State</A></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2282_14" HREF="terminal_interface-curses__ads.htm#ref_1771_14">Save_Terminal_State</A></FONT>
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2317_16">Savetty</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2284_16">Savetty</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Savetty, "savetty");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2317_16">Savetty</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2284_16">Savetty</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1765_14">Save_Terminal_State</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1771_14">Save_Terminal_State</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2325_14" HREF="terminal_interface-curses__ads.htm#ref_1770_14">Reset_Terminal_State</A></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2292_14" HREF="terminal_interface-curses__ads.htm#ref_1776_14">Reset_Terminal_State</A></FONT>
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2327_16">Resetty</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2294_16">Resetty</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Resetty, "resetty");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2327_16">Resetty</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2294_16">Resetty</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1770_14">Reset_Terminal_State</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1776_14">Reset_Terminal_State</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2335_14" HREF="terminal_interface-curses__ads.htm#ref_1783_14">Rip_Off_Lines</A></FONT> (<FONT COLOR=red><A NAME="ref_2335_29" HREF="terminal_interface-curses__ads.htm#ref_1783_29">Lines</A></FONT> : <b>in</b> Integer;
--                            <FONT COLOR=red><A NAME="ref_2336_29" HREF="terminal_interface-curses__ads.htm#ref_1784_29">Proc</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1774_9">Stdscr_Init_Proc</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2302_14" HREF="terminal_interface-curses__ads.htm#ref_1789_14">Rip_Off_Lines</A></FONT> (<FONT COLOR=red><A NAME="ref_2302_29" HREF="terminal_interface-curses__ads.htm#ref_1789_29">Lines</A></FONT> : <b>in</b> Integer;
-+                            <FONT COLOR=red><A NAME="ref_2303_29" HREF="terminal_interface-curses__ads.htm#ref_1790_29">Proc</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1780_9">Stdscr_Init_Proc</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2338_16">Ripoffline</A></FONT> (<FONT COLOR=red><A NAME="ref_2338_28" HREF="terminal_interface-curses__adb.htm#ref_2338_16">Lines</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--                           <FONT COLOR=red><A NAME="ref_2339_28" HREF="terminal_interface-curses__adb.htm#ref_2338_16">Proc</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_1774_9">Stdscr_Init_Proc</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2305_16">Ripoffline</A></FONT> (<FONT COLOR=red><A NAME="ref_2305_28" HREF="terminal_interface-curses__adb.htm#ref_2305_16">Lines</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+                           <FONT COLOR=red><A NAME="ref_2306_28" HREF="terminal_interface-curses__adb.htm#ref_2305_16">Proc</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_1780_9">Stdscr_Init_Proc</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Ripoffline, "_nc_ripoffline");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2338_16">Ripoffline</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1783_29">Lines</A>), <A HREF="terminal_interface-curses__ads.htm#ref_1784_29">Proc</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2305_16">Ripoffline</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1789_29">Lines</A>), <A HREF="terminal_interface-curses__ads.htm#ref_1790_29">Proc</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1783_14">Rip_Off_Lines</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1789_14">Rip_Off_Lines</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2347_14" HREF="terminal_interface-curses__ads.htm#ref_1795_14">Set_Cursor_Visibility</A></FONT> (<FONT COLOR=red><A NAME="ref_2347_37" HREF="terminal_interface-curses__ads.htm#ref_1795_37">Visibility</A></FONT> : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_1792_9">Cursor_Visibility</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2314_14" HREF="terminal_interface-curses__ads.htm#ref_1801_14">Set_Cursor_Visibility</A></FONT> (<FONT COLOR=red><A NAME="ref_2314_37" HREF="terminal_interface-curses__ads.htm#ref_1801_37">Visibility</A></FONT> : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_1798_9">Cursor_Visibility</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2349_16">Curs_Set</A></FONT> (<FONT COLOR=red><A NAME="ref_2349_26" HREF="terminal_interface-curses__adb.htm#ref_2349_16">Curs</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2316_16">Curs_Set</A></FONT> (<FONT COLOR=red><A NAME="ref_2316_26" HREF="terminal_interface-curses__adb.htm#ref_2316_16">Curs</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Curs_Set, "curs_set");
- 
--      <FONT COLOR=red><A NAME="ref_2352_7">Res</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <FONT COLOR=red><A NAME="ref_2319_7">Res</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-    <b>begin</b>
--      <A HREF="terminal_interface-curses__adb.htm#ref_2352_7">Res</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2349_16">Curs_Set</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1792_9">Cursor_Visibility</A>'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1795_37">Visibility</A>));
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2352_7">Res</A> /= <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
--         <A HREF="terminal_interface-curses__ads.htm#ref_1795_37">Visibility</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1792_9">Cursor_Visibility</A>'Val (<A HREF="terminal_interface-curses__adb.htm#ref_2352_7">Res</A>);
-+      <A HREF="terminal_interface-curses__adb.htm#ref_2319_7">Res</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2316_16">Curs_Set</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1798_9">Cursor_Visibility</A>'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1801_37">Visibility</A>));
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2319_7">Res</A> /= <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+         <A HREF="terminal_interface-curses__ads.htm#ref_1801_37">Visibility</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1798_9">Cursor_Visibility</A>'Val (<A HREF="terminal_interface-curses__adb.htm#ref_2319_7">Res</A>);
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1795_14">Set_Cursor_Visibility</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1801_14">Set_Cursor_Visibility</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2360_14" HREF="terminal_interface-curses__ads.htm#ref_1800_14">Nap_Milli_Seconds</A></FONT> (<FONT COLOR=red><A NAME="ref_2360_33" HREF="terminal_interface-curses__ads.htm#ref_1800_33">Ms</A></FONT> : <b>in</b> Natural)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2327_14" HREF="terminal_interface-curses__ads.htm#ref_1806_14">Nap_Milli_Seconds</A></FONT> (<FONT COLOR=red><A NAME="ref_2327_33" HREF="terminal_interface-curses__ads.htm#ref_1806_33">Ms</A></FONT> : <b>in</b> Natural)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2362_16">Napms</A></FONT> (<FONT COLOR=red><A NAME="ref_2362_23" HREF="terminal_interface-curses__adb.htm#ref_2362_16">Ms</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2329_16">Napms</A></FONT> (<FONT COLOR=red><A NAME="ref_2329_23" HREF="terminal_interface-curses__adb.htm#ref_2329_16">Ms</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Napms, "napms");
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2362_16">Napms</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1800_33">Ms</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2329_16">Napms</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1806_33">Ms</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1800_14">Nap_Milli_Seconds</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1806_14">Nap_Milli_Seconds</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_2371_13" HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_2338_13" HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
-+   <b>is</b>
-+      <FONT COLOR=red><A NAME="ref_2340_7">Result</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+      <b>pragma</b> Import (C, <A HREF="terminal_interface-curses__adb.htm#ref_2340_7">Result</A>, "stdscr");
-+   <b>begin</b>
-+      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_2340_7">Result</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_2346_13" HREF="terminal_interface-curses__ads.htm#ref_481_13">Current_Window</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
-    <b>is</b>
--      <FONT COLOR=red><A NAME="ref_2373_7">Stdscr</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--      <b>pragma</b> Import (C, <A HREF="terminal_interface-curses__adb.htm#ref_2373_7">Stdscr</A>, "stdscr");
-+      <FONT COLOR=red><A NAME="ref_2348_7">Result</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+      <b>pragma</b> Import (C, <A HREF="terminal_interface-curses__adb.htm#ref_2348_7">Result</A>, "curscr");
-    <b>begin</b>
--      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_2373_7">Stdscr</A>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_2348_7">Result</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_481_13">Current_Window</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_2379_13" HREF="terminal_interface-curses__ads.htm#ref_412_13">Lines</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_2354_13" HREF="terminal_interface-curses__ads.htm#ref_412_13">Lines</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>
-    <b>is</b>
--      <FONT COLOR=red><A NAME="ref_2381_7">C_Lines</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--      <b>pragma</b> Import (C, <A HREF="terminal_interface-curses__adb.htm#ref_2381_7">C_Lines</A>, "LINES");
-+      <FONT COLOR=red><A NAME="ref_2356_7">Result</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>pragma</b> Import (C, <A HREF="terminal_interface-curses__adb.htm#ref_2356_7">Result</A>, "LINES");
-    <b>begin</b>
--      <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2381_7">C_Lines</A>);
-+      <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2356_7">Result</A>);
-    <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_412_13">Lines</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_2387_13" HREF="terminal_interface-curses__ads.htm#ref_415_13">Columns</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_2362_13" HREF="terminal_interface-curses__ads.htm#ref_415_13">Columns</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>
-    <b>is</b>
--      <FONT COLOR=red><A NAME="ref_2389_7">C_Columns</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--      <b>pragma</b> Import (C, <A HREF="terminal_interface-curses__adb.htm#ref_2389_7">C_Columns</A>, "COLS");
-+      <FONT COLOR=red><A NAME="ref_2364_7">Result</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>pragma</b> Import (C, <A HREF="terminal_interface-curses__adb.htm#ref_2364_7">Result</A>, "COLS");
-    <b>begin</b>
--      <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2389_7">C_Columns</A>);
-+      <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2364_7">Result</A>);
-    <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_415_13">Columns</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_2395_13" HREF="terminal_interface-curses__ads.htm#ref_418_13">Tab_Size</A></FONT> <b>return</b> Natural
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_2370_13" HREF="terminal_interface-curses__ads.htm#ref_418_13">Tab_Size</A></FONT> <b>return</b> Natural
-    <b>is</b>
--      <FONT COLOR=red><A NAME="ref_2397_7">C_Tab_Size</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--      <b>pragma</b> Import (C, <A HREF="terminal_interface-curses__adb.htm#ref_2397_7">C_Tab_Size</A>, "TABSIZE");
-+      <FONT COLOR=red><A NAME="ref_2372_7">Result</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>pragma</b> Import (C, <A HREF="terminal_interface-curses__adb.htm#ref_2372_7">Result</A>, "TABSIZE");
-    <b>begin</b>
--      <b>return</b> Natural (<A HREF="terminal_interface-curses__adb.htm#ref_2397_7">C_Tab_Size</A>);
-+      <b>return</b> Natural (<A HREF="terminal_interface-curses__adb.htm#ref_2372_7">Result</A>);
-    <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_418_13">Tab_Size</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_2403_13" HREF="terminal_interface-curses__ads.htm#ref_421_13">Number_Of_Colors</A></FONT> <b>return</b> Natural
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_2378_13" HREF="terminal_interface-curses__ads.htm#ref_421_13">Number_Of_Colors</A></FONT> <b>return</b> Natural
-    <b>is</b>
--      <FONT COLOR=red><A NAME="ref_2405_7">C_Number_Of_Colors</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--      <b>pragma</b> Import (C, <A HREF="terminal_interface-curses__adb.htm#ref_2405_7">C_Number_Of_Colors</A>, "COLORS");
-+      <FONT COLOR=red><A NAME="ref_2380_7">Result</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>pragma</b> Import (C, <A HREF="terminal_interface-curses__adb.htm#ref_2380_7">Result</A>, "COLORS");
-    <b>begin</b>
--      <b>return</b> Natural (<A HREF="terminal_interface-curses__adb.htm#ref_2405_7">C_Number_Of_Colors</A>);
-+      <b>return</b> Natural (<A HREF="terminal_interface-curses__adb.htm#ref_2380_7">Result</A>);
-    <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_421_13">Number_Of_Colors</A>;
- 
--   <b>function</b> <FONT COLOR=red><A NAME="ref_2411_13" HREF="terminal_interface-curses__ads.htm#ref_424_13">Number_Of_Color_Pairs</A></FONT> <b>return</b> Natural
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_2386_13" HREF="terminal_interface-curses__ads.htm#ref_424_13">Number_Of_Color_Pairs</A></FONT> <b>return</b> Natural
-    <b>is</b>
--      <FONT COLOR=red><A NAME="ref_2413_7">C_Number_Of_Color_Pairs</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--      <b>pragma</b> Import (C, <A HREF="terminal_interface-curses__adb.htm#ref_2413_7">C_Number_Of_Color_Pairs</A>, "COLOR_PAIRS");
-+      <FONT COLOR=red><A NAME="ref_2388_7">Result</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>pragma</b> Import (C, <A HREF="terminal_interface-curses__adb.htm#ref_2388_7">Result</A>, "COLOR_PAIRS");
-    <b>begin</b>
--      <b>return</b> Natural (<A HREF="terminal_interface-curses__adb.htm#ref_2413_7">C_Number_Of_Color_Pairs</A>);
-+      <b>return</b> Natural (<A HREF="terminal_interface-curses__adb.htm#ref_2388_7">Result</A>);
-    <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_424_13">Number_Of_Color_Pairs</A>;
-+
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2419_14" HREF="terminal_interface-curses__ads.htm#ref_1808_14">Transform_Coordinates</A></FONT>
--     (<FONT COLOR=red><A NAME="ref_2420_7" HREF="terminal_interface-curses__ads.htm#ref_1809_7">W</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--      <FONT COLOR=red><A NAME="ref_2421_7" HREF="terminal_interface-curses__ads.htm#ref_1810_7">Line</A></FONT>   : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_2422_7" HREF="terminal_interface-curses__ads.htm#ref_1811_7">Column</A></FONT> : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
--      <FONT COLOR=red><A NAME="ref_2423_7" HREF="terminal_interface-curses__ads.htm#ref_1812_7">Dir</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1807_9">Transform_Direction</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1807_33">From_Screen</A>)
--   <b>is</b>
--      <b>type</b> <FONT COLOR=red><A NAME="ref_2425_12">Int_Access</A></FONT> <b>is</b> <b>access</b> <b>all</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2426_16">Transform</A></FONT> (<FONT COLOR=red><A NAME="ref_2426_27" HREF="terminal_interface-curses__adb.htm#ref_2426_16">W</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                          <FONT COLOR=red><A NAME="ref_2427_27" HREF="terminal_interface-curses__adb.htm#ref_2426_16">Y</A></FONT>, <FONT COLOR=red><A NAME="ref_2427_30" HREF="terminal_interface-curses__adb.htm#ref_2426_16">X</A></FONT> : <A HREF="terminal_interface-curses__adb.htm#ref_2425_12">Int_Access</A>;
--                          <FONT COLOR=red><A NAME="ref_2428_27" HREF="terminal_interface-curses__adb.htm#ref_2426_16">Dir</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2395_14" HREF="terminal_interface-curses__ads.htm#ref_1814_14">Transform_Coordinates</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_2396_7" HREF="terminal_interface-curses__ads.htm#ref_1815_7">W</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_2397_7" HREF="terminal_interface-curses__ads.htm#ref_1816_7">Line</A></FONT>   : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_2398_7" HREF="terminal_interface-curses__ads.htm#ref_1817_7">Column</A></FONT> : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_2399_7" HREF="terminal_interface-curses__ads.htm#ref_1818_7">Dir</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1813_9">Transform_Direction</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1813_33">From_Screen</A>)
-+   <b>is</b>
-+      <b>type</b> <FONT COLOR=red><A NAME="ref_2401_12">Int_Access</A></FONT> <b>is</b> <b>access</b> <b>all</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2402_16">Transform</A></FONT> (<FONT COLOR=red><A NAME="ref_2402_27" HREF="terminal_interface-curses__adb.htm#ref_2402_16">W</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                          <FONT COLOR=red><A NAME="ref_2403_27" HREF="terminal_interface-curses__adb.htm#ref_2402_16">Y</A></FONT>, <FONT COLOR=red><A NAME="ref_2403_30" HREF="terminal_interface-curses__adb.htm#ref_2402_16">X</A></FONT> : <A HREF="terminal_interface-curses__adb.htm#ref_2401_12">Int_Access</A>;
-+                          <FONT COLOR=red><A NAME="ref_2404_27" HREF="terminal_interface-curses__adb.htm#ref_2402_16">Dir</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, Transform, "wmouse_trafo");
- 
--      <FONT COLOR=red><A NAME="ref_2431_7">X</A></FONT> : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1811_7">Column</A>);
--      <FONT COLOR=red><A NAME="ref_2432_7">Y</A></FONT> : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1810_7">Line</A>);
--      <FONT COLOR=red><A NAME="ref_2433_7">D</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1931_4">Curses_Bool_False</A>;
--      <FONT COLOR=red><A NAME="ref_2434_7">R</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <FONT COLOR=red><A NAME="ref_2407_7">X</A></FONT> : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1817_7">Column</A>);
-+      <FONT COLOR=red><A NAME="ref_2408_7">Y</A></FONT> : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1816_7">Line</A>);
-+      <FONT COLOR=red><A NAME="ref_2409_7">D</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1927_4">Curses_Bool_False</A>;
-+      <FONT COLOR=red><A NAME="ref_2410_7">R</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_1812_7">Dir</A> = <A HREF="terminal_interface-curses__ads.htm#ref_1807_46">To_Screen</A> <b>then</b>
--         <A HREF="terminal_interface-curses__adb.htm#ref_2433_7">D</A> := 1;
-+      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_1818_7">Dir</A> = <A HREF="terminal_interface-curses__ads.htm#ref_1813_46">To_Screen</A> <b>then</b>
-+         <A HREF="terminal_interface-curses__adb.htm#ref_2409_7">D</A> := 1;
-       <b>end</b> <b>if</b>;
--      <A HREF="terminal_interface-curses__adb.htm#ref_2434_7">R</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2426_16">Transform</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1809_7">W</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2432_7">Y</A>'<b>Access</b>, <A HREF="terminal_interface-curses__adb.htm#ref_2431_7">X</A>'<b>Access</b>, <A HREF="terminal_interface-curses__adb.htm#ref_2433_7">D</A>);
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2434_7">R</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">Curses_False</A> <b>then</b>
-+      <A HREF="terminal_interface-curses__adb.htm#ref_2410_7">R</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2402_16">Transform</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1815_7">W</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2408_7">Y</A>'<b>Access</b>, <A HREF="terminal_interface-curses__adb.htm#ref_2407_7">X</A>'<b>Access</b>, <A HREF="terminal_interface-curses__adb.htm#ref_2409_7">D</A>);
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2410_7">R</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">Curses_False</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>else</b>
--         <A HREF="terminal_interface-curses__ads.htm#ref_1810_7">Line</A>   := <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2432_7">Y</A>);
--         <A HREF="terminal_interface-curses__ads.htm#ref_1811_7">Column</A> := <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2431_7">X</A>);
-+         <A HREF="terminal_interface-curses__ads.htm#ref_1816_7">Line</A>   := <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2408_7">Y</A>);
-+         <A HREF="terminal_interface-curses__ads.htm#ref_1817_7">Column</A> := <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2407_7">X</A>);
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1808_14">Transform_Coordinates</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1814_14">Transform_Coordinates</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2448_14" HREF="terminal_interface-curses__ads.htm#ref_1825_14">Use_Default_Colors</A></FONT> <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2449_16">C_Use_Default_Colors</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2424_14" HREF="terminal_interface-curses__ads.htm#ref_1831_14">Use_Default_Colors</A></FONT> <b>is</b>
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2425_16">C_Use_Default_Colors</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, C_Use_Default_Colors, "use_default_colors");
--      <FONT COLOR=red><A NAME="ref_2451_7">Err</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2449_16">C_Use_Default_Colors</A>;
-+      <FONT COLOR=red><A NAME="ref_2427_7">Err</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2425_16">C_Use_Default_Colors</A>;
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2451_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2427_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1825_14">Use_Default_Colors</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1831_14">Use_Default_Colors</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2458_14" HREF="terminal_interface-curses__ads.htm#ref_1830_14">Assume_Default_Colors</A></FONT> (<FONT COLOR=red><A NAME="ref_2458_37" HREF="terminal_interface-curses__ads.htm#ref_1830_37">Fore</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := <A HREF="terminal_interface-curses__ads.htm#ref_285_4">Default_Color</A>;
--                                    <FONT COLOR=red><A NAME="ref_2459_37" HREF="terminal_interface-curses__ads.htm#ref_1831_37">Back</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := <A HREF="terminal_interface-curses__ads.htm#ref_285_4">Default_Color</A>)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2434_14" HREF="terminal_interface-curses__ads.htm#ref_1836_14">Assume_Default_Colors</A></FONT> (<FONT COLOR=red><A NAME="ref_2434_37" HREF="terminal_interface-curses__ads.htm#ref_1836_37">Fore</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := <A HREF="terminal_interface-curses__ads.htm#ref_285_4">Default_Color</A>;
-+                                    <FONT COLOR=red><A NAME="ref_2435_37" HREF="terminal_interface-curses__ads.htm#ref_1837_37">Back</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := <A HREF="terminal_interface-curses__ads.htm#ref_285_4">Default_Color</A>)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2461_16">C_Assume_Default_Colors</A></FONT> (<FONT COLOR=red><A NAME="ref_2461_41" HREF="terminal_interface-curses__adb.htm#ref_2461_16">Fore</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--                                        <FONT COLOR=red><A NAME="ref_2462_41" HREF="terminal_interface-curses__adb.htm#ref_2461_16">Back</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2437_16">C_Assume_Default_Colors</A></FONT> (<FONT COLOR=red><A NAME="ref_2437_41" HREF="terminal_interface-curses__adb.htm#ref_2437_16">Fore</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+                                        <FONT COLOR=red><A NAME="ref_2438_41" HREF="terminal_interface-curses__adb.htm#ref_2437_16">Back</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, C_Assume_Default_Colors, "assume_default_colors");
- 
--      <FONT COLOR=red><A NAME="ref_2465_7">Err</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2461_16">C_Assume_Default_Colors</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1830_37">Fore</A>),
--                                                       <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1831_37">Back</A>));
-+      <FONT COLOR=red><A NAME="ref_2441_7">Err</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2437_16">C_Assume_Default_Colors</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1836_37">Fore</A>),
-+                                                       <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1837_37">Back</A>));
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2465_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2441_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1830_14">Assume_Default_Colors</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1836_14">Assume_Default_Colors</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>function</b> <FONT COLOR=red><A NAME="ref_2473_13" HREF="terminal_interface-curses__ads.htm#ref_1840_13">Curses_Version</A></FONT> <b>return</b> String
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_2449_13" HREF="terminal_interface-curses__ads.htm#ref_1846_13">Curses_Version</A></FONT> <b>return</b> String
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2475_16">curses_versionC</A></FONT> <b>return</b> chars_ptr;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2451_16">curses_versionC</A></FONT> <b>return</b> chars_ptr;
-       <b>pragma</b> Import (C, curses_versionC, "curses_version");
--      <FONT COLOR=red><A NAME="ref_2477_7">Result</A></FONT> : <b>constant</b> chars_ptr := <A HREF="terminal_interface-curses__adb.htm#ref_2475_16">curses_versionC</A>;
-+      <FONT COLOR=red><A NAME="ref_2453_7">Result</A></FONT> : <b>constant</b> chars_ptr := <A HREF="terminal_interface-curses__adb.htm#ref_2451_16">curses_versionC</A>;
-    <b>begin</b>
--      <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_121_13">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2477_7">Result</A>);
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1840_13">Curses_Version</A>;
-+      <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_121_13">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2453_7">Result</A>);
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1846_13">Curses_Version</A>;
-+<FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2458_14" HREF="terminal_interface-curses__ads.htm#ref_1859_14">Curses_Free_All</A></FONT> <b>is</b>
-+      <b>procedure</b> <FONT COLOR=red><A NAME="ref_2459_17">curses_freeall</A></FONT>;
-+      <b>pragma</b> Import (C, curses_freeall, "_nc_freeall");
-+   <b>begin</b>
-+      <FONT COLOR=green><EM>--  Use this only for testing: you cannot use curses after calling it,</EM></FONT>
-+      <FONT COLOR=green><EM>--  so it has to be the "last" thing done before exiting the program.</EM></FONT>
-+      <FONT COLOR=green><EM>--  This will not really free ALL of memory used by curses.  That is</EM></FONT>
-+      <FONT COLOR=green><EM>--  because it cannot free the memory used for stdout's setbuf.  The</EM></FONT>
-+      <FONT COLOR=green><EM>--  _nc_free_and_exit() procedure can do that, but it can be invoked</EM></FONT>
-+      <FONT COLOR=green><EM>--  safely only from C - and again, that only as the "last" thing done</EM></FONT>
-+      <FONT COLOR=green><EM>--  before exiting the program.</EM></FONT>
-+      <A HREF="terminal_interface-curses__adb.htm#ref_2459_17">curses_freeall</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1859_14">Curses_Free_All</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>function</b> <FONT COLOR=red><A NAME="ref_2482_13" HREF="terminal_interface-curses__ads.htm#ref_1845_13">Use_Extended_Names</A></FONT> (<FONT COLOR=red><A NAME="ref_2482_33" HREF="terminal_interface-curses__ads.htm#ref_1845_33">Enable</A></FONT> : Boolean) <b>return</b> Boolean
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_2472_13" HREF="terminal_interface-curses__ads.htm#ref_1851_13">Use_Extended_Names</A></FONT> (<FONT COLOR=red><A NAME="ref_2472_33" HREF="terminal_interface-curses__ads.htm#ref_1851_33">Enable</A></FONT> : Boolean) <b>return</b> Boolean
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2484_16">use_extended_namesC</A></FONT> (<FONT COLOR=red><A NAME="ref_2484_37" HREF="terminal_interface-curses__adb.htm#ref_2484_16">e</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2474_16">use_extended_namesC</A></FONT> (<FONT COLOR=red><A NAME="ref_2474_37" HREF="terminal_interface-curses__adb.htm#ref_2474_16">e</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, use_extended_namesC, "use_extended_names");
- 
--      <FONT COLOR=red><A NAME="ref_2487_7">Res</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> :=
--         <A HREF="terminal_interface-curses__adb.htm#ref_2484_16">use_extended_namesC</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1845_33">Enable</A>)));
-+      <FONT COLOR=red><A NAME="ref_2477_7">Res</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> :=
-+         <A HREF="terminal_interface-curses__adb.htm#ref_2474_16">use_extended_namesC</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1851_33">Enable</A>)));
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2487_7">Res</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1931_4">Curses_Bool_False</A>) <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2477_7">Res</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1927_4">Curses_Bool_False</A>) <b>then</b>
-          <b>return</b> False;
-       <b>else</b>
-          <b>return</b> True;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1845_13">Use_Extended_Names</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1851_13">Use_Extended_Names</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2497_14" HREF="terminal_interface-curses__ads.htm#ref_1853_14">Screen_Dump_To_File</A></FONT> (<FONT COLOR=red><A NAME="ref_2497_35" HREF="terminal_interface-curses__ads.htm#ref_1853_35">Filename</A></FONT> : <b>in</b> String)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2487_14" HREF="terminal_interface-curses__ads.htm#ref_1867_14">Screen_Dump_To_File</A></FONT> (<FONT COLOR=red><A NAME="ref_2487_35" HREF="terminal_interface-curses__ads.htm#ref_1867_35">Filename</A></FONT> : <b>in</b> String)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2499_16">scr_dump</A></FONT> (<FONT COLOR=red><A NAME="ref_2499_26" HREF="terminal_interface-curses__adb.htm#ref_2499_16">f</A></FONT> : char_array) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2489_16">scr_dump</A></FONT> (<FONT COLOR=red><A NAME="ref_2489_26" HREF="terminal_interface-curses__adb.htm#ref_2489_16">f</A></FONT> : char_array) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, scr_dump, "scr_dump");
--      <FONT COLOR=red><A NAME="ref_2501_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1853_35">Filename</A>'Length);
--      <FONT COLOR=red><A NAME="ref_2502_7">Length</A></FONT> : size_t;
-+      <FONT COLOR=red><A NAME="ref_2491_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1867_35">Filename</A>'Length);
-+      <FONT COLOR=red><A NAME="ref_2492_7">Length</A></FONT> : size_t;
-    <b>begin</b>
--      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1853_35">Filename</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2501_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2502_7">Length</A>);
--      <b>if</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> = <A HREF="terminal_interface-curses__adb.htm#ref_2499_16">scr_dump</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2501_7">Txt</A>) <b>then</b>
-+      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1867_35">Filename</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2491_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2492_7">Length</A>);
-+      <b>if</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> = <A HREF="terminal_interface-curses__adb.htm#ref_2489_16">scr_dump</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2491_7">Txt</A>) <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1853_14">Screen_Dump_To_File</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1867_14">Screen_Dump_To_File</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2510_14" HREF="terminal_interface-curses__ads.htm#ref_1857_14">Screen_Restore_From_File</A></FONT> (<FONT COLOR=red><A NAME="ref_2510_40" HREF="terminal_interface-curses__ads.htm#ref_1857_40">Filename</A></FONT> : <b>in</b> String)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2500_14" HREF="terminal_interface-curses__ads.htm#ref_1871_14">Screen_Restore_From_File</A></FONT> (<FONT COLOR=red><A NAME="ref_2500_40" HREF="terminal_interface-curses__ads.htm#ref_1871_40">Filename</A></FONT> : <b>in</b> String)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2512_16">scr_restore</A></FONT> (<FONT COLOR=red><A NAME="ref_2512_29" HREF="terminal_interface-curses__adb.htm#ref_2512_16">f</A></FONT> : char_array) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2502_16">scr_restore</A></FONT> (<FONT COLOR=red><A NAME="ref_2502_29" HREF="terminal_interface-curses__adb.htm#ref_2502_16">f</A></FONT> : char_array) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, scr_restore, "scr_restore");
--      <FONT COLOR=red><A NAME="ref_2514_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1857_40">Filename</A>'Length);
--      <FONT COLOR=red><A NAME="ref_2515_7">Length</A></FONT> : size_t;
-+      <FONT COLOR=red><A NAME="ref_2504_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1871_40">Filename</A>'Length);
-+      <FONT COLOR=red><A NAME="ref_2505_7">Length</A></FONT> : size_t;
-    <b>begin</b>
--      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1857_40">Filename</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2514_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2515_7">Length</A>);
--      <b>if</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> = <A HREF="terminal_interface-curses__adb.htm#ref_2512_16">scr_restore</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2514_7">Txt</A>)  <b>then</b>
-+      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1871_40">Filename</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2504_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2505_7">Length</A>);
-+      <b>if</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> = <A HREF="terminal_interface-curses__adb.htm#ref_2502_16">scr_restore</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2504_7">Txt</A>)  <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1857_14">Screen_Restore_From_File</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1871_14">Screen_Restore_From_File</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2523_14" HREF="terminal_interface-curses__ads.htm#ref_1861_14">Screen_Init_From_File</A></FONT> (<FONT COLOR=red><A NAME="ref_2523_37" HREF="terminal_interface-curses__ads.htm#ref_1861_37">Filename</A></FONT> : <b>in</b> String)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2513_14" HREF="terminal_interface-curses__ads.htm#ref_1875_14">Screen_Init_From_File</A></FONT> (<FONT COLOR=red><A NAME="ref_2513_37" HREF="terminal_interface-curses__ads.htm#ref_1875_37">Filename</A></FONT> : <b>in</b> String)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2525_16">scr_init</A></FONT> (<FONT COLOR=red><A NAME="ref_2525_26" HREF="terminal_interface-curses__adb.htm#ref_2525_16">f</A></FONT> : char_array) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2515_16">scr_init</A></FONT> (<FONT COLOR=red><A NAME="ref_2515_26" HREF="terminal_interface-curses__adb.htm#ref_2515_16">f</A></FONT> : char_array) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, scr_init, "scr_init");
--      <FONT COLOR=red><A NAME="ref_2527_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1861_37">Filename</A>'Length);
--      <FONT COLOR=red><A NAME="ref_2528_7">Length</A></FONT> : size_t;
-+      <FONT COLOR=red><A NAME="ref_2517_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1875_37">Filename</A>'Length);
-+      <FONT COLOR=red><A NAME="ref_2518_7">Length</A></FONT> : size_t;
-    <b>begin</b>
--      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1861_37">Filename</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2527_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2528_7">Length</A>);
--      <b>if</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> = <A HREF="terminal_interface-curses__adb.htm#ref_2525_16">scr_init</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2527_7">Txt</A>) <b>then</b>
-+      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1875_37">Filename</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2517_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2518_7">Length</A>);
-+      <b>if</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> = <A HREF="terminal_interface-curses__adb.htm#ref_2515_16">scr_init</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2517_7">Txt</A>) <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1861_14">Screen_Init_From_File</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1875_14">Screen_Init_From_File</A>;
- 
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2536_14" HREF="terminal_interface-curses__ads.htm#ref_1865_14">Screen_Set_File</A></FONT> (<FONT COLOR=red><A NAME="ref_2536_31" HREF="terminal_interface-curses__ads.htm#ref_1865_31">Filename</A></FONT> : <b>in</b> String)
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2526_14" HREF="terminal_interface-curses__ads.htm#ref_1879_14">Screen_Set_File</A></FONT> (<FONT COLOR=red><A NAME="ref_2526_31" HREF="terminal_interface-curses__ads.htm#ref_1879_31">Filename</A></FONT> : <b>in</b> String)
-    <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2538_16">scr_set</A></FONT> (<FONT COLOR=red><A NAME="ref_2538_25" HREF="terminal_interface-curses__adb.htm#ref_2538_16">f</A></FONT> : char_array) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2528_16">scr_set</A></FONT> (<FONT COLOR=red><A NAME="ref_2528_25" HREF="terminal_interface-curses__adb.htm#ref_2528_16">f</A></FONT> : char_array) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, scr_set, "scr_set");
--      <FONT COLOR=red><A NAME="ref_2540_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1865_31">Filename</A>'Length);
--      <FONT COLOR=red><A NAME="ref_2541_7">Length</A></FONT> : size_t;
-+      <FONT COLOR=red><A NAME="ref_2530_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1879_31">Filename</A>'Length);
-+      <FONT COLOR=red><A NAME="ref_2531_7">Length</A></FONT> : size_t;
-    <b>begin</b>
--      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1865_31">Filename</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2540_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2541_7">Length</A>);
--      <b>if</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> = <A HREF="terminal_interface-curses__adb.htm#ref_2538_16">scr_set</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2540_7">Txt</A>) <b>then</b>
-+      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1879_31">Filename</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2530_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2531_7">Length</A>);
-+      <b>if</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> = <A HREF="terminal_interface-curses__adb.htm#ref_2528_16">scr_set</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2530_7">Txt</A>) <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1865_14">Screen_Set_File</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1879_14">Screen_Set_File</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2549_14" HREF="terminal_interface-curses__ads.htm#ref_1897_14">Resize</A></FONT> (<FONT COLOR=red><A NAME="ref_2549_22" HREF="terminal_interface-curses__ads.htm#ref_1897_22">Win</A></FONT>               : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
--                     <FONT COLOR=red><A NAME="ref_2550_22" HREF="terminal_interface-curses__ads.htm#ref_1898_22">Number_Of_Lines</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
--                     <FONT COLOR=red><A NAME="ref_2551_22" HREF="terminal_interface-curses__ads.htm#ref_1899_22">Number_Of_Columns</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>) <b>is</b>
--      <b>function</b> <FONT COLOR=red><A NAME="ref_2552_16">wresize</A></FONT> (<FONT COLOR=red><A NAME="ref_2552_25" HREF="terminal_interface-curses__adb.htm#ref_2552_16">win</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                        <FONT COLOR=red><A NAME="ref_2553_25" HREF="terminal_interface-curses__adb.htm#ref_2552_16">lines</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
--                        <FONT COLOR=red><A NAME="ref_2554_25" HREF="terminal_interface-curses__adb.htm#ref_2552_16">columns</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2539_14" HREF="terminal_interface-curses__ads.htm#ref_1911_14">Resize</A></FONT> (<FONT COLOR=red><A NAME="ref_2539_22" HREF="terminal_interface-curses__ads.htm#ref_1911_22">Win</A></FONT>               : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                     <FONT COLOR=red><A NAME="ref_2540_22" HREF="terminal_interface-curses__ads.htm#ref_1912_22">Number_Of_Lines</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+                     <FONT COLOR=red><A NAME="ref_2541_22" HREF="terminal_interface-curses__ads.htm#ref_1913_22">Number_Of_Columns</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>) <b>is</b>
-+      <b>function</b> <FONT COLOR=red><A NAME="ref_2542_16">wresize</A></FONT> (<FONT COLOR=red><A NAME="ref_2542_25" HREF="terminal_interface-curses__adb.htm#ref_2542_16">win</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                        <FONT COLOR=red><A NAME="ref_2543_25" HREF="terminal_interface-curses__adb.htm#ref_2542_16">lines</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+                        <FONT COLOR=red><A NAME="ref_2544_25" HREF="terminal_interface-curses__adb.htm#ref_2542_16">columns</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-       <b>pragma</b> Import (C, wresize);
-    <b>begin</b>
--      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2552_16">wresize</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1897_22">Win</A>,
--                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1898_22">Number_Of_Lines</A>),
--                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1899_22">Number_Of_Columns</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2542_16">wresize</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1911_22">Win</A>,
-+                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1912_22">Number_Of_Lines</A>),
-+                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1913_22">Number_Of_Columns</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-       <b>end</b> <b>if</b>;
--   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1897_14">Resize</A>;
-+   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1911_14">Resize</A>;
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- 
- <b>end</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>;
-diff -Naur ncurses-5.6.orig/doc/html/ada/terminal_interface-curses__ads.htm ncurses-5.6/doc/html/ada/terminal_interface-curses__ads.htm
---- ncurses-5.6.orig/doc/html/ada/terminal_interface-curses__ads.htm	2006-09-23 16:31:33.000000000 -0400
-+++ ncurses-5.6/doc/html/ada/terminal_interface-curses__ads.htm	2008-06-18 06:49:44.000000000 -0400
-@@ -3,7 +3,6 @@
- <BODY>
- <HR><DIV ALIGN="center"><H1> File : terminal_interface-curses.ads </H1></DIV><HR>
- <PRE>
--
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
- <FONT COLOR=green><EM>--                           <A HREF="http://www.gnat.com">GNAT</A> ncurses Binding                           --</EM></FONT>
-@@ -13,7 +12,7 @@
- <FONT COLOR=green><EM>--                                 S P E C                                  --</EM></FONT>
- <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
--<FONT COLOR=green><EM>-- Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.              --</EM></FONT>
-+<FONT COLOR=green><EM>-- Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              --</EM></FONT>
- <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
- <FONT COLOR=green><EM>-- Permission is hereby granted, free of charge, to any person obtaining a  --</EM></FONT>
- <FONT COLOR=green><EM>-- copy of this software and associated documentation files (the            --</EM></FONT>
-@@ -41,296 +40,296 @@
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- <FONT COLOR=green><EM>--  Author:  Juergen Pfeifer, 1996</EM></FONT>
- <FONT COLOR=green><EM>--  Version Control:</EM></FONT>
--<FONT COLOR=green><EM>--  @Revision: 1.37 @</EM></FONT>
--<FONT COLOR=green><EM>--  @Date: 2006/06/25 14:30:22 @</EM></FONT>
-+<FONT COLOR=green><EM>--  @Revision: 1.41 @</EM></FONT>
-+<FONT COLOR=green><EM>--  @Date: 2007/05/05 20:33:52 @</EM></FONT>
- <FONT COLOR=green><EM>--  Binding Version 01.00</EM></FONT>
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- <FONT COLOR=green><EM>--  curses binding.</EM></FONT>
- <FONT COLOR=green><EM>--  This module is generated. Please don't change it manually!</EM></FONT>
- <FONT COLOR=green><EM>--  Run the generator instead.</EM></FONT>
- <FONT COLOR=green><EM>--  |</EM></FONT>
--<b>with</b> <A HREF="interfac__ads.htm#ref_38_9">System</A>.Storage_Elements;
--<b>with</b> Interfaces.C;   <FONT COLOR=green><EM>--  We need this for some assertions.</EM></FONT>
-+<b>with</b> System.Storage_Elements;
-+<b>with</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C;   <FONT COLOR=green><EM>--  We need this for some assertions.</EM></FONT>
- 
--<b>package</b> Terminal_Interface.Curses <b>is</b>
--   <b>pragma</b> Preelaborate (Terminal_Interface.Curses);
-+<b>package</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<FONT COLOR=red><A NAME="ref_49_28" HREF="terminal_interface-curses__adb.htm#ref_50_33">Curses</A></FONT> <b>is</b>
-+   <b>pragma</b> Preelaborate (<A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>);
-    <b>pragma</b> Linker_Options ("-lncurses");
- 
--   <FONT COLOR=red><A NAME="ref_54_4">NC_Major_Version</A></FONT> : <b>constant</b> := 5; <FONT COLOR=green><EM>--  Major version of the library</EM></FONT>
--   <FONT COLOR=red><A NAME="ref_55_4">NC_Minor_Version</A></FONT> : <b>constant</b> := 5; <FONT COLOR=green><EM>--  Minor version of the library</EM></FONT>
--   NC_Version : <b>constant</b> String := "5.5";  <FONT COLOR=green><EM>--  Version of library</EM></FONT>
-+   <FONT COLOR=red><A NAME="ref_53_4">NC_Major_Version</A></FONT> : <b>constant</b> := 5; <FONT COLOR=green><EM>--  Major version of the library</EM></FONT>
-+   <FONT COLOR=red><A NAME="ref_54_4">NC_Minor_Version</A></FONT> : <b>constant</b> := 6; <FONT COLOR=green><EM>--  Minor version of the library</EM></FONT>
-+   <FONT COLOR=red><A NAME="ref_55_4">NC_Version</A></FONT> : <b>constant</b> String := "5.6";  <FONT COLOR=green><EM>--  Version of library</EM></FONT>
- 
--   <b>type</b> Window <b>is</b> <b>private</b>;
--   Null_Window : <b>constant</b> Window;
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_57_9">Window</A></FONT> <b>is</b> <b>private</b>;
-+   <FONT COLOR=red><A NAME="ref_58_4">Null_Window</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
- 
--   <b>type</b> <FONT COLOR=red><A NAME="ref_61_9">Line_Position</A></FONT>   <b>is</b> <b>new</b> Natural; <FONT COLOR=green><EM>--  line coordinate</EM></FONT>
--   <b>type</b> Column_Position <b>is</b> <b>new</b> Natural; <FONT COLOR=green><EM>--  column coordinate</EM></FONT>
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_60_9">Line_Position</A></FONT>   <b>is</b> <b>new</b> Natural; <FONT COLOR=green><EM>--  line coordinate</EM></FONT>
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_61_9">Column_Position</A></FONT> <b>is</b> <b>new</b> Natural; <FONT COLOR=green><EM>--  column coordinate</EM></FONT>
- 
--   <b>subtype</b> Line_Count   <b>is</b> Line_Position   <b>range</b> 1 .. Line_Position'Last;
-+   <b>subtype</b> <FONT COLOR=red><A NAME="ref_63_12">Line_Count</A></FONT>   <b>is</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>   <b>range</b> 1 .. <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>'Last;
-    <FONT COLOR=green><EM>--  Type to count lines. We do not allow null windows, so must be positive</EM></FONT>
--   <b>subtype</b> Column_Count <b>is</b> Column_Position <b>range</b> 1 .. Column_Position'Last;
-+   <b>subtype</b> <FONT COLOR=red><A NAME="ref_65_12">Column_Count</A></FONT> <b>is</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> <b>range</b> 1 .. <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>'Last;
-    <FONT COLOR=green><EM>--  Type to count columns. We do not allow null windows, so must be positive</EM></FONT>
- 
--   <b>type</b> Key_Code <b>is</b> <b>new</b> Integer;
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_68_9">Key_Code</A></FONT> <b>is</b> <b>new</b> Integer;
-    <FONT COLOR=green><EM>--  That is anything including real characters, special keys and logical</EM></FONT>
-    <FONT COLOR=green><EM>--  request codes.</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  FIXME: The "-1" should be Curses_Err</EM></FONT>
--   <b>subtype</b> Real_Key_Code <b>is</b> Key_Code <b>range</b> -1 .. 8#777#;
-+   <b>subtype</b> <FONT COLOR=red><A NAME="ref_73_12">Real_Key_Code</A></FONT> <b>is</b> <A HREF="terminal_interface-curses__ads.htm#ref_68_9">Key_Code</A> <b>range</b> -1 .. 8#777#;
-    <FONT COLOR=green><EM>--  This are the codes that potentially represent a real keystroke.</EM></FONT>
-    <FONT COLOR=green><EM>--  Not all codes may be possible on a specific terminal. To check the</EM></FONT>
-    <FONT COLOR=green><EM>--  availability of a special key, the Has_Key function is provided.</EM></FONT>
- 
--   <b>subtype</b> Special_Key_Code <b>is</b> Real_Key_Code
--     <b>range</b> 8#400# .. Real_Key_Code'Last;
-+   <b>subtype</b> <FONT COLOR=red><A NAME="ref_78_12">Special_Key_Code</A></FONT> <b>is</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>
-+     <b>range</b> 8#400# .. <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>'Last;
-    <FONT COLOR=green><EM>--  Type for a function- or special key number</EM></FONT>
- 
--   <b>subtype</b> Normal_Key_Code <b>is</b> Real_Key_Code <b>range</b>
-+   <b>subtype</b> <FONT COLOR=red><A NAME="ref_82_12">Normal_Key_Code</A></FONT> <b>is</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A> <b>range</b>
-      Character'Pos (Character'First) .. Character'Pos (Character'Last);
-    <FONT COLOR=green><EM>--  This are the codes for regular (incl. non-graphical) characters.</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  Constants for function- and special keys</EM></FONT>
-    <FONT COLOR=green><EM>--</EM></FONT>
--   <FONT COLOR=red><A NAME="ref_89_4">Key_None</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#400#;
--   <FONT COLOR=red><A NAME="ref_90_4">Key_Code_Yes</A></FONT>                   : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#400#;
--   <FONT COLOR=red><A NAME="ref_91_4">Key_Min</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#401#;
--   <FONT COLOR=red><A NAME="ref_92_4">Key_Break</A></FONT>                      : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#401#;
--   <FONT COLOR=red><A NAME="ref_93_4">Key_Cursor_Down</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#402#;
--   <FONT COLOR=red><A NAME="ref_94_4">Key_Cursor_Up</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#403#;
--   <FONT COLOR=red><A NAME="ref_95_4">Key_Cursor_Left</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#404#;
--   <FONT COLOR=red><A NAME="ref_96_4">Key_Cursor_Right</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#405#;
--   <FONT COLOR=red><A NAME="ref_97_4">Key_Home</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#406#;
--   <FONT COLOR=red><A NAME="ref_98_4">Key_Backspace</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#407#;
--   <FONT COLOR=red><A NAME="ref_99_4">Key_F0</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#410#;
--   <FONT COLOR=red><A NAME="ref_100_4">Key_F1</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#411#;
--   <FONT COLOR=red><A NAME="ref_101_4">Key_F2</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#412#;
--   <FONT COLOR=red><A NAME="ref_102_4">Key_F3</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#413#;
--   <FONT COLOR=red><A NAME="ref_103_4">Key_F4</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#414#;
--   <FONT COLOR=red><A NAME="ref_104_4">Key_F5</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#415#;
--   <FONT COLOR=red><A NAME="ref_105_4">Key_F6</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#416#;
--   <FONT COLOR=red><A NAME="ref_106_4">Key_F7</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#417#;
--   <FONT COLOR=red><A NAME="ref_107_4">Key_F8</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#420#;
--   <FONT COLOR=red><A NAME="ref_108_4">Key_F9</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#421#;
--   <FONT COLOR=red><A NAME="ref_109_4">Key_F10</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#422#;
--   <FONT COLOR=red><A NAME="ref_110_4">Key_F11</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#423#;
--   <FONT COLOR=red><A NAME="ref_111_4">Key_F12</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#424#;
--   <FONT COLOR=red><A NAME="ref_112_4">Key_F13</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#425#;
--   <FONT COLOR=red><A NAME="ref_113_4">Key_F14</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#426#;
--   <FONT COLOR=red><A NAME="ref_114_4">Key_F15</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#427#;
--   <FONT COLOR=red><A NAME="ref_115_4">Key_F16</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#430#;
--   <FONT COLOR=red><A NAME="ref_116_4">Key_F17</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#431#;
--   <FONT COLOR=red><A NAME="ref_117_4">Key_F18</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#432#;
--   <FONT COLOR=red><A NAME="ref_118_4">Key_F19</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#433#;
--   <FONT COLOR=red><A NAME="ref_119_4">Key_F20</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#434#;
--   <FONT COLOR=red><A NAME="ref_120_4">Key_F21</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#435#;
--   <FONT COLOR=red><A NAME="ref_121_4">Key_F22</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#436#;
--   <FONT COLOR=red><A NAME="ref_122_4">Key_F23</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#437#;
--   <FONT COLOR=red><A NAME="ref_123_4">Key_F24</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#440#;
--   <FONT COLOR=red><A NAME="ref_124_4">Key_Delete_Line</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#510#;
--   <FONT COLOR=red><A NAME="ref_125_4">Key_Insert_Line</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#511#;
--   <FONT COLOR=red><A NAME="ref_126_4">Key_Delete_Char</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#512#;
--   <FONT COLOR=red><A NAME="ref_127_4">Key_Insert_Char</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#513#;
--   <FONT COLOR=red><A NAME="ref_128_4">Key_Exit_Insert_Mode</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#514#;
--   <FONT COLOR=red><A NAME="ref_129_4">Key_Clear_Screen</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#515#;
--   <FONT COLOR=red><A NAME="ref_130_4">Key_Clear_End_Of_Screen</A></FONT>        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#516#;
--   <FONT COLOR=red><A NAME="ref_131_4">Key_Clear_End_Of_Line</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#517#;
--   <FONT COLOR=red><A NAME="ref_132_4">Key_Scroll_1_Forward</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#520#;
--   <FONT COLOR=red><A NAME="ref_133_4">Key_Scroll_1_Backward</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#521#;
--   <FONT COLOR=red><A NAME="ref_134_4">Key_Next_Page</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#522#;
--   <FONT COLOR=red><A NAME="ref_135_4">Key_Previous_Page</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#523#;
--   <FONT COLOR=red><A NAME="ref_136_4">Key_Set_Tab</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#524#;
--   <FONT COLOR=red><A NAME="ref_137_4">Key_Clear_Tab</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#525#;
--   <FONT COLOR=red><A NAME="ref_138_4">Key_Clear_All_Tabs</A></FONT>             : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#526#;
--   <FONT COLOR=red><A NAME="ref_139_4">Key_Enter_Or_Send</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#527#;
--   <FONT COLOR=red><A NAME="ref_140_4">Key_Soft_Reset</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#530#;
--   <FONT COLOR=red><A NAME="ref_141_4">Key_Reset</A></FONT>                      : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#531#;
--   <FONT COLOR=red><A NAME="ref_142_4">Key_Print</A></FONT>                      : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#532#;
--   <FONT COLOR=red><A NAME="ref_143_4">Key_Bottom</A></FONT>                     : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#533#;
--   <FONT COLOR=red><A NAME="ref_144_4">Key_Upper_Left_Of_Keypad</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#534#;
--   <FONT COLOR=red><A NAME="ref_145_4">Key_Upper_Right_Of_Keypad</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#535#;
--   <FONT COLOR=red><A NAME="ref_146_4">Key_Center_Of_Keypad</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#536#;
--   <FONT COLOR=red><A NAME="ref_147_4">Key_Lower_Left_Of_Keypad</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#537#;
--   <FONT COLOR=red><A NAME="ref_148_4">Key_Lower_Right_Of_Keypad</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#540#;
--   <FONT COLOR=red><A NAME="ref_149_4">Key_Back_Tab</A></FONT>                   : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#541#;
--   <FONT COLOR=red><A NAME="ref_150_4">Key_Beginning</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#542#;
--   <FONT COLOR=red><A NAME="ref_151_4">Key_Cancel</A></FONT>                     : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#543#;
--   <FONT COLOR=red><A NAME="ref_152_4">Key_Close</A></FONT>                      : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#544#;
--   <FONT COLOR=red><A NAME="ref_153_4">Key_Command</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#545#;
--   <FONT COLOR=red><A NAME="ref_154_4">Key_Copy</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#546#;
--   <FONT COLOR=red><A NAME="ref_155_4">Key_Create</A></FONT>                     : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#547#;
--   <FONT COLOR=red><A NAME="ref_156_4">Key_End</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#550#;
--   <FONT COLOR=red><A NAME="ref_157_4">Key_Exit</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#551#;
--   <FONT COLOR=red><A NAME="ref_158_4">Key_Find</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#552#;
--   <FONT COLOR=red><A NAME="ref_159_4">Key_Help</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#553#;
--   <FONT COLOR=red><A NAME="ref_160_4">Key_Mark</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#554#;
--   <FONT COLOR=red><A NAME="ref_161_4">Key_Message</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#555#;
--   <FONT COLOR=red><A NAME="ref_162_4">Key_Move</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#556#;
--   <FONT COLOR=red><A NAME="ref_163_4">Key_Next</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#557#;
--   <FONT COLOR=red><A NAME="ref_164_4">Key_Open</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#560#;
--   <FONT COLOR=red><A NAME="ref_165_4">Key_Options</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#561#;
--   <FONT COLOR=red><A NAME="ref_166_4">Key_Previous</A></FONT>                   : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#562#;
--   <FONT COLOR=red><A NAME="ref_167_4">Key_Redo</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#563#;
--   <FONT COLOR=red><A NAME="ref_168_4">Key_Reference</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#564#;
--   <FONT COLOR=red><A NAME="ref_169_4">Key_Refresh</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#565#;
--   <FONT COLOR=red><A NAME="ref_170_4">Key_Replace</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#566#;
--   <FONT COLOR=red><A NAME="ref_171_4">Key_Restart</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#567#;
--   <FONT COLOR=red><A NAME="ref_172_4">Key_Resume</A></FONT>                     : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#570#;
--   <FONT COLOR=red><A NAME="ref_173_4">Key_Save</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#571#;
--   <FONT COLOR=red><A NAME="ref_174_4">Key_Shift_Begin</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#572#;
--   <FONT COLOR=red><A NAME="ref_175_4">Key_Shift_Cancel</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#573#;
--   <FONT COLOR=red><A NAME="ref_176_4">Key_Shift_Command</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#574#;
--   <FONT COLOR=red><A NAME="ref_177_4">Key_Shift_Copy</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#575#;
--   <FONT COLOR=red><A NAME="ref_178_4">Key_Shift_Create</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#576#;
--   <FONT COLOR=red><A NAME="ref_179_4">Key_Shift_Delete_Char</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#577#;
--   <FONT COLOR=red><A NAME="ref_180_4">Key_Shift_Delete_Line</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#600#;
--   <FONT COLOR=red><A NAME="ref_181_4">Key_Select</A></FONT>                     : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#601#;
--   <FONT COLOR=red><A NAME="ref_182_4">Key_Shift_End</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#602#;
--   <FONT COLOR=red><A NAME="ref_183_4">Key_Shift_Clear_End_Of_Line</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#603#;
--   <FONT COLOR=red><A NAME="ref_184_4">Key_Shift_Exit</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#604#;
--   <FONT COLOR=red><A NAME="ref_185_4">Key_Shift_Find</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#605#;
--   <FONT COLOR=red><A NAME="ref_186_4">Key_Shift_Help</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#606#;
--   <FONT COLOR=red><A NAME="ref_187_4">Key_Shift_Home</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#607#;
--   <FONT COLOR=red><A NAME="ref_188_4">Key_Shift_Insert_Char</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#610#;
--   <FONT COLOR=red><A NAME="ref_189_4">Key_Shift_Cursor_Left</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#611#;
--   <FONT COLOR=red><A NAME="ref_190_4">Key_Shift_Message</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#612#;
--   <FONT COLOR=red><A NAME="ref_191_4">Key_Shift_Move</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#613#;
--   <FONT COLOR=red><A NAME="ref_192_4">Key_Shift_Next_Page</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#614#;
--   <FONT COLOR=red><A NAME="ref_193_4">Key_Shift_Options</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#615#;
--   <FONT COLOR=red><A NAME="ref_194_4">Key_Shift_Previous_Page</A></FONT>        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#616#;
--   <FONT COLOR=red><A NAME="ref_195_4">Key_Shift_Print</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#617#;
--   <FONT COLOR=red><A NAME="ref_196_4">Key_Shift_Redo</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#620#;
--   <FONT COLOR=red><A NAME="ref_197_4">Key_Shift_Replace</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#621#;
--   <FONT COLOR=red><A NAME="ref_198_4">Key_Shift_Cursor_Right</A></FONT>         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#622#;
--   <FONT COLOR=red><A NAME="ref_199_4">Key_Shift_Resume</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#623#;
--   <FONT COLOR=red><A NAME="ref_200_4">Key_Shift_Save</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#624#;
--   <FONT COLOR=red><A NAME="ref_201_4">Key_Shift_Suspend</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#625#;
--   <FONT COLOR=red><A NAME="ref_202_4">Key_Shift_Undo</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#626#;
--   <FONT COLOR=red><A NAME="ref_203_4">Key_Suspend</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#627#;
--   <FONT COLOR=red><A NAME="ref_204_4">Key_Undo</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#630#;
--   <FONT COLOR=red><A NAME="ref_205_4">Key_Mouse</A></FONT>                      : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#631#;
--   Key_Resize                     : <b>constant</b> Special_Key_Code := 8#632#;
-+   <FONT COLOR=red><A NAME="ref_88_4">Key_None</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#400#;
-+   <FONT COLOR=red><A NAME="ref_89_4">Key_Code_Yes</A></FONT>                   : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#400#;
-+   <FONT COLOR=red><A NAME="ref_90_4">Key_Min</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#401#;
-+   <FONT COLOR=red><A NAME="ref_91_4">Key_Break</A></FONT>                      : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#401#;
-+   <FONT COLOR=red><A NAME="ref_92_4">Key_Cursor_Down</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#402#;
-+   <FONT COLOR=red><A NAME="ref_93_4">Key_Cursor_Up</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#403#;
-+   <FONT COLOR=red><A NAME="ref_94_4">Key_Cursor_Left</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#404#;
-+   <FONT COLOR=red><A NAME="ref_95_4">Key_Cursor_Right</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#405#;
-+   <FONT COLOR=red><A NAME="ref_96_4">Key_Home</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#406#;
-+   <FONT COLOR=red><A NAME="ref_97_4">Key_Backspace</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#407#;
-+   <FONT COLOR=red><A NAME="ref_98_4">Key_F0</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#410#;
-+   <FONT COLOR=red><A NAME="ref_99_4">Key_F1</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#411#;
-+   <FONT COLOR=red><A NAME="ref_100_4">Key_F2</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#412#;
-+   <FONT COLOR=red><A NAME="ref_101_4">Key_F3</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#413#;
-+   <FONT COLOR=red><A NAME="ref_102_4">Key_F4</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#414#;
-+   <FONT COLOR=red><A NAME="ref_103_4">Key_F5</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#415#;
-+   <FONT COLOR=red><A NAME="ref_104_4">Key_F6</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#416#;
-+   <FONT COLOR=red><A NAME="ref_105_4">Key_F7</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#417#;
-+   <FONT COLOR=red><A NAME="ref_106_4">Key_F8</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#420#;
-+   <FONT COLOR=red><A NAME="ref_107_4">Key_F9</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#421#;
-+   <FONT COLOR=red><A NAME="ref_108_4">Key_F10</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#422#;
-+   <FONT COLOR=red><A NAME="ref_109_4">Key_F11</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#423#;
-+   <FONT COLOR=red><A NAME="ref_110_4">Key_F12</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#424#;
-+   <FONT COLOR=red><A NAME="ref_111_4">Key_F13</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#425#;
-+   <FONT COLOR=red><A NAME="ref_112_4">Key_F14</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#426#;
-+   <FONT COLOR=red><A NAME="ref_113_4">Key_F15</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#427#;
-+   <FONT COLOR=red><A NAME="ref_114_4">Key_F16</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#430#;
-+   <FONT COLOR=red><A NAME="ref_115_4">Key_F17</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#431#;
-+   <FONT COLOR=red><A NAME="ref_116_4">Key_F18</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#432#;
-+   <FONT COLOR=red><A NAME="ref_117_4">Key_F19</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#433#;
-+   <FONT COLOR=red><A NAME="ref_118_4">Key_F20</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#434#;
-+   <FONT COLOR=red><A NAME="ref_119_4">Key_F21</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#435#;
-+   <FONT COLOR=red><A NAME="ref_120_4">Key_F22</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#436#;
-+   <FONT COLOR=red><A NAME="ref_121_4">Key_F23</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#437#;
-+   <FONT COLOR=red><A NAME="ref_122_4">Key_F24</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#440#;
-+   <FONT COLOR=red><A NAME="ref_123_4">Key_Delete_Line</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#510#;
-+   <FONT COLOR=red><A NAME="ref_124_4">Key_Insert_Line</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#511#;
-+   <FONT COLOR=red><A NAME="ref_125_4">Key_Delete_Char</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#512#;
-+   <FONT COLOR=red><A NAME="ref_126_4">Key_Insert_Char</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#513#;
-+   <FONT COLOR=red><A NAME="ref_127_4">Key_Exit_Insert_Mode</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#514#;
-+   <FONT COLOR=red><A NAME="ref_128_4">Key_Clear_Screen</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#515#;
-+   <FONT COLOR=red><A NAME="ref_129_4">Key_Clear_End_Of_Screen</A></FONT>        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#516#;
-+   <FONT COLOR=red><A NAME="ref_130_4">Key_Clear_End_Of_Line</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#517#;
-+   <FONT COLOR=red><A NAME="ref_131_4">Key_Scroll_1_Forward</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#520#;
-+   <FONT COLOR=red><A NAME="ref_132_4">Key_Scroll_1_Backward</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#521#;
-+   <FONT COLOR=red><A NAME="ref_133_4">Key_Next_Page</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#522#;
-+   <FONT COLOR=red><A NAME="ref_134_4">Key_Previous_Page</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#523#;
-+   <FONT COLOR=red><A NAME="ref_135_4">Key_Set_Tab</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#524#;
-+   <FONT COLOR=red><A NAME="ref_136_4">Key_Clear_Tab</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#525#;
-+   <FONT COLOR=red><A NAME="ref_137_4">Key_Clear_All_Tabs</A></FONT>             : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#526#;
-+   <FONT COLOR=red><A NAME="ref_138_4">Key_Enter_Or_Send</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#527#;
-+   <FONT COLOR=red><A NAME="ref_139_4">Key_Soft_Reset</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#530#;
-+   <FONT COLOR=red><A NAME="ref_140_4">Key_Reset</A></FONT>                      : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#531#;
-+   <FONT COLOR=red><A NAME="ref_141_4">Key_Print</A></FONT>                      : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#532#;
-+   <FONT COLOR=red><A NAME="ref_142_4">Key_Bottom</A></FONT>                     : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#533#;
-+   <FONT COLOR=red><A NAME="ref_143_4">Key_Upper_Left_Of_Keypad</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#534#;
-+   <FONT COLOR=red><A NAME="ref_144_4">Key_Upper_Right_Of_Keypad</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#535#;
-+   <FONT COLOR=red><A NAME="ref_145_4">Key_Center_Of_Keypad</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#536#;
-+   <FONT COLOR=red><A NAME="ref_146_4">Key_Lower_Left_Of_Keypad</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#537#;
-+   <FONT COLOR=red><A NAME="ref_147_4">Key_Lower_Right_Of_Keypad</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#540#;
-+   <FONT COLOR=red><A NAME="ref_148_4">Key_Back_Tab</A></FONT>                   : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#541#;
-+   <FONT COLOR=red><A NAME="ref_149_4">Key_Beginning</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#542#;
-+   <FONT COLOR=red><A NAME="ref_150_4">Key_Cancel</A></FONT>                     : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#543#;
-+   <FONT COLOR=red><A NAME="ref_151_4">Key_Close</A></FONT>                      : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#544#;
-+   <FONT COLOR=red><A NAME="ref_152_4">Key_Command</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#545#;
-+   <FONT COLOR=red><A NAME="ref_153_4">Key_Copy</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#546#;
-+   <FONT COLOR=red><A NAME="ref_154_4">Key_Create</A></FONT>                     : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#547#;
-+   <FONT COLOR=red><A NAME="ref_155_4">Key_End</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#550#;
-+   <FONT COLOR=red><A NAME="ref_156_4">Key_Exit</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#551#;
-+   <FONT COLOR=red><A NAME="ref_157_4">Key_Find</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#552#;
-+   <FONT COLOR=red><A NAME="ref_158_4">Key_Help</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#553#;
-+   <FONT COLOR=red><A NAME="ref_159_4">Key_Mark</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#554#;
-+   <FONT COLOR=red><A NAME="ref_160_4">Key_Message</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#555#;
-+   <FONT COLOR=red><A NAME="ref_161_4">Key_Move</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#556#;
-+   <FONT COLOR=red><A NAME="ref_162_4">Key_Next</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#557#;
-+   <FONT COLOR=red><A NAME="ref_163_4">Key_Open</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#560#;
-+   <FONT COLOR=red><A NAME="ref_164_4">Key_Options</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#561#;
-+   <FONT COLOR=red><A NAME="ref_165_4">Key_Previous</A></FONT>                   : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#562#;
-+   <FONT COLOR=red><A NAME="ref_166_4">Key_Redo</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#563#;
-+   <FONT COLOR=red><A NAME="ref_167_4">Key_Reference</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#564#;
-+   <FONT COLOR=red><A NAME="ref_168_4">Key_Refresh</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#565#;
-+   <FONT COLOR=red><A NAME="ref_169_4">Key_Replace</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#566#;
-+   <FONT COLOR=red><A NAME="ref_170_4">Key_Restart</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#567#;
-+   <FONT COLOR=red><A NAME="ref_171_4">Key_Resume</A></FONT>                     : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#570#;
-+   <FONT COLOR=red><A NAME="ref_172_4">Key_Save</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#571#;
-+   <FONT COLOR=red><A NAME="ref_173_4">Key_Shift_Begin</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#572#;
-+   <FONT COLOR=red><A NAME="ref_174_4">Key_Shift_Cancel</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#573#;
-+   <FONT COLOR=red><A NAME="ref_175_4">Key_Shift_Command</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#574#;
-+   <FONT COLOR=red><A NAME="ref_176_4">Key_Shift_Copy</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#575#;
-+   <FONT COLOR=red><A NAME="ref_177_4">Key_Shift_Create</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#576#;
-+   <FONT COLOR=red><A NAME="ref_178_4">Key_Shift_Delete_Char</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#577#;
-+   <FONT COLOR=red><A NAME="ref_179_4">Key_Shift_Delete_Line</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#600#;
-+   <FONT COLOR=red><A NAME="ref_180_4">Key_Select</A></FONT>                     : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#601#;
-+   <FONT COLOR=red><A NAME="ref_181_4">Key_Shift_End</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#602#;
-+   <FONT COLOR=red><A NAME="ref_182_4">Key_Shift_Clear_End_Of_Line</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#603#;
-+   <FONT COLOR=red><A NAME="ref_183_4">Key_Shift_Exit</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#604#;
-+   <FONT COLOR=red><A NAME="ref_184_4">Key_Shift_Find</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#605#;
-+   <FONT COLOR=red><A NAME="ref_185_4">Key_Shift_Help</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#606#;
-+   <FONT COLOR=red><A NAME="ref_186_4">Key_Shift_Home</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#607#;
-+   <FONT COLOR=red><A NAME="ref_187_4">Key_Shift_Insert_Char</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#610#;
-+   <FONT COLOR=red><A NAME="ref_188_4">Key_Shift_Cursor_Left</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#611#;
-+   <FONT COLOR=red><A NAME="ref_189_4">Key_Shift_Message</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#612#;
-+   <FONT COLOR=red><A NAME="ref_190_4">Key_Shift_Move</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#613#;
-+   <FONT COLOR=red><A NAME="ref_191_4">Key_Shift_Next_Page</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#614#;
-+   <FONT COLOR=red><A NAME="ref_192_4">Key_Shift_Options</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#615#;
-+   <FONT COLOR=red><A NAME="ref_193_4">Key_Shift_Previous_Page</A></FONT>        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#616#;
-+   <FONT COLOR=red><A NAME="ref_194_4">Key_Shift_Print</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#617#;
-+   <FONT COLOR=red><A NAME="ref_195_4">Key_Shift_Redo</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#620#;
-+   <FONT COLOR=red><A NAME="ref_196_4">Key_Shift_Replace</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#621#;
-+   <FONT COLOR=red><A NAME="ref_197_4">Key_Shift_Cursor_Right</A></FONT>         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#622#;
-+   <FONT COLOR=red><A NAME="ref_198_4">Key_Shift_Resume</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#623#;
-+   <FONT COLOR=red><A NAME="ref_199_4">Key_Shift_Save</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#624#;
-+   <FONT COLOR=red><A NAME="ref_200_4">Key_Shift_Suspend</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#625#;
-+   <FONT COLOR=red><A NAME="ref_201_4">Key_Shift_Undo</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#626#;
-+   <FONT COLOR=red><A NAME="ref_202_4">Key_Suspend</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#627#;
-+   <FONT COLOR=red><A NAME="ref_203_4">Key_Undo</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#630#;
-+   <FONT COLOR=red><A NAME="ref_204_4">Key_Mouse</A></FONT>                      : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#631#;
-+   <FONT COLOR=red><A NAME="ref_205_4">Key_Resize</A></FONT>                     : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#632#;
- 
--   Key_Max                        : <b>constant</b> Special_Key_Code
--     := Special_Key_Code'Last;
-+   <FONT COLOR=red><A NAME="ref_207_4">Key_Max</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>
-+     := <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>'Last;
- 
--   <b>subtype</b> User_Key_Code <b>is</b> Key_Code
--     <b>range</b> (Key_Max + 129) .. Key_Code'Last;
-+   <b>subtype</b> <FONT COLOR=red><A NAME="ref_210_12">User_Key_Code</A></FONT> <b>is</b> <A HREF="terminal_interface-curses__ads.htm#ref_68_9">Key_Code</A>
-+     <b>range</b> (<A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 129) .. <A HREF="terminal_interface-curses__ads.htm#ref_68_9">Key_Code</A>'Last;
-    <FONT COLOR=green><EM>--  This is reserved for user defined key codes. The range between Key_Max</EM></FONT>
-    <FONT COLOR=green><EM>--  and the first user code is reserved for subsystems like menu and forms.</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  For those who like to use the original key names we produce them were</EM></FONT>
-    <FONT COLOR=green><EM>--  they differ from the original. Please note that they may differ in</EM></FONT>
-    <FONT COLOR=green><EM>--  lower/upper case.</EM></FONT>
--   KEY_DOWN         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_93_4">Key_Cursor_Down</A>;
--   KEY_UP           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_94_4">Key_Cursor_Up</A>;
--   KEY_LEFT         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_95_4">Key_Cursor_Left</A>;
--   KEY_RIGHT        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_123_4">Key_Cursor_Right</A>;
--   KEY_DL           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_124_4">Key_Delete_Line</A>;
--   KEY_IL           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_125_4">Key_Insert_Line</A>;
--   KEY_DC           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_126_4">Key_Delete_Char</A>;
--   KEY_IC           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_127_4">Key_Insert_Char</A>;
--   KEY_EIC          : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_128_4">Key_Exit_Insert_Mode</A>;
--   KEY_CLEAR        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_129_4">Key_Clear_Screen</A>;
--   KEY_EOS          : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_130_4">Key_Clear_End_Of_Screen</A>;
--   KEY_EOL          : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_131_4">Key_Clear_End_Of_Line</A>;
--   KEY_SF           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_132_4">Key_Scroll_1_Forward</A>;
--   KEY_SR           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_133_4">Key_Scroll_1_Backward</A>;
--   KEY_NPAGE        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_134_4">Key_Next_Page</A>;
--   KEY_PPAGE        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_135_4">Key_Previous_Page</A>;
--   KEY_STAB         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_136_4">Key_Set_Tab</A>;
--   KEY_CTAB         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_137_4">Key_Clear_Tab</A>;
--   KEY_CATAB        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_138_4">Key_Clear_All_Tabs</A>;
--   KEY_ENTER        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_139_4">Key_Enter_Or_Send</A>;
--   KEY_SRESET       : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_142_4">Key_Soft_Reset</A>;
--   KEY_LL           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_143_4">Key_Bottom</A>;
--   KEY_A1           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_144_4">Key_Upper_Left_Of_Keypad</A>;
--   KEY_A3           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_145_4">Key_Upper_Right_Of_Keypad</A>;
--   KEY_B2           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_146_4">Key_Center_Of_Keypad</A>;
--   KEY_C1           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_147_4">Key_Lower_Left_Of_Keypad</A>;
--   KEY_C3           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_148_4">Key_Lower_Right_Of_Keypad</A>;
--   KEY_BTAB         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_149_4">Key_Back_Tab</A>;
--   KEY_BEG          : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_173_4">Key_Beginning</A>;
--   KEY_SBEG         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_174_4">Key_Shift_Begin</A>;
--   KEY_SCANCEL      : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_175_4">Key_Shift_Cancel</A>;
--   KEY_SCOMMAND     : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_176_4">Key_Shift_Command</A>;
--   KEY_SCOPY        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_177_4">Key_Shift_Copy</A>;
--   KEY_SCREATE      : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_178_4">Key_Shift_Create</A>;
--   KEY_SDC          : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_179_4">Key_Shift_Delete_Char</A>;
--   KEY_SDL          : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_181_4">Key_Shift_Delete_Line</A>;
--   KEY_SEND         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_182_4">Key_Shift_End</A>;
--   KEY_SEOL         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_183_4">Key_Shift_Clear_End_Of_Line</A>;
--   KEY_SEXIT        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_184_4">Key_Shift_Exit</A>;
--   KEY_SFIND        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_185_4">Key_Shift_Find</A>;
--   KEY_SHELP        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_186_4">Key_Shift_Help</A>;
--   KEY_SHOME        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_187_4">Key_Shift_Home</A>;
--   KEY_SIC          : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_188_4">Key_Shift_Insert_Char</A>;
--   KEY_SLEFT        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_189_4">Key_Shift_Cursor_Left</A>;
--   KEY_SMESSAGE     : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_190_4">Key_Shift_Message</A>;
--   KEY_SMOVE        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_191_4">Key_Shift_Move</A>;
--   KEY_SNEXT        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_192_4">Key_Shift_Next_Page</A>;
--   KEY_SOPTIONS     : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_193_4">Key_Shift_Options</A>;
--   KEY_SPREVIOUS    : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_194_4">Key_Shift_Previous_Page</A>;
--   KEY_SPRINT       : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_195_4">Key_Shift_Print</A>;
--   KEY_SREDO        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_196_4">Key_Shift_Redo</A>;
--   KEY_SREPLACE     : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_197_4">Key_Shift_Replace</A>;
--   KEY_SRIGHT       : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_198_4">Key_Shift_Cursor_Right</A>;
--   KEY_SRSUME       : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_199_4">Key_Shift_Resume</A>;
--   KEY_SSAVE        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_200_4">Key_Shift_Save</A>;
--   KEY_SSUSPEND     : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_201_4">Key_Shift_Suspend</A>;
--   KEY_SUNDO        : Special_Key_Code <b>renames</b> Key_Shift_Undo;
-+   KEY_DOWN         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_92_4">Key_Cursor_Down</A>;
-+   KEY_UP           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_93_4">Key_Cursor_Up</A>;
-+   KEY_LEFT         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_94_4">Key_Cursor_Left</A>;
-+   KEY_RIGHT        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_95_4">Key_Cursor_Right</A>;
-+   KEY_DL           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_123_4">Key_Delete_Line</A>;
-+   KEY_IL           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_124_4">Key_Insert_Line</A>;
-+   KEY_DC           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_125_4">Key_Delete_Char</A>;
-+   KEY_IC           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_126_4">Key_Insert_Char</A>;
-+   KEY_EIC          : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_127_4">Key_Exit_Insert_Mode</A>;
-+   KEY_CLEAR        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_128_4">Key_Clear_Screen</A>;
-+   KEY_EOS          : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_129_4">Key_Clear_End_Of_Screen</A>;
-+   KEY_EOL          : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_130_4">Key_Clear_End_Of_Line</A>;
-+   KEY_SF           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_131_4">Key_Scroll_1_Forward</A>;
-+   KEY_SR           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_132_4">Key_Scroll_1_Backward</A>;
-+   KEY_NPAGE        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_133_4">Key_Next_Page</A>;
-+   KEY_PPAGE        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_134_4">Key_Previous_Page</A>;
-+   KEY_STAB         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_135_4">Key_Set_Tab</A>;
-+   KEY_CTAB         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_136_4">Key_Clear_Tab</A>;
-+   KEY_CATAB        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_137_4">Key_Clear_All_Tabs</A>;
-+   KEY_ENTER        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_138_4">Key_Enter_Or_Send</A>;
-+   KEY_SRESET       : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_139_4">Key_Soft_Reset</A>;
-+   KEY_LL           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_142_4">Key_Bottom</A>;
-+   KEY_A1           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_143_4">Key_Upper_Left_Of_Keypad</A>;
-+   KEY_A3           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_144_4">Key_Upper_Right_Of_Keypad</A>;
-+   KEY_B2           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_145_4">Key_Center_Of_Keypad</A>;
-+   KEY_C1           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_146_4">Key_Lower_Left_Of_Keypad</A>;
-+   KEY_C3           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_147_4">Key_Lower_Right_Of_Keypad</A>;
-+   KEY_BTAB         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_148_4">Key_Back_Tab</A>;
-+   KEY_BEG          : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_149_4">Key_Beginning</A>;
-+   KEY_SBEG         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_173_4">Key_Shift_Begin</A>;
-+   KEY_SCANCEL      : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_174_4">Key_Shift_Cancel</A>;
-+   KEY_SCOMMAND     : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_175_4">Key_Shift_Command</A>;
-+   KEY_SCOPY        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_176_4">Key_Shift_Copy</A>;
-+   KEY_SCREATE      : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_177_4">Key_Shift_Create</A>;
-+   KEY_SDC          : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_178_4">Key_Shift_Delete_Char</A>;
-+   KEY_SDL          : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_179_4">Key_Shift_Delete_Line</A>;
-+   KEY_SEND         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_181_4">Key_Shift_End</A>;
-+   KEY_SEOL         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_182_4">Key_Shift_Clear_End_Of_Line</A>;
-+   KEY_SEXIT        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_183_4">Key_Shift_Exit</A>;
-+   KEY_SFIND        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_184_4">Key_Shift_Find</A>;
-+   KEY_SHELP        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_185_4">Key_Shift_Help</A>;
-+   KEY_SHOME        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_186_4">Key_Shift_Home</A>;
-+   KEY_SIC          : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_187_4">Key_Shift_Insert_Char</A>;
-+   KEY_SLEFT        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_188_4">Key_Shift_Cursor_Left</A>;
-+   KEY_SMESSAGE     : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_189_4">Key_Shift_Message</A>;
-+   KEY_SMOVE        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_190_4">Key_Shift_Move</A>;
-+   KEY_SNEXT        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_191_4">Key_Shift_Next_Page</A>;
-+   KEY_SOPTIONS     : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_192_4">Key_Shift_Options</A>;
-+   KEY_SPREVIOUS    : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_193_4">Key_Shift_Previous_Page</A>;
-+   KEY_SPRINT       : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_194_4">Key_Shift_Print</A>;
-+   KEY_SREDO        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_195_4">Key_Shift_Redo</A>;
-+   KEY_SREPLACE     : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_196_4">Key_Shift_Replace</A>;
-+   KEY_SRIGHT       : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_197_4">Key_Shift_Cursor_Right</A>;
-+   KEY_SRSUME       : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_198_4">Key_Shift_Resume</A>;
-+   KEY_SSAVE        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_199_4">Key_Shift_Save</A>;
-+   KEY_SSUSPEND     : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_200_4">Key_Shift_Suspend</A>;
-+   KEY_SUNDO        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_201_4">Key_Shift_Undo</A>;
- 
- <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
- 
--   <b>type</b><A HREF="terminal_interface-curses__ads.htm#ref_278_9"> </A>Color_Number <b>is</b> <b>range</b><A HREF="interfac__ads.htm#ref_38_9"> </A>-1 .. Integer (Interfaces.C.short'Last);
--   <b>for</b> Color_Number'Size <b>use</b> Interfaces.C.short'Size;
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_278_9">Color_Number</A></FONT> <b>is</b> <b>range</b> -1 .. Integer (<A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.short'Last);
-+   <b>for</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>'Size <b>use</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.short'Size;
-    <FONT COLOR=green><EM>--  (n)curses uses a short for the color index</EM></FONT>
-    <FONT COLOR=green><EM>--  The model is, that a Color_Number is an index into an array of</EM></FONT>
-    <FONT COLOR=green><EM>--  (potentially) definable colors. Some of those indices are</EM></FONT>
-    <FONT COLOR=green><EM>--  predefined (see below), although they may not really exist.</EM></FONT>
- 
--   <FONT COLOR=red><A NAME="ref_286_4">Default_Color</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := -1;
--   <FONT COLOR=red><A NAME="ref_287_4">Black</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := 0;
--   <FONT COLOR=red><A NAME="ref_288_4">Red</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := 1;
--   <FONT COLOR=red><A NAME="ref_289_4">Green</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := 2;
--   <FONT COLOR=red><A NAME="ref_290_4">Yellow</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := 3;
--   <FONT COLOR=red><A NAME="ref_291_4">Blue</A></FONT>             : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := 4;
--   <FONT COLOR=red><A NAME="ref_292_4">Magenta</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := 5;
--   <FONT COLOR=red><A NAME="ref_293_4">Cyan</A></FONT>             : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := 6;
--   White            : <b>constant</b> Color_Number := 7;
-+   <FONT COLOR=red><A NAME="ref_285_4">Default_Color</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := -1;
-+   <FONT COLOR=red><A NAME="ref_286_4">Black</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := 0;
-+   <FONT COLOR=red><A NAME="ref_287_4">Red</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := 1;
-+   <FONT COLOR=red><A NAME="ref_288_4">Green</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := 2;
-+   <FONT COLOR=red><A NAME="ref_289_4">Yellow</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := 3;
-+   <FONT COLOR=red><A NAME="ref_290_4">Blue</A></FONT>             : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := 4;
-+   <FONT COLOR=red><A NAME="ref_291_4">Magenta</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := 5;
-+   <FONT COLOR=red><A NAME="ref_292_4">Cyan</A></FONT>             : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := 6;
-+   <FONT COLOR=red><A NAME="ref_293_4">White</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := 7;
- 
--   <b>type</b><A HREF="terminal_interface-curses__ads.htm#ref_295_9"> </A>RGB_Value <b>is</b> <b>range</b><A HREF="interfac__ads.htm#ref_38_9"> </A>0 .. Integer (Interfaces.C.short'Last);
--   <b>for</b> RGB_Value'Size <b>use</b> Interfaces.C.short'Size;
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_295_9">RGB_Value</A></FONT> <b>is</b> <b>range</b> 0 .. Integer (<A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.short'Last);
-+   <b>for</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>'Size <b>use</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.short'Size;
-    <FONT COLOR=green><EM>--  Some system may allow to redefine a color by setting RGB values.</EM></FONT>
- 
--   <b>type</b><A HREF="terminal_interface-curses__ads.htm#ref_299_9"> </A>Color_Pair <b>is</b> <b>range</b> 0 .. 255;
--   <b>for</b> Color_Pair'Size <b>use</b> 8;
--   <b>subtype</b> Redefinable_Color_Pair <b>is</b> Color_Pair <b>range</b> 1 .. 255;
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_299_9">Color_Pair</A></FONT> <b>is</b> <b>range</b> 0 .. 255;
-+   <b>for</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'Size <b>use</b> 8;
-+   <b>subtype</b> <FONT COLOR=red><A NAME="ref_301_12">Redefinable_Color_Pair</A></FONT> <b>is</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> <b>range</b> 1 .. 255;
-    <FONT COLOR=green><EM>--  (n)curses reserves 1 Byte for the color-pair number. Color Pair 0</EM></FONT>
-    <FONT COLOR=green><EM>--  is fixed (Black &amp; White). A color pair is simply a combination of</EM></FONT>
-    <FONT COLOR=green><EM>--  two colors described by Color_Numbers, one for the foreground and</EM></FONT>
-    <FONT COLOR=green><EM>--  the other for the background</EM></FONT>
- 
--   <b>type</b> Character_Attribute_Set <b>is</b>
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_307_9">Character_Attribute_Set</A></FONT> <b>is</b>
-       <b>record</b>
--         <FONT COLOR=red><A NAME="ref_310_10">Stand_Out</A></FONT>               : Boolean;
--         <FONT COLOR=red><A NAME="ref_311_10">Under_Line</A></FONT>              : Boolean;
--         <FONT COLOR=red><A NAME="ref_312_10">Reverse_Video</A></FONT>           : Boolean;
--         <FONT COLOR=red><A NAME="ref_313_10">Blink</A></FONT>                   : Boolean;
--         <FONT COLOR=red><A NAME="ref_314_10">Dim_Character</A></FONT>           : Boolean;
--         <FONT COLOR=red><A NAME="ref_315_10">Bold_Character</A></FONT>          : Boolean;
--         <FONT COLOR=red><A NAME="ref_316_10">Alternate_Character_Set</A></FONT> : Boolean;
--         <FONT COLOR=red><A NAME="ref_317_10">Invisible_Character</A></FONT>     : Boolean;
--         <FONT COLOR=red><A NAME="ref_318_10">Protected_Character</A></FONT>     : Boolean;
--         <FONT COLOR=red><A NAME="ref_319_10">Horizontal</A></FONT>              : Boolean;
--         <FONT COLOR=red><A NAME="ref_320_10">Left</A></FONT>                    : Boolean;
--         <FONT COLOR=red><A NAME="ref_321_10">Low</A></FONT>                     : Boolean;
--         <FONT COLOR=red><A NAME="ref_322_10">Right</A></FONT>                   : Boolean;
--         <FONT COLOR=red><A NAME="ref_323_10">Top</A></FONT>                     : Boolean;
--         Vertical                : Boolean;
-+         <FONT COLOR=red><A NAME="ref_309_10">Stand_Out</A></FONT>               : Boolean;
-+         <FONT COLOR=red><A NAME="ref_310_10">Under_Line</A></FONT>              : Boolean;
-+         <FONT COLOR=red><A NAME="ref_311_10">Reverse_Video</A></FONT>           : Boolean;
-+         <FONT COLOR=red><A NAME="ref_312_10">Blink</A></FONT>                   : Boolean;
-+         <FONT COLOR=red><A NAME="ref_313_10">Dim_Character</A></FONT>           : Boolean;
-+         <FONT COLOR=red><A NAME="ref_314_10">Bold_Character</A></FONT>          : Boolean;
-+         <FONT COLOR=red><A NAME="ref_315_10">Alternate_Character_Set</A></FONT> : Boolean;
-+         <FONT COLOR=red><A NAME="ref_316_10">Invisible_Character</A></FONT>     : Boolean;
-+         <FONT COLOR=red><A NAME="ref_317_10">Protected_Character</A></FONT>     : Boolean;
-+         <FONT COLOR=red><A NAME="ref_318_10">Horizontal</A></FONT>              : Boolean;
-+         <FONT COLOR=red><A NAME="ref_319_10">Left</A></FONT>                    : Boolean;
-+         <FONT COLOR=red><A NAME="ref_320_10">Low</A></FONT>                     : Boolean;
-+         <FONT COLOR=red><A NAME="ref_321_10">Right</A></FONT>                   : Boolean;
-+         <FONT COLOR=red><A NAME="ref_322_10">Top</A></FONT>                     : Boolean;
-+         <FONT COLOR=red><A NAME="ref_323_10">Vertical</A></FONT>                : Boolean;
-       <b>end</b> <b>record</b>;
--   <b>pragma</b> Convention (C, Character_Attribute_Set);
-+   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>);
- 
--   <b>for</b> Character_Attribute_Set <b>use</b>
-+   <b>for</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> <b>use</b>
-       <b>record</b>
-          Stand_Out               <b>at</b> 0 <b>range</b>  0 ..  0;
-          Under_Line              <b>at</b> 0 <b>range</b>  1 ..  1;
-@@ -348,64 +347,64 @@
-          Top                     <b>at</b> 0 <b>range</b> 13 .. 13;
-          Vertical                <b>at</b> 0 <b>range</b> 14 .. 14;
-       <b>end</b> <b>record</b>;
--   <b>for</b> Character_Attribute_Set'Size <b>use</b> 16;
-+   <b>for</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>'Size <b>use</b> 16;
-    <FONT COLOR=green><EM>--  Please note: this rep. clause is generated and may be</EM></FONT>
-    <FONT COLOR=green><EM>--               different on your system.</EM></FONT>
-    <FONT COLOR=green><EM>--  (n)curses uses all but the lowest 16 Bits for Attributes.</EM></FONT>
- 
--   Normal_Video : <b>constant</b> Character_Attribute_Set := (<b>others</b> =&gt; False);
-+   <FONT COLOR=red><A NAME="ref_350_4">Normal_Video</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := (<b>others</b> =&gt; False);
- 
--   <b>type</b> Attributed_Character <b>is</b>
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_352_9">Attributed_Character</A></FONT> <b>is</b>
-       <b>record</b>
--         <FONT COLOR=red><A NAME="ref_355_10">Attr</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character_Attribute_Set</A>;
--         <FONT COLOR=red><A NAME="ref_356_10">Color</A></FONT> : Color_Pair;
--         Ch    : Character;
-+         <FONT COLOR=red><A NAME="ref_354_10">Attr</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>;
-+         <FONT COLOR=red><A NAME="ref_355_10">Color</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>;
-+         <FONT COLOR=red><A NAME="ref_356_10">Ch</A></FONT>    : Character;
-       <b>end</b> <b>record</b>;
--   <b>pragma</b> Convention (C, Attributed_Character);
-+   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>);
-    <FONT COLOR=green><EM>--  This is the counterpart for the chtype in C.</EM></FONT>
- 
--   <b>for</b> Attributed_Character <b>use</b>
-+   <b>for</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> <b>use</b>
-       <b>record</b>
-          Ch    <b>at</b> 0 <b>range</b>  0 ..  7;
-          Color <b>at</b> 0 <b>range</b>  8 .. 15;
-          Attr  <b>at</b> 0 <b>range</b> 16 .. 31;
-       <b>end</b> <b>record</b>;
--   <b>for</b> Attributed_Character'Size <b>use</b> 32;
-+   <b>for</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>'Size <b>use</b> 32;
-       <FONT COLOR=green><EM>--  Please note: this rep. clause is generated and may be</EM></FONT>
-       <FONT COLOR=green><EM>--               different on your system.</EM></FONT>
- 
--   Default_Character : <b>constant</b> Attributed_Character
--     := (<A HREF="terminal_interface-curses__ads.htm#ref_355_10">Ch</A>    =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character</A>'First,
--         <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Color</A> =&gt; Color_Pair'First,
--         Attr  =&gt; (<b>others</b> =&gt; False));  <FONT COLOR=green><EM>--  preelaboratable Normal_Video</EM></FONT>
-+   <FONT COLOR=red><A NAME="ref_371_4">Default_Character</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>
-+     := (<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; Character'First,
-+         <A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First,
-+         <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>  =&gt; (<b>others</b> =&gt; False));  <FONT COLOR=green><EM>--  preelaboratable Normal_Video</EM></FONT>
- 
--   <b>type</b> Attributed_String <b>is</b> <b>array</b> (Positive <b>range</b> &lt;&gt;) <b>of</b> Attributed_Character;
--   <b>pragma</b> Pack (Attributed_String);
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_376_9">Attributed_String</A></FONT> <b>is</b> <b>array</b> (Positive <b>range</b> &lt;&gt;) <b>of</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>;
-+   <b>pragma</b> Pack (<A HREF="terminal_interface-curses__ads.htm#ref_376_9">Attributed_String</A>);
-    <FONT COLOR=green><EM>--  In this binding we allow strings of attributed characters.</EM></FONT>
- 
-    <FONT COLOR=green><EM>------------------</EM></FONT>
-    <FONT COLOR=green><EM>--  Exceptions  --</EM></FONT>
-    <FONT COLOR=green><EM>------------------</EM></FONT>
--   <FONT COLOR=red><A NAME="ref_384_4">Curses_Exception</A></FONT>     : <b>exception</b>;
--   Wrong_Curses_Version : <b>exception</b>;
-+   <FONT COLOR=red><A NAME="ref_383_4">Curses_Exception</A></FONT>     : <b>exception</b>;
-+   <FONT COLOR=red><A NAME="ref_384_4">Wrong_Curses_Version</A></FONT> : <b>exception</b>;
- 
-    <FONT COLOR=green><EM>--  Those exceptions are raised by the ETI (Extended Terminal Interface)</EM></FONT>
-    <FONT COLOR=green><EM>--  subpackets for Menu and Forms handling.</EM></FONT>
-    <FONT COLOR=green><EM>--</EM></FONT>
--   <FONT COLOR=red><A NAME="ref_390_4">Eti_System_Error</A></FONT>    : <b>exception</b>;
--   <FONT COLOR=red><A NAME="ref_391_4">Eti_Bad_Argument</A></FONT>    : <b>exception</b>;
--   <FONT COLOR=red><A NAME="ref_392_4">Eti_Posted</A></FONT>          : <b>exception</b>;
--   <FONT COLOR=red><A NAME="ref_393_4">Eti_Connected</A></FONT>       : <b>exception</b>;
--   <FONT COLOR=red><A NAME="ref_394_4">Eti_Bad_State</A></FONT>       : <b>exception</b>;
--   <FONT COLOR=red><A NAME="ref_395_4">Eti_No_Room</A></FONT>         : <b>exception</b>;
--   <FONT COLOR=red><A NAME="ref_396_4">Eti_Not_Posted</A></FONT>      : <b>exception</b>;
--   <FONT COLOR=red><A NAME="ref_397_4">Eti_Unknown_Command</A></FONT> : <b>exception</b>;
--   <FONT COLOR=red><A NAME="ref_398_4">Eti_No_Match</A></FONT>        : <b>exception</b>;
--   <FONT COLOR=red><A NAME="ref_399_4">Eti_Not_Selectable</A></FONT>  : <b>exception</b>;
--   <FONT COLOR=red><A NAME="ref_400_4">Eti_Not_Connected</A></FONT>   : <b>exception</b>;
--   <FONT COLOR=red><A NAME="ref_401_4">Eti_Request_Denied</A></FONT>  : <b>exception</b>;
--   <FONT COLOR=red><A NAME="ref_402_4">Eti_Invalid_Field</A></FONT>   : <b>exception</b>;
--   Eti_Current         : <b>exception</b>;
-+   <FONT COLOR=red><A NAME="ref_389_4">Eti_System_Error</A></FONT>    : <b>exception</b>;
-+   <FONT COLOR=red><A NAME="ref_390_4">Eti_Bad_Argument</A></FONT>    : <b>exception</b>;
-+   <FONT COLOR=red><A NAME="ref_391_4">Eti_Posted</A></FONT>          : <b>exception</b>;
-+   <FONT COLOR=red><A NAME="ref_392_4">Eti_Connected</A></FONT>       : <b>exception</b>;
-+   <FONT COLOR=red><A NAME="ref_393_4">Eti_Bad_State</A></FONT>       : <b>exception</b>;
-+   <FONT COLOR=red><A NAME="ref_394_4">Eti_No_Room</A></FONT>         : <b>exception</b>;
-+   <FONT COLOR=red><A NAME="ref_395_4">Eti_Not_Posted</A></FONT>      : <b>exception</b>;
-+   <FONT COLOR=red><A NAME="ref_396_4">Eti_Unknown_Command</A></FONT> : <b>exception</b>;
-+   <FONT COLOR=red><A NAME="ref_397_4">Eti_No_Match</A></FONT>        : <b>exception</b>;
-+   <FONT COLOR=red><A NAME="ref_398_4">Eti_Not_Selectable</A></FONT>  : <b>exception</b>;
-+   <FONT COLOR=red><A NAME="ref_399_4">Eti_Not_Connected</A></FONT>   : <b>exception</b>;
-+   <FONT COLOR=red><A NAME="ref_400_4">Eti_Request_Denied</A></FONT>  : <b>exception</b>;
-+   <FONT COLOR=red><A NAME="ref_401_4">Eti_Invalid_Field</A></FONT>   : <b>exception</b>;
-+   <FONT COLOR=red><A NAME="ref_402_4">Eti_Current</A></FONT>         : <b>exception</b>;
- 
-    <FONT COLOR=green><EM>--------------------------------------------------------------------------</EM></FONT>
-    <FONT COLOR=green><EM>--  External C variables</EM></FONT>
-@@ -415,28 +414,29 @@
-    <FONT COLOR=green><EM>--  this is to use functions.</EM></FONT>
-    <FONT COLOR=green><EM>--------------------------------------------------------------------------</EM></FONT>
- 
--   <b>function</b> Lines <A HREF="terminal_interface-curses__ads.htm#ref_412_13"> </A>          <b>return</b> Line_Count;
--   <b>pragma</b> Inline (Lines);
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_412_13" HREF="terminal_interface-curses__adb.htm#ref_2354_13">Lines</A></FONT>            <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_412_13">Lines</A>);
- 
--   <b>function</b> Columns          <b>return</b> Column_Count;
--   <b>pragma</b> Inline (Columns);
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_415_13" HREF="terminal_interface-curses__adb.htm#ref_2362_13">Columns</A></FONT>          <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_415_13">Columns</A>);
- 
--   <b>function</b> Tab_Size         <b>return</b> Natural;
--   <b>pragma</b> Inline (Tab_Size);
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_418_13" HREF="terminal_interface-curses__adb.htm#ref_2370_13">Tab_Size</A></FONT>         <b>return</b> Natural;
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_418_13">Tab_Size</A>);
- 
--   <b>function</b> Number_Of_Colors <b>return</b> Natural;
--   <b>pragma</b> Inline (Number_Of_Colors);
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_421_13" HREF="terminal_interface-curses__adb.htm#ref_2378_13">Number_Of_Colors</A></FONT> <b>return</b> Natural;
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_421_13">Number_Of_Colors</A>);
- 
--   <b>function</b> Number_Of_Color_Pairs <b>return</b> Natural;
--   <b>pragma</b> Inline (Number_Of_Color_Pairs);
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_424_13" HREF="terminal_interface-curses__adb.htm#ref_2386_13">Number_Of_Color_Pairs</A></FONT> <b>return</b> Natural;
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_424_13">Number_Of_Color_Pairs</A>);
- 
--   ACS_Map : <b>array</b> (Character'Val (0) .. Character'Val (127)) <b>of</b>
--     Attributed_Character;
--   <b>pragma</b> Import (C, ACS_Map, "acs_map");
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_427_9">C_ACS_Map</A></FONT> <b>is</b> <b>array</b> (Character'Val (0) .. Character'Val (127))
-+        <b>of</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>;
-+   <FONT COLOR=red><A NAME="ref_429_4">ACS_Map</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_427_9">C_ACS_Map</A>;
-+   <b>pragma</b> Import (C, <A HREF="terminal_interface-curses__ads.htm#ref_429_4">ACS_Map</A>, "acs_map");
-    <FONT COLOR=green><EM>--</EM></FONT>
-    <FONT COLOR=green><EM>--</EM></FONT>
-    <FONT COLOR=green><EM>--  Constants for several characters from the Alternate Character Set</EM></FONT>
--   <FONT COLOR=green><EM>--  You must use this constants as indices into the ACS_Map array</EM></FONT>
-+   <FONT COLOR=green><EM>--  You must use these constants as indices into the ACS_Map array</EM></FONT>
-    <FONT COLOR=green><EM>--  to get the corresponding attributed character at runtime.</EM></FONT>
-    <FONT COLOR=green><EM>--</EM></FONT>
-    <FONT COLOR=red><A NAME="ref_437_4">ACS_Upper_Left_Corner</A></FONT>    : <b>constant</b> Character := 'l';
-@@ -470,93 +470,98 @@
-    <FONT COLOR=red><A NAME="ref_465_4">ACS_Greater_Or_Equal</A></FONT>     : <b>constant</b> Character := 'z';
-    <FONT COLOR=red><A NAME="ref_466_4">ACS_PI</A></FONT>                   : <b>constant</b> Character := '{';
-    <FONT COLOR=red><A NAME="ref_467_4">ACS_Not_Equal</A></FONT>            : <b>constant</b> Character := '|';
--   ACS_Sterling             : <b>constant</b> Character := '}';
-+   <FONT COLOR=red><A NAME="ref_468_4">ACS_Sterling</A></FONT>             : <b>constant</b> Character := '}';
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_initscr.3x.html">curs_initscr.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
--   <FONT COLOR=green><EM>--  | Not implemented: newterm, set_term, delscreen, curscr</EM></FONT>
-+   <FONT COLOR=green><EM>--  | Not implemented: newterm, set_term, delscreen</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_1"#2|</EM></FONT>
--   <b>function</b> Standard_Window <b>return</b> Window;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_476_13" HREF="terminal_interface-curses__adb.htm#ref_2338_13">Standard_Window</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_initscr.3x.html">stdscr</A></EM></FONT>
--   <b>pragma</b> Inline (Standard_Window);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_2"#2|</EM></FONT>
--   <b>procedure</b> Init_Screen;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_481_13" HREF="terminal_interface-curses__adb.htm#ref_2346_13">Current_Window</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_initscr.3x.html">curscr</A></EM></FONT>
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_481_13">Current_Window</A>);
- 
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_3"#2|</EM></FONT>
--   <b>procedure</b> Init_Windows <b>renames</b> Init_Screen;
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_486_14" HREF="terminal_interface-curses__adb.htm#ref_98_14">Init_Screen</A></FONT>;
-+
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_4"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_489_14">Init_Windows</A></FONT> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_486_14">Init_Screen</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_initscr.3x.html">initscr()</A></EM></FONT>
--   <b>pragma</b> Inline (Init_Screen);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_486_14">Init_Screen</A>);
-    <FONT COLOR=green><EM>--  pragma Inline (Init_Windows);</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_4"#2|</EM></FONT>
--   <b>procedure</b> End_Windows;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_5"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_495_14" HREF="terminal_interface-curses__adb.htm#ref_111_14">End_Windows</A></FONT>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_initscr.3x.html">endwin()</A></EM></FONT>
--   <b>procedure</b> End_Screen <b>renames</b> End_Windows;
--   <b>pragma</b> Inline (End_Windows);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_497_14">End_Screen</A></FONT> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_495_14">End_Windows</A>;
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_495_14">End_Windows</A>);
-    <FONT COLOR=green><EM>--  pragma Inline (End_Screen);</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_5"#2|</EM></FONT>
--   <b>function</b> Is_End_Window <b>return</b> Boolean;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_6"#2|</EM></FONT>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_502_13" HREF="terminal_interface-curses__adb.htm#ref_121_13">Is_End_Window</A></FONT> <b>return</b> Boolean;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_initscr.3x.html">isendwin()</A></EM></FONT>
--   <b>pragma</b> Inline (Is_End_Window);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_502_13">Is_End_Window</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_move.3x.html">curs_move.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_6"#2|</EM></FONT>
--   <b>procedure</b> Move_Cursor (<FONT COLOR=red><A NAME="ref_506_27" HREF="terminal_interface-curses__adb.htm#ref_187_27">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
--                          <FONT COLOR=red><A NAME="ref_507_27" HREF="terminal_interface-curses__adb.htm#ref_188_27">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--                          Column : <b>in</b> Column_Position);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_7"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_511_14" HREF="terminal_interface-curses__adb.htm#ref_133_14">Move_Cursor</A></FONT> (<FONT COLOR=red><A NAME="ref_511_27" HREF="terminal_interface-curses__adb.htm#ref_133_27">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                          <FONT COLOR=red><A NAME="ref_512_27" HREF="terminal_interface-curses__adb.htm#ref_134_27">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+                          <FONT COLOR=red><A NAME="ref_513_27" HREF="terminal_interface-curses__adb.htm#ref_135_27">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_move.3x.html">wmove()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: move()</EM></FONT>
--   <b>pragma</b> Inline (Move_Cursor);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_511_14">Move_Cursor</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_addch.3x.html">curs_addch.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_7"#2|</EM></FONT>
--   <b>procedure</b> Add (<FONT COLOR=red><A NAME="ref_518_19" HREF="terminal_interface-curses__adb.htm#ref_202_19">Win</A></FONT> :  <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Window</A> := Standard_Window;
--                  Ch  :  <b>in</b> Attributed_Character);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_8"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_523_14" HREF="terminal_interface-curses__adb.htm#ref_148_14">Add</A></FONT> (<FONT COLOR=red><A NAME="ref_523_19" HREF="terminal_interface-curses__adb.htm#ref_148_19">Win</A></FONT> :  <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                  <FONT COLOR=red><A NAME="ref_524_19" HREF="terminal_interface-curses__adb.htm#ref_149_19">Ch</A></FONT>  :  <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_addch.3x.html">waddch()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: addch()</EM></FONT>
- 
--   <b>procedure</b> Add (<FONT COLOR=red><A NAME="ref_523_19" HREF="terminal_interface-curses__adb.htm#ref_214_19">Win</A></FONT> :  <b>in</b> Window := Standard_Window;
--                  Ch  :  <b>in</b> Character);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_528_14" HREF="terminal_interface-curses__adb.htm#ref_160_14">Add</A></FONT> (<FONT COLOR=red><A NAME="ref_528_19" HREF="terminal_interface-curses__adb.htm#ref_160_19">Win</A></FONT> :  <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                  <FONT COLOR=red><A NAME="ref_529_19" HREF="terminal_interface-curses__adb.htm#ref_161_19">Ch</A></FONT>  :  <b>in</b> Character);
-    <FONT COLOR=green><EM>--  Add a single character at the current logical cursor position to</EM></FONT>
-    <FONT COLOR=green><EM>--  the window. Use the current windows attributes.</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_8"#2|</EM></FONT>
--   <b>procedure</b> Add
--     (<FONT COLOR=red><A NAME="ref_530_7" HREF="terminal_interface-curses__adb.htm#ref_225_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
--      <FONT COLOR=red><A NAME="ref_531_7" HREF="terminal_interface-curses__adb.htm#ref_226_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_532_7" HREF="terminal_interface-curses__adb.htm#ref_227_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Column_Position</A>;
--      Ch     : <b>in</b> Attributed_Character);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_9"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_534_14" HREF="terminal_interface-curses__adb.htm#ref_170_14">Add</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_535_7" HREF="terminal_interface-curses__adb.htm#ref_171_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_536_7" HREF="terminal_interface-curses__adb.htm#ref_172_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_537_7" HREF="terminal_interface-curses__adb.htm#ref_173_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_538_7" HREF="terminal_interface-curses__adb.htm#ref_174_7">Ch</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_addch.3x.html">mvwaddch()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: mvaddch()</EM></FONT>
- 
--   <b>procedure</b> Add
--     (<FONT COLOR=red><A NAME="ref_538_7" HREF="terminal_interface-curses__adb.htm#ref_244_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
--      <FONT COLOR=red><A NAME="ref_539_7" HREF="terminal_interface-curses__adb.htm#ref_245_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_540_7" HREF="terminal_interface-curses__adb.htm#ref_246_7">Column</A></FONT> : <b>in</b> Column_Position;
--      Ch     : <b>in</b> Character);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_542_14" HREF="terminal_interface-curses__adb.htm#ref_189_14">Add</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_543_7" HREF="terminal_interface-curses__adb.htm#ref_190_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_544_7" HREF="terminal_interface-curses__adb.htm#ref_191_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_545_7" HREF="terminal_interface-curses__adb.htm#ref_192_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_546_7" HREF="terminal_interface-curses__adb.htm#ref_193_7">Ch</A></FONT>     : <b>in</b> Character);
-    <FONT COLOR=green><EM>--  Move to the position and add a single character into the window</EM></FONT>
-    <FONT COLOR=green><EM>--  There are more Add routines, so the Inline pragma follows later</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_9"#2|</EM></FONT>
--   <b>procedure</b> Add_With_Immediate_Echo
--     (<FONT COLOR=red><A NAME="ref_547_7" HREF="terminal_interface-curses__adb.htm#ref_259_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Window</A> := Standard_Window;
--      Ch  : <b>in</b> Attributed_Character);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_10"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_551_14" HREF="terminal_interface-curses__adb.htm#ref_204_14">Add_With_Immediate_Echo</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_552_7" HREF="terminal_interface-curses__adb.htm#ref_205_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_553_7" HREF="terminal_interface-curses__adb.htm#ref_206_7">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_addch.3x.html">wechochar()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: echochar()</EM></FONT>
- 
--   <b>procedure</b> Add_With_Immediate_Echo
--     (<FONT COLOR=red><A NAME="ref_553_7" HREF="terminal_interface-curses__adb.htm#ref_272_7">Win</A></FONT> : <b>in</b> Window := Standard_Window;
--      Ch  : <b>in</b> Character);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_557_14" HREF="terminal_interface-curses__adb.htm#ref_217_14">Add_With_Immediate_Echo</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_558_7" HREF="terminal_interface-curses__adb.htm#ref_218_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_559_7" HREF="terminal_interface-curses__adb.htm#ref_219_7">Ch</A></FONT>  : <b>in</b> Character);
-    <FONT COLOR=green><EM>--  Add a character and do an immediate refresh of the screen.</EM></FONT>
-    <b>pragma</b> Inline (Add_With_Immediate_Echo);
- 
-@@ -565,105 +570,105 @@
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  Not Implemented: wcursyncup</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_10"#2|</EM></FONT>
--   <b>function</b> Create
--     (<FONT COLOR=red><A NAME="ref_565_7" HREF="terminal_interface-curses__adb.htm#ref_283_21">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
--      <FONT COLOR=red><A NAME="ref_566_7" HREF="terminal_interface-curses__adb.htm#ref_284_21">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Count</A>;
--      <FONT COLOR=red><A NAME="ref_567_7" HREF="terminal_interface-curses__adb.htm#ref_285_21">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--      First_Column_Position : Column_Position) <b>return</b> Window;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_11"#2|</EM></FONT>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_569_13" HREF="terminal_interface-curses__adb.htm#ref_229_13">Create</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_570_7" HREF="terminal_interface-curses__adb.htm#ref_229_21">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+      <FONT COLOR=red><A NAME="ref_571_7" HREF="terminal_interface-curses__adb.htm#ref_230_21">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-+      <FONT COLOR=red><A NAME="ref_572_7" HREF="terminal_interface-curses__adb.htm#ref_231_21">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_573_7" HREF="terminal_interface-curses__adb.htm#ref_232_21">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-    <FONT COLOR=green><EM>--  Not Implemented: Default Number_Of_Lines, Number_Of_Columns</EM></FONT>
-    <FONT COLOR=green><EM>--  the C version lets them be 0, see the man page.</EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_window.3x.html">newwin()</A></EM></FONT>
--   <b>pragma</b> Inline (Create);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_569_13">Create</A>);
- 
-    <b>function</b> New_Window
--     (<FONT COLOR=red><A NAME="ref_575_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
--      <FONT COLOR=red><A NAME="ref_576_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Count</A>;
--      <FONT COLOR=red><A NAME="ref_577_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--      First_Column_Position : Column_Position) <b>return</b> Window
--     <b>renames</b> Create;
-+     (<FONT COLOR=red><A NAME="ref_580_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+      <FONT COLOR=red><A NAME="ref_581_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-+      <FONT COLOR=red><A NAME="ref_582_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_583_7">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
-+     <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_569_13">Create</A>;
-    <FONT COLOR=green><EM>--  pragma Inline (New_Window);</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_11"#2|</EM></FONT>
--   <b>procedure</b> Delete (Win : <b>in</b> <b>out</b> Window);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_12"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_588_14" HREF="terminal_interface-curses__adb.htm#ref_252_14">Delete</A></FONT> (<FONT COLOR=red><A NAME="ref_588_22" HREF="terminal_interface-curses__adb.htm#ref_252_22">Win</A></FONT> : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_window.3x.html">delwin()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  Reset Win to Null_Window</EM></FONT>
--   <b>pragma</b> Inline (Delete);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_588_14">Delete</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_12"#2|</EM></FONT>
--   <b>function</b> Sub_Window
--     (<FONT COLOR=red><A NAME="ref_590_7" HREF="terminal_interface-curses__adb.htm#ref_318_7">Win</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Window</A> := Standard_Window;
--      <FONT COLOR=red><A NAME="ref_591_7" HREF="terminal_interface-curses__adb.htm#ref_319_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
--      <FONT COLOR=red><A NAME="ref_592_7" HREF="terminal_interface-curses__adb.htm#ref_320_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Count</A>;
--      <FONT COLOR=red><A NAME="ref_593_7" HREF="terminal_interface-curses__adb.htm#ref_321_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--      First_Column_Position : Column_Position) <b>return</b> Window;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_13"#2|</EM></FONT>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_594_13" HREF="terminal_interface-curses__adb.htm#ref_263_13">Sub_Window</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_595_7" HREF="terminal_interface-curses__adb.htm#ref_264_7">Win</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_596_7" HREF="terminal_interface-curses__adb.htm#ref_265_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+      <FONT COLOR=red><A NAME="ref_597_7" HREF="terminal_interface-curses__adb.htm#ref_266_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-+      <FONT COLOR=red><A NAME="ref_598_7" HREF="terminal_interface-curses__adb.htm#ref_267_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_599_7" HREF="terminal_interface-curses__adb.htm#ref_268_7">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_window.3x.html">subwin()</A></EM></FONT>
--   <b>pragma</b> Inline (Sub_Window);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_594_13">Sub_Window</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_13"#2|</EM></FONT>
--   <b>function</b> Derived_Window
--     (<FONT COLOR=red><A NAME="ref_600_7" HREF="terminal_interface-curses__adb.htm#ref_346_7">Win</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Window</A> := Standard_Window;
--      <FONT COLOR=red><A NAME="ref_601_7" HREF="terminal_interface-curses__adb.htm#ref_347_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
--      <FONT COLOR=red><A NAME="ref_602_7" HREF="terminal_interface-curses__adb.htm#ref_348_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Count</A>;
--      <FONT COLOR=red><A NAME="ref_603_7" HREF="terminal_interface-curses__adb.htm#ref_349_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--      First_Column_Position : Column_Position) <b>return</b> Window;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_14"#2|</EM></FONT>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_604_13" HREF="terminal_interface-curses__adb.htm#ref_291_13">Derived_Window</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_605_7" HREF="terminal_interface-curses__adb.htm#ref_292_7">Win</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_606_7" HREF="terminal_interface-curses__adb.htm#ref_293_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+      <FONT COLOR=red><A NAME="ref_607_7" HREF="terminal_interface-curses__adb.htm#ref_294_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-+      <FONT COLOR=red><A NAME="ref_608_7" HREF="terminal_interface-curses__adb.htm#ref_295_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_609_7" HREF="terminal_interface-curses__adb.htm#ref_296_7">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_window.3x.html">derwin()</A></EM></FONT>
--   <b>pragma</b> Inline (Derived_Window);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_604_13">Derived_Window</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_14"#2|</EM></FONT>
--   <b>function</b> Duplicate (Win : Window) <b>return</b> Window;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_15"#2|</EM></FONT>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_614_13" HREF="terminal_interface-curses__adb.htm#ref_319_13">Duplicate</A></FONT> (<FONT COLOR=red><A NAME="ref_614_24" HREF="terminal_interface-curses__adb.htm#ref_319_24">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_window.3x.html">dupwin()</A></EM></FONT>
--   <b>pragma</b> Inline (Duplicate);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_614_13">Duplicate</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_15"#2|</EM></FONT>
--   <b>procedure</b> Move_Window (<FONT COLOR=red><A NAME="ref_614_27" HREF="terminal_interface-curses__adb.htm#ref_386_27">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A>;
--                          <FONT COLOR=red><A NAME="ref_615_27" HREF="terminal_interface-curses__adb.htm#ref_387_27">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--                          Column : <b>in</b> Column_Position);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_16"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_619_14" HREF="terminal_interface-curses__adb.htm#ref_332_14">Move_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_619_27" HREF="terminal_interface-curses__adb.htm#ref_332_27">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                          <FONT COLOR=red><A NAME="ref_620_27" HREF="terminal_interface-curses__adb.htm#ref_333_27">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+                          <FONT COLOR=red><A NAME="ref_621_27" HREF="terminal_interface-curses__adb.htm#ref_334_27">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_window.3x.html">mvwin()</A></EM></FONT>
--   <b>pragma</b> Inline (Move_Window);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_619_14">Move_Window</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_16"#2|</EM></FONT>
--   <b>procedure</b> Move_Derived_Window (<FONT COLOR=red><A NAME="ref_621_35" HREF="terminal_interface-curses__adb.htm#ref_400_35">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A>;
--                                  <FONT COLOR=red><A NAME="ref_622_35" HREF="terminal_interface-curses__adb.htm#ref_401_35">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--                                  Column : <b>in</b> Column_Position);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_17"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_626_14" HREF="terminal_interface-curses__adb.htm#ref_346_14">Move_Derived_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_626_35" HREF="terminal_interface-curses__adb.htm#ref_346_35">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                                  <FONT COLOR=red><A NAME="ref_627_35" HREF="terminal_interface-curses__adb.htm#ref_347_35">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+                                  <FONT COLOR=red><A NAME="ref_628_35" HREF="terminal_interface-curses__adb.htm#ref_348_35">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_window.3x.html">mvderwin()</A></EM></FONT>
--   <b>pragma</b> Inline (Move_Derived_Window);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_626_14">Move_Derived_Window</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_17"#2|</EM></FONT>
--   <b>procedure</b> Synchronize_Upwards (Win : <b>in</b> Window);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_18"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_633_14">Synchronize_Upwards</A></FONT> (<FONT COLOR=red><A NAME="ref_633_35" HREF="terminal_interface-curses__ads.htm#ref_633_14">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_window.3x.html">wsyncup()</A></EM></FONT>
-    <b>pragma</b> Import (C, Synchronize_Upwards, "wsyncup");
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_18"#2|</EM></FONT>
--   <b>procedure</b> Synchronize_Downwards (Win : <b>in</b> Window);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_19"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_638_14">Synchronize_Downwards</A></FONT> (<FONT COLOR=red><A NAME="ref_638_37" HREF="terminal_interface-curses__ads.htm#ref_638_14">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_window.3x.html">wsyncdown()</A></EM></FONT>
-    <b>pragma</b> Import (C, Synchronize_Downwards, "wsyncdown");
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_19"#2|</EM></FONT>
--   <b>procedure</b> Set_Synch_Mode (<FONT COLOR=red><A NAME="ref_638_30" HREF="terminal_interface-curses__adb.htm#ref_414_30">Win</A></FONT>  : <b>in</b> Window := Standard_Window;
--                             Mode : <b>in</b> Boolean := False);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_20"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_643_14" HREF="terminal_interface-curses__adb.htm#ref_360_14">Set_Synch_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_643_30" HREF="terminal_interface-curses__adb.htm#ref_360_30">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                             <FONT COLOR=red><A NAME="ref_644_30" HREF="terminal_interface-curses__adb.htm#ref_361_30">Mode</A></FONT> : <b>in</b> Boolean := False);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_window.3x.html">syncok()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Synch_Mode);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_643_14">Set_Synch_Mode</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_addstr.3x.html">curs_addstr.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_20"#2|</EM></FONT>
--   <b>procedure</b> Add (<FONT COLOR=red><A NAME="ref_648_19" HREF="terminal_interface-curses__adb.htm#ref_426_19">Win</A></FONT> : <b>in</b> Window := Standard_Window;
--                  <FONT COLOR=red><A NAME="ref_649_19" HREF="terminal_interface-curses__adb.htm#ref_427_19">Str</A></FONT> : <b>in</b> String;
--                  Len : <b>in</b> Integer := -1);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_21"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_653_14" HREF="terminal_interface-curses__adb.htm#ref_372_14">Add</A></FONT> (<FONT COLOR=red><A NAME="ref_653_19" HREF="terminal_interface-curses__adb.htm#ref_372_19">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                  <FONT COLOR=red><A NAME="ref_654_19" HREF="terminal_interface-curses__adb.htm#ref_373_19">Str</A></FONT> : <b>in</b> String;
-+                  <FONT COLOR=red><A NAME="ref_655_19" HREF="terminal_interface-curses__adb.htm#ref_374_19">Len</A></FONT> : <b>in</b> Integer := -1);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_addstr.3x.html">waddnstr()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: waddstr()</EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: addnstr()</EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: addstr()</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_21"#2|</EM></FONT>
--   <b>procedure</b> Add (<FONT COLOR=red><A NAME="ref_657_19" HREF="terminal_interface-curses__adb.htm#ref_445_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
--                  <FONT COLOR=red><A NAME="ref_658_19" HREF="terminal_interface-curses__adb.htm#ref_446_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--                  <FONT COLOR=red><A NAME="ref_659_19" HREF="terminal_interface-curses__adb.htm#ref_447_7">Column</A></FONT> : <b>in</b> Column_Position;
--                  <FONT COLOR=red><A NAME="ref_660_19" HREF="terminal_interface-curses__adb.htm#ref_448_7">Str</A></FONT>    : <b>in</b> String;
--                  Len    : <b>in</b> Integer := -1);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_22"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_662_14" HREF="terminal_interface-curses__adb.htm#ref_390_14">Add</A></FONT> (<FONT COLOR=red><A NAME="ref_662_19" HREF="terminal_interface-curses__adb.htm#ref_391_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                  <FONT COLOR=red><A NAME="ref_663_19" HREF="terminal_interface-curses__adb.htm#ref_392_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+                  <FONT COLOR=red><A NAME="ref_664_19" HREF="terminal_interface-curses__adb.htm#ref_393_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+                  <FONT COLOR=red><A NAME="ref_665_19" HREF="terminal_interface-curses__adb.htm#ref_394_7">Str</A></FONT>    : <b>in</b> String;
-+                  <FONT COLOR=red><A NAME="ref_666_19" HREF="terminal_interface-curses__adb.htm#ref_395_7">Len</A></FONT>    : <b>in</b> Integer := -1);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_addstr.3x.html">mvwaddnstr()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: mvwaddstr()</EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: mvaddnstr()</EM></FONT>
-@@ -673,21 +678,21 @@
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_addchstr.3x.html">curs_addchstr.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_22"#2|</EM></FONT>
--   <b>procedure</b> Add (<FONT COLOR=red><A NAME="ref_672_19" HREF="terminal_interface-curses__adb.htm#ref_457_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Window</A> := Standard_Window;
--                  <FONT COLOR=red><A NAME="ref_673_19" HREF="terminal_interface-curses__adb.htm#ref_458_7">Str</A></FONT> : <b>in</b> Attributed_String;
--                  Len : <b>in</b> Integer := -1);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_23"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_677_14" HREF="terminal_interface-curses__adb.htm#ref_402_14">Add</A></FONT> (<FONT COLOR=red><A NAME="ref_677_19" HREF="terminal_interface-curses__adb.htm#ref_403_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                  <FONT COLOR=red><A NAME="ref_678_19" HREF="terminal_interface-curses__adb.htm#ref_404_7">Str</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Attributed_String</A>;
-+                  <FONT COLOR=red><A NAME="ref_679_19" HREF="terminal_interface-curses__adb.htm#ref_405_7">Len</A></FONT> : <b>in</b> Integer := -1);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_addchstr.3x.html">waddchnstr()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: waddchstr()</EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: addchnstr()</EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: addchstr()</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_23"#2|</EM></FONT>
--   <b>procedure</b> Add (<FONT COLOR=red><A NAME="ref_681_19" HREF="terminal_interface-curses__adb.htm#ref_480_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
--                  <FONT COLOR=red><A NAME="ref_682_19" HREF="terminal_interface-curses__adb.htm#ref_481_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--                  <FONT COLOR=red><A NAME="ref_683_19" HREF="terminal_interface-curses__adb.htm#ref_482_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Column_Position</A>;
--                  <FONT COLOR=red><A NAME="ref_684_19" HREF="terminal_interface-curses__adb.htm#ref_483_7">Str</A></FONT>    : <b>in</b> Attributed_String;
--                  Len    : <b>in</b> Integer := -1);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_24"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_686_14" HREF="terminal_interface-curses__adb.htm#ref_425_14">Add</A></FONT> (<FONT COLOR=red><A NAME="ref_686_19" HREF="terminal_interface-curses__adb.htm#ref_426_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                  <FONT COLOR=red><A NAME="ref_687_19" HREF="terminal_interface-curses__adb.htm#ref_427_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+                  <FONT COLOR=red><A NAME="ref_688_19" HREF="terminal_interface-curses__adb.htm#ref_428_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+                  <FONT COLOR=red><A NAME="ref_689_19" HREF="terminal_interface-curses__adb.htm#ref_429_7">Str</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Attributed_String</A>;
-+                  <FONT COLOR=red><A NAME="ref_690_19" HREF="terminal_interface-curses__adb.htm#ref_430_7">Len</A></FONT>    : <b>in</b> Integer := -1);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_addchstr.3x.html">mvwaddchnstr()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: mvwaddchstr()</EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: mvaddchnstr()</EM></FONT>
-@@ -700,92 +705,92 @@
-    <FONT COLOR=green><EM>--  | Not implemented: mvhline,  mvwhline, mvvline, mvwvline</EM></FONT>
-    <FONT COLOR=green><EM>--  | use Move_Cursor then Horizontal_Line or Vertical_Line</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_24"#2|</EM></FONT>
--   <b>procedure</b> Border
--     (<FONT COLOR=red><A NAME="ref_700_7" HREF="terminal_interface-curses__adb.htm#ref_492_7">Win</A></FONT>                       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Window</A> := Standard_Window;
--      <FONT COLOR=red><A NAME="ref_701_7" HREF="terminal_interface-curses__adb.htm#ref_493_7">Left_Side_Symbol</A></FONT>          : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
--      <FONT COLOR=red><A NAME="ref_702_7" HREF="terminal_interface-curses__adb.htm#ref_494_7">Right_Side_Symbol</A></FONT>         : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
--      <FONT COLOR=red><A NAME="ref_703_7" HREF="terminal_interface-curses__adb.htm#ref_495_7">Top_Side_Symbol</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
--      <FONT COLOR=red><A NAME="ref_704_7" HREF="terminal_interface-curses__adb.htm#ref_496_7">Bottom_Side_Symbol</A></FONT>        : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
--      <FONT COLOR=red><A NAME="ref_705_7" HREF="terminal_interface-curses__adb.htm#ref_497_7">Upper_Left_Corner_Symbol</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
--      <FONT COLOR=red><A NAME="ref_706_7" HREF="terminal_interface-curses__adb.htm#ref_498_7">Upper_Right_Corner_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
--      <FONT COLOR=red><A NAME="ref_707_7" HREF="terminal_interface-curses__adb.htm#ref_499_7">Lower_Left_Corner_Symbol</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
--      Lower_Right_Corner_Symbol : <b>in</b> Attributed_Character := Default_Character
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_25"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_704_14" HREF="terminal_interface-curses__adb.htm#ref_437_14">Border</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_705_7" HREF="terminal_interface-curses__adb.htm#ref_438_7">Win</A></FONT>                       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_706_7" HREF="terminal_interface-curses__adb.htm#ref_439_7">Left_Side_Symbol</A></FONT>          : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+      <FONT COLOR=red><A NAME="ref_707_7" HREF="terminal_interface-curses__adb.htm#ref_440_7">Right_Side_Symbol</A></FONT>         : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+      <FONT COLOR=red><A NAME="ref_708_7" HREF="terminal_interface-curses__adb.htm#ref_441_7">Top_Side_Symbol</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+      <FONT COLOR=red><A NAME="ref_709_7" HREF="terminal_interface-curses__adb.htm#ref_442_7">Bottom_Side_Symbol</A></FONT>        : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+      <FONT COLOR=red><A NAME="ref_710_7" HREF="terminal_interface-curses__adb.htm#ref_443_7">Upper_Left_Corner_Symbol</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+      <FONT COLOR=red><A NAME="ref_711_7" HREF="terminal_interface-curses__adb.htm#ref_444_7">Upper_Right_Corner_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+      <FONT COLOR=red><A NAME="ref_712_7" HREF="terminal_interface-curses__adb.htm#ref_445_7">Lower_Left_Corner_Symbol</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+      <FONT COLOR=red><A NAME="ref_713_7" HREF="terminal_interface-curses__adb.htm#ref_446_7">Lower_Right_Corner_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>
-      );
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_border.3x.html">wborder()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: border()</EM></FONT>
--   <b>pragma</b> Inline (Border);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_704_14">Border</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_25"#2|</EM></FONT>
--   <b>procedure</b> Box
--     (<FONT COLOR=red><A NAME="ref_716_7" HREF="terminal_interface-curses__adb.htm#ref_529_7">Win</A></FONT>               : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Window</A> := Standard_Window;
--      <FONT COLOR=red><A NAME="ref_717_7" HREF="terminal_interface-curses__adb.htm#ref_530_7">Vertical_Symbol</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
--      Horizontal_Symbol : <b>in</b> Attributed_Character := Default_Character);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_26"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_720_14" HREF="terminal_interface-curses__adb.htm#ref_474_14">Box</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_721_7" HREF="terminal_interface-curses__adb.htm#ref_475_7">Win</A></FONT>               : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_722_7" HREF="terminal_interface-curses__adb.htm#ref_476_7">Vertical_Symbol</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+      <FONT COLOR=red><A NAME="ref_723_7" HREF="terminal_interface-curses__adb.htm#ref_477_7">Horizontal_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_border.3x.html">box()</A></EM></FONT>
--   <b>pragma</b> Inline (Box);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_720_14">Box</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_26"#2|</EM></FONT>
--   <b>procedure</b> Horizontal_Line
--     (<FONT COLOR=red><A NAME="ref_724_7" HREF="terminal_interface-curses__adb.htm#ref_540_7">Win</A></FONT>         : <b>in</b> Window := Standard_Window;
--      <FONT COLOR=red><A NAME="ref_725_7" HREF="terminal_interface-curses__adb.htm#ref_541_7">Line_Size</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Natural</A>;
--      Line_Symbol : <b>in</b> Attributed_Character := Default_Character);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_27"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_728_14" HREF="terminal_interface-curses__adb.htm#ref_485_14">Horizontal_Line</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_729_7" HREF="terminal_interface-curses__adb.htm#ref_486_7">Win</A></FONT>         : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_730_7" HREF="terminal_interface-curses__adb.htm#ref_487_7">Line_Size</A></FONT>   : <b>in</b> Natural;
-+      <FONT COLOR=red><A NAME="ref_731_7" HREF="terminal_interface-curses__adb.htm#ref_488_7">Line_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_border.3x.html">whline()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: hline()</EM></FONT>
--   <b>pragma</b> Inline (Horizontal_Line);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_728_14">Horizontal_Line</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_27"#2|</EM></FONT>
--   <b>procedure</b> Vertical_Line
--     (<FONT COLOR=red><A NAME="ref_733_7" HREF="terminal_interface-curses__adb.htm#ref_557_7">Win</A></FONT>         : <b>in</b> Window := Standard_Window;
--      <FONT COLOR=red><A NAME="ref_734_7" HREF="terminal_interface-curses__adb.htm#ref_558_7">Line_Size</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Natural</A>;
--      Line_Symbol : <b>in</b> Attributed_Character := Default_Character);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_28"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_737_14" HREF="terminal_interface-curses__adb.htm#ref_502_14">Vertical_Line</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_738_7" HREF="terminal_interface-curses__adb.htm#ref_503_7">Win</A></FONT>         : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_739_7" HREF="terminal_interface-curses__adb.htm#ref_504_7">Line_Size</A></FONT>   : <b>in</b> Natural;
-+      <FONT COLOR=red><A NAME="ref_740_7" HREF="terminal_interface-curses__adb.htm#ref_505_7">Line_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_border.3x.html">wvline()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: vline()</EM></FONT>
--   <b>pragma</b> Inline (Vertical_Line);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_737_14">Vertical_Line</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_getch.3x.html">curs_getch.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  Not implemented: mvgetch, mvwgetch</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_28"#2|</EM></FONT>
--   <b>function</b> Get_Keystroke (Win : Window := Standard_Window)
--                           <b>return</b> Real_Key_Code;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_29"#2|</EM></FONT>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_751_13" HREF="terminal_interface-curses__adb.htm#ref_520_13">Get_Keystroke</A></FONT> (<FONT COLOR=red><A NAME="ref_751_28" HREF="terminal_interface-curses__adb.htm#ref_520_28">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-+                           <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_getch.3x.html">wgetch()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: getch()</EM></FONT>
-    <FONT COLOR=green><EM>--  Get a character from the keyboard and echo it - if enabled - to the</EM></FONT>
-    <FONT COLOR=green><EM>--  window.</EM></FONT>
-    <FONT COLOR=green><EM>--  If for any reason (i.e. a timeout) we couldn't get a character the</EM></FONT>
-    <FONT COLOR=green><EM>--  returned keycode is Key_None.</EM></FONT>
--   <b>pragma</b> Inline (Get_Keystroke);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_751_13">Get_Keystroke</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_29"#2|</EM></FONT>
--   <b>procedure</b> Undo_Keystroke (Key : <b>in</b> Real_Key_Code);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_30"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_762_14" HREF="terminal_interface-curses__adb.htm#ref_535_14">Undo_Keystroke</A></FONT> (<FONT COLOR=red><A NAME="ref_762_30" HREF="terminal_interface-curses__adb.htm#ref_535_30">Key</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_getch.3x.html">ungetch()</A></EM></FONT>
--   <b>pragma</b> Inline (Undo_Keystroke);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_762_14">Undo_Keystroke</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_30"#2|</EM></FONT>
--   <b>function</b> Has_Key (Key : Special_Key_Code) <b>return</b> Boolean;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_31"#2|</EM></FONT>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_767_13" HREF="terminal_interface-curses__adb.htm#ref_545_13">Has_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_767_22" HREF="terminal_interface-curses__adb.htm#ref_545_22">Key</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>) <b>return</b> Boolean;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_getch.3x.html">has_key()</A></EM></FONT>
--   <b>pragma</b> Inline (Has_Key);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_767_13">Has_Key</A>);
- 
-    <FONT COLOR=green><EM>--  |</EM></FONT>
-    <FONT COLOR=green><EM>--  | Some helper functions</EM></FONT>
-    <FONT COLOR=green><EM>--  |</EM></FONT>
--   <b>function</b> Is_Function_Key (Key : Special_Key_Code) <b>return</b> Boolean;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_774_13" HREF="terminal_interface-curses__adb.htm#ref_557_13">Is_Function_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_774_30" HREF="terminal_interface-curses__adb.htm#ref_557_30">Key</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>) <b>return</b> Boolean;
-    <FONT COLOR=green><EM>--  Return True if the Key is a function key (i.e. one of F0 .. F63)</EM></FONT>
--   <b>pragma</b> Inline (Is_Function_Key);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_774_13">Is_Function_Key</A>);
- 
--   <b>subtype</b> Function_Key_Number <b>is</b> Integer <b>range</b> 0 .. 63;
-+   <b>subtype</b> <FONT COLOR=red><A NAME="ref_778_12">Function_Key_Number</A></FONT> <b>is</b> Integer <b>range</b> 0 .. 63;
-    <FONT COLOR=green><EM>--  (n)curses allows for 64 function keys.</EM></FONT>
- 
--   <b>function</b> Function_Key (Key : Real_Key_Code) <b>return</b> Function_Key_Number;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_781_13" HREF="terminal_interface-curses__adb.htm#ref_569_13">Function_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_781_27" HREF="terminal_interface-curses__adb.htm#ref_569_27">Key</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_778_12">Function_Key_Number</A>;
-    <FONT COLOR=green><EM>--  Return the number of the function key. If the code is not a</EM></FONT>
-    <FONT COLOR=green><EM>--  function key, a CONSTRAINT_ERROR will be raised.</EM></FONT>
--   <b>pragma</b> Inline (Function_Key);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_781_13">Function_Key</A>);
- 
--   <b>function</b> Function_Key_Code (Key : Function_Key_Number) <b>return</b> Real_Key_Code;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_786_13" HREF="terminal_interface-curses__adb.htm#ref_580_13">Function_Key_Code</A></FONT> (<FONT COLOR=red><A NAME="ref_786_32" HREF="terminal_interface-curses__adb.htm#ref_580_32">Key</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_778_12">Function_Key_Number</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>;
-    <FONT COLOR=green><EM>--  Return the key code for a given function-key number.</EM></FONT>
--   <b>pragma</b> Inline (Function_Key_Code);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_786_13">Function_Key_Code</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></EM></FONT>
-@@ -796,68 +801,68 @@
-    <FONT COLOR=green><EM>--  PAIR_NUMBER</EM></FONT>
-    <FONT COLOR=green><EM>--  PAIR_NUMBER(c) is the same as c.Color</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_31"#2|</EM></FONT>
--   <b>procedure</b> Standout (<FONT COLOR=red><A NAME="ref_795_24" HREF="terminal_interface-curses__adb.htm#ref_640_24">Win</A></FONT> : Window  := Standard_Window;
--                       On  : Boolean := True);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_32"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_800_14" HREF="terminal_interface-curses__adb.htm#ref_586_14">Standout</A></FONT> (<FONT COLOR=red><A NAME="ref_800_24" HREF="terminal_interface-curses__adb.htm#ref_586_24">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>  := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                       <FONT COLOR=red><A NAME="ref_801_24" HREF="terminal_interface-curses__adb.htm#ref_587_24">On</A></FONT>  : Boolean := True);
-    <FONT COLOR=green><EM>--  AKA: wstandout()</EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: wstandend()</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_32"#2|</EM></FONT>
--   <b>procedure</b> Switch_Character_Attribute
--     (<FONT COLOR=red><A NAME="ref_802_7" HREF="terminal_interface-curses__adb.htm#ref_661_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Window</A> := Standard_Window;
--      <FONT COLOR=red><A NAME="ref_803_7" HREF="terminal_interface-curses__adb.htm#ref_662_7">Attr</A></FONT> : <b>in</b> Character_Attribute_Set := Normal_Video;
--      On   : <b>in</b> Boolean := True); <FONT COLOR=green><EM>--  if False we switch Off.</EM></FONT>
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_33"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_806_14" HREF="terminal_interface-curses__adb.htm#ref_606_14">Switch_Character_Attribute</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_807_7" HREF="terminal_interface-curses__adb.htm#ref_607_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_808_7" HREF="terminal_interface-curses__adb.htm#ref_608_7">Attr</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-+      <FONT COLOR=red><A NAME="ref_809_7" HREF="terminal_interface-curses__adb.htm#ref_609_7">On</A></FONT>   : <b>in</b> Boolean := True); <FONT COLOR=green><EM>--  if False we switch Off.</EM></FONT>
-    <FONT COLOR=green><EM>--  Switches those Attributes set to true in the list.</EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_attr.3x.html">wattron()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: wattroff()</EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: attron()</EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: attroff()</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_33"#2|</EM></FONT>
--   <b>procedure</b> Set_Character_Attributes
--     (<FONT COLOR=red><A NAME="ref_813_7" HREF="terminal_interface-curses__adb.htm#ref_689_7">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Window</A> := Standard_Window;
--      <FONT COLOR=red><A NAME="ref_814_7" HREF="terminal_interface-curses__adb.htm#ref_690_7">Attr</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character_Attribute_Set</A> := Normal_Video;
--      Color : <b>in</b> Color_Pair := Color_Pair'First);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_34"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_817_14" HREF="terminal_interface-curses__adb.htm#ref_634_14">Set_Character_Attributes</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_818_7" HREF="terminal_interface-curses__adb.htm#ref_635_7">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_819_7" HREF="terminal_interface-curses__adb.htm#ref_636_7">Attr</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-+      <FONT COLOR=red><A NAME="ref_820_7" HREF="terminal_interface-curses__adb.htm#ref_637_7">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_attr.3x.html">wattrset()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: attrset()</EM></FONT>
--   <b>pragma</b> Inline (Set_Character_Attributes);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_817_14">Set_Character_Attributes</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_34"#2|</EM></FONT>
--   <b>function</b> Get_Character_Attribute
--     (Win : <b>in</b> Window := Standard_Window) <b>return</b> Character_Attribute_Set;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_35"#2|</EM></FONT>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_826_13" HREF="terminal_interface-curses__adb.htm#ref_652_13">Get_Character_Attribute</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_827_7" HREF="terminal_interface-curses__adb.htm#ref_652_38">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_attr.3x.html">wattr_get()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: attr_get()</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_35"#2|</EM></FONT>
--   <b>function</b> Get_Character_Attribute
--     (Win : <b>in</b> Window := Standard_Window) <b>return</b> Color_Pair;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_36"#2|</EM></FONT>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_832_13" HREF="terminal_interface-curses__adb.htm#ref_675_13">Get_Character_Attribute</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_833_7" HREF="terminal_interface-curses__adb.htm#ref_675_38">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_attr.3x.html">wattr_get()</A></EM></FONT>
-    <b>pragma</b> Inline (Get_Character_Attribute);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_36"#2|</EM></FONT>
--   <b>procedure</b> Set_Color (<FONT COLOR=red><A NAME="ref_833_25" HREF="terminal_interface-curses__adb.htm#ref_752_25">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Window</A> := Standard_Window;
--                        Pair : <b>in</b> Color_Pair);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_37"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_838_14" HREF="terminal_interface-curses__adb.htm#ref_698_14">Set_Color</A></FONT> (<FONT COLOR=red><A NAME="ref_838_25" HREF="terminal_interface-curses__adb.htm#ref_698_25">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                        <FONT COLOR=red><A NAME="ref_839_25" HREF="terminal_interface-curses__adb.htm#ref_699_25">Pair</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_attr.3x.html">wcolor_set()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: color_set()</EM></FONT>
--   <b>pragma</b> Inline (Set_Color);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_838_14">Set_Color</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_37"#2|</EM></FONT>
--   <b>procedure</b> Change_Attributes
--     (<FONT COLOR=red><A NAME="ref_841_7" HREF="terminal_interface-curses__adb.htm#ref_768_7">Win</A></FONT>   : <b>in</b> Window := Standard_Window;
--      <FONT COLOR=red><A NAME="ref_842_7" HREF="terminal_interface-curses__adb.htm#ref_769_7">Count</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Integer</A> := -1;
--      <FONT COLOR=red><A NAME="ref_843_7" HREF="terminal_interface-curses__adb.htm#ref_770_7">Attr</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character_Attribute_Set</A> := Normal_Video;
--      Color : <b>in</b> Color_Pair := Color_Pair'First);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_38"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_845_14" HREF="terminal_interface-curses__adb.htm#ref_713_14">Change_Attributes</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_846_7" HREF="terminal_interface-curses__adb.htm#ref_714_7">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_847_7" HREF="terminal_interface-curses__adb.htm#ref_715_7">Count</A></FONT> : <b>in</b> Integer := -1;
-+      <FONT COLOR=red><A NAME="ref_848_7" HREF="terminal_interface-curses__adb.htm#ref_716_7">Attr</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-+      <FONT COLOR=red><A NAME="ref_849_7" HREF="terminal_interface-curses__adb.htm#ref_717_7">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_attr.3x.html">wchgat()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: chgat()</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_38"#2|</EM></FONT>
--   <b>procedure</b> Change_Attributes
--     (<FONT COLOR=red><A NAME="ref_850_7" HREF="terminal_interface-curses__adb.htm#ref_791_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
--      <FONT COLOR=red><A NAME="ref_851_7" HREF="terminal_interface-curses__adb.htm#ref_792_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A> := Line_Position'First;
--      <FONT COLOR=red><A NAME="ref_852_7" HREF="terminal_interface-curses__adb.htm#ref_793_7">Column</A></FONT> : <b>in</b> Column_Position := Column_Position'First;
--      <FONT COLOR=red><A NAME="ref_853_7" HREF="terminal_interface-curses__adb.htm#ref_794_7">Count</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Integer</A> := -1;
--      <FONT COLOR=red><A NAME="ref_854_7" HREF="terminal_interface-curses__adb.htm#ref_795_7">Attr</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character_Attribute_Set</A> := Normal_Video;
--      Color  : <b>in</b> Color_Pair := Color_Pair'First);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_39"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_854_14" HREF="terminal_interface-curses__adb.htm#ref_736_14">Change_Attributes</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_855_7" HREF="terminal_interface-curses__adb.htm#ref_737_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_856_7" HREF="terminal_interface-curses__adb.htm#ref_738_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A> := <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>'First;
-+      <FONT COLOR=red><A NAME="ref_857_7" HREF="terminal_interface-curses__adb.htm#ref_739_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> := <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>'First;
-+      <FONT COLOR=red><A NAME="ref_858_7" HREF="terminal_interface-curses__adb.htm#ref_740_7">Count</A></FONT>  : <b>in</b> Integer := -1;
-+      <FONT COLOR=red><A NAME="ref_859_7" HREF="terminal_interface-curses__adb.htm#ref_741_7">Attr</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-+      <FONT COLOR=red><A NAME="ref_860_7" HREF="terminal_interface-curses__adb.htm#ref_742_7">Color</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_attr.3x.html">mvwchgat()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: mvchgat()</EM></FONT>
-    <b>pragma</b> Inline (Change_Attributes);
-@@ -866,15 +871,15 @@
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_beep.3x.html">curs_beep.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_39"#2|</EM></FONT>
--   <b>procedure</b> Beep;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_40"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_870_14" HREF="terminal_interface-curses__adb.htm#ref_749_14">Beep</A></FONT>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_beep.3x.html">beep()</A></EM></FONT>
--   <b>pragma</b> Inline (Beep);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_870_14">Beep</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_40"#2|</EM></FONT>
--   <b>procedure</b> Flash_Screen;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_41"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_875_14" HREF="terminal_interface-curses__adb.htm#ref_759_14">Flash_Screen</A></FONT>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_beep.3x.html">flash()</A></EM></FONT>
--   <b>pragma</b> Inline (Flash_Screen);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_875_14">Flash_Screen</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></EM></FONT>
-@@ -882,76 +887,76 @@
- 
-    <FONT COLOR=green><EM>--  | Not implemented : typeahead</EM></FONT>
-    <FONT COLOR=green><EM>--</EM></FONT>
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_41"#2|</EM></FONT>
--   <b>procedure</b> Set_Cbreak_Mode (SwitchOn : <b>in</b> Boolean := True);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_42"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_886_14" HREF="terminal_interface-curses__adb.htm#ref_769_14">Set_Cbreak_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_886_31" HREF="terminal_interface-curses__adb.htm#ref_769_31">SwitchOn</A></FONT> : <b>in</b> Boolean := True);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_inopts.3x.html">cbreak()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: nocbreak()</EM></FONT>
--   <b>pragma</b> Inline (Set_Cbreak_Mode);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_886_14">Set_Cbreak_Mode</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_42"#2|</EM></FONT>
--   <b>procedure</b> Set_Raw_Mode (SwitchOn : <b>in</b> Boolean := True);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_43"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_892_14" HREF="terminal_interface-curses__adb.htm#ref_788_14">Set_Raw_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_892_28" HREF="terminal_interface-curses__adb.htm#ref_788_28">SwitchOn</A></FONT> : <b>in</b> Boolean := True);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_inopts.3x.html">raw()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: noraw()</EM></FONT>
--   <b>pragma</b> Inline (Set_Raw_Mode);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_892_14">Set_Raw_Mode</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_43"#2|</EM></FONT>
--   <b>procedure</b> Set_Echo_Mode (SwitchOn : <b>in</b> Boolean := True);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_44"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_898_14" HREF="terminal_interface-curses__adb.htm#ref_807_14">Set_Echo_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_898_29" HREF="terminal_interface-curses__adb.htm#ref_807_29">SwitchOn</A></FONT> : <b>in</b> Boolean := True);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_inopts.3x.html">echo()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: noecho()</EM></FONT>
--   <b>pragma</b> Inline (Set_Echo_Mode);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_898_14">Set_Echo_Mode</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_44"#2|</EM></FONT>
--   <b>procedure</b> Set_Meta_Mode (<FONT COLOR=red><A NAME="ref_899_29" HREF="terminal_interface-curses__adb.htm#ref_880_29">Win</A></FONT>      : <b>in</b> Window := Standard_Window;
--                            SwitchOn : <b>in</b> Boolean := True);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_45"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_904_14" HREF="terminal_interface-curses__adb.htm#ref_826_14">Set_Meta_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_904_29" HREF="terminal_interface-curses__adb.htm#ref_826_29">Win</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                            <FONT COLOR=red><A NAME="ref_905_29" HREF="terminal_interface-curses__adb.htm#ref_827_29">SwitchOn</A></FONT> : <b>in</b> Boolean := True);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_inopts.3x.html">meta()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Meta_Mode);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_904_14">Set_Meta_Mode</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_45"#2|</EM></FONT>
--   <b>procedure</b> Set_KeyPad_Mode (<FONT COLOR=red><A NAME="ref_905_31" HREF="terminal_interface-curses__adb.htm#ref_891_31">Win</A></FONT>      : <b>in</b> Window := Standard_Window;
--                              SwitchOn : <b>in</b> Boolean := True);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_46"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_910_14" HREF="terminal_interface-curses__adb.htm#ref_837_14">Set_KeyPad_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_910_31" HREF="terminal_interface-curses__adb.htm#ref_837_31">Win</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                              <FONT COLOR=red><A NAME="ref_911_31" HREF="terminal_interface-curses__adb.htm#ref_838_31">SwitchOn</A></FONT> : <b>in</b> Boolean := True);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_inopts.3x.html">keypad()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_KeyPad_Mode);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_910_14">Set_KeyPad_Mode</A>);
- 
--   <b>function</b> Get_KeyPad_Mode (Win : <b>in</b> Window := Standard_Window)
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_915_13" HREF="terminal_interface-curses__adb.htm#ref_848_13">Get_KeyPad_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_915_30" HREF="terminal_interface-curses__adb.htm#ref_848_30">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-                              <b>return</b> Boolean;
-    <FONT COLOR=green><EM>--  This has no pendant in C. There you've to look into the WINDOWS</EM></FONT>
-    <FONT COLOR=green><EM>--  structure to get the value. Bad practice, not repeated in Ada.</EM></FONT>
- 
--   <b>type</b> Half_Delay_Amount <b>is</b> <b>range</b> 1 .. 255;
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_920_9">Half_Delay_Amount</A></FONT> <b>is</b> <b>range</b> 1 .. 255;
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_46"#2|</EM></FONT>
--   <b>procedure</b> Half_Delay (Amount : <b>in</b> Half_Delay_Amount);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_47"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_923_14" HREF="terminal_interface-curses__adb.htm#ref_857_14">Half_Delay</A></FONT> (<FONT COLOR=red><A NAME="ref_923_26" HREF="terminal_interface-curses__adb.htm#ref_857_26">Amount</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_920_9">Half_Delay_Amount</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_inopts.3x.html">halfdelay()</A></EM></FONT>
--   <b>pragma</b> Inline (Half_Delay);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_923_14">Half_Delay</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_47"#2|</EM></FONT>
--   <b>procedure</b> Set_Flush_On_Interrupt_Mode
--     (<FONT COLOR=red><A NAME="ref_924_7" HREF="terminal_interface-curses__adb.htm#ref_920_7">Win</A></FONT>  : <b>in</b> Window := Standard_Window;
--      Mode : <b>in</b> Boolean := True);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_48"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_928_14" HREF="terminal_interface-curses__adb.htm#ref_867_14">Set_Flush_On_Interrupt_Mode</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_929_7" HREF="terminal_interface-curses__adb.htm#ref_868_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_930_7" HREF="terminal_interface-curses__adb.htm#ref_869_7">Mode</A></FONT> : <b>in</b> Boolean := True);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_inopts.3x.html">intrflush()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Flush_On_Interrupt_Mode);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_928_14">Set_Flush_On_Interrupt_Mode</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_48"#2|</EM></FONT>
--   <b>procedure</b> Set_Queue_Interrupt_Mode
--     (<FONT COLOR=red><A NAME="ref_931_7" HREF="terminal_interface-curses__adb.htm#ref_932_7">Win</A></FONT>   : <b>in</b> Window := Standard_Window;
--      Flush : <b>in</b> Boolean := True);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_49"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_935_14" HREF="terminal_interface-curses__adb.htm#ref_879_14">Set_Queue_Interrupt_Mode</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_936_7" HREF="terminal_interface-curses__adb.htm#ref_880_7">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_937_7" HREF="terminal_interface-curses__adb.htm#ref_881_7">Flush</A></FONT> : <b>in</b> Boolean := True);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_inopts.3x.html">qiflush()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: noqiflush()</EM></FONT>
--   <b>pragma</b> Inline (Set_Queue_Interrupt_Mode);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_935_14">Set_Queue_Interrupt_Mode</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_49"#2|</EM></FONT>
--   <b>procedure</b> Set_NoDelay_Mode
--     (<FONT COLOR=red><A NAME="ref_939_7" HREF="terminal_interface-curses__adb.htm#ref_951_7">Win</A></FONT>  : <b>in</b> Window := Standard_Window;
--      Mode : <b>in</b> Boolean := False);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_50"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_943_14" HREF="terminal_interface-curses__adb.htm#ref_898_14">Set_NoDelay_Mode</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_944_7" HREF="terminal_interface-curses__adb.htm#ref_899_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_945_7" HREF="terminal_interface-curses__adb.htm#ref_900_7">Mode</A></FONT> : <b>in</b> Boolean := False);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_inopts.3x.html">nodelay()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_NoDelay_Mode);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_943_14">Set_NoDelay_Mode</A>);
- 
--   <b>type</b> Timeout_Mode <b>is</b> (Blocking, Non_Blocking, Delayed);
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_949_9">Timeout_Mode</A></FONT> <b>is</b> (<FONT COLOR=red><A NAME="ref_949_26">Blocking</A></FONT>, <FONT COLOR=red><A NAME="ref_949_36">Non_Blocking</A></FONT>, <FONT COLOR=red><A NAME="ref_949_50">Delayed</A></FONT>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_50"#2|</EM></FONT>
--   <b>procedure</b> Set_Timeout_Mode (<FONT COLOR=red><A NAME="ref_947_32" HREF="terminal_interface-curses__adb.htm#ref_962_32">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_943_9">Window</A> := Standard_Window;
--                               <FONT COLOR=red><A NAME="ref_948_32" HREF="terminal_interface-curses__adb.htm#ref_963_32">Mode</A></FONT>   : <b>in</b> Timeout_Mode;
--                               Amount : <b>in</b> Natural); <FONT COLOR=green><EM>--  in Milliseconds</EM></FONT>
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_51"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_952_14" HREF="terminal_interface-curses__adb.htm#ref_910_14">Set_Timeout_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_952_32" HREF="terminal_interface-curses__adb.htm#ref_910_32">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                               <FONT COLOR=red><A NAME="ref_953_32" HREF="terminal_interface-curses__adb.htm#ref_911_32">Mode</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_949_9">Timeout_Mode</A>;
-+                               <FONT COLOR=red><A NAME="ref_954_32" HREF="terminal_interface-curses__adb.htm#ref_912_32">Amount</A></FONT> : <b>in</b> Natural); <FONT COLOR=green><EM>--  in Milliseconds</EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_inopts.3x.html">wtimeout()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: timeout()</EM></FONT>
-    <FONT COLOR=green><EM>--  Instead of overloading the semantic of the sign of amount, we</EM></FONT>
-@@ -960,109 +965,109 @@
-    <FONT COLOR=green><EM>--  evaluated.</EM></FONT>
-    <FONT COLOR=green><EM>--  We don't inline this procedure.</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_51"#2|</EM></FONT>
--   <b>procedure</b> Set_Escape_Timer_Mode
--     (<FONT COLOR=red><A NAME="ref_960_7" HREF="terminal_interface-curses__adb.htm#ref_986_7">Win</A></FONT>       : <b>in</b> Window := Standard_Window;
--      Timer_Off : <b>in</b> Boolean := False);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_52"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_964_14" HREF="terminal_interface-curses__adb.htm#ref_931_14">Set_Escape_Timer_Mode</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_965_7" HREF="terminal_interface-curses__adb.htm#ref_932_7">Win</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_966_7" HREF="terminal_interface-curses__adb.htm#ref_933_7">Timer_Off</A></FONT> : <b>in</b> Boolean := False);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_inopts.3x.html">notimeout()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Escape_Timer_Mode);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_964_14">Set_Escape_Timer_Mode</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_52"#2|</EM></FONT>
--   <b>procedure</b> Set_NL_Mode (SwitchOn : <b>in</b> Boolean := True);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_53"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_975_14" HREF="terminal_interface-curses__adb.htm#ref_945_14">Set_NL_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_975_27" HREF="terminal_interface-curses__adb.htm#ref_945_27">SwitchOn</A></FONT> : <b>in</b> Boolean := True);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_outopts.3x.html">nl()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: nonl()</EM></FONT>
--   <b>pragma</b> Inline (Set_NL_Mode);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_975_14">Set_NL_Mode</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_53"#2|</EM></FONT>
--   <b>procedure</b> Clear_On_Next_Update
--     (<FONT COLOR=red><A NAME="ref_977_7" HREF="terminal_interface-curses__adb.htm#ref_1019_7">Win</A></FONT>      : <b>in</b> Window := Standard_Window;
--      Do_Clear : <b>in</b> Boolean := True);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_54"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_981_14" HREF="terminal_interface-curses__adb.htm#ref_964_14">Clear_On_Next_Update</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_982_7" HREF="terminal_interface-curses__adb.htm#ref_965_7">Win</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_983_7" HREF="terminal_interface-curses__adb.htm#ref_966_7">Do_Clear</A></FONT> : <b>in</b> Boolean := True);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_outopts.3x.html">clearok()</A></EM></FONT>
--   <b>pragma</b> Inline (Clear_On_Next_Update);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_981_14">Clear_On_Next_Update</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_54"#2|</EM></FONT>
--   <b>procedure</b> Use_Insert_Delete_Line
--     (<FONT COLOR=red><A NAME="ref_984_7" HREF="terminal_interface-curses__adb.htm#ref_1031_7">Win</A></FONT>    : <b>in</b> Window := Standard_Window;
--      Do_Idl : <b>in</b> Boolean := True);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_55"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_988_14" HREF="terminal_interface-curses__adb.htm#ref_976_14">Use_Insert_Delete_Line</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_989_7" HREF="terminal_interface-curses__adb.htm#ref_977_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_990_7" HREF="terminal_interface-curses__adb.htm#ref_978_7">Do_Idl</A></FONT> : <b>in</b> Boolean := True);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_outopts.3x.html">idlok()</A></EM></FONT>
--   <b>pragma</b> Inline (Use_Insert_Delete_Line);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_988_14">Use_Insert_Delete_Line</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_55"#2|</EM></FONT>
--   <b>procedure</b> Use_Insert_Delete_Character
--     (<FONT COLOR=red><A NAME="ref_991_7" HREF="terminal_interface-curses__adb.htm#ref_1043_7">Win</A></FONT>    : <b>in</b> Window := Standard_Window;
--      Do_Idc : <b>in</b> Boolean := True);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_56"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_995_14" HREF="terminal_interface-curses__adb.htm#ref_988_14">Use_Insert_Delete_Character</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_996_7" HREF="terminal_interface-curses__adb.htm#ref_989_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_997_7" HREF="terminal_interface-curses__adb.htm#ref_990_7">Do_Idc</A></FONT> : <b>in</b> Boolean := True);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_outopts.3x.html">idcok()</A></EM></FONT>
--   <b>pragma</b> Inline (Use_Insert_Delete_Character);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_995_14">Use_Insert_Delete_Character</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_56"#2|</EM></FONT>
--   <b>procedure</b> Leave_Cursor_After_Update
--     (<FONT COLOR=red><A NAME="ref_998_7" HREF="terminal_interface-curses__adb.htm#ref_1055_7">Win</A></FONT>      : <b>in</b> Window := Standard_Window;
--      Do_Leave : <b>in</b> Boolean := True);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_57"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1002_14" HREF="terminal_interface-curses__adb.htm#ref_998_14">Leave_Cursor_After_Update</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1003_7" HREF="terminal_interface-curses__adb.htm#ref_999_7">Win</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1004_7" HREF="terminal_interface-curses__adb.htm#ref_1000_7">Do_Leave</A></FONT> : <b>in</b> Boolean := True);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_outopts.3x.html">leaveok()</A></EM></FONT>
--   <b>pragma</b> Inline (Leave_Cursor_After_Update);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1002_14">Leave_Cursor_After_Update</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_57"#2|</EM></FONT>
--   <b>procedure</b> Immediate_Update_Mode
--     (<FONT COLOR=red><A NAME="ref_1005_7" HREF="terminal_interface-curses__adb.htm#ref_1067_7">Win</A></FONT>  : <b>in</b> Window := Standard_Window;
--      Mode : <b>in</b> Boolean := False);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_58"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1009_14" HREF="terminal_interface-curses__adb.htm#ref_1010_14">Immediate_Update_Mode</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1010_7" HREF="terminal_interface-curses__adb.htm#ref_1011_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1011_7" HREF="terminal_interface-curses__adb.htm#ref_1012_7">Mode</A></FONT> : <b>in</b> Boolean := False);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_outopts.3x.html">immedok()</A></EM></FONT>
--   <b>pragma</b> Inline (Immediate_Update_Mode);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1009_14">Immediate_Update_Mode</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_58"#2|</EM></FONT>
--   <b>procedure</b> Allow_Scrolling
--     (<FONT COLOR=red><A NAME="ref_1012_7" HREF="terminal_interface-curses__adb.htm#ref_1079_7">Win</A></FONT>  : <b>in</b> Window := Standard_Window;
--      Mode : <b>in</b> Boolean := False);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_59"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1016_14" HREF="terminal_interface-curses__adb.htm#ref_1020_14">Allow_Scrolling</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1017_7" HREF="terminal_interface-curses__adb.htm#ref_1021_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1018_7" HREF="terminal_interface-curses__adb.htm#ref_1022_7">Mode</A></FONT> : <b>in</b> Boolean := False);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_outopts.3x.html">scrollok()</A></EM></FONT>
--   <b>pragma</b> Inline (Allow_Scrolling);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1016_14">Allow_Scrolling</A>);
- 
--   <b>function</b> Scrolling_Allowed (Win : Window := Standard_Window) <b>return</b> Boolean;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1022_13" HREF="terminal_interface-curses__adb.htm#ref_1032_13">Scrolling_Allowed</A></FONT> (<FONT COLOR=red><A NAME="ref_1022_32" HREF="terminal_interface-curses__adb.htm#ref_1032_32">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>) <b>return</b> Boolean;
-    <FONT COLOR=green><EM>--  There is no such function in the C interface.</EM></FONT>
--   <b>pragma</b> Inline (Scrolling_Allowed);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1022_13">Scrolling_Allowed</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_59"#2|</EM></FONT>
--   <b>procedure</b> Set_Scroll_Region
--     (<FONT COLOR=red><A NAME="ref_1023_7" HREF="terminal_interface-curses__adb.htm#ref_1098_7">Win</A></FONT>         : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
--      <FONT COLOR=red><A NAME="ref_1024_7" HREF="terminal_interface-curses__adb.htm#ref_1099_7">Top_Line</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
--      Bottom_Line : <b>in</b> Line_Position);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_60"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1027_14" HREF="terminal_interface-curses__adb.htm#ref_1041_14">Set_Scroll_Region</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1028_7" HREF="terminal_interface-curses__adb.htm#ref_1042_7">Win</A></FONT>         : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1029_7" HREF="terminal_interface-curses__adb.htm#ref_1043_7">Top_Line</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1030_7" HREF="terminal_interface-curses__adb.htm#ref_1044_7">Bottom_Line</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_outopts.3x.html">wsetscrreg()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: setscrreg()</EM></FONT>
--   <b>pragma</b> Inline (Set_Scroll_Region);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1027_14">Set_Scroll_Region</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_refresh.3x.html">curs_refresh.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_60"#2|</EM></FONT>
--   <b>procedure</b> Update_Screen;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_61"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1040_14" HREF="terminal_interface-curses__adb.htm#ref_1057_14">Update_Screen</A></FONT>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_refresh.3x.html">doupdate()</A></EM></FONT>
--   <b>pragma</b> Inline (Update_Screen);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1040_14">Update_Screen</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_61"#2|</EM></FONT>
--   <b>procedure</b> Refresh (Win : <b>in</b> Window := Standard_Window);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_62"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1045_14" HREF="terminal_interface-curses__adb.htm#ref_1067_14">Refresh</A></FONT> (<FONT COLOR=red><A NAME="ref_1045_23" HREF="terminal_interface-curses__adb.htm#ref_1067_23">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_refresh.3x.html">wrefresh()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  There is an overloaded Refresh for Pads.</EM></FONT>
-    <FONT COLOR=green><EM>--  The Inline pragma appears there</EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: refresh()</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_62"#2|</EM></FONT>
--   <b>procedure</b> Refresh_Without_Update
--     (Win : <b>in</b> Window := Standard_Window);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_63"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1052_14" HREF="terminal_interface-curses__adb.htm#ref_1077_14">Refresh_Without_Update</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1053_7" HREF="terminal_interface-curses__adb.htm#ref_1078_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_refresh.3x.html">wnoutrefresh()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  There is an overloaded Refresh_Without_Update for Pads.</EM></FONT>
-    <FONT COLOR=green><EM>--  The Inline pragma appears there</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_63"#2|</EM></FONT>
--   <b>procedure</b> Redraw (Win : <b>in</b> Window := Standard_Window);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_64"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1059_14" HREF="terminal_interface-curses__adb.htm#ref_1088_14">Redraw</A></FONT> (<FONT COLOR=red><A NAME="ref_1059_22" HREF="terminal_interface-curses__adb.htm#ref_1088_22">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_refresh.3x.html">redrawwin()</A></EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_64"#2|</EM></FONT>
--   <b>procedure</b> Redraw (<FONT COLOR=red><A NAME="ref_1058_22" HREF="terminal_interface-curses__adb.htm#ref_1155_7">Win</A></FONT>        : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
--                     <FONT COLOR=red><A NAME="ref_1059_22" HREF="terminal_interface-curses__adb.htm#ref_1156_7">Begin_Line</A></FONT> : <b>in</b> Line_Position;
--                     Line_Count : <b>in</b> Positive);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_65"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1063_14" HREF="terminal_interface-curses__adb.htm#ref_1098_14">Redraw</A></FONT> (<FONT COLOR=red><A NAME="ref_1063_22" HREF="terminal_interface-curses__adb.htm#ref_1099_7">Win</A></FONT>        : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                     <FONT COLOR=red><A NAME="ref_1064_22" HREF="terminal_interface-curses__adb.htm#ref_1100_7">Begin_Line</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+                     <FONT COLOR=red><A NAME="ref_1065_22" HREF="terminal_interface-curses__adb.htm#ref_1101_7">Line_Count</A></FONT> : <b>in</b> Positive);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_refresh.3x.html">wredrawln()</A></EM></FONT>
-    <b>pragma</b> Inline (Redraw);
- 
-@@ -1070,99 +1075,99 @@
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_clear.3x.html">curs_clear.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_65"#2|</EM></FONT>
--   <b>procedure</b> Erase (Win : <b>in</b> Window := Standard_Window);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_66"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1074_14" HREF="terminal_interface-curses__adb.htm#ref_1115_14">Erase</A></FONT> (<FONT COLOR=red><A NAME="ref_1074_21" HREF="terminal_interface-curses__adb.htm#ref_1115_21">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_clear.3x.html">werase()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: erase()</EM></FONT>
--   <b>pragma</b> Inline (Erase);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1074_14">Erase</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_66"#2|</EM></FONT>
--   <b>procedure</b> Clear
--     (Win : <b>in</b> Window := Standard_Window);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_67"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1080_14" HREF="terminal_interface-curses__adb.htm#ref_1125_14">Clear</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1081_7" HREF="terminal_interface-curses__adb.htm#ref_1125_21">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_clear.3x.html">wclear()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: clear()</EM></FONT>
--   <b>pragma</b> Inline (Clear);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1080_14">Clear</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_67"#2|</EM></FONT>
--   <b>procedure</b> Clear_To_End_Of_Screen
--     (Win : <b>in</b> Window := Standard_Window);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_68"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1087_14" HREF="terminal_interface-curses__adb.htm#ref_1135_14">Clear_To_End_Of_Screen</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1088_7" HREF="terminal_interface-curses__adb.htm#ref_1135_38">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_clear.3x.html">wclrtobot()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: clrtobot()</EM></FONT>
--   <b>pragma</b> Inline (Clear_To_End_Of_Screen);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1087_14">Clear_To_End_Of_Screen</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_68"#2|</EM></FONT>
--   <b>procedure</b> Clear_To_End_Of_Line
--     (Win : <b>in</b> Window := Standard_Window);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_69"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1094_14" HREF="terminal_interface-curses__adb.htm#ref_1145_14">Clear_To_End_Of_Line</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1095_7" HREF="terminal_interface-curses__adb.htm#ref_1145_36">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_clear.3x.html">wclrtoeol()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: clrtoeol()</EM></FONT>
--   <b>pragma</b> Inline (Clear_To_End_Of_Line);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1094_14">Clear_To_End_Of_Line</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_bkgd.3x.html">curs_bkgd.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_69"#2|</EM></FONT>
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_70"#2|</EM></FONT>
-    <FONT COLOR=green><EM>--  TODO: we could have Set_Background(Window; Character_Attribute_Set)</EM></FONT>
-    <FONT COLOR=green><EM>--  because in C it is common to see bkgdset(A_BOLD) or</EM></FONT>
-    <FONT COLOR=green><EM>--  bkgdset(COLOR_PAIR(n))</EM></FONT>
--   <b>procedure</b> Set_Background
--     (<FONT COLOR=red><A NAME="ref_1104_7" HREF="terminal_interface-curses__adb.htm#ref_1212_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Window</A> := Standard_Window;
--      Ch  : <b>in</b> Attributed_Character);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1108_14" HREF="terminal_interface-curses__adb.htm#ref_1155_14">Set_Background</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1109_7" HREF="terminal_interface-curses__adb.htm#ref_1156_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1110_7" HREF="terminal_interface-curses__adb.htm#ref_1157_7">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_bkgd.3x.html">wbkgdset()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: bkgdset()</EM></FONT>
--   <b>pragma</b> Inline (Set_Background);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1108_14">Set_Background</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_70"#2|</EM></FONT>
--   <b>procedure</b> Change_Background
--     (<FONT COLOR=red><A NAME="ref_1112_7" HREF="terminal_interface-curses__adb.htm#ref_1222_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Window</A> := Standard_Window;
--      Ch  : <b>in</b> Attributed_Character);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_71"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1116_14" HREF="terminal_interface-curses__adb.htm#ref_1165_14">Change_Background</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1117_7" HREF="terminal_interface-curses__adb.htm#ref_1166_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1118_7" HREF="terminal_interface-curses__adb.htm#ref_1167_7">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_bkgd.3x.html">wbkgd()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: bkgd()</EM></FONT>
--   <b>pragma</b> Inline (Change_Background);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1116_14">Change_Background</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_71"#2|</EM></FONT>
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_72"#2|</EM></FONT>
-    <FONT COLOR=green><EM>--  ? wbkgdget is not listed in curs_bkgd, getbkgd is thpough.</EM></FONT>
--   <b>function</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Get_Background</A> (Win : Window := Standard_Window)
--     <b>return</b> Attributed_Character;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1125_13" HREF="terminal_interface-curses__adb.htm#ref_1177_13">Get_Background</A></FONT> (<FONT COLOR=red><A NAME="ref_1125_29" HREF="terminal_interface-curses__adb.htm#ref_1177_29">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-+     <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_bkgd.3x.html">wbkgdget()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: bkgdget()</EM></FONT>
--   <b>pragma</b> Inline (Get_Background);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1125_13">Get_Background</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_touch.3x.html">curs_touch.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_72"#2|</EM></FONT>
--   <b>procedure</b> Untouch (Win : <b>in</b> Window := Standard_Window);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_73"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1136_14" HREF="terminal_interface-curses__adb.htm#ref_1212_14">Untouch</A></FONT> (<FONT COLOR=red><A NAME="ref_1136_23" HREF="terminal_interface-curses__adb.htm#ref_1212_23">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_touch.3x.html">untouchwin()</A></EM></FONT>
--   <b>pragma</b> Inline (Untouch);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1136_14">Untouch</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_73"#2|</EM></FONT>
--   <b>procedure</b> Touch (Win : <b>in</b> Window := Standard_Window);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_74"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1141_14" HREF="terminal_interface-curses__adb.htm#ref_1203_14">Touch</A></FONT> (<FONT COLOR=red><A NAME="ref_1141_21" HREF="terminal_interface-curses__adb.htm#ref_1203_21">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_touch.3x.html">touchwin()</A></EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_74"#2|</EM></FONT>
--   <b>procedure</b> Touch (<FONT COLOR=red><A NAME="ref_1140_21" HREF="terminal_interface-curses__adb.htm#ref_1277_21">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
--                    <FONT COLOR=red><A NAME="ref_1141_21" HREF="terminal_interface-curses__adb.htm#ref_1278_21">Start</A></FONT> : <b>in</b> Line_Position;
--                    Count : <b>in</b> Positive);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_75"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1145_14" HREF="terminal_interface-curses__adb.htm#ref_1221_14">Touch</A></FONT> (<FONT COLOR=red><A NAME="ref_1145_21" HREF="terminal_interface-curses__adb.htm#ref_1221_21">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                    <FONT COLOR=red><A NAME="ref_1146_21" HREF="terminal_interface-curses__adb.htm#ref_1222_21">Start</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+                    <FONT COLOR=red><A NAME="ref_1147_21" HREF="terminal_interface-curses__adb.htm#ref_1223_21">Count</A></FONT> : <b>in</b> Positive);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_touch.3x.html">touchline()</A></EM></FONT>
-    <b>pragma</b> Inline (Touch);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_75"#2|</EM></FONT>
--   <b>procedure</b> Change_Lines_Status (<FONT COLOR=red><A NAME="ref_1147_35" HREF="terminal_interface-curses__adb.htm#ref_1242_35">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
--                                  <FONT COLOR=red><A NAME="ref_1148_35" HREF="terminal_interface-curses__adb.htm#ref_1243_35">Start</A></FONT> : <b>in</b> Line_Position;
--                                  <FONT COLOR=red><A NAME="ref_1149_35" HREF="terminal_interface-curses__adb.htm#ref_1244_35">Count</A></FONT> : <b>in</b> Positive;
--                                  State : <b>in</b> Boolean);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_76"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1152_14" HREF="terminal_interface-curses__adb.htm#ref_1186_14">Change_Lines_Status</A></FONT> (<FONT COLOR=red><A NAME="ref_1152_35" HREF="terminal_interface-curses__adb.htm#ref_1186_35">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                                  <FONT COLOR=red><A NAME="ref_1153_35" HREF="terminal_interface-curses__adb.htm#ref_1187_35">Start</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+                                  <FONT COLOR=red><A NAME="ref_1154_35" HREF="terminal_interface-curses__adb.htm#ref_1188_35">Count</A></FONT> : <b>in</b> Positive;
-+                                  <FONT COLOR=red><A NAME="ref_1155_35" HREF="terminal_interface-curses__adb.htm#ref_1189_35">State</A></FONT> : <b>in</b> Boolean);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_touch.3x.html">wtouchln()</A></EM></FONT>
--   <b>pragma</b> Inline (Change_Lines_Status);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1152_14">Change_Lines_Status</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_76"#2|</EM></FONT>
--   <b>function</b> Is_Touched (<FONT COLOR=red><A NAME="ref_1155_25" HREF="terminal_interface-curses__adb.htm#ref_1286_7">Win</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
--                        Line : Line_Position) <b>return</b> Boolean;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_77"#2|</EM></FONT>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1160_13" HREF="terminal_interface-curses__adb.htm#ref_1229_13">Is_Touched</A></FONT> (<FONT COLOR=red><A NAME="ref_1160_25" HREF="terminal_interface-curses__adb.htm#ref_1230_7">Win</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                        <FONT COLOR=red><A NAME="ref_1161_25" HREF="terminal_interface-curses__adb.htm#ref_1231_7">Line</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>) <b>return</b> Boolean;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_touch.3x.html">is_linetouched()</A></EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_77"#2|</EM></FONT>
--   <b>function</b> Is_Touched (Win : Window := Standard_Window) <b>return</b> Boolean;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_78"#2|</EM></FONT>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1165_13" HREF="terminal_interface-curses__adb.htm#ref_1243_13">Is_Touched</A></FONT> (<FONT COLOR=red><A NAME="ref_1165_25" HREF="terminal_interface-curses__adb.htm#ref_1244_7">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>) <b>return</b> Boolean;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_touch.3x.html">is_wintouched()</A></EM></FONT>
-    <b>pragma</b> Inline (Is_Touched);
- 
-@@ -1170,176 +1175,176 @@
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_overlay.3x.html">curs_overlay.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_78"#2|</EM></FONT>
--   <b>procedure</b> Copy
--     (<FONT COLOR=red><A NAME="ref_1170_7" HREF="terminal_interface-curses__adb.htm#ref_1313_7">Source_Window</A></FONT>            : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--      <FONT COLOR=red><A NAME="ref_1171_7" HREF="terminal_interface-curses__adb.htm#ref_1314_7">Destination_Window</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A>;
--      <FONT COLOR=red><A NAME="ref_1172_7" HREF="terminal_interface-curses__adb.htm#ref_1315_7">Source_Top_Row</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1173_7" HREF="terminal_interface-curses__adb.htm#ref_1316_7">Source_Left_Column</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1174_7" HREF="terminal_interface-curses__adb.htm#ref_1317_7">Destination_Top_Row</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1175_7" HREF="terminal_interface-curses__adb.htm#ref_1318_7">Destination_Left_Column</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1176_7" HREF="terminal_interface-curses__adb.htm#ref_1319_7">Destination_Bottom_Row</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1177_7" HREF="terminal_interface-curses__adb.htm#ref_1320_7">Destination_Right_Column</A></FONT> : <b>in</b> Column_Position;
--      Non_Destructive_Mode     : <b>in</b> Boolean := True);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_79"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1174_14" HREF="terminal_interface-curses__adb.htm#ref_1256_14">Copy</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1175_7" HREF="terminal_interface-curses__adb.htm#ref_1257_7">Source_Window</A></FONT>            : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1176_7" HREF="terminal_interface-curses__adb.htm#ref_1258_7">Destination_Window</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1177_7" HREF="terminal_interface-curses__adb.htm#ref_1259_7">Source_Top_Row</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1178_7" HREF="terminal_interface-curses__adb.htm#ref_1260_7">Source_Left_Column</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1179_7" HREF="terminal_interface-curses__adb.htm#ref_1261_7">Destination_Top_Row</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1180_7" HREF="terminal_interface-curses__adb.htm#ref_1262_7">Destination_Left_Column</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1181_7" HREF="terminal_interface-curses__adb.htm#ref_1263_7">Destination_Bottom_Row</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1182_7" HREF="terminal_interface-curses__adb.htm#ref_1264_7">Destination_Right_Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1183_7" HREF="terminal_interface-curses__adb.htm#ref_1265_7">Non_Destructive_Mode</A></FONT>     : <b>in</b> Boolean := True);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_overlay.3x.html">copywin()</A></EM></FONT>
--   <b>pragma</b> Inline (Copy);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1174_14">Copy</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_79"#2|</EM></FONT>
--   <b>procedure</b> Overwrite (<FONT COLOR=red><A NAME="ref_1183_25" HREF="terminal_interface-curses__adb.htm#ref_1349_7">Source_Window</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                        Destination_Window : <b>in</b> Window);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_80"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1188_14" HREF="terminal_interface-curses__adb.htm#ref_1292_14">Overwrite</A></FONT> (<FONT COLOR=red><A NAME="ref_1188_25" HREF="terminal_interface-curses__adb.htm#ref_1293_7">Source_Window</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                        <FONT COLOR=red><A NAME="ref_1189_25" HREF="terminal_interface-curses__adb.htm#ref_1294_7">Destination_Window</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_overlay.3x.html">overwrite()</A></EM></FONT>
--   <b>pragma</b> Inline (Overwrite);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1188_14">Overwrite</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_80"#2|</EM></FONT>
--   <b>procedure</b> Overlay (<FONT COLOR=red><A NAME="ref_1189_23" HREF="terminal_interface-curses__adb.htm#ref_1361_7">Source_Window</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
--                      Destination_Window : <b>in</b> Window);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_81"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1194_14" HREF="terminal_interface-curses__adb.htm#ref_1304_14">Overlay</A></FONT> (<FONT COLOR=red><A NAME="ref_1194_23" HREF="terminal_interface-curses__adb.htm#ref_1305_7">Source_Window</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                      <FONT COLOR=red><A NAME="ref_1195_23" HREF="terminal_interface-curses__adb.htm#ref_1306_7">Destination_Window</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_overlay.3x.html">overlay()</A></EM></FONT>
--   <b>pragma</b> Inline (Overlay);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1194_14">Overlay</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_deleteln.3x.html">curs_deleteln.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_81"#2|</EM></FONT>
--   <b>procedure</b> Insert_Delete_Lines
--     (<FONT COLOR=red><A NAME="ref_1200_7" HREF="terminal_interface-curses__adb.htm#ref_1374_7">Win</A></FONT>   : <b>in</b> Window  := Standard_Window;
--      Lines : <b>in</b> Integer := 1); <FONT COLOR=green><EM>--  default is to insert one line above</EM></FONT>
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_82"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1204_14" HREF="terminal_interface-curses__adb.htm#ref_1317_14">Insert_Delete_Lines</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1205_7" HREF="terminal_interface-curses__adb.htm#ref_1318_7">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>  := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1206_7" HREF="terminal_interface-curses__adb.htm#ref_1319_7">Lines</A></FONT> : <b>in</b> Integer := 1); <FONT COLOR=green><EM>--  default is to insert one line above</EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_deleteln.3x.html">winsdelln()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: insdelln()</EM></FONT>
--   <b>pragma</b> Inline (Insert_Delete_Lines);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1204_14">Insert_Delete_Lines</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_82"#2|</EM></FONT>
--   <b>procedure</b> Delete_Line (Win : <b>in</b> Window := Standard_Window);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_83"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1212_14" HREF="terminal_interface-curses__adb.htm#ref_1329_14">Delete_Line</A></FONT> (<FONT COLOR=red><A NAME="ref_1212_27" HREF="terminal_interface-curses__adb.htm#ref_1329_27">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_deleteln.3x.html">wdeleteln()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: deleteln()</EM></FONT>
--   <b>pragma</b> Inline (Delete_Line);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1212_14">Delete_Line</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_83"#2|</EM></FONT>
--   <b>procedure</b> Insert_Line (Win : <b>in</b> Window := Standard_Window);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_84"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1218_14" HREF="terminal_interface-curses__adb.htm#ref_1335_14">Insert_Line</A></FONT> (<FONT COLOR=red><A NAME="ref_1218_27" HREF="terminal_interface-curses__adb.htm#ref_1335_27">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_deleteln.3x.html">winsertln()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: insertln()</EM></FONT>
--   <b>pragma</b> Inline (Insert_Line);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1218_14">Insert_Line</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_getyx.3x.html">curs_getyx.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_84"#2|</EM></FONT>
--   <b>procedure</b> Get_Size
--     (<FONT COLOR=red><A NAME="ref_1224_7" HREF="terminal_interface-curses__adb.htm#ref_1399_7">Win</A></FONT>               : <b>in</b> Window := Standard_Window;
--      <FONT COLOR=red><A NAME="ref_1225_7" HREF="terminal_interface-curses__adb.htm#ref_1400_7">Number_Of_Lines</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
--      Number_Of_Columns : <b>out</b> Column_Count);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_85"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1228_14" HREF="terminal_interface-curses__adb.htm#ref_1342_14">Get_Size</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1229_7" HREF="terminal_interface-curses__adb.htm#ref_1343_7">Win</A></FONT>               : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1230_7" HREF="terminal_interface-curses__adb.htm#ref_1344_7">Number_Of_Lines</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+      <FONT COLOR=red><A NAME="ref_1231_7" HREF="terminal_interface-curses__adb.htm#ref_1345_7">Number_Of_Columns</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_getyx.3x.html">getmaxyx()</A></EM></FONT>
--   <b>pragma</b> Inline (Get_Size);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1228_14">Get_Size</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_85"#2|</EM></FONT>
--   <b>procedure</b> Get_Window_Position
--     (<FONT COLOR=red><A NAME="ref_1232_7" HREF="terminal_interface-curses__adb.htm#ref_1415_7">Win</A></FONT>             : <b>in</b> Window := Standard_Window;
--      <FONT COLOR=red><A NAME="ref_1233_7" HREF="terminal_interface-curses__adb.htm#ref_1416_7">Top_Left_Line</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--      Top_Left_Column : <b>out</b> Column_Position);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_86"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1236_14" HREF="terminal_interface-curses__adb.htm#ref_1362_14">Get_Window_Position</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1237_7" HREF="terminal_interface-curses__adb.htm#ref_1363_7">Win</A></FONT>             : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1238_7" HREF="terminal_interface-curses__adb.htm#ref_1364_7">Top_Left_Line</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1239_7" HREF="terminal_interface-curses__adb.htm#ref_1365_7">Top_Left_Column</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_getyx.3x.html">getbegyx()</A></EM></FONT>
--   <b>pragma</b> Inline (Get_Window_Position);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1236_14">Get_Window_Position</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_86"#2|</EM></FONT>
--   <b>procedure</b> Get_Cursor_Position
--     (<FONT COLOR=red><A NAME="ref_1240_7" HREF="terminal_interface-curses__adb.htm#ref_1427_7">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
--      <FONT COLOR=red><A NAME="ref_1241_7" HREF="terminal_interface-curses__adb.htm#ref_1428_7">Line</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--      Column : <b>out</b> Column_Position);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_87"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1244_14" HREF="terminal_interface-curses__adb.htm#ref_1380_14">Get_Cursor_Position</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1245_7" HREF="terminal_interface-curses__adb.htm#ref_1381_7">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1246_7" HREF="terminal_interface-curses__adb.htm#ref_1382_7">Line</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1247_7" HREF="terminal_interface-curses__adb.htm#ref_1383_7">Column</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_getyx.3x.html">getyx()</A></EM></FONT>
--   <b>pragma</b> Inline (Get_Cursor_Position);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1244_14">Get_Cursor_Position</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_87"#2|</EM></FONT>
--   <b>procedure</b> Get_Origin_Relative_To_Parent
--     (<FONT COLOR=red><A NAME="ref_1248_7" HREF="terminal_interface-curses__adb.htm#ref_1439_7">Win</A></FONT>                : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A>;
--      <FONT COLOR=red><A NAME="ref_1249_7" HREF="terminal_interface-curses__adb.htm#ref_1440_7">Top_Left_Line</A></FONT>      : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1250_7" HREF="terminal_interface-curses__adb.htm#ref_1441_7">Top_Left_Column</A></FONT>    : <b>out</b> Column_Position;
--      Is_Not_A_Subwindow : <b>out</b> Boolean);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_88"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1252_14" HREF="terminal_interface-curses__adb.htm#ref_1398_14">Get_Origin_Relative_To_Parent</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1253_7" HREF="terminal_interface-curses__adb.htm#ref_1399_7">Win</A></FONT>                : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1254_7" HREF="terminal_interface-curses__adb.htm#ref_1400_7">Top_Left_Line</A></FONT>      : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1255_7" HREF="terminal_interface-curses__adb.htm#ref_1401_7">Top_Left_Column</A></FONT>    : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1256_7" HREF="terminal_interface-curses__adb.htm#ref_1402_7">Is_Not_A_Subwindow</A></FONT> : <b>out</b> Boolean);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_getyx.3x.html">getparyx()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  Instead of placing -1 in the coordinates as return, we use a boolean</EM></FONT>
-    <FONT COLOR=green><EM>--  to return the info that the window has no parent.</EM></FONT>
--   <b>pragma</b> Inline (Get_Origin_Relative_To_Parent);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1252_14">Get_Origin_Relative_To_Parent</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_pad.3x.html">curs_pad.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_88"#2|</EM></FONT>
--   <b>function</b> New_Pad (<FONT COLOR=red><A NAME="ref_1262_22" HREF="terminal_interface-curses__adb.htm#ref_1458_22">Lines</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
--                     Columns : Column_Count) <b>return</b> Window;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_89"#2|</EM></FONT>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1267_13" HREF="terminal_interface-curses__adb.htm#ref_1424_13">New_Pad</A></FONT> (<FONT COLOR=red><A NAME="ref_1267_22" HREF="terminal_interface-curses__adb.htm#ref_1424_22">Lines</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+                     <FONT COLOR=red><A NAME="ref_1268_22" HREF="terminal_interface-curses__adb.htm#ref_1425_22">Columns</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_pad.3x.html">newpad()</A></EM></FONT>
--   <b>pragma</b> Inline (New_Pad);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1267_13">New_Pad</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_89"#2|</EM></FONT>
--   <b>function</b> Sub_Pad
--     (<FONT COLOR=red><A NAME="ref_1269_7" HREF="terminal_interface-curses__adb.htm#ref_1474_7">Pad</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Window</A>;
--      <FONT COLOR=red><A NAME="ref_1270_7" HREF="terminal_interface-curses__adb.htm#ref_1475_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
--      <FONT COLOR=red><A NAME="ref_1271_7" HREF="terminal_interface-curses__adb.htm#ref_1476_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Count</A>;
--      <FONT COLOR=red><A NAME="ref_1272_7" HREF="terminal_interface-curses__adb.htm#ref_1477_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--      First_Column_Position : Column_Position) <b>return</b> Window;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_90"#2|</EM></FONT>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1273_13" HREF="terminal_interface-curses__adb.htm#ref_1439_13">Sub_Pad</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1274_7" HREF="terminal_interface-curses__adb.htm#ref_1440_7">Pad</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1275_7" HREF="terminal_interface-curses__adb.htm#ref_1441_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+      <FONT COLOR=red><A NAME="ref_1276_7" HREF="terminal_interface-curses__adb.htm#ref_1442_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-+      <FONT COLOR=red><A NAME="ref_1277_7" HREF="terminal_interface-curses__adb.htm#ref_1443_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1278_7" HREF="terminal_interface-curses__adb.htm#ref_1444_7">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_pad.3x.html">subpad()</A></EM></FONT>
--   <b>pragma</b> Inline (Sub_Pad);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1273_13">Sub_Pad</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_90"#2|</EM></FONT>
--   <b>procedure</b> Refresh
--     (<FONT COLOR=red><A NAME="ref_1279_7" HREF="terminal_interface-curses__adb.htm#ref_1502_7">Pad</A></FONT>                      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A>;
--      <FONT COLOR=red><A NAME="ref_1280_7" HREF="terminal_interface-curses__adb.htm#ref_1503_7">Source_Top_Row</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1281_7" HREF="terminal_interface-curses__adb.htm#ref_1504_7">Source_Left_Column</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1282_7" HREF="terminal_interface-curses__adb.htm#ref_1505_7">Destination_Top_Row</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1283_7" HREF="terminal_interface-curses__adb.htm#ref_1506_7">Destination_Left_Column</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1284_7" HREF="terminal_interface-curses__adb.htm#ref_1507_7">Destination_Bottom_Row</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--      Destination_Right_Column : <b>in</b> Column_Position);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_91"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1283_14" HREF="terminal_interface-curses__adb.htm#ref_1467_14">Refresh</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1284_7" HREF="terminal_interface-curses__adb.htm#ref_1468_7">Pad</A></FONT>                      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1285_7" HREF="terminal_interface-curses__adb.htm#ref_1469_7">Source_Top_Row</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1286_7" HREF="terminal_interface-curses__adb.htm#ref_1470_7">Source_Left_Column</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1287_7" HREF="terminal_interface-curses__adb.htm#ref_1471_7">Destination_Top_Row</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1288_7" HREF="terminal_interface-curses__adb.htm#ref_1472_7">Destination_Left_Column</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1289_7" HREF="terminal_interface-curses__adb.htm#ref_1473_7">Destination_Bottom_Row</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1290_7" HREF="terminal_interface-curses__adb.htm#ref_1474_7">Destination_Right_Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_pad.3x.html">prefresh()</A></EM></FONT>
-    <b>pragma</b> Inline (Refresh);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_91"#2|</EM></FONT>
--   <b>procedure</b> Refresh_Without_Update
--     (<FONT COLOR=red><A NAME="ref_1291_7" HREF="terminal_interface-curses__adb.htm#ref_1532_7">Pad</A></FONT>                      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A>;
--      <FONT COLOR=red><A NAME="ref_1292_7" HREF="terminal_interface-curses__adb.htm#ref_1533_7">Source_Top_Row</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1293_7" HREF="terminal_interface-curses__adb.htm#ref_1534_7">Source_Left_Column</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1294_7" HREF="terminal_interface-curses__adb.htm#ref_1535_7">Destination_Top_Row</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1295_7" HREF="terminal_interface-curses__adb.htm#ref_1536_7">Destination_Left_Column</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1296_7" HREF="terminal_interface-curses__adb.htm#ref_1537_7">Destination_Bottom_Row</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--      Destination_Right_Column : <b>in</b> Column_Position);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_92"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1295_14" HREF="terminal_interface-curses__adb.htm#ref_1497_14">Refresh_Without_Update</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1296_7" HREF="terminal_interface-curses__adb.htm#ref_1498_7">Pad</A></FONT>                      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1297_7" HREF="terminal_interface-curses__adb.htm#ref_1499_7">Source_Top_Row</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1298_7" HREF="terminal_interface-curses__adb.htm#ref_1500_7">Source_Left_Column</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1299_7" HREF="terminal_interface-curses__adb.htm#ref_1501_7">Destination_Top_Row</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1300_7" HREF="terminal_interface-curses__adb.htm#ref_1502_7">Destination_Left_Column</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1301_7" HREF="terminal_interface-curses__adb.htm#ref_1503_7">Destination_Bottom_Row</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1302_7" HREF="terminal_interface-curses__adb.htm#ref_1504_7">Destination_Right_Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_pad.3x.html">pnoutrefresh()</A></EM></FONT>
-    <b>pragma</b> Inline (Refresh_Without_Update);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_92"#2|</EM></FONT>
--   <b>procedure</b> Add_Character_To_Pad_And_Echo_It
--     (<FONT COLOR=red><A NAME="ref_1303_7" HREF="terminal_interface-curses__adb.htm#ref_1562_7">Pad</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Window</A>;
--      Ch  : <b>in</b> Attributed_Character);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_93"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1307_14" HREF="terminal_interface-curses__adb.htm#ref_1527_14">Add_Character_To_Pad_And_Echo_It</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1308_7" HREF="terminal_interface-curses__adb.htm#ref_1528_7">Pad</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1309_7" HREF="terminal_interface-curses__adb.htm#ref_1529_7">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_pad.3x.html">pechochar()</A></EM></FONT>
- 
--   <b>procedure</b> Add_Character_To_Pad_And_Echo_It
--     (<FONT COLOR=red><A NAME="ref_1308_7" HREF="terminal_interface-curses__adb.htm#ref_1575_7">Pad</A></FONT> : <b>in</b> Window;
--      Ch  : <b>in</b> Character);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1312_14" HREF="terminal_interface-curses__adb.htm#ref_1540_14">Add_Character_To_Pad_And_Echo_It</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1313_7" HREF="terminal_interface-curses__adb.htm#ref_1541_7">Pad</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1314_7" HREF="terminal_interface-curses__adb.htm#ref_1542_7">Ch</A></FONT>  : <b>in</b> Character);
-    <b>pragma</b> Inline (Add_Character_To_Pad_And_Echo_It);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_scroll.3x.html">curs_scroll.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_93"#2|</EM></FONT>
--   <b>procedure</b> Scroll (<FONT COLOR=red><A NAME="ref_1317_22" HREF="terminal_interface-curses__adb.htm#ref_1586_22">Win</A></FONT>    : <b>in</b> Window  := Standard_Window;
--                     Amount : <b>in</b> Integer := 1);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_94"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1322_14" HREF="terminal_interface-curses__adb.htm#ref_1552_14">Scroll</A></FONT> (<FONT COLOR=red><A NAME="ref_1322_22" HREF="terminal_interface-curses__adb.htm#ref_1552_22">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>  := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                     <FONT COLOR=red><A NAME="ref_1323_22" HREF="terminal_interface-curses__adb.htm#ref_1553_22">Amount</A></FONT> : <b>in</b> Integer := 1);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_scroll.3x.html">wscrl()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: scroll()</EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: scrl()</EM></FONT>
--   <b>pragma</b> Inline (Scroll);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1322_14">Scroll</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_delch.3x.html">curs_delch.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_94"#2|</EM></FONT>
--   <b>procedure</b> Delete_Character (Win : <b>in</b> Window := Standard_Window);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_95"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1334_14" HREF="terminal_interface-curses__adb.htm#ref_1565_14">Delete_Character</A></FONT> (<FONT COLOR=red><A NAME="ref_1334_32" HREF="terminal_interface-curses__adb.htm#ref_1565_32">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_delch.3x.html">wdelch()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: delch()</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_95"#2|</EM></FONT>
--   <b>procedure</b> Delete_Character
--     (<FONT COLOR=red><A NAME="ref_1335_7" HREF="terminal_interface-curses__adb.htm#ref_1610_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
--      <FONT COLOR=red><A NAME="ref_1336_7" HREF="terminal_interface-curses__adb.htm#ref_1611_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--      Column : <b>in</b> Column_Position);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_96"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1339_14" HREF="terminal_interface-curses__adb.htm#ref_1575_14">Delete_Character</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1340_7" HREF="terminal_interface-curses__adb.htm#ref_1576_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1341_7" HREF="terminal_interface-curses__adb.htm#ref_1577_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1342_7" HREF="terminal_interface-curses__adb.htm#ref_1578_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_delch.3x.html">mvwdelch()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: mvdelch()</EM></FONT>
-    <b>pragma</b> Inline (Delete_Character);
-@@ -1348,17 +1353,17 @@
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_inch.3x.html">curs_inch.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_96"#2|</EM></FONT>
--   <b>function</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Peek</A> (Win : Window := Standard_Window)
--     <b>return</b> Attributed_Character;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_97"#2|</EM></FONT>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1352_13" HREF="terminal_interface-curses__adb.htm#ref_1590_13">Peek</A></FONT> (<FONT COLOR=red><A NAME="ref_1352_19" HREF="terminal_interface-curses__adb.htm#ref_1590_19">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-+     <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>;
-    <FONT COLOR=green><EM>--  AKA: inch()</EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_inch.3x.html">winch()</A></EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_97"#2|</EM></FONT>
--   <b>function</b> Peek
--     (<FONT COLOR=red><A NAME="ref_1354_7" HREF="terminal_interface-curses__adb.htm#ref_1634_7">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
--      <FONT COLOR=red><A NAME="ref_1355_7" HREF="terminal_interface-curses__adb.htm#ref_1635_7">Line</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--      Column : Column_Position) <b>return</b> Attributed_Character;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_98"#2|</EM></FONT>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1358_13" HREF="terminal_interface-curses__adb.htm#ref_1599_13">Peek</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1359_7" HREF="terminal_interface-curses__adb.htm#ref_1600_7">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1360_7" HREF="terminal_interface-curses__adb.htm#ref_1601_7">Line</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1361_7" HREF="terminal_interface-curses__adb.htm#ref_1602_7">Column</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_inch.3x.html">mvwinch()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: mvinch()</EM></FONT>
-    <FONT COLOR=green><EM>--  More Peek's follow, pragma Inline appears later.</EM></FONT>
-@@ -1367,17 +1372,17 @@
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_insch.3x.html">curs_insch.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_98"#2|</EM></FONT>
--   <b>procedure</b> Insert (<FONT COLOR=red><A NAME="ref_1366_22" HREF="terminal_interface-curses__adb.htm#ref_1646_22">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Window</A> := Standard_Window;
--                     Ch  : <b>in</b> Attributed_Character);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_99"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1371_14" HREF="terminal_interface-curses__adb.htm#ref_1612_14">Insert</A></FONT> (<FONT COLOR=red><A NAME="ref_1371_22" HREF="terminal_interface-curses__adb.htm#ref_1612_22">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                     <FONT COLOR=red><A NAME="ref_1372_22" HREF="terminal_interface-curses__adb.htm#ref_1613_22">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_insch.3x.html">winsch()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: insch()</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_99"#2|</EM></FONT>
--   <b>procedure</b> Insert (<FONT COLOR=red><A NAME="ref_1372_22" HREF="terminal_interface-curses__adb.htm#ref_1658_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
--                     <FONT COLOR=red><A NAME="ref_1373_22" HREF="terminal_interface-curses__adb.htm#ref_1659_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--                     <FONT COLOR=red><A NAME="ref_1374_22" HREF="terminal_interface-curses__adb.htm#ref_1660_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Column_Position</A>;
--                     Ch     : <b>in</b> Attributed_Character);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_100"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1377_14" HREF="terminal_interface-curses__adb.htm#ref_1623_14">Insert</A></FONT> (<FONT COLOR=red><A NAME="ref_1377_22" HREF="terminal_interface-curses__adb.htm#ref_1624_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                     <FONT COLOR=red><A NAME="ref_1378_22" HREF="terminal_interface-curses__adb.htm#ref_1625_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+                     <FONT COLOR=red><A NAME="ref_1379_22" HREF="terminal_interface-curses__adb.htm#ref_1626_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+                     <FONT COLOR=red><A NAME="ref_1380_22" HREF="terminal_interface-curses__adb.htm#ref_1627_7">Ch</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_insch.3x.html">mvwinsch()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: mvinsch()</EM></FONT>
- 
-@@ -1385,21 +1390,21 @@
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_insstr.3x.html">curs_insstr.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_100"#2|</EM></FONT>
--   <b>procedure</b> Insert (<FONT COLOR=red><A NAME="ref_1384_22" HREF="terminal_interface-curses__adb.htm#ref_1677_22">Win</A></FONT> : <b>in</b> Window := Standard_Window;
--                     <FONT COLOR=red><A NAME="ref_1385_22" HREF="terminal_interface-curses__adb.htm#ref_1678_22">Str</A></FONT> : <b>in</b> String;
--                     Len : <b>in</b> Integer := -1);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_101"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1389_14" HREF="terminal_interface-curses__adb.htm#ref_1643_14">Insert</A></FONT> (<FONT COLOR=red><A NAME="ref_1389_22" HREF="terminal_interface-curses__adb.htm#ref_1643_22">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                     <FONT COLOR=red><A NAME="ref_1390_22" HREF="terminal_interface-curses__adb.htm#ref_1644_22">Str</A></FONT> : <b>in</b> String;
-+                     <FONT COLOR=red><A NAME="ref_1391_22" HREF="terminal_interface-curses__adb.htm#ref_1645_22">Len</A></FONT> : <b>in</b> Integer := -1);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_insstr.3x.html">winsnstr()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: winsstr()</EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: insnstr()</EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: insstr()</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_101"#2|</EM></FONT>
--   <b>procedure</b> Insert (<FONT COLOR=red><A NAME="ref_1393_22" HREF="terminal_interface-curses__adb.htm#ref_1696_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
--                     <FONT COLOR=red><A NAME="ref_1394_22" HREF="terminal_interface-curses__adb.htm#ref_1697_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--                     <FONT COLOR=red><A NAME="ref_1395_22" HREF="terminal_interface-curses__adb.htm#ref_1698_7">Column</A></FONT> : <b>in</b> Column_Position;
--                     <FONT COLOR=red><A NAME="ref_1396_22" HREF="terminal_interface-curses__adb.htm#ref_1699_7">Str</A></FONT>    : <b>in</b> String;
--                     Len    : <b>in</b> Integer := -1);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_102"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1398_14" HREF="terminal_interface-curses__adb.htm#ref_1661_14">Insert</A></FONT> (<FONT COLOR=red><A NAME="ref_1398_22" HREF="terminal_interface-curses__adb.htm#ref_1662_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                     <FONT COLOR=red><A NAME="ref_1399_22" HREF="terminal_interface-curses__adb.htm#ref_1663_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+                     <FONT COLOR=red><A NAME="ref_1400_22" HREF="terminal_interface-curses__adb.htm#ref_1664_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+                     <FONT COLOR=red><A NAME="ref_1401_22" HREF="terminal_interface-curses__adb.htm#ref_1665_7">Str</A></FONT>    : <b>in</b> String;
-+                     <FONT COLOR=red><A NAME="ref_1402_22" HREF="terminal_interface-curses__adb.htm#ref_1666_7">Len</A></FONT>    : <b>in</b> Integer := -1);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_insstr.3x.html">mvwinsnstr()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: mvwinsstr()</EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: mvinsnstr()</EM></FONT>
-@@ -1410,21 +1415,21 @@
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_instr.3x.html">curs_instr.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_102"#2|</EM></FONT>
--   <b>procedure</b> Peek (<FONT COLOR=red><A NAME="ref_1409_20" HREF="terminal_interface-curses__adb.htm#ref_1719_20">Win</A></FONT> : <b>in</b>  Window := Standard_Window;
--                   <FONT COLOR=red><A NAME="ref_1410_20" HREF="terminal_interface-curses__adb.htm#ref_1720_20">Str</A></FONT> : <b>out</b> String;
--                   Len : <b>in</b>  Integer := -1);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_103"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1414_14" HREF="terminal_interface-curses__adb.htm#ref_1685_14">Peek</A></FONT> (<FONT COLOR=red><A NAME="ref_1414_20" HREF="terminal_interface-curses__adb.htm#ref_1685_20">Win</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                   <FONT COLOR=red><A NAME="ref_1415_20" HREF="terminal_interface-curses__adb.htm#ref_1686_20">Str</A></FONT> : <b>out</b> String;
-+                   <FONT COLOR=red><A NAME="ref_1416_20" HREF="terminal_interface-curses__adb.htm#ref_1687_20">Len</A></FONT> : <b>in</b>  Integer := -1);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_instr.3x.html">winnstr()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: winstr()</EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: innstr()</EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: instr()</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_103"#2|</EM></FONT>
--   <b>procedure</b> Peek (<FONT COLOR=red><A NAME="ref_1418_20" HREF="terminal_interface-curses__adb.htm#ref_1749_7">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
--                   <FONT COLOR=red><A NAME="ref_1419_20" HREF="terminal_interface-curses__adb.htm#ref_1750_7">Line</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--                   <FONT COLOR=red><A NAME="ref_1420_20" HREF="terminal_interface-curses__adb.htm#ref_1751_7">Column</A></FONT> : <b>in</b>  Column_Position;
--                   <FONT COLOR=red><A NAME="ref_1421_20" HREF="terminal_interface-curses__adb.htm#ref_1752_7">Str</A></FONT>    : <b>out</b> String;
--                   Len    : <b>in</b>  Integer := -1);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_104"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1423_14" HREF="terminal_interface-curses__adb.htm#ref_1714_14">Peek</A></FONT> (<FONT COLOR=red><A NAME="ref_1423_20" HREF="terminal_interface-curses__adb.htm#ref_1715_7">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                   <FONT COLOR=red><A NAME="ref_1424_20" HREF="terminal_interface-curses__adb.htm#ref_1716_7">Line</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+                   <FONT COLOR=red><A NAME="ref_1425_20" HREF="terminal_interface-curses__adb.htm#ref_1717_7">Column</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+                   <FONT COLOR=red><A NAME="ref_1426_20" HREF="terminal_interface-curses__adb.htm#ref_1718_7">Str</A></FONT>    : <b>out</b> String;
-+                   <FONT COLOR=red><A NAME="ref_1427_20" HREF="terminal_interface-curses__adb.htm#ref_1719_7">Len</A></FONT>    : <b>in</b>  Integer := -1);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_instr.3x.html">mvwinnstr()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: mvwinstr()</EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: mvinnstr()</EM></FONT>
-@@ -1434,21 +1439,21 @@
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_inchstr.3x.html">curs_inchstr.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_104"#2|</EM></FONT>
--   <b>procedure</b> Peek (<FONT COLOR=red><A NAME="ref_1433_20" HREF="terminal_interface-curses__adb.htm#ref_1761_7">Win</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Window</A> := Standard_Window;
--                   <FONT COLOR=red><A NAME="ref_1434_20" HREF="terminal_interface-curses__adb.htm#ref_1762_7">Str</A></FONT> : <b>out</b> Attributed_String;
--                   Len : <b>in</b>  Integer := -1);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_105"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1438_14" HREF="terminal_interface-curses__adb.htm#ref_1726_14">Peek</A></FONT> (<FONT COLOR=red><A NAME="ref_1438_20" HREF="terminal_interface-curses__adb.htm#ref_1727_7">Win</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                   <FONT COLOR=red><A NAME="ref_1439_20" HREF="terminal_interface-curses__adb.htm#ref_1728_7">Str</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Attributed_String</A>;
-+                   <FONT COLOR=red><A NAME="ref_1440_20" HREF="terminal_interface-curses__adb.htm#ref_1729_7">Len</A></FONT> : <b>in</b>  Integer := -1);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_inchstr.3x.html">winchnstr()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: winchstr()</EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: inchnstr()</EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: inchstr()</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_105"#2|</EM></FONT>
--   <b>procedure</b> Peek (<FONT COLOR=red><A NAME="ref_1442_20" HREF="terminal_interface-curses__adb.htm#ref_1798_7">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
--                   <FONT COLOR=red><A NAME="ref_1443_20" HREF="terminal_interface-curses__adb.htm#ref_1799_7">Line</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--                   <FONT COLOR=red><A NAME="ref_1444_20" HREF="terminal_interface-curses__adb.htm#ref_1800_7">Column</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Column_Position</A>;
--                   <FONT COLOR=red><A NAME="ref_1445_20" HREF="terminal_interface-curses__adb.htm#ref_1801_7">Str</A></FONT>    : <b>out</b> Attributed_String;
--                   Len    : <b>in</b>  Integer := -1);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_106"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1447_14" HREF="terminal_interface-curses__adb.htm#ref_1763_14">Peek</A></FONT> (<FONT COLOR=red><A NAME="ref_1447_20" HREF="terminal_interface-curses__adb.htm#ref_1764_7">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                   <FONT COLOR=red><A NAME="ref_1448_20" HREF="terminal_interface-curses__adb.htm#ref_1765_7">Line</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+                   <FONT COLOR=red><A NAME="ref_1449_20" HREF="terminal_interface-curses__adb.htm#ref_1766_7">Column</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+                   <FONT COLOR=red><A NAME="ref_1450_20" HREF="terminal_interface-curses__adb.htm#ref_1767_7">Str</A></FONT>    : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Attributed_String</A>;
-+                   <FONT COLOR=red><A NAME="ref_1451_20" HREF="terminal_interface-curses__adb.htm#ref_1768_7">Len</A></FONT>    : <b>in</b>  Integer := -1);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_inchstr.3x.html">mvwinchnstr()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: mvwinchstr()</EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: mvinchnstr()</EM></FONT>
-@@ -1459,10 +1464,10 @@
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_getstr.3x.html">curs_getstr.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_106"#2|</EM></FONT>
--   <b>procedure</b> Get (<FONT COLOR=red><A NAME="ref_1458_19" HREF="terminal_interface-curses__adb.htm#ref_1809_19">Win</A></FONT> : <b>in</b>  Window := Standard_Window;
--                  <FONT COLOR=red><A NAME="ref_1459_19" HREF="terminal_interface-curses__adb.htm#ref_1810_19">Str</A></FONT> : <b>out</b> String;
--                  Len : <b>in</b>  Integer := -1);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_107"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1463_14" HREF="terminal_interface-curses__adb.htm#ref_1775_14">Get</A></FONT> (<FONT COLOR=red><A NAME="ref_1463_19" HREF="terminal_interface-curses__adb.htm#ref_1775_19">Win</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                  <FONT COLOR=red><A NAME="ref_1464_19" HREF="terminal_interface-curses__adb.htm#ref_1776_19">Str</A></FONT> : <b>out</b> String;
-+                  <FONT COLOR=red><A NAME="ref_1465_19" HREF="terminal_interface-curses__adb.htm#ref_1777_19">Len</A></FONT> : <b>in</b>  Integer := -1);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_getstr.3x.html">wgetnstr()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: wgetstr()</EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: getnstr()</EM></FONT>
-@@ -1470,12 +1475,12 @@
-    <FONT COLOR=green><EM>--  actually getstr is not supported because that results in buffer</EM></FONT>
-    <FONT COLOR=green><EM>--  overflows.</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_107"#2|</EM></FONT>
--   <b>procedure</b> Get (<FONT COLOR=red><A NAME="ref_1469_19" HREF="terminal_interface-curses__adb.htm#ref_1839_7">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
--                  <FONT COLOR=red><A NAME="ref_1470_19" HREF="terminal_interface-curses__adb.htm#ref_1840_7">Line</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--                  <FONT COLOR=red><A NAME="ref_1471_19" HREF="terminal_interface-curses__adb.htm#ref_1841_7">Column</A></FONT> : <b>in</b>  Column_Position;
--                  <FONT COLOR=red><A NAME="ref_1472_19" HREF="terminal_interface-curses__adb.htm#ref_1842_7">Str</A></FONT>    : <b>out</b> String;
--                  Len    : <b>in</b>  Integer := -1);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_108"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1474_14" HREF="terminal_interface-curses__adb.htm#ref_1804_14">Get</A></FONT> (<FONT COLOR=red><A NAME="ref_1474_19" HREF="terminal_interface-curses__adb.htm#ref_1805_7">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                  <FONT COLOR=red><A NAME="ref_1475_19" HREF="terminal_interface-curses__adb.htm#ref_1806_7">Line</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+                  <FONT COLOR=red><A NAME="ref_1476_19" HREF="terminal_interface-curses__adb.htm#ref_1807_7">Column</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+                  <FONT COLOR=red><A NAME="ref_1477_19" HREF="terminal_interface-curses__adb.htm#ref_1808_7">Str</A></FONT>    : <b>out</b> String;
-+                  <FONT COLOR=red><A NAME="ref_1478_19" HREF="terminal_interface-curses__adb.htm#ref_1809_7">Len</A></FONT>    : <b>in</b>  Integer := -1);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_getstr.3x.html">mvwgetnstr()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: mvwgetstr()</EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: mvgetnstr()</EM></FONT>
-@@ -1488,90 +1493,90 @@
- 
-    <FONT COLOR=green><EM>--  Not Implemented: slk_attr_on, slk_attr_off, slk_attr_set</EM></FONT>
- 
--   <b>type</b> Soft_Label_Key_Format <b>is</b> (<FONT COLOR=red><A NAME="ref_1486_35">Three_Two_Three</A></FONT>,
--                                  <FONT COLOR=red><A NAME="ref_1487_35">Four_Four</A></FONT>,
--                                  <FONT COLOR=red><A NAME="ref_1488_35">PC_Style</A></FONT>,              <FONT COLOR=green><EM>--  ncurses specific</EM></FONT>
--        <FONT COLOR=red><A NAME="ref_1489_9"> </A></FONT>                         PC_Style_With_Index);  <FONT COLOR=green><EM>--  "</EM></FONT>
--   <b>type</b> <FONT COLOR=red><A NAME="ref_1490_9">Label_Number</A></FONT> <b>is</b> <b>new</b> Positive <b>range</b> 1 .. <FONT COLOR=red><A NAME="ref_1490_49">12</A></FONT>;
--   <b>type</b> Label_Justification <b>is</b> (Left, Centered, Right);
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_1491_9">Soft_Label_Key_Format</A></FONT> <b>is</b> (<FONT COLOR=red><A NAME="ref_1491_35">Three_Two_Three</A></FONT>,
-+                                  <FONT COLOR=red><A NAME="ref_1492_35">Four_Four</A></FONT>,
-+                                  <FONT COLOR=red><A NAME="ref_1493_35">PC_Style</A></FONT>,              <FONT COLOR=green><EM>--  ncurses specific</EM></FONT>
-+                                  <FONT COLOR=red><A NAME="ref_1494_35">PC_Style_With_Index</A></FONT>);  <FONT COLOR=green><EM>--  "</EM></FONT>
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_1495_9">Label_Number</A></FONT> <b>is</b> <b>new</b> Positive <b>range</b> 1 .. 12;
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_1496_9">Label_Justification</A></FONT> <b>is</b> (<FONT COLOR=red><A NAME="ref_1496_33">Left</A></FONT>, <FONT COLOR=red><A NAME="ref_1496_39">Centered</A></FONT>, <FONT COLOR=red><A NAME="ref_1496_49">Right</A></FONT>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_108"#2|</EM></FONT>
--   <b>procedure</b> Init_Soft_Label_Keys
--     (Format : <b>in</b> Soft_Label_Key_Format := Three_Two_Three);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_109"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1499_14" HREF="terminal_interface-curses__adb.htm#ref_1816_14">Init_Soft_Label_Keys</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1500_7" HREF="terminal_interface-curses__adb.htm#ref_1817_7">Format</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1491_9">Soft_Label_Key_Format</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1491_35">Three_Two_Three</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_slk.3x.html">slk_init()</A></EM></FONT>
--   <b>pragma</b> Inline (Init_Soft_Label_Keys);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1499_14">Init_Soft_Label_Keys</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_109"#2|</EM></FONT>
--   <b>procedure</b> Set_Soft_Label_Key (<FONT COLOR=red><A NAME="ref_1500_34" HREF="terminal_interface-curses__adb.htm#ref_1861_34">Label</A></FONT> : <b>in</b> Label_Number;
--                                 <FONT COLOR=red><A NAME="ref_1501_34" HREF="terminal_interface-curses__adb.htm#ref_1862_34">Text</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1490_9">String</A>;
--                                 Fmt   : <b>in</b> Label_Justification := Left);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_110"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1505_14" HREF="terminal_interface-curses__adb.htm#ref_1827_14">Set_Soft_Label_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_1505_34" HREF="terminal_interface-curses__adb.htm#ref_1827_34">Label</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1495_9">Label_Number</A>;
-+                                 <FONT COLOR=red><A NAME="ref_1506_34" HREF="terminal_interface-curses__adb.htm#ref_1828_34">Text</A></FONT>  : <b>in</b> String;
-+                                 <FONT COLOR=red><A NAME="ref_1507_34" HREF="terminal_interface-curses__adb.htm#ref_1829_34">Fmt</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1496_9">Label_Justification</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1496_33">Left</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_slk.3x.html">slk_set()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  We don't inline this procedure</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_110"#2|</EM></FONT>
--   <b>procedure</b> Refresh_Soft_Label_Keys;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_111"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1512_14" HREF="terminal_interface-curses__adb.htm#ref_1846_14">Refresh_Soft_Label_Keys</A></FONT>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_slk.3x.html">slk_refresh()</A></EM></FONT>
--   <b>pragma</b> Inline (Refresh_Soft_Label_Keys);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1512_14">Refresh_Soft_Label_Keys</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_111"#2|</EM></FONT>
--   <b>procedure</b> Refresh_Soft_Label_Keys_Without_Update;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_112"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1517_14" HREF="terminal_interface-curses__adb.htm#ref_1856_14">Refresh_Soft_Label_Keys_Without_Update</A></FONT>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_slk.3x.html">slk_noutrefresh()</A></EM></FONT>
--   <b>pragma</b> Inline (Refresh_Soft_Label_Keys_Without_Update);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1517_14">Refresh_Soft_Label_Keys_Without_Update</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_112"#2|</EM></FONT>
--   <b>procedure</b> Get_Soft_Label_Key (<FONT COLOR=red><A NAME="ref_1517_34" HREF="terminal_interface-curses__adb.htm#ref_1900_34">Label</A></FONT> : <b>in</b> Label_Number;
--                                 Text  : <b>out</b> String);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_113"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1522_14" HREF="terminal_interface-curses__adb.htm#ref_1866_14">Get_Soft_Label_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_1522_34" HREF="terminal_interface-curses__adb.htm#ref_1866_34">Label</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1495_9">Label_Number</A>;
-+                                 <FONT COLOR=red><A NAME="ref_1523_34" HREF="terminal_interface-curses__adb.htm#ref_1867_34">Text</A></FONT>  : <b>out</b> String);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_slk.3x.html">slk_label()</A></EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_113"#2|</EM></FONT>
--   <b>function</b> Get_Soft_Label_Key (Label : <b>in</b> Label_Number) <b>return</b> String;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_114"#2|</EM></FONT>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1527_13" HREF="terminal_interface-curses__adb.htm#ref_1875_13">Get_Soft_Label_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_1527_33" HREF="terminal_interface-curses__adb.htm#ref_1875_33">Label</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1495_9">Label_Number</A>) <b>return</b> String;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_slk.3x.html">slk_label()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  Same as function</EM></FONT>
-    <b>pragma</b> Inline (Get_Soft_Label_Key);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_114"#2|</EM></FONT>
--   <b>procedure</b> Clear_Soft_Label_Keys;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_115"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1533_14" HREF="terminal_interface-curses__adb.htm#ref_1883_14">Clear_Soft_Label_Keys</A></FONT>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_slk.3x.html">slk_clear()</A></EM></FONT>
--   <b>pragma</b> Inline (Clear_Soft_Label_Keys);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1533_14">Clear_Soft_Label_Keys</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_115"#2|</EM></FONT>
--   <b>procedure</b> Restore_Soft_Label_Keys;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_116"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1538_14" HREF="terminal_interface-curses__adb.htm#ref_1893_14">Restore_Soft_Label_Keys</A></FONT>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_slk.3x.html">slk_restore()</A></EM></FONT>
--   <b>pragma</b> Inline (Restore_Soft_Label_Keys);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1538_14">Restore_Soft_Label_Keys</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_116"#2|</EM></FONT>
--   <b>procedure</b> Touch_Soft_Label_Keys;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_117"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1543_14" HREF="terminal_interface-curses__adb.htm#ref_1903_14">Touch_Soft_Label_Keys</A></FONT>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_slk.3x.html">slk_touch()</A></EM></FONT>
--   <b>pragma</b> Inline (Touch_Soft_Label_Keys);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1543_14">Touch_Soft_Label_Keys</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_117"#2|</EM></FONT>
--   <b>procedure</b> Switch_Soft_Label_Key_Attributes
--     (<FONT COLOR=red><A NAME="ref_1544_7" HREF="terminal_interface-curses__adb.htm#ref_1948_7">Attr</A></FONT> : <b>in</b> Character_Attribute_Set;
--      On   : <b>in</b> Boolean := True);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_118"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1548_14" HREF="terminal_interface-curses__adb.htm#ref_1913_14">Switch_Soft_Label_Key_Attributes</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1549_7" HREF="terminal_interface-curses__adb.htm#ref_1914_7">Attr</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>;
-+      <FONT COLOR=red><A NAME="ref_1550_7" HREF="terminal_interface-curses__adb.htm#ref_1915_7">On</A></FONT>   : <b>in</b> Boolean := True);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_slk.3x.html">slk_attron()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: slk_attroff()</EM></FONT>
--   <b>pragma</b> Inline (Switch_Soft_Label_Key_Attributes);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1548_14">Switch_Soft_Label_Key_Attributes</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_118"#2|</EM></FONT>
--   <b>procedure</b> Set_Soft_Label_Key_Attributes
--     (<FONT COLOR=red><A NAME="ref_1552_7" HREF="terminal_interface-curses__adb.htm#ref_1972_7">Attr</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character_Attribute_Set</A> := Normal_Video;
--      Color : <b>in</b> Color_Pair := Color_Pair'First);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_119"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1556_14" HREF="terminal_interface-curses__adb.htm#ref_1937_14">Set_Soft_Label_Key_Attributes</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1557_7" HREF="terminal_interface-curses__adb.htm#ref_1938_7">Attr</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-+      <FONT COLOR=red><A NAME="ref_1558_7" HREF="terminal_interface-curses__adb.htm#ref_1939_7">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_slk.3x.html">slk_attrset()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Soft_Label_Key_Attributes);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1556_14">Set_Soft_Label_Key_Attributes</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_119"#2|</EM></FONT>
--   <b>function</b> Get_Soft_Label_Key_Attributes <b>return</b> Character_Attribute_Set;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_120"#2|</EM></FONT>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1563_13" HREF="terminal_interface-curses__adb.htm#ref_1953_13">Get_Soft_Label_Key_Attributes</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_slk.3x.html">slk_attr()</A></EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_120"#2|</EM></FONT>
--   <b>function</b> Get_Soft_Label_Key_Attributes <b>return</b> Color_Pair;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_121"#2|</EM></FONT>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1567_13" HREF="terminal_interface-curses__adb.htm#ref_1963_13">Get_Soft_Label_Key_Attributes</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_slk.3x.html">slk_attr()</A></EM></FONT>
-    <b>pragma</b> Inline (Get_Soft_Label_Key_Attributes);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_121"#2|</EM></FONT>
--   <b>procedure</b> Set_Soft_Label_Key_Color (Pair : <b>in</b> Color_Pair);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_122"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1572_14" HREF="terminal_interface-curses__adb.htm#ref_1973_14">Set_Soft_Label_Key_Color</A></FONT> (<FONT COLOR=red><A NAME="ref_1572_40" HREF="terminal_interface-curses__adb.htm#ref_1973_40">Pair</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_slk.3x.html">slk_color()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Soft_Label_Key_Color);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1572_14">Set_Soft_Label_Key_Color</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/keybound.3x.html">keybound.3x</A></EM></FONT>
-@@ -1582,21 +1587,21 @@
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/keyok.3x.html">keyok.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_122"#2|</EM></FONT>
--   <b>procedure</b> Enable_Key (<FONT COLOR=red><A NAME="ref_1581_26" HREF="terminal_interface-curses__adb.htm#ref_2018_26">Key</A></FONT>    : <b>in</b> Special_Key_Code;
--                         Enable : <b>in</b> Boolean := True);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_123"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1586_14" HREF="terminal_interface-curses__adb.htm#ref_1984_14">Enable_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_1586_26" HREF="terminal_interface-curses__adb.htm#ref_1984_26">Key</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>;
-+                         <FONT COLOR=red><A NAME="ref_1587_26" HREF="terminal_interface-curses__adb.htm#ref_1985_26">Enable</A></FONT> : <b>in</b> Boolean := True);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/keyok.3x.html">keyok()</A></EM></FONT>
--   <b>pragma</b> Inline (Enable_Key);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1586_14">Enable_Key</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/define_key.3x.html">define_key.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_123"#2|</EM></FONT>
--   <b>procedure</b> Define_Key (<FONT COLOR=red><A NAME="ref_1591_26" HREF="terminal_interface-curses__adb.htm#ref_2031_26">Definition</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">String</A>;
--                         Key        : <b>in</b> Special_Key_Code);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_124"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1596_14" HREF="terminal_interface-curses__adb.htm#ref_1997_14">Define_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_1596_26" HREF="terminal_interface-curses__adb.htm#ref_1997_26">Definition</A></FONT> : <b>in</b> String;
-+                         <FONT COLOR=red><A NAME="ref_1597_26" HREF="terminal_interface-curses__adb.htm#ref_1998_26">Key</A></FONT>        : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/define_key.3x.html">define_key()</A></EM></FONT>
--   <b>pragma</b> Inline (Define_Key);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1596_14">Define_Key</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_util.3x.html">curs_util.3x</A></EM></FONT>
-@@ -1606,89 +1611,89 @@
-    <FONT COLOR=green><EM>--  | putwin, getwin are in the child package PutWin</EM></FONT>
-    <FONT COLOR=green><EM>--</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_124"#2|</EM></FONT>
--   <b>procedure</b> Key_Name (<FONT COLOR=red><A NAME="ref_1605_24" HREF="terminal_interface-curses__adb.htm#ref_144_24">Key</A></FONT>  : <b>in</b>  Real_Key_Code;
--                       Name : <b>out</b> String);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_125"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1610_14" HREF="terminal_interface-curses__adb.htm#ref_90_14">Key_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_1610_24" HREF="terminal_interface-curses__adb.htm#ref_90_24">Key</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>;
-+                       <FONT COLOR=red><A NAME="ref_1611_24" HREF="terminal_interface-curses__adb.htm#ref_91_24">Name</A></FONT> : <b>out</b> String);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_util.3x.html">keyname()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  The external name for a real keystroke.</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_125"#2|</EM></FONT>
--   <b>function</b> Key_Name (Key  : <b>in</b>  Real_Key_Code) <b>return</b> String;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_126"#2|</EM></FONT>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1616_13" HREF="terminal_interface-curses__adb.htm#ref_62_13">Key_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_1616_23" HREF="terminal_interface-curses__adb.htm#ref_62_23">Key</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>) <b>return</b> String;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_util.3x.html">keyname()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  Same as function</EM></FONT>
-    <FONT COLOR=green><EM>--  We don't inline this routine</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_126"#2|</EM></FONT>
--   <b>procedure</b> Un_Control (<FONT COLOR=red><A NAME="ref_1617_26" HREF="terminal_interface-curses__adb.htm#ref_2047_26">Ch</A></FONT>  : <b>in</b> Attributed_Character;
--                         Str : <b>out</b> String);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_127"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1622_14" HREF="terminal_interface-curses__adb.htm#ref_2013_14">Un_Control</A></FONT> (<FONT COLOR=red><A NAME="ref_1622_26" HREF="terminal_interface-curses__adb.htm#ref_2013_26">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>;
-+                         <FONT COLOR=red><A NAME="ref_1623_26" HREF="terminal_interface-curses__adb.htm#ref_2014_26">Str</A></FONT> : <b>out</b> String);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_util.3x.html">unctrl()</A></EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_127"#2|</EM></FONT>
--   <b>function</b> Un_Control (Ch  : <b>in</b> Attributed_Character) <b>return</b> String;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_128"#2|</EM></FONT>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1627_13" HREF="terminal_interface-curses__adb.htm#ref_2022_13">Un_Control</A></FONT> (<FONT COLOR=red><A NAME="ref_1627_25" HREF="terminal_interface-curses__adb.htm#ref_2022_25">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>) <b>return</b> String;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_util.3x.html">unctrl()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  Same as function</EM></FONT>
-    <b>pragma</b> Inline (Un_Control);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_128"#2|</EM></FONT>
--   <b>procedure</b> Delay_Output (Msecs : <b>in</b> Natural);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_129"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1633_14" HREF="terminal_interface-curses__adb.htm#ref_2030_14">Delay_Output</A></FONT> (<FONT COLOR=red><A NAME="ref_1633_28" HREF="terminal_interface-curses__adb.htm#ref_2030_28">Msecs</A></FONT> : <b>in</b> Natural);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_util.3x.html">delay_output()</A></EM></FONT>
--   <b>pragma</b> Inline (Delay_Output);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1633_14">Delay_Output</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_129"#2|</EM></FONT>
--   <b>procedure</b> Flush_Input;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_130"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1638_14" HREF="terminal_interface-curses__adb.htm#ref_2040_14">Flush_Input</A></FONT>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_util.3x.html">flushinp()</A></EM></FONT>
--   <b>pragma</b> Inline (Flush_Input);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1638_14">Flush_Input</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_130"#2|</EM></FONT>
--   <b>function</b> Baudrate <b>return</b> Natural;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_131"#2|</EM></FONT>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1647_13" HREF="terminal_interface-curses__adb.htm#ref_2050_13">Baudrate</A></FONT> <b>return</b> Natural;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_termattrs.3x.html">baudrate()</A></EM></FONT>
--   <b>pragma</b> Inline (Baudrate);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1647_13">Baudrate</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_131"#2|</EM></FONT>
--   <b>function</b> Erase_Character <b>return</b> Character;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_132"#2|</EM></FONT>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1652_13" HREF="terminal_interface-curses__adb.htm#ref_2058_13">Erase_Character</A></FONT> <b>return</b> Character;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_termattrs.3x.html">erasechar()</A></EM></FONT>
--   <b>pragma</b> Inline (Erase_Character);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1652_13">Erase_Character</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_132"#2|</EM></FONT>
--   <b>function</b> Kill_Character <b>return</b> Character;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_133"#2|</EM></FONT>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1657_13" HREF="terminal_interface-curses__adb.htm#ref_2066_13">Kill_Character</A></FONT> <b>return</b> Character;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_termattrs.3x.html">killchar()</A></EM></FONT>
--   <b>pragma</b> Inline (Kill_Character);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1657_13">Kill_Character</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_133"#2|</EM></FONT>
--   <b>function</b> Has_Insert_Character <b>return</b> Boolean;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_134"#2|</EM></FONT>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1662_13" HREF="terminal_interface-curses__adb.htm#ref_2074_13">Has_Insert_Character</A></FONT> <b>return</b> Boolean;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_termattrs.3x.html">has_ic()</A></EM></FONT>
--   <b>pragma</b> Inline (Has_Insert_Character);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1662_13">Has_Insert_Character</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_134"#2|</EM></FONT>
--   <b>function</b> Has_Insert_Line <b>return</b> Boolean;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_135"#2|</EM></FONT>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1667_13" HREF="terminal_interface-curses__adb.htm#ref_2086_13">Has_Insert_Line</A></FONT> <b>return</b> Boolean;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_termattrs.3x.html">has_il()</A></EM></FONT>
--   <b>pragma</b> Inline (Has_Insert_Line);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1667_13">Has_Insert_Line</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_135"#2|</EM></FONT>
--   <b>function</b> Supported_Attributes <b>return</b> Character_Attribute_Set;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_136"#2|</EM></FONT>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1672_13" HREF="terminal_interface-curses__adb.htm#ref_2098_13">Supported_Attributes</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_termattrs.3x.html">termattrs()</A></EM></FONT>
--   <b>pragma</b> Inline (Supported_Attributes);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1672_13">Supported_Attributes</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_136"#2|</EM></FONT>
--   <b>procedure</b> Long_Name (Name : <b>out</b> String);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_137"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1677_14" HREF="terminal_interface-curses__adb.htm#ref_2108_14">Long_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_1677_25" HREF="terminal_interface-curses__adb.htm#ref_2108_25">Name</A></FONT> : <b>out</b> String);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_termattrs.3x.html">longname()</A></EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_137"#2|</EM></FONT>
--   <b>function</b> Long_Name <b>return</b> String;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_138"#2|</EM></FONT>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1681_13" HREF="terminal_interface-curses__adb.htm#ref_2116_13">Long_Name</A></FONT> <b>return</b> String;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_termattrs.3x.html">longname()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  Same as function</EM></FONT>
-    <b>pragma</b> Inline (Long_Name);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_138"#2|</EM></FONT>
--   <b>procedure</b> Terminal_Name (Name : <b>out</b> String);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_139"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1687_14" HREF="terminal_interface-curses__adb.htm#ref_2124_14">Terminal_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_1687_29" HREF="terminal_interface-curses__adb.htm#ref_2124_29">Name</A></FONT> : <b>out</b> String);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_termattrs.3x.html">termname()</A></EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_139"#2|</EM></FONT>
--   <b>function</b> Terminal_Name <b>return</b> String;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_140"#2|</EM></FONT>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1691_13" HREF="terminal_interface-curses__adb.htm#ref_2132_13">Terminal_Name</A></FONT> <b>return</b> String;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_termattrs.3x.html">termname()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  Same as function</EM></FONT>
-    <b>pragma</b> Inline (Terminal_Name);
-@@ -1703,119 +1708,119 @@
-    <FONT COLOR=green><EM>--  In C you often see something like c = c | COLOR_PAIR(n);</EM></FONT>
-    <FONT COLOR=green><EM>--  This is equivalent to c.Color := n;</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_140"#2|</EM></FONT>
--   <b>procedure</b> Start_Color;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_141"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1707_14">Start_Color</A></FONT>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_color.3x.html">start_color()</A></EM></FONT>
-    <b>pragma</b> Import (C, Start_Color, "start_color");
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_141"#2|</EM></FONT>
--   <b>procedure</b> Init_Pair (<FONT COLOR=red><A NAME="ref_1707_25" HREF="terminal_interface-curses__adb.htm#ref_2174_25">Pair</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Redefinable_Color_Pair</A>;
--                        <FONT COLOR=red><A NAME="ref_1708_25" HREF="terminal_interface-curses__adb.htm#ref_2175_25">Fore</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>;
--                        Back : <b>in</b> Color_Number);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_142"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1712_14" HREF="terminal_interface-curses__adb.htm#ref_2140_14">Init_Pair</A></FONT> (<FONT COLOR=red><A NAME="ref_1712_25" HREF="terminal_interface-curses__adb.htm#ref_2140_25">Pair</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_301_12">Redefinable_Color_Pair</A>;
-+                        <FONT COLOR=red><A NAME="ref_1713_25" HREF="terminal_interface-curses__adb.htm#ref_2141_25">Fore</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>;
-+                        <FONT COLOR=red><A NAME="ref_1714_25" HREF="terminal_interface-curses__adb.htm#ref_2142_25">Back</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_color.3x.html">init_pair()</A></EM></FONT>
--   <b>pragma</b> Inline (Init_Pair);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1712_14">Init_Pair</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_142"#2|</EM></FONT>
--   <b>procedure</b> Pair_Content (<FONT COLOR=red><A NAME="ref_1714_28" HREF="terminal_interface-curses__adb.htm#ref_2195_28">Pair</A></FONT> : <b>in</b> Color_Pair;
--                           <FONT COLOR=red><A NAME="ref_1715_28" HREF="terminal_interface-curses__adb.htm#ref_2196_28">Fore</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>;
--                           Back : <b>out</b> Color_Number);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_143"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1719_14" HREF="terminal_interface-curses__adb.htm#ref_2161_14">Pair_Content</A></FONT> (<FONT COLOR=red><A NAME="ref_1719_28" HREF="terminal_interface-curses__adb.htm#ref_2161_28">Pair</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>;
-+                           <FONT COLOR=red><A NAME="ref_1720_28" HREF="terminal_interface-curses__adb.htm#ref_2162_28">Fore</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>;
-+                           <FONT COLOR=red><A NAME="ref_1721_28" HREF="terminal_interface-curses__adb.htm#ref_2163_28">Back</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_color.3x.html">pair_content()</A></EM></FONT>
--   <b>pragma</b> Inline (Pair_Content);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1719_14">Pair_Content</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_143"#2|</EM></FONT>
--   <b>function</b> Has_Colors <b>return</b> Boolean;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_144"#2|</EM></FONT>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1726_13" HREF="terminal_interface-curses__adb.htm#ref_2181_13">Has_Colors</A></FONT> <b>return</b> Boolean;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_color.3x.html">has_colors()</A></EM></FONT>
--   <b>pragma</b> Inline (Has_Colors);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1726_13">Has_Colors</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_144"#2|</EM></FONT>
--   <b>procedure</b> Init_Color (<FONT COLOR=red><A NAME="ref_1726_26" HREF="terminal_interface-curses__adb.htm#ref_2227_26">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">Color_Number</A>;
--                         <FONT COLOR=red><A NAME="ref_1727_26" HREF="terminal_interface-curses__adb.htm#ref_2228_26">Red</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
--                         <FONT COLOR=red><A NAME="ref_1728_26" HREF="terminal_interface-curses__adb.htm#ref_2229_26">Green</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
--                         Blue  : <b>in</b> RGB_Value);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_145"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1731_14" HREF="terminal_interface-curses__adb.htm#ref_2193_14">Init_Color</A></FONT> (<FONT COLOR=red><A NAME="ref_1731_26" HREF="terminal_interface-curses__adb.htm#ref_2193_26">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>;
-+                         <FONT COLOR=red><A NAME="ref_1732_26" HREF="terminal_interface-curses__adb.htm#ref_2194_26">Red</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
-+                         <FONT COLOR=red><A NAME="ref_1733_26" HREF="terminal_interface-curses__adb.htm#ref_2195_26">Green</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
-+                         <FONT COLOR=red><A NAME="ref_1734_26" HREF="terminal_interface-curses__adb.htm#ref_2196_26">Blue</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_color.3x.html">init_color()</A></EM></FONT>
--   <b>pragma</b> Inline (Init_Color);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1731_14">Init_Color</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_145"#2|</EM></FONT>
--   <b>function</b> Can_Change_Color <b>return</b> Boolean;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_146"#2|</EM></FONT>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1739_13" HREF="terminal_interface-curses__adb.htm#ref_2210_13">Can_Change_Color</A></FONT> <b>return</b> Boolean;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_color.3x.html">can_change_color()</A></EM></FONT>
--   <b>pragma</b> Inline (Can_Change_Color);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1739_13">Can_Change_Color</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_146"#2|</EM></FONT>
--   <b>procedure</b> Color_Content (<FONT COLOR=red><A NAME="ref_1739_29" HREF="terminal_interface-curses__adb.htm#ref_2256_29">Color</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_295_9">Color_Number</A>;
--                            <FONT COLOR=red><A NAME="ref_1740_29" HREF="terminal_interface-curses__adb.htm#ref_2257_29">Red</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
--                            <FONT COLOR=red><A NAME="ref_1741_29" HREF="terminal_interface-curses__adb.htm#ref_2258_29">Green</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
--                            Blue  : <b>out</b> RGB_Value);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_147"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1744_14" HREF="terminal_interface-curses__adb.htm#ref_2222_14">Color_Content</A></FONT> (<FONT COLOR=red><A NAME="ref_1744_29" HREF="terminal_interface-curses__adb.htm#ref_2222_29">Color</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>;
-+                            <FONT COLOR=red><A NAME="ref_1745_29" HREF="terminal_interface-curses__adb.htm#ref_2223_29">Red</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
-+                            <FONT COLOR=red><A NAME="ref_1746_29" HREF="terminal_interface-curses__adb.htm#ref_2224_29">Green</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
-+                            <FONT COLOR=red><A NAME="ref_1747_29" HREF="terminal_interface-curses__adb.htm#ref_2225_29">Blue</A></FONT>  : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_color.3x.html">color_content()</A></EM></FONT>
--   <b>pragma</b> Inline (Color_Content);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1744_14">Color_Content</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_kernel.3x.html">curs_kernel.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Not implemented: getsyx, setsyx</EM></FONT>
-    <FONT COLOR=green><EM>--</EM></FONT>
--   <b>type</b> Curses_Mode <b>is</b> (Curses, Shell);
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_1756_9">Curses_Mode</A></FONT> <b>is</b> (<FONT COLOR=red><A NAME="ref_1756_25">Curses</A></FONT>, <FONT COLOR=red><A NAME="ref_1756_33">Shell</A></FONT>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_147"#2|</EM></FONT>
--   <b>procedure</b> Save_Curses_Mode (Mode : <b>in</b> Curses_Mode);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_148"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1759_14" HREF="terminal_interface-curses__adb.htm#ref_2246_14">Save_Curses_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_1759_32" HREF="terminal_interface-curses__adb.htm#ref_2246_32">Mode</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1756_9">Curses_Mode</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_kernel.3x.html">def_prog_mode()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: def_shell_mode()</EM></FONT>
--   <b>pragma</b> Inline (Save_Curses_Mode);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1759_14">Save_Curses_Mode</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_148"#2|</EM></FONT>
--   <b>procedure</b> Reset_Curses_Mode (Mode : <b>in</b> Curses_Mode);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_149"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1765_14" HREF="terminal_interface-curses__adb.htm#ref_2264_14">Reset_Curses_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_1765_33" HREF="terminal_interface-curses__adb.htm#ref_2264_33">Mode</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1756_9">Curses_Mode</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_kernel.3x.html">reset_prog_mode()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  AKA: reset_shell_mode()</EM></FONT>
--   <b>pragma</b> Inline (Reset_Curses_Mode);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1765_14">Reset_Curses_Mode</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_149"#2|</EM></FONT>
--   <b>procedure</b> Save_Terminal_State;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_150"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1771_14" HREF="terminal_interface-curses__adb.htm#ref_2282_14">Save_Terminal_State</A></FONT>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_kernel.3x.html">savetty()</A></EM></FONT>
--   <b>pragma</b> Inline (Save_Terminal_State);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1771_14">Save_Terminal_State</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_150"#2|</EM></FONT>
--   <b>procedure</b> Reset_Terminal_State;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_151"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1776_14" HREF="terminal_interface-curses__adb.htm#ref_2292_14">Reset_Terminal_State</A></FONT>;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_kernel.3x.html">resetty();</A></EM></FONT>
--   <b>pragma</b> Inline (Reset_Terminal_State);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1776_14">Reset_Terminal_State</A>);
- 
--   <b>type</b> Stdscr_Init_Proc <b>is</b> <b>access</b>
--      <b>function</b> (<FONT COLOR=red><A NAME="ref_1776_17">Win</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Window</A>;
--                Columns :<A HREF="terminal_interface-curses__ads.htm#ref_1774_9"> </A>Column_Count) <b>return</b> Integer;
--   <b>pragma</b> Convention (C, Stdscr_Init_Proc);
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_1780_9">Stdscr_Init_Proc</A></FONT> <b>is</b> <b>access</b>
-+      <b>function</b> (<FONT COLOR=red><A NAME="ref_1781_17">Win</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+                <FONT COLOR=red><A NAME="ref_1782_17">Columns</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>) <b>return</b> Integer;
-+   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses__ads.htm#ref_1780_9">Stdscr_Init_Proc</A>);
-    <FONT COLOR=green><EM>--  N.B.: the return value is actually ignored, but it seems to be</EM></FONT>
-    <FONT COLOR=green><EM>--        a good practice to return 0 if you think all went fine</EM></FONT>
-    <FONT COLOR=green><EM>--        and -1 otherwise.</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_151"#2|</EM></FONT>
--   <b>procedure</b> Rip_Off_Lines (<FONT COLOR=red><A NAME="ref_1784_29" HREF="terminal_interface-curses__adb.htm#ref_2336_29">Lines</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1774_9">Integer</A>;
--                            Proc  : <b>in</b> Stdscr_Init_Proc);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_152"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1789_14" HREF="terminal_interface-curses__adb.htm#ref_2302_14">Rip_Off_Lines</A></FONT> (<FONT COLOR=red><A NAME="ref_1789_29" HREF="terminal_interface-curses__adb.htm#ref_2302_29">Lines</A></FONT> : <b>in</b> Integer;
-+                            <FONT COLOR=red><A NAME="ref_1790_29" HREF="terminal_interface-curses__adb.htm#ref_2303_29">Proc</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1780_9">Stdscr_Init_Proc</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_kernel.3x.html">ripoffline()</A></EM></FONT>
-    <FONT COLOR=green><EM>--  N.B.: to be more precise, this uses a ncurses specific enhancement of</EM></FONT>
-    <FONT COLOR=green><EM>--        ripoffline(), in which the Lines argument absolute value is the</EM></FONT>
-    <FONT COLOR=green><EM>--        number of lines to be ripped of. The official ripoffline() only</EM></FONT>
-    <FONT COLOR=green><EM>--        uses the sign of Lines to rip of a single line from bottom or top.</EM></FONT>
--   <b>pragma</b> Inline (Rip_Off_Lines);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1789_14">Rip_Off_Lines</A>);
- 
--   <b>type</b> Cursor_Visibility <b>is</b> (Invisible, Normal, Very_Visible);
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_1798_9">Cursor_Visibility</A></FONT> <b>is</b> (<FONT COLOR=red><A NAME="ref_1798_31">Invisible</A></FONT>, <FONT COLOR=red><A NAME="ref_1798_42">Normal</A></FONT>, <FONT COLOR=red><A NAME="ref_1798_50">Very_Visible</A></FONT>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_152"#2|</EM></FONT>
--   <b>procedure</b> Set_Cursor_Visibility (Visibility : <b>in</b> <b>out</b> Cursor_Visibility);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_153"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1801_14" HREF="terminal_interface-curses__adb.htm#ref_2314_14">Set_Cursor_Visibility</A></FONT> (<FONT COLOR=red><A NAME="ref_1801_37" HREF="terminal_interface-curses__adb.htm#ref_2314_37">Visibility</A></FONT> : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_1798_9">Cursor_Visibility</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_kernel.3x.html">curs_set()</A></EM></FONT>
--   <b>pragma</b> Inline (Set_Cursor_Visibility);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1801_14">Set_Cursor_Visibility</A>);
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_153"#2|</EM></FONT>
--   <b>procedure</b> Nap_Milli_Seconds (Ms : <b>in</b> Natural);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_154"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1806_14" HREF="terminal_interface-curses__adb.htm#ref_2327_14">Nap_Milli_Seconds</A></FONT> (<FONT COLOR=red><A NAME="ref_1806_33" HREF="terminal_interface-curses__adb.htm#ref_2327_33">Ms</A></FONT> : <b>in</b> Natural);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_kernel.3x.html">napms()</A></EM></FONT>
--   <b>pragma</b> Inline (Nap_Milli_Seconds);
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1806_14">Nap_Milli_Seconds</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Some useful helpers.</EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
--   <b>type</b> Transform_Direction <b>is</b> (From_Screen, To_Screen);
--   <b>procedure</b> Transform_Coordinates
--     (<FONT COLOR=red><A NAME="ref_1810_7" HREF="terminal_interface-curses__adb.htm#ref_2421_7">W</A></FONT>      : <b>in</b> Window := Standard_Window;
--      <FONT COLOR=red><A NAME="ref_1811_7" HREF="terminal_interface-curses__adb.htm#ref_2422_7">Line</A></FONT>   : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
--      <FONT COLOR=red><A NAME="ref_1812_7" HREF="terminal_interface-curses__adb.htm#ref_2423_7">Column</A></FONT> : <b>in</b> <b>out</b> Column_Position;
--      Dir    : <b>in</b> Transform_Direction := From_Screen);
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_1813_9">Transform_Direction</A></FONT> <b>is</b> (<FONT COLOR=red><A NAME="ref_1813_33">From_Screen</A></FONT>, <FONT COLOR=red><A NAME="ref_1813_46">To_Screen</A></FONT>);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1814_14" HREF="terminal_interface-curses__adb.htm#ref_2395_14">Transform_Coordinates</A></FONT>
-+     (<FONT COLOR=red><A NAME="ref_1815_7" HREF="terminal_interface-curses__adb.htm#ref_2396_7">W</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+      <FONT COLOR=red><A NAME="ref_1816_7" HREF="terminal_interface-curses__adb.htm#ref_2397_7">Line</A></FONT>   : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1817_7" HREF="terminal_interface-curses__adb.htm#ref_2398_7">Column</A></FONT> : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+      <FONT COLOR=red><A NAME="ref_1818_7" HREF="terminal_interface-curses__adb.htm#ref_2399_7">Dir</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1813_9">Transform_Direction</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1813_33">From_Screen</A>);
-    <FONT COLOR=green><EM>--  This procedure transforms screen coordinates into coordinates relative</EM></FONT>
-    <FONT COLOR=green><EM>--  to the window and vice versa, depending on the Dir parameter.</EM></FONT>
-    <FONT COLOR=green><EM>--  Screen coordinates are the position informations on the physical device.</EM></FONT>
-@@ -1824,51 +1829,59 @@
-    <FONT COLOR=green><EM>--  We don't inline this procedure</EM></FONT>
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
--   <FONT COLOR=green><EM>--  | Man page <A HREF="../man/dft_fgbg.3x.html">dft_fgbg.3x</A></EM></FONT>
-+   <FONT COLOR=green><EM>--  | Man page <A HREF="../man/default_colors.3x.html">default_colors.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_154"#2|</EM></FONT>
--   <b>procedure</b> Use_Default_Colors;
--   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/dft_fgbg.3x.html">use_default_colors()</A></EM></FONT>
--   <b>pragma</b> Inline (Use_Default_Colors);
--
-    <FONT COLOR=green><EM>--  #1A NAME="AFU_155"#2|</EM></FONT>
--   <b>procedure</b> Assume_Default_Colors (<FONT COLOR=red><A NAME="ref_1831_37" HREF="terminal_interface-curses__adb.htm#ref_2459_37">Fore</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := <A HREF="terminal_interface-curses__ads.htm#ref_285_4">Default_Color</A>;
--                                    Back : Color_Number := Default_Color);
--   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/dft_fgbg.3x.html">assume_default_colors()</A></EM></FONT>
--   <b>pragma</b> Inline (Assume_Default_Colors);
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1831_14" HREF="terminal_interface-curses__adb.htm#ref_2424_14">Use_Default_Colors</A></FONT>;
-+   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/default_colors.3x.html">use_default_colors()</A></EM></FONT>
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1831_14">Use_Default_Colors</A>);
-+
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_156"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1836_14" HREF="terminal_interface-curses__adb.htm#ref_2434_14">Assume_Default_Colors</A></FONT> (<FONT COLOR=red><A NAME="ref_1836_37" HREF="terminal_interface-curses__adb.htm#ref_2434_37">Fore</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := <A HREF="terminal_interface-curses__ads.htm#ref_285_4">Default_Color</A>;
-+                                    <FONT COLOR=red><A NAME="ref_1837_37" HREF="terminal_interface-curses__adb.htm#ref_2435_37">Back</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := <A HREF="terminal_interface-curses__ads.htm#ref_285_4">Default_Color</A>);
-+   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/default_colors.3x.html">assume_default_colors()</A></EM></FONT>
-+   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1836_14">Assume_Default_Colors</A>);
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_extend.3x.html">curs_extend.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_156"#2|</EM></FONT>
--   <b>function</b> Curses_Version <b>return</b> String;
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_157"#2|</EM></FONT>
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1846_13" HREF="terminal_interface-curses__adb.htm#ref_2449_13">Curses_Version</A></FONT> <b>return</b> String;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_extend.3x.html">curses_version()</A></EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_157"#2|</EM></FONT>
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_158"#2|</EM></FONT>
-    <FONT COLOR=green><EM>--  The returnvalue is the previous setting of the flag</EM></FONT>
--   <b>function</b> Use_Extended_Names (Enable : Boolean) <b>return</b> Boolean;
-+   <b>function</b> <FONT COLOR=red><A NAME="ref_1851_13" HREF="terminal_interface-curses__adb.htm#ref_2472_13">Use_Extended_Names</A></FONT> (<FONT COLOR=red><A NAME="ref_1851_33" HREF="terminal_interface-curses__adb.htm#ref_2472_33">Enable</A></FONT> : Boolean) <b>return</b> Boolean;
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_extend.3x.html">use_extended_names()</A></EM></FONT>
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+   <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_trace.3x.html">curs_trace.3x</A></EM></FONT>
-+   <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_159"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1859_14" HREF="terminal_interface-curses__adb.htm#ref_2458_14">Curses_Free_All</A></FONT>;
-+   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_trace.3x.html">_nc_freeall()</A></EM></FONT>
-+
-+   <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_scr_dump.3x.html">curs_scr_dump.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_158"#2|</EM></FONT>
--   <b>procedure</b> Screen_Dump_To_File (Filename : <b>in</b> String);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_160"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1867_14" HREF="terminal_interface-curses__adb.htm#ref_2487_14">Screen_Dump_To_File</A></FONT> (<FONT COLOR=red><A NAME="ref_1867_35" HREF="terminal_interface-curses__adb.htm#ref_2487_35">Filename</A></FONT> : <b>in</b> String);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_scr_dump.3x.html">scr_dump()</A></EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_159"#2|</EM></FONT>
--   <b>procedure</b> Screen_Restore_From_File (Filename : <b>in</b> String);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_161"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1871_14" HREF="terminal_interface-curses__adb.htm#ref_2500_14">Screen_Restore_From_File</A></FONT> (<FONT COLOR=red><A NAME="ref_1871_40" HREF="terminal_interface-curses__adb.htm#ref_2500_40">Filename</A></FONT> : <b>in</b> String);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_scr_dump.3x.html">scr_restore()</A></EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_160"#2|</EM></FONT>
--   <b>procedure</b> Screen_Init_From_File (Filename : <b>in</b> String);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_162"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1875_14" HREF="terminal_interface-curses__adb.htm#ref_2513_14">Screen_Init_From_File</A></FONT> (<FONT COLOR=red><A NAME="ref_1875_37" HREF="terminal_interface-curses__adb.htm#ref_2513_37">Filename</A></FONT> : <b>in</b> String);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_scr_dump.3x.html">scr_init()</A></EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_161"#2|</EM></FONT>
--   <b>procedure</b> Screen_Set_File (Filename : <b>in</b> String);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_163"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1879_14" HREF="terminal_interface-curses__adb.htm#ref_2526_14">Screen_Set_File</A></FONT> (<FONT COLOR=red><A NAME="ref_1879_31" HREF="terminal_interface-curses__adb.htm#ref_2526_31">Filename</A></FONT> : <b>in</b> String);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_scr_dump.3x.html">scr_set()</A></EM></FONT>
- 
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-@@ -1899,42 +1912,24 @@
-    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/wresize.3x.html">wresize.3x</A></EM></FONT>
-    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
- 
--   <FONT COLOR=green><EM>--  #1A NAME="AFU_162"#2|</EM></FONT>
--   <b>procedure</b> Resize (<FONT COLOR=red><A NAME="ref_1898_22" HREF="terminal_interface-curses__adb.htm#ref_2550_22">Win</A></FONT>               : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Window</A> := Standard_Window;
--                     <FONT COLOR=red><A NAME="ref_1899_22" HREF="terminal_interface-curses__adb.htm#ref_2551_22">Number_Of_Lines</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
--                     Number_Of_Columns : Column_Count);
-+   <FONT COLOR=green><EM>--  #1A NAME="AFU_164"#2|</EM></FONT>
-+   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1911_14" HREF="terminal_interface-curses__adb.htm#ref_2539_14">Resize</A></FONT> (<FONT COLOR=red><A NAME="ref_1911_22" HREF="terminal_interface-curses__adb.htm#ref_2539_22">Win</A></FONT>               : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                     <FONT COLOR=red><A NAME="ref_1912_22" HREF="terminal_interface-curses__adb.htm#ref_2540_22">Number_Of_Lines</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+                     <FONT COLOR=red><A NAME="ref_1913_22" HREF="terminal_interface-curses__adb.htm#ref_2541_22">Number_Of_Columns</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>);
-    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/wresize.3x.html">wresize()</A></EM></FONT>
- 
- <b>private</b>
--   <b>type</b> Window <b>is</b> <b>new</b> System.Storage_Elements.Integer_Address;
--   Null_Window : <b>constant</b> Window := 0;
-+   <b>type</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> <b>is</b> <b>new</b> System.Storage_Elements.Integer_Address;
-+   <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := 0;
- 
-    <FONT COLOR=green><EM>--  The next constants are generated and may be different on your</EM></FONT>
-    <FONT COLOR=green><EM>--  architecture.</EM></FONT>
-    <FONT COLOR=green><EM>--</EM></FONT>
--   <FONT COLOR=red><A NAME="ref_1910_4">Offset_maxy</A></FONT>        : <b>constant</b> Natural :=  2; <FONT COLOR=green><EM>--  short</EM></FONT>
--   <FONT COLOR=red><A NAME="ref_1911_4">Offset_maxx</A></FONT>        : <b>constant</b> Natural :=  3; <FONT COLOR=green><EM>--  short</EM></FONT>
--   <FONT COLOR=red><A NAME="ref_1912_4">Offset_begy</A></FONT>        : <b>constant</b> Natural :=  4; <FONT COLOR=green><EM>--  short</EM></FONT>
--   <FONT COLOR=red><A NAME="ref_1913_4">Offset_begx</A></FONT>        : <b>constant</b> Natural :=  5; <FONT COLOR=green><EM>--  short</EM></FONT>
--   <FONT COLOR=red><A NAME="ref_1914_4">Offset_cury</A></FONT>        : <b>constant</b> Natural :=  0; <FONT COLOR=green><EM>--  short</EM></FONT>
--   <FONT COLOR=red><A NAME="ref_1915_4">Offset_curx</A></FONT>        : <b>constant</b> Natural :=  1; <FONT COLOR=green><EM>--  short</EM></FONT>
--   <FONT COLOR=red><A NAME="ref_1916_4">Offset_yoffset</A></FONT>     : <b>constant</b> Natural := 36; <FONT COLOR=green><EM>--  short</EM></FONT>
--   <FONT COLOR=red><A NAME="ref_1917_4">Offset_pary</A></FONT>        : <b>constant</b> Natural := 13; <FONT COLOR=green><EM>--  int</EM></FONT>
--   <FONT COLOR=red><A NAME="ref_1918_4">Offset_parx</A></FONT>        : <b>constant</b> Natural := 12; <FONT COLOR=green><EM>--  int</EM></FONT>
--   <FONT COLOR=red><A NAME="ref_1919_4">Offset_notimeout</A></FONT>   : <b>constant</b> Natural := 24; <FONT COLOR=green><EM>--  char</EM></FONT>
--   <FONT COLOR=red><A NAME="ref_1920_4">Offset_clear</A></FONT>       : <b>constant</b> Natural := 25; <FONT COLOR=green><EM>--  char</EM></FONT>
--   <FONT COLOR=red><A NAME="ref_1921_4">Offset_leaveok</A></FONT>     : <b>constant</b> Natural := 26; <FONT COLOR=green><EM>--  char</EM></FONT>
--   <FONT COLOR=red><A NAME="ref_1922_4">Offset_scroll</A></FONT>      : <b>constant</b> Natural := 27; <FONT COLOR=green><EM>--  char</EM></FONT>
--   <FONT COLOR=red><A NAME="ref_1923_4">Offset_idlok</A></FONT>       : <b>constant</b> Natural := 28; <FONT COLOR=green><EM>--  char</EM></FONT>
--   <FONT COLOR=red><A NAME="ref_1924_4">Offset_idcok</A></FONT>       : <b>constant</b> Natural := 29; <FONT COLOR=green><EM>--  char</EM></FONT>
--   <FONT COLOR=red><A NAME="ref_1925_4">Offset_immed</A></FONT>       : <b>constant</b> Natural := 30; <FONT COLOR=green><EM>--  char</EM></FONT>
--   <FONT COLOR=red><A NAME="ref_1926_4">Offset_sync</A></FONT>        : <b>constant</b> Natural := 31; <FONT COLOR=green><EM>--  char</EM></FONT>
--   <FONT COLOR=red><A NAME="ref_1927_4">Offset_use_keypad</A></FONT>  : <b>constant</b> Natural := 32; <FONT COLOR=green><EM>--  char</EM></FONT>
--   <FONT COLOR=red><A NAME="ref_1928_4">Sizeof_bool</A></FONT>        : <b>constant</b> Natural :=  1; <FONT COLOR=green><EM>--  bool</EM></FONT>
--   Offset_XY          : <b>constant</b> Natural :=  1; <FONT COLOR=green><EM>--  int</EM></FONT>
-+   <FONT COLOR=red><A NAME="ref_1923_4">Sizeof_bool</A></FONT>        : <b>constant</b> Natural :=  1; <FONT COLOR=green><EM>--  bool</EM></FONT>
-+   <FONT COLOR=red><A NAME="ref_1924_4">Offset_XY</A></FONT>          : <b>constant</b> Natural :=  1; <FONT COLOR=green><EM>--  int</EM></FONT>
- 
--   <b>type</b> Curses_Bool <b>is</b> <b>mod</b> 2 ** <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Interfaces</A>.C.char'Size;
--   Curses_Bool_False : <b>constant</b> Curses_Bool := 0;
-+   <b>type</b> <FONT COLOR=red><A NAME="ref_1926_9">Curses_Bool</A></FONT> <b>is</b> <b>mod</b> 2 ** <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.char'Size;
-+   <FONT COLOR=red><A NAME="ref_1927_4">Curses_Bool_False</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> := 0;
- 
--<b>end</b> Terminal_Interface.Curses;
-+<b>end</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>;
- </PRE></BODY></HTML>
-diff -Naur ncurses-5.6.orig/doc/html/man/captoinfo.1m.html ncurses-5.6/doc/html/man/captoinfo.1m.html
---- ncurses-5.6.orig/doc/html/man/captoinfo.1m.html	2006-12-16 17:51:21.000000000 -0500
-+++ ncurses-5.6/doc/html/man/captoinfo.1m.html	2008-06-18 06:49:44.000000000 -0400
-@@ -28,7 +28,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: captoinfo.1m,v 1.20 2006/05/13 15:14:01 tom Exp @
-+  * @Id: captoinfo.1m,v 1.21 2006/12/24 18:07:15 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -166,7 +166,7 @@
-        GG    acs magic cookie count
- 
-        If  the  single-line  capabilities occur in an entry, they
--       will automatically be composed into an <STRONG>acsc</STRONG>  string.   The
-+       will automatically be composed into an <EM>acsc</EM>  string.   The
-        double-line capabilities and <STRONG>GG</STRONG> are discarded with a warn-
-        ing message.
- 
-@@ -183,11 +183,11 @@
-        font2   s2ds
-        font3   s3ds
- 
--       Additionally, the AIX <STRONG>box1</STRONG> capability  will  be  automati-
--       cally translated to an <STRONG>acsc</STRONG> string.
-+       Additionally, the AIX <EM>box1</EM> capability  will  be  automati-
-+       cally translated to an <EM>acsc</EM> string.
- 
-        Hewlett-Packard's  terminfo  library supports two nonstan-
--       dard terminfo capabilities <STRONG>meml</STRONG>  (memory  lock)  and  <STRONG>memu</STRONG>
-+       dard terminfo capabilities <EM>meml</EM>  (memory  lock)  and  <EM>memu</EM>
-        (memory  unlock).   These will be discarded with a warning
-        message.
- 
-@@ -195,7 +195,7 @@
- </PRE>
- <H2>NOTES</H2><PRE>
-        This utility is actually a link to <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, running in  <EM>-I</EM>
--       mode.  You can use other <EM>tic</EM> options such as <STRONG>-f</STRONG> and  <STRONG>-x</STRONG>.
-+       mode.  You can use other <STRONG>tic</STRONG> options such as <STRONG>-f</STRONG> and  <STRONG>-x</STRONG>.
- 
-        The  trace  option isn't identical to SVr4's.  Under SVr4,
-        instead of following the <STRONG>-v</STRONG> with  a  trace  level  n,  you
-@@ -206,7 +206,7 @@
- <H2>SEE ALSO</H2><PRE>
-        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
- 
--       This describes <STRONG>ncurses</STRONG> version 5.5 (patch 20061209).
-+       This describes <STRONG>ncurses</STRONG> version 5.6 (patch 20070303).
- 
- 
- </PRE>
-diff -Naur ncurses-5.6.orig/doc/html/man/clear.1.html ncurses-5.6/doc/html/man/clear.1.html
---- ncurses-5.6.orig/doc/html/man/clear.1.html	2006-12-16 17:51:21.000000000 -0500
-+++ ncurses-5.6/doc/html/man/clear.1.html	2008-06-18 06:49:44.000000000 -0400
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: clear.1,v 1.5 2006/07/01 21:55:09 tom Exp @
-+  * @Id: clear.1,v 1.6 2006/12/24 18:07:53 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -69,7 +69,7 @@
- <H2>SEE ALSO</H2><PRE>
-        <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
- 
--       This describes <STRONG>ncurses</STRONG> version 5.5 (patch 20061209).
-+       This describes <STRONG>ncurses</STRONG> version 5.6 (patch 20070303).
- 
- 
- 
-diff -Naur ncurses-5.6.orig/doc/html/man/curs_add_wch.3x.html ncurses-5.6/doc/html/man/curs_add_wch.3x.html
---- ncurses-5.6.orig/doc/html/man/curs_add_wch.3x.html	2006-12-16 17:51:22.000000000 -0500
-+++ ncurses-5.6/doc/html/man/curs_add_wch.3x.html	2008-06-18 06:49:44.000000000 -0400
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_add_wch.3x,v 1.5 2006/12/02 17:02:35 tom Exp @
-+  * @Id: curs_add_wch.3x,v 1.6 2006/12/24 15:22:22 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -87,8 +87,7 @@
- 
-        -    If  the  character  part  of  <EM>wch</EM>  is a tab, newline,
-             backspace or other control character, the  window  is
--            updated  and  the  cursor  moves as if <STRONG><A HREF="addch.3x.html">addch(3x)</A></STRONG> were
--            called.
-+            updated and the cursor moves as if <STRONG>addch</STRONG> were called.
- 
-        The <STRONG>echo_wchar</STRONG> function is functionally  equivalent  to  a
-        call to <STRONG>add_wch</STRONG> followed by a call to <STRONG>refresh</STRONG>.  Similarly,
-@@ -125,9 +124,8 @@
- 
- </PRE>
- <H2>SEE ALSO</H2><PRE>
--       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,       <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,       <STRONG><A HREF="curs_attr_get.3x.html">curs_attr_get(3x)</A></STRONG>,
--       <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,    <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>,     <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,
--       <STRONG><A HREF="putwc.3.html">putwc(3)</A></STRONG>
-+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>, <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>, <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,
-+       <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="putwc.3.html">putwc(3)</A></STRONG>
- 
- 
- 
-diff -Naur ncurses-5.6.orig/doc/html/man/curs_addch.3x.html ncurses-5.6/doc/html/man/curs_addch.3x.html
---- ncurses-5.6.orig/doc/html/man/curs_addch.3x.html	2006-12-16 17:51:22.000000000 -0500
-+++ ncurses-5.6/doc/html/man/curs_addch.3x.html	2008-06-18 06:49:44.000000000 -0400
-@@ -28,7 +28,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_addch.3x,v 1.25 2006/12/02 17:02:22 tom Exp @
-+  * @Id: curs_addch.3x,v 1.26 2006/12/24 16:05:17 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -192,7 +192,7 @@
- </PRE>
- <H2>SEE ALSO</H2><PRE>
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>, <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,  <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>,
--       <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="putc.3S.html">putc(3S)</A></STRONG>.
-+       <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="putc.3.html">putc(3)</A></STRONG>.
- 
-        Comparable  functions  in  the  wide-character  (ncursesw)
-        library are described in <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>.
-diff -Naur ncurses-5.6.orig/doc/html/man/curs_border.3x.html ncurses-5.6/doc/html/man/curs_border.3x.html
---- ncurses-5.6.orig/doc/html/man/curs_border.3x.html	2006-09-23 16:43:00.000000000 -0400
-+++ ncurses-5.6/doc/html/man/curs_border.3x.html	2008-06-18 06:49:44.000000000 -0400
-@@ -1,7 +1,7 @@
- <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
- <!-- 
-   ****************************************************************************
--  * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+  * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-   *                                                                          *
-   * Permission is hereby granted, free of charge, to any person obtaining a  *
-   * copy of this software and associated documentation files (the            *
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_border.3x,v 1.18 2006/02/25 21:49:19 tom Exp @
-+  * @Id: curs_border.3x,v 1.19 2007/02/24 16:15:38 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -65,8 +65,8 @@
-        <STRONG>int</STRONG> <STRONG>whline(WINDOW</STRONG> <STRONG>*win,</STRONG> <STRONG>chtype</STRONG> <STRONG>ch,</STRONG> <STRONG>int</STRONG> <STRONG>n);</STRONG>
-        <STRONG>int</STRONG> <STRONG>vline(chtype</STRONG> <STRONG>ch,</STRONG> <STRONG>int</STRONG> <STRONG>n);</STRONG>
-        <STRONG>int</STRONG> <STRONG>wvline(WINDOW</STRONG> <STRONG>*win,</STRONG> <STRONG>chtype</STRONG> <STRONG>ch,</STRONG> <STRONG>int</STRONG> <STRONG>n);</STRONG>
--       <STRONG>mvhline(int</STRONG> <STRONG>y,</STRONG> <STRONG>int</STRONG> <STRONG>x,</STRONG> <STRONG>chtype</STRONG> <STRONG>ch,</STRONG> <STRONG>int</STRONG> <STRONG>n);</STRONG>
--       <STRONG>mvwhline(WINDOW</STRONG> <STRONG>*,</STRONG> <STRONG>int</STRONG> <STRONG>y,</STRONG> <STRONG>int</STRONG> <STRONG>x,</STRONG> <STRONG>chtype</STRONG> <STRONG>ch,</STRONG> <STRONG>int</STRONG> <STRONG>n);</STRONG>
-+       <STRONG>int</STRONG> <STRONG>mvhline(int</STRONG> <STRONG>y,</STRONG> <STRONG>int</STRONG> <STRONG>x,</STRONG> <STRONG>chtype</STRONG> <STRONG>ch,</STRONG> <STRONG>int</STRONG> <STRONG>n);</STRONG>
-+       <STRONG>int</STRONG> <STRONG>mvwhline(WINDOW</STRONG> <STRONG>*,</STRONG> <STRONG>int</STRONG> <STRONG>y,</STRONG> <STRONG>int</STRONG> <STRONG>x,</STRONG> <STRONG>chtype</STRONG> <STRONG>ch,</STRONG> <STRONG>int</STRONG> <STRONG>n);</STRONG>
-        <STRONG>int</STRONG> <STRONG>mvvline(int</STRONG> <STRONG>y,</STRONG> <STRONG>int</STRONG> <STRONG>x,</STRONG> <STRONG>chtype</STRONG> <STRONG>ch,</STRONG> <STRONG>int</STRONG> <STRONG>n);</STRONG>
-        <STRONG>int</STRONG> <STRONG>mvwvline(WINDOW</STRONG> <STRONG>*,</STRONG> <STRONG>int</STRONG> <STRONG>y,</STRONG> <STRONG>int</STRONG> <STRONG>x,</STRONG> <STRONG>chtype</STRONG> <STRONG>ch,</STRONG> <STRONG>int</STRONG> <STRONG>n);</STRONG>
- 
-diff -Naur ncurses-5.6.orig/doc/html/man/curs_extend.3x.html ncurses-5.6/doc/html/man/curs_extend.3x.html
---- ncurses-5.6.orig/doc/html/man/curs_extend.3x.html	2006-09-23 16:43:01.000000000 -0400
-+++ ncurses-5.6/doc/html/man/curs_extend.3x.html	2008-06-18 06:49:44.000000000 -0400
-@@ -28,7 +28,7 @@
-   * authorization.                                                           *
-   ****************************************************************************
-   * Author: Thomas E. Dickey 1999-on
--  * @Id: curs_extend.3x,v 1.15 2006/02/25 21:04:43 tom Exp @
-+  * @Id: curs_extend.3x,v 1.17 2006/12/24 18:01:48 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -73,7 +73,7 @@
-        standard names which may be  compiled  into  the  terminfo
-        description, i.e., via the terminfo or termcap interfaces.
-        Normally these names are  available  for  use,  since  the
--       essential  decision  is made by using the <STRONG>-x</STRONG> option of <EM>tic</EM>
-+       essential  decision  is made by using the <STRONG>-x</STRONG> option of <STRONG>tic</STRONG>
-        to compile extended terminal definitions.  However you can
-        disable  this  feature  to ensure compatibility with other
-        implementations of curses.
-@@ -90,8 +90,8 @@
- </PRE>
- <H2>SEE ALSO</H2><PRE>
-        <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>,       <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>,      <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>,
--       <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>,     <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>,      <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>,
--       <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>, <STRONG><A HREF="nofilter.3x.html">nofilter(3x)</A></STRONG>, <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>, <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>.
-+       <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,  <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>,  <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>,  <STRONG>key-</STRONG>
-+       <STRONG><A HREF="keybound.3x.html">bound(3x)</A></STRONG>, <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>, <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>, <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>.
- 
- 
- </PRE>
-diff -Naur ncurses-5.6.orig/doc/html/man/curs_getcchar.3x.html ncurses-5.6/doc/html/man/curs_getcchar.3x.html
---- ncurses-5.6.orig/doc/html/man/curs_getcchar.3x.html	2006-09-23 16:43:01.000000000 -0400
-+++ ncurses-5.6/doc/html/man/curs_getcchar.3x.html	2008-06-18 06:49:44.000000000 -0400
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_getcchar.3x,v 1.8 2006/07/15 22:51:07 wcmbrine Exp @
-+  * @Id: curs_getcchar.3x,v 1.10 2006/12/24 16:00:02 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -136,8 +136,8 @@
- 
- </PRE>
- <H2>SEE ALSO</H2><PRE>
--       Functions:   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,  <STRONG><A HREF="wcwidth.3x.html">wcwidth(3x)</A></STRONG>,  <STRONG><A HREF="curs_attr_get.3x.html">curs_attr_get(3x)</A></STRONG>,
--       <STRONG><A HREF="can_change_color.3x.html">can_change_color(3x)</A></STRONG>.
-+       Functions:   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>,   <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>,  <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
-+       <STRONG><A HREF="wcwidth.3.html">wcwidth(3)</A></STRONG>.
- 
- 
- 
-diff -Naur ncurses-5.6.orig/doc/html/man/curs_insstr.3x.html ncurses-5.6/doc/html/man/curs_insstr.3x.html
---- ncurses-5.6.orig/doc/html/man/curs_insstr.3x.html	2006-09-23 16:43:04.000000000 -0400
-+++ ncurses-5.6/doc/html/man/curs_insstr.3x.html	2008-06-18 06:49:44.000000000 -0400
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_insstr.3x,v 1.17 2006/02/25 21:49:19 tom Exp @
-+  * @Id: curs_insstr.3x,v 1.18 2006/12/24 14:59:30 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -112,7 +112,7 @@
- 
- </PRE>
- <H2>SEE ALSO</H2><PRE>
--       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>, <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>, <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>.
-+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,  <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>, <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>, <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>.
- 
- 
- 
-diff -Naur ncurses-5.6.orig/doc/html/man/curs_mouse.3x.html ncurses-5.6/doc/html/man/curs_mouse.3x.html
---- ncurses-5.6.orig/doc/html/man/curs_mouse.3x.html	2005-05-15 13:05:53.000000000 -0400
-+++ ncurses-5.6/doc/html/man/curs_mouse.3x.html	2008-06-18 06:49:44.000000000 -0400
-@@ -2,7 +2,7 @@
- <!-- 
-   * t
-   ****************************************************************************
--  * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
-+  * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-   *                                                                          *
-   * Permission is hereby granted, free of charge, to any person obtaining a  *
-   * copy of this software and associated documentation files (the            *
-@@ -28,7 +28,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_mouse.3x,v 1.28 2005/05/15 16:18:19 tom Exp @
-+  * @Id: curs_mouse.3x,v 1.30 2006/12/30 23:43:34 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -162,45 +162,48 @@
-        screen windows enclose the location of a mouse event.
- 
-        The <STRONG>wmouse_trafo</STRONG> function transforms a given pair of coor-
--       dinates from stdscr-relative coordinates  to  screen-rela-
--       tive  coordinates  or  vice  versa.  Please remember, that
--       stdscr-relative coordinates are not  always  identical  to
--       screen-relative  coordinates  due  to the mechanism to re-
--       serve lines on top or bottom of the screen for other  pur-
--       poses  (ripoff()  call,  see also slk_...  functions).  If
--       the parameter <STRONG>to_screen</STRONG> is <STRONG>TRUE</STRONG>, the pointers <STRONG>pY,</STRONG> <STRONG>pX</STRONG>  must
--       reference  the coordinates of a location inside the window
--       <STRONG>win</STRONG>.  They are converted  to  screen-relative  coordinates
--       and  returned through the pointers.  If the conversion was
--       successful, the function returns <STRONG>TRUE</STRONG>.  If one of the  pa-
--       rameters  was  NULL or the location is not inside the win-
--       dow, <STRONG>FALSE</STRONG> is returned.  If <STRONG>to_screen</STRONG> is <STRONG>FALSE</STRONG>, the point-
--       ers  <STRONG>pY,</STRONG>  <STRONG>pX</STRONG>  must  reference screen-relative coordinates.
--       They are converted to stdscr-relative coordinates  if  the
--       window <STRONG>win</STRONG> encloses this point.  In this case the function
--       returns <STRONG>TRUE</STRONG>.  If one of the parameters  is  NULL  or  the
--       point is not inside the window, <STRONG>FALSE</STRONG> is returned.  Please
--       notice, that the referenced coordinates are only  replaced
--       by  the  converted  coordinates  if the transformation was
--       successful.
-+       dinates from stdscr-relative  coordinates  to  coordinates
-+       relative to the given window or vice versa.  Please remem-
-+       ber, that stdscr-relative coordinates are not always iden-
-+       tical  to window-relative coordinates due to the mechanism
-+       to reserve lines on top or bottom of the screen for  other
-+       purposes (see the <STRONG>ripoffline()</STRONG> and <STRONG>slk_init</STRONG> calls, for ex-
-+       ample).  If the parameter <STRONG>to_screen</STRONG> is <STRONG>TRUE</STRONG>, the  pointers
-+       <STRONG>pY,</STRONG> <STRONG>pX</STRONG> must reference the coordinates of a location inside
-+       the window <STRONG>win</STRONG>.  They are converted to window-relative co-
-+       ordinates  and returned through the pointers.  If the con-
-+       version was successful, the function returns <STRONG>TRUE</STRONG>.  If one
-+       of  the  parameters was NULL or the location is not inside
-+       the window, <STRONG>FALSE</STRONG> is returned.  If <STRONG>to_screen</STRONG> is <STRONG>FALSE</STRONG>, the
-+       pointers  <STRONG>pY,</STRONG>  <STRONG>pX</STRONG>  must  reference window-relative coordi-
-+       nates.  They are converted to stdscr-relative  coordinates
-+       if  the  window <STRONG>win</STRONG> encloses this point.  In this case the
-+       function returns <STRONG>TRUE</STRONG>.  If one of the parameters  is  NULL
-+       or  the point is not inside the window, <STRONG>FALSE</STRONG> is returned.
-+       Please notice, that the referenced  coordinates  are  only
-+       replaced  by  the converted coordinates if the transforma-
-+       tion was successful.
-+
-+       The <STRONG>mouse_trafo</STRONG> function performs the same translation  as
-+       <STRONG>wmouse_trafo</STRONG>, using stdscr for <STRONG>win</STRONG>.
- 
-        The <STRONG>mouseinterval</STRONG> function sets the maximum time (in thou-
--       sands  of  a second) that can elapse between press and re-
--       lease events for them to be recognized as  a  click.   Use
--       <STRONG>mouseinterval(0)</STRONG>  to disable click resolution.  This func-
-+       sands of a second) that can elapse between press  and  re-
-+       lease  events  for  them to be recognized as a click.  Use
-+       <STRONG>mouseinterval(0)</STRONG> to disable click resolution.  This  func-
-        tion returns the previous interval value.  Use <STRONG>mouseinter-</STRONG>
--       <STRONG>val(-1)</STRONG>  to  obtain the interval without altering it.  The
-+       <STRONG>val(-1)</STRONG> to obtain the interval without altering  it.   The
-        default is one sixth of a second.
- 
--       Note that mouse events will be ignored when  input  is  in
-+       Note  that  mouse  events will be ignored when input is in
-        cooked mode, and will cause an error beep when cooked mode
--       is being simulated in a window by a function such as  <STRONG>get-</STRONG>
-+       is  being simulated in a window by a function such as <STRONG>get-</STRONG>
-        <STRONG>str</STRONG> that expects a linefeed for input-loop termination.
- 
- 
- </PRE>
- <H2>RETURN VALUE</H2><PRE>
--       <STRONG>getmouse</STRONG>  and <STRONG>ungetmouse</STRONG> return the integer <STRONG>ERR</STRONG> upon fail-
-+       <STRONG>getmouse</STRONG> and <STRONG>ungetmouse</STRONG> return the integer <STRONG>ERR</STRONG> upon  fail-
-        ure or <STRONG>OK</STRONG> upon successful completion.
- 
-               <STRONG>getmouse</STRONG>
-@@ -212,83 +215,85 @@
- 
-        <STRONG>mousemask</STRONG> returns the mask of reportable events.
- 
--       <STRONG>mouseinterval</STRONG>  returns the previous interval value, unless
--       the terminal was not initialized.  In that  case,  it  re-
-+       <STRONG>mouseinterval</STRONG> returns the previous interval value,  unless
-+       the  terminal  was  not initialized.  In that case, it re-
-        turns the maximum interval value (166).
- 
--       <STRONG>wenclose</STRONG>  and <STRONG>wmouse_trafo</STRONG> are boolean functions returning
-+       <STRONG>wenclose</STRONG> and <STRONG>wmouse_trafo</STRONG> are boolean functions  returning
-        <STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG> depending on their test result.
- 
- 
- </PRE>
- <H2>PORTABILITY</H2><PRE>
--       These calls were designed for  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>,  and  are  not
-+       These  calls  were  designed  for <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, and are not
-        found in SVr4 curses, 4.4BSD curses, or any other previous
-        version of curses.
- 
-        The feature macro <STRONG>NCURSES_MOUSE_VERSION</STRONG> is provided so the
--       preprocessor  can  be  used to test whether these features
--       are present.  If the interface is changed,  the  value  of
--       <STRONG>NCURSES_MOUSE_VERSION</STRONG>  will  be incremented.  These values
--       for <STRONG>NCURSES_MOUSE_VERSION</STRONG> may be specified when  configur-
-+       preprocessor can be used to test  whether  these  features
-+       are  present.   If  the interface is changed, the value of
-+       <STRONG>NCURSES_MOUSE_VERSION</STRONG> will be incremented.   These  values
-+       for  <STRONG>NCURSES_MOUSE_VERSION</STRONG> may be specified when configur-
-        ing ncurses:
- 
--              1  has  definitions  for reserved events.  The mask
-+              1  has definitions for reserved events.   The  mask
-                  uses 28 bits.
- 
-               2  adds definitions for button 5, removes the defi-
--                 nitions  for  reserved events.  The mask uses 29
-+                 nitions for reserved events.  The mask  uses  29
-                  bits.
- 
--       The order of the <STRONG>MEVENT</STRONG> structure members is  not  guaran-
--       teed.   Additional fields may be added to the structure in
-+       The  order  of the <STRONG>MEVENT</STRONG> structure members is not guaran-
-+       teed.  Additional fields may be added to the structure  in
-        the future.
- 
--       Under <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, these calls are implemented  using  ei-
--       ther  xterm's built-in mouse-tracking API or platform-spe-
-+       Under  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>,  these calls are implemented using ei-
-+       ther xterm's built-in mouse-tracking API or  platform-spe-
-        cific drivers including
-               Alessandro Rubini's gpm server.
-               FreeBSD sysmouse
-               OS/2 EMX
--       If you  are  using  an  unsupported  configuration,  mouse
--       events will not be visible to <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> (and the <STRONG>wmouse-</STRONG>
-+       If  you  are  using  an  unsupported  configuration, mouse
-+       events will not be visible to <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> (and the  <STRONG>mouse-</STRONG>
-        <STRONG>mask</STRONG> function will always return <STRONG>0</STRONG>).
- 
--       If the terminfo entry contains a <STRONG>XM</STRONG> string, this  is  used
--       in  the xterm mouse driver to control the way the terminal
-+       If  the  terminfo entry contains a <STRONG>XM</STRONG> string, this is used
-+       in the xterm mouse driver to control the way the  terminal
-        is initialized for mouse operation.  The default, if <STRONG>XM</STRONG> is
-        not found, corresponds to private mode 1000 of xterm:
-               \E[?1000%?%p1%{1}%=%th%el%;
-        The z member in the event structure is not presently used.
--       It is intended for use with touch screens  (which  may  be
-+       It  is  intended  for use with touch screens (which may be
-        pressure-sensitive)   or   with   3D-mice/trackballs/power
-        gloves.
- 
- 
- </PRE>
- <H2>BUGS</H2><PRE>
--       Mouse events under xterm will not in fact be ignored  dur-
--       ing  cooked mode, if they have been enabled by <STRONG>wmousemask</STRONG>.
--       Instead, the xterm mouse report sequence  will  appear  in
-+       Mouse  events under xterm will not in fact be ignored dur-
-+       ing cooked mode, if they have been enabled  by  <STRONG>mousemask</STRONG>.
-+       Instead,  the  xterm  mouse report sequence will appear in
-        the string read.
- 
-        Mouse events under xterm will not be detected correctly in
--       a window with its keypad bit off, since  they  are  inter-
--       preted  as  a  variety of function key.  Your terminfo de-
--       scription must have <STRONG>kmous</STRONG> set to "\E[M" (the beginning  of
--       the response from xterm for mouse clicks).
--
--       Because  there  are  no  standard  terminal responses that
--       would serve to identify terminals which support the  xterm
--       mouse  protocol,  <STRONG>ncurses</STRONG> assumes that if your $TERM envi-
--       ronment variable contains "xterm", or <STRONG>kmous</STRONG> is defined  in
-+       a  window  with  its keypad bit off, since they are inter-
-+       preted as a variety of function key.   Your  terminfo  de-
-+       scription  should  have <STRONG>kmous</STRONG> set to "\E[M" (the beginning
-+       of the response from xterm for mouse clicks).  Other  val-
-+       ues  for  <STRONG>kmous</STRONG>  are permitted, but under the same assump-
-+       tion, i.e., it is the beginning of the response.
-+
-+       Because there are  no  standard  terminal  responses  that
-+       would  serve to identify terminals which support the xterm
-+       mouse protocol, <STRONG>ncurses</STRONG> assumes that if your  $TERM  envi-
-+       ronment  variable contains "xterm", or <STRONG>kmous</STRONG> is defined in
-        the terminal description, then the terminal may send mouse
-        events.
- 
- 
- </PRE>
- <H2>SEE ALSO</H2><PRE>
--       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>.
-+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>, <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>.
- 
- 
- 
-diff -Naur ncurses-5.6.orig/doc/html/man/curs_printw.3x.html ncurses-5.6/doc/html/man/curs_printw.3x.html
---- ncurses-5.6.orig/doc/html/man/curs_printw.3x.html	2006-09-23 16:43:06.000000000 -0400
-+++ ncurses-5.6/doc/html/man/curs_printw.3x.html	2008-06-18 06:49:44.000000000 -0400
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_printw.3x,v 1.16 2006/02/25 21:49:19 tom Exp @
-+  * @Id: curs_printw.3x,v 1.17 2006/12/24 16:05:17 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -69,12 +69,12 @@
- </PRE>
- <H2>DESCRIPTION</H2><PRE>
-        The  <STRONG>printw</STRONG>,  <STRONG>wprintw</STRONG>, <STRONG>mvprintw</STRONG> and <STRONG>mvwprintw</STRONG> routines are
--       analogous to <STRONG>printf</STRONG>  [see  <STRONG><A HREF="printf.3S.html">printf(3S)</A></STRONG>].   In  effect,  the
-+       analogous to  <STRONG>printf</STRONG>  [see  <STRONG><A HREF="printf.3.html">printf(3)</A></STRONG>].   In  effect,  the
-        string that would be output by <STRONG>printf</STRONG> is output instead as
-        though <STRONG>waddstr</STRONG> were used on the given window.
- 
-        The <STRONG>vwprintw</STRONG>  and  <STRONG>wv_printw</STRONG>  routines  are  analogous  to
--       <STRONG>vprintf</STRONG>  [see  <STRONG><A HREF="printf.3S.html">printf(3S)</A></STRONG>]  and  perform a <STRONG>wprintw</STRONG> using a
-+       <STRONG>vprintf</STRONG>  [see  <STRONG><A HREF="printf.3.html">printf(3)</A></STRONG>]  and  perform  a <STRONG>wprintw</STRONG> using a
-        variable argument list.  The third argument is a  <STRONG>va_list</STRONG>,
-        a   pointer   to  a  list  of  arguments,  as  defined  in
-        <STRONG>&lt;stdarg.h&gt;</STRONG>.
-@@ -107,7 +107,7 @@
- 
- </PRE>
- <H2>SEE ALSO</H2><PRE>
--       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="printf.3S.html">printf(3S)</A></STRONG>, <STRONG>vprintf(3S)</STRONG>
-+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="printf.3.html">printf(3)</A></STRONG>, <STRONG>vprintf(3)</STRONG>
- 
- 
- 
-diff -Naur ncurses-5.6.orig/doc/html/man/curs_scanw.3x.html ncurses-5.6/doc/html/man/curs_scanw.3x.html
---- ncurses-5.6.orig/doc/html/man/curs_scanw.3x.html	2006-09-23 16:43:07.000000000 -0400
-+++ ncurses-5.6/doc/html/man/curs_scanw.3x.html	2008-06-18 06:49:44.000000000 -0400
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_scanw.3x,v 1.13 2006/02/25 21:42:22 tom Exp @
-+  * @Id: curs_scanw.3x,v 1.14 2006/12/24 16:05:49 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -66,7 +66,7 @@
- </PRE>
- <H2>DESCRIPTION</H2><PRE>
-        The <STRONG>scanw</STRONG>, <STRONG>wscanw</STRONG> and <STRONG>mvscanw</STRONG> routines  are  analogous  to
--       <STRONG>scanf</STRONG> [see <STRONG><A HREF="scanf.3S.html">scanf(3S)</A></STRONG>].  The effect of these routines is as
-+       <STRONG>scanf</STRONG>  [see <STRONG><A HREF="scanf.3.html">scanf(3)</A></STRONG>].  The effect of these routines is as
-        though <STRONG>wgetstr</STRONG> were called on the window, and the  result-
-        ing line used as input for <STRONG><A HREF="sscanf.3.html">sscanf(3)</A></STRONG>.  Fields which do not
-        map to a variable in the <EM>fmt</EM> field are lost.
-@@ -114,7 +114,7 @@
- 
- </PRE>
- <H2>SEE ALSO</H2><PRE>
--       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>, <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>, <STRONG><A HREF="scanf.3S.html">scanf(3S)</A></STRONG>
-+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>, <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>, <STRONG><A HREF="scanf.3.html">scanf(3)</A></STRONG>
- 
- 
- 
-diff -Naur ncurses-5.6.orig/doc/html/man/curs_scr_dump.3x.html ncurses-5.6/doc/html/man/curs_scr_dump.3x.html
---- ncurses-5.6.orig/doc/html/man/curs_scr_dump.3x.html	2006-09-23 16:43:07.000000000 -0400
-+++ ncurses-5.6/doc/html/man/curs_scr_dump.3x.html	2008-06-18 06:49:44.000000000 -0400
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_scr_dump.3x,v 1.6 2006/02/25 21:49:19 tom Exp @
-+  * @Id: curs_scr_dump.3x,v 1.7 2006/12/24 16:05:49 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -122,7 +122,7 @@
- </PRE>
- <H2>SEE ALSO</H2><PRE>
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,      <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,       <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,
--       <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>, <STRONG><A HREF="system.3S.html">system(3S)</A></STRONG>
-+       <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>, <STRONG><A HREF="system.3.html">system(3)</A></STRONG>
- 
- 
- 
-diff -Naur ncurses-5.6.orig/doc/html/man/curs_termcap.3x.html ncurses-5.6/doc/html/man/curs_termcap.3x.html
---- ncurses-5.6.orig/doc/html/man/curs_termcap.3x.html	2006-09-23 16:43:08.000000000 -0400
-+++ ncurses-5.6/doc/html/man/curs_termcap.3x.html	2008-06-18 06:49:44.000000000 -0400
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_termcap.3x,v 1.20 2006/02/25 21:50:01 tom Exp @
-+  * @Id: curs_termcap.3x,v 1.21 2006/12/24 16:05:49 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -175,7 +175,7 @@
- 
- </PRE>
- <H2>SEE ALSO</H2><PRE>
--       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="putc.3S.html">putc(3S)</A></STRONG>.
-+       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="putc.3.html">putc(3)</A></STRONG>.
- 
- 
- 
-diff -Naur ncurses-5.6.orig/doc/html/man/curs_terminfo.3x.html ncurses-5.6/doc/html/man/curs_terminfo.3x.html
---- ncurses-5.6.orig/doc/html/man/curs_terminfo.3x.html	2006-12-16 17:51:32.000000000 -0500
-+++ ncurses-5.6/doc/html/man/curs_terminfo.3x.html	2008-06-18 06:49:44.000000000 -0400
-@@ -1,7 +1,7 @@
- <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
- <!-- 
-   ****************************************************************************
--  * Copyright (c) 1999-2005,2006 Free Software Foundation, Inc.              *
-+  * Copyright (c) 1999-2006,2007 Free Software Foundation, Inc.              *
-   *                                                                          *
-   * Permission is hereby granted, free of charge, to any person obtaining a  *
-   * copy of this software and associated documentation files (the            *
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_terminfo.3x,v 1.24 2006/11/04 21:50:03 tom Exp @
-+  * @Id: curs_terminfo.3x,v 1.26 2007/02/24 16:37:50 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -62,7 +62,7 @@
-        <STRONG>int</STRONG> <STRONG>setterm(char</STRONG> <STRONG>*</STRONG><EM>term</EM><STRONG>);</STRONG>
-        <STRONG>TERMINAL</STRONG> <STRONG>*set_curterm(TERMINAL</STRONG> <STRONG>*</STRONG><EM>nterm</EM><STRONG>);</STRONG>
-        <STRONG>int</STRONG> <STRONG>del_curterm(TERMINAL</STRONG> <STRONG>*</STRONG><EM>oterm</EM><STRONG>);</STRONG>
--       <STRONG>int</STRONG> <STRONG>restartterm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>term</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fildes</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG><EM>errret</EM><STRONG>);</STRONG>
-+       <STRONG>int</STRONG> <STRONG>restartterm(char</STRONG> <STRONG>*</STRONG><EM>term</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fildes</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG><EM>errret</EM><STRONG>);</STRONG>
-        <STRONG>char</STRONG> <STRONG>*tparm(char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>...);</STRONG>
-        <STRONG>int</STRONG> <STRONG>tputs(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>affcnt</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>(*</STRONG><EM>putc</EM><STRONG>)(int));</STRONG>
-        <STRONG>int</STRONG> <STRONG>putp(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
-@@ -318,7 +318,7 @@
- </PRE>
- <H2>SEE ALSO</H2><PRE>
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>, <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>, <STRONG>curs_term-</STRONG>
--       <STRONG><A HREF="curs_termcap.3x.html">cap(3x)</A></STRONG>, <STRONG><A HREF="putc.3S.html">putc(3S)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
-+       <STRONG><A HREF="curs_termcap.3x.html">cap(3x)</A></STRONG>, <STRONG><A HREF="putc.3.html">putc(3)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
- 
- 
- 
-diff -Naur ncurses-5.6.orig/doc/html/man/curs_trace.3x.html ncurses-5.6/doc/html/man/curs_trace.3x.html
---- ncurses-5.6.orig/doc/html/man/curs_trace.3x.html	2005-05-15 13:05:56.000000000 -0400
-+++ ncurses-5.6/doc/html/man/curs_trace.3x.html	2008-06-18 06:49:44.000000000 -0400
-@@ -1,7 +1,7 @@
- <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
- <!-- 
-   ****************************************************************************
--  * Copyright (c) 2000-2002,2005 Free Software Foundation, Inc.              *
-+  * Copyright (c) 2000-2005,2007 Free Software Foundation, Inc.              *
-   *                                                                          *
-   * Permission is hereby granted, free of charge, to any person obtaining a  *
-   * copy of this software and associated documentation files (the            *
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_trace.3x,v 1.7 2005/05/15 17:02:54 tom Exp @
-+  * @Id: curs_trace.3x,v 1.8 2007/02/24 17:33:49 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -61,7 +61,7 @@
-        <STRONG>char</STRONG> <STRONG>*_traceattr(attr_t</STRONG> <STRONG>attr);</STRONG>
-        <STRONG>char</STRONG> <STRONG>*_traceattr2(int</STRONG> <STRONG>buffer,</STRONG> <STRONG>chtype</STRONG> <STRONG>ch);</STRONG>
-        <STRONG>char</STRONG> <STRONG>*_nc_tracebits(void);</STRONG>
--       <STRONG>char</STRONG> <STRONG>*_tracechar(const</STRONG> <STRONG>unsigned</STRONG> <STRONG>char</STRONG> <STRONG>ch);</STRONG>
-+       <STRONG>char</STRONG> <STRONG>*_tracechar(int);</STRONG>
-        <STRONG>char</STRONG> <STRONG>*_tracechtype(chtype</STRONG> <STRONG>ch);</STRONG>
-        <STRONG>char</STRONG> <STRONG>*_tracechtype2(int</STRONG> <STRONG>buffer,</STRONG> <STRONG>chtype</STRONG> <STRONG>ch);</STRONG>
-        <STRONG>char</STRONG> <STRONG>*_tracemouse(const</STRONG> <STRONG>MEVENT</STRONG> <STRONG>*event);</STRONG>
-diff -Naur ncurses-5.6.orig/doc/html/man/curs_util.3x.html ncurses-5.6/doc/html/man/curs_util.3x.html
---- ncurses-5.6.orig/doc/html/man/curs_util.3x.html	2006-09-23 16:43:09.000000000 -0400
-+++ ncurses-5.6/doc/html/man/curs_util.3x.html	2008-06-18 06:49:44.000000000 -0400
-@@ -1,7 +1,7 @@
- <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
- <!-- 
-   ****************************************************************************
--  * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+  * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-   *                                                                          *
-   * Permission is hereby granted, free of charge, to any person obtaining a  *
-   * copy of this software and associated documentation files (the            *
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: curs_util.3x,v 1.21 2006/08/26 14:17:48 tom Exp @
-+  * @Id: curs_util.3x,v 1.23 2007/02/24 15:59:07 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -57,7 +57,7 @@
-        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
- 
-        <STRONG>char</STRONG> <STRONG>*unctrl(chtype</STRONG> <STRONG>c);</STRONG>
--       <STRONG>char</STRONG> <STRONG>*wunctrl(cchar_t</STRONG> <STRONG>*c);</STRONG>
-+       <STRONG>wchar_t</STRONG> <STRONG>*wunctrl(cchar_t</STRONG> <STRONG>*c);</STRONG>
-        <STRONG>char</STRONG> <STRONG>*keyname(int</STRONG> <STRONG>c);</STRONG>
-        <STRONG>char</STRONG> <STRONG>*key_name(wchar_t</STRONG> <STRONG>w);</STRONG>
-        <STRONG>void</STRONG> <STRONG>filter(void);</STRONG>
-@@ -191,8 +191,8 @@
- 
- </PRE>
- <H2>SEE ALSO</H2><PRE>
--       <STRONG><A HREF="use_legacy_coding.3.html">use_legacy_coding(3)</A></STRONG>,    <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,
--       <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>, <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>.
-+       <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>, <STRONG>curs_ker-</STRONG>
-+       <STRONG><A HREF="curs_kernel.3x.html">nel(3x)</A></STRONG>, <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>.
- 
- 
- 
-diff -Naur ncurses-5.6.orig/doc/html/man/default_colors.3x.html ncurses-5.6/doc/html/man/default_colors.3x.html
---- ncurses-5.6.orig/doc/html/man/default_colors.3x.html	2006-09-23 16:43:09.000000000 -0400
-+++ ncurses-5.6/doc/html/man/default_colors.3x.html	2008-06-18 06:49:44.000000000 -0400
-@@ -28,7 +28,7 @@
-   * authorization.                                                           *
-   ****************************************************************************
-   * Author: Thomas E. Dickey 1997,1999,2000,2005
--  * @Id: default_colors.3x,v 1.19 2006/02/25 21:49:19 tom Exp @
-+  * @Id: default_colors.3x,v 1.20 2006/12/24 15:02:53 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -121,7 +121,7 @@
- 
- </PRE>
- <H2>NOTES</H2><PRE>
--       Associated with this extension, the <STRONG><A HREF="init_pair.3x.html">init_pair(3x)</A></STRONG> function
-+       Associated  with  this  extension,  the <STRONG>init_pair</STRONG> function
-        accepts negative arguments to specify  default  foreground
-        or background colors.
- 
-diff -Naur ncurses-5.6.orig/doc/html/man/form.3x.html ncurses-5.6/doc/html/man/form.3x.html
---- ncurses-5.6.orig/doc/html/man/form.3x.html	2006-12-16 17:51:33.000000000 -0500
-+++ ncurses-5.6/doc/html/man/form.3x.html	2008-06-18 06:49:44.000000000 -0400
-@@ -236,7 +236,7 @@
- 
- </PRE>
- <H2>SEE ALSO</H2><PRE>
--       This describes <STRONG>ncurses</STRONG> version 5.5 (patch 20061209).
-+       This describes <STRONG>ncurses</STRONG> version 5.6 (patch 20070303).
- 
- 
- 
-diff -Naur ncurses-5.6.orig/doc/html/man/form_field_new.3x.html ncurses-5.6/doc/html/man/form_field_new.3x.html
---- ncurses-5.6.orig/doc/html/man/form_field_new.3x.html	2006-12-16 17:51:35.000000000 -0500
-+++ ncurses-5.6/doc/html/man/form_field_new.3x.html	2008-06-18 06:49:44.000000000 -0400
-@@ -28,7 +28,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: form_field_new.3x,v 1.14 2006/11/04 17:12:00 tom Exp @
-+  * @Id: form_field_new.3x,v 1.15 2006/12/24 14:56:41 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -127,9 +127,9 @@
-        were not supported on Version 7 or BSD versions.
- 
-        It may be unwise to count on the set of attributes  copied
--       by  <STRONG><A HREF="dup_field.3x.html">dup_field(3x)</A></STRONG>  being  portable;  the  System  V  forms
--       library documents are not very explicit  about  what  gets
--       copied and what doesn't.
-+       by  <STRONG>dup_field</STRONG>  being  portable; the System V forms library
-+       documents are not very explicit about what gets copied and
-+       what doesn't.
- 
- 
- </PRE>
-diff -Naur ncurses-5.6.orig/doc/html/man/form_field_opts.3x.html ncurses-5.6/doc/html/man/form_field_opts.3x.html
---- ncurses-5.6.orig/doc/html/man/form_field_opts.3x.html	2006-12-16 17:51:36.000000000 -0500
-+++ ncurses-5.6/doc/html/man/form_field_opts.3x.html	2008-06-18 06:49:44.000000000 -0400
-@@ -2,7 +2,7 @@
- <!-- 
-   * t
-   ****************************************************************************
--  * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+  * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-   *                                                                          *
-   * Permission is hereby granted, free of charge, to any person obtaining a  *
-   * copy of this software and associated documentation files (the            *
-@@ -28,7 +28,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: form_field_opts.3x,v 1.12 2006/11/04 17:12:00 tom Exp @
-+  * @Id: form_field_opts.3x,v 1.13 2007/02/24 17:34:27 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -54,10 +54,10 @@
- </PRE>
- <H2>SYNOPSIS</H2><PRE>
-        <STRONG>#include</STRONG> <STRONG>&lt;form.h&gt;</STRONG>
--       int set_field_opts(FIELD *field, OPTIONS opts);
--       int field_opts_on(FIELD *field, OPTIONS opts);
--       int field_opts_off(FIELD *field, OPTIONS opts);
--       OPTIONS field_opts(const FIELD *field);
-+       int set_field_opts(FIELD *field, Field_Options opts);
-+       int field_opts_on(FIELD *field, Field_Options opts);
-+       int field_opts_off(FIELD *field, Field_Options opts);
-+       Field_Options field_opts(const FIELD *field);
- 
- 
- </PRE>
-diff -Naur ncurses-5.6.orig/doc/html/man/form_field_validation.3x.html ncurses-5.6/doc/html/man/form_field_validation.3x.html
---- ncurses-5.6.orig/doc/html/man/form_field_validation.3x.html	2006-12-16 17:51:36.000000000 -0500
-+++ ncurses-5.6/doc/html/man/form_field_validation.3x.html	2008-06-18 06:49:44.000000000 -0400
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: form_field_validation.3x,v 1.15 2006/11/04 17:14:19 tom Exp @
-+  * @Id: form_field_validation.3x,v 1.16 2006/12/24 16:08:08 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -124,16 +124,16 @@
-             Regular expression data.  Requires a regular  expres-
-             sion  <STRONG>(char</STRONG>  <STRONG>*)</STRONG>  third argument; the data is valid if
-             the regular expression matches it.   Regular  expres-
--            sions   are   in   the   format  of  <STRONG><A HREF="regcomp.3x.html">regcomp(3x)</A></STRONG>  and
--            <STRONG><A HREF="regexec.3x.html">regexec(3x)</A></STRONG>. Please notice that the  regular  expres-
--            sion  must  match  the  whole  field. If you have for
--            example an eight  character  wide  field,  a  regular
--            expression  "^[0-9]*$"  always means that you have to
--            fill all eight positions with digits. If you want  to
--            allow  fewer digits, you may use for example "^[0-9]*
--            *$" which is good for trailing spaces (up to an empty
--            field),  or  "^ *[0-9]* *$" which is good for leading
--            and trailing spaces around the digits.
-+            sions  are  in  the  format  of  <STRONG>regcomp</STRONG> and <STRONG>regexec</STRONG>.
-+            Please notice that the regular expression must  match
-+            the  whole  field.  If  you have for example an eight
-+            character wide field, a regular expression "^[0-9]*$"
-+            always  means  that  you have to fill all eight posi-
-+            tions with digits. If you want to allow fewer digits,
-+            you  may  use  for example "^[0-9]* *$" which is good
-+            for trailing spaces (up to an  empty  field),  or  "^
-+            *[0-9]*  *$"  which  is good for leading and trailing
-+            spaces around the digits.
- 
-        TYPE_IPV4
-             An Internet Protocol Version 4 address. This requires
-diff -Naur ncurses-5.6.orig/doc/html/man/form_hook.3x.html ncurses-5.6/doc/html/man/form_hook.3x.html
---- ncurses-5.6.orig/doc/html/man/form_hook.3x.html	2006-12-16 17:51:36.000000000 -0500
-+++ ncurses-5.6/doc/html/man/form_hook.3x.html	2008-06-18 06:49:44.000000000 -0400
-@@ -2,7 +2,7 @@
- <!-- 
-   * t
-   ****************************************************************************
--  * Copyright (c) 1998,2006 Free Software Foundation, Inc.                   *
-+  * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-   *                                                                          *
-   * Permission is hereby granted, free of charge, to any person obtaining a  *
-   * copy of this software and associated documentation files (the            *
-@@ -28,7 +28,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: form_hook.3x,v 1.8 2006/11/04 17:12:00 tom Exp @
-+  * @Id: form_hook.3x,v 1.9 2007/02/24 17:34:18 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -55,14 +55,14 @@
- </PRE>
- <H2>SYNOPSIS</H2><PRE>
-        <STRONG>#include</STRONG> <STRONG>&lt;form.h&gt;</STRONG>
--       int set_field_init(FORM *form, void (*func)(FORM *));
--       void (*)(FORM *) field_init(const FORM *form);
--       int set_field_term(FORM *form, void (*func)(FORM *));
--       void (*)(FORM *) field_term(const FORM *form);
--       int set_form_init(FORM *form, void (*func)(FORM *));
--       void (*)(FORM *) form_init(const FORM *form);
--       int set_form_term(FORM *form, void (*func)(FORM *));
--       void (*)(FORM *) form_term(const FORM *form);
-+       int set_field_init(FORM *form, Form_Hook func);
-+       Form_Hook field_init(const FORM *form);
-+       int set_field_term(FORM *form, Form_Hook func);
-+       Form_Hook field_term(const FORM *form);
-+       int set_form_init(FORM *form, Form_Hook func);
-+       Form_Hook form_init(const FORM *form);
-+       int set_form_term(FORM *form, Form_Hook func);
-+       Form_Hook form_term(const FORM *form);
- 
- 
- </PRE>
-diff -Naur ncurses-5.6.orig/doc/html/man/form_opts.3x.html ncurses-5.6/doc/html/man/form_opts.3x.html
---- ncurses-5.6.orig/doc/html/man/form_opts.3x.html	2006-12-16 17:51:37.000000000 -0500
-+++ ncurses-5.6/doc/html/man/form_opts.3x.html	2008-06-18 06:49:44.000000000 -0400
-@@ -2,7 +2,7 @@
- <!-- 
-   * t
-   ****************************************************************************
--  * Copyright (c) 1998,2006 Free Software Foundation, Inc.                   *
-+  * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-   *                                                                          *
-   * Permission is hereby granted, free of charge, to any person obtaining a  *
-   * copy of this software and associated documentation files (the            *
-@@ -28,7 +28,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: form_opts.3x,v 1.8 2006/11/04 17:12:00 tom Exp @
-+  * @Id: form_opts.3x,v 1.9 2007/02/24 17:34:36 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -54,10 +54,10 @@
- </PRE>
- <H2>SYNOPSIS</H2><PRE>
-        <STRONG>#include</STRONG> <STRONG>&lt;form.h&gt;</STRONG>
--       int set_form_opts(FORM *form, OPTIONS opts);
--       int form_opts_on(FORM *form, OPTIONS opts);
--       int form_opts_off(FORM *form, OPTIONS opts);
--       OPTIONS form_opts(const FORM *form);
-+       int set_form_opts(FORM *form, Field_Options opts);
-+       int form_opts_on(FORM *form, Field_Options opts);
-+       int form_opts_off(FORM *form, Field_Options opts);
-+       Field_Options form_opts(const FORM *form);
- 
- 
- </PRE>
-diff -Naur ncurses-5.6.orig/doc/html/man/index.html ncurses-5.6/doc/html/man/index.html
---- ncurses-5.6.orig/doc/html/man/index.html	2006-04-22 18:29:12.000000000 -0400
-+++ ncurses-5.6/doc/html/man/index.html	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
- <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN">
- <!--
--  $Id: index.html,v 1.2 2006/04/22 22:29:12 tom Exp $
-+  $Id: index.html,v 1.3 2006/12/24 23:05:35 tom Exp $
-   ****************************************************************************
-   * Copyright (c) 1998-2001,2006 Free Software Foundation, Inc.              *
-   *                                                                          *
-@@ -33,7 +33,6 @@
- <HEAD>
- <TITLE>NCURSES - Manual Pages</TITLE>
- <LINK REV=MADE HREF="mailto:dickey@invisible-island.net">
--<BASE HREF="http://invisible-island.net/ncurses/man/">
- </HEAD>
- <BODY>
- <HR>
-diff -Naur ncurses-5.6.orig/doc/html/man/infocmp.1m.html ncurses-5.6/doc/html/man/infocmp.1m.html
---- ncurses-5.6.orig/doc/html/man/infocmp.1m.html	2006-12-16 17:51:38.000000000 -0500
-+++ ncurses-5.6/doc/html/man/infocmp.1m.html	2008-06-18 06:49:44.000000000 -0400
-@@ -28,7 +28,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: infocmp.1m,v 1.43 2006/05/13 15:14:01 tom Exp @
-+  * @Id: infocmp.1m,v 1.44 2006/12/24 18:16:31 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -423,7 +423,7 @@
-        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,    <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,     <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,     <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
- 
--       This describes <STRONG>ncurses</STRONG> version 5.5 (patch 20061209).
-+       This describes <STRONG>ncurses</STRONG> version 5.6 (patch 20070303).
- 
- 
- </PRE>
-diff -Naur ncurses-5.6.orig/doc/html/man/infotocap.1m.html ncurses-5.6/doc/html/man/infotocap.1m.html
---- ncurses-5.6.orig/doc/html/man/infotocap.1m.html	2006-12-16 17:51:38.000000000 -0500
-+++ ncurses-5.6/doc/html/man/infotocap.1m.html	2008-06-18 06:49:44.000000000 -0400
-@@ -28,7 +28,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: infotocap.1m,v 1.6 2006/05/13 15:35:45 tom Exp @
-+  * @Id: infotocap.1m,v 1.8 2006/12/24 20:13:56 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -85,7 +85,7 @@
- 
- </PRE>
- <H2>NOTES</H2><PRE>
--       This utility is actually a link to <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, running in  <EM>-C</EM>
-+       This utility is actually a link  to  <EM>tic</EM>,  running  in  <EM>-C</EM>
-        mode.  You can use other <EM>tic</EM> options such as <STRONG>-f</STRONG> and  <STRONG>-x</STRONG>.
- 
- 
-@@ -93,7 +93,7 @@
- <H2>SEE ALSO</H2><PRE>
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
- 
--       This describes <STRONG>ncurses</STRONG> version 5.5 (patch 20061209).
-+       This describes <STRONG>ncurses</STRONG> version 5.6 (patch 20070303).
- 
- 
- 
-diff -Naur ncurses-5.6.orig/doc/html/man/legacy_coding.3x.html ncurses-5.6/doc/html/man/legacy_coding.3x.html
---- ncurses-5.6.orig/doc/html/man/legacy_coding.3x.html	2006-09-23 16:43:15.000000000 -0400
-+++ ncurses-5.6/doc/html/man/legacy_coding.3x.html	2008-06-18 06:49:44.000000000 -0400
-@@ -28,7 +28,7 @@
-   * authorization.                                                           *
-   ****************************************************************************
-   * Author: Thomas E. Dickey
--  * @Id: legacy_coding.3x,v 1.2 2006/02/25 21:50:01 tom Exp @
-+  * @Id: legacy_coding.3x,v 1.3 2006/12/24 15:12:55 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -70,21 +70,20 @@
-        The <EM>level</EM> parameter controls the result:
- 
-               0    the library functions normally, rendering non-
--                   printing   characters  as  described  in  <STRONG>unc-</STRONG>
--                   <STRONG><A HREF="unctrl.3x.html">trl(3x)</A></STRONG>.
-+                   printing characters as described in <STRONG>unctrl</STRONG>.
- 
--              1    the library ignores <STRONG>isprintf</STRONG> for codes in  the
-+              1    the  library ignores <STRONG>isprintf</STRONG> for codes in the
-                    range 160-255.
- 
--              2    the  library ignores <STRONG>isprintf</STRONG> for codes in the
-+              2    the library ignores <STRONG>isprintf</STRONG> for codes in  the
-                    range 128-255.  It also modifies the output of
--                   <STRONG>unctrl</STRONG>,  showing codes in the range 128-159 as
-+                   <STRONG>unctrl</STRONG>, showing codes in the range 128-159  as
-                    is.
- 
- 
- </PRE>
- <H2>RETURN VALUE</H2><PRE>
--       If the screen has  not  been  initialized,  or  the  <EM>level</EM>
-+       If  the  screen  has  not  been  initialized, or the <EM>level</EM>
-        parameter is out of range, the function returns <STRONG>ERR</STRONG>.  Oth-
-        erwise, it returns the previous level: <STRONG>0</STRONG>, <STRONG>1</STRONG> or <STRONG>2</STRONG>.
- 
-@@ -93,7 +92,7 @@
- <H2>PORTABILITY</H2><PRE>
-        This routine is specific to ncurses.  It was not supported
-        on Version 7, BSD or System V implementations.  It is rec-
--       ommended that any code depending on ncurses extensions  be
-+       ommended  that any code depending on ncurses extensions be
-        conditioned using NCURSES_VERSION.
- 
- 
-@@ -104,7 +103,7 @@
- 
- </PRE>
- <H2>AUTHOR</H2><PRE>
--       Thomas  Dickey (to support lynx's font-switching feature).
-+       Thomas Dickey (to support lynx's font-switching  feature).
- 
- 
- 
-diff -Naur ncurses-5.6.orig/doc/html/man/menu.3x.html ncurses-5.6/doc/html/man/menu.3x.html
---- ncurses-5.6.orig/doc/html/man/menu.3x.html	2006-12-16 17:51:40.000000000 -0500
-+++ ncurses-5.6/doc/html/man/menu.3x.html	2008-06-18 06:49:44.000000000 -0400
-@@ -226,7 +226,7 @@
- 
- </PRE>
- <H2>SEE ALSO</H2><PRE>
--       This describes <STRONG>ncurses</STRONG> version 5.5 (patch 20061209).
-+       This describes <STRONG>ncurses</STRONG> version 5.6 (patch 20070303).
- 
- 
- 
-diff -Naur ncurses-5.6.orig/doc/html/man/menu_hook.3x.html ncurses-5.6/doc/html/man/menu_hook.3x.html
---- ncurses-5.6.orig/doc/html/man/menu_hook.3x.html	2006-12-16 17:51:41.000000000 -0500
-+++ ncurses-5.6/doc/html/man/menu_hook.3x.html	2008-06-18 06:49:44.000000000 -0400
-@@ -2,7 +2,7 @@
- <!-- 
-   * t
-   ****************************************************************************
--  * Copyright (c) 1998,2006 Free Software Foundation, Inc.                   *
-+  * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-   *                                                                          *
-   * Permission is hereby granted, free of charge, to any person obtaining a  *
-   * copy of this software and associated documentation files (the            *
-@@ -28,7 +28,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: menu_hook.3x,v 1.8 2006/11/04 17:12:00 tom Exp @
-+  * @Id: menu_hook.3x,v 1.9 2007/02/24 17:34:08 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -55,14 +55,14 @@
- </PRE>
- <H2>SYNOPSIS</H2><PRE>
-        <STRONG>#include</STRONG> <STRONG>&lt;menu.h&gt;</STRONG>
--       int set_item_init(MENU *menu, void (*func)(MENU *));
--       void (*)(MENU *) item_init(const MENU *menu);
--       int set_item_term(MENU *menu, void (*func)(MENU *));
--       void (*)(MENU *) item_term(const MENU *menu);
--       int set_menu_init(MENU *menu, void (*func)(MENU *));
--       void (*)(MENU *) menu_init(const MENU *menu);
--       int set_menu_term(MENU *menu, void (*func)(MENU *));
--       void (*)(MENU *) menu_term(const MENU *menu);
-+       int set_item_init(MENU *menu, Menu_Hook func);
-+       Menu_Hook item_init(const MENU *menu);
-+       int set_item_term(MENU *menu, Menu_Hook func);
-+       Menu_Hook item_term(const MENU *menu);
-+       int set_menu_init(MENU *menu, Menu_Hook func);
-+       Menu_Hook menu_init(const MENU *menu);
-+       int set_menu_term(MENU *menu, Menu_Hook func);
-+       Menu_Hook menu_term(const MENU *menu);
- 
- 
- </PRE>
-diff -Naur ncurses-5.6.orig/doc/html/man/menu_opts.3x.html ncurses-5.6/doc/html/man/menu_opts.3x.html
---- ncurses-5.6.orig/doc/html/man/menu_opts.3x.html	2006-12-16 17:51:42.000000000 -0500
-+++ ncurses-5.6/doc/html/man/menu_opts.3x.html	2008-06-18 06:49:44.000000000 -0400
-@@ -2,7 +2,7 @@
- <!-- 
-   * t
-   ****************************************************************************
--  * Copyright (c) 1998,2006 Free Software Foundation, Inc.                   *
-+  * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-   *                                                                          *
-   * Permission is hereby granted, free of charge, to any person obtaining a  *
-   * copy of this software and associated documentation files (the            *
-@@ -28,7 +28,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: menu_opts.3x,v 1.9 2006/11/04 17:12:00 tom Exp @
-+  * @Id: menu_opts.3x,v 1.10 2007/02/24 17:33:59 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -54,10 +54,10 @@
- </PRE>
- <H2>SYNOPSIS</H2><PRE>
-        <STRONG>#include</STRONG> <STRONG>&lt;menu.h&gt;</STRONG>
--       int set_menu_opts(MENU *menu, OPTIONS opts);
--       int menu_opts_on(MENU *menu, OPTIONS opts);
--       int menu_opts_off(MENU *menu, OPTIONS opts);
--       OPTIONS menu_opts(const MENU *menu);
-+       int set_menu_opts(MENU *menu, Menu_Options opts);
-+       int menu_opts_on(MENU *menu, Menu_Options opts);
-+       int menu_opts_off(MENU *menu, Menu_Options opts);
-+       Menu_Options menu_opts(const MENU *menu);
- 
- 
- </PRE>
-diff -Naur ncurses-5.6.orig/doc/html/man/mitem_opts.3x.html ncurses-5.6/doc/html/man/mitem_opts.3x.html
---- ncurses-5.6.orig/doc/html/man/mitem_opts.3x.html	2006-12-16 17:51:44.000000000 -0500
-+++ ncurses-5.6/doc/html/man/mitem_opts.3x.html	2008-06-18 06:49:44.000000000 -0400
-@@ -2,7 +2,7 @@
- <!-- 
-   * t
-   ****************************************************************************
--  * Copyright (c) 1998,2006 Free Software Foundation, Inc.                   *
-+  * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-   *                                                                          *
-   * Permission is hereby granted, free of charge, to any person obtaining a  *
-   * copy of this software and associated documentation files (the            *
-@@ -28,7 +28,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: mitem_opts.3x,v 1.8 2006/11/04 17:12:00 tom Exp @
-+  * @Id: mitem_opts.3x,v 1.9 2007/02/24 17:33:32 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -54,10 +54,10 @@
- </PRE>
- <H2>SYNOPSIS</H2><PRE>
-        <STRONG>#include</STRONG> <STRONG>&lt;menu.h&gt;</STRONG>
--       int set_item_opts(ITEM *item, OPTIONS opts);
--       int item_opts_on(ITEM *item, OPTIONS opts);
--       int item_opts_off(ITEM *item, OPTIONS opts);
--       OPTIONS item_opts(const ITEM *item);
-+       int set_item_opts(ITEM *item, Item_Options opts);
-+       int item_opts_on(ITEM *item, Item_Options opts);
-+       int item_opts_off(ITEM *item, Item_Options opts);
-+       Item_Options item_opts(const ITEM *item);
- 
- 
- </PRE>
-diff -Naur ncurses-5.6.orig/doc/html/man/ncurses.3x.html ncurses-5.6/doc/html/man/ncurses.3x.html
---- ncurses-5.6.orig/doc/html/man/ncurses.3x.html	2006-12-16 17:51:45.000000000 -0500
-+++ ncurses-5.6/doc/html/man/ncurses.3x.html	2008-06-18 06:49:44.000000000 -0400
-@@ -28,7 +28,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: ncurses.3x,v 1.81 2006/12/02 19:23:11 tom Exp @
-+  * @Id: ncurses.3x,v 1.82 2006/12/24 14:44:05 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -63,7 +63,7 @@
-        sonable   optimization.    This  implementation  is  ``new
-        curses'' (ncurses) and is  the  approved  replacement  for
-        4.4BSD  classic curses, which has been discontinued.  This
--       describes <STRONG>ncurses</STRONG> version 5.5 (patch 20061209).
-+       describes <STRONG>ncurses</STRONG> version 5.6 (patch 20070303).
- 
-        The <STRONG>ncurses</STRONG> routines emulate  the  <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>  library  of
-        System V Release 4 UNIX, and the XPG4 curses standard (XSI
-@@ -774,9 +774,9 @@
-        NCURSES_ASSUMED_COLORS
-             Override  the  compiled-in assumption that the termi-
-             nal's  default   colors   are   white-on-black   (see
--            <STRONG><A HREF="assume_default_colors.3x.html">assume_default_colors(3x)</A></STRONG>).   You  may  set the fore-
--            ground and background color values with this environ-
--            ment   variable   by   proving   a   2-element  list:
-+            <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>).   You may set the foreground and
-+            background color values with this  environment  vari-
-+            able     by     proving     a     2-element     list:
-             foreground,background.  For example, to tell  ncurses
-             to  not assume anything about the colors, set this to
-             "-1,-1".  To make it green-on-black, set it to "2,0".
-diff -Naur ncurses-5.6.orig/doc/html/man/panel.3x.html ncurses-5.6/doc/html/man/panel.3x.html
---- ncurses-5.6.orig/doc/html/man/panel.3x.html	2006-12-16 17:51:45.000000000 -0500
-+++ ncurses-5.6/doc/html/man/panel.3x.html	2008-06-18 06:49:44.000000000 -0400
-@@ -213,7 +213,7 @@
- <H2>SEE ALSO</H2><PRE>
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
- 
--       This describes <STRONG>ncurses</STRONG> version 5.5 (patch 20061209).
-+       This describes <STRONG>ncurses</STRONG> version 5.6 (patch 20070303).
- 
- 
- </PRE>
-diff -Naur ncurses-5.6.orig/doc/html/man/term.5.html ncurses-5.6/doc/html/man/term.5.html
---- ncurses-5.6.orig/doc/html/man/term.5.html	2006-12-16 17:51:45.000000000 -0500
-+++ ncurses-5.6/doc/html/man/term.5.html	2008-06-18 06:49:44.000000000 -0400
-@@ -27,20 +27,20 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: term.5,v 1.17 2006/12/03 01:08:16 tom Exp @
-+  * @Id: term.5,v 1.19 2006/12/24 18:12:38 tom Exp @
- -->
- <HTML>
- <HEAD>
--<TITLE>TERM 5</TITLE>
-+<TITLE>term 5</TITLE>
- <link rev=made href="mailto:bug-ncurses@gnu.org">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- </HEAD>
- <BODY>
--<H1>TERM 5</H1>
-+<H1>term 5</H1>
- <HR>
- <PRE>
- <!-- Manpage converted by man2html 3.0.1 -->
--<STRONG><A HREF="TERM.5.html">TERM(5)</A></STRONG>                                                         <STRONG><A HREF="TERM.5.html">TERM(5)</A></STRONG>
-+<STRONG><A HREF="term.5.html">term(5)</A></STRONG>                                                         <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
- 
- 
- 
-@@ -95,7 +95,7 @@
-        assumptions about byte  ordering  or  sign  extension  are
-        made.
- 
--       The  compiled  file  is  created with the <EM>tic</EM> program, and
-+       The  compiled  file  is  created with the <STRONG>tic</STRONG> program, and
-        read by the routine <EM>setupterm</EM>.  The file is  divided  into
-        six parts: the header, terminal names, boolean flags, num-
-        bers, strings, and string table.
-@@ -297,7 +297,7 @@
- 
- 
- 
--                                                                <STRONG><A HREF="TERM.5.html">TERM(5)</A></STRONG>
-+                                                                <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
- </PRE>
- <HR>
- <ADDRESS>
-diff -Naur ncurses-5.6.orig/doc/html/man/term.7.html ncurses-5.6/doc/html/man/term.7.html
---- ncurses-5.6.orig/doc/html/man/term.7.html	2006-09-23 16:43:22.000000000 -0400
-+++ ncurses-5.6/doc/html/man/term.7.html	2008-06-18 06:49:44.000000000 -0400
-@@ -27,20 +27,20 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: term.7,v 1.15 2006/02/25 21:47:06 tom Exp @
-+  * @Id: term.7,v 1.17 2006/12/24 18:14:09 tom Exp @
- -->
- <HTML>
- <HEAD>
--<TITLE>TERM 7</TITLE>
-+<TITLE>term 7</TITLE>
- <link rev=made href="mailto:bug-ncurses@gnu.org">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- </HEAD>
- <BODY>
--<H1>TERM 7</H1>
-+<H1>term 7</H1>
- <HR>
- <PRE>
- <!-- Manpage converted by man2html 3.0.1 -->
--<STRONG><A HREF="TERM.7.html">TERM(7)</A></STRONG>                                                         <STRONG><A HREF="TERM.7.html">TERM(7)</A></STRONG>
-+<STRONG><A HREF="term.7.html">term(7)</A></STRONG>                                                         <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
- 
- 
- 
-@@ -98,7 +98,7 @@
-        from your shell.  These capability files are in  a  binary
-        format optimized for retrieval speed (unlike the old text-
-        based <STRONG>termcap</STRONG> format they replace); to examine  an  entry,
--       you  must  use  the <STRONG><A HREF="infocmp.1.html">infocmp(1)</A></STRONG> command.  Invoke it as fol-
-+       you  must  use the <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG> command.  Invoke it as fol-
-        lows:
- 
-             infocmp <EM>entry-name</EM>
-@@ -240,7 +240,7 @@
- 
- 
- 
--                                                                <STRONG><A HREF="TERM.7.html">TERM(7)</A></STRONG>
-+                                                                <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
- </PRE>
- <HR>
- <ADDRESS>
-diff -Naur ncurses-5.6.orig/doc/html/man/terminfo.5.html ncurses-5.6/doc/html/man/terminfo.5.html
---- ncurses-5.6.orig/doc/html/man/terminfo.5.html	2006-12-16 17:51:46.000000000 -0500
-+++ ncurses-5.6/doc/html/man/terminfo.5.html	2008-06-18 06:49:44.000000000 -0400
-@@ -32,9 +32,9 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: terminfo.head,v 1.13 2006/05/13 15:35:45 tom Exp @
-+  * @Id: terminfo.head,v 1.15 2006/12/24 18:04:42 tom Exp @
-   * Head of terminfo man page ends here
--  * @Id: terminfo.tail,v 1.44 2006/04/01 22:47:01 tom Exp @
-+  * @Id: terminfo.tail,v 1.47 2006/12/24 18:14:22 tom Exp @
-   * Beginning of terminfo.tail file
-   * This file is part of ncurses.
-   * See "terminfo.head" for copyright.
-@@ -46,16 +46,16 @@
- -->
- <HTML>
- <HEAD>
--<TITLE>TERMINFO 5   File Formats</TITLE>
-+<TITLE>terminfo 5   File Formats</TITLE>
- <link rev=made href="mailto:bug-ncurses@gnu.org">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- </HEAD>
- <BODY>
--<H1>TERMINFO 5   File Formats</H1>
-+<H1>terminfo 5   File Formats</H1>
- <HR>
- <PRE>
- <!-- Manpage converted by man2html 3.0.1 -->
--<STRONG><A HREF="TERMINFO.5.html">TERMINFO(5)</A></STRONG>                   File Formats                  <STRONG><A HREF="TERMINFO.5.html">TERMINFO(5)</A></STRONG>
-+<STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>                   File Formats                  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
- 
- 
- 
-@@ -78,7 +78,7 @@
-        nals by giving a set of capabilities which they  have,  by
-        specifying how to perform screen operations, and by speci-
-        fying padding requirements and  initialization  sequences.
--       This describes <STRONG>ncurses</STRONG> version 5.5 (patch 20061209).
-+       This describes <STRONG>ncurses</STRONG> version 5.6 (patch 20070303).
- 
-        Entries in <EM>terminfo</EM> consist of a sequence of `,' separated
-        fields (embedded commas may be escaped with a backslash or
-@@ -95,13 +95,13 @@
- 
-        Lines beginning with a `#' in the first column are treated
-        as  comments.  While comment lines are legal at any point,
--       the output of <EM>captoinfo</EM> and <EM>infotocap</EM>  (aliases  for  <EM>tic</EM>)
-+       the output of <STRONG>captoinfo</STRONG> and <STRONG>infotocap</STRONG>  (aliases  for  <STRONG>tic</STRONG>)
-        will move comments so they occur only between entries.
- 
-        Newlines  and  leading  tabs  may  be  used for formatting
-        entries for readability.  These are  removed  from  parsed
--       entries.   The  <EM>infocmp</EM> <EM>-f</EM> option relies on this to format
--       if-then-else expressions: the result can be read by <EM>tic</EM>.
-+       entries.   The  <STRONG>infocmp</STRONG> <STRONG>-f</STRONG> option relies on this to format
-+       if-then-else expressions: the result can be read by <STRONG>tic</STRONG>.
- 
-        Terminal names (except for the last, verbose entry) should
-        be chosen using the following conventions.  The particular
-@@ -1234,7 +1234,7 @@
-    <STRONG>Parameterized</STRONG> <STRONG>Strings</STRONG>
-        Cursor addressing and other strings  requiring  parameters
-        in  the  terminal  are described by a parameterized string
--       capability, with <STRONG><A HREF="printf.3S.html">printf(3S)</A></STRONG> like escapes <STRONG>%x</STRONG>  in  it.   For
-+       capability, with <STRONG><A HREF="printf.3.html">printf(3)</A></STRONG> like escapes  <STRONG>%x</STRONG>  in  it.   For
-        example,  to  address  the  cursor,  the <STRONG>cup</STRONG> capability is
-        given, using two parameters: the row and column to address
-        to.  (Rows and columns are numbered from zero and refer to
-@@ -2269,7 +2269,7 @@
-        termcap entry.
- 
-        When in -C (translate to termcap) mode, the <STRONG>ncurses</STRONG> imple-
--       mentation  of <STRONG><A HREF="tic.1.html">tic(1)</A></STRONG> issues warning messages when the pre-
-+       mentation of <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG> issues warning messages when the pre-
-        tc length of a termcap translation is too  long.   The  -c
-        (check)  option  also checks resolved (after tc expansion)
-        lengths.
-@@ -2351,7 +2351,7 @@
- 
- </PRE>
- <H2>SEE ALSO</H2><PRE>
--       <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="printf.3S.html">printf(3S)</A></STRONG>, <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.
-+       <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="printf.3.html">printf(3)</A></STRONG>, <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.
- 
- 
- </PRE>
-@@ -2361,7 +2361,7 @@
- 
- 
- 
--                                                            <STRONG><A HREF="TERMINFO.5.html">TERMINFO(5)</A></STRONG>
-+                                                            <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
- </PRE>
- <HR>
- <ADDRESS>
-diff -Naur ncurses-5.6.orig/doc/html/man/tic.1m.html ncurses-5.6/doc/html/man/tic.1m.html
---- ncurses-5.6.orig/doc/html/man/tic.1m.html	2006-12-16 17:51:46.000000000 -0500
-+++ ncurses-5.6/doc/html/man/tic.1m.html	2008-06-18 06:49:44.000000000 -0400
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: tic.1m,v 1.43 2006/05/13 15:14:01 tom Exp @
-+  * @Id: tic.1m,v 1.44 2006/12/24 17:59:11 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -309,7 +309,7 @@
-        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,    <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
- 
--       This describes <STRONG>ncurses</STRONG> version 5.5 (patch 20061209).
-+       This describes <STRONG>ncurses</STRONG> version 5.6 (patch 20070303).
- 
- 
- 
-diff -Naur ncurses-5.6.orig/doc/html/man/toe.1m.html ncurses-5.6/doc/html/man/toe.1m.html
---- ncurses-5.6.orig/doc/html/man/toe.1m.html	2006-12-16 17:51:47.000000000 -0500
-+++ ncurses-5.6/doc/html/man/toe.1m.html	2008-06-18 06:49:44.000000000 -0400
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: toe.1m,v 1.18 2006/05/13 15:14:01 tom Exp @
-+  * @Id: toe.1m,v 1.20 2006/12/24 17:20:37 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -92,7 +92,7 @@
-        <STRONG>-v</STRONG><EM>n</EM>    specifies that (verbose) output be written to stan-
-               dard error, showing <STRONG>toe</STRONG>'s progress.   The  optional
-               parameter  <EM>n</EM>  is a number from 1 to 10, interpreted
--              as for <STRONG><A HREF="tic.1.html">tic(1)</A></STRONG>.
-+              as for <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>.
- 
-        <STRONG>-V</STRONG>     reports the version of ncurses which  was  used  in
-               this program, and exits.
-@@ -109,7 +109,7 @@
-        <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,    <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,
-        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
- 
--       This describes <STRONG>ncurses</STRONG> version 5.5 (patch 20061209).
-+       This describes <STRONG>ncurses</STRONG> version 5.6 (patch 20070303).
- 
- 
- 
-diff -Naur ncurses-5.6.orig/doc/html/man/tput.1.html ncurses-5.6/doc/html/man/tput.1.html
---- ncurses-5.6.orig/doc/html/man/tput.1.html	2006-12-16 17:51:47.000000000 -0500
-+++ ncurses-5.6/doc/html/man/tput.1.html	2008-06-18 06:49:44.000000000 -0400
-@@ -28,7 +28,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: tput.1,v 1.25 2006/05/13 15:14:01 tom Exp @
-+  * @Id: tput.1,v 1.27 2006/12/24 18:11:31 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -89,7 +89,7 @@
-        application  should  test  the  exit  code  (e.g., <STRONG>$?</STRONG>, see
-        <STRONG><A HREF="sh.1.html">sh(1)</A></STRONG>) to be sure it is <STRONG>0</STRONG>.  (See the <STRONG>EXIT</STRONG> <STRONG>CODES</STRONG> and  <STRONG>DIAG-</STRONG>
-        <STRONG>NOSTICS</STRONG>  sections.)   For  a complete list of capabilities
--       and the <EM>capname</EM> associated with each, see <STRONG><A HREF="terminfo.1.html">terminfo(1)</A></STRONG>.
-+       and the <EM>capname</EM> associated with each, see <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
- 
-        <STRONG>-T</STRONG><EM>type</EM> indicates the  <EM>type</EM>  of  terminal.   Normally  this
-               option is unnecessary, because the default is taken
-@@ -298,7 +298,7 @@
-        exit code   error message
-        ---------------------------------------------------------------------
-        <STRONG>0</STRONG>           (<EM>capname</EM> is a numeric variable that is not specified  in
--                   the  <STRONG><A HREF="terminfo.1.html">terminfo(1)</A></STRONG>  database  for this terminal type, e.g.
-+                   the  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>  database  for this terminal type, e.g.
-                    <STRONG>tput</STRONG> <STRONG>-T450</STRONG> <STRONG>lines</STRONG> and <STRONG>tput</STRONG> <STRONG>-T2621</STRONG> <STRONG>xmc</STRONG>)
-        <STRONG>1</STRONG>           no error message is printed, see the <STRONG>EXIT</STRONG> <STRONG>CODES</STRONG> section.
-        <STRONG>2</STRONG>           usage error
-@@ -328,7 +328,7 @@
- <H2>SEE ALSO</H2><PRE>
-        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG><A HREF="stty.1.html">stty(1)</A></STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
- 
--       This describes <STRONG>ncurses</STRONG> version 5.5 (patch 20061209).
-+       This describes <STRONG>ncurses</STRONG> version 5.6 (patch 20070303).
- 
- 
- 
-diff -Naur ncurses-5.6.orig/doc/html/man/tset.1.html ncurses-5.6/doc/html/man/tset.1.html
---- ncurses-5.6.orig/doc/html/man/tset.1.html	2006-12-16 17:51:47.000000000 -0500
-+++ ncurses-5.6/doc/html/man/tset.1.html	2008-06-18 06:49:44.000000000 -0400
-@@ -27,7 +27,7 @@
-   * sale, use or other dealings in this Software without prior written       *
-   * authorization.                                                           *
-   ****************************************************************************
--  * @Id: tset.1,v 1.18 2006/07/29 11:34:07 tom Exp @
-+  * @Id: tset.1,v 1.19 2006/12/24 15:00:30 tom Exp @
- -->
- <HTML>
- <HEAD>
-@@ -315,10 +315,10 @@
- 
- </PRE>
- <H2>SEE ALSO</H2><PRE>
--       <STRONG><A HREF="csh.1.html">csh(1)</A></STRONG>,  <STRONG><A HREF="sh.1.html">sh(1)</A></STRONG>,  <STRONG><A HREF="stty.1.html">stty(1)</A></STRONG>,  <STRONG><A HREF="setupterm.3x.html">setupterm(3x)</A></STRONG>,   <STRONG><A HREF="tty.4.html">tty(4)</A></STRONG>,   ter-
-+       <STRONG><A HREF="csh.1.html">csh(1)</A></STRONG>, <STRONG><A HREF="sh.1.html">sh(1)</A></STRONG>, <STRONG><A HREF="stty.1.html">stty(1)</A></STRONG>,  <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,  <STRONG><A HREF="tty.4.html">tty(4)</A></STRONG>,  ter-
-        <STRONG><A HREF="minfo.5.html">minfo(5)</A></STRONG>, <STRONG><A HREF="ttys.5.html">ttys(5)</A></STRONG>, <STRONG><A HREF="environ.7.html">environ(7)</A></STRONG>
- 
--       This describes <STRONG>ncurses</STRONG> version 5.5 (patch 20061209).
-+       This describes <STRONG>ncurses</STRONG> version 5.6 (patch 20070303).
- 
- 
- 
-diff -Naur ncurses-5.6.orig/doc/html/ncurses-intro.html ncurses-5.6/doc/html/ncurses-intro.html
---- ncurses-5.6.orig/doc/html/ncurses-intro.html	2005-12-24 10:47:05.000000000 -0500
-+++ ncurses-5.6/doc/html/ncurses-intro.html	2008-06-18 06:49:44.000000000 -0400
-@@ -1,8 +1,8 @@
- <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN">
- <!--
--  $Id: ncurses-intro.html,v 1.41 2005/12/24 15:47:05 tom Exp $
-+  $Id: ncurses-intro.html,v 1.43 2007/03/03 19:31:50 tom Exp $
-   ****************************************************************************
--  * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
-+  * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-   *                                                                          *
-   * Permission is hereby granted, free of charge, to any person obtaining a  *
-   * copy of this software and associated documentation files (the            *
-@@ -914,15 +914,14 @@
- 
- <H3><A NAME="xterm">Using NCURSES under XTERM</A></H3>
- 
--A resize operation in X sends SIGWINCH to the application running under xterm.
--The <CODE>ncurses</CODE> library provides an experimental signal
--handler, but in general does not catch this signal, because it cannot
--know how you want the screen re-painted.  You will usually have to write the
--SIGWINCH handler yourself.  Ncurses can give you some help. <P>
--
--The easiest way to code your SIGWINCH handler is to have it do an
--<CODE>endwin</CODE>, followed by an <CODE>refresh</CODE> and a screen repaint you code
--yourself.  The <CODE>refresh</CODE> will pick up the new screen size from the
-+A resize operation in X sends <CODE>SIGWINCH</CODE> to the application running
-+under xterm.
-+
-+The easiest way to handle <CODE>SIGWINCH</CODE>
-+is to do an <CODE>endwin</CODE>,
-+followed by an <CODE>refresh</CODE> and a screen repaint you code
-+yourself.
-+The <CODE>refresh</CODE> will pick up the new screen size from the
- xterm's environment. <P>
- 
- That is the standard way, of course (it even works with some vendor's curses
-@@ -934,8 +933,17 @@
- are limited to the new screen dimensions, and pads <CODE>stdscr</CODE>
- with blanks if the screen is larger. <P>
- 
--Finally, ncurses can be configured to provide its own SIGWINCH handler,
--based on <CODE>resizeterm</CODE>.
-+The <CODE>ncurses</CODE> library provides a SIGWINCH signal handler,
-+which pushes a <CODE>KEY_RESIZE</CODE> via the wgetch() calls.
-+When <CODE>ncurses</CODE> returns that code,
-+it calls <code>resizeterm</CODE>
-+to update the size of the standard screen's window, repainting that
-+(filling with blanks or truncating as needed).
-+It also resizes other windows,
-+but its effect may be less satisfactory because it cannot
-+know how you want the screen re-painted.
-+You will usually have to write special-purpose code to handle
-+<CODE>KEY_RESIZE</CODE> yourself.
- 
- <H3><A NAME="screens">Handling Multiple Terminal Screens</A></H3>
- 
-@@ -2184,7 +2192,7 @@
- from the last page goes to the first, and <CODE>REQ_PREV_PAGE</CODE> from
- the first page goes to the last.
- 
--<H3><A NAME="#ffield">Inter-Field Navigation Requests</A></H3>
-+<H3><A NAME="ffield">Inter-Field Navigation Requests</A></H3>
- 
- These requests handle navigation between fields on the same page.
- 
-@@ -2238,7 +2246,7 @@
- go to B only if A, B, and C <EM>all</EM> share the same first line;
- otherwise it will skip over B to C.
- 
--<H3><A NAME="#fifield">Intra-Field Navigation Requests</A></H3>
-+<H3><A NAME="fifield">Intra-Field Navigation Requests</A></H3>
- 
- These requests drive movement of the edit cursor within the currently
- selected field.
-diff -Naur ncurses-5.6.orig/doc/ncurses-intro.doc ncurses-5.6/doc/ncurses-intro.doc
---- ncurses-5.6.orig/doc/ncurses-intro.doc	2005-12-24 10:48:44.000000000 -0500
-+++ ncurses-5.6/doc/ncurses-intro.doc	2008-06-18 06:49:44.000000000 -0400
-@@ -174,7 +174,7 @@
-    The  ncurses  package  was  originated  by  Pavel Curtis. The original
-    maintainer  of  this  package is Zeyd Ben-Halim <zmbenhal@netcom.com>.
-    Eric S. Raymond <esr@snark.thyrsus.com> wrote many of the new features
--   in  versions  after  1.8.1 and wrote most of this introduction. Jürgen
-+   in  versions  after 1.8.1 and wrote most of this introduction. Juergen
-    Pfeifer  wrote  all  of  the  menu and forms code as well as the Ada95
-    binding.  Ongoing  work  is  being done by Thomas Dickey (maintainer).
-    Contact the current maintainers at bug-ncurses@gnu.org.
-@@ -798,15 +798,9 @@
-   Using NCURSES under XTERM
- 
-    A  resize  operation  in  X  sends SIGWINCH to the application running
--   under  xterm.  The  ncurses  library  provides  an experimental signal
--   handler,  but in general does not catch this signal, because it cannot
--   know  how  you  want  the  screen re-painted. You will usually have to
--   write the SIGWINCH handler yourself. Ncurses can give you some help.
--
--   The  easiest  way  to  code  your SIGWINCH handler is to have it do an
--   endwin, followed by an refresh and a screen repaint you code yourself.
--   The  refresh  will  pick  up  the  new  screen  size  from the xterm's
--   environment.
-+   under  xterm.  The  easiest way to handle SIGWINCH is to do an endwin,
-+   followed  by  an  refresh  and a screen repaint you code yourself. The
-+   refresh will pick up the new screen size from the xterm's environment.
- 
-    That  is the standard way, of course (it even works with some vendor's
-    curses  implementations). Its drawback is that it clears the screen to
-@@ -816,8 +810,13 @@
-    limited  to  the new screen dimensions, and pads stdscr with blanks if
-    the screen is larger.
- 
--   Finally,  ncurses  can  be  configured  to  provide  its  own SIGWINCH
--   handler, based on resizeterm.
-+   The ncurses library provides a SIGWINCH signal handler, which pushes a
-+   KEY_RESIZE  via the wgetch() calls. When ncurses returns that code, it
-+   calls  resizeterm  to update the size of the standard screen's window,
-+   repainting that (filling with blanks or truncating as needed). It also
-+   resizes other windows, but its effect may be less satisfactory because
-+   it  cannot  know  how you want the screen re-painted. You will usually
-+   have to write special-purpose code to handle KEY_RESIZE yourself.
- 
-   Handling Multiple Terminal Screens
- 
-@@ -889,11 +888,11 @@
-    To  understand why this is a problem, remember that screen updates are
-    calculated  between  two  representations  of  the entire display. The
-    documentation  says that when you refresh a window, it is first copied
--   to  the  virtual screen,  and  then  changes  are calculated to update
--   the  physical screen (and applied to the terminal). But "copied to" is
--   not  very  specific,  and  subtle differences in how copying works can
--   produce  different behaviors in the case where two overlapping windows
--   are each being refreshed at unpredictable intervals.
-+   to  the  virtual screen, and then changes are calculated to update the
-+   physical  screen (and applied to the terminal). But "copied to" is not
-+   very specific, and subtle differences in how copying works can produce
-+   different behaviors in the case where two overlapping windows are each
-+   being refreshed at unpredictable intervals.
- 
-    What  happens to the overlapping region depends on what wnoutrefresh()
-    does  with  its  argument  --  what portions of the argument window it
-diff -Naur ncurses-5.6.orig/form/Makefile.in ncurses-5.6/form/Makefile.in
---- ncurses-5.6.orig/form/Makefile.in	2006-10-14 16:40:36.000000000 -0400
-+++ ncurses-5.6/form/Makefile.in	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
--# $Id: Makefile.in,v 1.42 2006/10/14 20:40:36 tom Exp $
-+# $Id: Makefile.in,v 1.47 2007/04/28 14:56:11 tom Exp $
- ##############################################################################
--# Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -27,7 +27,7 @@
- # authorization.                                                             #
- ##############################################################################
- #
--# Author: Thomas E. Dickey <dickey@clark.net> 1996,1997
-+# Author: Thomas E. Dickey 1996-on
- #
- # Makefile for form source code.
- #
-@@ -91,7 +91,7 @@
- 
- CFLAGS_DEFAULT	= $(CFLAGS_@DFT_UPR_MODEL@)
- 
--LINK		= $(LIBTOOL_LINK) $(CC)
-+LINK		= $(LIBTOOL_LINK)
- LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
- 
- SHLIB_DIRS	= -L../lib
-@@ -106,8 +106,6 @@
- 
- RANLIB		= @LIB_PREP@
- 
--IMPORT_LIB	= @IMPORT_LIB@
--SHARED_LIB	= @SHARED_LIB@
- LIBRARIES	= @LIBS_TO_MAKE@
- 
- LINT		= @LINT@
-@@ -126,7 +124,7 @@
- 
- $(DESTDIR)$(bindir) \
- $(DESTDIR)$(libdir) :
--	sh $(srcdir)/../mkinstalldirs $@
-+	sh $(srcdir)/../mkdirs.sh $@
- 
- # make copies to simplify include-paths while still keeping form's include
- # file in this directory.
-diff -Naur ncurses-5.6.orig/form/fld_def.c ncurses-5.6/form/fld_def.c
---- ncurses-5.6.orig/form/fld_def.c	2005-04-16 13:31:17.000000000 -0400
-+++ ncurses-5.6/form/fld_def.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -32,7 +32,7 @@
- 
- #include "form.priv.h"
- 
--MODULE_ID("$Id: fld_def.c,v 1.33 2005/04/16 17:31:17 tom Exp $")
-+MODULE_ID("$Id: fld_def.c,v 1.36 2007/10/13 19:29:58 tom Exp $")
- 
- /* this can't be readonly */
- static FIELD default_field =
-@@ -93,7 +93,7 @@
-       assert(err != 0 && ap != (va_list *)0);
-       if ((typ->status & _LINKED_TYPE) != 0)
- 	{
--	  p = (TypeArgument *)malloc(sizeof(TypeArgument));
-+	  p = typeMalloc(TypeArgument, 1);
- 
- 	  if (p != 0)
- 	    {
-@@ -141,7 +141,7 @@
-       assert(err != 0 && argp != 0);
-       if ((typ->status & _LINKED_TYPE) != 0)
- 	{
--	  p = (TypeArgument *)malloc(sizeof(TypeArgument));
-+	  p = typeMalloc(TypeArgument, 1);
- 
- 	  if (p != 0)
- 	    {
-@@ -289,8 +289,9 @@
-       nrow >= 0 &&
-       nbuf >= 0 &&
-       ((err = E_SYSTEM_ERROR) != 0) &&	/* trick: this resets the default error */
--      (New_Field = (FIELD *)malloc(sizeof(FIELD))) != 0)
-+      (New_Field = typeMalloc(FIELD, 1)) != 0)
-     {
-+      T((T_CREATE("field %p"), New_Field));
-       *New_Field = default_field;
-       New_Field->rows = rows;
-       New_Field->cols = cols;
-@@ -304,7 +305,7 @@
- 
- #if USE_WIDEC_SUPPORT
-       New_Field->working = newpad(1, Buffer_Length(New_Field) + 1);
--      New_Field->expanded = (char **)calloc(1 + (unsigned)rows, sizeof(char *));
-+      New_Field->expanded = typeCalloc(char *, 1 + (unsigned)nbuf);
- #endif
- 
-       if (_nc_Copy_Type(New_Field, &default_field))
-diff -Naur ncurses-5.6.orig/form/fld_dup.c ncurses-5.6/form/fld_dup.c
---- ncurses-5.6.orig/form/fld_dup.c	2004-12-25 17:24:10.000000000 -0500
-+++ ncurses-5.6/form/fld_dup.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2004,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -32,7 +32,7 @@
- 
- #include "form.priv.h"
- 
--MODULE_ID("$Id: fld_dup.c,v 1.10 2004/12/25 22:24:10 tom Exp $")
-+MODULE_ID("$Id: fld_dup.c,v 1.12 2007/10/13 19:30:21 tom Exp $")
- 
- /*---------------------------------------------------------------------------
- |   Facility      :  libnform
-@@ -56,8 +56,9 @@
-   T((T_CALLED("dup_field(%p,%d,%d)"), field, frow, fcol));
-   if (field && (frow >= 0) && (fcol >= 0) &&
-       ((err = E_SYSTEM_ERROR) != 0) &&	/* trick : this resets the default error */
--      (New_Field = (FIELD *)malloc(sizeof(FIELD))))
-+      (New_Field = typeMalloc(FIELD, 1)))
-     {
-+      T((T_CREATE("field %p"), New_Field));
-       *New_Field = *_nc_Default_Field;
-       New_Field->frow = frow;
-       New_Field->fcol = fcol;
-diff -Naur ncurses-5.6.orig/form/fld_ftlink.c ncurses-5.6/form/fld_ftlink.c
---- ncurses-5.6.orig/form/fld_ftlink.c	2004-12-25 17:24:10.000000000 -0500
-+++ ncurses-5.6/form/fld_ftlink.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2004,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -32,7 +32,7 @@
- 
- #include "form.priv.h"
- 
--MODULE_ID("$Id: fld_ftlink.c,v 1.11 2004/12/25 22:24:10 tom Exp $")
-+MODULE_ID("$Id: fld_ftlink.c,v 1.13 2007/10/13 19:30:35 tom Exp $")
- 
- /*---------------------------------------------------------------------------
- |   Facility      :  libnform  
-@@ -56,10 +56,11 @@
-   T((T_CALLED("link_fieldtype(%p,%p)"), type1, type2));
-   if (type1 && type2)
-     {
--      nftyp = (FIELDTYPE *)malloc(sizeof(FIELDTYPE));
-+      nftyp = typeMalloc(FIELDTYPE, 1);
- 
-       if (nftyp)
- 	{
-+	  T((T_CREATE("fieldtype %p"), nftyp));
- 	  *nftyp = *_nc_Default_FieldType;
- 	  nftyp->status |= _LINKED_TYPE;
- 	  if ((type1->status & _HAS_ARGS) || (type2->status & _HAS_ARGS))
-diff -Naur ncurses-5.6.orig/form/fld_link.c ncurses-5.6/form/fld_link.c
---- ncurses-5.6.orig/form/fld_link.c	2004-12-25 17:24:10.000000000 -0500
-+++ ncurses-5.6/form/fld_link.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2004,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -32,7 +32,7 @@
- 
- #include "form.priv.h"
- 
--MODULE_ID("$Id: fld_link.c,v 1.9 2004/12/25 22:24:10 tom Exp $")
-+MODULE_ID("$Id: fld_link.c,v 1.11 2007/10/13 19:30:43 tom Exp $")
- 
- /*---------------------------------------------------------------------------
- |   Facility      :  libnform  
-@@ -57,8 +57,9 @@
-   T((T_CALLED("link_field(%p,%d,%d)"), field, frow, fcol));
-   if (field && (frow >= 0) && (fcol >= 0) &&
-       ((err = E_SYSTEM_ERROR) != 0) &&	/* trick: this resets the default error */
--      (New_Field = (FIELD *)malloc(sizeof(FIELD))))
-+      (New_Field = typeMalloc(FIELD, 1)))
-     {
-+      T((T_CREATE("field %p"), New_Field));
-       *New_Field = *_nc_Default_Field;
-       New_Field->frow = frow;
-       New_Field->fcol = fcol;
-diff -Naur ncurses-5.6.orig/form/fld_newftyp.c ncurses-5.6/form/fld_newftyp.c
---- ncurses-5.6.orig/form/fld_newftyp.c	2004-12-25 17:24:10.000000000 -0500
-+++ ncurses-5.6/form/fld_newftyp.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2004,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -32,7 +32,7 @@
- 
- #include "form.priv.h"
- 
--MODULE_ID("$Id: fld_newftyp.c,v 1.13 2004/12/25 22:24:10 tom Exp $")
-+MODULE_ID("$Id: fld_newftyp.c,v 1.15 2007/10/13 19:30:55 tom Exp $")
- 
- static FIELDTYPE const default_fieldtype =
- {
-@@ -76,10 +76,11 @@
-   T((T_CALLED("new_fieldtype(%p,%p)"), field_check, char_check));
-   if ((field_check) || (char_check))
-     {
--      nftyp = (FIELDTYPE *)malloc(sizeof(FIELDTYPE));
-+      nftyp = typeMalloc(FIELDTYPE, 1);
- 
-       if (nftyp)
- 	{
-+	  T((T_CREATE("fieldtype %p"), nftyp));
- 	  *nftyp = default_fieldtype;
- 	  nftyp->fcheck = field_check;
- 	  nftyp->ccheck = char_check;
-diff -Naur ncurses-5.6.orig/form/frm_def.c ncurses-5.6/form/frm_def.c
---- ncurses-5.6.orig/form/frm_def.c	2006-11-04 11:57:15.000000000 -0500
-+++ ncurses-5.6/form/frm_def.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -32,7 +32,7 @@
- 
- #include "form.priv.h"
- 
--MODULE_ID("$Id: frm_def.c,v 1.20 2006/11/04 16:57:15 tom Exp $")
-+MODULE_ID("$Id: frm_def.c,v 1.22 2007/10/13 19:31:17 tom Exp $")
- 
- /* this can't be readonly */
- static FORM default_form =
-@@ -186,8 +186,9 @@
-     RETURN(E_BAD_ARGUMENT);
- 
-   /* allocate page structures */
--  if ((pg = (_PAGE *) malloc(page_nr * sizeof(_PAGE))) != (_PAGE *) 0)
-+  if ((pg = typeMalloc(_PAGE, page_nr)) != (_PAGE *) 0)
-     {
-+      T((T_CREATE("_PAGE %p"), pg));
-       form->page = pg;
-     }
-   else
-@@ -290,11 +291,12 @@
- {
-   int err = E_SYSTEM_ERROR;
- 
--  FORM *form = (FORM *)malloc(sizeof(FORM));
-+  FORM *form = typeMalloc(FORM, 1);
- 
-   T((T_CALLED("new_form(%p)"), fields));
-   if (form)
-     {
-+      T((T_CREATE("form %p"), form));
-       *form = *_nc_Default_Form;
-       if ((err = Associate_Fields(form, fields)) != E_OK)
- 	{
-diff -Naur ncurses-5.6.orig/form/frm_driver.c ncurses-5.6/form/frm_driver.c
---- ncurses-5.6.orig/form/frm_driver.c	2006-11-04 13:45:35.000000000 -0500
-+++ ncurses-5.6/form/frm_driver.c	2008-06-18 06:49:46.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -32,7 +32,7 @@
- 
- #include "form.priv.h"
- 
--MODULE_ID("$Id: frm_driver.c,v 1.76 2006/11/04 18:45:35 tom Exp $")
-+MODULE_ID("$Id: frm_driver.c,v 1.86 2008/01/19 20:11:03 tom Exp $")
- 
- /*----------------------------------------------------------------------------
-   This is the core module of the form library. It contains the majority
-@@ -262,7 +262,19 @@
- static int
- fix_wchnstr(WINDOW *w, cchar_t *s, int n)
- {
-+  int x;
-+
-   win_wchnstr(w, s, n);
-+  /*
-+   * This function is used to extract the text only from the window.
-+   * Strip attributes and color from the string so they will not be added
-+   * back when copying the string to the window.
-+   */
-+  for (x = 0; x < n; ++x)
-+    {
-+      RemAttr(s[x], A_ATTRIBUTES);
-+      SetPair(s[x], 0);
-+    }
-   return n;
- }
- 
-@@ -651,6 +663,7 @@
- 
- 	  result = TRUE;	/* allow sharing of recovery on failure */
- 
-+	  T((T_CREATE("fieldcell %p"), newbuf));
- 	  field->buf = newbuf;
- 	  for (i = 0; i <= field->nbuf; i++)
- 	    {
-@@ -663,7 +676,7 @@
- 	      new_bp[new_buflen] = myZEROS;
- 	    }
- 
--#if USE_WIDEC_SUPPORT
-+#if USE_WIDEC_SUPPORT && NCURSES_EXT_FUNCS
- 	  if (wresize(field->working, 1, Buffer_Length(field) + 1) == ERR)
- 	    result = FALSE;
- #endif
-@@ -724,6 +737,34 @@
-   return (result);
- }
- 
-+#ifdef NCURSES_MOUSE_VERSION
-+/*---------------------------------------------------------------------------
-+|   Facility      :  libnform
-+|   Function      :  int Field_encloses(FIELD *field, int ry, int rx)
-+|
-+|   Description   :  Check if the given coordinates lie within the given field.
-+|
-+|   Return Values :  E_OK              - success
-+|                    E_BAD_ARGUMENT    - invalid form pointer
-+|                    E_SYSTEM_ERROR    - form has no current field or
-+|                                        field-window
-++--------------------------------------------------------------------------*/
-+static int
-+Field_encloses(FIELD *field, int ry, int rx)
-+{
-+  T((T_CALLED("Field_encloses(%p)"), field));
-+  if (field != 0
-+      && field->frow <= ry
-+      && (field->frow + field->rows) > ry
-+      && field->fcol <= rx
-+      && (field->fcol + field->cols) > rx)
-+    {
-+      RETURN(E_OK);
-+    }
-+  RETURN(E_INVALID_FIELD);
-+}
-+#endif
-+
- /*---------------------------------------------------------------------------
- |   Facility      :  libnform
- |   Function      :  int _nc_Position_Form_Cursor(FORM * form)
-@@ -4149,6 +4190,83 @@
- 	    res = (BI->cmd) (form);
- 	}
-     }
-+#ifdef NCURSES_MOUSE_VERSION
-+  else if (KEY_MOUSE == c)
-+    {
-+      MEVENT event;
-+      WINDOW *win = form->win ? form->win : stdscr;
-+      WINDOW *sub = form->sub ? form->sub : win;
-+
-+      getmouse(&event);
-+      if ((event.bstate & (BUTTON1_CLICKED |
-+			   BUTTON1_DOUBLE_CLICKED |
-+			   BUTTON1_TRIPLE_CLICKED))
-+	  && wenclose(win, event.y, event.x))
-+	{			/* we react only if the click was in the userwin, that means
-+				 * inside the form display area or at the decoration window.
-+				 */
-+	  int ry = event.y, rx = event.x;	/* screen coordinates */
-+
-+	  res = E_REQUEST_DENIED;
-+	  if (mouse_trafo(&ry, &rx, FALSE))
-+	    {			/* rx, ry are now "curses" coordinates */
-+	      if (ry < sub->_begy)
-+		{		/* we clicked above the display region; this is
-+				 * interpreted as "scroll up" request
-+				 */
-+		  if (event.bstate & BUTTON1_CLICKED)
-+		    res = form_driver(form, REQ_PREV_FIELD);
-+		  else if (event.bstate & BUTTON1_DOUBLE_CLICKED)
-+		    res = form_driver(form, REQ_PREV_PAGE);
-+		  else if (event.bstate & BUTTON1_TRIPLE_CLICKED)
-+		    res = form_driver(form, REQ_FIRST_FIELD);
-+		}
-+	      else if (ry > sub->_begy + sub->_maxy)
-+		{		/* we clicked below the display region; this is
-+				 * interpreted as "scroll down" request
-+				 */
-+		  if (event.bstate & BUTTON1_CLICKED)
-+		    res = form_driver(form, REQ_NEXT_FIELD);
-+		  else if (event.bstate & BUTTON1_DOUBLE_CLICKED)
-+		    res = form_driver(form, REQ_NEXT_PAGE);
-+		  else if (event.bstate & BUTTON1_TRIPLE_CLICKED)
-+		    res = form_driver(form, REQ_LAST_FIELD);
-+		}
-+	      else if (wenclose(sub, event.y, event.x))
-+		{		/* Inside the area we try to find the hit item */
-+		  int i;
-+
-+		  ry = event.y;
-+		  rx = event.x;
-+		  if (wmouse_trafo(sub, &ry, &rx, FALSE))
-+		    {
-+		      int min_field = form->page[form->curpage].pmin;
-+		      int max_field = form->page[form->curpage].pmax;
-+
-+		      for (i = min_field; i <= max_field; ++i)
-+			{
-+			  FIELD *field = form->field[i];
-+
-+			  if (Field_Is_Selectable(field)
-+			      && Field_encloses(field, ry, rx) == E_OK)
-+			    {
-+			      res = _nc_Set_Current_Field(form, field);
-+			      if (res == E_OK)
-+				res = _nc_Position_Form_Cursor(form);
-+			      if (res == E_OK
-+				  && (event.bstate & BUTTON1_DOUBLE_CLICKED))
-+				res = E_UNKNOWN_COMMAND;
-+			      break;
-+			    }
-+			}
-+		    }
-+		}
-+	    }
-+	}
-+      else
-+	res = E_REQUEST_DENIED;
-+    }
-+#endif /* NCURSES_MOUSE_VERSION */
-   else if (!(c & (~(int)MAX_REGULAR_CHARACTER)))
-     {
-       /*
-@@ -4261,7 +4379,7 @@
-   wclear(field->working);
-   mvwaddstr(field->working, 0, 0, value);
- 
--  if ((widevalue = (FIELD_CELL *)calloc(len, sizeof(FIELD_CELL))) == 0)
-+  if ((widevalue = typeCalloc(FIELD_CELL, len + 1)) == 0)
-     {
-       RETURN(E_SYSTEM_ERROR);
-     }
-@@ -4341,10 +4459,7 @@
- 	      init_mb(state);
- 	      next = _nc_wcrtomb(0, data[n].chars[0], &state);
- 	      if (!isEILSEQ(next))
--		{
--		  if (next != 0)
--		    need += next;
--		}
-+		need += next;
- 	    }
- 	}
- 
-@@ -4358,7 +4473,7 @@
- 	{
- 	  wclear(field->working);
- 	  mvwadd_wchnstr(field->working, 0, 0, data, size);
--	  mvwinnstr(field->working, 0, 0, result, (int)need + 1);
-+	  mvwinnstr(field->working, 0, 0, result, (int)need);
- 	}
- #else
-       result = Address_Of_Nth_Buffer(field, buffer);
-diff -Naur ncurses-5.6.orig/form/fty_alnum.c ncurses-5.6/form/fty_alnum.c
---- ncurses-5.6.orig/form/fty_alnum.c	2006-04-22 17:33:05.000000000 -0400
-+++ ncurses-5.6/form/fty_alnum.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -34,7 +34,7 @@
- 
- #include "form.priv.h"
- 
--MODULE_ID("$Id: fty_alnum.c,v 1.19 2006/04/22 21:33:05 tom Exp $")
-+MODULE_ID("$Id: fty_alnum.c,v 1.21 2007/10/13 19:31:52 tom Exp $")
- 
- #define thisARG alnumARG
- 
-@@ -55,10 +55,13 @@
- static void *
- Make_This_Type(va_list *ap)
- {
--  thisARG *argp = (thisARG *) malloc(sizeof(thisARG));
-+  thisARG *argp = typeMalloc(thisARG, 1);
- 
-   if (argp)
--    argp->width = va_arg(*ap, int);
-+    {
-+      T((T_CREATE("thisARG %p"), argp));
-+      argp->width = va_arg(*ap, int);
-+    }
- 
-   return ((void *)argp);
- }
-@@ -75,10 +78,13 @@
- Copy_This_Type(const void *argp)
- {
-   const thisARG *ap = (const thisARG *)argp;
--  thisARG *result = (thisARG *) malloc(sizeof(thisARG));
-+  thisARG *result = typeMalloc(thisARG, 1);
- 
-   if (result)
--    *result = *ap;
-+    {
-+      T((T_CREATE("thisARG %p"), result));
-+      *result = *ap;
-+    }
- 
-   return ((void *)result);
- }
-diff -Naur ncurses-5.6.orig/form/fty_alpha.c ncurses-5.6/form/fty_alpha.c
---- ncurses-5.6.orig/form/fty_alpha.c	2006-04-22 17:33:05.000000000 -0400
-+++ ncurses-5.6/form/fty_alpha.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -34,7 +34,7 @@
- 
- #include "form.priv.h"
- 
--MODULE_ID("$Id: fty_alpha.c,v 1.21 2006/04/22 21:33:05 tom Exp $")
-+MODULE_ID("$Id: fty_alpha.c,v 1.23 2007/10/13 19:32:09 tom Exp $")
- 
- #define thisARG alphaARG
- 
-@@ -55,10 +55,13 @@
- static void *
- Make_This_Type(va_list *ap)
- {
--  thisARG *argp = (thisARG *) malloc(sizeof(thisARG));
-+  thisARG *argp = typeMalloc(thisARG, 1);
- 
-   if (argp)
--    argp->width = va_arg(*ap, int);
-+    {
-+      T((T_CREATE("thisARG %p"), argp));
-+      argp->width = va_arg(*ap, int);
-+    }
- 
-   return ((void *)argp);
- }
-@@ -75,10 +78,13 @@
- Copy_This_Type(const void *argp)
- {
-   const thisARG *ap = (const thisARG *)argp;
--  thisARG *result = (thisARG *) malloc(sizeof(thisARG));
-+  thisARG *result = typeMalloc(thisARG, 1);
- 
-   if (result)
--    *result = *ap;
-+    {
-+      T((T_CREATE("thisARG %p"), result));
-+      *result = *ap;
-+    }
- 
-   return ((void *)result);
- }
-diff -Naur ncurses-5.6.orig/form/fty_enum.c ncurses-5.6/form/fty_enum.c
---- ncurses-5.6.orig/form/fty_enum.c	2006-04-22 17:33:05.000000000 -0400
-+++ ncurses-5.6/form/fty_enum.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -34,7 +34,7 @@
- 
- #include "form.priv.h"
- 
--MODULE_ID("$Id: fty_enum.c,v 1.20 2006/04/22 21:33:05 tom Exp $")
-+MODULE_ID("$Id: fty_enum.c,v 1.22 2007/10/13 19:32:26 tom Exp $")
- 
- typedef struct
-   {
-@@ -56,7 +56,7 @@
- static void *
- Make_Enum_Type(va_list *ap)
- {
--  enumARG *argp = (enumARG *)malloc(sizeof(enumARG));
-+  enumARG *argp = typeMalloc(enumARG, 1);
- 
-   if (argp)
-     {
-@@ -64,6 +64,7 @@
-       char **kp = (char **)0;
-       int ccase, cunique;
- 
-+      T((T_CREATE("enumARG %p"), argp));
-       argp->kwds = va_arg(*ap, char **);
-       ccase = va_arg(*ap, int);
-       cunique = va_arg(*ap, int);
-@@ -96,10 +97,13 @@
-     {
-       const enumARG *ap = (const enumARG *)argp;
- 
--      result = (enumARG *)malloc(sizeof(enumARG));
-+      result = typeMalloc(enumARG, 1);
- 
-       if (result)
--	*result = *ap;
-+	{
-+	  T((T_CREATE("enumARG %p"), result));
-+	  *result = *ap;
-+	}
-     }
-   return (void *)result;
- }
-diff -Naur ncurses-5.6.orig/form/fty_int.c ncurses-5.6/form/fty_int.c
---- ncurses-5.6.orig/form/fty_int.c	2006-04-22 17:33:05.000000000 -0400
-+++ ncurses-5.6/form/fty_int.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -34,7 +34,7 @@
- 
- #include "form.priv.h"
- 
--MODULE_ID("$Id: fty_int.c,v 1.20 2006/04/22 21:33:05 tom Exp $")
-+MODULE_ID("$Id: fty_int.c,v 1.22 2007/10/13 19:32:40 tom Exp $")
- 
- #if USE_WIDEC_SUPPORT
- #define isDigit(c) (iswdigit((wint_t)(c)) || isdigit(UChar(c)))
-@@ -63,10 +63,11 @@
- static void *
- Make_This_Type(va_list *ap)
- {
--  thisARG *argp = (thisARG *) malloc(sizeof(thisARG));
-+  thisARG *argp = typeMalloc(thisARG, 1);
- 
-   if (argp)
-     {
-+      T((T_CREATE("thisARG %p"), argp));
-       argp->precision = va_arg(*ap, int);
-       argp->low = va_arg(*ap, long);
-       argp->high = va_arg(*ap, long);
-@@ -90,9 +91,12 @@
- 
-   if (argp)
-     {
--      result = (thisARG *) malloc(sizeof(thisARG));
-+      result = typeMalloc(thisARG, 1);
-       if (result)
--	*result = *ap;
-+	{
-+	  T((T_CREATE("thisARG %p"), result));
-+	  *result = *ap;
-+	}
-     }
-   return (void *)result;
- }
-diff -Naur ncurses-5.6.orig/form/fty_num.c ncurses-5.6/form/fty_num.c
---- ncurses-5.6.orig/form/fty_num.c	2006-04-22 17:33:05.000000000 -0400
-+++ ncurses-5.6/form/fty_num.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -34,7 +34,7 @@
- 
- #include "form.priv.h"
- 
--MODULE_ID("$Id: fty_num.c,v 1.23 2006/04/22 21:33:05 tom Exp $")
-+MODULE_ID("$Id: fty_num.c,v 1.25 2007/10/13 19:32:54 tom Exp $")
- 
- #if HAVE_LOCALE_H
- #include <locale.h>
-@@ -74,10 +74,11 @@
- static void *
- Make_This_Type(va_list *ap)
- {
--  thisARG *argn = (thisARG *) malloc(sizeof(thisARG));
-+  thisARG *argn = typeMalloc(thisARG, 1);
- 
-   if (argn)
-     {
-+      T((T_CREATE("thisARG %p"), argn));
-       argn->precision = va_arg(*ap, int);
-       argn->low = va_arg(*ap, double);
-       argn->high = va_arg(*ap, double);
-@@ -107,9 +108,12 @@
- 
-   if (argp)
-     {
--      result = (thisARG *) malloc(sizeof(thisARG));
-+      result = typeMalloc(thisARG, 1);
-       if (result)
--	*result = *ap;
-+	{
-+	  T((T_CREATE("thisARG %p"), result));
-+	  *result = *ap;
-+	}
-     }
-   return (void *)result;
- }
-diff -Naur ncurses-5.6.orig/form/fty_regex.c ncurses-5.6/form/fty_regex.c
---- ncurses-5.6.orig/form/fty_regex.c	2006-04-22 17:33:05.000000000 -0400
-+++ ncurses-5.6/form/fty_regex.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -34,7 +34,7 @@
- 
- #include "form.priv.h"
- 
--MODULE_ID("$Id: fty_regex.c,v 1.19 2006/04/22 21:33:05 tom Exp $")
-+MODULE_ID("$Id: fty_regex.c,v 1.21 2007/10/13 19:33:50 tom Exp $")
- 
- #if HAVE_REGEX_H_FUNCS		/* We prefer POSIX regex */
- #include <regex.h>
-@@ -105,15 +105,17 @@
-   char *rx = va_arg(*ap, char *);
-   RegExp_Arg *preg;
- 
--  preg = (RegExp_Arg *)malloc(sizeof(RegExp_Arg));
-+  preg = typeMalloc(RegExp_Arg, 1);
- 
-   if (preg)
-     {
--      if (((preg->pRegExp = (regex_t *) malloc(sizeof(regex_t))) != 0)
-+      T((T_CREATE("RegExp_Arg %p"), preg));
-+      if (((preg->pRegExp = typeMalloc(regex_t, 1)) != 0)
- 	  && !regcomp(preg->pRegExp, rx,
- 		      (REG_EXTENDED | REG_NOSUB | REG_NEWLINE)))
- 	{
--	  preg->refCount = (unsigned long *)malloc(sizeof(unsigned long));
-+	  T((T_CREATE("regex_t %p"), preg->pRegExp));
-+	  preg->refCount = typeMalloc(unsigned long, 1);
- 
- 	  *(preg->refCount) = 1;
- 	}
-@@ -130,20 +132,21 @@
-   char *rx = va_arg(*ap, char *);
-   RegExp_Arg *pArg;
- 
--  pArg = (RegExp_Arg *)malloc(sizeof(RegExp_Arg));
-+  pArg = typeMalloc(RegExp_Arg, 1);
- 
-   if (pArg)
-     {
-       int blen = RX_INCREMENT;
- 
-+      T((T_CREATE("RegExp_Arg %p"), pArg));
-       pArg->compiled_expression = NULL;
--      pArg->refCount = (unsigned long *)malloc(sizeof(unsigned long));
-+      pArg->refCount = typeMalloc(unsigned long, 1);
- 
-       *(pArg->refCount) = 1;
- 
-       do
- 	{
--	  char *buf = (char *)malloc(blen);
-+	  char *buf = typeMalloc(char, blen);
- 
- 	  if (buf)
- 	    {
-diff -Naur ncurses-5.6.orig/form/headers ncurses-5.6/form/headers
---- ncurses-5.6.orig/form/headers	1998-02-11 07:13:43.000000000 -0500
-+++ ncurses-5.6/form/headers	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- ##############################################################################
--# Copyright (c) 1998 Free Software Foundation, Inc.                          #
-+# Copyright (c) 1998,2006 Free Software Foundation, Inc.                     #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -29,3 +29,4 @@
- # Author: Thomas E. Dickey <dickey@clark.net> 1996
- #
- $(srcdir)/form.h
-+# vile:makemode
-diff -Naur ncurses-5.6.orig/form/modules ncurses-5.6/form/modules
---- ncurses-5.6.orig/form/modules	2004-12-25 18:29:22.000000000 -0500
-+++ ncurses-5.6/form/modules	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
--# $Id: modules,v 1.14 2004/12/25 23:29:22 tom Exp $
-+# $Id: modules,v 1.15 2006/12/24 00:52:58 tom Exp $
- ##############################################################################
--# Copyright (c) 1998,2004 Free Software Foundation, Inc.                     #
-+# Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -27,7 +27,7 @@
- # authorization.                                                             #
- ##############################################################################
- #
--# Author: Thomas E. Dickey
-+# Author: Thomas E. Dickey	1995-on
- #
- 
- @ base
-@@ -72,3 +72,5 @@
- fty_ipv4	lib		$(srcdir)	$(FORM_PRIV_H)
- fty_num		lib		$(srcdir)	$(FORM_PRIV_H)
- fty_regex	lib		$(srcdir)	$(FORM_PRIV_H)
-+
-+# vile:makemode
-diff -Naur ncurses-5.6.orig/include/MKterm.h.awk.in ncurses-5.6/include/MKterm.h.awk.in
---- ncurses-5.6.orig/include/MKterm.h.awk.in	2006-11-25 20:18:23.000000000 -0500
-+++ ncurses-5.6/include/MKterm.h.awk.in	2008-06-18 06:49:51.000000000 -0400
-@@ -1,6 +1,7 @@
-+# vile:awkmode
- BEGIN		{
- 		    print  "/****************************************************************************"
--		    print  " * Copyright (c) 1998-2003,2006 Free Software Foundation, Inc.              *"
-+		    print  " * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *"
- 		    print  " *                                                                          *"
- 		    print  " * Permission is hereby granted, free of charge, to any person obtaining a  *"
- 		    print  " * copy of this software and associated documentation files (the            *"
-@@ -33,7 +34,7 @@
- 		    print  "/*    and: Thomas E. Dickey                        1995-on                  */"
- 		    print  "/****************************************************************************/"
- 		    print  ""
--		    print  "/* $Id: MKterm.h.awk.in,v 1.47 2006/11/26 01:18:23 tom Exp $ */"
-+		    print  "/* $Id: MKterm.h.awk.in,v 1.50 2008/05/24 23:13:59 tom Exp $ */"
- 		    print  ""
- 		    print  "/*"
- 		    print  "**	term.h -- Definition of struct term"
-@@ -227,31 +228,33 @@
- 			print  "    char *      _termname;      /* used for termname() */"
- 			print  "} TERMINAL;"
- 			print  ""
--			print  "extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;"
--			print  ""
--			print  "#if BROKEN_LINKER"
--			print  "#define boolnames  _nc_boolnames()"
--			print  "#define boolcodes  _nc_boolcodes()"
--			print  "#define boolfnames _nc_boolfnames()"
--			print  "#define numnames   _nc_numnames()"
--			print  "#define numcodes   _nc_numcodes()"
--			print  "#define numfnames  _nc_numfnames()"
--			print  "#define strnames   _nc_strnames()"
--			print  "#define strcodes   _nc_strcodes()"
--			print  "#define strfnames  _nc_strfnames()"
--			print  ""
--			print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_boolnames (void);"
--			print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_boolcodes (void);"
--			print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_boolfnames (void);"
--			print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_numnames (void);"
--			print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_numcodes (void);"
--			print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_numfnames (void);"
--			print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_strnames (void);"
--			print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_strcodes (void);"
--			print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_strfnames (void);"
-+			print  "#if @BROKEN_LINKER@ || @cf_cv_enable_reentrant@"
-+			print  "NCURSES_WRAPPED_VAR(TERMINAL *, cur_term);"
-+			print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolnames);"
-+			print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolcodes);"
-+			print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolfnames);"
-+			print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, numnames);"
-+			print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, numcodes);"
-+			print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, numfnames);"
-+			print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strnames);"
-+			print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strcodes);"
-+			print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strfnames);"
-+			print  ""
-+			print  "#define cur_term   NCURSES_PUBLIC_VAR(cur_term())"
-+			print  "#define boolnames  NCURSES_PUBLIC_VAR(boolnames())"
-+			print  "#define boolcodes  NCURSES_PUBLIC_VAR(boolcodes())"
-+			print  "#define boolfnames NCURSES_PUBLIC_VAR(boolfnames())"
-+			print  "#define numnames   NCURSES_PUBLIC_VAR(numnames())"
-+			print  "#define numcodes   NCURSES_PUBLIC_VAR(numcodes())"
-+			print  "#define numfnames  NCURSES_PUBLIC_VAR(numfnames())"
-+			print  "#define strnames   NCURSES_PUBLIC_VAR(strnames())"
-+			print  "#define strcodes   NCURSES_PUBLIC_VAR(strcodes())"
-+			print  "#define strfnames  NCURSES_PUBLIC_VAR(strfnames())"
- 			print  ""
- 			print  "#else"
- 			print  ""
-+			print  "extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;"
-+			print  ""
- 			print  "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolnames[];"
- 			print  "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolcodes[];"
- 			print  "extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolfnames[];"
-@@ -291,10 +294,10 @@
- 			print  "extern NCURSES_EXPORT(int) tigetnum (NCURSES_CONST char *);"
- 			print  ""
- 			print  "#if @NCURSES_TPARM_VARARGS@ /* NCURSES_TPARM_VARARGS */"
--			print  "extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...);	/* implemented */"
-+			print  "extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...);	/* special */"
- 			print  "#else"
--			print  "extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, long,long,long,long,long,long,long,long,long);	/* implemented */"
--			print  "extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...);	/* implemented */"
-+			print  "extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, long,long,long,long,long,long,long,long,long);	/* special */"
-+			print  "extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...);	/* special */"
- 			print  "#endif"
- 			print  ""
- 			print  "#endif /* __NCURSES_H */"
-diff -Naur ncurses-5.6.orig/include/curses.h.in ncurses-5.6/include/curses.h.in
---- ncurses-5.6.orig/include/curses.h.in	2006-11-25 20:14:54.000000000 -0500
-+++ ncurses-5.6/include/curses.h.in	2008-06-18 06:49:49.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -32,7 +32,7 @@
-  *     and: Thomas E. Dickey                        1996-on                 *
-  ****************************************************************************/
- 
--/* $Id: curses.h.in,v 1.167 2006/11/26 01:14:54 tom Exp $ */
-+/* $Id: curses.h.in,v 1.186 2008/04/05 15:30:28 tom Exp $ */
- 
- #ifndef __NCURSES_H
- #define __NCURSES_H
-@@ -103,10 +103,17 @@
- #define	NCURSES_COLOR_T short
- 
- /*
-+ * Definition used to make WINDOW and similar structs opaque.
-+ */
-+#ifndef @cf_cv_enable_opaque@
-+#define NCURSES_OPAQUE @NCURSES_OPAQUE@
-+#endif
-+
-+/*
-  * The internal type used for window dimensions.
-  */
- #undef	NCURSES_SIZE_T
--#define	NCURSES_SIZE_T short
-+#define	NCURSES_SIZE_T @NCURSES_SIZE_T@
- 
- /*
-  * Control whether tparm() supports varargs or fixed-parameter list.
-@@ -137,7 +144,7 @@
- #include <stddef.h>	/* we want wchar_t */
- #endif /* _XOPEN_SOURCE_EXTENDED */
- 
--/* XSI and SVr4 specify that curses implements 'bool'.  However, C++ may also
-+/* X/Open and SVr4 specify that curses implements 'bool'.  However, C++ may also
-  * implement it.  If so, we must use the C++ compiler's type to avoid conflict
-  * with other interfaces.
-  *
-@@ -184,7 +191,7 @@
- #endif
- 
- /*
-- * XSI attributes.  In the ncurses implementation, they are identical to the
-+ * X/Open attributes.  In the ncurses implementation, they are identical to the
-  * A_ attributes.
-  */
- #define WA_ATTRIBUTES	A_ATTRIBUTES
-@@ -206,9 +213,6 @@
- #define WA_VERTICAL	A_VERTICAL
- 
- /* colors */
--extern NCURSES_EXPORT_VAR(int) COLORS;
--extern NCURSES_EXPORT_VAR(int) COLOR_PAIRS;
--
- #define COLOR_BLACK	0
- #define COLOR_RED	1
- #define COLOR_GREEN	2
-@@ -220,8 +224,8 @@
- 
- /* line graphics */
- 
--#if @BROKEN_LINKER@
--extern NCURSES_EXPORT_VAR(chtype*) _nc_acs_map(void);
-+#if @BROKEN_LINKER@ || @cf_cv_enable_reentrant@
-+NCURSES_WRAPPED_VAR(chtype*, acs_map);
- #define acs_map (_nc_acs_map())
- #else
- extern NCURSES_EXPORT_VAR(chtype) acs_map[];
-@@ -346,6 +350,8 @@
-     attr_t	attr;
-     wchar_t	chars[CCHARW_MAX];
- #if @NCURSES_EXT_COLORS@
-+#undef NCURSES_EXT_COLORS
-+#define NCURSES_EXT_COLORS @NCURSES_PATCH@
-     int		ext_color;	/* color pair, must be more than 16-bits */
- #endif
- }
-@@ -353,6 +359,7 @@
- 
- #endif /* _XOPEN_SOURCE_EXTENDED */
- 
-+#if !NCURSES_OPAQUE
- struct ldat;
- 
- struct _win_st
-@@ -409,41 +416,7 @@
- #endif
- #endif
- };
--
--extern NCURSES_EXPORT_VAR(WINDOW *)   stdscr;
--extern NCURSES_EXPORT_VAR(WINDOW *)   curscr;
--extern NCURSES_EXPORT_VAR(WINDOW *)   newscr;
--
--extern NCURSES_EXPORT_VAR(int)	LINES;
--extern NCURSES_EXPORT_VAR(int)	COLS;
--extern NCURSES_EXPORT_VAR(int)	TABSIZE;
--
--/*
-- * This global was an undocumented feature under AIX curses.
-- */
--extern NCURSES_EXPORT_VAR(int) ESCDELAY;	/* ESC expire time in milliseconds */
--
--/*
-- * These functions are extensions - not in XSI Curses.
-- */
--#if @NCURSES_EXT_FUNCS@
--extern NCURSES_EXPORT(bool) is_term_resized (int, int);
--extern NCURSES_EXPORT(char *) keybound (int, int);
--extern NCURSES_EXPORT(const char *) curses_version (void);
--extern NCURSES_EXPORT(int) assume_default_colors (int, int);
--extern NCURSES_EXPORT(int) define_key (const char *, int);
--extern NCURSES_EXPORT(int) key_defined (const char *);
--extern NCURSES_EXPORT(int) keyok (int, bool);
--extern NCURSES_EXPORT(int) resize_term (int, int);
--extern NCURSES_EXPORT(int) resizeterm (int, int);
--extern NCURSES_EXPORT(int) use_default_colors (void);
--extern NCURSES_EXPORT(int) use_extended_names (bool);
--extern NCURSES_EXPORT(int) use_legacy_coding (int);
--extern NCURSES_EXPORT(int) wresize (WINDOW *, int, int);
--extern NCURSES_EXPORT(void) nofilter(void);
--#else
--#define curses_version() NCURSES_VERSION
--#endif
-+#endif /* NCURSES_OPAQUE */
- 
- /*
-  * This is an extension to support events...
-@@ -537,7 +510,7 @@
- #endif
- 
- /*
-- * Function prototypes.  This is the complete XSI Curses list of required
-+ * Function prototypes.  This is the complete X/Open Curses list of required
-  * functions.  Those marked `generated' will have sources generated from the
-  * macro definitions later in this file, in order to satisfy XPG4.2
-  * requirements.
-@@ -741,7 +714,7 @@
- extern NCURSES_EXPORT(int) standend (void);				/* generated */
- extern NCURSES_EXPORT(int) start_color (void);				/* implemented */
- extern NCURSES_EXPORT(WINDOW *) subpad (WINDOW *, int, int, int, int);	/* implemented */
--extern NCURSES_EXPORT(WINDOW *) subwin (WINDOW *,int,int,int,int);	/* implemented */
-+extern NCURSES_EXPORT(WINDOW *) subwin (WINDOW *, int, int, int, int);	/* implemented */
- extern NCURSES_EXPORT(int) syncok (WINDOW *, bool);			/* implemented */
- extern NCURSES_EXPORT(chtype) termattrs (void);				/* implemented */
- extern NCURSES_EXPORT(char *) termname (void);				/* implemented */
-@@ -825,17 +798,16 @@
- extern NCURSES_EXPORT(int) putp (const char *);				/* implemented */
- 
- #if NCURSES_TPARM_VARARGS
--extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...);	/* implemented */
-+extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...);	/* special */
- #else
--extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, long,long,long,long,long,long,long,long,long);	/* implemented */
--extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...);	/* implemented */
-+extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, long,long,long,long,long,long,long,long,long);	/* special */
-+extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...);	/* special */
- #endif
- 
--extern NCURSES_EXPORT_VAR(char) ttytype[];	/* needed for backward compatibility */
--
- /*
-  * These functions are not in X/Open, but we use them in macro definitions:
-  */
-+extern NCURSES_EXPORT(int) getattrs (const WINDOW *);			/* generated */
- extern NCURSES_EXPORT(int) getcurx (const WINDOW *);			/* generated */
- extern NCURSES_EXPORT(int) getcury (const WINDOW *);			/* generated */
- extern NCURSES_EXPORT(int) getbegx (const WINDOW *);			/* generated */
-@@ -846,12 +818,60 @@
- extern NCURSES_EXPORT(int) getpary (const WINDOW *);			/* generated */
- 
- /*
-- * vid_attr() was implemented originally based on a draft of XSI curses.
-+ * vid_attr() was implemented originally based on a draft of X/Open curses.
-  */
- #ifndef _XOPEN_SOURCE_EXTENDED
- #define vid_attr(a,pair,opts) vidattr(a)
- #endif
- 
-+/*
-+ * These functions are extensions - not in X/Open Curses.
-+ */
-+#if @NCURSES_EXT_FUNCS@
-+#undef  NCURSES_EXT_FUNCS
-+#define NCURSES_EXT_FUNCS @NCURSES_PATCH@
-+typedef int (*NCURSES_WINDOW_CB)(WINDOW *, void *);
-+typedef int (*NCURSES_SCREEN_CB)(SCREEN *, void *);
-+extern NCURSES_EXPORT(bool) is_term_resized (int, int);
-+extern NCURSES_EXPORT(char *) keybound (int, int);
-+extern NCURSES_EXPORT(const char *) curses_version (void);
-+extern NCURSES_EXPORT(int) assume_default_colors (int, int);
-+extern NCURSES_EXPORT(int) define_key (const char *, int);
-+extern NCURSES_EXPORT(int) key_defined (const char *);
-+extern NCURSES_EXPORT(int) keyok (int, bool);
-+extern NCURSES_EXPORT(int) resize_term (int, int);
-+extern NCURSES_EXPORT(int) resizeterm (int, int);
-+extern NCURSES_EXPORT(int) set_escdelay (int);
-+extern NCURSES_EXPORT(int) set_tabsize (int);
-+extern NCURSES_EXPORT(int) use_default_colors (void);
-+extern NCURSES_EXPORT(int) use_extended_names (bool);
-+extern NCURSES_EXPORT(int) use_legacy_coding (int);
-+extern NCURSES_EXPORT(int) use_screen (SCREEN *, NCURSES_SCREEN_CB, void *);
-+extern NCURSES_EXPORT(int) use_window (WINDOW *, NCURSES_WINDOW_CB, void *);
-+extern NCURSES_EXPORT(int) wresize (WINDOW *, int, int);
-+extern NCURSES_EXPORT(void) nofilter(void);
-+
-+/*
-+ * These extensions provide access to information stored in the WINDOW even
-+ * when NCURSES_OPAQUE is set:
-+ */
-+extern NCURSES_EXPORT(WINDOW *) wgetparent (const WINDOW *);	/* generated */
-+extern NCURSES_EXPORT(bool) is_cleared (const WINDOW *);	/* generated */
-+extern NCURSES_EXPORT(bool) is_idcok (const WINDOW *);		/* generated */
-+extern NCURSES_EXPORT(bool) is_idlok (const WINDOW *);		/* generated */
-+extern NCURSES_EXPORT(bool) is_immedok (const WINDOW *);	/* generated */
-+extern NCURSES_EXPORT(bool) is_keypad (const WINDOW *);		/* generated */
-+extern NCURSES_EXPORT(bool) is_leaveok (const WINDOW *);	/* generated */
-+extern NCURSES_EXPORT(bool) is_nodelay (const WINDOW *);	/* generated */
-+extern NCURSES_EXPORT(bool) is_notimeout (const WINDOW *);	/* generated */
-+extern NCURSES_EXPORT(bool) is_scrollok (const WINDOW *);	/* generated */
-+extern NCURSES_EXPORT(bool) is_syncok (const WINDOW *);		/* generated */
-+extern NCURSES_EXPORT(int) wgetscrreg (const WINDOW *, int *, int *); /* generated */
-+
-+#else
-+#define curses_version() NCURSES_VERSION
-+#endif
-+
- /* attributes */
- 
- #define NCURSES_ATTR_SHIFT       8
-@@ -892,11 +912,22 @@
- #define getmaxyx(win,y,x)	(y = getmaxy(win), x = getmaxx(win))
- #define getparyx(win,y,x)	(y = getpary(win), x = getparx(win))
- 
--#define getsyx(y,x) do { if(newscr->_leaveok) (y)=(x)=-1; \
--			 else getyx(newscr,(y),(x)); \
-+#define getsyx(y,x) do { if (newscr) { \
-+			     if (is_leaveok(newscr)) \
-+				(y) = (x) = -1; \
-+			     else \
-+				 getyx(newscr,(y), (x)); \
-+			} \
- 		    } while(0)
--#define setsyx(y,x) do { if((y)==-1 && (x)==-1) newscr->_leaveok=TRUE; \
--			 else {newscr->_leaveok=FALSE;wmove(newscr,(y),(x));} \
-+
-+#define setsyx(y,x) do { if (newscr) { \
-+			    if ((y) == -1 && (x) == -1) \
-+				leaveok(newscr, TRUE); \
-+			    else { \
-+				leaveok(newscr, FALSE); \
-+				wmove(newscr, (y), (x)); \
-+			    } \
-+			} \
- 		    } while(0)
- 
- #ifndef NCURSES_NOMACROS
-@@ -918,15 +949,17 @@
- #define gettmode()
- 
- /* It seems older SYSV curses versions define these */
--#define getattrs(win)		((win)?(win)->_attrs:A_NORMAL)
--#define getcurx(win)		((win)?(win)->_curx:ERR)
--#define getcury(win)		((win)?(win)->_cury:ERR)
--#define getbegx(win)		((win)?(win)->_begx:ERR)
--#define getbegy(win)		((win)?(win)->_begy:ERR)
--#define getmaxx(win)		((win)?((win)->_maxx + 1):ERR)
--#define getmaxy(win)		((win)?((win)->_maxy + 1):ERR)
--#define getparx(win)		((win)?(win)->_parx:ERR)
--#define getpary(win)		((win)?(win)->_pary:ERR)
-+#if !NCURSES_OPAQUE
-+#define getattrs(win)		((win) ? (win)->_attrs : A_NORMAL)
-+#define getcurx(win)		((win) ? (win)->_curx : ERR)
-+#define getcury(win)		((win) ? (win)->_cury : ERR)
-+#define getbegx(win)		((win) ? (win)->_begx : ERR)
-+#define getbegy(win)		((win) ? (win)->_begy : ERR)
-+#define getmaxx(win)		((win) ? ((win)->_maxx + 1) : ERR)
-+#define getmaxy(win)		((win) ? ((win)->_maxy + 1) : ERR)
-+#define getparx(win)		((win) ? (win)->_parx : ERR)
-+#define getpary(win)		((win) ? (win)->_pary : ERR)
-+#endif /* NCURSES_OPAQUE */
- 
- #define wstandout(win)      	(wattrset(win,A_STANDOUT))
- #define wstandend(win)      	(wattrset(win,A_NORMAL))
-@@ -934,12 +967,14 @@
- #define wattron(win,at)		wattr_on(win, NCURSES_CAST(attr_t, at), NULL)
- #define wattroff(win,at)	wattr_off(win, NCURSES_CAST(attr_t, at), NULL)
- 
-+#if !NCURSES_OPAQUE
- #if defined(_XOPEN_SOURCE_EXTENDED) && @NCURSES_EXT_COLORS@
- #define wattrset(win,at)	((win)->_color = PAIR_NUMBER(at), \
- 				 (win)->_attrs = (at))
- #else
- #define wattrset(win,at)	((win)->_attrs = (at))
- #endif
-+#endif /* NCURSES_OPAQUE */
- 
- #define scroll(win)		wscrl(win,1)
- 
-@@ -956,7 +991,10 @@
- #define winchstr(w, s)		winchnstr(w, s, -1)
- #define winsstr(w, s)		winsnstr(w, s, -1)
- 
-+#if !NCURSES_OPAQUE
- #define redrawwin(win)		wredrawln(win, 0, (win)->_maxy+1)
-+#endif /* NCURSES_OPAQUE */
-+
- #define waddstr(win,str)	waddnstr(win,str,-1)
- #define waddchstr(win,str)	waddchnstr(win,str,-1)
- 
-@@ -1064,27 +1102,31 @@
- /*
-  * Some wide-character functions can be implemented without the extensions.
-  */
-+#if !NCURSES_OPAQUE
- #define getbkgd(win)                    ((win)->_bkgd)
-+#endif /* NCURSES_OPAQUE */
- 
- #define slk_attr_off(a,v)		((v) ? ERR : slk_attroff(a))
- #define slk_attr_on(a,v)		((v) ? ERR : slk_attron(a))
- 
-+#if !NCURSES_OPAQUE
- #if defined(_XOPEN_SOURCE_EXTENDED) && @NCURSES_EXT_COLORS@
- #define wattr_set(win,a,p,opts)		((win)->_attrs = ((a) & ~A_COLOR), \
- 					 (win)->_color = (p), \
- 					 OK)
--#define wattr_get(win,a,p,opts)		((void)((a) != 0 && (*(a) = (win)->_attrs)), \
--					 (void)((p) != 0 && (*(p) = (win)->_color)), \
-+#define wattr_get(win,a,p,opts)		((void)((a) != (void *)0 && (*(a) = (win)->_attrs)), \
-+					 (void)((p) != (void *)0 && (*(p) = (win)->_color)), \
- 					 OK)
- #else
- #define wattr_set(win,a,p,opts)		((win)->_attrs = (((a) & ~A_COLOR) | COLOR_PAIR(p)), OK)
--#define wattr_get(win,a,p,opts)		((void)((a) != 0 && (*(a) = (win)->_attrs)), \
--					 (void)((p) != 0 && (*(p) = PAIR_NUMBER((win)->_attrs))), \
-+#define wattr_get(win,a,p,opts)		((void)((a) != (void *)0 && (*(a) = (win)->_attrs)), \
-+					 (void)((p) != (void *)0 && (*(p) = PAIR_NUMBER((win)->_attrs))), \
- 					 OK)
- #endif
-+#endif /* NCURSES_OPAQUE */
- 
- /*
-- * XSI curses deprecates SVr4 vwprintw/vwscanw, which are supposed to use
-+ * X/Open curses deprecates SVr4 vwprintw/vwscanw, which are supposed to use
-  * varargs.h.  It adds new calls vw_printw/vw_scanw, which are supposed to
-  * use POSIX stdarg.h.  The ncurses versions of vwprintw/vwscanw already
-  * use stdarg.h, so...
-@@ -1100,9 +1142,76 @@
- NCURSES_EXPORT(int) vsscanf(const char *, const char *, va_list);
- #endif
- 
-+/*
-+ * These macros are extensions - not in X/Open Curses.
-+ */
-+#if @NCURSES_EXT_FUNCS@
-+#if !NCURSES_OPAQUE
-+#define is_cleared(win)		((win)->_clear)
-+#define is_idcok(win)		((win)->_idcok)
-+#define is_idlok(win)		((win)->_idlok)
-+#define is_immedok(win)		((win)->_immed)
-+#define is_keypad(win)		((win)->_use_keypad)
-+#define is_leaveok(win)		((win)->_leaveok)
-+#define is_nodelay(win)		((win)->_delay == 0)
-+#define is_notimeout(win)	((win)->_notimeout)
-+#define is_scrollok(win)	((win)->_scroll)
-+#define is_syncok(win)		((win)->_sync)
-+#define wgetparent(win)		((win) ? (win)->_parent : 0)
-+#define wgetscrreg(win,t,b)	((win) ? (*(t) = (win)->_regtop, *(b) = (win)->_regbottom, OK) : ERR)
-+#endif
-+#endif
-+
- #endif /* NCURSES_NOMACROS */
- 
- /*
-+ * Public variables.
-+ *
-+ * Notes:
-+ *	a. ESCDELAY was an undocumented feature under AIX curses.
-+ *	   It gives the ESC expire time in milliseconds.
-+ *	b. ttytype is needed for backward compatibility
-+ */
-+#if @cf_cv_enable_reentrant@
-+
-+NCURSES_WRAPPED_VAR(WINDOW *, curscr);
-+NCURSES_WRAPPED_VAR(WINDOW *, newscr);
-+NCURSES_WRAPPED_VAR(WINDOW *, stdscr);
-+NCURSES_WRAPPED_VAR(char *, ttytype);
-+NCURSES_WRAPPED_VAR(int, COLORS);
-+NCURSES_WRAPPED_VAR(int, COLOR_PAIRS);
-+NCURSES_WRAPPED_VAR(int, COLS);
-+NCURSES_WRAPPED_VAR(int, ESCDELAY);
-+NCURSES_WRAPPED_VAR(int, LINES);
-+NCURSES_WRAPPED_VAR(int, TABSIZE);
-+
-+#define curscr      NCURSES_PUBLIC_VAR(curscr())
-+#define newscr      NCURSES_PUBLIC_VAR(newscr())
-+#define stdscr      NCURSES_PUBLIC_VAR(stdscr())
-+#define ttytype     NCURSES_PUBLIC_VAR(ttytype())
-+#define COLORS      NCURSES_PUBLIC_VAR(COLORS())
-+#define COLOR_PAIRS NCURSES_PUBLIC_VAR(COLOR_PAIRS())
-+#define COLS        NCURSES_PUBLIC_VAR(COLS())
-+#define ESCDELAY    NCURSES_PUBLIC_VAR(ESCDELAY())
-+#define LINES       NCURSES_PUBLIC_VAR(LINES())
-+#define TABSIZE     NCURSES_PUBLIC_VAR(TABSIZE())
-+
-+#else
-+
-+extern NCURSES_EXPORT_VAR(WINDOW *) curscr;
-+extern NCURSES_EXPORT_VAR(WINDOW *) newscr;
-+extern NCURSES_EXPORT_VAR(WINDOW *) stdscr;
-+extern NCURSES_EXPORT_VAR(char) ttytype[];
-+extern NCURSES_EXPORT_VAR(int) COLORS;
-+extern NCURSES_EXPORT_VAR(int) COLOR_PAIRS;
-+extern NCURSES_EXPORT_VAR(int) COLS;
-+extern NCURSES_EXPORT_VAR(int) ESCDELAY;
-+extern NCURSES_EXPORT_VAR(int) LINES;
-+extern NCURSES_EXPORT_VAR(int) TABSIZE;
-+
-+#endif
-+
-+/*
-  * Pseudo-character tokens outside ASCII range.  The curses wgetch() function
-  * will return any given one of these only if the corresponding k- capability
-  * is defined in your terminal's terminfo entry.
-diff -Naur ncurses-5.6.orig/include/curses.tail ncurses-5.6/include/curses.tail
---- ncurses-5.6.orig/include/curses.tail	2006-05-27 12:28:29.000000000 -0400
-+++ ncurses-5.6/include/curses.tail	2008-06-18 06:49:44.000000000 -0400
-@@ -1,8 +1,9 @@
-+/* $Id: curses.tail,v 1.15 2007/03/10 17:51:24 tom Exp $ */
- /*
-+ * vile:cmode:
-  * This file is part of ncurses, designed to be appended after curses.h.in
-  * (see that file for the relevant copyright).
-  */
--/* $Id: curses.tail,v 1.14 2006/05/27 16:28:29 tom Exp $ */
- 
- /* mouse interface */
- 
-diff -Naur ncurses-5.6.orig/include/curses.wide ncurses-5.6/include/curses.wide
---- ncurses-5.6.orig/include/curses.wide	2006-05-27 15:44:23.000000000 -0400
-+++ ncurses-5.6/include/curses.wide	2008-06-18 06:49:44.000000000 -0400
-@@ -1,11 +1,11 @@
-+/* $Id: curses.wide,v 1.34 2007/03/10 17:52:23 tom Exp $ */
- /*
-+ * vile:cmode:
-  * This file is part of ncurses, designed to be appended after curses.h.in
-  * (see that file for the relevant copyright).
-  */
- #ifdef _XOPEN_SOURCE_EXTENDED
- 
--/* $Id: curses.wide,v 1.32 2006/05/27 19:44:23 tom Exp $ */
--
- extern NCURSES_EXPORT_VAR(cchar_t *) _nc_wacs;
- 
- #define NCURSES_WACS(c)	(&_nc_wacs[(unsigned char)c])
-@@ -197,10 +197,13 @@
- #define wadd_wchstr(win,str)		wadd_wchnstr(win,str,-1)
- #define waddwstr(win,wstr)		waddnwstr(win,wstr,-1)
- #define wget_wstr(w,t)			wgetn_wstr(w,t,-1)
--#define wgetbkgrnd(win,wch)		(*wch = win->_bkgrnd, OK)
- #define win_wchstr(w,c)			win_wchnstr(w,c,-1)
- #define wins_wstr(w,t)			wins_nwstr(w,t,-1)
- 
-+#if !NCURSES_OPAQUE
-+#define wgetbkgrnd(win,wch)		(*wch = win->_bkgrnd, OK)
-+#endif
-+
- #define mvadd_wch(y,x,c)		mvwadd_wch(stdscr,y,x,c)
- #define mvadd_wchnstr(y,x,s,n)		mvwadd_wchnstr(stdscr,y,x,s,n)
- #define mvadd_wchstr(y,x,s)		mvwadd_wchstr(stdscr,y,x,s)
-diff -Naur ncurses-5.6.orig/include/headers ncurses-5.6/include/headers
---- ncurses-5.6.orig/include/headers	2001-04-07 16:52:04.000000000 -0400
-+++ ncurses-5.6/include/headers	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,6 @@
-+# $Id: headers,v 1.9 2007/01/20 19:57:04 Miroslav.Lichvar Exp $
- ##############################################################################
--# Copyright (c) 1998,2000,2001 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -26,10 +27,16 @@
- # authorization.                                                             #
- ##############################################################################
- #
--# Author: Thomas E. Dickey <dickey@clark.net> 1996
-+# Author: Thomas E. Dickey	1996-on
- #
- term.h
- curses.h
- unctrl.h
- termcap.h
- $(srcdir)/ncurses_dll.h
-+@ ticlib
-+$(srcdir)/tic.h
-+$(srcdir)/term_entry.h
-+$(srcdir)/nc_tparm.h
-+
-+# vile:makemode
-diff -Naur ncurses-5.6.orig/include/nc_alloc.h ncurses-5.6/include/nc_alloc.h
---- ncurses-5.6.orig/include/nc_alloc.h	2005-01-15 19:27:35.000000000 -0500
-+++ ncurses-5.6/include/nc_alloc.h	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -29,7 +29,7 @@
- /****************************************************************************
-  *  Author: Thomas E. Dickey <dickey@clark.net> 1996,1997                   *
-  ****************************************************************************/
--/* $Id: nc_alloc.h,v 1.13 2005/01/16 00:27:35 tom Exp $ */
-+/* $Id: nc_alloc.h,v 1.15 2007/02/03 18:40:23 tom Exp $ */
- 
- #ifndef NC_ALLOC_included
- #define NC_ALLOC_included 1
-@@ -67,8 +67,11 @@
- #define HAVE_NC_FREEALL 1
- struct termtype;
- extern NCURSES_EXPORT(void) _nc_free_and_exit(int) GCC_NORETURN;
-+extern NCURSES_EXPORT(void) _nc_free_tinfo(int) GCC_NORETURN;
-+extern NCURSES_EXPORT(void) _nc_free_tic(int) GCC_NORETURN;
- extern NCURSES_EXPORT(void) _nc_free_tparm(void);
- extern NCURSES_EXPORT(void) _nc_leaks_dump_entry(void);
-+extern NCURSES_EXPORT(void) _nc_leaks_tic(void);
- #define ExitProgram(code) _nc_free_and_exit(code)
- #endif
- 
-@@ -87,6 +90,9 @@
- extern NCURSES_EXPORT(char *) _nc_strdup(const char *);
- #endif
- 
-+/* entries.c */
-+extern NCURSES_EXPORT(void) _nc_leaks_tinfo(void);
-+
- #define typeMalloc(type,elts) (type *)malloc((elts)*sizeof(type))
- #define typeCalloc(type,elts) (type *)calloc((elts),sizeof(type))
- #define typeRealloc(type,elts,ptr) (type *)_nc_doalloc(ptr, (elts)*sizeof(type))
-diff -Naur ncurses-5.6.orig/include/ncurses_defs ncurses-5.6/include/ncurses_defs
---- ncurses-5.6.orig/include/ncurses_defs	2006-08-05 15:27:02.000000000 -0400
-+++ ncurses-5.6/include/ncurses_defs	2008-06-18 06:49:47.000000000 -0400
-@@ -1,6 +1,6 @@
--# $Id: ncurses_defs,v 1.30 2006/08/05 19:27:02 tom Exp $
-+# $Id: ncurses_defs,v 1.38 2008/02/10 00:12:03 tom Exp $
- ##############################################################################
--# Copyright (c) 2000-2005,2006 Free Software Foundation, Inc.                #
-+# Copyright (c) 2000-2007,2008 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -33,10 +33,8 @@
- 
- BROKEN_LINKER
- BSD_TPUTS
--CC_HAS_INLINE_FUNCS
- CC_HAS_PROTOS
- CPP_HAS_PARAM_INIT
--CPP_HAS_VSCAN_FUNC
- CURSES_ACS_ARRAY	acs_map
- CURSES_WACS_ARRAY	_nc_wacs
- DECL_ERRNO
-@@ -48,6 +46,8 @@
- HAVE_BSD_SIGNAL_H
- HAVE_BTOWC 
- HAVE_BUILTIN_H
-+HAVE_CHGAT	1
-+HAVE_COLOR_SET	1
- HAVE_DIRENT_H
- HAVE_ERRNO
- HAVE_FCNTL_H
-@@ -60,6 +60,7 @@
- HAVE_GETEUID
- HAVE_GETMAXX	1
- HAVE_GETNSTR
-+HAVE_GETPARX	1
- HAVE_GETOPT_H
- HAVE_GETTIMEOFDAY
- HAVE_GETTTYNAM
-@@ -68,6 +69,7 @@
- HAVE_GPP_BUILTIN_H
- HAVE_GXX_BUILTIN_H
- HAVE_HAS_KEY
-+HAVE_IOSTREAM
- HAVE_ISASCII
- HAVE_ISSETUGID
- HAVE_LANGINFO_CODESET
-@@ -159,6 +161,7 @@
- HAVE_WRESIZE
- HAVE__DOSCAN
- MIXEDCASE_FILENAMES
-+NCURSES_CHAR_EQ
- NCURSES_EXPANDED
- NCURSES_EXT_COLORS
- NCURSES_EXT_FUNCS
-@@ -189,12 +192,10 @@
- USE_MY_MEMMOVE
- USE_OK_BCOPY
- USE_RCS_IDS
-+USE_REENTRANT
- USE_SAFE_SPRINTF
- USE_SCROLL_HINTS
- USE_SIGWINCH
--USE_STDIO_VSCAN
--USE_STRSTREAM_VSCAN
--USE_STRSTREAM_VSCAN_CAST
- USE_SYMLINKS
- USE_SYSMOUSE
- USE_TERMCAP
-diff -Naur ncurses-5.6.orig/include/ncurses_dll.h ncurses-5.6/include/ncurses_dll.h
---- ncurses-5.6.orig/include/ncurses_dll.h	2006-04-22 18:07:51.000000000 -0400
-+++ ncurses-5.6/include/ncurses_dll.h	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -25,7 +25,7 @@
-  * sale, use or other dealings in this Software without prior written       *
-  * authorization.                                                           *
-  ****************************************************************************/
--/* $Id: ncurses_dll.h,v 1.5 2006/04/22 22:07:51 tom Exp $ */
-+/* $Id: ncurses_dll.h,v 1.6 2007/03/10 19:21:49 tom Exp $ */
- 
- #ifndef NCURSES_DLL_H_incl
- #define NCURSES_DLL_H_incl 1
-@@ -76,4 +76,11 @@
- #  define NCURSES_EXPORT_VAR(type) NCURSES_IMPEXP type
- #endif
- 
-+/*
-+ * For reentrant code, we map the various global variables into SCREEN by
-+ * using functions to access them.
-+ */
-+#define NCURSES_PUBLIC_VAR(name) _nc_##name
-+#define NCURSES_WRAPPED_VAR(type,name) extern type NCURSES_PUBLIC_VAR(name)(void)
-+
- #endif /* NCURSES_DLL_H_incl */
-diff -Naur ncurses-5.6.orig/include/tic.h ncurses-5.6/include/tic.h
---- ncurses-5.6.orig/include/tic.h	2006-08-19 10:17:49.000000000 -0400
-+++ ncurses-5.6/include/tic.h	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -33,7 +33,7 @@
-  ****************************************************************************/
- 
- /*
-- * $Id: tic.h,v 1.55 2006/08/19 14:17:49 tom Exp $
-+ * $Id: tic.h,v 1.62 2007/08/11 16:12:43 tom Exp $
-  *	tic.h - Global variables and structures for the terminfo
-  *			compiler.
-  */
-@@ -164,16 +164,6 @@
- extern NCURSES_EXPORT_VAR(struct token)	_nc_curr_token;
- 
- 	/*
--	 * List of keynames with their corresponding code.
--	 */
--struct kn {
--	const char *name;
--	int code;
--};
--
--extern NCURSES_EXPORT_VAR(const struct kn) _nc_key_names[];
--
--	/*
- 	 * Offsets to string capabilities, with the corresponding functionkey
- 	 * codes.
- 	 */
-@@ -185,11 +175,11 @@
- #if	BROKEN_LINKER
- 
- #define	_nc_tinfo_fkeys	_nc_tinfo_fkeysf()
--extern NCURSES_EXPORT(struct tinfo_fkeys *) _nc_tinfo_fkeysf (void);
-+extern NCURSES_EXPORT(const struct tinfo_fkeys *) _nc_tinfo_fkeysf (void);
- 
- #else
- 
--extern NCURSES_EXPORT_VAR(struct tinfo_fkeys) _nc_tinfo_fkeys[];
-+extern NCURSES_EXPORT_VAR(const struct tinfo_fkeys) _nc_tinfo_fkeys[];
- 
- #endif
- 
-@@ -214,14 +204,9 @@
- 	const char	*source;
- };
- 
--extern NCURSES_EXPORT_VAR(const struct name_table_entry * const) _nc_info_hash_table[];
--extern NCURSES_EXPORT_VAR(const struct name_table_entry * const) _nc_cap_hash_table[];
--
--extern NCURSES_EXPORT_VAR(const struct alias) _nc_capalias_table[];
--extern NCURSES_EXPORT_VAR(const struct alias) _nc_infoalias_table[];
--
- extern NCURSES_EXPORT(const struct name_table_entry *) _nc_get_table (bool);
--extern NCURSES_EXPORT(const struct name_table_entry * const *) _nc_get_hash_table (bool);
-+extern NCURSES_EXPORT(const short *) _nc_get_hash_table (bool);
-+extern NCURSES_EXPORT(const struct alias *) _nc_get_alias_table (bool);
- 
- #define NOTFOUND	((struct name_table_entry *) 0)
- 
-@@ -259,7 +244,7 @@
- 
- /* comp_hash.c: name lookup */
- extern NCURSES_EXPORT(struct name_table_entry const *) _nc_find_entry
--	(const char *, const struct name_table_entry *const *);
-+	(const char *, const short *);
- extern NCURSES_EXPORT(struct name_table_entry const *) _nc_find_type_entry
- 	(const char *, int, const struct name_table_entry *);
- 
-diff -Naur ncurses-5.6.orig/install-sh ncurses-5.6/install-sh
---- ncurses-5.6.orig/install-sh	2001-06-22 10:37:33.000000000 -0400
-+++ ncurses-5.6/install-sh	2008-06-18 06:49:44.000000000 -0400
-@@ -1,19 +1,37 @@
- #! /bin/sh
- #
- # install - install a program, script, or datafile
--# This comes from X11R5 (mit/util/scripts/install.sh).
- #
--# Copyright 1991 by the Massachusetts Institute of Technology
-+# This originates from X11R5 (mit/util/scripts/install.sh), which was
-+# later released in X11R6 (xc/config/util/install.sh) with the
-+# following copyright and license.
- #
--# Permission to use, copy, modify, distribute, and sell this software and its
--# documentation for any purpose is hereby granted without fee, provided that
--# the above copyright notice appear in all copies and that both that
--# copyright notice and this permission notice appear in supporting
--# documentation, and that the name of M.I.T. not be used in advertising or
--# publicity pertaining to distribution of the software without specific,
--# written prior permission.  M.I.T. makes no representations about the
--# suitability of this software for any purpose.  It is provided "as is"
--# without express or implied warranty.
-+# Copyright (C) 1994 X Consortium
-+#
-+# Permission is hereby granted, free of charge, to any person obtaining a copy
-+# of this software and associated documentation files (the "Software"), to
-+# deal in the Software without restriction, including without limitation the
-+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-+# sell copies of the Software, and to permit persons to whom the Software is
-+# furnished to do so, subject to the following conditions:
-+#
-+# The above copyright notice and this permission notice shall be included in
-+# all copies or substantial portions of the Software.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+#
-+# Except as contained in this notice, the name of the X Consortium shall not
-+# be used in advertising or otherwise to promote the sale, use or other deal-
-+# ings in this Software without prior written authorization from the X Consor-
-+# tium.
-+#
-+#
-+# FSF changes to this file are in the public domain.
- #
- # Calling this script install-sh is preferred over install.sh, to prevent
- # `make' implicit rules from creating a file called install from it
-@@ -56,7 +74,7 @@
- 
- while [ x"$1" != x ]; do
-     case $1 in
--	-c) instcmd="$cpprog"
-+	-c) instcmd=$cpprog
- 	    shift
- 	    continue;;
- 
-@@ -79,7 +97,7 @@
- 	    shift
- 	    continue;;
- 
--	-s) stripcmd="$stripprog"
-+	-s) stripcmd=$stripprog
- 	    shift
- 	    continue;;
- 
-@@ -106,7 +124,7 @@
- 
- if [ x"$src" = x ]
- then
--	echo "install:	no input file specified"
-+	echo "$0: no input file specified" >&2
- 	exit 1
- else
- 	:
-@@ -116,7 +134,7 @@
- 	dst=$src
- 	src=""
- 
--	if [ -d $dst ]; then
-+	if [ -d "$dst" ]; then
- 		instcmd=:
- 		chmodcmd=""
- 	else
-@@ -128,17 +146,17 @@
- # might cause directories to be created, which would be especially bad
- # if $src (and thus $dsttmp) contains '*'.
- 
--	if [ -f $src -o -d $src ]
-+	if [ -f "$src" ] || [ -d "$src" ]
- 	then
- 		:
- 	else
--		echo "install:  $src does not exist"
-+		echo "$0: $src does not exist" >&2
- 		exit 1
- 	fi
- 
- 	if [ x"$dst" = x ]
- 	then
--		echo "install:	no destination specified"
-+		echo "$0: no destination specified" >&2
- 		exit 1
- 	else
- 		:
-@@ -147,16 +165,16 @@
- # If destination is a directory, append the input filename; if your system
- # does not like double slashes in filenames, you may need to add some logic
- 
--	if [ -d $dst ]
-+	if [ -d "$dst" ]
- 	then
--		dst="$dst"/`basename $src`
-+		dst=$dst/`basename "$src"`
- 	else
- 		:
- 	fi
- fi
- 
- ## this sed command emulates the dirname command
--dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-+dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
- 
- # Make sure that the destination directory exists.
- #  this part is taken from Noah Friedman's mkinstalldirs script
-@@ -165,48 +183,48 @@
- if [ ! -d "$dstdir" ]; then
- defaultIFS='
- 	'
--IFS="${IFS-${defaultIFS}}"
-+IFS="${IFS-$defaultIFS}"
- 
--oIFS="${IFS}"
-+oIFS=$IFS
- # Some sh's can't handle IFS=/ for some reason.
- IFS='%'
--set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
--IFS="${oIFS}"
-+set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-+IFS=$oIFS
- 
- pathcomp=''
- 
- while [ $# -ne 0 ] ; do
--	pathcomp="${pathcomp}${1}"
-+	pathcomp=$pathcomp$1
- 	shift
- 
--	if [ ! -d "${pathcomp}" ] ;
-+	if [ ! -d "$pathcomp" ] ;
-         then
--		$mkdirprog "${pathcomp}"
-+		$mkdirprog "$pathcomp"
- 	else
- 		:
- 	fi
- 
--	pathcomp="${pathcomp}/"
-+	pathcomp=$pathcomp/
- done
- fi
- 
- if [ x"$dir_arg" != x ]
- then
--	$doit $instcmd $dst &&
-+	$doit $instcmd "$dst" &&
- 
--	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
--	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
--	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
--	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
-+	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
-+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
-+	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
-+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
- else
- 
- # If we're going to rename the final executable, determine the name now.
- 
- 	if [ x"$transformarg" = x ]
- 	then
--		dstfile=`basename $dst`
-+		dstfile=`basename "$dst"`
- 	else
--		dstfile=`basename $dst $transformbasename |
-+		dstfile=`basename "$dst" $transformbasename |
- 			sed $transformarg`$transformbasename
- 	fi
- 
-@@ -214,20 +232,24 @@
- 
- 	if [ x"$dstfile" = x ]
- 	then
--		dstfile=`basename $dst`
-+		dstfile=`basename "$dst"`
- 	else
- 		:
- 	fi
- 
--# Make a temp file name in the proper directory.
-+# Make a couple of temp file names in the proper directory.
- 
- 	dsttmp=$dstdir/#inst.$$#
-+	rmtmp=$dstdir/#rm.$$#
- 
--# Move or copy the file name to the temp name
-+# Trap to clean up temp files at exit.
- 
--	$doit $instcmd $src $dsttmp &&
-+	trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
-+	trap '(exit $?); exit' 1 2 13 15
- 
--	trap "rm -f ${dsttmp}" 0 &&
-+# Move or copy the file name to the temp name
-+
-+	$doit $instcmd "$src" "$dsttmp" &&
- 
- # and set any options; do chmod last to preserve setuid bits
- 
-@@ -235,17 +257,38 @@
- # ignore errors from any of these, just make sure not to ignore
- # errors from the above "$doit $instcmd $src $dsttmp" command.
- 
--	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
--	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
--	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
--	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&
-+	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
-+	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
-+	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
-+	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
-+
-+# Now remove or move aside any old file at destination location.  We try this
-+# two ways since rm can't unlink itself on some systems and the destination
-+# file might be busy for other reasons.  In this case, the final cleanup
-+# might fail but the new file should still install successfully.
-+
-+{
-+	if [ -f "$dstdir/$dstfile" ]
-+	then
-+		$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
-+		$doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
-+		{
-+		  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-+		  (exit 1); exit
-+		}
-+	else
-+		:
-+	fi
-+} &&
- 
- # Now rename the file to the real destination.
- 
--	$doit $rmcmd -f $dstdir/$dstfile &&
--	$doit $mvcmd $dsttmp $dstdir/$dstfile
-+	$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
- 
- fi &&
- 
-+# The final little trick to "correctly" pass the exit status to the exit trap.
- 
--exit 0
-+{
-+	(exit 0); exit
-+}
-diff -Naur ncurses-5.6.orig/man/Makefile.in ncurses-5.6/man/Makefile.in
---- ncurses-5.6.orig/man/Makefile.in	2005-07-16 13:26:45.000000000 -0400
-+++ ncurses-5.6/man/Makefile.in	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
--# $Id: Makefile.in,v 1.39 2005/07/16 17:26:45 tom Exp $
-+# $Id: Makefile.in,v 1.41 2007/03/31 15:54:06 tom Exp $
- ##############################################################################
--# Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -52,7 +52,7 @@
- tags :
- 
- $(DESTDIR)$(mandir) :
--	sh $(srcdir)/../mkinstalldirs $@
-+	sh $(srcdir)/../mkdirs.sh $@
- 
- EDITARGS = $(DESTDIR)$(mandir) $(srcdir) terminfo.5 $(srcdir)/*.[0-9]*
- 
-@@ -77,4 +77,4 @@
- 	sh $(srcdir)/make_sed.sh @MANPAGE_RENAMES@ >../edit_man.sed
- 
- distclean realclean: clean
--	rm -f Makefile ../edit_man.*
-+	rm -f Makefile ../edit_man.* ../man_alias.*
-diff -Naur ncurses-5.6.orig/man/captoinfo.1m ncurses-5.6/man/captoinfo.1m
---- ncurses-5.6.orig/man/captoinfo.1m	2006-05-13 11:14:01.000000000 -0400
-+++ ncurses-5.6/man/captoinfo.1m	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,16 +27,16 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: captoinfo.1m,v 1.20 2006/05/13 15:14:01 tom Exp $
--.TH captoinfo 1M ""
-+.\" $Id: captoinfo.1m,v 1.22 2007/06/02 20:40:07 tom Exp $
-+.TH @CAPTOINFO@ 1M ""
- .ds n 5
- .ds d @TERMINFO@
- .SH NAME
--\fBcaptoinfo\fR - convert a \fItermcap\fR description into a \fIterminfo\fR description
-+\fB@CAPTOINFO@\fR - convert a \fItermcap\fR description into a \fIterminfo\fR description
- .SH SYNOPSIS
--\fBcaptoinfo\fR [\fB-v\fR\fIn\fR \fIwidth\fR]  [\fB-V\fR] [\fB-1\fR] [\fB-w\fR \fIwidth\fR] \fIfile\fR . . .
-+\fB@CAPTOINFO@\fR [\fB-v\fR\fIn\fR \fIwidth\fR]  [\fB-V\fR] [\fB-1\fR] [\fB-w\fR \fIwidth\fR] \fIfile\fR . . .
- .SH DESCRIPTION
--\fBcaptoinfo\fR looks in \fIfile\fR for \fBtermcap\fR descriptions.  For each
-+\fB@CAPTOINFO@\fR looks in \fIfile\fR for \fBtermcap\fR descriptions.  For each
- one found, an equivalent \fBterminfo\fR description is written to standard
- output.  Termcap \fBtc\fR capabilities are translated directly to terminfo
- \fBuse\fR capabilities.
-@@ -67,7 +67,7 @@
- .SH TRANSLATIONS FROM NONSTANDARD CAPABILITIES
- .PP
- Some obsolete nonstandard capabilities will automatically be translated
--into standard (SVr4/XSI Curses) terminfo capabilities by \fBcaptoinfo\fR.
-+into standard (SVr4/XSI Curses) terminfo capabilities by \fB@CAPTOINFO@\fR.
- Whenever one of these automatic translations is done, the program
- will issue an notification to stderr, inviting the user to check that
- it has not mistakenly translated a completely unknown and random
-@@ -145,7 +145,7 @@
- .TE
- .PP
- If the single-line capabilities occur in an entry, they will automatically
--be composed into an \fBacsc\fR string.  The double-line capabilities and
-+be composed into an \fIacsc\fR string.  The double-line capabilities and
- \fBGG\fR are discarded with a warning message.
- .PP
- IBM's AIX has a terminfo facility descended from SVr1 terminfo but incompatible
-@@ -164,17 +164,17 @@
- font3	s3ds
- .TE
- .PP
--Additionally, the AIX \fBbox1\fR capability will be automatically translated to
--an \fBacsc\fR string.
-+Additionally, the AIX \fIbox1\fR capability will be automatically translated to
-+an \fIacsc\fR string.
- .PP
- Hewlett-Packard's terminfo library supports two nonstandard terminfo
--capabilities \fBmeml\fR (memory lock) and \fBmemu\fR (memory unlock).
-+capabilities \fImeml\fR (memory lock) and \fImemu\fR (memory unlock).
- These will be discarded with a warning message.
- .SH NOTES
--This utility is actually a link to \fItic\fR(1M), running in \fI-I\fR mode.
--You can use other \fItic\fR options such as \fB-f\fR and  \fB-x\fR.
-+This utility is actually a link to \fB@TIC@\fR(1M), running in \fI-I\fR mode.
-+You can use other \fB@TIC@\fR options such as \fB-f\fR and  \fB-x\fR.
- .PP
--The trace option isn't identical to SVr4's.  Under SVr4, instead of following
-+The trace option is not identical to SVr4's.  Under SVr4, instead of following
- the \fB-v\fR with a trace level n, you repeat it n times.
- .SH SEE ALSO
- \fB@INFOCMP@\fR(1M),
-diff -Naur ncurses-5.6.orig/man/clear.1 ncurses-5.6/man/clear.1
---- ncurses-5.6.orig/man/clear.1	2006-07-01 17:55:09.000000000 -0400
-+++ ncurses-5.6/man/clear.1	2008-06-18 06:49:44.000000000 -0400
-@@ -26,20 +26,20 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: clear.1,v 1.5 2006/07/01 21:55:09 tom Exp $
--.TH clear 1 ""
-+.\" $Id: clear.1,v 1.6 2006/12/24 18:07:53 tom Exp $
-+.TH @CLEAR@ 1 ""
- .ds n 5
- .SH NAME
--\fBclear\fR - clear the terminal screen
-+\fB@CLEAR@\fR - clear the terminal screen
- .SH SYNOPSIS
--\fBclear\fR
-+\fB@CLEAR@\fR
- .br
- .SH DESCRIPTION
--\fBclear\fR clears your screen if this is possible.  It looks in the
-+\fB@CLEAR@\fR clears your screen if this is possible.  It looks in the
- environment for the terminal type and then in the \fBterminfo\fR database to
- figure out how to clear the screen.
- .PP
--\fBclear\fR ignores any command-line parameters that may be present.
-+\fB@CLEAR@\fR ignores any command-line parameters that may be present.
- .SH SEE ALSO
- \fB@TPUT@\fR(1), \fBterminfo\fR(\*n)
- .PP
-diff -Naur ncurses-5.6.orig/man/curs_add_wch.3x ncurses-5.6/man/curs_add_wch.3x
---- ncurses-5.6.orig/man/curs_add_wch.3x	2006-12-02 12:02:35.000000000 -0500
-+++ ncurses-5.6/man/curs_add_wch.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_add_wch.3x,v 1.5 2006/12/02 17:02:35 tom Exp $
-+.\" $Id: curs_add_wch.3x,v 1.6 2006/12/24 15:22:22 tom Exp $
- .TH curs_add_wch 3X ""
- .SH NAME
- \fBadd_wch\fP,
-@@ -82,7 +82,7 @@
- -
- If the character part of \fIwch\fP is
- a tab, newline, backspace or other control character,
--the window is updated and the cursor moves as if \fBaddch\fR(3X) were called.
-+the window is updated and the cursor moves as if \fBaddch\fR were called.
- .PP
- The \fBecho_wchar\fP
- function is functionally equivalent to a call to
-@@ -122,7 +122,7 @@
- .PP
- \fBcurses\fR(3X),
- \fBcurs_addch\fR(3X),
--\fBcurs_attr_get\fR(3X),
-+\fBcurs_attr\fR(3X),
- \fBcurs_clear\fR(3X),
- \fBcurs_outopts\fR(3X),
- \fBcurs_refresh\fR(3X),
-diff -Naur ncurses-5.6.orig/man/curs_addch.3x ncurses-5.6/man/curs_addch.3x
---- ncurses-5.6.orig/man/curs_addch.3x	2006-12-02 12:02:22.000000000 -0500
-+++ ncurses-5.6/man/curs_addch.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,7 +27,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_addch.3x,v 1.25 2006/12/02 17:02:22 tom Exp $
-+.\" $Id: curs_addch.3x,v 1.27 2007/06/02 20:40:07 tom Exp $
- .TH curs_addch 3X ""
- .SH NAME
- \fBaddch\fR, \fBwaddch\fR, \fBmvaddch\fR, \fBmvwaddch\fR,
-@@ -87,7 +87,7 @@
- .SS Line Graphics
- The following variables may be used to add line drawing characters to the
- screen with routines of the \fBaddch\fR family.  The default character listed
--below is used if the \fBacsc\fR capability doesn't define a terminal-specific
-+below is used if the \fBacsc\fR capability does not define a terminal-specific
- replacement for it.
- The names are taken from VT100 nomenclature.
- .PP
-@@ -168,7 +168,7 @@
- \fBcurs_inch\fR(3X),
- \fBcurs_outopts\fR(3X),
- \fBcurs_refresh\fR(3X),
--\fBputc\fR(3S).
-+\fBputc\fR(3).
- .PP
- Comparable functions in the wide-character (ncursesw) library are
- described in
-diff -Naur ncurses-5.6.orig/man/curs_attr.3x ncurses-5.6/man/curs_attr.3x
---- ncurses-5.6.orig/man/curs_attr.3x	2006-07-15 14:39:05.000000000 -0400
-+++ ncurses-5.6/man/curs_attr.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,7 +27,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_attr.3x,v 1.30 2006/07/15 18:39:05 tom Exp $
-+.\" $Id: curs_attr.3x,v 1.31 2007/03/17 20:30:33 tom Exp $
- .TH curs_attr 3X ""
- .na
- .hy 0
-@@ -253,6 +253,9 @@
- if the window pointer is null.
- The \fBwcolor_set\fP function returns an error if the color pair parameter
- is outside the range 0..COLOR_PAIRS-1.
-+This implementation also provides
-+\fBgetattrs\fR
-+for compatibility with older versions of curses.
- .SH SEE ALSO
- \fBcurses\fR(3X),
- \fBcurs_addch\fR(3X),
-diff -Naur ncurses-5.6.orig/man/curs_border.3x ncurses-5.6/man/curs_border.3x
---- ncurses-5.6.orig/man/curs_border.3x	2006-02-25 16:49:19.000000000 -0500
-+++ ncurses-5.6/man/curs_border.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_border.3x,v 1.18 2006/02/25 21:49:19 tom Exp $
-+.\" $Id: curs_border.3x,v 1.19 2007/02/24 16:15:38 tom Exp $
- .TH curs_border 3X ""
- .na
- .hy 0
-@@ -64,9 +64,9 @@
- .br
- \fBint wvline(WINDOW *win, chtype ch, int n);\fR
- .br
--\fBmvhline(int y, int x, chtype ch, int n);\fR
-+\fBint mvhline(int y, int x, chtype ch, int n);\fR
- .br
--\fBmvwhline(WINDOW *, int y, int x, chtype ch, int n);\fR
-+\fBint mvwhline(WINDOW *, int y, int x, chtype ch, int n);\fR
- .br
- \fBint mvvline(int y, int x, chtype ch, int n);\fR
- .br
-diff -Naur ncurses-5.6.orig/man/curs_clear.3x ncurses-5.6/man/curs_clear.3x
---- ncurses-5.6.orig/man/curs_clear.3x	2005-10-01 15:34:43.000000000 -0400
-+++ ncurses-5.6/man/curs_clear.3x	2008-06-18 06:49:45.000000000 -0400
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998,2005 Free Software Foundation, Inc.                   *
-+.\" Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_clear.3x,v 1.10 2005/10/01 19:34:43 tom Exp $
-+.\" $Id: curs_clear.3x,v 1.11 2007/12/29 15:58:38 tom Exp $
- .TH curs_clear 3X ""
- .na
- .hy 0
-@@ -105,6 +105,12 @@
- That fact is not documented in other implementations,
- and may not be true of implementations
- which were not derived from SVr4 source.
-+.PP
-+Not obvious from the description,
-+most implementations clear the screen after \fBwclear\fP
-+even for a subwindow or derived window.
-+If you do not want to clear the screen during the next \fBwrefresh\fP,
-+use \fBwerase\fP instead.
- .SH SEE ALSO
- \fBcurses\fR(3X), \fBcurs_outopts\fR(3X), \fBcurs_refresh\fR(3X)
- .\"#
-diff -Naur ncurses-5.6.orig/man/curs_deleteln.3x ncurses-5.6/man/curs_deleteln.3x
---- ncurses-5.6.orig/man/curs_deleteln.3x	2006-02-25 16:49:19.000000000 -0500
-+++ ncurses-5.6/man/curs_deleteln.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_deleteln.3x,v 1.10 2006/02/25 21:49:19 tom Exp $
-+.\" $Id: curs_deleteln.3x,v 1.11 2007/06/02 20:40:07 tom Exp $
- .TH curs_deleteln 3X ""
- .SH NAME
- \fBdeleteln\fR,
-@@ -79,7 +79,7 @@
- Note that all but \fBwinsdelln\fR may be macros.
- .PP
- These routines do not require a hardware line delete or insert feature in the
--terminal.  In fact, they won't use hardware line delete/insert unless
-+terminal.  In fact, they will not use hardware line delete/insert unless
- \fBidlok(..., TRUE)\fR has been set on the current window.
- .SH SEE ALSO
- \fBcurses\fR(3X)
-diff -Naur ncurses-5.6.orig/man/curs_extend.3x ncurses-5.6/man/curs_extend.3x
---- ncurses-5.6.orig/man/curs_extend.3x	2006-02-25 16:04:43.000000000 -0500
-+++ ncurses-5.6/man/curs_extend.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -28,7 +28,7 @@
- .\"
- .\" Author: Thomas E. Dickey 1999-on
- .\"
--.\" $Id: curs_extend.3x,v 1.15 2006/02/25 21:04:43 tom Exp $
-+.\" $Id: curs_extend.3x,v 1.17 2006/12/24 18:01:48 tom Exp $
- .TH curs_extend 3X ""
- .SH NAME
- \fBcurses_version\fP,
-@@ -56,7 +56,7 @@
- which may be compiled into the terminfo
- description, i.e., via the terminfo or termcap interfaces.
- Normally these names are available for use, since the essential decision
--is made by using the \fB-x\fP option of \fItic\fP to compile
-+is made by using the \fB-x\fP option of \fB@TIC@\fP to compile
- extended terminal definitions.
- However you can disable this feature
- to ensure compatibility with other implementations of curses.
-@@ -68,11 +68,11 @@
- \fBcurs_getch\fR(3X),
- \fBcurs_mouse\fR(3X),
- \fBcurs_print\fR(3X),
-+\fBcurs_util\fR(3X),
- \fBdefault_colors\fR(3X),
- \fBdefine_key\fR(3X),
- \fBkeybound\fR(3X),
- \fBkeyok\fR(3X),
--\fBnofilter\fR(3X),
- \fBresizeterm\fR(3X),
- \fBwresize\fR(3X).
- .SH AUTHOR
-diff -Naur ncurses-5.6.orig/man/curs_getcchar.3x ncurses-5.6/man/curs_getcchar.3x
---- ncurses-5.6.orig/man/curs_getcchar.3x	2006-07-15 18:51:07.000000000 -0400
-+++ ncurses-5.6/man/curs_getcchar.3x	2008-06-18 06:49:50.000000000 -0400
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 2001-2003,2006 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 2001-2006,2008 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_getcchar.3x,v 1.8 2006/07/15 22:51:07 wcmbrine Exp $
-+.\" $Id: curs_getcchar.3x,v 1.11 2008/05/17 19:37:05 tom Exp $
- .TH curs_getcchar 3X ""
- .SH NAME
- \fBgetcchar\fP,
-@@ -106,9 +106,14 @@
- -
- The wide-character string pointed to by \fIwch\fP.
- The string must be L'\\0' terminated,
--contain at most one character with strictly positive width,
--which must be the first,
--and contain no characters of negative width.
-+contain at most one spacing character,
-+which must be the first.
-+.IP
-+Up to \fBCCHARW_MAX\fP-1 nonspacing characters may follow.
-+Additional nonspacing characters are ignored.
-+.IP
-+The string may contain a single control character instead.
-+In that case, no nonspacing characters are allowed.
- .SH NOTES
- .PP
- The \fIopts\fP argument is reserved for future use.
-@@ -132,10 +137,10 @@
- .SH SEE ALSO
- .PP
- Functions:
-+\fBcurs_attr\fR(3X),
-+\fBcurs_color\fR(3X),
- \fBcurses\fR(3X),
--\fBwcwidth\fR(3X),
--\fBcurs_attr_get\fR(3X),
--\fBcan_change_color\fR(3X).
-+\fBwcwidth\fR(3).
- .\"#
- .\"# The following sets edit modes for GNU EMACS
- .\"# Local Variables:
-diff -Naur ncurses-5.6.orig/man/curs_getyx.3x ncurses-5.6/man/curs_getyx.3x
---- ncurses-5.6.orig/man/curs_getyx.3x	2006-05-27 16:28:05.000000000 -0400
-+++ ncurses-5.6/man/curs_getyx.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2003,2006 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_getyx.3x,v 1.13 2006/05/27 20:28:05 tom Exp $
-+.\" $Id: curs_getyx.3x,v 1.16 2007/05/12 16:34:49 tom Exp $
- .TH curs_getyx 3X ""
- .SH NAME
- \fBgetyx\fR,
-@@ -69,7 +69,7 @@
- \fBgetmaxyx\fR
- macros are described in the XSI Curses standard, Issue 4.
- .PP
--This implementation also provides
-+This implementation also provides functions
- \fBgetbegx\fR,
- \fBgetbegy\fR,
- \fBgetcurx\fR,
-@@ -79,10 +79,25 @@
- \fBgetparx\fR and
- \fBgetpary\fR
- for compatibility with older versions of curses.
--X/Open does not define a corresponding \fBgetcuryx\fP function,
--though that would be needed to make references to the WINDOW structure opaque.
-+.PP
-+Although X/Open Curses does not address this,
-+many implementations provide members of the WINDOW structure
-+containing values corresponding to these macros.
-+For best portability, do not rely on using the data in WINDOW,
-+since some implementations make WINDOW opaque (do not allow
-+direct use of its members).
-+.PP
-+Besides the problem of opaque structures,
-+the data stored in like-named members may not have like-values in
-+different implementations.
-+For example, the WINDOW._maxx and WINDOW._maxy values in ncurses
-+have (at least since release 1.8.1) differed by one from some
-+other implementations.
-+The difference is hidden by means of the macro \fBgetmaxyx\fP.
- .SH SEE ALSO
--\fBcurses\fR(3X)
-+\fBcurses\fR(3X),
-+\fBcurs_legacy\fR(3X),
-+\fBcurs_opaque\fR(3X)
- .\"#
- .\"# The following sets edit modes for GNU EMACS
- .\"# Local Variables:
-diff -Naur ncurses-5.6.orig/man/curs_insstr.3x ncurses-5.6/man/curs_insstr.3x
---- ncurses-5.6.orig/man/curs_insstr.3x	2006-02-25 16:49:19.000000000 -0500
-+++ ncurses-5.6/man/curs_insstr.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_insstr.3x,v 1.17 2006/02/25 21:49:19 tom Exp $
-+.\" $Id: curs_insstr.3x,v 1.18 2006/12/24 14:59:30 tom Exp $
- .TH curs_insstr 3X ""
- .SH NAME
- \fBinsstr\fR,
-@@ -90,7 +90,7 @@
- Also, no implementation of curses documents this inconsistency.
- .SH SEE ALSO
- \fBcurses\fR(3X),
--\fBunctrl\fR(3X),
-+\fBcurs_util\fR(3X),
- \fBcurs_clear\fR(3X),
- \fBcurs_inch\fR(3X).
- .\"#
-diff -Naur ncurses-5.6.orig/man/curs_legacy.3x ncurses-5.6/man/curs_legacy.3x
---- ncurses-5.6.orig/man/curs_legacy.3x	1969-12-31 19:00:00.000000000 -0500
-+++ ncurses-5.6/man/curs_legacy.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -0,0 +1,93 @@
-+.\"***************************************************************************
-+.\" Copyright (c) 2007 Free Software Foundation, Inc.                        *
-+.\"                                                                          *
-+.\" Permission is hereby granted, free of charge, to any person obtaining a  *
-+.\" copy of this software and associated documentation files (the            *
-+.\" "Software"), to deal in the Software without restriction, including      *
-+.\" without limitation the rights to use, copy, modify, merge, publish,      *
-+.\" distribute, distribute with modifications, sublicense, and/or sell       *
-+.\" copies of the Software, and to permit persons to whom the Software is    *
-+.\" furnished to do so, subject to the following conditions:                 *
-+.\"                                                                          *
-+.\" The above copyright notice and this permission notice shall be included  *
-+.\" in all copies or substantial portions of the Software.                   *
-+.\"                                                                          *
-+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-+.\" IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-+.\" DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-+.\" OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-+.\" THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-+.\"                                                                          *
-+.\" Except as contained in this notice, the name(s) of the above copyright   *
-+.\" holders shall not be used in advertising or otherwise to promote the     *
-+.\" sale, use or other dealings in this Software without prior written       *
-+.\" authorization.                                                           *
-+.\"***************************************************************************
-+.\"
-+.\" $Id: curs_legacy.3x,v 1.1 2007/04/07 23:54:29 tom Exp $
-+.TH curs_legacy 3X ""
-+.SH NAME
-+\fBgetbegx\fR,
-+\fBgetbegy\fR,
-+\fBgetcurx\fR,
-+\fBgetcury\fR,
-+\fBgetmaxx\fR,
-+\fBgetmaxy\fR,
-+\fBgetparx\fR,
-+\fBgetpary\fR - get \fBcurses\fR cursor and window coordinates
-+.SH SYNOPSIS
-+\fB#include <curses.h>\fR
-+.sp
-+\fBint getbegx(WINDOW *win);\fR
-+.br
-+\fBint getbegy(WINDOW *win);\fR
-+.br
-+\fBint getcurx(WINDOW *win);\fR
-+.br
-+\fBint getcury(WINDOW *win);\fR
-+.br
-+\fBint getmaxx(WINDOW *win);\fR
-+.br
-+\fBint getmaxy(WINDOW *win);\fR
-+.br
-+\fBint getparx(WINDOW *win);\fR
-+.br
-+\fBint getpary(WINDOW *win);\fR
-+.br
-+.SH DESCRIPTION
-+The \fBgetbegy\fR and \fBgetbegx\fR functions return the same
-+data as \fBgetbegyx\fR.
-+.PP
-+The \fBgetcury\fR and \fBgetcurx\fR functions return the same
-+data as \fBgetyx\fR.
-+.PP
-+The \fBgetmaxy\fR and \fBgetmaxx\fR functions return the same
-+data as \fBgetmaxyx\fR.
-+.PP
-+The \fBgetpary\fR and \fBgetparx\fR functions return the same
-+data as \fBgetparyx\fR.
-+.SH RETURN VALUE
-+These functions return an integer,
-+or ERR if the window parameter is null.
-+.SH NOTES
-+All of these interfaces are provided as macros and functions.
-+The macros are suppressed (and only the functions provided)
-+when \fBNCURSES_OPAQUE\fR is defined.
-+The standard forms such as \fBgetyx\fP must be implemented as macros,
-+and (in this implementation) are defined in terms of the functions
-+described here,
-+to avoid reliance on internal details of the WINDOW structure.
-+.SH PORTABILITY
-+These functions were supported on Version 7, BSD or System V implementations.
-+.SH SEE ALSO
-+\fBcurses\fR(3X),
-+\fBcurs_getyx\fR(3X),
-+\fBcurs_opaque\fR(3X)
-+.\"#
-+.\"# The following sets edit modes for GNU EMACS
-+.\"# Local Variables:
-+.\"# mode:nroff
-+.\"# fill-column:79
-+.\"# End:
-diff -Naur ncurses-5.6.orig/man/curs_mouse.3x ncurses-5.6/man/curs_mouse.3x
---- ncurses-5.6.orig/man/curs_mouse.3x	2005-05-15 12:18:19.000000000 -0400
-+++ ncurses-5.6/man/curs_mouse.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,7 +27,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_mouse.3x,v 1.28 2005/05/15 16:18:19 tom Exp $
-+.\" $Id: curs_mouse.3x,v 1.30 2006/12/30 23:43:34 tom Exp $
- .TH curs_mouse 3X ""
- .na
- .hy 0
-@@ -158,22 +158,23 @@
- It is useful for determining what subset of
- the screen windows enclose the location of a mouse event.
- .PP
--The \fBwmouse_trafo\fR function transforms a given pair of coordinates from
--stdscr-relative coordinates to screen-relative coordinates or vice versa.
-+The \fBwmouse_trafo\fR function transforms a given pair of coordinates
-+from stdscr-relative coordinates
-+to coordinates relative to the given window or vice versa.
- Please remember, that stdscr-relative coordinates are not always identical
--to screen-relative coordinates due to the mechanism to reserve lines on top
--or bottom of the screen for other purposes (ripoff() call, see also slk_...
--functions).
-+to window-relative coordinates due to the mechanism to reserve lines on top
-+or bottom of the screen for other purposes
-+(see the \fBripoffline()\fP and \fBslk_init\fR calls, for example).
- If the parameter \fBto_screen\fR is \fBTRUE\fR, the pointers
--\fBpY, pX\fR must reference the coordinates of a location inside the window
--\fBwin\fR.
--They are converted to screen-relative coordinates and returned
-+\fBpY, pX\fR must reference the coordinates of a location
-+inside the window \fBwin\fR.
-+They are converted to window-relative coordinates and returned
- through the pointers.
- If the conversion was successful, the function returns \fBTRUE\fR.
- If one of the parameters was NULL or the location is
- not inside the window, \fBFALSE\fR is returned.
- If \fBto_screen\fR is
--\fBFALSE\fR, the pointers \fBpY, pX\fR must reference screen-relative
-+\fBFALSE\fR, the pointers \fBpY, pX\fR must reference window-relative
- coordinates.
- They are converted to stdscr-relative coordinates if the
- window \fBwin\fR encloses this point.
-@@ -184,6 +185,10 @@
- are only replaced by the converted coordinates if the transformation was
- successful.
- .PP
-+The \fBmouse_trafo\fR function performs the same translation
-+as \fBwmouse_trafo\fR,
-+using stdscr for \fBwin\fR.
-+.PP
- The \fBmouseinterval\fR function sets the maximum time (in thousands of a
- second) that can elapse between press and release events for them to
- be recognized as a click.
-@@ -259,7 +264,7 @@
- .RE
- If you are using an unsupported configuration,
- mouse events will not be visible to
--\fBncurses\fR(3X) (and the \fBwmousemask\fR function will always
-+\fBncurses\fR(3X) (and the \fBmousemask\fR function will always
- return \fB0\fR).
- .PP
- If the terminfo entry contains a \fBXM\fR string,
-@@ -276,14 +281,17 @@
- 3D-mice/trackballs/power gloves.
- .SH BUGS
- Mouse events under xterm will not in fact be ignored during cooked mode,
--if they have been enabled by \fBwmousemask\fR.
-+if they have been enabled by \fBmousemask\fR.
- Instead, the xterm mouse
- report sequence will appear in the string read.
- .PP
- Mouse events under xterm will not be detected correctly in a window with
- its keypad bit off, since they are interpreted as a variety of function key.
--Your terminfo description must have \fBkmous\fR set to "\\E[M" (the beginning
--of the response from xterm for mouse clicks).
-+Your terminfo description should have \fBkmous\fR set to "\\E[M"
-+(the beginning of the response from xterm for mouse clicks).
-+Other values for \fBkmous\fR are permitted,
-+but under the same assumption,
-+i.e., it is the beginning of the response.
- .PP
- Because there are no standard terminal responses that would serve to identify
- terminals which support the xterm mouse protocol, \fBncurses\fR assumes that
-@@ -291,7 +299,9 @@
- or \fBkmous\fR is defined in
- the terminal description, then the terminal may send mouse events.
- .SH SEE ALSO
--\fBcurses\fR(3X).
-+\fBcurses\fR(3X),
-+\fBcurs_kernel\fR(3X),
-+\fBcurs_slk\fR(3X).
- .\"#
- .\"# The following sets edit modes for GNU EMACS
- .\"# Local Variables:
-diff -Naur ncurses-5.6.orig/man/curs_opaque.3x ncurses-5.6/man/curs_opaque.3x
---- ncurses-5.6.orig/man/curs_opaque.3x	1969-12-31 19:00:00.000000000 -0500
-+++ ncurses-5.6/man/curs_opaque.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -0,0 +1,133 @@
-+.\"***************************************************************************
-+.\" Copyright (c) 2007 Free Software Foundation, Inc.                        *
-+.\"                                                                          *
-+.\" Permission is hereby granted, free of charge, to any person obtaining a  *
-+.\" copy of this software and associated documentation files (the            *
-+.\" "Software"), to deal in the Software without restriction, including      *
-+.\" without limitation the rights to use, copy, modify, merge, publish,      *
-+.\" distribute, distribute with modifications, sublicense, and/or sell       *
-+.\" copies of the Software, and to permit persons to whom the Software is    *
-+.\" furnished to do so, subject to the following conditions:                 *
-+.\"                                                                          *
-+.\" The above copyright notice and this permission notice shall be included  *
-+.\" in all copies or substantial portions of the Software.                   *
-+.\"                                                                          *
-+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-+.\" IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-+.\" DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-+.\" OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-+.\" THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-+.\"                                                                          *
-+.\" Except as contained in this notice, the name(s) of the above copyright   *
-+.\" holders shall not be used in advertising or otherwise to promote the     *
-+.\" sale, use or other dealings in this Software without prior written       *
-+.\" authorization.                                                           *
-+.\"***************************************************************************
-+.\"
-+.\" $Id: curs_opaque.3x,v 1.6 2007/09/08 18:49:13 tom Exp $
-+.TH curs_opaque 3X ""
-+.na
-+.hy 0
-+.SH NAME
-+\fBis_cleared\fR,
-+\fBis_idlok\fR,
-+\fBis_idcok\fR,
-+\fBis_immedok\fR,
-+\fBis_keypad\fR,
-+\fBis_leaveok\fR,
-+\fBis_nodelay\fR,
-+\fBis_timeout\fR,
-+\fBis_scrollok\fR,
-+\fBis_syncok\fR - \fBcurses\fR window properties
-+.ad
-+.hy
-+.SH SYNOPSIS
-+\fB#include <curses.h>\fR
-+.sp
-+\fBbool is_cleared(const WINDOW *win);\fR
-+.br
-+\fBbool is_idcok(const WINDOW *win);\fR
-+.br
-+\fBbool is_idlok(const WINDOW *win);\fR
-+.br
-+\fBbool is_immedok(const WINDOW *win);\fR
-+.br
-+\fBbool is_keypad(const WINDOW *win);\fR
-+.br
-+\fBbool is_leaveok(const WINDOW *win);\fR
-+.br
-+\fBbool is_nodelay(const WINDOW *win);\fR
-+.br
-+\fBbool is_notimeout(const WINDOW *win);\fR
-+.br
-+\fBbool is_scrollok(const WINDOW *win);\fR
-+.br
-+\fBbool is_syncok(const WINDOW *win);\fR
-+.br
-+\fBWINDOW * wgetparent(const WINDOW *win);\fR
-+.br
-+\fBint wgetscrreg(const WINDOW *win, int *top, int *bottom);\fR
-+.br
-+.SH DESCRIPTION
-+This implementation provides functions which return properties
-+set in the WINDOW structure, allowing it to be ``opaque'' if
-+the symbol \fBNCURSES_OPAQUE\fR is defined:
-+.TP 5
-+\fBis_cleared\fR
-+returns the value set in \fBclearok\fR
-+.TP 5
-+\fBis_idcok\fR
-+returns the value set in \fBidcok\fR
-+.TP 5
-+\fBis_idlok\fR
-+returns the value set in \fBidlok\fR
-+.TP 5
-+\fBis_immedok\fR
-+returns the value set in \fBimmedok\fR
-+.TP 5
-+\fBis_keypad\fR
-+returns the value set in \fBkeypad\fR
-+.TP 5
-+\fBis_leaveok\fR
-+returns the value set in \fBleaveok\fR
-+.TP 5
-+\fBis_nodelay\fR
-+returns the value set in \fBnodelay\fR
-+.TP 5
-+\fBis_notimeout\fR
-+returns the value set in \fBnotimeout\fR
-+.TP 5
-+\fBis_scrollok\fR
-+returns the value set in \fBscrollok\fR
-+.TP 5
-+\fBis_syncok\fR
-+returns the value set in \fBsyncok\fR
-+.TP 5
-+\fBwgetparent\fR
-+returns the parent WINDOW pointer for subwindows,
-+or NULL for windows having no parent.
-+.TP 5
-+\fBwgetscrreg\fR
-+returns the top and bottom rows for the scrolling margin as set in \fBwsetscrreg\fP.
-+.SH RETURN VALUE
-+These functions all return TRUE or FALSE, except as noted.
-+.SH NOTES
-+Both a macro and a function are provided for each name.
-+.SH PORTABILITY
-+These routines are specific to ncurses.
-+They were not supported on Version 7, BSD or System V implementations.
-+It is recommended that any code depending on ncurses extensions
-+be conditioned using NCURSES_VERSION.
-+.SH SEE ALSO
-+\fBcurses\fR(3X),
-+\fBcurs_inopts\fR(3X),
-+\fBcurs_outopts\fR(3X),
-+\fBcurs_window\fR(3X)
-+.\"#
-+.\"# The following sets edit modes for GNU EMACS
-+.\"# Local Variables:
-+.\"# mode:nroff
-+.\"# fill-column:79
-+.\"# End:
-diff -Naur ncurses-5.6.orig/man/curs_outopts.3x ncurses-5.6/man/curs_outopts.3x
---- ncurses-5.6.orig/man/curs_outopts.3x	2005-05-15 12:18:32.000000000 -0400
-+++ ncurses-5.6/man/curs_outopts.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_outopts.3x,v 1.20 2005/05/15 16:18:32 tom Exp $
-+.\" $Id: curs_outopts.3x,v 1.21 2007/06/02 20:40:07 tom Exp $
- .TH curs_outopts 3X ""
- .na
- .hy 0
-@@ -91,7 +91,7 @@
- application needs insert/delete line, for example, for a screen editor.
- It is
- disabled by default because insert/delete line tends to be visually annoying
--when used in applications where it isn't really needed.
-+when used in applications where it is not really needed.
- If insert/delete line
- cannot be used, \fBcurses\fR redraws the changed portions of all lines.
- .PP
-diff -Naur ncurses-5.6.orig/man/curs_printw.3x ncurses-5.6/man/curs_printw.3x
---- ncurses-5.6.orig/man/curs_printw.3x	2006-02-25 16:49:19.000000000 -0500
-+++ ncurses-5.6/man/curs_printw.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_printw.3x,v 1.16 2006/02/25 21:49:19 tom Exp $
-+.\" $Id: curs_printw.3x,v 1.17 2006/12/24 16:05:17 tom Exp $
- .TH curs_printw 3X ""
- .na
- .hy 0
-@@ -55,12 +55,12 @@
- .br
- .SH DESCRIPTION
- The \fBprintw\fR, \fBwprintw\fR, \fBmvprintw\fR and \fBmvwprintw\fR
--routines are analogous to \fBprintf\fR [see \fBprintf\fR(3S)].  In
-+routines are analogous to \fBprintf\fR [see \fBprintf\fR(3)].  In
- effect, the string that would be output by \fBprintf\fR is output
- instead as though \fBwaddstr\fR were used on the given window.
- .PP
- The \fBvwprintw\fR and \fBwv_printw\fR routines are analogous
--to \fBvprintf\fR [see \fBprintf\fR(3S)]
-+to \fBvprintf\fR [see \fBprintf\fR(3)]
- and perform a \fBwprintw\fR using a variable argument list.
- The third argument is a \fBva_list\fR, a pointer to a
- list of arguments, as defined in \fB<stdarg.h>\fR.
-@@ -85,7 +85,7 @@
- This implementation uses \fB<stdarg.h>\fR for both, because that header
- is included in \fB<curses.h\fR>.
- .SH SEE ALSO
--\fBcurses\fR(3X), \fBprintf\fR(3S), \fBvprintf(3S)\fR
-+\fBcurses\fR(3X), \fBprintf\fR(3), \fBvprintf(3)\fR
- .\"#
- .\"# The following sets edit modes for GNU EMACS
- .\"# Local Variables:
-diff -Naur ncurses-5.6.orig/man/curs_scanw.3x ncurses-5.6/man/curs_scanw.3x
---- ncurses-5.6.orig/man/curs_scanw.3x	2006-02-25 16:42:22.000000000 -0500
-+++ ncurses-5.6/man/curs_scanw.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_scanw.3x,v 1.13 2006/02/25 21:42:22 tom Exp $
-+.\" $Id: curs_scanw.3x,v 1.14 2006/12/24 16:05:49 tom Exp $
- .TH curs_scanw 3X ""
- .SH NAME
- \fBscanw\fR,
-@@ -50,7 +50,7 @@
- \fBint vwscanw(WINDOW *win, char *fmt, va_list varglist);\fR
- .SH DESCRIPTION
- The \fBscanw\fR, \fBwscanw\fR and \fBmvscanw\fR routines are analogous to
--\fBscanf\fR [see \fBscanf\fR(3S)].  The effect of these routines is as though
-+\fBscanf\fR [see \fBscanf\fR(3)].  The effect of these routines is as though
- \fBwgetstr\fR were called on the window, and the resulting line used as input
- for \fBsscanf\fR(3).  Fields which do not map to a variable in the \fIfmt\fR
- field are lost.
-@@ -88,7 +88,7 @@
- One possible way to get useful results would be to use a "%n" conversion
- at the end of the format string to ensure that something was processed.
- .SH SEE ALSO
--\fBcurses\fR(3X), \fBcurs_getstr\fR(3X), \fBcurs_printw\fR(3X), \fBscanf\fR(3S)
-+\fBcurses\fR(3X), \fBcurs_getstr\fR(3X), \fBcurs_printw\fR(3X), \fBscanf\fR(3)
- .\"#
- .\"# The following sets edit modes for GNU EMACS
- .\"# Local Variables:
-diff -Naur ncurses-5.6.orig/man/curs_scr_dump.3x ncurses-5.6/man/curs_scr_dump.3x
---- ncurses-5.6.orig/man/curs_scr_dump.3x	2006-02-25 16:49:19.000000000 -0500
-+++ ncurses-5.6/man/curs_scr_dump.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_scr_dump.3x,v 1.6 2006/02/25 21:49:19 tom Exp $
-+.\" $Id: curs_scr_dump.3x,v 1.7 2006/12/24 16:05:49 tom Exp $
- .TH curs_scr_dump 3X ""
- .na
- .hy 0
-@@ -93,7 +93,7 @@
- "old".
- .SH SEE ALSO
- \fBcurses\fR(3X), \fBcurs_initscr\fR(3X), \fBcurs_refresh\fR(3X),
--\fBcurs_util\fR(3X), \fBsystem\fR(3S)
-+\fBcurs_util\fR(3X), \fBsystem\fR(3)
- .\"#
- .\"# The following sets edit modes for GNU EMACS
- .\"# Local Variables:
-diff -Naur ncurses-5.6.orig/man/curs_slk.3x ncurses-5.6/man/curs_slk.3x
---- ncurses-5.6.orig/man/curs_slk.3x	2006-02-25 16:49:19.000000000 -0500
-+++ ncurses-5.6/man/curs_slk.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_slk.3x,v 1.15 2006/02/25 21:49:19 tom Exp $
-+.\" $Id: curs_slk.3x,v 1.16 2007/06/02 20:40:07 tom Exp $
- .TH curs_slk 3X ""
- .na
- .hy 0
-@@ -95,7 +95,7 @@
- implementation supports a mode where it simulates 12 labels of up to five
- characters each. This is most common for todays PC like enduser devices.
- Please note that ncurses simulates this mode by taking over up to two lines at
--the bottom of the screen, it doesn't try to use any hardware support for this
-+the bottom of the screen, it does not try to use any hardware support for this
- mode.
- .PP
- The \fBslk_init\fR routine must be called before \fBinitscr\fR or \fBnewterm\fR
-diff -Naur ncurses-5.6.orig/man/curs_termattrs.3x ncurses-5.6/man/curs_termattrs.3x
---- ncurses-5.6.orig/man/curs_termattrs.3x	2003-12-27 13:37:47.000000000 -0500
-+++ ncurses-5.6/man/curs_termattrs.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2002,2003 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2003,2007 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_termattrs.3x,v 1.9 2003/12/27 18:37:47 tom Exp $
-+.\" $Id: curs_termattrs.3x,v 1.10 2007/06/02 20:40:07 tom Exp $
- .TH curs_termattrs 3X ""
- .SH NAME
- \fBbaudrate\fR,
-@@ -101,7 +101,7 @@
- \fBnewterm\fR if \fBlongname\fR is going to be used with multiple
- terminals.
- .PP
--If a given terminal doesn't support a video attribute that an
-+If a given terminal does not support a video attribute that an
- application program is trying to use, \fBcurses\fR may substitute a
- different video attribute for it.
- The \fBtermattrs\fR and \fBterm_attrs\fR functions
-diff -Naur ncurses-5.6.orig/man/curs_termcap.3x ncurses-5.6/man/curs_termcap.3x
---- ncurses-5.6.orig/man/curs_termcap.3x	2006-02-25 16:50:01.000000000 -0500
-+++ ncurses-5.6/man/curs_termcap.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_termcap.3x,v 1.20 2006/02/25 21:50:01 tom Exp $
-+.\" $Id: curs_termcap.3x,v 1.22 2007/06/02 20:40:07 tom Exp $
- .TH curs_termcap 3X ""
- .ds n 5
- .SH NAME
-@@ -122,7 +122,7 @@
- .SH BUGS
- If you call \fBtgetstr\fR to fetch \fBca\fR or any other parameterized string,
- be aware that it will be returned in terminfo notation, not the older and
--not-quite-compatible termcap notation.  This won't cause problems if all
-+not-quite-compatible termcap notation.  This will not cause problems if all
- you do with it is call \fBtgoto\fR or \fBtparm\fR, which both expand
- terminfo-style strings as terminfo.
- (The \fBtgoto\fR function, if configured to support termcap, will check
-@@ -158,7 +158,7 @@
- In particular, some applications are reported to declare and/or
- modify \fBospeed\fR.
- .SH SEE ALSO
--\fBcurses\fR(3X), \fBterminfo\fR(\*n), \fBputc\fR(3S).
-+\fBcurses\fR(3X), \fBterminfo\fR(\*n), \fBputc\fR(3).
- .\"#
- .\"# The following sets edit modes for GNU EMACS
- .\"# Local Variables:
-diff -Naur ncurses-5.6.orig/man/curs_terminfo.3x ncurses-5.6/man/curs_terminfo.3x
---- ncurses-5.6.orig/man/curs_terminfo.3x	2006-11-04 16:50:03.000000000 -0500
-+++ ncurses-5.6/man/curs_terminfo.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1999-2005,2006 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1999-2006,2007 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_terminfo.3x,v 1.24 2006/11/04 21:50:03 tom Exp $
-+.\" $Id: curs_terminfo.3x,v 1.28 2007/05/26 20:09:06 tom Exp $
- .TH curs_terminfo 3X ""
- .ds n 5
- .na
-@@ -64,7 +64,7 @@
- .br
- \fBint del_curterm(TERMINAL *\fR\fIoterm\fR\fB);\fR
- .br
--\fBint restartterm(const char *\fR\fIterm\fR\fB, int \fR\fIfildes\fR\fB, int *\fR\fIerrret\fR\fB);\fR
-+\fBint restartterm(char *\fR\fIterm\fR\fB, int \fR\fIfildes\fR\fB, int *\fR\fIerrret\fR\fB);\fR
- .br
- \fBchar *tparm(char *\fR\fIstr\fR\fB, ...);\fR
- .br
-@@ -99,16 +99,22 @@
- Initially, \fBsetupterm\fR should be called.  Note that
- \fBsetupterm\fR is automatically called by \fBinitscr\fR and
- \fBnewterm\fR.  This defines the set of terminal-dependent variables
--[listed in \fBterminfo\fR(\*n)].  The \fBterminfo\fR variables
-+[listed in \fBterminfo\fR(\*n)].
-+The \fBterminfo\fR variables
- \fBlines\fR and \fBcolumns\fR are initialized by \fBsetupterm\fR as
--follows: If \fBuse_env(FALSE)\fR has been called, values for
-+follows:
-+.RS
-+.PP
-+If \fBuse_env(FALSE)\fR has been called, values for
- \fBlines\fR and \fBcolumns\fR specified in \fBterminfo\fR are used.
-+.PP
- Otherwise, if the environment variables \fBLINES\fR and \fBCOLUMNS\fR
- exist, their values are used.  If these environment variables do not
- exist and the program is running in a window, the current window size
- is used.  Otherwise, if the environment variables do not exist, the
- values for \fBlines\fR and \fBcolumns\fR specified in the
- \fBterminfo\fR database are used.
-+.RE
- .PP
- The header files \fBcurses.h\fR and \fBterm.h\fR should be included (in this
- order) to get the definitions for these strings, numbers, and flags.
-@@ -183,7 +189,8 @@
- example, when reloading a game saved as a core image dump).  It assumes that
- the windows and the input and output options are the same as when memory was
- saved, but the terminal type and baud rate may be different.  Accordingly,
--it saves various tty state bits, does a setupterm, and then restores the bits.
-+it saves various tty state bits, calls \fBsetupterm\fP,
-+and then restores the bits.
- .PP
- The \fBtparm\fR routine instantiates the string \fIstr\fR with
- parameters \fIpi\fR.  A pointer is returned to the result of \fIstr\fR
-@@ -288,6 +295,9 @@
- be considered non-portable.  All other functions are as described in the XSI
- curses standard.
- .PP
-+\fBsetupterm\fP copies the terminal name to the array \fBttytype\fP.
-+This is not part of X/Open Curses, but is assumed by some applications.
-+.PP
- In System V Release 4, \fBset_curterm\fR has an \fBint\fR return type and
- returns \fBOK\fR or \fBERR\fR.  We have chosen to implement the XSI Curses
- semantics.
-@@ -309,7 +319,7 @@
- So though it is documented as a terminfo function,
- \fBmvcur\fR is really a curses function which is not well specified.
- .PP
--XSI states that the old location must be given.
-+XSI states that the old location must be given for \fBmvcur\fP.
- This implementation allows the caller to use -1's for the old ordinates.
- In that case, the old location is unknown.
- .PP
-@@ -317,7 +327,7 @@
- are not stored in the arrays described in this section.
- .SH SEE ALSO
- \fBcurses\fR(3X), \fBcurs_initscr\fR(3X), \fBcurs_kernel\fR(3X), \fBcurs_termcap\fR(3X),
--\fBputc\fR(3S), \fBterminfo\fR(\*n)
-+\fBputc\fR(3), \fBterminfo\fR(\*n)
- .\"#
- .\"# The following sets edit modes for GNU EMACS
- .\"# Local Variables:
-diff -Naur ncurses-5.6.orig/man/curs_threads.3x ncurses-5.6/man/curs_threads.3x
---- ncurses-5.6.orig/man/curs_threads.3x	1969-12-31 19:00:00.000000000 -0500
-+++ ncurses-5.6/man/curs_threads.3x	2008-06-18 06:49:49.000000000 -0400
-@@ -0,0 +1,603 @@
-+.\"***************************************************************************
-+.\" Copyright (c) 2008 Free Software Foundation, Inc.                        *
-+.\"                                                                          *
-+.\" Permission is hereby granted, free of charge, to any person obtaining a  *
-+.\" copy of this software and associated documentation files (the            *
-+.\" "Software"), to deal in the Software without restriction, including      *
-+.\" without limitation the rights to use, copy, modify, merge, publish,      *
-+.\" distribute, distribute with modifications, sublicense, and/or sell       *
-+.\" copies of the Software, and to permit persons to whom the Software is    *
-+.\" furnished to do so, subject to the following conditions:                 *
-+.\"                                                                          *
-+.\" The above copyright notice and this permission notice shall be included  *
-+.\" in all copies or substantial portions of the Software.                   *
-+.\"                                                                          *
-+.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-+.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-+.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-+.\" IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-+.\" DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-+.\" OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-+.\" THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-+.\"                                                                          *
-+.\" Except as contained in this notice, the name(s) of the above copyright   *
-+.\" holders shall not be used in advertising or otherwise to promote the     *
-+.\" sale, use or other dealings in this Software without prior written       *
-+.\" authorization.                                                           *
-+.\"***************************************************************************
-+.\"
-+.\" $Id: curs_threads.3x,v 1.12 2008/04/12 18:22:51 tom Exp $
-+.TH curs_threads 3X ""
-+.na
-+.hy 0
-+.SH NAME
-+\fBuse_screen\fR,
-+\fBuse_window\fR - \fBcurses\fR thread support
-+.ad
-+.hy
-+.SH SYNOPSIS
-+\fB#include <curses.h>\fR
-+.sp
-+\fBtypedef int (*NCURSES_WINDOW_CB)(WINDOW *, void *);\fR
-+\fBtypedef int (*NCURSES_SCREEN_CB)(SCREEN *, void *);\fR
-+.br
-+\fBint set_escdelay(int size);\fR
-+.br
-+\fBint set_tabsize(int size);\fR
-+.br
-+\fBint use_screen(SCREEN *scr, NCURSES_WINDOW_CB func, void *data);\fR
-+.br
-+\fBint use_window(WINDOW *win, NCURSES_SCREEN_CB func, void *data);\fR
-+.br
-+.SH DESCRIPTION
-+This implementation can be configured to provide rudimentary support
-+for multi-threaded applications.
-+This makes a different set of libraries, e.g., \fIlibncursest\fP since
-+the binary interfaces are different.
-+.PP
-+Rather than modify the interfaces to pass a thread specifier to
-+each function, it adds a few functions which can be used in any
-+configuration which hide the mutex's needed to prevent concurrent
-+use of the global variables when configured for threading.
-+.PP
-+In addition to forcing access to members of the \fBWINDOW\fP structure
-+to be via functions (see \fBcurs_opaque\fP(3x)),
-+it makes functions of the common global variables,
-+e.g.,
-+COLORS,
-+COLOR_PAIRS,
-+COLS,
-+ESCDELAY,
-+LINES,
-+TABSIZE
-+curscr,
-+newscr and
-+ttytype.
-+Those variables are maintained as read-only values, stored in the \fBSCREEN\fP
-+structure.
-+.PP
-+Even this is not enough to make a thread-safe application using curses.
-+A multi-threaded application would be expected to have threads updating
-+separate windows (within the same device),
-+or updating on separate screens (on different devices).
-+Also, a few of the global variables are considered writable by some
-+applications.
-+The functions described here address these special situations.
-+.PP
-+The ESCDELAY and TABSIZE global variables are modified by some applications.
-+To modify them in any configuration,
-+use the \fBset_escdelay\fP or \fBset_tabsize\fP functions.
-+Other global variables are not modifiable.
-+.PP
-+The \fBuse_window\fP and \fBuse_screen\fP functions provide coarse
-+granularity mutexes for their respective \fBWINDOW\fP and \fBSCREEN\fP
-+parameters, and call a user-supplied function,
-+passing it a \fIdata\fP parameter,
-+and returning the value from the user-supplied function to the application.
-+.\" ***************************************************************************
-+.SS USAGE
-+All of the ncurses library functions assume that the locale is not
-+altered during operation.
-+In addition,
-+they use data which is maintained within a hierarchy of scopes.
-+.RS
-+.TP 3
-+-
-+global data, e.g., used in the low-level terminfo or termcap interfaces.
-+.TP 3
-+-
-+terminal data, e.g., associated with a call to \fIset_curterm\fP.
-+The terminal data are initialized when screens are created.
-+.TP 3
-+-
-+screen data, e.g., associated with a call to \fInewterm\fP or \fIinitscr\fP.
-+.TP 3
-+-
-+window data, e.g., associated with a call to \fInewwin\fP or \fIsubwin\fP.
-+Windows are associated with screens.
-+Pads are not necessarily associated with a particular screen.
-+.IP
-+Most curses applications operate on one or more windows within a single screen.
-+.TP 3
-+-
-+reentrant, i.e., it uses only the data passed as parameters.
-+.RE
-+.PP
-+This table lists the scope of data used for each symbol in the
-+ncurses library when it is configured to support threading:
-+.TS
-+center tab(/);
-+l l
-+l l .
-+Symbol/Scope
-+=
-+BC/global
-+COLORS/screen (readonly)
-+COLOR_PAIR/reentrant
-+COLOR_PAIRS/screen (readonly)
-+COLS/screen (readonly)
-+ESCDELAY/screen (readonly, see \fIset_escdelay\fP)
-+LINES/screen (readonly)
-+PAIR_NUMBER/reentrant
-+PC/global
-+SP/global
-+TABSIZE/screen (readonly)
-+UP/global
-+acs_map/screen (readonly)
-+add_wch/window (stdscr)
-+add_wchnstr/window (stdscr)
-+add_wchstr/window (stdscr)
-+addch/window (stdscr)
-+addchnstr/window (stdscr)
-+addchstr/window (stdscr)
-+addnstr/window (stdscr)
-+addnwstr/window (stdscr)
-+addstr/window (stdscr)
-+addwstr/window (stdscr)
-+assume_default_colors/screen
-+attr_get/window (stdscr)
-+attr_off/window (stdscr)
-+attr_on/window (stdscr)
-+attr_set/window (stdscr)
-+attroff/window (stdscr)
-+attron/window (stdscr)
-+attrset/window (stdscr)
-+baudrate/screen
-+beep/screen
-+bkgd/window (stdscr)
-+bkgdset/window (stdscr)
-+bkgrnd/window (stdscr)
-+bkgrndset/window (stdscr)
-+boolcodes/global (readonly)
-+boolfnames/global (readonly)
-+boolnames/global (readonly)
-+border/window (stdscr)
-+border_set/window (stdscr)
-+box/window (stdscr)
-+box_set/window (stdscr)
-+can_change_color/terminal
-+cbreak/screen
-+chgat/window (stdscr)
-+clear/window (stdscr)
-+clearok/window
-+clrtobot/window (stdscr)
-+clrtoeol/window (stdscr)
-+color_content/screen
-+color_set/window (stdscr)
-+copywin/window locks(source, target)
-+cur_term/terminal
-+curs_set/screen
-+curscr/screen (readonly)
-+curses_version/global (readonly)
-+def_prog_mode/terminal
-+def_shell_mode/terminal
-+define_key/screen
-+del_curterm/screen
-+delay_output/screen
-+delch/window (stdscr)
-+deleteln/window (stdscr)
-+delscreen/global locks(screenlist, screen)
-+delwin/global locks(windowlist)
-+derwin/screen
-+doupdate/screen
-+dupwin/screen locks(window)
-+echo/screen
-+echo_wchar/window (stdscr)
-+echochar/window (stdscr)
-+endwin/screen
-+erase/window (stdscr)
-+erasechar/window (stdscr)
-+erasewchar/window (stdscr)
-+filter/global
-+flash/terminal
-+flushinp/screen
-+get_wch/screen (input-operation)
-+get_wstr/screen (input-operation)
-+getattrs/window
-+getbegx/window
-+getbegy/window
-+getbkgd/window
-+getbkgrnd/window
-+getcchar/reentrant
-+getch/screen (input-operation)
-+getcurx/window
-+getcury/window
-+getmaxx/window
-+getmaxy/window
-+getmouse/screen (input-operation)
-+getn_wstr/screen (input-operation)
-+getnstr/screen (input-operation)
-+getparx/window
-+getpary/window
-+getstr/screen (input-operation)
-+getwin/screen (input-operation)
-+halfdelay/screen
-+has_colors/terminal
-+has_ic/terminal
-+has_il/terminal
-+has_key/screen
-+hline/window (stdscr)
-+hline_set/window (stdscr)
-+idcok/window
-+idlok/window
-+immedok/window
-+in_wch/window (stdscr)
-+in_wchnstr/window (stdscr)
-+in_wchstr/window (stdscr)
-+inch/window (stdscr)
-+inchnstr/window (stdscr)
-+inchstr/window (stdscr)
-+init_color/screen
-+init_pair/screen
-+initscr/global locks(screenlist)
-+innstr/window (stdscr)
-+innwstr/window (stdscr)
-+ins_nwstr/window (stdscr)
-+ins_wch/window (stdscr)
-+ins_wstr/window (stdscr)
-+insch/window (stdscr)
-+insdelln/window (stdscr)
-+insertln/window (stdscr)
-+insnstr/window (stdscr)
-+insstr/window (stdscr)
-+instr/window (stdscr)
-+intrflush/terminal
-+inwstr/window (stdscr)
-+is_cleared/window
-+is_idcok/window
-+is_idlok/window
-+is_immedok/window
-+is_keypad/window
-+is_leaveok/window
-+is_linetouched/window
-+is_nodelay/window
-+is_notimeout/window
-+is_scrollok/window
-+is_syncok/window
-+is_term_resized/terminal
-+is_wintouched/window
-+isendwin/screen
-+key_defined/screen
-+key_name/global (static data)
-+keybound/screen
-+keyname/global (static data)
-+keyok/screen
-+keypad/window
-+killchar/terminal
-+killwchar/terminal
-+leaveok/window
-+longname/screen
-+mcprint/terminal
-+meta/screen
-+mouse_trafo/window (stdscr)
-+mouseinterval/screen
-+mousemask/screen
-+move/window (stdscr)
-+mvadd_wch/window (stdscr)
-+mvadd_wchnstr/window (stdscr)
-+mvadd_wchstr/window (stdscr)
-+mvaddch/window (stdscr)
-+mvaddchnstr/window (stdscr)
-+mvaddchstr/window (stdscr)
-+mvaddnstr/window (stdscr)
-+mvaddnwstr/window (stdscr)
-+mvaddstr/window (stdscr)
-+mvaddwstr/window (stdscr)
-+mvchgat/window (stdscr)
-+mvcur/screen
-+mvdelch/window (stdscr)
-+mvderwin/window (stdscr)
-+mvget_wch/screen (input-operation)
-+mvget_wstr/screen (input-operation)
-+mvgetch/screen (input-operation)
-+mvgetn_wstr/screen (input-operation)
-+mvgetnstr/screen (input-operation)
-+mvgetstr/screen (input-operation)
-+mvhline/window (stdscr)
-+mvhline_set/window (stdscr)
-+mvin_wch/window (stdscr)
-+mvin_wchnstr/window (stdscr)
-+mvin_wchstr/window (stdscr)
-+mvinch/window (stdscr)
-+mvinchnstr/window (stdscr)
-+mvinchstr/window (stdscr)
-+mvinnstr/window (stdscr)
-+mvinnwstr/window (stdscr)
-+mvins_nwstr/window (stdscr)
-+mvins_wch/window (stdscr)
-+mvins_wstr/window (stdscr)
-+mvinsch/window (stdscr)
-+mvinsnstr/window (stdscr)
-+mvinsstr/window (stdscr)
-+mvinstr/window (stdscr)
-+mvinwstr/window (stdscr)
-+mvprintw/window (stdscr)
-+mvscanw/screen
-+mvvline/window (stdscr)
-+mvvline_set/window (stdscr)
-+mvwadd_wch/window
-+mvwadd_wchnstr/window
-+mvwadd_wchstr/window
-+mvwaddch/window
-+mvwaddchnstr/window
-+mvwaddchstr/window
-+mvwaddnstr/window
-+mvwaddnwstr/window
-+mvwaddstr/window
-+mvwaddwstr/window
-+mvwchgat/window
-+mvwdelch/window
-+mvwget_wch/screen (input-operation)
-+mvwget_wstr/screen (input-operation)
-+mvwgetch/screen (input-operation)
-+mvwgetn_wstr/screen (input-operation)
-+mvwgetnstr/screen (input-operation)
-+mvwgetstr/screen (input-operation)
-+mvwhline/window
-+mvwhline_set/window
-+mvwin/window
-+mvwin_wch/window
-+mvwin_wchnstr/window
-+mvwin_wchstr/window
-+mvwinch/window
-+mvwinchnstr/window
-+mvwinchstr/window
-+mvwinnstr/window
-+mvwinnwstr/window
-+mvwins_nwstr/window
-+mvwins_wch/window
-+mvwins_wstr/window
-+mvwinsch/window
-+mvwinsnstr/window
-+mvwinsstr/window
-+mvwinstr/window
-+mvwinwstr/window
-+mvwprintw/window
-+mvwscanw/screen
-+mvwvline/window
-+mvwvline_set/window
-+napms/reentrant
-+newpad/global locks(windowlist)
-+newscr/screen (readonly)
-+newterm/global locks(screenlist)
-+newwin/global locks(windowlist)
-+nl/screen
-+nocbreak/screen
-+nodelay/window
-+noecho/screen
-+nofilter/global
-+nonl/screen
-+noqiflush/terminal
-+noraw/screen
-+notimeout/window
-+numcodes/global (readonly)
-+numfnames/global (readonly)
-+numnames/global (readonly)
-+ospeed/global
-+overlay/window locks(source, target)
-+overwrite/window locks(source, target)
-+pair_content/screen
-+pecho_wchar/screen
-+pechochar/screen
-+pnoutrefresh/screen
-+prefresh/screen
-+printw/window
-+putp/global
-+putwin/window
-+qiflush/terminal
-+raw/screen
-+redrawwin/window
-+refresh/screen
-+reset_prog_mode/screen
-+reset_shell_mode/screen
-+resetty/terminal
-+resize_term/screen locks(windowlist)
-+resizeterm/screen
-+restartterm/screen
-+ripoffline/global (static data)
-+savetty/terminal
-+scanw/screen
-+scr_dump/screen
-+scr_init/screen
-+scr_restore/screen
-+scr_set/screen
-+scrl/window (stdscr)
-+scroll/window
-+scrollok/window
-+set_curterm/screen
-+set_escdelay/screen
-+set_tabsize/screen
-+set_term/global locks(screenlist, screen)
-+setcchar/reentrant
-+setscrreg/window (stdscr)
-+setupterm/global
-+slk_attr/screen
-+slk_attr_off/screen
-+slk_attr_on/screen
-+slk_attr_set/screen
-+slk_attroff/screen
-+slk_attron/screen
-+slk_attrset/screen
-+slk_clear/screen
-+slk_color/screen
-+slk_init/screen
-+slk_label/screen
-+slk_noutrefresh/screen
-+slk_refresh/screen
-+slk_restore/screen
-+slk_set/screen
-+slk_touch/screen
-+slk_wset/screen
-+standend/window
-+standout/window
-+start_color/screen
-+stdscr/screen (readonly)
-+strcodes/global (readonly)
-+strfnames/global (readonly)
-+strnames/global (readonly)
-+subpad/window
-+subwin/window
-+syncok/window
-+term_attrs/screen
-+termattrs/screen
-+termname/terminal
-+tgetent/global
-+tgetflag/global
-+tgetnum/global
-+tgetstr/global
-+tgoto/global
-+tigetflag/terminal
-+tigetnum/terminal
-+tigetstr/terminal
-+timeout/window (stdscr)
-+touchline/window
-+touchwin/window
-+tparm/global (static data)
-+tputs/screen
-+trace/global (static data)
-+ttytype/screen (readonly)
-+typeahead/screen
-+unctrl/screen
-+unget_wch/screen (input-operation)
-+ungetch/screen (input-operation)
-+ungetmouse/screen (input-operation)
-+untouchwin/window
-+use_default_colors/screen
-+use_env/global (static data)
-+use_extended_names/global (static data)
-+use_legacy_coding/screen
-+use_screen/global locks(screenlist, screen)
-+use_window/global locks(windowlist, window)
-+vid_attr/screen
-+vid_puts/screen
-+vidattr/screen
-+vidputs/screen
-+vline/window (stdscr)
-+vline_set/window (stdscr)
-+vw_printw/window
-+vw_scanw/screen
-+vwprintw/window
-+vwscanw/screen
-+wadd_wch/window
-+wadd_wchnstr/window
-+wadd_wchstr/window
-+waddch/window
-+waddchnstr/window
-+waddchstr/window
-+waddnstr/window
-+waddnwstr/window
-+waddstr/window
-+waddwstr/window
-+wattr_get/window
-+wattr_off/window
-+wattr_on/window
-+wattr_set/window
-+wattroff/window
-+wattron/window
-+wattrset/window
-+wbkgd/window
-+wbkgdset/window
-+wbkgrnd/window
-+wbkgrndset/window
-+wborder/window
-+wborder_set/window
-+wchgat/window
-+wclear/window
-+wclrtobot/window
-+wclrtoeol/window
-+wcolor_set/window
-+wcursyncup/screen (affects window plus parents)
-+wdelch/window
-+wdeleteln/window
-+wecho_wchar/window
-+wechochar/window
-+wenclose/window
-+werase/window
-+wget_wch/screen (input-operation)
-+wget_wstr/screen (input-operation)
-+wgetbkgrnd/window
-+wgetch/screen (input-operation)
-+wgetn_wstr/screen (input-operation)
-+wgetnstr/screen (input-operation)
-+wgetparent/window
-+wgetscrreg/window
-+wgetstr/screen (input-operation)
-+whline/window
-+whline_set/window
-+win_wch/window
-+win_wchnstr/window
-+win_wchstr/window
-+winch/window
-+winchnstr/window
-+winchstr/window
-+winnstr/window
-+winnwstr/window
-+wins_nwstr/window
-+wins_wch/window
-+wins_wstr/window
-+winsch/window
-+winsdelln/window
-+winsertln/window
-+winsnstr/window
-+winsstr/window
-+winstr/window
-+winwstr/window
-+wmouse_trafo/window
-+wmove/window
-+wnoutrefresh/screen
-+wprintw/window
-+wredrawln/window
-+wrefresh/screen
-+wresize/window locks(windowlist)
-+wscanw/screen
-+wscrl/window
-+wsetscrreg/window
-+wstandend/window
-+wstandout/window
-+wsyncdown/screen (affects window plus parents)
-+wsyncup/screen (affects window plus parents)
-+wtimeout/window
-+wtouchln/window
-+wunctrl/global (static data)
-+wvline/window
-+wvline_set/window
-+.TE
-+.\" ***************************************************************************
-+.SH RETURN VALUE
-+These functions all return TRUE or FALSE, except as noted.
-+.SH NOTES
-+Both a macro and a function are provided for each name.
-+.SH PORTABILITY
-+These routines are specific to ncurses.
-+They were not supported on Version 7, BSD or System V implementations.
-+It is recommended that any code depending on ncurses extensions
-+be conditioned using NCURSES_VERSION.
-+.SH SEE ALSO
-+\fBcurses\fR(3X),
-+\fBcurs_opaque\fR(3X)
-+.\"#
-+.\"# The following sets edit modes for GNU EMACS
-+.\"# Local Variables:
-+.\"# mode:nroff
-+.\"# fill-column:79
-+.\"# End:
-diff -Naur ncurses-5.6.orig/man/curs_trace.3x ncurses-5.6/man/curs_trace.3x
---- ncurses-5.6.orig/man/curs_trace.3x	2005-05-15 13:02:54.000000000 -0400
-+++ ncurses-5.6/man/curs_trace.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 2000-2002,2005 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 2000-2005,2007 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_trace.3x,v 1.7 2005/05/15 17:02:54 tom Exp $
-+.\" $Id: curs_trace.3x,v 1.8 2007/02/24 17:33:49 tom Exp $
- .TH curs_trace 3X ""
- .na
- .hy 0
-@@ -56,7 +56,7 @@
- .br
- \fBchar *_nc_tracebits(void);\fR
- .br
--\fBchar *_tracechar(const unsigned char ch);\fR
-+\fBchar *_tracechar(int);\fR
- .br
- \fBchar *_tracechtype(chtype ch);\fR
- .br
-diff -Naur ncurses-5.6.orig/man/curs_util.3x ncurses-5.6/man/curs_util.3x
---- ncurses-5.6.orig/man/curs_util.3x	2006-08-26 10:17:48.000000000 -0400
-+++ ncurses-5.6/man/curs_util.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: curs_util.3x,v 1.21 2006/08/26 14:17:48 tom Exp $
-+.\" $Id: curs_util.3x,v 1.25 2007/05/26 21:44:42 tom Exp $
- .TH curs_util 3X ""
- .na
- .hy 0
-@@ -49,7 +49,7 @@
- .sp
- \fBchar *unctrl(chtype c);\fR
- .br
--\fBchar *wunctrl(cchar_t *c);\fR
-+\fBwchar_t *wunctrl(cchar_t *c);\fR
- .br
- \fBchar *keyname(int c);\fR
- .br
-@@ -146,6 +146,29 @@
- The XSI Curses standard, Issue 4 describes these functions.
- It states that \fBunctrl\fR and \fBwunctrl\fR will return a null pointer if
- unsuccessful, but does not define any error conditions.
-+This implementation checks for three cases:
-+.RS
-+.TP 5
-+-
-+the parameter is a 7-bit US-ASCII code.
-+This is the case that X/Open Curses documented.
-+.TP 5
-+-
-+the parameter is in the range 128-159, i.e., a C1 control code.
-+If \fBuse_legacy_coding\fP has been called with a \fB2\fP parameter,
-+\fBunctrl\fP returns the parameter, i.e., a one-character string with
-+the parameter as the first character.
-+Otherwise, it returns ``~@'', ``~A'', etc., analogous to ``^@'', ``^A'', C0 controls.
-+.IP
-+X/Open Curses does not document whether \fBunctrl\fP can be called before
-+initializing curses.
-+This implementation permits that,
-+and returns the ``~@'', etc., values in that case.
-+.TP 5
-+-
-+parameter values outside the 0 to 255 range.
-+\fBunctrl\fP returns a null pointer.
-+.RE
- .PP
- The SVr4 documentation describes the action of \fBfilter\fR only in the vaguest
- terms.  The description here is adapted from the XSI Curses standard (which
-@@ -157,13 +180,24 @@
- Other implementations have different conventions.
- For example, they may show both sets of control characters with `^',
- and strip the parameter to 7 bits.
--Or they may ignore C1 controls and treat all of the upper-1280 codes as
-+Or they may ignore C1 controls and treat all of the upper-128 codes as
- printable.
- This implementation uses 8 bits but does not modify the string to reflect
- locale.
- The \fBuse_legacy_coding\fP function allows the caller to
- change the output of \fBunctrl\fP.
- .PP
-+Likewise, the \fBmeta\fP function allows the caller to change the
-+output of \fBkeyname\fP, i.e.,
-+it determines whether to use the `M-' prefix
-+for ``meta'' keys (codes in the range 128 to 255).
-+Both \fBuse_legacy_coding\fP and \fBmeta\fP succeed only after
-+curses is initialized. 
-+X/Open Curses does not document the treatment of codes 128 to 159.
-+When treating them as ``meta'' keys
-+(or if \fBkeyname\fP is called before initializing curses),
-+this implementation returns strings ``M-^@'', ``M-^A'', etc.
-+.PP
- The \fBkeyname\fP function may return the names of user-defined
- string capabilities which are defined in the terminfo entry via the \fB-x\fP
- option of \fBtic\fP.
-@@ -178,11 +212,12 @@
- It is recommended that any code depending on ncurses extensions
- be conditioned using NCURSES_VERSION.
- .SH SEE ALSO
--\fBuse_legacy_coding\fR(3),
-+\fBlegacy_coding\fR(3X),
- \fBcurses\fR(3X),
- \fBcurs_initscr\fR(3X),
- \fBcurs_kernel\fR(3X),
--\fBcurs_scr_dump\fR(3X).
-+\fBcurs_scr_dump\fR(3X),
-+\fBlegacy_coding\fR(3X).
- .\"#
- .\"# The following sets edit modes for GNU EMACS
- .\"# Local Variables:
-diff -Naur ncurses-5.6.orig/man/default_colors.3x ncurses-5.6/man/default_colors.3x
---- ncurses-5.6.orig/man/default_colors.3x	2006-02-25 16:49:19.000000000 -0500
-+++ ncurses-5.6/man/default_colors.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -28,7 +28,7 @@
- .\"
- .\" Author: Thomas E. Dickey 1997,1999,2000,2005
- .\"
--.\" $Id: default_colors.3x,v 1.19 2006/02/25 21:49:19 tom Exp $
-+.\" $Id: default_colors.3x,v 1.20 2006/12/24 15:02:53 tom Exp $
- .TH default_colors 3X ""
- .SH NAME
- \fBuse_default_colors\fR,
-@@ -104,9 +104,8 @@
- If the \fIinitialize_pair\fP capability is found, this causes an
- error as well.
- .SH NOTES
--Associated with this extension, the \fBinit_pair\fR(3X) function accepts
--negative arguments to specify default foreground or background
--colors.
-+Associated with this extension, the \fBinit_pair\fR function accepts
-+negative arguments to specify default foreground or background colors.
- .PP
- The \fIuse_default_colors()\fP function was added to support \fIded\fP.
- This is a full-screen application which uses curses to manage only part
-diff -Naur ncurses-5.6.orig/man/form.3x ncurses-5.6/man/form.3x
---- ncurses-5.6.orig/man/form.3x	2006-11-04 13:50:09.000000000 -0500
-+++ ncurses-5.6/man/form.3x	2008-06-18 06:49:50.000000000 -0400
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2002,2006 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,7 +27,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: form.3x,v 1.20 2006/11/04 18:50:09 tom Exp $
-+.\" $Id: form.3x,v 1.21 2008/04/26 17:11:52 tom Exp $
- .TH form 3X ""
- .SH NAME
- \fBform\fR - curses extension for programming forms
-@@ -69,7 +69,7 @@
- data_ahead	\fBform_data\fR(3X)
- data_behind	\fBform_data\fR(3X)
- dup_field	\fBform_field_new\fR(3X)
--dynamic_fieldinfo	\fBform_field_info\fR(3X)
-+dynamic_field_info	\fBform_field_info\fR(3X)
- field_arg	\fBform_field_validation\fR(3X)
- field_back	\fBform_field_attributes\fR(3X)
- field_buffer	\fBform_field_buffer\fR(3X)
-diff -Naur ncurses-5.6.orig/man/form_driver.3x ncurses-5.6/man/form_driver.3x
---- ncurses-5.6.orig/man/form_driver.3x	2006-11-04 13:51:00.000000000 -0500
-+++ ncurses-5.6/man/form_driver.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2002,2006 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: form_driver.3x,v 1.12 2006/11/04 18:51:00 tom Exp $
-+.\" $Id: form_driver.3x,v 1.15 2007/06/02 22:56:49 tom Exp $
- .TH form_driver 3X ""
- .SH NAME
- \fBform_driver\fR - command-processing loop of the form system
-@@ -38,7 +38,7 @@
- .SH DESCRIPTION
- Once a form has been posted (displayed), you should funnel input events to it
- through \fBform_driver\fR.  This routine has two major input cases; either
--the input is a form navigation request or it's a printable ASCII character.
-+the input is a form navigation request or it is a printable ASCII character.
- The form driver requests are as follows:
- .TP 5
- REQ_NEXT_PAGE
-@@ -221,6 +221,57 @@
- If the second argument is a printable ASCII character, the driver places it
- in the current position in the current field.  If it is one of the forms
- requests listed above, that request is executed.
-+.SS MOUSE HANDLING
-+.PP
-+If the second argument is the KEY_MOUSE special key, the associated
-+mouse event is translated into one of the above pre-defined requests.
-+Currently only clicks in the user window (e.g. inside the form display
-+area or the decoration window) are handled.
-+.PP
-+If you click above the display region of the form:
-+.RS
-+.TP
-+a REQ_PREV_FIELD is generated for a single click,
-+.TP
-+a REQ_PREV_PAGE is generated for a double-click and
-+.TP
-+a REQ_FIRST_FIELD is generated for a triple-click.
-+.RE
-+.PP
-+If you click below the display region of the form:
-+.RS
-+.TP
-+a REQ_NEXT_FIELD is generated for a single click,
-+.TP
-+a REQ_NEXT_PAGE is generated for a double-click and
-+.TP
-+a REQ_LAST_FIELD is generated for a triple-click.
-+.RE
-+.PP
-+If you click at an field inside the display area of the form:
-+.RS
-+.TP 3
-+-
-+the form cursor is positioned to that field.
-+.TP 3
-+-
-+If you double-click a field,
-+the form cursor is positioned to that field
-+and \fBE_UNKNOWN_COMMAND\fR is returned.
-+This return value makes sense,
-+because a double click usually means that an field-specific action should
-+be returned.
-+It is exactly the purpose of this return value to signal that an
-+application specific command should be executed.
-+.TP 3
-+-
-+If a translation
-+into a request was done, \fBform_driver\fR returns the result of this request.
-+.RE
-+.PP
-+If you clicked outside the user window or the mouse event couldn't be translated
-+into a form request an \fBE_REQUEST_DENIED\fR is returned.
-+.SS APPLICATION-DEFINED COMMANDS
- .PP
- If the second argument is neither printable ASCII nor one of the above
- pre-defined form requests, the driver assumes it is an application-specific
-diff -Naur ncurses-5.6.orig/man/form_field_new.3x ncurses-5.6/man/form_field_new.3x
---- ncurses-5.6.orig/man/form_field_new.3x	2006-11-04 12:12:00.000000000 -0500
-+++ ncurses-5.6/man/form_field_new.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2003,2006 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,7 +27,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: form_field_new.3x,v 1.14 2006/11/04 17:12:00 tom Exp $
-+.\" $Id: form_field_new.3x,v 1.16 2007/06/02 20:40:07 tom Exp $
- .TH form_field_new 3X ""
- .SH NAME
- \fBform_field_new\fR - create and destroy form fields
-@@ -93,8 +93,8 @@
- Version 7 or BSD versions.
- .PP
- It may be unwise to count on the set of attributes copied by
--\fBdup_field\fR(3X) being portable; the System V forms library documents are
--not very explicit about what gets copied and what doesn't.
-+\fBdup_field\fR being portable; the System V forms library documents are
-+not very explicit about what gets copied and what does not.
- .SH AUTHORS
- Juergen Pfeifer.  Manual pages and adaptation for new curses by Eric
- S. Raymond.
-diff -Naur ncurses-5.6.orig/man/form_field_opts.3x ncurses-5.6/man/form_field_opts.3x
---- ncurses-5.6.orig/man/form_field_opts.3x	2006-11-04 12:12:00.000000000 -0500
-+++ ncurses-5.6/man/form_field_opts.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,20 +27,20 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: form_field_opts.3x,v 1.12 2006/11/04 17:12:00 tom Exp $
-+.\" $Id: form_field_opts.3x,v 1.13 2007/02/24 17:34:27 tom Exp $
- .TH form_field_opts 3X ""
- .SH NAME
- \fBform_field_opts\fR - set and get field options
- .SH SYNOPSIS
- \fB#include <form.h>\fR
- .br
--int set_field_opts(FIELD *field, OPTIONS opts);
-+int set_field_opts(FIELD *field, Field_Options opts);
- .br
--int field_opts_on(FIELD *field, OPTIONS opts);
-+int field_opts_on(FIELD *field, Field_Options opts);
- .br
--int field_opts_off(FIELD *field, OPTIONS opts);
-+int field_opts_off(FIELD *field, Field_Options opts);
- .br
--OPTIONS field_opts(const FIELD *field);
-+Field_Options field_opts(const FIELD *field);
- .br
- .SH DESCRIPTION
- The function \fBset_field_opts\fR sets all the given field's option bits (field
-diff -Naur ncurses-5.6.orig/man/form_field_validation.3x ncurses-5.6/man/form_field_validation.3x
---- ncurses-5.6.orig/man/form_field_validation.3x	2006-11-04 12:14:19.000000000 -0500
-+++ ncurses-5.6/man/form_field_validation.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: form_field_validation.3x,v 1.15 2006/11/04 17:14:19 tom Exp $
-+.\" $Id: form_field_validation.3x,v 1.16 2006/12/24 16:08:08 tom Exp $
- .TH form_field_validation 3X ""
- .SH NAME
- \fBform_field_validation\fR - data type validation for fields
-@@ -99,7 +99,7 @@
- TYPE_REGEXP
- Regular expression data.  Requires a regular expression \fB(char *)\fR third argument;
- the data is valid if the regular expression matches it.  Regular expressions
--are in the format of \fBregcomp\fR(3X) and \fBregexec\fR(3X). Please notice
-+are in the format of \fBregcomp\fR and \fBregexec\fR. Please notice
- that the regular expression must match the whole field. If you have for
- example an eight character wide field, a regular expression "^[0-9]*$" always
- means that you have to fill all eight positions with digits. If you want to
-diff -Naur ncurses-5.6.orig/man/form_hook.3x ncurses-5.6/man/form_hook.3x
---- ncurses-5.6.orig/man/form_hook.3x	2006-11-04 12:12:00.000000000 -0500
-+++ ncurses-5.6/man/form_hook.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998,2006 Free Software Foundation, Inc.                   *
-+.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,28 +27,28 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: form_hook.3x,v 1.8 2006/11/04 17:12:00 tom Exp $
-+.\" $Id: form_hook.3x,v 1.9 2007/02/24 17:34:18 tom Exp $
- .TH form_hook 3X ""
- .SH NAME
- \fBform_hook\fR - set hooks for automatic invocation by applications
- .SH SYNOPSIS
- \fB#include <form.h>\fR
- .br
--int set_field_init(FORM *form, void (*func)(FORM *));
-+int set_field_init(FORM *form, Form_Hook func);
- .br
--void (*)(FORM *) field_init(const FORM *form);
-+Form_Hook field_init(const FORM *form);
- .br
--int set_field_term(FORM *form, void (*func)(FORM *));
-+int set_field_term(FORM *form, Form_Hook func);
- .br
--void (*)(FORM *) field_term(const FORM *form);
-+Form_Hook field_term(const FORM *form);
- .br
--int set_form_init(FORM *form, void (*func)(FORM *));
-+int set_form_init(FORM *form, Form_Hook func);
- .br
--void (*)(FORM *) form_init(const FORM *form);
-+Form_Hook form_init(const FORM *form);
- .br
--int set_form_term(FORM *form, void (*func)(FORM *));
-+int set_form_term(FORM *form, Form_Hook func);
- .br
--void (*)(FORM *) form_term(const FORM *form);
-+Form_Hook form_term(const FORM *form);
- .br
- .SH DESCRIPTION
- These functions make it possible to set hook functions to be called at various
-diff -Naur ncurses-5.6.orig/man/form_opts.3x ncurses-5.6/man/form_opts.3x
---- ncurses-5.6.orig/man/form_opts.3x	2006-11-04 12:12:00.000000000 -0500
-+++ ncurses-5.6/man/form_opts.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998,2006 Free Software Foundation, Inc.                   *
-+.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,20 +27,20 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: form_opts.3x,v 1.8 2006/11/04 17:12:00 tom Exp $
-+.\" $Id: form_opts.3x,v 1.9 2007/02/24 17:34:36 tom Exp $
- .TH form_opts 3X ""
- .SH NAME
- \fBform_opts\fR - set and get form options
- .SH SYNOPSIS
- \fB#include <form.h>\fR
- .br
--int set_form_opts(FORM *form, OPTIONS opts);
-+int set_form_opts(FORM *form, Field_Options opts);
- .br
--int form_opts_on(FORM *form, OPTIONS opts);
-+int form_opts_on(FORM *form, Field_Options opts);
- .br
--int form_opts_off(FORM *form, OPTIONS opts);
-+int form_opts_off(FORM *form, Field_Options opts);
- .br
--OPTIONS form_opts(const FORM *form);
-+Field_Options form_opts(const FORM *form);
- .br
- .SH DESCRIPTION
- The function \fBset_form_opts\fR sets all the given form's option bits (form
-diff -Naur ncurses-5.6.orig/man/infocmp.1m ncurses-5.6/man/infocmp.1m
---- ncurses-5.6.orig/man/infocmp.1m	2006-05-13 11:14:01.000000000 -0400
-+++ ncurses-5.6/man/infocmp.1m	2008-06-18 06:49:44.000000000 -0400
-@@ -27,14 +27,14 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: infocmp.1m,v 1.43 2006/05/13 15:14:01 tom Exp $
--.TH infocmp 1M ""
-+.\" $Id: infocmp.1m,v 1.44 2006/12/24 18:16:31 tom Exp $
-+.TH @INFOCMP@ 1M ""
- .ds n 5
- .ds d @TERMINFO@
- .SH NAME
--\fBinfocmp\fR - compare or print out \fIterminfo\fR descriptions
-+\fB@INFOCMP@\fR - compare or print out \fIterminfo\fR descriptions
- .SH SYNOPSIS
--\fBinfocmp\fR [\fB-\
-+\fB@INFOCMP@\fR [\fB-\
- 1\
- C\
- E\
-@@ -66,7 +66,7 @@
- .br
-       [\fItermname\fR...]
- .SH DESCRIPTION
--\fBinfocmp\fR can be used to compare a binary \fBterminfo\fR entry with other
-+\fB@INFOCMP@\fR can be used to compare a binary \fBterminfo\fR entry with other
- terminfo entries, rewrite a \fBterminfo\fR description to take advantage of the
- \fBuse=\fR terminfo field, or print out a \fBterminfo\fR description from the
- binary file (\fBterm\fR) in a variety of formats.  In all cases, the boolean
-@@ -77,7 +77,7 @@
- \fB-I\fR option will be assumed.  If more than one \fItermname\fR is specified,
- the \fB-d\fR option will be assumed.
- .SS Comparison Options [-d] [-c] [-n]
--\fBinfocmp\fR compares the \fBterminfo\fR description of the first terminal
-+\fB@INFOCMP@\fR compares the \fBterminfo\fR description of the first terminal
- \fItermname\fR with each of the descriptions given by the entries for the other
- terminal's \fItermnames\fR.  If a capability is defined for only one of the
- terminals, the value returned will depend on the type of the capability:
-@@ -114,7 +114,7 @@
- .PP
- The source produced by the \fB-C\fR option may be used directly as a
- \fBtermcap\fR entry, but not all parameterized strings can be changed to
--the \fBtermcap\fR format.  \fBinfocmp\fR will attempt to convert most of the
-+the \fBtermcap\fR format.  \fB@INFOCMP@\fR will attempt to convert most of the
- parameterized information, and anything not converted will be plainly marked in
- the output and commented out.  These should be edited by hand.
- .PP
-@@ -162,7 +162,7 @@
- other terminals.  In this manner, it is possible to retrofit generic terminfo
- entries into a terminal's description.  Or, if two similar terminals exist, but
- were coded at different times or by different people so that each description
--is a full description, using \fBinfocmp\fR will show what can be done to change
-+is a full description, using \fB@INFOCMP@\fR will show what can be done to change
- one description to be relative to the other.
- .PP
- A capability will get printed with an at-sign (@) if it no longer exists in the
-@@ -176,18 +176,18 @@
- terminfo compiler \fBtic\fR does a left-to-right scan of the capabilities,
- specifying two \fBuse=\fR entries that contain differing entries for the same
- capabilities will produce different results depending on the order that the
--entries are given in.  \fBinfocmp\fR will flag any such inconsistencies between
-+entries are given in.  \fB@INFOCMP@\fR will flag any such inconsistencies between
- the other \fItermname\fR entries as they are found.
- .PP
- Alternatively, specifying a capability \fIafter\fR a \fBuse=\fR entry that
- contains that capability will cause the second specification to be ignored.
--Using \fBinfocmp\fR to recreate a description can be a useful check to make
-+Using \fB@INFOCMP@\fR to recreate a description can be a useful check to make
- sure that everything was specified correctly in the original source
- description.
- .PP
- Another error that does not cause incorrect compiled files, but will slow down
- the compilation time, is specifying extra \fBuse=\fR fields that are
--superfluous.  \fBinfocmp\fR will flag any other \fItermname use=\fR fields that
-+superfluous.  \fB@INFOCMP@\fR will flag any other \fItermname use=\fR fields that
- were not needed.
- .SS Changing Databases [-A \fIdirectory\fR] [-B \fIdirectory\fR]
- The location of the compiled \fBterminfo\fR database is taken from the
-@@ -208,7 +208,7 @@
- of 60 characters.
- .TP
- \fB-a\fR
--tells \fBinfocmp\fP to retain commented-out capabilities rather than discarding
-+tells \fB@INFOCMP@\fP to retain commented-out capabilities rather than discarding
- them.  Capabilities are commented by prefixing them with a period.
- .TP 5
- \fB-E\fR
-@@ -367,9 +367,9 @@
- untranslatable capabilities are commented-out.
- .TP 5
- \fB-U\fR
--tells \fBinfocmp\fP to not post-process the data after parsing the source file.
-+tells \fB@INFOCMP@\fP to not post-process the data after parsing the source file.
- This feature helps when comparing the actual contents of two source files,
--since it excludes the inferences that \fBinfocmp\fP makes to fill in missing
-+since it excludes the inferences that \fB@INFOCMP@\fP makes to fill in missing
- data.
- .TP 5
- \fB-V\fR
-@@ -413,7 +413,7 @@
- Actual BSD curses versions will have a more restricted set.  To see only the
- 4.4BSD set, use \fB-r\fR \fB-RBSD\fR.
- .SH BUGS
--The \fB-F\fR option of \fBinfocmp\fR(1M) should be a \fBtoe\fR(1M) mode.
-+The \fB-F\fR option of \fB@INFOCMP@\fR(1M) should be a \fB@TOE@\fR(1M) mode.
- .SH SEE ALSO
- \fB@CAPTOINFO@\fR(1M),
- \fB@INFOTOCAP@\fR(1M),
-diff -Naur ncurses-5.6.orig/man/infotocap.1m ncurses-5.6/man/infotocap.1m
---- ncurses-5.6.orig/man/infotocap.1m	2006-05-13 11:35:45.000000000 -0400
-+++ ncurses-5.6/man/infotocap.1m	2008-06-18 06:49:44.000000000 -0400
-@@ -27,16 +27,16 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: infotocap.1m,v 1.6 2006/05/13 15:35:45 tom Exp $
--.TH infotocap 1M ""
-+.\" $Id: infotocap.1m,v 1.8 2006/12/24 20:13:56 tom Exp $
-+.TH @INFOTOCAP@ 1M ""
- .ds n 5
- .ds d @TERMINFO@
- .SH NAME
--\fBinfotocap\fR - convert a \fIterminfo\fR description into a \fItermcap\fR description
-+\fB@INFOTOCAP@\fR - convert a \fIterminfo\fR description into a \fItermcap\fR description
- .SH SYNOPSIS
--\fBinfotocap\fR [\fB-v\fR\fIn\fR \fIwidth\fR]  [\fB-V\fR] [\fB-1\fR] [\fB-w\fR \fIwidth\fR] \fIfile\fR . . .
-+\fB@INFOTOCAP@\fR [\fB-v\fR\fIn\fR \fIwidth\fR]  [\fB-V\fR] [\fB-1\fR] [\fB-w\fR \fIwidth\fR] \fIfile\fR . . .
- .SH DESCRIPTION
--\fBinfotocap\fR looks in \fIfile\fR for \fBterminfo\fR descriptions.  For each
-+\fB@INFOTOCAP@\fR looks in \fIfile\fR for \fBterminfo\fR descriptions.  For each
- one found, an equivalent \fBtermcap\fR description is written to standard
- output.  Terminfo \fBuse\fR capabilities are translated directly to termcap
- \fBtc\fR capabilities.
-@@ -59,12 +59,12 @@
- \*d
- Compiled terminal description database.
- .SH NOTES
--This utility is actually a link to \fItic\fR(1M), running in \fI-C\fR mode.
--You can use other \fItic\fR options such as \fB-f\fR and  \fB-x\fR.
-+This utility is actually a link to \fI@TIC@\fR, running in \fI-C\fR mode.
-+You can use other \fI@TIC@\fR options such as \fB-f\fR and  \fB-x\fR.
- .SH SEE ALSO
- \fBcurses\fR(3X),
--\fBtic\fR(1M),
--\fBinfocmp\fR(1M),
-+\fB@TIC@\fR(1M),
-+\fB@INFOCMP@\fR(1M),
- \fBterminfo\fR(\*n)
- .PP
- This describes \fBncurses\fR
-diff -Naur ncurses-5.6.orig/man/legacy_coding.3x ncurses-5.6/man/legacy_coding.3x
---- ncurses-5.6.orig/man/legacy_coding.3x	2006-02-25 16:50:01.000000000 -0500
-+++ ncurses-5.6/man/legacy_coding.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -28,7 +28,7 @@
- .\"
- .\" Author: Thomas E. Dickey
- .\"
--.\" $Id: legacy_coding.3x,v 1.2 2006/02/25 21:50:01 tom Exp $
-+.\" $Id: legacy_coding.3x,v 1.3 2006/12/24 15:12:55 tom Exp $
- .TH legacy_coding 3X ""
- .SH NAME
- \fBuse_legacy_coding\fR \- use terminal's default colors
-@@ -50,7 +50,7 @@
- .TP 5
- 0
- the library functions normally,
--rendering nonprinting characters as described in \fBunctrl\fP(3X).
-+rendering nonprinting characters as described in \fBunctrl\fP.
- .TP
- 1
- the library ignores \fBisprintf\fP for codes in the range 160-255.
-diff -Naur ncurses-5.6.orig/man/man_db.renames ncurses-5.6/man/man_db.renames
---- ncurses-5.6.orig/man/man_db.renames	2006-05-13 19:47:25.000000000 -0400
-+++ ncurses-5.6/man/man_db.renames	2008-06-18 06:49:46.000000000 -0400
-@@ -1,5 +1,5 @@
- ##############################################################################
--# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -25,7 +25,7 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: man_db.renames,v 0.36 2006/05/13 23:47:25 tom Exp $
-+# $Id: man_db.renames,v 0.40 2008/01/19 18:28:50 tom Exp $
- # Manual-page renamings for the man_db program
- #
- # Files:
-@@ -67,8 +67,10 @@
- curs_instr.3x			instr.3ncurses
- curs_inwstr.3x			inwstr.3ncurses
- curs_kernel.3x			kernel.3ncurses
-+curs_legacy.3x			legacy.3ncurses
- curs_mouse.3x			mouse.3ncurses
- curs_move.3x			move.3ncurses
-+curs_opaque.3x			opaque.3ncurses
- curs_outopts.3x			outopts.3ncurses
- curs_overlay.3x			overlay.3ncurses
- curs_pad.3x			pad.3ncurses
-@@ -82,6 +84,7 @@
- curs_termattrs.3x		termattrs.3ncurses
- curs_termcap.3x			termcap.3ncurses
- curs_terminfo.3x		terminfo.3ncurses
-+curs_threads.3x			threads.3ncurses
- curs_touch.3x			touch.3ncurses
- curs_trace.3x			trace.3ncurses
- curs_util.3x			util.3ncurses
-@@ -114,9 +117,9 @@
- form_win.3x			win.3form
- infocmp.1m			infocmp.1
- infotocap.1m			infotocap.1
-+key_defined.3x			key_defined.3ncurses
- keybound.3x			keybound.3ncurses
- keyok.3x			keyok.3ncurses
--key_defined.3x			key_defined.3ncurses
- legacy_coding.3x		legacy_coding.3ncurses
- menu.3x				menu.3menu
- menu_attributes.3x		attributes.3menu
-@@ -159,12 +162,15 @@
- vprintf.3s			vprintf.3
- wresize.3x			wresize.3ncurses
- #
--# Other cross-references:
--addch.3x			addch.3ncurses
--can_change_color.3x		can_change_color.3ncurses
--curs_attr_get.3x		attr_get.3ncurses
--dup_field.3x			dup_field.3ncurses
--init_pair.3x			init_pair.3ncurses
--#
- # Other:
- tack.1m				tack.1
-+#
-+getty.1				getty.8
-+scanf.3				scanf.3
-+ttys.5				ttys.4
-+termio.7			termios.3
-+system.3			system.3
-+regcomp.3x			regcomp.3
-+regexec.3x			regexec.3
-+#
-+# vile:cfgmode
-diff -Naur ncurses-5.6.orig/man/manlinks.sed ncurses-5.6/man/manlinks.sed
---- ncurses-5.6.orig/man/manlinks.sed	2003-12-20 08:17:56.000000000 -0500
-+++ ncurses-5.6/man/manlinks.sed	2008-06-18 06:49:46.000000000 -0400
-@@ -1,6 +1,6 @@
--# $Id: manlinks.sed,v 1.12 2003/12/20 13:17:56 tom Exp $
-+# $Id: manlinks.sed,v 1.13 2008/01/19 23:31:17 tom Exp $
- ##############################################################################
--# Copyright (c) 2000-2002,2003 Free Software Foundation, Inc.                #
-+# Copyright (c) 2000-2003,2008 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -35,6 +35,7 @@
- /\.\\"/d
- /^\.br/d
- /^\.sp/d
-+/typedef/d
- s/^\.IX//
- s/\\f.//g
- s/[:,]/ /g
-diff -Naur ncurses-5.6.orig/man/menu_driver.3x ncurses-5.6/man/menu_driver.3x
---- ncurses-5.6.orig/man/menu_driver.3x	2006-11-04 12:13:50.000000000 -0500
-+++ ncurses-5.6/man/menu_driver.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2003,2006 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: menu_driver.3x,v 1.12 2006/11/04 17:13:50 tom Exp $
-+.\" $Id: menu_driver.3x,v 1.14 2007/06/02 22:50:09 tom Exp $
- .TH menu_driver 3X ""
- .SH NAME
- \fBmenu_driver\fR - command-processing loop of the menu system
-@@ -38,7 +38,7 @@
- .SH DESCRIPTION
- Once a menu has been posted (displayed), you should funnel input events to it
- through \fBmenu_driver\fR.  This routine has three major input cases; either
--the input is a menu navigation request, it's a printable ASCII character or it
-+the input is a menu navigation request, it is a printable ASCII character or it
- is the KEY_MOUSE special key associated with an mouse event.
- The menu driver requests are as follows:
- .TP 5
-@@ -100,25 +100,56 @@
- .PP
- If the second argument is one of the above pre-defined requests, the
- corresponding action is performed.
-+.SS MOUSE HANDLING
- .PP
- If the second argument is the KEY_MOUSE special key, the associated
- mouse event is translated into one of the above pre-defined requests.
- Currently only clicks in the user window (e.g. inside the menu display
--area or the decoration window) are handled. If you click above the
--display region of the menu, a REQ_SCR_ULINE is generated, if you
--doubleclick a REQ_SCR_UPAGE is generated and if you tripleclick a
--REQ_FIRST_ITEM is generated. If you click below the display region of
--the menu, a REQ_SCR_DLINE is generated, if you doubleclick a REQ_SCR_DPAGE
--is generated and if you tripleclick a REQ_LAST_ITEM is generated. If you
--click at an item inside the display area of the menu, the menu cursor
--is positioned to that item. If you double-click at an item a REQ_TOGGLE_ITEM
--is generated and \fBE_UNKNOWN_COMMAND\fR is returned. This return value makes
--sense, because a double click usually means that an item-specific action should
--be returned. It's exactly the purpose of this return value to signal that an
--application specific command should be executed. If a translation
-+area or the decoration window) are handled.
-+.PP
-+If you click above the display region of the menu:
-+.RS
-+.TP
-+a REQ_SCR_ULINE is generated for a single click,
-+.TP
-+a REQ_SCR_UPAGE is generated for a double-click and
-+.TP
-+a REQ_FIRST_ITEM is generated for a triple-click.
-+.RE
-+.PP
-+If you click below the display region of the menu:
-+.RS
-+.TP
-+a REQ_SCR_DLINE is generated for a single click,
-+.TP
-+a REQ_SCR_DPAGE is generated for a double-click and
-+.TP
-+a REQ_LAST_ITEM is generated for a triple-click.
-+.RE
-+.PP
-+If you click at an item inside the display area of the menu:
-+.RS
-+.TP 3
-+-
-+the menu cursor is positioned to that item.
-+.TP 3
-+-
-+If you double-click an item a REQ_TOGGLE_ITEM
-+is generated and \fBE_UNKNOWN_COMMAND\fR is returned.
-+This return value makes sense,
-+because a double click usually means that an item-specific action should
-+be returned.
-+It is exactly the purpose of this return value to signal that an
-+application specific command should be executed.
-+.TP 3
-+-
-+If a translation
- into a request was done, \fBmenu_driver\fR returns the result of this request.
-+.RE
-+.PP
- If you clicked outside the user window or the mouse event couldn't be translated
- into a menu request an \fBE_REQUEST_DENIED\fR is returned.
-+.SS APPLICATION-DEFINED COMMANDS
- .PP
- If the second argument is neither printable ASCII nor one of the above
- pre-defined menu requests or KEY_MOUSE, the drive assumes it is an application-specific
-diff -Naur ncurses-5.6.orig/man/menu_hook.3x ncurses-5.6/man/menu_hook.3x
---- ncurses-5.6.orig/man/menu_hook.3x	2006-11-04 12:12:00.000000000 -0500
-+++ ncurses-5.6/man/menu_hook.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998,2006 Free Software Foundation, Inc.                   *
-+.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,28 +27,28 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: menu_hook.3x,v 1.8 2006/11/04 17:12:00 tom Exp $
-+.\" $Id: menu_hook.3x,v 1.9 2007/02/24 17:34:08 tom Exp $
- .TH menu_hook 3X ""
- .SH NAME
- \fBmenu_hook\fR - set hooks for automatic invocation by applications
- .SH SYNOPSIS
- \fB#include <menu.h>\fR
- .br
--int set_item_init(MENU *menu, void (*func)(MENU *));
-+int set_item_init(MENU *menu, Menu_Hook func);
- .br
--void (*)(MENU *) item_init(const MENU *menu);
-+Menu_Hook item_init(const MENU *menu);
- .br
--int set_item_term(MENU *menu, void (*func)(MENU *));
-+int set_item_term(MENU *menu, Menu_Hook func);
- .br
--void (*)(MENU *) item_term(const MENU *menu);
-+Menu_Hook item_term(const MENU *menu);
- .br
--int set_menu_init(MENU *menu, void (*func)(MENU *));
-+int set_menu_init(MENU *menu, Menu_Hook func);
- .br
--void (*)(MENU *) menu_init(const MENU *menu);
-+Menu_Hook menu_init(const MENU *menu);
- .br
--int set_menu_term(MENU *menu, void (*func)(MENU *));
-+int set_menu_term(MENU *menu, Menu_Hook func);
- .br
--void (*)(MENU *) menu_term(const MENU *menu);
-+Menu_Hook menu_term(const MENU *menu);
- .br
- .SH DESCRIPTION
- These functions make it possible to set hook functions to be called at various
-diff -Naur ncurses-5.6.orig/man/menu_opts.3x ncurses-5.6/man/menu_opts.3x
---- ncurses-5.6.orig/man/menu_opts.3x	2006-11-04 12:12:00.000000000 -0500
-+++ ncurses-5.6/man/menu_opts.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998,2006 Free Software Foundation, Inc.                   *
-+.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,20 +27,20 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: menu_opts.3x,v 1.9 2006/11/04 17:12:00 tom Exp $
-+.\" $Id: menu_opts.3x,v 1.10 2007/02/24 17:33:59 tom Exp $
- .TH menu_opts 3X ""
- .SH NAME
- \fBmenu_opts\fR - set and get menu options
- .SH SYNOPSIS
- \fB#include <menu.h>\fR
- .br
--int set_menu_opts(MENU *menu, OPTIONS opts);
-+int set_menu_opts(MENU *menu, Menu_Options opts);
- .br
--int menu_opts_on(MENU *menu, OPTIONS opts);
-+int menu_opts_on(MENU *menu, Menu_Options opts);
- .br
--int menu_opts_off(MENU *menu, OPTIONS opts);
-+int menu_opts_off(MENU *menu, Menu_Options opts);
- .br
--OPTIONS menu_opts(const MENU *menu);
-+Menu_Options menu_opts(const MENU *menu);
- .br
- .SH DESCRIPTION
- The function \fBset_menu_opts\fR sets all the given menu's option bits (menu
-diff -Naur ncurses-5.6.orig/man/mitem_opts.3x ncurses-5.6/man/mitem_opts.3x
---- ncurses-5.6.orig/man/mitem_opts.3x	2006-11-04 12:12:00.000000000 -0500
-+++ ncurses-5.6/man/mitem_opts.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998,2006 Free Software Foundation, Inc.                   *
-+.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,20 +27,20 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: mitem_opts.3x,v 1.8 2006/11/04 17:12:00 tom Exp $
-+.\" $Id: mitem_opts.3x,v 1.9 2007/02/24 17:33:32 tom Exp $
- .TH mitem_opts 3X ""
- .SH NAME
- \fBmitem_opts\fR - set and get menu item options
- .SH SYNOPSIS
- \fB#include <menu.h>\fR
- .br
--int set_item_opts(ITEM *item, OPTIONS opts);
-+int set_item_opts(ITEM *item, Item_Options opts);
- .br
--int item_opts_on(ITEM *item, OPTIONS opts);
-+int item_opts_on(ITEM *item, Item_Options opts);
- .br
--int item_opts_off(ITEM *item, OPTIONS opts);
-+int item_opts_off(ITEM *item, Item_Options opts);
- .br
--OPTIONS item_opts(const ITEM *item);
-+Item_Options item_opts(const ITEM *item);
- .br
- .SH DESCRIPTION
- The function \fBset_item_opts\fR sets all the given item's option bits (menu
-diff -Naur ncurses-5.6.orig/man/ncurses.3x ncurses-5.6/man/ncurses.3x
---- ncurses-5.6.orig/man/ncurses.3x	2006-12-02 14:23:11.000000000 -0500
-+++ ncurses-5.6/man/ncurses.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
- '\" t
- .\"***************************************************************************
--.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -27,7 +27,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: ncurses.3x,v 1.81 2006/12/02 19:23:11 tom Exp $
-+.\" $Id: ncurses.3x,v 1.89 2007/09/01 18:57:29 tom Exp $
- .hy 0
- .TH ncurses 3X ""
- .ds n 5
-@@ -39,19 +39,27 @@
- .br
- .SH DESCRIPTION
- The \fBncurses\fR library routines give the user a terminal-independent method
--of updating character screens with reasonable optimization.  This
--implementation is ``new curses'' (ncurses) and is the approved replacement for
-+of updating character screens with reasonable optimization.
-+This implementation is ``new curses'' (ncurses) and
-+is the approved replacement for
- 4.4BSD classic curses, which has been discontinued.
- This describes \fBncurses\fR
- version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
- .PP
--The \fBncurses\fR routines emulate the \fBcurses\fR(3X) library of System V
--Release 4 UNIX, and the XPG4 curses standard (XSI curses) but the \fBncurses\fR
--library is freely redistributable in source form.  Differences from the SVr4
-+The \fBncurses\fR library emulates the \fBcurses\fR(3X) library of
-+System V Release 4 UNIX,
-+and XPG4 (X/Open Portability Guide) curses (also known as XSI curses).
-+XSI stands for X/Open System Interfaces Extension.
-+The \fBncurses\fR library is freely redistributable in source form.
-+Differences from the SVr4
- curses are summarized under the \fBEXTENSIONS\fP and \fBPORTABILITY\fP sections below and
- described in detail in the respective \fBEXTENSIONS\fP, \fBPORTABILITY\fP and \fBBUGS\fP sections
- of individual man pages.
- .PP
-+The \fBncurses\fR library also provides many useful extensions,
-+i.e., features which cannot be implemented by a simple add-on library
-+but which require access to the internals of the library.
-+.PP
- A program using these routines must be linked with the \fB-lncurses\fR option,
- or (if it has been generated) with the debugging library \fB-lncurses_g\fR.
- (Your system integrator may also have installed these libraries under
-@@ -68,8 +76,9 @@
- .PP
- To initialize the routines, the routine \fBinitscr\fR or \fBnewterm\fR
- must be called before any of the other routines that deal with windows
--and screens are used.  The routine \fBendwin\fR must be called before
--exiting.  To get character-at-a-time input without echoing (most
-+and screens are used.
-+The routine \fBendwin\fR must be called before exiting.
-+To get character-at-a-time input without echoing (most
- interactive, screen oriented programs want this), the following
- sequence should be used:
- .sp
-@@ -82,60 +91,72 @@
-       \fBkeypad(stdscr, TRUE);\fR
- .sp
- Before a \fBcurses\fR program is run, the tab stops of the terminal
--should be set and its initialization strings, if defined, must be
--output.  This can be done by executing the \fBtput init\fR command
-+should be set and its initialization strings, if defined, must be output.
-+This can be done by executing the \fBtput init\fR command
- after the shell environment variable \fBTERM\fR has been exported.
- \fBtset(1)\fR is usually responsible for doing this.
- [See \fBterminfo\fR(\*n) for further details.]
- .PP
- The \fBncurses\fR library permits manipulation of data structures,
- called \fIwindows\fR, which can be thought of as two-dimensional
--arrays of characters representing all or part of a CRT screen.  A
--default window called \fBstdscr\fR, which is the size of the terminal
--screen, is supplied.  Others may be created with \fBnewwin\fR.
-+arrays of characters representing all or part of a CRT screen.
-+A default window called \fBstdscr\fR, which is the size of the terminal
-+screen, is supplied.
-+Others may be created with \fBnewwin\fR.
- .PP
- Note that \fBcurses\fR does not handle overlapping windows, that's done by
--the \fBpanel\fR(3X) library. This means that you can either use
-+the \fBpanel\fR(3X) library.
-+This means that you can either use
- \fBstdscr\fR or divide the screen into tiled windows and not using
--\fBstdscr\fR at all. Mixing the two will result in unpredictable, and
--undesired, effects.
-+\fBstdscr\fR at all.
-+Mixing the two will result in unpredictable, and undesired, effects.
- .PP
- Windows are referred to by variables declared as \fBWINDOW *\fR.
- These data structures are manipulated with routines described here and
--elsewhere in the \fBncurses\fR manual pages.  Among those, the most basic
--routines are \fBmove\fR and \fBaddch\fR.  More general versions of
-+elsewhere in the \fBncurses\fR manual pages.
-+Among those, the most basic
-+routines are \fBmove\fR and \fBaddch\fR.
-+More general versions of
- these routines are included with names beginning with \fBw\fR,
--allowing the user to specify a window.  The routines not beginning
-+allowing the user to specify a window.
-+The routines not beginning
- with \fBw\fR affect \fBstdscr\fR.
- .PP
- After using routines to manipulate a window, \fBrefresh\fR is called,
- telling \fBcurses\fR to make the user's CRT screen look like
--\fBstdscr\fR.  The characters in a window are actually of type
-+\fBstdscr\fR.
-+The characters in a window are actually of type
- \fBchtype\fR, (character and attribute data) so that other information
- about the character may also be stored with each character.
- .PP
--Special windows called \fIpads\fR may also be manipulated.  These are windows
-+Special windows called \fIpads\fR may also be manipulated.
-+These are windows
- which are not constrained to the size of the screen and whose contents need not
--be completely displayed.  See \fBcurs_pad\fR(3X) for more information.
-+be completely displayed.
-+See \fBcurs_pad\fR(3X) for more information.
- .PP
- In addition to drawing characters on the screen, video attributes and colors
- may be supported, causing the characters to show up in such modes as
- underlined, in reverse video, or in color on terminals that support such
--display enhancements.  Line drawing characters may be specified to be output.
-+display enhancements.
-+Line drawing characters may be specified to be output.
- On input, \fBcurses\fR is also able to translate arrow and function keys that
--transmit escape sequences into single values.  The video attributes, line
-+transmit escape sequences into single values.
-+The video attributes, line
- drawing characters, and input values use names, defined in \fB<curses.h>\fR,
- such as \fBA_REVERSE\fR, \fBACS_HLINE\fR, and \fBKEY_LEFT\fR.
- .PP
- If the environment variables \fBLINES\fR and \fBCOLUMNS\fR are set, or if the
- program is executing in a window environment, line and column information in
--the environment will override information read by \fIterminfo\fR.  This would
--effect a program running in an AT&T 630 layer, for example, where the size of a
-+the environment will override information read by \fIterminfo\fR.
-+This would affect a program running in an AT&T 630 layer,
-+for example, where the size of a
- screen is changeable (see \fBENVIRONMENT\fR).
- .PP
- If the environment variable \fBTERMINFO\fR is defined, any program using
- \fBcurses\fR checks for a local terminal definition before checking in the
--standard place.  For example, if \fBTERM\fR is set to \fBatt4424\fR, then the
-+standard place.
-+For example, if \fBTERM\fR is set to \fBatt4424\fR, then the
- compiled terminal definition is found in
- .sp
-       \fB\*d/a/att4424\fR.
-@@ -155,43 +176,100 @@
- .PP
- The integer variables \fBLINES\fR and \fBCOLS\fR are defined in
- \fB<curses.h>\fR and will be filled in by \fBinitscr\fR with the size of the
--screen.  The constants \fBTRUE\fR and \fBFALSE\fR have the values \fB1\fR and
-+screen.
-+The constants \fBTRUE\fR and \fBFALSE\fR have the values \fB1\fR and
- \fB0\fR, respectively.
- .PP
- The \fBcurses\fR routines also define the \fBWINDOW *\fR variable \fBcurscr\fR
- which is used for certain low-level operations like clearing and redrawing a
--screen containing garbage.  The \fBcurscr\fR can be used in only a few
--routines.
--.
-+screen containing garbage.
-+The \fBcurscr\fR can be used in only a few routines.
-+.\"
- .SS Routine and Argument Names
--Many \fBcurses\fR routines have two or more versions.  The routines prefixed
--with \fBw\fR require a window argument.  The routines prefixed with \fBp\fR
--require a pad argument.  Those without a prefix generally use \fBstdscr\fR.
-+Many \fBcurses\fR routines have two or more versions.
-+The routines prefixed with \fBw\fR require a window argument.
-+The routines prefixed with \fBp\fR require a pad argument.
-+Those without a prefix generally use \fBstdscr\fR.
- .PP
- The routines prefixed with \fBmv\fR require a \fIy\fR and \fIx\fR
--coordinate to move to before performing the appropriate action.  The
--\fBmv\fR routines imply a call to \fBmove\fR before the call to the
--other routine.  The coordinate \fIy\fR always refers to the row (of
--the window), and \fIx\fR always refers to the column.  The upper
--left-hand corner is always (0,0), not (1,1).
-+coordinate to move to before performing the appropriate action.
-+The \fBmv\fR routines imply a call to \fBmove\fR before the call to the
-+other routine.
-+The coordinate \fIy\fR always refers to the row (of
-+the window), and \fIx\fR always refers to the column.
-+The upper left-hand corner is always (0,0), not (1,1).
- .PP
- The routines prefixed with \fBmvw\fR take both a window argument and
--\fIx\fR and \fIy\fR coordinates.  The window argument is always
--specified before the coordinates.
-+\fIx\fR and \fIy\fR coordinates.
-+The window argument is always specified before the coordinates.
- .PP
- In each case, \fIwin\fR is the window affected, and \fIpad\fR is the
- pad affected; \fIwin\fR and \fIpad\fR are always pointers to type
- \fBWINDOW\fR.
- .PP
- Option setting routines require a Boolean flag \fIbf\fR with the value
--\fBTRUE\fR or \fBFALSE\fR; \fIbf\fR is always of type \fBbool\fR.  The
--variables \fIch\fR and \fIattrs\fR below are always of type
--\fBchtype\fR.  The types \fBWINDOW\fR, \fBSCREEN\fR, \fBbool\fR, and
--\fBchtype\fR are defined in \fB<curses.h>\fR.  The type \fBTERMINAL\fR
--is defined in \fB<term.h>\fR.  All other arguments are integers.
-+\fBTRUE\fR or \fBFALSE\fR; \fIbf\fR is always of type \fBbool\fR.
-+Most of the data types used in the library routines,
-+such as \fBWINDOW\fR, \fBSCREEN\fR, \fBbool\fR, and \fBchtype\fR
-+are defined in \fB<curses.h>\fR.
-+Types used for the terminfo routines such as
-+\fBTERMINAL\fR are defined in \fB<term.h>\fR.
-+.PP
-+This manual page describes functions which may appear in any configuration
-+of the library.
-+There are two common configurations of the library:
-+.RS
-+.TP 5
-+ncurses
-+the "normal" library, which handles 8-bit characters.
-+The normal (8-bit) library stores characters combined with attributes
-+in \fBchtype\fP data.
-+.IP
-+Attributes alone (no corresponding character) may be stored in \fBchtype\fP
-+or the equivalent \fBattr_t\fP data.
-+In either case, the data is stored in something like an integer.
-+.IP
-+Each cell (row and column) in a \fBWINDOW\fP is stored as a \fBchtype\fP.
-+.TP 5
-+ncursesw
-+the so-called "wide" library, which handles multibyte characters
-+(See the section on \fBALTERNATE CONFIGURATIONS\fP).
-+The "wide" library includes all of the calls from the "normal" library.
-+It adds about one third more calls using data types which store
-+multibyte characters:
-+.RS
-+.TP 5
-+.B cchar_t
-+corresponds to \fBchtype\fP.
-+However it is a structure, because more data is stored than can fit into
-+an integer.
-+The characters are large enough to require a full integer value - and there
-+may be more than one character per cell.
-+The video attributes and color are stored in separate fields of the structure.
-+.IP
-+Each cell (row and column) in a \fBWINDOW\fP is stored as a \fBcchar_t\fP.
-+.TP 5
-+.B wchar_t
-+stores a "wide" character.
-+Like \fBchtype\fP, this may be an integer.
-+.TP 5
-+.B wint_t
-+stores a \fBwchar_t\fP or \fBWEOF\fP - not the same, though both may have
-+the same size.
-+.RE
-+.IP
-+The "wide" library provides new functions which are analogous to
-+functions in the "normal" library.
-+There is a naming convention which relates many of the normal/wide variants:
-+a "_w" is inserted into the name.
-+For example, \fBwaddch\fP becomes \fBwadd_wch\fP.
-+.RE
-+.PP
-+.\"
- .SS Routine Name Index
- The following table lists each \fBcurses\fR routine and the name of
--the manual page on which it is described.  Routines flagged with `*'
-+the manual page on which it is described.
-+Routines flagged with `*'
- are ncurses-specific, not described by XPG4 or present in SVr4.
- .PP
- .TS
-@@ -275,15 +353,24 @@
- flushinp/\fBcurs_util\fR(3X)
- get_wch/\fBcurs_get_wch\fR(3X)
- get_wstr/\fBcurs_get_wstr\fR(3X)
-+getattrs/\fBcurs_attr\fR(3X)
-+getbegx/\fBcurs_legacy\fR(3X)*
-+getbegy/\fBcurs_legacy\fR(3X)*
- getbegyx/\fBcurs_getyx\fR(3X)
- getbkgd/\fBcurs_bkgd\fR(3X)
- getbkgrnd/\fBcurs_bkgrnd\fR(3X)
- getcchar/\fBcurs_getcchar\fR(3X)
- getch/\fBcurs_getch\fR(3X)
-+getcurx/\fBcurs_legacy\fR(3X)*
-+getcury/\fBcurs_legacy\fR(3X)*
-+getmaxx/\fBcurs_legacy\fR(3X)*
-+getmaxy/\fBcurs_legacy\fR(3X)*
- getmaxyx/\fBcurs_getyx\fR(3X)
- getmouse/\fBcurs_mouse\fR(3X)*
- getn_wstr/\fBcurs_get_wstr\fR(3X)
- getnstr/\fBcurs_getstr\fR(3X)
-+getparx/\fBcurs_legacy\fR(3X)*
-+getpary/\fBcurs_legacy\fR(3X)*
- getparyx/\fBcurs_getyx\fR(3X)
- getstr/\fBcurs_getstr\fR(3X)
- getsyx/\fBcurs_kernel\fR(3X)
-@@ -321,7 +408,18 @@
- instr/\fBcurs_instr\fR(3X)
- intrflush/\fBcurs_inopts\fR(3X)
- inwstr/\fBcurs_inwstr\fR(3X)
-+is_cleared/\fBcurs_opaque\fR(3X)*
-+is_idcok/\fBcurs_opaque\fR(3X)*
-+is_idlok/\fBcurs_opaque\fR(3X)*
-+is_immedok/\fBcurs_opaque\fR(3X)*
-+is_keypad/\fBcurs_opaque\fR(3X)*
-+is_leaveok/\fBcurs_opaque\fR(3X)*
- is_linetouched/\fBcurs_touch\fR(3X)
-+is_nodelay/\fBcurs_opaque\fR(3X)*
-+is_notimeout/\fBcurs_opaque\fR(3X)*
-+is_scrollok/\fBcurs_opaque\fR(3X)*
-+is_syncok/\fBcurs_opaque\fR(3X)*
-+is_term_resized/\fBresizeterm\fR(3X)*
- is_wintouched/\fBcurs_touch\fR(3X)
- isendwin/\fBcurs_initscr\fR(3X)
- key_defined/\fBkey_defined\fR(3X)*
-@@ -431,6 +529,7 @@
- nocbreak/\fBcurs_inopts\fR(3X)
- nodelay/\fBcurs_inopts\fR(3X)
- noecho/\fBcurs_inopts\fR(3X)
-+nofilter/\fBcurs_util\fR(3X)*
- nonl/\fBcurs_outopts\fR(3X)
- noqiflush/\fBcurs_inopts\fR(3X)
- noraw/\fBcurs_inopts\fR(3X)
-@@ -519,6 +618,7 @@
- use_default_colors/\fBdefault_colors\fR(3X)*
- use_env/\fBcurs_util\fR(3X)
- use_extended_names/\fBcurs_extend\fR(3X)*
-+use_legacy_coding/\fBlegacy_coding\fR(3X)*
- vid_attr/\fBcurs_terminfo\fR(3X)
- vid_puts/\fBcurs_terminfo\fR(3X)
- vidattr/\fBcurs_terminfo\fR(3X)
-@@ -617,16 +717,16 @@
- otherwise noted in the routine descriptions.
- .PP
- All macros return the value of the \fBw\fR version, except \fBsetscrreg\fR,
--\fBwsetscrreg\fR, \fBgetyx\fR, \fBgetbegyx\fR, and \fBgetmaxyx\fR.  The return
--values of \fBsetscrreg\fR, \fBwsetscrreg\fR, \fBgetyx\fR, \fBgetbegyx\fR, and
-+\fBwsetscrreg\fR, \fBgetyx\fR, \fBgetbegyx\fR, and \fBgetmaxyx\fR.
-+The return values of \fBsetscrreg\fR, \fBwsetscrreg\fR, \fBgetyx\fR, \fBgetbegyx\fR, and
- \fBgetmaxyx\fR are undefined (i.e., these should not be used as the
- right-hand side of assignment statements).
- .PP
- Routines that return pointers return \fBNULL\fR on error.
- .SH ENVIRONMENT
- The following environment symbols are useful for customizing the
--runtime behavior of the \fBncurses\fR library.  The most important
--ones have been already discussed in detail.
-+runtime behavior of the \fBncurses\fR library.
-+The most important ones have been already discussed in detail.
- .TP 5
- BAUDRATE
- The debugging library checks this environment symbol when the application
-@@ -722,7 +822,7 @@
- NCURSES_ASSUMED_COLORS
- Override the compiled-in assumption that the
- terminal's default colors are white-on-black
--(see \fBassume_default_colors\fR(3X)).
-+(see \fBdefault_colors\fR(3X)).
- You may set the foreground and background color values with this environment
- variable by proving a 2-element list: foreground,background.
- For example, to tell ncurses to not assume anything
-@@ -739,7 +839,7 @@
- .TP 5
- NCURSES_NO_MAGIC_COOKIES
- Some terminals use a magic-cookie feature which requires special handling
--to make highlighting and other video attributes display properly. 
-+to make highlighting and other video attributes display properly.
- You can suppress the highlighting entirely for these terminals by
- setting this environment variable.
- .TP 5
-@@ -761,18 +861,21 @@
- operations that the terminal does slowly, such as clearing the display.
- .IP
- As a result, many terminal descriptions (including the vt100)
--have delay times embedded.  You may wish to use these descriptions,
-+have delay times embedded.
-+You may wish to use these descriptions,
- but not want to pay the performance penalty.
- .IP
- Set the NCURSES_NO_PADDING symbol to disable all but mandatory
--padding.  Mandatory padding is used as a part of special control
-+padding.
-+Mandatory padding is used as a part of special control
- sequences such as \fIflash\fR.
- .TP 5
- NCURSES_NO_SETBUF
- Normally \fBncurses\fR enables buffered output during terminal initialization.
- This is done (as in SVr4 curses) for performance reasons.
- For testing purposes, both of \fBncurses\fR and certain applications,
--this feature is made optional.  Setting the NCURSES_NO_SETBUF variable
-+this feature is made optional.
-+Setting the NCURSES_NO_SETBUF variable
- disables output buffering, leaving the output in the original (usually
- line buffered) mode.
- .TP 5
-@@ -944,12 +1047,14 @@
- .SH EXTENSIONS
- The \fBncurses\fR library can be compiled with an option (\fB-DUSE_GETCAP\fR)
- that falls back to the old-style /etc/termcap file if the terminal setup code
--cannot find a terminfo entry corresponding to \fBTERM\fR.  Use of this feature
-+cannot find a terminfo entry corresponding to \fBTERM\fR.
-+Use of this feature
- is not recommended, as it essentially includes an entire termcap compiler in
- the \fBncurses\fR startup code, at significant cost in core and startup cycles.
- .PP
- The \fBncurses\fR library includes facilities for capturing mouse events on
--certain terminals (including xterm). See the \fBcurs_mouse\fR(3X)
-+certain terminals (including xterm).
-+See the \fBcurs_mouse\fR(3X)
- manual page for details.
- .PP
- The \fBncurses\fR library includes facilities for responding to window
-@@ -974,38 +1079,48 @@
- See the \fBdefault_colors\fR(3X) manual page for details.
- .PP
- The \fBncurses\fR library includes a function for directing application output
--to a printer attached to the terminal device.  See the \fBcurs_print\fR(3X)
--manual page for details.
-+to a printer attached to the terminal device.
-+See the \fBcurs_print\fR(3X) manual page for details.
- .SH PORTABILITY
--The \fBncurses\fR library is intended to be BASE-level conformant with the XSI
--Curses standard.  The EXTENDED XSI Curses functionality
-+The \fBncurses\fR library is intended to be BASE-level conformant with XSI
-+Curses.
-+The EXTENDED XSI Curses functionality
- (including color support) is supported.
- .PP
- A small number of local differences (that is, individual differences between
- the XSI Curses and \fBncurses\fR calls) are described in \fBPORTABILITY\fR
- sections of the library man pages.
- .PP
--The routine \fBhas_key\fR is not part of XPG4, nor is it present in SVr4.  See
--the \fBcurs_getch\fR(3X) manual page for details.
-+This implementation also contains several extensions:
-+.RS 5
-+.PP
-+The routine \fBhas_key\fR is not part of XPG4, nor is it present in SVr4.
-+See the \fBcurs_getch\fR(3X) manual page for details.
- .PP
--The routine \fBslk_attr\fR is not part of XPG4, nor is it present in SVr4.  See
--the \fBcurs_slk\fR(3X) manual page for details.
-+The routine \fBslk_attr\fR is not part of XPG4, nor is it present in SVr4.
-+See the \fBcurs_slk\fR(3X) manual page for details.
- .PP
- The routines \fBgetmouse\fR, \fBmousemask\fR, \fBungetmouse\fR,
- \fBmouseinterval\fR, and \fBwenclose\fR relating to mouse interfacing are not
--part of XPG4, nor are they present in SVr4.  See the \fBcurs_mouse\fR(3X)
--manual page for details.
-+part of XPG4, nor are they present in SVr4.
-+See the \fBcurs_mouse\fR(3X) manual page for details.
- .PP
--The routine \fBmcprint\fR was not present in any previous curses
--implementation.  See the \fBcurs_print\fR(3X) manual page for details.
-+The routine \fBmcprint\fR was not present in any previous curses implementation.
-+See the \fBcurs_print\fR(3X) manual page for details.
- .PP
--The routine \fBwresize\fR is not part of XPG4, nor is it present in SVr4.  See
--the \fBwresize\fR(3X) manual page for details.
-+The routine \fBwresize\fR is not part of XPG4, nor is it present in SVr4.
-+See the \fBwresize\fR(3X) manual page for details.
-+.PP
-+The WINDOW structure's internal details can be hidden from application
-+programs.
-+See \fBcurs_opaque\fR(3X) for the discussion of \fBis_scrollok\fR, etc.
-+.RE
- .PP
- In historic curses versions, delays embedded in the capabilities \fBcr\fR,
- \fBind\fR, \fBcub1\fR, \fBff\fR and \fBtab\fR activated corresponding delay
--bits in the UNIX tty driver.  In this implementation, all padding is done by
--NUL sends.  This method is slightly more expensive, but narrows the interface
-+bits in the UNIX tty driver.
-+In this implementation, all padding is done by sending NUL bytes.
-+This method is slightly more expensive, but narrows the interface
- to the UNIX kernel significantly and increases the package's portability
- correspondingly.
- .SH NOTES
-@@ -1013,8 +1128,8 @@
- \fB<stdio.h>\fR and \fB<unctrl.h>\fR.
- .PP
- If standard output from a \fBncurses\fR program is re-directed to something
--which is not a tty, screen updates will be directed to standard error.  This
--was an undocumented feature of AT&T System V Release 3 curses.
-+which is not a tty, screen updates will be directed to standard error.
-+This was an undocumented feature of AT&T System V Release 3 curses.
- .SH AUTHORS
- Zeyd M. Ben-Halim, Eric S. Raymond, Thomas E. Dickey.
- Based on pcurses by Pavel Curtis.
-diff -Naur ncurses-5.6.orig/man/panel.3x ncurses-5.6/man/panel.3x
---- ncurses-5.6.orig/man/panel.3x	2006-05-13 11:35:45.000000000 -0400
-+++ ncurses-5.6/man/panel.3x	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2003,2006 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: panel.3x,v 1.12 2006/05/13 15:35:45 tom Exp $
-+.\" $Id: panel.3x,v 1.14 2007/05/12 20:45:20 tom Exp $
- .TH panel 3X ""
- .ds n 5
- .ds d @TERMINFO@
-@@ -84,13 +84,13 @@
- high-level curses calls, and work anywhere terminfo curses does.
- .SH FUNCTIONS
- .TP
--\fBnew_panel(win)\fR
-+.B new_panel(win)
- allocates  a  \fBPANEL\fR structure, associates it with
- \fBwin\fR, places the panel on the top of the stack  (causes  it
- to  be  displayed above any other panel) and returns a
- pointer to the new panel.
- .TP
--\fBvoid update_panels()\fR
-+.B update_panels()
- refreshes the virtual screen to reflect the relations between the
- panels in the stack, but does not call doupdate() to refresh the
- physical screen.  Use this function and not wrefresh or wnoutrefresh.
-@@ -98,52 +98,57 @@
- doupdate(), but doupdate() is the function responsible for updating
- the physical screen.
- .TP
--\fBdel_panel(pan)\fR
-+.B del_panel(pan)
- removes the given panel from the  stack and deallocates the
- \fBPANEL\fR structure (but not its associated window).
- .TP
--\fBhide_panel(pan)\fR
-+.B hide_panel(pan)
- removes the given panel from the panel stack and thus hides it from
- view. The \fBPANEL\fR structure is not lost, merely removed from the stack.
- .TP
--\fBshow_panel(pan)\fR
-+.B panel_hidden(pan)
-+returns TRUE if the panel is in the panel stack,
-+FALSE if it is not.
-+If the panel is a null pointer, return ERR.
-+.TP
-+.B show_panel(pan)
- makes a hidden panel visible by placing it on top of the panels in the
- panel stack. See COMPATIBILITY below.
- .TP
--\fBtop_panel(pan)\fR
-+.B top_panel(pan)
- puts the given visible panel on top of all panels in the stack.  See
- COMPATIBILITY below.
- .TP
--\fBbottom_panel(pan)\fR
-+.B bottom_panel(pan)
- puts panel at the bottom of all panels.
- .TP
--\fBmove_panel(pan,starty,startx)\fR
-+.B move_panel(pan,starty,startx)
- moves the given panel window so that its upper-left corner is at
- \fBstarty\fR, \fBstartx\fR.  It does not change the position of the
- panel in the stack.  Be sure to use this function, not \fBmvwin()\fR,
- to move a panel window.
- .TP
--\fBreplace_panel(pan,window)\fR
-+.B replace_panel(pan,window)
- replaces the current window of panel with \fBwindow\fR (useful, for
- example if you want to resize a panel; if you're using \fBncurses\fR,
- you can call \fBreplace_panel\fR on the output of \fBwresize\fR(3X)).
- It does not change the position of the panel in the stack.
- .TP
--\fBpanel_above(pan)\fR
-+.B panel_above(pan)
- returns a pointer to the panel above pan.  If the panel argument is
- \fB(PANEL *)0\fR, it returns a pointer to the bottom panel in the stack.
- .TP
--\fBpanel_below(pan)\fR
-+.B panel_below(pan)
- returns a pointer to the panel just below pan.  If the panel argument
- is \fB(PANEL *)0\fR, it returns a pointer to the top panel in the stack.
- .TP
--\fBset_panel_userptr(pan,ptr)\fR
-+.B set_panel_userptr(pan,ptr)
- sets the panel's user pointer.
- .TP
--\fBpanel_userptr(pan)\fR
-+.B panel_userptr(pan)
- returns the user pointer for a given panel.
- .TP
--\fBpanel_window(pan)\fR
-+.B panel_window(pan)
- returns a pointer to the window of the given panel.
- .SH DIAGNOSTICS
- Each routine that returns a pointer returns \fBNULL\fR if an error
-diff -Naur ncurses-5.6.orig/man/term.5 ncurses-5.6/man/term.5
---- ncurses-5.6.orig/man/term.5	2006-12-02 20:08:16.000000000 -0500
-+++ ncurses-5.6/man/term.5	2008-06-18 06:49:44.000000000 -0400
-@@ -26,8 +26,8 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: term.5,v 1.17 2006/12/03 01:08:16 tom Exp $
--.TH TERM 5
-+.\" $Id: term.5,v 1.19 2006/12/24 18:12:38 tom Exp $
-+.TH term 5
- .ds n 5
- .ds d @TERMINFO@
- .SH NAME
-@@ -74,7 +74,7 @@
- or sign extension are made.
- .PP
- The compiled file is created with the
--.I tic
-+.B @TIC@
- program, and read by the routine
- .IR setupterm .
- The file is divided into six parts:
-diff -Naur ncurses-5.6.orig/man/term.7 ncurses-5.6/man/term.7
---- ncurses-5.6.orig/man/term.7	2006-02-25 16:47:06.000000000 -0500
-+++ ncurses-5.6/man/term.7	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2003,2006 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,8 +26,8 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: term.7,v 1.15 2006/02/25 21:47:06 tom Exp $
--.TH TERM 7
-+.\" $Id: term.7,v 1.18 2007/06/02 20:40:07 tom Exp $
-+.TH term 7
- .ds n 5
- .ds d @TERMINFO@
- .SH NAME
-@@ -66,14 +66,14 @@
- Terminal type descriptions are stored as files of capability data underneath
- \*d.  To browse a list of all terminal names recognized by the system, do
- .sp
--	toe | more
-+	@TOE@ | more
- .sp
- from your shell.  These capability files are in a binary format optimized for
- retrieval speed (unlike the old text-based \fBtermcap\fR format they replace);
--to examine an entry, you must use the \fBinfocmp\fR(1) command.  Invoke it as
--follows:
-+to examine an entry, you must use the \fB@INFOCMP@\fR(1M) command.
-+Invoke it as follows:
- .sp
--	infocmp \fIentry-name\fR
-+	@INFOCMP@ \fIentry-name\fR
- .sp
- where \fIentry-name\fR is the name of the type you wish to examine (and the
- name of its capability file the subdirectory of \*d named for its first
-@@ -119,7 +119,7 @@
- multi-platform environment!  If a model number follows, it should indicate
- either the OS release level or the console driver release level.
- .PP
--The root name for a terminal emulator (assuming it doesn't fit one of the
-+The root name for a terminal emulator (assuming it does not fit one of the
- standard ANSI or vt100 types) should be the program name or a readily
- recognizable abbreviation of it (i.e. \fBversaterm\fR, \fBctrm\fR).
- .PP
-diff -Naur ncurses-5.6.orig/man/terminfo.head ncurses-5.6/man/terminfo.head
---- ncurses-5.6.orig/man/terminfo.head	2006-05-13 11:35:45.000000000 -0400
-+++ ncurses-5.6/man/terminfo.head	2008-06-18 06:49:44.000000000 -0400
-@@ -26,8 +26,8 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: terminfo.head,v 1.13 2006/05/13 15:35:45 tom Exp $
--.TH TERMINFO 5 "" "" "File Formats"
-+.\" $Id: terminfo.head,v 1.16 2007/03/04 00:09:46 tom Exp $
-+.TH terminfo 5 "" "" "File Formats"
- .ds n 5
- .ds d @TERMINFO@
- .SH NAME
-@@ -51,7 +51,7 @@
- Entries in
- .I terminfo
- consist of a sequence of `,' separated fields (embedded commas may be
--escaped with a backslash or notated as \e054).
-+escaped with a backslash or notated as \\054).
- White space after the `,' separator is ignored.
- The first entry for each terminal gives the names which are known for the
- terminal, separated by `|' characters.
-@@ -62,14 +62,14 @@
- the last name may well contain upper case and blanks for readability.
- .PP
- Lines beginning with a `#' in the first column are treated as comments.
--While comment lines are legal at any point, the output of \fIcaptoinfo\fP
--and \fIinfotocap\fP (aliases for \fItic\fP)
-+While comment lines are legal at any point, the output of \fB@CAPTOINFO@\fP
-+and \fB@INFOTOCAP@\fP (aliases for \fB@TIC@\fP)
- will move comments so they occur only between entries.
- .PP
- Newlines and leading tabs may be used for formatting entries for readability.
- These are removed from parsed entries.
--The \fIinfocmp\ -f\fP option relies on this to format if-then-else expressions:
--the result can be read by \fItic\fP.
-+The \fB@INFOCMP@\ -f\fP option relies on this to format if-then-else expressions:
-+the result can be read by \fB@TIC@\fP.
- .PP
- Terminal names (except for the last, verbose entry) should
- be chosen using the following conventions.
-diff -Naur ncurses-5.6.orig/man/terminfo.tail ncurses-5.6/man/terminfo.tail
---- ncurses-5.6.orig/man/terminfo.tail	2006-04-01 17:47:01.000000000 -0500
-+++ ncurses-5.6/man/terminfo.tail	2008-06-18 06:49:47.000000000 -0400
-@@ -1,11 +1,11 @@
--.\" $Id: terminfo.tail,v 1.44 2006/04/01 22:47:01 tom Exp $
-+.\" $Id: terminfo.tail,v 1.49 2008/02/16 20:57:43 tom Exp $
- .\" Beginning of terminfo.tail file
- .\" This file is part of ncurses.
- .\" See "terminfo.head" for copyright.
- .ps +1
--..
-+.
- .SS A Sample Entry
--..
-+.
- The following entry, describing an ANSI-standard terminal, is representative
- of what a \fBterminfo\fR entry for a modern terminal typically looks like.
- .PP
-@@ -297,7 +297,7 @@
- Cursor addressing and other strings requiring parameters
- in the terminal are described by a
- parameterized string capability, with
--.IR printf (3S)
-+.IR printf (3)
- like escapes \fB%x\fR in it.
- For example, to address the cursor, the
- .B cup
-@@ -325,7 +325,9 @@
- outputs `%'
- .TP
- %\fI[[\fP:\fI]flags][width[.precision]][\fPdoxXs\fI]\fP
--as in \fBprintf\fP, flags are [-+#] and space
-+as in \fBprintf\fP, flags are [-+#] and space.
-+Use a `:' to allow the next character to be a `-' flag,
-+avoiding interpreting "%-" as an operator.
- .TP
- %c
- print pop() like %c in \fBprintf\fP
-@@ -395,7 +397,7 @@
- .IP
- where c\di\u are conditions, b\di\u are bodies.
- .IP
--Use the \fB-f\fP option of \fBtic\fP or \fBinfocmp\fP to see
-+Use the \fB-f\fP option of \fBtic\fP or \fB@INFOCMP@\fP to see
- the structure of if-the-else's.
- Some strings, e.g., \fBsgr\fP can be very complicated when written
- on one line.
-@@ -993,7 +995,7 @@
- They are normally sent to the terminal, by the
- .I init
- option of the
--.IR tput
-+.IR @TPUT@
- program, each time the user logs in.
- They will be printed in the following order:
- .RS
-@@ -1578,7 +1580,7 @@
- *
- and the termcap library (like the one in BSD/OS 1.1 and GNU) reads
- the whole entry into the buffer, no matter what its length, to see
--if it's the entry it wants,
-+if it is the entry it wants,
- .TP 5
- *
- and \fBtgetent()\fP is searching for a terminal type that either is the
-@@ -1599,19 +1601,19 @@
- .PP
- The "after tc expansion" length will have a similar effect to the
- above, but only for people who actually set TERM to that terminal
--type, since \fBtgetent()\fP only does "tc" expansion once it's found the
-+type, since \fBtgetent()\fP only does "tc" expansion once it is found the
- terminal type it was looking for, not while searching.
- .PP
- In summary, a termcap entry that is longer than 1023 bytes can cause,
- on various combinations of termcap libraries and applications, a core
- dump, warnings, or incorrect operation.
--If it's too long even before
-+If it is too long even before
- "tc" expansion, it will have this effect even for users of some other
- terminal types and users whose TERM variable does not have a termcap
- entry.
- .PP
- When in -C (translate to termcap) mode, the \fBncurses\fR implementation of
--\fBtic\fR(1) issues warning messages when the pre-tc length of a termcap
-+\fB@TIC@\fR(1M) issues warning messages when the pre-tc length of a termcap
- translation is too long.
- The -c (check) option also checks resolved (after tc
- expansion) lengths.
-@@ -1688,7 +1690,7 @@
- \fB@TIC@\fR(1M),
- \fB@INFOCMP@\fR(1M),
- \fBcurses\fR(3X),
--\fBprintf\fR(3S),
-+\fBprintf\fR(3),
- \fBterm\fR(\*n).
- .SH AUTHORS
- Zeyd M. Ben-Halim, Eric S. Raymond, Thomas E. Dickey.
-diff -Naur ncurses-5.6.orig/man/tic.1m ncurses-5.6/man/tic.1m
---- ncurses-5.6.orig/man/tic.1m	2006-05-13 11:14:01.000000000 -0400
-+++ ncurses-5.6/man/tic.1m	2008-06-18 06:49:44.000000000 -0400
-@@ -26,8 +26,8 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: tic.1m,v 1.43 2006/05/13 15:14:01 tom Exp $
--.TH tic 1M ""
-+.\" $Id: tic.1m,v 1.44 2006/12/24 17:59:11 tom Exp $
-+.TH @TIC@ 1M ""
- .ds n 5
- .ds d @TERMINFO@
- .SH NAME
-@@ -92,7 +92,7 @@
- .TP
- \fB-C\fR
- Force source translation to termcap format.  Note: this differs from the \fB-C\fR
--option of \fIinfocmp\fR(1M) in that it does not merely translate capability
-+option of \fB@INFOCMP@\fR(1M) in that it does not merely translate capability
- names, but also translates terminfo strings to termcap format.  Capabilities
- that are not translatable are left in the entry under their terminfo names
- but commented out with two preceding dots.
-diff -Naur ncurses-5.6.orig/man/toe.1m ncurses-5.6/man/toe.1m
---- ncurses-5.6.orig/man/toe.1m	2006-05-13 11:14:01.000000000 -0400
-+++ ncurses-5.6/man/toe.1m	2008-06-18 06:49:45.000000000 -0400
-@@ -1,5 +1,5 @@
- .\"***************************************************************************
--.\" Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.              *
-+.\" Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.              *
- .\"                                                                          *
- .\" Permission is hereby granted, free of charge, to any person obtaining a  *
- .\" copy of this software and associated documentation files (the            *
-@@ -26,8 +26,8 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: toe.1m,v 1.18 2006/05/13 15:14:01 tom Exp $
--.TH toe 1M ""
-+.\" $Id: toe.1m,v 1.21 2008/01/05 20:57:16 tom Exp $
-+.TH @TOE@ 1M ""
- .ds n 5
- .ds d @TERMINFO@
- .SH NAME
-@@ -37,10 +37,14 @@
- .br
- .SH DESCRIPTION
- .PP
--With no options, \fBtoe\fR lists all available terminal types by primary name
--with descriptions.  File arguments specify the directories to be scanned; if no
--such arguments are given, your default terminfo directory is scanned.  If you
--also specify the \fB-h\fR option, a directory header will be issued as each
-+With no options,
-+\fBtoe\fR lists all available terminal types by primary name
-+with descriptions.
-+File arguments specify the directories to be scanned; if no
-+such arguments are given,
-+your default terminfo directory is scanned.
-+If you also specify the \fB-h\fR option,
-+a directory header will be issued as each
- directory is entered.
- .PP
- There are other options intended for use by terminfo file maintainers:
-@@ -50,16 +54,25 @@
- rather than only the first one that it finds.
- .TP
- \fB-u\fR \fIfile\fR
--says to issue a report on dependencies in the given file. This report condenses
--the `use' relation: each line consists of the primary name of a terminal that
--has use capabilities, followed by a colon, followed by the
-+says to write a report to the standard output,
-+listing dependencies in the given terminfo/termcap source file.
-+The report condenses the `use' relation:
-+each line consists of the primary name of a terminal that
-+has use capabilities,
-+followed by a colon,
-+followed by the
- whitespace-separated primary names of all terminals which occur in those use
--capabilities, followed by a newline
-+capabilities,
-+followed by a newline
- .TP
- \fB-U\fR \fIfile\fR
--says to issue a report on reverse dependencies in the given file. This report
--reverses the `use' relation: each line consists of the primary name of a
--terminal that occurs in use capabilities, followed by a colon, followed by the
-+says to write a report to the standard output,
-+listing reverse dependencies in the given terminfo/termcap source file.
-+The report reverses the `use' relation:
-+each line consists of the primary name of a
-+terminal that occurs in use capabilities,
-+followed by a colon,
-+followed by the
- whitespace-separated primary names of all terminals which depend on it,
- followed by a newline.
- .TP
-@@ -67,10 +80,11 @@
- specifies that (verbose) output be written to standard error,
- showing \fBtoe\fR's progress.
- The optional parameter \fIn\fR is a number from 1 to 10,
--interpreted as for \fBtic\fR(1).
-+interpreted as for \fB@TIC@\fR(1M).
- .TP
- \fB-V\fR
--reports the version of ncurses which was used in this program, and exits.
-+reports the version of ncurses which was used in this program,
-+and exits.
- .SH FILES
- .TP 5
- \fB\*d/?/*\fR
-diff -Naur ncurses-5.6.orig/man/tput.1 ncurses-5.6/man/tput.1
---- ncurses-5.6.orig/man/tput.1	2006-05-13 11:14:01.000000000 -0400
-+++ ncurses-5.6/man/tput.1	2008-06-18 06:49:44.000000000 -0400
-@@ -27,27 +27,27 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: tput.1,v 1.25 2006/05/13 15:14:01 tom Exp $
--.TH tput 1 ""
-+.\" $Id: tput.1,v 1.27 2006/12/24 18:11:31 tom Exp $
-+.TH @TPUT@ 1 ""
- .ds d @TERMINFO@
- .ds n 1
- .SH NAME
--\fBtput\fR, \fBreset\fR - initialize a terminal or query terminfo database
-+\fB@TPUT@\fR, \fBreset\fR - initialize a terminal or query terminfo database
- .SH SYNOPSIS
--\fBtput\fR [\fB-T\fR\fItype\fR] \fIcapname\fR [\fIparms\fR ... ]
-+\fB@TPUT@\fR [\fB-T\fR\fItype\fR] \fIcapname\fR [\fIparms\fR ... ]
- .br
--\fBtput\fR [\fB-T\fR\fItype\fR] \fBinit\fR
-+\fB@TPUT@\fR [\fB-T\fR\fItype\fR] \fBinit\fR
- .br
--\fBtput\fR [\fB-T\fR\fItype\fR] \fBreset\fR
-+\fB@TPUT@\fR [\fB-T\fR\fItype\fR] \fBreset\fR
- .br
--\fBtput\fR [\fB-T\fR\fItype\fR] \fBlongname\fR
-+\fB@TPUT@\fR [\fB-T\fR\fItype\fR] \fBlongname\fR
- .br
--\fBtput -S\fR  \fB<<\fR
-+\fB@TPUT@ -S\fR  \fB<<\fR
- .br
--\fBtput -V\fR
-+\fB@TPUT@ -V\fR
- .br
- .SH DESCRIPTION
--The \fBtput\fR utility uses the \fBterminfo\fR database to make the
-+The \fB@TPUT@\fR utility uses the \fBterminfo\fR database to make the
- values of terminal-dependent capabilities and information available to
- the shell (see \fBsh\fR(1)), to initialize or reset the terminal, or
- return the long name of the requested terminal type.
-@@ -55,15 +55,15 @@
- .RS
- .TP 5
- string
--\fBtput\fR writes the string to the standard output.
-+\fB@TPUT@\fR writes the string to the standard output.
- No trailing newline is supplied.
- .TP
- integer
--\fBtput\fR writes the decimal value to the standard output,
-+\fB@TPUT@\fR writes the decimal value to the standard output,
- with a trailing newline.
- .TP
- boolean
--\fBtput\fR simply sets the exit code
-+\fB@TPUT@\fR simply sets the exit code
- (\fB0\fR for TRUE if the terminal has the capability,
- \fB1\fR for FALSE if it does not),
- and writes nothing to the standard output.
-@@ -74,7 +74,7 @@
- (e.g., \fB$?\fR, see \fBsh\fR(1)) to be sure it is \fB0\fR.
- (See the \fBEXIT CODES\fR and \fBDIAGNOSTICS\fR sections.)
- For a complete list of capabilities
--and the \fIcapname\fR associated with each, see \fBterminfo\fR(\*n).
-+and the \fIcapname\fR associated with each, see \fBterminfo\fR(5).
- .TP
- \fB-T\fR\fItype\fR
- indicates the \fItype\fR of terminal.  Normally this option is
-@@ -94,21 +94,21 @@
- .IP
- Most parameters are numbers.
- Only a few terminfo capabilities require string parameters;
--\fBtput\fR uses a table to decide which to pass as strings.
--Normally \fBtput\fR uses \fBtparm\fR (3X) to perform the substitution.
-+\fB@TPUT@\fR uses a table to decide which to pass as strings.
-+Normally \fB@TPUT@\fR uses \fBtparm\fR (3X) to perform the substitution.
- If no parameters are given for the capability,
--\fBtput\fR writes the string without performing the substitution.
-+\fB@TPUT@\fR writes the string without performing the substitution.
- .TP
- \fB-S\fR
--allows more than one capability per invocation of \fBtput\fR.  The
--capabilities must be passed to \fBtput\fR from the standard input
-+allows more than one capability per invocation of \fB@TPUT@\fR.  The
-+capabilities must be passed to \fB@TPUT@\fR from the standard input
- instead of from the command line (see example).
- Only one \fIcapname\fR is allowed per line.
- The \fB-S\fR option changes the
- meaning of the \fB0\fR and \fB1\fR boolean and string exit codes (see the
- EXIT CODES section).
- .IP
--Again, \fBtput\fR uses a table and the presence of parameters in its input
-+Again, \fB@TPUT@\fR uses a table and the presence of parameters in its input
- to decide whether to use \fBtparm\fR (3X),
- and how to interpret the parameters.
- .TP
-@@ -157,58 +157,58 @@
- name in the first line of the terminal's description in the
- \fBterminfo\fR database [see \fBterm\fR(5)].
- .PP
--If \fBtput\fR is invoked by a link named \fBreset\fR, this has the
--same effect as \fBtput reset\fR.
-+If \fB@TPUT@\fR is invoked by a link named \fBreset\fR, this has the
-+same effect as \fB@TPUT@ reset\fR.
- See \fBtset\fR for comparison, which has similar behavior.
- .SH EXAMPLES
- .TP 5
--\fBtput init\fR
-+\fB@TPUT@ init\fR
- Initialize the terminal according to the type of
- terminal in the environmental variable \fBTERM\fR.  This
- command should be included in everyone's .profile after
- the environmental variable \fBTERM\fR has been exported, as
- illustrated on the \fBprofile\fR(5) manual page.
- .TP 5
--\fBtput -T5620 reset\fR
-+\fB@TPUT@ -T5620 reset\fR
- Reset an AT&T 5620 terminal, overriding the type of
- terminal in the environmental variable \fBTERM\fR.
- .TP 5
--\fBtput cup 0 0\fR
-+\fB@TPUT@ cup 0 0\fR
- Send the sequence to move the cursor to row \fB0\fR, column \fB0\fR
- (the upper left corner of the screen, usually known as the "home"
- cursor position).
- .TP 5
--\fBtput clear\fR
-+\fB@TPUT@ clear\fR
- Echo the clear-screen sequence for the current terminal.
- .TP 5
--\fBtput cols\fR
-+\fB@TPUT@ cols\fR
- Print the number of columns for the current terminal.
- .TP 5
--\fBtput -T450 cols\fR
-+\fB@TPUT@ -T450 cols\fR
- Print the number of columns for the 450 terminal.
- .TP 5
--\fBbold=`tput smso` offbold=`tput rmso`\fR
-+\fBbold=`@TPUT@ smso` offbold=`@TPUT@ rmso`\fR
- Set the shell variables \fBbold\fR, to begin stand-out mode
- sequence, and \fBoffbold\fR, to end standout mode sequence,
- for the current terminal.  This might be followed by a
- prompt: \fBecho "${bold}Please type in your name: ${offbold}\\c"\fR
- .TP 5
--\fBtput hc\fR
-+\fB@TPUT@ hc\fR
- Set exit code to indicate if the current terminal is a hard copy terminal.
- .TP 5
--\fBtput cup 23 4\fR
-+\fB@TPUT@ cup 23 4\fR
- Send the sequence to move the cursor to row 23, column 4.
- .TP 5
--\fBtput cup\fR
-+\fB@TPUT@ cup\fR
- Send the terminfo string for cursor-movement, with no parameters substituted.
- .TP 5
--\fBtput longname\fR
-+\fB@TPUT@ longname\fR
- Print the long name from the \fBterminfo\fR database for the
- type of terminal specified in the environmental
- variable \fBTERM\fR.
- .PP
- .RS 5
--\fBtput -S <<!\fR
-+\fB@TPUT@ -S <<!\fR
- .br
- \fB> clear\fR
- .br
-@@ -220,7 +220,7 @@
- .RE
- .TP 5
- \&
--This example shows \fBtput\fR processing several capabilities in one invocation.
-+This example shows \fB@TPUT@\fR processing several capabilities in one invocation.
- It clears the screen,
- moves the cursor to position 10, 10
- and turns on bold (extra bright) mode.
-@@ -238,7 +238,7 @@
- section of \fBterminfo\fR(5)
- .SH EXIT CODES
- If the \fB-S\fR option is used,
--\fBtput\fR checks for errors from each line,
-+\fB@TPUT@\fR checks for errors from each line,
- and if any errors are found, will set the exit code to 4 plus the
- number of lines with errors.
- If no errors are found, the exit code is \fB0\fR.
-@@ -285,8 +285,8 @@
- =
- \fB0\fR	T{
- (\fIcapname\fR is a numeric variable that is not specified in the
--\fBterminfo\fR(\*n) database for this terminal type, e.g.
--\fBtput -T450 lines\fR and \fBtput -T2621 xmc\fR)
-+\fBterminfo\fR(5) database for this terminal type, e.g.
-+\fB@TPUT@ -T450 lines\fR and \fB@TPUT@ -T2621 xmc\fR)
- T}
- \fB1\fR	no error message is printed, see the \fBEXIT CODES\fR section.
- \fB2\fR	usage error
-diff -Naur ncurses-5.6.orig/man/tset.1 ncurses-5.6/man/tset.1
---- ncurses-5.6.orig/man/tset.1	2006-07-29 07:34:07.000000000 -0400
-+++ ncurses-5.6/man/tset.1	2008-06-18 06:49:44.000000000 -0400
-@@ -26,7 +26,7 @@
- .\" authorization.                                                           *
- .\"***************************************************************************
- .\"
--.\" $Id: tset.1,v 1.18 2006/07/29 11:34:07 tom Exp $
-+.\" $Id: tset.1,v 1.19 2006/12/24 15:00:30 tom Exp $
- .TH tset 1 ""
- .SH NAME
- \fBtset\fR, \fBreset\fR - terminal initialization
-@@ -272,7 +272,7 @@
- csh(1),
- sh(1),
- stty(1),
--setupterm(3X),
-+curs_terminfo(3X),
- tty(4),
- terminfo(5),
- ttys(5),
-diff -Naur ncurses-5.6.orig/menu/Makefile.in ncurses-5.6/menu/Makefile.in
---- ncurses-5.6.orig/menu/Makefile.in	2006-10-14 16:40:36.000000000 -0400
-+++ ncurses-5.6/menu/Makefile.in	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
--# $Id: Makefile.in,v 1.43 2006/10/14 20:40:36 tom Exp $
-+# $Id: Makefile.in,v 1.48 2007/04/28 14:56:11 tom Exp $
- ##############################################################################
--# Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -27,7 +27,7 @@
- # authorization.                                                             #
- ##############################################################################
- #
--# Author: Thomas E. Dickey <dickey@clark.net> 1996,1997
-+# Author: Thomas E. Dickey 1996-on
- #
- # Makefile for menu source code.
- #
-@@ -91,7 +91,7 @@
- 
- CFLAGS_DEFAULT	= $(CFLAGS_@DFT_UPR_MODEL@)
- 
--LINK		= $(LIBTOOL_LINK) $(CC)
-+LINK		= $(LIBTOOL_LINK)
- LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
- 
- SHLIB_DIRS	= -L../lib
-@@ -106,8 +106,6 @@
- 
- RANLIB		= @LIB_PREP@
- 
--IMPORT_LIB	= @IMPORT_LIB@
--SHARED_LIB	= @SHARED_LIB@
- LIBRARIES	= @LIBS_TO_MAKE@
- 
- LINT		= @LINT@
-@@ -128,7 +126,7 @@
- 
- $(DESTDIR)$(bindir) \
- $(DESTDIR)$(libdir) :
--	sh $(srcdir)/../mkinstalldirs $@
-+	sh $(srcdir)/../mkdirs.sh $@
- 
- # make copies to simplify include-paths while still keeping menu's include
- # file in this directory.
-diff -Naur ncurses-5.6.orig/menu/headers ncurses-5.6/menu/headers
---- ncurses-5.6.orig/menu/headers	1998-02-11 07:13:49.000000000 -0500
-+++ ncurses-5.6/menu/headers	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- ##############################################################################
--# Copyright (c) 1998 Free Software Foundation, Inc.                          #
-+# Copyright (c) 1998,2006 Free Software Foundation, Inc.                     #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -30,3 +30,4 @@
- #
- $(srcdir)/eti.h
- $(srcdir)/menu.h
-+# vile:makemode
-diff -Naur ncurses-5.6.orig/menu/menu.h ncurses-5.6/menu/menu.h
---- ncurses-5.6.orig/menu/menu.h	2003-11-08 15:48:24.000000000 -0500
-+++ ncurses-5.6/menu/menu.h	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2002,2003 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2003,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -30,7 +30,7 @@
-  *   Author:  Juergen Pfeifer, 1995,1997                                    *
-  ****************************************************************************/
- 
--/* $Id: menu.h,v 1.18 2003/11/08 20:48:24 tom Exp $ */
-+/* $Id: menu.h,v 1.19 2007/02/24 17:32:13 tom Exp $ */
- 
- #ifndef ETI_MENU
- #define ETI_MENU
-@@ -217,23 +217,23 @@
- extern NCURSES_EXPORT(int)	post_menu (MENU *);
- extern NCURSES_EXPORT(int)	scale_menu (const MENU *,int *,int *);
- extern NCURSES_EXPORT(int)	set_current_item (MENU *menu,ITEM *item);
--extern NCURSES_EXPORT(int)	set_item_init (MENU *,void(*)(MENU *));
-+extern NCURSES_EXPORT(int)	set_item_init (MENU *, Menu_Hook);
- extern NCURSES_EXPORT(int)	set_item_opts (ITEM *,Item_Options);
--extern NCURSES_EXPORT(int)	set_item_term (MENU *,void(*)(MENU *));
-+extern NCURSES_EXPORT(int)	set_item_term (MENU *, Menu_Hook);
- extern NCURSES_EXPORT(int)	set_item_userptr (ITEM *, void *);
- extern NCURSES_EXPORT(int)	set_item_value (ITEM *,bool);
- extern NCURSES_EXPORT(int)	set_menu_back (MENU *,chtype);
- extern NCURSES_EXPORT(int)	set_menu_fore (MENU *,chtype);
- extern NCURSES_EXPORT(int)	set_menu_format (MENU *,int,int);
- extern NCURSES_EXPORT(int)	set_menu_grey (MENU *,chtype);
--extern NCURSES_EXPORT(int)	set_menu_init (MENU *,void(*)(MENU *));
-+extern NCURSES_EXPORT(int)	set_menu_init (MENU *, Menu_Hook);
- extern NCURSES_EXPORT(int)	set_menu_items (MENU *,ITEM **);
- extern NCURSES_EXPORT(int)	set_menu_mark (MENU *, const char *);
- extern NCURSES_EXPORT(int)	set_menu_opts (MENU *,Menu_Options);
- extern NCURSES_EXPORT(int)	set_menu_pad (MENU *,int);
- extern NCURSES_EXPORT(int)	set_menu_pattern (MENU *,const char *);
- extern NCURSES_EXPORT(int)	set_menu_sub (MENU *,WINDOW *);
--extern NCURSES_EXPORT(int)	set_menu_term (MENU *,void(*)(MENU *));
-+extern NCURSES_EXPORT(int)	set_menu_term (MENU *, Menu_Hook);
- extern NCURSES_EXPORT(int)	set_menu_userptr (MENU *,void *);
- extern NCURSES_EXPORT(int)	set_menu_win (MENU *,WINDOW *);
- extern NCURSES_EXPORT(int)	set_top_row (MENU *,int);
-diff -Naur ncurses-5.6.orig/menu/modules ncurses-5.6/menu/modules
---- ncurses-5.6.orig/menu/modules	2004-12-25 17:06:33.000000000 -0500
-+++ ncurses-5.6/menu/modules	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
--# $Id: modules,v 1.16 2004/12/25 22:06:33 tom Exp $
-+# $Id: modules,v 1.17 2006/12/24 00:52:39 tom Exp $
- ##############################################################################
--# Copyright (c) 1998,2004 Free Software Foundation, Inc.                     #
-+# Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -27,7 +27,7 @@
- # authorization.                                                             #
- ##############################################################################
- #
--# Author: Thomas E. Dickey <dickey@clark.net> 1996,1997
-+# Author: Thomas E. Dickey	1996-on
- #
- 
- @ base
-@@ -59,3 +59,5 @@
- m_trace		lib		$(srcdir)	$(MENU_PRIV_H)
- m_userptr	lib		$(srcdir)	$(MENU_PRIV_H)
- m_win		lib		$(srcdir)	$(MENU_PRIV_H)
-+
-+# vile:makemode
-diff -Naur ncurses-5.6.orig/misc/Makefile.in ncurses-5.6/misc/Makefile.in
---- ncurses-5.6.orig/misc/Makefile.in	2006-10-21 09:28:03.000000000 -0400
-+++ ncurses-5.6/misc/Makefile.in	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
--# $Id: Makefile.in,v 1.40 2006/10/21 13:28:03 tom Exp $
-+# $Id: Makefile.in,v 1.43 2007/03/31 15:54:17 tom Exp $
- ##############################################################################
--# Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -76,7 +76,7 @@
- 
- sources :
- 
--install : install.data install.scripts
-+install : install.data install.libs
- 
- install.data :	terminfo.tmp \
- 		$(DESTDIR)$(libdir) \
-@@ -103,7 +103,7 @@
- 
- NCURSES_CONFIG	= ncurses@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config
- 
--install.scripts :	ncurses-config
-+install.libs : $(DESTDIR)$(bindir) ncurses-config
- 	$(INSTALL_PROG) ncurses-config $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
- 
- terminfo.tmp : run_tic.sed $(source)
-@@ -115,19 +115,20 @@
- 	ticdir=${ticdir} \
- 	$(SHELL) $(srcdir)/gen_edit.sh >$@
- 
-+$(DESTDIR)$(bindir) \
- $(DESTDIR)$(libdir) \
- $(DESTDIR)$(datadir) \
- $(DESTDIR)$(tabsetdir) :
--	$(SHELL) $(top_srcdir)/mkinstalldirs $@
-+	$(SHELL) $(top_srcdir)/mkdirs.sh $@
- 
--uninstall : uninstall.data uninstall.scripts
-+uninstall : uninstall.data uninstall.libs
- 
- uninstall.data :
- 	-test -d $(DESTDIR)$(tabsetdir) && rm -rf $(DESTDIR)$(tabsetdir)
- 	-test -d $(DESTDIR)$(ticdir) && rm -rf $(DESTDIR)$(ticdir)
- 	-test -f $(DESTDIR)$(ticfile) && rm -f $(DESTDIR)$(ticfile)
- 
--uninstall.scripts :
-+uninstall.libs :
- 	-rm -f $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
- 
- tags :
-diff -Naur ncurses-5.6.orig/misc/ncurses-config.in ncurses-5.6/misc/ncurses-config.in
---- ncurses-5.6.orig/misc/ncurses-config.in	2006-10-28 16:22:52.000000000 -0400
-+++ ncurses-5.6/misc/ncurses-config.in	2008-06-18 06:49:44.000000000 -0400
-@@ -1,7 +1,7 @@
- #!@SHELL@
--# $Id: ncurses-config.in,v 1.11 2006/10/28 20:22:52 tom Exp $
-+# $Id: ncurses-config.in,v 1.12 2007/03/17 20:02:19 tom Exp $
- ##############################################################################
--# Copyright (c) 2006 Free Software Foundation, Inc.                          #
-+# Copyright (c) 2006,2007 Free Software Foundation, Inc.                     #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -40,6 +40,11 @@
- 
- THIS="ncurses@DFT_ARG_SUFFIX@"
- 
-+LANG=C;		export LANG
-+LANGUAGE=C;	export LANGUAGE
-+LC_ALL=C;	export LC_ALL
-+LC_CTYPE=C;	export LC_CTYPE
-+
- test $# = 0 && exec @SHELL@ $0 --error
- 
- while test $# -gt 0; do
-diff -Naur ncurses-5.6.orig/misc/shlib ncurses-5.6/misc/shlib
---- ncurses-5.6.orig/misc/shlib	2005-06-25 18:41:17.000000000 -0400
-+++ ncurses-5.6/misc/shlib	2008-06-18 06:49:44.000000000 -0400
-@@ -29,7 +29,7 @@
- #
- # Author: Thomas E. Dickey <dickey@clark.net> 1996
- #
--# $Id: shlib,v 1.10 2005/06/25 22:41:17 tom Exp $
-+# $Id: shlib,v 1.11 2007/01/13 17:09:52 tom Exp $
- # Use this script as a wrapper when running executables linked to shared
- # libraries on systems that use the $LD_LIBRARY_PATH variable and don't embed
- # the soname's path within the linked executable (such as IRIX), e.g,
-@@ -81,6 +81,7 @@
- do
- 	if test -d $p; then
- 		q=`cd $p; pwd`
-+		break
- 	elif test -f configure && test ! -d ../$p ; then
- 		break
- 	fi
-diff -Naur ncurses-5.6.orig/misc/terminfo.src ncurses-5.6/misc/terminfo.src
---- ncurses-5.6.orig/misc/terminfo.src	2006-10-07 13:52:03.000000000 -0400
-+++ ncurses-5.6/misc/terminfo.src	2008-06-18 06:49:50.000000000 -0400
-@@ -6,8 +6,8 @@
- # Report bugs and new terminal descriptions to
- #	bug-ncurses@gnu.org
- #
--#	$Revision: 1.303 $
--#	$Date: 2006/10/07 17:52:03 $
-+#	$Revision: 1.328 $
-+#	$Date: 2008/04/29 00:49:41 $
- #
- # The original header is preserved below for reference.  It is noted that there
- # is a "newer" version which differs in some cosmetic details (but actually
-@@ -317,6 +317,16 @@
- 	OTbs,
- 	bel=^G, cr=^M, cud1=^J, ind=^J,
- 
-+# This is almost the same as "dumb", but with no prespecified width.
-+# DEL and ^C are hardcoded to act as kill characters.
-+# ^D acts as a line break (just like newline).
-+# It also interprets
-+#      \033];xxx\007 
-+# for compatibility with xterm -TD
-+9term|Plan9 terminal emulator for X,
-+	am,
-+	OTnl=^J, bel=^G, cud1=^J,
-+
- #### ANSI.SYS/ISO 6429/ECMA-48 Capabilities
- #
- # See the end-of-file comment for more on these.
-@@ -2691,8 +2701,9 @@
- vt100-putty|Reset PuTTY to pure vt100,
- 	rs2=\E<\E["p\Ec\E[?3l\E]R\E[40"p\E[61"p\E[50;1;2"p,
- 	use=vt100,
-+# palette is hardcoded...
- putty-256color|PuTTY 0.58 with xterm 256-colors,
--	use=xterm+256color, use=putty,
-+	initc@, use=xterm+256color, use=putty,
- 
- # One of the keyboard selections is "VT100+".
- # pterm (the X11 port) uses shifted F1-F10 as F11-F20
-@@ -3006,20 +3017,17 @@
- 	cnorm=\E[?12l\E[?25h, cvvis=\E[?12;25h, indn=\E[%p1%dS,
- 	rin=\E[%p1%dT, use=xterm-xf86-v43,
- 
--# This is the most common alias for xterm-new.
- xterm-xfree86|xterm terminal emulator (XFree86),
--	use=xterm-new,
--#	use=xterm-old,
-+	use=xterm-xf86-v44,
- 
- # This version reflects the current xterm features.
- xterm-new|modern xterm terminal emulator,
- 	npc,
- 	indn=\E[%p1%dS, kDC=\E[3;2~, kEND=\E[1;2F, kHOM=\E[1;2H,
--	kIC=\E[2;2~, kLFT=\E[1;2D, kNXT=\E[6;2~, kPRV=\E[5;2~,
--	kRIT=\E[1;2C, kb2=\EOE, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB,
--	kcuf1=\EOC, kcuu1=\EOA, kend=\EOF, kent=\EOM, khome=\EOH,
--	kich1=\E[2~, kind=\E[1;2B, kmous=\E[M, knp=\E[6~,
--	kpp=\E[5~, kri=\E[1;2A, rin=\E[%p1%dT, use=xterm+pcfkeys,
-+	kIC=\E[2;2~, kNXT=\E[6;2~, kPRV=\E[5;2~, kb2=\EOE,
-+	kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-+	kend=\EOF, kent=\EOM, khome=\EOH, kich1=\E[2~, kmous=\E[M,
-+	knp=\E[6~, kpp=\E[5~, rin=\E[%p1%dT, use=xterm+pcfkeys,
- 	use=xterm-basic,
- #
- # This fragment describes as much of XFree86 xterm's "pc-style" function
-@@ -3038,7 +3046,16 @@
- # The meta key may also be used as a modifier in this scheme, adding another
- # bit to the parameter.
- xterm+pcfkeys|fragment for PC-style fkeys,
--	use=xterm+pcf2, use=xterm+pcc2,
-+	use=xterm+app, use=xterm+pcf2, use=xterm+pcc2,
-+	use=xterm+pce2,
-+#
-+xterm+noapp|fragment with cursor keys in normal mode,
-+	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kend=\E[F,
-+	khome=\E[H,
-+
-+xterm+app|fragment with cursor keys in application mode,
-+	kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kend=\EOF,
-+	khome=\EOH,
- #
- # The "PC-style" modifier scheme was introduced in xterm patch #94 (1999/3/27)
- # and revised in patch #167 (2002/8/24).  Some other terminal emulators copied
-@@ -3060,25 +3077,41 @@
- # modifyCursorKeys resource.  These fragments list the modified cursor-keys
- # that might apply to xterm+pcfkeys with different values of that resource.
- xterm+pcc3|fragment with modifyCursorKeys:3,
--	kDN=\E[>1;2B, kDN5=\E[>1;5B, kDN6=\E[>1;6B,
--	kLFT5=\E[>1;5D, kLFT6=\E[>1;6D, kRIT5=\E[>1;5C,
--	kRIT6=\E[>1;6C, kUP=\E[>1;2A, kUP5=\E[>1;5A,
--	kUP6=\E[>1;6A,
-+	kLFT=\E[>1;2D, kRIT=\E[>1;2C, kind=\E[>1;2B,
-+	kri=\E[>1;2A, kDN=\E[>1;2B, kDN3=\E[>1;3B, kDN4=\E[>1;4B,
-+	kDN5=\E[>1;5B, kDN6=\E[>1;6B, kDN7=\E[>1;7B,
-+	kLFT3=\E[>1;3D, kLFT4=\E[>1;4D, kLFT5=\E[>1;5D,
-+	kLFT6=\E[>1;6D, kLFT7=\E[>1;7D, kRIT3=\E[>1;3C,
-+	kRIT4=\E[>1;4C, kRIT5=\E[>1;5C, kRIT6=\E[>1;6C,
-+	kRIT7=\E[>1;7C, kUP=\E[>1;2A, kUP3=\E[>1;3A,
-+	kUP4=\E[>1;4A, kUP5=\E[>1;5A, kUP6=\E[>1;6A,
-+	kUP7=\E[>1;7A,
- 
- xterm+pcc2|fragment with modifyCursorKeys:2,
--	kDN=\E[1;2B, kDN5=\E[1;5B, kDN6=\E[1;6B, kLFT5=\E[1;5D,
--	kLFT6=\E[1;6D, kRIT5=\E[1;5C, kRIT6=\E[1;6C, kUP=\E[1;2A,
--	kUP5=\E[1;5A, kUP6=\E[1;6A,
-+	kLFT=\E[1;2D, kRIT=\E[1;2C, kind=\E[1;2B, kri=\E[1;2A,
-+	kDN=\E[1;2B, kDN3=\E[1;3B, kDN4=\E[1;4B, kDN5=\E[1;5B,
-+	kDN6=\E[1;6B, kDN7=\E[1;7B, kLFT3=\E[1;3D, kLFT4=\E[1;4D,
-+	kLFT5=\E[1;5D, kLFT6=\E[1;6D, kLFT7=\E[1;7D,
-+	kRIT3=\E[1;3C, kRIT4=\E[1;4C, kRIT5=\E[1;5C,
-+	kRIT6=\E[1;6C, kRIT7=\E[1;7C, kUP=\E[1;2A, kUP3=\E[1;3A,
-+	kUP4=\E[1;4A, kUP5=\E[1;5A, kUP6=\E[1;6A, kUP7=\E[1;7A,
- 
- xterm+pcc1|fragment with modifyCursorKeys:1,
--	kDN=\E[2B, kDN5=\E[5B, kDN6=\E[6B, kLFT5=\E[5D,
--	kLFT6=\E[6D, kRIT5=\E[5C, kRIT6=\E[6C, kUP=\E[2A,
--	kUP5=\E[5A, kUP6=\E[6A,
-+	kLFT=\E[2D, kRIT=\E[2C, kind=\E[2B, kri=\E[2A, kDN=\E[2B,
-+	kDN3=\E[3B, kDN4=\E[4B, kDN5=\E[5B, kDN6=\E[6B, kDN7=\E[7B,
-+	kLFT3=\E[3D, kLFT4=\E[4D, kLFT5=\E[5D, kLFT6=\E[6D,
-+	kLFT7=\E[7D, kRIT3=\E[3C, kRIT4=\E[4C, kRIT5=\E[5C,
-+	kRIT6=\E[6C, kRIT7=\E[7C, kUP=\E[2A, kUP3=\E[3A,
-+	kUP4=\E[4A, kUP5=\E[5A, kUP6=\E[6A, kUP7=\E[7A,
- 
- xterm+pcc0|fragment with modifyCursorKeys:0,
--	kDN=\EO2B, kDN5=\EO5B, kDN6=\EO6B, kLFT5=\EO5D,
--	kLFT6=\EO6D, kRIT5=\EO5C, kRIT6=\EO6C, kUP=\EO2A,
--	kUP5=\EO5A, kUP6=\EO6A,
-+	kLFT=\EO2D, kRIT=\EO2C, kind=\EO2B, kri=\EO2A, kDN=\EO2B,
-+	kDN3=\EO3B, kDN4=\EO4B, kDN5=\EO5B, kDN6=\EO6B, kDN7=\EO7B,
-+	kLFT3=\EO3D, kLFT4=\EO4D, kLFT5=\EO5D, kLFT6=\EO6D,
-+	kLFT7=\EO7D, kRIT3=\EO3C, kRIT4=\EO4C, kRIT5=\EO5C,
-+	kRIT6=\EO6C, kRIT7=\EO7C, kUP=\EO2A, kUP3=\EO3A,
-+	kUP4=\EO4A, kUP5=\EO5A, kUP6=\EO6A, kUP7=\EO7A,
-+
- #
- # Here are corresponding fragments from xterm patch #216:
- #
-@@ -3101,24 +3134,63 @@
- 	kf59=\E[23;3~, kf6=\E[17~, kf60=\E[24;3~, kf61=\EO4P,
- 	kf62=\EO4Q, kf63=\EO4R, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
- #
--xterm+pcf2|fragment with modifyFunctionKeys:0,
-+xterm+pcf2|fragment with modifyFunctionKeys:2,
- 	kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
--	kf13=\E[2P, kf14=\E[2Q, kf15=\E[2R, kf16=\E[2S,
-+	kf13=\E[1;2P, kf14=\E[1;2Q, kf15=\E[1;2R, kf16=\E[1;2S,
- 	kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~, kf2=\EOQ,
- 	kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~,
--	kf23=\E[23;2~, kf24=\E[24;2~, kf25=\E[5P, kf26=\E[5Q,
--	kf27=\E[5R, kf28=\E[5S, kf29=\E[15;5~, kf3=\EOR,
-+	kf23=\E[23;2~, kf24=\E[24;2~, kf25=\E[1;5P, kf26=\E[1;5Q,
-+	kf27=\E[1;5R, kf28=\E[1;5S, kf29=\E[15;5~, kf3=\EOR,
- 	kf30=\E[17;5~, kf31=\E[18;5~, kf32=\E[19;5~,
- 	kf33=\E[20;5~, kf34=\E[21;5~, kf35=\E[23;5~,
--	kf36=\E[24;5~, kf37=\E[6P, kf38=\E[6Q, kf39=\E[6R,
--	kf4=\EOS, kf40=\E[6S, kf41=\E[15;6~, kf42=\E[17;6~,
-+	kf36=\E[24;5~, kf37=\E[1;6P, kf38=\E[1;6Q, kf39=\E[1;6R,
-+	kf4=\EOS, kf40=\E[1;6S, kf41=\E[15;6~, kf42=\E[17;6~,
- 	kf43=\E[18;6~, kf44=\E[19;6~, kf45=\E[20;6~,
--	kf46=\E[21;6~, kf47=\E[23;6~, kf48=\E[24;6~, kf49=\E[3P,
--	kf5=\E[15~, kf50=\E[3Q, kf51=\E[3R, kf52=\E[3S,
--	kf53=\E[15;3~, kf54=\E[17;3~, kf55=\E[18;3~,
--	kf56=\E[19;3~, kf57=\E[20;3~, kf58=\E[21;3~,
--	kf59=\E[23;3~, kf6=\E[17~, kf60=\E[24;3~, kf61=\E[4P,
--	kf62=\E[4Q, kf63=\E[4R, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-+	kf46=\E[21;6~, kf47=\E[23;6~, kf48=\E[24;6~,
-+	kf49=\E[1;3P, kf5=\E[15~, kf50=\E[1;3Q, kf51=\E[1;3R,
-+	kf52=\E[1;3S, kf53=\E[15;3~, kf54=\E[17;3~,
-+	kf55=\E[18;3~, kf56=\E[19;3~, kf57=\E[20;3~,
-+	kf58=\E[21;3~, kf59=\E[23;3~, kf6=\E[17~, kf60=\E[24;3~,
-+	kf61=\E[1;4P, kf62=\E[1;4Q, kf63=\E[1;4R, kf7=\E[18~,
-+	kf8=\E[19~, kf9=\E[20~,
-+#
-+# Chunks from xterm #230:
-+xterm+pce2|fragment with modifyCursorKeys:2,
-+	kDC=\E[3;2~, kEND=\E[1;2F, kHOM=\E[1;2H, kIC=\E[2;2~,
-+	kNXT=\E[6;2~, kPRV=\E[5;2~, kich1=\E[2~, knp=\E[6~,
-+	kpp=\E[5~, kDC3=\E[3;3~, kDC4=\E[3;4~, kDC5=\E[3;5~,
-+	kDC6=\E[3;6~, kDC7=\E[3;7~, kEND3=\E[1;3F, kEND4=\E[1;4F,
-+	kEND5=\E[1;5F, kEND6=\E[1;6F, kEND7=\E[1;7F,
-+	kHOM3=\E[1;3H, kHOM4=\E[1;4H, kHOM5=\E[1;5H,
-+	kHOM6=\E[1;6H, kHOM7=\E[1;7H, kIC3=\E[2;3~, kIC4=\E[2;4~,
-+	kIC5=\E[2;5~, kIC6=\E[2;6~, kIC7=\E[2;7~, kNXT3=\E[6;3~,
-+	kNXT4=\E[6;4~, kNXT5=\E[6;5~, kNXT6=\E[6;6~,
-+	kNXT7=\E[6;7~, kPRV3=\E[5;3~, kPRV4=\E[5;4~,
-+	kPRV5=\E[5;5~, kPRV6=\E[5;6~, kPRV7=\E[5;7~,
-+	use=xterm+edit,
-+
-+xterm+edit|fragment for 6-key editing-keypad,
-+	kdch1=\E[3~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
-+	use=xterm+pc+edit,
-+
-+xterm+pc+edit|fragment for pc-style editing keypad,
-+	kend=\E[4~, khome=\E[1~,
-+
-+xterm+vt+edit|fragment for vt220-style editing keypad,
-+	kfnd=\E[1~, kslt=\E[4~,
-+
-+#
-+# Those chunks use the new-style (the xterm oldFunctionKeys resource is false).
-+# Alternatively, the same scheme with old-style function keys as in xterm-r6
-+# is shown here (because that is used in mrxvt and mlterm):
-+xterm+r6f2|xterm with oldFunctionKeys and modifyFunctionKeys:2,
-+	kf1=\E[11~, kf13=\E[11;2~, kf14=\E[12;2~, kf15=\E[13;2~,
-+	kf16=\E[14;2~, kf2=\E[12~, kf25=\E[11;5~, kf26=\E[12;5~,
-+	kf27=\E[13;5~, kf28=\E[14;5~, kf3=\E[13~, kf37=\E[11;6~,
-+	kf38=\E[12;6~, kf39=\E[13;6~, kf4=\E[14~, kf40=\E[14;6~,
-+	kf49=\E[11;3~, kf50=\E[12;3~, kf51=\E[13;3~,
-+	kf52=\E[14;3~, kf61=\E[11;4~, kf62=\E[12;4~,
-+	kf63=\E[13;4~, use=xterm+pcf2,
- #
- # This chunk is used for building the VT220/Sun/PC keyboard variants.
- xterm-basic|modern xterm terminal emulator - common,
-@@ -3135,8 +3207,8 @@
- 	flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
- 	ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
- 	ind=^J, invis=\E[8m, is2=\E[!p\E[?3;4l\E[4l\E>, kbs=^H,
--	kdch1=\E[3~, kmous=\E[M, mc0=\E[i, mc4=\E[4i, mc5=\E[5i,
--	meml=\El, memu=\Em, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM,
-+	kmous=\E[M, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, meml=\El,
-+	memu=\Em, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM,
- 	rmacs=\E(B, rmam=\E[?7l, rmcup=\E[?1049l, rmir=\E[4l,
- 	rmkx=\E[?1l\E>, rmm=\E[?1034l, rmso=\E[27m, rmul=\E[24m,
- 	rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>, sc=\E7,
-@@ -3157,6 +3229,8 @@
- xterm-16color|xterm with 16 colors like aixterm,
- 	use=ibm+16color, use=xterm-new,
- 
-+# This is a compile-time feature of XFree86 xterm beginning with
-+# patch #111 (1999/7/10) -TD
- xterm+256color|xterm 256-color feature,
- 	ccc,
- 	colors#256, pairs#32767,
-@@ -3165,6 +3239,18 @@
- 	setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m,
- 	setb@, setf@,
- 
-+# This is a compile-time feature of XFree86 xterm beginning with
-+# patch #115 (1999/9/18) -TD
-+#
-+# Note that the escape sequences used are the same as for 256-colors - xterm
-+# has a different table of default color resource values.  If built for
-+# 256-colors, it can still handle an 88-color palette by using the initc
-+# capability.
-+#
-+# At this time (2007/7/14), except for rxvt 2.7.x, none of the other terminals
-+# which support the xterm+256color feature support the associated initc
-+# capability.  So it is cancelled in the entries which use this and/or the
-+# xterm+256color block.
- xterm+88color|xterm 88-color feature,
- 	colors#88, pairs#7744, use=xterm+256color,
- 
-@@ -3268,7 +3354,8 @@
- 	kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf20=\E[34~,
- 	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
- 	khome=\E[1~, kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~,
--	use=xterm-basic, use=vt220+keypad,
-+	use=xterm+app, use=xterm+edit, use=xterm-basic,
-+	use=vt220+keypad,
- 
- xterm-vt52|xterm emulating dec vt52,
- 	cols#80, it#8, lines#24,
-@@ -3279,11 +3366,11 @@
- 	kcuf1=\EC, kcuu1=\EA, nel=^M^J, ri=\EI, rmacs=\EG, smacs=\EF,
- 
- xterm-noapp|xterm with cursor keys in normal mode,
--	kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, rmcup@,
--	rmkx=\E>, smcup@, smkx=\E=, use=xterm,
-+	rmcup@, rmkx=\E>, smcup@, smkx=\E=, use=xterm+noapp,
-+	use=xterm,
- 
- xterm-24|vs100|xterms|xterm terminal emulator (X Window System),
--	lines#24, use=xterm,
-+	lines#24, use=xterm-old,
- 
- # This is xterm for ncurses.
- xterm|xterm terminal emulator (X Window System),
-@@ -3307,7 +3394,7 @@
- #
- # xterm with bold instead of underline
- xterm-bold|xterm terminal emulator (X11R6 Window System) standout w/bold,
--	smso=\E[7m, smul=\E[1m, use=xterm,
-+	smso=\E[7m, smul=\E[1m, use=xterm-old,
- # (kterm: this had extension capabilities ":KJ:TY=ascii:" -- esr)
- # (kterm should not invoke DEC Graphics as the alternate character set
- #  -- Kenji Rikitake)
-@@ -3444,11 +3531,23 @@
- 	rs2=\E7\E[r\E8\E[m\E[?7h\E[!p\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[?25h,
- 	use=ansi+enq, use=xterm+pcc0, use=gnome-rh90,
- 
-+# GNOME Terminal 2.18.1 (2007 snapshot)
-+#
-+# For any "recent" version of gnome-terminal, it is futile to attempt to
-+# support modifiers on cursor- and keypad keys because the program usually
-+# is hardcoded to set $TERM to "xterm", and on startup, it builds a subset
-+# of the keys (which more/less correspond to the termcap values), and will
-+# interpret those according to the $TERM value, but others not in the
-+# terminfo according to some constantly changing set of hacker guidelines -TD
-+gnome-2007|GNOME Terminal snapshot 2.18.1,
-+	use=xterm+pcc2, use=gnome-fc5,
-+
- gnome|GNOME Terminal,
--	use=gnome-fc5,
-+	use=gnome-2007,
- 
-+# palette is hardcoded...
- gnome-256color|GNOME Terminal with xterm 256-colors,
--	use=xterm+256color, use=gnome,
-+	initc@, use=xterm+256color, use=gnome,
- 
- # XFCE Terminal 0.2.5.4beta2
- #
-@@ -3551,14 +3650,29 @@
- konsole|KDE console window,
- 	use=konsole-xf4x,
- 
--# Based on mlterm 2.9.2's mlterm.ti, with corrections/additions from reading
--# the source code and running tack -TD
-+# palette is hardcoded...
-+konsole-256color|KDE console window with xterm 256-colors,
-+	initc@, use=xterm+256color, use=konsole,
-+
-+# This is mlterm 2.9.3's mlterm.ti, with some additions/corrections -TD
- #
--# This is nominally a vt102 emulator, with features borrowed from rxvt and
-+# It is nominally a vt102 emulator, with features borrowed from rxvt and
- # xterm.
- #
--# There are some problems with vttest:
--#	test of character sets leaves it in line-drawing mode.
-+# The function keys are numbered based on shift/control/alt modifiers, except
-+# that the control-modifier itself is used to spawn a new copy of mlterm (the
-+# "-P" option).  So control/F1 to control/F12 may not be usable, depending on
-+# how it is configured.
-+#
-+#				kf1 to kf12	\E[11~   to \E[24~
-+#	shift			kf1 to kf12	\E[11;2~ to \E[24;2~
-+#	alt			kf1 to kf12	\E[11;3~ to \E[24;3~
-+#	shift/alt		kf1 to kf12	\E[11;4~ to \E[24;4~
-+#	control			kf1 to kf12	\E[11;5~ to \E[24;5~ (maybe)
-+#	control/shift		kf1 to kf12	\E[11;6~ to \E[24;6~
-+#	control/alt		kf1 to kf12	\E[11;7~ to \E[24;7~
-+#	control/shit/alt	kf1 to kf12	\E[11;8~ to \E[24;8~
-+#
- mlterm|multi lingual terminal emulator,
- 	am, eslok, km, mc5i, mir, msgr, npc, xenl,
- 	colors#8, cols#80, it#8, lines#24, pairs#64,
-@@ -3574,21 +3688,29 @@
- 	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=^J, indn=\E[%p1%dS,
- 	is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>,
- 	kbs=\177, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
--	kdch1=\E[3~, kend=\EOF, kent=\EOM, kf1=\E[11~, kf10=\E[21~,
--	kf11=\E[23~, kf12=\E[24~, kf2=\E[12~, kf3=\E[13~,
--	kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
--	kf9=\E[20~, kfnd=\E[1~, khome=\EOH, kich1=\E[2~,
--	kmous=\E[M, knp=\E[6~, kpp=\E[5~, kslt=\E[4~, mc0=\E[i,
--	nel=\EE, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM,
--	rin=\E[%p1%dT, rmacs=\E(B, rmam=\E[?7l,
--	rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E[?1l\E>,
--	rmso=\E[27m, rmul=\E[24m,
-+	kdch1=\E[3~, kend=\EOF, kent=\EOM, kfnd=\E[1~, khome=\EOH,
-+	kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~, kslt=\E[4~,
-+	mc0=\E[i, nel=\EE, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM,
-+	rin=\E[%p1%dT, rmacs=\E(B, rmam=\E[?7l, rmcup=\E[?1049l,
-+	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
- 	rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l,
- 	sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
- 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;,
--	sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smcup=\E7\E[?47h,
-+	sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smcup=\E[?1049h,
- 	smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
--	tbc=\E[3g, vpa=\E[%i%p1%dd, use=vt100+enq,
-+	tbc=\E[3g, u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?1;2c, u9=\E[c,
-+	vpa=\E[%i%p1%dd, use=mlterm+pcfkeys, use=xterm+r6f2,
-+
-+# The insert/delete/home/end keys do not respond to modifiers because mlterm
-+# looks in its termcap to decide which string to send.  If it used terminfo
-+# (when available), it could use the extended names introduced for xterm.
-+mlterm+pcfkeys|fragment for PC-style fkeys,
-+	kLFT=\EO1;2D, kNXT=\E[6;2~, kPRV=\E[5;2~, kRIT=\EO1;2C,
-+	kDN=\EO1;2B, kDN5=\EO1;5B, kDN6=\EO1;6B, kIC5=\E[2;5~,
-+	kIC6=\E[2;6~, kLFT5=\EO1;5D, kLFT6=\EO1;6D,
-+	kNXT5=\E[6;5~, kNXT6=\E[6;6~, kPRV5=\E[5;5~,
-+	kPRV6=\E[5;6~, kRIT5=\EO1;5C, kRIT6=\EO1;6C, kUP=\EO1;2A,
-+	kUP5=\EO1;5A, kUP6=\EO1;6A,
- 
- # From: Thomas Dickey <dickey@clark.net> 04 Oct 1997
- # Updated: Oezguer Kesim <kesim@math.fu-berlin.de> 02 Nov 1997
-@@ -3607,7 +3729,7 @@
- #
- # rxvt is normally configured to look for "xterm" or "xterm-color" as $TERM.
- # Since rxvt is not really compatible with xterm, it should be configured as
--# "rxvt" (monochrome) and "rxvt-color".
-+# "rxvt" or "rxvt-color".
- #
- # removed dch/dch1 because they are inconsistent with bce/ech -TD
- # remove km as per tack test -TD
-@@ -3677,6 +3799,7 @@
- #  F18              ESC [ 32 ~   ESC [ 32 $   ESC [ 32 ^   ESC [ 32 @
- #  F19              ESC [ 33 ~   ESC [ 33 $   ESC [ 33 ^   ESC [ 33 @
- #  F20              ESC [ 34 ~   ESC [ 34 $   ESC [ 34 ^   ESC [ 34 @
-+#
- #                                                          Application
- #  Up               ESC [ A      ESC [ a      ESC O a      ESC O A
- #  Down             ESC [ B      ESC [ b      ESC O b      ESC O B
-@@ -3704,10 +3827,18 @@
- #  XK_KP_8          8                                      ESC O x
- #  XK_KP_9          9                                      ESC O y
- #
-+# The source-code for rxvt actually defines mappings for F21-F35, using
-+# "ESC [ 35 ~" to "ESC [  49 ~".  Keyboards with more than 12 function keys
-+# are rare, so this entry uses the shift- and control-modifiers as in
-+# xterm+pcfkeys to define keys past F12.
-+#
-+# kIC is normally not used, since rxvt performs a paste for that (shifted
-+# insert), unless private mode 35 is set.
-+#
- # kDN, kDN5, kDN6, etc are extensions based on the names from xterm+pcfkeys -TD
- # Removed kDN6, etc (control+shift) since rxvt does not implement this -TD
- rxvt+pcfkeys|fragment for PC-style fkeys,
--	kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E2$, kLFT=\E[d,
-+	kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d,
- 	kNXT=\E[6$, kPRV=\E[5$, kRIT=\E[c, kcub1=\E[D, kcud1=\E[B,
- 	kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~, kel=\E[8\^,
- 	kend=\E[8~, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~,
-@@ -3722,7 +3853,10 @@
- 	kf41=\E[33\^, kf42=\E[34\^, kf43=\E[23@, kf44=\E[24@,
- 	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
- 	kfnd=\E[1~, khome=\E[7~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
--	kslt=\E[4~, kDN=\E[b, kDN5=\EOb, kLFT5=\EOd, kRIT5=\EOc,
-+	kslt=\E[4~, kDC5=\E[3\^, kDC6=\E[3@, kDN=\E[b, kDN5=\EOb,
-+	kEND5=\E[8\^, kEND6=\E[8@, kHOM5=\E[7\^, kHOM6=\E[7@,
-+	kIC5=\E[2\^, kIC6=\E[2@, kLFT5=\EOd, kNXT5=\E[6\^,
-+	kNXT6=\E[6@, kPRV5=\E[5\^, kPRV6=\E[5@, kRIT5=\EOc,
- 	kUP=\E[a, kUP5=\EOa,
- 
- rxvt|rxvt terminal emulator (X Window System),
-@@ -3747,6 +3881,13 @@
- rxvt-16color|xterm with 16 colors like aixterm,
- 	ncv#32, use=ibm+16color, use=rxvt,
- 
-+# mrxvt 0.5.3
-+#
-+# mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which
-+# makes its function-keys different from other flavors of rxvt -TD
-+mrxvt|multitabbed rxvt,
-+	use=xterm+pcc2, use=xterm+r6f2, use=rxvt,
-+
- # From: Michael Jennings <mej@valinux.com>
- #
- # Eterm 0.9.3
-@@ -4218,13 +4359,20 @@
- #       if the terminal is wide (132 cols or more)).  If even this
- #       entry cannot be found, "vt100" is used as a substitute.
- #
-+# Notwithstanding the manpage, screen uses its own notion of the termcap
-+# and some keys from "screen.<term>" are ignored.  Here is an entry which
-+# covers those (tested with screen 4.00.02) -TD
-+screen+fkeys|function-keys according to screen,
-+	kend=\E[4~, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, kfnd@,
-+	khome=\E[1~, kslt@,
-+#
- # Here are a few customized entries which are useful -TD
- #
- # Notes:
- # (a)	screen does not support invis.
- # (b)	screen's implementation of bw is incorrect according to tack.
- # (c)	screen appears to hardcode the strings for khome/kend, making it
--#	necessary to override the "use=" clause's values.
-+#	necessary to override the "use=" clause's values (screen+fkeys).
- # (d)	screen sets $TERMCAP to a termcap-formatted copy of the 'screen' entry,
- #	which is NOT the same as the terminfo screen.<term>.
- # (e)	when screen finds one of these customized entries, it sets $TERM to
-@@ -4236,24 +4384,29 @@
- #	translation.  They are suppressed here to show what is tested by tack.
- screen.xterm-xfree86|screen.xterm-new|screen customized for modern xterm,
- 	bce@, bw,
--	invis@, kIC@, kNXT@, kPRV@, kend=\E[4~, khome=\E[1~, meml@,
--	memu@,
-+	invis@, kIC@, kNXT@, kPRV@, meml@, memu@,
- 	sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m,
--	use=xterm-new,
-+	use=screen+fkeys, use=xterm-new,
- # xterm-r6 does not really support khome/kend unless it is propped up by
- # the translations resource.
- screen.xterm-r6|screen customized for X11R6 xterm,
--	bw, use=xterm-r6,
-+	bw, use=screen+fkeys, use=xterm-r6,
- # Color applications running in screen and TeraTerm do not play well together
- # on Solaris because Sun's curses implementation gets confused.
- screen.teraterm|disable ncv in teraterm,
- 	ncv#127,
- 	acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260i\316j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
--	use=screen,
-+	use=screen+fkeys, use=screen,
-+# Other terminals
-+screen.rxvt|screen in rxvt,
-+	bw,
-+	cvvis@, flash@, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC,
-+	kcuu1=\EOA, use=screen+fkeys, use=vt100+enq,
-+	use=rxvt+pcfkeys, use=vt220+keypad, use=screen,
- # fix the backspace key
- screen.linux|screen in linux console,
- 	bw,
--	kbs=\177, kcbt@, use=screen,
-+	kbs=\177, kcbt@, use=screen+fkeys, use=screen,
- 
- screen-w|VT 100/ANSI X3.64 virtual terminal with 132 cols,
- 	cols#132, use=screen,
-@@ -15183,6 +15336,82 @@
- 	sgr0=^O, smso=\E0Q\016, smul=\E0`\016,
- 	vpa=\013%p1%{64}%+%c,
- 
-+# Newbury Data Recording Limited (Newbury Data)
-+#
-+# Have been manufacturing and reselling  various peripherals for a long time
-+# They don't make terminals anymore, but are still in business (in 2007).
-+# Their e-mail address is at ndsales@newburydata.co.uk
-+# and their post address is:
-+#
-+# Newbury Data Recording Ltd,
-+# Premier Park, Road One,
-+# Winsford, Cheshire, CW7 3PT
-+#
-+# Their technical support is still good, they sent me for free a printed copy
-+# of the 9500 user manual and I got it just 1 week after I first contacted them
-+# (in 2005)!
-+
-+# NDR 9500
-+# Manufactured in the early/mid eighties, behaves almost the same as a
-+# Televideo 950.  Take a 950, change its cabinet for a more 80s-ish one (but
-+# keep the same keyboard layout), add an optional 25-line mode, replace the DIP
-+# switches with a menu and remove the "lock line" feature (ESC !  1 and ESC ! 
-+# 2), here is the NDR 9500.  Even the line-lock, albeit disabled, is
-+# recognized:  if you type in "ESC !", the next (third) character is not
-+# echoed, showing that the terminal was actually waiting for a parameter!
-+ndr9500|nd9500|Newbury Data 9500,
-+	am, bw, hs, mc5i, mir, msgr, ul, xon,
-+	cols#80, lines#24, wsl#79,
-+	acsc=qKnImAjDwNuLtMvOlBkCxJ, bel=^G, cbt=\EI, civis=\E.0,
-+	clear=\E;, cnorm=\E.1, cr=^M, cub1=^H, cud1=^V, cuf1=^L,
-+	cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, dch1=\EW,
-+	dim=\E), dl1=\ER, dsl=\Eh, ed=\EY, el=\ET,
-+	flash=\Eb$<50/>\Ed, fsl=^M, home=^^, ht=^I, hts=\E1,
-+	ich1=\EQ, il1=\EE, ind=^J, is2=\Ew\E'\EDF\El\Er\EO,
-+	kDC=\Er, kDL=\EO, kEOL=\Et, kIC=\Eq, kcbt=\EI, kclr=^Z,
-+	kcub1=^H, kcud1=^V, kcuf1=^L, kcuu1=^K, kdch1=\EW, kdl1=\ER,
-+	ked=\EY, kel=\ET, kent=^M, kf1=^A@\r, kf10=^AI\r, kf11=^AJ\r,
-+	kf12=^A`\r, kf13=^Aa\r, kf14=^Ab\r, kf15=^Ac\r, kf16=^Ad\r,
-+	kf17=^Ae\r, kf18=^Af\r, kf19=^Ag\r, kf2=^AA\r, kf20=^Ah\r,
-+	kf21=^Ai\r, kf22=^Aj\r, kf3=^AB\r, kf4=^AC\r, kf5=^AD\r,
-+	kf6=^AE\r, kf7=^AF\r, kf8=^AG\r, kf9=^AH\r, khome=^^,
-+	kich1=\EQ, kil1=\EE, kprt=\EP, mc4=\Ea, mc5=\E`, nel=^_,
-+	pfloc=\E|%{48}%p1%+%c2%p2\031,
-+	pfx=\E|%{48}%p1%+%c1%p2\031, prot=\E), ri=\Ej,
-+	rmacs=\E%%, rmir=\Er, rmso=\E(, rmxon=^N,
-+	sgr=\E%%\E(%?%p1%p5%p8%|%|%t\E)%;%?%p9%t\E$%;,
-+	sgr0=\EG0\E%%\E(, smacs=\E$, smir=\Eq, smso=\E), smxon=^O,
-+	tbc=\E3, tsl=\Eg\Ef\011%p1%{32}%+%c, .kbs=^H,
-+
-+ndr9500-nl|NDR 9500 with no status line,
-+	hs@,
-+	wsl@,
-+	dsl@, fsl@, tsl@, use=ndr9500,
-+
-+ndr9500-25|NDR 9500 with 25th line enabled,
-+	lines#25, use=ndr9500,
-+
-+ndr9500-25-nl|NDR 9500 with 25 lines and no status line,
-+	lines#25, use=ndr9500-nl,
-+
-+ndr9500-mc|NDR 9500 with magic cookies (enables underline inverse video invisible and blink),
-+	msgr@,
-+	xmc#1,
-+	blink=\EG2, invis=\EG1, rev=\EG4, rmso=\EG0, rmul=\EG0,
-+	sgr=\E%%\E(%?%p5%p8%|%t\E)%;%?%p9%t\E$%;\EG%{48}%?%p7%t%{1}%+%;%?%p4%t%{2}%+%;%?%p3%p1%|%t%{4}%+%;%?%p2%t%{8}%+%;%c,
-+	sgr0=\EG0\E%%\E(, smso=\EG4, smul=\EG8, use=ndr9500,
-+
-+ndr9500-25-mc|NDR 500 with 25 lines and magic cookies,
-+	lines#25, use=ndr9500-mc,
-+
-+ndr9500-mc-nl|NDR 9500 with magic cookies and no status line,
-+	hs@,
-+	wsl@,
-+	dsl@, fsl@, tsl@, use=ndr9500-mc,
-+
-+ndr9500-25-mc-nl|NDR 9500 with 25 lines and magic cookies and no status line,
-+	lines#25, use=ndr9500-mc-nl,
-+
- #### Perkin-Elmer (Owl)
- #
- # These are official terminfo entries from within Perkin-Elmer.
-@@ -18147,19 +18376,19 @@
- h19|heath|h19-b|heathkit|heath-19|z19|zenith|heathkit h19,
- 	OTbs, am, eslok, hs, mir, msgr,
- 	cols#80, it#8, lines#24,
--	acsc=, bel=^G, clear=\EE, cnorm=\Ey4, cr=^M, cub1=^H, cud1=\EB,
--	cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA,
--	cvvis=\Ex4, dch1=\EN, ed=\EJ, el=\EK, fsl=\Ek\Ey5, home=\EH,
--	ht=^I, ind=^J, ip=<1.5/>, kbs=^H, kcub1=\ED, kcud1=\EB,
--	kcuf1=\EC, kcuu1=\EA, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV,
--	kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, khome=\EH, lf6=blue,
--	lf7=red, lf8=white, ri=\EI, rmacs=\EG, rmir=\EO, rmso=\Eq,
--	smacs=\EF, smir=\E@, smso=\Ep,
--	tsl=\Ej\Ex5\EY8%p1%{32}%+%c\Eo\Eo,
-+	acsc=~\^x`qanbkcjdmelfgg+hai.kwsutvutvozs{, bel=^G,
-+	clear=\EE, cnorm=\Ey4, cr=^M, cub1=^H, cud1=\EB, cuf1=\EC,
-+	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, cvvis=\Ex4,
-+	dch1=\EN, ed=\EJ, el=\EK, fsl=\Ek\Ey5, home=\EH, ht=^I, ind=^J,
-+	ip=<1.5/>, kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC,
-+	kcuu1=\EA, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV, kf5=\EW,
-+	kf6=\EP, kf7=\EQ, kf8=\ER, khome=\EH, lf6=blue, lf7=red,
-+	lf8=white, ri=\EI, rmacs=\EG, rmir=\EO, rmso=\Eq, smacs=\EF,
-+	smir=\E@, smso=\Ep, tsl=\Ej\Ex5\EY8%p1%{32}%+%c\Eo\Eo,
- h19-u|heathkit with underscore cursor,
- 	cnorm@, cvvis@, use=h19-b,
- h19-g|h19g|heathkit w/block cursor,
--	cnorm=\Ex4, use=h19-b,
-+	cnorm=\Ex4, cvvis@, use=h19-b,
- alto-h19|altoh19|altoheath|alto-heath|alto emulating heathkit h19,
- 	lines#60,
- 	dl1=\EM, il1=\EL, use=h19,
-@@ -18285,14 +18514,15 @@
- z100bw|h100bw|z110bw|z-100bw|h-100bw|heath/zenith z-100 pc,
- 	OTbs, OTpt, mir, msgr,
- 	OTkn#10, cols#80, it#8, lines#24,
--	acsc=, clear=\EE$<5*/>, cnorm=\Ey4, cub1=^H, cud1=\EB,
--	cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c$<1*/>,
--	cuu1=\EA, cvvis=\Ex4, dch1=\EN$<1*/>, dl1=\EM$<5*/>,
--	ed=\EJ, el=\EK, home=\EH, ht=^I, il1=\EL$<5*/>, kbs=^H,
--	kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, kf0=\EJ, kf1=\ES,
--	kf2=\ET, kf3=\EU, kf4=\EV, kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER,
--	kf9=\EOI, khome=\EH, ri=\EI, rmacs=\EG, rmir=\EO, rmso=\Eq,
--	smacs=\EF, smir=\E@, smso=\Ep,
-+	acsc=~\^x`qanbkcjdmelfgg+hai.kwsutvutvozs{,
-+	clear=\EE$<5*/>, cnorm=\Ey4, cub1=^H, cud1=\EB, cuf1=\EC,
-+	cup=\EY%p1%{32}%+%c%p2%{32}%+%c$<1*/>, cuu1=\EA,
-+	cvvis=\Ex4, dch1=\EN$<1*/>, dl1=\EM$<5*/>, ed=\EJ, el=\EK,
-+	home=\EH, ht=^I, il1=\EL$<5*/>, kbs=^H, kcub1=\ED, kcud1=\EB,
-+	kcuf1=\EC, kcuu1=\EA, kf0=\EJ, kf1=\ES, kf2=\ET, kf3=\EU,
-+	kf4=\EV, kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, kf9=\EOI,
-+	khome=\EH, ri=\EI, rmacs=\EG, rmir=\EO, rmso=\Eq, smacs=\EF,
-+	smir=\E@, smso=\Ep,
- p19|h19-b with il1/dl1,
- 	dl1=\EM$<2*/>, il1=\EL$<2*/>, use=h19-b,
- # From: <ucscc!B.fiatlux@ucbvax.berkeley.edu>
-@@ -20696,6 +20926,99 @@
- #	* Back off the xterm entry to use r6 as a base.
- # 9.13.22 (Sat Nov 30 11:51:31 EST 1996):
- #	* Added dec-vt220 at Adrian Garside's request.
-+#
-+#-(original-changelog-1996/12/29-to-1998/02/28-by-TD)---------------------------
-+#
-+# 10.1.0 (Sun Dec 29 02:36:31 EST 1996): withdrawn
-+#	* Minor corrections to xterm entries.
-+#	* Replaced EWAN telnet entry.
-+#	* Dropped the reorder script generator.  It was a fossil.
-+# 9.13.23 (Fri Feb 21 16:36:06 EST 1997):
-+#	* Replaced minitel-2 entry.
-+#	* Added MGR, ansi-nt.
-+# 9.13.24 (Sun Feb 23 20:55:23 EST 1997):
-+#	* Thorsten Lockert added termcap `bs' to a lot of types, working from
-+#	  the 4.4BSD Lite2 file.
-+#
-+# 10.1.1 (Sat May  3 21:41:27 EDT 1997):
-+#	* Use setaf/setab consistently with SVr4.
-+#	* Remove ech, el1 from cons25w, they do not work in FreeBSD 2.1.5
-+# 10.1.2 (Sat May 24 21:10:57 EDT 1997)
-+#	* update xterm-xf86-v32 to match XFree86 3.2A (changes F1-F4)
-+#	* add xterm-16color, for XFree86 3.3
-+# 10.1.3 (Sat May 31 12:21:05 EDT 1997)
-+#	* correct typo in emu
-+#	* correct typo in vt102-w (Robert Wuest)
-+#	* make new entry xterm-xf86-v33, restored xterm-xf86-v32.
-+# 10.1.4 (Sun Jun 15 08:29:05 EDT 1997)
-+#	* remove ech capability from rxvt (it does the wrong thing)
-+# 10.1.5 (Sat Jun 28 21:34:36 EDT 1997)
-+#	* remove spurious newlines from several entries (hp+color, wy50,
-+#	  wy350, wy370-nk, wy99gt-tek, wy370-tek, ibm3161, tek4205, ctrm,
-+#	  gs6300)
-+# 10.1.6 (Sat Jul  5 15:08:16 EDT 1997)
-+#	* correct rmso capability of wy50-mc
-+# 10.1.7 (Sat Jul 12 20:05:55 EDT 1997)
-+#	* add cbt to xterm-xf86-v32
-+#	* disentangle some entries from 'xterm', preferring xterm-r6 in case
-+#	  'xterm' is derived from xterm-xf86-v32, which implements ech and
-+#	  other capabilities not in xterm-r6.
-+#	* remove alternate character set from kterm entry.
-+# 10.1.8 (Sat Aug  2 18:43:18 EDT 1997)
-+#	* correct acsc entries for ACS_LANTERN, which is 'i', not 'I'.
-+# 10.1.9 (Sat Aug 23 17:54:38 EDT 1997)
-+#	* add xterm-8bit entry.
-+# 10.1.10 (Sat Oct  4 18:17:13 EDT 1997)
-+#	* repair several places where early version of tic replaced \, with \\\,
-+#	* make acsc entries canonical form (sorted, uniq).
-+#	* modify acsc entries for linux, linux-koi8
-+#	* new rxvt entry, from corrected copy of distribution in rxvt 2.21b
-+#	* add color, mouse support to kterm.
-+# 10.1.11 (Sat Oct 11 14:57:10 EDT 1997)
-+#	* correct wy120 smxon/tbc capabilities which were stuck together.
-+# 10.1.12 (Sat Oct 18 17:38:41 EDT 1997)
-+#	* add entry for xterm-xf86-v39t
-+# 10.1.13 (Sat Nov  8 13:43:33 EST 1997)
-+#	* add u8,u9 to sun-il description
-+# 10.1.14 (Sat Nov 22 19:59:03 EST 1997)
-+#	* add vt220-js, pilot, rbcomm, datapoint entries from esr's 27-jun-97
-+#	  version.
-+#	* add hds200 description (Walter Skorski)
-+#	* add EMX 0.9b descriptions
-+#	* correct rmso/smso capabilities in wy30-mc and wy50-mc (Daniel Weaver)
-+#	* rename xhpterm back to hpterm.
-+# 10.1.15 (Sat Nov 29 19:21:59 EST 1997)
-+#	* change initc in linux-c-nc to use 0..1000 range.
-+# 10.1.16 (Sat Dec 13 19:41:59 EST 1997)
-+#	* remove hpa/vpa from rxvt, which implements them incorrectly.
-+#	* add sgr0 for rxvt.
-+#	* remove bogus smacs/rmacs from EMX descriptions.
-+# 10.1.17 (Sat Dec 20 17:54:10 EST 1997)
-+#	* revised entry for att7300
-+# 10.1.18 (Sat Jan  3 17:58:49 EST 1998)
-+#	* use \0 rather than \200.
-+#	* rename rxvt-color to rxvt to match rxvt 2.4.5 distribution.
-+# 10.1.19 (Sat Jan 17 14:24:57 EST 1998)
-+#	* change xterm (xterm-xf86-v40), xterm-8bit rs1 to use hard reset.
-+#	* rename xterm-xf86-v39t to xterm-xf86-v40
-+#	* remove bold/underline from sun console entries since they're not
-+#	  implemented.
-+# 10.1.20 (Sat Jan 24 11:02:51 EST 1998)
-+#	* add beterm entry (Fred Fish)
-+#	* add irix-color/xwsh entry.
-+#	* turn ncv off for linux.
-+# 10.1.21 (Sat Jan 31 17:39:16 EST 1998)
-+#	* set ncv for FreeBSD console (treat colors with reverse specially).
-+#	* remove sgr string from qnx based on report by Xiaodan Tang
-+# 10.1.22 (Wed Feb 11 18:40:12 EST 1998)
-+#	* remove spurious commas from descriptions
-+#	* correct xterm-8bit to match XFree86 3.9Ad F1-F4.
-+# 10.1.23 (Sat Feb 28 17:48:38 EST 1998)
-+#	* add linux-koi8r to replace linux-koi8 (which uses a corrupt acsc,
-+#	  apparently based on cp-866).
-+#
-+#-(replaced-changelog-1998/02/28-by-ESR)----------------------------------------
-+#
- # 9.13.23 (Fri Feb 21 16:36:06 EST 1997):
- #	* Replaced minitel-2 entry.
- #	* Added MGR, ansi-nt.
-@@ -20748,6 +21071,8 @@
- #	* Incorporated att700 from the Boundless Technology FTP site.
- #	* Miscellaneous contact-address and Web-page updates.
- #
-+#-(changelog-beginning-ncurses-4.2)---------------------------------------------
-+#
- # 1998/5/9
- #	* add nxterm and xterm-color terminfo description (request by Cristian
- #	  Gafton <gafton@redhat.com>).
-@@ -21309,6 +21634,51 @@
- #	* add several GNU Screen variations with 16- and 256-colors, and
- #	  status line (Alain Bench).
- #
-+# 2007-03-03
-+#	* add Newbury Data entries (Jean-Charles Billaud).
-+#
-+# 2007-06-10
-+#	* corrected xterm+pcf2 modifiers for F1-F4, match xterm #226 -TD
-+#
-+# 2007-07-14
-+#	* restore section of pre-ncurses-4.2 changelog to fix attribution -TD
-+#	* add konsole-256color entry -TD
-+#
-+# 2007-08-18
-+#	* add 9term entry (request by Juhapekka Tolvanen) -TD
-+#
-+# 2007-10-13
-+#	* correct kIC in rxvt+pcfkeys (prompted by Debian #446444) -TD
-+#	* add shift-control- and control-modified keys for rxvt editing
-+#	  keypad -TD
-+#	* update mlterm entry to 2.9.3 -TD
-+#	* add mlterm+pcfkeys -TD
-+#
-+# 2007-10-20
-+#	* move kLFT, kRIT, kind and kri capabilities from xterm-new to
-+#	  xterm+pcc0, etc., to make the corresponding building blocks reflect
-+#	  xterm's capabilities -TD
-+#	* add mrxvt entry -TD
-+#	* add xterm+r6f2, use in mlterm and mrxvt entries -TD
-+#
-+# 2007-11-03
-+#	* correct acsc strings for h19 and z100 (Benjamin Sittler)
-+#
-+# 2007-11-11
-+#	* use xterm-xf86-v44 for "xterm-xfree86", reflecting changes to
-+#	  xterm starting with patch #216 -TD
-+#	* make legacy xterm entries such as xterm-24 inherit from xterm-old,
-+#	  to match xterm #230 -TD
-+#	* extend xterm+pccX entries to match xterm #230 -TD
-+#	* add xterm+app, xterm+noapp, from xterm #230 -TD
-+#	* add/use xterm+pce2 from xterm #230, in xterm+pcfkeys -TD
-+#
-+# 2008-04-19
-+#	* add screen.rxvt -TD
-+#
-+# 2008-04-28
-+#	* add screen+fkeys (prompted by Debian # 478094) -TD
-+#
- # The following sets edit modes for GNU EMACS.
- # Local Variables:
- # fill-prefix:"\t"
-diff -Naur ncurses-5.6.orig/mk-1st.awk ncurses-5.6/mk-1st.awk
---- ncurses-5.6.orig/mk-1st.awk	2006-10-07 20:14:08.000000000 -0400
-+++ ncurses-5.6/mk-1st.awk	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
--# $Id: mk-1st.awk,v 1.68 2006/10/08 00:14:08 tom Exp $
-+# $Id: mk-1st.awk,v 1.78 2007/03/24 22:10:55 tom Exp $
- ##############################################################################
--# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -37,9 +37,12 @@
- #	model		  (directory into which we compile, e.g., "obj")
- #	prefix		  (e.g., "lib", for Unix-style libraries)
- #	suffix		  (e.g., "_g.a", for debug libraries)
--#	subset		  ("none", "base", "base+ext_funcs" or "termlib")
-+#	subset		  ("none", "base", "base+ext_funcs" or "termlib", etc.)
- #	ShlibVer	  ("rel", "abi" or "auto", to augment DoLinks variable)
- #	ShlibVerInfix ("yes" or "no", determines location of version #)
-+#   TermlibRoot   ("tinfo" or other root for libterm.so)
-+#   TermlibSuffix (".so" or other suffix for libterm.so)
-+#	ReLink		  ("yes", or "no", flag to rebuild shared libs on install)
- #	DoLinks		  ("yes", "reverse" or "no", flag to add symbolic links)
- #	rmSoLocs	  ("yes" or "no", flag to add extra clean target)
- #	ldconfig	  (path for this tool, if used)
-@@ -52,6 +55,64 @@
- #	Mixed-case variable names are ok.
- #	HP/UX requires shared libraries to have executable permissions.
- #
-+function is_ticlib() {
-+		return ( subset ~ /^ticlib$/ );
-+	}
-+function is_termlib() {
-+		return ( subset ~ /^(ticlib\+)?termlib(\+ext_tinfo)?$/ );
-+	}
-+# see lib_name
-+function lib_name_of(a_name) {
-+		return sprintf("%s%s%s", prefix, a_name, suffix)
-+	}
-+# see imp_name
-+function imp_name_of(a_name) {
-+		if (ShlibVerInfix == "cygdll") {
-+			result = sprintf("%s%s%s.a", prefix, a_name, suffix);
-+		} else {
-+			result = "";
-+		}
-+		return result;
-+	}
-+# see abi_name
-+function abi_name_of(a_name) {
-+		if (ShlibVerInfix == "cygdll") {
-+			result = sprintf("%s%s$(ABI_VERSION)%s", "cyg", a_name, suffix);
-+		} else if (ShlibVerInfix == "yes") {
-+			result = sprintf("%s%s.$(ABI_VERSION)%s", prefix, a_name, suffix);
-+		} else {
-+			result = sprintf("%s.$(ABI_VERSION)", lib_name_of(a_name));
-+		}
-+		return result;
-+	}
-+# see rel_name
-+function rel_name_of(a_name) {
-+		if (ShlibVerInfix == "cygdll") {
-+			result = sprintf("%s%s$(REL_VERSION)%s", "cyg", a_name, suffix);
-+		} else if (ShlibVerInfix == "yes") {
-+			result = sprintf("%s%s.$(REL_VERSION)%s", prefix, a_name, suffix);
-+		} else {
-+			result = sprintf("%s.$(REL_VERSION)", lib_name_of(a_name));
-+		}
-+		return result;
-+	}
-+# see end_name
-+function end_name_of(a_name) {
-+		if ( MODEL != "SHARED" ) {
-+			result = lib_name_of(a_name);
-+		} else if ( DoLinks == "reverse") {
-+			result = lib_name_of(a_name);
-+		} else {
-+			if ( ShlibVer == "rel" ) {
-+				result = rel_name_of(a_name);
-+			} else if ( ShlibVer == "abi" || ShlibVer == "cygdll" ) {
-+				result = abi_name_of(a_name);
-+			} else {
-+				result = lib_name_of(a_name);
-+			}
-+		}
-+		return result
-+	}
- function symlink(src,dst) {
- 		if ( src != dst ) {
- 			printf "rm -f %s; ", dst
-@@ -64,19 +125,19 @@
- function removelinks(directory) {
- 		rmlink(directory, end_name);
- 		if ( DoLinks == "reverse" ) {
--				if ( ShlibVer == "rel" ) {
--					rmlink(directory, abi_name);
--					rmlink(directory, rel_name);
--				} else if ( ShlibVer == "abi" ) {
--					rmlink(directory, abi_name);
--				}
-+			if ( ShlibVer == "rel" ) {
-+				rmlink(directory, abi_name);
-+				rmlink(directory, rel_name);
-+			} else if ( ShlibVer == "abi" ) {
-+				rmlink(directory, abi_name);
-+			}
- 		} else {
--				if ( ShlibVer == "rel" ) {
--					rmlink(directory, abi_name);
--					rmlink(directory, lib_name);
--				} else if ( ShlibVer == "abi" ) {
--					rmlink(directory, lib_name);
--				}
-+			if ( ShlibVer == "rel" ) {
-+				rmlink(directory, abi_name);
-+				rmlink(directory, lib_name);
-+			} else if ( ShlibVer == "abi" ) {
-+				rmlink(directory, lib_name);
-+			}
- 		}
- 	}
- function make_shlib(objs, shlib_list) {
-@@ -103,27 +164,53 @@
- 			printf ")\n"
- 		}
- 	}
--function shlib_rule(directory) {
--		if ( ShlibVer == "cygdll" ) {
--				dst_libs = sprintf("%s/$(SHARED_LIB) %s/$(IMPORT_LIB)", directory, directory);
--		} else {
--				dst_libs = sprintf("%s/%s", directory, end_name);
-+# termlib may be named explicitly via "--with-termlib=XXX", which overrides
-+# any suffix.  Temporarily override "suffix" to account for this.
-+function termlib_end_of() {
-+	termlib_save_suffix = suffix;
-+	suffix = TermlibSuffix;
-+	termlib_temp_result = end_name_of(TermlibRoot);
-+	suffix = termlib_save_suffix;
-+	return termlib_temp_result;
-+}
-+function shlib_build(directory) {
-+		dst_libs = sprintf("%s/%s", directory, end_name);
-+		printf "%s : \\\n", dst_libs
-+		printf "\t\t%s \\\n", directory
-+		if (subset ~ /^base/ || subset == "ticlib" ) {
-+			save_suffix = suffix
-+			sub(/^[^.]\./,".",suffix)
-+			if (directory != "../lib") {
-+				printf "\t\t%s/%s \\\n", "../lib", termlib_end_of();
-+			}
-+			printf "\t\t%s/%s \\\n", directory, termlib_end_of();
-+			suffix = save_suffix
- 		}
--		printf "%s : %s $(%s_OBJS)\n", dst_libs, directory, OBJS
-+		printf "\t\t$(%s_OBJS)\n", OBJS
- 		printf "\t@echo linking $@\n"
--		print "\t-@rm -f %s", dst_libs;
--		if ( subset == "termlib" || subset == "termlib+ext_tinfo" ) {
--				make_shlib(OBJS, "TINFO_LIST")
-+		if ( is_ticlib() ) {
-+			make_shlib(OBJS, "TICS_LIST")
-+		} else if ( is_termlib() ) {
-+			make_shlib(OBJS, "TINFO_LIST")
- 		} else {
--				make_shlib(OBJS, "SHLIB_LIST")
-+			make_shlib(OBJS, "SHLIB_LIST")
- 		}
- 		sharedlinks(directory)
- 	}
-+function shlib_install(directory) {
-+		src_lib1 = sprintf("../lib/%s", end_name);
-+		dst_lib1 = sprintf("%s/%s", directory, end_name);
-+		printf "%s : \\\n", dst_lib1
-+		printf "\t\t%s \\\n", directory
-+		printf "\t\t%s\n", src_lib1
-+		printf "\t@echo installing $@\n"
-+		printf "\t$(INSTALL_LIB) %s %s\n", src_lib1, dst_lib1;
-+		sharedlinks(directory)
-+	}
- function install_dll(directory,filename) {
- 		src_name = sprintf("../lib/%s", filename);
- 		dst_name = sprintf("$(DESTDIR)%s/%s", directory, filename);
- 		printf "\t@echo installing %s as %s\n", src_name, dst_name
--		printf "\t-@rm -f %s\n", dst_name
- 		if ( directory == "$(bindir)" ) {
- 			program = "$(INSTALL) -m 755";
- 		} else {
-@@ -153,6 +240,9 @@
- 					printf "#  subset:        %s\n", subset 
- 					printf "#  ShlibVer:      %s\n", ShlibVer 
- 					printf "#  ShlibVerInfix: %s\n", ShlibVerInfix 
-+					printf "#  TermlibRoot:   %s\n", TermlibRoot 
-+					printf "#  TermlibSuffix: %s\n", TermlibSuffix 
-+					printf "#  ReLink:        %s\n", ReLink 
- 					printf "#  DoLinks:       %s\n", DoLinks 
- 					printf "#  rmSoLocs:      %s\n", rmSoLocs 
- 					printf "#  ldconfig:      %s\n", ldconfig 
-@@ -163,7 +253,9 @@
- 				}
- 				using = 1
- 			}
--			if ( subset == "termlib" || subset == "termlib+ext_tinfo" ) {
-+			if ( is_ticlib() ) {
-+				OBJS  = MODEL "_P"
-+			} else if ( is_termlib() ) {
- 				OBJS  = MODEL "_T"
- 			} else {
- 				OBJS  = MODEL
-@@ -205,33 +297,15 @@
- 		if ( found == 1 )
- 		{
- 			print  ""
--			lib_name = sprintf("%s%s%s", prefix, name, suffix)
-+			lib_name = lib_name_of(name);
- 			if ( MODEL == "SHARED" )
- 			{
--				if (ShlibVerInfix == "cygdll") {
--					abi_name = sprintf("%s%s$(ABI_VERSION)%s", "cyg", name, suffix);
--					rel_name = sprintf("%s%s$(REL_VERSION)%s", "cyg", name, suffix);
--					imp_name = sprintf("%s%s%s.a", prefix, name, suffix);
--				} else if (ShlibVerInfix == "yes") {
--					abi_name = sprintf("%s%s.$(ABI_VERSION)%s", prefix, name, suffix);
--					rel_name = sprintf("%s%s.$(REL_VERSION)%s", prefix, name, suffix);
--				} else {
--					abi_name = sprintf("%s.$(ABI_VERSION)", lib_name);
--					rel_name = sprintf("%s.$(REL_VERSION)", lib_name);
--				}
--				if ( DoLinks == "reverse") {
--					end_name = lib_name;
--				} else {
--					if ( ShlibVer == "rel" ) {
--						end_name = rel_name;
--					} else if ( ShlibVer == "abi" || ShlibVer == "cygdll" ) {
--						end_name = abi_name;
--					} else {
--						end_name = lib_name;
--					}
--				}
-+				abi_name = abi_name_of(name);
-+				rel_name = rel_name_of(name);
-+				imp_name = imp_name_of(name);
-+				end_name = end_name_of(name);
- 
--				shlib_rule("../lib")
-+				shlib_build("../lib")
- 
- 				print  ""
- 				print  "install \\"
-@@ -249,7 +323,11 @@
- 					lib_dir = "$(DESTDIR)$(libdir)";
- 					printf "install.%s :: %s/%s\n", name, lib_dir, end_name
- 					print ""
--					shlib_rule(lib_dir)
-+					if ( ReLink == "yes" ) {
-+						shlib_build(lib_dir)
-+					} else {
-+						shlib_install(lib_dir)
-+					}
- 				}
- 
- 				if ( overwrite == "yes" && name == "ncurses" )
-@@ -393,3 +471,4 @@
- 			}
- 		}
- 	}
-+# vile:ts=4 sw=4
-diff -Naur ncurses-5.6.orig/mk-hdr.awk ncurses-5.6/mk-hdr.awk
---- ncurses-5.6.orig/mk-hdr.awk	1969-12-31 19:00:00.000000000 -0500
-+++ ncurses-5.6/mk-hdr.awk	2008-06-18 06:49:44.000000000 -0400
-@@ -0,0 +1,107 @@
-+# $Id: mk-hdr.awk,v 1.2 2007/03/31 15:48:45 tom Exp $
-+##############################################################################
-+# Copyright (c) 2007 Free Software Foundation, Inc.                          #
-+#                                                                            #
-+# Permission is hereby granted, free of charge, to any person obtaining a    #
-+# copy of this software and associated documentation files (the "Software"), #
-+# to deal in the Software without restriction, including without limitation  #
-+# the rights to use, copy, modify, merge, publish, distribute, distribute    #
-+# with modifications, sublicense, and/or sell copies of the Software, and to #
-+# permit persons to whom the Software is furnished to do so, subject to the  #
-+# following conditions:                                                      #
-+#                                                                            #
-+# The above copyright notice and this permission notice shall be included in #
-+# all copies or substantial portions of the Software.                        #
-+#                                                                            #
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,   #
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL    #
-+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER      #
-+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING    #
-+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER        #
-+# DEALINGS IN THE SOFTWARE.                                                  #
-+#                                                                            #
-+# Except as contained in this notice, the name(s) of the above copyright     #
-+# holders shall not be used in advertising or otherwise to promote the sale, #
-+# use or other dealings in this Software without prior written               #
-+# authorization.                                                             #
-+##############################################################################
-+#
-+# Author: Thomas E. Dickey	2007
-+#
-+# Generate install/uninstall rules for header files
-+# Variables:
-+#	subset	  ("none", "base", "base+ext_funcs" or "termlib", etc.)
-+#	compat	  ("yes" or "no", flag to add link to curses.h
-+#
-+function basename(path) {
-+	sub(/^.*\//,"",path)
-+	return path;
-+}
-+BEGIN	{
-+		found = 0
-+		using = 1
-+		count = 0
-+	}
-+	/^@/ {
-+		using = 0
-+		if (subset == "none") {
-+			using = 1
-+		} else if (index(subset,$2) > 0) {
-+			using = 1
-+		} else {
-+			using = 0
-+		}
-+	}
-+	/^[@#]/ {
-+		next
-+	}
-+	{
-+		if (using && NF != 0) {
-+			if (found == 0) {
-+				print  ""
-+				print  "# generated by mk-hdr.awk"
-+				printf "#  subset:     %s\n", subset 
-+				printf "#  compat:     %s\n", compat 
-+				print  ""
-+				found = 1
-+			}
-+			data[count] = $1
-+			count = count + 1
-+		}
-+	}
-+END	{
-+		if ( count > 0 )
-+		{
-+			print "${DESTDIR}${includedir} :"
-+			print "	sh ${srcdir}/../mkdirs.sh $@"
-+			print ""
-+			print "install \\"
-+			print "install.libs \\"
-+			print "install.includes :: ${AUTO_SRC} ${DESTDIR}${includedir} \\"
-+
-+			for (i = 0; i < count - 1; ++i) {
-+				printf "		%s \\\n", data[i]
-+			}
-+			printf "		%s\n", data[count - 1]
-+
-+			for (i = 0; i < count; ++i) {
-+				printf "	@ (cd ${DESTDIR}${includedir} && rm -f %s) ; ../headers.sh ${INSTALL_DATA} ${DESTDIR}${includedir} ${srcdir} %s\n", basename(data[i]), data[i]
-+				if (data[i] == "curses.h" && compat == "yes") {
-+					printf "	@ (cd ${DESTDIR}${includedir} && rm -f ncurses.h && ${LN_S} %s ncurses.h)\n", data[i]
-+				}
-+			}
-+			print ""
-+			print "uninstall \\"
-+			print "uninstall.libs \\"
-+			print "uninstall.includes ::"
-+
-+			for (i = 0; i < count; ++i) {
-+				printf "	-@ (cd ${DESTDIR}${includedir} && rm -f %s)\n", basename(data[i])
-+				if (data[i] == "curses.h" && compat == "yes") {
-+					printf "	-@ (cd ${DESTDIR}${includedir} && rm -f ncurses.h)\n"
-+				}
-+			}
-+		}
-+	}
-+# vile:ts=4 sw=4
-diff -Naur ncurses-5.6.orig/mkdirs.sh ncurses-5.6/mkdirs.sh
---- ncurses-5.6.orig/mkdirs.sh	1969-12-31 19:00:00.000000000 -0500
-+++ ncurses-5.6/mkdirs.sh	2008-06-18 06:49:44.000000000 -0400
-@@ -0,0 +1,51 @@
-+#! /bin/sh
-+# $Id: mkdirs.sh,v 1.5 2007/03/25 22:29:46 tom Exp $
-+# -----------------------------------------------------------------------------
-+# mkinstalldirs --- make directory hierarchy
-+# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-+# Created: 1993-05-16
-+# Last modified: 1994-03-25
-+# Public domain
-+# -----------------------------------------------------------------------------
-+
-+errstatus=0
-+umask 022
-+
-+for file in ${1+"$@"} ; do
-+   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-+   shift
-+
-+   pathcomp=
-+   for d in ${1+"$@"} ; do
-+     pathcomp="$pathcomp$d"
-+     case "$pathcomp" in
-+       -* ) pathcomp=./$pathcomp ;;
-+     esac
-+
-+     if test ! -d "$pathcomp"; then
-+        echo "mkdir $pathcomp" 1>&2
-+        case "$pathcomp" in
-+          [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]: )
-+            ;;               # DOSISH systems
-+          * )
-+            mkdir "$pathcomp"
-+            errstatus=$?
-+            if test $errstatus != 0
-+            then
-+               # may have failed if invoked in a parallel "make -j# install"
-+               if test -d "$pathcomp"
-+               then
-+                  errstatus=0
-+               fi
-+            fi
-+            ;;
-+        esac
-+     fi
-+
-+     pathcomp="$pathcomp/"
-+   done
-+done
-+
-+exit $errstatus
-+
-+# mkinstalldirs ends here
-diff -Naur ncurses-5.6.orig/mkinstalldirs ncurses-5.6/mkinstalldirs
---- ncurses-5.6.orig/mkinstalldirs	2002-06-29 14:52:57.000000000 -0400
-+++ ncurses-5.6/mkinstalldirs	1969-12-31 19:00:00.000000000 -0500
-@@ -1,38 +0,0 @@
--#! /bin/sh
--# mkinstalldirs --- make directory hierarchy
--# Author: Noah Friedman <friedman@prep.ai.mit.edu>
--# Created: 1993-05-16
--# Last modified: 1994-03-25
--# Public domain
--#
--
--errstatus=0
--umask 022
--
--for file in ${1+"$@"} ; do
--   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
--   shift
--
--   pathcomp=
--   for d in ${1+"$@"} ; do
--     pathcomp="$pathcomp$d"
--     case "$pathcomp" in
--       -* ) pathcomp=./$pathcomp ;;
--     esac
--
--     if test ! -d "$pathcomp"; then
--        echo "mkdir $pathcomp" 1>&2
--        case "$pathcomp" in
--          [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]: )
--                ;;               # DOSISH systems
--          * )          mkdir "$pathcomp" || errstatus=$? ;;
--        esac
--     fi
--
--     pathcomp="$pathcomp/"
--   done
--done
--
--exit $errstatus
--
--# mkinstalldirs ends here
-diff -Naur ncurses-5.6.orig/ncurses/Makefile.in ncurses-5.6/ncurses/Makefile.in
---- ncurses-5.6.orig/ncurses/Makefile.in	2006-10-14 15:08:11.000000000 -0400
-+++ ncurses-5.6/ncurses/Makefile.in	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
--# $Id: Makefile.in,v 1.101 2006/10/14 19:08:11 tom Exp $
-+# $Id: Makefile.in,v 1.112 2007/09/01 20:45:53 tom Exp $
- ##############################################################################
--# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -112,12 +112,13 @@
- 
- CFLAGS_DEFAULT	= $(CFLAGS_@DFT_UPR_MODEL@)
- 
--LINK		= $(LIBTOOL) $(CC)
-+LINK		= $(LIBTOOL)
- LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
- 
- SHLIB_DIRS	= -L../lib
- SHLIB_LIST	= $(SHLIB_DIRS) @SHLIB_LIST@
- TINFO_LIST	= $(SHLIB_DIRS) @TINFO_LIST@
-+TICS_LIST	= $(SHLIB_DIRS) @TICS_LIST@
- 
- MK_SHARED_LIB	= @MK_SHARED_LIB@
- 
-@@ -128,8 +129,6 @@
- 
- RANLIB		= @LIB_PREP@
- 
--IMPORT_LIB	= @IMPORT_LIB@
--SHARED_LIB	= @SHARED_LIB@
- LIBRARIES	= @LIBS_TO_MAKE@
- 
- LINT		= @LINT@
-@@ -138,6 +137,7 @@
- 
- FALLBACK_LIST	= @FALLBACK_LIST@
- 
-+USE_BIG_STRINGS	= @USE_BIG_STRINGS@
- TERMINFO_CAPS	= $(top_srcdir)/include/@TERMINFO_CAPS@
- 
- AUTO_SRC = \
-@@ -151,11 +151,10 @@
- 	./names.c \
- 	./unctrl.c \
- 	init_keytry.h \
--	keys.list \
--	names-stamp
-+	keys.list
- 
- TEST_DEPS	= ../lib/@LIB_PREFIX@ncurses@DFT_DEP_SUFFIX@
--TEST_ARGS	= -L../lib -lncurses@DFT_ARG_SUFFIX@
-+TEST_ARGS	= @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@ 
- TEST_LDFLAGS	= @LD_MODEL@ $(TEST_ARGS) @LIBS@ @LOCAL_LDFLAGS@ @LDFLAGS@
- 
- TEST_PROGS = \
-@@ -179,7 +178,7 @@
- 
- $(DESTDIR)$(bindir) \
- $(DESTDIR)$(libdir) :
--	sh $(srcdir)/../mkinstalldirs $@
-+	sh $(srcdir)/../mkdirs.sh $@
- 
- ../lib : ; mkdir $@
- 
-@@ -197,7 +196,7 @@
- 
- make_keys$(BUILD_EXEEXT) : \
- 		$(tinfo)/make_keys.c \
--		names-stamp
-+		names.c
- 	$(BUILD_CC) -o $@ $(BUILD_CCFLAGS) $(tinfo)/make_keys.c $(BUILD_LDFLAGS) $(BUILD_LIBS)
- 
- make_hash$(BUILD_EXEEXT) : \
-@@ -211,27 +210,21 @@
- ./comp_captab.c: \
- 		make_hash$(BUILD_EXEEXT) \
- 		../include/hashsize.h \
-+		$(tinfo)/MKcaptab.sh \
- 		$(tinfo)/MKcaptab.awk
--	sh $(tinfo)/MKcaptab.awk $(AWK) $(srcdir)/../include/@TERMINFO_CAPS@ > $@
-+	sh $(tinfo)/MKcaptab.sh $(AWK) $(USE_BIG_STRINGS) $(tinfo)/MKcaptab.awk $(srcdir)/../include/@TERMINFO_CAPS@ > $@
- 
- ./lib_keyname.c: keys.list $(base)/MKkeyname.awk
--	$(AWK) -f $(base)/MKkeyname.awk keys.list > $@
-+	$(AWK) -f $(base)/MKkeyname.awk bigstrings=$(USE_BIG_STRINGS) keys.list > $@
- 
--names-stamp: $(tinfo)/MKnames.awk
--	$(AWK) -f $(tinfo)/MKnames.awk $(srcdir)/../include/@TERMINFO_CAPS@
--	cat namehdr boolnames boolfnames numnames numfnames strnames strfnames nameftr >names.c
--	cat namehdr boolcodes numcodes strcodes codeftr >codes.c
--	-rm -f namehdr nameftr codeftr boolnames boolfnames boolcodes numnames numfnames numcodes strnames strfnames strcodes
--	@echo >$@
-+./codes.c: $(tinfo)/MKcodes.awk
-+	$(AWK) -f $(tinfo)/MKcodes.awk bigstrings=$(USE_BIG_STRINGS) $(srcdir)/../include/@TERMINFO_CAPS@ >$@
- 
--./names.c: names-stamp
--	@echo made $@
--
--./codes.c: names-stamp
--	@echo made $@
-+./names.c: $(tinfo)/MKnames.awk
-+	$(AWK) -f $(tinfo)/MKnames.awk bigstrings=$(USE_BIG_STRINGS) $(srcdir)/../include/@TERMINFO_CAPS@ >$@
- 
- ./unctrl.c: $(base)/MKunctrl.awk
--	echo | $(AWK) -f $(base)/MKunctrl.awk >$@
-+	echo | $(AWK) -f $(base)/MKunctrl.awk bigstrings=$(USE_BIG_STRINGS) >$@
- 
- tags:
- 	ctags *.[ch] */*.[ch]
-@@ -267,17 +260,17 @@
- 	sh $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" implemented <../include/curses.h >$@
- 
- captoinfo$x : $(tinfo)/captoinfo.c $(TEST_DEPS)
--	@ECHO_LINK@ $(CC) -o $@ $(CFLAGS_DEFAULT) -DMAIN $(tinfo)/captoinfo.c $(TEST_LDFLAGS)
-+	@ECHO_LINK@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DMAIN $(tinfo)/captoinfo.c $(TEST_LDFLAGS)
- 
- hardscroll$x : $(serial)/hardscroll.c $(TEST_DEPS)
--	@ECHO_LINK@ $(CC) -o $@ $(CFLAGS_DEFAULT) -DSCROLLDEBUG $(serial)/hardscroll.c $(TEST_LDFLAGS)
-+	@ECHO_LINK@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DSCROLLDEBUG $(serial)/hardscroll.c $(TEST_LDFLAGS)
- 
--hashmap$x : $(serial)/hashmap.c $(TEST_DEPS)
--	@ECHO_LINK@ $(CC) -o $@ $(CFLAGS_DEFAULT) -DHASHDEBUG $(serial)/hashmap.c $(TEST_LDFLAGS)
-+hashmap$x : $(serial)/hashmap.c $(serial)/hardscroll.c $(TEST_DEPS)
-+	@ECHO_LINK@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DHASHDEBUG $(serial)/hashmap.c $(serial)/hardscroll.c $(TEST_LDFLAGS)
- 
- lib_mvcur$x : $(serial)/lib_mvcur.c $(TEST_DEPS) \
- 		../@DFT_OBJ_SUBDIR@/dump_entry$o
--	@ECHO_LINK@ $(CC) -o $@ $(CFLAGS_DEFAULT) -DNCURSES_TEST -I$(serial)/../../progs $(serial)/lib_mvcur.c ../@DFT_OBJ_SUBDIR@/dump_entry$o $(TEST_LDFLAGS)
-+	@ECHO_LINK@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DNCURSES_TEST -I$(serial)/../../progs $(serial)/lib_mvcur.c ../@DFT_OBJ_SUBDIR@/dump_entry$o $(TEST_LDFLAGS)
- 
- link_test$x : ./link_test.c $(TEST_DEPS) \
- 		../@DFT_OBJ_SUBDIR@/link_test$o
-diff -Naur ncurses-5.6.orig/ncurses/base/MKkeyname.awk ncurses-5.6/ncurses/base/MKkeyname.awk
---- ncurses-5.6.orig/ncurses/base/MKkeyname.awk	2006-05-20 13:35:30.000000000 -0400
-+++ ncurses-5.6/ncurses/base/MKkeyname.awk	2008-06-18 06:49:51.000000000 -0400
-@@ -1,6 +1,6 @@
--# $Id: MKkeyname.awk,v 1.30 2006/05/20 17:35:30 tom Exp $
-+# $Id: MKkeyname.awk,v 1.39 2008/05/31 19:54:58 tom Exp $
- ##############################################################################
--# Copyright (c) 1999-2005,2006 Free Software Foundation, Inc.                #
-+# Copyright (c) 1999-2007,2008 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -33,20 +33,41 @@
- 	print "#include <tic.h>"
- 	print "#include <term_entry.h>"
- 	print ""
--	print "const struct kn _nc_key_names[] = {"
-+	first = 1;
- }
- 
- /^[^#]/ {
--	printf "\t{ \"%s\", %s },\n", $1, $1;
-+		if (bigstrings) {
-+			if (first)  {
-+				print "struct kn { short offset; int code; };"
-+				print "static const struct kn _nc_key_names[] = {"
-+			}
-+			printf "\t{ %d, %s },\n", offset, $1
-+			offset += length($1) + 1
-+			names = names"\n\t\""$1"\\0\""
-+		} else {
-+			if (first) {
-+				print "struct kn { const char *name; int code; };"
-+				print "static const struct kn _nc_key_names[] = {"
-+			}
-+			printf "\t{ \"%s\", %s },\n", $1, $1;
-+		}
-+		first = 0;
- 	}
- 
- END {
--	printf "\t{ 0, 0 }};\n"
-+	if (bigstrings) {
-+		printf "\t{ -1, 0 }};\n"
-+		print ""
-+		print "static const char key_names[] = "names";"
-+	} else {
-+		printf "\t{ 0, 0 }};\n"
-+	}
- 	print ""
- 	print "#define SIZEOF_TABLE 256"
--	print "static char **keyname_table;"
-+	print "#define MyTable _nc_globals.keyname_table"
- 	print ""
--	print "NCURSES_EXPORT(NCURSES_CONST char *) keyname (int c)"
-+	print "NCURSES_EXPORT(NCURSES_CONST char *) _nc_keyname (SCREEN *sp, int c)"
- 	print "{"
- 	print "	int i;"
- 	print "	char name[20];"
-@@ -56,21 +77,30 @@
- 	print "	if (c == -1) {"
- 	print "		result = \"-1\";"
- 	print "	} else {"
--	print "		for (i = 0; _nc_key_names[i].name != 0; i++) {"
--	print "			if (_nc_key_names[i].code == c) {"
--	print "				result = (NCURSES_CONST char *)_nc_key_names[i].name;"
--	print "				break;"
--	print "			}"
--	print "		}"
-+	if (bigstrings) {
-+		print "		for (i = 0; _nc_key_names[i].offset != -1; i++) {"
-+		print "			if (_nc_key_names[i].code == c) {"
-+		print "				result = (NCURSES_CONST char *)key_names + _nc_key_names[i].offset;"
-+		print "				break;"
-+		print "			}"
-+		print "		}"
-+	} else {
-+		print "		for (i = 0; _nc_key_names[i].name != 0; i++) {"
-+		print "			if (_nc_key_names[i].code == c) {"
-+		print "				result = (NCURSES_CONST char *)_nc_key_names[i].name;"
-+		print "				break;"
-+		print "			}"
-+		print "		}"
-+	}
- 	print ""
- 	print "		if (result == 0 && (c >= 0 && c < SIZEOF_TABLE)) {"
--	print "			if (keyname_table == 0)"
--	print "				keyname_table = typeCalloc(char *, SIZEOF_TABLE);"
--	print "			if (keyname_table != 0) {"
--	print "				if (keyname_table[c] == 0) {"
-+	print "			if (MyTable == 0)"
-+	print "				MyTable = typeCalloc(char *, SIZEOF_TABLE);"
-+	print "			if (MyTable != 0) {"
-+	print "				if (MyTable[c] == 0) {"
- 	print "					int cc = c;"
- 	print "					p = name;"
--	print "					if (cc >= 128) {"
-+	print "					if (cc >= 128 && (sp == 0 || sp->_use_meta)) {"
- 	print "						strcpy(p, \"M-\");"
- 	print "						p += 2;"
- 	print "						cc -= 128;"
-@@ -81,9 +111,9 @@
- 	print "						strcpy(p, \"^?\");"
- 	print "					else"
- 	print "						sprintf(p, \"%c\", cc);"
--	print "					keyname_table[c] = strdup(name);"
-+	print "					MyTable[c] = strdup(name);"
- 	print "				}"
--	print "				result = keyname_table[c];"
-+	print "				result = MyTable[c];"
- 	print "			}"
- 	print "#if NCURSES_EXT_FUNCS && NCURSES_XNAMES"
- 	print "		} else if (result == 0 && cur_term != 0) {"
-@@ -111,24 +141,20 @@
- 	print "	return result;"
- 	print "}"
- 	print ""
--	print "#if USE_WIDEC_SUPPORT"
--	print "NCURSES_EXPORT(NCURSES_CONST char *) key_name (wchar_t c)"
-+	print "NCURSES_EXPORT(NCURSES_CONST char *) keyname (int c)"
- 	print "{"
--	print "	NCURSES_CONST char *result = keyname((int)c);"
--	print "	if (!strncmp(result, \"M-\", 2)) result = 0;"
--	print "	return result;"
-+	print "\treturn _nc_keyname(SP, c);"
- 	print "}"
--	print "#endif"
- 	print ""
- 	print "#if NO_LEAKS"
- 	print "void _nc_keyname_leaks(void)"
- 	print "{"
- 	print "	int j;"
--	print "	if (keyname_table != 0) {"
-+	print "	if (MyTable != 0) {"
- 	print "		for (j = 0; j < SIZEOF_TABLE; ++j) {"
--	print "			FreeIfNeeded(keyname_table[j]);"
-+	print "			FreeIfNeeded(MyTable[j]);"
- 	print "		}"
--	print "		FreeAndNull(keyname_table);"
-+	print "		FreeAndNull(MyTable);"
- 	print "	}"
- 	print "}"
- 	print "#endif /* NO_LEAKS */"
-diff -Naur ncurses-5.6.orig/ncurses/base/MKlib_gen.sh ncurses-5.6/ncurses/base/MKlib_gen.sh
---- ncurses-5.6.orig/ncurses/base/MKlib_gen.sh	2006-07-01 17:25:39.000000000 -0400
-+++ ncurses-5.6/ncurses/base/MKlib_gen.sh	2008-06-18 06:49:45.000000000 -0400
-@@ -2,10 +2,10 @@
- #
- # MKlib_gen.sh -- generate sources from curses.h macro definitions
- #
--# ($Id: MKlib_gen.sh,v 1.27 2006/07/01 21:25:39 tom Exp $)
-+# ($Id: MKlib_gen.sh,v 1.30 2008/01/05 23:21:10 tom Exp $)
- #
- ##############################################################################
--# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -62,7 +62,7 @@
- if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
- if test "${LC_COLLATE+set}"  = set; then LC_COLLATE=C;  export LC_COLLATE;  fi
- 
--preprocessor="$1 -I../include"
-+preprocessor="$1 -DNCURSES_INTERNALS -I../include"
- AWK="$2"
- USE="$3"
- 
-@@ -406,7 +406,11 @@
- | sed -e 's/NCURSES_EXPORT(\(.*\)) \(.*\) (\(.*\))/\1 \2(\3)/' \
- | sed -f $ED2 \
- | $AWK -f $AW1 using=$USE \
--| sed -e 's/^\([a-z_][a-z_]*[ *]*\)/\1 gen_/' -e 's/  / /g' >>$TMP
-+| sed \
-+	-e 's/ [ ]*$//g' \
-+	-e 's/^\([a-zA-Z_][a-zA-Z_]*[ *]*\)/\1 gen_/' \
-+	-e 's/gen_$//' \
-+	-e 's/  / /g' >>$TMP
- 
- $preprocessor $TMP 2>/dev/null \
- | sed \
-@@ -418,4 +422,5 @@
- | sed \
- 	-e 's/^.*T_CALLED.*returnCode( \([a-z].*) \));/	return \1;/' \
- 	-e 's/^.*T_CALLED.*returnCode( \((wmove.*) \));/	return \1;/' \
-+	-e 's/gen_//' \
- | sed -f $ED4
-diff -Naur ncurses-5.6.orig/ncurses/base/MKunctrl.awk ncurses-5.6/ncurses/base/MKunctrl.awk
---- ncurses-5.6.orig/ncurses/base/MKunctrl.awk	2005-12-17 17:48:37.000000000 -0500
-+++ ncurses-5.6/ncurses/base/MKunctrl.awk	2008-06-18 06:49:51.000000000 -0400
-@@ -1,6 +1,6 @@
--# $Id: MKunctrl.awk,v 1.11 2005/12/17 22:48:37 tom Exp $
-+# $Id: MKunctrl.awk,v 1.22 2008/05/31 19:36:11 tom Exp $
- ##############################################################################
--# Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -27,81 +27,164 @@
- # authorization.                                                             #
- ##############################################################################
- #
--# Author: Thomas E. Dickey <dickey@clark.net> 1997
-+# Author: Thomas E. Dickey (1997-on)
- #
- 
- BEGIN	{
- 		print "/* generated by MKunctrl.awk */"
- 		print ""
- 		print "#include <curses.priv.h>"
-+		print "#include <ctype.h>"
-+		print ""
-+		print "#if USE_WIDEC_SUPPORT"
-+		print "#if HAVE_WCTYPE_H"
-+		print "#include <wctype.h>"
-+		print "#endif"
-+		print "#endif"
- 		print ""
- 		print "#undef unctrl"
- 		print ""
- 	}
- END	{
--		print "NCURSES_EXPORT(NCURSES_CONST char *) unctrl (register chtype ch)"
-+		print "NCURSES_EXPORT(NCURSES_CONST char *) _nc_unctrl (SCREEN *sp, chtype ch)"
- 		print "{"
- 
--		printf "static const char* const table[] = {"
-+		blob=""
-+		offset=0
-+		if (bigstrings) {
-+			printf "static const short unctrl_table[] = {"
-+		} else {
-+			printf "static const char* const unctrl_table[] = {"
-+		}
- 		for ( ch = 0; ch < 256; ch++ ) {
- 			gap = ","
--			if ((ch % 8) == 0)
-+			part=""
-+			if ((ch % 8) == 0) {
- 				printf "\n    "
-+				if (ch != 0)
-+					blob = blob "\""
-+				blob = blob "\n    \""
-+			}
-+			if (bigstrings)
-+				printf "%4d%s", offset, gap;
- 			if (ch < 32) {
--				printf "\"^\\%03o\"", ch + 64
-+				part = sprintf ("^\\%03o", ch + 64);
-+				offset = offset + 3;
- 			} else if (ch == 127) {
--				printf "\"^?\""
-+				part = "^?";
-+				offset = offset + 3;
- 			} else if (ch >= 128 && ch < 160) {
--				printf "\"~\\%03o\"", ch - 64
-+				part = sprintf("~\\%03o", ch - 64);
-+				offset = offset + 3;
-+			} else if (ch == 255) {
-+				part = "~?";
-+				offset = offset + 3;
-+			} else if (ch >= 160) {
-+				part = sprintf("M-\\%03o", ch - 128);
-+				offset = offset + 4;
- 			} else {
--				printf "\"\\%03o\"", ch
- 				gap = gap " "
-+				part = sprintf("\\%03o", ch);
-+				offset = offset + 2;
- 			}
- 			if (ch == 255)
- 				gap = "\n"
- 			else if (((ch + 1) % 8) != 0)
- 				gap = gap " "
--			printf "%s", gap
-+			if (bigstrings) {
-+				blob = blob part "\\0";
-+			} else {
-+				printf "\"%s\"%s", part, gap
-+			}
- 		}
- 		print "};"
-+		blob = blob "\"";
- 
- 		print ""
--		print "#if NCURSES_EXT_FUNCS"
--		printf "static const char* const table2[] = {"
--		for ( ch = 128; ch < 160; ch++ ) {
-+		if (bigstrings) {
-+			blob = blob "\n/* printable values in 128-255 range */"
-+			printf "static const short unctrl_c1[] = {"
-+		} else {
-+			printf "static const char* const unctrl_c1[] = {"
-+		}
-+		for ( ch = 128; ch < 256; ch++ ) {
- 			gap = ","
--			if ((ch % 8) == 0)
-+			if ((ch % 8) == 0) {
-+				if (ch != 128)
-+					blob = blob "\""
- 				printf "\n    "
--			if (ch >= 128 && ch < 160) {
--				printf "\"\\%03o\"", ch
--				gap = gap " "
-+				blob = blob "\n    \""
-+			}
-+			if (bigstrings) {
-+				printf "%4d%s", offset, gap;
-+				part = sprintf("\\%03o\\0", ch);
-+				blob = blob part
-+				offset = offset + 2;
-+				if (((ch + 1) % 8) != 0)
-+					gap = gap " "
-+			} else {
-+				if (ch >= 128) {
-+					printf "\"\\%03o\"", ch
-+					gap = gap " "
-+				}
-+				if (ch == 255)
-+					gap = "\n"
-+				else if (((ch + 1) % 8) != 0)
-+					gap = gap " "
-+				printf "%s", gap
- 			}
--			if (ch == 255)
--				gap = "\n"
--			else if (((ch + 1) % 8) != 0)
--				gap = gap " "
--			printf "%s", gap
- 		}
- 		print "};"
--		print "#endif /* NCURSES_EXT_FUNCS */"
-+		blob = blob "\"\n"
- 
- 		print ""
--		print "\tint check = ChCharOf(ch);"
--		print "\tconst char *result;"
--		print ""
--		print "\tif (check >= 0 && check < (int)SIZEOF(table)) {"
--		print "#if NCURSES_EXT_FUNCS"
--		print "\t\tif ((SP != 0)"
--		print "\t\t && (SP->_legacy_coding > 1)"
--		print "\t\t && (check >= 128)"
--		print "\t\t && (check < 160))"
--		print "\t\t\tresult = table2[check - 128];"
--		print "\t\telse"
--		print "#endif /* NCURSES_EXT_FUNCS */"
--		print "\t\t\tresult = table[check];"
--		print "\t} else {"
--		print "\t\tresult = 0;"
--		print "\t}"
--		print "\treturn (NCURSES_CONST char *)result;"
--		print "}"
-+		if (bigstrings) {
-+			print "static const char unctrl_blob[] = "blob";"
-+			print ""
-+			stringname = "unctrl_blob + unctrl"
-+		} else {
-+			stringname = "unctrl"
-+		}
-+		print  "\tint check = ChCharOf(ch);"
-+		print  "\tconst char *result;"
-+		print  ""
-+		print  "\tif (check >= 0 && check < (int)SIZEOF(unctrl_table)) {"
-+		print  "#if NCURSES_EXT_FUNCS"
-+		print  "\t\tif ((sp != 0)"
-+		print  "\t\t && (sp->_legacy_coding > 1)"
-+		print  "\t\t && (check >= 128)"
-+		print  "\t\t && (check < 160))"
-+		printf "\t\t\tresult = %s_c1[check - 128];\n", stringname;
-+		print  "\t\telse"
-+		print  "#if USE_WIDEC_SUPPORT"
-+		print  "\t\tif ((check >= 160)"
-+		print  "\t\t && (check < 256)"
-+		print  "\t\t && ((sp != 0)"
-+		print  "\t\t  && ((sp->_legacy_coding > 0)"
-+		print  "\t\t   || (sp->_legacy_coding == 0"
-+		print  "\t\t       && (isprint(check) || iswprint(check))))))"
-+		printf "\t\t\tresult = %s_c1[check - 128];\n", stringname;
-+		print  "\t\telse"
-+		print  "#else"
-+		print  "\t\tif ((check >= 160)"
-+		print  "\t\t && (check < 256)"
-+		print  "\t\t && ((sp != 0)"
-+		print  "\t\t  && ((sp->_legacy_coding > 0)"
-+		print  "\t\t   || (sp->_legacy_coding == 0"
-+		print  "\t\t       && isprint(check)))))"
-+		printf "\t\t\tresult = %s_c1[check - 128];\n", stringname;
-+		print  "\t\telse"
-+		print  "#endif /* USE_WIDEC_SUPPORT */"
-+		print  "#endif /* NCURSES_EXT_FUNCS */"
-+		printf "\t\t\tresult = %s_table[check];\n", stringname;
-+		print  "\t} else {"
-+		print  "\t\tresult = 0;"
-+		print  "\t}"
-+		print  "\treturn (NCURSES_CONST char *)result;"
-+		print  "}"
-+		print  ""
-+		print  "NCURSES_EXPORT(NCURSES_CONST char *) unctrl (chtype ch)"
-+		print  "{"
-+		print  "\treturn _nc_unctrl(SP, ch);"
-+		print  "}"
- 	}
-diff -Naur ncurses-5.6.orig/ncurses/base/define_key.c ncurses-5.6/ncurses/base/define_key.c
---- ncurses-5.6.orig/ncurses/base/define_key.c	2006-06-17 14:19:48.000000000 -0400
-+++ ncurses-5.6/ncurses/base/define_key.c	2008-06-18 06:49:44.000000000 -0400
-@@ -32,7 +32,7 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: define_key.c,v 1.10 2006/06/17 18:19:48 tom Exp $")
-+MODULE_ID("$Id: define_key.c,v 1.13 2006/12/30 23:23:31 tom Exp $")
- 
- NCURSES_EXPORT(int)
- define_key(const char *str, int keycode)
-@@ -43,16 +43,21 @@
-     if (SP == 0) {
- 	code = ERR;
-     } else if (keycode > 0) {
-+	unsigned ukey = (unsigned) keycode;
-+
- 	if (str != 0) {
- 	    define_key(str, 0);
- 	} else if (has_key(keycode)) {
--	    while (_nc_remove_key(&(SP->_keytry), (unsigned) keycode))
-+	    while (_nc_remove_key(&(SP->_keytry), ukey))
- 		code = OK;
- 	}
- 	if (str != 0) {
- 	    if (key_defined(str) == 0) {
--		(void) _nc_add_to_try(&(SP->_keytry), str, (unsigned) keycode);
--		code = OK;
-+		if (_nc_add_to_try(&(SP->_keytry), str, ukey) == OK) {
-+		    code = OK;
-+		} else {
-+		    code = ERR;
-+		}
- 	    } else {
- 		code = ERR;
- 	    }
-diff -Naur ncurses-5.6.orig/ncurses/base/key_defined.c ncurses-5.6/ncurses/base/key_defined.c
---- ncurses-5.6.orig/ncurses/base/key_defined.c	2003-05-17 19:12:27.000000000 -0400
-+++ ncurses-5.6/ncurses/base/key_defined.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2003 Free Software Foundation, Inc.                        *
-+ * Copyright (c) 2003,2006 Free Software Foundation, Inc.                   *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -32,26 +32,27 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: key_defined.c,v 1.3 2003/05/17 23:12:27 tom Exp $")
-+MODULE_ID("$Id: key_defined.c,v 1.6 2006/12/30 23:22:55 tom Exp $")
- 
- static int
--find_definition(struct tries *tree, const char *str)
-+find_definition(TRIES * tree, const char *str)
- {
--    struct tries *ptr;
--    int result = 0;
-+    TRIES *ptr;
-+    int result = OK;
- 
-     if (str != 0 && *str != '\0') {
- 	for (ptr = tree; ptr != 0; ptr = ptr->sibling) {
- 	    if (UChar(*str) == UChar(ptr->ch)) {
- 		if (str[1] == '\0' && ptr->child != 0) {
--		    result = -1;
--		} else if ((result = find_definition(ptr->child, str + 1)) == 0) {
-+		    result = ERR;
-+		} else if ((result = find_definition(ptr->child, str + 1))
-+			   == OK) {
- 		    result = ptr->value;
- 		} else if (str[1] == '\0') {
--		    result = -1;
-+		    result = ERR;
- 		}
- 	    }
--	    if (result != 0)
-+	    if (result != OK)
- 		break;
- 	}
-     }
-@@ -60,7 +61,8 @@
- 
- /*
-  * Returns the keycode associated with the given string.  If none is found,
-- * return 0.  If the string is only a prefix to other strings, return -1.
-+ * return OK.  If the string is only a prefix to other strings, return ERR.
-+ * Otherwise, return the keycode's value (neither OK/ERR).
-  */
- NCURSES_EXPORT(int)
- key_defined(const char *str)
-diff -Naur ncurses-5.6.orig/ncurses/base/keyok.c ncurses-5.6/ncurses/base/keyok.c
---- ncurses-5.6.orig/ncurses/base/keyok.c	2006-06-17 14:18:43.000000000 -0400
-+++ ncurses-5.6/ncurses/base/keyok.c	2008-06-18 06:49:44.000000000 -0400
-@@ -27,12 +27,12 @@
-  ****************************************************************************/
- 
- /****************************************************************************
-- *  Author: Thomas E. Dickey <dickey@clark.net> 1997                        *
-+ *  Author: Thomas E. Dickey            1997-on                             *
-  ****************************************************************************/
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: keyok.c,v 1.6 2006/06/17 18:18:43 tom Exp $")
-+MODULE_ID("$Id: keyok.c,v 1.7 2006/12/30 16:22:33 tom Exp $")
- 
- /*
-  * Enable (or disable) ncurses' interpretation of a keycode by adding (or
-@@ -57,18 +57,20 @@
- 	if (flag) {
- 	    while ((s = _nc_expand_try(SP->_key_ok, ch, &count, 0)) != 0
- 		   && _nc_remove_key(&(SP->_key_ok), ch)) {
--		_nc_add_to_try(&(SP->_keytry), s, ch);
-+		code = _nc_add_to_try(&(SP->_keytry), s, ch);
- 		free(s);
--		code = OK;
- 		count = 0;
-+		if (code != OK)
-+		    break;
- 	    }
- 	} else {
- 	    while ((s = _nc_expand_try(SP->_keytry, ch, &count, 0)) != 0
- 		   && _nc_remove_key(&(SP->_keytry), ch)) {
--		_nc_add_to_try(&(SP->_key_ok), s, ch);
-+		code = _nc_add_to_try(&(SP->_key_ok), s, ch);
- 		free(s);
--		code = OK;
- 		count = 0;
-+		if (code != OK)
-+		    break;
- 	    }
- 	}
-     }
-diff -Naur ncurses-5.6.orig/ncurses/base/lib_addch.c ncurses-5.6/ncurses/base/lib_addch.c
---- ncurses-5.6.orig/ncurses/base/lib_addch.c	2006-10-14 16:31:19.000000000 -0400
-+++ ncurses-5.6/ncurses/base/lib_addch.c	2008-06-18 06:49:50.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -36,7 +36,7 @@
- #include <curses.priv.h>
- #include <ctype.h>
- 
--MODULE_ID("$Id: lib_addch.c,v 1.104 2006/10/14 20:31:19 tom Exp $")
-+MODULE_ID("$Id: lib_addch.c,v 1.112 2008/05/17 19:08:40 Miroslav.Lichvar Exp $")
- 
- static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
- 
-@@ -217,19 +217,19 @@
- 		       buffer,
- 		       WINDOW_EXT(win, addch_used), &state)) > 0) {
- 	attr_t attrs = AttrOf(CHDEREF(ch));
-+	if_EXT_COLORS(int pair = GetPair(CHDEREF(ch)));
- 	SetChar(CHDEREF(ch), result, attrs);
-+	if_EXT_COLORS(SetPair(CHDEREF(ch), pair));
-+	WINDOW_EXT(win, addch_used) = 0;
-+    } else if (len == -1) {
-+	/*
-+	 * An error occurred.  We could either discard everything,
-+	 * or assume that the error was in the previous input.
-+	 * Try the latter.
-+	 */
-+	TR(TRACE_VIRTPUT, ("Alert! mbrtowc returns error"));
-+	/* handle this with unctrl() */
- 	WINDOW_EXT(win, addch_used) = 0;
--    } else {
--	if (len == -1) {
--	    /*
--	     * An error occurred.  We could either discard everything,
--	     * or assume that the error was in the previous input.
--	     * Try the latter.
--	     */
--	    TR(TRACE_VIRTPUT, ("Alert! mbrtowc returns error"));
--	    buffer[0] = CharOf(CHDEREF(ch));
--	    WINDOW_EXT(win, addch_used) = 1;
--	}
-     }
-     return len;
- }
-@@ -264,13 +264,16 @@
- 	if (WINDOW_EXT(win, addch_used) != 0 || !Charable(ch)) {
- 	    int len = _nc_build_wch(win, CHREF(ch));
- 
--	    if (len > 0) {
-+	    if (len >= -1) {
-+		/* handle EILSEQ */
- 		if (is8bits(CharOf(ch))) {
- 		    const char *s = unctrl((chtype) CharOf(ch));
- 		    if (s[1] != 0) {
- 			return waddstr(win, s);
- 		    }
- 		}
-+		if (len == -1)
-+		    return waddch(win, ' ');
- 	    } else {
- 		return OK;
- 	    }
-@@ -287,12 +290,15 @@
- 	int len = wcwidth(CharOf(ch));
- 	int i;
- 	int j;
-+	wchar_t *chars;
- 
- 	if (len == 0) {		/* non-spacing */
- 	    if ((x > 0 && y >= 0)
--		|| ((y = win->_cury - 1) >= 0 &&
--		    (x = win->_maxx) > 0)) {
--		wchar_t *chars = (win->_line[y].text[x - 1].chars);
-+		|| (win->_maxx >= 0 && win->_cury >= 1)) {
-+		if (x > 0 && y >= 0)
-+		    chars = (win->_line[y].text[x - 1].chars);
-+		else
-+		    chars = (win->_line[y - 1].text[win->_maxx].chars);
- 		for (i = 0; i < CCHARW_MAX; ++i) {
- 		    if (chars[i] == 0) {
- 			TR(TRACE_VIRTPUT,
-@@ -473,6 +479,7 @@
- 	while (*s) {
- 	    NCURSES_CH_T sch;
- 	    SetChar(sch, *s++, AttrOf(ch));
-+	    if_EXT_COLORS(SetPair(sch, GetPair(ch)));
- 	    if (waddch_literal(win, sch) == ERR)
- 		return ERR;
- 	}
-diff -Naur ncurses-5.6.orig/ncurses/base/lib_addstr.c ncurses-5.6/ncurses/base/lib_addstr.c
---- ncurses-5.6.orig/ncurses/base/lib_addstr.c	2006-05-27 15:22:19.000000000 -0400
-+++ ncurses-5.6/ncurses/base/lib_addstr.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -44,7 +44,7 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: lib_addstr.c,v 1.46 2006/05/27 19:22:19 tom Exp $")
-+MODULE_ID("$Id: lib_addstr.c,v 1.48 2007/10/13 19:56:57 tom Exp $")
- 
- NCURSES_EXPORT(int)
- waddnstr(WINDOW *win, const char *astr, int n)
-@@ -80,8 +80,7 @@
- NCURSES_EXPORT(int)
- waddchnstr(WINDOW *win, const chtype *astr, int n)
- {
--    NCURSES_SIZE_T y = win->_cury;
--    NCURSES_SIZE_T x = win->_curx;
-+    NCURSES_SIZE_T y, x;
-     int code = OK;
-     int i;
-     struct ldat *line;
-@@ -91,6 +90,8 @@
-     if (!win)
- 	returnCode(ERR);
- 
-+    y = win->_cury;
-+    x = win->_curx;
-     if (n < 0) {
- 	const chtype *str;
- 	n = 0;
-@@ -128,8 +129,8 @@
- wadd_wchnstr(WINDOW *win, const cchar_t *astr, int n)
- {
-     static const NCURSES_CH_T blank = NewChar(BLANK_TEXT);
--    NCURSES_SIZE_T y = win->_cury;
--    NCURSES_SIZE_T x = win->_curx;
-+    NCURSES_SIZE_T y;
-+    NCURSES_SIZE_T x;
-     int code = OK;
-     struct ldat *line;
-     int i, j, start, len, end;
-@@ -139,6 +140,8 @@
-     if (!win)
- 	returnCode(ERR);
- 
-+    y = win->_cury;
-+    x = win->_curx;
-     if (n < 0) {
- 	n = _nc_wchstrlen(astr);
-     }
-diff -Naur ncurses-5.6.orig/ncurses/base/lib_bkgd.c ncurses-5.6/ncurses/base/lib_bkgd.c
---- ncurses-5.6.orig/ncurses/base/lib_bkgd.c	2006-05-27 15:20:11.000000000 -0400
-+++ ncurses-5.6/ncurses/base/lib_bkgd.c	2008-06-18 06:49:48.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -36,7 +36,7 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: lib_bkgd.c,v 1.35 2006/05/27 19:20:11 tom Exp $")
-+MODULE_ID("$Id: lib_bkgd.c,v 1.36 2008/03/23 00:09:14 tom Exp $")
- 
- /*
-  * Set the window's background information.
-@@ -70,7 +70,7 @@
- 
- 	if (CharOf(CHDEREF(ch)) == L('\0')) {
- 	    SetChar(win->_nc_bkgd, BLANK_TEXT, AttrOf(CHDEREF(ch)));
--	    SetPair(win->_nc_bkgd, GetPair(CHDEREF(ch)));
-+	    if_EXT_COLORS(SetPair(win->_nc_bkgd, GetPair(CHDEREF(ch))));
- 	} else {
- 	    win->_nc_bkgd = CHDEREF(ch);
- 	}
-diff -Naur ncurses-5.6.orig/ncurses/base/lib_color.c ncurses-5.6/ncurses/base/lib_color.c
---- ncurses-5.6.orig/ncurses/base/lib_color.c	2006-11-25 20:33:16.000000000 -0500
-+++ ncurses-5.6/ncurses/base/lib_color.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -42,21 +42,37 @@
- #include <term.h>
- #include <tic.h>
- 
--MODULE_ID("$Id: lib_color.c,v 1.80 2006/11/26 01:33:16 tom Exp $")
-+MODULE_ID("$Id: lib_color.c,v 1.85 2007/04/07 17:07:28 tom Exp $")
- 
- /*
-  * These should be screen structure members.  They need to be globals for
-  * historical reasons.  So we assign them in start_color() and also in
-  * set_term()'s screen-switching logic.
-  */
-+#if USE_REENTRANT
-+NCURSES_EXPORT(int)
-+NCURSES_PUBLIC_VAR(COLOR_PAIRS) (void)
-+{
-+    return SP ? SP->_pair_count : -1;
-+}
-+NCURSES_EXPORT(int)
-+NCURSES_PUBLIC_VAR(COLORS) (void)
-+{
-+    return SP ? SP->_color_count : -1;
-+}
-+#else
- NCURSES_EXPORT_VAR(int) COLOR_PAIRS = 0;
- NCURSES_EXPORT_VAR(int) COLORS = 0;
-+#endif
- 
- #define DATA(r,g,b) {r,g,b, 0,0,0, 0}
- 
- #define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts))
- 
-+#define MAX_PALETTE	8
-+
- #define OkColorHi(n)	(((n) < COLORS) && ((n) < max_colors))
-+#define InPalette(n)	((n) >= 0 && (n) < MAX_PALETTE)
- 
- /*
-  * Given a RGB range of 0..1000, we'll normally set the individual values
-@@ -162,10 +178,10 @@
- 
-     tp = (hue_lightness_saturation) ? hls_palette : cga_palette;
-     for (n = 0; n < COLORS; n++) {
--	if (n < 8) {
-+	if (InPalette(n)) {
- 	    SP->_color_table[n] = tp[n];
- 	} else {
--	    SP->_color_table[n] = tp[n % 8];
-+	    SP->_color_table[n] = tp[n % MAX_PALETTE];
- 	    if (hue_lightness_saturation) {
- 		SP->_color_table[n].green = 100;
- 	    } else {
-@@ -239,8 +255,12 @@
- 	}
- 
- 	if (max_pairs > 0 && max_colors > 0) {
--	    COLOR_PAIRS = SP->_pair_count = max_pairs;
--	    COLORS = SP->_color_count = max_colors;
-+	    SP->_pair_count = max_pairs;
-+	    SP->_color_count = max_colors;
-+#if !USE_REENTRANT
-+	    COLOR_PAIRS = max_pairs;
-+	    COLORS = max_colors;
-+#endif
- 
- 	    if ((SP->_color_pairs = TYPE_CALLOC(colorpair_t,
- 						max_pairs)) != 0) {
-@@ -365,13 +385,14 @@
-     if (GET_SCREEN_PAIR(SP) == pair)
- 	SET_SCREEN_PAIR(SP, (chtype) (~0));	/* force attribute update */
- 
--    if (initialize_pair) {
-+    if (initialize_pair && InPalette(f) && InPalette(b)) {
- 	const color_t *tp = hue_lightness_saturation ? hls_palette : cga_palette;
- 
--	T(("initializing pair: pair = %d, fg=(%d,%d,%d), bg=(%d,%d,%d)",
--	   pair,
--	   tp[f].red, tp[f].green, tp[f].blue,
--	   tp[b].red, tp[b].green, tp[b].blue));
-+	TR(TRACE_ATTRS,
-+	   ("initializing pair: pair = %d, fg=(%d,%d,%d), bg=(%d,%d,%d)",
-+	    pair,
-+	    tp[f].red, tp[f].green, tp[f].blue,
-+	    tp[b].red, tp[b].green, tp[b].blue));
- 
- 	TPUTS_TRACE("initialize_pair");
- 	putp(TPARM_7(initialize_pair,
-@@ -461,7 +482,8 @@
- 	if (b)
- 	    *b = c_b;
- 
--	T(("...color_content(%d,%d,%d,%d)", color, c_r, c_g, c_b));
-+	TR(TRACE_ATTRS, ("...color_content(%d,%d,%d,%d)",
-+			 color, c_r, c_g, c_b));
- 	result = OK;
-     }
-     returnCode(result);
-@@ -492,7 +514,7 @@
- 	if (b)
- 	    *b = bg;
- 
--	T(("...pair_content(%d,%d,%d)", pair, fg, bg));
-+	TR(TRACE_ATTRS, ("...pair_content(%d,%d,%d)", pair, fg, bg));
- 	result = OK;
-     }
-     returnCode(result);
-diff -Naur ncurses-5.6.orig/ncurses/base/lib_delwin.c ncurses-5.6/ncurses/base/lib_delwin.c
---- ncurses-5.6.orig/ncurses/base/lib_delwin.c	2001-08-25 20:40:20.000000000 -0400
-+++ ncurses-5.6/ncurses/base/lib_delwin.c	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998,2000,2001 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -40,7 +40,7 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: lib_delwin.c,v 1.13 2001/08/26 00:40:20 tom Exp $")
-+MODULE_ID("$Id: lib_delwin.c,v 1.17 2008/06/07 14:10:56 tom Exp $")
- 
- static bool
- cannot_delete(WINDOW *win)
-@@ -48,7 +48,7 @@
-     WINDOWLIST *p;
-     bool result = TRUE;
- 
--    for (p = _nc_windows; p != 0; p = p->next) {
-+    for (each_window(p)) {
- 	if (&(p->win) == win) {
- 	    result = FALSE;
- 	} else if ((p->win._flags & _SUBWIN) != 0
-@@ -63,16 +63,24 @@
- NCURSES_EXPORT(int)
- delwin(WINDOW *win)
- {
-+    int result = ERR;
-+
-     T((T_CALLED("delwin(%p)"), win));
- 
--    if (win == 0
--	|| cannot_delete(win))
--	returnCode(ERR);
--
--    if (win->_flags & _SUBWIN)
--	touchwin(win->_parent);
--    else if (curscr != 0)
--	touchwin(curscr);
-+    if (_nc_try_global(curses) == 0) {
-+	if (win == 0
-+	    || cannot_delete(win)) {
-+	    result = ERR;
-+	} else {
-+
-+	    if (win->_flags & _SUBWIN)
-+		touchwin(win->_parent);
-+	    else if (curscr != 0)
-+		touchwin(curscr);
- 
--    returnCode(_nc_freewin(win));
-+	    result = _nc_freewin(win);
-+	}
-+	_nc_unlock_global(curses);
-+    }
-+    returnCode(result);
- }
-diff -Naur ncurses-5.6.orig/ncurses/base/lib_freeall.c ncurses-5.6/ncurses/base/lib_freeall.c
---- ncurses-5.6.orig/ncurses/base/lib_freeall.c	2006-12-02 17:36:43.000000000 -0500
-+++ ncurses-5.6/ncurses/base/lib_freeall.c	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -27,7 +27,7 @@
-  ****************************************************************************/
- 
- /****************************************************************************
-- *  Author: Thomas E. Dickey                    1996,1997                   *
-+ *  Author: Thomas E. Dickey                    1996-on                     *
-  ****************************************************************************/
- 
- #include <curses.priv.h>
-@@ -40,7 +40,7 @@
- extern int malloc_errfd;	/* FIXME */
- #endif
- 
--MODULE_ID("$Id: lib_freeall.c,v 1.38 2006/12/02 22:36:43 tom Exp $")
-+MODULE_ID("$Id: lib_freeall.c,v 1.47 2008/06/07 13:58:29 tom Exp $")
- 
- /*
-  * Free all ncurses data.  This is used for testing only (there's no practical
-@@ -50,23 +50,27 @@
- _nc_freeall(void)
- {
-     WINDOWLIST *p, *q;
--    char *s;
-     static va_list empty_va;
- 
-     T((T_CALLED("_nc_freeall()")));
- #if NO_LEAKS
--    _nc_free_tparm();
--    if (_nc_oldnums != 0) {
--	FreeAndNull(_nc_oldnums);
-+    if (SP != 0) {
-+	if (SP->_oldnum_list != 0) {
-+	    FreeAndNull(SP->_oldnum_list);
-+	}
-     }
- #endif
-     if (SP != 0) {
-+	_nc_lock_global(curses);
-+
- 	while (_nc_windows != 0) {
-+	    bool deleted = FALSE;
-+
- 	    /* Delete only windows that're not a parent */
--	    for (p = _nc_windows; p != 0; p = p->next) {
-+	    for (each_window(p)) {
- 		bool found = FALSE;
- 
--		for (q = _nc_windows; q != 0; q = q->next) {
-+		for (each_window(q)) {
- 		    if ((p != q)
- 			&& (q->win._flags & _SUBWIN)
- 			&& (&(p->win) == q->win._parent)) {
-@@ -76,39 +80,38 @@
- 		}
- 
- 		if (!found) {
--		    delwin(&(p->win));
-+		    if (delwin(&(p->win)) != ERR)
-+			deleted = TRUE;
- 		    break;
- 		}
- 	    }
-+
-+	    /*
-+	     * Don't continue to loop if the list is trashed.
-+	     */
-+	    if (!deleted)
-+		break;
- 	}
- 	delscreen(SP);
-+	_nc_unlock_global(curses);
-     }
--#if NO_LEAKS
--    _nc_tgetent_leaks();
--#endif
--    del_curterm(cur_term);
--    _nc_free_entries(_nc_head);
--    _nc_get_type(0);
--    _nc_first_name(0);
-+    if (cur_term != 0)
-+	del_curterm(cur_term);
-+
- #if USE_WIDEC_SUPPORT
-     FreeIfNeeded(_nc_wacs);
- #endif
--#if NO_LEAKS
--    _nc_alloc_entry_leaks();
--    _nc_captoinfo_leaks();
--    _nc_comp_scan_leaks();
--    _nc_keyname_leaks();
--    _nc_tic_expand(0, FALSE, 0);
--#endif
--
--    if ((s = _nc_home_terminfo()) != 0)
--	free(s);
--
-     (void) _nc_printf_string(0, empty_va);
- #ifdef TRACE
-     (void) _nc_trace_buf(-1, 0);
- #endif
- 
-+#if BROKEN_LINKER || USE_REENTRANT
-+    FreeIfNeeded(_nc_prescreen.real_acs_map);
-+#endif
-+
-+    _nc_leaks_tinfo();
-+
- #if HAVE_LIBDBMALLOC
-     malloc_dump(malloc_errfd);
- #elif HAVE_LIBDMALLOC
-diff -Naur ncurses-5.6.orig/ncurses/base/lib_getch.c ncurses-5.6/ncurses/base/lib_getch.c
---- ncurses-5.6.orig/ncurses/base/lib_getch.c	2006-03-04 15:06:09.000000000 -0500
-+++ ncurses-5.6/ncurses/base/lib_getch.c	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -41,12 +41,47 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: lib_getch.c,v 1.75 2006/03/04 20:06:09 tom Exp $")
-+MODULE_ID("$Id: lib_getch.c,v 1.95 2008/06/07 15:52:51 tom Exp $")
- 
- #include <fifo_defs.h>
- 
-+#if USE_REENTRANT
-+#define GetEscdelay(sp) (sp)->_ESCDELAY
-+NCURSES_EXPORT(int)
-+NCURSES_PUBLIC_VAR(ESCDELAY) (void)
-+{
-+    return SP ? GetEscdelay(SP) : 1000;
-+}
-+#else
-+#define GetEscdelay(sp) ESCDELAY
- NCURSES_EXPORT_VAR(int)
- ESCDELAY = 1000;		/* max interval betw. chars in funkeys, in millisecs */
-+#endif
-+
-+#if NCURSES_EXT_FUNCS
-+NCURSES_EXPORT(int)
-+set_escdelay(int value)
-+{
-+    int code = OK;
-+#if USE_REENTRANT
-+    if (SP) {
-+	SP->_ESCDELAY = value;
-+    } else {
-+	code = ERR;
-+    }
-+#else
-+    ESCDELAY = value;
-+#endif
-+    return code;
-+}
-+#endif
-+
-+static int
-+_nc_use_meta(WINDOW *win)
-+{
-+    SCREEN *sp = _nc_screen_of(win);
-+    return (sp ? sp->_use_meta : 0);
-+}
- 
- #ifdef NCURSES_WGETCH_EVENTS
- #define TWAIT_MASK 7
-@@ -58,20 +93,20 @@
-  * Check for mouse activity, returning nonzero if we find any.
-  */
- static int
--check_mouse_activity(int delay EVENTLIST_2nd(_nc_eventlist * evl))
-+check_mouse_activity(SCREEN *sp, int delay EVENTLIST_2nd(_nc_eventlist * evl))
- {
-     int rc;
- 
- #if USE_SYSMOUSE
--    if ((SP->_mouse_type == M_SYSMOUSE)
--	&& (SP->_sysmouse_head < SP->_sysmouse_tail)) {
-+    if ((sp->_mouse_type == M_SYSMOUSE)
-+	&& (sp->_sysmouse_head < sp->_sysmouse_tail)) {
- 	return 2;
-     }
- #endif
--    rc = _nc_timed_wait(TWAIT_MASK, delay, (int *) 0 EVENTLIST_2nd(evl));
-+    rc = _nc_timed_wait(sp, TWAIT_MASK, delay, (int *) 0 EVENTLIST_2nd(evl));
- #if USE_SYSMOUSE
--    if ((SP->_mouse_type == M_SYSMOUSE)
--	&& (SP->_sysmouse_head < SP->_sysmouse_tail)
-+    if ((sp->_mouse_type == M_SYSMOUSE)
-+	&& (sp->_sysmouse_head < sp->_sysmouse_tail)
- 	&& (rc == 0)
- 	&& (errno == EINTR)) {
- 	rc |= 2;
-@@ -81,9 +116,9 @@
- }
- 
- static NCURSES_INLINE int
--fifo_peek(void)
-+fifo_peek(SCREEN *sp)
- {
--    int ch = SP->_fifo[peek];
-+    int ch = sp->_fifo[peek];
-     TR(TRACE_IEVENT, ("peeking at %d", peek));
- 
-     p_inc();
-@@ -91,11 +126,11 @@
- }
- 
- static NCURSES_INLINE int
--fifo_pull(void)
-+fifo_pull(SCREEN *sp)
- {
-     int ch;
--    ch = SP->_fifo[head];
--    TR(TRACE_IEVENT, ("pulling %s from %d", _tracechar(ch), head));
-+    ch = sp->_fifo[head];
-+    TR(TRACE_IEVENT, ("pulling %s from %d", _nc_tracechar(sp, ch), head));
- 
-     if (peek == head) {
- 	h_inc();
-@@ -104,14 +139,16 @@
- 	h_inc();
- 
- #ifdef TRACE
--    if (_nc_tracing & TRACE_IEVENT)
--	_nc_fifo_dump();
-+    if (USE_TRACEF(TRACE_IEVENT)) {
-+	_nc_fifo_dump(sp);
-+	_nc_unlock_global(tracef);
-+    }
- #endif
-     return ch;
- }
- 
- static NCURSES_INLINE int
--fifo_push(EVENTLIST_0th(_nc_eventlist * evl))
-+fifo_push(SCREEN *sp EVENTLIST_2nd(_nc_eventlist * evl))
- {
-     int n;
-     int ch = 0;
-@@ -129,47 +166,47 @@
- #ifdef NCURSES_WGETCH_EVENTS
-     if (evl
- #if USE_GPM_SUPPORT || USE_EMX_MOUSE || USE_SYSMOUSE
--	|| (SP->_mouse_fd >= 0)
-+	|| (sp->_mouse_fd >= 0)
- #endif
- 	) {
--	mask = check_mouse_activity(-1 EVENTLIST_2nd(evl));
-+	mask = check_mouse_activity(sp, -1 EVENTLIST_2nd(evl));
-     } else
- 	mask = 0;
- 
-     if (mask & 4) {
- 	T(("fifo_push: ungetch KEY_EVENT"));
--	ungetch(KEY_EVENT);
-+	_nc_ungetch(sp, KEY_EVENT);
- 	return KEY_EVENT;
-     }
- #elif USE_GPM_SUPPORT || USE_EMX_MOUSE || USE_SYSMOUSE
--    if (SP->_mouse_fd >= 0) {
--	mask = check_mouse_activity(-1 EVENTLIST_2nd(evl));
-+    if (sp->_mouse_fd >= 0) {
-+	mask = check_mouse_activity(sp, -1 EVENTLIST_2nd(evl));
-     }
- #endif
- 
- #if USE_GPM_SUPPORT || USE_EMX_MOUSE
--    if ((SP->_mouse_fd >= 0) && (mask & 2)) {
--	SP->_mouse_event(SP);
-+    if ((sp->_mouse_fd >= 0) && (mask & 2)) {
-+	sp->_mouse_event(sp);
- 	ch = KEY_MOUSE;
- 	n = 1;
-     } else
- #endif
- #if USE_SYSMOUSE
--	if ((SP->_mouse_type == M_SYSMOUSE)
--	    && (SP->_sysmouse_head < SP->_sysmouse_tail)) {
--	SP->_mouse_event(SP);
-+	if ((sp->_mouse_type == M_SYSMOUSE)
-+	    && (sp->_sysmouse_head < sp->_sysmouse_tail)) {
-+	sp->_mouse_event(sp);
- 	ch = KEY_MOUSE;
- 	n = 1;
--    } else if ((SP->_mouse_type == M_SYSMOUSE)
-+    } else if ((sp->_mouse_type == M_SYSMOUSE)
- 	       && (mask <= 0) && errno == EINTR) {
--	SP->_mouse_event(SP);
-+	sp->_mouse_event(sp);
- 	ch = KEY_MOUSE;
- 	n = 1;
-     } else
- #endif
-     {				/* Can block... */
- 	unsigned char c2 = 0;
--	n = read(SP->_ifd, &c2, 1);
-+	n = read(sp->_ifd, &c2, 1);
- 	ch = c2;
-     }
- 
-@@ -188,37 +225,85 @@
- #endif
- 
-     if ((n == -1) || (n == 0)) {
--	TR(TRACE_IEVENT, ("read(%d,&ch,1)=%d, errno=%d", SP->_ifd, n, errno));
-+	TR(TRACE_IEVENT, ("read(%d,&ch,1)=%d, errno=%d", sp->_ifd, n, errno));
- 	ch = ERR;
-     }
-     TR(TRACE_IEVENT, ("read %d characters", n));
- 
--    SP->_fifo[tail] = ch;
--    SP->_fifohold = 0;
-+    sp->_fifo[tail] = ch;
-+    sp->_fifohold = 0;
-     if (head == -1)
- 	head = peek = tail;
-     t_inc();
--    TR(TRACE_IEVENT, ("pushed %s at %d", _tracechar(ch), tail));
-+    TR(TRACE_IEVENT, ("pushed %s at %d", _nc_tracechar(sp, ch), tail));
- #ifdef TRACE
--    if (_nc_tracing & TRACE_IEVENT)
--	_nc_fifo_dump();
-+    if (USE_TRACEF(TRACE_IEVENT)) {
-+	_nc_fifo_dump(sp);
-+	_nc_unlock_global(tracef);
-+    }
- #endif
-     return ch;
- }
- 
- static NCURSES_INLINE void
--fifo_clear(void)
-+fifo_clear(SCREEN *sp)
- {
--    memset(SP->_fifo, 0, sizeof(SP->_fifo));
-+    memset(sp->_fifo, 0, sizeof(sp->_fifo));
-     head = -1;
-     tail = peek = 0;
- }
- 
--static int kgetch(EVENTLIST_0th(_nc_eventlist * evl));
-+static int kgetch(SCREEN *EVENTLIST_2nd(_nc_eventlist * evl));
-+
-+static void
-+recur_wrefresh(WINDOW *win)
-+{
-+#ifdef USE_PTHREADS
-+    SCREEN *sp = _nc_screen_of(win);
-+    if (sp != SP) {
-+	SCREEN *save_SP;
-+
-+	/* temporarily switch to the window's screen to check/refresh */
-+	_nc_lock_global(curses);
-+	save_SP = SP;
-+	SP = sp;
-+	recur_wrefresh(win);
-+	SP = save_SP;
-+	_nc_unlock_global(curses);
-+    } else
-+#endif
-+	if ((is_wintouched(win) || (win->_flags & _HASMOVED))
-+	    && !(win->_flags & _ISPAD)) {
-+	wrefresh(win);
-+    }
-+}
-+
-+static int
-+recur_wgetnstr(WINDOW *win, char *buf)
-+{
-+    SCREEN *sp = _nc_screen_of(win);
-+    int rc;
- 
--#define wgetch_should_refresh(win) (\
--	(is_wintouched(win) || (win->_flags & _HASMOVED)) \
--	&& !(win->_flags & _ISPAD))
-+#ifdef USE_PTHREADS
-+    if (sp != SP) {
-+	SCREEN *save_SP;
-+
-+	/* temporarily switch to the window's screen to get cooked input */
-+	_nc_lock_global(curses);
-+	save_SP = SP;
-+	SP = sp;
-+	rc = recur_wgetnstr(win, buf);
-+	SP = save_SP;
-+	_nc_unlock_global(curses);
-+    } else
-+#endif
-+    {
-+	sp->_called_wgetch = TRUE;
-+	rc = wgetnstr(win, buf, MAXCOLUMNS);
-+	sp->_called_wgetch = FALSE;
-+    }
-+    return rc;
-+}
- 
- NCURSES_EXPORT(int)
- _nc_wgetch(WINDOW *win,
-@@ -226,6 +311,7 @@
- 	   int use_meta
- 	   EVENTLIST_2nd(_nc_eventlist * evl))
- {
-+    SCREEN *sp;
-     int ch;
- #ifdef NCURSES_WGETCH_EVENTS
-     long event_delay = -1;
-@@ -234,15 +320,16 @@
-     T((T_CALLED("_nc_wgetch(%p)"), win));
- 
-     *result = 0;
--    if (win == 0 || SP == 0)
-+
-+    sp = _nc_screen_of(win);
-+    if (win == 0 || sp == 0) {
- 	returnCode(ERR);
-+    }
- 
-     if (cooked_key_in_fifo()) {
--	if (wgetch_should_refresh(win))
--	    wrefresh(win);
--
--	*result = fifo_pull();
--	returnCode(OK);
-+	recur_wrefresh(win);
-+	*result = fifo_pull(sp);
-+	returnCode(*result >= KEY_MIN ? KEY_CODE_YES : OK);
-     }
- #ifdef NCURSES_WGETCH_EVENTS
-     if (evl && (evl->count == 0))
-@@ -256,53 +343,48 @@
-      * the first character to return it.
-      */
-     if (head == -1 &&
--	!SP->_notty &&
--	!SP->_raw &&
--	!SP->_cbreak &&
--	!SP->_called_wgetch) {
--	char buf[MAXCOLUMNS], *sp;
-+	!sp->_notty &&
-+	!sp->_raw &&
-+	!sp->_cbreak &&
-+	!sp->_called_wgetch) {
-+	char buf[MAXCOLUMNS], *bufp;
- 	int rc;
- 
- 	TR(TRACE_IEVENT, ("filling queue in cooked mode"));
- 
--	SP->_called_wgetch = TRUE;
--	rc = wgetnstr(win, buf, MAXCOLUMNS);
--	SP->_called_wgetch = FALSE;
-+	rc = recur_wgetnstr(win, buf);
- 
- 	/* ungetch in reverse order */
- #ifdef NCURSES_WGETCH_EVENTS
- 	if (rc != KEY_EVENT)
- #endif
--	    ungetch('\n');
--	for (sp = buf + strlen(buf); sp > buf; sp--)
--	    ungetch(sp[-1]);
-+	    _nc_ungetch(sp, '\n');
-+	for (bufp = buf + strlen(buf); bufp > buf; bufp--)
-+	    _nc_ungetch(sp, bufp[-1]);
- 
- #ifdef NCURSES_WGETCH_EVENTS
- 	/* Return it first */
- 	if (rc == KEY_EVENT) {
- 	    *result = rc;
--	    returnCode(OK);
--	}
-+	} else
- #endif
--
--	*result = fifo_pull();
--	returnCode(OK);
-+	    *result = fifo_pull(sp);
-+	returnCode(*result >= KEY_MIN ? KEY_CODE_YES : OK);
-     }
- 
--    if (win->_use_keypad != SP->_keypad_on)
--	_nc_keypad(win->_use_keypad);
-+    if (win->_use_keypad != sp->_keypad_on)
-+	_nc_keypad(sp, win->_use_keypad);
- 
--    if (wgetch_should_refresh(win))
--	wrefresh(win);
-+    recur_wrefresh(win);
- 
--    if (!win->_notimeout && (win->_delay >= 0 || SP->_cbreak > 1)) {
-+    if (!win->_notimeout && (win->_delay >= 0 || sp->_cbreak > 1)) {
- 	if (head == -1) {	/* fifo is empty */
- 	    int delay;
- 	    int rc;
- 
- 	    TR(TRACE_IEVENT, ("timed delay in wgetch()"));
--	    if (SP->_cbreak > 1)
--		delay = (SP->_cbreak - 1) * 100;
-+	    if (sp->_cbreak > 1)
-+		delay = (sp->_cbreak - 1) * 100;
- 	    else
- 		delay = win->_delay;
- 
-@@ -313,16 +395,17 @@
- 
- 	    TR(TRACE_IEVENT, ("delay is %d milliseconds", delay));
- 
--	    rc = check_mouse_activity(delay EVENTLIST_2nd(evl));
-+	    rc = check_mouse_activity(sp, delay EVENTLIST_2nd(evl));
- 
- #ifdef NCURSES_WGETCH_EVENTS
- 	    if (rc & 4) {
- 		*result = KEY_EVENT;
--		returnCode(OK);
-+		returnCode(KEY_CODE_YES);
- 	    }
- #endif
--	    if (!rc)
-+	    if (!rc) {
- 		returnCode(ERR);
-+	    }
- 	}
- 	/* else go on to read data available */
-     }
-@@ -343,23 +426,23 @@
- 	int rc;
- 
- 	do {
--	    ch = kgetch(EVENTLIST_1st(evl));
-+	    ch = kgetch(sp EVENTLIST_2nd(evl));
- 	    if (ch == KEY_MOUSE) {
- 		++runcount;
--		if (SP->_mouse_inline(SP))
-+		if (sp->_mouse_inline(sp))
- 		    break;
- 	    }
--	    if (SP->_maxclick < 0)
-+	    if (sp->_maxclick < 0)
- 		break;
- 	} while
- 	    (ch == KEY_MOUSE
--	     && (((rc = check_mouse_activity(SP->_maxclick
-+	     && (((rc = check_mouse_activity(sp, sp->_maxclick
- 					     EVENTLIST_2nd(evl))) != 0
- 		  && !(rc & 4))
--		 || !SP->_mouse_parse(runcount)));
-+		 || !sp->_mouse_parse(sp, runcount)));
- #ifdef NCURSES_WGETCH_EVENTS
- 	if ((rc & 4) && !ch == KEY_EVENT) {
--	    ungetch(ch);
-+	    _nc_ungetch(sp, ch);
- 	    ch = KEY_EVENT;
- 	}
- #endif
-@@ -367,28 +450,28 @@
- #ifdef NCURSES_WGETCH_EVENTS
- 	    /* mouse event sequence ended by an event, report event */
- 	    if (ch == KEY_EVENT) {
--		ungetch(KEY_MOUSE);	/* FIXME This interrupts a gesture... */
-+		_nc_ungetch(sp, KEY_MOUSE);	/* FIXME This interrupts a gesture... */
- 	    } else
- #endif
- 	    {
- 		/* mouse event sequence ended by keystroke, store keystroke */
--		ungetch(ch);
-+		_nc_ungetch(sp, ch);
- 		ch = KEY_MOUSE;
- 	    }
- 	}
-     } else {
- 	if (head == -1)
--	    fifo_push(EVENTLIST_1st(evl));
--	ch = fifo_pull();
-+	    fifo_push(sp EVENTLIST_2nd(evl));
-+	ch = fifo_pull(sp);
-     }
- 
-     if (ch == ERR) {
- #if USE_SIZECHANGE
--	if (SP->_sig_winch) {
--	    _nc_update_screensize();
-+	if (_nc_handle_sigwinch(sp)) {
-+	    _nc_update_screensize(sp);
- 	    /* resizeterm can push KEY_RESIZE */
- 	    if (cooked_key_in_fifo()) {
--		*result = fifo_pull();
-+		*result = fifo_pull(sp);
- 		returnCode(*result >= KEY_MIN ? KEY_CODE_YES : OK);
- 	    }
- 	}
-@@ -414,7 +497,7 @@
-      * However, we provide the same visual result as Solaris, moving the
-      * cursor to the left.
-      */
--    if (SP->_echo && !(win->_flags & _ISPAD)) {
-+    if (sp->_echo && !(win->_flags & _ISPAD)) {
- 	chtype backup = (ch == KEY_BACKSPACE) ? '\b' : ch;
- 	if (backup < KEY_MIN)
- 	    wechochar(win, backup);
-@@ -423,7 +506,7 @@
-     /*
-      * Simulate ICRNL mode
-      */
--    if ((ch == '\r') && SP->_nl)
-+    if ((ch == '\r') && sp->_nl)
- 	ch = '\n';
- 
-     /* Strip 8th-bit if so desired.  We do this only for characters that
-@@ -435,7 +518,7 @@
- 	if ((ch < KEY_MIN) && (ch & 0x80))
- 	    ch &= 0x7f;
- 
--    T(("wgetch returning : %s", _tracechar(ch)));
-+    T(("wgetch returning : %s", _nc_tracechar(sp, ch)));
- 
-     *result = ch;
-     returnCode(ch >= KEY_MIN ? KEY_CODE_YES : OK);
-@@ -451,7 +534,7 @@
-     T((T_CALLED("wgetch_events(%p,%p)"), win, evl));
-     code = _nc_wgetch(win,
- 		      &value,
--		      SP->_use_meta
-+		      _nc_use_meta(win)
- 		      EVENTLIST_2nd(evl));
-     if (code != ERR)
- 	code = value;
-@@ -468,7 +551,7 @@
-     T((T_CALLED("wgetch(%p)"), win));
-     code = _nc_wgetch(win,
- 		      &value,
--		      (SP ? SP->_use_meta : 0)
-+		      _nc_use_meta(win)
- 		      EVENTLIST_2nd((_nc_eventlist *) 0));
-     if (code != ERR)
- 	code = value;
-@@ -491,21 +574,21 @@
- */
- 
- static int
--kgetch(EVENTLIST_0th(_nc_eventlist * evl))
-+kgetch(SCREEN *sp EVENTLIST_2nd(_nc_eventlist * evl))
- {
--    struct tries *ptr;
-+    TRIES *ptr;
-     int ch = 0;
--    int timeleft = ESCDELAY;
-+    int timeleft = GetEscdelay(sp);
- 
-     TR(TRACE_IEVENT, ("kgetch() called"));
- 
--    ptr = SP->_keytry;
-+    ptr = sp->_keytry;
- 
-     for (;;) {
--	if (cooked_key_in_fifo() && SP->_fifo[head] >= KEY_MIN) {
-+	if (cooked_key_in_fifo() && sp->_fifo[head] >= KEY_MIN) {
- 	    break;
- 	} else if (!raw_key_in_fifo()) {
--	    ch = fifo_push(EVENTLIST_1st(evl));
-+	    ch = fifo_push(sp EVENTLIST_2nd(evl));
- 	    if (ch == ERR) {
- 		peek = head;	/* the keys stay uninterpreted */
- 		return ERR;
-@@ -513,12 +596,12 @@
- #ifdef NCURSES_WGETCH_EVENTS
- 	    else if (ch == KEY_EVENT) {
- 		peek = head;	/* the keys stay uninterpreted */
--		return fifo_pull();	/* Remove KEY_EVENT from the queue */
-+		return fifo_pull(sp);	/* Remove KEY_EVENT from the queue */
- 	    }
- #endif
- 	}
- 
--	ch = fifo_peek();
-+	ch = fifo_peek(sp);
- 	if (ch >= KEY_MIN) {
- 	    /* If not first in queue, somebody put this key there on purpose in
- 	     * emergency.  Consider it higher priority than the unfinished
-@@ -530,7 +613,7 @@
- 	    return ch;
- 	}
- 
--	TR(TRACE_IEVENT, ("ch: %s", _tracechar((unsigned char) ch)));
-+	TR(TRACE_IEVENT, ("ch: %s", _nc_tracechar(sp, (unsigned char) ch)));
- 	while ((ptr != NULL) && (ptr->ch != (unsigned char) ch))
- 	    ptr = ptr->sibling;
- 
-@@ -544,7 +627,7 @@
- 	if (ptr->value != 0) {	/* sequence terminated */
- 	    TR(TRACE_IEVENT, ("end of sequence"));
- 	    if (peek == tail)
--		fifo_clear();
-+		fifo_clear(sp);
- 	    else
- 		head = peek;
- 	    return (ptr->value);
-@@ -556,7 +639,7 @@
- 	    int rc;
- 
- 	    TR(TRACE_IEVENT, ("waiting for rest of sequence"));
--	    rc = check_mouse_activity(timeleft EVENTLIST_2nd(evl));
-+	    rc = check_mouse_activity(sp, timeleft EVENTLIST_2nd(evl));
- #ifdef NCURSES_WGETCH_EVENTS
- 	    if (rc & 4) {
- 		TR(TRACE_IEVENT, ("interrupted by a user event"));
-@@ -571,7 +654,7 @@
- 	    }
- 	}
-     }
--    ch = fifo_pull();
-+    ch = fifo_pull(sp);
-     peek = head;
-     return ch;
- }
-diff -Naur ncurses-5.6.orig/ncurses/base/lib_getstr.c ncurses-5.6/ncurses/base/lib_getstr.c
---- ncurses-5.6.orig/ncurses/base/lib_getstr.c	2006-01-11 19:33:52.000000000 -0500
-+++ ncurses-5.6/ncurses/base/lib_getstr.c	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -41,7 +41,7 @@
- #include <curses.priv.h>
- #include <term.h>
- 
--MODULE_ID("$Id: lib_getstr.c,v 1.25 2006/01/12 00:33:52 tom Exp $")
-+MODULE_ID("$Id: lib_getstr.c,v 1.26 2008/05/31 22:05:15 tom Exp $")
- 
- /*
-  * This wipes out the last character, no matter whether it was a tab, control
-@@ -75,6 +75,7 @@
- 		int maxlen,
- 		EVENTLIST_1st(_nc_eventlist * evl))
- {
-+    SCREEN *sp = _nc_screen_of(win);
-     TTY buf;
-     bool oldnl, oldecho, oldraw, oldcbreak;
-     char erasec;
-@@ -90,10 +91,10 @@
- 
-     _nc_get_tty_mode(&buf);
- 
--    oldnl = SP->_nl;
--    oldecho = SP->_echo;
--    oldraw = SP->_raw;
--    oldcbreak = SP->_cbreak;
-+    oldnl = sp->_nl;
-+    oldecho = sp->_echo;
-+    oldraw = sp->_raw;
-+    oldcbreak = sp->_cbreak;
-     nl();
-     noecho();
-     noraw();
-@@ -187,10 +188,10 @@
-     /* Restore with a single I/O call, to fix minor asymmetry between
-      * raw/noraw, etc.
-      */
--    SP->_nl = oldnl;
--    SP->_echo = oldecho;
--    SP->_raw = oldraw;
--    SP->_cbreak = oldcbreak;
-+    sp->_nl = oldnl;
-+    sp->_echo = oldecho;
-+    sp->_raw = oldraw;
-+    sp->_cbreak = oldcbreak;
- 
-     _nc_set_tty_mode(&buf);
- 
-diff -Naur ncurses-5.6.orig/ncurses/base/lib_initscr.c ncurses-5.6/ncurses/base/lib_initscr.c
---- ncurses-5.6.orig/ncurses/base/lib_initscr.c	2005-10-22 16:30:38.000000000 -0400
-+++ ncurses-5.6/ncurses/base/lib_initscr.c	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -45,19 +45,22 @@
- #include <sys/termio.h>		/* needed for ISC */
- #endif
- 
--MODULE_ID("$Id: lib_initscr.c,v 1.34 2005/10/22 20:30:38 tom Exp $")
-+MODULE_ID("$Id: lib_initscr.c,v 1.37 2008/06/07 14:00:12 tom Exp $")
- 
- NCURSES_EXPORT(WINDOW *)
- initscr(void)
- {
--    static bool initialized = FALSE;
-+    WINDOW *result;
-+
-     NCURSES_CONST char *name;
- 
-     START_TRACE();
-     T((T_CALLED("initscr()")));
-+
-+    _nc_lock_global(curses);
-     /* Portable applications must not call initscr() more than once */
--    if (!initialized) {
--	initialized = TRUE;
-+    if (!_nc_globals.init_screen) {
-+	_nc_globals.init_screen = TRUE;
- 
- 	if ((name = getenv("TERM")) == 0
- 	    || *name == '\0')
-@@ -87,5 +90,8 @@
- 	/* def_shell_mode - done in newterm/_nc_setupscreen */
- 	def_prog_mode();
-     }
--    returnWin(stdscr);
-+    result = stdscr;
-+    _nc_unlock_global(curses);
-+
-+    returnWin(result);
- }
-diff -Naur ncurses-5.6.orig/ncurses/base/lib_insch.c ncurses-5.6/ncurses/base/lib_insch.c
---- ncurses-5.6.orig/ncurses/base/lib_insch.c	2005-02-26 14:27:28.000000000 -0500
-+++ ncurses-5.6/ncurses/base/lib_insch.c	2008-06-18 06:49:46.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2005,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -43,7 +43,7 @@
- #include <curses.priv.h>
- #include <ctype.h>
- 
--MODULE_ID("$Id: lib_insch.c,v 1.24 2005/02/26 19:27:28 tom Exp $")
-+MODULE_ID("$Id: lib_insch.c,v 1.25 2008/02/03 00:14:37 tom Exp $")
- 
- /*
-  * Insert the given character, updating the current location to simplify
-@@ -95,7 +95,8 @@
- 	} else if (is8bits(ChCharOf(ch)) && iscntrl(ChCharOf(ch))) {
- 	    s = unctrl(ChCharOf(ch));
- 	    while (*s != '\0') {
--		if ((code = _nc_insert_ch(win, ChAttrOf(ch) | UChar(*s))) != OK)
-+		code = _nc_insert_ch(win, ChAttrOf(ch) | UChar(*s));
-+		if (code != OK)
- 		    break;
- 		++s;
- 	    }
-@@ -107,8 +108,23 @@
- 	     */
- 	    SetChar2(wch, ch);
- 	    wch = _nc_render(win, wch);
--	    if (_nc_build_wch(win, &wch) >= 0)
-+	    count = _nc_build_wch(win, &wch);
-+	    if (count > 0) {
- 		code = wins_wch(win, &wch);
-+	    } else if (count == -1) {
-+		/* handle EILSEQ */
-+		if (is8bits(ch)) {
-+		    s = unctrl(ChCharOf(ch));
-+		    while (*s != '\0') {
-+			code = _nc_insert_ch(win, ChAttrOf(ch) | UChar(*s));
-+			if (code != OK)
-+			    break;
-+			++s;
-+		    }
-+		} else {
-+		    code = ERR;
-+		}
-+	    }
- 	}
- #endif
- 	break;
-diff -Naur ncurses-5.6.orig/ncurses/base/lib_instr.c ncurses-5.6/ncurses/base/lib_instr.c
---- ncurses-5.6.orig/ncurses/base/lib_instr.c	2005-11-19 20:38:03.000000000 -0500
-+++ ncurses-5.6/ncurses/base/lib_instr.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -41,7 +41,7 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: lib_instr.c,v 1.15 2005/11/20 01:38:03 tom Exp $")
-+MODULE_ID("$Id: lib_instr.c,v 1.16 2007/07/21 20:18:10 tom Exp $")
- 
- NCURSES_EXPORT(int)
- winnstr(WINDOW *win, char *str, int n)
-@@ -81,7 +81,7 @@
- 			n3 = wcstombs(0, wch, 0);
- 			if (isEILSEQ(n3) || (n3 == 0)) {
- 			    ;
--			} else if ((int) (n3 + i) >= n) {
-+			} else if ((int) (n3 + i) > n) {
- 			    done = TRUE;
- 			} else if ((tmp = typeCalloc(char, n3 + 10)) == 0) {
- 			    done = TRUE;
-@@ -102,9 +102,7 @@
- 	    str[i++] = (char) CharOf(win->_line[row].text[col]);
- #endif
- 	    if (++col > win->_maxx) {
--		col = 0;
--		if (++row > win->_maxy)
--		    break;
-+		break;
- 	    }
- 	}
-     }
-diff -Naur ncurses-5.6.orig/ncurses/base/lib_mouse.c ncurses-5.6/ncurses/base/lib_mouse.c
---- ncurses-5.6.orig/ncurses/base/lib_mouse.c	2006-11-25 17:30:28.000000000 -0500
-+++ ncurses-5.6/ncurses/base/lib_mouse.c	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -79,7 +79,7 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: lib_mouse.c,v 1.85 2006/11/25 22:30:28 tom Exp $")
-+MODULE_ID("$Id: lib_mouse.c,v 1.94 2008/05/31 20:30:10 tom Exp $")
- 
- #include <term.h>
- #include <tic.h>
-@@ -154,34 +154,34 @@
- 
- #endif				/* USE_GPM_SUPPORT */
- 
--static bool _nc_mouse_parse(int);
-+static bool _nc_mouse_parse(SCREEN *, int);
- static void _nc_mouse_resume(SCREEN *);
- static void _nc_mouse_wrap(SCREEN *);
- 
- /* maintain a circular list of mouse events */
- 
- #undef  NEXT
--#define NEXT(ep)	((ep == SP->_mouse_events + EV_MAX - 1) \
--			 ? SP->_mouse_events \
-+#define NEXT(ep)	((ep == sp->_mouse_events + EV_MAX - 1) \
-+			 ? sp->_mouse_events \
- 			 : ep + 1)
- 
- #undef  PREV
--#define PREV(ep)	((ep == SP->_mouse_events) \
--			 ? SP->_mouse_events + EV_MAX - 1 \
-+#define PREV(ep)	((ep == sp->_mouse_events) \
-+			 ? sp->_mouse_events + EV_MAX - 1 \
- 			 : ep - 1)
- 
- #ifdef TRACE
- static void
--_trace_slot(const char *tag)
-+_trace_slot(SCREEN *sp, const char *tag)
- {
-     MEVENT *ep;
- 
-     _tracef(tag);
- 
--    for (ep = SP->_mouse_events; ep < SP->_mouse_events + EV_MAX; ep++)
-+    for (ep = sp->_mouse_events; ep < sp->_mouse_events + EV_MAX; ep++)
- 	_tracef("mouse event queue slot %ld = %s",
--		(long) (ep - SP->_mouse_events),
--		_tracemouse(ep));
-+		(long) (ep - sp->_mouse_events),
-+		_nc_tracemouse(sp, ep));
- }
- #endif
- 
-@@ -193,7 +193,7 @@
- #  define M_FD(sp) sp->_mouse_fd
- 
- static void
--write_event(int down, int button, int x, int y)
-+write_event(SCREEN *sp, int down, int button, int x, int y)
- {
-     char buf[6];
-     unsigned long ignore;
-@@ -202,12 +202,13 @@
-     buf[3] = ' ' + (button - 1) + (down ? 0 : 0x40);
-     buf[4] = ' ' + x - LEFT_COL + 1;
-     buf[5] = ' ' + y - TOP_ROW + 1;
--    DosWrite(SP->_emxmouse_wfd, buf, 6, &ignore);
-+    DosWrite(sp->_emxmouse_wfd, buf, 6, &ignore);
- }
- 
- static void
--mouse_server(unsigned long ignored GCC_UNUSED)
-+mouse_server(unsigned long param)
- {
-+    SCREEN *sp = (SCREEN *) param;
-     unsigned short fWait = MOU_WAIT;
-     /* NOPTRRECT mourt = { 0,0,24,79 }; */
-     MOUEVENTINFO mouev;
-@@ -234,7 +235,7 @@
- 		    sprintf(err, "Error reading mouse queue, rc=%lu.\r\n", rc);
- 		    break;
- 		}
--		if (!SP->_emxmouse_activated)
-+		if (!sp->_emxmouse_activated)
- 		    goto finish;
- 
- 		/*
-@@ -246,13 +247,13 @@
- 		 */
- 		if ((mouev.fs ^ oldstate) & MOUSE_BN1_DOWN)
- 		    write_event(mouev.fs & MOUSE_BN1_DOWN,
--				SP->_emxmouse_buttons[1], mouev.col, mouev.row);
-+				sp->_emxmouse_buttons[1], mouev.col, mouev.row);
- 		if ((mouev.fs ^ oldstate) & MOUSE_BN2_DOWN)
- 		    write_event(mouev.fs & MOUSE_BN2_DOWN,
--				SP->_emxmouse_buttons[3], mouev.col, mouev.row);
-+				sp->_emxmouse_buttons[3], mouev.col, mouev.row);
- 		if ((mouev.fs ^ oldstate) & MOUSE_BN3_DOWN)
- 		    write_event(mouev.fs & MOUSE_BN3_DOWN,
--				SP->_emxmouse_buttons[2], mouev.col, mouev.row);
-+				sp->_emxmouse_buttons[2], mouev.col, mouev.row);
- 
- 	      finish:
- 		oldstate = mouev.fs;
-@@ -271,81 +272,87 @@
- 
- #if USE_SYSMOUSE
- static void
--handle_sysmouse(int sig GCC_UNUSED)
-+sysmouse_server(SCREEN *sp)
- {
-     struct mouse_info the_mouse;
-     MEVENT *work;
- 
-     the_mouse.operation = MOUSE_GETINFO;
--    if (SP != 0
--	&& SP->_mouse_fd >= 0
--	&& SP->_sysmouse_tail < FIFO_SIZE
--	&& ioctl(SP->_mouse_fd, CONS_MOUSECTL, &the_mouse) != -1) {
--
--	if (SP->_sysmouse_head > SP->_sysmouse_tail) {
--	    SP->_sysmouse_tail = 0;
--	    SP->_sysmouse_head = 0;
-+    if (sp != 0
-+	&& sp->_mouse_fd >= 0
-+	&& sp->_sysmouse_tail < FIFO_SIZE
-+	&& ioctl(sp->_mouse_fd, CONS_MOUSECTL, &the_mouse) != -1) {
-+
-+	if (sp->_sysmouse_head > sp->_sysmouse_tail) {
-+	    sp->_sysmouse_tail = 0;
-+	    sp->_sysmouse_head = 0;
- 	}
--	work = &(SP->_sysmouse_fifo[SP->_sysmouse_tail]);
-+	work = &(sp->_sysmouse_fifo[sp->_sysmouse_tail]);
- 	memset(work, 0, sizeof(*work));
- 	work->id = NORMAL_EVENT;	/* there's only one mouse... */
- 
--	SP->_sysmouse_old_buttons = SP->_sysmouse_new_buttons;
--	SP->_sysmouse_new_buttons = the_mouse.u.data.buttons & 0x7;
-+	sp->_sysmouse_old_buttons = sp->_sysmouse_new_buttons;
-+	sp->_sysmouse_new_buttons = the_mouse.u.data.buttons & 0x7;
- 
--	if (SP->_sysmouse_new_buttons) {
--	    if (SP->_sysmouse_new_buttons & 1)
-+	if (sp->_sysmouse_new_buttons) {
-+	    if (sp->_sysmouse_new_buttons & 1)
- 		work->bstate |= BUTTON1_PRESSED;
--	    if (SP->_sysmouse_new_buttons & 2)
-+	    if (sp->_sysmouse_new_buttons & 2)
- 		work->bstate |= BUTTON2_PRESSED;
--	    if (SP->_sysmouse_new_buttons & 4)
-+	    if (sp->_sysmouse_new_buttons & 4)
- 		work->bstate |= BUTTON3_PRESSED;
- 	} else {
--	    if (SP->_sysmouse_old_buttons & 1)
-+	    if (sp->_sysmouse_old_buttons & 1)
- 		work->bstate |= BUTTON1_RELEASED;
--	    if (SP->_sysmouse_old_buttons & 2)
-+	    if (sp->_sysmouse_old_buttons & 2)
- 		work->bstate |= BUTTON2_RELEASED;
--	    if (SP->_sysmouse_old_buttons & 4)
-+	    if (sp->_sysmouse_old_buttons & 4)
- 		work->bstate |= BUTTON3_RELEASED;
- 	}
- 
- 	/* for cosmetic bug in syscons.c on FreeBSD 3.[34] */
- 	the_mouse.operation = MOUSE_HIDE;
--	ioctl(SP->_mouse_fd, CONS_MOUSECTL, &the_mouse);
-+	ioctl(sp->_mouse_fd, CONS_MOUSECTL, &the_mouse);
- 	the_mouse.operation = MOUSE_SHOW;
--	ioctl(SP->_mouse_fd, CONS_MOUSECTL, &the_mouse);
-+	ioctl(sp->_mouse_fd, CONS_MOUSECTL, &the_mouse);
- 
- 	/*
- 	 * We're only interested if the button is pressed or released.
- 	 * FIXME: implement continuous event-tracking.
- 	 */
--	if (SP->_sysmouse_new_buttons != SP->_sysmouse_old_buttons) {
--	    SP->_sysmouse_tail += 1;
-+	if (sp->_sysmouse_new_buttons != sp->_sysmouse_old_buttons) {
-+	    sp->_sysmouse_tail += 1;
- 	}
--	work->x = the_mouse.u.data.x / SP->_sysmouse_char_width;
--	work->y = the_mouse.u.data.y / SP->_sysmouse_char_height;
-+	work->x = the_mouse.u.data.x / sp->_sysmouse_char_width;
-+	work->y = the_mouse.u.data.y / sp->_sysmouse_char_height;
-     }
- }
-+
-+static void
-+handle_sysmouse(int sig GCC_UNUSED)
-+{
-+    sysmouse_server(SP);
-+}
- #endif /* USE_SYSMOUSE */
- 
- static void
--init_xterm_mouse(void)
-+init_xterm_mouse(SCREEN *sp)
- {
--    SP->_mouse_type = M_XTERM;
--    SP->_mouse_xtermcap = tigetstr("XM");
--    if (!VALID_STRING(SP->_mouse_xtermcap))
--	SP->_mouse_xtermcap = "\033[?1000%?%p1%{1}%=%th%el%;";
-+    sp->_mouse_type = M_XTERM;
-+    sp->_mouse_xtermcap = tigetstr("XM");
-+    if (!VALID_STRING(sp->_mouse_xtermcap))
-+	sp->_mouse_xtermcap = "\033[?1000%?%p1%{1}%=%th%el%;";
- }
- 
- static void
--enable_xterm_mouse(int enable)
-+enable_xterm_mouse(SCREEN *sp, int enable)
- {
- #if USE_EMX_MOUSE
--    SP->_emxmouse_activated = enable;
-+    sp->_emxmouse_activated = enable;
- #else
--    putp(TPARM_1(SP->_mouse_xtermcap, enable));
-+    putp(TPARM_1(sp->_mouse_xtermcap, enable));
- #endif
--    SP->_mouse_active = enable;
-+    sp->_mouse_active = enable;
- }
- 
- #if USE_GPM_SUPPORT
-@@ -366,19 +373,19 @@
- }
- 
- static bool
--enable_gpm_mouse(int enable)
-+enable_gpm_mouse(SCREEN *sp, int enable)
- {
-     bool result;
- 
-     T((T_CALLED("enable_gpm_mouse(%d)"), enable));
- 
--    if (enable && !SP->_mouse_active) {
-+    if (enable && !sp->_mouse_active) {
- 	/* GPM: initialize connection to gpm server */
--	SP->_mouse_gpm_connect.eventMask = GPM_DOWN | GPM_UP;
--	SP->_mouse_gpm_connect.defaultMask =
--	    ~(SP->_mouse_gpm_connect.eventMask | GPM_HARD);
--	SP->_mouse_gpm_connect.minMod = 0;
--	SP->_mouse_gpm_connect.maxMod =
-+	sp->_mouse_gpm_connect.eventMask = GPM_DOWN | GPM_UP;
-+	sp->_mouse_gpm_connect.defaultMask =
-+	    ~(sp->_mouse_gpm_connect.eventMask | GPM_HARD);
-+	sp->_mouse_gpm_connect.minMod = 0;
-+	sp->_mouse_gpm_connect.maxMod =
- 	    (unsigned short) (~((1 << KG_SHIFT) |
- 				(1 << KG_SHIFTL) |
- 				(1 << KG_SHIFTR)));
-@@ -387,14 +394,14 @@
- 	 * The former is recognized by wscons (SunOS), and the latter by
- 	 * xterm.  Those will not show up in ncurses' traces.
- 	 */
--	result = (my_Gpm_Open(&SP->_mouse_gpm_connect, 0) >= 0);
--	SP->_mouse_active = result;
-+	result = (my_Gpm_Open(&sp->_mouse_gpm_connect, 0) >= 0);
-+	sp->_mouse_active = result;
- 	T(("GPM open %s", result ? "succeeded" : "failed"));
-     } else {
--	if (!enable && SP->_mouse_active) {
-+	if (!enable && sp->_mouse_active) {
- 	    /* GPM: close connection to gpm server */
- 	    my_Gpm_Close();
--	    SP->_mouse_active = FALSE;
-+	    sp->_mouse_active = FALSE;
- 	    T(("GPM closed"));
- 	}
- 	result = FALSE;
-@@ -403,17 +410,17 @@
- }
- #endif /* USE_GPM_SUPPORT */
- 
-+#define xterm_kmous "\033[M"
-+
- static void
--initialize_mousetype(void)
-+initialize_mousetype(SCREEN *sp)
- {
--    static const char *xterm_kmous = "\033[M";
--
-     T((T_CALLED("initialize_mousetype()")));
- 
-     /* Try gpm first, because gpm may be configured to run in xterm */
- #if USE_GPM_SUPPORT
-     if (allow_gpm_mouse()) {
--	if (!SP->_mouse_gpm_loaded) {
-+	if (!sp->_mouse_gpm_loaded) {
- #ifdef HAVE_LIBDL
- 	    void *obj;
- 
-@@ -425,13 +432,13 @@
- 		    T(("GPM initialization failed: %s", dlerror()));
- 		    dlclose(obj);
- 		} else {
--		    SP->_mouse_gpm_found = TRUE;
-+		    sp->_mouse_gpm_found = TRUE;
- 		}
- 	    }
- #else /* !HAVE_LIBDL */
--	    SP->_mouse_gpm_found = TRUE;
-+	    sp->_mouse_gpm_found = TRUE;
- #endif
--	    SP->_mouse_gpm_loaded = TRUE;
-+	    sp->_mouse_gpm_loaded = TRUE;
- 	}
- 
- 	/*
-@@ -439,10 +446,10 @@
- 	 * maintain our notion of whether the mouse connection is active
- 	 * without testing the file-descriptor.
- 	 */
--	if (SP->_mouse_gpm_found && enable_gpm_mouse(TRUE)) {
--	    SP->_mouse_type = M_GPM;
--	    SP->_mouse_fd = *(my_gpm_fd);
--	    T(("GPM mouse_fd %d", SP->_mouse_fd));
-+	if (sp->_mouse_gpm_found && enable_gpm_mouse(sp, TRUE)) {
-+	    sp->_mouse_type = M_GPM;
-+	    sp->_mouse_fd = *(my_gpm_fd);
-+	    T(("GPM mouse_fd %d", sp->_mouse_fd));
- 	    returnVoid;
- 	}
-     }
-@@ -450,7 +457,7 @@
- 
-     /* OS/2 VIO */
- #if USE_EMX_MOUSE
--    if (!SP->_emxmouse_thread
-+    if (!sp->_emxmouse_thread
- 	&& strstr(cur_term->type.term_names, "xterm") == 0
- 	&& key_mouse) {
- 	int handles[2];
-@@ -461,32 +468,32 @@
- 	} else {
- 	    int rc;
- 
--	    if (!SP->_emxmouse_buttons[0]) {
-+	    if (!sp->_emxmouse_buttons[0]) {
- 		char *s = getenv("MOUSE_BUTTONS_123");
- 
--		SP->_emxmouse_buttons[0] = 1;
-+		sp->_emxmouse_buttons[0] = 1;
- 		if (s && strlen(s) >= 3) {
--		    SP->_emxmouse_buttons[1] = s[0] - '0';
--		    SP->_emxmouse_buttons[2] = s[1] - '0';
--		    SP->_emxmouse_buttons[3] = s[2] - '0';
-+		    sp->_emxmouse_buttons[1] = s[0] - '0';
-+		    sp->_emxmouse_buttons[2] = s[1] - '0';
-+		    sp->_emxmouse_buttons[3] = s[2] - '0';
- 		} else {
--		    SP->_emxmouse_buttons[1] = 1;
--		    SP->_emxmouse_buttons[2] = 3;
--		    SP->_emxmouse_buttons[3] = 2;
-+		    sp->_emxmouse_buttons[1] = 1;
-+		    sp->_emxmouse_buttons[2] = 3;
-+		    sp->_emxmouse_buttons[3] = 2;
- 		}
- 	    }
--	    SP->_emxmouse_wfd = handles[1];
--	    M_FD(SP) = handles[0];
-+	    sp->_emxmouse_wfd = handles[1];
-+	    M_FD(sp) = handles[0];
- 	    /* Needed? */
- 	    setmode(handles[0], O_BINARY);
- 	    setmode(handles[1], O_BINARY);
- 	    /* Do not use CRT functions, we may single-threaded. */
--	    rc = DosCreateThread((unsigned long *) &SP->_emxmouse_thread,
--				 mouse_server, 0, 0, 8192);
-+	    rc = DosCreateThread((unsigned long *) &sp->_emxmouse_thread,
-+				 mouse_server, sp, 0, 8192);
- 	    if (rc) {
- 		printf("mouse thread error %d=%#x", rc, rc);
- 	    } else {
--		SP->_mouse_type = M_XTERM;
-+		sp->_mouse_type = M_XTERM;
- 	    }
- 	    returnVoid;
- 	}
-@@ -498,14 +505,14 @@
- 	struct mouse_info the_mouse;
- 	char *the_device = 0;
- 
--	if (isatty(SP->_ifd))
--	    the_device = ttyname(SP->_ifd);
-+	if (isatty(sp->_ifd))
-+	    the_device = ttyname(sp->_ifd);
- 	if (the_device == 0)
- 	    the_device = "/dev/tty";
- 
--	SP->_mouse_fd = open(the_device, O_RDWR);
-+	sp->_mouse_fd = open(the_device, O_RDWR);
- 
--	if (SP->_mouse_fd >= 0) {
-+	if (sp->_mouse_fd >= 0) {
- 	    /*
- 	     * sysmouse does not have a usable user interface for obtaining
- 	     * mouse events.  The logical way to proceed (reading data on a
-@@ -522,10 +529,10 @@
- 	    the_mouse.operation = MOUSE_MODE;
- 	    the_mouse.u.mode.mode = 0;
- 	    the_mouse.u.mode.signal = SIGUSR2;
--	    if (ioctl(SP->_mouse_fd, CONS_MOUSECTL, &the_mouse) != -1) {
-+	    if (ioctl(sp->_mouse_fd, CONS_MOUSECTL, &the_mouse) != -1) {
- 		signal(SIGUSR2, handle_sysmouse);
- 		the_mouse.operation = MOUSE_SHOW;
--		ioctl(SP->_mouse_fd, CONS_MOUSECTL, &the_mouse);
-+		ioctl(sp->_mouse_fd, CONS_MOUSECTL, &the_mouse);
- 
- #if defined(FBIO_MODEINFO) || defined(CONS_MODEINFO)	/* FreeBSD > 2.x */
- 		{
-@@ -535,23 +542,23 @@
- #endif /* FBIO_GETMODE */
- 		    video_info_t the_video;
- 
--		    if (ioctl(SP->_mouse_fd,
-+		    if (ioctl(sp->_mouse_fd,
- 			      FBIO_GETMODE,
- 			      &the_video.vi_mode) != -1
--			&& ioctl(SP->_mouse_fd,
-+			&& ioctl(sp->_mouse_fd,
- 				 FBIO_MODEINFO,
- 				 &the_video) != -1) {
--			SP->_sysmouse_char_width = the_video.vi_cwidth;
--			SP->_sysmouse_char_height = the_video.vi_cheight;
-+			sp->_sysmouse_char_width = the_video.vi_cwidth;
-+			sp->_sysmouse_char_height = the_video.vi_cheight;
- 		    }
- 		}
- #endif /* defined(FBIO_MODEINFO) || defined(CONS_MODEINFO) */
- 
--		if (SP->_sysmouse_char_width <= 0)
--		    SP->_sysmouse_char_width = 8;
--		if (SP->_sysmouse_char_height <= 0)
--		    SP->_sysmouse_char_height = 16;
--		SP->_mouse_type = M_SYSMOUSE;
-+		if (sp->_sysmouse_char_width <= 0)
-+		    sp->_sysmouse_char_width = 8;
-+		if (sp->_sysmouse_char_height <= 0)
-+		    sp->_sysmouse_char_height = 16;
-+		sp->_mouse_type = M_SYSMOUSE;
- 		returnVoid;
- 	    }
- 	}
-@@ -562,37 +569,37 @@
-     if (key_mouse != 0) {
- 	if (!strcmp(key_mouse, xterm_kmous)
- 	    || strstr(cur_term->type.term_names, "xterm") != 0) {
--	    init_xterm_mouse();
-+	    init_xterm_mouse(sp);
- 	}
-     } else if (strstr(cur_term->type.term_names, "xterm") != 0) {
--	(void) _nc_add_to_try(&(SP->_keytry), xterm_kmous, KEY_MOUSE);
--	init_xterm_mouse();
-+	if (_nc_add_to_try(&(sp->_keytry), xterm_kmous, KEY_MOUSE) == OK)
-+	    init_xterm_mouse(sp);
-     }
-     returnVoid;
- }
- 
- static bool
--_nc_mouse_init(void)
-+_nc_mouse_init(SCREEN *sp)
- /* initialize the mouse */
- {
-     bool result = FALSE;
-     int i;
- 
--    if (SP != 0) {
--	if (!SP->_mouse_initialized) {
--	    SP->_mouse_initialized = TRUE;
-+    if (sp != 0) {
-+	if (!sp->_mouse_initialized) {
-+	    sp->_mouse_initialized = TRUE;
- 
- 	    TR(MY_TRACE, ("_nc_mouse_init() called"));
- 
--	    SP->_mouse_eventp = SP->_mouse_events;
-+	    sp->_mouse_eventp = sp->_mouse_events;
- 	    for (i = 0; i < EV_MAX; i++)
--		SP->_mouse_events[i].id = INVALID_EVENT;
-+		sp->_mouse_events[i].id = INVALID_EVENT;
- 
--	    initialize_mousetype();
-+	    initialize_mousetype(sp);
- 
--	    T(("_nc_mouse_init() set mousetype to %d", SP->_mouse_type));
-+	    T(("_nc_mouse_init() set mousetype to %d", sp->_mouse_type));
- 	}
--	result = SP->_mouse_initialized;
-+	result = sp->_mouse_initialized;
-     }
-     return result;
- }
-@@ -604,12 +611,12 @@
- static bool
- _nc_mouse_event(SCREEN *sp GCC_UNUSED)
- {
--    MEVENT *eventp = SP->_mouse_eventp;
-+    MEVENT *eventp = sp->_mouse_eventp;
-     bool result = FALSE;
- 
-     (void) eventp;
- 
--    switch (SP->_mouse_type) {
-+    switch (sp->_mouse_type) {
-     case M_XTERM:
- 	/* xterm: never have to query, mouse events are in the keyboard stream */
- #if USE_EMX_MOUSE
-@@ -666,7 +673,7 @@
- 		eventp->z = 0;
- 
- 		/* bump the next-free pointer into the circular list */
--		SP->_mouse_eventp = eventp = NEXT(eventp);
-+		sp->_mouse_eventp = eventp = NEXT(eventp);
- 		result = TRUE;
- 	    }
- 	}
-@@ -675,22 +682,22 @@
- 
- #if USE_SYSMOUSE
-     case M_SYSMOUSE:
--	if (SP->_sysmouse_head < SP->_sysmouse_tail) {
--	    *eventp = SP->_sysmouse_fifo[SP->_sysmouse_head];
-+	if (sp->_sysmouse_head < sp->_sysmouse_tail) {
-+	    *eventp = sp->_sysmouse_fifo[sp->_sysmouse_head];
- 
- 	    /*
- 	     * Point the fifo-head to the next possible location.  If there
- 	     * are none, reset the indices.  This may be interrupted by the
- 	     * signal handler, doing essentially the same reset.
- 	     */
--	    SP->_sysmouse_head += 1;
--	    if (SP->_sysmouse_head == SP->_sysmouse_tail) {
--		SP->_sysmouse_tail = 0;
--		SP->_sysmouse_head = 0;
-+	    sp->_sysmouse_head += 1;
-+	    if (sp->_sysmouse_head == sp->_sysmouse_tail) {
-+		sp->_sysmouse_tail = 0;
-+		sp->_sysmouse_head = 0;
- 	    }
- 
- 	    /* bump the next-free pointer into the circular list */
--	    SP->_mouse_eventp = eventp = NEXT(eventp);
-+	    sp->_mouse_eventp = eventp = NEXT(eventp);
- 	    result = TRUE;
- 	}
- 	break;
-@@ -709,11 +716,11 @@
- {
-     int b;
-     bool result = FALSE;
--    MEVENT *eventp = SP->_mouse_eventp;
-+    MEVENT *eventp = sp->_mouse_eventp;
- 
-     TR(MY_TRACE, ("_nc_mouse_inline() called"));
- 
--    if (SP->_mouse_type == M_XTERM) {
-+    if (sp->_mouse_type == M_XTERM) {
- 	unsigned char kbuf[4];
- 	mmask_t prev;
- 	size_t grabbed;
-@@ -847,11 +854,11 @@
- 	eventp->y = (kbuf[2] - ' ') - 1;
- 	TR(MY_TRACE,
- 	   ("_nc_mouse_inline: primitive mouse-event %s has slot %ld",
--	    _tracemouse(eventp),
--	    (long) (eventp - SP->_mouse_events)));
-+	    _nc_tracemouse(sp, eventp),
-+	    (long) (eventp - sp->_mouse_events)));
- 
- 	/* bump the next-free pointer into the circular list */
--	SP->_mouse_eventp = NEXT(eventp);
-+	sp->_mouse_eventp = NEXT(eventp);
- #if 0				/* this return would be needed for QNX's mods to lib_getch.c */
- 	return (TRUE);
- #endif
-@@ -861,36 +868,36 @@
- }
- 
- static void
--mouse_activate(bool on)
-+mouse_activate(SCREEN *sp, bool on)
- {
--    if (!on && !SP->_mouse_initialized)
-+    if (!on && !sp->_mouse_initialized)
- 	return;
- 
--    if (!_nc_mouse_init())
-+    if (!_nc_mouse_init(sp))
- 	return;
- 
-     if (on) {
- 
--	switch (SP->_mouse_type) {
-+	switch (sp->_mouse_type) {
- 	case M_XTERM:
- #if NCURSES_EXT_FUNCS
- 	    keyok(KEY_MOUSE, on);
- #endif
- 	    TPUTS_TRACE("xterm mouse initialization");
--	    enable_xterm_mouse(1);
-+	    enable_xterm_mouse(sp, 1);
- 	    break;
- #if USE_GPM_SUPPORT
- 	case M_GPM:
--	    if (enable_gpm_mouse(1)) {
--		SP->_mouse_fd = *(my_gpm_fd);
--		T(("GPM mouse_fd %d", SP->_mouse_fd));
-+	    if (enable_gpm_mouse(sp, 1)) {
-+		sp->_mouse_fd = *(my_gpm_fd);
-+		T(("GPM mouse_fd %d", sp->_mouse_fd));
- 	    }
- 	    break;
- #endif
- #if USE_SYSMOUSE
- 	case M_SYSMOUSE:
- 	    signal(SIGUSR2, handle_sysmouse);
--	    SP->_mouse_active = TRUE;
-+	    sp->_mouse_active = TRUE;
- 	    break;
- #endif
- 	case M_NONE:
-@@ -899,27 +906,27 @@
- 	/* Make runtime binding to cut down on object size of applications that
- 	 * do not use the mouse (e.g., 'clear').
- 	 */
--	SP->_mouse_event = _nc_mouse_event;
--	SP->_mouse_inline = _nc_mouse_inline;
--	SP->_mouse_parse = _nc_mouse_parse;
--	SP->_mouse_resume = _nc_mouse_resume;
--	SP->_mouse_wrap = _nc_mouse_wrap;
-+	sp->_mouse_event = _nc_mouse_event;
-+	sp->_mouse_inline = _nc_mouse_inline;
-+	sp->_mouse_parse = _nc_mouse_parse;
-+	sp->_mouse_resume = _nc_mouse_resume;
-+	sp->_mouse_wrap = _nc_mouse_wrap;
-     } else {
- 
--	switch (SP->_mouse_type) {
-+	switch (sp->_mouse_type) {
- 	case M_XTERM:
- 	    TPUTS_TRACE("xterm mouse deinitialization");
--	    enable_xterm_mouse(0);
-+	    enable_xterm_mouse(sp, 0);
- 	    break;
- #if USE_GPM_SUPPORT
- 	case M_GPM:
--	    enable_gpm_mouse(0);
-+	    enable_gpm_mouse(sp, 0);
- 	    break;
- #endif
- #if USE_SYSMOUSE
- 	case M_SYSMOUSE:
- 	    signal(SIGUSR2, SIG_IGN);
--	    SP->_mouse_active = FALSE;
-+	    sp->_mouse_active = FALSE;
- 	    break;
- #endif
- 	case M_NONE:
-@@ -936,10 +943,10 @@
-  **************************************************************************/
- 
- static bool
--_nc_mouse_parse(int runcount)
-+_nc_mouse_parse(SCREEN *sp, int runcount)
- /* parse a run of atomic mouse events into a gesture */
- {
--    MEVENT *eventp = SP->_mouse_eventp;
-+    MEVENT *eventp = sp->_mouse_eventp;
-     MEVENT *ep, *runp, *next, *prev = PREV(eventp);
-     int n;
-     int b;
-@@ -971,10 +978,10 @@
-     if (runcount == 1) {
- 	TR(MY_TRACE,
- 	   ("_nc_mouse_parse: returning simple mouse event %s at slot %ld",
--	    _tracemouse(prev),
--	    (long) (prev - SP->_mouse_events)));
-+	    _nc_tracemouse(sp, prev),
-+	    (long) (prev - sp->_mouse_events)));
- 	return (prev->id >= NORMAL_EVENT)
--	    ? ((prev->bstate & SP->_mouse_mask) ? TRUE : FALSE)
-+	    ? ((prev->bstate & sp->_mouse_mask) ? TRUE : FALSE)
- 	    : FALSE;
-     }
- 
-@@ -985,12 +992,13 @@
-     }
- 
- #ifdef TRACE
--    if (_nc_tracing & TRACE_IEVENT) {
--	_trace_slot("before mouse press/release merge:");
-+    if (USE_TRACEF(TRACE_IEVENT)) {
-+	_trace_slot(sp, "before mouse press/release merge:");
- 	_tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d",
--		(long) (runp - SP->_mouse_events),
--		(long) ((eventp - SP->_mouse_events) + (EV_MAX - 1)) % EV_MAX,
-+		(long) (runp - sp->_mouse_events),
-+		(long) ((eventp - sp->_mouse_events) + (EV_MAX - 1)) % EV_MAX,
- 		runcount);
-+	_nc_unlock_global(tracef);
-     }
- #endif /* TRACE */
- 
-@@ -1013,7 +1021,7 @@
- #endif
- 		) {
- 		for (b = 1; b <= MAX_BUTTONS; ++b) {
--		    if ((SP->_mouse_mask & MASK_CLICK(b))
-+		    if ((sp->_mouse_mask & MASK_CLICK(b))
- 			&& (ep->bstate & MASK_PRESS(b))) {
- 			ep->bstate &= ~MASK_PRESS(b);
- 			ep->bstate |= MASK_CLICK(b);
-@@ -1028,12 +1036,13 @@
- 	(merge);
- 
- #ifdef TRACE
--    if (_nc_tracing & TRACE_IEVENT) {
--	_trace_slot("before mouse click merge:");
-+    if (USE_TRACEF(TRACE_IEVENT)) {
-+	_trace_slot(sp, "before mouse click merge:");
- 	_tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d",
--		(long) (runp - SP->_mouse_events),
--		(long) ((eventp - SP->_mouse_events) + (EV_MAX - 1)) % EV_MAX,
-+		(long) (runp - sp->_mouse_events),
-+		(long) ((eventp - sp->_mouse_events) + (EV_MAX - 1)) % EV_MAX,
- 		runcount);
-+	_nc_unlock_global(tracef);
-     }
- #endif /* TRACE */
- 
-@@ -1069,7 +1078,7 @@
- 		if ((ep->bstate & BUTTON_CLICKED)
- 		    && (follower->bstate & BUTTON_CLICKED)) {
- 		    for (b = 1; b <= MAX_BUTTONS; ++b) {
--			if ((SP->_mouse_mask & MASK_DOUBLE_CLICK(b))
-+			if ((sp->_mouse_mask & MASK_DOUBLE_CLICK(b))
- 			    && (follower->bstate & MASK_CLICK(b))) {
- 			    follower->bstate &= ~MASK_CLICK(b);
- 			    follower->bstate |= MASK_DOUBLE_CLICK(b);
-@@ -1084,7 +1093,7 @@
- 		if ((ep->bstate & BUTTON_DOUBLE_CLICKED)
- 		    && (follower->bstate & BUTTON_CLICKED)) {
- 		    for (b = 1; b <= MAX_BUTTONS; ++b) {
--			if ((SP->_mouse_mask & MASK_TRIPLE_CLICK(b))
-+			if ((sp->_mouse_mask & MASK_TRIPLE_CLICK(b))
- 			    && (follower->bstate & MASK_CLICK(b))) {
- 			    follower->bstate &= ~MASK_CLICK(b);
- 			    follower->bstate |= MASK_TRIPLE_CLICK(b);
-@@ -1099,12 +1108,13 @@
- 	(merge);
- 
- #ifdef TRACE
--    if (_nc_tracing & TRACE_IEVENT) {
--	_trace_slot("before mouse event queue compaction:");
-+    if (USE_TRACEF(TRACE_IEVENT)) {
-+	_trace_slot(sp, "before mouse event queue compaction:");
- 	_tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d",
--		(long) (runp - SP->_mouse_events),
--		(long) ((eventp - SP->_mouse_events) + (EV_MAX - 1)) % EV_MAX,
-+		(long) (runp - sp->_mouse_events),
-+		(long) ((eventp - sp->_mouse_events) + (EV_MAX - 1)) % EV_MAX,
- 		runcount);
-+	_nc_unlock_global(tracef);
-     }
- #endif /* TRACE */
- 
-@@ -1113,23 +1123,24 @@
-      * don't match the current event mask.
-      */
-     for (; runcount; prev = PREV(eventp), runcount--)
--	if (prev->id == INVALID_EVENT || !(prev->bstate & SP->_mouse_mask)) {
--	    SP->_mouse_eventp = eventp = prev;
-+	if (prev->id == INVALID_EVENT || !(prev->bstate & sp->_mouse_mask)) {
-+	    sp->_mouse_eventp = eventp = prev;
- 	}
- #ifdef TRACE
--    if (_nc_tracing & TRACE_IEVENT) {
--	_trace_slot("after mouse event queue compaction:");
-+    if (USE_TRACEF(TRACE_IEVENT)) {
-+	_trace_slot(sp, "after mouse event queue compaction:");
- 	_tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d",
--		(long) (runp - SP->_mouse_events),
--		(long) ((eventp - SP->_mouse_events) + (EV_MAX - 1)) % EV_MAX,
-+		(long) (runp - sp->_mouse_events),
-+		(long) ((eventp - sp->_mouse_events) + (EV_MAX - 1)) % EV_MAX,
- 		runcount);
-+	_nc_unlock_global(tracef);
-     }
-     for (ep = runp; ep != eventp; ep = NEXT(ep))
- 	if (ep->id != INVALID_EVENT)
- 	    TR(MY_TRACE,
- 	       ("_nc_mouse_parse: returning composite mouse event %s at slot %ld",
--		_tracemouse(ep),
--		(long) (ep - SP->_mouse_events)));
-+		_nc_tracemouse(sp, ep),
-+		(long) (ep - sp->_mouse_events)));
- #endif /* TRACE */
- 
-     /* after all this, do we have a valid event? */
-@@ -1137,26 +1148,26 @@
- }
- 
- static void
--_nc_mouse_wrap(SCREEN *sp GCC_UNUSED)
-+_nc_mouse_wrap(SCREEN *sp)
- /* release mouse -- called by endwin() before shellout/exit */
- {
-     TR(MY_TRACE, ("_nc_mouse_wrap() called"));
- 
--    switch (SP->_mouse_type) {
-+    switch (sp->_mouse_type) {
-     case M_XTERM:
--	if (SP->_mouse_mask)
--	    mouse_activate(FALSE);
-+	if (sp->_mouse_mask)
-+	    mouse_activate(sp, FALSE);
- 	break;
- #if USE_GPM_SUPPORT
- 	/* GPM: pass all mouse events to next client */
-     case M_GPM:
--	if (SP->_mouse_mask)
--	    mouse_activate(FALSE);
-+	if (sp->_mouse_mask)
-+	    mouse_activate(sp, FALSE);
- 	break;
- #endif
- #if USE_SYSMOUSE
-     case M_SYSMOUSE:
--	mouse_activate(FALSE);
-+	mouse_activate(sp, FALSE);
- 	break;
- #endif
-     case M_NONE:
-@@ -1165,29 +1176,29 @@
- }
- 
- static void
--_nc_mouse_resume(SCREEN *sp GCC_UNUSED)
-+_nc_mouse_resume(SCREEN *sp)
- /* re-connect to mouse -- called by doupdate() after shellout */
- {
-     TR(MY_TRACE, ("_nc_mouse_resume() called"));
- 
--    switch (SP->_mouse_type) {
-+    switch (sp->_mouse_type) {
-     case M_XTERM:
- 	/* xterm: re-enable reporting */
--	if (SP->_mouse_mask)
--	    mouse_activate(TRUE);
-+	if (sp->_mouse_mask)
-+	    mouse_activate(sp, TRUE);
- 	break;
- 
- #if USE_GPM_SUPPORT
-     case M_GPM:
- 	/* GPM: reclaim our event set */
--	if (SP->_mouse_mask)
--	    mouse_activate(TRUE);
-+	if (sp->_mouse_mask)
-+	    mouse_activate(sp, TRUE);
- 	break;
- #endif
- 
- #if USE_SYSMOUSE
-     case M_SYSMOUSE:
--	mouse_activate(TRUE);
-+	mouse_activate(sp, TRUE);
- 	break;
- #endif
-     case M_NONE:
-@@ -1201,14 +1212,13 @@
-  *
-  **************************************************************************/
- 
--NCURSES_EXPORT(int)
--getmouse(MEVENT * aevent)
--/* grab a copy of the current mouse event */
-+static int
-+_nc_getmouse(SCREEN *sp, MEVENT * aevent)
- {
-     T((T_CALLED("getmouse(%p)"), aevent));
- 
--    if ((aevent != 0) && (SP != 0) && (SP->_mouse_type != M_NONE)) {
--	MEVENT *eventp = SP->_mouse_eventp;
-+    if ((aevent != 0) && (sp != 0) && (sp->_mouse_type != M_NONE)) {
-+	MEVENT *eventp = sp->_mouse_eventp;
- 	/* compute the current-event pointer */
- 	MEVENT *prev = PREV(eventp);
- 
-@@ -1216,8 +1226,8 @@
- 	*aevent = *prev;
- 
- 	TR(TRACE_IEVENT, ("getmouse: returning event %s from slot %ld",
--			  _tracemouse(prev),
--			  (long) (prev - SP->_mouse_events)));
-+			  _nc_tracemouse(sp, prev),
-+			  (long) (prev - sp->_mouse_events)));
- 
- 	prev->id = INVALID_EVENT;	/* so the queue slot becomes free */
- 	returnCode(OK);
-@@ -1225,29 +1235,42 @@
-     returnCode(ERR);
- }
- 
-+/* grab a copy of the current mouse event */
- NCURSES_EXPORT(int)
--ungetmouse(MEVENT * aevent)
--/* enqueue a synthesized mouse event to be seen by the next wgetch() */
-+getmouse(MEVENT * aevent)
-+{
-+    return _nc_getmouse(SP, aevent);
-+}
-+
-+static int
-+_nc_ungetmouse(SCREEN *sp, MEVENT * aevent)
- {
-     int result = ERR;
- 
-     T((T_CALLED("ungetmouse(%p)"), aevent));
- 
--    if (aevent != 0 && SP != 0) {
--	MEVENT *eventp = SP->_mouse_eventp;
-+    if (aevent != 0 && sp != 0) {
-+	MEVENT *eventp = sp->_mouse_eventp;
- 
- 	/* stick the given event in the next-free slot */
- 	*eventp = *aevent;
- 
- 	/* bump the next-free pointer into the circular list */
--	SP->_mouse_eventp = NEXT(eventp);
-+	sp->_mouse_eventp = NEXT(eventp);
- 
- 	/* push back the notification event on the keyboard queue */
--	result = ungetch(KEY_MOUSE);
-+	result = _nc_ungetch(sp, KEY_MOUSE);
-     }
-     returnCode(result);
- }
- 
-+/* enqueue a synthesized mouse event to be seen by the next wgetch() */
-+NCURSES_EXPORT(int)
-+ungetmouse(MEVENT * aevent)
-+{
-+    return _nc_ungetmouse(SP, aevent);
-+}
-+
- NCURSES_EXPORT(mmask_t)
- mousemask(mmask_t newmask, mmask_t * oldmask)
- /* set the mouse event mask */
-@@ -1261,7 +1284,7 @@
- 	    *oldmask = SP->_mouse_mask;
- 
- 	if (newmask || SP->_mouse_initialized) {
--	    _nc_mouse_init();
-+	    _nc_mouse_init(SP);
- 	    if (SP->_mouse_type != M_NONE) {
- 		result = newmask &
- 		    (REPORT_MOUSE_POSITION
-@@ -1274,7 +1297,7 @@
- 		     | BUTTON_DOUBLE_CLICKED
- 		     | BUTTON_TRIPLE_CLICKED);
- 
--		mouse_activate((bool) (result != 0));
-+		mouse_activate(SP, (bool) (result != 0));
- 
- 		SP->_mouse_mask = result;
- 	    }
-diff -Naur ncurses-5.6.orig/ncurses/base/lib_newterm.c ncurses-5.6/ncurses/base/lib_newterm.c
---- ncurses-5.6.orig/ncurses/base/lib_newterm.c	2006-01-14 10:36:24.000000000 -0500
-+++ ncurses-5.6/ncurses/base/lib_newterm.c	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -48,7 +48,7 @@
- #include <term.h>		/* clear_screen, cup & friends, cur_term */
- #include <tic.h>
- 
--MODULE_ID("$Id: lib_newterm.c,v 1.64 2006/01/14 15:36:24 tom Exp $")
-+MODULE_ID("$Id: lib_newterm.c,v 1.70 2008/06/07 14:00:23 tom Exp $")
- 
- #ifndef ONLCR			/* Allows compilation under the QNX 4.2 OS */
- #define ONLCR 0
-@@ -94,14 +94,12 @@
-  * aside from possibly delaying a filter() call until some terminals have been
-  * initialized.
-  */
--static bool filter_mode = FALSE;
--
- NCURSES_EXPORT(void)
- filter(void)
- {
-     START_TRACE();
-     T((T_CALLED("filter")));
--    filter_mode = TRUE;
-+    _nc_prescreen.filter_mode = TRUE;
-     returnVoid;
- }
- 
-@@ -115,7 +113,7 @@
- {
-     START_TRACE();
-     T((T_CALLED("nofilter")));
--    filter_mode = FALSE;
-+    _nc_prescreen.filter_mode = FALSE;
-     returnVoid;
- }
- #endif
-@@ -125,31 +123,34 @@
- {
-     int value;
-     int errret;
--    int slk_format = _nc_slk_format;
-     SCREEN *current;
-     SCREEN *result = 0;
- 
-     START_TRACE();
-     T((T_CALLED("newterm(\"%s\",%p,%p)"), name, ofp, ifp));
- 
--    _nc_handle_sigwinch(0);
--
--    /* allow user to set maximum escape delay from the environment */
--    if ((value = _nc_getenv_num("ESCDELAY")) >= 0) {
--	ESCDELAY = value;
--    }
--
-+    _nc_lock_global(curses);
-     /* this loads the capability entry, then sets LINES and COLS */
--    if (setupterm(name, fileno(ofp), &errret) == ERR) {
--	result = 0;
--    } else {
-+    if (setupterm(name, fileno(ofp), &errret) != ERR) {
-+	int slk_format = _nc_globals.slk_format;
-+
- 	/*
- 	 * This actually allocates the screen structure, and saves the original
- 	 * terminal settings.
- 	 */
- 	current = SP;
- 	_nc_set_screen(0);
--	if (_nc_setupscreen(LINES, COLS, ofp, filter_mode, slk_format) == ERR) {
-+
-+	/* allow user to set maximum escape delay from the environment */
-+	if ((value = _nc_getenv_num("ESCDELAY")) >= 0) {
-+	    set_escdelay(value);
-+	}
-+
-+	if (_nc_setupscreen(LINES,
-+			    COLS,
-+			    ofp,
-+			    _nc_prescreen.filter_mode,
-+			    slk_format) == ERR) {
- 	    _nc_set_screen(current);
- 	    result = 0;
- 	} else {
-@@ -211,6 +212,6 @@
- 	    result = SP;
- 	}
-     }
--    _nc_handle_sigwinch(1);
-+    _nc_unlock_global(curses);
-     returnSP(result);
- }
-diff -Naur ncurses-5.6.orig/ncurses/base/lib_newwin.c ncurses-5.6/ncurses/base/lib_newwin.c
---- ncurses-5.6.orig/ncurses/base/lib_newwin.c	2006-10-14 16:31:19.000000000 -0400
-+++ ncurses-5.6/ncurses/base/lib_newwin.c	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -40,36 +40,39 @@
- */
- 
- #include <curses.priv.h>
-+#include <stddef.h>
- 
--MODULE_ID("$Id: lib_newwin.c,v 1.38 2006/10/14 20:31:19 tom Exp $")
-+MODULE_ID("$Id: lib_newwin.c,v 1.52 2008/06/07 13:58:09 tom Exp $")
- 
--static WINDOW *
-+#define window_is(name) ((sp)->_##name == win)
-+
-+#if USE_REENTRANT
-+#define remove_window(name) \
-+		sp->_##name = 0
-+#else
-+#define remove_window(name) \
-+		sp->_##name = 0; \
-+		if (win == name) \
-+		    name = 0
-+#endif
-+
-+static void
- remove_window_from_screen(WINDOW *win)
- {
--    SCREEN **scan = &_nc_screen_chain;
-+    SCREEN *sp;
- 
--    while (*scan) {
--	SCREEN *sp = *scan;
--	if (sp->_curscr == win) {
--	    sp->_curscr = 0;
--	    if (win == curscr)
--		curscr = 0;
--	} else if (sp->_stdscr == win) {
--	    sp->_stdscr = 0;
--	    if (win == stdscr)
--		stdscr = 0;
--	} else if (sp->_newscr == win) {
--	    sp->_newscr = 0;
--	    if (win == newscr)
--		newscr = 0;
--	} else {
--	    scan = &(*scan)->_next_screen;
--	    continue;
-+    for (each_screen(sp)) {
-+	if (window_is(curscr)) {
-+	    remove_window(curscr);
-+	    break;
-+	} else if (window_is(stdscr)) {
-+	    remove_window(stdscr);
-+	    break;
-+	} else if (window_is(newscr)) {
-+	    remove_window(newscr);
-+	    break;
- 	}
--	break;
-     }
--
--    return 0;
- }
- 
- NCURSES_EXPORT(int)
-@@ -79,29 +82,36 @@
-     int i;
-     int result = ERR;
- 
-+    T((T_CALLED("_nc_freewin(%p)"), win));
-+
-     if (win != 0) {
--	for (p = _nc_windows, q = 0; p != 0; q = p, p = p->next) {
--	    if (&(p->win) == win) {
--		remove_window_from_screen(win);
--		if (q == 0)
--		    _nc_windows = p->next;
--		else
--		    q->next = p->next;
--
--		if (!(win->_flags & _SUBWIN)) {
--		    for (i = 0; i <= win->_maxy; i++)
--			FreeIfNeeded(win->_line[i].text);
-+	if (_nc_try_global(curses) == 0) {
-+	    q = 0;
-+	    for (each_window(p)) {
-+		if (&(p->win) == win) {
-+		    remove_window_from_screen(win);
-+		    if (q == 0)
-+			_nc_windows = p->next;
-+		    else
-+			q->next = p->next;
-+
-+		    if (!(win->_flags & _SUBWIN)) {
-+			for (i = 0; i <= win->_maxy; i++)
-+			    FreeIfNeeded(win->_line[i].text);
-+		    }
-+		    free(win->_line);
-+		    free(p);
-+
-+		    result = OK;
-+		    T(("...deleted win=%p", win));
-+		    break;
- 		}
--		free(win->_line);
--		free(p);
--
--		result = OK;
--		T(("...deleted win=%p", win));
--		break;
-+		q = p;
- 	    }
-+	    _nc_unlock_global(curses);
- 	}
-     }
--    return result;
-+    returnCode(result);
- }
- 
- NCURSES_EXPORT(WINDOW *)
-@@ -208,24 +218,26 @@
-     WINDOW *win;
-     bool is_pad = (flags & _ISPAD);
- 
--    T(("_nc_makenew(%d,%d,%d,%d)", num_lines, num_columns, begy, begx));
-+    T((T_CALLED("_nc_makenew(%d,%d,%d,%d)"), num_lines, num_columns, begy, begx));
- 
-     if (SP == 0)
--	return 0;
-+	returnWin(0);
- 
-     if (!dimension_limit(num_lines) || !dimension_limit(num_columns))
--	return 0;
-+	returnWin(0);
- 
-     if ((wp = typeCalloc(WINDOWLIST, 1)) == 0)
--	return 0;
-+	returnWin(0);
- 
-     win = &(wp->win);
- 
-     if ((win->_line = typeCalloc(struct ldat, ((unsigned) num_lines))) == 0) {
- 	free(win);
--	return 0;
-+	returnWin(0);
-     }
- 
-+    _nc_lock_global(curses);
-+
-     win->_curx = 0;
-     win->_cury = 0;
-     win->_maxy = num_lines - 1;
-@@ -299,9 +311,28 @@
-     }
- 
-     wp->next = _nc_windows;
-+    wp->screen = SP;
-     _nc_windows = wp;
- 
-     T((T_CREATE("window %p"), win));
- 
--    return (win);
-+    _nc_unlock_global(curses);
-+    returnWin(win);
-+}
-+
-+/*
-+ * wgetch() and other functions with a WINDOW* parameter may use a SCREEN*
-+ * internally, and it is useful to allow those to be invoked without switching
-+ * SCREEN's, e.g., for multi-threaded applications.
-+ */
-+NCURSES_EXPORT(SCREEN *)
-+_nc_screen_of(WINDOW *win)
-+{
-+    SCREEN *sp = 0;
-+
-+    if (win != 0) {
-+	WINDOWLIST *wp = (WINDOWLIST *) win;
-+	sp = wp->screen;
-+    }
-+    return (sp);
- }
-diff -Naur ncurses-5.6.orig/ncurses/base/lib_overlay.c ncurses-5.6/ncurses/base/lib_overlay.c
---- ncurses-5.6.orig/ncurses/base/lib_overlay.c	2006-10-14 16:43:31.000000000 -0400
-+++ ncurses-5.6/ncurses/base/lib_overlay.c	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -40,46 +40,45 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: lib_overlay.c,v 1.22 2006/10/14 20:43:31 tom Exp $")
-+MODULE_ID("$Id: lib_overlay.c,v 1.27 2008/06/07 23:30:34 tom Exp $")
- 
- static int
--overlap(const WINDOW *const s, WINDOW *const d, int const flag)
-+overlap(const WINDOW *const src, WINDOW *const dst, int const flag)
- {
-+    int rc = ERR;
-     int sx1, sy1, sx2, sy2;
-     int dx1, dy1, dx2, dy2;
-     int sminrow, smincol;
-     int dminrow, dmincol;
-     int dmaxrow, dmaxcol;
- 
--    T((T_CALLED("overlap(%p,%p,%d)"), s, d, flag));
-+    T((T_CALLED("overlap(%p,%p,%d)"), src, dst, flag));
-+
-+    if (src != 0 && dst != 0) {
-+	_nc_lock_global(curses);
- 
--    if (s == 0 || d == 0) {
--	returnCode(ERR);
--    } else {
- 	T(("src : begy %ld, begx %ld, maxy %ld, maxx %ld",
--	   (long) s->_begy,
--	   (long) s->_begx,
--	   (long) s->_maxy,
--	   (long) s->_maxx));
-+	   (long) src->_begy,
-+	   (long) src->_begx,
-+	   (long) src->_maxy,
-+	   (long) src->_maxx));
- 	T(("dst : begy %ld, begx %ld, maxy %ld, maxx %ld",
--	   (long) d->_begy,
--	   (long) d->_begx,
--	   (long) d->_maxy,
--	   (long) d->_maxx));
--
--	sx1 = s->_begx;
--	sy1 = s->_begy;
--	sx2 = sx1 + s->_maxx;
--	sy2 = sy1 + s->_maxy;
--
--	dx1 = d->_begx;
--	dy1 = d->_begy;
--	dx2 = dx1 + d->_maxx;
--	dy2 = dy1 + d->_maxy;
--
--	if (dx2 < sx1 || dx1 > sx2 || dy2 < sy1 || dy1 > sy2) {
--	    returnCode(ERR);	/* No intersection */
--	} else {
-+	   (long) dst->_begy,
-+	   (long) dst->_begx,
-+	   (long) dst->_maxy,
-+	   (long) dst->_maxx));
-+
-+	sx1 = src->_begx;
-+	sy1 = src->_begy;
-+	sx2 = sx1 + src->_maxx;
-+	sy2 = sy1 + src->_maxy;
-+
-+	dx1 = dst->_begx;
-+	dy1 = dst->_begy;
-+	dx2 = dx1 + dst->_maxx;
-+	dy2 = dy1 + dst->_maxy;
-+
-+	if (dx2 >= sx1 && dx1 <= sx2 && dy2 >= sy1 && dy1 <= sy2) {
- 	    sminrow = max(sy1, dy1) - sy1;
- 	    smincol = max(sx1, dx1) - sx1;
- 	    dminrow = max(sy1, dy1) - dy1;
-@@ -87,13 +86,15 @@
- 	    dmaxrow = min(sy2, dy2) - dy1;
- 	    dmaxcol = min(sx2, dx2) - dx1;
- 
--	    returnCode(copywin(s, d,
--			       sminrow, smincol,
--			       dminrow, dmincol,
--			       dmaxrow, dmaxcol,
--			       flag));
-+	    rc = copywin(src, dst,
-+			 sminrow, smincol,
-+			 dminrow, dmincol,
-+			 dmaxrow, dmaxcol,
-+			 flag);
- 	}
-+	_nc_unlock_global(curses);
-     }
-+    returnCode(rc);
- }
- 
- /*
-@@ -137,54 +138,69 @@
- 	int dmaxrow, int dmaxcol,
- 	int over)
- {
-+    int rc = ERR;
-     int sx, sy, dx, dy;
-     bool touched;
--    attr_t bk = AttrOf(dst->_nc_bkgd);
--    attr_t mask = ~(attr_t) ((bk & A_COLOR) ? A_COLOR : 0);
-+    attr_t bk;
-+    attr_t mask;
- 
-     T((T_CALLED("copywin(%p, %p, %d, %d, %d, %d, %d, %d, %d)"),
-        src, dst, sminrow, smincol, dminrow, dmincol, dmaxrow, dmaxcol, over));
- 
--    if (!src || !dst)
--	returnCode(ERR);
-+    if (src && dst) {
-+	_nc_lock_global(curses);
- 
--    /* make sure rectangle exists in source */
--    if ((sminrow + dmaxrow - dminrow) > (src->_maxy + 1) ||
--	(smincol + dmaxcol - dmincol) > (src->_maxx + 1)) {
--	returnCode(ERR);
--    }
-+	bk = AttrOf(dst->_nc_bkgd);
-+	mask = ~(attr_t) ((bk & A_COLOR) ? A_COLOR : 0);
- 
--    T(("rectangle exists in source"));
--
--    /* make sure rectangle fits in destination */
--    if (dmaxrow > dst->_maxy || dmaxcol > dst->_maxx) {
--	returnCode(ERR);
--    }
--
--    T(("rectangle fits in destination"));
--
--    for (dy = dminrow, sy = sminrow; dy <= dmaxrow; sy++, dy++) {
--	touched = FALSE;
--	for (dx = dmincol, sx = smincol; dx <= dmaxcol; sx++, dx++) {
--	    if (over) {
--		if ((CharOf(src->_line[sy].text[sx]) != L(' ')) &&
--		    (!CharEq(dst->_line[dy].text[dx], src->_line[sy].text[sx]))) {
--		    dst->_line[dy].text[dx] = src->_line[sy].text[sx];
--		    SetAttr(dst->_line[dy].text[dx],
--			    (AttrOf(src->_line[sy].text[sx]) & mask) | bk);
--		    touched = TRUE;
--		}
--	    } else {
--		if (!CharEq(dst->_line[dy].text[dx], src->_line[sy].text[sx])) {
--		    dst->_line[dy].text[dx] = src->_line[sy].text[sx];
--		    touched = TRUE;
-+	/* make sure rectangle exists in source */
-+	if ((sminrow + dmaxrow - dminrow) <= (src->_maxy + 1) &&
-+	    (smincol + dmaxcol - dmincol) <= (src->_maxx + 1)) {
-+
-+	    T(("rectangle exists in source"));
-+
-+	    /* make sure rectangle fits in destination */
-+	    if (dmaxrow <= dst->_maxy && dmaxcol <= dst->_maxx) {
-+
-+		T(("rectangle fits in destination"));
-+
-+		for (dy = dminrow, sy = sminrow;
-+		     dy <= dmaxrow;
-+		     sy++, dy++) {
-+
-+		    touched = FALSE;
-+		    for (dx = dmincol, sx = smincol;
-+			 dx <= dmaxcol;
-+			 sx++, dx++) {
-+			if (over) {
-+			    if ((CharOf(src->_line[sy].text[sx]) != L(' ')) &&
-+				(!CharEq(dst->_line[dy].text[dx],
-+					 src->_line[sy].text[sx]))) {
-+				dst->_line[dy].text[dx] =
-+				    src->_line[sy].text[sx];
-+				SetAttr(dst->_line[dy].text[dx],
-+					((AttrOf(src->_line[sy].text[sx]) &
-+					  mask) | bk));
-+				touched = TRUE;
-+			    }
-+			} else {
-+			    if (!CharEq(dst->_line[dy].text[dx],
-+					src->_line[sy].text[sx])) {
-+				dst->_line[dy].text[dx] =
-+				    src->_line[sy].text[sx];
-+				touched = TRUE;
-+			    }
-+			}
-+		    }
-+		    if (touched) {
-+			touchline(dst, dminrow, (dmaxrow - dminrow + 1));
-+		    }
- 		}
-+		T(("finished copywin"));
-+		rc = OK;
- 	    }
- 	}
--	if (touched) {
--	    touchline(dst, dminrow, (dmaxrow - dminrow + 1));
--	}
-+	_nc_unlock_global(curses);
-     }
--    T(("finished copywin"));
--    returnCode(OK);
-+    returnCode(rc);
- }
-diff -Naur ncurses-5.6.orig/ncurses/base/lib_redrawln.c ncurses-5.6/ncurses/base/lib_redrawln.c
---- ncurses-5.6.orig/ncurses/base/lib_redrawln.c	2006-11-04 18:08:47.000000000 -0500
-+++ ncurses-5.6/ncurses/base/lib_redrawln.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2001,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -39,17 +39,20 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: lib_redrawln.c,v 1.11 2006/11/04 23:08:47 tom Exp $")
-+MODULE_ID("$Id: lib_redrawln.c,v 1.12 2007/10/13 20:08:56 tom Exp $")
- 
- NCURSES_EXPORT(int)
- wredrawln(WINDOW *win, int beg, int num)
- {
-     int i;
-     int end;
--    size_t len = (win->_maxx + 1);
-+    size_t len;
- 
-     T((T_CALLED("wredrawln(%p,%d,%d)"), win, beg, num));
- 
-+    if (win == 0)
-+	returnCode(ERR);
-+
-     if (beg < 0)
- 	beg = 0;
- 
-@@ -65,6 +68,7 @@
-     if (end > win->_maxy + 1)
- 	end = win->_maxy + 1;
- 
-+    len = (win->_maxx + 1);
-     if (len > (size_t) (curscr->_maxx + 1))
- 	len = (size_t) (curscr->_maxx + 1);
-     len *= sizeof(curscr->_line[0].text[0]);
-diff -Naur ncurses-5.6.orig/ncurses/base/lib_refresh.c ncurses-5.6/ncurses/base/lib_refresh.c
---- ncurses-5.6.orig/ncurses/base/lib_refresh.c	2006-05-27 15:21:19.000000000 -0400
-+++ ncurses-5.6/ncurses/base/lib_refresh.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -41,7 +41,7 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: lib_refresh.c,v 1.34 2006/05/27 19:21:19 tom Exp $")
-+MODULE_ID("$Id: lib_refresh.c,v 1.41 2007/09/29 20:39:34 tom Exp $")
- 
- NCURSES_EXPORT(int)
- wrefresh(WINDOW *win)
-@@ -74,18 +74,20 @@
- wnoutrefresh(WINDOW *win)
- {
-     NCURSES_SIZE_T limit_x;
--    NCURSES_SIZE_T i, j;
-+    NCURSES_SIZE_T src_row, src_col;
-     NCURSES_SIZE_T begx;
-     NCURSES_SIZE_T begy;
--    NCURSES_SIZE_T m, n;
-+    NCURSES_SIZE_T dst_row, dst_col;
- #if USE_SCROLL_HINTS
-     bool wide;
- #endif
- 
-     T((T_CALLED("wnoutrefresh(%p)"), win));
- #ifdef TRACE
--    if (_nc_tracing & TRACE_UPDATE)
-+    if (USE_TRACEF(TRACE_UPDATE)) {
- 	_tracedump("...win", win);
-+	_nc_unlock_global(tracef);
-+    }
- #endif /* TRACE */
- 
-     /*
-@@ -132,28 +134,121 @@
-      * so we'll force the issue.
-      */
- 
--    /* limit(n) */
-+    /* limit(dst_col) */
-     limit_x = win->_maxx;
--    /* limit(j) */
-+    /* limit(src_col) */
-     if (limit_x > newscr->_maxx - begx)
- 	limit_x = newscr->_maxx - begx;
- 
--    for (i = 0, m = begy + win->_yoffset;
--	 i <= win->_maxy && m <= newscr->_maxy;
--	 i++, m++) {
--	register struct ldat *nline = &newscr->_line[m];
--	register struct ldat *oline = &win->_line[i];
-+    for (src_row = 0, dst_row = begy + win->_yoffset;
-+	 src_row <= win->_maxy && dst_row <= newscr->_maxy;
-+	 src_row++, dst_row++) {
-+	register struct ldat *nline = &newscr->_line[dst_row];
-+	register struct ldat *oline = &win->_line[src_row];
- 
- 	if (oline->firstchar != _NOCHANGE) {
--	    int last = oline->lastchar;
-+	    int last_src = oline->lastchar;
-+
-+	    if (last_src > limit_x)
-+		last_src = limit_x;
- 
--	    if (last > limit_x)
--		last = limit_x;
-+	    src_col = oline->firstchar;
-+	    dst_col = src_col + begx;
-+
-+	    if_WIDEC({
-+		register int j;
-+
-+		/*
-+		 * Ensure that we will copy complete multi-column characters
-+		 * on the left-boundary.
-+		 */
-+		if (isWidecExt(oline->text[src_col])) {
-+		    j = 1 + dst_col - WidecExt(oline->text[src_col]);
-+		    if (j < 0)
-+			j = 0;
-+		    if (dst_col > j) {
-+			src_col -= (dst_col - j);
-+			dst_col = j;
-+		    }
-+		}
- 
--	    for (j = oline->firstchar, n = j + begx; j <= last; j++, n++) {
--		if (!CharEq(oline->text[j], nline->text[n])) {
--		    nline->text[n] = oline->text[j];
--		    CHANGED_CELL(nline, n);
-+		/*
-+		 * Ensure that we will copy complete multi-column characters
-+		 * on the right-boundary.
-+		 */
-+		j = last_src;
-+		if (WidecExt(oline->text[j])) {
-+		    ++j;
-+		    while (j <= limit_x) {
-+			if (isWidecBase(oline->text[j])) {
-+			    break;
-+			} else {
-+			    last_src = j;
-+			}
-+			++j;
-+		    }
-+		}
-+	    });
-+
-+	    if_WIDEC({
-+		static cchar_t blank = BLANK;
-+		int last_dst = begx + ((last_src < win->_maxx)
-+				       ? last_src
-+				       : win->_maxx);
-+		int fix_left = dst_col;
-+		int fix_right = last_dst;
-+		register int j;
-+
-+		/*
-+		 * Check for boundary cases where we may overwrite part of a
-+		 * multi-column character.  For those, wipe the remainder of
-+		 * the character to blanks.
-+		 */
-+		j = dst_col;
-+		if (isWidecExt(nline->text[j])) {
-+		    /*
-+		     * On the left, we only care about multi-column characters
-+		     * that extend into the changed region.
-+		     */
-+		    fix_left = 1 + j - WidecExt(nline->text[j]);
-+		    if (fix_left < 0)
-+			fix_left = 0;	/* only if cell is corrupt */
-+		}
-+
-+		j = last_dst;
-+		if (WidecExt(nline->text[j]) != 0) {
-+		    /*
-+		     * On the right, any multi-column character is a problem,
-+		     * unless it happens to be contained in the change, and
-+		     * ending at the right boundary of the change.  The
-+		     * computation for 'fix_left' accounts for the left-side of
-+		     * this character.  Find the end of the character.
-+		     */
-+		    ++j;
-+		    while (j <= newscr->_maxx && isWidecExt(nline->text[j])) {
-+			fix_right = j++;
-+		    }
-+		}
-+
-+		/*
-+		 * The analysis is simpler if we do the clearing afterwards.
-+		 * Do that now.
-+		 */
-+		if (fix_left < dst_col || fix_right > last_dst) {
-+		    for (j = fix_left; j <= fix_right; ++j) {
-+			nline->text[j] = blank;
-+			CHANGED_CELL(nline, j);
-+		    }
-+		}
-+	    });
-+
-+	    /*
-+	     * Copy the changed text.
-+	     */
-+	    for (; src_col <= last_src; src_col++, dst_col++) {
-+		if (!CharEq(oline->text[src_col], nline->text[dst_col])) {
-+		    nline->text[dst_col] = oline->text[src_col];
-+		    CHANGED_CELL(nline, dst_col);
- 		}
- 	    }
- 
-@@ -162,13 +257,14 @@
- 	if (wide) {
- 	    int oind = oline->oldindex;
- 
--	    nline->oldindex = (oind == _NEWINDEX) ? _NEWINDEX : begy + oind
--		+ win->_yoffset;
-+	    nline->oldindex = ((oind == _NEWINDEX)
-+			       ? _NEWINDEX
-+			       : (begy + oind + win->_yoffset));
- 	}
- #endif /* USE_SCROLL_HINTS */
- 
- 	oline->firstchar = oline->lastchar = _NOCHANGE;
--	if_USE_SCROLL_HINTS(oline->oldindex = i);
-+	if_USE_SCROLL_HINTS(oline->oldindex = src_row);
-     }
- 
-     if (win->_clear) {
-@@ -183,8 +279,10 @@
-     newscr->_leaveok = win->_leaveok;
- 
- #ifdef TRACE
--    if (_nc_tracing & TRACE_UPDATE)
-+    if (USE_TRACEF(TRACE_UPDATE)) {
- 	_tracedump("newscr", newscr);
-+	_nc_unlock_global(tracef);
-+    }
- #endif /* TRACE */
-     returnCode(OK);
- }
-diff -Naur ncurses-5.6.orig/ncurses/base/lib_restart.c ncurses-5.6/ncurses/base/lib_restart.c
---- ncurses-5.6.orig/ncurses/base/lib_restart.c	2006-01-14 10:58:23.000000000 -0500
-+++ ncurses-5.6/ncurses/base/lib_restart.c	2008-06-18 06:49:50.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -48,23 +48,22 @@
- 
- #include <term.h>		/* lines, columns, cur_term */
- 
--MODULE_ID("$Id: lib_restart.c,v 1.6 2006/01/14 15:58:23 tom Exp $")
-+MODULE_ID("$Id: lib_restart.c,v 1.9 2008/05/03 22:43:52 tom Exp $")
- 
- NCURSES_EXPORT(int)
- restartterm(NCURSES_CONST char *termp, int filenum, int *errret)
- {
--    int saveecho = SP->_echo;
--    int savecbreak = SP->_cbreak;
--    int saveraw = SP->_raw;
--    int savenl = SP->_nl;
-     int result;
- 
-     T((T_CALLED("restartterm(%s,%d,%p)"), termp, filenum, errret));
- 
--    _nc_handle_sigwinch(0);
-     if (setupterm(termp, filenum, errret) != OK) {
- 	result = ERR;
--    } else {
-+    } else if (SP != 0) {
-+	int saveecho = SP->_echo;
-+	int savecbreak = SP->_cbreak;
-+	int saveraw = SP->_raw;
-+	int savenl = SP->_nl;
- 
- 	if (saveecho)
- 	    echo();
-@@ -89,11 +88,12 @@
- 	reset_prog_mode();
- 
- #if USE_SIZECHANGE
--	_nc_update_screensize();
-+	_nc_update_screensize(SP);
- #endif
- 
- 	result = OK;
-+    } else {
-+	result = ERR;
-     }
--    _nc_handle_sigwinch(1);
-     returnCode(result);
- }
-diff -Naur ncurses-5.6.orig/ncurses/base/lib_screen.c ncurses-5.6/ncurses/base/lib_screen.c
---- ncurses-5.6.orig/ncurses/base/lib_screen.c	2006-05-27 15:21:38.000000000 -0400
-+++ ncurses-5.6/ncurses/base/lib_screen.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -34,7 +34,7 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: lib_screen.c,v 1.29 2006/05/27 19:21:38 tom Exp $")
-+MODULE_ID("$Id: lib_screen.c,v 1.30 2007/03/10 23:20:41 tom Exp $")
- 
- NCURSES_EXPORT(WINDOW *)
- getwin(FILE *filep)
-@@ -146,7 +146,10 @@
- 	returnCode(ERR);
-     } else {
- 	delwin(newscr);
--	SP->_newscr = newscr = getwin(fp);
-+	SP->_newscr = getwin(fp);
-+#if !USE_REENTRANT
-+	newscr = SP->_newscr;
-+#endif
- 	(void) fclose(fp);
- 	returnCode(OK);
-     }
-@@ -184,7 +187,10 @@
- 	returnCode(ERR);
-     } else {
- 	delwin(curscr);
--	SP->_curscr = curscr = getwin(fp);
-+	SP->_curscr = getwin(fp);
-+#if !USE_REENTRANT
-+	curscr = SP->_curscr;
-+#endif
- 	(void) fclose(fp);
- 	returnCode(OK);
-     }
-@@ -199,7 +205,10 @@
- 	returnCode(ERR);
-     } else {
- 	delwin(newscr);
--	SP->_newscr = newscr = dupwin(curscr);
-+	SP->_newscr = dupwin(curscr);
-+#if !USE_REENTRANT
-+	newscr = SP->_newscr;
-+#endif
- 	returnCode(OK);
-     }
- }
-diff -Naur ncurses-5.6.orig/ncurses/base/lib_set_term.c ncurses-5.6/ncurses/base/lib_set_term.c
---- ncurses-5.6.orig/ncurses/base/lib_set_term.c	2006-05-20 10:58:02.000000000 -0400
-+++ ncurses-5.6/ncurses/base/lib_set_term.c	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -44,31 +44,50 @@
- #include <term.h>		/* cur_term */
- #include <tic.h>
- 
--MODULE_ID("$Id: lib_set_term.c,v 1.91 2006/05/20 14:58:02 tom Exp $")
-+MODULE_ID("$Id: lib_set_term.c,v 1.112 2008/06/07 22:29:07 tom Exp $")
- 
- NCURSES_EXPORT(SCREEN *)
- set_term(SCREEN *screenp)
- {
-     SCREEN *oldSP;
-+    SCREEN *newSP;
- 
-     T((T_CALLED("set_term(%p)"), screenp));
- 
-+    _nc_lock_global(curses);
-+
-     oldSP = SP;
-     _nc_set_screen(screenp);
-+    newSP = SP;
- 
--    set_curterm(SP->_term);
--    curscr = SP->_curscr;
--    newscr = SP->_newscr;
--    stdscr = SP->_stdscr;
--    COLORS = SP->_color_count;
--    COLOR_PAIRS = SP->_pair_count;
-+    if (newSP != 0) {
-+	set_curterm(newSP->_term);
-+#if !USE_REENTRANT
-+	curscr = newSP->_curscr;
-+	newscr = newSP->_newscr;
-+	stdscr = newSP->_stdscr;
-+	COLORS = newSP->_color_count;
-+	COLOR_PAIRS = newSP->_pair_count;
-+#endif
-+    } else {
-+	set_curterm(0);
-+#if !USE_REENTRANT
-+	curscr = 0;
-+	newscr = 0;
-+	stdscr = 0;
-+	COLORS = 0;
-+	COLOR_PAIRS = 0;
-+#endif
-+    }
-+
-+    _nc_unlock_global(curses);
- 
-     T((T_RETURN("%p"), oldSP));
-     return (oldSP);
- }
- 
- static void
--_nc_free_keytry(struct tries *kt)
-+_nc_free_keytry(TRIES * kt)
- {
-     if (kt != 0) {
- 	_nc_free_keytry(kt->child);
-@@ -77,95 +96,114 @@
-     }
- }
- 
-+static bool
-+delink_screen(SCREEN *sp)
-+{
-+    SCREEN *last = 0;
-+    SCREEN *temp;
-+    bool result = FALSE;
-+
-+    for (each_screen(temp)) {
-+	if (temp == sp) {
-+	    if (last)
-+		last = sp->_next_screen;
-+	    else
-+		_nc_screen_chain = sp->_next_screen;
-+	    result = TRUE;
-+	    break;
-+	}
-+	last = temp;
-+    }
-+    return result;
-+}
-+
- /*
-  * Free the storage associated with the given SCREEN sp.
-  */
- NCURSES_EXPORT(void)
- delscreen(SCREEN *sp)
- {
--    SCREEN **scan = &_nc_screen_chain;
-     int i;
- 
-     T((T_CALLED("delscreen(%p)"), sp));
- 
--    while (*scan) {
--	if (*scan == sp) {
--	    *scan = sp->_next_screen;
--	    break;
--	}
--	scan = &(*scan)->_next_screen;
--    }
-+    _nc_lock_global(curses);
-+    if (delink_screen(sp)) {
- 
--    (void) _nc_freewin(sp->_curscr);
--    (void) _nc_freewin(sp->_newscr);
--    (void) _nc_freewin(sp->_stdscr);
--
--    if (sp->_slk != 0) {
--	if (sp->_slk->ent != 0) {
--	    for (i = 0; i < sp->_slk->labcnt; ++i) {
--		FreeIfNeeded(sp->_slk->ent[i].ent_text);
--		FreeIfNeeded(sp->_slk->ent[i].form_text);
-+	(void) _nc_freewin(sp->_curscr);
-+	(void) _nc_freewin(sp->_newscr);
-+	(void) _nc_freewin(sp->_stdscr);
-+
-+	if (sp->_slk != 0) {
-+	    if (sp->_slk->ent != 0) {
-+		for (i = 0; i < sp->_slk->labcnt; ++i) {
-+		    FreeIfNeeded(sp->_slk->ent[i].ent_text);
-+		    FreeIfNeeded(sp->_slk->ent[i].form_text);
-+		}
-+		free(sp->_slk->ent);
- 	    }
--	    free(sp->_slk->ent);
-+	    free(sp->_slk);
-+	    sp->_slk = 0;
- 	}
--	free(sp->_slk);
--	sp->_slk = 0;
--    }
- 
--    _nc_free_keytry(sp->_keytry);
--    sp->_keytry = 0;
-+	_nc_free_keytry(sp->_keytry);
-+	sp->_keytry = 0;
- 
--    _nc_free_keytry(sp->_key_ok);
--    sp->_key_ok = 0;
-+	_nc_free_keytry(sp->_key_ok);
-+	sp->_key_ok = 0;
- 
--    FreeIfNeeded(sp->_current_attr);
-+	FreeIfNeeded(sp->_current_attr);
- 
--    FreeIfNeeded(sp->_color_table);
--    FreeIfNeeded(sp->_color_pairs);
-+	FreeIfNeeded(sp->_color_table);
-+	FreeIfNeeded(sp->_color_pairs);
- 
--    FreeIfNeeded(sp->oldhash);
--    FreeIfNeeded(sp->newhash);
--    FreeIfNeeded(sp->hashtab);
-+	FreeIfNeeded(sp->oldhash);
-+	FreeIfNeeded(sp->newhash);
-+	FreeIfNeeded(sp->hashtab);
- 
--    FreeIfNeeded(sp->_acs_map);
--    FreeIfNeeded(sp->_screen_acs_map);
-+	FreeIfNeeded(sp->_acs_map);
-+	FreeIfNeeded(sp->_screen_acs_map);
- 
--    del_curterm(sp->_term);
-+#if 0
-+	/* FIXME - this should be a copy of the struct, not a pointer */
-+	del_curterm(sp->_term);
-+#endif
- 
--    /*
--     * If the associated output stream has been closed, we can discard the
--     * set-buffer.  Limit the error check to EBADF, since fflush may fail
--     * for other reasons than trying to operate upon a closed stream.
--     */
--    if (sp->_ofp != 0
--	&& sp->_setbuf != 0
--	&& fflush(sp->_ofp) != 0
--	&& errno == EBADF) {
--	free(sp->_setbuf);
--    }
-+	/*
-+	 * If the associated output stream has been closed, we can discard the
-+	 * set-buffer.  Limit the error check to EBADF, since fflush may fail
-+	 * for other reasons than trying to operate upon a closed stream.
-+	 */
-+	if (sp->_ofp != 0
-+	    && sp->_setbuf != 0
-+	    && fflush(sp->_ofp) != 0
-+	    && errno == EBADF) {
-+	    free(sp->_setbuf);
-+	}
- 
--    free(sp);
-+	free(sp);
- 
--    /*
--     * If this was the current screen, reset everything that the
--     * application might try to use (except cur_term, which may have
--     * multiple references in different screens).
--     */
--    if (sp == SP) {
--	curscr = 0;
--	newscr = 0;
--	stdscr = 0;
--	COLORS = 0;
--	COLOR_PAIRS = 0;
--	_nc_set_screen(0);
-+	/*
-+	 * If this was the current screen, reset everything that the
-+	 * application might try to use (except cur_term, which may have
-+	 * multiple references in different screens).
-+	 */
-+	if (sp == SP) {
-+#if !USE_REENTRANT
-+	    curscr = 0;
-+	    newscr = 0;
-+	    stdscr = 0;
-+	    COLORS = 0;
-+	    COLOR_PAIRS = 0;
-+#endif
-+	    _nc_set_screen(0);
-+	}
-     }
-+    _nc_unlock_global(curses);
-+
-     returnVoid;
- }
- 
--static ripoff_t rippedoff[5];
--static ripoff_t *rsp = rippedoff;
--#define N_RIPS SIZEOF(SP->_rippedoff)
--
- static bool
- no_mouse_event(SCREEN *sp GCC_UNUSED)
- {
-@@ -179,7 +217,7 @@
- }
- 
- static bool
--no_mouse_parse(int code GCC_UNUSED)
-+no_mouse_parse(SCREEN *sp GCC_UNUSED, int code GCC_UNUSED)
- {
-     return TRUE;
- }
-@@ -216,15 +254,16 @@
- 
- /* OS-independent screen initializations */
- NCURSES_EXPORT(int)
--_nc_setupscreen(int slines,
--		int scolumns,
-+_nc_setupscreen(int slines GCC_UNUSED,
-+		int scolumns GCC_UNUSED,
- 		FILE *output,
- 		bool filtered,
- 		int slk_format)
- {
-+    char *env;
-     int bottom_stolen = 0;
--    int i;
-     bool support_cookies = USE_XMC_SUPPORT;
-+    ripoff_t *rop;
- 
-     T((T_CALLED("_nc_setupscreen(%d, %d, %p, %d, %d)"),
-        slines, scolumns, output, filtered, slk_format));
-@@ -243,12 +282,20 @@
-     if ((SP->_current_attr = typeCalloc(NCURSES_CH_T, 1)) == 0)
- 	returnCode(ERR);
- 
-+    /*
-+     * We should always check the screensize, just in case.
-+     */
-+    _nc_get_screensize(SP, &slines, &scolumns);
-+    SET_LINES(slines);
-+    SET_COLS(scolumns);
-+    T((T_CREATE("screen %s %dx%d"), termname(), LINES, COLS));
-+
-     SP->_filtered = filtered;
- 
-     /* implement filter mode */
-     if (filtered) {
--	slines = LINES = 1;
--
-+	slines = 1;
-+	SET_LINES(slines);
- 	clear_screen = 0;
- 	cursor_down = parm_down_cursor = 0;
- 	cursor_address = 0;
-@@ -258,18 +305,6 @@
- 	cursor_home = carriage_return;
- 	T(("filter screensize %dx%d", LINES, COLS));
-     }
--
--    /* If we must simulate soft labels, grab off the line to be used.
--       We assume that we must simulate, if it is none of the standard
--       formats (4-4  or 3-2-3) for which there may be some hardware
--       support. */
--    if (num_labels <= 0 || !SLK_STDFMT(slk_format)) {
--	if (slk_format) {
--	    if (ERR == _nc_ripoffline(-SLK_LINES(slk_format),
--				      _nc_slk_initialize))
--		returnCode(ERR);
--	}
--    }
- #ifdef __DJGPP__
-     T(("setting output mode to binary"));
-     fflush(output);
-@@ -484,37 +519,45 @@
-     }
- 
-     /* initialize normal acs before wide, since we use mapping in the latter */
-+#if !USE_WIDEC_SUPPORT
-+    if (_nc_unicode_locale() && _nc_locale_breaks_acs()) {
-+	acs_chars = NULL;
-+	ena_acs = NULL;
-+	enter_alt_charset_mode = NULL;
-+	exit_alt_charset_mode = NULL;
-+	set_attributes = NULL;
-+    }
-+#endif
-     _nc_init_acs();
- #if USE_WIDEC_SUPPORT
-     _nc_init_wacs();
- 
-     SP->_screen_acs_fix = (_nc_unicode_locale() && _nc_locale_breaks_acs());
--    {
--	char *env = _nc_get_locale();
--	SP->_legacy_coding = ((env == 0)
--			      || !strcmp(env, "C")
--			      || !strcmp(env, "POSIX"));
--    }
- #endif
-+    env = _nc_get_locale();
-+    SP->_legacy_coding = ((env == 0)
-+			  || !strcmp(env, "C")
-+			  || !strcmp(env, "POSIX"));
-+    T(("legacy-coding %d", SP->_legacy_coding));
- 
-     _nc_idcok = TRUE;
-     _nc_idlok = FALSE;
- 
--    _nc_windows = 0;		/* no windows yet */
--
-     SP->oldhash = 0;
-     SP->newhash = 0;
- 
-     T(("creating newscr"));
--    if ((newscr = newwin(slines, scolumns, 0, 0)) == 0)
-+    if ((SP->_newscr = newwin(slines, scolumns, 0, 0)) == 0)
- 	returnCode(ERR);
- 
-     T(("creating curscr"));
--    if ((curscr = newwin(slines, scolumns, 0, 0)) == 0)
-+    if ((SP->_curscr = newwin(slines, scolumns, 0, 0)) == 0)
- 	returnCode(ERR);
- 
--    SP->_newscr = newscr;
--    SP->_curscr = curscr;
-+#if !USE_REENTRANT
-+    newscr = SP->_newscr;
-+    curscr = SP->_curscr;
-+#endif
- #if USE_SIZECHANGE
-     SP->_resize = resizeterm;
- #endif
-@@ -525,46 +568,65 @@
-     def_shell_mode();
-     def_prog_mode();
- 
--    for (i = 0, rsp = rippedoff; rsp->line && (i < (int) N_RIPS); rsp++, i++) {
--	T(("ripping off line %d at %s", i, rsp->line < 0 ? "bottom" : "top"));
--	SP->_rippedoff[i] = rippedoff[i];
--	if (rsp->hook) {
--	    int count = (rsp->line < 0) ? -rsp->line : rsp->line;
--
--	    SP->_rippedoff[i].w = newwin(count,
--					 scolumns,
--					 ((rsp->line < 0)
--					  ? SP->_lines_avail - count
--					  : 0),
--					 0);
--	    if (SP->_rippedoff[i].w != 0)
--		SP->_rippedoff[i].hook(SP->_rippedoff[i].w, scolumns);
--	    else
-+    for (rop = ripoff_stack;
-+	 rop != ripoff_sp && (rop - ripoff_stack) < N_RIPS;
-+	 rop++) {
-+
-+	/* If we must simulate soft labels, grab off the line to be used.
-+	   We assume that we must simulate, if it is none of the standard
-+	   formats (4-4 or 3-2-3) for which there may be some hardware
-+	   support. */
-+	if (rop->hook == _nc_slk_initialize)
-+	    if (!(num_labels <= 0 || !SLK_STDFMT(slk_format)))
-+		continue;
-+	if (rop->hook) {
-+	    int count;
-+	    WINDOW *w;
-+
-+	    count = (rop->line < 0) ? -rop->line : rop->line;
-+	    T(("ripping off %i lines at %s", count,
-+	       ((rop->line < 0)
-+		? "bottom"
-+		: "top")));
-+
-+	    w = newwin(count, scolumns,
-+		       ((rop->line < 0)
-+			? SP->_lines_avail - count
-+			: 0),
-+		       0);
-+	    if (w) {
-+		rop->win = w;
-+		rop->hook(w, scolumns);
-+	    } else {
- 		returnCode(ERR);
--	    if (rsp->line < 0)
-+	    }
-+	    if (rop->line < 0)
- 		bottom_stolen += count;
- 	    else
- 		SP->_topstolen += count;
- 	    SP->_lines_avail -= count;
- 	}
--	rsp->line = 0;
-     }
--    SP->_rip_count = i;
-     /* reset the stack */
--    rsp = rippedoff;
-+    ripoff_sp = ripoff_stack;
- 
-     T(("creating stdscr"));
-     assert((SP->_lines_avail + SP->_topstolen + bottom_stolen) == slines);
--    if ((stdscr = newwin(LINES = SP->_lines_avail, scolumns, 0, 0)) == 0)
-+    if ((SP->_stdscr = newwin(SP->_lines_avail, scolumns, 0, 0)) == 0)
- 	returnCode(ERR);
--    SP->_stdscr = stdscr;
-+
-+    SET_LINES(SP->_lines_avail);
-+#if !USE_REENTRANT
-+    stdscr = SP->_stdscr;
-+#endif
- 
-     returnCode(OK);
- }
- 
--/* The internal implementation interprets line as the number of
--   lines to rip off from the top or bottom.
--   */
-+/*
-+ * The internal implementation interprets line as the number of lines to rip
-+ * off from the top or bottom.
-+ */
- NCURSES_EXPORT(int)
- _nc_ripoffline(int line, int (*init) (WINDOW *, int))
- {
-@@ -572,13 +634,14 @@
- 
-     if (line != 0) {
- 
--	if (rsp >= rippedoff + N_RIPS)
-+	if (ripoff_sp == 0)
-+	    ripoff_sp = ripoff_stack;
-+	if (ripoff_sp >= ripoff_stack + N_RIPS)
- 	    returnCode(ERR);
- 
--	rsp->line = line;
--	rsp->hook = init;
--	rsp->w = 0;
--	rsp++;
-+	ripoff_sp->line = line;
-+	ripoff_sp->hook = init;
-+	ripoff_sp++;
-     }
- 
-     returnCode(OK);
-@@ -587,6 +650,7 @@
- NCURSES_EXPORT(int)
- ripoffline(int line, int (*init) (WINDOW *, int))
- {
-+    START_TRACE();
-     T((T_CALLED("ripoffline(%d,%p)"), line, init));
- 
-     if (line == 0)
-diff -Naur ncurses-5.6.orig/ncurses/base/lib_slk.c ncurses-5.6/ncurses/base/lib_slk.c
---- ncurses-5.6.orig/ncurses/base/lib_slk.c	2005-01-08 16:56:36.000000000 -0500
-+++ ncurses-5.6/ncurses/base/lib_slk.c	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2005,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -45,7 +45,7 @@
- #include <ctype.h>
- #include <term.h>		/* num_labels, label_*, plab_norm */
- 
--MODULE_ID("$Id: lib_slk.c,v 1.30 2005/01/08 21:56:36 tom Exp $")
-+MODULE_ID("$Id: lib_slk.c,v 1.33 2008/05/31 22:05:57 tom Exp $")
- 
- /*
-  * We'd like to move these into the screen context structure, but cannot,
-@@ -56,19 +56,20 @@
- 
- /*
-  * Paint the info line for the PC style SLK emulation.
-- *
-  */
- static void
- slk_paint_info(WINDOW *win)
- {
--    if (win && SP->slk_format == 4) {
-+    SCREEN *sp = _nc_screen_of(win);
-+
-+    if (win && sp && (sp->slk_format == 4)) {
- 	int i;
- 
- 	mvwhline(win, 0, 0, 0, getmaxx(win));
- 	wmove(win, 0, 0);
- 
--	for (i = 0; i < SP->_slk->maxlab; i++) {
--	    mvwprintw(win, 0, SP->_slk->ent[i].ent_x, "F%d", i + 1);
-+	for (i = 0; i < sp->_slk->maxlab; i++) {
-+	    mvwprintw(win, 0, sp->_slk->ent[i].ent_x, "F%d", i + 1);
- 	}
-     }
- }
-@@ -119,12 +120,12 @@
- 
-     SP->_slk->maxlab = ((num_labels > 0)
- 			? num_labels
--			: MAX_SKEY(_nc_slk_format));
-+			: MAX_SKEY(_nc_globals.slk_format));
-     SP->_slk->maxlen = ((num_labels > 0)
- 			? label_width * label_height
--			: MAX_SKEY_LEN(_nc_slk_format));
--    SP->_slk->labcnt = ((SP->_slk->maxlab < MAX_SKEY(_nc_slk_format))
--			? MAX_SKEY(_nc_slk_format)
-+			: MAX_SKEY_LEN(_nc_globals.slk_format));
-+    SP->_slk->labcnt = ((SP->_slk->maxlab < MAX_SKEY(_nc_globals.slk_format))
-+			? MAX_SKEY(_nc_globals.slk_format)
- 			: SP->_slk->maxlab);
- 
-     if (SP->_slk->maxlen <= 0
-@@ -148,7 +149,7 @@
- 	memset(SP->_slk->ent[i].form_text, ' ', max_length);
- 	SP->_slk->ent[i].visible = (i < SP->_slk->maxlab);
-     }
--    if (_nc_slk_format >= 3) {	/* PC style */
-+    if (_nc_globals.slk_format >= 3) {	/* PC style */
- 	int gap = (cols - 3 * (3 + 4 * max_length)) / 2;
- 
- 	if (gap < 1)
-@@ -161,7 +162,7 @@
- 	}
- 	slk_paint_info(stwin);
-     } else {
--	if (_nc_slk_format == 2) {	/* 4-4 */
-+	if (_nc_globals.slk_format == 2) {	/* 4-4 */
- 	    int gap = cols - (SP->_slk->maxlab * max_length) - 6;
- 
- 	    if (gap < 1)
-@@ -172,7 +173,7 @@
- 		x += (i == 3) ? gap : 1;
- 	    }
- 	} else {
--	    if (_nc_slk_format == 1) {	/* 1 -> 3-2-3 */
-+	    if (_nc_globals.slk_format == 1) {	/* 1 -> 3-2-3 */
- 		int gap = (cols - (SP->_slk->maxlab * max_length) - 5)
- 		/ 2;
- 
-@@ -196,8 +197,8 @@
-      * per default no SLK keys and may call slk_init again to
-      * define a new layout. (juergen 03-Mar-1999)
-      */
--    SP->slk_format = _nc_slk_format;
--    _nc_slk_format = 0;
-+    SP->slk_format = _nc_globals.slk_format;
-+    _nc_globals.slk_format = 0;
-     returnCode(res);
- }
- 
-diff -Naur ncurses-5.6.orig/ncurses/base/lib_slkclear.c ncurses-5.6/ncurses/base/lib_slkclear.c
---- ncurses-5.6.orig/ncurses/base/lib_slkclear.c	2006-05-27 15:21:19.000000000 -0400
-+++ ncurses-5.6/ncurses/base/lib_slkclear.c	2008-06-18 06:49:45.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2001,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -29,6 +29,8 @@
- /****************************************************************************
-  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
-  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
-+ *     and: Juergen Pfeifer                         1996-1999               *
-+ *     and: Thomas E. Dickey                        1996-on                 *
-  ****************************************************************************/
- 
- /*
-@@ -38,24 +40,27 @@
-  */
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: lib_slkclear.c,v 1.9 2006/05/27 19:21:19 tom Exp $")
-+MODULE_ID("$Id: lib_slkclear.c,v 1.10 2007/12/29 17:51:47 tom Exp $")
- 
- NCURSES_EXPORT(int)
- slk_clear(void)
- {
-+    int rc = ERR;
-+
-     T((T_CALLED("slk_clear()")));
- 
--    if (SP == NULL || SP->_slk == NULL)
--	returnCode(ERR);
--    SP->_slk->hidden = TRUE;
--    /* For simulated SLK's it's looks much more natural to
--       inherit those attributes from the standard screen */
--    SP->_slk->win->_nc_bkgd = stdscr->_nc_bkgd;
--    WINDOW_ATTRS(SP->_slk->win) = WINDOW_ATTRS(stdscr);
--    if (SP->_slk->win == stdscr) {
--	returnCode(OK);
--    } else {
--	werase(SP->_slk->win);
--	returnCode(wrefresh(SP->_slk->win));
-+    if (SP != NULL && SP->_slk != NULL) {
-+	SP->_slk->hidden = TRUE;
-+	/* For simulated SLK's it looks much more natural to
-+	   inherit those attributes from the standard screen */
-+	SP->_slk->win->_nc_bkgd = stdscr->_nc_bkgd;
-+	WINDOW_ATTRS(SP->_slk->win) = WINDOW_ATTRS(stdscr);
-+	if (SP->_slk->win == stdscr) {
-+	    rc = OK;
-+	} else {
-+	    werase(SP->_slk->win);
-+	    rc = wrefresh(SP->_slk->win);
-+	}
-     }
-+    returnCode(rc);
- }
-diff -Naur ncurses-5.6.orig/ncurses/base/lib_slkinit.c ncurses-5.6/ncurses/base/lib_slkinit.c
---- ncurses-5.6.orig/ncurses/base/lib_slkinit.c	2000-12-09 21:43:27.000000000 -0500
-+++ ncurses-5.6/ncurses/base/lib_slkinit.c	2008-06-18 06:49:46.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -29,6 +29,7 @@
- /****************************************************************************
-  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
-  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
-+ *     and: Thomas E. Dickey                        1996-on                 *
-  ****************************************************************************/
- 
- /*
-@@ -38,14 +39,17 @@
-  */
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: lib_slkinit.c,v 1.5 2000/12/10 02:43:27 tom Exp $")
-+MODULE_ID("$Id: lib_slkinit.c,v 1.7 2008/01/12 20:23:39 tom Exp $")
- 
- NCURSES_EXPORT(int)
- slk_init(int format)
- {
-+    int code = ERR;
-+
-     T((T_CALLED("slk_init(%d)"), format));
--    if (format < 0 || format > 3)
--	returnCode(ERR);
--    _nc_slk_format = 1 + format;
--    returnCode(OK);
-+    if (format >= 0 && format <= 3 && !_nc_globals.slk_format) {
-+	_nc_globals.slk_format = 1 + format;
-+	code = _nc_ripoffline(-SLK_LINES(_nc_globals.slk_format), _nc_slk_initialize);
-+    }
-+    returnCode(code);
- }
-diff -Naur ncurses-5.6.orig/ncurses/base/lib_slkset.c ncurses-5.6/ncurses/base/lib_slkset.c
---- ncurses-5.6.orig/ncurses/base/lib_slkset.c	2006-12-17 14:47:09.000000000 -0500
-+++ ncurses-5.6/ncurses/base/lib_slkset.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -44,12 +44,12 @@
- #endif
- #endif
- 
--MODULE_ID("$Id: lib_slkset.c,v 1.16 2006/12/17 19:47:09 tom Exp $")
-+MODULE_ID("$Id: lib_slkset.c,v 1.17 2007/10/13 20:08:46 tom Exp $")
- 
- NCURSES_EXPORT(int)
- slk_set(int i, const char *astr, int format)
- {
--    SLK *slk = SP->_slk;
-+    SLK *slk;
-     int offset;
-     int numchrs;
-     int numcols;
-@@ -59,7 +59,12 @@
- 
-     T((T_CALLED("slk_set(%d, \"%s\", %d)"), i, str, format));
- 
--    if (slk == NULL || i < 1 || i > slk->labcnt || format < 0 || format > 2)
-+    if (SP == 0
-+	|| (slk = SP->_slk) == 0
-+	|| i < 1
-+	|| i > slk->labcnt
-+	|| format < 0
-+	|| format > 2)
- 	returnCode(ERR);
-     if (str == NULL)
- 	str = "";
-diff -Naur ncurses-5.6.orig/ncurses/base/lib_ungetch.c ncurses-5.6/ncurses/base/lib_ungetch.c
---- ncurses-5.6.orig/ncurses/base/lib_ungetch.c	2002-08-24 18:08:48.000000000 -0400
-+++ ncurses-5.6/ncurses/base/lib_ungetch.c	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2001,2002 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -29,6 +29,7 @@
- /****************************************************************************
-  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
-  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
-+ *     and: Thomas E. Dickey                        1996-on                 *
-  ****************************************************************************/
- 
- /*
-@@ -40,40 +41,50 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: lib_ungetch.c,v 1.8 2002/08/24 22:08:48 tom Exp $")
-+MODULE_ID("$Id: lib_ungetch.c,v 1.11 2008/05/31 16:44:54 tom Exp $")
- 
- #include <fifo_defs.h>
- 
- #ifdef TRACE
- NCURSES_EXPORT(void)
--_nc_fifo_dump(void)
-+_nc_fifo_dump(SCREEN *sp)
- {
-     int i;
-     T(("head = %d, tail = %d, peek = %d", head, tail, peek));
-     for (i = 0; i < 10; i++)
--	T(("char %d = %s", i, _tracechar(SP->_fifo[i])));
-+	T(("char %d = %s", i, _nc_tracechar(sp, sp->_fifo[i])));
- }
- #endif /* TRACE */
- 
- NCURSES_EXPORT(int)
--ungetch(int ch)
-+_nc_ungetch(SCREEN *sp, int ch)
- {
--    T((T_CALLED("ungetch(%s)"), _tracechar(ch)));
-+    int rc = ERR;
- 
--    if (tail == -1)
--	returnCode(ERR);
--    if (head == -1) {
--	head = 0;
--	t_inc()
-+    if (tail != -1) {
-+	if (head == -1) {
-+	    head = 0;
-+	    t_inc();
- 	    peek = tail;	/* no raw keys */
--    } else
--	h_dec();
-+	} else
-+	    h_dec();
- 
--    SP->_fifo[head] = ch;
--    T(("ungetch %s ok", _tracechar(ch)));
-+	sp->_fifo[head] = ch;
-+	T(("ungetch %s ok", _nc_tracechar(sp, ch)));
- #ifdef TRACE
--    if (_nc_tracing & TRACE_IEVENT)
--	_nc_fifo_dump();
-+	if (USE_TRACEF(TRACE_IEVENT)) {
-+	    _nc_fifo_dump(sp);
-+	    _nc_unlock_global(tracef);
-+	}
- #endif
--    returnCode(OK);
-+	rc = OK;
-+    }
-+    return rc;
-+}
-+
-+NCURSES_EXPORT(int)
-+ungetch(int ch)
-+{
-+    T((T_CALLED("ungetch(%s)"), _nc_tracechar(SP, ch)));
-+    returnCode(_nc_ungetch(SP, ch));
- }
-diff -Naur ncurses-5.6.orig/ncurses/base/lib_window.c ncurses-5.6/ncurses/base/lib_window.c
---- ncurses-5.6.orig/ncurses/base/lib_window.c	2006-05-27 15:21:19.000000000 -0400
-+++ ncurses-5.6/ncurses/base/lib_window.c	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -39,7 +39,7 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: lib_window.c,v 1.22 2006/05/27 19:21:19 tom Exp $")
-+MODULE_ID("$Id: lib_window.c,v 1.25 2008/06/07 14:12:56 tom Exp $")
- 
- NCURSES_EXPORT(void)
- _nc_synchook(WINDOW *win)
-@@ -149,7 +149,7 @@
- 		/* left and right character in child coordinates */
- 		int left = pp->_line[win->_pary + y].firstchar - win->_parx;
- 		int right = pp->_line[win->_pary + y].lastchar - win->_parx;
--		/* The change maybe outside the childs range */
-+		/* The change may be outside the child's range */
- 		if (left < 0)
- 		    left = 0;
- 		if (right > win->_maxx)
-@@ -186,6 +186,7 @@
- 
-     if (win != 0) {
- 
-+	_nc_lock_global(curses);
- 	if (win->_flags & _ISPAD) {
- 	    nwin = newpad(win->_maxy + 1,
- 			  win->_maxx + 1);
-@@ -243,6 +244,7 @@
- 		nwin->_line[i].lastchar = win->_line[i].lastchar;
- 	    }
- 	}
-+	_nc_unlock_global(curses);
-     }
-     returnWin(nwin);
- }
-diff -Naur ncurses-5.6.orig/ncurses/base/memmove.c ncurses-5.6/ncurses/base/memmove.c
---- ncurses-5.6.orig/ncurses/base/memmove.c	2000-12-09 21:43:28.000000000 -0500
-+++ ncurses-5.6/ncurses/base/memmove.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
-+ * Copyright (c) 1998-2000,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -28,7 +28,7 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: memmove.c,v 1.4 2000/12/10 02:43:28 tom Exp $")
-+MODULE_ID("$Id: memmove.c,v 1.5 2007/08/11 17:12:43 tom Exp $")
- 
- /****************************************************************************
-  *  Author: Thomas E. Dickey <dickey@clark.net> 1998                        *
-@@ -51,7 +51,7 @@
- 	    }
- 	    for (j = 0; j < n; j++)
- 		bfr[j] = SRC[j];
--	    SRC = bfr;
-+	    s2 = bfr;
- 	}
- 	while (n-- != 0)
- 	    DST[n] = SRC[n];
-diff -Naur ncurses-5.6.orig/ncurses/base/resizeterm.c ncurses-5.6/ncurses/base/resizeterm.c
---- ncurses-5.6.orig/ncurses/base/resizeterm.c	2006-10-14 16:43:31.000000000 -0400
-+++ ncurses-5.6/ncurses/base/resizeterm.c	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -41,12 +41,24 @@
- #include <curses.priv.h>
- #include <term.h>
- 
--MODULE_ID("$Id: resizeterm.c,v 1.18 2006/10/14 20:43:31 tom Exp $")
-+MODULE_ID("$Id: resizeterm.c,v 1.34 2008/06/07 13:58:40 tom Exp $")
- 
- #define stolen_lines (screen_lines - SP->_lines_avail)
- 
-+/*
-+ * If we're trying to be reentrant, do not want any local statics.
-+ */
-+#if USE_REENTRANT
-+#define EXTRA_ARGS ,     CurLines,     CurCols
-+#define EXTRA_DCLS , int CurLines, int CurCols
-+#else
- static int current_lines;
- static int current_cols;
-+#define CurLines current_lines
-+#define CurCols  current_cols
-+#define EXTRA_ARGS		/* nothing */
-+#define EXTRA_DCLS		/* nothing */
-+#endif
- 
- #ifdef TRACE
- static void
-@@ -54,9 +66,10 @@
- {
-     WINDOWLIST *wp;
- 
-+    _nc_lock_global(curses);
-     _tracef("%s resizing: %2d x %2d (%2d x %2d)", name, LINES, COLS,
- 	    screen_lines, screen_columns);
--    for (wp = _nc_windows; wp != 0; wp = wp->next) {
-+    for (each_window(wp)) {
- 	_tracef("  window %p is %2ld x %2ld at %2ld,%2ld",
- 		&(wp->win),
- 		(long) wp->win._maxy + 1,
-@@ -64,9 +77,14 @@
- 		(long) wp->win._begy,
- 		(long) wp->win._begx);
-     }
-+    _nc_unlock_global(curses);
- }
- #endif
- 
-+/*
-+ * Return true if the given dimensions do not match the internal terminal
-+ * structure's size.
-+ */
- NCURSES_EXPORT(bool)
- is_term_resized(int ToLines, int ToCols)
- {
-@@ -78,6 +96,48 @@
- }
- 
- /*
-+ */
-+static ripoff_t *
-+ripped_window(WINDOW *win)
-+{
-+    ripoff_t *result = 0;
-+    ripoff_t *rop;
-+
-+    if (win != 0) {
-+	for (each_ripoff(rop)) {
-+	    if (rop->win == win && rop->line != 0) {
-+		result = rop;
-+		break;
-+	    }
-+	}
-+    }
-+    return result;
-+}
-+
-+/*
-+ * Returns the number of lines from the bottom for the beginning of a ripped
-+ * off window.
-+ */
-+static int
-+ripped_bottom(WINDOW *win)
-+{
-+    int result = 0;
-+    ripoff_t *rop;
-+
-+    if (win != 0) {
-+	for (each_ripoff(rop)) {
-+	    if (rop->line < 0) {
-+		result -= rop->line;
-+		if (rop->win == win) {
-+		    break;
-+		}
-+	    }
-+	}
-+    }
-+    return result;
-+}
-+
-+/*
-  * Return the number of levels of child-windows under the current window.
-  */
- static int
-@@ -88,7 +148,7 @@
-     if (cmp != 0) {
- 	WINDOWLIST *wp;
- 
--	for (wp = _nc_windows; wp != 0; wp = wp->next) {
-+	for (each_window(wp)) {
- 	    WINDOW *tst = &(wp->win);
- 	    if (tst->_parent == cmp) {
- 		depth = 1 + child_depth(tst);
-@@ -121,41 +181,53 @@
-  * FIXME: must adjust position so it's within the parent!
-  */
- static int
--adjust_window(WINDOW *win, int ToLines, int ToCols, int stolen)
-+adjust_window(WINDOW *win, int ToLines, int ToCols, int stolen EXTRA_DCLS)
- {
-     int result;
--    int bottom = current_lines + SP->_topstolen - stolen;
-+    int bottom = CurLines + SP->_topstolen - stolen;
-     int myLines = win->_maxy + 1;
-     int myCols = win->_maxx + 1;
-+    ripoff_t *rop = ripped_window(win);
- 
--    T((T_CALLED("adjust_window(%p,%d,%d) currently %ldx%ld at %ld,%ld"),
-+    T((T_CALLED("adjust_window(%p,%d,%d)%s depth %d/%d currently %ldx%ld at %ld,%ld"),
-        win, ToLines, ToCols,
-+       (rop != 0) ? " (rip)" : "",
-+       parent_depth(win),
-+       child_depth(win),
-        (long) getmaxy(win), (long) getmaxx(win),
--       (long) getbegy(win), (long) getbegx(win)));
-+       (long) getbegy(win) + win->_yoffset, (long) getbegx(win)));
- 
--    if (win->_begy >= bottom) {
--	win->_begy += (ToLines - current_lines);
-+    if (rop != 0 && rop->line < 0) {
-+	/*
-+	 * If it is a ripped-off window at the bottom of the screen, simply
-+	 * move it to the same relative position.
-+	 */
-+	win->_begy = ToLines - ripped_bottom(win) - 0 - win->_yoffset;
-+    } else if (win->_begy >= bottom) {
-+	/*
-+	 * If it is below the bottom of the new screen, move up by the same
-+	 * amount that the screen shrank.
-+	 */
-+	win->_begy += (ToLines - CurLines);
-     } else {
--	if (myLines == current_lines - stolen
--	    && ToLines != current_lines)
-+	if (myLines == (CurLines - stolen)
-+	    && ToLines != CurLines) {
- 	    myLines = ToLines - stolen;
--	else if (myLines == current_lines
--		 && ToLines != current_lines)
-+	} else if (myLines == CurLines
-+		   && ToLines != CurLines) {
- 	    myLines = ToLines;
-+	}
-     }
- 
--    if (myLines > ToLines)
-+    if (myLines > ToLines) {
- 	myLines = ToLines;
-+    }
- 
-     if (myCols > ToCols)
- 	myCols = ToCols;
- 
--    if (myLines == current_lines
--	&& ToLines != current_lines)
--	myLines = ToLines;
--
--    if (myCols == current_cols
--	&& ToCols != current_cols)
-+    if (myCols == CurCols
-+	&& ToCols != CurCols)
- 	myCols = ToCols;
- 
-     result = wresize(win, myLines, myCols);
-@@ -167,7 +239,7 @@
-  * children, decrease those to fit, then decrease the containing window, etc.
-  */
- static int
--decrease_size(int ToLines, int ToCols, int stolen)
-+decrease_size(int ToLines, int ToCols, int stolen EXTRA_DCLS)
- {
-     bool found;
-     int depth = 0;
-@@ -179,13 +251,14 @@
- 	found = FALSE;
- 	TR(TRACE_UPDATE, ("decreasing size of windows to %dx%d, depth=%d",
- 			  ToLines, ToCols, depth));
--	for (wp = _nc_windows; wp != 0; wp = wp->next) {
-+	for (each_window(wp)) {
- 	    WINDOW *win = &(wp->win);
- 
- 	    if (!(win->_flags & _ISPAD)) {
- 		if (child_depth(win) == depth) {
- 		    found = TRUE;
--		    if (adjust_window(win, ToLines, ToCols, stolen) != OK)
-+		    if (adjust_window(win, ToLines, ToCols,
-+				      stolen EXTRA_ARGS) != OK)
- 			returnCode(ERR);
- 		}
- 	    }
-@@ -200,7 +273,7 @@
-  * parent, increase those to fit, then increase the contained window, etc.
-  */
- static int
--increase_size(int ToLines, int ToCols, int stolen)
-+increase_size(int ToLines, int ToCols, int stolen EXTRA_DCLS)
- {
-     bool found;
-     int depth = 0;
-@@ -212,13 +285,14 @@
- 	found = FALSE;
- 	TR(TRACE_UPDATE, ("increasing size of windows to %dx%d, depth=%d",
- 			  ToLines, ToCols, depth));
--	for (wp = _nc_windows; wp != 0; wp = wp->next) {
-+	for (each_window(wp)) {
- 	    WINDOW *win = &(wp->win);
- 
- 	    if (!(win->_flags & _ISPAD)) {
- 		if (parent_depth(win) == depth) {
- 		    found = TRUE;
--		    if (adjust_window(win, ToLines, ToCols, stolen) != OK)
-+		    if (adjust_window(win, ToLines, ToCols,
-+				      stolen EXTRA_ARGS) != OK)
- 			returnCode(ERR);
- 		}
- 	    }
-@@ -235,36 +309,45 @@
- NCURSES_EXPORT(int)
- resize_term(int ToLines, int ToCols)
- {
--    int result = OK;
--    int was_stolen = (screen_lines - SP->_lines_avail);
-+    int result = OK EXTRA_ARGS;
-+    int was_stolen;
- 
-     T((T_CALLED("resize_term(%d,%d) old(%d,%d)"),
-        ToLines, ToCols,
-        screen_lines, screen_columns));
- 
-+    if (SP == 0) {
-+	returnCode(ERR);
-+    }
-+
-+    _nc_lock_global(curses);
-+
-+    was_stolen = (screen_lines - SP->_lines_avail);
-     if (is_term_resized(ToLines, ToCols)) {
--	int myLines = current_lines = screen_lines;
--	int myCols = current_cols = screen_columns;
-+	int myLines = CurLines = screen_lines;
-+	int myCols = CurCols = screen_columns;
- 
- #ifdef TRACE
--	if (_nc_tracing & TRACE_UPDATE)
-+	if (USE_TRACEF(TRACE_UPDATE)) {
- 	    show_window_sizes("before");
-+	    _nc_unlock_global(tracef);
-+	}
- #endif
- 	if (ToLines > screen_lines) {
--	    increase_size(myLines = ToLines, myCols, was_stolen);
--	    current_lines = myLines;
--	    current_cols = myCols;
-+	    increase_size(myLines = ToLines, myCols, was_stolen EXTRA_ARGS);
-+	    CurLines = myLines;
-+	    CurCols = myCols;
- 	}
- 
- 	if (ToCols > screen_columns) {
--	    increase_size(myLines, myCols = ToCols, was_stolen);
--	    current_lines = myLines;
--	    current_cols = myCols;
-+	    increase_size(myLines, myCols = ToCols, was_stolen EXTRA_ARGS);
-+	    CurLines = myLines;
-+	    CurCols = myCols;
- 	}
- 
- 	if (ToLines < myLines ||
- 	    ToCols < myCols) {
--	    decrease_size(ToLines, ToCols, was_stolen);
-+	    decrease_size(ToLines, ToCols, was_stolen EXTRA_ARGS);
- 	}
- 
- 	screen_lines = lines = ToLines;
-@@ -279,10 +362,11 @@
- 	    FreeAndNull(SP->newhash);
- 	}
- #ifdef TRACE
--	if (_nc_tracing & TRACE_UPDATE) {
--	    LINES = ToLines - was_stolen;
--	    COLS = ToCols;
-+	if (USE_TRACEF(TRACE_UPDATE)) {
-+	    SET_LINES(ToLines - was_stolen);
-+	    SET_COLS(ToCols);
- 	    show_window_sizes("after");
-+	    _nc_unlock_global(tracef);
- 	}
- #endif
-     }
-@@ -291,8 +375,10 @@
-      * Always update LINES, to allow for call from lib_doupdate.c which
-      * needs to have the count adjusted by the stolen (ripped off) lines.
-      */
--    LINES = ToLines - was_stolen;
--    COLS = ToCols;
-+    SET_LINES(ToLines - was_stolen);
-+    SET_COLS(ToCols);
-+
-+    _nc_unlock_global(curses);
- 
-     returnCode(result);
- }
-@@ -308,22 +394,61 @@
- NCURSES_EXPORT(int)
- resizeterm(int ToLines, int ToCols)
- {
--    int result = OK;
--
--    SP->_sig_winch = FALSE;
-+    int result = ERR;
- 
-     T((T_CALLED("resizeterm(%d,%d) old(%d,%d)"),
-        ToLines, ToCols,
-        screen_lines, screen_columns));
- 
--    if (is_term_resized(ToLines, ToCols)) {
-+    if (SP != 0) {
-+	result = OK;
-+	SP->_sig_winch = FALSE;
- 
-+	if (is_term_resized(ToLines, ToCols)) {
- #if USE_SIGWINCH
--	ungetch(KEY_RESIZE);	/* so application can know this */
--	clearok(curscr, TRUE);	/* screen contents are unknown */
-+	    ripoff_t *rop;
-+	    bool slk_visible = (SP != 0
-+				&& SP->_slk != 0
-+				&& !(SP->_slk->hidden));
-+
-+	    if (slk_visible) {
-+		slk_clear();
-+	    }
- #endif
-+	    result = resize_term(ToLines, ToCols);
-+
-+#if USE_SIGWINCH
-+	    _nc_ungetch(SP, KEY_RESIZE);	/* so application can know this */
-+	    clearok(curscr, TRUE);	/* screen contents are unknown */
-+
-+	    /* ripped-off lines are a special case: if we did not lengthen
-+	     * them, we haven't moved them either.  repaint them, too.
-+	     *
-+	     * for the rest - stdscr and other windows - the client has to
-+	     * decide which to repaint, since without panels, ncurses does
-+	     * not know which are really on top.
-+	     */
-+	    for (each_ripoff(rop)) {
-+		if (rop->win != stdscr
-+		    && rop->win != 0
-+		    && rop->line < 0) {
-+
-+		    if (rop->hook != _nc_slk_initialize) {
-+			touchwin(rop->win);
-+			wnoutrefresh(rop->win);
-+		    }
-+		}
-+	    }
-+
-+	    /* soft-keys are a special case: we _know_ how to repaint them */
-+	    if (slk_visible) {
-+		slk_restore();
-+		slk_touch();
- 
--	result = resize_term(ToLines, ToCols);
-+		slk_refresh();
-+	    }
-+#endif
-+	}
-     }
- 
-     returnCode(result);
-diff -Naur ncurses-5.6.orig/ncurses/base/safe_sprintf.c ncurses-5.6/ncurses/base/safe_sprintf.c
---- ncurses-5.6.orig/ncurses/base/safe_sprintf.c	2003-08-09 17:52:04.000000000 -0400
-+++ ncurses-5.6/ncurses/base/safe_sprintf.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2001,2003 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2003,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -33,7 +33,7 @@
- #include <curses.priv.h>
- #include <ctype.h>
- 
--MODULE_ID("$Id: safe_sprintf.c,v 1.18 2003/08/09 21:52:04 tom Exp $")
-+MODULE_ID("$Id: safe_sprintf.c,v 1.20 2007/04/21 22:28:06 tom Exp $")
- 
- #if USE_SAFE_SPRINTF
- 
-@@ -207,56 +207,58 @@
- }
- #endif
- 
-+#define my_buffer _nc_globals.safeprint_buf
-+#define my_length _nc_globals.safeprint_used
-+
- /*
-  * Wrapper for vsprintf that allocates a buffer big enough to hold the result.
-  */
- NCURSES_EXPORT(char *)
- _nc_printf_string(const char *fmt, va_list ap)
- {
--    static char *buf;
--    static size_t used;
-     char *result = 0;
- 
-     if (fmt != 0) {
- #if USE_SAFE_SPRINTF
- 	int len = _nc_printf_length(fmt, ap);
- 
--	if ((int) used < len + 1) {
--	    used = 2 * (len + 1);
--	    buf = typeRealloc(char, used, buf);
-+	if ((int) my_length < len + 1) {
-+	    my_length = 2 * (len + 1);
-+	    my_buffer = typeRealloc(char, my_length, my_buffer);
- 	}
--	if (buf != 0) {
--	    *buf = '\0';
-+	if (my_buffer != 0) {
-+	    *my_buffer = '\0';
- 	    if (len >= 0) {
--		vsprintf(buf, fmt, ap);
-+		vsprintf(my_buffer, fmt, ap);
- 	    }
--	    result = buf;
-+	    result = my_buffer;
- 	}
- #else
--	static int rows, cols;
-+#define MyCols _nc_globals.safeprint_cols
-+#define MyRows _nc_globals.safeprint_rows
- 
--	if (screen_lines > rows || screen_columns > cols) {
--	    if (screen_lines > rows)
--		rows = screen_lines;
--	    if (screen_columns > cols)
--		cols = screen_columns;
--	    used = (rows * (cols + 1)) + 1;
--	    buf = typeRealloc(char, used, buf);
-+	if (screen_lines > MyRows || screen_columns > MyCols) {
-+	    if (screen_lines > MyRows)
-+		MyRows = screen_lines;
-+	    if (screen_columns > MyCols)
-+		MyCols = screen_columns;
-+	    my_length = (MyRows * (MyCols + 1)) + 1;
-+	    my_buffer = typeRealloc(char, my_length, my_buffer);
- 	}
- 
--	if (buf != 0) {
-+	if (my_buffer != 0) {
- # if HAVE_VSNPRINTF
--	    vsnprintf(buf, used, fmt, ap);	/* GNU extension */
-+	    vsnprintf(my_buffer, my_length, fmt, ap);	/* GNU extension */
- # else
--	    vsprintf(buf, fmt, ap);	/* ANSI */
-+	    vsprintf(my_buffer, fmt, ap);	/* ANSI */
- # endif
--	    result = buf;
-+	    result = my_buffer;
- 	}
- #endif
--    } else if (buf != 0) {	/* see _nc_freeall() */
--	free(buf);
--	buf = 0;
--	used = 0;
-+    } else if (my_buffer != 0) {	/* see _nc_freeall() */
-+	free(my_buffer);
-+	my_buffer = 0;
-+	my_length = 0;
-     }
-     return result;
- }
-diff -Naur ncurses-5.6.orig/ncurses/base/tries.c ncurses-5.6/ncurses/base/tries.c
---- ncurses-5.6.orig/ncurses/base/tries.c	2005-11-26 15:09:18.000000000 -0500
-+++ ncurses-5.6/ncurses/base/tries.c	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -39,16 +39,16 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: tries.c,v 1.22 2005/11/26 20:09:18 tom Exp $")
-+MODULE_ID("$Id: tries.c,v 1.26 2008/05/31 16:54:22 tom Exp $")
- 
- /*
-  * Expand a keycode into the string that it corresponds to, returning null if
-  * no match was found, otherwise allocating a string of the result.
-  */
- NCURSES_EXPORT(char *)
--_nc_expand_try(struct tries *tree, unsigned code, int *count, size_t len)
-+_nc_expand_try(TRIES * tree, unsigned code, int *count, size_t len)
- {
--    struct tries *ptr = tree;
-+    TRIES *ptr = tree;
-     char *result = 0;
- 
-     if (code != 0) {
-@@ -68,11 +68,13 @@
- 	}
-     }
-     if (result != 0) {
--	if ((result[len] = ptr->ch) == 0)
-+	if (ptr != 0 && (result[len] = ptr->ch) == 0)
- 	    *((unsigned char *) (result + len)) = 128;
- #ifdef TRACE
--	if (len == 0 && _nc_tracing != 0)
--	    _tracef("expand_key %s %s", _tracechar(code), _nc_visbuf(result));
-+	if (len == 0 && USE_TRACEF(TRACE_MAXIMUM)) {
-+	    _tracef("expand_key %s %s", _nc_tracechar(SP, code), _nc_visbuf(result));
-+	    _nc_unlock_global(tracef);
-+	}
- #endif
-     }
-     return result;
-@@ -83,7 +85,7 @@
-  * true if the code was found/removed.
-  */
- NCURSES_EXPORT(int)
--_nc_remove_key(struct tries **tree, unsigned code)
-+_nc_remove_key(TRIES ** tree, unsigned code)
- {
-     T((T_CALLED("_nc_remove_key(%p,%d)"), tree, code));
- 
-@@ -99,7 +101,7 @@
- 		/* don't cut the whole sub-tree */
- 		(*tree)->value = 0;
- 	    } else {
--		struct tries *to_free = *tree;
-+		TRIES *to_free = *tree;
- 		*tree = (*tree)->sibling;
- 		free(to_free);
- 	    }
-@@ -115,7 +117,7 @@
-  * true if the string was found/removed.
-  */
- NCURSES_EXPORT(int)
--_nc_remove_string(struct tries **tree, const char *string)
-+_nc_remove_string(TRIES ** tree, const char *string)
- {
-     T((T_CALLED("_nc_remove_string(%p,%s)"), tree, _nc_visbuf(string)));
- 
-@@ -127,7 +129,7 @@
- 	    if (string[1] != 0)
- 		returnCode(_nc_remove_string(&(*tree)->child, string + 1));
- 	    if ((*tree)->child == 0) {
--		struct tries *to_free = *tree;
-+		TRIES *to_free = *tree;
- 		*tree = (*tree)->sibling;
- 		free(to_free);
- 		returnCode(TRUE);
-diff -Naur ncurses-5.6.orig/ncurses/base/use_window.c ncurses-5.6/ncurses/base/use_window.c
---- ncurses-5.6.orig/ncurses/base/use_window.c	1969-12-31 19:00:00.000000000 -0500
-+++ ncurses-5.6/ncurses/base/use_window.c	2008-06-18 06:49:51.000000000 -0400
-@@ -0,0 +1,48 @@
-+/****************************************************************************
-+ * Copyright (c) 2007,2008 Free Software Foundation, Inc.                   *
-+ *                                                                          *
-+ * Permission is hereby granted, free of charge, to any person obtaining a  *
-+ * copy of this software and associated documentation files (the            *
-+ * "Software"), to deal in the Software without restriction, including      *
-+ * without limitation the rights to use, copy, modify, merge, publish,      *
-+ * distribute, distribute with modifications, sublicense, and/or sell       *
-+ * copies of the Software, and to permit persons to whom the Software is    *
-+ * furnished to do so, subject to the following conditions:                 *
-+ *                                                                          *
-+ * The above copyright notice and this permission notice shall be included  *
-+ * in all copies or substantial portions of the Software.                   *
-+ *                                                                          *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-+ *                                                                          *
-+ * Except as contained in this notice, the name(s) of the above copyright   *
-+ * holders shall not be used in advertising or otherwise to promote the     *
-+ * sale, use or other dealings in this Software without prior written       *
-+ * authorization.                                                           *
-+ ****************************************************************************/
-+
-+/****************************************************************************
-+ *     Author: Thomas E. Dickey                        2007                 *
-+ ****************************************************************************/
-+
-+#include <curses.priv.h>
-+
-+MODULE_ID("$Id: use_window.c,v 1.8 2008/06/07 14:13:46 tom Exp $")
-+
-+NCURSES_EXPORT(int)
-+use_window(WINDOW *win, NCURSES_WINDOW_CB func, void *data)
-+{
-+    int code = OK;
-+
-+    T((T_CALLED("use_window(%p,%p,%p)"), win, func, data));
-+    _nc_lock_global(curses);
-+    code = func(win, data);
-+    _nc_unlock_global(curses);
-+
-+    returnCode(code);
-+}
-diff -Naur ncurses-5.6.orig/ncurses/base/wresize.c ncurses-5.6/ncurses/base/wresize.c
---- ncurses-5.6.orig/ncurses/base/wresize.c	2006-10-14 16:43:31.000000000 -0400
-+++ ncurses-5.6/ncurses/base/wresize.c	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -32,13 +32,13 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: wresize.c,v 1.24 2006/10/14 20:43:31 tom Exp $")
-+MODULE_ID("$Id: wresize.c,v 1.29 2008/06/07 13:59:01 tom Exp $")
- 
- static int
- cleanup_lines(struct ldat *data, int length)
- {
-     while (--length >= 0)
--	free(data->text);
-+	free(data[length].text);
-     free(data);
-     return ERR;
- }
-@@ -54,7 +54,9 @@
-     struct ldat *pline = cmp->_line;
-     int row;
- 
--    for (wp = _nc_windows; wp != 0; wp = wp->next) {
-+    _nc_lock_global(curses);
-+
-+    for (each_window(wp)) {
- 	WINDOW *tst = &(wp->win);
- 
- 	if (tst->_parent == cmp) {
-@@ -75,6 +77,7 @@
- 	    repair_subwindows(tst);
- 	}
-     }
-+    _nc_unlock_global(curses);
- }
- 
- /*
-@@ -96,8 +99,10 @@
- 			  (long) win->_begy, (long) win->_begx,
- 			  (long) win->_maxy, (long) win->_maxx,
- 			  (long) win->_regtop, (long) win->_regbottom));
--	if (_nc_tracing & TRACE_UPDATE)
-+	if (USE_TRACEF(TRACE_UPDATE)) {
- 	    _tracedump("...before", win);
-+	    _nc_unlock_global(tracef);
-+	}
-     }
- #endif
- 
-@@ -232,8 +237,10 @@
- 		      (long) win->_begy, (long) win->_begx,
- 		      (long) win->_maxy, (long) win->_maxx,
- 		      (long) win->_regtop, (long) win->_regbottom));
--    if (_nc_tracing & TRACE_UPDATE)
-+    if (USE_TRACEF(TRACE_UPDATE)) {
- 	_tracedump("...after:", win);
-+	_nc_unlock_global(tracef);
-+    }
- #endif
-     returnCode(OK);
- }
-diff -Naur ncurses-5.6.orig/ncurses/curses.priv.h ncurses-5.6/ncurses/curses.priv.h
---- ncurses-5.6.orig/ncurses/curses.priv.h	2006-12-09 19:55:14.000000000 -0500
-+++ ncurses-5.6/ncurses/curses.priv.h	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -34,7 +34,7 @@
- 
- 
- /*
-- * $Id: curses.priv.h,v 1.314 2006/12/10 00:55:14 tom Exp $
-+ * $Id: curses.priv.h,v 1.383 2008/06/07 14:13:19 tom Exp $
-  *
-  *	curses.priv.h
-  *
-@@ -202,16 +202,20 @@
-  * delays and expansion in raw mode.
-  */
- 
--struct tries {
--	struct tries    *child;     /* ptr to child.  NULL if none          */
--	struct tries    *sibling;   /* ptr to sibling.  NULL if none        */
-+#define TRIES struct tries
-+typedef TRIES {
-+	TRIES    *child;            /* ptr to child.  NULL if none          */
-+	TRIES    *sibling;          /* ptr to sibling.  NULL if none        */
- 	unsigned char    ch;        /* character at this node               */
- 	unsigned short   value;     /* code of string so far.  0 if none.   */
--};
-+#undef TRIES
-+} TRIES;
- 
- /*
-  * Common/troublesome character definitions
-  */
-+#define StringOf(ch) {ch, 0}
-+
- #define L_BRACE '{'
- #define R_BRACE '}'
- #define S_QUOTE '\''
-@@ -248,6 +252,10 @@
- #define wbkgrnd	    wbkgd
- #endif
- 
-+#undef NCURSES_OPAQUE
-+#define NCURSES_INTERNALS 1
-+#define NCURSES_OPAQUE 0
-+
- #include <curses.h>	/* we'll use -Ipath directive to get the right one! */
- #include <term.h>
- #include <term_entry.h>
-@@ -284,6 +292,70 @@
- #define GET_SCREEN_PAIR(s)	GetPair(SCREEN_ATTRS(s))
- #define SET_SCREEN_PAIR(s,p)	SetPair(SCREEN_ATTRS(s), p)
- 
-+#if USE_REENTRANT
-+NCURSES_EXPORT(int *) _nc_ptr_Lines (void);
-+NCURSES_EXPORT(int *) _nc_ptr_Cols (void);
-+#define ptrLines() (SP ? &(SP->_LINES) : &(_nc_prescreen._LINES))
-+#define ptrCols()  (SP ? &(SP->_COLS)  : &(_nc_prescreen._COLS))
-+#define SET_LINES(value) *_nc_ptr_Lines() = value
-+#define SET_COLS(value)  *_nc_ptr_Cols() = value
-+#else
-+#define ptrLines() &LINES
-+#define ptrCols()  &COLS
-+#define SET_LINES(value) LINES = value
-+#define SET_COLS(value)  COLS = value
-+#endif
-+
-+#define TR_MUTEX(data) _tracef("%s@%d: me:%08lX COUNT:%2u/%2d/%6d/%2d/%s%9u: " #data, \
-+	    __FILE__, __LINE__, \
-+	    (unsigned long) (pthread_self()), \
-+	    data.__data.__lock, \
-+	    data.__data.__count, \
-+	    data.__data.__owner, \
-+	    data.__data.__kind, \
-+	    (data.__data.__nusers > 5) ? " OOPS " : "", \
-+	    data.__data.__nusers)
-+#define TR_GLOBAL_MUTEX(name) TR_MUTEX(_nc_globals.mutex_##name)
-+
-+#ifdef USE_PTHREADS
-+
-+#if USE_REENTRANT
-+#include <pthread.h>
-+extern NCURSES_EXPORT(void) _nc_mutex_init(pthread_mutex_t *);
-+extern NCURSES_EXPORT(int) _nc_mutex_lock(pthread_mutex_t *);
-+extern NCURSES_EXPORT(int) _nc_mutex_trylock(pthread_mutex_t *);
-+extern NCURSES_EXPORT(int) _nc_mutex_unlock(pthread_mutex_t *);
-+#define _nc_lock_global(name)	_nc_mutex_lock(&_nc_globals.mutex_##name)
-+#define _nc_try_global(name)    _nc_mutex_trylock(&_nc_globals.mutex_##name)
-+#define _nc_unlock_global(name)	_nc_mutex_unlock(&_nc_globals.mutex_##name)
-+
-+#else
-+#error POSIX threads requires --enable-reentrant option
-+#endif
-+
-+#if HAVE_NANOSLEEP
-+#undef HAVE_NANOSLEEP
-+#define HAVE_NANOSLEEP 0	/* nanosleep suspends all threads */
-+#endif
-+
-+#else /* !USE_PTHREADS */
-+
-+#define _nc_mutex_init(obj)	/* nothing */
-+
-+#define _nc_lock_global(name)	/* nothing */
-+#define _nc_try_global(name)    0
-+#define _nc_unlock_global(name)	/* nothing */
-+
-+#endif /* USE_PTHREADS */
-+
-+#if HAVE_GETTIMEOFDAY
-+# define PRECISE_GETTIME 1
-+# define TimeType struct timeval
-+#else
-+# define PRECISE_GETTIME 0
-+# define TimeType time_t
-+#endif
-+
- /*
-  * Definitions for color pairs
-  */
-@@ -364,9 +436,9 @@
- #endif	/* USE_TERMLIB */
- 
- typedef	struct {
-+	WINDOW *win;		/* the window used in the hook      */
- 	int	line;		/* lines to take, < 0 => from bottom*/
- 	int	(*hook)(WINDOW *, int); /* callback for user	    */
--	WINDOW *w;		/* maybe we need this for cleanup   */
- } ripoff_t;
- 
- #if USE_GPM_SUPPORT
-@@ -393,6 +465,188 @@
- #endif /* HAVE_LIBDL */
- #endif /* USE_GPM_SUPPORT */
- 
-+typedef struct {
-+    long sequence;
-+    bool last_used;
-+    char *fix_sgr0;		/* this holds the filtered sgr0 string */
-+    char *last_bufp;		/* help with fix_sgr0 leak */
-+    TERMINAL *last_term;
-+} TGETENT_CACHE;
-+
-+#define TGETENT_MAX 4
-+
-+/*
-+ * State of tparm().
-+ */
-+#define STACKSIZE 20
-+
-+typedef struct {
-+	union {
-+		int	num;
-+		char	*str;
-+	} data;
-+	bool num_type;
-+} STACK_FRAME;
-+
-+#define NUM_VARS 26
-+
-+typedef struct {
-+#ifdef TRACE
-+	const char	*tname;
-+#endif
-+	const char	*tparam_base;
-+
-+	STACK_FRAME	stack[STACKSIZE];
-+	int		stack_ptr;
-+
-+	char		*out_buff;
-+	size_t		out_size;
-+	size_t		out_used;
-+
-+	char		*fmt_buff;
-+	size_t		fmt_size;
-+
-+	int		dynamic_var[NUM_VARS];
-+	int		static_vars[NUM_VARS];
-+} TPARM_STATE;
-+
-+typedef struct {
-+    char *text;
-+    size_t size;
-+} TRACEBUF;
-+
-+/*
-+ * The filesystem database normally uses a single-letter for the lower level
-+ * of directories.  Use a hexadecimal code for filesystems which do not
-+ * preserve mixed-case names.
-+ */
-+#if MIXEDCASE_FILENAMES
-+#define LEAF_FMT "%c"
-+#else
-+#define LEAF_FMT "%02x"
-+#endif
-+
-+/*
-+ * TRACEMSE_FMT is no longer than 80 columns, there are 5 numbers that
-+ * could at most have 10 digits, and the mask contains no more than 32 bits
-+ * with each bit representing less than 15 characters.  Usually the whole
-+ * string is less than 80 columns, but this buffer size is an absolute
-+ * limit.
-+ */
-+#define TRACEMSE_MAX	(80 + (5 * 10) + (32 * 15))
-+#define TRACEMSE_FMT	"id %2d  at (%2d, %2d, %2d) state %4lx = {" /* } */
-+
-+/*
-+ * Global data which is not specific to a screen.
-+ */
-+typedef struct {
-+	SIG_ATOMIC_T	have_sigwinch;
-+	SIG_ATOMIC_T	cleanup_nested;
-+
-+	bool		init_signals;
-+	bool		init_screen;
-+
-+	const char	*comp_sourcename;
-+	char		*comp_termtype;
-+
-+	bool		have_tic_directory;
-+	bool		keep_tic_directory;
-+	const char	*tic_directory;
-+
-+	char		*dbi_list;
-+	int		dbi_size;
-+
-+	char		*first_name;
-+	char		**keyname_table;
-+
-+	int		slk_format;
-+
-+	char		*safeprint_buf;
-+	size_t		safeprint_used;
-+
-+	TGETENT_CACHE	tgetent_cache[TGETENT_MAX];
-+	int		tgetent_index;
-+	long		tgetent_sequence;
-+
-+	WINDOWLIST	*_nc_windowlist;
-+#define _nc_windows	_nc_globals._nc_windowlist
-+
-+#if USE_HOME_TERMINFO
-+	char		*home_terminfo;
-+#endif
-+
-+#if !USE_SAFE_SPRINTF
-+	int		safeprint_cols;
-+	int		safeprint_rows;
-+#endif
-+
-+#ifdef TRACE
-+	bool		init_trace;
-+	char		trace_fname[PATH_MAX];
-+	int		trace_level;
-+	FILE		*trace_fp;
-+
-+	char		*tracearg_buf;
-+	size_t		tracearg_used;
-+
-+	TRACEBUF	*tracebuf_ptr;
-+	size_t		tracebuf_used;
-+
-+	char		tracechr_buf[40];
-+
-+	char		*tracedmp_buf;
-+	size_t		tracedmp_used;
-+
-+	unsigned char	*tracetry_buf;
-+	size_t		tracetry_used;
-+
-+	char		traceatr_color_buf[2][80];
-+	int		traceatr_color_sel;
-+	int		traceatr_color_last;
-+
-+#endif	/* TRACE */
-+
-+#ifdef USE_PTHREADS
-+       pthread_mutex_t	mutex_curses;
-+       pthread_mutex_t	mutex_tst_tracef;
-+       pthread_mutex_t	mutex_tracef;
-+       int		nested_tracef;
-+#endif
-+} NCURSES_GLOBALS;
-+
-+extern NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals;
-+
-+#define N_RIPS 5
-+
-+/*
-+ * Global data which can be swept up into a SCREEN when one is created.
-+ * It may be modified before the next SCREEN is created.
-+ */
-+typedef struct {
-+	bool		use_env;
-+	bool		filter_mode;
-+	attr_t		previous_attr;
-+	ripoff_t	rippedoff[N_RIPS];
-+	ripoff_t	*rsp;
-+	TPARM_STATE	tparm_state;
-+	TTY		*saved_tty;	/* savetty/resetty information	    */
-+#if BROKEN_LINKER || USE_REENTRANT
-+	chtype		*real_acs_map;
-+	int		_LINES;
-+	int		_COLS;
-+	TERMINAL	*_cur_term;
-+#ifdef TRACE
-+	long		_outchars;
-+	const char	*_tputs_trace;
-+#endif
-+#endif
-+} NCURSES_PRESCREEN;
-+
-+#define ripoff_sp	_nc_prescreen.rsp
-+#define ripoff_stack	_nc_prescreen.rippedoff
-+
-+extern NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen;
-+
- /*
-  * The SCREEN structure.
-  */
-@@ -405,20 +659,19 @@
- 	bool		_buffered;	/* setvbuf uses _setbuf data	    */
- 	int		_checkfd;	/* filedesc for typeahead check	    */
- 	TERMINAL	*_term;		/* terminal type information	    */
--	short		_lines;		/* screen lines			    */
--	short		_columns;	/* screen columns		    */
-+	TTY		_saved_tty;	/* savetty/resetty information	    */
-+	NCURSES_SIZE_T	_lines;		/* screen lines			    */
-+	NCURSES_SIZE_T	_columns;	/* screen columns		    */
- 
--	short		_lines_avail;	/* lines available for stdscr	    */
--	short		_topstolen;	/* lines stolen from top	    */
--	ripoff_t	_rippedoff[5];	/* list of lines stolen		    */
--	int		_rip_count;	/* ...and total lines stolen	    */
-+	NCURSES_SIZE_T	_lines_avail;	/* lines available for stdscr	    */
-+	NCURSES_SIZE_T	_topstolen;	/* lines stolen from top	    */
- 
- 	WINDOW		*_curscr;	/* current screen		    */
- 	WINDOW		*_newscr;	/* virtual screen to be updated to  */
- 	WINDOW		*_stdscr;	/* screen's full-window context	    */
- 
--	struct tries	*_keytry;	/* "Try" for use with keypad mode   */
--	struct tries	*_key_ok;	/* Disabled keys via keyok(,FALSE)  */
-+	TRIES		*_keytry;	/* "Try" for use with keypad mode   */
-+	TRIES		*_key_ok;	/* Disabled keys via keyok(,FALSE)  */
- 	bool		_tried;		/* keypad mode was initialized	    */
- 	bool		_keypad_on;	/* keypad mode is currently on	    */
- 
-@@ -532,7 +785,7 @@
- 	int		_maxclick;
- 	bool		(*_mouse_event) (SCREEN *);
- 	bool		(*_mouse_inline)(SCREEN *);
--	bool		(*_mouse_parse) (int);
-+	bool		(*_mouse_parse) (SCREEN *, int);
- 	void		(*_mouse_resume)(SCREEN *);
- 	void		(*_mouse_wrap)	(SCREEN *);
- 	int		_mouse_fd;	/* file-descriptor, if any */
-@@ -583,12 +836,6 @@
- 	 * per screen basis.
- 	 */
- 	struct panelhook _panelHook;
--	/*
--	 * Linked-list of all windows, to support '_nc_resizeall()' and
--	 * '_nc_freeall()'
--	 */
--	WINDOWLIST	*_nc_sp_windows;
--#define _nc_windows SP->_nc_sp_windows
- 
- 	bool		_sig_winch;
- 	SCREEN		*_next_screen;
-@@ -597,12 +844,30 @@
- 	unsigned long	*oldhash, *newhash;
- 	HASHMAP		*hashtab;
- 	int		hashtab_len;
-+	int		*_oldnum_list;
-+	int		_oldnum_size;
- 
- 	bool		_cleanup;	/* cleanup after int/quit signal */
- 	int		(*_outch)(int); /* output handler if not putc */
- 
- 	int		_legacy_coding;	/* see use_legacy_coding() */
- 
-+#if USE_REENTRANT
-+	char		_ttytype[NAMESIZE];
-+	int		_ESCDELAY;
-+	int		_TABSIZE;
-+	int		_LINES;
-+	int		_COLS;
-+#ifdef TRACE
-+	long		_outchars;
-+	const char	*_tputs_trace;
-+#endif
-+#endif
-+
-+#ifdef TRACE
-+	char		tracechr_buf[40];
-+	char		tracemse_buf[TRACEMSE_MAX];
-+#endif
- 	/*
- 	 * ncurses/ncursesw are the same up to this point.
- 	 */
-@@ -615,10 +880,12 @@
- };
- 
- extern NCURSES_EXPORT_VAR(SCREEN *) _nc_screen_chain;
-+extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch;
- 
- 	WINDOWLIST {
--	WINDOW	win;	/* first, so WINDOW_EXT() works */
-+	WINDOW	win;		/* first, so WINDOW_EXT() works */
- 	WINDOWLIST *next;
-+	SCREEN *screen;		/* screen containing the window */
- #ifdef _XOPEN_SOURCE_EXTENDED
- 	char addch_work[(MB_LEN_MAX * 9) + 1];
- 	unsigned addch_used;	/* number of bytes in addch_work[] */
-@@ -691,11 +958,17 @@
- #endif
- 
- #ifdef TRACE
--#define TRACE_OUTCHARS(n) _nc_outchars += (n);
-+#if USE_REENTRANT
-+#define COUNT_OUTCHARS(n) _nc_count_outchars(n);
-+#else
-+#define COUNT_OUTCHARS(n) _nc_outchars += (n);
-+#endif
- #else
--#define TRACE_OUTCHARS(n) /* nothing */
-+#define COUNT_OUTCHARS(n) /* nothing */
- #endif
- 
-+#define RESET_OUTCHARS() COUNT_OUTCHARS(-_nc_outchars)
-+
- #define UChar(c)	((unsigned char)(c))
- #define ChCharOf(c)	((c) & (chtype)A_CHARTEXT)
- #define ChAttrOf(c)	((c) & (chtype)A_ATTRIBUTES)
-@@ -705,7 +978,7 @@
- #endif
- 
- #if USE_WIDEC_SUPPORT /* { */
--#define isEILSEQ(status) ((status == (size_t)-1) && (errno == EILSEQ))
-+#define isEILSEQ(status) (((size_t)status == (size_t)-1) && (errno == EILSEQ))
- 
- #define init_mb(state)	memset(&state, 0, sizeof(state))
- 
-@@ -718,12 +991,26 @@
- #define NulChar		0,0,0,0	/* FIXME: see CCHARW_MAX */
- #define CharOf(c)	((c).chars[0])
- #define AttrOf(c)	((c).attr)
--#define AddAttr(c,a)	AttrOf(c) |= ((a) & A_ATTRIBUTES)
-+
-+#define AddAttr(c,a)	AttrOf(c) |=  ((a) & A_ATTRIBUTES)
- #define RemAttr(c,a)	AttrOf(c) &= ~((a) & A_ATTRIBUTES)
--#define SetAttr(c,a)	AttrOf(c) = ((a) & A_ATTRIBUTES)
-+#define SetAttr(c,a)	AttrOf(c) =   ((a) & A_ATTRIBUTES) | WidecExt(c)
-+
- #define NewChar2(c,a)	{ a, { c, NulChar } NulColor }
- #define NewChar(ch)	NewChar2(ChCharOf(ch), ChAttrOf(ch))
-+
-+#if CCHARW_MAX == 5
-+#define CharEq(a,b)	(((a).attr == (b).attr) \
-+		       && (a).chars[0] == (b).chars[0] \
-+		       && (a).chars[1] == (b).chars[1] \
-+		       && (a).chars[2] == (b).chars[2] \
-+		       && (a).chars[3] == (b).chars[3] \
-+		       && (a).chars[4] == (b).chars[4] \
-+			if_EXT_COLORS(&& (a).ext_color == (b).ext_color))
-+#else
- #define CharEq(a,b)	(!memcmp(&(a), &(b), sizeof(a)))
-+#endif
-+
- #define SetChar(ch,c,a) do {							    \
- 			    NCURSES_CH_T *_cp = &ch;				    \
- 			    memset(_cp, 0, sizeof(ch));				    \
-@@ -741,7 +1028,7 @@
- #define PUTC(ch,b)	do { if(!isWidecExt(ch)) {				    \
- 			if (Charable(ch)) {					    \
- 			    fputc(CharOf(ch), b);				    \
--			    TRACE_OUTCHARS(1);					    \
-+			    COUNT_OUTCHARS(1);					    \
- 			} else {						    \
- 			    PUTC_INIT;						    \
- 			    for (PUTC_i = 0; PUTC_i < CCHARW_MAX; ++PUTC_i) {	    \
-@@ -757,11 +1044,11 @@
- 				}						    \
- 				fwrite(PUTC_buf, (unsigned) PUTC_n, 1, b);	    \
- 			    }							    \
--			    TRACE_OUTCHARS(PUTC_i);				    \
-+			    COUNT_OUTCHARS(PUTC_i);				    \
- 			} } } while (0)
- 
--#define BLANK		{ WA_NORMAL, {' '} NulColor }
--#define ZEROS		{ WA_NORMAL, {'\0'} NulColor }
-+#define BLANK		NewChar2(' ', WA_NORMAL)
-+#define ZEROS		NewChar2('\0', WA_NORMAL)
- #define ISBLANK(ch)	((ch).chars[0] == L' ' && (ch).chars[1] == L'\0')
- 
- 	/*
-@@ -877,6 +1164,13 @@
- #endif
- 
- /*
-+ * Standardize/simplify common loops
-+ */
-+#define each_screen(p) p = _nc_screen_chain; p != 0; p = (p)->_next_screen
-+#define each_window(p) p = _nc_windows; p != 0; p = (p)->next
-+#define each_ripoff(p) p = ripoff_stack; (p - ripoff_stack) < N_RIPS; ++p
-+
-+/*
-  * Prefixes for call/return points of library function traces.  We use these to
-  * instrument the public functions so that the traces can be easily transformed
-  * into regression scripts.
-@@ -887,6 +1181,12 @@
- 
- #ifdef TRACE
- 
-+#if USE_REENTRANT
-+#define TPUTS_TRACE(s)	_nc_set_tputs_trace(s);
-+#else
-+#define TPUTS_TRACE(s)	_nc_tputs_trace = s;
-+#endif
-+
- #define START_TRACE() \
- 	if ((_nc_tracing & TRACE_MAXIMUM) == 0) { \
- 	    int t = _nc_getenv_num("NCURSES_TRACE"); \
-@@ -894,9 +1194,21 @@
- 		trace((unsigned) t); \
- 	}
- 
--#define TR(n, a)	if (_nc_tracing & (n)) _tracef a
-+/*
-+ * Many of the _tracef() calls use static buffers; lock the trace state before
-+ * trying to fill them.
-+ */
-+#if USE_REENTRANT
-+#define USE_TRACEF(mask) _nc_use_tracef(mask)
-+extern NCURSES_EXPORT(int)	_nc_use_tracef (unsigned);
-+extern NCURSES_EXPORT(void)	_nc_locked_tracef (const char *, ...) GCC_PRINTFLIKE(1,2);
-+#else
-+#define USE_TRACEF(mask) (_nc_tracing & (mask))
-+#define _nc_locked_tracef _tracef
-+#endif
-+
-+#define TR(n, a)	if (USE_TRACEF(n)) _nc_locked_tracef a
- #define T(a)		TR(TRACE_CALLS, a)
--#define TPUTS_TRACE(s)	_nc_tputs_trace = s;
- #define TRACE_RETURN(value,type) return _nc_retrace_##type(value)
- 
- #define returnAttr(code)	TRACE_RETURN(code,attr_t)
-@@ -926,9 +1238,20 @@
- extern NCURSES_EXPORT(int)              _nc_retrace_int (int);
- extern NCURSES_EXPORT(unsigned)         _nc_retrace_unsigned (unsigned);
- extern NCURSES_EXPORT(void *)           _nc_retrace_void_ptr (void *);
--extern NCURSES_EXPORT(void)             _nc_fifo_dump (void);
-+extern NCURSES_EXPORT(void)             _nc_fifo_dump (SCREEN *);
-+
-+#if USE_REENTRANT
-+NCURSES_WRAPPED_VAR(long, _nc_outchars);
-+NCURSES_WRAPPED_VAR(const char *, _nc_tputs_trace);
-+#define _nc_outchars       NCURSES_PUBLIC_VAR(_nc_outchars())
-+#define _nc_tputs_trace    NCURSES_PUBLIC_VAR(_nc_tputs_trace())
-+extern NCURSES_EXPORT(void)		_nc_set_tputs_trace (const char *);
-+extern NCURSES_EXPORT(void)		_nc_count_outchars (long);
-+#else
- extern NCURSES_EXPORT_VAR(const char *) _nc_tputs_trace;
- extern NCURSES_EXPORT_VAR(long)         _nc_outchars;
-+#endif
-+
- extern NCURSES_EXPORT_VAR(unsigned)     _nc_tracing;
- 
- #if USE_WIDEC_SUPPORT
-@@ -1083,6 +1406,21 @@
- extern NCURSES_EXPORT(wint_t) _nc_to_widechar(int);
- #endif
- 
-+/* comp_captab.c */
-+typedef struct {
-+	short	nte_name;	/* offset of name to hash on */
-+	int	nte_type;	/* BOOLEAN, NUMBER or STRING */
-+	short	nte_index;	/* index of associated variable in its array */
-+	short	nte_link;	/* index in table of next hash, or -1 */
-+} name_table_data;
-+
-+typedef struct
-+{
-+	short	from;
-+	short	to;
-+	short	source;
-+} alias_table_data;
-+
- /* doupdate.c */
- #if USE_XMC_SUPPORT
- extern NCURSES_EXPORT(void) _nc_do_xmc_glitch (attr_t);
-@@ -1141,14 +1479,18 @@
- extern NCURSES_EXPORT(int) _nc_unicode_locale(void);
- extern NCURSES_EXPORT(int) _nc_locale_breaks_acs(void);
- extern NCURSES_EXPORT(int) _nc_setupterm(NCURSES_CONST char *, int, int *, bool);
-+extern NCURSES_EXPORT(void) _nc_get_screensize(SCREEN *, int *, int *);
- 
- /* lib_tstp.c */
- #if USE_SIGWINCH
--extern NCURSES_EXPORT(int) _nc_handle_sigwinch(int);
-+extern NCURSES_EXPORT(int) _nc_handle_sigwinch(SCREEN *);
- #else
- #define _nc_handle_sigwinch(a) /* nothing */
- #endif
- 
-+/* lib_ungetch.c */
-+extern NCURSES_EXPORT(int) _nc_ungetch (SCREEN *, int);
-+
- /* lib_wacs.c */
- #if USE_WIDEC_SUPPORT
- extern NCURSES_EXPORT(void) _nc_init_wacs(void);
-@@ -1177,32 +1519,37 @@
- extern NCURSES_EXPORT(char *) _nc_printf_string (const char *, va_list);
- 
- /* tries.c */
--extern NCURSES_EXPORT(void) _nc_add_to_try (struct tries **, const char *, unsigned);
--extern NCURSES_EXPORT(char *) _nc_expand_try (struct tries *, unsigned, int *, size_t);
--extern NCURSES_EXPORT(int) _nc_remove_key (struct tries **, unsigned);
--extern NCURSES_EXPORT(int) _nc_remove_string (struct tries **, const char *);
-+extern NCURSES_EXPORT(int) _nc_add_to_try (TRIES **, const char *, unsigned);
-+extern NCURSES_EXPORT(char *) _nc_expand_try (TRIES *, unsigned, int *, size_t);
-+extern NCURSES_EXPORT(int) _nc_remove_key (TRIES **, unsigned);
-+extern NCURSES_EXPORT(int) _nc_remove_string (TRIES **, const char *);
- 
- /* elsewhere ... */
--extern NCURSES_EXPORT(ENTRY *) _nc_delink_entry(ENTRY *, TERMTYPE *);
-+extern NCURSES_EXPORT(ENTRY *) _nc_delink_entry (ENTRY *, TERMTYPE *);
-+extern NCURSES_EXPORT(NCURSES_CONST char *) _nc_keyname (SCREEN *, int);
-+extern NCURSES_EXPORT(NCURSES_CONST char *) _nc_unctrl (SCREEN *, chtype);
-+extern NCURSES_EXPORT(SCREEN *) _nc_screen_of (WINDOW *);
- extern NCURSES_EXPORT(WINDOW *) _nc_makenew (int, int, int, int, int);
- extern NCURSES_EXPORT(char *) _nc_trace_buf (int, size_t);
- extern NCURSES_EXPORT(char *) _nc_trace_bufcat (int, const char *);
-+extern NCURSES_EXPORT(char *) _nc_tracechar (SCREEN *, int);
-+extern NCURSES_EXPORT(char *) _nc_tracemouse (SCREEN *, MEVENT const *);
- extern NCURSES_EXPORT(int) _nc_access (const char *, int);
- extern NCURSES_EXPORT(int) _nc_baudrate (int);
- extern NCURSES_EXPORT(int) _nc_freewin (WINDOW *);
- extern NCURSES_EXPORT(int) _nc_getenv_num (const char *);
--extern NCURSES_EXPORT(int) _nc_keypad (bool);
-+extern NCURSES_EXPORT(int) _nc_keypad (SCREEN *, bool);
- extern NCURSES_EXPORT(int) _nc_ospeed (int);
- extern NCURSES_EXPORT(int) _nc_outch (int);
- extern NCURSES_EXPORT(int) _nc_read_termcap_entry (const char *const, TERMTYPE *const);
- extern NCURSES_EXPORT(int) _nc_setupscreen (int, int, FILE *, bool, int);
--extern NCURSES_EXPORT(int) _nc_timed_wait(int, int, int * EVENTLIST_2nd(_nc_eventlist *));
-+extern NCURSES_EXPORT(int) _nc_timed_wait (SCREEN *, int, int, int * EVENTLIST_2nd(_nc_eventlist *));
- extern NCURSES_EXPORT(void) _nc_do_color (short, short, bool, int (*)(int));
- extern NCURSES_EXPORT(void) _nc_flush (void);
--extern NCURSES_EXPORT(void) _nc_free_entry(ENTRY *, TERMTYPE *);
-+extern NCURSES_EXPORT(void) _nc_free_entry (ENTRY *, TERMTYPE *);
- extern NCURSES_EXPORT(void) _nc_freeall (void);
- extern NCURSES_EXPORT(void) _nc_hash_map (void);
--extern NCURSES_EXPORT(void) _nc_init_keytry (void);
-+extern NCURSES_EXPORT(void) _nc_init_keytry (SCREEN *);
- extern NCURSES_EXPORT(void) _nc_keep_tic_dir (const char *);
- extern NCURSES_EXPORT(void) _nc_make_oldhash (int i);
- extern NCURSES_EXPORT(void) _nc_scroll_oldhash (int n, int top, int bot);
-@@ -1210,13 +1557,16 @@
- extern NCURSES_EXPORT(void) _nc_set_buffer (FILE *, bool);
- extern NCURSES_EXPORT(void) _nc_signal_handler (bool);
- extern NCURSES_EXPORT(void) _nc_synchook (WINDOW *);
--extern NCURSES_EXPORT(void) _nc_trace_tries (struct tries *);
-+extern NCURSES_EXPORT(void) _nc_trace_tries (TRIES *);
- 
- #if NO_LEAKS
- extern NCURSES_EXPORT(void) _nc_alloc_entry_leaks(void);
- extern NCURSES_EXPORT(void) _nc_captoinfo_leaks(void);
-+extern NCURSES_EXPORT(void) _nc_codes_leaks(void);
-+extern NCURSES_EXPORT(void) _nc_comp_captab_leaks(void);
- extern NCURSES_EXPORT(void) _nc_comp_scan_leaks(void);
- extern NCURSES_EXPORT(void) _nc_keyname_leaks(void);
-+extern NCURSES_EXPORT(void) _nc_names_leaks(void);
- extern NCURSES_EXPORT(void) _nc_tgetent_leaks(void);
- #endif
- 
-@@ -1227,15 +1577,11 @@
- #endif
- 
- #if USE_WIDEC_SUPPORT && !defined(USE_TERMLIB)
--#ifdef linux
- extern NCURSES_EXPORT(size_t) _nc_wcrtomb (char *, wchar_t, mbstate_t *);
--#else
--#define _nc_wcrtomb(s,wc,ps) wcrtomb(s,wc,ps)
--#endif
- #endif
- 
- #if USE_SIZECHANGE
--extern NCURSES_EXPORT(void) _nc_update_screensize (void);
-+extern NCURSES_EXPORT(void) _nc_update_screensize (SCREEN *);
- #endif
- 
- #if HAVE_RESIZETERM
-@@ -1291,7 +1637,6 @@
- #define screen_lines	SP->_lines
- #define screen_columns	SP->_columns
- 
--extern NCURSES_EXPORT_VAR(int) _nc_slk_format;  /* != 0 if slk_init() called */
- extern NCURSES_EXPORT(int) _nc_slk_initialize (WINDOW *, int);
- 
- /*
-diff -Naur ncurses-5.6.orig/ncurses/fifo_defs.h ncurses-5.6/ncurses/fifo_defs.h
---- ncurses-5.6.orig/ncurses/fifo_defs.h	2002-03-16 15:47:50.000000000 -0500
-+++ ncurses-5.6/ncurses/fifo_defs.h	2008-06-18 06:49:50.000000000 -0400
-@@ -34,21 +34,21 @@
- /*
-  * Common macros for lib_getch.c, lib_ungetch.c
-  *
-- * $Id: fifo_defs.h,v 1.4 2002/03/16 20:47:50 tom Exp $
-+ * $Id: fifo_defs.h,v 1.5 2008/05/03 20:08:16 tom Exp $
-  */
- 
- #ifndef FIFO_DEFS_H
- #define FIFO_DEFS_H 1
- 
--#define head	SP->_fifohead
--#define tail	SP->_fifotail
-+#define head	sp->_fifohead
-+#define tail	sp->_fifotail
- /* peek points to next uninterpreted character */
--#define peek	SP->_fifopeek
-+#define peek	sp->_fifopeek
- 
- #define h_inc() { head == FIFO_SIZE-1 ? head = 0 : head++; if (head == tail) head = -1, tail = 0;}
- #define h_dec() { head == 0 ? head = FIFO_SIZE-1 : head--; if (head == tail) tail = -1;}
- #define t_inc() { tail == FIFO_SIZE-1 ? tail = 0 : tail++; if (tail == head) tail = -1;}
--#define t_dec() { tail == 0 ? tail = FIFO_SIZE-1 : tail--; if (head == tail) fifo_clear();}
-+#define t_dec() { tail == 0 ? tail = FIFO_SIZE-1 : tail--; if (head == tail) fifo_clear(sp);}
- #define p_inc() { peek == FIFO_SIZE-1 ? peek = 0 : peek++;}
- 
- #define cooked_key_in_fifo()	((head != -1) && (peek != head))
-diff -Naur ncurses-5.6.orig/ncurses/llib-lncurses ncurses-5.6/ncurses/llib-lncurses
---- ncurses-5.6.orig/ncurses/llib-lncurses	2006-10-28 18:20:51.000000000 -0400
-+++ ncurses-5.6/ncurses/llib-lncurses	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -27,7 +27,7 @@
-  ****************************************************************************/
- 
- /****************************************************************************
-- *  Author: Thomas E. Dickey 1996-2006                                      *
-+ *  Author: Thomas E. Dickey 1996-2007                                      *
-  ****************************************************************************/
- /* LINTLIBRARY */
- 
-@@ -1017,6 +1017,11 @@
- 		WINDOW	*z)
- 		{ return(*(int *)0); }
- 
-+#undef getattrs
-+int	getattrs(
-+		const WINDOW *z)
-+		{ return(*(int *)0); }
-+
- #undef getcurx
- int	getcurx(
- 		const WINDOW *z)
-@@ -1057,6 +1062,68 @@
- 		const WINDOW *z)
- 		{ return(*(int *)0); }
- 
-+#undef wgetparent
-+WINDOW	*wgetparent(
-+		const WINDOW *z)
-+		{ return(*(WINDOW **)0); }
-+
-+#undef is_cleared
-+NCURSES_BOOL is_cleared(
-+		const WINDOW *z)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef is_idcok
-+NCURSES_BOOL is_idcok(
-+		const WINDOW *z)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef is_idlok
-+NCURSES_BOOL is_idlok(
-+		const WINDOW *z)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef is_immedok
-+NCURSES_BOOL is_immedok(
-+		const WINDOW *z)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef is_keypad
-+NCURSES_BOOL is_keypad(
-+		const WINDOW *z)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef is_leaveok
-+NCURSES_BOOL is_leaveok(
-+		const WINDOW *z)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef is_nodelay
-+NCURSES_BOOL is_nodelay(
-+		const WINDOW *z)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef is_notimeout
-+NCURSES_BOOL is_notimeout(
-+		const WINDOW *z)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef is_scrollok
-+NCURSES_BOOL is_scrollok(
-+		const WINDOW *z)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef is_syncok
-+NCURSES_BOOL is_syncok(
-+		const WINDOW *z)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef wgetscrreg
-+int	wgetscrreg(
-+		const WINDOW *a1, 
-+		int	*a2, 
-+		int	*z)
-+		{ return(*(int *)0); }
-+
- #undef mouse_trafo
- NCURSES_BOOL mouse_trafo(
- 		int	*a1, 
-@@ -2093,40 +2160,11 @@
- /* ./tinfo/add_tries.c */
- 
- #undef _nc_add_to_try
--void	_nc_add_to_try(
--		struct tries **tree, 
-+int	_nc_add_to_try(
-+		TRIES	**tree, 
- 		const char *str, 
- 		unsigned code)
--		{ /* void */ }
--
--/* ./tinfo/alloc_entry.c */
--
--#undef _nc_init_entry
--void	_nc_init_entry(
--		TERMTYPE *const tp)
--		{ /* void */ }
--
--#undef _nc_copy_entry
--ENTRY	*_nc_copy_entry(
--		ENTRY	*oldp)
--		{ return(*(ENTRY **)0); }
--
--#undef _nc_save_str
--char	*_nc_save_str(
--		const char *const string)
--		{ return(*(char **)0); }
--
--#undef _nc_wrap_entry
--void	_nc_wrap_entry(
--		ENTRY	*const ep, 
--		NCURSES_BOOL copy_strings)
--		{ /* void */ }
--
--#undef _nc_merge_entry
--void	_nc_merge_entry(
--		TERMTYPE *const to, 
--		TERMTYPE *const from)
--		{ /* void */ }
-+		{ return(*(int *)0); }
- 
- /* ./tinfo/alloc_ttype.c */
- 
-@@ -2142,22 +2180,6 @@
- 		TERMTYPE *src)
- 		{ /* void */ }
- 
--/* ./tinfo/captoinfo.c */
--
--#undef _nc_captoinfo
--char	*_nc_captoinfo(
--		const char *cap, 
--		const char *s, 
--		int const parameterized)
--		{ return(*(char **)0); }
--
--#undef _nc_infotocap
--char	*_nc_infotocap(
--		const char *cap, 
--		const char *str, 
--		int const parameterized)
--		{ return(*(char **)0); }
--
- /* ./codes.c */
- 
- #undef boolcodes
-@@ -2167,31 +2189,7 @@
- #undef strcodes
- char	*const strcodes[] = {0};
- 
--/* ./comp_captab.c */
--
--#include <ncurses_cfg.h>
--
--#undef _nc_info_hash_table
--const struct name_table_entry *const _nc_info_hash_table[995] = {0};
--#undef _nc_cap_hash_table
--const struct name_table_entry *const _nc_cap_hash_table[995] = {0};
--#undef _nc_capalias_table
--const struct alias _nc_capalias_table[] = {0};
--#undef _nc_infoalias_table
--const struct alias _nc_infoalias_table[] = {0};
--
--#undef _nc_get_table
--const struct name_table_entry *_nc_get_table(
--		NCURSES_BOOL termcap)
--		{ return(*(const struct name_table_entry **)0); }
--
--#undef _nc_get_hash_table
--const struct name_table_entry *const *_nc_get_hash_table(
--		NCURSES_BOOL termcap)
--		{ return(*(const struct name_table_entry **)0); }
--
- /* ./tinfo/comp_error.c */
--
- #undef _nc_suppress_warnings
- NCURSES_BOOL _nc_suppress_warnings;
- #undef _nc_curr_line
-@@ -2236,134 +2234,6 @@
- 		...)
- 		{ /* void */ }
- 
--/* ./tinfo/comp_expand.c */
--
--#undef _nc_tic_expand
--char	*_nc_tic_expand(
--		const char *srcp, 
--		NCURSES_BOOL tic_format, 
--		int	numbers)
--		{ return(*(char **)0); }
--
--/* ./tinfo/comp_hash.c */
--
--#include <hashsize.h>
--
--#undef _nc_find_entry
--struct name_table_entry const *_nc_find_entry(
--		const char *string, 
--		const struct name_table_entry *const *hash_table)
--		{ return(*(struct name_table_entry const **)0); }
--
--#undef _nc_find_type_entry
--struct name_table_entry const *_nc_find_type_entry(
--		const char *string, 
--		int	type, 
--		const struct name_table_entry *table)
--		{ return(*(struct name_table_entry const **)0); }
--
--/* ./tinfo/comp_parse.c */
--
--#undef _nc_check_termtype2
--void	(*_nc_check_termtype2)(
--		TERMTYPE *p1, 
--		NCURSES_BOOL p2);
--#undef _nc_check_termtype
--void	(*_nc_check_termtype)(
--		TERMTYPE *p1);
--#undef _nc_head
--ENTRY	*_nc_head;
--#undef _nc_tail
--ENTRY	*_nc_tail;
--
--#undef _nc_free_entries
--void	_nc_free_entries(
--		ENTRY	*headp)
--		{ /* void */ }
--
--#undef _nc_delink_entry
--ENTRY	*_nc_delink_entry(
--		ENTRY	*headp, 
--		TERMTYPE *tterm)
--		{ return(*(ENTRY **)0); }
--
--#undef _nc_free_entry
--void	_nc_free_entry(
--		ENTRY	*headp, 
--		TERMTYPE *tterm)
--		{ /* void */ }
--
--#undef _nc_entry_match
--NCURSES_BOOL _nc_entry_match(
--		char	*n1, 
--		char	*n2)
--		{ return(*(NCURSES_BOOL *)0); }
--
--#undef _nc_read_entry_source
--void	_nc_read_entry_source(
--		FILE	*fp, 
--		char	*buf, 
--		int	literal, 
--		NCURSES_BOOL silent, 
--		NCURSES_BOOL (*hook)(
--		ENTRY	*p1))
--		{ /* void */ }
--
--#undef _nc_resolve_uses2
--int	_nc_resolve_uses2(
--		NCURSES_BOOL fullresolve, 
--		NCURSES_BOOL literal)
--		{ return(*(int *)0); }
--
--#undef _nc_resolve_uses
--int	_nc_resolve_uses(
--		NCURSES_BOOL fullresolve)
--		{ return(*(int *)0); }
--
--/* ./tinfo/comp_scan.c */
--
--#undef _nc_syntax
--int	_nc_syntax;
--#undef _nc_curr_file_pos
--long	_nc_curr_file_pos;
--#undef _nc_comment_start
--long	_nc_comment_start;
--#undef _nc_comment_end
--long	_nc_comment_end;
--#undef _nc_start_line
--long	_nc_start_line;
--#undef _nc_curr_token
--struct token _nc_curr_token;
--#undef _nc_disable_period
--NCURSES_BOOL _nc_disable_period;
--
--#undef _nc_reset_input
--void	_nc_reset_input(
--		FILE	*fp, 
--		char	*buf)
--		{ /* void */ }
--
--#undef _nc_get_token
--int	_nc_get_token(
--		NCURSES_BOOL silent)
--		{ return(*(int *)0); }
--
--#undef _nc_trans_string
--int	_nc_trans_string(
--		char	*ptr, 
--		char	*last)
--		{ return(*(int *)0); }
--
--#undef _nc_push_token
--void	_nc_push_token(
--		int	tokclass)
--		{ /* void */ }
--
--#undef _nc_panic_mode
--void	_nc_panic_mode(
--		char	ch)
--		{ /* void */ }
--
- /* ./tinfo/db_iterator.c */
- 
- #undef _nc_tic_dir
-@@ -2400,6 +2270,34 @@
- 		size_t	amount)
- 		{ return(*(void **)0); }
- 
-+/* ./tinfo/entries.c */
-+
-+#undef _nc_head
-+ENTRY	*_nc_head;
-+#undef _nc_tail
-+ENTRY	*_nc_tail;
-+
-+#undef _nc_free_entry
-+void	_nc_free_entry(
-+		ENTRY	*headp, 
-+		TERMTYPE *tterm)
-+		{ /* void */ }
-+
-+#undef _nc_free_entries
-+void	_nc_free_entries(
-+		ENTRY	*headp)
-+		{ /* void */ }
-+
-+#undef _nc_delink_entry
-+ENTRY	*_nc_delink_entry(
-+		ENTRY	*headp, 
-+		TERMTYPE *tterm)
-+		{ return(*(ENTRY **)0); }
-+
-+#undef _nc_leaks_tinfo
-+void	_nc_leaks_tinfo(void)
-+		{ /* void */ }
-+
- /* ./fallback.c */
- 
- #undef _nc_fallback
-@@ -2442,7 +2340,7 @@
- #include <init_keytry.h>
- 
- #undef _nc_tinfo_fkeys
--struct tinfo_fkeys _nc_tinfo_fkeys[];
-+const struct tinfo_fkeys _nc_tinfo_fkeys[] = {0};
- 
- #endif
- 
-@@ -2509,6 +2407,10 @@
- SCREEN	*_nc_screen_chain;
- #undef SP
- SCREEN	*SP;
-+#undef _nc_globals
-+NCURSES_GLOBALS _nc_globals;
-+#undef _nc_prescreen
-+NCURSES_PRESCREEN _nc_prescreen;
- 
- /* ./tinfo/lib_has_cap.c */
- 
-@@ -2536,8 +2438,7 @@
- 
- /* ./lib_keyname.c */
- 
--#undef _nc_key_names
--const struct kn _nc_key_names[] = {0};
-+struct kn { short offset; int code; };
- 
- #undef keyname
- char	*keyname(
-@@ -2677,7 +2578,7 @@
- 
- #undef _nc_handle_sigwinch
- int	_nc_handle_sigwinch(
--		int	enable)
-+		int	update)
- 		{ return(*(int *)0); }
- 
- #undef use_env
-@@ -2685,6 +2586,12 @@
- 		NCURSES_BOOL f)
- 		{ /* void */ }
- 
-+#undef _nc_get_screensize
-+void	_nc_get_screensize(
-+		int	*linep, 
-+		int	*colp)
-+		{ /* void */ }
-+
- #undef _nc_update_screensize
- void	_nc_update_screensize(void)
- 		{ /* void */ }
-@@ -2785,14 +2692,6 @@
- 
- /* ./tinfo/lib_tparm.c */
- 
--typedef struct {
--    union {
-- int num;
-- char *str;
--    } data;
--    NCURSES_BOOL num_type;
--} stack_frame;
--
- #undef _nc_tparm_err
- int	_nc_tparm_err;
- 
-@@ -3047,26 +2946,6 @@
- #undef strfnames
- char	*const strfnames[] = {0};
- 
--/* ./tinfo/parse_entry.c */
--
--#undef _nc_parse_entry
--int	_nc_parse_entry(
--		struct entry *entryp, 
--		int	literal, 
--		NCURSES_BOOL silent)
--		{ return(*(int *)0); }
--
--#undef _nc_capcmp
--int	_nc_capcmp(
--		const char *s, 
--		const char *t)
--		{ return(*(int *)0); }
--
--typedef struct {
--    const char *from;
--    const char *to;
--} assoc;
--
- /* ./tinfo/read_entry.c */
- 
- #include <hashed_db.h>
-@@ -3144,11 +3023,6 @@
- 
- /* ./trace/trace_buf.c */
- 
--typedef struct {
--    char *text;
--    size_t size;
--} LIST;
--
- #undef _nc_trace_buf
- char	*_nc_trace_buf(
- 		int	bufnum, 
-@@ -3165,14 +3039,14 @@
- 
- #undef _nc_trace_tries
- void	_nc_trace_tries(
--		struct tries *tree)
-+		TRIES	*tree)
- 		{ /* void */ }
- 
- /* ./base/tries.c */
- 
- #undef _nc_expand_try
- char	*_nc_expand_try(
--		struct tries *tree, 
-+		TRIES	*tree, 
- 		unsigned code, 
- 		int	*count, 
- 		size_t	len)
-@@ -3180,13 +3054,13 @@
- 
- #undef _nc_remove_key
- int	_nc_remove_key(
--		struct tries **tree, 
-+		TRIES	**tree, 
- 		unsigned code)
- 		{ return(*(int *)0); }
- 
- #undef _nc_remove_string
- int	_nc_remove_string(
--		struct tries **tree, 
-+		TRIES	**tree, 
- 		const char *string)
- 		{ return(*(int *)0); }
- 
-@@ -3236,6 +3110,195 @@
- 		int	len)
- 		{ return(*(const char **)0); }
- 
-+/* ./tinfo/alloc_entry.c */
-+
-+#undef _nc_init_entry
-+void	_nc_init_entry(
-+		TERMTYPE *const tp)
-+		{ /* void */ }
-+
-+#undef _nc_copy_entry
-+ENTRY	*_nc_copy_entry(
-+		ENTRY	*oldp)
-+		{ return(*(ENTRY **)0); }
-+
-+#undef _nc_save_str
-+char	*_nc_save_str(
-+		const char *const string)
-+		{ return(*(char **)0); }
-+
-+#undef _nc_wrap_entry
-+void	_nc_wrap_entry(
-+		ENTRY	*const ep, 
-+		NCURSES_BOOL copy_strings)
-+		{ /* void */ }
-+
-+#undef _nc_merge_entry
-+void	_nc_merge_entry(
-+		TERMTYPE *const to, 
-+		TERMTYPE *const from)
-+		{ /* void */ }
-+
-+/* ./tinfo/captoinfo.c */
-+
-+#undef _nc_captoinfo
-+char	*_nc_captoinfo(
-+		const char *cap, 
-+		const char *s, 
-+		int const parameterized)
-+		{ return(*(char **)0); }
-+
-+#undef _nc_infotocap
-+char	*_nc_infotocap(
-+		const char *cap, 
-+		const char *str, 
-+		int const parameterized)
-+		{ return(*(char **)0); }
-+
-+/* ./comp_captab.c */
-+
-+#include <hashsize.h>
-+
-+#undef _nc_get_table
-+const struct name_table_entry *_nc_get_table(
-+		NCURSES_BOOL termcap)
-+		{ return(*(const struct name_table_entry **)0); }
-+
-+#undef _nc_get_hash_table
-+const short *_nc_get_hash_table(
-+		NCURSES_BOOL termcap)
-+		{ return(*(const short **)0); }
-+
-+#undef _nc_get_alias_table
-+const struct alias *_nc_get_alias_table(
-+		NCURSES_BOOL termcap)
-+		{ return(*(const struct alias **)0); }
-+
-+/* ./tinfo/comp_expand.c */
-+
-+#undef _nc_tic_expand
-+char	*_nc_tic_expand(
-+		const char *srcp, 
-+		NCURSES_BOOL tic_format, 
-+		int	numbers)
-+		{ return(*(char **)0); }
-+
-+/* ./tinfo/comp_hash.c */
-+
-+#undef _nc_find_entry
-+struct name_table_entry const *_nc_find_entry(
-+		const char *string, 
-+		const short *hash_table)
-+		{ return(*(struct name_table_entry const **)0); }
-+
-+#undef _nc_find_type_entry
-+struct name_table_entry const *_nc_find_type_entry(
-+		const char *string, 
-+		int	type, 
-+		const struct name_table_entry *table)
-+		{ return(*(struct name_table_entry const **)0); }
-+
-+/* ./tinfo/comp_parse.c */
-+
-+#undef _nc_check_termtype2
-+void	(*_nc_check_termtype2)(
-+		TERMTYPE *p1, 
-+		NCURSES_BOOL p2);
-+#undef _nc_check_termtype
-+void	(*_nc_check_termtype)(
-+		TERMTYPE *p1);
-+
-+#undef _nc_entry_match
-+NCURSES_BOOL _nc_entry_match(
-+		char	*n1, 
-+		char	*n2)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef _nc_read_entry_source
-+void	_nc_read_entry_source(
-+		FILE	*fp, 
-+		char	*buf, 
-+		int	literal, 
-+		NCURSES_BOOL silent, 
-+		NCURSES_BOOL (*hook)(
-+		ENTRY	*p1))
-+		{ /* void */ }
-+
-+#undef _nc_resolve_uses2
-+int	_nc_resolve_uses2(
-+		NCURSES_BOOL fullresolve, 
-+		NCURSES_BOOL literal)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_resolve_uses
-+int	_nc_resolve_uses(
-+		NCURSES_BOOL fullresolve)
-+		{ return(*(int *)0); }
-+
-+/* ./tinfo/comp_scan.c */
-+
-+#undef _nc_syntax
-+int	_nc_syntax;
-+#undef _nc_curr_file_pos
-+long	_nc_curr_file_pos;
-+#undef _nc_comment_start
-+long	_nc_comment_start;
-+#undef _nc_comment_end
-+long	_nc_comment_end;
-+#undef _nc_start_line
-+long	_nc_start_line;
-+#undef _nc_curr_token
-+struct token _nc_curr_token;
-+#undef _nc_disable_period
-+NCURSES_BOOL _nc_disable_period;
-+
-+#undef _nc_reset_input
-+void	_nc_reset_input(
-+		FILE	*fp, 
-+		char	*buf)
-+		{ /* void */ }
-+
-+#undef _nc_get_token
-+int	_nc_get_token(
-+		NCURSES_BOOL silent)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_trans_string
-+int	_nc_trans_string(
-+		char	*ptr, 
-+		char	*last)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_push_token
-+void	_nc_push_token(
-+		int	tokclass)
-+		{ /* void */ }
-+
-+#undef _nc_panic_mode
-+void	_nc_panic_mode(
-+		char	ch)
-+		{ /* void */ }
-+
-+/* ./tinfo/parse_entry.c */
-+
-+#undef _nc_parse_entry
-+int	_nc_parse_entry(
-+		struct entry *entryp, 
-+		int	literal, 
-+		NCURSES_BOOL silent)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_capcmp
-+int	_nc_capcmp(
-+		const char *s, 
-+		const char *t)
-+		{ return(*(int *)0); }
-+
-+typedef struct {
-+    const char *from;
-+    const char *to;
-+} assoc;
-+
- /* ./tinfo/write_entry.c */
- 
- #undef _nc_set_writedir
-diff -Naur ncurses-5.6.orig/ncurses/llib-lncursest ncurses-5.6/ncurses/llib-lncursest
---- ncurses-5.6.orig/ncurses/llib-lncursest	1969-12-31 19:00:00.000000000 -0500
-+++ ncurses-5.6/ncurses/llib-lncursest	2008-06-18 06:49:51.000000000 -0400
-@@ -0,0 +1,3562 @@
-+/****************************************************************************
-+ * Copyright (c) 2008 Free Software Foundation, Inc.                        *
-+ *                                                                          *
-+ * Permission is hereby granted, free of charge, to any person obtaining a  *
-+ * copy of this software and associated documentation files (the            *
-+ * "Software"), to deal in the Software without restriction, including      *
-+ * without limitation the rights to use, copy, modify, merge, publish,      *
-+ * distribute, distribute with modifications, sublicense, and/or sell       *
-+ * copies of the Software, and to permit persons to whom the Software is    *
-+ * furnished to do so, subject to the following conditions:                 *
-+ *                                                                          *
-+ * The above copyright notice and this permission notice shall be included  *
-+ * in all copies or substantial portions of the Software.                   *
-+ *                                                                          *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-+ *                                                                          *
-+ * Except as contained in this notice, the name(s) of the above copyright   *
-+ * holders shall not be used in advertising or otherwise to promote the     *
-+ * sale, use or other dealings in this Software without prior written       *
-+ * authorization.                                                           *
-+ ****************************************************************************/
-+
-+/****************************************************************************
-+ *  Author: Thomas E. Dickey 2008                                           *
-+ ****************************************************************************/
-+/* LINTLIBRARY */
-+
-+/* ./tty/hardscroll.c */
-+
-+#include <curses.priv.h>
-+
-+#undef _nc_oldnums
-+int	*_nc_oldnums;
-+
-+#undef _nc_scroll_optimize
-+void	_nc_scroll_optimize(void)
-+		{ /* void */ }
-+
-+#undef _nc_linedump
-+void	_nc_linedump(void)
-+		{ /* void */ }
-+
-+/* ./tty/hashmap.c */
-+
-+#include <term.h>
-+
-+#undef _nc_hash_map
-+void	_nc_hash_map(void)
-+		{ /* void */ }
-+
-+#undef _nc_make_oldhash
-+void	_nc_make_oldhash(
-+		int	i)
-+		{ /* void */ }
-+
-+#undef _nc_scroll_oldhash
-+void	_nc_scroll_oldhash(
-+		int	n, 
-+		int	top, 
-+		int	bot)
-+		{ /* void */ }
-+
-+/* ./base/lib_addch.c */
-+
-+#include <ctype.h>
-+
-+#undef _nc_render
-+chtype	_nc_render(
-+		WINDOW	*win, 
-+		chtype	ch)
-+		{ return(*(chtype *)0); }
-+
-+#undef _nc_waddch_nosync
-+int	_nc_waddch_nosync(
-+		WINDOW	*win, 
-+		const chtype c)
-+		{ return(*(int *)0); }
-+
-+#undef waddch
-+int	waddch(
-+		WINDOW	*win, 
-+		const chtype ch)
-+		{ return(*(int *)0); }
-+
-+#undef wechochar
-+int	wechochar(
-+		WINDOW	*win, 
-+		const chtype ch)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_addstr.c */
-+
-+#undef waddnstr
-+int	waddnstr(
-+		WINDOW	*win, 
-+		const char *astr, 
-+		int	n)
-+		{ return(*(int *)0); }
-+
-+#undef waddchnstr
-+int	waddchnstr(
-+		WINDOW	*win, 
-+		const chtype *astr, 
-+		int	n)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_beep.c */
-+
-+#undef beep
-+int	beep(void)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_bkgd.c */
-+
-+#undef wbkgdset
-+void	wbkgdset(
-+		WINDOW	*win, 
-+		chtype	ch)
-+		{ /* void */ }
-+
-+#undef wbkgd
-+int	wbkgd(
-+		WINDOW	*win, 
-+		chtype	ch)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_box.c */
-+
-+#undef wborder
-+int	wborder(
-+		WINDOW	*win, 
-+		chtype	ls, 
-+		chtype	rs, 
-+		chtype	ts, 
-+		chtype	bs, 
-+		chtype	tl, 
-+		chtype	tr, 
-+		chtype	bl, 
-+		chtype	br)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_chgat.c */
-+
-+#undef wchgat
-+int	wchgat(
-+		WINDOW	*win, 
-+		int	n, 
-+		attr_t	attr, 
-+		short	color, 
-+		const void *opts)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_clear.c */
-+
-+#undef wclear
-+int	wclear(
-+		WINDOW	*win)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_clearok.c */
-+
-+#undef clearok
-+int	clearok(
-+		WINDOW	*win, 
-+		NCURSES_BOOL flag)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_clrbot.c */
-+
-+#undef wclrtobot
-+int	wclrtobot(
-+		WINDOW	*win)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_clreol.c */
-+
-+#undef wclrtoeol
-+int	wclrtoeol(
-+		WINDOW	*win)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_color.c */
-+
-+#include <tic.h>
-+
-+#undef _nc_COLOR_PAIRS
-+int	_nc_COLOR_PAIRS(void)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_COLORS
-+int	_nc_COLORS(void)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_reset_colors
-+NCURSES_BOOL _nc_reset_colors(void)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef start_color
-+int	start_color(void)
-+		{ return(*(int *)0); }
-+
-+#undef init_pair
-+int	init_pair(
-+		short	pair, 
-+		short	f, 
-+		short	b)
-+		{ return(*(int *)0); }
-+
-+#undef init_color
-+int	init_color(
-+		short	color, 
-+		short	r, 
-+		short	g, 
-+		short	b)
-+		{ return(*(int *)0); }
-+
-+#undef can_change_color
-+NCURSES_BOOL can_change_color(void)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef has_colors
-+NCURSES_BOOL has_colors(void)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef color_content
-+int	color_content(
-+		short	color, 
-+		short	*r, 
-+		short	*g, 
-+		short	*b)
-+		{ return(*(int *)0); }
-+
-+#undef pair_content
-+int	pair_content(
-+		short	pair, 
-+		short	*f, 
-+		short	*b)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_do_color
-+void	_nc_do_color(
-+		short	old_pair, 
-+		short	pair, 
-+		NCURSES_BOOL reverse, 
-+		int	(*outc)(
-+		int	p1))
-+		{ /* void */ }
-+
-+/* ./base/lib_colorset.c */
-+
-+#undef wcolor_set
-+int	wcolor_set(
-+		WINDOW	*win, 
-+		short	color_pair_number, 
-+		void	*opts)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_delch.c */
-+
-+#undef wdelch
-+int	wdelch(
-+		WINDOW	*win)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_delwin.c */
-+
-+#undef delwin
-+int	delwin(
-+		WINDOW	*win)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_echo.c */
-+
-+#undef echo
-+int	echo(void)
-+		{ return(*(int *)0); }
-+
-+#undef noecho
-+int	noecho(void)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_endwin.c */
-+
-+#undef endwin
-+int	endwin(void)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_erase.c */
-+
-+#undef werase
-+int	werase(
-+		WINDOW	*win)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_flash.c */
-+
-+#undef flash
-+int	flash(void)
-+		{ return(*(int *)0); }
-+
-+/* ./lib_gen.c */
-+
-+#undef addch
-+int	addch(
-+		const chtype z)
-+		{ return(*(int *)0); }
-+
-+#undef addchnstr
-+int	addchnstr(
-+		const chtype *a1, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef addchstr
-+int	addchstr(
-+		const chtype *z)
-+		{ return(*(int *)0); }
-+
-+#undef addnstr
-+int	addnstr(
-+		const char *a1, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef addstr
-+int	addstr(
-+		const char *z)
-+		{ return(*(int *)0); }
-+
-+#undef attroff
-+int	attroff(
-+		NCURSES_ATTR_T	z)
-+		{ return(*(int *)0); }
-+
-+#undef attron
-+int	attron(
-+		NCURSES_ATTR_T	z)
-+		{ return(*(int *)0); }
-+
-+#undef attrset
-+int	attrset(
-+		NCURSES_ATTR_T	z)
-+		{ return(*(int *)0); }
-+
-+#undef attr_get
-+int	attr_get(
-+		attr_t	*a1, 
-+		short	*a2, 
-+		void	*z)
-+		{ return(*(int *)0); }
-+
-+#undef attr_off
-+int	attr_off(
-+		attr_t	a1, 
-+		void	*z)
-+		{ return(*(int *)0); }
-+
-+#undef attr_on
-+int	attr_on(
-+		attr_t	a1, 
-+		void	*z)
-+		{ return(*(int *)0); }
-+
-+#undef attr_set
-+int	attr_set(
-+		attr_t	a1, 
-+		short	a2, 
-+		void	*z)
-+		{ return(*(int *)0); }
-+
-+#undef bkgd
-+int	bkgd(
-+		chtype	z)
-+		{ return(*(int *)0); }
-+
-+#undef bkgdset
-+void	bkgdset(
-+		chtype	z)
-+		{ /* void */ }
-+
-+#undef border
-+int	border(
-+		chtype	a1, 
-+		chtype	a2, 
-+		chtype	a3, 
-+		chtype	a4, 
-+		chtype	a5, 
-+		chtype	a6, 
-+		chtype	a7, 
-+		chtype	z)
-+		{ return(*(int *)0); }
-+
-+#undef box
-+int	box(
-+		WINDOW	*a1, 
-+		chtype	a2, 
-+		chtype	z)
-+		{ return(*(int *)0); }
-+
-+#undef chgat
-+int	chgat(
-+		int	a1, 
-+		attr_t	a2, 
-+		short	a3, 
-+		const void *z)
-+		{ return(*(int *)0); }
-+
-+#undef clear
-+int	clear(void)
-+		{ return(*(int *)0); }
-+
-+#undef clrtobot
-+int	clrtobot(void)
-+		{ return(*(int *)0); }
-+
-+#undef clrtoeol
-+int	clrtoeol(void)
-+		{ return(*(int *)0); }
-+
-+#undef color_set
-+int	color_set(
-+		short	a1, 
-+		void	*z)
-+		{ return(*(int *)0); }
-+
-+#undef COLOR_PAIR
-+int	COLOR_PAIR(
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef delch
-+int	delch(void)
-+		{ return(*(int *)0); }
-+
-+#undef deleteln
-+int	deleteln(void)
-+		{ return(*(int *)0); }
-+
-+#undef echochar
-+int	echochar(
-+		const chtype z)
-+		{ return(*(int *)0); }
-+
-+#undef erase
-+int	erase(void)
-+		{ return(*(int *)0); }
-+
-+#undef getbkgd
-+chtype	getbkgd(
-+		WINDOW	*z)
-+		{ return(*(chtype *)0); }
-+
-+#undef getch
-+int	getch(void)
-+		{ return(*(int *)0); }
-+
-+#undef getnstr
-+int	getnstr(
-+		char	*a1, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef getstr
-+int	getstr(
-+		char	*z)
-+		{ return(*(int *)0); }
-+
-+#undef hline
-+int	hline(
-+		chtype	a1, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef inch
-+chtype	inch(void)
-+		{ return(*(chtype *)0); }
-+
-+#undef inchnstr
-+int	inchnstr(
-+		chtype	*a1, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef inchstr
-+int	inchstr(
-+		chtype	*z)
-+		{ return(*(int *)0); }
-+
-+#undef innstr
-+int	innstr(
-+		char	*a1, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef insch
-+int	insch(
-+		chtype	z)
-+		{ return(*(int *)0); }
-+
-+#undef insdelln
-+int	insdelln(
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef insertln
-+int	insertln(void)
-+		{ return(*(int *)0); }
-+
-+#undef insnstr
-+int	insnstr(
-+		const char *a1, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef insstr
-+int	insstr(
-+		const char *z)
-+		{ return(*(int *)0); }
-+
-+#undef instr
-+int	instr(
-+		char	*z)
-+		{ return(*(int *)0); }
-+
-+#undef move
-+int	move(
-+		int	a1, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef mvaddch
-+int	mvaddch(
-+		int	a1, 
-+		int	a2, 
-+		const chtype z)
-+		{ return(*(int *)0); }
-+
-+#undef mvaddchnstr
-+int	mvaddchnstr(
-+		int	a1, 
-+		int	a2, 
-+		const chtype *a3, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef mvaddchstr
-+int	mvaddchstr(
-+		int	a1, 
-+		int	a2, 
-+		const chtype *z)
-+		{ return(*(int *)0); }
-+
-+#undef mvaddnstr
-+int	mvaddnstr(
-+		int	a1, 
-+		int	a2, 
-+		const char *a3, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef mvaddstr
-+int	mvaddstr(
-+		int	a1, 
-+		int	a2, 
-+		const char *z)
-+		{ return(*(int *)0); }
-+
-+#undef mvchgat
-+int	mvchgat(
-+		int	a1, 
-+		int	a2, 
-+		int	a3, 
-+		attr_t	a4, 
-+		short	a5, 
-+		const void *z)
-+		{ return(*(int *)0); }
-+
-+#undef mvdelch
-+int	mvdelch(
-+		int	a1, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef mvgetch
-+int	mvgetch(
-+		int	a1, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef mvgetnstr
-+int	mvgetnstr(
-+		int	a1, 
-+		int	a2, 
-+		char	*a3, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef mvgetstr
-+int	mvgetstr(
-+		int	a1, 
-+		int	a2, 
-+		char	*z)
-+		{ return(*(int *)0); }
-+
-+#undef mvhline
-+int	mvhline(
-+		int	a1, 
-+		int	a2, 
-+		chtype	a3, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef mvinch
-+chtype	mvinch(
-+		int	a1, 
-+		int	z)
-+		{ return(*(chtype *)0); }
-+
-+#undef mvinchnstr
-+int	mvinchnstr(
-+		int	a1, 
-+		int	a2, 
-+		chtype	*a3, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef mvinchstr
-+int	mvinchstr(
-+		int	a1, 
-+		int	a2, 
-+		chtype	*z)
-+		{ return(*(int *)0); }
-+
-+#undef mvinnstr
-+int	mvinnstr(
-+		int	a1, 
-+		int	a2, 
-+		char	*a3, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef mvinsch
-+int	mvinsch(
-+		int	a1, 
-+		int	a2, 
-+		chtype	z)
-+		{ return(*(int *)0); }
-+
-+#undef mvinsnstr
-+int	mvinsnstr(
-+		int	a1, 
-+		int	a2, 
-+		const char *a3, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef mvinsstr
-+int	mvinsstr(
-+		int	a1, 
-+		int	a2, 
-+		const char *z)
-+		{ return(*(int *)0); }
-+
-+#undef mvinstr
-+int	mvinstr(
-+		int	a1, 
-+		int	a2, 
-+		char	*z)
-+		{ return(*(int *)0); }
-+
-+#undef mvvline
-+int	mvvline(
-+		int	a1, 
-+		int	a2, 
-+		chtype	a3, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef mvwaddch
-+int	mvwaddch(
-+		WINDOW	*a1, 
-+		int	a2, 
-+		int	a3, 
-+		const chtype z)
-+		{ return(*(int *)0); }
-+
-+#undef mvwaddchnstr
-+int	mvwaddchnstr(
-+		WINDOW	*a1, 
-+		int	a2, 
-+		int	a3, 
-+		const chtype *a4, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef mvwaddchstr
-+int	mvwaddchstr(
-+		WINDOW	*a1, 
-+		int	a2, 
-+		int	a3, 
-+		const chtype *z)
-+		{ return(*(int *)0); }
-+
-+#undef mvwaddnstr
-+int	mvwaddnstr(
-+		WINDOW	*a1, 
-+		int	a2, 
-+		int	a3, 
-+		const char *a4, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef mvwaddstr
-+int	mvwaddstr(
-+		WINDOW	*a1, 
-+		int	a2, 
-+		int	a3, 
-+		const char *z)
-+		{ return(*(int *)0); }
-+
-+#undef mvwchgat
-+int	mvwchgat(
-+		WINDOW	*a1, 
-+		int	a2, 
-+		int	a3, 
-+		int	a4, 
-+		attr_t	a5, 
-+		short	a6, 
-+		const void *z)
-+		{ return(*(int *)0); }
-+
-+#undef mvwdelch
-+int	mvwdelch(
-+		WINDOW	*a1, 
-+		int	a2, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef mvwgetch
-+int	mvwgetch(
-+		WINDOW	*a1, 
-+		int	a2, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef mvwgetnstr
-+int	mvwgetnstr(
-+		WINDOW	*a1, 
-+		int	a2, 
-+		int	a3, 
-+		char	*a4, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef mvwgetstr
-+int	mvwgetstr(
-+		WINDOW	*a1, 
-+		int	a2, 
-+		int	a3, 
-+		char	*z)
-+		{ return(*(int *)0); }
-+
-+#undef mvwhline
-+int	mvwhline(
-+		WINDOW	*a1, 
-+		int	a2, 
-+		int	a3, 
-+		chtype	a4, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef mvwinch
-+chtype	mvwinch(
-+		WINDOW	*a1, 
-+		int	a2, 
-+		int	z)
-+		{ return(*(chtype *)0); }
-+
-+#undef mvwinchnstr
-+int	mvwinchnstr(
-+		WINDOW	*a1, 
-+		int	a2, 
-+		int	a3, 
-+		chtype	*a4, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef mvwinchstr
-+int	mvwinchstr(
-+		WINDOW	*a1, 
-+		int	a2, 
-+		int	a3, 
-+		chtype	*z)
-+		{ return(*(int *)0); }
-+
-+#undef mvwinnstr
-+int	mvwinnstr(
-+		WINDOW	*a1, 
-+		int	a2, 
-+		int	a3, 
-+		char	*a4, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef mvwinsch
-+int	mvwinsch(
-+		WINDOW	*a1, 
-+		int	a2, 
-+		int	a3, 
-+		chtype	z)
-+		{ return(*(int *)0); }
-+
-+#undef mvwinsnstr
-+int	mvwinsnstr(
-+		WINDOW	*a1, 
-+		int	a2, 
-+		int	a3, 
-+		const char *a4, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef mvwinsstr
-+int	mvwinsstr(
-+		WINDOW	*a1, 
-+		int	a2, 
-+		int	a3, 
-+		const char *z)
-+		{ return(*(int *)0); }
-+
-+#undef mvwinstr
-+int	mvwinstr(
-+		WINDOW	*a1, 
-+		int	a2, 
-+		int	a3, 
-+		char	*z)
-+		{ return(*(int *)0); }
-+
-+#undef mvwvline
-+int	mvwvline(
-+		WINDOW	*a1, 
-+		int	a2, 
-+		int	a3, 
-+		chtype	a4, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef PAIR_NUMBER
-+int	PAIR_NUMBER(
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef redrawwin
-+int	redrawwin(
-+		WINDOW	*z)
-+		{ return(*(int *)0); }
-+
-+#undef refresh
-+int	refresh(void)
-+		{ return(*(int *)0); }
-+
-+#undef scrl
-+int	scrl(
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef scroll
-+int	scroll(
-+		WINDOW	*z)
-+		{ return(*(int *)0); }
-+
-+#undef setscrreg
-+int	setscrreg(
-+		int	a1, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef standout
-+int	standout(void)
-+		{ return(*(int *)0); }
-+
-+#undef standend
-+int	standend(void)
-+		{ return(*(int *)0); }
-+
-+#undef timeout
-+void	timeout(
-+		int	z)
-+		{ /* void */ }
-+
-+#undef touchline
-+int	touchline(
-+		WINDOW	*a1, 
-+		int	a2, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef touchwin
-+int	touchwin(
-+		WINDOW	*z)
-+		{ return(*(int *)0); }
-+
-+#undef untouchwin
-+int	untouchwin(
-+		WINDOW	*z)
-+		{ return(*(int *)0); }
-+
-+#undef vline
-+int	vline(
-+		chtype	a1, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef vw_printw
-+int	vw_printw(
-+		WINDOW	*a1, 
-+		const char *a2, 
-+		va_list	z)
-+		{ return(*(int *)0); }
-+
-+#undef vw_scanw
-+int	vw_scanw(
-+		WINDOW	*a1, 
-+		const char *a2, 
-+		va_list	z)
-+		{ return(*(int *)0); }
-+
-+#undef waddchstr
-+int	waddchstr(
-+		WINDOW	*a1, 
-+		const chtype *z)
-+		{ return(*(int *)0); }
-+
-+#undef waddstr
-+int	waddstr(
-+		WINDOW	*a1, 
-+		const char *z)
-+		{ return(*(int *)0); }
-+
-+#undef wattron
-+int	wattron(
-+		WINDOW	*a1, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef wattroff
-+int	wattroff(
-+		WINDOW	*a1, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef wattrset
-+int	wattrset(
-+		WINDOW	*a1, 
-+		int	z)
-+		{ return(*(int *)0); }
-+
-+#undef wattr_get
-+int	wattr_get(
-+		WINDOW	*a1, 
-+		attr_t	*a2, 
-+		short	*a3, 
-+		void	*z)
-+		{ return(*(int *)0); }
-+
-+#undef wattr_set
-+int	wattr_set(
-+		WINDOW	*a1, 
-+		attr_t	a2, 
-+		short	a3, 
-+		void	*z)
-+		{ return(*(int *)0); }
-+
-+#undef wdeleteln
-+int	wdeleteln(
-+		WINDOW	*z)
-+		{ return(*(int *)0); }
-+
-+#undef wgetstr
-+int	wgetstr(
-+		WINDOW	*a1, 
-+		char	*z)
-+		{ return(*(int *)0); }
-+
-+#undef winchstr
-+int	winchstr(
-+		WINDOW	*a1, 
-+		chtype	*z)
-+		{ return(*(int *)0); }
-+
-+#undef winsertln
-+int	winsertln(
-+		WINDOW	*z)
-+		{ return(*(int *)0); }
-+
-+#undef winsstr
-+int	winsstr(
-+		WINDOW	*a1, 
-+		const char *z)
-+		{ return(*(int *)0); }
-+
-+#undef winstr
-+int	winstr(
-+		WINDOW	*a1, 
-+		char	*z)
-+		{ return(*(int *)0); }
-+
-+#undef wstandout
-+int	wstandout(
-+		WINDOW	*z)
-+		{ return(*(int *)0); }
-+
-+#undef wstandend
-+int	wstandend(
-+		WINDOW	*z)
-+		{ return(*(int *)0); }
-+
-+#undef getattrs
-+int	getattrs(
-+		const WINDOW *z)
-+		{ return(*(int *)0); }
-+
-+#undef getcurx
-+int	getcurx(
-+		const WINDOW *z)
-+		{ return(*(int *)0); }
-+
-+#undef getcury
-+int	getcury(
-+		const WINDOW *z)
-+		{ return(*(int *)0); }
-+
-+#undef getbegx
-+int	getbegx(
-+		const WINDOW *z)
-+		{ return(*(int *)0); }
-+
-+#undef getbegy
-+int	getbegy(
-+		const WINDOW *z)
-+		{ return(*(int *)0); }
-+
-+#undef getmaxx
-+int	getmaxx(
-+		const WINDOW *z)
-+		{ return(*(int *)0); }
-+
-+#undef getmaxy
-+int	getmaxy(
-+		const WINDOW *z)
-+		{ return(*(int *)0); }
-+
-+#undef getparx
-+int	getparx(
-+		const WINDOW *z)
-+		{ return(*(int *)0); }
-+
-+#undef getpary
-+int	getpary(
-+		const WINDOW *z)
-+		{ return(*(int *)0); }
-+
-+#undef wgetparent
-+WINDOW	*wgetparent(
-+		const WINDOW *z)
-+		{ return(*(WINDOW **)0); }
-+
-+#undef is_cleared
-+NCURSES_BOOL is_cleared(
-+		const WINDOW *z)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef is_idcok
-+NCURSES_BOOL is_idcok(
-+		const WINDOW *z)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef is_idlok
-+NCURSES_BOOL is_idlok(
-+		const WINDOW *z)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef is_immedok
-+NCURSES_BOOL is_immedok(
-+		const WINDOW *z)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef is_keypad
-+NCURSES_BOOL is_keypad(
-+		const WINDOW *z)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef is_leaveok
-+NCURSES_BOOL is_leaveok(
-+		const WINDOW *z)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef is_nodelay
-+NCURSES_BOOL is_nodelay(
-+		const WINDOW *z)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef is_notimeout
-+NCURSES_BOOL is_notimeout(
-+		const WINDOW *z)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef is_scrollok
-+NCURSES_BOOL is_scrollok(
-+		const WINDOW *z)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef is_syncok
-+NCURSES_BOOL is_syncok(
-+		const WINDOW *z)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef wgetscrreg
-+int	wgetscrreg(
-+		const WINDOW *a1, 
-+		int	*a2, 
-+		int	*z)
-+		{ return(*(int *)0); }
-+
-+#undef mouse_trafo
-+NCURSES_BOOL mouse_trafo(
-+		int	*a1, 
-+		int	*a2, 
-+		NCURSES_BOOL	z)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+/* ./base/lib_getch.c */
-+
-+#include <fifo_defs.h>
-+
-+#undef _nc_ESCDELAY
-+int	_nc_ESCDELAY(void)
-+		{ return(*(int *)0); }
-+
-+#undef set_escdelay
-+int	set_escdelay(
-+		int	value)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_wgetch
-+int	_nc_wgetch(
-+		WINDOW	*win, 
-+		unsigned long *result, 
-+		int	use_meta, 
-+		_nc_eventlist *evl)
-+		{ return(*(int *)0); }
-+
-+#undef wgetch_events
-+int	wgetch_events(
-+		WINDOW	*win, 
-+		_nc_eventlist *evl)
-+		{ return(*(int *)0); }
-+
-+#undef wgetch
-+int	wgetch(
-+		WINDOW	*win)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_getstr.c */
-+
-+#undef wgetnstr_events
-+int	wgetnstr_events(
-+		WINDOW	*win, 
-+		char	*str, 
-+		int	maxlen, 
-+		_nc_eventlist *evl)
-+		{ return(*(int *)0); }
-+
-+#undef wgetnstr
-+int	wgetnstr(
-+		WINDOW	*win, 
-+		char	*str, 
-+		int	maxlen)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_hline.c */
-+
-+#undef whline
-+int	whline(
-+		WINDOW	*win, 
-+		chtype	ch, 
-+		int	n)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_immedok.c */
-+
-+#undef immedok
-+void	immedok(
-+		WINDOW	*win, 
-+		NCURSES_BOOL flag)
-+		{ /* void */ }
-+
-+/* ./base/lib_inchstr.c */
-+
-+#undef winchnstr
-+int	winchnstr(
-+		WINDOW	*win, 
-+		chtype	*str, 
-+		int	n)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_initscr.c */
-+
-+#undef initscr
-+WINDOW	*initscr(void)
-+		{ return(*(WINDOW **)0); }
-+
-+/* ./base/lib_insch.c */
-+
-+#undef _nc_insert_ch
-+int	_nc_insert_ch(
-+		WINDOW	*win, 
-+		chtype	ch)
-+		{ return(*(int *)0); }
-+
-+#undef winsch
-+int	winsch(
-+		WINDOW	*win, 
-+		chtype	c)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_insdel.c */
-+
-+#undef winsdelln
-+int	winsdelln(
-+		WINDOW	*win, 
-+		int	n)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_insnstr.c */
-+
-+#undef winsnstr
-+int	winsnstr(
-+		WINDOW	*win, 
-+		const char *s, 
-+		int	n)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_instr.c */
-+
-+#undef winnstr
-+int	winnstr(
-+		WINDOW	*win, 
-+		char	*str, 
-+		int	n)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_isendwin.c */
-+
-+#undef isendwin
-+NCURSES_BOOL isendwin(void)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+/* ./base/lib_leaveok.c */
-+
-+#undef leaveok
-+int	leaveok(
-+		WINDOW	*win, 
-+		NCURSES_BOOL flag)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_mouse.c */
-+
-+#undef getmouse
-+int	getmouse(
-+		MEVENT	*aevent)
-+		{ return(*(int *)0); }
-+
-+#undef ungetmouse
-+int	ungetmouse(
-+		MEVENT	*aevent)
-+		{ return(*(int *)0); }
-+
-+#undef mousemask
-+mmask_t	mousemask(
-+		mmask_t	newmask, 
-+		mmask_t	*oldmask)
-+		{ return(*(mmask_t *)0); }
-+
-+#undef wenclose
-+NCURSES_BOOL wenclose(
-+		const WINDOW *win, 
-+		int	y, 
-+		int	x)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef mouseinterval
-+int	mouseinterval(
-+		int	maxclick)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_has_mouse
-+int	_nc_has_mouse(void)
-+		{ return(*(int *)0); }
-+
-+#undef wmouse_trafo
-+NCURSES_BOOL wmouse_trafo(
-+		const WINDOW *win, 
-+		int	*pY, 
-+		int	*pX, 
-+		NCURSES_BOOL to_screen)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+/* ./base/lib_move.c */
-+
-+#undef wmove
-+int	wmove(
-+		WINDOW	*win, 
-+		int	y, 
-+		int	x)
-+		{ return(*(int *)0); }
-+
-+/* ./tty/lib_mvcur.c */
-+
-+#undef _nc_msec_cost
-+int	_nc_msec_cost(
-+		const char *const cap, 
-+		int	affcnt)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_mvcur_resume
-+void	_nc_mvcur_resume(void)
-+		{ /* void */ }
-+
-+#undef _nc_mvcur_init
-+void	_nc_mvcur_init(void)
-+		{ /* void */ }
-+
-+#undef _nc_mvcur_wrap
-+void	_nc_mvcur_wrap(void)
-+		{ /* void */ }
-+
-+#undef mvcur
-+int	mvcur(
-+		int	yold, 
-+		int	xold, 
-+		int	ynew, 
-+		int	xnew)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_optimize_enable
-+int	_nc_optimize_enable;
-+
-+/* ./base/lib_mvwin.c */
-+
-+#undef mvwin
-+int	mvwin(
-+		WINDOW	*win, 
-+		int	by, 
-+		int	bx)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_newterm.c */
-+
-+#undef filter
-+void	filter(void)
-+		{ /* void */ }
-+
-+#undef nofilter
-+void	nofilter(void)
-+		{ /* void */ }
-+
-+#undef newterm
-+SCREEN	*newterm(
-+		const char *name, 
-+		FILE	*ofp, 
-+		FILE	*ifp)
-+		{ return(*(SCREEN **)0); }
-+
-+/* ./base/lib_newwin.c */
-+
-+#undef _nc_freewin
-+int	_nc_freewin(
-+		WINDOW	*win)
-+		{ return(*(int *)0); }
-+
-+#undef newwin
-+WINDOW	*newwin(
-+		int	num_lines, 
-+		int	num_columns, 
-+		int	begy, 
-+		int	begx)
-+		{ return(*(WINDOW **)0); }
-+
-+#undef derwin
-+WINDOW	*derwin(
-+		WINDOW	*orig, 
-+		int	num_lines, 
-+		int	num_columns, 
-+		int	begy, 
-+		int	begx)
-+		{ return(*(WINDOW **)0); }
-+
-+#undef subwin
-+WINDOW	*subwin(
-+		WINDOW	*w, 
-+		int	l, 
-+		int	c, 
-+		int	y, 
-+		int	x)
-+		{ return(*(WINDOW **)0); }
-+
-+#undef _nc_makenew
-+WINDOW	*_nc_makenew(
-+		int	num_lines, 
-+		int	num_columns, 
-+		int	begy, 
-+		int	begx, 
-+		int	flags)
-+		{ return(*(WINDOW **)0); }
-+
-+#undef _nc_screen_of
-+SCREEN	*_nc_screen_of(
-+		WINDOW	*win)
-+		{ return(*(SCREEN **)0); }
-+
-+/* ./base/lib_nl.c */
-+
-+#undef nl
-+int	nl(void)
-+		{ return(*(int *)0); }
-+
-+#undef nonl
-+int	nonl(void)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_overlay.c */
-+
-+#undef overlay
-+int	overlay(
-+		const WINDOW *win1, 
-+		WINDOW	*win2)
-+		{ return(*(int *)0); }
-+
-+#undef overwrite
-+int	overwrite(
-+		const WINDOW *win1, 
-+		WINDOW	*win2)
-+		{ return(*(int *)0); }
-+
-+#undef copywin
-+int	copywin(
-+		const WINDOW *src, 
-+		WINDOW	*dst, 
-+		int	sminrow, 
-+		int	smincol, 
-+		int	dminrow, 
-+		int	dmincol, 
-+		int	dmaxrow, 
-+		int	dmaxcol, 
-+		int	over)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_pad.c */
-+
-+#undef newpad
-+WINDOW	*newpad(
-+		int	l, 
-+		int	c)
-+		{ return(*(WINDOW **)0); }
-+
-+#undef subpad
-+WINDOW	*subpad(
-+		WINDOW	*orig, 
-+		int	l, 
-+		int	c, 
-+		int	begy, 
-+		int	begx)
-+		{ return(*(WINDOW **)0); }
-+
-+#undef prefresh
-+int	prefresh(
-+		WINDOW	*win, 
-+		int	pminrow, 
-+		int	pmincol, 
-+		int	sminrow, 
-+		int	smincol, 
-+		int	smaxrow, 
-+		int	smaxcol)
-+		{ return(*(int *)0); }
-+
-+#undef pnoutrefresh
-+int	pnoutrefresh(
-+		WINDOW	*win, 
-+		int	pminrow, 
-+		int	pmincol, 
-+		int	sminrow, 
-+		int	smincol, 
-+		int	smaxrow, 
-+		int	smaxcol)
-+		{ return(*(int *)0); }
-+
-+#undef pechochar
-+int	pechochar(
-+		WINDOW	*pad, 
-+		const chtype ch)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_printw.c */
-+
-+#undef printw
-+int	printw(
-+		const char *fmt, 
-+		...)
-+		{ return(*(int *)0); }
-+
-+#undef wprintw
-+int	wprintw(
-+		WINDOW	*win, 
-+		const char *fmt, 
-+		...)
-+		{ return(*(int *)0); }
-+
-+#undef mvprintw
-+int	mvprintw(
-+		int	y, 
-+		int	x, 
-+		const char *fmt, 
-+		...)
-+		{ return(*(int *)0); }
-+
-+#undef mvwprintw
-+int	mvwprintw(
-+		WINDOW	*win, 
-+		int	y, 
-+		int	x, 
-+		const char *fmt, 
-+		...)
-+		{ return(*(int *)0); }
-+
-+#undef vwprintw
-+int	vwprintw(
-+		WINDOW	*win, 
-+		const char *fmt, 
-+		va_list	argp)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_redrawln.c */
-+
-+#undef wredrawln
-+int	wredrawln(
-+		WINDOW	*win, 
-+		int	beg, 
-+		int	num)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_refresh.c */
-+
-+#undef wrefresh
-+int	wrefresh(
-+		WINDOW	*win)
-+		{ return(*(int *)0); }
-+
-+#undef wnoutrefresh
-+int	wnoutrefresh(
-+		WINDOW	*win)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_restart.c */
-+
-+#undef restartterm
-+int	restartterm(
-+		const char *termp, 
-+		int	filenum, 
-+		int	*errret)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_scanw.c */
-+
-+#undef vwscanw
-+int	vwscanw(
-+		WINDOW	*win, 
-+		const char *fmt, 
-+		va_list	argp)
-+		{ return(*(int *)0); }
-+
-+#undef scanw
-+int	scanw(
-+		const char *fmt, 
-+		...)
-+		{ return(*(int *)0); }
-+
-+#undef wscanw
-+int	wscanw(
-+		WINDOW	*win, 
-+		const char *fmt, 
-+		...)
-+		{ return(*(int *)0); }
-+
-+#undef mvscanw
-+int	mvscanw(
-+		int	y, 
-+		int	x, 
-+		const char *fmt, 
-+		...)
-+		{ return(*(int *)0); }
-+
-+#undef mvwscanw
-+int	mvwscanw(
-+		WINDOW	*win, 
-+		int	y, 
-+		int	x, 
-+		const char *fmt, 
-+		...)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_screen.c */
-+
-+#undef getwin
-+WINDOW	*getwin(
-+		FILE	*filep)
-+		{ return(*(WINDOW **)0); }
-+
-+#undef putwin
-+int	putwin(
-+		WINDOW	*win, 
-+		FILE	*filep)
-+		{ return(*(int *)0); }
-+
-+#undef scr_restore
-+int	scr_restore(
-+		const char *file)
-+		{ return(*(int *)0); }
-+
-+#undef scr_dump
-+int	scr_dump(
-+		const char *file)
-+		{ return(*(int *)0); }
-+
-+#undef scr_init
-+int	scr_init(
-+		const char *file)
-+		{ return(*(int *)0); }
-+
-+#undef scr_set
-+int	scr_set(
-+		const char *file)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_scroll.c */
-+
-+#undef _nc_scroll_window
-+void	_nc_scroll_window(
-+		WINDOW	*win, 
-+		int const n, 
-+		int const top, 
-+		int const bottom, 
-+		chtype	blank)
-+		{ /* void */ }
-+
-+#undef wscrl
-+int	wscrl(
-+		WINDOW	*win, 
-+		int	n)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_scrollok.c */
-+
-+#undef scrollok
-+int	scrollok(
-+		WINDOW	*win, 
-+		NCURSES_BOOL flag)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_scrreg.c */
-+
-+#undef wsetscrreg
-+int	wsetscrreg(
-+		WINDOW	*win, 
-+		int	top, 
-+		int	bottom)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_set_term.c */
-+
-+#undef set_term
-+SCREEN	*set_term(
-+		SCREEN	*screenp)
-+		{ return(*(SCREEN **)0); }
-+
-+#undef delscreen
-+void	delscreen(
-+		SCREEN	*sp)
-+		{ /* void */ }
-+
-+#undef _nc_setupscreen
-+int	_nc_setupscreen(
-+		int	slines, 
-+		int	scolumns, 
-+		FILE	*output, 
-+		NCURSES_BOOL filtered, 
-+		int	slk_format)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_ripoffline
-+int	_nc_ripoffline(
-+		int	line, 
-+		int	(*init)(
-+		WINDOW	*p1, 
-+		int	p2))
-+		{ return(*(int *)0); }
-+
-+#undef ripoffline
-+int	ripoffline(
-+		int	line, 
-+		int	(*init)(
-+		WINDOW	*p1, 
-+		int	p2))
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_slk.c */
-+
-+#undef _nc_slk_format
-+int	_nc_slk_format;
-+
-+#undef _nc_slk_initialize
-+int	_nc_slk_initialize(
-+		WINDOW	*stwin, 
-+		int	cols)
-+		{ return(*(int *)0); }
-+
-+#undef slk_restore
-+int	slk_restore(void)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_slkatr_set.c */
-+
-+#undef slk_attr_set
-+int	slk_attr_set(
-+		const attr_t attr, 
-+		short	color_pair_number, 
-+		void	*opts)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_slkatrof.c */
-+
-+#undef slk_attroff
-+int	slk_attroff(
-+		const chtype attr)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_slkatron.c */
-+
-+#undef slk_attron
-+int	slk_attron(
-+		const chtype attr)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_slkatrset.c */
-+
-+#undef slk_attrset
-+int	slk_attrset(
-+		const chtype attr)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_slkattr.c */
-+
-+#undef slk_attr
-+attr_t	slk_attr(void)
-+		{ return(*(attr_t *)0); }
-+
-+/* ./base/lib_slkclear.c */
-+
-+#undef slk_clear
-+int	slk_clear(void)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_slkcolor.c */
-+
-+#undef slk_color
-+int	slk_color(
-+		short	color_pair_number)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_slkinit.c */
-+
-+#undef slk_init
-+int	slk_init(
-+		int	format)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_slklab.c */
-+
-+#undef slk_label
-+char	*slk_label(
-+		int	n)
-+		{ return(*(char **)0); }
-+
-+/* ./base/lib_slkrefr.c */
-+
-+#undef slk_noutrefresh
-+int	slk_noutrefresh(void)
-+		{ return(*(int *)0); }
-+
-+#undef slk_refresh
-+int	slk_refresh(void)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_slkset.c */
-+
-+#undef slk_set
-+int	slk_set(
-+		int	i, 
-+		const char *astr, 
-+		int	format)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_slktouch.c */
-+
-+#undef slk_touch
-+int	slk_touch(void)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_touch.c */
-+
-+#undef is_linetouched
-+NCURSES_BOOL is_linetouched(
-+		WINDOW	*win, 
-+		int	line)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef is_wintouched
-+NCURSES_BOOL is_wintouched(
-+		WINDOW	*win)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef wtouchln
-+int	wtouchln(
-+		WINDOW	*win, 
-+		int	y, 
-+		int	n, 
-+		int	changed)
-+		{ return(*(int *)0); }
-+
-+/* ./trace/lib_tracedmp.c */
-+
-+#undef _tracedump
-+void	_tracedump(
-+		const char *name, 
-+		WINDOW	*win)
-+		{ /* void */ }
-+
-+/* ./trace/lib_tracemse.c */
-+
-+#undef _nc_tracemouse
-+char	*_nc_tracemouse(
-+		SCREEN	*sp, 
-+		MEVENT const *ep)
-+		{ return(*(char **)0); }
-+
-+#undef _tracemouse
-+char	*_tracemouse(
-+		MEVENT const *ep)
-+		{ return(*(char **)0); }
-+
-+/* ./tty/lib_tstp.c */
-+
-+#include <SigAction.h>
-+
-+#undef _nc_signal_handler
-+void	_nc_signal_handler(
-+		NCURSES_BOOL enable)
-+		{ /* void */ }
-+
-+/* ./base/lib_ungetch.c */
-+
-+#undef _nc_fifo_dump
-+void	_nc_fifo_dump(
-+		SCREEN	*sp)
-+		{ /* void */ }
-+
-+#undef _nc_ungetch
-+int	_nc_ungetch(
-+		SCREEN	*sp, 
-+		int	ch)
-+		{ return(*(int *)0); }
-+
-+#undef ungetch
-+int	ungetch(
-+		int	ch)
-+		{ return(*(int *)0); }
-+
-+/* ./tty/lib_vidattr.c */
-+
-+#undef vidputs
-+int	vidputs(
-+		chtype	newmode, 
-+		int	(*outc)(
-+		int	p1))
-+		{ return(*(int *)0); }
-+
-+#undef vidattr
-+int	vidattr(
-+		chtype	newmode)
-+		{ return(*(int *)0); }
-+
-+#undef termattrs
-+chtype	termattrs(void)
-+		{ return(*(chtype *)0); }
-+
-+/* ./base/lib_vline.c */
-+
-+#undef wvline
-+int	wvline(
-+		WINDOW	*win, 
-+		chtype	ch, 
-+		int	n)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_wattroff.c */
-+
-+#undef wattr_off
-+int	wattr_off(
-+		WINDOW	*win, 
-+		attr_t	at, 
-+		void	*opts)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_wattron.c */
-+
-+#undef wattr_on
-+int	wattr_on(
-+		WINDOW	*win, 
-+		attr_t	at, 
-+		void	*opts)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_winch.c */
-+
-+#undef winch
-+chtype	winch(
-+		WINDOW	*win)
-+		{ return(*(chtype *)0); }
-+
-+/* ./base/lib_window.c */
-+
-+#undef _nc_synchook
-+void	_nc_synchook(
-+		WINDOW	*win)
-+		{ /* void */ }
-+
-+#undef mvderwin
-+int	mvderwin(
-+		WINDOW	*win, 
-+		int	y, 
-+		int	x)
-+		{ return(*(int *)0); }
-+
-+#undef syncok
-+int	syncok(
-+		WINDOW	*win, 
-+		NCURSES_BOOL bf)
-+		{ return(*(int *)0); }
-+
-+#undef wsyncup
-+void	wsyncup(
-+		WINDOW	*win)
-+		{ /* void */ }
-+
-+#undef wsyncdown
-+void	wsyncdown(
-+		WINDOW	*win)
-+		{ /* void */ }
-+
-+#undef wcursyncup
-+void	wcursyncup(
-+		WINDOW	*win)
-+		{ /* void */ }
-+
-+#undef dupwin
-+WINDOW	*dupwin(
-+		WINDOW	*win)
-+		{ return(*(WINDOW **)0); }
-+
-+/* ./base/nc_panel.c */
-+
-+#undef _nc_panelhook
-+struct panelhook *_nc_panelhook(void)
-+		{ return(*(struct panelhook **)0); }
-+
-+/* ./base/safe_sprintf.c */
-+
-+#undef _nc_printf_string
-+char	*_nc_printf_string(
-+		const char *fmt, 
-+		va_list	ap)
-+		{ return(*(char **)0); }
-+
-+/* ./tty/tty_update.c */
-+
-+#include <sys/time.h>
-+#include <sys/times.h>
-+
-+#undef doupdate
-+int	doupdate(void)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_scrolln
-+int	_nc_scrolln(
-+		int	n, 
-+		int	top, 
-+		int	bot, 
-+		int	maxy)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_screen_resume
-+void	_nc_screen_resume(void)
-+		{ /* void */ }
-+
-+#undef _nc_screen_init
-+void	_nc_screen_init(void)
-+		{ /* void */ }
-+
-+#undef _nc_screen_wrap
-+void	_nc_screen_wrap(void)
-+		{ /* void */ }
-+
-+#undef _nc_do_xmc_glitch
-+void	_nc_do_xmc_glitch(
-+		attr_t	previous)
-+		{ /* void */ }
-+
-+/* ./trace/varargs.c */
-+
-+typedef enum {
-+    atUnknown = 0, atInteger, atFloat, atPoint, atString
-+} ARGTYPE;
-+
-+#undef _nc_varargs
-+char	*_nc_varargs(
-+		const char *fmt, 
-+		va_list	ap)
-+		{ return(*(char **)0); }
-+
-+/* ./base/memmove.c */
-+
-+#undef _nc_memmove
-+void	_nc_memmove(void)
-+		{ /* void */ }
-+
-+/* ./base/vsscanf.c */
-+
-+#undef _nc_vsscanf
-+void	_nc_vsscanf(void)
-+		{ /* void */ }
-+
-+/* ./base/lib_freeall.c */
-+
-+#include <term_entry.h>
-+
-+#undef _nc_freeall
-+void	_nc_freeall(void)
-+		{ /* void */ }
-+
-+#undef _nc_free_and_exit
-+void	_nc_free_and_exit(
-+		int	code)
-+		{ /* void */ }
-+
-+/* ./expanded.c */
-+
-+#undef _nc_expanded
-+void	_nc_expanded(void)
-+		{ /* void */ }
-+
-+/* ./base/legacy_coding.c */
-+
-+#undef use_legacy_coding
-+int	use_legacy_coding(
-+		int	level)
-+		{ return(*(int *)0); }
-+
-+/* ./base/lib_dft_fgbg.c */
-+
-+#undef use_default_colors
-+int	use_default_colors(void)
-+		{ return(*(int *)0); }
-+
-+#undef assume_default_colors
-+int	assume_default_colors(
-+		int	fg, 
-+		int	bg)
-+		{ return(*(int *)0); }
-+
-+/* ./tinfo/lib_print.c */
-+
-+#undef mcprint
-+int	mcprint(
-+		char	*data, 
-+		int	len)
-+		{ return(*(int *)0); }
-+
-+/* ./base/resizeterm.c */
-+
-+#undef is_term_resized
-+NCURSES_BOOL is_term_resized(
-+		int	ToLines, 
-+		int	ToCols)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef resize_term
-+int	resize_term(
-+		int	ToLines, 
-+		int	ToCols)
-+		{ return(*(int *)0); }
-+
-+#undef resizeterm
-+int	resizeterm(
-+		int	ToLines, 
-+		int	ToCols)
-+		{ return(*(int *)0); }
-+
-+/* ./trace/trace_xnames.c */
-+
-+#undef _nc_trace_xnames
-+void	_nc_trace_xnames(
-+		TERMTYPE *tp)
-+		{ /* void */ }
-+
-+/* ./tinfo/use_screen.c */
-+
-+#undef use_screen
-+int	use_screen(
-+		SCREEN	*screen, 
-+		NCURSES_SCREEN_CB func, 
-+		void	*data)
-+		{ return(*(int *)0); }
-+
-+/* ./base/use_window.c */
-+
-+#undef use_window
-+int	use_window(
-+		WINDOW	*win, 
-+		NCURSES_WINDOW_CB func, 
-+		void	*data)
-+		{ return(*(int *)0); }
-+
-+/* ./base/wresize.c */
-+
-+#undef wresize
-+int	wresize(
-+		WINDOW	*win, 
-+		int	ToLines, 
-+		int	ToCols)
-+		{ return(*(int *)0); }
-+
-+/* ./tinfo/access.c */
-+
-+#include <sys/stat.h>
-+#include <nc_alloc.h>
-+
-+#undef _nc_rootname
-+char	*_nc_rootname(
-+		char	*path)
-+		{ return(*(char **)0); }
-+
-+#undef _nc_is_abs_path
-+NCURSES_BOOL _nc_is_abs_path(
-+		const char *path)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef _nc_pathlast
-+unsigned _nc_pathlast(
-+		const char *path)
-+		{ return(*(unsigned *)0); }
-+
-+#undef _nc_basename
-+char	*_nc_basename(
-+		char	*path)
-+		{ return(*(char **)0); }
-+
-+#undef _nc_access
-+int	_nc_access(
-+		const char *path, 
-+		int	mode)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_is_dir_path
-+NCURSES_BOOL _nc_is_dir_path(
-+		const char *path)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef _nc_is_file_path
-+NCURSES_BOOL _nc_is_file_path(
-+		const char *path)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+/* ./tinfo/add_tries.c */
-+
-+#undef _nc_add_to_try
-+int	_nc_add_to_try(
-+		TRIES	**tree, 
-+		const char *str, 
-+		unsigned code)
-+		{ return(*(int *)0); }
-+
-+/* ./tinfo/alloc_ttype.c */
-+
-+#undef _nc_align_termtype
-+void	_nc_align_termtype(
-+		TERMTYPE *to, 
-+		TERMTYPE *from)
-+		{ /* void */ }
-+
-+#undef _nc_copy_termtype
-+void	_nc_copy_termtype(
-+		TERMTYPE *dst, 
-+		TERMTYPE *src)
-+		{ /* void */ }
-+
-+/* ./codes.c */
-+
-+#undef _nc_boolcodes
-+const char *const *_nc_boolcodes(void)
-+		{ return(*(const char **)0); }
-+
-+#undef _nc_numcodes
-+const char *const *_nc_numcodes(void)
-+		{ return(*(const char **)0); }
-+
-+#undef _nc_strcodes
-+const char *const *_nc_strcodes(void)
-+		{ return(*(const char **)0); }
-+
-+#undef _nc_codes_leaks
-+void	_nc_codes_leaks(void)
-+		{ /* void */ }
-+
-+/* ./tinfo/comp_error.c */
-+
-+#undef _nc_suppress_warnings
-+NCURSES_BOOL _nc_suppress_warnings;
-+#undef _nc_curr_line
-+int	_nc_curr_line;
-+#undef _nc_curr_col
-+int	_nc_curr_col;
-+
-+#undef _nc_get_source
-+const char *_nc_get_source(void)
-+		{ return(*(const char **)0); }
-+
-+#undef _nc_set_source
-+void	_nc_set_source(
-+		const char *const name)
-+		{ /* void */ }
-+
-+#undef _nc_set_type
-+void	_nc_set_type(
-+		const char *const name)
-+		{ /* void */ }
-+
-+#undef _nc_get_type
-+void	_nc_get_type(
-+		char	*name)
-+		{ /* void */ }
-+
-+#undef _nc_warning
-+void	_nc_warning(
-+		const char *const fmt, 
-+		...)
-+		{ /* void */ }
-+
-+#undef _nc_err_abort
-+void	_nc_err_abort(
-+		const char *const fmt, 
-+		...)
-+		{ /* void */ }
-+
-+#undef _nc_syserr_abort
-+void	_nc_syserr_abort(
-+		const char *const fmt, 
-+		...)
-+		{ /* void */ }
-+
-+/* ./tinfo/db_iterator.c */
-+
-+#undef _nc_tic_dir
-+const char *_nc_tic_dir(
-+		const char *path)
-+		{ return(*(const char **)0); }
-+
-+#undef _nc_keep_tic_dir
-+void	_nc_keep_tic_dir(
-+		const char *path)
-+		{ /* void */ }
-+
-+#undef _nc_last_db
-+void	_nc_last_db(void)
-+		{ /* void */ }
-+
-+#undef _nc_next_db
-+const char *_nc_next_db(
-+		DBDIRS	*state, 
-+		int	*offset)
-+		{ return(*(const char **)0); }
-+
-+#undef _nc_first_db
-+void	_nc_first_db(
-+		DBDIRS	*state, 
-+		int	*offset)
-+		{ /* void */ }
-+
-+/* ./tinfo/doalloc.c */
-+
-+#undef _nc_doalloc
-+void	*_nc_doalloc(
-+		void	*oldp, 
-+		size_t	amount)
-+		{ return(*(void **)0); }
-+
-+/* ./tinfo/entries.c */
-+
-+#undef _nc_head
-+ENTRY	*_nc_head;
-+#undef _nc_tail
-+ENTRY	*_nc_tail;
-+
-+#undef _nc_free_entry
-+void	_nc_free_entry(
-+		ENTRY	*headp, 
-+		TERMTYPE *tterm)
-+		{ /* void */ }
-+
-+#undef _nc_free_entries
-+void	_nc_free_entries(
-+		ENTRY	*headp)
-+		{ /* void */ }
-+
-+#undef _nc_delink_entry
-+ENTRY	*_nc_delink_entry(
-+		ENTRY	*headp, 
-+		TERMTYPE *tterm)
-+		{ return(*(ENTRY **)0); }
-+
-+#undef _nc_leaks_tinfo
-+void	_nc_leaks_tinfo(void)
-+		{ /* void */ }
-+
-+#undef _nc_free_tinfo
-+void	_nc_free_tinfo(
-+		int	code)
-+		{ /* void */ }
-+
-+/* ./fallback.c */
-+
-+#undef _nc_fallback
-+const TERMTYPE *_nc_fallback(
-+		const char *name)
-+		{ return(*(const TERMTYPE **)0); }
-+
-+/* ./tinfo/free_ttype.c */
-+
-+#undef _nc_free_termtype
-+void	_nc_free_termtype(
-+		TERMTYPE *ptr)
-+		{ /* void */ }
-+
-+#undef _nc_user_definable
-+NCURSES_BOOL _nc_user_definable;
-+
-+#undef use_extended_names
-+int	use_extended_names(
-+		NCURSES_BOOL flag)
-+		{ return(*(int *)0); }
-+
-+/* ./tinfo/getenv_num.c */
-+
-+#undef _nc_getenv_num
-+int	_nc_getenv_num(
-+		const char *name)
-+		{ return(*(int *)0); }
-+
-+/* ./tinfo/home_terminfo.c */
-+
-+#undef _nc_home_terminfo
-+char	*_nc_home_terminfo(void)
-+		{ return(*(char **)0); }
-+
-+/* ./tinfo/init_keytry.c */
-+
-+#if 0
-+
-+#include <init_keytry.h>
-+
-+#undef _nc_tinfo_fkeys
-+const struct tinfo_fkeys _nc_tinfo_fkeys[] = {0};
-+
-+#endif
-+
-+#undef _nc_init_keytry
-+void	_nc_init_keytry(
-+		SCREEN	*sp)
-+		{ /* void */ }
-+
-+/* ./tinfo/lib_acs.c */
-+
-+#undef _nc_acs_map
-+chtype	*_nc_acs_map(void)
-+		{ return(*(chtype **)0); }
-+
-+#undef _nc_init_acs
-+void	_nc_init_acs(void)
-+		{ /* void */ }
-+
-+/* ./tinfo/lib_baudrate.c */
-+
-+#include <termcap.h>
-+
-+struct speed {
-+    int s; 
-+    int sp; 
-+};
-+
-+#undef _nc_baudrate
-+int	_nc_baudrate(
-+		int	OSpeed)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_ospeed
-+int	_nc_ospeed(
-+		int	BaudRate)
-+		{ return(*(int *)0); }
-+
-+#undef baudrate
-+int	baudrate(void)
-+		{ return(*(int *)0); }
-+
-+/* ./tinfo/lib_cur_term.c */
-+
-+#undef _nc_cur_term
-+TERMINAL *_nc_cur_term(void)
-+		{ return(*(TERMINAL **)0); }
-+
-+#undef set_curterm
-+TERMINAL *set_curterm(
-+		TERMINAL *termp)
-+		{ return(*(TERMINAL **)0); }
-+
-+#undef del_curterm
-+int	del_curterm(
-+		TERMINAL *termp)
-+		{ return(*(int *)0); }
-+
-+/* ./tinfo/lib_data.c */
-+
-+#undef _nc_stdscr
-+WINDOW	*_nc_stdscr(void)
-+		{ return(*(WINDOW **)0); }
-+
-+#undef _nc_curscr
-+WINDOW	*_nc_curscr(void)
-+		{ return(*(WINDOW **)0); }
-+
-+#undef _nc_newscr
-+WINDOW	*_nc_newscr(void)
-+		{ return(*(WINDOW **)0); }
-+
-+#undef _nc_screen_chain
-+SCREEN	*_nc_screen_chain;
-+#undef SP
-+SCREEN	*SP;
-+#undef _nc_globals
-+NCURSES_GLOBALS _nc_globals;
-+#undef _nc_prescreen
-+NCURSES_PRESCREEN _nc_prescreen;
-+
-+#undef _nc_mutex_init
-+void	_nc_mutex_init(
-+		pthread_mutex_t *obj)
-+		{ /* void */ }
-+
-+#undef _nc_mutex_lock
-+int	_nc_mutex_lock(
-+		pthread_mutex_t *obj)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_mutex_trylock
-+int	_nc_mutex_trylock(
-+		pthread_mutex_t *obj)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_mutex_unlock
-+int	_nc_mutex_unlock(
-+		pthread_mutex_t *obj)
-+		{ return(*(int *)0); }
-+
-+/* ./tinfo/lib_has_cap.c */
-+
-+#undef has_ic
-+NCURSES_BOOL has_ic(void)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef has_il
-+NCURSES_BOOL has_il(void)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+/* ./tinfo/lib_kernel.c */
-+
-+#undef erasechar
-+char	erasechar(void)
-+		{ return(*(char *)0); }
-+
-+#undef killchar
-+char	killchar(void)
-+		{ return(*(char *)0); }
-+
-+#undef flushinp
-+int	flushinp(void)
-+		{ return(*(int *)0); }
-+
-+/* ./lib_keyname.c */
-+
-+struct kn { short offset; int code; };
-+
-+#undef _nc_keyname
-+const char *_nc_keyname(
-+		SCREEN	*sp, 
-+		int	c)
-+		{ return(*(const char **)0); }
-+
-+#undef keyname
-+const char *keyname(
-+		int	c)
-+		{ return(*(const char **)0); }
-+
-+#undef _nc_keyname_leaks
-+void	_nc_keyname_leaks(void)
-+		{ /* void */ }
-+
-+/* ./tinfo/lib_longname.c */
-+
-+#undef longname
-+char	*longname(void)
-+		{ return(*(char **)0); }
-+
-+/* ./tinfo/lib_napms.c */
-+
-+#undef napms
-+int	napms(
-+		int	ms)
-+		{ return(*(int *)0); }
-+
-+/* ./tinfo/lib_options.c */
-+
-+#undef idlok
-+int	idlok(
-+		WINDOW	*win, 
-+		NCURSES_BOOL flag)
-+		{ return(*(int *)0); }
-+
-+#undef idcok
-+void	idcok(
-+		WINDOW	*win, 
-+		NCURSES_BOOL flag)
-+		{ /* void */ }
-+
-+#undef halfdelay
-+int	halfdelay(
-+		int	t)
-+		{ return(*(int *)0); }
-+
-+#undef nodelay
-+int	nodelay(
-+		WINDOW	*win, 
-+		NCURSES_BOOL flag)
-+		{ return(*(int *)0); }
-+
-+#undef notimeout
-+int	notimeout(
-+		WINDOW	*win, 
-+		NCURSES_BOOL f)
-+		{ return(*(int *)0); }
-+
-+#undef wtimeout
-+void	wtimeout(
-+		WINDOW	*win, 
-+		int	delay)
-+		{ /* void */ }
-+
-+#undef keypad
-+int	keypad(
-+		WINDOW	*win, 
-+		NCURSES_BOOL flag)
-+		{ return(*(int *)0); }
-+
-+#undef meta
-+int	meta(
-+		WINDOW	*win, 
-+		NCURSES_BOOL flag)
-+		{ return(*(int *)0); }
-+
-+#undef curs_set
-+int	curs_set(
-+		int	vis)
-+		{ return(*(int *)0); }
-+
-+#undef typeahead
-+int	typeahead(
-+		int	fd)
-+		{ return(*(int *)0); }
-+
-+#undef has_key
-+int	has_key(
-+		int	keycode)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_keypad
-+int	_nc_keypad(
-+		SCREEN	*sp, 
-+		NCURSES_BOOL flag)
-+		{ return(*(int *)0); }
-+
-+/* ./tinfo/lib_raw.c */
-+
-+#undef raw
-+int	raw(void)
-+		{ return(*(int *)0); }
-+
-+#undef cbreak
-+int	cbreak(void)
-+		{ return(*(int *)0); }
-+
-+#undef qiflush
-+void	qiflush(void)
-+		{ /* void */ }
-+
-+#undef noraw
-+int	noraw(void)
-+		{ return(*(int *)0); }
-+
-+#undef nocbreak
-+int	nocbreak(void)
-+		{ return(*(int *)0); }
-+
-+#undef noqiflush
-+void	noqiflush(void)
-+		{ /* void */ }
-+
-+#undef intrflush
-+int	intrflush(
-+		WINDOW	*win, 
-+		NCURSES_BOOL flag)
-+		{ return(*(int *)0); }
-+
-+/* ./tinfo/lib_setup.c */
-+
-+#include <locale.h>
-+#include <sys/ioctl.h>
-+#include <langinfo.h>
-+
-+#undef _nc_ttytype
-+char	*_nc_ttytype(void)
-+		{ return(*(char **)0); }
-+
-+#undef _nc_ptr_Lines
-+int	*_nc_ptr_Lines(void)
-+		{ return(*(int **)0); }
-+
-+#undef _nc_LINES
-+int	_nc_LINES(void)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_ptr_Cols
-+int	*_nc_ptr_Cols(void)
-+		{ return(*(int **)0); }
-+
-+#undef _nc_COLS
-+int	_nc_COLS(void)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_TABSIZE
-+int	_nc_TABSIZE(void)
-+		{ return(*(int *)0); }
-+
-+#undef set_tabsize
-+int	set_tabsize(
-+		int	value)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_handle_sigwinch
-+int	_nc_handle_sigwinch(
-+		SCREEN	*sp)
-+		{ return(*(int *)0); }
-+
-+#undef use_env
-+void	use_env(
-+		NCURSES_BOOL f)
-+		{ /* void */ }
-+
-+#undef _nc_get_screensize
-+void	_nc_get_screensize(
-+		SCREEN	*sp, 
-+		int	*linep, 
-+		int	*colp)
-+		{ /* void */ }
-+
-+#undef _nc_update_screensize
-+void	_nc_update_screensize(
-+		SCREEN	*sp)
-+		{ /* void */ }
-+
-+#undef _nc_get_locale
-+char	*_nc_get_locale(void)
-+		{ return(*(char **)0); }
-+
-+#undef _nc_unicode_locale
-+int	_nc_unicode_locale(void)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_locale_breaks_acs
-+int	_nc_locale_breaks_acs(void)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_setupterm
-+int	_nc_setupterm(
-+		const char *tname, 
-+		int	Filedes, 
-+		int	*errret, 
-+		NCURSES_BOOL reuse)
-+		{ return(*(int *)0); }
-+
-+#undef setupterm
-+int	setupterm(
-+		const char *tname, 
-+		int	Filedes, 
-+		int	*errret)
-+		{ return(*(int *)0); }
-+
-+/* ./tinfo/lib_termcap.c */
-+
-+#undef UP
-+char	*UP;
-+#undef BC
-+char	*BC;
-+
-+#undef tgetent
-+int	tgetent(
-+		char	*bufp, 
-+		const char *name)
-+		{ return(*(int *)0); }
-+
-+#if 0
-+
-+#include <capdefaults.c>
-+
-+#endif
-+
-+#undef tgetflag
-+int	tgetflag(
-+		const char *id)
-+		{ return(*(int *)0); }
-+
-+#undef tgetnum
-+int	tgetnum(
-+		const char *id)
-+		{ return(*(int *)0); }
-+
-+#undef tgetstr
-+char	*tgetstr(
-+		const char *id, 
-+		char	**area)
-+		{ return(*(char **)0); }
-+
-+#undef _nc_tgetent_leaks
-+void	_nc_tgetent_leaks(void)
-+		{ /* void */ }
-+
-+/* ./tinfo/lib_termname.c */
-+
-+#undef termname
-+char	*termname(void)
-+		{ return(*(char **)0); }
-+
-+/* ./tinfo/lib_tgoto.c */
-+
-+#undef tgoto
-+char	*tgoto(
-+		const char *string, 
-+		int	x, 
-+		int	y)
-+		{ return(*(char **)0); }
-+
-+/* ./tinfo/lib_ti.c */
-+
-+#undef tigetflag
-+int	tigetflag(
-+		const char *str)
-+		{ return(*(int *)0); }
-+
-+#undef tigetnum
-+int	tigetnum(
-+		const char *str)
-+		{ return(*(int *)0); }
-+
-+#undef tigetstr
-+char	*tigetstr(
-+		const char *str)
-+		{ return(*(char **)0); }
-+
-+/* ./tinfo/lib_tparm.c */
-+
-+#undef _nc_tparm_err
-+int	_nc_tparm_err;
-+
-+#undef _nc_free_tparm
-+void	_nc_free_tparm(void)
-+		{ /* void */ }
-+
-+#undef _nc_tparm_analyze
-+int	_nc_tparm_analyze(
-+		const char *string, 
-+		char	*p_is_s[9], 
-+		int	*popcount)
-+		{ return(*(int *)0); }
-+
-+#undef tparm
-+char	*tparm(
-+		const char *string, 
-+		...)
-+		{ return(*(char **)0); }
-+
-+/* ./tinfo/lib_tputs.c */
-+
-+#undef PC
-+char	PC;
-+#undef ospeed
-+NCURSES_OSPEED	ospeed;
-+#undef _nc_nulls_sent
-+int	_nc_nulls_sent;
-+
-+#undef delay_output
-+int	delay_output(
-+		int	ms)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_flush
-+void	_nc_flush(void)
-+		{ /* void */ }
-+
-+#undef _nc_outch
-+int	_nc_outch(
-+		int	ch)
-+		{ return(*(int *)0); }
-+
-+#undef putp
-+int	putp(
-+		const char *string)
-+		{ return(*(int *)0); }
-+
-+#undef tputs
-+int	tputs(
-+		const char *string, 
-+		int	affcnt, 
-+		int	(*outc)(
-+		int	p1))
-+		{ return(*(int *)0); }
-+
-+/* ./trace/lib_trace.c */
-+
-+#undef _nc_tracing
-+unsigned _nc_tracing;
-+
-+#undef _nc__nc_tputs_trace
-+const char *_nc__nc_tputs_trace(void)
-+		{ return(*(const char **)0); }
-+
-+#undef _nc__nc_outchars
-+long	_nc__nc_outchars(void)
-+		{ return(*(long *)0); }
-+
-+#undef _nc_set_tputs_trace
-+void	_nc_set_tputs_trace(
-+		const char *s)
-+		{ /* void */ }
-+
-+#undef _nc_count_outchars
-+void	_nc_count_outchars(
-+		long	increment)
-+		{ /* void */ }
-+
-+#undef trace
-+void	trace(
-+		const unsigned int tracelevel)
-+		{ /* void */ }
-+
-+#undef _tracef
-+void	_tracef(
-+		const char *fmt, 
-+		...)
-+		{ /* void */ }
-+
-+#undef _nc_retrace_bool
-+NCURSES_BOOL _nc_retrace_bool(
-+		NCURSES_BOOL code)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef _nc_retrace_int
-+int	_nc_retrace_int(
-+		int	code)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_retrace_unsigned
-+unsigned _nc_retrace_unsigned(
-+		unsigned code)
-+		{ return(*(unsigned *)0); }
-+
-+#undef _nc_retrace_ptr
-+char	*_nc_retrace_ptr(
-+		char	*code)
-+		{ return(*(char **)0); }
-+
-+#undef _nc_retrace_cptr
-+const char *_nc_retrace_cptr(
-+		const char *code)
-+		{ return(*(const char **)0); }
-+
-+#undef _nc_retrace_cvoid_ptr
-+const void *_nc_retrace_cvoid_ptr(
-+		const void *code)
-+		{ return(*(const void **)0); }
-+
-+#undef _nc_retrace_void_ptr
-+void	*_nc_retrace_void_ptr(
-+		void	*code)
-+		{ return(*(void **)0); }
-+
-+#undef _nc_retrace_sp
-+SCREEN	*_nc_retrace_sp(
-+		SCREEN	*code)
-+		{ return(*(SCREEN **)0); }
-+
-+#undef _nc_retrace_win
-+WINDOW	*_nc_retrace_win(
-+		WINDOW	*code)
-+		{ return(*(WINDOW **)0); }
-+
-+#undef _nc_use_tracef
-+int	_nc_use_tracef(
-+		unsigned mask)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_locked_tracef
-+void	_nc_locked_tracef(
-+		const char *fmt, 
-+		...)
-+		{ /* void */ }
-+
-+/* ./trace/lib_traceatr.c */
-+
-+#undef _traceattr2
-+char	*_traceattr2(
-+		int	bufnum, 
-+		chtype	newmode)
-+		{ return(*(char **)0); }
-+
-+#undef _traceattr
-+char	*_traceattr(
-+		attr_t	newmode)
-+		{ return(*(char **)0); }
-+
-+#undef _nc_retrace_attr_t
-+attr_t	_nc_retrace_attr_t(
-+		attr_t	code)
-+		{ return(*(attr_t *)0); }
-+
-+#undef _nc_altcharset_name
-+const char *_nc_altcharset_name(
-+		attr_t	attr, 
-+		chtype	ch)
-+		{ return(*(const char **)0); }
-+
-+#undef _tracechtype2
-+char	*_tracechtype2(
-+		int	bufnum, 
-+		chtype	ch)
-+		{ return(*(char **)0); }
-+
-+#undef _tracechtype
-+char	*_tracechtype(
-+		chtype	ch)
-+		{ return(*(char **)0); }
-+
-+#undef _nc_retrace_chtype
-+chtype	_nc_retrace_chtype(
-+		chtype	code)
-+		{ return(*(chtype *)0); }
-+
-+/* ./trace/lib_tracebits.c */
-+
-+typedef struct {
-+    unsigned int val;
-+    const char *name;
-+} BITNAMES;
-+
-+#undef _nc_trace_ttymode
-+char	*_nc_trace_ttymode(
-+		struct termios *tty)
-+		{ return(*(char **)0); }
-+
-+#undef _nc_tracebits
-+char	*_nc_tracebits(void)
-+		{ return(*(char **)0); }
-+
-+/* ./trace/lib_tracechr.c */
-+
-+#undef _nc_tracechar
-+char	*_nc_tracechar(
-+		SCREEN	*sp, 
-+		int	ch)
-+		{ return(*(char **)0); }
-+
-+#undef _tracechar
-+char	*_tracechar(
-+		int	ch)
-+		{ return(*(char **)0); }
-+
-+/* ./tinfo/lib_ttyflags.c */
-+
-+#undef _nc_get_tty_mode
-+int	_nc_get_tty_mode(
-+		struct termios *buf)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_set_tty_mode
-+int	_nc_set_tty_mode(
-+		struct termios *buf)
-+		{ return(*(int *)0); }
-+
-+#undef def_shell_mode
-+int	def_shell_mode(void)
-+		{ return(*(int *)0); }
-+
-+#undef def_prog_mode
-+int	def_prog_mode(void)
-+		{ return(*(int *)0); }
-+
-+#undef reset_prog_mode
-+int	reset_prog_mode(void)
-+		{ return(*(int *)0); }
-+
-+#undef reset_shell_mode
-+int	reset_shell_mode(void)
-+		{ return(*(int *)0); }
-+
-+#undef savetty
-+int	savetty(void)
-+		{ return(*(int *)0); }
-+
-+#undef resetty
-+int	resetty(void)
-+		{ return(*(int *)0); }
-+
-+/* ./tty/lib_twait.c */
-+
-+#undef _nc_eventlist_timeout
-+int	_nc_eventlist_timeout(
-+		_nc_eventlist *evl)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_timed_wait
-+int	_nc_timed_wait(
-+		SCREEN	*sp, 
-+		int	mode, 
-+		int	milliseconds, 
-+		int	*timeleft, 
-+		_nc_eventlist *evl)
-+		{ return(*(int *)0); }
-+
-+/* ./tinfo/name_match.c */
-+
-+#undef _nc_first_name
-+char	*_nc_first_name(
-+		const char *const sp)
-+		{ return(*(char **)0); }
-+
-+#undef _nc_name_match
-+int	_nc_name_match(
-+		const char *const namelst, 
-+		const char *const name, 
-+		const char *const delim)
-+		{ return(*(int *)0); }
-+
-+/* ./names.c */
-+
-+#undef _nc_boolnames
-+const char *const *_nc_boolnames(void)
-+		{ return(*(const char **)0); }
-+
-+#undef _nc_boolfnames
-+const char *const *_nc_boolfnames(void)
-+		{ return(*(const char **)0); }
-+
-+#undef _nc_numnames
-+const char *const *_nc_numnames(void)
-+		{ return(*(const char **)0); }
-+
-+#undef _nc_numfnames
-+const char *const *_nc_numfnames(void)
-+		{ return(*(const char **)0); }
-+
-+#undef _nc_strnames
-+const char *const *_nc_strnames(void)
-+		{ return(*(const char **)0); }
-+
-+#undef _nc_strfnames
-+const char *const *_nc_strfnames(void)
-+		{ return(*(const char **)0); }
-+
-+#undef _nc_names_leaks
-+void	_nc_names_leaks(void)
-+		{ /* void */ }
-+
-+/* ./tinfo/read_entry.c */
-+
-+#include <hashed_db.h>
-+
-+#undef _nc_read_termtype
-+int	_nc_read_termtype(
-+		TERMTYPE *ptr, 
-+		char	*buffer, 
-+		int	limit)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_read_file_entry
-+int	_nc_read_file_entry(
-+		const char *const filename, 
-+		TERMTYPE *ptr)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_read_entry
-+int	_nc_read_entry(
-+		const char *const name, 
-+		char	*const filename, 
-+		TERMTYPE *const tp)
-+		{ return(*(int *)0); }
-+
-+/* ./tinfo/read_termcap.c */
-+
-+#include <sys/types.h>
-+
-+#undef _nc_read_termcap
-+void	_nc_read_termcap(void)
-+		{ /* void */ }
-+
-+/* ./tinfo/setbuf.c */
-+
-+#undef _nc_set_buffer
-+void	_nc_set_buffer(
-+		FILE	*ofp, 
-+		NCURSES_BOOL buffered)
-+		{ /* void */ }
-+
-+/* ./tinfo/strings.c */
-+
-+#undef _nc_str_init
-+string_desc *_nc_str_init(
-+		string_desc *dst, 
-+		char	*src, 
-+		size_t	len)
-+		{ return(*(string_desc **)0); }
-+
-+#undef _nc_str_null
-+string_desc *_nc_str_null(
-+		string_desc *dst, 
-+		size_t	len)
-+		{ return(*(string_desc **)0); }
-+
-+#undef _nc_str_copy
-+string_desc *_nc_str_copy(
-+		string_desc *dst, 
-+		string_desc *src)
-+		{ return(*(string_desc **)0); }
-+
-+#undef _nc_safe_strcat
-+NCURSES_BOOL _nc_safe_strcat(
-+		string_desc *dst, 
-+		const char *src)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef _nc_safe_strcpy
-+NCURSES_BOOL _nc_safe_strcpy(
-+		string_desc *dst, 
-+		const char *src)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+/* ./trace/trace_buf.c */
-+
-+#undef _nc_trace_buf
-+char	*_nc_trace_buf(
-+		int	bufnum, 
-+		size_t	want)
-+		{ return(*(char **)0); }
-+
-+#undef _nc_trace_bufcat
-+char	*_nc_trace_bufcat(
-+		int	bufnum, 
-+		const char *value)
-+		{ return(*(char **)0); }
-+
-+/* ./trace/trace_tries.c */
-+
-+#undef _nc_trace_tries
-+void	_nc_trace_tries(
-+		TRIES	*tree)
-+		{ /* void */ }
-+
-+/* ./base/tries.c */
-+
-+#undef _nc_expand_try
-+char	*_nc_expand_try(
-+		TRIES	*tree, 
-+		unsigned code, 
-+		int	*count, 
-+		size_t	len)
-+		{ return(*(char **)0); }
-+
-+#undef _nc_remove_key
-+int	_nc_remove_key(
-+		TRIES	**tree, 
-+		unsigned code)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_remove_string
-+int	_nc_remove_string(
-+		TRIES	**tree, 
-+		const char *string)
-+		{ return(*(int *)0); }
-+
-+/* ./tinfo/trim_sgr0.c */
-+
-+#undef _nc_trim_sgr0
-+char	*_nc_trim_sgr0(
-+		TERMTYPE *tp)
-+		{ return(*(char **)0); }
-+
-+/* ./unctrl.c */
-+
-+#undef _nc_unctrl
-+const char *_nc_unctrl(
-+		SCREEN	*sp, 
-+		chtype	ch)
-+		{ return(*(const char **)0); }
-+
-+#undef unctrl
-+const char *unctrl(
-+		chtype	ch)
-+		{ return(*(const char **)0); }
-+
-+/* ./trace/visbuf.c */
-+
-+#undef _nc_visbuf2
-+const char *_nc_visbuf2(
-+		int	bufnum, 
-+		const char *buf)
-+		{ return(*(const char **)0); }
-+
-+#undef _nc_visbuf
-+const char *_nc_visbuf(
-+		const char *buf)
-+		{ return(*(const char **)0); }
-+
-+#undef _nc_visbufn
-+const char *_nc_visbufn(
-+		const char *buf, 
-+		int	len)
-+		{ return(*(const char **)0); }
-+
-+#undef _nc_viscbuf2
-+const char *_nc_viscbuf2(
-+		int	bufnum, 
-+		const chtype *buf, 
-+		int	len)
-+		{ return(*(const char **)0); }
-+
-+#undef _nc_viscbuf
-+const char *_nc_viscbuf(
-+		const chtype *buf, 
-+		int	len)
-+		{ return(*(const char **)0); }
-+
-+/* ./tinfo/alloc_entry.c */
-+
-+#undef _nc_init_entry
-+void	_nc_init_entry(
-+		TERMTYPE *const tp)
-+		{ /* void */ }
-+
-+#undef _nc_copy_entry
-+ENTRY	*_nc_copy_entry(
-+		ENTRY	*oldp)
-+		{ return(*(ENTRY **)0); }
-+
-+#undef _nc_save_str
-+char	*_nc_save_str(
-+		const char *const string)
-+		{ return(*(char **)0); }
-+
-+#undef _nc_wrap_entry
-+void	_nc_wrap_entry(
-+		ENTRY	*const ep, 
-+		NCURSES_BOOL copy_strings)
-+		{ /* void */ }
-+
-+#undef _nc_merge_entry
-+void	_nc_merge_entry(
-+		TERMTYPE *const to, 
-+		TERMTYPE *const from)
-+		{ /* void */ }
-+
-+#undef _nc_alloc_entry_leaks
-+void	_nc_alloc_entry_leaks(void)
-+		{ /* void */ }
-+
-+/* ./tinfo/captoinfo.c */
-+
-+#undef _nc_captoinfo
-+char	*_nc_captoinfo(
-+		const char *cap, 
-+		const char *s, 
-+		int const parameterized)
-+		{ return(*(char **)0); }
-+
-+#undef _nc_infotocap
-+char	*_nc_infotocap(
-+		const char *cap, 
-+		const char *str, 
-+		int const parameterized)
-+		{ return(*(char **)0); }
-+
-+#undef _nc_captoinfo_leaks
-+void	_nc_captoinfo_leaks(void)
-+		{ /* void */ }
-+
-+/* ./comp_captab.c */
-+
-+#include <hashsize.h>
-+
-+#undef _nc_get_table
-+const struct name_table_entry *_nc_get_table(
-+		NCURSES_BOOL termcap)
-+		{ return(*(const struct name_table_entry **)0); }
-+
-+#undef _nc_get_hash_table
-+const short *_nc_get_hash_table(
-+		NCURSES_BOOL termcap)
-+		{ return(*(const short **)0); }
-+
-+#undef _nc_get_alias_table
-+const struct alias *_nc_get_alias_table(
-+		NCURSES_BOOL termcap)
-+		{ return(*(const struct alias **)0); }
-+
-+#undef _nc_comp_captab_leaks
-+void	_nc_comp_captab_leaks(void)
-+		{ /* void */ }
-+
-+/* ./tinfo/comp_expand.c */
-+
-+#undef _nc_tic_expand
-+char	*_nc_tic_expand(
-+		const char *srcp, 
-+		NCURSES_BOOL tic_format, 
-+		int	numbers)
-+		{ return(*(char **)0); }
-+
-+/* ./tinfo/comp_hash.c */
-+
-+#undef _nc_find_entry
-+struct name_table_entry const *_nc_find_entry(
-+		const char *string, 
-+		const short *hash_table)
-+		{ return(*(struct name_table_entry const **)0); }
-+
-+#undef _nc_find_type_entry
-+struct name_table_entry const *_nc_find_type_entry(
-+		const char *string, 
-+		int	type, 
-+		const struct name_table_entry *table)
-+		{ return(*(struct name_table_entry const **)0); }
-+
-+/* ./tinfo/comp_parse.c */
-+
-+#undef _nc_check_termtype2
-+void	(*_nc_check_termtype2)(
-+		TERMTYPE *p1, 
-+		NCURSES_BOOL p2);
-+#undef _nc_check_termtype
-+void	(*_nc_check_termtype)(
-+		TERMTYPE *p1);
-+
-+#undef _nc_entry_match
-+NCURSES_BOOL _nc_entry_match(
-+		char	*n1, 
-+		char	*n2)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef _nc_read_entry_source
-+void	_nc_read_entry_source(
-+		FILE	*fp, 
-+		char	*buf, 
-+		int	literal, 
-+		NCURSES_BOOL silent, 
-+		NCURSES_BOOL (*hook)(
-+		ENTRY	*p1))
-+		{ /* void */ }
-+
-+#undef _nc_resolve_uses2
-+int	_nc_resolve_uses2(
-+		NCURSES_BOOL fullresolve, 
-+		NCURSES_BOOL literal)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_resolve_uses
-+int	_nc_resolve_uses(
-+		NCURSES_BOOL fullresolve)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_leaks_tic
-+void	_nc_leaks_tic(void)
-+		{ /* void */ }
-+
-+#undef _nc_free_tic
-+void	_nc_free_tic(
-+		int	code)
-+		{ /* void */ }
-+
-+/* ./tinfo/comp_scan.c */
-+
-+#undef _nc_syntax
-+int	_nc_syntax;
-+#undef _nc_curr_file_pos
-+long	_nc_curr_file_pos;
-+#undef _nc_comment_start
-+long	_nc_comment_start;
-+#undef _nc_comment_end
-+long	_nc_comment_end;
-+#undef _nc_start_line
-+long	_nc_start_line;
-+#undef _nc_curr_token
-+struct token _nc_curr_token;
-+#undef _nc_disable_period
-+NCURSES_BOOL _nc_disable_period;
-+
-+#undef _nc_reset_input
-+void	_nc_reset_input(
-+		FILE	*fp, 
-+		char	*buf)
-+		{ /* void */ }
-+
-+#undef _nc_get_token
-+int	_nc_get_token(
-+		NCURSES_BOOL silent)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_trans_string
-+int	_nc_trans_string(
-+		char	*ptr, 
-+		char	*last)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_push_token
-+void	_nc_push_token(
-+		int	tokclass)
-+		{ /* void */ }
-+
-+#undef _nc_panic_mode
-+void	_nc_panic_mode(
-+		char	ch)
-+		{ /* void */ }
-+
-+#undef _nc_comp_scan_leaks
-+void	_nc_comp_scan_leaks(void)
-+		{ /* void */ }
-+
-+/* ./tinfo/parse_entry.c */
-+
-+#undef _nc_parse_entry
-+int	_nc_parse_entry(
-+		struct entry *entryp, 
-+		int	literal, 
-+		NCURSES_BOOL silent)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_capcmp
-+int	_nc_capcmp(
-+		const char *s, 
-+		const char *t)
-+		{ return(*(int *)0); }
-+
-+typedef struct {
-+    const char *from;
-+    const char *to;
-+} assoc;
-+
-+/* ./tinfo/write_entry.c */
-+
-+#undef _nc_set_writedir
-+void	_nc_set_writedir(
-+		char	*dir)
-+		{ /* void */ }
-+
-+#undef _nc_write_entry
-+void	_nc_write_entry(
-+		TERMTYPE *const tp)
-+		{ /* void */ }
-+
-+#undef _nc_tic_written
-+int	_nc_tic_written(void)
-+		{ return(*(int *)0); }
-+
-+/* ./base/define_key.c */
-+
-+#undef define_key
-+int	define_key(
-+		const char *str, 
-+		int	keycode)
-+		{ return(*(int *)0); }
-+
-+/* ./tinfo/hashed_db.c */
-+
-+#undef _nc_hashed_db
-+void	_nc_hashed_db(void)
-+		{ /* void */ }
-+
-+/* ./base/key_defined.c */
-+
-+#undef key_defined
-+int	key_defined(
-+		const char *str)
-+		{ return(*(int *)0); }
-+
-+/* ./base/keybound.c */
-+
-+#undef keybound
-+char	*keybound(
-+		int	code, 
-+		int	count)
-+		{ return(*(char **)0); }
-+
-+/* ./base/keyok.c */
-+
-+#undef keyok
-+int	keyok(
-+		int	c, 
-+		NCURSES_BOOL flag)
-+		{ return(*(int *)0); }
-+
-+/* ./base/version.c */
-+
-+#undef curses_version
-+const char *curses_version(void)
-+		{ return(*(const char **)0); }
-diff -Naur ncurses-5.6.orig/ncurses/llib-lncursesw ncurses-5.6/ncurses/llib-lncursesw
---- ncurses-5.6.orig/ncurses/llib-lncursesw	2006-12-17 12:37:36.000000000 -0500
-+++ ncurses-5.6/ncurses/llib-lncursesw	2008-06-18 06:49:44.000000000 -0400
-@@ -1066,6 +1066,11 @@
- 		WINDOW	*z)
- 		{ return(*(int *)0); }
- 
-+#undef getattrs
-+int	getattrs(
-+		const WINDOW *z)
-+		{ return(*(int *)0); }
-+
- #undef getcurx
- int	getcurx(
- 		const WINDOW *z)
-@@ -1106,6 +1111,68 @@
- 		const WINDOW *z)
- 		{ return(*(int *)0); }
- 
-+#undef wgetparent
-+WINDOW	*wgetparent(
-+		const WINDOW *z)
-+		{ return(*(WINDOW **)0); }
-+
-+#undef is_cleared
-+NCURSES_BOOL is_cleared(
-+		const WINDOW *z)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef is_idcok
-+NCURSES_BOOL is_idcok(
-+		const WINDOW *z)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef is_idlok
-+NCURSES_BOOL is_idlok(
-+		const WINDOW *z)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef is_immedok
-+NCURSES_BOOL is_immedok(
-+		const WINDOW *z)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef is_keypad
-+NCURSES_BOOL is_keypad(
-+		const WINDOW *z)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef is_leaveok
-+NCURSES_BOOL is_leaveok(
-+		const WINDOW *z)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef is_nodelay
-+NCURSES_BOOL is_nodelay(
-+		const WINDOW *z)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef is_notimeout
-+NCURSES_BOOL is_notimeout(
-+		const WINDOW *z)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef is_scrollok
-+NCURSES_BOOL is_scrollok(
-+		const WINDOW *z)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef is_syncok
-+NCURSES_BOOL is_syncok(
-+		const WINDOW *z)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef wgetscrreg
-+int	wgetscrreg(
-+		const WINDOW *a1, 
-+		int	*a2, 
-+		int	*z)
-+		{ return(*(int *)0); }
-+
- #undef add_wch
- int	add_wch(
- 		const cchar_t *z)
-@@ -2529,14 +2596,6 @@
- 		void	*opts)
- 		{ return(*(int *)0); }
- 
--/* ./widechar/lib_get_wch.c */
--
--#undef wget_wch
--int	wget_wch(
--		WINDOW	*win, 
--		wint_t	*result)
--		{ return(*(int *)0); }
--
- /* ./widechar/lib_erasewchar.c */
- 
- #undef erasewchar
-@@ -2549,6 +2608,14 @@
- 		wchar_t	*wch)
- 		{ return(*(int *)0); }
- 
-+/* ./widechar/lib_get_wch.c */
-+
-+#undef wget_wch
-+int	wget_wch(
-+		WINDOW	*win, 
-+		wint_t	*result)
-+		{ return(*(int *)0); }
-+
- /* ./widechar/lib_get_wstr.c */
- 
- #undef wgetn_wstr
-@@ -2614,6 +2681,13 @@
- 		wchar_t	*wstr)
- 		{ return(*(int *)0); }
- 
-+/* ./widechar/lib_key_name.c */
-+
-+#undef key_name
-+char	*key_name(
-+		wchar_t	c)
-+		{ return(*(char **)0); }
-+
- /* ./widechar/lib_pecho_wchar.c */
- 
- #undef pecho_wchar
-@@ -2832,40 +2906,11 @@
- /* ./tinfo/add_tries.c */
- 
- #undef _nc_add_to_try
--void	_nc_add_to_try(
--		struct tries **tree, 
-+int	_nc_add_to_try(
-+		TRIES	**tree, 
- 		const char *str, 
- 		unsigned code)
--		{ /* void */ }
--
--/* ./tinfo/alloc_entry.c */
--
--#undef _nc_init_entry
--void	_nc_init_entry(
--		TERMTYPE *const tp)
--		{ /* void */ }
--
--#undef _nc_copy_entry
--ENTRY	*_nc_copy_entry(
--		ENTRY	*oldp)
--		{ return(*(ENTRY **)0); }
--
--#undef _nc_save_str
--char	*_nc_save_str(
--		const char *const string)
--		{ return(*(char **)0); }
--
--#undef _nc_wrap_entry
--void	_nc_wrap_entry(
--		ENTRY	*const ep, 
--		NCURSES_BOOL copy_strings)
--		{ /* void */ }
--
--#undef _nc_merge_entry
--void	_nc_merge_entry(
--		TERMTYPE *const to, 
--		TERMTYPE *const from)
--		{ /* void */ }
-+		{ return(*(int *)0); }
- 
- /* ./tinfo/alloc_ttype.c */
- 
-@@ -2881,22 +2926,6 @@
- 		TERMTYPE *src)
- 		{ /* void */ }
- 
--/* ./tinfo/captoinfo.c */
--
--#undef _nc_captoinfo
--char	*_nc_captoinfo(
--		const char *cap, 
--		const char *s, 
--		int const parameterized)
--		{ return(*(char **)0); }
--
--#undef _nc_infotocap
--char	*_nc_infotocap(
--		const char *cap, 
--		const char *str, 
--		int const parameterized)
--		{ return(*(char **)0); }
--
- /* ./codes.c */
- 
- #undef boolcodes
-@@ -2906,31 +2935,7 @@
- #undef strcodes
- char	*const strcodes[] = {0};
- 
--/* ./comp_captab.c */
--
--#include <ncurses_cfg.h>
--
--#undef _nc_info_hash_table
--const struct name_table_entry *const _nc_info_hash_table[995] = {0};
--#undef _nc_cap_hash_table
--const struct name_table_entry *const _nc_cap_hash_table[995] = {0};
--#undef _nc_capalias_table
--const struct alias _nc_capalias_table[] = {0};
--#undef _nc_infoalias_table
--const struct alias _nc_infoalias_table[] = {0};
--
--#undef _nc_get_table
--const struct name_table_entry *_nc_get_table(
--		NCURSES_BOOL termcap)
--		{ return(*(const struct name_table_entry **)0); }
--
--#undef _nc_get_hash_table
--const struct name_table_entry *const *_nc_get_hash_table(
--		NCURSES_BOOL termcap)
--		{ return(*(const struct name_table_entry **)0); }
--
- /* ./tinfo/comp_error.c */
--
- #undef _nc_suppress_warnings
- NCURSES_BOOL _nc_suppress_warnings;
- #undef _nc_curr_line
-@@ -2975,134 +2980,6 @@
- 		...)
- 		{ /* void */ }
- 
--/* ./tinfo/comp_expand.c */
--
--#undef _nc_tic_expand
--char	*_nc_tic_expand(
--		const char *srcp, 
--		NCURSES_BOOL tic_format, 
--		int	numbers)
--		{ return(*(char **)0); }
--
--/* ./tinfo/comp_hash.c */
--
--#include <hashsize.h>
--
--#undef _nc_find_entry
--struct name_table_entry const *_nc_find_entry(
--		const char *string, 
--		const struct name_table_entry *const *hash_table)
--		{ return(*(struct name_table_entry const **)0); }
--
--#undef _nc_find_type_entry
--struct name_table_entry const *_nc_find_type_entry(
--		const char *string, 
--		int	type, 
--		const struct name_table_entry *table)
--		{ return(*(struct name_table_entry const **)0); }
--
--/* ./tinfo/comp_parse.c */
--
--#undef _nc_check_termtype2
--void	(*_nc_check_termtype2)(
--		TERMTYPE *p1, 
--		NCURSES_BOOL p2);
--#undef _nc_check_termtype
--void	(*_nc_check_termtype)(
--		TERMTYPE *p1);
--#undef _nc_head
--ENTRY	*_nc_head;
--#undef _nc_tail
--ENTRY	*_nc_tail;
--
--#undef _nc_free_entries
--void	_nc_free_entries(
--		ENTRY	*headp)
--		{ /* void */ }
--
--#undef _nc_delink_entry
--ENTRY	*_nc_delink_entry(
--		ENTRY	*headp, 
--		TERMTYPE *tterm)
--		{ return(*(ENTRY **)0); }
--
--#undef _nc_free_entry
--void	_nc_free_entry(
--		ENTRY	*headp, 
--		TERMTYPE *tterm)
--		{ /* void */ }
--
--#undef _nc_entry_match
--NCURSES_BOOL _nc_entry_match(
--		char	*n1, 
--		char	*n2)
--		{ return(*(NCURSES_BOOL *)0); }
--
--#undef _nc_read_entry_source
--void	_nc_read_entry_source(
--		FILE	*fp, 
--		char	*buf, 
--		int	literal, 
--		NCURSES_BOOL silent, 
--		NCURSES_BOOL (*hook)(
--		ENTRY	*p1))
--		{ /* void */ }
--
--#undef _nc_resolve_uses2
--int	_nc_resolve_uses2(
--		NCURSES_BOOL fullresolve, 
--		NCURSES_BOOL literal)
--		{ return(*(int *)0); }
--
--#undef _nc_resolve_uses
--int	_nc_resolve_uses(
--		NCURSES_BOOL fullresolve)
--		{ return(*(int *)0); }
--
--/* ./tinfo/comp_scan.c */
--
--#undef _nc_syntax
--int	_nc_syntax;
--#undef _nc_curr_file_pos
--long	_nc_curr_file_pos;
--#undef _nc_comment_start
--long	_nc_comment_start;
--#undef _nc_comment_end
--long	_nc_comment_end;
--#undef _nc_start_line
--long	_nc_start_line;
--#undef _nc_curr_token
--struct token _nc_curr_token;
--#undef _nc_disable_period
--NCURSES_BOOL _nc_disable_period;
--
--#undef _nc_reset_input
--void	_nc_reset_input(
--		FILE	*fp, 
--		char	*buf)
--		{ /* void */ }
--
--#undef _nc_get_token
--int	_nc_get_token(
--		NCURSES_BOOL silent)
--		{ return(*(int *)0); }
--
--#undef _nc_trans_string
--int	_nc_trans_string(
--		char	*ptr, 
--		char	*last)
--		{ return(*(int *)0); }
--
--#undef _nc_push_token
--void	_nc_push_token(
--		int	tokclass)
--		{ /* void */ }
--
--#undef _nc_panic_mode
--void	_nc_panic_mode(
--		char	ch)
--		{ /* void */ }
--
- /* ./tinfo/db_iterator.c */
- 
- #undef _nc_tic_dir
-@@ -3139,6 +3016,34 @@
- 		size_t	amount)
- 		{ return(*(void **)0); }
- 
-+/* ./tinfo/entries.c */
-+
-+#undef _nc_head
-+ENTRY	*_nc_head;
-+#undef _nc_tail
-+ENTRY	*_nc_tail;
-+
-+#undef _nc_free_entry
-+void	_nc_free_entry(
-+		ENTRY	*headp, 
-+		TERMTYPE *tterm)
-+		{ /* void */ }
-+
-+#undef _nc_free_entries
-+void	_nc_free_entries(
-+		ENTRY	*headp)
-+		{ /* void */ }
-+
-+#undef _nc_delink_entry
-+ENTRY	*_nc_delink_entry(
-+		ENTRY	*headp, 
-+		TERMTYPE *tterm)
-+		{ return(*(ENTRY **)0); }
-+
-+#undef _nc_leaks_tinfo
-+void	_nc_leaks_tinfo(void)
-+		{ /* void */ }
-+
- /* ./fallback.c */
- 
- #undef _nc_fallback
-@@ -3181,7 +3086,7 @@
- #include <init_keytry.h>
- 
- #undef _nc_tinfo_fkeys
--struct tinfo_fkeys _nc_tinfo_fkeys[];
-+const struct tinfo_fkeys _nc_tinfo_fkeys[] = {0};
- 
- #endif
- 
-@@ -3248,6 +3153,10 @@
- SCREEN	*_nc_screen_chain;
- #undef SP
- SCREEN	*SP;
-+#undef _nc_globals
-+NCURSES_GLOBALS _nc_globals;
-+#undef _nc_prescreen
-+NCURSES_PRESCREEN _nc_prescreen;
- 
- /* ./tinfo/lib_has_cap.c */
- 
-@@ -3275,19 +3184,13 @@
- 
- /* ./lib_keyname.c */
- 
--#undef _nc_key_names
--const struct kn _nc_key_names[] = {0};
-+struct kn { short offset; int code; };
- 
- #undef keyname
- char	*keyname(
- 		int	c)
- 		{ return(*(char **)0); }
- 
--#undef key_name
--char	*key_name(
--		wchar_t	c)
--		{ return(*(char **)0); }
--
- /* ./tinfo/lib_longname.c */
- 
- #undef longname
-@@ -3421,7 +3324,7 @@
- 
- #undef _nc_handle_sigwinch
- int	_nc_handle_sigwinch(
--		int	enable)
-+		int	update)
- 		{ return(*(int *)0); }
- 
- #undef use_env
-@@ -3429,6 +3332,12 @@
- 		NCURSES_BOOL f)
- 		{ /* void */ }
- 
-+#undef _nc_get_screensize
-+void	_nc_get_screensize(
-+		int	*linep, 
-+		int	*colp)
-+		{ /* void */ }
-+
- #undef _nc_update_screensize
- void	_nc_update_screensize(void)
- 		{ /* void */ }
-@@ -3529,14 +3438,6 @@
- 
- /* ./tinfo/lib_tparm.c */
- 
--typedef struct {
--    union {
-- int num;
-- char *str;
--    } data;
--    NCURSES_BOOL num_type;
--} stack_frame;
--
- #undef _nc_tparm_err
- int	_nc_tparm_err;
- 
-@@ -3802,26 +3703,6 @@
- #undef strfnames
- char	*const strfnames[] = {0};
- 
--/* ./tinfo/parse_entry.c */
--
--#undef _nc_parse_entry
--int	_nc_parse_entry(
--		struct entry *entryp, 
--		int	literal, 
--		NCURSES_BOOL silent)
--		{ return(*(int *)0); }
--
--#undef _nc_capcmp
--int	_nc_capcmp(
--		const char *s, 
--		const char *t)
--		{ return(*(int *)0); }
--
--typedef struct {
--    const char *from;
--    const char *to;
--} assoc;
--
- /* ./tinfo/read_entry.c */
- 
- #include <hashed_db.h>
-@@ -3899,11 +3780,6 @@
- 
- /* ./trace/trace_buf.c */
- 
--typedef struct {
--    char *text;
--    size_t size;
--} LIST;
--
- #undef _nc_trace_buf
- char	*_nc_trace_buf(
- 		int	bufnum, 
-@@ -3920,14 +3796,14 @@
- 
- #undef _nc_trace_tries
- void	_nc_trace_tries(
--		struct tries *tree)
-+		TRIES	*tree)
- 		{ /* void */ }
- 
- /* ./base/tries.c */
- 
- #undef _nc_expand_try
- char	*_nc_expand_try(
--		struct tries *tree, 
-+		TRIES	*tree, 
- 		unsigned code, 
- 		int	*count, 
- 		size_t	len)
-@@ -3935,13 +3811,13 @@
- 
- #undef _nc_remove_key
- int	_nc_remove_key(
--		struct tries **tree, 
-+		TRIES	**tree, 
- 		unsigned code)
- 		{ return(*(int *)0); }
- 
- #undef _nc_remove_string
- int	_nc_remove_string(
--		struct tries **tree, 
-+		TRIES	**tree, 
- 		const char *string)
- 		{ return(*(int *)0); }
- 
-@@ -4013,6 +3889,195 @@
- 		int	len)
- 		{ return(*(const char **)0); }
- 
-+/* ./tinfo/alloc_entry.c */
-+
-+#undef _nc_init_entry
-+void	_nc_init_entry(
-+		TERMTYPE *const tp)
-+		{ /* void */ }
-+
-+#undef _nc_copy_entry
-+ENTRY	*_nc_copy_entry(
-+		ENTRY	*oldp)
-+		{ return(*(ENTRY **)0); }
-+
-+#undef _nc_save_str
-+char	*_nc_save_str(
-+		const char *const string)
-+		{ return(*(char **)0); }
-+
-+#undef _nc_wrap_entry
-+void	_nc_wrap_entry(
-+		ENTRY	*const ep, 
-+		NCURSES_BOOL copy_strings)
-+		{ /* void */ }
-+
-+#undef _nc_merge_entry
-+void	_nc_merge_entry(
-+		TERMTYPE *const to, 
-+		TERMTYPE *const from)
-+		{ /* void */ }
-+
-+/* ./tinfo/captoinfo.c */
-+
-+#undef _nc_captoinfo
-+char	*_nc_captoinfo(
-+		const char *cap, 
-+		const char *s, 
-+		int const parameterized)
-+		{ return(*(char **)0); }
-+
-+#undef _nc_infotocap
-+char	*_nc_infotocap(
-+		const char *cap, 
-+		const char *str, 
-+		int const parameterized)
-+		{ return(*(char **)0); }
-+
-+/* ./comp_captab.c */
-+
-+#include <hashsize.h>
-+
-+#undef _nc_get_table
-+const struct name_table_entry *_nc_get_table(
-+		NCURSES_BOOL termcap)
-+		{ return(*(const struct name_table_entry **)0); }
-+
-+#undef _nc_get_hash_table
-+const short *_nc_get_hash_table(
-+		NCURSES_BOOL termcap)
-+		{ return(*(const short **)0); }
-+
-+#undef _nc_get_alias_table
-+const struct alias *_nc_get_alias_table(
-+		NCURSES_BOOL termcap)
-+		{ return(*(const struct alias **)0); }
-+
-+/* ./tinfo/comp_expand.c */
-+
-+#undef _nc_tic_expand
-+char	*_nc_tic_expand(
-+		const char *srcp, 
-+		NCURSES_BOOL tic_format, 
-+		int	numbers)
-+		{ return(*(char **)0); }
-+
-+/* ./tinfo/comp_hash.c */
-+
-+#undef _nc_find_entry
-+struct name_table_entry const *_nc_find_entry(
-+		const char *string, 
-+		const short *hash_table)
-+		{ return(*(struct name_table_entry const **)0); }
-+
-+#undef _nc_find_type_entry
-+struct name_table_entry const *_nc_find_type_entry(
-+		const char *string, 
-+		int	type, 
-+		const struct name_table_entry *table)
-+		{ return(*(struct name_table_entry const **)0); }
-+
-+/* ./tinfo/comp_parse.c */
-+
-+#undef _nc_check_termtype2
-+void	(*_nc_check_termtype2)(
-+		TERMTYPE *p1, 
-+		NCURSES_BOOL p2);
-+#undef _nc_check_termtype
-+void	(*_nc_check_termtype)(
-+		TERMTYPE *p1);
-+
-+#undef _nc_entry_match
-+NCURSES_BOOL _nc_entry_match(
-+		char	*n1, 
-+		char	*n2)
-+		{ return(*(NCURSES_BOOL *)0); }
-+
-+#undef _nc_read_entry_source
-+void	_nc_read_entry_source(
-+		FILE	*fp, 
-+		char	*buf, 
-+		int	literal, 
-+		NCURSES_BOOL silent, 
-+		NCURSES_BOOL (*hook)(
-+		ENTRY	*p1))
-+		{ /* void */ }
-+
-+#undef _nc_resolve_uses2
-+int	_nc_resolve_uses2(
-+		NCURSES_BOOL fullresolve, 
-+		NCURSES_BOOL literal)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_resolve_uses
-+int	_nc_resolve_uses(
-+		NCURSES_BOOL fullresolve)
-+		{ return(*(int *)0); }
-+
-+/* ./tinfo/comp_scan.c */
-+
-+#undef _nc_syntax
-+int	_nc_syntax;
-+#undef _nc_curr_file_pos
-+long	_nc_curr_file_pos;
-+#undef _nc_comment_start
-+long	_nc_comment_start;
-+#undef _nc_comment_end
-+long	_nc_comment_end;
-+#undef _nc_start_line
-+long	_nc_start_line;
-+#undef _nc_curr_token
-+struct token _nc_curr_token;
-+#undef _nc_disable_period
-+NCURSES_BOOL _nc_disable_period;
-+
-+#undef _nc_reset_input
-+void	_nc_reset_input(
-+		FILE	*fp, 
-+		char	*buf)
-+		{ /* void */ }
-+
-+#undef _nc_get_token
-+int	_nc_get_token(
-+		NCURSES_BOOL silent)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_trans_string
-+int	_nc_trans_string(
-+		char	*ptr, 
-+		char	*last)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_push_token
-+void	_nc_push_token(
-+		int	tokclass)
-+		{ /* void */ }
-+
-+#undef _nc_panic_mode
-+void	_nc_panic_mode(
-+		char	ch)
-+		{ /* void */ }
-+
-+/* ./tinfo/parse_entry.c */
-+
-+#undef _nc_parse_entry
-+int	_nc_parse_entry(
-+		struct entry *entryp, 
-+		int	literal, 
-+		NCURSES_BOOL silent)
-+		{ return(*(int *)0); }
-+
-+#undef _nc_capcmp
-+int	_nc_capcmp(
-+		const char *s, 
-+		const char *t)
-+		{ return(*(int *)0); }
-+
-+typedef struct {
-+    const char *from;
-+    const char *to;
-+} assoc;
-+
- /* ./tinfo/write_entry.c */
- 
- #undef _nc_set_writedir
-diff -Naur ncurses-5.6.orig/ncurses/modules ncurses-5.6/ncurses/modules
---- ncurses-5.6.orig/ncurses/modules	2006-08-12 10:19:44.000000000 -0400
-+++ ncurses-5.6/ncurses/modules	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
--# $Id: modules,v 1.107 2006/08/12 14:19:44 tom Exp $
-+# $Id: modules,v 1.112 2007/09/08 22:03:34 tom Exp $
- ##############################################################################
--# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -127,14 +127,15 @@
- lib_add_wch	lib		$(wide)
- lib_box_set	lib		$(wide)
- lib_cchar	lib		$(wide)
--lib_get_wch	lib		$(wide)
- lib_erasewchar	lib		$(wide)
-+lib_get_wch	lib		$(wide)
- lib_get_wstr	lib		$(wide)
- lib_hline_set	lib		$(wide)
- lib_in_wch	lib		$(wide)
- lib_in_wchnstr	lib		$(wide)
- lib_ins_wch	lib		$(wide)
- lib_inwstr	lib		$(wide)
-+lib_key_name	lib		$(wide)
- lib_pecho_wchar	lib		$(wide)
- lib_slk_wset	lib		$(wide)
- lib_unget_wch	lib		$(wide)
-@@ -151,24 +152,20 @@
- lib_print	lib		$(tinfo)	../include/term.h
- resizeterm	lib		$(base)		../include/term.h
- trace_xnames	lib		$(trace)	../include/term.h $(INCDIR)/term_entry.h
-+use_screen	lib		$(tinfo)
-+use_window	lib		$(base)
- wresize		lib		$(base)		../include/term.h
- 
- # Support for termcap (and tic, etc.), which can be a separate library
- @ termlib
- access		lib		$(tinfo)
- add_tries	lib		$(tinfo)
--alloc_entry	lib		$(tinfo)	../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
- alloc_ttype	lib		$(tinfo)	../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
--captoinfo	lib		$(tinfo)	$(INCDIR)/tic.h
- codes		lib		.
--comp_captab	lib		.		$(INCDIR)/tic.h ../include/term.h ../include/hashsize.h
- comp_error	lib		$(tinfo)	$(INCDIR)/tic.h
--comp_expand	lib		$(tinfo)	$(INCDIR)/tic.h
--comp_hash	lib		$(tinfo)	../include/term.h $(INCDIR)/tic.h ../include/hashsize.h
--comp_parse	lib		$(tinfo)	../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
--comp_scan	lib		$(tinfo)	$(INCDIR)/tic.h
- db_iterator	lib		$(tinfo)	$(INCDIR)/tic.h
- doalloc		lib		$(tinfo)
-+entries		lib		$(tinfo)	../include/term.h $(INCDIR)/tic.h
- fallback	lib		.		../include/term.h $(INCDIR)/tic.h
- free_ttype	lib		$(tinfo)	../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
- getenv_num	lib		$(tinfo)
-@@ -200,7 +197,6 @@
- lib_twait	lib		$(serial)
- name_match	lib		$(tinfo)	../include/term.h $(INCDIR)/tic.h
- names		lib		.
--parse_entry	lib		$(tinfo)	../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h ../include/parametrized.h $(INCDIR)/capdefaults.c
- read_entry	lib		$(tinfo)	../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
- read_termcap	lib		$(tinfo)	../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
- setbuf		lib		$(tinfo)
-@@ -211,6 +207,17 @@
- trim_sgr0	lib		$(tinfo)	../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
- unctrl		lib		.
- visbuf		lib		$(trace)	$(INCDIR)/tic.h
-+
-+# Modules used only for tic, other programs using internal interfaces
-+@ ticlib
-+alloc_entry	lib		$(tinfo)	../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
-+captoinfo	lib		$(tinfo)	$(INCDIR)/tic.h
-+comp_captab	lib		.		$(INCDIR)/tic.h ../include/term.h ../include/hashsize.h
-+comp_expand	lib		$(tinfo)	$(INCDIR)/tic.h
-+comp_hash	lib		$(tinfo)	../include/term.h $(INCDIR)/tic.h ../include/hashsize.h
-+comp_parse	lib		$(tinfo)	../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
-+comp_scan	lib		$(tinfo)	$(INCDIR)/tic.h
-+parse_entry	lib		$(tinfo)	../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h ../include/parametrized.h $(INCDIR)/capdefaults.c
- write_entry	lib		$(tinfo)	../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
- 
- # Extensions to the termlib library
-@@ -221,3 +228,5 @@
- keybound	lib		$(base)
- keyok		lib		$(base)
- version		lib		$(base)
-+
-+# vile:makemode
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/MKcaptab.awk ncurses-5.6/ncurses/tinfo/MKcaptab.awk
---- ncurses-5.6.orig/ncurses/tinfo/MKcaptab.awk	2006-04-22 17:46:17.000000000 -0400
-+++ ncurses-5.6/ncurses/tinfo/MKcaptab.awk	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,5 @@
--#!/bin/sh
- ##############################################################################
--# Copyright (c) 1998-2000,2006 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -26,73 +25,70 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: MKcaptab.awk,v 1.13 2006/04/22 21:46:17 tom Exp $
--AWK=${1-awk}
--DATA=${2-../include/Caps}
--
--cat <<'EOF'
--/*
-- *	comp_captab.c -- The names of the capabilities indexed via a hash
-- *		         table for the compiler.
-- *
-- */
--
--#include <ncurses_cfg.h>
--#include <curses.priv.h>
--#include <tic.h>
--#include <term.h>
--
--EOF
--
--./make_hash 1 info <$DATA
--./make_hash 3 cap  <$DATA
--
--cat <<'EOF'
--const struct alias _nc_capalias_table[] =
--{
--EOF
-+# $Id: MKcaptab.awk,v 1.20 2007/08/12 00:26:15 tom Exp $
-+function add_string(text) {
-+    if (text != "IGNORE") {
-+	offsets[num_strings] = offset;
-+	offset = offset + length(text) + 1;
-+	printf "%s\\0", text;
-+    } else {
-+	offsets[num_strings] = -1;
-+    }
-+    num_strings = num_strings + 1;
-+    if ((num_strings % 3) == 0) {
-+	printf "\\\n";
-+    }
-+    return offsets[num_strings - 1];
-+}
-+BEGIN {
-+	first = 1;
-+	num_aliases = 0;
-+	num_strings = 0;
-+	offset = 0;
-+}
- 
--$AWK <$DATA '
--$1 == "capalias"	{
--		    if ($3 == "IGNORE")
--			to = "(char *)NULL";
--		    else
--			to = "\"" $3 "\"";
--		    printf "\t{\"%s\", %s, \"%s\"},\t /* %s */\n",
--				$2, to, $4, $5
-+/^[^#]/ {
-+	    if (first) {
-+		printf "/* generated by MKcaptab.awk %s(%d) */\n", tablename, bigstrings;
-+		print ""
-+		if (bigstrings) {
-+		    printf "static struct alias *_nc_%s_table = 0;\n", tablename;
-+		    print "";
-+		    printf "static const char %s_text[] = \"\\\n", tablename;
-+		} else {
-+		    printf "static const struct alias _nc_%s_table[] =\n", tablename;
-+		    printf "{\n";
- 		}
--'
--
--cat <<'EOF'
--	{(char *)NULL, (char *)NULL, (char *)NULL}
--};
--
--const struct alias _nc_infoalias_table[] =
--{
--EOF
--
--$AWK <$DATA '
--$1 == "infoalias"	{
--		    if ($3 == "IGNORE")
--			to = "(char *)NULL";
--		    else
--			to = "\"" $3 "\"";
--		    printf "\t{\"%s\", %s, \"%s\"},\t /* %s */\n",
--				$2, to, $4, $5
-+		first = 0;
-+	    }
-+	    if ($1 == tablename) {
-+		if ($3 == "IGNORE") {
-+		    to = "(char *)NULL";
-+		} else {
-+		    to = "\"" $3 "\"";
- 		}
--'
--
--cat <<'EOF'
--	{(char *)NULL, (char *)NULL, (char *)NULL}
--};
--
--NCURSES_EXPORT(const struct name_table_entry *) _nc_get_table (bool termcap)
--{
--	return termcap ? _nc_cap_table: _nc_info_table ;
--}
--
--NCURSES_EXPORT(const struct name_table_entry * const *) _nc_get_hash_table (bool termcap)
--{
--	return termcap ? _nc_cap_hash_table: _nc_info_hash_table ;
--}
--EOF
-+		if (bigstrings) {
-+		    c1 = add_string($2);
-+		    c2 = add_string($3);
-+		    c3 = add_string($4);
-+		    aliases[num_aliases] = sprintf("\t{%5d, %5d, %5d},\t /* %s */", c1, c2, c3, $5);
-+		    num_aliases = num_aliases + 1;
-+		} else {
-+		    printf "\t{\"%s\", %s, \"%s\"},\t /* %s */\n", $2, to, $4, $5;
-+		}
-+	    }
-+	}
-+END	{
-+	    if (bigstrings) {
-+		printf "\";\n\n";
-+		printf "static const alias_table_data %s_data[] = {\n", tablename;
-+		for (n = 0; n < num_aliases; ++n) {
-+		    printf "%s\n", aliases[n];
-+		}
-+		printf "};\n\n";
-+	    } else {
-+		printf "\t{(char *)NULL, (char *)NULL, (char *)NULL}\n";
-+		printf "};\n\n";
-+	    }
-+	}
-+# vile:sw=4:
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/MKcaptab.sh ncurses-5.6/ncurses/tinfo/MKcaptab.sh
---- ncurses-5.6.orig/ncurses/tinfo/MKcaptab.sh	1969-12-31 19:00:00.000000000 -0500
-+++ ncurses-5.6/ncurses/tinfo/MKcaptab.sh	2008-06-18 06:49:44.000000000 -0400
-@@ -0,0 +1,149 @@
-+#!/bin/sh
-+##############################################################################
-+# Copyright (c) 2007 Free Software Foundation, Inc.                          #
-+#                                                                            #
-+# Permission is hereby granted, free of charge, to any person obtaining a    #
-+# copy of this software and associated documentation files (the "Software"), #
-+# to deal in the Software without restriction, including without limitation  #
-+# the rights to use, copy, modify, merge, publish, distribute, distribute    #
-+# with modifications, sublicense, and/or sell copies of the Software, and to #
-+# permit persons to whom the Software is furnished to do so, subject to the  #
-+# following conditions:                                                      #
-+#                                                                            #
-+# The above copyright notice and this permission notice shall be included in #
-+# all copies or substantial portions of the Software.                        #
-+#                                                                            #
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,   #
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL    #
-+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER      #
-+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING    #
-+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER        #
-+# DEALINGS IN THE SOFTWARE.                                                  #
-+#                                                                            #
-+# Except as contained in this notice, the name(s) of the above copyright     #
-+# holders shall not be used in advertising or otherwise to promote the sale, #
-+# use or other dealings in this Software without prior written               #
-+# authorization.                                                             #
-+##############################################################################
-+# $Id: MKcaptab.sh,v 1.8 2007/08/12 13:13:51 tom Exp $
-+AWK=${1-awk}
-+OPT1=${2-0}
-+OPT2=${3-tinfo/MKcaptab.awk}
-+DATA=${4-../include/Caps}
-+
-+cat <<'EOF'
-+/*
-+ *	comp_captab.c -- The names of the capabilities indexed via a hash
-+ *		         table for the compiler.
-+ *
-+ */
-+
-+#include <curses.priv.h>
-+#include <tic.h>
-+#include <hashsize.h>
-+
-+EOF
-+
-+./make_hash 1 info $OPT1 <$DATA
-+./make_hash 3 cap  $OPT1 <$DATA
-+
-+$AWK -f $OPT2 bigstrings=$OPT1 tablename=capalias <$DATA 
-+
-+$AWK -f $OPT2 bigstrings=$OPT1 tablename=infoalias <$DATA
-+
-+cat <<EOF
-+
-+#if $OPT1
-+static void
-+next_string(const char *strings, unsigned *offset)
-+{
-+	*offset += strlen(strings + *offset) + 1;
-+}
-+
-+static const struct name_table_entry *
-+_nc_build_names(struct name_table_entry **actual,
-+		const name_table_data *source,
-+		const char *strings)
-+{
-+	if (*actual == 0) {
-+		*actual = typeCalloc(struct name_table_entry, CAPTABSIZE);
-+		if (*actual != 0) {
-+			unsigned n;
-+			unsigned len = 0;
-+			for (n = 0; n < CAPTABSIZE; ++n) {
-+				(*actual)[n].nte_name = strings + len;
-+				(*actual)[n].nte_type = source[n].nte_type;
-+				(*actual)[n].nte_index = source[n].nte_index;
-+				(*actual)[n].nte_link = source[n].nte_link;
-+				next_string(strings, &len);
-+			}
-+		}
-+	}
-+	return *actual;
-+}
-+
-+#define add_alias(field) \\
-+	if (source[n].field >= 0) { \\
-+		(*actual)[n].field = strings + source[n].field; \\
-+	}
-+
-+static const struct alias *
-+_nc_build_alias(struct alias **actual,
-+		const alias_table_data *source,
-+		const char *strings,
-+		unsigned tablesize)
-+{
-+	if (*actual == 0) {
-+		*actual = typeCalloc(struct alias, tablesize + 1);
-+		if (*actual != 0) {
-+			unsigned n;
-+			for (n = 0; n < tablesize; ++n) {
-+				add_alias(from);
-+				add_alias(to);
-+				add_alias(source);
-+			}
-+		}
-+	}
-+	return *actual;
-+}
-+
-+#define build_names(root) _nc_build_names(&_nc_##root##_table, \\
-+					  root##_names_data, \\
-+					  root##_names_text)
-+#define build_alias(root) _nc_build_alias(&_nc_##root##alias_table, \\
-+					  root##alias_data, \\
-+					  root##alias_text, \\
-+					  SIZEOF(root##alias_data))
-+#else
-+#define build_names(root) _nc_ ## root ## _table
-+#define build_alias(root) _nc_ ## root ## alias_table
-+#endif
-+
-+NCURSES_EXPORT(const struct name_table_entry *) _nc_get_table (bool termcap)
-+{
-+	return termcap ? build_names(cap) : build_names(info) ;
-+}
-+
-+NCURSES_EXPORT(const short *) _nc_get_hash_table (bool termcap)
-+{
-+	return termcap ? _nc_cap_hash_table: _nc_info_hash_table ;
-+}
-+
-+NCURSES_EXPORT(const struct alias *) _nc_get_alias_table (bool termcap)
-+{
-+	return termcap ? build_alias(cap) : build_alias(info) ;
-+}
-+
-+#if NO_LEAKS
-+NCURSES_EXPORT(void) _nc_comp_captab_leaks(void)
-+{
-+#if $OPT1
-+	FreeIfNeeded(_nc_cap_table);
-+	FreeIfNeeded(_nc_info_table);
-+	FreeIfNeeded(_nc_capalias_table);
-+	FreeIfNeeded(_nc_infoalias_table);
-+#endif
-+}
-+#endif /* NO_LEAKS */
-+EOF
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/MKcodes.awk ncurses-5.6/ncurses/tinfo/MKcodes.awk
---- ncurses-5.6.orig/ncurses/tinfo/MKcodes.awk	1969-12-31 19:00:00.000000000 -0500
-+++ ncurses-5.6/ncurses/tinfo/MKcodes.awk	2008-06-18 06:49:44.000000000 -0400
-@@ -0,0 +1,161 @@
-+##############################################################################
-+# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
-+#                                                                            #
-+# Permission is hereby granted, free of charge, to any person obtaining a    #
-+# copy of this software and associated documentation files (the "Software"), #
-+# to deal in the Software without restriction, including without limitation  #
-+# the rights to use, copy, modify, merge, publish, distribute, distribute    #
-+# with modifications, sublicense, and/or sell copies of the Software, and to #
-+# permit persons to whom the Software is furnished to do so, subject to the  #
-+# following conditions:                                                      #
-+#                                                                            #
-+# The above copyright notice and this permission notice shall be included in #
-+# all copies or substantial portions of the Software.                        #
-+#                                                                            #
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,   #
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL    #
-+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER      #
-+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING    #
-+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER        #
-+# DEALINGS IN THE SOFTWARE.                                                  #
-+#                                                                            #
-+# Except as contained in this notice, the name(s) of the above copyright     #
-+# holders shall not be used in advertising or otherwise to promote the sale, #
-+# use or other dealings in this Software without prior written               #
-+# authorization.                                                             #
-+##############################################################################
-+# $Id: MKcodes.awk,v 1.4 2007/11/03 20:24:15 tom Exp $
-+function large_item(value) {
-+	result = sprintf("%d,", offset);
-+	offset = offset + length(value) + 1;
-+	offcol = offcol + length(result) + 2;
-+	if (offcol > 70) {
-+		result = result "\n";
-+		offcol = 0;
-+	} else {
-+		result = result " ";
-+	}
-+	bigstr = bigstr sprintf("\"%s\\0\" ", value);
-+	bigcol = bigcol + length(value) + 5;
-+	if (bigcol > 70) {
-+		bigstr = bigstr "\\\n";
-+		bigcol = 0;
-+	}
-+	return result;
-+}
-+
-+function small_item(value) {
-+	return sprintf("\t\t\"%s\",\n", value);
-+}
-+
-+function print_strings(name,value) {
-+	printf  "DCL(%s) = {\n", name
-+	print  value
-+	print  "\t\t(NCURSES_CONST char *)0,"
-+	print  "};"
-+	print  ""
-+}
-+
-+function print_offsets(name,value) {
-+	printf  "static const short _nc_offset_%s[] = {\n", name
-+	printf "%s",  value
-+	print  "};"
-+	print  ""
-+	printf "static NCURSES_CONST char ** ptr_%s = 0;\n", name
-+	print  ""
-+}
-+
-+BEGIN	{
-+		print  "/* This file was generated by MKcodes.awk */"
-+		print  ""
-+		print  "#include <curses.priv.h>"
-+		print  ""
-+		print  "#define IT NCURSES_CONST char * const"
-+		print  ""
-+		offset = 0;
-+		offcol = 0;
-+		bigcol = 0;
-+	}
-+
-+$1 ~ /^#/		{next;}
-+
-+$1 == "SKIPWARN"	{next;}
-+
-+$3 == "bool"	{
-+			small_boolcodes = small_boolcodes small_item($4);
-+			large_boolcodes = large_boolcodes large_item($4);
-+		}
-+
-+$3 == "num"	{
-+			small_numcodes = small_numcodes small_item($4);
-+			large_numcodes = large_numcodes large_item($4);
-+		}
-+
-+$3 == "str"	{
-+			small_strcodes = small_strcodes small_item($4);
-+			large_strcodes = large_strcodes large_item($4);
-+		}
-+
-+END	{
-+		print  ""
-+		print  "#if BROKEN_LINKER || USE_REENTRANT"
-+		print  ""
-+		print  "#include <term.h>"
-+		print  ""
-+		if (bigstrings) {
-+			printf "static const char _nc_code_blob[] = \n"
-+			printf "%s;\n", bigstr;
-+			print_offsets("boolcodes", large_boolcodes);
-+			print_offsets("numcodes", large_numcodes);
-+			print_offsets("strcodes", large_strcodes);
-+			print  ""
-+			print  "static IT *"
-+			print  "alloc_array(NCURSES_CONST char ***value, const short *offsets, unsigned size)"
-+			print  "{"
-+			print  "	if (*value == 0) {"
-+			print  "		if ((*value = typeCalloc(NCURSES_CONST char *, size + 1)) != 0) {"
-+			print  "			unsigned n;"
-+			print  "			for (n = 0; n < size; ++n) {"
-+			print  "				(*value)[n] = _nc_code_blob + offsets[n];"
-+			print  "			}"
-+			print  "		}"
-+			print  "	}"
-+			print  "	return *value;"
-+			print  "}"
-+			print  ""
-+			print  "#define FIX(it) NCURSES_IMPEXP IT * NCURSES_API _nc_##it(void) { return alloc_array(&ptr_##it, _nc_offset_##it, SIZEOF(_nc_offset_##it)); }"
-+		} else {
-+			print  "#define DCL(it) static IT data##it[]"
-+			print  ""
-+			print_strings("boolcodes", small_boolcodes);
-+			print_strings("numcodes", small_numcodes);
-+			print_strings("strcodes", small_strcodes);
-+			print  "#define FIX(it) NCURSES_IMPEXP IT * NCURSES_API _nc_##it(void) { return data##it; }"
-+		}
-+		print  ""
-+		print  "FIX(boolcodes)"
-+		print  "FIX(numcodes)"
-+		print  "FIX(strcodes)"
-+		print  ""
-+		print  "#define FREE_FIX(it) if (ptr_##it) { FreeAndNull(ptr_##it); }"
-+		print  ""
-+		print  "NCURSES_EXPORT(void)"
-+		print  "_nc_codes_leaks(void)"
-+		print  "{"
-+		if (bigstrings) {
-+		print  "FREE_FIX(boolcodes)"
-+		print  "FREE_FIX(numcodes)"
-+		print  "FREE_FIX(strcodes)"
-+		}
-+		print  "}"
-+		print  "#else"
-+		print  ""
-+		print  "#define DCL(it) NCURSES_EXPORT_VAR(IT) it[]"
-+		print  ""
-+		print_strings("boolcodes", small_boolcodes);
-+		print_strings("numcodes", small_numcodes);
-+		print_strings("strcodes", small_strcodes);
-+		print  ""
-+		print  "#endif /* BROKEN_LINKER */"
-+	}
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/MKnames.awk ncurses-5.6/ncurses/tinfo/MKnames.awk
---- ncurses-5.6.orig/ncurses/tinfo/MKnames.awk	2006-04-22 17:46:17.000000000 -0400
-+++ ncurses-5.6/ncurses/tinfo/MKnames.awk	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- ##############################################################################
--# Copyright (c) 1998-2000,2006 Free Software Foundation, Inc.                #
-+# Copyright (c) 2007 Free Software Foundation, Inc.                          #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -25,101 +25,159 @@
- # use or other dealings in this Software without prior written               #
- # authorization.                                                             #
- ##############################################################################
--# $Id: MKnames.awk,v 1.12 2006/04/22 21:46:17 tom Exp $
--BEGIN		{
--			print  "/* This file was generated by MKnames.awk */" > "namehdr"
--			print  ""				> "namehdr"
--			print  "#include <curses.priv.h>"	> "namehdr"
--			print  ""				> "namehdr"
--			print  "#define IT NCURSES_CONST char * const"	> "namehdr"
--			print  ""				> "namehdr"
--			print  "#if BROKEN_LINKER"		> "namehdr"
--			print  "#include <term.h>"		> "namehdr"
--			print  "#define DCL(it) static IT data##it[]" > "namehdr"
--			print  "#else"				> "namehdr"
--			print  "#define DCL(it) NCURSES_EXPORT_VAR(IT) it[]"	> "namehdr"
--			print  "#endif"				> "namehdr"
--			print  ""				> "namehdr"
--			print  "/*"				> "boolnames"
--			print  " *	names.c - Arrays of capability names and codes"  > "boolnames"
--			print  " *"				> "boolnames"
--			print  " */"				> "boolnames"
--			print  ""				> "boolnames"
--			print  "DCL(boolnames)  = {"		> "boolnames"
--			print  "DCL(boolfnames) = {"		> "boolfnames"
--			print  "DCL(boolcodes)  = {"		> "boolcodes"
--			print  "DCL(numnames)   = {"		> "numnames"
--			print  "DCL(numfnames)  = {"		> "numfnames"
--			print  "DCL(numcodes)   = {"		> "numcodes"
--			print  "DCL(strnames)   = {"		> "strnames"
--			print  "DCL(strfnames)  = {"		> "strfnames"
--			print  "DCL(strcodes)   = {"		> "strcodes"
--		}
-+# $Id: MKnames.awk,v 1.18 2007/11/03 20:24:15 tom Exp $
-+function large_item(value) {
-+	result = sprintf("%d,", offset);
-+	offset = offset + length(value) + 1;
-+	offcol = offcol + length(result) + 2;
-+	if (offcol > 70) {
-+		result = result "\n";
-+		offcol = 0;
-+	} else {
-+		result = result " ";
-+	}
-+	bigstr = bigstr sprintf("\"%s\\0\" ", value);
-+	bigcol = bigcol + length(value) + 5;
-+	if (bigcol > 70) {
-+		bigstr = bigstr "\\\n";
-+		bigcol = 0;
-+	}
-+	return result;
-+}
-+
-+function small_item(value) {
-+	return sprintf("\t\t\"%s\",\n", value);
-+}
-+
-+function print_strings(name,value) {
-+	printf  "DCL(%s) = {\n", name
-+	print  value
-+	print  "\t\t(NCURSES_CONST char *)0,"
-+	print  "};"
-+	print  ""
-+}
-+
-+function print_offsets(name,value) {
-+	printf  "static const short _nc_offset_%s[] = {\n", name
-+	printf "%s",  value
-+	print  "};"
-+	print  ""
-+	printf "static NCURSES_CONST char ** ptr_%s = 0;\n", name
-+	print  ""
-+}
-+
-+BEGIN	{
-+		print  "/* This file was generated by MKnames.awk */"
-+		print  ""
-+		print  "#include <curses.priv.h>"
-+		print  ""
-+		print  "#define IT NCURSES_CONST char * const"
-+		print  ""
-+		offset = 0;
-+		offcol = 0;
-+		bigcol = 0;
-+	}
- 
- $1 ~ /^#/		{next;}
- 
- $1 == "SKIPWARN"	{next;}
- 
- $3 == "bool"	{
--			printf "\t\t\"%s\",\n", $2 > "boolnames"
--			printf "\t\t\"%s\",\n", $1 > "boolfnames"
--			printf "\t\t\"%s\",\n", $4 > "boolcodes"
-+			small_boolnames = small_boolnames small_item($2);
-+			large_boolnames = large_boolnames large_item($2);
-+			small_boolfnames = small_boolfnames small_item($1);
-+			large_boolfnames = large_boolfnames large_item($1);
- 		}
- 
- $3 == "num"	{
--			printf "\t\t\"%s\",\n", $2 > "numnames"
--			printf "\t\t\"%s\",\n", $1 > "numfnames"
--			printf "\t\t\"%s\",\n", $4 > "numcodes"
-+			small_numnames = small_numnames small_item($2);
-+			large_numnames = large_numnames large_item($2);
-+			small_numfnames = small_numfnames small_item($1);
-+			large_numfnames = large_numfnames large_item($1);
- 		}
- 
- $3 == "str"	{
--			printf "\t\t\"%s\",\n", $2 > "strnames"
--			printf "\t\t\"%s\",\n", $1 > "strfnames"
--			printf "\t\t\"%s\",\n", $4 > "strcodes"
-+			small_strnames = small_strnames small_item($2);
-+			large_strnames = large_strnames large_item($2);
-+			small_strfnames = small_strfnames small_item($1);
-+			large_strfnames = large_strfnames large_item($1);
- 		}
- 
--END		{
--			print  "\t\t(NCURSES_CONST char *)0," > "boolnames"
--			print  "};" > "boolnames"
--			print  "" > "boolnames"
--			print  "\t\t(NCURSES_CONST char *)0," > "boolfnames"
--			print  "};" > "boolfnames"
--			print  "" > "boolfnames"
--			print  "\t\t(NCURSES_CONST char *)0," > "boolcodes"
--			print  "};" > "boolcodes"
--			print  "" > "boolcodes"
--			print  "\t\t(NCURSES_CONST char *)0," > "numnames"
--			print  "};" > "numnames"
--			print  "" > "numnames"
--			print  "\t\t(NCURSES_CONST char *)0," > "numfnames"
--			print  "};" > "numfnames"
--			print  "" > "numfnames"
--			print  "\t\t(NCURSES_CONST char *)0," > "numcodes"
--			print  "};" > "numcodes"
--			print  "" > "numcodes"
--			print  "\t\t(NCURSES_CONST char *)0," > "strnames"
--			print  "};" > "strnames"
--			print  "" > "strnames"
--			print  "\t\t(NCURSES_CONST char *)0," > "strfnames"
--			print  "};" > "strfnames"
--			print  "" > "strfnames"
--			print  "\t\t(NCURSES_CONST char *)0," > "strcodes"
--			print  "};"				> "strcodes"
--			print  ""				> "strcodes"
--			print  "#if BROKEN_LINKER"		> "nameftr"
--			print  "#define FIX(it) NCURSES_IMPEXP IT * NCURSES_API _nc_##it(void) { return data##it; }" > "nameftr"
--			print  "FIX(boolnames)"			> "nameftr"
--			print  "FIX(boolfnames)"		> "nameftr"
--			print  "FIX(numnames)"			> "nameftr"
--			print  "FIX(numfnames)"			> "nameftr"
--			print  "FIX(strnames)"			> "nameftr"
--			print  "FIX(strfnames)"			> "nameftr"
--			print  "#endif /* BROKEN_LINKER */"	> "nameftr"
--			print  ""				> "codeftr"
--			print  "#if BROKEN_LINKER"		> "codeftr"
--			print  "#define FIX(it) NCURSES_IMPEXP IT * NCURSES_API _nc_##it(void) { return data##it; }" > "codeftr"
--			print  "FIX(boolcodes)"			> "codeftr"
--			print  "FIX(numcodes)"			> "codeftr"
--			print  "FIX(strcodes)"			> "codeftr"
--			print  "#endif /* BROKEN_LINKER */"	> "codeftr"
-+END	{
-+		print  ""
-+		print  "#if BROKEN_LINKER || USE_REENTRANT"
-+		print  ""
-+		print  "#include <term.h>"
-+		print  ""
-+		if (bigstrings) {
-+			printf "static const char _nc_name_blob[] = \n"
-+			printf "%s;\n", bigstr;
-+			print_offsets("boolfnames", large_boolfnames);
-+			print_offsets("boolnames", large_boolnames);
-+			print_offsets("numfnames", large_numfnames);
-+			print_offsets("numnames", large_numnames);
-+			print_offsets("strfnames", large_strfnames);
-+			print_offsets("strnames", large_strnames);
-+			print  ""
-+			print  "static IT *"
-+			print  "alloc_array(NCURSES_CONST char ***value, const short *offsets, unsigned size)"
-+			print  "{"
-+			print  "	if (*value == 0) {"
-+			print  "		if ((*value = typeCalloc(NCURSES_CONST char *, size + 1)) != 0) {"
-+			print  "			unsigned n;"
-+			print  "			for (n = 0; n < size; ++n) {"
-+			print  "				(*value)[n] = _nc_name_blob + offsets[n];"
-+			print  "			}"
-+			print  "		}"
-+			print  "	}"
-+			print  "	return *value;"
-+			print  "}"
-+			print  ""
-+			print  "#define FIX(it) NCURSES_IMPEXP IT * NCURSES_API _nc_##it(void) { return alloc_array(&ptr_##it, _nc_offset_##it, SIZEOF(_nc_offset_##it)); }"
-+		} else {
-+			print  "#define DCL(it) static IT data##it[]"
-+			print  ""
-+			print_strings("boolnames", small_boolnames);
-+			print_strings("boolfnames", small_boolfnames);
-+			print_strings("numnames", small_numnames);
-+			print_strings("numfnames", small_numfnames);
-+			print_strings("strnames", small_strnames);
-+			print_strings("strfnames", small_strfnames);
-+			print  "#define FIX(it) NCURSES_IMPEXP IT * NCURSES_API _nc_##it(void) { return data##it; }"
-+		}
-+		print  ""
-+		print  "FIX(boolnames)"
-+		print  "FIX(boolfnames)"
-+		print  "FIX(numnames)"
-+		print  "FIX(numfnames)"
-+		print  "FIX(strnames)"
-+		print  "FIX(strfnames)"
-+		print  ""
-+		print  ""
-+		print  "#define FREE_FIX(it) if (ptr_##it) { FreeAndNull(ptr_##it); }"
-+		print  ""
-+		print  "NCURSES_EXPORT(void)"
-+		print  "_nc_names_leaks(void)"
-+		print  "{"
-+		if (bigstrings) {
-+		print  "FREE_FIX(boolnames)"
-+		print  "FREE_FIX(boolfnames)"
-+		print  "FREE_FIX(numnames)"
-+		print  "FREE_FIX(numfnames)"
-+		print  "FREE_FIX(strnames)"
-+		print  "FREE_FIX(strfnames)"
- 		}
-+		print  "}"
-+		print  "#else"
-+		print  ""
-+		print  "#define DCL(it) NCURSES_EXPORT_VAR(IT) it[]"
-+		print  ""
-+		print_strings("boolnames", small_boolnames);
-+		print_strings("boolfnames", small_boolfnames);
-+		print_strings("numnames", small_numnames);
-+		print_strings("numfnames", small_numfnames);
-+		print_strings("strnames", small_strnames);
-+		print_strings("strfnames", small_strfnames);
-+		print  ""
-+		print  "#endif /* BROKEN_LINKER */"
-+	}
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/access.c ncurses-5.6/ncurses/tinfo/access.c
---- ncurses-5.6.orig/ncurses/tinfo/access.c	2006-08-05 13:18:14.000000000 -0400
-+++ ncurses-5.6/ncurses/tinfo/access.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2003,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -32,12 +32,13 @@
- 
- #include <curses.priv.h>
- 
-+#include <ctype.h>
- #include <sys/stat.h>
- 
- #include <tic.h>
- #include <nc_alloc.h>
- 
--MODULE_ID("$Id: access.c,v 1.12 2006/08/05 17:18:14 tom Exp $")
-+MODULE_ID("$Id: access.c,v 1.14 2007/11/18 00:57:53 tom Exp $")
- 
- #define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c))
- 
-@@ -45,14 +46,13 @@
- _nc_rootname(char *path)
- {
-     char *result = _nc_basename(path);
--#if !defined(MIXEDCASE_FILENAMES) || defined(PROG_EXT)
-+#if !MIXEDCASE_FILENAMES || defined(PROG_EXT)
-     static char *temp;
-     char *s;
- 
-     temp = strdup(result);
-     result = temp;
--#if !defined(MIXEDCASE_FILENAMES)
--    int n;
-+#if !MIXEDCASE_FILENAMES
-     for (s = result; *s != '\0'; ++s) {
- 	*s = LOWERCASE(*s);
-     }
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/add_tries.c ncurses-5.6/ncurses/tinfo/add_tries.c
---- ncurses-5.6.orig/ncurses/tinfo/add_tries.c	2005-11-19 20:32:48.000000000 -0500
-+++ ncurses-5.6/ncurses/tinfo/add_tries.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -27,7 +27,7 @@
-  ****************************************************************************/
- 
- /****************************************************************************
-- *  Author: Thomas E. Dickey <dickey@clark.net> 1998                        *
-+ *  Author: Thomas E. Dickey            1998-on                             *
-  ****************************************************************************/
- 
- /*
-@@ -39,20 +39,20 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: add_tries.c,v 1.5 2005/11/20 01:32:48 tom Exp $")
-+MODULE_ID("$Id: add_tries.c,v 1.8 2006/12/30 23:15:26 tom Exp $")
- 
- #define SET_TRY(dst,src) if ((dst->ch = *src++) == 128) dst->ch = '\0'
- #define CMP_TRY(a,b) ((a)? (a == b) : (b == 128))
- 
--NCURSES_EXPORT(void)
--_nc_add_to_try(struct tries **tree, const char *str, unsigned code)
-+NCURSES_EXPORT(int)
-+_nc_add_to_try(TRIES ** tree, const char *str, unsigned code)
- {
--    static bool out_of_memory = FALSE;
--    struct tries *ptr, *savedptr;
-+    TRIES *ptr, *savedptr;
-     unsigned const char *txt = (unsigned const char *) str;
- 
--    if (txt == 0 || *txt == '\0' || out_of_memory || code == 0)
--	return;
-+    T((T_CALLED("_nc_add_to_try(%p, %s, %u)"), *tree, _nc_visbuf(str), code));
-+    if (txt == 0 || *txt == '\0' || code == 0)
-+	returnCode(ERR);
- 
-     if ((*tree) != 0) {
- 	ptr = savedptr = (*tree);
-@@ -67,16 +67,15 @@
- 	    if (CMP_TRY(ptr->ch, cmp)) {
- 		if (*(++txt) == '\0') {
- 		    ptr->value = code;
--		    return;
-+		    returnCode(OK);
- 		}
- 		if (ptr->child != 0)
- 		    ptr = ptr->child;
- 		else
- 		    break;
- 	    } else {
--		if ((ptr->sibling = typeCalloc(struct tries, 1)) == 0) {
--		    out_of_memory = TRUE;
--		    return;
-+		if ((ptr->sibling = typeCalloc(TRIES, 1)) == 0) {
-+		    returnCode(ERR);
- 		}
- 
- 		savedptr = ptr = ptr->sibling;
-@@ -87,11 +86,10 @@
- 	    }
- 	}			/* end for (;;) */
-     } else {			/* (*tree) == 0 :: First sequence to be added */
--	savedptr = ptr = (*tree) = typeCalloc(struct tries, 1);
-+	savedptr = ptr = (*tree) = typeCalloc(TRIES, 1);
- 
- 	if (ptr == 0) {
--	    out_of_memory = TRUE;
--	    return;
-+	    returnCode(ERR);
- 	}
- 
- 	SET_TRY(ptr, txt);
-@@ -101,19 +99,16 @@
-     /* at this point, we are adding to the try.  ptr->child == 0 */
- 
-     while (*txt) {
--	ptr->child = typeCalloc(struct tries, 1);
-+	ptr->child = typeCalloc(TRIES, 1);
- 
- 	ptr = ptr->child;
- 
- 	if (ptr == 0) {
--	    out_of_memory = TRUE;
--
- 	    while ((ptr = savedptr) != 0) {
- 		savedptr = ptr->child;
- 		free(ptr);
- 	    }
--
--	    return;
-+	    returnCode(ERR);
- 	}
- 
- 	SET_TRY(ptr, txt);
-@@ -121,5 +116,5 @@
-     }
- 
-     ptr->value = code;
--    return;
-+    returnCode(OK);
- }
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/comp_error.c ncurses-5.6/ncurses/tinfo/comp_error.c
---- ncurses-5.6.orig/ncurses/tinfo/comp_error.c	2005-11-26 10:28:47.000000000 -0500
-+++ ncurses-5.6/ncurses/tinfo/comp_error.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2002,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -41,36 +41,36 @@
- 
- #include <tic.h>
- 
--MODULE_ID("$Id: comp_error.c,v 1.30 2005/11/26 15:28:47 tom Exp $")
-+MODULE_ID("$Id: comp_error.c,v 1.31 2007/04/21 23:38:32 tom Exp $")
- 
- NCURSES_EXPORT_VAR(bool) _nc_suppress_warnings = FALSE;
- NCURSES_EXPORT_VAR(int) _nc_curr_line = 0; /* current line # in input */
- NCURSES_EXPORT_VAR(int) _nc_curr_col = 0; /* current column # in input */
- 
--static const char *sourcename;
--static char *termtype;
-+#define SourceName	_nc_globals.comp_sourcename
-+#define TermType	_nc_globals.comp_termtype
- 
- NCURSES_EXPORT(const char *)
- _nc_get_source(void)
- {
--    return sourcename;
-+    return SourceName;
- }
- 
- NCURSES_EXPORT(void)
- _nc_set_source(const char *const name)
- {
--    sourcename = name;
-+    SourceName = name;
- }
- 
- NCURSES_EXPORT(void)
- _nc_set_type(const char *const name)
- {
--    if (termtype == 0)
--	termtype = typeMalloc(char, MAX_NAME_SIZE + 1);
--    if (termtype != 0) {
--	termtype[0] = '\0';
-+    if (TermType == 0)
-+	TermType = typeMalloc(char, MAX_NAME_SIZE + 1);
-+    if (TermType != 0) {
-+	TermType[0] = '\0';
- 	if (name)
--	    strncat(termtype, name, MAX_NAME_SIZE);
-+	    strncat(TermType, name, MAX_NAME_SIZE);
-     }
- }
- 
-@@ -78,25 +78,25 @@
- _nc_get_type(char *name)
- {
- #if NO_LEAKS
--    if (name == 0 && termtype != 0) {
--	FreeAndNull(termtype);
-+    if (name == 0 && TermType != 0) {
-+	FreeAndNull(TermType);
- 	return;
-     }
- #endif
-     if (name != 0)
--	strcpy(name, termtype != 0 ? termtype : "");
-+	strcpy(name, TermType != 0 ? TermType : "");
- }
- 
- static NCURSES_INLINE void
- where_is_problem(void)
- {
--    fprintf(stderr, "\"%s\"", sourcename);
-+    fprintf(stderr, "\"%s\"", SourceName ? SourceName : "?");
-     if (_nc_curr_line >= 0)
- 	fprintf(stderr, ", line %d", _nc_curr_line);
-     if (_nc_curr_col >= 0)
- 	fprintf(stderr, ", col %d", _nc_curr_col);
--    if (termtype != 0 && termtype[0] != '\0')
--	fprintf(stderr, ", terminal '%s'", termtype);
-+    if (TermType != 0 && TermType[0] != '\0')
-+	fprintf(stderr, ", terminal '%s'", TermType);
-     fputc(':', stderr);
-     fputc(' ', stderr);
- }
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/comp_hash.c ncurses-5.6/ncurses/tinfo/comp_hash.c
---- ncurses-5.6.orig/ncurses/tinfo/comp_hash.c	2005-08-20 15:58:18.000000000 -0400
-+++ ncurses-5.6/ncurses/tinfo/comp_hash.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -50,7 +50,7 @@
- #define DEBUG(level, params)	/*nothing */
- #endif
- 
--MODULE_ID("$Id: comp_hash.c,v 1.28 2005/08/20 19:58:18 tom Exp $")
-+MODULE_ID("$Id: comp_hash.c,v 1.33 2007/08/18 21:42:25 tom Exp $")
- 
- static int hash_function(const char *);
- 
-@@ -71,21 +71,24 @@
- 
- static void
- _nc_make_hash_table(struct name_table_entry *table,
--		    struct name_table_entry **hash_table)
-+		    short *hash_table)
- {
-     int i;
-     int hashvalue;
-     int collisions = 0;
- 
-+    for (i = 0; i < HASHTABSIZE; i++) {
-+	hash_table[i] = -1;
-+    }
-     for (i = 0; i < CAPTABSIZE; i++) {
- 	hashvalue = hash_function(table[i].nte_name);
- 
--	if (hash_table[hashvalue] != (struct name_table_entry *) 0)
-+	if (hash_table[hashvalue] >= 0)
- 	    collisions++;
- 
- 	if (hash_table[hashvalue] != 0)
--	    table[i].nte_link = (short) (hash_table[hashvalue] - table);
--	hash_table[hashvalue] = &table[i];
-+	    table[i].nte_link = hash_table[hashvalue];
-+	hash_table[hashvalue] = i;
-     }
- 
-     DEBUG(4, ("Hash table complete: %d collisions out of %d entries",
-@@ -130,18 +133,21 @@
- #ifndef MAIN_PROGRAM
- NCURSES_EXPORT(struct name_table_entry const *)
- _nc_find_entry(const char *string,
--	       const struct name_table_entry *const *hash_table)
-+	       const short *hash_table)
- {
-     int hashvalue;
--    struct name_table_entry const *ptr;
-+    struct name_table_entry const *ptr = 0;
-+    struct name_table_entry const *real_table;
- 
-     hashvalue = hash_function(string);
- 
--    if ((ptr = hash_table[hashvalue]) != 0) {
-+    if (hash_table[hashvalue] >= 0) {
-+	real_table = _nc_get_table(hash_table != _nc_get_hash_table(FALSE));
-+	ptr = real_table + hash_table[hashvalue];
- 	while (strcmp(ptr->nte_name, string) != 0) {
- 	    if (ptr->nte_link < 0)
- 		return 0;
--	    ptr = ptr->nte_link + hash_table[HASHTABSIZE];
-+	    ptr = real_table + (ptr->nte_link + hash_table[HASHTABSIZE]);
- 	}
-     }
- 
-@@ -231,10 +237,10 @@
- {
-     struct name_table_entry *name_table = typeCalloc(struct
- 						     name_table_entry, CAPTABSIZE);
--    struct name_table_entry **hash_table = typeCalloc(struct name_table_entry
--						      *, HASHTABSIZE);
-+    short *hash_table = typeCalloc(short, HASHTABSIZE);
-     const char *root_name = "";
-     int column = 0;
-+    int bigstring = 0;
-     int n;
-     char buffer[BUFSIZ];
- 
-@@ -248,11 +254,12 @@
-     /* The first argument is the column-number (starting with 0).
-      * The second is the root name of the tables to generate.
-      */
--    if (argc <= 2
-+    if (argc <= 3
- 	|| (column = atoi(argv[1])) <= 0
- 	|| (column >= MAX_COLUMNS)
--	|| *(root_name = argv[2]) == 0) {
--	fprintf(stderr, "usage: make_hash column root_name\n");
-+	|| *(root_name = argv[2]) == 0
-+	|| (bigstring = atoi(argv[3])) < 0) {
-+	fprintf(stderr, "usage: make_hash column root_name bigstring\n");
- 	exit(EXIT_FAILURE);
-     }
- 
-@@ -288,36 +295,64 @@
-     /*
-      * Write the compiled tables to standard output
-      */
--    printf("static struct name_table_entry const _nc_%s_table[] =\n",
--	   root_name);
--    printf("{\n");
--    for (n = 0; n < CAPTABSIZE; n++) {
--	sprintf(buffer, "\"%s\"",
--		name_table[n].nte_name);
--	printf("\t{ %15s,\t%10s,\t%3d, %3d }%c\n",
--	       buffer,
--	       typenames[name_table[n].nte_type],
--	       name_table[n].nte_index,
--	       name_table[n].nte_link,
--	       n < CAPTABSIZE - 1 ? ',' : ' ');
-+    if (bigstring) {
-+	int len = 0;
-+	int nxt;
-+
-+	printf("static const char %s_names_text[] = \\\n", root_name);
-+	for (n = 0; n < CAPTABSIZE; n++) {
-+	    nxt = strlen(name_table[n].nte_name) + 5;
-+	    if (nxt + len > 72) {
-+		printf("\\\n");
-+		len = 0;
-+	    }
-+	    printf("\"%s\\0\" ", name_table[n].nte_name);
-+	    len += nxt;
-+	}
-+	printf(";\n\n");
-+
-+	len = 0;
-+	printf("static name_table_data const %s_names_data[] =\n",
-+	       root_name);
-+	printf("{\n");
-+	for (n = 0; n < CAPTABSIZE; n++) {
-+	    printf("\t{ %15d,\t%10s,\t%3d, %3d }%c\n",
-+		   len,
-+		   typenames[name_table[n].nte_type],
-+		   name_table[n].nte_index,
-+		   name_table[n].nte_link,
-+		   n < CAPTABSIZE - 1 ? ',' : ' ');
-+	    len += strlen(name_table[n].nte_name) + 1;
-+	}
-+	printf("};\n\n");
-+	printf("static struct name_table_entry *_nc_%s_table = 0;\n\n", root_name);
-+    } else {
-+
-+	printf("static struct name_table_entry %s _nc_%s_table[] =\n",
-+	       bigstring ? "" : "const",
-+	       root_name);
-+	printf("{\n");
-+	for (n = 0; n < CAPTABSIZE; n++) {
-+	    sprintf(buffer, "\"%s\"",
-+		    name_table[n].nte_name);
-+	    printf("\t{ %15s,\t%10s,\t%3d, %3d }%c\n",
-+		   buffer,
-+		   typenames[name_table[n].nte_type],
-+		   name_table[n].nte_index,
-+		   name_table[n].nte_link,
-+		   n < CAPTABSIZE - 1 ? ',' : ' ');
-+	}
-+	printf("};\n\n");
-     }
--    printf("};\n\n");
- 
--    printf("const struct name_table_entry * const _nc_%s_hash_table[%d] =\n",
-+    printf("static const short _nc_%s_hash_table[%d] =\n",
- 	   root_name,
- 	   HASHTABSIZE + 1);
-     printf("{\n");
-     for (n = 0; n < HASHTABSIZE; n++) {
--	if (hash_table[n] != 0) {
--	    sprintf(buffer, "_nc_%s_table + %3ld",
--		    root_name,
--		    (long) (hash_table[n] - name_table));
--	} else {
--	    strcpy(buffer, "0");
--	}
--	printf("\t%s,\n", buffer);
-+	printf("\t%3d,\n", hash_table[n]);
-     }
--    printf("\t_nc_%s_table\t/* base-of-table */\n", root_name);
-+    printf("\t0\t/* base-of-table */\n");
-     printf("};\n\n");
- 
-     printf("#if (BOOLCOUNT!=%d)||(NUMCOUNT!=%d)||(STRCOUNT!=%d)\n",
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/comp_parse.c ncurses-5.6/ncurses/tinfo/comp_parse.c
---- ncurses-5.6.orig/ncurses/tinfo/comp_parse.c	2006-07-08 14:55:14.000000000 -0400
-+++ ncurses-5.6/ncurses/tinfo/comp_parse.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -53,7 +53,7 @@
- #include <tic.h>
- #include <term_entry.h>
- 
--MODULE_ID("$Id: comp_parse.c,v 1.63 2006/07/08 18:55:14 tom Exp $")
-+MODULE_ID("$Id: comp_parse.c,v 1.68 2007/11/03 20:41:46 tom Exp $")
- 
- static void sanity_check2(TERMTYPE *, bool);
- NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype2) (TERMTYPE *, bool) = sanity_check2;
-@@ -62,30 +62,6 @@
- static void sanity_check(TERMTYPE *);
- NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype) (TERMTYPE *) = sanity_check;
- 
--/****************************************************************************
-- *
-- * Entry queue handling
-- *
-- ****************************************************************************/
--/*
-- *  The entry list is a doubly linked list with NULLs terminating the lists:
-- *
-- *	  ---------   ---------   ---------
-- *	  |       |   |       |   |       |   offset
-- *        |-------|   |-------|   |-------|
-- *	  |   ----+-->|   ----+-->|  NULL |   next
-- *	  |-------|   |-------|   |-------|
-- *	  |  NULL |<--+----   |<--+----   |   last
-- *	  ---------   ---------   ---------
-- *	      ^                       ^
-- *	      |                       |
-- *	      |                       |
-- *	   _nc_head                _nc_tail
-- */
--
--NCURSES_EXPORT_VAR(ENTRY *) _nc_head = 0;
--NCURSES_EXPORT_VAR(ENTRY *) _nc_tail = 0;
--
- static void
- enqueue(ENTRY * ep)
- /* add an entry to the in-core list */
-@@ -103,51 +79,6 @@
- 	newp->last->next = newp;
- }
- 
--NCURSES_EXPORT(void)
--_nc_free_entries(ENTRY * headp)
--/* free the allocated storage consumed by list entries */
--{
--    (void) headp;		/* unused - _nc_head is altered here! */
--
--    while (_nc_head != 0) {
--	_nc_free_termtype(&(_nc_head->tterm));
--    }
--}
--
--NCURSES_EXPORT(ENTRY *)
--_nc_delink_entry(ENTRY * headp, TERMTYPE *tterm)
--/* delink the allocated storage for the given list entry */
--{
--    ENTRY *ep, *last;
--
--    for (last = 0, ep = headp; ep != 0; last = ep, ep = ep->next) {
--	if (&(ep->tterm) == tterm) {
--	    if (last != 0) {
--		last->next = ep->next;
--	    }
--	    if (ep == _nc_head) {
--		_nc_head = ep->next;
--	    }
--	    if (ep == _nc_tail) {
--		_nc_tail = last;
--	    }
--	    break;
--	}
--    }
--    return ep;
--}
--
--NCURSES_EXPORT(void)
--_nc_free_entry(ENTRY * headp, TERMTYPE *tterm)
--/* free the allocated storage consumed by the given list entry */
--{
--    ENTRY *ep;
--
--    if ((ep = _nc_delink_entry(headp, tterm)) != 0) {
--	free(ep);
--    }
--}
--
- static char *
- force_bar(char *dst, char *src)
- {
-@@ -534,3 +465,26 @@
- {
-     sanity_check2(tp, FALSE);
- }
-+
-+#if NO_LEAKS
-+NCURSES_EXPORT(void)
-+_nc_leaks_tic(void)
-+{
-+    _nc_alloc_entry_leaks();
-+    _nc_captoinfo_leaks();
-+    _nc_comp_captab_leaks();
-+    _nc_comp_scan_leaks();
-+#if BROKEN_LINKER || USE_REENTRANT
-+    _nc_names_leaks();
-+    _nc_codes_leaks();
-+#endif
-+    _nc_tic_expand(0, FALSE, 0);
-+}
-+
-+NCURSES_EXPORT(void)
-+_nc_free_tic(int code)
-+{
-+    _nc_leaks_tic();
-+    _nc_free_tinfo(code);
-+}
-+#endif
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/db_iterator.c ncurses-5.6/ncurses/tinfo/db_iterator.c
---- ncurses-5.6.orig/ncurses/tinfo/db_iterator.c	2006-12-16 14:06:42.000000000 -0500
-+++ ncurses-5.6/ncurses/tinfo/db_iterator.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2006 Free Software Foundation, Inc.                        *
-+ * Copyright (c) 2006,2007 Free Software Foundation, Inc.                   *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -27,7 +27,7 @@
-  ****************************************************************************/
- 
- /****************************************************************************
-- *  Author: Thomas E. Dickey                     2006                       *
-+ *  Author: Thomas E. Dickey                                                *
-  ****************************************************************************/
- 
- /*
-@@ -38,10 +38,11 @@
- 
- #include <tic.h>
- 
--MODULE_ID("$Id: db_iterator.c,v 1.5 2006/12/16 19:06:42 tom Exp $")
-+MODULE_ID("$Id: db_iterator.c,v 1.6 2007/04/22 00:00:26 tom Exp $")
- 
--static bool have_tic_directory = FALSE;
--static bool keep_tic_directory = FALSE;
-+#define HaveTicDirectory _nc_globals.have_tic_directory
-+#define KeepTicDirectory _nc_globals.keep_tic_directory
-+#define TicDirectory     _nc_globals.tic_directory
- 
- /*
-  * Record the "official" location of the terminfo directory, according to
-@@ -50,19 +51,17 @@
- NCURSES_EXPORT(const char *)
- _nc_tic_dir(const char *path)
- {
--    static const char *result = TERMINFO;
--
--    if (!keep_tic_directory) {
-+    if (!KeepTicDirectory) {
- 	if (path != 0) {
--	    result = path;
--	    have_tic_directory = TRUE;
--	} else if (!have_tic_directory && use_terminfo_vars()) {
-+	    TicDirectory = path;
-+	    HaveTicDirectory = TRUE;
-+	} else if (!HaveTicDirectory && use_terminfo_vars()) {
- 	    char *envp;
- 	    if ((envp = getenv("TERMINFO")) != 0)
- 		return _nc_tic_dir(envp);
- 	}
-     }
--    return result;
-+    return TicDirectory;
- }
- 
- /*
-@@ -74,16 +73,15 @@
- _nc_keep_tic_dir(const char *path)
- {
-     _nc_tic_dir(path);
--    keep_tic_directory = TRUE;
-+    KeepTicDirectory = TRUE;
- }
- 
- /*
-  * Process the list of :-separated directories, looking for the terminal type.
-  * We don't use strtok because it does not show us empty tokens.
-  */
--
--static char *this_db_list = 0;
--static int size_db_list;
-+#define ThisDbList	_nc_globals.dbi_list
-+#define ThisDbSize	_nc_globals.dbi_size
- 
- /*
-  * Cleanup.
-@@ -91,10 +89,10 @@
- NCURSES_EXPORT(void)
- _nc_last_db(void)
- {
--    if (this_db_list != 0) {
--	FreeAndNull(this_db_list);
-+    if (ThisDbList != 0) {
-+	FreeAndNull(ThisDbList);
-     }
--    size_db_list = 0;
-+    ThisDbSize = 0;
- }
- 
- /* The TERMINFO_DIRS value, if defined by the configure script, begins with a
-@@ -104,14 +102,14 @@
- next_list_item(const char *source, int *offset)
- {
-     if (source != 0) {
--	FreeIfNeeded(this_db_list);
--	this_db_list = strdup(source);
--	size_db_list = strlen(source);
-+	FreeIfNeeded(ThisDbList);
-+	ThisDbList = strdup(source);
-+	ThisDbSize = strlen(source);
-     }
- 
--    if (this_db_list != 0 && size_db_list && *offset < size_db_list) {
-+    if (ThisDbList != 0 && ThisDbSize && *offset < ThisDbSize) {
- 	static char system_db[] = TERMINFO;
--	char *result = this_db_list + *offset;
-+	char *result = ThisDbList + *offset;
- 	char *marker = strchr(result, NCURSES_PATHSEP);
- 
- 	/*
-@@ -124,9 +122,9 @@
- 	    marker = result + *offset;
- 	} else {
- 	    *marker++ = 0;
--	    *offset = marker - this_db_list;
-+	    *offset = marker - ThisDbList;
- 	}
--	if (*result == 0 && result != (this_db_list + size_db_list))
-+	if (*result == 0 && result != (ThisDbList + ThisDbSize))
- 	    result = system_db;
- 	return result;
-     }
-@@ -153,7 +151,7 @@
- 
- 	switch (*state) {
- 	case dbdTIC:
--	    if (have_tic_directory)
-+	    if (HaveTicDirectory)
- 		result = _nc_tic_dir(0);
- 	    break;
- #if USE_DATABASE
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/entries.c ncurses-5.6/ncurses/tinfo/entries.c
---- ncurses-5.6.orig/ncurses/tinfo/entries.c	1969-12-31 19:00:00.000000000 -0500
-+++ ncurses-5.6/ncurses/tinfo/entries.c	2008-06-18 06:49:44.000000000 -0400
-@@ -0,0 +1,144 @@
-+/****************************************************************************
-+ * Copyright (c) 2006,2007 Free Software Foundation, Inc.                   *
-+ *                                                                          *
-+ * Permission is hereby granted, free of charge, to any person obtaining a  *
-+ * copy of this software and associated documentation files (the            *
-+ * "Software"), to deal in the Software without restriction, including      *
-+ * without limitation the rights to use, copy, modify, merge, publish,      *
-+ * distribute, distribute with modifications, sublicense, and/or sell       *
-+ * copies of the Software, and to permit persons to whom the Software is    *
-+ * furnished to do so, subject to the following conditions:                 *
-+ *                                                                          *
-+ * The above copyright notice and this permission notice shall be included  *
-+ * in all copies or substantial portions of the Software.                   *
-+ *                                                                          *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-+ *                                                                          *
-+ * Except as contained in this notice, the name(s) of the above copyright   *
-+ * holders shall not be used in advertising or otherwise to promote the     *
-+ * sale, use or other dealings in this Software without prior written       *
-+ * authorization.                                                           *
-+ ****************************************************************************/
-+
-+/****************************************************************************
-+ *  Author: Thomas E. Dickey                                                *
-+ ****************************************************************************/
-+
-+#include <curses.priv.h>
-+
-+#include <ctype.h>
-+
-+#include <tic.h>
-+#include <term_entry.h>
-+
-+MODULE_ID("$Id: entries.c,v 1.4 2007/11/03 21:00:27 tom Exp $")
-+
-+/****************************************************************************
-+ *
-+ * Entry queue handling
-+ *
-+ ****************************************************************************/
-+/*
-+ *  The entry list is a doubly linked list with NULLs terminating the lists:
-+ *
-+ *	  ---------   ---------   ---------
-+ *	  |       |   |       |   |       |   offset
-+ *        |-------|   |-------|   |-------|
-+ *	  |   ----+-->|   ----+-->|  NULL |   next
-+ *	  |-------|   |-------|   |-------|
-+ *	  |  NULL |<--+----   |<--+----   |   last
-+ *	  ---------   ---------   ---------
-+ *	      ^                       ^
-+ *	      |                       |
-+ *	      |                       |
-+ *	   _nc_head                _nc_tail
-+ */
-+
-+NCURSES_EXPORT_VAR(ENTRY *) _nc_head = 0;
-+NCURSES_EXPORT_VAR(ENTRY *) _nc_tail = 0;
-+
-+NCURSES_EXPORT(void)
-+_nc_free_entry(ENTRY * headp, TERMTYPE *tterm)
-+/* free the allocated storage consumed by the given list entry */
-+{
-+    ENTRY *ep;
-+
-+    if ((ep = _nc_delink_entry(headp, tterm)) != 0) {
-+	free(ep);
-+    }
-+}
-+
-+NCURSES_EXPORT(void)
-+_nc_free_entries(ENTRY * headp)
-+/* free the allocated storage consumed by list entries */
-+{
-+    (void) headp;		/* unused - _nc_head is altered here! */
-+
-+    while (_nc_head != 0) {
-+	_nc_free_termtype(&(_nc_head->tterm));
-+    }
-+}
-+
-+NCURSES_EXPORT(ENTRY *)
-+_nc_delink_entry(ENTRY * headp, TERMTYPE *tterm)
-+/* delink the allocated storage for the given list entry */
-+{
-+    ENTRY *ep, *last;
-+
-+    for (last = 0, ep = headp; ep != 0; last = ep, ep = ep->next) {
-+	if (&(ep->tterm) == tterm) {
-+	    if (last != 0) {
-+		last->next = ep->next;
-+	    }
-+	    if (ep == _nc_head) {
-+		_nc_head = ep->next;
-+	    }
-+	    if (ep == _nc_tail) {
-+		_nc_tail = last;
-+	    }
-+	    break;
-+	}
-+    }
-+    return ep;
-+}
-+
-+NCURSES_EXPORT(void)
-+_nc_leaks_tinfo(void)
-+{
-+    char *s;
-+
-+    T((T_CALLED("_nc_free_tinfo()")));
-+#if NO_LEAKS
-+    _nc_free_tparm();
-+    _nc_tgetent_leaks();
-+#endif
-+    _nc_free_entries(_nc_head);
-+    _nc_get_type(0);
-+    _nc_first_name(0);
-+#if NO_LEAKS
-+    _nc_keyname_leaks();
-+#endif
-+#if BROKEN_LINKER || USE_REENTRANT
-+    _nc_names_leaks();
-+    _nc_codes_leaks();
-+#endif
-+
-+    if ((s = _nc_home_terminfo()) != 0)
-+	free(s);
-+    returnVoid;
-+}
-+
-+#if NO_LEAKS
-+NCURSES_EXPORT(void)
-+_nc_free_tinfo(int code)
-+{
-+    _nc_leaks_tinfo();
-+    exit(code);
-+}
-+#endif
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/home_terminfo.c ncurses-5.6/ncurses/tinfo/home_terminfo.c
---- ncurses-5.6.orig/ncurses/tinfo/home_terminfo.c	2005-07-02 15:43:38.000000000 -0400
-+++ ncurses-5.6/ncurses/tinfo/home_terminfo.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -27,7 +27,7 @@
-  ****************************************************************************/
- 
- /****************************************************************************
-- *  Author: Thomas E. Dickey 1998,2000,2004,2005                            *
-+ *  Author: Thomas E. Dickey                                                *
-  ****************************************************************************/
- 
- /*
-@@ -37,31 +37,32 @@
- #include <curses.priv.h>
- #include <tic.h>
- 
--MODULE_ID("$Id: home_terminfo.c,v 1.9 2005/07/02 19:43:38 tom Exp $")
-+MODULE_ID("$Id: home_terminfo.c,v 1.10 2007/04/21 23:11:53 tom Exp $")
- 
- #define my_length (strlen(home) + sizeof(PRIVATE_INFO))
- 
- /* ncurses extension...fall back on user's private directory */
- 
-+#define MyBuffer _nc_globals.home_terminfo
-+
- NCURSES_EXPORT(char *)
- _nc_home_terminfo(void)
- {
-     char *result = 0;
--#ifdef USE_HOME_TERMINFO
-+#if USE_HOME_TERMINFO
-     char *home;
--    static char *temp = 0;
- 
-     if (use_terminfo_vars()) {
--	if (temp == 0) {
-+	if (MyBuffer == 0) {
- 	    if ((home = getenv("HOME")) != 0
- 		&& my_length <= PATH_MAX) {
--		temp = typeMalloc(char, my_length);
--		if (temp == 0)
-+		MyBuffer = typeMalloc(char, my_length);
-+		if (MyBuffer == 0)
- 		    _nc_err_abort(MSG_NO_MEMORY);
--		(void) sprintf(temp, PRIVATE_INFO, home);
-+		(void) sprintf(MyBuffer, PRIVATE_INFO, home);
- 	    }
- 	}
--	result = temp;
-+	result = MyBuffer;
-     }
- #endif
-     return result;
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/init_keytry.c ncurses-5.6/ncurses/tinfo/init_keytry.c
---- ncurses-5.6.orig/ncurses/tinfo/init_keytry.c	2006-01-21 18:43:28.000000000 -0500
-+++ ncurses-5.6/ncurses/tinfo/init_keytry.c	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1999-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1999-2006,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -36,7 +36,7 @@
- 
- #include <term_entry.h>
- 
--MODULE_ID("$Id: init_keytry.c,v 1.8 2006/01/21 23:43:28 tom Exp $")
-+MODULE_ID("$Id: init_keytry.c,v 1.12 2008/05/24 21:44:51 tom Exp $")
- 
- /*
- **      _nc_init_keytry()
-@@ -45,6 +45,13 @@
- **
- */
- 
-+/*
-+ * Internal entrypoints use SCREEN* parameter to obtain capabilities rather
-+ * than cur_term.
-+ */
-+#undef CUR
-+#define CUR (sp->_term)->type.
-+
- #if	BROKEN_LINKER
- #undef	_nc_tinfo_fkeys
- #endif
-@@ -56,7 +63,7 @@
- #endif*/
- 
- #if	BROKEN_LINKER
--struct tinfo_fkeys *
-+const struct tinfo_fkeys *
- _nc_tinfo_fkeysf(void)
- {
-     return _nc_tinfo_fkeys;
-@@ -64,21 +71,21 @@
- #endif
- 
- NCURSES_EXPORT(void)
--_nc_init_keytry(void)
-+_nc_init_keytry(SCREEN *sp)
- {
-     size_t n;
- 
--    /* The SP->_keytry value is initialized in newterm(), where the SP
-+    /* The sp->_keytry value is initialized in newterm(), where the sp
-      * structure is created, because we can not tell where keypad() or
-      * mouse_activate() (which will call keyok()) are first called.
-      */
- 
--    if (SP != 0) {
-+    if (sp != 0) {
- 	for (n = 0; _nc_tinfo_fkeys[n].code; n++) {
- 	    if (_nc_tinfo_fkeys[n].offset < STRCOUNT) {
--		_nc_add_to_try(&(SP->_keytry),
--			       CUR Strings[_nc_tinfo_fkeys[n].offset],
--			       _nc_tinfo_fkeys[n].code);
-+		(void) _nc_add_to_try(&(sp->_keytry),
-+				      CUR Strings[_nc_tinfo_fkeys[n].offset],
-+				      _nc_tinfo_fkeys[n].code);
- 	    }
- 	}
- #if NCURSES_XNAMES
-@@ -88,7 +95,7 @@
- 	 * names.
- 	 */
- 	{
--	    TERMTYPE *tp = &(SP->_term->type);
-+	    TERMTYPE *tp = &(sp->_term->type);
- 	    for (n = STRCOUNT; n < NUM_STRINGS(tp); ++n) {
- 		const char *name = ExtStrname(tp, n, strnames);
- 		char *value = tp->Strings[n];
-@@ -96,15 +103,15 @@
- 		    && *name == 'k'
- 		    && value != 0
- 		    && key_defined(value) == 0) {
--		    _nc_add_to_try(&(SP->_keytry),
--				   value,
--				   n - STRCOUNT + KEY_MAX);
-+		    (void) _nc_add_to_try(&(sp->_keytry),
-+					  value,
-+					  n - STRCOUNT + KEY_MAX);
- 		}
- 	    }
- 	}
- #endif
- #ifdef TRACE
--	_nc_trace_tries(SP->_keytry);
-+	_nc_trace_tries(sp->_keytry);
- #endif
-     }
- }
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/lib_acs.c ncurses-5.6/ncurses/tinfo/lib_acs.c
---- ncurses-5.6.orig/ncurses/tinfo/lib_acs.c	2006-01-07 16:27:15.000000000 -0500
-+++ ncurses-5.6/ncurses/tinfo/lib_acs.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -35,17 +35,18 @@
- #include <curses.priv.h>
- #include <term.h>		/* ena_acs, acs_chars */
- 
--MODULE_ID("$Id: lib_acs.c,v 1.30 2006/01/07 21:27:15 tom Exp $")
-+MODULE_ID("$Id: lib_acs.c,v 1.34 2007/09/29 20:37:13 tom Exp $")
- 
--#if BROKEN_LINKER
-+#if BROKEN_LINKER || USE_REENTRANT
-+#define MyBuffer _nc_prescreen.real_acs_map
- NCURSES_EXPORT_VAR(chtype *)
- _nc_acs_map(void)
- {
--    static chtype *the_map = 0;
--    if (the_map == 0)
--	the_map = typeCalloc(chtype, ACS_LEN);
--    return the_map;
-+    if (MyBuffer == 0)
-+	MyBuffer = typeCalloc(chtype, ACS_LEN);
-+    return MyBuffer;
- }
-+#undef MyBuffer
- #else
- NCURSES_EXPORT_VAR(chtype) acs_map[ACS_LEN] =
- {
-@@ -117,16 +118,6 @@
-     real_map['|'] = '!';	/* should be not-equal */
-     real_map['}'] = 'f';	/* should be pound-sterling symbol */
- 
--#if !USE_WIDEC_SUPPORT
--    if (_nc_unicode_locale() && _nc_locale_breaks_acs()) {
--	acs_chars = NULL;
--	ena_acs = NULL;
--	enter_alt_charset_mode = NULL;
--	exit_alt_charset_mode = NULL;
--	set_attributes = NULL;
--    }
--#endif
--
-     if (ena_acs != NULL) {
- 	TPUTS_TRACE("ena_acs");
- 	putp(ena_acs);
-@@ -175,7 +166,7 @@
-     /* Show the equivalent mapping, noting if it does not match the
-      * given attribute, whether by re-ordering or duplication.
-      */
--    if (_nc_tracing & TRACE_CALLS) {
-+    if (USE_TRACEF(TRACE_CALLS)) {
- 	size_t n, m;
- 	char show[ACS_LEN * 2 + 1];
- 	for (n = 1, m = 0; n < ACS_LEN; n++) {
-@@ -196,6 +187,7 @@
- 		   ? "DIFF"
- 		   : "SAME"),
- 		_nc_visbuf(show));
-+	_nc_unlock_global(tracef);
-     }
- #endif /* TRACE */
- }
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/lib_baudrate.c ncurses-5.6/ncurses/tinfo/lib_baudrate.c
---- ncurses-5.6.orig/ncurses/tinfo/lib_baudrate.c	2002-01-19 18:07:53.000000000 -0500
-+++ ncurses-5.6/ncurses/tinfo/lib_baudrate.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998,2000,2002 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -29,6 +29,7 @@
- /****************************************************************************
-  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
-  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
-+ *     and: Thomas E. Dickey                        1996-on                 *
-  ****************************************************************************/
- 
- /*
-@@ -39,6 +40,9 @@
- #include <curses.priv.h>
- #include <term.h>		/* cur_term, pad_char */
- #include <termcap.h>		/* ospeed */
-+#if defined(__FreeBSD__)
-+#include <sys/param.h>
-+#endif
- 
- /*
-  * These systems use similar header files, which define B1200 as 1200, etc.,
-@@ -46,7 +50,7 @@
-  * of the indices up to B115200 fit nicely in a 'short', allowing us to retain
-  * ospeed's type for compatibility.
-  */
--#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-+#if (defined(__FreeBSD__) && (__FreeBSD_version < 700000)) || defined(__NetBSD__) || defined(__OpenBSD__)
- #undef B0
- #undef B50
- #undef B75
-@@ -76,7 +80,7 @@
- #undef USE_OLD_TTY
- #endif /* USE_OLD_TTY */
- 
--MODULE_ID("$Id: lib_baudrate.c,v 1.22 2002/01/19 23:07:53 Andrey.A.Chernov Exp $")
-+MODULE_ID("$Id: lib_baudrate.c,v 1.25 2007/10/20 15:00:41 Rong-En.Fan Exp $")
- 
- /*
-  *	int
-@@ -141,16 +145,20 @@
- NCURSES_EXPORT(int)
- _nc_baudrate(int OSpeed)
- {
-+#if !USE_REENTRANT
-     static int last_OSpeed;
-     static int last_baudrate;
-+#endif
- 
--    int result;
-+    int result = ERR;
-     unsigned i;
- 
-+#if !USE_REENTRANT
-     if (OSpeed == last_OSpeed) {
- 	result = last_baudrate;
--    } else {
--	result = ERR;
-+    }
-+#endif
-+    if (result == ERR) {
- 	if (OSpeed >= 0) {
- 	    for (i = 0; i < SIZEOF(speeds); i++) {
- 		if (speeds[i].s == OSpeed) {
-@@ -159,7 +167,12 @@
- 		}
- 	    }
- 	}
--	last_baudrate = result;
-+#if !USE_REENTRANT
-+	if (OSpeed == last_OSpeed) {
-+	    last_OSpeed = OSpeed;
-+	    last_baudrate = result;
-+	}
-+#endif
-     }
-     return (result);
- }
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/lib_cur_term.c ncurses-5.6/ncurses/tinfo/lib_cur_term.c
---- ncurses-5.6.orig/ncurses/tinfo/lib_cur_term.c	2003-12-27 13:21:30.000000000 -0500
-+++ ncurses-5.6/ncurses/tinfo/lib_cur_term.c	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2000,2003 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2003,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -40,21 +40,45 @@
- #include <term_entry.h>		/* TTY, cur_term */
- #include <termcap.h>		/* ospeed */
- 
--MODULE_ID("$Id: lib_cur_term.c,v 1.13 2003/12/27 18:21:30 tom Exp $")
-+MODULE_ID("$Id: lib_cur_term.c,v 1.16 2008/06/07 22:22:16 tom Exp $")
- 
-+#undef CUR
-+#define CUR termp->type.
-+
-+#if USE_REENTRANT
-+NCURSES_EXPORT(TERMINAL *)
-+NCURSES_PUBLIC_VAR(cur_term) (void)
-+{
-+    return (SP != 0 && SP->_term != 0) ? SP->_term : _nc_prescreen._cur_term;
-+}
-+#else
- NCURSES_EXPORT_VAR(TERMINAL *) cur_term = 0;
-+#endif
- 
- NCURSES_EXPORT(TERMINAL *)
- set_curterm(TERMINAL * termp)
- {
--    TERMINAL *oldterm = cur_term;
-+    TERMINAL *oldterm;
- 
-     T((T_CALLED("set_curterm(%p)"), termp));
- 
--    if ((cur_term = termp) != 0) {
--	ospeed = _nc_ospeed(cur_term->_baudrate);
--	PC = (pad_char != NULL) ? pad_char[0] : 0;
-+    _nc_lock_global(curses);
-+    oldterm = cur_term;
-+    if (SP)
-+	SP->_term = termp;
-+#if USE_REENTRANT
-+    _nc_prescreen._cur_term = termp;
-+#else
-+    cur_term = termp;
-+#endif
-+    if (termp != 0) {
-+	ospeed = _nc_ospeed(termp->_baudrate);
-+	if (termp->type.Strings) {
-+	    PC = (pad_char != NULL) ? pad_char[0] : 0;
-+	}
-     }
-+    _nc_unlock_global(curses);
-+
-     T((T_RETURN("%p"), oldterm));
-     return (oldterm);
- }
-@@ -62,15 +86,20 @@
- NCURSES_EXPORT(int)
- del_curterm(TERMINAL * termp)
- {
-+    int rc = ERR;
-+
-     T((T_CALLED("del_curterm(%p)"), termp));
- 
-+    _nc_lock_global(curses);
-     if (termp != 0) {
- 	_nc_free_termtype(&(termp->type));
- 	FreeIfNeeded(termp->_termname);
- 	free(termp);
- 	if (termp == cur_term)
--	    cur_term = 0;
--	returnCode(OK);
-+	    set_curterm(0);
-+	rc = OK;
-     }
--    returnCode(ERR);
-+    _nc_unlock_global(curses);
-+
-+    returnCode(rc);
- }
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/lib_data.c ncurses-5.6/ncurses/tinfo/lib_data.c
---- ncurses-5.6.orig/ncurses/tinfo/lib_data.c	2005-01-22 12:39:22.000000000 -0500
-+++ ncurses-5.6/ncurses/tinfo/lib_data.c	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -41,15 +41,33 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: lib_data.c,v 1.17 2005/01/22 17:39:22 tom Exp $")
-+MODULE_ID("$Id: lib_data.c,v 1.48 2008/06/07 14:03:15 tom Exp $")
- 
- /*
-  * OS/2's native linker complains if we don't initialize public data when
-  * constructing a dll (reported by J.J.G.Ripoll).
-  */
-+#if USE_REENTRANT
-+NCURSES_EXPORT(WINDOW *)
-+NCURSES_PUBLIC_VAR(stdscr) (void)
-+{
-+    return SP ? SP->_stdscr : 0;
-+}
-+NCURSES_EXPORT(WINDOW *)
-+NCURSES_PUBLIC_VAR(curscr) (void)
-+{
-+    return SP ? SP->_curscr : 0;
-+}
-+NCURSES_EXPORT(WINDOW *)
-+NCURSES_PUBLIC_VAR(newscr) (void)
-+{
-+    return SP ? SP->_newscr : 0;
-+}
-+#else
- NCURSES_EXPORT_VAR(WINDOW *) stdscr = 0;
- NCURSES_EXPORT_VAR(WINDOW *) curscr = 0;
- NCURSES_EXPORT_VAR(WINDOW *) newscr = 0;
-+#endif
- 
- NCURSES_EXPORT_VAR(SCREEN *) _nc_screen_chain = 0;
- 
-@@ -87,3 +105,183 @@
- #else
- NCURSES_EXPORT_VAR(SCREEN *) SP = NULL; /* Some linkers require initialized data... */
- #endif
-+/* *INDENT-OFF* */
-+#define CHARS_0s { '\0' }
-+
-+#define TGETENT_0 { 0L, FALSE, NULL, NULL, NULL }
-+#define TGETENT_0s { TGETENT_0, TGETENT_0, TGETENT_0, TGETENT_0 }
-+
-+NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = {
-+    0,				/* have_sigwinch */
-+    0,				/* cleanup_nested */
-+
-+    FALSE,			/* init_signals */
-+    FALSE,			/* init_screen */
-+
-+    NULL,			/* comp_sourcename */
-+    NULL,			/* comp_termtype */
-+
-+    FALSE,			/* have_tic_directory */
-+    FALSE,			/* keep_tic_directory */
-+    TERMINFO,			/* tic_directory */
-+
-+    NULL,			/* dbi_list */
-+    0,				/* dbi_size */
-+
-+    NULL,			/* first_name */
-+    NULL,			/* keyname_table */
-+
-+    0,				/* slk_format */
-+
-+    NULL,			/* safeprint_buf */
-+    0,				/* safeprint_used */
-+
-+    TGETENT_0s,			/* tgetent_cache */
-+    0,				/* tgetent_index */
-+    0,				/* tgetent_sequence */
-+
-+    0,				/* _nc_windowlist */
-+
-+#if USE_HOME_TERMINFO
-+    NULL,			/* home_terminfo */
-+#endif
-+
-+#if !USE_SAFE_SPRINTF
-+    0,				/* safeprint_cols */
-+    0,				/* safeprint_rows */
-+#endif
-+
-+#ifdef TRACE
-+    FALSE,			/* init_trace */
-+    CHARS_0s,			/* trace_fname */
-+    0,				/* trace_level */
-+    NULL,			/* trace_fp */
-+
-+    NULL,			/* tracearg_buf */
-+    0,				/* tracearg_used */
-+
-+    NULL,			/* tracebuf_ptr */
-+    0,				/* tracebuf_used */
-+
-+    CHARS_0s,			/* tracechr_buf */
-+
-+    NULL,			/* tracedmp_buf */
-+    0,				/* tracedmp_used */
-+
-+    NULL,			/* tracetry_buf */
-+    0,				/* tracetry_used */
-+
-+    { CHARS_0s, CHARS_0s },	/* traceatr_color_buf */
-+    0,				/* traceatr_color_sel */
-+    -1,				/* traceatr_color_last */
-+
-+#endif /* TRACE */
-+#ifdef USE_PTHREADS
-+    PTHREAD_MUTEX_INITIALIZER,	/* mutex_curses */
-+    PTHREAD_MUTEX_INITIALIZER,	/* mutex_tst_tracef */
-+    PTHREAD_MUTEX_INITIALIZER,	/* mutex_tracef */
-+    0,				/* nested_tracef */
-+#endif
-+};
-+
-+#define STACK_FRAME_0	{ { 0 }, 0 }
-+#define STACK_FRAME_0s	{ STACK_FRAME_0 }
-+#define NUM_VARS_0s	{ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
-+
-+#define RIPOFF_0	{ 0,0,0 }
-+#define RIPOFF_0s	{ RIPOFF_0 }
-+
-+NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen = {
-+    TRUE,			/* use_env */
-+    FALSE,			/* filter_mode */
-+    A_NORMAL,			/* previous_attr */
-+    RIPOFF_0s,			/* ripoff */
-+    NULL,			/* rsp */
-+    {				/* tparm_state */
-+#ifdef TRACE
-+	NULL,			/* tname */
-+#endif
-+	NULL,			/* tparam_base */
-+
-+	STACK_FRAME_0s,		/* stack */
-+	0,			/* stack_ptr */
-+
-+	NULL,			/* out_buff */
-+	0,			/* out_size */
-+	0,			/* out_used */
-+
-+	NULL,			/* fmt_buff */
-+	0,			/* fmt_size */
-+
-+	NUM_VARS_0s,		/* dynamic_var */
-+	NUM_VARS_0s,		/* static_vars */
-+    },
-+    NULL,			/* saved_tty */
-+#if BROKEN_LINKER || USE_REENTRANT
-+    NULL,			/* real_acs_map */
-+    0,				/* LINES */
-+    0,				/* COLS */
-+    0,				/* cur_term */
-+#ifdef TRACE
-+    0L,				/* _outchars */
-+    NULL,			/* _tputs_trace */
-+#endif
-+#endif
-+};
-+/* *INDENT-ON* */
-+
-+/******************************************************************************/
-+#ifdef USE_PTHREADS
-+static void
-+init_global_mutexes(void)
-+{
-+    static bool initialized = FALSE;
-+
-+    if (!initialized) {
-+	initialized = TRUE;
-+	_nc_mutex_init(&_nc_globals.mutex_curses);
-+	_nc_mutex_init(&_nc_globals.mutex_tst_tracef);
-+	_nc_mutex_init(&_nc_globals.mutex_tracef);
-+    }
-+}
-+
-+/*
-+ * Use recursive mutexes if we have them - they're part of Unix98.
-+ * For the cases where we do not, _nc_mutex_trylock() is used to avoid a
-+ * deadlock, at the expense of memory leaks and unexpected failures that
-+ * may not be handled by typical clients.
-+ *
-+ * FIXME - need configure check for PTHREAD_MUTEX_RECURSIVE, define it to
-+ * PTHREAD_MUTEX_NORMAL if not supported.
-+ */
-+NCURSES_EXPORT(void)
-+_nc_mutex_init(pthread_mutex_t * obj)
-+{
-+    pthread_mutexattr_t recattr;
-+
-+    memset(&recattr, 0, sizeof(recattr));
-+    pthread_mutexattr_settype(&recattr, PTHREAD_MUTEX_RECURSIVE);
-+    pthread_mutex_init(obj, &recattr);
-+}
-+
-+NCURSES_EXPORT(int)
-+_nc_mutex_lock(pthread_mutex_t * obj)
-+{
-+    init_global_mutexes();
-+    return pthread_mutex_lock(obj);
-+}
-+
-+NCURSES_EXPORT(int)
-+_nc_mutex_trylock(pthread_mutex_t * obj)
-+{
-+    init_global_mutexes();
-+    return pthread_mutex_trylock(obj);
-+}
-+
-+NCURSES_EXPORT(int)
-+_nc_mutex_unlock(pthread_mutex_t * obj)
-+{
-+    init_global_mutexes();
-+    return pthread_mutex_unlock(obj);
-+}
-+#endif /* USE_PTHREADS */
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/lib_napms.c ncurses-5.6/ncurses/tinfo/lib_napms.c
---- ncurses-5.6.orig/ncurses/tinfo/lib_napms.c	2005-04-03 09:58:14.000000000 -0400
-+++ ncurses-5.6/ncurses/tinfo/lib_napms.c	2008-06-18 06:49:50.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2005,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -49,7 +49,7 @@
- #endif
- #endif
- 
--MODULE_ID("$Id: lib_napms.c,v 1.15 2005/04/03 13:58:14 tom Exp $")
-+MODULE_ID("$Id: lib_napms.c,v 1.17 2008/05/03 21:34:13 tom Exp $")
- 
- NCURSES_EXPORT(int)
- napms(int ms)
-@@ -67,7 +67,7 @@
- 	}
-     }
- #else
--    _nc_timed_wait(0, ms, (int *) 0 EVENTLIST_2nd(0));
-+    _nc_timed_wait(0, 0, ms, (int *) 0 EVENTLIST_2nd(0));
- #endif
- 
-     returnCode(OK);
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/lib_options.c ncurses-5.6/ncurses/tinfo/lib_options.c
---- ncurses-5.6.orig/ncurses/tinfo/lib_options.c	2006-03-04 14:28:25.000000000 -0500
-+++ ncurses-5.6/ncurses/tinfo/lib_options.c	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -43,7 +43,10 @@
- 
- #include <term.h>
- 
--MODULE_ID("$Id: lib_options.c,v 1.49 2006/03/04 19:28:25 tom Exp $")
-+MODULE_ID("$Id: lib_options.c,v 1.56 2008/06/07 14:01:46 tom Exp $")
-+
-+static int _nc_curs_set(SCREEN *, int);
-+static int _nc_meta(SCREEN *, bool);
- 
- NCURSES_EXPORT(int)
- idlok(WINDOW *win, bool flag)
-@@ -126,7 +129,7 @@
- 
-     if (win) {
- 	win->_use_keypad = flag;
--	returnCode(_nc_keypad(flag));
-+	returnCode(_nc_keypad(SP, flag));
-     } else
- 	returnCode(ERR);
- }
-@@ -134,23 +137,11 @@
- NCURSES_EXPORT(int)
- meta(WINDOW *win GCC_UNUSED, bool flag)
- {
--    int result = ERR;
-+    int result;
- 
-     /* Ok, we stay relaxed and don't signal an error if win is NULL */
-     T((T_CALLED("meta(%p,%d)"), win, flag));
--
--    if (SP != 0) {
--	SP->_use_meta = flag;
--
--	if (flag && meta_on) {
--	    TPUTS_TRACE("meta_on");
--	    putp(meta_on);
--	} else if (!flag && meta_off) {
--	    TPUTS_TRACE("meta_off");
--	    putp(meta_off);
--	}
--	result = OK;
--    }
-+    result = _nc_meta(SP, flag);
-     returnCode(result);
- }
- 
-@@ -159,43 +150,10 @@
- NCURSES_EXPORT(int)
- curs_set(int vis)
- {
--    int result = ERR;
-+    int result;
- 
-     T((T_CALLED("curs_set(%d)"), vis));
--    if (SP != 0 && vis >= 0 && vis <= 2) {
--	int cursor = SP->_cursor;
--
--	if (vis == cursor) {
--	    result = cursor;
--	} else {
--	    result = (cursor == -1 ? 1 : cursor);
--	    switch (vis) {
--	    case 2:
--		if (cursor_visible) {
--		    TPUTS_TRACE("cursor_visible");
--		    putp(cursor_visible);
--		} else
--		    result = ERR;
--		break;
--	    case 1:
--		if (cursor_normal) {
--		    TPUTS_TRACE("cursor_normal");
--		    putp(cursor_normal);
--		} else
--		    result = ERR;
--		break;
--	    case 0:
--		if (cursor_invisible) {
--		    TPUTS_TRACE("cursor_invisible");
--		    putp(cursor_invisible);
--		} else
--		    result = ERR;
--		break;
--	    }
--	    SP->_cursor = vis;
--	    _nc_flush();
--	}
--    }
-+    result = _nc_curs_set(SP, vis);
-     returnCode(result);
- }
- 
-@@ -220,7 +178,7 @@
- 
- #if NCURSES_EXT_FUNCS
- static int
--has_key_internal(int keycode, struct tries *tp)
-+has_key_internal(int keycode, TRIES * tp)
- {
-     if (tp == 0)
- 	return (FALSE);
-@@ -239,6 +197,35 @@
- }
- #endif /* NCURSES_EXT_FUNCS */
- 
-+/*
-+ * Internal entrypoints use SCREEN* parameter to obtain capabilities rather
-+ * than cur_term.
-+ */
-+#undef CUR
-+#define CUR (sp->_term)->type.
-+
-+static int
-+_nc_putp(const char *name GCC_UNUSED, const char *value)
-+{
-+    int rc = ERR;
-+
-+    if (value) {
-+	TPUTS_TRACE(name);
-+	rc = putp(value);
-+    }
-+    return rc;
-+}
-+
-+static int
-+_nc_putp_flush(const char *name, const char *value)
-+{
-+    int rc = _nc_putp(name, value);
-+    if (rc != ERR) {
-+	_nc_flush();
-+    }
-+    return rc;
-+}
-+
- /* Turn the keypad on/off
-  *
-  * Note:  we flush the output because changing this mode causes some terminals
-@@ -247,24 +234,94 @@
-  * the terminal state _before_ switching modes.
-  */
- NCURSES_EXPORT(int)
--_nc_keypad(bool flag)
-+_nc_keypad(SCREEN *sp, bool flag)
- {
--    if (flag && keypad_xmit) {
--	TPUTS_TRACE("keypad_xmit");
--	putp(keypad_xmit);
--	_nc_flush();
--    } else if (!flag && keypad_local) {
--	TPUTS_TRACE("keypad_local");
--	putp(keypad_local);
--	_nc_flush();
-+    int rc = ERR;
-+
-+    if (sp != 0) {
-+#ifdef USE_PTHREADS
-+	/*
-+	 * We might have this situation in a multithreaded application that
-+	 * has wgetch() reading in more than one thread.  putp() and below
-+	 * may use SP explicitly.
-+	 */
-+	if (sp != SP) {
-+	    SCREEN *save_sp;
-+
-+	    /* cannot use use_screen(), since that is not in tinfo library */
-+	    _nc_lock_global(curses);
-+	    save_sp = SP;
-+	    SP = sp;
-+	    rc = _nc_keypad(sp, flag);
-+	    SP = save_sp;
-+	    _nc_unlock_global(curses);
-+	} else
-+#endif
-+	{
-+	    if (flag) {
-+		(void) _nc_putp_flush("keypad_xmit", keypad_xmit);
-+	    } else if (!flag && keypad_local) {
-+		(void) _nc_putp_flush("keypad_local", keypad_local);
-+	    }
-+
-+	    if (flag && !sp->_tried) {
-+		_nc_init_keytry(sp);
-+		sp->_tried = TRUE;
-+	    }
-+	    sp->_keypad_on = flag;
-+	    rc = OK;
-+	}
-     }
-+    return (rc);
-+}
-+
-+static int
-+_nc_curs_set(SCREEN *sp, int vis)
-+{
-+    int result = ERR;
-+
-+    T((T_CALLED("curs_set(%d)"), vis));
-+    if (sp != 0 && vis >= 0 && vis <= 2) {
-+	int cursor = sp->_cursor;
-+
-+	if (vis == cursor) {
-+	    result = cursor;
-+	} else {
-+	    switch (vis) {
-+	    case 2:
-+		result = _nc_putp_flush("cursor_visible", cursor_visible);
-+		break;
-+	    case 1:
-+		result = _nc_putp_flush("cursor_normal", cursor_normal);
-+		break;
-+	    case 0:
-+		result = _nc_putp_flush("cursor_invisible", cursor_invisible);
-+		break;
-+	    }
-+	    if (result != ERR)
-+		result = (cursor == -1 ? 1 : cursor);
-+	    sp->_cursor = vis;
-+	}
-+    }
-+    returnCode(result);
-+}
-+
-+static int
-+_nc_meta(SCREEN *sp, bool flag)
-+{
-+    int result = ERR;
-+
-+    /* Ok, we stay relaxed and don't signal an error if win is NULL */
- 
-     if (SP != 0) {
--	if (flag && !SP->_tried) {
--	    _nc_init_keytry();
--	    SP->_tried = TRUE;
-+	SP->_use_meta = flag;
-+
-+	if (flag) {
-+	    _nc_putp("meta_on", meta_on);
-+	} else {
-+	    _nc_putp("meta_off", meta_off);
- 	}
--	SP->_keypad_on = flag;
-+	result = OK;
-     }
--    return (OK);
-+    return result;
- }
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/lib_raw.c ncurses-5.6/ncurses/tinfo/lib_raw.c
---- ncurses-5.6.orig/ncurses/tinfo/lib_raw.c	2002-07-06 18:00:45.000000000 -0400
-+++ ncurses-5.6/ncurses/tinfo/lib_raw.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2001,2002 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2002,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -49,7 +49,7 @@
- #include <curses.priv.h>
- #include <term.h>		/* cur_term */
- 
--MODULE_ID("$Id: lib_raw.c,v 1.13 2002/07/06 22:00:45 tom Exp $")
-+MODULE_ID("$Id: lib_raw.c,v 1.14 2007/09/29 21:50:22 tom Exp $")
- 
- #if SVR4_TERMIO && !defined(_POSIX_SOURCE)
- #define _POSIX_SOURCE
-@@ -69,8 +69,8 @@
- #define COOKED_INPUT	(IXON|BRKINT|PARMRK)
- 
- #ifdef TRACE
--#define BEFORE(N)	if (_nc_tracing&TRACE_BITS) _tracef("%s before bits: %s", N, _nc_tracebits())
--#define AFTER(N)	if (_nc_tracing&TRACE_BITS) _tracef("%s after bits: %s", N, _nc_tracebits())
-+#define BEFORE(N)	if (USE_TRACEF(TRACE_BITS)) _nc_locked_tracef("%s before bits: %s", N, _nc_tracebits())
-+#define AFTER(N)	if (USE_TRACEF(TRACE_BITS)) _nc_locked_tracef("%s after bits: %s", N, _nc_tracebits())
- #else
- #define BEFORE(s)
- #define AFTER(s)
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/lib_setup.c ncurses-5.6/ncurses/tinfo/lib_setup.c
---- ncurses-5.6.orig/ncurses/tinfo/lib_setup.c	2006-07-28 18:58:13.000000000 -0400
-+++ ncurses-5.6/ncurses/tinfo/lib_setup.c	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -29,7 +29,7 @@
- /****************************************************************************
-  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
-  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
-- *     and: Thomas E. Dickey 1996-2003                                      *
-+ *     and: Thomas E. Dickey                        1996-on                 *
-  ****************************************************************************/
- 
- /*
-@@ -53,7 +53,7 @@
- 
- #include <term.h>		/* lines, columns, cur_term */
- 
--MODULE_ID("$Id: lib_setup.c,v 1.95 2006/07/28 22:58:13 tom Exp $")
-+MODULE_ID("$Id: lib_setup.c,v 1.107 2008/06/07 22:22:58 tom Exp $")
- 
- /****************************************************************************
-  *
-@@ -99,55 +99,84 @@
- # endif
- #endif
- 
-+/*
-+ * Wrap global variables in this module.
-+ */
-+#if USE_REENTRANT
-+NCURSES_EXPORT(char *)
-+NCURSES_PUBLIC_VAR(ttytype) (void)
-+{
-+    static char empty[] = "";
-+    return cur_term ? cur_term->type.term_names : empty;
-+}
-+NCURSES_EXPORT(int *)
-+_nc_ptr_Lines(void)
-+{
-+    return ptrLines();
-+}
-+NCURSES_EXPORT(int)
-+NCURSES_PUBLIC_VAR(LINES) (void)
-+{
-+    return *_nc_ptr_Lines();
-+}
-+NCURSES_EXPORT(int *)
-+_nc_ptr_Cols(void)
-+{
-+    return ptrCols();
-+}
-+NCURSES_EXPORT(int)
-+NCURSES_PUBLIC_VAR(COLS) (void)
-+{
-+    return *_nc_ptr_Cols();
-+}
-+NCURSES_EXPORT(int)
-+NCURSES_PUBLIC_VAR(TABSIZE) (void)
-+{
-+    return SP ? SP->_TABSIZE : 8;
-+}
-+#else
- NCURSES_EXPORT_VAR(char) ttytype[NAMESIZE] = "";
- NCURSES_EXPORT_VAR(int) LINES = 0;
- NCURSES_EXPORT_VAR(int) COLS = 0;
- NCURSES_EXPORT_VAR(int) TABSIZE = 0;
-+#endif
- 
--static int _use_env = TRUE;
-+#if NCURSES_EXT_FUNCS
-+NCURSES_EXPORT(int)
-+set_tabsize(int value)
-+{
-+    int code = OK;
-+#if USE_REENTRANT
-+    if (SP) {
-+	SP->_TABSIZE = value;
-+    } else {
-+	code = ERR;
-+    }
-+#else
-+    TABSIZE = value;
-+#endif
-+    return code;
-+}
-+#endif
- 
- #if USE_SIGWINCH
--int
--_nc_handle_sigwinch(int enable)
-+/*
-+ * If we have a pending SIGWINCH, set the flag in each screen.
-+ */
-+NCURSES_EXPORT(int)
-+_nc_handle_sigwinch(SCREEN *sp)
- {
--    static int have_sigwinch = 0;	/* initially no SIGWINCH's */
--    static int can_resizeall = 1;	/* initially enabled */
-     SCREEN *scan;
--    int result;
- 
--    switch (enable) {
--    default:
--	/* record a SIGWINCH */
--	have_sigwinch = 1;
--	break;
--    case 0:
--	/* temporarily disable the next block */
--	--can_resizeall;
--	break;
--    case 1:
--	/* temporarily enable the next block */
--	++can_resizeall;
--	break;
--    }
-+    if (_nc_globals.have_sigwinch) {
-+	_nc_globals.have_sigwinch = 0;
- 
--    /*
--     * If we have a pending SIGWINCH, set the flag in each screen.
--     * But do this only if the block is enabled.
--     */
--    if (can_resizeall-- >= 0) {	/* test and disable */
--	if (have_sigwinch) {
--	    scan = _nc_screen_chain;
--	    while (scan) {
--		scan->_sig_winch = TRUE;
--		scan = scan->_next_screen;
--	    }
--	    have_sigwinch = 0;
-+	for (each_screen(scan)) {
-+	    scan->_sig_winch = TRUE;
- 	}
-     }
--    result = can_resizeall + 1;	/* reenable (unless disables are nested) */
--    can_resizeall = result;
- 
--    return result;
-+    return (sp ? sp->_sig_winch : 0);
- }
- 
- #endif
-@@ -156,19 +185,20 @@
- use_env(bool f)
- {
-     T((T_CALLED("use_env()")));
--    _use_env = f;
-+    _nc_prescreen.use_env = f;
-     returnVoid;
- }
- 
--static void
--_nc_get_screensize(int *linep, int *colp)
-+NCURSES_EXPORT(void)
-+_nc_get_screensize(SCREEN *sp, int *linep, int *colp)
- /* Obtain lines/columns values from the environment and/or terminfo entry */
- {
-+    int my_tabsize;
-+
-     /* figure out the size of the screen */
-     T(("screen size: terminfo lines = %d columns = %d", lines, columns));
- 
--    _nc_handle_sigwinch(0);
--    if (!_use_env) {
-+    if (!_nc_prescreen.use_env) {
- 	*linep = (int) lines;
- 	*colp = (int) columns;
-     } else {			/* usually want to query LINES and COLUMNS from environment */
-@@ -214,7 +244,7 @@
- 		 * environment variable.
- 		 */
- 		if (*linep <= 0)
--		    *linep = (SP != 0 && SP->_filtered) ? 1 : WINSIZE_ROWS(size);
-+		    *linep = (sp != 0 && sp->_filtered) ? 1 : WINSIZE_ROWS(size);
- 		if (*colp <= 0)
- 		    *colp = WINSIZE_COLS(size);
- 	    }
-@@ -246,38 +276,44 @@
- 	lines = (short) (*linep);
- 	columns = (short) (*colp);
-     }
--    _nc_handle_sigwinch(1);
- 
-     T(("screen size is %dx%d", *linep, *colp));
- 
-     if (VALID_NUMERIC(init_tabs))
--	TABSIZE = (int) init_tabs;
-+	my_tabsize = (int) init_tabs;
-     else
--	TABSIZE = 8;
-+	my_tabsize = 8;
-+
-+#if USE_REENTRANT
-+    if (sp != 0)
-+	sp->_TABSIZE = my_tabsize;
-+#else
-+    TABSIZE = my_tabsize;
-+#endif
-     T(("TABSIZE = %d", TABSIZE));
- }
- 
- #if USE_SIZECHANGE
- NCURSES_EXPORT(void)
--_nc_update_screensize(void)
-+_nc_update_screensize(SCREEN *sp)
- {
-     int old_lines = lines;
-     int new_lines;
-     int old_cols = columns;
-     int new_cols;
- 
--    _nc_get_screensize(&new_lines, &new_cols);
-+    _nc_get_screensize(sp, &new_lines, &new_cols);
- 
-     /*
-      * See is_term_resized() and resizeterm().
-      * We're doing it this way because those functions belong to the upper
-      * ncurses library, while this resides in the lower terminfo library.
-      */
--    if (SP != 0
--	&& SP->_resize != 0) {
-+    if (sp != 0
-+	&& sp->_resize != 0) {
- 	if ((new_lines != old_lines) || (new_cols != old_cols))
--	    SP->_resize(new_lines, new_cols);
--	SP->_sig_winch = FALSE;
-+	    sp->_resize(new_lines, new_cols);
-+	sp->_sig_winch = FALSE;
-     }
- }
- #endif
-@@ -530,18 +566,19 @@
- 		ret_error(status, "'%s': unknown terminal type.\n", tname);
- 	    }
- 	}
-+#if !USE_REENTRANT
-+	strncpy(ttytype, term_ptr->type.term_names, NAMESIZE - 1);
-+	ttytype[NAMESIZE - 1] = '\0';
-+#endif
-+
-+	term_ptr->Filedes = Filedes;
-+	term_ptr->_termname = strdup(tname);
- 
- 	set_curterm(term_ptr);
- 
- 	if (command_character && getenv("CC"))
- 	    do_prototype();
- 
--	strncpy(ttytype, cur_term->type.term_names, NAMESIZE - 1);
--	ttytype[NAMESIZE - 1] = '\0';
--
--	cur_term->Filedes = Filedes;
--	cur_term->_termname = strdup(tname);
--
- 	/*
- 	 * If an application calls setupterm() rather than initscr() or
- 	 * newterm(), we will not have the def_prog_mode() call in
-@@ -557,13 +594,11 @@
-     /*
-      * We should always check the screensize, just in case.
-      */
--    _nc_get_screensize(&LINES, &COLS);
-+    _nc_get_screensize(SP, ptrLines(), ptrCols());
- 
-     if (errret)
- 	*errret = TGETENT_YES;
- 
--    T((T_CREATE("screen %s %dx%d"), tname, LINES, COLS));
--
-     if (generic_type) {
- 	ret_error(TGETENT_NO, "'%s': I need something more specific.\n", tname);
-     }
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/lib_termcap.c ncurses-5.6/ncurses/tinfo/lib_termcap.c
---- ncurses-5.6.orig/ncurses/tinfo/lib_termcap.c	2006-09-02 15:39:46.000000000 -0400
-+++ ncurses-5.6/ncurses/tinfo/lib_termcap.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -45,26 +45,20 @@
- 
- #include <term_entry.h>
- 
--MODULE_ID("$Id: lib_termcap.c,v 1.58 2006/09/02 19:39:46 Miroslav.Lichvar Exp $")
-+MODULE_ID("$Id: lib_termcap.c,v 1.61 2007/06/02 19:36:03 tom Exp $")
- 
- NCURSES_EXPORT_VAR(char *) UP = 0;
- NCURSES_EXPORT_VAR(char *) BC = 0;
- 
--typedef struct {
--    long sequence;
--    char *fix_sgr0;		/* this holds the filtered sgr0 string */
--    char *last_bufp;		/* help with fix_sgr0 leak */
--    TERMINAL *last_term;
--} CACHE;
--
--#define MAX_CACHE 4
--static CACHE cache[MAX_CACHE];
--static int in_cache = 0;
--
--#define FIX_SGR0 cache[in_cache].fix_sgr0
--#define LAST_TRM cache[in_cache].last_term
--#define LAST_BUF cache[in_cache].last_bufp
--#define LAST_SEQ cache[in_cache].sequence
-+#define MyCache  _nc_globals.tgetent_cache
-+#define CacheInx _nc_globals.tgetent_index
-+#define CacheSeq _nc_globals.tgetent_sequence
-+
-+#define FIX_SGR0 MyCache[CacheInx].fix_sgr0
-+#define LAST_TRM MyCache[CacheInx].last_term
-+#define LAST_BUF MyCache[CacheInx].last_bufp
-+#define LAST_USE MyCache[CacheInx].last_used
-+#define LAST_SEQ MyCache[CacheInx].sequence
- 
- /***************************************************************************
-  *
-@@ -84,8 +78,6 @@
- NCURSES_EXPORT(int)
- tgetent(char *bufp, const char *name)
- {
--    static long sequence;
--
-     int errcode;
-     int n;
-     bool found_cache = FALSE;
-@@ -100,11 +92,17 @@
-      * caller, but if tgetent() is called with the same buffer, that is
-      * good enough, since the previous data would be invalidated by the
-      * current call.
-+     *
-+     * bufp may be a null pointer, e.g., GNU termcap.  That allocates data,
-+     * which is good until the next tgetent() call.  The conventional termcap
-+     * is inconvenient because of the fixed buffer size, but because it uses
-+     * caller-supplied buffers, can have multiple terminal descriptions in
-+     * use at a given time.
-      */
--    for (n = 0; n < MAX_CACHE; ++n) {
--	bool same_result = (bufp != 0 && cache[n].last_bufp == bufp);
-+    for (n = 0; n < TGETENT_MAX; ++n) {
-+	bool same_result = (MyCache[n].last_used && MyCache[n].last_bufp == bufp);
- 	if (same_result) {
--	    in_cache = n;
-+	    CacheInx = n;
- 	    if (FIX_SGR0 != 0) {
- 		FreeAndNull(FIX_SGR0);
- 	    }
-@@ -114,10 +112,10 @@
- 	    if (LAST_TRM != 0 && LAST_TRM != cur_term) {
- 		TERMINAL *trm = LAST_TRM;
- 		del_curterm(LAST_TRM);
--		for (in_cache = 0; in_cache < MAX_CACHE; ++in_cache)
-+		for (CacheInx = 0; CacheInx < TGETENT_MAX; ++CacheInx)
- 		    if (LAST_TRM == trm)
- 			LAST_TRM = 0;
--		in_cache = n;
-+		CacheInx = n;
- 	    }
- 	    found_cache = TRUE;
- 	    break;
-@@ -126,15 +124,15 @@
-     if (!found_cache) {
- 	int best = 0;
- 
--	for (in_cache = 0; in_cache < MAX_CACHE; ++in_cache) {
--	    if (LAST_SEQ < cache[best].sequence) {
--		best = in_cache;
-+	for (CacheInx = 0; CacheInx < TGETENT_MAX; ++CacheInx) {
-+	    if (LAST_SEQ < MyCache[best].sequence) {
-+		best = CacheInx;
- 	    }
- 	}
--	in_cache = best;
-+	CacheInx = best;
-     }
-     LAST_TRM = cur_term;
--    LAST_SEQ = ++sequence;
-+    LAST_SEQ = ++CacheSeq;
- 
-     PC = 0;
-     UP = 0;
-@@ -164,6 +162,7 @@
- 	    }
- 	}
- 	LAST_BUF = bufp;
-+	LAST_USE = TRUE;
- 
- 	(void) baudrate();	/* sets ospeed as a side-effect */
- 
-@@ -282,9 +281,10 @@
- NCURSES_EXPORT(void)
- _nc_tgetent_leaks(void)
- {
--    for (in_cache = 0; in_cache < MAX_CACHE; ++in_cache) {
-+    for (CacheInx = 0; CacheInx < TGETENT_MAX; ++CacheInx) {
- 	FreeIfNeeded(FIX_SGR0);
--	del_curterm(LAST_TRM);
-+	if (LAST_TRM != 0)
-+	    del_curterm(LAST_TRM);
-     }
- }
- #endif
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/lib_tparm.c ncurses-5.6/ncurses/tinfo/lib_tparm.c
---- ncurses-5.6.orig/ncurses/tinfo/lib_tparm.c	2006-11-25 20:12:56.000000000 -0500
-+++ ncurses-5.6/ncurses/tinfo/lib_tparm.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -43,7 +43,7 @@
- #include <term.h>
- #include <tic.h>
- 
--MODULE_ID("$Id: lib_tparm.c,v 1.71 2006/11/26 01:12:56 tom Exp $")
-+MODULE_ID("$Id: lib_tparm.c,v 1.74 2007/09/29 20:37:13 tom Exp $")
- 
- /*
-  *	char *
-@@ -105,43 +105,20 @@
-  *	resulting in x mod y, not the reverse.
-  */
- 
--#define STACKSIZE	20
--
--typedef struct {
--    union {
--	int num;
--	char *str;
--    } data;
--    bool num_type;
--} stack_frame;
--
- NCURSES_EXPORT_VAR(int) _nc_tparm_err = 0;
- 
--static stack_frame stack[STACKSIZE];
--static int stack_ptr;
--static const char *tparam_base = "";
--
--#ifdef TRACE
--static const char *tname;
--#endif /* TRACE */
--
--static char *out_buff;
--static size_t out_size;
--static size_t out_used;
--
--static char *fmt_buff;
--static size_t fmt_size;
-+#define TPS(var) _nc_prescreen.tparm_state.var
- 
- #if NO_LEAKS
- NCURSES_EXPORT(void)
- _nc_free_tparm(void)
- {
--    if (out_buff != 0) {
--	FreeAndNull(out_buff);
--	out_size = 0;
--	out_used = 0;
--	FreeAndNull(fmt_buff);
--	fmt_size = 0;
-+    if (TPS(out_buff) != 0) {
-+	FreeAndNull(TPS(out_buff));
-+	TPS(out_size) = 0;
-+	TPS(out_used) = 0;
-+	FreeAndNull(TPS(fmt_buff));
-+	TPS(fmt_size) = 0;
-     }
- }
- #endif
-@@ -149,11 +126,11 @@
- static NCURSES_INLINE void
- get_space(size_t need)
- {
--    need += out_used;
--    if (need > out_size) {
--	out_size = need * 2;
--	out_buff = typeRealloc(char, out_size, out_buff);
--	if (out_buff == 0)
-+    need += TPS(out_used);
-+    if (need > TPS(out_size)) {
-+	TPS(out_size) = need * 2;
-+	TPS(out_buff) = typeRealloc(char, TPS(out_size), TPS(out_buff));
-+	if (TPS(out_buff) == 0)
- 	    _nc_err_abort(MSG_NO_MEMORY);
-     }
- }
-@@ -167,8 +144,8 @@
- 
-     get_space(s_len + 1);
- 
--    (void) sprintf(out_buff + out_used, fmt, s);
--    out_used += strlen(out_buff + out_used);
-+    (void) sprintf(TPS(out_buff) + TPS(out_used), fmt, s);
-+    TPS(out_used) += strlen(TPS(out_buff) + TPS(out_used));
- }
- 
- static NCURSES_INLINE void
-@@ -179,8 +156,8 @@
- 
-     get_space((unsigned) len + 1);
- 
--    (void) sprintf(out_buff + out_used, fmt, number);
--    out_used += strlen(out_buff + out_used);
-+    (void) sprintf(TPS(out_buff) + TPS(out_used), fmt, number);
-+    TPS(out_used) += strlen(TPS(out_buff) + TPS(out_used));
- }
- 
- static NCURSES_INLINE void
-@@ -189,18 +166,18 @@
-     if (c == 0)
- 	c = 0200;
-     get_space(1);
--    out_buff[out_used++] = c;
-+    TPS(out_buff)[TPS(out_used)++] = c;
- }
- 
- static NCURSES_INLINE void
- npush(int x)
- {
--    if (stack_ptr < STACKSIZE) {
--	stack[stack_ptr].num_type = TRUE;
--	stack[stack_ptr].data.num = x;
--	stack_ptr++;
-+    if (TPS(stack_ptr) < STACKSIZE) {
-+	TPS(stack)[TPS(stack_ptr)].num_type = TRUE;
-+	TPS(stack)[TPS(stack_ptr)].data.num = x;
-+	TPS(stack_ptr)++;
-     } else {
--	DEBUG(2, ("npush: stack overflow: %s", _nc_visbuf(tparam_base)));
-+	DEBUG(2, ("npush: stack overflow: %s", _nc_visbuf(TPS(tparam_base))));
- 	_nc_tparm_err++;
-     }
- }
-@@ -209,12 +186,12 @@
- npop(void)
- {
-     int result = 0;
--    if (stack_ptr > 0) {
--	stack_ptr--;
--	if (stack[stack_ptr].num_type)
--	    result = stack[stack_ptr].data.num;
-+    if (TPS(stack_ptr) > 0) {
-+	TPS(stack_ptr)--;
-+	if (TPS(stack)[TPS(stack_ptr)].num_type)
-+	    result = TPS(stack)[TPS(stack_ptr)].data.num;
-     } else {
--	DEBUG(2, ("npop: stack underflow: %s", _nc_visbuf(tparam_base)));
-+	DEBUG(2, ("npop: stack underflow: %s", _nc_visbuf(TPS(tparam_base))));
- 	_nc_tparm_err++;
-     }
-     return result;
-@@ -223,12 +200,12 @@
- static NCURSES_INLINE void
- spush(char *x)
- {
--    if (stack_ptr < STACKSIZE) {
--	stack[stack_ptr].num_type = FALSE;
--	stack[stack_ptr].data.str = x;
--	stack_ptr++;
-+    if (TPS(stack_ptr) < STACKSIZE) {
-+	TPS(stack)[TPS(stack_ptr)].num_type = FALSE;
-+	TPS(stack)[TPS(stack_ptr)].data.str = x;
-+	TPS(stack_ptr)++;
-     } else {
--	DEBUG(2, ("spush: stack overflow: %s", _nc_visbuf(tparam_base)));
-+	DEBUG(2, ("spush: stack overflow: %s", _nc_visbuf(TPS(tparam_base))));
- 	_nc_tparm_err++;
-     }
- }
-@@ -238,12 +215,13 @@
- {
-     static char dummy[] = "";	/* avoid const-cast */
-     char *result = dummy;
--    if (stack_ptr > 0) {
--	stack_ptr--;
--	if (!stack[stack_ptr].num_type && stack[stack_ptr].data.str != 0)
--	    result = stack[stack_ptr].data.str;
-+    if (TPS(stack_ptr) > 0) {
-+	TPS(stack_ptr)--;
-+	if (!TPS(stack)[TPS(stack_ptr)].num_type
-+	    && TPS(stack)[TPS(stack_ptr)].data.str != 0)
-+	    result = TPS(stack)[TPS(stack_ptr)].data.str;
-     } else {
--	DEBUG(2, ("spop: stack underflow: %s", _nc_visbuf(tparam_base)));
-+	DEBUG(2, ("spop: stack underflow: %s", _nc_visbuf(TPS(tparam_base))));
- 	_nc_tparm_err++;
-     }
-     return result;
-@@ -369,10 +347,11 @@
-     if (cp == 0)
- 	return 0;
- 
--    if ((len2 = strlen(cp)) > fmt_size) {
--	fmt_size = len2 + fmt_size + 2;
--	if ((fmt_buff = typeRealloc(char, fmt_size, fmt_buff)) == 0)
--	      return 0;
-+    if ((len2 = strlen(cp)) > TPS(fmt_size)) {
-+	TPS(fmt_size) = len2 + TPS(fmt_size) + 2;
-+	TPS(fmt_buff) = typeRealloc(char, TPS(fmt_size), TPS(fmt_buff));
-+	if (TPS(fmt_buff) == 0)
-+	    return 0;
-     }
- 
-     memset(p_is_s, 0, sizeof(p_is_s[0]) * NUM_PARM);
-@@ -381,7 +360,7 @@
-     while ((cp - string) < (int) len2) {
- 	if (*cp == '%') {
- 	    cp++;
--	    cp = parse_format(cp, fmt_buff, &len);
-+	    cp = parse_format(cp, TPS(fmt_buff), &len);
- 	    switch (*cp) {
- 	    default:
- 		break;
-@@ -474,7 +453,6 @@
- static NCURSES_INLINE char *
- tparam_internal(const char *string, va_list ap)
- {
--#define NUM_VARS 26
-     char *p_is_s[NUM_PARM];
-     TPARM_ARG param[NUM_PARM];
-     int popcount;
-@@ -485,13 +463,11 @@
-     int i;
-     const char *cp = string;
-     size_t len2;
--    static int dynamic_var[NUM_VARS];
--    static int static_vars[NUM_VARS];
- 
-     if (cp == NULL)
- 	return NULL;
- 
--    out_used = 0;
-+    TPS(out_used) = 0;
-     len2 = strlen(cp);
- 
-     /*
-@@ -500,7 +476,7 @@
-      * variable-length argument list.
-      */
-     number = _nc_tparm_analyze(cp, p_is_s, &popcount);
--    if (fmt_buff == 0)
-+    if (TPS(fmt_buff) == 0)
- 	return NULL;
- 
-     for (i = 0; i < max(popcount, number); i++) {
-@@ -525,22 +501,23 @@
-      * the expansion of (for example) \E[%d;%dH work correctly in termcap
-      * style, which means tparam() will expand termcap strings OK.
-      */
--    stack_ptr = 0;
-+    TPS(stack_ptr) = 0;
-     if (popcount == 0) {
- 	popcount = number;
- 	for (i = number - 1; i >= 0; i--)
- 	    npush(param[i]);
-     }
- #ifdef TRACE
--    if (_nc_tracing & TRACE_CALLS) {
-+    if (USE_TRACEF(TRACE_CALLS)) {
- 	for (i = 0; i < popcount; i++) {
- 	    if (p_is_s[i] != 0)
- 		save_text(", %s", _nc_visbuf(p_is_s[i]), 0);
- 	    else
- 		save_number(", %d", param[i], 0);
- 	}
--	_tracef(T_CALLED("%s(%s%s)"), tname, _nc_visbuf(cp), out_buff);
--	out_used = 0;
-+	_tracef(T_CALLED("%s(%s%s)"), TPS(tname), _nc_visbuf(cp), TPS(out_buff));
-+	TPS(out_used) = 0;
-+	_nc_unlock_global(tracef);
-     }
- #endif /* TRACE */
- 
-@@ -548,8 +525,8 @@
- 	if (*cp != '%') {
- 	    save_char(UChar(*cp));
- 	} else {
--	    tparam_base = cp++;
--	    cp = parse_format(cp, fmt_buff, &len);
-+	    TPS(tparam_base) = cp++;
-+	    cp = parse_format(cp, TPS(fmt_buff), &len);
- 	    switch (*cp) {
- 	    default:
- 		break;
-@@ -561,7 +538,7 @@
- 	    case 'o':		/* FALLTHRU */
- 	    case 'x':		/* FALLTHRU */
- 	    case 'X':		/* FALLTHRU */
--		save_number(fmt_buff, npop(), len);
-+		save_number(TPS(fmt_buff), npop(), len);
- 		break;
- 
- 	    case 'c':		/* FALLTHRU */
-@@ -573,7 +550,7 @@
- 		break;
- 
- 	    case 's':
--		save_text(fmt_buff, spop(), len);
-+		save_text(TPS(fmt_buff), spop(), len);
- 		break;
- 
- 	    case 'p':
-@@ -591,10 +568,10 @@
- 		cp++;
- 		if (isUPPER(*cp)) {
- 		    i = (UChar(*cp) - 'A');
--		    static_vars[i] = npop();
-+		    TPS(static_vars)[i] = npop();
- 		} else if (isLOWER(*cp)) {
- 		    i = (UChar(*cp) - 'a');
--		    dynamic_var[i] = npop();
-+		    TPS(dynamic_var)[i] = npop();
- 		}
- 		break;
- 
-@@ -602,10 +579,10 @@
- 		cp++;
- 		if (isUPPER(*cp)) {
- 		    i = (UChar(*cp) - 'A');
--		    npush(static_vars[i]);
-+		    npush(TPS(static_vars)[i]);
- 		} else if (isLOWER(*cp)) {
- 		    i = (UChar(*cp) - 'a');
--		    npush(dynamic_var[i]);
-+		    npush(TPS(dynamic_var)[i]);
- 		}
- 		break;
- 
-@@ -768,10 +745,10 @@
-     }				/* endwhile (*cp) */
- 
-     get_space(1);
--    out_buff[out_used] = '\0';
-+    TPS(out_buff)[TPS(out_used)] = '\0';
- 
--    T((T_RETURN("%s"), _nc_visbuf(out_buff)));
--    return (out_buff);
-+    T((T_RETURN("%s"), _nc_visbuf(TPS(out_buff))));
-+    return (TPS(out_buff));
- }
- 
- #if NCURSES_TPARM_VARARGS
-@@ -789,7 +766,7 @@
-     _nc_tparm_err = 0;
-     va_start(ap, string);
- #ifdef TRACE
--    tname = "tparm";
-+    TPS(tname) = "tparm";
- #endif /* TRACE */
-     result = tparam_internal(string, ap);
-     va_end(ap);
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/lib_tputs.c ncurses-5.6/ncurses/tinfo/lib_tputs.c
---- ncurses-5.6.orig/ncurses/tinfo/lib_tputs.c	2003-08-23 17:39:20.000000000 -0400
-+++ ncurses-5.6/ncurses/tinfo/lib_tputs.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2002,2003 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2003,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -45,12 +45,12 @@
- #include <termcap.h>		/* ospeed */
- #include <tic.h>
- 
--MODULE_ID("$Id: lib_tputs.c,v 1.62 2003/08/23 21:39:20 tom Exp $")
-+MODULE_ID("$Id: lib_tputs.c,v 1.64 2007/09/29 20:37:13 tom Exp $")
- 
--NCURSES_EXPORT_VAR(char) PC = 0;		/* used by termcap library */
--NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0;	/* used by termcap library */
-+NCURSES_EXPORT_VAR(char) PC = 0;              /* used by termcap library */
-+NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0;        /* used by termcap library */
- 
--NCURSES_EXPORT_VAR(int) _nc_nulls_sent = 0;	/* used by 'tack' program */
-+NCURSES_EXPORT_VAR(int) _nc_nulls_sent = 0;   /* used by 'tack' program */
- 
- static int (*my_outch) (int c) = _nc_outch;
- 
-@@ -84,7 +84,7 @@
- NCURSES_EXPORT(int)
- _nc_outch(int ch)
- {
--    TRACE_OUTCHARS(1);
-+    COUNT_OUTCHARS(1);
- 
-     if (SP != 0
- 	&& SP->_cleanup) {
-@@ -119,7 +119,7 @@
- #ifdef TRACE
-     char addrbuf[32];
- 
--    if (_nc_tracing & TRACE_TPUTS) {
-+    if (USE_TRACEF(TRACE_TPUTS)) {
- 	if (outc == _nc_outch)
- 	    (void) strcpy(addrbuf, "_nc_outch");
- 	else
-@@ -130,7 +130,8 @@
- 	} else {
- 	    _tracef("tputs(%s, %d, %s) called", _nc_visbuf(string), affcnt, addrbuf);
- 	}
--	_nc_tputs_trace = (char *) NULL;
-+	TPUTS_TRACE(NULL);
-+	_nc_unlock_global(tracef);
-     }
- #endif /* TRACE */
- 
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/lib_ttyflags.c ncurses-5.6/ncurses/tinfo/lib_ttyflags.c
---- ncurses-5.6.orig/ncurses/tinfo/lib_ttyflags.c	2006-12-09 20:31:54.000000000 -0500
-+++ ncurses-5.6/ncurses/tinfo/lib_ttyflags.c	2008-06-18 06:49:50.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -38,31 +38,35 @@
- #include <curses.priv.h>
- #include <term.h>		/* cur_term */
- 
--MODULE_ID("$Id: lib_ttyflags.c,v 1.13 2006/12/10 01:31:54 tom Exp $")
-+MODULE_ID("$Id: lib_ttyflags.c,v 1.16 2008/05/03 22:39:03 tom Exp $")
- 
- NCURSES_EXPORT(int)
- _nc_get_tty_mode(TTY * buf)
- {
-     int result = OK;
- 
--    if (cur_term == 0) {
-+    if (buf == 0) {
- 	result = ERR;
-     } else {
--	for (;;) {
--	    if (GET_TTY(cur_term->Filedes, buf) != 0) {
--		if (errno == EINTR)
--		    continue;
--		result = ERR;
-+	if (cur_term == 0) {
-+	    result = ERR;
-+	} else {
-+	    for (;;) {
-+		if (GET_TTY(cur_term->Filedes, buf) != 0) {
-+		    if (errno == EINTR)
-+			continue;
-+		    result = ERR;
-+		}
-+		break;
- 	    }
--	    break;
- 	}
--    }
- 
--    if (result == ERR)
--	memset(buf, 0, sizeof(*buf));
-+	if (result == ERR)
-+	    memset(buf, 0, sizeof(*buf));
- 
--    TR(TRACE_BITS, ("_nc_get_tty_mode(%d): %s",
--		    cur_term->Filedes, _nc_trace_ttymode(buf)));
-+	TR(TRACE_BITS, ("_nc_get_tty_mode(%d): %s",
-+			cur_term->Filedes, _nc_trace_ttymode(buf)));
-+    }
-     return (result);
- }
- 
-@@ -71,22 +75,26 @@
- {
-     int result = OK;
- 
--    if (cur_term == 0) {
-+    if (buf == 0) {
- 	result = ERR;
-     } else {
--	for (;;) {
--	    if (SET_TTY(cur_term->Filedes, buf) != 0) {
--		if (errno == EINTR)
--		    continue;
--		if ((errno == ENOTTY) && (SP != 0))
--		    SP->_notty = TRUE;
--		result = ERR;
-+	if (cur_term == 0) {
-+	    result = ERR;
-+	} else {
-+	    for (;;) {
-+		if (SET_TTY(cur_term->Filedes, buf) != 0) {
-+		    if (errno == EINTR)
-+			continue;
-+		    if ((errno == ENOTTY) && (SP != 0))
-+			SP->_notty = TRUE;
-+		    result = ERR;
-+		}
-+		break;
- 	    }
--	    break;
- 	}
-+	TR(TRACE_BITS, ("_nc_set_tty_mode(%d): %s",
-+			cur_term->Filedes, _nc_trace_ttymode(buf)));
-     }
--    TR(TRACE_BITS, ("_nc_set_tty_mode(%d): %s",
--		    cur_term->Filedes, _nc_trace_ttymode(buf)));
-     return (result);
- }
- 
-@@ -139,7 +147,7 @@
- 	if (_nc_set_tty_mode(&cur_term->Nttyb) == OK) {
- 	    if (SP) {
- 		if (SP->_keypad_on)
--		    _nc_keypad(TRUE);
-+		    _nc_keypad(SP, TRUE);
- 		NC_BUFFERED(TRUE);
- 	    }
- 	    returnCode(OK);
-@@ -155,7 +163,7 @@
- 
-     if (cur_term != 0) {
- 	if (SP) {
--	    _nc_keypad(FALSE);
-+	    _nc_keypad(SP, FALSE);
- 	    _nc_flush();
- 	    NC_BUFFERED(FALSE);
- 	}
-@@ -164,19 +172,33 @@
-     returnCode(ERR);
- }
- 
-+static TTY *
-+saved_tty(void)
-+{
-+    TTY *result = 0;
-+
-+    if (SP != 0) {
-+	result = &(SP->_saved_tty);
-+    } else {
-+	if (_nc_prescreen.saved_tty == 0) {
-+	    _nc_prescreen.saved_tty = typeCalloc(TTY, 1);
-+	}
-+	result = _nc_prescreen.saved_tty;
-+    }
-+    return result;
-+}
-+
- /*
- **	savetty()  and  resetty()
- **
- */
- 
--static TTY buf;
--
- NCURSES_EXPORT(int)
- savetty(void)
- {
-     T((T_CALLED("savetty()")));
- 
--    returnCode(_nc_get_tty_mode(&buf));
-+    returnCode(_nc_get_tty_mode(saved_tty()));
- }
- 
- NCURSES_EXPORT(int)
-@@ -184,5 +206,5 @@
- {
-     T((T_CALLED("resetty()")));
- 
--    returnCode(_nc_set_tty_mode(&buf));
-+    returnCode(_nc_set_tty_mode(saved_tty()));
- }
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/make_keys.c ncurses-5.6/ncurses/tinfo/make_keys.c
---- ncurses-5.6.orig/ncurses/tinfo/make_keys.c	2005-08-20 15:58:18.000000000 -0400
-+++ ncurses-5.6/ncurses/tinfo/make_keys.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -39,7 +39,7 @@
- #define USE_TERMLIB 1
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: make_keys.c,v 1.12 2005/08/20 19:58:18 tom Exp $")
-+MODULE_ID("$Id: make_keys.c,v 1.13 2007/01/07 00:00:14 tom Exp $")
- 
- #include <names.c>
- 
-@@ -113,7 +113,7 @@
- 	"#if BROKEN_LINKER",
- 	"static",
- 	"#endif",
--	"struct tinfo_fkeys _nc_tinfo_fkeys[] = {",
-+	"const struct tinfo_fkeys _nc_tinfo_fkeys[] = {",
- 	0
-     };
-     static const char *suffix[] =
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/name_match.c ncurses-5.6/ncurses/tinfo/name_match.c
---- ncurses-5.6.orig/ncurses/tinfo/name_match.c	2005-01-22 16:47:25.000000000 -0500
-+++ ncurses-5.6/ncurses/tinfo/name_match.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1999-2004,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1999-2005,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -34,38 +34,38 @@
- #include <term.h>
- #include <tic.h>
- 
--MODULE_ID("$Id: name_match.c,v 1.15 2005/01/22 21:47:25 tom Exp $")
-+MODULE_ID("$Id: name_match.c,v 1.16 2007/04/21 21:28:13 tom Exp $")
- 
- /*
-  *	_nc_first_name(char *names)
-  *
-  *	Extract the primary name from a compiled entry.
-  */
-+#define FirstName _nc_globals.first_name
- 
- NCURSES_EXPORT(char *)
- _nc_first_name(const char *const sp)
- /* get the first name from the given name list */
- {
--    static char *buf;
--    register unsigned n;
-+    unsigned n;
- 
- #if NO_LEAKS
-     if (sp == 0) {
--	if (buf != 0)
--	    FreeAndNull(buf);	/* for leak-testing */
-+	if (FirstName != 0)
-+	    FreeAndNull(FirstName);
- 	return 0;
-     }
- #endif
- 
--    if (buf == 0)
--	buf = typeMalloc(char, MAX_NAME_SIZE + 1);
-+    if (FirstName == 0)
-+	FirstName = typeMalloc(char, MAX_NAME_SIZE + 1);
-     for (n = 0; n < MAX_NAME_SIZE; n++) {
--	if ((buf[n] = sp[n]) == '\0'
--	    || (buf[n] == '|'))
-+	if ((FirstName[n] = sp[n]) == '\0'
-+	    || (FirstName[n] == '|'))
- 	    break;
-     }
--    buf[n] = '\0';
--    return (buf);
-+    FirstName[n] = '\0';
-+    return (FirstName);
- }
- 
- /*
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/parse_entry.c ncurses-5.6/ncurses/tinfo/parse_entry.c
---- ncurses-5.6.orig/ncurses/tinfo/parse_entry.c	2006-06-17 13:57:50.000000000 -0400
-+++ ncurses-5.6/ncurses/tinfo/parse_entry.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -48,7 +48,7 @@
- #include <tic.h>
- #include <term_entry.h>
- 
--MODULE_ID("$Id: parse_entry.c,v 1.63 2006/06/17 17:57:50 tom Exp $")
-+MODULE_ID("$Id: parse_entry.c,v 1.65 2007/08/11 16:19:02 tom Exp $")
- 
- #ifdef LINT
- static short const parametrized[] =
-@@ -283,7 +283,7 @@
- 	} else {
- 	    /* normal token lookup */
- 	    entry_ptr = _nc_find_entry(_nc_curr_token.tk_name,
--				       _nc_syntax ? _nc_cap_hash_table : _nc_info_hash_table);
-+				       _nc_get_hash_table(_nc_syntax));
- 
- 	    /*
- 	     * Our kluge to handle aliasing.  The reason it's done
-@@ -300,7 +300,7 @@
- 		    if (entryp->nuses != 0) {
- 			BAD_TC_USAGE
- 		    }
--		    for (ap = _nc_capalias_table; ap->from; ap++)
-+		    for (ap = _nc_get_alias_table(TRUE); ap->from; ap++)
- 			if (strcmp(ap->from, _nc_curr_token.tk_name) == 0) {
- 			    if (ap->to == (char *) 0) {
- 				_nc_warning("%s (%s termcap extension) ignored",
-@@ -308,14 +308,15 @@
- 				goto nexttok;
- 			    }
- 
--			    entry_ptr = _nc_find_entry(ap->to, _nc_cap_hash_table);
-+			    entry_ptr = _nc_find_entry(ap->to,
-+						       _nc_get_hash_table(TRUE));
- 			    if (entry_ptr && !silent)
- 				_nc_warning("%s (%s termcap extension) aliased to %s",
- 					    ap->from, ap->source, ap->to);
- 			    break;
- 			}
- 		} else {	/* if (_nc_syntax == SYN_TERMINFO) */
--		    for (ap = _nc_infoalias_table; ap->from; ap++)
-+		    for (ap = _nc_get_alias_table(FALSE); ap->from; ap++)
- 			if (strcmp(ap->from, _nc_curr_token.tk_name) == 0) {
- 			    if (ap->to == (char *) 0) {
- 				_nc_warning("%s (%s terminfo extension) ignored",
-@@ -323,7 +324,8 @@
- 				goto nexttok;
- 			    }
- 
--			    entry_ptr = _nc_find_entry(ap->to, _nc_info_hash_table);
-+			    entry_ptr = _nc_find_entry(ap->to,
-+						       _nc_get_hash_table(FALSE));
- 			    if (entry_ptr && !silent)
- 				_nc_warning("%s (%s terminfo extension) aliased to %s",
- 					    ap->from, ap->source, ap->to);
-@@ -796,8 +798,8 @@
- 
- 	    /* now we know we found a match in ko_table, so... */
- 
--	    from_ptr = _nc_find_entry(ap->from, _nc_cap_hash_table);
--	    to_ptr = _nc_find_entry(ap->to, _nc_info_hash_table);
-+	    from_ptr = _nc_find_entry(ap->from, _nc_get_hash_table(TRUE));
-+	    to_ptr = _nc_find_entry(ap->to, _nc_get_hash_table(FALSE));
- 
- 	    if (!from_ptr || !to_ptr)	/* should never happen! */
- 		_nc_err_abort("ko translation table is invalid, I give up");
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/read_entry.c ncurses-5.6/ncurses/tinfo/read_entry.c
---- ncurses-5.6.orig/ncurses/tinfo/read_entry.c	2006-08-19 11:58:50.000000000 -0400
-+++ ncurses-5.6/ncurses/tinfo/read_entry.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -42,7 +42,7 @@
- #include <tic.h>
- #include <term_entry.h>
- 
--MODULE_ID("$Id: read_entry.c,v 1.99 2006/08/19 15:58:50 tom Exp $")
-+MODULE_ID("$Id: read_entry.c,v 1.100 2007/11/17 23:56:50 tom Exp $")
- 
- #define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts))
- 
-@@ -409,7 +409,7 @@
- 	unsigned need = 4 + strlen(path) + strlen(name);
- 
- 	if (need <= limit) {
--	    (void) sprintf(filename, "%s/%c/%s", path, *name, name);
-+	    (void) sprintf(filename, "%s/" LEAF_FMT "/%s", path, *name, name);
- 	    result = _nc_read_file_entry(filename, tp);
- 	}
-     }
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/setbuf.c ncurses-5.6/ncurses/tinfo/setbuf.c
---- ncurses-5.6.orig/ncurses/tinfo/setbuf.c	2003-11-15 18:55:34.000000000 -0500
-+++ ncurses-5.6/ncurses/tinfo/setbuf.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2000,2003 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2003,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -40,7 +40,7 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: setbuf.c,v 1.12 2003/11/15 23:55:34 tom Exp $")
-+MODULE_ID("$Id: setbuf.c,v 1.13 2007/05/12 19:04:02 tom Exp $")
- 
- /*
-  * If the output file descriptor is connected to a tty (the typical case) it
-@@ -102,7 +102,7 @@
- {
-     /* optional optimization hack -- do before any output to ofp */
- #if HAVE_SETVBUF || HAVE_SETBUFFER
--    if (SP->_buffered != (int)buffered) {
-+    if (SP->_buffered != buffered) {
- 	unsigned buf_len;
- 	char *buf_ptr;
- 
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/strings.c ncurses-5.6/ncurses/tinfo/strings.c
---- ncurses-5.6.orig/ncurses/tinfo/strings.c	2003-08-16 19:46:00.000000000 -0400
-+++ ncurses-5.6/ncurses/tinfo/strings.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2000,2003 Free Software Foundation, Inc.                   *
-+ * Copyright (c) 2000-2003,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -36,7 +36,7 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: strings.c,v 1.5 2003/08/16 23:46:00 tom Exp $")
-+MODULE_ID("$Id: strings.c,v 1.6 2007/08/11 17:12:17 tom Exp $")
- 
- /****************************************************************************
-  * Useful string functions (especially for mvcur)
-@@ -52,7 +52,7 @@
- 
-     while ((len1 != 0) && (len1-- >= len2)) {
- 	if (!strncmp(haystack, needle, len2)) {
--	    result = haystack;
-+	    result = (char *) haystack;
- 	    break;
- 	}
- 	haystack++;
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/trim_sgr0.c ncurses-5.6/ncurses/tinfo/trim_sgr0.c
---- ncurses-5.6.orig/ncurses/tinfo/trim_sgr0.c	2006-12-02 14:37:57.000000000 -0500
-+++ ncurses-5.6/ncurses/tinfo/trim_sgr0.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2005 Free Software Foundation, Inc.                        *
-+ * Copyright (c) 2005-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -37,7 +37,7 @@
- #include <tic.h>
- #include <term_entry.h>
- 
--MODULE_ID("$Id: trim_sgr0.c,v 1.7 2006/12/02 19:37:57 tom Exp $")
-+MODULE_ID("$Id: trim_sgr0.c,v 1.8 2007/04/07 17:14:11 tom Exp $")
- 
- #undef CUR
- #define CUR tp->
-@@ -247,9 +247,7 @@
- 	if (!rewrite_sgr(on, enter_alt_charset_mode)
- 	    || !rewrite_sgr(off, exit_alt_charset_mode)
- 	    || !rewrite_sgr(end, exit_alt_charset_mode)) {
--	    FreeIfNeeded(on);
- 	    FreeIfNeeded(off);
--	    FreeIfNeeded(end);
- 	} else if (similar_sgr(off, end)
- 		   && !similar_sgr(off, on)) {
- 	    TR(TRACE_DATABASE, ("adjusting sgr(9:off) : %s", _nc_visbuf(off)));
-@@ -315,8 +313,8 @@
- 	     */
- 	    free(off);
- 	}
--	free(end);
--	free(on);
-+	FreeIfNeeded(end);
-+	FreeIfNeeded(on);
-     } else {
- 	/*
- 	 * Possibly some applications are confused if sgr0 contains rmacs,
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/use_screen.c ncurses-5.6/ncurses/tinfo/use_screen.c
---- ncurses-5.6.orig/ncurses/tinfo/use_screen.c	1969-12-31 19:00:00.000000000 -0500
-+++ ncurses-5.6/ncurses/tinfo/use_screen.c	2008-06-18 06:49:51.000000000 -0400
-@@ -0,0 +1,58 @@
-+/****************************************************************************
-+ * Copyright (c) 2007,2008 Free Software Foundation, Inc.                   *
-+ *                                                                          *
-+ * Permission is hereby granted, free of charge, to any person obtaining a  *
-+ * copy of this software and associated documentation files (the            *
-+ * "Software"), to deal in the Software without restriction, including      *
-+ * without limitation the rights to use, copy, modify, merge, publish,      *
-+ * distribute, distribute with modifications, sublicense, and/or sell       *
-+ * copies of the Software, and to permit persons to whom the Software is    *
-+ * furnished to do so, subject to the following conditions:                 *
-+ *                                                                          *
-+ * The above copyright notice and this permission notice shall be included  *
-+ * in all copies or substantial portions of the Software.                   *
-+ *                                                                          *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-+ *                                                                          *
-+ * Except as contained in this notice, the name(s) of the above copyright   *
-+ * holders shall not be used in advertising or otherwise to promote the     *
-+ * sale, use or other dealings in this Software without prior written       *
-+ * authorization.                                                           *
-+ ****************************************************************************/
-+
-+/****************************************************************************
-+ *     Author: Thomas E. Dickey                        2007                 *
-+ ****************************************************************************/
-+
-+#include <curses.priv.h>
-+
-+MODULE_ID("$Id: use_screen.c,v 1.6 2008/06/07 19:16:56 tom Exp $")
-+
-+NCURSES_EXPORT(int)
-+use_screen(SCREEN *screen, NCURSES_SCREEN_CB func, void *data)
-+{
-+    SCREEN *save_SP;
-+    int code = OK;
-+
-+    T((T_CALLED("use_screen(%p,%p,%p)"), screen, func, data));
-+
-+    /*
-+     * FIXME - add a flag so a given thread can check if _it_ has already
-+     * recurred through this point, return an error if so.
-+     */
-+    _nc_lock_global(curses);
-+    save_SP = SP;
-+    set_term(screen);
-+
-+    code = func(screen, data);
-+
-+    set_term(save_SP);
-+    _nc_unlock_global(curses);
-+    returnCode(code);
-+}
-diff -Naur ncurses-5.6.orig/ncurses/tinfo/write_entry.c ncurses-5.6/ncurses/tinfo/write_entry.c
---- ncurses-5.6.orig/ncurses/tinfo/write_entry.c	2006-10-14 16:45:16.000000000 -0400
-+++ ncurses-5.6/ncurses/tinfo/write_entry.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -54,7 +54,7 @@
- #define TRACE_OUT(p)		/*nothing */
- #endif
- 
--MODULE_ID("$Id: write_entry.c,v 1.68 2006/10/14 20:45:16 tom Exp $")
-+MODULE_ID("$Id: write_entry.c,v 1.70 2007/11/17 23:38:28 tom Exp $")
- 
- static int total_written;
- 
-@@ -97,17 +97,16 @@
-     static const char dirnames[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-     static bool verified[sizeof(dirnames)];
- 
--    char dir[2];
-+    char dir[sizeof(LEAF_FMT)];
-     char *s = 0;
- 
-     if (code == 0 || (s = strchr(dirnames, code)) == 0)
--	_nc_err_abort("Illegal terminfo subdirectory \"%c\"", code);
-+	_nc_err_abort("Illegal terminfo subdirectory \"" LEAF_FMT "\"", code);
- 
-     if (verified[s - dirnames])
- 	return;
- 
--    dir[0] = code;
--    dir[1] = '\0';
-+    sprintf(dir, LEAF_FMT, code);
-     if (make_db_root(dir) < 0) {
- 	_nc_err_abort("%s/%s: permission denied", _nc_tic_dir(0), dir);
-     }
-@@ -358,7 +357,7 @@
-     if (strlen(first_name) > sizeof(filename) - 3)
- 	_nc_warning("terminal name too long.");
- 
--    sprintf(filename, "%c/%s", first_name[0], first_name);
-+    sprintf(filename, LEAF_FMT "/%s", first_name[0], first_name);
- 
-     /*
-      * Has this primary name been written since the first call to
-@@ -399,7 +398,7 @@
- 	}
- 
- 	check_writeable(ptr[0]);
--	sprintf(linkname, "%c/%s", ptr[0], ptr);
-+	sprintf(linkname, LEAF_FMT "/%s", ptr[0], ptr);
- 
- 	if (strcmp(filename, linkname) == 0) {
- 	    _nc_warning("self-synonym ignored");
-@@ -502,7 +501,8 @@
- 	} else {
- 	    offsets[i] = nextfree;
- 	    nextfree += strlen(Strings[i]) + 1;
--	    TRACE_OUT(("put Strings[%d]=%s(%d)", i, _nc_visbuf(Strings[i]), nextfree));
-+	    TRACE_OUT(("put Strings[%d]=%s(%d)", (int) i,
-+		       _nc_visbuf(Strings[i]), nextfree));
- 	}
-     }
-     return nextfree;
-@@ -740,7 +740,7 @@
- 	 */
- 	for (i = 0; i < tp->ext_Strings; i++) {
- 	    if (VALID_STRING(tp->Strings[i + STRCOUNT])) {
--		TRACE_OUT(("WRITE ext_Strings[%d]=%s", i,
-+		TRACE_OUT(("WRITE ext_Strings[%d]=%s", (int) i,
- 			   _nc_visbuf(tp->Strings[i + STRCOUNT])));
- 		if (!WRITE_STRING(tp->Strings[i + STRCOUNT]))
- 		    return (ERR);
-@@ -751,7 +751,7 @@
- 	 * Write the extended names
- 	 */
- 	for (i = 0; i < extcnt; i++) {
--	    TRACE_OUT(("WRITE ext_Names[%d]=%s", i, tp->ext_Names[i]));
-+	    TRACE_OUT(("WRITE ext_Names[%d]=%s", (int) i, tp->ext_Names[i]));
- 	    if (!WRITE_STRING(tp->ext_Names[i]))
- 		return (ERR);
- 	}
-diff -Naur ncurses-5.6.orig/ncurses/trace/lib_trace.c ncurses-5.6/ncurses/trace/lib_trace.c
---- ncurses-5.6.orig/ncurses/trace/lib_trace.c	2006-08-19 08:05:25.000000000 -0400
-+++ ncurses-5.6/ncurses/trace/lib_trace.c	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -46,37 +46,69 @@
- 
- #include <ctype.h>
- 
--MODULE_ID("$Id: lib_trace.c,v 1.59 2006/08/19 12:05:25 tom Exp $")
-+MODULE_ID("$Id: lib_trace.c,v 1.67 2008/06/07 20:49:56 tom Exp $")
- 
- NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
- 
- #ifdef TRACE
-+
-+#if USE_REENTRANT
-+NCURSES_EXPORT(const char *)
-+NCURSES_PUBLIC_VAR(_nc_tputs_trace) (void)
-+{
-+    return SP ? SP->_tputs_trace : _nc_prescreen._tputs_trace;
-+}
-+NCURSES_EXPORT(long)
-+NCURSES_PUBLIC_VAR(_nc_outchars) (void)
-+{
-+    return SP ? SP->_outchars : _nc_prescreen._outchars;
-+}
-+NCURSES_EXPORT(void)
-+_nc_set_tputs_trace(const char *s)
-+{
-+    if (SP)
-+	SP->_tputs_trace = s;
-+    else
-+	_nc_prescreen._tputs_trace = s;
-+}
-+NCURSES_EXPORT(void)
-+_nc_count_outchars(long increment)
-+{
-+    if (SP)
-+	SP->_outchars += increment;
-+    else
-+	_nc_prescreen._outchars += increment;
-+}
-+#else
- NCURSES_EXPORT_VAR(const char *) _nc_tputs_trace = "";
- NCURSES_EXPORT_VAR(long) _nc_outchars = 0;
-+#endif
- 
--static FILE *tracefp = 0;	/* default to writing to stderr */
-+#define TraceFP		_nc_globals.trace_fp
-+#define TracePath	_nc_globals.trace_fname
-+#define TraceLevel	_nc_globals.trace_level
- 
- NCURSES_EXPORT(void)
- trace(const unsigned int tracelevel)
- {
--    static bool been_here = FALSE;
--    static char my_name[PATH_MAX];
-+    if ((TraceFP == 0) && tracelevel) {
-+	const char *mode = _nc_globals.init_trace ? "ab" : "wb";
- 
--    if ((tracefp == 0) && tracelevel) {
--	const char *mode = been_here ? "ab" : "wb";
--
--	if (*my_name == '\0') {
--	    if (getcwd(my_name, sizeof(my_name) - 10) == 0) {
-+	if (TracePath[0] == '\0') {
-+	    if (getcwd(TracePath, sizeof(TracePath) - 12) == 0) {
- 		perror("curses: Can't get working directory");
- 		exit(EXIT_FAILURE);
- 	    }
--	    strcat(my_name, "/trace");
-+	    strcat(TracePath, "/trace");
-+	    if (_nc_is_dir_path(TracePath)) {
-+		strcat(TracePath, ".log");
-+	    }
- 	}
- 
--	been_here = TRUE;
-+	_nc_globals.init_trace = TRUE;
- 	_nc_tracing = tracelevel;
--	if (_nc_access(my_name, W_OK) < 0
--	    || (tracefp = fopen(my_name, mode)) == 0) {
-+	if (_nc_access(TracePath, W_OK) < 0
-+	    || (TraceFP = fopen(TracePath, mode)) == 0) {
- 	    perror("curses: Can't open 'trace' file");
- 	    exit(EXIT_FAILURE);
- 	}
-@@ -85,18 +117,18 @@
- 	 * end of each line.  This is useful in case the program dies. 
- 	 */
- #if HAVE_SETVBUF		/* ANSI */
--	(void) setvbuf(tracefp, (char *) 0, _IOLBF, 0);
-+	(void) setvbuf(TraceFP, (char *) 0, _IOLBF, 0);
- #elif HAVE_SETBUF		/* POSIX */
--	(void) setbuffer(tracefp, (char *) 0);
-+	(void) setbuffer(TraceFP, (char *) 0);
- #endif
- 	_tracef("TRACING NCURSES version %s.%d (tracelevel=%#x)",
- 		NCURSES_VERSION,
- 		NCURSES_VERSION_PATCH,
- 		tracelevel);
-     } else if (tracelevel == 0) {
--	if (tracefp != 0) {
--	    fclose(tracefp);
--	    tracefp = 0;
-+	if (TraceFP != 0) {
-+	    fclose(TraceFP);
-+	    TraceFP = 0;
- 	}
- 	_nc_tracing = tracelevel;
-     } else if (_nc_tracing != tracelevel) {
-@@ -105,13 +137,12 @@
-     }
- }
- 
--NCURSES_EXPORT(void)
--_tracef(const char *fmt,...)
-+static void
-+_nc_va_tracef(const char *fmt, va_list ap)
- {
-     static const char Called[] = T_CALLED("");
-     static const char Return[] = T_RETURN("");
--    static int level;
--    va_list ap;
-+
-     bool before = FALSE;
-     bool after = FALSE;
-     unsigned doit = _nc_tracing;
-@@ -120,12 +151,12 @@
-     if (strlen(fmt) >= sizeof(Called) - 1) {
- 	if (!strncmp(fmt, Called, sizeof(Called) - 1)) {
- 	    before = TRUE;
--	    level++;
-+	    TraceLevel++;
- 	} else if (!strncmp(fmt, Return, sizeof(Return) - 1)) {
- 	    after = TRUE;
- 	}
- 	if (before || after) {
--	    if ((level <= 1)
-+	    if ((TraceLevel <= 1)
- 		|| (doit & TRACE_ICALLS) != 0)
- 		doit &= (TRACE_CALLS | TRACE_CCALLS);
- 	    else
-@@ -134,25 +165,46 @@
-     }
- 
-     if (doit != 0) {
--	if (tracefp == 0)
--	    tracefp = stderr;
-+	if (TraceFP == 0)
-+	    TraceFP = stderr;
-+#ifdef USE_PTHREADS
-+	/*
-+	 * TRACE_ICALLS is "really" needed to show normal use with threaded
-+	 * applications, since anything can be running during a napms(),
-+	 * making it appear in the hierarchical trace as it other functions
-+	 * are being called.
-+	 *
-+	 * Rather than add the complication of a per-thread stack, just
-+	 * show the thread-id in each line of the trace.
-+	 */
-+	fprintf(TraceFP, "%#lx:", (long) pthread_self());
-+#endif
- 	if (before || after) {
- 	    int n;
--	    for (n = 1; n < level; n++)
--		fputs("+ ", tracefp);
-+	    for (n = 1; n < TraceLevel; n++)
-+		fputs("+ ", TraceFP);
- 	}
--	va_start(ap, fmt);
--	vfprintf(tracefp, fmt, ap);
--	fputc('\n', tracefp);
--	va_end(ap);
--	fflush(tracefp);
-+	vfprintf(TraceFP, fmt, ap);
-+	fputc('\n', TraceFP);
-+	fflush(TraceFP);
-     }
- 
--    if (after && level)
--	level--;
-+    if (after && TraceLevel)
-+	TraceLevel--;
-+
-     errno = save_err;
- }
- 
-+NCURSES_EXPORT(void)
-+_tracef(const char *fmt,...)
-+{
-+    va_list ap;
-+
-+    va_start(ap, fmt);
-+    _nc_va_tracef(fmt, ap);
-+    va_end(ap);
-+}
-+
- /* Trace 'bool' return-values */
- NCURSES_EXPORT(NCURSES_BOOL)
- _nc_retrace_bool(NCURSES_BOOL code)
-@@ -224,4 +276,53 @@
-     T((T_RETURN("%p"), code));
-     return code;
- }
-+
-+#if USE_REENTRANT
-+/*
-+ * Check if the given trace-mask is enabled.
-+ *
-+ * This function may be called from within one of the functions that fills
-+ * in parameters for _tracef(), but in that case we do not want to lock the
-+ * mutex, since it is already locked.
-+ */
-+NCURSES_EXPORT(int)
-+_nc_use_tracef(unsigned mask)
-+{
-+    bool result = FALSE;
-+
-+    _nc_lock_global(tst_tracef);
-+    if (!_nc_globals.nested_tracef++) {
-+	if ((result = (_nc_tracing & (mask))) != 0
-+	    && _nc_try_global(tracef) == 0) {
-+	    /* we will call _nc_locked_tracef(), no nesting so far */
-+	} else {
-+	    /* we will not call _nc_locked_tracef() */
-+	    _nc_globals.nested_tracef = 0;
-+	}
-+    } else {
-+	/* we may call _nc_locked_tracef(), but with nested_tracef > 0 */
-+	result = (_nc_tracing & (mask));
-+    }
-+    _nc_unlock_global(tst_tracef);
-+    return result;
-+}
-+
-+/*
-+ * We call this if _nc_use_tracef() returns true, which means we must unlock
-+ * the tracef mutex.
-+ */
-+NCURSES_EXPORT(void)
-+_nc_locked_tracef(const char *fmt,...)
-+{
-+    va_list ap;
-+
-+    va_start(ap, fmt);
-+    _nc_va_tracef(fmt, ap);
-+    va_end(ap);
-+
-+    if (--(_nc_globals.nested_tracef) == 0)
-+	_nc_unlock_global(tracef);
-+}
-+#endif /* USE_REENTRANT */
-+
- #endif /* TRACE */
-diff -Naur ncurses-5.6.orig/ncurses/trace/lib_traceatr.c ncurses-5.6/ncurses/trace/lib_traceatr.c
---- ncurses-5.6.orig/ncurses/trace/lib_traceatr.c	2006-12-02 16:18:28.000000000 -0500
-+++ ncurses-5.6/ncurses/trace/lib_traceatr.c	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -39,33 +39,37 @@
- #include <curses.priv.h>
- #include <term.h>		/* acs_chars */
- 
--MODULE_ID("$Id: lib_traceatr.c,v 1.56 2006/12/02 21:18:28 tom Exp $")
-+MODULE_ID("$Id: lib_traceatr.c,v 1.60 2008/05/31 16:53:15 tom Exp $")
- 
- #define COLOR_OF(c) ((c < 0) ? "default" : (c > 7 ? color_of(c) : colors[c].name))
- 
- #ifdef TRACE
- 
--static const char l_brace[] = {L_BRACE, 0};
--static const char r_brace[] = {R_BRACE, 0};
-+static const char l_brace[] = StringOf(L_BRACE);
-+static const char r_brace[] = StringOf(R_BRACE);
- 
- #ifndef USE_TERMLIB
-+
-+#define my_buffer _nc_globals.traceatr_color_buf
-+#define my_select _nc_globals.traceatr_color_sel
-+#define my_cached _nc_globals.traceatr_color_last
-+
- static char *
- color_of(int c)
- {
--    static char buffer[2][80];
--    static int sel;
--    static int last = -1;
--
--    if (c != last) {
--	last = c;
--	sel = !sel;
-+    if (c != my_cached) {
-+	my_cached = c;
-+	my_select = !my_select;
- 	if (c == COLOR_DEFAULT)
--	    strcpy(buffer[sel], "default");
-+	    strcpy(my_buffer[my_select], "default");
- 	else
--	    sprintf(buffer[sel], "color%d", c);
-+	    sprintf(my_buffer[my_select], "color%d", c);
-     }
--    return buffer[sel];
-+    return my_buffer[my_select];
- }
-+
-+#undef my_buffer
-+#undef my_select
- #endif /* !USE_TERMLIB */
- 
- NCURSES_EXPORT(char *)
-@@ -173,17 +177,19 @@
- const char *
- _nc_altcharset_name(attr_t attr, chtype ch)
- {
-+    typedef struct {
-+	unsigned int val;
-+	const char *name;
-+    } ALT_NAMES;
-+
-     const char *result = 0;
- 
-     if ((attr & A_ALTCHARSET) && (acs_chars != 0)) {
- 	char *cp;
- 	char *found = 0;
--	static const struct {
--	    unsigned int val;
--	    const char *name;
--	} names[] =
-+	/* *INDENT-OFF* */
-+	static const ALT_NAMES names[] =
- 	{
--	    /* *INDENT-OFF* */
- 	    { 'l', "ACS_ULCORNER" },	/* upper left corner */
- 	    { 'm', "ACS_LLCORNER" },	/* lower left corner */
- 	    { 'k', "ACS_URCORNER" },	/* upper right corner */
-@@ -217,9 +223,9 @@
- 	    { '|', "ACS_NEQUAL" },	/* not equal */
- 	    { '}', "ACS_STERLING" },	/* UK pound sign */
- 	    { '\0', (char *) 0 }
--		/* *INDENT-OFF* */
--	},
--	    *sp;
-+	};
-+	/* *INDENT-OFF* */
-+	const ALT_NAMES *sp;
- 
- 	for (cp = acs_chars; cp[0] && cp[1]; cp += 2) {
- 	    if (ChCharOf(cp[1]) == ChCharOf(ch)) {
-@@ -249,7 +255,7 @@
-     if ((found = _nc_altcharset_name(ChAttrOf(ch), ch)) != 0) {
- 	(void) _nc_trace_bufcat(bufnum, found);
-     } else
--	(void) _nc_trace_bufcat(bufnum, _tracechar((int)ChCharOf(ch)));
-+	(void) _nc_trace_bufcat(bufnum, _nc_tracechar(SP, (int)ChCharOf(ch)));
- 
-     if (ChAttrOf(ch) != A_NORMAL) {
- 	(void) _nc_trace_bufcat(bufnum, " | ");
-@@ -305,14 +311,14 @@
- 		if (PUTC_n <= 0) {
- 		    if (PUTC_ch != L'\0') {
- 			/* it could not be a multibyte sequence */
--			(void) _nc_trace_bufcat(bufnum, _tracechar(UChar(ch->chars[PUTC_i])));
-+			(void) _nc_trace_bufcat(bufnum, _nc_tracechar(SP, UChar(ch->chars[PUTC_i])));
- 		    }
- 		    break;
- 		}
- 		for (n = 0; n < PUTC_n; n++) {
- 		    if (n)
- 			(void) _nc_trace_bufcat(bufnum, ", ");
--		    (void) _nc_trace_bufcat(bufnum, _tracechar(UChar(PUTC_buf[n])));
-+		    (void) _nc_trace_bufcat(bufnum, _nc_tracechar(SP, UChar(PUTC_buf[n])));
- 		}
- 	    }
- 	    (void) _nc_trace_bufcat(bufnum, " }");
-diff -Naur ncurses-5.6.orig/ncurses/trace/lib_tracebits.c ncurses-5.6/ncurses/trace/lib_tracebits.c
---- ncurses-5.6.orig/ncurses/trace/lib_tracebits.c	2006-12-09 20:33:00.000000000 -0500
-+++ ncurses-5.6/ncurses/trace/lib_tracebits.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -35,7 +35,7 @@
- #include <curses.priv.h>
- #include <term.h>		/* cur_term */
- 
--MODULE_ID("$Id: lib_tracebits.c,v 1.13 2006/12/10 01:33:00 tom Exp $")
-+MODULE_ID("$Id: lib_tracebits.c,v 1.15 2007/06/30 16:14:20 tom Exp $")
- 
- #if SVR4_TERMIO && !defined(_POSIX_SOURCE)
- #define _POSIX_SOURCE
-@@ -53,10 +53,27 @@
- #ifndef TOSTOP
- #define TOSTOP 0
- #endif
-+
- #ifndef IEXTEN
- #define IEXTEN 0
- #endif
- 
-+#ifndef ONLCR
-+#define ONLCR 0
-+#endif
-+
-+#ifndef OCRNL
-+#define OCRNL 0
-+#endif
-+
-+#ifndef ONOCR
-+#define ONOCR 0
-+#endif
-+
-+#ifndef ONLRET
-+#define ONLRET 0
-+#endif
-+
- #ifdef TRACE
- 
- typedef struct {
-@@ -108,8 +125,12 @@
-     {
- 	{OPOST, "OPOST"},
- 	{OFLAGS_TABS, "XTABS"},
-+	{ONLCR, "ONLCR"},
-+	{OCRNL, "OCRNL"},
-+	{ONOCR, "ONOCR"},
-+	{ONLRET, "ONLRET"},
- 	{0, NULL}
--#define ALLOUT	(OPOST)
-+#define ALLOUT	(OPOST|OFLAGS_TABS|ONLCR|OCRNL|ONOCR|ONLRET)
-     }, cflags[] =
-     {
- 	{CLOCAL, "CLOCAL"},
-diff -Naur ncurses-5.6.orig/ncurses/trace/lib_tracechr.c ncurses-5.6/ncurses/trace/lib_tracechr.c
---- ncurses-5.6.orig/ncurses/trace/lib_tracechr.c	2005-04-16 12:55:46.000000000 -0400
-+++ ncurses-5.6/ncurses/trace/lib_tracechr.c	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -39,34 +39,43 @@
- 
- #include <ctype.h>
- 
--MODULE_ID("$Id: lib_tracechr.c,v 1.12 2005/04/16 16:55:46 tom Exp $")
-+MODULE_ID("$Id: lib_tracechr.c,v 1.17 2008/05/31 19:57:47 tom Exp $")
- 
- #ifdef TRACE
-+
- NCURSES_EXPORT(char *)
--_tracechar(int ch)
-+_nc_tracechar(SCREEN *sp, int ch)
- {
--    static char result[40];
-     NCURSES_CONST char *name;
-+    char *MyBuffer = ((sp != 0)
-+		      ? sp->tracechr_buf
-+		      : _nc_globals.tracechr_buf);
- 
-     if (ch > KEY_MIN || ch < 0) {
--	name = keyname(ch);
-+	name = _nc_keyname(sp, ch);
- 	if (name == 0 || *name == '\0')
- 	    name = "NULL";
--	(void) sprintf(result, "'%.30s' = %#03o", name, ch);
-+	(void) sprintf(MyBuffer, "'%.30s' = %#03o", name, ch);
-     } else if (!is8bits(ch) || !isprint(UChar(ch))) {
- 	/*
- 	 * workaround for glibc bug:
- 	 * sprintf changes the result from unctrl() to an empty string if it
- 	 * does not correspond to a valid multibyte sequence.
- 	 */
--	(void) sprintf(result, "%#03o", ch);
-+	(void) sprintf(MyBuffer, "%#03o", ch);
-     } else {
--	name = unctrl((chtype) ch);
-+	name = _nc_unctrl(sp, (chtype) ch);
- 	if (name == 0 || *name == 0)
- 	    name = "null";	/* shouldn't happen */
--	(void) sprintf(result, "'%.30s' = %#03o", name, ch);
-+	(void) sprintf(MyBuffer, "'%.30s' = %#03o", name, ch);
-     }
--    return (result);
-+    return (MyBuffer);
-+}
-+
-+NCURSES_EXPORT(char *)
-+_tracechar(int ch)
-+{
-+    return _nc_tracechar(SP, ch);
- }
- #else
- empty_module(_nc_lib_tracechr)
-diff -Naur ncurses-5.6.orig/ncurses/trace/lib_tracedmp.c ncurses-5.6/ncurses/trace/lib_tracedmp.c
---- ncurses-5.6.orig/ncurses/trace/lib_tracedmp.c	2006-10-14 16:43:31.000000000 -0400
-+++ ncurses-5.6/ncurses/trace/lib_tracedmp.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -39,15 +39,16 @@
- #include <curses.priv.h>
- #include <ctype.h>
- 
--MODULE_ID("$Id: lib_tracedmp.c,v 1.27 2006/10/14 20:43:31 tom Exp $")
-+MODULE_ID("$Id: lib_tracedmp.c,v 1.29 2007/06/30 23:01:19 tom Exp $")
- 
- #ifdef TRACE
-+
-+#define my_buffer _nc_globals.tracedmp_buf
-+#define my_length _nc_globals.tracedmp_used
-+
- NCURSES_EXPORT(void)
- _tracedump(const char *name, WINDOW *win)
- {
--    static char *buf = 0;
--    static size_t used = 0;
--
-     int i, j, n, width;
- 
-     /* compute narrowest possible display width */
-@@ -66,13 +67,13 @@
-     }
-     if (width < win->_maxx)
- 	++width;
--    if (++width + 1 > (int) used) {
--	used = 2 * (width + 1);
--	buf = typeRealloc(char, used, buf);
-+    if (++width + 1 > (int) my_length) {
-+	my_length = 2 * (width + 1);
-+	my_buffer = typeRealloc(char, my_length, my_buffer);
-     }
- 
-     for (n = 0; n <= win->_maxy; ++n) {
--	char *ep = buf;
-+	char *ep = my_buffer;
- 	bool haveattrs, havecolors;
- 
- 	/*
-@@ -99,6 +100,30 @@
- 		(long) win->_line[n].lastchar,
- 		ep);
- 
-+	/* if there are multi-column characters on the line, print them now */
-+	if_WIDEC({
-+	    bool multicolumn = FALSE;
-+	    for (j = 0; j < width; ++j)
-+		if (WidecExt(win->_line[n].text[j]) != 0) {
-+		    multicolumn = TRUE;
-+		    break;
-+		}
-+	    if (multicolumn) {
-+		ep = my_buffer;
-+		for (j = 0; j < width; ++j) {
-+		    int test = WidecExt(win->_line[n].text[j]);
-+		    if (test) {
-+			ep[j] = test + '0';
-+		    } else {
-+			ep[j] = ' ';
-+		    }
-+		}
-+		ep[j] = '\0';
-+		_tracef("%*s[%2d]%*s='%s'", (int) strlen(name),
-+			"widec", n, 8, " ", my_buffer);
-+	    }
-+	});
-+
- 	/* dump A_COLOR part, will screw up if there are more than 96 */
- 	havecolors = FALSE;
- 	for (j = 0; j < width; ++j)
-@@ -107,7 +132,7 @@
- 		break;
- 	    }
- 	if (havecolors) {
--	    ep = buf;
-+	    ep = my_buffer;
- 	    for (j = 0; j < width; ++j) {
- 		int pair = GetPair(win->_line[n].text[j]);
- 		if (pair >= 52)
-@@ -123,7 +148,7 @@
- 	    }
- 	    ep[j] = '\0';
- 	    _tracef("%*s[%2d]%*s='%s'", (int) strlen(name),
--		    "colors", n, 8, " ", buf);
-+		    "colors", n, 8, " ", my_buffer);
- 	}
- 
- 	for (i = 0; i < 4; ++i) {
-@@ -137,20 +162,20 @@
- 		    break;
- 		}
- 	    if (haveattrs) {
--		ep = buf;
-+		ep = my_buffer;
- 		for (j = 0; j < width; ++j)
- 		    ep[j] = hex[(AttrOf(win->_line[n].text[j]) & mask) >>
- 				((i + 4) * 4)];
- 		ep[j] = '\0';
- 		_tracef("%*s%d[%2d]%*s='%s'", (int) strlen(name) -
--			1, "attrs", i, n, 8, " ", buf);
-+			1, "attrs", i, n, 8, " ", my_buffer);
- 	    }
- 	}
-     }
- #if NO_LEAKS
--    free(buf);
--    buf = 0;
--    used = 0;
-+    free(my_buffer);
-+    my_buffer = 0;
-+    my_length = 0;
- #endif
- }
- 
-diff -Naur ncurses-5.6.orig/ncurses/trace/lib_tracemse.c ncurses-5.6/ncurses/trace/lib_tracemse.c
---- ncurses-5.6.orig/ncurses/trace/lib_tracemse.c	2005-06-11 15:53:50.000000000 -0400
-+++ ncurses-5.6/ncurses/trace/lib_tracemse.c	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2002,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -38,30 +38,23 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: lib_tracemse.c,v 1.12 2005/06/11 19:53:50 tom Exp $")
-+MODULE_ID("$Id: lib_tracemse.c,v 1.14 2008/05/31 17:20:25 tom Exp $")
- 
- #ifdef TRACE
- 
-+#define my_buffer sp->tracemse_buf
-+
- NCURSES_EXPORT(char *)
--_tracemouse(MEVENT const *ep)
-+_nc_tracemouse(SCREEN *sp, MEVENT const *ep)
- {
--    /*
--     * hmm - format is no longer than 80 columns, there are 5 numbers that
--     * could at most have 10 digits, and the mask contains no more than 32 bits
--     * with each bit representing less than 15 characters.  Usually the whole
--     * string is less than 80 columns, but this buffer size is an absolute
--     * limit.
--     */
--    static char buf[80 + (5 * 10) + (32 * 15)];
--
--    (void) sprintf(buf, "id %2d  at (%2d, %2d, %2d) state %4lx = {",
-+    (void) sprintf(my_buffer, TRACEMSE_FMT,
- 		   ep->id,
- 		   ep->x,
- 		   ep->y,
- 		   ep->z,
- 		   (unsigned long) ep->bstate);
- 
--#define SHOW(m, s) if ((ep->bstate & m) == m) strcat(strcat(buf, s), ", ")
-+#define SHOW(m, s) if ((ep->bstate & m) == m) strcat(strcat(my_buffer, s), ", ")
- 
-     SHOW(BUTTON1_RELEASED, "release-1");
-     SHOW(BUTTON1_PRESSED, "press-1");
-@@ -115,10 +108,16 @@
- 
- #undef SHOW
- 
--    if (buf[strlen(buf) - 1] == ' ')
--	buf[strlen(buf) - 2] = '\0';
--    (void) strcat(buf, "}");
--    return (buf);
-+    if (my_buffer[strlen(my_buffer) - 1] == ' ')
-+	my_buffer[strlen(my_buffer) - 2] = '\0';
-+    (void) strcat(my_buffer, "}");
-+    return (my_buffer);
-+}
-+
-+NCURSES_EXPORT(char *)
-+_tracemouse(MEVENT const *ep)
-+{
-+    return _nc_tracemouse(SP, ep);
- }
- 
- #else /* !TRACE */
-diff -Naur ncurses-5.6.orig/ncurses/trace/trace_buf.c ncurses-5.6/ncurses/trace/trace_buf.c
---- ncurses-5.6.orig/ncurses/trace/trace_buf.c	2003-03-15 16:21:36.000000000 -0500
-+++ ncurses-5.6/ncurses/trace/trace_buf.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2002,2003 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2003,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -35,46 +35,42 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: trace_buf.c,v 1.12 2003/03/15 21:21:36 tom Exp $")
-+MODULE_ID("$Id: trace_buf.c,v 1.13 2007/04/21 22:50:08 tom Exp $")
- 
--typedef struct {
--    char *text;
--    size_t size;
--} LIST;
-+#define MyList _nc_globals.tracebuf_ptr
-+#define MySize _nc_globals.tracebuf_used
- 
- static char *
- _nc_trace_alloc(int bufnum, size_t want)
- {
-     char *result = 0;
--    static LIST *list;
--    static size_t have;
- 
-     if (bufnum >= 0) {
--	if ((size_t) (bufnum + 1) > have) {
-+	if ((size_t) (bufnum + 1) > MySize) {
- 	    size_t need = (bufnum + 1) * 2;
--	    if ((list = typeRealloc(LIST, need, list)) == 0)
-+	    if ((MyList = typeRealloc(TRACEBUF, need, MyList)) == 0)
- 		return (0);
--	    while (need > have)
--		list[have++].text = 0;
-+	    while (need > MySize)
-+		MyList[MySize++].text = 0;
- 	}
- 
--	if (list[bufnum].text == 0
--	    || want > list[bufnum].size) {
--	    if ((list[bufnum].text = typeRealloc(char, want, list[bufnum].text))
--		!= 0)
--		  list[bufnum].size = want;
-+	if (MyList[bufnum].text == 0
-+	    || want > MyList[bufnum].size) {
-+	    MyList[bufnum].text = typeRealloc(char, want, MyList[bufnum].text);
-+	    if (MyList[bufnum].text != 0)
-+		MyList[bufnum].size = want;
- 	}
- 
--	result = list[bufnum].text;
-+	result = MyList[bufnum].text;
-     }
- #if NO_LEAKS
-     else {
--	if (have) {
--	    while (have--) {
--		if (list[have].text != 0)
--		    free(list[have].text);
-+	if (MySize) {
-+	    while (MySize--) {
-+		if (MyList[MySize].text != 0)
-+		    free(MyList[MySize].text);
- 	    }
--	    free(list);
-+	    free(MyList);
- 	}
-     }
- #endif
-diff -Naur ncurses-5.6.orig/ncurses/trace/trace_tries.c ncurses-5.6/ncurses/trace/trace_tries.c
---- ncurses-5.6.orig/ncurses/trace/trace_tries.c	2001-10-20 18:42:51.000000000 -0400
-+++ ncurses-5.6/ncurses/trace/trace_tries.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1999,2000,2001 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1999-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -35,25 +35,27 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: trace_tries.c,v 1.10 2001/10/20 22:42:51 tom Exp $")
-+MODULE_ID("$Id: trace_tries.c,v 1.12 2007/04/21 21:55:41 tom Exp $")
- 
- #ifdef TRACE
--static unsigned char *buffer;
--static unsigned len;
-+#define my_buffer _nc_globals.tracetry_buf
-+#define my_length _nc_globals.tracetry_used
- 
- static void
--recur_tries(struct tries *tree, unsigned level)
-+recur_tries(TRIES * tree, unsigned level)
- {
--    if (level > len)
--	buffer = (unsigned char *) realloc(buffer, len = (level + 1) * 4);
-+    if (level > my_length) {
-+	my_length = (level + 1) * 4;
-+	my_buffer = (unsigned char *) realloc(my_buffer, my_length);
-+    }
- 
-     while (tree != 0) {
--	if ((buffer[level] = tree->ch) == 0)
--	    buffer[level] = 128;
--	buffer[level + 1] = 0;
-+	if ((my_buffer[level] = tree->ch) == 0)
-+	    my_buffer[level] = 128;
-+	my_buffer[level + 1] = 0;
- 	if (tree->value != 0) {
- 	    _tracef("%5d: %s (%s)", tree->value,
--		    _nc_visbuf((char *) buffer), keyname(tree->value));
-+		    _nc_visbuf((char *) my_buffer), keyname(tree->value));
- 	}
- 	if (tree->child)
- 	    recur_tries(tree->child, level + 1);
-@@ -62,13 +64,13 @@
- }
- 
- NCURSES_EXPORT(void)
--_nc_trace_tries(struct tries *tree)
-+_nc_trace_tries(TRIES * tree)
- {
--    buffer = typeMalloc(unsigned char, len = 80);
-+    my_buffer = typeMalloc(unsigned char, my_length = 80);
-     _tracef("BEGIN tries %p", tree);
-     recur_tries(tree, 0);
-     _tracef(". . . tries %p", tree);
--    free(buffer);
-+    free(my_buffer);
- }
- 
- #else
-diff -Naur ncurses-5.6.orig/ncurses/trace/varargs.c ncurses-5.6/ncurses/trace/varargs.c
---- ncurses-5.6.orig/ncurses/trace/varargs.c	2003-05-24 17:10:28.000000000 -0400
-+++ ncurses-5.6/ncurses/trace/varargs.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2001-2002,2003 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2001-2003,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -34,7 +34,7 @@
- 
- #include <ctype.h>
- 
--MODULE_ID("$Id: varargs.c,v 1.4 2003/05/24 21:10:28 tom Exp $")
-+MODULE_ID("$Id: varargs.c,v 1.6 2007/07/14 15:51:27 tom Exp $")
- 
- #ifdef TRACE
- 
-@@ -49,6 +49,9 @@
- #define VA_PTR(type) pval = (char *)va_arg(ap, type)
- #define VA_STR(type) sval = va_arg(ap, type)
- 
-+#define MyBuffer _nc_globals.tracearg_buf
-+#define MyLength _nc_globals.tracearg_used
-+
- /*
-  * Returns a string that represents the parameter list of a printf-style call.
-  */
-@@ -56,8 +59,6 @@
- _nc_varargs(const char *fmt, va_list ap)
- {
-     static char dummy[] = "";
--    static char *result_buf;
--    static size_t result_len;
- 
-     char buffer[BUFSIZ];
-     const char *param;
-@@ -65,11 +66,11 @@
- 
-     if (fmt == 0 || *fmt == '\0')
- 	return dummy;
--    if (result_len == 0)
--	result_buf = typeMalloc(char, result_len = BUFSIZ);
--    if (result_buf == 0)
-+    if (MyLength == 0)
-+	MyBuffer = typeMalloc(char, MyLength = BUFSIZ);
-+    if (MyBuffer == 0)
- 	return dummy;
--    *result_buf = '\0';
-+    *MyBuffer = '\0';
- 
-     while (*fmt != '\0') {
- 	if (*fmt == '%') {
-@@ -159,13 +160,14 @@
- 			case atString:
- 			    param = _nc_visbuf2(1, sval);
- 			    break;
-+			case atUnknown:
- 			default:
- 			    strcpy(buffer, "?");
- 			    break;
- 			}
--			result_len += strlen(param) + 2;
--			result_buf = typeRealloc(char, result_len, result_buf);
--			sprintf(result_buf + strlen(result_buf), ", %s", param);
-+			MyLength += strlen(param) + 2;
-+			MyBuffer = typeRealloc(char, MyLength, MyBuffer);
-+			sprintf(MyBuffer + strlen(MyBuffer), ", %s", param);
- 		    }
- 		}
- 		used = atUnknown;
-@@ -175,7 +177,7 @@
- 	}
-     }
- 
--    return (result_buf);
-+    return (MyBuffer);
- }
- #else
- empty_module(_nc_varargs)
-diff -Naur ncurses-5.6.orig/ncurses/trace/visbuf.c ncurses-5.6/ncurses/trace/visbuf.c
---- ncurses-5.6.orig/ncurses/trace/visbuf.c	2006-12-02 16:20:28.000000000 -0500
-+++ ncurses-5.6/ncurses/trace/visbuf.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2001-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2001-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -42,11 +42,16 @@
- #include <tic.h>
- #include <ctype.h>
- 
--MODULE_ID("$Id: visbuf.c,v 1.21 2006/12/02 21:20:28 tom Exp $")
-+MODULE_ID("$Id: visbuf.c,v 1.26 2007/06/09 17:21:53 tom Exp $")
- 
--static const char d_quote[] = {D_QUOTE, 0};
--static const char l_brace[] = {L_BRACE, 0};
--static const char r_brace[] = {R_BRACE, 0};
-+#define NormalLen(len) (unsigned) ((len + 1) * 4)
-+#define WideLen(len)   (unsigned) ((len + 1) * 4 * MB_CUR_MAX)
-+
-+#ifdef TRACE
-+static const char d_quote[] = StringOf(D_QUOTE);
-+static const char l_brace[] = StringOf(L_BRACE);
-+static const char r_brace[] = StringOf(R_BRACE);
-+#endif
- 
- static char *
- _nc_vischar(char *tp, unsigned c)
-@@ -68,6 +73,10 @@
-     } else if (c == '\033') {
- 	*tp++ = '\\';
- 	*tp++ = 'e';
-+    } else if (UChar(c) == 0x7f) {
-+	*tp++ = '\\';
-+	*tp++ = '^';
-+	*tp++ = '?';
-     } else if (is7bits(c) && iscntrl(UChar(c))) {
- 	*tp++ = '\\';
- 	*tp++ = '^';
-@@ -96,11 +105,11 @@
- 	len = strlen(buf);
- 
- #ifdef TRACE
--    tp = vbuf = _nc_trace_buf(bufnum, (unsigned) (len * 4) + 5);
-+    tp = vbuf = _nc_trace_buf(bufnum, NormalLen(len));
- #else
-     {
--	static char *mybuf[2];
--	mybuf[bufnum] = typeRealloc(char, (unsigned) (len * 4) + 5, mybuf[bufnum]);
-+	static char *mybuf[4];
-+	mybuf[bufnum] = typeRealloc(char, NormalLen(len), mybuf[bufnum]);
- 	tp = vbuf = mybuf[bufnum];
-     }
- #endif
-@@ -161,11 +170,11 @@
- 	len = wcslen(buf);
- 
- #ifdef TRACE
--    tp = vbuf = _nc_trace_buf(bufnum, (unsigned) (len * 4) + 5);
-+    tp = vbuf = _nc_trace_buf(bufnum, WideLen(len));
- #else
-     {
- 	static char *mybuf[2];
--	mybuf[bufnum] = typeRealloc(char, (unsigned) (len * 4) + 5, mybuf[bufnum]);
-+	mybuf[bufnum] = typeRealloc(char, WideLen(len), mybuf[bufnum]);
- 	tp = vbuf = mybuf[bufnum];
-     }
- #endif
-@@ -259,7 +268,8 @@
- 	result = _nc_trace_bufcat(bufnum, l_brace);
- 	result = _nc_trace_bufcat(bufnum, d_quote);
- 	for (j = first; j <= last; ++j) {
--	    if ((found = _nc_altcharset_name(attr, (chtype) CharOf(buf[j]))) != 0) {
-+	    found = _nc_altcharset_name(attr, (chtype) CharOf(buf[j]));
-+	    if (found != 0) {
- 		result = _nc_trace_bufcat(bufnum, found);
- 		attr &= ~A_ALTCHARSET;
- 	    } else
-diff -Naur ncurses-5.6.orig/ncurses/tty/hardscroll.c ncurses-5.6/ncurses/tty/hardscroll.c
---- ncurses-5.6.orig/ncurses/tty/hardscroll.c	2001-01-13 19:17:28.000000000 -0500
-+++ ncurses-5.6/ncurses/tty/hardscroll.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -145,7 +145,7 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: hardscroll.c,v 1.36 2001/01/14 00:17:28 tom Exp $")
-+MODULE_ID("$Id: hardscroll.c,v 1.41 2007/09/29 21:48:36 tom Exp $")
- 
- #if defined(SCROLLDEBUG) || defined(HASHDEBUG)
- 
-@@ -158,22 +158,25 @@
- # undef TR
- # define TR(n, a)	if (_nc_tracing & (n)) { _tracef a ; putchar('\n'); }
- 
-+extern NCURSES_EXPORT_VAR(unsigned) _nc_tracing;
-+
- #else /* no debug */
- 
- /* OLDNUM(n) indicates which line will be shifted to the position n.
-    if OLDNUM(n) == _NEWINDEX, then the line n in new, not shifted from
-    somewhere. */
- NCURSES_EXPORT_VAR(int *)
--_nc_oldnums = 0;
-+_nc_oldnums = 0;		/* obsolete: keep for ABI compat */
- 
- # if USE_HASHMAP
--     static int oldnums_allocated = 0;
--#  define oldnums       _nc_oldnums
-+#  define oldnums       SP->_oldnum_list
- #  define OLDNUM(n)	oldnums[n]
- # else				/* !USE_HASHMAP */
- #  define OLDNUM(n)	newscr->_line[n].oldindex
- # endif				/* !USE_HASHMAP */
- 
-+#define OLDNUM_SIZE     SP->_oldnum_size
-+
- #endif /* defined(SCROLLDEBUG) || defined(HASHDEBUG) */
- 
- NCURSES_EXPORT(void)
-@@ -183,17 +186,17 @@
-     int i;
-     int start, end, shift;
- 
--    TR(TRACE_ICALLS, ("_nc_scroll_optimize() begins"));
-+    TR(TRACE_ICALLS, (T_CALLED("_nc_scroll_optimize")));
- 
- #if !defined(SCROLLDEBUG) && !defined(HASHDEBUG)
- #if USE_HASHMAP
-     /* get enough storage */
--    if (oldnums_allocated < screen_lines) {
-+    if (OLDNUM_SIZE < screen_lines) {
- 	int *new_oldnums = typeRealloc(int, screen_lines, oldnums);
- 	if (!new_oldnums)
- 	    return;
- 	oldnums = new_oldnums;
--	oldnums_allocated = screen_lines;
-+	OLDNUM_SIZE = screen_lines;
-     }
-     /* calculate the indices */
-     _nc_hash_map();
-@@ -201,8 +204,10 @@
- #endif /* !defined(SCROLLDEBUG) && !defined(HASHDEBUG) */
- 
- #ifdef TRACE
--    if (_nc_tracing & (TRACE_UPDATE | TRACE_MOVE))
-+    if (USE_TRACEF(TRACE_UPDATE | TRACE_MOVE)) {
- 	_nc_linedump();
-+	_nc_unlock_global(tracef);
-+    }
- #endif /* TRACE */
- 
-     /* pass 1 - from top to bottom scrolling up */
-@@ -253,6 +258,7 @@
- 	}
- #endif /* !defined(SCROLLDEBUG) && !defined(HASHDEBUG) */
-     }
-+    TR(TRACE_ICALLS, (T_RETURN("")));
- }
- 
- #if defined(TRACE) || defined(SCROLLDEBUG) || defined(HASHDEBUG)
-@@ -260,23 +266,17 @@
- _nc_linedump(void)
- /* dump the state of the real and virtual oldnum fields */
- {
--    static size_t have;
--    static char *buf;
--
-     int n;
-+    char *buf = 0;
-     size_t want = (screen_lines + 1) * 4;
- 
--    if (have < want)
--	buf = typeMalloc(char, have = want);
-+    buf = typeMalloc(char, want);
- 
-     (void) strcpy(buf, "virt");
-     for (n = 0; n < screen_lines; n++)
- 	(void) sprintf(buf + strlen(buf), " %02d", OLDNUM(n));
-     TR(TRACE_UPDATE | TRACE_MOVE, (buf));
--#if NO_LEAKS
-     free(buf);
--    have = 0;
--#endif
- }
- #endif /* defined(TRACE) || defined(SCROLLDEBUG) */
- 
-diff -Naur ncurses-5.6.orig/ncurses/tty/hashmap.c ncurses-5.6/ncurses/tty/hashmap.c
---- ncurses-5.6.orig/ncurses/tty/hashmap.c	2006-03-11 14:33:49.000000000 -0500
-+++ ncurses-5.6/ncurses/tty/hashmap.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                   *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                   *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -70,7 +70,7 @@
- #include <curses.priv.h>
- #include <term.h>		/* for back_color_erase */
- 
--MODULE_ID("$Id: hashmap.c,v 1.49 2006/03/11 19:33:49 tom Exp $")
-+MODULE_ID("$Id: hashmap.c,v 1.56 2007/10/13 18:47:25 Miroslav.Lichvar Exp $")
- 
- #ifdef HASHDEBUG
- 
-@@ -81,7 +81,8 @@
- # define screen_lines MAXLINES
- # define TEXTWIDTH	1
- int oldnums[MAXLINES], reallines[MAXLINES];
--static chtype oldtext[MAXLINES][TEXTWIDTH], newtext[MAXLINES][TEXTWIDTH];
-+static NCURSES_CH_T oldtext[MAXLINES][TEXTWIDTH];
-+static NCURSES_CH_T newtext[MAXLINES][TEXTWIDTH];
- # define OLDNUM(n)	oldnums[n]
- # define OLDTEXT(n)	oldtext[n]
- # define NEWTEXT(m)	newtext[m]
-@@ -89,7 +90,7 @@
- 
- #else /* !HASHDEBUG */
- 
--# define OLDNUM(n)	_nc_oldnums[n]
-+# define OLDNUM(n)	SP->_oldnum_list[n]
- # define OLDTEXT(n)	curscr->_line[n].text
- # define NEWTEXT(m)	newscr->_line[m].text
- # define TEXTWIDTH	(curscr->_maxx+1)
-@@ -130,8 +131,8 @@
-     int cost = 0;
-     int i;
- 
--    for (i = TEXTWIDTH; i > 0; i--)
--	if (!(CharEq(*from++, *to++)))
-+    for (i = TEXTWIDTH; i > 0; i--, from++, to++)
-+	if (!(CharEq(*from, *to)))
- 	    cost++;
- 
-     return cost;
-@@ -147,8 +148,8 @@
-     if (back_color_erase)
- 	SetPair(blank, GetPair(stdscr->_nc_bkgd));
- 
--    for (i = TEXTWIDTH; i > 0; i--)
--	if (!(CharEq(blank, *to++)))
-+    for (i = TEXTWIDTH; i > 0; i--, to++)
-+	if (!(CharEq(blank, *to)))
- 	    cost++;
- 
-     return cost;
-@@ -446,11 +447,14 @@
-     char line[BUFSIZ], *st;
-     int n;
- 
--    SP = typeCalloc(SCREEN, 1);
-+    if (setupterm(NULL, fileno(stdout), (int *) 0) == ERR)
-+	return EXIT_FAILURE;
-+    (void) _nc_alloc_screen();
-+
-     for (n = 0; n < screen_lines; n++) {
- 	reallines[n] = n;
- 	oldnums[n] = _NEWINDEX;
--	oldtext[n][0] = newtext[n][0] = '.';
-+	CharOf(oldtext[n][0]) = CharOf(newtext[n][0]) = '.';
-     }
- 
-     if (isatty(fileno(stdin)))
-@@ -462,7 +466,7 @@
-     for (;;) {
- 	/* grab a test command */
- 	if (fgets(line, sizeof(line), stdin) == (char *) NULL)
--	    exit(EXIT_SUCCESS);
-+	    break;
- 
- 	switch (line[0]) {
- 	case '#':		/* comment */
-@@ -484,22 +488,22 @@
- 
- 	case 'n':		/* use following letters as text of new lines */
- 	    for (n = 0; n < screen_lines; n++)
--		newtext[n][0] = '.';
-+		CharOf(newtext[n][0]) = '.';
- 	    for (n = 0; n < screen_lines; n++)
- 		if (line[n + 1] == '\n')
- 		    break;
- 		else
--		    newtext[n][0] = line[n + 1];
-+		    CharOf(newtext[n][0]) = line[n + 1];
- 	    break;
- 
- 	case 'o':		/* use following letters as text of old lines */
- 	    for (n = 0; n < screen_lines; n++)
--		oldtext[n][0] = '.';
-+		CharOf(oldtext[n][0]) = '.';
- 	    for (n = 0; n < screen_lines; n++)
- 		if (line[n + 1] == '\n')
- 		    break;
- 		else
--		    oldtext[n][0] = line[n + 1];
-+		    CharOf(oldtext[n][0]) = line[n + 1];
- 	    break;
- 
- 	case 'd':		/* dump state of test arrays */
-@@ -508,12 +512,12 @@
- #endif
- 	    (void) fputs("Old lines: [", stdout);
- 	    for (n = 0; n < screen_lines; n++)
--		putchar(oldtext[n][0]);
-+		putchar(CharOf(oldtext[n][0]));
- 	    putchar(']');
- 	    putchar('\n');
- 	    (void) fputs("New lines: [", stdout);
- 	    for (n = 0; n < screen_lines; n++)
--		putchar(newtext[n][0]);
-+		putchar(CharOf(newtext[n][0]));
- 	    putchar(']');
- 	    putchar('\n');
- 	    break;
-@@ -527,12 +531,17 @@
- 	    _nc_scroll_optimize();
- 	    (void) fputs("Done.\n", stderr);
- 	    break;
-+	default:
- 	case '?':
- 	    usage();
- 	    break;
- 	}
-     }
-+#if NO_LEAKS
-+    _nc_free_and_exit(EXIT_SUCCESS);
-+#else
-     return EXIT_SUCCESS;
-+#endif
- }
- 
- #endif /* HASHDEBUG */
-diff -Naur ncurses-5.6.orig/ncurses/tty/lib_mvcur.c ncurses-5.6/ncurses/tty/lib_mvcur.c
---- ncurses-5.6.orig/ncurses/tty/lib_mvcur.c	2006-11-25 17:31:59.000000000 -0500
-+++ ncurses-5.6/ncurses/tty/lib_mvcur.c	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -155,7 +155,7 @@
- #include <term.h>
- #include <ctype.h>
- 
--MODULE_ID("$Id: lib_mvcur.c,v 1.107 2006/11/25 22:31:59 tom Exp $")
-+MODULE_ID("$Id: lib_mvcur.c,v 1.111 2008/05/24 14:36:54 Miroslav.Lichvar Exp $")
- 
- #define WANT_CHAR(y, x)	SP->_newscr->_line[y].text[x]	/* desired state */
- #define BAUDRATE	cur_term->_baudrate	/* bits per second */
-@@ -426,8 +426,11 @@
-     mvcur(-1, -1, screen_lines - 1, 0);
- 
-     /* set cursor to normal mode */
--    if (SP->_cursor != -1)
-+    if (SP->_cursor != -1) {
-+	int cursor = SP->_cursor;
- 	curs_set(1);
-+	SP->_cursor = cursor;
-+    }
- 
-     if (exit_ca_mode) {
- 	TPUTS_TRACE("exit_ca_mode");
-@@ -959,6 +962,7 @@
- 
- #include <tic.h>
- #include <dump_entry.h>
-+#include <time.h>
- 
- NCURSES_EXPORT_VAR(const char *) _nc_progname = "mvcur";
- 
-@@ -1017,7 +1021,7 @@
- int
- main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
- {
--    (void) strcpy(tname, termname());
-+    strcpy(tname, getenv("TERM"));
-     load_term();
-     _nc_setupscreen(lines, columns, stdout, FALSE, 0);
-     baudrate();
-@@ -1088,7 +1092,7 @@
- 	    load_term();
- 	} else if (sscanf(buf, "d %s", capname) == 1) {
- 	    struct name_table_entry const *np = _nc_find_entry(capname,
--							       _nc_info_hash_table);
-+							       _nc_get_hash_table(FALSE));
- 
- 	    if (np == NULL)
- 		(void) printf("No such capability as \"%s\"\n", capname);
-@@ -1116,7 +1120,7 @@
- 	    }
- 	} else if (buf[0] == 'i') {
- 	    dump_init((char *) NULL, F_TERMINFO, S_TERMINFO, 70, 0, FALSE);
--	    dump_entry(&cur_term->type, FALSE, TRUE, 0, 0, 0);
-+	    dump_entry(&cur_term->type, FALSE, TRUE, 0, 0);
- 	    putchar('\n');
- 	} else if (buf[0] == 'o') {
- 	    if (_nc_optimize_enable & OPTIMIZE_MVCUR) {
-diff -Naur ncurses-5.6.orig/ncurses/tty/lib_tstp.c ncurses-5.6/ncurses/tty/lib_tstp.c
---- ncurses-5.6.orig/ncurses/tty/lib_tstp.c	2006-04-01 14:31:34.000000000 -0500
-+++ ncurses-5.6/ncurses/tty/lib_tstp.c	2008-06-18 06:49:50.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -46,7 +46,7 @@
- #define _POSIX_SOURCE
- #endif
- 
--MODULE_ID("$Id: lib_tstp.c,v 1.32 2006/04/01 19:31:34 tom Exp $")
-+MODULE_ID("$Id: lib_tstp.c,v 1.37 2008/05/03 16:24:56 tom Exp $")
- 
- #if defined(SIGTSTP) && (HAVE_SIGACTION || HAVE_SIGVEC)
- #define USE_SIGTSTP 1
-@@ -234,14 +234,12 @@
- static void
- cleanup(int sig)
- {
--    static int nested;
--
-     /*
-      * Actually, doing any sort of I/O from within an signal handler is
-      * "unsafe".  But we'll _try_ to clean up the screen and terminal
-      * settings on the way out.
-      */
--    if (!nested++
-+    if (!_nc_globals.cleanup_nested++
- 	&& (sig == SIGINT
- 	    || sig == SIGQUIT)) {
- #if HAVE_SIGACTION || HAVE_SIGVEC
-@@ -254,19 +252,17 @@
- 	if (signal(sig, SIG_IGN) != SIG_ERR)
- #endif
- 	{
--	    SCREEN *scan = _nc_screen_chain;
--	    while (scan) {
--		if (SP != 0
--		    && SP->_ofp != 0
--		    && isatty(fileno(SP->_ofp))) {
--		    SP->_cleanup = TRUE;
--		    SP->_outch = _nc_outch;
-+	    SCREEN *scan;
-+	    for (each_screen(scan)) {
-+		if (scan->_ofp != 0
-+		    && isatty(fileno(scan->_ofp))) {
-+		    scan->_cleanup = TRUE;
-+		    scan->_outch = _nc_outch;
- 		}
- 		set_term(scan);
- 		endwin();
- 		if (SP)
- 		    SP->_endwin = FALSE;	/* in case we have an atexit! */
--		scan = scan->_next_screen;
- 	    }
- 	}
-     }
-@@ -277,7 +273,7 @@
- static void
- sigwinch(int sig GCC_UNUSED)
- {
--    _nc_handle_sigwinch(-1);
-+    _nc_globals.have_sigwinch = 1;
- }
- #endif /* USE_SIGWINCH */
- 
-@@ -351,29 +347,27 @@
- NCURSES_EXPORT(void)
- _nc_signal_handler(bool enable)
- {
--    static bool initialized = FALSE;
--
-     T((T_CALLED("_nc_signal_handler(%d)"), enable));
- #if USE_SIGTSTP			/* Xenix 2.x doesn't have SIGTSTP, for example */
-     {
- 	static bool ignore_tstp = FALSE;
- 
- 	if (!ignore_tstp) {
--	    static sigaction_t act, oact;
-+	    static sigaction_t new_sigaction, old_sigaction;
- 
- 	    if (!enable) {
--		act.sa_handler = SIG_IGN;
--		sigaction(SIGTSTP, &act, &oact);
--	    } else if (act.sa_handler != SIG_DFL) {
--		sigaction(SIGTSTP, &oact, NULL);
--	    } else if (sigaction(SIGTSTP, NULL, &oact) == 0
--		       && (oact.sa_handler == SIG_DFL)) {
--		sigemptyset(&act.sa_mask);
-+		new_sigaction.sa_handler = SIG_IGN;
-+		sigaction(SIGTSTP, &new_sigaction, &old_sigaction);
-+	    } else if (new_sigaction.sa_handler != SIG_DFL) {
-+		sigaction(SIGTSTP, &old_sigaction, NULL);
-+	    } else if (sigaction(SIGTSTP, NULL, &old_sigaction) == 0
-+		       && (old_sigaction.sa_handler == SIG_DFL)) {
-+		sigemptyset(&new_sigaction.sa_mask);
- #ifdef SA_RESTART
--		act.sa_flags |= SA_RESTART;
-+		new_sigaction.sa_flags |= SA_RESTART;
- #endif /* SA_RESTART */
--		act.sa_handler = tstp;
--		(void) sigaction(SIGTSTP, &act, NULL);
-+		new_sigaction.sa_handler = tstp;
-+		(void) sigaction(SIGTSTP, &new_sigaction, NULL);
- 	    } else {
- 		ignore_tstp = TRUE;
- 	    }
-@@ -381,14 +375,14 @@
-     }
- #endif /* !USE_SIGTSTP */
- 
--    if (!initialized) {
-+    if (!_nc_globals.init_signals) {
- 	if (enable) {
- 	    CatchIfDefault(SIGINT, cleanup);
- 	    CatchIfDefault(SIGTERM, cleanup);
- #if USE_SIGWINCH
- 	    CatchIfDefault(SIGWINCH, sigwinch);
- #endif
--	    initialized = TRUE;
-+	    _nc_globals.init_signals = TRUE;
- 	}
-     }
-     returnVoid;
-diff -Naur ncurses-5.6.orig/ncurses/tty/lib_twait.c ncurses-5.6/ncurses/tty/lib_twait.c
---- ncurses-5.6.orig/ncurses/tty/lib_twait.c	2006-05-27 17:57:43.000000000 -0400
-+++ ncurses-5.6/ncurses/tty/lib_twait.c	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -29,6 +29,7 @@
- /****************************************************************************
-  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
-  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
-+ *     and: Thomas E. Dickey                        1996-on                 *
-  ****************************************************************************/
- 
- /*
-@@ -61,38 +62,36 @@
- # endif
- #endif
- 
--MODULE_ID("$Id: lib_twait.c,v 1.51 2006/05/27 21:57:43 tom Exp $")
-+#undef CUR
-+
-+MODULE_ID("$Id: lib_twait.c,v 1.58 2008/05/24 15:08:01 tom Exp $")
- 
- static long
--_nc_gettime(bool first)
-+_nc_gettime(TimeType * t0, bool first)
- {
-     long res;
- 
--#if HAVE_GETTIMEOFDAY
--# define PRECISE_GETTIME 1
--    static struct timeval t0;
--    struct timeval t1;
-+#if PRECISE_GETTIME
-+    TimeType t1;
-     gettimeofday(&t1, (struct timezone *) 0);
-     if (first) {
--	t0 = t1;
-+	*t0 = t1;
- 	res = 0;
-     } else {
- 	/* .tv_sec and .tv_usec are unsigned, be careful when subtracting */
--	if (t0.tv_usec > t1.tv_usec) {	/* Convert 1s in 1e6 microsecs */
--	    t1.tv_usec += 1000000;
-+	if (t0->tv_usec > t1.tv_usec) {
-+	    t1.tv_usec += 1000000;	/* Convert 1s in 1e6 microsecs */
- 	    t1.tv_sec--;
- 	}
--	res = (t1.tv_sec - t0.tv_sec) * 1000
--	    + (t1.tv_usec - t0.tv_usec) / 1000;
-+	res = (t1.tv_sec - t0->tv_sec) * 1000
-+	    + (t1.tv_usec - t0->tv_usec) / 1000;
-     }
- #else
--# define PRECISE_GETTIME 0
--    static time_t t0;
-     time_t t1 = time((time_t *) 0);
-     if (first) {
--	t0 = t1;
-+	*t0 = t1;
-     }
--    res = (t1 - t0) * 1000;
-+    res = (t1 - *t0) * 1000;
- #endif
-     TR(TRACE_IEVENT, ("%s time: %ld msec", first ? "get" : "elapsed", res));
-     return res;
-@@ -140,14 +139,16 @@
-  * descriptors.
-  */
- NCURSES_EXPORT(int)
--_nc_timed_wait(int mode,
-+_nc_timed_wait(SCREEN *sp,
-+	       int mode,
- 	       int milliseconds,
- 	       int *timeleft
- 	       EVENTLIST_2nd(_nc_eventlist * evl))
- {
-     int fd;
-     int count;
--    int result;
-+    int result = 0;
-+    TimeType t0;
- 
- #ifdef NCURSES_WGETCH_EVENTS
-     int timeout_is_event = 0;
-@@ -160,7 +161,7 @@
-     struct pollfd *fds = fd_list;
- #elif defined(__BEOS__)
- #elif HAVE_SELECT
--    static fd_set set;
-+    fd_set set;
- #endif
- 
-     long starttime, returntime;
-@@ -180,10 +181,10 @@
-     }
- #endif
- 
--#if PRECISE_GETTIME
-+#if PRECISE_GETTIME && HAVE_NANOSLEEP
-   retry:
- #endif
--    starttime = _nc_gettime(TRUE);
-+    starttime = _nc_gettime(&t0, TRUE);
- 
-     count = 0;
- 
-@@ -201,12 +202,12 @@
- #endif
- 
-     if (mode & 1) {
--	fds[count].fd = SP->_ifd;
-+	fds[count].fd = sp->_ifd;
- 	fds[count].events = POLLIN;
- 	count++;
-     }
-     if ((mode & 2)
--	&& (fd = SP->_mouse_fd) >= 0) {
-+	&& (fd = sp->_mouse_fd) >= 0) {
- 	fds[count].fd = fd;
- 	fds[count].events = POLLIN;
- 	count++;
-@@ -309,11 +310,11 @@
-     FD_ZERO(&set);
- 
-     if (mode & 1) {
--	FD_SET(SP->_ifd, &set);
--	count = SP->_ifd + 1;
-+	FD_SET(sp->_ifd, &set);
-+	count = sp->_ifd + 1;
-     }
-     if ((mode & 2)
--	&& (fd = SP->_mouse_fd) >= 0) {
-+	&& (fd = sp->_mouse_fd) >= 0) {
- 	FD_SET(fd, &set);
- 	count = max(fd, count) + 1;
-     }
-@@ -362,7 +363,7 @@
- 
- #endif /* USE_FUNC_POLL, etc */
- 
--    returntime = _nc_gettime(FALSE);
-+    returntime = _nc_gettime(&t0, FALSE);
- 
-     if (milliseconds >= 0)
- 	milliseconds -= (returntime - starttime);
-@@ -426,11 +427,11 @@
- 	    result = 1;		/* redundant, but simple */
- #elif HAVE_SELECT
- 	    if ((mode & 2)
--		&& (fd = SP->_mouse_fd) >= 0
-+		&& (fd = sp->_mouse_fd) >= 0
- 		&& FD_ISSET(fd, &set))
- 		result |= 2;
- 	    if ((mode & 1)
--		&& FD_ISSET(SP->_ifd, &set))
-+		&& FD_ISSET(sp->_ifd, &set))
- 		result |= 1;
- #endif
- 	} else
-diff -Naur ncurses-5.6.orig/ncurses/tty/lib_vidattr.c ncurses-5.6/ncurses/tty/lib_vidattr.c
---- ncurses-5.6.orig/ncurses/tty/lib_vidattr.c	2006-01-21 18:39:40.000000000 -0500
-+++ ncurses-5.6/ncurses/tty/lib_vidattr.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -65,7 +65,7 @@
- #include <curses.priv.h>
- #include <term.h>
- 
--MODULE_ID("$Id: lib_vidattr.c,v 1.46 2006/01/21 23:39:40 tom Exp $")
-+MODULE_ID("$Id: lib_vidattr.c,v 1.49 2007/06/30 21:58:04 tom Exp $")
- 
- #define doPut(mode) TPUTS_TRACE(#mode); tputs(mode, 1, outc)
- 
-@@ -87,10 +87,11 @@
- 		} \
- 	}
- 
-+#define PreviousAttr _nc_prescreen.previous_attr
-+
- NCURSES_EXPORT(int)
- vidputs(chtype newmode, int (*outc) (int))
- {
--    static attr_t previous_attr = A_NORMAL;
-     attr_t turn_on, turn_off;
-     int pair;
-     bool reverse = FALSE;
-@@ -101,18 +102,19 @@
- #define fix_pair0 FALSE
- #endif
- 
-+    newmode &= A_ATTRIBUTES;
-     T((T_CALLED("vidputs(%s)"), _traceattr(newmode)));
- 
-     /* this allows us to go on whether or not newterm() has been called */
-     if (SP)
--	previous_attr = AttrOf(SCREEN_ATTRS(SP));
-+	PreviousAttr = AttrOf(SCREEN_ATTRS(SP));
- 
--    TR(TRACE_ATTRS, ("previous attribute was %s", _traceattr(previous_attr)));
-+    TR(TRACE_ATTRS, ("previous attribute was %s", _traceattr(PreviousAttr)));
- 
-     if ((SP != 0)
- 	&& (magic_cookie_glitch > 0)) {
- #if USE_XMC_SUPPORT
--	static chtype table[] =
-+	static const chtype table[] =
- 	{
- 	    A_STANDOUT,
- 	    A_UNDERLINE,
-@@ -183,7 +185,7 @@
- 	newmode &= ~mask;
-     }
- 
--    if (newmode == previous_attr)
-+    if (newmode == PreviousAttr)
- 	returnCode(OK);
- 
-     pair = PAIR_NUMBER(newmode);
-@@ -192,17 +194,17 @@
- 	newmode &= ~A_REVERSE;
-     }
- 
--    turn_off = (~newmode & previous_attr) & ALL_BUT_COLOR;
--    turn_on = (newmode & ~previous_attr) & ALL_BUT_COLOR;
-+    turn_off = (~newmode & PreviousAttr) & ALL_BUT_COLOR;
-+    turn_on = (newmode & ~PreviousAttr) & ALL_BUT_COLOR;
- 
--    SetColorsIf(((pair == 0) && !fix_pair0), previous_attr);
-+    SetColorsIf(((pair == 0) && !fix_pair0), PreviousAttr);
- 
-     if (newmode == A_NORMAL) {
--	if ((previous_attr & A_ALTCHARSET) && exit_alt_charset_mode) {
-+	if ((PreviousAttr & A_ALTCHARSET) && exit_alt_charset_mode) {
- 	    doPut(exit_alt_charset_mode);
--	    previous_attr &= ~A_ALTCHARSET;
-+	    PreviousAttr &= ~A_ALTCHARSET;
- 	}
--	if (previous_attr) {
-+	if (PreviousAttr) {
- 	    if (exit_attribute_mode) {
- 		doPut(exit_attribute_mode);
- 	    } else {
-@@ -213,10 +215,10 @@
- 		    TurnOff(A_STANDOUT, exit_standout_mode);
- 		}
- 	    }
--	    previous_attr &= ALL_BUT_COLOR;
-+	    PreviousAttr &= ALL_BUT_COLOR;
- 	}
- 
--	SetColorsIf((pair != 0) || fix_pair0, previous_attr);
-+	SetColorsIf((pair != 0) || fix_pair0, PreviousAttr);
-     } else if (set_attributes) {
- 	if (turn_on || turn_off) {
- 	    TPUTS_TRACE("set_attributes");
-@@ -230,9 +232,9 @@
- 			(newmode & A_INVIS) != 0,
- 			(newmode & A_PROTECT) != 0,
- 			(newmode & A_ALTCHARSET) != 0), 1, outc);
--	    previous_attr &= ALL_BUT_COLOR;
-+	    PreviousAttr &= ALL_BUT_COLOR;
- 	}
--	SetColorsIf((pair != 0) || fix_pair0, previous_attr);
-+	SetColorsIf((pair != 0) || fix_pair0, PreviousAttr);
-     } else {
- 
- 	TR(TRACE_ATTRS, ("turning %s off", _traceattr(turn_off)));
-@@ -250,9 +252,9 @@
- 	if (turn_off && exit_attribute_mode) {
- 	    doPut(exit_attribute_mode);
- 	    turn_on |= (newmode & ALL_BUT_COLOR);
--	    previous_attr &= ALL_BUT_COLOR;
-+	    PreviousAttr &= ALL_BUT_COLOR;
- 	}
--	SetColorsIf((pair != 0) || fix_pair0, previous_attr);
-+	SetColorsIf((pair != 0) || fix_pair0, PreviousAttr);
- 
- 	TR(TRACE_ATTRS, ("turning %s on", _traceattr(turn_on)));
- 	/* *INDENT-OFF* */
-@@ -283,7 +285,7 @@
-     if (SP)
- 	SetAttr(SCREEN_ATTRS(SP), newmode);
-     else
--	previous_attr = newmode;
-+	PreviousAttr = newmode;
- 
-     returnCode(OK);
- }
-diff -Naur ncurses-5.6.orig/ncurses/tty/tty_update.c ncurses-5.6/ncurses/tty/tty_update.c
---- ncurses-5.6.orig/ncurses/tty/tty_update.c	2006-11-25 17:33:21.000000000 -0500
-+++ ncurses-5.6/ncurses/tty/tty_update.c	2008-06-18 06:49:50.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -74,7 +74,7 @@
- #include <ctype.h>
- #include <term.h>
- 
--MODULE_ID("$Id: tty_update.c,v 1.238 2006/11/25 22:33:21 tom Exp $")
-+MODULE_ID("$Id: tty_update.c,v 1.245 2008/05/03 22:43:04 tom Exp $")
- 
- /*
-  * This define controls the line-breakout optimization.  Every once in a
-@@ -289,7 +289,7 @@
- #endif
-     {
- 	PUTC(CHDEREF(ch), SP->_ofp);	/* macro's fastest... */
--	TRACE_OUTCHARS(1);
-+	COUNT_OUTCHARS(1);
-     }
-     SP->_curscol += chlen;
-     if (char_padding) {
-@@ -624,13 +624,18 @@
- 
-     T((T_CALLED("doupdate()")));
- 
-+    if (curscr == 0
-+	|| newscr == 0)
-+	returnCode(ERR);
-+
- #ifdef TRACE
--    if (_nc_tracing & TRACE_UPDATE) {
-+    if (USE_TRACEF(TRACE_UPDATE)) {
- 	if (curscr->_clear)
- 	    _tracef("curscr is clear");
- 	else
- 	    _tracedump("curscr", curscr);
- 	_tracedump("newscr", newscr);
-+	_nc_unlock_global(tracef);
-     }
- #endif /* TRACE */
- 
-@@ -640,7 +645,7 @@
- 	SP->_fifohold--;
- 
- #if USE_SIZECHANGE
--    if (SP->_endwin || SP->_sig_winch) {
-+    if (SP->_endwin || _nc_handle_sigwinch(SP)) {
- 	/*
- 	 * This is a transparent extension:  XSI does not address it,
- 	 * and applications need not know that ncurses can do it.
-@@ -649,7 +654,7 @@
- 	 * (this can happen in an xterm, for example), and resize the
- 	 * ncurses data structures accordingly.
- 	 */
--	_nc_update_screensize();
-+	_nc_update_screensize(SP);
-     }
- #endif
- 
-@@ -666,7 +671,7 @@
-     }
- #if USE_TRACE_TIMES
-     /* zero the metering machinery */
--    _nc_outchars = 0;
-+    RESET_OUTCHARS();
-     (void) times(&before);
- #endif /* USE_TRACE_TIMES */
- 
-@@ -826,9 +831,10 @@
- 
- #ifdef TRACE
- 	/* show altered highlights after magic-cookie check */
--	if (_nc_tracing & TRACE_UPDATE) {
-+	if (USE_TRACEF(TRACE_UPDATE)) {
- 	    _tracef("After magic-cookie check...");
- 	    _tracedump("newscr", newscr);
-+	    _nc_unlock_global(tracef);
- 	}
- #endif /* TRACE */
-     }
-@@ -836,7 +842,6 @@
- 
-     nonempty = 0;
-     if (curscr->_clear || newscr->_clear) {	/* force refresh ? */
--	TR(TRACE_UPDATE, ("clearing and updating from scratch"));
- 	ClrUpdate();
- 	curscr->_clear = FALSE;	/* reset flag */
- 	newscr->_clear = FALSE;	/* reset flag */
-@@ -967,7 +972,7 @@
-     NCURSES_CH_T blank = ClrBlank(stdscr);
-     int nonempty = min(screen_lines, newscr->_maxy + 1);
- 
--    TR(TRACE_UPDATE, ("ClrUpdate() called"));
-+    TR(TRACE_UPDATE, (T_CALLED("ClrUpdate")));
- 
-     ClearScreen(blank);
- 
-@@ -977,6 +982,8 @@
- 
-     for (i = 0; i < nonempty; i++)
- 	TransformLine(i);
-+
-+    TR(TRACE_UPDATE, (T_RETURN("")));
- }
- 
- /*
-diff -Naur ncurses-5.6.orig/ncurses/widechar/lib_cchar.c ncurses-5.6/ncurses/widechar/lib_cchar.c
---- ncurses-5.6.orig/ncurses/widechar/lib_cchar.c	2005-01-29 16:29:16.000000000 -0500
-+++ ncurses-5.6/ncurses/widechar/lib_cchar.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2001-2004,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2001-2005,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -35,7 +35,7 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: lib_cchar.c,v 1.11 2005/01/29 21:29:16 tom Exp $")
-+MODULE_ID("$Id: lib_cchar.c,v 1.12 2007/05/12 19:03:06 tom Exp $")
- 
- /* 
-  * The SuSv2 description leaves some room for interpretation.  We'll assume wch
-@@ -54,8 +54,9 @@
-     int len;
-     int code = OK;
- 
--    TR(TRACE_CCALLS, (T_CALLED("setcchar(%p,%s,%ld,%d,%p)"),
--		      wcval, _nc_viswbuf(wch), attrs, color_pair, opts));
-+    TR(TRACE_CCALLS, (T_CALLED("setcchar(%p,%s,%lu,%d,%p)"),
-+		      wcval, _nc_viswbuf(wch),
-+		      (unsigned long) attrs, color_pair, opts));
- 
-     len = wcslen(wch);
-     if (opts != NULL
-diff -Naur ncurses-5.6.orig/ncurses/widechar/lib_get_wch.c ncurses-5.6/ncurses/widechar/lib_get_wch.c
---- ncurses-5.6.orig/ncurses/widechar/lib_get_wch.c	2006-06-03 13:27:57.000000000 -0400
-+++ ncurses-5.6/ncurses/widechar/lib_get_wch.c	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2002-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2002-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -40,7 +40,7 @@
- #include <curses.priv.h>
- #include <ctype.h>
- 
--MODULE_ID("$Id: lib_get_wch.c,v 1.13 2006/06/03 17:27:57 tom Exp $")
-+MODULE_ID("$Id: lib_get_wch.c,v 1.16 2008/06/07 15:14:33 tom Exp $")
- 
- #if HAVE_MBTOWC && HAVE_MBLEN
- #define reset_mbytes(state) mblen(NULL, 0), mbtowc(NULL, NULL, 0)
-@@ -60,6 +60,7 @@
- NCURSES_EXPORT(int)
- wget_wch(WINDOW *win, wint_t *result)
- {
-+    SCREEN *sp;
-     int code;
-     char buffer[(MB_LEN_MAX * 9) + 1];	/* allow some redundant shifts */
-     int status;
-@@ -76,44 +77,52 @@
-      * We can get a stream of single-byte characters and KEY_xxx codes from
-      * _nc_wgetch(), while we want to return a wide character or KEY_xxx code.
-      */
--    for (;;) {
--	T(("reading %d of %d", count + 1, sizeof(buffer)));
--	code = _nc_wgetch(win, &value, TRUE EVENTLIST_2nd((_nc_eventlist *) 0));
--	if (code == ERR) {
--	    break;
--	} else if (code == KEY_CODE_YES) {
--	    /*
--	     * If we were processing an incomplete multibyte character, return
--	     * an error since we have a KEY_xxx code which interrupts it.  For
--	     * some cases, we could improve this by writing a new version of
--	     * lib_getch.c(!), but it is not clear whether the improvement
--	     * would be worth the effort.
--	     */
--	    if (count != 0) {
--		ungetch((int) value);
-+    _nc_lock_global(curses);
-+    sp = _nc_screen_of(win);
-+    if (sp != 0) {
-+	for (;;) {
-+	    T(("reading %d of %d", (int) count + 1, (int) sizeof(buffer)));
-+	    code = _nc_wgetch(win, &value, TRUE EVENTLIST_2nd((_nc_eventlist
-+							       *) 0));
-+	    if (code == ERR) {
-+		break;
-+	    } else if (code == KEY_CODE_YES) {
-+		/*
-+		 * If we were processing an incomplete multibyte character,
-+		 * return an error since we have a KEY_xxx code which
-+		 * interrupts it.  For some cases, we could improve this by
-+		 * writing a new version of lib_getch.c(!), but it is not clear
-+		 * whether the improvement would be worth the effort.
-+		 */
-+		if (count != 0) {
-+		    _nc_ungetch(sp, (int) value);
-+		    code = ERR;
-+		}
-+		break;
-+	    } else if (count + 1 >= sizeof(buffer)) {
-+		_nc_ungetch(sp, (int) value);
- 		code = ERR;
--	    }
--	    break;
--	} else if (count + 1 >= sizeof(buffer)) {
--	    ungetch((int) value);
--	    code = ERR;
--	    break;
--	} else {
--	    buffer[count++] = UChar(value);
--	    reset_mbytes(state);
--	    status = count_mbytes(buffer, count, state);
--	    if (status >= 0) {
-+		break;
-+	    } else {
-+		buffer[count++] = UChar(value);
- 		reset_mbytes(state);
--		if (check_mbytes(wch, buffer, count, state) != status) {
--		    code = ERR;	/* the two calls should match */
--		    ungetch((int) value);
-+		status = count_mbytes(buffer, count, state);
-+		if (status >= 0) {
-+		    reset_mbytes(state);
-+		    if (check_mbytes(wch, buffer, count, state) != status) {
-+			code = ERR;	/* the two calls should match */
-+			_nc_ungetch(sp, (int) value);
-+		    }
-+		    value = wch;
-+		    break;
- 		}
--		value = wch;
--		break;
- 	    }
- 	}
-+    } else {
-+	code = ERR;
-     }
-     *result = value;
-+    _nc_unlock_global(curses);
-     T(("result %#lo", value));
-     returnCode(code);
- }
-diff -Naur ncurses-5.6.orig/ncurses/widechar/lib_get_wstr.c ncurses-5.6/ncurses/widechar/lib_get_wstr.c
---- ncurses-5.6.orig/ncurses/widechar/lib_get_wstr.c	2004-10-16 17:55:36.000000000 -0400
-+++ ncurses-5.6/ncurses/widechar/lib_get_wstr.c	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2002-2003,2004 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2002-2004,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -40,7 +40,7 @@
- #include <curses.priv.h>
- #include <term.h>
- 
--MODULE_ID("$Id: lib_get_wstr.c,v 1.8 2004/10/16 21:55:36 tom Exp $")
-+MODULE_ID("$Id: lib_get_wstr.c,v 1.9 2008/06/07 14:50:11 tom Exp $")
- 
- static int
- wadd_wint(WINDOW *win, wint_t *src)
-@@ -86,6 +86,7 @@
- NCURSES_EXPORT(int)
- wgetn_wstr(WINDOW *win, wint_t *str, int maxlen)
- {
-+    SCREEN *sp = _nc_screen_of(win);
-     TTY buf;
-     bool oldnl, oldecho, oldraw, oldcbreak;
-     wint_t erasec;
-@@ -102,10 +103,10 @@
- 
-     _nc_get_tty_mode(&buf);
- 
--    oldnl = SP->_nl;
--    oldecho = SP->_echo;
--    oldraw = SP->_raw;
--    oldcbreak = SP->_cbreak;
-+    oldnl = sp->_nl;
-+    oldecho = sp->_echo;
-+    oldraw = sp->_raw;
-+    oldcbreak = sp->_cbreak;
-     nl();
-     noecho();
-     noraw();
-@@ -209,10 +210,10 @@
-     /* Restore with a single I/O call, to fix minor asymmetry between
-      * raw/noraw, etc.
-      */
--    SP->_nl = oldnl;
--    SP->_echo = oldecho;
--    SP->_raw = oldraw;
--    SP->_cbreak = oldcbreak;
-+    sp->_nl = oldnl;
-+    sp->_echo = oldecho;
-+    sp->_raw = oldraw;
-+    sp->_cbreak = oldcbreak;
- 
-     (void) _nc_set_tty_mode(&buf);
- 
-diff -Naur ncurses-5.6.orig/ncurses/widechar/lib_in_wchnstr.c ncurses-5.6/ncurses/widechar/lib_in_wchnstr.c
---- ncurses-5.6.orig/ncurses/widechar/lib_in_wchnstr.c	2004-05-15 20:12:30.000000000 -0400
-+++ ncurses-5.6/ncurses/widechar/lib_in_wchnstr.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2002,2004 Free Software Foundation, Inc.                   *
-+ * Copyright (c) 2002-2004-2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -27,7 +27,7 @@
-  ****************************************************************************/
- 
- /****************************************************************************
-- * Author: Thomas Dickey 2002,2004                                          *
-+ * Author: Thomas Dickey                                                    *
-  ****************************************************************************/
- 
- /*
-@@ -39,27 +39,35 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: lib_in_wchnstr.c,v 1.3 2004/05/16 00:12:30 tom Exp $")
-+MODULE_ID("$Id: lib_in_wchnstr.c,v 1.7 2007/02/11 01:00:00 tom Exp $")
- 
- NCURSES_EXPORT(int)
--win_wchnstr(WINDOW *win, cchar_t * wchstr, int n)
-+win_wchnstr(WINDOW *win, cchar_t *wchstr, int n)
- {
-     int code = OK;
- 
--    TR(TRACE_CALLS, (T_CALLED("win_wchnstr(%p,%p,%d)"), win, wchstr, n));
-+    T((T_CALLED("win_wchnstr(%p,%p,%d)"), win, wchstr, n));
-     if (win != 0
- 	&& wchstr != 0) {
-+	NCURSES_CH_T *src;
- 	int row, col;
--	int j;
-+	int j, k, limit;
- 
- 	getyx(win, row, col);
-+	limit = getmaxx(win) - col;
-+	src = &(win->_line[row].text[col]);
- 
- 	if (n < 0) {
--	    n = getmaxx(win) + 1 - getcurx(win);
-+	    n = limit;
-+	} else if (n > limit) {
-+	    n = limit;
- 	}
--	for (j = 0; j < n; ++j) {
--	    wchstr[j] = win->_line[row].text[col + j];
-+	for (j = k = 0; j < n; ++j) {
-+	    if (j == 0 || !WidecExt(src[j]) || isWidecBase(src[j])) {
-+		wchstr[k++] = src[j];
-+	    }
- 	}
-+	memset(&(wchstr[k]), 0, sizeof(*wchstr));
- 	T(("result = %s", _nc_viscbuf(wchstr, n)));
-     } else {
- 	code = ERR;
-diff -Naur ncurses-5.6.orig/ncurses/widechar/lib_key_name.c ncurses-5.6/ncurses/widechar/lib_key_name.c
---- ncurses-5.6.orig/ncurses/widechar/lib_key_name.c	1969-12-31 19:00:00.000000000 -0500
-+++ ncurses-5.6/ncurses/widechar/lib_key_name.c	2008-06-18 06:49:44.000000000 -0400
-@@ -0,0 +1,62 @@
-+/****************************************************************************
-+ * Copyright (c) 2007 Free Software Foundation, Inc.                        *
-+ *                                                                          *
-+ * Permission is hereby granted, free of charge, to any person obtaining a  *
-+ * copy of this software and associated documentation files (the            *
-+ * "Software"), to deal in the Software without restriction, including      *
-+ * without limitation the rights to use, copy, modify, merge, publish,      *
-+ * distribute, distribute with modifications, sublicense, and/or sell       *
-+ * copies of the Software, and to permit persons to whom the Software is    *
-+ * furnished to do so, subject to the following conditions:                 *
-+ *                                                                          *
-+ * The above copyright notice and this permission notice shall be included  *
-+ * in all copies or substantial portions of the Software.                   *
-+ *                                                                          *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-+ *                                                                          *
-+ * Except as contained in this notice, the name(s) of the above copyright   *
-+ * holders shall not be used in advertising or otherwise to promote the     *
-+ * sale, use or other dealings in this Software without prior written       *
-+ * authorization.                                                           *
-+ ****************************************************************************/
-+
-+/*
-+**	lib_key_name.c
-+**
-+**	The routine key_name().
-+**
-+*/
-+
-+#include <curses.priv.h>
-+
-+MODULE_ID("$Id: lib_key_name.c,v 1.2 2007/06/12 21:01:13 tom Exp $")
-+
-+NCURSES_EXPORT(NCURSES_CONST char *)
-+key_name(wchar_t c)
-+{
-+    cchar_t my_cchar;
-+    wchar_t *my_wchars;
-+    size_t len;
-+
-+    /* FIXME: move to _nc_globals */
-+    static char result[MB_LEN_MAX + 1];
-+
-+    memset(&my_cchar, 0, sizeof(my_cchar));
-+    my_cchar.chars[0] = c;
-+    my_cchar.chars[1] = L'\0';
-+
-+    my_wchars = wunctrl(&my_cchar);
-+    len = wcstombs(result, my_wchars, sizeof(result) - 1);
-+    if (isEILSEQ(len) || (len == 0)) {
-+	return "UNKNOWN KEY";
-+    }
-+
-+    result[len] = '\0';
-+    return result;
-+}
-diff -Naur ncurses-5.6.orig/ncurses/widechar/lib_unget_wch.c ncurses-5.6/ncurses/widechar/lib_unget_wch.c
---- ncurses-5.6.orig/ncurses/widechar/lib_unget_wch.c	2004-12-04 20:21:31.000000000 -0500
-+++ ncurses-5.6/ncurses/widechar/lib_unget_wch.c	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2002-2003,2004 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2002-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -39,26 +39,30 @@
- 
- #include <curses.priv.h>
- 
--MODULE_ID("$Id: lib_unget_wch.c,v 1.7 2004/12/05 01:21:31 tom Exp $")
-+MODULE_ID("$Id: lib_unget_wch.c,v 1.10 2008/06/07 14:50:37 tom Exp $")
- 
--#ifdef linux
- /*
-- * glibc's wcrtomb() function is broken - does not return the proper value
-- * when target is null (noted for glibc 2.3.2).  This is a workaround.
-+ * Wrapper for wcrtomb() which obtains the length needed for the given
-+ * wide-character 'source'.
-  */
- NCURSES_EXPORT(size_t)
- _nc_wcrtomb(char *target, wchar_t source, mbstate_t * state)
- {
-+    int result;
-+
-     if (target == 0) {
- 	wchar_t temp[2];
- 	const wchar_t *tempp = temp;
- 	temp[0] = source;
- 	temp[1] = 0;
--	return wcsrtombs(NULL, &tempp, 0, state);
-+	result = wcsrtombs(NULL, &tempp, 0, state);
-+    } else {
-+	result = wcrtomb(target, source, state);
-     }
--    return wcrtomb(target, source, state);
-+    if (!isEILSEQ(result) && (result == 0))
-+	result = 1;
-+    return result;
- }
--#endif
- 
- NCURSES_EXPORT(int)
- unget_wch(const wchar_t wch)
-@@ -82,7 +86,7 @@
- 	    wcrtomb(string, wch, &state);
- 
- 	    for (n = (int) (length - 1); n >= 0; --n) {
--		if (ungetch(string[n]) != OK) {
-+		if (_nc_ungetch(SP, string[n]) != OK) {
- 		    result = ERR;
- 		    break;
- 		}
-diff -Naur ncurses-5.6.orig/ncurses/widechar/lib_vid_attr.c ncurses-5.6/ncurses/widechar/lib_vid_attr.c
---- ncurses-5.6.orig/ncurses/widechar/lib_vid_attr.c	2006-11-25 19:26:00.000000000 -0500
-+++ ncurses-5.6/ncurses/widechar/lib_vid_attr.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2002-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2002-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -33,7 +33,7 @@
- #include <curses.priv.h>
- #include <term.h>
- 
--MODULE_ID("$Id: lib_vid_attr.c,v 1.4 2006/11/26 00:26:00 tom Exp $")
-+MODULE_ID("$Id: lib_vid_attr.c,v 1.5 2007/06/30 22:03:02 tom Exp $")
- 
- #define doPut(mode) TPUTS_TRACE(#mode); tputs(mode, 1, outc)
- 
-@@ -72,6 +72,7 @@
- #define fix_pair0 FALSE
- #endif
- 
-+    newmode &= A_ATTRIBUTES;
-     T((T_CALLED("vid_puts(%s,%d)"), _traceattr(newmode), pair));
- 
-     /* this allows us to go on whether or not newterm() has been called */
-diff -Naur ncurses-5.6.orig/ncurses/widechar/lib_wunctrl.c ncurses-5.6/ncurses/widechar/lib_wunctrl.c
---- ncurses-5.6.orig/ncurses/widechar/lib_wunctrl.c	2005-04-16 14:10:44.000000000 -0400
-+++ ncurses-5.6/ncurses/widechar/lib_wunctrl.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2001-2003,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2001-2005,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -35,23 +35,21 @@
- 
- #include <curses.priv.h>
- 
--#if USE_WIDEC_SUPPORT
--
--MODULE_ID("$Id: lib_wunctrl.c,v 1.8 2005/04/16 18:10:44 tom Exp $")
-+MODULE_ID("$Id: lib_wunctrl.c,v 1.12 2007/06/12 20:22:32 tom Exp $")
- 
- NCURSES_EXPORT(wchar_t *)
- wunctrl(cchar_t *wc)
- {
--    static wchar_t str[5], *sp;
-+    static wchar_t str[CCHARW_MAX + 1], *sp;
- 
-     if (Charable(*wc)) {
- 	const char *p = unctrl((unsigned) _nc_to_char((wint_t) CharOf(*wc)));
- 
--	for (sp = str; *p;)
--	    *sp++ = _nc_to_widechar(*p++);
-+	for (sp = str; *p; ++p) {
-+	    *sp++ = _nc_to_widechar(*p);
-+	}
-+	*sp = 0;
- 	return str;
-     } else
- 	return wc->chars;
- }
--
--#endif
-diff -Naur ncurses-5.6.orig/ncurses-5.6-20071201-patch.sh ncurses-5.6/ncurses-5.6-20071201-patch.sh
---- ncurses-5.6.orig/ncurses-5.6-20071201-patch.sh	1969-12-31 19:00:00.000000000 -0500
-+++ ncurses-5.6/ncurses-5.6-20071201-patch.sh	2008-06-18 06:49:44.000000000 -0400
-@@ -0,0 +1,60468 @@
-+#!/bin/sh
-+# Use this script to patch ncurses 5.6 to 5.6 (20071201)
-+# Run this script inside the ncurses 5.6 source directory et voila! Updated.
-+
-+if ( egrep '^NCURSES_MAJOR = 5$' dist.mk >/dev/null 2>&1 \
-+  && egrep '^NCURSES_MINOR = 6$' dist.mk >/dev/null 2>&1 \
-+  && egrep '^NCURSES_PATCH = 20061217$' dist.mk >/dev/null 2>&1 )
-+then
-+        echo patching...
-+else
-+        echo 'This does not look like ncurses 5.6'
-+        exit 1
-+fi
-+
-+rm -rf tack
-+rm -f Ada95/src/terminal_interface-curses.adb
-+rm -f mkinstalldirs
-+
-+patch -p1 -i $0         # shell command = this script = inputfile for patch
-+exit
-+
-+# patch by Thomas E. Dickey <dickey@invisible-island.net>
-+# created  Sat Dec  8 23:18:44 UTC 2007
-+# ------------------------------------------------------------------------------
-+# Ada95/gen/Makefile.in                                                 |  134 
-+# Ada95/gen/gen.c                                                       |  144 
-+# Ada95/gen/html.m4                                                     |    6 
-+# Ada95/gen/terminal_interface-curses-aux.ads.m4                        |    5 
-+# Ada95/gen/terminal_interface-curses-menus.ads.m4                      |    6 
-+# Ada95/gen/terminal_interface-curses.ads.m4                            |   30 
-+# Ada95/samples/ncurses2-attr_test.adb                                  |   18 
-+# Ada95/samples/ncurses2-m.adb                                          |    5 
-+# Ada95/samples/rain.adb                                                |    4 
-+# Ada95/samples/sample.adb                                              |    4 
-+# Ada95/src/Makefile.in                                                 |    8 
-+# INSTALL                                                               |   60 
-+# MANIFEST                                                              |   48 
-+# NEWS                                                                  |  514 +
-+# TO-DO                                                                 |   23 
-+# aclocal.m4                                                            |  642 +
-+# c++/Makefile.in                                                       |   16 
-+# c++/README-first                                                      |   35 
-+# c++/cursesapp.cc                                                      |    9 
-+# c++/cursesmain.cc                                                     |   32 
-+# c++/cursesp.h                                                         |    6 
-+# c++/cursespad.cc                                                      |   10 
-+# c++/cursesw.cc                                                        |  453 -
-+# c++/cursesw.h                                                         |   33 
-+# c++/demo.cc                                                           |  126 
-+# c++/edit_cfg.sh                                                       |   12 
-+# c++/etip.h.in                                                         |   44 
-+# c++/headers                                                           |    5 
-+# c++/internal.h                                                        |    6 
-+# c++/modules                                                           |    8 
-+# config.guess                                                          |   34 
-+# config.sub                                                            |   28 
-+# configure                                                             | 4143 +++++-----
-+# configure.in                                                          |  265 
-+# dist.mk                                                               |    7 
-+# doc/hackguide.doc                                                     |    2 
-+# doc/html/ada/funcs/A.htm                                              |   15 
-+# doc/html/ada/funcs/B.htm                                              |   14 
-+# doc/html/ada/funcs/C.htm                                              |   49 
-+# doc/html/ada/funcs/D.htm                                              |   41 
-+# doc/html/ada/funcs/E.htm                                              |   14 
-+# doc/html/ada/funcs/F.htm                                              |   21 
-+# doc/html/ada/funcs/G.htm                                              |   65 
-+# doc/html/ada/funcs/H.htm                                              |   18 
-+# doc/html/ada/funcs/I.htm                                              |   39 
-+# doc/html/ada/funcs/K.htm                                              |   11 
-+# doc/html/ada/funcs/L.htm                                              |   11 
-+# doc/html/ada/funcs/M.htm                                              |   25 
-+# doc/html/ada/funcs/N.htm                                              |   30 
-+# doc/html/ada/funcs/O.htm                                              |    6 
-+# doc/html/ada/funcs/P.htm                                              |   24 
-+# doc/html/ada/funcs/Q.htm                                              |    2 
-+# doc/html/ada/funcs/R.htm                                              |   34 
-+# doc/html/ada/funcs/S.htm                                              |  153 
-+# doc/html/ada/funcs/T.htm                                              |   19 
-+# doc/html/ada/funcs/U.htm                                              |   19 
-+# doc/html/ada/funcs/V.htm                                              |    5 
-+# doc/html/ada/funcs/W.htm                                              |   90 
-+# doc/html/ada/table.html                                               |  334 
-+# doc/html/ada/terminal_interface-curses-aux__ads.htm                   |   99 
-+# doc/html/ada/terminal_interface-curses-forms-field_types__ads.htm     |  181 
-+# doc/html/ada/terminal_interface-curses-forms-field_user_data__ads.htm |   23 
-+# doc/html/ada/terminal_interface-curses-forms-form_user_data__ads.htm  |   23 
-+# doc/html/ada/terminal_interface-curses-forms__ads.htm                 |  717 -
-+# doc/html/ada/terminal_interface-curses-menus-item_user_data__ads.htm  |   23 
-+# doc/html/ada/terminal_interface-curses-menus-menu_user_data__ads.htm  |   23 
-+# doc/html/ada/terminal_interface-curses-menus__ads.htm                 |  525 -
-+# doc/html/ada/terminal_interface-curses-mouse__adb.htm                 |   12 
-+# doc/html/ada/terminal_interface-curses-mouse__ads.htm                 |  213 
-+# doc/html/ada/terminal_interface-curses-panels-user_data__ads.htm      |   23 
-+# doc/html/ada/terminal_interface-curses-panels__ads.htm                |   69 
-+# doc/html/ada/terminal_interface-curses-terminfo__adb.htm              |    4 
-+# doc/html/ada/terminal_interface-curses-text_io-aux__adb.htm           |    4 
-+# doc/html/ada/terminal_interface-curses-text_io__adb.htm               |   34 
-+# doc/html/ada/terminal_interface-curses-trace__ads.htm                 |   65 
-+# doc/html/ada/terminal_interface-curses__adb.htm                       | 2936 +++----
-+# doc/html/ada/terminal_interface-curses__ads.htm                       | 2019 ++--
-+# doc/html/man/captoinfo.1m.html                                        |   14 
-+# doc/html/man/clear.1.html                                             |    4 
-+# doc/html/man/curs_add_wch.3x.html                                     |   10 
-+# doc/html/man/curs_addch.3x.html                                       |    4 
-+# doc/html/man/curs_border.3x.html                                      |    8 
-+# doc/html/man/curs_extend.3x.html                                      |    8 
-+# doc/html/man/curs_getcchar.3x.html                                    |    6 
-+# doc/html/man/curs_insstr.3x.html                                      |    4 
-+# doc/html/man/curs_mouse.3x.html                                       |  129 
-+# doc/html/man/curs_printw.3x.html                                      |    8 
-+# doc/html/man/curs_scanw.3x.html                                       |    6 
-+# doc/html/man/curs_scr_dump.3x.html                                    |    4 
-+# doc/html/man/curs_termcap.3x.html                                     |    4 
-+# doc/html/man/curs_terminfo.3x.html                                    |    8 
-+# doc/html/man/curs_trace.3x.html                                       |    6 
-+# doc/html/man/curs_util.3x.html                                        |   10 
-+# doc/html/man/default_colors.3x.html                                   |    4 
-+# doc/html/man/form.3x.html                                             |    2 
-+# doc/html/man/form_field_new.3x.html                                   |    8 
-+# doc/html/man/form_field_opts.3x.html                                  |   12 
-+# doc/html/man/form_field_validation.3x.html                            |   22 
-+# doc/html/man/form_hook.3x.html                                        |   20 
-+# doc/html/man/form_opts.3x.html                                        |   12 
-+# doc/html/man/index.html                                               |    3 
-+# doc/html/man/infocmp.1m.html                                          |    4 
-+# doc/html/man/infotocap.1m.html                                        |    6 
-+# doc/html/man/legacy_coding.3x.html                                    |   17 
-+# doc/html/man/menu.3x.html                                             |    2 
-+# doc/html/man/menu_hook.3x.html                                        |   20 
-+# doc/html/man/menu_opts.3x.html                                        |   12 
-+# doc/html/man/mitem_opts.3x.html                                       |   12 
-+# doc/html/man/ncurses.3x.html                                          |   10 
-+# doc/html/man/panel.3x.html                                            |    2 
-+# doc/html/man/term.5.html                                              |   12 
-+# doc/html/man/term.7.html                                              |   12 
-+# doc/html/man/terminfo.5.html                                          |   26 
-+# doc/html/man/tic.1m.html                                              |    4 
-+# doc/html/man/toe.1m.html                                              |    6 
-+# doc/html/man/tput.1.html                                              |    8 
-+# doc/html/man/tset.1.html                                              |    6 
-+# doc/html/ncurses-intro.html                                           |   38 
-+# doc/ncurses-intro.doc                                                 |   33 
-+# form/Makefile.in                                                      |   12 
-+# form/fld_def.c                                                        |   13 
-+# form/fld_dup.c                                                        |    7 
-+# form/fld_ftlink.c                                                     |    7 
-+# form/fld_link.c                                                       |    7 
-+# form/fld_newftyp.c                                                    |    7 
-+# form/frm_def.c                                                        |   10 
-+# form/frm_driver.c                                                     |  131 
-+# form/fty_alnum.c                                                      |   18 
-+# form/fty_alpha.c                                                      |   18 
-+# form/fty_enum.c                                                       |   14 
-+# form/fty_int.c                                                        |   14 
-+# form/fty_num.c                                                        |   14 
-+# form/fty_regex.c                                                      |   19 
-+# form/headers                                                          |    3 
-+# form/modules                                                          |    8 
-+# include/MKterm.h.awk.in                                               |   51 
-+# include/curses.h.in                                                   |  237 
-+# include/curses.tail                                                   |    3 
-+# include/curses.wide                                                   |    9 
-+# include/headers                                                       |   11 
-+# include/nc_alloc.h                                                    |   10 
-+# include/ncurses_defs                                                  |   12 
-+# include/ncurses_dll.h                                                 |   11 
-+# include/tic.h                                                         |   29 
-+# install-sh                                                            |  139 
-+# man/Makefile.in                                                       |    8 
-+# man/captoinfo.1m                                                      |   28 
-+# man/clear.1                                                           |   12 
-+# man/curs_add_wch.3x                                                   |    6 
-+# man/curs_addch.3x                                                     |    8 
-+# man/curs_attr.3x                                                      |    7 
-+# man/curs_border.3x                                                    |    8 
-+# man/curs_deleteln.3x                                                  |    6 
-+# man/curs_extend.3x                                                    |    6 
-+# man/curs_getcchar.3x                                                  |    8 
-+# man/curs_getyx.3x                                                     |   27 
-+# man/curs_insstr.3x                                                    |    4 
-+# man/curs_mouse.3x                                                     |   42 
-+# man/curs_outopts.3x                                                   |    6 
-+# man/curs_printw.3x                                                    |    8 
-+# man/curs_scanw.3x                                                     |    6 
-+# man/curs_scr_dump.3x                                                  |    4 
-+# man/curs_slk.3x                                                       |    6 
-+# man/curs_termattrs.3x                                                 |    6 
-+# man/curs_termcap.3x                                                   |    8 
-+# man/curs_terminfo.3x                                                  |   26 
-+# man/curs_trace.3x                                                     |    6 
-+# man/curs_util.3x                                                      |   47 
-+# man/default_colors.3x                                                 |    7 
-+# man/form_driver.3x                                                    |   57 
-+# man/form_field_new.3x                                                 |    8 
-+# man/form_field_opts.3x                                                |   12 
-+# man/form_field_validation.3x                                          |    4 
-+# man/form_hook.3x                                                      |   20 
-+# man/form_opts.3x                                                      |   12 
-+# man/infocmp.1m                                                        |   30 
-+# man/infotocap.1m                                                      |   18 
-+# man/legacy_coding.3x                                                  |    4 
-+# man/man_db.renames                                                    |   23 
-+# man/menu_driver.3x                                                    |   61 
-+# man/menu_hook.3x                                                      |   20 
-+# man/menu_opts.3x                                                      |   12 
-+# man/mitem_opts.3x                                                     |   12 
-+# man/ncurses.3x                                                        |  269 
-+# man/panel.3x                                                          |   37 
-+# man/term.5                                                            |    6 
-+# man/term.7                                                            |   16 
-+# man/terminfo.head                                                     |   14 
-+# man/terminfo.tail                                                     |   22 
-+# man/tic.1m                                                            |    6 
-+# man/toe.1m                                                            |    6 
-+# man/tput.1                                                            |   76 
-+# man/tset.1                                                            |    4 
-+# menu/Makefile.in                                                      |   12 
-+# menu/headers                                                          |    3 
-+# menu/menu.h                                                           |   12 
-+# menu/modules                                                          |    8 
-+# misc/Makefile.in                                                      |   15 
-+# misc/ncurses-config.in                                                |    9 
-+# misc/shlib                                                            |    3 
-+# misc/terminfo.src                                                     |  430 -
-+# mk-1st.awk                                                            |  183 
-+# ncurses-5.6-20071201/Ada95/gen/adacurses-config.in                    |   35 
-+# ncurses-5.6-20071201/Ada95/gen/terminal_interface-curses.adb.m4       | 2501 ++++++
-+# ncurses-5.6-20071201/man/curs_legacy.3x                               |   93 
-+# ncurses-5.6-20071201/man/curs_opaque.3x                               |  133 
-+# ncurses-5.6-20071201/mk-hdr.awk                                       |  107 
-+# ncurses-5.6-20071201/mkdirs.sh                                        |   51 
-+# ncurses-5.6-20071201/ncurses/base/use_window.c                        |   80 
-+# ncurses-5.6-20071201/ncurses/tinfo/MKcaptab.sh                        |  149 
-+# ncurses-5.6-20071201/ncurses/tinfo/MKcodes.awk                        |  161 
-+# ncurses-5.6-20071201/ncurses/tinfo/entries.c                          |  144 
-+# ncurses-5.6-20071201/ncurses/tinfo/use_screen.c                       |   60 
-+# ncurses-5.6-20071201/ncurses/widechar/lib_key_name.c                  |   62 
-+# ncurses-5.6-20071201/test/dots_mvcur.c                                |  171 
-+# ncurses-5.6-20071201/test/inch_wide.c                                 |  279 
-+# ncurses-5.6-20071201/test/inchs.c                                     |  272 
-+# ncurses-5.6-20071201/test/key_names.c                                 |   56 
-+# ncurses-5.6-20071201/test/savescreen.sh                               |   55 
-+# ncurses-5.6-20071201/test/test_arrays.c                               |   79 
-+# ncurses-5.6-20071201/test/test_get_wstr.c                             |  361 
-+# ncurses-5.6-20071201/test/test_getstr.c                               |  351 
-+# ncurses-5.6-20071201/test/test_instr.c                                |  260 
-+# ncurses-5.6-20071201/test/test_inwstr.c                               |  269 
-+# ncurses-5.6-20071201/test/test_opaque.c                               |  421 +
-+# ncurses/Makefile.in                                                   |   51 
-+# ncurses/base/MKkeyname.awk                                            |   83 
-+# ncurses/base/MKlib_gen.sh                                             |   12 
-+# ncurses/base/MKunctrl.awk                                             |   92 
-+# ncurses/base/define_key.c                                             |   13 
-+# ncurses/base/key_defined.c                                            |   22 
-+# ncurses/base/keyok.c                                                  |   14 
-+# ncurses/base/lib_addstr.c                                             |   15 
-+# ncurses/base/lib_color.c                                              |   48 
-+# ncurses/base/lib_delwin.c                                             |   27 
-+# ncurses/base/lib_freeall.c                                            |   41 
-+# ncurses/base/lib_getch.c                                              |   39 
-+# ncurses/base/lib_initscr.c                                            |    9 
-+# ncurses/base/lib_instr.c                                              |   10 
-+# ncurses/base/lib_mouse.c                                              |   24 
-+# ncurses/base/lib_newterm.c                                            |   34 
-+# ncurses/base/lib_newwin.c                                             |   31 
-+# ncurses/base/lib_overlay.c                                            |   11 
-+# ncurses/base/lib_redrawln.c                                           |   10 
-+# ncurses/base/lib_refresh.c                                            |  144 
-+# ncurses/base/lib_restart.c                                            |   18 
-+# ncurses/base/lib_screen.c                                             |   19 
-+# ncurses/base/lib_set_term.c                                           |  147 
-+# ncurses/base/lib_slkinit.c                                            |   15 
-+# ncurses/base/lib_slkset.c                                             |   13 
-+# ncurses/base/lib_ungetch.c                                            |    8 
-+# ncurses/base/lib_window.c                                             |    6 
-+# ncurses/base/memmove.c                                                |    6 
-+# ncurses/base/resizeterm.c                                             |  106 
-+# ncurses/base/safe_sprintf.c                                           |   56 
-+# ncurses/base/tries.c                                                  |   22 
-+# ncurses/base/wresize.c                                                |   14 
-+# ncurses/curses.priv.h                                                 |  369 
-+# ncurses/llib-lncurses                                                 |  549 -
-+# ncurses/llib-lncursesw                                                |  573 -
-+# ncurses/modules                                                       |   31 
-+# ncurses/tinfo/MKcaptab.awk                                            |  134 
-+# ncurses/tinfo/MKnames.awk                                             |  226 
-+# ncurses/tinfo/access.c                                                |   10 
-+# ncurses/tinfo/add_tries.c                                             |   39 
-+# ncurses/tinfo/comp_error.c                                            |   34 
-+# ncurses/tinfo/comp_hash.c                                             |  111 
-+# ncurses/tinfo/comp_parse.c                                            |   96 
-+# ncurses/tinfo/db_iterator.c                                           |   52 
-+# ncurses/tinfo/home_terminfo.c                                         |   21 
-+# ncurses/tinfo/init_keytry.c                                           |   16 
-+# ncurses/tinfo/lib_acs.c                                               |   28 
-+# ncurses/tinfo/lib_baudrate.c                                          |   27 
-+# ncurses/tinfo/lib_data.c                                              |  148 
-+# ncurses/tinfo/lib_options.c                                           |    4 
-+# ncurses/tinfo/lib_raw.c                                               |    8 
-+# ncurses/tinfo/lib_setup.c                                             |  110 
-+# ncurses/tinfo/lib_termcap.c                                           |   62 
-+# ncurses/tinfo/lib_tparm.c                                             |  153 
-+# ncurses/tinfo/lib_tputs.c                                             |   17 
-+# ncurses/tinfo/lib_ttyflags.c                                          |   80 
-+# ncurses/tinfo/make_keys.c                                             |    6 
-+# ncurses/tinfo/name_match.c                                            |   24 
-+# ncurses/tinfo/parse_entry.c                                           |   20 
-+# ncurses/tinfo/read_entry.c                                            |    6 
-+# ncurses/tinfo/setbuf.c                                                |    6 
-+# ncurses/tinfo/strings.c                                               |    6 
-+# ncurses/tinfo/trim_sgr0.c                                             |   10 
-+# ncurses/tinfo/write_entry.c                                           |   22 
-+# ncurses/trace/lib_trace.c                                             |  161 
-+# ncurses/trace/lib_traceatr.c                                          |   50 
-+# ncurses/trace/lib_tracebits.c                                         |   27 
-+# ncurses/trace/lib_tracechr.c                                          |   15 
-+# ncurses/trace/lib_tracedmp.c                                          |   57 
-+# ncurses/trace/lib_tracemse.c                                          |   27 
-+# ncurses/trace/trace_buf.c                                             |   42 
-+# ncurses/trace/trace_tries.c                                           |   30 
-+# ncurses/trace/varargs.c                                               |   26 
-+# ncurses/trace/visbuf.c                                                |   32 
-+# ncurses/tty/hardscroll.c                                              |   34 
-+# ncurses/tty/hashmap.c                                                 |   43 
-+# ncurses/tty/lib_mvcur.c                                               |   11 
-+# ncurses/tty/lib_tstp.c                                                |   38 
-+# ncurses/tty/lib_twait.c                                               |   48 
-+# ncurses/tty/lib_vidattr.c                                             |   42 
-+# ncurses/tty/tty_update.c                                              |   25 
-+# ncurses/widechar/lib_cchar.c                                          |    9 
-+# ncurses/widechar/lib_get_wch.c                                        |    6 
-+# ncurses/widechar/lib_in_wchnstr.c                                     |   26 
-+# ncurses/widechar/lib_unget_wch.c                                      |   20 
-+# ncurses/widechar/lib_vid_attr.c                                       |    5 
-+# ncurses/widechar/lib_wunctrl.c                                        |   16 
-+# panel/Makefile.in                                                     |   12 
-+# panel/headers                                                         |    3 
-+# panel/modules                                                         |    6 
-+# progs/Makefile.in                                                     |   35 
-+# progs/clear.c                                                         |    5 
-+# progs/dump_entry.c                                                    |   21 
-+# progs/infocmp.c                                                       |  161 
-+# progs/modules                                                         |    8 
-+# progs/progs.priv.h                                                    |   13 
-+# progs/tic.c                                                           |   38 
-+# progs/toe.c                                                           |   11 
-+# progs/tput.c                                                          |    8 
-+# progs/tset.c                                                          |   24 
-+# test/Makefile.in                                                      |   14 
-+# test/README                                                           |  363 
-+# test/aclocal.m4                                                       |   92 
-+# test/bs.c                                                             |    6 
-+# test/cardfile.c                                                       |   18 
-+# test/chgat.c                                                          |   27 
-+# test/configure                                                        | 1224 +-
-+# test/configure.in                                                     |   42 
-+# test/demo_defkey.c                                                    |    7 
-+# test/demo_forms.c                                                     |   14 
-+# test/demo_menus.c                                                     |    6 
-+# test/demo_panels.c                                                    |  777 +
-+# test/demo_termcap.c                                                   |    5 
-+# test/ditto.c                                                          |   42 
-+# test/dots.c                                                           |    5 
-+# test/echochar.c                                                       |   12 
-+# test/gdc.c                                                            |    6 
-+# test/hashtest.c                                                       |    6 
-+# test/ins_wide.c                                                       |   14 
-+# test/inserts.c                                                        |   14 
-+# test/mk-test.awk                                                      |   12 
-+# test/modules                                                          |   24 
-+# test/movewindow.c                                                     |   16 
-+# test/ncurses.c                                                        |  391 
-+# test/programs                                                         |   16 
-+# test/railroad.c                                                       |    5 
-+# test/redraw.c                                                         |    6 
-+# test/savescreen.c                                                     |  292 
-+# test/test.priv.h                                                      |   14 
-+# test/view.c                                                           |   10 
-+# test/worm.c                                                           |  278 
-+# 356 files changed, 22567 insertions(+), 10675 deletions(-)
-+# ------------------------------------------------------------------------------
-+# Please remove the following files before applying this patch.
-+# (You can feed this patch to 'sh' to do so.)
-+
-+rm -f Ada95/src/terminal_interface-curses.adb
-+rm -f mkinstalldirs
-+rm -f tack/COPYING
-+rm -f tack/HISTORY
-+rm -f tack/Makefile.in
-+rm -f tack/README
-+rm -f tack/ansi.c
-+rm -f tack/charset.c
-+rm -f tack/color.c
-+rm -f tack/control.c
-+rm -f tack/crum.c
-+rm -f tack/edit.c
-+rm -f tack/fun.c
-+rm -f tack/init.c
-+rm -f tack/menu.c
-+rm -f tack/modes.c
-+rm -f tack/modules
-+rm -f tack/output.c
-+rm -f tack/pad.c
-+rm -f tack/scan.c
-+rm -f tack/sync.c
-+rm -f tack/sysdep.c
-+rm -f tack/tack.1
-+rm -f tack/tack.c
-+rm -f tack/tack.h
-+exit
-+
-+Index: Ada95/gen/Makefile.in
-+Prereq:  1.51 
-+--- ncurses-5.6/Ada95/gen/Makefile.in	2006-12-17 16:53:33.000000000 +0000
-++++ ncurses-5.6-20071201/Ada95/gen/Makefile.in	2007-09-15 17:55:33.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ ##############################################################################
-+-# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
-++# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -28,7 +28,7 @@
-+ #
-+ #  Author:  Juergen Pfeifer, 1996
-+ #
-+-#  $Id: Makefile.in,v 1.51 2006/12/17 16:53:33 tom Exp $
-++#  $Id: Makefile.in,v 1.60 2007/09/15 17:55:33 tom Exp $
-+ #
-+ .SUFFIXES:
-+ 
-+@@ -42,10 +42,13 @@
-+ srcdir		= @srcdir@
-+ prefix		= @prefix@
-+ exec_prefix	= @exec_prefix@
-++bindir		= @bindir@
-++
-+ ADA_INCLUDE	= $(DESTDIR)@ADA_INCLUDE@
-+ ADA_OBJECTS	= $(DESTDIR)@ADA_OBJECTS@
-+ 
-+ INSTALL		= @INSTALL@
-++INSTALL_PROG	= @INSTALL_PROGRAM@
-+ INSTALL_DATA	= @INSTALL_DATA@
-+ 
-+ AWK		= @AWK@
-+@@ -78,6 +81,9 @@
-+ M4		= m4
-+ M4FLAGS		=
-+ 
-++ADACURSES_CONFIG = adacurses-config
-++
-++WRAPPER		= sh $(top_srcdir)/misc/shlib
-+ GENERATE	= ./gen$x '@DFT_ARG_SUFFIX@'
-+ DEL_ADAMODE	= sed -e '/^\-\-\ \ \-\*\-\ ada\ \-\*\-.*/d'
-+ 
-+@@ -92,17 +98,18 @@
-+ 
-+ GEN_FILES0      = Base_Defs
-+ 
-+-GEN_FILES1      = Key_Definitions              		\
-+-		  Old_Keys                     		\
-+-		  Character_Attribute_Set_Rep  		\
-++GEN_FILES1      = ACS_Map                      		\
-+ 		  AC_Rep                       		\
-++		  Base_Defs			        \
-++		  Character_Attribute_Set_Rep  		\
-+ 		  Color_Defs                   		\
-+-		  ACS_Map                      		\
-++		  Key_Definitions              		\
-+ 		  Linker_Options               		\
-+-		  Base_Defs			        \
-+-		  Window_Offsets                        \
-++		  Old_Keys                     		\
-++		  Public_Variables                      \
-++		  Trace_Defs				\
-+ 		  Version_Info				\
-+-		  Trace_Defs
-++		  Window_Offsets
-+ 
-+ GEN_FILES2      = Menu_Opt_Rep        		    	\
-+ 		  Menu_Base_Defs               		\
-+@@ -123,6 +130,7 @@
-+ 		  Eti_Defs
-+ 
-+ GEN_TARGETS     = $(ADA_SRCDIR)/$(ABASE).ads         			\
-++		  $(ADA_SRCDIR)/$(ABASE).adb         			\
-+ 	          $(ADA_SRCDIR)/$(ABASE)-aux.ads   			\
-+ 	          $(ADA_SRCDIR)/$(ABASE)-trace.ads   			\
-+ 	          $(ADA_SRCDIR)/$(ABASE)-menus.ads   			\
-+@@ -137,6 +145,7 @@
-+ 	          $(ADA_SRCDIR)/$(ABASE)-panels-user_data.ads
-+ 
-+ GEN_SRC		= $(srcdir)/$(ABASE).ads.m4				\
-++		  $(srcdir)/$(ABASE).adb.m4				\
-+ 	          $(srcdir)/$(ABASE)-aux.ads.m4 	  		\
-+ 	          $(srcdir)/$(ABASE)-trace.ads.m4 	  		\
-+ 	          $(srcdir)/$(ABASE)-menus.ads.m4 	  		\
-+@@ -159,7 +168,7 @@
-+ 
-+ $(ADA_INCLUDE) \
-+ $(ADA_OBJECTS) :
-+-	$(top_srcdir)/mkinstalldirs $@
-++	sh $(top_srcdir)/mkdirs.sh $@
-+ 
-+ install \
-+ install.libs :: $(ADA_INCLUDE)
-+@@ -177,6 +186,10 @@
-+ 	@$(top_srcdir)/tar-copy.sh '$(ALIB)[-.]*.ali' $(ADA_SRCDIR) $(ADA_OBJECTS)
-+ 	@-chmod u+x $(ADA_SRCDIR)/*.ali
-+ 
-++install \
-++install.libs :: $(DESTDIR)$(bindir) adacurses-config
-++	$(INSTALL_PROG) adacurses-config $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG)
-++
-+ uninstall \
-+ uninstall.libs ::
-+ 	@echo removing package $(ALIB) from $(ADA_INCLUDE)
-+@@ -187,93 +200,106 @@
-+ 	@echo removing package $(ALIB) from $(ADA_OBJECTS)
-+ 	-@cd $(ADA_OBJECTS) && rm -f $(ALIB)[-.]*
-+ 
-++uninstall \
-++uninstall.libs ::
-++	-rm -f $(DESTDIR)$(bindir)/$(ADACURSES_CONFIG)
-++
-+ gen$x:	gen.o
-+ 	@ECHO_LINK@ $(LINK) $(CFLAGS_NORMAL) gen.o $(LD_FLAGS) -o $@
-+ 
-+ gen.o:	$(srcdir)/gen.c
-+ 	$(HOST_CC) $(CFLAGS_NORMAL) -c -o $@ $(srcdir)/gen.c
-+-
-++################################################################################
-+ Character_Attribute_Set_Rep: gen$x
-+-	$(GENERATE) B A >$@
-++	$(WRAPPER) "$(GENERATE) B A" >$@
-+ 
-+ Base_Defs: gen$x
-+-	$(GENERATE) B B >$@
-++	$(WRAPPER) "$(GENERATE) B B" >$@
-+ 
-+ Color_Defs: gen$x
-+-	$(GENERATE) B C >$@
-++	$(WRAPPER) "$(GENERATE) B C" >$@
-++
-++Window_Offsets: gen$x
-++	$(WRAPPER) "$(GENERATE) B D" >$@
-+ 
-+ Key_Definitions: gen$x
-+-	$(GENERATE) B K >$@
-++	$(WRAPPER) "$(GENERATE) B K" >$@
-+ 
-+-Old_Keys: gen$x
-+-	$(GENERATE) B O >$@
-++Linker_Options: gen$x
-++	$(WRAPPER) "$(GENERATE) B L" >$@
-+ 
-+ ACS_Map: gen$x
-+-	$(GENERATE) B M >$@
-++	$(WRAPPER) "$(GENERATE) B M" >$@
-+ 
-+-AC_Rep: gen$x
-+-	$(GENERATE) B R >$@
-++Old_Keys: gen$x
-++	$(WRAPPER) "$(GENERATE) B O" >$@
-+ 
-+-Linker_Options: gen$x
-+-	$(GENERATE) B L >$@
-++Public_Variables: gen$x
-++	$(WRAPPER) "$(GENERATE) B P" >$@
-+ 
-+-Version_Info: gen$x
-+-	$(GENERATE) B V >$@
-++AC_Rep: gen$x
-++	$(WRAPPER) "$(GENERATE) B R" >$@
-+ 
-+-Window_Offsets: gen$x
-+-	$(GENERATE) B D >$@
-++Version_Info: gen$x
-++	$(WRAPPER) "$(GENERATE) B V" >$@
-+ 
-+ Trace_Defs: gen$x
-+-	$(GENERATE) B T >$@
-+-
-++	$(WRAPPER) "$(GENERATE) B T" >$@
-++################################################################################
-+ Menu_Opt_Rep: gen$x
-+-	$(GENERATE) M R >$@
-++	$(WRAPPER) "$(GENERATE) M R" >$@
-+ 
-+ Menu_Base_Defs: gen$x
-+-	$(GENERATE) M B >$@
-++	$(WRAPPER) "$(GENERATE) M B" >$@
-+ 
-+ Menu_Linker_Options: gen$x
-+-	$(GENERATE) M L >$@
-++	$(WRAPPER) "$(GENERATE) M L" >$@
-+ 
-+ Item_Rep: gen$x
-+-	$(GENERATE) M I >$@
-+-
-++	$(WRAPPER) "$(GENERATE) M I" >$@
-++################################################################################
-+ Form_Opt_Rep: gen$x
-+-	$(GENERATE) F R >$@
-++	$(WRAPPER) "$(GENERATE) F R" >$@
-+ 
-+ Form_Base_Defs: gen$x
-+-	$(GENERATE) F B >$@
-++	$(WRAPPER) "$(GENERATE) F B" >$@
-+ 
-+ Form_Linker_Options: gen$x
-+-	$(GENERATE) F L >$@
-++	$(WRAPPER) "$(GENERATE) F L" >$@
-+ 
-+ Field_Rep: gen$x
-+-	$(GENERATE) F I >$@
-+-
-++	$(WRAPPER) "$(GENERATE) F I" >$@
-++################################################################################
-+ Mouse_Base_Defs: gen$x
-+-	$(GENERATE) P B >$@
-++	$(WRAPPER) "$(GENERATE) P B" >$@
-+ 
-+ Mouse_Event_Rep: gen$x
-+-	$(GENERATE) P M >$@
-++	$(WRAPPER) "$(GENERATE) P M" >$@
-+ 
-+ Mouse_Events: gen$x
-+-	$(GENERATE) B E >$@
-++	$(WRAPPER) "$(GENERATE) B E" >$@
-+ 
-+ Panel_Linker_Options: gen$x
-+-	$(GENERATE) P L >$@
-++	$(WRAPPER) "$(GENERATE) P L" >$@
-+ 
-+ Chtype_Def: gen$x
-+-	$(GENERATE) E C >$@
-++	$(WRAPPER) "$(GENERATE) E C" >$@
-+ 
-+ Eti_Defs: gen$x
-+-	$(GENERATE) E E >$@
-+-
-++	$(WRAPPER) "$(GENERATE) E E" >$@
-++################################################################################
-+ $(ADA_SRCDIR)/$(ABASE).ads: 	$(srcdir)/$(ABASE).ads.m4 \
-+ 				$(GEN_FILES1) $(srcdir)/normal.m4
-+ 	$(M4) $(M4FLAGS) -DM4MACRO=$(srcdir)/normal.m4 \
-+ 	$(srcdir)/$(ABASE).ads.m4 |\
-+ 	$(DEL_ADAMODE) >$@
-+ 
-++$(ADA_SRCDIR)/$(ABASE).adb: 	$(srcdir)/$(ABASE).adb.m4 \
-++				$(GEN_FILES1) $(srcdir)/normal.m4
-++	$(M4) $(M4FLAGS) -DM4MACRO=$(srcdir)/normal.m4 \
-++	$(srcdir)/$(ABASE).adb.m4 |\
-++	$(DEL_ADAMODE) >$@
-++
-+ $(ADA_SRCDIR)/$(ABASE)-aux.ads: $(srcdir)/$(ABASE)-aux.ads.m4 \
-+ 				$(GEN_FILES5) $(srcdir)/normal.m4
-+ 	$(M4) $(M4FLAGS) -DM4MACRO=$(srcdir)/normal.m4 \
-+@@ -357,8 +383,8 @@
-+ tags:
-+ 	ctags *.[ch]
-+ 
-+-TAGS:
-+-	etags *.[ch]
-++@MAKE_UPPER_TAGS@TAGS:
-++@MAKE_UPPER_TAGS@	etags *.[ch]
-+ 
-+ mostlyclean ::
-+ 	-rm -f a.out core gen$x *.o
-+@@ -372,7 +398,8 @@
-+ 	-rm -f $(GEN_TARGETS) instab.tmp *.ad[bs] *.html *.ali *.tmp
-+ 
-+ distclean :: clean
-+-	rm -f Makefile
-++	-rm -f adacurses-config
-++	-rm -f Makefile
-+ 
-+ realclean :: distclean
-+ 
-+@@ -408,9 +435,14 @@
-+ 	@mkdir -p $(HTML_DIR)
-+ 	cp -p ../src/*.ad[sb] . && chmod +w *.ad[sb]
-+ 	ln -sf ../src/*.ali .
-+-	for f in $(GEN_SRC); do \
-++	@echo "Filtering generated files"
-++	@for f in $(GEN_SRC); do \
-++	   h=`basename $$f` ;\
-+ 	   g=`basename $$f .ads.m4` ;\
-+-	   $(M4) $(M4FLAGS) -DM4MACRO=html.m4 $$f | $(DEL_ADAMODE) > $$g.ads ;\
-++	   if test "$$g" != "$$h" ; then \
-++	      $(M4) $(M4FLAGS) -DM4MACRO=html.m4 $$f | $(DEL_ADAMODE) > $$g.ads ;\
-++	      echo "... $$g.ads" ;\
-++	   fi \
-+ 	done
-+ 	@-rm -f $(HTML_DIR)/$(ALIB)*.htm*
-+ 	$(GNATHTML) -d -f $(ALIB)*.ads
-+@@ -423,7 +455,7 @@
-+ 	   sed -e 's/3X/3x/g' |\
-+ 	   sed -e 's/$$\([ABCDEFGHIJKLMNOPQRSTUVWXZabcdefghijklmnopqrstuvwxz0123456789_]*:.*\)\$$/@\1@/' |\
-+ 	   sed -e 's%&lt;/A&gt;%</A>%g' > $$a.tmp ;\
-+-           mv $$a.tmp $$f ;\
-++	   mv $$a.tmp $$f ;\
-+ 	done
-+ 	@rm -f *.ad[sb] *.ali *.tmp
-+ 	@for f in funcs.htm main.htm ; do \
-+Index: Ada95/gen/adacurses-config.in
-+--- /dev/null	2007-12-08 19:14:25.328509000 +0000
-++++ ncurses-5.6-20071201/Ada95/gen/adacurses-config.in	2007-04-07 21:06:50.000000000 +0000
-+@@ -0,0 +1,35 @@
-++#! /bin/sh
-++# $Id: adacurses-config.in,v 1.2 2007/04/07 21:06:50 tom Exp $
-++#
-++# This script will return the option to add to `gnatmake' for using
-++# AdaCurses.
-++#
-++
-++prefix="@prefix@"
-++exec_prefix="@exec_prefix@"
-++libdir="@libdir@"
-++
-++VERSION="@NCURSES_MAJOR@.@NCURSES_MINOR@.@NCURSES_PATCH@"
-++
-++CFLAGS="-I$libdir/adacurses -L$libdir/adacurses"
-++LIBS="-L$prefix/lib -lAdaCurses"
-++
-++case "x$1" in
-++    x--version)
-++        echo AdaCurses $VERSION
-++        ;;
-++    x--cflags)
-++        echo $CFLAGS
-++        ;;
-++    x--libs)
-++        echo $LIBS
-++        ;;
-++    x)
-++    	# if no parameter is given, give what gnatmake needs
-++        echo $CFLAGS -largs $LIBS
-++        ;;
-++    *)
-++        echo 'Usage: adacurses-config [--version | --cflags | --libs]' >&2
-++        exit 1
-++        ;;
-++esac
-+Index: Ada95/gen/gen.c
-+Prereq:  1.40 
-+--- ncurses-5.6/Ada95/gen/gen.c	2005-01-22 17:03:48.000000000 +0000
-++++ ncurses-5.6-20071201/Ada95/gen/gen.c	2007-05-05 17:24:36.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998,2004,2005 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998,2005,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -32,7 +32,7 @@
-+ 
-+ /*
-+     Version Control
-+-    $Id: gen.c,v 1.40 2005/01/22 17:03:48 tom Exp $
-++    $Id: gen.c,v 1.48 2007/05/05 17:24:36 tom Exp $
-+   --------------------------------------------------------------------------*/
-+ /*
-+   This program generates various record structures and constants from the
-+@@ -41,6 +41,8 @@
-+   to produce the real source.
-+   */
-+ 
-++#include <ncurses_cfg.h>
-++
-+ #include <stdlib.h>
-+ #include <stddef.h>
-+ #include <string.h>
-+@@ -771,6 +773,23 @@
-+ static void
-+ gen_acs(void)
-+ {
-++  printf("   type C_ACS_Map is array (Character'Val (0) .. Character'Val (127))\n");
-++  printf("        of Attributed_Character;\n");
-++#if USE_REENTRANT || BROKEN_LINKER
-++  printf("   type C_ACS_Ptr is access C_ACS_Map;\n");
-++  printf("   function ACS_Map return C_ACS_Ptr;\n");
-++  printf("   pragma Import (C, ACS_Map, \"_nc_acs_map\");\n");
-++#else
-++  printf("   ACS_Map : C_ACS_Map;\n");
-++  printf("   pragma Import (C, ACS_Map, \"acs_map\");\n");
-++#endif
-++  printf("   --\n");
-++  printf("   --\n");
-++  printf("   --  Constants for several characters from the Alternate Character Set\n");
-++  printf("   --  You must use these constants as indices into the ACS_Map array\n");
-++  printf("   --  to get the corresponding attributed character at runtime.\n");
-++  printf("   --\n");
-++
-+ #ifdef ACS_ULCORNER
-+   acs_def("ACS_Upper_Left_Corner", &ACS_ULCORNER);
-+ #endif
-+@@ -877,8 +896,7 @@
-+    printf("   %-25s : constant Event_Mask := 8#%011lo#;\n", \
-+           #name, name)
-+ 
-+-static
-+-void
-++static void
-+ gen_mouse_events(void)
-+ {
-+   mmask_t all1 = 0;
-+@@ -1004,6 +1022,56 @@
-+   GEN_EVENT(BUTTON4_EVENTS, all4);
-+ }
-+ 
-++static void
-++wrap_one_var(const char *c_var,
-++	     const char *c_type,
-++	     const char *ada_func,
-++	     const char *ada_type)
-++{
-++#if USE_REENTRANT
-++  /* must wrap variables */
-++  printf("\n");
-++  printf("   function %s return %s\n", ada_func, ada_type);
-++  printf("   is\n");
-++  printf("      function Result return %s;\n", c_type);
-++  printf("      pragma Import (C, Result, \"_nc_%s\");\n", c_var);
-++  printf("   begin\n");
-++  if (strcmp(c_type, ada_type))
-++    printf("      return %s (Result);\n", ada_type);
-++  else
-++    printf("      return Result;\n");
-++  printf("   end %s;\n", ada_func);
-++#else
-++  /* global variables are really global */
-++  printf("\n");
-++  printf("   function %s return %s\n", ada_func, ada_type);
-++  printf("   is\n");
-++  printf("      Result : %s;\n", c_type);
-++  printf("      pragma Import (C, Result, \"%s\");\n", c_var);
-++  printf("   begin\n");
-++  if (strcmp(c_type, ada_type))
-++    printf("      return %s (Result);\n", ada_type);
-++  else
-++    printf("      return Result;\n");
-++  printf("   end %s;\n", ada_func);
-++#endif
-++}
-++
-++#define GEN_PUBLIC_VAR(c_var, c_type, ada_func, ada_type) \
-++	wrap_one_var(#c_var, #c_type, #ada_func, #ada_type)
-++
-++static void
-++gen_public_vars(void)
-++{
-++  GEN_PUBLIC_VAR(stdscr, Window, Standard_Window, Window);
-++  GEN_PUBLIC_VAR(curscr, Window, Current_Window, Window);
-++  GEN_PUBLIC_VAR(LINES, C_Int, Lines, Line_Count);
-++  GEN_PUBLIC_VAR(COLS, C_Int, Columns, Column_Count);
-++  GEN_PUBLIC_VAR(TABSIZE, C_Int, Tab_Size, Natural);
-++  GEN_PUBLIC_VAR(COLORS, C_Int, Number_Of_Colors, Natural);
-++  GEN_PUBLIC_VAR(COLOR_PAIRS, C_Int, Number_Of_Color_Pairs, Natural);
-++}
-++
-+ /*
-+  * Output some comment lines indicating that the file is generated.
-+  * The name parameter is the name of the facility to be used in
-+@@ -1178,70 +1246,21 @@
-+   return strlen(buf);
-+ }
-+ 
-+-#define GEN_OFFSET(member,itype)                                    \
-+-  if (sizeof(((WINDOW*)0)->member)==sizeof(itype)) {                \
-+-    o = offsetof(WINDOW, member);                                   \
-+-    if ((o%sizeof(itype) == 0)) {                                   \
-+-       printf("   Offset%-*s : constant Natural := %2ld; --  %s\n", \
-+-              12, #member, (long)(o/sizeof(itype)),#itype);         \
-+-    }                                                               \
-+-  }
-+-
-+ static void
-+ gen_offsets(void)
-+ {
-+-  long o;
-+   const char *s_bool = "";
-+ 
-+-  GEN_OFFSET(_maxy, short);
-+-  GEN_OFFSET(_maxx, short);
-+-  GEN_OFFSET(_begy, short);
-+-  GEN_OFFSET(_begx, short);
-+-  GEN_OFFSET(_cury, short);
-+-  GEN_OFFSET(_curx, short);
-+-  GEN_OFFSET(_yoffset, short);
-+-  GEN_OFFSET(_pary, int);
-+-  GEN_OFFSET(_parx, int);
-+   if (sizeof(bool) == sizeof(char))
-+     {
-+-      GEN_OFFSET(_notimeout, char);
-+-      GEN_OFFSET(_clear, char);
-+-      GEN_OFFSET(_leaveok, char);
-+-      GEN_OFFSET(_scroll, char);
-+-      GEN_OFFSET(_idlok, char);
-+-      GEN_OFFSET(_idcok, char);
-+-      GEN_OFFSET(_immed, char);
-+-      GEN_OFFSET(_sync, char);
-+-      GEN_OFFSET(_use_keypad, char);
-+-
-+       s_bool = "char";
-+     }
-+   else if (sizeof(bool) == sizeof(short))
-+     {
-+-      GEN_OFFSET(_notimeout, short);
-+-      GEN_OFFSET(_clear, short);
-+-      GEN_OFFSET(_leaveok, short);
-+-      GEN_OFFSET(_scroll, short);
-+-      GEN_OFFSET(_idlok, short);
-+-      GEN_OFFSET(_idcok, short);
-+-      GEN_OFFSET(_immed, short);
-+-      GEN_OFFSET(_sync, short);
-+-      GEN_OFFSET(_use_keypad, short);
-+-
-+       s_bool = "short";
-+     }
-+   else if (sizeof(bool) == sizeof(int))
-+     {
-+-      GEN_OFFSET(_notimeout, int);
-+-      GEN_OFFSET(_clear, int);
-+-      GEN_OFFSET(_leaveok, int);
-+-      GEN_OFFSET(_scroll, int);
-+-      GEN_OFFSET(_idlok, int);
-+-      GEN_OFFSET(_idcok, int);
-+-      GEN_OFFSET(_immed, int);
-+-      GEN_OFFSET(_sync, int);
-+-      GEN_OFFSET(_use_keypad, int);
-+-
-+       s_bool = "int";
-+     }
-+   printf("   Sizeof%-*s : constant Natural := %2ld; --  %s\n",
-+@@ -1291,9 +1310,6 @@
-+ 	case 'A':		/* chtype translation into Ada95 record type */
-+ 	  gen_attr_set("Character_Attribute_Set");
-+ 	  break;
-+-	case 'K':		/* translation of keycodes */
-+-	  gen_keydefs(0);
-+-	  break;
-+ 	case 'B':		/* write some initial comment lines */
-+ 	  basedefs();
-+ 	  break;
-+@@ -1306,24 +1322,30 @@
-+ 	case 'E':		/* generate Mouse Event codes */
-+ 	  gen_mouse_events();
-+ 	  break;
-+-	case 'M':		/* generate constants for the ACS characters */
-+-	  gen_acs();
-++	case 'K':		/* translation of keycodes */
-++	  gen_keydefs(0);
-+ 	  break;
-+ 	case 'L':		/* generate the Linker_Options pragma */
-+ 	  gen_linkopts();
-+ 	  break;
-++	case 'M':		/* generate constants for the ACS characters */
-++	  gen_acs();
-++	  break;
-+ 	case 'O':		/* generate definitions of the old key code names */
-+ 	  gen_keydefs(1);
-+ 	  break;
-++	case 'P':		/* generate definitions of the public variables */
-++	  gen_public_vars();
-++	  break;
-+ 	case 'R':		/* generate representation clause for Attributed character */
-+ 	  gen_chtype_rep("Attributed_Character");
-+ 	  break;
-+-	case 'V':		/* generate version info */
-+-	  gen_version_info();
-+-	  break;
-+ 	case 'T':		/* generate the Trace info */
-+ 	  gen_trace("Trace_Attribute_Set");
-+ 	  break;
-++	case 'V':		/* generate version info */
-++	  gen_version_info();
-++	  break;
-+ 	default:
-+ 	  break;
-+ 	}
-+Index: Ada95/gen/html.m4
-+Prereq:  1.2 
-+--- ncurses-5.6/Ada95/gen/html.m4	2006-04-22 23:16:44.000000000 +0000
-++++ ncurses-5.6-20071201/Ada95/gen/html.m4	2007-09-01 23:59:59.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ dnl***************************************************************************
-+-dnl Copyright (c) 2000,2006 Free Software Foundation, Inc.                   *
-++dnl Copyright (c) 2000-2006,2007 Free Software Foundation, Inc.              *
-+ dnl                                                                          *
-+ dnl Permission is hereby granted, free of charge, to any person obtaining a  *
-+ dnl copy of this software and associated documentation files (the            *
-+@@ -26,7 +26,7 @@
-+ dnl authorization.                                                           *
-+ dnl***************************************************************************
-+ dnl
-+-dnl $Id: html.m4,v 1.2 2006/04/22 23:16:44 tom Exp $
-++dnl $Id: html.m4,v 1.3 2007/09/01 23:59:59 tom Exp $
-+ define(`ANCHORIDX',`0')dnl
-+ define(`MANPAGE',`define(`MANPG',$1)dnl
-+ |=====================================================================
-+@@ -35,6 +35,6 @@
-+ define(`ANCHOR',`define(`ANCHORIDX',incr(ANCHORIDX))dnl
-+ `#'1A NAME="AFU`_'ANCHORIDX"`#'2dnl
-+ define(`CFUNAME',`$1')define(`AFUNAME',`$2')dnl
-+-|')
-++|')dnl
-+ define(`AKA',``AKA': <A HREF="../man/MANPG.html">CFUNAME</A>')dnl
-+ define(`ALIAS',``AKA': $1')dnl
-+Index: Ada95/gen/terminal_interface-curses-aux.ads.m4
-+--- ncurses-5.6/Ada95/gen/terminal_interface-curses-aux.ads.m4	2003-10-25 15:39:18.000000000 +0000
-++++ ncurses-5.6-20071201/Ada95/gen/terminal_interface-curses-aux.ads.m4	2007-09-01 23:49:12.000000000 +0000
-+@@ -1,6 +1,7 @@
-+ --  -*- ada -*-
-+ define(`HTMLNAME',`terminal_interface-curses-aux__ads.htm')dnl
-+-include(M4MACRO)------------------------------------------------------------------------------
-++include(M4MACRO)dnl
-++------------------------------------------------------------------------------
-+ --                                                                          --
-+ --                           GNAT ncurses Binding                           --
-+ --                                                                          --
-+@@ -37,7 +38,7 @@
-+ ------------------------------------------------------------------------------
-+ --  Author:  Juergen Pfeifer, 1996
-+ --  Version Control:
-+---  $Revision: 1.15 $
-++--  $Revision: 1.16 $
-+ --  Binding Version 01.00
-+ ------------------------------------------------------------------------------
-+ include(`Base_Defs')
-+Index: Ada95/gen/terminal_interface-curses-menus.ads.m4
-+--- ncurses-5.6/Ada95/gen/terminal_interface-curses-menus.ads.m4	2006-06-25 14:30:22.000000000 +0000
-++++ ncurses-5.6-20071201/Ada95/gen/terminal_interface-curses-menus.ads.m4	2007-05-05 20:20:52.000000000 +0000
-+@@ -38,8 +38,8 @@
-+ ------------------------------------------------------------------------------
-+ --  Author:  Juergen Pfeifer, 1996
-+ --  Version Control:
-+---  $Revision: 1.26 $
-+---  $Date: 2006/06/25 14:30:22 $
-++--  $Revision: 1.27 $
-++--  $Date: 2007/05/05 20:20:52 $
-+ --  Binding Version 01.00
-+ ------------------------------------------------------------------------------
-+ include(`Menu_Base_Defs')
-+@@ -360,7 +360,7 @@
-+    --  Implemented as function
-+    pragma Inline (Mark);
-+ 
-+-   --  MANPAGE(`menu_attribs.3x')
-++   --  MANPAGE(`menu_attributes.3x')
-+ 
-+    --  ANCHOR(`set_menu_fore()',`Set_Foreground')
-+    procedure Set_Foreground
-+Index: Ada95/gen/terminal_interface-curses.adb.m4
-+--- /dev/null	2007-12-08 19:14:25.328509000 +0000
-++++ ncurses-5.6-20071201/Ada95/gen/terminal_interface-curses.adb.m4	2007-05-05 20:09:10.000000000 +0000
-+@@ -0,0 +1,2501 @@
-++--  -*- ada -*-
-++define(`HTMLNAME',`terminal_interface-curses__adb.htm')dnl
-++include(M4MACRO)------------------------------------------------------------------------------
-++--                                                                          --
-++--                           GNAT ncurses Binding                           --
-++--                                                                          --
-++--                        Terminal_Interface.Curses                         --
-++--                                                                          --
-++--                                 B O D Y                                  --
-++--                                                                          --
-++------------------------------------------------------------------------------
-++-- Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              --
-++--                                                                          --
-++-- Permission is hereby granted, free of charge, to any person obtaining a  --
-++-- copy of this software and associated documentation files (the            --
-++-- "Software"), to deal in the Software without restriction, including      --
-++-- without limitation the rights to use, copy, modify, merge, publish,      --
-++-- distribute, distribute with modifications, sublicense, and/or sell       --
-++-- copies of the Software, and to permit persons to whom the Software is    --
-++-- furnished to do so, subject to the following conditions:                 --
-++--                                                                          --
-++-- The above copyright notice and this permission notice shall be included  --
-++-- in all copies or substantial portions of the Software.                   --
-++--                                                                          --
-++-- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  --
-++-- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               --
-++-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   --
-++-- IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   --
-++-- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    --
-++-- OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    --
-++-- THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               --
-++--                                                                          --
-++-- Except as contained in this notice, the name(s) of the above copyright   --
-++-- holders shall not be used in advertising or otherwise to promote the     --
-++-- sale, use or other dealings in this Software without prior written       --
-++-- authorization.                                                           --
-++------------------------------------------------------------------------------
-++--  Author: Juergen Pfeifer, 1996
-++--  Version Control:
-++--  $Revision: 1.4 $
-++--  $Date: 2007/05/05 20:09:10 $
-++--  Binding Version 01.00
-++------------------------------------------------------------------------------
-++with System;
-++
-++with Terminal_Interface.Curses.Aux;
-++with Interfaces.C;                  use Interfaces.C;
-++with Interfaces.C.Strings;          use Interfaces.C.Strings;
-++with Ada.Characters.Handling;       use Ada.Characters.Handling;
-++with Ada.Strings.Fixed;
-++
-++package body Terminal_Interface.Curses is
-++
-++   use Aux;
-++   use type System.Bit_Order;
-++
-++   package ASF renames Ada.Strings.Fixed;
-++
-++   type chtype_array is array (size_t range <>)
-++      of aliased Attributed_Character;
-++   pragma Convention (C, chtype_array);
-++
-++------------------------------------------------------------------------------
-++   function Key_Name (Key : in Real_Key_Code) return String
-++   is
-++      function Keyname (K : C_Int) return chars_ptr;
-++      pragma Import (C, Keyname, "keyname");
-++
-++      Ch : Character;
-++   begin
-++      if Key <= Character'Pos (Character'Last) then
-++         Ch := Character'Val (Key);
-++         if Is_Control (Ch) then
-++            return Un_Control (Attributed_Character'(Ch    => Ch,
-++                                                     Color => Color_Pair'First,
-++                                                     Attr  => Normal_Video));
-++         elsif Is_Graphic (Ch) then
-++            declare
-++               S : String (1 .. 1);
-++            begin
-++               S (1) := Ch;
-++               return S;
-++            end;
-++         else
-++            return "";
-++         end if;
-++      else
-++         return Fill_String (Keyname (C_Int (Key)));
-++      end if;
-++   end Key_Name;
-++
-++   procedure Key_Name (Key  : in  Real_Key_Code;
-++                       Name : out String)
-++   is
-++   begin
-++      ASF.Move (Key_Name (Key), Name);
-++   end Key_Name;
-++
-++------------------------------------------------------------------------------
-++   procedure Init_Screen
-++   is
-++      function Initscr return Window;
-++      pragma Import (C, Initscr, "initscr");
-++
-++      W : Window;
-++   begin
-++      W := Initscr;
-++      if W = Null_Window then
-++         raise Curses_Exception;
-++      end if;
-++   end Init_Screen;
-++
-++   procedure End_Windows
-++   is
-++      function Endwin return C_Int;
-++      pragma Import (C, Endwin, "endwin");
-++   begin
-++      if Endwin = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end End_Windows;
-++
-++   function Is_End_Window return Boolean
-++   is
-++      function Isendwin return Curses_Bool;
-++      pragma Import (C, Isendwin, "isendwin");
-++   begin
-++      if Isendwin = Curses_Bool_False then
-++         return False;
-++      else
-++         return True;
-++      end if;
-++   end Is_End_Window;
-++------------------------------------------------------------------------------
-++   procedure Move_Cursor (Win    : in Window := Standard_Window;
-++                          Line   : in Line_Position;
-++                          Column : in Column_Position)
-++   is
-++      function Wmove (Win    : Window;
-++                      Line   : C_Int;
-++                      Column : C_Int
-++                     ) return C_Int;
-++      pragma Import (C, Wmove, "wmove");
-++   begin
-++      if Wmove (Win, C_Int (Line), C_Int (Column)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Move_Cursor;
-++------------------------------------------------------------------------------
-++   procedure Add (Win : in Window := Standard_Window;
-++                  Ch  : in Attributed_Character)
-++   is
-++      function Waddch (W  : Window;
-++                       Ch : C_Chtype) return C_Int;
-++      pragma Import (C, Waddch, "waddch");
-++   begin
-++      if Waddch (Win, AttrChar_To_Chtype (Ch)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Add;
-++
-++   procedure Add (Win : in Window := Standard_Window;
-++                  Ch  : in Character)
-++   is
-++   begin
-++      Add (Win,
-++           Attributed_Character'(Ch    => Ch,
-++                                 Color => Color_Pair'First,
-++                                 Attr  => Normal_Video));
-++   end Add;
-++
-++   procedure Add
-++     (Win    : in Window := Standard_Window;
-++      Line   : in Line_Position;
-++      Column : in Column_Position;
-++      Ch     : in Attributed_Character)
-++   is
-++      function mvwaddch (W  : Window;
-++                         Y  : C_Int;
-++                         X  : C_Int;
-++                         Ch : C_Chtype) return C_Int;
-++      pragma Import (C, mvwaddch, "mvwaddch");
-++   begin
-++      if mvwaddch (Win, C_Int (Line),
-++                   C_Int (Column),
-++                   AttrChar_To_Chtype (Ch)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Add;
-++
-++   procedure Add
-++     (Win    : in Window := Standard_Window;
-++      Line   : in Line_Position;
-++      Column : in Column_Position;
-++      Ch     : in Character)
-++   is
-++   begin
-++      Add (Win,
-++           Line,
-++           Column,
-++           Attributed_Character'(Ch    => Ch,
-++                                 Color => Color_Pair'First,
-++                                 Attr  => Normal_Video));
-++   end Add;
-++
-++   procedure Add_With_Immediate_Echo
-++     (Win : in Window := Standard_Window;
-++      Ch  : in Attributed_Character)
-++   is
-++      function Wechochar (W  : Window;
-++                          Ch : C_Chtype) return C_Int;
-++      pragma Import (C, Wechochar, "wechochar");
-++   begin
-++      if Wechochar (Win, AttrChar_To_Chtype (Ch)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Add_With_Immediate_Echo;
-++
-++   procedure Add_With_Immediate_Echo
-++     (Win : in Window := Standard_Window;
-++      Ch  : in Character)
-++   is
-++   begin
-++      Add_With_Immediate_Echo
-++        (Win,
-++         Attributed_Character'(Ch    => Ch,
-++                               Color => Color_Pair'First,
-++                               Attr  => Normal_Video));
-++   end Add_With_Immediate_Echo;
-++------------------------------------------------------------------------------
-++   function Create (Number_Of_Lines       : Line_Count;
-++                    Number_Of_Columns     : Column_Count;
-++                    First_Line_Position   : Line_Position;
-++                    First_Column_Position : Column_Position) return Window
-++   is
-++      function Newwin (Number_Of_Lines       : C_Int;
-++                       Number_Of_Columns     : C_Int;
-++                       First_Line_Position   : C_Int;
-++                       First_Column_Position : C_Int) return Window;
-++      pragma Import (C, Newwin, "newwin");
-++
-++      W : Window;
-++   begin
-++      W := Newwin (C_Int (Number_Of_Lines),
-++                   C_Int (Number_Of_Columns),
-++                   C_Int (First_Line_Position),
-++                   C_Int (First_Column_Position));
-++      if W = Null_Window then
-++         raise Curses_Exception;
-++      end if;
-++      return W;
-++   end Create;
-++
-++   procedure Delete (Win : in out Window)
-++   is
-++      function Wdelwin (W : Window) return C_Int;
-++      pragma Import (C, Wdelwin, "delwin");
-++   begin
-++      if Wdelwin (Win) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++      Win := Null_Window;
-++   end Delete;
-++
-++   function Sub_Window
-++     (Win                   : Window := Standard_Window;
-++      Number_Of_Lines       : Line_Count;
-++      Number_Of_Columns     : Column_Count;
-++      First_Line_Position   : Line_Position;
-++      First_Column_Position : Column_Position) return Window
-++   is
-++      function Subwin
-++        (Win                   : Window;
-++         Number_Of_Lines       : C_Int;
-++         Number_Of_Columns     : C_Int;
-++         First_Line_Position   : C_Int;
-++         First_Column_Position : C_Int) return Window;
-++      pragma Import (C, Subwin, "subwin");
-++
-++      W : Window;
-++   begin
-++      W := Subwin (Win,
-++                   C_Int (Number_Of_Lines),
-++                   C_Int (Number_Of_Columns),
-++                   C_Int (First_Line_Position),
-++                   C_Int (First_Column_Position));
-++      if W = Null_Window then
-++         raise Curses_Exception;
-++      end if;
-++      return W;
-++   end Sub_Window;
-++
-++   function Derived_Window
-++     (Win                   : Window := Standard_Window;
-++      Number_Of_Lines       : Line_Count;
-++      Number_Of_Columns     : Column_Count;
-++      First_Line_Position   : Line_Position;
-++      First_Column_Position : Column_Position) return Window
-++   is
-++      function Derwin
-++        (Win                   : Window;
-++         Number_Of_Lines       : C_Int;
-++         Number_Of_Columns     : C_Int;
-++         First_Line_Position   : C_Int;
-++         First_Column_Position : C_Int) return Window;
-++      pragma Import (C, Derwin, "derwin");
-++
-++      W : Window;
-++   begin
-++      W := Derwin (Win,
-++                   C_Int (Number_Of_Lines),
-++                   C_Int (Number_Of_Columns),
-++                   C_Int (First_Line_Position),
-++                   C_Int (First_Column_Position));
-++      if W = Null_Window then
-++         raise Curses_Exception;
-++      end if;
-++      return W;
-++   end Derived_Window;
-++
-++   function Duplicate (Win : Window) return Window
-++   is
-++      function Dupwin (Win : Window) return Window;
-++      pragma Import (C, Dupwin, "dupwin");
-++
-++      W : constant Window := Dupwin (Win);
-++   begin
-++      if W = Null_Window then
-++         raise Curses_Exception;
-++      end if;
-++      return W;
-++   end Duplicate;
-++
-++   procedure Move_Window (Win    : in Window;
-++                          Line   : in Line_Position;
-++                          Column : in Column_Position)
-++   is
-++      function Mvwin (Win    : Window;
-++                      Line   : C_Int;
-++                      Column : C_Int) return C_Int;
-++      pragma Import (C, Mvwin, "mvwin");
-++   begin
-++      if Mvwin (Win, C_Int (Line), C_Int (Column)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Move_Window;
-++
-++   procedure Move_Derived_Window (Win    : in Window;
-++                                  Line   : in Line_Position;
-++                                  Column : in Column_Position)
-++   is
-++      function Mvderwin (Win    : Window;
-++                         Line   : C_Int;
-++                         Column : C_Int) return C_Int;
-++      pragma Import (C, Mvderwin, "mvderwin");
-++   begin
-++      if Mvderwin (Win, C_Int (Line), C_Int (Column)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Move_Derived_Window;
-++
-++   procedure Set_Synch_Mode (Win  : in Window  := Standard_Window;
-++                             Mode : in Boolean := False)
-++   is
-++      function Syncok (Win  : Window;
-++                       Mode : Curses_Bool) return C_Int;
-++      pragma Import (C, Syncok, "syncok");
-++   begin
-++      if Syncok (Win, Curses_Bool (Boolean'Pos (Mode))) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Set_Synch_Mode;
-++------------------------------------------------------------------------------
-++   procedure Add (Win : in Window := Standard_Window;
-++                  Str : in String;
-++                  Len : in Integer := -1)
-++   is
-++      function Waddnstr (Win : Window;
-++                         Str : char_array;
-++                         Len : C_Int := -1) return C_Int;
-++      pragma Import (C, Waddnstr, "waddnstr");
-++
-++      Txt    : char_array (0 .. Str'Length);
-++      Length : size_t;
-++   begin
-++      To_C (Str, Txt, Length);
-++      if Waddnstr (Win, Txt, C_Int (Len)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Add;
-++
-++   procedure Add
-++     (Win    : in Window := Standard_Window;
-++      Line   : in Line_Position;
-++      Column : in Column_Position;
-++      Str    : in String;
-++      Len    : in Integer := -1)
-++   is
-++   begin
-++      Move_Cursor (Win, Line, Column);
-++      Add (Win, Str, Len);
-++   end Add;
-++------------------------------------------------------------------------------
-++   procedure Add
-++     (Win : in Window := Standard_Window;
-++      Str : in Attributed_String;
-++      Len : in Integer := -1)
-++   is
-++      function Waddchnstr (Win : Window;
-++                           Str : chtype_array;
-++                           Len : C_Int := -1) return C_Int;
-++      pragma Import (C, Waddchnstr, "waddchnstr");
-++
-++      Txt : chtype_array (0 .. Str'Length);
-++   begin
-++      for Length in 1 .. size_t (Str'Length) loop
-++         Txt (Length - 1) := Str (Natural (Length));
-++      end loop;
-++      Txt (Str'Length) := Default_Character;
-++      if Waddchnstr (Win,
-++                     Txt,
-++                     C_Int (Len)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Add;
-++
-++   procedure Add
-++     (Win    : in Window := Standard_Window;
-++      Line   : in Line_Position;
-++      Column : in Column_Position;
-++      Str    : in Attributed_String;
-++      Len    : in Integer := -1)
-++   is
-++   begin
-++      Move_Cursor (Win, Line, Column);
-++      Add (Win, Str, Len);
-++   end Add;
-++------------------------------------------------------------------------------
-++   procedure Border
-++     (Win                       : in Window := Standard_Window;
-++      Left_Side_Symbol          : in Attributed_Character := Default_Character;
-++      Right_Side_Symbol         : in Attributed_Character := Default_Character;
-++      Top_Side_Symbol           : in Attributed_Character := Default_Character;
-++      Bottom_Side_Symbol        : in Attributed_Character := Default_Character;
-++      Upper_Left_Corner_Symbol  : in Attributed_Character := Default_Character;
-++      Upper_Right_Corner_Symbol : in Attributed_Character := Default_Character;
-++      Lower_Left_Corner_Symbol  : in Attributed_Character := Default_Character;
-++      Lower_Right_Corner_Symbol : in Attributed_Character := Default_Character)
-++   is
-++      function Wborder (W   : Window;
-++                        LS  : C_Chtype;
-++                        RS  : C_Chtype;
-++                        TS  : C_Chtype;
-++                        BS  : C_Chtype;
-++                        ULC : C_Chtype;
-++                        URC : C_Chtype;
-++                        LLC : C_Chtype;
-++                        LRC : C_Chtype) return C_Int;
-++      pragma Import (C, Wborder, "wborder");
-++   begin
-++      if Wborder (Win,
-++                  AttrChar_To_Chtype (Left_Side_Symbol),
-++                  AttrChar_To_Chtype (Right_Side_Symbol),
-++                  AttrChar_To_Chtype (Top_Side_Symbol),
-++                  AttrChar_To_Chtype (Bottom_Side_Symbol),
-++                  AttrChar_To_Chtype (Upper_Left_Corner_Symbol),
-++                  AttrChar_To_Chtype (Upper_Right_Corner_Symbol),
-++                  AttrChar_To_Chtype (Lower_Left_Corner_Symbol),
-++                  AttrChar_To_Chtype (Lower_Right_Corner_Symbol)
-++                  ) = Curses_Err
-++      then
-++         raise Curses_Exception;
-++      end if;
-++   end Border;
-++
-++   procedure Box
-++     (Win               : in Window := Standard_Window;
-++      Vertical_Symbol   : in Attributed_Character := Default_Character;
-++      Horizontal_Symbol : in Attributed_Character := Default_Character)
-++   is
-++   begin
-++      Border (Win,
-++              Vertical_Symbol, Vertical_Symbol,
-++              Horizontal_Symbol, Horizontal_Symbol);
-++   end Box;
-++
-++   procedure Horizontal_Line
-++     (Win         : in Window := Standard_Window;
-++      Line_Size   : in Natural;
-++      Line_Symbol : in Attributed_Character := Default_Character)
-++   is
-++      function Whline (W   : Window;
-++                       Ch  : C_Chtype;
-++                       Len : C_Int) return C_Int;
-++      pragma Import (C, Whline, "whline");
-++   begin
-++      if Whline (Win,
-++                 AttrChar_To_Chtype (Line_Symbol),
-++                 C_Int (Line_Size)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Horizontal_Line;
-++
-++   procedure Vertical_Line
-++     (Win         : in Window := Standard_Window;
-++      Line_Size   : in Natural;
-++      Line_Symbol : in Attributed_Character := Default_Character)
-++   is
-++      function Wvline (W   : Window;
-++                       Ch  : C_Chtype;
-++                       Len : C_Int) return C_Int;
-++      pragma Import (C, Wvline, "wvline");
-++   begin
-++      if Wvline (Win,
-++                 AttrChar_To_Chtype (Line_Symbol),
-++                 C_Int (Line_Size)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Vertical_Line;
-++
-++------------------------------------------------------------------------------
-++   function Get_Keystroke (Win : Window := Standard_Window)
-++     return Real_Key_Code
-++   is
-++      function Wgetch (W : Window) return C_Int;
-++      pragma Import (C, Wgetch, "wgetch");
-++
-++      C : constant C_Int := Wgetch (Win);
-++   begin
-++      if C = Curses_Err then
-++         return Key_None;
-++      else
-++         return Real_Key_Code (C);
-++      end if;
-++   end Get_Keystroke;
-++
-++   procedure Undo_Keystroke (Key : in Real_Key_Code)
-++   is
-++      function Ungetch (Ch : C_Int) return C_Int;
-++      pragma Import (C, Ungetch, "ungetch");
-++   begin
-++      if Ungetch (C_Int (Key)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Undo_Keystroke;
-++
-++   function Has_Key (Key : Special_Key_Code) return Boolean
-++   is
-++      function Haskey (Key : C_Int) return C_Int;
-++      pragma Import (C, Haskey, "has_key");
-++   begin
-++      if Haskey (C_Int (Key)) = Curses_False then
-++         return False;
-++      else
-++         return True;
-++      end if;
-++   end Has_Key;
-++
-++   function Is_Function_Key (Key : Special_Key_Code) return Boolean
-++   is
-++      L : constant Special_Key_Code  := Special_Key_Code (Natural (Key_F0) +
-++        Natural (Function_Key_Number'Last));
-++   begin
-++      if (Key >= Key_F0) and then (Key <= L) then
-++         return True;
-++      else
-++         return False;
-++      end if;
-++   end Is_Function_Key;
-++
-++   function Function_Key (Key : Real_Key_Code)
-++                          return Function_Key_Number
-++   is
-++   begin
-++      if Is_Function_Key (Key) then
-++         return Function_Key_Number (Key - Key_F0);
-++      else
-++         raise Constraint_Error;
-++      end if;
-++   end Function_Key;
-++
-++   function Function_Key_Code (Key : Function_Key_Number) return Real_Key_Code
-++   is
-++   begin
-++      return Real_Key_Code (Natural (Key_F0) + Natural (Key));
-++   end Function_Key_Code;
-++------------------------------------------------------------------------------
-++   procedure Standout (Win : Window  := Standard_Window;
-++                       On  : Boolean := True)
-++   is
-++      function wstandout (Win : Window) return C_Int;
-++      pragma Import (C, wstandout, "wstandout");
-++      function wstandend (Win : Window) return C_Int;
-++      pragma Import (C, wstandend, "wstandend");
-++
-++      Err : C_Int;
-++   begin
-++      if On then
-++         Err := wstandout (Win);
-++      else
-++         Err := wstandend (Win);
-++      end if;
-++      if Err = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Standout;
-++
-++   procedure Switch_Character_Attribute
-++     (Win  : in Window := Standard_Window;
-++      Attr : in Character_Attribute_Set := Normal_Video;
-++      On   : in Boolean := True)
-++   is
-++      function Wattron (Win    : Window;
-++                        C_Attr : C_AttrType) return C_Int;
-++      pragma Import (C, Wattron, "wattr_on");
-++      function Wattroff (Win    : Window;
-++                         C_Attr : C_AttrType) return C_Int;
-++      pragma Import (C, Wattroff, "wattr_off");
-++      --  In Ada we use the On Boolean to control whether or not we want to
-++      --  switch on or off the attributes in the set.
-++      Err : C_Int;
-++      AC  : constant Attributed_Character := (Ch    => Character'First,
-++                                              Color => Color_Pair'First,
-++                                              Attr  => Attr);
-++   begin
-++      if On then
-++         Err := Wattron  (Win, AttrChar_To_AttrType (AC));
-++      else
-++         Err := Wattroff (Win, AttrChar_To_AttrType (AC));
-++      end if;
-++      if Err = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Switch_Character_Attribute;
-++
-++   procedure Set_Character_Attributes
-++     (Win   : in Window := Standard_Window;
-++      Attr  : in Character_Attribute_Set := Normal_Video;
-++      Color : in Color_Pair := Color_Pair'First)
-++   is
-++      function Wattrset (Win    : Window;
-++                         C_Attr : C_AttrType) return C_Int;
-++      pragma Import (C, Wattrset, "wattrset"); -- ??? wattr_set
-++   begin
-++      if Wattrset (Win,
-++                   AttrChar_To_AttrType (Attributed_Character'
-++                                         (Ch    => Character'First,
-++                                          Color => Color,
-++                                          Attr  => Attr))) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Set_Character_Attributes;
-++
-++   function Get_Character_Attribute (Win : Window := Standard_Window)
-++                                     return Character_Attribute_Set
-++   is
-++      function Wattrget (Win : Window;
-++                         Atr : access C_AttrType;
-++                         Col : access C_Short;
-++                         Opt : System.Address) return C_Int;
-++      pragma Import (C, Wattrget, "wattr_get");
-++
-++      Attr : aliased C_AttrType;
-++      Col  : aliased C_Short;
-++      Res  : constant C_Int := Wattrget (Win, Attr'Access, Col'Access,
-++                                         System.Null_Address);
-++      Ch   : Attributed_Character;
-++   begin
-++      if Res = Curses_Ok then
-++         Ch := AttrType_To_AttrChar (Attr);
-++         return Ch.Attr;
-++      else
-++         raise Curses_Exception;
-++      end if;
-++   end Get_Character_Attribute;
-++
-++   function Get_Character_Attribute (Win : Window := Standard_Window)
-++                                     return Color_Pair
-++   is
-++      function Wattrget (Win : Window;
-++                         Atr : access C_AttrType;
-++                         Col : access C_Short;
-++                         Opt : System.Address) return C_Int;
-++      pragma Import (C, Wattrget, "wattr_get");
-++
-++      Attr : aliased C_AttrType;
-++      Col  : aliased C_Short;
-++      Res  : constant C_Int := Wattrget (Win, Attr'Access, Col'Access,
-++                                         System.Null_Address);
-++      Ch   : Attributed_Character;
-++   begin
-++      if Res = Curses_Ok then
-++         Ch := AttrType_To_AttrChar (Attr);
-++         return Ch.Color;
-++      else
-++         raise Curses_Exception;
-++      end if;
-++   end Get_Character_Attribute;
-++
-++   procedure Set_Color (Win  : in Window := Standard_Window;
-++                        Pair : in Color_Pair)
-++   is
-++      function Wset_Color (Win   : Window;
-++                           Color : C_Short;
-++                           Opts  : C_Void_Ptr) return C_Int;
-++      pragma Import (C, Wset_Color, "wcolor_set");
-++   begin
-++      if Wset_Color (Win,
-++                     C_Short (Pair),
-++                     C_Void_Ptr (System.Null_Address)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Set_Color;
-++
-++   procedure Change_Attributes
-++     (Win   : in Window := Standard_Window;
-++      Count : in Integer := -1;
-++      Attr  : in Character_Attribute_Set := Normal_Video;
-++      Color : in Color_Pair := Color_Pair'First)
-++   is
-++      function Wchgat (Win   : Window;
-++                       Cnt   : C_Int;
-++                       Attr  : C_AttrType;
-++                       Color : C_Short;
-++                       Opts  : System.Address := System.Null_Address)
-++                       return C_Int;
-++      pragma Import (C, Wchgat, "wchgat");
-++
-++      Ch : constant Attributed_Character :=
-++        (Ch => Character'First, Color => Color_Pair'First, Attr => Attr);
-++   begin
-++      if Wchgat (Win, C_Int (Count), AttrChar_To_AttrType (Ch),
-++                 C_Short (Color)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Change_Attributes;
-++
-++   procedure Change_Attributes
-++     (Win    : in Window := Standard_Window;
-++      Line   : in Line_Position := Line_Position'First;
-++      Column : in Column_Position := Column_Position'First;
-++      Count  : in Integer := -1;
-++      Attr   : in Character_Attribute_Set := Normal_Video;
-++      Color  : in Color_Pair := Color_Pair'First)
-++   is
-++   begin
-++      Move_Cursor (Win, Line, Column);
-++      Change_Attributes (Win, Count, Attr, Color);
-++   end Change_Attributes;
-++------------------------------------------------------------------------------
-++   procedure Beep
-++   is
-++      function Beeper return C_Int;
-++      pragma Import (C, Beeper, "beep");
-++   begin
-++      if Beeper = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Beep;
-++
-++   procedure Flash_Screen
-++   is
-++      function Flash return C_Int;
-++      pragma Import (C, Flash, "flash");
-++   begin
-++      if Flash = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Flash_Screen;
-++------------------------------------------------------------------------------
-++   procedure Set_Cbreak_Mode (SwitchOn : in Boolean := True)
-++   is
-++      function Cbreak return C_Int;
-++      pragma Import (C, Cbreak, "cbreak");
-++      function NoCbreak return C_Int;
-++      pragma Import (C, NoCbreak, "nocbreak");
-++
-++      Err : C_Int;
-++   begin
-++      if SwitchOn then
-++         Err := Cbreak;
-++      else
-++         Err := NoCbreak;
-++      end if;
-++      if Err = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Set_Cbreak_Mode;
-++
-++   procedure Set_Raw_Mode (SwitchOn : in Boolean := True)
-++   is
-++      function Raw return C_Int;
-++      pragma Import (C, Raw, "raw");
-++      function NoRaw return C_Int;
-++      pragma Import (C, NoRaw, "noraw");
-++
-++      Err : C_Int;
-++   begin
-++      if SwitchOn then
-++         Err := Raw;
-++      else
-++         Err := NoRaw;
-++      end if;
-++      if Err = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Set_Raw_Mode;
-++
-++   procedure Set_Echo_Mode (SwitchOn : in Boolean := True)
-++   is
-++      function Echo return C_Int;
-++      pragma Import (C, Echo, "echo");
-++      function NoEcho return C_Int;
-++      pragma Import (C, NoEcho, "noecho");
-++
-++      Err : C_Int;
-++   begin
-++      if SwitchOn then
-++         Err := Echo;
-++      else
-++         Err := NoEcho;
-++      end if;
-++      if Err = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Set_Echo_Mode;
-++
-++   procedure Set_Meta_Mode (Win      : in Window := Standard_Window;
-++                            SwitchOn : in Boolean := True)
-++   is
-++      function Meta (W : Window; Mode : Curses_Bool) return C_Int;
-++      pragma Import (C, Meta, "meta");
-++   begin
-++      if Meta (Win, Curses_Bool (Boolean'Pos (SwitchOn))) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Set_Meta_Mode;
-++
-++   procedure Set_KeyPad_Mode (Win      : in Window := Standard_Window;
-++                              SwitchOn : in Boolean := True)
-++   is
-++      function Keypad (W : Window; Mode : Curses_Bool) return C_Int;
-++      pragma Import (C, Keypad, "keypad");
-++   begin
-++      if Keypad (Win, Curses_Bool (Boolean'Pos (SwitchOn))) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Set_KeyPad_Mode;
-++
-++   function Get_KeyPad_Mode (Win : in Window := Standard_Window)
-++                             return Boolean
-++   is
-++      function Is_Keypad (W : Window) return Curses_Bool;
-++      pragma Import (C, Is_Keypad, "is_keypad");
-++   begin
-++      return (Is_Keypad (Win) /= Curses_Bool_False);
-++   end Get_KeyPad_Mode;
-++
-++   procedure Half_Delay (Amount : in Half_Delay_Amount)
-++   is
-++      function Halfdelay (Amount : C_Int) return C_Int;
-++      pragma Import (C, Halfdelay, "halfdelay");
-++   begin
-++      if Halfdelay (C_Int (Amount)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Half_Delay;
-++
-++   procedure Set_Flush_On_Interrupt_Mode
-++     (Win  : in Window := Standard_Window;
-++      Mode : in Boolean := True)
-++   is
-++      function Intrflush (Win : Window; Mode : Curses_Bool) return C_Int;
-++      pragma Import (C, Intrflush, "intrflush");
-++   begin
-++      if Intrflush (Win, Curses_Bool (Boolean'Pos (Mode))) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Set_Flush_On_Interrupt_Mode;
-++
-++   procedure Set_Queue_Interrupt_Mode
-++     (Win   : in Window := Standard_Window;
-++      Flush : in Boolean := True)
-++   is
-++      procedure Qiflush;
-++      pragma Import (C, Qiflush, "qiflush");
-++      procedure No_Qiflush;
-++      pragma Import (C, No_Qiflush, "noqiflush");
-++   begin
-++      if Win = Null_Window then
-++         raise Curses_Exception;
-++      end if;
-++      if Flush then
-++         Qiflush;
-++      else
-++         No_Qiflush;
-++      end if;
-++   end Set_Queue_Interrupt_Mode;
-++
-++   procedure Set_NoDelay_Mode
-++     (Win  : in Window := Standard_Window;
-++      Mode : in Boolean := False)
-++   is
-++      function Nodelay (Win : Window; Mode : Curses_Bool) return C_Int;
-++      pragma Import (C, Nodelay, "nodelay");
-++   begin
-++      if Nodelay (Win, Curses_Bool (Boolean'Pos (Mode))) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Set_NoDelay_Mode;
-++
-++   procedure Set_Timeout_Mode (Win    : in Window := Standard_Window;
-++                               Mode   : in Timeout_Mode;
-++                               Amount : in Natural)
-++   is
-++      procedure Wtimeout (Win : Window; Amount : C_Int);
-++      pragma Import (C, Wtimeout, "wtimeout");
-++
-++      Time : C_Int;
-++   begin
-++      case Mode is
-++         when Blocking     => Time := -1;
-++         when Non_Blocking => Time := 0;
-++         when Delayed      =>
-++            if Amount = 0 then
-++               raise Constraint_Error;
-++            end if;
-++            Time := C_Int (Amount);
-++      end case;
-++      Wtimeout (Win, Time);
-++   end Set_Timeout_Mode;
-++
-++   procedure Set_Escape_Timer_Mode
-++     (Win       : in Window := Standard_Window;
-++      Timer_Off : in Boolean := False)
-++   is
-++      function Notimeout (Win : Window; Mode : Curses_Bool) return C_Int;
-++      pragma Import (C, Notimeout, "notimeout");
-++   begin
-++      if Notimeout (Win, Curses_Bool (Boolean'Pos (Timer_Off)))
-++        = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Set_Escape_Timer_Mode;
-++
-++------------------------------------------------------------------------------
-++   procedure Set_NL_Mode (SwitchOn : in Boolean := True)
-++   is
-++      function NL return C_Int;
-++      pragma Import (C, NL, "nl");
-++      function NoNL return C_Int;
-++      pragma Import (C, NoNL, "nonl");
-++
-++      Err : C_Int;
-++   begin
-++      if SwitchOn then
-++         Err := NL;
-++      else
-++         Err := NoNL;
-++      end if;
-++      if Err = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Set_NL_Mode;
-++
-++   procedure Clear_On_Next_Update
-++     (Win      : in Window := Standard_Window;
-++      Do_Clear : in Boolean := True)
-++   is
-++      function Clear_Ok (W : Window; Flag : Curses_Bool) return C_Int;
-++      pragma Import (C, Clear_Ok, "clearok");
-++   begin
-++      if Clear_Ok (Win, Curses_Bool (Boolean'Pos (Do_Clear))) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Clear_On_Next_Update;
-++
-++   procedure Use_Insert_Delete_Line
-++     (Win    : in Window := Standard_Window;
-++      Do_Idl : in Boolean := True)
-++   is
-++      function IDL_Ok (W : Window; Flag : Curses_Bool) return C_Int;
-++      pragma Import (C, IDL_Ok, "idlok");
-++   begin
-++      if IDL_Ok (Win, Curses_Bool (Boolean'Pos (Do_Idl))) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Use_Insert_Delete_Line;
-++
-++   procedure Use_Insert_Delete_Character
-++     (Win    : in Window := Standard_Window;
-++      Do_Idc : in Boolean := True)
-++   is
-++      procedure IDC_Ok (W : Window; Flag : Curses_Bool);
-++      pragma Import (C, IDC_Ok, "idcok");
-++   begin
-++      IDC_Ok (Win, Curses_Bool (Boolean'Pos (Do_Idc)));
-++   end Use_Insert_Delete_Character;
-++
-++   procedure Leave_Cursor_After_Update
-++     (Win      : in Window := Standard_Window;
-++      Do_Leave : in Boolean := True)
-++   is
-++      function Leave_Ok (W : Window; Flag : Curses_Bool) return C_Int;
-++      pragma Import (C, Leave_Ok, "leaveok");
-++   begin
-++      if Leave_Ok (Win, Curses_Bool (Boolean'Pos (Do_Leave))) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Leave_Cursor_After_Update;
-++
-++   procedure Immediate_Update_Mode
-++     (Win  : in Window := Standard_Window;
-++      Mode : in Boolean := False)
-++   is
-++      procedure Immedok (Win : Window; Mode : Curses_Bool);
-++      pragma Import (C, Immedok, "immedok");
-++   begin
-++      Immedok (Win, Curses_Bool (Boolean'Pos (Mode)));
-++   end Immediate_Update_Mode;
-++
-++   procedure Allow_Scrolling
-++     (Win  : in Window  := Standard_Window;
-++      Mode : in Boolean := False)
-++   is
-++      function Scrollok (Win : Window; Mode : Curses_Bool) return C_Int;
-++      pragma Import (C, Scrollok, "scrollok");
-++   begin
-++      if Scrollok (Win, Curses_Bool (Boolean'Pos (Mode))) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Allow_Scrolling;
-++
-++   function Scrolling_Allowed (Win : Window := Standard_Window)
-++                               return Boolean
-++   is
-++      function Is_Scroll_Ok (W : Window) return Curses_Bool;
-++      pragma Import (C, Is_Scroll_Ok, "is_scrollok");
-++   begin
-++      return (Is_Scroll_Ok (Win) /= Curses_Bool_False);
-++   end Scrolling_Allowed;
-++
-++   procedure Set_Scroll_Region
-++     (Win         : in Window := Standard_Window;
-++      Top_Line    : in Line_Position;
-++      Bottom_Line : in Line_Position)
-++   is
-++      function Wsetscrreg (Win : Window;
-++                           Lin : C_Int;
-++                           Col : C_Int) return C_Int;
-++      pragma Import (C, Wsetscrreg, "wsetscrreg");
-++   begin
-++      if Wsetscrreg (Win, C_Int (Top_Line), C_Int (Bottom_Line))
-++        = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Set_Scroll_Region;
-++------------------------------------------------------------------------------
-++   procedure Update_Screen
-++   is
-++      function Do_Update return C_Int;
-++      pragma Import (C, Do_Update, "doupdate");
-++   begin
-++      if Do_Update = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Update_Screen;
-++
-++   procedure Refresh (Win : in Window := Standard_Window)
-++   is
-++      function Wrefresh (W : Window) return C_Int;
-++      pragma Import (C, Wrefresh, "wrefresh");
-++   begin
-++      if Wrefresh (Win) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Refresh;
-++
-++   procedure Refresh_Without_Update
-++     (Win : in Window := Standard_Window)
-++   is
-++      function Wnoutrefresh (W : Window) return C_Int;
-++      pragma Import (C, Wnoutrefresh, "wnoutrefresh");
-++   begin
-++      if Wnoutrefresh (Win) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Refresh_Without_Update;
-++
-++   procedure Redraw (Win : in Window := Standard_Window)
-++   is
-++      function Redrawwin (Win : Window) return C_Int;
-++      pragma Import (C, Redrawwin, "redrawwin");
-++   begin
-++      if Redrawwin (Win) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Redraw;
-++
-++   procedure Redraw
-++     (Win        : in Window := Standard_Window;
-++      Begin_Line : in Line_Position;
-++      Line_Count : in Positive)
-++   is
-++      function Wredrawln (Win : Window; First : C_Int; Cnt : C_Int)
-++                          return C_Int;
-++      pragma Import (C, Wredrawln, "wredrawln");
-++   begin
-++      if Wredrawln (Win,
-++                    C_Int (Begin_Line),
-++                    C_Int (Line_Count)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Redraw;
-++
-++------------------------------------------------------------------------------
-++   procedure Erase (Win : in Window := Standard_Window)
-++   is
-++      function Werase (W : Window) return C_Int;
-++      pragma Import (C, Werase, "werase");
-++   begin
-++      if Werase (Win) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Erase;
-++
-++   procedure Clear (Win : in Window := Standard_Window)
-++   is
-++      function Wclear (W : Window) return C_Int;
-++      pragma Import (C, Wclear, "wclear");
-++   begin
-++      if Wclear (Win) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Clear;
-++
-++   procedure Clear_To_End_Of_Screen (Win : in Window := Standard_Window)
-++   is
-++      function Wclearbot (W : Window) return C_Int;
-++      pragma Import (C, Wclearbot, "wclrtobot");
-++   begin
-++      if Wclearbot (Win) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Clear_To_End_Of_Screen;
-++
-++   procedure Clear_To_End_Of_Line (Win : in Window := Standard_Window)
-++   is
-++      function Wcleareol (W : Window) return C_Int;
-++      pragma Import (C, Wcleareol, "wclrtoeol");
-++   begin
-++      if Wcleareol (Win) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Clear_To_End_Of_Line;
-++------------------------------------------------------------------------------
-++   procedure Set_Background
-++     (Win : in Window := Standard_Window;
-++      Ch  : in Attributed_Character)
-++   is
-++      procedure WBackground (W : in Window; Ch : in C_Chtype);
-++      pragma Import (C, WBackground, "wbkgdset");
-++   begin
-++      WBackground (Win, AttrChar_To_Chtype (Ch));
-++   end Set_Background;
-++
-++   procedure Change_Background
-++     (Win : in Window := Standard_Window;
-++      Ch  : in Attributed_Character)
-++   is
-++      function WChangeBkgd (W : Window; Ch : C_Chtype) return C_Int;
-++      pragma Import (C, WChangeBkgd, "wbkgd");
-++   begin
-++      if WChangeBkgd (Win, AttrChar_To_Chtype (Ch)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Change_Background;
-++
-++   function Get_Background (Win : Window := Standard_Window)
-++     return Attributed_Character
-++   is
-++      function Wgetbkgd (Win : Window) return C_Chtype;
-++      pragma Import (C, Wgetbkgd, "getbkgd");
-++   begin
-++      return Chtype_To_AttrChar (Wgetbkgd (Win));
-++   end Get_Background;
-++------------------------------------------------------------------------------
-++   procedure Change_Lines_Status (Win   : in Window := Standard_Window;
-++                                  Start : in Line_Position;
-++                                  Count : in Positive;
-++                                  State : in Boolean)
-++   is
-++      function Wtouchln (Win : Window;
-++                         Sta : C_Int;
-++                         Cnt : C_Int;
-++                         Chg : C_Int) return C_Int;
-++      pragma Import (C, Wtouchln, "wtouchln");
-++   begin
-++      if Wtouchln (Win, C_Int (Start), C_Int (Count),
-++                   C_Int (Boolean'Pos (State))) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Change_Lines_Status;
-++
-++   procedure Touch (Win : in Window := Standard_Window)
-++   is
-++      Y : Line_Position;
-++      X : Column_Position;
-++   begin
-++      Get_Size (Win, Y, X);
-++      Change_Lines_Status (Win, 0, Positive (Y), True);
-++   end Touch;
-++
-++   procedure Untouch (Win : in Window := Standard_Window)
-++   is
-++      Y : Line_Position;
-++      X : Column_Position;
-++   begin
-++      Get_Size (Win, Y, X);
-++      Change_Lines_Status (Win, 0, Positive (Y), False);
-++   end Untouch;
-++
-++   procedure Touch (Win   : in Window := Standard_Window;
-++                    Start : in Line_Position;
-++                    Count : in Positive)
-++   is
-++   begin
-++      Change_Lines_Status (Win, Start, Count, True);
-++   end Touch;
-++
-++   function Is_Touched
-++     (Win  : Window := Standard_Window;
-++      Line : Line_Position) return Boolean
-++   is
-++      function WLineTouched (W : Window; L : C_Int) return Curses_Bool;
-++      pragma Import (C, WLineTouched, "is_linetouched");
-++   begin
-++      if WLineTouched (Win, C_Int (Line)) = Curses_Bool_False then
-++         return False;
-++      else
-++         return True;
-++      end if;
-++   end Is_Touched;
-++
-++   function Is_Touched
-++     (Win : Window := Standard_Window) return Boolean
-++   is
-++      function WWinTouched (W : Window) return Curses_Bool;
-++      pragma Import (C, WWinTouched, "is_wintouched");
-++   begin
-++      if WWinTouched (Win) = Curses_Bool_False then
-++         return False;
-++      else
-++         return True;
-++      end if;
-++   end Is_Touched;
-++------------------------------------------------------------------------------
-++   procedure Copy
-++     (Source_Window            : in Window;
-++      Destination_Window       : in Window;
-++      Source_Top_Row           : in Line_Position;
-++      Source_Left_Column       : in Column_Position;
-++      Destination_Top_Row      : in Line_Position;
-++      Destination_Left_Column  : in Column_Position;
-++      Destination_Bottom_Row   : in Line_Position;
-++      Destination_Right_Column : in Column_Position;
-++      Non_Destructive_Mode     : in Boolean := True)
-++   is
-++      function Copywin (Src : Window;
-++                        Dst : Window;
-++                        Str : C_Int;
-++                        Slc : C_Int;
-++                        Dtr : C_Int;
-++                        Dlc : C_Int;
-++                        Dbr : C_Int;
-++                        Drc : C_Int;
-++                        Ndm : C_Int) return C_Int;
-++      pragma Import (C, Copywin, "copywin");
-++   begin
-++      if Copywin (Source_Window,
-++                  Destination_Window,
-++                  C_Int (Source_Top_Row),
-++                  C_Int (Source_Left_Column),
-++                  C_Int (Destination_Top_Row),
-++                  C_Int (Destination_Left_Column),
-++                  C_Int (Destination_Bottom_Row),
-++                  C_Int (Destination_Right_Column),
-++                  Boolean'Pos (Non_Destructive_Mode)
-++                ) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Copy;
-++
-++   procedure Overwrite
-++     (Source_Window      : in Window;
-++      Destination_Window : in Window)
-++   is
-++      function Overwrite (Src : Window; Dst : Window) return C_Int;
-++      pragma Import (C, Overwrite, "overwrite");
-++   begin
-++      if Overwrite (Source_Window, Destination_Window) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Overwrite;
-++
-++   procedure Overlay
-++     (Source_Window      : in Window;
-++      Destination_Window : in Window)
-++   is
-++      function Overlay (Src : Window; Dst : Window) return C_Int;
-++      pragma Import (C, Overlay, "overlay");
-++   begin
-++      if Overlay (Source_Window, Destination_Window) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Overlay;
-++
-++------------------------------------------------------------------------------
-++   procedure Insert_Delete_Lines
-++     (Win   : in Window := Standard_Window;
-++      Lines : in Integer       := 1) -- default is to insert one line above
-++   is
-++      function Winsdelln (W : Window; N : C_Int) return C_Int;
-++      pragma Import (C, Winsdelln, "winsdelln");
-++   begin
-++      if Winsdelln (Win, C_Int (Lines)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Insert_Delete_Lines;
-++
-++   procedure Delete_Line (Win : in Window := Standard_Window)
-++   is
-++   begin
-++      Insert_Delete_Lines (Win, -1);
-++   end Delete_Line;
-++
-++   procedure Insert_Line (Win : in Window := Standard_Window)
-++   is
-++   begin
-++      Insert_Delete_Lines (Win, 1);
-++   end Insert_Line;
-++------------------------------------------------------------------------------
-++
-++   procedure Get_Size
-++     (Win               : in Window := Standard_Window;
-++      Number_Of_Lines   : out Line_Count;
-++      Number_Of_Columns : out Column_Count)
-++   is
-++      function GetMaxY (W : Window) return C_Int;
-++      pragma Import (C, GetMaxY, "getmaxy");
-++
-++      function GetMaxX (W : Window) return C_Int;
-++      pragma Import (C, GetMaxX, "getmaxx");
-++
-++      Y : constant C_Int := GetMaxY (Win)
-++                          + C_Int (Offset_XY);
-++      X : constant C_Int := GetMaxX (Win)
-++                          + C_Int (Offset_XY);
-++   begin
-++      Number_Of_Lines   := Line_Count (Y);
-++      Number_Of_Columns := Column_Count (X);
-++   end Get_Size;
-++
-++   procedure Get_Window_Position
-++     (Win             : in Window := Standard_Window;
-++      Top_Left_Line   : out Line_Position;
-++      Top_Left_Column : out Column_Position)
-++   is
-++      function GetBegY (W : Window) return C_Int;
-++      pragma Import (C, GetBegY, "getbegy");
-++
-++      function GetBegX (W : Window) return C_Int;
-++      pragma Import (C, GetBegX, "getbegx");
-++
-++      Y : constant C_Short := C_Short (GetBegY (Win));
-++      X : constant C_Short := C_Short (GetBegX (Win));
-++   begin
-++      Top_Left_Line   := Line_Position (Y);
-++      Top_Left_Column := Column_Position (X);
-++   end Get_Window_Position;
-++
-++   procedure Get_Cursor_Position
-++     (Win    : in  Window := Standard_Window;
-++      Line   : out Line_Position;
-++      Column : out Column_Position)
-++   is
-++      function GetCurY (W : Window) return C_Int;
-++      pragma Import (C, GetCurY, "getcury");
-++
-++      function GetCurX (W : Window) return C_Int;
-++      pragma Import (C, GetCurX, "getcurx");
-++
-++      Y : constant C_Short := C_Short (GetCurY (Win));
-++      X : constant C_Short := C_Short (GetCurX (Win));
-++   begin
-++      Line   := Line_Position (Y);
-++      Column := Column_Position (X);
-++   end Get_Cursor_Position;
-++
-++   procedure Get_Origin_Relative_To_Parent
-++     (Win                : in  Window;
-++      Top_Left_Line      : out Line_Position;
-++      Top_Left_Column    : out Column_Position;
-++      Is_Not_A_Subwindow : out Boolean)
-++   is
-++      function GetParY (W : Window) return C_Int;
-++      pragma Import (C, GetParY, "getpary");
-++
-++      function GetParX (W : Window) return C_Int;
-++      pragma Import (C, GetParX, "getparx");
-++
-++      Y : constant C_Int := GetParY (Win);
-++      X : constant C_Int := GetParX (Win);
-++   begin
-++      if Y = -1 then
-++         Top_Left_Line   := Line_Position'Last;
-++         Top_Left_Column := Column_Position'Last;
-++         Is_Not_A_Subwindow := True;
-++      else
-++         Top_Left_Line   := Line_Position (Y);
-++         Top_Left_Column := Column_Position (X);
-++         Is_Not_A_Subwindow := False;
-++      end if;
-++   end Get_Origin_Relative_To_Parent;
-++------------------------------------------------------------------------------
-++   function New_Pad (Lines   : Line_Count;
-++                     Columns : Column_Count) return Window
-++   is
-++      function Newpad (Lines : C_Int; Columns : C_Int) return Window;
-++      pragma Import (C, Newpad, "newpad");
-++
-++      W : Window;
-++   begin
-++      W := Newpad (C_Int (Lines), C_Int (Columns));
-++      if W = Null_Window then
-++         raise Curses_Exception;
-++      end if;
-++      return W;
-++   end New_Pad;
-++
-++   function Sub_Pad
-++     (Pad                   : Window;
-++      Number_Of_Lines       : Line_Count;
-++      Number_Of_Columns     : Column_Count;
-++      First_Line_Position   : Line_Position;
-++      First_Column_Position : Column_Position) return Window
-++   is
-++      function Subpad
-++        (Pad                   : Window;
-++         Number_Of_Lines       : C_Int;
-++         Number_Of_Columns     : C_Int;
-++         First_Line_Position   : C_Int;
-++         First_Column_Position : C_Int) return Window;
-++      pragma Import (C, Subpad, "subpad");
-++
-++      W : Window;
-++   begin
-++      W := Subpad (Pad,
-++                   C_Int (Number_Of_Lines),
-++                   C_Int (Number_Of_Columns),
-++                   C_Int (First_Line_Position),
-++                   C_Int (First_Column_Position));
-++      if W = Null_Window then
-++         raise Curses_Exception;
-++      end if;
-++      return W;
-++   end Sub_Pad;
-++
-++   procedure Refresh
-++     (Pad                      : in Window;
-++      Source_Top_Row           : in Line_Position;
-++      Source_Left_Column       : in Column_Position;
-++      Destination_Top_Row      : in Line_Position;
-++      Destination_Left_Column  : in Column_Position;
-++      Destination_Bottom_Row   : in Line_Position;
-++      Destination_Right_Column : in Column_Position)
-++   is
-++      function Prefresh
-++        (Pad                      : Window;
-++         Source_Top_Row           : C_Int;
-++         Source_Left_Column       : C_Int;
-++         Destination_Top_Row      : C_Int;
-++         Destination_Left_Column  : C_Int;
-++         Destination_Bottom_Row   : C_Int;
-++         Destination_Right_Column : C_Int) return C_Int;
-++      pragma Import (C, Prefresh, "prefresh");
-++   begin
-++      if Prefresh (Pad,
-++                   C_Int (Source_Top_Row),
-++                   C_Int (Source_Left_Column),
-++                   C_Int (Destination_Top_Row),
-++                   C_Int (Destination_Left_Column),
-++                   C_Int (Destination_Bottom_Row),
-++                   C_Int (Destination_Right_Column)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Refresh;
-++
-++   procedure Refresh_Without_Update
-++     (Pad                      : in Window;
-++      Source_Top_Row           : in Line_Position;
-++      Source_Left_Column       : in Column_Position;
-++      Destination_Top_Row      : in Line_Position;
-++      Destination_Left_Column  : in Column_Position;
-++      Destination_Bottom_Row   : in Line_Position;
-++      Destination_Right_Column : in Column_Position)
-++   is
-++      function Pnoutrefresh
-++        (Pad                      : Window;
-++         Source_Top_Row           : C_Int;
-++         Source_Left_Column       : C_Int;
-++         Destination_Top_Row      : C_Int;
-++         Destination_Left_Column  : C_Int;
-++         Destination_Bottom_Row   : C_Int;
-++         Destination_Right_Column : C_Int) return C_Int;
-++      pragma Import (C, Pnoutrefresh, "pnoutrefresh");
-++   begin
-++      if Pnoutrefresh (Pad,
-++                       C_Int (Source_Top_Row),
-++                       C_Int (Source_Left_Column),
-++                       C_Int (Destination_Top_Row),
-++                       C_Int (Destination_Left_Column),
-++                       C_Int (Destination_Bottom_Row),
-++                       C_Int (Destination_Right_Column)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Refresh_Without_Update;
-++
-++   procedure Add_Character_To_Pad_And_Echo_It
-++     (Pad : in Window;
-++      Ch  : in Attributed_Character)
-++   is
-++      function Pechochar (Pad : Window; Ch : C_Chtype)
-++                          return C_Int;
-++      pragma Import (C, Pechochar, "pechochar");
-++   begin
-++      if Pechochar (Pad, AttrChar_To_Chtype (Ch)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Add_Character_To_Pad_And_Echo_It;
-++
-++   procedure Add_Character_To_Pad_And_Echo_It
-++     (Pad : in Window;
-++      Ch  : in Character)
-++   is
-++   begin
-++      Add_Character_To_Pad_And_Echo_It
-++        (Pad,
-++         Attributed_Character'(Ch    => Ch,
-++                               Color => Color_Pair'First,
-++                               Attr  => Normal_Video));
-++   end Add_Character_To_Pad_And_Echo_It;
-++------------------------------------------------------------------------------
-++   procedure Scroll (Win    : in Window := Standard_Window;
-++                     Amount : in Integer := 1)
-++   is
-++      function Wscrl (Win : Window; N : C_Int) return C_Int;
-++      pragma Import (C, Wscrl, "wscrl");
-++
-++   begin
-++      if Wscrl (Win, C_Int (Amount)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Scroll;
-++
-++------------------------------------------------------------------------------
-++   procedure Delete_Character (Win : in Window := Standard_Window)
-++   is
-++      function Wdelch (Win : Window) return C_Int;
-++      pragma Import (C, Wdelch, "wdelch");
-++   begin
-++      if Wdelch (Win) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Delete_Character;
-++
-++   procedure Delete_Character
-++     (Win    : in Window := Standard_Window;
-++      Line   : in Line_Position;
-++      Column : in Column_Position)
-++   is
-++      function Mvwdelch (Win : Window;
-++                         Lin : C_Int;
-++                         Col : C_Int) return C_Int;
-++      pragma Import (C, Mvwdelch, "mvwdelch");
-++   begin
-++      if Mvwdelch (Win, C_Int (Line), C_Int (Column)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Delete_Character;
-++------------------------------------------------------------------------------
-++   function Peek (Win : Window := Standard_Window)
-++     return Attributed_Character
-++   is
-++      function Winch (Win : Window) return C_Chtype;
-++      pragma Import (C, Winch, "winch");
-++   begin
-++      return Chtype_To_AttrChar (Winch (Win));
-++   end Peek;
-++
-++   function Peek
-++     (Win    : Window := Standard_Window;
-++      Line   : Line_Position;
-++      Column : Column_Position) return Attributed_Character
-++   is
-++      function Mvwinch (Win : Window;
-++                        Lin : C_Int;
-++                        Col : C_Int) return C_Chtype;
-++      pragma Import (C, Mvwinch, "mvwinch");
-++   begin
-++      return Chtype_To_AttrChar (Mvwinch (Win, C_Int (Line), C_Int (Column)));
-++   end Peek;
-++------------------------------------------------------------------------------
-++   procedure Insert (Win : in Window := Standard_Window;
-++                     Ch  : in Attributed_Character)
-++   is
-++      function Winsch (Win : Window; Ch : C_Chtype) return C_Int;
-++      pragma Import (C, Winsch, "winsch");
-++   begin
-++      if Winsch (Win, AttrChar_To_Chtype (Ch)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Insert;
-++
-++   procedure Insert
-++     (Win    : in Window := Standard_Window;
-++      Line   : in Line_Position;
-++      Column : in Column_Position;
-++      Ch     : in Attributed_Character)
-++   is
-++      function Mvwinsch (Win : Window;
-++                         Lin : C_Int;
-++                         Col : C_Int;
-++                         Ch  : C_Chtype) return C_Int;
-++      pragma Import (C, Mvwinsch, "mvwinsch");
-++   begin
-++      if Mvwinsch (Win,
-++                   C_Int (Line),
-++                   C_Int (Column),
-++                   AttrChar_To_Chtype (Ch)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Insert;
-++------------------------------------------------------------------------------
-++   procedure Insert (Win : in Window := Standard_Window;
-++                     Str : in String;
-++                     Len : in Integer := -1)
-++   is
-++      function Winsnstr (Win : Window;
-++                         Str : char_array;
-++                         Len : Integer := -1) return C_Int;
-++      pragma Import (C, Winsnstr, "winsnstr");
-++
-++      Txt    : char_array (0 .. Str'Length);
-++      Length : size_t;
-++   begin
-++      To_C (Str, Txt, Length);
-++      if Winsnstr (Win, Txt, Len) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Insert;
-++
-++   procedure Insert
-++     (Win    : in Window := Standard_Window;
-++      Line   : in Line_Position;
-++      Column : in Column_Position;
-++      Str    : in String;
-++      Len    : in Integer := -1)
-++   is
-++      function Mvwinsnstr (Win    : Window;
-++                           Line   : C_Int;
-++                           Column : C_Int;
-++                           Str    : char_array;
-++                           Len    : C_Int) return C_Int;
-++      pragma Import (C, Mvwinsnstr, "mvwinsnstr");
-++
-++      Txt    : char_array (0 .. Str'Length);
-++      Length : size_t;
-++   begin
-++      To_C (Str, Txt, Length);
-++      if Mvwinsnstr (Win, C_Int (Line), C_Int (Column), Txt, C_Int (Len))
-++        = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Insert;
-++------------------------------------------------------------------------------
-++   procedure Peek (Win : in  Window := Standard_Window;
-++                   Str : out String;
-++                   Len : in  Integer := -1)
-++   is
-++      function Winnstr (Win : Window;
-++                        Str : char_array;
-++                        Len : C_Int) return C_Int;
-++      pragma Import (C, Winnstr, "winnstr");
-++
-++      N   : Integer := Len;
-++      Txt : char_array (0 .. Str'Length);
-++      Cnt : Natural;
-++   begin
-++      if N < 0 then
-++         N := Str'Length;
-++      end if;
-++      if N > Str'Length then
-++         raise Constraint_Error;
-++      end if;
-++      Txt (0) := Interfaces.C.char'First;
-++      if Winnstr (Win, Txt, C_Int (N)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++      To_Ada (Txt, Str, Cnt, True);
-++      if Cnt < Str'Length then
-++         Str ((Str'First + Cnt) .. Str'Last) := (others => ' ');
-++      end if;
-++   end Peek;
-++
-++   procedure Peek
-++     (Win    : in  Window := Standard_Window;
-++      Line   : in  Line_Position;
-++      Column : in  Column_Position;
-++      Str    : out String;
-++      Len    : in  Integer := -1)
-++   is
-++   begin
-++      Move_Cursor (Win, Line, Column);
-++      Peek (Win, Str, Len);
-++   end Peek;
-++------------------------------------------------------------------------------
-++   procedure Peek
-++     (Win : in  Window := Standard_Window;
-++      Str : out Attributed_String;
-++      Len : in  Integer := -1)
-++   is
-++      function Winchnstr (Win : Window;
-++                          Str : chtype_array;             -- out
-++                          Len : C_Int) return C_Int;
-++      pragma Import (C, Winchnstr, "winchnstr");
-++
-++      N   : Integer := Len;
-++      Txt : constant chtype_array (0 .. Str'Length)
-++          := (0 => Default_Character);
-++      Cnt : Natural := 0;
-++   begin
-++      if N < 0 then
-++         N := Str'Length;
-++      end if;
-++      if N > Str'Length then
-++         raise Constraint_Error;
-++      end if;
-++      if Winchnstr (Win, Txt, C_Int (N)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++      for To in Str'Range loop
-++         exit when Txt (size_t (Cnt)) = Default_Character;
-++         Str (To) := Txt (size_t (Cnt));
-++         Cnt := Cnt + 1;
-++      end loop;
-++      if Cnt < Str'Length then
-++         Str ((Str'First + Cnt) .. Str'Last) :=
-++           (others => (Ch => ' ',
-++                       Color => Color_Pair'First,
-++                       Attr => Normal_Video));
-++      end if;
-++   end Peek;
-++
-++   procedure Peek
-++     (Win    : in  Window := Standard_Window;
-++      Line   : in  Line_Position;
-++      Column : in  Column_Position;
-++      Str    : out Attributed_String;
-++      Len    : in Integer := -1)
-++   is
-++   begin
-++      Move_Cursor (Win, Line, Column);
-++      Peek (Win, Str, Len);
-++   end Peek;
-++------------------------------------------------------------------------------
-++   procedure Get (Win : in  Window := Standard_Window;
-++                  Str : out String;
-++                  Len : in  Integer := -1)
-++   is
-++      function Wgetnstr (Win : Window;
-++                         Str : char_array;
-++                         Len : C_Int) return C_Int;
-++      pragma Import (C, Wgetnstr, "wgetnstr");
-++
-++      N   : Integer := Len;
-++      Txt : char_array (0 .. Str'Length);
-++      Cnt : Natural;
-++   begin
-++      if N < 0 then
-++         N := Str'Length;
-++      end if;
-++      if N > Str'Length then
-++         raise Constraint_Error;
-++      end if;
-++      Txt (0) := Interfaces.C.char'First;
-++      if Wgetnstr (Win, Txt, C_Int (N)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++      To_Ada (Txt, Str, Cnt, True);
-++      if Cnt < Str'Length then
-++         Str ((Str'First + Cnt) .. Str'Last) := (others => ' ');
-++      end if;
-++   end Get;
-++
-++   procedure Get
-++     (Win    : in  Window := Standard_Window;
-++      Line   : in  Line_Position;
-++      Column : in  Column_Position;
-++      Str    : out String;
-++      Len    : in  Integer := -1)
-++   is
-++   begin
-++      Move_Cursor (Win, Line, Column);
-++      Get (Win, Str, Len);
-++   end Get;
-++------------------------------------------------------------------------------
-++   procedure Init_Soft_Label_Keys
-++     (Format : in Soft_Label_Key_Format := Three_Two_Three)
-++   is
-++      function Slk_Init (Fmt : C_Int) return C_Int;
-++      pragma Import (C, Slk_Init, "slk_init");
-++   begin
-++      if Slk_Init (Soft_Label_Key_Format'Pos (Format)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Init_Soft_Label_Keys;
-++
-++   procedure Set_Soft_Label_Key (Label : in Label_Number;
-++                                 Text  : in String;
-++                                 Fmt   : in Label_Justification := Left)
-++   is
-++      function Slk_Set (Label : C_Int;
-++                        Txt   : char_array;
-++                        Fmt   : C_Int) return C_Int;
-++      pragma Import (C, Slk_Set, "slk_set");
-++
-++      Txt : char_array (0 .. Text'Length);
-++      Len : size_t;
-++   begin
-++      To_C (Text, Txt, Len);
-++      if Slk_Set (C_Int (Label), Txt,
-++                  C_Int (Label_Justification'Pos (Fmt))) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Set_Soft_Label_Key;
-++
-++   procedure Refresh_Soft_Label_Keys
-++   is
-++      function Slk_Refresh return C_Int;
-++      pragma Import (C, Slk_Refresh, "slk_refresh");
-++   begin
-++      if Slk_Refresh = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Refresh_Soft_Label_Keys;
-++
-++   procedure Refresh_Soft_Label_Keys_Without_Update
-++   is
-++      function Slk_Noutrefresh return C_Int;
-++      pragma Import (C, Slk_Noutrefresh, "slk_noutrefresh");
-++   begin
-++      if Slk_Noutrefresh = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Refresh_Soft_Label_Keys_Without_Update;
-++
-++   procedure Get_Soft_Label_Key (Label : in Label_Number;
-++                                 Text  : out String)
-++   is
-++      function Slk_Label (Label : C_Int) return chars_ptr;
-++      pragma Import (C, Slk_Label, "slk_label");
-++   begin
-++      Fill_String (Slk_Label (C_Int (Label)), Text);
-++   end Get_Soft_Label_Key;
-++
-++   function Get_Soft_Label_Key (Label : in Label_Number) return String
-++   is
-++      function Slk_Label (Label : C_Int) return chars_ptr;
-++      pragma Import (C, Slk_Label, "slk_label");
-++   begin
-++      return Fill_String (Slk_Label (C_Int (Label)));
-++   end Get_Soft_Label_Key;
-++
-++   procedure Clear_Soft_Label_Keys
-++   is
-++      function Slk_Clear return C_Int;
-++      pragma Import (C, Slk_Clear, "slk_clear");
-++   begin
-++      if Slk_Clear = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Clear_Soft_Label_Keys;
-++
-++   procedure Restore_Soft_Label_Keys
-++   is
-++      function Slk_Restore return C_Int;
-++      pragma Import (C, Slk_Restore, "slk_restore");
-++   begin
-++      if Slk_Restore = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Restore_Soft_Label_Keys;
-++
-++   procedure Touch_Soft_Label_Keys
-++   is
-++      function Slk_Touch return C_Int;
-++      pragma Import (C, Slk_Touch, "slk_touch");
-++   begin
-++      if Slk_Touch = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Touch_Soft_Label_Keys;
-++
-++   procedure Switch_Soft_Label_Key_Attributes
-++     (Attr : in Character_Attribute_Set;
-++      On   : in Boolean := True)
-++   is
-++      function Slk_Attron (Ch : C_Chtype) return C_Int;
-++      pragma Import (C, Slk_Attron, "slk_attron");
-++      function Slk_Attroff (Ch : C_Chtype) return C_Int;
-++      pragma Import (C, Slk_Attroff, "slk_attroff");
-++
-++      Err : C_Int;
-++      Ch  : constant Attributed_Character := (Ch    => Character'First,
-++                                              Attr  => Attr,
-++                                              Color => Color_Pair'First);
-++   begin
-++      if On then
-++         Err := Slk_Attron  (AttrChar_To_Chtype (Ch));
-++      else
-++         Err := Slk_Attroff (AttrChar_To_Chtype (Ch));
-++      end if;
-++      if Err = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Switch_Soft_Label_Key_Attributes;
-++
-++   procedure Set_Soft_Label_Key_Attributes
-++     (Attr  : in Character_Attribute_Set := Normal_Video;
-++      Color : in Color_Pair := Color_Pair'First)
-++   is
-++      function Slk_Attrset (Ch : C_Chtype) return C_Int;
-++      pragma Import (C, Slk_Attrset, "slk_attrset");
-++
-++      Ch : constant Attributed_Character := (Ch    => Character'First,
-++                                             Attr  => Attr,
-++                                             Color => Color);
-++   begin
-++      if Slk_Attrset (AttrChar_To_Chtype (Ch)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Set_Soft_Label_Key_Attributes;
-++
-++   function Get_Soft_Label_Key_Attributes return Character_Attribute_Set
-++   is
-++      function Slk_Attr return C_Chtype;
-++      pragma Import (C, Slk_Attr, "slk_attr");
-++
-++      Attr : constant C_Chtype := Slk_Attr;
-++   begin
-++      return Chtype_To_AttrChar (Attr).Attr;
-++   end Get_Soft_Label_Key_Attributes;
-++
-++   function Get_Soft_Label_Key_Attributes return Color_Pair
-++   is
-++      function Slk_Attr return C_Chtype;
-++      pragma Import (C, Slk_Attr, "slk_attr");
-++
-++      Attr : constant C_Chtype := Slk_Attr;
-++   begin
-++      return Chtype_To_AttrChar (Attr).Color;
-++   end Get_Soft_Label_Key_Attributes;
-++
-++   procedure Set_Soft_Label_Key_Color (Pair : in Color_Pair)
-++   is
-++      function Slk_Color (Color : in C_Short) return C_Int;
-++      pragma Import (C, Slk_Color, "slk_color");
-++   begin
-++      if Slk_Color (C_Short (Pair)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Set_Soft_Label_Key_Color;
-++
-++------------------------------------------------------------------------------
-++   procedure Enable_Key (Key    : in Special_Key_Code;
-++                         Enable : in Boolean := True)
-++   is
-++      function Keyok (Keycode : C_Int;
-++                      On_Off  : Curses_Bool) return C_Int;
-++      pragma Import (C, Keyok, "keyok");
-++   begin
-++      if Keyok (C_Int (Key), Curses_Bool (Boolean'Pos (Enable)))
-++        = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Enable_Key;
-++------------------------------------------------------------------------------
-++   procedure Define_Key (Definition : in String;
-++                         Key        : in Special_Key_Code)
-++   is
-++      function Defkey (Def : char_array;
-++                       Key : C_Int) return C_Int;
-++      pragma Import (C, Defkey, "define_key");
-++
-++      Txt    : char_array (0 .. Definition'Length);
-++      Length : size_t;
-++   begin
-++      To_C (Definition, Txt, Length);
-++      if Defkey (Txt, C_Int (Key)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Define_Key;
-++------------------------------------------------------------------------------
-++   procedure Un_Control (Ch  : in Attributed_Character;
-++                         Str : out String)
-++   is
-++      function Unctrl (Ch : C_Chtype) return chars_ptr;
-++      pragma Import (C, Unctrl, "unctrl");
-++   begin
-++      Fill_String (Unctrl (AttrChar_To_Chtype (Ch)), Str);
-++   end Un_Control;
-++
-++   function Un_Control (Ch : in Attributed_Character) return String
-++   is
-++      function Unctrl (Ch : C_Chtype) return chars_ptr;
-++      pragma Import (C, Unctrl, "unctrl");
-++   begin
-++      return Fill_String (Unctrl (AttrChar_To_Chtype (Ch)));
-++   end Un_Control;
-++
-++   procedure Delay_Output (Msecs : in Natural)
-++   is
-++      function Delayoutput (Msecs : C_Int) return C_Int;
-++      pragma Import (C, Delayoutput, "delay_output");
-++   begin
-++      if Delayoutput (C_Int (Msecs)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Delay_Output;
-++
-++   procedure Flush_Input
-++   is
-++      function Flushinp return C_Int;
-++      pragma Import (C, Flushinp, "flushinp");
-++   begin
-++      if Flushinp = Curses_Err then  -- docu says that never happens, but...
-++         raise Curses_Exception;
-++      end if;
-++   end Flush_Input;
-++------------------------------------------------------------------------------
-++   function Baudrate return Natural
-++   is
-++      function Baud return C_Int;
-++      pragma Import (C, Baud, "baudrate");
-++   begin
-++      return Natural (Baud);
-++   end Baudrate;
-++
-++   function Erase_Character return Character
-++   is
-++      function Erasechar return C_Int;
-++      pragma Import (C, Erasechar, "erasechar");
-++   begin
-++      return Character'Val (Erasechar);
-++   end Erase_Character;
-++
-++   function Kill_Character return Character
-++   is
-++      function Killchar return C_Int;
-++      pragma Import (C, Killchar, "killchar");
-++   begin
-++      return Character'Val (Killchar);
-++   end Kill_Character;
-++
-++   function Has_Insert_Character return Boolean
-++   is
-++      function Has_Ic return Curses_Bool;
-++      pragma Import (C, Has_Ic, "has_ic");
-++   begin
-++      if Has_Ic = Curses_Bool_False then
-++         return False;
-++      else
-++         return True;
-++      end if;
-++   end Has_Insert_Character;
-++
-++   function Has_Insert_Line return Boolean
-++   is
-++      function Has_Il return Curses_Bool;
-++      pragma Import (C, Has_Il, "has_il");
-++   begin
-++      if Has_Il = Curses_Bool_False then
-++         return False;
-++      else
-++         return True;
-++      end if;
-++   end Has_Insert_Line;
-++
-++   function Supported_Attributes return Character_Attribute_Set
-++   is
-++      function Termattrs return C_Chtype;
-++      pragma Import (C, Termattrs, "termattrs");
-++
-++      Ch : constant Attributed_Character := Chtype_To_AttrChar (Termattrs);
-++   begin
-++      return Ch.Attr;
-++   end Supported_Attributes;
-++
-++   procedure Long_Name (Name : out String)
-++   is
-++      function Longname return chars_ptr;
-++      pragma Import (C, Longname, "longname");
-++   begin
-++      Fill_String (Longname, Name);
-++   end Long_Name;
-++
-++   function Long_Name return String
-++   is
-++      function Longname return chars_ptr;
-++      pragma Import (C, Longname, "longname");
-++   begin
-++      return Fill_String (Longname);
-++   end Long_Name;
-++
-++   procedure Terminal_Name (Name : out String)
-++   is
-++      function Termname return chars_ptr;
-++      pragma Import (C, Termname, "termname");
-++   begin
-++      Fill_String (Termname, Name);
-++   end Terminal_Name;
-++
-++   function Terminal_Name return String
-++   is
-++      function Termname return chars_ptr;
-++      pragma Import (C, Termname, "termname");
-++   begin
-++      return Fill_String (Termname);
-++   end Terminal_Name;
-++------------------------------------------------------------------------------
-++   procedure Init_Pair (Pair : in Redefinable_Color_Pair;
-++                        Fore : in Color_Number;
-++                        Back : in Color_Number)
-++   is
-++      function Initpair (Pair : C_Short;
-++                         Fore : C_Short;
-++                         Back : C_Short) return C_Int;
-++      pragma Import (C, Initpair, "init_pair");
-++   begin
-++      if Integer (Pair) >= Number_Of_Color_Pairs then
-++         raise Constraint_Error;
-++      end if;
-++      if Integer (Fore) >= Number_Of_Colors or else
-++        Integer (Back) >= Number_Of_Colors then raise Constraint_Error;
-++      end if;
-++      if Initpair (C_Short (Pair), C_Short (Fore), C_Short (Back))
-++        = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Init_Pair;
-++
-++   procedure Pair_Content (Pair : in Color_Pair;
-++                           Fore : out Color_Number;
-++                           Back : out Color_Number)
-++   is
-++      type C_Short_Access is access all C_Short;
-++      function Paircontent (Pair : C_Short;
-++                            Fp   : C_Short_Access;
-++                            Bp   : C_Short_Access) return C_Int;
-++      pragma Import (C, Paircontent, "pair_content");
-++
-++      F, B : aliased C_Short;
-++   begin
-++      if Paircontent (C_Short (Pair), F'Access, B'Access) = Curses_Err then
-++         raise Curses_Exception;
-++      else
-++         Fore := Color_Number (F);
-++         Back := Color_Number (B);
-++      end if;
-++   end Pair_Content;
-++
-++   function Has_Colors return Boolean
-++   is
-++      function Hascolors return Curses_Bool;
-++      pragma Import (C, Hascolors, "has_colors");
-++   begin
-++      if Hascolors = Curses_Bool_False then
-++         return False;
-++      else
-++         return True;
-++      end if;
-++   end Has_Colors;
-++
-++   procedure Init_Color (Color : in Color_Number;
-++                         Red   : in RGB_Value;
-++                         Green : in RGB_Value;
-++                         Blue  : in RGB_Value)
-++   is
-++      function Initcolor (Col   : C_Short;
-++                          Red   : C_Short;
-++                          Green : C_Short;
-++                          Blue  : C_Short) return C_Int;
-++      pragma Import (C, Initcolor, "init_color");
-++   begin
-++      if Initcolor (C_Short (Color), C_Short (Red), C_Short (Green),
-++                    C_Short (Blue)) = Curses_Err then
-++            raise Curses_Exception;
-++      end if;
-++   end Init_Color;
-++
-++   function Can_Change_Color return Boolean
-++   is
-++      function Canchangecolor return Curses_Bool;
-++      pragma Import (C, Canchangecolor, "can_change_color");
-++   begin
-++      if Canchangecolor = Curses_Bool_False then
-++         return False;
-++      else
-++         return True;
-++      end if;
-++   end Can_Change_Color;
-++
-++   procedure Color_Content (Color : in  Color_Number;
-++                            Red   : out RGB_Value;
-++                            Green : out RGB_Value;
-++                            Blue  : out RGB_Value)
-++   is
-++      type C_Short_Access is access all C_Short;
-++
-++      function Colorcontent (Color : C_Short; R, G, B : C_Short_Access)
-++                             return C_Int;
-++      pragma Import (C, Colorcontent, "color_content");
-++
-++      R, G, B : aliased C_Short;
-++   begin
-++      if Colorcontent (C_Short (Color), R'Access, G'Access, B'Access) =
-++        Curses_Err then
-++         raise Curses_Exception;
-++      else
-++         Red   := RGB_Value (R);
-++         Green := RGB_Value (G);
-++         Blue  := RGB_Value (B);
-++      end if;
-++   end Color_Content;
-++
-++------------------------------------------------------------------------------
-++   procedure Save_Curses_Mode (Mode : in Curses_Mode)
-++   is
-++      function Def_Prog_Mode return C_Int;
-++      pragma Import (C, Def_Prog_Mode, "def_prog_mode");
-++      function Def_Shell_Mode return C_Int;
-++      pragma Import (C, Def_Shell_Mode, "def_shell_mode");
-++
-++      Err : C_Int;
-++   begin
-++      case Mode is
-++         when Curses => Err := Def_Prog_Mode;
-++         when Shell  => Err := Def_Shell_Mode;
-++      end case;
-++      if Err = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Save_Curses_Mode;
-++
-++   procedure Reset_Curses_Mode (Mode : in Curses_Mode)
-++   is
-++      function Reset_Prog_Mode return C_Int;
-++      pragma Import (C, Reset_Prog_Mode, "reset_prog_mode");
-++      function Reset_Shell_Mode return C_Int;
-++      pragma Import (C, Reset_Shell_Mode, "reset_shell_mode");
-++
-++      Err : C_Int;
-++   begin
-++      case Mode is
-++         when Curses => Err := Reset_Prog_Mode;
-++         when Shell  => Err := Reset_Shell_Mode;
-++      end case;
-++      if Err = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Reset_Curses_Mode;
-++
-++   procedure Save_Terminal_State
-++   is
-++      function Savetty return C_Int;
-++      pragma Import (C, Savetty, "savetty");
-++   begin
-++      if Savetty = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Save_Terminal_State;
-++
-++   procedure Reset_Terminal_State
-++   is
-++      function Resetty return C_Int;
-++      pragma Import (C, Resetty, "resetty");
-++   begin
-++      if Resetty = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Reset_Terminal_State;
-++
-++   procedure Rip_Off_Lines (Lines : in Integer;
-++                            Proc  : in Stdscr_Init_Proc)
-++   is
-++      function Ripoffline (Lines : C_Int;
-++                           Proc  : Stdscr_Init_Proc) return C_Int;
-++      pragma Import (C, Ripoffline, "_nc_ripoffline");
-++   begin
-++      if Ripoffline (C_Int (Lines), Proc) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Rip_Off_Lines;
-++
-++   procedure Set_Cursor_Visibility (Visibility : in out Cursor_Visibility)
-++   is
-++      function Curs_Set (Curs : C_Int) return C_Int;
-++      pragma Import (C, Curs_Set, "curs_set");
-++
-++      Res : C_Int;
-++   begin
-++      Res := Curs_Set (Cursor_Visibility'Pos (Visibility));
-++      if Res /= Curses_Err then
-++         Visibility := Cursor_Visibility'Val (Res);
-++      end if;
-++   end Set_Cursor_Visibility;
-++
-++   procedure Nap_Milli_Seconds (Ms : in Natural)
-++   is
-++      function Napms (Ms : C_Int) return C_Int;
-++      pragma Import (C, Napms, "napms");
-++   begin
-++      if Napms (C_Int (Ms)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Nap_Milli_Seconds;
-++------------------------------------------------------------------------------
-++include(`Public_Variables')
-++------------------------------------------------------------------------------
-++   procedure Transform_Coordinates
-++     (W      : in Window := Standard_Window;
-++      Line   : in out Line_Position;
-++      Column : in out Column_Position;
-++      Dir    : in Transform_Direction := From_Screen)
-++   is
-++      type Int_Access is access all C_Int;
-++      function Transform (W    : Window;
-++                          Y, X : Int_Access;
-++                          Dir  : Curses_Bool) return C_Int;
-++      pragma Import (C, Transform, "wmouse_trafo");
-++
-++      X : aliased C_Int := C_Int (Column);
-++      Y : aliased C_Int := C_Int (Line);
-++      D : Curses_Bool := Curses_Bool_False;
-++      R : C_Int;
-++   begin
-++      if Dir = To_Screen then
-++         D := 1;
-++      end if;
-++      R := Transform (W, Y'Access, X'Access, D);
-++      if R = Curses_False then
-++         raise Curses_Exception;
-++      else
-++         Line   := Line_Position (Y);
-++         Column := Column_Position (X);
-++      end if;
-++   end Transform_Coordinates;
-++------------------------------------------------------------------------------
-++   procedure Use_Default_Colors is
-++      function C_Use_Default_Colors return C_Int;
-++      pragma Import (C, C_Use_Default_Colors, "use_default_colors");
-++      Err : constant C_Int := C_Use_Default_Colors;
-++   begin
-++      if Err = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Use_Default_Colors;
-++
-++   procedure Assume_Default_Colors (Fore : Color_Number := Default_Color;
-++                                    Back : Color_Number := Default_Color)
-++   is
-++      function C_Assume_Default_Colors (Fore : C_Int;
-++                                        Back : C_Int) return C_Int;
-++      pragma Import (C, C_Assume_Default_Colors, "assume_default_colors");
-++
-++      Err : constant C_Int := C_Assume_Default_Colors (C_Int (Fore),
-++                                                       C_Int (Back));
-++   begin
-++      if Err = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Assume_Default_Colors;
-++------------------------------------------------------------------------------
-++   function Curses_Version return String
-++   is
-++      function curses_versionC return chars_ptr;
-++      pragma Import (C, curses_versionC, "curses_version");
-++      Result : constant chars_ptr := curses_versionC;
-++   begin
-++      return Fill_String (Result);
-++   end Curses_Version;
-++------------------------------------------------------------------------------
-++   procedure Curses_Free_All is
-++      procedure curses_freeall;
-++      pragma Import (C, curses_freeall, "_nc_freeall");
-++   begin
-++      --  Use this only for testing: you cannot use curses after calling it,
-++      --  so it has to be the "last" thing done before exiting the program.
-++      --  This will not really free ALL of memory used by curses.  That is
-++      --  because it cannot free the memory used for stdout's setbuf.  The
-++      --  _nc_free_and_exit() procedure can do that, but it can be invoked
-++      --  safely only from C - and again, that only as the "last" thing done
-++      --  before exiting the program.
-++      curses_freeall;
-++   end Curses_Free_All;
-++------------------------------------------------------------------------------
-++   function Use_Extended_Names (Enable : Boolean) return Boolean
-++   is
-++      function use_extended_namesC (e : Curses_Bool) return C_Int;
-++      pragma Import (C, use_extended_namesC, "use_extended_names");
-++
-++      Res : constant C_Int :=
-++         use_extended_namesC (Curses_Bool (Boolean'Pos (Enable)));
-++   begin
-++      if Res = C_Int (Curses_Bool_False) then
-++         return False;
-++      else
-++         return True;
-++      end if;
-++   end Use_Extended_Names;
-++------------------------------------------------------------------------------
-++   procedure Screen_Dump_To_File (Filename : in String)
-++   is
-++      function scr_dump (f : char_array) return C_Int;
-++      pragma Import (C, scr_dump, "scr_dump");
-++      Txt    : char_array (0 .. Filename'Length);
-++      Length : size_t;
-++   begin
-++      To_C (Filename, Txt, Length);
-++      if Curses_Err = scr_dump (Txt) then
-++         raise Curses_Exception;
-++      end if;
-++   end Screen_Dump_To_File;
-++
-++   procedure Screen_Restore_From_File (Filename : in String)
-++   is
-++      function scr_restore (f : char_array) return C_Int;
-++      pragma Import (C, scr_restore, "scr_restore");
-++      Txt    : char_array (0 .. Filename'Length);
-++      Length : size_t;
-++   begin
-++      To_C (Filename, Txt, Length);
-++      if Curses_Err = scr_restore (Txt)  then
-++         raise Curses_Exception;
-++      end if;
-++   end Screen_Restore_From_File;
-++
-++   procedure Screen_Init_From_File (Filename : in String)
-++   is
-++      function scr_init (f : char_array) return C_Int;
-++      pragma Import (C, scr_init, "scr_init");
-++      Txt    : char_array (0 .. Filename'Length);
-++      Length : size_t;
-++   begin
-++      To_C (Filename, Txt, Length);
-++      if Curses_Err = scr_init (Txt) then
-++         raise Curses_Exception;
-++      end if;
-++   end Screen_Init_From_File;
-++
-++   procedure Screen_Set_File (Filename : in String)
-++   is
-++      function scr_set (f : char_array) return C_Int;
-++      pragma Import (C, scr_set, "scr_set");
-++      Txt    : char_array (0 .. Filename'Length);
-++      Length : size_t;
-++   begin
-++      To_C (Filename, Txt, Length);
-++      if Curses_Err = scr_set (Txt) then
-++         raise Curses_Exception;
-++      end if;
-++   end Screen_Set_File;
-++------------------------------------------------------------------------------
-++   procedure Resize (Win               : Window := Standard_Window;
-++                     Number_Of_Lines   : Line_Count;
-++                     Number_Of_Columns : Column_Count) is
-++      function wresize (win     : Window;
-++                        lines   : C_Int;
-++                        columns : C_Int) return C_Int;
-++      pragma Import (C, wresize);
-++   begin
-++      if wresize (Win,
-++                  C_Int (Number_Of_Lines),
-++                  C_Int (Number_Of_Columns)) = Curses_Err then
-++         raise Curses_Exception;
-++      end if;
-++   end Resize;
-++------------------------------------------------------------------------------
-++
-++end Terminal_Interface.Curses;
-+Index: Ada95/gen/terminal_interface-curses.ads.m4
-+--- ncurses-5.6/Ada95/gen/terminal_interface-curses.ads.m4	2006-06-25 14:30:22.000000000 +0000
-++++ ncurses-5.6-20071201/Ada95/gen/terminal_interface-curses.ads.m4	2007-05-05 20:33:52.000000000 +0000
-+@@ -9,7 +9,7 @@
-+ --                                 S P E C                                  --
-+ --                                                                          --
-+ ------------------------------------------------------------------------------
-+--- Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.              --
-++-- Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              --
-+ --                                                                          --
-+ -- Permission is hereby granted, free of charge, to any person obtaining a  --
-+ -- copy of this software and associated documentation files (the            --
-+@@ -37,8 +37,8 @@
-+ ------------------------------------------------------------------------------
-+ --  Author:  Juergen Pfeifer, 1996
-+ --  Version Control:
-+---  $Revision: 1.37 $
-+---  $Date: 2006/06/25 14:30:22 $
-++--  $Revision: 1.41 $
-++--  $Date: 2007/05/05 20:33:52 $
-+ --  Binding Version 01.00
-+ ------------------------------------------------------------------------------
-+ include(`Base_Defs')
-+@@ -188,25 +188,21 @@
-+    function Number_Of_Color_Pairs return Natural;
-+    pragma Inline (Number_Of_Color_Pairs);
-+ 
-+-   ACS_Map : array (Character'Val (0) .. Character'Val (127)) of
-+-     Attributed_Character;
-+-   pragma Import (C, ACS_Map, "acs_map");
-+-   --
-+-   --
-+-   --  Constants for several characters from the Alternate Character Set
-+-   --  You must use this constants as indices into the ACS_Map array
-+-   --  to get the corresponding attributed character at runtime.
-+-   --
-+ include(`ACS_Map')dnl
-+ 
-+    --  MANPAGE(`curs_initscr.3x')
-+-   --  | Not implemented: newterm, set_term, delscreen, curscr
-++   --  | Not implemented: newterm, set_term, delscreen
-+ 
-+    --  ANCHOR(`stdscr',`Standard_Window')
-+    function Standard_Window return Window;
-+    --  AKA
-+    pragma Inline (Standard_Window);
-+ 
-++   --  ANCHOR(`curscr',`Current_Window')
-++   function Current_Window return Window;
-++   --  AKA
-++   pragma Inline (Current_Window);
-++
-+    --  ANCHOR(`initscr()',`Init_Screen')
-+    procedure Init_Screen;
-+ 
-+@@ -1478,7 +1474,7 @@
-+    --  Window or if you pass the Null_Window as argument.
-+    --  We don't inline this procedure
-+ 
-+-   --  MANPAGE(`dft_fgbg.3x')
-++   --  MANPAGE(`default_colors.3x')
-+ 
-+    --  ANCHOR(`use_default_colors()',`Use_Default_Colors')
-+    procedure Use_Default_Colors;
-+@@ -1502,6 +1498,12 @@
-+    function Use_Extended_Names (Enable : Boolean) return Boolean;
-+    --  AKA
-+ 
-++   --  MANPAGE(`curs_trace.3x')
-++
-++   --  ANCHOR(`_nc_freeall()',`Curses_Free_All')
-++   procedure Curses_Free_All;
-++   --  AKA
-++
-+    --  MANPAGE(`curs_scr_dump.3x')
-+ 
-+    --  ANCHOR(`scr_dump()',`Screen_Dump_To_File')
-+Index: Ada95/samples/ncurses2-attr_test.adb
-+--- ncurses-5.6/Ada95/samples/ncurses2-attr_test.adb	2006-06-25 14:24:40.000000000 +0000
-++++ ncurses-5.6-20071201/Ada95/samples/ncurses2-attr_test.adb	2007-05-05 21:28:18.000000000 +0000
-+@@ -7,7 +7,7 @@
-+ --                                 B O D Y                                  --
-+ --                                                                          --
-+ ------------------------------------------------------------------------------
-+--- Copyright (c) 2000-2004,2006 Free Software Foundation, Inc.              --
-++-- Copyright (c) 2000-2006,2007 Free Software Foundation, Inc.              --
-+ --                                                                          --
-+ -- Permission is hereby granted, free of charge, to any person obtaining a  --
-+ -- copy of this software and associated documentation files (the            --
-+@@ -35,8 +35,8 @@
-+ ------------------------------------------------------------------------------
-+ --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
-+ --  Version Control
-+---  $Revision: 1.6 $
-+---  $Date: 2006/06/25 14:24:40 $
-++--  $Revision: 1.8 $
-++--  $Date: 2007/05/05 21:28:18 $
-+ --  Binding Version 01.00
-+ ------------------------------------------------------------------------------
-+ with ncurses2.util; use ncurses2.util;
-+@@ -56,7 +56,7 @@
-+                         attr : Character_Attribute_Set;
-+                         name : String;
-+                         once : Boolean) return Line_Position;
-+-   procedure attr_getc (skip : out Integer;
-++   procedure attr_getc (skip : in out Integer;
-+                         fg, bg : in out Color_Number;
-+                         result : out Boolean);
-+ 
-+@@ -233,20 +233,18 @@
-+       return row + 2;
-+    end show_attr;
-+ 
-+-   procedure attr_getc (skip : out Integer; fg, bg : in out Color_Number;
-+-                                            result : out Boolean) is
-++   procedure attr_getc (skip : in out Integer;
-++                        fg, bg : in out Color_Number;
-++                        result : out Boolean) is
-+       ch : constant Key_Code := Getchar;
-+       nc : constant Color_Number := Color_Number (Number_Of_Colors);
-+-      curscr : Window;
-+-      pragma Import (C, curscr, "curscr");
-+-      --  curscr is not implemented in the Ada binding
-+    begin
-+       result := True;
-+       if Ada.Characters.Handling.Is_Digit (Character'Val (ch)) then
-+          skip := ctoi (Code_To_Char (ch));
-+       elsif ch = CTRL ('L') then
-+          Touch;
-+-         Touch (curscr);
-++         Touch (Current_Window);
-+          Refresh;
-+       elsif Has_Colors then
-+          case ch is
-+Index: Ada95/samples/ncurses2-m.adb
-+--- ncurses-5.6/Ada95/samples/ncurses2-m.adb	2006-06-25 14:24:40.000000000 +0000
-++++ ncurses-5.6-20071201/Ada95/samples/ncurses2-m.adb	2007-05-05 18:02:40.000000000 +0000
-+@@ -35,8 +35,8 @@
-+ ------------------------------------------------------------------------------
-+ --  Author: Eugene V. Melaragno <aldomel@ix.netcom.com> 2000
-+ --  Version Control
-+---  $Revision: 1.6 $
-+---  $Date: 2006/06/25 14:24:40 $
-++--  $Revision: 1.7 $
-++--  $Date: 2007/05/05 18:02:40 $
-+ --  Binding Version 01.00
-+ ------------------------------------------------------------------------------
-+ --  TODO use Default_Character where appropriate
-+@@ -442,6 +442,7 @@
-+ 
-+          exit when command = 'q';
-+       end loop;
-++      Curses_Free_All;
-+       return 0; -- TODO ExitProgram(EXIT_SUCCESS);
-+    end main;
-+ 
-+Index: Ada95/samples/rain.adb
-+--- ncurses-5.6/Ada95/samples/rain.adb	2003-10-25 15:39:18.000000000 +0000
-++++ ncurses-5.6-20071201/Ada95/samples/rain.adb	2007-05-05 18:54:03.000000000 +0000
-+@@ -36,7 +36,8 @@
-+ --  Author:  Laurent Pautet <pautet@gnat.com>
-+ --  Modified by:  Juergen Pfeifer, 1997
-+ --  Version Control
-+---  $Revision: 1.6 $
-++--  $Revision: 1.7 $
-++--  $Date: 2007/05/05 18:54:03 $
-+ --  Binding Version 01.00
-+ ------------------------------------------------------------------------------
-+ --                                                                          --
-+@@ -158,5 +159,6 @@
-+    Visibility := Normal;
-+    Set_Cursor_Visibility (Visibility);
-+    End_Windows;
-++   Curses_Free_All;
-+ 
-+ end Rain;
-+Index: Ada95/samples/sample.adb
-+--- ncurses-5.6/Ada95/samples/sample.adb	2003-10-25 15:39:18.000000000 +0000
-++++ ncurses-5.6-20071201/Ada95/samples/sample.adb	2007-05-05 18:46:21.000000000 +0000
-+@@ -35,7 +35,8 @@
-+ ------------------------------------------------------------------------------
-+ --  Author:  Juergen Pfeifer, 1996
-+ --  Version Control
-+---  $Revision: 1.14 $
-++--  $Revision: 1.15 $
-++--  $Date: 2007/05/05 18:46:21 $
-+ --  Binding Version 01.00
-+ ------------------------------------------------------------------------------
-+ with Text_IO;
-+@@ -204,6 +205,7 @@
-+       --  We have some fixed key throughout this sample
-+       Main_Menu;
-+       End_Windows;
-++      Curses_Free_All;
-+ 
-+    exception
-+       when Event : others =>
-+Index: Ada95/src/Makefile.in
-+Prereq:  1.30 
-+--- ncurses-5.6/Ada95/src/Makefile.in	2004-08-21 21:29:50.000000000 +0000
-++++ ncurses-5.6-20071201/Ada95/src/Makefile.in	2007-09-15 18:22:24.000000000 +0000
-+@@ -28,7 +28,7 @@
-+ #
-+ #  Author:  Juergen Pfeifer, 1996
-+ #
-+-#  $Id: Makefile.in,v 1.30 2004/08/21 21:29:50 tom Exp $
-++#  $Id: Makefile.in,v 1.31 2007/09/15 18:22:24 tom Exp $
-+ #
-+ .SUFFIXES:
-+ 
-+@@ -197,7 +197,7 @@
-+ 
-+ realclean :: distclean
-+ 
-+-BASEDEPS=$(ABASE).ads $(ABASE)-aux.ads $(srcdir)/$(ABASE).adb
-++BASEDEPS=$(ABASE).ads $(ABASE)-aux.ads $(ABASE).adb
-+ 
-+ $(ALIB).o: $(srcdir)/$(ALIB).ads
-+ 	$(ADA) $(ADAFLAGS) -c -o $@ $(srcdir)/$(ALIB).ads
-+@@ -207,8 +207,8 @@
-+ 	$(ADA) $(ADAFLAGS) -c -o $@ $(srcdir)/$(ABASE)-aux.adb
-+ 
-+ 
-+-$(ABASE).o: $(srcdir)/$(ABASE).adb $(BASEDEPS)
-+-	$(ADA) $(ADAFLAGS) -c -o $@ $(srcdir)/$(ABASE).adb
-++$(ABASE).o: $(ABASE).adb $(BASEDEPS)
-++	$(ADA) $(ADAFLAGS) -c -o $@ $(ABASE).adb
-+ 
-+ 
-+ $(ABASE)-terminfo.o: \
-+Index: INSTALL
-+Prereq:  1.114 
-+--- ncurses-5.6/INSTALL	2006-12-17 19:58:19.000000000 +0000
-++++ ncurses-5.6-20071201/INSTALL	2007-12-01 19:37:47.000000000 +0000
-+@@ -25,7 +25,7 @@
-+ -- sale, use or other dealings in this Software without prior written        --
-+ -- authorization.                                                            --
-+ -------------------------------------------------------------------------------
-+--- $Id: INSTALL,v 1.114 2006/12/17 19:58:19 tom Exp $
-++-- $Id: INSTALL,v 1.122 2007/12/01 19:37:47 tom Exp $
-+ ---------------------------------------------------------------------
-+              How to install Ncurses/Terminfo on your system
-+ ---------------------------------------------------------------------
-+@@ -304,6 +304,11 @@
-+ 	return deceptive results, so you may have to override the configure
-+ 	script.  Or you may be building tic for a smaller machine.
-+ 
-++    --disable-big-strings
-++	Disable compile-time optimization of predefined tables which puts
-++	all of their strings into a very long string, to reduce relocation
-++	overhead.
-++
-+     --disable-database
-+ 	Use only built-in data.  The ncurses libraries normally read terminfo
-+ 	and termcap data from disk.  You can configure ncurses to have a
-+@@ -334,6 +339,16 @@
-+ 	For testing, compile-in code that frees memory that normally would not
-+ 	be freed, to simplify analysis of memory-leaks.
-+ 
-++	Any implementation of curses must not free the memory associated with
-++	a screen, since (even after calling endwin()), it must be available
-++	for use in the next call to refresh().  There are also chunks of
-++	memory held for performance reasons.  That makes it hard to analyze
-++	curses applications for memory leaks.  To work around this, build
-++	a debugging version of the ncurses library which frees those chunks
-++	which it can, and provides the _nc_free_and_exit() function to free
-++	the remainder on exit.  The ncurses utility and test programs use this
-++	feature, e.g., via the ExitProgram() macro.
-++
-+     --disable-lp64
-+ 	The header files will ignore use of the _LP64 symbol to make chtype
-+ 	and mmask_t types 32 bits (they may be long on 64-bit hosts, for
-+@@ -358,6 +373,13 @@
-+ 	rather than the include directory.  This makes it simpler to avoid
-+ 	compile-time conflicts with other versions of curses.h
-+ 
-++    --disable-relink
-++	If --enable-rpath is given, the generated makefiles normally will
-++	rebuild the libraries during install.  Use this option to simply
-++	copy whatever the linked produced.
-++
-++	This option is ignored if --enable-rpath is not given.
-++
-+     --disable-root-environ
-+ 	Compile with environment restriction, so certain environment variables
-+ 	are not available when running as root, or via a setuid/setgid
-+@@ -476,12 +498,22 @@
-+ 	may not be accurate, or that your stty settings have disabled the use
-+ 	of tabs.
-+ 
-++    --enable-mixed-case
-++	Controls whether the filesystem on which the terminfo database resides
-++	supports mixed-case filenames (normal for UNIX, but not on other
-++	systems).  If you do not specify this option, the configure script
-++	checks the current filesystem.
-++
-+     --enable-no-padding
-+ 	Compile-in support for the $NCURSES_NO_PADDING environment variable,
-+ 	which allows you to suppress the effect of non-mandatory padding in
-+ 	terminfo entries.  This is the default, unless you have disabled the
-+ 	extended functions.
-+ 
-++    --enable-reentrant
-++	Compile experimental configuration which improves reentrant use of the
-++	library by reducing global and static variables.
-++
-+     --enable-rpath
-+ 	Use rpath option when generating shared libraries, and (with some
-+ 	restrictions) when linking the corresponding programs.  This originally
-+@@ -495,6 +527,9 @@
-+ 	environment variable, they do not work with setuid applications since
-+ 	the LD_LIBRARY_PATH variable would be unset in that situation.
-+ 
-++	This option does not apply to --with-libtool, since libtool makes
-++	extra assumptions about rpath.
-++
-+     --enable-safe-sprintf
-+ 	Compile with experimental safe-sprintf code.  You may consider using
-+ 	this if you are building ncurses for a system that has neither
-+@@ -659,10 +694,16 @@
-+ 
-+ 	See also --without-dlsym
-+ 
-+-    --with-hashed-db
-++    --with-hashed-db[=XXX]
-+ 	Use a hashed database for storing terminfo data rather than storing
-+ 	each compiled entry in a separate binary file within a directory
-+ 	tree.
-++	
-++	In particular, this uses the Berkeley database 1.8.5 interface, as
-++	provided by that and its successors db 2, 3, and 4.  The actual
-++	interface is slightly different in the successor versions of the
-++	Berkeley database.  The database should have been configured using
-++	"--enable-compat185".
-+ 
-+ 	If you use this option for configuring ncurses, tic will only be able
-+ 	to write entries in the hashed database.  infocmp can still read
-+@@ -674,6 +715,12 @@
-+ 	You cannot have a directory containing both hashed-database and
-+ 	filesystem-based terminfo entries.
-+ 
-++	Use the parameter value to give the install-prefix used for the
-++	datbase, e.g.,
-++		--with-hashed-db=/usr/local/BigBase
-++	to find the corresponding include- and lib-directories under the
-++	given directory.
-++
-+ 	See also the --enable-getcap option.
-+ 
-+     --with-install-prefix=XXX
-+@@ -833,6 +880,15 @@
-+ 	Specify a search-list of termcap files which will be compiled into the
-+ 	ncurses library (default:  /etc/termcap:/usr/share/misc/termcap)
-+ 
-++    --with-ticlib[=XXX]
-++	When building the ncurses library, build a separate library for
-++	the modules that are used only by the utility programs.  Normally
-++	those would be bundled with the termlib or ncurses libraries.
-++
-++	If an option value is given, that overrides the name of the tic
-++	library.  As in termlib, there is no ABI difference between the
-++	"wide" libticw.so and libtic.so
-++
-+     --with-trace
-+ 	Configure the trace() function as part of the all models of the ncurses
-+ 	library.  Normally it is part of the debug (libncurses_g) library only.
-+Index: MANIFEST
-+--- ncurses-5.6/MANIFEST	2006-11-26 02:21:05.000000000 +0000
-++++ ncurses-5.6-20071201/MANIFEST	2007-09-08 21:31:21.000000000 +0000
-+@@ -4,6 +4,7 @@
-+ ./Ada95/README
-+ ./Ada95/TODO
-+ ./Ada95/gen/Makefile.in
-++./Ada95/gen/adacurses-config.in
-+ ./Ada95/gen/gen.c
-+ ./Ada95/gen/html.m4
-+ ./Ada95/gen/normal.m4
-+@@ -20,6 +21,7 @@
-+ ./Ada95/gen/terminal_interface-curses-panels-user_data.ads.m4
-+ ./Ada95/gen/terminal_interface-curses-panels.ads.m4
-+ ./Ada95/gen/terminal_interface-curses-trace.ads.m4
-++./Ada95/gen/terminal_interface-curses.adb.m4
-+ ./Ada95/gen/terminal_interface-curses.ads.m4
-+ ./Ada95/samples/Makefile.in
-+ ./Ada95/samples/README
-+@@ -163,7 +165,6 @@
-+ ./Ada95/src/terminal_interface-curses-text_io.adb
-+ ./Ada95/src/terminal_interface-curses-text_io.ads
-+ ./Ada95/src/terminal_interface-curses-trace.adb_p
-+-./Ada95/src/terminal_interface-curses.adb
-+ ./Ada95/src/terminal_interface.ads
-+ ./INSTALL
-+ ./MANIFEST
-+@@ -553,8 +554,10 @@
-+ ./man/curs_instr.3x
-+ ./man/curs_inwstr.3x
-+ ./man/curs_kernel.3x
-++./man/curs_legacy.3x
-+ ./man/curs_mouse.3x
-+ ./man/curs_move.3x
-++./man/curs_opaque.3x
-+ ./man/curs_outopts.3x
-+ ./man/curs_overlay.3x
-+ ./man/curs_pad.3x
-+@@ -709,7 +712,8 @@
-+ ./mk-0th.awk
-+ ./mk-1st.awk
-+ ./mk-2nd.awk
-+-./mkinstalldirs
-++./mk-hdr.awk
-++./mkdirs.sh
-+ ./ncurses/Makefile.in
-+ ./ncurses/README
-+ ./ncurses/README.IZ
-+@@ -799,6 +803,7 @@
-+ ./ncurses/base/safe_sprintf.c
-+ ./ncurses/base/sigaction.c
-+ ./ncurses/base/tries.c
-++./ncurses/base/use_window.c
-+ ./ncurses/base/version.c
-+ ./ncurses/base/vsscanf.c
-+ ./ncurses/base/wresize.c
-+@@ -808,6 +813,8 @@
-+ ./ncurses/llib-lncursesw
-+ ./ncurses/modules
-+ ./ncurses/tinfo/MKcaptab.awk
-++./ncurses/tinfo/MKcaptab.sh
-++./ncurses/tinfo/MKcodes.awk
-+ ./ncurses/tinfo/MKfallback.sh
-+ ./ncurses/tinfo/MKkeys_list.sh
-+ ./ncurses/tinfo/MKnames.awk
-+@@ -824,6 +831,7 @@
-+ ./ncurses/tinfo/comp_scan.c
-+ ./ncurses/tinfo/db_iterator.c
-+ ./ncurses/tinfo/doalloc.c
-++./ncurses/tinfo/entries.c
-+ ./ncurses/tinfo/free_ttype.c
-+ ./ncurses/tinfo/getenv_num.c
-+ ./ncurses/tinfo/hashed_db.c
-+@@ -856,6 +864,7 @@
-+ ./ncurses/tinfo/setbuf.c
-+ ./ncurses/tinfo/strings.c
-+ ./ncurses/tinfo/trim_sgr0.c
-++./ncurses/tinfo/use_screen.c
-+ ./ncurses/tinfo/write_entry.c
-+ ./ncurses/trace/README
-+ ./ncurses/trace/lib_trace.c
-+@@ -891,6 +900,7 @@
-+ ./ncurses/widechar/lib_in_wchnstr.c
-+ ./ncurses/widechar/lib_ins_wch.c
-+ ./ncurses/widechar/lib_inwstr.c
-++./ncurses/widechar/lib_key_name.c
-+ ./ncurses/widechar/lib_pecho_wchar.c
-+ ./ncurses/widechar/lib_slk_wset.c
-+ ./ncurses/widechar/lib_unget_wch.c
-+@@ -934,29 +944,6 @@
-+ ./progs/toe.c
-+ ./progs/tput.c
-+ ./progs/tset.c
-+-./tack/COPYING
-+-./tack/HISTORY
-+-./tack/Makefile.in
-+-./tack/README
-+-./tack/ansi.c
-+-./tack/charset.c
-+-./tack/color.c
-+-./tack/control.c
-+-./tack/crum.c
-+-./tack/edit.c
-+-./tack/fun.c
-+-./tack/init.c
-+-./tack/menu.c
-+-./tack/modes.c
-+-./tack/modules
-+-./tack/output.c
-+-./tack/pad.c
-+-./tack/scan.c
-+-./tack/sync.c
-+-./tack/sysdep.c
-+-./tack/tack.1
-+-./tack/tack.c
-+-./tack/tack.h
-+ ./tar-copy.sh
-+ ./test/Makefile.in
-+ ./test/README
-+@@ -981,6 +968,7 @@
-+ ./test/demo_termcap.c
-+ ./test/ditto.c
-+ ./test/dots.c
-++./test/dots_mvcur.c
-+ ./test/echochar.c
-+ ./test/edit_field.c
-+ ./test/edit_field.h
-+@@ -992,8 +980,11 @@
-+ ./test/gdc.c
-+ ./test/hanoi.c
-+ ./test/hashtest.c
-++./test/inch_wide.c
-++./test/inchs.c
-+ ./test/ins_wide.c
-+ ./test/inserts.c
-++./test/key_names.c
-+ ./test/keynames.c
-+ ./test/knight.c
-+ ./test/linux-color.dat
-+@@ -1010,8 +1001,15 @@
-+ ./test/rain.c
-+ ./test/redraw.c
-+ ./test/savescreen.c
-++./test/savescreen.sh
-+ ./test/tclock.c
-+ ./test/test.priv.h
-++./test/test_arrays.c
-++./test/test_get_wstr.c
-++./test/test_getstr.c
-++./test/test_instr.c
-++./test/test_inwstr.c
-++./test/test_opaque.c
-+ ./test/testaddch.c
-+ ./test/testcurs.c
-+ ./test/testscanw.c
-+Index: NEWS
-+Prereq:  1.1056 
-+--- ncurses-5.6/NEWS	2006-12-17 20:36:26.000000000 +0000
-++++ ncurses-5.6-20071201/NEWS	2007-12-01 19:38:49.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ -------------------------------------------------------------------------------
-+--- Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.               --
-++-- Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.               --
-+ --                                                                           --
-+ -- Permission is hereby granted, free of charge, to any person obtaining a   --
-+ -- copy of this software and associated documentation files (the             --
-+@@ -25,7 +25,7 @@
-+ -- sale, use or other dealings in this Software without prior written        --
-+ -- authorization.                                                            --
-+ -------------------------------------------------------------------------------
-+--- $Id: NEWS,v 1.1056 2006/12/17 20:36:26 tom Exp $
-++-- $Id: NEWS,v 1.1186 2007/12/01 19:38:49 tom Exp $
-+ -------------------------------------------------------------------------------
-+ 
-+ This is a log of changes that ncurses has gone through since Zeyd started
-+@@ -45,9 +45,504 @@
-+ Changes through 1.9.9e did not credit all contributions;
-+ it is not possible to add this information.
-+ 
-++20071201
-++	+ add note about configure options needed for Berkeley database to the
-++	  INSTALL file.
-++	+ improve checks for version of Berkeley database libraries.
-++	+ amend fix for rpath to not modify LDFLAGS if the platform has no
-++	  applicable transformation (report by Christian Ebert, cf: 20071124).
-++
-++20071124
-++	+ modify configure option --with-hashed-db to accept a parameter which
-++	  is the install-prefix of a given Berkeley Database (prompted by
-++	  pierre4d2 comments).
-++	+ rewrite wrapper for wcrtomb(), making it work on Solaris.  This is
-++	  used in the form library to determine the length of the buffer needed
-++	  by field_buffer (report by Alfred Fung).
-++	+ remove unneeded window-parameter from C++ binding for wresize (report
-++	  by Chris Lee).
-++
-++20071117
-++	+ modify the support for filesystems which do not support mixed-case to
-++	  generate 2-character (hexadecimal) codes for the lower-level of the
-++	  filesystem terminfo database (request by Michail Vidiassov).
-++	+ add configure option --enable-mixed-case, to allow overriding the
-++	  configure script's check if the filesystem supports mixed-case
-++	  filenames.
-++	+ add wresize() to C++ binding (request by Chris Lee).
-++	+ define NCURSES_EXT_FUNCS and NCURSES_EXT_COLORS in curses.h to make
-++	  it simpler to tell if the extended functions and/or colors are
-++	  declared.
-++
-++20071103
-++	+ update memory-leak checks for changes to names.c and codes.c
-++	+ correct acsc strings in h19, z100 (patch by Benjamin C W Sittler).
-++
-++20071020
-++	+ continue implementing support for threading demo by adding mutex
-++	  for use_window().
-++	+ add mrxvt terminfo entry, add/fix xterm building blocks for modified
-++	  cursor keys -TD
-++	+ compile with FreeBSD "contemporary" TTY interface (patch by
-++	  Rong-En Fan).
-++
-++20071013
-++	+ modify makefile rules to allow clear, tput and tset to be built
-++	  without libtic.  The other programs (infocmp, tic and toe) rely on
-++	  that library.
-++	+ add/modify null-pointer checks in several functions for SP and/or
-++	  the WINDOW* parameter (report by Thorben Krueger).
-++	+ fixes for field_buffer() in formw library (see Redhat Bugzilla
-++	  #310071, patches by Miroslav Lichvar).
-++	+ improve performance of NCURSES_CHAR_EQ code (patch by Miroslav
-++	  Lichvar).
-++	+ update/improve mlterm and rxvt terminfo entries, e.g., for
-++	  the modified cursor- and keypad-keys -TD
-++
-++20071006
-++	+ add code to curses.priv.h ifdef'd with NCURSES_CHAR_EQ, which
-++	  changes the CharEq() macro to an inline function to allow comparing
-++	  cchar_t struct's without comparing gaps in a possibly unpacked
-++	  memory layout (report by Miroslav Lichvar).
-++
-++20070929
-++	+ add new functions to lib_trace.c to setup mutex's for the _tracef()
-++	  calls within the ncurses library.
-++	+ for the reentrant model, move _nc_tputs_trace and _nc_outchars into
-++	  the SCREEN.
-++	+ start modifying test/worm.c to provide threading demo (incomplete).
-++	+ separated ifdef's for some BSD-related symbols in tset.c, to make
-++	  it compile on LynxOS (report by Greg Gemmer).
-++20070915
-++	+ modify Ada95/gen/Makefile to use shlib script, to simplify building
-++	  shared-library configuration on platforms lacking rpath support.
-++	+ build-fix for Ada95/src/Makefile to reflect changed dependency for
-++	  the terminal-interface-curses-aux.adb file which is now generated.
-++	+ restructuring test/worm.c, for use_window() example.
-++
-++20070908
-++	+ add use_window() and use_screen() functions, to develop into support
-++	  for threaded library (incomplete).
-++	+ fix typos in man/curs_opaque.3x which kept the install script from
-++	  creating symbolic links to two aliases created in 20070818 (report by
-++	  Rong-En Fan).
-++
-++20070901
-++	+ remove a spurious newline from output of html.m4, which caused links
-++	  for Ada95 html to be incorrect for the files generated using m4.
-++	+ start investigating mutex's for SCREEN manipulation (incomplete).
-++	+ minor cleanup of codes.c/names.c for --enable-const
-++	+ expand/revise "Routine and Argument Names" section of ncurses manpage
-++	  to address report by David Givens in newsgroup discussion.
-++	+ fix interaction between --without-progs/--with-termcap configure
-++	  options (report by Michail Vidiassov).
-++	+ fix typo in "--disable-relink" option (report by Michail Vidiassov).
-++
-++20070825
-++	+ fix a sign-extension bug in infocmp's repair_acsc() function
-++	  (cf: 971004).
-++	+ fix old configure script bug which prevented "--disable-warnings"
-++	  option from working (patch by Mike Frysinger).
-++
-++20070818
-++	+ add 9term terminal description (request by Juhapekka Tolvanen) -TD
-++	+ modify comp_hash.c's string output to avoid misinterpreting a null
-++	  "\0" followed by a digit.
-++	+ modify MKnames.awk and MKcodes.awk to support big-strings.
-++	  This only applies to the cases (broken linker, reentrant) where
-++	  the corresponding arrays are accessed via wrapper functions.
-++	+ split MKnames.awk into two scripts, eliminating the shell redirection
-++	  which complicated the make process and also the bogus timestamp file
-++	  which was introduced to fix "make -j".
-++	+ add test/test_opaque.c, test/test_arrays.c
-++	+ add wgetscrreg() and wgetparent() for applications that may need it
-++	  when NCURSES_OPAQUE is defined (prompted by Bryan Christ).
-++
-++20070812
-++	+ amend treatment of infocmp "-r" option to retain the 1023-byte limit
-++	  unless "-T" is given (cf: 981017).
-++	+ modify comp_captab.c generation to use big-strings.
-++	+ make _nc_capalias_table and _nc_infoalias_table private accessed via
-++	  _nc_get_alias_table() since the tables are used only within the tic
-++	  library.
-++	+ modify configure script to skip Intel compiler in CF_C_INLINE.
-++	+ make _nc_info_hash_table and _nc_cap_hash_table private accessed via
-++	  _nc_get_hash_table() since the tables are used only within the tic
-++	  library.
-++
-++20070728
-++	+ make _nc_capalias_table and _nc_infoalias_table private, accessed via
-++	  _nc_get_alias_table() since they are used only by parse_entry.c
-++	+ make _nc_key_names private since it is used only by lib_keyname.c
-++	+ add --disable-big-strings configure option to control whether
-++	  unctrl.c is generated using the big-string optimization - which may
-++	  use strings longer than supported by a given compiler.
-++	+ reduce relocation tables for tic, infocmp by changing type of
-++	  internal hash tables to short, and make those private symbols.
-++	+ eliminate large fixed arrays from progs/infocmp.c
-++
-++20070721
-++	+ change winnstr() to stop at the end of the line (cf: 970315).
-++	+ add test/test_get_wstr.c
-++	+ add test/test_getstr.c
-++	+ add test/test_inwstr.c
-++	+ add test/test_instr.c
-++
-++20070716
-++	+ restore a call to obtain screen-size in _nc_setupterm(), which
-++	  is used in tput and other non-screen applications via setupterm()
-++	  (Debian #433357, reported by Florent Bayle, Christian Ohm,
-++	  cf: 20070310).
-++
-++20070714
-++	+ add test/savescreen.c test-program
-++	+ add check to trace-file open, if the given name is a directory, add
-++	  ".log" to the name and try again.
-++	+ add konsole-256color entry -TD
-++	+ add extra gcc warning options from xterm.
-++	+ minor fixes for ncurses/hashmap test-program.
-++	+ modify configure script to quiet c++ build with libtool when the
-++	  --disable-echo option is used.
-++	+ modify configure script to disable ada95 if libtool is selected,
-++	  writing a warning message (addresses FreeBSD ports/114493).
-++	+ update config.guess, config.sub
-++
-++20070707
-++	+ add continuous-move "M" to demo_panels to help test refresh changes.
-++	+ improve fix for refresh of window on top of multi-column characters,
-++	  taking into account some split characters on left/right window
-++	  boundaries.
-++
-++20070630
-++	+ add "widec" row to _tracedump() output to help diagnose remaining
-++	  problems with multi-column characters.
-++	+ partial fix for refresh of window on top of multi-column characters
-++	  which are partly overwritten (report by Sadrul H Chowdhury).
-++	+ ignore A_CHARTEXT bits in vidattr() and vid_attr(), in case
-++	  multi-column extension bits are passed there.
-++	+ add setlocale() call to demo_panels.c, needed for wide-characters.
-++	+ add some output flags to _nc_trace_ttymode to help diagnose a bug
-++	  report by Larry Virden, i.e., ONLCR, OCRNL, ONOCR and ONLRET,
-++
-++20070623
-++	+ add test/demo_panels.c
-++	+ implement opaque version of setsyx() and getsyx().
-++
-++20070612
-++	+ corrected xterm+pcf2 terminfo modifiers for F1-F4, to match xterm
-++	  #226 -TD
-++	+ split-out key_name() from MKkeyname.awk since it now depends upon
-++	  wunctrl() which is not in libtinfo (report by Rong-En Fan).
-++
-++20070609
-++	+ add test/key_name.c
-++	+ add stdscr cases to test/inchs.c and test_inch_wide.c
-++	+ update test/configure
-++	+ correct formatting of DEL (0x7f) in _nc_vischar().
-++	+ null-terminate result of wunctrl().
-++	+ add null-pointer check in key_name() (report by Andreas Krennmair,
-++	  cf: 20020901).
-++
-++20070602
-++	+ adapt mouse-handling code from menu library in form-library
-++	  (discussion with Clive Nicolson).
-++	+ add a modification of test/dots.c, i.e., test/dots_mvcur.c to
-++	  illustrate how to use mvcur().
-++	+ modify wide-character flavor of SetAttr() to preserve the
-++	  WidecExt() value stored in the .attr field, e.g., in case it
-++	  is overwritten by chgat (report by Aleksi Torhamo).
-++	+ correct buffer-size for _nc_viswbuf2n() (report by Aleksi Torhamo).
-++	+ build-fixes for Solaris 2.6 and 2.7 (patch by Peter O'Gorman).
-++
-++20070526
-++	+ modify keyname() to use "^X" form only if meta() has been called, or
-++	  if keyname() is called without initializing curses, e.g., via
-++	  initscr() or newterm() (prompted by LinuxBase #1604).
-++	+ document some portability issues in man/curs_util.3x
-++	+ add a shadow copy of TTY buffer to _nc_prescreen to fix applications
-++	  broken by moving that data into SCREEN (cf: 20061230).
-++
-++20070512
-++	+ add 'O' (wide-character panel test) in ncurses.c to demonstrate a
-++	  problem reported by Sadrul H Chowdhury with repainting parts of
-++	  a fullwidth cell.
-++	+ modify slk_init() so that if there are preceding calls to
-++	  ripoffline(), those affect the available lines for soft-keys (adapted
-++	  from patch by Clive Nicolson).
-++	+ document some portability issues in man/curs_getyx.3x
-++
-++20070505
-++	+ fix a bug in Ada95/samples/ncurses which caused a variable to
-++	  become uninitialized in the "b" test.
-++	+ fix Ada95/gen/Makefile.in adahtml rule to account for recent
-++	  movement of files, fix a few incorrect manpage references in the
-++	  generated html.
-++	+ add Ada95 binding to _nc_freeall() as Curses_Free_All to help with
-++	  memory-checking.
-++	+ correct some functions in Ada95 binding which were using return value
-++	  from C where none was returned:  idcok(), immedok() and wtimeout().
-++	+ amend recent changes for Ada95 binding to make it build with
-++	  Cygwin's linker, e.g., with configure options
-++		--enable-broken-linker --with-ticlib
-++
-++20070428
-++	+ add a configure check for gcc's options for inlining, use that to
-++	  quiet a warning message where gcc's default behavior changed from
-++	  3.x to 4.x.
-++	+ improve warning message when checking if GPM is linked to curses
-++	  library by not warning if its use of "wgetch" is via a weak symbol.
-++	+ add loader options when building with static libraries to ensure that
-++	  an installed shared library for ncurses does not conflict.  This is
-++	  reported as problem with Tru64, but could affect other platforms
-++	  (report Martin Mokrejs, analysis by Tim Mooney).
-++	+ fix build on cygwin after recent ticlib/termlib changes, i.e.,
-++	  + adjust TINFO_SUFFIX value to work with cygwin's dll naming
-++	  + revert a change from 20070303 which commented out dependency of
-++	    SHLIB_LIST in form/menu/panel/c++ libraries.
-++	+ fix initialization of ripoff stack pointer (cf: 20070421).
-++
-++20070421
-++	+ move most static variables into structures _nc_globals and
-++	  _nc_prescreen, to simplify storage.
-++	+ add/use configure script macro CF_SIG_ATOMIC_T, use the corresponding
-++	  type for data manipulated by signal handlers (prompted by comments
-++	  in mailing.openbsd.bugs newsgroup).
-++	+ modify CF_WITH_LIBTOOL to allow one to pass options such as -static
-++	  to the libtool create- and link-operations.
-++
-++20070414
-++	+ fix whitespace in curs_opaque.3x which caused a spurious ';' in
-++	  the installed aliases (report by Peter Santoro).
-++	+ fix configure script to not try to generate adacurses-config when
-++	  Ada95 tree is not built.
-++
-++20070407
-++	+ add man/curs_legacy.3x, man/curs_opaque.3x
-++	+ fix acs_map binding for Ada95 when --enable-reentrant is used.
-++	+ add adacurses-config to the Ada95 install, based on version from
-++	  FreeBSD port, in turn by Juergen Pfeifer in 2000 (prompted by
-++	  comment on comp.lang.ada newsgroup).
-++	+ fix includes in c++ binding to build with Intel compiler
-++	  (cf: 20061209).
-++	+ update install rule in Ada95 to use mkdirs.sh
-++	> other fixes prompted by inspection for Coverity report:
-++	+ modify ifdef's for c++ binding to use try/catch/throw statements
-++	+ add a null-pointer check in tack/ansi.c request_cfss()
-++	+ fix a memory leak in ncurses/base/wresize.c
-++	+ corrected check for valid memu/meml capabilities in
-++	  progs/dump_entry.c when handling V_HPUX case.
-++	> fixes based on Coverity report:
-++	+ remove dead code in test/bs.c
-++	+ remove dead code in test/demo_defkey.c
-++	+ remove an unused assignment in progs/infocmp.c
-++	+ fix a limit check in tack/ansi.c tools_charset()
-++	+ fix tack/ansi.c tools_status() to perform the VT320/VT420
-++	  tests in request_cfss().  The function had exited too soon.
-++	+ fix a memory leak in tic.c's make_namelist()
-++	+ fix a couple of places in tack/output.c which did not check for EOF.
-++	+ fix a loop-condition in test/bs.c
-++	+ add index checks in lib_color.c for color palettes
-++	+ add index checks in progs/dump_entry.c for version_filter() handling
-++	  of V_BSD case.
-++	+ fix a possible null-pointer dereference in copywin()
-++	+ fix a possible null-pointer dereference in waddchnstr()
-++	+ add a null-pointer check in _nc_expand_try()
-++	+ add a null-pointer check in tic.c's make_namelist()
-++	+ add a null-pointer check in _nc_expand_try()
-++	+ add null-pointer checks in test/cardfile.c
-++	+ fix a double-free in ncurses/tinfo/trim_sgr0.c
-++	+ fix a double-free in ncurses/base/wresize.c
-++	+ add try/catch block to c++/cursesmain.cc
-++
-++20070331
-++	+ modify Ada95 binding to build with --enable-reentrant by wrapping
-++	  global variables (bug: acs_map does not yet work).
-++	+ modify Ada95 binding to use the new access-functions, allowing it
-++	  to build/run when NCURSES_OPAQUE is set.
-++	+ add access-functions and macros to return properties of the WINDOW
-++	  structure, e.g., when NCURSES_OPAQUE is set.
-++	+ improved install-sh's quoting.
-++	+ use mkdirs.sh rather than mkinstalldirs, e.g., to use fixes from
-++	  other programs.
-++
-++20070324
-++	+ eliminate part of the direct use of WINDOW data from Ada95 interface.
-++	+ fix substitutions for termlib filename to make configure option
-++	  --enable-reentrant work with --with-termlib.
-++	+ change a constructor for NCursesWindow to allow compiling with
-++	  NCURSES_OPAQUE set, since we cannot pass a reference to
-++	  an opaque pointer.
-++
-++20070317
-++	+ ignore --with-chtype=unsigned since unsigned is always added to
-++	  the type in curses.h; do the same for --with-mmask-t.
-++	+ change warning regarding --enable-ext-colors and wide-character
-++	  in the configure script to an error.
-++	+ tweak error message in CF_WITH_LIBTOOL to distinguish other programs
-++	  such as Darwin's libtool program (report by Michail Vidiassov)
-++	+ modify edit_man.sh to allow for multiple substitutions per line.
-++	+ set locale in misc/ncurses-config.in since it uses a range
-++	+ change permissions libncurses++.a install (report by Michail
-++	  Vidiassov).
-++	+ corrected length of temporary buffer in wide-character version
-++	  of set_field_buffer() (related to report by Bryan Christ).
-++
-++20070311
-++	+ fix mk-1st.awk script install_shlib() function, broken in 20070224
-++	  changes for cygwin (report by  Michail Vidiassov).
-++
-++20070310
-++	+ increase size of array in _nc_visbuf2n() to make "tic -v" work
-++	  properly in its similar_sgr() function (report/analysis by Peter
-++	  Santoro).
-++	+ add --enable-reentrant configure option for ongoing changes to
-++	  implement a reentrant version of ncurses:
-++	  + libraries are suffixed with "t"
-++	  + wrap several global variables (curscr, newscr, stdscr, ttytype,
-++	    COLORS, COLOR_PAIRS, COLS, ESCDELAY, LINES and TABSIZE) as
-++	    functions returning values stored in SCREEN or cur_term.
-++	  + move some initialization (LINES, COLS) from lib_setup.c,
-++	    i.e., setupterm() to _nc_setupscreen(), i.e., newterm().
-++
-++20070303
-++	+ regenerated html documentation.
-++	+ add NCURSES_OPAQUE symbol to curses.h, will use to make structs
-++	  opaque in selected configurations.
-++	+ move the chunk in lib_acs.c which resets acs capabilities when
-++	  running on a terminal whose locale interferes with those into
-++	  _nc_setupscreen(), so the libtinfo/libtinfow files can be made
-++	  identical (requested by Miroslav Lichvar).
-++	+ do not use configure variable SHLIB_LIBS for building libraries
-++	  outside the ncurses directory, since that symbol is customized
-++	  only for that directory, and using it introduces an unneeded
-++	  dependency on libdl (requested by Miroslav Lichvar).
-++	+ modify mk-1st.awk so the generated makefile rules for linking or
-++	  installing shared libraries do not first remove the library, in
-++	  case it is in use, e.g., libncurses.so by /bin/sh (report by Jeff
-++	  Chua).
-++	+ revised section "Using NCURSES under XTERM" in ncurses-intro.html
-++	  (prompted by newsgroup comment by Nick Guenther).
-++
-++20070224
-++	+ change internal return codes of _nc_wgetch() to check for cases
-++	  where KEY_CODE_YES should be returned, e.g., if a KEY_RESIZE was
-++	  ungetch'd, and read by wget_wch().
-++	+ fix static-library build broken in 20070217 changes to remove "-ldl"
-++	  (report by Miroslav Lichvar).
-++	+ change makefile/scripts for cygwin to allow building termlib.
-++	+ use Form_Hook in manpages to match form.h
-++	+ use Menu_Hook in manpages, as well as a few places in menu.h
-++	+ correct form- and menu-manpages to use specific Field_Options,
-++	  Menu_Options and Item_Options types.
-++	+ correct prototype for _tracechar() in manpage (cf: 20011229).
-++	+ correct prototype for wunctrl() in manpage.
-++
-++20070217
-++	+ fixes for $(TICS_LIST) in ncurses/Makefile (report by Miroslav
-++	  Lichvar).
-++	+ modify relinking of shared libraries to apply only when rpath is
-++	  enabled, and add --disable-relink option which can be used to
-++	  disable the feature altogether (reports by Michail Vidiassov,
-++	  Adam J Richter).
-++	+ fix --with-termlib option for wide-character configuration, stripping
-++	  the "w" suffix in one place (report by Miroslav Lichvar).
-++	+ remove "-ldl" from some library lists to reduce dependencies in
-++	  programs (report by Miroslav Lichvar).
-++	+ correct description of --enable-signed-char in configure --help
-++	  (report by Michail Vidiassov).
-++	+ add pattern for GNU/kFreeBSD configuration to CF_XOPEN_SOURCE,
-++	  which matches an earlier change to CF_SHARED_OPTS, from xterm #224
-++	  fixes.
-++	+ remove "${DESTDIR}" from -install_name option used for linking
-++	  shared libraries on Darwin (report by Michail Vidiassov).
-++
-++20070210
-++	+ add test/inchs.c, test_inch_wide.c, to test win_wchnstr().
-++	+ remove libdl from library list for termlib (report by Miroslav
-++	  Lichvar).
-++	+ fix configure.in to allow --without-progs --with-termlib (patch by
-++	  Miroslav Lichvar).
-++	+ modify win_wchnstr() to ensure that only a base cell is returned
-++	  for each multi-column character (prompted by report by Wei Kong
-++	  regarding change in mvwin_wch() cf: 20041023).
-++
-++20070203
-++	+ modify fix_wchnstr() in form library to strip attributes (and color)
-++	  from the cchar_t array (field cells) read from a field's window.
-++	  Otherwise, when copying the field cells back to the window, the
-++	  associated color overrides the field's background color (report by
-++	  Ricardo Cantu).
-++	+ improve tracing for form library, showing created forms, fields, etc.
-++	+ ignore --enable-rpath configure option if --with-shared was omitted.
-++	+ add _nc_leaks_tinfo(), _nc_free_tic(), _nc_free_tinfo() entrypoints
-++	  to allow leak-checking when both tic- and tinfo-libraries are built.
-++	+ drop CF_CPP_VSCAN_FUNC macro from configure script, since C++ binding
-++	  no longer relies on it.
-++	+ disallow combining configure script options --with-ticlib and
-++	  --enable-termcap (report by Rong-En Fan).
-++	+ remove tack from ncurses tree.
-++
-++20070128
-++	+ fix typo in configure script that broke --with-termlib option
-++	  (report by Rong-En Fan).
-++
-++20070127
-++	+ improve fix for FreeBSD gnu/98975, to allow for null pointer passed
-++	  to tgetent() (report by Rong-en Fan).
-++	+ update tack/HISTORY and tack/README to tell how to build it after
-++	  it is removed from the ncurses tree.
-++	+ fix configure check for libtool's version to trim blank lines
-++	  (report by sci-fi@hush.ai).
-++	+ review/eliminate other original-file artifacts in cursesw.cc, making
-++	  its license consistent with ncurses.
-++	+ use ncurses vw_scanw() rather than reading into a fixed buffer in
-++	  the c++ binding for scanw() methods (prompted by report by Nuno Dias).
-++	+ eliminate fixed-buffer vsprintf() calls in c++ binding.
-++
-++20070120
-++	+ add _nc_leaks_tic() to separate leak-checking of tic library from
-++	  term/ncurses libraries, and thereby eliminate a library dependency.
-++	+ fix test/mk-test.awk to ignore blank lines.
-++	+ correct paths in include/headers, for --srcdir (patch by Miroslav
-++	  Lichvar).
-++
-++20070113
-++	+ add a break-statement in misc/shlib to ensure that it exits on the
-++	  _first_ matched directory (report by Paul Novak).
-++	+ add tack/configure, which can be used to build tack outside the
-++	  ncurses build-tree.
-++	+ add --with-ticlib option, to build/install the tic-support functions
-++	  in a separate library (suggested by Miroslav Lichvar).
-++
-++20070106
-++	+ change MKunctrl.awk to reduce relocation table for unctrl.o
-++	+ change MKkeyname.awk to reduce relocation table for keyname.o
-++	  (patch by Miroslav Lichvar).
-++
-++20061230
-++	+ modify configure check for libtool's version to trim blank lines
-++	  (report by sci-fi@hush.ai).
-++	+ modify some modules to allow them to be reentrant if _REENTRANT is
-++	  defined: lib_baudrate.c, resizeterm.c (local data only)
-++	+ eliminate static data from some modules: add_tries.c, hardscroll.c,
-++	  lib_ttyflags.c, lib_twait.c
-++	+ improve manpage install to add aliases for the transformed program
-++	  names, e.g., from --program-prefix.
-++	+ used linklint to verify links in the HTML documentation, made fixes
-++	  to manpages as needed.
-++	+ fix a typo in curs_mouse.3x (report by William McBrine).
-++	+ fix install-rule for ncurses5-config to make the bin-directory.
-++
-++20061223
-++	+ modify configure script to omit the tic (terminfo compiler) support
-++	  from ncurses library if --without-progs option is given.
-++	+ modify install rule for ncurses5-config to do this via "install.libs"
-++	+ modify shared-library rules to allow FreeBSD 3.x to use rpath.
-++	+ update config.guess, config.sub
-++
-+ 20061217 5.6 release for upload to ftp.gnu.org
-+ 
-+-20061217 
-++20061217
-+ 	+ add ifdef's for <wctype.h> for HPUX, which has the corresponding
-+ 	  definitions in <wchar.h>.
-+ 	+ revert the va_copy() change from 20061202, since it was neither
-+@@ -62,7 +557,7 @@
-+ 	+ modify configure --with-gpm option to allow it to accept a parameter,
-+ 	  i.e., the name of the dynamic GPM library to load via dlopen()
-+ 	  (requested by Bryan Henderson).
-+-	+ add configure option --with-valgrind (from vile).
-++	+ add configure option --with-valgrind, changes from vile.
-+ 	+ modify configure script AC_TRY_RUN and AC_TRY_LINK checks to use
-+ 	  'return' in preference to 'exit()'.
-+ 
-+@@ -1524,7 +2019,8 @@
-+ 20031108
-+ 	+ add DJGPP to special case of DOS-style drive letters potentially
-+ 	  appearing in TERMCAP environment variable.
-+-	+ fix some spelling in comments (reports by jmc, Jonathon Gray).
-++	+ fix some spelling in comments (reports by Jason McIntyre, Jonathon
-++	  Gray).
-+ 	+ update config.guess, config.sub
-+ 
-+ 20031101
-+@@ -1814,7 +2310,7 @@
-+ 	  "--srcdir" work (report by Warren L Dodge).
-+ 	+ correct missing definition of $(CC) in Ada95/gen/Makefile.in
-+ 	  (reported by Warren L Dodge <warrend@mdhost.cse.tek.com>).
-+-	+ fix typos and whitespace in manpages (patch by jmc
-++	+ fix typos and whitespace in manpages (patch by Jason McIntyre
-+ 	  <jmc@prioris.mini.pw.edu.pl>).
-+ 
-+ 20030503
-+@@ -3449,7 +3945,7 @@
-+ 
-+ 20000923
-+ 	+ modify rs2 capability in xterm-r6 and similar where cursor
-+-	  save/restore bracketed the sequence for resetting video attributes. 
-++	  save/restore bracketed the sequence for resetting video attributes.
-+ 	  The cursor restore would undo that (report by John Hawkinson
-+ 	  <jhawk@MIT.EDU> (see NetBSD misc/11052)).
-+ 	+ using parameter check added to tic, corrected 27 typos in
-+@@ -4266,7 +4762,7 @@
-+ 	  <bledp@voila.fr>)).
-+ 	+ change renaming of dft_fgbg.3x to use_default_colors.3ncurses in
-+ 	  man_db.renames, since Debian is not concerned with 14-character
-+-	  filename limitation (from Debian bug report by Josip Rodin
-++	  filename limitation (Debian bug report by Josip Rodin
-+ 	  <joy@cibalia.gkvk.hr>).
-+ 	+ corrected scoansi terminfo entry by testing with scoterm and console.
-+ 	+ revert change from 990614 to terminal_interface-curses-forms.ads.m4,
-+@@ -5309,7 +5805,7 @@
-+ 
-+ 980321
-+ 	+ revise configure macro CF_SPEED_TYPE so that termcap.h has speed_t
-+-	  declared (from Adam J. Richter <adam@yggdrasil.com>)
-++	  declared (from Adam J Richter <adam@yggdrasil.com>)
-+ 	+ remove spurious curs_set() call from leaveok() (J T Conklin).
-+ 	+ corrected handling leaveok() in doupdate() (patch by Alexander V.
-+ 	  Lukyanov).
-+Index: TO-DO
-+Prereq:  1.48 
-+--- ncurses-5.6/TO-DO	2006-10-28 19:49:16.000000000 +0000
-++++ ncurses-5.6-20071201/TO-DO	2007-02-03 16:29:17.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ -------------------------------------------------------------------------------
-+--- Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.               --
-++-- Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.               --
-+ --                                                                           --
-+ -- Permission is hereby granted, free of charge, to any person obtaining a   --
-+ -- copy of this software and associated documentation files (the             --
-+@@ -25,7 +25,7 @@
-+ -- sale, use or other dealings in this Software without prior written        --
-+ -- authorization.                                                            --
-+ -------------------------------------------------------------------------------
-+--- $Id: TO-DO,v 1.48 2006/10/28 19:49:16 tom Exp $
-++-- $Id: TO-DO,v 1.49 2007/02/03 16:29:17 tom Exp $
-+ -------------------------------------------------------------------------------
-+ 
-+ SHORT-TERM TO-DO ITEMS:
-+@@ -58,9 +58,6 @@
-+ + The window classes defined in the c++ subdirectory need documentation.  Some
-+   C++ programmer could earn a lot of good karma by doing this...
-+ 
-+-+ The resizeterm() function does not handle ripped-off lines such as that done
-+-  for the slk_XXX functions.
-+-
-+ + vid_attr() should support the set_a_attributes (sgr1) string, but does not. 
-+   There appear to be no terminals that require that functionality.
-+ 
-+@@ -75,19 +72,19 @@
-+   ncurses/tty/lib_tstp.c .
-+ 
-+ + In theory, vwprintw and vwscanf are supposed to use the older varargs.h
-+-  interface for handling variadic argument lists.  Linux doesn't have
-+-  varargs.h, it has the newer X/Open-standard stdargs.h equivalent.  So these
-+-  functions use stdargs instead.  This is unlikely to be a problem unless
-+-  you're building ncurses on a System V old enough to only have varargs.h. 
-+-  (Solaris 2.5.1 uses the stdarg.h binding as well).
-++  interface for handling variadic argument lists (and are deprecated by X/Open
-++  for that reason).  Linux doesn't have varargs.h, it has the newer
-++  X/Open-standard stdargs.h equivalent.  So these functions use stdargs
-++  instead.  This is unlikely to be a problem unless you're building ncurses on
-++  a System V old enough to only have varargs.h.  (Solaris 2.5.1 used the
-++  stdarg.h binding as well).
-+ 
-+ + If you're using a BSD earlier than 4.4BSD, or a Linux old enough not to have
-+   a native vsscanf(3) in its library, vwscanw() will not work.  You lose.  (It
-+   should work on any System V, however).  If you want to fix this, add an
-+   implementation to ncurses/vsscanf.c.
-+ 
-+-+ The C++ binding fails to build with a few C++ compilers, mainly with
-+-  configure script problems with vsscanf().
-+++ The C++ binding fails to build with a few C++ compilers.
-+ 
-+ + terminfo.5 does not format with the SunOS (and most other platform's) tbl
-+   utility because it relies on a diversion for each table entry.  Get the
-+@@ -106,7 +103,7 @@
-+ 
-+ 1. Extended COSE conformance
-+ 
-+-There is an XPG4 standard recently released which describes a superset
-++There is an XPG4 standard released in 1996 which describes a superset
-+ of the SVr4 API.  The library is BASE conformant with this standard.
-+ We would like to make ncurses fully conformant at the EXTENDED level
-+ supporting internationalization.
-+Index: aclocal.m4
-+Prereq:  1.407 
-+--- ncurses-5.6/aclocal.m4	2006-12-17 16:12:38.000000000 +0000
-++++ ncurses-5.6-20071201/aclocal.m4	2007-12-01 20:02:42.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ dnl***************************************************************************
-+-dnl Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++dnl Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+ dnl                                                                          *
-+ dnl Permission is hereby granted, free of charge, to any person obtaining a  *
-+ dnl copy of this software and associated documentation files (the            *
-+@@ -28,7 +28,7 @@
-+ dnl
-+ dnl Author: Thomas E. Dickey 1995-on
-+ dnl
-+-dnl $Id: aclocal.m4,v 1.407 2006/12/17 16:12:38 tom Exp $
-++dnl $Id: aclocal.m4,v 1.442 2007/12/01 20:02:42 tom Exp $
-+ dnl Macros used in NCURSES auto-configuration script.
-+ dnl
-+ dnl These macros are maintained separately from NCURSES.  The copyright on
-+@@ -168,6 +168,99 @@
-+ 
-+ ])dnl
-+ dnl ---------------------------------------------------------------------------
-++dnl CF_ADD_INCDIR version: 8 updated: 2007/07/30 19:22:58
-++dnl -------------
-++dnl Add an include-directory to $CPPFLAGS.  Don't add /usr/include, since it's
-++dnl redundant.  We don't normally need to add -I/usr/local/include for gcc,
-++dnl but old versions (and some misinstalled ones) need that.  To make things
-++dnl worse, gcc 3.x may give error messages if -I/usr/local/include is added to
-++dnl the include-path).
-++AC_DEFUN([CF_ADD_INCDIR],
-++[
-++if test -n "$1" ; then
-++  for cf_add_incdir in $1
-++  do
-++	while test $cf_add_incdir != /usr/include
-++	do
-++	  if test -d $cf_add_incdir
-++	  then
-++		cf_have_incdir=no
-++		if test -n "$CFLAGS$CPPFLAGS" ; then
-++		  # a loop is needed to ensure we can add subdirs of existing dirs
-++		  for cf_test_incdir in $CFLAGS $CPPFLAGS ; do
-++			if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then
-++			  cf_have_incdir=yes; break
-++			fi
-++		  done
-++		fi
-++
-++		if test "$cf_have_incdir" = no ; then
-++          if test "$cf_add_incdir" = /usr/local/include ; then
-++			if test "$GCC" = yes
-++			then
-++			  cf_save_CPPFLAGS=$CPPFLAGS
-++			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
-++			  AC_TRY_COMPILE([#include <stdio.h>],
-++				  [printf("Hello")],
-++				  [],
-++				  [cf_have_incdir=yes])
-++			  CPPFLAGS=$cf_save_CPPFLAGS
-++			fi
-++		  fi
-++		fi
-++
-++		if test "$cf_have_incdir" = no ; then
-++		  AC_VERBOSE(adding $cf_add_incdir to include-path)
-++		  ifelse($2,,CPPFLAGS,$2)="-I$cf_add_incdir $ifelse($2,,CPPFLAGS,[$]$2)"
-++
-++          cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
-++          test "$cf_top_incdir" = "$cf_add_incdir" && break
-++          cf_add_incdir="$cf_top_incdir"
-++		else
-++		  break
-++		fi
-++	  fi
-++	done
-++  done
-++fi
-++])dnl
-++dnl ---------------------------------------------------------------------------
-++dnl CF_ADD_LIBDIR version: 5 updated: 2007/07/30 19:12:03
-++dnl -------------
-++dnl	Adds to the library-path
-++dnl
-++dnl	Some machines have trouble with multiple -L options.
-++dnl
-++dnl $1 is the (list of) directory(s) to add
-++dnl $2 is the optional name of the variable to update (default LDFLAGS)
-++dnl
-++AC_DEFUN([CF_ADD_LIBDIR],
-++[
-++if test -n "$1" ; then
-++  for cf_add_libdir in $1
-++  do
-++    if test $cf_add_libdir = /usr/lib ; then
-++      :
-++    elif test -d $cf_add_libdir
-++    then
-++      cf_have_libdir=no
-++      if test -n "$LDFLAGS$LIBS" ; then
-++        # a loop is needed to ensure we can add subdirs of existing dirs
-++        for cf_test_libdir in $LDFLAGS $LIBS ; do
-++          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-++            cf_have_libdir=yes; break
-++          fi
-++        done
-++      fi
-++      if test "$cf_have_libdir" = no ; then
-++        AC_VERBOSE(adding $cf_add_libdir to library-path)
-++        ifelse($2,,LDFLAGS,$2)="-L$cf_add_libdir $ifelse($2,,LDFLAGS,[$]$2)"
-++      fi
-++    fi
-++  done
-++fi
-++])dnl
-++dnl ---------------------------------------------------------------------------
-+ dnl CF_ANSI_CC_CHECK version: 9 updated: 2001/12/30 17:53:34
-+ dnl ----------------
-+ dnl This is adapted from the macros 'fp_PROG_CC_STDC' and 'fp_C_PROTOTYPES'
-+@@ -612,6 +705,50 @@
-+ 
-+ ])dnl
-+ dnl ---------------------------------------------------------------------------
-++dnl CF_CHECK_GPM_WGETCH version: 1 updated: 2007/04/28 14:38:06
-++dnl -------------------
-++dnl Check if GPM is already linked with curses.  If so - and if the linkage
-++dnl is not "weak" - warn about this because it can create problems linking
-++dnl applications with ncurses.
-++AC_DEFUN([CF_CHECK_GPM_WGETCH],[
-++AC_CHECK_LIB(gpm,Gpm_Wgetch,[
-++
-++AC_CACHE_CHECK(if GPM is weakly bound to curses library, cf_cv_check_gpm_wgetch,[
-++cf_cv_check_gpm_wgetch=unknown
-++if test "$cross_compiling" != yes ; then
-++
-++cat >conftest.$ac_ext <<CF_EOF
-++#include <gpm.h>
-++int main()
-++{
-++	Gpm_Wgetch();
-++	${cf_cv_main_return:-return}(0);
-++}
-++CF_EOF
-++
-++	cf_save_LIBS="$LIBS"
-++	# This only works if we can look at the symbol table.  If a shared
-++	# library is stripped for install, we cannot use that.  So we're forced
-++	# to rely on the static library, noting that some packagers may not
-++	# include it.
-++	LIBS="-static -lgpm -dynamic $LIBS"
-++	if AC_TRY_EVAL(ac_compile) ; then
-++		if AC_TRY_EVAL(ac_link) ; then
-++			cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[[vVwW]]\>'`
-++			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
-++			test -z "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=no
-++		fi
-++	fi
-++	rm -f conftest*
-++	LIBS="$cf_save_LIBS"
-++fi
-++])
-++
-++if test "$cf_cv_check_gpm_wgetch" != yes ; then
-++	AC_MSG_WARN(GPM library is already linked with curses - read the FAQ)
-++fi
-++])])dnl
-++dnl ---------------------------------------------------------------------------
-+ dnl CF_CPP_PARAM_INIT version: 4 updated: 2001/04/07 22:31:18
-+ dnl -----------------
-+ dnl Check if the C++ compiler accepts duplicate parameter initialization.  This
-+@@ -703,82 +840,36 @@
-+ test "$cf_cv_cpp_static_cast" = yes && AC_DEFINE(CPP_HAS_STATIC_CAST)
-+ ])dnl
-+ dnl ---------------------------------------------------------------------------
-+-dnl CF_CPP_VSCAN_FUNC version: 5 updated: 2001/12/02 01:39:28
-+-dnl -----------------
-+-dnl Check if the g++ compiler supports vscan function (not a standard feature).
-+-AC_DEFUN([CF_CPP_VSCAN_FUNC],
-+-[
-+-if test -n "$CXX"; then
-+-
-+-AC_LANG_SAVE
-+-AC_LANG_CPLUSPLUS
-+-AC_CHECK_HEADERS(strstream.h)
-+-
-+-AC_CACHE_CHECK(if $CXX supports vscan function,cf_cv_cpp_vscan_func,[
-+-	for cf_vscan_func in strstream strstream_cast stdio
-+-	do
-+-	case $cf_vscan_func in #(vi
-+-	stdio)		cf_vscan_defs=USE_STDIO_VSCAN ;; #(vi
-+-	strstream)	cf_vscan_defs=USE_STRSTREAM_VSCAN ;;
-+-	strstream_cast)	cf_vscan_defs=USE_STRSTREAM_VSCAN_CAST ;;
-+-	esac
-+-	AC_TRY_LINK([
-+-#include <stdio.h>
-+-#include <stdarg.h>
-+-#define $cf_vscan_defs 1
-+-#if defined(USE_STDIO_VSCAN)
-+-#elif defined(HAVE_STRSTREAM_H) && defined(USE_STRSTREAM_VSCAN)
-+-#include <strstream.h>
-+-#endif
-+-
-+-int scanw(const char* fmt, ...)
-+-{
-+-    int result = -1;
-+-    char buf[BUFSIZ];
-+-
-+-    va_list args;
-+-    va_start(args, fmt);
-+-#if defined(USE_STDIO_VSCAN)
-+-    if (::vsscanf(buf, fmt, args) != -1)
-+-	result = 0;
-+-#elif defined(USE_STRSTREAM_VSCAN)
-+-    strstreambuf ss(buf, sizeof(buf));
-+-    if (ss.vscan(fmt, args) != -1)
-+-	result = 0;
-+-#elif defined(USE_STRSTREAM_VSCAN_CAST)
-+-    strstreambuf ss(buf, sizeof(buf));
-+-    if (ss.vscan(fmt, (_IO_va_list)args) != -1)
-+-	result = 0;
-+-#else
-+-#error case $cf_vscan_func failed
-+-#endif
-+-    va_end(args);
-+-    return result;
-+-}
-+-],[int tmp, foo = scanw("%d", &tmp)],
-+-	[cf_cv_cpp_vscan_func=$cf_vscan_func; break],
-+-	[cf_cv_cpp_vscan_func=no])
-+-	test "$cf_cv_cpp_vscan_func" != no && break
-+-	done
-+-])
-+-
-+-AC_LANG_RESTORE
-++dnl CF_C_INLINE version: 2 updated: 2007/08/11 14:09:50
-++dnl -----------
-++dnl Check if the C compiler supports "inline".
-++dnl $1 is the name of a shell variable to set if inline is supported
-++dnl $2 is the threshold for gcc 4.x's option controlling maximum inline size
-++AC_DEFUN([CF_C_INLINE],[
-++AC_C_INLINE
-++$1=
-++if test "$ac_cv_c_inline" != no ; then
-++  $1=inline
-++  if test "$INTEL_COMPILER" = yes
-++  then
-++    :
-++  elif test "$GCC" = yes
-++  then
-++    AC_CACHE_CHECK(if gcc supports options to tune inlining,cf_cv_gcc_inline,[
-++      cf_save_CFLAGS=$CFLAGS
-++      CFLAGS="$CFLAGS --param max-inline-insns-single=$2"
-++      AC_TRY_COMPILE([inline int foo(void) { return 1; }],
-++      [${cf_cv_main_return:-return} foo()],
-++      [cf_cv_gcc_inline=yes],
-++      [cf_cv_gcc_inline=no])
-++      CFLAGS=$cf_save_CFLAGS
-++    ])
-++    if test "$cf_cv_gcc_inline" = yes ; then
-++        CF_ADD_CFLAGS([--param max-inline-insns-single=$2])
-++    fi
-++  fi
-+ fi
-+-
-+-case $cf_cv_cpp_vscan_func in #(vi
-+-stdio) #(vi
-+-	AC_DEFINE(CPP_HAS_VSCAN_FUNC)
-+-	AC_DEFINE(USE_STDIO_VSCAN)
-+-	;;
-+-strstream)
-+-	AC_DEFINE(CPP_HAS_VSCAN_FUNC)
-+-	AC_DEFINE(USE_STRSTREAM_VSCAN)
-+-	;;
-+-strstream_cast)
-+-	AC_DEFINE(CPP_HAS_VSCAN_FUNC)
-+-	AC_DEFINE(USE_STRSTREAM_VSCAN_CAST)
-+-	;;
-+-esac
-++AC_SUBST($1)
-+ ])dnl
-+ dnl ---------------------------------------------------------------------------
-+ dnl CF_DIRNAME version: 4 updated: 2002/12/21 19:25:52
-+@@ -1070,7 +1161,7 @@
-+ 
-+ ])dnl
-+ dnl ---------------------------------------------------------------------------
-+-dnl CF_GCC_ATTRIBUTES version: 10 updated: 2005/05/28 13:16:28
-++dnl CF_GCC_ATTRIBUTES version: 11 updated: 2007/07/29 09:55:12
-+ dnl -----------------
-+ dnl Test for availability of useful gcc __attribute__ directives to quiet
-+ dnl compiler warnings.  Though useful, not all are supported -- and contrary
-+@@ -1097,7 +1188,7 @@
-+ then
-+ 	AC_CHECKING([for $CC __attribute__ directives])
-+ cat > conftest.$ac_ext <<EOF
-+-#line __oline__ "configure"
-++#line __oline__ "${as_me-configure}"
-+ #include "confdefs.h"
-+ #include "conftest.h"
-+ #include "conftest.i"
-+@@ -1159,7 +1250,7 @@
-+ fi
-+ ])dnl
-+ dnl ---------------------------------------------------------------------------
-+-dnl CF_GCC_WARNINGS version: 20 updated: 2005/08/06 18:37:29
-++dnl CF_GCC_WARNINGS version: 22 updated: 2007/07/29 09:55:12
-+ dnl ---------------
-+ dnl Check if the compiler supports useful warning options.  There's a few that
-+ dnl we don't use, simply because they're too noisy:
-+@@ -1184,7 +1275,7 @@
-+ CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
-+ 
-+ cat > conftest.$ac_ext <<EOF
-+-#line __oline__ "configure"
-++#line __oline__ "${as_me-configure}"
-+ int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == 0) ; }
-+ EOF
-+ 
-+@@ -1205,7 +1296,7 @@
-+ 	AC_CHECKING([for $CC warning options])
-+ 	cf_save_CFLAGS="$CFLAGS"
-+ 	EXTRA_CFLAGS="-Wall"
-+-	for cf_opt in $1 \
-++	for cf_opt in \
-+ 		wd1419 \
-+ 		wd1682 \
-+ 		wd1683 \
-+@@ -1561,11 +1652,24 @@
-+ AC_SUBST(EXTRA_CXXFLAGS)
-+ ])dnl
-+ dnl ---------------------------------------------------------------------------
-+-dnl CF_HASHED_DB version: 1 updated: 2006/08/19 09:16:14
-++dnl CF_HASHED_DB version: 3 updated: 2007/11/24 17:43:37
-+ dnl ------------
-+ dnl Look for an instance of the Berkeley hashed database.
-++dnl
-++dnl $1 = optional parameter, to specify install-prefix for the database.
-+ AC_DEFUN([CF_HASHED_DB],
-+ [
-++ifelse([$1],,,[
-++case $1 in #(vi
-++yes|*able*) #(vi
-++    ;;
-++*)
-++    if test -d "$1" ; then
-++        CF_ADD_INCDIR($1/include)
-++        CF_ADD_LIBDIR($1/lib)
-++    fi
-++esac
-++])
-+ AC_CHECK_HEADER(db.h,[
-+ CF_HASHED_DB_VERSION
-+ if test "$cf_cv_hashed_db_version" = unknown ; then
-+@@ -1583,7 +1687,7 @@
-+ ])
-+ ])dnl
-+ dnl ---------------------------------------------------------------------------
-+-dnl CF_HASHED_DB_LIBS version: 6 updated: 2006/12/16 12:33:30
-++dnl CF_HASHED_DB_LIBS version: 7 updated: 2007/12/01 15:01:37
-+ dnl -----------------
-+ dnl Given that we have the header and version for hashed database, find the
-+ dnl library information.
-+@@ -1591,7 +1695,7 @@
-+ [
-+ AC_CACHE_CHECK(for db libraries, cf_cv_hashed_db_libs,[
-+ cf_cv_hashed_db_libs=unknown
-+-for cf_db_libs in db$cf_cv_hashed_db_version db ''
-++for cf_db_libs in db$cf_cv_hashed_db_version db-$cf_cv_hashed_db_version db ''
-+ do
-+ 	cf_save_libs="$LIBS"
-+ 	if test -n "$cf_db_libs"; then
-+@@ -1655,7 +1759,7 @@
-+ ])
-+ ])dnl
-+ dnl ---------------------------------------------------------------------------
-+-dnl CF_HASHED_DB_VERSION version: 2 updated: 2006/08/19 15:12:49
-++dnl CF_HASHED_DB_VERSION version: 3 updated: 2007/12/01 15:01:37
-+ dnl --------------------
-+ dnl Given that we have the header file for hashed database, find the version
-+ dnl information.
-+@@ -1664,7 +1768,7 @@
-+ AC_CACHE_CHECK(for version of db, cf_cv_hashed_db_version,[
-+ cf_cv_hashed_db_version=unknown
-+ 
-+-for cf_db_version in 1 2 3 4
-++for cf_db_version in 1 2 3 4 5
-+ do
-+ 	CF_MSG_LOG(checking for db version $cf_db_version)
-+ 	AC_TRY_COMPILE([
-+@@ -1778,7 +1882,7 @@
-+ test "$cf_cv_have_isascii" = yes && AC_DEFINE(HAVE_ISASCII)
-+ ])dnl
-+ dnl ---------------------------------------------------------------------------
-+-dnl CF_LARGEFILE version: 6 updated: 2006/09/23 19:07:52
-++dnl CF_LARGEFILE version: 7 updated: 2007/06/02 11:58:50
-+ dnl ------------
-+ dnl Add checks for large file support.
-+ AC_DEFUN([CF_LARGEFILE],[
-+@@ -1796,6 +1900,7 @@
-+ 	# the config.h
-+ 	test "$ac_cv_sys_large_files"      != no && CPPFLAGS="$CPPFLAGS -D_LARGE_FILES "
-+ 	test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
-++	test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
-+ 
-+ 	AC_CACHE_CHECK(whether to use struct dirent64, cf_cv_struct_dirent64,[
-+ 		AC_TRY_COMPILE([
-+@@ -1816,6 +1921,48 @@
-+ ])
-+ ])
-+ dnl ---------------------------------------------------------------------------
-++dnl CF_LDFLAGS_STATIC version: 2 updated: 2007/04/28 15:25:27
-++dnl -----------------
-++dnl Check for compiler/linker flags used to temporarily force usage of static
-++dnl libraries.  This depends on the compiler and platform.  Use this to help
-++dnl ensure that the linker picks up a given library based on its position in
-++dnl the list of linker options and libraries.
-++AC_DEFUN([CF_LDFLAGS_STATIC],[
-++
-++if test "$GCC" = yes ; then
-++	LDFLAGS_STATIC=-static
-++	LDFLAGS_SHARED=-dynamic
-++else
-++	case $cf_cv_system_name in #(
-++	aix[[45]]*) 	#( from ld manpage
-++		LDFLAGS_STATIC=-bstatic
-++		LDFLAGS_SHARED=-bdynamic
-++		;;
-++	hpux*)		#( from ld manpage for hpux10.20, hpux11.11
-++		# We could also use just "archive" and "shared".
-++		LDFLAGS_STATIC=-Wl,-a,archive_shared
-++		LDFLAGS_SHARED=-Wl,-a,shared_archive
-++		;;
-++	irix*)		#( from ld manpage IRIX64
-++		LDFLAGS_STATIC=-Bstatic
-++		LDFLAGS_SHARED=-Bdynamic
-++		;;
-++	osf[[45]]*)	#( from ld manpage osf4.0d, osf5.1
-++		# alternative "-oldstyle_liblookup" (not in cc manpage)
-++		LDFLAGS_STATIC=-noso 
-++		LDFLAGS_SHARED=-so_archive
-++		;;
-++	solaris2*)
-++		LDFLAGS_STATIC=-Bstatic
-++		LDFLAGS_SHARED=-Bdynamic
-++		;;
-++	esac
-++fi
-++
-++AC_SUBST(LDFLAGS_STATIC)
-++AC_SUBST(LDFLAGS_SHARED)
-++])
-++dnl ---------------------------------------------------------------------------
-+ dnl CF_LIBUTF8 version: 2 updated: 2002/01/19 22:51:32
-+ dnl ----------
-+ dnl Check for libutf8
-+@@ -1852,11 +1999,11 @@
-+ 	AC_SUBST(LIB_PREFIX)
-+ ])dnl
-+ dnl ---------------------------------------------------------------------------
-+-dnl CF_LIB_RULES version: 40 updated: 2006/10/14 15:23:15
-++dnl CF_LIB_RULES version: 50 updated: 2007/03/24 18:26:59
-+ dnl ------------
-+ dnl Append definitions and rules for the given models to the subdirectory
-+ dnl Makefiles, and the recursion rule for the top-level Makefile.  If the
-+-dnl subdirectory is a library-source directory, modify the LIBRARIES list in
-++dnl subdirectory is a library-source directory, modify the LIBS_TO_MAKE list in
-+ dnl the corresponding makefile to list the models that we'll generate.
-+ dnl
-+ dnl For shared libraries, make a list of symbolic links to construct when
-+@@ -1875,7 +2022,6 @@
-+ 		continue
-+ 	elif test -f $srcdir/$cf_dir/modules; then
-+ 
-+-		IMPORT_LIB=
-+ 		SHARED_LIB=
-+ 		LIBS_TO_MAKE=
-+ 		for cf_item in $cf_LIST_MODELS
-+@@ -1922,9 +2068,7 @@
-+ 			# use autodetected ${cf_prefix} for import lib and static lib, but
-+ 			# use 'cyg' prefix for shared lib.
-+ 			if test $cf_cv_shlib_version = cygdll ; then
-+-				SHARED_LIB="cyg${cf_dir}\${ABI_VERSION}.dll"
-+-				IMPORT_LIB="${cf_prefix}${cf_dir}.dll.a"
-+-				LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/\${SHARED_LIB} ../lib/\${IMPORT_LIB}"
-++				LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/cyg${cf_dir}\${ABI_VERSION}.dll"
-+ 				continue
-+ 			fi
-+ 			fi
-+@@ -1933,17 +2077,34 @@
-+ 
-+ 		if test $cf_dir = ncurses ; then
-+ 			cf_subsets="$LIB_SUBSETS"
-+-			cf_termlib=`echo "$cf_subsets" |sed -e 's/ .*$//'`
-+-			if test "$cf_termlib" != "$cf_subsets" ; then
-+-				cf_item=`echo $LIBS_TO_MAKE |sed -e s%${LIB_NAME}${LIB_SUFFIX}%${TINFO_LIB_SUFFIX}%g`
-+-				LIBS_TO_MAKE="$cf_item $LIBS_TO_MAKE"
-+-			fi
-++			cf_r_parts="$cf_subsets"
-++
-++			while test -n "$cf_r_parts"
-++			do
-++				cf_l_parts=`echo "$cf_r_parts" |sed -e 's/ .*$//'`
-++				cf_r_parts=`echo "$cf_r_parts" |sed -e 's/^[[^ ]]* //'`
-++				if test "$cf_l_parts" != "$cf_r_parts" ; then
-++					case $cf_l_parts in #(vi
-++					*termlib*) #(vi
-++						cf_item=`echo $LIBS_TO_MAKE |sed -e s%${LIB_NAME}${LIB_SUFFIX}%${TINFO_LIB_SUFFIX}%g`
-++						;;
-++					*ticlib*)
-++						cf_item=`echo $LIBS_TO_MAKE |sed -e s%${LIB_NAME}${LIB_SUFFIX}%${TICS_LIB_SUFFIX}%g`
-++						;;
-++					*)
-++						break
-++						;;
-++					esac
-++					LIBS_TO_MAKE="$cf_item $LIBS_TO_MAKE"
-++				else
-++					break
-++				fi
-++			done
-+ 		else
-+ 			cf_subsets=`echo "$LIB_SUBSETS" | sed -e 's/^termlib.* //'`
-+ 		fi
-+ 
-+ 		sed -e "s%@LIBS_TO_MAKE@%$LIBS_TO_MAKE%" \
-+-		    -e "s%@IMPORT_LIB@%$IMPORT_LIB%" \
-+ 		    -e "s%@SHARED_LIB@%$SHARED_LIB%" \
-+ 			$cf_dir/Makefile >$cf_dir/Makefile.out
-+ 		mv $cf_dir/Makefile.out $cf_dir/Makefile
-+@@ -1968,13 +2129,20 @@
-+ 				case $cf_subset in
-+ 				*base*)
-+ 					;;
-+-				termlib*)
-++				*termlib*)
-+ 					cf_libname=$TINFO_LIB_SUFFIX
-+ 					if test -n "${DFT_ARG_SUFFIX}" ; then
-+ 						# undo $LIB_SUFFIX add-on in CF_LIB_SUFFIX
-+ 						cf_suffix=`echo $cf_suffix |sed -e "s%^${LIB_SUFFIX}%%"`
-+ 					fi
-+-				;;
-++					;;
-++				ticlib*)
-++					cf_libname=$TICS_LIB_SUFFIX
-++					if test -n "${DFT_ARG_SUFFIX}" ; then
-++						# undo $LIB_SUFFIX add-on in CF_LIB_SUFFIX
-++						cf_suffix=`echo $cf_suffix |sed -e "s%^${LIB_SUFFIX}%%"`
-++					fi
-++					;;
-+ 				esac
-+ 			fi
-+ 
-+@@ -2015,8 +2183,11 @@
-+ 				prefix=$cf_prefix \
-+ 				suffix=$cf_suffix \
-+ 				subset=$cf_subset \
-++				TermlibRoot=$TINFO_NAME \
-++				TermlibSuffix=$TINFO_SUFFIX \
-+ 				ShlibVer=$cf_cv_shlib_version \
-+ 				ShlibVerInfix=$cf_cv_shlib_version_infix \
-++				ReLink=${cf_cv_do_relink-no} \
-+ 				DoLinks=$cf_cv_do_symlinks \
-+ 				rmSoLocs=$cf_cv_rm_so_locs \
-+ 				ldconfig="$LDCONFIG" \
-+@@ -2103,8 +2274,8 @@
-+ 
-+ cat >> Makefile <<CF_EOF
-+ 
-+-install.data \\
-+-uninstall.data ::
-++install.libs uninstall.libs \\
-++install.data uninstall.data ::
-+ $MAKE_TERMINFO	cd misc && \${MAKE} \${CF_MFLAGS} \[$]@
-+ 
-+ install.man \\
-+@@ -2113,7 +2284,7 @@
-+ 
-+ distclean ::
-+ 	rm -f config.cache config.log config.status Makefile include/ncurses_cfg.h
-+-	rm -f headers.sh headers.sed
-++	rm -f headers.sh headers.sed mk_shared_lib.sh
-+ 	rm -rf \${DIRS_TO_MAKE}
-+ CF_EOF
-+ 
-+@@ -2224,41 +2395,10 @@
-+ 	fi
-+ 
-+ 	if test -f $srcdir/$cf_dir/headers; then
-+-	cat >>$cf_dir/Makefile <<CF_EOF
-+-\${DESTDIR}\${includedir} :
-+-	sh \${srcdir}/../mkinstalldirs \[$]@
-+-
-+-install \\
-+-install.libs \\
-+-install.includes :: \${AUTO_SRC} \${DESTDIR}\${includedir} \\
-+-CF_EOF
-+-		j=""
-+-		for i in `cat $srcdir/$cf_dir/headers |fgrep -v "#"`
-+-		do
-+-			test -n "$j" && echo "		$j \\" >>$cf_dir/Makefile
-+-			j=$i
-+-		done
-+-
-+-		echo "		$j" >>$cf_dir/Makefile
-+-
-+-		for i in `cat $srcdir/$cf_dir/headers |fgrep -v "#"`
-+-		do
-+-			echo "	@ (cd \${DESTDIR}\${includedir} && rm -f `basename $i`) ; ../headers.sh \${INSTALL_DATA} \${DESTDIR}\${includedir} \${srcdir} $i" >>$cf_dir/Makefile
-+-			test $i = curses.h && test $WITH_CURSES_H = yes && echo "	@ (cd \${DESTDIR}\${includedir} && rm -f ncurses.h && \${LN_S} curses.h ncurses.h)" >>$cf_dir/Makefile
-+-		done
-+-
-+-	cat >>$cf_dir/Makefile <<CF_EOF
-+-
-+-uninstall \\
-+-uninstall.libs \\
-+-uninstall.includes ::
-+-CF_EOF
-+-		for i in `cat $srcdir/$cf_dir/headers |fgrep -v "#"`
-+-		do
-+-			i=`basename $i`
-+-			echo "	-@ (cd \${DESTDIR}\${includedir} && rm -f $i)" >>$cf_dir/Makefile
-+-			test $i = curses.h && echo "	-@ (cd \${DESTDIR}\${includedir} && rm -f ncurses.h)" >>$cf_dir/Makefile
-+-		done
-++		$AWK -f $srcdir/mk-hdr.awk \
-++			subset="$LIB_SUBSETS" \
-++			compat="$WITH_CURSES_H" \
-++			$srcdir/$cf_dir/headers >>$cf_dir/Makefile
-+ 	fi
-+ 
-+ 	if test -f $srcdir/$cf_dir/modules; then
-+@@ -2776,7 +2916,7 @@
-+ AC_MSG_RESULT($MANPAGE_TBL)
-+ ])dnl
-+ dnl ---------------------------------------------------------------------------
-+-dnl CF_MAN_PAGES version: 31 updated: 2006/12/09 12:27:08
-++dnl CF_MAN_PAGES version: 35 updated: 2007/03/31 11:47:29
-+ dnl ------------
-+ dnl Try to determine if the man-pages on the system are compressed, and if
-+ dnl so, what format is used.  Use this information to construct a script that
-+@@ -2826,6 +2966,7 @@
-+ esac
-+ 
-+ cf_edit_man=./edit_man.sh
-++cf_man_alias=`pwd`/man_alias.sed
-+ 
-+ cat >$cf_edit_man <<CF_EOF
-+ #! /bin/sh
-+@@ -2841,7 +2982,7 @@
-+ NCURSES_OSPEED="$NCURSES_OSPEED"
-+ TERMINFO="$TERMINFO"
-+ 
-+-MKDIRS="sh `cd $srcdir && pwd`/mkinstalldirs"
-++MKDIRS="sh `cd $srcdir && pwd`/mkdirs.sh"
-+ 
-+ INSTALL="$INSTALL"
-+ INSTALL_DATA="$INSTALL_DATA"
-+@@ -2889,6 +3030,32 @@
-+ 		\$MKDIRS \$cf_subdir\$section
-+ 	fi
-+ 	fi
-++
-++	# replace variables in man page
-++	if test ! -f $cf_man_alias ; then
-++cat >>$cf_man_alias <<-CF_EOF2
-++		s,@DATADIR@,\$datadir,g
-++		s,@TERMINFO@,\$TERMINFO,g
-++		s,@NCURSES_MAJOR@,\$NCURSES_MAJOR,g
-++		s,@NCURSES_MINOR@,\$NCURSES_MINOR,g
-++		s,@NCURSES_PATCH@,\$NCURSES_PATCH,g
-++		s,@NCURSES_OSPEED@,\$NCURSES_OSPEED,g
-++CF_EOF
-++	ifelse($1,,,[
-++	for cf_name in $1
-++	do
-++		cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-++		cf_name=`echo $cf_name|sed "$program_transform_name"`
-++cat >>$cf_edit_man <<-CF_EOF
-++		s,@$cf_NAME@,$cf_name,
-++CF_EOF
-++	done
-++	])
-++cat >>$cf_edit_man <<CF_EOF
-++CF_EOF2
-++		echo "...made $cf_man_alias"
-++	fi
-++
-+ 	aliases=
-+ 	cf_source=\`basename \$i\`
-+ 	inalias=\$cf_source
-+@@ -2901,7 +3068,7 @@
-+ 
-+ if test "$MANPAGE_ALIASES" != no ; then
-+ cat >>$cf_edit_man <<CF_EOF
-+-	aliases=\`sed -f \$top_srcdir/man/manlinks.sed \$inalias | sort -u\`
-++	aliases=\`sed -f \$top_srcdir/man/manlinks.sed \$inalias |sed -f $cf_man_alias | sort -u\`
-+ CF_EOF
-+ fi
-+ 
-+@@ -2922,36 +3089,13 @@
-+ 		cf_target="\$cf_source"
-+ 	fi
-+ 	cf_target="\$cf_subdir\${section}/\${cf_target}"
-+-CF_EOF
-+-fi
-+ 
-+-	# replace variables in man page
-+-	ifelse($1,,,[
-+-	for cf_name in $1
-+-	do
-+-cat >>$cf_edit_man <<CF_EOF
-+-	prog_$cf_name=\`echo $cf_name|sed "\${transform}"\`
-+-CF_EOF
-+-	done
-+-	])
-+-cat >>$cf_edit_man <<CF_EOF
-+-	sed	-e "s,@DATADIR@,\$datadir," \\
-+-		-e "s,@TERMINFO@,\$TERMINFO," \\
-+-		-e "s,@NCURSES_MAJOR@,\$NCURSES_MAJOR," \\
-+-		-e "s,@NCURSES_MINOR@,\$NCURSES_MINOR," \\
-+-		-e "s,@NCURSES_PATCH@,\$NCURSES_PATCH," \\
-+-		-e "s,@NCURSES_OSPEED@,\$NCURSES_OSPEED," \\
-+ CF_EOF
-++fi
-+ 
-+-	ifelse($1,,,[
-+-	for cf_name in $1
-+-	do
-+-		cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-+ cat >>$cf_edit_man <<CF_EOF
-+-		-e "s,@$cf_NAME@,\$prog_$cf_name," \\
-++	sed	-f $cf_man_alias \\
-+ CF_EOF
-+-	done
-+-	])
-+ 
-+ if test -f $MANPAGE_RENAMES ; then
-+ cat >>$cf_edit_man <<CF_EOF
-+@@ -3012,6 +3156,7 @@
-+ 	if test \$verb = installing ; then
-+ 		echo \$verb \$cf_target
-+ 		\$INSTALL_DATA \$TMP \$cf_target
-++		test -d \$cf_subdir\${section} &&
-+ 		test -n "\$aliases" && (
-+ 			cd \$cf_subdir\${section} && (
-+ 				cf_source=\`echo \$cf_target |sed -e 's%^.*/\([[^/]][[^/]]*/[[^/]][[^/]]*$\)%\1%'\`
-+@@ -3053,8 +3198,11 @@
-+ 			)
-+ 		)
-+ 	elif test \$verb = removing ; then
-+-		echo \$verb \$cf_target
-+-		rm -f \$cf_target
-++		test -f \$cf_target && (
-++			echo \$verb \$cf_target
-++			rm -f \$cf_target
-++		)
-++		test -d \$cf_subdir\${section} &&
-+ 		test -n "\$aliases" && (
-+ 			cd \$cf_subdir\${section} && (
-+ 				for cf_alias in \$aliases
-+@@ -3192,12 +3340,12 @@
-+ fi
-+ ])dnl
-+ dnl ---------------------------------------------------------------------------
-+-dnl CF_MSG_LOG version: 3 updated: 1997/09/07 14:05:52
-++dnl CF_MSG_LOG version: 4 updated: 2007/07/29 09:55:12
-+ dnl ----------
-+ dnl Write a debug message to config.log, along with the line number in the
-+ dnl configure script.
-+ AC_DEFUN([CF_MSG_LOG],[
-+-echo "(line __oline__) testing $* ..." 1>&AC_FD_CC
-++echo "${as_me-configure}:__oline__: testing $* ..." 1>&AC_FD_CC
-+ ])dnl
-+ dnl ---------------------------------------------------------------------------
-+ dnl CF_NCURSES_ABI_6 version: 1 updated: 2005/09/17 18:42:49
-+@@ -3680,7 +3828,73 @@
-+ 		-e 's/-[[UD]]$3\(=[[^ 	]]*\)\?[$]//g'`
-+ ])dnl
-+ dnl ---------------------------------------------------------------------------
-+-dnl CF_SHARED_OPTS version: 41 updated: 2006/12/09 12:32:00
-++dnl CF_REMOVE_LIB version: 1 updated: 2007/02/17 14:11:52
-++dnl -------------
-++dnl Remove the given library from the symbol
-++dnl
-++dnl $1 = target (which could be the same as the source variable)
-++dnl $2 = source (including '$')
-++dnl $3 = library to remove
-++define([CF_REMOVE_LIB],
-++[
-++# remove $3 library from $2
-++$1=`echo "$2" | sed -e 's/-l$3[[ 	]]//g' -e 's/-l$3[$]//'`
-++])dnl
-++dnl ---------------------------------------------------------------------------
-++dnl CF_RPATH_HACK version: 3 updated: 2007/12/01 11:14:13
-++dnl -------------
-++AC_DEFUN([CF_RPATH_HACK],
-++[
-++AC_REQUIRE([CF_SHARED_OPTS])
-++AC_MSG_CHECKING(for updated LDFLAGS)
-++if test -n "$LDFLAGS" ; then
-++AC_MSG_RESULT(maybe)
-++CF_VERBOSE(...checking LDFLAGS $LDFLAGS)
-++CF_VERBOSE(...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS)
-++case "$EXTRA_LDFLAGS" in #(vi
-++-Wl,-rpath,*) #(vi
-++    cf_rpath_hack="-Wl,-rpath,"
-++    ;;
-++-R\ *)
-++    cf_rpath_hack="-R "
-++    ;;
-++-R*)
-++    cf_rpath_hack="-R"
-++    ;;
-++*)
-++    cf_rpath_hack=
-++    ;;
-++esac
-++if test -n "$cf_rpath_hack" ; then
-++    cf_rpath_dst=
-++    for cf_rpath_src in $LDFLAGS
-++    do
-++        CF_VERBOSE(Filtering $cf_rpath_src)
-++        case $cf_rpath_src in #(vi
-++        -L*) #(vi
-++            if test "$cf_rpath_hack" = "-R " ; then
-++                cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e 's%-L%-R %'`
-++            else
-++                cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e s%-L%$cf_rpath_hack%`
-++            fi
-++            CF_VERBOSE(...Filter $cf_rpath_tmp)
-++            EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
-++            ;;
-++        *)
-++            cf_rpath_dst="$cf_rpath_dst $cf_rpath_src"
-++            ;;
-++        esac
-++    done
-++    LDFLAGS=$cf_rpath_dst
-++    CF_VERBOSE(...checked LDFLAGS $LDFLAGS)
-++    CF_VERBOSE(...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS)
-++fi
-++else
-++AC_MSG_RESULT(no)
-++fi
-++])dnl
-++dnl ---------------------------------------------------------------------------
-++dnl CF_SHARED_OPTS version: 46 updated: 2007/02/24 18:58:09
-+ dnl --------------
-+ dnl --------------
-+ dnl Attempt to determine the appropriate CC/LD options for creating a shared
-+@@ -3757,14 +3971,27 @@
-+ 		;;
-+ 	cygwin*)
-+ 		CC_SHARED_OPTS=
-+-		MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,--out-implib=../lib/${IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/${SHARED_LIB}'
-++		MK_SHARED_LIB='sh ../mk_shared_lib.sh [$]@ [$]{CC} [$]{CFLAGS}'
-+ 		cf_cv_shlib_version=cygdll
-+ 		cf_cv_shlib_version_infix=cygdll
-++		cat >mk_shared_lib.sh <<-CF_EOF
-++		#!/bin/sh
-++		SHARED_LIB=\[$]1
-++		IMPORT_LIB=\`echo "\[$]1" | sed -e 's/cyg/lib/' -e 's/[[0-9]]*\.dll[$]/.dll.a/'\`
-++		shift
-++		cat <<-EOF
-++		Linking shared library
-++		** SHARED_LIB \[$]SHARED_LIB
-++		** IMPORT_LIB \[$]IMPORT_LIB
-++EOF
-++		exec \[$]* -shared -Wl,--out-implib=../lib/\[$]{IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\[$]{SHARED_LIB}
-++CF_EOF
-++		chmod +x mk_shared_lib.sh 
-+ 		;;
-+ 	darwin*)
-+ 		EXTRA_CFLAGS="-no-cpp-precomp"
-+ 		CC_SHARED_OPTS="-dynamic"
-+-		MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${DESTDIR}${libdir}/`basename $[@]` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $[@]'
-++		MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $[@]` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $[@]'
-+ 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
-+ 		cf_cv_shlib_version_infix=yes
-+ 		AC_CACHE_CHECK([if ld -search_paths_first works], cf_cv_ldflags_search_paths_first, [
-+@@ -3818,11 +4045,11 @@
-+ 		CF_SHARED_SONAME
-+ 		MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_shared_soname',-stats,-lc -o $[@]'
-+ 		;;
-+-	openbsd2*)
-++	openbsd[[2-9]].*)
-+ 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
-+ 		MK_SHARED_LIB='${LD} -Bshareable -soname,`basename $[@].${ABI_VERSION}` -o $[@]'
-+ 		;;
-+-	openbsd*|freebsd[[23]]*)
-++	openbsd*|freebsd[[12]].*)
-+ 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
-+ 		MK_SHARED_LIB='${LD} -Bshareable -o $[@]'
-+ 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
-+@@ -4043,6 +4270,41 @@
-+ fi
-+ ])dnl
-+ dnl ---------------------------------------------------------------------------
-++dnl CF_SIG_ATOMIC_T version: 2 updated: 2005/09/18 17:27:12
-++dnl ---------------
-++dnl signal handler, but there are some gcc depedencies in that recommendation.
-++dnl Try anyway.
-++AC_DEFUN([CF_SIG_ATOMIC_T],
-++[
-++AC_MSG_CHECKING(for signal global datatype)
-++AC_CACHE_VAL(cf_cv_sig_atomic_t,[
-++	for cf_type in \
-++		"volatile sig_atomic_t" \
-++		"sig_atomic_t" \
-++		"int"
-++	do
-++	AC_TRY_COMPILE([
-++#include <sys/types.h>
-++#include <signal.h>
-++#include <stdio.h>
-++
-++extern $cf_type x;
-++$cf_type x;
-++static void handler(int sig)
-++{
-++	x = 5;
-++}],
-++		[signal(SIGINT, handler);
-++		 x = 1],
-++		[cf_cv_sig_atomic_t=$cf_type],
-++		[cf_cv_sig_atomic_t=no])
-++		test "$cf_cv_sig_atomic_t" != no && break
-++	done
-++	])
-++AC_MSG_RESULT($cf_cv_sig_atomic_t)
-++test "$cf_cv_sig_atomic_t" != no && AC_DEFINE_UNQUOTED(SIG_ATOMIC_T, $cf_cv_sig_atomic_t)
-++])dnl
-++dnl ---------------------------------------------------------------------------
-+ dnl CF_SIZECHANGE version: 8 updated: 2000/11/04 12:22:16
-+ dnl -------------
-+ dnl Check for definitions & structures needed for window size-changing
-+@@ -4503,11 +4765,12 @@
-+ $1=`echo "$2" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-+ ])dnl
-+ dnl ---------------------------------------------------------------------------
-+-dnl CF_VERBOSE version: 2 updated: 1997/09/05 10:45:14
-++dnl CF_VERBOSE version: 3 updated: 2007/07/29 09:55:12
-+ dnl ----------
-+ dnl Use AC_VERBOSE w/o the warnings
-+ AC_DEFUN([CF_VERBOSE],
-+ [test -n "$verbose" && echo "	$1" 1>&AC_FD_MSG
-++CF_MSG_LOG([$1])
-+ ])dnl
-+ dnl ---------------------------------------------------------------------------
-+ dnl CF_WCHAR_TYPE version: 2 updated: 2004/01/17 19:18:20
-+@@ -4643,7 +4906,7 @@
-+ fi
-+ ])
-+ dnl ---------------------------------------------------------------------------
-+-dnl CF_WITH_LIBTOOL version: 10 updated: 2006/10/14 15:23:15
-++dnl CF_WITH_LIBTOOL version: 18 updated: 2007/04/08 20:02:38
-+ dnl ---------------
-+ dnl Provide a configure option to incorporate libtool.  Define several useful
-+ dnl symbols for the makefile rules.
-+@@ -4692,7 +4955,7 @@
-+ # doing:
-+ LIB_CLEAN=
-+ LIB_COMPILE=
-+-LIB_LINK=
-++LIB_LINK='${CC}'
-+ LIB_INSTALL=
-+ LIB_UNINSTALL=
-+ 
-+@@ -4718,12 +4981,12 @@
-+  		AC_MSG_ERROR(Cannot find libtool)
-+  	fi
-+ ])dnl
-+-	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` -o'
-+-	LIB_OBJECT='${OBJECTS}.o=.lo)'
-++	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
-++	LIB_OBJECT='${OBJECTS:.o=.lo}'
-+ 	LIB_SUFFIX=.la
-+ 	LIB_CLEAN='${LIBTOOL} --mode=clean'
-+ 	LIB_COMPILE='${LIBTOOL} --mode=compile'
-+-	LIB_LINK='${LIBTOOL} --mode=link'
-++	LIB_LINK='${LIBTOOL} --mode=link ${CC} ${LIBTOOL_OPTS}'
-+ 	LIB_INSTALL='${LIBTOOL} --mode=install'
-+ 	LIB_UNINSTALL='${LIBTOOL} --mode=uninstall'
-+ 	LIB_PREP=:
-+@@ -4734,10 +4997,10 @@
-+ 	# Save the version in a cache variable - this is not entirely a good
-+ 	# thing, but the version string from libtool is very ugly, and for
-+ 	# bug reports it might be useful to have the original string.
-+-	cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '2,$d' -e 's/([[^)]]*)//g' -e 's/^[[^1-9]]*//' -e 's/[[^0-9.]].*//'`
-++	cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([[^)]]*)//g' -e 's/^[[^1-9]]*//' -e 's/[[^0-9.]].*//'`
-+ 	AC_MSG_RESULT($cf_cv_libtool_version)
-+ 	if test -z "$cf_cv_libtool_version" ; then
-+-		AC_MSG_ERROR(This is not libtool)
-++		AC_MSG_ERROR(This is not GNU libtool)
-+ 	fi
-+ 
-+ 	# special hack to add --tag option for C++ compiler
-+@@ -4758,6 +5021,7 @@
-+ 
-+ AC_SUBST(LIBTOOL)
-+ AC_SUBST(LIBTOOL_CXX)
-++AC_SUBST(LIBTOOL_OPTS)
-+ 
-+ AC_SUBST(LIB_CREATE)
-+ AC_SUBST(LIB_OBJECT)
-+@@ -4772,7 +5036,7 @@
-+ 
-+ ])dnl
-+ dnl ---------------------------------------------------------------------------
-+-dnl CF_WITH_PATH version: 7 updated: 2006/08/03 15:20:08
-++dnl CF_WITH_PATH version: 8 updated: 2007/05/13 13:16:35
-+ dnl ------------
-+ dnl Wrapper for AC_ARG_WITH to ensure that user supplies a pathname, not just
-+ dnl defaulting to yes/no.
-+@@ -4786,7 +5050,9 @@
-+ AC_DEFUN([CF_WITH_PATH],
-+ [AC_ARG_WITH($1,[$2 ](default: ifelse($4,,empty,$4)),,
-+ ifelse($4,,[withval="${$3}"],[withval="${$3-ifelse($5,,$4,$5)}"]))dnl
-++if ifelse($5,,true,[test -n "$5"]) ; then
-+ CF_PATH_SYNTAX(withval)
-++fi
-+ $3="$withval"
-+ AC_SUBST($3)dnl
-+ ])dnl
-+@@ -4896,7 +5162,7 @@
-+ 	[USE_VALGRIND])
-+ ])dnl
-+ dnl ---------------------------------------------------------------------------
-+-dnl CF_XOPEN_SOURCE version: 24 updated: 2006/04/02 16:41:09
-++dnl CF_XOPEN_SOURCE version: 25 updated: 2007/01/29 18:36:38
-+ dnl ---------------
-+ dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
-+ dnl or adapt to the vendor's definitions to get equivalent functionality,
-+@@ -4930,7 +5196,7 @@
-+ irix[[56]].*) #(vi
-+ 	CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
-+ 	;;
-+-linux*|gnu*) #(vi
-++linux*|gnu*|k*bsd*-gnu) #(vi
-+ 	CF_GNU_SOURCE
-+ 	;;
-+ mirbsd*) #(vi
-+Index: c++/Makefile.in
-+Prereq:  1.78 
-+--- ncurses-5.6/c++/Makefile.in	2006-10-21 17:07:49.000000000 +0000
-++++ ncurses-5.6-20071201/c++/Makefile.in	2007-04-28 15:29:12.000000000 +0000
-+@@ -1,6 +1,6 @@
-+-# $Id: Makefile.in,v 1.78 2006/10/21 17:07:49 tom Exp $
-++# $Id: Makefile.in,v 1.84 2007/04/28 15:29:12 tom Exp $
-+ ##############################################################################
-+-# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
-++# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -57,6 +57,7 @@
-+ LIBTOOL_UNINSTALL = @LIB_UNINSTALL@
-+ 
-+ INSTALL		= @INSTALL@
-++INSTALL_LIB	= @INSTALL@ @INSTALL_LIB@
-+ INSTALL_DATA	= @INSTALL_DATA@
-+ 
-+ AR		= @AR@
-+@@ -74,6 +75,7 @@
-+ INCDIR		= ../include
-+ CPPFLAGS	= -I../c++ -I$(INCDIR) -I$(srcdir) -DHAVE_CONFIG_H @CPPFLAGS@
-+ 
-++CC		= ${CXX}
-+ CCFLAGS		= $(CPPFLAGS) $(CXXFLAGS)
-+ 
-+ CFLAGS_LIBTOOL	= $(CCFLAGS)
-+@@ -91,7 +93,7 @@
-+ 
-+ LOCAL_LIBDIR	= @top_builddir@/lib
-+ 
-+-LINK		= @LINK_PROGS@ $(LIBTOOL_LINK) $(CXX) @CXXLDFLAGS@
-++LINK		= @LINK_PROGS@ $(LIBTOOL_LINK) @CXXLDFLAGS@
-+ SHLIB_DIRS	= -L../lib
-+ SHLIB_LIST	= $(SHLIB_DIRS) -lncurses@LIB_SUFFIX@ @SHLIB_LIST@
-+ 
-+@@ -109,7 +111,9 @@
-+ LINK_PROFILE	= $(LINK_FLAGS)
-+ LINK_SHARED	= $(LINK_FLAGS)
-+ 
-+-LDFLAGS		= @TEST_ARGS@ @LDFLAGS@ \
-++TEST_ARGS	= @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@ 
-++
-++LDFLAGS		= $(TEST_ARGS) @LDFLAGS@ \
-+ 	@LD_MODEL@ @LIBS@ @LOCAL_LDFLAGS@ $(CXXLIBS)
-+ 
-+ LDFLAGS_LIBTOOL	= $(LDFLAGS) $(CFLAGS_LIBTOOL)
-+@@ -173,11 +177,11 @@
-+ 	sh $(srcdir)/edit_cfg.sh ../include/ncurses_cfg.h $@
-+ 
-+ $(DESTDIR)$(libdir) :
-+-	sh $(srcdir)/../mkinstalldirs $@
-++	sh $(srcdir)/../mkdirs.sh $@
-+ 
-+ install \
-+ install.libs:: ../lib/$(LIBNAME) $(DESTDIR)$(libdir)
-+-	$(LIBTOOL_INSTALL) $(INSTALL) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)/$(LIBNAME)
-++	$(LIBTOOL_INSTALL) $(INSTALL_LIB) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)/$(LIBNAME)
-+ 
-+ uninstall \
-+ uninstall.libs::
-+Index: c++/README-first
-+Prereq:  1.8 
-+--- ncurses-5.6/c++/README-first	2006-04-22 22:19:37.000000000 +0000
-++++ ncurses-5.6-20071201/c++/README-first	2007-01-27 18:27:09.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ -------------------------------------------------------------------------------
-+--- Copyright (c) 1998-2003,2006 Free Software Foundation, Inc.               --
-++-- Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.               --
-+ --                                                                           --
-+ -- Permission is hereby granted, free of charge, to any person obtaining a   --
-+ -- copy of this software and associated documentation files (the             --
-+@@ -25,38 +25,38 @@
-+ -- sale, use or other dealings in this Software without prior written        --
-+ -- authorization.                                                            --
-+ -------------------------------------------------------------------------------
-+--- $Id: README-first,v 1.8 2006/04/22 22:19:37 tom Exp $
-++-- $Id: README-first,v 1.9 2007/01/27 18:27:09 tom Exp $
-+ -------------------------------------------------------------------------------
-+                   C++ interface to ncurses routines
-+ -----------------------------------------------------------------------
-+ 
-+ This directory contains the source code for several C++ classes which
-+-ease the use of writing ncurses-based programs.  The code is derived
-+-from the libg++ CursesWindow class but enhanced for ncurses.
-++ease the use of writing ncurses-based programs.  The code was originally
-++derived from the libg++ CursesWindow class, but rewritten for ncurses.
-+ 
-+ The classes simplify the use of window specific functions by
-+ encapsulating them in the window object.  Function overloading is
-+-used in order to narrow the interface.  E.g. you don't have the
-++used in order to narrow the interface.  For example, you do not have the
-+ distinction between `printw' and `mvprintw' anymore.
-+ 
-+ A second benefit is the removal of all #defines which are included in
-+ the curses.h file.  This is a steady cause of trouble because many
-+ common identifiers are used.  Instead now all #defines are inline
-+-functions which also allows strict type checking of arguments.
-++functions, which also allows strict type checking of arguments.
-+ 
-+ The next enhancement is color support. It was originally provided by a 
-+-derived class. This caused some trouble if you think about Panels or
-+-Menus and Forms with colors. We decided to put color support into the
-++derived class.  This caused some trouble if you think about Panels or
-++Menus and Forms with colors.  We decided to put color support into the
-+ base class so that any derived class may use color support also.
-+ The implementation chosen here is directed to unrestricted use
-+-of mixes of color and monochrome windows. The original NCursesColorWindow
-++of mixes of color and monochrome windows.  The original NCursesColorWindow
-+ class is maintained for compatibility reasons.
-+ 
-+ The last point to mention is the support of other packages that are
-+-distributed with the ncurses package: the panels library, the menu library
-+-and the form library. This support is provided by the NCursesPanel class, 
-++distributed with the ncurses package:  the panels library, the menu library
-++and the form library.  This support is provided by the NCursesPanel class,
-+ which is also derived from the NCursesWindow class and the NCursesMenu
-+-and NCursesForm classes which are derived from NCursesPanel. This allows 
-++and NCursesForm classes which are derived from NCursesPanel.  This allows
-+ building interfaces with windows.
-+ 
-+ Please see the example program for a quick introduction.
-+@@ -68,14 +68,6 @@
-+ Suggestions for enhancements and contributions of code (and docs) are
-+ welcome.  Please let us know which functionality you miss.
-+ 
-+-	ATTENTION LINUX USERS:  There is currently some discussion of
-+-	replacing the BSD curses in the Linux libc with ncurses.  If
-+-	this is done we could perhaps include these classes in the Linux
-+-	libg++ replacing the original CursesWindow class (and renaming it
-+-	to CursesWindow).  This could be done because NCursesWindow can
-+-	be made easily to a superset of the CursesWindow class.
-+-
-+-
-+ Original author:
-+      Eric Newton         <newton@rocky.oswego.edu> for FSF's libg++
-+ 
-+@@ -83,5 +75,6 @@
-+      Ulrich Drepper      <drepper@ira.uka.de>
-+  and Anatoly Ivasyuk     <anatoly@nick.csh.rit.edu>
-+ 
-+-Author of this release:
-++Authors of this release:
-+      Juergen Pfeifer
-++     Thomas E. Dickey
-+Index: c++/cursesapp.cc
-+Prereq:  1.13 
-+--- ncurses-5.6/c++/cursesapp.cc	2005-04-03 12:25:23.000000000 +0000
-++++ ncurses-5.6-20071201/c++/cursesapp.cc	2007-01-27 20:16:42.000000000 +0000
-+@@ -1,6 +1,6 @@
-+ // * this is for making emacs happy: -*-Mode: C++;-*-
-+ /****************************************************************************
-+- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -34,7 +34,7 @@
-+ #include "internal.h"
-+ #include "cursesapp.h"
-+ 
-+-MODULE_ID("$Id: cursesapp.cc,v 1.13 2005/04/03 12:25:23 tom Exp $")
-++MODULE_ID("$Id: cursesapp.cc,v 1.14 2007/01/27 20:16:42 tom Exp $")
-+ 
-+ void
-+ NCursesApplication::init(bool bColors)
-+@@ -72,11 +72,16 @@
-+   Soft_Label_Key_Set* S;
-+ 
-+   delete titleWindow;
-++  titleWindow = 0;
-++
-+   while( (S=top()) ) {
-+     pop();
-+     delete S;
-+   }
-++
-+   delete Root_Window;
-++  Root_Window = 0;
-++
-+   ::endwin();
-+ }
-+ 
-+Index: c++/cursesmain.cc
-+Prereq:  1.11 
-+--- ncurses-5.6/c++/cursesmain.cc	2003-10-25 14:53:13.000000000 +0000
-++++ ncurses-5.6-20071201/c++/cursesmain.cc	2007-04-07 17:10:11.000000000 +0000
-+@@ -1,6 +1,6 @@
-+ // * this is for making emacs happy: -*-Mode: C++;-*-
-+ /****************************************************************************
-+- * Copyright (c) 1998-2002,2003 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2003,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -34,7 +34,14 @@
-+ #include "internal.h"
-+ #include "cursesapp.h"
-+ 
-+-MODULE_ID("$Id: cursesmain.cc,v 1.11 2003/10/25 14:53:13 tom Exp $")
-++#if CPP_HAS_TRY_CATCH && HAVE_IOSTREAM
-++#include <iostream>
-++#else
-++#undef CPP_HAS_TRY_CATCH
-++#define CPP_HAS_TRY_CATCH 0
-++#endif
-++
-++MODULE_ID("$Id: cursesmain.cc,v 1.14 2007/04/07 17:10:11 tom Exp $")
-+ 
-+ #if HAVE_LOCALE_H
-+ #include <locale.h>
-+@@ -42,6 +49,10 @@
-+ #define setlocale(name,string) /* nothing */
-+ #endif
-+ 
-++#if NO_LEAKS
-++#include <nc_alloc.h>
-++#endif
-++
-+ /* This is the default implementation of main() for a NCursesApplication.
-+  * You only have to instantiate a static NCursesApplication object in your
-+  * main application source file and link this module with your application.
-+@@ -58,8 +69,25 @@
-+ 
-+     A->handleArgs(argc,argv);
-+     ::endwin();
-++#if CPP_HAS_TRY_CATCH
-++    try {
-++      res = (*A)();
-++      ::endwin();
-++    }
-++    catch(const NCursesException &e) {
-++      ::endwin();
-++      std::cerr << e.message << std::endl;
-++      res = e.errorno;
-++    }
-++#else
-+     res = (*A)();
-+     ::endwin();
-++#endif
-++#if NO_LEAKS
-++    delete A;
-++    _nc_free_and_exit(res);
-++#else
-+     return(res);
-++#endif
-+   }
-+ }
-+Index: c++/cursesp.h
-+Prereq:  1.26 
-+--- ncurses-5.6/c++/cursesp.h	2005-08-13 18:09:21.000000000 +0000
-++++ ncurses-5.6-20071201/c++/cursesp.h	2007-04-07 17:12:54.000000000 +0000
-+@@ -1,6 +1,6 @@
-+ // * This makes emacs happy -*-Mode: C++;-*-
-+ /****************************************************************************
-+- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -34,7 +34,7 @@
-+ #ifndef NCURSES_CURSESP_H_incl
-+ #define NCURSES_CURSESP_H_incl 1
-+ 
-+-// $Id: cursesp.h,v 1.26 2005/08/13 18:09:21 tom Exp $
-++// $Id: cursesp.h,v 1.27 2007/04/07 17:12:54 tom Exp $
-+ 
-+ #include <cursesw.h>
-+ 
-+@@ -83,7 +83,7 @@
-+     return uptr->m_user;
-+   }
-+ 
-+-  void OnError (int err) const THROWS((NCursesPanelException))
-++  void OnError (int err) const THROWS(NCursesPanelException)
-+   {
-+     if (err==ERR)
-+       THROW(new NCursesPanelException (this, err));
-+Index: c++/cursespad.cc
-+Prereq:  1.11 
-+--- ncurses-5.6/c++/cursespad.cc	2005-07-23 20:51:23.000000000 +0000
-++++ ncurses-5.6-20071201/c++/cursespad.cc	2007-04-07 18:43:54.000000000 +0000
-+@@ -1,6 +1,6 @@
-+ // * this is for making emacs happy: -*-Mode: C++;-*-
-+ /****************************************************************************
-+- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -33,12 +33,10 @@
-+ 
-+ #include "internal.h"
-+ 
-+-#include <stdio.h>
-++#include <etip.h>
-++#include <cursesw.h>
-+ 
-+-#include "etip.h"
-+-#include "cursesw.h"
-+-
-+-MODULE_ID("$Id: cursespad.cc,v 1.11 2005/07/23 20:51:23 tom Exp $")
-++MODULE_ID("$Id: cursespad.cc,v 1.12 2007/04/07 18:43:54 tom Exp $")
-+ 
-+ NCursesPad::NCursesPad(int nlines, int ncols)
-+   : NCursesWindow(),
-+Index: c++/cursesw.cc
-+Prereq:  1.32 
-+--- ncurses-5.6/c++/cursesw.cc	2005-08-13 18:12:17.000000000 +0000
-++++ ncurses-5.6-20071201/c++/cursesw.cc	2007-03-24 19:00:58.000000000 +0000
-+@@ -1,79 +1,70 @@
-+ // * this is for making emacs happy: -*-Mode: C++;-*-
-++/****************************************************************************
-++ * Copyright (c) 2007 Free Software Foundation, Inc.                        *
-++ *                                                                          *
-++ * Permission is hereby granted, free of charge, to any person obtaining a  *
-++ * copy of this software and associated documentation files (the            *
-++ * "Software"), to deal in the Software without restriction, including      *
-++ * without limitation the rights to use, copy, modify, merge, publish,      *
-++ * distribute, distribute with modifications, sublicense, and/or sell       *
-++ * copies of the Software, and to permit persons to whom the Software is    *
-++ * furnished to do so, subject to the following conditions:                 *
-++ *                                                                          *
-++ * The above copyright notice and this permission notice shall be included  *
-++ * in all copies or substantial portions of the Software.                   *
-++ *                                                                          *
-++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-++ *                                                                          *
-++ * Except as contained in this notice, the name(s) of the above copyright   *
-++ * holders shall not be used in advertising or otherwise to promote the     *
-++ * sale, use or other dealings in this Software without prior written       *
-++ * authorization.                                                           *
-++ ****************************************************************************/
-+ 
-+ /*
-+-  Copyright (C) 1989 Free Software Foundation
-+-  written by Eric Newton (newton@rocky.oswego.edu)
-+-
-+-  This file is part of the GNU C++ Library.  This library is free
-+-  software; you can redistribute it and/or modify it under the terms of
-+-  the GNU Library General Public License as published by the Free
-+-  Software Foundation; either version 2 of the License, or (at your
-+-  option) any later version.  This library is distributed in the hope
-+-  that it will be useful, but WITHOUT ANY WARRANTY; without even the
-+-  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-+-  PURPOSE.  See the GNU Library General Public License for more details.
-+-  You should have received a copy of the GNU Library General Public
-+-  License along with this library; if not, write to the Free Software
-+-  Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-+-
-+-  modified by Ulrich Drepper  (drepper@karlsruhe.gmd.de)
-+-          and Anatoly Ivasyuk (anatoly@nick.csh.rit.edu)
-+-
-+-  modified by Juergen Pfeifer
-+-  and Thomas Dickey (noting that more than 70% of this file has been changed)
-+-*/
-++ * Authors:
-++ *	Thomas E. Dickey
-++ *	Juergen Pfeifer
-++ *
-++ * The NCursesWindow class was originally based on a file written by
-++ * Eric Newton, later modified by Ulrich Drepper and Anatoly Ivasyuk.
-++ * However, aside from the compatible interface definition, no trace
-++ * of the original code remains in this version: it consists only of
-++ * changes introduced since 1995.
-++ */
-+ 
-+ #include "internal.h"
-+ #include "cursesw.h"
-+ 
-+-MODULE_ID("$Id: cursesw.cc,v 1.32 2005/08/13 18:12:17 tom Exp $")
-++MODULE_ID("$Id: cursesw.cc,v 1.48 2007/03/24 19:00:58 tom Exp $")
-+ 
-+ #define COLORS_NEED_INITIALIZATION  -1
-+ #define COLORS_NOT_INITIALIZED       0
-+ #define COLORS_MONOCHROME            1
-+ #define COLORS_ARE_REALLY_THERE      2
-+ 
-++#define HaveColors() (colorInitialized == COLORS_ARE_REALLY_THERE)
-++
-+ // declare static variables for the class
-+ long NCursesWindow::count = 0L;
-+ bool NCursesWindow::b_initialized = FALSE;
-+ 
-+-/*
-+- * The ncurses library has a fallback for vsscanf(), which may work...
-+- */
-+-#if !(USE_STRSTREAM_VSCAN || USE_STRSTREAM_VSCAN_CAST)
-+-#  undef  USE_STDIO_VSCAN
-+-#  define USE_STDIO_VSCAN 1
-+-#endif
-+-
-+-#if defined(__GNUG__)
-+-#  ifndef _IO_va_list
-+-#    define _IO_va_list char *
-+-#  endif
-+-#endif
-+-
-+ int
-+ NCursesWindow::scanw(const char* fmt, ...)
-+ {
-+     int result = ERR;
-+-    char buf[BUFSIZ];
-+ 
-+-    if (::wgetnstr(w, buf, sizeof(buf)) != ERR) {
-+-	va_list args;
-+-	va_start(args, fmt);
-+-#if USE_STDIO_VSCAN
-+-	if (::vsscanf(buf, fmt, args) != -1)
-+-	    result = OK;
-+-#elif USE_STRSTREAM_VSCAN	/* powerpc, os390 */
-+-	strstreambuf ss(buf, sizeof(buf));
-+-	if (ss.vscan(fmt, args) != -1)
-+-	    result = OK;
-+-#elif USE_STRSTREAM_VSCAN_CAST	/* pre-gcc 3.0 */
-+-	strstreambuf ss(buf, sizeof(buf));
-+-	if (ss.vscan(fmt, (_IO_va_list)args) != -1)
-+-	    result = OK;
-+-#endif
-+-	va_end(args);
-+-    }
-++    va_list args;
-++    va_start(args, fmt);
-++    result = ::vw_scanw (w, const_cast<NCURSES_CONST char *>(fmt), args);
-++    va_end(args);
-++
-+     return result;
-+ }
-+ 
-+@@ -82,26 +73,12 @@
-+ NCursesWindow::scanw(int y, int x, const char* fmt, ...)
-+ {
-+     int result = ERR;
-+-    char buf[BUFSIZ];
-+ 
-+     if (::wmove(w, y, x) != ERR) {
-+-	if (::wgetnstr(w, buf, sizeof(buf)) != ERR) {
-+-	    va_list args;
-+-	    va_start(args, fmt);
-+-#if USE_STDIO_VSCAN
-+-	    if (::vsscanf(buf, fmt, args) != -1)
-+-		result = OK;
-+-#elif USE_STRSTREAM_VSCAN	/* powerpc, os390 */
-+-	    strstreambuf ss(buf, sizeof(buf));
-+-	    if (ss.vscan(fmt, args) != -1)
-+-		result = OK;
-+-#elif USE_STRSTREAM_VSCAN_CAST	/* pre-gcc 3.0 */
-+-	    strstreambuf ss(buf, sizeof(buf));
-+-	    if (ss.vscan(fmt, (_IO_va_list)args) != -1)
-+-		result = OK;
-+-#endif
-+-	    va_end(args);
-+-	}
-++	va_list args;
-++	va_start(args, fmt);
-++	result = ::vw_scanw (w, const_cast<NCURSES_CONST char *>(fmt), args);
-++	va_end(args);
-+     }
-+     return result;
-+ }
-+@@ -112,10 +89,9 @@
-+ {
-+     va_list args;
-+     va_start(args, fmt);
-+-    char buf[BUFSIZ];
-+-    ::vsprintf(buf, fmt, args);
-++    int result = ::vw_printw(w, fmt, args);
-+     va_end(args);
-+-    return waddstr(w, buf);
-++    return result;
-+ }
-+ 
-+ 
-+@@ -126,9 +102,7 @@
-+     va_start(args, fmt);
-+     int result = ::wmove(w, y, x);
-+     if (result == OK) {
-+-	char buf[BUFSIZ];
-+-	::vsprintf(buf, fmt, args);
-+-	result = waddstr(w, buf);
-++	result = ::vw_printw(w, fmt, args);
-+     }
-+     va_end(args);
-+     return result;
-+@@ -136,11 +110,10 @@
-+ 
-+ 
-+ void
-+-NCursesWindow::init(void)
-++NCursesWindow::set_keyboard(void)
-+ {
-+-    leaveok(0);
-+-    keypad(1);
-+-    meta(1);
-++    keypad(TRUE);
-++    meta(TRUE);
-+ }
-+ 
-+ void
-+@@ -152,73 +125,73 @@
-+ void
-+ NCursesWindow::initialize()
-+ {
-+-  if (!b_initialized) {
-+-    ::initscr();
-+-    b_initialized = TRUE;
-+-    if (colorInitialized==COLORS_NEED_INITIALIZATION) {
-+-      colorInitialized=COLORS_NOT_INITIALIZED;
-+-      useColors();
-+-    }
-+-    ::noecho();
-+-    ::cbreak();
-+-  }
-++    if (!b_initialized) {
-++	::initscr();
-++	b_initialized = TRUE;
-++	if (colorInitialized == COLORS_NEED_INITIALIZATION) {
-++	    colorInitialized = COLORS_NOT_INITIALIZED;
-++	    useColors();
-++	}
-++	::noecho();
-++	::cbreak();
-++    }
-++}
-++
-++void
-++NCursesWindow::constructing()
-++{
-++    initialize();
-++    ++count;
-+ }
-+ 
-+ NCursesWindow::NCursesWindow()
-+-  : w(0), alloced(0), par(0), subwins(0), sib(0)
-++  : w(0), alloced(FALSE), par(0), subwins(0), sib(0)
-+ {
-+-  initialize();
-++    constructing();
-+ 
-+-  w = static_cast<WINDOW *>(0);
-+-  init();
-+-  alloced = FALSE;
-+-  subwins = par = sib = 0;
-+-  count++;
-++    w = static_cast<WINDOW *>(0);
-++    set_keyboard();
-+ }
-+ 
-+ NCursesWindow::NCursesWindow(int nlines, int ncols, int begin_y, int begin_x)
-+-  : w(0), alloced(0), par(0), subwins(0), sib(0)
-++  : w(0), alloced(TRUE), par(0), subwins(0), sib(0)
-+ {
-+-    initialize();
-++    constructing();
-+ 
-+     w = ::newwin(nlines, ncols, begin_y, begin_x);
-+     if (w == 0) {
-+ 	err_handler("Cannot construct window");
-+     }
-+-    init();
-+-
-+-    alloced = TRUE;
-+-    subwins = par = sib = 0;
-+-    count++;
-++    set_keyboard();
-+ }
-+ 
-+-NCursesWindow::NCursesWindow(WINDOW* &window)
-+-  : w(0), alloced(0), par(0), subwins(0), sib(0)
-++NCursesWindow::NCursesWindow(WINDOW* window)
-++  : w(0), alloced(FALSE), par(0), subwins(0), sib(0)
-+ {
-+-    initialize();
-++    constructing();
-+ 
-+-    w = window;
-+-    init();
-+-    alloced = FALSE;
-+-    subwins = par = sib = 0;
-+-    count++;
-++    // We used to use a reference on the "window" parameter, but we cannot do
-++    // that with an opaque pointer (see NCURSES_OPAQUE).  If the parameter was
-++    // "::stdscr", that is first set via the "constructing() call, and is null
-++    // up to that point.  So we allow a null pointer here as meaning the "same"
-++    // as "::stdscr".
-++    w = window ? window : ::stdscr;
-++    set_keyboard();
-+ }
-+ 
-+-NCursesWindow::NCursesWindow(NCursesWindow& win, int l, int c,
-++NCursesWindow::NCursesWindow(NCursesWindow& win, int ny, int nx,
-+ 			     int begin_y, int begin_x, char absrel)
-+-  : w(0), alloced(0), par(0), subwins(0), sib(0)
-++  : w(0), alloced(TRUE), par(0), subwins(0), sib(0)
-+ {
-+-    initialize();
-+-    if (absrel == 'a') { // absolute origin
-++    constructing();
-++    if (absrel == 'a') {	// absolute origin
-+ 	begin_y -= win.begy();
-+ 	begin_x -= win.begx();
-+     }
-+ 
-+-    // Even though we treat subwindows as a tree, the standard curses
-+-    // library needs the `subwin' call to link to the parent in
-+-    // order to correctly perform refreshes, etc.
-+-    // Friendly enough, this also works for pads.
-+-    w = ::derwin(win.w, l, c, begin_y, begin_x);
-++    // Link this window into its parent's list of subwindows.
-++    // We use derwin(), since this also works for pads.
-++    w = ::derwin(win.w, ny, nx, begin_y, begin_x);
-+     if (w == 0) {
-+ 	err_handler("Cannot construct subwindow");
-+     }
-+@@ -226,45 +199,40 @@
-+     par = &win;
-+     sib = win.subwins;
-+     win.subwins = this;
-+-    subwins = 0;
-+-    alloced = TRUE;
-+-    count++;
-+ }
-+ 
-+ NCursesWindow::NCursesWindow(NCursesWindow& win,
-+ 				bool do_box NCURSES_PARAM_INIT(TRUE))
-+-  : w(0), alloced(0), par(0), subwins(0), sib(0)
-++  : w(0), alloced(TRUE), par(0), subwins(0), sib(0)
-+ {
-+-  initialize();
-+-  int myHeight = win.height();
-+-  int myWidth  = win.width();
-+-  w = :: derwin(win.w, myHeight - 2, myWidth - 2, 1, 1);
-+-  if (w == 0) {
-+-    err_handler("Cannot construct subwindow");
-+-  }
-+-
-+-  par = &win;
-+-  sib = win.subwins;
-+-  win.subwins = this;
-+-  subwins = 0;
-+-  alloced = TRUE;
-+-  count++;
-+-
-+-  if (do_box) {
-+-    win.box();
-+-    win.touchwin();
-+-  }
-++    constructing();
-++    int myHeight = win.height();
-++    int myWidth  = win.width();
-++    w = :: derwin(win.w, myHeight - 2, myWidth - 2, 1, 1);
-++    if (w == 0) {
-++	err_handler("Cannot construct subwindow");
-++    }
-++
-++    par = &win;
-++    sib = win.subwins;
-++    win.subwins = this;
-++    subwins = 0;
-++
-++    if (do_box) {
-++	win.box();
-++	win.touchwin();
-++    }
-+ }
-+ 
-+ NCursesWindow NCursesWindow::Clone()
-+ {
-+-  WINDOW *d = ::dupwin(w);
-+-  NCursesWindow W(d);
-+-  W.subwins = subwins;
-+-  W.sib = sib;
-+-  W.par = par;
-+-  W.alloced = alloced;
-+-  return W;
-++    WINDOW *d = ::dupwin(w);
-++    NCursesWindow W(d);
-++    W.subwins = subwins;
-++    W.sib = sib;
-++    W.par = par;
-++    W.alloced = alloced;
-++    return W;
-+ }
-+ 
-+ typedef int (*RIPOFFINIT)(NCursesWindow&);
-+@@ -273,62 +241,64 @@
-+ static RIPOFFINIT* prip = R_INIT;
-+ 
-+ NCursesWindow::NCursesWindow(WINDOW *win, int ncols)
-+-  : w(0), alloced(0), par(0), subwins(0), sib(0)
-++  : w(0), alloced(FALSE), par(0), subwins(0), sib(0)
-+ {
-+-  initialize();
-+-  w = win;
-+-  assert((w->_maxx+1)==ncols);
-+-  alloced = FALSE;
-+-  subwins = par = sib = 0;
-++    initialize();
-++    w = win;
-++    assert((w->_maxx +1 ) == ncols);
-+ }
-+ 
-+ int _nc_xx_ripoff_init(WINDOW *w, int ncols)
-+ {
-+-  int res = ERR;
-++    int res = ERR;
-+ 
-+-  RIPOFFINIT init = *prip++;
-+-  if (init) {
-+-    NCursesWindow* W = new NCursesWindow(w,ncols);
-+-    res = init(*W);
-+-  }
-+-  return res;
-++    RIPOFFINIT init = *prip++;
-++    if (init) {
-++	NCursesWindow* W = new NCursesWindow(w,ncols);
-++	res = init(*W);
-++    }
-++    return res;
-+ }
-+ 
-+ int NCursesWindow::ripoffline(int ripoff_lines,
-+ 			      int (*init)(NCursesWindow& win))
-+ {
-+-  int code = ::_nc_ripoffline(ripoff_lines,_nc_xx_ripoff_init);
-+-  if (code==OK && init && ripoff_lines) {
-+-    R_INIT[r_init_idx++] = init;
-+-  }
-+-  return code;
-++    int code = ::_nc_ripoffline(ripoff_lines,_nc_xx_ripoff_init);
-++    if (code == OK && init && ripoff_lines) {
-++	R_INIT[r_init_idx++] = init;
-++    }
-++    return code;
-+ }
-+ 
-+ bool
-+ NCursesWindow::isDescendant(NCursesWindow& win)
-+ {
-+-  for (NCursesWindow* p = subwins; p != NULL; p = p->sib) {
-+-    if (p==&win)
-+-      return TRUE;
-+-    else {
-+-      if (p->isDescendant(win))
-+-	return TRUE;
-++    bool result = FALSE;
-++
-++    for (NCursesWindow* p = subwins; p != NULL; p = p->sib) {
-++	if (p == &win || p->isDescendant(win)) {
-++	    result = TRUE;
-++	    break;
-++	}
-+     }
-+-  }
-+-  return FALSE;
-++    return result;
-+ }
-+ 
-+ void
-+ NCursesWindow::kill_subwindows()
-+ {
-+-    for (NCursesWindow* p = subwins; p != 0; p = p->sib) {
-++    NCursesWindow* p = subwins;
-++
-++    subwins = 0;
-++    while (p != 0) {
-++	NCursesWindow* q = p->sib;
-+ 	p->kill_subwindows();
-+ 	if (p->alloced) {
-+ 	    if (p->w != 0)
-+ 		::delwin(p->w);
-+-	    p->alloced = FALSE;
-+ 	}
-+-	p->w = 0; // cause a run-time error if anyone attempts to use...
-++	delete p;
-++	p = q;
-+     }
-+ }
-+ 
-+@@ -337,22 +307,21 @@
-+ {
-+     kill_subwindows();
-+ 
-+-    if (par != 0) {  // Snip us from the parent's list of subwindows.
-+-	NCursesWindow * win = par->subwins;
-+-	NCursesWindow * trail = 0;
-+-	for (;;) {
-+-	    if (win == 0)
-++    if (par != 0) {
-++	// Remove this window from the parent's list of subwindows.
-++	NCursesWindow * next = par->subwins;
-++	NCursesWindow * prev = 0;
-++	while (next != 0) {
-++	    if (next == this) {
-++		if (prev != 0) {
-++		    prev->sib = next->sib;
-++		} else {
-++		    par->subwins = next->sib;
-++		}
-+ 		break;
-+-	    else if (win == this) {
-+-		if (trail != 0)
-+-		    trail->sib = win->sib;
-+-		else
-+-		    par->subwins = win->sib;
-+-		break;
-+-	    } else {
-+-		trail = win;
-+-		win = win->sib;
-+ 	    }
-++	    prev = next;
-++	    next = next->sib;
-+ 	}
-+     }
-+ 
-+@@ -360,13 +329,12 @@
-+ 	::delwin(w);
-+ 
-+     if (alloced) {
-+-      --count;
-+-      if (count == 0) {
-+-	::endwin();
-+-      }
-+-      else if (count < 0) { // cannot happen!
-+-	err_handler("Too many windows destroyed");
-+-      }
-++	--count;
-++	if (count == 0) {
-++	    ::endwin();
-++	} else if (count < 0) { // cannot happen!
-++	    err_handler("Too many windows destroyed");
-++	}
-+     }
-+ }
-+ 
-+@@ -379,89 +347,82 @@
-+ NCursesWindow::useColors(void)
-+ {
-+     if (colorInitialized == COLORS_NOT_INITIALIZED) {
-+-      if (b_initialized) {
-+-	if (::has_colors()) {
-+-	  ::start_color();
-+-	  colorInitialized = COLORS_ARE_REALLY_THERE;
-++	if (b_initialized) {
-++	    if (::has_colors()) {
-++		::start_color();
-++		colorInitialized = COLORS_ARE_REALLY_THERE;
-++	    } else {
-++		colorInitialized = COLORS_MONOCHROME;
-++	    }
-++	} else {
-++	    colorInitialized = COLORS_NEED_INITIALIZATION;
-+ 	}
-+-	else
-+-	  colorInitialized = COLORS_MONOCHROME;
-+-      }
-+-      else
-+-	colorInitialized = COLORS_NEED_INITIALIZATION;
-+     }
-+ }
-+ 
-+ short
-++NCursesWindow::getPair() const
-++{
-++    return static_cast<short>(PAIR_NUMBER(getattrs(w)));
-++}
-++
-++short
-+ NCursesWindow::getcolor(int getback) const
-+ {
-+     short fore, back;
-+ 
-+-    if (colorInitialized==COLORS_ARE_REALLY_THERE) {
-+-      if (::pair_content(static_cast<short>(PAIR_NUMBER(w->_attrs)), &fore, &back))
-+-	err_handler("Can't get color pair");
-+-    }
-+-    else {
-+-      // Monochrome means white on black
-+-      back = COLOR_BLACK;
-+-      fore = COLOR_WHITE;
-++    if (HaveColors()) {
-++	if (::pair_content(getPair(), &fore, &back) == ERR)
-++	    err_handler("Can't get color pair");
-++    } else {
-++	// Monochrome means white on black
-++	back = COLOR_BLACK;
-++	fore = COLOR_WHITE;
-+     }
-+     return getback ? back : fore;
-+ }
-+ 
-+ int NCursesWindow::NumberOfColors()
-+ {
-+-  if (colorInitialized==COLORS_ARE_REALLY_THERE)
-+-    return COLORS;
-+-  else
-+-    return 1; // monochrome (actually there are two ;-)
-++    return (HaveColors()) ? COLORS : 1;
-+ }
-+ 
-+ short
-+ NCursesWindow::getcolor() const
-+ {
-+-  if (colorInitialized==COLORS_ARE_REALLY_THERE)
-+-    return PAIR_NUMBER(w->_attrs);
-+-  else
-+-    return 0; // we only have pair zero
-++    return (HaveColors()) ? getPair() : 0;
-+ }
-+ 
-+ int
-+ NCursesWindow::setpalette(short fore, short back, short pair)
-+ {
-+-  if (colorInitialized==COLORS_ARE_REALLY_THERE)
-+-    return ::init_pair(pair, fore, back);
-+-  else
-+-    return OK;
-++    return (HaveColors()) ? ::init_pair(pair, fore, back) : OK;
-+ }
-+ 
-+ int
-+ NCursesWindow::setpalette(short fore, short back)
-+ {
-+-  if (colorInitialized==COLORS_ARE_REALLY_THERE)
-+-    return setpalette(fore, back, static_cast<short>(PAIR_NUMBER(w->_attrs)));
-+-  else
-+-    return OK;
-++    return setpalette(fore, back, getPair());
-+ }
-+ 
-+ 
-+ int
-+ NCursesWindow::setcolor(short pair)
-+ {
-+-  if (colorInitialized==COLORS_ARE_REALLY_THERE) {
-+-    if ((pair < 1) || (pair > COLOR_PAIRS))
-+-      err_handler("Can't set color pair");
-+-
-+-    attroff(A_COLOR);
-+-    attrset(COLOR_PAIR(pair));
-+-  }
-+-  return OK;
-++    if (HaveColors()) {
-++	if ((pair < 1) || (pair > COLOR_PAIRS))
-++	    err_handler("Can't set color pair");
-++
-++	attroff(A_COLOR);
-++	attrset(COLOR_PAIR(pair));
-++    }
-++    return OK;
-+ }
-+ 
-+ #if HAVE_HAS_KEY
-+ bool NCursesWindow::has_mouse() const
-+ {
-+-  return ((::has_key(KEY_MOUSE) || ::_nc_has_mouse())
-+-	  ? TRUE : FALSE);
-++    return ((::has_key(KEY_MOUSE) || ::_nc_has_mouse())
-++	     ? TRUE : FALSE);
-+ }
-+ #endif
-+Index: c++/cursesw.h
-+Prereq:  1.38 
-+--- ncurses-5.6/c++/cursesw.h	2005-07-23 20:51:39.000000000 +0000
-++++ ncurses-5.6-20071201/c++/cursesw.h	2007-11-24 19:09:09.000000000 +0000
-+@@ -1,6 +1,6 @@
-+ // * This makes emacs happy -*-Mode: C++;-*-
-+ /****************************************************************************
-+- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -30,17 +30,10 @@
-+ #ifndef NCURSES_CURSESW_H_incl
-+ #define NCURSES_CURSESW_H_incl 1
-+ 
-+-// $Id: cursesw.h,v 1.38 2005/07/23 20:51:39 tom Exp $
-+-
-+-#include <stdarg.h>
-+-#include <stdio.h>
-++// $Id: cursesw.h,v 1.46 2007/11/24 19:09:09 tom Exp $
-+ 
-+ #include <etip.h>
-+ 
-+-#if HAVE_STRSTREAM_H && (USE_STRSTREAM_VSCAN||USE_STRSTREAM_VSCAN_CAST)
-+-#include <strstream.h>
-+-#endif
-+-
-+ extern "C" {
-+ #  include   <curses.h>
-+ }
-+@@ -705,11 +698,13 @@
-+ private:
-+   static bool    b_initialized;
-+   static void    initialize();
-++  void           constructing();
-+   friend int     _nc_xx_ripoff_init(WINDOW *, int);
-+ 
-+-  void           init();
-++  void           set_keyboard();
-+ 
-+   short          getcolor(int getback) const;
-++  short          getPair() const;
-+ 
-+   static int     setpalette(short fore, short back, short pair);
-+   static int     colorInitialized;
-+@@ -743,7 +738,7 @@
-+   NCursesWindow();
-+ 
-+ public:
-+-  NCursesWindow(WINDOW* &window);  // useful only for stdscr
-++  NCursesWindow(WINDOW* window);   // useful only for stdscr
-+ 
-+   NCursesWindow(int nlines,        // number of lines
-+ 		int ncols,         // number of columns
-+@@ -823,16 +818,16 @@
-+   int            width() const { return maxx() + 1; }
-+   // Number of columns in this window
-+ 
-+-  int            begx() const { return w->_begx; }
-++  int            begx() const { return getbegx(w); }
-+   // Column of top left corner relative to stdscr
-+ 
-+-  int            begy() const { return w->_begy; }
-++  int            begy() const { return getbegy(w); }
-+   // Line of top left corner relative to stdscr
-+ 
-+-  int            maxx() const { return w->_maxx; }
-++  int            maxx() const { return getmaxx(w) == ERR ? ERR : getmaxx(w)-1; }
-+   // Largest x coord in window
-+ 
-+-  int            maxy() const { return w->_maxy; }
-++  int            maxy() const { return getmaxy(w) == ERR ? ERR : getmaxy(w)-1; }
-+   // Largest y coord in window
-+ 
-+   short          getcolor() const;
-+@@ -1220,6 +1215,14 @@
-+   // sminrow,smincol.
-+ 
-+   // -------------------------------------------------------------------------
-++  // Extended functions
-++  // -------------------------------------------------------------------------
-++#ifdef NCURSES_EXT_FUNCS
-++  int            wresize(int newLines, int newColumns) {
-++    return ::wresize(w, newLines, newColumns); }
-++#endif
-++
-++  // -------------------------------------------------------------------------
-+   // Mouse related
-+   // -------------------------------------------------------------------------
-+   bool has_mouse() const;
-+Index: c++/demo.cc
-+Prereq:  1.34 
-+--- ncurses-5.6/c++/demo.cc	2006-04-22 22:38:57.000000000 +0000
-++++ ncurses-5.6-20071201/c++/demo.cc	2007-04-07 20:24:49.000000000 +0000
-+@@ -1,6 +1,6 @@
-+ // * This makes emacs happy -*-Mode: C++;-*-
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -35,7 +35,7 @@
-+  *   Demo code for NCursesMenu and NCursesForm written by
-+  *   Juergen Pfeifer
-+  *
-+- * $Id: demo.cc,v 1.34 2006/04/22 22:38:57 tom Exp $
-++ * $Id: demo.cc,v 1.36 2007/04/07 20:24:49 tom Exp $
-+  */
-+ 
-+ #include "internal.h"
-+@@ -55,30 +55,30 @@
-+   public:
-+   void run(int sleeptime) {
-+ 
-+-    NCursesPanel *std = new NCursesPanel();
-++    NCursesPanel *mystd = new NCursesPanel();
-+ 
-+     //  Make a few small demo panels
-+ 
-+-    NCursesPanel *u = new NCursesPanel(8,20,12,4);
-+-    NCursesPanel *v = new NCursesPanel(8,20,10,6);
-+-    NCursesPanel *w = new NCursesPanel(8,20,8,8);
-+-    NCursesPanel *x = new NCursesPanel(8,20,6,10);
-+-    NCursesPanel *y = new NCursesPanel(8,20,4,12);
-+-    NCursesPanel *z = new NCursesPanel(8,30,2,14);
-++    NCursesPanel *u = new NCursesPanel(8, 20, 12, 4);
-++    NCursesPanel *v = new NCursesPanel(8, 20, 10, 6);
-++    NCursesPanel *w = new NCursesPanel(8, 20, 8, 8);
-++    NCursesPanel *x = new NCursesPanel(8, 20, 6, 10);
-++    NCursesPanel *y = new NCursesPanel(8, 20, 4, 12);
-++    NCursesPanel *z = new NCursesPanel(8, 30, 2, 14);
-+ 
-+     //  Draw something on the main screen, so we can see what happens
-+     //  when panels get moved or deleted.
-+ 
-+-    std->box();
-+-    std->move(std->height()/2,1);
-+-    std->hline(std->width()-2);
-+-    std->move(1,std->width()/2);
-+-    std->vline(std->height()-2);
-+-    std->addch(0,std->width()/2,ACS_TTEE);
-+-    std->addch(std->height()-1,std->width()/2,ACS_BTEE);
-+-    std->addch(std->height()/2,0,ACS_LTEE);
-+-    std->addch(std->height()/2,std->width()-1,ACS_RTEE);
-+-    std->addch(std->height()/2,std->width()/2,ACS_PLUS);
-++    mystd->box();
-++    mystd->move(mystd->height()/2, 1);
-++    mystd->hline(mystd->width()-2);
-++    mystd->move(1, mystd->width()/2);
-++    mystd->vline(mystd->height()-2);
-++    mystd->addch(0, mystd->width()/2, ACS_TTEE);
-++    mystd->addch(mystd->height()-1, mystd->width()/2, ACS_BTEE);
-++    mystd->addch(mystd->height()/2, 0, ACS_LTEE);
-++    mystd->addch(mystd->height()/2, mystd->width()-1, ACS_RTEE);
-++    mystd->addch(mystd->height()/2, mystd->width()/2, ACS_PLUS);
-+ 
-+     //  Draw frames with titles around panels so that we can see where
-+     //  the panels are located.
-+@@ -98,56 +98,56 @@
-+     }
-+ 
-+     //  A refresh to any valid panel updates all panels and refreshes
-+-    //  the screen.  Using std is just convenient - We know it's always
-++    //  the screen.  Using mystd is just convenient - We know it's always
-+     //  valid until the end of the program.
-+ 
-+-    std->refresh();
-++    mystd->refresh();
-+     sleep(sleeptime);
-+ 
-+     //  Show what happens when panels are deleted and moved.
-+ 
-+     sleep(sleeptime);
-+     delete u;
-+-    std->refresh();
-++    mystd->refresh();
-+ 
-+     sleep(sleeptime);
-+     delete z;
-+-    std->refresh();
-++    mystd->refresh();
-+ 
-+     sleep(sleeptime);
-+     delete v;
-+-    std->refresh();
-++    mystd->refresh();
-+ 
-+     // show how it looks when a panel moves
-+     sleep(sleeptime);
-+-    y->mvwin(5,30);
-+-    std->refresh();
-++    y->mvwin(5, 30);
-++    mystd->refresh();
-+ 
-+     sleep(sleeptime);
-+     delete y;
-+-    std->refresh();
-++    mystd->refresh();
-+ 
-+     // show how it looks when you raise a panel
-+     sleep(sleeptime);
-+     w->top();
-+-    std->refresh();
-++    mystd->refresh();
-+ 
-+     sleep(sleeptime);
-+     delete w;
-+-    std->refresh();
-++    mystd->refresh();
-+ 
-+     sleep(sleeptime);
-+     delete x;
-+ 
-+-    std->clear();
-+-    std->refresh();
-++    mystd->clear();
-++    mystd->refresh();
-+ 
-+     //  Don't forget to clean up the main screen.  Since this is the
-+     //  last thing using NCursesWindow, this has the effect of
-+     //  shutting down ncurses and restoring the terminal state.
-+ 
-+     sleep(sleeptime);
-+-    delete std;
-++    delete mystd;
-+   }
-+ };
-+ 
-+@@ -247,21 +247,21 @@
-+ 
-+     F     = new NCursesFormField*[10];
-+     mft   = new MyFieldType('X');
-+-    ift   = new Integer_Field(0,1,10);
-++    ift   = new Integer_Field(0, 1, 10);
-+     eft   = new Enumeration_Field(weekdays);
-+ 
-+-    F[0]  = new Label("Demo Entry Form",0,16);
-+-    F[1]  = new Label("Weekday Enum",2,1);
-+-    F[2]  = new Label("Number(1-10)",2,21);
-+-    F[3]  = new Label("Only 'X'",2,35);
-+-    F[4]  = new Label("Multiline Field (Dynamic and Scrollable)",5,1);
-+-    F[5]  = new NCursesFormField(1,18,3,1);
-+-    F[6]  = new NCursesFormField(1,12,3,21);
-+-    F[7]  = new NCursesFormField(1,12,3,35);
-+-    F[8]  = new NCursesFormField(4,46,6,1,2);
-++    F[0]  = new Label("Demo Entry Form", 0, 16);
-++    F[1]  = new Label("Weekday Enum", 2, 1);
-++    F[2]  = new Label("Number(1-10)", 2, 21);
-++    F[3]  = new Label("Only 'X'", 2, 35);
-++    F[4]  = new Label("Multiline Field (Dynamic and Scrollable)", 5, 1);
-++    F[5]  = new NCursesFormField(1, 18, 3, 1);
-++    F[6]  = new NCursesFormField(1, 12, 3, 21);
-++    F[7]  = new NCursesFormField(1, 12, 3, 35);
-++    F[8]  = new NCursesFormField(4, 46, 6, 1, 2);
-+     F[9]  = new NCursesFormField();
-+ 
-+-    InitForm(F,TRUE,TRUE);
-++    InitForm(F, TRUE, TRUE);
-+     boldframe();
-+ 
-+     F[5]->set_fieldtype(*eft);
-+@@ -312,7 +312,7 @@
-+     Soft_Label_Key_Set* S = new Soft_Label_Key_Set;
-+     for(int i=1; i <= S->labels(); i++) {
-+       char buf[8];
-+-      ::sprintf(buf,"Frm%02d",i);
-++      ::sprintf(buf, "Frm%02d", i);
-+       (*S)[i] = buf;                                      // Text
-+       (*S)[i] = Soft_Label_Key_Set::Soft_Label_Key::Left; // Justification
-+     }
-+@@ -336,9 +336,9 @@
-+     const int PADSIZE  = 200;
-+     unsigned gridcount = 0;
-+ 
-+-    NCursesPanel std;
-+-    NCursesPanel P(std.lines()-2,std.cols()-2,1,1);
-+-    NCursesFramedPad FP(P,PADSIZE,PADSIZE);
-++    NCursesPanel mystd;
-++    NCursesPanel P(mystd.lines()-2, mystd.cols()-2, 1, 1);
-++    NCursesFramedPad FP(P, PADSIZE, PADSIZE);
-+ 
-+     for (int i=0; i < PADSIZE; i++) {
-+       for (int j=0; j < PADSIZE; j++) {
-+@@ -357,7 +357,7 @@
-+       }
-+     }
-+ 
-+-    P.label("Pad Demo",NULL);
-++    P.label("Pad Demo", NULL);
-+     FP();
-+     P.clear();
-+     return FALSE;
-+@@ -385,9 +385,9 @@
-+   }
-+ 
-+   bool action() {
-+-    NCursesPanel *std = new NCursesPanel();
-++    NCursesPanel *mystd = new NCursesPanel();
-+ 
-+-    NCursesPanel *w = new NCursesPanel(std->lines() - 2, std->cols() - 2, 1, 1);
-++    NCursesPanel *w = new NCursesPanel(mystd->lines() - 2, mystd->cols() - 2, 1, 1);
-+     w->box();
-+     w->refresh();
-+ 
-+@@ -411,7 +411,7 @@
-+ 
-+     delete s;
-+     delete w;
-+-    delete std;
-++    delete mystd;
-+     ::noecho();
-+     return FALSE;
-+   }
-+@@ -444,10 +444,10 @@
-+     I[6] = new QuitItem();
-+     I[7] = new NCursesMenuItem(); // Terminating empty item
-+ 
-+-    InitMenu(I,TRUE,TRUE);
-++    InitMenu(I, TRUE, TRUE);
-+ 
-+-    P = new NCursesPanel(1,n_items,LINES-1,1);
-+-    boldframe("Demo","Silly");
-++    P = new NCursesPanel(1, n_items, LINES-1, 1);
-++    boldframe("Demo", "Silly");
-+     P->show();
-+   }
-+ 
-+@@ -474,7 +474,7 @@
-+   virtual void On_Menu_Init()
-+   {
-+     NCursesWindow W(::stdscr);
-+-    P->move(0,0);
-++    P->move(0, 0);
-+     P->clrtoeol();
-+     for(int i=1; i<=count(); i++)
-+       P->addch('0' + i);
-+@@ -484,25 +484,25 @@
-+ 
-+   virtual void On_Menu_Termination()
-+   {
-+-    P->move(0,0);
-++    P->move(0, 0);
-+     P->clrtoeol();
-+     refresh();
-+   }
-+ 
-+   virtual void On_Item_Init(NCursesMenuItem& item)
-+   {
-+-    P->move(0,item.index());
-++    P->move(0, item.index());
-+     P->attron(A_REVERSE);
-+-    P->printw("%1d",1+item.index());
-++    P->printw("%1d", 1+item.index());
-+     P->attroff(A_REVERSE);
-+     refresh();
-+   }
-+ 
-+   virtual void On_Item_Termination(NCursesMenuItem& item)
-+   {
-+-    P->move(0,item.index());
-++    P->move(0, item.index());
-+     P->attroff(A_REVERSE);
-+-    P->printw("%1d",1+item.index());
-++    P->printw("%1d", 1+item.index());
-+     refresh();
-+   }
-+ };
-+@@ -530,7 +530,7 @@
-+ {
-+   for(int i=1; i <= S.labels(); i++) {
-+     char buf[8];
-+-    ::sprintf(buf,"Key%02d",i);
-++    ::sprintf(buf, "Key%02d", i);
-+     S[i] = buf;                                      // Text
-+     S[i] = Soft_Label_Key_Set::Soft_Label_Key::Left; // Justification
-+   }
-+@@ -542,7 +542,7 @@
-+   const int len = ::strlen(titleText);
-+ 
-+   titleWindow->bkgd(screen_titles());
-+-  titleWindow->addstr(0,(titleWindow->cols() - len)/2, titleText);
-++  titleWindow->addstr(0, (titleWindow->cols() - len)/2, titleText);
-+   titleWindow->noutrefresh();
-+ }
-+ 
-+@@ -557,4 +557,4 @@
-+ //
-+ // -------------------------------------------------------------------------
-+ //
-+-static TestApplication Demo;
-++static TestApplication *Demo = new TestApplication();
-+Index: c++/edit_cfg.sh
-+Prereq:  1.14 
-+--- ncurses-5.6/c++/edit_cfg.sh	2005-04-30 21:00:22.000000000 +0000
-++++ ncurses-5.6-20071201/c++/edit_cfg.sh	2007-04-07 19:08:49.000000000 +0000
-+@@ -1,7 +1,7 @@
-+ #!/bin/sh
-+-# $Id: edit_cfg.sh,v 1.14 2005/04/30 21:00:22 tom Exp $
-++# $Id: edit_cfg.sh,v 1.16 2007/04/07 19:08:49 tom Exp $
-+ ##############################################################################
-+-# Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.                #
-++# Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.                #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -28,7 +28,7 @@
-+ # authorization.                                                             #
-+ ##############################################################################
-+ #
-+-# Author: Thomas E. Dickey 1997
-++# Author: Thomas E. Dickey 1997-on
-+ #
-+ # Edit the default value of the etip.h file based on the autoconf-generated
-+ # values:
-+@@ -45,11 +45,9 @@
-+ 	HAVE_BUILTIN_H \
-+ 	HAVE_GPP_BUILTIN_H \
-+ 	HAVE_GXX_BUILTIN_H \
-+-	HAVE_STRSTREAM_H \
-++	HAVE_IOSTREAM \
-+ 	HAVE_TYPEINFO \
-+-	HAVE_VALUES_H \
-+-	USE_STRSTREAM_VSCAN \
-+-	USE_STRSTREAM_VSCAN_CAST
-++	HAVE_VALUES_H
-+ do
-+ 	rm -f $2.bak
-+ 	mv $2 $2.bak
-+Index: c++/etip.h.in
-+Prereq:  1.32 
-+--- ncurses-5.6/c++/etip.h.in	2005-08-06 19:55:57.000000000 +0000
-++++ ncurses-5.6-20071201/c++/etip.h.in	2007-04-07 18:56:32.000000000 +0000
-+@@ -1,6 +1,6 @@
-+ // * This makes emacs happy -*-Mode: C++;-*-
-+ /****************************************************************************
-+- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -31,7 +31,7 @@
-+  *   Author: Juergen Pfeifer, 1997                                          *
-+  ****************************************************************************/
-+ 
-+-// $Id: etip.h.in,v 1.32 2005/08/06 19:55:57 tom Exp $
-++// $Id: etip.h.in,v 1.36 2007/04/07 18:56:32 tom Exp $
-+ 
-+ #ifndef NCURSES_ETIP_H_incl
-+ #define NCURSES_ETIP_H_incl 1
-+@@ -49,8 +49,8 @@
-+ #define HAVE_GPP_BUILTIN_H 0
-+ #endif
-+ 
-+-#ifndef HAVE_STRSTREAM_H
-+-#define HAVE_STRSTREAM_H 0
-++#ifndef HAVE_IOSTREAM
-++#define HAVE_IOSTREAM 0
-+ #endif
-+ 
-+ #ifndef HAVE_TYPEINFO
-+@@ -77,14 +77,6 @@
-+ #define CPP_HAS_STATIC_CAST 0	// workaround for g++ 2.95.3
-+ #endif
-+ 
-+-#ifndef USE_STRSTREAM_VSCAN
-+-#define USE_STRSTREAM_VSCAN 0
-+-#endif
-+-
-+-#ifndef USE_STRSTREAM_VSCAN_CAST
-+-#define USE_STRSTREAM_VSCAN_CAST 0
-+-#endif
-+-
-+ #ifdef __GNUG__
-+ #  if ((__GNUG__ <= 2) && (__GNUC_MINOR__ < 8))
-+ #    if HAVE_TYPEINFO
-+@@ -335,30 +327,46 @@
-+ };
-+ 
-+ #if !((defined(__GNUG__) && defined(__EXCEPTIONS)) || defined(__SUNPRO_CC))
-+-#  include <iostream.h>
-++#  if HAVE_IOSTREAM
-++#     include <iostream>
-++using std::cerr;
-++using std::endl;
-++#  else
-++#     include <iostream.h>
-++#  endif
-+    extern "C" void exit(int);
-+ #endif
-+ 
-+ inline void THROW(const NCursesException *e) {
-+ #if defined(__GNUG__) && defined(__EXCEPTIONS)
-+ #  if ((__GNUG__ <= 2) && (__GNUC_MINOR__ < 8))
-+-      (*lib_error_handler)(e?e->classname():"",e?e->message:"");
-++      (*lib_error_handler)(e ? e->classname() : "", e ? e->message : "");
-+ #else
-+-      throw *e;
-++#define CPP_HAS_TRY_CATCH 1
-+ #endif
-+ #elif defined(__SUNPRO_CC)
-+ #  if !defined(__SUNPRO_CC_COMPAT) || (__SUNPRO_CC_COMPAT < 5)
-+   genericerror(1, ((e != 0) ? (char *)(e->message) : ""));
-+ #else
-+-  throw *e;
-++#define CPP_HAS_TRY_CATCH 1
-+ #endif
-+ #else
-+   if (e)
-+     cerr << e->message << endl;
-+   exit(0);
-+ #endif
-+-}
-+ 
-+-#define THROWS(s)
-++#ifndef CPP_HAS_TRY_CATCH
-++#define CPP_HAS_TRY_CATCH 0
-++#define NCURSES_CPP_TRY		/* nothing */
-++#define NCURSES_CPP_CATCH(e)	if (false)
-++#define THROWS(s)		/* nothing */
-++#elif CPP_HAS_TRY_CATCH
-++  throw *e;
-++#define NCURSES_CPP_TRY		try
-++#define NCURSES_CPP_CATCH(e)	catch(e)
-++#define THROWS(s)		throw(s)
-++#endif
-++}
-+ 
-+ #endif /* NCURSES_ETIP_H_incl */
-+Index: c++/headers
-+Prereq:  1.2 
-+--- ncurses-5.6/c++/headers	1998-02-11 12:13:40.000000000 +0000
-++++ ncurses-5.6-20071201/c++/headers	2006-12-24 16:25:45.000000000 +0000
-+@@ -1,7 +1,7 @@
-+ # C++ headers
-+-# $Id: headers,v 1.2 1998/02/11 12:13:40 tom Exp $
-++# $Id: headers,v 1.3 2006/12/24 16:25:45 tom Exp $
-+ ##############################################################################
-+-# Copyright (c) 1998 Free Software Foundation, Inc.                          #
-++# Copyright (c) 1998,2006 Free Software Foundation, Inc.                     #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -37,3 +37,4 @@
-+ $(srcdir)/cursesw.h
-+ $(srcdir)/cursslk.h
-+ etip.h
-++# vile:makemode
-+Index: c++/internal.h
-+Prereq:  1.13 
-+--- ncurses-5.6/c++/internal.h	2006-09-30 21:59:57.000000000 +0000
-++++ ncurses-5.6-20071201/c++/internal.h	2007-06-02 15:58:00.000000000 +0000
-+@@ -1,6 +1,6 @@
-+ // * This makes emacs happy -*-Mode: C++;-*-
-+ /****************************************************************************
-+- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -31,13 +31,15 @@
-+  *   Author: Juergen Pfeifer, 1997                                          *
-+  ****************************************************************************/
-+ 
-+-// $Id: internal.h,v 1.13 2006/09/30 21:59:57 tom Exp $
-++// $Id: internal.h,v 1.15 2007/06/02 15:58:00 tom Exp $
-+ 
-+ #ifndef NCURSES_CPLUS_INTERNAL_H
-+ #define NCURSES_CPLUS_INTERNAL_H 1
-+ 
-+ #include <ncurses_cfg.h>
-+ 
-++#include <stdlib.h>
-++
-+ #if USE_RCS_IDS
-+ #define MODULE_ID(id) static const char Ident[] = id;
-+ #else
-+Index: c++/modules
-+Prereq:  1.6 
-+--- ncurses-5.6/c++/modules	1999-07-31 09:46:54.000000000 +0000
-++++ ncurses-5.6-20071201/c++/modules	2006-12-24 00:53:08.000000000 +0000
-+@@ -1,7 +1,7 @@
-+ # Program modules
-+-# $Id: modules,v 1.6 1999/07/31 09:46:54 juergen Exp $
-++# $Id: modules,v 1.7 2006/12/24 00:53:08 tom Exp $
-+ ##############################################################################
-+-# Copyright (c) 1998 Free Software Foundation, Inc.                          #
-++# Copyright (c) 1998,2006 Free Software Foundation, Inc.                     #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -28,7 +28,7 @@
-+ # authorization.                                                             #
-+ ##############################################################################
-+ #
-+-# Author: Thomas E. Dickey <dickey@clark.net> 1995,1997
-++# Author: Thomas E. Dickey	1995-on
-+ #
-+ 
-+ @ base
-+@@ -41,3 +41,5 @@
-+ cursesapp	c++		$(srcdir)	$(cursesapp_h)
-+ cursesmain	c++		$(srcdir)	$(cursesapp_h)
-+ demo		c++		$(srcdir)	$(cursesf_h) $(cursesm_h) $(cursesapp_h)
-++
-++# vile:makemode
-+Index: config.guess
-+--- ncurses-5.6/config.guess	2006-07-22 15:57:37.000000000 +0000
-++++ ncurses-5.6-20071201/config.guess	2007-07-04 15:02:46.000000000 +0000
-+@@ -4,7 +4,7 @@
-+ #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-+ #   Inc.
-+ 
-+-timestamp='2006-07-02'
-++timestamp='2007-05-17'
-+ 
-+ # This file is free software; you can redistribute it and/or modify it
-+ # under the terms of the GNU General Public License as published by
-+@@ -161,6 +161,7 @@
-+ 	    arm*) machine=arm-unknown ;;
-+ 	    sh3el) machine=shl-unknown ;;
-+ 	    sh3eb) machine=sh-unknown ;;
-++	    sh5el) machine=sh5le-unknown ;;
-+ 	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-+ 	esac
-+ 	# The Operating System including object format, if it has switched
-+@@ -329,7 +330,7 @@
-+     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-+ 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ 	exit ;;
-+-    i86pc:SunOS:5.*:*)
-++    i86pc:SunOS:5.*:* | ix86xen:SunOS:5.*:*)
-+ 	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+ 	exit ;;
-+     sun4*:SunOS:6*:*)
-+@@ -780,7 +781,7 @@
-+     i*:CYGWIN*:*)
-+ 	echo ${UNAME_MACHINE}-pc-cygwin
-+ 	exit ;;
-+-    i*:MINGW*:*)
-++    *:MINGW*:*)
-+ 	echo ${UNAME_MACHINE}-pc-mingw32
-+ 	exit ;;
-+     i*:windows32*:*)
-+@@ -790,12 +791,15 @@
-+     i*:PW*:*)
-+ 	echo ${UNAME_MACHINE}-pc-pw32
-+ 	exit ;;
-+-    x86:Interix*:[3456]*)
-+-	echo i586-pc-interix${UNAME_RELEASE}
-+-	exit ;;
-+-    EM64T:Interix*:[3456]*)
-+-	echo x86_64-unknown-interix${UNAME_RELEASE}
-+-	exit ;;
-++    *:Interix*:[3456]*)
-++    	case ${UNAME_MACHINE} in
-++	    x86) 
-++		echo i586-pc-interix${UNAME_RELEASE}
-++		exit ;;
-++	    EM64T | authenticamd)
-++		echo x86_64-unknown-interix${UNAME_RELEASE}
-++		exit ;;
-++	esac ;;
-+     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-+ 	echo i${UNAME_MACHINE}-pc-mks
-+ 	exit ;;
-+@@ -950,6 +954,9 @@
-+     x86_64:Linux:*:*)
-+ 	echo x86_64-unknown-linux-gnu
-+ 	exit ;;
-++    xtensa:Linux:*:*)
-++    	echo xtensa-unknown-linux-gnu
-++	exit ;;
-+     i*86:Linux:*:*)
-+ 	# The BFD linker knows what the default object file format is, so
-+ 	# first see if it will tell us. cd to the root directory to prevent
-+@@ -1208,6 +1215,15 @@
-+     SX-6:SUPER-UX:*:*)
-+ 	echo sx6-nec-superux${UNAME_RELEASE}
-+ 	exit ;;
-++    SX-7:SUPER-UX:*:*)
-++	echo sx7-nec-superux${UNAME_RELEASE}
-++	exit ;;
-++    SX-8:SUPER-UX:*:*)
-++	echo sx8-nec-superux${UNAME_RELEASE}
-++	exit ;;
-++    SX-8R:SUPER-UX:*:*)
-++	echo sx8r-nec-superux${UNAME_RELEASE}
-++	exit ;;
-+     Power*:Rhapsody:*:*)
-+ 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-+ 	exit ;;
-+Index: config.sub
-+--- ncurses-5.6/config.sub	2006-08-14 16:00:00.000000000 +0000
-++++ ncurses-5.6-20071201/config.sub	2007-07-04 15:03:05.000000000 +0000
-+@@ -4,7 +4,7 @@
-+ #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-+ #   Inc.
-+ 
-+-timestamp='2006-08-14'
-++timestamp='2007-06-28'
-+ 
-+ # This file is (in principle) common to ALL GNU software.
-+ # The presence of a machine in this file suggests that SOME GNU software
-+@@ -245,12 +245,12 @@
-+ 	| bfin \
-+ 	| c4x | clipper \
-+ 	| d10v | d30v | dlx | dsp16xx \
-+-	| fr30 | frv \
-++	| fido | fr30 | frv \
-+ 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-+ 	| i370 | i860 | i960 | ia64 \
-+ 	| ip2k | iq2000 \
-+ 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-+-	| maxq | mb | microblaze | mcore \
-++	| maxq | mb | microblaze | mcore | mep \
-+ 	| mips | mipsbe | mipseb | mipsel | mipsle \
-+ 	| mips16 \
-+ 	| mips64 | mips64el \
-+@@ -276,6 +276,7 @@
-+ 	| pdp10 | pdp11 | pj | pjl \
-+ 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-+ 	| pyramid \
-++	| score \
-+ 	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-+ 	| sh64 | sh64le \
-+ 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-+@@ -323,7 +324,7 @@
-+ 	| clipper-* | craynv-* | cydra-* \
-+ 	| d10v-* | d30v-* | dlx-* \
-+ 	| elxsi-* \
-+-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-++	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-+ 	| h8300-* | h8500-* \
-+ 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-+ 	| i*86-* | i860-* | i960-* | ia64-* \
-+@@ -474,8 +475,8 @@
-+ 		basic_machine=craynv-cray
-+ 		os=-unicosmp
-+ 		;;
-+-	cr16c)
-+-		basic_machine=cr16c-unknown
-++	cr16)
-++		basic_machine=cr16-unknown
-+ 		os=-elf
-+ 		;;
-+ 	crds | unos)
-+@@ -682,6 +683,10 @@
-+ 		basic_machine=i386-pc
-+ 		os=-mingw32
-+ 		;;
-++	mingw32ce)
-++		basic_machine=arm-unknown
-++		os=-mingw32ce
-++		;;
-+ 	miniframe)
-+ 		basic_machine=m68000-convergent
-+ 		;;
-+@@ -924,6 +929,9 @@
-+ 		basic_machine=sh-hitachi
-+ 		os=-hms
-+ 		;;
-++	sh5el)
-++		basic_machine=sh5le-unknown
-++		;;
-+ 	sh64)
-+ 		basic_machine=sh64-unknown
-+ 		;;
-+@@ -1218,7 +1226,7 @@
-+ 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-+ 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-+ 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-+-	      | -skyos* | -haiku* | -rdos* | -toppers*)
-++	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
-+ 	# Remember, each alternative MUST END IN *, to match a version number.
-+ 		;;
-+ 	-qnx*)
-+@@ -1370,6 +1378,9 @@
-+ # system, and we'll never get to this point.
-+ 
-+ case $basic_machine in
-++        score-*)
-++		os=-elf
-++		;;
-+         spu-*)
-+ 		os=-elf
-+ 		;;
-+@@ -1410,6 +1421,9 @@
-+ 	m68*-cisco)
-+ 		os=-aout
-+ 		;;
-++        mep-*)
-++		os=-elf
-++		;;
-+ 	mips*-cisco)
-+ 		os=-elf
-+ 		;;
-+Index: configure
-+--- ncurses-5.6/configure	2006-12-17 16:33:38.000000000 +0000
-++++ ncurses-5.6-20071201/configure	2007-12-01 20:43:33.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ #! /bin/sh
-+-# From configure.in Revision: 1.383 .
-++# From configure.in Revision: 1.429 .
-+ # Guess values for system-dependent variables and create Makefiles.
-+ # Generated by Autoconf 2.52.20061216.
-+ #
-+@@ -699,6 +699,7 @@
-+   --without-ada           suppress check for Ada95, don't build demo
-+   --without-progs         suppress build with programs (e.g., tic)
-+   --without-curses-h      install curses.h as ncurses.h only
-++  --enable-mixed-case     tic should assume mixed-case filenames
-+   --with-install-prefix   prefixes actual install-location ($DESTDIR)
-+ Build-Tools Needed to Compile Temporary Applications for Cross-compiling:
-+   --with-build-cc=XXX     the build C compiler ($BUILD_CC)
-+@@ -714,10 +715,12 @@
-+   --with-debug            generate debug-libraries (default)
-+   --with-profile          generate profile-libraries
-+   --with-termlib          generate separate terminfo library
-++  --with-ticlib           generate separate tic library
-+   --with-gpm              use Alessandro Rubini's GPM library
-+   --without-dlsym         do not use dlsym() to load GPM dynamically
-+   --with-sysmouse         use sysmouse (FreeBSD console)
-+   --enable-rpath          use rpath option when generating shared libraries
-++  --disable-relink        relink shared libraries during install
-+   --with-shlib-version=X  Specify rel or abi version for shared libs
-+ Fine-Tuning Your Configuration:
-+   --disable-overwrite     leave out the link to -lcurses
-+@@ -729,6 +732,7 @@
-+   --with-terminfo-dirs=XXX specify list of terminfo directories (default: DATADIR/terminfo)
-+   --with-default-terminfo-dir=DIR default terminfo directory (default: DATADIR/terminfo)
-+   --disable-big-core      assume machine has little memory
-++  --disable-big-strings   assume compiler has only standard-size strings
-+   --enable-termcap        compile in termcap fallback support
-+   --with-termpath=XXX     specify list of termcap files (default: /etc/termcap:/usr/share/misc/termcap)
-+   --enable-getcap         fast termcap load, no xrefs to terminfo
-+@@ -759,7 +763,7 @@
-+   --disable-ext-funcs     disable function-extensions
-+   --enable-const          compile with extra/non-standard const
-+   --enable-no-padding     compile with $NCURSES_NO_PADDING code
-+-  --enable-signed-char    compile with SIGWINCH handler
-++  --enable-signed-char    compile using signed Boolean's in term.h
-+   --enable-sigwinch       compile with SIGWINCH handler
-+   --enable-tcap-names     compile with user-definable terminal capabilities
-+ Development Code:
-+@@ -772,6 +776,7 @@
-+   --enable-colorfgbg      compile with $COLORFGBG code
-+   --enable-ext-colors     compile for experimental 256-color support
-+   --enable-ext-mouse      compile for experimental mouse-encoding
-++  --enable-reentrant      compile with experimental reentrant code
-+   --enable-safe-sprintf   compile with experimental safe-sprintf code
-+   --disable-scroll-hints  compile without scroll-hints code
-+   --enable-wgetch-events  compile with experimental wgetch-events code
-+@@ -986,7 +991,7 @@
-+ fi
-+ for ac_site_file in $CONFIG_SITE; do
-+   if test -r "$ac_site_file"; then
-+-    { echo "$as_me:989: loading site script $ac_site_file" >&5
-++    { echo "$as_me:994: loading site script $ac_site_file" >&5
-+ echo "$as_me: loading site script $ac_site_file" >&6;}
-+     cat "$ac_site_file" >&5
-+     . "$ac_site_file"
-+@@ -997,7 +1002,7 @@
-+   # Some versions of bash will fail to source /dev/null (special
-+   # files actually), so we avoid doing that.
-+   if test -f "$cache_file"; then
-+-    { echo "$as_me:1000: loading cache $cache_file" >&5
-++    { echo "$as_me:1005: loading cache $cache_file" >&5
-+ echo "$as_me: loading cache $cache_file" >&6;}
-+     case $cache_file in
-+       [\\/]* | ?:[\\/]* ) . $cache_file;;
-+@@ -1005,7 +1010,7 @@
-+     esac
-+   fi
-+ else
-+-  { echo "$as_me:1008: creating cache $cache_file" >&5
-++  { echo "$as_me:1013: creating cache $cache_file" >&5
-+ echo "$as_me: creating cache $cache_file" >&6;}
-+   >$cache_file
-+ fi
-+@@ -1021,21 +1026,21 @@
-+   eval ac_new_val="\$ac_env_${ac_var}_value"
-+   case $ac_old_set,$ac_new_set in
-+     set,)
-+-      { echo "$as_me:1024: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-++      { echo "$as_me:1029: 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)
-+-      { echo "$as_me:1028: error: \`$ac_var' was not set in the previous run" >&5
-++      { echo "$as_me:1033: 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
-+-        { echo "$as_me:1034: error: \`$ac_var' has changed since the previous run:" >&5
-++        { echo "$as_me:1039: 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:1036:   former value:  $ac_old_val" >&5
-++        { echo "$as_me:1041:   former value:  $ac_old_val" >&5
-+ echo "$as_me:   former value:  $ac_old_val" >&2;}
-+-        { echo "$as_me:1038:   current value: $ac_new_val" >&5
-++        { echo "$as_me:1043:   current value: $ac_new_val" >&5
-+ echo "$as_me:   current value: $ac_new_val" >&2;}
-+         ac_cache_corrupted=:
-+       fi;;
-+@@ -1054,9 +1059,9 @@
-+   fi
-+ done
-+ if $ac_cache_corrupted; then
-+-  { echo "$as_me:1057: error: changes in the environment can compromise the build" >&5
-++  { echo "$as_me:1062: 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:1059: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-++  { { echo "$as_me:1064: 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
-+@@ -1077,10 +1082,10 @@
-+ echo "#! $SHELL" >conftest.sh
-+ echo  "exit 0"   >>conftest.sh
-+ chmod +x conftest.sh
-+-if { (echo "$as_me:1080: PATH=\".;.\"; conftest.sh") >&5
-++if { (echo "$as_me:1085: PATH=\".;.\"; conftest.sh") >&5
-+   (PATH=".;."; conftest.sh) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:1083: \$? = $ac_status" >&5
-++  echo "$as_me:1088: \$? = $ac_status" >&5
-+   (exit $ac_status); }; then
-+   ac_path_separator=';'
-+ else
-+@@ -1093,7 +1098,7 @@
-+ 
-+ top_builddir=`pwd`
-+ 
-+-echo "$as_me:1096: checking for egrep" >&5
-++echo "$as_me:1101: checking for egrep" >&5
-+ echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-+ if test "${ac_cv_prog_egrep+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -1103,11 +1108,11 @@
-+     else ac_cv_prog_egrep='egrep'
-+     fi
-+ fi
-+-echo "$as_me:1106: result: $ac_cv_prog_egrep" >&5
-++echo "$as_me:1111: result: $ac_cv_prog_egrep" >&5
-+ echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-+  EGREP=$ac_cv_prog_egrep
-+ 
-+-test -z "$EGREP" && { { echo "$as_me:1110: error: No egrep program found" >&5
-++test -z "$EGREP" && { { echo "$as_me:1115: error: No egrep program found" >&5
-+ echo "$as_me: error: No egrep program found" >&2;}
-+    { (exit 1); exit 1; }; }
-+ 
-+@@ -1117,7 +1122,7 @@
-+ cf_cv_abi_version=${NCURSES_MAJOR}
-+ cf_cv_rel_version=${NCURSES_MAJOR}.${NCURSES_MINOR}
-+ cf_cv_timestamp=`date`
-+-echo "$as_me:1120: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
-++echo "$as_me:1125: result: Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&5
-+ echo "${ECHO_T}Configuring NCURSES $cf_cv_rel_version ABI $cf_cv_abi_version ($cf_cv_timestamp)" >&6
-+ 
-+ test -z "$cf_cv_rel_version" && cf_cv_rel_version=0.0
-+@@ -1125,7 +1130,7 @@
-+ # Check whether --with-rel-version or --without-rel-version was given.
-+ if test "${with_rel_version+set}" = set; then
-+   withval="$with_rel_version"
-+-  { echo "$as_me:1128: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
-++  { echo "$as_me:1133: WARNING: overriding release version $cf_cv_rel_version to $withval" >&5
-+ echo "$as_me: WARNING: overriding release version $cf_cv_rel_version to $withval" >&2;}
-+  cf_cv_rel_version=$withval
-+ fi;
-+@@ -1138,13 +1143,13 @@
-+   [0-9]*) #(vi
-+  	;;
-+   *)
-+-	{ { echo "$as_me:1141: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
-++	{ { echo "$as_me:1146: error: Release major-version is not a number: $NCURSES_MAJOR" >&5
-+ echo "$as_me: error: Release major-version is not a number: $NCURSES_MAJOR" >&2;}
-+    { (exit 1); exit 1; }; }
-+  	;;
-+   esac
-+ else
-+-  { { echo "$as_me:1147: error: Release major-version value is empty" >&5
-++  { { echo "$as_me:1152: error: Release major-version value is empty" >&5
-+ echo "$as_me: error: Release major-version value is empty" >&2;}
-+    { (exit 1); exit 1; }; }
-+ fi
-+@@ -1154,13 +1159,13 @@
-+   [0-9]*) #(vi
-+  	;;
-+   *)
-+-	{ { echo "$as_me:1157: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
-++	{ { echo "$as_me:1162: error: Release minor-version is not a number: $NCURSES_MINOR" >&5
-+ echo "$as_me: error: Release minor-version is not a number: $NCURSES_MINOR" >&2;}
-+    { (exit 1); exit 1; }; }
-+  	;;
-+   esac
-+ else
-+-  { { echo "$as_me:1163: error: Release minor-version value is empty" >&5
-++  { { echo "$as_me:1168: error: Release minor-version value is empty" >&5
-+ echo "$as_me: error: Release minor-version value is empty" >&2;}
-+    { (exit 1); exit 1; }; }
-+ fi
-+@@ -1170,7 +1175,7 @@
-+ # Check whether --with-abi-version or --without-abi-version was given.
-+ if test "${with_abi_version+set}" = set; then
-+   withval="$with_abi_version"
-+-  { echo "$as_me:1173: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
-++  { echo "$as_me:1178: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&5
-+ echo "$as_me: WARNING: overriding ABI version $cf_cv_abi_version to $withval" >&2;}
-+  cf_cv_abi_version=$withval
-+ fi;
-+@@ -1180,13 +1185,13 @@
-+   [0-9]*) #(vi
-+  	;;
-+   *)
-+-	{ { echo "$as_me:1183: error: ABI version is not a number: $cf_cv_abi_version" >&5
-++	{ { echo "$as_me:1188: error: ABI version is not a number: $cf_cv_abi_version" >&5
-+ echo "$as_me: error: ABI version is not a number: $cf_cv_abi_version" >&2;}
-+    { (exit 1); exit 1; }; }
-+  	;;
-+   esac
-+ else
-+-  { { echo "$as_me:1189: error: ABI version value is empty" >&5
-++  { { echo "$as_me:1194: error: ABI version value is empty" >&5
-+ echo "$as_me: error: ABI version value is empty" >&2;}
-+    { (exit 1); exit 1; }; }
-+ fi
-+@@ -1208,7 +1213,7 @@
-+   fi
-+ done
-+ if test -z "$ac_aux_dir"; then
-+-  { { echo "$as_me:1211: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-++  { { echo "$as_me:1216: 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
-+@@ -1218,11 +1223,11 @@
-+ 
-+ # Make sure we can run config.sub.
-+ $ac_config_sub sun4 >/dev/null 2>&1 ||
-+-  { { echo "$as_me:1221: error: cannot run $ac_config_sub" >&5
-++  { { echo "$as_me:1226: error: cannot run $ac_config_sub" >&5
-+ echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-+    { (exit 1); exit 1; }; }
-+ 
-+-echo "$as_me:1225: checking build system type" >&5
-++echo "$as_me:1230: checking build system type" >&5
-+ echo $ECHO_N "checking build system type... $ECHO_C" >&6
-+ if test "${ac_cv_build+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -1231,23 +1236,23 @@
-+ test -z "$ac_cv_build_alias" &&
-+   ac_cv_build_alias=`$ac_config_guess`
-+ test -z "$ac_cv_build_alias" &&
-+-  { { echo "$as_me:1234: error: cannot guess build type; you must specify one" >&5
-++  { { echo "$as_me:1239: error: cannot guess build type; you must specify one" >&5
-+ echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-+    { (exit 1); exit 1; }; }
-+ ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-+-  { { echo "$as_me:1238: error: $ac_config_sub $ac_cv_build_alias failed." >&5
-++  { { echo "$as_me:1243: error: $ac_config_sub $ac_cv_build_alias failed." >&5
-+ echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
-+    { (exit 1); exit 1; }; }
-+ 
-+ fi
-+-echo "$as_me:1243: result: $ac_cv_build" >&5
-++echo "$as_me:1248: result: $ac_cv_build" >&5
-+ echo "${ECHO_T}$ac_cv_build" >&6
-+ build=$ac_cv_build
-+ build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-+ build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-+ build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+ 
-+-echo "$as_me:1250: checking host system type" >&5
-++echo "$as_me:1255: checking host system type" >&5
-+ echo $ECHO_N "checking host system type... $ECHO_C" >&6
-+ if test "${ac_cv_host+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -1256,12 +1261,12 @@
-+ test -z "$ac_cv_host_alias" &&
-+   ac_cv_host_alias=$ac_cv_build_alias
-+ ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-+-  { { echo "$as_me:1259: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-++  { { echo "$as_me:1264: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-+ echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-+    { (exit 1); exit 1; }; }
-+ 
-+ fi
-+-echo "$as_me:1264: result: $ac_cv_host" >&5
-++echo "$as_me:1269: result: $ac_cv_host" >&5
-+ echo "${ECHO_T}$ac_cv_host" >&6
-+ host=$ac_cv_host
-+ host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-+@@ -1269,7 +1274,7 @@
-+ host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+ 
-+ if test -f $srcdir/config.guess || test -f $ac_aux_dir/config.guess ; then
-+-	echo "$as_me:1272: checking target system type" >&5
-++	echo "$as_me:1277: checking target system type" >&5
-+ echo $ECHO_N "checking target system type... $ECHO_C" >&6
-+ if test "${ac_cv_target+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -1278,12 +1283,12 @@
-+ test "x$ac_cv_target_alias" = "x" &&
-+   ac_cv_target_alias=$ac_cv_host_alias
-+ ac_cv_target=`$ac_config_sub $ac_cv_target_alias` ||
-+-  { { echo "$as_me:1281: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-++  { { echo "$as_me:1286: error: $ac_config_sub $ac_cv_target_alias failed" >&5
-+ echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;}
-+    { (exit 1); exit 1; }; }
-+ 
-+ fi
-+-echo "$as_me:1286: result: $ac_cv_target" >&5
-++echo "$as_me:1291: result: $ac_cv_target" >&5
-+ echo "${ECHO_T}$ac_cv_target" >&6
-+ target=$ac_cv_target
-+ target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-+@@ -1314,13 +1319,13 @@
-+ fi
-+ 
-+ test -z "$system_name" && system_name="$cf_cv_system_name"
-+-test -n "$cf_cv_system_name" && echo "$as_me:1317: result: Configuring for $cf_cv_system_name" >&5
-++test -n "$cf_cv_system_name" && echo "$as_me:1322: result: Configuring for $cf_cv_system_name" >&5
-+ echo "${ECHO_T}Configuring for $cf_cv_system_name" >&6
-+ 
-+ if test ".$system_name" != ".$cf_cv_system_name" ; then
-+-	echo "$as_me:1321: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
-++	echo "$as_me:1326: result: Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&5
-+ echo "${ECHO_T}Cached system name ($system_name) does not agree with actual ($cf_cv_system_name)" >&6
-+-	{ { echo "$as_me:1323: error: \"Please remove config.cache and try again.\"" >&5
-++	{ { echo "$as_me:1328: error: \"Please remove config.cache and try again.\"" >&5
-+ echo "$as_me: error: \"Please remove config.cache and try again.\"" >&2;}
-+    { (exit 1); exit 1; }; }
-+ fi
-+@@ -1328,7 +1333,7 @@
-+ # Check whether --with-system-type or --without-system-type was given.
-+ if test "${with_system_type+set}" = set; then
-+   withval="$with_system_type"
-+-  { echo "$as_me:1331: WARNING: overriding system type to $withval" >&5
-++  { echo "$as_me:1336: WARNING: overriding system type to $withval" >&5
-+ echo "$as_me: WARNING: overriding system type to $withval" >&2;}
-+  cf_cv_system_name=$withval
-+ fi;
-+@@ -1338,7 +1343,7 @@
-+ 
-+ ###	Default install-location
-+ 
-+-echo "$as_me:1341: checking for prefix" >&5
-++echo "$as_me:1346: checking for prefix" >&5
-+ echo $ECHO_N "checking for prefix... $ECHO_C" >&6
-+ if test "x$prefix" = "xNONE" ; then
-+ 	case "$cf_cv_system_name" in
-+@@ -1350,11 +1355,11 @@
-+ 		;;
-+ 	esac
-+ fi
-+-echo "$as_me:1353: result: $prefix" >&5
-++echo "$as_me:1358: result: $prefix" >&5
-+ echo "${ECHO_T}$prefix" >&6
-+ 
-+ if test "x$prefix" = "xNONE" ; then
-+-echo "$as_me:1357: checking for default include-directory" >&5
-++echo "$as_me:1362: checking for default include-directory" >&5
-+ echo $ECHO_N "checking for default include-directory... $ECHO_C" >&6
-+ test -n "$verbose" && echo 1>&6
-+ for cf_symbol in \
-+@@ -1377,7 +1382,7 @@
-+ 	fi
-+ 	test -n "$verbose"  && echo "	tested $cf_dir" 1>&6
-+ done
-+-echo "$as_me:1380: result: $includedir" >&5
-++echo "$as_me:1385: result: $includedir" >&5
-+ echo "${ECHO_T}$includedir" >&6
-+ fi
-+ 
-+@@ -1391,7 +1396,7 @@
-+ 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
-+-echo "$as_me:1394: checking for $ac_word" >&5
-++echo "$as_me:1399: checking for $ac_word" >&5
-+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+ if test "${ac_cv_prog_CC+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -1406,7 +1411,7 @@
-+   test -z "$ac_dir" && ac_dir=.
-+   $as_executable_p "$ac_dir/$ac_word" || continue
-+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
-+-echo "$as_me:1409: found $ac_dir/$ac_word" >&5
-++echo "$as_me:1414: found $ac_dir/$ac_word" >&5
-+ break
-+ done
-+ 
-+@@ -1414,10 +1419,10 @@
-+ fi
-+ CC=$ac_cv_prog_CC
-+ if test -n "$CC"; then
-+-  echo "$as_me:1417: result: $CC" >&5
-++  echo "$as_me:1422: result: $CC" >&5
-+ echo "${ECHO_T}$CC" >&6
-+ else
-+-  echo "$as_me:1420: result: no" >&5
-++  echo "$as_me:1425: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+ fi
-+ 
-+@@ -1426,7 +1431,7 @@
-+   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
-+-echo "$as_me:1429: checking for $ac_word" >&5
-++echo "$as_me:1434: 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
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -1441,7 +1446,7 @@
-+   test -z "$ac_dir" && ac_dir=.
-+   $as_executable_p "$ac_dir/$ac_word" || continue
-+ ac_cv_prog_ac_ct_CC="gcc"
-+-echo "$as_me:1444: found $ac_dir/$ac_word" >&5
-++echo "$as_me:1449: found $ac_dir/$ac_word" >&5
-+ break
-+ done
-+ 
-+@@ -1449,10 +1454,10 @@
-+ fi
-+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+ if test -n "$ac_ct_CC"; then
-+-  echo "$as_me:1452: result: $ac_ct_CC" >&5
-++  echo "$as_me:1457: result: $ac_ct_CC" >&5
-+ echo "${ECHO_T}$ac_ct_CC" >&6
-+ else
-+-  echo "$as_me:1455: result: no" >&5
-++  echo "$as_me:1460: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+ fi
-+ 
-+@@ -1465,7 +1470,7 @@
-+   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
-+-echo "$as_me:1468: checking for $ac_word" >&5
-++echo "$as_me:1473: checking for $ac_word" >&5
-+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+ if test "${ac_cv_prog_CC+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -1480,7 +1485,7 @@
-+   test -z "$ac_dir" && ac_dir=.
-+   $as_executable_p "$ac_dir/$ac_word" || continue
-+ ac_cv_prog_CC="${ac_tool_prefix}cc"
-+-echo "$as_me:1483: found $ac_dir/$ac_word" >&5
-++echo "$as_me:1488: found $ac_dir/$ac_word" >&5
-+ break
-+ done
-+ 
-+@@ -1488,10 +1493,10 @@
-+ fi
-+ CC=$ac_cv_prog_CC
-+ if test -n "$CC"; then
-+-  echo "$as_me:1491: result: $CC" >&5
-++  echo "$as_me:1496: result: $CC" >&5
-+ echo "${ECHO_T}$CC" >&6
-+ else
-+-  echo "$as_me:1494: result: no" >&5
-++  echo "$as_me:1499: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+ fi
-+ 
-+@@ -1500,7 +1505,7 @@
-+   ac_ct_CC=$CC
-+   # Extract the first word of "cc", so it can be a program name with args.
-+ set dummy cc; ac_word=$2
-+-echo "$as_me:1503: checking for $ac_word" >&5
-++echo "$as_me:1508: 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
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -1515,7 +1520,7 @@
-+   test -z "$ac_dir" && ac_dir=.
-+   $as_executable_p "$ac_dir/$ac_word" || continue
-+ ac_cv_prog_ac_ct_CC="cc"
-+-echo "$as_me:1518: found $ac_dir/$ac_word" >&5
-++echo "$as_me:1523: found $ac_dir/$ac_word" >&5
-+ break
-+ done
-+ 
-+@@ -1523,10 +1528,10 @@
-+ fi
-+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+ if test -n "$ac_ct_CC"; then
-+-  echo "$as_me:1526: result: $ac_ct_CC" >&5
-++  echo "$as_me:1531: result: $ac_ct_CC" >&5
-+ echo "${ECHO_T}$ac_ct_CC" >&6
-+ else
-+-  echo "$as_me:1529: result: no" >&5
-++  echo "$as_me:1534: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+ fi
-+ 
-+@@ -1539,7 +1544,7 @@
-+ 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
-+-echo "$as_me:1542: checking for $ac_word" >&5
-++echo "$as_me:1547: checking for $ac_word" >&5
-+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+ if test "${ac_cv_prog_CC+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -1559,7 +1564,7 @@
-+   continue
-+ fi
-+ ac_cv_prog_CC="cc"
-+-echo "$as_me:1562: found $ac_dir/$ac_word" >&5
-++echo "$as_me:1567: found $ac_dir/$ac_word" >&5
-+ break
-+ done
-+ 
-+@@ -1581,10 +1586,10 @@
-+ fi
-+ CC=$ac_cv_prog_CC
-+ if test -n "$CC"; then
-+-  echo "$as_me:1584: result: $CC" >&5
-++  echo "$as_me:1589: result: $CC" >&5
-+ echo "${ECHO_T}$CC" >&6
-+ else
-+-  echo "$as_me:1587: result: no" >&5
-++  echo "$as_me:1592: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+ fi
-+ 
-+@@ -1595,7 +1600,7 @@
-+   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
-+-echo "$as_me:1598: checking for $ac_word" >&5
-++echo "$as_me:1603: checking for $ac_word" >&5
-+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+ if test "${ac_cv_prog_CC+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -1610,7 +1615,7 @@
-+   test -z "$ac_dir" && ac_dir=.
-+   $as_executable_p "$ac_dir/$ac_word" || continue
-+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-+-echo "$as_me:1613: found $ac_dir/$ac_word" >&5
-++echo "$as_me:1618: found $ac_dir/$ac_word" >&5
-+ break
-+ done
-+ 
-+@@ -1618,10 +1623,10 @@
-+ fi
-+ CC=$ac_cv_prog_CC
-+ if test -n "$CC"; then
-+-  echo "$as_me:1621: result: $CC" >&5
-++  echo "$as_me:1626: result: $CC" >&5
-+ echo "${ECHO_T}$CC" >&6
-+ else
-+-  echo "$as_me:1624: result: no" >&5
-++  echo "$as_me:1629: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+ fi
-+ 
-+@@ -1634,7 +1639,7 @@
-+ do
-+   # Extract the first word of "$ac_prog", so it can be a program name with args.
-+ set dummy $ac_prog; ac_word=$2
-+-echo "$as_me:1637: checking for $ac_word" >&5
-++echo "$as_me:1642: 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
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -1649,7 +1654,7 @@
-+   test -z "$ac_dir" && ac_dir=.
-+   $as_executable_p "$ac_dir/$ac_word" || continue
-+ ac_cv_prog_ac_ct_CC="$ac_prog"
-+-echo "$as_me:1652: found $ac_dir/$ac_word" >&5
-++echo "$as_me:1657: found $ac_dir/$ac_word" >&5
-+ break
-+ done
-+ 
-+@@ -1657,10 +1662,10 @@
-+ fi
-+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
-+ if test -n "$ac_ct_CC"; then
-+-  echo "$as_me:1660: result: $ac_ct_CC" >&5
-++  echo "$as_me:1665: result: $ac_ct_CC" >&5
-+ echo "${ECHO_T}$ac_ct_CC" >&6
-+ else
-+-  echo "$as_me:1663: result: no" >&5
-++  echo "$as_me:1668: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+ fi
-+ 
-+@@ -1672,32 +1677,32 @@
-+ 
-+ fi
-+ 
-+-test -z "$CC" && { { echo "$as_me:1675: error: no acceptable cc found in \$PATH" >&5
-++test -z "$CC" && { { echo "$as_me:1680: error: no acceptable cc found in \$PATH" >&5
-+ echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
-+    { (exit 1); exit 1; }; }
-+ 
-+ # Provide some information about the compiler.
-+-echo "$as_me:1680:" \
-++echo "$as_me:1685:" \
-+      "checking for C compiler version" >&5
-+ ac_compiler=`set X $ac_compile; echo $2`
-+-{ (eval echo "$as_me:1683: \"$ac_compiler --version </dev/null >&5\"") >&5
-++{ (eval echo "$as_me:1688: \"$ac_compiler --version </dev/null >&5\"") >&5
-+   (eval $ac_compiler --version </dev/null >&5) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:1686: \$? = $ac_status" >&5
-++  echo "$as_me:1691: \$? = $ac_status" >&5
-+   (exit $ac_status); }
-+-{ (eval echo "$as_me:1688: \"$ac_compiler -v </dev/null >&5\"") >&5
-++{ (eval echo "$as_me:1693: \"$ac_compiler -v </dev/null >&5\"") >&5
-+   (eval $ac_compiler -v </dev/null >&5) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:1691: \$? = $ac_status" >&5
-++  echo "$as_me:1696: \$? = $ac_status" >&5
-+   (exit $ac_status); }
-+-{ (eval echo "$as_me:1693: \"$ac_compiler -V </dev/null >&5\"") >&5
-++{ (eval echo "$as_me:1698: \"$ac_compiler -V </dev/null >&5\"") >&5
-+   (eval $ac_compiler -V </dev/null >&5) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:1696: \$? = $ac_status" >&5
-++  echo "$as_me:1701: \$? = $ac_status" >&5
-+   (exit $ac_status); }
-+ 
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 1700 "configure"
-++#line 1705 "configure"
-+ #include "confdefs.h"
-+ 
-+ int
-+@@ -1713,13 +1718,13 @@
-+ # 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.
-+-echo "$as_me:1716: checking for C compiler default output" >&5
-++echo "$as_me:1721: checking for C compiler default output" >&5
-+ echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
-+ ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-+-if { (eval echo "$as_me:1719: \"$ac_link_default\"") >&5
-++if { (eval echo "$as_me:1724: \"$ac_link_default\"") >&5
-+   (eval $ac_link_default) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:1722: \$? = $ac_status" >&5
-++  echo "$as_me:1727: \$? = $ac_status" >&5
-+   (exit $ac_status); }; then
-+   # Find the output, starting from the most likely.  This scheme is
-+ # not robust to junk in `.', hence go to wildcards (a.*) only as a last
-+@@ -1742,34 +1747,34 @@
-+ else
-+   echo "$as_me: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+-{ { echo "$as_me:1745: error: C compiler cannot create executables" >&5
-++{ { echo "$as_me:1750: error: C compiler cannot create executables" >&5
-+ echo "$as_me: error: C compiler cannot create executables" >&2;}
-+    { (exit 77); exit 77; }; }
-+ fi
-+ 
-+ ac_exeext=$ac_cv_exeext
-+-echo "$as_me:1751: result: $ac_file" >&5
-++echo "$as_me:1756: result: $ac_file" >&5
-+ echo "${ECHO_T}$ac_file" >&6
-+ 
-+ # Check the compiler produces executables we can run.  If not, either
-+ # the compiler is broken, or we cross compile.
-+-echo "$as_me:1756: checking whether the C compiler works" >&5
-++echo "$as_me:1761: 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
-+   if { ac_try='./$ac_file'
-+-  { (eval echo "$as_me:1762: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:1767: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:1765: \$? = $ac_status" >&5
-++  echo "$as_me:1770: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+     cross_compiling=no
-+   else
-+     if test "$cross_compiling" = maybe; then
-+ 	cross_compiling=yes
-+     else
-+-	{ { echo "$as_me:1772: error: cannot run C compiled programs.
-++	{ { echo "$as_me:1777: error: cannot run C compiled programs.
-+ If you meant to cross compile, use \`--host'." >&5
-+ echo "$as_me: error: cannot run C compiled programs.
-+ If you meant to cross compile, use \`--host'." >&2;}
-+@@ -1777,24 +1782,24 @@
-+     fi
-+   fi
-+ fi
-+-echo "$as_me:1780: result: yes" >&5
-++echo "$as_me:1785: result: yes" >&5
-+ echo "${ECHO_T}yes" >&6
-+ 
-+ rm -f a.out a.exe conftest$ac_cv_exeext
-+ ac_clean_files=$ac_clean_files_save
-+ # Check the compiler produces executables we can run.  If not, either
-+ # the compiler is broken, or we cross compile.
-+-echo "$as_me:1787: checking whether we are cross compiling" >&5
-++echo "$as_me:1792: checking whether we are cross compiling" >&5
-+ echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-+-echo "$as_me:1789: result: $cross_compiling" >&5
-++echo "$as_me:1794: result: $cross_compiling" >&5
-+ echo "${ECHO_T}$cross_compiling" >&6
-+ 
-+-echo "$as_me:1792: checking for executable suffix" >&5
-++echo "$as_me:1797: checking for executable suffix" >&5
-+ echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-+-if { (eval echo "$as_me:1794: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:1799: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:1797: \$? = $ac_status" >&5
-++  echo "$as_me:1802: \$? = $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
-+@@ -1810,25 +1815,25 @@
-+   esac
-+ done
-+ else
-+-  { { echo "$as_me:1813: error: cannot compute EXEEXT: cannot compile and link" >&5
-++  { { echo "$as_me:1818: error: cannot compute EXEEXT: cannot compile and link" >&5
-+ echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
-+    { (exit 1); exit 1; }; }
-+ fi
-+ 
-+ rm -f conftest$ac_cv_exeext
-+-echo "$as_me:1819: result: $ac_cv_exeext" >&5
-++echo "$as_me:1824: result: $ac_cv_exeext" >&5
-+ echo "${ECHO_T}$ac_cv_exeext" >&6
-+ 
-+ rm -f conftest.$ac_ext
-+ EXEEXT=$ac_cv_exeext
-+ ac_exeext=$EXEEXT
-+-echo "$as_me:1825: checking for object suffix" >&5
-++echo "$as_me:1830: checking for object suffix" >&5
-+ echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
-+ if test "${ac_cv_objext+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 1831 "configure"
-++#line 1836 "configure"
-+ #include "confdefs.h"
-+ 
-+ int
-+@@ -1840,10 +1845,10 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.o conftest.obj
-+-if { (eval echo "$as_me:1843: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:1848: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:1846: \$? = $ac_status" >&5
-++  echo "$as_me:1851: \$? = $ac_status" >&5
-+   (exit $ac_status); }; then
-+   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-+   case $ac_file in
-+@@ -1855,24 +1860,24 @@
-+ else
-+   echo "$as_me: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+-{ { echo "$as_me:1858: error: cannot compute OBJEXT: cannot compile" >&5
-++{ { echo "$as_me:1863: error: cannot compute OBJEXT: cannot compile" >&5
-+ echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
-+    { (exit 1); exit 1; }; }
-+ fi
-+ 
-+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
-+ fi
-+-echo "$as_me:1865: result: $ac_cv_objext" >&5
-++echo "$as_me:1870: result: $ac_cv_objext" >&5
-+ echo "${ECHO_T}$ac_cv_objext" >&6
-+ OBJEXT=$ac_cv_objext
-+ ac_objext=$OBJEXT
-+-echo "$as_me:1869: checking whether we are using the GNU C compiler" >&5
-++echo "$as_me:1874: 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
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 1875 "configure"
-++#line 1880 "configure"
-+ #include "confdefs.h"
-+ 
-+ int
-+@@ -1887,16 +1892,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:1890: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:1895: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:1893: \$? = $ac_status" >&5
-++  echo "$as_me:1898: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:1896: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:1901: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:1899: \$? = $ac_status" >&5
-++  echo "$as_me:1904: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_compiler_gnu=yes
-+ else
-+@@ -1908,19 +1913,19 @@
-+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
-+ 
-+ fi
-+-echo "$as_me:1911: result: $ac_cv_c_compiler_gnu" >&5
-++echo "$as_me:1916: 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
-+ CFLAGS="-g"
-+-echo "$as_me:1917: checking whether $CC accepts -g" >&5
-++echo "$as_me:1922: 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
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 1923 "configure"
-++#line 1928 "configure"
-+ #include "confdefs.h"
-+ 
-+ int
-+@@ -1932,16 +1937,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:1935: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:1940: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:1938: \$? = $ac_status" >&5
-++  echo "$as_me:1943: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:1941: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:1946: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:1944: \$? = $ac_status" >&5
-++  echo "$as_me:1949: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_cv_prog_cc_g=yes
-+ else
-+@@ -1951,7 +1956,7 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+ fi
-+-echo "$as_me:1954: result: $ac_cv_prog_cc_g" >&5
-++echo "$as_me:1959: 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
-+@@ -1978,16 +1983,16 @@
-+ #endif
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:1981: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:1986: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:1984: \$? = $ac_status" >&5
-++  echo "$as_me:1989: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:1987: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:1992: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:1990: \$? = $ac_status" >&5
-++  echo "$as_me:1995: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   for ac_declaration in \
-+    ''\
-+@@ -1999,7 +2004,7 @@
-+    'void exit (int);'
-+ do
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 2002 "configure"
-++#line 2007 "configure"
-+ #include "confdefs.h"
-+ #include <stdlib.h>
-+ $ac_declaration
-+@@ -2012,16 +2017,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:2015: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:2020: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:2018: \$? = $ac_status" >&5
-++  echo "$as_me:2023: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:2021: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:2026: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:2024: \$? = $ac_status" >&5
-++  echo "$as_me:2029: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   :
-+ else
-+@@ -2031,7 +2036,7 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 2034 "configure"
-++#line 2039 "configure"
-+ #include "confdefs.h"
-+ $ac_declaration
-+ int
-+@@ -2043,16 +2048,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:2046: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:2051: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:2049: \$? = $ac_status" >&5
-++  echo "$as_me:2054: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:2052: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:2057: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:2055: \$? = $ac_status" >&5
-++  echo "$as_me:2060: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   break
-+ else
-+@@ -2082,11 +2087,11 @@
-+ 
-+ GCC_VERSION=none
-+ if test "$GCC" = yes ; then
-+-	echo "$as_me:2085: checking version of $CC" >&5
-++	echo "$as_me:2090: checking version of $CC" >&5
-+ echo $ECHO_N "checking version of $CC... $ECHO_C" >&6
-+ 	GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
-+ 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-+-	echo "$as_me:2089: result: $GCC_VERSION" >&5
-++	echo "$as_me:2094: result: $GCC_VERSION" >&5
-+ echo "${ECHO_T}$GCC_VERSION" >&6
-+ fi
-+ 
-+@@ -2096,7 +2101,7 @@
-+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+ ac_main_return=return
-+-echo "$as_me:2099: checking how to run the C preprocessor" >&5
-++echo "$as_me:2104: 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
-+@@ -2117,18 +2122,18 @@
-+   # On the NeXT, cc -E runs the code through the compiler's parser,
-+   # not just through cpp. "Syntax error" is here to catch this case.
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 2120 "configure"
-++#line 2125 "configure"
-+ #include "confdefs.h"
-+ #include <assert.h>
-+                      Syntax error
-+ _ACEOF
-+-if { (eval echo "$as_me:2125: \"$ac_cpp conftest.$ac_ext\"") >&5
-++if { (eval echo "$as_me:2130: \"$ac_cpp conftest.$ac_ext\"") >&5
-+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+   ac_status=$?
-+   egrep -v '^ *\+' conftest.er1 >conftest.err
-+   rm -f conftest.er1
-+   cat conftest.err >&5
-+-  echo "$as_me:2131: \$? = $ac_status" >&5
-++  echo "$as_me:2136: \$? = $ac_status" >&5
-+   (exit $ac_status); } >/dev/null; then
-+   if test -s conftest.err; then
-+     ac_cpp_err=$ac_c_preproc_warn_flag
-+@@ -2151,17 +2156,17 @@
-+   # OK, works on sane cases.  Now check whether non-existent headers
-+   # can be detected and how.
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 2154 "configure"
-++#line 2159 "configure"
-+ #include "confdefs.h"
-+ #include <ac_nonexistent.h>
-+ _ACEOF
-+-if { (eval echo "$as_me:2158: \"$ac_cpp conftest.$ac_ext\"") >&5
-++if { (eval echo "$as_me:2163: \"$ac_cpp conftest.$ac_ext\"") >&5
-+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+   ac_status=$?
-+   egrep -v '^ *\+' conftest.er1 >conftest.err
-+   rm -f conftest.er1
-+   cat conftest.err >&5
-+-  echo "$as_me:2164: \$? = $ac_status" >&5
-++  echo "$as_me:2169: \$? = $ac_status" >&5
-+   (exit $ac_status); } >/dev/null; then
-+   if test -s conftest.err; then
-+     ac_cpp_err=$ac_c_preproc_warn_flag
-+@@ -2198,7 +2203,7 @@
-+ else
-+   ac_cv_prog_CPP=$CPP
-+ fi
-+-echo "$as_me:2201: result: $CPP" >&5
-++echo "$as_me:2206: result: $CPP" >&5
-+ echo "${ECHO_T}$CPP" >&6
-+ ac_preproc_ok=false
-+ for ac_c_preproc_warn_flag in '' yes
-+@@ -2208,18 +2213,18 @@
-+   # On the NeXT, cc -E runs the code through the compiler's parser,
-+   # not just through cpp. "Syntax error" is here to catch this case.
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 2211 "configure"
-++#line 2216 "configure"
-+ #include "confdefs.h"
-+ #include <assert.h>
-+                      Syntax error
-+ _ACEOF
-+-if { (eval echo "$as_me:2216: \"$ac_cpp conftest.$ac_ext\"") >&5
-++if { (eval echo "$as_me:2221: \"$ac_cpp conftest.$ac_ext\"") >&5
-+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+   ac_status=$?
-+   egrep -v '^ *\+' conftest.er1 >conftest.err
-+   rm -f conftest.er1
-+   cat conftest.err >&5
-+-  echo "$as_me:2222: \$? = $ac_status" >&5
-++  echo "$as_me:2227: \$? = $ac_status" >&5
-+   (exit $ac_status); } >/dev/null; then
-+   if test -s conftest.err; then
-+     ac_cpp_err=$ac_c_preproc_warn_flag
-+@@ -2242,17 +2247,17 @@
-+   # OK, works on sane cases.  Now check whether non-existent headers
-+   # can be detected and how.
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 2245 "configure"
-++#line 2250 "configure"
-+ #include "confdefs.h"
-+ #include <ac_nonexistent.h>
-+ _ACEOF
-+-if { (eval echo "$as_me:2249: \"$ac_cpp conftest.$ac_ext\"") >&5
-++if { (eval echo "$as_me:2254: \"$ac_cpp conftest.$ac_ext\"") >&5
-+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+   ac_status=$?
-+   egrep -v '^ *\+' conftest.er1 >conftest.err
-+   rm -f conftest.er1
-+   cat conftest.err >&5
-+-  echo "$as_me:2255: \$? = $ac_status" >&5
-++  echo "$as_me:2260: \$? = $ac_status" >&5
-+   (exit $ac_status); } >/dev/null; then
-+   if test -s conftest.err; then
-+     ac_cpp_err=$ac_c_preproc_warn_flag
-+@@ -2280,7 +2285,7 @@
-+ if $ac_preproc_ok; then
-+   :
-+ else
-+-  { { echo "$as_me:2283: error: C preprocessor \"$CPP\" fails sanity check" >&5
-++  { { echo "$as_me:2288: error: C preprocessor \"$CPP\" fails sanity check" >&5
-+ echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
-+    { (exit 1); exit 1; }; }
-+ fi
-+@@ -2293,14 +2298,14 @@
-+ ac_main_return=return
-+ 
-+ if test $ac_cv_c_compiler_gnu = yes; then
-+-    echo "$as_me:2296: checking whether $CC needs -traditional" >&5
-++    echo "$as_me:2301: checking whether $CC needs -traditional" >&5
-+ echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
-+ if test "${ac_cv_prog_gcc_traditional+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+     ac_pattern="Autoconf.*'x'"
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 2303 "configure"
-++#line 2308 "configure"
-+ #include "confdefs.h"
-+ #include <sgtty.h>
-+ int Autoconf = TIOCGETP;
-+@@ -2315,7 +2320,7 @@
-+ 
-+   if test $ac_cv_prog_gcc_traditional = no; then
-+     cat >conftest.$ac_ext <<_ACEOF
-+-#line 2318 "configure"
-++#line 2323 "configure"
-+ #include "confdefs.h"
-+ #include <termio.h>
-+ int Autoconf = TCGETA;
-+@@ -2328,14 +2333,14 @@
-+ 
-+   fi
-+ fi
-+-echo "$as_me:2331: result: $ac_cv_prog_gcc_traditional" >&5
-++echo "$as_me:2336: result: $ac_cv_prog_gcc_traditional" >&5
-+ echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
-+   if test $ac_cv_prog_gcc_traditional = yes; then
-+     CC="$CC -traditional"
-+   fi
-+ fi
-+ 
-+-echo "$as_me:2338: checking whether $CC understands -c and -o together" >&5
-++echo "$as_me:2343: checking whether $CC understands -c and -o together" >&5
-+ echo $ECHO_N "checking whether $CC understands -c and -o together... $ECHO_C" >&6
-+ if test "${cf_cv_prog_CC_c_o+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -2351,15 +2356,15 @@
-+ # We do the test twice because some compilers refuse to overwrite an
-+ # existing .o file with -o, though they will create one.
-+ ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-+-if { (eval echo "$as_me:2354: \"$ac_try\"") >&5
-++if { (eval echo "$as_me:2359: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:2357: \$? = $ac_status" >&5
-++  echo "$as_me:2362: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:2359: \"$ac_try\"") >&5
-++  test -f conftest2.$ac_objext && { (eval echo "$as_me:2364: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:2362: \$? = $ac_status" >&5
-++  echo "$as_me:2367: \$? = $ac_status" >&5
-+   (exit $ac_status); };
-+ then
-+   eval cf_cv_prog_CC_c_o=yes
-+@@ -2370,19 +2375,19 @@
-+ 
-+ fi
-+ if test $cf_cv_prog_CC_c_o = yes; then
-+-  echo "$as_me:2373: result: yes" >&5
-++  echo "$as_me:2378: result: yes" >&5
-+ echo "${ECHO_T}yes" >&6
-+ else
-+-  echo "$as_me:2376: result: no" >&5
-++  echo "$as_me:2381: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+ fi
-+ 
-+-echo "$as_me:2380: checking for POSIXized ISC" >&5
-++echo "$as_me:2385: checking for POSIXized ISC" >&5
-+ echo $ECHO_N "checking for POSIXized ISC... $ECHO_C" >&6
-+ if test -d /etc/conf/kconfig.d &&
-+    grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
-+ then
-+-  echo "$as_me:2385: result: yes" >&5
-++  echo "$as_me:2390: result: yes" >&5
-+ echo "${ECHO_T}yes" >&6
-+   ISC=yes # If later tests want to check for ISC.
-+ 
-+@@ -2396,12 +2401,12 @@
-+     CC="$CC -Xp"
-+   fi
-+ else
-+-  echo "$as_me:2399: result: no" >&5
-++  echo "$as_me:2404: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+   ISC=
-+ fi
-+ 
-+-echo "$as_me:2404: checking for ${CC-cc} option to accept ANSI C" >&5
-++echo "$as_me:2409: checking for ${CC-cc} option to accept ANSI C" >&5
-+ echo $ECHO_N "checking for ${CC-cc} option to accept ANSI C... $ECHO_C" >&6
-+ if test "${cf_cv_ansi_cc+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -2495,7 +2500,7 @@
-+ fi
-+ 
-+ 	cat >conftest.$ac_ext <<_ACEOF
-+-#line 2498 "configure"
-++#line 2503 "configure"
-+ #include "confdefs.h"
-+ 
-+ #ifndef CC_HAS_PROTOS
-+@@ -2516,16 +2521,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:2519: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:2524: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:2522: \$? = $ac_status" >&5
-++  echo "$as_me:2527: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:2525: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:2530: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:2528: \$? = $ac_status" >&5
-++  echo "$as_me:2533: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_ansi_cc="$cf_arg"; break
-+ else
-+@@ -2538,7 +2543,7 @@
-+ CPPFLAGS="$cf_save_CPPFLAGS"
-+ 
-+ fi
-+-echo "$as_me:2541: result: $cf_cv_ansi_cc" >&5
-++echo "$as_me:2546: result: $cf_cv_ansi_cc" >&5
-+ echo "${ECHO_T}$cf_cv_ansi_cc" >&6
-+ 
-+ if test "$cf_cv_ansi_cc" != "no"; then
-+@@ -2621,7 +2626,7 @@
-+ fi
-+ 
-+ if test "$cf_cv_ansi_cc" = "no"; then
-+-	{ { echo "$as_me:2624: error: Your compiler does not appear to recognize prototypes.
-++	{ { echo "$as_me:2629: error: Your compiler does not appear to recognize prototypes.
-+ You have the following choices:
-+ 	a. adjust your compiler options
-+ 	b. get an up-to-date compiler
-+@@ -2661,7 +2666,7 @@
-+ *) LDPATH=$PATH:/sbin:/usr/sbin
-+   # Extract the first word of "ldconfig", so it can be a program name with args.
-+ set dummy ldconfig; ac_word=$2
-+-echo "$as_me:2664: checking for $ac_word" >&5
-++echo "$as_me:2669: checking for $ac_word" >&5
-+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+ if test "${ac_cv_path_LDCONFIG+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -2678,7 +2683,7 @@
-+   test -z "$ac_dir" && ac_dir=.
-+   if $as_executable_p "$ac_dir/$ac_word"; then
-+    ac_cv_path_LDCONFIG="$ac_dir/$ac_word"
-+-   echo "$as_me:2681: found $ac_dir/$ac_word" >&5
-++   echo "$as_me:2686: found $ac_dir/$ac_word" >&5
-+    break
-+ fi
-+ done
-+@@ -2689,10 +2694,10 @@
-+ LDCONFIG=$ac_cv_path_LDCONFIG
-+ 
-+ if test -n "$LDCONFIG"; then
-+-  echo "$as_me:2692: result: $LDCONFIG" >&5
-++  echo "$as_me:2697: result: $LDCONFIG" >&5
-+ echo "${ECHO_T}$LDCONFIG" >&6
-+ else
-+-  echo "$as_me:2695: result: no" >&5
-++  echo "$as_me:2700: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+ fi
-+ 
-+@@ -2700,7 +2705,7 @@
-+ esac
-+ fi
-+ 
-+-echo "$as_me:2703: checking if you want to ensure bool is consistent with C++" >&5
-++echo "$as_me:2708: checking if you want to ensure bool is consistent with C++" >&5
-+ echo $ECHO_N "checking if you want to ensure bool is consistent with C++... $ECHO_C" >&6
-+ 
-+ # Check whether --with-cxx or --without-cxx was given.
-+@@ -2710,7 +2715,7 @@
-+ else
-+   cf_with_cxx=yes
-+ fi;
-+-echo "$as_me:2713: result: $cf_with_cxx" >&5
-++echo "$as_me:2718: result: $cf_with_cxx" >&5
-+ echo "${ECHO_T}$cf_with_cxx" >&6
-+ if test "X$cf_with_cxx" = Xno ; then
-+ 	CXX=""
-+@@ -2728,7 +2733,7 @@
-+   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
-+-echo "$as_me:2731: checking for $ac_word" >&5
-++echo "$as_me:2736: checking for $ac_word" >&5
-+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+ if test "${ac_cv_prog_CXX+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -2743,7 +2748,7 @@
-+   test -z "$ac_dir" && ac_dir=.
-+   $as_executable_p "$ac_dir/$ac_word" || continue
-+ ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-+-echo "$as_me:2746: found $ac_dir/$ac_word" >&5
-++echo "$as_me:2751: found $ac_dir/$ac_word" >&5
-+ break
-+ done
-+ 
-+@@ -2751,10 +2756,10 @@
-+ fi
-+ CXX=$ac_cv_prog_CXX
-+ if test -n "$CXX"; then
-+-  echo "$as_me:2754: result: $CXX" >&5
-++  echo "$as_me:2759: result: $CXX" >&5
-+ echo "${ECHO_T}$CXX" >&6
-+ else
-+-  echo "$as_me:2757: result: no" >&5
-++  echo "$as_me:2762: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+ fi
-+ 
-+@@ -2767,7 +2772,7 @@
-+ do
-+   # Extract the first word of "$ac_prog", so it can be a program name with args.
-+ set dummy $ac_prog; ac_word=$2
-+-echo "$as_me:2770: checking for $ac_word" >&5
-++echo "$as_me:2775: 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
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -2782,7 +2787,7 @@
-+   test -z "$ac_dir" && ac_dir=.
-+   $as_executable_p "$ac_dir/$ac_word" || continue
-+ ac_cv_prog_ac_ct_CXX="$ac_prog"
-+-echo "$as_me:2785: found $ac_dir/$ac_word" >&5
-++echo "$as_me:2790: found $ac_dir/$ac_word" >&5
-+ break
-+ done
-+ 
-+@@ -2790,10 +2795,10 @@
-+ fi
-+ ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-+ if test -n "$ac_ct_CXX"; then
-+-  echo "$as_me:2793: result: $ac_ct_CXX" >&5
-++  echo "$as_me:2798: result: $ac_ct_CXX" >&5
-+ echo "${ECHO_T}$ac_ct_CXX" >&6
-+ else
-+-  echo "$as_me:2796: result: no" >&5
-++  echo "$as_me:2801: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+ fi
-+ 
-+@@ -2805,32 +2810,32 @@
-+ fi
-+ 
-+ # Provide some information about the compiler.
-+-echo "$as_me:2808:" \
-++echo "$as_me:2813:" \
-+      "checking for C++ compiler version" >&5
-+ ac_compiler=`set X $ac_compile; echo $2`
-+-{ (eval echo "$as_me:2811: \"$ac_compiler --version </dev/null >&5\"") >&5
-++{ (eval echo "$as_me:2816: \"$ac_compiler --version </dev/null >&5\"") >&5
-+   (eval $ac_compiler --version </dev/null >&5) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:2814: \$? = $ac_status" >&5
-++  echo "$as_me:2819: \$? = $ac_status" >&5
-+   (exit $ac_status); }
-+-{ (eval echo "$as_me:2816: \"$ac_compiler -v </dev/null >&5\"") >&5
-++{ (eval echo "$as_me:2821: \"$ac_compiler -v </dev/null >&5\"") >&5
-+   (eval $ac_compiler -v </dev/null >&5) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:2819: \$? = $ac_status" >&5
-++  echo "$as_me:2824: \$? = $ac_status" >&5
-+   (exit $ac_status); }
-+-{ (eval echo "$as_me:2821: \"$ac_compiler -V </dev/null >&5\"") >&5
-++{ (eval echo "$as_me:2826: \"$ac_compiler -V </dev/null >&5\"") >&5
-+   (eval $ac_compiler -V </dev/null >&5) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:2824: \$? = $ac_status" >&5
-++  echo "$as_me:2829: \$? = $ac_status" >&5
-+   (exit $ac_status); }
-+ 
-+-echo "$as_me:2827: checking whether we are using the GNU C++ compiler" >&5
-++echo "$as_me:2832: 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
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 2833 "configure"
-++#line 2838 "configure"
-+ #include "confdefs.h"
-+ 
-+ int
-+@@ -2845,16 +2850,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:2848: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:2853: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:2851: \$? = $ac_status" >&5
-++  echo "$as_me:2856: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:2854: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:2859: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:2857: \$? = $ac_status" >&5
-++  echo "$as_me:2862: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_compiler_gnu=yes
-+ else
-+@@ -2866,19 +2871,19 @@
-+ ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-+ 
-+ fi
-+-echo "$as_me:2869: result: $ac_cv_cxx_compiler_gnu" >&5
-++echo "$as_me:2874: 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
-+ CXXFLAGS="-g"
-+-echo "$as_me:2875: checking whether $CXX accepts -g" >&5
-++echo "$as_me:2880: 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
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 2881 "configure"
-++#line 2886 "configure"
-+ #include "confdefs.h"
-+ 
-+ int
-+@@ -2890,16 +2895,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:2893: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:2898: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:2896: \$? = $ac_status" >&5
-++  echo "$as_me:2901: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:2899: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:2904: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:2902: \$? = $ac_status" >&5
-++  echo "$as_me:2907: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_cv_prog_cxx_g=yes
-+ else
-+@@ -2909,7 +2914,7 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+ fi
-+-echo "$as_me:2912: result: $ac_cv_prog_cxx_g" >&5
-++echo "$as_me:2917: 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
-+@@ -2936,7 +2941,7 @@
-+    'void exit (int);'
-+ do
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 2939 "configure"
-++#line 2944 "configure"
-+ #include "confdefs.h"
-+ #include <stdlib.h>
-+ $ac_declaration
-+@@ -2949,16 +2954,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:2952: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:2957: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:2955: \$? = $ac_status" >&5
-++  echo "$as_me:2960: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:2958: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:2963: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:2961: \$? = $ac_status" >&5
-++  echo "$as_me:2966: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   :
-+ else
-+@@ -2968,7 +2973,7 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 2971 "configure"
-++#line 2976 "configure"
-+ #include "confdefs.h"
-+ $ac_declaration
-+ int
-+@@ -2980,16 +2985,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:2983: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:2988: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:2986: \$? = $ac_status" >&5
-++  echo "$as_me:2991: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:2989: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:2994: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:2992: \$? = $ac_status" >&5
-++  echo "$as_me:2997: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   break
-+ else
-+@@ -3016,7 +3021,7 @@
-+ 	if test "$CXX" = "g++" ; then
-+ 		# Extract the first word of "g++", so it can be a program name with args.
-+ set dummy g++; ac_word=$2
-+-echo "$as_me:3019: checking for $ac_word" >&5
-++echo "$as_me:3024: checking for $ac_word" >&5
-+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+ if test "${ac_cv_path_CXX+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -3033,7 +3038,7 @@
-+   test -z "$ac_dir" && ac_dir=.
-+   if $as_executable_p "$ac_dir/$ac_word"; then
-+    ac_cv_path_CXX="$ac_dir/$ac_word"
-+-   echo "$as_me:3036: found $ac_dir/$ac_word" >&5
-++   echo "$as_me:3041: found $ac_dir/$ac_word" >&5
-+    break
-+ fi
-+ done
-+@@ -3044,16 +3049,16 @@
-+ CXX=$ac_cv_path_CXX
-+ 
-+ if test -n "$CXX"; then
-+-  echo "$as_me:3047: result: $CXX" >&5
-++  echo "$as_me:3052: result: $CXX" >&5
-+ echo "${ECHO_T}$CXX" >&6
-+ else
-+-  echo "$as_me:3050: result: no" >&5
-++  echo "$as_me:3055: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+ fi
-+ 
-+ 	fi
-+ 	if test "$CXX" = "g++" ; then
-+-		{ echo "$as_me:3056: WARNING: ignoring hardcoded g++" >&5
-++		{ echo "$as_me:3061: WARNING: ignoring hardcoded g++" >&5
-+ echo "$as_me: WARNING: ignoring hardcoded g++" >&2;}
-+ 		cf_with_cxx=no; CXX=""; GXX="";
-+ 	fi
-+@@ -3061,11 +3066,11 @@
-+ 
-+ GXX_VERSION=none
-+ if test "$GXX" = yes; then
-+-	echo "$as_me:3064: checking version of g++" >&5
-++	echo "$as_me:3069: checking version of g++" >&5
-+ echo $ECHO_N "checking version of g++... $ECHO_C" >&6
-+ 	GXX_VERSION="`${CXX-g++} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
-+ 	test -z "$GXX_VERSION" && GXX_VERSION=unknown
-+-	echo "$as_me:3068: result: $GXX_VERSION" >&5
-++	echo "$as_me:3073: result: $GXX_VERSION" >&5
-+ echo "${ECHO_T}$GXX_VERSION" >&6
-+ fi
-+ 
-+@@ -3073,12 +3078,12 @@
-+ 1*|2.[0-6]*)
-+ 	# GXX=""; CXX=""; ac_cv_prog_gxx=no
-+ 	# cf_cxx_library=no
-+-	{ echo "$as_me:3076: WARNING: templates do not work" >&5
-++	{ echo "$as_me:3081: WARNING: templates do not work" >&5
-+ echo "$as_me: WARNING: templates do not work" >&2;}
-+ 	;;
-+ esac
-+ 
-+-echo "$as_me:3081: checking if you want to build C++ binding and demo" >&5
-++echo "$as_me:3086: checking if you want to build C++ binding and demo" >&5
-+ echo $ECHO_N "checking if you want to build C++ binding and demo... $ECHO_C" >&6
-+ 
-+ # Check whether --with-cxx-binding or --without-cxx-binding was given.
-+@@ -3088,10 +3093,10 @@
-+ else
-+   cf_with_cxx_binding=$cf_with_cxx
-+ fi;
-+-echo "$as_me:3091: result: $cf_with_cxx_binding" >&5
-++echo "$as_me:3096: result: $cf_with_cxx_binding" >&5
-+ echo "${ECHO_T}$cf_with_cxx_binding" >&6
-+ 
-+-echo "$as_me:3094: checking if you want to build with Ada95" >&5
-++echo "$as_me:3099: checking if you want to build with Ada95" >&5
-+ echo $ECHO_N "checking if you want to build with Ada95... $ECHO_C" >&6
-+ 
-+ # Check whether --with-ada or --without-ada was given.
-+@@ -3101,10 +3106,10 @@
-+ else
-+   cf_with_ada=yes
-+ fi;
-+-echo "$as_me:3104: result: $cf_with_ada" >&5
-++echo "$as_me:3109: result: $cf_with_ada" >&5
-+ echo "${ECHO_T}$cf_with_ada" >&6
-+ 
-+-echo "$as_me:3107: checking if you want to build programs such as tic" >&5
-++echo "$as_me:3112: checking if you want to build programs such as tic" >&5
-+ echo $ECHO_N "checking if you want to build programs such as tic... $ECHO_C" >&6
-+ 
-+ # Check whether --with-progs or --without-progs was given.
-+@@ -3114,10 +3119,10 @@
-+ else
-+   cf_with_progs=yes
-+ fi;
-+-echo "$as_me:3117: result: $cf_with_progs" >&5
-++echo "$as_me:3122: result: $cf_with_progs" >&5
-+ echo "${ECHO_T}$cf_with_progs" >&6
-+ 
-+-echo "$as_me:3120: checking if you wish to install curses.h" >&5
-++echo "$as_me:3125: checking if you wish to install curses.h" >&5
-+ echo $ECHO_N "checking if you wish to install curses.h... $ECHO_C" >&6
-+ 
-+ # Check whether --with-curses-h or --without-curses-h was given.
-+@@ -3127,7 +3132,7 @@
-+ else
-+   with_curses_h=yes
-+ fi;
-+-echo "$as_me:3130: result: $with_curses_h" >&5
-++echo "$as_me:3135: result: $with_curses_h" >&5
-+ echo "${ECHO_T}$with_curses_h" >&6
-+ 
-+ modules_to_build="ncurses"
-+@@ -3153,7 +3158,7 @@
-+ do
-+   # Extract the first word of "$ac_prog", so it can be a program name with args.
-+ set dummy $ac_prog; ac_word=$2
-+-echo "$as_me:3156: checking for $ac_word" >&5
-++echo "$as_me:3161: checking for $ac_word" >&5
-+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+ if test "${ac_cv_prog_AWK+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -3168,7 +3173,7 @@
-+   test -z "$ac_dir" && ac_dir=.
-+   $as_executable_p "$ac_dir/$ac_word" || continue
-+ ac_cv_prog_AWK="$ac_prog"
-+-echo "$as_me:3171: found $ac_dir/$ac_word" >&5
-++echo "$as_me:3176: found $ac_dir/$ac_word" >&5
-+ break
-+ done
-+ 
-+@@ -3176,21 +3181,21 @@
-+ fi
-+ AWK=$ac_cv_prog_AWK
-+ if test -n "$AWK"; then
-+-  echo "$as_me:3179: result: $AWK" >&5
-++  echo "$as_me:3184: result: $AWK" >&5
-+ echo "${ECHO_T}$AWK" >&6
-+ else
-+-  echo "$as_me:3182: result: no" >&5
-++  echo "$as_me:3187: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+ fi
-+ 
-+   test -n "$AWK" && break
-+ done
-+ 
-+-test -z "$AWK" && { { echo "$as_me:3189: error: No awk program found" >&5
-++test -z "$AWK" && { { echo "$as_me:3194: error: No awk program found" >&5
-+ echo "$as_me: error: No awk program found" >&2;}
-+    { (exit 1); exit 1; }; }
-+ 
-+-echo "$as_me:3193: checking for egrep" >&5
-++echo "$as_me:3198: checking for egrep" >&5
-+ echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-+ if test "${ac_cv_prog_egrep+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -3200,11 +3205,11 @@
-+     else ac_cv_prog_egrep='egrep'
-+     fi
-+ fi
-+-echo "$as_me:3203: result: $ac_cv_prog_egrep" >&5
-++echo "$as_me:3208: result: $ac_cv_prog_egrep" >&5
-+ echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-+  EGREP=$ac_cv_prog_egrep
-+ 
-+-test -z "$EGREP" && { { echo "$as_me:3207: error: No egrep program found" >&5
-++test -z "$EGREP" && { { echo "$as_me:3212: error: No egrep program found" >&5
-+ echo "$as_me: error: No egrep program found" >&2;}
-+    { (exit 1); exit 1; }; }
-+ 
-+@@ -3220,7 +3225,7 @@
-+ # AFS /usr/afsws/bin/install, which mishandles nonexistent args
-+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-+ # ./install, which can be erroneously created by make from ./install.sh.
-+-echo "$as_me:3223: checking for a BSD compatible install" >&5
-++echo "$as_me:3228: 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
-+@@ -3269,7 +3274,7 @@
-+     INSTALL=$ac_install_sh
-+   fi
-+ fi
-+-echo "$as_me:3272: result: $INSTALL" >&5
-++echo "$as_me:3277: result: $INSTALL" >&5
-+ echo "${ECHO_T}$INSTALL" >&6
-+ 
-+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-+@@ -3294,7 +3299,7 @@
-+ do
-+   # Extract the first word of "$ac_prog", so it can be a program name with args.
-+ set dummy $ac_prog; ac_word=$2
-+-echo "$as_me:3297: checking for $ac_word" >&5
-++echo "$as_me:3302: checking for $ac_word" >&5
-+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+ if test "${ac_cv_prog_LINT+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -3309,7 +3314,7 @@
-+   test -z "$ac_dir" && ac_dir=.
-+   $as_executable_p "$ac_dir/$ac_word" || continue
-+ ac_cv_prog_LINT="$ac_prog"
-+-echo "$as_me:3312: found $ac_dir/$ac_word" >&5
-++echo "$as_me:3317: found $ac_dir/$ac_word" >&5
-+ break
-+ done
-+ 
-+@@ -3317,57 +3322,91 @@
-+ fi
-+ LINT=$ac_cv_prog_LINT
-+ if test -n "$LINT"; then
-+-  echo "$as_me:3320: result: $LINT" >&5
-++  echo "$as_me:3325: result: $LINT" >&5
-+ echo "${ECHO_T}$LINT" >&6
-+ else
-+-  echo "$as_me:3323: result: no" >&5
-++  echo "$as_me:3328: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+ fi
-+ 
-+   test -n "$LINT" && break
-+ done
-+ 
-+-echo "$as_me:3330: checking whether ln -s works" >&5
-++echo "$as_me:3335: checking whether ln -s works" >&5
-+ echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
-+ LN_S=$as_ln_s
-+ if test "$LN_S" = "ln -s"; then
-+-  echo "$as_me:3334: result: yes" >&5
-++  echo "$as_me:3339: result: yes" >&5
-+ echo "${ECHO_T}yes" >&6
-+ else
-+-  echo "$as_me:3337: result: no, using $LN_S" >&5
-++  echo "$as_me:3342: result: no, using $LN_S" >&5
-+ echo "${ECHO_T}no, using $LN_S" >&6
-+ fi
-+ 
-+-echo "$as_me:3341: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+-echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
-+-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
-+-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-++echo "$as_me:3346: checking for long file names" >&5
-++echo $ECHO_N "checking for long file names... $ECHO_C" >&6
-++if test "${ac_cv_sys_long_file_names+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+-  cat >conftest.make <<\EOF
-+-all:
-+-	@echo 'ac_maketemp="${MAKE}"'
-+-EOF
-+-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-+-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-+-if test -n "$ac_maketemp"; then
-+-  eval ac_cv_prog_make_${ac_make}_set=yes
-++  ac_cv_sys_long_file_names=yes
-++# Test for long file names in all the places we know might matter:
-++#      .		the current directory, where building will happen
-++#      $prefix/lib	where we will be installing things
-++#      $exec_prefix/lib	likewise
-++# eval it to expand exec_prefix.
-++#      $TMPDIR		if set, where it might want to write temporary files
-++# if $TMPDIR is not set:
-++#      /tmp		where it might want to write temporary files
-++#      /var/tmp		likewise
-++#      /usr/tmp		likewise
-++if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then
-++  ac_tmpdirs=$TMPDIR
-+ else
-+-  eval ac_cv_prog_make_${ac_make}_set=no
-++  ac_tmpdirs='/tmp /var/tmp /usr/tmp'
-+ fi
-+-rm -f conftest.make
-++for ac_dir in  . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do
-++  test -d $ac_dir || continue
-++  test -w $ac_dir || continue # It is less confusing to not echo anything here.
-++  ac_xdir=$ac_dir/cf$$
-++  (umask 077 && mkdir $ac_xdir 2>/dev/null) || continue
-++  ac_tf1=$ac_xdir/conftest9012345
-++  ac_tf2=$ac_xdir/conftest9012346
-++  (echo 1 >$ac_tf1) 2>/dev/null
-++  (echo 2 >$ac_tf2) 2>/dev/null
-++  ac_val=`cat $ac_tf1 2>/dev/null`
-++  if test ! -f $ac_tf1 || test "$ac_val" != 1; then
-++    ac_cv_sys_long_file_names=no
-++    rm -rf $ac_xdir 2>/dev/null
-++    break
-++  fi
-++  rm -rf $ac_xdir 2>/dev/null
-++done
-+ fi
-+-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-+-  echo "$as_me:3361: result: yes" >&5
-+-echo "${ECHO_T}yes" >&6
-+-  SET_MAKE=
-+-else
-+-  echo "$as_me:3365: result: no" >&5
-+-echo "${ECHO_T}no" >&6
-+-  SET_MAKE="MAKE=${MAKE-make}"
-++echo "$as_me:3385: result: $ac_cv_sys_long_file_names" >&5
-++echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
-++if test $ac_cv_sys_long_file_names = yes; then
-++
-++cat >>confdefs.h <<\EOF
-++#define HAVE_LONG_FILE_NAMES 1
-++EOF
-++
-+ fi
-+ 
-+-echo "$as_me:3370: checking if filesystem supports mixed-case filenames" >&5
-++echo "$as_me:3395: checking if we should assume mixed-case filenames" >&5
-++echo $ECHO_N "checking if we should assume mixed-case filenames... $ECHO_C" >&6
-++
-++# Check whether --enable-mixed-case or --disable-mixed-case was given.
-++if test "${enable_mixed_case+set}" = set; then
-++  enableval="$enable_mixed_case"
-++  enable_mixedcase=$enableval
-++else
-++  enable_mixedcase=auto
-++fi;
-++echo "$as_me:3405: result: $enable_mixedcase" >&5
-++echo "${ECHO_T}$enable_mixedcase" >&6
-++if test "$enable_mixedcase" = "auto" ; then
-++
-++echo "$as_me:3409: checking if filesystem supports mixed-case filenames" >&5
-+ echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
-+ if test "${cf_cv_mixedcase+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -3394,15 +3433,55 @@
-+ fi
-+ 
-+ fi
-+-echo "$as_me:3397: result: $cf_cv_mixedcase" >&5
-++echo "$as_me:3436: result: $cf_cv_mixedcase" >&5
-+ echo "${ECHO_T}$cf_cv_mixedcase" >&6
-+ test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF
-+ #define MIXEDCASE_FILENAMES 1
-+ EOF
-+ 
-++else
-++    cf_cv_mixedcase=$enable_mixedcase
-++    if test "$enable_mixedcase" = "yes" ; then
-++        cat >>confdefs.h <<\EOF
-++#define MIXEDCASE_FILENAMES 1
-++EOF
-++
-++    fi
-++fi
-++
-++# do this after mixed-case option (tags/TAGS is not as important as tic).
-++echo "$as_me:3453: checking whether ${MAKE-make} sets \${MAKE}" >&5
-++echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
-++set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
-++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-++  echo $ECHO_N "(cached) $ECHO_C" >&6
-++else
-++  cat >conftest.make <<\EOF
-++all:
-++	@echo 'ac_maketemp="${MAKE}"'
-++EOF
-++# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-++eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-++if test -n "$ac_maketemp"; then
-++  eval ac_cv_prog_make_${ac_make}_set=yes
-++else
-++  eval ac_cv_prog_make_${ac_make}_set=no
-++fi
-++rm -f conftest.make
-++fi
-++if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-++  echo "$as_me:3473: result: yes" >&5
-++echo "${ECHO_T}yes" >&6
-++  SET_MAKE=
-++else
-++  echo "$as_me:3477: result: no" >&5
-++echo "${ECHO_T}no" >&6
-++  SET_MAKE="MAKE=${MAKE-make}"
-++fi
-++
-+ # Extract the first word of "ctags", so it can be a program name with args.
-+ set dummy ctags; ac_word=$2
-+-echo "$as_me:3405: checking for $ac_word" >&5
-++echo "$as_me:3484: checking for $ac_word" >&5
-+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+ if test "${ac_cv_prog_MAKE_LOWER_TAGS+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -3417,7 +3496,7 @@
-+   test -z "$ac_dir" && ac_dir=.
-+   $as_executable_p "$ac_dir/$ac_word" || continue
-+ ac_cv_prog_MAKE_LOWER_TAGS="yes"
-+-echo "$as_me:3420: found $ac_dir/$ac_word" >&5
-++echo "$as_me:3499: found $ac_dir/$ac_word" >&5
-+ break
-+ done
-+ 
-+@@ -3426,17 +3505,17 @@
-+ fi
-+ MAKE_LOWER_TAGS=$ac_cv_prog_MAKE_LOWER_TAGS
-+ if test -n "$MAKE_LOWER_TAGS"; then
-+-  echo "$as_me:3429: result: $MAKE_LOWER_TAGS" >&5
-++  echo "$as_me:3508: result: $MAKE_LOWER_TAGS" >&5
-+ echo "${ECHO_T}$MAKE_LOWER_TAGS" >&6
-+ else
-+-  echo "$as_me:3432: result: no" >&5
-++  echo "$as_me:3511: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+ fi
-+ 
-+ if test "$cf_cv_mixedcase" = yes ; then
-+ 	# Extract the first word of "etags", so it can be a program name with args.
-+ set dummy etags; ac_word=$2
-+-echo "$as_me:3439: checking for $ac_word" >&5
-++echo "$as_me:3518: checking for $ac_word" >&5
-+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+ if test "${ac_cv_prog_MAKE_UPPER_TAGS+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -3451,7 +3530,7 @@
-+   test -z "$ac_dir" && ac_dir=.
-+   $as_executable_p "$ac_dir/$ac_word" || continue
-+ ac_cv_prog_MAKE_UPPER_TAGS="yes"
-+-echo "$as_me:3454: found $ac_dir/$ac_word" >&5
-++echo "$as_me:3533: found $ac_dir/$ac_word" >&5
-+ break
-+ done
-+ 
-+@@ -3460,10 +3539,10 @@
-+ fi
-+ MAKE_UPPER_TAGS=$ac_cv_prog_MAKE_UPPER_TAGS
-+ if test -n "$MAKE_UPPER_TAGS"; then
-+-  echo "$as_me:3463: result: $MAKE_UPPER_TAGS" >&5
-++  echo "$as_me:3542: result: $MAKE_UPPER_TAGS" >&5
-+ echo "${ECHO_T}$MAKE_UPPER_TAGS" >&6
-+ else
-+-  echo "$as_me:3466: result: no" >&5
-++  echo "$as_me:3545: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+ fi
-+ 
-+@@ -3483,7 +3562,7 @@
-+ 	MAKE_LOWER_TAGS="#"
-+ fi
-+ 
-+-echo "$as_me:3486: checking for makeflags variable" >&5
-++echo "$as_me:3565: checking for makeflags variable" >&5
-+ echo $ECHO_N "checking for makeflags variable... $ECHO_C" >&6
-+ if test "${cf_cv_makeflags+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -3517,95 +3596,13 @@
-+ 	rm -f cf_makeflags.tmp
-+ 
-+ fi
-+-echo "$as_me:3520: result: $cf_cv_makeflags" >&5
-++echo "$as_me:3599: result: $cf_cv_makeflags" >&5
-+ echo "${ECHO_T}$cf_cv_makeflags" >&6
-+ 
-+-echo "$as_me:3523: checking for long file names" >&5
-+-echo $ECHO_N "checking for long file names... $ECHO_C" >&6
-+-if test "${ac_cv_sys_long_file_names+set}" = set; then
-+-  echo $ECHO_N "(cached) $ECHO_C" >&6
-+-else
-+-  ac_cv_sys_long_file_names=yes
-+-# Test for long file names in all the places we know might matter:
-+-#      .		the current directory, where building will happen
-+-#      $prefix/lib	where we will be installing things
-+-#      $exec_prefix/lib	likewise
-+-# eval it to expand exec_prefix.
-+-#      $TMPDIR		if set, where it might want to write temporary files
-+-# if $TMPDIR is not set:
-+-#      /tmp		where it might want to write temporary files
-+-#      /var/tmp		likewise
-+-#      /usr/tmp		likewise
-+-if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then
-+-  ac_tmpdirs=$TMPDIR
-+-else
-+-  ac_tmpdirs='/tmp /var/tmp /usr/tmp'
-+-fi
-+-for ac_dir in  . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do
-+-  test -d $ac_dir || continue
-+-  test -w $ac_dir || continue # It is less confusing to not echo anything here.
-+-  ac_xdir=$ac_dir/cf$$
-+-  (umask 077 && mkdir $ac_xdir 2>/dev/null) || continue
-+-  ac_tf1=$ac_xdir/conftest9012345
-+-  ac_tf2=$ac_xdir/conftest9012346
-+-  (echo 1 >$ac_tf1) 2>/dev/null
-+-  (echo 2 >$ac_tf2) 2>/dev/null
-+-  ac_val=`cat $ac_tf1 2>/dev/null`
-+-  if test ! -f $ac_tf1 || test "$ac_val" != 1; then
-+-    ac_cv_sys_long_file_names=no
-+-    rm -rf $ac_xdir 2>/dev/null
-+-    break
-+-  fi
-+-  rm -rf $ac_xdir 2>/dev/null
-+-done
-+-fi
-+-echo "$as_me:3562: result: $ac_cv_sys_long_file_names" >&5
-+-echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6
-+-if test $ac_cv_sys_long_file_names = yes; then
-+-
-+-cat >>confdefs.h <<\EOF
-+-#define HAVE_LONG_FILE_NAMES 1
-+-EOF
-+-
-+-fi
-+-
-+-echo "$as_me:3572: checking if filesystem supports mixed-case filenames" >&5
-+-echo $ECHO_N "checking if filesystem supports mixed-case filenames... $ECHO_C" >&6
-+-if test "${cf_cv_mixedcase+set}" = set; then
-+-  echo $ECHO_N "(cached) $ECHO_C" >&6
-+-else
-+-
-+-if test "$cross_compiling" = yes ; then
-+-	case $target_alias in #(vi
-+-	*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-mingw32*|*-uwin*) #(vi
-+-		cf_cv_mixedcase=no
-+-		;;
-+-	*)
-+-		cf_cv_mixedcase=yes
-+-		;;
-+-	esac
-+-else
-+-	rm -f conftest CONFTEST
-+-	echo test >conftest
-+-	if test -f CONFTEST ; then
-+-		cf_cv_mixedcase=no
-+-	else
-+-		cf_cv_mixedcase=yes
-+-	fi
-+-	rm -f conftest CONFTEST
-+-fi
-+-
-+-fi
-+-echo "$as_me:3599: result: $cf_cv_mixedcase" >&5
-+-echo "${ECHO_T}$cf_cv_mixedcase" >&6
-+-test "$cf_cv_mixedcase" = yes && cat >>confdefs.h <<\EOF
-+-#define MIXEDCASE_FILENAMES 1
-+-EOF
-+-
-+ 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
-+-echo "$as_me:3608: checking for $ac_word" >&5
-++echo "$as_me:3605: checking for $ac_word" >&5
-+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+ if test "${ac_cv_prog_RANLIB+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -3620,7 +3617,7 @@
-+   test -z "$ac_dir" && ac_dir=.
-+   $as_executable_p "$ac_dir/$ac_word" || continue
-+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-+-echo "$as_me:3623: found $ac_dir/$ac_word" >&5
-++echo "$as_me:3620: found $ac_dir/$ac_word" >&5
-+ break
-+ done
-+ 
-+@@ -3628,10 +3625,10 @@
-+ fi
-+ RANLIB=$ac_cv_prog_RANLIB
-+ if test -n "$RANLIB"; then
-+-  echo "$as_me:3631: result: $RANLIB" >&5
-++  echo "$as_me:3628: result: $RANLIB" >&5
-+ echo "${ECHO_T}$RANLIB" >&6
-+ else
-+-  echo "$as_me:3634: result: no" >&5
-++  echo "$as_me:3631: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+ fi
-+ 
-+@@ -3640,7 +3637,7 @@
-+   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
-+-echo "$as_me:3643: checking for $ac_word" >&5
-++echo "$as_me:3640: 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
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -3655,7 +3652,7 @@
-+   test -z "$ac_dir" && ac_dir=.
-+   $as_executable_p "$ac_dir/$ac_word" || continue
-+ ac_cv_prog_ac_ct_RANLIB="ranlib"
-+-echo "$as_me:3658: found $ac_dir/$ac_word" >&5
-++echo "$as_me:3655: found $ac_dir/$ac_word" >&5
-+ break
-+ done
-+ 
-+@@ -3664,10 +3661,10 @@
-+ fi
-+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-+ if test -n "$ac_ct_RANLIB"; then
-+-  echo "$as_me:3667: result: $ac_ct_RANLIB" >&5
-++  echo "$as_me:3664: result: $ac_ct_RANLIB" >&5
-+ echo "${ECHO_T}$ac_ct_RANLIB" >&6
-+ else
-+-  echo "$as_me:3670: result: no" >&5
-++  echo "$as_me:3667: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+ fi
-+ 
-+@@ -3679,7 +3676,7 @@
-+ if test -n "$ac_tool_prefix"; then
-+   # Extract the first word of "${ac_tool_prefix}ld", so it can be a program name with args.
-+ set dummy ${ac_tool_prefix}ld; ac_word=$2
-+-echo "$as_me:3682: checking for $ac_word" >&5
-++echo "$as_me:3679: checking for $ac_word" >&5
-+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+ if test "${ac_cv_prog_LD+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -3694,7 +3691,7 @@
-+   test -z "$ac_dir" && ac_dir=.
-+   $as_executable_p "$ac_dir/$ac_word" || continue
-+ ac_cv_prog_LD="${ac_tool_prefix}ld"
-+-echo "$as_me:3697: found $ac_dir/$ac_word" >&5
-++echo "$as_me:3694: found $ac_dir/$ac_word" >&5
-+ break
-+ done
-+ 
-+@@ -3702,10 +3699,10 @@
-+ fi
-+ LD=$ac_cv_prog_LD
-+ if test -n "$LD"; then
-+-  echo "$as_me:3705: result: $LD" >&5
-++  echo "$as_me:3702: result: $LD" >&5
-+ echo "${ECHO_T}$LD" >&6
-+ else
-+-  echo "$as_me:3708: result: no" >&5
-++  echo "$as_me:3705: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+ fi
-+ 
-+@@ -3714,7 +3711,7 @@
-+   ac_ct_LD=$LD
-+   # Extract the first word of "ld", so it can be a program name with args.
-+ set dummy ld; ac_word=$2
-+-echo "$as_me:3717: checking for $ac_word" >&5
-++echo "$as_me:3714: checking for $ac_word" >&5
-+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+ if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -3729,7 +3726,7 @@
-+   test -z "$ac_dir" && ac_dir=.
-+   $as_executable_p "$ac_dir/$ac_word" || continue
-+ ac_cv_prog_ac_ct_LD="ld"
-+-echo "$as_me:3732: found $ac_dir/$ac_word" >&5
-++echo "$as_me:3729: found $ac_dir/$ac_word" >&5
-+ break
-+ done
-+ 
-+@@ -3738,10 +3735,10 @@
-+ fi
-+ ac_ct_LD=$ac_cv_prog_ac_ct_LD
-+ if test -n "$ac_ct_LD"; then
-+-  echo "$as_me:3741: result: $ac_ct_LD" >&5
-++  echo "$as_me:3738: result: $ac_ct_LD" >&5
-+ echo "${ECHO_T}$ac_ct_LD" >&6
-+ else
-+-  echo "$as_me:3744: result: no" >&5
-++  echo "$as_me:3741: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+ fi
-+ 
-+@@ -3753,7 +3750,7 @@
-+ if test -n "$ac_tool_prefix"; then
-+   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-+ set dummy ${ac_tool_prefix}ar; ac_word=$2
-+-echo "$as_me:3756: checking for $ac_word" >&5
-++echo "$as_me:3753: checking for $ac_word" >&5
-+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+ if test "${ac_cv_prog_AR+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -3768,7 +3765,7 @@
-+   test -z "$ac_dir" && ac_dir=.
-+   $as_executable_p "$ac_dir/$ac_word" || continue
-+ ac_cv_prog_AR="${ac_tool_prefix}ar"
-+-echo "$as_me:3771: found $ac_dir/$ac_word" >&5
-++echo "$as_me:3768: found $ac_dir/$ac_word" >&5
-+ break
-+ done
-+ 
-+@@ -3776,10 +3773,10 @@
-+ fi
-+ AR=$ac_cv_prog_AR
-+ if test -n "$AR"; then
-+-  echo "$as_me:3779: result: $AR" >&5
-++  echo "$as_me:3776: result: $AR" >&5
-+ echo "${ECHO_T}$AR" >&6
-+ else
-+-  echo "$as_me:3782: result: no" >&5
-++  echo "$as_me:3779: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+ fi
-+ 
-+@@ -3788,7 +3785,7 @@
-+   ac_ct_AR=$AR
-+   # Extract the first word of "ar", so it can be a program name with args.
-+ set dummy ar; ac_word=$2
-+-echo "$as_me:3791: checking for $ac_word" >&5
-++echo "$as_me:3788: checking for $ac_word" >&5
-+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+ if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -3803,7 +3800,7 @@
-+   test -z "$ac_dir" && ac_dir=.
-+   $as_executable_p "$ac_dir/$ac_word" || continue
-+ ac_cv_prog_ac_ct_AR="ar"
-+-echo "$as_me:3806: found $ac_dir/$ac_word" >&5
-++echo "$as_me:3803: found $ac_dir/$ac_word" >&5
-+ break
-+ done
-+ 
-+@@ -3812,10 +3809,10 @@
-+ fi
-+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
-+ if test -n "$ac_ct_AR"; then
-+-  echo "$as_me:3815: result: $ac_ct_AR" >&5
-++  echo "$as_me:3812: result: $ac_ct_AR" >&5
-+ echo "${ECHO_T}$ac_ct_AR" >&6
-+ else
-+-  echo "$as_me:3818: result: no" >&5
-++  echo "$as_me:3815: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+ fi
-+ 
-+@@ -3828,7 +3825,7 @@
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+ 
-+-echo "$as_me:3831: checking for archiver options (symbol AR_OPTS)" >&5
-++echo "$as_me:3828: checking for archiver options (symbol AR_OPTS)" >&5
-+ echo $ECHO_N "checking for archiver options (symbol AR_OPTS)... $ECHO_C" >&6
-+ 
-+ if test -z "$AR_OPTS" ; then
-+@@ -3837,12 +3834,12 @@
-+ fi
-+ 
-+ cf_cv_subst_AR_OPTS=$AR_OPTS
-+-echo "$as_me:3840: result: $AR_OPTS" >&5
-++echo "$as_me:3837: result: $AR_OPTS" >&5
-+ echo "${ECHO_T}$AR_OPTS" >&6
-+ 
-+ fi
-+ 
-+-echo "$as_me:3845: checking if you have specified an install-prefix" >&5
-++echo "$as_me:3842: checking if you have specified an install-prefix" >&5
-+ echo $ECHO_N "checking if you have specified an install-prefix... $ECHO_C" >&6
-+ 
-+ # Check whether --with-install-prefix or --without-install-prefix was given.
-+@@ -3855,7 +3852,7 @@
-+ 		;;
-+ 	esac
-+ fi;
-+-echo "$as_me:3858: result: $DESTDIR" >&5
-++echo "$as_me:3855: result: $DESTDIR" >&5
-+ echo "${ECHO_T}$DESTDIR" >&6
-+ 
-+ ###############################################################################
-+@@ -3883,7 +3880,7 @@
-+ do
-+   # Extract the first word of "$ac_prog", so it can be a program name with args.
-+ set dummy $ac_prog; ac_word=$2
-+-echo "$as_me:3886: checking for $ac_word" >&5
-++echo "$as_me:3883: checking for $ac_word" >&5
-+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+ if test "${ac_cv_prog_BUILD_CC+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -3898,7 +3895,7 @@
-+   test -z "$ac_dir" && ac_dir=.
-+   $as_executable_p "$ac_dir/$ac_word" || continue
-+ ac_cv_prog_BUILD_CC="$ac_prog"
-+-echo "$as_me:3901: found $ac_dir/$ac_word" >&5
-++echo "$as_me:3898: found $ac_dir/$ac_word" >&5
-+ break
-+ done
-+ 
-+@@ -3906,10 +3903,10 @@
-+ fi
-+ BUILD_CC=$ac_cv_prog_BUILD_CC
-+ if test -n "$BUILD_CC"; then
-+-  echo "$as_me:3909: result: $BUILD_CC" >&5
-++  echo "$as_me:3906: result: $BUILD_CC" >&5
-+ echo "${ECHO_T}$BUILD_CC" >&6
-+ else
-+-  echo "$as_me:3912: result: no" >&5
-++  echo "$as_me:3909: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+ fi
-+ 
-+@@ -3917,12 +3914,12 @@
-+ done
-+ 
-+ fi;
-+-	echo "$as_me:3920: checking for native build C compiler" >&5
-++	echo "$as_me:3917: checking for native build C compiler" >&5
-+ echo $ECHO_N "checking for native build C compiler... $ECHO_C" >&6
-+-	echo "$as_me:3922: result: $BUILD_CC" >&5
-++	echo "$as_me:3919: result: $BUILD_CC" >&5
-+ echo "${ECHO_T}$BUILD_CC" >&6
-+ 
-+-	echo "$as_me:3925: checking for native build C preprocessor" >&5
-++	echo "$as_me:3922: checking for native build C preprocessor" >&5
-+ echo $ECHO_N "checking for native build C preprocessor... $ECHO_C" >&6
-+ 
-+ # Check whether --with-build-cpp or --without-build-cpp was given.
-+@@ -3932,10 +3929,10 @@
-+ else
-+   BUILD_CPP='${BUILD_CC} -E'
-+ fi;
-+-	echo "$as_me:3935: result: $BUILD_CPP" >&5
-++	echo "$as_me:3932: result: $BUILD_CPP" >&5
-+ echo "${ECHO_T}$BUILD_CPP" >&6
-+ 
-+-	echo "$as_me:3938: checking for native build C flags" >&5
-++	echo "$as_me:3935: checking for native build C flags" >&5
-+ echo $ECHO_N "checking for native build C flags... $ECHO_C" >&6
-+ 
-+ # Check whether --with-build-cflags or --without-build-cflags was given.
-+@@ -3943,10 +3940,10 @@
-+   withval="$with_build_cflags"
-+   BUILD_CFLAGS="$withval"
-+ fi;
-+-	echo "$as_me:3946: result: $BUILD_CFLAGS" >&5
-++	echo "$as_me:3943: result: $BUILD_CFLAGS" >&5
-+ echo "${ECHO_T}$BUILD_CFLAGS" >&6
-+ 
-+-	echo "$as_me:3949: checking for native build C preprocessor-flags" >&5
-++	echo "$as_me:3946: checking for native build C preprocessor-flags" >&5
-+ echo $ECHO_N "checking for native build C preprocessor-flags... $ECHO_C" >&6
-+ 
-+ # Check whether --with-build-cppflags or --without-build-cppflags was given.
-+@@ -3954,10 +3951,10 @@
-+   withval="$with_build_cppflags"
-+   BUILD_CPPFLAGS="$withval"
-+ fi;
-+-	echo "$as_me:3957: result: $BUILD_CPPFLAGS" >&5
-++	echo "$as_me:3954: result: $BUILD_CPPFLAGS" >&5
-+ echo "${ECHO_T}$BUILD_CPPFLAGS" >&6
-+ 
-+-	echo "$as_me:3960: checking for native build linker-flags" >&5
-++	echo "$as_me:3957: checking for native build linker-flags" >&5
-+ echo $ECHO_N "checking for native build linker-flags... $ECHO_C" >&6
-+ 
-+ # Check whether --with-build-ldflags or --without-build-ldflags was given.
-+@@ -3965,10 +3962,10 @@
-+   withval="$with_build_ldflags"
-+   BUILD_LDFLAGS="$withval"
-+ fi;
-+-	echo "$as_me:3968: result: $BUILD_LDFLAGS" >&5
-++	echo "$as_me:3965: result: $BUILD_LDFLAGS" >&5
-+ echo "${ECHO_T}$BUILD_LDFLAGS" >&6
-+ 
-+-	echo "$as_me:3971: checking for native build linker-libraries" >&5
-++	echo "$as_me:3968: checking for native build linker-libraries" >&5
-+ echo $ECHO_N "checking for native build linker-libraries... $ECHO_C" >&6
-+ 
-+ # Check whether --with-build-libs or --without-build-libs was given.
-+@@ -3976,7 +3973,7 @@
-+   withval="$with_build_libs"
-+   BUILD_LIBS="$withval"
-+ fi;
-+-	echo "$as_me:3979: result: $BUILD_LIBS" >&5
-++	echo "$as_me:3976: result: $BUILD_LIBS" >&5
-+ echo "${ECHO_T}$BUILD_LIBS" >&6
-+ 
-+ 	# this assumes we're on Unix.
-+@@ -3986,7 +3983,7 @@
-+ 	: ${BUILD_CC:='${CC}'}
-+ 
-+ 	if ( test "$BUILD_CC" = "$CC" || test "$BUILD_CC" = '${CC}' ) ; then
-+-		{ { echo "$as_me:3989: error: Cross-build requires two compilers.
-++		{ { echo "$as_me:3986: error: Cross-build requires two compilers.
-+ Use --with-build-cc to specify the native compiler." >&5
-+ echo "$as_me: error: Cross-build requires two compilers.
-+ Use --with-build-cc to specify the native compiler." >&2;}
-+@@ -4023,11 +4020,11 @@
-+ # doing:
-+ LIB_CLEAN=
-+ LIB_COMPILE=
-+-LIB_LINK=
-++LIB_LINK='${CC}'
-+ LIB_INSTALL=
-+ LIB_UNINSTALL=
-+ 
-+-echo "$as_me:4030: checking if you want to build libraries with libtool" >&5
-++echo "$as_me:4027: checking if you want to build libraries with libtool" >&5
-+ echo $ECHO_N "checking if you want to build libraries with libtool... $ECHO_C" >&6
-+ 
-+ # Check whether --with-libtool or --without-libtool was given.
-+@@ -4037,7 +4034,7 @@
-+ else
-+   with_libtool=no
-+ fi;
-+-echo "$as_me:4040: result: $with_libtool" >&5
-++echo "$as_me:4037: result: $with_libtool" >&5
-+ echo "${ECHO_T}$with_libtool" >&6
-+ if test "$with_libtool" != "no"; then
-+ 
-+@@ -4068,7 +4065,7 @@
-+   with_libtool=`echo $with_libtool | sed -e s%NONE%$cf_path_syntax%`
-+   ;;
-+ *)
-+-  { { echo "$as_me:4071: error: expected a pathname, not \"$with_libtool\"" >&5
-++  { { echo "$as_me:4068: error: expected a pathname, not \"$with_libtool\"" >&5
-+ echo "$as_me: error: expected a pathname, not \"$with_libtool\"" >&2;}
-+    { (exit 1); exit 1; }; }
-+   ;;
-+@@ -4078,7 +4075,7 @@
-+ 	else
-+  		# Extract the first word of "libtool", so it can be a program name with args.
-+ set dummy libtool; ac_word=$2
-+-echo "$as_me:4081: checking for $ac_word" >&5
-++echo "$as_me:4078: checking for $ac_word" >&5
-+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+ if test "${ac_cv_path_LIBTOOL+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -4095,7 +4092,7 @@
-+   test -z "$ac_dir" && ac_dir=.
-+   if $as_executable_p "$ac_dir/$ac_word"; then
-+    ac_cv_path_LIBTOOL="$ac_dir/$ac_word"
-+-   echo "$as_me:4098: found $ac_dir/$ac_word" >&5
-++   echo "$as_me:4095: found $ac_dir/$ac_word" >&5
-+    break
-+ fi
-+ done
-+@@ -4106,42 +4103,42 @@
-+ LIBTOOL=$ac_cv_path_LIBTOOL
-+ 
-+ if test -n "$LIBTOOL"; then
-+-  echo "$as_me:4109: result: $LIBTOOL" >&5
-++  echo "$as_me:4106: result: $LIBTOOL" >&5
-+ echo "${ECHO_T}$LIBTOOL" >&6
-+ else
-+-  echo "$as_me:4112: result: no" >&5
-++  echo "$as_me:4109: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+ fi
-+ 
-+  	fi
-+  	if test -z "$LIBTOOL" ; then
-+- 		{ { echo "$as_me:4118: error: Cannot find libtool" >&5
-++ 		{ { echo "$as_me:4115: error: Cannot find libtool" >&5
-+ echo "$as_me: error: Cannot find libtool" >&2;}
-+    { (exit 1); exit 1; }; }
-+  	fi
-+-	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` -o'
-+-	LIB_OBJECT='${OBJECTS}.o=.lo)'
-++	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} -version-info `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} -o'
-++	LIB_OBJECT='${OBJECTS:.o=.lo}'
-+ 	LIB_SUFFIX=.la
-+ 	LIB_CLEAN='${LIBTOOL} --mode=clean'
-+ 	LIB_COMPILE='${LIBTOOL} --mode=compile'
-+-	LIB_LINK='${LIBTOOL} --mode=link'
-++	LIB_LINK='${LIBTOOL} --mode=link ${CC} ${LIBTOOL_OPTS}'
-+ 	LIB_INSTALL='${LIBTOOL} --mode=install'
-+ 	LIB_UNINSTALL='${LIBTOOL} --mode=uninstall'
-+ 	LIB_PREP=:
-+ 
-+ 	# Show the version of libtool
-+-	echo "$as_me:4133: checking version of libtool" >&5
-++	echo "$as_me:4130: checking version of libtool" >&5
-+ echo $ECHO_N "checking version of libtool... $ECHO_C" >&6
-+ 
-+ 	# Save the version in a cache variable - this is not entirely a good
-+ 	# thing, but the version string from libtool is very ugly, and for
-+ 	# bug reports it might be useful to have the original string.
-+-	cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '2,$d' -e 's/([^)]*)//g' -e 's/^[^1-9]*//' -e 's/[^0-9.].*//'`
-+-	echo "$as_me:4140: result: $cf_cv_libtool_version" >&5
-++	cf_cv_libtool_version=`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed -e '2,$d' -e 's/([^)]*)//g' -e 's/^[^1-9]*//' -e 's/[^0-9.].*//'`
-++	echo "$as_me:4137: result: $cf_cv_libtool_version" >&5
-+ echo "${ECHO_T}$cf_cv_libtool_version" >&6
-+ 	if test -z "$cf_cv_libtool_version" ; then
-+-		{ { echo "$as_me:4143: error: This is not libtool" >&5
-+-echo "$as_me: error: This is not libtool" >&2;}
-++		{ { echo "$as_me:4140: error: This is not GNU libtool" >&5
-++echo "$as_me: error: This is not GNU libtool" >&2;}
-+    { (exit 1); exit 1; }; }
-+ 	fi
-+ 
-+@@ -4167,7 +4164,7 @@
-+ 
-+ else
-+ 
-+-echo "$as_me:4170: checking if you want to build shared libraries" >&5
-++echo "$as_me:4167: checking if you want to build shared libraries" >&5
-+ echo $ECHO_N "checking if you want to build shared libraries... $ECHO_C" >&6
-+ 
-+ # Check whether --with-shared or --without-shared was given.
-+@@ -4177,11 +4174,11 @@
-+ else
-+   with_shared=no
-+ fi;
-+-echo "$as_me:4180: result: $with_shared" >&5
-++echo "$as_me:4177: result: $with_shared" >&5
-+ echo "${ECHO_T}$with_shared" >&6
-+ test "$with_shared" = "yes" && cf_list_models="$cf_list_models shared"
-+ 
-+-echo "$as_me:4184: checking if you want to build static libraries" >&5
-++echo "$as_me:4181: checking if you want to build static libraries" >&5
-+ echo $ECHO_N "checking if you want to build static libraries... $ECHO_C" >&6
-+ 
-+ # Check whether --with-normal or --without-normal was given.
-+@@ -4191,11 +4188,11 @@
-+ else
-+   with_normal=yes
-+ fi;
-+-echo "$as_me:4194: result: $with_normal" >&5
-++echo "$as_me:4191: result: $with_normal" >&5
-+ echo "${ECHO_T}$with_normal" >&6
-+ test "$with_normal" = "yes" && cf_list_models="$cf_list_models normal"
-+ 
-+-echo "$as_me:4198: checking if you want to build debug libraries" >&5
-++echo "$as_me:4195: checking if you want to build debug libraries" >&5
-+ echo $ECHO_N "checking if you want to build debug libraries... $ECHO_C" >&6
-+ 
-+ # Check whether --with-debug or --without-debug was given.
-+@@ -4205,11 +4202,11 @@
-+ else
-+   with_debug=yes
-+ fi;
-+-echo "$as_me:4208: result: $with_debug" >&5
-++echo "$as_me:4205: result: $with_debug" >&5
-+ echo "${ECHO_T}$with_debug" >&6
-+ test "$with_debug" = "yes" && cf_list_models="$cf_list_models debug"
-+ 
-+-echo "$as_me:4212: checking if you want to build profiling libraries" >&5
-++echo "$as_me:4209: checking if you want to build profiling libraries" >&5
-+ echo $ECHO_N "checking if you want to build profiling libraries... $ECHO_C" >&6
-+ 
-+ # Check whether --with-profile or --without-profile was given.
-+@@ -4219,7 +4216,7 @@
-+ else
-+   with_profile=no
-+ fi;
-+-echo "$as_me:4222: result: $with_profile" >&5
-++echo "$as_me:4219: result: $with_profile" >&5
-+ echo "${ECHO_T}$with_profile" >&6
-+ test "$with_profile" = "yes" && cf_list_models="$cf_list_models profile"
-+ 
-+@@ -4227,23 +4224,25 @@
-+ 
-+ ###############################################################################
-+ 
-+-echo "$as_me:4230: checking for specified models" >&5
-++echo "$as_me:4227: checking for specified models" >&5
-+ echo $ECHO_N "checking for specified models... $ECHO_C" >&6
-+ test -z "$cf_list_models" && cf_list_models=normal
-+ test "$with_libtool" != "no" && cf_list_models=libtool
-+-echo "$as_me:4234: result: $cf_list_models" >&5
-++echo "$as_me:4231: result: $cf_list_models" >&5
-+ echo "${ECHO_T}$cf_list_models" >&6
-+ 
-+ ### Use the first model as the default, and save its suffix for use in building
-+ ### up test-applications.
-+-echo "$as_me:4239: checking for default model" >&5
-++echo "$as_me:4236: checking for default model" >&5
-+ echo $ECHO_N "checking for default model... $ECHO_C" >&6
-+ DFT_LWR_MODEL=`echo "$cf_list_models" | $AWK '{print $1}'`
-+-echo "$as_me:4242: result: $DFT_LWR_MODEL" >&5
-++echo "$as_me:4239: result: $DFT_LWR_MODEL" >&5
-+ echo "${ECHO_T}$DFT_LWR_MODEL" >&6
-+ 
-+ DFT_UPR_MODEL=`echo "$DFT_LWR_MODEL" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-+ 
-++TICS_NAME=tic
-++
-+ TINFO_NAME=tinfo
-+ 
-+ LIB_NAME=ncurses
-+@@ -4264,7 +4263,7 @@
-+ 
-+ ###############################################################################
-+ 
-+-echo "$as_me:4267: checking if you want to build a separate terminfo library" >&5
-++echo "$as_me:4266: checking if you want to build a separate terminfo library" >&5
-+ echo $ECHO_N "checking if you want to build a separate terminfo library... $ECHO_C" >&6
-+ 
-+ # Check whether --with-termlib or --without-termlib was given.
-+@@ -4274,13 +4273,26 @@
-+ else
-+   with_termlib=no
-+ fi;
-+-echo "$as_me:4277: result: $with_termlib" >&5
-++echo "$as_me:4276: result: $with_termlib" >&5
-+ echo "${ECHO_T}$with_termlib" >&6
-+ 
-++echo "$as_me:4279: checking if you want to build a separate tic library" >&5
-++echo $ECHO_N "checking if you want to build a separate tic library... $ECHO_C" >&6
-++
-++# Check whether --with-ticlib or --without-ticlib was given.
-++if test "${with_ticlib+set}" = set; then
-++  withval="$with_ticlib"
-++  with_ticlib=$withval
-++else
-++  with_ticlib=no
-++fi;
-++echo "$as_me:4289: result: $with_ticlib" >&5
-++echo "${ECHO_T}$with_ticlib" >&6
-++
-+ ### Checks for special libraries, must be done up-front.
-+ SHLIB_LIST=""
-+ 
-+-echo "$as_me:4283: checking if you want to link with the GPM mouse library" >&5
-++echo "$as_me:4295: checking if you want to link with the GPM mouse library" >&5
-+ echo $ECHO_N "checking if you want to link with the GPM mouse library... $ECHO_C" >&6
-+ 
-+ # Check whether --with-gpm or --without-gpm was given.
-+@@ -4290,27 +4302,27 @@
-+ else
-+   with_gpm=maybe
-+ fi;
-+-echo "$as_me:4293: result: $with_gpm" >&5
-++echo "$as_me:4305: result: $with_gpm" >&5
-+ echo "${ECHO_T}$with_gpm" >&6
-+ 
-+ if test "$with_gpm" != no ; then
-+-	echo "$as_me:4297: checking for gpm.h" >&5
-++	echo "$as_me:4309: checking for gpm.h" >&5
-+ echo $ECHO_N "checking for gpm.h... $ECHO_C" >&6
-+ if test "${ac_cv_header_gpm_h+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 4303 "configure"
-++#line 4315 "configure"
-+ #include "confdefs.h"
-+ #include <gpm.h>
-+ _ACEOF
-+-if { (eval echo "$as_me:4307: \"$ac_cpp conftest.$ac_ext\"") >&5
-++if { (eval echo "$as_me:4319: \"$ac_cpp conftest.$ac_ext\"") >&5
-+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+   ac_status=$?
-+   egrep -v '^ *\+' conftest.er1 >conftest.err
-+   rm -f conftest.er1
-+   cat conftest.err >&5
-+-  echo "$as_me:4313: \$? = $ac_status" >&5
-++  echo "$as_me:4325: \$? = $ac_status" >&5
-+   (exit $ac_status); } >/dev/null; then
-+   if test -s conftest.err; then
-+     ac_cpp_err=$ac_c_preproc_warn_flag
-+@@ -4329,7 +4341,7 @@
-+ fi
-+ rm -f conftest.err conftest.$ac_ext
-+ fi
-+-echo "$as_me:4332: result: $ac_cv_header_gpm_h" >&5
-++echo "$as_me:4344: result: $ac_cv_header_gpm_h" >&5
-+ echo "${ECHO_T}$ac_cv_header_gpm_h" >&6
-+ if test $ac_cv_header_gpm_h = yes; then
-+ 
-+@@ -4340,12 +4352,14 @@
-+ 		if test "$with_gpm" != yes && test "$with_gpm" != maybe ; then
-+ 			test -n "$verbose" && echo "	assuming we really have GPM library" 1>&6
-+ 
-++echo "${as_me-configure}:4355: testing assuming we really have GPM library ..." 1>&5
-++
-+ 			cat >>confdefs.h <<\EOF
-+ #define HAVE_LIBGPM 1
-+ EOF
-+ 
-+ 		else
-+-			echo "$as_me:4348: checking for Gpm_Open in -lgpm" >&5
-++			echo "$as_me:4362: checking for Gpm_Open in -lgpm" >&5
-+ echo $ECHO_N "checking for Gpm_Open in -lgpm... $ECHO_C" >&6
-+ if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -4353,7 +4367,7 @@
-+   ac_check_lib_save_LIBS=$LIBS
-+ LIBS="-lgpm  $LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 4356 "configure"
-++#line 4370 "configure"
-+ #include "confdefs.h"
-+ 
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+@@ -4372,16 +4386,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:4375: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:4389: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:4378: \$? = $ac_status" >&5
-++  echo "$as_me:4392: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:4381: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:4395: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:4384: \$? = $ac_status" >&5
-++  echo "$as_me:4398: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_cv_lib_gpm_Gpm_Open=yes
-+ else
-+@@ -4392,13 +4406,13 @@
-+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ LIBS=$ac_check_lib_save_LIBS
-+ fi
-+-echo "$as_me:4395: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-++echo "$as_me:4409: result: $ac_cv_lib_gpm_Gpm_Open" >&5
-+ echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Open" >&6
-+ if test $ac_cv_lib_gpm_Gpm_Open = yes; then
-+   :
-+ else
-+ 
-+-				{ { echo "$as_me:4401: error: Cannot link with GPM library" >&5
-++				{ { echo "$as_me:4415: error: Cannot link with GPM library" >&5
-+ echo "$as_me: error: Cannot link with GPM library" >&2;}
-+    { (exit 1); exit 1; }; }
-+ 		fi
-+@@ -4408,7 +4422,7 @@
-+ 
-+ else
-+ 
-+-		test "$with_gpm" != maybe && { echo "$as_me:4411: WARNING: Cannot find GPM header" >&5
-++		test "$with_gpm" != maybe && { echo "$as_me:4425: WARNING: Cannot find GPM header" >&5
-+ echo "$as_me: WARNING: Cannot find GPM header" >&2;}
-+ 		with_gpm=no
-+ 
-+@@ -4417,7 +4431,7 @@
-+ fi
-+ 
-+ if test "$with_gpm" != no ; then
-+-	echo "$as_me:4420: checking if you want to load GPM dynamically" >&5
-++	echo "$as_me:4434: checking if you want to load GPM dynamically" >&5
-+ echo $ECHO_N "checking if you want to load GPM dynamically... $ECHO_C" >&6
-+ 
-+ # Check whether --with-dlsym or --without-dlsym was given.
-+@@ -4427,18 +4441,18 @@
-+ else
-+   with_dlsym=yes
-+ fi;
-+-	echo "$as_me:4430: result: $with_dlsym" >&5
-++	echo "$as_me:4444: result: $with_dlsym" >&5
-+ echo "${ECHO_T}$with_dlsym" >&6
-+ 	if test "$with_dlsym" = yes ; then
-+ 
-+ cf_have_dlsym=no
-+-echo "$as_me:4435: checking for dlsym" >&5
-++echo "$as_me:4449: checking for dlsym" >&5
-+ echo $ECHO_N "checking for dlsym... $ECHO_C" >&6
-+ if test "${ac_cv_func_dlsym+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 4441 "configure"
-++#line 4455 "configure"
-+ #include "confdefs.h"
-+ /* System header to define __stub macros and hopefully few prototypes,
-+     which can conflict with char dlsym (); below.  */
-+@@ -4469,16 +4483,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:4472: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:4486: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:4475: \$? = $ac_status" >&5
-++  echo "$as_me:4489: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:4478: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:4492: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:4481: \$? = $ac_status" >&5
-++  echo "$as_me:4495: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_cv_func_dlsym=yes
-+ else
-+@@ -4488,14 +4502,14 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ fi
-+-echo "$as_me:4491: result: $ac_cv_func_dlsym" >&5
-++echo "$as_me:4505: result: $ac_cv_func_dlsym" >&5
-+ echo "${ECHO_T}$ac_cv_func_dlsym" >&6
-+ if test $ac_cv_func_dlsym = yes; then
-+   cf_have_dlsym=yes
-+ else
-+ 
-+ cf_have_libdl=no
-+-echo "$as_me:4498: checking for dlsym in -ldl" >&5
-++echo "$as_me:4512: checking for dlsym in -ldl" >&5
-+ echo $ECHO_N "checking for dlsym in -ldl... $ECHO_C" >&6
-+ if test "${ac_cv_lib_dl_dlsym+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -4503,7 +4517,7 @@
-+   ac_check_lib_save_LIBS=$LIBS
-+ LIBS="-ldl  $LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 4506 "configure"
-++#line 4520 "configure"
-+ #include "confdefs.h"
-+ 
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+@@ -4522,16 +4536,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:4525: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:4539: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:4528: \$? = $ac_status" >&5
-++  echo "$as_me:4542: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:4531: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:4545: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:4534: \$? = $ac_status" >&5
-++  echo "$as_me:4548: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_cv_lib_dl_dlsym=yes
-+ else
-+@@ -4542,7 +4556,7 @@
-+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ LIBS=$ac_check_lib_save_LIBS
-+ fi
-+-echo "$as_me:4545: result: $ac_cv_lib_dl_dlsym" >&5
-++echo "$as_me:4559: result: $ac_cv_lib_dl_dlsym" >&5
-+ echo "${ECHO_T}$ac_cv_lib_dl_dlsym" >&6
-+ if test $ac_cv_lib_dl_dlsym = yes; then
-+ 
-+@@ -4555,10 +4569,10 @@
-+ if test "$cf_have_dlsym" = yes ; then
-+ 	test "$cf_have_libdl" = yes && LIBS="-ldl $LIBS"
-+ 
-+-	echo "$as_me:4558: checking whether able to link to dl*() functions" >&5
-++	echo "$as_me:4572: checking whether able to link to dl*() functions" >&5
-+ echo $ECHO_N "checking whether able to link to dl*() functions... $ECHO_C" >&6
-+ 	cat >conftest.$ac_ext <<_ACEOF
-+-#line 4561 "configure"
-++#line 4575 "configure"
-+ #include "confdefs.h"
-+ #include <dlfcn.h>
-+ int
-+@@ -4576,16 +4590,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:4579: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:4593: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:4582: \$? = $ac_status" >&5
-++  echo "$as_me:4596: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:4585: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:4599: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:4588: \$? = $ac_status" >&5
-++  echo "$as_me:4602: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+ 
-+ 		cat >>confdefs.h <<\EOF
-+@@ -4596,15 +4610,15 @@
-+   echo "$as_me: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ 
-+-		{ { echo "$as_me:4599: error: Cannot link test program for libdl" >&5
-++		{ { echo "$as_me:4613: error: Cannot link test program for libdl" >&5
-+ echo "$as_me: error: Cannot link test program for libdl" >&2;}
-+    { (exit 1); exit 1; }; }
-+ fi
-+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+-	echo "$as_me:4604: result: ok" >&5
-++	echo "$as_me:4618: result: ok" >&5
-+ echo "${ECHO_T}ok" >&6
-+ else
-+-	{ { echo "$as_me:4607: error: Cannot find dlsym function" >&5
-++	{ { echo "$as_me:4621: error: Cannot find dlsym function" >&5
-+ echo "$as_me: error: Cannot find dlsym function" >&2;}
-+    { (exit 1); exit 1; }; }
-+ fi
-+@@ -4612,10 +4626,12 @@
-+ 		if test "$with_gpm" != yes ; then
-+ 			test -n "$verbose" && echo "	assuming soname for gpm is $with_gpm" 1>&6
-+ 
-++echo "${as_me-configure}:4629: testing assuming soname for gpm is $with_gpm ..." 1>&5
-++
-+ 			cf_cv_gpm_soname="$with_gpm"
-+ 		else
-+ 
-+-echo "$as_me:4618: checking for soname of gpm library" >&5
-++echo "$as_me:4634: checking for soname of gpm library" >&5
-+ echo $ECHO_N "checking for soname of gpm library... $ECHO_C" >&6
-+ if test "${cf_cv_gpm_soname+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -4633,15 +4649,15 @@
-+ CF_EOF
-+ cf_save_LIBS="$LIBS"
-+ 	LIBS="-lgpm $LIBS"
-+-	if { (eval echo "$as_me:4636: \"$ac_compile\"") >&5
-++	if { (eval echo "$as_me:4652: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:4639: \$? = $ac_status" >&5
-++  echo "$as_me:4655: \$? = $ac_status" >&5
-+   (exit $ac_status); } ; then
-+-		if { (eval echo "$as_me:4641: \"$ac_link\"") >&5
-++		if { (eval echo "$as_me:4657: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:4644: \$? = $ac_status" >&5
-++  echo "$as_me:4660: \$? = $ac_status" >&5
-+   (exit $ac_status); } ; then
-+ 			cf_cv_gpm_soname=`ldd conftest$ac_exeext 2>/dev/null | sed -e 's,^.*/,,' -e 's, .*$,,' | fgrep libgpm.`
-+ 			test -z "$cf_cv_gpm_soname" && cf_cv_gpm_soname=unknown
-+@@ -4652,7 +4668,7 @@
-+ fi
-+ 
-+ fi
-+-echo "$as_me:4655: result: $cf_cv_gpm_soname" >&5
-++echo "$as_me:4671: result: $cf_cv_gpm_soname" >&5
-+ echo "${ECHO_T}$cf_cv_gpm_soname" >&6
-+ 
-+ 		fi
-+@@ -4668,7 +4684,7 @@
-+ #define HAVE_LIBGPM 1
-+ EOF
-+ 
-+-	echo "$as_me:4671: checking for Gpm_Wgetch in -lgpm" >&5
-++echo "$as_me:4687: checking for Gpm_Wgetch in -lgpm" >&5
-+ echo $ECHO_N "checking for Gpm_Wgetch in -lgpm... $ECHO_C" >&6
-+ if test "${ac_cv_lib_gpm_Gpm_Wgetch+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -4676,7 +4692,7 @@
-+   ac_check_lib_save_LIBS=$LIBS
-+ LIBS="-lgpm  $LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 4679 "configure"
-++#line 4695 "configure"
-+ #include "confdefs.h"
-+ 
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+@@ -4695,16 +4711,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:4698: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:4714: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:4701: \$? = $ac_status" >&5
-++  echo "$as_me:4717: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:4704: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:4720: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:4707: \$? = $ac_status" >&5
-++  echo "$as_me:4723: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_cv_lib_gpm_Gpm_Wgetch=yes
-+ else
-+@@ -4715,12 +4731,61 @@
-+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ LIBS=$ac_check_lib_save_LIBS
-+ fi
-+-echo "$as_me:4718: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
-++echo "$as_me:4734: result: $ac_cv_lib_gpm_Gpm_Wgetch" >&5
-+ echo "${ECHO_T}$ac_cv_lib_gpm_Gpm_Wgetch" >&6
-+ if test $ac_cv_lib_gpm_Gpm_Wgetch = yes; then
-+ 
-+-		{ echo "$as_me:4722: WARNING: GPM library is already linked with curses - read the FAQ" >&5
-++echo "$as_me:4738: checking if GPM is weakly bound to curses library" >&5
-++echo $ECHO_N "checking if GPM is weakly bound to curses library... $ECHO_C" >&6
-++if test "${cf_cv_check_gpm_wgetch+set}" = set; then
-++  echo $ECHO_N "(cached) $ECHO_C" >&6
-++else
-++
-++cf_cv_check_gpm_wgetch=unknown
-++if test "$cross_compiling" != yes ; then
-++
-++cat >conftest.$ac_ext <<CF_EOF
-++#include <gpm.h>
-++int main()
-++{
-++	Gpm_Wgetch();
-++	${cf_cv_main_return:-return}(0);
-++}
-++CF_EOF
-++
-++	cf_save_LIBS="$LIBS"
-++	# This only works if we can look at the symbol table.  If a shared
-++	# library is stripped for install, we cannot use that.  So we're forced
-++	# to rely on the static library, noting that some packagers may not
-++	# include it.
-++	LIBS="-static -lgpm -dynamic $LIBS"
-++	if { (eval echo "$as_me:4762: \"$ac_compile\"") >&5
-++  (eval $ac_compile) 2>&5
-++  ac_status=$?
-++  echo "$as_me:4765: \$? = $ac_status" >&5
-++  (exit $ac_status); } ; then
-++		if { (eval echo "$as_me:4767: \"$ac_link\"") >&5
-++  (eval $ac_link) 2>&5
-++  ac_status=$?
-++  echo "$as_me:4770: \$? = $ac_status" >&5
-++  (exit $ac_status); } ; then
-++			cf_cv_check_gpm_wgetch=`nm conftest$ac_exeext | egrep '\<wgetch\>' | egrep '\<[vVwW]\>'`
-++			test -n "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=yes
-++			test -z "$cf_cv_check_gpm_wgetch" && cf_cv_check_gpm_wgetch=no
-++		fi
-++	fi
-++	rm -f conftest*
-++	LIBS="$cf_save_LIBS"
-++fi
-++
-++fi
-++echo "$as_me:4782: result: $cf_cv_check_gpm_wgetch" >&5
-++echo "${ECHO_T}$cf_cv_check_gpm_wgetch" >&6
-++
-++if test "$cf_cv_check_gpm_wgetch" != yes ; then
-++	{ echo "$as_me:4786: WARNING: GPM library is already linked with curses - read the FAQ" >&5
-+ echo "$as_me: WARNING: GPM library is already linked with curses - read the FAQ" >&2;}
-++fi
-+ 
-+ fi
-+ 
-+@@ -4728,7 +4793,7 @@
-+ 
-+ # not everyone has "test -c"
-+ if test -c /dev/sysmouse 2>/dev/null ; then
-+-echo "$as_me:4731: checking if you want to use sysmouse" >&5
-++echo "$as_me:4796: checking if you want to use sysmouse" >&5
-+ echo $ECHO_N "checking if you want to use sysmouse... $ECHO_C" >&6
-+ 
-+ # Check whether --with-sysmouse or --without-sysmouse was given.
-+@@ -4740,7 +4805,7 @@
-+ fi;
-+ 	if test "$cf_with_sysmouse" != no ; then
-+ 	cat >conftest.$ac_ext <<_ACEOF
-+-#line 4743 "configure"
-++#line 4808 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <osreldate.h>
-+@@ -4763,16 +4828,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:4766: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:4831: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:4769: \$? = $ac_status" >&5
-++  echo "$as_me:4834: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:4772: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:4837: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:4775: \$? = $ac_status" >&5
-++  echo "$as_me:4840: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_with_sysmouse=yes
-+ else
-+@@ -4782,7 +4847,7 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+ 	fi
-+-echo "$as_me:4785: result: $cf_with_sysmouse" >&5
-++echo "$as_me:4850: result: $cf_with_sysmouse" >&5
-+ echo "${ECHO_T}$cf_with_sysmouse" >&6
-+ test "$cf_with_sysmouse" = yes && cat >>confdefs.h <<\EOF
-+ #define USE_SYSMOUSE 1
-+@@ -4800,7 +4865,7 @@
-+ 	test -n "$GXX" && test "${ac_cv_prog_cxx_g}" != yes && CXX_G_OPT=''
-+ fi
-+ 
-+-echo "$as_me:4803: checking for default loader flags" >&5
-++echo "$as_me:4868: checking for default loader flags" >&5
-+ echo $ECHO_N "checking for default loader flags... $ECHO_C" >&6
-+ case $DFT_LWR_MODEL in
-+ libtool) LD_MODEL=''   ;;
-+@@ -4809,10 +4874,12 @@
-+ profile) LD_MODEL='-pg';;
-+ shared)  LD_MODEL=''   ;;
-+ esac
-+-echo "$as_me:4812: result: $LD_MODEL" >&5
-++echo "$as_me:4877: result: $LD_MODEL" >&5
-+ echo "${ECHO_T}$LD_MODEL" >&6
-+ 
-+-echo "$as_me:4815: checking if rpath option should be used" >&5
-++case $DFT_LWR_MODEL in
-++shared)
-++echo "$as_me:4882: checking if rpath option should be used" >&5
-+ echo $ECHO_N "checking if rpath option should be used... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-rpath or --disable-rpath was given.
-+@@ -4822,8 +4889,22 @@
-+ else
-+   cf_cv_ld_rpath=no
-+ fi;
-+-echo "$as_me:4825: result: $cf_cv_ld_rpath" >&5
-++echo "$as_me:4892: result: $cf_cv_ld_rpath" >&5
-+ echo "${ECHO_T}$cf_cv_ld_rpath" >&6
-++echo "$as_me:4894: checking if shared libraries should be relinked during install" >&5
-++echo $ECHO_N "checking if shared libraries should be relinked during install... $ECHO_C" >&6
-++
-++# Check whether --enable-relink or --disable-relink was given.
-++if test "${enable_relink+set}" = set; then
-++  enableval="$enable_relink"
-++  cf_cv_do_relink=$enableval
-++else
-++  cf_cv_do_relink=yes
-++fi;
-++echo "$as_me:4904: result: $cf_cv_do_relink" >&5
-++echo "${ECHO_T}$cf_cv_do_relink" >&6
-++	;;
-++esac
-+ 
-+ 	LOCAL_LDFLAGS=
-+ 	LOCAL_LDFLAGS2=
-+@@ -4832,7 +4913,7 @@
-+ 
-+ 	cf_cv_do_symlinks=no
-+ 
-+-	echo "$as_me:4835: checking if release/abi version should be used for shared libs" >&5
-++	echo "$as_me:4916: checking if release/abi version should be used for shared libs" >&5
-+ echo $ECHO_N "checking if release/abi version should be used for shared libs... $ECHO_C" >&6
-+ 
-+ # Check whether --with-shlib-version or --without-shlib-version was given.
-+@@ -4847,7 +4928,7 @@
-+ 		cf_cv_shlib_version=$withval
-+ 		;;
-+ 	*)
-+-		{ { echo "$as_me:4850: error: option value must be one of: rel, abi, auto or no" >&5
-++		{ { echo "$as_me:4931: error: option value must be one of: rel, abi, auto or no" >&5
-+ echo "$as_me: error: option value must be one of: rel, abi, auto or no" >&2;}
-+    { (exit 1); exit 1; }; }
-+ 		;;
-+@@ -4856,7 +4937,7 @@
-+ else
-+   cf_cv_shlib_version=auto
-+ fi;
-+-	echo "$as_me:4859: result: $cf_cv_shlib_version" >&5
-++	echo "$as_me:4940: result: $cf_cv_shlib_version" >&5
-+ echo "${ECHO_T}$cf_cv_shlib_version" >&6
-+ 
-+ 	cf_cv_rm_so_locs=no
-+@@ -4865,14 +4946,14 @@
-+ 	CC_SHARED_OPTS=
-+ 	if test "$GCC" = yes
-+ 	then
-+-		echo "$as_me:4868: checking which $CC option to use" >&5
-++		echo "$as_me:4949: checking which $CC option to use" >&5
-+ echo $ECHO_N "checking which $CC option to use... $ECHO_C" >&6
-+ 		cf_save_CFLAGS="$CFLAGS"
-+ 		for CC_SHARED_OPTS in -fPIC -fpic ''
-+ 		do
-+ 			CFLAGS="$cf_save_CFLAGS $CC_SHARED_OPTS"
-+ 			cat >conftest.$ac_ext <<_ACEOF
-+-#line 4875 "configure"
-++#line 4956 "configure"
-+ #include "confdefs.h"
-+ #include <stdio.h>
-+ int
-+@@ -4884,16 +4965,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:4887: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:4968: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:4890: \$? = $ac_status" >&5
-++  echo "$as_me:4971: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:4893: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:4974: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:4896: \$? = $ac_status" >&5
-++  echo "$as_me:4977: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   break
-+ else
-+@@ -4902,7 +4983,7 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+ 		done
-+-		echo "$as_me:4905: result: $CC_SHARED_OPTS" >&5
-++		echo "$as_me:4986: result: $CC_SHARED_OPTS" >&5
-+ echo "${ECHO_T}$CC_SHARED_OPTS" >&6
-+ 		CFLAGS="$cf_save_CFLAGS"
-+ 	fi
-+@@ -4915,17 +4996,30 @@
-+ 		;;
-+ 	cygwin*)
-+ 		CC_SHARED_OPTS=
-+-		MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,--out-implib=../lib/${IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/${SHARED_LIB}'
-++		MK_SHARED_LIB='sh ../mk_shared_lib.sh $@ ${CC} ${CFLAGS}'
-+ 		cf_cv_shlib_version=cygdll
-+ 		cf_cv_shlib_version_infix=cygdll
-++		cat >mk_shared_lib.sh <<-CF_EOF
-++		#!/bin/sh
-++		SHARED_LIB=\$1
-++		IMPORT_LIB=\`echo "\$1" | sed -e 's/cyg/lib/' -e 's/[0-9]*\.dll$/.dll.a/'\`
-++		shift
-++		cat <<-EOF
-++		Linking shared library
-++		** SHARED_LIB \$SHARED_LIB
-++		** IMPORT_LIB \$IMPORT_LIB
-++EOF
-++		exec \$* -shared -Wl,--out-implib=../lib/\${IMPORT_LIB} -Wl,--export-all-symbols -o ../lib/\${SHARED_LIB}
-++CF_EOF
-++		chmod +x mk_shared_lib.sh
-+ 		;;
-+ 	darwin*)
-+ 		EXTRA_CFLAGS="-no-cpp-precomp"
-+ 		CC_SHARED_OPTS="-dynamic"
-+-		MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${DESTDIR}${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
-++		MK_SHARED_LIB='${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/`basename $@` -compatibility_version ${ABI_VERSION} -current_version ${ABI_VERSION} -o $@'
-+ 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=abi
-+ 		cf_cv_shlib_version_infix=yes
-+-		echo "$as_me:4928: checking if ld -search_paths_first works" >&5
-++		echo "$as_me:5022: checking if ld -search_paths_first works" >&5
-+ echo $ECHO_N "checking if ld -search_paths_first works... $ECHO_C" >&6
-+ if test "${cf_cv_ldflags_search_paths_first+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -4934,7 +5028,7 @@
-+ 			cf_save_LDFLAGS=$LDFLAGS
-+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
-+ 			cat >conftest.$ac_ext <<_ACEOF
-+-#line 4937 "configure"
-++#line 5031 "configure"
-+ #include "confdefs.h"
-+ 
-+ int
-+@@ -4946,16 +5040,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:4949: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:5043: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:4952: \$? = $ac_status" >&5
-++  echo "$as_me:5046: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:4955: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:5049: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:4958: \$? = $ac_status" >&5
-++  echo "$as_me:5052: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_ldflags_search_paths_first=yes
-+ else
-+@@ -4966,7 +5060,7 @@
-+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ 				LDFLAGS=$cf_save_LDFLAGS
-+ fi
-+-echo "$as_me:4969: result: $cf_cv_ldflags_search_paths_first" >&5
-++echo "$as_me:5063: result: $cf_cv_ldflags_search_paths_first" >&5
-+ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
-+ 		if test $cf_cv_ldflags_search_paths_first = yes; then
-+ 			LDFLAGS="$LDFLAGS -Wl,-search_paths_first"
-+@@ -5021,11 +5115,11 @@
-+ 
-+ 		MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_shared_soname',-stats,-lc -o $@'
-+ 		;;
-+-	openbsd2*)
-++	openbsd[2-9].*)
-+ 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
-+ 		MK_SHARED_LIB='${LD} -Bshareable -soname,`basename $@.${ABI_VERSION}` -o $@'
-+ 		;;
-+-	openbsd*|freebsd[23]*)
-++	openbsd*|freebsd[12].*)
-+ 		CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
-+ 		MK_SHARED_LIB='${LD} -Bshareable -o $@'
-+ 		test "$cf_cv_shlib_version" = auto && cf_cv_shlib_version=rel
-+@@ -5162,7 +5256,7 @@
-+ 			test "$cf_cv_do_symlinks" = no && cf_cv_do_symlinks=yes
-+ 			;;
-+ 		*)
-+-			{ echo "$as_me:5165: WARNING: ignored --with-shlib-version" >&5
-++			{ echo "$as_me:5259: WARNING: ignored --with-shlib-version" >&5
-+ echo "$as_me: WARNING: ignored --with-shlib-version" >&2;}
-+ 			;;
-+ 		esac
-+@@ -5170,12 +5264,12 @@
-+ 	esac
-+ 
-+ 	if test -n "$cf_ld_rpath_opt" ; then
-+-		echo "$as_me:5173: checking if we need a space after rpath option" >&5
-++		echo "$as_me:5267: checking if we need a space after rpath option" >&5
-+ echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6
-+ 		cf_save_LIBS="$LIBS"
-+ 		LIBS="$LIBS ${cf_ld_rpath_opt}$libdir"
-+ 		cat >conftest.$ac_ext <<_ACEOF
-+-#line 5178 "configure"
-++#line 5272 "configure"
-+ #include "confdefs.h"
-+ 
-+ int
-+@@ -5187,16 +5281,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:5190: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:5284: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:5193: \$? = $ac_status" >&5
-++  echo "$as_me:5287: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:5196: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:5290: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:5199: \$? = $ac_status" >&5
-++  echo "$as_me:5293: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_rpath_space=no
-+ else
-+@@ -5206,7 +5300,7 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ 		LIBS="$cf_save_LIBS"
-+-		echo "$as_me:5209: result: $cf_rpath_space" >&5
-++		echo "$as_me:5303: result: $cf_rpath_space" >&5
-+ echo "${ECHO_T}$cf_rpath_space" >&6
-+ 		test "$cf_rpath_space" = yes && cf_ld_rpath_opt="$cf_ld_rpath_opt "
-+ 		MK_SHARED_LIB="$MK_SHARED_LIB $cf_ld_rpath_opt\${libdir}"
-+@@ -5215,7 +5309,7 @@
-+ if test "$CC_SHARED_OPTS" = "unknown"; then
-+ 	for model in $cf_list_models; do
-+ 		if test "$model" = "shared"; then
-+-			{ { echo "$as_me:5218: error: Shared libraries are not supported in this version" >&5
-++			{ { echo "$as_me:5312: error: Shared libraries are not supported in this version" >&5
-+ echo "$as_me: error: Shared libraries are not supported in this version" >&2;}
-+    { (exit 1); exit 1; }; }
-+ 		fi
-+@@ -5225,7 +5319,7 @@
-+ ###############################################################################
-+ 
-+ ###	use option --disable-overwrite to leave out the link to -lcurses
-+-echo "$as_me:5228: checking if you wish to install ncurses overwriting curses" >&5
-++echo "$as_me:5322: checking if you wish to install ncurses overwriting curses" >&5
-+ echo $ECHO_N "checking if you wish to install ncurses overwriting curses... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-overwrite or --disable-overwrite was given.
-+@@ -5235,10 +5329,10 @@
-+ else
-+   if test "$prefix" = "/usr" ; then with_overwrite=yes; else with_overwrite=no; fi
-+ fi;
-+-echo "$as_me:5238: result: $with_overwrite" >&5
-++echo "$as_me:5332: result: $with_overwrite" >&5
-+ echo "${ECHO_T}$with_overwrite" >&6
-+ 
-+-echo "$as_me:5241: checking if external terminfo-database is used" >&5
-++echo "$as_me:5335: checking if external terminfo-database is used" >&5
-+ echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-database or --disable-database was given.
-+@@ -5248,7 +5342,7 @@
-+ else
-+   use_database=yes
-+ fi;
-+-echo "$as_me:5251: result: $use_database" >&5
-++echo "$as_me:5345: result: $use_database" >&5
-+ echo "${ECHO_T}$use_database" >&6
-+ 
-+ case $host_os in #(vi
-+@@ -5270,7 +5364,7 @@
-+ #define USE_DATABASE 1
-+ EOF
-+ 
-+-	echo "$as_me:5273: checking which terminfo source-file will be installed" >&5
-++	echo "$as_me:5367: checking which terminfo source-file will be installed" >&5
-+ echo $ECHO_N "checking which terminfo source-file will be installed... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-database or --disable-database was given.
-+@@ -5278,10 +5372,10 @@
-+   enableval="$enable_database"
-+   TERMINFO_SRC=$withval
-+ fi;
-+-	echo "$as_me:5281: result: $TERMINFO_SRC" >&5
-++	echo "$as_me:5375: result: $TERMINFO_SRC" >&5
-+ echo "${ECHO_T}$TERMINFO_SRC" >&6
-+ 
-+-	echo "$as_me:5284: checking whether to use hashed database instead of directory/tree" >&5
-++	echo "$as_me:5378: checking whether to use hashed database instead of directory/tree" >&5
-+ echo $ECHO_N "checking whether to use hashed database instead of directory/tree... $ECHO_C" >&6
-+ 
-+ # Check whether --with-hashed-db or --without-hashed-db was given.
-+@@ -5291,11 +5385,11 @@
-+ else
-+   with_hashed_db=no
-+ fi;
-+-	echo "$as_me:5294: result: $with_hashed_db" >&5
-++	echo "$as_me:5388: result: $with_hashed_db" >&5
-+ echo "${ECHO_T}$with_hashed_db" >&6
-+ fi
-+ 
-+-echo "$as_me:5298: checking for list of fallback descriptions" >&5
-++echo "$as_me:5392: checking for list of fallback descriptions" >&5
-+ echo $ECHO_N "checking for list of fallback descriptions... $ECHO_C" >&6
-+ 
-+ # Check whether --with-fallbacks or --without-fallbacks was given.
-+@@ -5305,11 +5399,11 @@
-+ else
-+   with_fallback=
-+ fi;
-+-echo "$as_me:5308: result: $with_fallback" >&5
-++echo "$as_me:5402: result: $with_fallback" >&5
-+ echo "${ECHO_T}$with_fallback" >&6
-+ FALLBACK_LIST=`echo "$with_fallback" | sed -e 's/,/ /g'`
-+ 
-+-echo "$as_me:5312: checking if you want modern xterm or antique" >&5
-++echo "$as_me:5406: checking if you want modern xterm or antique" >&5
-+ echo $ECHO_N "checking if you want modern xterm or antique... $ECHO_C" >&6
-+ 
-+ # Check whether --with-xterm-new or --without-xterm-new was given.
-+@@ -5323,7 +5417,7 @@
-+ no)	with_xterm_new=xterm-old;;
-+ *)	with_xterm_new=xterm-new;;
-+ esac
-+-echo "$as_me:5326: result: $with_xterm_new" >&5
-++echo "$as_me:5420: result: $with_xterm_new" >&5
-+ echo "${ECHO_T}$with_xterm_new" >&6
-+ WHICH_XTERM=$with_xterm_new
-+ 
-+@@ -5333,7 +5427,7 @@
-+ 	MAKE_TERMINFO="#"
-+ else
-+ 
-+-echo "$as_me:5336: checking for list of terminfo directories" >&5
-++echo "$as_me:5430: checking for list of terminfo directories" >&5
-+ echo $ECHO_N "checking for list of terminfo directories... $ECHO_C" >&6
-+ 
-+ # Check whether --with-terminfo-dirs or --without-terminfo-dirs was given.
-+@@ -5373,7 +5467,7 @@
-+   cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
-+   ;;
-+ *)
-+-  { { echo "$as_me:5376: error: expected a pathname, not \"$cf_src_path\"" >&5
-++  { { echo "$as_me:5470: error: expected a pathname, not \"$cf_src_path\"" >&5
-+ echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
-+    { (exit 1); exit 1; }; }
-+   ;;
-+@@ -5386,13 +5480,13 @@
-+ 
-+ eval 'TERMINFO_DIRS="$cf_dst_path"'
-+ 
-+-echo "$as_me:5389: result: $TERMINFO_DIRS" >&5
-++echo "$as_me:5483: result: $TERMINFO_DIRS" >&5
-+ echo "${ECHO_T}$TERMINFO_DIRS" >&6
-+ test -n "$TERMINFO_DIRS" && cat >>confdefs.h <<EOF
-+ #define TERMINFO_DIRS "$TERMINFO_DIRS"
-+ EOF
-+ 
-+-echo "$as_me:5395: checking for default terminfo directory" >&5
-++echo "$as_me:5489: checking for default terminfo directory" >&5
-+ echo $ECHO_N "checking for default terminfo directory... $ECHO_C" >&6
-+ 
-+ # Check whether --with-default-terminfo-dir or --without-default-terminfo-dir was given.
-+@@ -5401,7 +5495,8 @@
-+ 
-+ else
-+   withval="${TERMINFO-${datadir}/terminfo}"
-+-fi;
-++fi; if test -n "${datadir}/terminfo" ; then
-++
-+ if test "x$prefix" != xNONE; then
-+   cf_path_syntax="$prefix"
-+ else
-+@@ -5427,15 +5522,16 @@
-+   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
-+   ;;
-+ *)
-+-  { { echo "$as_me:5430: error: expected a pathname, not \"$withval\"" >&5
-++  { { echo "$as_me:5525: error: expected a pathname, not \"$withval\"" >&5
-+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-+    { (exit 1); exit 1; }; }
-+   ;;
-+ esac
-+ 
-++fi
-+ TERMINFO="$withval"
-+ 
-+-echo "$as_me:5438: result: $TERMINFO" >&5
-++echo "$as_me:5534: result: $TERMINFO" >&5
-+ echo "${ECHO_T}$TERMINFO" >&6
-+ cat >>confdefs.h <<EOF
-+ #define TERMINFO "$TERMINFO"
-+@@ -5445,7 +5541,7 @@
-+ 
-+ ###	use option --disable-big-core to make tic run on small machines
-+ ###	We need 4Mb, check if we can allocate 50% more than that.
-+-echo "$as_me:5448: checking if big-core option selected" >&5
-++echo "$as_me:5544: checking if big-core option selected" >&5
-+ echo $ECHO_N "checking if big-core option selected... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-big-core or --disable-big-core was given.
-+@@ -5457,7 +5553,7 @@
-+   with_big_core=no
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 5460 "configure"
-++#line 5556 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <stdlib.h>
-+@@ -5471,15 +5567,15 @@
-+ }
-+ _ACEOF
-+ rm -f conftest$ac_exeext
-+-if { (eval echo "$as_me:5474: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:5570: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:5477: \$? = $ac_status" >&5
-++  echo "$as_me:5573: \$? = $ac_status" >&5
-+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+-  { (eval echo "$as_me:5479: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:5575: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:5482: \$? = $ac_status" >&5
-++  echo "$as_me:5578: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   with_big_core=yes
-+ else
-+@@ -5491,14 +5587,32 @@
-+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+ fi
-+ fi;
-+-echo "$as_me:5494: result: $with_big_core" >&5
-++echo "$as_me:5590: result: $with_big_core" >&5
-+ echo "${ECHO_T}$with_big_core" >&6
-+ test "$with_big_core" = "yes" && cat >>confdefs.h <<\EOF
-+ #define HAVE_BIG_CORE 1
-+ EOF
-+ 
-++### ISO C only guarantees 512-char strings, we have tables which load faster
-++### when constructed using "big" strings.
-++echo "$as_me:5598: checking if big-strings option selected" >&5
-++echo $ECHO_N "checking if big-strings option selected... $ECHO_C" >&6
-++
-++# Check whether --enable-big-strings or --disable-big-strings was given.
-++if test "${enable_big_strings+set}" = set; then
-++  enableval="$enable_big_strings"
-++  with_big_strings=no
-++else
-++  with_big_strings=yes
-++fi;
-++echo "$as_me:5608: result: $with_big_strings" >&5
-++echo "${ECHO_T}$with_big_strings" >&6
-++
-++USE_BIG_STRINGS=0
-++test "$with_big_strings" = "yes" && USE_BIG_STRINGS=1
-++
-+ ###	use option --enable-termcap to compile in the termcap fallback support
-+-echo "$as_me:5501: checking if you want termcap-fallback support" >&5
-++echo "$as_me:5615: checking if you want termcap-fallback support" >&5
-+ echo $ECHO_N "checking if you want termcap-fallback support... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-termcap or --disable-termcap was given.
-+@@ -5508,13 +5622,13 @@
-+ else
-+   with_termcap=no
-+ fi;
-+-echo "$as_me:5511: result: $with_termcap" >&5
-++echo "$as_me:5625: result: $with_termcap" >&5
-+ echo "${ECHO_T}$with_termcap" >&6
-+ 
-+ if test "$with_termcap" != "yes" ; then
-+ 	if test "$use_database" = no ; then
-+ 		if test -z "$with_fallback" ; then
-+-			{ { echo "$as_me:5517: error: You have disabled the database w/o specifying fallbacks" >&5
-++			{ { echo "$as_me:5631: error: You have disabled the database w/o specifying fallbacks" >&5
-+ echo "$as_me: error: You have disabled the database w/o specifying fallbacks" >&2;}
-+    { (exit 1); exit 1; }; }
-+ 		fi
-+@@ -5525,11 +5639,17 @@
-+ 
-+ else
-+ 
-++if test "$with_ticlib" != no ; then
-++	{ { echo "$as_me:5643: error: Options --with-ticlib and --enable-termcap cannot be combined" >&5
-++echo "$as_me: error: Options --with-ticlib and --enable-termcap cannot be combined" >&2;}
-++   { (exit 1); exit 1; }; }
-++fi
-++
-+ cat >>confdefs.h <<\EOF
-+ #define USE_TERMCAP 1
-+ EOF
-+ 
-+-echo "$as_me:5532: checking for list of termcap files" >&5
-++echo "$as_me:5652: checking for list of termcap files" >&5
-+ echo $ECHO_N "checking for list of termcap files... $ECHO_C" >&6
-+ 
-+ # Check whether --with-termpath or --without-termpath was given.
-+@@ -5569,7 +5689,7 @@
-+   cf_src_path=`echo $cf_src_path | sed -e s%NONE%$cf_path_syntax%`
-+   ;;
-+ *)
-+-  { { echo "$as_me:5572: error: expected a pathname, not \"$cf_src_path\"" >&5
-++  { { echo "$as_me:5692: error: expected a pathname, not \"$cf_src_path\"" >&5
-+ echo "$as_me: error: expected a pathname, not \"$cf_src_path\"" >&2;}
-+    { (exit 1); exit 1; }; }
-+   ;;
-+@@ -5582,14 +5702,14 @@
-+ 
-+ eval 'TERMPATH="$cf_dst_path"'
-+ 
-+-echo "$as_me:5585: result: $TERMPATH" >&5
-++echo "$as_me:5705: result: $TERMPATH" >&5
-+ echo "${ECHO_T}$TERMPATH" >&6
-+ test -n "$TERMPATH" && cat >>confdefs.h <<EOF
-+ #define TERMPATH "$TERMPATH"
-+ EOF
-+ 
-+ ###	use option --enable-getcap to use a hacked getcap for reading termcaps
-+-echo "$as_me:5592: checking if fast termcap-loader is needed" >&5
-++echo "$as_me:5712: checking if fast termcap-loader is needed" >&5
-+ echo $ECHO_N "checking if fast termcap-loader is needed... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-getcap or --disable-getcap was given.
-+@@ -5599,13 +5719,13 @@
-+ else
-+   with_getcap=no
-+ fi;
-+-echo "$as_me:5602: result: $with_getcap" >&5
-++echo "$as_me:5722: result: $with_getcap" >&5
-+ echo "${ECHO_T}$with_getcap" >&6
-+ test "$with_getcap" = "yes" && cat >>confdefs.h <<\EOF
-+ #define USE_GETCAP 1
-+ EOF
-+ 
-+-echo "$as_me:5608: checking if translated termcaps will be cached in ~/.terminfo" >&5
-++echo "$as_me:5728: checking if translated termcaps will be cached in ~/.terminfo" >&5
-+ echo $ECHO_N "checking if translated termcaps will be cached in ~/.terminfo... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-getcap-cache or --disable-getcap-cache was given.
-+@@ -5615,7 +5735,7 @@
-+ else
-+   with_getcap_cache=no
-+ fi;
-+-echo "$as_me:5618: result: $with_getcap_cache" >&5
-++echo "$as_me:5738: result: $with_getcap_cache" >&5
-+ echo "${ECHO_T}$with_getcap_cache" >&6
-+ test "$with_getcap_cache" = "yes" && cat >>confdefs.h <<\EOF
-+ #define USE_GETCAP_CACHE 1
-+@@ -5624,7 +5744,7 @@
-+ fi
-+ 
-+ ###   Use option --disable-home-terminfo to completely remove ~/.terminfo
-+-echo "$as_me:5627: checking if ~/.terminfo is wanted" >&5
-++echo "$as_me:5747: checking if ~/.terminfo is wanted" >&5
-+ echo $ECHO_N "checking if ~/.terminfo is wanted... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-home-terminfo or --disable-home-terminfo was given.
-+@@ -5634,13 +5754,13 @@
-+ else
-+   with_home_terminfo=yes
-+ fi;
-+-echo "$as_me:5637: result: $with_home_terminfo" >&5
-++echo "$as_me:5757: result: $with_home_terminfo" >&5
-+ echo "${ECHO_T}$with_home_terminfo" >&6
-+ test "$with_home_terminfo" = "yes" && cat >>confdefs.h <<\EOF
-+ #define USE_HOME_TERMINFO 1
-+ EOF
-+ 
-+-echo "$as_me:5643: checking if you want to use restricted environment when running as root" >&5
-++echo "$as_me:5763: checking if you want to use restricted environment when running as root" >&5
-+ echo $ECHO_N "checking if you want to use restricted environment when running as root... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-root-environ or --disable-root-environ was given.
-+@@ -5650,7 +5770,7 @@
-+ else
-+   with_root_environ=yes
-+ fi;
-+-echo "$as_me:5653: result: $with_root_environ" >&5
-++echo "$as_me:5773: result: $with_root_environ" >&5
-+ echo "${ECHO_T}$with_root_environ" >&6
-+ test "$with_root_environ" = yes && cat >>confdefs.h <<\EOF
-+ #define USE_ROOT_ENVIRON 1
-+@@ -5664,13 +5784,13 @@
-+ 	unlink
-+ do
-+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+-echo "$as_me:5667: checking for $ac_func" >&5
-++echo "$as_me:5787: checking for $ac_func" >&5
-+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+ if eval "test \"\${$as_ac_var+set}\" = set"; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 5673 "configure"
-++#line 5793 "configure"
-+ #include "confdefs.h"
-+ /* System header to define __stub macros and hopefully few prototypes,
-+     which can conflict with char $ac_func (); below.  */
-+@@ -5701,16 +5821,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:5704: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:5824: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:5707: \$? = $ac_status" >&5
-++  echo "$as_me:5827: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:5710: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:5830: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:5713: \$? = $ac_status" >&5
-++  echo "$as_me:5833: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   eval "$as_ac_var=yes"
-+ else
-+@@ -5720,7 +5840,7 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ fi
-+-echo "$as_me:5723: result: `eval echo '${'$as_ac_var'}'`" >&5
-++echo "$as_me:5843: result: `eval echo '${'$as_ac_var'}'`" >&5
-+ echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ if test `eval echo '${'$as_ac_var'}'` = yes; then
-+   cat >>confdefs.h <<EOF
-+@@ -5737,13 +5857,13 @@
-+ 		symlink
-+ do
-+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+-echo "$as_me:5740: checking for $ac_func" >&5
-++echo "$as_me:5860: checking for $ac_func" >&5
-+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+ if eval "test \"\${$as_ac_var+set}\" = set"; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 5746 "configure"
-++#line 5866 "configure"
-+ #include "confdefs.h"
-+ /* System header to define __stub macros and hopefully few prototypes,
-+     which can conflict with char $ac_func (); below.  */
-+@@ -5774,16 +5894,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:5777: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:5897: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:5780: \$? = $ac_status" >&5
-++  echo "$as_me:5900: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:5783: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:5903: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:5786: \$? = $ac_status" >&5
-++  echo "$as_me:5906: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   eval "$as_ac_var=yes"
-+ else
-+@@ -5793,7 +5913,7 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ fi
-+-echo "$as_me:5796: result: `eval echo '${'$as_ac_var'}'`" >&5
-++echo "$as_me:5916: result: `eval echo '${'$as_ac_var'}'`" >&5
-+ echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ if test `eval echo '${'$as_ac_var'}'` = yes; then
-+   cat >>confdefs.h <<EOF
-+@@ -5804,7 +5924,7 @@
-+ done
-+ 
-+ else
-+-	echo "$as_me:5807: checking if link/symlink functions work" >&5
-++	echo "$as_me:5927: checking if link/symlink functions work" >&5
-+ echo $ECHO_N "checking if link/symlink functions work... $ECHO_C" >&6
-+ if test "${cf_cv_link_funcs+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -5817,7 +5937,7 @@
-+ 			eval 'ac_cv_func_'$cf_func'=error'
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 5820 "configure"
-++#line 5940 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <sys/types.h>
-+@@ -5847,15 +5967,15 @@
-+ 
-+ _ACEOF
-+ rm -f conftest$ac_exeext
-+-if { (eval echo "$as_me:5850: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:5970: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:5853: \$? = $ac_status" >&5
-++  echo "$as_me:5973: \$? = $ac_status" >&5
-+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+-  { (eval echo "$as_me:5855: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:5975: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:5858: \$? = $ac_status" >&5
-++  echo "$as_me:5978: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+ 
-+ 			cf_cv_link_funcs="$cf_cv_link_funcs $cf_func"
-+@@ -5873,7 +5993,7 @@
-+ 		test -z "$cf_cv_link_funcs" && cf_cv_link_funcs=no
-+ 
-+ fi
-+-echo "$as_me:5876: result: $cf_cv_link_funcs" >&5
-++echo "$as_me:5996: result: $cf_cv_link_funcs" >&5
-+ echo "${ECHO_T}$cf_cv_link_funcs" >&6
-+ 	test "$ac_cv_func_link"    = yes && cat >>confdefs.h <<\EOF
-+ #define HAVE_LINK 1
-+@@ -5891,7 +6011,7 @@
-+ # soft links (symbolic links) are useful for some systems where hard links do
-+ # not work, or to make it simpler to copy terminfo trees around.
-+ if test "$ac_cv_func_symlink" = yes ; then
-+-    echo "$as_me:5894: checking if tic should use symbolic links" >&5
-++    echo "$as_me:6014: checking if tic should use symbolic links" >&5
-+ echo $ECHO_N "checking if tic should use symbolic links... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-symlinks or --disable-symlinks was given.
-+@@ -5901,21 +6021,21 @@
-+ else
-+   with_symlinks=no
-+ fi;
-+-    echo "$as_me:5904: result: $with_symlinks" >&5
-++    echo "$as_me:6024: result: $with_symlinks" >&5
-+ echo "${ECHO_T}$with_symlinks" >&6
-+ fi
-+ 
-+ # If we have hard links and did not choose to use soft links instead, there is
-+ # no reason to make this choice optional - use the hard links.
-+ if test "$with_symlinks" = no ; then
-+-    echo "$as_me:5911: checking if tic should use hard links" >&5
-++    echo "$as_me:6031: checking if tic should use hard links" >&5
-+ echo $ECHO_N "checking if tic should use hard links... $ECHO_C" >&6
-+     if test "$ac_cv_func_link" = yes ; then
-+ 	with_links=yes
-+     else
-+ 	with_links=no
-+     fi
-+-    echo "$as_me:5918: result: $with_links" >&5
-++    echo "$as_me:6038: result: $with_links" >&5
-+ echo "${ECHO_T}$with_links" >&6
-+ fi
-+ 
-+@@ -5928,7 +6048,7 @@
-+ EOF
-+ 
-+ ###   use option --enable-broken-linker to force on use of broken-linker support
-+-echo "$as_me:5931: checking if you want broken-linker support code" >&5
-++echo "$as_me:6051: checking if you want broken-linker support code" >&5
-+ echo $ECHO_N "checking if you want broken-linker support code... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-broken_linker or --disable-broken_linker was given.
-+@@ -5938,7 +6058,7 @@
-+ else
-+   with_broken_linker=${BROKEN_LINKER-no}
-+ fi;
-+-echo "$as_me:5941: result: $with_broken_linker" >&5
-++echo "$as_me:6061: result: $with_broken_linker" >&5
-+ echo "${ECHO_T}$with_broken_linker" >&6
-+ 
-+ BROKEN_LINKER=0
-+@@ -5958,12 +6078,14 @@
-+ 		BROKEN_LINKER=1
-+ 		test -n "$verbose" && echo "	cygwin linker is broken anyway" 1>&6
-+ 
-++echo "${as_me-configure}:6081: testing cygwin linker is broken anyway ..." 1>&5
-++
-+ 		;;
-+ 	esac
-+ fi
-+ 
-+ ###   use option --enable-bsdpad to have tputs process BSD-style prefix padding
-+-echo "$as_me:5966: checking if tputs should process BSD-style prefix padding" >&5
-++echo "$as_me:6088: checking if tputs should process BSD-style prefix padding" >&5
-+ echo $ECHO_N "checking if tputs should process BSD-style prefix padding... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-bsdpad or --disable-bsdpad was given.
-+@@ -5973,7 +6095,7 @@
-+ else
-+   with_bsdpad=no
-+ fi;
-+-echo "$as_me:5976: result: $with_bsdpad" >&5
-++echo "$as_me:6098: result: $with_bsdpad" >&5
-+ echo "${ECHO_T}$with_bsdpad" >&6
-+ test "$with_bsdpad" = yes && cat >>confdefs.h <<\EOF
-+ #define BSD_TPUTS 1
-+@@ -5990,7 +6112,7 @@
-+ 
-+ # Check to define _XOPEN_SOURCE "automatically"
-+ 
-+-echo "$as_me:5993: checking if $CC -U and -D options work together" >&5
-++echo "$as_me:6115: checking if $CC -U and -D options work together" >&5
-+ echo $ECHO_N "checking if $CC -U and -D options work together... $ECHO_C" >&6
-+ if test "${cf_cv_cc_u_d_options+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -5999,7 +6121,7 @@
-+ 	cf_save_CPPFLAGS="$CPPFLAGS"
-+ 	CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
-+ 	cat >conftest.$ac_ext <<_ACEOF
-+-#line 6002 "configure"
-++#line 6124 "configure"
-+ #include "confdefs.h"
-+ 
-+ int
-+@@ -6018,16 +6140,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:6021: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:6143: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6024: \$? = $ac_status" >&5
-++  echo "$as_me:6146: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:6027: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:6149: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6030: \$? = $ac_status" >&5
-++  echo "$as_me:6152: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+ 
-+ 	cf_cv_cc_u_d_options=yes
-+@@ -6041,7 +6163,7 @@
-+ 	CPPFLAGS="$cf_save_CPPFLAGS"
-+ 
-+ fi
-+-echo "$as_me:6044: result: $cf_cv_cc_u_d_options" >&5
-++echo "$as_me:6166: result: $cf_cv_cc_u_d_options" >&5
-+ echo "${ECHO_T}$cf_cv_cc_u_d_options" >&6
-+ 
-+ cf_XOPEN_SOURCE=500
-+@@ -6065,16 +6187,16 @@
-+ irix[56].*) #(vi
-+ 	CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
-+ 	;;
-+-linux*|gnu*) #(vi
-++linux*|gnu*|k*bsd*-gnu) #(vi
-+ 
-+-echo "$as_me:6070: checking if we must define _GNU_SOURCE" >&5
-++echo "$as_me:6192: checking if we must define _GNU_SOURCE" >&5
-+ echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6
-+ if test "${cf_cv_gnu_source+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+ 
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 6077 "configure"
-++#line 6199 "configure"
-+ #include "confdefs.h"
-+ #include <sys/types.h>
-+ int
-+@@ -6089,16 +6211,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:6092: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:6214: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6095: \$? = $ac_status" >&5
-++  echo "$as_me:6217: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:6098: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:6220: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6101: \$? = $ac_status" >&5
-++  echo "$as_me:6223: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_gnu_source=no
-+ else
-+@@ -6107,7 +6229,7 @@
-+ cf_save="$CPPFLAGS"
-+ 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-+ 	 cat >conftest.$ac_ext <<_ACEOF
-+-#line 6110 "configure"
-++#line 6232 "configure"
-+ #include "confdefs.h"
-+ #include <sys/types.h>
-+ int
-+@@ -6122,16 +6244,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:6125: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:6247: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6128: \$? = $ac_status" >&5
-++  echo "$as_me:6250: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:6131: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:6253: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6134: \$? = $ac_status" >&5
-++  echo "$as_me:6256: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_gnu_source=no
-+ else
-+@@ -6146,7 +6268,7 @@
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+ 
-+ fi
-+-echo "$as_me:6149: result: $cf_cv_gnu_source" >&5
-++echo "$as_me:6271: result: $cf_cv_gnu_source" >&5
-+ echo "${ECHO_T}$cf_cv_gnu_source" >&6
-+ test "$cf_cv_gnu_source" = yes && CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-+ 
-+@@ -6173,14 +6295,14 @@
-+ 	CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
-+ 	;;
-+ *)
-+-	echo "$as_me:6176: checking if we should define _XOPEN_SOURCE" >&5
-++	echo "$as_me:6298: checking if we should define _XOPEN_SOURCE" >&5
-+ echo $ECHO_N "checking if we should define _XOPEN_SOURCE... $ECHO_C" >&6
-+ if test "${cf_cv_xopen_source+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+ 
-+ 	cat >conftest.$ac_ext <<_ACEOF
-+-#line 6183 "configure"
-++#line 6305 "configure"
-+ #include "confdefs.h"
-+ #include <sys/types.h>
-+ int
-+@@ -6195,16 +6317,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:6198: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:6320: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6201: \$? = $ac_status" >&5
-++  echo "$as_me:6323: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:6204: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:6326: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6207: \$? = $ac_status" >&5
-++  echo "$as_me:6329: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_xopen_source=no
-+ else
-+@@ -6213,7 +6335,7 @@
-+ cf_save="$CPPFLAGS"
-+ 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
-+ 	 cat >conftest.$ac_ext <<_ACEOF
-+-#line 6216 "configure"
-++#line 6338 "configure"
-+ #include "confdefs.h"
-+ #include <sys/types.h>
-+ int
-+@@ -6228,16 +6350,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:6231: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:6353: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6234: \$? = $ac_status" >&5
-++  echo "$as_me:6356: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:6237: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:6359: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6240: \$? = $ac_status" >&5
-++  echo "$as_me:6362: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_xopen_source=no
-+ else
-+@@ -6252,7 +6374,7 @@
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+ 
-+ fi
-+-echo "$as_me:6255: result: $cf_cv_xopen_source" >&5
-++echo "$as_me:6377: result: $cf_cv_xopen_source" >&5
-+ echo "${ECHO_T}$cf_cv_xopen_source" >&6
-+ 	if test "$cf_cv_xopen_source" != no ; then
-+ 
-+@@ -6286,16 +6408,16 @@
-+ 	sed	-e 's/-[UD]_POSIX_C_SOURCE\(=[^ 	]*\)\?[ 	]/ /g' \
-+ 		-e 's/-[UD]_POSIX_C_SOURCE\(=[^ 	]*\)\?$//g'`
-+ 
-+-echo "$as_me:6289: checking if we should define _POSIX_C_SOURCE" >&5
-++echo "$as_me:6411: checking if we should define _POSIX_C_SOURCE" >&5
-+ echo $ECHO_N "checking if we should define _POSIX_C_SOURCE... $ECHO_C" >&6
-+ if test "${cf_cv_posix_c_source+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+ 
-+-echo "(line 6295) testing if the symbol is already defined go no further ..." 1>&5
-++echo "${as_me-configure}:6417: testing if the symbol is already defined go no further ..." 1>&5
-+ 
-+ 	cat >conftest.$ac_ext <<_ACEOF
-+-#line 6298 "configure"
-++#line 6420 "configure"
-+ #include "confdefs.h"
-+ #include <sys/types.h>
-+ int
-+@@ -6310,16 +6432,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:6313: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:6435: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6316: \$? = $ac_status" >&5
-++  echo "$as_me:6438: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:6319: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:6441: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6322: \$? = $ac_status" >&5
-++  echo "$as_me:6444: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_posix_c_source=no
-+ else
-+@@ -6340,7 +6462,7 @@
-+ 	 esac
-+ 	 if test "$cf_want_posix_source" = yes ; then
-+ 		cat >conftest.$ac_ext <<_ACEOF
-+-#line 6343 "configure"
-++#line 6465 "configure"
-+ #include "confdefs.h"
-+ #include <sys/types.h>
-+ int
-+@@ -6355,16 +6477,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:6358: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:6480: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6361: \$? = $ac_status" >&5
-++  echo "$as_me:6483: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:6364: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:6486: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6367: \$? = $ac_status" >&5
-++  echo "$as_me:6489: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   :
-+ else
-+@@ -6375,15 +6497,15 @@
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+ 	 fi
-+ 
-+-echo "(line 6378) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-++echo "${as_me-configure}:6500: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+ 
-+ 	 CFLAGS="$cf_trim_CFLAGS"
-+ 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
-+ 
-+-echo "(line 6383) testing if the second compile does not leave our definition intact error ..." 1>&5
-++echo "${as_me-configure}:6505: testing if the second compile does not leave our definition intact error ..." 1>&5
-+ 
-+ 	 cat >conftest.$ac_ext <<_ACEOF
-+-#line 6386 "configure"
-++#line 6508 "configure"
-+ #include "confdefs.h"
-+ #include <sys/types.h>
-+ int
-+@@ -6398,16 +6520,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:6401: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:6523: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6404: \$? = $ac_status" >&5
-++  echo "$as_me:6526: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:6407: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:6529: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6410: \$? = $ac_status" >&5
-++  echo "$as_me:6532: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   :
-+ else
-+@@ -6423,7 +6545,7 @@
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+ 
-+ fi
-+-echo "$as_me:6426: result: $cf_cv_posix_c_source" >&5
-++echo "$as_me:6548: result: $cf_cv_posix_c_source" >&5
-+ echo "${ECHO_T}$cf_cv_posix_c_source" >&6
-+ 
-+ if test "$cf_cv_posix_c_source" != no ; then
-+@@ -6442,14 +6564,14 @@
-+ 
-+ # Work around breakage on OS X
-+ 
-+-echo "$as_me:6445: checking if SIGWINCH is defined" >&5
-++echo "$as_me:6567: checking if SIGWINCH is defined" >&5
-+ echo $ECHO_N "checking if SIGWINCH is defined... $ECHO_C" >&6
-+ if test "${cf_cv_define_sigwinch+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+ 
-+ 	cat >conftest.$ac_ext <<_ACEOF
-+-#line 6452 "configure"
-++#line 6574 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <sys/types.h>
-+@@ -6464,23 +6586,23 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:6467: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:6589: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6470: \$? = $ac_status" >&5
-++  echo "$as_me:6592: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:6473: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:6595: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6476: \$? = $ac_status" >&5
-++  echo "$as_me:6598: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_define_sigwinch=yes
-+ else
-+   echo "$as_me: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 6483 "configure"
-++#line 6605 "configure"
-+ #include "confdefs.h"
-+ 
-+ #undef _XOPEN_SOURCE
-+@@ -6498,16 +6620,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:6501: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:6623: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6504: \$? = $ac_status" >&5
-++  echo "$as_me:6626: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:6507: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:6629: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6510: \$? = $ac_status" >&5
-++  echo "$as_me:6632: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_define_sigwinch=maybe
-+ else
-+@@ -6521,11 +6643,11 @@
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+ 
-+ fi
-+-echo "$as_me:6524: result: $cf_cv_define_sigwinch" >&5
-++echo "$as_me:6646: result: $cf_cv_define_sigwinch" >&5
-+ echo "${ECHO_T}$cf_cv_define_sigwinch" >&6
-+ 
-+ if test "$cf_cv_define_sigwinch" = maybe ; then
-+-echo "$as_me:6528: checking for actual SIGWINCH definition" >&5
-++echo "$as_me:6650: checking for actual SIGWINCH definition" >&5
-+ echo $ECHO_N "checking for actual SIGWINCH definition... $ECHO_C" >&6
-+ if test "${cf_cv_fixup_sigwinch+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -6536,7 +6658,7 @@
-+ while test $cf_sigwinch != 1
-+ do
-+ 	cat >conftest.$ac_ext <<_ACEOF
-+-#line 6539 "configure"
-++#line 6661 "configure"
-+ #include "confdefs.h"
-+ 
-+ #undef _XOPEN_SOURCE
-+@@ -6558,16 +6680,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:6561: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:6683: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6564: \$? = $ac_status" >&5
-++  echo "$as_me:6686: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:6567: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:6689: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6570: \$? = $ac_status" >&5
-++  echo "$as_me:6692: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_fixup_sigwinch=$cf_sigwinch
-+ 	 break
-+@@ -6581,7 +6703,7 @@
-+ done
-+ 
-+ fi
-+-echo "$as_me:6584: result: $cf_cv_fixup_sigwinch" >&5
-++echo "$as_me:6706: result: $cf_cv_fixup_sigwinch" >&5
-+ echo "${ECHO_T}$cf_cv_fixup_sigwinch" >&6
-+ 
-+ 	if test "$cf_cv_fixup_sigwinch" != unknown ; then
-+@@ -6591,13 +6713,13 @@
-+ 
-+ # Checks for CODESET support.
-+ 
-+-  echo "$as_me:6594: checking for nl_langinfo and CODESET" >&5
-++  echo "$as_me:6716: checking for nl_langinfo and CODESET" >&5
-+ echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6
-+ if test "${am_cv_langinfo_codeset+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 6600 "configure"
-++#line 6722 "configure"
-+ #include "confdefs.h"
-+ #include <langinfo.h>
-+ int
-+@@ -6609,16 +6731,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:6612: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:6734: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6615: \$? = $ac_status" >&5
-++  echo "$as_me:6737: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:6618: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:6740: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6621: \$? = $ac_status" >&5
-++  echo "$as_me:6743: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   am_cv_langinfo_codeset=yes
-+ else
-+@@ -6629,7 +6751,7 @@
-+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ 
-+ fi
-+-echo "$as_me:6632: result: $am_cv_langinfo_codeset" >&5
-++echo "$as_me:6754: result: $am_cv_langinfo_codeset" >&5
-+ echo "${ECHO_T}$am_cv_langinfo_codeset" >&6
-+   if test $am_cv_langinfo_codeset = yes; then
-+ 
-+@@ -6643,7 +6765,7 @@
-+ NCURSES_OK_WCHAR_T=
-+ NCURSES_OK_WINT_T=
-+ 
-+-echo "$as_me:6646: checking if you want wide-character code" >&5
-++echo "$as_me:6768: checking if you want wide-character code" >&5
-+ echo $ECHO_N "checking if you want wide-character code... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-widec or --disable-widec was given.
-+@@ -6653,7 +6775,7 @@
-+ else
-+   with_widec=no
-+ fi;
-+-echo "$as_me:6656: result: $with_widec" >&5
-++echo "$as_me:6778: result: $with_widec" >&5
-+ echo "${ECHO_T}$with_widec" >&6
-+ if test "$with_widec" = yes ; then
-+ 	LIB_SUFFIX="w${LIB_SUFFIX}"
-+@@ -6661,10 +6783,10 @@
-+ #define USE_WIDEC_SUPPORT 1
-+ EOF
-+ 
-+-echo "$as_me:6664: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
-++echo "$as_me:6786: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
-+ echo $ECHO_N "checking if we must define _XOPEN_SOURCE_EXTENDED... $ECHO_C" >&6
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 6667 "configure"
-++#line 6789 "configure"
-+ #include "confdefs.h"
-+ #include <sys/types.h>
-+ 
-+@@ -6680,16 +6802,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:6683: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:6805: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6686: \$? = $ac_status" >&5
-++  echo "$as_me:6808: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:6689: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:6811: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6692: \$? = $ac_status" >&5
-++  echo "$as_me:6814: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_result=no
-+ else
-+@@ -6698,16 +6820,16 @@
-+ cf_result=yes
-+ fi
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+-echo "$as_me:6701: result: $cf_result" >&5
-++echo "$as_me:6823: result: $cf_result" >&5
-+ echo "${ECHO_T}$cf_result" >&6
-+ 
-+ if test "$cf_result" = yes ; then
-+ 	CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
-+ elif test "x" != "x" ; then
-+-	echo "$as_me:6707: checking checking for compatible value versus " >&5
-++	echo "$as_me:6829: checking checking for compatible value versus " >&5
-+ echo $ECHO_N "checking checking for compatible value versus ... $ECHO_C" >&6
-+ 	cat >conftest.$ac_ext <<_ACEOF
-+-#line 6710 "configure"
-++#line 6832 "configure"
-+ #include "confdefs.h"
-+ #include <sys/types.h>
-+ 
-+@@ -6723,16 +6845,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:6726: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:6848: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6729: \$? = $ac_status" >&5
-++  echo "$as_me:6851: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:6732: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:6854: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6735: \$? = $ac_status" >&5
-++  echo "$as_me:6857: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_result=yes
-+ else
-+@@ -6741,7 +6863,7 @@
-+ cf_result=no
-+ fi
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+-	echo "$as_me:6744: result: $cf_result" >&5
-++	echo "$as_me:6866: result: $cf_result" >&5
-+ echo "${ECHO_T}$cf_result" >&6
-+ 	if test "$cf_result" = no ; then
-+ 		# perhaps we can override it - try...
-+@@ -6755,13 +6877,13 @@
-+ for ac_func in putwc btowc wctob mbtowc wctomb mblen mbrlen mbrtowc
-+ do
-+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+-echo "$as_me:6758: checking for $ac_func" >&5
-++echo "$as_me:6880: checking for $ac_func" >&5
-+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+ if eval "test \"\${$as_ac_var+set}\" = set"; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 6764 "configure"
-++#line 6886 "configure"
-+ #include "confdefs.h"
-+ /* System header to define __stub macros and hopefully few prototypes,
-+     which can conflict with char $ac_func (); below.  */
-+@@ -6792,16 +6914,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:6795: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:6917: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6798: \$? = $ac_status" >&5
-++  echo "$as_me:6920: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:6801: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:6923: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6804: \$? = $ac_status" >&5
-++  echo "$as_me:6926: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   eval "$as_ac_var=yes"
-+ else
-+@@ -6811,7 +6933,7 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ fi
-+-echo "$as_me:6814: result: `eval echo '${'$as_ac_var'}'`" >&5
-++echo "$as_me:6936: result: `eval echo '${'$as_ac_var'}'`" >&5
-+ echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ if test `eval echo '${'$as_ac_var'}'` = yes; then
-+   cat >>confdefs.h <<EOF
-+@@ -6823,7 +6945,7 @@
-+ 
-+ 	if test "$ac_cv_func_putwc" != yes ; then
-+ 
-+-echo "$as_me:6826: checking for putwc in libutf8" >&5
-++echo "$as_me:6948: checking for putwc in libutf8" >&5
-+ echo $ECHO_N "checking for putwc in libutf8... $ECHO_C" >&6
-+ if test "${cf_cv_libutf8+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -6832,7 +6954,7 @@
-+ 	cf_save_LIBS="$LIBS"
-+ 	LIBS="-lutf8 $LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 6835 "configure"
-++#line 6957 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <libutf8.h>
-+@@ -6845,16 +6967,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:6848: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:6970: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6851: \$? = $ac_status" >&5
-++  echo "$as_me:6973: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:6854: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:6976: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6857: \$? = $ac_status" >&5
-++  echo "$as_me:6979: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_libutf8=yes
-+ else
-+@@ -6866,7 +6988,7 @@
-+ 	LIBS="$cf_save_LIBS"
-+ 
-+ fi
-+-echo "$as_me:6869: result: $cf_cv_libutf8" >&5
-++echo "$as_me:6991: result: $cf_cv_libutf8" >&5
-+ echo "${ECHO_T}$cf_cv_libutf8" >&6
-+ 
-+ if test "$cf_cv_libutf8" = yes ; then
-+@@ -6883,14 +7005,14 @@
-+ 	fi
-+ 
-+ # This is needed on Tru64 5.0 to declare mbstate_t
-+-echo "$as_me:6886: checking if we must include wchar.h to declare mbstate_t" >&5
-++echo "$as_me:7008: checking if we must include wchar.h to declare mbstate_t" >&5
-+ echo $ECHO_N "checking if we must include wchar.h to declare mbstate_t... $ECHO_C" >&6
-+ if test "${cf_cv_mbstate_t+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+ 
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 6893 "configure"
-++#line 7015 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <stdlib.h>
-+@@ -6908,23 +7030,23 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:6911: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:7033: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6914: \$? = $ac_status" >&5
-++  echo "$as_me:7036: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:6917: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:7039: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6920: \$? = $ac_status" >&5
-++  echo "$as_me:7042: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_mbstate_t=no
-+ else
-+   echo "$as_me: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 6927 "configure"
-++#line 7049 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <stdlib.h>
-+@@ -6943,16 +7065,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:6946: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:7068: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6949: \$? = $ac_status" >&5
-++  echo "$as_me:7071: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:6952: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:7074: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:6955: \$? = $ac_status" >&5
-++  echo "$as_me:7077: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_mbstate_t=yes
-+ else
-+@@ -6964,7 +7086,7 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+ fi
-+-echo "$as_me:6967: result: $cf_cv_mbstate_t" >&5
-++echo "$as_me:7089: result: $cf_cv_mbstate_t" >&5
-+ echo "${ECHO_T}$cf_cv_mbstate_t" >&6
-+ 
-+ if test "$cf_cv_mbstate_t" = yes ; then
-+@@ -6981,14 +7103,14 @@
-+ fi
-+ 
-+ # This is needed on Tru64 5.0 to declare wchar_t
-+-echo "$as_me:6984: checking if we must include wchar.h to declare wchar_t" >&5
-++echo "$as_me:7106: checking if we must include wchar.h to declare wchar_t" >&5
-+ echo $ECHO_N "checking if we must include wchar.h to declare wchar_t... $ECHO_C" >&6
-+ if test "${cf_cv_wchar_t+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+ 
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 6991 "configure"
-++#line 7113 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <stdlib.h>
-+@@ -7006,23 +7128,23 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:7009: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:7131: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:7012: \$? = $ac_status" >&5
-++  echo "$as_me:7134: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:7015: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:7137: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:7018: \$? = $ac_status" >&5
-++  echo "$as_me:7140: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_wchar_t=no
-+ else
-+   echo "$as_me: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 7025 "configure"
-++#line 7147 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <stdlib.h>
-+@@ -7041,16 +7163,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:7044: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:7166: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:7047: \$? = $ac_status" >&5
-++  echo "$as_me:7169: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:7050: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:7172: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:7053: \$? = $ac_status" >&5
-++  echo "$as_me:7175: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_wchar_t=yes
-+ else
-+@@ -7062,7 +7184,7 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+ fi
-+-echo "$as_me:7065: result: $cf_cv_wchar_t" >&5
-++echo "$as_me:7187: result: $cf_cv_wchar_t" >&5
-+ echo "${ECHO_T}$cf_cv_wchar_t" >&6
-+ 
-+ if test "$cf_cv_wchar_t" = yes ; then
-+@@ -7084,14 +7206,14 @@
-+ fi
-+ 
-+ # This is needed on Tru64 5.0 to declare wint_t
-+-echo "$as_me:7087: checking if we must include wchar.h to declare wint_t" >&5
-++echo "$as_me:7209: checking if we must include wchar.h to declare wint_t" >&5
-+ echo $ECHO_N "checking if we must include wchar.h to declare wint_t... $ECHO_C" >&6
-+ if test "${cf_cv_wint_t+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+ 
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 7094 "configure"
-++#line 7216 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <stdlib.h>
-+@@ -7109,23 +7231,23 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:7112: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:7234: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:7115: \$? = $ac_status" >&5
-++  echo "$as_me:7237: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:7118: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:7240: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:7121: \$? = $ac_status" >&5
-++  echo "$as_me:7243: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_wint_t=no
-+ else
-+   echo "$as_me: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 7128 "configure"
-++#line 7250 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <stdlib.h>
-+@@ -7144,16 +7266,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:7147: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:7269: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:7150: \$? = $ac_status" >&5
-++  echo "$as_me:7272: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:7153: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:7275: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:7156: \$? = $ac_status" >&5
-++  echo "$as_me:7278: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_wint_t=yes
-+ else
-+@@ -7165,7 +7287,7 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+ fi
-+-echo "$as_me:7168: result: $cf_cv_wint_t" >&5
-++echo "$as_me:7290: result: $cf_cv_wint_t" >&5
-+ echo "${ECHO_T}$cf_cv_wint_t" >&6
-+ 
-+ if test "$cf_cv_wint_t" = yes ; then
-+@@ -7204,7 +7326,7 @@
-+ 	;;
-+ esac
-+ 
-+-echo "$as_me:7207: checking whether to enable _LP64 definition in curses.h" >&5
-++echo "$as_me:7329: checking whether to enable _LP64 definition in curses.h" >&5
-+ echo $ECHO_N "checking whether to enable _LP64 definition in curses.h... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-lp64 or --disable-lp64 was given.
-+@@ -7214,7 +7336,7 @@
-+ else
-+   with_lp64=$default_with_lp64
-+ fi;
-+-echo "$as_me:7217: result: $with_lp64" >&5
-++echo "$as_me:7339: result: $with_lp64" >&5
-+ echo "${ECHO_T}$with_lp64" >&6
-+ 
-+ if test "$with_lp64" = yes ; then
-+@@ -7230,7 +7352,7 @@
-+ fi;
-+ if test "$enable_largefile" != no; then
-+ 
-+-  echo "$as_me:7233: checking for special C compiler options needed for large files" >&5
-++  echo "$as_me:7355: checking for special C compiler options needed for large files" >&5
-+ echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6
-+ if test "${ac_cv_sys_largefile_CC+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -7242,7 +7364,7 @@
-+      	 # IRIX 6.2 and later do not support large files by default,
-+      	 # so use the C compiler's -n32 option if that helps.
-+          cat >conftest.$ac_ext <<_ACEOF
-+-#line 7245 "configure"
-++#line 7367 "configure"
-+ #include "confdefs.h"
-+ #include <sys/types.h>
-+  /* Check that off_t can represent 2**63 - 1 correctly.
-+@@ -7262,16 +7384,16 @@
-+ }
-+ _ACEOF
-+      	 rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:7265: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:7387: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:7268: \$? = $ac_status" >&5
-++  echo "$as_me:7390: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:7271: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:7393: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:7274: \$? = $ac_status" >&5
-++  echo "$as_me:7396: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   break
-+ else
-+@@ -7281,16 +7403,16 @@
-+ rm -f conftest.$ac_objext
-+      	 CC="$CC -n32"
-+      	 rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:7284: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:7406: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:7287: \$? = $ac_status" >&5
-++  echo "$as_me:7409: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:7290: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:7412: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:7293: \$? = $ac_status" >&5
-++  echo "$as_me:7415: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_cv_sys_largefile_CC=' -n32'; break
-+ else
-+@@ -7304,13 +7426,13 @@
-+        rm -f conftest.$ac_ext
-+     fi
-+ fi
-+-echo "$as_me:7307: result: $ac_cv_sys_largefile_CC" >&5
-++echo "$as_me:7429: result: $ac_cv_sys_largefile_CC" >&5
-+ echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6
-+   if test "$ac_cv_sys_largefile_CC" != no; then
-+     CC=$CC$ac_cv_sys_largefile_CC
-+   fi
-+ 
-+-  echo "$as_me:7313: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-++  echo "$as_me:7435: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+ echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6
-+ if test "${ac_cv_sys_file_offset_bits+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -7318,7 +7440,7 @@
-+   while :; do
-+   ac_cv_sys_file_offset_bits=no
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 7321 "configure"
-++#line 7443 "configure"
-+ #include "confdefs.h"
-+ #include <sys/types.h>
-+  /* Check that off_t can represent 2**63 - 1 correctly.
-+@@ -7338,16 +7460,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:7341: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:7463: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:7344: \$? = $ac_status" >&5
-++  echo "$as_me:7466: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:7347: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:7469: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:7350: \$? = $ac_status" >&5
-++  echo "$as_me:7472: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   break
-+ else
-+@@ -7356,7 +7478,7 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 7359 "configure"
-++#line 7481 "configure"
-+ #include "confdefs.h"
-+ #define _FILE_OFFSET_BITS 64
-+ #include <sys/types.h>
-+@@ -7377,16 +7499,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:7380: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:7502: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:7383: \$? = $ac_status" >&5
-++  echo "$as_me:7505: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:7386: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:7508: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:7389: \$? = $ac_status" >&5
-++  echo "$as_me:7511: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_cv_sys_file_offset_bits=64; break
-+ else
-+@@ -7397,7 +7519,7 @@
-+   break
-+ done
-+ fi
-+-echo "$as_me:7400: result: $ac_cv_sys_file_offset_bits" >&5
-++echo "$as_me:7522: result: $ac_cv_sys_file_offset_bits" >&5
-+ echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6
-+ if test "$ac_cv_sys_file_offset_bits" != no; then
-+ 
-+@@ -7407,7 +7529,7 @@
-+ 
-+ fi
-+ rm -f conftest*
-+-  echo "$as_me:7410: checking for _LARGE_FILES value needed for large files" >&5
-++  echo "$as_me:7532: checking for _LARGE_FILES value needed for large files" >&5
-+ echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6
-+ if test "${ac_cv_sys_large_files+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -7415,7 +7537,7 @@
-+   while :; do
-+   ac_cv_sys_large_files=no
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 7418 "configure"
-++#line 7540 "configure"
-+ #include "confdefs.h"
-+ #include <sys/types.h>
-+  /* Check that off_t can represent 2**63 - 1 correctly.
-+@@ -7435,16 +7557,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:7438: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:7560: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:7441: \$? = $ac_status" >&5
-++  echo "$as_me:7563: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:7444: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:7566: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:7447: \$? = $ac_status" >&5
-++  echo "$as_me:7569: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   break
-+ else
-+@@ -7453,7 +7575,7 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 7456 "configure"
-++#line 7578 "configure"
-+ #include "confdefs.h"
-+ #define _LARGE_FILES 1
-+ #include <sys/types.h>
-+@@ -7474,16 +7596,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:7477: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:7599: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:7480: \$? = $ac_status" >&5
-++  echo "$as_me:7602: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:7483: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:7605: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:7486: \$? = $ac_status" >&5
-++  echo "$as_me:7608: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_cv_sys_large_files=1; break
-+ else
-+@@ -7494,7 +7616,7 @@
-+   break
-+ done
-+ fi
-+-echo "$as_me:7497: result: $ac_cv_sys_large_files" >&5
-++echo "$as_me:7619: result: $ac_cv_sys_large_files" >&5
-+ echo "${ECHO_T}$ac_cv_sys_large_files" >&6
-+ if test "$ac_cv_sys_large_files" != no; then
-+ 
-+@@ -7507,7 +7629,7 @@
-+ fi
-+ 
-+     if test "$enable_largefile" != no ; then
-+-	echo "$as_me:7510: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-++	echo "$as_me:7632: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-+ echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6
-+ if test "${ac_cv_sys_largefile_source+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -7515,7 +7637,7 @@
-+   while :; do
-+   ac_cv_sys_largefile_source=no
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 7518 "configure"
-++#line 7640 "configure"
-+ #include "confdefs.h"
-+ #include <stdio.h>
-+ int
-+@@ -7527,16 +7649,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:7530: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:7652: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:7533: \$? = $ac_status" >&5
-++  echo "$as_me:7655: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:7536: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:7658: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:7539: \$? = $ac_status" >&5
-++  echo "$as_me:7661: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   break
-+ else
-+@@ -7545,7 +7667,7 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 7548 "configure"
-++#line 7670 "configure"
-+ #include "confdefs.h"
-+ #define _LARGEFILE_SOURCE 1
-+ #include <stdio.h>
-+@@ -7558,16 +7680,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:7561: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:7683: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:7564: \$? = $ac_status" >&5
-++  echo "$as_me:7686: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:7567: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:7689: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:7570: \$? = $ac_status" >&5
-++  echo "$as_me:7692: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_cv_sys_largefile_source=1; break
-+ else
-+@@ -7578,7 +7700,7 @@
-+   break
-+ done
-+ fi
-+-echo "$as_me:7581: result: $ac_cv_sys_largefile_source" >&5
-++echo "$as_me:7703: result: $ac_cv_sys_largefile_source" >&5
-+ echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6
-+ if test "$ac_cv_sys_largefile_source" != no; then
-+ 
-+@@ -7592,13 +7714,13 @@
-+ # We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
-+ # in glibc 2.1.3, but that breaks too many other things.
-+ # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-+-echo "$as_me:7595: checking for fseeko" >&5
-++echo "$as_me:7717: checking for fseeko" >&5
-+ echo $ECHO_N "checking for fseeko... $ECHO_C" >&6
-+ if test "${ac_cv_func_fseeko+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 7601 "configure"
-++#line 7723 "configure"
-+ #include "confdefs.h"
-+ #include <stdio.h>
-+ int
-+@@ -7610,16 +7732,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:7613: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:7735: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:7616: \$? = $ac_status" >&5
-++  echo "$as_me:7738: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:7619: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:7741: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:7622: \$? = $ac_status" >&5
-++  echo "$as_me:7744: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_cv_func_fseeko=yes
-+ else
-+@@ -7629,7 +7751,7 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ fi
-+-echo "$as_me:7632: result: $ac_cv_func_fseeko" >&5
-++echo "$as_me:7754: result: $ac_cv_func_fseeko" >&5
-+ echo "${ECHO_T}$ac_cv_func_fseeko" >&6
-+ if test $ac_cv_func_fseeko = yes; then
-+ 
-+@@ -7648,15 +7770,16 @@
-+ 	# the config.h
-+ 	test "$ac_cv_sys_large_files"      != no && CPPFLAGS="$CPPFLAGS -D_LARGE_FILES "
-+ 	test "$ac_cv_sys_largefile_source" != no && CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE "
-++	test "$ac_cv_sys_file_offset_bits" != no && CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits "
-+ 
-+-	echo "$as_me:7652: checking whether to use struct dirent64" >&5
-++	echo "$as_me:7775: checking whether to use struct dirent64" >&5
-+ echo $ECHO_N "checking whether to use struct dirent64... $ECHO_C" >&6
-+ if test "${cf_cv_struct_dirent64+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+ 
-+ 		cat >conftest.$ac_ext <<_ACEOF
-+-#line 7659 "configure"
-++#line 7782 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <sys/types.h>
-+@@ -7677,16 +7800,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:7680: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:7803: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:7683: \$? = $ac_status" >&5
-++  echo "$as_me:7806: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:7686: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:7809: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:7689: \$? = $ac_status" >&5
-++  echo "$as_me:7812: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_struct_dirent64=yes
-+ else
-+@@ -7697,7 +7820,7 @@
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+ 
-+ fi
-+-echo "$as_me:7700: result: $cf_cv_struct_dirent64" >&5
-++echo "$as_me:7823: result: $cf_cv_struct_dirent64" >&5
-+ echo "${ECHO_T}$cf_cv_struct_dirent64" >&6
-+ 	test "$cf_cv_struct_dirent64" = yes && cat >>confdefs.h <<\EOF
-+ #define HAVE_STRUCT_DIRENT64 1
-+@@ -7706,7 +7829,7 @@
-+     fi
-+ 
-+ ###   use option --disable-tparm-varargs to make tparm() conform to X/Open
-+-echo "$as_me:7709: checking if you want tparm not to use X/Open fixed-parameter list" >&5
-++echo "$as_me:7832: checking if you want tparm not to use X/Open fixed-parameter list" >&5
-+ echo $ECHO_N "checking if you want tparm not to use X/Open fixed-parameter list... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-tparm-varargs or --disable-tparm-varargs was given.
-+@@ -7716,13 +7839,13 @@
-+ else
-+   with_tparm_varargs=yes
-+ fi;
-+-echo "$as_me:7719: result: $with_tparm_varargs" >&5
-++echo "$as_me:7842: result: $with_tparm_varargs" >&5
-+ echo "${ECHO_T}$with_tparm_varargs" >&6
-+ NCURSES_TPARM_VARARGS=0
-+ test "$with_tparm_varargs" = yes && NCURSES_TPARM_VARARGS=1
-+ 
-+ ###   use option --with-bool to override bool's type
-+-echo "$as_me:7725: checking for type of bool" >&5
-++echo "$as_me:7848: checking for type of bool" >&5
-+ echo $ECHO_N "checking for type of bool... $ECHO_C" >&6
-+ 
-+ # Check whether --with-bool or --without-bool was given.
-+@@ -7732,10 +7855,10 @@
-+ else
-+   NCURSES_BOOL=auto
-+ fi;
-+-echo "$as_me:7735: result: $NCURSES_BOOL" >&5
-++echo "$as_me:7858: result: $NCURSES_BOOL" >&5
-+ echo "${ECHO_T}$NCURSES_BOOL" >&6
-+ 
-+-echo "$as_me:7738: checking for alternate terminal capabilities file" >&5
-++echo "$as_me:7861: checking for alternate terminal capabilities file" >&5
-+ echo $ECHO_N "checking for alternate terminal capabilities file... $ECHO_C" >&6
-+ 
-+ # Check whether --with-caps or --without-caps was given.
-+@@ -7746,11 +7869,11 @@
-+   TERMINFO_CAPS=Caps
-+ fi;
-+ test -f "${srcdir}/include/${TERMINFO_CAPS}" || TERMINFO_CAPS=Caps
-+-echo "$as_me:7749: result: $TERMINFO_CAPS" >&5
-++echo "$as_me:7872: result: $TERMINFO_CAPS" >&5
-+ echo "${ECHO_T}$TERMINFO_CAPS" >&6
-+ 
-+ ###   use option --with-chtype to override chtype's type
-+-echo "$as_me:7753: checking for type of chtype" >&5
-++echo "$as_me:7876: checking for type of chtype" >&5
-+ echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
-+ 
-+ # Check whether --with-chtype or --without-chtype was given.
-+@@ -7760,11 +7883,11 @@
-+ else
-+   NCURSES_CHTYPE=auto
-+ fi;
-+-echo "$as_me:7763: result: $NCURSES_CHTYPE" >&5
-++echo "$as_me:7886: result: $NCURSES_CHTYPE" >&5
-+ echo "${ECHO_T}$NCURSES_CHTYPE" >&6
-+ 
-+ ###   use option --with-ospeed to override ospeed's type
-+-echo "$as_me:7767: checking for type of ospeed" >&5
-++echo "$as_me:7890: checking for type of ospeed" >&5
-+ echo $ECHO_N "checking for type of ospeed... $ECHO_C" >&6
-+ 
-+ # Check whether --with-ospeed or --without-ospeed was given.
-+@@ -7774,11 +7897,11 @@
-+ else
-+   NCURSES_OSPEED=short
-+ fi;
-+-echo "$as_me:7777: result: $NCURSES_OSPEED" >&5
-++echo "$as_me:7900: result: $NCURSES_OSPEED" >&5
-+ echo "${ECHO_T}$NCURSES_OSPEED" >&6
-+ 
-+ ###   use option --with-mmask-t to override mmask_t's type
-+-echo "$as_me:7781: checking for type of mmask_t" >&5
-++echo "$as_me:7904: checking for type of mmask_t" >&5
-+ echo $ECHO_N "checking for type of mmask_t... $ECHO_C" >&6
-+ 
-+ # Check whether --with-mmask-t or --without-mmask-t was given.
-+@@ -7788,11 +7911,11 @@
-+ else
-+   NCURSES_MMASK_T=auto
-+ fi;
-+-echo "$as_me:7791: result: $NCURSES_MMASK_T" >&5
-++echo "$as_me:7914: result: $NCURSES_MMASK_T" >&5
-+ echo "${ECHO_T}$NCURSES_MMASK_T" >&6
-+ 
-+ ### Enable compiling-in rcs id's
-+-echo "$as_me:7795: checking if RCS identifiers should be compiled-in" >&5
-++echo "$as_me:7918: checking if RCS identifiers should be compiled-in" >&5
-+ echo $ECHO_N "checking if RCS identifiers should be compiled-in... $ECHO_C" >&6
-+ 
-+ # Check whether --with-rcs-ids or --without-rcs-ids was given.
-+@@ -7802,7 +7925,7 @@
-+ else
-+   with_rcs_ids=no
-+ fi;
-+-echo "$as_me:7805: result: $with_rcs_ids" >&5
-++echo "$as_me:7928: result: $with_rcs_ids" >&5
-+ echo "${ECHO_T}$with_rcs_ids" >&6
-+ test "$with_rcs_ids" = yes && cat >>confdefs.h <<\EOF
-+ #define USE_RCS_IDS 1
-+@@ -7810,7 +7933,7 @@
-+ 
-+ ###############################################################################
-+ 
-+-echo "$as_me:7813: checking format of man-pages" >&5
-++echo "$as_me:7936: checking format of man-pages" >&5
-+ echo $ECHO_N "checking format of man-pages... $ECHO_C" >&6
-+ 
-+ # Check whether --with-manpage-format or --without-manpage-format was given.
-+@@ -7899,14 +8022,14 @@
-+   ;;
-+ esac
-+ 
-+-echo "$as_me:7902: result: $MANPAGE_FORMAT" >&5
-++echo "$as_me:8025: result: $MANPAGE_FORMAT" >&5
-+ echo "${ECHO_T}$MANPAGE_FORMAT" >&6
-+ if test -n "$cf_unknown" ; then
-+-  { echo "$as_me:7905: WARNING: Unexpected manpage-format $cf_unknown" >&5
-++  { echo "$as_me:8028: WARNING: Unexpected manpage-format $cf_unknown" >&5
-+ echo "$as_me: WARNING: Unexpected manpage-format $cf_unknown" >&2;}
-+ fi
-+ 
-+-echo "$as_me:7909: checking for manpage renaming" >&5
-++echo "$as_me:8032: checking for manpage renaming" >&5
-+ echo $ECHO_N "checking for manpage renaming... $ECHO_C" >&6
-+ 
-+ # Check whether --with-manpage-renames or --without-manpage-renames was given.
-+@@ -7934,7 +8057,7 @@
-+   if test -f $srcdir/man/$MANPAGE_RENAMES ; then
-+     MANPAGE_RENAMES=`cd $srcdir/man && pwd`/$MANPAGE_RENAMES
-+   elif test ! -f $MANPAGE_RENAMES ; then
-+-    { { echo "$as_me:7937: error: not a filename: $MANPAGE_RENAMES" >&5
-++    { { echo "$as_me:8060: error: not a filename: $MANPAGE_RENAMES" >&5
-+ echo "$as_me: error: not a filename: $MANPAGE_RENAMES" >&2;}
-+    { (exit 1); exit 1; }; }
-+   fi
-+@@ -7948,10 +8071,10 @@
-+   fi
-+ fi
-+ 
-+-echo "$as_me:7951: result: $MANPAGE_RENAMES" >&5
-++echo "$as_me:8074: result: $MANPAGE_RENAMES" >&5
-+ echo "${ECHO_T}$MANPAGE_RENAMES" >&6
-+ 
-+-echo "$as_me:7954: checking if manpage aliases will be installed" >&5
-++echo "$as_me:8077: checking if manpage aliases will be installed" >&5
-+ echo $ECHO_N "checking if manpage aliases will be installed... $ECHO_C" >&6
-+ 
-+ # Check whether --with-manpage-aliases or --without-manpage-aliases was given.
-+@@ -7962,7 +8085,7 @@
-+   MANPAGE_ALIASES=yes
-+ fi;
-+ 
-+-echo "$as_me:7965: result: $MANPAGE_ALIASES" >&5
-++echo "$as_me:8088: result: $MANPAGE_ALIASES" >&5
-+ echo "${ECHO_T}$MANPAGE_ALIASES" >&6
-+ 
-+ if test "$LN_S" = "ln -s"; then
-+@@ -7973,7 +8096,7 @@
-+ 
-+ MANPAGE_SYMLINKS=no
-+ if test "$MANPAGE_ALIASES" = yes ; then
-+-echo "$as_me:7976: checking if manpage symlinks should be used" >&5
-++echo "$as_me:8099: checking if manpage symlinks should be used" >&5
-+ echo $ECHO_N "checking if manpage symlinks should be used... $ECHO_C" >&6
-+ 
-+ # Check whether --with-manpage-symlinks or --without-manpage-symlinks was given.
-+@@ -7986,17 +8109,17 @@
-+ 
-+ if test "$$cf_use_symlinks" = no; then
-+ if test "$MANPAGE_SYMLINKS" = yes ; then
-+-	{ echo "$as_me:7989: WARNING: cannot make symlinks" >&5
-++	{ echo "$as_me:8112: WARNING: cannot make symlinks" >&5
-+ echo "$as_me: WARNING: cannot make symlinks" >&2;}
-+ 	MANPAGE_SYMLINKS=no
-+ fi
-+ fi
-+ 
-+-echo "$as_me:7995: result: $MANPAGE_SYMLINKS" >&5
-++echo "$as_me:8118: result: $MANPAGE_SYMLINKS" >&5
-+ echo "${ECHO_T}$MANPAGE_SYMLINKS" >&6
-+ fi
-+ 
-+-echo "$as_me:7999: checking for manpage tbl" >&5
-++echo "$as_me:8122: checking for manpage tbl" >&5
-+ echo $ECHO_N "checking for manpage tbl... $ECHO_C" >&6
-+ 
-+ # Check whether --with-manpage-tbl or --without-manpage-tbl was given.
-+@@ -8007,7 +8130,7 @@
-+   MANPAGE_TBL=no
-+ fi;
-+ 
-+-echo "$as_me:8010: result: $MANPAGE_TBL" >&5
-++echo "$as_me:8133: result: $MANPAGE_TBL" >&5
-+ echo "${ECHO_T}$MANPAGE_TBL" >&6
-+ 
-+   if test "$prefix" = "NONE" ; then
-+@@ -8047,6 +8170,7 @@
-+ esac
-+ 
-+ cf_edit_man=./edit_man.sh
-++cf_man_alias=`pwd`/man_alias.sed
-+ 
-+ cat >$cf_edit_man <<CF_EOF
-+ #! /bin/sh
-+@@ -8062,7 +8186,7 @@
-+ NCURSES_OSPEED="$NCURSES_OSPEED"
-+ TERMINFO="$TERMINFO"
-+ 
-+-MKDIRS="sh `cd $srcdir && pwd`/mkinstalldirs"
-++MKDIRS="sh `cd $srcdir && pwd`/mkdirs.sh"
-+ 
-+ INSTALL="$INSTALL"
-+ INSTALL_DATA="$INSTALL_DATA"
-+@@ -8110,8 +8234,34 @@
-+ 		\$MKDIRS \$cf_subdir\$section
-+ 	fi
-+ 	fi
-+-	aliases=
-+-	cf_source=\`basename \$i\`
-++
-++	# replace variables in man page
-++	if test ! -f $cf_man_alias ; then
-++cat >>$cf_man_alias <<-CF_EOF2
-++		s,@DATADIR@,\$datadir,g
-++		s,@TERMINFO@,\$TERMINFO,g
-++		s,@NCURSES_MAJOR@,\$NCURSES_MAJOR,g
-++		s,@NCURSES_MINOR@,\$NCURSES_MINOR,g
-++		s,@NCURSES_PATCH@,\$NCURSES_PATCH,g
-++		s,@NCURSES_OSPEED@,\$NCURSES_OSPEED,g
-++CF_EOF
-++
-++	for cf_name in  captoinfo clear infocmp infotocap tic toe tput
-++	do
-++		cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-++		cf_name=`echo $cf_name|sed "$program_transform_name"`
-++cat >>$cf_edit_man <<-CF_EOF
-++		s,@$cf_NAME@,$cf_name,
-++CF_EOF
-++	done
-++
-++cat >>$cf_edit_man <<CF_EOF
-++CF_EOF2
-++		echo "...made $cf_man_alias"
-++	fi
-++
-++	aliases=
-++	cf_source=\`basename \$i\`
-+ 	inalias=\$cf_source
-+ 	test ! -f \$inalias && inalias="\$srcdir/\$inalias"
-+ 	if test ! -f \$inalias ; then
-+@@ -8122,7 +8272,7 @@
-+ 
-+ if test "$MANPAGE_ALIASES" != no ; then
-+ cat >>$cf_edit_man <<CF_EOF
-+-	aliases=\`sed -f \$top_srcdir/man/manlinks.sed \$inalias | sort -u\`
-++	aliases=\`sed -f \$top_srcdir/man/manlinks.sed \$inalias |sed -f $cf_man_alias | sort -u\`
-+ CF_EOF
-+ fi
-+ 
-+@@ -8143,34 +8293,13 @@
-+ 		cf_target="\$cf_source"
-+ 	fi
-+ 	cf_target="\$cf_subdir\${section}/\${cf_target}"
-+-CF_EOF
-+-fi
-+-
-+-	# replace variables in man page
-+ 
-+-	for cf_name in  captoinfo clear infocmp infotocap tic toe tput
-+-	do
-+-cat >>$cf_edit_man <<CF_EOF
-+-	prog_$cf_name=\`echo $cf_name|sed "\${transform}"\`
-+-CF_EOF
-+-	done
-+-
-+-cat >>$cf_edit_man <<CF_EOF
-+-	sed	-e "s,@DATADIR@,\$datadir," \\
-+-		-e "s,@TERMINFO@,\$TERMINFO," \\
-+-		-e "s,@NCURSES_MAJOR@,\$NCURSES_MAJOR," \\
-+-		-e "s,@NCURSES_MINOR@,\$NCURSES_MINOR," \\
-+-		-e "s,@NCURSES_PATCH@,\$NCURSES_PATCH," \\
-+-		-e "s,@NCURSES_OSPEED@,\$NCURSES_OSPEED," \\
-+ CF_EOF
-++fi
-+ 
-+-	for cf_name in  captoinfo clear infocmp infotocap tic toe tput
-+-	do
-+-		cf_NAME=`echo "$cf_name" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-+ cat >>$cf_edit_man <<CF_EOF
-+-		-e "s,@$cf_NAME@,\$prog_$cf_name," \\
-++	sed	-f $cf_man_alias \\
-+ CF_EOF
-+-	done
-+ 
-+ if test -f $MANPAGE_RENAMES ; then
-+ cat >>$cf_edit_man <<CF_EOF
-+@@ -8231,6 +8360,7 @@
-+ 	if test \$verb = installing ; then
-+ 		echo \$verb \$cf_target
-+ 		\$INSTALL_DATA \$TMP \$cf_target
-++		test -d \$cf_subdir\${section} &&
-+ 		test -n "\$aliases" && (
-+ 			cd \$cf_subdir\${section} && (
-+ 				cf_source=\`echo \$cf_target |sed -e 's%^.*/\([^/][^/]*/[^/][^/]*$\)%\1%'\`
-+@@ -8272,8 +8402,11 @@
-+ 			)
-+ 		)
-+ 	elif test \$verb = removing ; then
-+-		echo \$verb \$cf_target
-+-		rm -f \$cf_target
-++		test -f \$cf_target && (
-++			echo \$verb \$cf_target
-++			rm -f \$cf_target
-++		)
-++		test -d \$cf_subdir\${section} &&
-+ 		test -n "\$aliases" && (
-+ 			cd \$cf_subdir\${section} && (
-+ 				for cf_alias in \$aliases
-+@@ -8308,7 +8441,7 @@
-+ ###############################################################################
-+ 
-+ ### Note that some functions (such as const) are normally disabled anyway.
-+-echo "$as_me:8311: checking if you want to build with function extensions" >&5
-++echo "$as_me:8444: checking if you want to build with function extensions" >&5
-+ echo $ECHO_N "checking if you want to build with function extensions... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-ext-funcs or --disable-ext-funcs was given.
-+@@ -8318,7 +8451,7 @@
-+ else
-+   with_ext_funcs=yes
-+ fi;
-+-echo "$as_me:8321: result: $with_ext_funcs" >&5
-++echo "$as_me:8454: result: $with_ext_funcs" >&5
-+ echo "${ECHO_T}$with_ext_funcs" >&6
-+ if test "$with_ext_funcs" = yes ; then
-+ 	NCURSES_EXT_FUNCS=1
-+@@ -8355,7 +8488,7 @@
-+ fi
-+ 
-+ ###   use option --enable-const to turn on use of const beyond that in XSI.
-+-echo "$as_me:8358: checking for extended use of const keyword" >&5
-++echo "$as_me:8491: checking for extended use of const keyword" >&5
-+ echo $ECHO_N "checking for extended use of const keyword... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-const or --disable-const was given.
-+@@ -8365,14 +8498,14 @@
-+ else
-+   with_ext_const=no
-+ fi;
-+-echo "$as_me:8368: result: $with_ext_const" >&5
-++echo "$as_me:8501: result: $with_ext_const" >&5
-+ echo "${ECHO_T}$with_ext_const" >&6
-+ NCURSES_CONST='/*nothing*/'
-+ if test "$with_ext_const" = yes ; then
-+ 	NCURSES_CONST=const
-+ fi
-+ 
-+-echo "$as_me:8375: checking if you want \$NCURSES_NO_PADDING code" >&5
-++echo "$as_me:8508: checking if you want \$NCURSES_NO_PADDING code" >&5
-+ echo $ECHO_N "checking if you want \$NCURSES_NO_PADDING code... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-no-padding or --disable-no-padding was given.
-+@@ -8382,19 +8515,19 @@
-+ else
-+   with_no_padding=$with_ext_funcs
-+ fi;
-+-echo "$as_me:8385: result: $with_no_padding" >&5
-++echo "$as_me:8518: result: $with_no_padding" >&5
-+ echo "${ECHO_T}$with_no_padding" >&6
-+ test "$with_no_padding" = yes && cat >>confdefs.h <<\EOF
-+ #define NCURSES_NO_PADDING 1
-+ EOF
-+ 
-+-echo "$as_me:8391: checking for ANSI C header files" >&5
-++echo "$as_me:8524: 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
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 8397 "configure"
-++#line 8530 "configure"
-+ #include "confdefs.h"
-+ #include <stdlib.h>
-+ #include <stdarg.h>
-+@@ -8402,13 +8535,13 @@
-+ #include <float.h>
-+ 
-+ _ACEOF
-+-if { (eval echo "$as_me:8405: \"$ac_cpp conftest.$ac_ext\"") >&5
-++if { (eval echo "$as_me:8538: \"$ac_cpp conftest.$ac_ext\"") >&5
-+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+   ac_status=$?
-+   egrep -v '^ *\+' conftest.er1 >conftest.err
-+   rm -f conftest.er1
-+   cat conftest.err >&5
-+-  echo "$as_me:8411: \$? = $ac_status" >&5
-++  echo "$as_me:8544: \$? = $ac_status" >&5
-+   (exit $ac_status); } >/dev/null; then
-+   if test -s conftest.err; then
-+     ac_cpp_err=$ac_c_preproc_warn_flag
-+@@ -8430,7 +8563,7 @@
-+ if test $ac_cv_header_stdc = yes; then
-+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 8433 "configure"
-++#line 8566 "configure"
-+ #include "confdefs.h"
-+ #include <string.h>
-+ 
-+@@ -8448,7 +8581,7 @@
-+ if test $ac_cv_header_stdc = yes; then
-+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 8451 "configure"
-++#line 8584 "configure"
-+ #include "confdefs.h"
-+ #include <stdlib.h>
-+ 
-+@@ -8469,7 +8602,7 @@
-+   :
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 8472 "configure"
-++#line 8605 "configure"
-+ #include "confdefs.h"
-+ #include <ctype.h>
-+ #if ((' ' & 0x0FF) == 0x020)
-+@@ -8495,15 +8628,15 @@
-+ }
-+ _ACEOF
-+ rm -f conftest$ac_exeext
-+-if { (eval echo "$as_me:8498: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:8631: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:8501: \$? = $ac_status" >&5
-++  echo "$as_me:8634: \$? = $ac_status" >&5
-+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+-  { (eval echo "$as_me:8503: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:8636: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:8506: \$? = $ac_status" >&5
-++  echo "$as_me:8639: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   :
-+ else
-+@@ -8516,7 +8649,7 @@
-+ fi
-+ fi
-+ fi
-+-echo "$as_me:8519: result: $ac_cv_header_stdc" >&5
-++echo "$as_me:8652: result: $ac_cv_header_stdc" >&5
-+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
-+ if test $ac_cv_header_stdc = yes; then
-+ 
-+@@ -8532,28 +8665,28 @@
-+                   inttypes.h stdint.h unistd.h
-+ do
-+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+-echo "$as_me:8535: checking for $ac_header" >&5
-++echo "$as_me:8668: checking for $ac_header" >&5
-+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 8541 "configure"
-++#line 8674 "configure"
-+ #include "confdefs.h"
-+ $ac_includes_default
-+ #include <$ac_header>
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:8547: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:8680: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:8550: \$? = $ac_status" >&5
-++  echo "$as_me:8683: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:8553: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:8686: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:8556: \$? = $ac_status" >&5
-++  echo "$as_me:8689: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   eval "$as_ac_Header=yes"
-+ else
-+@@ -8563,7 +8696,7 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+ fi
-+-echo "$as_me:8566: result: `eval echo '${'$as_ac_Header'}'`" >&5
-++echo "$as_me:8699: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+   cat >>confdefs.h <<EOF
-+@@ -8573,13 +8706,13 @@
-+ fi
-+ done
-+ 
-+-echo "$as_me:8576: checking for signed char" >&5
-++echo "$as_me:8709: checking for signed char" >&5
-+ echo $ECHO_N "checking for signed char... $ECHO_C" >&6
-+ if test "${ac_cv_type_signed_char+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 8582 "configure"
-++#line 8715 "configure"
-+ #include "confdefs.h"
-+ $ac_includes_default
-+ int
-+@@ -8594,16 +8727,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:8597: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:8730: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:8600: \$? = $ac_status" >&5
-++  echo "$as_me:8733: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:8603: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:8736: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:8606: \$? = $ac_status" >&5
-++  echo "$as_me:8739: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_cv_type_signed_char=yes
-+ else
-+@@ -8613,10 +8746,10 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+ fi
-+-echo "$as_me:8616: result: $ac_cv_type_signed_char" >&5
-++echo "$as_me:8749: result: $ac_cv_type_signed_char" >&5
-+ echo "${ECHO_T}$ac_cv_type_signed_char" >&6
-+ 
-+-echo "$as_me:8619: checking size of signed char" >&5
-++echo "$as_me:8752: checking size of signed char" >&5
-+ echo $ECHO_N "checking size of signed char... $ECHO_C" >&6
-+ if test "${ac_cv_sizeof_signed_char+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -8625,7 +8758,7 @@
-+   if test "$cross_compiling" = yes; then
-+   # Depending upon the size, compute the lo and hi bounds.
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 8628 "configure"
-++#line 8761 "configure"
-+ #include "confdefs.h"
-+ $ac_includes_default
-+ int
-+@@ -8637,21 +8770,21 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:8640: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:8773: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:8643: \$? = $ac_status" >&5
-++  echo "$as_me:8776: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:8646: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:8779: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:8649: \$? = $ac_status" >&5
-++  echo "$as_me:8782: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_lo=0 ac_mid=0
-+   while :; do
-+     cat >conftest.$ac_ext <<_ACEOF
-+-#line 8654 "configure"
-++#line 8787 "configure"
-+ #include "confdefs.h"
-+ $ac_includes_default
-+ int
-+@@ -8663,16 +8796,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:8666: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:8799: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:8669: \$? = $ac_status" >&5
-++  echo "$as_me:8802: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:8672: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:8805: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:8675: \$? = $ac_status" >&5
-++  echo "$as_me:8808: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_hi=$ac_mid; break
-+ else
-+@@ -8688,7 +8821,7 @@
-+ ac_hi=-1 ac_mid=-1
-+   while :; do
-+     cat >conftest.$ac_ext <<_ACEOF
-+-#line 8691 "configure"
-++#line 8824 "configure"
-+ #include "confdefs.h"
-+ $ac_includes_default
-+ int
-+@@ -8700,16 +8833,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:8703: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:8836: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:8706: \$? = $ac_status" >&5
-++  echo "$as_me:8839: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:8709: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:8842: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:8712: \$? = $ac_status" >&5
-++  echo "$as_me:8845: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_lo=$ac_mid; break
-+ else
-+@@ -8725,7 +8858,7 @@
-+ while test "x$ac_lo" != "x$ac_hi"; do
-+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 8728 "configure"
-++#line 8861 "configure"
-+ #include "confdefs.h"
-+ $ac_includes_default
-+ int
-+@@ -8737,16 +8870,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:8740: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:8873: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:8743: \$? = $ac_status" >&5
-++  echo "$as_me:8876: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:8746: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:8879: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:8749: \$? = $ac_status" >&5
-++  echo "$as_me:8882: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_hi=$ac_mid
-+ else
-+@@ -8759,12 +8892,12 @@
-+ ac_cv_sizeof_signed_char=$ac_lo
-+ else
-+   if test "$cross_compiling" = yes; then
-+-  { { echo "$as_me:8762: error: cannot run test program while cross compiling" >&5
-++  { { echo "$as_me:8895: error: cannot run test program while cross compiling" >&5
-+ echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-+    { (exit 1); exit 1; }; }
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 8767 "configure"
-++#line 8900 "configure"
-+ #include "confdefs.h"
-+ $ac_includes_default
-+ int
-+@@ -8780,15 +8913,15 @@
-+ }
-+ _ACEOF
-+ rm -f conftest$ac_exeext
-+-if { (eval echo "$as_me:8783: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:8916: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:8786: \$? = $ac_status" >&5
-++  echo "$as_me:8919: \$? = $ac_status" >&5
-+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+-  { (eval echo "$as_me:8788: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:8921: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:8791: \$? = $ac_status" >&5
-++  echo "$as_me:8924: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_cv_sizeof_signed_char=`cat conftest.val`
-+ else
-+@@ -8804,7 +8937,7 @@
-+   ac_cv_sizeof_signed_char=0
-+ fi
-+ fi
-+-echo "$as_me:8807: result: $ac_cv_sizeof_signed_char" >&5
-++echo "$as_me:8940: result: $ac_cv_sizeof_signed_char" >&5
-+ echo "${ECHO_T}$ac_cv_sizeof_signed_char" >&6
-+ cat >>confdefs.h <<EOF
-+ #define SIZEOF_SIGNED_CHAR $ac_cv_sizeof_signed_char
-+@@ -8815,7 +8948,7 @@
-+ else
-+ 	NCURSES_SBOOL="char"
-+ fi
-+-echo "$as_me:8818: checking if you want to use signed Boolean array in term.h" >&5
-++echo "$as_me:8951: checking if you want to use signed Boolean array in term.h" >&5
-+ echo $ECHO_N "checking if you want to use signed Boolean array in term.h... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-signed-char or --disable-signed-char was given.
-+@@ -8825,12 +8958,12 @@
-+ else
-+   with_signed_char=no
-+ fi;
-+-echo "$as_me:8828: result: $with_signed_char" >&5
-++echo "$as_me:8961: result: $with_signed_char" >&5
-+ echo "${ECHO_T}$with_signed_char" >&6
-+ test "$with_signed_char" != yes && NCURSES_SBOOL="char"
-+ 
-+ ###   use option --enable-sigwinch to turn on use of SIGWINCH logic
-+-echo "$as_me:8833: checking if you want SIGWINCH handler" >&5
-++echo "$as_me:8966: checking if you want SIGWINCH handler" >&5
-+ echo $ECHO_N "checking if you want SIGWINCH handler... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-sigwinch or --disable-sigwinch was given.
-+@@ -8840,14 +8973,14 @@
-+ else
-+   with_sigwinch=$with_ext_funcs
-+ fi;
-+-echo "$as_me:8843: result: $with_sigwinch" >&5
-++echo "$as_me:8976: result: $with_sigwinch" >&5
-+ echo "${ECHO_T}$with_sigwinch" >&6
-+ test "$with_sigwinch" = yes && cat >>confdefs.h <<\EOF
-+ #define USE_SIGWINCH 1
-+ EOF
-+ 
-+ ###   use option --enable-tcap-names to allow user to define new capabilities
-+-echo "$as_me:8850: checking if you want user-definable terminal capabilities like termcap" >&5
-++echo "$as_me:8983: checking if you want user-definable terminal capabilities like termcap" >&5
-+ echo $ECHO_N "checking if you want user-definable terminal capabilities like termcap... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-tcap-names or --disable-tcap-names was given.
-+@@ -8857,7 +8990,7 @@
-+ else
-+   with_tcap_names=$with_ext_funcs
-+ fi;
-+-echo "$as_me:8860: result: $with_tcap_names" >&5
-++echo "$as_me:8993: result: $with_tcap_names" >&5
-+ echo "${ECHO_T}$with_tcap_names" >&6
-+ NCURSES_XNAMES=0
-+ test "$with_tcap_names" = yes && NCURSES_XNAMES=1
-+@@ -8865,7 +8998,7 @@
-+ ###############################################################################
-+ # These options are relatively safe to experiment with.
-+ 
-+-echo "$as_me:8868: checking if you want all development code" >&5
-++echo "$as_me:9001: checking if you want all development code" >&5
-+ echo $ECHO_N "checking if you want all development code... $ECHO_C" >&6
-+ 
-+ # Check whether --with-develop or --without-develop was given.
-+@@ -8875,11 +9008,11 @@
-+ else
-+   with_develop=no
-+ fi;
-+-echo "$as_me:8878: result: $with_develop" >&5
-++echo "$as_me:9011: result: $with_develop" >&5
-+ echo "${ECHO_T}$with_develop" >&6
-+ 
-+ ###   use option --enable-hard-tabs to turn on use of hard-tabs optimize
-+-echo "$as_me:8882: checking if you want hard-tabs code" >&5
-++echo "$as_me:9015: checking if you want hard-tabs code" >&5
-+ echo $ECHO_N "checking if you want hard-tabs code... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-hard-tabs or --disable-hard-tabs was given.
-+@@ -8889,14 +9022,14 @@
-+ else
-+   enable_hard_tabs=$with_develop
-+ fi;
-+-echo "$as_me:8892: result: $enable_hard_tabs" >&5
-++echo "$as_me:9025: result: $enable_hard_tabs" >&5
-+ echo "${ECHO_T}$enable_hard_tabs" >&6
-+ test "$enable_hard_tabs" = yes && cat >>confdefs.h <<\EOF
-+ #define USE_HARD_TABS 1
-+ EOF
-+ 
-+ ###   use option --enable-xmc-glitch to turn on use of magic-cookie optimize
-+-echo "$as_me:8899: checking if you want limited support for xmc" >&5
-++echo "$as_me:9032: checking if you want limited support for xmc" >&5
-+ echo $ECHO_N "checking if you want limited support for xmc... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-xmc-glitch or --disable-xmc-glitch was given.
-+@@ -8906,7 +9039,7 @@
-+ else
-+   enable_xmc_glitch=$with_develop
-+ fi;
-+-echo "$as_me:8909: result: $enable_xmc_glitch" >&5
-++echo "$as_me:9042: result: $enable_xmc_glitch" >&5
-+ echo "${ECHO_T}$enable_xmc_glitch" >&6
-+ test "$enable_xmc_glitch" = yes && cat >>confdefs.h <<\EOF
-+ #define USE_XMC_SUPPORT 1
-+@@ -8915,7 +9048,7 @@
-+ ###############################################################################
-+ # These are just experimental, probably should not be in a package:
-+ 
-+-echo "$as_me:8918: checking if you do not want to assume colors are white-on-black" >&5
-++echo "$as_me:9051: checking if you do not want to assume colors are white-on-black" >&5
-+ echo $ECHO_N "checking if you do not want to assume colors are white-on-black... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-assumed-color or --disable-assumed-color was given.
-+@@ -8925,14 +9058,14 @@
-+ else
-+   with_assumed_color=yes
-+ fi;
-+-echo "$as_me:8928: result: $with_assumed_color" >&5
-++echo "$as_me:9061: result: $with_assumed_color" >&5
-+ echo "${ECHO_T}$with_assumed_color" >&6
-+ test "$with_assumed_color" = yes && cat >>confdefs.h <<\EOF
-+ #define USE_ASSUMED_COLOR 1
-+ EOF
-+ 
-+ ###   use option --enable-hashmap to turn on use of hashmap scrolling logic
-+-echo "$as_me:8935: checking if you want hashmap scrolling-optimization code" >&5
-++echo "$as_me:9068: checking if you want hashmap scrolling-optimization code" >&5
-+ echo $ECHO_N "checking if you want hashmap scrolling-optimization code... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-hashmap or --disable-hashmap was given.
-+@@ -8942,14 +9075,14 @@
-+ else
-+   with_hashmap=yes
-+ fi;
-+-echo "$as_me:8945: result: $with_hashmap" >&5
-++echo "$as_me:9078: result: $with_hashmap" >&5
-+ echo "${ECHO_T}$with_hashmap" >&6
-+ test "$with_hashmap" = yes && cat >>confdefs.h <<\EOF
-+ #define USE_HASHMAP 1
-+ EOF
-+ 
-+ ###   use option --enable-colorfgbg to turn on use of $COLORFGBG environment
-+-echo "$as_me:8952: checking if you want colorfgbg code" >&5
-++echo "$as_me:9085: checking if you want colorfgbg code" >&5
-+ echo $ECHO_N "checking if you want colorfgbg code... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-colorfgbg or --disable-colorfgbg was given.
-+@@ -8959,14 +9092,14 @@
-+ else
-+   with_colorfgbg=no
-+ fi;
-+-echo "$as_me:8962: result: $with_colorfgbg" >&5
-++echo "$as_me:9095: result: $with_colorfgbg" >&5
-+ echo "${ECHO_T}$with_colorfgbg" >&6
-+ test "$with_colorfgbg" = yes && cat >>confdefs.h <<\EOF
-+ #define USE_COLORFGBG 1
-+ EOF
-+ 
-+ ###   use option --enable-ext-colors to turn on use of colors beyond 16.
-+-echo "$as_me:8969: checking if you want to use experimental extended colors" >&5
-++echo "$as_me:9102: checking if you want to use experimental extended colors" >&5
-+ echo $ECHO_N "checking if you want to use experimental extended colors... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-ext-colors or --disable-ext-colors was given.
-+@@ -8976,13 +9109,14 @@
-+ else
-+   with_ext_colors=no
-+ fi;
-+-echo "$as_me:8979: result: $with_ext_colors" >&5
-++echo "$as_me:9112: result: $with_ext_colors" >&5
-+ echo "${ECHO_T}$with_ext_colors" >&6
-+ NCURSES_EXT_COLORS=0
-+ if test "$with_ext_colors" = yes ; then
-+ 	if test "$with_widec" != yes ; then
-+-		{ echo "$as_me:8984: WARNING: This option applies only to wide-character library" >&5
-+-echo "$as_me: WARNING: This option applies only to wide-character library" >&2;}
-++		{ { echo "$as_me:9117: error: This option applies only to wide-character library" >&5
-++echo "$as_me: error: This option applies only to wide-character library" >&2;}
-++   { (exit 1); exit 1; }; }
-+ 	else
-+ 		# cannot be ABI 5 since it changes sizeof(cchar_t)
-+ 
-+@@ -8991,7 +9125,7 @@
-+ 	5.*)
-+ 		cf_cv_rel_version=6.0
-+ 		cf_cv_abi_version=6
-+-		{ echo "$as_me:8994: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
-++		{ echo "$as_me:9128: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
-+ echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
-+ 		;;
-+ 	esac
-+@@ -9006,7 +9140,7 @@
-+ fi
-+ 
-+ ###   use option --enable-ext-mouse to modify coding to support 5-button mice
-+-echo "$as_me:9009: checking if you want to use experimental extended mouse encoding" >&5
-++echo "$as_me:9143: checking if you want to use experimental extended mouse encoding" >&5
-+ echo $ECHO_N "checking if you want to use experimental extended mouse encoding... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-ext-mouse or --disable-ext-mouse was given.
-+@@ -9016,7 +9150,7 @@
-+ else
-+   with_ext_mouse=no
-+ fi;
-+-echo "$as_me:9019: result: $with_ext_mouse" >&5
-++echo "$as_me:9153: result: $with_ext_mouse" >&5
-+ echo "${ECHO_T}$with_ext_mouse" >&6
-+ NCURSES_MOUSE_VERSION=1
-+ if test "$with_ext_mouse" = yes ; then
-+@@ -9027,7 +9161,7 @@
-+ 	5.*)
-+ 		cf_cv_rel_version=6.0
-+ 		cf_cv_abi_version=6
-+-		{ echo "$as_me:9030: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
-++		{ echo "$as_me:9164: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
-+ echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
-+ 		;;
-+ 	esac
-+@@ -9035,7 +9169,49 @@
-+ 
-+ fi
-+ 
-+-echo "$as_me:9038: checking if you want experimental safe-sprintf code" >&5
-++# Reentrant code has to be opaque; there's little advantage to making ncurses
-++# opaque outside of that, so there is no --enable-opaque option.
-++echo "$as_me:9174: checking if you want experimental reentrant code" >&5
-++echo $ECHO_N "checking if you want experimental reentrant code... $ECHO_C" >&6
-++
-++# Check whether --enable-reentrant or --disable-reentrant was given.
-++if test "${enable_reentrant+set}" = set; then
-++  enableval="$enable_reentrant"
-++  with_reentrant=$enableval
-++else
-++  with_reentrant=no
-++fi;
-++echo "$as_me:9184: result: $with_reentrant" >&5
-++echo "${ECHO_T}$with_reentrant" >&6
-++if test "$with_reentrant" = yes ; then
-++	cf_cv_enable_reentrant=1
-++	cf_cv_enable_opaque="NCURSES_INTERNALS"
-++	NCURSES_OPAQUE=1
-++	NCURSES_SIZE_T=int
-++	LIB_SUFFIX="t${LIB_SUFFIX}"
-++	cat >>confdefs.h <<\EOF
-++#define USE_REENTRANT 1
-++EOF
-++
-++if test "${with_abi_version+set}" != set; then
-++	case $cf_cv_rel_version in
-++	5.*)
-++		cf_cv_rel_version=6.0
-++		cf_cv_abi_version=6
-++		{ echo "$as_me:9201: WARNING: Overriding ABI version to $cf_cv_abi_version" >&5
-++echo "$as_me: WARNING: Overriding ABI version to $cf_cv_abi_version" >&2;}
-++		;;
-++	esac
-++fi
-++
-++else
-++	cf_cv_enable_reentrant=0
-++	cf_cv_enable_opaque="NCURSES_OPAQUE"
-++	NCURSES_OPAQUE=0
-++	NCURSES_SIZE_T=short
-++fi
-++
-++echo "$as_me:9214: checking if you want experimental safe-sprintf code" >&5
-+ echo $ECHO_N "checking if you want experimental safe-sprintf code... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-safe-sprintf or --disable-safe-sprintf was given.
-+@@ -9045,7 +9221,7 @@
-+ else
-+   with_safe_sprintf=no
-+ fi;
-+-echo "$as_me:9048: result: $with_safe_sprintf" >&5
-++echo "$as_me:9224: result: $with_safe_sprintf" >&5
-+ echo "${ECHO_T}$with_safe_sprintf" >&6
-+ test "$with_safe_sprintf" = yes && cat >>confdefs.h <<\EOF
-+ #define USE_SAFE_SPRINTF 1
-+@@ -9054,7 +9230,7 @@
-+ ###   use option --disable-scroll-hints to turn off use of scroll-hints scrolling logic
-+ # when hashmap is used scroll hints are useless
-+ if test "$with_hashmap" = no ; then
-+-echo "$as_me:9057: checking if you want to experiment without scrolling-hints code" >&5
-++echo "$as_me:9233: checking if you want to experiment without scrolling-hints code" >&5
-+ echo $ECHO_N "checking if you want to experiment without scrolling-hints code... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-scroll-hints or --disable-scroll-hints was given.
-+@@ -9064,7 +9240,7 @@
-+ else
-+   with_scroll_hints=yes
-+ fi;
-+-echo "$as_me:9067: result: $with_scroll_hints" >&5
-++echo "$as_me:9243: result: $with_scroll_hints" >&5
-+ echo "${ECHO_T}$with_scroll_hints" >&6
-+ test "$with_scroll_hints" = yes && cat >>confdefs.h <<\EOF
-+ #define USE_SCROLL_HINTS 1
-+@@ -9072,7 +9248,7 @@
-+ 
-+ fi
-+ 
-+-echo "$as_me:9075: checking if you want experimental wgetch-events code" >&5
-++echo "$as_me:9251: checking if you want experimental wgetch-events code" >&5
-+ echo $ECHO_N "checking if you want experimental wgetch-events code... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-wgetch-events or --disable-wgetch-events was given.
-+@@ -9082,7 +9258,7 @@
-+ else
-+   with_wgetch_events=no
-+ fi;
-+-echo "$as_me:9085: result: $with_wgetch_events" >&5
-++echo "$as_me:9261: result: $with_wgetch_events" >&5
-+ echo "${ECHO_T}$with_wgetch_events" >&6
-+ test "$with_wgetch_events" = yes && cat >>confdefs.h <<\EOF
-+ #define NCURSES_WGETCH_EVENTS 1
-+@@ -9091,7 +9267,7 @@
-+ ###############################################################################
-+ 
-+ ###	use option --disable-echo to suppress full display compiling commands
-+-echo "$as_me:9094: checking if you want to display full commands during build" >&5
-++echo "$as_me:9270: checking if you want to display full commands during build" >&5
-+ echo $ECHO_N "checking if you want to display full commands during build... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-echo or --disable-echo was given.
-+@@ -9106,12 +9282,13 @@
-+ else
-+ 	ECHO_LINK='@ echo linking $@ ... ;'
-+ 	test -n "$LIBTOOL" && LIBTOOL="$LIBTOOL --silent"
-++	test -n "$LIBTOOL_CXX" && LIBTOOL_CXX="$LIBTOOL_CXX --silent"
-+ fi
-+-echo "$as_me:9110: result: $with_echo" >&5
-++echo "$as_me:9287: result: $with_echo" >&5
-+ echo "${ECHO_T}$with_echo" >&6
-+ 
-+ ###	use option --enable-warnings to turn on all gcc warnings
-+-echo "$as_me:9114: checking if you want to see compiler warnings" >&5
-++echo "$as_me:9291: checking if you want to see compiler warnings" >&5
-+ echo $ECHO_N "checking if you want to see compiler warnings... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-warnings or --disable-warnings was given.
-+@@ -9119,10 +9296,10 @@
-+   enableval="$enable_warnings"
-+   with_warnings=$enableval
-+ fi;
-+-echo "$as_me:9122: result: $with_warnings" >&5
-++echo "$as_me:9299: result: $with_warnings" >&5
-+ echo "${ECHO_T}$with_warnings" >&6
-+ 
-+-if test -n "$with_warnings"; then
-++if test "x$with_warnings" = "xyes"; then
-+  	ADAFLAGS="$ADAFLAGS -gnatg"
-+ 
-+ INTEL_COMPILER=no
-+@@ -9130,12 +9307,12 @@
-+ if test "$GCC" = yes ; then
-+ 	case $host_os in
-+ 	linux*|gnu*)
-+-		echo "$as_me:9133: checking if this is really Intel C compiler" >&5
-++		echo "$as_me:9310: checking if this is really Intel C compiler" >&5
-+ echo $ECHO_N "checking if this is really Intel C compiler... $ECHO_C" >&6
-+ 		cf_save_CFLAGS="$CFLAGS"
-+ 		CFLAGS="$CFLAGS -no-gcc"
-+ 		cat >conftest.$ac_ext <<_ACEOF
-+-#line 9138 "configure"
-++#line 9315 "configure"
-+ #include "confdefs.h"
-+ 
-+ int
-+@@ -9152,16 +9329,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:9155: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:9332: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:9158: \$? = $ac_status" >&5
-++  echo "$as_me:9335: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:9161: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:9338: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:9164: \$? = $ac_status" >&5
-++  echo "$as_me:9341: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   INTEL_COMPILER=yes
-+ cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
-+@@ -9172,14 +9349,14 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+ 		CFLAGS="$cf_save_CFLAGS"
-+-		echo "$as_me:9175: result: $INTEL_COMPILER" >&5
-++		echo "$as_me:9352: result: $INTEL_COMPILER" >&5
-+ echo "${ECHO_T}$INTEL_COMPILER" >&6
-+ 		;;
-+ 	esac
-+ fi
-+ 
-+ cat > conftest.$ac_ext <<EOF
-+-#line 9182 "configure"
-++#line 9359 "${as_me-configure}"
-+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
-+ EOF
-+ 
-+@@ -9197,11 +9374,11 @@
-+ # remark #981: operands are evaluated in unspecified order
-+ # warning #269: invalid format string conversion
-+ 
-+-	{ echo "$as_me:9200: checking for $CC warning options..." >&5
-++	{ echo "$as_me:9377: checking for $CC warning options..." >&5
-+ echo "$as_me: checking for $CC warning options..." >&6;}
-+ 	cf_save_CFLAGS="$CFLAGS"
-+ 	EXTRA_CFLAGS="-Wall"
-+-	for cf_opt in  \
-++	for cf_opt in \
-+ 		wd1419 \
-+ 		wd1682 \
-+ 		wd1683 \
-+@@ -9214,12 +9391,12 @@
-+ 		wd981
-+ 	do
-+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-+-		if { (eval echo "$as_me:9217: \"$ac_compile\"") >&5
-++		if { (eval echo "$as_me:9394: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:9220: \$? = $ac_status" >&5
-++  echo "$as_me:9397: \$? = $ac_status" >&5
-+   (exit $ac_status); }; then
-+-			test -n "$verbose" && echo "$as_me:9222: result: ... -$cf_opt" >&5
-++			test -n "$verbose" && echo "$as_me:9399: result: ... -$cf_opt" >&5
-+ echo "${ECHO_T}... -$cf_opt" >&6
-+ 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
-+ 		fi
-+@@ -9228,7 +9405,7 @@
-+ 
-+ elif test "$GCC" = yes
-+ then
-+-	{ echo "$as_me:9231: checking for $CC warning options..." >&5
-++	{ echo "$as_me:9408: checking for $CC warning options..." >&5
-+ echo "$as_me: checking for $CC warning options..." >&6;}
-+ 	cf_save_CFLAGS="$CFLAGS"
-+ 	EXTRA_CFLAGS="-W -Wall"
-+@@ -9245,15 +9422,15 @@
-+ 		Wpointer-arith \
-+ 		Wshadow \
-+ 		Wstrict-prototypes \
-+-		Wundef $cf_warn_CONST
-++		Wundef $cf_warn_CONST Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum
-+ 	do
-+ 		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-+-		if { (eval echo "$as_me:9251: \"$ac_compile\"") >&5
-++		if { (eval echo "$as_me:9428: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:9254: \$? = $ac_status" >&5
-++  echo "$as_me:9431: \$? = $ac_status" >&5
-+   (exit $ac_status); }; then
-+-			test -n "$verbose" && echo "$as_me:9256: result: ... -$cf_opt" >&5
-++			test -n "$verbose" && echo "$as_me:9433: result: ... -$cf_opt" >&5
-+ echo "${ECHO_T}... -$cf_opt" >&6
-+ 			case $cf_opt in #(vi
-+ 			Wcast-qual) #(vi
-+@@ -9264,6 +9441,8 @@
-+ 				3.3*)
-+ 					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
-+ 
-++echo "${as_me-configure}:9444: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-++
-+ 					continue;;
-+ 				esac
-+ 				;;
-+@@ -9282,12 +9461,12 @@
-+ if test "$GCC" = yes ; then
-+ 	case $host_os in
-+ 	linux*|gnu*)
-+-		echo "$as_me:9285: checking if this is really Intel C++ compiler" >&5
-++		echo "$as_me:9464: checking if this is really Intel C++ compiler" >&5
-+ echo $ECHO_N "checking if this is really Intel C++ compiler... $ECHO_C" >&6
-+ 		cf_save_CFLAGS="$CXXFLAGS"
-+ 		CXXFLAGS="$CXXFLAGS -no-gcc"
-+ 		cat >conftest.$ac_ext <<_ACEOF
-+-#line 9290 "configure"
-++#line 9469 "configure"
-+ #include "confdefs.h"
-+ 
-+ int
-+@@ -9304,16 +9483,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:9307: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:9486: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:9310: \$? = $ac_status" >&5
-++  echo "$as_me:9489: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:9313: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:9492: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:9316: \$? = $ac_status" >&5
-++  echo "$as_me:9495: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   INTEL_CPLUSPLUS=yes
-+ cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
-+@@ -9324,7 +9503,7 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+ 		CXXFLAGS="$cf_save_CFLAGS"
-+-		echo "$as_me:9327: result: $INTEL_CPLUSPLUS" >&5
-++		echo "$as_me:9506: result: $INTEL_CPLUSPLUS" >&5
-+ echo "${ECHO_T}$INTEL_CPLUSPLUS" >&6
-+ 		;;
-+ 	esac
-+@@ -9338,7 +9517,7 @@
-+ ac_main_return=return
-+ 
-+ cat > conftest.$ac_ext <<EOF
-+-#line 9341 "configure"
-++#line 9520 "configure"
-+ int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
-+ EOF
-+ 
-+@@ -9356,7 +9535,7 @@
-+ # remark #981: operands are evaluated in unspecified order
-+ # warning #269: invalid format string conversion
-+ 
-+-	{ echo "$as_me:9359: checking for $CC warning options..." >&5
-++	{ echo "$as_me:9538: checking for $CC warning options..." >&5
-+ echo "$as_me: checking for $CC warning options..." >&6;}
-+ 	cf_save_CXXFLAGS="$CXXFLAGS"
-+ 	EXTRA_CXXFLAGS="-Wall"
-+@@ -9373,12 +9552,12 @@
-+ 		wd981
-+ 	do
-+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -$cf_opt"
-+-		if { (eval echo "$as_me:9376: \"$ac_compile\"") >&5
-++		if { (eval echo "$as_me:9555: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:9379: \$? = $ac_status" >&5
-++  echo "$as_me:9558: \$? = $ac_status" >&5
-+   (exit $ac_status); }; then
-+-			test -n "$verbose" && echo "$as_me:9381: result: ... -$cf_opt" >&5
-++			test -n "$verbose" && echo "$as_me:9560: result: ... -$cf_opt" >&5
-+ echo "${ECHO_T}... -$cf_opt" >&6
-+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
-+ 		fi
-+@@ -9387,7 +9566,7 @@
-+ 
-+ elif test "$GXX" = yes
-+ then
-+-	{ echo "$as_me:9390: checking for $CXX warning options..." >&5
-++	{ echo "$as_me:9569: checking for $CXX warning options..." >&5
-+ echo "$as_me: checking for $CXX warning options..." >&6;}
-+ 	cf_save_CXXFLAGS="$CXXFLAGS"
-+ 	EXTRA_CXXFLAGS="-W -Wall"
-+@@ -9416,16 +9595,16 @@
-+ 		Wundef $cf_gxx_extra_warnings Wno-unused
-+ 	do
-+ 		CXXFLAGS="$cf_save_CXXFLAGS $EXTRA_CXXFLAGS -Werror -$cf_opt"
-+-		if { (eval echo "$as_me:9419: \"$ac_compile\"") >&5
-++		if { (eval echo "$as_me:9598: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:9422: \$? = $ac_status" >&5
-++  echo "$as_me:9601: \$? = $ac_status" >&5
-+   (exit $ac_status); }; then
-+-			test -n "$verbose" && echo "$as_me:9424: result: ... -$cf_opt" >&5
-++			test -n "$verbose" && echo "$as_me:9603: result: ... -$cf_opt" >&5
-+ echo "${ECHO_T}... -$cf_opt" >&6
-+ 			EXTRA_CXXFLAGS="$EXTRA_CXXFLAGS -$cf_opt"
-+ 		else
-+-			test -n "$verbose" && echo "$as_me:9428: result: ... no -$cf_opt" >&5
-++			test -n "$verbose" && echo "$as_me:9607: result: ... no -$cf_opt" >&5
-+ echo "${ECHO_T}... no -$cf_opt" >&6
-+ 		fi
-+ 	done
-+@@ -9461,10 +9640,10 @@
-+ EOF
-+ if test "$GCC" = yes
-+ then
-+-	{ echo "$as_me:9464: checking for $CC __attribute__ directives..." >&5
-++	{ echo "$as_me:9643: checking for $CC __attribute__ directives..." >&5
-+ echo "$as_me: checking for $CC __attribute__ directives..." >&6;}
-+ cat > conftest.$ac_ext <<EOF
-+-#line 9467 "configure"
-++#line 9646 "${as_me-configure}"
-+ #include "confdefs.h"
-+ #include "conftest.h"
-+ #include "conftest.i"
-+@@ -9502,12 +9681,12 @@
-+ EOF
-+ 			;;
-+ 		esac
-+-		if { (eval echo "$as_me:9505: \"$ac_compile\"") >&5
-++		if { (eval echo "$as_me:9684: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:9508: \$? = $ac_status" >&5
-++  echo "$as_me:9687: \$? = $ac_status" >&5
-+   (exit $ac_status); }; then
-+-			test -n "$verbose" && echo "$as_me:9510: result: ... $cf_attribute" >&5
-++			test -n "$verbose" && echo "$as_me:9689: result: ... $cf_attribute" >&5
-+ echo "${ECHO_T}... $cf_attribute" >&6
-+ 			cat conftest.h >>confdefs.h
-+ 		fi
-+@@ -9519,7 +9698,7 @@
-+ fi
-+ 
-+ ###	use option --enable-assertions to turn on generation of assertion code
-+-echo "$as_me:9522: checking if you want to enable runtime assertions" >&5
-++echo "$as_me:9701: checking if you want to enable runtime assertions" >&5
-+ echo $ECHO_N "checking if you want to enable runtime assertions... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-assertions or --disable-assertions was given.
-+@@ -9529,7 +9708,7 @@
-+ else
-+   with_assertions=no
-+ fi;
-+-echo "$as_me:9532: result: $with_assertions" >&5
-++echo "$as_me:9711: result: $with_assertions" >&5
-+ echo "${ECHO_T}$with_assertions" >&6
-+ if test -n "$GCC"
-+ then
-+@@ -9547,7 +9726,7 @@
-+ 
-+ ###	use option --disable-leaks to suppress "permanent" leaks, for testing
-+ 
-+-echo "$as_me:9550: checking if you want to use dmalloc for testing" >&5
-++echo "$as_me:9729: checking if you want to use dmalloc for testing" >&5
-+ echo $ECHO_N "checking if you want to use dmalloc for testing... $ECHO_C" >&6
-+ 
-+ # Check whether --with-dmalloc or --without-dmalloc was given.
-+@@ -9563,7 +9742,7 @@
-+ else
-+   with_dmalloc=
-+ fi;
-+-echo "$as_me:9566: result: ${with_dmalloc:-no}" >&5
-++echo "$as_me:9745: result: ${with_dmalloc:-no}" >&5
-+ echo "${ECHO_T}${with_dmalloc:-no}" >&6
-+ 
-+ case .$with_cflags in #(vi
-+@@ -9647,23 +9826,23 @@
-+ esac
-+ 
-+ if test "$with_dmalloc" = yes ; then
-+-	echo "$as_me:9650: checking for dmalloc.h" >&5
-++	echo "$as_me:9829: checking for dmalloc.h" >&5
-+ echo $ECHO_N "checking for dmalloc.h... $ECHO_C" >&6
-+ if test "${ac_cv_header_dmalloc_h+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 9656 "configure"
-++#line 9835 "configure"
-+ #include "confdefs.h"
-+ #include <dmalloc.h>
-+ _ACEOF
-+-if { (eval echo "$as_me:9660: \"$ac_cpp conftest.$ac_ext\"") >&5
-++if { (eval echo "$as_me:9839: \"$ac_cpp conftest.$ac_ext\"") >&5
-+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+   ac_status=$?
-+   egrep -v '^ *\+' conftest.er1 >conftest.err
-+   rm -f conftest.er1
-+   cat conftest.err >&5
-+-  echo "$as_me:9666: \$? = $ac_status" >&5
-++  echo "$as_me:9845: \$? = $ac_status" >&5
-+   (exit $ac_status); } >/dev/null; then
-+   if test -s conftest.err; then
-+     ac_cpp_err=$ac_c_preproc_warn_flag
-+@@ -9682,11 +9861,11 @@
-+ fi
-+ rm -f conftest.err conftest.$ac_ext
-+ fi
-+-echo "$as_me:9685: result: $ac_cv_header_dmalloc_h" >&5
-++echo "$as_me:9864: result: $ac_cv_header_dmalloc_h" >&5
-+ echo "${ECHO_T}$ac_cv_header_dmalloc_h" >&6
-+ if test $ac_cv_header_dmalloc_h = yes; then
-+ 
-+-echo "$as_me:9689: checking for dmalloc_debug in -ldmalloc" >&5
-++echo "$as_me:9868: checking for dmalloc_debug in -ldmalloc" >&5
-+ echo $ECHO_N "checking for dmalloc_debug in -ldmalloc... $ECHO_C" >&6
-+ if test "${ac_cv_lib_dmalloc_dmalloc_debug+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -9694,7 +9873,7 @@
-+   ac_check_lib_save_LIBS=$LIBS
-+ LIBS="-ldmalloc  $LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 9697 "configure"
-++#line 9876 "configure"
-+ #include "confdefs.h"
-+ 
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+@@ -9713,16 +9892,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:9716: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:9895: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:9719: \$? = $ac_status" >&5
-++  echo "$as_me:9898: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:9722: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:9901: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:9725: \$? = $ac_status" >&5
-++  echo "$as_me:9904: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_cv_lib_dmalloc_dmalloc_debug=yes
-+ else
-+@@ -9733,7 +9912,7 @@
-+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ LIBS=$ac_check_lib_save_LIBS
-+ fi
-+-echo "$as_me:9736: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
-++echo "$as_me:9915: result: $ac_cv_lib_dmalloc_dmalloc_debug" >&5
-+ echo "${ECHO_T}$ac_cv_lib_dmalloc_dmalloc_debug" >&6
-+ if test $ac_cv_lib_dmalloc_dmalloc_debug = yes; then
-+   cat >>confdefs.h <<EOF
-+@@ -9748,7 +9927,7 @@
-+ 
-+ fi
-+ 
-+-echo "$as_me:9751: checking if you want to use dbmalloc for testing" >&5
-++echo "$as_me:9930: checking if you want to use dbmalloc for testing" >&5
-+ echo $ECHO_N "checking if you want to use dbmalloc for testing... $ECHO_C" >&6
-+ 
-+ # Check whether --with-dbmalloc or --without-dbmalloc was given.
-+@@ -9764,7 +9943,7 @@
-+ else
-+   with_dbmalloc=
-+ fi;
-+-echo "$as_me:9767: result: ${with_dbmalloc:-no}" >&5
-++echo "$as_me:9946: result: ${with_dbmalloc:-no}" >&5
-+ echo "${ECHO_T}${with_dbmalloc:-no}" >&6
-+ 
-+ case .$with_cflags in #(vi
-+@@ -9848,23 +10027,23 @@
-+ esac
-+ 
-+ if test "$with_dbmalloc" = yes ; then
-+-	echo "$as_me:9851: checking for dbmalloc.h" >&5
-++	echo "$as_me:10030: checking for dbmalloc.h" >&5
-+ echo $ECHO_N "checking for dbmalloc.h... $ECHO_C" >&6
-+ if test "${ac_cv_header_dbmalloc_h+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 9857 "configure"
-++#line 10036 "configure"
-+ #include "confdefs.h"
-+ #include <dbmalloc.h>
-+ _ACEOF
-+-if { (eval echo "$as_me:9861: \"$ac_cpp conftest.$ac_ext\"") >&5
-++if { (eval echo "$as_me:10040: \"$ac_cpp conftest.$ac_ext\"") >&5
-+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+   ac_status=$?
-+   egrep -v '^ *\+' conftest.er1 >conftest.err
-+   rm -f conftest.er1
-+   cat conftest.err >&5
-+-  echo "$as_me:9867: \$? = $ac_status" >&5
-++  echo "$as_me:10046: \$? = $ac_status" >&5
-+   (exit $ac_status); } >/dev/null; then
-+   if test -s conftest.err; then
-+     ac_cpp_err=$ac_c_preproc_warn_flag
-+@@ -9883,11 +10062,11 @@
-+ fi
-+ rm -f conftest.err conftest.$ac_ext
-+ fi
-+-echo "$as_me:9886: result: $ac_cv_header_dbmalloc_h" >&5
-++echo "$as_me:10065: result: $ac_cv_header_dbmalloc_h" >&5
-+ echo "${ECHO_T}$ac_cv_header_dbmalloc_h" >&6
-+ if test $ac_cv_header_dbmalloc_h = yes; then
-+ 
-+-echo "$as_me:9890: checking for debug_malloc in -ldbmalloc" >&5
-++echo "$as_me:10069: checking for debug_malloc in -ldbmalloc" >&5
-+ echo $ECHO_N "checking for debug_malloc in -ldbmalloc... $ECHO_C" >&6
-+ if test "${ac_cv_lib_dbmalloc_debug_malloc+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -9895,7 +10074,7 @@
-+   ac_check_lib_save_LIBS=$LIBS
-+ LIBS="-ldbmalloc  $LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 9898 "configure"
-++#line 10077 "configure"
-+ #include "confdefs.h"
-+ 
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+@@ -9914,16 +10093,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:9917: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:10096: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:9920: \$? = $ac_status" >&5
-++  echo "$as_me:10099: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:9923: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:10102: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:9926: \$? = $ac_status" >&5
-++  echo "$as_me:10105: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_cv_lib_dbmalloc_debug_malloc=yes
-+ else
-+@@ -9934,7 +10113,7 @@
-+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ LIBS=$ac_check_lib_save_LIBS
-+ fi
-+-echo "$as_me:9937: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
-++echo "$as_me:10116: result: $ac_cv_lib_dbmalloc_debug_malloc" >&5
-+ echo "${ECHO_T}$ac_cv_lib_dbmalloc_debug_malloc" >&6
-+ if test $ac_cv_lib_dbmalloc_debug_malloc = yes; then
-+   cat >>confdefs.h <<EOF
-+@@ -9949,7 +10128,7 @@
-+ 
-+ fi
-+ 
-+-echo "$as_me:9952: checking if you want to use valgrind for testing" >&5
-++echo "$as_me:10131: checking if you want to use valgrind for testing" >&5
-+ echo $ECHO_N "checking if you want to use valgrind for testing... $ECHO_C" >&6
-+ 
-+ # Check whether --with-valgrind or --without-valgrind was given.
-+@@ -9965,7 +10144,7 @@
-+ else
-+   with_valgrind=
-+ fi;
-+-echo "$as_me:9968: result: ${with_valgrind:-no}" >&5
-++echo "$as_me:10147: result: ${with_valgrind:-no}" >&5
-+ echo "${ECHO_T}${with_valgrind:-no}" >&6
-+ 
-+ case .$with_cflags in #(vi
-+@@ -10048,7 +10227,7 @@
-+ 	;;
-+ esac
-+ 
-+-echo "$as_me:10051: checking if you want to perform memory-leak testing" >&5
-++echo "$as_me:10230: checking if you want to perform memory-leak testing" >&5
-+ echo $ECHO_N "checking if you want to perform memory-leak testing... $ECHO_C" >&6
-+ 
-+ # Check whether --enable-leaks or --disable-leaks was given.
-+@@ -10058,7 +10237,7 @@
-+ else
-+   : ${with_no_leaks:=no}
-+ fi;
-+-echo "$as_me:10061: result: $with_no_leaks" >&5
-++echo "$as_me:10240: result: $with_no_leaks" >&5
-+ echo "${ECHO_T}$with_no_leaks" >&6
-+ 
-+ if test "$with_no_leaks" = yes ; then
-+@@ -10103,7 +10282,7 @@
-+ 	;;
-+ esac
-+ 
-+-echo "$as_me:10106: checking whether to add trace feature to all models" >&5
-++echo "$as_me:10285: checking whether to add trace feature to all models" >&5
-+ echo $ECHO_N "checking whether to add trace feature to all models... $ECHO_C" >&6
-+ 
-+ # Check whether --with-trace or --without-trace was given.
-+@@ -10113,7 +10292,7 @@
-+ else
-+   cf_with_trace=$cf_all_traces
-+ fi;
-+-echo "$as_me:10116: result: $cf_with_trace" >&5
-++echo "$as_me:10295: result: $cf_with_trace" >&5
-+ echo "${ECHO_T}$cf_with_trace" >&6
-+ 
-+ if test "$cf_with_trace" = yes ; then
-+@@ -10194,13 +10373,13 @@
-+ fi
-+ 
-+ ###	Checks for libraries.
-+-echo "$as_me:10197: checking for gettimeofday" >&5
-++echo "$as_me:10376: checking for gettimeofday" >&5
-+ echo $ECHO_N "checking for gettimeofday... $ECHO_C" >&6
-+ if test "${ac_cv_func_gettimeofday+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 10203 "configure"
-++#line 10382 "configure"
-+ #include "confdefs.h"
-+ /* System header to define __stub macros and hopefully few prototypes,
-+     which can conflict with char gettimeofday (); below.  */
-+@@ -10231,16 +10410,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:10234: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:10413: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:10237: \$? = $ac_status" >&5
-++  echo "$as_me:10416: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:10240: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:10419: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:10243: \$? = $ac_status" >&5
-++  echo "$as_me:10422: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_cv_func_gettimeofday=yes
-+ else
-+@@ -10250,7 +10429,7 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ fi
-+-echo "$as_me:10253: result: $ac_cv_func_gettimeofday" >&5
-++echo "$as_me:10432: result: $ac_cv_func_gettimeofday" >&5
-+ echo "${ECHO_T}$ac_cv_func_gettimeofday" >&6
-+ if test $ac_cv_func_gettimeofday = yes; then
-+   cat >>confdefs.h <<\EOF
-+@@ -10259,7 +10438,7 @@
-+ 
-+ else
-+ 
-+-echo "$as_me:10262: checking for gettimeofday in -lbsd" >&5
-++echo "$as_me:10441: checking for gettimeofday in -lbsd" >&5
-+ echo $ECHO_N "checking for gettimeofday in -lbsd... $ECHO_C" >&6
-+ if test "${ac_cv_lib_bsd_gettimeofday+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -10267,7 +10446,7 @@
-+   ac_check_lib_save_LIBS=$LIBS
-+ LIBS="-lbsd  $LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 10270 "configure"
-++#line 10449 "configure"
-+ #include "confdefs.h"
-+ 
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+@@ -10286,16 +10465,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:10289: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:10468: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:10292: \$? = $ac_status" >&5
-++  echo "$as_me:10471: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:10295: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:10474: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:10298: \$? = $ac_status" >&5
-++  echo "$as_me:10477: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_cv_lib_bsd_gettimeofday=yes
-+ else
-+@@ -10306,7 +10485,7 @@
-+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ LIBS=$ac_check_lib_save_LIBS
-+ fi
-+-echo "$as_me:10309: result: $ac_cv_lib_bsd_gettimeofday" >&5
-++echo "$as_me:10488: result: $ac_cv_lib_bsd_gettimeofday" >&5
-+ echo "${ECHO_T}$ac_cv_lib_bsd_gettimeofday" >&6
-+ if test $ac_cv_lib_bsd_gettimeofday = yes; then
-+   cat >>confdefs.h <<\EOF
-+@@ -10318,14 +10497,14 @@
-+ 
-+ fi
-+ 
-+-echo "$as_me:10321: checking if -lm needed for math functions" >&5
-++echo "$as_me:10500: checking if -lm needed for math functions" >&5
-+ echo $ECHO_N "checking if -lm needed for math functions... $ECHO_C" >&6
-+ if test "${cf_cv_need_libm+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+ 
-+ 	cat >conftest.$ac_ext <<_ACEOF
-+-#line 10328 "configure"
-++#line 10507 "configure"
-+ #include "confdefs.h"
-+ 
-+ 	#include <stdio.h>
-+@@ -10340,16 +10519,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:10343: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:10522: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:10346: \$? = $ac_status" >&5
-++  echo "$as_me:10525: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:10349: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:10528: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:10352: \$? = $ac_status" >&5
-++  echo "$as_me:10531: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_need_libm=no
-+ else
-+@@ -10359,7 +10538,7 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ fi
-+-echo "$as_me:10362: result: $cf_cv_need_libm" >&5
-++echo "$as_me:10541: result: $cf_cv_need_libm" >&5
-+ echo "${ECHO_T}$cf_cv_need_libm" >&6
-+ if test "$cf_cv_need_libm" = yes
-+ then
-+@@ -10367,13 +10546,13 @@
-+ fi
-+ 
-+ ###	Checks for header files.
-+-echo "$as_me:10370: checking for ANSI C header files" >&5
-++echo "$as_me:10549: 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
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 10376 "configure"
-++#line 10555 "configure"
-+ #include "confdefs.h"
-+ #include <stdlib.h>
-+ #include <stdarg.h>
-+@@ -10381,13 +10560,13 @@
-+ #include <float.h>
-+ 
-+ _ACEOF
-+-if { (eval echo "$as_me:10384: \"$ac_cpp conftest.$ac_ext\"") >&5
-++if { (eval echo "$as_me:10563: \"$ac_cpp conftest.$ac_ext\"") >&5
-+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+   ac_status=$?
-+   egrep -v '^ *\+' conftest.er1 >conftest.err
-+   rm -f conftest.er1
-+   cat conftest.err >&5
-+-  echo "$as_me:10390: \$? = $ac_status" >&5
-++  echo "$as_me:10569: \$? = $ac_status" >&5
-+   (exit $ac_status); } >/dev/null; then
-+   if test -s conftest.err; then
-+     ac_cpp_err=$ac_c_preproc_warn_flag
-+@@ -10409,7 +10588,7 @@
-+ if test $ac_cv_header_stdc = yes; then
-+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 10412 "configure"
-++#line 10591 "configure"
-+ #include "confdefs.h"
-+ #include <string.h>
-+ 
-+@@ -10427,7 +10606,7 @@
-+ if test $ac_cv_header_stdc = yes; then
-+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 10430 "configure"
-++#line 10609 "configure"
-+ #include "confdefs.h"
-+ #include <stdlib.h>
-+ 
-+@@ -10448,7 +10627,7 @@
-+   :
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 10451 "configure"
-++#line 10630 "configure"
-+ #include "confdefs.h"
-+ #include <ctype.h>
-+ #if ((' ' & 0x0FF) == 0x020)
-+@@ -10474,15 +10653,15 @@
-+ }
-+ _ACEOF
-+ rm -f conftest$ac_exeext
-+-if { (eval echo "$as_me:10477: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:10656: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:10480: \$? = $ac_status" >&5
-++  echo "$as_me:10659: \$? = $ac_status" >&5
-+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+-  { (eval echo "$as_me:10482: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:10661: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:10485: \$? = $ac_status" >&5
-++  echo "$as_me:10664: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   :
-+ else
-+@@ -10495,7 +10674,7 @@
-+ fi
-+ fi
-+ fi
-+-echo "$as_me:10498: result: $ac_cv_header_stdc" >&5
-++echo "$as_me:10677: result: $ac_cv_header_stdc" >&5
-+ echo "${ECHO_T}$ac_cv_header_stdc" >&6
-+ if test $ac_cv_header_stdc = yes; then
-+ 
-+@@ -10508,13 +10687,13 @@
-+ ac_header_dirent=no
-+ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-+   as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-+-echo "$as_me:10511: checking for $ac_hdr that defines DIR" >&5
-++echo "$as_me:10690: checking for $ac_hdr that defines DIR" >&5
-+ echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
-+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 10517 "configure"
-++#line 10696 "configure"
-+ #include "confdefs.h"
-+ #include <sys/types.h>
-+ #include <$ac_hdr>
-+@@ -10529,16 +10708,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:10532: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:10711: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:10535: \$? = $ac_status" >&5
-++  echo "$as_me:10714: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:10538: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:10717: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:10541: \$? = $ac_status" >&5
-++  echo "$as_me:10720: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   eval "$as_ac_Header=yes"
-+ else
-+@@ -10548,7 +10727,7 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+ fi
-+-echo "$as_me:10551: result: `eval echo '${'$as_ac_Header'}'`" >&5
-++echo "$as_me:10730: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+   cat >>confdefs.h <<EOF
-+@@ -10561,7 +10740,7 @@
-+ done
-+ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
-+ if test $ac_header_dirent = dirent.h; then
-+-  echo "$as_me:10564: checking for opendir in -ldir" >&5
-++  echo "$as_me:10743: checking for opendir in -ldir" >&5
-+ echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6
-+ if test "${ac_cv_lib_dir_opendir+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -10569,7 +10748,7 @@
-+   ac_check_lib_save_LIBS=$LIBS
-+ LIBS="-ldir  $LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 10572 "configure"
-++#line 10751 "configure"
-+ #include "confdefs.h"
-+ 
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+@@ -10588,16 +10767,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:10591: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:10770: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:10594: \$? = $ac_status" >&5
-++  echo "$as_me:10773: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:10597: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:10776: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:10600: \$? = $ac_status" >&5
-++  echo "$as_me:10779: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_cv_lib_dir_opendir=yes
-+ else
-+@@ -10608,14 +10787,14 @@
-+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ LIBS=$ac_check_lib_save_LIBS
-+ fi
-+-echo "$as_me:10611: result: $ac_cv_lib_dir_opendir" >&5
-++echo "$as_me:10790: result: $ac_cv_lib_dir_opendir" >&5
-+ echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6
-+ if test $ac_cv_lib_dir_opendir = yes; then
-+   LIBS="$LIBS -ldir"
-+ fi
-+ 
-+ else
-+-  echo "$as_me:10618: checking for opendir in -lx" >&5
-++  echo "$as_me:10797: checking for opendir in -lx" >&5
-+ echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6
-+ if test "${ac_cv_lib_x_opendir+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -10623,7 +10802,7 @@
-+   ac_check_lib_save_LIBS=$LIBS
-+ LIBS="-lx  $LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 10626 "configure"
-++#line 10805 "configure"
-+ #include "confdefs.h"
-+ 
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+@@ -10642,16 +10821,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:10645: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:10824: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:10648: \$? = $ac_status" >&5
-++  echo "$as_me:10827: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:10651: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:10830: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:10654: \$? = $ac_status" >&5
-++  echo "$as_me:10833: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_cv_lib_x_opendir=yes
-+ else
-+@@ -10662,7 +10841,7 @@
-+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ LIBS=$ac_check_lib_save_LIBS
-+ fi
-+-echo "$as_me:10665: result: $ac_cv_lib_x_opendir" >&5
-++echo "$as_me:10844: result: $ac_cv_lib_x_opendir" >&5
-+ echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6
-+ if test $ac_cv_lib_x_opendir = yes; then
-+   LIBS="$LIBS -lx"
-+@@ -10670,13 +10849,13 @@
-+ 
-+ fi
-+ 
-+-echo "$as_me:10673: checking whether time.h and sys/time.h may both be included" >&5
-++echo "$as_me:10852: checking whether time.h and sys/time.h may both be included" >&5
-+ echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
-+ if test "${ac_cv_header_time+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 10679 "configure"
-++#line 10858 "configure"
-+ #include "confdefs.h"
-+ #include <sys/types.h>
-+ #include <sys/time.h>
-+@@ -10692,16 +10871,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:10695: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:10874: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:10698: \$? = $ac_status" >&5
-++  echo "$as_me:10877: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:10701: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:10880: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:10704: \$? = $ac_status" >&5
-++  echo "$as_me:10883: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_cv_header_time=yes
-+ else
-+@@ -10711,7 +10890,7 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+ fi
-+-echo "$as_me:10714: result: $ac_cv_header_time" >&5
-++echo "$as_me:10893: result: $ac_cv_header_time" >&5
-+ echo "${ECHO_T}$ac_cv_header_time" >&6
-+ if test $ac_cv_header_time = yes; then
-+ 
-+@@ -10721,14 +10900,14 @@
-+ 
-+ fi
-+ 
-+-echo "$as_me:10724: checking for regular-expression headers" >&5
-++echo "$as_me:10903: checking for regular-expression headers" >&5
-+ echo $ECHO_N "checking for regular-expression headers... $ECHO_C" >&6
-+ if test "${cf_cv_regex+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+ 
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 10731 "configure"
-++#line 10910 "configure"
-+ #include "confdefs.h"
-+ #include <sys/types.h>
-+ #include <regex.h>
-+@@ -10746,16 +10925,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:10749: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:10928: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:10752: \$? = $ac_status" >&5
-++  echo "$as_me:10931: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:10755: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:10934: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:10758: \$? = $ac_status" >&5
-++  echo "$as_me:10937: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_regex="regex.h"
-+ else
-+@@ -10763,7 +10942,7 @@
-+ cat conftest.$ac_ext >&5
-+ 
-+ 	cat >conftest.$ac_ext <<_ACEOF
-+-#line 10766 "configure"
-++#line 10945 "configure"
-+ #include "confdefs.h"
-+ #include <regexp.h>
-+ int
-+@@ -10778,16 +10957,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:10781: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:10960: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:10784: \$? = $ac_status" >&5
-++  echo "$as_me:10963: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:10787: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:10966: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:10790: \$? = $ac_status" >&5
-++  echo "$as_me:10969: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_regex="regexp.h"
-+ else
-+@@ -10797,7 +10976,7 @@
-+ 		cf_save_LIBS="$LIBS"
-+ 		LIBS="-lgen $LIBS"
-+ 		cat >conftest.$ac_ext <<_ACEOF
-+-#line 10800 "configure"
-++#line 10979 "configure"
-+ #include "confdefs.h"
-+ #include <regexpr.h>
-+ int
-+@@ -10812,16 +10991,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:10815: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:10994: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:10818: \$? = $ac_status" >&5
-++  echo "$as_me:10997: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:10821: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:11000: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:10824: \$? = $ac_status" >&5
-++  echo "$as_me:11003: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_regex="regexpr.h"
-+ else
-+@@ -10837,7 +11016,7 @@
-+ 
-+ fi
-+ 
-+-echo "$as_me:10840: result: $cf_cv_regex" >&5
-++echo "$as_me:11019: result: $cf_cv_regex" >&5
-+ echo "${ECHO_T}$cf_cv_regex" >&6
-+ case $cf_cv_regex in
-+ 	regex.h)   cat >>confdefs.h <<\EOF
-+@@ -10873,23 +11052,23 @@
-+ 
-+ do
-+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+-echo "$as_me:10876: checking for $ac_header" >&5
-++echo "$as_me:11055: checking for $ac_header" >&5
-+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 10882 "configure"
-++#line 11061 "configure"
-+ #include "confdefs.h"
-+ #include <$ac_header>
-+ _ACEOF
-+-if { (eval echo "$as_me:10886: \"$ac_cpp conftest.$ac_ext\"") >&5
-++if { (eval echo "$as_me:11065: \"$ac_cpp conftest.$ac_ext\"") >&5
-+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+   ac_status=$?
-+   egrep -v '^ *\+' conftest.er1 >conftest.err
-+   rm -f conftest.er1
-+   cat conftest.err >&5
-+-  echo "$as_me:10892: \$? = $ac_status" >&5
-++  echo "$as_me:11071: \$? = $ac_status" >&5
-+   (exit $ac_status); } >/dev/null; then
-+   if test -s conftest.err; then
-+     ac_cpp_err=$ac_c_preproc_warn_flag
-+@@ -10908,7 +11087,7 @@
-+ fi
-+ rm -f conftest.err conftest.$ac_ext
-+ fi
-+-echo "$as_me:10911: result: `eval echo '${'$as_ac_Header'}'`" >&5
-++echo "$as_me:11090: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+   cat >>confdefs.h <<EOF
-+@@ -10922,7 +11101,7 @@
-+ # Note: even non-Posix ISC needs <sys/bsdtypes.h> to declare fd_set
-+ if test "$ISC" = yes ; then
-+ 
-+-echo "$as_me:10925: checking for main in -lcposix" >&5
-++echo "$as_me:11104: checking for main in -lcposix" >&5
-+ echo $ECHO_N "checking for main in -lcposix... $ECHO_C" >&6
-+ if test "${ac_cv_lib_cposix_main+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -10930,7 +11109,7 @@
-+   ac_check_lib_save_LIBS=$LIBS
-+ LIBS="-lcposix  $LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 10933 "configure"
-++#line 11112 "configure"
-+ #include "confdefs.h"
-+ 
-+ int
-+@@ -10942,16 +11121,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:10945: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:11124: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:10948: \$? = $ac_status" >&5
-++  echo "$as_me:11127: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:10951: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:11130: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:10954: \$? = $ac_status" >&5
-++  echo "$as_me:11133: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_cv_lib_cposix_main=yes
-+ else
-+@@ -10962,7 +11141,7 @@
-+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ LIBS=$ac_check_lib_save_LIBS
-+ fi
-+-echo "$as_me:10965: result: $ac_cv_lib_cposix_main" >&5
-++echo "$as_me:11144: result: $ac_cv_lib_cposix_main" >&5
-+ echo "${ECHO_T}$ac_cv_lib_cposix_main" >&6
-+ if test $ac_cv_lib_cposix_main = yes; then
-+   cat >>confdefs.h <<EOF
-+@@ -10973,7 +11152,7 @@
-+ 
-+ fi
-+ 
-+-	echo "$as_me:10976: checking for bzero in -linet" >&5
-++	echo "$as_me:11155: checking for bzero in -linet" >&5
-+ echo $ECHO_N "checking for bzero in -linet... $ECHO_C" >&6
-+ if test "${ac_cv_lib_inet_bzero+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -10981,7 +11160,7 @@
-+   ac_check_lib_save_LIBS=$LIBS
-+ LIBS="-linet  $LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 10984 "configure"
-++#line 11163 "configure"
-+ #include "confdefs.h"
-+ 
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+@@ -11000,16 +11179,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:11003: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:11182: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11006: \$? = $ac_status" >&5
-++  echo "$as_me:11185: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:11009: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:11188: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11012: \$? = $ac_status" >&5
-++  echo "$as_me:11191: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_cv_lib_inet_bzero=yes
-+ else
-+@@ -11020,21 +11199,21 @@
-+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ LIBS=$ac_check_lib_save_LIBS
-+ fi
-+-echo "$as_me:11023: result: $ac_cv_lib_inet_bzero" >&5
-++echo "$as_me:11202: result: $ac_cv_lib_inet_bzero" >&5
-+ echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6
-+ if test $ac_cv_lib_inet_bzero = yes; then
-+   LIBS="$LIBS -linet"
-+ fi
-+ fi
-+ 
-+-echo "$as_me:11030: checking if sys/time.h works with sys/select.h" >&5
-++echo "$as_me:11209: checking if sys/time.h works with sys/select.h" >&5
-+ echo $ECHO_N "checking if sys/time.h works with sys/select.h... $ECHO_C" >&6
-+ if test "${cf_cv_sys_time_select+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+ 
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 11037 "configure"
-++#line 11216 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <sys/types.h>
-+@@ -11054,16 +11233,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:11057: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:11236: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11060: \$? = $ac_status" >&5
-++  echo "$as_me:11239: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:11063: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:11242: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11066: \$? = $ac_status" >&5
-++  echo "$as_me:11245: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_sys_time_select=yes
-+ else
-+@@ -11075,7 +11254,7 @@
-+ 
-+ fi
-+ 
-+-echo "$as_me:11078: result: $cf_cv_sys_time_select" >&5
-++echo "$as_me:11257: result: $cf_cv_sys_time_select" >&5
-+ echo "${ECHO_T}$cf_cv_sys_time_select" >&6
-+ test "$cf_cv_sys_time_select" = yes && cat >>confdefs.h <<\EOF
-+ #define HAVE_SYS_TIME_SELECT 1
-+@@ -11089,7 +11268,7 @@
-+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+ ac_main_return=return
-+ 
-+-echo "$as_me:11092: checking for $CC option to accept ANSI C" >&5
-++echo "$as_me:11271: checking for $CC option to accept ANSI C" >&5
-+ echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-+ if test "${ac_cv_prog_cc_stdc+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -11097,7 +11276,7 @@
-+   ac_cv_prog_cc_stdc=no
-+ ac_save_CC=$CC
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 11100 "configure"
-++#line 11279 "configure"
-+ #include "confdefs.h"
-+ #include <stdarg.h>
-+ #include <stdio.h>
-+@@ -11146,16 +11325,16 @@
-+ do
-+   CC="$ac_save_CC $ac_arg"
-+   rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:11149: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:11328: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11152: \$? = $ac_status" >&5
-++  echo "$as_me:11331: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:11155: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:11334: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11158: \$? = $ac_status" >&5
-++  echo "$as_me:11337: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_cv_prog_cc_stdc=$ac_arg
-+ break
-+@@ -11172,21 +11351,21 @@
-+ 
-+ case "x$ac_cv_prog_cc_stdc" in
-+   x|xno)
-+-    echo "$as_me:11175: result: none needed" >&5
-++    echo "$as_me:11354: result: none needed" >&5
-+ echo "${ECHO_T}none needed" >&6 ;;
-+   *)
-+-    echo "$as_me:11178: result: $ac_cv_prog_cc_stdc" >&5
-++    echo "$as_me:11357: result: $ac_cv_prog_cc_stdc" >&5
-+ echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-+     CC="$CC $ac_cv_prog_cc_stdc" ;;
-+ esac
-+ 
-+-echo "$as_me:11183: checking for an ANSI C-conforming const" >&5
-++echo "$as_me:11362: checking for an ANSI C-conforming const" >&5
-+ echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
-+ if test "${ac_cv_c_const+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 11189 "configure"
-++#line 11368 "configure"
-+ #include "confdefs.h"
-+ 
-+ int
-+@@ -11244,16 +11423,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:11247: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:11426: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11250: \$? = $ac_status" >&5
-++  echo "$as_me:11429: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:11253: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:11432: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11256: \$? = $ac_status" >&5
-++  echo "$as_me:11435: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_cv_c_const=yes
-+ else
-+@@ -11263,7 +11442,7 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+ fi
-+-echo "$as_me:11266: result: $ac_cv_c_const" >&5
-++echo "$as_me:11445: result: $ac_cv_c_const" >&5
-+ echo "${ECHO_T}$ac_cv_c_const" >&6
-+ if test $ac_cv_c_const = no; then
-+ 
-+@@ -11273,7 +11452,7 @@
-+ 
-+ fi
-+ 
-+-echo "$as_me:11276: checking for inline" >&5
-++echo "$as_me:11455: checking for inline" >&5
-+ echo $ECHO_N "checking for inline... $ECHO_C" >&6
-+ if test "${ac_cv_c_inline+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -11281,7 +11460,7 @@
-+   ac_cv_c_inline=no
-+ for ac_kw in inline __inline__ __inline; do
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 11284 "configure"
-++#line 11463 "configure"
-+ #include "confdefs.h"
-+ #ifndef __cplusplus
-+ static $ac_kw int static_foo () {return 0; }
-+@@ -11290,16 +11469,16 @@
-+ 
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:11293: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:11472: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11296: \$? = $ac_status" >&5
-++  echo "$as_me:11475: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:11299: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:11478: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11302: \$? = $ac_status" >&5
-++  echo "$as_me:11481: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_cv_c_inline=$ac_kw; break
-+ else
-+@@ -11310,7 +11489,7 @@
-+ done
-+ 
-+ fi
-+-echo "$as_me:11313: result: $ac_cv_c_inline" >&5
-++echo "$as_me:11492: result: $ac_cv_c_inline" >&5
-+ echo "${ECHO_T}$ac_cv_c_inline" >&6
-+ case $ac_cv_c_inline in
-+   inline | yes) ;;
-+@@ -11327,16 +11506,197 @@
-+ 
-+ NCURSES_INLINE=
-+ if test "$ac_cv_c_inline" != no ; then
-+-	cat >>confdefs.h <<\EOF
-+-#define CC_HAS_INLINE_FUNCS 1
-+-EOF
-++  NCURSES_INLINE=inline
-++  if test "$INTEL_COMPILER" = yes
-++  then
-++    :
-++  elif test "$GCC" = yes
-++  then
-++    echo "$as_me:11515: checking if gcc supports options to tune inlining" >&5
-++echo $ECHO_N "checking if gcc supports options to tune inlining... $ECHO_C" >&6
-++if test "${cf_cv_gcc_inline+set}" = set; then
-++  echo $ECHO_N "(cached) $ECHO_C" >&6
-++else
-++
-++      cf_save_CFLAGS=$CFLAGS
-++      CFLAGS="$CFLAGS --param max-inline-insns-single=1200"
-++      cat >conftest.$ac_ext <<_ACEOF
-++#line 11524 "configure"
-++#include "confdefs.h"
-++inline int foo(void) { return 1; }
-++int
-++main ()
-++{
-++${cf_cv_main_return:-return} foo()
-++  ;
-++  return 0;
-++}
-++_ACEOF
-++rm -f conftest.$ac_objext
-++if { (eval echo "$as_me:11536: \"$ac_compile\"") >&5
-++  (eval $ac_compile) 2>&5
-++  ac_status=$?
-++  echo "$as_me:11539: \$? = $ac_status" >&5
-++  (exit $ac_status); } &&
-++         { ac_try='test -s conftest.$ac_objext'
-++  { (eval echo "$as_me:11542: \"$ac_try\"") >&5
-++  (eval $ac_try) 2>&5
-++  ac_status=$?
-++  echo "$as_me:11545: \$? = $ac_status" >&5
-++  (exit $ac_status); }; }; then
-++  cf_cv_gcc_inline=yes
-++else
-++  echo "$as_me: failed program was:" >&5
-++cat conftest.$ac_ext >&5
-++cf_cv_gcc_inline=no
-++fi
-++rm -f conftest.$ac_objext conftest.$ac_ext
-++      CFLAGS=$cf_save_CFLAGS
-++
-++fi
-++echo "$as_me:11557: result: $cf_cv_gcc_inline" >&5
-++echo "${ECHO_T}$cf_cv_gcc_inline" >&6
-++    if test "$cf_cv_gcc_inline" = yes ; then
-++
-++cf_fix_cppflags=no
-++cf_new_cflags=
-++cf_new_cppflags=
-++cf_new_extra_cppflags=
-++
-++for cf_add_cflags in --param max-inline-insns-single=1200
-++do
-++case $cf_fix_cppflags in
-++no)
-++	case $cf_add_cflags in #(vi
-++	-undef|-nostdinc*|-I*|-D*|-U*|-E|-P|-C) #(vi
-++		case $cf_add_cflags in
-++		-D*)
-++			cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'`
-++
-++			test "${cf_add_cflags}" != "${cf_tst_cflags}" \
-++			&& test -z "${cf_tst_cflags}" \
-++			&& cf_fix_cppflags=yes
-++
-++			if test $cf_fix_cppflags = yes ; then
-++				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
-++				continue
-++			elif test "${cf_tst_cflags}" = "\"'" ; then
-++				cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
-++				continue
-++			fi
-++			;;
-++		esac
-++		case "$CPPFLAGS" in
-++		*$cf_add_cflags) #(vi
-++			;;
-++		*) #(vi
-++			cf_new_cppflags="$cf_new_cppflags $cf_add_cflags"
-++			;;
-++		esac
-++		;;
-++	*)
-++		cf_new_cflags="$cf_new_cflags $cf_add_cflags"
-++		;;
-++	esac
-++	;;
-++yes)
-++	cf_new_extra_cppflags="$cf_new_extra_cppflags $cf_add_cflags"
-+ 
-+-	NCURSES_INLINE=inline
-++	cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'`
-++
-++	test "${cf_add_cflags}" != "${cf_tst_cflags}" \
-++	&& test -z "${cf_tst_cflags}" \
-++	&& cf_fix_cppflags=no
-++	;;
-++esac
-++done
-++
-++if test -n "$cf_new_cflags" ; then
-++
-++	CFLAGS="$CFLAGS $cf_new_cflags"
-++fi
-++
-++if test -n "$cf_new_cppflags" ; then
-++
-++	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
-++fi
-++
-++if test -n "$cf_new_extra_cppflags" ; then
-++
-++	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
-++fi
-++
-++    fi
-++  fi
-++fi
-++
-++echo "$as_me:11633: checking for signal global datatype" >&5
-++echo $ECHO_N "checking for signal global datatype... $ECHO_C" >&6
-++if test "${cf_cv_sig_atomic_t+set}" = set; then
-++  echo $ECHO_N "(cached) $ECHO_C" >&6
-++else
-++
-++	for cf_type in \
-++		"volatile sig_atomic_t" \
-++		"sig_atomic_t" \
-++		"int"
-++	do
-++	cat >conftest.$ac_ext <<_ACEOF
-++#line 11645 "configure"
-++#include "confdefs.h"
-++
-++#include <sys/types.h>
-++#include <signal.h>
-++#include <stdio.h>
-++
-++extern $cf_type x;
-++$cf_type x;
-++static void handler(int sig)
-++{
-++	x = 5;
-++}
-++int
-++main ()
-++{
-++signal(SIGINT, handler);
-++		 x = 1
-++  ;
-++  return 0;
-++}
-++_ACEOF
-++rm -f conftest.$ac_objext
-++if { (eval echo "$as_me:11668: \"$ac_compile\"") >&5
-++  (eval $ac_compile) 2>&5
-++  ac_status=$?
-++  echo "$as_me:11671: \$? = $ac_status" >&5
-++  (exit $ac_status); } &&
-++         { ac_try='test -s conftest.$ac_objext'
-++  { (eval echo "$as_me:11674: \"$ac_try\"") >&5
-++  (eval $ac_try) 2>&5
-++  ac_status=$?
-++  echo "$as_me:11677: \$? = $ac_status" >&5
-++  (exit $ac_status); }; }; then
-++  cf_cv_sig_atomic_t=$cf_type
-++else
-++  echo "$as_me: failed program was:" >&5
-++cat conftest.$ac_ext >&5
-++cf_cv_sig_atomic_t=no
-+ fi
-++rm -f conftest.$ac_objext conftest.$ac_ext
-++		test "$cf_cv_sig_atomic_t" != no && break
-++	done
-++
-++fi
-++
-++echo "$as_me:11691: result: $cf_cv_sig_atomic_t" >&5
-++echo "${ECHO_T}$cf_cv_sig_atomic_t" >&6
-++test "$cf_cv_sig_atomic_t" != no && cat >>confdefs.h <<EOF
-++#define SIG_ATOMIC_T $cf_cv_sig_atomic_t
-++EOF
-+ 
-+ if test $NCURSES_CHTYPE = auto ; then
-+ 
-+-echo "$as_me:11339: checking for type of chtype" >&5
-++echo "$as_me:11699: checking for type of chtype" >&5
-+ echo $ECHO_N "checking for type of chtype... $ECHO_C" >&6
-+ if test "${cf_cv_typeof_chtype+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -11346,7 +11706,7 @@
-+   cf_cv_typeof_chtype=long
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 11349 "configure"
-++#line 11709 "configure"
-+ #include "confdefs.h"
-+ 
-+ #define WANT_BITS 31
-+@@ -11381,15 +11741,15 @@
-+ 
-+ _ACEOF
-+ rm -f conftest$ac_exeext
-+-if { (eval echo "$as_me:11384: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:11744: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11387: \$? = $ac_status" >&5
-++  echo "$as_me:11747: \$? = $ac_status" >&5
-+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+-  { (eval echo "$as_me:11389: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:11749: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11392: \$? = $ac_status" >&5
-++  echo "$as_me:11752: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_typeof_chtype=`cat cf_test.out`
-+ else
-+@@ -11404,7 +11764,7 @@
-+ 
-+ fi
-+ 
-+-echo "$as_me:11407: result: $cf_cv_typeof_chtype" >&5
-++echo "$as_me:11767: result: $cf_cv_typeof_chtype" >&5
-+ echo "${ECHO_T}$cf_cv_typeof_chtype" >&6
-+ 
-+ cat >>confdefs.h <<EOF
-+@@ -11414,15 +11774,16 @@
-+ else
-+ 	cf_cv_typeof_chtype=$NCURSES_CHTYPE
-+ fi
-++test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
-+ 
-+-echo "$as_me:11418: checking if unsigned literals are legal" >&5
-++echo "$as_me:11779: checking if unsigned literals are legal" >&5
-+ echo $ECHO_N "checking if unsigned literals are legal... $ECHO_C" >&6
-+ if test "${cf_cv_unsigned_literals+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+ 
-+ 	cat >conftest.$ac_ext <<_ACEOF
-+-#line 11425 "configure"
-++#line 11786 "configure"
-+ #include "confdefs.h"
-+ 
-+ int
-+@@ -11434,16 +11795,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:11437: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:11798: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11440: \$? = $ac_status" >&5
-++  echo "$as_me:11801: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:11443: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:11804: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11446: \$? = $ac_status" >&5
-++  echo "$as_me:11807: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_unsigned_literals=yes
-+ else
-+@@ -11455,29 +11816,30 @@
-+ 
-+ fi
-+ 
-+-echo "$as_me:11458: result: $cf_cv_unsigned_literals" >&5
-++echo "$as_me:11819: result: $cf_cv_unsigned_literals" >&5
-+ echo "${ECHO_T}$cf_cv_unsigned_literals" >&6
-+ 
-+ cf_cv_1UL="1"
-+-test "$cf_cv_unsigned_literals" = yes && cf_cv_1UL="${cf_cv_1UL}U"
-+-test "$cf_cv_typeof_chtype"    = long && cf_cv_1UL="${cf_cv_1UL}L"
-++test ".$cf_cv_unsigned_literals" = .yes && cf_cv_1UL="${cf_cv_1UL}U"
-++test ".$cf_cv_typeof_chtype"    = .long && cf_cv_1UL="${cf_cv_1UL}L"
-+ 
-+ if test $NCURSES_MMASK_T = auto ; then
-+ 	cf_cv_typeof_mmask_t=long
-+ else
-+ 	cf_cv_typeof_mmask_t=$NCURSES_MMASK_T
-+ fi
-++test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
-+ 
-+ ###	Checks for external-data
-+ 
-+-echo "$as_me:11473: checking if external errno is declared" >&5
-++echo "$as_me:11835: checking if external errno is declared" >&5
-+ echo $ECHO_N "checking if external errno is declared... $ECHO_C" >&6
-+ if test "${cf_cv_dcl_errno+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+ 
-+     cat >conftest.$ac_ext <<_ACEOF
-+-#line 11480 "configure"
-++#line 11842 "configure"
-+ #include "confdefs.h"
-+ 
-+ #ifdef HAVE_STDLIB_H
-+@@ -11495,16 +11857,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:11498: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:11860: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11501: \$? = $ac_status" >&5
-++  echo "$as_me:11863: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:11504: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:11866: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11507: \$? = $ac_status" >&5
-++  echo "$as_me:11869: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_dcl_errno=yes
-+ else
-+@@ -11515,7 +11877,7 @@
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+ 
-+ fi
-+-echo "$as_me:11518: result: $cf_cv_dcl_errno" >&5
-++echo "$as_me:11880: result: $cf_cv_dcl_errno" >&5
-+ echo "${ECHO_T}$cf_cv_dcl_errno" >&6
-+ 
-+ if test "$cf_cv_dcl_errno" = no ; then
-+@@ -11530,14 +11892,14 @@
-+ 
-+ # It's possible (for near-UNIX clones) that the data doesn't exist
-+ 
-+-echo "$as_me:11533: checking if external errno exists" >&5
-++echo "$as_me:11895: checking if external errno exists" >&5
-+ echo $ECHO_N "checking if external errno exists... $ECHO_C" >&6
-+ if test "${cf_cv_have_errno+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+ 
-+     cat >conftest.$ac_ext <<_ACEOF
-+-#line 11540 "configure"
-++#line 11902 "configure"
-+ #include "confdefs.h"
-+ 
-+ #undef errno
-+@@ -11552,16 +11914,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:11555: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:11917: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11558: \$? = $ac_status" >&5
-++  echo "$as_me:11920: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:11561: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:11923: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11564: \$? = $ac_status" >&5
-++  echo "$as_me:11926: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_have_errno=yes
-+ else
-+@@ -11572,7 +11934,7 @@
-+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ 
-+ fi
-+-echo "$as_me:11575: result: $cf_cv_have_errno" >&5
-++echo "$as_me:11937: result: $cf_cv_have_errno" >&5
-+ echo "${ECHO_T}$cf_cv_have_errno" >&6
-+ 
-+ if test "$cf_cv_have_errno" = yes ; then
-+@@ -11585,7 +11947,7 @@
-+ 
-+ fi
-+ 
-+-echo "$as_me:11588: checking if data-only library module links" >&5
-++echo "$as_me:11950: checking if data-only library module links" >&5
-+ echo $ECHO_N "checking if data-only library module links... $ECHO_C" >&6
-+ if test "${cf_cv_link_dataonly+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -11593,20 +11955,20 @@
-+ 
-+ 	rm -f conftest.a
-+ 	cat >conftest.$ac_ext <<EOF
-+-#line 11596 "configure"
-++#line 11958 "configure"
-+ int	testdata[3] = { 123, 456, 789 };
-+ EOF
-+-	if { (eval echo "$as_me:11599: \"$ac_compile\"") >&5
-++	if { (eval echo "$as_me:11961: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11602: \$? = $ac_status" >&5
-++  echo "$as_me:11964: \$? = $ac_status" >&5
-+   (exit $ac_status); } ; then
-+ 		mv conftest.o data.o && \
-+ 		( $AR $AR_OPTS conftest.a data.o ) 2>&5 1>/dev/null
-+ 	fi
-+ 	rm -f conftest.$ac_ext data.o
-+ 	cat >conftest.$ac_ext <<EOF
-+-#line 11609 "configure"
-++#line 11971 "configure"
-+ int	testfunc()
-+ {
-+ #if defined(NeXT)
-+@@ -11619,10 +11981,10 @@
-+ #endif
-+ }
-+ EOF
-+-	if { (eval echo "$as_me:11622: \"$ac_compile\"") >&5
-++	if { (eval echo "$as_me:11984: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11625: \$? = $ac_status" >&5
-++  echo "$as_me:11987: \$? = $ac_status" >&5
-+   (exit $ac_status); }; then
-+ 		mv conftest.o func.o && \
-+ 		( $AR $AR_OPTS conftest.a func.o ) 2>&5 1>/dev/null
-+@@ -11635,7 +11997,7 @@
-+   cf_cv_link_dataonly=unknown
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 11638 "configure"
-++#line 12000 "configure"
-+ #include "confdefs.h"
-+ 
-+ 	int main()
-+@@ -11646,15 +12008,15 @@
-+ 
-+ _ACEOF
-+ rm -f conftest$ac_exeext
-+-if { (eval echo "$as_me:11649: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:12011: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11652: \$? = $ac_status" >&5
-++  echo "$as_me:12014: \$? = $ac_status" >&5
-+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+-  { (eval echo "$as_me:11654: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:12016: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11657: \$? = $ac_status" >&5
-++  echo "$as_me:12019: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_link_dataonly=yes
-+ else
-+@@ -11669,7 +12031,7 @@
-+ 
-+ fi
-+ 
-+-echo "$as_me:11672: result: $cf_cv_link_dataonly" >&5
-++echo "$as_me:12034: result: $cf_cv_link_dataonly" >&5
-+ echo "${ECHO_T}$cf_cv_link_dataonly" >&6
-+ 
-+ if test "$cf_cv_link_dataonly" = no ; then
-+@@ -11704,13 +12066,13 @@
-+ 
-+ do
-+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+-echo "$as_me:11707: checking for $ac_func" >&5
-++echo "$as_me:12069: checking for $ac_func" >&5
-+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
-+ if eval "test \"\${$as_ac_var+set}\" = set"; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 11713 "configure"
-++#line 12075 "configure"
-+ #include "confdefs.h"
-+ /* System header to define __stub macros and hopefully few prototypes,
-+     which can conflict with char $ac_func (); below.  */
-+@@ -11741,16 +12103,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:11744: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:12106: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11747: \$? = $ac_status" >&5
-++  echo "$as_me:12109: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:11750: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:12112: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11753: \$? = $ac_status" >&5
-++  echo "$as_me:12115: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   eval "$as_ac_var=yes"
-+ else
-+@@ -11760,7 +12122,7 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ fi
-+-echo "$as_me:11763: result: `eval echo '${'$as_ac_var'}'`" >&5
-++echo "$as_me:12125: result: `eval echo '${'$as_ac_var'}'`" >&5
-+ echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
-+ if test `eval echo '${'$as_ac_var'}'` = yes; then
-+   cat >>confdefs.h <<EOF
-+@@ -11772,14 +12134,14 @@
-+ 
-+ if test "$with_getcap" = "yes" ; then
-+ 
-+-echo "$as_me:11775: checking for terminal-capability database functions" >&5
-++echo "$as_me:12137: checking for terminal-capability database functions" >&5
-+ echo $ECHO_N "checking for terminal-capability database functions... $ECHO_C" >&6
-+ if test "${cf_cv_cgetent+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+ 
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 11782 "configure"
-++#line 12144 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <stdlib.h>
-+@@ -11799,16 +12161,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:11802: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:12164: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11805: \$? = $ac_status" >&5
-++  echo "$as_me:12167: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:11808: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:12170: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11811: \$? = $ac_status" >&5
-++  echo "$as_me:12173: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_cgetent=yes
-+ else
-+@@ -11820,7 +12182,7 @@
-+ 
-+ fi
-+ 
-+-echo "$as_me:11823: result: $cf_cv_cgetent" >&5
-++echo "$as_me:12185: result: $cf_cv_cgetent" >&5
-+ echo "${ECHO_T}$cf_cv_cgetent" >&6
-+ test "$cf_cv_cgetent" = yes && cat >>confdefs.h <<\EOF
-+ #define HAVE_BSD_CGETENT 1
-+@@ -11828,14 +12190,14 @@
-+ 
-+ fi
-+ 
-+-echo "$as_me:11831: checking for isascii" >&5
-++echo "$as_me:12193: checking for isascii" >&5
-+ echo $ECHO_N "checking for isascii... $ECHO_C" >&6
-+ if test "${cf_cv_have_isascii+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+ 
-+ 	cat >conftest.$ac_ext <<_ACEOF
-+-#line 11838 "configure"
-++#line 12200 "configure"
-+ #include "confdefs.h"
-+ #include <ctype.h>
-+ int
-+@@ -11847,16 +12209,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:11850: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:12212: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11853: \$? = $ac_status" >&5
-++  echo "$as_me:12215: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:11856: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:12218: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11859: \$? = $ac_status" >&5
-++  echo "$as_me:12221: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_have_isascii=yes
-+ else
-+@@ -11867,17 +12229,17 @@
-+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ 
-+ fi
-+-echo "$as_me:11870: result: $cf_cv_have_isascii" >&5
-++echo "$as_me:12232: result: $cf_cv_have_isascii" >&5
-+ echo "${ECHO_T}$cf_cv_have_isascii" >&6
-+ test "$cf_cv_have_isascii" = yes && cat >>confdefs.h <<\EOF
-+ #define HAVE_ISASCII 1
-+ EOF
-+ 
-+ if test "$ac_cv_func_sigaction" = yes; then
-+-echo "$as_me:11877: checking whether sigaction needs _POSIX_SOURCE" >&5
-++echo "$as_me:12239: checking whether sigaction needs _POSIX_SOURCE" >&5
-+ echo $ECHO_N "checking whether sigaction needs _POSIX_SOURCE... $ECHO_C" >&6
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 11880 "configure"
-++#line 12242 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <sys/types.h>
-+@@ -11891,16 +12253,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:11894: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:12256: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11897: \$? = $ac_status" >&5
-++  echo "$as_me:12259: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:11900: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:12262: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11903: \$? = $ac_status" >&5
-++  echo "$as_me:12265: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   sigact_bad=no
-+ else
-+@@ -11908,7 +12270,7 @@
-+ cat conftest.$ac_ext >&5
-+ 
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 11911 "configure"
-++#line 12273 "configure"
-+ #include "confdefs.h"
-+ 
-+ #define _POSIX_SOURCE
-+@@ -11923,16 +12285,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:11926: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:12288: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11929: \$? = $ac_status" >&5
-++  echo "$as_me:12291: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:11932: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:12294: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11935: \$? = $ac_status" >&5
-++  echo "$as_me:12297: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   sigact_bad=yes
-+ 	 cat >>confdefs.h <<\EOF
-+@@ -11947,11 +12309,11 @@
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+ fi
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+-echo "$as_me:11950: result: $sigact_bad" >&5
-++echo "$as_me:12312: result: $sigact_bad" >&5
-+ echo "${ECHO_T}$sigact_bad" >&6
-+ fi
-+ 
-+-echo "$as_me:11954: checking if nanosleep really works" >&5
-++echo "$as_me:12316: checking if nanosleep really works" >&5
-+ echo $ECHO_N "checking if nanosleep really works... $ECHO_C" >&6
-+ if test "${cf_cv_func_nanosleep+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -11961,7 +12323,7 @@
-+   cf_cv_func_nanosleep=unknown
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 11964 "configure"
-++#line 12326 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <stdio.h>
-+@@ -11986,15 +12348,15 @@
-+ 
-+ _ACEOF
-+ rm -f conftest$ac_exeext
-+-if { (eval echo "$as_me:11989: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:12351: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11992: \$? = $ac_status" >&5
-++  echo "$as_me:12354: \$? = $ac_status" >&5
-+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+-  { (eval echo "$as_me:11994: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:12356: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:11997: \$? = $ac_status" >&5
-++  echo "$as_me:12359: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_func_nanosleep=yes
-+ else
-+@@ -12006,7 +12368,7 @@
-+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+ fi
-+ fi
-+-echo "$as_me:12009: result: $cf_cv_func_nanosleep" >&5
-++echo "$as_me:12371: result: $cf_cv_func_nanosleep" >&5
-+ echo "${ECHO_T}$cf_cv_func_nanosleep" >&6
-+ 
-+ test "$cf_cv_func_nanosleep" = "yes" && cat >>confdefs.h <<\EOF
-+@@ -12020,23 +12382,23 @@
-+ 
-+ do
-+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+-echo "$as_me:12023: checking for $ac_header" >&5
-++echo "$as_me:12385: checking for $ac_header" >&5
-+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 12029 "configure"
-++#line 12391 "configure"
-+ #include "confdefs.h"
-+ #include <$ac_header>
-+ _ACEOF
-+-if { (eval echo "$as_me:12033: \"$ac_cpp conftest.$ac_ext\"") >&5
-++if { (eval echo "$as_me:12395: \"$ac_cpp conftest.$ac_ext\"") >&5
-+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+   ac_status=$?
-+   egrep -v '^ *\+' conftest.er1 >conftest.err
-+   rm -f conftest.er1
-+   cat conftest.err >&5
-+-  echo "$as_me:12039: \$? = $ac_status" >&5
-++  echo "$as_me:12401: \$? = $ac_status" >&5
-+   (exit $ac_status); } >/dev/null; then
-+   if test -s conftest.err; then
-+     ac_cpp_err=$ac_c_preproc_warn_flag
-+@@ -12055,7 +12417,7 @@
-+ fi
-+ rm -f conftest.err conftest.$ac_ext
-+ fi
-+-echo "$as_me:12058: result: `eval echo '${'$as_ac_Header'}'`" >&5
-++echo "$as_me:12420: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+   cat >>confdefs.h <<EOF
-+@@ -12070,23 +12432,23 @@
-+ for ac_header in sys/termio.h
-+ do
-+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+-echo "$as_me:12073: checking for $ac_header" >&5
-++echo "$as_me:12435: checking for $ac_header" >&5
-+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 12079 "configure"
-++#line 12441 "configure"
-+ #include "confdefs.h"
-+ #include <$ac_header>
-+ _ACEOF
-+-if { (eval echo "$as_me:12083: \"$ac_cpp conftest.$ac_ext\"") >&5
-++if { (eval echo "$as_me:12445: \"$ac_cpp conftest.$ac_ext\"") >&5
-+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+   ac_status=$?
-+   egrep -v '^ *\+' conftest.er1 >conftest.err
-+   rm -f conftest.er1
-+   cat conftest.err >&5
-+-  echo "$as_me:12089: \$? = $ac_status" >&5
-++  echo "$as_me:12451: \$? = $ac_status" >&5
-+   (exit $ac_status); } >/dev/null; then
-+   if test -s conftest.err; then
-+     ac_cpp_err=$ac_c_preproc_warn_flag
-+@@ -12105,7 +12467,7 @@
-+ fi
-+ rm -f conftest.err conftest.$ac_ext
-+ fi
-+-echo "$as_me:12108: result: `eval echo '${'$as_ac_Header'}'`" >&5
-++echo "$as_me:12470: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+   cat >>confdefs.h <<EOF
-+@@ -12123,10 +12485,10 @@
-+ 	*)	termios_bad=maybe ;;
-+ 	esac
-+ 	if test "$termios_bad" = maybe ; then
-+-	echo "$as_me:12126: checking whether termios.h needs _POSIX_SOURCE" >&5
-++	echo "$as_me:12488: checking whether termios.h needs _POSIX_SOURCE" >&5
-+ echo $ECHO_N "checking whether termios.h needs _POSIX_SOURCE... $ECHO_C" >&6
-+ 	cat >conftest.$ac_ext <<_ACEOF
-+-#line 12129 "configure"
-++#line 12491 "configure"
-+ #include "confdefs.h"
-+ #include <termios.h>
-+ int
-+@@ -12138,16 +12500,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:12141: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:12503: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:12144: \$? = $ac_status" >&5
-++  echo "$as_me:12506: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:12147: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:12509: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:12150: \$? = $ac_status" >&5
-++  echo "$as_me:12512: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   termios_bad=no
-+ else
-+@@ -12155,7 +12517,7 @@
-+ cat conftest.$ac_ext >&5
-+ 
-+ 		cat >conftest.$ac_ext <<_ACEOF
-+-#line 12158 "configure"
-++#line 12520 "configure"
-+ #include "confdefs.h"
-+ 
-+ #define _POSIX_SOURCE
-+@@ -12169,16 +12531,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:12172: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:12534: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:12175: \$? = $ac_status" >&5
-++  echo "$as_me:12537: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:12178: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:12540: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:12181: \$? = $ac_status" >&5
-++  echo "$as_me:12543: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   termios_bad=unknown
-+ else
-+@@ -12193,19 +12555,19 @@
-+ 
-+ fi
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+-	echo "$as_me:12196: result: $termios_bad" >&5
-++	echo "$as_me:12558: result: $termios_bad" >&5
-+ echo "${ECHO_T}$termios_bad" >&6
-+ 	fi
-+ fi
-+ 
-+-echo "$as_me:12201: checking for tcgetattr" >&5
-++echo "$as_me:12563: checking for tcgetattr" >&5
-+ echo $ECHO_N "checking for tcgetattr... $ECHO_C" >&6
-+ if test "${cf_cv_have_tcgetattr+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+ 
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 12208 "configure"
-++#line 12570 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <sys/types.h>
-+@@ -12233,16 +12595,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:12236: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:12598: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:12239: \$? = $ac_status" >&5
-++  echo "$as_me:12601: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:12242: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:12604: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:12245: \$? = $ac_status" >&5
-++  echo "$as_me:12607: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_have_tcgetattr=yes
-+ else
-+@@ -12252,20 +12614,20 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ fi
-+-echo "$as_me:12255: result: $cf_cv_have_tcgetattr" >&5
-++echo "$as_me:12617: result: $cf_cv_have_tcgetattr" >&5
-+ echo "${ECHO_T}$cf_cv_have_tcgetattr" >&6
-+ test "$cf_cv_have_tcgetattr" = yes && cat >>confdefs.h <<\EOF
-+ #define HAVE_TCGETATTR 1
-+ EOF
-+ 
-+-echo "$as_me:12261: checking for vsscanf function or workaround" >&5
-++echo "$as_me:12623: checking for vsscanf function or workaround" >&5
-+ echo $ECHO_N "checking for vsscanf function or workaround... $ECHO_C" >&6
-+ if test "${cf_cv_func_vsscanf+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+ 
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 12268 "configure"
-++#line 12630 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <stdarg.h>
-+@@ -12281,16 +12643,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:12284: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:12646: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:12287: \$? = $ac_status" >&5
-++  echo "$as_me:12649: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:12290: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:12652: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:12293: \$? = $ac_status" >&5
-++  echo "$as_me:12655: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_func_vsscanf=vsscanf
-+ else
-+@@ -12298,7 +12660,7 @@
-+ cat conftest.$ac_ext >&5
-+ 
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 12301 "configure"
-++#line 12663 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <stdarg.h>
-+@@ -12320,16 +12682,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:12323: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:12685: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:12326: \$? = $ac_status" >&5
-++  echo "$as_me:12688: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:12329: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:12691: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:12332: \$? = $ac_status" >&5
-++  echo "$as_me:12694: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_func_vsscanf=vfscanf
-+ else
-+@@ -12337,7 +12699,7 @@
-+ cat conftest.$ac_ext >&5
-+ 
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 12340 "configure"
-++#line 12702 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <stdarg.h>
-+@@ -12359,16 +12721,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:12362: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:12724: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:12365: \$? = $ac_status" >&5
-++  echo "$as_me:12727: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:12368: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:12730: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:12371: \$? = $ac_status" >&5
-++  echo "$as_me:12733: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_func_vsscanf=_doscan
-+ else
-+@@ -12383,7 +12745,7 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ fi
-+-echo "$as_me:12386: result: $cf_cv_func_vsscanf" >&5
-++echo "$as_me:12748: result: $cf_cv_func_vsscanf" >&5
-+ echo "${ECHO_T}$cf_cv_func_vsscanf" >&6
-+ 
-+ case $cf_cv_func_vsscanf in #(vi
-+@@ -12401,7 +12763,7 @@
-+ ;;
-+ esac
-+ 
-+-echo "$as_me:12404: checking for working mkstemp" >&5
-++echo "$as_me:12766: checking for working mkstemp" >&5
-+ echo $ECHO_N "checking for working mkstemp... $ECHO_C" >&6
-+ if test "${cf_cv_func_mkstemp+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -12409,13 +12771,13 @@
-+ 
-+ rm -f conftest*
-+ if test "$cross_compiling" = yes; then
-+-  echo "$as_me:12412: checking for mkstemp" >&5
-++  echo "$as_me:12774: checking for mkstemp" >&5
-+ echo $ECHO_N "checking for mkstemp... $ECHO_C" >&6
-+ if test "${ac_cv_func_mkstemp+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 12418 "configure"
-++#line 12780 "configure"
-+ #include "confdefs.h"
-+ /* System header to define __stub macros and hopefully few prototypes,
-+     which can conflict with char mkstemp (); below.  */
-+@@ -12446,16 +12808,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:12449: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:12811: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:12452: \$? = $ac_status" >&5
-++  echo "$as_me:12814: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:12455: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:12817: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:12458: \$? = $ac_status" >&5
-++  echo "$as_me:12820: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_cv_func_mkstemp=yes
-+ else
-+@@ -12465,12 +12827,12 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ fi
-+-echo "$as_me:12468: result: $ac_cv_func_mkstemp" >&5
-++echo "$as_me:12830: result: $ac_cv_func_mkstemp" >&5
-+ echo "${ECHO_T}$ac_cv_func_mkstemp" >&6
-+ 
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 12473 "configure"
-++#line 12835 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <sys/types.h>
-+@@ -12508,15 +12870,15 @@
-+ 
-+ _ACEOF
-+ rm -f conftest$ac_exeext
-+-if { (eval echo "$as_me:12511: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:12873: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:12514: \$? = $ac_status" >&5
-++  echo "$as_me:12876: \$? = $ac_status" >&5
-+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+-  { (eval echo "$as_me:12516: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:12878: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:12519: \$? = $ac_status" >&5
-++  echo "$as_me:12881: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_func_mkstemp=yes
-+ 
-+@@ -12531,7 +12893,7 @@
-+ fi
-+ 
-+ fi
-+-echo "$as_me:12534: result: $cf_cv_func_mkstemp" >&5
-++echo "$as_me:12896: result: $cf_cv_func_mkstemp" >&5
-+ echo "${ECHO_T}$cf_cv_func_mkstemp" >&6
-+ if test "$cf_cv_func_mkstemp" = yes ; then
-+ 	cat >>confdefs.h <<\EOF
-+@@ -12549,21 +12911,21 @@
-+ fi
-+ 
-+ if test "$cross_compiling" = yes ; then
-+-	{ echo "$as_me:12552: WARNING: cross compiling: assume setvbuf params not reversed" >&5
-++	{ echo "$as_me:12914: WARNING: cross compiling: assume setvbuf params not reversed" >&5
-+ echo "$as_me: WARNING: cross compiling: assume setvbuf params not reversed" >&2;}
-+ else
-+-	echo "$as_me:12555: checking whether setvbuf arguments are reversed" >&5
-++	echo "$as_me:12917: checking whether setvbuf arguments are reversed" >&5
-+ echo $ECHO_N "checking whether setvbuf arguments are reversed... $ECHO_C" >&6
-+ if test "${ac_cv_func_setvbuf_reversed+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   if test "$cross_compiling" = yes; then
-+-  { { echo "$as_me:12561: error: cannot run test program while cross compiling" >&5
-++  { { echo "$as_me:12923: error: cannot run test program while cross compiling" >&5
-+ echo "$as_me: error: cannot run test program while cross compiling" >&2;}
-+    { (exit 1); exit 1; }; }
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 12566 "configure"
-++#line 12928 "configure"
-+ #include "confdefs.h"
-+ #include <stdio.h>
-+ /* If setvbuf has the reversed format, exit 0. */
-+@@ -12580,15 +12942,15 @@
-+ }
-+ _ACEOF
-+ rm -f conftest$ac_exeext
-+-if { (eval echo "$as_me:12583: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:12945: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:12586: \$? = $ac_status" >&5
-++  echo "$as_me:12948: \$? = $ac_status" >&5
-+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+-  { (eval echo "$as_me:12588: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:12950: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:12591: \$? = $ac_status" >&5
-++  echo "$as_me:12953: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_cv_func_setvbuf_reversed=yes
-+ else
-+@@ -12601,7 +12963,7 @@
-+ fi
-+ rm -f core core.* *.core
-+ fi
-+-echo "$as_me:12604: result: $ac_cv_func_setvbuf_reversed" >&5
-++echo "$as_me:12966: result: $ac_cv_func_setvbuf_reversed" >&5
-+ echo "${ECHO_T}$ac_cv_func_setvbuf_reversed" >&6
-+ if test $ac_cv_func_setvbuf_reversed = yes; then
-+ 
-+@@ -12612,13 +12974,13 @@
-+ fi
-+ 
-+ fi
-+-echo "$as_me:12615: checking return type of signal handlers" >&5
-++echo "$as_me:12977: checking return type of signal handlers" >&5
-+ echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
-+ if test "${ac_cv_type_signal+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 12621 "configure"
-++#line 12983 "configure"
-+ #include "confdefs.h"
-+ #include <sys/types.h>
-+ #include <signal.h>
-+@@ -12640,16 +13002,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:12643: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:13005: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:12646: \$? = $ac_status" >&5
-++  echo "$as_me:13008: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:12649: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:13011: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:12652: \$? = $ac_status" >&5
-++  echo "$as_me:13014: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_cv_type_signal=void
-+ else
-+@@ -12659,21 +13021,21 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+ fi
-+-echo "$as_me:12662: result: $ac_cv_type_signal" >&5
-++echo "$as_me:13024: result: $ac_cv_type_signal" >&5
-+ echo "${ECHO_T}$ac_cv_type_signal" >&6
-+ 
-+ cat >>confdefs.h <<EOF
-+ #define RETSIGTYPE $ac_cv_type_signal
-+ EOF
-+ 
-+-echo "$as_me:12669: checking for type sigaction_t" >&5
-++echo "$as_me:13031: checking for type sigaction_t" >&5
-+ echo $ECHO_N "checking for type sigaction_t... $ECHO_C" >&6
-+ if test "${cf_cv_type_sigaction+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+ 
-+ 	cat >conftest.$ac_ext <<_ACEOF
-+-#line 12676 "configure"
-++#line 13038 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <signal.h>
-+@@ -12686,16 +13048,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:12689: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:13051: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:12692: \$? = $ac_status" >&5
-++  echo "$as_me:13054: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:12695: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:13057: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:12698: \$? = $ac_status" >&5
-++  echo "$as_me:13060: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_type_sigaction=yes
-+ else
-+@@ -12706,13 +13068,13 @@
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+ fi
-+ 
-+-echo "$as_me:12709: result: $cf_cv_type_sigaction" >&5
-++echo "$as_me:13071: result: $cf_cv_type_sigaction" >&5
-+ echo "${ECHO_T}$cf_cv_type_sigaction" >&6
-+ test "$cf_cv_type_sigaction" = yes && cat >>confdefs.h <<\EOF
-+ #define HAVE_TYPE_SIGACTION 1
-+ EOF
-+ 
-+-echo "$as_me:12715: checking declaration of size-change" >&5
-++echo "$as_me:13077: checking declaration of size-change" >&5
-+ echo $ECHO_N "checking declaration of size-change... $ECHO_C" >&6
-+ if test "${cf_cv_sizechange+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -12727,7 +13089,7 @@
-+     CPPFLAGS="$cf_save_CPPFLAGS"
-+     test -n "$cf_opts" && CPPFLAGS="$CPPFLAGS -D$cf_opts"
-+     cat >conftest.$ac_ext <<_ACEOF
-+-#line 12730 "configure"
-++#line 13092 "configure"
-+ #include "confdefs.h"
-+ #include <sys/types.h>
-+ #ifdef HAVE_TERMIOS_H
-+@@ -12771,16 +13133,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:12774: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:13136: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:12777: \$? = $ac_status" >&5
-++  echo "$as_me:13139: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:12780: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:13142: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:12783: \$? = $ac_status" >&5
-++  echo "$as_me:13145: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_sizechange=yes
-+ else
-+@@ -12799,7 +13161,7 @@
-+ done
-+ 
-+ fi
-+-echo "$as_me:12802: result: $cf_cv_sizechange" >&5
-++echo "$as_me:13164: result: $cf_cv_sizechange" >&5
-+ echo "${ECHO_T}$cf_cv_sizechange" >&6
-+ if test "$cf_cv_sizechange" != no ; then
-+ 	cat >>confdefs.h <<\EOF
-+@@ -12816,13 +13178,13 @@
-+ 	esac
-+ fi
-+ 
-+-echo "$as_me:12819: checking for memmove" >&5
-++echo "$as_me:13181: checking for memmove" >&5
-+ echo $ECHO_N "checking for memmove... $ECHO_C" >&6
-+ if test "${ac_cv_func_memmove+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 12825 "configure"
-++#line 13187 "configure"
-+ #include "confdefs.h"
-+ /* System header to define __stub macros and hopefully few prototypes,
-+     which can conflict with char memmove (); below.  */
-+@@ -12853,16 +13215,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:12856: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:13218: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:12859: \$? = $ac_status" >&5
-++  echo "$as_me:13221: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:12862: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:13224: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:12865: \$? = $ac_status" >&5
-++  echo "$as_me:13227: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_cv_func_memmove=yes
-+ else
-+@@ -12872,19 +13234,19 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ fi
-+-echo "$as_me:12875: result: $ac_cv_func_memmove" >&5
-++echo "$as_me:13237: result: $ac_cv_func_memmove" >&5
-+ echo "${ECHO_T}$ac_cv_func_memmove" >&6
-+ if test $ac_cv_func_memmove = yes; then
-+   :
-+ else
-+ 
-+-echo "$as_me:12881: checking for bcopy" >&5
-++echo "$as_me:13243: checking for bcopy" >&5
-+ echo $ECHO_N "checking for bcopy... $ECHO_C" >&6
-+ if test "${ac_cv_func_bcopy+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 12887 "configure"
-++#line 13249 "configure"
-+ #include "confdefs.h"
-+ /* System header to define __stub macros and hopefully few prototypes,
-+     which can conflict with char bcopy (); below.  */
-+@@ -12915,16 +13277,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:12918: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:13280: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:12921: \$? = $ac_status" >&5
-++  echo "$as_me:13283: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:12924: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:13286: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:12927: \$? = $ac_status" >&5
-++  echo "$as_me:13289: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   ac_cv_func_bcopy=yes
-+ else
-+@@ -12934,11 +13296,11 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ fi
-+-echo "$as_me:12937: result: $ac_cv_func_bcopy" >&5
-++echo "$as_me:13299: result: $ac_cv_func_bcopy" >&5
-+ echo "${ECHO_T}$ac_cv_func_bcopy" >&6
-+ if test $ac_cv_func_bcopy = yes; then
-+ 
-+-	echo "$as_me:12941: checking if bcopy does overlapping moves" >&5
-++	echo "$as_me:13303: checking if bcopy does overlapping moves" >&5
-+ echo $ECHO_N "checking if bcopy does overlapping moves... $ECHO_C" >&6
-+ if test "${cf_cv_good_bcopy+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -12948,7 +13310,7 @@
-+   cf_cv_good_bcopy=unknown
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 12951 "configure"
-++#line 13313 "configure"
-+ #include "confdefs.h"
-+ 
-+ int main() {
-+@@ -12962,15 +13324,15 @@
-+ 
-+ _ACEOF
-+ rm -f conftest$ac_exeext
-+-if { (eval echo "$as_me:12965: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:13327: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:12968: \$? = $ac_status" >&5
-++  echo "$as_me:13330: \$? = $ac_status" >&5
-+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+-  { (eval echo "$as_me:12970: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:13332: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:12973: \$? = $ac_status" >&5
-++  echo "$as_me:13335: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_good_bcopy=yes
-+ else
-+@@ -12983,7 +13345,7 @@
-+ fi
-+ 
-+ fi
-+-echo "$as_me:12986: result: $cf_cv_good_bcopy" >&5
-++echo "$as_me:13348: result: $cf_cv_good_bcopy" >&5
-+ echo "${ECHO_T}$cf_cv_good_bcopy" >&6
-+ 
-+ else
-+@@ -13004,7 +13366,7 @@
-+ 
-+ fi
-+ 
-+-echo "$as_me:13007: checking if poll really works" >&5
-++echo "$as_me:13369: checking if poll really works" >&5
-+ echo $ECHO_N "checking if poll really works... $ECHO_C" >&6
-+ if test "${cf_cv_working_poll+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -13014,7 +13376,7 @@
-+   cf_cv_working_poll=unknown
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 13017 "configure"
-++#line 13379 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <stdio.h>
-+@@ -13035,15 +13397,15 @@
-+ }
-+ _ACEOF
-+ rm -f conftest$ac_exeext
-+-if { (eval echo "$as_me:13038: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:13400: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:13041: \$? = $ac_status" >&5
-++  echo "$as_me:13403: \$? = $ac_status" >&5
-+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+-  { (eval echo "$as_me:13043: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:13405: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:13046: \$? = $ac_status" >&5
-++  echo "$as_me:13408: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_working_poll=yes
-+ else
-+@@ -13055,7 +13417,7 @@
-+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+ fi
-+ fi
-+-echo "$as_me:13058: result: $cf_cv_working_poll" >&5
-++echo "$as_me:13420: result: $cf_cv_working_poll" >&5
-+ echo "${ECHO_T}$cf_cv_working_poll" >&6
-+ test "$cf_cv_working_poll" = "yes" && cat >>confdefs.h <<\EOF
-+ #define HAVE_WORKING_POLL 1
-+@@ -13066,23 +13428,132 @@
-+ #define USE_HASHED_DB 1
-+ EOF
-+ 
-+-echo "$as_me:13069: checking for db.h" >&5
-++case $with_hashed_db in #(vi
-++yes|*able*) #(vi
-++    ;;
-++*)
-++    if test -d "$with_hashed_db" ; then
-++
-++if test -n "$with_hashed_db/include" ; then
-++  for cf_add_incdir in $with_hashed_db/include
-++  do
-++	while test $cf_add_incdir != /usr/include
-++	do
-++	  if test -d $cf_add_incdir
-++	  then
-++		cf_have_incdir=no
-++		if test -n "$CFLAGS$CPPFLAGS" ; then
-++		  # a loop is needed to ensure we can add subdirs of existing dirs
-++		  for cf_test_incdir in $CFLAGS $CPPFLAGS ; do
-++			if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then
-++			  cf_have_incdir=yes; break
-++			fi
-++		  done
-++		fi
-++
-++		if test "$cf_have_incdir" = no ; then
-++          if test "$cf_add_incdir" = /usr/local/include ; then
-++			if test "$GCC" = yes
-++			then
-++			  cf_save_CPPFLAGS=$CPPFLAGS
-++			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
-++			  cat >conftest.$ac_ext <<_ACEOF
-++#line 13461 "configure"
-++#include "confdefs.h"
-++#include <stdio.h>
-++int
-++main ()
-++{
-++printf("Hello")
-++  ;
-++  return 0;
-++}
-++_ACEOF
-++rm -f conftest.$ac_objext
-++if { (eval echo "$as_me:13473: \"$ac_compile\"") >&5
-++  (eval $ac_compile) 2>&5
-++  ac_status=$?
-++  echo "$as_me:13476: \$? = $ac_status" >&5
-++  (exit $ac_status); } &&
-++         { ac_try='test -s conftest.$ac_objext'
-++  { (eval echo "$as_me:13479: \"$ac_try\"") >&5
-++  (eval $ac_try) 2>&5
-++  ac_status=$?
-++  echo "$as_me:13482: \$? = $ac_status" >&5
-++  (exit $ac_status); }; }; then
-++  :
-++else
-++  echo "$as_me: failed program was:" >&5
-++cat conftest.$ac_ext >&5
-++cf_have_incdir=yes
-++fi
-++rm -f conftest.$ac_objext conftest.$ac_ext
-++			  CPPFLAGS=$cf_save_CPPFLAGS
-++			fi
-++		  fi
-++		fi
-++
-++		if test "$cf_have_incdir" = no ; then
-++		  echo "$as_me:13497: result: adding $cf_add_incdir to include-path" >&5
-++echo "${ECHO_T}adding $cf_add_incdir to include-path" >&6
-++		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
-++
-++          cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
-++          test "$cf_top_incdir" = "$cf_add_incdir" && break
-++          cf_add_incdir="$cf_top_incdir"
-++		else
-++		  break
-++		fi
-++	  fi
-++	done
-++  done
-++fi
-++
-++if test -n "$with_hashed_db/lib" ; then
-++  for cf_add_libdir in $with_hashed_db/lib
-++  do
-++    if test $cf_add_libdir = /usr/lib ; then
-++      :
-++    elif test -d $cf_add_libdir
-++    then
-++      cf_have_libdir=no
-++      if test -n "$LDFLAGS$LIBS" ; then
-++        # a loop is needed to ensure we can add subdirs of existing dirs
-++        for cf_test_libdir in $LDFLAGS $LIBS ; do
-++          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-++            cf_have_libdir=yes; break
-++          fi
-++        done
-++      fi
-++      if test "$cf_have_libdir" = no ; then
-++        echo "$as_me:13529: result: adding $cf_add_libdir to library-path" >&5
-++echo "${ECHO_T}adding $cf_add_libdir to library-path" >&6
-++        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-++      fi
-++    fi
-++  done
-++fi
-++
-++    fi
-++esac
-++
-++echo "$as_me:13540: checking for db.h" >&5
-+ echo $ECHO_N "checking for db.h... $ECHO_C" >&6
-+ if test "${ac_cv_header_db_h+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 13075 "configure"
-++#line 13546 "configure"
-+ #include "confdefs.h"
-+ #include <db.h>
-+ _ACEOF
-+-if { (eval echo "$as_me:13079: \"$ac_cpp conftest.$ac_ext\"") >&5
-++if { (eval echo "$as_me:13550: \"$ac_cpp conftest.$ac_ext\"") >&5
-+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+   ac_status=$?
-+   egrep -v '^ *\+' conftest.er1 >conftest.err
-+   rm -f conftest.er1
-+   cat conftest.err >&5
-+-  echo "$as_me:13085: \$? = $ac_status" >&5
-++  echo "$as_me:13556: \$? = $ac_status" >&5
-+   (exit $ac_status); } >/dev/null; then
-+   if test -s conftest.err; then
-+     ac_cpp_err=$ac_c_preproc_warn_flag
-+@@ -13101,11 +13572,11 @@
-+ fi
-+ rm -f conftest.err conftest.$ac_ext
-+ fi
-+-echo "$as_me:13104: result: $ac_cv_header_db_h" >&5
-++echo "$as_me:13575: result: $ac_cv_header_db_h" >&5
-+ echo "${ECHO_T}$ac_cv_header_db_h" >&6
-+ if test $ac_cv_header_db_h = yes; then
-+ 
-+-echo "$as_me:13108: checking for version of db" >&5
-++echo "$as_me:13579: checking for version of db" >&5
-+ echo $ECHO_N "checking for version of db... $ECHO_C" >&6
-+ if test "${cf_cv_hashed_db_version+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -13113,13 +13584,13 @@
-+ 
-+ cf_cv_hashed_db_version=unknown
-+ 
-+-for cf_db_version in 1 2 3 4
-++for cf_db_version in 1 2 3 4 5
-+ do
-+ 
-+-echo "(line 13119) testing checking for db version $cf_db_version ..." 1>&5
-++echo "${as_me-configure}:13590: testing checking for db version $cf_db_version ..." 1>&5
-+ 
-+ 	cat >conftest.$ac_ext <<_ACEOF
-+-#line 13122 "configure"
-++#line 13593 "configure"
-+ #include "confdefs.h"
-+ 
-+ $ac_includes_default
-+@@ -13149,16 +13620,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:13152: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:13623: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:13155: \$? = $ac_status" >&5
-++  echo "$as_me:13626: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:13158: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:13629: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:13161: \$? = $ac_status" >&5
-++  echo "$as_me:13632: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+ 
-+ 	cf_cv_hashed_db_version=$cf_db_version
-+@@ -13172,33 +13643,33 @@
-+ done
-+ 
-+ fi
-+-echo "$as_me:13175: result: $cf_cv_hashed_db_version" >&5
-++echo "$as_me:13646: result: $cf_cv_hashed_db_version" >&5
-+ echo "${ECHO_T}$cf_cv_hashed_db_version" >&6
-+ 
-+ if test "$cf_cv_hashed_db_version" = unknown ; then
-+-	{ { echo "$as_me:13179: error: Cannot determine version of db" >&5
-++	{ { echo "$as_me:13650: error: Cannot determine version of db" >&5
-+ echo "$as_me: error: Cannot determine version of db" >&2;}
-+    { (exit 1); exit 1; }; }
-+ else
-+ 
-+-echo "$as_me:13184: checking for db libraries" >&5
-++echo "$as_me:13655: checking for db libraries" >&5
-+ echo $ECHO_N "checking for db libraries... $ECHO_C" >&6
-+ if test "${cf_cv_hashed_db_libs+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+ 
-+ cf_cv_hashed_db_libs=unknown
-+-for cf_db_libs in db$cf_cv_hashed_db_version db ''
-++for cf_db_libs in db$cf_cv_hashed_db_version db-$cf_cv_hashed_db_version db ''
-+ do
-+ 	cf_save_libs="$LIBS"
-+ 	if test -n "$cf_db_libs"; then
-+ 		LIBS="-l$cf_db_libs $LIBS"
-+ 	fi
-+ 
-+-echo "(line 13198) testing checking for library "$cf_db_libs" ..." 1>&5
-++echo "${as_me-configure}:13669: testing checking for library "$cf_db_libs" ..." 1>&5
-+ 
-+ 	cat >conftest.$ac_ext <<_ACEOF
-+-#line 13201 "configure"
-++#line 13672 "configure"
-+ #include "confdefs.h"
-+ 
-+ $ac_includes_default
-+@@ -13253,16 +13724,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:13256: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:13727: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:13259: \$? = $ac_status" >&5
-++  echo "$as_me:13730: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:13262: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:13733: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:13265: \$? = $ac_status" >&5
-++  echo "$as_me:13736: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+ 
-+ 	if test -n "$cf_db_libs" ; then
-+@@ -13282,11 +13753,11 @@
-+ done
-+ 
-+ fi
-+-echo "$as_me:13285: result: $cf_cv_hashed_db_libs" >&5
-++echo "$as_me:13756: result: $cf_cv_hashed_db_libs" >&5
-+ echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6
-+ 
-+ 	if test "$cf_cv_hashed_db_libs" = unknown ; then
-+-		{ { echo "$as_me:13289: error: Cannot determine library for db" >&5
-++		{ { echo "$as_me:13760: error: Cannot determine library for db" >&5
-+ echo "$as_me: error: Cannot determine library for db" >&2;}
-+    { (exit 1); exit 1; }; }
-+ 	elif test "$cf_cv_hashed_db_libs" != default ; then
-+@@ -13296,7 +13767,7 @@
-+ 
-+ else
-+ 
-+-	{ { echo "$as_me:13299: error: Cannot find db.h" >&5
-++	{ { echo "$as_me:13770: error: Cannot find db.h" >&5
-+ echo "$as_me: error: Cannot find db.h" >&2;}
-+    { (exit 1); exit 1; }; }
-+ 
-+@@ -13311,7 +13782,7 @@
-+ 
-+ # Just in case, check if the C compiler has a bool type.
-+ 
-+-echo "$as_me:13314: checking if we should include stdbool.h" >&5
-++echo "$as_me:13785: checking if we should include stdbool.h" >&5
-+ echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
-+ 
-+ if test "${cf_cv_header_stdbool_h+set}" = set; then
-+@@ -13319,7 +13790,7 @@
-+ else
-+ 
-+ 	cat >conftest.$ac_ext <<_ACEOF
-+-#line 13322 "configure"
-++#line 13793 "configure"
-+ #include "confdefs.h"
-+ 
-+ int
-+@@ -13331,23 +13802,23 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:13334: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:13805: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:13337: \$? = $ac_status" >&5
-++  echo "$as_me:13808: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:13340: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:13811: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:13343: \$? = $ac_status" >&5
-++  echo "$as_me:13814: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_header_stdbool_h=0
-+ else
-+   echo "$as_me: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 13350 "configure"
-++#line 13821 "configure"
-+ #include "confdefs.h"
-+ 
-+ #ifndef __BEOS__
-+@@ -13363,16 +13834,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:13366: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:13837: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:13369: \$? = $ac_status" >&5
-++  echo "$as_me:13840: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:13372: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:13843: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:13375: \$? = $ac_status" >&5
-++  echo "$as_me:13846: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_header_stdbool_h=1
-+ else
-+@@ -13386,13 +13857,13 @@
-+ fi
-+ 
-+ if test "$cf_cv_header_stdbool_h" = 1
-+-then	echo "$as_me:13389: result: yes" >&5
-++then	echo "$as_me:13860: result: yes" >&5
-+ echo "${ECHO_T}yes" >&6
-+-else	echo "$as_me:13391: result: no" >&5
-++else	echo "$as_me:13862: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+ fi
-+ 
-+-echo "$as_me:13395: checking for builtin bool type" >&5
-++echo "$as_me:13866: checking for builtin bool type" >&5
-+ echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
-+ 
-+ if test "${cf_cv_cc_bool_type+set}" = set; then
-+@@ -13400,7 +13871,7 @@
-+ else
-+ 
-+ 	cat >conftest.$ac_ext <<_ACEOF
-+-#line 13403 "configure"
-++#line 13874 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <stdio.h>
-+@@ -13415,16 +13886,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:13418: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:13889: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:13421: \$? = $ac_status" >&5
-++  echo "$as_me:13892: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:13424: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:13895: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:13427: \$? = $ac_status" >&5
-++  echo "$as_me:13898: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_cc_bool_type=1
-+ else
-+@@ -13437,9 +13908,9 @@
-+ fi
-+ 
-+ if test "$cf_cv_cc_bool_type" = 1
-+-then	echo "$as_me:13440: result: yes" >&5
-++then	echo "$as_me:13911: result: yes" >&5
-+ echo "${ECHO_T}yes" >&6
-+-else	echo "$as_me:13442: result: no" >&5
-++else	echo "$as_me:13913: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+ fi
-+ 
-+@@ -13461,7 +13932,7 @@
-+ 	cf_stdcpp_libname=stdc++
-+ 	;;
-+ esac
-+-echo "$as_me:13464: checking for library $cf_stdcpp_libname" >&5
-++echo "$as_me:13935: checking for library $cf_stdcpp_libname" >&5
-+ echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
-+ if test "${cf_cv_libstdcpp+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -13470,7 +13941,7 @@
-+ 	cf_save="$LIBS"
-+ 	LIBS="$LIBS -l$cf_stdcpp_libname"
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 13473 "configure"
-++#line 13944 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <strstream.h>
-+@@ -13486,16 +13957,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:13489: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:13960: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:13492: \$? = $ac_status" >&5
-++  echo "$as_me:13963: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:13495: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:13966: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:13498: \$? = $ac_status" >&5
-++  echo "$as_me:13969: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_libstdcpp=yes
-+ else
-+@@ -13507,12 +13978,12 @@
-+ 	LIBS="$cf_save"
-+ 
-+ fi
-+-echo "$as_me:13510: result: $cf_cv_libstdcpp" >&5
-++echo "$as_me:13981: result: $cf_cv_libstdcpp" >&5
-+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
-+ test "$cf_cv_libstdcpp" = yes && CXXLIBS="$CXXLIBS -l$cf_stdcpp_libname"
-+ fi
-+ 
-+-	echo "$as_me:13515: checking whether $CXX understands -c and -o together" >&5
-++	echo "$as_me:13986: checking whether $CXX understands -c and -o together" >&5
-+ echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
-+ if test "${cf_cv_prog_CXX_c_o+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -13528,15 +13999,15 @@
-+ # We do the test twice because some compilers refuse to overwrite an
-+ # existing .o file with -o, though they will create one.
-+ ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-+-if { (eval echo "$as_me:13531: \"$ac_try\"") >&5
-++if { (eval echo "$as_me:14002: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:13534: \$? = $ac_status" >&5
-++  echo "$as_me:14005: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+-  test -f conftest2.$ac_objext && { (eval echo "$as_me:13536: \"$ac_try\"") >&5
-++  test -f conftest2.$ac_objext && { (eval echo "$as_me:14007: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:13539: \$? = $ac_status" >&5
-++  echo "$as_me:14010: \$? = $ac_status" >&5
-+   (exit $ac_status); };
-+ then
-+   eval cf_cv_prog_CXX_c_o=yes
-+@@ -13547,10 +14018,10 @@
-+ 
-+ fi
-+ if test $cf_cv_prog_CXX_c_o = yes; then
-+-  echo "$as_me:13550: result: yes" >&5
-++  echo "$as_me:14021: result: yes" >&5
-+ echo "${ECHO_T}yes" >&6
-+ else
-+-  echo "$as_me:13553: result: no" >&5
-++  echo "$as_me:14024: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+ fi
-+ 
-+@@ -13570,12 +14041,12 @@
-+ 	;;
-+ esac
-+ if test "$GXX" = yes; then
-+-	echo "$as_me:13573: checking for lib$cf_gpp_libname" >&5
-++	echo "$as_me:14044: checking for lib$cf_gpp_libname" >&5
-+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
-+ 	cf_save="$LIBS"
-+ 	LIBS="$LIBS -l$cf_gpp_libname"
-+ 	cat >conftest.$ac_ext <<_ACEOF
-+-#line 13578 "configure"
-++#line 14049 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <$cf_gpp_libname/builtin.h>
-+@@ -13589,16 +14060,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:13592: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:14063: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:13595: \$? = $ac_status" >&5
-++  echo "$as_me:14066: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:13598: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:14069: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:13601: \$? = $ac_status" >&5
-++  echo "$as_me:14072: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cxx_library=yes
-+ 	 CXXLIBS="$CXXLIBS -l$cf_gpp_libname"
-+@@ -13617,7 +14088,7 @@
-+   echo "$as_me: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 13620 "configure"
-++#line 14091 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <builtin.h>
-+@@ -13631,16 +14102,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:13634: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:14105: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:13637: \$? = $ac_status" >&5
-++  echo "$as_me:14108: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:13640: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:14111: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:13643: \$? = $ac_status" >&5
-++  echo "$as_me:14114: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cxx_library=yes
-+ 	 CXXLIBS="$CXXLIBS -l$cf_gpp_libname"
-+@@ -13657,7 +14128,7 @@
-+ fi
-+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+ 	LIBS="$cf_save"
-+-	echo "$as_me:13660: result: $cf_cxx_library" >&5
-++	echo "$as_me:14131: result: $cf_cxx_library" >&5
-+ echo "${ECHO_T}$cf_cxx_library" >&6
-+ fi
-+ 
-+@@ -13673,7 +14144,7 @@
-+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+ ac_main_return=return
-+-echo "$as_me:13676: checking how to run the C++ preprocessor" >&5
-++echo "$as_me:14147: 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
-+@@ -13690,18 +14161,18 @@
-+   # On the NeXT, cc -E runs the code through the compiler's parser,
-+   # not just through cpp. "Syntax error" is here to catch this case.
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 13693 "configure"
-++#line 14164 "configure"
-+ #include "confdefs.h"
-+ #include <assert.h>
-+                      Syntax error
-+ _ACEOF
-+-if { (eval echo "$as_me:13698: \"$ac_cpp conftest.$ac_ext\"") >&5
-++if { (eval echo "$as_me:14169: \"$ac_cpp conftest.$ac_ext\"") >&5
-+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+   ac_status=$?
-+   egrep -v '^ *\+' conftest.er1 >conftest.err
-+   rm -f conftest.er1
-+   cat conftest.err >&5
-+-  echo "$as_me:13704: \$? = $ac_status" >&5
-++  echo "$as_me:14175: \$? = $ac_status" >&5
-+   (exit $ac_status); } >/dev/null; then
-+   if test -s conftest.err; then
-+     ac_cpp_err=$ac_cxx_preproc_warn_flag
-+@@ -13724,17 +14195,17 @@
-+   # OK, works on sane cases.  Now check whether non-existent headers
-+   # can be detected and how.
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 13727 "configure"
-++#line 14198 "configure"
-+ #include "confdefs.h"
-+ #include <ac_nonexistent.h>
-+ _ACEOF
-+-if { (eval echo "$as_me:13731: \"$ac_cpp conftest.$ac_ext\"") >&5
-++if { (eval echo "$as_me:14202: \"$ac_cpp conftest.$ac_ext\"") >&5
-+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+   ac_status=$?
-+   egrep -v '^ *\+' conftest.er1 >conftest.err
-+   rm -f conftest.er1
-+   cat conftest.err >&5
-+-  echo "$as_me:13737: \$? = $ac_status" >&5
-++  echo "$as_me:14208: \$? = $ac_status" >&5
-+   (exit $ac_status); } >/dev/null; then
-+   if test -s conftest.err; then
-+     ac_cpp_err=$ac_cxx_preproc_warn_flag
-+@@ -13771,7 +14242,7 @@
-+ else
-+   ac_cv_prog_CXXCPP=$CXXCPP
-+ fi
-+-echo "$as_me:13774: result: $CXXCPP" >&5
-++echo "$as_me:14245: result: $CXXCPP" >&5
-+ echo "${ECHO_T}$CXXCPP" >&6
-+ ac_preproc_ok=false
-+ for ac_cxx_preproc_warn_flag in '' yes
-+@@ -13781,18 +14252,18 @@
-+   # On the NeXT, cc -E runs the code through the compiler's parser,
-+   # not just through cpp. "Syntax error" is here to catch this case.
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 13784 "configure"
-++#line 14255 "configure"
-+ #include "confdefs.h"
-+ #include <assert.h>
-+                      Syntax error
-+ _ACEOF
-+-if { (eval echo "$as_me:13789: \"$ac_cpp conftest.$ac_ext\"") >&5
-++if { (eval echo "$as_me:14260: \"$ac_cpp conftest.$ac_ext\"") >&5
-+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+   ac_status=$?
-+   egrep -v '^ *\+' conftest.er1 >conftest.err
-+   rm -f conftest.er1
-+   cat conftest.err >&5
-+-  echo "$as_me:13795: \$? = $ac_status" >&5
-++  echo "$as_me:14266: \$? = $ac_status" >&5
-+   (exit $ac_status); } >/dev/null; then
-+   if test -s conftest.err; then
-+     ac_cpp_err=$ac_cxx_preproc_warn_flag
-+@@ -13815,17 +14286,17 @@
-+   # OK, works on sane cases.  Now check whether non-existent headers
-+   # can be detected and how.
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 13818 "configure"
-++#line 14289 "configure"
-+ #include "confdefs.h"
-+ #include <ac_nonexistent.h>
-+ _ACEOF
-+-if { (eval echo "$as_me:13822: \"$ac_cpp conftest.$ac_ext\"") >&5
-++if { (eval echo "$as_me:14293: \"$ac_cpp conftest.$ac_ext\"") >&5
-+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+   ac_status=$?
-+   egrep -v '^ *\+' conftest.er1 >conftest.err
-+   rm -f conftest.er1
-+   cat conftest.err >&5
-+-  echo "$as_me:13828: \$? = $ac_status" >&5
-++  echo "$as_me:14299: \$? = $ac_status" >&5
-+   (exit $ac_status); } >/dev/null; then
-+   if test -s conftest.err; then
-+     ac_cpp_err=$ac_cxx_preproc_warn_flag
-+@@ -13853,7 +14324,7 @@
-+ if $ac_preproc_ok; then
-+   :
-+ else
-+-  { { echo "$as_me:13856: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
-++  { { echo "$as_me:14327: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
-+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
-+    { (exit 1); exit 1; }; }
-+ fi
-+@@ -13865,26 +14336,26 @@
-+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+ ac_main_return=return
-+ 
-+-for ac_header in typeinfo
-++for ac_header in iostream typeinfo
-+ do
-+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+-echo "$as_me:13871: checking for $ac_header" >&5
-++echo "$as_me:14342: checking for $ac_header" >&5
-+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 13877 "configure"
-++#line 14348 "configure"
-+ #include "confdefs.h"
-+ #include <$ac_header>
-+ _ACEOF
-+-if { (eval echo "$as_me:13881: \"$ac_cpp conftest.$ac_ext\"") >&5
-++if { (eval echo "$as_me:14352: \"$ac_cpp conftest.$ac_ext\"") >&5
-+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+   ac_status=$?
-+   egrep -v '^ *\+' conftest.er1 >conftest.err
-+   rm -f conftest.er1
-+   cat conftest.err >&5
-+-  echo "$as_me:13887: \$? = $ac_status" >&5
-++  echo "$as_me:14358: \$? = $ac_status" >&5
-+   (exit $ac_status); } >/dev/null; then
-+   if test -s conftest.err; then
-+     ac_cpp_err=$ac_cxx_preproc_warn_flag
-+@@ -13903,7 +14374,7 @@
-+ fi
-+ rm -f conftest.err conftest.$ac_ext
-+ fi
-+-echo "$as_me:13906: result: `eval echo '${'$as_ac_Header'}'`" >&5
-++echo "$as_me:14377: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+   cat >>confdefs.h <<EOF
-+@@ -13913,7 +14384,7 @@
-+ fi
-+ done
-+ 
-+-echo "$as_me:13916: checking if we should include stdbool.h" >&5
-++echo "$as_me:14387: checking if we should include stdbool.h" >&5
-+ echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
-+ 
-+ if test "${cf_cv_header_stdbool_h+set}" = set; then
-+@@ -13921,7 +14392,7 @@
-+ else
-+ 
-+ 	cat >conftest.$ac_ext <<_ACEOF
-+-#line 13924 "configure"
-++#line 14395 "configure"
-+ #include "confdefs.h"
-+ 
-+ int
-+@@ -13933,23 +14404,23 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:13936: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:14407: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:13939: \$? = $ac_status" >&5
-++  echo "$as_me:14410: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:13942: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:14413: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:13945: \$? = $ac_status" >&5
-++  echo "$as_me:14416: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_header_stdbool_h=0
-+ else
-+   echo "$as_me: failed program was:" >&5
-+ cat conftest.$ac_ext >&5
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 13952 "configure"
-++#line 14423 "configure"
-+ #include "confdefs.h"
-+ 
-+ #ifndef __BEOS__
-+@@ -13965,16 +14436,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:13968: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:14439: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:13971: \$? = $ac_status" >&5
-++  echo "$as_me:14442: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:13974: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:14445: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:13977: \$? = $ac_status" >&5
-++  echo "$as_me:14448: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_header_stdbool_h=1
-+ else
-+@@ -13988,13 +14459,13 @@
-+ fi
-+ 
-+ if test "$cf_cv_header_stdbool_h" = 1
-+-then	echo "$as_me:13991: result: yes" >&5
-++then	echo "$as_me:14462: result: yes" >&5
-+ echo "${ECHO_T}yes" >&6
-+-else	echo "$as_me:13993: result: no" >&5
-++else	echo "$as_me:14464: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+ fi
-+ 
-+-echo "$as_me:13997: checking for builtin bool type" >&5
-++echo "$as_me:14468: checking for builtin bool type" >&5
-+ echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
-+ 
-+ if test "${cf_cv_builtin_bool+set}" = set; then
-+@@ -14002,7 +14473,7 @@
-+ else
-+ 
-+ 	cat >conftest.$ac_ext <<_ACEOF
-+-#line 14005 "configure"
-++#line 14476 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <stdio.h>
-+@@ -14017,16 +14488,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:14020: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:14491: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:14023: \$? = $ac_status" >&5
-++  echo "$as_me:14494: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:14026: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:14497: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:14029: \$? = $ac_status" >&5
-++  echo "$as_me:14500: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_builtin_bool=1
-+ else
-+@@ -14039,13 +14510,13 @@
-+ fi
-+ 
-+ if test "$cf_cv_builtin_bool" = 1
-+-then	echo "$as_me:14042: result: yes" >&5
-++then	echo "$as_me:14513: result: yes" >&5
-+ echo "${ECHO_T}yes" >&6
-+-else	echo "$as_me:14044: result: no" >&5
-++else	echo "$as_me:14515: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+ fi
-+ 
-+-echo "$as_me:14048: checking for size of bool" >&5
-++echo "$as_me:14519: checking for size of bool" >&5
-+ echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
-+ if test "${cf_cv_type_of_bool+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -14056,7 +14527,7 @@
-+   cf_cv_type_of_bool=unknown
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 14059 "configure"
-++#line 14530 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <stdlib.h>
-+@@ -14098,15 +14569,15 @@
-+ 
-+ _ACEOF
-+ rm -f conftest$ac_exeext
-+-if { (eval echo "$as_me:14101: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:14572: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:14104: \$? = $ac_status" >&5
-++  echo "$as_me:14575: \$? = $ac_status" >&5
-+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+-  { (eval echo "$as_me:14106: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:14577: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:14109: \$? = $ac_status" >&5
-++  echo "$as_me:14580: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_type_of_bool=`cat cf_test.out`
-+ 		 if test -z "$cf_cv_type_of_bool"; then
-+@@ -14124,18 +14595,18 @@
-+ fi
-+ 
-+ 	rm -f cf_test.out
-+-echo "$as_me:14127: result: $cf_cv_type_of_bool" >&5
-++echo "$as_me:14598: result: $cf_cv_type_of_bool" >&5
-+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
-+ if test "$cf_cv_type_of_bool" = unknown ; then
-+ 	case .$NCURSES_BOOL in #(vi
-+ 	.auto|.) NCURSES_BOOL=unsigned;;
-+ 	esac
-+-	{ echo "$as_me:14133: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-++	{ echo "$as_me:14604: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+ echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
-+ 	cf_cv_type_of_bool=$NCURSES_BOOL
-+ fi
-+ 
-+-echo "$as_me:14138: checking for special defines needed for etip.h" >&5
-++echo "$as_me:14609: checking for special defines needed for etip.h" >&5
-+ echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
-+ cf_save_CXXFLAGS="$CXXFLAGS"
-+ cf_result="none"
-+@@ -14147,7 +14618,7 @@
-+ 	test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
-+ 	test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
-+ cat >conftest.$ac_ext <<_ACEOF
-+-#line 14150 "configure"
-++#line 14621 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <etip.h.in>
-+@@ -14161,16 +14632,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:14164: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:14635: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:14167: \$? = $ac_status" >&5
-++  echo "$as_me:14638: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:14170: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:14641: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:14173: \$? = $ac_status" >&5
-++  echo "$as_me:14644: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+ 
-+ 	test -n "$cf_math" && cat >>confdefs.h <<EOF
-+@@ -14191,12 +14662,12 @@
-+ rm -f conftest.$ac_objext conftest.$ac_ext
-+ done
-+ done
-+-echo "$as_me:14194: result: $cf_result" >&5
-++echo "$as_me:14665: result: $cf_result" >&5
-+ echo "${ECHO_T}$cf_result" >&6
-+ CXXFLAGS="$cf_save_CXXFLAGS"
-+ 
-+ if test -n "$CXX"; then
-+-echo "$as_me:14199: checking if $CXX accepts parameter initialization" >&5
-++echo "$as_me:14670: checking if $CXX accepts parameter initialization" >&5
-+ echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
-+ if test "${cf_cv_cpp_param_init+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -14213,7 +14684,7 @@
-+   cf_cv_cpp_param_init=unknown
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 14216 "configure"
-++#line 14687 "configure"
-+ #include "confdefs.h"
-+ 
-+ class TEST {
-+@@ -14232,15 +14703,15 @@
-+ 
-+ _ACEOF
-+ rm -f conftest$ac_exeext
-+-if { (eval echo "$as_me:14235: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:14706: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:14238: \$? = $ac_status" >&5
-++  echo "$as_me:14709: \$? = $ac_status" >&5
-+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+-  { (eval echo "$as_me:14240: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:14711: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:14243: \$? = $ac_status" >&5
-++  echo "$as_me:14714: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_cpp_param_init=yes
-+ else
-+@@ -14259,7 +14730,7 @@
-+ ac_main_return=return
-+ 
-+ fi
-+-echo "$as_me:14262: result: $cf_cv_cpp_param_init" >&5
-++echo "$as_me:14733: result: $cf_cv_cpp_param_init" >&5
-+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
-+ fi
-+ test "$cf_cv_cpp_param_init" = yes && cat >>confdefs.h <<\EOF
-+@@ -14268,7 +14739,7 @@
-+ 
-+ if test -n "$CXX"; then
-+ 
-+-echo "$as_me:14271: checking if $CXX accepts static_cast" >&5
-++echo "$as_me:14742: checking if $CXX accepts static_cast" >&5
-+ echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
-+ if test "${cf_cv_cpp_static_cast+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -14282,7 +14753,7 @@
-+ ac_main_return=return
-+ 
-+ 	cat >conftest.$ac_ext <<_ACEOF
-+-#line 14285 "configure"
-++#line 14756 "configure"
-+ #include "confdefs.h"
-+ 
-+ class NCursesPanel
-+@@ -14326,16 +14797,16 @@
-+ }
-+ _ACEOF
-+ rm -f conftest.$ac_objext
-+-if { (eval echo "$as_me:14329: \"$ac_compile\"") >&5
-++if { (eval echo "$as_me:14800: \"$ac_compile\"") >&5
-+   (eval $ac_compile) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:14332: \$? = $ac_status" >&5
-++  echo "$as_me:14803: \$? = $ac_status" >&5
-+   (exit $ac_status); } &&
-+          { ac_try='test -s conftest.$ac_objext'
-+-  { (eval echo "$as_me:14335: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:14806: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:14338: \$? = $ac_status" >&5
-++  echo "$as_me:14809: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_cpp_static_cast=yes
-+ else
-+@@ -14353,7 +14824,7 @@
-+ ac_main_return=return
-+ 
-+ fi
-+-echo "$as_me:14356: result: $cf_cv_cpp_static_cast" >&5
-++echo "$as_me:14827: result: $cf_cv_cpp_static_cast" >&5
-+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
-+ 
-+ fi
-+@@ -14362,189 +14833,6 @@
-+ #define CPP_HAS_STATIC_CAST 1
-+ EOF
-+ 
-+-if test -n "$CXX"; then
-+-
-+-ac_ext=cc
-+-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
-+-ac_main_return=return
-+-
-+-for ac_header in strstream.h
-+-do
-+-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+-echo "$as_me:14377: checking for $ac_header" >&5
-+-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-+-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+-  echo $ECHO_N "(cached) $ECHO_C" >&6
-+-else
-+-  cat >conftest.$ac_ext <<_ACEOF
-+-#line 14383 "configure"
-+-#include "confdefs.h"
-+-#include <$ac_header>
-+-_ACEOF
-+-if { (eval echo "$as_me:14387: \"$ac_cpp conftest.$ac_ext\"") >&5
-+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+-  ac_status=$?
-+-  egrep -v '^ *\+' conftest.er1 >conftest.err
-+-  rm -f conftest.er1
-+-  cat conftest.err >&5
-+-  echo "$as_me:14393: \$? = $ac_status" >&5
-+-  (exit $ac_status); } >/dev/null; then
-+-  if test -s conftest.err; then
-+-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-+-  else
-+-    ac_cpp_err=
-+-  fi
-+-else
-+-  ac_cpp_err=yes
-+-fi
-+-if test -z "$ac_cpp_err"; then
-+-  eval "$as_ac_Header=yes"
-+-else
-+-  echo "$as_me: failed program was:" >&5
-+-  cat conftest.$ac_ext >&5
-+-  eval "$as_ac_Header=no"
-+-fi
-+-rm -f conftest.err conftest.$ac_ext
-+-fi
-+-echo "$as_me:14412: result: `eval echo '${'$as_ac_Header'}'`" >&5
-+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+-  cat >>confdefs.h <<EOF
-+-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+-EOF
-+-
-+-fi
-+-done
-+-
-+-echo "$as_me:14422: checking if $CXX supports vscan function" >&5
-+-echo $ECHO_N "checking if $CXX supports vscan function... $ECHO_C" >&6
-+-if test "${cf_cv_cpp_vscan_func+set}" = set; then
-+-  echo $ECHO_N "(cached) $ECHO_C" >&6
-+-else
-+-
-+-	for cf_vscan_func in strstream strstream_cast stdio
-+-	do
-+-	case $cf_vscan_func in #(vi
-+-	stdio)		cf_vscan_defs=USE_STDIO_VSCAN ;; #(vi
-+-	strstream)	cf_vscan_defs=USE_STRSTREAM_VSCAN ;;
-+-	strstream_cast)	cf_vscan_defs=USE_STRSTREAM_VSCAN_CAST ;;
-+-	esac
-+-	cat >conftest.$ac_ext <<_ACEOF
-+-#line 14436 "configure"
-+-#include "confdefs.h"
-+-
-+-#include <stdio.h>
-+-#include <stdarg.h>
-+-#define $cf_vscan_defs 1
-+-#if defined(USE_STDIO_VSCAN)
-+-#elif defined(HAVE_STRSTREAM_H) && defined(USE_STRSTREAM_VSCAN)
-+-#include <strstream.h>
-+-#endif
-+-
-+-int scanw(const char* fmt, ...)
-+-{
-+-    int result = -1;
-+-    char buf[BUFSIZ];
-+-
-+-    va_list args;
-+-    va_start(args, fmt);
-+-#if defined(USE_STDIO_VSCAN)
-+-    if (::vsscanf(buf, fmt, args) != -1)
-+-	result = 0;
-+-#elif defined(USE_STRSTREAM_VSCAN)
-+-    strstreambuf ss(buf, sizeof(buf));
-+-    if (ss.vscan(fmt, args) != -1)
-+-	result = 0;
-+-#elif defined(USE_STRSTREAM_VSCAN_CAST)
-+-    strstreambuf ss(buf, sizeof(buf));
-+-    if (ss.vscan(fmt, (_IO_va_list)args) != -1)
-+-	result = 0;
-+-#else
-+-#error case $cf_vscan_func failed
-+-#endif
-+-    va_end(args);
-+-    return result;
-+-}
-+-
-+-int
-+-main ()
-+-{
-+-int tmp, foo = scanw("%d", &tmp)
-+-  ;
-+-  return 0;
-+-}
-+-_ACEOF
-+-rm -f conftest.$ac_objext conftest$ac_exeext
-+-if { (eval echo "$as_me:14481: \"$ac_link\"") >&5
-+-  (eval $ac_link) 2>&5
-+-  ac_status=$?
-+-  echo "$as_me:14484: \$? = $ac_status" >&5
-+-  (exit $ac_status); } &&
-+-         { ac_try='test -s conftest$ac_exeext'
-+-  { (eval echo "$as_me:14487: \"$ac_try\"") >&5
-+-  (eval $ac_try) 2>&5
-+-  ac_status=$?
-+-  echo "$as_me:14490: \$? = $ac_status" >&5
-+-  (exit $ac_status); }; }; then
-+-  cf_cv_cpp_vscan_func=$cf_vscan_func; break
-+-else
-+-  echo "$as_me: failed program was:" >&5
-+-cat conftest.$ac_ext >&5
-+-cf_cv_cpp_vscan_func=no
-+-fi
-+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-+-	test "$cf_cv_cpp_vscan_func" != no && break
-+-	done
-+-
-+-fi
-+-echo "$as_me:14503: result: $cf_cv_cpp_vscan_func" >&5
-+-echo "${ECHO_T}$cf_cv_cpp_vscan_func" >&6
-+-
-+-ac_ext=cc
-+-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
-+-ac_main_return=return
-+-
-+-fi
-+-
-+-case $cf_cv_cpp_vscan_func in #(vi
-+-stdio) #(vi
-+-	cat >>confdefs.h <<\EOF
-+-#define CPP_HAS_VSCAN_FUNC 1
-+-EOF
-+-
-+-	cat >>confdefs.h <<\EOF
-+-#define USE_STDIO_VSCAN 1
-+-EOF
-+-
-+-	;;
-+-strstream)
-+-	cat >>confdefs.h <<\EOF
-+-#define CPP_HAS_VSCAN_FUNC 1
-+-EOF
-+-
-+-	cat >>confdefs.h <<\EOF
-+-#define USE_STRSTREAM_VSCAN 1
-+-EOF
-+-
-+-	;;
-+-strstream_cast)
-+-	cat >>confdefs.h <<\EOF
-+-#define CPP_HAS_VSCAN_FUNC 1
-+-EOF
-+-
-+-	cat >>confdefs.h <<\EOF
-+-#define USE_STRSTREAM_VSCAN_CAST 1
-+-EOF
-+-
-+-	;;
-+-esac
-+-
-+ 	CXX_AR='$(AR)'
-+ 	CXX_AR_OPTS='$(AR_OPTS)'
-+ 	case $cf_cv_system_name in #(vi
-+@@ -14584,7 +14872,7 @@
-+ 	else
-+ 		if test "$cf_cv_header_stdbool_h" = 1 ; then
-+ 
-+-echo "$as_me:14587: checking for size of bool" >&5
-++echo "$as_me:14875: checking for size of bool" >&5
-+ echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
-+ if test "${cf_cv_type_of_bool+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -14595,7 +14883,7 @@
-+   cf_cv_type_of_bool=unknown
-+ else
-+   cat >conftest.$ac_ext <<_ACEOF
-+-#line 14598 "configure"
-++#line 14886 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <stdlib.h>
-+@@ -14637,15 +14925,15 @@
-+ 
-+ _ACEOF
-+ rm -f conftest$ac_exeext
-+-if { (eval echo "$as_me:14640: \"$ac_link\"") >&5
-++if { (eval echo "$as_me:14928: \"$ac_link\"") >&5
-+   (eval $ac_link) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:14643: \$? = $ac_status" >&5
-++  echo "$as_me:14931: \$? = $ac_status" >&5
-+   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+-  { (eval echo "$as_me:14645: \"$ac_try\"") >&5
-++  { (eval echo "$as_me:14933: \"$ac_try\"") >&5
-+   (eval $ac_try) 2>&5
-+   ac_status=$?
-+-  echo "$as_me:14648: \$? = $ac_status" >&5
-++  echo "$as_me:14936: \$? = $ac_status" >&5
-+   (exit $ac_status); }; }; then
-+   cf_cv_type_of_bool=`cat cf_test.out`
-+ 		 if test -z "$cf_cv_type_of_bool"; then
-+@@ -14663,25 +14951,25 @@
-+ fi
-+ 
-+ 	rm -f cf_test.out
-+-echo "$as_me:14666: result: $cf_cv_type_of_bool" >&5
-++echo "$as_me:14954: result: $cf_cv_type_of_bool" >&5
-+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
-+ if test "$cf_cv_type_of_bool" = unknown ; then
-+ 	case .$NCURSES_BOOL in #(vi
-+ 	.auto|.) NCURSES_BOOL=unsigned;;
-+ 	esac
-+-	{ echo "$as_me:14672: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-++	{ echo "$as_me:14960: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
-+ echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
-+ 	cf_cv_type_of_bool=$NCURSES_BOOL
-+ fi
-+ 
-+ 		else
-+-			echo "$as_me:14678: checking for fallback type of bool" >&5
-++			echo "$as_me:14966: checking for fallback type of bool" >&5
-+ echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
-+ 			case "$host_cpu" in #(vi
-+ 			i?86)	cf_cv_type_of_bool=char	;; #(vi
-+ 			*)	cf_cv_type_of_bool=int	;;
-+ 			esac
-+-			echo "$as_me:14684: result: $cf_cv_type_of_bool" >&5
-++			echo "$as_me:14972: result: $cf_cv_type_of_bool" >&5
-+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
-+ 		fi
-+ 	fi
-+@@ -14707,11 +14995,20 @@
-+ fi
-+ 
-+ if test -f "${srcdir}/Ada95/Makefile.in" ; then
-++
-++if test "$cf_with_ada" != "no" ; then
-++    if test "$with_libtool" != "no"; then
-++	{ echo "$as_me:15001: WARNING: libtool does not support Ada - disabling feature" >&5
-++echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
-++	cf_with_ada=no
-++    fi
-++fi
-++
-+ if test "$cf_with_ada" != "no" ; then
-+ cf_ada_make=gnatmake
-+ # Extract the first word of "$cf_ada_make", so it can be a program name with args.
-+ set dummy $cf_ada_make; ac_word=$2
-+-echo "$as_me:14714: checking for $ac_word" >&5
-++echo "$as_me:15011: checking for $ac_word" >&5
-+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+ if test "${ac_cv_prog_gnat_exists+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -14726,7 +15023,7 @@
-+   test -z "$ac_dir" && ac_dir=.
-+   $as_executable_p "$ac_dir/$ac_word" || continue
-+ ac_cv_prog_gnat_exists="yes"
-+-echo "$as_me:14729: found $ac_dir/$ac_word" >&5
-++echo "$as_me:15026: found $ac_dir/$ac_word" >&5
-+ break
-+ done
-+ 
-+@@ -14735,10 +15032,10 @@
-+ fi
-+ gnat_exists=$ac_cv_prog_gnat_exists
-+ if test -n "$gnat_exists"; then
-+-  echo "$as_me:14738: result: $gnat_exists" >&5
-++  echo "$as_me:15035: result: $gnat_exists" >&5
-+ echo "${ECHO_T}$gnat_exists" >&6
-+ else
-+-  echo "$as_me:14741: result: no" >&5
-++  echo "$as_me:15038: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+ fi
-+ 
-+@@ -14746,11 +15043,11 @@
-+    cf_ada_make=
-+ else
-+ 
-+-echo "$as_me:14749: checking for gnat version" >&5
-++echo "$as_me:15046: checking for gnat version" >&5
-+ echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
-+ cf_gnat_version=`${cf_ada_make-gnatmake} -v 2>&1 | grep '[0-9].[0-9][0-9]*' |\
-+   sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
-+-echo "$as_me:14753: result: $cf_gnat_version" >&5
-++echo "$as_me:15050: result: $cf_gnat_version" >&5
-+ echo "${ECHO_T}$cf_gnat_version" >&6
-+ 
-+ case $cf_gnat_version in
-+@@ -14773,7 +15070,7 @@
-+ 
-+    # Extract the first word of "m4", so it can be a program name with args.
-+ set dummy m4; ac_word=$2
-+-echo "$as_me:14776: checking for $ac_word" >&5
-++echo "$as_me:15073: checking for $ac_word" >&5
-+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+ if test "${ac_cv_prog_M4_exists+set}" = set; then
-+   echo $ECHO_N "(cached) $ECHO_C" >&6
-+@@ -14788,7 +15085,7 @@
-+   test -z "$ac_dir" && ac_dir=.
-+   $as_executable_p "$ac_dir/$ac_word" || continue
-+ ac_cv_prog_M4_exists="yes"
-+-echo "$as_me:14791: found $ac_dir/$ac_word" >&5
-++echo "$as_me:15088: found $ac_dir/$ac_word" >&5
-+ break
-+ done
-+ 
-+@@ -14797,10 +15094,10 @@
-+ fi
-+ M4_exists=$ac_cv_prog_M4_exists
-+ if test -n "$M4_exists"; then
-+-  echo "$as_me:14800: result: $M4_exists" >&5
-++  echo "$as_me:15097: result: $M4_exists" >&5
-+ echo "${ECHO_T}$M4_exists" >&6
-+ else
-+-  echo "$as_me:14803: result: no" >&5
-++  echo "$as_me:15100: result: no" >&5
-+ echo "${ECHO_T}no" >&6
-+ fi
-+ 
-+@@ -14809,7 +15106,7 @@
-+       echo Ada95 binding required program m4 not found. Ada95 binding disabled.
-+    fi
-+    if test "$cf_cv_prog_gnat_correct" = yes; then
-+-      echo "$as_me:14812: checking if GNAT works" >&5
-++      echo "$as_me:15109: checking if GNAT works" >&5
-+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
-+ 
-+ rm -f conftest*
-+@@ -14837,14 +15134,14 @@
-+ fi
-+ rm -f conftest*
-+ 
-+-      echo "$as_me:14840: result: $cf_cv_prog_gnat_correct" >&5
-++      echo "$as_me:15137: result: $cf_cv_prog_gnat_correct" >&5
-+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
-+    fi
-+ fi
-+ if test	"$cf_cv_prog_gnat_correct" = yes; then
-+    ADAFLAGS="-O3 -gnatpn $ADAFLAGS"
-+ 
-+-   echo "$as_me:14847: checking if GNAT pragma Unreferenced works" >&5
-++   echo "$as_me:15144: checking if GNAT pragma Unreferenced works" >&5
-+ echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6
-+ 
-+ rm -f conftest*
-+@@ -14871,7 +15168,7 @@
-+ fi
-+ rm -f conftest*
-+ 
-+-   echo "$as_me:14874: result: $cf_cv_pragma_unreferenced" >&5
-++   echo "$as_me:15171: result: $cf_cv_pragma_unreferenced" >&5
-+ echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6
-+ 
-+    # if the pragma is supported, use it (needed in the Trace code).
-+@@ -14897,7 +15194,8 @@
-+ 
-+ else
-+   withval="${ADA_INCLUDE-$prefix/lib/ada/adainclude}"
-+-fi;
-++fi; if test -n "$prefix/lib/ada/adainclude" ; then
-++
-+ if test "x$prefix" != xNONE; then
-+   cf_path_syntax="$prefix"
-+ else
-+@@ -14923,12 +15221,13 @@
-+   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
-+   ;;
-+ *)
-+-  { { echo "$as_me:14926: error: expected a pathname, not \"$withval\"" >&5
-++  { { echo "$as_me:15224: error: expected a pathname, not \"$withval\"" >&5
-+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-+    { (exit 1); exit 1; }; }
-+   ;;
-+ esac
-+ 
-++fi
-+ ADA_INCLUDE="$withval"
-+ 
-+ # Check whether --with-ada-objects or --without-ada-objects was given.
-+@@ -14937,7 +15236,8 @@
-+ 
-+ else
-+   withval="${ADA_OBJECTS-$prefix/lib/ada/adalib}"
-+-fi;
-++fi; if test -n "$prefix/lib/ada/adalib" ; then
-++
-+ if test "x$prefix" != xNONE; then
-+   cf_path_syntax="$prefix"
-+ else
-+@@ -14963,34 +15263,57 @@
-+   withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
-+   ;;
-+ *)
-+-  { { echo "$as_me:14966: error: expected a pathname, not \"$withval\"" >&5
-++  { { echo "$as_me:15266: error: expected a pathname, not \"$withval\"" >&5
-+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
-+    { (exit 1); exit 1; }; }
-+   ;;
-+ esac
-+ 
-++fi
-+ ADA_OBJECTS="$withval"
-+ 
-+ fi
-+ fi
-++else
-++   cf_with_ada=no
-+ fi
-+ 
-+-### Construct the library-subsets, if any, from this set of keywords:
-+-### none, base, ext_funcs, ext_tinfo, termlib, widechar (see CF_LIB_RULES).
-+-echo "$as_me:14980: checking for library subsets" >&5
-++### Construct the ncurses library-subsets, if any, from this set of keywords:
-++###	none, base, ext_funcs, ext_tinfo, ticlib, termlib, widechar
-++###
-++### ticlib modules may be a separate library, otherwise contained in termlib.
-++### termlib modules may be a separate library, otherwise contained in ncurses.
-++###
-++### The of "+" or " " between the tokens controls the way the script
-++### chooses to split module lists into libraries.
-++###
-++### (see CF_LIB_RULES).
-++echo "$as_me:15291: checking for library subsets" >&5
-+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
-++LIB_SUBSETS=
-++
-++if test "$cf_with_progs" = yes || test "$with_ticlib" != no || test "$with_termcap" != no; then
-++	LIB_SUBSETS="${LIB_SUBSETS}ticlib"
-++	if test "$with_ticlib" != no ; then
-++		LIB_SUBSETS="${LIB_SUBSETS} "
-++	else
-++		LIB_SUBSETS="${LIB_SUBSETS}+"
-++	fi
-++fi
-++
-++LIB_SUBSETS="${LIB_SUBSETS}termlib"
-++test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_tinfo"
-+ if test "$with_termlib" != no ; then
-+-	LIB_SUBSETS="termlib"
-+-	test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_tinfo"
-+ 	LIB_SUBSETS="${LIB_SUBSETS} "
-+ else
-+-	LIB_SUBSETS="termlib+"
-+-	test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}ext_tinfo+"
-++	LIB_SUBSETS="${LIB_SUBSETS}+"
-+ fi
-++
-+ LIB_SUBSETS="${LIB_SUBSETS}base"
-+ test "$with_widec"     = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
-+ test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
-+-echo "$as_me:14993: result: $LIB_SUBSETS" >&5
-++
-++echo "$as_me:15316: result: $LIB_SUBSETS" >&5
-+ echo "${ECHO_T}$LIB_SUBSETS" >&6
-+ 
-+ ### Construct the list of include-directories to be generated
-+@@ -15028,7 +15351,7 @@
-+ fi
-+ 
-+ ### Build up pieces for makefile rules
-+-echo "$as_me:15031: checking default library suffix" >&5
-++echo "$as_me:15354: checking default library suffix" >&5
-+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
-+ 
-+ 	case $DFT_LWR_MODEL in
-+@@ -15039,10 +15362,10 @@
-+ 	shared)  DFT_ARG_SUFFIX=''   ;;
-+ 	esac
-+ 	test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
-+-echo "$as_me:15042: result: $DFT_ARG_SUFFIX" >&5
-++echo "$as_me:15365: result: $DFT_ARG_SUFFIX" >&5
-+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
-+ 
-+-echo "$as_me:15045: checking default library-dependency suffix" >&5
-++echo "$as_me:15368: checking default library-dependency suffix" >&5
-+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
-+ 
-+ 	case $DFT_LWR_MODEL in
-+@@ -15064,17 +15387,19 @@
-+ 		esac
-+ 	esac
-+ 	test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}"
-++DFT_LIB_SUFFIX=$DFT_DEP_SUFFIX
-+ if test $DFT_LWR_MODEL = shared ; then
-+ 	case $cf_cv_system_name in #(vi
-+ 	cygwin*)
-+ 		DFT_DEP_SUFFIX=".dll.a"
-++		DFT_LIB_SUFFIX=".dll"
-+ 		;;
-+ 	esac
-+ fi
-+-echo "$as_me:15074: result: $DFT_DEP_SUFFIX" >&5
-++echo "$as_me:15399: result: $DFT_DEP_SUFFIX" >&5
-+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
-+ 
-+-echo "$as_me:15077: checking default object directory" >&5
-++echo "$as_me:15402: checking default object directory" >&5
-+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
-+ 
-+ 	case $DFT_LWR_MODEL in
-+@@ -15090,12 +15415,12 @@
-+ 			DFT_OBJ_SUBDIR='obj_s' ;;
-+ 		esac
-+ 	esac
-+-echo "$as_me:15093: result: $DFT_OBJ_SUBDIR" >&5
-++echo "$as_me:15418: result: $DFT_OBJ_SUBDIR" >&5
-+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
-+ 
-+ # libtool thinks it can make c++ shared libraries (perhaps only g++)
-+ if test "$cf_with_cxx" = yes ; then
-+-echo "$as_me:15098: checking c++ library-dependency suffix" >&5
-++echo "$as_me:15423: checking c++ library-dependency suffix" >&5
-+ echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
-+ if test "$with_libtool" != "no"; then
-+ 	CXX_LIB_SUFFIX=$DFT_DEP_SUFFIX
-+@@ -15121,21 +15446,60 @@
-+ 	esac
-+ 	test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}"
-+ fi
-+-echo "$as_me:15124: result: $CXX_LIB_SUFFIX" >&5
-++echo "$as_me:15449: result: $CXX_LIB_SUFFIX" >&5
-+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
-+ 
-+ fi
-+ 
-++# do not want -ldl in build except as needed for -lncurses dependency
-++if test "$with_dlsym" = yes ; then
-++if test $DFT_LWR_MODEL = shared || \
-++   test $DFT_LWR_MODEL = libtool ; then
-++
-++# remove dl library from $LIBS
-++LIBS=`echo "$LIBS" | sed -e 's/-ldl[ 	]//g' -e 's/-ldl$//'`
-++
-++fi
-++fi
-+ ### Set up low-level terminfo dependencies for makefiles.
-+-TINFO_LIST="$SHLIB_LIST"
-++
-++# TICS_LIST and TINFO_LIST are needed to build libtic.so and libterm.so, but
-++# do not need libdl
-++TICS_LIST=
-++if test "$with_dlsym" = yes ; then
-++
-++# remove dl library from $SHLIB_LIST
-++TINFO_LIST=`echo "$SHLIB_LIST" | sed -e 's/-ldl[ 	]//g' -e 's/-ldl$//'`
-++
-++fi
-++
-++if test "$with_ticlib" != no ; then
-++
-++	if test "$with_ticlib" != yes ; then
-++		TICS_NAME=$with_ticlib
-++		TICS_ARG_SUFFIX="${with_ticlib}`echo ${DFT_ARG_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
-++		TICS_DEP_SUFFIX="${with_ticlib}`echo ${DFT_DEP_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
-++		TICS_LIB_SUFFIX="${with_ticlib}"
-++	else
-++		TICS_ARG_SUFFIX="${TICS_NAME}${DFT_ARG_SUFFIX}"
-++		TICS_DEP_SUFFIX="${TICS_NAME}${DFT_DEP_SUFFIX}"
-++		TICS_LIB_SUFFIX="${TICS_NAME}${LIB_SUFFIX}"
-++	fi
-++	TICS_ARGS="-L${LIB_DIR} -l${TICS_LIB_SUFFIX}"
-++else
-++	TICS_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
-++fi
-++
-+ if test "$with_termlib" != no ; then
-+ 
-+ 	if test "$with_termlib" != yes ; then
-+ 		TINFO_NAME=$with_termlib
-++		TINFO_SUFFIX="`echo ${DFT_LIB_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
-+ 		TINFO_ARG_SUFFIX="${with_termlib}`echo ${DFT_ARG_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
-+ 		TINFO_DEP_SUFFIX="${with_termlib}`echo ${DFT_DEP_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
-+ 		TINFO_LIB_SUFFIX="${with_termlib}"
-+ 	else
-++		TINFO_SUFFIX=${DFT_LIB_SUFFIX}
-+ 		TINFO_ARG_SUFFIX="${TINFO_NAME}${DFT_ARG_SUFFIX}"
-+ 		TINFO_DEP_SUFFIX="${TINFO_NAME}${DFT_DEP_SUFFIX}"
-+ 		TINFO_LIB_SUFFIX="${TINFO_NAME}${LIB_SUFFIX}"
-+@@ -15150,22 +15514,81 @@
-+ 	else
-+ 		TEST_ARGS="-l${TINFO_ARG_SUFFIX}"
-+ 		TEST_ARG2="-l${TINFO_ARG_SUFFIX}"
-++		TICS_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
-+ 		TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS"
-+ 		SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
-+ 	fi
-+ else
-++	# the next lines are needed for linking libtic over libncurses
-++	TINFO_NAME=${LIB_NAME}
-++	TINFO_SUFFIX=${DFT_LIB_SUFFIX}
-++	TINFO_ARG_SUFFIX=${LIB_NAME}${DFT_ARG_SUFFIX}
-++	TICS_LIST="$SHLIB_LIST -l${LIB_NAME}${DFT_ARG_SUFFIX}"
-++
-+ 	TINFO_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
-+ fi
-+ 
-++if test "$DFT_LWR_MODEL" = shared ; then
-++	case $cf_cv_system_name in #(vi
-++	cygwin*)
-++		# "lib" files have ".dll.a" suffix, "cyg" files have ".dll"
-++		TINFO_SUFFIX=.dll
-++		;;
-++	esac
-++fi
-++
-++if test "$with_dlsym" = yes ; then
-++
-++# remove dl library from $TICS_LIST
-++TICS_LIST=`echo "$TICS_LIST" | sed -e 's/-ldl[ 	]//g' -e 's/-ldl$//'`
-++
-++fi
-++
-+ # needed for Ada95
-+ TINFO_ARGS2=`echo "$TINFO_ARGS" | sed -e 's,-L\.\./,-L../../,'`
-+ 
-+-echo "$as_me:15163: checking where we will install curses.h" >&5
-++case $DFT_LWR_MODEL in
-++normal|debug|profile)
-++
-++if test "$GCC" = yes ; then
-++	LDFLAGS_STATIC=-static
-++	LDFLAGS_SHARED=-dynamic
-++else
-++	case $cf_cv_system_name in #(
-++	aix[45]*) 	#( from ld manpage
-++		LDFLAGS_STATIC=-bstatic
-++		LDFLAGS_SHARED=-bdynamic
-++		;;
-++	hpux*)		#( from ld manpage for hpux10.20, hpux11.11
-++		# We could also use just "archive" and "shared".
-++		LDFLAGS_STATIC=-Wl,-a,archive_shared
-++		LDFLAGS_SHARED=-Wl,-a,shared_archive
-++		;;
-++	irix*)		#( from ld manpage IRIX64
-++		LDFLAGS_STATIC=-Bstatic
-++		LDFLAGS_SHARED=-Bdynamic
-++		;;
-++	osf[45]*)	#( from ld manpage osf4.0d, osf5.1
-++		# alternative "-oldstyle_liblookup" (not in cc manpage)
-++		LDFLAGS_STATIC=-noso
-++		LDFLAGS_SHARED=-so_archive
-++		;;
-++	solaris2*)
-++		LDFLAGS_STATIC=-Bstatic
-++		LDFLAGS_SHARED=-Bdynamic
-++		;;
-++	esac
-++fi
-++
-++	;;
-++esac
-++
-++echo "$as_me:15586: checking where we will install curses.h" >&5
-+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
-+ test "$with_overwrite" = no && \
-+ test "x$includedir" = 'x${prefix}/include' && \
-+ 	includedir='${prefix}/include/ncurses'${LIB_SUFFIX}
-+-echo "$as_me:15168: result: $includedir" >&5
-++echo "$as_me:15591: result: $includedir" >&5
-+ echo "${ECHO_T}$includedir" >&6
-+ 
-+ ### Resolve a conflict between normal and wide-curses by forcing applications
-+@@ -15173,11 +15596,14 @@
-+ if test "$with_overwrite" != no ; then
-+ if test "$NCURSES_LIBUTF8" = 1 ; then
-+ 	NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
-+-	{ echo "$as_me:15176: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
-++	{ echo "$as_me:15599: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
-+ echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
-+ fi
-+ fi
-+ 
-++# used to separate tack out of the tree
-++NCURSES_TREE=
-++
-+ ### predefined stuff for the test programs
-+ cat >>confdefs.h <<\EOF
-+ #define HAVE_SLK_COLOR 1
-+@@ -15186,7 +15612,7 @@
-+ ### Construct the list of subdirectories for which we'll customize makefiles
-+ ### with the appropriate compile-rules.
-+ 
-+-echo "$as_me:15189: checking for src modules" >&5
-++echo "$as_me:15615: checking for src modules" >&5
-+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
-+ 
-+ # dependencies and linker-arguments for test-programs
-+@@ -15249,7 +15675,7 @@
-+ 		fi
-+ 	fi
-+ done
-+-echo "$as_me:15252: result: $cf_cv_src_modules" >&5
-++echo "$as_me:15678: result: $cf_cv_src_modules" >&5
-+ echo "${ECHO_T}$cf_cv_src_modules" >&6
-+ 
-+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
-+@@ -15284,6 +15710,10 @@
-+ 
-+ fi
-+ 
-++if test "$cf_with_ada" != "no" && test "$cf_cv_prog_gnat_correct" != "no"; then
-++   SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses-config"
-++fi
-++
-+ DIRS_TO_MAKE="lib"
-+ for cf_item in $cf_list_models
-+ do
-+@@ -15391,6 +15821,79 @@
-+ 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
-+ fi
-+ 
-++### If we're building with rpath, try to link non-standard libs that way too.
-++if test "$DFT_LWR_MODEL" = "shared"; then
-++
-++echo "$as_me:15827: checking for updated LDFLAGS" >&5
-++echo $ECHO_N "checking for updated LDFLAGS... $ECHO_C" >&6
-++if test -n "$LDFLAGS" ; then
-++echo "$as_me:15830: result: maybe" >&5
-++echo "${ECHO_T}maybe" >&6
-++test -n "$verbose" && echo "	...checking LDFLAGS $LDFLAGS" 1>&6
-++
-++echo "${as_me-configure}:15834: testing ...checking LDFLAGS $LDFLAGS ..." 1>&5
-++
-++test -n "$verbose" && echo "	...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
-++
-++echo "${as_me-configure}:15838: testing ...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-++
-++case "$EXTRA_LDFLAGS" in #(vi
-++-Wl,-rpath,*) #(vi
-++    cf_rpath_hack="-Wl,-rpath,"
-++    ;;
-++-R\ *)
-++    cf_rpath_hack="-R "
-++    ;;
-++-R*)
-++    cf_rpath_hack="-R"
-++    ;;
-++*)
-++    cf_rpath_hack=
-++    ;;
-++esac
-++if test -n "$cf_rpath_hack" ; then
-++    cf_rpath_dst=
-++    for cf_rpath_src in $LDFLAGS
-++    do
-++        test -n "$verbose" && echo "	Filtering $cf_rpath_src" 1>&6
-++
-++echo "${as_me-configure}:15860: testing Filtering $cf_rpath_src ..." 1>&5
-++
-++        case $cf_rpath_src in #(vi
-++        -L*) #(vi
-++            if test "$cf_rpath_hack" = "-R " ; then
-++                cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e 's%-L%-R %'`
-++            else
-++                cf_rpath_tmp=`echo "$cf_rpath_src" |sed -e s%-L%$cf_rpath_hack%`
-++            fi
-++            test -n "$verbose" && echo "	...Filter $cf_rpath_tmp" 1>&6
-++
-++echo "${as_me-configure}:15871: testing ...Filter $cf_rpath_tmp ..." 1>&5
-++
-++            EXTRA_LDFLAGS="$cf_rpath_tmp $EXTRA_LDFLAGS"
-++            ;;
-++        *)
-++            cf_rpath_dst="$cf_rpath_dst $cf_rpath_src"
-++            ;;
-++        esac
-++    done
-++    LDFLAGS=$cf_rpath_dst
-++    test -n "$verbose" && echo "	...checked LDFLAGS $LDFLAGS" 1>&6
-++
-++echo "${as_me-configure}:15883: testing ...checked LDFLAGS $LDFLAGS ..." 1>&5
-++
-++    test -n "$verbose" && echo "	...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS" 1>&6
-++
-++echo "${as_me-configure}:15887: testing ...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS ..." 1>&5
-++
-++fi
-++else
-++echo "$as_me:15891: result: no" >&5
-++echo "${ECHO_T}no" >&6
-++fi
-++
-++fi
-++
-+ ### Define substitutions for header files to avoid name-pollution
-+ 
-+ if test "$cf_cv_have_tcgetattr" = yes ; then
-+@@ -15495,7 +15998,7 @@
-+ : ${CONFIG_STATUS=./config.status}
-+ ac_clean_files_save=$ac_clean_files
-+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-+-{ echo "$as_me:15498: creating $CONFIG_STATUS" >&5
-++{ echo "$as_me:16001: creating $CONFIG_STATUS" >&5
-+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
-+ cat >$CONFIG_STATUS <<_ACEOF
-+ #! $SHELL
-+@@ -15671,7 +16174,7 @@
-+     echo "$ac_cs_version"; exit 0 ;;
-+   --he | --h)
-+     # Conflict between --help and --header
-+-    { { echo "$as_me:15674: error: ambiguous option: $1
-++    { { echo "$as_me:16177: error: ambiguous option: $1
-+ Try \`$0 --help' for more information." >&5
-+ echo "$as_me: error: ambiguous option: $1
-+ Try \`$0 --help' for more information." >&2;}
-+@@ -15690,7 +16193,7 @@
-+     ac_need_defaults=false;;
-+ 
-+   # This is an error.
-+-  -*) { { echo "$as_me:15693: error: unrecognized option: $1
-++  -*) { { echo "$as_me:16196: error: unrecognized option: $1
-+ Try \`$0 --help' for more information." >&5
-+ echo "$as_me: error: unrecognized option: $1
-+ Try \`$0 --help' for more information." >&2;}
-+@@ -15747,13 +16250,19 @@
-+ TINFO_ARG_SUFFIX="$TINFO_ARG_SUFFIX"
-+ TINFO_LIB_SUFFIX="$TINFO_LIB_SUFFIX"
-+ TINFO_NAME="$TINFO_NAME"
-++TINFO_SUFFIX="$TINFO_SUFFIX"
-++TICS_ARG_SUFFIX="$TICS_ARG_SUFFIX"
-++TICS_LIB_SUFFIX="$TICS_LIB_SUFFIX"
-++TICS_NAME="$TICS_NAME"
-+ WITH_CURSES_H="$with_curses_h"
-+ WITH_ECHO="$with_echo"
-+ WITH_OVERWRITE="$with_overwrite"
-+ cf_LIST_MODELS="$cf_list_models"
-+ cf_cv_abi_version="$cf_cv_abi_version"
-++cf_cv_do_relink="$cf_cv_do_relink"
-+ cf_cv_do_symlinks="$cf_cv_do_symlinks"
-+ cf_cv_enable_lp64="$cf_cv_enable_lp64"
-++cf_cv_enable_opaque="$cf_cv_enable_opaque"
-+ cf_cv_prog_CC_c_o=$cf_cv_prog_CC_c_o
-+ cf_cv_prog_CXX_c_o=$cf_cv_prog_CXX_c_o
-+ cf_cv_rel_version="$cf_cv_rel_version"
-+@@ -15780,7 +16289,7 @@
-+   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-+   "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
-+   "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
-+-  *) { { echo "$as_me:15783: error: invalid argument: $ac_config_target" >&5
-++  *) { { echo "$as_me:16292: error: invalid argument: $ac_config_target" >&5
-+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-+    { (exit 1); exit 1; }; };;
-+   esac
-+@@ -15928,6 +16437,7 @@
-+ s,@cf_list_models@,$cf_list_models,;t t
-+ s,@LIBTOOL@,$LIBTOOL,;t t
-+ s,@LIBTOOL_CXX@,$LIBTOOL_CXX,;t t
-++s,@LIBTOOL_OPTS@,$LIBTOOL_OPTS,;t t
-+ s,@LIB_CREATE@,$LIB_CREATE,;t t
-+ s,@LIB_OBJECT@,$LIB_OBJECT,;t t
-+ s,@LIB_SUFFIX@,$LIB_SUFFIX,;t t
-+@@ -15939,6 +16449,7 @@
-+ s,@LIB_UNINSTALL@,$LIB_UNINSTALL,;t t
-+ s,@DFT_LWR_MODEL@,$DFT_LWR_MODEL,;t t
-+ s,@DFT_UPR_MODEL@,$DFT_UPR_MODEL,;t t
-++s,@TICS_NAME@,$TICS_NAME,;t t
-+ s,@TINFO_NAME@,$TINFO_NAME,;t t
-+ s,@LIB_NAME@,$LIB_NAME,;t t
-+ s,@LIB_PREFIX@,$LIB_PREFIX,;t t
-+@@ -15961,6 +16472,7 @@
-+ s,@TERMINFO_DIRS@,$TERMINFO_DIRS,;t t
-+ s,@TERMINFO@,$TERMINFO,;t t
-+ s,@MAKE_TERMINFO@,$MAKE_TERMINFO,;t t
-++s,@USE_BIG_STRINGS@,$USE_BIG_STRINGS,;t t
-+ s,@TERMPATH@,$TERMPATH,;t t
-+ s,@BROKEN_LINKER@,$BROKEN_LINKER,;t t
-+ s,@NCURSES_CH_T@,$NCURSES_CH_T,;t t
-+@@ -15983,6 +16495,10 @@
-+ s,@NCURSES_XNAMES@,$NCURSES_XNAMES,;t t
-+ s,@NCURSES_EXT_COLORS@,$NCURSES_EXT_COLORS,;t t
-+ s,@NCURSES_MOUSE_VERSION@,$NCURSES_MOUSE_VERSION,;t t
-++s,@cf_cv_enable_reentrant@,$cf_cv_enable_reentrant,;t t
-++s,@cf_cv_enable_opaque@,$cf_cv_enable_opaque,;t t
-++s,@NCURSES_OPAQUE@,$NCURSES_OPAQUE,;t t
-++s,@NCURSES_SIZE_T@,$NCURSES_SIZE_T,;t t
-+ s,@ECHO_LINK@,$ECHO_LINK,;t t
-+ s,@EXTRA_CFLAGS@,$EXTRA_CFLAGS,;t t
-+ s,@EXTRA_CXXFLAGS@,$EXTRA_CXXFLAGS,;t t
-+@@ -16015,14 +16531,22 @@
-+ s,@DFT_DEP_SUFFIX@,$DFT_DEP_SUFFIX,;t t
-+ s,@DFT_OBJ_SUBDIR@,$DFT_OBJ_SUBDIR,;t t
-+ s,@CXX_LIB_SUFFIX@,$CXX_LIB_SUFFIX,;t t
-++s,@TICS_ARG_SUFFIX@,$TICS_ARG_SUFFIX,;t t
-++s,@TICS_DEP_SUFFIX@,$TICS_DEP_SUFFIX,;t t
-++s,@TICS_LIB_SUFFIX@,$TICS_LIB_SUFFIX,;t t
-++s,@TICS_ARGS@,$TICS_ARGS,;t t
-+ s,@TINFO_ARG_SUFFIX@,$TINFO_ARG_SUFFIX,;t t
-+ s,@TINFO_DEP_SUFFIX@,$TINFO_DEP_SUFFIX,;t t
-+ s,@TINFO_LIB_SUFFIX@,$TINFO_LIB_SUFFIX,;t t
-+ s,@TINFO_ARGS@,$TINFO_ARGS,;t t
-+ s,@TINFO_ARGS2@,$TINFO_ARGS2,;t t
-++s,@LDFLAGS_STATIC@,$LDFLAGS_STATIC,;t t
-++s,@LDFLAGS_SHARED@,$LDFLAGS_SHARED,;t t
-+ s,@WITH_OVERWRITE@,$WITH_OVERWRITE,;t t
-++s,@TICS_LIST@,$TICS_LIST,;t t
-+ s,@TINFO_LIST@,$TINFO_LIST,;t t
-+ s,@SHLIB_LIST@,$SHLIB_LIST,;t t
-++s,@NCURSES_TREE@,$NCURSES_TREE,;t t
-+ s,@TEST_ARGS@,$TEST_ARGS,;t t
-+ s,@TEST_DEPS@,$TEST_DEPS,;t t
-+ s,@TEST_ARG2@,$TEST_ARG2,;t t
-+@@ -16146,7 +16670,7 @@
-+   esac
-+ 
-+   if test x"$ac_file" != x-; then
-+-    { echo "$as_me:16149: creating $ac_file" >&5
-++    { echo "$as_me:16673: creating $ac_file" >&5
-+ echo "$as_me: creating $ac_file" >&6;}
-+     rm -f "$ac_file"
-+   fi
-+@@ -16164,7 +16688,7 @@
-+       -) echo $tmp/stdin ;;
-+       [\\/$]*)
-+          # Absolute (can't be DOS-style, as IFS=:)
-+-         test -f "$f" || { { echo "$as_me:16167: error: cannot find input file: $f" >&5
-++         test -f "$f" || { { echo "$as_me:16691: error: cannot find input file: $f" >&5
-+ echo "$as_me: error: cannot find input file: $f" >&2;}
-+    { (exit 1); exit 1; }; }
-+          echo $f;;
-+@@ -16177,7 +16701,7 @@
-+            echo $srcdir/$f
-+          else
-+            # /dev/null tree
-+-           { { echo "$as_me:16180: error: cannot find input file: $f" >&5
-++           { { echo "$as_me:16704: error: cannot find input file: $f" >&5
-+ echo "$as_me: error: cannot find input file: $f" >&2;}
-+    { (exit 1); exit 1; }; }
-+          fi;;
-+@@ -16243,7 +16767,7 @@
-+   * )   ac_file_in=$ac_file.in ;;
-+   esac
-+ 
-+-  test x"$ac_file" != x- && { echo "$as_me:16246: creating $ac_file" >&5
-++  test x"$ac_file" != x- && { echo "$as_me:16770: creating $ac_file" >&5
-+ echo "$as_me: creating $ac_file" >&6;}
-+ 
-+   # First look for the input files in the build tree, otherwise in the
-+@@ -16254,7 +16778,7 @@
-+       -) echo $tmp/stdin ;;
-+       [\\/$]*)
-+          # Absolute (can't be DOS-style, as IFS=:)
-+-         test -f "$f" || { { echo "$as_me:16257: error: cannot find input file: $f" >&5
-++         test -f "$f" || { { echo "$as_me:16781: error: cannot find input file: $f" >&5
-+ echo "$as_me: error: cannot find input file: $f" >&2;}
-+    { (exit 1); exit 1; }; }
-+          echo $f;;
-+@@ -16267,7 +16791,7 @@
-+            echo $srcdir/$f
-+          else
-+            # /dev/null tree
-+-           { { echo "$as_me:16270: error: cannot find input file: $f" >&5
-++           { { echo "$as_me:16794: error: cannot find input file: $f" >&5
-+ echo "$as_me: error: cannot find input file: $f" >&2;}
-+    { (exit 1); exit 1; }; }
-+          fi;;
-+@@ -16325,7 +16849,7 @@
-+   rm -f $tmp/in
-+   if test x"$ac_file" != x-; then
-+     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-+-      { echo "$as_me:16328: $ac_file is unchanged" >&5
-++      { echo "$as_me:16852: $ac_file is unchanged" >&5
-+ echo "$as_me: $ac_file is unchanged" >&6;}
-+     else
-+       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+@@ -16400,7 +16924,6 @@
-+ 		continue
-+ 	elif test -f $srcdir/$cf_dir/modules; then
-+ 
-+-		IMPORT_LIB=
-+ 		SHARED_LIB=
-+ 		LIBS_TO_MAKE=
-+ 		for cf_item in $cf_LIST_MODELS
-+@@ -16467,9 +16990,7 @@
-+ 			# use autodetected ${cf_prefix} for import lib and static lib, but
-+ 			# use 'cyg' prefix for shared lib.
-+ 			if test $cf_cv_shlib_version = cygdll ; then
-+-				SHARED_LIB="cyg${cf_dir}\${ABI_VERSION}.dll"
-+-				IMPORT_LIB="${cf_prefix}${cf_dir}.dll.a"
-+-				LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/\${SHARED_LIB} ../lib/\${IMPORT_LIB}"
-++				LIBS_TO_MAKE="$LIBS_TO_MAKE ../lib/cyg${cf_dir}\${ABI_VERSION}.dll"
-+ 				continue
-+ 			fi
-+ 			fi
-+@@ -16478,17 +16999,34 @@
-+ 
-+ 		if test $cf_dir = ncurses ; then
-+ 			cf_subsets="$LIB_SUBSETS"
-+-			cf_termlib=`echo "$cf_subsets" |sed -e 's/ .*$//'`
-+-			if test "$cf_termlib" != "$cf_subsets" ; then
-+-				cf_item=`echo $LIBS_TO_MAKE |sed -e s%${LIB_NAME}${LIB_SUFFIX}%${TINFO_LIB_SUFFIX}%g`
-+-				LIBS_TO_MAKE="$cf_item $LIBS_TO_MAKE"
-+-			fi
-++			cf_r_parts="$cf_subsets"
-++
-++			while test -n "$cf_r_parts"
-++			do
-++				cf_l_parts=`echo "$cf_r_parts" |sed -e 's/ .*$//'`
-++				cf_r_parts=`echo "$cf_r_parts" |sed -e 's/^[^ ]* //'`
-++				if test "$cf_l_parts" != "$cf_r_parts" ; then
-++					case $cf_l_parts in #(vi
-++					*termlib*) #(vi
-++						cf_item=`echo $LIBS_TO_MAKE |sed -e s%${LIB_NAME}${LIB_SUFFIX}%${TINFO_LIB_SUFFIX}%g`
-++						;;
-++					*ticlib*)
-++						cf_item=`echo $LIBS_TO_MAKE |sed -e s%${LIB_NAME}${LIB_SUFFIX}%${TICS_LIB_SUFFIX}%g`
-++						;;
-++					*)
-++						break
-++						;;
-++					esac
-++					LIBS_TO_MAKE="$cf_item $LIBS_TO_MAKE"
-++				else
-++					break
-++				fi
-++			done
-+ 		else
-+ 			cf_subsets=`echo "$LIB_SUBSETS" | sed -e 's/^termlib.* //'`
-+ 		fi
-+ 
-+ 		sed -e "s%@LIBS_TO_MAKE@%$LIBS_TO_MAKE%" \
-+-		    -e "s%@IMPORT_LIB@%$IMPORT_LIB%" \
-+ 		    -e "s%@SHARED_LIB@%$SHARED_LIB%" \
-+ 			$cf_dir/Makefile >$cf_dir/Makefile.out
-+ 		mv $cf_dir/Makefile.out $cf_dir/Makefile
-+@@ -16546,13 +17084,20 @@
-+ 				case $cf_subset in
-+ 				*base*)
-+ 					;;
-+-				termlib*)
-++				*termlib*)
-+ 					cf_libname=$TINFO_LIB_SUFFIX
-+ 					if test -n "${DFT_ARG_SUFFIX}" ; then
-+ 						# undo $LIB_SUFFIX add-on in CF_LIB_SUFFIX
-+ 						cf_suffix=`echo $cf_suffix |sed -e "s%^${LIB_SUFFIX}%%"`
-+ 					fi
-+-				;;
-++					;;
-++				ticlib*)
-++					cf_libname=$TICS_LIB_SUFFIX
-++					if test -n "${DFT_ARG_SUFFIX}" ; then
-++						# undo $LIB_SUFFIX add-on in CF_LIB_SUFFIX
-++						cf_suffix=`echo $cf_suffix |sed -e "s%^${LIB_SUFFIX}%%"`
-++					fi
-++					;;
-+ 				esac
-+ 			fi
-+ 
-+@@ -16593,8 +17138,11 @@
-+ 				prefix=$cf_prefix \
-+ 				suffix=$cf_suffix \
-+ 				subset=$cf_subset \
-++				TermlibRoot=$TINFO_NAME \
-++				TermlibSuffix=$TINFO_SUFFIX \
-+ 				ShlibVer=$cf_cv_shlib_version \
-+ 				ShlibVerInfix=$cf_cv_shlib_version_infix \
-++				ReLink=${cf_cv_do_relink-no} \
-+ 				DoLinks=$cf_cv_do_symlinks \
-+ 				rmSoLocs=$cf_cv_rm_so_locs \
-+ 				ldconfig="$LDCONFIG" \
-+@@ -16681,8 +17229,8 @@
-+ 
-+ cat >> Makefile <<CF_EOF
-+ 
-+-install.data \\
-+-uninstall.data ::
-++install.libs uninstall.libs \\
-++install.data uninstall.data ::
-+ $MAKE_TERMINFO	cd misc && \${MAKE} \${CF_MFLAGS} \$@
-+ 
-+ install.man \\
-+@@ -16691,7 +17239,7 @@
-+ 
-+ distclean ::
-+ 	rm -f config.cache config.log config.status Makefile include/ncurses_cfg.h
-+-	rm -f headers.sh headers.sed
-++	rm -f headers.sh headers.sed mk_shared_lib.sh
-+ 	rm -rf \${DIRS_TO_MAKE}
-+ CF_EOF
-+ 
-+@@ -16795,41 +17343,10 @@
-+ 	fi
-+ 
-+ 	if test -f $srcdir/$cf_dir/headers; then
-+-	cat >>$cf_dir/Makefile <<CF_EOF
-+-\${DESTDIR}\${includedir} :
-+-	sh \${srcdir}/../mkinstalldirs \$@
-+-
-+-install \\
-+-install.libs \\
-+-install.includes :: \${AUTO_SRC} \${DESTDIR}\${includedir} \\
-+-CF_EOF
-+-		j=""
-+-		for i in `cat $srcdir/$cf_dir/headers |fgrep -v "#"`
-+-		do
-+-			test -n "$j" && echo "		$j \\" >>$cf_dir/Makefile
-+-			j=$i
-+-		done
-+-
-+-		echo "		$j" >>$cf_dir/Makefile
-+-
-+-		for i in `cat $srcdir/$cf_dir/headers |fgrep -v "#"`
-+-		do
-+-			echo "	@ (cd \${DESTDIR}\${includedir} && rm -f `basename $i`) ; ../headers.sh \${INSTALL_DATA} \${DESTDIR}\${includedir} \${srcdir} $i" >>$cf_dir/Makefile
-+-			test $i = curses.h && test $WITH_CURSES_H = yes && echo "	@ (cd \${DESTDIR}\${includedir} && rm -f ncurses.h && \${LN_S} curses.h ncurses.h)" >>$cf_dir/Makefile
-+-		done
-+-
-+-	cat >>$cf_dir/Makefile <<CF_EOF
-+-
-+-uninstall \\
-+-uninstall.libs \\
-+-uninstall.includes ::
-+-CF_EOF
-+-		for i in `cat $srcdir/$cf_dir/headers |fgrep -v "#"`
-+-		do
-+-			i=`basename $i`
-+-			echo "	-@ (cd \${DESTDIR}\${includedir} && rm -f $i)" >>$cf_dir/Makefile
-+-			test $i = curses.h && echo "	-@ (cd \${DESTDIR}\${includedir} && rm -f ncurses.h)" >>$cf_dir/Makefile
-+-		done
-++		$AWK -f $srcdir/mk-hdr.awk \
-++			subset="$LIB_SUBSETS" \
-++			compat="$WITH_CURSES_H" \
-++			$srcdir/$cf_dir/headers >>$cf_dir/Makefile
-+ 	fi
-+ 
-+ 	if test -f $srcdir/$cf_dir/modules; then
-+Index: configure.in
-+Prereq:  1.383 
-+--- ncurses-5.6/configure.in	2006-12-17 01:26:06.000000000 +0000
-++++ ncurses-5.6-20071201/configure.in	2007-11-24 22:42:43.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ dnl***************************************************************************
-+-dnl Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++dnl Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+ dnl                                                                          *
-+ dnl Permission is hereby granted, free of charge, to any person obtaining a  *
-+ dnl copy of this software and associated documentation files (the            *
-+@@ -28,14 +28,14 @@
-+ dnl
-+ dnl Author: Thomas E. Dickey 1995-on
-+ dnl
-+-dnl $Id: configure.in,v 1.383 2006/12/17 01:26:06 tom Exp $
-++dnl $Id: configure.in,v 1.429 2007/11/24 22:42:43 tom Exp $
-+ dnl Process this file with autoconf to produce a configure script.
-+ dnl
-+ dnl See http://invisible-island.net/autoconf/ for additional information.
-+ dnl
-+ dnl ---------------------------------------------------------------------------
-+ AC_PREREQ(2.13.20020210)
-+-AC_REVISION($Revision: 1.383 $)
-++AC_REVISION($Revision: 1.429 $)
-+ AC_INIT(ncurses/base/lib_initscr.c)
-+ AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
-+ 
-+@@ -150,13 +150,28 @@
-+ CF_PROG_LINT
-+ AC_PROG_LN_S
-+ 
-++AC_SYS_LONG_FILE_NAMES
-++
-++AC_MSG_CHECKING(if we should assume mixed-case filenames)
-++AC_ARG_ENABLE(mixed-case,
-++	[  --enable-mixed-case     tic should assume mixed-case filenames],
-++	[enable_mixedcase=$enableval],
-++	[enable_mixedcase=auto])
-++AC_MSG_RESULT($enable_mixedcase)
-++if test "$enable_mixedcase" = "auto" ; then
-++    CF_MIXEDCASE_FILENAMES
-++else
-++    cf_cv_mixedcase=$enable_mixedcase
-++    if test "$enable_mixedcase" = "yes" ; then
-++        AC_DEFINE(MIXEDCASE_FILENAMES)
-++    fi
-++fi
-++
-++# do this after mixed-case option (tags/TAGS is not as important as tic).
-+ AC_PROG_MAKE_SET
-+ CF_MAKE_TAGS
-+ CF_MAKEFLAGS
-+ 
-+-AC_SYS_LONG_FILE_NAMES
-+-CF_MIXEDCASE_FILENAMES
-+-
-+ dnl These are standard among *NIX systems, but not when cross-compiling
-+ AC_CHECK_TOOL(RANLIB, ranlib, ':')
-+ AC_CHECK_TOOL(LD, ld, ld)
-+@@ -255,6 +270,9 @@
-+ AC_SUBST(DFT_LWR_MODEL)dnl	the default model ("normal")
-+ AC_SUBST(DFT_UPR_MODEL)dnl	the default model ("NORMAL")
-+ 
-++TICS_NAME=tic
-++AC_SUBST(TICS_NAME)
-++
-+ TINFO_NAME=tinfo
-+ AC_SUBST(TINFO_NAME)
-+ 
-+@@ -280,6 +298,13 @@
-+ 	[with_termlib=no])
-+ AC_MSG_RESULT($with_termlib)
-+ 
-++AC_MSG_CHECKING(if you want to build a separate tic library)
-++AC_ARG_WITH(ticlib,
-++	[  --with-ticlib           generate separate tic library],
-++	[with_ticlib=$withval],
-++	[with_ticlib=no])
-++AC_MSG_RESULT($with_ticlib)
-++
-+ ### Checks for special libraries, must be done up-front.
-+ SHLIB_LIST=""
-+ CF_WITH_GPM
-+@@ -304,9 +329,7 @@
-+ 		SHLIB_LIST="-lgpm $SHLIB_LIST"
-+ 	fi
-+ 	AC_DEFINE(HAVE_LIBGPM)
-+-	AC_CHECK_LIB(gpm,Gpm_Wgetch,[
-+-		AC_MSG_WARN(GPM library is already linked with curses - read the FAQ)
-+-	])
-++	CF_CHECK_GPM_WGETCH
-+ fi
-+ 
-+ CF_WITH_SYSMOUSE
-+@@ -336,12 +359,22 @@
-+ AC_SUBST(LD_MODEL)dnl		the type of link (e.g., -g or -pg)
-+ AC_MSG_RESULT($LD_MODEL)
-+ 
-++case $DFT_LWR_MODEL in
-++shared)
-+ AC_MSG_CHECKING(if rpath option should be used)
-+ AC_ARG_ENABLE(rpath,
-+ [  --enable-rpath          use rpath option when generating shared libraries],
-+ [cf_cv_ld_rpath=$enableval],
-+ [cf_cv_ld_rpath=no])
-+ AC_MSG_RESULT($cf_cv_ld_rpath)
-++AC_MSG_CHECKING(if shared libraries should be relinked during install)
-++AC_ARG_ENABLE(relink,
-++[  --disable-relink        relink shared libraries during install],
-++[cf_cv_do_relink=$enableval],
-++[cf_cv_do_relink=yes])
-++AC_MSG_RESULT($cf_cv_do_relink)
-++	;;
-++esac
-+ 
-+ CF_SHARED_OPTS
-+ if test "$CC_SHARED_OPTS" = "unknown"; then
-+@@ -470,6 +503,19 @@
-+ AC_MSG_RESULT($with_big_core)
-+ test "$with_big_core" = "yes" && AC_DEFINE(HAVE_BIG_CORE)
-+ 
-++### ISO C only guarantees 512-char strings, we have tables which load faster
-++### when constructed using "big" strings.
-++AC_MSG_CHECKING(if big-strings option selected)
-++AC_ARG_ENABLE(big-strings,
-++	[  --disable-big-strings   assume compiler has only standard-size strings],
-++	[with_big_strings=no],
-++	[with_big_strings=yes])
-++AC_MSG_RESULT($with_big_strings)
-++
-++USE_BIG_STRINGS=0
-++test "$with_big_strings" = "yes" && USE_BIG_STRINGS=1
-++AC_SUBST(USE_BIG_STRINGS)
-++
-+ ###	use option --enable-termcap to compile in the termcap fallback support
-+ AC_MSG_CHECKING(if you want termcap-fallback support)
-+ AC_ARG_ENABLE(termcap,
-+@@ -487,6 +533,10 @@
-+ 	AC_DEFINE(PURE_TERMINFO)
-+ else
-+ 
-++if test "$with_ticlib" != no ; then
-++	AC_ERROR(Options --with-ticlib and --enable-termcap cannot be combined)
-++fi
-++
-+ AC_DEFINE(USE_TERMCAP)
-+ AC_MSG_CHECKING(for list of termcap files)
-+ CF_WITH_PATHLIST(termpath,
-+@@ -683,7 +733,7 @@
-+ 
-+ CF_LARGEFILE
-+ 
-+-###   use option --disable-tparm-varargs to make tparm() conform to X/Open 
-++###   use option --disable-tparm-varargs to make tparm() conform to X/Open
-+ AC_MSG_CHECKING(if you want tparm not to use X/Open fixed-parameter list)
-+ AC_ARG_ENABLE(tparm-varargs,
-+ 	[  --disable-tparm-varargs compile tparm() without varargs interface],
-+@@ -802,7 +852,7 @@
-+ fi
-+ AC_MSG_CHECKING(if you want to use signed Boolean array in term.h)
-+ AC_ARG_ENABLE(signed-char,
-+-	[  --enable-signed-char    compile with SIGWINCH handler],
-++	[  --enable-signed-char    compile using signed Boolean's in term.h],
-+ 	[with_signed_char=$enableval],
-+ 	[with_signed_char=no])
-+ AC_MSG_RESULT($with_signed_char)
-+@@ -895,7 +945,7 @@
-+ NCURSES_EXT_COLORS=0
-+ if test "$with_ext_colors" = yes ; then
-+ 	if test "$with_widec" != yes ; then
-+-		AC_MSG_WARN(This option applies only to wide-character library)
-++		AC_MSG_ERROR(This option applies only to wide-character library)
-+ 	else
-+ 		# cannot be ABI 5 since it changes sizeof(cchar_t)
-+ 		CF_NCURSES_ABI_6
-+@@ -919,6 +969,33 @@
-+ fi
-+ AC_SUBST(NCURSES_MOUSE_VERSION)
-+ 
-++# Reentrant code has to be opaque; there's little advantage to making ncurses
-++# opaque outside of that, so there is no --enable-opaque option.
-++AC_MSG_CHECKING(if you want experimental reentrant code)
-++AC_ARG_ENABLE(reentrant,
-++	[  --enable-reentrant      compile with experimental reentrant code],
-++	[with_reentrant=$enableval],
-++	[with_reentrant=no])
-++AC_MSG_RESULT($with_reentrant)
-++if test "$with_reentrant" = yes ; then
-++	cf_cv_enable_reentrant=1
-++	cf_cv_enable_opaque="NCURSES_INTERNALS"
-++	NCURSES_OPAQUE=1
-++	NCURSES_SIZE_T=int
-++	LIB_SUFFIX="t${LIB_SUFFIX}"
-++	AC_DEFINE(USE_REENTRANT)
-++	CF_NCURSES_ABI_6
-++else
-++	cf_cv_enable_reentrant=0
-++	cf_cv_enable_opaque="NCURSES_OPAQUE"
-++	NCURSES_OPAQUE=0
-++	NCURSES_SIZE_T=short
-++fi
-++AC_SUBST(cf_cv_enable_reentrant)
-++AC_SUBST(cf_cv_enable_opaque)
-++AC_SUBST(NCURSES_OPAQUE)
-++AC_SUBST(NCURSES_SIZE_T)
-++
-+ AC_MSG_CHECKING(if you want experimental safe-sprintf code)
-+ AC_ARG_ENABLE(safe-sprintf,
-+ 	[  --enable-safe-sprintf   compile with experimental safe-sprintf code],
-+@@ -961,6 +1038,7 @@
-+ else
-+ 	ECHO_LINK='@ echo linking $@ ... ;'
-+ 	test -n "$LIBTOOL" && LIBTOOL="$LIBTOOL --silent"
-++	test -n "$LIBTOOL_CXX" && LIBTOOL_CXX="$LIBTOOL_CXX --silent"
-+ fi
-+ AC_MSG_RESULT($with_echo)
-+ AC_SUBST(ECHO_LINK)
-+@@ -972,9 +1050,9 @@
-+ 	[with_warnings=$enableval])
-+ AC_MSG_RESULT($with_warnings)
-+ 
-+-if test -n "$with_warnings"; then
-++if test "x$with_warnings" = "xyes"; then
-+  	ADAFLAGS="$ADAFLAGS -gnatg"
-+-	CF_GCC_WARNINGS
-++	CF_GCC_WARNINGS(Wdeclaration-after-statement Wextra Wno-unknown-pragmas Wswitch-enum)
-+ 	if test "$cf_with_cxx" = yes ; then
-+ 		CF_GXX_WARNINGS(Wno-unused)
-+ 	fi
-+@@ -1088,26 +1166,21 @@
-+ ###	checks for compiler characteristics
-+ AC_LANG_C
-+ AC_C_CONST
-+-AC_C_INLINE
-+-
-+-NCURSES_INLINE=
-+-if test "$ac_cv_c_inline" != no ; then
-+-	AC_DEFINE(CC_HAS_INLINE_FUNCS)
-+-	NCURSES_INLINE=inline
-+-fi
-+-AC_SUBST(NCURSES_INLINE)
-++CF_C_INLINE(NCURSES_INLINE,1200)
-++CF_SIG_ATOMIC_T
-+ 
-+ if test $NCURSES_CHTYPE = auto ; then
-+ 	CF_TYPEOF_CHTYPE
-+ else
-+ 	cf_cv_typeof_chtype=$NCURSES_CHTYPE
-+ fi
-++test "$cf_cv_typeof_chtype" = unsigned && cf_cv_typeof_chtype=""
-+ AC_SUBST(cf_cv_typeof_chtype)
-+ 
-+ CF_UNSIGNED_LITERALS
-+ cf_cv_1UL="1"
-+-test "$cf_cv_unsigned_literals" = yes && cf_cv_1UL="${cf_cv_1UL}U"
-+-test "$cf_cv_typeof_chtype"    = long && cf_cv_1UL="${cf_cv_1UL}L"
-++test ".$cf_cv_unsigned_literals" = .yes && cf_cv_1UL="${cf_cv_1UL}U"
-++test ".$cf_cv_typeof_chtype"    = .long && cf_cv_1UL="${cf_cv_1UL}L"
-+ AC_SUBST(cf_cv_1UL)
-+ 
-+ if test $NCURSES_MMASK_T = auto ; then
-+@@ -1115,6 +1188,7 @@
-+ else
-+ 	cf_cv_typeof_mmask_t=$NCURSES_MMASK_T
-+ fi
-++test "$cf_cv_typeof_mmask_t" = unsigned && cf_cv_typeof_mmask_t=""
-+ AC_SUBST(cf_cv_typeof_mmask_t)
-+ 
-+ ###	Checks for external-data
-+@@ -1170,7 +1244,7 @@
-+ 
-+ if test "$with_hashed_db" != no ; then
-+ 	AC_DEFINE(USE_HASHED_DB)
-+-	CF_HASHED_DB
-++	CF_HASHED_DB($with_hashed_db)
-+ fi
-+ 
-+ dnl We'll do our own -g libraries, unless the user's overridden via $CFLAGS
-+@@ -1200,14 +1274,13 @@
-+ 		;;
-+ 	esac
-+ 
-+-	AC_CHECK_HEADERS(typeinfo)
-++	AC_CHECK_HEADERS(iostream typeinfo)
-+ 
-+ 	CF_BOOL_DECL
-+ 	CF_BOOL_SIZE
-+ 	CF_ETIP_DEFINES
-+ 	CF_CPP_PARAM_INIT
-+ 	CF_CPP_STATIC_CAST
-+-	CF_CPP_VSCAN_FUNC
-+ 
-+ 	CXX_AR='$(AR)'
-+ 	CXX_AR_OPTS='$(AR_OPTS)'
-+@@ -1284,9 +1357,22 @@
-+ 
-+ CF_HELP_MESSAGE(Ada95 Binding Options:)
-+ 
-++dnl If the Ada95 source-tree is present, add that to the build unless it will
-++dnl not work, or was not requested.
-++if test -f "${srcdir}/Ada95/Makefile.in" ; then
-++
-++dnl libtool does not know anything about GNAT, though a change made in 1998
-++dnl provided for it "someday".  Disable the ada subtree if we are using
-++dnl libtool -TD 20070714
-++if test "$cf_with_ada" != "no" ; then
-++    if test "$with_libtool" != "no"; then
-++	AC_MSG_WARN(libtool does not support Ada - disabling feature)
-++	cf_with_ada=no
-++    fi
-++fi
-++
-+ dnl Check for availability of GNU Ada Translator (GNAT).
-+ dnl At the moment we support no other Ada95 compiler.
-+-if test -f "${srcdir}/Ada95/Makefile.in" ; then
-+ if test "$cf_with_ada" != "no" ; then
-+ cf_ada_make=gnatmake
-+ AC_CHECK_PROG(gnat_exists, $cf_ada_make, yes, no)
-+@@ -1369,22 +1455,44 @@
-+ 
-+ fi
-+ fi
-++else
-++   cf_with_ada=no
-+ fi
-+ 
-+-### Construct the library-subsets, if any, from this set of keywords:
-+-### none, base, ext_funcs, ext_tinfo, termlib, widechar (see CF_LIB_RULES).
-++### Construct the ncurses library-subsets, if any, from this set of keywords:
-++###	none, base, ext_funcs, ext_tinfo, ticlib, termlib, widechar
-++###
-++### ticlib modules may be a separate library, otherwise contained in termlib.
-++### termlib modules may be a separate library, otherwise contained in ncurses.
-++###
-++### The of "+" or " " between the tokens controls the way the script
-++### chooses to split module lists into libraries.
-++###
-++### (see CF_LIB_RULES).
-+ AC_MSG_CHECKING(for library subsets)
-++LIB_SUBSETS=
-++
-++if test "$cf_with_progs" = yes || test "$with_ticlib" != no || test "$with_termcap" != no; then
-++	LIB_SUBSETS="${LIB_SUBSETS}ticlib"
-++	if test "$with_ticlib" != no ; then
-++		LIB_SUBSETS="${LIB_SUBSETS} "
-++	else
-++		LIB_SUBSETS="${LIB_SUBSETS}+"
-++	fi
-++fi
-++
-++LIB_SUBSETS="${LIB_SUBSETS}termlib"
-++test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_tinfo"
-+ if test "$with_termlib" != no ; then
-+-	LIB_SUBSETS="termlib"
-+-	test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_tinfo"
-+ 	LIB_SUBSETS="${LIB_SUBSETS} "
-+ else
-+-	LIB_SUBSETS="termlib+"
-+-	test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}ext_tinfo+"
-++	LIB_SUBSETS="${LIB_SUBSETS}+"
-+ fi
-++
-+ LIB_SUBSETS="${LIB_SUBSETS}base"
-+ test "$with_widec"     = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
-+ test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
-++
-+ AC_MSG_RESULT($LIB_SUBSETS)
-+ 
-+ ### Construct the list of include-directories to be generated
-+@@ -1399,10 +1507,12 @@
-+ 
-+ AC_MSG_CHECKING(default library-dependency suffix)
-+ CF_LIB_SUFFIX($DFT_LWR_MODEL,DFT_DEP_SUFFIX)dnl
-++DFT_LIB_SUFFIX=$DFT_DEP_SUFFIX
-+ if test $DFT_LWR_MODEL = shared ; then
-+ 	case $cf_cv_system_name in #(vi
-+ 	cygwin*)
-+ 		DFT_DEP_SUFFIX=".dll.a"
-++		DFT_LIB_SUFFIX=".dll"
-+ 		;;
-+ 	esac
-+ fi
-+@@ -1426,16 +1536,53 @@
-+ AC_SUBST(CXX_LIB_SUFFIX)
-+ fi
-+ 
-++# do not want -ldl in build except as needed for -lncurses dependency
-++if test "$with_dlsym" = yes ; then
-++if test $DFT_LWR_MODEL = shared || \
-++   test $DFT_LWR_MODEL = libtool ; then
-++	CF_REMOVE_LIB(LIBS,$LIBS,dl)
-++fi
-++fi
-+ ### Set up low-level terminfo dependencies for makefiles.
-+-TINFO_LIST="$SHLIB_LIST"
-++
-++# TICS_LIST and TINFO_LIST are needed to build libtic.so and libterm.so, but
-++# do not need libdl
-++TICS_LIST=
-++if test "$with_dlsym" = yes ; then
-++	CF_REMOVE_LIB(TINFO_LIST,$SHLIB_LIST,dl)
-++fi
-++
-++if test "$with_ticlib" != no ; then
-++
-++	if test "$with_ticlib" != yes ; then
-++		TICS_NAME=$with_ticlib
-++		TICS_ARG_SUFFIX="${with_ticlib}`echo ${DFT_ARG_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
-++		TICS_DEP_SUFFIX="${with_ticlib}`echo ${DFT_DEP_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
-++		TICS_LIB_SUFFIX="${with_ticlib}"
-++	else
-++		TICS_ARG_SUFFIX="${TICS_NAME}${DFT_ARG_SUFFIX}"
-++		TICS_DEP_SUFFIX="${TICS_NAME}${DFT_DEP_SUFFIX}"
-++		TICS_LIB_SUFFIX="${TICS_NAME}${LIB_SUFFIX}"
-++	fi
-++	TICS_ARGS="-L${LIB_DIR} -l${TICS_LIB_SUFFIX}"
-++else
-++	TICS_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
-++fi
-++AC_SUBST(TICS_ARG_SUFFIX)
-++AC_SUBST(TICS_DEP_SUFFIX)
-++AC_SUBST(TICS_LIB_SUFFIX)
-++AC_SUBST(TICS_ARGS)
-++
-+ if test "$with_termlib" != no ; then
-+ 
-+ 	if test "$with_termlib" != yes ; then
-+ 		TINFO_NAME=$with_termlib
-++		TINFO_SUFFIX="`echo ${DFT_LIB_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
-+ 		TINFO_ARG_SUFFIX="${with_termlib}`echo ${DFT_ARG_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
-+ 		TINFO_DEP_SUFFIX="${with_termlib}`echo ${DFT_DEP_SUFFIX}|sed -e "s/^${LIB_SUFFIX}//"`"
-+ 		TINFO_LIB_SUFFIX="${with_termlib}"
-+ 	else
-++		TINFO_SUFFIX=${DFT_LIB_SUFFIX}
-+ 		TINFO_ARG_SUFFIX="${TINFO_NAME}${DFT_ARG_SUFFIX}"
-+ 		TINFO_DEP_SUFFIX="${TINFO_NAME}${DFT_DEP_SUFFIX}"
-+ 		TINFO_LIB_SUFFIX="${TINFO_NAME}${LIB_SUFFIX}"
-+@@ -1450,21 +1597,48 @@
-+ 	else
-+ 		TEST_ARGS="-l${TINFO_ARG_SUFFIX}"
-+ 		TEST_ARG2="-l${TINFO_ARG_SUFFIX}"
-++		TICS_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
-+ 		TINFO_ARGS="-L${LIB_DIR} $TEST_ARGS"
-+ 		SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
-+ 	fi
-+ else
-++	# the next lines are needed for linking libtic over libncurses
-++	TINFO_NAME=${LIB_NAME}
-++	TINFO_SUFFIX=${DFT_LIB_SUFFIX}
-++	TINFO_ARG_SUFFIX=${LIB_NAME}${DFT_ARG_SUFFIX}
-++	TICS_LIST="$SHLIB_LIST -l${LIB_NAME}${DFT_ARG_SUFFIX}"
-++
-+ 	TINFO_ARGS="-L${LIB_DIR} -l${LIB_NAME}${DFT_ARG_SUFFIX}"
-+ fi
-++
-++if test "$DFT_LWR_MODEL" = shared ; then
-++	case $cf_cv_system_name in #(vi
-++	cygwin*)
-++		# "lib" files have ".dll.a" suffix, "cyg" files have ".dll"
-++		TINFO_SUFFIX=.dll
-++		;;
-++	esac
-++fi
-++
-+ AC_SUBST(TINFO_ARG_SUFFIX)
-+ AC_SUBST(TINFO_DEP_SUFFIX)
-+ AC_SUBST(TINFO_LIB_SUFFIX)
-+ AC_SUBST(TINFO_ARGS)
-+ 
-++if test "$with_dlsym" = yes ; then
-++	CF_REMOVE_LIB(TICS_LIST,$TICS_LIST,dl)
-++fi
-++
-+ # needed for Ada95
-+ TINFO_ARGS2=`echo "$TINFO_ARGS" | sed -e 's,-L\.\./,-L../../,'`
-+ AC_SUBST(TINFO_ARGS2)
-+ 
-++case $DFT_LWR_MODEL in
-++normal|debug|profile)
-++	CF_LDFLAGS_STATIC
-++	;;
-++esac
-++
-+ AC_MSG_CHECKING(where we will install curses.h)
-+ test "$with_overwrite" = no && \
-+ test "x$includedir" = 'x${prefix}/include' && \
-+@@ -1481,9 +1655,14 @@
-+ fi
-+ 
-+ AC_SUBST(WITH_OVERWRITE)
-++AC_SUBST(TICS_LIST)
-+ AC_SUBST(TINFO_LIST)
-+ AC_SUBST(SHLIB_LIST)
-+ 
-++# used to separate tack out of the tree
-++NCURSES_TREE=
-++AC_SUBST(NCURSES_TREE)
-++
-+ ### predefined stuff for the test programs
-+ AC_DEFINE(HAVE_SLK_COLOR)
-+ 
-+@@ -1491,6 +1670,11 @@
-+ ### with the appropriate compile-rules.
-+ 
-+ CF_SRC_MODULES($modules_to_build)
-++
-++if test "$cf_with_ada" != "no" && test "$cf_cv_prog_gnat_correct" != "no"; then
-++   SUB_MAKEFILES="$SUB_MAKEFILES Ada95/gen/adacurses-config"
-++fi
-++
-+ CF_DIRS_TO_MAKE
-+ 
-+ AC_DEFINE_UNQUOTED(NCURSES_PATHSEP,'$PATHSEP')
-+@@ -1500,6 +1684,11 @@
-+ ### Now that we're done running tests, add the compiler-warnings, if any
-+ CF_ADD_CFLAGS($EXTRA_CFLAGS)
-+ 
-++### If we're building with rpath, try to link non-standard libs that way too.
-++if test "$DFT_LWR_MODEL" = "shared"; then
-++  CF_RPATH_HACK
-++fi
-++
-+ ### Define substitutions for header files to avoid name-pollution
-+ CF_SUBST_IF(["$cf_cv_have_tcgetattr" = yes], HAVE_TCGETATTR, 1, 0)
-+ CF_SUBST_IF(["$ac_cv_header_termio_h" = yes], HAVE_TERMIO_H, 1, 0)
-+@@ -1540,13 +1729,19 @@
-+ TINFO_ARG_SUFFIX="$TINFO_ARG_SUFFIX"
-+ TINFO_LIB_SUFFIX="$TINFO_LIB_SUFFIX"
-+ TINFO_NAME="$TINFO_NAME"
-++TINFO_SUFFIX="$TINFO_SUFFIX"
-++TICS_ARG_SUFFIX="$TICS_ARG_SUFFIX"
-++TICS_LIB_SUFFIX="$TICS_LIB_SUFFIX"
-++TICS_NAME="$TICS_NAME"
-+ WITH_CURSES_H="$with_curses_h"
-+ WITH_ECHO="$with_echo"
-+ WITH_OVERWRITE="$with_overwrite"
-+ cf_LIST_MODELS="$cf_list_models"
-+ cf_cv_abi_version="$cf_cv_abi_version"
-++cf_cv_do_relink="$cf_cv_do_relink"
-+ cf_cv_do_symlinks="$cf_cv_do_symlinks"
-+ cf_cv_enable_lp64="$cf_cv_enable_lp64"
-++cf_cv_enable_opaque="$cf_cv_enable_opaque"
-+ cf_cv_prog_CC_c_o=$cf_cv_prog_CC_c_o
-+ cf_cv_prog_CXX_c_o=$cf_cv_prog_CXX_c_o
-+ cf_cv_rel_version="$cf_cv_rel_version"
-+Index: dist.mk
-+Prereq:  1.567 
-+--- ncurses-5.6/dist.mk	2006-12-17 19:58:35.000000000 +0000
-++++ ncurses-5.6-20071201/dist.mk	2007-12-01 16:08:01.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ ##############################################################################
-+-# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
-++# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -25,7 +25,7 @@
-+ # use or other dealings in this Software without prior written               #
-+ # authorization.                                                             #
-+ ##############################################################################
-+-# $Id: dist.mk,v 1.567 2006/12/17 19:58:35 tom Exp $
-++# $Id: dist.mk,v 1.618 2007/12/01 16:08:01 tom Exp $
-+ # Makefile for creating ncurses distributions.
-+ #
-+ # This only needs to be used directly as a makefile by developers, but
-+@@ -37,7 +37,7 @@
-+ # These define the major/minor/patch versions of ncurses.
-+ NCURSES_MAJOR = 5
-+ NCURSES_MINOR = 6
-+-NCURSES_PATCH = 20061217
-++NCURSES_PATCH = 20071201
-+ 
-+ # We don't append the patch to the version, since this only applies to releases
-+ VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
-+@@ -106,6 +106,7 @@
-+ 	   fi ;\
-+ 	done
-+ 	# change some things to make weblint happy:
-++	@cat man_alias.sed           >> subst.tmp
-+ 	@echo 's/<B>/<STRONG>/g'     >> subst.tmp
-+ 	@echo 's/<\/B>/<\/STRONG>/g' >> subst.tmp
-+ 	@echo 's/<I>/<EM>/g'         >> subst.tmp
-+Index: doc/hackguide.doc
-+--- ncurses-5.6/doc/hackguide.doc	2005-12-24 15:44:52.000000000 +0000
-++++ ncurses-5.6-20071201/doc/hackguide.doc	2007-03-03 23:45:04.000000000 +0000
-+@@ -261,7 +261,7 @@
-+      lib_tracedmp.c lib_tracemse.c trace_buf.c
-+ 
-+    It  is  rather unlikely you will ever need to change these, unless you
-+-   want to introduce a new debug trace level for some reasoon.
-++   want to introduce a new debug trace level for some reason.
-+ 
-+    There  is  another  group  of  files  that  do direct I/O via tputs(),
-+    computations  on  the  terminal  capabilities,  or  queries  to the OS
-+Index: doc/html/ada/funcs/A.htm
-+--- ncurses-5.6/doc/html/ada/funcs/A.htm	2005-05-14 17:34:32.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/funcs/A.htm	2007-09-01 23:56:30.000000000 +0000
-+@@ -4,6 +4,21 @@
-+ <H2>Functions - A</H2>
-+ <A HREF="../funcs.htm" TARGET="_self">[index]</A>
-+ <UL COMPACT TYPE=DISC>
-++<LI><A HREF="../terminal_interface-curses-panels__ads.htm#ref_129_13" TARGET="main">Above</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_523_14" TARGET="main">Add -  terminal_interface-curses.ads:523</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_528_14" TARGET="main">Add -  terminal_interface-curses.ads:528</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_534_14" TARGET="main">Add -  terminal_interface-curses.ads:534</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_542_14" TARGET="main">Add -  terminal_interface-curses.ads:542</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_653_14" TARGET="main">Add -  terminal_interface-curses.ads:653</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_662_14" TARGET="main">Add -  terminal_interface-curses.ads:662</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_677_14" TARGET="main">Add -  terminal_interface-curses.ads:677</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_686_14" TARGET="main">Add -  terminal_interface-curses.ads:686</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1307_14" TARGET="main">Add_Character_To_Pad_And_Echo_It -  terminal_interface-curses.ads:1307</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1312_14" TARGET="main">Add_Character_To_Pad_And_Echo_It -  terminal_interface-curses.ads:1312</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_551_14" TARGET="main">Add_With_Immediate_Echo -  terminal_interface-curses.ads:551</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_557_14" TARGET="main">Add_With_Immediate_Echo -  terminal_interface-curses.ads:557</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_959_16" TARGET="main">Ahead</A>
-+ <LI><A HREF="../terminal_interface-curses-forms-field_types-user__adb.htm#ref_53_16" TARGET="main">Allocate_Arg</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1016_14" TARGET="main">Allow_Scrolling</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1836_14" TARGET="main">Assume_Default_Colors</A>
-+ </UL></BODY></HTML>
-+Index: doc/html/ada/funcs/B.htm
-+--- ncurses-5.6/doc/html/ada/funcs/B.htm	2006-09-23 20:31:30.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/funcs/B.htm	2007-09-01 23:56:30.000000000 +0000
-+@@ -4,8 +4,18 @@
-+ <H2>Functions - B</H2>
-+ <A HREF="../funcs.htm" TARGET="_self">[index]</A>
-+ <UL COMPACT TYPE=DISC>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2085_16" TARGET="main">Baud</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_804_16" TARGET="main">Beeper</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_454_14" TARGET="main">Background -  terminal_interface-curses-forms.ads:454</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_459_14" TARGET="main">Background -  terminal_interface-curses-forms.ads:459</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_451_14" TARGET="main">Background -  terminal_interface-curses-menus.ads:451</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_456_14" TARGET="main">Background -  terminal_interface-curses-menus.ads:456</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2052_16" TARGET="main">Baud</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1647_13" TARGET="main">Baudrate</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_870_14" TARGET="main">Beep</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_751_16" TARGET="main">Beeper</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_975_16" TARGET="main">Behind</A>
-++<LI><A HREF="../terminal_interface-curses-panels__ads.htm#ref_134_13" TARGET="main">Below</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_704_14" TARGET="main">Border</A>
-++<LI><A HREF="../terminal_interface-curses-panels__ads.htm#ref_77_14" TARGET="main">Bottom</A>
-+ <LI><A HREF="../terminal_interface-curses-panels__adb.htm#ref_65_16" TARGET="main">Bottompanel</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_720_14" TARGET="main">Box</A>
-+ </UL></BODY></HTML>
-+Index: doc/html/ada/funcs/C.htm
-+--- ncurses-5.6/doc/html/ada/funcs/C.htm	2006-09-23 20:31:30.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/funcs/C.htm	2007-09-01 23:56:30.000000000 +0000
-+@@ -4,24 +4,53 @@
-+ <H2>Functions - C</H2>
-+ <A HREF="../funcs.htm" TARGET="_self">[index]</A>
-+ <UL COMPACT TYPE=DISC>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2245_16" TARGET="main">Canchangecolor</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_824_16" TARGET="main">Cbreak</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1021_16" TARGET="main">Clear_Ok</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2212_16" TARGET="main">Canchangecolor</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1739_13" TARGET="main">Can_Change_Color</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_771_16" TARGET="main">Cbreak</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_382_13" TARGET="main">Changed</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_845_14" TARGET="main">Change_Attributes -  terminal_interface-curses.ads:845</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_854_14" TARGET="main">Change_Attributes -  terminal_interface-curses.ads:854</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1116_14" TARGET="main">Change_Background</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1152_14" TARGET="main">Change_Lines_Status</A>
-++<LI><A HREF="../terminal_interface-curses-forms-field_types__ads.htm#ref_185_13" TARGET="main">Char_Check_Router</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1080_14" TARGET="main">Clear</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_968_16" TARGET="main">Clear_Ok</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_981_14" TARGET="main">Clear_On_Next_Update</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1533_14" TARGET="main">Clear_Soft_Label_Keys</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1094_14" TARGET="main">Clear_To_End_Of_Line</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1087_14" TARGET="main">Clear_To_End_Of_Screen</A>
-+ <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_98_13" TARGET="main">Col -  terminal_interface-curses-text_io.ads:98</A>
-+ <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_99_13" TARGET="main">Col -  terminal_interface-curses-text_io.ads:99</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2262_16" TARGET="main">Colorcontent</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1322_16" TARGET="main">Copywin</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2229_16" TARGET="main">Colorcontent</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1744_14" TARGET="main">Color_Content</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_415_13" TARGET="main">Columns</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1174_14" TARGET="main">Copy</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1267_16" TARGET="main">Copywin</A>
-++<LI><A HREF="../terminal_interface-curses-forms-field_types__ads.htm#ref_167_13" TARGET="main">Copy_Arg</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_774_16" TARGET="main">Count -  terminal_interface-curses-forms.adb:774</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_912_16" TARGET="main">Count -  terminal_interface-curses-menus.adb:912</A>
-+ <LI><A HREF="../terminal_interface-curses-forms-field_types-enumeration-ada__ads.htm#ref_48_13" TARGET="main">Create -  terminal_interface-curses-forms-field_types-enumeration-ada.ads:48</A>
-+ <LI><A HREF="../terminal_interface-curses-forms-field_types-enumeration__ads.htm#ref_64_13" TARGET="main">Create -  terminal_interface-curses-forms-field_types-enumeration.ads:64</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_293_13" TARGET="main">Create -  terminal_interface-curses-forms.ads:293</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_623_13" TARGET="main">Create -  terminal_interface-curses-forms.ads:623</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_191_13" TARGET="main">Create -  terminal_interface-curses-menus.ads:191</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_638_13" TARGET="main">Create -  terminal_interface-curses-menus.ads:638</A>
-++<LI><A HREF="../terminal_interface-curses-panels__ads.htm#ref_67_13" TARGET="main">Create -  terminal_interface-curses-panels.ads:67</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_569_13" TARGET="main">Create -  terminal_interface-curses.ads:569</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_729_13" TARGET="main">Current -  terminal_interface-curses-forms.ads:729</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_294_13" TARGET="main">Current -  terminal_interface-curses-menus.ads:294</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_1040_16" TARGET="main">Current_Fld</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_481_13" TARGET="main">Current_Window</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_300_16" TARGET="main">Curr_Item</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2475_16" TARGET="main">curses_versionC</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2349_16" TARGET="main">Curs_Set</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2461_16" TARGET="main">C_Assume_Default_Colors</A>
-+-<LI><A HREF="../terminal_interface-curses-forms-field_types__ads.htm#ref_149_13" TARGET="main">C_Builtin_Router</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2459_17" TARGET="main">curses_freeall</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1859_14" TARGET="main">Curses_Free_All</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1846_13" TARGET="main">Curses_Version</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2451_16" TARGET="main">curses_versionC</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2316_16" TARGET="main">Curs_Set</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2437_16" TARGET="main">C_Assume_Default_Colors</A>
-++<LI><A HREF="../terminal_interface-curses-forms-field_types__ads.htm#ref_148_13" TARGET="main">C_Builtin_Router</A>
-++<LI><A HREF="../terminal_interface-curses-forms-field_types__ads.htm#ref_149_13" TARGET="main">C_Choice_Router</A>
-+ <LI><A HREF="../terminal_interface-curses-forms-field_types-user-choice__ads.htm#ref_80_13" TARGET="main">C_Generic_Choice</A>
-+ <LI><A HREF="../terminal_interface-curses-forms-field_types-user__ads.htm#ref_81_13" TARGET="main">C_Generic_Type</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2449_16" TARGET="main">C_Use_Default_Colors</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2425_16" TARGET="main">C_Use_Default_Colors</A>
-+ </UL></BODY></HTML>
-+Index: doc/html/ada/funcs/D.htm
-+--- ncurses-5.6/doc/html/ada/funcs/D.htm	2006-09-23 20:31:30.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/funcs/D.htm	2007-09-01 23:56:30.000000000 +0000
-+@@ -4,19 +4,44 @@
-+ <H2>Functions - D</H2>
-+ <A HREF="../funcs.htm" TARGET="_self">[index]</A>
-+ <UL COMPACT TYPE=DISC>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2033_16" TARGET="main">Defkey</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2281_16" TARGET="main">Def_Prog_Mode</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2283_16" TARGET="main">Def_Shell_Mode</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2065_16" TARGET="main">Delayoutput</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_692_13" TARGET="main">Data_Ahead</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_697_13" TARGET="main">Data_Behind</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_102_13" TARGET="main">Default_Field_Options</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_125_13" TARGET="main">Default_Form_Options</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_168_13" TARGET="main">Default_Item_Options</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_146_13" TARGET="main">Default_Menu_Options</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1596_14" TARGET="main">Define_Key</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2000_16" TARGET="main">Defkey</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2248_16" TARGET="main">Def_Prog_Mode</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2250_16" TARGET="main">Def_Shell_Mode</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2032_16" TARGET="main">Delayoutput</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1633_14" TARGET="main">Delay_Output</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_315_14" TARGET="main">Delete -  terminal_interface-curses-forms.ads:315</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_634_14" TARGET="main">Delete -  terminal_interface-curses-forms.ads:634</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_203_14" TARGET="main">Delete -  terminal_interface-curses-menus.ads:203</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_645_14" TARGET="main">Delete -  terminal_interface-curses-menus.ads:645</A>
-++<LI><A HREF="../terminal_interface-curses-panels__ads.htm#ref_139_14" TARGET="main">Delete -  terminal_interface-curses-panels.ads:139</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_588_14" TARGET="main">Delete -  terminal_interface-curses.ads:588</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1334_14" TARGET="main">Delete_Character -  terminal_interface-curses.ads:1334</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1339_14" TARGET="main">Delete_Character -  terminal_interface-curses.ads:1339</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1212_14" TARGET="main">Delete_Line</A>
-+ <LI><A HREF="../terminal_interface-curses-panels__adb.htm#ref_156_16" TARGET="main">Del_Panel</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_351_16" TARGET="main">Derwin</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_604_13" TARGET="main">Derived_Window</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_298_16" TARGET="main">Derwin</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_126_16" TARGET="main">Descname -  terminal_interface-curses-menus.adb:126</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_270_16" TARGET="main">Descname -  terminal_interface-curses-menus.adb:270</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_278_16" TARGET="main">Descname -  terminal_interface-curses-menus.adb:278</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_274_14" TARGET="main">Description -  terminal_interface-curses-menus.ads:274</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_278_14" TARGET="main">Description -  terminal_interface-curses-menus.ads:278</A>
-+ <LI><A HREF="../terminal_interface-curses-mouse__adb.htm#ref_134_14" TARGET="main">Dispatch_Event</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1114_16" TARGET="main">Do_Update</A>
-+-<LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_973_16" TARGET="main">Driver</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_374_16" TARGET="main">Dupwin</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1059_16" TARGET="main">Do_Update</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_711_13" TARGET="main">Driver -  terminal_interface-curses-forms.ads:711</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_660_13" TARGET="main">Driver -  terminal_interface-curses-menus.ads:660</A>
-++<LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_973_16" TARGET="main">Driver -  terminal_interface-curses-menus.adb:973</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_321_13" TARGET="main">Duplicate -  terminal_interface-curses-forms.ads:321</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_614_13" TARGET="main">Duplicate -  terminal_interface-curses.ads:614</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_321_16" TARGET="main">Dupwin</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_151_16" TARGET="main">Dup_Field</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_493_14" TARGET="main">Dynamic_Info</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_559_16" TARGET="main">Dyn_Info</A>
-+ </UL></BODY></HTML>
-+Index: doc/html/ada/funcs/E.htm
-+--- ncurses-5.6/doc/html/ada/funcs/E.htm	2006-09-23 20:31:30.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/funcs/E.htm	2007-09-01 23:56:30.000000000 +0000
-+@@ -4,7 +4,15 @@
-+ <H2>Functions - E</H2>
-+ <A HREF="../funcs.htm" TARGET="_self">[index]</A>
-+ <UL COMPACT TYPE=DISC>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_862_16" TARGET="main">Echo</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_166_16" TARGET="main">Endwin</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2093_16" TARGET="main">Erasechar</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_809_16" TARGET="main">Echo</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1586_14" TARGET="main">Enable_Key</A>
-++<LI><A HREF="../terminal_interface-curses-mouse__ads.htm#ref_154_13" TARGET="main">Enclosed_In_Window</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_113_16" TARGET="main">Endwin</A>
-++<LI><A HREF="../terminal_interface-curses-mouse__ads.htm#ref_128_14" TARGET="main">End_Mouse</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_497_14" TARGET="main">End_Screen</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_495_14" TARGET="main">End_Windows</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1074_14" TARGET="main">Erase</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2060_16" TARGET="main">Erasechar</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1652_13" TARGET="main">Erase_Character</A>
-++<LI><A HREF="../terminal_interface-curses-aux__ads.htm#ref_96_14" TARGET="main">Eti_Exception</A>
-+ </UL></BODY></HTML>
-+Index: doc/html/ada/funcs/F.htm
-+--- ncurses-5.6/doc/html/ada/funcs/F.htm	2006-09-23 20:31:30.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/funcs/F.htm	2007-09-01 23:56:30.000000000 +0000
-+@@ -4,10 +4,13 @@
-+ <H2>Functions - F</H2>
-+ <A HREF="../funcs.htm" TARGET="_self">[index]</A>
-+ <UL COMPACT TYPE=DISC>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_601_13" TARGET="main">Fields</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_468_16" TARGET="main">Field_Back -  terminal_interface-curses-forms.adb:468</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_478_16" TARGET="main">Field_Back -  terminal_interface-curses-forms.adb:478</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_255_16" TARGET="main">Field_Buffer -  terminal_interface-curses-forms.adb:255</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_266_16" TARGET="main">Field_Buffer -  terminal_interface-curses-forms.adb:266</A>
-++<LI><A HREF="../terminal_interface-curses-forms-field_types__ads.htm#ref_177_13" TARGET="main">Field_Check_Router</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_607_13" TARGET="main">Field_Count</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_424_16" TARGET="main">Field_Fore -  terminal_interface-curses-forms.adb:424</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_434_16" TARGET="main">Field_Fore -  terminal_interface-curses-forms.adb:434</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_213_16" TARGET="main">Field_Just</A>
-+@@ -17,11 +20,20 @@
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_507_16" TARGET="main">Field_Pad</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_293_16" TARGET="main">Field_Status</A>
-+ <LI><A HREF="../terminal_interface-curses-forms-field_user_data__adb.htm#ref_72_16" TARGET="main">Field_Userptr</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_814_16" TARGET="main">Flash</A>
-++<LI><A HREF="../terminal_interface-curses-aux__ads.htm#ref_116_14" TARGET="main">Fill_String -  terminal_interface-curses-aux.ads:116</A>
-++<LI><A HREF="../terminal_interface-curses-aux__ads.htm#ref_121_13" TARGET="main">Fill_String -  terminal_interface-curses-aux.ads:121</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_761_16" TARGET="main">Flash</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_875_14" TARGET="main">Flash_Screen</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_528_16" TARGET="main">Fld_Info</A>
-+ <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_65_14" TARGET="main">Flush -  terminal_interface-curses-text_io.ads:65</A>
-+ <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_66_14" TARGET="main">Flush -  terminal_interface-curses-text_io.ads:66</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2075_16" TARGET="main">Flushinp</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2042_16" TARGET="main">Flushinp</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1638_14" TARGET="main">Flush_Input</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_434_14" TARGET="main">Foreground -  terminal_interface-curses-forms.ads:434</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_439_14" TARGET="main">Foreground -  terminal_interface-curses-forms.ads:439</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_431_14" TARGET="main">Foreground -  terminal_interface-curses-menus.ads:431</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_436_14" TARGET="main">Foreground -  terminal_interface-curses-menus.ads:436</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_551_14" TARGET="main">Format</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_889_16" TARGET="main">Form_Opts</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_867_16" TARGET="main">Form_Opts_Off</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_864_16" TARGET="main">Form_Opts_On</A>
-+@@ -30,9 +42,14 @@
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_628_16" TARGET="main">Form_Sub</A>
-+ <LI><A HREF="../terminal_interface-curses-forms-form_user_data__adb.htm#ref_73_16" TARGET="main">Form_Userptr</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_600_16" TARGET="main">Form_Win</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_136_14" TARGET="main">Free -  terminal_interface-curses-forms.ads:136</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_180_14" TARGET="main">Free -  terminal_interface-curses-menus.ads:180</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_825_16" TARGET="main">Free -  terminal_interface-curses-forms.adb:825</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_958_16" TARGET="main">Free -  terminal_interface-curses-menus.adb:958</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_131_16" TARGET="main">Freeitem</A>
-++<LI><A HREF="../terminal_interface-curses-forms-field_types__ads.htm#ref_172_14" TARGET="main">Free_Arg</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_133_16" TARGET="main">Free_Field</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_996_16" TARGET="main">Frm_Driver</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_781_13" TARGET="main">Function_Key</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_786_13" TARGET="main">Function_Key_Code</A>
-+ </UL></BODY></HTML>
-+Index: doc/html/ada/funcs/G.htm
-+--- ncurses-5.6/doc/html/ada/funcs/G.htm	2006-09-23 20:31:30.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/funcs/G.htm	2007-09-01 23:56:30.000000000 +0000
-+@@ -8,26 +8,89 @@
-+ <LI><A HREF="../terminal_interface-curses-forms-field_types-user__ads.htm#ref_83_13" TARGET="main">Generic_Field_Check</A>
-+ <LI><A HREF="../terminal_interface-curses-forms-field_types-user-choice__ads.htm#ref_82_13" TARGET="main">Generic_Next</A>
-+ <LI><A HREF="../terminal_interface-curses-forms-field_types-user-choice__ads.htm#ref_89_13" TARGET="main">Generic_Prev</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1463_14" TARGET="main">Get -  terminal_interface-curses.ads:1463</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1474_14" TARGET="main">Get -  terminal_interface-curses.ads:1474</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1370_16" TARGET="main">GetBegX</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1367_16" TARGET="main">GetBegY</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1388_16" TARGET="main">GetCurX</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1385_16" TARGET="main">GetCurY</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1350_16" TARGET="main">GetMaxX</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1347_16" TARGET="main">GetMaxY</A>
-+ <LI><A HREF="../terminal_interface-curses-mouse__adb.htm#ref_69_16" TARGET="main">Getmouse</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1407_16" TARGET="main">GetParX</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1404_16" TARGET="main">GetParY</A>
-+ <LI><A HREF="../terminal_interface-curses-putwin__adb.htm#ref_65_16" TARGET="main">getwin</A>
-+ <LI><A HREF="../terminal_interface-curses-forms-field_types__adb.htm#ref_64_13" TARGET="main">Get_Arg</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1125_13" TARGET="main">Get_Background</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_362_14" TARGET="main">Get_Buffer -  terminal_interface-curses-forms.ads:362</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_368_13" TARGET="main">Get_Buffer -  terminal_interface-curses-forms.ads:368</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_826_13" TARGET="main">Get_Character_Attribute -  terminal_interface-curses.ads:826</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_832_13" TARGET="main">Get_Character_Attribute -  terminal_interface-curses.ads:832</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1244_14" TARGET="main">Get_Cursor_Position</A>
-+ <LI><A HREF="../terminal_interface-curses-termcap__ads.htm#ref_59_13" TARGET="main">Get_Entry</A>
-++<LI><A HREF="../terminal_interface-curses-mouse__ads.htm#ref_137_14" TARGET="main">Get_Event</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_1084_16" TARGET="main">Get_Fieldindex</A>
-+ <LI><A HREF="../terminal_interface-curses-forms-field_types__adb.htm#ref_61_13" TARGET="main">Get_Fieldtype</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_565_13" TARGET="main">Get_Field_Init_Hook</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_570_13" TARGET="main">Get_Field_Term_Hook</A>
-+ <LI><A HREF="../terminal_interface-curses-termcap__ads.htm#ref_63_13" TARGET="main">Get_Flag -  terminal_interface-curses-termcap.ads:63</A>
-+ <LI><A HREF="../terminal_interface-curses-terminfo__ads.htm#ref_64_13" TARGET="main">Get_Flag -  terminal_interface-curses-terminfo.ads:64</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_93_13" TARGET="main">Get_Flag -  terminal_interface-curses.adb:93</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_575_13" TARGET="main">Get_Form_Init_Hook</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_580_13" TARGET="main">Get_Form_Term_Hook</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_745_13" TARGET="main">Get_Index -  terminal_interface-curses-forms.ads:745</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_310_13" TARGET="main">Get_Index -  terminal_interface-curses-menus.ads:310</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_340_16" TARGET="main">Get_Itemindex</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_589_13" TARGET="main">Get_Item_Init_Hook</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_594_13" TARGET="main">Get_Item_Term_Hook</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_345_13" TARGET="main">Get_Justification</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_915_13" TARGET="main">Get_KeyPad_Mode</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_751_13" TARGET="main">Get_Keystroke</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_599_13" TARGET="main">Get_Menu_Init_Hook</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_532_16" TARGET="main">Get_Menu_Mark -  terminal_interface-curses-menus.adb:532</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_540_16" TARGET="main">Get_Menu_Mark -  terminal_interface-curses-menus.adb:540</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_604_13" TARGET="main">Get_Menu_Term_Hook</A>
-++<LI><A HREF="../terminal_interface-curses-mouse__ads.htm#ref_133_13" TARGET="main">Get_Mouse</A>
-+ <LI><A HREF="../terminal_interface-curses-termcap__ads.htm#ref_67_14" TARGET="main">Get_Number -  terminal_interface-curses-termcap.ads:67</A>
-+ <LI><A HREF="../terminal_interface-curses-terminfo__ads.htm#ref_68_13" TARGET="main">Get_Number -  terminal_interface-curses-terminfo.ads:68</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_411_14" TARGET="main">Get_Options -  terminal_interface-curses-forms.ads:411</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_416_13" TARGET="main">Get_Options -  terminal_interface-curses-forms.ads:416</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_658_14" TARGET="main">Get_Options -  terminal_interface-curses-forms.ads:658</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_663_13" TARGET="main">Get_Options -  terminal_interface-curses-forms.ads:663</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_251_14" TARGET="main">Get_Options -  terminal_interface-curses-menus.ads:251</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_256_13" TARGET="main">Get_Options -  terminal_interface-curses-menus.ads:256</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_347_14" TARGET="main">Get_Options -  terminal_interface-curses-menus.ads:347</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_352_13" TARGET="main">Get_Options -  terminal_interface-curses-menus.ads:352</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1252_14" TARGET="main">Get_Origin_Relative_To_Parent</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_1070_16" TARGET="main">Get_Page</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_758_16" TARGET="main">Get_Pattern</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1228_14" TARGET="main">Get_Size</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1522_14" TARGET="main">Get_Soft_Label_Key -  terminal_interface-curses.ads:1522</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1527_13" TARGET="main">Get_Soft_Label_Key -  terminal_interface-curses.ads:1527</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1563_13" TARGET="main">Get_Soft_Label_Key_Attributes -  terminal_interface-curses.ads:1563</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1567_13" TARGET="main">Get_Soft_Label_Key_Attributes -  terminal_interface-curses.ads:1567</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_713_16" TARGET="main">Get_Spacing</A>
-+ <LI><A HREF="../terminal_interface-curses-termcap__ads.htm#ref_73_14" TARGET="main">Get_String -  terminal_interface-curses-termcap.ads:73</A>
-+ <LI><A HREF="../terminal_interface-curses-termcap__ads.htm#ref_76_13" TARGET="main">Get_String -  terminal_interface-curses-termcap.ads:76</A>
-+ <LI><A HREF="../terminal_interface-curses-terminfo__ads.htm#ref_57_14" TARGET="main">Get_String -  terminal_interface-curses-terminfo.ads:57</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_522_13" TARGET="main">Get_Sub_Window -  terminal_interface-curses-forms.ads:522</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_378_13" TARGET="main">Get_Sub_Window -  terminal_interface-curses-menus.ads:378</A>
-++<LI><A HREF="../terminal_interface-curses-forms-field_types__ads.htm#ref_79_13" TARGET="main">Get_Type</A>
-++<LI><A HREF="../terminal_interface-curses-forms-field_user_data__ads.htm#ref_59_14" TARGET="main">Get_User_Data -  terminal_interface-curses-forms-field_user_data.ads:59</A>
-++<LI><A HREF="../terminal_interface-curses-forms-field_user_data__ads.htm#ref_64_13" TARGET="main">Get_User_Data -  terminal_interface-curses-forms-field_user_data.ads:64</A>
-++<LI><A HREF="../terminal_interface-curses-forms-form_user_data__ads.htm#ref_59_14" TARGET="main">Get_User_Data -  terminal_interface-curses-forms-form_user_data.ads:59</A>
-++<LI><A HREF="../terminal_interface-curses-forms-form_user_data__ads.htm#ref_64_13" TARGET="main">Get_User_Data -  terminal_interface-curses-forms-form_user_data.ads:64</A>
-++<LI><A HREF="../terminal_interface-curses-menus-item_user_data__ads.htm#ref_64_14" TARGET="main">Get_User_Data -  terminal_interface-curses-menus-item_user_data.ads:64</A>
-++<LI><A HREF="../terminal_interface-curses-menus-item_user_data__ads.htm#ref_69_13" TARGET="main">Get_User_Data -  terminal_interface-curses-menus-item_user_data.ads:69</A>
-++<LI><A HREF="../terminal_interface-curses-menus-menu_user_data__ads.htm#ref_59_14" TARGET="main">Get_User_Data -  terminal_interface-curses-menus-menu_user_data.ads:59</A>
-++<LI><A HREF="../terminal_interface-curses-menus-menu_user_data__ads.htm#ref_64_13" TARGET="main">Get_User_Data -  terminal_interface-curses-menus-menu_user_data.ads:64</A>
-++<LI><A HREF="../terminal_interface-curses-panels-user_data__ads.htm#ref_59_14" TARGET="main">Get_User_Data -  terminal_interface-curses-panels-user_data.ads:59</A>
-++<LI><A HREF="../terminal_interface-curses-panels-user_data__ads.htm#ref_64_13" TARGET="main">Get_User_Data -  terminal_interface-curses-panels-user_data.ads:64</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_511_13" TARGET="main">Get_Window -  terminal_interface-curses-forms.ads:511</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_367_13" TARGET="main">Get_Window -  terminal_interface-curses-menus.ads:367</A>
-++<LI><A HREF="../terminal_interface-curses-panels__ads.htm#ref_102_13" TARGET="main">Get_Window -  terminal_interface-curses-panels.ads:102</A>
-+ <LI><A HREF="../terminal_interface-curses-putwin__ads.htm#ref_48_13" TARGET="main">Get_Window -  terminal_interface-curses-putwin.ads:48</A>
-+ <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_62_13" TARGET="main">Get_Window -  terminal_interface-curses-text_io.ads:62</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1236_14" TARGET="main">Get_Window_Position</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_471_14" TARGET="main">Grey -  terminal_interface-curses-menus.ads:471</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_476_14" TARGET="main">Grey -  terminal_interface-curses-menus.ads:476</A>
-+ </UL></BODY></HTML>
-+Index: doc/html/ada/funcs/H.htm
-+--- ncurses-5.6/doc/html/ada/funcs/H.htm	2006-09-23 20:31:30.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/funcs/H.htm	2007-09-01 23:56:30.000000000 +0000
-+@@ -4,11 +4,19 @@
-+ <H2>Functions - H</H2>
-+ <A HREF="../funcs.htm" TARGET="_self">[index]</A>
-+ <UL COMPACT TYPE=DISC>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_910_16" TARGET="main">Halfdelay</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2216_16" TARGET="main">Hascolors</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_600_16" TARGET="main">Haskey</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2109_16" TARGET="main">Has_Ic</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2121_16" TARGET="main">Has_Il</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_859_16" TARGET="main">Halfdelay</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_923_14" TARGET="main">Half_Delay</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2183_16" TARGET="main">Hascolors</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_547_16" TARGET="main">Haskey</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1726_13" TARGET="main">Has_Colors</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2076_16" TARGET="main">Has_Ic</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2088_16" TARGET="main">Has_Il</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1662_13" TARGET="main">Has_Insert_Character</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1667_13" TARGET="main">Has_Insert_Line</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_767_13" TARGET="main">Has_Key</A>
-++<LI><A HREF="../terminal_interface-curses-mouse__ads.htm#ref_98_13" TARGET="main">Has_Mouse</A>
-+ <LI><A HREF="../terminal_interface-curses-terminfo__ads.htm#ref_60_13" TARGET="main">Has_String</A>
-++<LI><A HREF="../terminal_interface-curses-panels__ads.htm#ref_97_14" TARGET="main">Hide</A>
-+ <LI><A HREF="../terminal_interface-curses-panels__adb.htm#ref_95_16" TARGET="main">Hidepanel</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_728_14" TARGET="main">Horizontal_Line</A>
-+ </UL></BODY></HTML>
-+Index: doc/html/ada/funcs/I.htm
-+--- ncurses-5.6/doc/html/ada/funcs/I.htm	2006-09-23 20:31:30.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/funcs/I.htm	2007-09-01 23:56:30.000000000 +0000
-+@@ -4,19 +4,42 @@
-+ <H2>Functions - I</H2>
-+ <A HREF="../funcs.htm" TARGET="_self">[index]</A>
-+ <UL COMPACT TYPE=DISC>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1045_16" TARGET="main">IDC_Ok</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1033_16" TARGET="main">IDL_Ok</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1069_16" TARGET="main">Immedok</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2231_16" TARGET="main">Initcolor</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2177_16" TARGET="main">Initpair</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_153_16" TARGET="main">Initscr</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_922_16" TARGET="main">Intrflush</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_176_16" TARGET="main">Isendwin</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_992_17" TARGET="main">IDC_Ok</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_980_16" TARGET="main">IDL_Ok</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1009_14" TARGET="main">Immediate_Update_Mode</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1014_17" TARGET="main">Immedok</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_482_14" TARGET="main">Info</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2198_16" TARGET="main">Initcolor</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2144_16" TARGET="main">Initpair</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_100_16" TARGET="main">Initscr</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1731_14" TARGET="main">Init_Color</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1712_14" TARGET="main">Init_Pair</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_486_14" TARGET="main">Init_Screen</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1499_14" TARGET="main">Init_Soft_Label_Keys</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_489_14" TARGET="main">Init_Windows</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1371_14" TARGET="main">Insert -  terminal_interface-curses.ads:1371</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1377_14" TARGET="main">Insert -  terminal_interface-curses.ads:1377</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1389_14" TARGET="main">Insert -  terminal_interface-curses.ads:1389</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1398_14" TARGET="main">Insert -  terminal_interface-curses.ads:1398</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1204_14" TARGET="main">Insert_Delete_Lines</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1218_14" TARGET="main">Insert_Line</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_871_16" TARGET="main">Intrflush</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_123_16" TARGET="main">Isendwin</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_502_13" TARGET="main">Is_End_Window</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_774_13" TARGET="main">Is_Function_Key</A>
-++<LI><A HREF="../terminal_interface-curses-panels__ads.htm#ref_124_13" TARGET="main">Is_Hidden</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_851_16" TARGET="main">Is_Keypad</A>
-+ <LI><A HREF="../terminal_interface-curses-terminfo__adb.htm#ref_50_13" TARGET="main">Is_MinusOne_Pointer</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_1119_16" TARGET="main">Is_New</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_763_13" TARGET="main">Is_New_Page</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1035_16" TARGET="main">Is_Scroll_Ok</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1160_13" TARGET="main">Is_Touched -  terminal_interface-curses.ads:1160</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1165_13" TARGET="main">Is_Touched -  terminal_interface-curses.ads:1165</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_128_16" TARGET="main">Itemname -  terminal_interface-curses-menus.adb:128</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_253_16" TARGET="main">Itemname -  terminal_interface-curses-menus.adb:253</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_261_16" TARGET="main">Itemname -  terminal_interface-curses-menus.adb:261</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_623_13" TARGET="main">Items</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_629_13" TARGET="main">Item_Count</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_860_16" TARGET="main">Item_Init</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_234_16" TARGET="main">Item_Opts</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_214_16" TARGET="main">Item_Opts_Off</A>
-+Index: doc/html/ada/funcs/K.htm
-+--- ncurses-5.6/doc/html/ada/funcs/K.htm	2006-09-23 20:31:30.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/funcs/K.htm	2007-09-01 23:56:30.000000000 +0000
-+@@ -4,8 +4,11 @@
-+ <H2>Functions - K</H2>
-+ <A HREF="../funcs.htm" TARGET="_self">[index]</A>
-+ <UL COMPACT TYPE=DISC>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_117_16" TARGET="main">Keyname</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2020_16" TARGET="main">Keyok</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_893_16" TARGET="main">Keypad</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2101_16" TARGET="main">Killchar</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_64_16" TARGET="main">Keyname</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1987_16" TARGET="main">Keyok</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_840_16" TARGET="main">Keypad</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1610_14" TARGET="main">Key_Name -  terminal_interface-curses.ads:1610</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1616_13" TARGET="main">Key_Name -  terminal_interface-curses.ads:1616</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2068_16" TARGET="main">Killchar</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1657_13" TARGET="main">Kill_Character</A>
-+ </UL></BODY></HTML>
-+Index: doc/html/ada/funcs/L.htm
-+--- ncurses-5.6/doc/html/ada/funcs/L.htm	2006-09-23 20:31:30.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/funcs/L.htm	2007-09-01 23:56:30.000000000 +0000
-+@@ -4,12 +4,17 @@
-+ <H2>Functions - L</H2>
-+ <A HREF="../funcs.htm" TARGET="_self">[index]</A>
-+ <UL COMPACT TYPE=DISC>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1057_16" TARGET="main">Leave_Ok</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1002_14" TARGET="main">Leave_Cursor_After_Update</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1002_16" TARGET="main">Leave_Ok</A>
-+ <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_101_13" TARGET="main">Line -  terminal_interface-curses-text_io.ads:101</A>
-+ <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_102_13" TARGET="main">Line -  terminal_interface-curses-text_io.ads:102</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_412_13" TARGET="main">Lines</A>
-+ <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_77_13" TARGET="main">Line_Length -  terminal_interface-curses-text_io.ads:77</A>
-+ <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_78_13" TARGET="main">Line_Length -  terminal_interface-curses-text_io.ads:78</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_328_13" TARGET="main">Link</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_172_16" TARGET="main">Lnk_Field</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2143_16" TARGET="main">Longname -  terminal_interface-curses.adb:2143</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2151_16" TARGET="main">Longname -  terminal_interface-curses.adb:2151</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2110_16" TARGET="main">Longname -  terminal_interface-curses.adb:2110</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2118_16" TARGET="main">Longname -  terminal_interface-curses.adb:2118</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1677_14" TARGET="main">Long_Name -  terminal_interface-curses.ads:1677</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1681_13" TARGET="main">Long_Name -  terminal_interface-curses.ads:1681</A>
-+ </UL></BODY></HTML>
-+Index: doc/html/ada/funcs/M.htm
-+--- ncurses-5.6/doc/html/ada/funcs/M.htm	2006-09-23 20:31:30.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/funcs/M.htm	2007-09-01 23:56:30.000000000 +0000
-+@@ -4,6 +4,9 @@
-+ <H2>Functions - M</H2>
-+ <A HREF="../funcs.htm" TARGET="_self">[index]</A>
-+ <UL COMPACT TYPE=DISC>
-++<LI><A HREF="../terminal_interface-curses-forms-field_types__ads.htm#ref_162_13" TARGET="main">Make_Arg</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_409_14" TARGET="main">Mark -  terminal_interface-curses-menus.ads:409</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_413_14" TARGET="main">Mark -  terminal_interface-curses-menus.ads:413</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_608_16" TARGET="main">Menu_Back -  terminal_interface-curses-menus.adb:608</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_618_16" TARGET="main">Menu_Back -  terminal_interface-curses-menus.adb:618</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_787_16" TARGET="main">Menu_Fmt</A>
-+@@ -20,19 +23,25 @@
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_884_16" TARGET="main">Menu_Term</A>
-+ <LI><A HREF="../terminal_interface-curses-menus-menu_user_data__adb.htm#ref_63_16" TARGET="main">Menu_Userptr</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_446_16" TARGET="main">Menu_Win</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_882_16" TARGET="main">Meta</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_829_16" TARGET="main">Meta</A>
-+ <LI><A HREF="../terminal_interface-curses-mouse__adb.htm#ref_113_16" TARGET="main">MMask</A>
-+ <LI><A HREF="../terminal_interface-curses-mouse__adb.htm#ref_214_16" TARGET="main">Mouseinterval</A>
-+ <LI><A HREF="../terminal_interface-curses-mouse__adb.htm#ref_55_16" TARGET="main">Mouse_Avail</A>
-++<LI><A HREF="../terminal_interface-curses-mouse__ads.htm#ref_161_13" TARGET="main">Mouse_Interval</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_612_14" TARGET="main">Move -  terminal_interface-curses-forms.ads:612</A>
-++<LI><A HREF="../terminal_interface-curses-panels__ads.htm#ref_117_14" TARGET="main">Move -  terminal_interface-curses-panels.ads:117</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_786_16" TARGET="main">Move -  terminal_interface-curses-forms.adb:786</A>
-+ <LI><A HREF="../terminal_interface-curses-panels__adb.htm#ref_132_16" TARGET="main">Move -  terminal_interface-curses-panels.adb:132</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_403_16" TARGET="main">Mvderwin</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_229_16" TARGET="main">mvwaddch</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1613_16" TARGET="main">Mvwdelch</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_389_16" TARGET="main">Mvwin</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1637_16" TARGET="main">Mvwinch</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1662_16" TARGET="main">Mvwinsch</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1701_16" TARGET="main">Mvwinsnstr</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_511_14" TARGET="main">Move_Cursor</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_626_14" TARGET="main">Move_Derived_Window</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_619_14" TARGET="main">Move_Window</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_350_16" TARGET="main">Mvderwin</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_176_16" TARGET="main">mvwaddch</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1580_16" TARGET="main">Mvwdelch</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_336_16" TARGET="main">Mvwin</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1604_16" TARGET="main">Mvwinch</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1629_16" TARGET="main">Mvwinsch</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1668_16" TARGET="main">Mvwinsnstr</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_916_16" TARGET="main">M_Post -  terminal_interface-curses-forms.adb:916</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_354_16" TARGET="main">M_Post -  terminal_interface-curses-menus.adb:354</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_643_16" TARGET="main">M_Scale -  terminal_interface-curses-forms.adb:643</A>
-+Index: doc/html/ada/funcs/N.htm
-+--- ncurses-5.6/doc/html/ada/funcs/N.htm	2006-09-23 20:31:30.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/funcs/N.htm	2007-09-01 23:56:30.000000000 +0000
-+@@ -4,24 +4,32 @@
-+ <H2>Functions - N</H2>
-+ <A HREF="../funcs.htm" TARGET="_self">[index]</A>
-+ <UL COMPACT TYPE=DISC>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2362_16" TARGET="main">Napms</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_265_14" TARGET="main">Name -  terminal_interface-curses-menus.ads:265</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_268_14" TARGET="main">Name -  terminal_interface-curses-menus.ads:268</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2329_16" TARGET="main">Napms</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1806_14" TARGET="main">Nap_Milli_Seconds</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_116_16" TARGET="main">Newfield</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_804_16" TARGET="main">NewForm</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_98_16" TARGET="main">Newitem</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_939_16" TARGET="main">Newmenu</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1460_16" TARGET="main">Newpad</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1427_16" TARGET="main">Newpad</A>
-+ <LI><A HREF="../terminal_interface-curses-panels__adb.htm#ref_51_16" TARGET="main">Newpanel</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_287_16" TARGET="main">Newwin</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_234_16" TARGET="main">Newwin</A>
-++<LI><A HREF="../terminal_interface-curses-forms-field_types__ads.htm#ref_222_13" TARGET="main">New_Fieldtype</A>
-+ <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_86_14" TARGET="main">New_Line -  terminal_interface-curses-text_io.ads:86</A>
-+ <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_87_14" TARGET="main">New_Line -  terminal_interface-curses-text_io.ads:87</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1267_13" TARGET="main">New_Pad</A>
-+ <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_89_14" TARGET="main">New_Page -  terminal_interface-curses-text_io.ads:89</A>
-+ <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_90_14" TARGET="main">New_Page -  terminal_interface-curses-text_io.ads:90</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1000_16" TARGET="main">NL</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_826_16" TARGET="main">NoCbreak</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_953_16" TARGET="main">Nodelay</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_864_16" TARGET="main">NoEcho</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1002_16" TARGET="main">NoNL</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_845_16" TARGET="main">NoRaw</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_988_16" TARGET="main">Notimeout</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_936_17" TARGET="main">No_Qiflush</A>
-++<LI><A HREF="../terminal_interface-curses-forms-field_types__ads.htm#ref_193_13" TARGET="main">Next_Router</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_947_16" TARGET="main">NL</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_773_16" TARGET="main">NoCbreak</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_902_16" TARGET="main">Nodelay</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_811_16" TARGET="main">NoEcho</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_949_16" TARGET="main">NoNL</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_792_16" TARGET="main">NoRaw</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_935_16" TARGET="main">Notimeout</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_885_17" TARGET="main">No_Qiflush</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_421_13" TARGET="main">Number_Of_Colors</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_424_13" TARGET="main">Number_Of_Color_Pairs</A>
-+ </UL></BODY></HTML>
-+Index: doc/html/ada/funcs/O.htm
-+--- ncurses-5.6/doc/html/ada/funcs/O.htm	2006-09-23 20:31:30.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/funcs/O.htm	2007-09-01 23:56:30.000000000 +0000
-+@@ -5,6 +5,8 @@
-+ <A HREF="../funcs.htm" TARGET="_self">[index]</A>
-+ <UL COMPACT TYPE=DISC>
-+ <LI><A HREF="../terminal_interface-curses-text_io-aux__adb.htm#ref_59_17" TARGET="main">Output</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1363_16" TARGET="main">Overlay</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1351_16" TARGET="main">Overwrite</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1194_14" TARGET="main">Overlay -  terminal_interface-curses.ads:1194</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1308_16" TARGET="main">Overlay -  terminal_interface-curses.adb:1308</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1188_14" TARGET="main">Overwrite -  terminal_interface-curses.ads:1188</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1296_16" TARGET="main">Overwrite -  terminal_interface-curses.adb:1296</A>
-+ </UL></BODY></HTML>
-+Index: doc/html/ada/funcs/P.htm
-+--- ncurses-5.6/doc/html/ada/funcs/P.htm	2006-09-23 20:31:30.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/funcs/P.htm	2007-09-01 23:56:30.000000000 +0000
-+@@ -4,17 +4,33 @@
-+ <H2>Functions - P</H2>
-+ <A HREF="../funcs.htm" TARGET="_self">[index]</A>
-+ <UL COMPACT TYPE=DISC>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_472_14" TARGET="main">Pad_Character -  terminal_interface-curses-forms.ads:472</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_490_14" TARGET="main">Pad_Character -  terminal_interface-curses-menus.ads:490</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_740_13" TARGET="main">Page</A>
-+ <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_80_13" TARGET="main">Page_Length -  terminal_interface-curses-text_io.ads:80</A>
-+ <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_81_13" TARGET="main">Page_Length -  terminal_interface-curses-text_io.ads:81</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2199_16" TARGET="main">Paircontent</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2166_16" TARGET="main">Paircontent</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1719_14" TARGET="main">Pair_Content</A>
-+ <LI><A HREF="../terminal_interface-curses-panels__adb.htm#ref_144_16" TARGET="main">Panel_Hidden</A>
-+ <LI><A HREF="../terminal_interface-curses-panels-user_data__adb.htm#ref_65_16" TARGET="main">Panel_Userptr</A>
-+ <LI><A HREF="../terminal_interface-curses-panels__adb.htm#ref_105_16" TARGET="main">Panel_Win</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1564_16" TARGET="main">Pechochar</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1539_16" TARGET="main">Pnoutrefresh</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_527_14" TARGET="main">Pattern</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1531_16" TARGET="main">Pechochar</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1352_13" TARGET="main">Peek -  terminal_interface-curses.ads:1352</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1358_13" TARGET="main">Peek -  terminal_interface-curses.ads:1358</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1414_14" TARGET="main">Peek -  terminal_interface-curses.ads:1414</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1423_14" TARGET="main">Peek -  terminal_interface-curses.ads:1423</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1438_14" TARGET="main">Peek -  terminal_interface-curses.ads:1438</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1447_14" TARGET="main">Peek -  terminal_interface-curses.ads:1447</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1506_16" TARGET="main">Pnoutrefresh</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_683_14" TARGET="main">Position_Cursor -  terminal_interface-curses-forms.ads:683</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_394_14" TARGET="main">Position_Cursor -  terminal_interface-curses-menus.ads:394</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_672_14" TARGET="main">Post -  terminal_interface-curses-forms.ads:672</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_322_14" TARGET="main">Post -  terminal_interface-curses-menus.ads:322</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_941_16" TARGET="main">Pos_Form_Cursor</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_499_16" TARGET="main">Pos_Menu_Cursor</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1509_16" TARGET="main">Prefresh</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1476_16" TARGET="main">Prefresh</A>
-++<LI><A HREF="../terminal_interface-curses-forms-field_types__ads.htm#ref_201_13" TARGET="main">Prev_Router</A>
-+ <LI><A HREF="../terminal_interface-curses-text_io-complex_io__ads.htm#ref_54_14" TARGET="main">Put -  terminal_interface-curses-text_io-complex_io.ads:54</A>
-+ <LI><A HREF="../terminal_interface-curses-text_io-complex_io__ads.htm#ref_61_14" TARGET="main">Put -  terminal_interface-curses-text_io-complex_io.ads:61</A>
-+ <LI><A HREF="../terminal_interface-curses-text_io-decimal_io__ads.htm#ref_50_14" TARGET="main">Put -  terminal_interface-curses-text_io-decimal_io.ads:50</A>
-+Index: doc/html/ada/funcs/Q.htm
-+--- ncurses-5.6/doc/html/ada/funcs/Q.htm	2005-05-14 17:34:32.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/funcs/Q.htm	2007-05-05 20:35:19.000000000 +0000
-+@@ -4,5 +4,5 @@
-+ <H2>Functions - Q</H2>
-+ <A HREF="../funcs.htm" TARGET="_self">[index]</A>
-+ <UL COMPACT TYPE=DISC>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_934_17" TARGET="main">Qiflush</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_883_17" TARGET="main">Qiflush</A>
-+ </UL></BODY></HTML>
-+Index: doc/html/ada/funcs/R.htm
-+--- ncurses-5.6/doc/html/ada/funcs/R.htm	2006-09-23 20:31:30.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/funcs/R.htm	2007-09-01 23:56:30.000000000 +0000
-+@@ -4,14 +4,36 @@
-+ <H2>Functions - R</H2>
-+ <A HREF="../funcs.htm" TARGET="_self">[index]</A>
-+ <UL COMPACT TYPE=DISC>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_843_16" TARGET="main">Raw</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1145_16" TARGET="main">Redrawwin</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_790_16" TARGET="main">Raw</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_589_14" TARGET="main">Redefine -  terminal_interface-curses-forms.ads:589</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_613_14" TARGET="main">Redefine -  terminal_interface-curses-menus.ads:613</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1059_14" TARGET="main">Redraw -  terminal_interface-curses.ads:1059</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1063_14" TARGET="main">Redraw -  terminal_interface-curses.ads:1063</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1090_16" TARGET="main">Redrawwin</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1045_14" TARGET="main">Refresh -  terminal_interface-curses.ads:1045</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1283_14" TARGET="main">Refresh -  terminal_interface-curses.ads:1283</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1512_14" TARGET="main">Refresh_Soft_Label_Keys</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1517_14" TARGET="main">Refresh_Soft_Label_Keys_Without_Update</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1052_14" TARGET="main">Refresh_Without_Update -  terminal_interface-curses.ads:1052</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1295_14" TARGET="main">Refresh_Without_Update -  terminal_interface-curses.ads:1295</A>
-++<LI><A HREF="../terminal_interface-curses-mouse__ads.htm#ref_101_14" TARGET="main">Register_Reportable_Event</A>
-++<LI><A HREF="../terminal_interface-curses-mouse__ads.htm#ref_110_14" TARGET="main">Register_Reportable_Events</A>
-+ <LI><A HREF="../terminal_interface-curses-forms-field_types-enumeration__ads.htm#ref_77_14" TARGET="main">Release</A>
-++<LI><A HREF="../terminal_interface-curses-panels__ads.htm#ref_111_14" TARGET="main">Replace</A>
-+ <LI><A HREF="../terminal_interface-curses-panels__adb.htm#ref_119_16" TARGET="main">Replace_Pan</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_276_14" TARGET="main">Request_Name -  terminal_interface-curses-forms.ads:276</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_279_14" TARGET="main">Request_Name -  terminal_interface-curses-forms.ads:279</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_106_14" TARGET="main">Request_Name -  terminal_interface-curses-menus.ads:106</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_109_14" TARGET="main">Request_Name -  terminal_interface-curses-menus.ads:109</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_80_16" TARGET="main">Request_Name -  terminal_interface-curses-menus.adb:80</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_88_16" TARGET="main">Request_Name -  terminal_interface-curses-menus.adb:88</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2327_16" TARGET="main">Resetty</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2299_16" TARGET="main">Reset_Prog_Mode</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2301_16" TARGET="main">Reset_Shell_Mode</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2338_16" TARGET="main">Ripoffline</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2294_16" TARGET="main">Resetty</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1765_14" TARGET="main">Reset_Curses_Mode</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2266_16" TARGET="main">Reset_Prog_Mode</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2268_16" TARGET="main">Reset_Shell_Mode</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1776_14" TARGET="main">Reset_Terminal_State</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1911_14" TARGET="main">Resize</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1538_14" TARGET="main">Restore_Soft_Label_Keys</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2305_16" TARGET="main">Ripoffline</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1789_14" TARGET="main">Rip_Off_Lines</A>
-+ </UL></BODY></HTML>
-+Index: doc/html/ada/funcs/S.htm
-+--- ncurses-5.6/doc/html/ada/funcs/S.htm	2006-09-23 20:31:30.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/funcs/S.htm	2007-09-01 23:56:30.000000000 +0000
-+@@ -4,24 +4,51 @@
-+ <H2>Functions - S</H2>
-+ <A HREF="../funcs.htm" TARGET="_self">[index]</A>
-+ <UL COMPACT TYPE=DISC>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2317_16" TARGET="main">Savetty</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1081_16" TARGET="main">Scrollok</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2499_16" TARGET="main">scr_dump</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2525_16" TARGET="main">scr_init</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2512_16" TARGET="main">scr_restore</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2538_16" TARGET="main">scr_set</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2284_16" TARGET="main">Savetty</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1759_14" TARGET="main">Save_Curses_Mode</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1771_14" TARGET="main">Save_Terminal_State</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_527_14" TARGET="main">Scale -  terminal_interface-curses-forms.ads:527</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_383_14" TARGET="main">Scale -  terminal_interface-curses-menus.ads:383</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1867_14" TARGET="main">Screen_Dump_To_File</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1875_14" TARGET="main">Screen_Init_From_File</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1871_14" TARGET="main">Screen_Restore_From_File</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1879_14" TARGET="main">Screen_Set_File</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1322_14" TARGET="main">Scroll</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1022_13" TARGET="main">Scrolling_Allowed</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1024_16" TARGET="main">Scrollok</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2489_16" TARGET="main">scr_dump</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2515_16" TARGET="main">scr_init</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2502_16" TARGET="main">scr_restore</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2528_16" TARGET="main">scr_set</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_446_14" TARGET="main">Set_Background -  terminal_interface-curses-forms.ads:446</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_443_14" TARGET="main">Set_Background -  terminal_interface-curses-menus.ads:443</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1108_14" TARGET="main">Set_Background -  terminal_interface-curses.ads:1108</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_354_14" TARGET="main">Set_Buffer</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_886_14" TARGET="main">Set_Cbreak_Mode</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_817_14" TARGET="main">Set_Character_Attributes</A>
-+ <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_92_14" TARGET="main">Set_Col -  terminal_interface-curses-text_io.ads:92</A>
-+ <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_93_14" TARGET="main">Set_Col -  terminal_interface-curses-text_io.ads:93</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_838_14" TARGET="main">Set_Color</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_723_14" TARGET="main">Set_Current -  terminal_interface-curses-forms.ads:723</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_288_14" TARGET="main">Set_Current -  terminal_interface-curses-menus.ads:288</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_1026_16" TARGET="main">Set_Current_Fld</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_287_16" TARGET="main">Set_Curr_Item</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1801_14" TARGET="main">Set_Cursor_Visibility</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_898_14" TARGET="main">Set_Echo_Mode</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_964_14" TARGET="main">Set_Escape_Timer_Mode</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_595_14" TARGET="main">Set_Fields</A>
-++<LI><A HREF="../terminal_interface-curses-forms-field_types__ads.htm#ref_227_13" TARGET="main">Set_Fieldtype_Arg</A>
-++<LI><A HREF="../terminal_interface-curses-forms-field_types__ads.htm#ref_234_13" TARGET="main">Set_Fieldtype_Choice</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_448_16" TARGET="main">Set_Field_Back</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_404_16" TARGET="main">Set_Field_Fore</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_665_16" TARGET="main">Set_Field_Init</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_541_14" TARGET="main">Set_Field_Init_Hook</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_196_16" TARGET="main">Set_Field_Just</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_310_16" TARGET="main">Set_Field_Max</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_330_16" TARGET="main">Set_Field_Opts</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_490_16" TARGET="main">Set_Field_Pad</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_681_16" TARGET="main">Set_Field_Term</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_547_14" TARGET="main">Set_Field_Term_Hook</A>
-+ <LI><A HREF="../terminal_interface-curses-forms-field_types-alpha__ads.htm#ref_49_14" TARGET="main">Set_Field_Type -  terminal_interface-curses-forms-field_types-alpha.ads:49</A>
-+ <LI><A HREF="../terminal_interface-curses-forms-field_types-alphanumeric__ads.htm#ref_50_14" TARGET="main">Set_Field_Type -  terminal_interface-curses-forms-field_types-alphanumeric.ads:50</A>
-+ <LI><A HREF="../terminal_interface-curses-forms-field_types-enumeration__ads.htm#ref_84_14" TARGET="main">Set_Field_Type -  terminal_interface-curses-forms-field_types-enumeration.ads:84</A>
-+@@ -41,58 +68,124 @@
-+ <LI><A HREF="../terminal_interface-curses-forms-field_types-numeric__adb.htm#ref_56_16" TARGET="main">Set_Fld_Type -  terminal_interface-curses-forms-field_types-numeric.adb:56</A>
-+ <LI><A HREF="../terminal_interface-curses-forms-field_types-user__adb.htm#ref_56_16" TARGET="main">Set_Fld_Type -  terminal_interface-curses-forms-field_types-user.adb:56</A>
-+ <LI><A HREF="../terminal_interface-curses-forms-field_types__adb.htm#ref_153_16" TARGET="main">Set_Fld_Type -  terminal_interface-curses-forms-field_types.adb:153</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_928_14" TARGET="main">Set_Flush_On_Interrupt_Mode</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_426_14" TARGET="main">Set_Foreground -  terminal_interface-curses-forms.ads:426</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_423_14" TARGET="main">Set_Foreground -  terminal_interface-curses-menus.ads:423</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_537_14" TARGET="main">Set_Format</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_697_16" TARGET="main">Set_Form_Init</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_553_14" TARGET="main">Set_Form_Init_Hook</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_845_16" TARGET="main">Set_Form_Opts</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_613_16" TARGET="main">Set_Form_Sub</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_713_16" TARGET="main">Set_Form_Term</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_559_14" TARGET="main">Set_Form_Term_Hook</A>
-+ <LI><A HREF="../terminal_interface-curses-forms-form_user_data__adb.htm#ref_58_16" TARGET="main">Set_Form_Userptr</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_585_16" TARGET="main">Set_Form_Win</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_733_16" TARGET="main">Set_Frm_Fields</A>
-+ <LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_1056_16" TARGET="main">Set_Frm_Page</A>
-+ <LI><A HREF="../terminal_interface-curses-forms-field_types-regexp__adb.htm#ref_54_16" TARGET="main">Set_Ftyp</A>
-+-<LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_893_16" TARGET="main">Set_Items</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_463_14" TARGET="main">Set_Grey</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_618_14" TARGET="main">Set_Items -  terminal_interface-curses-menus.ads:618</A>
-++<LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_893_16" TARGET="main">Set_Items -  terminal_interface-curses-menus.adb:893</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_805_16" TARGET="main">Set_Item_Init</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_565_14" TARGET="main">Set_Item_Init_Hook</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_194_16" TARGET="main">Set_Item_Opts</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_819_16" TARGET="main">Set_Item_Term</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_571_14" TARGET="main">Set_Item_Term_Hook</A>
-+ <LI><A HREF="../terminal_interface-curses-menus-item_user_data__adb.htm#ref_51_16" TARGET="main">Set_Item_Userptr</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_155_16" TARGET="main">Set_Item_Val</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_339_14" TARGET="main">Set_Justification</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_910_14" TARGET="main">Set_KeyPad_Mode</A>
-+ <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_95_14" TARGET="main">Set_Line -  terminal_interface-curses-text_io.ads:95</A>
-+ <LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_96_14" TARGET="main">Set_Line -  terminal_interface-curses-text_io.ads:96</A>
-+-<LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_514_16" TARGET="main">Set_Mark</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_403_14" TARGET="main">Set_Mark -  terminal_interface-curses-menus.ads:403</A>
-++<LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_514_16" TARGET="main">Set_Mark -  terminal_interface-curses-menus.adb:514</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_387_14" TARGET="main">Set_Maximum_Size</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_591_16" TARGET="main">Set_Menu_Back</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_768_16" TARGET="main">Set_Menu_Fmt</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_552_16" TARGET="main">Set_Menu_Fore</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_629_16" TARGET="main">Set_Menu_Grey</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_833_16" TARGET="main">Set_Menu_Init</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_577_14" TARGET="main">Set_Menu_Init_Hook</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_374_16" TARGET="main">Set_Menu_Opts</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_667_16" TARGET="main">Set_Menu_Pad</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_457_16" TARGET="main">Set_Menu_Sub</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_847_16" TARGET="main">Set_Menu_Term</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_583_14" TARGET="main">Set_Menu_Term_Hook</A>
-+ <LI><A HREF="../terminal_interface-curses-menus-menu_user_data__adb.htm#ref_50_16" TARGET="main">Set_Menu_Userptr</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_433_16" TARGET="main">Set_Menu_Win</A>
-+-<LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_1105_16" TARGET="main">Set_Page</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_904_14" TARGET="main">Set_Meta_Mode</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_757_14" TARGET="main">Set_New_Page</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_975_14" TARGET="main">Set_NL_Mode</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_943_14" TARGET="main">Set_NoDelay_Mode</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_397_14" TARGET="main">Set_Options -  terminal_interface-curses-forms.ads:397</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_644_14" TARGET="main">Set_Options -  terminal_interface-curses-forms.ads:644</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_236_14" TARGET="main">Set_Options -  terminal_interface-curses-menus.ads:236</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_333_14" TARGET="main">Set_Options -  terminal_interface-curses-menus.ads:333</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_466_14" TARGET="main">Set_Pad_Character -  terminal_interface-curses-forms.ads:466</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_484_14" TARGET="main">Set_Pad_Character -  terminal_interface-curses-menus.ads:484</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_734_14" TARGET="main">Set_Page -  terminal_interface-curses-forms.ads:734</A>
-++<LI><A HREF="../terminal_interface-curses-forms__adb.htm#ref_1105_16" TARGET="main">Set_Page -  terminal_interface-curses-forms.adb:1105</A>
-+ <LI><A HREF="../terminal_interface-curses-panels-user_data__adb.htm#ref_54_16" TARGET="main">Set_Panel_Userptr</A>
-+-<LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_736_16" TARGET="main">Set_Pattern</A>
-+-<LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_693_16" TARGET="main">Set_Spacing</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_520_13" TARGET="main">Set_Pattern -  terminal_interface-curses-menus.ads:520</A>
-++<LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_736_16" TARGET="main">Set_Pattern -  terminal_interface-curses-menus.adb:736</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_935_14" TARGET="main">Set_Queue_Interrupt_Mode</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_892_14" TARGET="main">Set_Raw_Mode</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1027_14" TARGET="main">Set_Scroll_Region</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1505_14" TARGET="main">Set_Soft_Label_Key</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1556_14" TARGET="main">Set_Soft_Label_Key_Attributes</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1572_14" TARGET="main">Set_Soft_Label_Key_Color</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_500_14" TARGET="main">Set_Spacing -  terminal_interface-curses-menus.ads:500</A>
-++<LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_693_16" TARGET="main">Set_Spacing -  terminal_interface-curses-menus.adb:693</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_376_14" TARGET="main">Set_Status</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_516_14" TARGET="main">Set_Sub_Window -  terminal_interface-curses-forms.ads:516</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_372_14" TARGET="main">Set_Sub_Window -  terminal_interface-curses-menus.ads:372</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_643_14" TARGET="main">Set_Synch_Mode</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_952_14" TARGET="main">Set_Timeout_Mode</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_314_16" TARGET="main">Set_Toprow</A>
-+-<LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_59_14" TARGET="main">Set_Window</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_299_14" TARGET="main">Set_Top_Row</A>
-++<LI><A HREF="../terminal_interface-curses-forms-field_user_data__ads.htm#ref_53_14" TARGET="main">Set_User_Data -  terminal_interface-curses-forms-field_user_data.ads:53</A>
-++<LI><A HREF="../terminal_interface-curses-forms-form_user_data__ads.htm#ref_53_14" TARGET="main">Set_User_Data -  terminal_interface-curses-forms-form_user_data.ads:53</A>
-++<LI><A HREF="../terminal_interface-curses-menus-item_user_data__ads.htm#ref_58_14" TARGET="main">Set_User_Data -  terminal_interface-curses-menus-item_user_data.ads:58</A>
-++<LI><A HREF="../terminal_interface-curses-menus-menu_user_data__ads.htm#ref_53_14" TARGET="main">Set_User_Data -  terminal_interface-curses-menus-menu_user_data.ads:53</A>
-++<LI><A HREF="../terminal_interface-curses-panels-user_data__ads.htm#ref_53_14" TARGET="main">Set_User_Data -  terminal_interface-curses-panels-user_data.ads:53</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_212_14" TARGET="main">Set_Value</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_505_14" TARGET="main">Set_Window -  terminal_interface-curses-forms.ads:505</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_361_14" TARGET="main">Set_Window -  terminal_interface-curses-menus.ads:361</A>
-++<LI><A HREF="../terminal_interface-curses-text_io__ads.htm#ref_59_14" TARGET="main">Set_Window -  terminal_interface-curses-text_io.ads:59</A>
-++<LI><A HREF="../terminal_interface-curses-panels__ads.htm#ref_87_14" TARGET="main">Show</A>
-+ <LI><A HREF="../terminal_interface-curses-panels__adb.htm#ref_85_16" TARGET="main">Showpanel</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1988_16" TARGET="main">Slk_Attr -  terminal_interface-curses.adb:1988</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1998_16" TARGET="main">Slk_Attr -  terminal_interface-curses.adb:1998</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1952_16" TARGET="main">Slk_Attroff</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1950_16" TARGET="main">Slk_Attron</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1974_16" TARGET="main">Slk_Attrset</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1918_16" TARGET="main">Slk_Clear</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2008_16" TARGET="main">Slk_Color</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1852_16" TARGET="main">Slk_Init</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1902_16" TARGET="main">Slk_Label -  terminal_interface-curses.adb:1902</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1910_16" TARGET="main">Slk_Label -  terminal_interface-curses.adb:1910</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1891_16" TARGET="main">Slk_Noutrefresh</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1881_16" TARGET="main">Slk_Refresh</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1928_16" TARGET="main">Slk_Restore</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1864_16" TARGET="main">Slk_Set</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1938_16" TARGET="main">Slk_Touch</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1479_16" TARGET="main">Subpad</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_323_16" TARGET="main">Subwin</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_416_16" TARGET="main">Syncok</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1955_16" TARGET="main">Slk_Attr -  terminal_interface-curses.adb:1955</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1965_16" TARGET="main">Slk_Attr -  terminal_interface-curses.adb:1965</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1919_16" TARGET="main">Slk_Attroff</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1917_16" TARGET="main">Slk_Attron</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1941_16" TARGET="main">Slk_Attrset</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1885_16" TARGET="main">Slk_Clear</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1975_16" TARGET="main">Slk_Color</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1819_16" TARGET="main">Slk_Init</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1869_16" TARGET="main">Slk_Label -  terminal_interface-curses.adb:1869</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1877_16" TARGET="main">Slk_Label -  terminal_interface-curses.adb:1877</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1858_16" TARGET="main">Slk_Noutrefresh</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1848_16" TARGET="main">Slk_Refresh</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1895_16" TARGET="main">Slk_Restore</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1831_16" TARGET="main">Slk_Set</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1905_16" TARGET="main">Slk_Touch</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_508_14" TARGET="main">Spacing</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_476_13" TARGET="main">Standard_Window</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_800_14" TARGET="main">Standout</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1707_14" TARGET="main">Start_Color</A>
-++<LI><A HREF="../terminal_interface-curses-mouse__ads.htm#ref_123_13" TARGET="main">Start_Mouse</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1446_16" TARGET="main">Subpad</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_270_16" TARGET="main">Subwin</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1273_13" TARGET="main">Sub_Pad</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_594_13" TARGET="main">Sub_Window</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1672_13" TARGET="main">Supported_Attributes</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_806_14" TARGET="main">Switch_Character_Attribute</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_403_14" TARGET="main">Switch_Options -  terminal_interface-curses-forms.ads:403</A>
-++<LI><A HREF="../terminal_interface-curses-forms__ads.htm#ref_650_14" TARGET="main">Switch_Options -  terminal_interface-curses-forms.ads:650</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_242_14" TARGET="main">Switch_Options -  terminal_interface-curses-menus.ads:242</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_339_14" TARGET="main">Switch_Options -  terminal_interface-curses-menus.ads:339</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1548_14" TARGET="main">Switch_Soft_Label_Key_Attributes</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_638_14" TARGET="main">Synchronize_Downwards</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_633_14" TARGET="main">Synchronize_Upwards</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_363_16" TARGET="main">Syncok</A>
-+ </UL></BODY></HTML>
-+Index: doc/html/ada/funcs/T.htm
-+--- ncurses-5.6/doc/html/ada/funcs/T.htm	2006-09-23 20:31:30.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/funcs/T.htm	2007-09-01 23:56:30.000000000 +0000
-+@@ -4,9 +4,12 @@
-+ <H2>Functions - T</H2>
-+ <A HREF="../funcs.htm" TARGET="_self">[index]</A>
-+ <UL COMPACT TYPE=DISC>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2133_16" TARGET="main">Termattrs</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2159_16" TARGET="main">Termname -  terminal_interface-curses.adb:2159</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2167_16" TARGET="main">Termname -  terminal_interface-curses.adb:2167</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_418_13" TARGET="main">Tab_Size</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2100_16" TARGET="main">Termattrs</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1687_14" TARGET="main">Terminal_Name -  terminal_interface-curses.ads:1687</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1691_13" TARGET="main">Terminal_Name -  terminal_interface-curses.ads:1691</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2126_16" TARGET="main">Termname -  terminal_interface-curses.adb:2126</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2134_16" TARGET="main">Termname -  terminal_interface-curses.adb:2134</A>
-+ <LI><A HREF="../terminal_interface-curses-termcap__adb.htm#ref_51_16" TARGET="main">tgetent</A>
-+ <LI><A HREF="../terminal_interface-curses-termcap__adb.htm#ref_71_16" TARGET="main">tgetflag</A>
-+ <LI><A HREF="../terminal_interface-curses-termcap__adb.htm#ref_89_16" TARGET="main">tgetnum</A>
-+@@ -18,8 +21,16 @@
-+ <LI><A HREF="../terminal_interface-curses-terminfo__adb.htm#ref_87_16" TARGET="main">tigetstr -  terminal_interface-curses-terminfo.adb:87</A>
-+ <LI><A HREF="../terminal_interface-curses-terminfo__adb.htm#ref_108_16" TARGET="main">tigetstr -  terminal_interface-curses-terminfo.adb:108</A>
-+ <LI><A HREF="../terminal_interface-curses-terminfo__adb.htm#ref_127_16" TARGET="main">tigetstr -  terminal_interface-curses-terminfo.adb:127</A>
-++<LI><A HREF="../terminal_interface-curses-panels__ads.htm#ref_82_14" TARGET="main">Top</A>
-+ <LI><A HREF="../terminal_interface-curses-panels__adb.htm#ref_75_16" TARGET="main">Toppanel</A>
-+ <LI><A HREF="../terminal_interface-curses-menus__adb.htm#ref_327_16" TARGET="main">Toprow</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_305_13" TARGET="main">Top_Row</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1141_14" TARGET="main">Touch -  terminal_interface-curses.ads:1141</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1145_14" TARGET="main">Touch -  terminal_interface-curses.ads:1145</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1543_14" TARGET="main">Touch_Soft_Label_Keys</A>
-+ <LI><A HREF="../terminal_interface-curses-terminfo__adb.htm#ref_140_16" TARGET="main">tputs</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2426_16" TARGET="main">Transform</A>
-++<LI><A HREF="../terminal_interface-curses-trace__ads.htm#ref_102_14" TARGET="main">Trace_On</A>
-++<LI><A HREF="../terminal_interface-curses-trace__ads.htm#ref_106_14" TARGET="main">Trace_Put</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2402_16" TARGET="main">Transform</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1814_14" TARGET="main">Transform_Coordinates</A>
-+ </UL></BODY></HTML>
-+Index: doc/html/ada/funcs/U.htm
-+--- ncurses-5.6/doc/html/ada/funcs/U.htm	2006-09-23 20:31:30.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/funcs/U.htm	2007-09-01 23:56:30.000000000 +0000
-+@@ -4,9 +4,20 @@
-+ <H2>Functions - U</H2>
-+ <A HREF="../funcs.htm" TARGET="_self">[index]</A>
-+ <UL COMPACT TYPE=DISC>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2049_16" TARGET="main">Unctrl -  terminal_interface-curses.adb:2049</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2057_16" TARGET="main">Unctrl -  terminal_interface-curses.adb:2057</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_590_16" TARGET="main">Ungetch</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2016_16" TARGET="main">Unctrl -  terminal_interface-curses.adb:2016</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2024_16" TARGET="main">Unctrl -  terminal_interface-curses.adb:2024</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_762_14" TARGET="main">Undo_Keystroke</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_537_16" TARGET="main">Ungetch</A>
-+ <LI><A HREF="../terminal_interface-curses-mouse__adb.htm#ref_189_16" TARGET="main">Ungetmouse</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2484_16" TARGET="main">use_extended_namesC</A>
-++<LI><A HREF="../terminal_interface-curses-mouse__ads.htm#ref_149_14" TARGET="main">Unget_Mouse</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1136_14" TARGET="main">Untouch</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1622_14" TARGET="main">Un_Control -  terminal_interface-curses.ads:1622</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1627_13" TARGET="main">Un_Control -  terminal_interface-curses.ads:1627</A>
-++<LI><A HREF="../terminal_interface-curses-panels__ads.htm#ref_92_14" TARGET="main">Update_Panels</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1040_14" TARGET="main">Update_Screen</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1831_14" TARGET="main">Use_Default_Colors</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_1851_13" TARGET="main">Use_Extended_Names</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2474_16" TARGET="main">use_extended_namesC</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_995_14" TARGET="main">Use_Insert_Delete_Character</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_988_14" TARGET="main">Use_Insert_Delete_Line</A>
-+ </UL></BODY></HTML>
-+Index: doc/html/ada/funcs/V.htm
-+--- ncurses-5.6/doc/html/ada/funcs/V.htm	2005-05-14 17:34:32.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/funcs/V.htm	2007-09-01 23:56:30.000000000 +0000
-+@@ -4,5 +4,8 @@
-+ <H2>Functions - V</H2>
-+ <A HREF="../funcs.htm" TARGET="_self">[index]</A>
-+ <UL COMPACT TYPE=DISC>
-+-<LI><A HREF="../terminal_interface-curses-forms-field_types-enumeration-ada__ads.htm#ref_53_13" TARGET="main">Value</A>
-++<LI><A HREF="../terminal_interface-curses-forms-field_types-enumeration-ada__ads.htm#ref_53_13" TARGET="main">Value -  terminal_interface-curses-forms-field_types-enumeration-ada.ads:53</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_218_13" TARGET="main">Value -  terminal_interface-curses-menus.ads:218</A>
-++<LI><A HREF="../terminal_interface-curses__ads.htm#ref_737_14" TARGET="main">Vertical_Line</A>
-++<LI><A HREF="../terminal_interface-curses-menus__ads.htm#ref_227_13" TARGET="main">Visible</A>
-+ </UL></BODY></HTML>
-+Index: doc/html/ada/funcs/W.htm
-+--- ncurses-5.6/doc/html/ada/funcs/W.htm	2006-09-23 20:31:30.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/funcs/W.htm	2007-09-01 23:56:30.000000000 +0000
-+@@ -4,50 +4,50 @@
-+ <H2>Functions - W</H2>
-+ <A HREF="../funcs.htm" TARGET="_self">[index]</A>
-+ <UL COMPACT TYPE=DISC>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_204_16" TARGET="main">Waddch</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_460_16" TARGET="main">Waddchnstr</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_429_16" TARGET="main">Waddnstr</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_708_16" TARGET="main">Wattrget -  terminal_interface-curses.adb:708</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_731_16" TARGET="main">Wattrget -  terminal_interface-curses.adb:731</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_667_16" TARGET="main">Wattroff</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_664_16" TARGET="main">Wattron</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_692_16" TARGET="main">Wattrset</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1214_17" TARGET="main">WBackground</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_501_16" TARGET="main">Wborder</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1224_16" TARGET="main">WChangeBkgd</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_772_16" TARGET="main">Wchgat</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1182_16" TARGET="main">Wclear</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1192_16" TARGET="main">Wclearbot</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1202_16" TARGET="main">Wcleareol</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1600_16" TARGET="main">Wdelch</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_307_16" TARGET="main">Wdelwin</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_261_16" TARGET="main">Wechochar</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_151_16" TARGET="main">Waddch</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_407_16" TARGET="main">Waddchnstr</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_376_16" TARGET="main">Waddnstr</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_655_16" TARGET="main">Wattrget -  terminal_interface-curses.adb:655</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_678_16" TARGET="main">Wattrget -  terminal_interface-curses.adb:678</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_614_16" TARGET="main">Wattroff</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_611_16" TARGET="main">Wattron</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_639_16" TARGET="main">Wattrset</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1159_17" TARGET="main">WBackground</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_448_16" TARGET="main">Wborder</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1169_16" TARGET="main">WChangeBkgd</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_719_16" TARGET="main">Wchgat</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1127_16" TARGET="main">Wclear</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1137_16" TARGET="main">Wclearbot</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1147_16" TARGET="main">Wcleareol</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1567_16" TARGET="main">Wdelch</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_254_16" TARGET="main">Wdelwin</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_208_16" TARGET="main">Wechochar</A>
-+ <LI><A HREF="../terminal_interface-curses-mouse__adb.htm#ref_200_16" TARGET="main">Wenclose</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1172_16" TARGET="main">Werase</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1235_16" TARGET="main">Wgetbkgd</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_576_16" TARGET="main">Wgetch</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1812_16" TARGET="main">Wgetnstr</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_543_16" TARGET="main">Whline</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1626_16" TARGET="main">Winch</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1764_16" TARGET="main">Winchnstr</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1722_16" TARGET="main">Winnstr</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1648_16" TARGET="main">Winsch</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1376_16" TARGET="main">Winsdelln</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1680_16" TARGET="main">Winsnstr</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1288_16" TARGET="main">WLineTouched</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_190_16" TARGET="main">Wmove</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1135_16" TARGET="main">Wnoutrefresh</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1158_16" TARGET="main">Wredrawln</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1124_16" TARGET="main">Wrefresh</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2552_16" TARGET="main">wresize</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1588_16" TARGET="main">Wscrl</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1101_16" TARGET="main">Wsetscrreg</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_754_16" TARGET="main">Wset_Color</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_644_16" TARGET="main">wstandend</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_642_16" TARGET="main">wstandout</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_965_16" TARGET="main">Wtimeout</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1246_16" TARGET="main">Wtouchln</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_560_16" TARGET="main">Wvline</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1301_16" TARGET="main">WWinTouched</A>
-+-<LI><A HREF="../terminal_interface-curses__adb.htm#ref_66_13" TARGET="main">W_Get_Element</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1117_16" TARGET="main">Werase</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1180_16" TARGET="main">Wgetbkgd</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_523_16" TARGET="main">Wgetch</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1779_16" TARGET="main">Wgetnstr</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_490_16" TARGET="main">Whline</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1593_16" TARGET="main">Winch</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1731_16" TARGET="main">Winchnstr</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1689_16" TARGET="main">Winnstr</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1615_16" TARGET="main">Winsch</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1321_16" TARGET="main">Winsdelln</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1647_16" TARGET="main">Winsnstr</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1233_16" TARGET="main">WLineTouched</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_137_16" TARGET="main">Wmove</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1080_16" TARGET="main">Wnoutrefresh</A>
-++<LI><A HREF="../terminal_interface-curses-forms-field_types__ads.htm#ref_151_14" TARGET="main">Wrap_Builtin</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1103_16" TARGET="main">Wredrawln</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1069_16" TARGET="main">Wrefresh</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_2542_16" TARGET="main">wresize</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1555_16" TARGET="main">Wscrl</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1046_16" TARGET="main">Wsetscrreg</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_701_16" TARGET="main">Wset_Color</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_591_16" TARGET="main">wstandend</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_589_16" TARGET="main">wstandout</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_914_17" TARGET="main">Wtimeout</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1191_16" TARGET="main">Wtouchln</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_507_16" TARGET="main">Wvline</A>
-++<LI><A HREF="../terminal_interface-curses__adb.htm#ref_1246_16" TARGET="main">WWinTouched</A>
-+ </UL></BODY></HTML>
-+Index: doc/html/ada/table.html
-+--- ncurses-5.6/doc/html/ada/table.html	2000-12-02 23:38:22.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/table.html	2007-05-05 20:35:21.000000000 +0000
-+@@ -10,36 +10,38 @@
-+ <TABLE ALIGN=CENTER BORDER>
-+ <TR ALIGN=LEFT>
-+ <TH>C name</TH><TH>Ada name</TH><TH>man page</TH></TR>
-++<TR><TD>_nc_freeall()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_159">Curses_Free_All</A></TD><TD><A HREF="../man/curs_trace.3x.html">curs_trace.3x</A></TD></TR>
-+ <TR><TD>_tracef()</TD><TD><A HREF="terminal_interface-curses-trace__ads.htm#AFU_2">Trace_Put</A></TD><TD><A HREF="../man/curs_trace.3x.html">curs_trace.3x</A></TD></TR>
-+-<TR><TD>assume_default_colors()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_155">Assume_Default_Colors</A></TD><TD><A HREF="../man/dft_fgbg.3x.html">dft_fgbg.3x</A></TD></TR>
-+-<TR><TD>baudrate()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_130">Baudrate</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
-+-<TR><TD>beep()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_39">Beep</A></TD><TD><A HREF="../man/curs_beep.3x.html">curs_beep.3x</A></TD></TR>
-++<TR><TD>assume_default_colors()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_156">Assume_Default_Colors</A></TD><TD><A HREF="../man/default_colors.3x.html">default_colors.3x</A></TD></TR>
-++<TR><TD>baudrate()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_131">Baudrate</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
-++<TR><TD>beep()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_40">Beep</A></TD><TD><A HREF="../man/curs_beep.3x.html">curs_beep.3x</A></TD></TR>
-+ <TR><TD>bottom_panel()</TD><TD><A HREF="terminal_interface-curses-panels__ads.htm#AFU_3">Bottom</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
-+-<TR><TD>box()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_25">Box</A></TD><TD><A HREF="../man/curs_border.3x.html">curs_border.3x</A></TD></TR>
-+-<TR><TD>can_change_color()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_145">Can_Change_Color</A></TD><TD><A HREF="../man/curs_color.3x.html">curs_color.3x</A></TD></TR>
-+-<TR><TD>cbreak()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_41">Set_Cbreak_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-+-<TR><TD>clearok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_53">Clear_On_Next_Update</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
-+-<TR><TD>color_content()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_146">Color_Content</A></TD><TD><A HREF="../man/curs_color.3x.html">curs_color.3x</A></TD></TR>
-+-<TR><TD>copywin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_78">Copy</A></TD><TD><A HREF="../man/curs_overlay.3x.html">curs_overlay.3x</A></TD></TR>
-++<TR><TD>box()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_26">Box</A></TD><TD><A HREF="../man/curs_border.3x.html">curs_border.3x</A></TD></TR>
-++<TR><TD>can_change_color()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_146">Can_Change_Color</A></TD><TD><A HREF="../man/curs_color.3x.html">curs_color.3x</A></TD></TR>
-++<TR><TD>cbreak()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_42">Set_Cbreak_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-++<TR><TD>clearok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_54">Clear_On_Next_Update</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
-++<TR><TD>color_content()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_147">Color_Content</A></TD><TD><A HREF="../man/curs_color.3x.html">curs_color.3x</A></TD></TR>
-++<TR><TD>copywin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_79">Copy</A></TD><TD><A HREF="../man/curs_overlay.3x.html">curs_overlay.3x</A></TD></TR>
-+ <TR><TD>current_field()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_58">Current</A></TD><TD><A HREF="../man/form_page.3x.html">form_page.3x</A></TD></TR>
-+ <TR><TD>current_item()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_14">Current</A></TD><TD><A HREF="../man/mitem_current.3x.html">mitem_current.3x</A></TD></TR>
-+-<TR><TD>curs_set()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_152">Set_Cursor_Visibility</A></TD><TD><A HREF="../man/curs_kernel.3x.html">curs_kernel.3x</A></TD></TR>
-+-<TR><TD>curses_version()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_156">Curses_Version</A></TD><TD><A HREF="../man/curs_extend.3x.html">curs_extend.3x</A></TD></TR>
-++<TR><TD>curs_set()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_153">Set_Cursor_Visibility</A></TD><TD><A HREF="../man/curs_kernel.3x.html">curs_kernel.3x</A></TD></TR>
-++<TR><TD>curscr</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_2">Current_Window</A></TD><TD><A HREF="../man/curs_initscr.3x.html">curs_initscr.3x</A></TD></TR>
-++<TR><TD>curses_version()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_157">Curses_Version</A></TD><TD><A HREF="../man/curs_extend.3x.html">curs_extend.3x</A></TD></TR>
-+ <TR><TD>data_ahead()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_54">Data_Ahead</A></TD><TD><A HREF="../man/form_data.3x.html">form_data.3x</A></TD></TR>
-+ <TR><TD>data_behind()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_55">Data_Behind</A></TD><TD><A HREF="../man/form_data.3x.html">form_data.3x</A></TD></TR>
-+-<TR><TD>def_prog_mode()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_147">Save_Curses_Mode</A></TD><TD><A HREF="../man/curs_kernel.3x.html">curs_kernel.3x</A></TD></TR>
-+-<TR><TD>define_key()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_123">Define_Key</A></TD><TD><A HREF="../man/define_key.3x.html">define_key.3x</A></TD></TR>
-++<TR><TD>def_prog_mode()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_148">Save_Curses_Mode</A></TD><TD><A HREF="../man/curs_kernel.3x.html">curs_kernel.3x</A></TD></TR>
-++<TR><TD>define_key()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_124">Define_Key</A></TD><TD><A HREF="../man/define_key.3x.html">define_key.3x</A></TD></TR>
-+ <TR><TD>del_panel()</TD><TD><A HREF="terminal_interface-curses-panels__ads.htm#AFU_15">Delete</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
-+-<TR><TD>delay_output()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_128">Delay_Output</A></TD><TD><A HREF="../man/curs_util.3x.html">curs_util.3x</A></TD></TR>
-+-<TR><TD>delwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_11">Delete</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
-+-<TR><TD>derwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_13">Derived_Window</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
-+-<TR><TD>doupdate()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_60">Update_Screen</A></TD><TD><A HREF="../man/curs_refresh.3x.html">curs_refresh.3x</A></TD></TR>
-++<TR><TD>delay_output()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_129">Delay_Output</A></TD><TD><A HREF="../man/curs_util.3x.html">curs_util.3x</A></TD></TR>
-++<TR><TD>delwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_12">Delete</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
-++<TR><TD>derwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_14">Derived_Window</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
-++<TR><TD>doupdate()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_61">Update_Screen</A></TD><TD><A HREF="../man/curs_refresh.3x.html">curs_refresh.3x</A></TD></TR>
-+ <TR><TD>dup_field()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_4">Duplicate</A></TD><TD><A HREF="../man/form_field_new.3x.html">form_field_new.3x</A></TD></TR>
-+-<TR><TD>dupwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_14">Duplicate</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
-++<TR><TD>dupwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_15">Duplicate</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
-+ <TR><TD>dynamic_field_info()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_26">Dynamic_Info</A></TD><TD><A HREF="../man/form_field_info.3x.html">form_field_info.3x</A></TD></TR>
-+-<TR><TD>echo()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_43">Set_Echo_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-+-<TR><TD>endwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_4">End_Windows</A></TD><TD><A HREF="../man/curs_initscr.3x.html">curs_initscr.3x</A></TD></TR>
-+-<TR><TD>erasechar()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_131">Erase_Character</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
-++<TR><TD>echo()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_44">Set_Echo_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-++<TR><TD>endwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_5">End_Windows</A></TD><TD><A HREF="../man/curs_initscr.3x.html">curs_initscr.3x</A></TD></TR>
-++<TR><TD>erasechar()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_132">Erase_Character</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
-+ <TR><TD>field_back()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_21">Background</A></TD><TD><A HREF="../man/form_field_attributes.3x.html">form_field_attributes.3x</A></TD></TR>
-+ <TR><TD>field_back()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_22">Background</A></TD><TD><A HREF="../man/form_field_attributes.3x.html">form_field_attributes.3x</A></TD></TR>
-+ <TR><TD>field_buffer()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_9">Get_Buffer</A></TD><TD><A HREF="../man/form_field_buffer.3x.html">form_field_buffer.3x</A></TD></TR>
-+@@ -59,8 +61,8 @@
-+ <TR><TD>field_type()</TD><TD><A HREF="terminal_interface-curses-forms-field_user_data__ads.htm#AFU_2">Get_Type</A></TD><TD><A HREF="../man/form_field_validation.3x.html">form_field_validation.3x</A></TD></TR>
-+ <TR><TD>field_userptr</TD><TD><A HREF="terminal_interface-curses-forms-field_user_data__ads.htm#AFU_2">Get_User_Data</A></TD><TD><A HREF="../man/form_field_userptr.3x.html">form_field_userptr.3x</A></TD></TR>
-+ <TR><TD>field_userptr</TD><TD><A HREF="terminal_interface-curses-forms-field_user_data__ads.htm#AFU_3">Get_User_Data</A></TD><TD><A HREF="../man/form_field_userptr.3x.html">form_field_userptr.3x</A></TD></TR>
-+-<TR><TD>flash()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_40">Flash_Screen</A></TD><TD><A HREF="../man/curs_beep.3x.html">curs_beep.3x</A></TD></TR>
-+-<TR><TD>flushinp()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_129">Flush_Input</A></TD><TD><A HREF="../man/curs_util.3x.html">curs_util.3x</A></TD></TR>
-++<TR><TD>flash()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_41">Flash_Screen</A></TD><TD><A HREF="../man/curs_beep.3x.html">curs_beep.3x</A></TD></TR>
-++<TR><TD>flushinp()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_130">Flush_Input</A></TD><TD><A HREF="../man/curs_util.3x.html">curs_util.3x</A></TD></TR>
-+ <TR><TD>form_driver()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_56">Driver</A></TD><TD><A HREF="../man/form_driver.3x.html">form_driver.3x</A></TD></TR>
-+ <TR><TD>form_fields()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_42">Fields</A></TD><TD><A HREF="../man/form_field.3x.html">form_field.3x</A></TD></TR>
-+ <TR><TD>form_init()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_38">Get_Form_Init_Hook</A></TD><TD><A HREF="../man/form_hook.3x.html">form_hook.3x</A></TD></TR>
-+@@ -77,28 +79,28 @@
-+ <TR><TD>free_form()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_47">Delete</A></TD><TD><A HREF="../man/form_new.3x.html">form_new.3x</A></TD></TR>
-+ <TR><TD>free_item()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_3">Delete</A></TD><TD><A HREF="../man/mitem_new.3x.html">mitem_new.3x</A></TD></TR>
-+ <TR><TD>free_menu()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_60">Delete</A></TD><TD><A HREF="../man/menu_new.3x.html">menu_new.3x</A></TD></TR>
-+-<TR><TD>getbegyx()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_85">Get_Window_Position</A></TD><TD><A HREF="../man/curs_getyx.3x.html">curs_getyx.3x</A></TD></TR>
-+-<TR><TD>getmaxyx()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_84">Get_Size</A></TD><TD><A HREF="../man/curs_getyx.3x.html">curs_getyx.3x</A></TD></TR>
-++<TR><TD>getbegyx()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_86">Get_Window_Position</A></TD><TD><A HREF="../man/curs_getyx.3x.html">curs_getyx.3x</A></TD></TR>
-++<TR><TD>getmaxyx()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_85">Get_Size</A></TD><TD><A HREF="../man/curs_getyx.3x.html">curs_getyx.3x</A></TD></TR>
-+ <TR><TD>getmouse()</TD><TD><A HREF="terminal_interface-curses-mouse__ads.htm#AFU_2">Get_Mouse</A></TD><TD><A HREF="../man/curs_mouse.3x.html">curs_mouse.3x</A></TD></TR>
-+-<TR><TD>getparyx()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_87">Get_Origin_Relative_To_Parent</A></TD><TD><A HREF="../man/curs_getyx.3x.html">curs_getyx.3x</A></TD></TR>
-+-<TR><TD>getyx()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_86">Get_Cursor_Position</A></TD><TD><A HREF="../man/curs_getyx.3x.html">curs_getyx.3x</A></TD></TR>
-+-<TR><TD>halfdelay()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_46">Half_Delay</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-+-<TR><TD>has_colors()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_143">Has_Colors</A></TD><TD><A HREF="../man/curs_color.3x.html">curs_color.3x</A></TD></TR>
-+-<TR><TD>has_ic()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_133">Has_Insert_Character</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
-+-<TR><TD>has_il()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_134">Has_Insert_Line</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
-+-<TR><TD>has_key()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_30">Has_Key</A></TD><TD><A HREF="../man/curs_getch.3x.html">curs_getch.3x</A></TD></TR>
-++<TR><TD>getparyx()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_88">Get_Origin_Relative_To_Parent</A></TD><TD><A HREF="../man/curs_getyx.3x.html">curs_getyx.3x</A></TD></TR>
-++<TR><TD>getyx()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_87">Get_Cursor_Position</A></TD><TD><A HREF="../man/curs_getyx.3x.html">curs_getyx.3x</A></TD></TR>
-++<TR><TD>halfdelay()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_47">Half_Delay</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-++<TR><TD>has_colors()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_144">Has_Colors</A></TD><TD><A HREF="../man/curs_color.3x.html">curs_color.3x</A></TD></TR>
-++<TR><TD>has_ic()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_134">Has_Insert_Character</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
-++<TR><TD>has_il()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_135">Has_Insert_Line</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
-++<TR><TD>has_key()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_31">Has_Key</A></TD><TD><A HREF="../man/curs_getch.3x.html">curs_getch.3x</A></TD></TR>
-+ <TR><TD>hide_panel()</TD><TD><A HREF="terminal_interface-curses-panels__ads.htm#AFU_7">Hide</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
-+-<TR><TD>idcok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_55">Use_Insert_Delete_Character</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
-+-<TR><TD>idlok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_54">Use_Insert_Delete_Line</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
-+-<TR><TD>immedok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_57">Immediate_Update_Mode</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
-+-<TR><TD>init_color()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_144">Init_Color</A></TD><TD><A HREF="../man/curs_color.3x.html">curs_color.3x</A></TD></TR>
-+-<TR><TD>init_pair()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_141">Init_Pair</A></TD><TD><A HREF="../man/curs_color.3x.html">curs_color.3x</A></TD></TR>
-+-<TR><TD>initscr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_2">Init_Screen</A></TD><TD><A HREF="../man/curs_initscr.3x.html">curs_initscr.3x</A></TD></TR>
-+-<TR><TD>initscr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_3">Init_Windows</A></TD><TD><A HREF="../man/curs_initscr.3x.html">curs_initscr.3x</A></TD></TR>
-+-<TR><TD>intrflush()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_47">Set_Flush_On_Interrupt_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-+-<TR><TD>is_linetouched()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_76">Is_Touched</A></TD><TD><A HREF="../man/curs_touch.3x.html">curs_touch.3x</A></TD></TR>
-+-<TR><TD>is_wintouched()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_77">Is_Touched</A></TD><TD><A HREF="../man/curs_touch.3x.html">curs_touch.3x</A></TD></TR>
-+-<TR><TD>isendwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_5">Is_End_Window</A></TD><TD><A HREF="../man/curs_initscr.3x.html">curs_initscr.3x</A></TD></TR>
-++<TR><TD>idcok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_56">Use_Insert_Delete_Character</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
-++<TR><TD>idlok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_55">Use_Insert_Delete_Line</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
-++<TR><TD>immedok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_58">Immediate_Update_Mode</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
-++<TR><TD>init_color()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_145">Init_Color</A></TD><TD><A HREF="../man/curs_color.3x.html">curs_color.3x</A></TD></TR>
-++<TR><TD>init_pair()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_142">Init_Pair</A></TD><TD><A HREF="../man/curs_color.3x.html">curs_color.3x</A></TD></TR>
-++<TR><TD>initscr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_3">Init_Screen</A></TD><TD><A HREF="../man/curs_initscr.3x.html">curs_initscr.3x</A></TD></TR>
-++<TR><TD>initscr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_4">Init_Windows</A></TD><TD><A HREF="../man/curs_initscr.3x.html">curs_initscr.3x</A></TD></TR>
-++<TR><TD>intrflush()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_48">Set_Flush_On_Interrupt_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-++<TR><TD>is_linetouched()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_77">Is_Touched</A></TD><TD><A HREF="../man/curs_touch.3x.html">curs_touch.3x</A></TD></TR>
-++<TR><TD>is_wintouched()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_78">Is_Touched</A></TD><TD><A HREF="../man/curs_touch.3x.html">curs_touch.3x</A></TD></TR>
-++<TR><TD>isendwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_6">Is_End_Window</A></TD><TD><A HREF="../man/curs_initscr.3x.html">curs_initscr.3x</A></TD></TR>
-+ <TR><TD>item_count()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_58">Item_Count</A></TD><TD><A HREF="../man/menu_items.3x.html">menu_items.3x</A></TD></TR>
-+ <TR><TD>item_description();</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_12">Description</A></TD><TD><A HREF="../man/mitem_name.3x.html">mitem_name.3x</A></TD></TR>
-+ <TR><TD>item_index()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_17">Get_Index</A></TD><TD><A HREF="../man/mitem_current.3x.html">mitem_current.3x</A></TD></TR>
-+@@ -112,30 +114,30 @@
-+ <TR><TD>item_userptr</TD><TD><A HREF="terminal_interface-curses-menus-item_user_data__ads.htm#AFU_3">Get_User_Data</A></TD><TD><A HREF="../man/mitem_userptr.3x.html">mitem_userptr.3x</A></TD></TR>
-+ <TR><TD>item_value()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_5">Value</A></TD><TD><A HREF="../man/mitem_value.3x.html">mitem_value.3x</A></TD></TR>
-+ <TR><TD>item_visible()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_6">Visible</A></TD><TD><A HREF="../man/mitem_visible.3x.html">mitem_visible.3x</A></TD></TR>
-+-<TR><TD>keyname()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_124">Key_Name</A></TD><TD><A HREF="../man/curs_util.3x.html">curs_util.3x</A></TD></TR>
-+ <TR><TD>keyname()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_125">Key_Name</A></TD><TD><A HREF="../man/curs_util.3x.html">curs_util.3x</A></TD></TR>
-+-<TR><TD>keyok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_122">Enable_Key</A></TD><TD><A HREF="../man/keyok.3x.html">keyok.3x</A></TD></TR>
-+-<TR><TD>keypad()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_45">Set_KeyPad_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-+-<TR><TD>killchar()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_132">Kill_Character</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
-+-<TR><TD>leaveok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_56">Leave_Cursor_After_Update</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
-++<TR><TD>keyname()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_126">Key_Name</A></TD><TD><A HREF="../man/curs_util.3x.html">curs_util.3x</A></TD></TR>
-++<TR><TD>keyok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_123">Enable_Key</A></TD><TD><A HREF="../man/keyok.3x.html">keyok.3x</A></TD></TR>
-++<TR><TD>keypad()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_46">Set_KeyPad_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-++<TR><TD>killchar()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_133">Kill_Character</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
-++<TR><TD>leaveok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_57">Leave_Cursor_After_Update</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
-+ <TR><TD>link_field()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_5">Link</A></TD><TD><A HREF="../man/form_field_new.3x.html">form_field_new.3x</A></TD></TR>
-+-<TR><TD>longname()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_136">Long_Name</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
-+ <TR><TD>longname()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_137">Long_Name</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
-+-<TR><TD>menu_back()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_35">Background</A></TD><TD><A HREF="../man/menu_attribs.3x.html">menu_attribs.3x</A></TD></TR>
-+-<TR><TD>menu_back()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_36">Background</A></TD><TD><A HREF="../man/menu_attribs.3x.html">menu_attribs.3x</A></TD></TR>
-++<TR><TD>longname()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_138">Long_Name</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
-++<TR><TD>menu_back()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_35">Background</A></TD><TD><A HREF="../man/menu_attributes.3x.html">menu_attributes.3x</A></TD></TR>
-++<TR><TD>menu_back()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_36">Background</A></TD><TD><A HREF="../man/menu_attributes.3x.html">menu_attributes.3x</A></TD></TR>
-+ <TR><TD>menu_driver()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_61">Driver</A></TD><TD><A HREF="../man/menu_driver.3x.html">menu_driver.3x</A></TD></TR>
-+-<TR><TD>menu_fore()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_32">Foreground</A></TD><TD><A HREF="../man/menu_attribs.3x.html">menu_attribs.3x</A></TD></TR>
-+-<TR><TD>menu_fore()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_33">Foreground</A></TD><TD><A HREF="../man/menu_attribs.3x.html">menu_attribs.3x</A></TD></TR>
-++<TR><TD>menu_fore()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_32">Foreground</A></TD><TD><A HREF="../man/menu_attributes.3x.html">menu_attributes.3x</A></TD></TR>
-++<TR><TD>menu_fore()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_33">Foreground</A></TD><TD><A HREF="../man/menu_attributes.3x.html">menu_attributes.3x</A></TD></TR>
-+ <TR><TD>menu_format()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_47">Format</A></TD><TD><A HREF="../man/menu_format.3x.html">menu_format.3x</A></TD></TR>
-+-<TR><TD>menu_grey()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_38">Grey</A></TD><TD><A HREF="../man/menu_attribs.3x.html">menu_attribs.3x</A></TD></TR>
-+-<TR><TD>menu_grey()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_39">Grey</A></TD><TD><A HREF="../man/menu_attribs.3x.html">menu_attribs.3x</A></TD></TR>
-++<TR><TD>menu_grey()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_38">Grey</A></TD><TD><A HREF="../man/menu_attributes.3x.html">menu_attributes.3x</A></TD></TR>
-++<TR><TD>menu_grey()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_39">Grey</A></TD><TD><A HREF="../man/menu_attributes.3x.html">menu_attributes.3x</A></TD></TR>
-+ <TR><TD>menu_init()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_54">Get_Menu_Init_Hook</A></TD><TD><A HREF="../man/menu_hook.3x.html">menu_hook.3x</A></TD></TR>
-+ <TR><TD>menu_items()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_57">Items</A></TD><TD><A HREF="../man/menu_items.3x.html">menu_items.3x</A></TD></TR>
-+ <TR><TD>menu_mark()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_30">Mark</A></TD><TD><A HREF="../man/menu_mark.3x.html">menu_mark.3x</A></TD></TR>
-+ <TR><TD>menu_opts()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_21">Get_Options</A></TD><TD><A HREF="../man/menu_opts.3x.html">menu_opts.3x</A></TD></TR>
-+ <TR><TD>menu_opts()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_22">Get_Options</A></TD><TD><A HREF="../man/menu_opts.3x.html">menu_opts.3x</A></TD></TR>
-+ <TR><TD>menu_opts_on()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_20">Switch_Options</A></TD><TD><A HREF="../man/menu_opts.3x.html">menu_opts.3x</A></TD></TR>
-+-<TR><TD>menu_pad()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_41">Pad_Character</A></TD><TD><A HREF="../man/menu_attribs.3x.html">menu_attribs.3x</A></TD></TR>
-++<TR><TD>menu_pad()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_41">Pad_Character</A></TD><TD><A HREF="../man/menu_attributes.3x.html">menu_attributes.3x</A></TD></TR>
-+ <TR><TD>menu_pattern()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_45">Pattern</A></TD><TD><A HREF="../man/menu_pattern.3x.html">menu_pattern.3x</A></TD></TR>
-+ <TR><TD>menu_requestname.3x</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_62"></A></TD><TD><A HREF="../man/menu_driver.3x.html">menu_driver.3x</A></TD></TR>
-+ <TR><TD>menu_spacing()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_43">Spacing</A></TD><TD><A HREF="../man/menu_spacing.3x.html">menu_spacing.3x</A></TD></TR>
-+@@ -144,25 +146,25 @@
-+ <TR><TD>menu_userptr</TD><TD><A HREF="terminal_interface-curses-menus-menu_user_data__ads.htm#AFU_2">Get_User_Data</A></TD><TD><A HREF="../man/menu_userptr.3x.html">menu_userptr.3x</A></TD></TR>
-+ <TR><TD>menu_userptr</TD><TD><A HREF="terminal_interface-curses-menus-menu_user_data__ads.htm#AFU_3">Get_User_Data</A></TD><TD><A HREF="../man/menu_userptr.3x.html">menu_userptr.3x</A></TD></TR>
-+ <TR><TD>menu_win()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_24">Get_Window</A></TD><TD><A HREF="../man/menu_win.3x.html">menu_win.3x</A></TD></TR>
-+-<TR><TD>meta()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_44">Set_Meta_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-++<TR><TD>meta()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_45">Set_Meta_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-+ <TR><TD>mouseinterval()</TD><TD><A HREF="terminal_interface-curses-mouse__ads.htm#AFU_5">Mouse_Interval</A></TD><TD><A HREF="../man/curs_mouse.3x.html">curs_mouse.3x</A></TD></TR>
-+ <TR><TD>mousemask()</TD><TD><A HREF="terminal_interface-curses-mouse__ads.htm#AFU_1">Start_Mouse</A></TD><TD><A HREF="../man/curs_mouse.3x.html">curs_mouse.3x</A></TD></TR>
-+ <TR><TD>move_field()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_44">Move</A></TD><TD><A HREF="../man/form_field.3x.html">form_field.3x</A></TD></TR>
-+ <TR><TD>move_panel()</TD><TD><A HREF="terminal_interface-curses-panels__ads.htm#AFU_11">Move</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
-+-<TR><TD>mvderwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_16">Move_Derived_Window</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
-+-<TR><TD>mvwaddch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_8">Add</A></TD><TD><A HREF="../man/curs_addch.3x.html">curs_addch.3x</A></TD></TR>
-+-<TR><TD>mvwaddchnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_23">Add</A></TD><TD><A HREF="../man/curs_addchstr.3x.html">curs_addchstr.3x</A></TD></TR>
-+-<TR><TD>mvwaddnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_21">Add</A></TD><TD><A HREF="../man/curs_addstr.3x.html">curs_addstr.3x</A></TD></TR>
-+-<TR><TD>mvwchgat()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_38">Change_Attributes</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
-+-<TR><TD>mvwdelch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_95">Delete_Character</A></TD><TD><A HREF="../man/curs_delch.3x.html">curs_delch.3x</A></TD></TR>
-+-<TR><TD>mvwgetnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_107">Get</A></TD><TD><A HREF="../man/curs_getstr.3x.html">curs_getstr.3x</A></TD></TR>
-+-<TR><TD>mvwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_15">Move_Window</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
-+-<TR><TD>mvwinch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_97">Peek</A></TD><TD><A HREF="../man/curs_inch.3x.html">curs_inch.3x</A></TD></TR>
-+-<TR><TD>mvwinchnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_105">Peek</A></TD><TD><A HREF="../man/curs_inchstr.3x.html">curs_inchstr.3x</A></TD></TR>
-+-<TR><TD>mvwinnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_103">Peek</A></TD><TD><A HREF="../man/curs_instr.3x.html">curs_instr.3x</A></TD></TR>
-+-<TR><TD>mvwinsch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_99">Insert</A></TD><TD><A HREF="../man/curs_insch.3x.html">curs_insch.3x</A></TD></TR>
-+-<TR><TD>mvwinsnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_101">Insert</A></TD><TD><A HREF="../man/curs_insstr.3x.html">curs_insstr.3x</A></TD></TR>
-+-<TR><TD>napms()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_153">Nap_Milli_Seconds</A></TD><TD><A HREF="../man/curs_kernel.3x.html">curs_kernel.3x</A></TD></TR>
-++<TR><TD>mvderwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_17">Move_Derived_Window</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
-++<TR><TD>mvwaddch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_9">Add</A></TD><TD><A HREF="../man/curs_addch.3x.html">curs_addch.3x</A></TD></TR>
-++<TR><TD>mvwaddchnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_24">Add</A></TD><TD><A HREF="../man/curs_addchstr.3x.html">curs_addchstr.3x</A></TD></TR>
-++<TR><TD>mvwaddnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_22">Add</A></TD><TD><A HREF="../man/curs_addstr.3x.html">curs_addstr.3x</A></TD></TR>
-++<TR><TD>mvwchgat()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_39">Change_Attributes</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
-++<TR><TD>mvwdelch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_96">Delete_Character</A></TD><TD><A HREF="../man/curs_delch.3x.html">curs_delch.3x</A></TD></TR>
-++<TR><TD>mvwgetnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_108">Get</A></TD><TD><A HREF="../man/curs_getstr.3x.html">curs_getstr.3x</A></TD></TR>
-++<TR><TD>mvwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_16">Move_Window</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
-++<TR><TD>mvwinch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_98">Peek</A></TD><TD><A HREF="../man/curs_inch.3x.html">curs_inch.3x</A></TD></TR>
-++<TR><TD>mvwinchnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_106">Peek</A></TD><TD><A HREF="../man/curs_inchstr.3x.html">curs_inchstr.3x</A></TD></TR>
-++<TR><TD>mvwinnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_104">Peek</A></TD><TD><A HREF="../man/curs_instr.3x.html">curs_instr.3x</A></TD></TR>
-++<TR><TD>mvwinsch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_100">Insert</A></TD><TD><A HREF="../man/curs_insch.3x.html">curs_insch.3x</A></TD></TR>
-++<TR><TD>mvwinsnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_102">Insert</A></TD><TD><A HREF="../man/curs_insstr.3x.html">curs_insstr.3x</A></TD></TR>
-++<TR><TD>napms()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_154">Nap_Milli_Seconds</A></TD><TD><A HREF="../man/curs_kernel.3x.html">curs_kernel.3x</A></TD></TR>
-+ <TR><TD>new_field()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_1">Create</A></TD><TD><A HREF="../man/form_field_new.3x.html">form_field_new.3x</A></TD></TR>
-+ <TR><TD>new_field()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_2">New_Field</A></TD><TD><A HREF="../man/form_field_new.3x.html">form_field_new.3x</A></TD></TR>
-+ <TR><TD>new_form()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_45">Create</A></TD><TD><A HREF="../man/form_new.3x.html">form_new.3x</A></TD></TR>
-+@@ -173,14 +175,14 @@
-+ <TR><TD>new_page()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_63">Is_New_Page</A></TD><TD><A HREF="../man/form_new_page.3x.html">form_new_page.3x</A></TD></TR>
-+ <TR><TD>new_panel()</TD><TD><A HREF="terminal_interface-curses-panels__ads.htm#AFU_1">Create</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
-+ <TR><TD>new_panel()</TD><TD><A HREF="terminal_interface-curses-panels__ads.htm#AFU_2">New_Panel</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
-+-<TR><TD>newpad()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_88">New_Pad</A></TD><TD><A HREF="../man/curs_pad.3x.html">curs_pad.3x</A></TD></TR>
-+-<TR><TD>newwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_10">Create</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
-+-<TR><TD>nl()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_52">Set_NL_Mode</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
-+-<TR><TD>nodelay()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_49">Set_NoDelay_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-+-<TR><TD>notimeout()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_51">Set_Escape_Time_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-+-<TR><TD>overlay()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_80">Overlay</A></TD><TD><A HREF="../man/curs_overlay.3x.html">curs_overlay.3x</A></TD></TR>
-+-<TR><TD>overwrite()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_79">Overwrite</A></TD><TD><A HREF="../man/curs_overlay.3x.html">curs_overlay.3x</A></TD></TR>
-+-<TR><TD>pair_content()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_142">Pair_Content</A></TD><TD><A HREF="../man/curs_color.3x.html">curs_color.3x</A></TD></TR>
-++<TR><TD>newpad()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_89">New_Pad</A></TD><TD><A HREF="../man/curs_pad.3x.html">curs_pad.3x</A></TD></TR>
-++<TR><TD>newwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_11">Create</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
-++<TR><TD>nl()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_53">Set_NL_Mode</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
-++<TR><TD>nodelay()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_50">Set_NoDelay_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-++<TR><TD>notimeout()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_52">Set_Escape_Time_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-++<TR><TD>overlay()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_81">Overlay</A></TD><TD><A HREF="../man/curs_overlay.3x.html">curs_overlay.3x</A></TD></TR>
-++<TR><TD>overwrite()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_80">Overwrite</A></TD><TD><A HREF="../man/curs_overlay.3x.html">curs_overlay.3x</A></TD></TR>
-++<TR><TD>pair_content()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_143">Pair_Content</A></TD><TD><A HREF="../man/curs_color.3x.html">curs_color.3x</A></TD></TR>
-+ <TR><TD>panel_above()</TD><TD><A HREF="terminal_interface-curses-panels__ads.htm#AFU_13">Above</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
-+ <TR><TD>panel_below()</TD><TD><A HREF="terminal_interface-curses-panels__ads.htm#AFU_14">Below</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
-+ <TR><TD>panel_hidden()</TD><TD><A HREF="terminal_interface-curses-panels__ads.htm#AFU_12">Is_Hidden</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
-+@@ -188,28 +190,28 @@
-+ <TR><TD>panel_userptr</TD><TD><A HREF="terminal_interface-curses-panels-user_data__ads.htm#AFU_3">Get_User_Data</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
-+ <TR><TD>panel_window()</TD><TD><A HREF="terminal_interface-curses-panels__ads.htm#AFU_8">Get_Window</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
-+ <TR><TD>panel_window()</TD><TD><A HREF="terminal_interface-curses-panels__ads.htm#AFU_9">Panel_Window</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
-+-<TR><TD>pechochar()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_92">Add_Character_To_Pad_And_Echo_It</A></TD><TD><A HREF="../man/curs_pad.3x.html">curs_pad.3x</A></TD></TR>
-+-<TR><TD>pnoutrefresh()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_91">Refresh_Without_Update</A></TD><TD><A HREF="../man/curs_pad.3x.html">curs_pad.3x</A></TD></TR>
-++<TR><TD>pechochar()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_93">Add_Character_To_Pad_And_Echo_It</A></TD><TD><A HREF="../man/curs_pad.3x.html">curs_pad.3x</A></TD></TR>
-++<TR><TD>pnoutrefresh()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_92">Refresh_Without_Update</A></TD><TD><A HREF="../man/curs_pad.3x.html">curs_pad.3x</A></TD></TR>
-+ <TR><TD>pos_form_cursor()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_53">Position_Cursor</A></TD><TD><A HREF="../man/form_cursor.3x.html">form_cursor.3x</A></TD></TR>
-+ <TR><TD>pos_menu_cursor()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_28">Position_Cursor</A></TD><TD><A HREF="../man/menu_cursor.3x.html">menu_cursor.3x</A></TD></TR>
-+ <TR><TD>post_form()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_52">Post</A></TD><TD><A HREF="../man/form_post.3x.html">form_post.3x</A></TD></TR>
-+ <TR><TD>post_menu()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_18">Post</A></TD><TD><A HREF="../man/menu_post.3x.html">menu_post.3x</A></TD></TR>
-+-<TR><TD>prefresh()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_90">Refresh</A></TD><TD><A HREF="../man/curs_pad.3x.html">curs_pad.3x</A></TD></TR>
-+-<TR><TD>qiflush()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_48">Set_Queue_Interrupt_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-+-<TR><TD>raw()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_42">Set_Raw_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-+-<TR><TD>redrawwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_63">Redraw</A></TD><TD><A HREF="../man/curs_refresh.3x.html">curs_refresh.3x</A></TD></TR>
-++<TR><TD>prefresh()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_91">Refresh</A></TD><TD><A HREF="../man/curs_pad.3x.html">curs_pad.3x</A></TD></TR>
-++<TR><TD>qiflush()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_49">Set_Queue_Interrupt_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-++<TR><TD>raw()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_43">Set_Raw_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-++<TR><TD>redrawwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_64">Redraw</A></TD><TD><A HREF="../man/curs_refresh.3x.html">curs_refresh.3x</A></TD></TR>
-+ <TR><TD>replace_panel()</TD><TD><A HREF="terminal_interface-curses-panels__ads.htm#AFU_10">Replace</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
-+-<TR><TD>reset_prog_mode()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_148">Reset_Curses_Mode</A></TD><TD><A HREF="../man/curs_kernel.3x.html">curs_kernel.3x</A></TD></TR>
-+-<TR><TD>resetty();</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_150">Reset_Terminal_State</A></TD><TD><A HREF="../man/curs_kernel.3x.html">curs_kernel.3x</A></TD></TR>
-+-<TR><TD>ripoffline()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_151">Rip_Off_Lines</A></TD><TD><A HREF="../man/curs_kernel.3x.html">curs_kernel.3x</A></TD></TR>
-+-<TR><TD>savetty()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_149">Save_Terminal_State</A></TD><TD><A HREF="../man/curs_kernel.3x.html">curs_kernel.3x</A></TD></TR>
-++<TR><TD>reset_prog_mode()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_149">Reset_Curses_Mode</A></TD><TD><A HREF="../man/curs_kernel.3x.html">curs_kernel.3x</A></TD></TR>
-++<TR><TD>resetty();</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_151">Reset_Terminal_State</A></TD><TD><A HREF="../man/curs_kernel.3x.html">curs_kernel.3x</A></TD></TR>
-++<TR><TD>ripoffline()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_152">Rip_Off_Lines</A></TD><TD><A HREF="../man/curs_kernel.3x.html">curs_kernel.3x</A></TD></TR>
-++<TR><TD>savetty()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_150">Save_Terminal_State</A></TD><TD><A HREF="../man/curs_kernel.3x.html">curs_kernel.3x</A></TD></TR>
-+ <TR><TD>scale_form()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_31">Scale</A></TD><TD><A HREF="../man/form_win.3x.html">form_win.3x</A></TD></TR>
-+ <TR><TD>scale_menu()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_27">Scale</A></TD><TD><A HREF="../man/menu_win.3x.html">menu_win.3x</A></TD></TR>
-+-<TR><TD>scr_dump()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_158">Screen_Dump_To_File</A></TD><TD><A HREF="../man/curs_scr_dump.3x.html">curs_scr_dump.3x</A></TD></TR>
-+-<TR><TD>scr_init()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_160">Screen_Init_From_File</A></TD><TD><A HREF="../man/curs_scr_dump.3x.html">curs_scr_dump.3x</A></TD></TR>
-+-<TR><TD>scr_restore()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_159">Screen_Restore_From_File</A></TD><TD><A HREF="../man/curs_scr_dump.3x.html">curs_scr_dump.3x</A></TD></TR>
-+-<TR><TD>scr_set()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_161">Screen_Set_File</A></TD><TD><A HREF="../man/curs_scr_dump.3x.html">curs_scr_dump.3x</A></TD></TR>
-+-<TR><TD>scrollok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_58">Allow_Scrolling</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
-++<TR><TD>scr_dump()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_160">Screen_Dump_To_File</A></TD><TD><A HREF="../man/curs_scr_dump.3x.html">curs_scr_dump.3x</A></TD></TR>
-++<TR><TD>scr_init()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_162">Screen_Init_From_File</A></TD><TD><A HREF="../man/curs_scr_dump.3x.html">curs_scr_dump.3x</A></TD></TR>
-++<TR><TD>scr_restore()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_161">Screen_Restore_From_File</A></TD><TD><A HREF="../man/curs_scr_dump.3x.html">curs_scr_dump.3x</A></TD></TR>
-++<TR><TD>scr_set()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_163">Screen_Set_File</A></TD><TD><A HREF="../man/curs_scr_dump.3x.html">curs_scr_dump.3x</A></TD></TR>
-++<TR><TD>scrollok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_59">Allow_Scrolling</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
-+ <TR><TD>set_current_field()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_57">Set_Current</A></TD><TD><A HREF="../man/form_page.3x.html">form_page.3x</A></TD></TR>
-+ <TR><TD>set_current_item()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_13">Set_Current</A></TD><TD><A HREF="../man/mitem_current.3x.html">mitem_current.3x</A></TD></TR>
-+ <TR><TD>set_field_back()</TD><TD><A HREF="terminal_interface-curses-forms__ads.htm#AFU_20">Set_Background</A></TD><TD><A HREF="../man/form_field_attributes.3x.html">form_field_attributes.3x</A></TD></TR>
-+@@ -238,15 +240,15 @@
-+ <TR><TD>set_item_term()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_49">Set_Item_Term_Hook</A></TD><TD><A HREF="../man/menu_hook.3x.html">menu_hook.3x</A></TD></TR>
-+ <TR><TD>set_item_userptr</TD><TD><A HREF="terminal_interface-curses-menus-item_user_data__ads.htm#AFU_1">Set_User_Data</A></TD><TD><A HREF="../man/mitem_userptr.3x.html">mitem_userptr.3x</A></TD></TR>
-+ <TR><TD>set_item_value()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_4">Set_Value</A></TD><TD><A HREF="../man/mitem_value.3x.html">mitem_value.3x</A></TD></TR>
-+-<TR><TD>set_menu_back()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_34">Set_Background</A></TD><TD><A HREF="../man/menu_attribs.3x.html">menu_attribs.3x</A></TD></TR>
-+-<TR><TD>set_menu_fore()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_31">Set_Foreground</A></TD><TD><A HREF="../man/menu_attribs.3x.html">menu_attribs.3x</A></TD></TR>
-++<TR><TD>set_menu_back()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_34">Set_Background</A></TD><TD><A HREF="../man/menu_attributes.3x.html">menu_attributes.3x</A></TD></TR>
-++<TR><TD>set_menu_fore()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_31">Set_Foreground</A></TD><TD><A HREF="../man/menu_attributes.3x.html">menu_attributes.3x</A></TD></TR>
-+ <TR><TD>set_menu_format()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_46">Set_Format</A></TD><TD><A HREF="../man/menu_format.3x.html">menu_format.3x</A></TD></TR>
-+-<TR><TD>set_menu_grey()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_37">Set_Grey</A></TD><TD><A HREF="../man/menu_attribs.3x.html">menu_attribs.3x</A></TD></TR>
-++<TR><TD>set_menu_grey()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_37">Set_Grey</A></TD><TD><A HREF="../man/menu_attributes.3x.html">menu_attributes.3x</A></TD></TR>
-+ <TR><TD>set_menu_init()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_50">Set_Menu_Init_Hook</A></TD><TD><A HREF="../man/menu_hook.3x.html">menu_hook.3x</A></TD></TR>
-+ <TR><TD>set_menu_items()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_56">Redefine</A></TD><TD><A HREF="../man/menu_items.3x.html">menu_items.3x</A></TD></TR>
-+ <TR><TD>set_menu_mark()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_29">Set_Mark</A></TD><TD><A HREF="../man/menu_mark.3x.html">menu_mark.3x</A></TD></TR>
-+ <TR><TD>set_menu_opts()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_19">Set_Options</A></TD><TD><A HREF="../man/menu_opts.3x.html">menu_opts.3x</A></TD></TR>
-+-<TR><TD>set_menu_pad()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_40">Set_Pad_Character</A></TD><TD><A HREF="../man/menu_attribs.3x.html">menu_attribs.3x</A></TD></TR>
-++<TR><TD>set_menu_pad()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_40">Set_Pad_Character</A></TD><TD><A HREF="../man/menu_attributes.3x.html">menu_attributes.3x</A></TD></TR>
-+ <TR><TD>set_menu_pattern()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_44">Set_Pattern</A></TD><TD><A HREF="../man/menu_pattern.3x.html">menu_pattern.3x</A></TD></TR>
-+ <TR><TD>set_menu_spacing()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_42">Set_Spacing</A></TD><TD><A HREF="../man/menu_spacing.3x.html">menu_spacing.3x</A></TD></TR>
-+ <TR><TD>set_menu_sub()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_25">Set_Sub_Window</A></TD><TD><A HREF="../man/menu_win.3x.html">menu_win.3x</A></TD></TR>
-+@@ -257,83 +259,83 @@
-+ <TR><TD>set_panel_userptr</TD><TD><A HREF="terminal_interface-curses-panels-user_data__ads.htm#AFU_1">Set_User_Data</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
-+ <TR><TD>set_top_row()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_15">Set_Top_Row</A></TD><TD><A HREF="../man/mitem_current.3x.html">mitem_current.3x</A></TD></TR>
-+ <TR><TD>show_panel()</TD><TD><A HREF="terminal_interface-curses-panels__ads.htm#AFU_5">Show</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
-+-<TR><TD>slk_attr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_119">Get_Soft_Label_Key_Attributes</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-+ <TR><TD>slk_attr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_120">Get_Soft_Label_Key_Attributes</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-+-<TR><TD>slk_attron()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_117">Switch_Soft_Label_Key_Attributes</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-+-<TR><TD>slk_attrset()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_118">Set_Soft_Label_Key_Attributes</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-+-<TR><TD>slk_clear()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_114">Clear_Soft_Label_Keys</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-+-<TR><TD>slk_color()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_121">Set_Soft_Label_Key_Color</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-+-<TR><TD>slk_init()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_108">Init_Soft_Label_Keys</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-+-<TR><TD>slk_label()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_112">Get_Soft_Label_Key</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-++<TR><TD>slk_attr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_121">Get_Soft_Label_Key_Attributes</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-++<TR><TD>slk_attron()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_118">Switch_Soft_Label_Key_Attributes</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-++<TR><TD>slk_attrset()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_119">Set_Soft_Label_Key_Attributes</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-++<TR><TD>slk_clear()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_115">Clear_Soft_Label_Keys</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-++<TR><TD>slk_color()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_122">Set_Soft_Label_Key_Color</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-++<TR><TD>slk_init()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_109">Init_Soft_Label_Keys</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-+ <TR><TD>slk_label()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_113">Get_Soft_Label_Key</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-+-<TR><TD>slk_noutrefresh()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_111">Refresh_Soft_Label_Keys_Without_Update</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-+-<TR><TD>slk_refresh()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_110">Refresh_Soft_Label_Key</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-+-<TR><TD>slk_restore()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_115">Restore_Soft_Label_Keys</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-+-<TR><TD>slk_set()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_109">Set_Soft_Label_Key</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-+-<TR><TD>slk_touch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_116">Touch_Soft_Label_Keys</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-+-<TR><TD>standout()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_31">Standout</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
-+-<TR><TD>start_color()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_140">Start_Color</A></TD><TD><A HREF="../man/curs_color.3x.html">curs_color.3x</A></TD></TR>
-++<TR><TD>slk_label()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_114">Get_Soft_Label_Key</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-++<TR><TD>slk_noutrefresh()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_112">Refresh_Soft_Label_Keys_Without_Update</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-++<TR><TD>slk_refresh()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_111">Refresh_Soft_Label_Key</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-++<TR><TD>slk_restore()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_116">Restore_Soft_Label_Keys</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-++<TR><TD>slk_set()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_110">Set_Soft_Label_Key</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-++<TR><TD>slk_touch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_117">Touch_Soft_Label_Keys</A></TD><TD><A HREF="../man/curs_slk.3x.html">curs_slk.3x</A></TD></TR>
-++<TR><TD>standout()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_32">Standout</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
-++<TR><TD>start_color()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_141">Start_Color</A></TD><TD><A HREF="../man/curs_color.3x.html">curs_color.3x</A></TD></TR>
-+ <TR><TD>stdscr</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_1">Standard_Window</A></TD><TD><A HREF="../man/curs_initscr.3x.html">curs_initscr.3x</A></TD></TR>
-+-<TR><TD>subpad()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_89">Sub_Pad</A></TD><TD><A HREF="../man/curs_pad.3x.html">curs_pad.3x</A></TD></TR>
-+-<TR><TD>subwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_12">Sub_Window</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
-+-<TR><TD>syncok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_19">Set_Synch_Mode</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
-+-<TR><TD>termattrs()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_135">Supported_Attributes</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
-+-<TR><TD>termname()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_138">Terminal_Name</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
-++<TR><TD>subpad()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_90">Sub_Pad</A></TD><TD><A HREF="../man/curs_pad.3x.html">curs_pad.3x</A></TD></TR>
-++<TR><TD>subwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_13">Sub_Window</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
-++<TR><TD>syncok()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_20">Set_Synch_Mode</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
-++<TR><TD>termattrs()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_136">Supported_Attributes</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
-+ <TR><TD>termname()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_139">Terminal_Name</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
-++<TR><TD>termname()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_140">Terminal_Name</A></TD><TD><A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></TD></TR>
-+ <TR><TD>top_panel()</TD><TD><A HREF="terminal_interface-curses-panels__ads.htm#AFU_4">Top</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
-+ <TR><TD>top_row()</TD><TD><A HREF="terminal_interface-curses-menus__ads.htm#AFU_16">Top_Row</A></TD><TD><A HREF="../man/mitem_current.3x.html">mitem_current.3x</A></TD></TR>
-+-<TR><TD>touchline()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_74">Touch</A></TD><TD><A HREF="../man/curs_touch.3x.html">curs_touch.3x</A></TD></TR>
-+-<TR><TD>touchwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_73">Touch</A></TD><TD><A HREF="../man/curs_touch.3x.html">curs_touch.3x</A></TD></TR>
-++<TR><TD>touchline()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_75">Touch</A></TD><TD><A HREF="../man/curs_touch.3x.html">curs_touch.3x</A></TD></TR>
-++<TR><TD>touchwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_74">Touch</A></TD><TD><A HREF="../man/curs_touch.3x.html">curs_touch.3x</A></TD></TR>
-+ <TR><TD>trace()</TD><TD><A HREF="terminal_interface-curses-trace__ads.htm#AFU_1">Trace_on</A></TD><TD><A HREF="../man/curs_trace.3x.html">curs_trace.3x</A></TD></TR>
-+-<TR><TD>unctrl()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_126">Un_Control</A></TD><TD><A HREF="../man/curs_util.3x.html">curs_util.3x</A></TD></TR>
-+ <TR><TD>unctrl()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_127">Un_Control</A></TD><TD><A HREF="../man/curs_util.3x.html">curs_util.3x</A></TD></TR>
-+-<TR><TD>ungetch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_29">Undo_Keystroke</A></TD><TD><A HREF="../man/curs_getch.3x.html">curs_getch.3x</A></TD></TR>
-++<TR><TD>unctrl()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_128">Un_Control</A></TD><TD><A HREF="../man/curs_util.3x.html">curs_util.3x</A></TD></TR>
-++<TR><TD>ungetch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_30">Undo_Keystroke</A></TD><TD><A HREF="../man/curs_getch.3x.html">curs_getch.3x</A></TD></TR>
-+ <TR><TD>ungetmouse()</TD><TD><A HREF="terminal_interface-curses-mouse__ads.htm#AFU_3">Unget_Mouse</A></TD><TD><A HREF="../man/curs_mouse.3x.html">curs_mouse.3x</A></TD></TR>
-+-<TR><TD>untouchwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_72">Untouch</A></TD><TD><A HREF="../man/curs_touch.3x.html">curs_touch.3x</A></TD></TR>
-++<TR><TD>untouchwin()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_73">Untouch</A></TD><TD><A HREF="../man/curs_touch.3x.html">curs_touch.3x</A></TD></TR>
-+ <TR><TD>update_panels()</TD><TD><A HREF="terminal_interface-curses-panels__ads.htm#AFU_6">Update_Panels</A></TD><TD><A HREF="../man/panel.3x.html">panel.3x</A></TD></TR>
-+-<TR><TD>use_default_colors()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_154">Use_Default_Colors</A></TD><TD><A HREF="../man/dft_fgbg.3x.html">dft_fgbg.3x</A></TD></TR>
-+-<TR><TD>use_extended_names()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_157">Use_Extended_Names</A></TD><TD><A HREF="../man/curs_extend.3x.html">curs_extend.3x</A></TD></TR>
-+-<TR><TD>waddch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_7">Add</A></TD><TD><A HREF="../man/curs_addch.3x.html">curs_addch.3x</A></TD></TR>
-+-<TR><TD>waddchnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_22">Add</A></TD><TD><A HREF="../man/curs_addchstr.3x.html">curs_addchstr.3x</A></TD></TR>
-+-<TR><TD>waddnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_20">Add</A></TD><TD><A HREF="../man/curs_addstr.3x.html">curs_addstr.3x</A></TD></TR>
-+-<TR><TD>wattr_get()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_34">Get_Character_Attributes</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
-+-<TR><TD>wattr_get()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_35">Get_Character_Attribute</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
-+-<TR><TD>wattron()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_32">Switch_Character_Attribute</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
-+-<TR><TD>wattrset()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_33">Set_Character_Attributes</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
-+-<TR><TD>wbkgd()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_70">Change_Background</A></TD><TD><A HREF="../man/curs_bkgd.3x.html">curs_bkgd.3x</A></TD></TR>
-+-<TR><TD>wbkgdget()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_71">Get_Background</A></TD><TD><A HREF="../man/curs_bkgd.3x.html">curs_bkgd.3x</A></TD></TR>
-+-<TR><TD>wbkgdset()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_69">Set_Background</A></TD><TD><A HREF="../man/curs_bkgd.3x.html">curs_bkgd.3x</A></TD></TR>
-+-<TR><TD>wborder()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_24">Border</A></TD><TD><A HREF="../man/curs_border.3x.html">curs_border.3x</A></TD></TR>
-+-<TR><TD>wchgat()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_37">Change_Attributes</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
-+-<TR><TD>wclear()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_66">Clear</A></TD><TD><A HREF="../man/curs_clear.3x.html">curs_clear.3x</A></TD></TR>
-+-<TR><TD>wclrtobot()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_67">Clear_To_End_Of_Screen</A></TD><TD><A HREF="../man/curs_clear.3x.html">curs_clear.3x</A></TD></TR>
-+-<TR><TD>wclrtoeol()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_68">Clear_To_End_Of_Line</A></TD><TD><A HREF="../man/curs_clear.3x.html">curs_clear.3x</A></TD></TR>
-+-<TR><TD>wcolor_set()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_36">Set_Color</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
-+-<TR><TD>wdelch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_94">Delete_Character</A></TD><TD><A HREF="../man/curs_delch.3x.html">curs_delch.3x</A></TD></TR>
-+-<TR><TD>wdeleteln()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_82">Delete_Line</A></TD><TD><A HREF="../man/curs_deleteln.3x.html">curs_deleteln.3x</A></TD></TR>
-+-<TR><TD>wechochar()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_9">Add_With_Immediate_Echo</A></TD><TD><A HREF="../man/curs_addch.3x.html">curs_addch.3x</A></TD></TR>
-++<TR><TD>use_default_colors()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_155">Use_Default_Colors</A></TD><TD><A HREF="../man/default_colors.3x.html">default_colors.3x</A></TD></TR>
-++<TR><TD>use_extended_names()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_158">Use_Extended_Names</A></TD><TD><A HREF="../man/curs_extend.3x.html">curs_extend.3x</A></TD></TR>
-++<TR><TD>waddch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_8">Add</A></TD><TD><A HREF="../man/curs_addch.3x.html">curs_addch.3x</A></TD></TR>
-++<TR><TD>waddchnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_23">Add</A></TD><TD><A HREF="../man/curs_addchstr.3x.html">curs_addchstr.3x</A></TD></TR>
-++<TR><TD>waddnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_21">Add</A></TD><TD><A HREF="../man/curs_addstr.3x.html">curs_addstr.3x</A></TD></TR>
-++<TR><TD>wattr_get()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_35">Get_Character_Attributes</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
-++<TR><TD>wattr_get()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_36">Get_Character_Attribute</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
-++<TR><TD>wattron()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_33">Switch_Character_Attribute</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
-++<TR><TD>wattrset()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_34">Set_Character_Attributes</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
-++<TR><TD>wbkgd()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_71">Change_Background</A></TD><TD><A HREF="../man/curs_bkgd.3x.html">curs_bkgd.3x</A></TD></TR>
-++<TR><TD>wbkgdget()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_72">Get_Background</A></TD><TD><A HREF="../man/curs_bkgd.3x.html">curs_bkgd.3x</A></TD></TR>
-++<TR><TD>wbkgdset()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_70">Set_Background</A></TD><TD><A HREF="../man/curs_bkgd.3x.html">curs_bkgd.3x</A></TD></TR>
-++<TR><TD>wborder()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_25">Border</A></TD><TD><A HREF="../man/curs_border.3x.html">curs_border.3x</A></TD></TR>
-++<TR><TD>wchgat()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_38">Change_Attributes</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
-++<TR><TD>wclear()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_67">Clear</A></TD><TD><A HREF="../man/curs_clear.3x.html">curs_clear.3x</A></TD></TR>
-++<TR><TD>wclrtobot()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_68">Clear_To_End_Of_Screen</A></TD><TD><A HREF="../man/curs_clear.3x.html">curs_clear.3x</A></TD></TR>
-++<TR><TD>wclrtoeol()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_69">Clear_To_End_Of_Line</A></TD><TD><A HREF="../man/curs_clear.3x.html">curs_clear.3x</A></TD></TR>
-++<TR><TD>wcolor_set()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_37">Set_Color</A></TD><TD><A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></TD></TR>
-++<TR><TD>wdelch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_95">Delete_Character</A></TD><TD><A HREF="../man/curs_delch.3x.html">curs_delch.3x</A></TD></TR>
-++<TR><TD>wdeleteln()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_83">Delete_Line</A></TD><TD><A HREF="../man/curs_deleteln.3x.html">curs_deleteln.3x</A></TD></TR>
-++<TR><TD>wechochar()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_10">Add_With_Immediate_Echo</A></TD><TD><A HREF="../man/curs_addch.3x.html">curs_addch.3x</A></TD></TR>
-+ <TR><TD>wenclose()</TD><TD><A HREF="terminal_interface-curses-mouse__ads.htm#AFU_4">Enclosed_In_Window</A></TD><TD><A HREF="../man/curs_mouse.3x.html">curs_mouse.3x</A></TD></TR>
-+-<TR><TD>werase()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_65">Erase</A></TD><TD><A HREF="../man/curs_clear.3x.html">curs_clear.3x</A></TD></TR>
-+-<TR><TD>wgetch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_28">Get_Keystroke</A></TD><TD><A HREF="../man/curs_getch.3x.html">curs_getch.3x</A></TD></TR>
-+-<TR><TD>wgetnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_106">Get</A></TD><TD><A HREF="../man/curs_getstr.3x.html">curs_getstr.3x</A></TD></TR>
-+-<TR><TD>whline()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_26">Horizontal_Line</A></TD><TD><A HREF="../man/curs_border.3x.html">curs_border.3x</A></TD></TR>
-+-<TR><TD>winch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_96">Peek</A></TD><TD><A HREF="../man/curs_inch.3x.html">curs_inch.3x</A></TD></TR>
-+-<TR><TD>winchnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_104">Peek</A></TD><TD><A HREF="../man/curs_inchstr.3x.html">curs_inchstr.3x</A></TD></TR>
-+-<TR><TD>winnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_102">Peek</A></TD><TD><A HREF="../man/curs_instr.3x.html">curs_instr.3x</A></TD></TR>
-+-<TR><TD>winsch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_98">Insert</A></TD><TD><A HREF="../man/curs_insch.3x.html">curs_insch.3x</A></TD></TR>
-+-<TR><TD>winsdelln()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_81">Insert_Delete_Lines</A></TD><TD><A HREF="../man/curs_deleteln.3x.html">curs_deleteln.3x</A></TD></TR>
-+-<TR><TD>winsertln()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_83">Insert_Line</A></TD><TD><A HREF="../man/curs_deleteln.3x.html">curs_deleteln.3x</A></TD></TR>
-+-<TR><TD>winsnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_100">Insert</A></TD><TD><A HREF="../man/curs_insstr.3x.html">curs_insstr.3x</A></TD></TR>
-+-<TR><TD>wmove()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_6">Move_Cursor</A></TD><TD><A HREF="../man/curs_move.3x.html">curs_move.3x</A></TD></TR>
-+-<TR><TD>wnoutrefresh()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_62">Refresh_Without_Update</A></TD><TD><A HREF="../man/curs_refresh.3x.html">curs_refresh.3x</A></TD></TR>
-+-<TR><TD>wredrawln()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_64">Redraw</A></TD><TD><A HREF="../man/curs_refresh.3x.html">curs_refresh.3x</A></TD></TR>
-+-<TR><TD>wrefresh()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_61">Refresh</A></TD><TD><A HREF="../man/curs_refresh.3x.html">curs_refresh.3x</A></TD></TR>
-+-<TR><TD>wresize()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_162">Resize</A></TD><TD><A HREF="../man/wresize.3x.html">wresize.3x</A></TD></TR>
-+-<TR><TD>wscrl()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_93">Scroll</A></TD><TD><A HREF="../man/curs_scroll.3x.html">curs_scroll.3x</A></TD></TR>
-+-<TR><TD>wsetscrreg()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_59">Set_Scroll_Region</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
-+-<TR><TD>wsyncdown()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_18">Synchronize_Downwards</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
-+-<TR><TD>wsyncup()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_17">Synchronize_Upwards</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
-+-<TR><TD>wtimeout()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_50">Set_Timeout_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-+-<TR><TD>wtouchln()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_75">Change_Line_Status</A></TD><TD><A HREF="../man/curs_touch.3x.html">curs_touch.3x</A></TD></TR>
-+-<TR><TD>wvline()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_27">Vertical_Line</A></TD><TD><A HREF="../man/curs_border.3x.html">curs_border.3x</A></TD></TR>
-++<TR><TD>werase()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_66">Erase</A></TD><TD><A HREF="../man/curs_clear.3x.html">curs_clear.3x</A></TD></TR>
-++<TR><TD>wgetch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_29">Get_Keystroke</A></TD><TD><A HREF="../man/curs_getch.3x.html">curs_getch.3x</A></TD></TR>
-++<TR><TD>wgetnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_107">Get</A></TD><TD><A HREF="../man/curs_getstr.3x.html">curs_getstr.3x</A></TD></TR>
-++<TR><TD>whline()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_27">Horizontal_Line</A></TD><TD><A HREF="../man/curs_border.3x.html">curs_border.3x</A></TD></TR>
-++<TR><TD>winch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_97">Peek</A></TD><TD><A HREF="../man/curs_inch.3x.html">curs_inch.3x</A></TD></TR>
-++<TR><TD>winchnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_105">Peek</A></TD><TD><A HREF="../man/curs_inchstr.3x.html">curs_inchstr.3x</A></TD></TR>
-++<TR><TD>winnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_103">Peek</A></TD><TD><A HREF="../man/curs_instr.3x.html">curs_instr.3x</A></TD></TR>
-++<TR><TD>winsch()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_99">Insert</A></TD><TD><A HREF="../man/curs_insch.3x.html">curs_insch.3x</A></TD></TR>
-++<TR><TD>winsdelln()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_82">Insert_Delete_Lines</A></TD><TD><A HREF="../man/curs_deleteln.3x.html">curs_deleteln.3x</A></TD></TR>
-++<TR><TD>winsertln()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_84">Insert_Line</A></TD><TD><A HREF="../man/curs_deleteln.3x.html">curs_deleteln.3x</A></TD></TR>
-++<TR><TD>winsnstr()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_101">Insert</A></TD><TD><A HREF="../man/curs_insstr.3x.html">curs_insstr.3x</A></TD></TR>
-++<TR><TD>wmove()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_7">Move_Cursor</A></TD><TD><A HREF="../man/curs_move.3x.html">curs_move.3x</A></TD></TR>
-++<TR><TD>wnoutrefresh()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_63">Refresh_Without_Update</A></TD><TD><A HREF="../man/curs_refresh.3x.html">curs_refresh.3x</A></TD></TR>
-++<TR><TD>wredrawln()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_65">Redraw</A></TD><TD><A HREF="../man/curs_refresh.3x.html">curs_refresh.3x</A></TD></TR>
-++<TR><TD>wrefresh()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_62">Refresh</A></TD><TD><A HREF="../man/curs_refresh.3x.html">curs_refresh.3x</A></TD></TR>
-++<TR><TD>wresize()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_164">Resize</A></TD><TD><A HREF="../man/wresize.3x.html">wresize.3x</A></TD></TR>
-++<TR><TD>wscrl()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_94">Scroll</A></TD><TD><A HREF="../man/curs_scroll.3x.html">curs_scroll.3x</A></TD></TR>
-++<TR><TD>wsetscrreg()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_60">Set_Scroll_Region</A></TD><TD><A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></TD></TR>
-++<TR><TD>wsyncdown()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_19">Synchronize_Downwards</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
-++<TR><TD>wsyncup()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_18">Synchronize_Upwards</A></TD><TD><A HREF="../man/curs_window.3x.html">curs_window.3x</A></TD></TR>
-++<TR><TD>wtimeout()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_51">Set_Timeout_Mode</A></TD><TD><A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></TD></TR>
-++<TR><TD>wtouchln()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_76">Change_Line_Status</A></TD><TD><A HREF="../man/curs_touch.3x.html">curs_touch.3x</A></TD></TR>
-++<TR><TD>wvline()</TD><TD><A HREF="terminal_interface-curses__ads.htm#AFU_28">Vertical_Line</A></TD><TD><A HREF="../man/curs_border.3x.html">curs_border.3x</A></TD></TR>
-+ </TABLE></BODY></HTML>
-+Index: doc/html/ada/terminal_interface-curses-aux__ads.htm
-+--- ncurses-5.6/doc/html/ada/terminal_interface-curses-aux__ads.htm	2006-09-23 20:31:30.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/terminal_interface-curses-aux__ads.htm	2007-09-01 23:56:30.000000000 +0000
-+@@ -3,7 +3,6 @@
-+ <BODY>
-+ <HR><DIV ALIGN="center"><H1> File : terminal_interface-curses-aux.ads </H1></DIV><HR>
-+ <PRE>
-+-
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
-+ <FONT COLOR=green><EM>--                           <A HREF="http://www.gnat.com">GNAT</A> ncurses Binding                           --</EM></FONT>
-+@@ -48,84 +47,84 @@
-+ <FONT COLOR=green><EM>--  This module is generated. Please don't change it manually!</EM></FONT>
-+ <FONT COLOR=green><EM>--  Run the generator instead.</EM></FONT>
-+ <FONT COLOR=green><EM>--  |</EM></FONT>
-+-<b>with</b> <A HREF="interfac__ads.htm#ref_38_9">System</A>;
-++<b>with</b> System;
-+ <b>with</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C;
-+-<b>with</b> <A HREF="unchconv__ads.htm#ref_20_10">Interfaces</A>.C.Strings; <b>use</b> Interfaces.C.Strings;
-+-<b>with</b> Unchecked_Conversion;
-++<b>with</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.Strings; <b>use</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.Strings;
-++<b>with</b> <A HREF="unchconv__ads.htm#ref_20_10">Unchecked_Conversion</A>;
-+ 
-+-<b>package</b> Terminal_Interface.Curses.Aux <b>is</b>
-+-   <b>pragma</b> Preelaborate (Terminal_Interface.Curses.Aux);
-++<b>package</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<FONT COLOR=red><A NAME="ref_50_35" HREF="terminal_interface-curses-aux__adb.htm#ref_41_40">Aux</A></FONT> <b>is</b>
-++   <b>pragma</b> Preelaborate (<A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-aux__ads.htm#ref_50_35">Aux</A>);
-+ 
-+-   <b>use</b> <b>type</b> Interfaces.C.int;
-++   <b>use</b> <b>type</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.int;
-+ 
-+-   <b>subtype</b> <FONT COLOR=red><A NAME="ref_56_12">C_Int</A></FONT>      <b>is</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.int;
-+-   <b>subtype</b> <FONT COLOR=red><A NAME="ref_57_12">C_Short</A></FONT>    <b>is</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.short;
-+-   <b>subtype</b> <FONT COLOR=red><A NAME="ref_58_12">C_Long_Int</A></FONT> <b>is</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.long;
-+-   <b>subtype</b> <FONT COLOR=red><A NAME="ref_59_12">C_Size_T</A></FONT>   <b>is</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.size_t;
-+-   <b>subtype</b> <FONT COLOR=red><A NAME="ref_60_12">C_UInt</A></FONT>     <b>is</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.unsigned;
-+-   <b>subtype</b> <FONT COLOR=red><A NAME="ref_61_12">C_ULong</A></FONT>    <b>is</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.unsigned_long;
-+-   <b>subtype</b> <FONT COLOR=red><A NAME="ref_62_12">C_Char_Ptr</A></FONT> <b>is</b> Interfaces.C.Strings.chars_ptr;
-+-   <b>type</b>    <FONT COLOR=red><A NAME="ref_63_12">C_Void_Ptr</A></FONT> <b>is</b> <b>new</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_60_12">System</A>.Address;
-+-   <b>type</b>    <FONT COLOR=red><A NAME="ref_64_12">C_Chtype</A></FONT>   <b>is</b> <b>new</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_60_12">C_ULong</A>;
-+-   <b>type</b>    C_AttrType <b>is</b> <b>new</b> C_ULong;
-++   <b>subtype</b> <FONT COLOR=red><A NAME="ref_55_12">C_Int</A></FONT>      <b>is</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.int;
-++   <b>subtype</b> <FONT COLOR=red><A NAME="ref_56_12">C_Short</A></FONT>    <b>is</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.short;
-++   <b>subtype</b> <FONT COLOR=red><A NAME="ref_57_12">C_Long_Int</A></FONT> <b>is</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.long;
-++   <b>subtype</b> <FONT COLOR=red><A NAME="ref_58_12">C_Size_T</A></FONT>   <b>is</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.size_t;
-++   <b>subtype</b> <FONT COLOR=red><A NAME="ref_59_12">C_UInt</A></FONT>     <b>is</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.unsigned;
-++   <b>subtype</b> <FONT COLOR=red><A NAME="ref_60_12">C_ULong</A></FONT>    <b>is</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.unsigned_long;
-++   <b>subtype</b> <FONT COLOR=red><A NAME="ref_61_12">C_Char_Ptr</A></FONT> <b>is</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.Strings.chars_ptr;
-++   <b>type</b>    <FONT COLOR=red><A NAME="ref_62_12">C_Void_Ptr</A></FONT> <b>is</b> <b>new</b> System.Address;
-++   <b>type</b>    <FONT COLOR=red><A NAME="ref_63_12">C_Chtype</A></FONT>   <b>is</b> <b>new</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_60_12">C_ULong</A>;
-++   <b>type</b>    <FONT COLOR=red><A NAME="ref_64_12">C_AttrType</A></FONT> <b>is</b> <b>new</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_60_12">C_ULong</A>;
-+ 
-+    <FONT COLOR=green><EM>--  This is how those constants are defined in ncurses. I see them also</EM></FONT>
-+    <FONT COLOR=green><EM>--  exactly like this in all ETI implementations I ever tested. So it</EM></FONT>
-+    <FONT COLOR=green><EM>--  could be that this is quite general, but please check with your curses.</EM></FONT>
-+    <FONT COLOR=green><EM>--  This is critical, because curses sometime mixes boolean returns with</EM></FONT>
-+    <FONT COLOR=green><EM>--  returning an error status.</EM></FONT>
-+-   <FONT COLOR=red><A NAME="ref_72_4">Curses_Ok</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := 0;
-+-   Curses_Err   : <b>constant</b> C_Int := -1;
-++   <FONT COLOR=red><A NAME="ref_71_4">Curses_Ok</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := 0;
-++   <FONT COLOR=red><A NAME="ref_72_4">Curses_Err</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := -1;
-+ 
-+-   <FONT COLOR=red><A NAME="ref_75_4">Curses_True</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := 1;
-+-   Curses_False : <b>constant</b> C_Int := 0;
-++   <FONT COLOR=red><A NAME="ref_74_4">Curses_True</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := 1;
-++   <FONT COLOR=red><A NAME="ref_75_4">Curses_False</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := 0;
-+ 
-+    <FONT COLOR=green><EM>--  Eti_Error: type for error codes returned by the menu and form subsystem</EM></FONT>
-+-   <b>subtype</b> Eti_Error <b>is</b> C_Int <b>range</b> -14 .. 0;
-++   <b>subtype</b> <FONT COLOR=red><A NAME="ref_78_12">Eti_Error</A></FONT> <b>is</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> <b>range</b> -14 .. 0;
-+ 
-+-   <FONT COLOR=red><A NAME="ref_81_4">E_Ok</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := 0;
-+-   <FONT COLOR=red><A NAME="ref_82_4">E_System_Error</A></FONT>     : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -1;
-+-   <FONT COLOR=red><A NAME="ref_83_4">E_Bad_Argument</A></FONT>     : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -2;
-+-   <FONT COLOR=red><A NAME="ref_84_4">E_Posted</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -3;
-+-   <FONT COLOR=red><A NAME="ref_85_4">E_Connected</A></FONT>        : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -4;
-+-   <FONT COLOR=red><A NAME="ref_86_4">E_Bad_State</A></FONT>        : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -5;
-+-   <FONT COLOR=red><A NAME="ref_87_4">E_No_Room</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -6;
-+-   <FONT COLOR=red><A NAME="ref_88_4">E_Not_Posted</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -7;
-+-   <FONT COLOR=red><A NAME="ref_89_4">E_Unknown_Command</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -8;
-+-   <FONT COLOR=red><A NAME="ref_90_4">E_No_Match</A></FONT>         : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -9;
-+-   <FONT COLOR=red><A NAME="ref_91_4">E_Not_Selectable</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -10;
-+-   <FONT COLOR=red><A NAME="ref_92_4">E_Not_Connected</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -11;
-+-   <FONT COLOR=red><A NAME="ref_93_4">E_Request_Denied</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -12;
-+-   <FONT COLOR=red><A NAME="ref_94_4">E_Invalid_Field</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -13;
-+-   E_Current          : <b>constant</b> Eti_Error := -14;
-++   <FONT COLOR=red><A NAME="ref_80_4">E_Ok</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := 0;
-++   <FONT COLOR=red><A NAME="ref_81_4">E_System_Error</A></FONT>     : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -1;
-++   <FONT COLOR=red><A NAME="ref_82_4">E_Bad_Argument</A></FONT>     : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -2;
-++   <FONT COLOR=red><A NAME="ref_83_4">E_Posted</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -3;
-++   <FONT COLOR=red><A NAME="ref_84_4">E_Connected</A></FONT>        : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -4;
-++   <FONT COLOR=red><A NAME="ref_85_4">E_Bad_State</A></FONT>        : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -5;
-++   <FONT COLOR=red><A NAME="ref_86_4">E_No_Room</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -6;
-++   <FONT COLOR=red><A NAME="ref_87_4">E_Not_Posted</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -7;
-++   <FONT COLOR=red><A NAME="ref_88_4">E_Unknown_Command</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -8;
-++   <FONT COLOR=red><A NAME="ref_89_4">E_No_Match</A></FONT>         : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -9;
-++   <FONT COLOR=red><A NAME="ref_90_4">E_Not_Selectable</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -10;
-++   <FONT COLOR=red><A NAME="ref_91_4">E_Not_Connected</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -11;
-++   <FONT COLOR=red><A NAME="ref_92_4">E_Request_Denied</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -12;
-++   <FONT COLOR=red><A NAME="ref_93_4">E_Invalid_Field</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -13;
-++   <FONT COLOR=red><A NAME="ref_94_4">E_Current</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A> := -14;
-+ 
-+-   <b>procedure</b> Eti_Exception (Code : Eti_Error);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_96_14" HREF="terminal_interface-curses-aux__adb.htm#ref_94_14">Eti_Exception</A></FONT> (<FONT COLOR=red><A NAME="ref_96_29" HREF="terminal_interface-curses-aux__adb.htm#ref_94_29">Code</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_78_12">Eti_Error</A>);
-+    <FONT COLOR=green><EM>--  Dispatch the error code and raise the appropriate exception</EM></FONT>
-+    <FONT COLOR=green><EM>--</EM></FONT>
-+    <FONT COLOR=green><EM>--</EM></FONT>
-+    <FONT COLOR=green><EM>--  Some helpers</EM></FONT>
-+    <b>function</b> Chtype_To_AttrChar <b>is</b> <b>new</b>
-+-     Unchecked_Conversion (<A HREF="unchconv__ads.htm#ref_18_9">Source</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_352_9">C_Chtype</A>,
-+-                           Target =&gt; Attributed_Character);
-++     <A HREF="unchconv__ads.htm#ref_20_10">Unchecked_Conversion</A> (<A HREF="unchconv__ads.htm#ref_17_9">Source</A> =&gt; <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>,
-++                           <A HREF="unchconv__ads.htm#ref_18_9">Target</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>);
-+    <b>function</b> AttrChar_To_Chtype <b>is</b> <b>new</b>
-+-     Unchecked_Conversion (<A HREF="unchconv__ads.htm#ref_18_9">Source</A> =&gt; <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">Attributed_Character</A>,
-+-                           Target =&gt; C_Chtype);
-++     <A HREF="unchconv__ads.htm#ref_20_10">Unchecked_Conversion</A> (<A HREF="unchconv__ads.htm#ref_17_9">Source</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>,
-++                           <A HREF="unchconv__ads.htm#ref_18_9">Target</A> =&gt; <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>);
-+ 
-+    <b>function</b> AttrChar_To_AttrType <b>is</b> <b>new</b>
-+-     Unchecked_Conversion (<A HREF="unchconv__ads.htm#ref_18_9">Source</A> =&gt; <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">Attributed_Character</A>,
-+-                           Target =&gt; C_AttrType);
-++     <A HREF="unchconv__ads.htm#ref_20_10">Unchecked_Conversion</A> (<A HREF="unchconv__ads.htm#ref_17_9">Source</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>,
-++                           <A HREF="unchconv__ads.htm#ref_18_9">Target</A> =&gt; <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>);
-+ 
-+    <b>function</b> AttrType_To_AttrChar <b>is</b> <b>new</b>
-+-     Unchecked_Conversion (<A HREF="unchconv__ads.htm#ref_18_9">Source</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_352_9">C_AttrType</A>,
-+-                           Target =&gt; Attributed_Character);
-++     <A HREF="unchconv__ads.htm#ref_20_10">Unchecked_Conversion</A> (<A HREF="unchconv__ads.htm#ref_17_9">Source</A> =&gt; <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>,
-++                           <A HREF="unchconv__ads.htm#ref_18_9">Target</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>);
-+ 
-+-   <b>procedure</b> Fill_String (<FONT COLOR=red><A NAME="ref_117_27" HREF="terminal_interface-curses-aux__adb.htm#ref_45_27">Cp</A></FONT>  : <b>in</b>  chars_ptr;
-+-                          Str : <b>out</b> String);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_116_14" HREF="terminal_interface-curses-aux__adb.htm#ref_44_14">Fill_String</A></FONT> (<FONT COLOR=red><A NAME="ref_116_27" HREF="terminal_interface-curses-aux__adb.htm#ref_44_27">Cp</A></FONT>  : <b>in</b>  chars_ptr;
-++                          <FONT COLOR=red><A NAME="ref_117_27" HREF="terminal_interface-curses-aux__adb.htm#ref_45_27">Str</A></FONT> : <b>out</b> String);
-+    <FONT COLOR=green><EM>--  Fill the Str parameter with the string denoted by the chars_ptr</EM></FONT>
-+    <FONT COLOR=green><EM>--  C-Style string.</EM></FONT>
-+ 
-+-   <b>function</b> Fill_String (Cp : chars_ptr) <b>return</b> String;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_121_13" HREF="terminal_interface-curses-aux__adb.htm#ref_73_13">Fill_String</A></FONT> (<FONT COLOR=red><A NAME="ref_121_26" HREF="terminal_interface-curses-aux__adb.htm#ref_73_26">Cp</A></FONT> : chars_ptr) <b>return</b> String;
-+    <FONT COLOR=green><EM>--  Same but as function.</EM></FONT>
-+ 
-+-<b>end</b> Terminal_Interface.Curses.Aux;
-++<b>end</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-aux__ads.htm#ref_50_35">Aux</A>;
-+ </PRE></BODY></HTML>
-+Index: doc/html/ada/terminal_interface-curses-forms-field_types__ads.htm
-+--- ncurses-5.6/doc/html/ada/terminal_interface-curses-forms-field_types__ads.htm	2006-09-23 20:31:31.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/terminal_interface-curses-forms-field_types__ads.htm	2007-09-01 23:56:30.000000000 +0000
-+@@ -3,7 +3,6 @@
-+ <BODY>
-+ <HR><DIV ALIGN="center"><H1> File : terminal_interface-curses-forms-field_types.ads </H1></DIV><HR>
-+ <PRE>
-+-
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
-+ <FONT COLOR=green><EM>--                           <A HREF="http://www.gnat.com">GNAT</A> ncurses Binding                           --</EM></FONT>
-+@@ -44,18 +43,18 @@
-+ <FONT COLOR=green><EM>--  @Revision: 1.14 @</EM></FONT>
-+ <FONT COLOR=green><EM>--  Binding Version 01.00</EM></FONT>
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-<b>with</b> Interfaces.C;
-++<b>with</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C;
-+ 
-+-<b>package</b> Terminal_Interface.Curses.Forms.Field_Types <b>is</b>
-+-   <b>pragma</b> Preelaborate (Terminal_Interface.Curses.Forms.Field_Types);
-+-   <b>use</b> <b>type</b><FONT COLOR=red><A NAME="ref_46_12"> </A></FONT>Interfaces.C.int;
-+-   <b>subtype</b> C_Int <b>is</b> Interfaces.C.int;
-++<b>package</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-forms__ads.htm#ref_49_35">Forms</A>.<FONT COLOR=red><A NAME="ref_43_41" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_51_46">Field_Types</A></FONT> <b>is</b>
-++   <b>pragma</b> Preelaborate (<A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-forms__ads.htm#ref_49_35">Forms</A>.<A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_43_41">Field_Types</A>);
-++   <b>use</b> <b>type</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.int;
-++   <b>subtype</b> <FONT COLOR=red><A NAME="ref_46_12">C_Int</A></FONT> <b>is</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.int;
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_fieldtype.3x.html">form_fieldtype.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <b>type</b> Field_Type <b>is</b> <b>abstract</b> <b>tagged</b> <b>null</b> <b>record</b>;
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_52_9">Field_Type</A></FONT> <b>is</b> <b>abstract</b> <b>tagged</b> <b>null</b> <b>record</b>;
-+    <FONT COLOR=green><EM>--  Abstract base type for all field types. A concrete field type</EM></FONT>
-+    <FONT COLOR=green><EM>--  is an extension that adds some data elements describing formats or</EM></FONT>
-+    <FONT COLOR=green><EM>--  boundary values for the type and validation routines.</EM></FONT>
-+@@ -66,11 +65,11 @@
-+    <FONT COLOR=green><EM>--  how to create you own child packages for low-level field types that</EM></FONT>
-+    <FONT COLOR=green><EM>--  you may have already written in C.</EM></FONT>
-+ 
-+-   <b>type</b> Field_Type_Access <b>is</b> <b>access</b> <b>all</b> Field_Type'Class;
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_63_9">Field_Type_Access</A></FONT> <b>is</b> <b>access</b> <b>all</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_52_9">Field_Type</A>'Class;
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_1"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Field_Type (<FONT COLOR=red><A NAME="ref_67_30" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_66_14">Fld</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_52_9">Field</A>;
-+-                             Fld_Type : <b>in</b> Field_Type) <b>is</b> <b>abstract</b>;
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_66_14">Set_Field_Type</A></FONT> (<FONT COLOR=red><A NAME="ref_66_30" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_66_14">Fld</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++                             <FONT COLOR=red><A NAME="ref_67_30" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_66_14">Fld_Type</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_52_9">Field_Type</A>) <b>is</b> <b>abstract</b>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_fieldtype.3x.html">set_field_type()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  But: we hide the vararg mechanism of the C interface. You always</EM></FONT>
-+    <FONT COLOR=green><EM>--       have to pass a single Field_Type parameter.</EM></FONT>
-+@@ -82,7 +81,7 @@
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_2"#2|</EM></FONT>
-+-   <b>function</b> Get_Type (Fld : <b>in</b> Field) <b>return</b> Field_Type_Access;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_79_13" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_73_13">Get_Type</A></FONT> (<FONT COLOR=red><A NAME="ref_79_23" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_73_23">Fld</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>) <b>return</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_63_9">Field_Type_Access</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_validation.3x.html">field_type()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: field_arg()</EM></FONT>
-+    <FONT COLOR=green><EM>--  In Ada95 we can combine these. If you try to retrieve the field type</EM></FONT>
-+@@ -95,68 +94,68 @@
-+    <FONT COLOR=green><EM>--  | Most of this is used by the implementations of the child packages.</EM></FONT>
-+    <FONT COLOR=green><EM>--  |</EM></FONT>
-+ <b>private</b>
-+-   <b>type</b> Makearg_Function <b>is</b> <b>access</b>
-+-     <b>function</b> (Args : System.Address) <b>return</b> System.Address;
-+-   <b>pragma</b> Convention (C, Makearg_Function);
-+-
-+-   <b>type</b> Copyarg_Function <b>is</b> <b>access</b>
-+-     <b>function</b> (Usr : System.Address) <b>return</b> System.Address;
-+-   <b>pragma</b> Convention (C, Copyarg_Function);
-+-
-+-   <b>type</b> Freearg_Function <b>is</b> <b>access</b>
-+-     <b>procedure</b> (Usr : System.Address);
-+-   <b>pragma</b> Convention (C, Freearg_Function);
-+-
-+-   <b>type</b> Field_Check_Function<FONT COLOR=red><A NAME="ref_105_29"> </A></FONT><b>is</b> <b>access</b>
-+-     <b>function</b> (Fld : Field; Usr : System.Address) <b>return</b> C_Int;
-+-   <b>pragma</b> Convention (C, Field_Check_Function);
-+-
-+-   <b>type</b> Char_Check_Function<FONT COLOR=red><A NAME="ref_109_28"> </A></FONT><b>is</b> <b>access</b>
-+-     <b>function</b> (Ch : C_Int<A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_108_9">;</A> Usr : System.Address) <b>return</b> C_Int;
-+-   <b>pragma</b> Convention (C, Char_Check_Function);
-+-
-+-   <b>type</b> Choice_Function <b>is</b> <b>access</b>
-+-     <b>function</b> (Fld : Field; Usr : System.Address) <b>return</b> C_Int;
-+-   <b>pragma</b> Convention (C, Choice_Function);
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_92_9">Makearg_Function</A></FONT> <b>is</b> <b>access</b>
-++     <b>function</b> (<FONT COLOR=red><A NAME="ref_93_16">Args</A></FONT> : System.Address) <b>return</b> System.Address;
-++   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_92_9">Makearg_Function</A>);
-++
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_96_9">Copyarg_Function</A></FONT> <b>is</b> <b>access</b>
-++     <b>function</b> (<FONT COLOR=red><A NAME="ref_97_16">Usr</A></FONT> : System.Address) <b>return</b> System.Address;
-++   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_96_9">Copyarg_Function</A>);
-++
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_100_9">Freearg_Function</A></FONT> <b>is</b> <b>access</b>
-++     <b>procedure</b> (<FONT COLOR=red><A NAME="ref_101_17">Usr</A></FONT> : System.Address);
-++   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_100_9">Freearg_Function</A>);
-++
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_104_9">Field_Check_Function</A></FONT> <b>is</b> <b>access</b>
-++     <b>function</b> (<FONT COLOR=red><A NAME="ref_105_16">Fld</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>; <FONT COLOR=red><A NAME="ref_105_29">Usr</A></FONT> : System.Address) <b>return</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_46_12">C_Int</A>;
-++   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_104_9">Field_Check_Function</A>);
-++
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_108_9">Char_Check_Function</A></FONT> <b>is</b> <b>access</b>
-++     <b>function</b> (<FONT COLOR=red><A NAME="ref_109_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_46_12">C_Int</A>; <FONT COLOR=red><A NAME="ref_109_28">Usr</A></FONT> : System.Address) <b>return</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_46_12">C_Int</A>;
-++   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_108_9">Char_Check_Function</A>);
-++
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_112_9">Choice_Function</A></FONT> <b>is</b> <b>access</b>
-++     <b>function</b> (<FONT COLOR=red><A NAME="ref_113_16">Fld</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>; <FONT COLOR=red><A NAME="ref_113_29">Usr</A></FONT> : System.Address) <b>return</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_46_12">C_Int</A>;
-++   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_112_9">Choice_Function</A>);
-+ 
-+    <FONT COLOR=green><EM>--  +----------------------------------------------------------------------</EM></FONT>
-+    <FONT COLOR=green><EM>--  | This must be in sync with the FIELDTYPE structure in form.h</EM></FONT>
-+    <FONT COLOR=green><EM>--  |</EM></FONT>
-+-   <b>type</b> Low_Level_Field_Type <b>is</b>
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_119_9">Low_Level_Field_Type</A></FONT> <b>is</b>
-+       <b>record</b>
-+-         <FONT COLOR=red><A NAME="ref_122_10">Status</A></FONT> :              <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.short;
-+-         <FONT COLOR=red><A NAME="ref_123_10">Ref_Count</A></FONT> :           Interfaces.C.long;
-+-         <FONT COLOR=red><A NAME="ref_124_10">Left</A></FONT>, Right :         <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_92_9">System</A>.Address;
-+-         <FONT COLOR=red><A NAME="ref_125_10">Makearg</A></FONT> :             <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_96_9">Makearg_Function</A>;
-+-         <FONT COLOR=red><A NAME="ref_126_10">Copyarg</A></FONT> :             <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_100_9">Copyarg_Function</A>;
-+-         <FONT COLOR=red><A NAME="ref_127_10">Freearg</A></FONT> :             <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_104_9">Freearg_Function</A>;
-+-         <FONT COLOR=red><A NAME="ref_128_10">Fcheck</A></FONT> :              <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_108_9">Field_Check_Function</A>;
-+-         <FONT COLOR=red><A NAME="ref_129_10">Ccheck</A></FONT><FONT COLOR=red><A NAME="ref_129_16"> </A></FONT>:              <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_112_9">Char_Check_Function</A>;
-+-         Next, Prev :          Choice_Function;
-++         <FONT COLOR=red><A NAME="ref_121_10">Status</A></FONT> :              <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.short;
-++         <FONT COLOR=red><A NAME="ref_122_10">Ref_Count</A></FONT> :           <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.long;
-++         <FONT COLOR=red><A NAME="ref_123_10">Left</A></FONT>, <FONT COLOR=red><A NAME="ref_123_16">Right</A></FONT> :         System.Address;
-++         <FONT COLOR=red><A NAME="ref_124_10">Makearg</A></FONT> :             <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_92_9">Makearg_Function</A>;
-++         <FONT COLOR=red><A NAME="ref_125_10">Copyarg</A></FONT> :             <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_96_9">Copyarg_Function</A>;
-++         <FONT COLOR=red><A NAME="ref_126_10">Freearg</A></FONT> :             <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_100_9">Freearg_Function</A>;
-++         <FONT COLOR=red><A NAME="ref_127_10">Fcheck</A></FONT> :              <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_104_9">Field_Check_Function</A>;
-++         <FONT COLOR=red><A NAME="ref_128_10">Ccheck</A></FONT> :              <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_108_9">Char_Check_Function</A>;
-++         <FONT COLOR=red><A NAME="ref_129_10">Next</A></FONT>, <FONT COLOR=red><A NAME="ref_129_16">Prev</A></FONT> :          <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_112_9">Choice_Function</A>;
-+       <b>end</b> <b>record</b>;
-+-   <b>pragma</b> Convention (C, Low_Level_Field_Type);
-+-   <b>type</b> C_Field_Type <b>is</b> <b>access</b> <b>all</b> Low_Level_Field_Type;
-++   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_119_9">Low_Level_Field_Type</A>);
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_132_9">C_Field_Type</A></FONT> <b>is</b> <b>access</b> <b>all</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_119_9">Low_Level_Field_Type</A>;
-+ 
-+-   Null_Field_Type   : <b>constant</b> C_Field_Type := <b>null</b>;
-++   <FONT COLOR=red><A NAME="ref_134_4">Null_Field_Type</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A> := <b>null</b>;
-+ 
-+    <FONT COLOR=green><EM>--  +----------------------------------------------------------------------</EM></FONT>
-+    <FONT COLOR=green><EM>--  | This four low-level fieldtypes are the ones associated with</EM></FONT>
-+    <FONT COLOR=green><EM>--  | fieldtypes handled by this binding. Any other low-level fieldtype</EM></FONT>
-+    <FONT COLOR=green><EM>--  | will result in a Form_Exception is function Get_Type.</EM></FONT>
-+    <FONT COLOR=green><EM>--  |</EM></FONT>
-+-   <FONT COLOR=red><A NAME="ref_142_4">M_Generic_Type</A></FONT>   : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A> := <b>null</b>;
-+-   <FONT COLOR=red><A NAME="ref_143_4">M_Generic_Choice</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A> := <b>null</b>;
-+-   <FONT COLOR=red><A NAME="ref_144_4">M_Builtin_Router</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A> := <b>null</b>;
-+-   M_Choice_Router  : C_Field_Type := <b>null</b>;
-++   <FONT COLOR=red><A NAME="ref_141_4">M_Generic_Type</A></FONT>   : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A> := <b>null</b>;
-++   <FONT COLOR=red><A NAME="ref_142_4">M_Generic_Choice</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A> := <b>null</b>;
-++   <FONT COLOR=red><A NAME="ref_143_4">M_Builtin_Router</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A> := <b>null</b>;
-++   <FONT COLOR=red><A NAME="ref_144_4">M_Choice_Router</A></FONT>  : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A> := <b>null</b>;
-+ 
-+    <FONT COLOR=green><EM>--  Two wrapper functions to access those low-level fieldtypes defined</EM></FONT>
-+    <FONT COLOR=green><EM>--  in this package.</EM></FONT>
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_149_13" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_266_13">C_Builtin_Router</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A>;
-+-   <b>function</b> C_Choice_Router  <b>return</b> C_Field_Type;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_148_13" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_239_13">C_Builtin_Router</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A>;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_149_13" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_266_13">C_Choice_Router</A></FONT>  <b>return</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A>;
-+ 
-+-   <b>procedure</b> Wrap_Builtin (<FONT COLOR=red><A NAME="ref_152_28" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_146_28">Fld</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_52_9">Field</A>;
-+-                           <FONT COLOR=red><A NAME="ref_153_28" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_147_28">Typ</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">Field_Type</A>'Class<A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_148_13">;</A>
-+-                           Cft : C_Field_Type := C_Builtin_Router);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_151_14" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_145_14">Wrap_Builtin</A></FONT> (<FONT COLOR=red><A NAME="ref_151_28" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_145_28">Fld</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++                           <FONT COLOR=red><A NAME="ref_152_28" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_146_28">Typ</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_52_9">Field_Type</A>'Class;
-++                           <FONT COLOR=red><A NAME="ref_153_28" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_147_28">Cft</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A> := <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_148_13">C_Builtin_Router</A>);
-+    <FONT COLOR=green><EM>--  This procedure has to be called by the Set_Field_Type implementation</EM></FONT>
-+    <FONT COLOR=green><EM>--  for builtin low-level fieldtypes to replace it by an Ada95</EM></FONT>
-+    <FONT COLOR=green><EM>--  conformant Field_Type object.</EM></FONT>
-+@@ -165,48 +164,48 @@
-+    <FONT COLOR=green><EM>--  low-level fieldtypes witch choice functions (like TYP_ENUM).</EM></FONT>
-+    <FONT COLOR=green><EM>--  Any other value will raise a Form_Exception.</EM></FONT>
-+ 
-+-   <b>function</b> Make_Arg (Args : System.Address) <b>return</b> System.Address;
-+-   <b>pragma</b> Convention (C, Make_Arg);
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_162_13" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_97_13">Make_Arg</A></FONT> (<FONT COLOR=red><A NAME="ref_162_23" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_97_23">Args</A></FONT> : System.Address) <b>return</b> System.Address;
-++   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_162_13">Make_Arg</A>);
-+    <FONT COLOR=green><EM>--  This is the Makearg_Function for the internal low-level types</EM></FONT>
-+    <FONT COLOR=green><EM>--  introduced by this binding.</EM></FONT>
-+ 
-+-   <b>function</b> Copy_Arg (Usr<A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_167_13"> </A>: System.Address) <b>return</b> System.Address;
-+-   <b>pragma</b> Convention (C, Copy_Arg);
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_167_13" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_115_13">Copy_Arg</A></FONT> (<FONT COLOR=red><A NAME="ref_167_23" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_115_23">Usr</A></FONT> : System.Address) <b>return</b> System.Address;
-++   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_167_13">Copy_Arg</A>);
-+    <FONT COLOR=green><EM>--  This is the Copyarg_Function for the internal low-level types</EM></FONT>
-+    <FONT COLOR=green><EM>--  introduced by this binding.</EM></FONT>
-+ 
-+-   <b>procedure</b> Free_Arg (Usr : System.Address);
-+-   <b>pragma</b> Convention (C, Free_Arg);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_172_14" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_121_14">Free_Arg</A></FONT> (<FONT COLOR=red><A NAME="ref_172_24" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_121_24">Usr</A></FONT> : System.Address);
-++   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_172_14">Free_Arg</A>);
-+    <FONT COLOR=green><EM>--  This is the Freearg_Function for the internal low-level types</EM></FONT>
-+    <FONT COLOR=green><EM>--  introduced by this binding.</EM></FONT>
-+ 
-+-   <b>function</b> Field_Check_Router (<FONT COLOR=red><A NAME="ref_178_33" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_182_33">Fld</A></FONT> : Field;
-+-                         <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_177_13"> </A>      Usr : System.Address) <b>return</b> C_Int;
-+-   <b>pragma</b> Convention (C, Field_Check_Router);
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_177_13" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_181_13">Field_Check_Router</A></FONT> (<FONT COLOR=red><A NAME="ref_177_33" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_181_33">Fld</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++                                <FONT COLOR=red><A NAME="ref_178_33" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_182_33">Usr</A></FONT> : System.Address) <b>return</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_46_12">C_Int</A>;
-++   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_177_13">Field_Check_Router</A>);
-+    <FONT COLOR=green><EM>--  This is the Field_Check_Function for the internal low-level types</EM></FONT>
-+    <FONT COLOR=green><EM>--  introduced to wrap the low-level types by a Field_Type derived</EM></FONT>
-+    <FONT COLOR=green><EM>--  type. It routes the call to the corresponding low-level validation</EM></FONT>
-+    <FONT COLOR=green><EM>--  function.</EM></FONT>
-+ 
-+-   <b>function</b> Char_Check_Router (<FONT COLOR=red><A NAME="ref_186_32" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_196_32">Ch</A></FONT> : C_Int;
-+-                         <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_185_13"> </A>     Usr : System.Address) <b>return</b> C_Int;
-+-   <b>pragma</b> Convention (C, Char_Check_Router);
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_185_13" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_195_13">Char_Check_Router</A></FONT> (<FONT COLOR=red><A NAME="ref_185_32" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_195_32">Ch</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_46_12">C_Int</A>;
-++                               <FONT COLOR=red><A NAME="ref_186_32" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_196_32">Usr</A></FONT> : System.Address) <b>return</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_46_12">C_Int</A>;
-++   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_185_13">Char_Check_Router</A>);
-+    <FONT COLOR=green><EM>--  This is the Char_Check_Function for the internal low-level types</EM></FONT>
-+    <FONT COLOR=green><EM>--  introduced to wrap the low-level types by a Field_Type derived</EM></FONT>
-+    <FONT COLOR=green><EM>--  type. It routes the call to the corresponding low-level validation</EM></FONT>
-+    <FONT COLOR=green><EM>--  function.</EM></FONT>
-+ 
-+-   <b>function</b> Next_Router (<FONT COLOR=red><A NAME="ref_194_26" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_210_26">Fld</A></FONT> : Field;
-+-                         <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_193_13">Usr</A> : System.Address) <b>return</b> C_Int;
-+-   <b>pragma</b> Convention (C, Next_Router);
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_193_13" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_209_13">Next_Router</A></FONT> (<FONT COLOR=red><A NAME="ref_193_26" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_209_26">Fld</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++                         <FONT COLOR=red><A NAME="ref_194_26" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_210_26">Usr</A></FONT> : System.Address) <b>return</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_46_12">C_Int</A>;
-++   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_193_13">Next_Router</A>);
-+    <FONT COLOR=green><EM>--  This is the Choice_Function for the internal low-level types</EM></FONT>
-+    <FONT COLOR=green><EM>--  introduced to wrap the low-level types by a Field_Type derived</EM></FONT>
-+    <FONT COLOR=green><EM>--  type. It routes the call to the corresponding low-level next_choice</EM></FONT>
-+    <FONT COLOR=green><EM>--  function.</EM></FONT>
-+ 
-+-   <b>function</b> Prev_Router (<FONT COLOR=red><A NAME="ref_202_26" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_224_26">Fld</A></FONT> : Field;
-+-                         <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_201_13">Usr</A> : System.Address) <b>return</b> C_Int;
-+-   <b>pragma</b> Convention (C, Prev_Router);
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_201_13" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_223_13">Prev_Router</A></FONT> (<FONT COLOR=red><A NAME="ref_201_26" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_223_26">Fld</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++                         <FONT COLOR=red><A NAME="ref_202_26" HREF="terminal_interface-curses-forms-field_types__adb.htm#ref_224_26">Usr</A></FONT> : System.Address) <b>return</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_46_12">C_Int</A>;
-++   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_201_13">Prev_Router</A>);
-+    <FONT COLOR=green><EM>--  This is the Choice_Function for the internal low-level types</EM></FONT>
-+    <FONT COLOR=green><EM>--  introduced to wrap the low-level types by a Field_Type derived</EM></FONT>
-+    <FONT COLOR=green><EM>--  type. It routes the call to the corresponding low-level prev_choice</EM></FONT>
-+@@ -214,33 +213,33 @@
-+ 
-+    <FONT COLOR=green><EM>--  This is the Argument structure maintained by all low-level field types</EM></FONT>
-+    <FONT COLOR=green><EM>--  introduced by this binding.</EM></FONT>
-+-   <b>type</b> Argument <b>is</b> <b>record</b>
-+-      <FONT COLOR=red><A NAME="ref_213_7">Typ</A></FONT> : Field_Type_Access;   <FONT COLOR=green><EM>--  the Field_Type creating this record</EM></FONT>
-+-      <FONT COLOR=red><A NAME="ref_214_7">Usr</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">System</A>.Address;      <FONT COLOR=green><EM>--  original arg for builtin low-level types</EM></FONT>
-+-      Cft : C_Field_Type;        <FONT COLOR=green><EM>--  the original low-level type</EM></FONT>
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_211_9">Argument</A></FONT> <b>is</b> <b>record</b>
-++      <FONT COLOR=red><A NAME="ref_212_7">Typ</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_63_9">Field_Type_Access</A>;   <FONT COLOR=green><EM>--  the Field_Type creating this record</EM></FONT>
-++      <FONT COLOR=red><A NAME="ref_213_7">Usr</A></FONT> : System.Address;      <FONT COLOR=green><EM>--  original arg for builtin low-level types</EM></FONT>
-++      <FONT COLOR=red><A NAME="ref_214_7">Cft</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A>;        <FONT COLOR=green><EM>--  the original low-level type</EM></FONT>
-+    <b>end</b> <b>record</b>;
-+-   <b>type</b> Argument_Access <b>is</b> <b>access</b> <b>all</b> Argument;
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_216_9">Argument_Access</A></FONT> <b>is</b> <b>access</b> <b>all</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_211_9">Argument</A>;
-+ 
-+    <FONT COLOR=green><EM>--  +----------------------------------------------------------------------</EM></FONT>
-+    <FONT COLOR=green><EM>--  |</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Some Imports of libform routines to deal with low-level fieldtypes.</EM></FONT>
-+    <FONT COLOR=green><EM>--  |</EM></FONT>
-+-   <b>function</b> New_Fieldtype (<FONT COLOR=red><A NAME="ref_223_28" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_222_13">Fcheck</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_108_9">Field_Check_Function</A>;
-+-            <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9"> </A>              Ccheck : Char_Check_Function)
-+-     <b>return</b> C_Field_Type;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_222_13">New_Fieldtype</A></FONT> (<FONT COLOR=red><A NAME="ref_222_28" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_222_13">Fcheck</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_104_9">Field_Check_Function</A>;
-++                           <FONT COLOR=red><A NAME="ref_223_28" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_222_13">Ccheck</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_108_9">Char_Check_Function</A>)
-++     <b>return</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A>;
-+    <b>pragma</b> Import (C, New_Fieldtype, "new_fieldtype");
-+ 
-+-   <b>function</b> Set_Fieldtype_Arg (<FONT COLOR=red><A NAME="ref_228_32" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_227_13">Cft</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_92_9">C_Field_Type</A>;
-+-                               <FONT COLOR=red><A NAME="ref_229_32" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_227_13">Mak</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_96_9">Makearg_Function</A> := <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_167_13">Make_Arg</A>'<b>Access</b>;
-+-                               <FONT COLOR=red><A NAME="ref_230_32" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_227_13">Cop</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_100_9">Copyarg_Function</A> := <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_172_14">Copy_Arg</A>'<b>Access</b>;
-+-            <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_46_12"> </A>                  Fre : Freearg_Function := Free_Arg'<b>Access</b>)
-+-     <b>return</b> C_Int;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_227_13">Set_Fieldtype_Arg</A></FONT> (<FONT COLOR=red><A NAME="ref_227_32" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_227_13">Cft</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A>;
-++                               <FONT COLOR=red><A NAME="ref_228_32" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_227_13">Mak</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_92_9">Makearg_Function</A> := <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_162_13">Make_Arg</A>'<b>Access</b>;
-++                               <FONT COLOR=red><A NAME="ref_229_32" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_227_13">Cop</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_96_9">Copyarg_Function</A> := <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_167_13">Copy_Arg</A>'<b>Access</b>;
-++                               <FONT COLOR=red><A NAME="ref_230_32" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_227_13">Fre</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_100_9">Freearg_Function</A> := <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_172_14">Free_Arg</A>'<b>Access</b>)
-++     <b>return</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_46_12">C_Int</A>;
-+    <b>pragma</b> Import (C, Set_Fieldtype_Arg, "set_fieldtype_arg");
-+ 
-+-   <b>function</b> Set_Fieldtype_Choice (<FONT COLOR=red><A NAME="ref_235_35" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_234_13">Cft</A></FONT> : <FONT COLOR=red><A NAME="ref_235_41" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_234_13">C_Field_Type</A></FONT>;
-+-            <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_46_12"> </A>                     Next, Prev : Choice_Function)
-+-     <b>return</b> C_Int;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_234_13">Set_Fieldtype_Choice</A></FONT> (<FONT COLOR=red><A NAME="ref_234_35" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_234_13">Cft</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_132_9">C_Field_Type</A>;
-++                                  <FONT COLOR=red><A NAME="ref_235_35" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_234_13">Next</A></FONT>, <FONT COLOR=red><A NAME="ref_235_41" HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_234_13">Prev</A></FONT> : <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_112_9">Choice_Function</A>)
-++     <b>return</b> <A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_46_12">C_Int</A>;
-+    <b>pragma</b> Import (C, Set_Fieldtype_Choice, "set_fieldtype_choice");
-+ 
-+-<b>end</b> Terminal_Interface.Curses.Forms.Field_Types;
-++<b>end</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-forms__ads.htm#ref_49_35">Forms</A>.<A HREF="terminal_interface-curses-forms-field_types__ads.htm#ref_43_41">Field_Types</A>;
-+ </PRE></BODY></HTML>
-+Index: doc/html/ada/terminal_interface-curses-forms-field_user_data__ads.htm
-+--- ncurses-5.6/doc/html/ada/terminal_interface-curses-forms-field_user_data__ads.htm	2006-09-23 20:31:31.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/terminal_interface-curses-forms-field_user_data__ads.htm	2007-09-01 23:56:30.000000000 +0000
-+@@ -3,7 +3,6 @@
-+ <BODY>
-+ <HR><DIV ALIGN="center"><H1> File : terminal_interface-curses-forms-field_user_data.ads </H1></DIV><HR>
-+ <PRE>
-+-
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
-+ <FONT COLOR=green><EM>--                           <A HREF="http://www.gnat.com">GNAT</A> ncurses Binding                           --</EM></FONT>
-+@@ -46,31 +45,31 @@
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ 
-+ <b>generic</b>
-+-   <b>type</b> <FONT COLOR=red><A NAME="ref_44_9" HREF="terminal_interface-curses-forms-field_user_data__ads.htm#ref_45_41">User</A></FONT> <b>is</b> <b>limited</b> <b>private</b>;
-+-   <b>type</b> <A HREF="terminal_interface__ads.htm#ref_42_9">User_Access</A> <b>is</b> <b>access</b> User<A HREF="terminal_interface-curses-forms__ads.htm#ref_49_35">;</A>
-+-<b>package</b> Terminal_Interface.Curses.Forms.Field_User_Data <b>is</b>
-+-   <b>pragma</b> Preelaborate (Terminal_Interface.Curses.Forms.Field_User_Data);
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_43_9" HREF="terminal_interface-curses-forms-field_user_data__ads.htm#ref_45_41">User</A></FONT> <b>is</b> <b>limited</b> <b>private</b>;
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_44_9" HREF="terminal_interface-curses-forms-field_user_data__ads.htm#ref_45_41">User_Access</A></FONT> <b>is</b> <b>access</b> <A HREF="terminal_interface-curses-forms-field_user_data__ads.htm#ref_43_9">User</A>;
-++<b>package</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-forms__ads.htm#ref_49_35">Forms</A>.<FONT COLOR=red><A NAME="ref_45_41" HREF="terminal_interface-curses-forms-field_user_data__adb.htm#ref_48_46">Field_User_Data</A></FONT> <b>is</b>
-++   <b>pragma</b> Preelaborate (<A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-forms__ads.htm#ref_49_35">Forms</A>.<A HREF="terminal_interface-curses-forms-field_user_data__ads.htm#ref_45_41">Field_User_Data</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_field_userptr.3x.html">form_field_userptr.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_1"#2|</EM></FONT>
-+-   <b>procedure</b> Set_User_Data (<FONT COLOR=red><A NAME="ref_54_29" HREF="terminal_interface-curses-forms-field_user_data__adb.htm#ref_55_29">Fld</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms-field_user_data__ads.htm#ref_44_9">Field</A>;
-+-                            Data : <b>in</b> User_Access);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_53_14" HREF="terminal_interface-curses-forms-field_user_data__adb.htm#ref_54_14">Set_User_Data</A></FONT> (<FONT COLOR=red><A NAME="ref_53_29" HREF="terminal_interface-curses-forms-field_user_data__adb.htm#ref_54_29">Fld</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++                            <FONT COLOR=red><A NAME="ref_54_29" HREF="terminal_interface-curses-forms-field_user_data__adb.htm#ref_55_29">Data</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms-field_user_data__ads.htm#ref_44_9">User_Access</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_userptr.3x.html">set_field_userptr</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_User_Data);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms-field_user_data__ads.htm#ref_53_14">Set_User_Data</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_2"#2|</EM></FONT>
-+-   <b>procedure</b> Get_User_Data (<FONT COLOR=red><A NAME="ref_60_29" HREF="terminal_interface-curses-forms-field_user_data__adb.htm#ref_79_29">Fld</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-forms-field_user_data__ads.htm#ref_44_9">Field</A>;
-+-                            Data : <b>out</b> User_Access);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_59_14" HREF="terminal_interface-curses-forms-field_user_data__adb.htm#ref_78_14">Get_User_Data</A></FONT> (<FONT COLOR=red><A NAME="ref_59_29" HREF="terminal_interface-curses-forms-field_user_data__adb.htm#ref_78_29">Fld</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++                            <FONT COLOR=red><A NAME="ref_60_29" HREF="terminal_interface-curses-forms-field_user_data__adb.htm#ref_79_29">Data</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses-forms-field_user_data__ads.htm#ref_44_9">User_Access</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_userptr.3x.html">field_userptr</A></EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_3"#2|</EM></FONT>
-+-   <b>function</b> Get_User_Data (Fld  : <b>in</b>  Field) <b>return</b> User_Access;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_64_13" HREF="terminal_interface-curses-forms-field_user_data__adb.htm#ref_70_13">Get_User_Data</A></FONT> (<FONT COLOR=red><A NAME="ref_64_28" HREF="terminal_interface-curses-forms-field_user_data__adb.htm#ref_70_28">Fld</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>) <b>return</b> <A HREF="terminal_interface-curses-forms-field_user_data__ads.htm#ref_44_9">User_Access</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_userptr.3x.html">field_userptr</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  Sama as function</EM></FONT>
-+    <b>pragma</b> Inline (Get_User_Data);
-+ 
-+-<b>end</b> Terminal_Interface.Curses.Forms.Field_User_Data;
-++<b>end</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-forms__ads.htm#ref_49_35">Forms</A>.<A HREF="terminal_interface-curses-forms-field_user_data__ads.htm#ref_45_41">Field_User_Data</A>;
-+ </PRE></BODY></HTML>
-+Index: doc/html/ada/terminal_interface-curses-forms-form_user_data__ads.htm
-+--- ncurses-5.6/doc/html/ada/terminal_interface-curses-forms-form_user_data__ads.htm	2006-09-23 20:31:31.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/terminal_interface-curses-forms-form_user_data__ads.htm	2007-09-01 23:56:30.000000000 +0000
-+@@ -3,7 +3,6 @@
-+ <BODY>
-+ <HR><DIV ALIGN="center"><H1> File : terminal_interface-curses-forms-form_user_data.ads </H1></DIV><HR>
-+ <PRE>
-+-
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
-+ <FONT COLOR=green><EM>--                           <A HREF="http://www.gnat.com">GNAT</A> ncurses Binding                           --</EM></FONT>
-+@@ -46,31 +45,31 @@
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ 
-+ <b>generic</b>
-+-   <b>type</b> <FONT COLOR=red><A NAME="ref_44_9" HREF="terminal_interface-curses-forms-form_user_data__ads.htm#ref_45_41">User</A></FONT> <b>is</b> <b>limited</b> <b>private</b>;
-+-   <b>type</b> <A HREF="terminal_interface__ads.htm#ref_42_9">User_Access</A> <b>is</b> <b>access</b> User<A HREF="terminal_interface-curses-forms__ads.htm#ref_49_35">;</A>
-+-<b>package</b> Terminal_Interface.Curses.Forms.Form_User_Data <b>is</b>
-+-   <b>pragma</b> Preelaborate (Terminal_Interface.Curses.Forms.Form_User_Data);
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_43_9" HREF="terminal_interface-curses-forms-form_user_data__ads.htm#ref_45_41">User</A></FONT> <b>is</b> <b>limited</b> <b>private</b>;
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_44_9" HREF="terminal_interface-curses-forms-form_user_data__ads.htm#ref_45_41">User_Access</A></FONT> <b>is</b> <b>access</b> <A HREF="terminal_interface-curses-forms-form_user_data__ads.htm#ref_43_9">User</A>;
-++<b>package</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-forms__ads.htm#ref_49_35">Forms</A>.<FONT COLOR=red><A NAME="ref_45_41" HREF="terminal_interface-curses-forms-form_user_data__adb.htm#ref_48_46">Form_User_Data</A></FONT> <b>is</b>
-++   <b>pragma</b> Preelaborate (<A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-forms__ads.htm#ref_49_35">Forms</A>.<A HREF="terminal_interface-curses-forms-form_user_data__ads.htm#ref_45_41">Form_User_Data</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_userptr.3x.html">form_userptr.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_1"#2|</EM></FONT>
-+-   <b>procedure</b> Set_User_Data (<FONT COLOR=red><A NAME="ref_54_29" HREF="terminal_interface-curses-forms-form_user_data__adb.htm#ref_56_29">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms-form_user_data__ads.htm#ref_44_9">Form</A>;
-+-                            Data : <b>in</b> User_Access);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_53_14" HREF="terminal_interface-curses-forms-form_user_data__adb.htm#ref_55_14">Set_User_Data</A></FONT> (<FONT COLOR=red><A NAME="ref_53_29" HREF="terminal_interface-curses-forms-form_user_data__adb.htm#ref_55_29">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-++                            <FONT COLOR=red><A NAME="ref_54_29" HREF="terminal_interface-curses-forms-form_user_data__adb.htm#ref_56_29">Data</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms-form_user_data__ads.htm#ref_44_9">User_Access</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_userptr.3x.html">set_form_userptr</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_User_Data);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms-form_user_data__ads.htm#ref_53_14">Set_User_Data</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_2"#2|</EM></FONT>
-+-   <b>procedure</b> Get_User_Data (<FONT COLOR=red><A NAME="ref_60_29" HREF="terminal_interface-curses-forms-form_user_data__adb.htm#ref_80_29">Frm</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-forms-form_user_data__ads.htm#ref_44_9">Form</A>;
-+-                            Data : <b>out</b> User_Access);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_59_14" HREF="terminal_interface-curses-forms-form_user_data__adb.htm#ref_79_14">Get_User_Data</A></FONT> (<FONT COLOR=red><A NAME="ref_59_29" HREF="terminal_interface-curses-forms-form_user_data__adb.htm#ref_79_29">Frm</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-++                            <FONT COLOR=red><A NAME="ref_60_29" HREF="terminal_interface-curses-forms-form_user_data__adb.htm#ref_80_29">Data</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses-forms-form_user_data__ads.htm#ref_44_9">User_Access</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_userptr.3x.html">form_userptr</A></EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_3"#2|</EM></FONT>
-+-   <b>function</b> Get_User_Data (Frm  : <b>in</b>  Form) <b>return</b> User_Access;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_64_13" HREF="terminal_interface-curses-forms-form_user_data__adb.htm#ref_71_13">Get_User_Data</A></FONT> (<FONT COLOR=red><A NAME="ref_64_28" HREF="terminal_interface-curses-forms-form_user_data__adb.htm#ref_71_28">Frm</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>) <b>return</b> <A HREF="terminal_interface-curses-forms-form_user_data__ads.htm#ref_44_9">User_Access</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_userptr.3x.html">form_userptr</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  Same as function</EM></FONT>
-+    <b>pragma</b> Inline (Get_User_Data);
-+ 
-+-<b>end</b> Terminal_Interface.Curses.Forms.Form_User_Data;
-++<b>end</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-forms__ads.htm#ref_49_35">Forms</A>.<A HREF="terminal_interface-curses-forms-form_user_data__ads.htm#ref_45_41">Form_User_Data</A>;
-+ </PRE></BODY></HTML>
-+Index: doc/html/ada/terminal_interface-curses-forms__ads.htm
-+--- ncurses-5.6/doc/html/ada/terminal_interface-curses-forms__ads.htm	2006-09-23 20:31:31.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/terminal_interface-curses-forms__ads.htm	2007-09-01 23:56:31.000000000 +0000
-+@@ -3,7 +3,6 @@
-+ <BODY>
-+ <HR><DIV ALIGN="center"><H1> File : terminal_interface-curses-forms.ads </H1></DIV><HR>
-+ <PRE>
-+-
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
-+ <FONT COLOR=green><EM>--                           <A HREF="http://www.gnat.com">GNAT</A> ncurses Binding                           --</EM></FONT>
-+@@ -52,41 +51,41 @@
-+ <b>with</b> System;
-+ <b>with</b> Ada.Characters.Latin_1;
-+ 
-+-<b>package</b> Terminal_Interface.Curses.Forms <b>is</b>
-+-   <b>pragma</b> Preelaborate (Terminal_Interface.Curses.Forms);
-++<b>package</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<FONT COLOR=red><A NAME="ref_49_35" HREF="terminal_interface-curses-forms__adb.htm#ref_51_40">Forms</A></FONT> <b>is</b>
-++   <b>pragma</b> Preelaborate (<A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-forms__ads.htm#ref_49_35">Forms</A>);
-+    <b>pragma</b> Linker_Options ("-lform");
-+    <b>pragma</b> Linker_Options ("-lncurses");
-+ 
-+    Space : Character <b>renames</b> Ada.Characters.Latin_1.Space;
-+ 
-+-   <b>type</b> <FONT COLOR=red><A NAME="ref_57_9">Field</A></FONT>        <b>is</b> <b>private</b>;
-+-   <b>type</b> Form         <b>is</b> <b>private</b>;
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_56_9">Field</A></FONT>        <b>is</b> <b>private</b>;
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_57_9">Form</A></FONT>         <b>is</b> <b>private</b>;
-+ 
-+-   <FONT COLOR=red><A NAME="ref_60_4">Null_Field</A></FONT>        : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Field</A>;
-+-   Null_Form         : <b>constant</b> Form;
-++   <FONT COLOR=red><A NAME="ref_59_4">Null_Field</A></FONT>        : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++   <FONT COLOR=red><A NAME="ref_60_4">Null_Form</A></FONT>         : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-+ 
-+-   <b>type</b> Field_Justification <b>is</b> (<FONT COLOR=red><A NAME="ref_63_33">None</A></FONT>,
-+-                                <FONT COLOR=red><A NAME="ref_64_33">Left</A></FONT>,
-+-                                <FONT COLOR=red><A NAME="ref_65_33">Center</A></FONT>,
-+-                                Right);
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_62_9">Field_Justification</A></FONT> <b>is</b> (<FONT COLOR=red><A NAME="ref_62_33">None</A></FONT>,
-++                                <FONT COLOR=red><A NAME="ref_63_33">Left</A></FONT>,
-++                                <FONT COLOR=red><A NAME="ref_64_33">Center</A></FONT>,
-++                                <FONT COLOR=red><A NAME="ref_65_33">Right</A></FONT>);
-+ 
-+    <b>pragma</b> Warnings (Off);
-+-   <b>type</b> Field_Option_Set <b>is</b>
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_68_9">Field_Option_Set</A></FONT> <b>is</b>
-+       <b>record</b>
-+-         <FONT COLOR=red><A NAME="ref_71_10">Visible</A></FONT>     : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_72_10">Active</A></FONT>      : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_73_10">Public</A></FONT>      : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_74_10">Edit</A></FONT>        : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_75_10">Wrap</A></FONT>        : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_76_10">Blank</A></FONT>       : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_77_10">Auto_Skip</A></FONT>   : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_78_10">Null_Ok</A></FONT>     : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_79_10">Pass_Ok</A></FONT>     : Boolean;
-+-         Static      : Boolean;
-++         <FONT COLOR=red><A NAME="ref_70_10">Visible</A></FONT>     : Boolean;
-++         <FONT COLOR=red><A NAME="ref_71_10">Active</A></FONT>      : Boolean;
-++         <FONT COLOR=red><A NAME="ref_72_10">Public</A></FONT>      : Boolean;
-++         <FONT COLOR=red><A NAME="ref_73_10">Edit</A></FONT>        : Boolean;
-++         <FONT COLOR=red><A NAME="ref_74_10">Wrap</A></FONT>        : Boolean;
-++         <FONT COLOR=red><A NAME="ref_75_10">Blank</A></FONT>       : Boolean;
-++         <FONT COLOR=red><A NAME="ref_76_10">Auto_Skip</A></FONT>   : Boolean;
-++         <FONT COLOR=red><A NAME="ref_77_10">Null_Ok</A></FONT>     : Boolean;
-++         <FONT COLOR=red><A NAME="ref_78_10">Pass_Ok</A></FONT>     : Boolean;
-++         <FONT COLOR=red><A NAME="ref_79_10">Static</A></FONT>      : Boolean;
-+       <b>end</b> <b>record</b>;
-+-   <b>pragma</b> Convention (C, Field_Option_Set);
-++   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms__ads.htm#ref_68_9">Field_Option_Set</A>);
-+ 
-+-   <b>for</b> Field_Option_Set <b>use</b>
-++   <b>for</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_68_9">Field_Option_Set</A> <b>use</b>
-+       <b>record</b>
-+          Visible     <b>at</b> 0 <b>range</b>  0 ..  0;
-+          Active      <b>at</b> 0 <b>range</b>  1 ..  1;
-+@@ -99,328 +98,328 @@
-+          Pass_Ok     <b>at</b> 0 <b>range</b>  8 ..  8;
-+          Static      <b>at</b> 0 <b>range</b>  9 ..  9;
-+       <b>end</b> <b>record</b>;
-+-   <b>for</b> Field_Option_Set'Size <b>use</b> 32;
-++   <b>for</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_68_9">Field_Option_Set</A>'Size <b>use</b> 32;
-+    <FONT COLOR=green><EM>--  Please note: this rep. clause is generated and may be</EM></FONT>
-+    <FONT COLOR=green><EM>--               different on your system.Dnl</EM></FONT>
-+ 
-+    <b>pragma</b> Warnings (On);
-+ 
-+-   <b>function</b> Default_Field_Options <b>return</b> Field_Option_Set;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_102_13" HREF="terminal_interface-curses-forms__adb.htm#ref_1149_13">Default_Field_Options</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_68_9">Field_Option_Set</A>;
-+    <FONT COLOR=green><EM>--  The initial defaults for the field options.</EM></FONT>
-+-   <b>pragma</b> Inline (Default_Field_Options);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_102_13">Default_Field_Options</A>);
-+ 
-+    <b>pragma</b> Warnings (Off);
-+-   <b>type</b> Form_Option_Set <b>is</b>
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_107_9">Form_Option_Set</A></FONT> <b>is</b>
-+       <b>record</b>
-+-         <FONT COLOR=red><A NAME="ref_110_10">NL_Overload</A></FONT> : Boolean;
-+-         BS_Overload : Boolean;
-++         <FONT COLOR=red><A NAME="ref_109_10">NL_Overload</A></FONT> : Boolean;
-++         <FONT COLOR=red><A NAME="ref_110_10">BS_Overload</A></FONT> : Boolean;
-+       <b>end</b> <b>record</b>;
-+-   <b>pragma</b> Convention (C, Form_Option_Set);
-++   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms__ads.htm#ref_107_9">Form_Option_Set</A>);
-+ 
-+-   <b>for</b> Form_Option_Set <b>use</b>
-++   <b>for</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_107_9">Form_Option_Set</A> <b>use</b>
-+       <b>record</b>
-+          NL_Overload <b>at</b> 0 <b>range</b>  0 ..  0;
-+          BS_Overload <b>at</b> 0 <b>range</b>  1 ..  1;
-+       <b>end</b> <b>record</b>;
-+-   <b>for</b> Form_Option_Set'Size <b>use</b> 32;
-++   <b>for</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_107_9">Form_Option_Set</A>'Size <b>use</b> 32;
-+    <FONT COLOR=green><EM>--  Please note: this rep. clause is generated and may be</EM></FONT>
-+    <FONT COLOR=green><EM>--               different on your system.Dnl</EM></FONT>
-+ 
-+    <b>pragma</b> Warnings (On);
-+ 
-+-   <b>function</b> Default_Form_Options <b>return</b> Form_Option_Set;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_125_13" HREF="terminal_interface-curses-forms__adb.htm#ref_1155_13">Default_Form_Options</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_107_9">Form_Option_Set</A>;
-+    <FONT COLOR=green><EM>--  The initial defaults for the form options.</EM></FONT>
-+-   <b>pragma</b> Inline (Default_Form_Options);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_125_13">Default_Form_Options</A>);
-+ 
-+-   <b>type</b> Buffer_Number <b>is</b> <b>new</b> Natural;
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_129_9">Buffer_Number</A></FONT> <b>is</b> <b>new</b> Natural;
-+ 
-+-   <b>type</b> Field_Array <b>is</b> <b>array</b> (Positive <b>range</b> &lt;&gt;) <b>of</b> <b>aliased</b> Field;
-+-   <b>pragma</b> Convention (C, Field_Array);
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_131_9">Field_Array</A></FONT> <b>is</b> <b>array</b> (Positive <b>range</b> &lt;&gt;) <b>of</b> <b>aliased</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms__ads.htm#ref_131_9">Field_Array</A>);
-+ 
-+-   <b>type</b> Field_Array_Access <b>is</b> <b>access</b> Field_Array;
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_134_9">Field_Array_Access</A></FONT> <b>is</b> <b>access</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_131_9">Field_Array</A>;
-+ 
-+-   <b>procedure</b> Free (<FONT COLOR=red><A NAME="ref_137_20" HREF="terminal_interface-curses-forms__adb.htm#ref_1132_20">FA</A></FONT>          : <b>in</b> <b>out</b> Field_Array_Access;
-+-                   Free_Fields : <b>in</b> Boolean := False);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_136_14" HREF="terminal_interface-curses-forms__adb.htm#ref_1131_14">Free</A></FONT> (<FONT COLOR=red><A NAME="ref_136_20" HREF="terminal_interface-curses-forms__adb.htm#ref_1131_20">FA</A></FONT>          : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_134_9">Field_Array_Access</A>;
-++                   <FONT COLOR=red><A NAME="ref_137_20" HREF="terminal_interface-curses-forms__adb.htm#ref_1132_20">Free_Fields</A></FONT> : <b>in</b> Boolean := False);
-+    <FONT COLOR=green><EM>--  Release the memory for an allocated field array</EM></FONT>
-+    <FONT COLOR=green><EM>--  If Free_Fields is True, call Delete() for all the fields in</EM></FONT>
-+    <FONT COLOR=green><EM>--  the array.</EM></FONT>
-+ 
-+-   <b>subtype</b> Form_Request_Code <b>is</b> Key_Code <b>range</b> (Key_Max + 1) .. (Key_Max + 57);
-++   <b>subtype</b> <FONT COLOR=red><A NAME="ref_142_12">Form_Request_Code</A></FONT> <b>is</b> <A HREF="terminal_interface-curses__ads.htm#ref_68_9">Key_Code</A> <b>range</b> (<A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 1) .. (<A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 57);
-+ 
-+    <FONT COLOR=green><EM>--  The prefix F_ stands for "Form Request"</EM></FONT>
-+-   <FONT COLOR=red><A NAME="ref_146_4">F_Next_Page</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 1;
-+-   <FONT COLOR=red><A NAME="ref_147_4">F_Previous_Page</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 2;
-+-   <FONT COLOR=red><A NAME="ref_148_4">F_First_Page</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 3;
-+-   F_Last_Page                : <b>constant</b> Form_Request_Code := Key_Max + 4;
-+-
-+-   <FONT COLOR=red><A NAME="ref_151_4">F_Next_Field</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 5;
-+-   <FONT COLOR=red><A NAME="ref_152_4">F_Previous_Field</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 6;
-+-   <FONT COLOR=red><A NAME="ref_153_4">F_First_Field</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 7;
-+-   <FONT COLOR=red><A NAME="ref_154_4">F_Last_Field</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 8;
-+-   <FONT COLOR=red><A NAME="ref_155_4">F_Sorted_Next_Field</A></FONT>        : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 9;
-+-   <FONT COLOR=red><A NAME="ref_156_4">F_Sorted_Previous_Field</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 10;
-+-   <FONT COLOR=red><A NAME="ref_157_4">F_Sorted_First_Field</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 11;
-+-   <FONT COLOR=red><A NAME="ref_158_4">F_Sorted_Last_Field</A></FONT>        : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 12;
-+-   <FONT COLOR=red><A NAME="ref_159_4">F_Left_Field</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 13;
-+-   <FONT COLOR=red><A NAME="ref_160_4">F_Right_Field</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 14;
-+-   <FONT COLOR=red><A NAME="ref_161_4">F_Up_Field</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 15;
-+-   F_Down_Field               : <b>constant</b> Form_Request_Code := Key_Max + 16;
-+-
-+-   <FONT COLOR=red><A NAME="ref_164_4">F_Next_Char</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 17;
-+-   <FONT COLOR=red><A NAME="ref_165_4">F_Previous_Char</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 18;
-+-   <FONT COLOR=red><A NAME="ref_166_4">F_Next_Line</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 19;
-+-   <FONT COLOR=red><A NAME="ref_167_4">F_Previous_Line</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 20;
-+-   <FONT COLOR=red><A NAME="ref_168_4">F_Next_Word</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 21;
-+-   <FONT COLOR=red><A NAME="ref_169_4">F_Previous_Word</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 22;
-+-   <FONT COLOR=red><A NAME="ref_170_4">F_Begin_Field</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 23;
-+-   <FONT COLOR=red><A NAME="ref_171_4">F_End_Field</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 24;
-+-   <FONT COLOR=red><A NAME="ref_172_4">F_Begin_Line</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 25;
-+-   <FONT COLOR=red><A NAME="ref_173_4">F_End_Line</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 26;
-+-   <FONT COLOR=red><A NAME="ref_174_4">F_Left_Char</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 27;
-+-   <FONT COLOR=red><A NAME="ref_175_4">F_Right_Char</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 28;
-+-   <FONT COLOR=red><A NAME="ref_176_4">F_Up_Char</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 29;
-+-   F_Down_Char                : <b>constant</b> Form_Request_Code := Key_Max + 30;
-+-
-+-   <FONT COLOR=red><A NAME="ref_179_4">F_New_Line</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 31;
-+-   <FONT COLOR=red><A NAME="ref_180_4">F_Insert_Char</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 32;
-+-   <FONT COLOR=red><A NAME="ref_181_4">F_Insert_Line</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 33;
-+-   <FONT COLOR=red><A NAME="ref_182_4">F_Delete_Char</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 34;
-+-   <FONT COLOR=red><A NAME="ref_183_4">F_Delete_Previous</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 35;
-+-   <FONT COLOR=red><A NAME="ref_184_4">F_Delete_Line</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 36;
-+-   <FONT COLOR=red><A NAME="ref_185_4">F_Delete_Word</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 37;
-+-   <FONT COLOR=red><A NAME="ref_186_4">F_Clear_EOL</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 38;
-+-   <FONT COLOR=red><A NAME="ref_187_4">F_Clear_EOF</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 39;
-+-   <FONT COLOR=red><A NAME="ref_188_4">F_Clear_Field</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 40;
-+-   <FONT COLOR=red><A NAME="ref_189_4">F_Overlay_Mode</A></FONT>             : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 41;
-+-   F_Insert_Mode              : <b>constant</b> Form_Request_Code := Key_Max + 42;
-++   <FONT COLOR=red><A NAME="ref_145_4">F_Next_Page</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 1;
-++   <FONT COLOR=red><A NAME="ref_146_4">F_Previous_Page</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 2;
-++   <FONT COLOR=red><A NAME="ref_147_4">F_First_Page</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 3;
-++   <FONT COLOR=red><A NAME="ref_148_4">F_Last_Page</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 4;
-++
-++   <FONT COLOR=red><A NAME="ref_150_4">F_Next_Field</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 5;
-++   <FONT COLOR=red><A NAME="ref_151_4">F_Previous_Field</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 6;
-++   <FONT COLOR=red><A NAME="ref_152_4">F_First_Field</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 7;
-++   <FONT COLOR=red><A NAME="ref_153_4">F_Last_Field</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 8;
-++   <FONT COLOR=red><A NAME="ref_154_4">F_Sorted_Next_Field</A></FONT>        : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 9;
-++   <FONT COLOR=red><A NAME="ref_155_4">F_Sorted_Previous_Field</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 10;
-++   <FONT COLOR=red><A NAME="ref_156_4">F_Sorted_First_Field</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 11;
-++   <FONT COLOR=red><A NAME="ref_157_4">F_Sorted_Last_Field</A></FONT>        : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 12;
-++   <FONT COLOR=red><A NAME="ref_158_4">F_Left_Field</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 13;
-++   <FONT COLOR=red><A NAME="ref_159_4">F_Right_Field</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 14;
-++   <FONT COLOR=red><A NAME="ref_160_4">F_Up_Field</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 15;
-++   <FONT COLOR=red><A NAME="ref_161_4">F_Down_Field</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 16;
-++
-++   <FONT COLOR=red><A NAME="ref_163_4">F_Next_Char</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 17;
-++   <FONT COLOR=red><A NAME="ref_164_4">F_Previous_Char</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 18;
-++   <FONT COLOR=red><A NAME="ref_165_4">F_Next_Line</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 19;
-++   <FONT COLOR=red><A NAME="ref_166_4">F_Previous_Line</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 20;
-++   <FONT COLOR=red><A NAME="ref_167_4">F_Next_Word</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 21;
-++   <FONT COLOR=red><A NAME="ref_168_4">F_Previous_Word</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 22;
-++   <FONT COLOR=red><A NAME="ref_169_4">F_Begin_Field</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 23;
-++   <FONT COLOR=red><A NAME="ref_170_4">F_End_Field</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 24;
-++   <FONT COLOR=red><A NAME="ref_171_4">F_Begin_Line</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 25;
-++   <FONT COLOR=red><A NAME="ref_172_4">F_End_Line</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 26;
-++   <FONT COLOR=red><A NAME="ref_173_4">F_Left_Char</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 27;
-++   <FONT COLOR=red><A NAME="ref_174_4">F_Right_Char</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 28;
-++   <FONT COLOR=red><A NAME="ref_175_4">F_Up_Char</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 29;
-++   <FONT COLOR=red><A NAME="ref_176_4">F_Down_Char</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 30;
-++
-++   <FONT COLOR=red><A NAME="ref_178_4">F_New_Line</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 31;
-++   <FONT COLOR=red><A NAME="ref_179_4">F_Insert_Char</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 32;
-++   <FONT COLOR=red><A NAME="ref_180_4">F_Insert_Line</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 33;
-++   <FONT COLOR=red><A NAME="ref_181_4">F_Delete_Char</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 34;
-++   <FONT COLOR=red><A NAME="ref_182_4">F_Delete_Previous</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 35;
-++   <FONT COLOR=red><A NAME="ref_183_4">F_Delete_Line</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 36;
-++   <FONT COLOR=red><A NAME="ref_184_4">F_Delete_Word</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 37;
-++   <FONT COLOR=red><A NAME="ref_185_4">F_Clear_EOL</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 38;
-++   <FONT COLOR=red><A NAME="ref_186_4">F_Clear_EOF</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 39;
-++   <FONT COLOR=red><A NAME="ref_187_4">F_Clear_Field</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 40;
-++   <FONT COLOR=red><A NAME="ref_188_4">F_Overlay_Mode</A></FONT>             : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 41;
-++   <FONT COLOR=red><A NAME="ref_189_4">F_Insert_Mode</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 42;
-+ 
-+    <FONT COLOR=green><EM>--  Vertical Scrolling</EM></FONT>
-+-   <FONT COLOR=red><A NAME="ref_193_4">F_ScrollForward_Line</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 43;
-+-   <FONT COLOR=red><A NAME="ref_194_4">F_ScrollBackward_Line</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 44;
-+-   <FONT COLOR=red><A NAME="ref_195_4">F_ScrollForward_Page</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 45;
-+-   <FONT COLOR=red><A NAME="ref_196_4">F_ScrollBackward_Page</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 46;
-+-   <FONT COLOR=red><A NAME="ref_197_4">F_ScrollForward_HalfPage</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 47;
-+-   F_ScrollBackward_HalfPage  : <b>constant</b> Form_Request_Code := Key_Max + 48;
-++   <FONT COLOR=red><A NAME="ref_192_4">F_ScrollForward_Line</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 43;
-++   <FONT COLOR=red><A NAME="ref_193_4">F_ScrollBackward_Line</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 44;
-++   <FONT COLOR=red><A NAME="ref_194_4">F_ScrollForward_Page</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 45;
-++   <FONT COLOR=red><A NAME="ref_195_4">F_ScrollBackward_Page</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 46;
-++   <FONT COLOR=red><A NAME="ref_196_4">F_ScrollForward_HalfPage</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 47;
-++   <FONT COLOR=red><A NAME="ref_197_4">F_ScrollBackward_HalfPage</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 48;
-+ 
-+    <FONT COLOR=green><EM>--  Horizontal Scrolling</EM></FONT>
-+-   <FONT COLOR=red><A NAME="ref_201_4">F_HScrollForward_Char</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 49;
-+-   <FONT COLOR=red><A NAME="ref_202_4">F_HScrollBackward_Char</A></FONT>     : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 50;
-+-   <FONT COLOR=red><A NAME="ref_203_4">F_HScrollForward_Line</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 51;
-+-   <FONT COLOR=red><A NAME="ref_204_4">F_HScrollBackward_Line</A></FONT>     : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 52;
-+-   <FONT COLOR=red><A NAME="ref_205_4">F_HScrollForward_HalfLine</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 53;
-+-   F_HScrollBackward_HalfLine : <b>constant</b> Form_Request_Code := Key_Max + 54;
-+-
-+-   <FONT COLOR=red><A NAME="ref_208_4">F_Validate_Field</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 55;
-+-   <FONT COLOR=red><A NAME="ref_209_4">F_Next_Choice</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 56;
-+-   F_Previous_Choice          : <b>constant</b> Form_Request_Code := Key_Max + 57;
-++   <FONT COLOR=red><A NAME="ref_200_4">F_HScrollForward_Char</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 49;
-++   <FONT COLOR=red><A NAME="ref_201_4">F_HScrollBackward_Char</A></FONT>     : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 50;
-++   <FONT COLOR=red><A NAME="ref_202_4">F_HScrollForward_Line</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 51;
-++   <FONT COLOR=red><A NAME="ref_203_4">F_HScrollBackward_Line</A></FONT>     : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 52;
-++   <FONT COLOR=red><A NAME="ref_204_4">F_HScrollForward_HalfLine</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 53;
-++   <FONT COLOR=red><A NAME="ref_205_4">F_HScrollBackward_HalfLine</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 54;
-++
-++   <FONT COLOR=red><A NAME="ref_207_4">F_Validate_Field</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 55;
-++   <FONT COLOR=red><A NAME="ref_208_4">F_Next_Choice</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 56;
-++   <FONT COLOR=red><A NAME="ref_209_4">F_Previous_Choice</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 57;
-+ 
-+    <FONT COLOR=green><EM>--  For those who like the old 'C' style request names</EM></FONT>
-+-   REQ_NEXT_PAGE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_146_4">F_Next_Page</A>;
-+-   REQ_PREV_PAGE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_147_4">F_Previous_Page</A>;
-+-   REQ_FIRST_PAGE   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_148_4">F_First_Page</A>;
-+-   REQ_LAST_PAGE    : Form_Request_Code <b>renames</b> F_Last_Page;
-+-
-+-   REQ_NEXT_FIELD   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_151_4">F_Next_Field</A>;
-+-   REQ_PREV_FIELD   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_152_4">F_Previous_Field</A>;
-+-   REQ_FIRST_FIELD  : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_153_4">F_First_Field</A>;
-+-   REQ_LAST_FIELD   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_154_4">F_Last_Field</A>;
-+-   REQ_SNEXT_FIELD  : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_155_4">F_Sorted_Next_Field</A>;
-+-   REQ_SPREV_FIELD  : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_156_4">F_Sorted_Previous_Field</A>;
-+-   REQ_SFIRST_FIELD : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_157_4">F_Sorted_First_Field</A>;
-+-   REQ_SLAST_FIELD  : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_158_4">F_Sorted_Last_Field</A>;
-+-   REQ_LEFT_FIELD   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_159_4">F_Left_Field</A>;
-+-   REQ_RIGHT_FIELD  : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_160_4">F_Right_Field</A>;
-+-   REQ_UP_FIELD     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_161_4">F_Up_Field</A>;
-+-   REQ_DOWN_FIELD   : Form_Request_Code <b>renames</b> F_Down_Field;
-+-
-+-   REQ_NEXT_CHAR    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_164_4">F_Next_Char</A>;
-+-   REQ_PREV_CHAR    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_165_4">F_Previous_Char</A>;
-+-   REQ_NEXT_LINE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_166_4">F_Next_Line</A>;
-+-   REQ_PREV_LINE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_167_4">F_Previous_Line</A>;
-+-   REQ_NEXT_WORD    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_168_4">F_Next_Word</A>;
-+-   REQ_PREV_WORD    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_169_4">F_Previous_Word</A>;
-+-   REQ_BEG_FIELD    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_170_4">F_Begin_Field</A>;
-+-   REQ_END_FIELD    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_171_4">F_End_Field</A>;
-+-   REQ_BEG_LINE     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_172_4">F_Begin_Line</A>;
-+-   REQ_END_LINE     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_173_4">F_End_Line</A>;
-+-   REQ_LEFT_CHAR    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_174_4">F_Left_Char</A>;
-+-   REQ_RIGHT_CHAR   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_175_4">F_Right_Char</A>;
-+-   REQ_UP_CHAR      : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_176_4">F_Up_Char</A>;
-+-   REQ_DOWN_CHAR    : Form_Request_Code <b>renames</b> F_Down_Char;
-+-
-+-   REQ_NEW_LINE     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_179_4">F_New_Line</A>;
-+-   REQ_INS_CHAR     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_180_4">F_Insert_Char</A>;
-+-   REQ_INS_LINE     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_181_4">F_Insert_Line</A>;
-+-   REQ_DEL_CHAR     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_182_4">F_Delete_Char</A>;
-+-   REQ_DEL_PREV     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_183_4">F_Delete_Previous</A>;
-+-   REQ_DEL_LINE     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_184_4">F_Delete_Line</A>;
-+-   REQ_DEL_WORD     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_185_4">F_Delete_Word</A>;
-+-   REQ_CLR_EOL      : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_186_4">F_Clear_EOL</A>;
-+-   REQ_CLR_EOF      : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_187_4">F_Clear_EOF</A>;
-+-   REQ_CLR_FIELD    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_188_4">F_Clear_Field</A>;
-+-   REQ_OVL_MODE     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_189_4">F_Overlay_Mode</A>;
-+-   REQ_INS_MODE     : Form_Request_Code <b>renames</b> F_Insert_Mode;
-+-
-+-   REQ_SCR_FLINE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_193_4">F_ScrollForward_Line</A>;
-+-   REQ_SCR_BLINE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_194_4">F_ScrollBackward_Line</A>;
-+-   REQ_SCR_FPAGE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_195_4">F_ScrollForward_Page</A>;
-+-   REQ_SCR_BPAGE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_196_4">F_ScrollBackward_Page</A>;
-+-   REQ_SCR_FHPAGE   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_197_4">F_ScrollForward_HalfPage</A>;
-+-   REQ_SCR_BHPAGE   : Form_Request_Code <b>renames</b> F_ScrollBackward_HalfPage;
-+-
-+-   REQ_SCR_FCHAR    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_201_4">F_HScrollForward_Char</A>;
-+-   REQ_SCR_BCHAR    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_202_4">F_HScrollBackward_Char</A>;
-+-   REQ_SCR_HFLINE   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_203_4">F_HScrollForward_Line</A>;
-+-   REQ_SCR_HBLINE   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_204_4">F_HScrollBackward_Line</A>;
-+-   REQ_SCR_HFHALF   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_205_4">F_HScrollForward_HalfLine</A>;
-+-   REQ_SCR_HBHALF   : Form_Request_Code <b>renames</b> F_HScrollBackward_HalfLine;
-+-
-+-   REQ_VALIDATION   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_208_4">F_Validate_Field</A>;
-+-   REQ_NEXT_CHOICE  : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_209_4">F_Next_Choice</A>;
-+-   REQ_PREV_CHOICE  : Form_Request_Code <b>renames</b> F_Previous_Choice;
-++   REQ_NEXT_PAGE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_145_4">F_Next_Page</A>;
-++   REQ_PREV_PAGE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_146_4">F_Previous_Page</A>;
-++   REQ_FIRST_PAGE   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_147_4">F_First_Page</A>;
-++   REQ_LAST_PAGE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_148_4">F_Last_Page</A>;
-++
-++   REQ_NEXT_FIELD   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_150_4">F_Next_Field</A>;
-++   REQ_PREV_FIELD   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_151_4">F_Previous_Field</A>;
-++   REQ_FIRST_FIELD  : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_152_4">F_First_Field</A>;
-++   REQ_LAST_FIELD   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_153_4">F_Last_Field</A>;
-++   REQ_SNEXT_FIELD  : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_154_4">F_Sorted_Next_Field</A>;
-++   REQ_SPREV_FIELD  : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_155_4">F_Sorted_Previous_Field</A>;
-++   REQ_SFIRST_FIELD : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_156_4">F_Sorted_First_Field</A>;
-++   REQ_SLAST_FIELD  : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_157_4">F_Sorted_Last_Field</A>;
-++   REQ_LEFT_FIELD   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_158_4">F_Left_Field</A>;
-++   REQ_RIGHT_FIELD  : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_159_4">F_Right_Field</A>;
-++   REQ_UP_FIELD     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_160_4">F_Up_Field</A>;
-++   REQ_DOWN_FIELD   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_161_4">F_Down_Field</A>;
-++
-++   REQ_NEXT_CHAR    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_163_4">F_Next_Char</A>;
-++   REQ_PREV_CHAR    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_164_4">F_Previous_Char</A>;
-++   REQ_NEXT_LINE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_165_4">F_Next_Line</A>;
-++   REQ_PREV_LINE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_166_4">F_Previous_Line</A>;
-++   REQ_NEXT_WORD    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_167_4">F_Next_Word</A>;
-++   REQ_PREV_WORD    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_168_4">F_Previous_Word</A>;
-++   REQ_BEG_FIELD    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_169_4">F_Begin_Field</A>;
-++   REQ_END_FIELD    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_170_4">F_End_Field</A>;
-++   REQ_BEG_LINE     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_171_4">F_Begin_Line</A>;
-++   REQ_END_LINE     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_172_4">F_End_Line</A>;
-++   REQ_LEFT_CHAR    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_173_4">F_Left_Char</A>;
-++   REQ_RIGHT_CHAR   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_174_4">F_Right_Char</A>;
-++   REQ_UP_CHAR      : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_175_4">F_Up_Char</A>;
-++   REQ_DOWN_CHAR    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_176_4">F_Down_Char</A>;
-++
-++   REQ_NEW_LINE     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_178_4">F_New_Line</A>;
-++   REQ_INS_CHAR     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_179_4">F_Insert_Char</A>;
-++   REQ_INS_LINE     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_180_4">F_Insert_Line</A>;
-++   REQ_DEL_CHAR     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_181_4">F_Delete_Char</A>;
-++   REQ_DEL_PREV     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_182_4">F_Delete_Previous</A>;
-++   REQ_DEL_LINE     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_183_4">F_Delete_Line</A>;
-++   REQ_DEL_WORD     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_184_4">F_Delete_Word</A>;
-++   REQ_CLR_EOL      : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_185_4">F_Clear_EOL</A>;
-++   REQ_CLR_EOF      : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_186_4">F_Clear_EOF</A>;
-++   REQ_CLR_FIELD    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_187_4">F_Clear_Field</A>;
-++   REQ_OVL_MODE     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_188_4">F_Overlay_Mode</A>;
-++   REQ_INS_MODE     : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_189_4">F_Insert_Mode</A>;
-++
-++   REQ_SCR_FLINE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_192_4">F_ScrollForward_Line</A>;
-++   REQ_SCR_BLINE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_193_4">F_ScrollBackward_Line</A>;
-++   REQ_SCR_FPAGE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_194_4">F_ScrollForward_Page</A>;
-++   REQ_SCR_BPAGE    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_195_4">F_ScrollBackward_Page</A>;
-++   REQ_SCR_FHPAGE   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_196_4">F_ScrollForward_HalfPage</A>;
-++   REQ_SCR_BHPAGE   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_197_4">F_ScrollBackward_HalfPage</A>;
-++
-++   REQ_SCR_FCHAR    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_200_4">F_HScrollForward_Char</A>;
-++   REQ_SCR_BCHAR    : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_201_4">F_HScrollBackward_Char</A>;
-++   REQ_SCR_HFLINE   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_202_4">F_HScrollForward_Line</A>;
-++   REQ_SCR_HBLINE   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_203_4">F_HScrollBackward_Line</A>;
-++   REQ_SCR_HFHALF   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_204_4">F_HScrollForward_HalfLine</A>;
-++   REQ_SCR_HBHALF   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_205_4">F_HScrollBackward_HalfLine</A>;
-++
-++   REQ_VALIDATION   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_207_4">F_Validate_Field</A>;
-++   REQ_NEXT_CHOICE  : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_208_4">F_Next_Choice</A>;
-++   REQ_PREV_CHOICE  : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_209_4">F_Previous_Choice</A>;
-+ 
-+-   <b>procedure</b> Request_Name (<FONT COLOR=red><A NAME="ref_277_28" HREF="terminal_interface-curses-forms__adb.htm#ref_82_33">Key</A></FONT>  : <b>in</b> Form_Request_Code;
-+-                           Name : <b>out</b> String);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_276_14" HREF="terminal_interface-curses-forms__adb.htm#ref_81_14">Request_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_276_28" HREF="terminal_interface-curses-forms__adb.htm#ref_81_28">Key</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A>;
-++                           <FONT COLOR=red><A NAME="ref_277_28" HREF="terminal_interface-curses-forms__adb.htm#ref_82_33">Name</A></FONT> : <b>out</b> String);
-+ 
-+-   <b>function</b>  Request_Name (Key : Form_Request_Code) <b>return</b> String;
-++   <b>function</b>  <FONT COLOR=red><A NAME="ref_279_14" HREF="terminal_interface-curses-forms__adb.htm#ref_90_13">Request_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_279_28" HREF="terminal_interface-curses-forms__adb.htm#ref_90_27">Key</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_142_12">Form_Request_Code</A>) <b>return</b> String;
-+    <FONT COLOR=green><EM>--  Same as function</EM></FONT>
-+    <b>pragma</b> Inline (Request_Name);
-+ 
-+    <FONT COLOR=green><EM>------------------</EM></FONT>
-+    <FONT COLOR=green><EM>--  Exceptions  --</EM></FONT>
-+    <FONT COLOR=green><EM>------------------</EM></FONT>
-+-   Form_Exception : <b>exception</b>;
-++   <FONT COLOR=red><A NAME="ref_286_4">Form_Exception</A></FONT> : <b>exception</b>;
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_field_new.3x.html">form_field_new.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_1"#2|</EM></FONT>
-+-   <b>function</b> Create (<FONT COLOR=red><A NAME="ref_294_21" HREF="terminal_interface-curses-forms__adb.htm#ref_109_21">Height</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
-+-                    <FONT COLOR=red><A NAME="ref_295_21" HREF="terminal_interface-curses-forms__adb.htm#ref_110_21">Width</A></FONT>        : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Count</A>;
-+-                    <FONT COLOR=red><A NAME="ref_296_21" HREF="terminal_interface-curses-forms__adb.htm#ref_111_21">Top</A></FONT>          : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-                    <FONT COLOR=red><A NAME="ref_297_21" HREF="terminal_interface-curses-forms__adb.htm#ref_112_21">Left</A></FONT>         : Column_Position;
-+-                    <FONT COLOR=red><A NAME="ref_298_21" HREF="terminal_interface-curses-forms__adb.htm#ref_113_21">Off_Screen</A></FONT>   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Natural</A> := 0;
-+-                    More_Buffers : Buffer_Number := Buffer_Number'First)
-+-                    <b>return</b> Field;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_293_13" HREF="terminal_interface-curses-forms__adb.htm#ref_108_13">Create</A></FONT> (<FONT COLOR=red><A NAME="ref_293_21" HREF="terminal_interface-curses-forms__adb.htm#ref_108_21">Height</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-++                    <FONT COLOR=red><A NAME="ref_294_21" HREF="terminal_interface-curses-forms__adb.htm#ref_109_21">Width</A></FONT>        : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-++                    <FONT COLOR=red><A NAME="ref_295_21" HREF="terminal_interface-curses-forms__adb.htm#ref_110_21">Top</A></FONT>          : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++                    <FONT COLOR=red><A NAME="ref_296_21" HREF="terminal_interface-curses-forms__adb.htm#ref_111_21">Left</A></FONT>         : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++                    <FONT COLOR=red><A NAME="ref_297_21" HREF="terminal_interface-curses-forms__adb.htm#ref_112_21">Off_Screen</A></FONT>   : Natural := 0;
-++                    <FONT COLOR=red><A NAME="ref_298_21" HREF="terminal_interface-curses-forms__adb.htm#ref_113_21">More_Buffers</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Buffer_Number</A> := <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Buffer_Number</A>'First)
-++                    <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_new.3x.html">new_field()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  An overloaded Create is defined later. Pragma Inline appears there.</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_2"#2|</EM></FONT>
-+-   <b>function</b> New_Field (<FONT COLOR=red><A NAME="ref_305_24">Height</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
-+-                       <FONT COLOR=red><A NAME="ref_306_24">Width</A></FONT>        : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Count</A>;
-+-                       <FONT COLOR=red><A NAME="ref_307_24">Top</A></FONT>          : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-                       <FONT COLOR=red><A NAME="ref_308_24">Left</A></FONT>         : Column_Position;
-+-                       <FONT COLOR=red><A NAME="ref_309_24">Off_Screen</A></FONT>   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Natural</A> := 0;
-+-                       More_Buffers : Buffer_Number := Buffer_Number'First)
-+-                       <b>return</b> Field <b>renames</b> Create;
-++   <b>function</b> New_Field (<FONT COLOR=red><A NAME="ref_304_24">Height</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-++                       <FONT COLOR=red><A NAME="ref_305_24">Width</A></FONT>        : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-++                       <FONT COLOR=red><A NAME="ref_306_24">Top</A></FONT>          : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++                       <FONT COLOR=red><A NAME="ref_307_24">Left</A></FONT>         : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++                       <FONT COLOR=red><A NAME="ref_308_24">Off_Screen</A></FONT>   : Natural := 0;
-++                       <FONT COLOR=red><A NAME="ref_309_24">More_Buffers</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Buffer_Number</A> := <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Buffer_Number</A>'First)
-++                       <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A> <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_293_13">Create</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_new.3x.html">new_field()</A></EM></FONT>
-+    <b>pragma</b> Inline (New_Field);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_3"#2|</EM></FONT>
-+-   <b>procedure</b> Delete (Fld : <b>in</b> <b>out</b> Field);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_315_14" HREF="terminal_interface-curses-forms__adb.htm#ref_131_14">Delete</A></FONT> (<FONT COLOR=red><A NAME="ref_315_22" HREF="terminal_interface-curses-forms__adb.htm#ref_131_22">Fld</A></FONT> : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_new.3x.html">free_field()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  Reset Fld to Null_Field</EM></FONT>
-+    <FONT COLOR=green><EM>--  An overloaded Delete is defined later. Pragma Inline appears there.</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_4"#2|</EM></FONT>
-+-   <b>function</b> Duplicate (<FONT COLOR=red><A NAME="ref_322_24" HREF="terminal_interface-curses-forms__adb.htm#ref_148_24">Fld</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Field</A>;
-+-                       <FONT COLOR=red><A NAME="ref_323_24" HREF="terminal_interface-curses-forms__adb.htm#ref_149_24">Top</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-                       Left : Column_Position) <b>return</b> Field;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_321_13" HREF="terminal_interface-curses-forms__adb.htm#ref_147_13">Duplicate</A></FONT> (<FONT COLOR=red><A NAME="ref_321_24" HREF="terminal_interface-curses-forms__adb.htm#ref_147_24">Fld</A></FONT>  : <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++                       <FONT COLOR=red><A NAME="ref_322_24" HREF="terminal_interface-curses-forms__adb.htm#ref_148_24">Top</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++                       <FONT COLOR=red><A NAME="ref_323_24" HREF="terminal_interface-curses-forms__adb.htm#ref_149_24">Left</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_new.3x.html">dup_field()</A></EM></FONT>
-+    <b>pragma</b> Inline (Duplicate);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_5"#2|</EM></FONT>
-+-   <b>function</b> Link (<FONT COLOR=red><A NAME="ref_329_19" HREF="terminal_interface-curses-forms__adb.htm#ref_169_19">Fld</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Field</A>;
-+-                  <FONT COLOR=red><A NAME="ref_330_19" HREF="terminal_interface-curses-forms__adb.htm#ref_170_19">Top</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-                  Left : Column_Position) <b>return</b> Field;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_328_13" HREF="terminal_interface-curses-forms__adb.htm#ref_168_13">Link</A></FONT> (<FONT COLOR=red><A NAME="ref_328_19" HREF="terminal_interface-curses-forms__adb.htm#ref_168_19">Fld</A></FONT>  : <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++                  <FONT COLOR=red><A NAME="ref_329_19" HREF="terminal_interface-curses-forms__adb.htm#ref_169_19">Top</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++                  <FONT COLOR=red><A NAME="ref_330_19" HREF="terminal_interface-curses-forms__adb.htm#ref_170_19">Left</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_new.3x.html">link_field()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Link);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_328_13">Link</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_field_just.3x.html">form_field_just.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_6"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Justification (<FONT COLOR=red><A NAME="ref_340_33" HREF="terminal_interface-curses-forms__adb.htm#ref_194_33">Fld</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_62_9">Field</A>;
-+-                                Just : <b>in</b> Field_Justification := None);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_339_14" HREF="terminal_interface-curses-forms__adb.htm#ref_193_14">Set_Justification</A></FONT> (<FONT COLOR=red><A NAME="ref_339_33" HREF="terminal_interface-curses-forms__adb.htm#ref_193_33">Fld</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++                                <FONT COLOR=red><A NAME="ref_340_33" HREF="terminal_interface-curses-forms__adb.htm#ref_194_33">Just</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_62_9">Field_Justification</A> := <A HREF="terminal_interface-curses-forms__ads.htm#ref_62_33">None</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_just.3x.html">set_field_just()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Justification);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_339_14">Set_Justification</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_7"#2|</EM></FONT>
-+-   <b>function</b> Get_Justification (Fld : Field) <b>return</b> Field_Justification;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_345_13" HREF="terminal_interface-curses-forms__adb.htm#ref_211_13">Get_Justification</A></FONT> (<FONT COLOR=red><A NAME="ref_345_32" HREF="terminal_interface-curses-forms__adb.htm#ref_211_32">Fld</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>) <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_62_9">Field_Justification</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_just.3x.html">field_just()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Get_Justification);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_345_13">Get_Justification</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_field_buffer.3x.html">form_field_buffer.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_8"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Buffer
-+-     (<FONT COLOR=red><A NAME="ref_356_7" HREF="terminal_interface-curses-forms__adb.htm#ref_227_7">Fld</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Field</A>;
-+-      <FONT COLOR=red><A NAME="ref_357_7" HREF="terminal_interface-curses-forms__adb.htm#ref_228_7">Buffer</A></FONT> : <b>in</b> Buffer_Number := Buffer_Number'First;
-+-      Str    : <b>in</b> String);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_354_14" HREF="terminal_interface-curses-forms__adb.htm#ref_225_14">Set_Buffer</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_355_7" HREF="terminal_interface-curses-forms__adb.htm#ref_226_7">Fld</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++      <FONT COLOR=red><A NAME="ref_356_7" HREF="terminal_interface-curses-forms__adb.htm#ref_227_7">Buffer</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Buffer_Number</A> := <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Buffer_Number</A>'First;
-++      <FONT COLOR=red><A NAME="ref_357_7" HREF="terminal_interface-curses-forms__adb.htm#ref_228_7">Str</A></FONT>    : <b>in</b> String);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_buffer.3x.html">set_field_buffer()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  Not inlined</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_9"#2|</EM></FONT>
-+-   <b>procedure</b> Get_Buffer
-+-     (<FONT COLOR=red><A NAME="ref_364_7" HREF="terminal_interface-curses-forms__adb.htm#ref_252_7">Fld</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Field</A>;
-+-      <FONT COLOR=red><A NAME="ref_365_7" HREF="terminal_interface-curses-forms__adb.htm#ref_253_7">Buffer</A></FONT> : <b>in</b> Buffer_Number := Buffer_Number'First;
-+-      Str    : <b>out</b> String);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_362_14" HREF="terminal_interface-curses-forms__adb.htm#ref_250_14">Get_Buffer</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_363_7" HREF="terminal_interface-curses-forms__adb.htm#ref_251_7">Fld</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++      <FONT COLOR=red><A NAME="ref_364_7" HREF="terminal_interface-curses-forms__adb.htm#ref_252_7">Buffer</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Buffer_Number</A> := <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Buffer_Number</A>'First;
-++      <FONT COLOR=red><A NAME="ref_365_7" HREF="terminal_interface-curses-forms__adb.htm#ref_253_7">Str</A></FONT>    : <b>out</b> String);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_buffer.3x.html">field_buffer()</A></EM></FONT>
-+ 
-+-   <b>function</b> Get_Buffer
-+-     (<FONT COLOR=red><A NAME="ref_370_7" HREF="terminal_interface-curses-forms__adb.htm#ref_264_7">Fld</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Field</A>;
-+-      Buffer : <b>in</b> Buffer_Number := Buffer_Number'First) <b>return</b> String;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_368_13" HREF="terminal_interface-curses-forms__adb.htm#ref_262_13">Get_Buffer</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_369_7" HREF="terminal_interface-curses-forms__adb.htm#ref_263_7">Fld</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++      <FONT COLOR=red><A NAME="ref_370_7" HREF="terminal_interface-curses-forms__adb.htm#ref_264_7">Buffer</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Buffer_Number</A> := <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Buffer_Number</A>'First) <b>return</b> String;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_buffer.3x.html">field_buffer()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  Same but as function</EM></FONT>
-+    <b>pragma</b> Inline (Get_Buffer);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_10"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Status (<FONT COLOR=red><A NAME="ref_377_26" HREF="terminal_interface-curses-forms__adb.htm#ref_276_26">Fld</A></FONT>    : <b>in</b> Field;
-+-                         Status : <b>in</b> Boolean := True);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_376_14" HREF="terminal_interface-curses-forms__adb.htm#ref_275_14">Set_Status</A></FONT> (<FONT COLOR=red><A NAME="ref_376_26" HREF="terminal_interface-curses-forms__adb.htm#ref_275_26">Fld</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++                         <FONT COLOR=red><A NAME="ref_377_26" HREF="terminal_interface-curses-forms__adb.htm#ref_276_26">Status</A></FONT> : <b>in</b> Boolean := True);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_buffer.3x.html">set_field_status()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Status);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_376_14">Set_Status</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_11"#2|</EM></FONT>
-+-   <b>function</b> Changed (Fld : Field) <b>return</b> Boolean;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_382_13" HREF="terminal_interface-curses-forms__adb.htm#ref_291_13">Changed</A></FONT> (<FONT COLOR=red><A NAME="ref_382_22" HREF="terminal_interface-curses-forms__adb.htm#ref_291_22">Fld</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>) <b>return</b> Boolean;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_buffer.3x.html">field_status()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Changed);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_382_13">Changed</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_12"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Maximum_Size (<FONT COLOR=red><A NAME="ref_388_32" HREF="terminal_interface-curses-forms__adb.htm#ref_308_32">Fld</A></FONT> : <b>in</b> Field;
-+-                               Max : <b>in</b> Natural := 0);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_387_14" HREF="terminal_interface-curses-forms__adb.htm#ref_307_14">Set_Maximum_Size</A></FONT> (<FONT COLOR=red><A NAME="ref_387_32" HREF="terminal_interface-curses-forms__adb.htm#ref_307_32">Fld</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++                               <FONT COLOR=red><A NAME="ref_388_32" HREF="terminal_interface-curses-forms__adb.htm#ref_308_32">Max</A></FONT> : <b>in</b> Natural := 0);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_buffer.3x.html">set_field_max()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Maximum_Size);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_387_14">Set_Maximum_Size</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_field_opts.3x.html">form_field_opts.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_13"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Options (<FONT COLOR=red><A NAME="ref_398_27" HREF="terminal_interface-curses-forms__adb.htm#ref_328_27">Fld</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_68_9">Field</A>;
-+-                          Options : <b>in</b> Field_Option_Set);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_397_14" HREF="terminal_interface-curses-forms__adb.htm#ref_327_14">Set_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_397_27" HREF="terminal_interface-curses-forms__adb.htm#ref_327_27">Fld</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++                          <FONT COLOR=red><A NAME="ref_398_27" HREF="terminal_interface-curses-forms__adb.htm#ref_328_27">Options</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_68_9">Field_Option_Set</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_opts.3x.html">set_field_opts()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  An overloaded version is defined later. Pragma Inline appears there</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_14"#2|</EM></FONT>
-+-   <b>procedure</b> Switch_Options (<FONT COLOR=red><A NAME="ref_404_30" HREF="terminal_interface-curses-forms__adb.htm#ref_346_30">Fld</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_68_9">Field</A>;
-+-                             <FONT COLOR=red><A NAME="ref_405_30" HREF="terminal_interface-curses-forms__adb.htm#ref_347_30">Options</A></FONT> : <b>in</b> Field_Option_Set;
-+-                             On      : Boolean := True);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_403_14" HREF="terminal_interface-curses-forms__adb.htm#ref_345_14">Switch_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_403_30" HREF="terminal_interface-curses-forms__adb.htm#ref_345_30">Fld</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++                             <FONT COLOR=red><A NAME="ref_404_30" HREF="terminal_interface-curses-forms__adb.htm#ref_346_30">Options</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_68_9">Field_Option_Set</A>;
-++                             <FONT COLOR=red><A NAME="ref_405_30" HREF="terminal_interface-curses-forms__adb.htm#ref_347_30">On</A></FONT>      : Boolean := True);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_opts.3x.html">field_opts_on()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: field_opts_off()</EM></FONT>
-+    <FONT COLOR=green><EM>--  An overloaded version is defined later. Pragma Inline appears there</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_15"#2|</EM></FONT>
-+-   <b>procedure</b> Get_Options (<FONT COLOR=red><A NAME="ref_412_27" HREF="terminal_interface-curses-forms__adb.htm#ref_372_27">Fld</A></FONT>     : <b>in</b>  <A HREF="terminal_interface-curses-forms__ads.htm#ref_68_9">Field</A>;
-+-                          Options : <b>out</b> Field_Option_Set);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_411_14" HREF="terminal_interface-curses-forms__adb.htm#ref_371_14">Get_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_411_27" HREF="terminal_interface-curses-forms__adb.htm#ref_371_27">Fld</A></FONT>     : <b>in</b>  <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++                          <FONT COLOR=red><A NAME="ref_412_27" HREF="terminal_interface-curses-forms__adb.htm#ref_372_27">Options</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_68_9">Field_Option_Set</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_opts.3x.html">field_opts()</A></EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_16"#2|</EM></FONT>
-+-   <b>function</b> Get_Options (Fld : Field := Null_Field)
-+-                         <b>return</b> Field_Option_Set;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_416_13" HREF="terminal_interface-curses-forms__adb.htm#ref_384_13">Get_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_416_26" HREF="terminal_interface-curses-forms__adb.htm#ref_384_26">Fld</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A> := <A HREF="terminal_interface-curses-forms__ads.htm#ref_59_4">Null_Field</A>)
-++                         <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_68_9">Field_Option_Set</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_opts.3x.html">field_opts()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  An overloaded version is defined later. Pragma Inline appears there</EM></FONT>
-+ 
-+@@ -429,161 +428,161 @@
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_17"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Foreground
-+-     (<FONT COLOR=red><A NAME="ref_428_7" HREF="terminal_interface-curses-forms__adb.htm#ref_401_7">Fld</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Field</A>;
-+-      <FONT COLOR=red><A NAME="ref_429_7" HREF="terminal_interface-curses-forms__adb.htm#ref_402_7">Fore</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character_Attribute_Set</A> := Normal_Video;
-+-      Color : <b>in</b> Color_Pair := Color_Pair'First);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_426_14" HREF="terminal_interface-curses-forms__adb.htm#ref_399_14">Set_Foreground</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_427_7" HREF="terminal_interface-curses-forms__adb.htm#ref_400_7">Fld</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++      <FONT COLOR=red><A NAME="ref_428_7" HREF="terminal_interface-curses-forms__adb.htm#ref_401_7">Fore</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-++      <FONT COLOR=red><A NAME="ref_429_7" HREF="terminal_interface-curses-forms__adb.htm#ref_402_7">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_attributes.3x.html">set_field_fore()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Foreground);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_426_14">Set_Foreground</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_18"#2|</EM></FONT>
-+-   <b>procedure</b> Foreground (<FONT COLOR=red><A NAME="ref_435_26" HREF="terminal_interface-curses-forms__adb.htm#ref_422_26">Fld</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Field</A>;
-+-                         Fore : <b>out</b> Character_Attribute_Set);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_434_14" HREF="terminal_interface-curses-forms__adb.htm#ref_421_14">Foreground</A></FONT> (<FONT COLOR=red><A NAME="ref_434_26" HREF="terminal_interface-curses-forms__adb.htm#ref_421_26">Fld</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++                         <FONT COLOR=red><A NAME="ref_435_26" HREF="terminal_interface-curses-forms__adb.htm#ref_422_26">Fore</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_attributes.3x.html">field_fore()</A></EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_19"#2|</EM></FONT>
-+-   <b>procedure</b> Foreground (<FONT COLOR=red><A NAME="ref_440_26" HREF="terminal_interface-curses-forms__adb.htm#ref_431_26">Fld</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Field</A>;
-+-                         <FONT COLOR=red><A NAME="ref_441_26" HREF="terminal_interface-curses-forms__adb.htm#ref_432_26">Fore</A></FONT>  : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character_Attribute_Set</A>;
-+-                         Color : <b>out</b> Color_Pair);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_439_14" HREF="terminal_interface-curses-forms__adb.htm#ref_430_14">Foreground</A></FONT> (<FONT COLOR=red><A NAME="ref_439_26" HREF="terminal_interface-curses-forms__adb.htm#ref_430_26">Fld</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++                         <FONT COLOR=red><A NAME="ref_440_26" HREF="terminal_interface-curses-forms__adb.htm#ref_431_26">Fore</A></FONT>  : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>;
-++                         <FONT COLOR=red><A NAME="ref_441_26" HREF="terminal_interface-curses-forms__adb.htm#ref_432_26">Color</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_attributes.3x.html">field_fore()</A></EM></FONT>
-+    <b>pragma</b> Inline (Foreground);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_20"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Background
-+-     (<FONT COLOR=red><A NAME="ref_448_7" HREF="terminal_interface-curses-forms__adb.htm#ref_445_7">Fld</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Field</A>;
-+-      <FONT COLOR=red><A NAME="ref_449_7" HREF="terminal_interface-curses-forms__adb.htm#ref_446_7">Back</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character_Attribute_Set</A> := Normal_Video;
-+-      Color : <b>in</b> Color_Pair := Color_Pair'First);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_446_14" HREF="terminal_interface-curses-forms__adb.htm#ref_443_14">Set_Background</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_447_7" HREF="terminal_interface-curses-forms__adb.htm#ref_444_7">Fld</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++      <FONT COLOR=red><A NAME="ref_448_7" HREF="terminal_interface-curses-forms__adb.htm#ref_445_7">Back</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-++      <FONT COLOR=red><A NAME="ref_449_7" HREF="terminal_interface-curses-forms__adb.htm#ref_446_7">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_attributes.3x.html">set_field_back()</A></EM></FONT>
-+    <b>pragma</b> Inline (Set_Background);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_21"#2|</EM></FONT>
-+-   <b>procedure</b> Background (<FONT COLOR=red><A NAME="ref_455_26" HREF="terminal_interface-curses-forms__adb.htm#ref_466_26">Fld</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Field</A>;
-+-                         Back : <b>out</b> Character_Attribute_Set);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_454_14" HREF="terminal_interface-curses-forms__adb.htm#ref_465_14">Background</A></FONT> (<FONT COLOR=red><A NAME="ref_454_26" HREF="terminal_interface-curses-forms__adb.htm#ref_465_26">Fld</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++                         <FONT COLOR=red><A NAME="ref_455_26" HREF="terminal_interface-curses-forms__adb.htm#ref_466_26">Back</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_attributes.3x.html">field_back()</A></EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_22"#2|</EM></FONT>
-+-   <b>procedure</b> Background (<FONT COLOR=red><A NAME="ref_460_26" HREF="terminal_interface-curses-forms__adb.htm#ref_475_26">Fld</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Field</A>;
-+-                         <FONT COLOR=red><A NAME="ref_461_26" HREF="terminal_interface-curses-forms__adb.htm#ref_476_26">Back</A></FONT>  : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character_Attribute_Set</A>;
-+-                         Color : <b>out</b> Color_Pair);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_459_14" HREF="terminal_interface-curses-forms__adb.htm#ref_474_14">Background</A></FONT> (<FONT COLOR=red><A NAME="ref_459_26" HREF="terminal_interface-curses-forms__adb.htm#ref_474_26">Fld</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++                         <FONT COLOR=red><A NAME="ref_460_26" HREF="terminal_interface-curses-forms__adb.htm#ref_475_26">Back</A></FONT>  : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>;
-++                         <FONT COLOR=red><A NAME="ref_461_26" HREF="terminal_interface-curses-forms__adb.htm#ref_476_26">Color</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_attributes.3x.html">field_back()</A></EM></FONT>
-+    <b>pragma</b> Inline (Background);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_23"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Pad_Character (<FONT COLOR=red><A NAME="ref_467_33" HREF="terminal_interface-curses-forms__adb.htm#ref_488_33">Fld</A></FONT> : <b>in</b> Field;
-+-                                Pad : <b>in</b> Character := Space);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_466_14" HREF="terminal_interface-curses-forms__adb.htm#ref_487_14">Set_Pad_Character</A></FONT> (<FONT COLOR=red><A NAME="ref_466_33" HREF="terminal_interface-curses-forms__adb.htm#ref_487_33">Fld</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++                                <FONT COLOR=red><A NAME="ref_467_33" HREF="terminal_interface-curses-forms__adb.htm#ref_488_33">Pad</A></FONT> : <b>in</b> Character := Space);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_attributes.3x.html">set_field_pad()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Pad_Character);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_466_14">Set_Pad_Character</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_24"#2|</EM></FONT>
-+-   <b>procedure</b> Pad_Character (<FONT COLOR=red><A NAME="ref_473_29" HREF="terminal_interface-curses-forms__adb.htm#ref_505_29">Fld</A></FONT> : <b>in</b>  Field;
-+-                            Pad : <b>out</b> Character);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_472_14" HREF="terminal_interface-curses-forms__adb.htm#ref_504_14">Pad_Character</A></FONT> (<FONT COLOR=red><A NAME="ref_472_29" HREF="terminal_interface-curses-forms__adb.htm#ref_504_29">Fld</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++                            <FONT COLOR=red><A NAME="ref_473_29" HREF="terminal_interface-curses-forms__adb.htm#ref_505_29">Pad</A></FONT> : <b>out</b> Character);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_attributes.3x.html">field_pad()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Pad_Character);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_472_14">Pad_Character</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_field_info.3x.html">form_field_info.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_25"#2|</EM></FONT>
-+-   <b>procedure</b> Info (<FONT COLOR=red><A NAME="ref_483_20" HREF="terminal_interface-curses-forms__adb.htm#ref_520_20">Fld</A></FONT>                : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Field</A>;
-+-                   <FONT COLOR=red><A NAME="ref_484_20" HREF="terminal_interface-curses-forms__adb.htm#ref_521_20">Lines</A></FONT>              : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
-+-                   <FONT COLOR=red><A NAME="ref_485_20" HREF="terminal_interface-curses-forms__adb.htm#ref_522_20">Columns</A></FONT>            : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Count</A>;
-+-                   <FONT COLOR=red><A NAME="ref_486_20" HREF="terminal_interface-curses-forms__adb.htm#ref_523_20">First_Row</A></FONT>          : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-                   <FONT COLOR=red><A NAME="ref_487_20" HREF="terminal_interface-curses-forms__adb.htm#ref_524_20">First_Column</A></FONT>       : <b>out</b> Column_Position;
-+-                   <FONT COLOR=red><A NAME="ref_488_20" HREF="terminal_interface-curses-forms__adb.htm#ref_525_20">Off_Screen</A></FONT>         : <b>out</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Natural</A>;
-+-                   Additional_Buffers : <b>out</b> Buffer_Number);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_482_14" HREF="terminal_interface-curses-forms__adb.htm#ref_519_14">Info</A></FONT> (<FONT COLOR=red><A NAME="ref_482_20" HREF="terminal_interface-curses-forms__adb.htm#ref_519_20">Fld</A></FONT>                : <b>in</b>  <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++                   <FONT COLOR=red><A NAME="ref_483_20" HREF="terminal_interface-curses-forms__adb.htm#ref_520_20">Lines</A></FONT>              : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-++                   <FONT COLOR=red><A NAME="ref_484_20" HREF="terminal_interface-curses-forms__adb.htm#ref_521_20">Columns</A></FONT>            : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-++                   <FONT COLOR=red><A NAME="ref_485_20" HREF="terminal_interface-curses-forms__adb.htm#ref_522_20">First_Row</A></FONT>          : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++                   <FONT COLOR=red><A NAME="ref_486_20" HREF="terminal_interface-curses-forms__adb.htm#ref_523_20">First_Column</A></FONT>       : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++                   <FONT COLOR=red><A NAME="ref_487_20" HREF="terminal_interface-curses-forms__adb.htm#ref_524_20">Off_Screen</A></FONT>         : <b>out</b> Natural;
-++                   <FONT COLOR=red><A NAME="ref_488_20" HREF="terminal_interface-curses-forms__adb.htm#ref_525_20">Additional_Buffers</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_129_9">Buffer_Number</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_info.3x.html">field_info()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Info);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_482_14">Info</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_26"#2|</EM></FONT>
-+-   <b>procedure</b> Dynamic_Info (<FONT COLOR=red><A NAME="ref_494_28" HREF="terminal_interface-curses-forms__adb.htm#ref_554_28">Fld</A></FONT>     : <b>in</b> Field;
-+-                           <FONT COLOR=red><A NAME="ref_495_28" HREF="terminal_interface-curses-forms__adb.htm#ref_555_28">Lines</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
-+-                           <FONT COLOR=red><A NAME="ref_496_28" HREF="terminal_interface-curses-forms__adb.htm#ref_556_28">Columns</A></FONT> : <b>out</b> Column_Count;
-+-                           Max     : <b>out</b> Natural);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_493_14" HREF="terminal_interface-curses-forms__adb.htm#ref_553_14">Dynamic_Info</A></FONT> (<FONT COLOR=red><A NAME="ref_493_28" HREF="terminal_interface-curses-forms__adb.htm#ref_553_28">Fld</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++                           <FONT COLOR=red><A NAME="ref_494_28" HREF="terminal_interface-curses-forms__adb.htm#ref_554_28">Lines</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-++                           <FONT COLOR=red><A NAME="ref_495_28" HREF="terminal_interface-curses-forms__adb.htm#ref_555_28">Columns</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-++                           <FONT COLOR=red><A NAME="ref_496_28" HREF="terminal_interface-curses-forms__adb.htm#ref_556_28">Max</A></FONT>     : <b>out</b> Natural);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field_info.3x.html">dynamic_field_info()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Dynamic_Info);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_493_14">Dynamic_Info</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_win.3x.html">form_win.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_27"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Window (<FONT COLOR=red><A NAME="ref_506_26" HREF="terminal_interface-curses-forms__adb.htm#ref_583_26">Frm</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Form</A>;
-+-                         Win : <b>in</b> Window);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_505_14" HREF="terminal_interface-curses-forms__adb.htm#ref_582_14">Set_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_505_26" HREF="terminal_interface-curses-forms__adb.htm#ref_582_26">Frm</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-++                         <FONT COLOR=red><A NAME="ref_506_26" HREF="terminal_interface-curses-forms__adb.htm#ref_583_26">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_win.3x.html">set_form_win()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Window);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_505_14">Set_Window</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_28"#2|</EM></FONT>
-+-   <b>function</b> Get_Window (Frm : Form) <b>return</b> Window;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_511_13" HREF="terminal_interface-curses-forms__adb.htm#ref_598_13">Get_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_511_25" HREF="terminal_interface-curses-forms__adb.htm#ref_598_25">Frm</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_win.3x.html">form_win()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Get_Window);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_511_13">Get_Window</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_29"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Sub_Window (<FONT COLOR=red><A NAME="ref_517_30" HREF="terminal_interface-curses-forms__adb.htm#ref_611_30">Frm</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Form</A>;
-+-                             Win : <b>in</b> Window);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_516_14" HREF="terminal_interface-curses-forms__adb.htm#ref_610_14">Set_Sub_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_516_30" HREF="terminal_interface-curses-forms__adb.htm#ref_610_30">Frm</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-++                             <FONT COLOR=red><A NAME="ref_517_30" HREF="terminal_interface-curses-forms__adb.htm#ref_611_30">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_win.3x.html">set_form_sub()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Sub_Window);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_516_14">Set_Sub_Window</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_30"#2|</EM></FONT>
-+-   <b>function</b> Get_Sub_Window (Frm : Form) <b>return</b> Window;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_522_13" HREF="terminal_interface-curses-forms__adb.htm#ref_626_13">Get_Sub_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_522_29" HREF="terminal_interface-curses-forms__adb.htm#ref_626_29">Frm</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_win.3x.html">form_sub()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Get_Sub_Window);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_522_13">Get_Sub_Window</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_31"#2|</EM></FONT>
-+-   <b>procedure</b> Scale (<FONT COLOR=red><A NAME="ref_528_21" HREF="terminal_interface-curses-forms__adb.htm#ref_639_21">Frm</A></FONT>     : <b>in</b> Form;
-+-                    <FONT COLOR=red><A NAME="ref_529_21" HREF="terminal_interface-curses-forms__adb.htm#ref_640_21">Lines</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
-+-                    Columns : <b>out</b> Column_Count);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_527_14" HREF="terminal_interface-curses-forms__adb.htm#ref_638_14">Scale</A></FONT> (<FONT COLOR=red><A NAME="ref_527_21" HREF="terminal_interface-curses-forms__adb.htm#ref_638_21">Frm</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-++                    <FONT COLOR=red><A NAME="ref_528_21" HREF="terminal_interface-curses-forms__adb.htm#ref_639_21">Lines</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-++                    <FONT COLOR=red><A NAME="ref_529_21" HREF="terminal_interface-curses-forms__adb.htm#ref_640_21">Columns</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_win.3x.html">scale_form()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Scale);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_527_14">Scale</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_hook.3x.html">form_hook.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <b>type</b> Form_Hook_Function <b>is</b> <b>access</b> <b>procedure</b> (Frm : <b>in</b> Form);
-+-   <b>pragma</b> Convention (C, Form_Hook_Function);
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_537_9">Form_Hook_Function</A></FONT> <b>is</b> <b>access</b> <b>procedure</b> (<FONT COLOR=red><A NAME="ref_537_49">Frm</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>);
-++   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-forms__ads.htm#ref_537_9">Form_Hook_Function</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_32"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Field_Init_Hook (<FONT COLOR=red><A NAME="ref_542_35" HREF="terminal_interface-curses-forms__adb.htm#ref_663_35">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_537_9">Form</A>;
-+-                                  Proc : <b>in</b> Form_Hook_Function);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_541_14" HREF="terminal_interface-curses-forms__adb.htm#ref_662_14">Set_Field_Init_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_541_35" HREF="terminal_interface-curses-forms__adb.htm#ref_662_35">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-++                                  <FONT COLOR=red><A NAME="ref_542_35" HREF="terminal_interface-curses-forms__adb.htm#ref_663_35">Proc</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_537_9">Form_Hook_Function</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_hook.3x.html">set_field_init()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Field_Init_Hook);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_541_14">Set_Field_Init_Hook</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_33"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Field_Term_Hook (<FONT COLOR=red><A NAME="ref_548_35" HREF="terminal_interface-curses-forms__adb.htm#ref_679_35">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_537_9">Form</A>;
-+-                                  Proc : <b>in</b> Form_Hook_Function);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_547_14" HREF="terminal_interface-curses-forms__adb.htm#ref_678_14">Set_Field_Term_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_547_35" HREF="terminal_interface-curses-forms__adb.htm#ref_678_35">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-++                                  <FONT COLOR=red><A NAME="ref_548_35" HREF="terminal_interface-curses-forms__adb.htm#ref_679_35">Proc</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_537_9">Form_Hook_Function</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_hook.3x.html">set_field_term()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Field_Term_Hook);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_547_14">Set_Field_Term_Hook</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_34"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Form_Init_Hook (<FONT COLOR=red><A NAME="ref_554_34" HREF="terminal_interface-curses-forms__adb.htm#ref_695_34">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_537_9">Form</A>;
-+-                                 Proc : <b>in</b> Form_Hook_Function);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_553_14" HREF="terminal_interface-curses-forms__adb.htm#ref_694_14">Set_Form_Init_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_553_34" HREF="terminal_interface-curses-forms__adb.htm#ref_694_34">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-++                                 <FONT COLOR=red><A NAME="ref_554_34" HREF="terminal_interface-curses-forms__adb.htm#ref_695_34">Proc</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_537_9">Form_Hook_Function</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_hook.3x.html">set_form_init()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Form_Init_Hook);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_553_14">Set_Form_Init_Hook</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_35"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Form_Term_Hook (<FONT COLOR=red><A NAME="ref_560_34" HREF="terminal_interface-curses-forms__adb.htm#ref_711_34">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_537_9">Form</A>;
-+-                                 Proc : <b>in</b> Form_Hook_Function);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_559_14" HREF="terminal_interface-curses-forms__adb.htm#ref_710_14">Set_Form_Term_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_559_34" HREF="terminal_interface-curses-forms__adb.htm#ref_710_34">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-++                                 <FONT COLOR=red><A NAME="ref_560_34" HREF="terminal_interface-curses-forms__adb.htm#ref_711_34">Proc</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_537_9">Form_Hook_Function</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_hook.3x.html">set_form_term()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Form_Term_Hook);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_559_14">Set_Form_Term_Hook</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_36"#2|</EM></FONT>
-+-   <b>function</b> Get_Field_Init_Hook (Frm : Form) <b>return</b> Form_Hook_Function;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_565_13">Get_Field_Init_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_565_34" HREF="terminal_interface-curses-forms__ads.htm#ref_565_13">Frm</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>) <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_537_9">Form_Hook_Function</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_hook.3x.html">field_init()</A></EM></FONT>
-+    <b>pragma</b> Import (C, Get_Field_Init_Hook, "field_init");
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_37"#2|</EM></FONT>
-+-   <b>function</b> Get_Field_Term_Hook (Frm : Form) <b>return</b> Form_Hook_Function;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_570_13">Get_Field_Term_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_570_34" HREF="terminal_interface-curses-forms__ads.htm#ref_570_13">Frm</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>) <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_537_9">Form_Hook_Function</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_hook.3x.html">field_term()</A></EM></FONT>
-+    <b>pragma</b> Import (C, Get_Field_Term_Hook, "field_term");
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_38"#2|</EM></FONT>
-+-   <b>function</b> Get_Form_Init_Hook (Frm : Form) <b>return</b> Form_Hook_Function;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_575_13">Get_Form_Init_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_575_33" HREF="terminal_interface-curses-forms__ads.htm#ref_575_13">Frm</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>) <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_537_9">Form_Hook_Function</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_hook.3x.html">form_init()</A></EM></FONT>
-+    <b>pragma</b> Import (C, Get_Form_Init_Hook, "form_init");
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_39"#2|</EM></FONT>
-+-   <b>function</b> Get_Form_Term_Hook (Frm : Form) <b>return</b> Form_Hook_Function;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_580_13">Get_Form_Term_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_580_33" HREF="terminal_interface-curses-forms__ads.htm#ref_580_13">Frm</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>) <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_537_9">Form_Hook_Function</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_hook.3x.html">form_term()</A></EM></FONT>
-+    <b>pragma</b> Import (C, Get_Form_Term_Hook, "form_term");
-+ 
-+@@ -592,52 +591,52 @@
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_40"#2|</EM></FONT>
-+-   <b>procedure</b> Redefine (<FONT COLOR=red><A NAME="ref_590_24" HREF="terminal_interface-curses-forms__adb.htm#ref_731_24">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_134_9">Form</A>;
-+-                       Flds : <b>in</b> Field_Array_Access);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_589_14" HREF="terminal_interface-curses-forms__adb.htm#ref_730_14">Redefine</A></FONT> (<FONT COLOR=red><A NAME="ref_589_24" HREF="terminal_interface-curses-forms__adb.htm#ref_730_24">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-++                       <FONT COLOR=red><A NAME="ref_590_24" HREF="terminal_interface-curses-forms__adb.htm#ref_731_24">Flds</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_134_9">Field_Array_Access</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field.3x.html">set_form_fields()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Redefine);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_589_14">Redefine</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_41"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Fields (<FONT COLOR=red><A NAME="ref_596_26">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_134_9">Form</A>;
-+-                         Flds : <b>in</b> Field_Array_Access) <b>renames</b> Redefine;
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_595_14">Set_Fields</A></FONT> (<FONT COLOR=red><A NAME="ref_595_26">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-++                         <FONT COLOR=red><A NAME="ref_596_26">Flds</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_134_9">Field_Array_Access</A>) <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_589_14">Redefine</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field.3x.html">set_form_fields()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  pragma Inline (Set_Fields);</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_42"#2|</EM></FONT>
-+-   <b>function</b> Fields (<FONT COLOR=red><A NAME="ref_602_21" HREF="terminal_interface-curses-forms__adb.htm#ref_753_21">Frm</A></FONT>   : Form;
-+-                    Index : Positive) <b>return</b> Field;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_601_13" HREF="terminal_interface-curses-forms__adb.htm#ref_752_13">Fields</A></FONT> (<FONT COLOR=red><A NAME="ref_601_21" HREF="terminal_interface-curses-forms__adb.htm#ref_752_21">Frm</A></FONT>   : <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-++                    <FONT COLOR=red><A NAME="ref_602_21" HREF="terminal_interface-curses-forms__adb.htm#ref_753_21">Index</A></FONT> : Positive) <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field.3x.html">form_fields()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Fields);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_601_13">Fields</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_43"#2|</EM></FONT>
-+-   <b>function</b> Field_Count (Frm : Form) <b>return</b> Natural;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_607_13" HREF="terminal_interface-curses-forms__adb.htm#ref_772_13">Field_Count</A></FONT> (<FONT COLOR=red><A NAME="ref_607_26" HREF="terminal_interface-curses-forms__adb.htm#ref_772_26">Frm</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>) <b>return</b> Natural;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field.3x.html">field_count()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Field_Count);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_607_13">Field_Count</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_44"#2|</EM></FONT>
-+-   <b>procedure</b> Move (<FONT COLOR=red><A NAME="ref_613_20" HREF="terminal_interface-curses-forms__adb.htm#ref_783_20">Fld</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Field</A>;
-+-                   <FONT COLOR=red><A NAME="ref_614_20" HREF="terminal_interface-curses-forms__adb.htm#ref_784_20">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-                   Column : <b>in</b> Column_Position);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_612_14" HREF="terminal_interface-curses-forms__adb.htm#ref_782_14">Move</A></FONT> (<FONT COLOR=red><A NAME="ref_612_20" HREF="terminal_interface-curses-forms__adb.htm#ref_782_20">Fld</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++                   <FONT COLOR=red><A NAME="ref_613_20" HREF="terminal_interface-curses-forms__adb.htm#ref_783_20">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++                   <FONT COLOR=red><A NAME="ref_614_20" HREF="terminal_interface-curses-forms__adb.htm#ref_784_20">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_field.3x.html">move_field()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Move);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_612_14">Move</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_new.3x.html">form_new.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_45"#2|</EM></FONT>
-+-   <b>function</b> Create (Fields : Field_Array_Access) <b>return</b> Form;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_623_13" HREF="terminal_interface-curses-forms__adb.htm#ref_802_13">Create</A></FONT> (<FONT COLOR=red><A NAME="ref_623_21" HREF="terminal_interface-curses-forms__adb.htm#ref_802_21">Fields</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_134_9">Field_Array_Access</A>) <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_new.3x.html">new_form()</A></EM></FONT>
-+    <b>pragma</b> Inline (Create);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_46"#2|</EM></FONT>
-+-   <b>function</b> New_Form (Fields : Field_Array_Access) <b>return</b> Form
-+-     <b>renames</b> Create;
-++   <b>function</b> New_Form (<FONT COLOR=red><A NAME="ref_628_23">Fields</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_134_9">Field_Array_Access</A>) <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>
-++     <b>renames</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_623_13">Create</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_new.3x.html">new_form()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  pragma Inline (New_Form);</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_47"#2|</EM></FONT>
-+-   <b>procedure</b> Delete (Frm : <b>in</b> <b>out</b> Form);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_634_14" HREF="terminal_interface-curses-forms__adb.htm#ref_823_14">Delete</A></FONT> (<FONT COLOR=red><A NAME="ref_634_22" HREF="terminal_interface-curses-forms__adb.htm#ref_823_22">Frm</A></FONT> : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_new.3x.html">free_form()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  Reset Frm to Null_Form</EM></FONT>
-+    <b>pragma</b> Inline (Delete);
-+@@ -647,26 +646,26 @@
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_48"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Options (<FONT COLOR=red><A NAME="ref_645_27" HREF="terminal_interface-curses-forms__adb.htm#ref_843_27">Frm</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_107_9">Form</A>;
-+-                          Options : <b>in</b> Form_Option_Set);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_644_14" HREF="terminal_interface-curses-forms__adb.htm#ref_842_14">Set_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_644_27" HREF="terminal_interface-curses-forms__adb.htm#ref_842_27">Frm</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-++                          <FONT COLOR=red><A NAME="ref_645_27" HREF="terminal_interface-curses-forms__adb.htm#ref_843_27">Options</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_107_9">Form_Option_Set</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_opts.3x.html">set_form_opts()</A></EM></FONT>
-+    <b>pragma</b> Inline (Set_Options);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_49"#2|</EM></FONT>
-+-   <b>procedure</b> Switch_Options (<FONT COLOR=red><A NAME="ref_651_30" HREF="terminal_interface-curses-forms__adb.htm#ref_861_30">Frm</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_107_9">Form</A>;
-+-                             <FONT COLOR=red><A NAME="ref_652_30" HREF="terminal_interface-curses-forms__adb.htm#ref_862_30">Options</A></FONT> : <b>in</b> Form_Option_Set;
-+-                             On      : Boolean := True);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_650_14" HREF="terminal_interface-curses-forms__adb.htm#ref_860_14">Switch_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_650_30" HREF="terminal_interface-curses-forms__adb.htm#ref_860_30">Frm</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-++                             <FONT COLOR=red><A NAME="ref_651_30" HREF="terminal_interface-curses-forms__adb.htm#ref_861_30">Options</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_107_9">Form_Option_Set</A>;
-++                             <FONT COLOR=red><A NAME="ref_652_30" HREF="terminal_interface-curses-forms__adb.htm#ref_862_30">On</A></FONT>      : Boolean := True);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_opts.3x.html">form_opts_on()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: form_opts_off()</EM></FONT>
-+    <b>pragma</b> Inline (Switch_Options);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_50"#2|</EM></FONT>
-+-   <b>procedure</b> Get_Options (<FONT COLOR=red><A NAME="ref_659_27" HREF="terminal_interface-curses-forms__adb.htm#ref_887_27">Frm</A></FONT>     : <b>in</b>  <A HREF="terminal_interface-curses-forms__ads.htm#ref_107_9">Form</A>;
-+-                          Options : <b>out</b> Form_Option_Set);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_658_14" HREF="terminal_interface-curses-forms__adb.htm#ref_886_14">Get_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_658_27" HREF="terminal_interface-curses-forms__adb.htm#ref_886_27">Frm</A></FONT>     : <b>in</b>  <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-++                          <FONT COLOR=red><A NAME="ref_659_27" HREF="terminal_interface-curses-forms__adb.htm#ref_887_27">Options</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_107_9">Form_Option_Set</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_opts.3x.html">form_opts()</A></EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_51"#2|</EM></FONT>
-+-   <b>function</b> Get_Options (Frm : Form := Null_Form) <b>return</b> Form_Option_Set;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_663_13" HREF="terminal_interface-curses-forms__adb.htm#ref_899_13">Get_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_663_26" HREF="terminal_interface-curses-forms__adb.htm#ref_899_26">Frm</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A> := <A HREF="terminal_interface-curses-forms__ads.htm#ref_60_4">Null_Form</A>) <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_107_9">Form_Option_Set</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_opts.3x.html">form_opts()</A></EM></FONT>
-+    <b>pragma</b> Inline (Get_Options);
-+ 
-+@@ -675,47 +674,47 @@
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_52"#2|</EM></FONT>
-+-   <b>procedure</b> Post (<FONT COLOR=red><A NAME="ref_673_20" HREF="terminal_interface-curses-forms__adb.htm#ref_914_20">Frm</A></FONT>  : <b>in</b> Form;
-+-                   Post : <b>in</b> Boolean := True);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_672_14" HREF="terminal_interface-curses-forms__adb.htm#ref_913_14">Post</A></FONT> (<FONT COLOR=red><A NAME="ref_672_20" HREF="terminal_interface-curses-forms__adb.htm#ref_913_20">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-++                   <FONT COLOR=red><A NAME="ref_673_20" HREF="terminal_interface-curses-forms__adb.htm#ref_914_20">Post</A></FONT> : <b>in</b> Boolean := True);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_post.3x.html">post_form()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: unpost_form()</EM></FONT>
-+-   <b>pragma</b> Inline (Post);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_672_14">Post</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_cursor.3x.html">form_cursor.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_53"#2|</EM></FONT>
-+-   <b>procedure</b> Position_Cursor (Frm : Form);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_683_14" HREF="terminal_interface-curses-forms__adb.htm#ref_939_14">Position_Cursor</A></FONT> (<FONT COLOR=red><A NAME="ref_683_31" HREF="terminal_interface-curses-forms__adb.htm#ref_939_31">Frm</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_cursor.3x.html">pos_form_cursor()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Position_Cursor);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_683_14">Position_Cursor</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_data.3x.html">form_data.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_54"#2|</EM></FONT>
-+-   <b>function</b> Data_Ahead (Frm : Form) <b>return</b> Boolean;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_692_13" HREF="terminal_interface-curses-forms__adb.htm#ref_957_13">Data_Ahead</A></FONT> (<FONT COLOR=red><A NAME="ref_692_25" HREF="terminal_interface-curses-forms__adb.htm#ref_957_25">Frm</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>) <b>return</b> Boolean;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_data.3x.html">data_ahead()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Data_Ahead);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_692_13">Data_Ahead</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_55"#2|</EM></FONT>
-+-   <b>function</b> Data_Behind (Frm : Form) <b>return</b> Boolean;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_697_13" HREF="terminal_interface-curses-forms__adb.htm#ref_973_13">Data_Behind</A></FONT> (<FONT COLOR=red><A NAME="ref_697_26" HREF="terminal_interface-curses-forms__adb.htm#ref_973_26">Frm</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>) <b>return</b> Boolean;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_data.3x.html">data_behind()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Data_Behind);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_697_13">Data_Behind</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_driver.3x.html">form_driver.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <b>type</b> Driver_Result <b>is</b> (<FONT COLOR=red><A NAME="ref_706_27">Form_Ok</A></FONT>,
-+-                          <FONT COLOR=red><A NAME="ref_707_27">Request_Denied</A></FONT>,
-+-                          <FONT COLOR=red><A NAME="ref_708_27">Unknown_Request</A></FONT>,
-+-                          Invalid_Field);
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_705_9">Driver_Result</A></FONT> <b>is</b> (<FONT COLOR=red><A NAME="ref_705_27">Form_Ok</A></FONT>,
-++                          <FONT COLOR=red><A NAME="ref_706_27">Request_Denied</A></FONT>,
-++                          <FONT COLOR=red><A NAME="ref_707_27">Unknown_Request</A></FONT>,
-++                          <FONT COLOR=red><A NAME="ref_708_27">Invalid_Field</A></FONT>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_56"#2|</EM></FONT>
-+-   <b>function</b> Driver (<FONT COLOR=red><A NAME="ref_712_21" HREF="terminal_interface-curses-forms__adb.htm#ref_994_21">Frm</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_68_9">Form</A>;
-+-                    Key : Key_Code) <b>return</b> Driver_Result;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_711_13" HREF="terminal_interface-curses-forms__adb.htm#ref_993_13">Driver</A></FONT> (<FONT COLOR=red><A NAME="ref_711_21" HREF="terminal_interface-curses-forms__adb.htm#ref_993_21">Frm</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-++                    <FONT COLOR=red><A NAME="ref_712_21" HREF="terminal_interface-curses-forms__adb.htm#ref_994_21">Key</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_68_9">Key_Code</A>) <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_705_9">Driver_Result</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_driver.3x.html">form_driver()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  Driver not inlined</EM></FONT>
-+ 
-+@@ -723,52 +722,52 @@
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_page.3x.html">form_page.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <b>type</b> Page_Number <b>is</b> <b>new</b> Natural;
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_720_9">Page_Number</A></FONT> <b>is</b> <b>new</b> Natural;
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_57"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Current (<FONT COLOR=red><A NAME="ref_724_27" HREF="terminal_interface-curses-forms__adb.htm#ref_1024_27">Frm</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Form</A>;
-+-                          Fld : <b>in</b> Field);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_723_14" HREF="terminal_interface-curses-forms__adb.htm#ref_1023_14">Set_Current</A></FONT> (<FONT COLOR=red><A NAME="ref_723_27" HREF="terminal_interface-curses-forms__adb.htm#ref_1023_27">Frm</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-++                          <FONT COLOR=red><A NAME="ref_724_27" HREF="terminal_interface-curses-forms__adb.htm#ref_1024_27">Fld</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_page.3x.html">set_current_field()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Current);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_723_14">Set_Current</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_58"#2|</EM></FONT>
-+-   <b>function</b> Current (Frm : <b>in</b> Form) <b>return</b> Field;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_729_13" HREF="terminal_interface-curses-forms__adb.htm#ref_1038_13">Current</A></FONT> (<FONT COLOR=red><A NAME="ref_729_22" HREF="terminal_interface-curses-forms__adb.htm#ref_1038_22">Frm</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>) <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_page.3x.html">current_field()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Current);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_729_13">Current</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_59"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Page (<FONT COLOR=red><A NAME="ref_735_24" HREF="terminal_interface-curses-forms__adb.htm#ref_1054_24">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_720_9">Form</A>;
-+-                       Page : <b>in</b> Page_Number := Page_Number'First);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_734_14" HREF="terminal_interface-curses-forms__adb.htm#ref_1053_14">Set_Page</A></FONT> (<FONT COLOR=red><A NAME="ref_734_24" HREF="terminal_interface-curses-forms__adb.htm#ref_1053_24">Frm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>;
-++                       <FONT COLOR=red><A NAME="ref_735_24" HREF="terminal_interface-curses-forms__adb.htm#ref_1054_24">Page</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_720_9">Page_Number</A> := <A HREF="terminal_interface-curses-forms__ads.htm#ref_720_9">Page_Number</A>'First);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_page.3x.html">set_form_page()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Page);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_734_14">Set_Page</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_60"#2|</EM></FONT>
-+-   <b>function</b> Page (Frm : Form) <b>return</b> Page_Number;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_740_13" HREF="terminal_interface-curses-forms__adb.htm#ref_1068_13">Page</A></FONT> (<FONT COLOR=red><A NAME="ref_740_19" HREF="terminal_interface-curses-forms__adb.htm#ref_1068_19">Frm</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>) <b>return</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_720_9">Page_Number</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_page.3x.html">form_page()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Page);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_740_13">Page</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_61"#2|</EM></FONT>
-+-   <b>function</b> Get_Index (Fld : Field) <b>return</b> Positive;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_745_13" HREF="terminal_interface-curses-forms__adb.htm#ref_1082_13">Get_Index</A></FONT> (<FONT COLOR=red><A NAME="ref_745_24" HREF="terminal_interface-curses-forms__adb.htm#ref_1082_24">Fld</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>) <b>return</b> Positive;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_page.3x.html">field_index()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  Please note that in this binding we start the numbering of fields</EM></FONT>
-+    <FONT COLOR=green><EM>--  with 1. So this is number is one more than you get from the low</EM></FONT>
-+    <FONT COLOR=green><EM>--  level call.</EM></FONT>
-+-   <b>pragma</b> Inline (Get_Index);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_745_13">Get_Index</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_new_page.3x.html">form_new_page.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_62"#2|</EM></FONT>
-+-   <b>procedure</b> Set_New_Page (<FONT COLOR=red><A NAME="ref_758_28" HREF="terminal_interface-curses-forms__adb.htm#ref_1103_28">Fld</A></FONT>      : <b>in</b> Field;
-+-                           New_Page : <b>in</b> Boolean := True);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_757_14" HREF="terminal_interface-curses-forms__adb.htm#ref_1102_14">Set_New_Page</A></FONT> (<FONT COLOR=red><A NAME="ref_757_28" HREF="terminal_interface-curses-forms__adb.htm#ref_1102_28">Fld</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>;
-++                           <FONT COLOR=red><A NAME="ref_758_28" HREF="terminal_interface-curses-forms__adb.htm#ref_1103_28">New_Page</A></FONT> : <b>in</b> Boolean := True);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_new_page.3x.html">set_new_page()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_New_Page);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_757_14">Set_New_Page</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_63"#2|</EM></FONT>
-+-   <b>function</b> Is_New_Page (Fld : Field) <b>return</b> Boolean;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_763_13" HREF="terminal_interface-curses-forms__adb.htm#ref_1117_13">Is_New_Page</A></FONT> (<FONT COLOR=red><A NAME="ref_763_26" HREF="terminal_interface-curses-forms__adb.htm#ref_1117_26">Fld</A></FONT> : <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A>) <b>return</b> Boolean;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/form_new_page.3x.html">new_page()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Is_New_Page);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-forms__ads.htm#ref_763_13">Is_New_Page</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/form_requestname.3x.html">form_requestname.3x</A></EM></FONT>
-+@@ -777,11 +776,11 @@
-+ 
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ <b>private</b>
-+-   <b>type</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Field</A> <b>is</b> <b>new</b> System.Storage_Elements.Integer_Address;
-+-   <b>type</b> Form  <b>is</b> <b>new</b> System.Storage_Elements.Integer_Address;
-++   <b>type</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A> <b>is</b> <b>new</b> System.Storage_Elements.Integer_Address;
-++   <b>type</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>  <b>is</b> <b>new</b> System.Storage_Elements.Integer_Address;
-+ 
-+-   <A HREF="terminal_interface-curses-forms__ads.htm#ref_60_4">Null_Field</A> : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Field</A> := 0;
-+-   Null_Form  : <b>constant</b> Form  := 0;
-++   <A HREF="terminal_interface-curses-forms__ads.htm#ref_59_4">Null_Field</A> : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_56_9">Field</A> := 0;
-++   <A HREF="terminal_interface-curses-forms__ads.htm#ref_60_4">Null_Form</A>  : <b>constant</b> <A HREF="terminal_interface-curses-forms__ads.htm#ref_57_9">Form</A>  := 0;
-+ 
-+-<b>end</b> Terminal_Interface.Curses.Forms;
-++<b>end</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-forms__ads.htm#ref_49_35">Forms</A>;
-+ </PRE></BODY></HTML>
-+Index: doc/html/ada/terminal_interface-curses-menus-item_user_data__ads.htm
-+--- ncurses-5.6/doc/html/ada/terminal_interface-curses-menus-item_user_data__ads.htm	2006-09-23 20:31:31.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/terminal_interface-curses-menus-item_user_data__ads.htm	2007-09-01 23:56:31.000000000 +0000
-+@@ -3,7 +3,6 @@
-+ <BODY>
-+ <HR><DIV ALIGN="center"><H1> File : terminal_interface-curses-menus-item_user_data.ads </H1></DIV><HR>
-+ <PRE>
-+-
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
-+ <FONT COLOR=green><EM>--                           <A HREF="http://www.gnat.com">GNAT</A> ncurses Binding                           --</EM></FONT>
-+@@ -47,10 +46,10 @@
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ 
-+ <b>generic</b>
-+-   <b>type</b> <FONT COLOR=red><A NAME="ref_45_9" HREF="terminal_interface-curses-menus-item_user_data__ads.htm#ref_46_41">User</A></FONT> <b>is</b> <b>limited</b> <b>private</b>;
-+-   <b>type</b> <A HREF="terminal_interface__ads.htm#ref_42_9">User_Access</A> <b>is</b> <b>access</b> User<A HREF="terminal_interface-curses-menus__ads.htm#ref_49_35">;</A>
-+-<b>package</b> Terminal_Interface.Curses.Menus.Item_User_Data <b>is</b>
-+-   <b>pragma</b> Preelaborate (Terminal_Interface.Curses.Menus.Item_User_Data);
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_44_9" HREF="terminal_interface-curses-menus-item_user_data__ads.htm#ref_46_41">User</A></FONT> <b>is</b> <b>limited</b> <b>private</b>;
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_45_9" HREF="terminal_interface-curses-menus-item_user_data__ads.htm#ref_46_41">User_Access</A></FONT> <b>is</b> <b>access</b> <A HREF="terminal_interface-curses-menus-item_user_data__ads.htm#ref_44_9">User</A>;
-++<b>package</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-menus__ads.htm#ref_49_35">Menus</A>.<FONT COLOR=red><A NAME="ref_46_41" HREF="terminal_interface-curses-menus-item_user_data__adb.htm#ref_44_46">Item_User_Data</A></FONT> <b>is</b>
-++   <b>pragma</b> Preelaborate (<A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-menus__ads.htm#ref_49_35">Menus</A>.<A HREF="terminal_interface-curses-menus-item_user_data__ads.htm#ref_46_41">Item_User_Data</A>);
-+ 
-+    <FONT COLOR=green><EM>--  The binding uses the same user pointer for menu items</EM></FONT>
-+    <FONT COLOR=green><EM>--  as the low level C implementation. So you can safely</EM></FONT>
-+@@ -61,21 +60,21 @@
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_1"#2|</EM></FONT>
-+-   <b>procedure</b> Set_User_Data (<FONT COLOR=red><A NAME="ref_59_29" HREF="terminal_interface-curses-menus-item_user_data__adb.htm#ref_49_29">Itm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus-item_user_data__ads.htm#ref_45_9">Item</A>;
-+-                            Data : <b>in</b> User_Access);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_58_14" HREF="terminal_interface-curses-menus-item_user_data__adb.htm#ref_48_14">Set_User_Data</A></FONT> (<FONT COLOR=red><A NAME="ref_58_29" HREF="terminal_interface-curses-menus-item_user_data__adb.htm#ref_48_29">Itm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>;
-++                            <FONT COLOR=red><A NAME="ref_59_29" HREF="terminal_interface-curses-menus-item_user_data__adb.htm#ref_49_29">Data</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus-item_user_data__ads.htm#ref_45_9">User_Access</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_userptr.3x.html">set_item_userptr</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_User_Data);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus-item_user_data__ads.htm#ref_58_14">Set_User_Data</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_2"#2|</EM></FONT>
-+-   <b>procedure</b> Get_User_Data (<FONT COLOR=red><A NAME="ref_65_29" HREF="terminal_interface-curses-menus-item_user_data__adb.htm#ref_71_29">Itm</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-menus-item_user_data__ads.htm#ref_45_9">Item</A>;
-+-                            Data : <b>out</b> User_Access);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_64_14" HREF="terminal_interface-curses-menus-item_user_data__adb.htm#ref_70_14">Get_User_Data</A></FONT> (<FONT COLOR=red><A NAME="ref_64_29" HREF="terminal_interface-curses-menus-item_user_data__adb.htm#ref_70_29">Itm</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>;
-++                            <FONT COLOR=red><A NAME="ref_65_29" HREF="terminal_interface-curses-menus-item_user_data__adb.htm#ref_71_29">Data</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses-menus-item_user_data__ads.htm#ref_45_9">User_Access</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_userptr.3x.html">item_userptr</A></EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_3"#2|</EM></FONT>
-+-   <b>function</b> Get_User_Data (Itm  : <b>in</b>  Item) <b>return</b> User_Access;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_69_13" HREF="terminal_interface-curses-menus-item_user_data__adb.htm#ref_62_13">Get_User_Data</A></FONT> (<FONT COLOR=red><A NAME="ref_69_28" HREF="terminal_interface-curses-menus-item_user_data__adb.htm#ref_62_28">Itm</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>) <b>return</b> <A HREF="terminal_interface-curses-menus-item_user_data__ads.htm#ref_45_9">User_Access</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_userptr.3x.html">item_userptr</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  Same as function</EM></FONT>
-+    <b>pragma</b> Inline (Get_User_Data);
-+ 
-+-<b>end</b> Terminal_Interface.Curses.Menus.Item_User_Data;
-++<b>end</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-menus__ads.htm#ref_49_35">Menus</A>.<A HREF="terminal_interface-curses-menus-item_user_data__ads.htm#ref_46_41">Item_User_Data</A>;
-+ </PRE></BODY></HTML>
-+Index: doc/html/ada/terminal_interface-curses-menus-menu_user_data__ads.htm
-+--- ncurses-5.6/doc/html/ada/terminal_interface-curses-menus-menu_user_data__ads.htm	2006-09-23 20:31:31.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/terminal_interface-curses-menus-menu_user_data__ads.htm	2007-09-01 23:56:31.000000000 +0000
-+@@ -3,7 +3,6 @@
-+ <BODY>
-+ <HR><DIV ALIGN="center"><H1> File : terminal_interface-curses-menus-menu_user_data.ads </H1></DIV><HR>
-+ <PRE>
-+-
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
-+ <FONT COLOR=green><EM>--                           <A HREF="http://www.gnat.com">GNAT</A> ncurses Binding                           --</EM></FONT>
-+@@ -46,31 +45,31 @@
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ 
-+ <b>generic</b>
-+-   <b>type</b> <FONT COLOR=red><A NAME="ref_44_9" HREF="terminal_interface-curses-menus-menu_user_data__ads.htm#ref_45_41">User</A></FONT> <b>is</b> <b>limited</b> <b>private</b>;
-+-   <b>type</b> <A HREF="terminal_interface__ads.htm#ref_42_9">User_Access</A> <b>is</b> <b>access</b> User<A HREF="terminal_interface-curses-menus__ads.htm#ref_49_35">;</A>
-+-<b>package</b> Terminal_Interface.Curses.Menus.Menu_User_Data <b>is</b>
-+-   <b>pragma</b> Preelaborate (Terminal_Interface.Curses.Menus.Menu_User_Data);
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_43_9" HREF="terminal_interface-curses-menus-menu_user_data__ads.htm#ref_45_41">User</A></FONT> <b>is</b> <b>limited</b> <b>private</b>;
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_44_9" HREF="terminal_interface-curses-menus-menu_user_data__ads.htm#ref_45_41">User_Access</A></FONT> <b>is</b> <b>access</b> <A HREF="terminal_interface-curses-menus-menu_user_data__ads.htm#ref_43_9">User</A>;
-++<b>package</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-menus__ads.htm#ref_49_35">Menus</A>.<FONT COLOR=red><A NAME="ref_45_41" HREF="terminal_interface-curses-menus-menu_user_data__adb.htm#ref_43_46">Menu_User_Data</A></FONT> <b>is</b>
-++   <b>pragma</b> Preelaborate (<A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-menus__ads.htm#ref_49_35">Menus</A>.<A HREF="terminal_interface-curses-menus-menu_user_data__ads.htm#ref_45_41">Menu_User_Data</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/menu_userptr.3x.html">menu_userptr.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_1"#2|</EM></FONT>
-+-   <b>procedure</b> Set_User_Data (<FONT COLOR=red><A NAME="ref_54_29" HREF="terminal_interface-curses-menus-menu_user_data__adb.htm#ref_48_29">Men</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus-menu_user_data__ads.htm#ref_44_9">Menu</A>;
-+-                            Data : <b>in</b> User_Access);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_53_14" HREF="terminal_interface-curses-menus-menu_user_data__adb.htm#ref_47_14">Set_User_Data</A></FONT> (<FONT COLOR=red><A NAME="ref_53_29" HREF="terminal_interface-curses-menus-menu_user_data__adb.htm#ref_47_29">Men</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                            <FONT COLOR=red><A NAME="ref_54_29" HREF="terminal_interface-curses-menus-menu_user_data__adb.htm#ref_48_29">Data</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus-menu_user_data__ads.htm#ref_44_9">User_Access</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_userptr.3x.html">set_menu_userptr</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_User_Data);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus-menu_user_data__ads.htm#ref_53_14">Set_User_Data</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_2"#2|</EM></FONT>
-+-   <b>procedure</b> Get_User_Data (<FONT COLOR=red><A NAME="ref_60_29" HREF="terminal_interface-curses-menus-menu_user_data__adb.htm#ref_70_29">Men</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-menus-menu_user_data__ads.htm#ref_44_9">Menu</A>;
-+-                            Data : <b>out</b> User_Access);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_59_14" HREF="terminal_interface-curses-menus-menu_user_data__adb.htm#ref_69_14">Get_User_Data</A></FONT> (<FONT COLOR=red><A NAME="ref_59_29" HREF="terminal_interface-curses-menus-menu_user_data__adb.htm#ref_69_29">Men</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                            <FONT COLOR=red><A NAME="ref_60_29" HREF="terminal_interface-curses-menus-menu_user_data__adb.htm#ref_70_29">Data</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses-menus-menu_user_data__ads.htm#ref_44_9">User_Access</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_userptr.3x.html">menu_userptr</A></EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_3"#2|</EM></FONT>
-+-   <b>function</b> Get_User_Data (Men  : <b>in</b>  Menu) <b>return</b> User_Access;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_64_13" HREF="terminal_interface-curses-menus-menu_user_data__adb.htm#ref_61_13">Get_User_Data</A></FONT> (<FONT COLOR=red><A NAME="ref_64_28" HREF="terminal_interface-curses-menus-menu_user_data__adb.htm#ref_61_28">Men</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>) <b>return</b> <A HREF="terminal_interface-curses-menus-menu_user_data__ads.htm#ref_44_9">User_Access</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_userptr.3x.html">menu_userptr</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  Same as function</EM></FONT>
-+    <b>pragma</b> Inline (Get_User_Data);
-+ 
-+-<b>end</b> Terminal_Interface.Curses.Menus.Menu_User_Data;
-++<b>end</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-menus__ads.htm#ref_49_35">Menus</A>.<A HREF="terminal_interface-curses-menus-menu_user_data__ads.htm#ref_45_41">Menu_User_Data</A>;
-+ </PRE></BODY></HTML>
-+Index: doc/html/ada/terminal_interface-curses-menus__ads.htm
-+--- ncurses-5.6/doc/html/ada/terminal_interface-curses-menus__ads.htm	2006-09-23 20:31:31.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/terminal_interface-curses-menus__ads.htm	2007-09-01 23:56:31.000000000 +0000
-+@@ -3,7 +3,6 @@
-+ <BODY>
-+ <HR><DIV ALIGN="center"><H1> File : terminal_interface-curses-menus.ads </H1></DIV><HR>
-+ <PRE>
-+-
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
-+ <FONT COLOR=green><EM>--                           <A HREF="http://www.gnat.com">GNAT</A> ncurses Binding                           --</EM></FONT>
-+@@ -41,8 +40,8 @@
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ <FONT COLOR=green><EM>--  Author:  Juergen Pfeifer, 1996</EM></FONT>
-+ <FONT COLOR=green><EM>--  Version Control:</EM></FONT>
-+-<FONT COLOR=green><EM>--  @Revision: 1.26 @</EM></FONT>
-+-<FONT COLOR=green><EM>--  @Date: 2006/06/25 14:30:22 @</EM></FONT>
-++<FONT COLOR=green><EM>--  @Revision: 1.27 @</EM></FONT>
-++<FONT COLOR=green><EM>--  @Date: 2007/05/05 20:20:52 @</EM></FONT>
-+ <FONT COLOR=green><EM>--  Binding Version 01.00</EM></FONT>
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ <FONT COLOR=green><EM>--  menu binding.</EM></FONT>
-+@@ -52,90 +51,90 @@
-+ <b>with</b> System;
-+ <b>with</b> Ada.Characters.Latin_1;
-+ 
-+-<b>package</b> Terminal_Interface.Curses.Menus <b>is</b>
-+-   <b>pragma</b> Preelaborate (Terminal_Interface.Curses.Menus);
-++<b>package</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<FONT COLOR=red><A NAME="ref_49_35" HREF="terminal_interface-curses-menus__adb.htm#ref_51_40">Menus</A></FONT> <b>is</b>
-++   <b>pragma</b> Preelaborate (<A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-menus__ads.htm#ref_49_35">Menus</A>);
-+    <b>pragma</b> Linker_Options ("-lmenu");
-+    <b>pragma</b> Linker_Options ("-lncurses");
-+ 
-+    Space : Character <b>renames</b> Ada.Characters.Latin_1.Space;
-+ 
-+-   <b>type</b> <FONT COLOR=red><A NAME="ref_57_9">Item</A></FONT> <b>is</b> <b>private</b>;
-+-   <b>type</b> Menu <b>is</b> <b>private</b>;
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_56_9">Item</A></FONT> <b>is</b> <b>private</b>;
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_57_9">Menu</A></FONT> <b>is</b> <b>private</b>;
-+ 
-+    <FONT COLOR=green><EM>---------------------------</EM></FONT>
-+    <FONT COLOR=green><EM>--  Interface constants  --</EM></FONT>
-+    <FONT COLOR=green><EM>---------------------------</EM></FONT>
-+-   <FONT COLOR=red><A NAME="ref_63_4">Null_Item</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Item</A>;
-+-   Null_Menu : <b>constant</b> Menu;
-++   <FONT COLOR=red><A NAME="ref_62_4">Null_Item</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>;
-++   <FONT COLOR=red><A NAME="ref_63_4">Null_Menu</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+ 
-+-   <b>subtype</b> Menu_Request_Code <b>is</b> Key_Code
-+-     <b>range</b> (Key_Max + 1) .. (Key_Max + 17);
-++   <b>subtype</b> <FONT COLOR=red><A NAME="ref_65_12">Menu_Request_Code</A></FONT> <b>is</b> <A HREF="terminal_interface-curses__ads.htm#ref_68_9">Key_Code</A>
-++     <b>range</b> (<A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 1) .. (<A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 17);
-+ 
-+    <FONT COLOR=green><EM>--  The prefix M_ stands for "Menu Request"</EM></FONT>
-+-   <FONT COLOR=red><A NAME="ref_70_4">M_Left_Item</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 1;
-+-   <FONT COLOR=red><A NAME="ref_71_4">M_Right_Item</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 2;
-+-   <FONT COLOR=red><A NAME="ref_72_4">M_Up_Item</A></FONT>         : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 3;
-+-   <FONT COLOR=red><A NAME="ref_73_4">M_Down_Item</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 4;
-+-   <FONT COLOR=red><A NAME="ref_74_4">M_ScrollUp_Line</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 5;
-+-   <FONT COLOR=red><A NAME="ref_75_4">M_ScrollDown_Line</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 6;
-+-   <FONT COLOR=red><A NAME="ref_76_4">M_ScrollDown_Page</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 7;
-+-   <FONT COLOR=red><A NAME="ref_77_4">M_ScrollUp_Page</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 8;
-+-   <FONT COLOR=red><A NAME="ref_78_4">M_First_Item</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 9;
-+-   <FONT COLOR=red><A NAME="ref_79_4">M_Last_Item</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 10;
-+-   <FONT COLOR=red><A NAME="ref_80_4">M_Next_Item</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 11;
-+-   <FONT COLOR=red><A NAME="ref_81_4">M_Previous_Item</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 12;
-+-   <FONT COLOR=red><A NAME="ref_82_4">M_Toggle_Item</A></FONT>     : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 13;
-+-   <FONT COLOR=red><A NAME="ref_83_4">M_Clear_Pattern</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 14;
-+-   <FONT COLOR=red><A NAME="ref_84_4">M_Back_Pattern</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 15;
-+-   <FONT COLOR=red><A NAME="ref_85_4">M_Next_Match</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 16;
-+-   M_Previous_Match  : <b>constant</b> Menu_Request_Code := Key_Max + 17;
-++   <FONT COLOR=red><A NAME="ref_69_4">M_Left_Item</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 1;
-++   <FONT COLOR=red><A NAME="ref_70_4">M_Right_Item</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 2;
-++   <FONT COLOR=red><A NAME="ref_71_4">M_Up_Item</A></FONT>         : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 3;
-++   <FONT COLOR=red><A NAME="ref_72_4">M_Down_Item</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 4;
-++   <FONT COLOR=red><A NAME="ref_73_4">M_ScrollUp_Line</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 5;
-++   <FONT COLOR=red><A NAME="ref_74_4">M_ScrollDown_Line</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 6;
-++   <FONT COLOR=red><A NAME="ref_75_4">M_ScrollDown_Page</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 7;
-++   <FONT COLOR=red><A NAME="ref_76_4">M_ScrollUp_Page</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 8;
-++   <FONT COLOR=red><A NAME="ref_77_4">M_First_Item</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 9;
-++   <FONT COLOR=red><A NAME="ref_78_4">M_Last_Item</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 10;
-++   <FONT COLOR=red><A NAME="ref_79_4">M_Next_Item</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 11;
-++   <FONT COLOR=red><A NAME="ref_80_4">M_Previous_Item</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 12;
-++   <FONT COLOR=red><A NAME="ref_81_4">M_Toggle_Item</A></FONT>     : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 13;
-++   <FONT COLOR=red><A NAME="ref_82_4">M_Clear_Pattern</A></FONT>   : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 14;
-++   <FONT COLOR=red><A NAME="ref_83_4">M_Back_Pattern</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 15;
-++   <FONT COLOR=red><A NAME="ref_84_4">M_Next_Match</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 16;
-++   <FONT COLOR=red><A NAME="ref_85_4">M_Previous_Match</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> := <A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 17;
-+ 
-+    <FONT COLOR=green><EM>--  For those who like the old 'C' names for the request codes</EM></FONT>
-+-   REQ_LEFT_ITEM     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_70_4">M_Left_Item</A>;
-+-   REQ_RIGHT_ITEM    : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_71_4">M_Right_Item</A>;
-+-   REQ_UP_ITEM       : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_72_4">M_Up_Item</A>;
-+-   REQ_DOWN_ITEM     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_73_4">M_Down_Item</A>;
-+-   REQ_SCR_ULINE     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_74_4">M_ScrollUp_Line</A>;
-+-   REQ_SCR_DLINE     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_75_4">M_ScrollDown_Line</A>;
-+-   REQ_SCR_DPAGE     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_76_4">M_ScrollDown_Page</A>;
-+-   REQ_SCR_UPAGE     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_77_4">M_ScrollUp_Page</A>;
-+-   REQ_FIRST_ITEM    : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_78_4">M_First_Item</A>;
-+-   REQ_LAST_ITEM     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_79_4">M_Last_Item</A>;
-+-   REQ_NEXT_ITEM     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_80_4">M_Next_Item</A>;
-+-   REQ_PREV_ITEM     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_81_4">M_Previous_Item</A>;
-+-   REQ_TOGGLE_ITEM   : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_82_4">M_Toggle_Item</A>;
-+-   REQ_CLEAR_PATTERN : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_83_4">M_Clear_Pattern</A>;
-+-   REQ_BACK_PATTERN  : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_84_4">M_Back_Pattern</A>;
-+-   REQ_NEXT_MATCH    : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_85_4">M_Next_Match</A>;
-+-   REQ_PREV_MATCH    : Menu_Request_Code <b>renames</b> M_Previous_Match;
-++   REQ_LEFT_ITEM     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_69_4">M_Left_Item</A>;
-++   REQ_RIGHT_ITEM    : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_70_4">M_Right_Item</A>;
-++   REQ_UP_ITEM       : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_71_4">M_Up_Item</A>;
-++   REQ_DOWN_ITEM     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_72_4">M_Down_Item</A>;
-++   REQ_SCR_ULINE     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_73_4">M_ScrollUp_Line</A>;
-++   REQ_SCR_DLINE     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_74_4">M_ScrollDown_Line</A>;
-++   REQ_SCR_DPAGE     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_75_4">M_ScrollDown_Page</A>;
-++   REQ_SCR_UPAGE     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_76_4">M_ScrollUp_Page</A>;
-++   REQ_FIRST_ITEM    : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_77_4">M_First_Item</A>;
-++   REQ_LAST_ITEM     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_78_4">M_Last_Item</A>;
-++   REQ_NEXT_ITEM     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_79_4">M_Next_Item</A>;
-++   REQ_PREV_ITEM     : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_80_4">M_Previous_Item</A>;
-++   REQ_TOGGLE_ITEM   : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_81_4">M_Toggle_Item</A>;
-++   REQ_CLEAR_PATTERN : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_82_4">M_Clear_Pattern</A>;
-++   REQ_BACK_PATTERN  : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_83_4">M_Back_Pattern</A>;
-++   REQ_NEXT_MATCH    : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_84_4">M_Next_Match</A>;
-++   REQ_PREV_MATCH    : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_85_4">M_Previous_Match</A>;
-+ 
-+-   <b>procedure</b> Request_Name (<FONT COLOR=red><A NAME="ref_107_28" HREF="terminal_interface-curses-menus__adb.htm#ref_78_28">Key</A></FONT>  : <b>in</b> Menu_Request_Code;
-+-                           Name : <b>out</b> String);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_106_14" HREF="terminal_interface-curses-menus__adb.htm#ref_77_14">Request_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_106_28" HREF="terminal_interface-curses-menus__adb.htm#ref_77_28">Key</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A>;
-++                           <FONT COLOR=red><A NAME="ref_107_28" HREF="terminal_interface-curses-menus__adb.htm#ref_78_28">Name</A></FONT> : <b>out</b> String);
-+ 
-+-   <b>function</b>  Request_Name (Key : Menu_Request_Code) <b>return</b> String;
-++   <b>function</b>  <FONT COLOR=red><A NAME="ref_109_14" HREF="terminal_interface-curses-menus__adb.htm#ref_86_13">Request_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_109_28" HREF="terminal_interface-curses-menus__adb.htm#ref_86_27">Key</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_65_12">Menu_Request_Code</A>) <b>return</b> String;
-+    <FONT COLOR=green><EM>--  Same as function</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>------------------</EM></FONT>
-+    <FONT COLOR=green><EM>--  Exceptions  --</EM></FONT>
-+    <FONT COLOR=green><EM>------------------</EM></FONT>
-+ 
-+-   Menu_Exception : <b>exception</b>;
-++   <FONT COLOR=red><A NAME="ref_116_4">Menu_Exception</A></FONT> : <b>exception</b>;
-+    <FONT COLOR=green><EM>--</EM></FONT>
-+    <FONT COLOR=green><EM>--  Menu options</EM></FONT>
-+    <FONT COLOR=green><EM>--</EM></FONT>
-+    <b>pragma</b> Warnings (Off);
-+-   <b>type</b> Menu_Option_Set <b>is</b>
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_121_9">Menu_Option_Set</A></FONT> <b>is</b>
-+       <b>record</b>
-+-         <FONT COLOR=red><A NAME="ref_124_10">One_Valued</A></FONT>        : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_125_10">Show_Descriptions</A></FONT> : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_126_10">Row_Major_Order</A></FONT>   : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_127_10">Ignore_Case</A></FONT>       : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_128_10">Show_Matches</A></FONT>      : Boolean;
-+-         Non_Cyclic        : Boolean;
-++         <FONT COLOR=red><A NAME="ref_123_10">One_Valued</A></FONT>        : Boolean;
-++         <FONT COLOR=red><A NAME="ref_124_10">Show_Descriptions</A></FONT> : Boolean;
-++         <FONT COLOR=red><A NAME="ref_125_10">Row_Major_Order</A></FONT>   : Boolean;
-++         <FONT COLOR=red><A NAME="ref_126_10">Ignore_Case</A></FONT>       : Boolean;
-++         <FONT COLOR=red><A NAME="ref_127_10">Show_Matches</A></FONT>      : Boolean;
-++         <FONT COLOR=red><A NAME="ref_128_10">Non_Cyclic</A></FONT>        : Boolean;
-+       <b>end</b> <b>record</b>;
-+-   <b>pragma</b> Convention (C, Menu_Option_Set);
-++   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-menus__ads.htm#ref_121_9">Menu_Option_Set</A>);
-+ 
-+-   <b>for</b> Menu_Option_Set <b>use</b>
-++   <b>for</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_121_9">Menu_Option_Set</A> <b>use</b>
-+       <b>record</b>
-+          One_Valued        <b>at</b> 0 <b>range</b>  0 ..  0;
-+          Show_Descriptions <b>at</b> 0 <b>range</b>  1 ..  1;
-+@@ -144,47 +143,47 @@
-+          Show_Matches      <b>at</b> 0 <b>range</b>  4 ..  4;
-+          Non_Cyclic        <b>at</b> 0 <b>range</b>  5 ..  5;
-+       <b>end</b> <b>record</b>;
-+-   <b>for</b> Menu_Option_Set'Size <b>use</b> 32;
-++   <b>for</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_121_9">Menu_Option_Set</A>'Size <b>use</b> 32;
-+    <FONT COLOR=green><EM>--  Please note: this rep. clause is generated and may be</EM></FONT>
-+    <FONT COLOR=green><EM>--               different on your system.</EM></FONT>
-+    <b>pragma</b> Warnings (On);
-+ 
-+-   <b>function</b> Default_Menu_Options <b>return</b> Menu_Option_Set;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_146_13" HREF="terminal_interface-curses-menus__adb.htm#ref_1009_13">Default_Menu_Options</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_121_9">Menu_Option_Set</A>;
-+    <FONT COLOR=green><EM>--  Initial default options for a menu.</EM></FONT>
-+-   <b>pragma</b> Inline (Default_Menu_Options);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_146_13">Default_Menu_Options</A>);
-+    <FONT COLOR=green><EM>--</EM></FONT>
-+    <FONT COLOR=green><EM>--  Item options</EM></FONT>
-+    <FONT COLOR=green><EM>--</EM></FONT>
-+    <b>pragma</b> Warnings (Off);
-+-   <b>type</b> Item_Option_Set <b>is</b>
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_153_9">Item_Option_Set</A></FONT> <b>is</b>
-+       <b>record</b>
-+-         Selectable  : Boolean;
-++         <FONT COLOR=red><A NAME="ref_155_10">Selectable</A></FONT>  : Boolean;
-+       <b>end</b> <b>record</b>;
-+-   <b>pragma</b> Convention (C, Item_Option_Set);
-++   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-menus__ads.htm#ref_153_9">Item_Option_Set</A>);
-+ 
-+-   <b>for</b> Item_Option_Set <b>use</b>
-++   <b>for</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_153_9">Item_Option_Set</A> <b>use</b>
-+       <b>record</b>
-+          Selectable  <b>at</b> 0 <b>range</b>  0 ..  0;
-+       <b>end</b> <b>record</b>;
-+-   <b>for</b> Item_Option_Set'Size <b>use</b> 32;
-++   <b>for</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_153_9">Item_Option_Set</A>'Size <b>use</b> 32;
-+    <FONT COLOR=green><EM>--  Please note: this rep. clause is generated and may be</EM></FONT>
-+    <FONT COLOR=green><EM>--               different on your system.</EM></FONT>
-+    <b>pragma</b> Warnings (On);
-+ 
-+-   <b>function</b> Default_Item_Options <b>return</b> Item_Option_Set;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_168_13" HREF="terminal_interface-curses-menus__adb.htm#ref_1015_13">Default_Item_Options</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_153_9">Item_Option_Set</A>;
-+    <FONT COLOR=green><EM>--  Initial default options for an item.</EM></FONT>
-+-   <b>pragma</b> Inline (Default_Item_Options);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_168_13">Default_Item_Options</A>);
-+ 
-+    <FONT COLOR=green><EM>--</EM></FONT>
-+    <FONT COLOR=green><EM>--  Item Array</EM></FONT>
-+    <FONT COLOR=green><EM>--</EM></FONT>
-+-   <b>type</b> Item_Array <b>is</b> <b>array</b> (Positive <b>range</b> &lt;&gt;) <b>of</b> <b>aliased</b> Item;
-+-   <b>pragma</b> Convention (C, Item_Array);
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_175_9">Item_Array</A></FONT> <b>is</b> <b>array</b> (Positive <b>range</b> &lt;&gt;) <b>of</b> <b>aliased</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>;
-++   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-menus__ads.htm#ref_175_9">Item_Array</A>);
-+ 
-+-   <b>type</b> Item_Array_Access <b>is</b> <b>access</b> Item_Array;
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_178_9">Item_Array_Access</A></FONT> <b>is</b> <b>access</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_175_9">Item_Array</A>;
-+ 
-+-   <b>procedure</b> Free (<FONT COLOR=red><A NAME="ref_181_20" HREF="terminal_interface-curses-menus__adb.htm#ref_993_20">IA</A></FONT>         : <b>in</b> <b>out</b> Item_Array_Access;
-+-                   Free_Items : Boolean := False);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_180_14" HREF="terminal_interface-curses-menus__adb.htm#ref_992_14">Free</A></FONT> (<FONT COLOR=red><A NAME="ref_180_20" HREF="terminal_interface-curses-menus__adb.htm#ref_992_20">IA</A></FONT>         : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_178_9">Item_Array_Access</A>;
-++                   <FONT COLOR=red><A NAME="ref_181_20" HREF="terminal_interface-curses-menus__adb.htm#ref_993_20">Free_Items</A></FONT> : Boolean := False);
-+    <FONT COLOR=green><EM>--  Release the memory for an allocated item array</EM></FONT>
-+    <FONT COLOR=green><EM>--  If Free_Items is True, call Delete() for all the items in</EM></FONT>
-+    <FONT COLOR=green><EM>--  the array.</EM></FONT>
-+@@ -194,19 +193,19 @@
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_1"#2|</EM></FONT>
-+-   <b>function</b> Create (<FONT COLOR=red><A NAME="ref_192_21" HREF="terminal_interface-curses-menus__adb.htm#ref_95_21">Name</A></FONT>        : String;
-+-                    Description : String := "") <b>return</b> Item;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_191_13" HREF="terminal_interface-curses-menus__adb.htm#ref_94_13">Create</A></FONT> (<FONT COLOR=red><A NAME="ref_191_21" HREF="terminal_interface-curses-menus__adb.htm#ref_94_21">Name</A></FONT>        : String;
-++                    <FONT COLOR=red><A NAME="ref_192_21" HREF="terminal_interface-curses-menus__adb.htm#ref_95_21">Description</A></FONT> : String := "") <b>return</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_new.3x.html">new_item()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  Not inlined.</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_2"#2|</EM></FONT>
-+-   <b>function</b> New_Item (<FONT COLOR=red><A NAME="ref_198_23">Name</A></FONT>        : String;
-+-             <A HREF="terminal_interface-curses-menus__ads.htm#ref_191_13"> </A>        Description : String := "") <b>return</b> Item
-+-     <b>renames</b> Create;
-++   <b>function</b> New_Item (<FONT COLOR=red><A NAME="ref_197_23">Name</A></FONT>        : String;
-++                      <FONT COLOR=red><A NAME="ref_198_23">Description</A></FONT> : String := "") <b>return</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>
-++     <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_191_13">Create</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_new.3x.html">new_item()</A></EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_3"#2|</EM></FONT>
-+-   <b>procedure</b> Delete (Itm : <b>in</b> <b>out</b> Item);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_203_14" HREF="terminal_interface-curses-menus__adb.htm#ref_124_14">Delete</A></FONT> (<FONT COLOR=red><A NAME="ref_203_22" HREF="terminal_interface-curses-menus__adb.htm#ref_124_22">Itm</A></FONT> : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_new.3x.html">free_item()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  Resets Itm to Null_Item</EM></FONT>
-+ 
-+@@ -215,51 +214,51 @@
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_4"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Value (<FONT COLOR=red><A NAME="ref_213_25" HREF="terminal_interface-curses-menus__adb.htm#ref_153_25">Itm</A></FONT>   : <b>in</b> Item;
-+-                        Value : <b>in</b> Boolean := True);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_212_14" HREF="terminal_interface-curses-menus__adb.htm#ref_152_14">Set_Value</A></FONT> (<FONT COLOR=red><A NAME="ref_212_25" HREF="terminal_interface-curses-menus__adb.htm#ref_152_25">Itm</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>;
-++                        <FONT COLOR=red><A NAME="ref_213_25" HREF="terminal_interface-curses-menus__adb.htm#ref_153_25">Value</A></FONT> : <b>in</b> Boolean := True);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_value.3x.html">set_item_value()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Value);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_212_14">Set_Value</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_5"#2|</EM></FONT>
-+-   <b>function</b> Value (Itm : Item) <b>return</b> Boolean;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_218_13" HREF="terminal_interface-curses-menus__adb.htm#ref_166_13">Value</A></FONT> (<FONT COLOR=red><A NAME="ref_218_20" HREF="terminal_interface-curses-menus__adb.htm#ref_166_20">Itm</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>) <b>return</b> Boolean;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_value.3x.html">item_value()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Value);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_218_13">Value</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/mitem_visible.3x.html">mitem_visible.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_6"#2|</EM></FONT>
-+-   <b>function</b> Visible (Itm : Item) <b>return</b> Boolean;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_227_13" HREF="terminal_interface-curses-menus__adb.htm#ref_179_13">Visible</A></FONT> (<FONT COLOR=red><A NAME="ref_227_22" HREF="terminal_interface-curses-menus__adb.htm#ref_179_22">Itm</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>) <b>return</b> Boolean;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_visible.3x.html">item_visible()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Visible);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_227_13">Visible</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/mitem_opts.3x.html">mitem_opts.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_7"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Options (<FONT COLOR=red><A NAME="ref_237_27" HREF="terminal_interface-curses-menus__adb.htm#ref_192_27">Itm</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_153_9">Item</A>;
-+-                          Options : <b>in</b> Item_Option_Set);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_236_14" HREF="terminal_interface-curses-menus__adb.htm#ref_191_14">Set_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_236_27" HREF="terminal_interface-curses-menus__adb.htm#ref_191_27">Itm</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>;
-++                          <FONT COLOR=red><A NAME="ref_237_27" HREF="terminal_interface-curses-menus__adb.htm#ref_192_27">Options</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_153_9">Item_Option_Set</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_opts.3x.html">set_item_opts()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  An overloaded Set_Options is defined later. Pragma Inline appears there</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_8"#2|</EM></FONT>
-+-   <b>procedure</b> Switch_Options (<FONT COLOR=red><A NAME="ref_243_30" HREF="terminal_interface-curses-menus__adb.htm#ref_208_30">Itm</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_153_9">Item</A>;
-+-                             <FONT COLOR=red><A NAME="ref_244_30" HREF="terminal_interface-curses-menus__adb.htm#ref_209_30">Options</A></FONT> : <b>in</b> Item_Option_Set;
-+-                             On      : Boolean := True);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_242_14" HREF="terminal_interface-curses-menus__adb.htm#ref_207_14">Switch_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_242_30" HREF="terminal_interface-curses-menus__adb.htm#ref_207_30">Itm</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>;
-++                             <FONT COLOR=red><A NAME="ref_243_30" HREF="terminal_interface-curses-menus__adb.htm#ref_208_30">Options</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_153_9">Item_Option_Set</A>;
-++                             <FONT COLOR=red><A NAME="ref_244_30" HREF="terminal_interface-curses-menus__adb.htm#ref_209_30">On</A></FONT>      : Boolean := True);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_opts.3x.html">item_opts_on()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: item_opts_off()</EM></FONT>
-+    <FONT COLOR=green><EM>--  An overloaded Switch_Options is defined later.</EM></FONT>
-+    <FONT COLOR=green><EM>--  Pragma Inline appears there</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_9"#2|</EM></FONT>
-+-   <b>procedure</b> Get_Options (<FONT COLOR=red><A NAME="ref_252_27" HREF="terminal_interface-curses-menus__adb.htm#ref_232_27">Itm</A></FONT>     : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_153_9">Item</A>;
-+-                          Options : <b>out</b> Item_Option_Set);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_251_14" HREF="terminal_interface-curses-menus__adb.htm#ref_231_14">Get_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_251_27" HREF="terminal_interface-curses-menus__adb.htm#ref_231_27">Itm</A></FONT>     : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>;
-++                          <FONT COLOR=red><A NAME="ref_252_27" HREF="terminal_interface-curses-menus__adb.htm#ref_232_27">Options</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_153_9">Item_Option_Set</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_opts.3x.html">item_opts()</A></EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_10"#2|</EM></FONT>
-+-   <b>function</b> Get_Options (Itm : Item := Null_Item) <b>return</b> Item_Option_Set;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_256_13" HREF="terminal_interface-curses-menus__adb.htm#ref_242_13">Get_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_256_26" HREF="terminal_interface-curses-menus__adb.htm#ref_242_26">Itm</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A> := <A HREF="terminal_interface-curses-menus__ads.htm#ref_62_4">Null_Item</A>) <b>return</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_153_9">Item_Option_Set</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_opts.3x.html">item_opts()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  An overloaded Get_Options is defined later. Pragma Inline appears there</EM></FONT>
-+ 
-+@@ -268,20 +267,20 @@
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_11"#2|</EM></FONT>
-+-   <b>procedure</b> Name (<FONT COLOR=red><A NAME="ref_266_20" HREF="terminal_interface-curses-menus__adb.htm#ref_251_20">Itm</A></FONT>  : <b>in</b> Item;
-+-                   Name : <b>out</b> String);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_265_14" HREF="terminal_interface-curses-menus__adb.htm#ref_250_14">Name</A></FONT> (<FONT COLOR=red><A NAME="ref_265_20" HREF="terminal_interface-curses-menus__adb.htm#ref_250_20">Itm</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>;
-++                   <FONT COLOR=red><A NAME="ref_266_20" HREF="terminal_interface-curses-menus__adb.htm#ref_251_20">Name</A></FONT> : <b>out</b> String);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_name.3x.html">item_name()</A></EM></FONT>
-+-   <b>function</b>  Name (Itm : Item) <b>return</b> String;
-++   <b>function</b>  <FONT COLOR=red><A NAME="ref_268_14" HREF="terminal_interface-curses-menus__adb.htm#ref_259_13">Name</A></FONT> (<FONT COLOR=red><A NAME="ref_268_20" HREF="terminal_interface-curses-menus__adb.htm#ref_259_19">Itm</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>) <b>return</b> String;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_name.3x.html">item_name()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  Implemented as function</EM></FONT>
-+    <b>pragma</b> Inline (Name);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_12"#2|</EM></FONT>
-+-   <b>procedure</b> Description (<FONT COLOR=red><A NAME="ref_275_27" HREF="terminal_interface-curses-menus__adb.htm#ref_268_27">Itm</A></FONT>         : <b>in</b> Item;
-+-                          Description : <b>out</b> String);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_274_14" HREF="terminal_interface-curses-menus__adb.htm#ref_267_14">Description</A></FONT> (<FONT COLOR=red><A NAME="ref_274_27" HREF="terminal_interface-curses-menus__adb.htm#ref_267_27">Itm</A></FONT>         : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>;
-++                          <FONT COLOR=red><A NAME="ref_275_27" HREF="terminal_interface-curses-menus__adb.htm#ref_268_27">Description</A></FONT> : <b>out</b> String);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_name.3x.html">item_description();</A></EM></FONT>
-+ 
-+-   <b>function</b>  Description (Itm : Item) <b>return</b> String;
-++   <b>function</b>  <FONT COLOR=red><A NAME="ref_278_14" HREF="terminal_interface-curses-menus__adb.htm#ref_276_13">Description</A></FONT> (<FONT COLOR=red><A NAME="ref_278_27" HREF="terminal_interface-curses-menus__adb.htm#ref_276_26">Itm</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>) <b>return</b> String;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_name.3x.html">item_description();</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  Implemented as function</EM></FONT>
-+    <b>pragma</b> Inline (Description);
-+@@ -291,71 +290,71 @@
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_13"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Current (<FONT COLOR=red><A NAME="ref_289_27" HREF="terminal_interface-curses-menus__adb.htm#ref_285_27">Men</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Menu</A>;
-+-                          Itm : <b>in</b> Item);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_288_14" HREF="terminal_interface-curses-menus__adb.htm#ref_284_14">Set_Current</A></FONT> (<FONT COLOR=red><A NAME="ref_288_27" HREF="terminal_interface-curses-menus__adb.htm#ref_284_27">Men</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                          <FONT COLOR=red><A NAME="ref_289_27" HREF="terminal_interface-curses-menus__adb.htm#ref_285_27">Itm</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_current.3x.html">set_current_item()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Current);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_288_14">Set_Current</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_14"#2|</EM></FONT>
-+-   <b>function</b> Current (Men : Menu) <b>return</b> Item;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_294_13" HREF="terminal_interface-curses-menus__adb.htm#ref_298_13">Current</A></FONT> (<FONT COLOR=red><A NAME="ref_294_22" HREF="terminal_interface-curses-menus__adb.htm#ref_298_22">Men</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>) <b>return</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_current.3x.html">current_item()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Current);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_294_13">Current</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_15"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Top_Row (<FONT COLOR=red><A NAME="ref_300_27" HREF="terminal_interface-curses-menus__adb.htm#ref_312_27">Men</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Menu</A>;
-+-                          Line : <b>in</b> Line_Position);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_299_14" HREF="terminal_interface-curses-menus__adb.htm#ref_311_14">Set_Top_Row</A></FONT> (<FONT COLOR=red><A NAME="ref_299_27" HREF="terminal_interface-curses-menus__adb.htm#ref_311_27">Men</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                          <FONT COLOR=red><A NAME="ref_300_27" HREF="terminal_interface-curses-menus__adb.htm#ref_312_27">Line</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_current.3x.html">set_top_row()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Top_Row);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_299_14">Set_Top_Row</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_16"#2|</EM></FONT>
-+-   <b>function</b> Top_Row (Men : Menu) <b>return</b> Line_Position;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_305_13" HREF="terminal_interface-curses-menus__adb.htm#ref_325_13">Top_Row</A></FONT> (<FONT COLOR=red><A NAME="ref_305_22" HREF="terminal_interface-curses-menus__adb.htm#ref_325_22">Men</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_current.3x.html">top_row()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Top_Row);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_305_13">Top_Row</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_17"#2|</EM></FONT>
-+-   <b>function</b> Get_Index (Itm : Item) <b>return</b> Positive;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_310_13" HREF="terminal_interface-curses-menus__adb.htm#ref_338_13">Get_Index</A></FONT> (<FONT COLOR=red><A NAME="ref_310_24" HREF="terminal_interface-curses-menus__adb.htm#ref_338_24">Itm</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>) <b>return</b> Positive;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/mitem_current.3x.html">item_index()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  Please note that in this binding we start the numbering of items</EM></FONT>
-+    <FONT COLOR=green><EM>--  with 1. So this is number is one more than you get from the low</EM></FONT>
-+    <FONT COLOR=green><EM>--  level call.</EM></FONT>
-+-   <b>pragma</b> Inline (Get_Index);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_310_13">Get_Index</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/menu_post.3x.html">menu_post.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_18"#2|</EM></FONT>
-+-   <b>procedure</b> Post (<FONT COLOR=red><A NAME="ref_323_20" HREF="terminal_interface-curses-menus__adb.htm#ref_352_20">Men</A></FONT>  : <b>in</b> Menu;
-+-                   Post : <b>in</b> Boolean := True);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_322_14" HREF="terminal_interface-curses-menus__adb.htm#ref_351_14">Post</A></FONT> (<FONT COLOR=red><A NAME="ref_322_20" HREF="terminal_interface-curses-menus__adb.htm#ref_351_20">Men</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                   <FONT COLOR=red><A NAME="ref_323_20" HREF="terminal_interface-curses-menus__adb.htm#ref_352_20">Post</A></FONT> : <b>in</b> Boolean := True);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_post.3x.html">post_menu()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: unpost_menu()</EM></FONT>
-+-   <b>pragma</b> Inline (Post);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_322_14">Post</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/menu_opts.3x.html">menu_opts.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_19"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Options (<FONT COLOR=red><A NAME="ref_334_27" HREF="terminal_interface-curses-menus__adb.htm#ref_372_27">Men</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_121_9">Menu</A>;
-+-                          Options : <b>in</b> Menu_Option_Set);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_333_14" HREF="terminal_interface-curses-menus__adb.htm#ref_371_14">Set_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_333_27" HREF="terminal_interface-curses-menus__adb.htm#ref_371_27">Men</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                          <FONT COLOR=red><A NAME="ref_334_27" HREF="terminal_interface-curses-menus__adb.htm#ref_372_27">Options</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_121_9">Menu_Option_Set</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_opts.3x.html">set_menu_opts()</A></EM></FONT>
-+    <b>pragma</b> Inline (Set_Options);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_20"#2|</EM></FONT>
-+-   <b>procedure</b> Switch_Options (<FONT COLOR=red><A NAME="ref_340_30" HREF="terminal_interface-curses-menus__adb.htm#ref_388_30">Men</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_121_9">Menu</A>;
-+-                             <FONT COLOR=red><A NAME="ref_341_30" HREF="terminal_interface-curses-menus__adb.htm#ref_389_30">Options</A></FONT> : <b>in</b> Menu_Option_Set;
-+-                             On      : Boolean := True);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_339_14" HREF="terminal_interface-curses-menus__adb.htm#ref_387_14">Switch_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_339_30" HREF="terminal_interface-curses-menus__adb.htm#ref_387_30">Men</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                             <FONT COLOR=red><A NAME="ref_340_30" HREF="terminal_interface-curses-menus__adb.htm#ref_388_30">Options</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_121_9">Menu_Option_Set</A>;
-++                             <FONT COLOR=red><A NAME="ref_341_30" HREF="terminal_interface-curses-menus__adb.htm#ref_389_30">On</A></FONT>      : Boolean := True);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_opts.3x.html">menu_opts_on()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: menu_opts_off()</EM></FONT>
-+    <b>pragma</b> Inline (Switch_Options);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_21"#2|</EM></FONT>
-+-   <b>procedure</b> Get_Options (<FONT COLOR=red><A NAME="ref_348_27" HREF="terminal_interface-curses-menus__adb.htm#ref_412_32">Men</A></FONT>     : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_121_9">Menu</A>;
-+-                          Options : <b>out</b> Menu_Option_Set);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_347_14" HREF="terminal_interface-curses-menus__adb.htm#ref_411_14">Get_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_347_27" HREF="terminal_interface-curses-menus__adb.htm#ref_411_27">Men</A></FONT>     : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                          <FONT COLOR=red><A NAME="ref_348_27" HREF="terminal_interface-curses-menus__adb.htm#ref_412_32">Options</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_121_9">Menu_Option_Set</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_opts.3x.html">menu_opts()</A></EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_22"#2|</EM></FONT>
-+-   <b>function</b> Get_Options (Men : Menu := Null_Menu) <b>return</b> Menu_Option_Set;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_352_13" HREF="terminal_interface-curses-menus__adb.htm#ref_422_13">Get_Options</A></FONT> (<FONT COLOR=red><A NAME="ref_352_26" HREF="terminal_interface-curses-menus__adb.htm#ref_422_26">Men</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A> := <A HREF="terminal_interface-curses-menus__ads.htm#ref_63_4">Null_Menu</A>) <b>return</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_121_9">Menu_Option_Set</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_opts.3x.html">menu_opts()</A></EM></FONT>
-+    <b>pragma</b> Inline (Get_Options);
-+ 
-+@@ -364,185 +363,185 @@
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_23"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Window (<FONT COLOR=red><A NAME="ref_362_26" HREF="terminal_interface-curses-menus__adb.htm#ref_431_26">Men</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Menu</A>;
-+-                         Win : <b>in</b> Window);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_361_14" HREF="terminal_interface-curses-menus__adb.htm#ref_430_14">Set_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_361_26" HREF="terminal_interface-curses-menus__adb.htm#ref_430_26">Men</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                         <FONT COLOR=red><A NAME="ref_362_26" HREF="terminal_interface-curses-menus__adb.htm#ref_431_26">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_win.3x.html">set_menu_win()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Window);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_361_14">Set_Window</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_24"#2|</EM></FONT>
-+-   <b>function</b> Get_Window (Men : Menu) <b>return</b> Window;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_367_13" HREF="terminal_interface-curses-menus__adb.htm#ref_444_13">Get_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_367_25" HREF="terminal_interface-curses-menus__adb.htm#ref_444_25">Men</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_win.3x.html">menu_win()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Get_Window);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_367_13">Get_Window</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_25"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Sub_Window (<FONT COLOR=red><A NAME="ref_373_30" HREF="terminal_interface-curses-menus__adb.htm#ref_455_30">Men</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Menu</A>;
-+-                             Win : <b>in</b> Window);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_372_14" HREF="terminal_interface-curses-menus__adb.htm#ref_454_14">Set_Sub_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_372_30" HREF="terminal_interface-curses-menus__adb.htm#ref_454_30">Men</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                             <FONT COLOR=red><A NAME="ref_373_30" HREF="terminal_interface-curses-menus__adb.htm#ref_455_30">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_win.3x.html">set_menu_sub()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Sub_Window);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_372_14">Set_Sub_Window</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_26"#2|</EM></FONT>
-+-   <b>function</b> Get_Sub_Window (Men : Menu) <b>return</b> Window;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_378_13" HREF="terminal_interface-curses-menus__adb.htm#ref_468_13">Get_Sub_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_378_29" HREF="terminal_interface-curses-menus__adb.htm#ref_468_29">Men</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_win.3x.html">menu_sub()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Get_Sub_Window);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_378_13">Get_Sub_Window</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_27"#2|</EM></FONT>
-+-   <b>procedure</b> Scale (<FONT COLOR=red><A NAME="ref_384_21" HREF="terminal_interface-curses-menus__adb.htm#ref_479_21">Men</A></FONT>     : <b>in</b> Menu;
-+-                    <FONT COLOR=red><A NAME="ref_385_21" HREF="terminal_interface-curses-menus__adb.htm#ref_480_21">Lines</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
-+-                    Columns : <b>out</b> Column_Count);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_383_14" HREF="terminal_interface-curses-menus__adb.htm#ref_478_14">Scale</A></FONT> (<FONT COLOR=red><A NAME="ref_383_21" HREF="terminal_interface-curses-menus__adb.htm#ref_478_21">Men</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                    <FONT COLOR=red><A NAME="ref_384_21" HREF="terminal_interface-curses-menus__adb.htm#ref_479_21">Lines</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-++                    <FONT COLOR=red><A NAME="ref_385_21" HREF="terminal_interface-curses-menus__adb.htm#ref_480_21">Columns</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_win.3x.html">scale_menu()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Scale);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_383_14">Scale</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/menu_cursor.3x.html">menu_cursor.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_28"#2|</EM></FONT>
-+-   <b>procedure</b> Position_Cursor (Men : Menu);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_394_14" HREF="terminal_interface-curses-menus__adb.htm#ref_497_14">Position_Cursor</A></FONT> (<FONT COLOR=red><A NAME="ref_394_31" HREF="terminal_interface-curses-menus__adb.htm#ref_497_31">Men</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_cursor.3x.html">pos_menu_cursor()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Position_Cursor);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_394_14">Position_Cursor</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/menu_mark.3x.html">menu_mark.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_29"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Mark (<FONT COLOR=red><A NAME="ref_404_24" HREF="terminal_interface-curses-menus__adb.htm#ref_511_24">Men</A></FONT>  : <b>in</b> Menu;
-+-                       Mark : <b>in</b> String);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_403_14" HREF="terminal_interface-curses-menus__adb.htm#ref_510_14">Set_Mark</A></FONT> (<FONT COLOR=red><A NAME="ref_403_24" HREF="terminal_interface-curses-menus__adb.htm#ref_510_24">Men</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                       <FONT COLOR=red><A NAME="ref_404_24" HREF="terminal_interface-curses-menus__adb.htm#ref_511_24">Mark</A></FONT> : <b>in</b> String);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_mark.3x.html">set_menu_mark()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Mark);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_403_14">Set_Mark</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_30"#2|</EM></FONT>
-+-   <b>procedure</b> Mark (<FONT COLOR=red><A NAME="ref_410_20" HREF="terminal_interface-curses-menus__adb.htm#ref_530_20">Men</A></FONT>  : <b>in</b>  Menu;
-+-                   Mark : <b>out</b> String);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_409_14" HREF="terminal_interface-curses-menus__adb.htm#ref_529_14">Mark</A></FONT> (<FONT COLOR=red><A NAME="ref_409_20" HREF="terminal_interface-curses-menus__adb.htm#ref_529_20">Men</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                   <FONT COLOR=red><A NAME="ref_410_20" HREF="terminal_interface-curses-menus__adb.htm#ref_530_20">Mark</A></FONT> : <b>out</b> String);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_mark.3x.html">menu_mark()</A></EM></FONT>
-+ 
-+-   <b>function</b>  Mark (Men : Menu) <b>return</b> String;
-++   <b>function</b>  <FONT COLOR=red><A NAME="ref_413_14" HREF="terminal_interface-curses-menus__adb.htm#ref_538_13">Mark</A></FONT> (<FONT COLOR=red><A NAME="ref_413_20" HREF="terminal_interface-curses-menus__adb.htm#ref_538_19">Men</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>) <b>return</b> String;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_mark.3x.html">menu_mark()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  Implemented as function</EM></FONT>
-+    <b>pragma</b> Inline (Mark);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+-   <FONT COLOR=green><EM>--  | Man page <A HREF="../man/menu_attribs.3x.html">menu_attribs.3x</A></EM></FONT>
-++   <FONT COLOR=green><EM>--  | Man page <A HREF="../man/menu_attributes.3x.html">menu_attributes.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_31"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Foreground
-+-     (<FONT COLOR=red><A NAME="ref_425_7" HREF="terminal_interface-curses-menus__adb.htm#ref_549_7">Men</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Menu</A>;
-+-      <FONT COLOR=red><A NAME="ref_426_7" HREF="terminal_interface-curses-menus__adb.htm#ref_550_7">Fore</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character_Attribute_Set</A> := Normal_Video;
-+-      Color : <b>in</b> Color_Pair := Color_Pair'First);
-+-   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attribs.3x.html">set_menu_fore()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Foreground);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_423_14" HREF="terminal_interface-curses-menus__adb.htm#ref_547_14">Set_Foreground</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_424_7" HREF="terminal_interface-curses-menus__adb.htm#ref_548_7">Men</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++      <FONT COLOR=red><A NAME="ref_425_7" HREF="terminal_interface-curses-menus__adb.htm#ref_549_7">Fore</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-++      <FONT COLOR=red><A NAME="ref_426_7" HREF="terminal_interface-curses-menus__adb.htm#ref_550_7">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First);
-++   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attributes.3x.html">set_menu_fore()</A></EM></FONT>
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_423_14">Set_Foreground</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_32"#2|</EM></FONT>
-+-   <b>procedure</b> Foreground (<FONT COLOR=red><A NAME="ref_432_26" HREF="terminal_interface-curses-menus__adb.htm#ref_567_26">Men</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Menu</A>;
-+-                         Fore  : <b>out</b> Character_Attribute_Set);
-+-   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attribs.3x.html">menu_fore()</A></EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_431_14" HREF="terminal_interface-curses-menus__adb.htm#ref_566_14">Foreground</A></FONT> (<FONT COLOR=red><A NAME="ref_431_26" HREF="terminal_interface-curses-menus__adb.htm#ref_566_26">Men</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                         <FONT COLOR=red><A NAME="ref_432_26" HREF="terminal_interface-curses-menus__adb.htm#ref_567_26">Fore</A></FONT>  : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>);
-++   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attributes.3x.html">menu_fore()</A></EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_33"#2|</EM></FONT>
-+-   <b>procedure</b> Foreground (<FONT COLOR=red><A NAME="ref_437_26" HREF="terminal_interface-curses-menus__adb.htm#ref_576_26">Men</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Menu</A>;
-+-                         <FONT COLOR=red><A NAME="ref_438_26" HREF="terminal_interface-curses-menus__adb.htm#ref_577_26">Fore</A></FONT>  : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character_Attribute_Set</A>;
-+-                         Color : <b>out</b> Color_Pair);
-+-   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attribs.3x.html">menu_fore()</A></EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_436_14" HREF="terminal_interface-curses-menus__adb.htm#ref_575_14">Foreground</A></FONT> (<FONT COLOR=red><A NAME="ref_436_26" HREF="terminal_interface-curses-menus__adb.htm#ref_575_26">Men</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                         <FONT COLOR=red><A NAME="ref_437_26" HREF="terminal_interface-curses-menus__adb.htm#ref_576_26">Fore</A></FONT>  : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>;
-++                         <FONT COLOR=red><A NAME="ref_438_26" HREF="terminal_interface-curses-menus__adb.htm#ref_577_26">Color</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>);
-++   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attributes.3x.html">menu_fore()</A></EM></FONT>
-+    <b>pragma</b> Inline (Foreground);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_34"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Background
-+-     (<FONT COLOR=red><A NAME="ref_445_7" HREF="terminal_interface-curses-menus__adb.htm#ref_588_7">Men</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Menu</A>;
-+-      <FONT COLOR=red><A NAME="ref_446_7" HREF="terminal_interface-curses-menus__adb.htm#ref_589_7">Back</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character_Attribute_Set</A> := Normal_Video;
-+-      Color : <b>in</b> Color_Pair := Color_Pair'First);
-+-   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attribs.3x.html">set_menu_back()</A></EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_443_14" HREF="terminal_interface-curses-menus__adb.htm#ref_586_14">Set_Background</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_444_7" HREF="terminal_interface-curses-menus__adb.htm#ref_587_7">Men</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++      <FONT COLOR=red><A NAME="ref_445_7" HREF="terminal_interface-curses-menus__adb.htm#ref_588_7">Back</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-++      <FONT COLOR=red><A NAME="ref_446_7" HREF="terminal_interface-curses-menus__adb.htm#ref_589_7">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First);
-++   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attributes.3x.html">set_menu_back()</A></EM></FONT>
-+    <b>pragma</b> Inline (Set_Background);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_35"#2|</EM></FONT>
-+-   <b>procedure</b> Background (<FONT COLOR=red><A NAME="ref_452_26" HREF="terminal_interface-curses-menus__adb.htm#ref_606_26">Men</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Menu</A>;
-+-                         Back : <b>out</b> Character_Attribute_Set);
-+-   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attribs.3x.html">menu_back()</A></EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_451_14" HREF="terminal_interface-curses-menus__adb.htm#ref_605_14">Background</A></FONT> (<FONT COLOR=red><A NAME="ref_451_26" HREF="terminal_interface-curses-menus__adb.htm#ref_605_26">Men</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                         <FONT COLOR=red><A NAME="ref_452_26" HREF="terminal_interface-curses-menus__adb.htm#ref_606_26">Back</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>);
-++   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attributes.3x.html">menu_back()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_36"#2|</EM></FONT>
-+ 
-+-   <b>procedure</b> Background (<FONT COLOR=red><A NAME="ref_457_26" HREF="terminal_interface-curses-menus__adb.htm#ref_615_26">Men</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Menu</A>;
-+-                         <FONT COLOR=red><A NAME="ref_458_26" HREF="terminal_interface-curses-menus__adb.htm#ref_616_26">Back</A></FONT>  : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character_Attribute_Set</A>;
-+-                         Color : <b>out</b> Color_Pair);
-+-   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attribs.3x.html">menu_back()</A></EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_456_14" HREF="terminal_interface-curses-menus__adb.htm#ref_614_14">Background</A></FONT> (<FONT COLOR=red><A NAME="ref_456_26" HREF="terminal_interface-curses-menus__adb.htm#ref_614_26">Men</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                         <FONT COLOR=red><A NAME="ref_457_26" HREF="terminal_interface-curses-menus__adb.htm#ref_615_26">Back</A></FONT>  : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>;
-++                         <FONT COLOR=red><A NAME="ref_458_26" HREF="terminal_interface-curses-menus__adb.htm#ref_616_26">Color</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>);
-++   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attributes.3x.html">menu_back()</A></EM></FONT>
-+    <b>pragma</b> Inline (Background);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_37"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Grey
-+-     (<FONT COLOR=red><A NAME="ref_465_7" HREF="terminal_interface-curses-menus__adb.htm#ref_626_24">Men</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Menu</A>;
-+-      <FONT COLOR=red><A NAME="ref_466_7" HREF="terminal_interface-curses-menus__adb.htm#ref_627_24">Grey</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character_Attribute_Set</A> := Normal_Video;
-+-      Color : <b>in</b> Color_Pair := Color_Pair'First);
-+-   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attribs.3x.html">set_menu_grey()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Grey);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_463_14" HREF="terminal_interface-curses-menus__adb.htm#ref_625_14">Set_Grey</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_464_7" HREF="terminal_interface-curses-menus__adb.htm#ref_625_24">Men</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++      <FONT COLOR=red><A NAME="ref_465_7" HREF="terminal_interface-curses-menus__adb.htm#ref_626_24">Grey</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-++      <FONT COLOR=red><A NAME="ref_466_7" HREF="terminal_interface-curses-menus__adb.htm#ref_627_24">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First);
-++   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attributes.3x.html">set_menu_grey()</A></EM></FONT>
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_463_14">Set_Grey</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_38"#2|</EM></FONT>
-+-   <b>procedure</b> Grey (<FONT COLOR=red><A NAME="ref_472_20" HREF="terminal_interface-curses-menus__adb.htm#ref_645_20">Men</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Menu</A>;
-+-                   Grey : <b>out</b> Character_Attribute_Set);
-+-   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attribs.3x.html">menu_grey()</A></EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_471_14" HREF="terminal_interface-curses-menus__adb.htm#ref_644_14">Grey</A></FONT> (<FONT COLOR=red><A NAME="ref_471_20" HREF="terminal_interface-curses-menus__adb.htm#ref_644_20">Men</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                   <FONT COLOR=red><A NAME="ref_472_20" HREF="terminal_interface-curses-menus__adb.htm#ref_645_20">Grey</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>);
-++   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attributes.3x.html">menu_grey()</A></EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_39"#2|</EM></FONT>
-+-   <b>procedure</b> Grey
-+-     (<FONT COLOR=red><A NAME="ref_478_7" HREF="terminal_interface-curses-menus__adb.htm#ref_654_20">Men</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Menu</A>;
-+-      <FONT COLOR=red><A NAME="ref_479_7" HREF="terminal_interface-curses-menus__adb.htm#ref_655_20">Grey</A></FONT>  : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character_Attribute_Set</A>;
-+-      Color : <b>out</b> Color_Pair);
-+-   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attribs.3x.html">menu_grey()</A></EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_476_14" HREF="terminal_interface-curses-menus__adb.htm#ref_653_14">Grey</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_477_7" HREF="terminal_interface-curses-menus__adb.htm#ref_653_20">Men</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++      <FONT COLOR=red><A NAME="ref_478_7" HREF="terminal_interface-curses-menus__adb.htm#ref_654_20">Grey</A></FONT>  : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>;
-++      <FONT COLOR=red><A NAME="ref_479_7" HREF="terminal_interface-curses-menus__adb.htm#ref_655_20">Color</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>);
-++   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attributes.3x.html">menu_grey()</A></EM></FONT>
-+    <b>pragma</b> Inline (Grey);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_40"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Pad_Character (<FONT COLOR=red><A NAME="ref_485_33" HREF="terminal_interface-curses-menus__adb.htm#ref_665_33">Men</A></FONT> : <b>in</b> Menu;
-+-                                Pad : <b>in</b> Character := Space);
-+-   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attribs.3x.html">set_menu_pad()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Pad_Character);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_484_14" HREF="terminal_interface-curses-menus__adb.htm#ref_664_14">Set_Pad_Character</A></FONT> (<FONT COLOR=red><A NAME="ref_484_33" HREF="terminal_interface-curses-menus__adb.htm#ref_664_33">Men</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                                <FONT COLOR=red><A NAME="ref_485_33" HREF="terminal_interface-curses-menus__adb.htm#ref_665_33">Pad</A></FONT> : <b>in</b> Character := Space);
-++   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attributes.3x.html">set_menu_pad()</A></EM></FONT>
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_484_14">Set_Pad_Character</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_41"#2|</EM></FONT>
-+-   <b>procedure</b> Pad_Character (<FONT COLOR=red><A NAME="ref_491_29" HREF="terminal_interface-curses-menus__adb.htm#ref_680_29">Men</A></FONT> : <b>in</b>  Menu;
-+-                            Pad : <b>out</b> Character);
-+-   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attribs.3x.html">menu_pad()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Pad_Character);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_490_14" HREF="terminal_interface-curses-menus__adb.htm#ref_679_14">Pad_Character</A></FONT> (<FONT COLOR=red><A NAME="ref_490_29" HREF="terminal_interface-curses-menus__adb.htm#ref_679_29">Men</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                            <FONT COLOR=red><A NAME="ref_491_29" HREF="terminal_interface-curses-menus__adb.htm#ref_680_29">Pad</A></FONT> : <b>out</b> Character);
-++   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_attributes.3x.html">menu_pad()</A></EM></FONT>
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_490_14">Pad_Character</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/menu_spacing.3x.html">menu_spacing.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_42"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Spacing (<FONT COLOR=red><A NAME="ref_501_27" HREF="terminal_interface-curses-menus__adb.htm#ref_689_27">Men</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Menu</A>;
-+-                          <FONT COLOR=red><A NAME="ref_502_27" HREF="terminal_interface-curses-menus__adb.htm#ref_690_27">Descr</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Position</A> := 0;
-+-                          <FONT COLOR=red><A NAME="ref_503_27" HREF="terminal_interface-curses-menus__adb.htm#ref_691_27">Row</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>   := 0;
-+-                          Col   : <b>in</b> Column_Position := 0);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_500_14" HREF="terminal_interface-curses-menus__adb.htm#ref_688_14">Set_Spacing</A></FONT> (<FONT COLOR=red><A NAME="ref_500_27" HREF="terminal_interface-curses-menus__adb.htm#ref_688_27">Men</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                          <FONT COLOR=red><A NAME="ref_501_27" HREF="terminal_interface-curses-menus__adb.htm#ref_689_27">Descr</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> := 0;
-++                          <FONT COLOR=red><A NAME="ref_502_27" HREF="terminal_interface-curses-menus__adb.htm#ref_690_27">Row</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>   := 0;
-++                          <FONT COLOR=red><A NAME="ref_503_27" HREF="terminal_interface-curses-menus__adb.htm#ref_691_27">Col</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> := 0);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_spacing.3x.html">set_menu_spacing()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Spacing);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_500_14">Set_Spacing</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_43"#2|</EM></FONT>
-+-   <b>procedure</b> Spacing (<FONT COLOR=red><A NAME="ref_509_23" HREF="terminal_interface-curses-menus__adb.htm#ref_708_23">Men</A></FONT>   : <b>in</b> Menu;
-+-                      <FONT COLOR=red><A NAME="ref_510_23" HREF="terminal_interface-curses-menus__adb.htm#ref_709_23">Descr</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Position</A>;
-+-                      <FONT COLOR=red><A NAME="ref_511_23" HREF="terminal_interface-curses-menus__adb.htm#ref_710_23">Row</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-                      Col   : <b>out</b> Column_Position);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_508_14" HREF="terminal_interface-curses-menus__adb.htm#ref_707_14">Spacing</A></FONT> (<FONT COLOR=red><A NAME="ref_508_23" HREF="terminal_interface-curses-menus__adb.htm#ref_707_23">Men</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                      <FONT COLOR=red><A NAME="ref_509_23" HREF="terminal_interface-curses-menus__adb.htm#ref_708_23">Descr</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++                      <FONT COLOR=red><A NAME="ref_510_23" HREF="terminal_interface-curses-menus__adb.htm#ref_709_23">Row</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++                      <FONT COLOR=red><A NAME="ref_511_23" HREF="terminal_interface-curses-menus__adb.htm#ref_710_23">Col</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_spacing.3x.html">menu_spacing()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Spacing);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_508_14">Spacing</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/menu_pattern.3x.html">menu_pattern.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_44"#2|</EM></FONT>
-+-   <b>function</b> Set_Pattern (<FONT COLOR=red><A NAME="ref_521_26" HREF="terminal_interface-curses-menus__adb.htm#ref_733_26">Men</A></FONT>  : Menu;
-+-                         Text : String) <b>return</b> Boolean;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_520_13" HREF="terminal_interface-curses-menus__adb.htm#ref_732_13">Set_Pattern</A></FONT> (<FONT COLOR=red><A NAME="ref_520_26" HREF="terminal_interface-curses-menus__adb.htm#ref_732_26">Men</A></FONT>  : <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                         <FONT COLOR=red><A NAME="ref_521_26" HREF="terminal_interface-curses-menus__adb.htm#ref_733_26">Text</A></FONT> : String) <b>return</b> Boolean;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_pattern.3x.html">set_menu_pattern()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  Return TRUE if the pattern matches, FALSE otherwise</EM></FONT>
-+-   <b>pragma</b> Inline (Set_Pattern);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_520_13">Set_Pattern</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_45"#2|</EM></FONT>
-+-   <b>procedure</b> Pattern (<FONT COLOR=red><A NAME="ref_528_23" HREF="terminal_interface-curses-menus__adb.htm#ref_756_23">Men</A></FONT>  : <b>in</b>  Menu;
-+-                      Text : <b>out</b> String);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_527_14" HREF="terminal_interface-curses-menus__adb.htm#ref_755_14">Pattern</A></FONT> (<FONT COLOR=red><A NAME="ref_527_23" HREF="terminal_interface-curses-menus__adb.htm#ref_755_23">Men</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                      <FONT COLOR=red><A NAME="ref_528_23" HREF="terminal_interface-curses-menus__adb.htm#ref_756_23">Text</A></FONT> : <b>out</b> String);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_pattern.3x.html">menu_pattern()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Pattern);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_527_14">Pattern</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/menu_format.3x.html">menu_format.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_46"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Format (<FONT COLOR=red><A NAME="ref_538_26" HREF="terminal_interface-curses-menus__adb.htm#ref_765_26">Men</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Menu</A>;
-+-                         <FONT COLOR=red><A NAME="ref_539_26" HREF="terminal_interface-curses-menus__adb.htm#ref_766_26">Lines</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
-+-                         Columns : <b>in</b> Column_Count);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_537_14" HREF="terminal_interface-curses-menus__adb.htm#ref_764_14">Set_Format</A></FONT> (<FONT COLOR=red><A NAME="ref_537_26" HREF="terminal_interface-curses-menus__adb.htm#ref_764_26">Men</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                         <FONT COLOR=red><A NAME="ref_538_26" HREF="terminal_interface-curses-menus__adb.htm#ref_765_26">Lines</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-++                         <FONT COLOR=red><A NAME="ref_539_26" HREF="terminal_interface-curses-menus__adb.htm#ref_766_26">Columns</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>);
-+    <FONT COLOR=green><EM>--  Not implemented: 0 argument for Lines or Columns;</EM></FONT>
-+    <FONT COLOR=green><EM>--  instead use Format to get the current sizes</EM></FONT>
-+    <FONT COLOR=green><EM>--      The  default  format  is  16  rows,  1  column.    Calling</EM></FONT>
-+@@ -551,104 +550,104 @@
-+    <FONT COLOR=green><EM>--      is  interpreted  as  a  request  not to change the current</EM></FONT>
-+    <FONT COLOR=green><EM>--      value.</EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_format.3x.html">set_menu_format()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Format);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_537_14">Set_Format</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_47"#2|</EM></FONT>
-+-   <b>procedure</b> Format (<FONT COLOR=red><A NAME="ref_552_22" HREF="terminal_interface-curses-menus__adb.htm#ref_783_22">Men</A></FONT>     : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Menu</A>;
-+-                     <FONT COLOR=red><A NAME="ref_553_22" HREF="terminal_interface-curses-menus__adb.htm#ref_784_22">Lines</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
-+-                     Columns : <b>out</b> Column_Count);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_551_14" HREF="terminal_interface-curses-menus__adb.htm#ref_782_14">Format</A></FONT> (<FONT COLOR=red><A NAME="ref_551_22" HREF="terminal_interface-curses-menus__adb.htm#ref_782_22">Men</A></FONT>     : <b>in</b>  <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                     <FONT COLOR=red><A NAME="ref_552_22" HREF="terminal_interface-curses-menus__adb.htm#ref_783_22">Lines</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-++                     <FONT COLOR=red><A NAME="ref_553_22" HREF="terminal_interface-curses-menus__adb.htm#ref_784_22">Columns</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_format.3x.html">menu_format()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Format);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_551_14">Format</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/menu_hook.3x.html">menu_hook.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <b>type</b> Menu_Hook_Function <b>is</b> <b>access</b> <b>procedure</b> (Men : <b>in</b> Menu);
-+-   <b>pragma</b> Convention (C, Menu_Hook_Function);
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_561_9">Menu_Hook_Function</A></FONT> <b>is</b> <b>access</b> <b>procedure</b> (<FONT COLOR=red><A NAME="ref_561_49">Men</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>);
-++   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-menus__ads.htm#ref_561_9">Menu_Hook_Function</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_48"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Item_Init_Hook (<FONT COLOR=red><A NAME="ref_566_34" HREF="terminal_interface-curses-menus__adb.htm#ref_803_34">Men</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_561_9">Menu</A>;
-+-                                 Proc : <b>in</b> Menu_Hook_Function);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_565_14" HREF="terminal_interface-curses-menus__adb.htm#ref_802_14">Set_Item_Init_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_565_34" HREF="terminal_interface-curses-menus__adb.htm#ref_802_34">Men</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                                 <FONT COLOR=red><A NAME="ref_566_34" HREF="terminal_interface-curses-menus__adb.htm#ref_803_34">Proc</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_561_9">Menu_Hook_Function</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_hook.3x.html">set_item_init()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Item_Init_Hook);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_565_14">Set_Item_Init_Hook</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_49"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Item_Term_Hook (<FONT COLOR=red><A NAME="ref_572_34" HREF="terminal_interface-curses-menus__adb.htm#ref_817_34">Men</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_561_9">Menu</A>;
-+-                                 Proc : <b>in</b> Menu_Hook_Function);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_571_14" HREF="terminal_interface-curses-menus__adb.htm#ref_816_14">Set_Item_Term_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_571_34" HREF="terminal_interface-curses-menus__adb.htm#ref_816_34">Men</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                                 <FONT COLOR=red><A NAME="ref_572_34" HREF="terminal_interface-curses-menus__adb.htm#ref_817_34">Proc</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_561_9">Menu_Hook_Function</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_hook.3x.html">set_item_term()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Item_Term_Hook);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_571_14">Set_Item_Term_Hook</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_50"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Menu_Init_Hook (<FONT COLOR=red><A NAME="ref_578_34" HREF="terminal_interface-curses-menus__adb.htm#ref_831_34">Men</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_561_9">Menu</A>;
-+-                                 Proc : <b>in</b> Menu_Hook_Function);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_577_14" HREF="terminal_interface-curses-menus__adb.htm#ref_830_14">Set_Menu_Init_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_577_34" HREF="terminal_interface-curses-menus__adb.htm#ref_830_34">Men</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                                 <FONT COLOR=red><A NAME="ref_578_34" HREF="terminal_interface-curses-menus__adb.htm#ref_831_34">Proc</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_561_9">Menu_Hook_Function</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_hook.3x.html">set_menu_init()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Menu_Init_Hook);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_577_14">Set_Menu_Init_Hook</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_51"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Menu_Term_Hook (<FONT COLOR=red><A NAME="ref_584_34" HREF="terminal_interface-curses-menus__adb.htm#ref_845_34">Men</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_561_9">Menu</A>;
-+-                                 Proc : <b>in</b> Menu_Hook_Function);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_583_14" HREF="terminal_interface-curses-menus__adb.htm#ref_844_14">Set_Menu_Term_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_583_34" HREF="terminal_interface-curses-menus__adb.htm#ref_844_34">Men</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                                 <FONT COLOR=red><A NAME="ref_584_34" HREF="terminal_interface-curses-menus__adb.htm#ref_845_34">Proc</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_561_9">Menu_Hook_Function</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_hook.3x.html">set_menu_term()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Menu_Term_Hook);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_583_14">Set_Menu_Term_Hook</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_52"#2|</EM></FONT>
-+-   <b>function</b> Get_Item_Init_Hook (Men : Menu) <b>return</b> Menu_Hook_Function;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_589_13" HREF="terminal_interface-curses-menus__adb.htm#ref_858_13">Get_Item_Init_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_589_33" HREF="terminal_interface-curses-menus__adb.htm#ref_858_33">Men</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>) <b>return</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_561_9">Menu_Hook_Function</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_hook.3x.html">item_init()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Get_Item_Init_Hook);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_589_13">Get_Item_Init_Hook</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_53"#2|</EM></FONT>
-+-   <b>function</b> Get_Item_Term_Hook (Men : Menu) <b>return</b> Menu_Hook_Function;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_594_13" HREF="terminal_interface-curses-menus__adb.htm#ref_866_13">Get_Item_Term_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_594_33" HREF="terminal_interface-curses-menus__adb.htm#ref_866_33">Men</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>) <b>return</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_561_9">Menu_Hook_Function</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_hook.3x.html">item_term()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Get_Item_Term_Hook);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_594_13">Get_Item_Term_Hook</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_54"#2|</EM></FONT>
-+-   <b>function</b> Get_Menu_Init_Hook (Men : Menu) <b>return</b> Menu_Hook_Function;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_599_13" HREF="terminal_interface-curses-menus__adb.htm#ref_874_13">Get_Menu_Init_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_599_33" HREF="terminal_interface-curses-menus__adb.htm#ref_874_33">Men</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>) <b>return</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_561_9">Menu_Hook_Function</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_hook.3x.html">menu_init()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Get_Menu_Init_Hook);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_599_13">Get_Menu_Init_Hook</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_55"#2|</EM></FONT>
-+-   <b>function</b> Get_Menu_Term_Hook (Men : Menu) <b>return</b> Menu_Hook_Function;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_604_13" HREF="terminal_interface-curses-menus__adb.htm#ref_882_13">Get_Menu_Term_Hook</A></FONT> (<FONT COLOR=red><A NAME="ref_604_33" HREF="terminal_interface-curses-menus__adb.htm#ref_882_33">Men</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>) <b>return</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_561_9">Menu_Hook_Function</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_hook.3x.html">menu_term()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Get_Menu_Term_Hook);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_604_13">Get_Menu_Term_Hook</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/menu_items.3x.html">menu_items.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_56"#2|</EM></FONT>
-+-   <b>procedure</b> Redefine (<FONT COLOR=red><A NAME="ref_614_24" HREF="terminal_interface-curses-menus__adb.htm#ref_891_24">Men</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_178_9">Menu</A>;
-+-                       Items : <b>in</b> Item_Array_Access);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_613_14" HREF="terminal_interface-curses-menus__adb.htm#ref_890_14">Redefine</A></FONT> (<FONT COLOR=red><A NAME="ref_613_24" HREF="terminal_interface-curses-menus__adb.htm#ref_890_24">Men</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                       <FONT COLOR=red><A NAME="ref_614_24" HREF="terminal_interface-curses-menus__adb.htm#ref_891_24">Items</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_178_9">Item_Array_Access</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_items.3x.html">set_menu_items()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Redefine);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_613_14">Redefine</A>);
-+ 
-+-   <b>procedure</b> Set_Items (<FONT COLOR=red><A NAME="ref_619_25">Men</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_178_9">Menu</A>;
-+-                        Items : <b>in</b> Item_Array_Access) <b>renames</b> Redefine;
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_618_14">Set_Items</A></FONT> (<FONT COLOR=red><A NAME="ref_618_25">Men</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                        <FONT COLOR=red><A NAME="ref_619_25">Items</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_178_9">Item_Array_Access</A>) <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_613_14">Redefine</A>;
-+    <FONT COLOR=green><EM>--  pragma Inline (Set_Items);</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_57"#2|</EM></FONT>
-+-   <b>function</b> Items (<FONT COLOR=red><A NAME="ref_624_20" HREF="terminal_interface-curses-menus__adb.htm#ref_919_20">Men</A></FONT>   : Menu;
-+-                   Index : Positive) <b>return</b> Item;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_623_13" HREF="terminal_interface-curses-menus__adb.htm#ref_918_13">Items</A></FONT> (<FONT COLOR=red><A NAME="ref_623_20" HREF="terminal_interface-curses-menus__adb.htm#ref_918_20">Men</A></FONT>   : <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                   <FONT COLOR=red><A NAME="ref_624_20" HREF="terminal_interface-curses-menus__adb.htm#ref_919_20">Index</A></FONT> : Positive) <b>return</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_items.3x.html">menu_items()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Items);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_623_13">Items</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_58"#2|</EM></FONT>
-+-   <b>function</b> Item_Count (Men : Menu) <b>return</b> Natural;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_629_13" HREF="terminal_interface-curses-menus__adb.htm#ref_910_13">Item_Count</A></FONT> (<FONT COLOR=red><A NAME="ref_629_25" HREF="terminal_interface-curses-menus__adb.htm#ref_910_25">Men</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>) <b>return</b> Natural;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_items.3x.html">item_count()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Item_Count);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-menus__ads.htm#ref_629_13">Item_Count</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/menu_new.3x.html">menu_new.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_59"#2|</EM></FONT>
-+-   <b>function</b> Create (Items : Item_Array_Access) <b>return</b> Menu;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_638_13" HREF="terminal_interface-curses-menus__adb.htm#ref_937_13">Create</A></FONT> (<FONT COLOR=red><A NAME="ref_638_21" HREF="terminal_interface-curses-menus__adb.htm#ref_937_21">Items</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_178_9">Item_Array_Access</A>) <b>return</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_new.3x.html">new_menu()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  Not inlined</EM></FONT>
-+ 
-+-   <b>function</b> New_Menu (Items : Item_Array_Access) <b>return</b> Menu <b>renames</b> Create;
-++   <b>function</b> New_Menu (<FONT COLOR=red><A NAME="ref_642_23">Items</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_178_9">Item_Array_Access</A>) <b>return</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A> <b>renames</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_638_13">Create</A>;
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_60"#2|</EM></FONT>
-+-   <b>procedure</b> Delete (Men : <b>in</b> <b>out</b> Menu);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_645_14" HREF="terminal_interface-curses-menus__adb.htm#ref_956_14">Delete</A></FONT> (<FONT COLOR=red><A NAME="ref_645_22" HREF="terminal_interface-curses-menus__adb.htm#ref_956_22">Men</A></FONT> : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_new.3x.html">free_menu()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  Reset Men to Null_Menu</EM></FONT>
-+    <FONT COLOR=green><EM>--  Not inlined</EM></FONT>
-+@@ -657,14 +656,14 @@
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/menu_driver.3x.html">menu_driver.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <b>type</b> Driver_Result <b>is</b> (<FONT COLOR=red><A NAME="ref_655_27">Menu_Ok</A></FONT>,
-+-                          <FONT COLOR=red><A NAME="ref_656_27">Request_Denied</A></FONT>,
-+-                          <FONT COLOR=red><A NAME="ref_657_27">Unknown_Request</A></FONT>,
-+-                          No_Match);
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_654_9">Driver_Result</A></FONT> <b>is</b> (<FONT COLOR=red><A NAME="ref_654_27">Menu_Ok</A></FONT>,
-++                          <FONT COLOR=red><A NAME="ref_655_27">Request_Denied</A></FONT>,
-++                          <FONT COLOR=red><A NAME="ref_656_27">Unknown_Request</A></FONT>,
-++                          <FONT COLOR=red><A NAME="ref_657_27">No_Match</A></FONT>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_61"#2|</EM></FONT>
-+-   <b>function</b> Driver (<FONT COLOR=red><A NAME="ref_661_21" HREF="terminal_interface-curses-menus__adb.htm#ref_971_21">Men</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_68_9">Menu</A>;
-+-                    Key : Key_Code) <b>return</b> Driver_Result;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_660_13" HREF="terminal_interface-curses-menus__adb.htm#ref_970_13">Driver</A></FONT> (<FONT COLOR=red><A NAME="ref_660_21" HREF="terminal_interface-curses-menus__adb.htm#ref_970_21">Men</A></FONT> : <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>;
-++                    <FONT COLOR=red><A NAME="ref_661_21" HREF="terminal_interface-curses-menus__adb.htm#ref_971_21">Key</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_68_9">Key_Code</A>) <b>return</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_654_9">Driver_Result</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/menu_driver.3x.html">menu_driver()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  Driver is not inlined</EM></FONT>
-+ 
-+@@ -672,11 +671,11 @@
-+    <FONT COLOR=green><EM>--  Not Implemented: menu_request_name, menu_request_by_name</EM></FONT>
-+ <FONT COLOR=green><EM>-------------------------------------------------------------------------------</EM></FONT>
-+ <b>private</b>
-+-   <b>type</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Item</A>   <b>is</b> <b>new</b> System.Storage_Elements.Integer_Address;
-+-   <b>type</b> Menu   <b>is</b> <b>new</b> System.Storage_Elements.Integer_Address;
-++   <b>type</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A>   <b>is</b> <b>new</b> System.Storage_Elements.Integer_Address;
-++   <b>type</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A>   <b>is</b> <b>new</b> System.Storage_Elements.Integer_Address;
-+ 
-+-   <A HREF="terminal_interface-curses-menus__ads.htm#ref_63_4">Null_Item</A> : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Item</A> := 0;
-+-   Null_Menu : <b>constant</b> Menu := 0;
-++   <A HREF="terminal_interface-curses-menus__ads.htm#ref_62_4">Null_Item</A> : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_56_9">Item</A> := 0;
-++   <A HREF="terminal_interface-curses-menus__ads.htm#ref_63_4">Null_Menu</A> : <b>constant</b> <A HREF="terminal_interface-curses-menus__ads.htm#ref_57_9">Menu</A> := 0;
-+ 
-+-<b>end</b> Terminal_Interface.Curses.Menus;
-++<b>end</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-menus__ads.htm#ref_49_35">Menus</A>;
-+ </PRE></BODY></HTML>
-+Index: doc/html/ada/terminal_interface-curses-mouse__adb.htm
-+--- ncurses-5.6/doc/html/ada/terminal_interface-curses-mouse__adb.htm	2006-09-23 20:31:31.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/terminal_interface-curses-mouse__adb.htm	2007-05-05 20:35:20.000000000 +0000
-+@@ -60,7 +60,7 @@
-+       <b>function</b> <FONT COLOR=red><A NAME="ref_55_16">Mouse_Avail</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Mouse_Avail, "_nc_has_mouse");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_761_13">Has_Key</A> (<A HREF="terminal_interface-curses__ads.htm#ref_204_4">Key_Mouse</A>) <b>or</b> <b>else</b> <A HREF="terminal_interface-curses-mouse__adb.htm#ref_55_16">Mouse_Avail</A> /= 0 <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_767_13">Has_Key</A> (<A HREF="terminal_interface-curses__ads.htm#ref_204_4">Key_Mouse</A>) <b>or</b> <b>else</b> <A HREF="terminal_interface-curses-mouse__adb.htm#ref_55_16">Mouse_Avail</A> /= 0 <b>then</b>
-+          <b>return</b> True;
-+       <b>else</b>
-+          <b>return</b> False;
-+@@ -123,7 +123,7 @@
-+    <b>begin</b>
-+       <A HREF="terminal_interface-curses-mouse__adb.htm#ref_116_7">R</A> := <A HREF="terminal_interface-curses-mouse__adb.htm#ref_113_16">MMask</A> (<A HREF="terminal_interface-curses-mouse__ads.htm#ref_123_26">Mask</A>, <A HREF="terminal_interface-curses-mouse__adb.htm#ref_117_7">Old</A>'<b>Access</b>);
-+       <b>if</b> <A HREF="terminal_interface-curses-mouse__adb.htm#ref_116_7">R</A> = <A HREF="terminal_interface-curses-mouse__ads.htm#ref_65_4">No_Events</A> <b>then</b>
-+-         <A HREF="terminal_interface-curses__ads.htm#ref_864_14">Beep</A>;
-++         <A HREF="terminal_interface-curses__ads.htm#ref_870_14">Beep</A>;
-+       <b>end</b> <b>if</b>;
-+       <b>return</b> <A HREF="terminal_interface-curses-mouse__adb.htm#ref_117_7">Old</A>;
-+    <b>end</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_123_13">Start_Mouse</A>;
-+@@ -132,7 +132,7 @@
-+    <b>is</b>
-+    <b>begin</b>
-+       <b>if</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_128_25">Mask</A> /= <A HREF="terminal_interface-curses-mouse__ads.htm#ref_65_4">No_Events</A> <b>then</b>
-+-         <A HREF="terminal_interface-curses__ads.htm#ref_864_14">Beep</A>;
-++         <A HREF="terminal_interface-curses__ads.htm#ref_870_14">Beep</A>;
-+       <b>end</b> <b>if</b>;
-+    <b>end</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_128_14">End_Mouse</A>;
-+ 
-+@@ -199,15 +199,15 @@
-+       <b>end</b> <b>if</b>;
-+    <b>end</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_149_14">Unget_Mouse</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_197_13" HREF="terminal_interface-curses-mouse__ads.htm#ref_154_13">Enclosed_In_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_197_33" HREF="terminal_interface-curses-mouse__ads.htm#ref_154_33">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_197_13" HREF="terminal_interface-curses-mouse__ads.htm#ref_154_13">Enclosed_In_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_197_33" HREF="terminal_interface-curses-mouse__ads.htm#ref_154_33">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+                                 <FONT COLOR=red><A NAME="ref_198_33" HREF="terminal_interface-curses-mouse__ads.htm#ref_155_33">Event</A></FONT>  : <A HREF="terminal_interface-curses-mouse__ads.htm#ref_92_9">Mouse_Event</A>) <b>return</b> Boolean
-+    <b>is</b>
-+       <b>function</b> <FONT COLOR=red><A NAME="ref_200_16">Wenclose</A></FONT> (<FONT COLOR=red><A NAME="ref_200_26" HREF="terminal_interface-curses-mouse__adb.htm#ref_200_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_200_40" HREF="terminal_interface-curses-mouse__adb.htm#ref_200_16">Y</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>; <FONT COLOR=red><A NAME="ref_200_51" HREF="terminal_interface-curses-mouse__adb.htm#ref_200_16">X</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>)
-+-                         <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>;
-++                         <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>;
-+       <b>pragma</b> Import (C, Wenclose, "wenclose");
-+    <b>begin</b>
-+       <b>if</b> <A HREF="terminal_interface-curses-mouse__adb.htm#ref_200_16">Wenclose</A> (<A HREF="terminal_interface-curses-mouse__ads.htm#ref_154_33">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses-mouse__ads.htm#ref_155_33">Event</A>.<A HREF="terminal_interface-curses-mouse__ads.htm#ref_172_13">Y</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses-mouse__ads.htm#ref_155_33">Event</A>.<A HREF="terminal_interface-curses-mouse__ads.htm#ref_172_10">X</A>))
-+-        = <A HREF="terminal_interface-curses__ads.htm#ref_1931_4">Curses_Bool_False</A> <b>then</b>
-++        = <A HREF="terminal_interface-curses__ads.htm#ref_1927_4">Curses_Bool_False</A> <b>then</b>
-+          <b>return</b> False;
-+       <b>else</b>
-+          <b>return</b> True;
-+Index: doc/html/ada/terminal_interface-curses-mouse__ads.htm
-+--- ncurses-5.6/doc/html/ada/terminal_interface-curses-mouse__ads.htm	2006-09-23 20:31:31.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/terminal_interface-curses-mouse__ads.htm	2007-09-01 23:56:31.000000000 +0000
-+@@ -3,7 +3,6 @@
-+ <BODY>
-+ <HR><DIV ALIGN="center"><H1> File : terminal_interface-curses-mouse.ads </H1></DIV><HR>
-+ <PRE>
-+-
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
-+ <FONT COLOR=green><EM>--                           <A HREF="http://www.gnat.com">GNAT</A> ncurses Binding                           --</EM></FONT>
-+@@ -51,8 +50,8 @@
-+ <FONT COLOR=green><EM>--  |</EM></FONT>
-+ <b>with</b> System;
-+ 
-+-<b>package</b> Terminal_Interface.Curses.Mouse <b>is</b>
-+-   <b>pragma</b> Preelaborate (Terminal_Interface.Curses.Mouse);
-++<b>package</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<FONT COLOR=red><A NAME="ref_48_35" HREF="terminal_interface-curses-mouse__adb.htm#ref_48_40">Mouse</A></FONT> <b>is</b>
-++   <b>pragma</b> Preelaborate (<A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-mouse__ads.htm#ref_48_35">Mouse</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_mouse.3x.html">curs_mouse.3x</A></EM></FONT>
-+@@ -67,56 +66,56 @@
-+    <FONT COLOR=green><EM>--  Not implemented:</EM></FONT>
-+    <FONT COLOR=green><EM>--  REPORT_MOUSE_POSITION (i.e. as a parameter to Register_Reportable_Event</EM></FONT>
-+    <FONT COLOR=green><EM>--  or Start_Mouse)</EM></FONT>
-+-   <b>type</b> Event_Mask <b>is</b> <b>private</b>;
-+-   <FONT COLOR=red><A NAME="ref_66_4">No_Events</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A>;
-+-   All_Events : <b>constant</b> Event_Mask;
-+-
-+-   <b>type</b> Mouse_Button <b>is</b> (<FONT COLOR=red><A NAME="ref_69_26">Left</A></FONT>,     <FONT COLOR=green><EM>-- aka: Button 1</EM></FONT>
-+-                         <FONT COLOR=red><A NAME="ref_70_26">Middle</A></FONT>,   <FONT COLOR=green><EM>-- aka: Button 2</EM></FONT>
-+-                         <FONT COLOR=red><A NAME="ref_71_26">Right</A></FONT>,    <FONT COLOR=green><EM>-- aka: Button 3</EM></FONT>
-+-                         <FONT COLOR=red><A NAME="ref_72_26">Button4</A></FONT>,  <FONT COLOR=green><EM>-- aka: Button 4</EM></FONT>
-+-                         <FONT COLOR=red><A NAME="ref_73_26">Control</A></FONT>,  <FONT COLOR=green><EM>-- Control Key</EM></FONT>
-+-                         <FONT COLOR=red><A NAME="ref_74_26">Shift</A></FONT>,    <FONT COLOR=green><EM>-- Shift Key</EM></FONT>
-+-                         Alt);     <FONT COLOR=green><EM>-- ALT Key</EM></FONT>
-+-
-+-   <b>subtype</b> <FONT COLOR=red><A NAME="ref_77_12">Real_Buttons</A></FONT>  <b>is</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_68_9">Mouse_Button</A> <b>range</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_72_26">Left</A> .. Button4;
-+-   <b>subtype</b> Modifier_Keys <b>is</b> Mouse_Button <b>range</b> Control .. Alt;
-+-
-+-   <b>type</b> Button_State <b>is</b> (<FONT COLOR=red><A NAME="ref_80_26">Released</A></FONT>,
-+-                         <FONT COLOR=red><A NAME="ref_81_26">Pressed</A></FONT>,
-+-                         <FONT COLOR=red><A NAME="ref_82_26">Clicked</A></FONT>,
-+-                         <FONT COLOR=red><A NAME="ref_83_26">Double_Clicked</A></FONT>,
-+-                         Triple_Clicked);
-+-
-+-   <b>type</b> Button_States <b>is</b> <b>array</b> (Button_State) <b>of</b> Boolean;
-+-   <b>pragma</b> Pack (Button_States);
-+-
-+-   All_Clicks : <b>constant</b> Button_States := (Clicked .. Triple_Clicked =&gt; True,
-+-   <FONT COLOR=red><A NAME="ref_90_4"> </A></FONT>                     <A HREF="terminal_interface-curses-mouse__ads.htm#ref_85_9"> </A>                 <b>others</b> =&gt; False);
-+-   All_States : <b>constant</b> Button_States := (<b>others</b> =&gt; True);
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_64_9">Event_Mask</A></FONT> <b>is</b> <b>private</b>;
-++   <FONT COLOR=red><A NAME="ref_65_4">No_Events</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A>;
-++   <FONT COLOR=red><A NAME="ref_66_4">All_Events</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A>;
-++
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_68_9">Mouse_Button</A></FONT> <b>is</b> (<FONT COLOR=red><A NAME="ref_68_26">Left</A></FONT>,     <FONT COLOR=green><EM>-- aka: Button 1</EM></FONT>
-++                         <FONT COLOR=red><A NAME="ref_69_26">Middle</A></FONT>,   <FONT COLOR=green><EM>-- aka: Button 2</EM></FONT>
-++                         <FONT COLOR=red><A NAME="ref_70_26">Right</A></FONT>,    <FONT COLOR=green><EM>-- aka: Button 3</EM></FONT>
-++                         <FONT COLOR=red><A NAME="ref_71_26">Button4</A></FONT>,  <FONT COLOR=green><EM>-- aka: Button 4</EM></FONT>
-++                         <FONT COLOR=red><A NAME="ref_72_26">Control</A></FONT>,  <FONT COLOR=green><EM>-- Control Key</EM></FONT>
-++                         <FONT COLOR=red><A NAME="ref_73_26">Shift</A></FONT>,    <FONT COLOR=green><EM>-- Shift Key</EM></FONT>
-++                         <FONT COLOR=red><A NAME="ref_74_26">Alt</A></FONT>);     <FONT COLOR=green><EM>-- ALT Key</EM></FONT>
-++
-++   <b>subtype</b> <FONT COLOR=red><A NAME="ref_76_12">Real_Buttons</A></FONT>  <b>is</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_68_9">Mouse_Button</A> <b>range</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_68_26">Left</A> .. <A HREF="terminal_interface-curses-mouse__ads.htm#ref_71_26">Button4</A>;
-++   <b>subtype</b> <FONT COLOR=red><A NAME="ref_77_12">Modifier_Keys</A></FONT> <b>is</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_68_9">Mouse_Button</A> <b>range</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_72_26">Control</A> .. <A HREF="terminal_interface-curses-mouse__ads.htm#ref_74_26">Alt</A>;
-++
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_79_9">Button_State</A></FONT> <b>is</b> (<FONT COLOR=red><A NAME="ref_79_26">Released</A></FONT>,
-++                         <FONT COLOR=red><A NAME="ref_80_26">Pressed</A></FONT>,
-++                         <FONT COLOR=red><A NAME="ref_81_26">Clicked</A></FONT>,
-++                         <FONT COLOR=red><A NAME="ref_82_26">Double_Clicked</A></FONT>,
-++                         <FONT COLOR=red><A NAME="ref_83_26">Triple_Clicked</A></FONT>);
-++
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_85_9">Button_States</A></FONT> <b>is</b> <b>array</b> (<A HREF="terminal_interface-curses-mouse__ads.htm#ref_79_9">Button_State</A>) <b>of</b> Boolean;
-++   <b>pragma</b> Pack (<A HREF="terminal_interface-curses-mouse__ads.htm#ref_85_9">Button_States</A>);
-++
-++   <FONT COLOR=red><A NAME="ref_88_4">All_Clicks</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_85_9">Button_States</A> := (<A HREF="terminal_interface-curses-mouse__ads.htm#ref_81_26">Clicked</A> .. <A HREF="terminal_interface-curses-mouse__ads.htm#ref_83_26">Triple_Clicked</A> =&gt; True,
-++                                           <b>others</b> =&gt; False);
-++   <FONT COLOR=red><A NAME="ref_90_4">All_States</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_85_9">Button_States</A> := (<b>others</b> =&gt; True);
-+ 
-+-   <b>type</b> Mouse_Event <b>is</b> <b>private</b>;
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_92_9">Mouse_Event</A></FONT> <b>is</b> <b>private</b>;
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_mouse.3x.html">curs_mouse.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <b>function</b> Has_Mouse <b>return</b> Boolean;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_98_13" HREF="terminal_interface-curses-mouse__adb.htm#ref_53_13">Has_Mouse</A></FONT> <b>return</b> Boolean;
-+    <FONT COLOR=green><EM>--  Return true if a mouse device is supported, false otherwise.</EM></FONT>
-+ 
-+-   <b>procedure</b> Register_Reportable_Event
-+-     (<FONT COLOR=red><A NAME="ref_103_7" HREF="terminal_interface-curses-mouse__adb.htm#ref_81_41">Button</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_79_9">Mouse_Button</A>;
-+-      <FONT COLOR=red><A NAME="ref_104_7" HREF="terminal_interface-curses-mouse__adb.htm#ref_82_41">State</A></FONT>  : <b>in</b> Button_State;
-+-      Mask   : <b>in</b> <b>out</b> Event_Mask);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_101_14" HREF="terminal_interface-curses-mouse__adb.htm#ref_80_14">Register_Reportable_Event</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_102_7" HREF="terminal_interface-curses-mouse__adb.htm#ref_80_41">Button</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_68_9">Mouse_Button</A>;
-++      <FONT COLOR=red><A NAME="ref_103_7" HREF="terminal_interface-curses-mouse__adb.htm#ref_81_41">State</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_79_9">Button_State</A>;
-++      <FONT COLOR=red><A NAME="ref_104_7" HREF="terminal_interface-curses-mouse__adb.htm#ref_82_41">Mask</A></FONT>   : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A>);
-+    <FONT COLOR=green><EM>--  Stores the event described by the button and the state in the mask.</EM></FONT>
-+    <FONT COLOR=green><EM>--  Before you call this the first time, you should init the mask</EM></FONT>
-+    <FONT COLOR=green><EM>--  with the Empty_Mask constant</EM></FONT>
-+-   <b>pragma</b> Inline (Register_Reportable_Event);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-mouse__ads.htm#ref_101_14">Register_Reportable_Event</A>);
-+ 
-+-   <b>procedure</b> Register_Reportable_Events
-+-     (<FONT COLOR=red><A NAME="ref_112_7" HREF="terminal_interface-curses-mouse__adb.htm#ref_99_42">Button</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_85_9">Mouse_Button</A>;
-+-      <FONT COLOR=red><A NAME="ref_113_7" HREF="terminal_interface-curses-mouse__adb.htm#ref_100_42">State</A></FONT>  : <b>in</b> Button_States;
-+-      Mask   : <b>in</b> <b>out</b> Event_Mask);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_110_14" HREF="terminal_interface-curses-mouse__adb.htm#ref_98_14">Register_Reportable_Events</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_111_7" HREF="terminal_interface-curses-mouse__adb.htm#ref_98_42">Button</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_68_9">Mouse_Button</A>;
-++      <FONT COLOR=red><A NAME="ref_112_7" HREF="terminal_interface-curses-mouse__adb.htm#ref_99_42">State</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_85_9">Button_States</A>;
-++      <FONT COLOR=red><A NAME="ref_113_7" HREF="terminal_interface-curses-mouse__adb.htm#ref_100_42">Mask</A></FONT>   : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A>);
-+    <FONT COLOR=green><EM>--  Register all events described by the Button and the State bitmap.</EM></FONT>
-+    <FONT COLOR=green><EM>--  Before you call this the first time, you should init the mask</EM></FONT>
-+    <FONT COLOR=green><EM>--  with the Empty_Mask constant</EM></FONT>
-+@@ -126,62 +125,62 @@
-+    <FONT COLOR=green><EM>--  old mask, that means the event mask value before this call.</EM></FONT>
-+    <FONT COLOR=green><EM>--  Not Implemented: The library version</EM></FONT>
-+    <FONT COLOR=green><EM>--  returns a Mouse_Mask that tells which events are reported.</EM></FONT>
-+-   <b>function</b> Start_Mouse (Mask : <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := All_Events)
-+-                         <b>return</b> Event_Mask;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_123_13" HREF="terminal_interface-curses-mouse__adb.htm#ref_110_13">Start_Mouse</A></FONT> (<FONT COLOR=red><A NAME="ref_123_26" HREF="terminal_interface-curses-mouse__adb.htm#ref_110_26">Mask</A></FONT> : <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := <A HREF="terminal_interface-curses-mouse__ads.htm#ref_66_4">All_Events</A>)
-++                         <b>return</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_mouse.3x.html">mousemask()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Start_Mouse);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-mouse__ads.htm#ref_123_13">Start_Mouse</A>);
-+ 
-+-   <b>procedure</b> End_Mouse (Mask : <b>in</b> Event_Mask := No_Events);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_128_14" HREF="terminal_interface-curses-mouse__adb.htm#ref_126_14">End_Mouse</A></FONT> (<FONT COLOR=red><A NAME="ref_128_25" HREF="terminal_interface-curses-mouse__adb.htm#ref_126_25">Mask</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := <A HREF="terminal_interface-curses-mouse__ads.htm#ref_65_4">No_Events</A>);
-+    <FONT COLOR=green><EM>--  Terminates the mouse, restores the specified event mask</EM></FONT>
-+-   <b>pragma</b> Inline (End_Mouse);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-mouse__ads.htm#ref_128_14">End_Mouse</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_2"#2|</EM></FONT>
-+-   <b>function</b> Get_Mouse <b>return</b> Mouse_Event;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_133_13" HREF="terminal_interface-curses-mouse__adb.htm#ref_65_13">Get_Mouse</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_92_9">Mouse_Event</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_mouse.3x.html">getmouse()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Get_Mouse);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-mouse__ads.htm#ref_133_13">Get_Mouse</A>);
-+ 
-+-   <b>procedure</b> Get_Event (<FONT COLOR=red><A NAME="ref_138_25" HREF="terminal_interface-curses-mouse__adb.htm#ref_175_25">Event</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Mouse_Event</A>;
-+-                        <FONT COLOR=red><A NAME="ref_139_25" HREF="terminal_interface-curses-mouse__adb.htm#ref_176_25">Y</A></FONT>      : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-                        <FONT COLOR=red><A NAME="ref_140_25" HREF="terminal_interface-curses-mouse__adb.htm#ref_177_25">X</A></FONT>      : <b>out</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_68_9">Column_Position</A>;
-+-                        <FONT COLOR=red><A NAME="ref_141_25" HREF="terminal_interface-curses-mouse__adb.htm#ref_178_25">Button</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_79_9">Mouse_Button</A>;
-+-                        State  : <b>out</b> Button_State);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_137_14" HREF="terminal_interface-curses-mouse__adb.htm#ref_174_14">Get_Event</A></FONT> (<FONT COLOR=red><A NAME="ref_137_25" HREF="terminal_interface-curses-mouse__adb.htm#ref_174_25">Event</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-mouse__ads.htm#ref_92_9">Mouse_Event</A>;
-++                        <FONT COLOR=red><A NAME="ref_138_25" HREF="terminal_interface-curses-mouse__adb.htm#ref_175_25">Y</A></FONT>      : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++                        <FONT COLOR=red><A NAME="ref_139_25" HREF="terminal_interface-curses-mouse__adb.htm#ref_176_25">X</A></FONT>      : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++                        <FONT COLOR=red><A NAME="ref_140_25" HREF="terminal_interface-curses-mouse__adb.htm#ref_177_25">Button</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_68_9">Mouse_Button</A>;
-++                        <FONT COLOR=red><A NAME="ref_141_25" HREF="terminal_interface-curses-mouse__adb.htm#ref_178_25">State</A></FONT>  : <b>out</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_79_9">Button_State</A>);
-+    <FONT COLOR=green><EM>--  !!! Warning: X and Y are screen coordinates. Due to ripped of lines they</EM></FONT>
-+    <FONT COLOR=green><EM>--  may not be identical to window coordinates.</EM></FONT>
-+    <FONT COLOR=green><EM>--  Not Implemented: Get_Event only reports one event, the C library</EM></FONT>
-+    <FONT COLOR=green><EM>--  version supports multiple events, e.g. {click-1, click-3}</EM></FONT>
-+-   <b>pragma</b> Inline (Get_Event);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-mouse__ads.htm#ref_137_14">Get_Event</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_3"#2|</EM></FONT>
-+-   <b>procedure</b> Unget_Mouse (Event : <b>in</b> Mouse_Event);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_149_14" HREF="terminal_interface-curses-mouse__adb.htm#ref_187_14">Unget_Mouse</A></FONT> (<FONT COLOR=red><A NAME="ref_149_27" HREF="terminal_interface-curses-mouse__adb.htm#ref_187_27">Event</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_92_9">Mouse_Event</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_mouse.3x.html">ungetmouse()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Unget_Mouse);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-mouse__ads.htm#ref_149_14">Unget_Mouse</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_4"#2|</EM></FONT>
-+-   <b>function</b> Enclosed_In_Window (<FONT COLOR=red><A NAME="ref_155_33" HREF="terminal_interface-curses-mouse__adb.htm#ref_198_33">Win</A></FONT>    : <A HREF="terminal_interface-curses-mouse__ads.htm#ref_92_9">Window</A> := Standard_Window;
-+-                                Event  : Mouse_Event) <b>return</b> Boolean;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_154_13" HREF="terminal_interface-curses-mouse__adb.htm#ref_197_13">Enclosed_In_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_154_33" HREF="terminal_interface-curses-mouse__adb.htm#ref_197_33">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                                <FONT COLOR=red><A NAME="ref_155_33" HREF="terminal_interface-curses-mouse__adb.htm#ref_198_33">Event</A></FONT>  : <A HREF="terminal_interface-curses-mouse__ads.htm#ref_92_9">Mouse_Event</A>) <b>return</b> Boolean;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_mouse.3x.html">wenclose()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  But : use event instead of screen coordinates.</EM></FONT>
-+-   <b>pragma</b> Inline (Enclosed_In_Window);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-mouse__ads.htm#ref_154_13">Enclosed_In_Window</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_5"#2|</EM></FONT>
-+-   <b>function</b> Mouse_Interval (Msec : Natural := 200) <b>return</b> Natural;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_161_13" HREF="terminal_interface-curses-mouse__adb.htm#ref_212_13">Mouse_Interval</A></FONT> (<FONT COLOR=red><A NAME="ref_161_29" HREF="terminal_interface-curses-mouse__adb.htm#ref_212_29">Msec</A></FONT> : Natural := 200) <b>return</b> Natural;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_mouse.3x.html">mouseinterval()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Mouse_Interval);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-mouse__ads.htm#ref_161_13">Mouse_Interval</A>);
-+ 
-+ <b>private</b>
-+-   <b>type</b> Event_Mask <b>is</b> <b>new</b> Interfaces.C.unsigned_long;
-++   <b>type</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> <b>is</b> <b>new</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.unsigned_long;
-+ 
-+-   <b>type</b> Mouse_Event <b>is</b>
-++   <b>type</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_92_9">Mouse_Event</A> <b>is</b>
-+       <b>record</b>
-+-         Id      : Integer <b>range</b> Integer (<A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.short'First) ..
-+-         <FONT COLOR=red><A NAME="ref_172_10"> </A></FONT>  <FONT COLOR=red><A NAME="ref_172_13"> </A></FONT>  <FONT COLOR=red><A NAME="ref_172_16"> </A></FONT>                 Integer (<A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.short'Last);
-+-         X, Y, Z : Integer <b>range</b> Integer (<A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.int'First) ..
-+-         <FONT COLOR=red><A NAME="ref_174_10"> </A></FONT>         <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9"> </A>             Integer (Interfaces.C.int'Last);
-+-         Bstate  : Event_Mask;
-++         <FONT COLOR=red><A NAME="ref_170_10">Id</A></FONT>      : Integer <b>range</b> Integer (<A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.short'First) ..
-++                                 Integer (<A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.short'Last);
-++         <FONT COLOR=red><A NAME="ref_172_10">X</A></FONT>, <FONT COLOR=red><A NAME="ref_172_13">Y</A></FONT>, <FONT COLOR=red><A NAME="ref_172_16">Z</A></FONT> : Integer <b>range</b> Integer (<A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.int'First) ..
-++                                 Integer (<A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.int'Last);
-++         <FONT COLOR=red><A NAME="ref_174_10">Bstate</A></FONT>  : <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A>;
-+       <b>end</b> <b>record</b>;
-+-   <b>pragma</b> Convention (C, Mouse_Event);
-++   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-mouse__ads.htm#ref_92_9">Mouse_Event</A>);
-+ 
-+-   <b>for</b> Mouse_Event <b>use</b>
-++   <b>for</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_92_9">Mouse_Event</A> <b>use</b>
-+       <b>record</b>
-+          Id      <b>at</b> 0 <b>range</b>   0 ..  15;
-+          X       <b>at</b> 0 <b>range</b>  32 ..  63;
-+@@ -192,45 +191,45 @@
-+       <FONT COLOR=green><EM>--  Please note: this rep. clause is generated and may be</EM></FONT>
-+       <FONT COLOR=green><EM>--               different on your system.</EM></FONT>
-+ 
-+-   Generation_Bit_Order : <b>constant</b> System.Bit_Order := System.Low_Order_First;
-++   <FONT COLOR=red><A NAME="ref_189_4">Generation_Bit_Order</A></FONT> : <b>constant</b> System.Bit_Order := System.Low_Order_First;
-+    <FONT COLOR=green><EM>--  This constant may be different on your system.</EM></FONT>
-+ 
-+-   <FONT COLOR=red><A NAME="ref_193_4">BUTTON1_RELEASED</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000001#;
-+-   <FONT COLOR=red><A NAME="ref_194_4">BUTTON1_PRESSED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000002#;
-+-   <FONT COLOR=red><A NAME="ref_195_4">BUTTON1_CLICKED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000004#;
-+-   <FONT COLOR=red><A NAME="ref_196_4">BUTTON1_DOUBLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000010#;
-+-   <FONT COLOR=red><A NAME="ref_197_4">BUTTON1_TRIPLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000020#;
-+-   <FONT COLOR=red><A NAME="ref_198_4">BUTTON1_RESERVED_EVENT</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000040#;
-+-   <FONT COLOR=red><A NAME="ref_199_4">BUTTON2_RELEASED</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000100#;
-+-   <FONT COLOR=red><A NAME="ref_200_4">BUTTON2_PRESSED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000200#;
-+-   <FONT COLOR=red><A NAME="ref_201_4">BUTTON2_CLICKED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000400#;
-+-   <FONT COLOR=red><A NAME="ref_202_4">BUTTON2_DOUBLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000001000#;
-+-   <FONT COLOR=red><A NAME="ref_203_4">BUTTON2_TRIPLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000002000#;
-+-   <FONT COLOR=red><A NAME="ref_204_4">BUTTON2_RESERVED_EVENT</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000004000#;
-+-   <FONT COLOR=red><A NAME="ref_205_4">BUTTON3_RELEASED</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000010000#;
-+-   <FONT COLOR=red><A NAME="ref_206_4">BUTTON3_PRESSED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000020000#;
-+-   <FONT COLOR=red><A NAME="ref_207_4">BUTTON3_CLICKED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000040000#;
-+-   <FONT COLOR=red><A NAME="ref_208_4">BUTTON3_DOUBLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000100000#;
-+-   <FONT COLOR=red><A NAME="ref_209_4">BUTTON3_TRIPLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000200000#;
-+-   <FONT COLOR=red><A NAME="ref_210_4">BUTTON3_RESERVED_EVENT</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000400000#;
-+-   <FONT COLOR=red><A NAME="ref_211_4">BUTTON4_RELEASED</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00001000000#;
-+-   <FONT COLOR=red><A NAME="ref_212_4">BUTTON4_PRESSED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00002000000#;
-+-   <FONT COLOR=red><A NAME="ref_213_4">BUTTON4_CLICKED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00004000000#;
-+-   <FONT COLOR=red><A NAME="ref_214_4">BUTTON4_DOUBLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00010000000#;
-+-   <FONT COLOR=red><A NAME="ref_215_4">BUTTON4_TRIPLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00020000000#;
-+-   <FONT COLOR=red><A NAME="ref_216_4">BUTTON4_RESERVED_EVENT</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00040000000#;
-+-   <FONT COLOR=red><A NAME="ref_217_4">BUTTON_CTRL</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00100000000#;
-+-   <FONT COLOR=red><A NAME="ref_218_4">BUTTON_SHIFT</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00200000000#;
-+-   <FONT COLOR=red><A NAME="ref_219_4">BUTTON_ALT</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00400000000#;
-+-   <FONT COLOR=red><A NAME="ref_220_4">REPORT_MOUSE_POSITION</A></FONT>     : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#01000000000#;
-+-   <FONT COLOR=red><A NAME="ref_221_4">ALL_MOUSE_EVENTS</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00777777777#;
-+-   <FONT COLOR=red><A NAME="ref_222_4">BUTTON1_EVENTS</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000077#;
-+-   <FONT COLOR=red><A NAME="ref_223_4">BUTTON2_EVENTS</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000007700#;
-+-   <FONT COLOR=red><A NAME="ref_224_4">BUTTON3_EVENTS</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000770000#;
-+-   BUTTON4_EVENTS            : <b>constant</b> Event_Mask := 8#00077000000#;
-++   <FONT COLOR=red><A NAME="ref_192_4">BUTTON1_RELEASED</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000001#;
-++   <FONT COLOR=red><A NAME="ref_193_4">BUTTON1_PRESSED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000002#;
-++   <FONT COLOR=red><A NAME="ref_194_4">BUTTON1_CLICKED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000004#;
-++   <FONT COLOR=red><A NAME="ref_195_4">BUTTON1_DOUBLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000010#;
-++   <FONT COLOR=red><A NAME="ref_196_4">BUTTON1_TRIPLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000020#;
-++   <FONT COLOR=red><A NAME="ref_197_4">BUTTON1_RESERVED_EVENT</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000040#;
-++   <FONT COLOR=red><A NAME="ref_198_4">BUTTON2_RELEASED</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000100#;
-++   <FONT COLOR=red><A NAME="ref_199_4">BUTTON2_PRESSED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000200#;
-++   <FONT COLOR=red><A NAME="ref_200_4">BUTTON2_CLICKED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000400#;
-++   <FONT COLOR=red><A NAME="ref_201_4">BUTTON2_DOUBLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000001000#;
-++   <FONT COLOR=red><A NAME="ref_202_4">BUTTON2_TRIPLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000002000#;
-++   <FONT COLOR=red><A NAME="ref_203_4">BUTTON2_RESERVED_EVENT</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000004000#;
-++   <FONT COLOR=red><A NAME="ref_204_4">BUTTON3_RELEASED</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000010000#;
-++   <FONT COLOR=red><A NAME="ref_205_4">BUTTON3_PRESSED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000020000#;
-++   <FONT COLOR=red><A NAME="ref_206_4">BUTTON3_CLICKED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000040000#;
-++   <FONT COLOR=red><A NAME="ref_207_4">BUTTON3_DOUBLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000100000#;
-++   <FONT COLOR=red><A NAME="ref_208_4">BUTTON3_TRIPLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000200000#;
-++   <FONT COLOR=red><A NAME="ref_209_4">BUTTON3_RESERVED_EVENT</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000400000#;
-++   <FONT COLOR=red><A NAME="ref_210_4">BUTTON4_RELEASED</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00001000000#;
-++   <FONT COLOR=red><A NAME="ref_211_4">BUTTON4_PRESSED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00002000000#;
-++   <FONT COLOR=red><A NAME="ref_212_4">BUTTON4_CLICKED</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00004000000#;
-++   <FONT COLOR=red><A NAME="ref_213_4">BUTTON4_DOUBLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00010000000#;
-++   <FONT COLOR=red><A NAME="ref_214_4">BUTTON4_TRIPLE_CLICKED</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00020000000#;
-++   <FONT COLOR=red><A NAME="ref_215_4">BUTTON4_RESERVED_EVENT</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00040000000#;
-++   <FONT COLOR=red><A NAME="ref_216_4">BUTTON_CTRL</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00100000000#;
-++   <FONT COLOR=red><A NAME="ref_217_4">BUTTON_SHIFT</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00200000000#;
-++   <FONT COLOR=red><A NAME="ref_218_4">BUTTON_ALT</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00400000000#;
-++   <FONT COLOR=red><A NAME="ref_219_4">REPORT_MOUSE_POSITION</A></FONT>     : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#01000000000#;
-++   <FONT COLOR=red><A NAME="ref_220_4">ALL_MOUSE_EVENTS</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00777777777#;
-++   <FONT COLOR=red><A NAME="ref_221_4">BUTTON1_EVENTS</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000000077#;
-++   <FONT COLOR=red><A NAME="ref_222_4">BUTTON2_EVENTS</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000007700#;
-++   <FONT COLOR=red><A NAME="ref_223_4">BUTTON3_EVENTS</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00000770000#;
-++   <FONT COLOR=red><A NAME="ref_224_4">BUTTON4_EVENTS</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 8#00077000000#;
-+ 
-+-   <A HREF="terminal_interface-curses-mouse__ads.htm#ref_66_4">No_Events</A>  : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := <A HREF="terminal_interface-curses-mouse__ads.htm#ref_220_4">0</A>;
-+-   All_Events : <b>constant</b> Event_Mask := ALL_MOUSE_EVENTS;
-++   <A HREF="terminal_interface-curses-mouse__ads.htm#ref_65_4">No_Events</A>  : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := 0;
-++   <A HREF="terminal_interface-curses-mouse__ads.htm#ref_66_4">All_Events</A> : <b>constant</b> <A HREF="terminal_interface-curses-mouse__ads.htm#ref_64_9">Event_Mask</A> := <A HREF="terminal_interface-curses-mouse__ads.htm#ref_220_4">ALL_MOUSE_EVENTS</A>;
-+ 
-+-<b>end</b> Terminal_Interface.Curses.Mouse;
-++<b>end</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-mouse__ads.htm#ref_48_35">Mouse</A>;
-+ </PRE></BODY></HTML>
-+Index: doc/html/ada/terminal_interface-curses-panels-user_data__ads.htm
-+--- ncurses-5.6/doc/html/ada/terminal_interface-curses-panels-user_data__ads.htm	2006-09-23 20:31:31.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/terminal_interface-curses-panels-user_data__ads.htm	2007-09-01 23:56:31.000000000 +0000
-+@@ -3,7 +3,6 @@
-+ <BODY>
-+ <HR><DIV ALIGN="center"><H1> File : terminal_interface-curses-panels-user_data.ads </H1></DIV><HR>
-+ <PRE>
-+-
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
-+ <FONT COLOR=green><EM>--                           <A HREF="http://www.gnat.com">GNAT</A> ncurses Binding                           --</EM></FONT>
-+@@ -46,31 +45,31 @@
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ 
-+ <b>generic</b>
-+-   <b>type</b> <FONT COLOR=red><A NAME="ref_44_9" HREF="terminal_interface-curses-panels-user_data__ads.htm#ref_45_42">User</A></FONT> <b>is</b> <b>limited</b> <b>private</b>;
-+-   <b>type</b> <A HREF="terminal_interface__ads.htm#ref_42_9">User_Access</A> <b>is</b> <b>access</b> <b>all</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_44_35">User</A>;
-+-<b>package</b> Terminal_Interface.Curses.Panels.User_Data<A HREF="terminal_interface-curses-panels__ads.htm#ref_44_35"> </A><b>is</b>
-+-   <b>pragma</b> Preelaborate (Terminal_Interface.Curses.Panels.User_Data);
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_43_9" HREF="terminal_interface-curses-panels-user_data__ads.htm#ref_45_42">User</A></FONT> <b>is</b> <b>limited</b> <b>private</b>;
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_44_9" HREF="terminal_interface-curses-panels-user_data__ads.htm#ref_45_42">User_Access</A></FONT> <b>is</b> <b>access</b> <b>all</b> <A HREF="terminal_interface-curses-panels-user_data__ads.htm#ref_43_9">User</A>;
-++<b>package</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-panels__ads.htm#ref_44_35">Panels</A>.<FONT COLOR=red><A NAME="ref_45_42" HREF="terminal_interface-curses-panels-user_data__adb.htm#ref_47_47">User_Data</A></FONT> <b>is</b>
-++   <b>pragma</b> Preelaborate (<A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-panels__ads.htm#ref_44_35">Panels</A>.<A HREF="terminal_interface-curses-panels-user_data__ads.htm#ref_45_42">User_Data</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/panel.3x.html">panel.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_1"#2|</EM></FONT>
-+-   <b>procedure</b> Set_User_Data (<FONT COLOR=red><A NAME="ref_54_29" HREF="terminal_interface-curses-panels-user_data__adb.htm#ref_52_29">Pan</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-panels-user_data__ads.htm#ref_44_9">Panel</A>;
-+-                            Data : <b>in</b> User_Access);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_53_14" HREF="terminal_interface-curses-panels-user_data__adb.htm#ref_51_14">Set_User_Data</A></FONT> (<FONT COLOR=red><A NAME="ref_53_29" HREF="terminal_interface-curses-panels-user_data__adb.htm#ref_51_29">Pan</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>;
-++                            <FONT COLOR=red><A NAME="ref_54_29" HREF="terminal_interface-curses-panels-user_data__adb.htm#ref_52_29">Data</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-panels-user_data__ads.htm#ref_44_9">User_Access</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">set_panel_userptr</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_User_Data);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-panels-user_data__ads.htm#ref_53_14">Set_User_Data</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_2"#2|</EM></FONT>
-+-   <b>procedure</b> Get_User_Data (<FONT COLOR=red><A NAME="ref_60_29" HREF="terminal_interface-curses-panels-user_data__adb.htm#ref_72_29">Pan</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-panels-user_data__ads.htm#ref_44_9">Panel</A>;
-+-                            Data : <b>out</b> User_Access);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_59_14" HREF="terminal_interface-curses-panels-user_data__adb.htm#ref_71_14">Get_User_Data</A></FONT> (<FONT COLOR=red><A NAME="ref_59_29" HREF="terminal_interface-curses-panels-user_data__adb.htm#ref_71_29">Pan</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>;
-++                            <FONT COLOR=red><A NAME="ref_60_29" HREF="terminal_interface-curses-panels-user_data__adb.htm#ref_72_29">Data</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses-panels-user_data__ads.htm#ref_44_9">User_Access</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">panel_userptr</A></EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_3"#2|</EM></FONT>
-+-   <b>function</b> Get_User_Data (Pan  : <b>in</b>  Panel) <b>return</b> User_Access;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_64_13" HREF="terminal_interface-curses-panels-user_data__adb.htm#ref_63_13">Get_User_Data</A></FONT> (<FONT COLOR=red><A NAME="ref_64_28" HREF="terminal_interface-curses-panels-user_data__adb.htm#ref_63_28">Pan</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>) <b>return</b> <A HREF="terminal_interface-curses-panels-user_data__ads.htm#ref_44_9">User_Access</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">panel_userptr</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  Same as function</EM></FONT>
-+    <b>pragma</b> Inline (Get_User_Data);
-+ 
-+-<b>end</b> Terminal_Interface.Curses.Panels.User_Data;
-++<b>end</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-panels__ads.htm#ref_44_35">Panels</A>.<A HREF="terminal_interface-curses-panels-user_data__ads.htm#ref_45_42">User_Data</A>;
-+ </PRE></BODY></HTML>
-+Index: doc/html/ada/terminal_interface-curses-panels__ads.htm
-+--- ncurses-5.6/doc/html/ada/terminal_interface-curses-panels__ads.htm	2006-09-23 20:31:32.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/terminal_interface-curses-panels__ads.htm	2007-09-01 23:56:31.000000000 +0000
-+@@ -3,7 +3,6 @@
-+ <BODY>
-+ <HR><DIV ALIGN="center"><H1> File : terminal_interface-curses-panels.ads </H1></DIV><HR>
-+ <PRE>
-+-
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
-+ <FONT COLOR=green><EM>--                           <A HREF="http://www.gnat.com">GNAT</A> ncurses Binding                           --</EM></FONT>
-+@@ -47,108 +46,108 @@
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ <b>with</b> System;
-+ 
-+-<b>package</b> Terminal_Interface.Curses.Panels <b>is</b>
-+-   <b>pragma</b> Preelaborate (Terminal_Interface.Curses.Panels);
-++<b>package</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<FONT COLOR=red><A NAME="ref_44_35" HREF="terminal_interface-curses-panels__adb.htm#ref_45_40">Panels</A></FONT> <b>is</b>
-++   <b>pragma</b> Preelaborate (<A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-panels__ads.htm#ref_44_35">Panels</A>);
-+    <b>pragma</b> Linker_Options ("-lpanel");
-+    <b>pragma</b> Linker_Options ("-lncurses");
-+ 
-+-   <b>type</b> Panel <b>is</b> <b>private</b>;
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_49_9">Panel</A></FONT> <b>is</b> <b>private</b>;
-+ 
-+    <FONT COLOR=green><EM>---------------------------</EM></FONT>
-+    <FONT COLOR=green><EM>--  Interface constants  --</EM></FONT>
-+    <FONT COLOR=green><EM>---------------------------</EM></FONT>
-+-   Null_Panel : <b>constant</b> Panel;
-++   <FONT COLOR=red><A NAME="ref_54_4">Null_Panel</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>;
-+ 
-+    <FONT COLOR=green><EM>-------------------</EM></FONT>
-+    <FONT COLOR=green><EM>--  Exceptions   --</EM></FONT>
-+    <FONT COLOR=green><EM>-------------------</EM></FONT>
-+ 
-+-   Panel_Exception : <b>exception</b>;
-++   <FONT COLOR=red><A NAME="ref_60_4">Panel_Exception</A></FONT> : <b>exception</b>;
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/panel.3x.html">panel.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_1"#2|</EM></FONT>
-+-   <b>function</b> Create (Win : Window) <b>return</b> Panel;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_67_13" HREF="terminal_interface-curses-panels__adb.htm#ref_49_13">Create</A></FONT> (<FONT COLOR=red><A NAME="ref_67_21" HREF="terminal_interface-curses-panels__adb.htm#ref_49_21">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">new_panel()</A></EM></FONT>
-+    <b>pragma</b> Inline (Create);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_2"#2|</EM></FONT>
-+-   <b>function</b> New_Panel (Win : Window) <b>return</b> Panel <b>renames</b> Create;
-++   <b>function</b> New_Panel (<FONT COLOR=red><A NAME="ref_72_24">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A> <b>renames</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_67_13">Create</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">new_panel()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  pragma Inline (New_Panel);</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_3"#2|</EM></FONT>
-+-   <b>procedure</b> Bottom (Pan : <b>in</b> Panel);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_77_14" HREF="terminal_interface-curses-panels__adb.htm#ref_63_14">Bottom</A></FONT> (<FONT COLOR=red><A NAME="ref_77_22" HREF="terminal_interface-curses-panels__adb.htm#ref_63_22">Pan</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">bottom_panel()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Bottom);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-panels__ads.htm#ref_77_14">Bottom</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_4"#2|</EM></FONT>
-+-   <b>procedure</b> Top (Pan : <b>in</b> Panel);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_82_14" HREF="terminal_interface-curses-panels__adb.htm#ref_73_14">Top</A></FONT> (<FONT COLOR=red><A NAME="ref_82_19" HREF="terminal_interface-curses-panels__adb.htm#ref_73_19">Pan</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">top_panel()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Top);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-panels__ads.htm#ref_82_14">Top</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_5"#2|</EM></FONT>
-+-   <b>procedure</b> Show (Pan : <b>in</b> Panel);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_87_14" HREF="terminal_interface-curses-panels__adb.htm#ref_83_14">Show</A></FONT> (<FONT COLOR=red><A NAME="ref_87_20" HREF="terminal_interface-curses-panels__adb.htm#ref_83_20">Pan</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">show_panel()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Show);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-panels__ads.htm#ref_87_14">Show</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_6"#2|</EM></FONT>
-+-   <b>procedure</b> Update_Panels;
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_92_14">Update_Panels</A></FONT>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">update_panels()</A></EM></FONT>
-+    <b>pragma</b> Import (C, Update_Panels, "update_panels");
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_7"#2|</EM></FONT>
-+-   <b>procedure</b> Hide (Pan : <b>in</b> Panel);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_97_14" HREF="terminal_interface-curses-panels__adb.htm#ref_93_14">Hide</A></FONT> (<FONT COLOR=red><A NAME="ref_97_20" HREF="terminal_interface-curses-panels__adb.htm#ref_93_20">Pan</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">hide_panel()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Hide);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-panels__ads.htm#ref_97_14">Hide</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_8"#2|</EM></FONT>
-+-   <b>function</b> Get_Window (Pan : Panel) <b>return</b> Window;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_102_13" HREF="terminal_interface-curses-panels__adb.htm#ref_103_13">Get_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_102_25" HREF="terminal_interface-curses-panels__adb.htm#ref_103_25">Pan</A></FONT> : <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">panel_window()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Get_Window);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-panels__ads.htm#ref_102_13">Get_Window</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_9"#2|</EM></FONT>
-+-   <b>function</b> Panel_Window (Pan : Panel) <b>return</b> Window <b>renames</b> Get_Window;
-++   <b>function</b> Panel_Window (<FONT COLOR=red><A NAME="ref_107_27">Pan</A></FONT> : <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> <b>renames</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_102_13">Get_Window</A>;
-+    <FONT COLOR=green><EM>--  pragma Inline (Panel_Window);</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_10"#2|</EM></FONT>
-+-   <b>procedure</b> Replace (<FONT COLOR=red><A NAME="ref_112_23" HREF="terminal_interface-curses-panels__adb.htm#ref_117_23">Pan</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Panel</A>;
-+-                      Win : <b>in</b> Window);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_111_14" HREF="terminal_interface-curses-panels__adb.htm#ref_116_14">Replace</A></FONT> (<FONT COLOR=red><A NAME="ref_111_23" HREF="terminal_interface-curses-panels__adb.htm#ref_116_23">Pan</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>;
-++                      <FONT COLOR=red><A NAME="ref_112_23" HREF="terminal_interface-curses-panels__adb.htm#ref_117_23">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">replace_panel()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Replace);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-panels__ads.htm#ref_111_14">Replace</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_11"#2|</EM></FONT>
-+-   <b>procedure</b> Move (<FONT COLOR=red><A NAME="ref_118_20" HREF="terminal_interface-curses-panels__adb.htm#ref_129_20">Pan</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Panel</A>;
-+-                   <FONT COLOR=red><A NAME="ref_119_20" HREF="terminal_interface-curses-panels__adb.htm#ref_130_20">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-                   Column : <b>in</b> Column_Position);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_117_14" HREF="terminal_interface-curses-panels__adb.htm#ref_128_14">Move</A></FONT> (<FONT COLOR=red><A NAME="ref_117_20" HREF="terminal_interface-curses-panels__adb.htm#ref_128_20">Pan</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>;
-++                   <FONT COLOR=red><A NAME="ref_118_20" HREF="terminal_interface-curses-panels__adb.htm#ref_129_20">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++                   <FONT COLOR=red><A NAME="ref_119_20" HREF="terminal_interface-curses-panels__adb.htm#ref_130_20">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">move_panel()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Move);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-panels__ads.htm#ref_117_14">Move</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_12"#2|</EM></FONT>
-+-   <b>function</b> Is_Hidden (Pan : Panel) <b>return</b> Boolean;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_124_13" HREF="terminal_interface-curses-panels__adb.htm#ref_142_13">Is_Hidden</A></FONT> (<FONT COLOR=red><A NAME="ref_124_24" HREF="terminal_interface-curses-panels__adb.htm#ref_142_24">Pan</A></FONT> : <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>) <b>return</b> Boolean;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">panel_hidden()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Is_Hidden);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses-panels__ads.htm#ref_124_13">Is_Hidden</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_13"#2|</EM></FONT>
-+-   <b>function</b> Above (Pan : Panel) <b>return</b> Panel;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_129_13">Above</A></FONT> (<FONT COLOR=red><A NAME="ref_129_20" HREF="terminal_interface-curses-panels__ads.htm#ref_129_13">Pan</A></FONT> : <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>) <b>return</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">panel_above()</A></EM></FONT>
-+    <b>pragma</b> Import (C, Above, "panel_above");
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_14"#2|</EM></FONT>
-+-   <b>function</b> Below (Pan : Panel) <b>return</b> Panel;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_134_13">Below</A></FONT> (<FONT COLOR=red><A NAME="ref_134_20" HREF="terminal_interface-curses-panels__ads.htm#ref_134_13">Pan</A></FONT> : <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>) <b>return</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">panel_below()</A></EM></FONT>
-+    <b>pragma</b> Import (C, Below, "panel_below");
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_15"#2|</EM></FONT>
-+-   <b>procedure</b> Delete (Pan : <b>in</b> <b>out</b> Panel);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_139_14" HREF="terminal_interface-curses-panels__adb.htm#ref_154_14">Delete</A></FONT> (<FONT COLOR=red><A NAME="ref_139_22" HREF="terminal_interface-curses-panels__adb.htm#ref_154_22">Pan</A></FONT> : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/panel.3x.html">del_panel()</A></EM></FONT>
-+    <b>pragma</b> Inline (Delete);
-+ 
-+ <b>private</b>
-+-      <b>type</b> Panel <b>is</b> <b>new</b> System.Storage_Elements.Integer_Address;
-+-      Null_Panel : <b>constant</b> Panel := 0;
-++      <b>type</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A> <b>is</b> <b>new</b> System.Storage_Elements.Integer_Address;
-++      <A HREF="terminal_interface-curses-panels__ads.htm#ref_54_4">Null_Panel</A> : <b>constant</b> <A HREF="terminal_interface-curses-panels__ads.htm#ref_49_9">Panel</A> := 0;
-+ 
-+-<b>end</b> Terminal_Interface.Curses.Panels;
-++<b>end</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-panels__ads.htm#ref_44_35">Panels</A>;
-+ </PRE></BODY></HTML>
-+Index: doc/html/ada/terminal_interface-curses-terminfo__adb.htm
-+--- ncurses-5.6/doc/html/ada/terminal_interface-curses-terminfo__adb.htm	2006-09-23 20:31:32.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/terminal_interface-curses-terminfo__adb.htm	2007-05-05 20:35:20.000000000 +0000
-+@@ -71,13 +71,13 @@
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+    <b>function</b> <FONT COLOR=red><A NAME="ref_67_13" HREF="terminal_interface-curses-terminfo__ads.htm#ref_64_13">Get_Flag</A></FONT> (<FONT COLOR=red><A NAME="ref_67_23" HREF="terminal_interface-curses-terminfo__ads.htm#ref_64_23">Name</A></FONT> : String) <b>return</b> Boolean
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_69_16">tigetflag</A></FONT> (<FONT COLOR=red><A NAME="ref_69_27" HREF="terminal_interface-curses-terminfo__adb.htm#ref_69_16">id</A></FONT> : char_array) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_69_16">tigetflag</A></FONT> (<FONT COLOR=red><A NAME="ref_69_27" HREF="terminal_interface-curses-terminfo__adb.htm#ref_69_16">id</A></FONT> : char_array) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>;
-+       <b>pragma</b> Import (C, tigetflag);
-+       <FONT COLOR=red><A NAME="ref_71_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses-terminfo__ads.htm#ref_64_23">Name</A>'Length);
-+       <FONT COLOR=red><A NAME="ref_72_7">Length</A></FONT> : size_t;
-+    <b>begin</b>
-+       To_C (<A HREF="terminal_interface-curses-terminfo__ads.htm#ref_64_23">Name</A>, <A HREF="terminal_interface-curses-terminfo__adb.htm#ref_71_7">Txt</A>, <A HREF="terminal_interface-curses-terminfo__adb.htm#ref_72_7">Length</A>);
-+-      <b>if</b> <A HREF="terminal_interface-curses-terminfo__adb.htm#ref_69_16">tigetflag</A> (<A HREF="terminal_interface-curses-terminfo__adb.htm#ref_71_7">Txt</A>) = <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_74_4">Curses_True</A>) <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses-terminfo__adb.htm#ref_69_16">tigetflag</A> (<A HREF="terminal_interface-curses-terminfo__adb.htm#ref_71_7">Txt</A>) = <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_74_4">Curses_True</A>) <b>then</b>
-+          <b>return</b> True;
-+       <b>else</b>
-+          <b>return</b> False;
-+Index: doc/html/ada/terminal_interface-curses-text_io-aux__adb.htm
-+--- ncurses-5.6/doc/html/ada/terminal_interface-curses-text_io-aux__adb.htm	2006-09-23 20:31:32.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/terminal_interface-curses-text_io-aux__adb.htm	2007-05-05 20:35:20.000000000 +0000
-+@@ -76,7 +76,7 @@
-+             <b>end</b> <b>if</b>;
-+ 
-+             <b>pragma</b> Assert (<A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_52_7">Len</A> &lt;= <A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_53_7">W</A>);
-+-            <A HREF="terminal_interface-curses__ads.htm#ref_1222_14">Get_Size</A> (<A HREF="terminal_interface-curses-text_io-aux__ads.htm#ref_49_7">Win</A>, <A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_54_7">LC</A>, <A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_55_7">CC</A>);
-++            <A HREF="terminal_interface-curses__ads.htm#ref_1228_14">Get_Size</A> (<A HREF="terminal_interface-curses-text_io-aux__ads.htm#ref_49_7">Win</A>, <A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_54_7">LC</A>, <A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_55_7">CC</A>);
-+             <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A> (<A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_52_7">Len</A>) &gt; <A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_55_7">CC</A> <b>then</b>
-+                <b>if</b> <A HREF="terminal_interface-curses-text_io-aux__ads.htm#ref_52_7">Signal</A> <b>then</b>
-+                   <b>raise</b> <A HREF="terminal_interface-curses-text_io__ads.htm#ref_134_4">Layout_Error</A>;
-+@@ -92,7 +92,7 @@
-+                      <A HREF="terminal_interface-curses-text_io__ads.htm#ref_115_14">Put</A> (<A HREF="terminal_interface-curses-text_io-aux__ads.htm#ref_49_7">Win</A>, <A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_84_22">Filler</A>);
-+                   <b>end</b>;
-+                <b>end</b> <b>if</b>;
-+-               <A HREF="terminal_interface-curses__ads.htm#ref_1238_14">Get_Cursor_Position</A> (<A HREF="terminal_interface-curses-text_io-aux__ads.htm#ref_49_7">Win</A>, <A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_56_7">Y</A>, <A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_57_7">X</A>);
-++               <A HREF="terminal_interface-curses__ads.htm#ref_1244_14">Get_Cursor_Position</A> (<A HREF="terminal_interface-curses-text_io-aux__ads.htm#ref_49_7">Win</A>, <A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_56_7">Y</A>, <A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_57_7">X</A>);
-+                <b>if</b> (<A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_57_7">X</A> + <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> (<A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_52_7">Len</A>)) &gt; <A HREF="terminal_interface-curses-text_io-aux__adb.htm#ref_55_7">CC</A> <b>then</b>
-+                   <A HREF="terminal_interface-curses-text_io__ads.htm#ref_86_14">New_Line</A> (<A HREF="terminal_interface-curses-text_io-aux__ads.htm#ref_49_7">Win</A>);
-+                <b>end</b> <b>if</b>;
-+Index: doc/html/ada/terminal_interface-curses-text_io__adb.htm
-+--- ncurses-5.6/doc/html/ada/terminal_interface-curses-text_io__adb.htm	2006-09-23 20:31:32.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/terminal_interface-curses-text_io__adb.htm	2007-05-05 20:35:20.000000000 +0000
-+@@ -58,7 +58,7 @@
-+    <b>is</b>
-+    <b>begin</b>
-+       <b>if</b> <A HREF="terminal_interface-curses-text_io__adb.htm#ref_44_4">Default_Window</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-+-         <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-++         <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-+       <b>else</b>
-+          <b>return</b> <A HREF="terminal_interface-curses-text_io__adb.htm#ref_44_4">Default_Window</A>;
-+       <b>end</b> <b>if</b>;
-+@@ -68,7 +68,7 @@
-+    <b>procedure</b> <FONT COLOR=red><A NAME="ref_63_14" HREF="terminal_interface-curses-text_io__ads.htm#ref_65_14">Flush</A></FONT> (<FONT COLOR=red><A NAME="ref_63_21" HREF="terminal_interface-curses-text_io__ads.htm#ref_65_21">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>)
-+    <b>is</b>
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_1039_14">Refresh</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_65_21">Win</A>);
-++      <A HREF="terminal_interface-curses__ads.htm#ref_1045_14">Refresh</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_65_21">Win</A>);
-+    <b>end</b> <A HREF="terminal_interface-curses-text_io__ads.htm#ref_65_14">Flush</A>;
-+ 
-+    <b>procedure</b> <FONT COLOR=red><A NAME="ref_69_14" HREF="terminal_interface-curses-text_io__ads.htm#ref_66_14">Flush</A></FONT>
-+@@ -91,7 +91,7 @@
-+       <FONT COLOR=red><A NAME="ref_86_7">N_Lines</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+       <FONT COLOR=red><A NAME="ref_87_7">N_Cols</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_1222_14">Get_Size</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_77_26">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_86_7">N_Lines</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_87_7">N_Cols</A>);
-++      <A HREF="terminal_interface-curses__ads.htm#ref_1228_14">Get_Size</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_77_26">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_86_7">N_Lines</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_87_7">N_Cols</A>);
-+       <FONT COLOR=green><EM>--  if Natural (N_Cols) &gt; Natural (Count'Last) then</EM></FONT>
-+       <FONT COLOR=green><EM>--     raise Layout_Error;</EM></FONT>
-+       <FONT COLOR=green><EM>--  end if;</EM></FONT>
-+@@ -109,10 +109,10 @@
-+       <FONT COLOR=red><A NAME="ref_104_7">N_Lines</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+       <FONT COLOR=red><A NAME="ref_105_7">N_Cols</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_1016_13">Scrolling_Allowed</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_80_26">Win</A>) <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_1022_13">Scrolling_Allowed</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_80_26">Win</A>) <b>then</b>
-+          <b>return</b> 0;
-+       <b>else</b>
-+-         <A HREF="terminal_interface-curses__ads.htm#ref_1222_14">Get_Size</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_80_26">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_104_7">N_Lines</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_105_7">N_Cols</A>);
-++         <A HREF="terminal_interface-curses__ads.htm#ref_1228_14">Get_Size</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_80_26">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_104_7">N_Lines</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_105_7">N_Cols</A>);
-+          <FONT COLOR=green><EM>--  if Natural (N_Lines) &gt; Natural (Count'Last) then</EM></FONT>
-+          <FONT COLOR=green><EM>--     raise Layout_Error;</EM></FONT>
-+          <FONT COLOR=green><EM>--  end if;</EM></FONT>
-+@@ -141,7 +141,7 @@
-+          <b>if</b> <A HREF="terminal_interface-curses-text_io__adb.htm#ref_129_7">P_Size</A> &gt; 0 <b>and</b> <b>then</b> <A HREF="terminal_interface-curses-text_io__ads.htm#ref_101_13">Line</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_86_24">Win</A>) &gt;= <A HREF="terminal_interface-curses-text_io__adb.htm#ref_129_7">P_Size</A> <b>then</b>
-+             <A HREF="terminal_interface-curses-text_io__ads.htm#ref_89_14">New_Page</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_86_24">Win</A>);
-+          <b>else</b>
-+-            <A HREF="terminal_interface-curses__ads.htm#ref_522_14">Add</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_86_24">Win</A>, ASCII.LF);
-++            <A HREF="terminal_interface-curses__ads.htm#ref_528_14">Add</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_86_24">Win</A>, ASCII.LF);
-+          <b>end</b> <b>if</b>;
-+       <b>end</b> <b>loop</b>;
-+    <b>end</b> <A HREF="terminal_interface-curses-text_io__ads.htm#ref_86_14">New_Line</A>;
-+@@ -155,7 +155,7 @@
-+    <b>procedure</b> <FONT COLOR=red><A NAME="ref_150_14" HREF="terminal_interface-curses-text_io__ads.htm#ref_89_14">New_Page</A></FONT> (<FONT COLOR=red><A NAME="ref_150_24" HREF="terminal_interface-curses-text_io__ads.htm#ref_89_24">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>)
-+    <b>is</b>
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_1074_14">Clear</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_89_24">Win</A>);
-++      <A HREF="terminal_interface-curses__ads.htm#ref_1080_14">Clear</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_89_24">Win</A>);
-+    <b>end</b> <A HREF="terminal_interface-curses-text_io__ads.htm#ref_89_14">New_Page</A>;
-+ 
-+    <b>procedure</b> <FONT COLOR=red><A NAME="ref_156_14" HREF="terminal_interface-curses-text_io__ads.htm#ref_90_14">New_Page</A></FONT>
-+@@ -175,7 +175,7 @@
-+          <b>raise</b> Constraint_Error;
-+       <b>end</b> <b>if</b>;
-+ 
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_1238_14">Get_Cursor_Position</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_92_23">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_164_7">Y</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_165_7">X1</A>);
-++      <A HREF="terminal_interface-curses__ads.htm#ref_1244_14">Get_Cursor_Position</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_92_23">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_164_7">Y</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_165_7">X1</A>);
-+       <A HREF="terminal_interface-curses-text_io__adb.htm#ref_167_7">N</A>  := Natural (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_92_41">To</A>); <A HREF="terminal_interface-curses-text_io__adb.htm#ref_167_7">N</A> := <A HREF="terminal_interface-curses-text_io__adb.htm#ref_167_7">N</A> - 1;
-+       <A HREF="terminal_interface-curses-text_io__adb.htm#ref_166_7">X2</A> := <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> (<A HREF="terminal_interface-curses-text_io__adb.htm#ref_167_7">N</A>);
-+       <b>if</b> <A HREF="terminal_interface-curses-text_io__adb.htm#ref_165_7">X1</A> &gt; <A HREF="terminal_interface-curses-text_io__adb.htm#ref_166_7">X2</A> <b>then</b>
-+@@ -209,7 +209,7 @@
-+          <b>raise</b> Constraint_Error;
-+       <b>end</b> <b>if</b>;
-+ 
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_1238_14">Get_Cursor_Position</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_95_24">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_198_7">Y1</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_200_7">X</A>);
-++      <A HREF="terminal_interface-curses__ads.htm#ref_1244_14">Get_Cursor_Position</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_95_24">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_198_7">Y1</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_200_7">X</A>);
-+       <A HREF="terminal_interface-curses-text_io__adb.htm#ref_201_7">N</A>  := Natural (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_95_41">To</A>); <A HREF="terminal_interface-curses-text_io__adb.htm#ref_201_7">N</A> := <A HREF="terminal_interface-curses-text_io__adb.htm#ref_201_7">N</A> - 1;
-+       <A HREF="terminal_interface-curses-text_io__adb.htm#ref_199_7">Y2</A> := <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A> (<A HREF="terminal_interface-curses-text_io__adb.htm#ref_201_7">N</A>);
-+       <b>if</b> <A HREF="terminal_interface-curses-text_io__adb.htm#ref_199_7">Y2</A> &lt; <A HREF="terminal_interface-curses-text_io__adb.htm#ref_198_7">Y1</A> <b>then</b>
-+@@ -233,7 +233,7 @@
-+       <FONT COLOR=red><A NAME="ref_228_7">X</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+       <FONT COLOR=red><A NAME="ref_229_7">N</A></FONT> : Natural;
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_1238_14">Get_Cursor_Position</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_98_18">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_227_7">Y</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_228_7">X</A>);
-++      <A HREF="terminal_interface-curses__ads.htm#ref_1244_14">Get_Cursor_Position</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_98_18">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_227_7">Y</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_228_7">X</A>);
-+       <A HREF="terminal_interface-curses-text_io__adb.htm#ref_229_7">N</A> := Natural (<A HREF="terminal_interface-curses-text_io__adb.htm#ref_228_7">X</A>); <A HREF="terminal_interface-curses-text_io__adb.htm#ref_229_7">N</A> := <A HREF="terminal_interface-curses-text_io__adb.htm#ref_229_7">N</A> + 1;
-+       <FONT COLOR=green><EM>--  if N &gt; Natural (Count'Last) then</EM></FONT>
-+       <FONT COLOR=green><EM>--     raise Layout_Error;</EM></FONT>
-+@@ -253,7 +253,7 @@
-+       <FONT COLOR=red><A NAME="ref_248_7">X</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+       <FONT COLOR=red><A NAME="ref_249_7">N</A></FONT> : Natural;
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_1238_14">Get_Cursor_Position</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_101_19">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_247_7">Y</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_248_7">X</A>);
-++      <A HREF="terminal_interface-curses__ads.htm#ref_1244_14">Get_Cursor_Position</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_101_19">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_247_7">Y</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_248_7">X</A>);
-+       <A HREF="terminal_interface-curses-text_io__adb.htm#ref_249_7">N</A> := Natural (<A HREF="terminal_interface-curses-text_io__adb.htm#ref_247_7">Y</A>); <A HREF="terminal_interface-curses-text_io__adb.htm#ref_249_7">N</A> := <A HREF="terminal_interface-curses-text_io__adb.htm#ref_249_7">N</A> + 1;
-+       <FONT COLOR=green><EM>--  if N &gt; Natural (Count'Last) then</EM></FONT>
-+       <FONT COLOR=green><EM>--     raise Layout_Error;</EM></FONT>
-+@@ -280,13 +280,13 @@
-+       <FONT COLOR=red><A NAME="ref_275_7">C</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-+    <b>begin</b>
-+       <b>if</b> <A HREF="terminal_interface-curses-text_io__adb.htm#ref_271_7">P_Size</A> &gt; 0 <b>then</b>
-+-         <A HREF="terminal_interface-curses__ads.htm#ref_1238_14">Get_Cursor_Position</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_108_19">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_272_7">Y</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_273_7">X</A>);
-+-         <A HREF="terminal_interface-curses__ads.htm#ref_1222_14">Get_Size</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_108_19">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_274_7">L</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_275_7">C</A>);
-++         <A HREF="terminal_interface-curses__ads.htm#ref_1244_14">Get_Cursor_Position</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_108_19">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_272_7">Y</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_273_7">X</A>);
-++         <A HREF="terminal_interface-curses__ads.htm#ref_1228_14">Get_Size</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_108_19">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_274_7">L</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_275_7">C</A>);
-+          <b>if</b> (<A HREF="terminal_interface-curses-text_io__adb.htm#ref_272_7">Y</A> + 1) = <A HREF="terminal_interface-curses-text_io__adb.htm#ref_274_7">L</A> <b>and</b> <b>then</b> (<A HREF="terminal_interface-curses-text_io__adb.htm#ref_273_7">X</A> + 1) = <A HREF="terminal_interface-curses-text_io__adb.htm#ref_275_7">C</A> <b>then</b>
-+             <A HREF="terminal_interface-curses-text_io__ads.htm#ref_89_14">New_Page</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_108_19">Win</A>);
-+          <b>end</b> <b>if</b>;
-+       <b>end</b> <b>if</b>;
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_522_14">Add</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_108_19">Win</A>, <A HREF="terminal_interface-curses-text_io__ads.htm#ref_108_37">Item</A>);
-++      <A HREF="terminal_interface-curses__ads.htm#ref_528_14">Add</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_108_19">Win</A>, <A HREF="terminal_interface-curses-text_io__ads.htm#ref_108_37">Item</A>);
-+    <b>end</b> <A HREF="terminal_interface-curses-text_io__ads.htm#ref_108_14">Put</A>;
-+ 
-+    <b>procedure</b> <FONT COLOR=red><A NAME="ref_287_14" HREF="terminal_interface-curses-text_io__ads.htm#ref_109_14">Put</A></FONT> (<FONT COLOR=red><A NAME="ref_287_19" HREF="terminal_interface-curses-text_io__ads.htm#ref_109_19">Item</A></FONT> : <b>in</b> Character)
-+@@ -308,13 +308,13 @@
-+       <FONT COLOR=red><A NAME="ref_303_7">C</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-+    <b>begin</b>
-+       <b>if</b> <A HREF="terminal_interface-curses-text_io__adb.htm#ref_299_7">P_Size</A> &gt; 0 <b>then</b>
-+-         <A HREF="terminal_interface-curses__ads.htm#ref_1238_14">Get_Cursor_Position</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_115_19">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_300_7">Y</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_301_7">X</A>);
-+-         <A HREF="terminal_interface-curses__ads.htm#ref_1222_14">Get_Size</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_115_19">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_302_7">L</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_303_7">C</A>);
-++         <A HREF="terminal_interface-curses__ads.htm#ref_1244_14">Get_Cursor_Position</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_115_19">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_300_7">Y</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_301_7">X</A>);
-++         <A HREF="terminal_interface-curses__ads.htm#ref_1228_14">Get_Size</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_115_19">Win</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_302_7">L</A>, <A HREF="terminal_interface-curses-text_io__adb.htm#ref_303_7">C</A>);
-+          <b>if</b> (<A HREF="terminal_interface-curses-text_io__adb.htm#ref_300_7">Y</A> + 1) = <A HREF="terminal_interface-curses-text_io__adb.htm#ref_302_7">L</A> <b>and</b> <b>then</b> (<A HREF="terminal_interface-curses-text_io__adb.htm#ref_301_7">X</A> + 1 + <A HREF="terminal_interface-curses-text_io__ads.htm#ref_115_37">Item</A>'Length) &gt;= <A HREF="terminal_interface-curses-text_io__adb.htm#ref_303_7">C</A> <b>then</b>
-+             <A HREF="terminal_interface-curses-text_io__ads.htm#ref_89_14">New_Page</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_115_19">Win</A>);
-+          <b>end</b> <b>if</b>;
-+       <b>end</b> <b>if</b>;
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_647_14">Add</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_115_19">Win</A>, <A HREF="terminal_interface-curses-text_io__ads.htm#ref_115_37">Item</A>);
-++      <A HREF="terminal_interface-curses__ads.htm#ref_653_14">Add</A> (<A HREF="terminal_interface-curses-text_io__ads.htm#ref_115_19">Win</A>, <A HREF="terminal_interface-curses-text_io__ads.htm#ref_115_37">Item</A>);
-+    <b>end</b> <A HREF="terminal_interface-curses-text_io__ads.htm#ref_115_14">Put</A>;
-+ 
-+    <b>procedure</b> <FONT COLOR=red><A NAME="ref_315_14" HREF="terminal_interface-curses-text_io__ads.htm#ref_116_14">Put</A></FONT> (<FONT COLOR=red><A NAME="ref_315_19" HREF="terminal_interface-curses-text_io__ads.htm#ref_116_19">Item</A></FONT> : <b>in</b> String)
-+Index: doc/html/ada/terminal_interface-curses-trace__ads.htm
-+--- ncurses-5.6/doc/html/ada/terminal_interface-curses-trace__ads.htm	2006-09-23 20:31:32.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/terminal_interface-curses-trace__ads.htm	2007-09-01 23:56:32.000000000 +0000
-+@@ -3,7 +3,6 @@
-+ <BODY>
-+ <HR><DIV ALIGN="center"><H1> File : terminal_interface-curses-trace.ads </H1></DIV><HR>
-+ <PRE>
-+-
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
-+ <FONT COLOR=green><EM>--                           <A HREF="http://www.gnat.com">GNAT</A> ncurses Binding                           --</EM></FONT>
-+@@ -45,28 +44,28 @@
-+ <FONT COLOR=green><EM>--  Binding Version 01.00</EM></FONT>
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ 
-+-<b>package</b> Terminal_Interface.Curses.Trace <b>is</b>
-+-   <b>pragma</b> Preelaborate (Terminal_Interface.Curses.Trace);
-++<b>package</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<FONT COLOR=red><A NAME="ref_42_35" HREF="terminal_interface-curses-trace__adb.htm#ref_42_40">Trace</A></FONT> <b>is</b>
-++   <b>pragma</b> Preelaborate (<A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-trace__ads.htm#ref_42_35">Trace</A>);
-+ 
-+    <b>pragma</b> Warnings (Off);
-+-   <b>type</b> Trace_Attribute_Set <b>is</b>
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_46_9">Trace_Attribute_Set</A></FONT> <b>is</b>
-+       <b>record</b>
-+-         <FONT COLOR=red><A NAME="ref_49_10">Times</A></FONT>            : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_50_10">Tputs</A></FONT>            : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_51_10">Update</A></FONT>           : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_52_10">Cursor_Move</A></FONT>      : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_53_10">Character_Output</A></FONT> : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_54_10">Calls</A></FONT>            : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_55_10">Virtual_Puts</A></FONT>     : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_56_10">Input_Events</A></FONT>     : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_57_10">TTY_State</A></FONT>        : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_58_10">Internal_Calls</A></FONT>   : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_59_10">Character_Calls</A></FONT>  : Boolean;
-+-         Termcap_TermInfo : Boolean;
-++         <FONT COLOR=red><A NAME="ref_48_10">Times</A></FONT>            : Boolean;
-++         <FONT COLOR=red><A NAME="ref_49_10">Tputs</A></FONT>            : Boolean;
-++         <FONT COLOR=red><A NAME="ref_50_10">Update</A></FONT>           : Boolean;
-++         <FONT COLOR=red><A NAME="ref_51_10">Cursor_Move</A></FONT>      : Boolean;
-++         <FONT COLOR=red><A NAME="ref_52_10">Character_Output</A></FONT> : Boolean;
-++         <FONT COLOR=red><A NAME="ref_53_10">Calls</A></FONT>            : Boolean;
-++         <FONT COLOR=red><A NAME="ref_54_10">Virtual_Puts</A></FONT>     : Boolean;
-++         <FONT COLOR=red><A NAME="ref_55_10">Input_Events</A></FONT>     : Boolean;
-++         <FONT COLOR=red><A NAME="ref_56_10">TTY_State</A></FONT>        : Boolean;
-++         <FONT COLOR=red><A NAME="ref_57_10">Internal_Calls</A></FONT>   : Boolean;
-++         <FONT COLOR=red><A NAME="ref_58_10">Character_Calls</A></FONT>  : Boolean;
-++         <FONT COLOR=red><A NAME="ref_59_10">Termcap_TermInfo</A></FONT> : Boolean;
-+       <b>end</b> <b>record</b>;
-+-   <b>pragma</b> Convention (C, Trace_Attribute_Set);
-++   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses-trace__ads.htm#ref_46_9">Trace_Attribute_Set</A>);
-+ 
-+-   <b>for</b> Trace_Attribute_Set <b>use</b>
-++   <b>for</b> <A HREF="terminal_interface-curses-trace__ads.htm#ref_46_9">Trace_Attribute_Set</A> <b>use</b>
-+       <b>record</b>
-+          Times            <b>at</b> 0 <b>range</b>  0 ..  0;
-+          Tputs            <b>at</b> 0 <b>range</b>  1 ..  1;
-+@@ -81,22 +80,22 @@
-+          Character_Calls  <b>at</b> 0 <b>range</b> 10 .. 10;
-+          Termcap_TermInfo <b>at</b> 0 <b>range</b> 11 .. 11;
-+       <b>end</b> <b>record</b>;
-+-   <b>for</b> Trace_Attribute_Set'Size <b>use</b> 32;
-++   <b>for</b> <A HREF="terminal_interface-curses-trace__ads.htm#ref_46_9">Trace_Attribute_Set</A>'Size <b>use</b> 32;
-+    <FONT COLOR=green><EM>--  Please note: this rep. clause is generated and may be</EM></FONT>
-+    <FONT COLOR=green><EM>--               different on your system.</EM></FONT>
-+ 
-+    <b>pragma</b> Warnings (On);
-+ 
-+-   Trace_Disable  : <b>constant</b> Trace_Attribute_Set := (<b>others</b> =&gt; False);
-++   <FONT COLOR=red><A NAME="ref_84_4">Trace_Disable</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses-trace__ads.htm#ref_46_9">Trace_Attribute_Set</A> := (<b>others</b> =&gt; False);
-+ 
-+-   Trace_Ordinary : <b>constant</b> Trace_Attribute_Set :=
-+-     (<A HREF="terminal_interface-curses-trace__ads.htm#ref_49_10">Times</A>            =&gt; True,
-+-      <A HREF="terminal_interface-curses-trace__ads.htm#ref_50_10">Tputs</A>            =&gt; True,
-+-      <A HREF="terminal_interface-curses-trace__ads.htm#ref_51_10">Update</A>           =&gt; True,
-+-      <A HREF="terminal_interface-curses-trace__ads.htm#ref_52_10">Cursor_Move</A>      =&gt; True,
-+-      Character_Output =&gt; True,
-+-   <FONT COLOR=red><A NAME="ref_93_4"> </A></FONT>  <b>others</b>           =&gt; False);
-+-   Trace_Maximum : <b>constant</b> Trace_Attribute_Set := (<b>others</b> =&gt; True);
-++   <FONT COLOR=red><A NAME="ref_86_4">Trace_Ordinary</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-trace__ads.htm#ref_46_9">Trace_Attribute_Set</A> :=
-++     (<A HREF="terminal_interface-curses-trace__ads.htm#ref_48_10">Times</A>            =&gt; True,
-++      <A HREF="terminal_interface-curses-trace__ads.htm#ref_49_10">Tputs</A>            =&gt; True,
-++      <A HREF="terminal_interface-curses-trace__ads.htm#ref_50_10">Update</A>           =&gt; True,
-++      <A HREF="terminal_interface-curses-trace__ads.htm#ref_51_10">Cursor_Move</A>      =&gt; True,
-++      <A HREF="terminal_interface-curses-trace__ads.htm#ref_52_10">Character_Output</A> =&gt; True,
-++      <b>others</b>           =&gt; False);
-++   <FONT COLOR=red><A NAME="ref_93_4">Trace_Maximum</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-trace__ads.htm#ref_46_9">Trace_Attribute_Set</A> := (<b>others</b> =&gt; True);
-+ 
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ 
-+@@ -105,15 +104,15 @@
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_1"#2|</EM></FONT>
-+-   <b>procedure</b> Trace_On (x : Trace_Attribute_Set);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_102_14" HREF="terminal_interface-curses-trace__adb.htm#ref_44_14">Trace_On</A></FONT> (<FONT COLOR=red><A NAME="ref_102_24" HREF="terminal_interface-curses-trace__adb.htm#ref_44_24">x</A></FONT> : <A HREF="terminal_interface-curses-trace__ads.htm#ref_46_9">Trace_Attribute_Set</A>);
-+    <FONT COLOR=green><EM>--  The debugging library has trace.</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_2"#2|</EM></FONT>
-+-   <b>procedure</b> Trace_Put (str : String);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_106_14" HREF="terminal_interface-curses-trace__adb.htm#ref_50_14">Trace_Put</A></FONT> (<FONT COLOR=red><A NAME="ref_106_25" HREF="terminal_interface-curses-trace__adb.htm#ref_50_25">str</A></FONT> : String);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_trace.3x.html">_tracef()</A></EM></FONT>
-+ 
-+-   Current_Trace_Setting : Trace_Attribute_Set;
-+-   <b>pragma</b> Import (C, Current_Trace_Setting, "_nc_tracing");
-++   <FONT COLOR=red><A NAME="ref_109_4">Current_Trace_Setting</A></FONT> : <A HREF="terminal_interface-curses-trace__ads.htm#ref_46_9">Trace_Attribute_Set</A>;
-++   <b>pragma</b> Import (C, <A HREF="terminal_interface-curses-trace__ads.htm#ref_109_4">Current_Trace_Setting</A>, "_nc_tracing");
-+ 
-+-<b>end</b> Terminal_Interface.Curses.Trace;
-++<b>end</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-trace__ads.htm#ref_42_35">Trace</A>;
-+ </PRE></BODY></HTML>
-+Index: doc/html/ada/terminal_interface-curses__adb.htm
-+--- ncurses-5.6/doc/html/ada/terminal_interface-curses__adb.htm	2006-09-23 20:31:33.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/terminal_interface-curses__adb.htm	2007-05-05 20:35:21.000000000 +0000
-+@@ -12,7 +12,7 @@
-+ <FONT COLOR=green><EM>--                                 B O D Y                                  --</EM></FONT>
-+ <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-<FONT COLOR=green><EM>-- Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.              --</EM></FONT>
-++<FONT COLOR=green><EM>-- Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              --</EM></FONT>
-+ <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
-+ <FONT COLOR=green><EM>-- Permission is hereby granted, free of charge, to any person obtaining a  --</EM></FONT>
-+ <FONT COLOR=green><EM>-- copy of this software and associated documentation files (the            --</EM></FONT>
-+@@ -40,8 +40,8 @@
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ <FONT COLOR=green><EM>--  Author: Juergen Pfeifer, 1996</EM></FONT>
-+ <FONT COLOR=green><EM>--  Version Control:</EM></FONT>
-+-<FONT COLOR=green><EM>--  @Revision: 1.34 @</EM></FONT>
-+-<FONT COLOR=green><EM>--  @Date: 2006/06/25 14:30:22 @</EM></FONT>
-++<FONT COLOR=green><EM>--  @Revision: 1.4 @</EM></FONT>
-++<FONT COLOR=green><EM>--  @Date: 2007/05/05 20:09:10 @</EM></FONT>
-+ <FONT COLOR=green><EM>--  Binding Version 01.00</EM></FONT>
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ <b>with</b> System;
-+@@ -49,2522 +49,2512 @@
-+ <b>with</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>.<A HREF="terminal_interface-curses-aux__ads.htm#ref_50_35">Aux</A>;
-+ <b>with</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C;                  <b>use</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C;
-+ <b>with</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.Strings;          <b>use</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.Strings;
-+-<b>with</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.Pointers;
-+ <b>with</b> Ada.Characters.Handling;       <b>use</b> Ada.Characters.Handling;
-+ <b>with</b> Ada.Strings.Fixed;
-+-<b>with</b> Ada.Unchecked_Conversion;
-+ 
-+-<b>package</b> <b>body</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<FONT COLOR=red><A NAME="ref_52_33" HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A></FONT> <b>is</b>
-++<b>package</b> <b>body</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<FONT COLOR=red><A NAME="ref_50_33" HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A></FONT> <b>is</b>
-+ 
-+    <b>use</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_50_35">Aux</A>;
-+    <b>use</b> <b>type</b> System.Bit_Order;
-+ 
-+-   <b>package</b> <FONT COLOR=red><A NAME="ref_57_12">ASF</A></FONT> <b>renames</b> Ada.Strings.Fixed;
-++   <b>package</b> <FONT COLOR=red><A NAME="ref_55_12">ASF</A></FONT> <b>renames</b> Ada.Strings.Fixed;
-+ 
-+-   <b>type</b> <FONT COLOR=red><A NAME="ref_59_9">chtype_array</A></FONT> <b>is</b> <b>array</b> (size_t <b>range</b> &lt;&gt;)
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_57_9">chtype_array</A></FONT> <b>is</b> <b>array</b> (size_t <b>range</b> &lt;&gt;)
-+       <b>of</b> <b>aliased</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>;
-+-   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses__adb.htm#ref_59_9">chtype_array</A>);
-++   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses__adb.htm#ref_57_9">chtype_array</A>);
-+ 
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>generic</b>
-+-      <b>type</b> <FONT COLOR=red><A NAME="ref_65_12">Element</A></FONT> <b>is</b> (&lt;&gt;);
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_66_13" HREF="terminal_interface-curses__adb.htm#ref_69_13">W_Get_Element</A></FONT> (<FONT COLOR=red><A NAME="ref_66_28" HREF="terminal_interface-curses__adb.htm#ref_69_28">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                           <FONT COLOR=red><A NAME="ref_67_28" HREF="terminal_interface-curses__adb.htm#ref_70_28">Offset</A></FONT> : <b>in</b> Natural) <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_65_12">Element</A>;
-+-
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_69_13" HREF="terminal_interface-curses__adb.htm#ref_66_13">W_Get_Element</A></FONT> (<FONT COLOR=red><A NAME="ref_69_28" HREF="terminal_interface-curses__adb.htm#ref_66_28">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                           <FONT COLOR=red><A NAME="ref_70_28" HREF="terminal_interface-curses__adb.htm#ref_67_28">Offset</A></FONT> : <b>in</b> Natural) <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_65_12">Element</A> <b>is</b>
-+-      <b>type</b> <FONT COLOR=red><A NAME="ref_71_12">E_Array</A></FONT> <b>is</b> <b>array</b> (Natural <b>range</b> &lt;&gt;) <b>of</b> <b>aliased</b> <A HREF="terminal_interface-curses__adb.htm#ref_65_12">Element</A>;
-+-      <b>package</b> C_E_Array <b>is</b> <b>new</b>
-+-        <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.Pointers (Natural, <A HREF="terminal_interface-curses__adb.htm#ref_65_12">Element</A>, <A HREF="terminal_interface-curses__adb.htm#ref_71_12">E_Array</A>, <A HREF="terminal_interface-curses__adb.htm#ref_65_12">Element</A>'Val (0));
-+-      <b>use</b> C_E_Array;
-+-
-+-      <b>function</b> To_Pointer <b>is</b> <b>new</b>
-+-        Ada.Unchecked_Conversion (<A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>, Pointer);
-+-
-+-      P : Pointer := To_Pointer (<A HREF="terminal_interface-curses__adb.htm#ref_66_28">Win</A>);
-+-   <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_66_28">Win</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-+-         <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+-      <b>else</b>
-+-         P := P + ptrdiff_t (<A HREF="terminal_interface-curses__adb.htm#ref_67_28">Offset</A>);
-+-         <b>return</b> P.<b>all</b>;
-+-      <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__adb.htm#ref_66_13">W_Get_Element</A>;
-+-
-+-   <b>function</b> W_Get_Int   <b>is</b> <b>new</b> <A HREF="terminal_interface-curses__adb.htm#ref_66_13">W_Get_Element</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>);
-+-   <b>function</b> W_Get_Short <b>is</b> <b>new</b> <A HREF="terminal_interface-curses__adb.htm#ref_66_13">W_Get_Element</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>);
-+-   <b>function</b> W_Get_Byte  <b>is</b> <b>new</b> <A HREF="terminal_interface-curses__adb.htm#ref_66_13">W_Get_Element</A> (<A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.unsigned_char);
-+-
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_93_13" HREF="terminal_interface-curses__adb.htm#ref_96_13">Get_Flag</A></FONT> (<FONT COLOR=red><A NAME="ref_93_23" HREF="terminal_interface-curses__adb.htm#ref_96_23">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                      <FONT COLOR=red><A NAME="ref_94_23" HREF="terminal_interface-curses__adb.htm#ref_97_23">Offset</A></FONT> : Natural) <b>return</b> Boolean;
-+-
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_96_13" HREF="terminal_interface-curses__adb.htm#ref_93_13">Get_Flag</A></FONT> (<FONT COLOR=red><A NAME="ref_96_23" HREF="terminal_interface-curses__adb.htm#ref_93_23">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                      <FONT COLOR=red><A NAME="ref_97_23" HREF="terminal_interface-curses__adb.htm#ref_94_23">Offset</A></FONT> : Natural) <b>return</b> Boolean
-+-   <b>is</b>
-+-      <FONT COLOR=red><A NAME="ref_99_7">Res</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-   <b>begin</b>
-+-      <b>case</b> <A HREF="terminal_interface-curses__ads.htm#ref_1927_4">Sizeof_bool</A> <b>is</b>
-+-         <b>when</b> 1 =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_99_7">Res</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (W_Get_Byte  (<A HREF="terminal_interface-curses__adb.htm#ref_93_23">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_94_23">Offset</A>));
-+-         <b>when</b> 2 =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_99_7">Res</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (W_Get_Short (<A HREF="terminal_interface-curses__adb.htm#ref_93_23">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_94_23">Offset</A>));
-+-         <b>when</b> 4 =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_99_7">Res</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (W_Get_Int   (<A HREF="terminal_interface-curses__adb.htm#ref_93_23">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_94_23">Offset</A>));
-+-         <b>when</b> <b>others</b> =&gt; <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+-      <b>end</b> <b>case</b>;
-+-
-+-      <b>case</b> <A HREF="terminal_interface-curses__adb.htm#ref_99_7">Res</A> <b>is</b>
-+-         <b>when</b> 0       =&gt; <b>return</b> False;
-+-         <b>when</b> <b>others</b>  =&gt; <b>return</b> True;
-+-      <b>end</b> <b>case</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__adb.htm#ref_93_13">Get_Flag</A>;
-+-
-+-<FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_115_13" HREF="terminal_interface-curses__ads.htm#ref_1610_13">Key_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_115_23" HREF="terminal_interface-curses__ads.htm#ref_1610_23">Key</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>) <b>return</b> String
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_62_13" HREF="terminal_interface-curses__ads.htm#ref_1616_13">Key_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_62_23" HREF="terminal_interface-curses__ads.htm#ref_1616_23">Key</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>) <b>return</b> String
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_117_16">Keyname</A></FONT> (<FONT COLOR=red><A NAME="ref_117_25" HREF="terminal_interface-curses__adb.htm#ref_117_16">K</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> chars_ptr;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_64_16">Keyname</A></FONT> (<FONT COLOR=red><A NAME="ref_64_25" HREF="terminal_interface-curses__adb.htm#ref_64_16">K</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> chars_ptr;
-+       <b>pragma</b> Import (C, Keyname, "keyname");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_120_7">Ch</A></FONT> : Character;
-++      <FONT COLOR=red><A NAME="ref_67_7">Ch</A></FONT> : Character;
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_1610_23">Key</A> &lt;= Character'Pos (Character'Last) <b>then</b>
-+-         <A HREF="terminal_interface-curses__adb.htm#ref_120_7">Ch</A> := Character'Val (<A HREF="terminal_interface-curses__ads.htm#ref_1610_23">Key</A>);
-+-         <b>if</b> Is_Control (<A HREF="terminal_interface-curses__adb.htm#ref_120_7">Ch</A>) <b>then</b>
-+-            <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1621_13">Un_Control</A> (<A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>'(<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_120_7">Ch</A>,
-++      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_1616_23">Key</A> &lt;= Character'Pos (Character'Last) <b>then</b>
-++         <A HREF="terminal_interface-curses__adb.htm#ref_67_7">Ch</A> := Character'Val (<A HREF="terminal_interface-curses__ads.htm#ref_1616_23">Key</A>);
-++         <b>if</b> Is_Control (<A HREF="terminal_interface-curses__adb.htm#ref_67_7">Ch</A>) <b>then</b>
-++            <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1627_13">Un_Control</A> (<A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>'(<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_67_7">Ch</A>,
-+                                                      <A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First,
-+                                                      <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>  =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>));
-+-         <b>elsif</b> Is_Graphic (<A HREF="terminal_interface-curses__adb.htm#ref_120_7">Ch</A>) <b>then</b>
-++         <b>elsif</b> Is_Graphic (<A HREF="terminal_interface-curses__adb.htm#ref_67_7">Ch</A>) <b>then</b>
-+             <b>declare</b>
-+-               <FONT COLOR=red><A NAME="ref_130_16">S</A></FONT> : String (1 .. 1);
-++               <FONT COLOR=red><A NAME="ref_77_16">S</A></FONT> : String (1 .. 1);
-+             <b>begin</b>
-+-               <A HREF="terminal_interface-curses__adb.htm#ref_130_16">S</A> (1) := <A HREF="terminal_interface-curses__adb.htm#ref_120_7">Ch</A>;
-+-               <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_130_16">S</A>;
-++               <A HREF="terminal_interface-curses__adb.htm#ref_77_16">S</A> (1) := <A HREF="terminal_interface-curses__adb.htm#ref_67_7">Ch</A>;
-++               <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_77_16">S</A>;
-+             <b>end</b>;
-+          <b>else</b>
-+             <b>return</b> "";
-+          <b>end</b> <b>if</b>;
-+       <b>else</b>
-+-         <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_121_13">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_117_16">Keyname</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1610_23">Key</A>)));
-++         <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_121_13">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_64_16">Keyname</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1616_23">Key</A>)));
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1610_13">Key_Name</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1616_13">Key_Name</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_143_14" HREF="terminal_interface-curses__ads.htm#ref_1604_14">Key_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_143_24" HREF="terminal_interface-curses__ads.htm#ref_1604_24">Key</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>;
-+-                       <FONT COLOR=red><A NAME="ref_144_24" HREF="terminal_interface-curses__ads.htm#ref_1605_24">Name</A></FONT> : <b>out</b> String)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_90_14" HREF="terminal_interface-curses__ads.htm#ref_1610_14">Key_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_90_24" HREF="terminal_interface-curses__ads.htm#ref_1610_24">Key</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>;
-++                       <FONT COLOR=red><A NAME="ref_91_24" HREF="terminal_interface-curses__ads.htm#ref_1611_24">Name</A></FONT> : <b>out</b> String)
-+    <b>is</b>
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses__adb.htm#ref_57_12">ASF</A>.Move (<A HREF="terminal_interface-curses__ads.htm#ref_1610_13">Key_Name</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1604_24">Key</A>), <A HREF="terminal_interface-curses__ads.htm#ref_1605_24">Name</A>);
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1604_14">Key_Name</A>;
-++      <A HREF="terminal_interface-curses__adb.htm#ref_55_12">ASF</A>.Move (<A HREF="terminal_interface-curses__ads.htm#ref_1616_13">Key_Name</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1610_24">Key</A>), <A HREF="terminal_interface-curses__ads.htm#ref_1611_24">Name</A>);
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1610_14">Key_Name</A>;
-+ 
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_151_14" HREF="terminal_interface-curses__ads.htm#ref_480_14">Init_Screen</A></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_98_14" HREF="terminal_interface-curses__ads.htm#ref_486_14">Init_Screen</A></FONT>
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_153_16">Initscr</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_100_16">Initscr</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+       <b>pragma</b> Import (C, Initscr, "initscr");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_156_7">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++      <FONT COLOR=red><A NAME="ref_103_7">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses__adb.htm#ref_156_7">W</A> := <A HREF="terminal_interface-curses__adb.htm#ref_153_16">Initscr</A>;
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_156_7">W</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-++      <A HREF="terminal_interface-curses__adb.htm#ref_103_7">W</A> := <A HREF="terminal_interface-curses__adb.htm#ref_100_16">Initscr</A>;
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_103_7">W</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_480_14">Init_Screen</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_486_14">Init_Screen</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_164_14" HREF="terminal_interface-curses__ads.htm#ref_489_14">End_Windows</A></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_111_14" HREF="terminal_interface-curses__ads.htm#ref_495_14">End_Windows</A></FONT>
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_166_16">Endwin</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_113_16">Endwin</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Endwin, "endwin");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_166_16">Endwin</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_113_16">Endwin</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_489_14">End_Windows</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_495_14">End_Windows</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_174_13" HREF="terminal_interface-curses__ads.htm#ref_496_13">Is_End_Window</A></FONT> <b>return</b> Boolean
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_121_13" HREF="terminal_interface-curses__ads.htm#ref_502_13">Is_End_Window</A></FONT> <b>return</b> Boolean
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_176_16">Isendwin</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_123_16">Isendwin</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>;
-+       <b>pragma</b> Import (C, Isendwin, "isendwin");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_176_16">Isendwin</A> = <A HREF="terminal_interface-curses__ads.htm#ref_1931_4">Curses_Bool_False</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_123_16">Isendwin</A> = <A HREF="terminal_interface-curses__ads.htm#ref_1927_4">Curses_Bool_False</A> <b>then</b>
-+          <b>return</b> False;
-+       <b>else</b>
-+          <b>return</b> True;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_496_13">Is_End_Window</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_502_13">Is_End_Window</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_186_14" HREF="terminal_interface-curses__ads.htm#ref_505_14">Move_Cursor</A></FONT> (<FONT COLOR=red><A NAME="ref_186_27" HREF="terminal_interface-curses__ads.htm#ref_505_27">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-                          <FONT COLOR=red><A NAME="ref_187_27" HREF="terminal_interface-curses__ads.htm#ref_506_27">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-                          <FONT COLOR=red><A NAME="ref_188_27" HREF="terminal_interface-curses__ads.htm#ref_507_27">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
-+-   <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_190_16">Wmove</A></FONT> (<FONT COLOR=red><A NAME="ref_190_23" HREF="terminal_interface-curses__adb.htm#ref_190_16">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                      <FONT COLOR=red><A NAME="ref_191_23" HREF="terminal_interface-curses__adb.htm#ref_190_16">Line</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-                      <FONT COLOR=red><A NAME="ref_192_23" HREF="terminal_interface-curses__adb.htm#ref_190_16">Column</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_133_14" HREF="terminal_interface-curses__ads.htm#ref_511_14">Move_Cursor</A></FONT> (<FONT COLOR=red><A NAME="ref_133_27" HREF="terminal_interface-curses__ads.htm#ref_511_27">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                          <FONT COLOR=red><A NAME="ref_134_27" HREF="terminal_interface-curses__ads.htm#ref_512_27">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++                          <FONT COLOR=red><A NAME="ref_135_27" HREF="terminal_interface-curses__ads.htm#ref_513_27">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
-++   <b>is</b>
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_137_16">Wmove</A></FONT> (<FONT COLOR=red><A NAME="ref_137_23" HREF="terminal_interface-curses__adb.htm#ref_137_16">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                      <FONT COLOR=red><A NAME="ref_138_23" HREF="terminal_interface-curses__adb.htm#ref_137_16">Line</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++                      <FONT COLOR=red><A NAME="ref_139_23" HREF="terminal_interface-curses__adb.htm#ref_137_16">Column</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>
-+                      ) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Wmove, "wmove");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_190_16">Wmove</A> (<A HREF="terminal_interface-curses__ads.htm#ref_505_27">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_506_27">Line</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_507_27">Column</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_137_16">Wmove</A> (<A HREF="terminal_interface-curses__ads.htm#ref_511_27">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_512_27">Line</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_513_27">Column</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_505_14">Move_Cursor</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_511_14">Move_Cursor</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_201_14" HREF="terminal_interface-curses__ads.htm#ref_517_14">Add</A></FONT> (<FONT COLOR=red><A NAME="ref_201_19" HREF="terminal_interface-curses__ads.htm#ref_517_19">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-                  <FONT COLOR=red><A NAME="ref_202_19" HREF="terminal_interface-curses__ads.htm#ref_518_19">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_148_14" HREF="terminal_interface-curses__ads.htm#ref_523_14">Add</A></FONT> (<FONT COLOR=red><A NAME="ref_148_19" HREF="terminal_interface-curses__ads.htm#ref_523_19">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                  <FONT COLOR=red><A NAME="ref_149_19" HREF="terminal_interface-curses__ads.htm#ref_524_19">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_204_16">Waddch</A></FONT> (<FONT COLOR=red><A NAME="ref_204_24" HREF="terminal_interface-curses__adb.htm#ref_204_16">W</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                       <FONT COLOR=red><A NAME="ref_205_24" HREF="terminal_interface-curses__adb.htm#ref_204_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_151_16">Waddch</A></FONT> (<FONT COLOR=red><A NAME="ref_151_24" HREF="terminal_interface-curses__adb.htm#ref_151_16">W</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                       <FONT COLOR=red><A NAME="ref_152_24" HREF="terminal_interface-curses__adb.htm#ref_151_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Waddch, "waddch");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_204_16">Waddch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_517_19">Win</A>, AttrChar_To_Chtype (<A HREF="terminal_interface-curses__ads.htm#ref_518_19">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_151_16">Waddch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_523_19">Win</A>, AttrChar_To_Chtype (<A HREF="terminal_interface-curses__ads.htm#ref_524_19">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_517_14">Add</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_523_14">Add</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_213_14" HREF="terminal_interface-curses__ads.htm#ref_522_14">Add</A></FONT> (<FONT COLOR=red><A NAME="ref_213_19" HREF="terminal_interface-curses__ads.htm#ref_522_19">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-                  <FONT COLOR=red><A NAME="ref_214_19" HREF="terminal_interface-curses__ads.htm#ref_523_19">Ch</A></FONT>  : <b>in</b> Character)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_160_14" HREF="terminal_interface-curses__ads.htm#ref_528_14">Add</A></FONT> (<FONT COLOR=red><A NAME="ref_160_19" HREF="terminal_interface-curses__ads.htm#ref_528_19">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                  <FONT COLOR=red><A NAME="ref_161_19" HREF="terminal_interface-curses__ads.htm#ref_529_19">Ch</A></FONT>  : <b>in</b> Character)
-+    <b>is</b>
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_517_14">Add</A> (<A HREF="terminal_interface-curses__ads.htm#ref_522_19">Win</A>,
-+-           <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>'(<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_523_19">Ch</A>,
-++      <A HREF="terminal_interface-curses__ads.htm#ref_523_14">Add</A> (<A HREF="terminal_interface-curses__ads.htm#ref_528_19">Win</A>,
-++           <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>'(<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_529_19">Ch</A>,
-+                                  <A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First,
-+                                  <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>  =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>));
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_522_14">Add</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_528_14">Add</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_223_14" HREF="terminal_interface-curses__ads.htm#ref_528_14">Add</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_224_7" HREF="terminal_interface-curses__ads.htm#ref_529_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_225_7" HREF="terminal_interface-curses__ads.htm#ref_530_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_226_7" HREF="terminal_interface-curses__ads.htm#ref_531_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_227_7" HREF="terminal_interface-curses__ads.htm#ref_532_7">Ch</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
-+-   <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_229_16">mvwaddch</A></FONT> (<FONT COLOR=red><A NAME="ref_229_26" HREF="terminal_interface-curses__adb.htm#ref_229_16">W</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                         <FONT COLOR=red><A NAME="ref_230_26" HREF="terminal_interface-curses__adb.htm#ref_229_16">Y</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-                         <FONT COLOR=red><A NAME="ref_231_26" HREF="terminal_interface-curses__adb.htm#ref_229_16">X</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-                         <FONT COLOR=red><A NAME="ref_232_26" HREF="terminal_interface-curses__adb.htm#ref_229_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_170_14" HREF="terminal_interface-curses__ads.htm#ref_534_14">Add</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_171_7" HREF="terminal_interface-curses__ads.htm#ref_535_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_172_7" HREF="terminal_interface-curses__ads.htm#ref_536_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_173_7" HREF="terminal_interface-curses__ads.htm#ref_537_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_174_7" HREF="terminal_interface-curses__ads.htm#ref_538_7">Ch</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
-++   <b>is</b>
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_176_16">mvwaddch</A></FONT> (<FONT COLOR=red><A NAME="ref_176_26" HREF="terminal_interface-curses__adb.htm#ref_176_16">W</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                         <FONT COLOR=red><A NAME="ref_177_26" HREF="terminal_interface-curses__adb.htm#ref_176_16">Y</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++                         <FONT COLOR=red><A NAME="ref_178_26" HREF="terminal_interface-curses__adb.htm#ref_176_16">X</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++                         <FONT COLOR=red><A NAME="ref_179_26" HREF="terminal_interface-curses__adb.htm#ref_176_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, mvwaddch, "mvwaddch");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_229_16">mvwaddch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_529_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_530_7">Line</A>),
-+-                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_531_7">Column</A>),
-+-                   AttrChar_To_Chtype (<A HREF="terminal_interface-curses__ads.htm#ref_532_7">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_176_16">mvwaddch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_535_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_536_7">Line</A>),
-++                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_537_7">Column</A>),
-++                   AttrChar_To_Chtype (<A HREF="terminal_interface-curses__ads.htm#ref_538_7">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_528_14">Add</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_534_14">Add</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_242_14" HREF="terminal_interface-curses__ads.htm#ref_536_14">Add</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_243_7" HREF="terminal_interface-curses__ads.htm#ref_537_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_244_7" HREF="terminal_interface-curses__ads.htm#ref_538_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_245_7" HREF="terminal_interface-curses__ads.htm#ref_539_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_246_7" HREF="terminal_interface-curses__ads.htm#ref_540_7">Ch</A></FONT>     : <b>in</b> Character)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_189_14" HREF="terminal_interface-curses__ads.htm#ref_542_14">Add</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_190_7" HREF="terminal_interface-curses__ads.htm#ref_543_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_191_7" HREF="terminal_interface-curses__ads.htm#ref_544_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_192_7" HREF="terminal_interface-curses__ads.htm#ref_545_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_193_7" HREF="terminal_interface-curses__ads.htm#ref_546_7">Ch</A></FONT>     : <b>in</b> Character)
-+    <b>is</b>
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_528_14">Add</A> (<A HREF="terminal_interface-curses__ads.htm#ref_537_7">Win</A>,
-+-           <A HREF="terminal_interface-curses__ads.htm#ref_538_7">Line</A>,
-+-           <A HREF="terminal_interface-curses__ads.htm#ref_539_7">Column</A>,
-+-           <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>'(<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_540_7">Ch</A>,
-++      <A HREF="terminal_interface-curses__ads.htm#ref_534_14">Add</A> (<A HREF="terminal_interface-curses__ads.htm#ref_543_7">Win</A>,
-++           <A HREF="terminal_interface-curses__ads.htm#ref_544_7">Line</A>,
-++           <A HREF="terminal_interface-curses__ads.htm#ref_545_7">Column</A>,
-++           <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>'(<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_546_7">Ch</A>,
-+                                  <A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First,
-+                                  <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>  =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>));
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_536_14">Add</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_542_14">Add</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_257_14" HREF="terminal_interface-curses__ads.htm#ref_545_14">Add_With_Immediate_Echo</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_258_7" HREF="terminal_interface-curses__ads.htm#ref_546_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_259_7" HREF="terminal_interface-curses__ads.htm#ref_547_7">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_204_14" HREF="terminal_interface-curses__ads.htm#ref_551_14">Add_With_Immediate_Echo</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_205_7" HREF="terminal_interface-curses__ads.htm#ref_552_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_206_7" HREF="terminal_interface-curses__ads.htm#ref_553_7">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_261_16">Wechochar</A></FONT> (<FONT COLOR=red><A NAME="ref_261_27" HREF="terminal_interface-curses__adb.htm#ref_261_16">W</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                          <FONT COLOR=red><A NAME="ref_262_27" HREF="terminal_interface-curses__adb.htm#ref_261_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_208_16">Wechochar</A></FONT> (<FONT COLOR=red><A NAME="ref_208_27" HREF="terminal_interface-curses__adb.htm#ref_208_16">W</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                          <FONT COLOR=red><A NAME="ref_209_27" HREF="terminal_interface-curses__adb.htm#ref_208_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Wechochar, "wechochar");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_261_16">Wechochar</A> (<A HREF="terminal_interface-curses__ads.htm#ref_546_7">Win</A>, AttrChar_To_Chtype (<A HREF="terminal_interface-curses__ads.htm#ref_547_7">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_208_16">Wechochar</A> (<A HREF="terminal_interface-curses__ads.htm#ref_552_7">Win</A>, AttrChar_To_Chtype (<A HREF="terminal_interface-curses__ads.htm#ref_553_7">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_545_14">Add_With_Immediate_Echo</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_551_14">Add_With_Immediate_Echo</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_270_14" HREF="terminal_interface-curses__ads.htm#ref_551_14">Add_With_Immediate_Echo</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_271_7" HREF="terminal_interface-curses__ads.htm#ref_552_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_272_7" HREF="terminal_interface-curses__ads.htm#ref_553_7">Ch</A></FONT>  : <b>in</b> Character)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_217_14" HREF="terminal_interface-curses__ads.htm#ref_557_14">Add_With_Immediate_Echo</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_218_7" HREF="terminal_interface-curses__ads.htm#ref_558_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_219_7" HREF="terminal_interface-curses__ads.htm#ref_559_7">Ch</A></FONT>  : <b>in</b> Character)
-+    <b>is</b>
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_545_14">Add_With_Immediate_Echo</A>
-+-        (<A HREF="terminal_interface-curses__ads.htm#ref_552_7">Win</A>,
-+-         <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>'(<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_553_7">Ch</A>,
-++      <A HREF="terminal_interface-curses__ads.htm#ref_551_14">Add_With_Immediate_Echo</A>
-++        (<A HREF="terminal_interface-curses__ads.htm#ref_558_7">Win</A>,
-++         <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>'(<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_559_7">Ch</A>,
-+                                <A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First,
-+                                <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>  =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>));
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_551_14">Add_With_Immediate_Echo</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_557_14">Add_With_Immediate_Echo</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_282_13" HREF="terminal_interface-curses__ads.htm#ref_563_13">Create</A></FONT> (<FONT COLOR=red><A NAME="ref_282_21" HREF="terminal_interface-curses__ads.htm#ref_564_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+-                    <FONT COLOR=red><A NAME="ref_283_21" HREF="terminal_interface-curses__ads.htm#ref_565_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-+-                    <FONT COLOR=red><A NAME="ref_284_21" HREF="terminal_interface-curses__ads.htm#ref_566_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-                    <FONT COLOR=red><A NAME="ref_285_21" HREF="terminal_interface-curses__ads.htm#ref_567_7">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
-+-   <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_287_16">Newwin</A></FONT> (<FONT COLOR=red><A NAME="ref_287_24" HREF="terminal_interface-curses__adb.htm#ref_287_16">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-                       <FONT COLOR=red><A NAME="ref_288_24" HREF="terminal_interface-curses__adb.htm#ref_287_16">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-                       <FONT COLOR=red><A NAME="ref_289_24" HREF="terminal_interface-curses__adb.htm#ref_287_16">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-                       <FONT COLOR=red><A NAME="ref_290_24" HREF="terminal_interface-curses__adb.htm#ref_287_16">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_229_13" HREF="terminal_interface-curses__ads.htm#ref_569_13">Create</A></FONT> (<FONT COLOR=red><A NAME="ref_229_21" HREF="terminal_interface-curses__ads.htm#ref_570_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-++                    <FONT COLOR=red><A NAME="ref_230_21" HREF="terminal_interface-curses__ads.htm#ref_571_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-++                    <FONT COLOR=red><A NAME="ref_231_21" HREF="terminal_interface-curses__ads.htm#ref_572_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++                    <FONT COLOR=red><A NAME="ref_232_21" HREF="terminal_interface-curses__ads.htm#ref_573_7">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
-++   <b>is</b>
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_234_16">Newwin</A></FONT> (<FONT COLOR=red><A NAME="ref_234_24" HREF="terminal_interface-curses__adb.htm#ref_234_16">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++                       <FONT COLOR=red><A NAME="ref_235_24" HREF="terminal_interface-curses__adb.htm#ref_234_16">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++                       <FONT COLOR=red><A NAME="ref_236_24" HREF="terminal_interface-curses__adb.htm#ref_234_16">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++                       <FONT COLOR=red><A NAME="ref_237_24" HREF="terminal_interface-curses__adb.htm#ref_234_16">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+       <b>pragma</b> Import (C, Newwin, "newwin");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_293_7">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++      <FONT COLOR=red><A NAME="ref_240_7">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses__adb.htm#ref_293_7">W</A> := <A HREF="terminal_interface-curses__adb.htm#ref_287_16">Newwin</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_564_7">Number_Of_Lines</A>),
-+-                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_565_7">Number_Of_Columns</A>),
-+-                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_566_7">First_Line_Position</A>),
-+-                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_567_7">First_Column_Position</A>));
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_293_7">W</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-++      <A HREF="terminal_interface-curses__adb.htm#ref_240_7">W</A> := <A HREF="terminal_interface-curses__adb.htm#ref_234_16">Newwin</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_570_7">Number_Of_Lines</A>),
-++                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_571_7">Number_Of_Columns</A>),
-++                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_572_7">First_Line_Position</A>),
-++                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_573_7">First_Column_Position</A>));
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_240_7">W</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_293_7">W</A>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_563_13">Create</A>;
-++      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_240_7">W</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_569_13">Create</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_305_14" HREF="terminal_interface-curses__ads.htm#ref_582_14">Delete</A></FONT> (<FONT COLOR=red><A NAME="ref_305_22" HREF="terminal_interface-curses__ads.htm#ref_582_22">Win</A></FONT> : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_252_14" HREF="terminal_interface-curses__ads.htm#ref_588_14">Delete</A></FONT> (<FONT COLOR=red><A NAME="ref_252_22" HREF="terminal_interface-curses__ads.htm#ref_588_22">Win</A></FONT> : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_307_16">Wdelwin</A></FONT> (<FONT COLOR=red><A NAME="ref_307_25" HREF="terminal_interface-curses__adb.htm#ref_307_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_254_16">Wdelwin</A></FONT> (<FONT COLOR=red><A NAME="ref_254_25" HREF="terminal_interface-curses__adb.htm#ref_254_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Wdelwin, "delwin");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_307_16">Wdelwin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_582_22">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_254_16">Wdelwin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_588_22">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_582_22">Win</A> := <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_582_14">Delete</A>;
-++      <A HREF="terminal_interface-curses__ads.htm#ref_588_22">Win</A> := <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_588_14">Delete</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_316_13" HREF="terminal_interface-curses__ads.htm#ref_588_13">Sub_Window</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_317_7" HREF="terminal_interface-curses__ads.htm#ref_589_7">Win</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_318_7" HREF="terminal_interface-curses__ads.htm#ref_590_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+-      <FONT COLOR=red><A NAME="ref_319_7" HREF="terminal_interface-curses__ads.htm#ref_591_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-+-      <FONT COLOR=red><A NAME="ref_320_7" HREF="terminal_interface-curses__ads.htm#ref_592_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_321_7" HREF="terminal_interface-curses__ads.htm#ref_593_7">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
-+-   <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_323_16">Subwin</A></FONT>
-+-        (<FONT COLOR=red><A NAME="ref_324_10" HREF="terminal_interface-curses__adb.htm#ref_323_16">Win</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-         <FONT COLOR=red><A NAME="ref_325_10" HREF="terminal_interface-curses__adb.htm#ref_323_16">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-         <FONT COLOR=red><A NAME="ref_326_10" HREF="terminal_interface-curses__adb.htm#ref_323_16">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-         <FONT COLOR=red><A NAME="ref_327_10" HREF="terminal_interface-curses__adb.htm#ref_323_16">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-         <FONT COLOR=red><A NAME="ref_328_10" HREF="terminal_interface-curses__adb.htm#ref_323_16">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_263_13" HREF="terminal_interface-curses__ads.htm#ref_594_13">Sub_Window</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_264_7" HREF="terminal_interface-curses__ads.htm#ref_595_7">Win</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_265_7" HREF="terminal_interface-curses__ads.htm#ref_596_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-++      <FONT COLOR=red><A NAME="ref_266_7" HREF="terminal_interface-curses__ads.htm#ref_597_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-++      <FONT COLOR=red><A NAME="ref_267_7" HREF="terminal_interface-curses__ads.htm#ref_598_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_268_7" HREF="terminal_interface-curses__ads.htm#ref_599_7">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
-++   <b>is</b>
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_270_16">Subwin</A></FONT>
-++        (<FONT COLOR=red><A NAME="ref_271_10" HREF="terminal_interface-curses__adb.htm#ref_270_16">Win</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++         <FONT COLOR=red><A NAME="ref_272_10" HREF="terminal_interface-curses__adb.htm#ref_270_16">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++         <FONT COLOR=red><A NAME="ref_273_10" HREF="terminal_interface-curses__adb.htm#ref_270_16">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++         <FONT COLOR=red><A NAME="ref_274_10" HREF="terminal_interface-curses__adb.htm#ref_270_16">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++         <FONT COLOR=red><A NAME="ref_275_10" HREF="terminal_interface-curses__adb.htm#ref_270_16">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+       <b>pragma</b> Import (C, Subwin, "subwin");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_331_7">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++      <FONT COLOR=red><A NAME="ref_278_7">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses__adb.htm#ref_331_7">W</A> := <A HREF="terminal_interface-curses__adb.htm#ref_323_16">Subwin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_589_7">Win</A>,
-+-                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_590_7">Number_Of_Lines</A>),
-+-                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_591_7">Number_Of_Columns</A>),
-+-                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_592_7">First_Line_Position</A>),
-+-                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_593_7">First_Column_Position</A>));
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_331_7">W</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-+-         <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+-      <b>end</b> <b>if</b>;
-+-      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_331_7">W</A>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_588_13">Sub_Window</A>;
-+-
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_344_13" HREF="terminal_interface-curses__ads.htm#ref_598_13">Derived_Window</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_345_7" HREF="terminal_interface-curses__ads.htm#ref_599_7">Win</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_346_7" HREF="terminal_interface-curses__ads.htm#ref_600_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+-      <FONT COLOR=red><A NAME="ref_347_7" HREF="terminal_interface-curses__ads.htm#ref_601_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-+-      <FONT COLOR=red><A NAME="ref_348_7" HREF="terminal_interface-curses__ads.htm#ref_602_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_349_7" HREF="terminal_interface-curses__ads.htm#ref_603_7">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
-+-   <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_351_16">Derwin</A></FONT>
-+-        (<FONT COLOR=red><A NAME="ref_352_10" HREF="terminal_interface-curses__adb.htm#ref_351_16">Win</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-         <FONT COLOR=red><A NAME="ref_353_10" HREF="terminal_interface-curses__adb.htm#ref_351_16">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-         <FONT COLOR=red><A NAME="ref_354_10" HREF="terminal_interface-curses__adb.htm#ref_351_16">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-         <FONT COLOR=red><A NAME="ref_355_10" HREF="terminal_interface-curses__adb.htm#ref_351_16">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-         <FONT COLOR=red><A NAME="ref_356_10" HREF="terminal_interface-curses__adb.htm#ref_351_16">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++      <A HREF="terminal_interface-curses__adb.htm#ref_278_7">W</A> := <A HREF="terminal_interface-curses__adb.htm#ref_270_16">Subwin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_595_7">Win</A>,
-++                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_596_7">Number_Of_Lines</A>),
-++                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_597_7">Number_Of_Columns</A>),
-++                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_598_7">First_Line_Position</A>),
-++                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_599_7">First_Column_Position</A>));
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_278_7">W</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-++         <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-++      <b>end</b> <b>if</b>;
-++      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_278_7">W</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_594_13">Sub_Window</A>;
-++
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_291_13" HREF="terminal_interface-curses__ads.htm#ref_604_13">Derived_Window</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_292_7" HREF="terminal_interface-curses__ads.htm#ref_605_7">Win</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_293_7" HREF="terminal_interface-curses__ads.htm#ref_606_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-++      <FONT COLOR=red><A NAME="ref_294_7" HREF="terminal_interface-curses__ads.htm#ref_607_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-++      <FONT COLOR=red><A NAME="ref_295_7" HREF="terminal_interface-curses__ads.htm#ref_608_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_296_7" HREF="terminal_interface-curses__ads.htm#ref_609_7">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
-++   <b>is</b>
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_298_16">Derwin</A></FONT>
-++        (<FONT COLOR=red><A NAME="ref_299_10" HREF="terminal_interface-curses__adb.htm#ref_298_16">Win</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++         <FONT COLOR=red><A NAME="ref_300_10" HREF="terminal_interface-curses__adb.htm#ref_298_16">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++         <FONT COLOR=red><A NAME="ref_301_10" HREF="terminal_interface-curses__adb.htm#ref_298_16">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++         <FONT COLOR=red><A NAME="ref_302_10" HREF="terminal_interface-curses__adb.htm#ref_298_16">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++         <FONT COLOR=red><A NAME="ref_303_10" HREF="terminal_interface-curses__adb.htm#ref_298_16">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+       <b>pragma</b> Import (C, Derwin, "derwin");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_359_7">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++      <FONT COLOR=red><A NAME="ref_306_7">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses__adb.htm#ref_359_7">W</A> := <A HREF="terminal_interface-curses__adb.htm#ref_351_16">Derwin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_599_7">Win</A>,
-+-                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_600_7">Number_Of_Lines</A>),
-+-                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_601_7">Number_Of_Columns</A>),
-+-                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_602_7">First_Line_Position</A>),
-+-                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_603_7">First_Column_Position</A>));
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_359_7">W</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-++      <A HREF="terminal_interface-curses__adb.htm#ref_306_7">W</A> := <A HREF="terminal_interface-curses__adb.htm#ref_298_16">Derwin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_605_7">Win</A>,
-++                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_606_7">Number_Of_Lines</A>),
-++                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_607_7">Number_Of_Columns</A>),
-++                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_608_7">First_Line_Position</A>),
-++                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_609_7">First_Column_Position</A>));
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_306_7">W</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_359_7">W</A>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_598_13">Derived_Window</A>;
-++      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_306_7">W</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_604_13">Derived_Window</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_372_13" HREF="terminal_interface-curses__ads.htm#ref_608_13">Duplicate</A></FONT> (<FONT COLOR=red><A NAME="ref_372_24" HREF="terminal_interface-curses__ads.htm#ref_608_24">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_319_13" HREF="terminal_interface-curses__ads.htm#ref_614_13">Duplicate</A></FONT> (<FONT COLOR=red><A NAME="ref_319_24" HREF="terminal_interface-curses__ads.htm#ref_614_24">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_374_16">Dupwin</A></FONT> (<FONT COLOR=red><A NAME="ref_374_24" HREF="terminal_interface-curses__adb.htm#ref_374_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_321_16">Dupwin</A></FONT> (<FONT COLOR=red><A NAME="ref_321_24" HREF="terminal_interface-curses__adb.htm#ref_321_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+       <b>pragma</b> Import (C, Dupwin, "dupwin");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_377_7">W</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__adb.htm#ref_374_16">Dupwin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_608_24">Win</A>);
-++      <FONT COLOR=red><A NAME="ref_324_7">W</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__adb.htm#ref_321_16">Dupwin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_614_24">Win</A>);
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_377_7">W</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_324_7">W</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_377_7">W</A>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_608_13">Duplicate</A>;
-++      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_324_7">W</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_614_13">Duplicate</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_385_14" HREF="terminal_interface-curses__ads.htm#ref_613_14">Move_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_385_27" HREF="terminal_interface-curses__ads.htm#ref_613_27">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                          <FONT COLOR=red><A NAME="ref_386_27" HREF="terminal_interface-curses__ads.htm#ref_614_27">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-                          <FONT COLOR=red><A NAME="ref_387_27" HREF="terminal_interface-curses__ads.htm#ref_615_27">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_332_14" HREF="terminal_interface-curses__ads.htm#ref_619_14">Move_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_332_27" HREF="terminal_interface-curses__ads.htm#ref_619_27">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                          <FONT COLOR=red><A NAME="ref_333_27" HREF="terminal_interface-curses__ads.htm#ref_620_27">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++                          <FONT COLOR=red><A NAME="ref_334_27" HREF="terminal_interface-curses__ads.htm#ref_621_27">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_389_16">Mvwin</A></FONT> (<FONT COLOR=red><A NAME="ref_389_23" HREF="terminal_interface-curses__adb.htm#ref_389_16">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                      <FONT COLOR=red><A NAME="ref_390_23" HREF="terminal_interface-curses__adb.htm#ref_389_16">Line</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-                      <FONT COLOR=red><A NAME="ref_391_23" HREF="terminal_interface-curses__adb.htm#ref_389_16">Column</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_336_16">Mvwin</A></FONT> (<FONT COLOR=red><A NAME="ref_336_23" HREF="terminal_interface-curses__adb.htm#ref_336_16">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                      <FONT COLOR=red><A NAME="ref_337_23" HREF="terminal_interface-curses__adb.htm#ref_336_16">Line</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++                      <FONT COLOR=red><A NAME="ref_338_23" HREF="terminal_interface-curses__adb.htm#ref_336_16">Column</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Mvwin, "mvwin");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_389_16">Mvwin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_613_27">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_614_27">Line</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_615_27">Column</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_336_16">Mvwin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_619_27">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_620_27">Line</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_621_27">Column</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_613_14">Move_Window</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_619_14">Move_Window</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_399_14" HREF="terminal_interface-curses__ads.htm#ref_620_14">Move_Derived_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_399_35" HREF="terminal_interface-curses__ads.htm#ref_620_35">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                                  <FONT COLOR=red><A NAME="ref_400_35" HREF="terminal_interface-curses__ads.htm#ref_621_35">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-                                  <FONT COLOR=red><A NAME="ref_401_35" HREF="terminal_interface-curses__ads.htm#ref_622_35">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_346_14" HREF="terminal_interface-curses__ads.htm#ref_626_14">Move_Derived_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_346_35" HREF="terminal_interface-curses__ads.htm#ref_626_35">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                                  <FONT COLOR=red><A NAME="ref_347_35" HREF="terminal_interface-curses__ads.htm#ref_627_35">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++                                  <FONT COLOR=red><A NAME="ref_348_35" HREF="terminal_interface-curses__ads.htm#ref_628_35">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_403_16">Mvderwin</A></FONT> (<FONT COLOR=red><A NAME="ref_403_26" HREF="terminal_interface-curses__adb.htm#ref_403_16">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                         <FONT COLOR=red><A NAME="ref_404_26" HREF="terminal_interface-curses__adb.htm#ref_403_16">Line</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-                         <FONT COLOR=red><A NAME="ref_405_26" HREF="terminal_interface-curses__adb.htm#ref_403_16">Column</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_350_16">Mvderwin</A></FONT> (<FONT COLOR=red><A NAME="ref_350_26" HREF="terminal_interface-curses__adb.htm#ref_350_16">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                         <FONT COLOR=red><A NAME="ref_351_26" HREF="terminal_interface-curses__adb.htm#ref_350_16">Line</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++                         <FONT COLOR=red><A NAME="ref_352_26" HREF="terminal_interface-curses__adb.htm#ref_350_16">Column</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Mvderwin, "mvderwin");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_403_16">Mvderwin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_620_35">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_621_35">Line</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_622_35">Column</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_350_16">Mvderwin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_626_35">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_627_35">Line</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_628_35">Column</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_620_14">Move_Derived_Window</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_626_14">Move_Derived_Window</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_413_14" HREF="terminal_interface-curses__ads.htm#ref_637_14">Set_Synch_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_413_30" HREF="terminal_interface-curses__ads.htm#ref_637_30">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>  := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-                             <FONT COLOR=red><A NAME="ref_414_30" HREF="terminal_interface-curses__ads.htm#ref_638_30">Mode</A></FONT> : <b>in</b> Boolean := False)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_360_14" HREF="terminal_interface-curses__ads.htm#ref_643_14">Set_Synch_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_360_30" HREF="terminal_interface-curses__ads.htm#ref_643_30">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>  := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                             <FONT COLOR=red><A NAME="ref_361_30" HREF="terminal_interface-curses__ads.htm#ref_644_30">Mode</A></FONT> : <b>in</b> Boolean := False)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_416_16">Syncok</A></FONT> (<FONT COLOR=red><A NAME="ref_416_24" HREF="terminal_interface-curses__adb.htm#ref_416_16">Win</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                       <FONT COLOR=red><A NAME="ref_417_24" HREF="terminal_interface-curses__adb.htm#ref_416_16">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_363_16">Syncok</A></FONT> (<FONT COLOR=red><A NAME="ref_363_24" HREF="terminal_interface-curses__adb.htm#ref_363_16">Win</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                       <FONT COLOR=red><A NAME="ref_364_24" HREF="terminal_interface-curses__adb.htm#ref_363_16">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Syncok, "syncok");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_416_16">Syncok</A> (<A HREF="terminal_interface-curses__ads.htm#ref_637_30">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_638_30">Mode</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_363_16">Syncok</A> (<A HREF="terminal_interface-curses__ads.htm#ref_643_30">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_644_30">Mode</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_637_14">Set_Synch_Mode</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_643_14">Set_Synch_Mode</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_425_14" HREF="terminal_interface-curses__ads.htm#ref_647_14">Add</A></FONT> (<FONT COLOR=red><A NAME="ref_425_19" HREF="terminal_interface-curses__ads.htm#ref_647_19">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-                  <FONT COLOR=red><A NAME="ref_426_19" HREF="terminal_interface-curses__ads.htm#ref_648_19">Str</A></FONT> : <b>in</b> String;
-+-                  <FONT COLOR=red><A NAME="ref_427_19" HREF="terminal_interface-curses__ads.htm#ref_649_19">Len</A></FONT> : <b>in</b> Integer := -1)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_372_14" HREF="terminal_interface-curses__ads.htm#ref_653_14">Add</A></FONT> (<FONT COLOR=red><A NAME="ref_372_19" HREF="terminal_interface-curses__ads.htm#ref_653_19">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                  <FONT COLOR=red><A NAME="ref_373_19" HREF="terminal_interface-curses__ads.htm#ref_654_19">Str</A></FONT> : <b>in</b> String;
-++                  <FONT COLOR=red><A NAME="ref_374_19" HREF="terminal_interface-curses__ads.htm#ref_655_19">Len</A></FONT> : <b>in</b> Integer := -1)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_429_16">Waddnstr</A></FONT> (<FONT COLOR=red><A NAME="ref_429_26" HREF="terminal_interface-curses__adb.htm#ref_429_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                         <FONT COLOR=red><A NAME="ref_430_26" HREF="terminal_interface-curses__adb.htm#ref_429_16">Str</A></FONT> : char_array;
-+-                         <FONT COLOR=red><A NAME="ref_431_26" HREF="terminal_interface-curses__adb.htm#ref_429_16">Len</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := -1) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_376_16">Waddnstr</A></FONT> (<FONT COLOR=red><A NAME="ref_376_26" HREF="terminal_interface-curses__adb.htm#ref_376_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                         <FONT COLOR=red><A NAME="ref_377_26" HREF="terminal_interface-curses__adb.htm#ref_376_16">Str</A></FONT> : char_array;
-++                         <FONT COLOR=red><A NAME="ref_378_26" HREF="terminal_interface-curses__adb.htm#ref_376_16">Len</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := -1) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Waddnstr, "waddnstr");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_434_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_648_19">Str</A>'Length);
-+-      <FONT COLOR=red><A NAME="ref_435_7">Length</A></FONT> : size_t;
-++      <FONT COLOR=red><A NAME="ref_381_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_654_19">Str</A>'Length);
-++      <FONT COLOR=red><A NAME="ref_382_7">Length</A></FONT> : size_t;
-+    <b>begin</b>
-+-      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_648_19">Str</A>, <A HREF="terminal_interface-curses__adb.htm#ref_434_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_435_7">Length</A>);
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_429_16">Waddnstr</A> (<A HREF="terminal_interface-curses__ads.htm#ref_647_19">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_434_7">Txt</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_649_19">Len</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_654_19">Str</A>, <A HREF="terminal_interface-curses__adb.htm#ref_381_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_382_7">Length</A>);
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_376_16">Waddnstr</A> (<A HREF="terminal_interface-curses__ads.htm#ref_653_19">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_381_7">Txt</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_655_19">Len</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_647_14">Add</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_653_14">Add</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_443_14" HREF="terminal_interface-curses__ads.htm#ref_656_14">Add</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_444_7" HREF="terminal_interface-curses__ads.htm#ref_656_19">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_445_7" HREF="terminal_interface-curses__ads.htm#ref_657_19">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_446_7" HREF="terminal_interface-curses__ads.htm#ref_658_19">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_447_7" HREF="terminal_interface-curses__ads.htm#ref_659_19">Str</A></FONT>    : <b>in</b> String;
-+-      <FONT COLOR=red><A NAME="ref_448_7" HREF="terminal_interface-curses__ads.htm#ref_660_19">Len</A></FONT>    : <b>in</b> Integer := -1)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_390_14" HREF="terminal_interface-curses__ads.htm#ref_662_14">Add</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_391_7" HREF="terminal_interface-curses__ads.htm#ref_662_19">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_392_7" HREF="terminal_interface-curses__ads.htm#ref_663_19">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_393_7" HREF="terminal_interface-curses__ads.htm#ref_664_19">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_394_7" HREF="terminal_interface-curses__ads.htm#ref_665_19">Str</A></FONT>    : <b>in</b> String;
-++      <FONT COLOR=red><A NAME="ref_395_7" HREF="terminal_interface-curses__ads.htm#ref_666_19">Len</A></FONT>    : <b>in</b> Integer := -1)
-+    <b>is</b>
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_505_14">Move_Cursor</A> (<A HREF="terminal_interface-curses__ads.htm#ref_656_19">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_657_19">Line</A>, <A HREF="terminal_interface-curses__ads.htm#ref_658_19">Column</A>);
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_647_14">Add</A> (<A HREF="terminal_interface-curses__ads.htm#ref_656_19">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_659_19">Str</A>, <A HREF="terminal_interface-curses__ads.htm#ref_660_19">Len</A>);
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_656_14">Add</A>;
-++      <A HREF="terminal_interface-curses__ads.htm#ref_511_14">Move_Cursor</A> (<A HREF="terminal_interface-curses__ads.htm#ref_662_19">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_663_19">Line</A>, <A HREF="terminal_interface-curses__ads.htm#ref_664_19">Column</A>);
-++      <A HREF="terminal_interface-curses__ads.htm#ref_653_14">Add</A> (<A HREF="terminal_interface-curses__ads.htm#ref_662_19">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_665_19">Str</A>, <A HREF="terminal_interface-curses__ads.htm#ref_666_19">Len</A>);
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_662_14">Add</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_455_14" HREF="terminal_interface-curses__ads.htm#ref_671_14">Add</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_456_7" HREF="terminal_interface-curses__ads.htm#ref_671_19">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_457_7" HREF="terminal_interface-curses__ads.htm#ref_672_19">Str</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Attributed_String</A>;
-+-      <FONT COLOR=red><A NAME="ref_458_7" HREF="terminal_interface-curses__ads.htm#ref_673_19">Len</A></FONT> : <b>in</b> Integer := -1)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_402_14" HREF="terminal_interface-curses__ads.htm#ref_677_14">Add</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_403_7" HREF="terminal_interface-curses__ads.htm#ref_677_19">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_404_7" HREF="terminal_interface-curses__ads.htm#ref_678_19">Str</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Attributed_String</A>;
-++      <FONT COLOR=red><A NAME="ref_405_7" HREF="terminal_interface-curses__ads.htm#ref_679_19">Len</A></FONT> : <b>in</b> Integer := -1)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_460_16">Waddchnstr</A></FONT> (<FONT COLOR=red><A NAME="ref_460_28" HREF="terminal_interface-curses__adb.htm#ref_460_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                           <FONT COLOR=red><A NAME="ref_461_28" HREF="terminal_interface-curses__adb.htm#ref_460_16">Str</A></FONT> : <A HREF="terminal_interface-curses__adb.htm#ref_59_9">chtype_array</A>;
-+-                           <FONT COLOR=red><A NAME="ref_462_28" HREF="terminal_interface-curses__adb.htm#ref_460_16">Len</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := -1) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_407_16">Waddchnstr</A></FONT> (<FONT COLOR=red><A NAME="ref_407_28" HREF="terminal_interface-curses__adb.htm#ref_407_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                           <FONT COLOR=red><A NAME="ref_408_28" HREF="terminal_interface-curses__adb.htm#ref_407_16">Str</A></FONT> : <A HREF="terminal_interface-curses__adb.htm#ref_57_9">chtype_array</A>;
-++                           <FONT COLOR=red><A NAME="ref_409_28" HREF="terminal_interface-curses__adb.htm#ref_407_16">Len</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := -1) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Waddchnstr, "waddchnstr");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_465_7">Txt</A></FONT> : <A HREF="terminal_interface-curses__adb.htm#ref_59_9">chtype_array</A> (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_672_19">Str</A>'Length);
-++      <FONT COLOR=red><A NAME="ref_412_7">Txt</A></FONT> : <A HREF="terminal_interface-curses__adb.htm#ref_57_9">chtype_array</A> (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_678_19">Str</A>'Length);
-+    <b>begin</b>
-+-      <b>for</b> <FONT COLOR=red><A NAME="ref_467_11">Length</A></FONT> <b>in</b> 1 .. size_t (<A HREF="terminal_interface-curses__ads.htm#ref_672_19">Str</A>'Length) <b>loop</b>
-+-         <A HREF="terminal_interface-curses__adb.htm#ref_465_7">Txt</A> (<A HREF="terminal_interface-curses__adb.htm#ref_467_11">Length</A> - 1) := <A HREF="terminal_interface-curses__ads.htm#ref_672_19">Str</A> (Natural (<A HREF="terminal_interface-curses__adb.htm#ref_467_11">Length</A>));
-++      <b>for</b> <FONT COLOR=red><A NAME="ref_414_11">Length</A></FONT> <b>in</b> 1 .. size_t (<A HREF="terminal_interface-curses__ads.htm#ref_678_19">Str</A>'Length) <b>loop</b>
-++         <A HREF="terminal_interface-curses__adb.htm#ref_412_7">Txt</A> (<A HREF="terminal_interface-curses__adb.htm#ref_414_11">Length</A> - 1) := <A HREF="terminal_interface-curses__ads.htm#ref_678_19">Str</A> (Natural (<A HREF="terminal_interface-curses__adb.htm#ref_414_11">Length</A>));
-+       <b>end</b> <b>loop</b>;
-+-      <A HREF="terminal_interface-curses__adb.htm#ref_465_7">Txt</A> (<A HREF="terminal_interface-curses__ads.htm#ref_672_19">Str</A>'Length) := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_460_16">Waddchnstr</A> (<A HREF="terminal_interface-curses__ads.htm#ref_671_19">Win</A>,
-+-                     <A HREF="terminal_interface-curses__adb.htm#ref_465_7">Txt</A>,
-+-                     <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_673_19">Len</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+-         <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+-      <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_671_14">Add</A>;
-+-
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_478_14" HREF="terminal_interface-curses__ads.htm#ref_680_14">Add</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_479_7" HREF="terminal_interface-curses__ads.htm#ref_680_19">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_480_7" HREF="terminal_interface-curses__ads.htm#ref_681_19">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_481_7" HREF="terminal_interface-curses__ads.htm#ref_682_19">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_482_7" HREF="terminal_interface-curses__ads.htm#ref_683_19">Str</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Attributed_String</A>;
-+-      <FONT COLOR=red><A NAME="ref_483_7" HREF="terminal_interface-curses__ads.htm#ref_684_19">Len</A></FONT>    : <b>in</b> Integer := -1)
-+-   <b>is</b>
-+-   <b>begin</b>
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_505_14">Move_Cursor</A> (<A HREF="terminal_interface-curses__ads.htm#ref_680_19">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_681_19">Line</A>, <A HREF="terminal_interface-curses__ads.htm#ref_682_19">Column</A>);
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_671_14">Add</A> (<A HREF="terminal_interface-curses__ads.htm#ref_680_19">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_683_19">Str</A>, <A HREF="terminal_interface-curses__ads.htm#ref_684_19">Len</A>);
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_680_14">Add</A>;
-+-<FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_490_14" HREF="terminal_interface-curses__ads.htm#ref_698_14">Border</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_491_7" HREF="terminal_interface-curses__ads.htm#ref_699_7">Win</A></FONT>                       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_492_7" HREF="terminal_interface-curses__ads.htm#ref_700_7">Left_Side_Symbol</A></FONT>          : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+-      <FONT COLOR=red><A NAME="ref_493_7" HREF="terminal_interface-curses__ads.htm#ref_701_7">Right_Side_Symbol</A></FONT>         : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+-      <FONT COLOR=red><A NAME="ref_494_7" HREF="terminal_interface-curses__ads.htm#ref_702_7">Top_Side_Symbol</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+-      <FONT COLOR=red><A NAME="ref_495_7" HREF="terminal_interface-curses__ads.htm#ref_703_7">Bottom_Side_Symbol</A></FONT>        : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+-      <FONT COLOR=red><A NAME="ref_496_7" HREF="terminal_interface-curses__ads.htm#ref_704_7">Upper_Left_Corner_Symbol</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+-      <FONT COLOR=red><A NAME="ref_497_7" HREF="terminal_interface-curses__ads.htm#ref_705_7">Upper_Right_Corner_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+-      <FONT COLOR=red><A NAME="ref_498_7" HREF="terminal_interface-curses__ads.htm#ref_706_7">Lower_Left_Corner_Symbol</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+-      <FONT COLOR=red><A NAME="ref_499_7" HREF="terminal_interface-curses__ads.htm#ref_707_7">Lower_Right_Corner_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>)
-+-   <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_501_16">Wborder</A></FONT> (<FONT COLOR=red><A NAME="ref_501_25" HREF="terminal_interface-curses__adb.htm#ref_501_16">W</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                        <FONT COLOR=red><A NAME="ref_502_25" HREF="terminal_interface-curses__adb.htm#ref_501_16">LS</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-+-                        <FONT COLOR=red><A NAME="ref_503_25" HREF="terminal_interface-curses__adb.htm#ref_501_16">RS</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-+-                        <FONT COLOR=red><A NAME="ref_504_25" HREF="terminal_interface-curses__adb.htm#ref_501_16">TS</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-+-                        <FONT COLOR=red><A NAME="ref_505_25" HREF="terminal_interface-curses__adb.htm#ref_501_16">BS</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-+-                        <FONT COLOR=red><A NAME="ref_506_25" HREF="terminal_interface-curses__adb.htm#ref_501_16">ULC</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-+-                        <FONT COLOR=red><A NAME="ref_507_25" HREF="terminal_interface-curses__adb.htm#ref_501_16">URC</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-+-                        <FONT COLOR=red><A NAME="ref_508_25" HREF="terminal_interface-curses__adb.htm#ref_501_16">LLC</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-+-                        <FONT COLOR=red><A NAME="ref_509_25" HREF="terminal_interface-curses__adb.htm#ref_501_16">LRC</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <A HREF="terminal_interface-curses__adb.htm#ref_412_7">Txt</A> (<A HREF="terminal_interface-curses__ads.htm#ref_678_19">Str</A>'Length) := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_407_16">Waddchnstr</A> (<A HREF="terminal_interface-curses__ads.htm#ref_677_19">Win</A>,
-++                     <A HREF="terminal_interface-curses__adb.htm#ref_412_7">Txt</A>,
-++                     <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_679_19">Len</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++         <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-++      <b>end</b> <b>if</b>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_677_14">Add</A>;
-++
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_425_14" HREF="terminal_interface-curses__ads.htm#ref_686_14">Add</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_426_7" HREF="terminal_interface-curses__ads.htm#ref_686_19">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_427_7" HREF="terminal_interface-curses__ads.htm#ref_687_19">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_428_7" HREF="terminal_interface-curses__ads.htm#ref_688_19">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_429_7" HREF="terminal_interface-curses__ads.htm#ref_689_19">Str</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Attributed_String</A>;
-++      <FONT COLOR=red><A NAME="ref_430_7" HREF="terminal_interface-curses__ads.htm#ref_690_19">Len</A></FONT>    : <b>in</b> Integer := -1)
-++   <b>is</b>
-++   <b>begin</b>
-++      <A HREF="terminal_interface-curses__ads.htm#ref_511_14">Move_Cursor</A> (<A HREF="terminal_interface-curses__ads.htm#ref_686_19">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_687_19">Line</A>, <A HREF="terminal_interface-curses__ads.htm#ref_688_19">Column</A>);
-++      <A HREF="terminal_interface-curses__ads.htm#ref_677_14">Add</A> (<A HREF="terminal_interface-curses__ads.htm#ref_686_19">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_689_19">Str</A>, <A HREF="terminal_interface-curses__ads.htm#ref_690_19">Len</A>);
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_686_14">Add</A>;
-++<FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_437_14" HREF="terminal_interface-curses__ads.htm#ref_704_14">Border</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_438_7" HREF="terminal_interface-curses__ads.htm#ref_705_7">Win</A></FONT>                       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_439_7" HREF="terminal_interface-curses__ads.htm#ref_706_7">Left_Side_Symbol</A></FONT>          : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-++      <FONT COLOR=red><A NAME="ref_440_7" HREF="terminal_interface-curses__ads.htm#ref_707_7">Right_Side_Symbol</A></FONT>         : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-++      <FONT COLOR=red><A NAME="ref_441_7" HREF="terminal_interface-curses__ads.htm#ref_708_7">Top_Side_Symbol</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-++      <FONT COLOR=red><A NAME="ref_442_7" HREF="terminal_interface-curses__ads.htm#ref_709_7">Bottom_Side_Symbol</A></FONT>        : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-++      <FONT COLOR=red><A NAME="ref_443_7" HREF="terminal_interface-curses__ads.htm#ref_710_7">Upper_Left_Corner_Symbol</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-++      <FONT COLOR=red><A NAME="ref_444_7" HREF="terminal_interface-curses__ads.htm#ref_711_7">Upper_Right_Corner_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-++      <FONT COLOR=red><A NAME="ref_445_7" HREF="terminal_interface-curses__ads.htm#ref_712_7">Lower_Left_Corner_Symbol</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-++      <FONT COLOR=red><A NAME="ref_446_7" HREF="terminal_interface-curses__ads.htm#ref_713_7">Lower_Right_Corner_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>)
-++   <b>is</b>
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_448_16">Wborder</A></FONT> (<FONT COLOR=red><A NAME="ref_448_25" HREF="terminal_interface-curses__adb.htm#ref_448_16">W</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                        <FONT COLOR=red><A NAME="ref_449_25" HREF="terminal_interface-curses__adb.htm#ref_448_16">LS</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-++                        <FONT COLOR=red><A NAME="ref_450_25" HREF="terminal_interface-curses__adb.htm#ref_448_16">RS</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-++                        <FONT COLOR=red><A NAME="ref_451_25" HREF="terminal_interface-curses__adb.htm#ref_448_16">TS</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-++                        <FONT COLOR=red><A NAME="ref_452_25" HREF="terminal_interface-curses__adb.htm#ref_448_16">BS</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-++                        <FONT COLOR=red><A NAME="ref_453_25" HREF="terminal_interface-curses__adb.htm#ref_448_16">ULC</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-++                        <FONT COLOR=red><A NAME="ref_454_25" HREF="terminal_interface-curses__adb.htm#ref_448_16">URC</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-++                        <FONT COLOR=red><A NAME="ref_455_25" HREF="terminal_interface-curses__adb.htm#ref_448_16">LLC</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-++                        <FONT COLOR=red><A NAME="ref_456_25" HREF="terminal_interface-curses__adb.htm#ref_448_16">LRC</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Wborder, "wborder");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_501_16">Wborder</A> (<A HREF="terminal_interface-curses__ads.htm#ref_699_7">Win</A>,
-+-                  AttrChar_To_Chtype (<A HREF="terminal_interface-curses__ads.htm#ref_700_7">Left_Side_Symbol</A>),
-+-                  AttrChar_To_Chtype (<A HREF="terminal_interface-curses__ads.htm#ref_701_7">Right_Side_Symbol</A>),
-+-                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_702_7">Top_Side_Symbol</A>),
-+-                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_703_7">Bottom_Side_Symbol</A>),
-+-                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_704_7">Upper_Left_Corner_Symbol</A>),
-+-                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_705_7">Upper_Right_Corner_Symbol</A>),
-+-                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_706_7">Lower_Left_Corner_Symbol</A>),
-+-                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_707_7">Lower_Right_Corner_Symbol</A>)
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_448_16">Wborder</A> (<A HREF="terminal_interface-curses__ads.htm#ref_705_7">Win</A>,
-++                  AttrChar_To_Chtype (<A HREF="terminal_interface-curses__ads.htm#ref_706_7">Left_Side_Symbol</A>),
-++                  AttrChar_To_Chtype (<A HREF="terminal_interface-curses__ads.htm#ref_707_7">Right_Side_Symbol</A>),
-++                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_708_7">Top_Side_Symbol</A>),
-++                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_709_7">Bottom_Side_Symbol</A>),
-++                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_710_7">Upper_Left_Corner_Symbol</A>),
-++                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_711_7">Upper_Right_Corner_Symbol</A>),
-++                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_712_7">Lower_Left_Corner_Symbol</A>),
-++                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_713_7">Lower_Right_Corner_Symbol</A>)
-+                   ) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A>
-+       <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_698_14">Border</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_704_14">Border</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_527_14" HREF="terminal_interface-curses__ads.htm#ref_714_14">Box</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_528_7" HREF="terminal_interface-curses__ads.htm#ref_715_7">Win</A></FONT>               : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_529_7" HREF="terminal_interface-curses__ads.htm#ref_716_7">Vertical_Symbol</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+-      <FONT COLOR=red><A NAME="ref_530_7" HREF="terminal_interface-curses__ads.htm#ref_717_7">Horizontal_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>)
-+-   <b>is</b>
-+-   <b>begin</b>
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_698_14">Border</A> (<A HREF="terminal_interface-curses__ads.htm#ref_715_7">Win</A>,
-+-              <A HREF="terminal_interface-curses__ads.htm#ref_716_7">Vertical_Symbol</A>, <A HREF="terminal_interface-curses__ads.htm#ref_716_7">Vertical_Symbol</A>,
-+-              <A HREF="terminal_interface-curses__ads.htm#ref_717_7">Horizontal_Symbol</A>, <A HREF="terminal_interface-curses__ads.htm#ref_717_7">Horizontal_Symbol</A>);
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_714_14">Box</A>;
-+-
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_538_14" HREF="terminal_interface-curses__ads.htm#ref_722_14">Horizontal_Line</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_539_7" HREF="terminal_interface-curses__ads.htm#ref_723_7">Win</A></FONT>         : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_540_7" HREF="terminal_interface-curses__ads.htm#ref_724_7">Line_Size</A></FONT>   : <b>in</b> Natural;
-+-      <FONT COLOR=red><A NAME="ref_541_7" HREF="terminal_interface-curses__ads.htm#ref_725_7">Line_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>)
-+-   <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_543_16">Whline</A></FONT> (<FONT COLOR=red><A NAME="ref_543_24" HREF="terminal_interface-curses__adb.htm#ref_543_16">W</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                       <FONT COLOR=red><A NAME="ref_544_24" HREF="terminal_interface-curses__adb.htm#ref_543_16">Ch</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-+-                       <FONT COLOR=red><A NAME="ref_545_24" HREF="terminal_interface-curses__adb.htm#ref_543_16">Len</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_474_14" HREF="terminal_interface-curses__ads.htm#ref_720_14">Box</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_475_7" HREF="terminal_interface-curses__ads.htm#ref_721_7">Win</A></FONT>               : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_476_7" HREF="terminal_interface-curses__ads.htm#ref_722_7">Vertical_Symbol</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-++      <FONT COLOR=red><A NAME="ref_477_7" HREF="terminal_interface-curses__ads.htm#ref_723_7">Horizontal_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>)
-++   <b>is</b>
-++   <b>begin</b>
-++      <A HREF="terminal_interface-curses__ads.htm#ref_704_14">Border</A> (<A HREF="terminal_interface-curses__ads.htm#ref_721_7">Win</A>,
-++              <A HREF="terminal_interface-curses__ads.htm#ref_722_7">Vertical_Symbol</A>, <A HREF="terminal_interface-curses__ads.htm#ref_722_7">Vertical_Symbol</A>,
-++              <A HREF="terminal_interface-curses__ads.htm#ref_723_7">Horizontal_Symbol</A>, <A HREF="terminal_interface-curses__ads.htm#ref_723_7">Horizontal_Symbol</A>);
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_720_14">Box</A>;
-++
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_485_14" HREF="terminal_interface-curses__ads.htm#ref_728_14">Horizontal_Line</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_486_7" HREF="terminal_interface-curses__ads.htm#ref_729_7">Win</A></FONT>         : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_487_7" HREF="terminal_interface-curses__ads.htm#ref_730_7">Line_Size</A></FONT>   : <b>in</b> Natural;
-++      <FONT COLOR=red><A NAME="ref_488_7" HREF="terminal_interface-curses__ads.htm#ref_731_7">Line_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>)
-++   <b>is</b>
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_490_16">Whline</A></FONT> (<FONT COLOR=red><A NAME="ref_490_24" HREF="terminal_interface-curses__adb.htm#ref_490_16">W</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                       <FONT COLOR=red><A NAME="ref_491_24" HREF="terminal_interface-curses__adb.htm#ref_490_16">Ch</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-++                       <FONT COLOR=red><A NAME="ref_492_24" HREF="terminal_interface-curses__adb.htm#ref_490_16">Len</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Whline, "whline");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_543_16">Whline</A> (<A HREF="terminal_interface-curses__ads.htm#ref_723_7">Win</A>,
-+-                 <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_725_7">Line_Symbol</A>),
-+-                 <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_724_7">Line_Size</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_490_16">Whline</A> (<A HREF="terminal_interface-curses__ads.htm#ref_729_7">Win</A>,
-++                 <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_731_7">Line_Symbol</A>),
-++                 <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_730_7">Line_Size</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_722_14">Horizontal_Line</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_728_14">Horizontal_Line</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_555_14" HREF="terminal_interface-curses__ads.htm#ref_731_14">Vertical_Line</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_556_7" HREF="terminal_interface-curses__ads.htm#ref_732_7">Win</A></FONT>         : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_557_7" HREF="terminal_interface-curses__ads.htm#ref_733_7">Line_Size</A></FONT>   : <b>in</b> Natural;
-+-      <FONT COLOR=red><A NAME="ref_558_7" HREF="terminal_interface-curses__ads.htm#ref_734_7">Line_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_502_14" HREF="terminal_interface-curses__ads.htm#ref_737_14">Vertical_Line</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_503_7" HREF="terminal_interface-curses__ads.htm#ref_738_7">Win</A></FONT>         : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_504_7" HREF="terminal_interface-curses__ads.htm#ref_739_7">Line_Size</A></FONT>   : <b>in</b> Natural;
-++      <FONT COLOR=red><A NAME="ref_505_7" HREF="terminal_interface-curses__ads.htm#ref_740_7">Line_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_560_16">Wvline</A></FONT> (<FONT COLOR=red><A NAME="ref_560_24" HREF="terminal_interface-curses__adb.htm#ref_560_16">W</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                       <FONT COLOR=red><A NAME="ref_561_24" HREF="terminal_interface-curses__adb.htm#ref_560_16">Ch</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-+-                       <FONT COLOR=red><A NAME="ref_562_24" HREF="terminal_interface-curses__adb.htm#ref_560_16">Len</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_507_16">Wvline</A></FONT> (<FONT COLOR=red><A NAME="ref_507_24" HREF="terminal_interface-curses__adb.htm#ref_507_16">W</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                       <FONT COLOR=red><A NAME="ref_508_24" HREF="terminal_interface-curses__adb.htm#ref_507_16">Ch</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-++                       <FONT COLOR=red><A NAME="ref_509_24" HREF="terminal_interface-curses__adb.htm#ref_507_16">Len</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Wvline, "wvline");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_560_16">Wvline</A> (<A HREF="terminal_interface-curses__ads.htm#ref_732_7">Win</A>,
-+-                 <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_734_7">Line_Symbol</A>),
-+-                 <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_733_7">Line_Size</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_507_16">Wvline</A> (<A HREF="terminal_interface-curses__ads.htm#ref_738_7">Win</A>,
-++                 <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_740_7">Line_Symbol</A>),
-++                 <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_739_7">Line_Size</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_731_14">Vertical_Line</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_737_14">Vertical_Line</A>;
-+ 
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_573_13" HREF="terminal_interface-curses__ads.htm#ref_745_13">Get_Keystroke</A></FONT> (<FONT COLOR=red><A NAME="ref_573_28" HREF="terminal_interface-curses__ads.htm#ref_745_28">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_520_13" HREF="terminal_interface-curses__ads.htm#ref_751_13">Get_Keystroke</A></FONT> (<FONT COLOR=red><A NAME="ref_520_28" HREF="terminal_interface-curses__ads.htm#ref_751_28">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-+      <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_576_16">Wgetch</A></FONT> (<FONT COLOR=red><A NAME="ref_576_24" HREF="terminal_interface-curses__adb.htm#ref_576_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_523_16">Wgetch</A></FONT> (<FONT COLOR=red><A NAME="ref_523_24" HREF="terminal_interface-curses__adb.htm#ref_523_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Wgetch, "wgetch");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_579_7">C</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses__adb.htm#ref_576_16">Wgetch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_745_28">Win</A>);
-++      <FONT COLOR=red><A NAME="ref_526_7">C</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses__adb.htm#ref_523_16">Wgetch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_751_28">Win</A>);
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_579_7">C</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_526_7">C</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_88_4">Key_None</A>;
-+       <b>else</b>
-+-         <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A> (<A HREF="terminal_interface-curses__adb.htm#ref_579_7">C</A>);
-++         <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A> (<A HREF="terminal_interface-curses__adb.htm#ref_526_7">C</A>);
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_745_13">Get_Keystroke</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_751_13">Get_Keystroke</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_588_14" HREF="terminal_interface-curses__ads.htm#ref_756_14">Undo_Keystroke</A></FONT> (<FONT COLOR=red><A NAME="ref_588_30" HREF="terminal_interface-curses__ads.htm#ref_756_30">Key</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_535_14" HREF="terminal_interface-curses__ads.htm#ref_762_14">Undo_Keystroke</A></FONT> (<FONT COLOR=red><A NAME="ref_535_30" HREF="terminal_interface-curses__ads.htm#ref_762_30">Key</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_590_16">Ungetch</A></FONT> (<FONT COLOR=red><A NAME="ref_590_25" HREF="terminal_interface-curses__adb.htm#ref_590_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_537_16">Ungetch</A></FONT> (<FONT COLOR=red><A NAME="ref_537_25" HREF="terminal_interface-curses__adb.htm#ref_537_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Ungetch, "ungetch");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_590_16">Ungetch</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_756_30">Key</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_537_16">Ungetch</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_762_30">Key</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_756_14">Undo_Keystroke</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_762_14">Undo_Keystroke</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_598_13" HREF="terminal_interface-curses__ads.htm#ref_761_13">Has_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_598_22" HREF="terminal_interface-curses__ads.htm#ref_761_22">Key</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>) <b>return</b> Boolean
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_545_13" HREF="terminal_interface-curses__ads.htm#ref_767_13">Has_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_545_22" HREF="terminal_interface-curses__ads.htm#ref_767_22">Key</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>) <b>return</b> Boolean
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_600_16">Haskey</A></FONT> (<FONT COLOR=red><A NAME="ref_600_24" HREF="terminal_interface-curses__adb.htm#ref_600_16">Key</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_547_16">Haskey</A></FONT> (<FONT COLOR=red><A NAME="ref_547_24" HREF="terminal_interface-curses__adb.htm#ref_547_16">Key</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Haskey, "has_key");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_600_16">Haskey</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_761_22">Key</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">Curses_False</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_547_16">Haskey</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_767_22">Key</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">Curses_False</A> <b>then</b>
-+          <b>return</b> False;
-+       <b>else</b>
-+          <b>return</b> True;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_761_13">Has_Key</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_767_13">Has_Key</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_610_13" HREF="terminal_interface-curses__ads.htm#ref_768_13">Is_Function_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_610_30" HREF="terminal_interface-curses__ads.htm#ref_768_30">Key</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>) <b>return</b> Boolean
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_557_13" HREF="terminal_interface-curses__ads.htm#ref_774_13">Is_Function_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_557_30" HREF="terminal_interface-curses__ads.htm#ref_774_30">Key</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>) <b>return</b> Boolean
-+    <b>is</b>
-+-      <FONT COLOR=red><A NAME="ref_612_7">L</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>  := <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> (Natural (<A HREF="terminal_interface-curses__ads.htm#ref_98_4">Key_F0</A>) +
-+-        Natural (<A HREF="terminal_interface-curses__ads.htm#ref_772_12">Function_Key_Number</A>'Last));
-++      <FONT COLOR=red><A NAME="ref_559_7">L</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>  := <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> (Natural (<A HREF="terminal_interface-curses__ads.htm#ref_98_4">Key_F0</A>) +
-++        Natural (<A HREF="terminal_interface-curses__ads.htm#ref_778_12">Function_Key_Number</A>'Last));
-+    <b>begin</b>
-+-      <b>if</b> (<A HREF="terminal_interface-curses__ads.htm#ref_768_30">Key</A> &gt;= <A HREF="terminal_interface-curses__ads.htm#ref_98_4">Key_F0</A>) <b>and</b> <b>then</b> (<A HREF="terminal_interface-curses__ads.htm#ref_768_30">Key</A> &lt;= <A HREF="terminal_interface-curses__adb.htm#ref_612_7">L</A>) <b>then</b>
-++      <b>if</b> (<A HREF="terminal_interface-curses__ads.htm#ref_774_30">Key</A> &gt;= <A HREF="terminal_interface-curses__ads.htm#ref_98_4">Key_F0</A>) <b>and</b> <b>then</b> (<A HREF="terminal_interface-curses__ads.htm#ref_774_30">Key</A> &lt;= <A HREF="terminal_interface-curses__adb.htm#ref_559_7">L</A>) <b>then</b>
-+          <b>return</b> True;
-+       <b>else</b>
-+          <b>return</b> False;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_768_13">Is_Function_Key</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_774_13">Is_Function_Key</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_622_13" HREF="terminal_interface-curses__ads.htm#ref_775_13">Function_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_622_27" HREF="terminal_interface-curses__ads.htm#ref_775_27">Key</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>)
-+-                          <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_772_12">Function_Key_Number</A>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_569_13" HREF="terminal_interface-curses__ads.htm#ref_781_13">Function_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_569_27" HREF="terminal_interface-curses__ads.htm#ref_781_27">Key</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>)
-++                          <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_778_12">Function_Key_Number</A>
-+    <b>is</b>
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_768_13">Is_Function_Key</A> (<A HREF="terminal_interface-curses__ads.htm#ref_775_27">Key</A>) <b>then</b>
-+-         <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_772_12">Function_Key_Number</A> (<A HREF="terminal_interface-curses__ads.htm#ref_775_27">Key</A> - <A HREF="terminal_interface-curses__ads.htm#ref_98_4">Key_F0</A>);
-++      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_774_13">Is_Function_Key</A> (<A HREF="terminal_interface-curses__ads.htm#ref_781_27">Key</A>) <b>then</b>
-++         <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_778_12">Function_Key_Number</A> (<A HREF="terminal_interface-curses__ads.htm#ref_781_27">Key</A> - <A HREF="terminal_interface-curses__ads.htm#ref_98_4">Key_F0</A>);
-+       <b>else</b>
-+          <b>raise</b> Constraint_Error;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_775_13">Function_Key</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_781_13">Function_Key</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_633_13" HREF="terminal_interface-curses__ads.htm#ref_780_13">Function_Key_Code</A></FONT> (<FONT COLOR=red><A NAME="ref_633_32" HREF="terminal_interface-curses__ads.htm#ref_780_32">Key</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_772_12">Function_Key_Number</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_580_13" HREF="terminal_interface-curses__ads.htm#ref_786_13">Function_Key_Code</A></FONT> (<FONT COLOR=red><A NAME="ref_580_32" HREF="terminal_interface-curses__ads.htm#ref_786_32">Key</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_778_12">Function_Key_Number</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>
-+    <b>is</b>
-+    <b>begin</b>
-+-      <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A> (Natural (<A HREF="terminal_interface-curses__ads.htm#ref_98_4">Key_F0</A>) + Natural (<A HREF="terminal_interface-curses__ads.htm#ref_780_32">Key</A>));
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_780_13">Function_Key_Code</A>;
-++      <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A> (Natural (<A HREF="terminal_interface-curses__ads.htm#ref_98_4">Key_F0</A>) + Natural (<A HREF="terminal_interface-curses__ads.htm#ref_786_32">Key</A>));
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_786_13">Function_Key_Code</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_639_14" HREF="terminal_interface-curses__ads.htm#ref_794_14">Standout</A></FONT> (<FONT COLOR=red><A NAME="ref_639_24" HREF="terminal_interface-curses__ads.htm#ref_794_24">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>  := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-                       <FONT COLOR=red><A NAME="ref_640_24" HREF="terminal_interface-curses__ads.htm#ref_795_24">On</A></FONT>  : Boolean := True)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_586_14" HREF="terminal_interface-curses__ads.htm#ref_800_14">Standout</A></FONT> (<FONT COLOR=red><A NAME="ref_586_24" HREF="terminal_interface-curses__ads.htm#ref_800_24">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>  := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                       <FONT COLOR=red><A NAME="ref_587_24" HREF="terminal_interface-curses__ads.htm#ref_801_24">On</A></FONT>  : Boolean := True)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_642_16">wstandout</A></FONT> (<FONT COLOR=red><A NAME="ref_642_27" HREF="terminal_interface-curses__adb.htm#ref_642_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_589_16">wstandout</A></FONT> (<FONT COLOR=red><A NAME="ref_589_27" HREF="terminal_interface-curses__adb.htm#ref_589_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, wstandout, "wstandout");
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_644_16">wstandend</A></FONT> (<FONT COLOR=red><A NAME="ref_644_27" HREF="terminal_interface-curses__adb.htm#ref_644_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_591_16">wstandend</A></FONT> (<FONT COLOR=red><A NAME="ref_591_27" HREF="terminal_interface-curses__adb.htm#ref_591_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, wstandend, "wstandend");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_647_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <FONT COLOR=red><A NAME="ref_594_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_795_24">On</A> <b>then</b>
-+-         <A HREF="terminal_interface-curses__adb.htm#ref_647_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_642_16">wstandout</A> (<A HREF="terminal_interface-curses__ads.htm#ref_794_24">Win</A>);
-++      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_801_24">On</A> <b>then</b>
-++         <A HREF="terminal_interface-curses__adb.htm#ref_594_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_589_16">wstandout</A> (<A HREF="terminal_interface-curses__ads.htm#ref_800_24">Win</A>);
-+       <b>else</b>
-+-         <A HREF="terminal_interface-curses__adb.htm#ref_647_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_644_16">wstandend</A> (<A HREF="terminal_interface-curses__ads.htm#ref_794_24">Win</A>);
-++         <A HREF="terminal_interface-curses__adb.htm#ref_594_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_591_16">wstandend</A> (<A HREF="terminal_interface-curses__ads.htm#ref_800_24">Win</A>);
-+       <b>end</b> <b>if</b>;
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_647_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_594_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_794_14">Standout</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_800_14">Standout</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_659_14" HREF="terminal_interface-curses__ads.htm#ref_800_14">Switch_Character_Attribute</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_660_7" HREF="terminal_interface-curses__ads.htm#ref_801_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_661_7" HREF="terminal_interface-curses__ads.htm#ref_802_7">Attr</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-+-      <FONT COLOR=red><A NAME="ref_662_7" HREF="terminal_interface-curses__ads.htm#ref_803_7">On</A></FONT>   : <b>in</b> Boolean := True)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_606_14" HREF="terminal_interface-curses__ads.htm#ref_806_14">Switch_Character_Attribute</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_607_7" HREF="terminal_interface-curses__ads.htm#ref_807_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_608_7" HREF="terminal_interface-curses__ads.htm#ref_808_7">Attr</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-++      <FONT COLOR=red><A NAME="ref_609_7" HREF="terminal_interface-curses__ads.htm#ref_809_7">On</A></FONT>   : <b>in</b> Boolean := True)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_664_16">Wattron</A></FONT> (<FONT COLOR=red><A NAME="ref_664_25" HREF="terminal_interface-curses__adb.htm#ref_664_16">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                        <FONT COLOR=red><A NAME="ref_665_25" HREF="terminal_interface-curses__adb.htm#ref_664_16">C_Attr</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_611_16">Wattron</A></FONT> (<FONT COLOR=red><A NAME="ref_611_25" HREF="terminal_interface-curses__adb.htm#ref_611_16">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                        <FONT COLOR=red><A NAME="ref_612_25" HREF="terminal_interface-curses__adb.htm#ref_611_16">C_Attr</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Wattron, "wattr_on");
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_667_16">Wattroff</A></FONT> (<FONT COLOR=red><A NAME="ref_667_26" HREF="terminal_interface-curses__adb.htm#ref_667_16">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                         <FONT COLOR=red><A NAME="ref_668_26" HREF="terminal_interface-curses__adb.htm#ref_667_16">C_Attr</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_614_16">Wattroff</A></FONT> (<FONT COLOR=red><A NAME="ref_614_26" HREF="terminal_interface-curses__adb.htm#ref_614_16">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                         <FONT COLOR=red><A NAME="ref_615_26" HREF="terminal_interface-curses__adb.htm#ref_614_16">C_Attr</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Wattroff, "wattr_off");
-+       <FONT COLOR=green><EM>--  In Ada we use the On Boolean to control whether or not we want to</EM></FONT>
-+       <FONT COLOR=green><EM>--  switch on or off the attributes in the set.</EM></FONT>
-+-      <FONT COLOR=red><A NAME="ref_672_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-      <FONT COLOR=red><A NAME="ref_673_7">AC</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := (<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; Character'First,
-++      <FONT COLOR=red><A NAME="ref_619_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <FONT COLOR=red><A NAME="ref_620_7">AC</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := (<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; Character'First,
-+                                               <A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First,
-+-                                              <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>  =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_802_7">Attr</A>);
-++                                              <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>  =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_808_7">Attr</A>);
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_803_7">On</A> <b>then</b>
-+-         <A HREF="terminal_interface-curses__adb.htm#ref_672_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_664_16">Wattron</A>  (<A HREF="terminal_interface-curses__ads.htm#ref_801_7">Win</A>, AttrChar_To_AttrType (<A HREF="terminal_interface-curses__adb.htm#ref_673_7">AC</A>));
-++      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_809_7">On</A> <b>then</b>
-++         <A HREF="terminal_interface-curses__adb.htm#ref_619_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_611_16">Wattron</A>  (<A HREF="terminal_interface-curses__ads.htm#ref_807_7">Win</A>, AttrChar_To_AttrType (<A HREF="terminal_interface-curses__adb.htm#ref_620_7">AC</A>));
-+       <b>else</b>
-+-         <A HREF="terminal_interface-curses__adb.htm#ref_672_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_667_16">Wattroff</A> (<A HREF="terminal_interface-curses__ads.htm#ref_801_7">Win</A>, AttrChar_To_AttrType (<A HREF="terminal_interface-curses__adb.htm#ref_673_7">AC</A>));
-++         <A HREF="terminal_interface-curses__adb.htm#ref_619_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_614_16">Wattroff</A> (<A HREF="terminal_interface-curses__ads.htm#ref_807_7">Win</A>, AttrChar_To_AttrType (<A HREF="terminal_interface-curses__adb.htm#ref_620_7">AC</A>));
-+       <b>end</b> <b>if</b>;
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_672_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_619_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_800_14">Switch_Character_Attribute</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_806_14">Switch_Character_Attribute</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_687_14" HREF="terminal_interface-curses__ads.htm#ref_811_14">Set_Character_Attributes</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_688_7" HREF="terminal_interface-curses__ads.htm#ref_812_7">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_689_7" HREF="terminal_interface-curses__ads.htm#ref_813_7">Attr</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-+-      <FONT COLOR=red><A NAME="ref_690_7" HREF="terminal_interface-curses__ads.htm#ref_814_7">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_634_14" HREF="terminal_interface-curses__ads.htm#ref_817_14">Set_Character_Attributes</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_635_7" HREF="terminal_interface-curses__ads.htm#ref_818_7">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_636_7" HREF="terminal_interface-curses__ads.htm#ref_819_7">Attr</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-++      <FONT COLOR=red><A NAME="ref_637_7" HREF="terminal_interface-curses__ads.htm#ref_820_7">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_692_16">Wattrset</A></FONT> (<FONT COLOR=red><A NAME="ref_692_26" HREF="terminal_interface-curses__adb.htm#ref_692_16">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                         <FONT COLOR=red><A NAME="ref_693_26" HREF="terminal_interface-curses__adb.htm#ref_692_16">C_Attr</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_639_16">Wattrset</A></FONT> (<FONT COLOR=red><A NAME="ref_639_26" HREF="terminal_interface-curses__adb.htm#ref_639_16">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                         <FONT COLOR=red><A NAME="ref_640_26" HREF="terminal_interface-curses__adb.htm#ref_639_16">C_Attr</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Wattrset, "wattrset"); <FONT COLOR=green><EM>-- ??? wattr_set</EM></FONT>
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_692_16">Wattrset</A> (<A HREF="terminal_interface-curses__ads.htm#ref_812_7">Win</A>,
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_639_16">Wattrset</A> (<A HREF="terminal_interface-curses__ads.htm#ref_818_7">Win</A>,
-+                    AttrChar_To_AttrType (<A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>'
-+                                          (<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; Character'First,
-+-                                          <A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_814_7">Color</A>,
-+-                                          <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>  =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_813_7">Attr</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++                                          <A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_820_7">Color</A>,
-++                                          <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>  =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_819_7">Attr</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_811_14">Set_Character_Attributes</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_817_14">Set_Character_Attributes</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_705_13" HREF="terminal_interface-curses__ads.htm#ref_820_13">Get_Character_Attribute</A></FONT> (<FONT COLOR=red><A NAME="ref_705_38" HREF="terminal_interface-curses__ads.htm#ref_821_7">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_652_13" HREF="terminal_interface-curses__ads.htm#ref_826_13">Get_Character_Attribute</A></FONT> (<FONT COLOR=red><A NAME="ref_652_38" HREF="terminal_interface-curses__ads.htm#ref_827_7">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-+                                      <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_708_16">Wattrget</A></FONT> (<FONT COLOR=red><A NAME="ref_708_26" HREF="terminal_interface-curses__adb.htm#ref_708_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                         <FONT COLOR=red><A NAME="ref_709_26" HREF="terminal_interface-curses__adb.htm#ref_708_16">Atr</A></FONT> : <b>access</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>;
-+-                         <FONT COLOR=red><A NAME="ref_710_26" HREF="terminal_interface-curses__adb.htm#ref_708_16">Col</A></FONT> : <b>access</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+-                         <FONT COLOR=red><A NAME="ref_711_26" HREF="terminal_interface-curses__adb.htm#ref_708_16">Opt</A></FONT> : System.Address) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_655_16">Wattrget</A></FONT> (<FONT COLOR=red><A NAME="ref_655_26" HREF="terminal_interface-curses__adb.htm#ref_655_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                         <FONT COLOR=red><A NAME="ref_656_26" HREF="terminal_interface-curses__adb.htm#ref_655_16">Atr</A></FONT> : <b>access</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>;
-++                         <FONT COLOR=red><A NAME="ref_657_26" HREF="terminal_interface-curses__adb.htm#ref_655_16">Col</A></FONT> : <b>access</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-++                         <FONT COLOR=red><A NAME="ref_658_26" HREF="terminal_interface-curses__adb.htm#ref_655_16">Opt</A></FONT> : System.Address) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Wattrget, "wattr_get");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_714_7">Attr</A></FONT> : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>;
-+-      <FONT COLOR=red><A NAME="ref_715_7">Col</A></FONT>  : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+-      <FONT COLOR=red><A NAME="ref_716_7">Res</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses__adb.htm#ref_708_16">Wattrget</A> (<A HREF="terminal_interface-curses__ads.htm#ref_821_7">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_714_7">Attr</A>'<b>Access</b>, <A HREF="terminal_interface-curses__adb.htm#ref_715_7">Col</A>'<b>Access</b>,
-++      <FONT COLOR=red><A NAME="ref_661_7">Attr</A></FONT> : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>;
-++      <FONT COLOR=red><A NAME="ref_662_7">Col</A></FONT>  : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-++      <FONT COLOR=red><A NAME="ref_663_7">Res</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses__adb.htm#ref_655_16">Wattrget</A> (<A HREF="terminal_interface-curses__ads.htm#ref_827_7">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_661_7">Attr</A>'<b>Access</b>, <A HREF="terminal_interface-curses__adb.htm#ref_662_7">Col</A>'<b>Access</b>,
-+                                          System.Null_Address);
-+-      <FONT COLOR=red><A NAME="ref_718_7">Ch</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>;
-++      <FONT COLOR=red><A NAME="ref_665_7">Ch</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>;
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_716_7">Res</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_71_4">Curses_Ok</A> <b>then</b>
-+-         <A HREF="terminal_interface-curses__adb.htm#ref_718_7">Ch</A> := AttrType_To_AttrChar (<A HREF="terminal_interface-curses__adb.htm#ref_714_7">Attr</A>);
-+-         <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_718_7">Ch</A>.<A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>;
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_663_7">Res</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_71_4">Curses_Ok</A> <b>then</b>
-++         <A HREF="terminal_interface-curses__adb.htm#ref_665_7">Ch</A> := AttrType_To_AttrChar (<A HREF="terminal_interface-curses__adb.htm#ref_661_7">Attr</A>);
-++         <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_665_7">Ch</A>.<A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>;
-+       <b>else</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_820_13">Get_Character_Attribute</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_826_13">Get_Character_Attribute</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_728_13" HREF="terminal_interface-curses__ads.htm#ref_826_13">Get_Character_Attribute</A></FONT> (<FONT COLOR=red><A NAME="ref_728_38" HREF="terminal_interface-curses__ads.htm#ref_827_7">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_675_13" HREF="terminal_interface-curses__ads.htm#ref_832_13">Get_Character_Attribute</A></FONT> (<FONT COLOR=red><A NAME="ref_675_38" HREF="terminal_interface-curses__ads.htm#ref_833_7">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-+                                      <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_731_16">Wattrget</A></FONT> (<FONT COLOR=red><A NAME="ref_731_26" HREF="terminal_interface-curses__adb.htm#ref_731_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                         <FONT COLOR=red><A NAME="ref_732_26" HREF="terminal_interface-curses__adb.htm#ref_731_16">Atr</A></FONT> : <b>access</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>;
-+-                         <FONT COLOR=red><A NAME="ref_733_26" HREF="terminal_interface-curses__adb.htm#ref_731_16">Col</A></FONT> : <b>access</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+-                         <FONT COLOR=red><A NAME="ref_734_26" HREF="terminal_interface-curses__adb.htm#ref_731_16">Opt</A></FONT> : System.Address) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_678_16">Wattrget</A></FONT> (<FONT COLOR=red><A NAME="ref_678_26" HREF="terminal_interface-curses__adb.htm#ref_678_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                         <FONT COLOR=red><A NAME="ref_679_26" HREF="terminal_interface-curses__adb.htm#ref_678_16">Atr</A></FONT> : <b>access</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>;
-++                         <FONT COLOR=red><A NAME="ref_680_26" HREF="terminal_interface-curses__adb.htm#ref_678_16">Col</A></FONT> : <b>access</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-++                         <FONT COLOR=red><A NAME="ref_681_26" HREF="terminal_interface-curses__adb.htm#ref_678_16">Opt</A></FONT> : System.Address) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Wattrget, "wattr_get");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_737_7">Attr</A></FONT> : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>;
-+-      <FONT COLOR=red><A NAME="ref_738_7">Col</A></FONT>  : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+-      <FONT COLOR=red><A NAME="ref_739_7">Res</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses__adb.htm#ref_731_16">Wattrget</A> (<A HREF="terminal_interface-curses__ads.htm#ref_827_7">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_737_7">Attr</A>'<b>Access</b>, <A HREF="terminal_interface-curses__adb.htm#ref_738_7">Col</A>'<b>Access</b>,
-++      <FONT COLOR=red><A NAME="ref_684_7">Attr</A></FONT> : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>;
-++      <FONT COLOR=red><A NAME="ref_685_7">Col</A></FONT>  : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-++      <FONT COLOR=red><A NAME="ref_686_7">Res</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses__adb.htm#ref_678_16">Wattrget</A> (<A HREF="terminal_interface-curses__ads.htm#ref_833_7">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_684_7">Attr</A>'<b>Access</b>, <A HREF="terminal_interface-curses__adb.htm#ref_685_7">Col</A>'<b>Access</b>,
-+                                          System.Null_Address);
-+-      <FONT COLOR=red><A NAME="ref_741_7">Ch</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>;
-++      <FONT COLOR=red><A NAME="ref_688_7">Ch</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>;
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_739_7">Res</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_71_4">Curses_Ok</A> <b>then</b>
-+-         <A HREF="terminal_interface-curses__adb.htm#ref_741_7">Ch</A> := AttrType_To_AttrChar (<A HREF="terminal_interface-curses__adb.htm#ref_737_7">Attr</A>);
-+-         <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_741_7">Ch</A>.<A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A>;
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_686_7">Res</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_71_4">Curses_Ok</A> <b>then</b>
-++         <A HREF="terminal_interface-curses__adb.htm#ref_688_7">Ch</A> := AttrType_To_AttrChar (<A HREF="terminal_interface-curses__adb.htm#ref_684_7">Attr</A>);
-++         <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_688_7">Ch</A>.<A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A>;
-+       <b>else</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_826_13">Get_Character_Attribute</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_832_13">Get_Character_Attribute</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_751_14" HREF="terminal_interface-curses__ads.htm#ref_832_14">Set_Color</A></FONT> (<FONT COLOR=red><A NAME="ref_751_25" HREF="terminal_interface-curses__ads.htm#ref_832_25">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-                        <FONT COLOR=red><A NAME="ref_752_25" HREF="terminal_interface-curses__ads.htm#ref_833_25">Pair</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_698_14" HREF="terminal_interface-curses__ads.htm#ref_838_14">Set_Color</A></FONT> (<FONT COLOR=red><A NAME="ref_698_25" HREF="terminal_interface-curses__ads.htm#ref_838_25">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                        <FONT COLOR=red><A NAME="ref_699_25" HREF="terminal_interface-curses__ads.htm#ref_839_25">Pair</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_754_16">Wset_Color</A></FONT> (<FONT COLOR=red><A NAME="ref_754_28" HREF="terminal_interface-curses__adb.htm#ref_754_16">Win</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                           <FONT COLOR=red><A NAME="ref_755_28" HREF="terminal_interface-curses__adb.htm#ref_754_16">Color</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+-                           <FONT COLOR=red><A NAME="ref_756_28" HREF="terminal_interface-curses__adb.htm#ref_754_16">Opts</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_62_12">C_Void_Ptr</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_701_16">Wset_Color</A></FONT> (<FONT COLOR=red><A NAME="ref_701_28" HREF="terminal_interface-curses__adb.htm#ref_701_16">Win</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                           <FONT COLOR=red><A NAME="ref_702_28" HREF="terminal_interface-curses__adb.htm#ref_701_16">Color</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-++                           <FONT COLOR=red><A NAME="ref_703_28" HREF="terminal_interface-curses__adb.htm#ref_701_16">Opts</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_62_12">C_Void_Ptr</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Wset_Color, "wcolor_set");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_754_16">Wset_Color</A> (<A HREF="terminal_interface-curses__ads.htm#ref_832_25">Win</A>,
-+-                     <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_833_25">Pair</A>),
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_701_16">Wset_Color</A> (<A HREF="terminal_interface-curses__ads.htm#ref_838_25">Win</A>,
-++                     <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_839_25">Pair</A>),
-+                      <A HREF="terminal_interface-curses-aux__ads.htm#ref_62_12">C_Void_Ptr</A> (System.Null_Address)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_832_14">Set_Color</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_838_14">Set_Color</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_766_14" HREF="terminal_interface-curses__ads.htm#ref_839_14">Change_Attributes</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_767_7" HREF="terminal_interface-curses__ads.htm#ref_840_7">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_768_7" HREF="terminal_interface-curses__ads.htm#ref_841_7">Count</A></FONT> : <b>in</b> Integer := -1;
-+-      <FONT COLOR=red><A NAME="ref_769_7" HREF="terminal_interface-curses__ads.htm#ref_842_7">Attr</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-+-      <FONT COLOR=red><A NAME="ref_770_7" HREF="terminal_interface-curses__ads.htm#ref_843_7">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First)
-+-   <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_772_16">Wchgat</A></FONT> (<FONT COLOR=red><A NAME="ref_772_24" HREF="terminal_interface-curses__adb.htm#ref_772_16">Win</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                       <FONT COLOR=red><A NAME="ref_773_24" HREF="terminal_interface-curses__adb.htm#ref_772_16">Cnt</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-                       <FONT COLOR=red><A NAME="ref_774_24" HREF="terminal_interface-curses__adb.htm#ref_772_16">Attr</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>;
-+-                       <FONT COLOR=red><A NAME="ref_775_24" HREF="terminal_interface-curses__adb.htm#ref_772_16">Color</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+-                       <FONT COLOR=red><A NAME="ref_776_24" HREF="terminal_interface-curses__adb.htm#ref_772_16">Opts</A></FONT>  : System.Address := System.Null_Address)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_713_14" HREF="terminal_interface-curses__ads.htm#ref_845_14">Change_Attributes</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_714_7" HREF="terminal_interface-curses__ads.htm#ref_846_7">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_715_7" HREF="terminal_interface-curses__ads.htm#ref_847_7">Count</A></FONT> : <b>in</b> Integer := -1;
-++      <FONT COLOR=red><A NAME="ref_716_7" HREF="terminal_interface-curses__ads.htm#ref_848_7">Attr</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-++      <FONT COLOR=red><A NAME="ref_717_7" HREF="terminal_interface-curses__ads.htm#ref_849_7">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First)
-++   <b>is</b>
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_719_16">Wchgat</A></FONT> (<FONT COLOR=red><A NAME="ref_719_24" HREF="terminal_interface-curses__adb.htm#ref_719_16">Win</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                       <FONT COLOR=red><A NAME="ref_720_24" HREF="terminal_interface-curses__adb.htm#ref_719_16">Cnt</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++                       <FONT COLOR=red><A NAME="ref_721_24" HREF="terminal_interface-curses__adb.htm#ref_719_16">Attr</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_64_12">C_AttrType</A>;
-++                       <FONT COLOR=red><A NAME="ref_722_24" HREF="terminal_interface-curses__adb.htm#ref_719_16">Color</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-++                       <FONT COLOR=red><A NAME="ref_723_24" HREF="terminal_interface-curses__adb.htm#ref_719_16">Opts</A></FONT>  : System.Address := System.Null_Address)
-+                        <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Wchgat, "wchgat");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_780_7">Ch</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> :=
-+-        (<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A> =&gt; Character'First, <A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First, <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_842_7">Attr</A>);
-++      <FONT COLOR=red><A NAME="ref_727_7">Ch</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> :=
-++        (<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A> =&gt; Character'First, <A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First, <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_848_7">Attr</A>);
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_772_16">Wchgat</A> (<A HREF="terminal_interface-curses__ads.htm#ref_840_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_841_7">Count</A>), AttrChar_To_AttrType (<A HREF="terminal_interface-curses__adb.htm#ref_780_7">Ch</A>),
-+-                 <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_843_7">Color</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_719_16">Wchgat</A> (<A HREF="terminal_interface-curses__ads.htm#ref_846_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_847_7">Count</A>), AttrChar_To_AttrType (<A HREF="terminal_interface-curses__adb.htm#ref_727_7">Ch</A>),
-++                 <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_849_7">Color</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_839_14">Change_Attributes</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_845_14">Change_Attributes</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_789_14" HREF="terminal_interface-curses__ads.htm#ref_848_14">Change_Attributes</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_790_7" HREF="terminal_interface-curses__ads.htm#ref_849_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_791_7" HREF="terminal_interface-curses__ads.htm#ref_850_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A> := <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>'First;
-+-      <FONT COLOR=red><A NAME="ref_792_7" HREF="terminal_interface-curses__ads.htm#ref_851_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> := <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>'First;
-+-      <FONT COLOR=red><A NAME="ref_793_7" HREF="terminal_interface-curses__ads.htm#ref_852_7">Count</A></FONT>  : <b>in</b> Integer := -1;
-+-      <FONT COLOR=red><A NAME="ref_794_7" HREF="terminal_interface-curses__ads.htm#ref_853_7">Attr</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-+-      <FONT COLOR=red><A NAME="ref_795_7" HREF="terminal_interface-curses__ads.htm#ref_854_7">Color</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_736_14" HREF="terminal_interface-curses__ads.htm#ref_854_14">Change_Attributes</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_737_7" HREF="terminal_interface-curses__ads.htm#ref_855_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_738_7" HREF="terminal_interface-curses__ads.htm#ref_856_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A> := <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>'First;
-++      <FONT COLOR=red><A NAME="ref_739_7" HREF="terminal_interface-curses__ads.htm#ref_857_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> := <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>'First;
-++      <FONT COLOR=red><A NAME="ref_740_7" HREF="terminal_interface-curses__ads.htm#ref_858_7">Count</A></FONT>  : <b>in</b> Integer := -1;
-++      <FONT COLOR=red><A NAME="ref_741_7" HREF="terminal_interface-curses__ads.htm#ref_859_7">Attr</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-++      <FONT COLOR=red><A NAME="ref_742_7" HREF="terminal_interface-curses__ads.htm#ref_860_7">Color</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First)
-+    <b>is</b>
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_505_14">Move_Cursor</A> (<A HREF="terminal_interface-curses__ads.htm#ref_849_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_850_7">Line</A>, <A HREF="terminal_interface-curses__ads.htm#ref_851_7">Column</A>);
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_839_14">Change_Attributes</A> (<A HREF="terminal_interface-curses__ads.htm#ref_849_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_852_7">Count</A>, <A HREF="terminal_interface-curses__ads.htm#ref_853_7">Attr</A>, <A HREF="terminal_interface-curses__ads.htm#ref_854_7">Color</A>);
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_848_14">Change_Attributes</A>;
-++      <A HREF="terminal_interface-curses__ads.htm#ref_511_14">Move_Cursor</A> (<A HREF="terminal_interface-curses__ads.htm#ref_855_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_856_7">Line</A>, <A HREF="terminal_interface-curses__ads.htm#ref_857_7">Column</A>);
-++      <A HREF="terminal_interface-curses__ads.htm#ref_845_14">Change_Attributes</A> (<A HREF="terminal_interface-curses__ads.htm#ref_855_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_858_7">Count</A>, <A HREF="terminal_interface-curses__ads.htm#ref_859_7">Attr</A>, <A HREF="terminal_interface-curses__ads.htm#ref_860_7">Color</A>);
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_854_14">Change_Attributes</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_802_14" HREF="terminal_interface-curses__ads.htm#ref_864_14">Beep</A></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_749_14" HREF="terminal_interface-curses__ads.htm#ref_870_14">Beep</A></FONT>
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_804_16">Beeper</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_751_16">Beeper</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Beeper, "beep");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_804_16">Beeper</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_751_16">Beeper</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_864_14">Beep</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_870_14">Beep</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_812_14" HREF="terminal_interface-curses__ads.htm#ref_869_14">Flash_Screen</A></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_759_14" HREF="terminal_interface-curses__ads.htm#ref_875_14">Flash_Screen</A></FONT>
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_814_16">Flash</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_761_16">Flash</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Flash, "flash");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_814_16">Flash</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_761_16">Flash</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_869_14">Flash_Screen</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_875_14">Flash_Screen</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_822_14" HREF="terminal_interface-curses__ads.htm#ref_880_14">Set_Cbreak_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_822_31" HREF="terminal_interface-curses__ads.htm#ref_880_31">SwitchOn</A></FONT> : <b>in</b> Boolean := True)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_769_14" HREF="terminal_interface-curses__ads.htm#ref_886_14">Set_Cbreak_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_769_31" HREF="terminal_interface-curses__ads.htm#ref_886_31">SwitchOn</A></FONT> : <b>in</b> Boolean := True)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_824_16">Cbreak</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_771_16">Cbreak</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Cbreak, "cbreak");
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_826_16">NoCbreak</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_773_16">NoCbreak</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, NoCbreak, "nocbreak");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_829_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <FONT COLOR=red><A NAME="ref_776_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_880_31">SwitchOn</A> <b>then</b>
-+-         <A HREF="terminal_interface-curses__adb.htm#ref_829_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_824_16">Cbreak</A>;
-++      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_886_31">SwitchOn</A> <b>then</b>
-++         <A HREF="terminal_interface-curses__adb.htm#ref_776_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_771_16">Cbreak</A>;
-+       <b>else</b>
-+-         <A HREF="terminal_interface-curses__adb.htm#ref_829_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_826_16">NoCbreak</A>;
-++         <A HREF="terminal_interface-curses__adb.htm#ref_776_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_773_16">NoCbreak</A>;
-+       <b>end</b> <b>if</b>;
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_829_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_776_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_880_14">Set_Cbreak_Mode</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_886_14">Set_Cbreak_Mode</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_841_14" HREF="terminal_interface-curses__ads.htm#ref_886_14">Set_Raw_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_841_28" HREF="terminal_interface-curses__ads.htm#ref_886_28">SwitchOn</A></FONT> : <b>in</b> Boolean := True)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_788_14" HREF="terminal_interface-curses__ads.htm#ref_892_14">Set_Raw_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_788_28" HREF="terminal_interface-curses__ads.htm#ref_892_28">SwitchOn</A></FONT> : <b>in</b> Boolean := True)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_843_16">Raw</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_790_16">Raw</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Raw, "raw");
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_845_16">NoRaw</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_792_16">NoRaw</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, NoRaw, "noraw");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_848_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <FONT COLOR=red><A NAME="ref_795_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_886_28">SwitchOn</A> <b>then</b>
-+-         <A HREF="terminal_interface-curses__adb.htm#ref_848_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_843_16">Raw</A>;
-++      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_892_28">SwitchOn</A> <b>then</b>
-++         <A HREF="terminal_interface-curses__adb.htm#ref_795_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_790_16">Raw</A>;
-+       <b>else</b>
-+-         <A HREF="terminal_interface-curses__adb.htm#ref_848_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_845_16">NoRaw</A>;
-++         <A HREF="terminal_interface-curses__adb.htm#ref_795_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_792_16">NoRaw</A>;
-+       <b>end</b> <b>if</b>;
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_848_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_795_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_886_14">Set_Raw_Mode</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_892_14">Set_Raw_Mode</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_860_14" HREF="terminal_interface-curses__ads.htm#ref_892_14">Set_Echo_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_860_29" HREF="terminal_interface-curses__ads.htm#ref_892_29">SwitchOn</A></FONT> : <b>in</b> Boolean := True)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_807_14" HREF="terminal_interface-curses__ads.htm#ref_898_14">Set_Echo_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_807_29" HREF="terminal_interface-curses__ads.htm#ref_898_29">SwitchOn</A></FONT> : <b>in</b> Boolean := True)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_862_16">Echo</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_809_16">Echo</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Echo, "echo");
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_864_16">NoEcho</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_811_16">NoEcho</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, NoEcho, "noecho");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_867_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <FONT COLOR=red><A NAME="ref_814_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_892_29">SwitchOn</A> <b>then</b>
-+-         <A HREF="terminal_interface-curses__adb.htm#ref_867_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_862_16">Echo</A>;
-++      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_898_29">SwitchOn</A> <b>then</b>
-++         <A HREF="terminal_interface-curses__adb.htm#ref_814_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_809_16">Echo</A>;
-+       <b>else</b>
-+-         <A HREF="terminal_interface-curses__adb.htm#ref_867_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_864_16">NoEcho</A>;
-++         <A HREF="terminal_interface-curses__adb.htm#ref_814_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_811_16">NoEcho</A>;
-+       <b>end</b> <b>if</b>;
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_867_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_814_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_892_14">Set_Echo_Mode</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_898_14">Set_Echo_Mode</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_879_14" HREF="terminal_interface-curses__ads.htm#ref_898_14">Set_Meta_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_879_29" HREF="terminal_interface-curses__ads.htm#ref_898_29">Win</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-                            <FONT COLOR=red><A NAME="ref_880_29" HREF="terminal_interface-curses__ads.htm#ref_899_29">SwitchOn</A></FONT> : <b>in</b> Boolean := True)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_826_14" HREF="terminal_interface-curses__ads.htm#ref_904_14">Set_Meta_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_826_29" HREF="terminal_interface-curses__ads.htm#ref_904_29">Win</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                            <FONT COLOR=red><A NAME="ref_827_29" HREF="terminal_interface-curses__ads.htm#ref_905_29">SwitchOn</A></FONT> : <b>in</b> Boolean := True)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_882_16">Meta</A></FONT> (<FONT COLOR=red><A NAME="ref_882_22" HREF="terminal_interface-curses__adb.htm#ref_882_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_882_34" HREF="terminal_interface-curses__adb.htm#ref_882_16">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_829_16">Meta</A></FONT> (<FONT COLOR=red><A NAME="ref_829_22" HREF="terminal_interface-curses__adb.htm#ref_829_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_829_34" HREF="terminal_interface-curses__adb.htm#ref_829_16">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Meta, "meta");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_882_16">Meta</A> (<A HREF="terminal_interface-curses__ads.htm#ref_898_29">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_899_29">SwitchOn</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_829_16">Meta</A> (<A HREF="terminal_interface-curses__ads.htm#ref_904_29">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_905_29">SwitchOn</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_898_14">Set_Meta_Mode</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_904_14">Set_Meta_Mode</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_890_14" HREF="terminal_interface-curses__ads.htm#ref_904_14">Set_KeyPad_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_890_31" HREF="terminal_interface-curses__ads.htm#ref_904_31">Win</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-                              <FONT COLOR=red><A NAME="ref_891_31" HREF="terminal_interface-curses__ads.htm#ref_905_31">SwitchOn</A></FONT> : <b>in</b> Boolean := True)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_837_14" HREF="terminal_interface-curses__ads.htm#ref_910_14">Set_KeyPad_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_837_31" HREF="terminal_interface-curses__ads.htm#ref_910_31">Win</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                              <FONT COLOR=red><A NAME="ref_838_31" HREF="terminal_interface-curses__ads.htm#ref_911_31">SwitchOn</A></FONT> : <b>in</b> Boolean := True)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_893_16">Keypad</A></FONT> (<FONT COLOR=red><A NAME="ref_893_24" HREF="terminal_interface-curses__adb.htm#ref_893_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_893_36" HREF="terminal_interface-curses__adb.htm#ref_893_16">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_840_16">Keypad</A></FONT> (<FONT COLOR=red><A NAME="ref_840_24" HREF="terminal_interface-curses__adb.htm#ref_840_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_840_36" HREF="terminal_interface-curses__adb.htm#ref_840_16">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Keypad, "keypad");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_893_16">Keypad</A> (<A HREF="terminal_interface-curses__ads.htm#ref_904_31">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_905_31">SwitchOn</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_840_16">Keypad</A> (<A HREF="terminal_interface-curses__ads.htm#ref_910_31">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_911_31">SwitchOn</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_904_14">Set_KeyPad_Mode</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_910_14">Set_KeyPad_Mode</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_901_13" HREF="terminal_interface-curses__ads.htm#ref_909_13">Get_KeyPad_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_901_30" HREF="terminal_interface-curses__ads.htm#ref_909_30">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_848_13" HREF="terminal_interface-curses__ads.htm#ref_915_13">Get_KeyPad_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_848_30" HREF="terminal_interface-curses__ads.htm#ref_915_30">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-+                              <b>return</b> Boolean
-+    <b>is</b>
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_851_16">Is_Keypad</A></FONT> (<FONT COLOR=red><A NAME="ref_851_27" HREF="terminal_interface-curses__adb.htm#ref_851_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>;
-++      <b>pragma</b> Import (C, Is_Keypad, "is_keypad");
-+    <b>begin</b>
-+-      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_93_13">Get_Flag</A> (<A HREF="terminal_interface-curses__ads.htm#ref_909_30">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1926_4">Offset_use_keypad</A>);
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_909_13">Get_KeyPad_Mode</A>;
-++      <b>return</b> (<A HREF="terminal_interface-curses__adb.htm#ref_851_16">Is_Keypad</A> (<A HREF="terminal_interface-curses__ads.htm#ref_915_30">Win</A>) /= <A HREF="terminal_interface-curses__ads.htm#ref_1927_4">Curses_Bool_False</A>);
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_915_13">Get_KeyPad_Mode</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_908_14" HREF="terminal_interface-curses__ads.htm#ref_917_14">Half_Delay</A></FONT> (<FONT COLOR=red><A NAME="ref_908_26" HREF="terminal_interface-curses__ads.htm#ref_917_26">Amount</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_914_9">Half_Delay_Amount</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_857_14" HREF="terminal_interface-curses__ads.htm#ref_923_14">Half_Delay</A></FONT> (<FONT COLOR=red><A NAME="ref_857_26" HREF="terminal_interface-curses__ads.htm#ref_923_26">Amount</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_920_9">Half_Delay_Amount</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_910_16">Halfdelay</A></FONT> (<FONT COLOR=red><A NAME="ref_910_27" HREF="terminal_interface-curses__adb.htm#ref_910_16">Amount</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_859_16">Halfdelay</A></FONT> (<FONT COLOR=red><A NAME="ref_859_27" HREF="terminal_interface-curses__adb.htm#ref_859_16">Amount</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Halfdelay, "halfdelay");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_910_16">Halfdelay</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_917_26">Amount</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_859_16">Halfdelay</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_923_26">Amount</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_917_14">Half_Delay</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_923_14">Half_Delay</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_918_14" HREF="terminal_interface-curses__ads.htm#ref_922_14">Set_Flush_On_Interrupt_Mode</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_919_7" HREF="terminal_interface-curses__ads.htm#ref_923_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_920_7" HREF="terminal_interface-curses__ads.htm#ref_924_7">Mode</A></FONT> : <b>in</b> Boolean := True)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_867_14" HREF="terminal_interface-curses__ads.htm#ref_928_14">Set_Flush_On_Interrupt_Mode</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_868_7" HREF="terminal_interface-curses__ads.htm#ref_929_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_869_7" HREF="terminal_interface-curses__ads.htm#ref_930_7">Mode</A></FONT> : <b>in</b> Boolean := True)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_922_16">Intrflush</A></FONT> (<FONT COLOR=red><A NAME="ref_922_27" HREF="terminal_interface-curses__adb.htm#ref_922_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_922_41" HREF="terminal_interface-curses__adb.htm#ref_922_16">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_871_16">Intrflush</A></FONT> (<FONT COLOR=red><A NAME="ref_871_27" HREF="terminal_interface-curses__adb.htm#ref_871_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_871_41" HREF="terminal_interface-curses__adb.htm#ref_871_16">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Intrflush, "intrflush");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_922_16">Intrflush</A> (<A HREF="terminal_interface-curses__ads.htm#ref_923_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_924_7">Mode</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_871_16">Intrflush</A> (<A HREF="terminal_interface-curses__ads.htm#ref_929_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_930_7">Mode</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_922_14">Set_Flush_On_Interrupt_Mode</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_928_14">Set_Flush_On_Interrupt_Mode</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_930_14" HREF="terminal_interface-curses__ads.htm#ref_929_14">Set_Queue_Interrupt_Mode</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_931_7" HREF="terminal_interface-curses__ads.htm#ref_930_7">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_932_7" HREF="terminal_interface-curses__ads.htm#ref_931_7">Flush</A></FONT> : <b>in</b> Boolean := True)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_879_14" HREF="terminal_interface-curses__ads.htm#ref_935_14">Set_Queue_Interrupt_Mode</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_880_7" HREF="terminal_interface-curses__ads.htm#ref_936_7">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_881_7" HREF="terminal_interface-curses__ads.htm#ref_937_7">Flush</A></FONT> : <b>in</b> Boolean := True)
-+    <b>is</b>
-+-      <b>procedure</b> <FONT COLOR=red><A NAME="ref_934_17">Qiflush</A></FONT>;
-++      <b>procedure</b> <FONT COLOR=red><A NAME="ref_883_17">Qiflush</A></FONT>;
-+       <b>pragma</b> Import (C, Qiflush, "qiflush");
-+-      <b>procedure</b> <FONT COLOR=red><A NAME="ref_936_17">No_Qiflush</A></FONT>;
-++      <b>procedure</b> <FONT COLOR=red><A NAME="ref_885_17">No_Qiflush</A></FONT>;
-+       <b>pragma</b> Import (C, No_Qiflush, "noqiflush");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_930_7">Win</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_936_7">Win</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_931_7">Flush</A> <b>then</b>
-+-         <A HREF="terminal_interface-curses__adb.htm#ref_934_17">Qiflush</A>;
-++      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_937_7">Flush</A> <b>then</b>
-++         <A HREF="terminal_interface-curses__adb.htm#ref_883_17">Qiflush</A>;
-+       <b>else</b>
-+-         <A HREF="terminal_interface-curses__adb.htm#ref_936_17">No_Qiflush</A>;
-++         <A HREF="terminal_interface-curses__adb.htm#ref_885_17">No_Qiflush</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_929_14">Set_Queue_Interrupt_Mode</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_935_14">Set_Queue_Interrupt_Mode</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_949_14" HREF="terminal_interface-curses__ads.htm#ref_937_14">Set_NoDelay_Mode</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_950_7" HREF="terminal_interface-curses__ads.htm#ref_938_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_951_7" HREF="terminal_interface-curses__ads.htm#ref_939_7">Mode</A></FONT> : <b>in</b> Boolean := False)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_898_14" HREF="terminal_interface-curses__ads.htm#ref_943_14">Set_NoDelay_Mode</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_899_7" HREF="terminal_interface-curses__ads.htm#ref_944_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_900_7" HREF="terminal_interface-curses__ads.htm#ref_945_7">Mode</A></FONT> : <b>in</b> Boolean := False)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_953_16">Nodelay</A></FONT> (<FONT COLOR=red><A NAME="ref_953_25" HREF="terminal_interface-curses__adb.htm#ref_953_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_953_39" HREF="terminal_interface-curses__adb.htm#ref_953_16">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_902_16">Nodelay</A></FONT> (<FONT COLOR=red><A NAME="ref_902_25" HREF="terminal_interface-curses__adb.htm#ref_902_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_902_39" HREF="terminal_interface-curses__adb.htm#ref_902_16">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Nodelay, "nodelay");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_953_16">Nodelay</A> (<A HREF="terminal_interface-curses__ads.htm#ref_938_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_939_7">Mode</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_902_16">Nodelay</A> (<A HREF="terminal_interface-curses__ads.htm#ref_944_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_945_7">Mode</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_937_14">Set_NoDelay_Mode</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_943_14">Set_NoDelay_Mode</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_961_14" HREF="terminal_interface-curses__ads.htm#ref_946_14">Set_Timeout_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_961_32" HREF="terminal_interface-curses__ads.htm#ref_946_32">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-                               <FONT COLOR=red><A NAME="ref_962_32" HREF="terminal_interface-curses__ads.htm#ref_947_32">Mode</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_943_9">Timeout_Mode</A>;
-+-                               <FONT COLOR=red><A NAME="ref_963_32" HREF="terminal_interface-curses__ads.htm#ref_948_32">Amount</A></FONT> : <b>in</b> Natural)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_910_14" HREF="terminal_interface-curses__ads.htm#ref_952_14">Set_Timeout_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_910_32" HREF="terminal_interface-curses__ads.htm#ref_952_32">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                               <FONT COLOR=red><A NAME="ref_911_32" HREF="terminal_interface-curses__ads.htm#ref_953_32">Mode</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_949_9">Timeout_Mode</A>;
-++                               <FONT COLOR=red><A NAME="ref_912_32" HREF="terminal_interface-curses__ads.htm#ref_954_32">Amount</A></FONT> : <b>in</b> Natural)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_965_16">Wtimeout</A></FONT> (<FONT COLOR=red><A NAME="ref_965_26" HREF="terminal_interface-curses__adb.htm#ref_965_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_965_40" HREF="terminal_interface-curses__adb.htm#ref_965_16">Amount</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>procedure</b> <FONT COLOR=red><A NAME="ref_914_17">Wtimeout</A></FONT> (<FONT COLOR=red><A NAME="ref_914_27" HREF="terminal_interface-curses__adb.htm#ref_914_17">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_914_41" HREF="terminal_interface-curses__adb.htm#ref_914_17">Amount</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>);
-+       <b>pragma</b> Import (C, Wtimeout, "wtimeout");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_968_7">Time</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <FONT COLOR=red><A NAME="ref_917_7">Time</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+    <b>begin</b>
-+-      <b>case</b> <A HREF="terminal_interface-curses__ads.htm#ref_947_32">Mode</A> <b>is</b>
-+-         <b>when</b> <A HREF="terminal_interface-curses__ads.htm#ref_943_26">Blocking</A>     =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_968_7">Time</A> := -1;
-+-         <b>when</b> <A HREF="terminal_interface-curses__ads.htm#ref_943_36">Non_Blocking</A> =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_968_7">Time</A> := 0;
-+-         <b>when</b> <A HREF="terminal_interface-curses__ads.htm#ref_943_50">Delayed</A>      =&gt;
-+-            <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_948_32">Amount</A> = 0 <b>then</b>
-++      <b>case</b> <A HREF="terminal_interface-curses__ads.htm#ref_953_32">Mode</A> <b>is</b>
-++         <b>when</b> <A HREF="terminal_interface-curses__ads.htm#ref_949_26">Blocking</A>     =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_917_7">Time</A> := -1;
-++         <b>when</b> <A HREF="terminal_interface-curses__ads.htm#ref_949_36">Non_Blocking</A> =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_917_7">Time</A> := 0;
-++         <b>when</b> <A HREF="terminal_interface-curses__ads.htm#ref_949_50">Delayed</A>      =&gt;
-++            <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_954_32">Amount</A> = 0 <b>then</b>
-+                <b>raise</b> Constraint_Error;
-+             <b>end</b> <b>if</b>;
-+-            <A HREF="terminal_interface-curses__adb.htm#ref_968_7">Time</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_948_32">Amount</A>);
-++            <A HREF="terminal_interface-curses__adb.htm#ref_917_7">Time</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_954_32">Amount</A>);
-+       <b>end</b> <b>case</b>;
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_965_16">Wtimeout</A> (<A HREF="terminal_interface-curses__ads.htm#ref_946_32">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_968_7">Time</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+-         <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+-      <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_946_14">Set_Timeout_Mode</A>;
-++      <A HREF="terminal_interface-curses__adb.htm#ref_914_17">Wtimeout</A> (<A HREF="terminal_interface-curses__ads.htm#ref_952_32">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_917_7">Time</A>);
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_952_14">Set_Timeout_Mode</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_984_14" HREF="terminal_interface-curses__ads.htm#ref_958_14">Set_Escape_Timer_Mode</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_985_7" HREF="terminal_interface-curses__ads.htm#ref_959_7">Win</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_986_7" HREF="terminal_interface-curses__ads.htm#ref_960_7">Timer_Off</A></FONT> : <b>in</b> Boolean := False)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_931_14" HREF="terminal_interface-curses__ads.htm#ref_964_14">Set_Escape_Timer_Mode</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_932_7" HREF="terminal_interface-curses__ads.htm#ref_965_7">Win</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_933_7" HREF="terminal_interface-curses__ads.htm#ref_966_7">Timer_Off</A></FONT> : <b>in</b> Boolean := False)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_988_16">Notimeout</A></FONT> (<FONT COLOR=red><A NAME="ref_988_27" HREF="terminal_interface-curses__adb.htm#ref_988_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_988_41" HREF="terminal_interface-curses__adb.htm#ref_988_16">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_935_16">Notimeout</A></FONT> (<FONT COLOR=red><A NAME="ref_935_27" HREF="terminal_interface-curses__adb.htm#ref_935_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_935_41" HREF="terminal_interface-curses__adb.htm#ref_935_16">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Notimeout, "notimeout");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_988_16">Notimeout</A> (<A HREF="terminal_interface-curses__ads.htm#ref_959_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_960_7">Timer_Off</A>)))
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_935_16">Notimeout</A> (<A HREF="terminal_interface-curses__ads.htm#ref_965_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_966_7">Timer_Off</A>)))
-+         = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_958_14">Set_Escape_Timer_Mode</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_964_14">Set_Escape_Timer_Mode</A>;
-+ 
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_998_14" HREF="terminal_interface-curses__ads.htm#ref_969_14">Set_NL_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_998_27" HREF="terminal_interface-curses__ads.htm#ref_969_27">SwitchOn</A></FONT> : <b>in</b> Boolean := True)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_945_14" HREF="terminal_interface-curses__ads.htm#ref_975_14">Set_NL_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_945_27" HREF="terminal_interface-curses__ads.htm#ref_975_27">SwitchOn</A></FONT> : <b>in</b> Boolean := True)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1000_16">NL</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_947_16">NL</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, NL, "nl");
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1002_16">NoNL</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_949_16">NoNL</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, NoNL, "nonl");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_1005_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <FONT COLOR=red><A NAME="ref_952_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_969_27">SwitchOn</A> <b>then</b>
-+-         <A HREF="terminal_interface-curses__adb.htm#ref_1005_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1000_16">NL</A>;
-++      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_975_27">SwitchOn</A> <b>then</b>
-++         <A HREF="terminal_interface-curses__adb.htm#ref_952_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_947_16">NL</A>;
-+       <b>else</b>
-+-         <A HREF="terminal_interface-curses__adb.htm#ref_1005_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1002_16">NoNL</A>;
-++         <A HREF="terminal_interface-curses__adb.htm#ref_952_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_949_16">NoNL</A>;
-+       <b>end</b> <b>if</b>;
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1005_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_952_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_969_14">Set_NL_Mode</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_975_14">Set_NL_Mode</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1017_14" HREF="terminal_interface-curses__ads.htm#ref_975_14">Clear_On_Next_Update</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1018_7" HREF="terminal_interface-curses__ads.htm#ref_976_7">Win</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1019_7" HREF="terminal_interface-curses__ads.htm#ref_977_7">Do_Clear</A></FONT> : <b>in</b> Boolean := True)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_964_14" HREF="terminal_interface-curses__ads.htm#ref_981_14">Clear_On_Next_Update</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_965_7" HREF="terminal_interface-curses__ads.htm#ref_982_7">Win</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_966_7" HREF="terminal_interface-curses__ads.htm#ref_983_7">Do_Clear</A></FONT> : <b>in</b> Boolean := True)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1021_16">Clear_Ok</A></FONT> (<FONT COLOR=red><A NAME="ref_1021_26" HREF="terminal_interface-curses__adb.htm#ref_1021_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1021_38" HREF="terminal_interface-curses__adb.htm#ref_1021_16">Flag</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_968_16">Clear_Ok</A></FONT> (<FONT COLOR=red><A NAME="ref_968_26" HREF="terminal_interface-curses__adb.htm#ref_968_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_968_38" HREF="terminal_interface-curses__adb.htm#ref_968_16">Flag</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Clear_Ok, "clearok");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1021_16">Clear_Ok</A> (<A HREF="terminal_interface-curses__ads.htm#ref_976_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_977_7">Do_Clear</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_968_16">Clear_Ok</A> (<A HREF="terminal_interface-curses__ads.htm#ref_982_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_983_7">Do_Clear</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_975_14">Clear_On_Next_Update</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_981_14">Clear_On_Next_Update</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1029_14" HREF="terminal_interface-curses__ads.htm#ref_982_14">Use_Insert_Delete_Line</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1030_7" HREF="terminal_interface-curses__ads.htm#ref_983_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1031_7" HREF="terminal_interface-curses__ads.htm#ref_984_7">Do_Idl</A></FONT> : <b>in</b> Boolean := True)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_976_14" HREF="terminal_interface-curses__ads.htm#ref_988_14">Use_Insert_Delete_Line</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_977_7" HREF="terminal_interface-curses__ads.htm#ref_989_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_978_7" HREF="terminal_interface-curses__ads.htm#ref_990_7">Do_Idl</A></FONT> : <b>in</b> Boolean := True)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1033_16">IDL_Ok</A></FONT> (<FONT COLOR=red><A NAME="ref_1033_24" HREF="terminal_interface-curses__adb.htm#ref_1033_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1033_36" HREF="terminal_interface-curses__adb.htm#ref_1033_16">Flag</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_980_16">IDL_Ok</A></FONT> (<FONT COLOR=red><A NAME="ref_980_24" HREF="terminal_interface-curses__adb.htm#ref_980_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_980_36" HREF="terminal_interface-curses__adb.htm#ref_980_16">Flag</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, IDL_Ok, "idlok");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1033_16">IDL_Ok</A> (<A HREF="terminal_interface-curses__ads.htm#ref_983_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_984_7">Do_Idl</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_980_16">IDL_Ok</A> (<A HREF="terminal_interface-curses__ads.htm#ref_989_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_990_7">Do_Idl</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_982_14">Use_Insert_Delete_Line</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_988_14">Use_Insert_Delete_Line</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1041_14" HREF="terminal_interface-curses__ads.htm#ref_989_14">Use_Insert_Delete_Character</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1042_7" HREF="terminal_interface-curses__ads.htm#ref_990_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1043_7" HREF="terminal_interface-curses__ads.htm#ref_991_7">Do_Idc</A></FONT> : <b>in</b> Boolean := True)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_988_14" HREF="terminal_interface-curses__ads.htm#ref_995_14">Use_Insert_Delete_Character</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_989_7" HREF="terminal_interface-curses__ads.htm#ref_996_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_990_7" HREF="terminal_interface-curses__ads.htm#ref_997_7">Do_Idc</A></FONT> : <b>in</b> Boolean := True)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1045_16">IDC_Ok</A></FONT> (<FONT COLOR=red><A NAME="ref_1045_24" HREF="terminal_interface-curses__adb.htm#ref_1045_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1045_36" HREF="terminal_interface-curses__adb.htm#ref_1045_16">Flag</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>procedure</b> <FONT COLOR=red><A NAME="ref_992_17">IDC_Ok</A></FONT> (<FONT COLOR=red><A NAME="ref_992_25" HREF="terminal_interface-curses__adb.htm#ref_992_17">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_992_37" HREF="terminal_interface-curses__adb.htm#ref_992_17">Flag</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>);
-+       <b>pragma</b> Import (C, IDC_Ok, "idcok");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1045_16">IDC_Ok</A> (<A HREF="terminal_interface-curses__ads.htm#ref_990_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_991_7">Do_Idc</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+-         <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+-      <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_989_14">Use_Insert_Delete_Character</A>;
-++      <A HREF="terminal_interface-curses__adb.htm#ref_992_17">IDC_Ok</A> (<A HREF="terminal_interface-curses__ads.htm#ref_996_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_997_7">Do_Idc</A>)));
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_995_14">Use_Insert_Delete_Character</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1053_14" HREF="terminal_interface-curses__ads.htm#ref_996_14">Leave_Cursor_After_Update</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1054_7" HREF="terminal_interface-curses__ads.htm#ref_997_7">Win</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1055_7" HREF="terminal_interface-curses__ads.htm#ref_998_7">Do_Leave</A></FONT> : <b>in</b> Boolean := True)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_998_14" HREF="terminal_interface-curses__ads.htm#ref_1002_14">Leave_Cursor_After_Update</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_999_7" HREF="terminal_interface-curses__ads.htm#ref_1003_7">Win</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1000_7" HREF="terminal_interface-curses__ads.htm#ref_1004_7">Do_Leave</A></FONT> : <b>in</b> Boolean := True)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1057_16">Leave_Ok</A></FONT> (<FONT COLOR=red><A NAME="ref_1057_26" HREF="terminal_interface-curses__adb.htm#ref_1057_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1057_38" HREF="terminal_interface-curses__adb.htm#ref_1057_16">Flag</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1002_16">Leave_Ok</A></FONT> (<FONT COLOR=red><A NAME="ref_1002_26" HREF="terminal_interface-curses__adb.htm#ref_1002_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1002_38" HREF="terminal_interface-curses__adb.htm#ref_1002_16">Flag</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Leave_Ok, "leaveok");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1057_16">Leave_Ok</A> (<A HREF="terminal_interface-curses__ads.htm#ref_997_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_998_7">Do_Leave</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1002_16">Leave_Ok</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1003_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1004_7">Do_Leave</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_996_14">Leave_Cursor_After_Update</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1002_14">Leave_Cursor_After_Update</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1065_14" HREF="terminal_interface-curses__ads.htm#ref_1003_14">Immediate_Update_Mode</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1066_7" HREF="terminal_interface-curses__ads.htm#ref_1004_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1067_7" HREF="terminal_interface-curses__ads.htm#ref_1005_7">Mode</A></FONT> : <b>in</b> Boolean := False)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1010_14" HREF="terminal_interface-curses__ads.htm#ref_1009_14">Immediate_Update_Mode</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1011_7" HREF="terminal_interface-curses__ads.htm#ref_1010_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1012_7" HREF="terminal_interface-curses__ads.htm#ref_1011_7">Mode</A></FONT> : <b>in</b> Boolean := False)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1069_16">Immedok</A></FONT> (<FONT COLOR=red><A NAME="ref_1069_25" HREF="terminal_interface-curses__adb.htm#ref_1069_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1069_39" HREF="terminal_interface-curses__adb.htm#ref_1069_16">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>procedure</b> <FONT COLOR=red><A NAME="ref_1014_17">Immedok</A></FONT> (<FONT COLOR=red><A NAME="ref_1014_26" HREF="terminal_interface-curses__adb.htm#ref_1014_17">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1014_40" HREF="terminal_interface-curses__adb.htm#ref_1014_17">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>);
-+       <b>pragma</b> Import (C, Immedok, "immedok");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1069_16">Immedok</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1004_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1005_7">Mode</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+-         <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+-      <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1003_14">Immediate_Update_Mode</A>;
-++      <A HREF="terminal_interface-curses__adb.htm#ref_1014_17">Immedok</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1010_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1011_7">Mode</A>)));
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1009_14">Immediate_Update_Mode</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1077_14" HREF="terminal_interface-curses__ads.htm#ref_1010_14">Allow_Scrolling</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1078_7" HREF="terminal_interface-curses__ads.htm#ref_1011_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>  := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1079_7" HREF="terminal_interface-curses__ads.htm#ref_1012_7">Mode</A></FONT> : <b>in</b> Boolean := False)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1020_14" HREF="terminal_interface-curses__ads.htm#ref_1016_14">Allow_Scrolling</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1021_7" HREF="terminal_interface-curses__ads.htm#ref_1017_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>  := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1022_7" HREF="terminal_interface-curses__ads.htm#ref_1018_7">Mode</A></FONT> : <b>in</b> Boolean := False)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1081_16">Scrollok</A></FONT> (<FONT COLOR=red><A NAME="ref_1081_26" HREF="terminal_interface-curses__adb.htm#ref_1081_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1081_40" HREF="terminal_interface-curses__adb.htm#ref_1081_16">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1024_16">Scrollok</A></FONT> (<FONT COLOR=red><A NAME="ref_1024_26" HREF="terminal_interface-curses__adb.htm#ref_1024_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1024_40" HREF="terminal_interface-curses__adb.htm#ref_1024_16">Mode</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Scrollok, "scrollok");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1081_16">Scrollok</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1011_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1012_7">Mode</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1024_16">Scrollok</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1017_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1018_7">Mode</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1010_14">Allow_Scrolling</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1016_14">Allow_Scrolling</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_1089_13" HREF="terminal_interface-curses__ads.htm#ref_1016_13">Scrolling_Allowed</A></FONT> (<FONT COLOR=red><A NAME="ref_1089_32" HREF="terminal_interface-curses__ads.htm#ref_1016_32">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1032_13" HREF="terminal_interface-curses__ads.htm#ref_1022_13">Scrolling_Allowed</A></FONT> (<FONT COLOR=red><A NAME="ref_1032_32" HREF="terminal_interface-curses__ads.htm#ref_1022_32">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-+                                <b>return</b> Boolean
-+    <b>is</b>
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1035_16">Is_Scroll_Ok</A></FONT> (<FONT COLOR=red><A NAME="ref_1035_30" HREF="terminal_interface-curses__adb.htm#ref_1035_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>;
-++      <b>pragma</b> Import (C, Is_Scroll_Ok, "is_scrollok");
-+    <b>begin</b>
-+-      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_93_13">Get_Flag</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1016_32">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1921_4">Offset_scroll</A>);
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1016_13">Scrolling_Allowed</A>;
-++      <b>return</b> (<A HREF="terminal_interface-curses__adb.htm#ref_1035_16">Is_Scroll_Ok</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1022_32">Win</A>) /= <A HREF="terminal_interface-curses__ads.htm#ref_1927_4">Curses_Bool_False</A>);
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1022_13">Scrolling_Allowed</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1096_14" HREF="terminal_interface-curses__ads.htm#ref_1021_14">Set_Scroll_Region</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1097_7" HREF="terminal_interface-curses__ads.htm#ref_1022_7">Win</A></FONT>         : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1098_7" HREF="terminal_interface-curses__ads.htm#ref_1023_7">Top_Line</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1099_7" HREF="terminal_interface-curses__ads.htm#ref_1024_7">Bottom_Line</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>)
-+-   <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1101_16">Wsetscrreg</A></FONT> (<FONT COLOR=red><A NAME="ref_1101_28" HREF="terminal_interface-curses__adb.htm#ref_1101_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                           <FONT COLOR=red><A NAME="ref_1102_28" HREF="terminal_interface-curses__adb.htm#ref_1101_16">Lin</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-                           <FONT COLOR=red><A NAME="ref_1103_28" HREF="terminal_interface-curses__adb.htm#ref_1101_16">Col</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1041_14" HREF="terminal_interface-curses__ads.htm#ref_1027_14">Set_Scroll_Region</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1042_7" HREF="terminal_interface-curses__ads.htm#ref_1028_7">Win</A></FONT>         : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1043_7" HREF="terminal_interface-curses__ads.htm#ref_1029_7">Top_Line</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1044_7" HREF="terminal_interface-curses__ads.htm#ref_1030_7">Bottom_Line</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>)
-++   <b>is</b>
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1046_16">Wsetscrreg</A></FONT> (<FONT COLOR=red><A NAME="ref_1046_28" HREF="terminal_interface-curses__adb.htm#ref_1046_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                           <FONT COLOR=red><A NAME="ref_1047_28" HREF="terminal_interface-curses__adb.htm#ref_1046_16">Lin</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++                           <FONT COLOR=red><A NAME="ref_1048_28" HREF="terminal_interface-curses__adb.htm#ref_1046_16">Col</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Wsetscrreg, "wsetscrreg");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1101_16">Wsetscrreg</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1022_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1023_7">Top_Line</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1024_7">Bottom_Line</A>))
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1046_16">Wsetscrreg</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1028_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1029_7">Top_Line</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1030_7">Bottom_Line</A>))
-+         = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1021_14">Set_Scroll_Region</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1027_14">Set_Scroll_Region</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1112_14" HREF="terminal_interface-curses__ads.htm#ref_1034_14">Update_Screen</A></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1057_14" HREF="terminal_interface-curses__ads.htm#ref_1040_14">Update_Screen</A></FONT>
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1114_16">Do_Update</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1059_16">Do_Update</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Do_Update, "doupdate");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1114_16">Do_Update</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1059_16">Do_Update</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1034_14">Update_Screen</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1040_14">Update_Screen</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1122_14" HREF="terminal_interface-curses__ads.htm#ref_1039_14">Refresh</A></FONT> (<FONT COLOR=red><A NAME="ref_1122_23" HREF="terminal_interface-curses__ads.htm#ref_1039_23">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1067_14" HREF="terminal_interface-curses__ads.htm#ref_1045_14">Refresh</A></FONT> (<FONT COLOR=red><A NAME="ref_1067_23" HREF="terminal_interface-curses__ads.htm#ref_1045_23">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1124_16">Wrefresh</A></FONT> (<FONT COLOR=red><A NAME="ref_1124_26" HREF="terminal_interface-curses__adb.htm#ref_1124_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1069_16">Wrefresh</A></FONT> (<FONT COLOR=red><A NAME="ref_1069_26" HREF="terminal_interface-curses__adb.htm#ref_1069_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Wrefresh, "wrefresh");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1124_16">Wrefresh</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1039_23">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1069_16">Wrefresh</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1045_23">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1039_14">Refresh</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1045_14">Refresh</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1132_14" HREF="terminal_interface-curses__ads.htm#ref_1046_14">Refresh_Without_Update</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1133_7" HREF="terminal_interface-curses__ads.htm#ref_1047_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1077_14" HREF="terminal_interface-curses__ads.htm#ref_1052_14">Refresh_Without_Update</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1078_7" HREF="terminal_interface-curses__ads.htm#ref_1053_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1135_16">Wnoutrefresh</A></FONT> (<FONT COLOR=red><A NAME="ref_1135_30" HREF="terminal_interface-curses__adb.htm#ref_1135_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1080_16">Wnoutrefresh</A></FONT> (<FONT COLOR=red><A NAME="ref_1080_30" HREF="terminal_interface-curses__adb.htm#ref_1080_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Wnoutrefresh, "wnoutrefresh");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1135_16">Wnoutrefresh</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1047_7">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1080_16">Wnoutrefresh</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1053_7">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1046_14">Refresh_Without_Update</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1052_14">Refresh_Without_Update</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1143_14" HREF="terminal_interface-curses__ads.htm#ref_1053_14">Redraw</A></FONT> (<FONT COLOR=red><A NAME="ref_1143_22" HREF="terminal_interface-curses__ads.htm#ref_1053_22">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1088_14" HREF="terminal_interface-curses__ads.htm#ref_1059_14">Redraw</A></FONT> (<FONT COLOR=red><A NAME="ref_1088_22" HREF="terminal_interface-curses__ads.htm#ref_1059_22">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1145_16">Redrawwin</A></FONT> (<FONT COLOR=red><A NAME="ref_1145_27" HREF="terminal_interface-curses__adb.htm#ref_1145_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1090_16">Redrawwin</A></FONT> (<FONT COLOR=red><A NAME="ref_1090_27" HREF="terminal_interface-curses__adb.htm#ref_1090_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Redrawwin, "redrawwin");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1145_16">Redrawwin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1053_22">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1090_16">Redrawwin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1059_22">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1053_14">Redraw</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1059_14">Redraw</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1153_14" HREF="terminal_interface-curses__ads.htm#ref_1057_14">Redraw</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1154_7" HREF="terminal_interface-curses__ads.htm#ref_1057_22">Win</A></FONT>        : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1155_7" HREF="terminal_interface-curses__ads.htm#ref_1058_22">Begin_Line</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1156_7" HREF="terminal_interface-curses__ads.htm#ref_1059_22">Line_Count</A></FONT> : <b>in</b> Positive)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1098_14" HREF="terminal_interface-curses__ads.htm#ref_1063_14">Redraw</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1099_7" HREF="terminal_interface-curses__ads.htm#ref_1063_22">Win</A></FONT>        : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1100_7" HREF="terminal_interface-curses__ads.htm#ref_1064_22">Begin_Line</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1101_7" HREF="terminal_interface-curses__ads.htm#ref_1065_22">Line_Count</A></FONT> : <b>in</b> Positive)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1158_16">Wredrawln</A></FONT> (<FONT COLOR=red><A NAME="ref_1158_27" HREF="terminal_interface-curses__adb.htm#ref_1158_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1158_41" HREF="terminal_interface-curses__adb.htm#ref_1158_16">First</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>; <FONT COLOR=red><A NAME="ref_1158_56" HREF="terminal_interface-curses__adb.htm#ref_1158_16">Cnt</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>)
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1103_16">Wredrawln</A></FONT> (<FONT COLOR=red><A NAME="ref_1103_27" HREF="terminal_interface-curses__adb.htm#ref_1103_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1103_41" HREF="terminal_interface-curses__adb.htm#ref_1103_16">First</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>; <FONT COLOR=red><A NAME="ref_1103_56" HREF="terminal_interface-curses__adb.htm#ref_1103_16">Cnt</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>)
-+                           <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Wredrawln, "wredrawln");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1158_16">Wredrawln</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1057_22">Win</A>,
-+-                    <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1058_22">Begin_Line</A>),
-+-                    <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1059_22">Line_Count</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1103_16">Wredrawln</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1063_22">Win</A>,
-++                    <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1064_22">Begin_Line</A>),
-++                    <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1065_22">Line_Count</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1057_14">Redraw</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1063_14">Redraw</A>;
-+ 
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1170_14" HREF="terminal_interface-curses__ads.htm#ref_1068_14">Erase</A></FONT> (<FONT COLOR=red><A NAME="ref_1170_21" HREF="terminal_interface-curses__ads.htm#ref_1068_21">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1115_14" HREF="terminal_interface-curses__ads.htm#ref_1074_14">Erase</A></FONT> (<FONT COLOR=red><A NAME="ref_1115_21" HREF="terminal_interface-curses__ads.htm#ref_1074_21">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1172_16">Werase</A></FONT> (<FONT COLOR=red><A NAME="ref_1172_24" HREF="terminal_interface-curses__adb.htm#ref_1172_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1117_16">Werase</A></FONT> (<FONT COLOR=red><A NAME="ref_1117_24" HREF="terminal_interface-curses__adb.htm#ref_1117_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Werase, "werase");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1172_16">Werase</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1068_21">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1117_16">Werase</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1074_21">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1068_14">Erase</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1074_14">Erase</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1180_14" HREF="terminal_interface-curses__ads.htm#ref_1074_14">Clear</A></FONT> (<FONT COLOR=red><A NAME="ref_1180_21" HREF="terminal_interface-curses__ads.htm#ref_1075_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1125_14" HREF="terminal_interface-curses__ads.htm#ref_1080_14">Clear</A></FONT> (<FONT COLOR=red><A NAME="ref_1125_21" HREF="terminal_interface-curses__ads.htm#ref_1081_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1182_16">Wclear</A></FONT> (<FONT COLOR=red><A NAME="ref_1182_24" HREF="terminal_interface-curses__adb.htm#ref_1182_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1127_16">Wclear</A></FONT> (<FONT COLOR=red><A NAME="ref_1127_24" HREF="terminal_interface-curses__adb.htm#ref_1127_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Wclear, "wclear");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1182_16">Wclear</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1075_7">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1127_16">Wclear</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1081_7">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1074_14">Clear</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1080_14">Clear</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1190_14" HREF="terminal_interface-curses__ads.htm#ref_1081_14">Clear_To_End_Of_Screen</A></FONT> (<FONT COLOR=red><A NAME="ref_1190_38" HREF="terminal_interface-curses__ads.htm#ref_1082_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1135_14" HREF="terminal_interface-curses__ads.htm#ref_1087_14">Clear_To_End_Of_Screen</A></FONT> (<FONT COLOR=red><A NAME="ref_1135_38" HREF="terminal_interface-curses__ads.htm#ref_1088_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1192_16">Wclearbot</A></FONT> (<FONT COLOR=red><A NAME="ref_1192_27" HREF="terminal_interface-curses__adb.htm#ref_1192_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1137_16">Wclearbot</A></FONT> (<FONT COLOR=red><A NAME="ref_1137_27" HREF="terminal_interface-curses__adb.htm#ref_1137_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Wclearbot, "wclrtobot");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1192_16">Wclearbot</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1082_7">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1137_16">Wclearbot</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1088_7">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1081_14">Clear_To_End_Of_Screen</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1087_14">Clear_To_End_Of_Screen</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1200_14" HREF="terminal_interface-curses__ads.htm#ref_1088_14">Clear_To_End_Of_Line</A></FONT> (<FONT COLOR=red><A NAME="ref_1200_36" HREF="terminal_interface-curses__ads.htm#ref_1089_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1145_14" HREF="terminal_interface-curses__ads.htm#ref_1094_14">Clear_To_End_Of_Line</A></FONT> (<FONT COLOR=red><A NAME="ref_1145_36" HREF="terminal_interface-curses__ads.htm#ref_1095_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1202_16">Wcleareol</A></FONT> (<FONT COLOR=red><A NAME="ref_1202_27" HREF="terminal_interface-curses__adb.htm#ref_1202_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1147_16">Wcleareol</A></FONT> (<FONT COLOR=red><A NAME="ref_1147_27" HREF="terminal_interface-curses__adb.htm#ref_1147_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Wcleareol, "wclrtoeol");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1202_16">Wcleareol</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1089_7">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1147_16">Wcleareol</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1095_7">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1088_14">Clear_To_End_Of_Line</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1094_14">Clear_To_End_Of_Line</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1210_14" HREF="terminal_interface-curses__ads.htm#ref_1102_14">Set_Background</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1211_7" HREF="terminal_interface-curses__ads.htm#ref_1103_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1212_7" HREF="terminal_interface-curses__ads.htm#ref_1104_7">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1155_14" HREF="terminal_interface-curses__ads.htm#ref_1108_14">Set_Background</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1156_7" HREF="terminal_interface-curses__ads.htm#ref_1109_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1157_7" HREF="terminal_interface-curses__ads.htm#ref_1110_7">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
-+    <b>is</b>
-+-      <b>procedure</b> <FONT COLOR=red><A NAME="ref_1214_17">WBackground</A></FONT> (<FONT COLOR=red><A NAME="ref_1214_30" HREF="terminal_interface-curses__adb.htm#ref_1214_17">W</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1214_45" HREF="terminal_interface-curses__adb.htm#ref_1214_17">Ch</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>);
-++      <b>procedure</b> <FONT COLOR=red><A NAME="ref_1159_17">WBackground</A></FONT> (<FONT COLOR=red><A NAME="ref_1159_30" HREF="terminal_interface-curses__adb.htm#ref_1159_17">W</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1159_45" HREF="terminal_interface-curses__adb.htm#ref_1159_17">Ch</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>);
-+       <b>pragma</b> Import (C, WBackground, "wbkgdset");
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses__adb.htm#ref_1214_17">WBackground</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1103_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1104_7">Ch</A>));
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1102_14">Set_Background</A>;
-++      <A HREF="terminal_interface-curses__adb.htm#ref_1159_17">WBackground</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1109_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1110_7">Ch</A>));
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1108_14">Set_Background</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1220_14" HREF="terminal_interface-curses__ads.htm#ref_1110_14">Change_Background</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1221_7" HREF="terminal_interface-curses__ads.htm#ref_1111_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1222_7" HREF="terminal_interface-curses__ads.htm#ref_1112_7">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1165_14" HREF="terminal_interface-curses__ads.htm#ref_1116_14">Change_Background</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1166_7" HREF="terminal_interface-curses__ads.htm#ref_1117_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1167_7" HREF="terminal_interface-curses__ads.htm#ref_1118_7">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1224_16">WChangeBkgd</A></FONT> (<FONT COLOR=red><A NAME="ref_1224_29" HREF="terminal_interface-curses__adb.htm#ref_1224_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1224_41" HREF="terminal_interface-curses__adb.htm#ref_1224_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1169_16">WChangeBkgd</A></FONT> (<FONT COLOR=red><A NAME="ref_1169_29" HREF="terminal_interface-curses__adb.htm#ref_1169_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1169_41" HREF="terminal_interface-curses__adb.htm#ref_1169_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, WChangeBkgd, "wbkgd");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1224_16">WChangeBkgd</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1111_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1112_7">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1169_16">WChangeBkgd</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1117_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1118_7">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1110_14">Change_Background</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1116_14">Change_Background</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_1232_13" HREF="terminal_interface-curses__ads.htm#ref_1119_13">Get_Background</A></FONT> (<FONT COLOR=red><A NAME="ref_1232_29" HREF="terminal_interface-curses__ads.htm#ref_1119_29">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1177_13" HREF="terminal_interface-curses__ads.htm#ref_1125_13">Get_Background</A></FONT> (<FONT COLOR=red><A NAME="ref_1177_29" HREF="terminal_interface-curses__ads.htm#ref_1125_29">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-+      <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1235_16">Wgetbkgd</A></FONT> (<FONT COLOR=red><A NAME="ref_1235_26" HREF="terminal_interface-curses__adb.htm#ref_1235_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1180_16">Wgetbkgd</A></FONT> (<FONT COLOR=red><A NAME="ref_1180_26" HREF="terminal_interface-curses__adb.htm#ref_1180_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-+       <b>pragma</b> Import (C, Wgetbkgd, "getbkgd");
-+    <b>begin</b>
-+-      <b>return</b> Chtype_To_AttrChar (<A HREF="terminal_interface-curses__adb.htm#ref_1235_16">Wgetbkgd</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1119_29">Win</A>));
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1119_13">Get_Background</A>;
-++      <b>return</b> Chtype_To_AttrChar (<A HREF="terminal_interface-curses__adb.htm#ref_1180_16">Wgetbkgd</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1125_29">Win</A>));
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1125_13">Get_Background</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1241_14" HREF="terminal_interface-curses__ads.htm#ref_1146_14">Change_Lines_Status</A></FONT> (<FONT COLOR=red><A NAME="ref_1241_35" HREF="terminal_interface-curses__ads.htm#ref_1146_35">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-                                  <FONT COLOR=red><A NAME="ref_1242_35" HREF="terminal_interface-curses__ads.htm#ref_1147_35">Start</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-                                  <FONT COLOR=red><A NAME="ref_1243_35" HREF="terminal_interface-curses__ads.htm#ref_1148_35">Count</A></FONT> : <b>in</b> Positive;
-+-                                  <FONT COLOR=red><A NAME="ref_1244_35" HREF="terminal_interface-curses__ads.htm#ref_1149_35">State</A></FONT> : <b>in</b> Boolean)
-+-   <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1246_16">Wtouchln</A></FONT> (<FONT COLOR=red><A NAME="ref_1246_26" HREF="terminal_interface-curses__adb.htm#ref_1246_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                         <FONT COLOR=red><A NAME="ref_1247_26" HREF="terminal_interface-curses__adb.htm#ref_1246_16">Sta</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-                         <FONT COLOR=red><A NAME="ref_1248_26" HREF="terminal_interface-curses__adb.htm#ref_1246_16">Cnt</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-                         <FONT COLOR=red><A NAME="ref_1249_26" HREF="terminal_interface-curses__adb.htm#ref_1246_16">Chg</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1186_14" HREF="terminal_interface-curses__ads.htm#ref_1152_14">Change_Lines_Status</A></FONT> (<FONT COLOR=red><A NAME="ref_1186_35" HREF="terminal_interface-curses__ads.htm#ref_1152_35">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                                  <FONT COLOR=red><A NAME="ref_1187_35" HREF="terminal_interface-curses__ads.htm#ref_1153_35">Start</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++                                  <FONT COLOR=red><A NAME="ref_1188_35" HREF="terminal_interface-curses__ads.htm#ref_1154_35">Count</A></FONT> : <b>in</b> Positive;
-++                                  <FONT COLOR=red><A NAME="ref_1189_35" HREF="terminal_interface-curses__ads.htm#ref_1155_35">State</A></FONT> : <b>in</b> Boolean)
-++   <b>is</b>
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1191_16">Wtouchln</A></FONT> (<FONT COLOR=red><A NAME="ref_1191_26" HREF="terminal_interface-curses__adb.htm#ref_1191_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                         <FONT COLOR=red><A NAME="ref_1192_26" HREF="terminal_interface-curses__adb.htm#ref_1191_16">Sta</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++                         <FONT COLOR=red><A NAME="ref_1193_26" HREF="terminal_interface-curses__adb.htm#ref_1191_16">Cnt</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++                         <FONT COLOR=red><A NAME="ref_1194_26" HREF="terminal_interface-curses__adb.htm#ref_1191_16">Chg</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Wtouchln, "wtouchln");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1246_16">Wtouchln</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1146_35">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1147_35">Start</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1148_35">Count</A>),
-+-                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1149_35">State</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1191_16">Wtouchln</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1152_35">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1153_35">Start</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1154_35">Count</A>),
-++                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1155_35">State</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1146_14">Change_Lines_Status</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1152_14">Change_Lines_Status</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1258_14" HREF="terminal_interface-curses__ads.htm#ref_1135_14">Touch</A></FONT> (<FONT COLOR=red><A NAME="ref_1258_21" HREF="terminal_interface-curses__ads.htm#ref_1135_21">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1203_14" HREF="terminal_interface-curses__ads.htm#ref_1141_14">Touch</A></FONT> (<FONT COLOR=red><A NAME="ref_1203_21" HREF="terminal_interface-curses__ads.htm#ref_1141_21">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-+    <b>is</b>
-+-      <FONT COLOR=red><A NAME="ref_1260_7">Y</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1261_7">X</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1205_7">Y</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1206_7">X</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_1222_14">Get_Size</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1135_21">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1260_7">Y</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1261_7">X</A>);
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_1146_14">Change_Lines_Status</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1135_21">Win</A>, 0, Positive (<A HREF="terminal_interface-curses__adb.htm#ref_1260_7">Y</A>), True);
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1135_14">Touch</A>;
-++      <A HREF="terminal_interface-curses__ads.htm#ref_1228_14">Get_Size</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1141_21">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1205_7">Y</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1206_7">X</A>);
-++      <A HREF="terminal_interface-curses__ads.htm#ref_1152_14">Change_Lines_Status</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1141_21">Win</A>, 0, Positive (<A HREF="terminal_interface-curses__adb.htm#ref_1205_7">Y</A>), True);
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1141_14">Touch</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1267_14" HREF="terminal_interface-curses__ads.htm#ref_1130_14">Untouch</A></FONT> (<FONT COLOR=red><A NAME="ref_1267_23" HREF="terminal_interface-curses__ads.htm#ref_1130_23">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1212_14" HREF="terminal_interface-curses__ads.htm#ref_1136_14">Untouch</A></FONT> (<FONT COLOR=red><A NAME="ref_1212_23" HREF="terminal_interface-curses__ads.htm#ref_1136_23">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-+    <b>is</b>
-+-      <FONT COLOR=red><A NAME="ref_1269_7">Y</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1270_7">X</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1214_7">Y</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1215_7">X</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_1222_14">Get_Size</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1130_23">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1269_7">Y</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1270_7">X</A>);
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_1146_14">Change_Lines_Status</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1130_23">Win</A>, 0, Positive (<A HREF="terminal_interface-curses__adb.htm#ref_1269_7">Y</A>), False);
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1130_14">Untouch</A>;
-++      <A HREF="terminal_interface-curses__ads.htm#ref_1228_14">Get_Size</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1136_23">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1214_7">Y</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1215_7">X</A>);
-++      <A HREF="terminal_interface-curses__ads.htm#ref_1152_14">Change_Lines_Status</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1136_23">Win</A>, 0, Positive (<A HREF="terminal_interface-curses__adb.htm#ref_1214_7">Y</A>), False);
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1136_14">Untouch</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1276_14" HREF="terminal_interface-curses__ads.htm#ref_1139_14">Touch</A></FONT> (<FONT COLOR=red><A NAME="ref_1276_21" HREF="terminal_interface-curses__ads.htm#ref_1139_21">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-                    <FONT COLOR=red><A NAME="ref_1277_21" HREF="terminal_interface-curses__ads.htm#ref_1140_21">Start</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-                    <FONT COLOR=red><A NAME="ref_1278_21" HREF="terminal_interface-curses__ads.htm#ref_1141_21">Count</A></FONT> : <b>in</b> Positive)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1221_14" HREF="terminal_interface-curses__ads.htm#ref_1145_14">Touch</A></FONT> (<FONT COLOR=red><A NAME="ref_1221_21" HREF="terminal_interface-curses__ads.htm#ref_1145_21">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                    <FONT COLOR=red><A NAME="ref_1222_21" HREF="terminal_interface-curses__ads.htm#ref_1146_21">Start</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++                    <FONT COLOR=red><A NAME="ref_1223_21" HREF="terminal_interface-curses__ads.htm#ref_1147_21">Count</A></FONT> : <b>in</b> Positive)
-+    <b>is</b>
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_1146_14">Change_Lines_Status</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1139_21">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1140_21">Start</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1141_21">Count</A>, True);
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1139_14">Touch</A>;
-++      <A HREF="terminal_interface-curses__ads.htm#ref_1152_14">Change_Lines_Status</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1145_21">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1146_21">Start</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1147_21">Count</A>, True);
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1145_14">Touch</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_1284_13" HREF="terminal_interface-curses__ads.htm#ref_1154_13">Is_Touched</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1285_7" HREF="terminal_interface-curses__ads.htm#ref_1154_25">Win</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1286_7" HREF="terminal_interface-curses__ads.htm#ref_1155_25">Line</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>) <b>return</b> Boolean
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1229_13" HREF="terminal_interface-curses__ads.htm#ref_1160_13">Is_Touched</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1230_7" HREF="terminal_interface-curses__ads.htm#ref_1160_25">Win</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1231_7" HREF="terminal_interface-curses__ads.htm#ref_1161_25">Line</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>) <b>return</b> Boolean
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1288_16">WLineTouched</A></FONT> (<FONT COLOR=red><A NAME="ref_1288_30" HREF="terminal_interface-curses__adb.htm#ref_1288_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1288_42" HREF="terminal_interface-curses__adb.htm#ref_1288_16">L</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1233_16">WLineTouched</A></FONT> (<FONT COLOR=red><A NAME="ref_1233_30" HREF="terminal_interface-curses__adb.htm#ref_1233_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1233_42" HREF="terminal_interface-curses__adb.htm#ref_1233_16">L</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>;
-+       <b>pragma</b> Import (C, WLineTouched, "is_linetouched");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1288_16">WLineTouched</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1154_25">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1155_25">Line</A>)) = <A HREF="terminal_interface-curses__ads.htm#ref_1931_4">Curses_Bool_False</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1233_16">WLineTouched</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1160_25">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1161_25">Line</A>)) = <A HREF="terminal_interface-curses__ads.htm#ref_1927_4">Curses_Bool_False</A> <b>then</b>
-+          <b>return</b> False;
-+       <b>else</b>
-+          <b>return</b> True;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1154_13">Is_Touched</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1160_13">Is_Touched</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_1298_13" HREF="terminal_interface-curses__ads.htm#ref_1159_13">Is_Touched</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1299_7" HREF="terminal_interface-curses__ads.htm#ref_1159_25">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>) <b>return</b> Boolean
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1243_13" HREF="terminal_interface-curses__ads.htm#ref_1165_13">Is_Touched</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1244_7" HREF="terminal_interface-curses__ads.htm#ref_1165_25">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>) <b>return</b> Boolean
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1301_16">WWinTouched</A></FONT> (<FONT COLOR=red><A NAME="ref_1301_29" HREF="terminal_interface-curses__adb.htm#ref_1301_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1246_16">WWinTouched</A></FONT> (<FONT COLOR=red><A NAME="ref_1246_29" HREF="terminal_interface-curses__adb.htm#ref_1246_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>;
-+       <b>pragma</b> Import (C, WWinTouched, "is_wintouched");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1301_16">WWinTouched</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1159_25">Win</A>) = <A HREF="terminal_interface-curses__ads.htm#ref_1931_4">Curses_Bool_False</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1246_16">WWinTouched</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1165_25">Win</A>) = <A HREF="terminal_interface-curses__ads.htm#ref_1927_4">Curses_Bool_False</A> <b>then</b>
-+          <b>return</b> False;
-+       <b>else</b>
-+          <b>return</b> True;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1159_13">Is_Touched</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1165_13">Is_Touched</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1311_14" HREF="terminal_interface-curses__ads.htm#ref_1168_14">Copy</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1312_7" HREF="terminal_interface-curses__ads.htm#ref_1169_7">Source_Window</A></FONT>            : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1313_7" HREF="terminal_interface-curses__ads.htm#ref_1170_7">Destination_Window</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1314_7" HREF="terminal_interface-curses__ads.htm#ref_1171_7">Source_Top_Row</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1315_7" HREF="terminal_interface-curses__ads.htm#ref_1172_7">Source_Left_Column</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1316_7" HREF="terminal_interface-curses__ads.htm#ref_1173_7">Destination_Top_Row</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1317_7" HREF="terminal_interface-curses__ads.htm#ref_1174_7">Destination_Left_Column</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1318_7" HREF="terminal_interface-curses__ads.htm#ref_1175_7">Destination_Bottom_Row</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1319_7" HREF="terminal_interface-curses__ads.htm#ref_1176_7">Destination_Right_Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1320_7" HREF="terminal_interface-curses__ads.htm#ref_1177_7">Non_Destructive_Mode</A></FONT>     : <b>in</b> Boolean := True)
-+-   <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1322_16">Copywin</A></FONT> (<FONT COLOR=red><A NAME="ref_1322_25" HREF="terminal_interface-curses__adb.htm#ref_1322_16">Src</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                        <FONT COLOR=red><A NAME="ref_1323_25" HREF="terminal_interface-curses__adb.htm#ref_1322_16">Dst</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                        <FONT COLOR=red><A NAME="ref_1324_25" HREF="terminal_interface-curses__adb.htm#ref_1322_16">Str</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-                        <FONT COLOR=red><A NAME="ref_1325_25" HREF="terminal_interface-curses__adb.htm#ref_1322_16">Slc</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-                        <FONT COLOR=red><A NAME="ref_1326_25" HREF="terminal_interface-curses__adb.htm#ref_1322_16">Dtr</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-                        <FONT COLOR=red><A NAME="ref_1327_25" HREF="terminal_interface-curses__adb.htm#ref_1322_16">Dlc</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-                        <FONT COLOR=red><A NAME="ref_1328_25" HREF="terminal_interface-curses__adb.htm#ref_1322_16">Dbr</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-                        <FONT COLOR=red><A NAME="ref_1329_25" HREF="terminal_interface-curses__adb.htm#ref_1322_16">Drc</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-                        <FONT COLOR=red><A NAME="ref_1330_25" HREF="terminal_interface-curses__adb.htm#ref_1322_16">Ndm</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1256_14" HREF="terminal_interface-curses__ads.htm#ref_1174_14">Copy</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1257_7" HREF="terminal_interface-curses__ads.htm#ref_1175_7">Source_Window</A></FONT>            : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1258_7" HREF="terminal_interface-curses__ads.htm#ref_1176_7">Destination_Window</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1259_7" HREF="terminal_interface-curses__ads.htm#ref_1177_7">Source_Top_Row</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1260_7" HREF="terminal_interface-curses__ads.htm#ref_1178_7">Source_Left_Column</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1261_7" HREF="terminal_interface-curses__ads.htm#ref_1179_7">Destination_Top_Row</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1262_7" HREF="terminal_interface-curses__ads.htm#ref_1180_7">Destination_Left_Column</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1263_7" HREF="terminal_interface-curses__ads.htm#ref_1181_7">Destination_Bottom_Row</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1264_7" HREF="terminal_interface-curses__ads.htm#ref_1182_7">Destination_Right_Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1265_7" HREF="terminal_interface-curses__ads.htm#ref_1183_7">Non_Destructive_Mode</A></FONT>     : <b>in</b> Boolean := True)
-++   <b>is</b>
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1267_16">Copywin</A></FONT> (<FONT COLOR=red><A NAME="ref_1267_25" HREF="terminal_interface-curses__adb.htm#ref_1267_16">Src</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                        <FONT COLOR=red><A NAME="ref_1268_25" HREF="terminal_interface-curses__adb.htm#ref_1267_16">Dst</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                        <FONT COLOR=red><A NAME="ref_1269_25" HREF="terminal_interface-curses__adb.htm#ref_1267_16">Str</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++                        <FONT COLOR=red><A NAME="ref_1270_25" HREF="terminal_interface-curses__adb.htm#ref_1267_16">Slc</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++                        <FONT COLOR=red><A NAME="ref_1271_25" HREF="terminal_interface-curses__adb.htm#ref_1267_16">Dtr</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++                        <FONT COLOR=red><A NAME="ref_1272_25" HREF="terminal_interface-curses__adb.htm#ref_1267_16">Dlc</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++                        <FONT COLOR=red><A NAME="ref_1273_25" HREF="terminal_interface-curses__adb.htm#ref_1267_16">Dbr</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++                        <FONT COLOR=red><A NAME="ref_1274_25" HREF="terminal_interface-curses__adb.htm#ref_1267_16">Drc</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++                        <FONT COLOR=red><A NAME="ref_1275_25" HREF="terminal_interface-curses__adb.htm#ref_1267_16">Ndm</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Copywin, "copywin");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1322_16">Copywin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1169_7">Source_Window</A>,
-+-                  <A HREF="terminal_interface-curses__ads.htm#ref_1170_7">Destination_Window</A>,
-+-                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1171_7">Source_Top_Row</A>),
-+-                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1172_7">Source_Left_Column</A>),
-+-                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1173_7">Destination_Top_Row</A>),
-+-                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1174_7">Destination_Left_Column</A>),
-+-                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1175_7">Destination_Bottom_Row</A>),
-+-                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1176_7">Destination_Right_Column</A>),
-+-                  Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1177_7">Non_Destructive_Mode</A>)
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1267_16">Copywin</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1175_7">Source_Window</A>,
-++                  <A HREF="terminal_interface-curses__ads.htm#ref_1176_7">Destination_Window</A>,
-++                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1177_7">Source_Top_Row</A>),
-++                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1178_7">Source_Left_Column</A>),
-++                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1179_7">Destination_Top_Row</A>),
-++                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1180_7">Destination_Left_Column</A>),
-++                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1181_7">Destination_Bottom_Row</A>),
-++                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1182_7">Destination_Right_Column</A>),
-++                  Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1183_7">Non_Destructive_Mode</A>)
-+                 ) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1168_14">Copy</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1174_14">Copy</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1347_14" HREF="terminal_interface-curses__ads.htm#ref_1182_14">Overwrite</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1348_7" HREF="terminal_interface-curses__ads.htm#ref_1182_25">Source_Window</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1349_7" HREF="terminal_interface-curses__ads.htm#ref_1183_25">Destination_Window</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1292_14" HREF="terminal_interface-curses__ads.htm#ref_1188_14">Overwrite</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1293_7" HREF="terminal_interface-curses__ads.htm#ref_1188_25">Source_Window</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1294_7" HREF="terminal_interface-curses__ads.htm#ref_1189_25">Destination_Window</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1351_16">Overwrite</A></FONT> (<FONT COLOR=red><A NAME="ref_1351_27" HREF="terminal_interface-curses__adb.htm#ref_1351_16">Src</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1351_41" HREF="terminal_interface-curses__adb.htm#ref_1351_16">Dst</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1296_16">Overwrite</A></FONT> (<FONT COLOR=red><A NAME="ref_1296_27" HREF="terminal_interface-curses__adb.htm#ref_1296_16">Src</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1296_41" HREF="terminal_interface-curses__adb.htm#ref_1296_16">Dst</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Overwrite, "overwrite");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1351_16">Overwrite</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1182_25">Source_Window</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1183_25">Destination_Window</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1296_16">Overwrite</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1188_25">Source_Window</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1189_25">Destination_Window</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1182_14">Overwrite</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1188_14">Overwrite</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1359_14" HREF="terminal_interface-curses__ads.htm#ref_1188_14">Overlay</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1360_7" HREF="terminal_interface-curses__ads.htm#ref_1188_23">Source_Window</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1361_7" HREF="terminal_interface-curses__ads.htm#ref_1189_23">Destination_Window</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1304_14" HREF="terminal_interface-curses__ads.htm#ref_1194_14">Overlay</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1305_7" HREF="terminal_interface-curses__ads.htm#ref_1194_23">Source_Window</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1306_7" HREF="terminal_interface-curses__ads.htm#ref_1195_23">Destination_Window</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1363_16">Overlay</A></FONT> (<FONT COLOR=red><A NAME="ref_1363_25" HREF="terminal_interface-curses__adb.htm#ref_1363_16">Src</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1363_39" HREF="terminal_interface-curses__adb.htm#ref_1363_16">Dst</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1308_16">Overlay</A></FONT> (<FONT COLOR=red><A NAME="ref_1308_25" HREF="terminal_interface-curses__adb.htm#ref_1308_16">Src</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1308_39" HREF="terminal_interface-curses__adb.htm#ref_1308_16">Dst</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Overlay, "overlay");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1363_16">Overlay</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1188_23">Source_Window</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1189_23">Destination_Window</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1308_16">Overlay</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1194_23">Source_Window</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1195_23">Destination_Window</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1188_14">Overlay</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1194_14">Overlay</A>;
-+ 
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1372_14" HREF="terminal_interface-curses__ads.htm#ref_1198_14">Insert_Delete_Lines</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1373_7" HREF="terminal_interface-curses__ads.htm#ref_1199_7">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1374_7" HREF="terminal_interface-curses__ads.htm#ref_1200_7">Lines</A></FONT> : <b>in</b> Integer       := 1) <FONT COLOR=green><EM>-- default is to insert one line above</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1317_14" HREF="terminal_interface-curses__ads.htm#ref_1204_14">Insert_Delete_Lines</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1318_7" HREF="terminal_interface-curses__ads.htm#ref_1205_7">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1319_7" HREF="terminal_interface-curses__ads.htm#ref_1206_7">Lines</A></FONT> : <b>in</b> Integer       := 1) <FONT COLOR=green><EM>-- default is to insert one line above</EM></FONT>
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1376_16">Winsdelln</A></FONT> (<FONT COLOR=red><A NAME="ref_1376_27" HREF="terminal_interface-curses__adb.htm#ref_1376_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1376_39" HREF="terminal_interface-curses__adb.htm#ref_1376_16">N</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1321_16">Winsdelln</A></FONT> (<FONT COLOR=red><A NAME="ref_1321_27" HREF="terminal_interface-curses__adb.htm#ref_1321_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1321_39" HREF="terminal_interface-curses__adb.htm#ref_1321_16">N</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Winsdelln, "winsdelln");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1376_16">Winsdelln</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1199_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1200_7">Lines</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1321_16">Winsdelln</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1205_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1206_7">Lines</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1198_14">Insert_Delete_Lines</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1204_14">Insert_Delete_Lines</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1384_14" HREF="terminal_interface-curses__ads.htm#ref_1206_14">Delete_Line</A></FONT> (<FONT COLOR=red><A NAME="ref_1384_27" HREF="terminal_interface-curses__ads.htm#ref_1206_27">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1329_14" HREF="terminal_interface-curses__ads.htm#ref_1212_14">Delete_Line</A></FONT> (<FONT COLOR=red><A NAME="ref_1329_27" HREF="terminal_interface-curses__ads.htm#ref_1212_27">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-+    <b>is</b>
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_1198_14">Insert_Delete_Lines</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1206_27">Win</A>, -1);
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1206_14">Delete_Line</A>;
-++      <A HREF="terminal_interface-curses__ads.htm#ref_1204_14">Insert_Delete_Lines</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1212_27">Win</A>, -1);
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1212_14">Delete_Line</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1390_14" HREF="terminal_interface-curses__ads.htm#ref_1212_14">Insert_Line</A></FONT> (<FONT COLOR=red><A NAME="ref_1390_27" HREF="terminal_interface-curses__ads.htm#ref_1212_27">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1335_14" HREF="terminal_interface-curses__ads.htm#ref_1218_14">Insert_Line</A></FONT> (<FONT COLOR=red><A NAME="ref_1335_27" HREF="terminal_interface-curses__ads.htm#ref_1218_27">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-+    <b>is</b>
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_1198_14">Insert_Delete_Lines</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1212_27">Win</A>, 1);
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1212_14">Insert_Line</A>;
-++      <A HREF="terminal_interface-curses__ads.htm#ref_1204_14">Insert_Delete_Lines</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1218_27">Win</A>, 1);
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1218_14">Insert_Line</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1397_14" HREF="terminal_interface-curses__ads.htm#ref_1222_14">Get_Size</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1398_7" HREF="terminal_interface-curses__ads.htm#ref_1223_7">Win</A></FONT>               : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1399_7" HREF="terminal_interface-curses__ads.htm#ref_1224_7">Number_Of_Lines</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+-      <FONT COLOR=red><A NAME="ref_1400_7" HREF="terminal_interface-curses__ads.htm#ref_1225_7">Number_Of_Columns</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1342_14" HREF="terminal_interface-curses__ads.htm#ref_1228_14">Get_Size</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1343_7" HREF="terminal_interface-curses__ads.htm#ref_1229_7">Win</A></FONT>               : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1344_7" HREF="terminal_interface-curses__ads.htm#ref_1230_7">Number_Of_Lines</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-++      <FONT COLOR=red><A NAME="ref_1345_7" HREF="terminal_interface-curses__ads.htm#ref_1231_7">Number_Of_Columns</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>)
-+    <b>is</b>
-+-      <FONT COLOR=green><EM>--  Please note: in ncurses they are one off.</EM></FONT>
-+-      <FONT COLOR=green><EM>--  This might be different in other implementations of curses</EM></FONT>
-+-      <FONT COLOR=red><A NAME="ref_1404_7">Y</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (W_Get_Short (<A HREF="terminal_interface-curses__ads.htm#ref_1223_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1909_4">Offset_maxy</A>))
-+-                          + <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1928_4">Offset_XY</A>);
-+-      <FONT COLOR=red><A NAME="ref_1406_7">X</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (W_Get_Short (<A HREF="terminal_interface-curses__ads.htm#ref_1223_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1910_4">Offset_maxx</A>))
-+-                          + <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1928_4">Offset_XY</A>);
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1347_16">GetMaxY</A></FONT> (<FONT COLOR=red><A NAME="ref_1347_25" HREF="terminal_interface-curses__adb.htm#ref_1347_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>pragma</b> Import (C, GetMaxY, "getmaxy");
-++
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1350_16">GetMaxX</A></FONT> (<FONT COLOR=red><A NAME="ref_1350_25" HREF="terminal_interface-curses__adb.htm#ref_1350_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>pragma</b> Import (C, GetMaxX, "getmaxx");
-++
-++      <FONT COLOR=red><A NAME="ref_1353_7">Y</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1347_16">GetMaxY</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1229_7">Win</A>)
-++                          + <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1924_4">Offset_XY</A>);
-++      <FONT COLOR=red><A NAME="ref_1355_7">X</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1350_16">GetMaxX</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1229_7">Win</A>)
-++                          + <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1924_4">Offset_XY</A>);
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_1224_7">Number_Of_Lines</A>   := <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1404_7">Y</A>);
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_1225_7">Number_Of_Columns</A> := <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1406_7">X</A>);
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1222_14">Get_Size</A>;
-++      <A HREF="terminal_interface-curses__ads.htm#ref_1230_7">Number_Of_Lines</A>   := <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1353_7">Y</A>);
-++      <A HREF="terminal_interface-curses__ads.htm#ref_1231_7">Number_Of_Columns</A> := <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1355_7">X</A>);
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1228_14">Get_Size</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1413_14" HREF="terminal_interface-curses__ads.htm#ref_1230_14">Get_Window_Position</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1414_7" HREF="terminal_interface-curses__ads.htm#ref_1231_7">Win</A></FONT>             : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1415_7" HREF="terminal_interface-curses__ads.htm#ref_1232_7">Top_Left_Line</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1416_7" HREF="terminal_interface-curses__ads.htm#ref_1233_7">Top_Left_Column</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1362_14" HREF="terminal_interface-curses__ads.htm#ref_1236_14">Get_Window_Position</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1363_7" HREF="terminal_interface-curses__ads.htm#ref_1237_7">Win</A></FONT>             : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1364_7" HREF="terminal_interface-curses__ads.htm#ref_1238_7">Top_Left_Line</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1365_7" HREF="terminal_interface-curses__ads.htm#ref_1239_7">Top_Left_Column</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
-+    <b>is</b>
-+-      <FONT COLOR=red><A NAME="ref_1418_7">Y</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> := W_Get_Short (<A HREF="terminal_interface-curses__ads.htm#ref_1231_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1911_4">Offset_begy</A>);
-+-      <FONT COLOR=red><A NAME="ref_1419_7">X</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> := W_Get_Short (<A HREF="terminal_interface-curses__ads.htm#ref_1231_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1912_4">Offset_begx</A>);
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1367_16">GetBegY</A></FONT> (<FONT COLOR=red><A NAME="ref_1367_25" HREF="terminal_interface-curses__adb.htm#ref_1367_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>pragma</b> Import (C, GetBegY, "getbegy");
-++
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1370_16">GetBegX</A></FONT> (<FONT COLOR=red><A NAME="ref_1370_25" HREF="terminal_interface-curses__adb.htm#ref_1370_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>pragma</b> Import (C, GetBegX, "getbegx");
-++
-++      <FONT COLOR=red><A NAME="ref_1373_7">Y</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1367_16">GetBegY</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1237_7">Win</A>));
-++      <FONT COLOR=red><A NAME="ref_1374_7">X</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1370_16">GetBegX</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1237_7">Win</A>));
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_1232_7">Top_Left_Line</A>   := <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1418_7">Y</A>);
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_1233_7">Top_Left_Column</A> := <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1419_7">X</A>);
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1230_14">Get_Window_Position</A>;
-++      <A HREF="terminal_interface-curses__ads.htm#ref_1238_7">Top_Left_Line</A>   := <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1373_7">Y</A>);
-++      <A HREF="terminal_interface-curses__ads.htm#ref_1239_7">Top_Left_Column</A> := <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1374_7">X</A>);
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1236_14">Get_Window_Position</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1425_14" HREF="terminal_interface-curses__ads.htm#ref_1238_14">Get_Cursor_Position</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1426_7" HREF="terminal_interface-curses__ads.htm#ref_1239_7">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1427_7" HREF="terminal_interface-curses__ads.htm#ref_1240_7">Line</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1428_7" HREF="terminal_interface-curses__ads.htm#ref_1241_7">Column</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1380_14" HREF="terminal_interface-curses__ads.htm#ref_1244_14">Get_Cursor_Position</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1381_7" HREF="terminal_interface-curses__ads.htm#ref_1245_7">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1382_7" HREF="terminal_interface-curses__ads.htm#ref_1246_7">Line</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1383_7" HREF="terminal_interface-curses__ads.htm#ref_1247_7">Column</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
-+    <b>is</b>
-+-      <FONT COLOR=red><A NAME="ref_1430_7">Y</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> := W_Get_Short (<A HREF="terminal_interface-curses__ads.htm#ref_1239_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1913_4">Offset_cury</A>);
-+-      <FONT COLOR=red><A NAME="ref_1431_7">X</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> := <A HREF="terminal_interface-curses__adb.htm#ref_71_12">W_Get_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1239_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1914_4">Offset_curx</A>);
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1385_16">GetCurY</A></FONT> (<FONT COLOR=red><A NAME="ref_1385_25" HREF="terminal_interface-curses__adb.htm#ref_1385_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>pragma</b> Import (C, GetCurY, "getcury");
-++
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1388_16">GetCurX</A></FONT> (<FONT COLOR=red><A NAME="ref_1388_25" HREF="terminal_interface-curses__adb.htm#ref_1388_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>pragma</b> Import (C, GetCurX, "getcurx");
-++
-++      <FONT COLOR=red><A NAME="ref_1391_7">Y</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1385_16">GetCurY</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1245_7">Win</A>));
-++      <FONT COLOR=red><A NAME="ref_1392_7">X</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1388_16">GetCurX</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1245_7">Win</A>));
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_1240_7">Line</A>   := <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1430_7">Y</A>);
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_1241_7">Column</A> := <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1431_7">X</A>);
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1238_14">Get_Cursor_Position</A>;
-++      <A HREF="terminal_interface-curses__ads.htm#ref_1246_7">Line</A>   := <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1391_7">Y</A>);
-++      <A HREF="terminal_interface-curses__ads.htm#ref_1247_7">Column</A> := <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1392_7">X</A>);
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1244_14">Get_Cursor_Position</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1437_14" HREF="terminal_interface-curses__ads.htm#ref_1246_14">Get_Origin_Relative_To_Parent</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1438_7" HREF="terminal_interface-curses__ads.htm#ref_1247_7">Win</A></FONT>                : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1439_7" HREF="terminal_interface-curses__ads.htm#ref_1248_7">Top_Left_Line</A></FONT>      : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1440_7" HREF="terminal_interface-curses__ads.htm#ref_1249_7">Top_Left_Column</A></FONT>    : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1441_7" HREF="terminal_interface-curses__ads.htm#ref_1250_7">Is_Not_A_Subwindow</A></FONT> : <b>out</b> Boolean)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1398_14" HREF="terminal_interface-curses__ads.htm#ref_1252_14">Get_Origin_Relative_To_Parent</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1399_7" HREF="terminal_interface-curses__ads.htm#ref_1253_7">Win</A></FONT>                : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1400_7" HREF="terminal_interface-curses__ads.htm#ref_1254_7">Top_Left_Line</A></FONT>      : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1401_7" HREF="terminal_interface-curses__ads.htm#ref_1255_7">Top_Left_Column</A></FONT>    : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1402_7" HREF="terminal_interface-curses__ads.htm#ref_1256_7">Is_Not_A_Subwindow</A></FONT> : <b>out</b> Boolean)
-+    <b>is</b>
-+-      <FONT COLOR=red><A NAME="ref_1443_7">Y</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := W_Get_Int (<A HREF="terminal_interface-curses__ads.htm#ref_1247_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1916_4">Offset_pary</A>);
-+-      <FONT COLOR=red><A NAME="ref_1444_7">X</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := W_Get_Int (<A HREF="terminal_interface-curses__ads.htm#ref_1247_7">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1917_4">Offset_parx</A>);
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1404_16">GetParY</A></FONT> (<FONT COLOR=red><A NAME="ref_1404_25" HREF="terminal_interface-curses__adb.htm#ref_1404_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>pragma</b> Import (C, GetParY, "getpary");
-++
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1407_16">GetParX</A></FONT> (<FONT COLOR=red><A NAME="ref_1407_25" HREF="terminal_interface-curses__adb.htm#ref_1407_16">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>pragma</b> Import (C, GetParX, "getparx");
-++
-++      <FONT COLOR=red><A NAME="ref_1410_7">Y</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1404_16">GetParY</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1253_7">Win</A>);
-++      <FONT COLOR=red><A NAME="ref_1411_7">X</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1407_16">GetParX</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1253_7">Win</A>);
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1443_7">Y</A> = -1 <b>then</b>
-+-         <A HREF="terminal_interface-curses__ads.htm#ref_1248_7">Top_Left_Line</A>   := <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>'Last;
-+-         <A HREF="terminal_interface-curses__ads.htm#ref_1249_7">Top_Left_Column</A> := <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>'Last;
-+-         <A HREF="terminal_interface-curses__ads.htm#ref_1250_7">Is_Not_A_Subwindow</A> := True;
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1410_7">Y</A> = -1 <b>then</b>
-++         <A HREF="terminal_interface-curses__ads.htm#ref_1254_7">Top_Left_Line</A>   := <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>'Last;
-++         <A HREF="terminal_interface-curses__ads.htm#ref_1255_7">Top_Left_Column</A> := <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>'Last;
-++         <A HREF="terminal_interface-curses__ads.htm#ref_1256_7">Is_Not_A_Subwindow</A> := True;
-+       <b>else</b>
-+-         <A HREF="terminal_interface-curses__ads.htm#ref_1248_7">Top_Left_Line</A>   := <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1443_7">Y</A>);
-+-         <A HREF="terminal_interface-curses__ads.htm#ref_1249_7">Top_Left_Column</A> := <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1444_7">X</A>);
-+-         <A HREF="terminal_interface-curses__ads.htm#ref_1250_7">Is_Not_A_Subwindow</A> := False;
-++         <A HREF="terminal_interface-curses__ads.htm#ref_1254_7">Top_Left_Line</A>   := <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1410_7">Y</A>);
-++         <A HREF="terminal_interface-curses__ads.htm#ref_1255_7">Top_Left_Column</A> := <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1411_7">X</A>);
-++         <A HREF="terminal_interface-curses__ads.htm#ref_1256_7">Is_Not_A_Subwindow</A> := False;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1246_14">Get_Origin_Relative_To_Parent</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1252_14">Get_Origin_Relative_To_Parent</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_1457_13" HREF="terminal_interface-curses__ads.htm#ref_1261_13">New_Pad</A></FONT> (<FONT COLOR=red><A NAME="ref_1457_22" HREF="terminal_interface-curses__ads.htm#ref_1261_22">Lines</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+-                     <FONT COLOR=red><A NAME="ref_1458_22" HREF="terminal_interface-curses__ads.htm#ref_1262_22">Columns</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1424_13" HREF="terminal_interface-curses__ads.htm#ref_1267_13">New_Pad</A></FONT> (<FONT COLOR=red><A NAME="ref_1424_22" HREF="terminal_interface-curses__ads.htm#ref_1267_22">Lines</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-++                     <FONT COLOR=red><A NAME="ref_1425_22" HREF="terminal_interface-curses__ads.htm#ref_1268_22">Columns</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1460_16">Newpad</A></FONT> (<FONT COLOR=red><A NAME="ref_1460_24" HREF="terminal_interface-curses__adb.htm#ref_1460_16">Lines</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>; <FONT COLOR=red><A NAME="ref_1460_39" HREF="terminal_interface-curses__adb.htm#ref_1460_16">Columns</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1427_16">Newpad</A></FONT> (<FONT COLOR=red><A NAME="ref_1427_24" HREF="terminal_interface-curses__adb.htm#ref_1427_16">Lines</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>; <FONT COLOR=red><A NAME="ref_1427_39" HREF="terminal_interface-curses__adb.htm#ref_1427_16">Columns</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+       <b>pragma</b> Import (C, Newpad, "newpad");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_1463_7">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1430_7">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses__adb.htm#ref_1463_7">W</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1460_16">Newpad</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1261_22">Lines</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1262_22">Columns</A>));
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1463_7">W</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-++      <A HREF="terminal_interface-curses__adb.htm#ref_1430_7">W</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1427_16">Newpad</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1267_22">Lines</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1268_22">Columns</A>));
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1430_7">W</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_1463_7">W</A>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1261_13">New_Pad</A>;
-++      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_1430_7">W</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1267_13">New_Pad</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_1472_13" HREF="terminal_interface-curses__ads.htm#ref_1267_13">Sub_Pad</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1473_7" HREF="terminal_interface-curses__ads.htm#ref_1268_7">Pad</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1474_7" HREF="terminal_interface-curses__ads.htm#ref_1269_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+-      <FONT COLOR=red><A NAME="ref_1475_7" HREF="terminal_interface-curses__ads.htm#ref_1270_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-+-      <FONT COLOR=red><A NAME="ref_1476_7" HREF="terminal_interface-curses__ads.htm#ref_1271_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1477_7" HREF="terminal_interface-curses__ads.htm#ref_1272_7">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
-+-   <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1479_16">Subpad</A></FONT>
-+-        (<FONT COLOR=red><A NAME="ref_1480_10" HREF="terminal_interface-curses__adb.htm#ref_1479_16">Pad</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-         <FONT COLOR=red><A NAME="ref_1481_10" HREF="terminal_interface-curses__adb.htm#ref_1479_16">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-         <FONT COLOR=red><A NAME="ref_1482_10" HREF="terminal_interface-curses__adb.htm#ref_1479_16">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-         <FONT COLOR=red><A NAME="ref_1483_10" HREF="terminal_interface-curses__adb.htm#ref_1479_16">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-         <FONT COLOR=red><A NAME="ref_1484_10" HREF="terminal_interface-curses__adb.htm#ref_1479_16">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1439_13" HREF="terminal_interface-curses__ads.htm#ref_1273_13">Sub_Pad</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1440_7" HREF="terminal_interface-curses__ads.htm#ref_1274_7">Pad</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1441_7" HREF="terminal_interface-curses__ads.htm#ref_1275_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-++      <FONT COLOR=red><A NAME="ref_1442_7" HREF="terminal_interface-curses__ads.htm#ref_1276_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-++      <FONT COLOR=red><A NAME="ref_1443_7" HREF="terminal_interface-curses__ads.htm#ref_1277_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1444_7" HREF="terminal_interface-curses__ads.htm#ref_1278_7">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
-++   <b>is</b>
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1446_16">Subpad</A></FONT>
-++        (<FONT COLOR=red><A NAME="ref_1447_10" HREF="terminal_interface-curses__adb.htm#ref_1446_16">Pad</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++         <FONT COLOR=red><A NAME="ref_1448_10" HREF="terminal_interface-curses__adb.htm#ref_1446_16">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++         <FONT COLOR=red><A NAME="ref_1449_10" HREF="terminal_interface-curses__adb.htm#ref_1446_16">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++         <FONT COLOR=red><A NAME="ref_1450_10" HREF="terminal_interface-curses__adb.htm#ref_1446_16">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++         <FONT COLOR=red><A NAME="ref_1451_10" HREF="terminal_interface-curses__adb.htm#ref_1446_16">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+       <b>pragma</b> Import (C, Subpad, "subpad");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_1487_7">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1454_7">W</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses__adb.htm#ref_1487_7">W</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1479_16">Subpad</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1268_7">Pad</A>,
-+-                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1269_7">Number_Of_Lines</A>),
-+-                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1270_7">Number_Of_Columns</A>),
-+-                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1271_7">First_Line_Position</A>),
-+-                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1272_7">First_Column_Position</A>));
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1487_7">W</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-+-         <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+-      <b>end</b> <b>if</b>;
-+-      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_1487_7">W</A>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1267_13">Sub_Pad</A>;
-+-
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1500_14" HREF="terminal_interface-curses__ads.htm#ref_1277_14">Refresh</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1501_7" HREF="terminal_interface-curses__ads.htm#ref_1278_7">Pad</A></FONT>                      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1502_7" HREF="terminal_interface-curses__ads.htm#ref_1279_7">Source_Top_Row</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1503_7" HREF="terminal_interface-curses__ads.htm#ref_1280_7">Source_Left_Column</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1504_7" HREF="terminal_interface-curses__ads.htm#ref_1281_7">Destination_Top_Row</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1505_7" HREF="terminal_interface-curses__ads.htm#ref_1282_7">Destination_Left_Column</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1506_7" HREF="terminal_interface-curses__ads.htm#ref_1283_7">Destination_Bottom_Row</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1507_7" HREF="terminal_interface-curses__ads.htm#ref_1284_7">Destination_Right_Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
-+-   <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1509_16">Prefresh</A></FONT>
-+-        (<FONT COLOR=red><A NAME="ref_1510_10" HREF="terminal_interface-curses__adb.htm#ref_1509_16">Pad</A></FONT>                      : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-         <FONT COLOR=red><A NAME="ref_1511_10" HREF="terminal_interface-curses__adb.htm#ref_1509_16">Source_Top_Row</A></FONT>           : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-         <FONT COLOR=red><A NAME="ref_1512_10" HREF="terminal_interface-curses__adb.htm#ref_1509_16">Source_Left_Column</A></FONT>       : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-         <FONT COLOR=red><A NAME="ref_1513_10" HREF="terminal_interface-curses__adb.htm#ref_1509_16">Destination_Top_Row</A></FONT>      : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-         <FONT COLOR=red><A NAME="ref_1514_10" HREF="terminal_interface-curses__adb.htm#ref_1509_16">Destination_Left_Column</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-         <FONT COLOR=red><A NAME="ref_1515_10" HREF="terminal_interface-curses__adb.htm#ref_1509_16">Destination_Bottom_Row</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-         <FONT COLOR=red><A NAME="ref_1516_10" HREF="terminal_interface-curses__adb.htm#ref_1509_16">Destination_Right_Column</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <A HREF="terminal_interface-curses__adb.htm#ref_1454_7">W</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1446_16">Subpad</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1274_7">Pad</A>,
-++                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1275_7">Number_Of_Lines</A>),
-++                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1276_7">Number_Of_Columns</A>),
-++                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1277_7">First_Line_Position</A>),
-++                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1278_7">First_Column_Position</A>));
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1454_7">W</A> = <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> <b>then</b>
-++         <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-++      <b>end</b> <b>if</b>;
-++      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_1454_7">W</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1273_13">Sub_Pad</A>;
-++
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1467_14" HREF="terminal_interface-curses__ads.htm#ref_1283_14">Refresh</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1468_7" HREF="terminal_interface-curses__ads.htm#ref_1284_7">Pad</A></FONT>                      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1469_7" HREF="terminal_interface-curses__ads.htm#ref_1285_7">Source_Top_Row</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1470_7" HREF="terminal_interface-curses__ads.htm#ref_1286_7">Source_Left_Column</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1471_7" HREF="terminal_interface-curses__ads.htm#ref_1287_7">Destination_Top_Row</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1472_7" HREF="terminal_interface-curses__ads.htm#ref_1288_7">Destination_Left_Column</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1473_7" HREF="terminal_interface-curses__ads.htm#ref_1289_7">Destination_Bottom_Row</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1474_7" HREF="terminal_interface-curses__ads.htm#ref_1290_7">Destination_Right_Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
-++   <b>is</b>
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1476_16">Prefresh</A></FONT>
-++        (<FONT COLOR=red><A NAME="ref_1477_10" HREF="terminal_interface-curses__adb.htm#ref_1476_16">Pad</A></FONT>                      : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++         <FONT COLOR=red><A NAME="ref_1478_10" HREF="terminal_interface-curses__adb.htm#ref_1476_16">Source_Top_Row</A></FONT>           : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++         <FONT COLOR=red><A NAME="ref_1479_10" HREF="terminal_interface-curses__adb.htm#ref_1476_16">Source_Left_Column</A></FONT>       : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++         <FONT COLOR=red><A NAME="ref_1480_10" HREF="terminal_interface-curses__adb.htm#ref_1476_16">Destination_Top_Row</A></FONT>      : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++         <FONT COLOR=red><A NAME="ref_1481_10" HREF="terminal_interface-curses__adb.htm#ref_1476_16">Destination_Left_Column</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++         <FONT COLOR=red><A NAME="ref_1482_10" HREF="terminal_interface-curses__adb.htm#ref_1476_16">Destination_Bottom_Row</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++         <FONT COLOR=red><A NAME="ref_1483_10" HREF="terminal_interface-curses__adb.htm#ref_1476_16">Destination_Right_Column</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Prefresh, "prefresh");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1509_16">Prefresh</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1278_7">Pad</A>,
-+-                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1279_7">Source_Top_Row</A>),
-+-                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1280_7">Source_Left_Column</A>),
-+-                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1281_7">Destination_Top_Row</A>),
-+-                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1282_7">Destination_Left_Column</A>),
-+-                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1283_7">Destination_Bottom_Row</A>),
-+-                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1284_7">Destination_Right_Column</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+-         <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+-      <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1277_14">Refresh</A>;
-+-
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1530_14" HREF="terminal_interface-curses__ads.htm#ref_1289_14">Refresh_Without_Update</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1531_7" HREF="terminal_interface-curses__ads.htm#ref_1290_7">Pad</A></FONT>                      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1532_7" HREF="terminal_interface-curses__ads.htm#ref_1291_7">Source_Top_Row</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1533_7" HREF="terminal_interface-curses__ads.htm#ref_1292_7">Source_Left_Column</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1534_7" HREF="terminal_interface-curses__ads.htm#ref_1293_7">Destination_Top_Row</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1535_7" HREF="terminal_interface-curses__ads.htm#ref_1294_7">Destination_Left_Column</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1536_7" HREF="terminal_interface-curses__ads.htm#ref_1295_7">Destination_Bottom_Row</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1537_7" HREF="terminal_interface-curses__ads.htm#ref_1296_7">Destination_Right_Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
-+-   <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1539_16">Pnoutrefresh</A></FONT>
-+-        (<FONT COLOR=red><A NAME="ref_1540_10" HREF="terminal_interface-curses__adb.htm#ref_1539_16">Pad</A></FONT>                      : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-         <FONT COLOR=red><A NAME="ref_1541_10" HREF="terminal_interface-curses__adb.htm#ref_1539_16">Source_Top_Row</A></FONT>           : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-         <FONT COLOR=red><A NAME="ref_1542_10" HREF="terminal_interface-curses__adb.htm#ref_1539_16">Source_Left_Column</A></FONT>       : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-         <FONT COLOR=red><A NAME="ref_1543_10" HREF="terminal_interface-curses__adb.htm#ref_1539_16">Destination_Top_Row</A></FONT>      : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-         <FONT COLOR=red><A NAME="ref_1544_10" HREF="terminal_interface-curses__adb.htm#ref_1539_16">Destination_Left_Column</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-         <FONT COLOR=red><A NAME="ref_1545_10" HREF="terminal_interface-curses__adb.htm#ref_1539_16">Destination_Bottom_Row</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-         <FONT COLOR=red><A NAME="ref_1546_10" HREF="terminal_interface-curses__adb.htm#ref_1539_16">Destination_Right_Column</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1476_16">Prefresh</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1284_7">Pad</A>,
-++                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1285_7">Source_Top_Row</A>),
-++                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1286_7">Source_Left_Column</A>),
-++                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1287_7">Destination_Top_Row</A>),
-++                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1288_7">Destination_Left_Column</A>),
-++                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1289_7">Destination_Bottom_Row</A>),
-++                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1290_7">Destination_Right_Column</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++         <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-++      <b>end</b> <b>if</b>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1283_14">Refresh</A>;
-++
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1497_14" HREF="terminal_interface-curses__ads.htm#ref_1295_14">Refresh_Without_Update</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1498_7" HREF="terminal_interface-curses__ads.htm#ref_1296_7">Pad</A></FONT>                      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1499_7" HREF="terminal_interface-curses__ads.htm#ref_1297_7">Source_Top_Row</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1500_7" HREF="terminal_interface-curses__ads.htm#ref_1298_7">Source_Left_Column</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1501_7" HREF="terminal_interface-curses__ads.htm#ref_1299_7">Destination_Top_Row</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1502_7" HREF="terminal_interface-curses__ads.htm#ref_1300_7">Destination_Left_Column</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1503_7" HREF="terminal_interface-curses__ads.htm#ref_1301_7">Destination_Bottom_Row</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1504_7" HREF="terminal_interface-curses__ads.htm#ref_1302_7">Destination_Right_Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
-++   <b>is</b>
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1506_16">Pnoutrefresh</A></FONT>
-++        (<FONT COLOR=red><A NAME="ref_1507_10" HREF="terminal_interface-curses__adb.htm#ref_1506_16">Pad</A></FONT>                      : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++         <FONT COLOR=red><A NAME="ref_1508_10" HREF="terminal_interface-curses__adb.htm#ref_1506_16">Source_Top_Row</A></FONT>           : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++         <FONT COLOR=red><A NAME="ref_1509_10" HREF="terminal_interface-curses__adb.htm#ref_1506_16">Source_Left_Column</A></FONT>       : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++         <FONT COLOR=red><A NAME="ref_1510_10" HREF="terminal_interface-curses__adb.htm#ref_1506_16">Destination_Top_Row</A></FONT>      : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++         <FONT COLOR=red><A NAME="ref_1511_10" HREF="terminal_interface-curses__adb.htm#ref_1506_16">Destination_Left_Column</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++         <FONT COLOR=red><A NAME="ref_1512_10" HREF="terminal_interface-curses__adb.htm#ref_1506_16">Destination_Bottom_Row</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++         <FONT COLOR=red><A NAME="ref_1513_10" HREF="terminal_interface-curses__adb.htm#ref_1506_16">Destination_Right_Column</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Pnoutrefresh, "pnoutrefresh");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1539_16">Pnoutrefresh</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1290_7">Pad</A>,
-+-                       <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1291_7">Source_Top_Row</A>),
-+-                       <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1292_7">Source_Left_Column</A>),
-+-                       <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1293_7">Destination_Top_Row</A>),
-+-                       <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1294_7">Destination_Left_Column</A>),
-+-                       <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1295_7">Destination_Bottom_Row</A>),
-+-                       <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1296_7">Destination_Right_Column</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+-         <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+-      <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1289_14">Refresh_Without_Update</A>;
-+-
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1560_14" HREF="terminal_interface-curses__ads.htm#ref_1301_14">Add_Character_To_Pad_And_Echo_It</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1561_7" HREF="terminal_interface-curses__ads.htm#ref_1302_7">Pad</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1562_7" HREF="terminal_interface-curses__ads.htm#ref_1303_7">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1506_16">Pnoutrefresh</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1296_7">Pad</A>,
-++                       <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1297_7">Source_Top_Row</A>),
-++                       <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1298_7">Source_Left_Column</A>),
-++                       <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1299_7">Destination_Top_Row</A>),
-++                       <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1300_7">Destination_Left_Column</A>),
-++                       <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1301_7">Destination_Bottom_Row</A>),
-++                       <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1302_7">Destination_Right_Column</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++         <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-++      <b>end</b> <b>if</b>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1295_14">Refresh_Without_Update</A>;
-++
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1527_14" HREF="terminal_interface-curses__ads.htm#ref_1307_14">Add_Character_To_Pad_And_Echo_It</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1528_7" HREF="terminal_interface-curses__ads.htm#ref_1308_7">Pad</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1529_7" HREF="terminal_interface-curses__ads.htm#ref_1309_7">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1564_16">Pechochar</A></FONT> (<FONT COLOR=red><A NAME="ref_1564_27" HREF="terminal_interface-curses__adb.htm#ref_1564_16">Pad</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1564_41" HREF="terminal_interface-curses__adb.htm#ref_1564_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>)
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1531_16">Pechochar</A></FONT> (<FONT COLOR=red><A NAME="ref_1531_27" HREF="terminal_interface-curses__adb.htm#ref_1531_16">Pad</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1531_41" HREF="terminal_interface-curses__adb.htm#ref_1531_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>)
-+                           <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Pechochar, "pechochar");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1564_16">Pechochar</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1302_7">Pad</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1303_7">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1531_16">Pechochar</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1308_7">Pad</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1309_7">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1301_14">Add_Character_To_Pad_And_Echo_It</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1307_14">Add_Character_To_Pad_And_Echo_It</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1573_14" HREF="terminal_interface-curses__ads.htm#ref_1306_14">Add_Character_To_Pad_And_Echo_It</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1574_7" HREF="terminal_interface-curses__ads.htm#ref_1307_7">Pad</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1575_7" HREF="terminal_interface-curses__ads.htm#ref_1308_7">Ch</A></FONT>  : <b>in</b> Character)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1540_14" HREF="terminal_interface-curses__ads.htm#ref_1312_14">Add_Character_To_Pad_And_Echo_It</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1541_7" HREF="terminal_interface-curses__ads.htm#ref_1313_7">Pad</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1542_7" HREF="terminal_interface-curses__ads.htm#ref_1314_7">Ch</A></FONT>  : <b>in</b> Character)
-+    <b>is</b>
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_1301_14">Add_Character_To_Pad_And_Echo_It</A>
-+-        (<A HREF="terminal_interface-curses__ads.htm#ref_1307_7">Pad</A>,
-+-         <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>'(<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_1308_7">Ch</A>,
-++      <A HREF="terminal_interface-curses__ads.htm#ref_1307_14">Add_Character_To_Pad_And_Echo_It</A>
-++        (<A HREF="terminal_interface-curses__ads.htm#ref_1313_7">Pad</A>,
-++         <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>'(<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_1314_7">Ch</A>,
-+                                <A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First,
-+                                <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>  =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>));
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1306_14">Add_Character_To_Pad_And_Echo_It</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1312_14">Add_Character_To_Pad_And_Echo_It</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1585_14" HREF="terminal_interface-curses__ads.htm#ref_1316_14">Scroll</A></FONT> (<FONT COLOR=red><A NAME="ref_1585_22" HREF="terminal_interface-curses__ads.htm#ref_1316_22">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-                     <FONT COLOR=red><A NAME="ref_1586_22" HREF="terminal_interface-curses__ads.htm#ref_1317_22">Amount</A></FONT> : <b>in</b> Integer := 1)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1552_14" HREF="terminal_interface-curses__ads.htm#ref_1322_14">Scroll</A></FONT> (<FONT COLOR=red><A NAME="ref_1552_22" HREF="terminal_interface-curses__ads.htm#ref_1322_22">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                     <FONT COLOR=red><A NAME="ref_1553_22" HREF="terminal_interface-curses__ads.htm#ref_1323_22">Amount</A></FONT> : <b>in</b> Integer := 1)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1588_16">Wscrl</A></FONT> (<FONT COLOR=red><A NAME="ref_1588_23" HREF="terminal_interface-curses__adb.htm#ref_1588_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1588_37" HREF="terminal_interface-curses__adb.htm#ref_1588_16">N</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1555_16">Wscrl</A></FONT> (<FONT COLOR=red><A NAME="ref_1555_23" HREF="terminal_interface-curses__adb.htm#ref_1555_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1555_37" HREF="terminal_interface-curses__adb.htm#ref_1555_16">N</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Wscrl, "wscrl");
-+ 
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1588_16">Wscrl</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1316_22">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1317_22">Amount</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1555_16">Wscrl</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1322_22">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1323_22">Amount</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1316_14">Scroll</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1322_14">Scroll</A>;
-+ 
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1598_14" HREF="terminal_interface-curses__ads.htm#ref_1328_14">Delete_Character</A></FONT> (<FONT COLOR=red><A NAME="ref_1598_32" HREF="terminal_interface-curses__ads.htm#ref_1328_32">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1565_14" HREF="terminal_interface-curses__ads.htm#ref_1334_14">Delete_Character</A></FONT> (<FONT COLOR=red><A NAME="ref_1565_32" HREF="terminal_interface-curses__ads.htm#ref_1334_32">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1600_16">Wdelch</A></FONT> (<FONT COLOR=red><A NAME="ref_1600_24" HREF="terminal_interface-curses__adb.htm#ref_1600_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1567_16">Wdelch</A></FONT> (<FONT COLOR=red><A NAME="ref_1567_24" HREF="terminal_interface-curses__adb.htm#ref_1567_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Wdelch, "wdelch");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1600_16">Wdelch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1328_32">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1567_16">Wdelch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1334_32">Win</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1328_14">Delete_Character</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1334_14">Delete_Character</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1608_14" HREF="terminal_interface-curses__ads.htm#ref_1333_14">Delete_Character</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1609_7" HREF="terminal_interface-curses__ads.htm#ref_1334_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1610_7" HREF="terminal_interface-curses__ads.htm#ref_1335_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1611_7" HREF="terminal_interface-curses__ads.htm#ref_1336_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1575_14" HREF="terminal_interface-curses__ads.htm#ref_1339_14">Delete_Character</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1576_7" HREF="terminal_interface-curses__ads.htm#ref_1340_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1577_7" HREF="terminal_interface-curses__ads.htm#ref_1341_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1578_7" HREF="terminal_interface-curses__ads.htm#ref_1342_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1613_16">Mvwdelch</A></FONT> (<FONT COLOR=red><A NAME="ref_1613_26" HREF="terminal_interface-curses__adb.htm#ref_1613_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                         <FONT COLOR=red><A NAME="ref_1614_26" HREF="terminal_interface-curses__adb.htm#ref_1613_16">Lin</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-                         <FONT COLOR=red><A NAME="ref_1615_26" HREF="terminal_interface-curses__adb.htm#ref_1613_16">Col</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1580_16">Mvwdelch</A></FONT> (<FONT COLOR=red><A NAME="ref_1580_26" HREF="terminal_interface-curses__adb.htm#ref_1580_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                         <FONT COLOR=red><A NAME="ref_1581_26" HREF="terminal_interface-curses__adb.htm#ref_1580_16">Lin</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++                         <FONT COLOR=red><A NAME="ref_1582_26" HREF="terminal_interface-curses__adb.htm#ref_1580_16">Col</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Mvwdelch, "mvwdelch");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1613_16">Mvwdelch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1334_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1335_7">Line</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1336_7">Column</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1580_16">Mvwdelch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1340_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1341_7">Line</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1342_7">Column</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1333_14">Delete_Character</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1339_14">Delete_Character</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_1623_13" HREF="terminal_interface-curses__ads.htm#ref_1346_13">Peek</A></FONT> (<FONT COLOR=red><A NAME="ref_1623_19" HREF="terminal_interface-curses__ads.htm#ref_1346_19">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>)
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1590_13" HREF="terminal_interface-curses__ads.htm#ref_1352_13">Peek</A></FONT> (<FONT COLOR=red><A NAME="ref_1590_19" HREF="terminal_interface-curses__ads.htm#ref_1352_19">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-+      <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1626_16">Winch</A></FONT> (<FONT COLOR=red><A NAME="ref_1626_23" HREF="terminal_interface-curses__adb.htm#ref_1626_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1593_16">Winch</A></FONT> (<FONT COLOR=red><A NAME="ref_1593_23" HREF="terminal_interface-curses__adb.htm#ref_1593_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-+       <b>pragma</b> Import (C, Winch, "winch");
-+    <b>begin</b>
-+-      <b>return</b> Chtype_To_AttrChar (<A HREF="terminal_interface-curses__adb.htm#ref_1626_16">Winch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1346_19">Win</A>));
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1346_13">Peek</A>;
-++      <b>return</b> Chtype_To_AttrChar (<A HREF="terminal_interface-curses__adb.htm#ref_1593_16">Winch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1352_19">Win</A>));
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1352_13">Peek</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_1632_13" HREF="terminal_interface-curses__ads.htm#ref_1352_13">Peek</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1633_7" HREF="terminal_interface-curses__ads.htm#ref_1353_7">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1634_7" HREF="terminal_interface-curses__ads.htm#ref_1354_7">Line</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1635_7" HREF="terminal_interface-curses__ads.htm#ref_1355_7">Column</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>
-+-   <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1637_16">Mvwinch</A></FONT> (<FONT COLOR=red><A NAME="ref_1637_25" HREF="terminal_interface-curses__adb.htm#ref_1637_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                        <FONT COLOR=red><A NAME="ref_1638_25" HREF="terminal_interface-curses__adb.htm#ref_1637_16">Lin</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-                        <FONT COLOR=red><A NAME="ref_1639_25" HREF="terminal_interface-curses__adb.htm#ref_1637_16">Col</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1599_13" HREF="terminal_interface-curses__ads.htm#ref_1358_13">Peek</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1600_7" HREF="terminal_interface-curses__ads.htm#ref_1359_7">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1601_7" HREF="terminal_interface-curses__ads.htm#ref_1360_7">Line</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1602_7" HREF="terminal_interface-curses__ads.htm#ref_1361_7">Column</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>
-++   <b>is</b>
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1604_16">Mvwinch</A></FONT> (<FONT COLOR=red><A NAME="ref_1604_25" HREF="terminal_interface-curses__adb.htm#ref_1604_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                        <FONT COLOR=red><A NAME="ref_1605_25" HREF="terminal_interface-curses__adb.htm#ref_1604_16">Lin</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++                        <FONT COLOR=red><A NAME="ref_1606_25" HREF="terminal_interface-curses__adb.htm#ref_1604_16">Col</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-+       <b>pragma</b> Import (C, Mvwinch, "mvwinch");
-+    <b>begin</b>
-+-      <b>return</b> Chtype_To_AttrChar (<A HREF="terminal_interface-curses__adb.htm#ref_1637_16">Mvwinch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1353_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1354_7">Line</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1355_7">Column</A>)));
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1352_13">Peek</A>;
-++      <b>return</b> Chtype_To_AttrChar (<A HREF="terminal_interface-curses__adb.htm#ref_1604_16">Mvwinch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1359_7">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1360_7">Line</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1361_7">Column</A>)));
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1358_13">Peek</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1645_14" HREF="terminal_interface-curses__ads.htm#ref_1365_14">Insert</A></FONT> (<FONT COLOR=red><A NAME="ref_1645_22" HREF="terminal_interface-curses__ads.htm#ref_1365_22">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-                     <FONT COLOR=red><A NAME="ref_1646_22" HREF="terminal_interface-curses__ads.htm#ref_1366_22">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1612_14" HREF="terminal_interface-curses__ads.htm#ref_1371_14">Insert</A></FONT> (<FONT COLOR=red><A NAME="ref_1612_22" HREF="terminal_interface-curses__ads.htm#ref_1371_22">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                     <FONT COLOR=red><A NAME="ref_1613_22" HREF="terminal_interface-curses__ads.htm#ref_1372_22">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1648_16">Winsch</A></FONT> (<FONT COLOR=red><A NAME="ref_1648_24" HREF="terminal_interface-curses__adb.htm#ref_1648_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1648_38" HREF="terminal_interface-curses__adb.htm#ref_1648_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1615_16">Winsch</A></FONT> (<FONT COLOR=red><A NAME="ref_1615_24" HREF="terminal_interface-curses__adb.htm#ref_1615_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>; <FONT COLOR=red><A NAME="ref_1615_38" HREF="terminal_interface-curses__adb.htm#ref_1615_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Winsch, "winsch");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1648_16">Winsch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1365_22">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1366_22">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1615_16">Winsch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1371_22">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1372_22">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1365_14">Insert</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1371_14">Insert</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1656_14" HREF="terminal_interface-curses__ads.htm#ref_1371_14">Insert</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1657_7" HREF="terminal_interface-curses__ads.htm#ref_1371_22">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1658_7" HREF="terminal_interface-curses__ads.htm#ref_1372_22">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1659_7" HREF="terminal_interface-curses__ads.htm#ref_1373_22">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1660_7" HREF="terminal_interface-curses__ads.htm#ref_1374_22">Ch</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
-+-   <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1662_16">Mvwinsch</A></FONT> (<FONT COLOR=red><A NAME="ref_1662_26" HREF="terminal_interface-curses__adb.htm#ref_1662_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                         <FONT COLOR=red><A NAME="ref_1663_26" HREF="terminal_interface-curses__adb.htm#ref_1662_16">Lin</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-                         <FONT COLOR=red><A NAME="ref_1664_26" HREF="terminal_interface-curses__adb.htm#ref_1662_16">Col</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-                         <FONT COLOR=red><A NAME="ref_1665_26" HREF="terminal_interface-curses__adb.htm#ref_1662_16">Ch</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1623_14" HREF="terminal_interface-curses__ads.htm#ref_1377_14">Insert</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1624_7" HREF="terminal_interface-curses__ads.htm#ref_1377_22">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1625_7" HREF="terminal_interface-curses__ads.htm#ref_1378_22">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1626_7" HREF="terminal_interface-curses__ads.htm#ref_1379_22">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1627_7" HREF="terminal_interface-curses__ads.htm#ref_1380_22">Ch</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>)
-++   <b>is</b>
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1629_16">Mvwinsch</A></FONT> (<FONT COLOR=red><A NAME="ref_1629_26" HREF="terminal_interface-curses__adb.htm#ref_1629_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                         <FONT COLOR=red><A NAME="ref_1630_26" HREF="terminal_interface-curses__adb.htm#ref_1629_16">Lin</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++                         <FONT COLOR=red><A NAME="ref_1631_26" HREF="terminal_interface-curses__adb.htm#ref_1629_16">Col</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++                         <FONT COLOR=red><A NAME="ref_1632_26" HREF="terminal_interface-curses__adb.htm#ref_1629_16">Ch</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Mvwinsch, "mvwinsch");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1662_16">Mvwinsch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1371_22">Win</A>,
-+-                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1372_22">Line</A>),
-+-                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1373_22">Column</A>),
-+-                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1374_22">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1629_16">Mvwinsch</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1377_22">Win</A>,
-++                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1378_22">Line</A>),
-++                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1379_22">Column</A>),
-++                   <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1380_22">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1371_14">Insert</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1377_14">Insert</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1676_14" HREF="terminal_interface-curses__ads.htm#ref_1383_14">Insert</A></FONT> (<FONT COLOR=red><A NAME="ref_1676_22" HREF="terminal_interface-curses__ads.htm#ref_1383_22">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-                     <FONT COLOR=red><A NAME="ref_1677_22" HREF="terminal_interface-curses__ads.htm#ref_1384_22">Str</A></FONT> : <b>in</b> String;
-+-                     <FONT COLOR=red><A NAME="ref_1678_22" HREF="terminal_interface-curses__ads.htm#ref_1385_22">Len</A></FONT> : <b>in</b> Integer := -1)
-+-   <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1680_16">Winsnstr</A></FONT> (<FONT COLOR=red><A NAME="ref_1680_26" HREF="terminal_interface-curses__adb.htm#ref_1680_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                         <FONT COLOR=red><A NAME="ref_1681_26" HREF="terminal_interface-curses__adb.htm#ref_1680_16">Str</A></FONT> : char_array;
-+-                         <FONT COLOR=red><A NAME="ref_1682_26" HREF="terminal_interface-curses__adb.htm#ref_1680_16">Len</A></FONT> : Integer := -1) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1643_14" HREF="terminal_interface-curses__ads.htm#ref_1389_14">Insert</A></FONT> (<FONT COLOR=red><A NAME="ref_1643_22" HREF="terminal_interface-curses__ads.htm#ref_1389_22">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                     <FONT COLOR=red><A NAME="ref_1644_22" HREF="terminal_interface-curses__ads.htm#ref_1390_22">Str</A></FONT> : <b>in</b> String;
-++                     <FONT COLOR=red><A NAME="ref_1645_22" HREF="terminal_interface-curses__ads.htm#ref_1391_22">Len</A></FONT> : <b>in</b> Integer := -1)
-++   <b>is</b>
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1647_16">Winsnstr</A></FONT> (<FONT COLOR=red><A NAME="ref_1647_26" HREF="terminal_interface-curses__adb.htm#ref_1647_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                         <FONT COLOR=red><A NAME="ref_1648_26" HREF="terminal_interface-curses__adb.htm#ref_1647_16">Str</A></FONT> : char_array;
-++                         <FONT COLOR=red><A NAME="ref_1649_26" HREF="terminal_interface-curses__adb.htm#ref_1647_16">Len</A></FONT> : Integer := -1) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Winsnstr, "winsnstr");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_1685_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1384_22">Str</A>'Length);
-+-      <FONT COLOR=red><A NAME="ref_1686_7">Length</A></FONT> : size_t;
-++      <FONT COLOR=red><A NAME="ref_1652_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1390_22">Str</A>'Length);
-++      <FONT COLOR=red><A NAME="ref_1653_7">Length</A></FONT> : size_t;
-+    <b>begin</b>
-+-      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1384_22">Str</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1685_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1686_7">Length</A>);
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1680_16">Winsnstr</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1383_22">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1685_7">Txt</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1385_22">Len</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1390_22">Str</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1652_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1653_7">Length</A>);
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1647_16">Winsnstr</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1389_22">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1652_7">Txt</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1391_22">Len</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1383_14">Insert</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1389_14">Insert</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1694_14" HREF="terminal_interface-curses__ads.htm#ref_1392_14">Insert</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1695_7" HREF="terminal_interface-curses__ads.htm#ref_1392_22">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1696_7" HREF="terminal_interface-curses__ads.htm#ref_1393_22">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1697_7" HREF="terminal_interface-curses__ads.htm#ref_1394_22">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1698_7" HREF="terminal_interface-curses__ads.htm#ref_1395_22">Str</A></FONT>    : <b>in</b> String;
-+-      <FONT COLOR=red><A NAME="ref_1699_7" HREF="terminal_interface-curses__ads.htm#ref_1396_22">Len</A></FONT>    : <b>in</b> Integer := -1)
-+-   <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1701_16">Mvwinsnstr</A></FONT> (<FONT COLOR=red><A NAME="ref_1701_28" HREF="terminal_interface-curses__adb.htm#ref_1701_16">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                           <FONT COLOR=red><A NAME="ref_1702_28" HREF="terminal_interface-curses__adb.htm#ref_1701_16">Line</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-                           <FONT COLOR=red><A NAME="ref_1703_28" HREF="terminal_interface-curses__adb.htm#ref_1701_16">Column</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-                           <FONT COLOR=red><A NAME="ref_1704_28" HREF="terminal_interface-curses__adb.htm#ref_1701_16">Str</A></FONT>    : char_array;
-+-                           <FONT COLOR=red><A NAME="ref_1705_28" HREF="terminal_interface-curses__adb.htm#ref_1701_16">Len</A></FONT>    : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1661_14" HREF="terminal_interface-curses__ads.htm#ref_1398_14">Insert</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1662_7" HREF="terminal_interface-curses__ads.htm#ref_1398_22">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1663_7" HREF="terminal_interface-curses__ads.htm#ref_1399_22">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1664_7" HREF="terminal_interface-curses__ads.htm#ref_1400_22">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1665_7" HREF="terminal_interface-curses__ads.htm#ref_1401_22">Str</A></FONT>    : <b>in</b> String;
-++      <FONT COLOR=red><A NAME="ref_1666_7" HREF="terminal_interface-curses__ads.htm#ref_1402_22">Len</A></FONT>    : <b>in</b> Integer := -1)
-++   <b>is</b>
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1668_16">Mvwinsnstr</A></FONT> (<FONT COLOR=red><A NAME="ref_1668_28" HREF="terminal_interface-curses__adb.htm#ref_1668_16">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                           <FONT COLOR=red><A NAME="ref_1669_28" HREF="terminal_interface-curses__adb.htm#ref_1668_16">Line</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++                           <FONT COLOR=red><A NAME="ref_1670_28" HREF="terminal_interface-curses__adb.htm#ref_1668_16">Column</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++                           <FONT COLOR=red><A NAME="ref_1671_28" HREF="terminal_interface-curses__adb.htm#ref_1668_16">Str</A></FONT>    : char_array;
-++                           <FONT COLOR=red><A NAME="ref_1672_28" HREF="terminal_interface-curses__adb.htm#ref_1668_16">Len</A></FONT>    : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Mvwinsnstr, "mvwinsnstr");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_1708_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1395_22">Str</A>'Length);
-+-      <FONT COLOR=red><A NAME="ref_1709_7">Length</A></FONT> : size_t;
-++      <FONT COLOR=red><A NAME="ref_1675_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1401_22">Str</A>'Length);
-++      <FONT COLOR=red><A NAME="ref_1676_7">Length</A></FONT> : size_t;
-+    <b>begin</b>
-+-      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1395_22">Str</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1708_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1709_7">Length</A>);
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1701_16">Mvwinsnstr</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1392_22">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1393_22">Line</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1394_22">Column</A>), <A HREF="terminal_interface-curses__adb.htm#ref_1708_7">Txt</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1396_22">Len</A>))
-++      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1401_22">Str</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1675_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1676_7">Length</A>);
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1668_16">Mvwinsnstr</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1398_22">Win</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1399_22">Line</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1400_22">Column</A>), <A HREF="terminal_interface-curses__adb.htm#ref_1675_7">Txt</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1402_22">Len</A>))
-+         = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1392_14">Insert</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1398_14">Insert</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1718_14" HREF="terminal_interface-curses__ads.htm#ref_1408_14">Peek</A></FONT> (<FONT COLOR=red><A NAME="ref_1718_20" HREF="terminal_interface-curses__ads.htm#ref_1408_20">Win</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-                   <FONT COLOR=red><A NAME="ref_1719_20" HREF="terminal_interface-curses__ads.htm#ref_1409_20">Str</A></FONT> : <b>out</b> String;
-+-                   <FONT COLOR=red><A NAME="ref_1720_20" HREF="terminal_interface-curses__ads.htm#ref_1410_20">Len</A></FONT> : <b>in</b>  Integer := -1)
-+-   <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1722_16">Winnstr</A></FONT> (<FONT COLOR=red><A NAME="ref_1722_25" HREF="terminal_interface-curses__adb.htm#ref_1722_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                        <FONT COLOR=red><A NAME="ref_1723_25" HREF="terminal_interface-curses__adb.htm#ref_1722_16">Str</A></FONT> : char_array;
-+-                        <FONT COLOR=red><A NAME="ref_1724_25" HREF="terminal_interface-curses__adb.htm#ref_1722_16">Len</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1685_14" HREF="terminal_interface-curses__ads.htm#ref_1414_14">Peek</A></FONT> (<FONT COLOR=red><A NAME="ref_1685_20" HREF="terminal_interface-curses__ads.htm#ref_1414_20">Win</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                   <FONT COLOR=red><A NAME="ref_1686_20" HREF="terminal_interface-curses__ads.htm#ref_1415_20">Str</A></FONT> : <b>out</b> String;
-++                   <FONT COLOR=red><A NAME="ref_1687_20" HREF="terminal_interface-curses__ads.htm#ref_1416_20">Len</A></FONT> : <b>in</b>  Integer := -1)
-++   <b>is</b>
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1689_16">Winnstr</A></FONT> (<FONT COLOR=red><A NAME="ref_1689_25" HREF="terminal_interface-curses__adb.htm#ref_1689_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                        <FONT COLOR=red><A NAME="ref_1690_25" HREF="terminal_interface-curses__adb.htm#ref_1689_16">Str</A></FONT> : char_array;
-++                        <FONT COLOR=red><A NAME="ref_1691_25" HREF="terminal_interface-curses__adb.htm#ref_1689_16">Len</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Winnstr, "winnstr");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_1727_7">N</A></FONT>   : Integer := <A HREF="terminal_interface-curses__ads.htm#ref_1410_20">Len</A>;
-+-      <FONT COLOR=red><A NAME="ref_1728_7">Txt</A></FONT> : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1409_20">Str</A>'Length);
-+-      <FONT COLOR=red><A NAME="ref_1729_7">Cnt</A></FONT> : Natural;
-++      <FONT COLOR=red><A NAME="ref_1694_7">N</A></FONT>   : Integer := <A HREF="terminal_interface-curses__ads.htm#ref_1416_20">Len</A>;
-++      <FONT COLOR=red><A NAME="ref_1695_7">Txt</A></FONT> : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1415_20">Str</A>'Length);
-++      <FONT COLOR=red><A NAME="ref_1696_7">Cnt</A></FONT> : Natural;
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1727_7">N</A> &lt; 0 <b>then</b>
-+-         <A HREF="terminal_interface-curses__adb.htm#ref_1727_7">N</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1409_20">Str</A>'Length;
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1694_7">N</A> &lt; 0 <b>then</b>
-++         <A HREF="terminal_interface-curses__adb.htm#ref_1694_7">N</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1415_20">Str</A>'Length;
-+       <b>end</b> <b>if</b>;
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1727_7">N</A> &gt; <A HREF="terminal_interface-curses__ads.htm#ref_1409_20">Str</A>'Length <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1694_7">N</A> &gt; <A HREF="terminal_interface-curses__ads.htm#ref_1415_20">Str</A>'Length <b>then</b>
-+          <b>raise</b> Constraint_Error;
-+       <b>end</b> <b>if</b>;
-+-      <A HREF="terminal_interface-curses__adb.htm#ref_1728_7">Txt</A> (0) := <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.char'First;
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1722_16">Winnstr</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1408_20">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1728_7">Txt</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1727_7">N</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <A HREF="terminal_interface-curses__adb.htm#ref_1695_7">Txt</A> (0) := <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.char'First;
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1689_16">Winnstr</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1414_20">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1695_7">Txt</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1694_7">N</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-      To_Ada (<A HREF="terminal_interface-curses__adb.htm#ref_1728_7">Txt</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1409_20">Str</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1729_7">Cnt</A>, True);
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1729_7">Cnt</A> &lt; <A HREF="terminal_interface-curses__ads.htm#ref_1409_20">Str</A>'Length <b>then</b>
-+-         <A HREF="terminal_interface-curses__ads.htm#ref_1409_20">Str</A> ((<A HREF="terminal_interface-curses__ads.htm#ref_1409_20">Str</A>'First + <A HREF="terminal_interface-curses__adb.htm#ref_1729_7">Cnt</A>) .. <A HREF="terminal_interface-curses__ads.htm#ref_1409_20">Str</A>'Last) := (<b>others</b> =&gt; ' ');
-++      To_Ada (<A HREF="terminal_interface-curses__adb.htm#ref_1695_7">Txt</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1415_20">Str</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1696_7">Cnt</A>, True);
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1696_7">Cnt</A> &lt; <A HREF="terminal_interface-curses__ads.htm#ref_1415_20">Str</A>'Length <b>then</b>
-++         <A HREF="terminal_interface-curses__ads.htm#ref_1415_20">Str</A> ((<A HREF="terminal_interface-curses__ads.htm#ref_1415_20">Str</A>'First + <A HREF="terminal_interface-curses__adb.htm#ref_1696_7">Cnt</A>) .. <A HREF="terminal_interface-curses__ads.htm#ref_1415_20">Str</A>'Last) := (<b>others</b> =&gt; ' ');
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1408_14">Peek</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1414_14">Peek</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1747_14" HREF="terminal_interface-curses__ads.htm#ref_1417_14">Peek</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1748_7" HREF="terminal_interface-curses__ads.htm#ref_1417_20">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1749_7" HREF="terminal_interface-curses__ads.htm#ref_1418_20">Line</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1750_7" HREF="terminal_interface-curses__ads.htm#ref_1419_20">Column</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1751_7" HREF="terminal_interface-curses__ads.htm#ref_1420_20">Str</A></FONT>    : <b>out</b> String;
-+-      <FONT COLOR=red><A NAME="ref_1752_7" HREF="terminal_interface-curses__ads.htm#ref_1421_20">Len</A></FONT>    : <b>in</b>  Integer := -1)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1714_14" HREF="terminal_interface-curses__ads.htm#ref_1423_14">Peek</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1715_7" HREF="terminal_interface-curses__ads.htm#ref_1423_20">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1716_7" HREF="terminal_interface-curses__ads.htm#ref_1424_20">Line</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1717_7" HREF="terminal_interface-curses__ads.htm#ref_1425_20">Column</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1718_7" HREF="terminal_interface-curses__ads.htm#ref_1426_20">Str</A></FONT>    : <b>out</b> String;
-++      <FONT COLOR=red><A NAME="ref_1719_7" HREF="terminal_interface-curses__ads.htm#ref_1427_20">Len</A></FONT>    : <b>in</b>  Integer := -1)
-+    <b>is</b>
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_505_14">Move_Cursor</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1417_20">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1418_20">Line</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1419_20">Column</A>);
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_1408_14">Peek</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1417_20">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1420_20">Str</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1421_20">Len</A>);
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1417_14">Peek</A>;
-++      <A HREF="terminal_interface-curses__ads.htm#ref_511_14">Move_Cursor</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1423_20">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1424_20">Line</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1425_20">Column</A>);
-++      <A HREF="terminal_interface-curses__ads.htm#ref_1414_14">Peek</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1423_20">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1426_20">Str</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1427_20">Len</A>);
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1423_14">Peek</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1759_14" HREF="terminal_interface-curses__ads.htm#ref_1432_14">Peek</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1760_7" HREF="terminal_interface-curses__ads.htm#ref_1432_20">Win</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1761_7" HREF="terminal_interface-curses__ads.htm#ref_1433_20">Str</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Attributed_String</A>;
-+-      <FONT COLOR=red><A NAME="ref_1762_7" HREF="terminal_interface-curses__ads.htm#ref_1434_20">Len</A></FONT> : <b>in</b>  Integer := -1)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1726_14" HREF="terminal_interface-curses__ads.htm#ref_1438_14">Peek</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1727_7" HREF="terminal_interface-curses__ads.htm#ref_1438_20">Win</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1728_7" HREF="terminal_interface-curses__ads.htm#ref_1439_20">Str</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Attributed_String</A>;
-++      <FONT COLOR=red><A NAME="ref_1729_7" HREF="terminal_interface-curses__ads.htm#ref_1440_20">Len</A></FONT> : <b>in</b>  Integer := -1)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1764_16">Winchnstr</A></FONT> (<FONT COLOR=red><A NAME="ref_1764_27" HREF="terminal_interface-curses__adb.htm#ref_1764_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                          <FONT COLOR=red><A NAME="ref_1765_27" HREF="terminal_interface-curses__adb.htm#ref_1764_16">Str</A></FONT> : <A HREF="terminal_interface-curses__adb.htm#ref_59_9">chtype_array</A>;             <FONT COLOR=green><EM>-- out</EM></FONT>
-+-                          <FONT COLOR=red><A NAME="ref_1766_27" HREF="terminal_interface-curses__adb.htm#ref_1764_16">Len</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1731_16">Winchnstr</A></FONT> (<FONT COLOR=red><A NAME="ref_1731_27" HREF="terminal_interface-curses__adb.htm#ref_1731_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                          <FONT COLOR=red><A NAME="ref_1732_27" HREF="terminal_interface-curses__adb.htm#ref_1731_16">Str</A></FONT> : <A HREF="terminal_interface-curses__adb.htm#ref_57_9">chtype_array</A>;             <FONT COLOR=green><EM>-- out</EM></FONT>
-++                          <FONT COLOR=red><A NAME="ref_1733_27" HREF="terminal_interface-curses__adb.htm#ref_1731_16">Len</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Winchnstr, "winchnstr");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_1769_7">N</A></FONT>   : Integer := <A HREF="terminal_interface-curses__ads.htm#ref_1434_20">Len</A>;
-+-      <FONT COLOR=red><A NAME="ref_1770_7">Txt</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__adb.htm#ref_59_9">chtype_array</A> (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1433_20">Str</A>'Length)
-++      <FONT COLOR=red><A NAME="ref_1736_7">N</A></FONT>   : Integer := <A HREF="terminal_interface-curses__ads.htm#ref_1440_20">Len</A>;
-++      <FONT COLOR=red><A NAME="ref_1737_7">Txt</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__adb.htm#ref_57_9">chtype_array</A> (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1439_20">Str</A>'Length)
-+           := (0 =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>);
-+-      <FONT COLOR=red><A NAME="ref_1772_7">Cnt</A></FONT> : Natural := 0;
-++      <FONT COLOR=red><A NAME="ref_1739_7">Cnt</A></FONT> : Natural := 0;
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1769_7">N</A> &lt; 0 <b>then</b>
-+-         <A HREF="terminal_interface-curses__adb.htm#ref_1769_7">N</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1433_20">Str</A>'Length;
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1736_7">N</A> &lt; 0 <b>then</b>
-++         <A HREF="terminal_interface-curses__adb.htm#ref_1736_7">N</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1439_20">Str</A>'Length;
-+       <b>end</b> <b>if</b>;
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1769_7">N</A> &gt; <A HREF="terminal_interface-curses__ads.htm#ref_1433_20">Str</A>'Length <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1736_7">N</A> &gt; <A HREF="terminal_interface-curses__ads.htm#ref_1439_20">Str</A>'Length <b>then</b>
-+          <b>raise</b> Constraint_Error;
-+       <b>end</b> <b>if</b>;
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1764_16">Winchnstr</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1432_20">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1770_7">Txt</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1769_7">N</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1731_16">Winchnstr</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1438_20">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1737_7">Txt</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1736_7">N</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-      <b>for</b> <FONT COLOR=red><A NAME="ref_1783_11">To</A></FONT> <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1433_20">Str</A>'<b>Range</b> <b>loop</b>
-+-         <b>exit</b> <b>when</b> <A HREF="terminal_interface-curses__adb.htm#ref_1770_7">Txt</A> (size_t (<A HREF="terminal_interface-curses__adb.htm#ref_1772_7">Cnt</A>)) = <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+-         <A HREF="terminal_interface-curses__ads.htm#ref_1433_20">Str</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1783_11">To</A>) := <A HREF="terminal_interface-curses__adb.htm#ref_1770_7">Txt</A> (size_t (<A HREF="terminal_interface-curses__adb.htm#ref_1772_7">Cnt</A>));
-+-         <A HREF="terminal_interface-curses__adb.htm#ref_1772_7">Cnt</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1772_7">Cnt</A> + 1;
-++      <b>for</b> <FONT COLOR=red><A NAME="ref_1750_11">To</A></FONT> <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1439_20">Str</A>'<b>Range</b> <b>loop</b>
-++         <b>exit</b> <b>when</b> <A HREF="terminal_interface-curses__adb.htm#ref_1737_7">Txt</A> (size_t (<A HREF="terminal_interface-curses__adb.htm#ref_1739_7">Cnt</A>)) = <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-++         <A HREF="terminal_interface-curses__ads.htm#ref_1439_20">Str</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1750_11">To</A>) := <A HREF="terminal_interface-curses__adb.htm#ref_1737_7">Txt</A> (size_t (<A HREF="terminal_interface-curses__adb.htm#ref_1739_7">Cnt</A>));
-++         <A HREF="terminal_interface-curses__adb.htm#ref_1739_7">Cnt</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1739_7">Cnt</A> + 1;
-+       <b>end</b> <b>loop</b>;
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1772_7">Cnt</A> &lt; <A HREF="terminal_interface-curses__ads.htm#ref_1433_20">Str</A>'Length <b>then</b>
-+-         <A HREF="terminal_interface-curses__ads.htm#ref_1433_20">Str</A> ((<A HREF="terminal_interface-curses__ads.htm#ref_1433_20">Str</A>'First + <A HREF="terminal_interface-curses__adb.htm#ref_1772_7">Cnt</A>) .. <A HREF="terminal_interface-curses__ads.htm#ref_1433_20">Str</A>'Last) :=
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1739_7">Cnt</A> &lt; <A HREF="terminal_interface-curses__ads.htm#ref_1439_20">Str</A>'Length <b>then</b>
-++         <A HREF="terminal_interface-curses__ads.htm#ref_1439_20">Str</A> ((<A HREF="terminal_interface-curses__ads.htm#ref_1439_20">Str</A>'First + <A HREF="terminal_interface-curses__adb.htm#ref_1739_7">Cnt</A>) .. <A HREF="terminal_interface-curses__ads.htm#ref_1439_20">Str</A>'Last) :=
-+            (<b>others</b> =&gt; (<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A> =&gt; ' ',
-+                        <A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First,
-+                        <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>));
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1432_14">Peek</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1438_14">Peek</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1796_14" HREF="terminal_interface-curses__ads.htm#ref_1441_14">Peek</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1797_7" HREF="terminal_interface-curses__ads.htm#ref_1441_20">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1798_7" HREF="terminal_interface-curses__ads.htm#ref_1442_20">Line</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1799_7" HREF="terminal_interface-curses__ads.htm#ref_1443_20">Column</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1800_7" HREF="terminal_interface-curses__ads.htm#ref_1444_20">Str</A></FONT>    : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Attributed_String</A>;
-+-      <FONT COLOR=red><A NAME="ref_1801_7" HREF="terminal_interface-curses__ads.htm#ref_1445_20">Len</A></FONT>    : <b>in</b> Integer := -1)
-+-   <b>is</b>
-+-   <b>begin</b>
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_505_14">Move_Cursor</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1441_20">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1442_20">Line</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1443_20">Column</A>);
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_1432_14">Peek</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1441_20">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1444_20">Str</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1445_20">Len</A>);
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1441_14">Peek</A>;
-+-<FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1808_14" HREF="terminal_interface-curses__ads.htm#ref_1457_14">Get</A></FONT> (<FONT COLOR=red><A NAME="ref_1808_19" HREF="terminal_interface-curses__ads.htm#ref_1457_19">Win</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-                  <FONT COLOR=red><A NAME="ref_1809_19" HREF="terminal_interface-curses__ads.htm#ref_1458_19">Str</A></FONT> : <b>out</b> String;
-+-                  <FONT COLOR=red><A NAME="ref_1810_19" HREF="terminal_interface-curses__ads.htm#ref_1459_19">Len</A></FONT> : <b>in</b>  Integer := -1)
-+-   <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1812_16">Wgetnstr</A></FONT> (<FONT COLOR=red><A NAME="ref_1812_26" HREF="terminal_interface-curses__adb.htm#ref_1812_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                         <FONT COLOR=red><A NAME="ref_1813_26" HREF="terminal_interface-curses__adb.htm#ref_1812_16">Str</A></FONT> : char_array;
-+-                         <FONT COLOR=red><A NAME="ref_1814_26" HREF="terminal_interface-curses__adb.htm#ref_1812_16">Len</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1763_14" HREF="terminal_interface-curses__ads.htm#ref_1447_14">Peek</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1764_7" HREF="terminal_interface-curses__ads.htm#ref_1447_20">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1765_7" HREF="terminal_interface-curses__ads.htm#ref_1448_20">Line</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1766_7" HREF="terminal_interface-curses__ads.htm#ref_1449_20">Column</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1767_7" HREF="terminal_interface-curses__ads.htm#ref_1450_20">Str</A></FONT>    : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Attributed_String</A>;
-++      <FONT COLOR=red><A NAME="ref_1768_7" HREF="terminal_interface-curses__ads.htm#ref_1451_20">Len</A></FONT>    : <b>in</b> Integer := -1)
-++   <b>is</b>
-++   <b>begin</b>
-++      <A HREF="terminal_interface-curses__ads.htm#ref_511_14">Move_Cursor</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1447_20">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1448_20">Line</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1449_20">Column</A>);
-++      <A HREF="terminal_interface-curses__ads.htm#ref_1438_14">Peek</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1447_20">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1450_20">Str</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1451_20">Len</A>);
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1447_14">Peek</A>;
-++<FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1775_14" HREF="terminal_interface-curses__ads.htm#ref_1463_14">Get</A></FONT> (<FONT COLOR=red><A NAME="ref_1775_19" HREF="terminal_interface-curses__ads.htm#ref_1463_19">Win</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                  <FONT COLOR=red><A NAME="ref_1776_19" HREF="terminal_interface-curses__ads.htm#ref_1464_19">Str</A></FONT> : <b>out</b> String;
-++                  <FONT COLOR=red><A NAME="ref_1777_19" HREF="terminal_interface-curses__ads.htm#ref_1465_19">Len</A></FONT> : <b>in</b>  Integer := -1)
-++   <b>is</b>
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1779_16">Wgetnstr</A></FONT> (<FONT COLOR=red><A NAME="ref_1779_26" HREF="terminal_interface-curses__adb.htm#ref_1779_16">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                         <FONT COLOR=red><A NAME="ref_1780_26" HREF="terminal_interface-curses__adb.htm#ref_1779_16">Str</A></FONT> : char_array;
-++                         <FONT COLOR=red><A NAME="ref_1781_26" HREF="terminal_interface-curses__adb.htm#ref_1779_16">Len</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Wgetnstr, "wgetnstr");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_1817_7">N</A></FONT>   : Integer := <A HREF="terminal_interface-curses__ads.htm#ref_1459_19">Len</A>;
-+-      <FONT COLOR=red><A NAME="ref_1818_7">Txt</A></FONT> : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1458_19">Str</A>'Length);
-+-      <FONT COLOR=red><A NAME="ref_1819_7">Cnt</A></FONT> : Natural;
-++      <FONT COLOR=red><A NAME="ref_1784_7">N</A></FONT>   : Integer := <A HREF="terminal_interface-curses__ads.htm#ref_1465_19">Len</A>;
-++      <FONT COLOR=red><A NAME="ref_1785_7">Txt</A></FONT> : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1464_19">Str</A>'Length);
-++      <FONT COLOR=red><A NAME="ref_1786_7">Cnt</A></FONT> : Natural;
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1817_7">N</A> &lt; 0 <b>then</b>
-+-         <A HREF="terminal_interface-curses__adb.htm#ref_1817_7">N</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1458_19">Str</A>'Length;
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1784_7">N</A> &lt; 0 <b>then</b>
-++         <A HREF="terminal_interface-curses__adb.htm#ref_1784_7">N</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1464_19">Str</A>'Length;
-+       <b>end</b> <b>if</b>;
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1817_7">N</A> &gt; <A HREF="terminal_interface-curses__ads.htm#ref_1458_19">Str</A>'Length <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1784_7">N</A> &gt; <A HREF="terminal_interface-curses__ads.htm#ref_1464_19">Str</A>'Length <b>then</b>
-+          <b>raise</b> Constraint_Error;
-+       <b>end</b> <b>if</b>;
-+-      <A HREF="terminal_interface-curses__adb.htm#ref_1818_7">Txt</A> (0) := <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.char'First;
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1812_16">Wgetnstr</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1457_19">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1818_7">Txt</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1817_7">N</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <A HREF="terminal_interface-curses__adb.htm#ref_1785_7">Txt</A> (0) := <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.char'First;
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1779_16">Wgetnstr</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1463_19">Win</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1785_7">Txt</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1784_7">N</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-      To_Ada (<A HREF="terminal_interface-curses__adb.htm#ref_1818_7">Txt</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1458_19">Str</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1819_7">Cnt</A>, True);
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1819_7">Cnt</A> &lt; <A HREF="terminal_interface-curses__ads.htm#ref_1458_19">Str</A>'Length <b>then</b>
-+-         <A HREF="terminal_interface-curses__ads.htm#ref_1458_19">Str</A> ((<A HREF="terminal_interface-curses__ads.htm#ref_1458_19">Str</A>'First + <A HREF="terminal_interface-curses__adb.htm#ref_1819_7">Cnt</A>) .. <A HREF="terminal_interface-curses__ads.htm#ref_1458_19">Str</A>'Last) := (<b>others</b> =&gt; ' ');
-++      To_Ada (<A HREF="terminal_interface-curses__adb.htm#ref_1785_7">Txt</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1464_19">Str</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1786_7">Cnt</A>, True);
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1786_7">Cnt</A> &lt; <A HREF="terminal_interface-curses__ads.htm#ref_1464_19">Str</A>'Length <b>then</b>
-++         <A HREF="terminal_interface-curses__ads.htm#ref_1464_19">Str</A> ((<A HREF="terminal_interface-curses__ads.htm#ref_1464_19">Str</A>'First + <A HREF="terminal_interface-curses__adb.htm#ref_1786_7">Cnt</A>) .. <A HREF="terminal_interface-curses__ads.htm#ref_1464_19">Str</A>'Last) := (<b>others</b> =&gt; ' ');
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1457_14">Get</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1463_14">Get</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1837_14" HREF="terminal_interface-curses__ads.htm#ref_1468_14">Get</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1838_7" HREF="terminal_interface-curses__ads.htm#ref_1468_19">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1839_7" HREF="terminal_interface-curses__ads.htm#ref_1469_19">Line</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1840_7" HREF="terminal_interface-curses__ads.htm#ref_1470_19">Column</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1841_7" HREF="terminal_interface-curses__ads.htm#ref_1471_19">Str</A></FONT>    : <b>out</b> String;
-+-      <FONT COLOR=red><A NAME="ref_1842_7" HREF="terminal_interface-curses__ads.htm#ref_1472_19">Len</A></FONT>    : <b>in</b>  Integer := -1)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1804_14" HREF="terminal_interface-curses__ads.htm#ref_1474_14">Get</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1805_7" HREF="terminal_interface-curses__ads.htm#ref_1474_19">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1806_7" HREF="terminal_interface-curses__ads.htm#ref_1475_19">Line</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1807_7" HREF="terminal_interface-curses__ads.htm#ref_1476_19">Column</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1808_7" HREF="terminal_interface-curses__ads.htm#ref_1477_19">Str</A></FONT>    : <b>out</b> String;
-++      <FONT COLOR=red><A NAME="ref_1809_7" HREF="terminal_interface-curses__ads.htm#ref_1478_19">Len</A></FONT>    : <b>in</b>  Integer := -1)
-+    <b>is</b>
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_505_14">Move_Cursor</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1468_19">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1469_19">Line</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1470_19">Column</A>);
-+-      <A HREF="terminal_interface-curses__ads.htm#ref_1457_14">Get</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1468_19">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1471_19">Str</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1472_19">Len</A>);
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1468_14">Get</A>;
-++      <A HREF="terminal_interface-curses__ads.htm#ref_511_14">Move_Cursor</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1474_19">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1475_19">Line</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1476_19">Column</A>);
-++      <A HREF="terminal_interface-curses__ads.htm#ref_1463_14">Get</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1474_19">Win</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1477_19">Str</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1478_19">Len</A>);
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1474_14">Get</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1849_14" HREF="terminal_interface-curses__ads.htm#ref_1493_14">Init_Soft_Label_Keys</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1850_7" HREF="terminal_interface-curses__ads.htm#ref_1494_7">Format</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1485_9">Soft_Label_Key_Format</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1485_35">Three_Two_Three</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1816_14" HREF="terminal_interface-curses__ads.htm#ref_1499_14">Init_Soft_Label_Keys</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1817_7" HREF="terminal_interface-curses__ads.htm#ref_1500_7">Format</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1491_9">Soft_Label_Key_Format</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1491_35">Three_Two_Three</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1852_16">Slk_Init</A></FONT> (<FONT COLOR=red><A NAME="ref_1852_26" HREF="terminal_interface-curses__adb.htm#ref_1852_16">Fmt</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1819_16">Slk_Init</A></FONT> (<FONT COLOR=red><A NAME="ref_1819_26" HREF="terminal_interface-curses__adb.htm#ref_1819_16">Fmt</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Slk_Init, "slk_init");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1852_16">Slk_Init</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1485_9">Soft_Label_Key_Format</A>'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1494_7">Format</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1819_16">Slk_Init</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1491_9">Soft_Label_Key_Format</A>'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1500_7">Format</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1493_14">Init_Soft_Label_Keys</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1499_14">Init_Soft_Label_Keys</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1860_14" HREF="terminal_interface-curses__ads.htm#ref_1499_14">Set_Soft_Label_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_1860_34" HREF="terminal_interface-curses__ads.htm#ref_1499_34">Label</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1489_9">Label_Number</A>;
-+-                                 <FONT COLOR=red><A NAME="ref_1861_34" HREF="terminal_interface-curses__ads.htm#ref_1500_34">Text</A></FONT>  : <b>in</b> String;
-+-                                 <FONT COLOR=red><A NAME="ref_1862_34" HREF="terminal_interface-curses__ads.htm#ref_1501_34">Fmt</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1490_9">Label_Justification</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1490_33">Left</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1827_14" HREF="terminal_interface-curses__ads.htm#ref_1505_14">Set_Soft_Label_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_1827_34" HREF="terminal_interface-curses__ads.htm#ref_1505_34">Label</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1495_9">Label_Number</A>;
-++                                 <FONT COLOR=red><A NAME="ref_1828_34" HREF="terminal_interface-curses__ads.htm#ref_1506_34">Text</A></FONT>  : <b>in</b> String;
-++                                 <FONT COLOR=red><A NAME="ref_1829_34" HREF="terminal_interface-curses__ads.htm#ref_1507_34">Fmt</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1496_9">Label_Justification</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1496_33">Left</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1864_16">Slk_Set</A></FONT> (<FONT COLOR=red><A NAME="ref_1864_25" HREF="terminal_interface-curses__adb.htm#ref_1864_16">Label</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-                        <FONT COLOR=red><A NAME="ref_1865_25" HREF="terminal_interface-curses__adb.htm#ref_1864_16">Txt</A></FONT>   : char_array;
-+-                        <FONT COLOR=red><A NAME="ref_1866_25" HREF="terminal_interface-curses__adb.htm#ref_1864_16">Fmt</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1831_16">Slk_Set</A></FONT> (<FONT COLOR=red><A NAME="ref_1831_25" HREF="terminal_interface-curses__adb.htm#ref_1831_16">Label</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++                        <FONT COLOR=red><A NAME="ref_1832_25" HREF="terminal_interface-curses__adb.htm#ref_1831_16">Txt</A></FONT>   : char_array;
-++                        <FONT COLOR=red><A NAME="ref_1833_25" HREF="terminal_interface-curses__adb.htm#ref_1831_16">Fmt</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Slk_Set, "slk_set");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_1869_7">Txt</A></FONT> : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1500_34">Text</A>'Length);
-+-      <FONT COLOR=red><A NAME="ref_1870_7">Len</A></FONT> : size_t;
-++      <FONT COLOR=red><A NAME="ref_1836_7">Txt</A></FONT> : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1506_34">Text</A>'Length);
-++      <FONT COLOR=red><A NAME="ref_1837_7">Len</A></FONT> : size_t;
-+    <b>begin</b>
-+-      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1500_34">Text</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1869_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1870_7">Len</A>);
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1864_16">Slk_Set</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1499_34">Label</A>), <A HREF="terminal_interface-curses__adb.htm#ref_1869_7">Txt</A>,
-+-                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1490_9">Label_Justification</A>'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1501_34">Fmt</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1506_34">Text</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1836_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_1837_7">Len</A>);
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1831_16">Slk_Set</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1505_34">Label</A>), <A HREF="terminal_interface-curses__adb.htm#ref_1836_7">Txt</A>,
-++                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1496_9">Label_Justification</A>'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1507_34">Fmt</A>))) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1499_14">Set_Soft_Label_Key</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1505_14">Set_Soft_Label_Key</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1879_14" HREF="terminal_interface-curses__ads.htm#ref_1506_14">Refresh_Soft_Label_Keys</A></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1846_14" HREF="terminal_interface-curses__ads.htm#ref_1512_14">Refresh_Soft_Label_Keys</A></FONT>
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1881_16">Slk_Refresh</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1848_16">Slk_Refresh</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Slk_Refresh, "slk_refresh");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1881_16">Slk_Refresh</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1848_16">Slk_Refresh</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1506_14">Refresh_Soft_Label_Keys</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1512_14">Refresh_Soft_Label_Keys</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1889_14" HREF="terminal_interface-curses__ads.htm#ref_1511_14">Refresh_Soft_Label_Keys_Without_Update</A></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1856_14" HREF="terminal_interface-curses__ads.htm#ref_1517_14">Refresh_Soft_Label_Keys_Without_Update</A></FONT>
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1891_16">Slk_Noutrefresh</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1858_16">Slk_Noutrefresh</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Slk_Noutrefresh, "slk_noutrefresh");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1891_16">Slk_Noutrefresh</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1858_16">Slk_Noutrefresh</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1511_14">Refresh_Soft_Label_Keys_Without_Update</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1517_14">Refresh_Soft_Label_Keys_Without_Update</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1899_14" HREF="terminal_interface-curses__ads.htm#ref_1516_14">Get_Soft_Label_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_1899_34" HREF="terminal_interface-curses__ads.htm#ref_1516_34">Label</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1489_9">Label_Number</A>;
-+-                                 <FONT COLOR=red><A NAME="ref_1900_34" HREF="terminal_interface-curses__ads.htm#ref_1517_34">Text</A></FONT>  : <b>out</b> String)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1866_14" HREF="terminal_interface-curses__ads.htm#ref_1522_14">Get_Soft_Label_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_1866_34" HREF="terminal_interface-curses__ads.htm#ref_1522_34">Label</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1495_9">Label_Number</A>;
-++                                 <FONT COLOR=red><A NAME="ref_1867_34" HREF="terminal_interface-curses__ads.htm#ref_1523_34">Text</A></FONT>  : <b>out</b> String)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1902_16">Slk_Label</A></FONT> (<FONT COLOR=red><A NAME="ref_1902_27" HREF="terminal_interface-curses__adb.htm#ref_1902_16">Label</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> chars_ptr;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1869_16">Slk_Label</A></FONT> (<FONT COLOR=red><A NAME="ref_1869_27" HREF="terminal_interface-curses__adb.htm#ref_1869_16">Label</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> chars_ptr;
-+       <b>pragma</b> Import (C, Slk_Label, "slk_label");
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses-aux__ads.htm#ref_116_14">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1902_16">Slk_Label</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1516_34">Label</A>)), <A HREF="terminal_interface-curses__ads.htm#ref_1517_34">Text</A>);
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1516_14">Get_Soft_Label_Key</A>;
-++      <A HREF="terminal_interface-curses-aux__ads.htm#ref_116_14">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1869_16">Slk_Label</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1522_34">Label</A>)), <A HREF="terminal_interface-curses__ads.htm#ref_1523_34">Text</A>);
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1522_14">Get_Soft_Label_Key</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_1908_13" HREF="terminal_interface-curses__ads.htm#ref_1521_13">Get_Soft_Label_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_1908_33" HREF="terminal_interface-curses__ads.htm#ref_1521_33">Label</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1489_9">Label_Number</A>) <b>return</b> String
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1875_13" HREF="terminal_interface-curses__ads.htm#ref_1527_13">Get_Soft_Label_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_1875_33" HREF="terminal_interface-curses__ads.htm#ref_1527_33">Label</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1495_9">Label_Number</A>) <b>return</b> String
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1910_16">Slk_Label</A></FONT> (<FONT COLOR=red><A NAME="ref_1910_27" HREF="terminal_interface-curses__adb.htm#ref_1910_16">Label</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> chars_ptr;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1877_16">Slk_Label</A></FONT> (<FONT COLOR=red><A NAME="ref_1877_27" HREF="terminal_interface-curses__adb.htm#ref_1877_16">Label</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> chars_ptr;
-+       <b>pragma</b> Import (C, Slk_Label, "slk_label");
-+    <b>begin</b>
-+-      <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_121_13">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1910_16">Slk_Label</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1521_33">Label</A>)));
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1521_13">Get_Soft_Label_Key</A>;
-++      <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_121_13">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1877_16">Slk_Label</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1527_33">Label</A>)));
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1527_13">Get_Soft_Label_Key</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1916_14" HREF="terminal_interface-curses__ads.htm#ref_1527_14">Clear_Soft_Label_Keys</A></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1883_14" HREF="terminal_interface-curses__ads.htm#ref_1533_14">Clear_Soft_Label_Keys</A></FONT>
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1918_16">Slk_Clear</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1885_16">Slk_Clear</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Slk_Clear, "slk_clear");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1918_16">Slk_Clear</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1885_16">Slk_Clear</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1527_14">Clear_Soft_Label_Keys</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1533_14">Clear_Soft_Label_Keys</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1926_14" HREF="terminal_interface-curses__ads.htm#ref_1532_14">Restore_Soft_Label_Keys</A></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1893_14" HREF="terminal_interface-curses__ads.htm#ref_1538_14">Restore_Soft_Label_Keys</A></FONT>
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1928_16">Slk_Restore</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1895_16">Slk_Restore</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Slk_Restore, "slk_restore");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1928_16">Slk_Restore</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1895_16">Slk_Restore</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1532_14">Restore_Soft_Label_Keys</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1538_14">Restore_Soft_Label_Keys</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1936_14" HREF="terminal_interface-curses__ads.htm#ref_1537_14">Touch_Soft_Label_Keys</A></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1903_14" HREF="terminal_interface-curses__ads.htm#ref_1543_14">Touch_Soft_Label_Keys</A></FONT>
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1938_16">Slk_Touch</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1905_16">Slk_Touch</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Slk_Touch, "slk_touch");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1938_16">Slk_Touch</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1905_16">Slk_Touch</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1537_14">Touch_Soft_Label_Keys</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1543_14">Touch_Soft_Label_Keys</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1946_14" HREF="terminal_interface-curses__ads.htm#ref_1542_14">Switch_Soft_Label_Key_Attributes</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1947_7" HREF="terminal_interface-curses__ads.htm#ref_1543_7">Attr</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>;
-+-      <FONT COLOR=red><A NAME="ref_1948_7" HREF="terminal_interface-curses__ads.htm#ref_1544_7">On</A></FONT>   : <b>in</b> Boolean := True)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1913_14" HREF="terminal_interface-curses__ads.htm#ref_1548_14">Switch_Soft_Label_Key_Attributes</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1914_7" HREF="terminal_interface-curses__ads.htm#ref_1549_7">Attr</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>;
-++      <FONT COLOR=red><A NAME="ref_1915_7" HREF="terminal_interface-curses__ads.htm#ref_1550_7">On</A></FONT>   : <b>in</b> Boolean := True)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1950_16">Slk_Attron</A></FONT> (<FONT COLOR=red><A NAME="ref_1950_28" HREF="terminal_interface-curses__adb.htm#ref_1950_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1917_16">Slk_Attron</A></FONT> (<FONT COLOR=red><A NAME="ref_1917_28" HREF="terminal_interface-curses__adb.htm#ref_1917_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Slk_Attron, "slk_attron");
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1952_16">Slk_Attroff</A></FONT> (<FONT COLOR=red><A NAME="ref_1952_29" HREF="terminal_interface-curses__adb.htm#ref_1952_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1919_16">Slk_Attroff</A></FONT> (<FONT COLOR=red><A NAME="ref_1919_29" HREF="terminal_interface-curses__adb.htm#ref_1919_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Slk_Attroff, "slk_attroff");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_1955_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-      <FONT COLOR=red><A NAME="ref_1956_7">Ch</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := (<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; Character'First,
-+-                                              <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>  =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_1543_7">Attr</A>,
-++      <FONT COLOR=red><A NAME="ref_1922_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <FONT COLOR=red><A NAME="ref_1923_7">Ch</A></FONT>  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := (<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; Character'First,
-++                                              <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>  =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_1549_7">Attr</A>,
-+                                               <A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First);
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_1544_7">On</A> <b>then</b>
-+-         <A HREF="terminal_interface-curses__adb.htm#ref_1955_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1950_16">Slk_Attron</A>  (<A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1956_7">Ch</A>));
-++      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_1550_7">On</A> <b>then</b>
-++         <A HREF="terminal_interface-curses__adb.htm#ref_1922_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1917_16">Slk_Attron</A>  (<A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1923_7">Ch</A>));
-+       <b>else</b>
-+-         <A HREF="terminal_interface-curses__adb.htm#ref_1955_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1952_16">Slk_Attroff</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1956_7">Ch</A>));
-++         <A HREF="terminal_interface-curses__adb.htm#ref_1922_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1919_16">Slk_Attroff</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1923_7">Ch</A>));
-+       <b>end</b> <b>if</b>;
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1955_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1922_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1542_14">Switch_Soft_Label_Key_Attributes</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1548_14">Switch_Soft_Label_Key_Attributes</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1970_14" HREF="terminal_interface-curses__ads.htm#ref_1550_14">Set_Soft_Label_Key_Attributes</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_1971_7" HREF="terminal_interface-curses__ads.htm#ref_1551_7">Attr</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-+-      <FONT COLOR=red><A NAME="ref_1972_7" HREF="terminal_interface-curses__ads.htm#ref_1552_7">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1937_14" HREF="terminal_interface-curses__ads.htm#ref_1556_14">Set_Soft_Label_Key_Attributes</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1938_7" HREF="terminal_interface-curses__ads.htm#ref_1557_7">Attr</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-++      <FONT COLOR=red><A NAME="ref_1939_7" HREF="terminal_interface-curses__ads.htm#ref_1558_7">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1974_16">Slk_Attrset</A></FONT> (<FONT COLOR=red><A NAME="ref_1974_29" HREF="terminal_interface-curses__adb.htm#ref_1974_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1941_16">Slk_Attrset</A></FONT> (<FONT COLOR=red><A NAME="ref_1941_29" HREF="terminal_interface-curses__adb.htm#ref_1941_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Slk_Attrset, "slk_attrset");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_1977_7">Ch</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := (<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; Character'First,
-+-                                             <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>  =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_1551_7">Attr</A>,
-+-                                             <A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_1552_7">Color</A>);
-++      <FONT COLOR=red><A NAME="ref_1944_7">Ch</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := (<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; Character'First,
-++                                             <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>  =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_1557_7">Attr</A>,
-++                                             <A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_1558_7">Color</A>);
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1974_16">Slk_Attrset</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1977_7">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1941_16">Slk_Attrset</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1944_7">Ch</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1550_14">Set_Soft_Label_Key_Attributes</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1556_14">Set_Soft_Label_Key_Attributes</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_1986_13" HREF="terminal_interface-curses__ads.htm#ref_1557_13">Get_Soft_Label_Key_Attributes</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1953_13" HREF="terminal_interface-curses__ads.htm#ref_1563_13">Get_Soft_Label_Key_Attributes</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1988_16">Slk_Attr</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1955_16">Slk_Attr</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-+       <b>pragma</b> Import (C, Slk_Attr, "slk_attr");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_1991_7">Attr</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1988_16">Slk_Attr</A>;
-++      <FONT COLOR=red><A NAME="ref_1958_7">Attr</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1955_16">Slk_Attr</A>;
-+    <b>begin</b>
-+-      <b>return</b> Chtype_To_AttrChar (<A HREF="terminal_interface-curses__adb.htm#ref_1991_7">Attr</A>).<A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1557_13">Get_Soft_Label_Key_Attributes</A>;
-++      <b>return</b> Chtype_To_AttrChar (<A HREF="terminal_interface-curses__adb.htm#ref_1958_7">Attr</A>).<A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1563_13">Get_Soft_Label_Key_Attributes</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_1996_13" HREF="terminal_interface-curses__ads.htm#ref_1561_13">Get_Soft_Label_Key_Attributes</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1963_13" HREF="terminal_interface-curses__ads.htm#ref_1567_13">Get_Soft_Label_Key_Attributes</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_1998_16">Slk_Attr</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1965_16">Slk_Attr</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-+       <b>pragma</b> Import (C, Slk_Attr, "slk_attr");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_2001_7">Attr</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1998_16">Slk_Attr</A>;
-++      <FONT COLOR=red><A NAME="ref_1968_7">Attr</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A> := <A HREF="terminal_interface-curses__adb.htm#ref_1965_16">Slk_Attr</A>;
-+    <b>begin</b>
-+-      <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">Chtype_To_AttrChar</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2001_7">Attr</A>).<A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1561_13">Get_Soft_Label_Key_Attributes</A>;
-++      <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">Chtype_To_AttrChar</A> (<A HREF="terminal_interface-curses__adb.htm#ref_1968_7">Attr</A>).<A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1567_13">Get_Soft_Label_Key_Attributes</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2006_14" HREF="terminal_interface-curses__ads.htm#ref_1566_14">Set_Soft_Label_Key_Color</A></FONT> (<FONT COLOR=red><A NAME="ref_2006_40" HREF="terminal_interface-curses__ads.htm#ref_1566_40">Pair</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1973_14" HREF="terminal_interface-curses__ads.htm#ref_1572_14">Set_Soft_Label_Key_Color</A></FONT> (<FONT COLOR=red><A NAME="ref_1973_40" HREF="terminal_interface-curses__ads.htm#ref_1572_40">Pair</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2008_16">Slk_Color</A></FONT> (<FONT COLOR=red><A NAME="ref_2008_27" HREF="terminal_interface-curses__adb.htm#ref_2008_16">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1975_16">Slk_Color</A></FONT> (<FONT COLOR=red><A NAME="ref_1975_27" HREF="terminal_interface-curses__adb.htm#ref_1975_16">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Slk_Color, "slk_color");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2008_16">Slk_Color</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1566_40">Pair</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1975_16">Slk_Color</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1572_40">Pair</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1566_14">Set_Soft_Label_Key_Color</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1572_14">Set_Soft_Label_Key_Color</A>;
-+ 
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2017_14" HREF="terminal_interface-curses__ads.htm#ref_1580_14">Enable_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_2017_26" HREF="terminal_interface-curses__ads.htm#ref_1580_26">Key</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>;
-+-                         <FONT COLOR=red><A NAME="ref_2018_26" HREF="terminal_interface-curses__ads.htm#ref_1581_26">Enable</A></FONT> : <b>in</b> Boolean := True)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1984_14" HREF="terminal_interface-curses__ads.htm#ref_1586_14">Enable_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_1984_26" HREF="terminal_interface-curses__ads.htm#ref_1586_26">Key</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>;
-++                         <FONT COLOR=red><A NAME="ref_1985_26" HREF="terminal_interface-curses__ads.htm#ref_1587_26">Enable</A></FONT> : <b>in</b> Boolean := True)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2020_16">Keyok</A></FONT> (<FONT COLOR=red><A NAME="ref_2020_23" HREF="terminal_interface-curses__adb.htm#ref_2020_16">Keycode</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-                      <FONT COLOR=red><A NAME="ref_2021_23" HREF="terminal_interface-curses__adb.htm#ref_2020_16">On_Off</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_1987_16">Keyok</A></FONT> (<FONT COLOR=red><A NAME="ref_1987_23" HREF="terminal_interface-curses__adb.htm#ref_1987_16">Keycode</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++                      <FONT COLOR=red><A NAME="ref_1988_23" HREF="terminal_interface-curses__adb.htm#ref_1987_16">On_Off</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Keyok, "keyok");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2020_16">Keyok</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1580_26">Key</A>), <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1581_26">Enable</A>)))
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_1987_16">Keyok</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1586_26">Key</A>), <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1587_26">Enable</A>)))
-+         = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1580_14">Enable_Key</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1586_14">Enable_Key</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2030_14" HREF="terminal_interface-curses__ads.htm#ref_1590_14">Define_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_2030_26" HREF="terminal_interface-curses__ads.htm#ref_1590_26">Definition</A></FONT> : <b>in</b> String;
-+-                         <FONT COLOR=red><A NAME="ref_2031_26" HREF="terminal_interface-curses__ads.htm#ref_1591_26">Key</A></FONT>        : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1997_14" HREF="terminal_interface-curses__ads.htm#ref_1596_14">Define_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_1997_26" HREF="terminal_interface-curses__ads.htm#ref_1596_26">Definition</A></FONT> : <b>in</b> String;
-++                         <FONT COLOR=red><A NAME="ref_1998_26" HREF="terminal_interface-curses__ads.htm#ref_1597_26">Key</A></FONT>        : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2033_16">Defkey</A></FONT> (<FONT COLOR=red><A NAME="ref_2033_24" HREF="terminal_interface-curses__adb.htm#ref_2033_16">Def</A></FONT> : char_array;
-+-                       <FONT COLOR=red><A NAME="ref_2034_24" HREF="terminal_interface-curses__adb.htm#ref_2033_16">Key</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2000_16">Defkey</A></FONT> (<FONT COLOR=red><A NAME="ref_2000_24" HREF="terminal_interface-curses__adb.htm#ref_2000_16">Def</A></FONT> : char_array;
-++                       <FONT COLOR=red><A NAME="ref_2001_24" HREF="terminal_interface-curses__adb.htm#ref_2000_16">Key</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Defkey, "define_key");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_2037_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1590_26">Definition</A>'Length);
-+-      <FONT COLOR=red><A NAME="ref_2038_7">Length</A></FONT> : size_t;
-++      <FONT COLOR=red><A NAME="ref_2004_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1596_26">Definition</A>'Length);
-++      <FONT COLOR=red><A NAME="ref_2005_7">Length</A></FONT> : size_t;
-+    <b>begin</b>
-+-      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1590_26">Definition</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2037_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2038_7">Length</A>);
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2033_16">Defkey</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2037_7">Txt</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1591_26">Key</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1596_26">Definition</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2004_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2005_7">Length</A>);
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2000_16">Defkey</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2004_7">Txt</A>, <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1597_26">Key</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1590_14">Define_Key</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1596_14">Define_Key</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2046_14" HREF="terminal_interface-curses__ads.htm#ref_1616_14">Un_Control</A></FONT> (<FONT COLOR=red><A NAME="ref_2046_26" HREF="terminal_interface-curses__ads.htm#ref_1616_26">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>;
-+-                         <FONT COLOR=red><A NAME="ref_2047_26" HREF="terminal_interface-curses__ads.htm#ref_1617_26">Str</A></FONT> : <b>out</b> String)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2013_14" HREF="terminal_interface-curses__ads.htm#ref_1622_14">Un_Control</A></FONT> (<FONT COLOR=red><A NAME="ref_2013_26" HREF="terminal_interface-curses__ads.htm#ref_1622_26">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>;
-++                         <FONT COLOR=red><A NAME="ref_2014_26" HREF="terminal_interface-curses__ads.htm#ref_1623_26">Str</A></FONT> : <b>out</b> String)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2049_16">Unctrl</A></FONT> (<FONT COLOR=red><A NAME="ref_2049_24" HREF="terminal_interface-curses__adb.htm#ref_2049_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> chars_ptr;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2016_16">Unctrl</A></FONT> (<FONT COLOR=red><A NAME="ref_2016_24" HREF="terminal_interface-curses__adb.htm#ref_2016_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> chars_ptr;
-+       <b>pragma</b> Import (C, Unctrl, "unctrl");
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses-aux__ads.htm#ref_116_14">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2049_16">Unctrl</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1616_26">Ch</A>)), <A HREF="terminal_interface-curses__ads.htm#ref_1617_26">Str</A>);
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1616_14">Un_Control</A>;
-++      <A HREF="terminal_interface-curses-aux__ads.htm#ref_116_14">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2016_16">Unctrl</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1622_26">Ch</A>)), <A HREF="terminal_interface-curses__ads.htm#ref_1623_26">Str</A>);
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1622_14">Un_Control</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_2055_13" HREF="terminal_interface-curses__ads.htm#ref_1621_13">Un_Control</A></FONT> (<FONT COLOR=red><A NAME="ref_2055_25" HREF="terminal_interface-curses__ads.htm#ref_1621_25">Ch</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>) <b>return</b> String
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_2022_13" HREF="terminal_interface-curses__ads.htm#ref_1627_13">Un_Control</A></FONT> (<FONT COLOR=red><A NAME="ref_2022_25" HREF="terminal_interface-curses__ads.htm#ref_1627_25">Ch</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>) <b>return</b> String
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2057_16">Unctrl</A></FONT> (<FONT COLOR=red><A NAME="ref_2057_24" HREF="terminal_interface-curses__adb.htm#ref_2057_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> chars_ptr;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2024_16">Unctrl</A></FONT> (<FONT COLOR=red><A NAME="ref_2024_24" HREF="terminal_interface-curses__adb.htm#ref_2024_16">Ch</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>) <b>return</b> chars_ptr;
-+       <b>pragma</b> Import (C, Unctrl, "unctrl");
-+    <b>begin</b>
-+-      <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_121_13">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2057_16">Unctrl</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1621_25">Ch</A>)));
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1621_13">Un_Control</A>;
-++      <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_121_13">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2024_16">Unctrl</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">AttrChar_To_Chtype</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1627_25">Ch</A>)));
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1627_13">Un_Control</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2063_14" HREF="terminal_interface-curses__ads.htm#ref_1627_14">Delay_Output</A></FONT> (<FONT COLOR=red><A NAME="ref_2063_28" HREF="terminal_interface-curses__ads.htm#ref_1627_28">Msecs</A></FONT> : <b>in</b> Natural)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2030_14" HREF="terminal_interface-curses__ads.htm#ref_1633_14">Delay_Output</A></FONT> (<FONT COLOR=red><A NAME="ref_2030_28" HREF="terminal_interface-curses__ads.htm#ref_1633_28">Msecs</A></FONT> : <b>in</b> Natural)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2065_16">Delayoutput</A></FONT> (<FONT COLOR=red><A NAME="ref_2065_29" HREF="terminal_interface-curses__adb.htm#ref_2065_16">Msecs</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2032_16">Delayoutput</A></FONT> (<FONT COLOR=red><A NAME="ref_2032_29" HREF="terminal_interface-curses__adb.htm#ref_2032_16">Msecs</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Delayoutput, "delay_output");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2065_16">Delayoutput</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1627_28">Msecs</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2032_16">Delayoutput</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1633_28">Msecs</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1627_14">Delay_Output</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1633_14">Delay_Output</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2073_14" HREF="terminal_interface-curses__ads.htm#ref_1632_14">Flush_Input</A></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2040_14" HREF="terminal_interface-curses__ads.htm#ref_1638_14">Flush_Input</A></FONT>
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2075_16">Flushinp</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2042_16">Flushinp</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Flushinp, "flushinp");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2075_16">Flushinp</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>  <FONT COLOR=green><EM>-- docu says that never happens, but...</EM></FONT>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2042_16">Flushinp</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>  <FONT COLOR=green><EM>-- docu says that never happens, but...</EM></FONT>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1632_14">Flush_Input</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1638_14">Flush_Input</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_2083_13" HREF="terminal_interface-curses__ads.htm#ref_1641_13">Baudrate</A></FONT> <b>return</b> Natural
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_2050_13" HREF="terminal_interface-curses__ads.htm#ref_1647_13">Baudrate</A></FONT> <b>return</b> Natural
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2085_16">Baud</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2052_16">Baud</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Baud, "baudrate");
-+    <b>begin</b>
-+-      <b>return</b> Natural (<A HREF="terminal_interface-curses__adb.htm#ref_2085_16">Baud</A>);
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1641_13">Baudrate</A>;
-++      <b>return</b> Natural (<A HREF="terminal_interface-curses__adb.htm#ref_2052_16">Baud</A>);
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1647_13">Baudrate</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_2091_13" HREF="terminal_interface-curses__ads.htm#ref_1646_13">Erase_Character</A></FONT> <b>return</b> Character
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_2058_13" HREF="terminal_interface-curses__ads.htm#ref_1652_13">Erase_Character</A></FONT> <b>return</b> Character
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2093_16">Erasechar</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2060_16">Erasechar</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Erasechar, "erasechar");
-+    <b>begin</b>
-+-      <b>return</b> Character'Val (<A HREF="terminal_interface-curses__adb.htm#ref_2093_16">Erasechar</A>);
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1646_13">Erase_Character</A>;
-++      <b>return</b> Character'Val (<A HREF="terminal_interface-curses__adb.htm#ref_2060_16">Erasechar</A>);
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1652_13">Erase_Character</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_2099_13" HREF="terminal_interface-curses__ads.htm#ref_1651_13">Kill_Character</A></FONT> <b>return</b> Character
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_2066_13" HREF="terminal_interface-curses__ads.htm#ref_1657_13">Kill_Character</A></FONT> <b>return</b> Character
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2101_16">Killchar</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2068_16">Killchar</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Killchar, "killchar");
-+    <b>begin</b>
-+-      <b>return</b> Character'Val (<A HREF="terminal_interface-curses__adb.htm#ref_2101_16">Killchar</A>);
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1651_13">Kill_Character</A>;
-++      <b>return</b> Character'Val (<A HREF="terminal_interface-curses__adb.htm#ref_2068_16">Killchar</A>);
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1657_13">Kill_Character</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_2107_13" HREF="terminal_interface-curses__ads.htm#ref_1656_13">Has_Insert_Character</A></FONT> <b>return</b> Boolean
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_2074_13" HREF="terminal_interface-curses__ads.htm#ref_1662_13">Has_Insert_Character</A></FONT> <b>return</b> Boolean
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2109_16">Has_Ic</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2076_16">Has_Ic</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>;
-+       <b>pragma</b> Import (C, Has_Ic, "has_ic");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2109_16">Has_Ic</A> = <A HREF="terminal_interface-curses__ads.htm#ref_1931_4">Curses_Bool_False</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2076_16">Has_Ic</A> = <A HREF="terminal_interface-curses__ads.htm#ref_1927_4">Curses_Bool_False</A> <b>then</b>
-+          <b>return</b> False;
-+       <b>else</b>
-+          <b>return</b> True;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1656_13">Has_Insert_Character</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1662_13">Has_Insert_Character</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_2119_13" HREF="terminal_interface-curses__ads.htm#ref_1661_13">Has_Insert_Line</A></FONT> <b>return</b> Boolean
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_2086_13" HREF="terminal_interface-curses__ads.htm#ref_1667_13">Has_Insert_Line</A></FONT> <b>return</b> Boolean
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2121_16">Has_Il</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2088_16">Has_Il</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>;
-+       <b>pragma</b> Import (C, Has_Il, "has_il");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2121_16">Has_Il</A> = <A HREF="terminal_interface-curses__ads.htm#ref_1931_4">Curses_Bool_False</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2088_16">Has_Il</A> = <A HREF="terminal_interface-curses__ads.htm#ref_1927_4">Curses_Bool_False</A> <b>then</b>
-+          <b>return</b> False;
-+       <b>else</b>
-+          <b>return</b> True;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1661_13">Has_Insert_Line</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1667_13">Has_Insert_Line</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_2131_13" HREF="terminal_interface-curses__ads.htm#ref_1666_13">Supported_Attributes</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_2098_13" HREF="terminal_interface-curses__ads.htm#ref_1672_13">Supported_Attributes</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2133_16">Termattrs</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2100_16">Termattrs</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_63_12">C_Chtype</A>;
-+       <b>pragma</b> Import (C, Termattrs, "termattrs");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_2136_7">Ch</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">Chtype_To_AttrChar</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2133_16">Termattrs</A>);
-++      <FONT COLOR=red><A NAME="ref_2103_7">Ch</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">Chtype_To_AttrChar</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2100_16">Termattrs</A>);
-+    <b>begin</b>
-+-      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_2136_7">Ch</A>.<A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1666_13">Supported_Attributes</A>;
-++      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_2103_7">Ch</A>.<A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1672_13">Supported_Attributes</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2141_14" HREF="terminal_interface-curses__ads.htm#ref_1671_14">Long_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_2141_25" HREF="terminal_interface-curses__ads.htm#ref_1671_25">Name</A></FONT> : <b>out</b> String)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2108_14" HREF="terminal_interface-curses__ads.htm#ref_1677_14">Long_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_2108_25" HREF="terminal_interface-curses__ads.htm#ref_1677_25">Name</A></FONT> : <b>out</b> String)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2143_16">Longname</A></FONT> <b>return</b> chars_ptr;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2110_16">Longname</A></FONT> <b>return</b> chars_ptr;
-+       <b>pragma</b> Import (C, Longname, "longname");
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses-aux__ads.htm#ref_116_14">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2143_16">Longname</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1671_25">Name</A>);
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1671_14">Long_Name</A>;
-++      <A HREF="terminal_interface-curses-aux__ads.htm#ref_116_14">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2110_16">Longname</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1677_25">Name</A>);
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1677_14">Long_Name</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_2149_13" HREF="terminal_interface-curses__ads.htm#ref_1675_13">Long_Name</A></FONT> <b>return</b> String
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_2116_13" HREF="terminal_interface-curses__ads.htm#ref_1681_13">Long_Name</A></FONT> <b>return</b> String
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2151_16">Longname</A></FONT> <b>return</b> chars_ptr;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2118_16">Longname</A></FONT> <b>return</b> chars_ptr;
-+       <b>pragma</b> Import (C, Longname, "longname");
-+    <b>begin</b>
-+-      <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_121_13">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2151_16">Longname</A>);
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1675_13">Long_Name</A>;
-++      <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_121_13">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2118_16">Longname</A>);
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1681_13">Long_Name</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2157_14" HREF="terminal_interface-curses__ads.htm#ref_1681_14">Terminal_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_2157_29" HREF="terminal_interface-curses__ads.htm#ref_1681_29">Name</A></FONT> : <b>out</b> String)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2124_14" HREF="terminal_interface-curses__ads.htm#ref_1687_14">Terminal_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_2124_29" HREF="terminal_interface-curses__ads.htm#ref_1687_29">Name</A></FONT> : <b>out</b> String)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2159_16">Termname</A></FONT> <b>return</b> chars_ptr;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2126_16">Termname</A></FONT> <b>return</b> chars_ptr;
-+       <b>pragma</b> Import (C, Termname, "termname");
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses-aux__ads.htm#ref_116_14">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2159_16">Termname</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1681_29">Name</A>);
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1681_14">Terminal_Name</A>;
-++      <A HREF="terminal_interface-curses-aux__ads.htm#ref_116_14">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2126_16">Termname</A>, <A HREF="terminal_interface-curses__ads.htm#ref_1687_29">Name</A>);
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1687_14">Terminal_Name</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_2165_13" HREF="terminal_interface-curses__ads.htm#ref_1685_13">Terminal_Name</A></FONT> <b>return</b> String
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_2132_13" HREF="terminal_interface-curses__ads.htm#ref_1691_13">Terminal_Name</A></FONT> <b>return</b> String
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2167_16">Termname</A></FONT> <b>return</b> chars_ptr;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2134_16">Termname</A></FONT> <b>return</b> chars_ptr;
-+       <b>pragma</b> Import (C, Termname, "termname");
-+    <b>begin</b>
-+-      <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_121_13">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2167_16">Termname</A>);
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1685_13">Terminal_Name</A>;
-++      <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_121_13">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2134_16">Termname</A>);
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1691_13">Terminal_Name</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2173_14" HREF="terminal_interface-curses__ads.htm#ref_1706_14">Init_Pair</A></FONT> (<FONT COLOR=red><A NAME="ref_2173_25" HREF="terminal_interface-curses__ads.htm#ref_1706_25">Pair</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_301_12">Redefinable_Color_Pair</A>;
-+-                        <FONT COLOR=red><A NAME="ref_2174_25" HREF="terminal_interface-curses__ads.htm#ref_1707_25">Fore</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>;
-+-                        <FONT COLOR=red><A NAME="ref_2175_25" HREF="terminal_interface-curses__ads.htm#ref_1708_25">Back</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>)
-+-   <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2177_16">Initpair</A></FONT> (<FONT COLOR=red><A NAME="ref_2177_26" HREF="terminal_interface-curses__adb.htm#ref_2177_16">Pair</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+-                         <FONT COLOR=red><A NAME="ref_2178_26" HREF="terminal_interface-curses__adb.htm#ref_2177_16">Fore</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+-                         <FONT COLOR=red><A NAME="ref_2179_26" HREF="terminal_interface-curses__adb.htm#ref_2177_16">Back</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2140_14" HREF="terminal_interface-curses__ads.htm#ref_1712_14">Init_Pair</A></FONT> (<FONT COLOR=red><A NAME="ref_2140_25" HREF="terminal_interface-curses__ads.htm#ref_1712_25">Pair</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_301_12">Redefinable_Color_Pair</A>;
-++                        <FONT COLOR=red><A NAME="ref_2141_25" HREF="terminal_interface-curses__ads.htm#ref_1713_25">Fore</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>;
-++                        <FONT COLOR=red><A NAME="ref_2142_25" HREF="terminal_interface-curses__ads.htm#ref_1714_25">Back</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>)
-++   <b>is</b>
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2144_16">Initpair</A></FONT> (<FONT COLOR=red><A NAME="ref_2144_26" HREF="terminal_interface-curses__adb.htm#ref_2144_16">Pair</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-++                         <FONT COLOR=red><A NAME="ref_2145_26" HREF="terminal_interface-curses__adb.htm#ref_2144_16">Fore</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-++                         <FONT COLOR=red><A NAME="ref_2146_26" HREF="terminal_interface-curses__adb.htm#ref_2144_16">Back</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Initpair, "init_pair");
-+    <b>begin</b>
-+-      <b>if</b> Integer (<A HREF="terminal_interface-curses__ads.htm#ref_1706_25">Pair</A>) &gt;= <A HREF="terminal_interface-curses__ads.htm#ref_424_13">Number_Of_Color_Pairs</A> <b>then</b>
-++      <b>if</b> Integer (<A HREF="terminal_interface-curses__ads.htm#ref_1712_25">Pair</A>) &gt;= <A HREF="terminal_interface-curses__ads.htm#ref_424_13">Number_Of_Color_Pairs</A> <b>then</b>
-+          <b>raise</b> Constraint_Error;
-+       <b>end</b> <b>if</b>;
-+-      <b>if</b> Integer (<A HREF="terminal_interface-curses__ads.htm#ref_1707_25">Fore</A>) &gt;= <A HREF="terminal_interface-curses__ads.htm#ref_421_13">Number_Of_Colors</A> <b>or</b> <b>else</b>
-+-        Integer (<A HREF="terminal_interface-curses__ads.htm#ref_1708_25">Back</A>) &gt;= <A HREF="terminal_interface-curses__ads.htm#ref_421_13">Number_Of_Colors</A> <b>then</b> <b>raise</b> Constraint_Error;
-++      <b>if</b> Integer (<A HREF="terminal_interface-curses__ads.htm#ref_1713_25">Fore</A>) &gt;= <A HREF="terminal_interface-curses__ads.htm#ref_421_13">Number_Of_Colors</A> <b>or</b> <b>else</b>
-++        Integer (<A HREF="terminal_interface-curses__ads.htm#ref_1714_25">Back</A>) &gt;= <A HREF="terminal_interface-curses__ads.htm#ref_421_13">Number_Of_Colors</A> <b>then</b> <b>raise</b> Constraint_Error;
-+       <b>end</b> <b>if</b>;
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2177_16">Initpair</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1706_25">Pair</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1707_25">Fore</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1708_25">Back</A>))
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2144_16">Initpair</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1712_25">Pair</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1713_25">Fore</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1714_25">Back</A>))
-+         = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1706_14">Init_Pair</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1712_14">Init_Pair</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2194_14" HREF="terminal_interface-curses__ads.htm#ref_1713_14">Pair_Content</A></FONT> (<FONT COLOR=red><A NAME="ref_2194_28" HREF="terminal_interface-curses__ads.htm#ref_1713_28">Pair</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>;
-+-                           <FONT COLOR=red><A NAME="ref_2195_28" HREF="terminal_interface-curses__ads.htm#ref_1714_28">Fore</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>;
-+-                           <FONT COLOR=red><A NAME="ref_2196_28" HREF="terminal_interface-curses__ads.htm#ref_1715_28">Back</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>)
-+-   <b>is</b>
-+-      <b>type</b> <FONT COLOR=red><A NAME="ref_2198_12">C_Short_Access</A></FONT> <b>is</b> <b>access</b> <b>all</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2199_16">Paircontent</A></FONT> (<FONT COLOR=red><A NAME="ref_2199_29" HREF="terminal_interface-curses__adb.htm#ref_2199_16">Pair</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+-                            <FONT COLOR=red><A NAME="ref_2200_29" HREF="terminal_interface-curses__adb.htm#ref_2199_16">Fp</A></FONT>   : <A HREF="terminal_interface-curses__adb.htm#ref_2198_12">C_Short_Access</A>;
-+-                            <FONT COLOR=red><A NAME="ref_2201_29" HREF="terminal_interface-curses__adb.htm#ref_2199_16">Bp</A></FONT>   : <A HREF="terminal_interface-curses__adb.htm#ref_2198_12">C_Short_Access</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2161_14" HREF="terminal_interface-curses__ads.htm#ref_1719_14">Pair_Content</A></FONT> (<FONT COLOR=red><A NAME="ref_2161_28" HREF="terminal_interface-curses__ads.htm#ref_1719_28">Pair</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>;
-++                           <FONT COLOR=red><A NAME="ref_2162_28" HREF="terminal_interface-curses__ads.htm#ref_1720_28">Fore</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>;
-++                           <FONT COLOR=red><A NAME="ref_2163_28" HREF="terminal_interface-curses__ads.htm#ref_1721_28">Back</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>)
-++   <b>is</b>
-++      <b>type</b> <FONT COLOR=red><A NAME="ref_2165_12">C_Short_Access</A></FONT> <b>is</b> <b>access</b> <b>all</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2166_16">Paircontent</A></FONT> (<FONT COLOR=red><A NAME="ref_2166_29" HREF="terminal_interface-curses__adb.htm#ref_2166_16">Pair</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-++                            <FONT COLOR=red><A NAME="ref_2167_29" HREF="terminal_interface-curses__adb.htm#ref_2166_16">Fp</A></FONT>   : <A HREF="terminal_interface-curses__adb.htm#ref_2165_12">C_Short_Access</A>;
-++                            <FONT COLOR=red><A NAME="ref_2168_29" HREF="terminal_interface-curses__adb.htm#ref_2166_16">Bp</A></FONT>   : <A HREF="terminal_interface-curses__adb.htm#ref_2165_12">C_Short_Access</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Paircontent, "pair_content");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_2204_7">F</A></FONT>, <FONT COLOR=red><A NAME="ref_2204_10">B</A></FONT> : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-++      <FONT COLOR=red><A NAME="ref_2171_7">F</A></FONT>, <FONT COLOR=red><A NAME="ref_2171_10">B</A></FONT> : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2199_16">Paircontent</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1713_28">Pair</A>), <A HREF="terminal_interface-curses__adb.htm#ref_2204_7">F</A>'<b>Access</b>, <A HREF="terminal_interface-curses__adb.htm#ref_2204_10">B</A>'<b>Access</b>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2166_16">Paircontent</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1719_28">Pair</A>), <A HREF="terminal_interface-curses__adb.htm#ref_2171_7">F</A>'<b>Access</b>, <A HREF="terminal_interface-curses__adb.htm#ref_2171_10">B</A>'<b>Access</b>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>else</b>
-+-         <A HREF="terminal_interface-curses__ads.htm#ref_1714_28">Fore</A> := <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2204_7">F</A>);
-+-         <A HREF="terminal_interface-curses__ads.htm#ref_1715_28">Back</A> := <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2204_10">B</A>);
-++         <A HREF="terminal_interface-curses__ads.htm#ref_1720_28">Fore</A> := <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2171_7">F</A>);
-++         <A HREF="terminal_interface-curses__ads.htm#ref_1721_28">Back</A> := <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2171_10">B</A>);
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1713_14">Pair_Content</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1719_14">Pair_Content</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_2214_13" HREF="terminal_interface-curses__ads.htm#ref_1720_13">Has_Colors</A></FONT> <b>return</b> Boolean
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_2181_13" HREF="terminal_interface-curses__ads.htm#ref_1726_13">Has_Colors</A></FONT> <b>return</b> Boolean
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2216_16">Hascolors</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2183_16">Hascolors</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>;
-+       <b>pragma</b> Import (C, Hascolors, "has_colors");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2216_16">Hascolors</A> = <A HREF="terminal_interface-curses__ads.htm#ref_1931_4">Curses_Bool_False</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2183_16">Hascolors</A> = <A HREF="terminal_interface-curses__ads.htm#ref_1927_4">Curses_Bool_False</A> <b>then</b>
-+          <b>return</b> False;
-+       <b>else</b>
-+          <b>return</b> True;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1720_13">Has_Colors</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1726_13">Has_Colors</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2226_14" HREF="terminal_interface-curses__ads.htm#ref_1725_14">Init_Color</A></FONT> (<FONT COLOR=red><A NAME="ref_2226_26" HREF="terminal_interface-curses__ads.htm#ref_1725_26">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>;
-+-                         <FONT COLOR=red><A NAME="ref_2227_26" HREF="terminal_interface-curses__ads.htm#ref_1726_26">Red</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
-+-                         <FONT COLOR=red><A NAME="ref_2228_26" HREF="terminal_interface-curses__ads.htm#ref_1727_26">Green</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
-+-                         <FONT COLOR=red><A NAME="ref_2229_26" HREF="terminal_interface-curses__ads.htm#ref_1728_26">Blue</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>)
-+-   <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2231_16">Initcolor</A></FONT> (<FONT COLOR=red><A NAME="ref_2231_27" HREF="terminal_interface-curses__adb.htm#ref_2231_16">Col</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+-                          <FONT COLOR=red><A NAME="ref_2232_27" HREF="terminal_interface-curses__adb.htm#ref_2231_16">Red</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+-                          <FONT COLOR=red><A NAME="ref_2233_27" HREF="terminal_interface-curses__adb.htm#ref_2231_16">Green</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+-                          <FONT COLOR=red><A NAME="ref_2234_27" HREF="terminal_interface-curses__adb.htm#ref_2231_16">Blue</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2193_14" HREF="terminal_interface-curses__ads.htm#ref_1731_14">Init_Color</A></FONT> (<FONT COLOR=red><A NAME="ref_2193_26" HREF="terminal_interface-curses__ads.htm#ref_1731_26">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>;
-++                         <FONT COLOR=red><A NAME="ref_2194_26" HREF="terminal_interface-curses__ads.htm#ref_1732_26">Red</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
-++                         <FONT COLOR=red><A NAME="ref_2195_26" HREF="terminal_interface-curses__ads.htm#ref_1733_26">Green</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
-++                         <FONT COLOR=red><A NAME="ref_2196_26" HREF="terminal_interface-curses__ads.htm#ref_1734_26">Blue</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>)
-++   <b>is</b>
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2198_16">Initcolor</A></FONT> (<FONT COLOR=red><A NAME="ref_2198_27" HREF="terminal_interface-curses__adb.htm#ref_2198_16">Col</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-++                          <FONT COLOR=red><A NAME="ref_2199_27" HREF="terminal_interface-curses__adb.htm#ref_2198_16">Red</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-++                          <FONT COLOR=red><A NAME="ref_2200_27" HREF="terminal_interface-curses__adb.htm#ref_2198_16">Green</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-++                          <FONT COLOR=red><A NAME="ref_2201_27" HREF="terminal_interface-curses__adb.htm#ref_2198_16">Blue</A></FONT>  : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Initcolor, "init_color");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2231_16">Initcolor</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1725_26">Color</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1726_26">Red</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1727_26">Green</A>),
-+-                    <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1728_26">Blue</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2198_16">Initcolor</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1731_26">Color</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1732_26">Red</A>), <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1733_26">Green</A>),
-++                    <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1734_26">Blue</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+             <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1725_14">Init_Color</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1731_14">Init_Color</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_2243_13" HREF="terminal_interface-curses__ads.htm#ref_1733_13">Can_Change_Color</A></FONT> <b>return</b> Boolean
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_2210_13" HREF="terminal_interface-curses__ads.htm#ref_1739_13">Can_Change_Color</A></FONT> <b>return</b> Boolean
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2245_16">Canchangecolor</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2212_16">Canchangecolor</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>;
-+       <b>pragma</b> Import (C, Canchangecolor, "can_change_color");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2245_16">Canchangecolor</A> = <A HREF="terminal_interface-curses__ads.htm#ref_1931_4">Curses_Bool_False</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2212_16">Canchangecolor</A> = <A HREF="terminal_interface-curses__ads.htm#ref_1927_4">Curses_Bool_False</A> <b>then</b>
-+          <b>return</b> False;
-+       <b>else</b>
-+          <b>return</b> True;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1733_13">Can_Change_Color</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1739_13">Can_Change_Color</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2255_14" HREF="terminal_interface-curses__ads.htm#ref_1738_14">Color_Content</A></FONT> (<FONT COLOR=red><A NAME="ref_2255_29" HREF="terminal_interface-curses__ads.htm#ref_1738_29">Color</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>;
-+-                            <FONT COLOR=red><A NAME="ref_2256_29" HREF="terminal_interface-curses__ads.htm#ref_1739_29">Red</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
-+-                            <FONT COLOR=red><A NAME="ref_2257_29" HREF="terminal_interface-curses__ads.htm#ref_1740_29">Green</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
-+-                            <FONT COLOR=red><A NAME="ref_2258_29" HREF="terminal_interface-curses__ads.htm#ref_1741_29">Blue</A></FONT>  : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2222_14" HREF="terminal_interface-curses__ads.htm#ref_1744_14">Color_Content</A></FONT> (<FONT COLOR=red><A NAME="ref_2222_29" HREF="terminal_interface-curses__ads.htm#ref_1744_29">Color</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>;
-++                            <FONT COLOR=red><A NAME="ref_2223_29" HREF="terminal_interface-curses__ads.htm#ref_1745_29">Red</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
-++                            <FONT COLOR=red><A NAME="ref_2224_29" HREF="terminal_interface-curses__ads.htm#ref_1746_29">Green</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
-++                            <FONT COLOR=red><A NAME="ref_2225_29" HREF="terminal_interface-curses__ads.htm#ref_1747_29">Blue</A></FONT>  : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>)
-+    <b>is</b>
-+-      <b>type</b> <FONT COLOR=red><A NAME="ref_2260_12">C_Short_Access</A></FONT> <b>is</b> <b>access</b> <b>all</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-++      <b>type</b> <FONT COLOR=red><A NAME="ref_2227_12">C_Short_Access</A></FONT> <b>is</b> <b>access</b> <b>all</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+ 
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2262_16">Colorcontent</A></FONT> (<FONT COLOR=red><A NAME="ref_2262_30" HREF="terminal_interface-curses__adb.htm#ref_2262_16">Color</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>; <FONT COLOR=red><A NAME="ref_2262_47" HREF="terminal_interface-curses__adb.htm#ref_2262_16">R</A></FONT>, <FONT COLOR=red><A NAME="ref_2262_50" HREF="terminal_interface-curses__adb.htm#ref_2262_16">G</A></FONT>, <FONT COLOR=red><A NAME="ref_2262_53" HREF="terminal_interface-curses__adb.htm#ref_2262_16">B</A></FONT> : <A HREF="terminal_interface-curses__adb.htm#ref_2260_12">C_Short_Access</A>)
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2229_16">Colorcontent</A></FONT> (<FONT COLOR=red><A NAME="ref_2229_30" HREF="terminal_interface-curses__adb.htm#ref_2229_16">Color</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>; <FONT COLOR=red><A NAME="ref_2229_47" HREF="terminal_interface-curses__adb.htm#ref_2229_16">R</A></FONT>, <FONT COLOR=red><A NAME="ref_2229_50" HREF="terminal_interface-curses__adb.htm#ref_2229_16">G</A></FONT>, <FONT COLOR=red><A NAME="ref_2229_53" HREF="terminal_interface-curses__adb.htm#ref_2229_16">B</A></FONT> : <A HREF="terminal_interface-curses__adb.htm#ref_2227_12">C_Short_Access</A>)
-+                              <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Colorcontent, "color_content");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_2266_7">R</A></FONT>, <FONT COLOR=red><A NAME="ref_2266_10">G</A></FONT>, <FONT COLOR=red><A NAME="ref_2266_13">B</A></FONT> : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-++      <FONT COLOR=red><A NAME="ref_2233_7">R</A></FONT>, <FONT COLOR=red><A NAME="ref_2233_10">G</A></FONT>, <FONT COLOR=red><A NAME="ref_2233_13">B</A></FONT> : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A>;
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2262_16">Colorcontent</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1738_29">Color</A>), <A HREF="terminal_interface-curses__adb.htm#ref_2266_7">R</A>'<b>Access</b>, <A HREF="terminal_interface-curses__adb.htm#ref_2266_10">G</A>'<b>Access</b>, <A HREF="terminal_interface-curses__adb.htm#ref_2266_13">B</A>'<b>Access</b>) =
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2229_16">Colorcontent</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_56_12">C_Short</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1744_29">Color</A>), <A HREF="terminal_interface-curses__adb.htm#ref_2233_7">R</A>'<b>Access</b>, <A HREF="terminal_interface-curses__adb.htm#ref_2233_10">G</A>'<b>Access</b>, <A HREF="terminal_interface-curses__adb.htm#ref_2233_13">B</A>'<b>Access</b>) =
-+         <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>else</b>
-+-         <A HREF="terminal_interface-curses__ads.htm#ref_1739_29">Red</A>   := <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2266_7">R</A>);
-+-         <A HREF="terminal_interface-curses__ads.htm#ref_1740_29">Green</A> := <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2266_10">G</A>);
-+-         <A HREF="terminal_interface-curses__ads.htm#ref_1741_29">Blue</A>  := <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2266_13">B</A>);
-++         <A HREF="terminal_interface-curses__ads.htm#ref_1745_29">Red</A>   := <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2233_7">R</A>);
-++         <A HREF="terminal_interface-curses__ads.htm#ref_1746_29">Green</A> := <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2233_10">G</A>);
-++         <A HREF="terminal_interface-curses__ads.htm#ref_1747_29">Blue</A>  := <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2233_13">B</A>);
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1738_14">Color_Content</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1744_14">Color_Content</A>;
-+ 
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2279_14" HREF="terminal_interface-curses__ads.htm#ref_1753_14">Save_Curses_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_2279_32" HREF="terminal_interface-curses__ads.htm#ref_1753_32">Mode</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1750_9">Curses_Mode</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2246_14" HREF="terminal_interface-curses__ads.htm#ref_1759_14">Save_Curses_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_2246_32" HREF="terminal_interface-curses__ads.htm#ref_1759_32">Mode</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1756_9">Curses_Mode</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2281_16">Def_Prog_Mode</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2248_16">Def_Prog_Mode</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Def_Prog_Mode, "def_prog_mode");
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2283_16">Def_Shell_Mode</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2250_16">Def_Shell_Mode</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Def_Shell_Mode, "def_shell_mode");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_2286_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <FONT COLOR=red><A NAME="ref_2253_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+    <b>begin</b>
-+-      <b>case</b> <A HREF="terminal_interface-curses__ads.htm#ref_1753_32">Mode</A> <b>is</b>
-+-         <b>when</b> <A HREF="terminal_interface-curses__ads.htm#ref_1750_25">Curses</A> =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_2286_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2281_16">Def_Prog_Mode</A>;
-+-         <b>when</b> <A HREF="terminal_interface-curses__ads.htm#ref_1750_33">Shell</A>  =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_2286_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2283_16">Def_Shell_Mode</A>;
-++      <b>case</b> <A HREF="terminal_interface-curses__ads.htm#ref_1759_32">Mode</A> <b>is</b>
-++         <b>when</b> <A HREF="terminal_interface-curses__ads.htm#ref_1756_25">Curses</A> =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_2253_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2248_16">Def_Prog_Mode</A>;
-++         <b>when</b> <A HREF="terminal_interface-curses__ads.htm#ref_1756_33">Shell</A>  =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_2253_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2250_16">Def_Shell_Mode</A>;
-+       <b>end</b> <b>case</b>;
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2286_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2253_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1753_14">Save_Curses_Mode</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1759_14">Save_Curses_Mode</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2297_14" HREF="terminal_interface-curses__ads.htm#ref_1759_14">Reset_Curses_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_2297_33" HREF="terminal_interface-curses__ads.htm#ref_1759_33">Mode</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1750_9">Curses_Mode</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2264_14" HREF="terminal_interface-curses__ads.htm#ref_1765_14">Reset_Curses_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_2264_33" HREF="terminal_interface-curses__ads.htm#ref_1765_33">Mode</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1756_9">Curses_Mode</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2299_16">Reset_Prog_Mode</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2266_16">Reset_Prog_Mode</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Reset_Prog_Mode, "reset_prog_mode");
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2301_16">Reset_Shell_Mode</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2268_16">Reset_Shell_Mode</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Reset_Shell_Mode, "reset_shell_mode");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_2304_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <FONT COLOR=red><A NAME="ref_2271_7">Err</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+    <b>begin</b>
-+-      <b>case</b> <A HREF="terminal_interface-curses__ads.htm#ref_1759_33">Mode</A> <b>is</b>
-+-         <b>when</b> <A HREF="terminal_interface-curses__ads.htm#ref_1750_25">Curses</A> =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_2304_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2299_16">Reset_Prog_Mode</A>;
-+-         <b>when</b> <A HREF="terminal_interface-curses__ads.htm#ref_1750_33">Shell</A>  =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_2304_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2301_16">Reset_Shell_Mode</A>;
-++      <b>case</b> <A HREF="terminal_interface-curses__ads.htm#ref_1765_33">Mode</A> <b>is</b>
-++         <b>when</b> <A HREF="terminal_interface-curses__ads.htm#ref_1756_25">Curses</A> =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_2271_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2266_16">Reset_Prog_Mode</A>;
-++         <b>when</b> <A HREF="terminal_interface-curses__ads.htm#ref_1756_33">Shell</A>  =&gt; <A HREF="terminal_interface-curses__adb.htm#ref_2271_7">Err</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2268_16">Reset_Shell_Mode</A>;
-+       <b>end</b> <b>case</b>;
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2304_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2271_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1759_14">Reset_Curses_Mode</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1765_14">Reset_Curses_Mode</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2315_14" HREF="terminal_interface-curses__ads.htm#ref_1765_14">Save_Terminal_State</A></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2282_14" HREF="terminal_interface-curses__ads.htm#ref_1771_14">Save_Terminal_State</A></FONT>
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2317_16">Savetty</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2284_16">Savetty</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Savetty, "savetty");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2317_16">Savetty</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2284_16">Savetty</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1765_14">Save_Terminal_State</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1771_14">Save_Terminal_State</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2325_14" HREF="terminal_interface-curses__ads.htm#ref_1770_14">Reset_Terminal_State</A></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2292_14" HREF="terminal_interface-curses__ads.htm#ref_1776_14">Reset_Terminal_State</A></FONT>
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2327_16">Resetty</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2294_16">Resetty</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Resetty, "resetty");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2327_16">Resetty</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2294_16">Resetty</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1770_14">Reset_Terminal_State</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1776_14">Reset_Terminal_State</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2335_14" HREF="terminal_interface-curses__ads.htm#ref_1783_14">Rip_Off_Lines</A></FONT> (<FONT COLOR=red><A NAME="ref_2335_29" HREF="terminal_interface-curses__ads.htm#ref_1783_29">Lines</A></FONT> : <b>in</b> Integer;
-+-                            <FONT COLOR=red><A NAME="ref_2336_29" HREF="terminal_interface-curses__ads.htm#ref_1784_29">Proc</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1774_9">Stdscr_Init_Proc</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2302_14" HREF="terminal_interface-curses__ads.htm#ref_1789_14">Rip_Off_Lines</A></FONT> (<FONT COLOR=red><A NAME="ref_2302_29" HREF="terminal_interface-curses__ads.htm#ref_1789_29">Lines</A></FONT> : <b>in</b> Integer;
-++                            <FONT COLOR=red><A NAME="ref_2303_29" HREF="terminal_interface-curses__ads.htm#ref_1790_29">Proc</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1780_9">Stdscr_Init_Proc</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2338_16">Ripoffline</A></FONT> (<FONT COLOR=red><A NAME="ref_2338_28" HREF="terminal_interface-curses__adb.htm#ref_2338_16">Lines</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-                           <FONT COLOR=red><A NAME="ref_2339_28" HREF="terminal_interface-curses__adb.htm#ref_2338_16">Proc</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_1774_9">Stdscr_Init_Proc</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2305_16">Ripoffline</A></FONT> (<FONT COLOR=red><A NAME="ref_2305_28" HREF="terminal_interface-curses__adb.htm#ref_2305_16">Lines</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++                           <FONT COLOR=red><A NAME="ref_2306_28" HREF="terminal_interface-curses__adb.htm#ref_2305_16">Proc</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_1780_9">Stdscr_Init_Proc</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Ripoffline, "_nc_ripoffline");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2338_16">Ripoffline</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1783_29">Lines</A>), <A HREF="terminal_interface-curses__ads.htm#ref_1784_29">Proc</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2305_16">Ripoffline</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1789_29">Lines</A>), <A HREF="terminal_interface-curses__ads.htm#ref_1790_29">Proc</A>) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1783_14">Rip_Off_Lines</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1789_14">Rip_Off_Lines</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2347_14" HREF="terminal_interface-curses__ads.htm#ref_1795_14">Set_Cursor_Visibility</A></FONT> (<FONT COLOR=red><A NAME="ref_2347_37" HREF="terminal_interface-curses__ads.htm#ref_1795_37">Visibility</A></FONT> : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_1792_9">Cursor_Visibility</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2314_14" HREF="terminal_interface-curses__ads.htm#ref_1801_14">Set_Cursor_Visibility</A></FONT> (<FONT COLOR=red><A NAME="ref_2314_37" HREF="terminal_interface-curses__ads.htm#ref_1801_37">Visibility</A></FONT> : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_1798_9">Cursor_Visibility</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2349_16">Curs_Set</A></FONT> (<FONT COLOR=red><A NAME="ref_2349_26" HREF="terminal_interface-curses__adb.htm#ref_2349_16">Curs</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2316_16">Curs_Set</A></FONT> (<FONT COLOR=red><A NAME="ref_2316_26" HREF="terminal_interface-curses__adb.htm#ref_2316_16">Curs</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Curs_Set, "curs_set");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_2352_7">Res</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <FONT COLOR=red><A NAME="ref_2319_7">Res</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+    <b>begin</b>
-+-      <A HREF="terminal_interface-curses__adb.htm#ref_2352_7">Res</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2349_16">Curs_Set</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1792_9">Cursor_Visibility</A>'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1795_37">Visibility</A>));
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2352_7">Res</A> /= <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+-         <A HREF="terminal_interface-curses__ads.htm#ref_1795_37">Visibility</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1792_9">Cursor_Visibility</A>'Val (<A HREF="terminal_interface-curses__adb.htm#ref_2352_7">Res</A>);
-++      <A HREF="terminal_interface-curses__adb.htm#ref_2319_7">Res</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2316_16">Curs_Set</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1798_9">Cursor_Visibility</A>'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1801_37">Visibility</A>));
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2319_7">Res</A> /= <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++         <A HREF="terminal_interface-curses__ads.htm#ref_1801_37">Visibility</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1798_9">Cursor_Visibility</A>'Val (<A HREF="terminal_interface-curses__adb.htm#ref_2319_7">Res</A>);
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1795_14">Set_Cursor_Visibility</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1801_14">Set_Cursor_Visibility</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2360_14" HREF="terminal_interface-curses__ads.htm#ref_1800_14">Nap_Milli_Seconds</A></FONT> (<FONT COLOR=red><A NAME="ref_2360_33" HREF="terminal_interface-curses__ads.htm#ref_1800_33">Ms</A></FONT> : <b>in</b> Natural)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2327_14" HREF="terminal_interface-curses__ads.htm#ref_1806_14">Nap_Milli_Seconds</A></FONT> (<FONT COLOR=red><A NAME="ref_2327_33" HREF="terminal_interface-curses__ads.htm#ref_1806_33">Ms</A></FONT> : <b>in</b> Natural)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2362_16">Napms</A></FONT> (<FONT COLOR=red><A NAME="ref_2362_23" HREF="terminal_interface-curses__adb.htm#ref_2362_16">Ms</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2329_16">Napms</A></FONT> (<FONT COLOR=red><A NAME="ref_2329_23" HREF="terminal_interface-curses__adb.htm#ref_2329_16">Ms</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Napms, "napms");
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2362_16">Napms</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1800_33">Ms</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2329_16">Napms</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1806_33">Ms</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1800_14">Nap_Milli_Seconds</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1806_14">Nap_Milli_Seconds</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_2371_13" HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_2338_13" HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
-++   <b>is</b>
-++      <FONT COLOR=red><A NAME="ref_2340_7">Result</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++      <b>pragma</b> Import (C, <A HREF="terminal_interface-curses__adb.htm#ref_2340_7">Result</A>, "stdscr");
-++   <b>begin</b>
-++      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_2340_7">Result</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_2346_13" HREF="terminal_interface-curses__ads.htm#ref_481_13">Current_Window</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
-+    <b>is</b>
-+-      <FONT COLOR=red><A NAME="ref_2373_7">Stdscr</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-      <b>pragma</b> Import (C, <A HREF="terminal_interface-curses__adb.htm#ref_2373_7">Stdscr</A>, "stdscr");
-++      <FONT COLOR=red><A NAME="ref_2348_7">Result</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++      <b>pragma</b> Import (C, <A HREF="terminal_interface-curses__adb.htm#ref_2348_7">Result</A>, "curscr");
-+    <b>begin</b>
-+-      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_2373_7">Stdscr</A>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-++      <b>return</b> <A HREF="terminal_interface-curses__adb.htm#ref_2348_7">Result</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_481_13">Current_Window</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_2379_13" HREF="terminal_interface-curses__ads.htm#ref_412_13">Lines</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_2354_13" HREF="terminal_interface-curses__ads.htm#ref_412_13">Lines</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>
-+    <b>is</b>
-+-      <FONT COLOR=red><A NAME="ref_2381_7">C_Lines</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-      <b>pragma</b> Import (C, <A HREF="terminal_interface-curses__adb.htm#ref_2381_7">C_Lines</A>, "LINES");
-++      <FONT COLOR=red><A NAME="ref_2356_7">Result</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>pragma</b> Import (C, <A HREF="terminal_interface-curses__adb.htm#ref_2356_7">Result</A>, "LINES");
-+    <b>begin</b>
-+-      <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2381_7">C_Lines</A>);
-++      <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2356_7">Result</A>);
-+    <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_412_13">Lines</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_2387_13" HREF="terminal_interface-curses__ads.htm#ref_415_13">Columns</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_2362_13" HREF="terminal_interface-curses__ads.htm#ref_415_13">Columns</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>
-+    <b>is</b>
-+-      <FONT COLOR=red><A NAME="ref_2389_7">C_Columns</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-      <b>pragma</b> Import (C, <A HREF="terminal_interface-curses__adb.htm#ref_2389_7">C_Columns</A>, "COLS");
-++      <FONT COLOR=red><A NAME="ref_2364_7">Result</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>pragma</b> Import (C, <A HREF="terminal_interface-curses__adb.htm#ref_2364_7">Result</A>, "COLS");
-+    <b>begin</b>
-+-      <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2389_7">C_Columns</A>);
-++      <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2364_7">Result</A>);
-+    <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_415_13">Columns</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_2395_13" HREF="terminal_interface-curses__ads.htm#ref_418_13">Tab_Size</A></FONT> <b>return</b> Natural
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_2370_13" HREF="terminal_interface-curses__ads.htm#ref_418_13">Tab_Size</A></FONT> <b>return</b> Natural
-+    <b>is</b>
-+-      <FONT COLOR=red><A NAME="ref_2397_7">C_Tab_Size</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-      <b>pragma</b> Import (C, <A HREF="terminal_interface-curses__adb.htm#ref_2397_7">C_Tab_Size</A>, "TABSIZE");
-++      <FONT COLOR=red><A NAME="ref_2372_7">Result</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>pragma</b> Import (C, <A HREF="terminal_interface-curses__adb.htm#ref_2372_7">Result</A>, "TABSIZE");
-+    <b>begin</b>
-+-      <b>return</b> Natural (<A HREF="terminal_interface-curses__adb.htm#ref_2397_7">C_Tab_Size</A>);
-++      <b>return</b> Natural (<A HREF="terminal_interface-curses__adb.htm#ref_2372_7">Result</A>);
-+    <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_418_13">Tab_Size</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_2403_13" HREF="terminal_interface-curses__ads.htm#ref_421_13">Number_Of_Colors</A></FONT> <b>return</b> Natural
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_2378_13" HREF="terminal_interface-curses__ads.htm#ref_421_13">Number_Of_Colors</A></FONT> <b>return</b> Natural
-+    <b>is</b>
-+-      <FONT COLOR=red><A NAME="ref_2405_7">C_Number_Of_Colors</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-      <b>pragma</b> Import (C, <A HREF="terminal_interface-curses__adb.htm#ref_2405_7">C_Number_Of_Colors</A>, "COLORS");
-++      <FONT COLOR=red><A NAME="ref_2380_7">Result</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>pragma</b> Import (C, <A HREF="terminal_interface-curses__adb.htm#ref_2380_7">Result</A>, "COLORS");
-+    <b>begin</b>
-+-      <b>return</b> Natural (<A HREF="terminal_interface-curses__adb.htm#ref_2405_7">C_Number_Of_Colors</A>);
-++      <b>return</b> Natural (<A HREF="terminal_interface-curses__adb.htm#ref_2380_7">Result</A>);
-+    <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_421_13">Number_Of_Colors</A>;
-+ 
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_2411_13" HREF="terminal_interface-curses__ads.htm#ref_424_13">Number_Of_Color_Pairs</A></FONT> <b>return</b> Natural
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_2386_13" HREF="terminal_interface-curses__ads.htm#ref_424_13">Number_Of_Color_Pairs</A></FONT> <b>return</b> Natural
-+    <b>is</b>
-+-      <FONT COLOR=red><A NAME="ref_2413_7">C_Number_Of_Color_Pairs</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-      <b>pragma</b> Import (C, <A HREF="terminal_interface-curses__adb.htm#ref_2413_7">C_Number_Of_Color_Pairs</A>, "COLOR_PAIRS");
-++      <FONT COLOR=red><A NAME="ref_2388_7">Result</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>pragma</b> Import (C, <A HREF="terminal_interface-curses__adb.htm#ref_2388_7">Result</A>, "COLOR_PAIRS");
-+    <b>begin</b>
-+-      <b>return</b> Natural (<A HREF="terminal_interface-curses__adb.htm#ref_2413_7">C_Number_Of_Color_Pairs</A>);
-++      <b>return</b> Natural (<A HREF="terminal_interface-curses__adb.htm#ref_2388_7">Result</A>);
-+    <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_424_13">Number_Of_Color_Pairs</A>;
-++
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2419_14" HREF="terminal_interface-curses__ads.htm#ref_1808_14">Transform_Coordinates</A></FONT>
-+-     (<FONT COLOR=red><A NAME="ref_2420_7" HREF="terminal_interface-curses__ads.htm#ref_1809_7">W</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_2421_7" HREF="terminal_interface-curses__ads.htm#ref_1810_7">Line</A></FONT>   : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_2422_7" HREF="terminal_interface-curses__ads.htm#ref_1811_7">Column</A></FONT> : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_2423_7" HREF="terminal_interface-curses__ads.htm#ref_1812_7">Dir</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1807_9">Transform_Direction</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1807_33">From_Screen</A>)
-+-   <b>is</b>
-+-      <b>type</b> <FONT COLOR=red><A NAME="ref_2425_12">Int_Access</A></FONT> <b>is</b> <b>access</b> <b>all</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2426_16">Transform</A></FONT> (<FONT COLOR=red><A NAME="ref_2426_27" HREF="terminal_interface-curses__adb.htm#ref_2426_16">W</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                          <FONT COLOR=red><A NAME="ref_2427_27" HREF="terminal_interface-curses__adb.htm#ref_2426_16">Y</A></FONT>, <FONT COLOR=red><A NAME="ref_2427_30" HREF="terminal_interface-curses__adb.htm#ref_2426_16">X</A></FONT> : <A HREF="terminal_interface-curses__adb.htm#ref_2425_12">Int_Access</A>;
-+-                          <FONT COLOR=red><A NAME="ref_2428_27" HREF="terminal_interface-curses__adb.htm#ref_2426_16">Dir</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2395_14" HREF="terminal_interface-curses__ads.htm#ref_1814_14">Transform_Coordinates</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_2396_7" HREF="terminal_interface-curses__ads.htm#ref_1815_7">W</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_2397_7" HREF="terminal_interface-curses__ads.htm#ref_1816_7">Line</A></FONT>   : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_2398_7" HREF="terminal_interface-curses__ads.htm#ref_1817_7">Column</A></FONT> : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_2399_7" HREF="terminal_interface-curses__ads.htm#ref_1818_7">Dir</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1813_9">Transform_Direction</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1813_33">From_Screen</A>)
-++   <b>is</b>
-++      <b>type</b> <FONT COLOR=red><A NAME="ref_2401_12">Int_Access</A></FONT> <b>is</b> <b>access</b> <b>all</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2402_16">Transform</A></FONT> (<FONT COLOR=red><A NAME="ref_2402_27" HREF="terminal_interface-curses__adb.htm#ref_2402_16">W</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                          <FONT COLOR=red><A NAME="ref_2403_27" HREF="terminal_interface-curses__adb.htm#ref_2402_16">Y</A></FONT>, <FONT COLOR=red><A NAME="ref_2403_30" HREF="terminal_interface-curses__adb.htm#ref_2402_16">X</A></FONT> : <A HREF="terminal_interface-curses__adb.htm#ref_2401_12">Int_Access</A>;
-++                          <FONT COLOR=red><A NAME="ref_2404_27" HREF="terminal_interface-curses__adb.htm#ref_2402_16">Dir</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, Transform, "wmouse_trafo");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_2431_7">X</A></FONT> : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1811_7">Column</A>);
-+-      <FONT COLOR=red><A NAME="ref_2432_7">Y</A></FONT> : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1810_7">Line</A>);
-+-      <FONT COLOR=red><A NAME="ref_2433_7">D</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1931_4">Curses_Bool_False</A>;
-+-      <FONT COLOR=red><A NAME="ref_2434_7">R</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <FONT COLOR=red><A NAME="ref_2407_7">X</A></FONT> : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1817_7">Column</A>);
-++      <FONT COLOR=red><A NAME="ref_2408_7">Y</A></FONT> : <b>aliased</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1816_7">Line</A>);
-++      <FONT COLOR=red><A NAME="ref_2409_7">D</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1927_4">Curses_Bool_False</A>;
-++      <FONT COLOR=red><A NAME="ref_2410_7">R</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_1812_7">Dir</A> = <A HREF="terminal_interface-curses__ads.htm#ref_1807_46">To_Screen</A> <b>then</b>
-+-         <A HREF="terminal_interface-curses__adb.htm#ref_2433_7">D</A> := 1;
-++      <b>if</b> <A HREF="terminal_interface-curses__ads.htm#ref_1818_7">Dir</A> = <A HREF="terminal_interface-curses__ads.htm#ref_1813_46">To_Screen</A> <b>then</b>
-++         <A HREF="terminal_interface-curses__adb.htm#ref_2409_7">D</A> := 1;
-+       <b>end</b> <b>if</b>;
-+-      <A HREF="terminal_interface-curses__adb.htm#ref_2434_7">R</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2426_16">Transform</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1809_7">W</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2432_7">Y</A>'<b>Access</b>, <A HREF="terminal_interface-curses__adb.htm#ref_2431_7">X</A>'<b>Access</b>, <A HREF="terminal_interface-curses__adb.htm#ref_2433_7">D</A>);
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2434_7">R</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">Curses_False</A> <b>then</b>
-++      <A HREF="terminal_interface-curses__adb.htm#ref_2410_7">R</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2402_16">Transform</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1815_7">W</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2408_7">Y</A>'<b>Access</b>, <A HREF="terminal_interface-curses__adb.htm#ref_2407_7">X</A>'<b>Access</b>, <A HREF="terminal_interface-curses__adb.htm#ref_2409_7">D</A>);
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2410_7">R</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_75_4">Curses_False</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>else</b>
-+-         <A HREF="terminal_interface-curses__ads.htm#ref_1810_7">Line</A>   := <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2432_7">Y</A>);
-+-         <A HREF="terminal_interface-curses__ads.htm#ref_1811_7">Column</A> := <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2431_7">X</A>);
-++         <A HREF="terminal_interface-curses__ads.htm#ref_1816_7">Line</A>   := <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2408_7">Y</A>);
-++         <A HREF="terminal_interface-curses__ads.htm#ref_1817_7">Column</A> := <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2407_7">X</A>);
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1808_14">Transform_Coordinates</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1814_14">Transform_Coordinates</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2448_14" HREF="terminal_interface-curses__ads.htm#ref_1825_14">Use_Default_Colors</A></FONT> <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2449_16">C_Use_Default_Colors</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2424_14" HREF="terminal_interface-curses__ads.htm#ref_1831_14">Use_Default_Colors</A></FONT> <b>is</b>
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2425_16">C_Use_Default_Colors</A></FONT> <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, C_Use_Default_Colors, "use_default_colors");
-+-      <FONT COLOR=red><A NAME="ref_2451_7">Err</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2449_16">C_Use_Default_Colors</A>;
-++      <FONT COLOR=red><A NAME="ref_2427_7">Err</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2425_16">C_Use_Default_Colors</A>;
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2451_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2427_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1825_14">Use_Default_Colors</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1831_14">Use_Default_Colors</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2458_14" HREF="terminal_interface-curses__ads.htm#ref_1830_14">Assume_Default_Colors</A></FONT> (<FONT COLOR=red><A NAME="ref_2458_37" HREF="terminal_interface-curses__ads.htm#ref_1830_37">Fore</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := <A HREF="terminal_interface-curses__ads.htm#ref_285_4">Default_Color</A>;
-+-                                    <FONT COLOR=red><A NAME="ref_2459_37" HREF="terminal_interface-curses__ads.htm#ref_1831_37">Back</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := <A HREF="terminal_interface-curses__ads.htm#ref_285_4">Default_Color</A>)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2434_14" HREF="terminal_interface-curses__ads.htm#ref_1836_14">Assume_Default_Colors</A></FONT> (<FONT COLOR=red><A NAME="ref_2434_37" HREF="terminal_interface-curses__ads.htm#ref_1836_37">Fore</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := <A HREF="terminal_interface-curses__ads.htm#ref_285_4">Default_Color</A>;
-++                                    <FONT COLOR=red><A NAME="ref_2435_37" HREF="terminal_interface-curses__ads.htm#ref_1837_37">Back</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := <A HREF="terminal_interface-curses__ads.htm#ref_285_4">Default_Color</A>)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2461_16">C_Assume_Default_Colors</A></FONT> (<FONT COLOR=red><A NAME="ref_2461_41" HREF="terminal_interface-curses__adb.htm#ref_2461_16">Fore</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-                                        <FONT COLOR=red><A NAME="ref_2462_41" HREF="terminal_interface-curses__adb.htm#ref_2461_16">Back</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2437_16">C_Assume_Default_Colors</A></FONT> (<FONT COLOR=red><A NAME="ref_2437_41" HREF="terminal_interface-curses__adb.htm#ref_2437_16">Fore</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++                                        <FONT COLOR=red><A NAME="ref_2438_41" HREF="terminal_interface-curses__adb.htm#ref_2437_16">Back</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, C_Assume_Default_Colors, "assume_default_colors");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_2465_7">Err</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2461_16">C_Assume_Default_Colors</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1830_37">Fore</A>),
-+-                                                       <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1831_37">Back</A>));
-++      <FONT COLOR=red><A NAME="ref_2441_7">Err</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> := <A HREF="terminal_interface-curses__adb.htm#ref_2437_16">C_Assume_Default_Colors</A> (<A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1836_37">Fore</A>),
-++                                                       <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1837_37">Back</A>));
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2465_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2441_7">Err</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1830_14">Assume_Default_Colors</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1836_14">Assume_Default_Colors</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_2473_13" HREF="terminal_interface-curses__ads.htm#ref_1840_13">Curses_Version</A></FONT> <b>return</b> String
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_2449_13" HREF="terminal_interface-curses__ads.htm#ref_1846_13">Curses_Version</A></FONT> <b>return</b> String
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2475_16">curses_versionC</A></FONT> <b>return</b> chars_ptr;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2451_16">curses_versionC</A></FONT> <b>return</b> chars_ptr;
-+       <b>pragma</b> Import (C, curses_versionC, "curses_version");
-+-      <FONT COLOR=red><A NAME="ref_2477_7">Result</A></FONT> : <b>constant</b> chars_ptr := <A HREF="terminal_interface-curses__adb.htm#ref_2475_16">curses_versionC</A>;
-++      <FONT COLOR=red><A NAME="ref_2453_7">Result</A></FONT> : <b>constant</b> chars_ptr := <A HREF="terminal_interface-curses__adb.htm#ref_2451_16">curses_versionC</A>;
-+    <b>begin</b>
-+-      <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_121_13">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2477_7">Result</A>);
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1840_13">Curses_Version</A>;
-++      <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_121_13">Fill_String</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2453_7">Result</A>);
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1846_13">Curses_Version</A>;
-++<FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2458_14" HREF="terminal_interface-curses__ads.htm#ref_1859_14">Curses_Free_All</A></FONT> <b>is</b>
-++      <b>procedure</b> <FONT COLOR=red><A NAME="ref_2459_17">curses_freeall</A></FONT>;
-++      <b>pragma</b> Import (C, curses_freeall, "_nc_freeall");
-++   <b>begin</b>
-++      <FONT COLOR=green><EM>--  Use this only for testing: you cannot use curses after calling it,</EM></FONT>
-++      <FONT COLOR=green><EM>--  so it has to be the "last" thing done before exiting the program.</EM></FONT>
-++      <FONT COLOR=green><EM>--  This will not really free ALL of memory used by curses.  That is</EM></FONT>
-++      <FONT COLOR=green><EM>--  because it cannot free the memory used for stdout's setbuf.  The</EM></FONT>
-++      <FONT COLOR=green><EM>--  _nc_free_and_exit() procedure can do that, but it can be invoked</EM></FONT>
-++      <FONT COLOR=green><EM>--  safely only from C - and again, that only as the "last" thing done</EM></FONT>
-++      <FONT COLOR=green><EM>--  before exiting the program.</EM></FONT>
-++      <A HREF="terminal_interface-curses__adb.htm#ref_2459_17">curses_freeall</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1859_14">Curses_Free_All</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>function</b> <FONT COLOR=red><A NAME="ref_2482_13" HREF="terminal_interface-curses__ads.htm#ref_1845_13">Use_Extended_Names</A></FONT> (<FONT COLOR=red><A NAME="ref_2482_33" HREF="terminal_interface-curses__ads.htm#ref_1845_33">Enable</A></FONT> : Boolean) <b>return</b> Boolean
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_2472_13" HREF="terminal_interface-curses__ads.htm#ref_1851_13">Use_Extended_Names</A></FONT> (<FONT COLOR=red><A NAME="ref_2472_33" HREF="terminal_interface-curses__ads.htm#ref_1851_33">Enable</A></FONT> : Boolean) <b>return</b> Boolean
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2484_16">use_extended_namesC</A></FONT> (<FONT COLOR=red><A NAME="ref_2484_37" HREF="terminal_interface-curses__adb.htm#ref_2484_16">e</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2474_16">use_extended_namesC</A></FONT> (<FONT COLOR=red><A NAME="ref_2474_37" HREF="terminal_interface-curses__adb.htm#ref_2474_16">e</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, use_extended_namesC, "use_extended_names");
-+ 
-+-      <FONT COLOR=red><A NAME="ref_2487_7">Res</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> :=
-+-         <A HREF="terminal_interface-curses__adb.htm#ref_2484_16">use_extended_namesC</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1845_33">Enable</A>)));
-++      <FONT COLOR=red><A NAME="ref_2477_7">Res</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> :=
-++         <A HREF="terminal_interface-curses__adb.htm#ref_2474_16">use_extended_namesC</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> (Boolean'Pos (<A HREF="terminal_interface-curses__ads.htm#ref_1851_33">Enable</A>)));
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2487_7">Res</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1931_4">Curses_Bool_False</A>) <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2477_7">Res</A> = <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1927_4">Curses_Bool_False</A>) <b>then</b>
-+          <b>return</b> False;
-+       <b>else</b>
-+          <b>return</b> True;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1845_13">Use_Extended_Names</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1851_13">Use_Extended_Names</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2497_14" HREF="terminal_interface-curses__ads.htm#ref_1853_14">Screen_Dump_To_File</A></FONT> (<FONT COLOR=red><A NAME="ref_2497_35" HREF="terminal_interface-curses__ads.htm#ref_1853_35">Filename</A></FONT> : <b>in</b> String)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2487_14" HREF="terminal_interface-curses__ads.htm#ref_1867_14">Screen_Dump_To_File</A></FONT> (<FONT COLOR=red><A NAME="ref_2487_35" HREF="terminal_interface-curses__ads.htm#ref_1867_35">Filename</A></FONT> : <b>in</b> String)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2499_16">scr_dump</A></FONT> (<FONT COLOR=red><A NAME="ref_2499_26" HREF="terminal_interface-curses__adb.htm#ref_2499_16">f</A></FONT> : char_array) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2489_16">scr_dump</A></FONT> (<FONT COLOR=red><A NAME="ref_2489_26" HREF="terminal_interface-curses__adb.htm#ref_2489_16">f</A></FONT> : char_array) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, scr_dump, "scr_dump");
-+-      <FONT COLOR=red><A NAME="ref_2501_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1853_35">Filename</A>'Length);
-+-      <FONT COLOR=red><A NAME="ref_2502_7">Length</A></FONT> : size_t;
-++      <FONT COLOR=red><A NAME="ref_2491_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1867_35">Filename</A>'Length);
-++      <FONT COLOR=red><A NAME="ref_2492_7">Length</A></FONT> : size_t;
-+    <b>begin</b>
-+-      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1853_35">Filename</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2501_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2502_7">Length</A>);
-+-      <b>if</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> = <A HREF="terminal_interface-curses__adb.htm#ref_2499_16">scr_dump</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2501_7">Txt</A>) <b>then</b>
-++      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1867_35">Filename</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2491_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2492_7">Length</A>);
-++      <b>if</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> = <A HREF="terminal_interface-curses__adb.htm#ref_2489_16">scr_dump</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2491_7">Txt</A>) <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1853_14">Screen_Dump_To_File</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1867_14">Screen_Dump_To_File</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2510_14" HREF="terminal_interface-curses__ads.htm#ref_1857_14">Screen_Restore_From_File</A></FONT> (<FONT COLOR=red><A NAME="ref_2510_40" HREF="terminal_interface-curses__ads.htm#ref_1857_40">Filename</A></FONT> : <b>in</b> String)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2500_14" HREF="terminal_interface-curses__ads.htm#ref_1871_14">Screen_Restore_From_File</A></FONT> (<FONT COLOR=red><A NAME="ref_2500_40" HREF="terminal_interface-curses__ads.htm#ref_1871_40">Filename</A></FONT> : <b>in</b> String)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2512_16">scr_restore</A></FONT> (<FONT COLOR=red><A NAME="ref_2512_29" HREF="terminal_interface-curses__adb.htm#ref_2512_16">f</A></FONT> : char_array) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2502_16">scr_restore</A></FONT> (<FONT COLOR=red><A NAME="ref_2502_29" HREF="terminal_interface-curses__adb.htm#ref_2502_16">f</A></FONT> : char_array) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, scr_restore, "scr_restore");
-+-      <FONT COLOR=red><A NAME="ref_2514_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1857_40">Filename</A>'Length);
-+-      <FONT COLOR=red><A NAME="ref_2515_7">Length</A></FONT> : size_t;
-++      <FONT COLOR=red><A NAME="ref_2504_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1871_40">Filename</A>'Length);
-++      <FONT COLOR=red><A NAME="ref_2505_7">Length</A></FONT> : size_t;
-+    <b>begin</b>
-+-      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1857_40">Filename</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2514_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2515_7">Length</A>);
-+-      <b>if</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> = <A HREF="terminal_interface-curses__adb.htm#ref_2512_16">scr_restore</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2514_7">Txt</A>)  <b>then</b>
-++      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1871_40">Filename</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2504_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2505_7">Length</A>);
-++      <b>if</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> = <A HREF="terminal_interface-curses__adb.htm#ref_2502_16">scr_restore</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2504_7">Txt</A>)  <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1857_14">Screen_Restore_From_File</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1871_14">Screen_Restore_From_File</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2523_14" HREF="terminal_interface-curses__ads.htm#ref_1861_14">Screen_Init_From_File</A></FONT> (<FONT COLOR=red><A NAME="ref_2523_37" HREF="terminal_interface-curses__ads.htm#ref_1861_37">Filename</A></FONT> : <b>in</b> String)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2513_14" HREF="terminal_interface-curses__ads.htm#ref_1875_14">Screen_Init_From_File</A></FONT> (<FONT COLOR=red><A NAME="ref_2513_37" HREF="terminal_interface-curses__ads.htm#ref_1875_37">Filename</A></FONT> : <b>in</b> String)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2525_16">scr_init</A></FONT> (<FONT COLOR=red><A NAME="ref_2525_26" HREF="terminal_interface-curses__adb.htm#ref_2525_16">f</A></FONT> : char_array) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2515_16">scr_init</A></FONT> (<FONT COLOR=red><A NAME="ref_2515_26" HREF="terminal_interface-curses__adb.htm#ref_2515_16">f</A></FONT> : char_array) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, scr_init, "scr_init");
-+-      <FONT COLOR=red><A NAME="ref_2527_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1861_37">Filename</A>'Length);
-+-      <FONT COLOR=red><A NAME="ref_2528_7">Length</A></FONT> : size_t;
-++      <FONT COLOR=red><A NAME="ref_2517_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1875_37">Filename</A>'Length);
-++      <FONT COLOR=red><A NAME="ref_2518_7">Length</A></FONT> : size_t;
-+    <b>begin</b>
-+-      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1861_37">Filename</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2527_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2528_7">Length</A>);
-+-      <b>if</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> = <A HREF="terminal_interface-curses__adb.htm#ref_2525_16">scr_init</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2527_7">Txt</A>) <b>then</b>
-++      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1875_37">Filename</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2517_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2518_7">Length</A>);
-++      <b>if</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> = <A HREF="terminal_interface-curses__adb.htm#ref_2515_16">scr_init</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2517_7">Txt</A>) <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1861_14">Screen_Init_From_File</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1875_14">Screen_Init_From_File</A>;
-+ 
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2536_14" HREF="terminal_interface-curses__ads.htm#ref_1865_14">Screen_Set_File</A></FONT> (<FONT COLOR=red><A NAME="ref_2536_31" HREF="terminal_interface-curses__ads.htm#ref_1865_31">Filename</A></FONT> : <b>in</b> String)
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2526_14" HREF="terminal_interface-curses__ads.htm#ref_1879_14">Screen_Set_File</A></FONT> (<FONT COLOR=red><A NAME="ref_2526_31" HREF="terminal_interface-curses__ads.htm#ref_1879_31">Filename</A></FONT> : <b>in</b> String)
-+    <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2538_16">scr_set</A></FONT> (<FONT COLOR=red><A NAME="ref_2538_25" HREF="terminal_interface-curses__adb.htm#ref_2538_16">f</A></FONT> : char_array) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2528_16">scr_set</A></FONT> (<FONT COLOR=red><A NAME="ref_2528_25" HREF="terminal_interface-curses__adb.htm#ref_2528_16">f</A></FONT> : char_array) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, scr_set, "scr_set");
-+-      <FONT COLOR=red><A NAME="ref_2540_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1865_31">Filename</A>'Length);
-+-      <FONT COLOR=red><A NAME="ref_2541_7">Length</A></FONT> : size_t;
-++      <FONT COLOR=red><A NAME="ref_2530_7">Txt</A></FONT>    : char_array (0 .. <A HREF="terminal_interface-curses__ads.htm#ref_1879_31">Filename</A>'Length);
-++      <FONT COLOR=red><A NAME="ref_2531_7">Length</A></FONT> : size_t;
-+    <b>begin</b>
-+-      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1865_31">Filename</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2540_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2541_7">Length</A>);
-+-      <b>if</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> = <A HREF="terminal_interface-curses__adb.htm#ref_2538_16">scr_set</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2540_7">Txt</A>) <b>then</b>
-++      To_C (<A HREF="terminal_interface-curses__ads.htm#ref_1879_31">Filename</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2530_7">Txt</A>, <A HREF="terminal_interface-curses__adb.htm#ref_2531_7">Length</A>);
-++      <b>if</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> = <A HREF="terminal_interface-curses__adb.htm#ref_2528_16">scr_set</A> (<A HREF="terminal_interface-curses__adb.htm#ref_2530_7">Txt</A>) <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1865_14">Screen_Set_File</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1879_14">Screen_Set_File</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2549_14" HREF="terminal_interface-curses__ads.htm#ref_1897_14">Resize</A></FONT> (<FONT COLOR=red><A NAME="ref_2549_22" HREF="terminal_interface-curses__ads.htm#ref_1897_22">Win</A></FONT>               : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_475_13">Standard_Window</A>;
-+-                     <FONT COLOR=red><A NAME="ref_2550_22" HREF="terminal_interface-curses__ads.htm#ref_1898_22">Number_Of_Lines</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-+-                     <FONT COLOR=red><A NAME="ref_2551_22" HREF="terminal_interface-curses__ads.htm#ref_1899_22">Number_Of_Columns</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>) <b>is</b>
-+-      <b>function</b> <FONT COLOR=red><A NAME="ref_2552_16">wresize</A></FONT> (<FONT COLOR=red><A NAME="ref_2552_25" HREF="terminal_interface-curses__adb.htm#ref_2552_16">win</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                        <FONT COLOR=red><A NAME="ref_2553_25" HREF="terminal_interface-curses__adb.htm#ref_2552_16">lines</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+-                        <FONT COLOR=red><A NAME="ref_2554_25" HREF="terminal_interface-curses__adb.htm#ref_2552_16">columns</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_2539_14" HREF="terminal_interface-curses__ads.htm#ref_1911_14">Resize</A></FONT> (<FONT COLOR=red><A NAME="ref_2539_22" HREF="terminal_interface-curses__ads.htm#ref_1911_22">Win</A></FONT>               : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                     <FONT COLOR=red><A NAME="ref_2540_22" HREF="terminal_interface-curses__ads.htm#ref_1912_22">Number_Of_Lines</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-++                     <FONT COLOR=red><A NAME="ref_2541_22" HREF="terminal_interface-curses__ads.htm#ref_1913_22">Number_Of_Columns</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>) <b>is</b>
-++      <b>function</b> <FONT COLOR=red><A NAME="ref_2542_16">wresize</A></FONT> (<FONT COLOR=red><A NAME="ref_2542_25" HREF="terminal_interface-curses__adb.htm#ref_2542_16">win</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                        <FONT COLOR=red><A NAME="ref_2543_25" HREF="terminal_interface-curses__adb.htm#ref_2542_16">lines</A></FONT>   : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-++                        <FONT COLOR=red><A NAME="ref_2544_25" HREF="terminal_interface-curses__adb.htm#ref_2542_16">columns</A></FONT> : <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>) <b>return</b> <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A>;
-+       <b>pragma</b> Import (C, wresize);
-+    <b>begin</b>
-+-      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2552_16">wresize</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1897_22">Win</A>,
-+-                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1898_22">Number_Of_Lines</A>),
-+-                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1899_22">Number_Of_Columns</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-++      <b>if</b> <A HREF="terminal_interface-curses__adb.htm#ref_2542_16">wresize</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1911_22">Win</A>,
-++                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1912_22">Number_Of_Lines</A>),
-++                  <A HREF="terminal_interface-curses-aux__ads.htm#ref_55_12">C_Int</A> (<A HREF="terminal_interface-curses__ads.htm#ref_1913_22">Number_Of_Columns</A>)) = <A HREF="terminal_interface-curses-aux__ads.htm#ref_72_4">Curses_Err</A> <b>then</b>
-+          <b>raise</b> <A HREF="terminal_interface-curses__ads.htm#ref_383_4">Curses_Exception</A>;
-+       <b>end</b> <b>if</b>;
-+-   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1897_14">Resize</A>;
-++   <b>end</b> <A HREF="terminal_interface-curses__ads.htm#ref_1911_14">Resize</A>;
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ 
-+ <b>end</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>;
-+Index: doc/html/ada/terminal_interface-curses__ads.htm
-+--- ncurses-5.6/doc/html/ada/terminal_interface-curses__ads.htm	2006-09-23 20:31:33.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ada/terminal_interface-curses__ads.htm	2007-09-01 23:56:32.000000000 +0000
-+@@ -3,7 +3,6 @@
-+ <BODY>
-+ <HR><DIV ALIGN="center"><H1> File : terminal_interface-curses.ads </H1></DIV><HR>
-+ <PRE>
-+-
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
-+ <FONT COLOR=green><EM>--                           <A HREF="http://www.gnat.com">GNAT</A> ncurses Binding                           --</EM></FONT>
-+@@ -13,7 +12,7 @@
-+ <FONT COLOR=green><EM>--                                 S P E C                                  --</EM></FONT>
-+ <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+-<FONT COLOR=green><EM>-- Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.              --</EM></FONT>
-++<FONT COLOR=green><EM>-- Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              --</EM></FONT>
-+ <FONT COLOR=green><EM>--                                                                          --</EM></FONT>
-+ <FONT COLOR=green><EM>-- Permission is hereby granted, free of charge, to any person obtaining a  --</EM></FONT>
-+ <FONT COLOR=green><EM>-- copy of this software and associated documentation files (the            --</EM></FONT>
-+@@ -41,296 +40,296 @@
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ <FONT COLOR=green><EM>--  Author:  Juergen Pfeifer, 1996</EM></FONT>
-+ <FONT COLOR=green><EM>--  Version Control:</EM></FONT>
-+-<FONT COLOR=green><EM>--  @Revision: 1.37 @</EM></FONT>
-+-<FONT COLOR=green><EM>--  @Date: 2006/06/25 14:30:22 @</EM></FONT>
-++<FONT COLOR=green><EM>--  @Revision: 1.41 @</EM></FONT>
-++<FONT COLOR=green><EM>--  @Date: 2007/05/05 20:33:52 @</EM></FONT>
-+ <FONT COLOR=green><EM>--  Binding Version 01.00</EM></FONT>
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ <FONT COLOR=green><EM>--  curses binding.</EM></FONT>
-+ <FONT COLOR=green><EM>--  This module is generated. Please don't change it manually!</EM></FONT>
-+ <FONT COLOR=green><EM>--  Run the generator instead.</EM></FONT>
-+ <FONT COLOR=green><EM>--  |</EM></FONT>
-+-<b>with</b> <A HREF="interfac__ads.htm#ref_38_9">System</A>.Storage_Elements;
-+-<b>with</b> Interfaces.C;   <FONT COLOR=green><EM>--  We need this for some assertions.</EM></FONT>
-++<b>with</b> System.Storage_Elements;
-++<b>with</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C;   <FONT COLOR=green><EM>--  We need this for some assertions.</EM></FONT>
-+ 
-+-<b>package</b> Terminal_Interface.Curses <b>is</b>
-+-   <b>pragma</b> Preelaborate (Terminal_Interface.Curses);
-++<b>package</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<FONT COLOR=red><A NAME="ref_49_28" HREF="terminal_interface-curses__adb.htm#ref_50_33">Curses</A></FONT> <b>is</b>
-++   <b>pragma</b> Preelaborate (<A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>);
-+    <b>pragma</b> Linker_Options ("-lncurses");
-+ 
-+-   <FONT COLOR=red><A NAME="ref_54_4">NC_Major_Version</A></FONT> : <b>constant</b> := 5; <FONT COLOR=green><EM>--  Major version of the library</EM></FONT>
-+-   <FONT COLOR=red><A NAME="ref_55_4">NC_Minor_Version</A></FONT> : <b>constant</b> := 5; <FONT COLOR=green><EM>--  Minor version of the library</EM></FONT>
-+-   NC_Version : <b>constant</b> String := "5.5";  <FONT COLOR=green><EM>--  Version of library</EM></FONT>
-++   <FONT COLOR=red><A NAME="ref_53_4">NC_Major_Version</A></FONT> : <b>constant</b> := 5; <FONT COLOR=green><EM>--  Major version of the library</EM></FONT>
-++   <FONT COLOR=red><A NAME="ref_54_4">NC_Minor_Version</A></FONT> : <b>constant</b> := 6; <FONT COLOR=green><EM>--  Minor version of the library</EM></FONT>
-++   <FONT COLOR=red><A NAME="ref_55_4">NC_Version</A></FONT> : <b>constant</b> String := "5.6";  <FONT COLOR=green><EM>--  Version of library</EM></FONT>
-+ 
-+-   <b>type</b> Window <b>is</b> <b>private</b>;
-+-   Null_Window : <b>constant</b> Window;
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_57_9">Window</A></FONT> <b>is</b> <b>private</b>;
-++   <FONT COLOR=red><A NAME="ref_58_4">Null_Window</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+ 
-+-   <b>type</b> <FONT COLOR=red><A NAME="ref_61_9">Line_Position</A></FONT>   <b>is</b> <b>new</b> Natural; <FONT COLOR=green><EM>--  line coordinate</EM></FONT>
-+-   <b>type</b> Column_Position <b>is</b> <b>new</b> Natural; <FONT COLOR=green><EM>--  column coordinate</EM></FONT>
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_60_9">Line_Position</A></FONT>   <b>is</b> <b>new</b> Natural; <FONT COLOR=green><EM>--  line coordinate</EM></FONT>
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_61_9">Column_Position</A></FONT> <b>is</b> <b>new</b> Natural; <FONT COLOR=green><EM>--  column coordinate</EM></FONT>
-+ 
-+-   <b>subtype</b> Line_Count   <b>is</b> Line_Position   <b>range</b> 1 .. Line_Position'Last;
-++   <b>subtype</b> <FONT COLOR=red><A NAME="ref_63_12">Line_Count</A></FONT>   <b>is</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>   <b>range</b> 1 .. <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>'Last;
-+    <FONT COLOR=green><EM>--  Type to count lines. We do not allow null windows, so must be positive</EM></FONT>
-+-   <b>subtype</b> Column_Count <b>is</b> Column_Position <b>range</b> 1 .. Column_Position'Last;
-++   <b>subtype</b> <FONT COLOR=red><A NAME="ref_65_12">Column_Count</A></FONT> <b>is</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> <b>range</b> 1 .. <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>'Last;
-+    <FONT COLOR=green><EM>--  Type to count columns. We do not allow null windows, so must be positive</EM></FONT>
-+ 
-+-   <b>type</b> Key_Code <b>is</b> <b>new</b> Integer;
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_68_9">Key_Code</A></FONT> <b>is</b> <b>new</b> Integer;
-+    <FONT COLOR=green><EM>--  That is anything including real characters, special keys and logical</EM></FONT>
-+    <FONT COLOR=green><EM>--  request codes.</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  FIXME: The "-1" should be Curses_Err</EM></FONT>
-+-   <b>subtype</b> Real_Key_Code <b>is</b> Key_Code <b>range</b> -1 .. 8#777#;
-++   <b>subtype</b> <FONT COLOR=red><A NAME="ref_73_12">Real_Key_Code</A></FONT> <b>is</b> <A HREF="terminal_interface-curses__ads.htm#ref_68_9">Key_Code</A> <b>range</b> -1 .. 8#777#;
-+    <FONT COLOR=green><EM>--  This are the codes that potentially represent a real keystroke.</EM></FONT>
-+    <FONT COLOR=green><EM>--  Not all codes may be possible on a specific terminal. To check the</EM></FONT>
-+    <FONT COLOR=green><EM>--  availability of a special key, the Has_Key function is provided.</EM></FONT>
-+ 
-+-   <b>subtype</b> Special_Key_Code <b>is</b> Real_Key_Code
-+-     <b>range</b> 8#400# .. Real_Key_Code'Last;
-++   <b>subtype</b> <FONT COLOR=red><A NAME="ref_78_12">Special_Key_Code</A></FONT> <b>is</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>
-++     <b>range</b> 8#400# .. <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>'Last;
-+    <FONT COLOR=green><EM>--  Type for a function- or special key number</EM></FONT>
-+ 
-+-   <b>subtype</b> Normal_Key_Code <b>is</b> Real_Key_Code <b>range</b>
-++   <b>subtype</b> <FONT COLOR=red><A NAME="ref_82_12">Normal_Key_Code</A></FONT> <b>is</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A> <b>range</b>
-+      Character'Pos (Character'First) .. Character'Pos (Character'Last);
-+    <FONT COLOR=green><EM>--  This are the codes for regular (incl. non-graphical) characters.</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  Constants for function- and special keys</EM></FONT>
-+    <FONT COLOR=green><EM>--</EM></FONT>
-+-   <FONT COLOR=red><A NAME="ref_89_4">Key_None</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#400#;
-+-   <FONT COLOR=red><A NAME="ref_90_4">Key_Code_Yes</A></FONT>                   : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#400#;
-+-   <FONT COLOR=red><A NAME="ref_91_4">Key_Min</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#401#;
-+-   <FONT COLOR=red><A NAME="ref_92_4">Key_Break</A></FONT>                      : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#401#;
-+-   <FONT COLOR=red><A NAME="ref_93_4">Key_Cursor_Down</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#402#;
-+-   <FONT COLOR=red><A NAME="ref_94_4">Key_Cursor_Up</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#403#;
-+-   <FONT COLOR=red><A NAME="ref_95_4">Key_Cursor_Left</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#404#;
-+-   <FONT COLOR=red><A NAME="ref_96_4">Key_Cursor_Right</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#405#;
-+-   <FONT COLOR=red><A NAME="ref_97_4">Key_Home</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#406#;
-+-   <FONT COLOR=red><A NAME="ref_98_4">Key_Backspace</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#407#;
-+-   <FONT COLOR=red><A NAME="ref_99_4">Key_F0</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#410#;
-+-   <FONT COLOR=red><A NAME="ref_100_4">Key_F1</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#411#;
-+-   <FONT COLOR=red><A NAME="ref_101_4">Key_F2</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#412#;
-+-   <FONT COLOR=red><A NAME="ref_102_4">Key_F3</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#413#;
-+-   <FONT COLOR=red><A NAME="ref_103_4">Key_F4</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#414#;
-+-   <FONT COLOR=red><A NAME="ref_104_4">Key_F5</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#415#;
-+-   <FONT COLOR=red><A NAME="ref_105_4">Key_F6</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#416#;
-+-   <FONT COLOR=red><A NAME="ref_106_4">Key_F7</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#417#;
-+-   <FONT COLOR=red><A NAME="ref_107_4">Key_F8</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#420#;
-+-   <FONT COLOR=red><A NAME="ref_108_4">Key_F9</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#421#;
-+-   <FONT COLOR=red><A NAME="ref_109_4">Key_F10</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#422#;
-+-   <FONT COLOR=red><A NAME="ref_110_4">Key_F11</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#423#;
-+-   <FONT COLOR=red><A NAME="ref_111_4">Key_F12</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#424#;
-+-   <FONT COLOR=red><A NAME="ref_112_4">Key_F13</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#425#;
-+-   <FONT COLOR=red><A NAME="ref_113_4">Key_F14</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#426#;
-+-   <FONT COLOR=red><A NAME="ref_114_4">Key_F15</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#427#;
-+-   <FONT COLOR=red><A NAME="ref_115_4">Key_F16</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#430#;
-+-   <FONT COLOR=red><A NAME="ref_116_4">Key_F17</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#431#;
-+-   <FONT COLOR=red><A NAME="ref_117_4">Key_F18</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#432#;
-+-   <FONT COLOR=red><A NAME="ref_118_4">Key_F19</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#433#;
-+-   <FONT COLOR=red><A NAME="ref_119_4">Key_F20</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#434#;
-+-   <FONT COLOR=red><A NAME="ref_120_4">Key_F21</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#435#;
-+-   <FONT COLOR=red><A NAME="ref_121_4">Key_F22</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#436#;
-+-   <FONT COLOR=red><A NAME="ref_122_4">Key_F23</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#437#;
-+-   <FONT COLOR=red><A NAME="ref_123_4">Key_F24</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#440#;
-+-   <FONT COLOR=red><A NAME="ref_124_4">Key_Delete_Line</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#510#;
-+-   <FONT COLOR=red><A NAME="ref_125_4">Key_Insert_Line</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#511#;
-+-   <FONT COLOR=red><A NAME="ref_126_4">Key_Delete_Char</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#512#;
-+-   <FONT COLOR=red><A NAME="ref_127_4">Key_Insert_Char</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#513#;
-+-   <FONT COLOR=red><A NAME="ref_128_4">Key_Exit_Insert_Mode</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#514#;
-+-   <FONT COLOR=red><A NAME="ref_129_4">Key_Clear_Screen</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#515#;
-+-   <FONT COLOR=red><A NAME="ref_130_4">Key_Clear_End_Of_Screen</A></FONT>        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#516#;
-+-   <FONT COLOR=red><A NAME="ref_131_4">Key_Clear_End_Of_Line</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#517#;
-+-   <FONT COLOR=red><A NAME="ref_132_4">Key_Scroll_1_Forward</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#520#;
-+-   <FONT COLOR=red><A NAME="ref_133_4">Key_Scroll_1_Backward</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#521#;
-+-   <FONT COLOR=red><A NAME="ref_134_4">Key_Next_Page</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#522#;
-+-   <FONT COLOR=red><A NAME="ref_135_4">Key_Previous_Page</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#523#;
-+-   <FONT COLOR=red><A NAME="ref_136_4">Key_Set_Tab</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#524#;
-+-   <FONT COLOR=red><A NAME="ref_137_4">Key_Clear_Tab</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#525#;
-+-   <FONT COLOR=red><A NAME="ref_138_4">Key_Clear_All_Tabs</A></FONT>             : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#526#;
-+-   <FONT COLOR=red><A NAME="ref_139_4">Key_Enter_Or_Send</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#527#;
-+-   <FONT COLOR=red><A NAME="ref_140_4">Key_Soft_Reset</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#530#;
-+-   <FONT COLOR=red><A NAME="ref_141_4">Key_Reset</A></FONT>                      : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#531#;
-+-   <FONT COLOR=red><A NAME="ref_142_4">Key_Print</A></FONT>                      : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#532#;
-+-   <FONT COLOR=red><A NAME="ref_143_4">Key_Bottom</A></FONT>                     : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#533#;
-+-   <FONT COLOR=red><A NAME="ref_144_4">Key_Upper_Left_Of_Keypad</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#534#;
-+-   <FONT COLOR=red><A NAME="ref_145_4">Key_Upper_Right_Of_Keypad</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#535#;
-+-   <FONT COLOR=red><A NAME="ref_146_4">Key_Center_Of_Keypad</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#536#;
-+-   <FONT COLOR=red><A NAME="ref_147_4">Key_Lower_Left_Of_Keypad</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#537#;
-+-   <FONT COLOR=red><A NAME="ref_148_4">Key_Lower_Right_Of_Keypad</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#540#;
-+-   <FONT COLOR=red><A NAME="ref_149_4">Key_Back_Tab</A></FONT>                   : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#541#;
-+-   <FONT COLOR=red><A NAME="ref_150_4">Key_Beginning</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#542#;
-+-   <FONT COLOR=red><A NAME="ref_151_4">Key_Cancel</A></FONT>                     : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#543#;
-+-   <FONT COLOR=red><A NAME="ref_152_4">Key_Close</A></FONT>                      : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#544#;
-+-   <FONT COLOR=red><A NAME="ref_153_4">Key_Command</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#545#;
-+-   <FONT COLOR=red><A NAME="ref_154_4">Key_Copy</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#546#;
-+-   <FONT COLOR=red><A NAME="ref_155_4">Key_Create</A></FONT>                     : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#547#;
-+-   <FONT COLOR=red><A NAME="ref_156_4">Key_End</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#550#;
-+-   <FONT COLOR=red><A NAME="ref_157_4">Key_Exit</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#551#;
-+-   <FONT COLOR=red><A NAME="ref_158_4">Key_Find</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#552#;
-+-   <FONT COLOR=red><A NAME="ref_159_4">Key_Help</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#553#;
-+-   <FONT COLOR=red><A NAME="ref_160_4">Key_Mark</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#554#;
-+-   <FONT COLOR=red><A NAME="ref_161_4">Key_Message</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#555#;
-+-   <FONT COLOR=red><A NAME="ref_162_4">Key_Move</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#556#;
-+-   <FONT COLOR=red><A NAME="ref_163_4">Key_Next</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#557#;
-+-   <FONT COLOR=red><A NAME="ref_164_4">Key_Open</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#560#;
-+-   <FONT COLOR=red><A NAME="ref_165_4">Key_Options</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#561#;
-+-   <FONT COLOR=red><A NAME="ref_166_4">Key_Previous</A></FONT>                   : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#562#;
-+-   <FONT COLOR=red><A NAME="ref_167_4">Key_Redo</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#563#;
-+-   <FONT COLOR=red><A NAME="ref_168_4">Key_Reference</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#564#;
-+-   <FONT COLOR=red><A NAME="ref_169_4">Key_Refresh</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#565#;
-+-   <FONT COLOR=red><A NAME="ref_170_4">Key_Replace</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#566#;
-+-   <FONT COLOR=red><A NAME="ref_171_4">Key_Restart</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#567#;
-+-   <FONT COLOR=red><A NAME="ref_172_4">Key_Resume</A></FONT>                     : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#570#;
-+-   <FONT COLOR=red><A NAME="ref_173_4">Key_Save</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#571#;
-+-   <FONT COLOR=red><A NAME="ref_174_4">Key_Shift_Begin</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#572#;
-+-   <FONT COLOR=red><A NAME="ref_175_4">Key_Shift_Cancel</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#573#;
-+-   <FONT COLOR=red><A NAME="ref_176_4">Key_Shift_Command</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#574#;
-+-   <FONT COLOR=red><A NAME="ref_177_4">Key_Shift_Copy</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#575#;
-+-   <FONT COLOR=red><A NAME="ref_178_4">Key_Shift_Create</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#576#;
-+-   <FONT COLOR=red><A NAME="ref_179_4">Key_Shift_Delete_Char</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#577#;
-+-   <FONT COLOR=red><A NAME="ref_180_4">Key_Shift_Delete_Line</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#600#;
-+-   <FONT COLOR=red><A NAME="ref_181_4">Key_Select</A></FONT>                     : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#601#;
-+-   <FONT COLOR=red><A NAME="ref_182_4">Key_Shift_End</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#602#;
-+-   <FONT COLOR=red><A NAME="ref_183_4">Key_Shift_Clear_End_Of_Line</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#603#;
-+-   <FONT COLOR=red><A NAME="ref_184_4">Key_Shift_Exit</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#604#;
-+-   <FONT COLOR=red><A NAME="ref_185_4">Key_Shift_Find</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#605#;
-+-   <FONT COLOR=red><A NAME="ref_186_4">Key_Shift_Help</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#606#;
-+-   <FONT COLOR=red><A NAME="ref_187_4">Key_Shift_Home</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#607#;
-+-   <FONT COLOR=red><A NAME="ref_188_4">Key_Shift_Insert_Char</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#610#;
-+-   <FONT COLOR=red><A NAME="ref_189_4">Key_Shift_Cursor_Left</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#611#;
-+-   <FONT COLOR=red><A NAME="ref_190_4">Key_Shift_Message</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#612#;
-+-   <FONT COLOR=red><A NAME="ref_191_4">Key_Shift_Move</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#613#;
-+-   <FONT COLOR=red><A NAME="ref_192_4">Key_Shift_Next_Page</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#614#;
-+-   <FONT COLOR=red><A NAME="ref_193_4">Key_Shift_Options</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#615#;
-+-   <FONT COLOR=red><A NAME="ref_194_4">Key_Shift_Previous_Page</A></FONT>        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#616#;
-+-   <FONT COLOR=red><A NAME="ref_195_4">Key_Shift_Print</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#617#;
-+-   <FONT COLOR=red><A NAME="ref_196_4">Key_Shift_Redo</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#620#;
-+-   <FONT COLOR=red><A NAME="ref_197_4">Key_Shift_Replace</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#621#;
-+-   <FONT COLOR=red><A NAME="ref_198_4">Key_Shift_Cursor_Right</A></FONT>         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#622#;
-+-   <FONT COLOR=red><A NAME="ref_199_4">Key_Shift_Resume</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#623#;
-+-   <FONT COLOR=red><A NAME="ref_200_4">Key_Shift_Save</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#624#;
-+-   <FONT COLOR=red><A NAME="ref_201_4">Key_Shift_Suspend</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#625#;
-+-   <FONT COLOR=red><A NAME="ref_202_4">Key_Shift_Undo</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#626#;
-+-   <FONT COLOR=red><A NAME="ref_203_4">Key_Suspend</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#627#;
-+-   <FONT COLOR=red><A NAME="ref_204_4">Key_Undo</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#630#;
-+-   <FONT COLOR=red><A NAME="ref_205_4">Key_Mouse</A></FONT>                      : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#631#;
-+-   Key_Resize                     : <b>constant</b> Special_Key_Code := 8#632#;
-++   <FONT COLOR=red><A NAME="ref_88_4">Key_None</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#400#;
-++   <FONT COLOR=red><A NAME="ref_89_4">Key_Code_Yes</A></FONT>                   : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#400#;
-++   <FONT COLOR=red><A NAME="ref_90_4">Key_Min</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#401#;
-++   <FONT COLOR=red><A NAME="ref_91_4">Key_Break</A></FONT>                      : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#401#;
-++   <FONT COLOR=red><A NAME="ref_92_4">Key_Cursor_Down</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#402#;
-++   <FONT COLOR=red><A NAME="ref_93_4">Key_Cursor_Up</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#403#;
-++   <FONT COLOR=red><A NAME="ref_94_4">Key_Cursor_Left</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#404#;
-++   <FONT COLOR=red><A NAME="ref_95_4">Key_Cursor_Right</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#405#;
-++   <FONT COLOR=red><A NAME="ref_96_4">Key_Home</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#406#;
-++   <FONT COLOR=red><A NAME="ref_97_4">Key_Backspace</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#407#;
-++   <FONT COLOR=red><A NAME="ref_98_4">Key_F0</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#410#;
-++   <FONT COLOR=red><A NAME="ref_99_4">Key_F1</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#411#;
-++   <FONT COLOR=red><A NAME="ref_100_4">Key_F2</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#412#;
-++   <FONT COLOR=red><A NAME="ref_101_4">Key_F3</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#413#;
-++   <FONT COLOR=red><A NAME="ref_102_4">Key_F4</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#414#;
-++   <FONT COLOR=red><A NAME="ref_103_4">Key_F5</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#415#;
-++   <FONT COLOR=red><A NAME="ref_104_4">Key_F6</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#416#;
-++   <FONT COLOR=red><A NAME="ref_105_4">Key_F7</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#417#;
-++   <FONT COLOR=red><A NAME="ref_106_4">Key_F8</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#420#;
-++   <FONT COLOR=red><A NAME="ref_107_4">Key_F9</A></FONT>                         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#421#;
-++   <FONT COLOR=red><A NAME="ref_108_4">Key_F10</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#422#;
-++   <FONT COLOR=red><A NAME="ref_109_4">Key_F11</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#423#;
-++   <FONT COLOR=red><A NAME="ref_110_4">Key_F12</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#424#;
-++   <FONT COLOR=red><A NAME="ref_111_4">Key_F13</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#425#;
-++   <FONT COLOR=red><A NAME="ref_112_4">Key_F14</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#426#;
-++   <FONT COLOR=red><A NAME="ref_113_4">Key_F15</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#427#;
-++   <FONT COLOR=red><A NAME="ref_114_4">Key_F16</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#430#;
-++   <FONT COLOR=red><A NAME="ref_115_4">Key_F17</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#431#;
-++   <FONT COLOR=red><A NAME="ref_116_4">Key_F18</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#432#;
-++   <FONT COLOR=red><A NAME="ref_117_4">Key_F19</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#433#;
-++   <FONT COLOR=red><A NAME="ref_118_4">Key_F20</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#434#;
-++   <FONT COLOR=red><A NAME="ref_119_4">Key_F21</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#435#;
-++   <FONT COLOR=red><A NAME="ref_120_4">Key_F22</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#436#;
-++   <FONT COLOR=red><A NAME="ref_121_4">Key_F23</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#437#;
-++   <FONT COLOR=red><A NAME="ref_122_4">Key_F24</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#440#;
-++   <FONT COLOR=red><A NAME="ref_123_4">Key_Delete_Line</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#510#;
-++   <FONT COLOR=red><A NAME="ref_124_4">Key_Insert_Line</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#511#;
-++   <FONT COLOR=red><A NAME="ref_125_4">Key_Delete_Char</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#512#;
-++   <FONT COLOR=red><A NAME="ref_126_4">Key_Insert_Char</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#513#;
-++   <FONT COLOR=red><A NAME="ref_127_4">Key_Exit_Insert_Mode</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#514#;
-++   <FONT COLOR=red><A NAME="ref_128_4">Key_Clear_Screen</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#515#;
-++   <FONT COLOR=red><A NAME="ref_129_4">Key_Clear_End_Of_Screen</A></FONT>        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#516#;
-++   <FONT COLOR=red><A NAME="ref_130_4">Key_Clear_End_Of_Line</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#517#;
-++   <FONT COLOR=red><A NAME="ref_131_4">Key_Scroll_1_Forward</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#520#;
-++   <FONT COLOR=red><A NAME="ref_132_4">Key_Scroll_1_Backward</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#521#;
-++   <FONT COLOR=red><A NAME="ref_133_4">Key_Next_Page</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#522#;
-++   <FONT COLOR=red><A NAME="ref_134_4">Key_Previous_Page</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#523#;
-++   <FONT COLOR=red><A NAME="ref_135_4">Key_Set_Tab</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#524#;
-++   <FONT COLOR=red><A NAME="ref_136_4">Key_Clear_Tab</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#525#;
-++   <FONT COLOR=red><A NAME="ref_137_4">Key_Clear_All_Tabs</A></FONT>             : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#526#;
-++   <FONT COLOR=red><A NAME="ref_138_4">Key_Enter_Or_Send</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#527#;
-++   <FONT COLOR=red><A NAME="ref_139_4">Key_Soft_Reset</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#530#;
-++   <FONT COLOR=red><A NAME="ref_140_4">Key_Reset</A></FONT>                      : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#531#;
-++   <FONT COLOR=red><A NAME="ref_141_4">Key_Print</A></FONT>                      : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#532#;
-++   <FONT COLOR=red><A NAME="ref_142_4">Key_Bottom</A></FONT>                     : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#533#;
-++   <FONT COLOR=red><A NAME="ref_143_4">Key_Upper_Left_Of_Keypad</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#534#;
-++   <FONT COLOR=red><A NAME="ref_144_4">Key_Upper_Right_Of_Keypad</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#535#;
-++   <FONT COLOR=red><A NAME="ref_145_4">Key_Center_Of_Keypad</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#536#;
-++   <FONT COLOR=red><A NAME="ref_146_4">Key_Lower_Left_Of_Keypad</A></FONT>       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#537#;
-++   <FONT COLOR=red><A NAME="ref_147_4">Key_Lower_Right_Of_Keypad</A></FONT>      : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#540#;
-++   <FONT COLOR=red><A NAME="ref_148_4">Key_Back_Tab</A></FONT>                   : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#541#;
-++   <FONT COLOR=red><A NAME="ref_149_4">Key_Beginning</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#542#;
-++   <FONT COLOR=red><A NAME="ref_150_4">Key_Cancel</A></FONT>                     : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#543#;
-++   <FONT COLOR=red><A NAME="ref_151_4">Key_Close</A></FONT>                      : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#544#;
-++   <FONT COLOR=red><A NAME="ref_152_4">Key_Command</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#545#;
-++   <FONT COLOR=red><A NAME="ref_153_4">Key_Copy</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#546#;
-++   <FONT COLOR=red><A NAME="ref_154_4">Key_Create</A></FONT>                     : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#547#;
-++   <FONT COLOR=red><A NAME="ref_155_4">Key_End</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#550#;
-++   <FONT COLOR=red><A NAME="ref_156_4">Key_Exit</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#551#;
-++   <FONT COLOR=red><A NAME="ref_157_4">Key_Find</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#552#;
-++   <FONT COLOR=red><A NAME="ref_158_4">Key_Help</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#553#;
-++   <FONT COLOR=red><A NAME="ref_159_4">Key_Mark</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#554#;
-++   <FONT COLOR=red><A NAME="ref_160_4">Key_Message</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#555#;
-++   <FONT COLOR=red><A NAME="ref_161_4">Key_Move</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#556#;
-++   <FONT COLOR=red><A NAME="ref_162_4">Key_Next</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#557#;
-++   <FONT COLOR=red><A NAME="ref_163_4">Key_Open</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#560#;
-++   <FONT COLOR=red><A NAME="ref_164_4">Key_Options</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#561#;
-++   <FONT COLOR=red><A NAME="ref_165_4">Key_Previous</A></FONT>                   : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#562#;
-++   <FONT COLOR=red><A NAME="ref_166_4">Key_Redo</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#563#;
-++   <FONT COLOR=red><A NAME="ref_167_4">Key_Reference</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#564#;
-++   <FONT COLOR=red><A NAME="ref_168_4">Key_Refresh</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#565#;
-++   <FONT COLOR=red><A NAME="ref_169_4">Key_Replace</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#566#;
-++   <FONT COLOR=red><A NAME="ref_170_4">Key_Restart</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#567#;
-++   <FONT COLOR=red><A NAME="ref_171_4">Key_Resume</A></FONT>                     : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#570#;
-++   <FONT COLOR=red><A NAME="ref_172_4">Key_Save</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#571#;
-++   <FONT COLOR=red><A NAME="ref_173_4">Key_Shift_Begin</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#572#;
-++   <FONT COLOR=red><A NAME="ref_174_4">Key_Shift_Cancel</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#573#;
-++   <FONT COLOR=red><A NAME="ref_175_4">Key_Shift_Command</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#574#;
-++   <FONT COLOR=red><A NAME="ref_176_4">Key_Shift_Copy</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#575#;
-++   <FONT COLOR=red><A NAME="ref_177_4">Key_Shift_Create</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#576#;
-++   <FONT COLOR=red><A NAME="ref_178_4">Key_Shift_Delete_Char</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#577#;
-++   <FONT COLOR=red><A NAME="ref_179_4">Key_Shift_Delete_Line</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#600#;
-++   <FONT COLOR=red><A NAME="ref_180_4">Key_Select</A></FONT>                     : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#601#;
-++   <FONT COLOR=red><A NAME="ref_181_4">Key_Shift_End</A></FONT>                  : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#602#;
-++   <FONT COLOR=red><A NAME="ref_182_4">Key_Shift_Clear_End_Of_Line</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#603#;
-++   <FONT COLOR=red><A NAME="ref_183_4">Key_Shift_Exit</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#604#;
-++   <FONT COLOR=red><A NAME="ref_184_4">Key_Shift_Find</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#605#;
-++   <FONT COLOR=red><A NAME="ref_185_4">Key_Shift_Help</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#606#;
-++   <FONT COLOR=red><A NAME="ref_186_4">Key_Shift_Home</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#607#;
-++   <FONT COLOR=red><A NAME="ref_187_4">Key_Shift_Insert_Char</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#610#;
-++   <FONT COLOR=red><A NAME="ref_188_4">Key_Shift_Cursor_Left</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#611#;
-++   <FONT COLOR=red><A NAME="ref_189_4">Key_Shift_Message</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#612#;
-++   <FONT COLOR=red><A NAME="ref_190_4">Key_Shift_Move</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#613#;
-++   <FONT COLOR=red><A NAME="ref_191_4">Key_Shift_Next_Page</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#614#;
-++   <FONT COLOR=red><A NAME="ref_192_4">Key_Shift_Options</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#615#;
-++   <FONT COLOR=red><A NAME="ref_193_4">Key_Shift_Previous_Page</A></FONT>        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#616#;
-++   <FONT COLOR=red><A NAME="ref_194_4">Key_Shift_Print</A></FONT>                : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#617#;
-++   <FONT COLOR=red><A NAME="ref_195_4">Key_Shift_Redo</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#620#;
-++   <FONT COLOR=red><A NAME="ref_196_4">Key_Shift_Replace</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#621#;
-++   <FONT COLOR=red><A NAME="ref_197_4">Key_Shift_Cursor_Right</A></FONT>         : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#622#;
-++   <FONT COLOR=red><A NAME="ref_198_4">Key_Shift_Resume</A></FONT>               : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#623#;
-++   <FONT COLOR=red><A NAME="ref_199_4">Key_Shift_Save</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#624#;
-++   <FONT COLOR=red><A NAME="ref_200_4">Key_Shift_Suspend</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#625#;
-++   <FONT COLOR=red><A NAME="ref_201_4">Key_Shift_Undo</A></FONT>                 : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#626#;
-++   <FONT COLOR=red><A NAME="ref_202_4">Key_Suspend</A></FONT>                    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#627#;
-++   <FONT COLOR=red><A NAME="ref_203_4">Key_Undo</A></FONT>                       : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#630#;
-++   <FONT COLOR=red><A NAME="ref_204_4">Key_Mouse</A></FONT>                      : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#631#;
-++   <FONT COLOR=red><A NAME="ref_205_4">Key_Resize</A></FONT>                     : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> := 8#632#;
-+ 
-+-   Key_Max                        : <b>constant</b> Special_Key_Code
-+-     := Special_Key_Code'Last;
-++   <FONT COLOR=red><A NAME="ref_207_4">Key_Max</A></FONT>                        : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>
-++     := <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>'Last;
-+ 
-+-   <b>subtype</b> User_Key_Code <b>is</b> Key_Code
-+-     <b>range</b> (Key_Max + 129) .. Key_Code'Last;
-++   <b>subtype</b> <FONT COLOR=red><A NAME="ref_210_12">User_Key_Code</A></FONT> <b>is</b> <A HREF="terminal_interface-curses__ads.htm#ref_68_9">Key_Code</A>
-++     <b>range</b> (<A HREF="terminal_interface-curses__ads.htm#ref_207_4">Key_Max</A> + 129) .. <A HREF="terminal_interface-curses__ads.htm#ref_68_9">Key_Code</A>'Last;
-+    <FONT COLOR=green><EM>--  This is reserved for user defined key codes. The range between Key_Max</EM></FONT>
-+    <FONT COLOR=green><EM>--  and the first user code is reserved for subsystems like menu and forms.</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  For those who like to use the original key names we produce them were</EM></FONT>
-+    <FONT COLOR=green><EM>--  they differ from the original. Please note that they may differ in</EM></FONT>
-+    <FONT COLOR=green><EM>--  lower/upper case.</EM></FONT>
-+-   KEY_DOWN         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_93_4">Key_Cursor_Down</A>;
-+-   KEY_UP           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_94_4">Key_Cursor_Up</A>;
-+-   KEY_LEFT         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_95_4">Key_Cursor_Left</A>;
-+-   KEY_RIGHT        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_123_4">Key_Cursor_Right</A>;
-+-   KEY_DL           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_124_4">Key_Delete_Line</A>;
-+-   KEY_IL           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_125_4">Key_Insert_Line</A>;
-+-   KEY_DC           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_126_4">Key_Delete_Char</A>;
-+-   KEY_IC           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_127_4">Key_Insert_Char</A>;
-+-   KEY_EIC          : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_128_4">Key_Exit_Insert_Mode</A>;
-+-   KEY_CLEAR        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_129_4">Key_Clear_Screen</A>;
-+-   KEY_EOS          : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_130_4">Key_Clear_End_Of_Screen</A>;
-+-   KEY_EOL          : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_131_4">Key_Clear_End_Of_Line</A>;
-+-   KEY_SF           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_132_4">Key_Scroll_1_Forward</A>;
-+-   KEY_SR           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_133_4">Key_Scroll_1_Backward</A>;
-+-   KEY_NPAGE        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_134_4">Key_Next_Page</A>;
-+-   KEY_PPAGE        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_135_4">Key_Previous_Page</A>;
-+-   KEY_STAB         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_136_4">Key_Set_Tab</A>;
-+-   KEY_CTAB         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_137_4">Key_Clear_Tab</A>;
-+-   KEY_CATAB        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_138_4">Key_Clear_All_Tabs</A>;
-+-   KEY_ENTER        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_139_4">Key_Enter_Or_Send</A>;
-+-   KEY_SRESET       : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_142_4">Key_Soft_Reset</A>;
-+-   KEY_LL           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_143_4">Key_Bottom</A>;
-+-   KEY_A1           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_144_4">Key_Upper_Left_Of_Keypad</A>;
-+-   KEY_A3           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_145_4">Key_Upper_Right_Of_Keypad</A>;
-+-   KEY_B2           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_146_4">Key_Center_Of_Keypad</A>;
-+-   KEY_C1           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_147_4">Key_Lower_Left_Of_Keypad</A>;
-+-   KEY_C3           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_148_4">Key_Lower_Right_Of_Keypad</A>;
-+-   KEY_BTAB         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_149_4">Key_Back_Tab</A>;
-+-   KEY_BEG          : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_173_4">Key_Beginning</A>;
-+-   KEY_SBEG         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_174_4">Key_Shift_Begin</A>;
-+-   KEY_SCANCEL      : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_175_4">Key_Shift_Cancel</A>;
-+-   KEY_SCOMMAND     : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_176_4">Key_Shift_Command</A>;
-+-   KEY_SCOPY        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_177_4">Key_Shift_Copy</A>;
-+-   KEY_SCREATE      : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_178_4">Key_Shift_Create</A>;
-+-   KEY_SDC          : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_179_4">Key_Shift_Delete_Char</A>;
-+-   KEY_SDL          : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_181_4">Key_Shift_Delete_Line</A>;
-+-   KEY_SEND         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_182_4">Key_Shift_End</A>;
-+-   KEY_SEOL         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_183_4">Key_Shift_Clear_End_Of_Line</A>;
-+-   KEY_SEXIT        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_184_4">Key_Shift_Exit</A>;
-+-   KEY_SFIND        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_185_4">Key_Shift_Find</A>;
-+-   KEY_SHELP        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_186_4">Key_Shift_Help</A>;
-+-   KEY_SHOME        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_187_4">Key_Shift_Home</A>;
-+-   KEY_SIC          : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_188_4">Key_Shift_Insert_Char</A>;
-+-   KEY_SLEFT        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_189_4">Key_Shift_Cursor_Left</A>;
-+-   KEY_SMESSAGE     : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_190_4">Key_Shift_Message</A>;
-+-   KEY_SMOVE        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_191_4">Key_Shift_Move</A>;
-+-   KEY_SNEXT        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_192_4">Key_Shift_Next_Page</A>;
-+-   KEY_SOPTIONS     : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_193_4">Key_Shift_Options</A>;
-+-   KEY_SPREVIOUS    : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_194_4">Key_Shift_Previous_Page</A>;
-+-   KEY_SPRINT       : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_195_4">Key_Shift_Print</A>;
-+-   KEY_SREDO        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_196_4">Key_Shift_Redo</A>;
-+-   KEY_SREPLACE     : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_197_4">Key_Shift_Replace</A>;
-+-   KEY_SRIGHT       : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_198_4">Key_Shift_Cursor_Right</A>;
-+-   KEY_SRSUME       : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_199_4">Key_Shift_Resume</A>;
-+-   KEY_SSAVE        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_200_4">Key_Shift_Save</A>;
-+-   KEY_SSUSPEND     : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_201_4">Key_Shift_Suspend</A>;
-+-   KEY_SUNDO        : Special_Key_Code <b>renames</b> Key_Shift_Undo;
-++   KEY_DOWN         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_92_4">Key_Cursor_Down</A>;
-++   KEY_UP           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_93_4">Key_Cursor_Up</A>;
-++   KEY_LEFT         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_94_4">Key_Cursor_Left</A>;
-++   KEY_RIGHT        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_95_4">Key_Cursor_Right</A>;
-++   KEY_DL           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_123_4">Key_Delete_Line</A>;
-++   KEY_IL           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_124_4">Key_Insert_Line</A>;
-++   KEY_DC           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_125_4">Key_Delete_Char</A>;
-++   KEY_IC           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_126_4">Key_Insert_Char</A>;
-++   KEY_EIC          : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_127_4">Key_Exit_Insert_Mode</A>;
-++   KEY_CLEAR        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_128_4">Key_Clear_Screen</A>;
-++   KEY_EOS          : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_129_4">Key_Clear_End_Of_Screen</A>;
-++   KEY_EOL          : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_130_4">Key_Clear_End_Of_Line</A>;
-++   KEY_SF           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_131_4">Key_Scroll_1_Forward</A>;
-++   KEY_SR           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_132_4">Key_Scroll_1_Backward</A>;
-++   KEY_NPAGE        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_133_4">Key_Next_Page</A>;
-++   KEY_PPAGE        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_134_4">Key_Previous_Page</A>;
-++   KEY_STAB         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_135_4">Key_Set_Tab</A>;
-++   KEY_CTAB         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_136_4">Key_Clear_Tab</A>;
-++   KEY_CATAB        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_137_4">Key_Clear_All_Tabs</A>;
-++   KEY_ENTER        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_138_4">Key_Enter_Or_Send</A>;
-++   KEY_SRESET       : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_139_4">Key_Soft_Reset</A>;
-++   KEY_LL           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_142_4">Key_Bottom</A>;
-++   KEY_A1           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_143_4">Key_Upper_Left_Of_Keypad</A>;
-++   KEY_A3           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_144_4">Key_Upper_Right_Of_Keypad</A>;
-++   KEY_B2           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_145_4">Key_Center_Of_Keypad</A>;
-++   KEY_C1           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_146_4">Key_Lower_Left_Of_Keypad</A>;
-++   KEY_C3           : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_147_4">Key_Lower_Right_Of_Keypad</A>;
-++   KEY_BTAB         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_148_4">Key_Back_Tab</A>;
-++   KEY_BEG          : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_149_4">Key_Beginning</A>;
-++   KEY_SBEG         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_173_4">Key_Shift_Begin</A>;
-++   KEY_SCANCEL      : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_174_4">Key_Shift_Cancel</A>;
-++   KEY_SCOMMAND     : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_175_4">Key_Shift_Command</A>;
-++   KEY_SCOPY        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_176_4">Key_Shift_Copy</A>;
-++   KEY_SCREATE      : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_177_4">Key_Shift_Create</A>;
-++   KEY_SDC          : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_178_4">Key_Shift_Delete_Char</A>;
-++   KEY_SDL          : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_179_4">Key_Shift_Delete_Line</A>;
-++   KEY_SEND         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_181_4">Key_Shift_End</A>;
-++   KEY_SEOL         : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_182_4">Key_Shift_Clear_End_Of_Line</A>;
-++   KEY_SEXIT        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_183_4">Key_Shift_Exit</A>;
-++   KEY_SFIND        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_184_4">Key_Shift_Find</A>;
-++   KEY_SHELP        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_185_4">Key_Shift_Help</A>;
-++   KEY_SHOME        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_186_4">Key_Shift_Home</A>;
-++   KEY_SIC          : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_187_4">Key_Shift_Insert_Char</A>;
-++   KEY_SLEFT        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_188_4">Key_Shift_Cursor_Left</A>;
-++   KEY_SMESSAGE     : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_189_4">Key_Shift_Message</A>;
-++   KEY_SMOVE        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_190_4">Key_Shift_Move</A>;
-++   KEY_SNEXT        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_191_4">Key_Shift_Next_Page</A>;
-++   KEY_SOPTIONS     : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_192_4">Key_Shift_Options</A>;
-++   KEY_SPREVIOUS    : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_193_4">Key_Shift_Previous_Page</A>;
-++   KEY_SPRINT       : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_194_4">Key_Shift_Print</A>;
-++   KEY_SREDO        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_195_4">Key_Shift_Redo</A>;
-++   KEY_SREPLACE     : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_196_4">Key_Shift_Replace</A>;
-++   KEY_SRIGHT       : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_197_4">Key_Shift_Cursor_Right</A>;
-++   KEY_SRSUME       : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_198_4">Key_Shift_Resume</A>;
-++   KEY_SSAVE        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_199_4">Key_Shift_Save</A>;
-++   KEY_SSUSPEND     : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_200_4">Key_Shift_Suspend</A>;
-++   KEY_SUNDO        : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_201_4">Key_Shift_Undo</A>;
-+ 
-+ <FONT COLOR=green><EM>------------------------------------------------------------------------------</EM></FONT>
-+ 
-+-   <b>type</b><A HREF="terminal_interface-curses__ads.htm#ref_278_9"> </A>Color_Number <b>is</b> <b>range</b><A HREF="interfac__ads.htm#ref_38_9"> </A>-1 .. Integer (Interfaces.C.short'Last);
-+-   <b>for</b> Color_Number'Size <b>use</b> Interfaces.C.short'Size;
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_278_9">Color_Number</A></FONT> <b>is</b> <b>range</b> -1 .. Integer (<A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.short'Last);
-++   <b>for</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>'Size <b>use</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.short'Size;
-+    <FONT COLOR=green><EM>--  (n)curses uses a short for the color index</EM></FONT>
-+    <FONT COLOR=green><EM>--  The model is, that a Color_Number is an index into an array of</EM></FONT>
-+    <FONT COLOR=green><EM>--  (potentially) definable colors. Some of those indices are</EM></FONT>
-+    <FONT COLOR=green><EM>--  predefined (see below), although they may not really exist.</EM></FONT>
-+ 
-+-   <FONT COLOR=red><A NAME="ref_286_4">Default_Color</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := -1;
-+-   <FONT COLOR=red><A NAME="ref_287_4">Black</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := 0;
-+-   <FONT COLOR=red><A NAME="ref_288_4">Red</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := 1;
-+-   <FONT COLOR=red><A NAME="ref_289_4">Green</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := 2;
-+-   <FONT COLOR=red><A NAME="ref_290_4">Yellow</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := 3;
-+-   <FONT COLOR=red><A NAME="ref_291_4">Blue</A></FONT>             : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := 4;
-+-   <FONT COLOR=red><A NAME="ref_292_4">Magenta</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := 5;
-+-   <FONT COLOR=red><A NAME="ref_293_4">Cyan</A></FONT>             : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := 6;
-+-   White            : <b>constant</b> Color_Number := 7;
-++   <FONT COLOR=red><A NAME="ref_285_4">Default_Color</A></FONT>    : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := -1;
-++   <FONT COLOR=red><A NAME="ref_286_4">Black</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := 0;
-++   <FONT COLOR=red><A NAME="ref_287_4">Red</A></FONT>              : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := 1;
-++   <FONT COLOR=red><A NAME="ref_288_4">Green</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := 2;
-++   <FONT COLOR=red><A NAME="ref_289_4">Yellow</A></FONT>           : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := 3;
-++   <FONT COLOR=red><A NAME="ref_290_4">Blue</A></FONT>             : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := 4;
-++   <FONT COLOR=red><A NAME="ref_291_4">Magenta</A></FONT>          : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := 5;
-++   <FONT COLOR=red><A NAME="ref_292_4">Cyan</A></FONT>             : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := 6;
-++   <FONT COLOR=red><A NAME="ref_293_4">White</A></FONT>            : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := 7;
-+ 
-+-   <b>type</b><A HREF="terminal_interface-curses__ads.htm#ref_295_9"> </A>RGB_Value <b>is</b> <b>range</b><A HREF="interfac__ads.htm#ref_38_9"> </A>0 .. Integer (Interfaces.C.short'Last);
-+-   <b>for</b> RGB_Value'Size <b>use</b> Interfaces.C.short'Size;
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_295_9">RGB_Value</A></FONT> <b>is</b> <b>range</b> 0 .. Integer (<A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.short'Last);
-++   <b>for</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>'Size <b>use</b> <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.short'Size;
-+    <FONT COLOR=green><EM>--  Some system may allow to redefine a color by setting RGB values.</EM></FONT>
-+ 
-+-   <b>type</b><A HREF="terminal_interface-curses__ads.htm#ref_299_9"> </A>Color_Pair <b>is</b> <b>range</b> 0 .. 255;
-+-   <b>for</b> Color_Pair'Size <b>use</b> 8;
-+-   <b>subtype</b> Redefinable_Color_Pair <b>is</b> Color_Pair <b>range</b> 1 .. 255;
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_299_9">Color_Pair</A></FONT> <b>is</b> <b>range</b> 0 .. 255;
-++   <b>for</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'Size <b>use</b> 8;
-++   <b>subtype</b> <FONT COLOR=red><A NAME="ref_301_12">Redefinable_Color_Pair</A></FONT> <b>is</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> <b>range</b> 1 .. 255;
-+    <FONT COLOR=green><EM>--  (n)curses reserves 1 Byte for the color-pair number. Color Pair 0</EM></FONT>
-+    <FONT COLOR=green><EM>--  is fixed (Black &amp; White). A color pair is simply a combination of</EM></FONT>
-+    <FONT COLOR=green><EM>--  two colors described by Color_Numbers, one for the foreground and</EM></FONT>
-+    <FONT COLOR=green><EM>--  the other for the background</EM></FONT>
-+ 
-+-   <b>type</b> Character_Attribute_Set <b>is</b>
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_307_9">Character_Attribute_Set</A></FONT> <b>is</b>
-+       <b>record</b>
-+-         <FONT COLOR=red><A NAME="ref_310_10">Stand_Out</A></FONT>               : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_311_10">Under_Line</A></FONT>              : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_312_10">Reverse_Video</A></FONT>           : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_313_10">Blink</A></FONT>                   : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_314_10">Dim_Character</A></FONT>           : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_315_10">Bold_Character</A></FONT>          : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_316_10">Alternate_Character_Set</A></FONT> : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_317_10">Invisible_Character</A></FONT>     : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_318_10">Protected_Character</A></FONT>     : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_319_10">Horizontal</A></FONT>              : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_320_10">Left</A></FONT>                    : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_321_10">Low</A></FONT>                     : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_322_10">Right</A></FONT>                   : Boolean;
-+-         <FONT COLOR=red><A NAME="ref_323_10">Top</A></FONT>                     : Boolean;
-+-         Vertical                : Boolean;
-++         <FONT COLOR=red><A NAME="ref_309_10">Stand_Out</A></FONT>               : Boolean;
-++         <FONT COLOR=red><A NAME="ref_310_10">Under_Line</A></FONT>              : Boolean;
-++         <FONT COLOR=red><A NAME="ref_311_10">Reverse_Video</A></FONT>           : Boolean;
-++         <FONT COLOR=red><A NAME="ref_312_10">Blink</A></FONT>                   : Boolean;
-++         <FONT COLOR=red><A NAME="ref_313_10">Dim_Character</A></FONT>           : Boolean;
-++         <FONT COLOR=red><A NAME="ref_314_10">Bold_Character</A></FONT>          : Boolean;
-++         <FONT COLOR=red><A NAME="ref_315_10">Alternate_Character_Set</A></FONT> : Boolean;
-++         <FONT COLOR=red><A NAME="ref_316_10">Invisible_Character</A></FONT>     : Boolean;
-++         <FONT COLOR=red><A NAME="ref_317_10">Protected_Character</A></FONT>     : Boolean;
-++         <FONT COLOR=red><A NAME="ref_318_10">Horizontal</A></FONT>              : Boolean;
-++         <FONT COLOR=red><A NAME="ref_319_10">Left</A></FONT>                    : Boolean;
-++         <FONT COLOR=red><A NAME="ref_320_10">Low</A></FONT>                     : Boolean;
-++         <FONT COLOR=red><A NAME="ref_321_10">Right</A></FONT>                   : Boolean;
-++         <FONT COLOR=red><A NAME="ref_322_10">Top</A></FONT>                     : Boolean;
-++         <FONT COLOR=red><A NAME="ref_323_10">Vertical</A></FONT>                : Boolean;
-+       <b>end</b> <b>record</b>;
-+-   <b>pragma</b> Convention (C, Character_Attribute_Set);
-++   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>);
-+ 
-+-   <b>for</b> Character_Attribute_Set <b>use</b>
-++   <b>for</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> <b>use</b>
-+       <b>record</b>
-+          Stand_Out               <b>at</b> 0 <b>range</b>  0 ..  0;
-+          Under_Line              <b>at</b> 0 <b>range</b>  1 ..  1;
-+@@ -348,64 +347,64 @@
-+          Top                     <b>at</b> 0 <b>range</b> 13 .. 13;
-+          Vertical                <b>at</b> 0 <b>range</b> 14 .. 14;
-+       <b>end</b> <b>record</b>;
-+-   <b>for</b> Character_Attribute_Set'Size <b>use</b> 16;
-++   <b>for</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>'Size <b>use</b> 16;
-+    <FONT COLOR=green><EM>--  Please note: this rep. clause is generated and may be</EM></FONT>
-+    <FONT COLOR=green><EM>--               different on your system.</EM></FONT>
-+    <FONT COLOR=green><EM>--  (n)curses uses all but the lowest 16 Bits for Attributes.</EM></FONT>
-+ 
-+-   Normal_Video : <b>constant</b> Character_Attribute_Set := (<b>others</b> =&gt; False);
-++   <FONT COLOR=red><A NAME="ref_350_4">Normal_Video</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := (<b>others</b> =&gt; False);
-+ 
-+-   <b>type</b> Attributed_Character <b>is</b>
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_352_9">Attributed_Character</A></FONT> <b>is</b>
-+       <b>record</b>
-+-         <FONT COLOR=red><A NAME="ref_355_10">Attr</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character_Attribute_Set</A>;
-+-         <FONT COLOR=red><A NAME="ref_356_10">Color</A></FONT> : Color_Pair;
-+-         Ch    : Character;
-++         <FONT COLOR=red><A NAME="ref_354_10">Attr</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>;
-++         <FONT COLOR=red><A NAME="ref_355_10">Color</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>;
-++         <FONT COLOR=red><A NAME="ref_356_10">Ch</A></FONT>    : Character;
-+       <b>end</b> <b>record</b>;
-+-   <b>pragma</b> Convention (C, Attributed_Character);
-++   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>);
-+    <FONT COLOR=green><EM>--  This is the counterpart for the chtype in C.</EM></FONT>
-+ 
-+-   <b>for</b> Attributed_Character <b>use</b>
-++   <b>for</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> <b>use</b>
-+       <b>record</b>
-+          Ch    <b>at</b> 0 <b>range</b>  0 ..  7;
-+          Color <b>at</b> 0 <b>range</b>  8 .. 15;
-+          Attr  <b>at</b> 0 <b>range</b> 16 .. 31;
-+       <b>end</b> <b>record</b>;
-+-   <b>for</b> Attributed_Character'Size <b>use</b> 32;
-++   <b>for</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>'Size <b>use</b> 32;
-+       <FONT COLOR=green><EM>--  Please note: this rep. clause is generated and may be</EM></FONT>
-+       <FONT COLOR=green><EM>--               different on your system.</EM></FONT>
-+ 
-+-   Default_Character : <b>constant</b> Attributed_Character
-+-     := (<A HREF="terminal_interface-curses__ads.htm#ref_355_10">Ch</A>    =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character</A>'First,
-+-         <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Color</A> =&gt; Color_Pair'First,
-+-         Attr  =&gt; (<b>others</b> =&gt; False));  <FONT COLOR=green><EM>--  preelaboratable Normal_Video</EM></FONT>
-++   <FONT COLOR=red><A NAME="ref_371_4">Default_Character</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>
-++     := (<A HREF="terminal_interface-curses__ads.htm#ref_356_10">Ch</A>    =&gt; Character'First,
-++         <A HREF="terminal_interface-curses__ads.htm#ref_355_10">Color</A> =&gt; <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First,
-++         <A HREF="terminal_interface-curses__ads.htm#ref_354_10">Attr</A>  =&gt; (<b>others</b> =&gt; False));  <FONT COLOR=green><EM>--  preelaboratable Normal_Video</EM></FONT>
-+ 
-+-   <b>type</b> Attributed_String <b>is</b> <b>array</b> (Positive <b>range</b> &lt;&gt;) <b>of</b> Attributed_Character;
-+-   <b>pragma</b> Pack (Attributed_String);
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_376_9">Attributed_String</A></FONT> <b>is</b> <b>array</b> (Positive <b>range</b> &lt;&gt;) <b>of</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>;
-++   <b>pragma</b> Pack (<A HREF="terminal_interface-curses__ads.htm#ref_376_9">Attributed_String</A>);
-+    <FONT COLOR=green><EM>--  In this binding we allow strings of attributed characters.</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>------------------</EM></FONT>
-+    <FONT COLOR=green><EM>--  Exceptions  --</EM></FONT>
-+    <FONT COLOR=green><EM>------------------</EM></FONT>
-+-   <FONT COLOR=red><A NAME="ref_384_4">Curses_Exception</A></FONT>     : <b>exception</b>;
-+-   Wrong_Curses_Version : <b>exception</b>;
-++   <FONT COLOR=red><A NAME="ref_383_4">Curses_Exception</A></FONT>     : <b>exception</b>;
-++   <FONT COLOR=red><A NAME="ref_384_4">Wrong_Curses_Version</A></FONT> : <b>exception</b>;
-+ 
-+    <FONT COLOR=green><EM>--  Those exceptions are raised by the ETI (Extended Terminal Interface)</EM></FONT>
-+    <FONT COLOR=green><EM>--  subpackets for Menu and Forms handling.</EM></FONT>
-+    <FONT COLOR=green><EM>--</EM></FONT>
-+-   <FONT COLOR=red><A NAME="ref_390_4">Eti_System_Error</A></FONT>    : <b>exception</b>;
-+-   <FONT COLOR=red><A NAME="ref_391_4">Eti_Bad_Argument</A></FONT>    : <b>exception</b>;
-+-   <FONT COLOR=red><A NAME="ref_392_4">Eti_Posted</A></FONT>          : <b>exception</b>;
-+-   <FONT COLOR=red><A NAME="ref_393_4">Eti_Connected</A></FONT>       : <b>exception</b>;
-+-   <FONT COLOR=red><A NAME="ref_394_4">Eti_Bad_State</A></FONT>       : <b>exception</b>;
-+-   <FONT COLOR=red><A NAME="ref_395_4">Eti_No_Room</A></FONT>         : <b>exception</b>;
-+-   <FONT COLOR=red><A NAME="ref_396_4">Eti_Not_Posted</A></FONT>      : <b>exception</b>;
-+-   <FONT COLOR=red><A NAME="ref_397_4">Eti_Unknown_Command</A></FONT> : <b>exception</b>;
-+-   <FONT COLOR=red><A NAME="ref_398_4">Eti_No_Match</A></FONT>        : <b>exception</b>;
-+-   <FONT COLOR=red><A NAME="ref_399_4">Eti_Not_Selectable</A></FONT>  : <b>exception</b>;
-+-   <FONT COLOR=red><A NAME="ref_400_4">Eti_Not_Connected</A></FONT>   : <b>exception</b>;
-+-   <FONT COLOR=red><A NAME="ref_401_4">Eti_Request_Denied</A></FONT>  : <b>exception</b>;
-+-   <FONT COLOR=red><A NAME="ref_402_4">Eti_Invalid_Field</A></FONT>   : <b>exception</b>;
-+-   Eti_Current         : <b>exception</b>;
-++   <FONT COLOR=red><A NAME="ref_389_4">Eti_System_Error</A></FONT>    : <b>exception</b>;
-++   <FONT COLOR=red><A NAME="ref_390_4">Eti_Bad_Argument</A></FONT>    : <b>exception</b>;
-++   <FONT COLOR=red><A NAME="ref_391_4">Eti_Posted</A></FONT>          : <b>exception</b>;
-++   <FONT COLOR=red><A NAME="ref_392_4">Eti_Connected</A></FONT>       : <b>exception</b>;
-++   <FONT COLOR=red><A NAME="ref_393_4">Eti_Bad_State</A></FONT>       : <b>exception</b>;
-++   <FONT COLOR=red><A NAME="ref_394_4">Eti_No_Room</A></FONT>         : <b>exception</b>;
-++   <FONT COLOR=red><A NAME="ref_395_4">Eti_Not_Posted</A></FONT>      : <b>exception</b>;
-++   <FONT COLOR=red><A NAME="ref_396_4">Eti_Unknown_Command</A></FONT> : <b>exception</b>;
-++   <FONT COLOR=red><A NAME="ref_397_4">Eti_No_Match</A></FONT>        : <b>exception</b>;
-++   <FONT COLOR=red><A NAME="ref_398_4">Eti_Not_Selectable</A></FONT>  : <b>exception</b>;
-++   <FONT COLOR=red><A NAME="ref_399_4">Eti_Not_Connected</A></FONT>   : <b>exception</b>;
-++   <FONT COLOR=red><A NAME="ref_400_4">Eti_Request_Denied</A></FONT>  : <b>exception</b>;
-++   <FONT COLOR=red><A NAME="ref_401_4">Eti_Invalid_Field</A></FONT>   : <b>exception</b>;
-++   <FONT COLOR=red><A NAME="ref_402_4">Eti_Current</A></FONT>         : <b>exception</b>;
-+ 
-+    <FONT COLOR=green><EM>--------------------------------------------------------------------------</EM></FONT>
-+    <FONT COLOR=green><EM>--  External C variables</EM></FONT>
-+@@ -415,28 +414,29 @@
-+    <FONT COLOR=green><EM>--  this is to use functions.</EM></FONT>
-+    <FONT COLOR=green><EM>--------------------------------------------------------------------------</EM></FONT>
-+ 
-+-   <b>function</b> Lines <A HREF="terminal_interface-curses__ads.htm#ref_412_13"> </A>          <b>return</b> Line_Count;
-+-   <b>pragma</b> Inline (Lines);
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_412_13" HREF="terminal_interface-curses__adb.htm#ref_2354_13">Lines</A></FONT>            <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_412_13">Lines</A>);
-+ 
-+-   <b>function</b> Columns          <b>return</b> Column_Count;
-+-   <b>pragma</b> Inline (Columns);
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_415_13" HREF="terminal_interface-curses__adb.htm#ref_2362_13">Columns</A></FONT>          <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_415_13">Columns</A>);
-+ 
-+-   <b>function</b> Tab_Size         <b>return</b> Natural;
-+-   <b>pragma</b> Inline (Tab_Size);
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_418_13" HREF="terminal_interface-curses__adb.htm#ref_2370_13">Tab_Size</A></FONT>         <b>return</b> Natural;
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_418_13">Tab_Size</A>);
-+ 
-+-   <b>function</b> Number_Of_Colors <b>return</b> Natural;
-+-   <b>pragma</b> Inline (Number_Of_Colors);
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_421_13" HREF="terminal_interface-curses__adb.htm#ref_2378_13">Number_Of_Colors</A></FONT> <b>return</b> Natural;
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_421_13">Number_Of_Colors</A>);
-+ 
-+-   <b>function</b> Number_Of_Color_Pairs <b>return</b> Natural;
-+-   <b>pragma</b> Inline (Number_Of_Color_Pairs);
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_424_13" HREF="terminal_interface-curses__adb.htm#ref_2386_13">Number_Of_Color_Pairs</A></FONT> <b>return</b> Natural;
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_424_13">Number_Of_Color_Pairs</A>);
-+ 
-+-   ACS_Map : <b>array</b> (Character'Val (0) .. Character'Val (127)) <b>of</b>
-+-     Attributed_Character;
-+-   <b>pragma</b> Import (C, ACS_Map, "acs_map");
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_427_9">C_ACS_Map</A></FONT> <b>is</b> <b>array</b> (Character'Val (0) .. Character'Val (127))
-++        <b>of</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>;
-++   <FONT COLOR=red><A NAME="ref_429_4">ACS_Map</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_427_9">C_ACS_Map</A>;
-++   <b>pragma</b> Import (C, <A HREF="terminal_interface-curses__ads.htm#ref_429_4">ACS_Map</A>, "acs_map");
-+    <FONT COLOR=green><EM>--</EM></FONT>
-+    <FONT COLOR=green><EM>--</EM></FONT>
-+    <FONT COLOR=green><EM>--  Constants for several characters from the Alternate Character Set</EM></FONT>
-+-   <FONT COLOR=green><EM>--  You must use this constants as indices into the ACS_Map array</EM></FONT>
-++   <FONT COLOR=green><EM>--  You must use these constants as indices into the ACS_Map array</EM></FONT>
-+    <FONT COLOR=green><EM>--  to get the corresponding attributed character at runtime.</EM></FONT>
-+    <FONT COLOR=green><EM>--</EM></FONT>
-+    <FONT COLOR=red><A NAME="ref_437_4">ACS_Upper_Left_Corner</A></FONT>    : <b>constant</b> Character := 'l';
-+@@ -470,93 +470,98 @@
-+    <FONT COLOR=red><A NAME="ref_465_4">ACS_Greater_Or_Equal</A></FONT>     : <b>constant</b> Character := 'z';
-+    <FONT COLOR=red><A NAME="ref_466_4">ACS_PI</A></FONT>                   : <b>constant</b> Character := '{';
-+    <FONT COLOR=red><A NAME="ref_467_4">ACS_Not_Equal</A></FONT>            : <b>constant</b> Character := '|';
-+-   ACS_Sterling             : <b>constant</b> Character := '}';
-++   <FONT COLOR=red><A NAME="ref_468_4">ACS_Sterling</A></FONT>             : <b>constant</b> Character := '}';
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_initscr.3x.html">curs_initscr.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+-   <FONT COLOR=green><EM>--  | Not implemented: newterm, set_term, delscreen, curscr</EM></FONT>
-++   <FONT COLOR=green><EM>--  | Not implemented: newterm, set_term, delscreen</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_1"#2|</EM></FONT>
-+-   <b>function</b> Standard_Window <b>return</b> Window;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_476_13" HREF="terminal_interface-curses__adb.htm#ref_2338_13">Standard_Window</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_initscr.3x.html">stdscr</A></EM></FONT>
-+-   <b>pragma</b> Inline (Standard_Window);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_2"#2|</EM></FONT>
-+-   <b>procedure</b> Init_Screen;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_481_13" HREF="terminal_interface-curses__adb.htm#ref_2346_13">Current_Window</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_initscr.3x.html">curscr</A></EM></FONT>
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_481_13">Current_Window</A>);
-+ 
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_3"#2|</EM></FONT>
-+-   <b>procedure</b> Init_Windows <b>renames</b> Init_Screen;
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_486_14" HREF="terminal_interface-curses__adb.htm#ref_98_14">Init_Screen</A></FONT>;
-++
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_4"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_489_14">Init_Windows</A></FONT> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_486_14">Init_Screen</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_initscr.3x.html">initscr()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Init_Screen);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_486_14">Init_Screen</A>);
-+    <FONT COLOR=green><EM>--  pragma Inline (Init_Windows);</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_4"#2|</EM></FONT>
-+-   <b>procedure</b> End_Windows;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_5"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_495_14" HREF="terminal_interface-curses__adb.htm#ref_111_14">End_Windows</A></FONT>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_initscr.3x.html">endwin()</A></EM></FONT>
-+-   <b>procedure</b> End_Screen <b>renames</b> End_Windows;
-+-   <b>pragma</b> Inline (End_Windows);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_497_14">End_Screen</A></FONT> <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_495_14">End_Windows</A>;
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_495_14">End_Windows</A>);
-+    <FONT COLOR=green><EM>--  pragma Inline (End_Screen);</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_5"#2|</EM></FONT>
-+-   <b>function</b> Is_End_Window <b>return</b> Boolean;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_6"#2|</EM></FONT>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_502_13" HREF="terminal_interface-curses__adb.htm#ref_121_13">Is_End_Window</A></FONT> <b>return</b> Boolean;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_initscr.3x.html">isendwin()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Is_End_Window);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_502_13">Is_End_Window</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_move.3x.html">curs_move.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_6"#2|</EM></FONT>
-+-   <b>procedure</b> Move_Cursor (<FONT COLOR=red><A NAME="ref_506_27" HREF="terminal_interface-curses__adb.htm#ref_187_27">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
-+-                          <FONT COLOR=red><A NAME="ref_507_27" HREF="terminal_interface-curses__adb.htm#ref_188_27">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-                          Column : <b>in</b> Column_Position);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_7"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_511_14" HREF="terminal_interface-curses__adb.htm#ref_133_14">Move_Cursor</A></FONT> (<FONT COLOR=red><A NAME="ref_511_27" HREF="terminal_interface-curses__adb.htm#ref_133_27">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                          <FONT COLOR=red><A NAME="ref_512_27" HREF="terminal_interface-curses__adb.htm#ref_134_27">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++                          <FONT COLOR=red><A NAME="ref_513_27" HREF="terminal_interface-curses__adb.htm#ref_135_27">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_move.3x.html">wmove()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: move()</EM></FONT>
-+-   <b>pragma</b> Inline (Move_Cursor);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_511_14">Move_Cursor</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_addch.3x.html">curs_addch.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_7"#2|</EM></FONT>
-+-   <b>procedure</b> Add (<FONT COLOR=red><A NAME="ref_518_19" HREF="terminal_interface-curses__adb.htm#ref_202_19">Win</A></FONT> :  <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Window</A> := Standard_Window;
-+-                  Ch  :  <b>in</b> Attributed_Character);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_8"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_523_14" HREF="terminal_interface-curses__adb.htm#ref_148_14">Add</A></FONT> (<FONT COLOR=red><A NAME="ref_523_19" HREF="terminal_interface-curses__adb.htm#ref_148_19">Win</A></FONT> :  <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                  <FONT COLOR=red><A NAME="ref_524_19" HREF="terminal_interface-curses__adb.htm#ref_149_19">Ch</A></FONT>  :  <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_addch.3x.html">waddch()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: addch()</EM></FONT>
-+ 
-+-   <b>procedure</b> Add (<FONT COLOR=red><A NAME="ref_523_19" HREF="terminal_interface-curses__adb.htm#ref_214_19">Win</A></FONT> :  <b>in</b> Window := Standard_Window;
-+-                  Ch  :  <b>in</b> Character);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_528_14" HREF="terminal_interface-curses__adb.htm#ref_160_14">Add</A></FONT> (<FONT COLOR=red><A NAME="ref_528_19" HREF="terminal_interface-curses__adb.htm#ref_160_19">Win</A></FONT> :  <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                  <FONT COLOR=red><A NAME="ref_529_19" HREF="terminal_interface-curses__adb.htm#ref_161_19">Ch</A></FONT>  :  <b>in</b> Character);
-+    <FONT COLOR=green><EM>--  Add a single character at the current logical cursor position to</EM></FONT>
-+    <FONT COLOR=green><EM>--  the window. Use the current windows attributes.</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_8"#2|</EM></FONT>
-+-   <b>procedure</b> Add
-+-     (<FONT COLOR=red><A NAME="ref_530_7" HREF="terminal_interface-curses__adb.htm#ref_225_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
-+-      <FONT COLOR=red><A NAME="ref_531_7" HREF="terminal_interface-curses__adb.htm#ref_226_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_532_7" HREF="terminal_interface-curses__adb.htm#ref_227_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Column_Position</A>;
-+-      Ch     : <b>in</b> Attributed_Character);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_9"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_534_14" HREF="terminal_interface-curses__adb.htm#ref_170_14">Add</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_535_7" HREF="terminal_interface-curses__adb.htm#ref_171_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_536_7" HREF="terminal_interface-curses__adb.htm#ref_172_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_537_7" HREF="terminal_interface-curses__adb.htm#ref_173_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_538_7" HREF="terminal_interface-curses__adb.htm#ref_174_7">Ch</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_addch.3x.html">mvwaddch()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: mvaddch()</EM></FONT>
-+ 
-+-   <b>procedure</b> Add
-+-     (<FONT COLOR=red><A NAME="ref_538_7" HREF="terminal_interface-curses__adb.htm#ref_244_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
-+-      <FONT COLOR=red><A NAME="ref_539_7" HREF="terminal_interface-curses__adb.htm#ref_245_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_540_7" HREF="terminal_interface-curses__adb.htm#ref_246_7">Column</A></FONT> : <b>in</b> Column_Position;
-+-      Ch     : <b>in</b> Character);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_542_14" HREF="terminal_interface-curses__adb.htm#ref_189_14">Add</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_543_7" HREF="terminal_interface-curses__adb.htm#ref_190_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_544_7" HREF="terminal_interface-curses__adb.htm#ref_191_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_545_7" HREF="terminal_interface-curses__adb.htm#ref_192_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_546_7" HREF="terminal_interface-curses__adb.htm#ref_193_7">Ch</A></FONT>     : <b>in</b> Character);
-+    <FONT COLOR=green><EM>--  Move to the position and add a single character into the window</EM></FONT>
-+    <FONT COLOR=green><EM>--  There are more Add routines, so the Inline pragma follows later</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_9"#2|</EM></FONT>
-+-   <b>procedure</b> Add_With_Immediate_Echo
-+-     (<FONT COLOR=red><A NAME="ref_547_7" HREF="terminal_interface-curses__adb.htm#ref_259_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Window</A> := Standard_Window;
-+-      Ch  : <b>in</b> Attributed_Character);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_10"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_551_14" HREF="terminal_interface-curses__adb.htm#ref_204_14">Add_With_Immediate_Echo</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_552_7" HREF="terminal_interface-curses__adb.htm#ref_205_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_553_7" HREF="terminal_interface-curses__adb.htm#ref_206_7">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_addch.3x.html">wechochar()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: echochar()</EM></FONT>
-+ 
-+-   <b>procedure</b> Add_With_Immediate_Echo
-+-     (<FONT COLOR=red><A NAME="ref_553_7" HREF="terminal_interface-curses__adb.htm#ref_272_7">Win</A></FONT> : <b>in</b> Window := Standard_Window;
-+-      Ch  : <b>in</b> Character);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_557_14" HREF="terminal_interface-curses__adb.htm#ref_217_14">Add_With_Immediate_Echo</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_558_7" HREF="terminal_interface-curses__adb.htm#ref_218_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_559_7" HREF="terminal_interface-curses__adb.htm#ref_219_7">Ch</A></FONT>  : <b>in</b> Character);
-+    <FONT COLOR=green><EM>--  Add a character and do an immediate refresh of the screen.</EM></FONT>
-+    <b>pragma</b> Inline (Add_With_Immediate_Echo);
-+ 
-+@@ -565,105 +570,105 @@
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  Not Implemented: wcursyncup</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_10"#2|</EM></FONT>
-+-   <b>function</b> Create
-+-     (<FONT COLOR=red><A NAME="ref_565_7" HREF="terminal_interface-curses__adb.htm#ref_283_21">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
-+-      <FONT COLOR=red><A NAME="ref_566_7" HREF="terminal_interface-curses__adb.htm#ref_284_21">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Count</A>;
-+-      <FONT COLOR=red><A NAME="ref_567_7" HREF="terminal_interface-curses__adb.htm#ref_285_21">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-      First_Column_Position : Column_Position) <b>return</b> Window;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_11"#2|</EM></FONT>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_569_13" HREF="terminal_interface-curses__adb.htm#ref_229_13">Create</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_570_7" HREF="terminal_interface-curses__adb.htm#ref_229_21">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-++      <FONT COLOR=red><A NAME="ref_571_7" HREF="terminal_interface-curses__adb.htm#ref_230_21">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-++      <FONT COLOR=red><A NAME="ref_572_7" HREF="terminal_interface-curses__adb.htm#ref_231_21">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_573_7" HREF="terminal_interface-curses__adb.htm#ref_232_21">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+    <FONT COLOR=green><EM>--  Not Implemented: Default Number_Of_Lines, Number_Of_Columns</EM></FONT>
-+    <FONT COLOR=green><EM>--  the C version lets them be 0, see the man page.</EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_window.3x.html">newwin()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Create);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_569_13">Create</A>);
-+ 
-+    <b>function</b> New_Window
-+-     (<FONT COLOR=red><A NAME="ref_575_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
-+-      <FONT COLOR=red><A NAME="ref_576_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Count</A>;
-+-      <FONT COLOR=red><A NAME="ref_577_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-      First_Column_Position : Column_Position) <b>return</b> Window
-+-     <b>renames</b> Create;
-++     (<FONT COLOR=red><A NAME="ref_580_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-++      <FONT COLOR=red><A NAME="ref_581_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-++      <FONT COLOR=red><A NAME="ref_582_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_583_7">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>
-++     <b>renames</b> <A HREF="terminal_interface-curses__ads.htm#ref_569_13">Create</A>;
-+    <FONT COLOR=green><EM>--  pragma Inline (New_Window);</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_11"#2|</EM></FONT>
-+-   <b>procedure</b> Delete (Win : <b>in</b> <b>out</b> Window);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_12"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_588_14" HREF="terminal_interface-curses__adb.htm#ref_252_14">Delete</A></FONT> (<FONT COLOR=red><A NAME="ref_588_22" HREF="terminal_interface-curses__adb.htm#ref_252_22">Win</A></FONT> : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_window.3x.html">delwin()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  Reset Win to Null_Window</EM></FONT>
-+-   <b>pragma</b> Inline (Delete);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_588_14">Delete</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_12"#2|</EM></FONT>
-+-   <b>function</b> Sub_Window
-+-     (<FONT COLOR=red><A NAME="ref_590_7" HREF="terminal_interface-curses__adb.htm#ref_318_7">Win</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Window</A> := Standard_Window;
-+-      <FONT COLOR=red><A NAME="ref_591_7" HREF="terminal_interface-curses__adb.htm#ref_319_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
-+-      <FONT COLOR=red><A NAME="ref_592_7" HREF="terminal_interface-curses__adb.htm#ref_320_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Count</A>;
-+-      <FONT COLOR=red><A NAME="ref_593_7" HREF="terminal_interface-curses__adb.htm#ref_321_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-      First_Column_Position : Column_Position) <b>return</b> Window;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_13"#2|</EM></FONT>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_594_13" HREF="terminal_interface-curses__adb.htm#ref_263_13">Sub_Window</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_595_7" HREF="terminal_interface-curses__adb.htm#ref_264_7">Win</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_596_7" HREF="terminal_interface-curses__adb.htm#ref_265_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-++      <FONT COLOR=red><A NAME="ref_597_7" HREF="terminal_interface-curses__adb.htm#ref_266_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-++      <FONT COLOR=red><A NAME="ref_598_7" HREF="terminal_interface-curses__adb.htm#ref_267_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_599_7" HREF="terminal_interface-curses__adb.htm#ref_268_7">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_window.3x.html">subwin()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Sub_Window);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_594_13">Sub_Window</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_13"#2|</EM></FONT>
-+-   <b>function</b> Derived_Window
-+-     (<FONT COLOR=red><A NAME="ref_600_7" HREF="terminal_interface-curses__adb.htm#ref_346_7">Win</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Window</A> := Standard_Window;
-+-      <FONT COLOR=red><A NAME="ref_601_7" HREF="terminal_interface-curses__adb.htm#ref_347_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
-+-      <FONT COLOR=red><A NAME="ref_602_7" HREF="terminal_interface-curses__adb.htm#ref_348_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Count</A>;
-+-      <FONT COLOR=red><A NAME="ref_603_7" HREF="terminal_interface-curses__adb.htm#ref_349_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-      First_Column_Position : Column_Position) <b>return</b> Window;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_14"#2|</EM></FONT>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_604_13" HREF="terminal_interface-curses__adb.htm#ref_291_13">Derived_Window</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_605_7" HREF="terminal_interface-curses__adb.htm#ref_292_7">Win</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_606_7" HREF="terminal_interface-curses__adb.htm#ref_293_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-++      <FONT COLOR=red><A NAME="ref_607_7" HREF="terminal_interface-curses__adb.htm#ref_294_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-++      <FONT COLOR=red><A NAME="ref_608_7" HREF="terminal_interface-curses__adb.htm#ref_295_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_609_7" HREF="terminal_interface-curses__adb.htm#ref_296_7">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_window.3x.html">derwin()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Derived_Window);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_604_13">Derived_Window</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_14"#2|</EM></FONT>
-+-   <b>function</b> Duplicate (Win : Window) <b>return</b> Window;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_15"#2|</EM></FONT>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_614_13" HREF="terminal_interface-curses__adb.htm#ref_319_13">Duplicate</A></FONT> (<FONT COLOR=red><A NAME="ref_614_24" HREF="terminal_interface-curses__adb.htm#ref_319_24">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_window.3x.html">dupwin()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Duplicate);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_614_13">Duplicate</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_15"#2|</EM></FONT>
-+-   <b>procedure</b> Move_Window (<FONT COLOR=red><A NAME="ref_614_27" HREF="terminal_interface-curses__adb.htm#ref_386_27">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A>;
-+-                          <FONT COLOR=red><A NAME="ref_615_27" HREF="terminal_interface-curses__adb.htm#ref_387_27">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-                          Column : <b>in</b> Column_Position);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_16"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_619_14" HREF="terminal_interface-curses__adb.htm#ref_332_14">Move_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_619_27" HREF="terminal_interface-curses__adb.htm#ref_332_27">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                          <FONT COLOR=red><A NAME="ref_620_27" HREF="terminal_interface-curses__adb.htm#ref_333_27">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++                          <FONT COLOR=red><A NAME="ref_621_27" HREF="terminal_interface-curses__adb.htm#ref_334_27">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_window.3x.html">mvwin()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Move_Window);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_619_14">Move_Window</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_16"#2|</EM></FONT>
-+-   <b>procedure</b> Move_Derived_Window (<FONT COLOR=red><A NAME="ref_621_35" HREF="terminal_interface-curses__adb.htm#ref_400_35">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A>;
-+-                                  <FONT COLOR=red><A NAME="ref_622_35" HREF="terminal_interface-curses__adb.htm#ref_401_35">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-                                  Column : <b>in</b> Column_Position);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_17"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_626_14" HREF="terminal_interface-curses__adb.htm#ref_346_14">Move_Derived_Window</A></FONT> (<FONT COLOR=red><A NAME="ref_626_35" HREF="terminal_interface-curses__adb.htm#ref_346_35">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                                  <FONT COLOR=red><A NAME="ref_627_35" HREF="terminal_interface-curses__adb.htm#ref_347_35">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++                                  <FONT COLOR=red><A NAME="ref_628_35" HREF="terminal_interface-curses__adb.htm#ref_348_35">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_window.3x.html">mvderwin()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Move_Derived_Window);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_626_14">Move_Derived_Window</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_17"#2|</EM></FONT>
-+-   <b>procedure</b> Synchronize_Upwards (Win : <b>in</b> Window);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_18"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_633_14">Synchronize_Upwards</A></FONT> (<FONT COLOR=red><A NAME="ref_633_35" HREF="terminal_interface-curses__ads.htm#ref_633_14">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_window.3x.html">wsyncup()</A></EM></FONT>
-+    <b>pragma</b> Import (C, Synchronize_Upwards, "wsyncup");
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_18"#2|</EM></FONT>
-+-   <b>procedure</b> Synchronize_Downwards (Win : <b>in</b> Window);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_19"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_638_14">Synchronize_Downwards</A></FONT> (<FONT COLOR=red><A NAME="ref_638_37" HREF="terminal_interface-curses__ads.htm#ref_638_14">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_window.3x.html">wsyncdown()</A></EM></FONT>
-+    <b>pragma</b> Import (C, Synchronize_Downwards, "wsyncdown");
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_19"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Synch_Mode (<FONT COLOR=red><A NAME="ref_638_30" HREF="terminal_interface-curses__adb.htm#ref_414_30">Win</A></FONT>  : <b>in</b> Window := Standard_Window;
-+-                             Mode : <b>in</b> Boolean := False);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_20"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_643_14" HREF="terminal_interface-curses__adb.htm#ref_360_14">Set_Synch_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_643_30" HREF="terminal_interface-curses__adb.htm#ref_360_30">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                             <FONT COLOR=red><A NAME="ref_644_30" HREF="terminal_interface-curses__adb.htm#ref_361_30">Mode</A></FONT> : <b>in</b> Boolean := False);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_window.3x.html">syncok()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Synch_Mode);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_643_14">Set_Synch_Mode</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_addstr.3x.html">curs_addstr.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_20"#2|</EM></FONT>
-+-   <b>procedure</b> Add (<FONT COLOR=red><A NAME="ref_648_19" HREF="terminal_interface-curses__adb.htm#ref_426_19">Win</A></FONT> : <b>in</b> Window := Standard_Window;
-+-                  <FONT COLOR=red><A NAME="ref_649_19" HREF="terminal_interface-curses__adb.htm#ref_427_19">Str</A></FONT> : <b>in</b> String;
-+-                  Len : <b>in</b> Integer := -1);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_21"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_653_14" HREF="terminal_interface-curses__adb.htm#ref_372_14">Add</A></FONT> (<FONT COLOR=red><A NAME="ref_653_19" HREF="terminal_interface-curses__adb.htm#ref_372_19">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                  <FONT COLOR=red><A NAME="ref_654_19" HREF="terminal_interface-curses__adb.htm#ref_373_19">Str</A></FONT> : <b>in</b> String;
-++                  <FONT COLOR=red><A NAME="ref_655_19" HREF="terminal_interface-curses__adb.htm#ref_374_19">Len</A></FONT> : <b>in</b> Integer := -1);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_addstr.3x.html">waddnstr()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: waddstr()</EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: addnstr()</EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: addstr()</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_21"#2|</EM></FONT>
-+-   <b>procedure</b> Add (<FONT COLOR=red><A NAME="ref_657_19" HREF="terminal_interface-curses__adb.htm#ref_445_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
-+-                  <FONT COLOR=red><A NAME="ref_658_19" HREF="terminal_interface-curses__adb.htm#ref_446_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-                  <FONT COLOR=red><A NAME="ref_659_19" HREF="terminal_interface-curses__adb.htm#ref_447_7">Column</A></FONT> : <b>in</b> Column_Position;
-+-                  <FONT COLOR=red><A NAME="ref_660_19" HREF="terminal_interface-curses__adb.htm#ref_448_7">Str</A></FONT>    : <b>in</b> String;
-+-                  Len    : <b>in</b> Integer := -1);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_22"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_662_14" HREF="terminal_interface-curses__adb.htm#ref_390_14">Add</A></FONT> (<FONT COLOR=red><A NAME="ref_662_19" HREF="terminal_interface-curses__adb.htm#ref_391_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                  <FONT COLOR=red><A NAME="ref_663_19" HREF="terminal_interface-curses__adb.htm#ref_392_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++                  <FONT COLOR=red><A NAME="ref_664_19" HREF="terminal_interface-curses__adb.htm#ref_393_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++                  <FONT COLOR=red><A NAME="ref_665_19" HREF="terminal_interface-curses__adb.htm#ref_394_7">Str</A></FONT>    : <b>in</b> String;
-++                  <FONT COLOR=red><A NAME="ref_666_19" HREF="terminal_interface-curses__adb.htm#ref_395_7">Len</A></FONT>    : <b>in</b> Integer := -1);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_addstr.3x.html">mvwaddnstr()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: mvwaddstr()</EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: mvaddnstr()</EM></FONT>
-+@@ -673,21 +678,21 @@
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_addchstr.3x.html">curs_addchstr.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_22"#2|</EM></FONT>
-+-   <b>procedure</b> Add (<FONT COLOR=red><A NAME="ref_672_19" HREF="terminal_interface-curses__adb.htm#ref_457_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Window</A> := Standard_Window;
-+-                  <FONT COLOR=red><A NAME="ref_673_19" HREF="terminal_interface-curses__adb.htm#ref_458_7">Str</A></FONT> : <b>in</b> Attributed_String;
-+-                  Len : <b>in</b> Integer := -1);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_23"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_677_14" HREF="terminal_interface-curses__adb.htm#ref_402_14">Add</A></FONT> (<FONT COLOR=red><A NAME="ref_677_19" HREF="terminal_interface-curses__adb.htm#ref_403_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                  <FONT COLOR=red><A NAME="ref_678_19" HREF="terminal_interface-curses__adb.htm#ref_404_7">Str</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Attributed_String</A>;
-++                  <FONT COLOR=red><A NAME="ref_679_19" HREF="terminal_interface-curses__adb.htm#ref_405_7">Len</A></FONT> : <b>in</b> Integer := -1);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_addchstr.3x.html">waddchnstr()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: waddchstr()</EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: addchnstr()</EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: addchstr()</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_23"#2|</EM></FONT>
-+-   <b>procedure</b> Add (<FONT COLOR=red><A NAME="ref_681_19" HREF="terminal_interface-curses__adb.htm#ref_480_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
-+-                  <FONT COLOR=red><A NAME="ref_682_19" HREF="terminal_interface-curses__adb.htm#ref_481_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-                  <FONT COLOR=red><A NAME="ref_683_19" HREF="terminal_interface-curses__adb.htm#ref_482_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Column_Position</A>;
-+-                  <FONT COLOR=red><A NAME="ref_684_19" HREF="terminal_interface-curses__adb.htm#ref_483_7">Str</A></FONT>    : <b>in</b> Attributed_String;
-+-                  Len    : <b>in</b> Integer := -1);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_24"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_686_14" HREF="terminal_interface-curses__adb.htm#ref_425_14">Add</A></FONT> (<FONT COLOR=red><A NAME="ref_686_19" HREF="terminal_interface-curses__adb.htm#ref_426_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                  <FONT COLOR=red><A NAME="ref_687_19" HREF="terminal_interface-curses__adb.htm#ref_427_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++                  <FONT COLOR=red><A NAME="ref_688_19" HREF="terminal_interface-curses__adb.htm#ref_428_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++                  <FONT COLOR=red><A NAME="ref_689_19" HREF="terminal_interface-curses__adb.htm#ref_429_7">Str</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Attributed_String</A>;
-++                  <FONT COLOR=red><A NAME="ref_690_19" HREF="terminal_interface-curses__adb.htm#ref_430_7">Len</A></FONT>    : <b>in</b> Integer := -1);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_addchstr.3x.html">mvwaddchnstr()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: mvwaddchstr()</EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: mvaddchnstr()</EM></FONT>
-+@@ -700,92 +705,92 @@
-+    <FONT COLOR=green><EM>--  | Not implemented: mvhline,  mvwhline, mvvline, mvwvline</EM></FONT>
-+    <FONT COLOR=green><EM>--  | use Move_Cursor then Horizontal_Line or Vertical_Line</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_24"#2|</EM></FONT>
-+-   <b>procedure</b> Border
-+-     (<FONT COLOR=red><A NAME="ref_700_7" HREF="terminal_interface-curses__adb.htm#ref_492_7">Win</A></FONT>                       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Window</A> := Standard_Window;
-+-      <FONT COLOR=red><A NAME="ref_701_7" HREF="terminal_interface-curses__adb.htm#ref_493_7">Left_Side_Symbol</A></FONT>          : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+-      <FONT COLOR=red><A NAME="ref_702_7" HREF="terminal_interface-curses__adb.htm#ref_494_7">Right_Side_Symbol</A></FONT>         : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+-      <FONT COLOR=red><A NAME="ref_703_7" HREF="terminal_interface-curses__adb.htm#ref_495_7">Top_Side_Symbol</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+-      <FONT COLOR=red><A NAME="ref_704_7" HREF="terminal_interface-curses__adb.htm#ref_496_7">Bottom_Side_Symbol</A></FONT>        : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+-      <FONT COLOR=red><A NAME="ref_705_7" HREF="terminal_interface-curses__adb.htm#ref_497_7">Upper_Left_Corner_Symbol</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+-      <FONT COLOR=red><A NAME="ref_706_7" HREF="terminal_interface-curses__adb.htm#ref_498_7">Upper_Right_Corner_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+-      <FONT COLOR=red><A NAME="ref_707_7" HREF="terminal_interface-curses__adb.htm#ref_499_7">Lower_Left_Corner_Symbol</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+-      Lower_Right_Corner_Symbol : <b>in</b> Attributed_Character := Default_Character
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_25"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_704_14" HREF="terminal_interface-curses__adb.htm#ref_437_14">Border</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_705_7" HREF="terminal_interface-curses__adb.htm#ref_438_7">Win</A></FONT>                       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_706_7" HREF="terminal_interface-curses__adb.htm#ref_439_7">Left_Side_Symbol</A></FONT>          : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-++      <FONT COLOR=red><A NAME="ref_707_7" HREF="terminal_interface-curses__adb.htm#ref_440_7">Right_Side_Symbol</A></FONT>         : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-++      <FONT COLOR=red><A NAME="ref_708_7" HREF="terminal_interface-curses__adb.htm#ref_441_7">Top_Side_Symbol</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-++      <FONT COLOR=red><A NAME="ref_709_7" HREF="terminal_interface-curses__adb.htm#ref_442_7">Bottom_Side_Symbol</A></FONT>        : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-++      <FONT COLOR=red><A NAME="ref_710_7" HREF="terminal_interface-curses__adb.htm#ref_443_7">Upper_Left_Corner_Symbol</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-++      <FONT COLOR=red><A NAME="ref_711_7" HREF="terminal_interface-curses__adb.htm#ref_444_7">Upper_Right_Corner_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-++      <FONT COLOR=red><A NAME="ref_712_7" HREF="terminal_interface-curses__adb.htm#ref_445_7">Lower_Left_Corner_Symbol</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-++      <FONT COLOR=red><A NAME="ref_713_7" HREF="terminal_interface-curses__adb.htm#ref_446_7">Lower_Right_Corner_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>
-+      );
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_border.3x.html">wborder()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: border()</EM></FONT>
-+-   <b>pragma</b> Inline (Border);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_704_14">Border</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_25"#2|</EM></FONT>
-+-   <b>procedure</b> Box
-+-     (<FONT COLOR=red><A NAME="ref_716_7" HREF="terminal_interface-curses__adb.htm#ref_529_7">Win</A></FONT>               : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Window</A> := Standard_Window;
-+-      <FONT COLOR=red><A NAME="ref_717_7" HREF="terminal_interface-curses__adb.htm#ref_530_7">Vertical_Symbol</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-+-      Horizontal_Symbol : <b>in</b> Attributed_Character := Default_Character);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_26"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_720_14" HREF="terminal_interface-curses__adb.htm#ref_474_14">Box</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_721_7" HREF="terminal_interface-curses__adb.htm#ref_475_7">Win</A></FONT>               : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_722_7" HREF="terminal_interface-curses__adb.htm#ref_476_7">Vertical_Symbol</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>;
-++      <FONT COLOR=red><A NAME="ref_723_7" HREF="terminal_interface-curses__adb.htm#ref_477_7">Horizontal_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_border.3x.html">box()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Box);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_720_14">Box</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_26"#2|</EM></FONT>
-+-   <b>procedure</b> Horizontal_Line
-+-     (<FONT COLOR=red><A NAME="ref_724_7" HREF="terminal_interface-curses__adb.htm#ref_540_7">Win</A></FONT>         : <b>in</b> Window := Standard_Window;
-+-      <FONT COLOR=red><A NAME="ref_725_7" HREF="terminal_interface-curses__adb.htm#ref_541_7">Line_Size</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Natural</A>;
-+-      Line_Symbol : <b>in</b> Attributed_Character := Default_Character);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_27"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_728_14" HREF="terminal_interface-curses__adb.htm#ref_485_14">Horizontal_Line</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_729_7" HREF="terminal_interface-curses__adb.htm#ref_486_7">Win</A></FONT>         : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_730_7" HREF="terminal_interface-curses__adb.htm#ref_487_7">Line_Size</A></FONT>   : <b>in</b> Natural;
-++      <FONT COLOR=red><A NAME="ref_731_7" HREF="terminal_interface-curses__adb.htm#ref_488_7">Line_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_border.3x.html">whline()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: hline()</EM></FONT>
-+-   <b>pragma</b> Inline (Horizontal_Line);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_728_14">Horizontal_Line</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_27"#2|</EM></FONT>
-+-   <b>procedure</b> Vertical_Line
-+-     (<FONT COLOR=red><A NAME="ref_733_7" HREF="terminal_interface-curses__adb.htm#ref_557_7">Win</A></FONT>         : <b>in</b> Window := Standard_Window;
-+-      <FONT COLOR=red><A NAME="ref_734_7" HREF="terminal_interface-curses__adb.htm#ref_558_7">Line_Size</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Natural</A>;
-+-      Line_Symbol : <b>in</b> Attributed_Character := Default_Character);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_28"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_737_14" HREF="terminal_interface-curses__adb.htm#ref_502_14">Vertical_Line</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_738_7" HREF="terminal_interface-curses__adb.htm#ref_503_7">Win</A></FONT>         : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_739_7" HREF="terminal_interface-curses__adb.htm#ref_504_7">Line_Size</A></FONT>   : <b>in</b> Natural;
-++      <FONT COLOR=red><A NAME="ref_740_7" HREF="terminal_interface-curses__adb.htm#ref_505_7">Line_Symbol</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A> := <A HREF="terminal_interface-curses__ads.htm#ref_371_4">Default_Character</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_border.3x.html">wvline()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: vline()</EM></FONT>
-+-   <b>pragma</b> Inline (Vertical_Line);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_737_14">Vertical_Line</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_getch.3x.html">curs_getch.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  Not implemented: mvgetch, mvwgetch</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_28"#2|</EM></FONT>
-+-   <b>function</b> Get_Keystroke (Win : Window := Standard_Window)
-+-                           <b>return</b> Real_Key_Code;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_29"#2|</EM></FONT>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_751_13" HREF="terminal_interface-curses__adb.htm#ref_520_13">Get_Keystroke</A></FONT> (<FONT COLOR=red><A NAME="ref_751_28" HREF="terminal_interface-curses__adb.htm#ref_520_28">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-++                           <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_getch.3x.html">wgetch()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: getch()</EM></FONT>
-+    <FONT COLOR=green><EM>--  Get a character from the keyboard and echo it - if enabled - to the</EM></FONT>
-+    <FONT COLOR=green><EM>--  window.</EM></FONT>
-+    <FONT COLOR=green><EM>--  If for any reason (i.e. a timeout) we couldn't get a character the</EM></FONT>
-+    <FONT COLOR=green><EM>--  returned keycode is Key_None.</EM></FONT>
-+-   <b>pragma</b> Inline (Get_Keystroke);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_751_13">Get_Keystroke</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_29"#2|</EM></FONT>
-+-   <b>procedure</b> Undo_Keystroke (Key : <b>in</b> Real_Key_Code);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_30"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_762_14" HREF="terminal_interface-curses__adb.htm#ref_535_14">Undo_Keystroke</A></FONT> (<FONT COLOR=red><A NAME="ref_762_30" HREF="terminal_interface-curses__adb.htm#ref_535_30">Key</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_getch.3x.html">ungetch()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Undo_Keystroke);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_762_14">Undo_Keystroke</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_30"#2|</EM></FONT>
-+-   <b>function</b> Has_Key (Key : Special_Key_Code) <b>return</b> Boolean;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_31"#2|</EM></FONT>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_767_13" HREF="terminal_interface-curses__adb.htm#ref_545_13">Has_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_767_22" HREF="terminal_interface-curses__adb.htm#ref_545_22">Key</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>) <b>return</b> Boolean;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_getch.3x.html">has_key()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Has_Key);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_767_13">Has_Key</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Some helper functions</EM></FONT>
-+    <FONT COLOR=green><EM>--  |</EM></FONT>
-+-   <b>function</b> Is_Function_Key (Key : Special_Key_Code) <b>return</b> Boolean;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_774_13" HREF="terminal_interface-curses__adb.htm#ref_557_13">Is_Function_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_774_30" HREF="terminal_interface-curses__adb.htm#ref_557_30">Key</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>) <b>return</b> Boolean;
-+    <FONT COLOR=green><EM>--  Return True if the Key is a function key (i.e. one of F0 .. F63)</EM></FONT>
-+-   <b>pragma</b> Inline (Is_Function_Key);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_774_13">Is_Function_Key</A>);
-+ 
-+-   <b>subtype</b> Function_Key_Number <b>is</b> Integer <b>range</b> 0 .. 63;
-++   <b>subtype</b> <FONT COLOR=red><A NAME="ref_778_12">Function_Key_Number</A></FONT> <b>is</b> Integer <b>range</b> 0 .. 63;
-+    <FONT COLOR=green><EM>--  (n)curses allows for 64 function keys.</EM></FONT>
-+ 
-+-   <b>function</b> Function_Key (Key : Real_Key_Code) <b>return</b> Function_Key_Number;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_781_13" HREF="terminal_interface-curses__adb.htm#ref_569_13">Function_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_781_27" HREF="terminal_interface-curses__adb.htm#ref_569_27">Key</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_778_12">Function_Key_Number</A>;
-+    <FONT COLOR=green><EM>--  Return the number of the function key. If the code is not a</EM></FONT>
-+    <FONT COLOR=green><EM>--  function key, a CONSTRAINT_ERROR will be raised.</EM></FONT>
-+-   <b>pragma</b> Inline (Function_Key);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_781_13">Function_Key</A>);
-+ 
-+-   <b>function</b> Function_Key_Code (Key : Function_Key_Number) <b>return</b> Real_Key_Code;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_786_13" HREF="terminal_interface-curses__adb.htm#ref_580_13">Function_Key_Code</A></FONT> (<FONT COLOR=red><A NAME="ref_786_32" HREF="terminal_interface-curses__adb.htm#ref_580_32">Key</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_778_12">Function_Key_Number</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>;
-+    <FONT COLOR=green><EM>--  Return the key code for a given function-key number.</EM></FONT>
-+-   <b>pragma</b> Inline (Function_Key_Code);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_786_13">Function_Key_Code</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_attr.3x.html">curs_attr.3x</A></EM></FONT>
-+@@ -796,68 +801,68 @@
-+    <FONT COLOR=green><EM>--  PAIR_NUMBER</EM></FONT>
-+    <FONT COLOR=green><EM>--  PAIR_NUMBER(c) is the same as c.Color</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_31"#2|</EM></FONT>
-+-   <b>procedure</b> Standout (<FONT COLOR=red><A NAME="ref_795_24" HREF="terminal_interface-curses__adb.htm#ref_640_24">Win</A></FONT> : Window  := Standard_Window;
-+-                       On  : Boolean := True);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_32"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_800_14" HREF="terminal_interface-curses__adb.htm#ref_586_14">Standout</A></FONT> (<FONT COLOR=red><A NAME="ref_800_24" HREF="terminal_interface-curses__adb.htm#ref_586_24">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>  := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                       <FONT COLOR=red><A NAME="ref_801_24" HREF="terminal_interface-curses__adb.htm#ref_587_24">On</A></FONT>  : Boolean := True);
-+    <FONT COLOR=green><EM>--  AKA: wstandout()</EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: wstandend()</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_32"#2|</EM></FONT>
-+-   <b>procedure</b> Switch_Character_Attribute
-+-     (<FONT COLOR=red><A NAME="ref_802_7" HREF="terminal_interface-curses__adb.htm#ref_661_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Window</A> := Standard_Window;
-+-      <FONT COLOR=red><A NAME="ref_803_7" HREF="terminal_interface-curses__adb.htm#ref_662_7">Attr</A></FONT> : <b>in</b> Character_Attribute_Set := Normal_Video;
-+-      On   : <b>in</b> Boolean := True); <FONT COLOR=green><EM>--  if False we switch Off.</EM></FONT>
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_33"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_806_14" HREF="terminal_interface-curses__adb.htm#ref_606_14">Switch_Character_Attribute</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_807_7" HREF="terminal_interface-curses__adb.htm#ref_607_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_808_7" HREF="terminal_interface-curses__adb.htm#ref_608_7">Attr</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-++      <FONT COLOR=red><A NAME="ref_809_7" HREF="terminal_interface-curses__adb.htm#ref_609_7">On</A></FONT>   : <b>in</b> Boolean := True); <FONT COLOR=green><EM>--  if False we switch Off.</EM></FONT>
-+    <FONT COLOR=green><EM>--  Switches those Attributes set to true in the list.</EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_attr.3x.html">wattron()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: wattroff()</EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: attron()</EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: attroff()</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_33"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Character_Attributes
-+-     (<FONT COLOR=red><A NAME="ref_813_7" HREF="terminal_interface-curses__adb.htm#ref_689_7">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Window</A> := Standard_Window;
-+-      <FONT COLOR=red><A NAME="ref_814_7" HREF="terminal_interface-curses__adb.htm#ref_690_7">Attr</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character_Attribute_Set</A> := Normal_Video;
-+-      Color : <b>in</b> Color_Pair := Color_Pair'First);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_34"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_817_14" HREF="terminal_interface-curses__adb.htm#ref_634_14">Set_Character_Attributes</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_818_7" HREF="terminal_interface-curses__adb.htm#ref_635_7">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_819_7" HREF="terminal_interface-curses__adb.htm#ref_636_7">Attr</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-++      <FONT COLOR=red><A NAME="ref_820_7" HREF="terminal_interface-curses__adb.htm#ref_637_7">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_attr.3x.html">wattrset()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: attrset()</EM></FONT>
-+-   <b>pragma</b> Inline (Set_Character_Attributes);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_817_14">Set_Character_Attributes</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_34"#2|</EM></FONT>
-+-   <b>function</b> Get_Character_Attribute
-+-     (Win : <b>in</b> Window := Standard_Window) <b>return</b> Character_Attribute_Set;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_35"#2|</EM></FONT>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_826_13" HREF="terminal_interface-curses__adb.htm#ref_652_13">Get_Character_Attribute</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_827_7" HREF="terminal_interface-curses__adb.htm#ref_652_38">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_attr.3x.html">wattr_get()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: attr_get()</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_35"#2|</EM></FONT>
-+-   <b>function</b> Get_Character_Attribute
-+-     (Win : <b>in</b> Window := Standard_Window) <b>return</b> Color_Pair;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_36"#2|</EM></FONT>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_832_13" HREF="terminal_interface-curses__adb.htm#ref_675_13">Get_Character_Attribute</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_833_7" HREF="terminal_interface-curses__adb.htm#ref_675_38">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_attr.3x.html">wattr_get()</A></EM></FONT>
-+    <b>pragma</b> Inline (Get_Character_Attribute);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_36"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Color (<FONT COLOR=red><A NAME="ref_833_25" HREF="terminal_interface-curses__adb.htm#ref_752_25">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Window</A> := Standard_Window;
-+-                        Pair : <b>in</b> Color_Pair);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_37"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_838_14" HREF="terminal_interface-curses__adb.htm#ref_698_14">Set_Color</A></FONT> (<FONT COLOR=red><A NAME="ref_838_25" HREF="terminal_interface-curses__adb.htm#ref_698_25">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                        <FONT COLOR=red><A NAME="ref_839_25" HREF="terminal_interface-curses__adb.htm#ref_699_25">Pair</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_attr.3x.html">wcolor_set()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: color_set()</EM></FONT>
-+-   <b>pragma</b> Inline (Set_Color);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_838_14">Set_Color</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_37"#2|</EM></FONT>
-+-   <b>procedure</b> Change_Attributes
-+-     (<FONT COLOR=red><A NAME="ref_841_7" HREF="terminal_interface-curses__adb.htm#ref_768_7">Win</A></FONT>   : <b>in</b> Window := Standard_Window;
-+-      <FONT COLOR=red><A NAME="ref_842_7" HREF="terminal_interface-curses__adb.htm#ref_769_7">Count</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Integer</A> := -1;
-+-      <FONT COLOR=red><A NAME="ref_843_7" HREF="terminal_interface-curses__adb.htm#ref_770_7">Attr</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character_Attribute_Set</A> := Normal_Video;
-+-      Color : <b>in</b> Color_Pair := Color_Pair'First);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_38"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_845_14" HREF="terminal_interface-curses__adb.htm#ref_713_14">Change_Attributes</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_846_7" HREF="terminal_interface-curses__adb.htm#ref_714_7">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_847_7" HREF="terminal_interface-curses__adb.htm#ref_715_7">Count</A></FONT> : <b>in</b> Integer := -1;
-++      <FONT COLOR=red><A NAME="ref_848_7" HREF="terminal_interface-curses__adb.htm#ref_716_7">Attr</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-++      <FONT COLOR=red><A NAME="ref_849_7" HREF="terminal_interface-curses__adb.htm#ref_717_7">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_attr.3x.html">wchgat()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: chgat()</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_38"#2|</EM></FONT>
-+-   <b>procedure</b> Change_Attributes
-+-     (<FONT COLOR=red><A NAME="ref_850_7" HREF="terminal_interface-curses__adb.htm#ref_791_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
-+-      <FONT COLOR=red><A NAME="ref_851_7" HREF="terminal_interface-curses__adb.htm#ref_792_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A> := Line_Position'First;
-+-      <FONT COLOR=red><A NAME="ref_852_7" HREF="terminal_interface-curses__adb.htm#ref_793_7">Column</A></FONT> : <b>in</b> Column_Position := Column_Position'First;
-+-      <FONT COLOR=red><A NAME="ref_853_7" HREF="terminal_interface-curses__adb.htm#ref_794_7">Count</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Integer</A> := -1;
-+-      <FONT COLOR=red><A NAME="ref_854_7" HREF="terminal_interface-curses__adb.htm#ref_795_7">Attr</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character_Attribute_Set</A> := Normal_Video;
-+-      Color  : <b>in</b> Color_Pair := Color_Pair'First);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_39"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_854_14" HREF="terminal_interface-curses__adb.htm#ref_736_14">Change_Attributes</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_855_7" HREF="terminal_interface-curses__adb.htm#ref_737_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_856_7" HREF="terminal_interface-curses__adb.htm#ref_738_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A> := <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>'First;
-++      <FONT COLOR=red><A NAME="ref_857_7" HREF="terminal_interface-curses__adb.htm#ref_739_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A> := <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>'First;
-++      <FONT COLOR=red><A NAME="ref_858_7" HREF="terminal_interface-curses__adb.htm#ref_740_7">Count</A></FONT>  : <b>in</b> Integer := -1;
-++      <FONT COLOR=red><A NAME="ref_859_7" HREF="terminal_interface-curses__adb.htm#ref_741_7">Attr</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-++      <FONT COLOR=red><A NAME="ref_860_7" HREF="terminal_interface-curses__adb.htm#ref_742_7">Color</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_attr.3x.html">mvwchgat()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: mvchgat()</EM></FONT>
-+    <b>pragma</b> Inline (Change_Attributes);
-+@@ -866,15 +871,15 @@
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_beep.3x.html">curs_beep.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_39"#2|</EM></FONT>
-+-   <b>procedure</b> Beep;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_40"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_870_14" HREF="terminal_interface-curses__adb.htm#ref_749_14">Beep</A></FONT>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_beep.3x.html">beep()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Beep);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_870_14">Beep</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_40"#2|</EM></FONT>
-+-   <b>procedure</b> Flash_Screen;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_41"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_875_14" HREF="terminal_interface-curses__adb.htm#ref_759_14">Flash_Screen</A></FONT>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_beep.3x.html">flash()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Flash_Screen);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_875_14">Flash_Screen</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_inopts.3x.html">curs_inopts.3x</A></EM></FONT>
-+@@ -882,76 +887,76 @@
-+ 
-+    <FONT COLOR=green><EM>--  | Not implemented : typeahead</EM></FONT>
-+    <FONT COLOR=green><EM>--</EM></FONT>
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_41"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Cbreak_Mode (SwitchOn : <b>in</b> Boolean := True);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_42"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_886_14" HREF="terminal_interface-curses__adb.htm#ref_769_14">Set_Cbreak_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_886_31" HREF="terminal_interface-curses__adb.htm#ref_769_31">SwitchOn</A></FONT> : <b>in</b> Boolean := True);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_inopts.3x.html">cbreak()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: nocbreak()</EM></FONT>
-+-   <b>pragma</b> Inline (Set_Cbreak_Mode);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_886_14">Set_Cbreak_Mode</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_42"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Raw_Mode (SwitchOn : <b>in</b> Boolean := True);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_43"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_892_14" HREF="terminal_interface-curses__adb.htm#ref_788_14">Set_Raw_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_892_28" HREF="terminal_interface-curses__adb.htm#ref_788_28">SwitchOn</A></FONT> : <b>in</b> Boolean := True);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_inopts.3x.html">raw()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: noraw()</EM></FONT>
-+-   <b>pragma</b> Inline (Set_Raw_Mode);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_892_14">Set_Raw_Mode</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_43"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Echo_Mode (SwitchOn : <b>in</b> Boolean := True);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_44"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_898_14" HREF="terminal_interface-curses__adb.htm#ref_807_14">Set_Echo_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_898_29" HREF="terminal_interface-curses__adb.htm#ref_807_29">SwitchOn</A></FONT> : <b>in</b> Boolean := True);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_inopts.3x.html">echo()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: noecho()</EM></FONT>
-+-   <b>pragma</b> Inline (Set_Echo_Mode);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_898_14">Set_Echo_Mode</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_44"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Meta_Mode (<FONT COLOR=red><A NAME="ref_899_29" HREF="terminal_interface-curses__adb.htm#ref_880_29">Win</A></FONT>      : <b>in</b> Window := Standard_Window;
-+-                            SwitchOn : <b>in</b> Boolean := True);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_45"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_904_14" HREF="terminal_interface-curses__adb.htm#ref_826_14">Set_Meta_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_904_29" HREF="terminal_interface-curses__adb.htm#ref_826_29">Win</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                            <FONT COLOR=red><A NAME="ref_905_29" HREF="terminal_interface-curses__adb.htm#ref_827_29">SwitchOn</A></FONT> : <b>in</b> Boolean := True);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_inopts.3x.html">meta()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Meta_Mode);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_904_14">Set_Meta_Mode</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_45"#2|</EM></FONT>
-+-   <b>procedure</b> Set_KeyPad_Mode (<FONT COLOR=red><A NAME="ref_905_31" HREF="terminal_interface-curses__adb.htm#ref_891_31">Win</A></FONT>      : <b>in</b> Window := Standard_Window;
-+-                              SwitchOn : <b>in</b> Boolean := True);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_46"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_910_14" HREF="terminal_interface-curses__adb.htm#ref_837_14">Set_KeyPad_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_910_31" HREF="terminal_interface-curses__adb.htm#ref_837_31">Win</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                              <FONT COLOR=red><A NAME="ref_911_31" HREF="terminal_interface-curses__adb.htm#ref_838_31">SwitchOn</A></FONT> : <b>in</b> Boolean := True);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_inopts.3x.html">keypad()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_KeyPad_Mode);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_910_14">Set_KeyPad_Mode</A>);
-+ 
-+-   <b>function</b> Get_KeyPad_Mode (Win : <b>in</b> Window := Standard_Window)
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_915_13" HREF="terminal_interface-curses__adb.htm#ref_848_13">Get_KeyPad_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_915_30" HREF="terminal_interface-curses__adb.htm#ref_848_30">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-+                              <b>return</b> Boolean;
-+    <FONT COLOR=green><EM>--  This has no pendant in C. There you've to look into the WINDOWS</EM></FONT>
-+    <FONT COLOR=green><EM>--  structure to get the value. Bad practice, not repeated in Ada.</EM></FONT>
-+ 
-+-   <b>type</b> Half_Delay_Amount <b>is</b> <b>range</b> 1 .. 255;
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_920_9">Half_Delay_Amount</A></FONT> <b>is</b> <b>range</b> 1 .. 255;
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_46"#2|</EM></FONT>
-+-   <b>procedure</b> Half_Delay (Amount : <b>in</b> Half_Delay_Amount);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_47"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_923_14" HREF="terminal_interface-curses__adb.htm#ref_857_14">Half_Delay</A></FONT> (<FONT COLOR=red><A NAME="ref_923_26" HREF="terminal_interface-curses__adb.htm#ref_857_26">Amount</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_920_9">Half_Delay_Amount</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_inopts.3x.html">halfdelay()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Half_Delay);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_923_14">Half_Delay</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_47"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Flush_On_Interrupt_Mode
-+-     (<FONT COLOR=red><A NAME="ref_924_7" HREF="terminal_interface-curses__adb.htm#ref_920_7">Win</A></FONT>  : <b>in</b> Window := Standard_Window;
-+-      Mode : <b>in</b> Boolean := True);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_48"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_928_14" HREF="terminal_interface-curses__adb.htm#ref_867_14">Set_Flush_On_Interrupt_Mode</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_929_7" HREF="terminal_interface-curses__adb.htm#ref_868_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_930_7" HREF="terminal_interface-curses__adb.htm#ref_869_7">Mode</A></FONT> : <b>in</b> Boolean := True);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_inopts.3x.html">intrflush()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Flush_On_Interrupt_Mode);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_928_14">Set_Flush_On_Interrupt_Mode</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_48"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Queue_Interrupt_Mode
-+-     (<FONT COLOR=red><A NAME="ref_931_7" HREF="terminal_interface-curses__adb.htm#ref_932_7">Win</A></FONT>   : <b>in</b> Window := Standard_Window;
-+-      Flush : <b>in</b> Boolean := True);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_49"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_935_14" HREF="terminal_interface-curses__adb.htm#ref_879_14">Set_Queue_Interrupt_Mode</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_936_7" HREF="terminal_interface-curses__adb.htm#ref_880_7">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_937_7" HREF="terminal_interface-curses__adb.htm#ref_881_7">Flush</A></FONT> : <b>in</b> Boolean := True);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_inopts.3x.html">qiflush()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: noqiflush()</EM></FONT>
-+-   <b>pragma</b> Inline (Set_Queue_Interrupt_Mode);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_935_14">Set_Queue_Interrupt_Mode</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_49"#2|</EM></FONT>
-+-   <b>procedure</b> Set_NoDelay_Mode
-+-     (<FONT COLOR=red><A NAME="ref_939_7" HREF="terminal_interface-curses__adb.htm#ref_951_7">Win</A></FONT>  : <b>in</b> Window := Standard_Window;
-+-      Mode : <b>in</b> Boolean := False);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_50"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_943_14" HREF="terminal_interface-curses__adb.htm#ref_898_14">Set_NoDelay_Mode</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_944_7" HREF="terminal_interface-curses__adb.htm#ref_899_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_945_7" HREF="terminal_interface-curses__adb.htm#ref_900_7">Mode</A></FONT> : <b>in</b> Boolean := False);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_inopts.3x.html">nodelay()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_NoDelay_Mode);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_943_14">Set_NoDelay_Mode</A>);
-+ 
-+-   <b>type</b> Timeout_Mode <b>is</b> (Blocking, Non_Blocking, Delayed);
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_949_9">Timeout_Mode</A></FONT> <b>is</b> (<FONT COLOR=red><A NAME="ref_949_26">Blocking</A></FONT>, <FONT COLOR=red><A NAME="ref_949_36">Non_Blocking</A></FONT>, <FONT COLOR=red><A NAME="ref_949_50">Delayed</A></FONT>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_50"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Timeout_Mode (<FONT COLOR=red><A NAME="ref_947_32" HREF="terminal_interface-curses__adb.htm#ref_962_32">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_943_9">Window</A> := Standard_Window;
-+-                               <FONT COLOR=red><A NAME="ref_948_32" HREF="terminal_interface-curses__adb.htm#ref_963_32">Mode</A></FONT>   : <b>in</b> Timeout_Mode;
-+-                               Amount : <b>in</b> Natural); <FONT COLOR=green><EM>--  in Milliseconds</EM></FONT>
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_51"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_952_14" HREF="terminal_interface-curses__adb.htm#ref_910_14">Set_Timeout_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_952_32" HREF="terminal_interface-curses__adb.htm#ref_910_32">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                               <FONT COLOR=red><A NAME="ref_953_32" HREF="terminal_interface-curses__adb.htm#ref_911_32">Mode</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_949_9">Timeout_Mode</A>;
-++                               <FONT COLOR=red><A NAME="ref_954_32" HREF="terminal_interface-curses__adb.htm#ref_912_32">Amount</A></FONT> : <b>in</b> Natural); <FONT COLOR=green><EM>--  in Milliseconds</EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_inopts.3x.html">wtimeout()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: timeout()</EM></FONT>
-+    <FONT COLOR=green><EM>--  Instead of overloading the semantic of the sign of amount, we</EM></FONT>
-+@@ -960,109 +965,109 @@
-+    <FONT COLOR=green><EM>--  evaluated.</EM></FONT>
-+    <FONT COLOR=green><EM>--  We don't inline this procedure.</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_51"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Escape_Timer_Mode
-+-     (<FONT COLOR=red><A NAME="ref_960_7" HREF="terminal_interface-curses__adb.htm#ref_986_7">Win</A></FONT>       : <b>in</b> Window := Standard_Window;
-+-      Timer_Off : <b>in</b> Boolean := False);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_52"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_964_14" HREF="terminal_interface-curses__adb.htm#ref_931_14">Set_Escape_Timer_Mode</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_965_7" HREF="terminal_interface-curses__adb.htm#ref_932_7">Win</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_966_7" HREF="terminal_interface-curses__adb.htm#ref_933_7">Timer_Off</A></FONT> : <b>in</b> Boolean := False);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_inopts.3x.html">notimeout()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Escape_Timer_Mode);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_964_14">Set_Escape_Timer_Mode</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_outopts.3x.html">curs_outopts.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_52"#2|</EM></FONT>
-+-   <b>procedure</b> Set_NL_Mode (SwitchOn : <b>in</b> Boolean := True);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_53"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_975_14" HREF="terminal_interface-curses__adb.htm#ref_945_14">Set_NL_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_975_27" HREF="terminal_interface-curses__adb.htm#ref_945_27">SwitchOn</A></FONT> : <b>in</b> Boolean := True);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_outopts.3x.html">nl()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: nonl()</EM></FONT>
-+-   <b>pragma</b> Inline (Set_NL_Mode);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_975_14">Set_NL_Mode</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_53"#2|</EM></FONT>
-+-   <b>procedure</b> Clear_On_Next_Update
-+-     (<FONT COLOR=red><A NAME="ref_977_7" HREF="terminal_interface-curses__adb.htm#ref_1019_7">Win</A></FONT>      : <b>in</b> Window := Standard_Window;
-+-      Do_Clear : <b>in</b> Boolean := True);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_54"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_981_14" HREF="terminal_interface-curses__adb.htm#ref_964_14">Clear_On_Next_Update</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_982_7" HREF="terminal_interface-curses__adb.htm#ref_965_7">Win</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_983_7" HREF="terminal_interface-curses__adb.htm#ref_966_7">Do_Clear</A></FONT> : <b>in</b> Boolean := True);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_outopts.3x.html">clearok()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Clear_On_Next_Update);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_981_14">Clear_On_Next_Update</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_54"#2|</EM></FONT>
-+-   <b>procedure</b> Use_Insert_Delete_Line
-+-     (<FONT COLOR=red><A NAME="ref_984_7" HREF="terminal_interface-curses__adb.htm#ref_1031_7">Win</A></FONT>    : <b>in</b> Window := Standard_Window;
-+-      Do_Idl : <b>in</b> Boolean := True);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_55"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_988_14" HREF="terminal_interface-curses__adb.htm#ref_976_14">Use_Insert_Delete_Line</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_989_7" HREF="terminal_interface-curses__adb.htm#ref_977_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_990_7" HREF="terminal_interface-curses__adb.htm#ref_978_7">Do_Idl</A></FONT> : <b>in</b> Boolean := True);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_outopts.3x.html">idlok()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Use_Insert_Delete_Line);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_988_14">Use_Insert_Delete_Line</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_55"#2|</EM></FONT>
-+-   <b>procedure</b> Use_Insert_Delete_Character
-+-     (<FONT COLOR=red><A NAME="ref_991_7" HREF="terminal_interface-curses__adb.htm#ref_1043_7">Win</A></FONT>    : <b>in</b> Window := Standard_Window;
-+-      Do_Idc : <b>in</b> Boolean := True);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_56"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_995_14" HREF="terminal_interface-curses__adb.htm#ref_988_14">Use_Insert_Delete_Character</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_996_7" HREF="terminal_interface-curses__adb.htm#ref_989_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_997_7" HREF="terminal_interface-curses__adb.htm#ref_990_7">Do_Idc</A></FONT> : <b>in</b> Boolean := True);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_outopts.3x.html">idcok()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Use_Insert_Delete_Character);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_995_14">Use_Insert_Delete_Character</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_56"#2|</EM></FONT>
-+-   <b>procedure</b> Leave_Cursor_After_Update
-+-     (<FONT COLOR=red><A NAME="ref_998_7" HREF="terminal_interface-curses__adb.htm#ref_1055_7">Win</A></FONT>      : <b>in</b> Window := Standard_Window;
-+-      Do_Leave : <b>in</b> Boolean := True);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_57"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1002_14" HREF="terminal_interface-curses__adb.htm#ref_998_14">Leave_Cursor_After_Update</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1003_7" HREF="terminal_interface-curses__adb.htm#ref_999_7">Win</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1004_7" HREF="terminal_interface-curses__adb.htm#ref_1000_7">Do_Leave</A></FONT> : <b>in</b> Boolean := True);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_outopts.3x.html">leaveok()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Leave_Cursor_After_Update);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1002_14">Leave_Cursor_After_Update</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_57"#2|</EM></FONT>
-+-   <b>procedure</b> Immediate_Update_Mode
-+-     (<FONT COLOR=red><A NAME="ref_1005_7" HREF="terminal_interface-curses__adb.htm#ref_1067_7">Win</A></FONT>  : <b>in</b> Window := Standard_Window;
-+-      Mode : <b>in</b> Boolean := False);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_58"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1009_14" HREF="terminal_interface-curses__adb.htm#ref_1010_14">Immediate_Update_Mode</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1010_7" HREF="terminal_interface-curses__adb.htm#ref_1011_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1011_7" HREF="terminal_interface-curses__adb.htm#ref_1012_7">Mode</A></FONT> : <b>in</b> Boolean := False);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_outopts.3x.html">immedok()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Immediate_Update_Mode);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1009_14">Immediate_Update_Mode</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_58"#2|</EM></FONT>
-+-   <b>procedure</b> Allow_Scrolling
-+-     (<FONT COLOR=red><A NAME="ref_1012_7" HREF="terminal_interface-curses__adb.htm#ref_1079_7">Win</A></FONT>  : <b>in</b> Window := Standard_Window;
-+-      Mode : <b>in</b> Boolean := False);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_59"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1016_14" HREF="terminal_interface-curses__adb.htm#ref_1020_14">Allow_Scrolling</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1017_7" HREF="terminal_interface-curses__adb.htm#ref_1021_7">Win</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1018_7" HREF="terminal_interface-curses__adb.htm#ref_1022_7">Mode</A></FONT> : <b>in</b> Boolean := False);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_outopts.3x.html">scrollok()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Allow_Scrolling);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1016_14">Allow_Scrolling</A>);
-+ 
-+-   <b>function</b> Scrolling_Allowed (Win : Window := Standard_Window) <b>return</b> Boolean;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1022_13" HREF="terminal_interface-curses__adb.htm#ref_1032_13">Scrolling_Allowed</A></FONT> (<FONT COLOR=red><A NAME="ref_1022_32" HREF="terminal_interface-curses__adb.htm#ref_1032_32">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>) <b>return</b> Boolean;
-+    <FONT COLOR=green><EM>--  There is no such function in the C interface.</EM></FONT>
-+-   <b>pragma</b> Inline (Scrolling_Allowed);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1022_13">Scrolling_Allowed</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_59"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Scroll_Region
-+-     (<FONT COLOR=red><A NAME="ref_1023_7" HREF="terminal_interface-curses__adb.htm#ref_1098_7">Win</A></FONT>         : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
-+-      <FONT COLOR=red><A NAME="ref_1024_7" HREF="terminal_interface-curses__adb.htm#ref_1099_7">Top_Line</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-+-      Bottom_Line : <b>in</b> Line_Position);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_60"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1027_14" HREF="terminal_interface-curses__adb.htm#ref_1041_14">Set_Scroll_Region</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1028_7" HREF="terminal_interface-curses__adb.htm#ref_1042_7">Win</A></FONT>         : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1029_7" HREF="terminal_interface-curses__adb.htm#ref_1043_7">Top_Line</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1030_7" HREF="terminal_interface-curses__adb.htm#ref_1044_7">Bottom_Line</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_outopts.3x.html">wsetscrreg()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: setscrreg()</EM></FONT>
-+-   <b>pragma</b> Inline (Set_Scroll_Region);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1027_14">Set_Scroll_Region</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_refresh.3x.html">curs_refresh.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_60"#2|</EM></FONT>
-+-   <b>procedure</b> Update_Screen;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_61"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1040_14" HREF="terminal_interface-curses__adb.htm#ref_1057_14">Update_Screen</A></FONT>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_refresh.3x.html">doupdate()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Update_Screen);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1040_14">Update_Screen</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_61"#2|</EM></FONT>
-+-   <b>procedure</b> Refresh (Win : <b>in</b> Window := Standard_Window);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_62"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1045_14" HREF="terminal_interface-curses__adb.htm#ref_1067_14">Refresh</A></FONT> (<FONT COLOR=red><A NAME="ref_1045_23" HREF="terminal_interface-curses__adb.htm#ref_1067_23">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_refresh.3x.html">wrefresh()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  There is an overloaded Refresh for Pads.</EM></FONT>
-+    <FONT COLOR=green><EM>--  The Inline pragma appears there</EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: refresh()</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_62"#2|</EM></FONT>
-+-   <b>procedure</b> Refresh_Without_Update
-+-     (Win : <b>in</b> Window := Standard_Window);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_63"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1052_14" HREF="terminal_interface-curses__adb.htm#ref_1077_14">Refresh_Without_Update</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1053_7" HREF="terminal_interface-curses__adb.htm#ref_1078_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_refresh.3x.html">wnoutrefresh()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  There is an overloaded Refresh_Without_Update for Pads.</EM></FONT>
-+    <FONT COLOR=green><EM>--  The Inline pragma appears there</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_63"#2|</EM></FONT>
-+-   <b>procedure</b> Redraw (Win : <b>in</b> Window := Standard_Window);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_64"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1059_14" HREF="terminal_interface-curses__adb.htm#ref_1088_14">Redraw</A></FONT> (<FONT COLOR=red><A NAME="ref_1059_22" HREF="terminal_interface-curses__adb.htm#ref_1088_22">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_refresh.3x.html">redrawwin()</A></EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_64"#2|</EM></FONT>
-+-   <b>procedure</b> Redraw (<FONT COLOR=red><A NAME="ref_1058_22" HREF="terminal_interface-curses__adb.htm#ref_1155_7">Win</A></FONT>        : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
-+-                     <FONT COLOR=red><A NAME="ref_1059_22" HREF="terminal_interface-curses__adb.htm#ref_1156_7">Begin_Line</A></FONT> : <b>in</b> Line_Position;
-+-                     Line_Count : <b>in</b> Positive);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_65"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1063_14" HREF="terminal_interface-curses__adb.htm#ref_1098_14">Redraw</A></FONT> (<FONT COLOR=red><A NAME="ref_1063_22" HREF="terminal_interface-curses__adb.htm#ref_1099_7">Win</A></FONT>        : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                     <FONT COLOR=red><A NAME="ref_1064_22" HREF="terminal_interface-curses__adb.htm#ref_1100_7">Begin_Line</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++                     <FONT COLOR=red><A NAME="ref_1065_22" HREF="terminal_interface-curses__adb.htm#ref_1101_7">Line_Count</A></FONT> : <b>in</b> Positive);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_refresh.3x.html">wredrawln()</A></EM></FONT>
-+    <b>pragma</b> Inline (Redraw);
-+ 
-+@@ -1070,99 +1075,99 @@
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_clear.3x.html">curs_clear.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_65"#2|</EM></FONT>
-+-   <b>procedure</b> Erase (Win : <b>in</b> Window := Standard_Window);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_66"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1074_14" HREF="terminal_interface-curses__adb.htm#ref_1115_14">Erase</A></FONT> (<FONT COLOR=red><A NAME="ref_1074_21" HREF="terminal_interface-curses__adb.htm#ref_1115_21">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_clear.3x.html">werase()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: erase()</EM></FONT>
-+-   <b>pragma</b> Inline (Erase);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1074_14">Erase</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_66"#2|</EM></FONT>
-+-   <b>procedure</b> Clear
-+-     (Win : <b>in</b> Window := Standard_Window);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_67"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1080_14" HREF="terminal_interface-curses__adb.htm#ref_1125_14">Clear</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1081_7" HREF="terminal_interface-curses__adb.htm#ref_1125_21">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_clear.3x.html">wclear()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: clear()</EM></FONT>
-+-   <b>pragma</b> Inline (Clear);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1080_14">Clear</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_67"#2|</EM></FONT>
-+-   <b>procedure</b> Clear_To_End_Of_Screen
-+-     (Win : <b>in</b> Window := Standard_Window);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_68"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1087_14" HREF="terminal_interface-curses__adb.htm#ref_1135_14">Clear_To_End_Of_Screen</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1088_7" HREF="terminal_interface-curses__adb.htm#ref_1135_38">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_clear.3x.html">wclrtobot()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: clrtobot()</EM></FONT>
-+-   <b>pragma</b> Inline (Clear_To_End_Of_Screen);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1087_14">Clear_To_End_Of_Screen</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_68"#2|</EM></FONT>
-+-   <b>procedure</b> Clear_To_End_Of_Line
-+-     (Win : <b>in</b> Window := Standard_Window);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_69"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1094_14" HREF="terminal_interface-curses__adb.htm#ref_1145_14">Clear_To_End_Of_Line</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1095_7" HREF="terminal_interface-curses__adb.htm#ref_1145_36">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_clear.3x.html">wclrtoeol()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: clrtoeol()</EM></FONT>
-+-   <b>pragma</b> Inline (Clear_To_End_Of_Line);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1094_14">Clear_To_End_Of_Line</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_bkgd.3x.html">curs_bkgd.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_69"#2|</EM></FONT>
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_70"#2|</EM></FONT>
-+    <FONT COLOR=green><EM>--  TODO: we could have Set_Background(Window; Character_Attribute_Set)</EM></FONT>
-+    <FONT COLOR=green><EM>--  because in C it is common to see bkgdset(A_BOLD) or</EM></FONT>
-+    <FONT COLOR=green><EM>--  bkgdset(COLOR_PAIR(n))</EM></FONT>
-+-   <b>procedure</b> Set_Background
-+-     (<FONT COLOR=red><A NAME="ref_1104_7" HREF="terminal_interface-curses__adb.htm#ref_1212_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Window</A> := Standard_Window;
-+-      Ch  : <b>in</b> Attributed_Character);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1108_14" HREF="terminal_interface-curses__adb.htm#ref_1155_14">Set_Background</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1109_7" HREF="terminal_interface-curses__adb.htm#ref_1156_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1110_7" HREF="terminal_interface-curses__adb.htm#ref_1157_7">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_bkgd.3x.html">wbkgdset()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: bkgdset()</EM></FONT>
-+-   <b>pragma</b> Inline (Set_Background);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1108_14">Set_Background</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_70"#2|</EM></FONT>
-+-   <b>procedure</b> Change_Background
-+-     (<FONT COLOR=red><A NAME="ref_1112_7" HREF="terminal_interface-curses__adb.htm#ref_1222_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Window</A> := Standard_Window;
-+-      Ch  : <b>in</b> Attributed_Character);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_71"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1116_14" HREF="terminal_interface-curses__adb.htm#ref_1165_14">Change_Background</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1117_7" HREF="terminal_interface-curses__adb.htm#ref_1166_7">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1118_7" HREF="terminal_interface-curses__adb.htm#ref_1167_7">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_bkgd.3x.html">wbkgd()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: bkgd()</EM></FONT>
-+-   <b>pragma</b> Inline (Change_Background);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1116_14">Change_Background</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_71"#2|</EM></FONT>
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_72"#2|</EM></FONT>
-+    <FONT COLOR=green><EM>--  ? wbkgdget is not listed in curs_bkgd, getbkgd is thpough.</EM></FONT>
-+-   <b>function</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Get_Background</A> (Win : Window := Standard_Window)
-+-     <b>return</b> Attributed_Character;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1125_13" HREF="terminal_interface-curses__adb.htm#ref_1177_13">Get_Background</A></FONT> (<FONT COLOR=red><A NAME="ref_1125_29" HREF="terminal_interface-curses__adb.htm#ref_1177_29">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-++     <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_bkgd.3x.html">wbkgdget()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: bkgdget()</EM></FONT>
-+-   <b>pragma</b> Inline (Get_Background);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1125_13">Get_Background</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_touch.3x.html">curs_touch.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_72"#2|</EM></FONT>
-+-   <b>procedure</b> Untouch (Win : <b>in</b> Window := Standard_Window);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_73"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1136_14" HREF="terminal_interface-curses__adb.htm#ref_1212_14">Untouch</A></FONT> (<FONT COLOR=red><A NAME="ref_1136_23" HREF="terminal_interface-curses__adb.htm#ref_1212_23">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_touch.3x.html">untouchwin()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Untouch);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1136_14">Untouch</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_73"#2|</EM></FONT>
-+-   <b>procedure</b> Touch (Win : <b>in</b> Window := Standard_Window);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_74"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1141_14" HREF="terminal_interface-curses__adb.htm#ref_1203_14">Touch</A></FONT> (<FONT COLOR=red><A NAME="ref_1141_21" HREF="terminal_interface-curses__adb.htm#ref_1203_21">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_touch.3x.html">touchwin()</A></EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_74"#2|</EM></FONT>
-+-   <b>procedure</b> Touch (<FONT COLOR=red><A NAME="ref_1140_21" HREF="terminal_interface-curses__adb.htm#ref_1277_21">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
-+-                    <FONT COLOR=red><A NAME="ref_1141_21" HREF="terminal_interface-curses__adb.htm#ref_1278_21">Start</A></FONT> : <b>in</b> Line_Position;
-+-                    Count : <b>in</b> Positive);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_75"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1145_14" HREF="terminal_interface-curses__adb.htm#ref_1221_14">Touch</A></FONT> (<FONT COLOR=red><A NAME="ref_1145_21" HREF="terminal_interface-curses__adb.htm#ref_1221_21">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                    <FONT COLOR=red><A NAME="ref_1146_21" HREF="terminal_interface-curses__adb.htm#ref_1222_21">Start</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++                    <FONT COLOR=red><A NAME="ref_1147_21" HREF="terminal_interface-curses__adb.htm#ref_1223_21">Count</A></FONT> : <b>in</b> Positive);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_touch.3x.html">touchline()</A></EM></FONT>
-+    <b>pragma</b> Inline (Touch);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_75"#2|</EM></FONT>
-+-   <b>procedure</b> Change_Lines_Status (<FONT COLOR=red><A NAME="ref_1147_35" HREF="terminal_interface-curses__adb.htm#ref_1242_35">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
-+-                                  <FONT COLOR=red><A NAME="ref_1148_35" HREF="terminal_interface-curses__adb.htm#ref_1243_35">Start</A></FONT> : <b>in</b> Line_Position;
-+-                                  <FONT COLOR=red><A NAME="ref_1149_35" HREF="terminal_interface-curses__adb.htm#ref_1244_35">Count</A></FONT> : <b>in</b> Positive;
-+-                                  State : <b>in</b> Boolean);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_76"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1152_14" HREF="terminal_interface-curses__adb.htm#ref_1186_14">Change_Lines_Status</A></FONT> (<FONT COLOR=red><A NAME="ref_1152_35" HREF="terminal_interface-curses__adb.htm#ref_1186_35">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                                  <FONT COLOR=red><A NAME="ref_1153_35" HREF="terminal_interface-curses__adb.htm#ref_1187_35">Start</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++                                  <FONT COLOR=red><A NAME="ref_1154_35" HREF="terminal_interface-curses__adb.htm#ref_1188_35">Count</A></FONT> : <b>in</b> Positive;
-++                                  <FONT COLOR=red><A NAME="ref_1155_35" HREF="terminal_interface-curses__adb.htm#ref_1189_35">State</A></FONT> : <b>in</b> Boolean);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_touch.3x.html">wtouchln()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Change_Lines_Status);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1152_14">Change_Lines_Status</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_76"#2|</EM></FONT>
-+-   <b>function</b> Is_Touched (<FONT COLOR=red><A NAME="ref_1155_25" HREF="terminal_interface-curses__adb.htm#ref_1286_7">Win</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
-+-                        Line : Line_Position) <b>return</b> Boolean;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_77"#2|</EM></FONT>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1160_13" HREF="terminal_interface-curses__adb.htm#ref_1229_13">Is_Touched</A></FONT> (<FONT COLOR=red><A NAME="ref_1160_25" HREF="terminal_interface-curses__adb.htm#ref_1230_7">Win</A></FONT>  : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                        <FONT COLOR=red><A NAME="ref_1161_25" HREF="terminal_interface-curses__adb.htm#ref_1231_7">Line</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>) <b>return</b> Boolean;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_touch.3x.html">is_linetouched()</A></EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_77"#2|</EM></FONT>
-+-   <b>function</b> Is_Touched (Win : Window := Standard_Window) <b>return</b> Boolean;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_78"#2|</EM></FONT>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1165_13" HREF="terminal_interface-curses__adb.htm#ref_1243_13">Is_Touched</A></FONT> (<FONT COLOR=red><A NAME="ref_1165_25" HREF="terminal_interface-curses__adb.htm#ref_1244_7">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>) <b>return</b> Boolean;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_touch.3x.html">is_wintouched()</A></EM></FONT>
-+    <b>pragma</b> Inline (Is_Touched);
-+ 
-+@@ -1170,176 +1175,176 @@
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_overlay.3x.html">curs_overlay.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_78"#2|</EM></FONT>
-+-   <b>procedure</b> Copy
-+-     (<FONT COLOR=red><A NAME="ref_1170_7" HREF="terminal_interface-curses__adb.htm#ref_1313_7">Source_Window</A></FONT>            : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1171_7" HREF="terminal_interface-curses__adb.htm#ref_1314_7">Destination_Window</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1172_7" HREF="terminal_interface-curses__adb.htm#ref_1315_7">Source_Top_Row</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1173_7" HREF="terminal_interface-curses__adb.htm#ref_1316_7">Source_Left_Column</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1174_7" HREF="terminal_interface-curses__adb.htm#ref_1317_7">Destination_Top_Row</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1175_7" HREF="terminal_interface-curses__adb.htm#ref_1318_7">Destination_Left_Column</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1176_7" HREF="terminal_interface-curses__adb.htm#ref_1319_7">Destination_Bottom_Row</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1177_7" HREF="terminal_interface-curses__adb.htm#ref_1320_7">Destination_Right_Column</A></FONT> : <b>in</b> Column_Position;
-+-      Non_Destructive_Mode     : <b>in</b> Boolean := True);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_79"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1174_14" HREF="terminal_interface-curses__adb.htm#ref_1256_14">Copy</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1175_7" HREF="terminal_interface-curses__adb.htm#ref_1257_7">Source_Window</A></FONT>            : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1176_7" HREF="terminal_interface-curses__adb.htm#ref_1258_7">Destination_Window</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1177_7" HREF="terminal_interface-curses__adb.htm#ref_1259_7">Source_Top_Row</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1178_7" HREF="terminal_interface-curses__adb.htm#ref_1260_7">Source_Left_Column</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1179_7" HREF="terminal_interface-curses__adb.htm#ref_1261_7">Destination_Top_Row</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1180_7" HREF="terminal_interface-curses__adb.htm#ref_1262_7">Destination_Left_Column</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1181_7" HREF="terminal_interface-curses__adb.htm#ref_1263_7">Destination_Bottom_Row</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1182_7" HREF="terminal_interface-curses__adb.htm#ref_1264_7">Destination_Right_Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1183_7" HREF="terminal_interface-curses__adb.htm#ref_1265_7">Non_Destructive_Mode</A></FONT>     : <b>in</b> Boolean := True);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_overlay.3x.html">copywin()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Copy);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1174_14">Copy</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_79"#2|</EM></FONT>
-+-   <b>procedure</b> Overwrite (<FONT COLOR=red><A NAME="ref_1183_25" HREF="terminal_interface-curses__adb.htm#ref_1349_7">Source_Window</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                        Destination_Window : <b>in</b> Window);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_80"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1188_14" HREF="terminal_interface-curses__adb.htm#ref_1292_14">Overwrite</A></FONT> (<FONT COLOR=red><A NAME="ref_1188_25" HREF="terminal_interface-curses__adb.htm#ref_1293_7">Source_Window</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                        <FONT COLOR=red><A NAME="ref_1189_25" HREF="terminal_interface-curses__adb.htm#ref_1294_7">Destination_Window</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_overlay.3x.html">overwrite()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Overwrite);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1188_14">Overwrite</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_80"#2|</EM></FONT>
-+-   <b>procedure</b> Overlay (<FONT COLOR=red><A NAME="ref_1189_23" HREF="terminal_interface-curses__adb.htm#ref_1361_7">Source_Window</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+-                      Destination_Window : <b>in</b> Window);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_81"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1194_14" HREF="terminal_interface-curses__adb.htm#ref_1304_14">Overlay</A></FONT> (<FONT COLOR=red><A NAME="ref_1194_23" HREF="terminal_interface-curses__adb.htm#ref_1305_7">Source_Window</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                      <FONT COLOR=red><A NAME="ref_1195_23" HREF="terminal_interface-curses__adb.htm#ref_1306_7">Destination_Window</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_overlay.3x.html">overlay()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Overlay);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1194_14">Overlay</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_deleteln.3x.html">curs_deleteln.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_81"#2|</EM></FONT>
-+-   <b>procedure</b> Insert_Delete_Lines
-+-     (<FONT COLOR=red><A NAME="ref_1200_7" HREF="terminal_interface-curses__adb.htm#ref_1374_7">Win</A></FONT>   : <b>in</b> Window  := Standard_Window;
-+-      Lines : <b>in</b> Integer := 1); <FONT COLOR=green><EM>--  default is to insert one line above</EM></FONT>
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_82"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1204_14" HREF="terminal_interface-curses__adb.htm#ref_1317_14">Insert_Delete_Lines</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1205_7" HREF="terminal_interface-curses__adb.htm#ref_1318_7">Win</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>  := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1206_7" HREF="terminal_interface-curses__adb.htm#ref_1319_7">Lines</A></FONT> : <b>in</b> Integer := 1); <FONT COLOR=green><EM>--  default is to insert one line above</EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_deleteln.3x.html">winsdelln()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: insdelln()</EM></FONT>
-+-   <b>pragma</b> Inline (Insert_Delete_Lines);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1204_14">Insert_Delete_Lines</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_82"#2|</EM></FONT>
-+-   <b>procedure</b> Delete_Line (Win : <b>in</b> Window := Standard_Window);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_83"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1212_14" HREF="terminal_interface-curses__adb.htm#ref_1329_14">Delete_Line</A></FONT> (<FONT COLOR=red><A NAME="ref_1212_27" HREF="terminal_interface-curses__adb.htm#ref_1329_27">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_deleteln.3x.html">wdeleteln()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: deleteln()</EM></FONT>
-+-   <b>pragma</b> Inline (Delete_Line);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1212_14">Delete_Line</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_83"#2|</EM></FONT>
-+-   <b>procedure</b> Insert_Line (Win : <b>in</b> Window := Standard_Window);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_84"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1218_14" HREF="terminal_interface-curses__adb.htm#ref_1335_14">Insert_Line</A></FONT> (<FONT COLOR=red><A NAME="ref_1218_27" HREF="terminal_interface-curses__adb.htm#ref_1335_27">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_deleteln.3x.html">winsertln()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: insertln()</EM></FONT>
-+-   <b>pragma</b> Inline (Insert_Line);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1218_14">Insert_Line</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_getyx.3x.html">curs_getyx.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_84"#2|</EM></FONT>
-+-   <b>procedure</b> Get_Size
-+-     (<FONT COLOR=red><A NAME="ref_1224_7" HREF="terminal_interface-curses__adb.htm#ref_1399_7">Win</A></FONT>               : <b>in</b> Window := Standard_Window;
-+-      <FONT COLOR=red><A NAME="ref_1225_7" HREF="terminal_interface-curses__adb.htm#ref_1400_7">Number_Of_Lines</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
-+-      Number_Of_Columns : <b>out</b> Column_Count);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_85"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1228_14" HREF="terminal_interface-curses__adb.htm#ref_1342_14">Get_Size</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1229_7" HREF="terminal_interface-curses__adb.htm#ref_1343_7">Win</A></FONT>               : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1230_7" HREF="terminal_interface-curses__adb.htm#ref_1344_7">Number_Of_Lines</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-++      <FONT COLOR=red><A NAME="ref_1231_7" HREF="terminal_interface-curses__adb.htm#ref_1345_7">Number_Of_Columns</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_getyx.3x.html">getmaxyx()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Get_Size);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1228_14">Get_Size</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_85"#2|</EM></FONT>
-+-   <b>procedure</b> Get_Window_Position
-+-     (<FONT COLOR=red><A NAME="ref_1232_7" HREF="terminal_interface-curses__adb.htm#ref_1415_7">Win</A></FONT>             : <b>in</b> Window := Standard_Window;
-+-      <FONT COLOR=red><A NAME="ref_1233_7" HREF="terminal_interface-curses__adb.htm#ref_1416_7">Top_Left_Line</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-      Top_Left_Column : <b>out</b> Column_Position);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_86"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1236_14" HREF="terminal_interface-curses__adb.htm#ref_1362_14">Get_Window_Position</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1237_7" HREF="terminal_interface-curses__adb.htm#ref_1363_7">Win</A></FONT>             : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1238_7" HREF="terminal_interface-curses__adb.htm#ref_1364_7">Top_Left_Line</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1239_7" HREF="terminal_interface-curses__adb.htm#ref_1365_7">Top_Left_Column</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_getyx.3x.html">getbegyx()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Get_Window_Position);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1236_14">Get_Window_Position</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_86"#2|</EM></FONT>
-+-   <b>procedure</b> Get_Cursor_Position
-+-     (<FONT COLOR=red><A NAME="ref_1240_7" HREF="terminal_interface-curses__adb.htm#ref_1427_7">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
-+-      <FONT COLOR=red><A NAME="ref_1241_7" HREF="terminal_interface-curses__adb.htm#ref_1428_7">Line</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-      Column : <b>out</b> Column_Position);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_87"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1244_14" HREF="terminal_interface-curses__adb.htm#ref_1380_14">Get_Cursor_Position</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1245_7" HREF="terminal_interface-curses__adb.htm#ref_1381_7">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1246_7" HREF="terminal_interface-curses__adb.htm#ref_1382_7">Line</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1247_7" HREF="terminal_interface-curses__adb.htm#ref_1383_7">Column</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_getyx.3x.html">getyx()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Get_Cursor_Position);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1244_14">Get_Cursor_Position</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_87"#2|</EM></FONT>
-+-   <b>procedure</b> Get_Origin_Relative_To_Parent
-+-     (<FONT COLOR=red><A NAME="ref_1248_7" HREF="terminal_interface-curses__adb.htm#ref_1439_7">Win</A></FONT>                : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1249_7" HREF="terminal_interface-curses__adb.htm#ref_1440_7">Top_Left_Line</A></FONT>      : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1250_7" HREF="terminal_interface-curses__adb.htm#ref_1441_7">Top_Left_Column</A></FONT>    : <b>out</b> Column_Position;
-+-      Is_Not_A_Subwindow : <b>out</b> Boolean);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_88"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1252_14" HREF="terminal_interface-curses__adb.htm#ref_1398_14">Get_Origin_Relative_To_Parent</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1253_7" HREF="terminal_interface-curses__adb.htm#ref_1399_7">Win</A></FONT>                : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1254_7" HREF="terminal_interface-curses__adb.htm#ref_1400_7">Top_Left_Line</A></FONT>      : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1255_7" HREF="terminal_interface-curses__adb.htm#ref_1401_7">Top_Left_Column</A></FONT>    : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1256_7" HREF="terminal_interface-curses__adb.htm#ref_1402_7">Is_Not_A_Subwindow</A></FONT> : <b>out</b> Boolean);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_getyx.3x.html">getparyx()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  Instead of placing -1 in the coordinates as return, we use a boolean</EM></FONT>
-+    <FONT COLOR=green><EM>--  to return the info that the window has no parent.</EM></FONT>
-+-   <b>pragma</b> Inline (Get_Origin_Relative_To_Parent);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1252_14">Get_Origin_Relative_To_Parent</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_pad.3x.html">curs_pad.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_88"#2|</EM></FONT>
-+-   <b>function</b> New_Pad (<FONT COLOR=red><A NAME="ref_1262_22" HREF="terminal_interface-curses__adb.htm#ref_1458_22">Lines</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
-+-                     Columns : Column_Count) <b>return</b> Window;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_89"#2|</EM></FONT>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1267_13" HREF="terminal_interface-curses__adb.htm#ref_1424_13">New_Pad</A></FONT> (<FONT COLOR=red><A NAME="ref_1267_22" HREF="terminal_interface-curses__adb.htm#ref_1424_22">Lines</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-++                     <FONT COLOR=red><A NAME="ref_1268_22" HREF="terminal_interface-curses__adb.htm#ref_1425_22">Columns</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_pad.3x.html">newpad()</A></EM></FONT>
-+-   <b>pragma</b> Inline (New_Pad);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1267_13">New_Pad</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_89"#2|</EM></FONT>
-+-   <b>function</b> Sub_Pad
-+-     (<FONT COLOR=red><A NAME="ref_1269_7" HREF="terminal_interface-curses__adb.htm#ref_1474_7">Pad</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1270_7" HREF="terminal_interface-curses__adb.htm#ref_1475_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
-+-      <FONT COLOR=red><A NAME="ref_1271_7" HREF="terminal_interface-curses__adb.htm#ref_1476_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Count</A>;
-+-      <FONT COLOR=red><A NAME="ref_1272_7" HREF="terminal_interface-curses__adb.htm#ref_1477_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-      First_Column_Position : Column_Position) <b>return</b> Window;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_90"#2|</EM></FONT>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1273_13" HREF="terminal_interface-curses__adb.htm#ref_1439_13">Sub_Pad</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1274_7" HREF="terminal_interface-curses__adb.htm#ref_1440_7">Pad</A></FONT>                   : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1275_7" HREF="terminal_interface-curses__adb.htm#ref_1441_7">Number_Of_Lines</A></FONT>       : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-++      <FONT COLOR=red><A NAME="ref_1276_7" HREF="terminal_interface-curses__adb.htm#ref_1442_7">Number_Of_Columns</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>;
-++      <FONT COLOR=red><A NAME="ref_1277_7" HREF="terminal_interface-curses__adb.htm#ref_1443_7">First_Line_Position</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1278_7" HREF="terminal_interface-curses__adb.htm#ref_1444_7">First_Column_Position</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_pad.3x.html">subpad()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Sub_Pad);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1273_13">Sub_Pad</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_90"#2|</EM></FONT>
-+-   <b>procedure</b> Refresh
-+-     (<FONT COLOR=red><A NAME="ref_1279_7" HREF="terminal_interface-curses__adb.htm#ref_1502_7">Pad</A></FONT>                      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1280_7" HREF="terminal_interface-curses__adb.htm#ref_1503_7">Source_Top_Row</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1281_7" HREF="terminal_interface-curses__adb.htm#ref_1504_7">Source_Left_Column</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1282_7" HREF="terminal_interface-curses__adb.htm#ref_1505_7">Destination_Top_Row</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1283_7" HREF="terminal_interface-curses__adb.htm#ref_1506_7">Destination_Left_Column</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1284_7" HREF="terminal_interface-curses__adb.htm#ref_1507_7">Destination_Bottom_Row</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-      Destination_Right_Column : <b>in</b> Column_Position);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_91"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1283_14" HREF="terminal_interface-curses__adb.htm#ref_1467_14">Refresh</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1284_7" HREF="terminal_interface-curses__adb.htm#ref_1468_7">Pad</A></FONT>                      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1285_7" HREF="terminal_interface-curses__adb.htm#ref_1469_7">Source_Top_Row</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1286_7" HREF="terminal_interface-curses__adb.htm#ref_1470_7">Source_Left_Column</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1287_7" HREF="terminal_interface-curses__adb.htm#ref_1471_7">Destination_Top_Row</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1288_7" HREF="terminal_interface-curses__adb.htm#ref_1472_7">Destination_Left_Column</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1289_7" HREF="terminal_interface-curses__adb.htm#ref_1473_7">Destination_Bottom_Row</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1290_7" HREF="terminal_interface-curses__adb.htm#ref_1474_7">Destination_Right_Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_pad.3x.html">prefresh()</A></EM></FONT>
-+    <b>pragma</b> Inline (Refresh);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_91"#2|</EM></FONT>
-+-   <b>procedure</b> Refresh_Without_Update
-+-     (<FONT COLOR=red><A NAME="ref_1291_7" HREF="terminal_interface-curses__adb.htm#ref_1532_7">Pad</A></FONT>                      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A>;
-+-      <FONT COLOR=red><A NAME="ref_1292_7" HREF="terminal_interface-curses__adb.htm#ref_1533_7">Source_Top_Row</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1293_7" HREF="terminal_interface-curses__adb.htm#ref_1534_7">Source_Left_Column</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1294_7" HREF="terminal_interface-curses__adb.htm#ref_1535_7">Destination_Top_Row</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1295_7" HREF="terminal_interface-curses__adb.htm#ref_1536_7">Destination_Left_Column</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Column_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1296_7" HREF="terminal_interface-curses__adb.htm#ref_1537_7">Destination_Bottom_Row</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-      Destination_Right_Column : <b>in</b> Column_Position);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_92"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1295_14" HREF="terminal_interface-curses__adb.htm#ref_1497_14">Refresh_Without_Update</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1296_7" HREF="terminal_interface-curses__adb.htm#ref_1498_7">Pad</A></FONT>                      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1297_7" HREF="terminal_interface-curses__adb.htm#ref_1499_7">Source_Top_Row</A></FONT>           : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1298_7" HREF="terminal_interface-curses__adb.htm#ref_1500_7">Source_Left_Column</A></FONT>       : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1299_7" HREF="terminal_interface-curses__adb.htm#ref_1501_7">Destination_Top_Row</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1300_7" HREF="terminal_interface-curses__adb.htm#ref_1502_7">Destination_Left_Column</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1301_7" HREF="terminal_interface-curses__adb.htm#ref_1503_7">Destination_Bottom_Row</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1302_7" HREF="terminal_interface-curses__adb.htm#ref_1504_7">Destination_Right_Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_pad.3x.html">pnoutrefresh()</A></EM></FONT>
-+    <b>pragma</b> Inline (Refresh_Without_Update);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_92"#2|</EM></FONT>
-+-   <b>procedure</b> Add_Character_To_Pad_And_Echo_It
-+-     (<FONT COLOR=red><A NAME="ref_1303_7" HREF="terminal_interface-curses__adb.htm#ref_1562_7">Pad</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Window</A>;
-+-      Ch  : <b>in</b> Attributed_Character);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_93"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1307_14" HREF="terminal_interface-curses__adb.htm#ref_1527_14">Add_Character_To_Pad_And_Echo_It</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1308_7" HREF="terminal_interface-curses__adb.htm#ref_1528_7">Pad</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1309_7" HREF="terminal_interface-curses__adb.htm#ref_1529_7">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_pad.3x.html">pechochar()</A></EM></FONT>
-+ 
-+-   <b>procedure</b> Add_Character_To_Pad_And_Echo_It
-+-     (<FONT COLOR=red><A NAME="ref_1308_7" HREF="terminal_interface-curses__adb.htm#ref_1575_7">Pad</A></FONT> : <b>in</b> Window;
-+-      Ch  : <b>in</b> Character);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1312_14" HREF="terminal_interface-curses__adb.htm#ref_1540_14">Add_Character_To_Pad_And_Echo_It</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1313_7" HREF="terminal_interface-curses__adb.htm#ref_1541_7">Pad</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1314_7" HREF="terminal_interface-curses__adb.htm#ref_1542_7">Ch</A></FONT>  : <b>in</b> Character);
-+    <b>pragma</b> Inline (Add_Character_To_Pad_And_Echo_It);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_scroll.3x.html">curs_scroll.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_93"#2|</EM></FONT>
-+-   <b>procedure</b> Scroll (<FONT COLOR=red><A NAME="ref_1317_22" HREF="terminal_interface-curses__adb.htm#ref_1586_22">Win</A></FONT>    : <b>in</b> Window  := Standard_Window;
-+-                     Amount : <b>in</b> Integer := 1);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_94"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1322_14" HREF="terminal_interface-curses__adb.htm#ref_1552_14">Scroll</A></FONT> (<FONT COLOR=red><A NAME="ref_1322_22" HREF="terminal_interface-curses__adb.htm#ref_1552_22">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>  := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                     <FONT COLOR=red><A NAME="ref_1323_22" HREF="terminal_interface-curses__adb.htm#ref_1553_22">Amount</A></FONT> : <b>in</b> Integer := 1);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_scroll.3x.html">wscrl()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: scroll()</EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: scrl()</EM></FONT>
-+-   <b>pragma</b> Inline (Scroll);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1322_14">Scroll</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_delch.3x.html">curs_delch.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_94"#2|</EM></FONT>
-+-   <b>procedure</b> Delete_Character (Win : <b>in</b> Window := Standard_Window);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_95"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1334_14" HREF="terminal_interface-curses__adb.htm#ref_1565_14">Delete_Character</A></FONT> (<FONT COLOR=red><A NAME="ref_1334_32" HREF="terminal_interface-curses__adb.htm#ref_1565_32">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_delch.3x.html">wdelch()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: delch()</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_95"#2|</EM></FONT>
-+-   <b>procedure</b> Delete_Character
-+-     (<FONT COLOR=red><A NAME="ref_1335_7" HREF="terminal_interface-curses__adb.htm#ref_1610_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
-+-      <FONT COLOR=red><A NAME="ref_1336_7" HREF="terminal_interface-curses__adb.htm#ref_1611_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-      Column : <b>in</b> Column_Position);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_96"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1339_14" HREF="terminal_interface-curses__adb.htm#ref_1575_14">Delete_Character</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1340_7" HREF="terminal_interface-curses__adb.htm#ref_1576_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1341_7" HREF="terminal_interface-curses__adb.htm#ref_1577_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1342_7" HREF="terminal_interface-curses__adb.htm#ref_1578_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_delch.3x.html">mvwdelch()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: mvdelch()</EM></FONT>
-+    <b>pragma</b> Inline (Delete_Character);
-+@@ -1348,17 +1353,17 @@
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_inch.3x.html">curs_inch.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_96"#2|</EM></FONT>
-+-   <b>function</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Peek</A> (Win : Window := Standard_Window)
-+-     <b>return</b> Attributed_Character;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_97"#2|</EM></FONT>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1352_13" HREF="terminal_interface-curses__adb.htm#ref_1590_13">Peek</A></FONT> (<FONT COLOR=red><A NAME="ref_1352_19" HREF="terminal_interface-curses__adb.htm#ref_1590_19">Win</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>)
-++     <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>;
-+    <FONT COLOR=green><EM>--  AKA: inch()</EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_inch.3x.html">winch()</A></EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_97"#2|</EM></FONT>
-+-   <b>function</b> Peek
-+-     (<FONT COLOR=red><A NAME="ref_1354_7" HREF="terminal_interface-curses__adb.htm#ref_1634_7">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
-+-      <FONT COLOR=red><A NAME="ref_1355_7" HREF="terminal_interface-curses__adb.htm#ref_1635_7">Line</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-      Column : Column_Position) <b>return</b> Attributed_Character;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_98"#2|</EM></FONT>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1358_13" HREF="terminal_interface-curses__adb.htm#ref_1599_13">Peek</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1359_7" HREF="terminal_interface-curses__adb.htm#ref_1600_7">Win</A></FONT>    : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1360_7" HREF="terminal_interface-curses__adb.htm#ref_1601_7">Line</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1361_7" HREF="terminal_interface-curses__adb.htm#ref_1602_7">Column</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>) <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_inch.3x.html">mvwinch()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: mvinch()</EM></FONT>
-+    <FONT COLOR=green><EM>--  More Peek's follow, pragma Inline appears later.</EM></FONT>
-+@@ -1367,17 +1372,17 @@
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_insch.3x.html">curs_insch.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_98"#2|</EM></FONT>
-+-   <b>procedure</b> Insert (<FONT COLOR=red><A NAME="ref_1366_22" HREF="terminal_interface-curses__adb.htm#ref_1646_22">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Window</A> := Standard_Window;
-+-                     Ch  : <b>in</b> Attributed_Character);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_99"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1371_14" HREF="terminal_interface-curses__adb.htm#ref_1612_14">Insert</A></FONT> (<FONT COLOR=red><A NAME="ref_1371_22" HREF="terminal_interface-curses__adb.htm#ref_1612_22">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                     <FONT COLOR=red><A NAME="ref_1372_22" HREF="terminal_interface-curses__adb.htm#ref_1613_22">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_insch.3x.html">winsch()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: insch()</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_99"#2|</EM></FONT>
-+-   <b>procedure</b> Insert (<FONT COLOR=red><A NAME="ref_1372_22" HREF="terminal_interface-curses__adb.htm#ref_1658_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
-+-                     <FONT COLOR=red><A NAME="ref_1373_22" HREF="terminal_interface-curses__adb.htm#ref_1659_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-                     <FONT COLOR=red><A NAME="ref_1374_22" HREF="terminal_interface-curses__adb.htm#ref_1660_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Column_Position</A>;
-+-                     Ch     : <b>in</b> Attributed_Character);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_100"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1377_14" HREF="terminal_interface-curses__adb.htm#ref_1623_14">Insert</A></FONT> (<FONT COLOR=red><A NAME="ref_1377_22" HREF="terminal_interface-curses__adb.htm#ref_1624_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                     <FONT COLOR=red><A NAME="ref_1378_22" HREF="terminal_interface-curses__adb.htm#ref_1625_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++                     <FONT COLOR=red><A NAME="ref_1379_22" HREF="terminal_interface-curses__adb.htm#ref_1626_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++                     <FONT COLOR=red><A NAME="ref_1380_22" HREF="terminal_interface-curses__adb.htm#ref_1627_7">Ch</A></FONT>     : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_insch.3x.html">mvwinsch()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: mvinsch()</EM></FONT>
-+ 
-+@@ -1385,21 +1390,21 @@
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_insstr.3x.html">curs_insstr.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_100"#2|</EM></FONT>
-+-   <b>procedure</b> Insert (<FONT COLOR=red><A NAME="ref_1384_22" HREF="terminal_interface-curses__adb.htm#ref_1677_22">Win</A></FONT> : <b>in</b> Window := Standard_Window;
-+-                     <FONT COLOR=red><A NAME="ref_1385_22" HREF="terminal_interface-curses__adb.htm#ref_1678_22">Str</A></FONT> : <b>in</b> String;
-+-                     Len : <b>in</b> Integer := -1);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_101"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1389_14" HREF="terminal_interface-curses__adb.htm#ref_1643_14">Insert</A></FONT> (<FONT COLOR=red><A NAME="ref_1389_22" HREF="terminal_interface-curses__adb.htm#ref_1643_22">Win</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                     <FONT COLOR=red><A NAME="ref_1390_22" HREF="terminal_interface-curses__adb.htm#ref_1644_22">Str</A></FONT> : <b>in</b> String;
-++                     <FONT COLOR=red><A NAME="ref_1391_22" HREF="terminal_interface-curses__adb.htm#ref_1645_22">Len</A></FONT> : <b>in</b> Integer := -1);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_insstr.3x.html">winsnstr()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: winsstr()</EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: insnstr()</EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: insstr()</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_101"#2|</EM></FONT>
-+-   <b>procedure</b> Insert (<FONT COLOR=red><A NAME="ref_1393_22" HREF="terminal_interface-curses__adb.htm#ref_1696_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
-+-                     <FONT COLOR=red><A NAME="ref_1394_22" HREF="terminal_interface-curses__adb.htm#ref_1697_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-                     <FONT COLOR=red><A NAME="ref_1395_22" HREF="terminal_interface-curses__adb.htm#ref_1698_7">Column</A></FONT> : <b>in</b> Column_Position;
-+-                     <FONT COLOR=red><A NAME="ref_1396_22" HREF="terminal_interface-curses__adb.htm#ref_1699_7">Str</A></FONT>    : <b>in</b> String;
-+-                     Len    : <b>in</b> Integer := -1);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_102"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1398_14" HREF="terminal_interface-curses__adb.htm#ref_1661_14">Insert</A></FONT> (<FONT COLOR=red><A NAME="ref_1398_22" HREF="terminal_interface-curses__adb.htm#ref_1662_7">Win</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                     <FONT COLOR=red><A NAME="ref_1399_22" HREF="terminal_interface-curses__adb.htm#ref_1663_7">Line</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++                     <FONT COLOR=red><A NAME="ref_1400_22" HREF="terminal_interface-curses__adb.htm#ref_1664_7">Column</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++                     <FONT COLOR=red><A NAME="ref_1401_22" HREF="terminal_interface-curses__adb.htm#ref_1665_7">Str</A></FONT>    : <b>in</b> String;
-++                     <FONT COLOR=red><A NAME="ref_1402_22" HREF="terminal_interface-curses__adb.htm#ref_1666_7">Len</A></FONT>    : <b>in</b> Integer := -1);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_insstr.3x.html">mvwinsnstr()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: mvwinsstr()</EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: mvinsnstr()</EM></FONT>
-+@@ -1410,21 +1415,21 @@
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_instr.3x.html">curs_instr.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_102"#2|</EM></FONT>
-+-   <b>procedure</b> Peek (<FONT COLOR=red><A NAME="ref_1409_20" HREF="terminal_interface-curses__adb.htm#ref_1719_20">Win</A></FONT> : <b>in</b>  Window := Standard_Window;
-+-                   <FONT COLOR=red><A NAME="ref_1410_20" HREF="terminal_interface-curses__adb.htm#ref_1720_20">Str</A></FONT> : <b>out</b> String;
-+-                   Len : <b>in</b>  Integer := -1);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_103"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1414_14" HREF="terminal_interface-curses__adb.htm#ref_1685_14">Peek</A></FONT> (<FONT COLOR=red><A NAME="ref_1414_20" HREF="terminal_interface-curses__adb.htm#ref_1685_20">Win</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                   <FONT COLOR=red><A NAME="ref_1415_20" HREF="terminal_interface-curses__adb.htm#ref_1686_20">Str</A></FONT> : <b>out</b> String;
-++                   <FONT COLOR=red><A NAME="ref_1416_20" HREF="terminal_interface-curses__adb.htm#ref_1687_20">Len</A></FONT> : <b>in</b>  Integer := -1);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_instr.3x.html">winnstr()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: winstr()</EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: innstr()</EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: instr()</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_103"#2|</EM></FONT>
-+-   <b>procedure</b> Peek (<FONT COLOR=red><A NAME="ref_1418_20" HREF="terminal_interface-curses__adb.htm#ref_1749_7">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
-+-                   <FONT COLOR=red><A NAME="ref_1419_20" HREF="terminal_interface-curses__adb.htm#ref_1750_7">Line</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-                   <FONT COLOR=red><A NAME="ref_1420_20" HREF="terminal_interface-curses__adb.htm#ref_1751_7">Column</A></FONT> : <b>in</b>  Column_Position;
-+-                   <FONT COLOR=red><A NAME="ref_1421_20" HREF="terminal_interface-curses__adb.htm#ref_1752_7">Str</A></FONT>    : <b>out</b> String;
-+-                   Len    : <b>in</b>  Integer := -1);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_104"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1423_14" HREF="terminal_interface-curses__adb.htm#ref_1714_14">Peek</A></FONT> (<FONT COLOR=red><A NAME="ref_1423_20" HREF="terminal_interface-curses__adb.htm#ref_1715_7">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                   <FONT COLOR=red><A NAME="ref_1424_20" HREF="terminal_interface-curses__adb.htm#ref_1716_7">Line</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++                   <FONT COLOR=red><A NAME="ref_1425_20" HREF="terminal_interface-curses__adb.htm#ref_1717_7">Column</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++                   <FONT COLOR=red><A NAME="ref_1426_20" HREF="terminal_interface-curses__adb.htm#ref_1718_7">Str</A></FONT>    : <b>out</b> String;
-++                   <FONT COLOR=red><A NAME="ref_1427_20" HREF="terminal_interface-curses__adb.htm#ref_1719_7">Len</A></FONT>    : <b>in</b>  Integer := -1);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_instr.3x.html">mvwinnstr()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: mvwinstr()</EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: mvinnstr()</EM></FONT>
-+@@ -1434,21 +1439,21 @@
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_inchstr.3x.html">curs_inchstr.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_104"#2|</EM></FONT>
-+-   <b>procedure</b> Peek (<FONT COLOR=red><A NAME="ref_1433_20" HREF="terminal_interface-curses__adb.htm#ref_1761_7">Win</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Window</A> := Standard_Window;
-+-                   <FONT COLOR=red><A NAME="ref_1434_20" HREF="terminal_interface-curses__adb.htm#ref_1762_7">Str</A></FONT> : <b>out</b> Attributed_String;
-+-                   Len : <b>in</b>  Integer := -1);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_105"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1438_14" HREF="terminal_interface-curses__adb.htm#ref_1726_14">Peek</A></FONT> (<FONT COLOR=red><A NAME="ref_1438_20" HREF="terminal_interface-curses__adb.htm#ref_1727_7">Win</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                   <FONT COLOR=red><A NAME="ref_1439_20" HREF="terminal_interface-curses__adb.htm#ref_1728_7">Str</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Attributed_String</A>;
-++                   <FONT COLOR=red><A NAME="ref_1440_20" HREF="terminal_interface-curses__adb.htm#ref_1729_7">Len</A></FONT> : <b>in</b>  Integer := -1);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_inchstr.3x.html">winchnstr()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: winchstr()</EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: inchnstr()</EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: inchstr()</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_105"#2|</EM></FONT>
-+-   <b>procedure</b> Peek (<FONT COLOR=red><A NAME="ref_1442_20" HREF="terminal_interface-curses__adb.htm#ref_1798_7">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
-+-                   <FONT COLOR=red><A NAME="ref_1443_20" HREF="terminal_interface-curses__adb.htm#ref_1799_7">Line</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-                   <FONT COLOR=red><A NAME="ref_1444_20" HREF="terminal_interface-curses__adb.htm#ref_1800_7">Column</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Column_Position</A>;
-+-                   <FONT COLOR=red><A NAME="ref_1445_20" HREF="terminal_interface-curses__adb.htm#ref_1801_7">Str</A></FONT>    : <b>out</b> Attributed_String;
-+-                   Len    : <b>in</b>  Integer := -1);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_106"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1447_14" HREF="terminal_interface-curses__adb.htm#ref_1763_14">Peek</A></FONT> (<FONT COLOR=red><A NAME="ref_1447_20" HREF="terminal_interface-curses__adb.htm#ref_1764_7">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                   <FONT COLOR=red><A NAME="ref_1448_20" HREF="terminal_interface-curses__adb.htm#ref_1765_7">Line</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++                   <FONT COLOR=red><A NAME="ref_1449_20" HREF="terminal_interface-curses__adb.htm#ref_1766_7">Column</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++                   <FONT COLOR=red><A NAME="ref_1450_20" HREF="terminal_interface-curses__adb.htm#ref_1767_7">Str</A></FONT>    : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_376_9">Attributed_String</A>;
-++                   <FONT COLOR=red><A NAME="ref_1451_20" HREF="terminal_interface-curses__adb.htm#ref_1768_7">Len</A></FONT>    : <b>in</b>  Integer := -1);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_inchstr.3x.html">mvwinchnstr()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: mvwinchstr()</EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: mvinchnstr()</EM></FONT>
-+@@ -1459,10 +1464,10 @@
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_getstr.3x.html">curs_getstr.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_106"#2|</EM></FONT>
-+-   <b>procedure</b> Get (<FONT COLOR=red><A NAME="ref_1458_19" HREF="terminal_interface-curses__adb.htm#ref_1809_19">Win</A></FONT> : <b>in</b>  Window := Standard_Window;
-+-                  <FONT COLOR=red><A NAME="ref_1459_19" HREF="terminal_interface-curses__adb.htm#ref_1810_19">Str</A></FONT> : <b>out</b> String;
-+-                  Len : <b>in</b>  Integer := -1);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_107"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1463_14" HREF="terminal_interface-curses__adb.htm#ref_1775_14">Get</A></FONT> (<FONT COLOR=red><A NAME="ref_1463_19" HREF="terminal_interface-curses__adb.htm#ref_1775_19">Win</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                  <FONT COLOR=red><A NAME="ref_1464_19" HREF="terminal_interface-curses__adb.htm#ref_1776_19">Str</A></FONT> : <b>out</b> String;
-++                  <FONT COLOR=red><A NAME="ref_1465_19" HREF="terminal_interface-curses__adb.htm#ref_1777_19">Len</A></FONT> : <b>in</b>  Integer := -1);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_getstr.3x.html">wgetnstr()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: wgetstr()</EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: getnstr()</EM></FONT>
-+@@ -1470,12 +1475,12 @@
-+    <FONT COLOR=green><EM>--  actually getstr is not supported because that results in buffer</EM></FONT>
-+    <FONT COLOR=green><EM>--  overflows.</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_107"#2|</EM></FONT>
-+-   <b>procedure</b> Get (<FONT COLOR=red><A NAME="ref_1469_19" HREF="terminal_interface-curses__adb.htm#ref_1839_7">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Window</A> := Standard_Window;
-+-                  <FONT COLOR=red><A NAME="ref_1470_19" HREF="terminal_interface-curses__adb.htm#ref_1840_7">Line</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-                  <FONT COLOR=red><A NAME="ref_1471_19" HREF="terminal_interface-curses__adb.htm#ref_1841_7">Column</A></FONT> : <b>in</b>  Column_Position;
-+-                  <FONT COLOR=red><A NAME="ref_1472_19" HREF="terminal_interface-curses__adb.htm#ref_1842_7">Str</A></FONT>    : <b>out</b> String;
-+-                  Len    : <b>in</b>  Integer := -1);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_108"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1474_14" HREF="terminal_interface-curses__adb.htm#ref_1804_14">Get</A></FONT> (<FONT COLOR=red><A NAME="ref_1474_19" HREF="terminal_interface-curses__adb.htm#ref_1805_7">Win</A></FONT>    : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                  <FONT COLOR=red><A NAME="ref_1475_19" HREF="terminal_interface-curses__adb.htm#ref_1806_7">Line</A></FONT>   : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++                  <FONT COLOR=red><A NAME="ref_1476_19" HREF="terminal_interface-curses__adb.htm#ref_1807_7">Column</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++                  <FONT COLOR=red><A NAME="ref_1477_19" HREF="terminal_interface-curses__adb.htm#ref_1808_7">Str</A></FONT>    : <b>out</b> String;
-++                  <FONT COLOR=red><A NAME="ref_1478_19" HREF="terminal_interface-curses__adb.htm#ref_1809_7">Len</A></FONT>    : <b>in</b>  Integer := -1);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_getstr.3x.html">mvwgetnstr()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: mvwgetstr()</EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: mvgetnstr()</EM></FONT>
-+@@ -1488,90 +1493,90 @@
-+ 
-+    <FONT COLOR=green><EM>--  Not Implemented: slk_attr_on, slk_attr_off, slk_attr_set</EM></FONT>
-+ 
-+-   <b>type</b> Soft_Label_Key_Format <b>is</b> (<FONT COLOR=red><A NAME="ref_1486_35">Three_Two_Three</A></FONT>,
-+-                                  <FONT COLOR=red><A NAME="ref_1487_35">Four_Four</A></FONT>,
-+-                                  <FONT COLOR=red><A NAME="ref_1488_35">PC_Style</A></FONT>,              <FONT COLOR=green><EM>--  ncurses specific</EM></FONT>
-+-        <FONT COLOR=red><A NAME="ref_1489_9"> </A></FONT>                         PC_Style_With_Index);  <FONT COLOR=green><EM>--  "</EM></FONT>
-+-   <b>type</b> <FONT COLOR=red><A NAME="ref_1490_9">Label_Number</A></FONT> <b>is</b> <b>new</b> Positive <b>range</b> 1 .. <FONT COLOR=red><A NAME="ref_1490_49">12</A></FONT>;
-+-   <b>type</b> Label_Justification <b>is</b> (Left, Centered, Right);
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_1491_9">Soft_Label_Key_Format</A></FONT> <b>is</b> (<FONT COLOR=red><A NAME="ref_1491_35">Three_Two_Three</A></FONT>,
-++                                  <FONT COLOR=red><A NAME="ref_1492_35">Four_Four</A></FONT>,
-++                                  <FONT COLOR=red><A NAME="ref_1493_35">PC_Style</A></FONT>,              <FONT COLOR=green><EM>--  ncurses specific</EM></FONT>
-++                                  <FONT COLOR=red><A NAME="ref_1494_35">PC_Style_With_Index</A></FONT>);  <FONT COLOR=green><EM>--  "</EM></FONT>
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_1495_9">Label_Number</A></FONT> <b>is</b> <b>new</b> Positive <b>range</b> 1 .. 12;
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_1496_9">Label_Justification</A></FONT> <b>is</b> (<FONT COLOR=red><A NAME="ref_1496_33">Left</A></FONT>, <FONT COLOR=red><A NAME="ref_1496_39">Centered</A></FONT>, <FONT COLOR=red><A NAME="ref_1496_49">Right</A></FONT>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_108"#2|</EM></FONT>
-+-   <b>procedure</b> Init_Soft_Label_Keys
-+-     (Format : <b>in</b> Soft_Label_Key_Format := Three_Two_Three);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_109"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1499_14" HREF="terminal_interface-curses__adb.htm#ref_1816_14">Init_Soft_Label_Keys</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1500_7" HREF="terminal_interface-curses__adb.htm#ref_1817_7">Format</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1491_9">Soft_Label_Key_Format</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1491_35">Three_Two_Three</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_slk.3x.html">slk_init()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Init_Soft_Label_Keys);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1499_14">Init_Soft_Label_Keys</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_109"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Soft_Label_Key (<FONT COLOR=red><A NAME="ref_1500_34" HREF="terminal_interface-curses__adb.htm#ref_1861_34">Label</A></FONT> : <b>in</b> Label_Number;
-+-                                 <FONT COLOR=red><A NAME="ref_1501_34" HREF="terminal_interface-curses__adb.htm#ref_1862_34">Text</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1490_9">String</A>;
-+-                                 Fmt   : <b>in</b> Label_Justification := Left);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_110"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1505_14" HREF="terminal_interface-curses__adb.htm#ref_1827_14">Set_Soft_Label_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_1505_34" HREF="terminal_interface-curses__adb.htm#ref_1827_34">Label</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1495_9">Label_Number</A>;
-++                                 <FONT COLOR=red><A NAME="ref_1506_34" HREF="terminal_interface-curses__adb.htm#ref_1828_34">Text</A></FONT>  : <b>in</b> String;
-++                                 <FONT COLOR=red><A NAME="ref_1507_34" HREF="terminal_interface-curses__adb.htm#ref_1829_34">Fmt</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1496_9">Label_Justification</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1496_33">Left</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_slk.3x.html">slk_set()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  We don't inline this procedure</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_110"#2|</EM></FONT>
-+-   <b>procedure</b> Refresh_Soft_Label_Keys;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_111"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1512_14" HREF="terminal_interface-curses__adb.htm#ref_1846_14">Refresh_Soft_Label_Keys</A></FONT>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_slk.3x.html">slk_refresh()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Refresh_Soft_Label_Keys);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1512_14">Refresh_Soft_Label_Keys</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_111"#2|</EM></FONT>
-+-   <b>procedure</b> Refresh_Soft_Label_Keys_Without_Update;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_112"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1517_14" HREF="terminal_interface-curses__adb.htm#ref_1856_14">Refresh_Soft_Label_Keys_Without_Update</A></FONT>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_slk.3x.html">slk_noutrefresh()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Refresh_Soft_Label_Keys_Without_Update);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1517_14">Refresh_Soft_Label_Keys_Without_Update</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_112"#2|</EM></FONT>
-+-   <b>procedure</b> Get_Soft_Label_Key (<FONT COLOR=red><A NAME="ref_1517_34" HREF="terminal_interface-curses__adb.htm#ref_1900_34">Label</A></FONT> : <b>in</b> Label_Number;
-+-                                 Text  : <b>out</b> String);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_113"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1522_14" HREF="terminal_interface-curses__adb.htm#ref_1866_14">Get_Soft_Label_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_1522_34" HREF="terminal_interface-curses__adb.htm#ref_1866_34">Label</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1495_9">Label_Number</A>;
-++                                 <FONT COLOR=red><A NAME="ref_1523_34" HREF="terminal_interface-curses__adb.htm#ref_1867_34">Text</A></FONT>  : <b>out</b> String);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_slk.3x.html">slk_label()</A></EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_113"#2|</EM></FONT>
-+-   <b>function</b> Get_Soft_Label_Key (Label : <b>in</b> Label_Number) <b>return</b> String;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_114"#2|</EM></FONT>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1527_13" HREF="terminal_interface-curses__adb.htm#ref_1875_13">Get_Soft_Label_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_1527_33" HREF="terminal_interface-curses__adb.htm#ref_1875_33">Label</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1495_9">Label_Number</A>) <b>return</b> String;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_slk.3x.html">slk_label()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  Same as function</EM></FONT>
-+    <b>pragma</b> Inline (Get_Soft_Label_Key);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_114"#2|</EM></FONT>
-+-   <b>procedure</b> Clear_Soft_Label_Keys;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_115"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1533_14" HREF="terminal_interface-curses__adb.htm#ref_1883_14">Clear_Soft_Label_Keys</A></FONT>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_slk.3x.html">slk_clear()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Clear_Soft_Label_Keys);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1533_14">Clear_Soft_Label_Keys</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_115"#2|</EM></FONT>
-+-   <b>procedure</b> Restore_Soft_Label_Keys;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_116"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1538_14" HREF="terminal_interface-curses__adb.htm#ref_1893_14">Restore_Soft_Label_Keys</A></FONT>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_slk.3x.html">slk_restore()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Restore_Soft_Label_Keys);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1538_14">Restore_Soft_Label_Keys</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_116"#2|</EM></FONT>
-+-   <b>procedure</b> Touch_Soft_Label_Keys;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_117"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1543_14" HREF="terminal_interface-curses__adb.htm#ref_1903_14">Touch_Soft_Label_Keys</A></FONT>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_slk.3x.html">slk_touch()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Touch_Soft_Label_Keys);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1543_14">Touch_Soft_Label_Keys</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_117"#2|</EM></FONT>
-+-   <b>procedure</b> Switch_Soft_Label_Key_Attributes
-+-     (<FONT COLOR=red><A NAME="ref_1544_7" HREF="terminal_interface-curses__adb.htm#ref_1948_7">Attr</A></FONT> : <b>in</b> Character_Attribute_Set;
-+-      On   : <b>in</b> Boolean := True);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_118"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1548_14" HREF="terminal_interface-curses__adb.htm#ref_1913_14">Switch_Soft_Label_Key_Attributes</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1549_7" HREF="terminal_interface-curses__adb.htm#ref_1914_7">Attr</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>;
-++      <FONT COLOR=red><A NAME="ref_1550_7" HREF="terminal_interface-curses__adb.htm#ref_1915_7">On</A></FONT>   : <b>in</b> Boolean := True);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_slk.3x.html">slk_attron()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: slk_attroff()</EM></FONT>
-+-   <b>pragma</b> Inline (Switch_Soft_Label_Key_Attributes);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1548_14">Switch_Soft_Label_Key_Attributes</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_118"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Soft_Label_Key_Attributes
-+-     (<FONT COLOR=red><A NAME="ref_1552_7" HREF="terminal_interface-curses__adb.htm#ref_1972_7">Attr</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Character_Attribute_Set</A> := Normal_Video;
-+-      Color : <b>in</b> Color_Pair := Color_Pair'First);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_119"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1556_14" HREF="terminal_interface-curses__adb.htm#ref_1937_14">Set_Soft_Label_Key_Attributes</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1557_7" HREF="terminal_interface-curses__adb.htm#ref_1938_7">Attr</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A> := <A HREF="terminal_interface-curses__ads.htm#ref_350_4">Normal_Video</A>;
-++      <FONT COLOR=red><A NAME="ref_1558_7" HREF="terminal_interface-curses__adb.htm#ref_1939_7">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A> := <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>'First);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_slk.3x.html">slk_attrset()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Soft_Label_Key_Attributes);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1556_14">Set_Soft_Label_Key_Attributes</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_119"#2|</EM></FONT>
-+-   <b>function</b> Get_Soft_Label_Key_Attributes <b>return</b> Character_Attribute_Set;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_120"#2|</EM></FONT>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1563_13" HREF="terminal_interface-curses__adb.htm#ref_1953_13">Get_Soft_Label_Key_Attributes</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_slk.3x.html">slk_attr()</A></EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_120"#2|</EM></FONT>
-+-   <b>function</b> Get_Soft_Label_Key_Attributes <b>return</b> Color_Pair;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_121"#2|</EM></FONT>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1567_13" HREF="terminal_interface-curses__adb.htm#ref_1963_13">Get_Soft_Label_Key_Attributes</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_slk.3x.html">slk_attr()</A></EM></FONT>
-+    <b>pragma</b> Inline (Get_Soft_Label_Key_Attributes);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_121"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Soft_Label_Key_Color (Pair : <b>in</b> Color_Pair);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_122"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1572_14" HREF="terminal_interface-curses__adb.htm#ref_1973_14">Set_Soft_Label_Key_Color</A></FONT> (<FONT COLOR=red><A NAME="ref_1572_40" HREF="terminal_interface-curses__adb.htm#ref_1973_40">Pair</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_slk.3x.html">slk_color()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Soft_Label_Key_Color);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1572_14">Set_Soft_Label_Key_Color</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/keybound.3x.html">keybound.3x</A></EM></FONT>
-+@@ -1582,21 +1587,21 @@
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/keyok.3x.html">keyok.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_122"#2|</EM></FONT>
-+-   <b>procedure</b> Enable_Key (<FONT COLOR=red><A NAME="ref_1581_26" HREF="terminal_interface-curses__adb.htm#ref_2018_26">Key</A></FONT>    : <b>in</b> Special_Key_Code;
-+-                         Enable : <b>in</b> Boolean := True);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_123"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1586_14" HREF="terminal_interface-curses__adb.htm#ref_1984_14">Enable_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_1586_26" HREF="terminal_interface-curses__adb.htm#ref_1984_26">Key</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>;
-++                         <FONT COLOR=red><A NAME="ref_1587_26" HREF="terminal_interface-curses__adb.htm#ref_1985_26">Enable</A></FONT> : <b>in</b> Boolean := True);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/keyok.3x.html">keyok()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Enable_Key);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1586_14">Enable_Key</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/define_key.3x.html">define_key.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_123"#2|</EM></FONT>
-+-   <b>procedure</b> Define_Key (<FONT COLOR=red><A NAME="ref_1591_26" HREF="terminal_interface-curses__adb.htm#ref_2031_26">Definition</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">String</A>;
-+-                         Key        : <b>in</b> Special_Key_Code);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_124"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1596_14" HREF="terminal_interface-curses__adb.htm#ref_1997_14">Define_Key</A></FONT> (<FONT COLOR=red><A NAME="ref_1596_26" HREF="terminal_interface-curses__adb.htm#ref_1997_26">Definition</A></FONT> : <b>in</b> String;
-++                         <FONT COLOR=red><A NAME="ref_1597_26" HREF="terminal_interface-curses__adb.htm#ref_1998_26">Key</A></FONT>        : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_78_12">Special_Key_Code</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/define_key.3x.html">define_key()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Define_Key);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1596_14">Define_Key</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_util.3x.html">curs_util.3x</A></EM></FONT>
-+@@ -1606,89 +1611,89 @@
-+    <FONT COLOR=green><EM>--  | putwin, getwin are in the child package PutWin</EM></FONT>
-+    <FONT COLOR=green><EM>--</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_124"#2|</EM></FONT>
-+-   <b>procedure</b> Key_Name (<FONT COLOR=red><A NAME="ref_1605_24" HREF="terminal_interface-curses__adb.htm#ref_144_24">Key</A></FONT>  : <b>in</b>  Real_Key_Code;
-+-                       Name : <b>out</b> String);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_125"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1610_14" HREF="terminal_interface-curses__adb.htm#ref_90_14">Key_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_1610_24" HREF="terminal_interface-curses__adb.htm#ref_90_24">Key</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>;
-++                       <FONT COLOR=red><A NAME="ref_1611_24" HREF="terminal_interface-curses__adb.htm#ref_91_24">Name</A></FONT> : <b>out</b> String);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_util.3x.html">keyname()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  The external name for a real keystroke.</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_125"#2|</EM></FONT>
-+-   <b>function</b> Key_Name (Key  : <b>in</b>  Real_Key_Code) <b>return</b> String;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_126"#2|</EM></FONT>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1616_13" HREF="terminal_interface-curses__adb.htm#ref_62_13">Key_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_1616_23" HREF="terminal_interface-curses__adb.htm#ref_62_23">Key</A></FONT>  : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_73_12">Real_Key_Code</A>) <b>return</b> String;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_util.3x.html">keyname()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  Same as function</EM></FONT>
-+    <FONT COLOR=green><EM>--  We don't inline this routine</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_126"#2|</EM></FONT>
-+-   <b>procedure</b> Un_Control (<FONT COLOR=red><A NAME="ref_1617_26" HREF="terminal_interface-curses__adb.htm#ref_2047_26">Ch</A></FONT>  : <b>in</b> Attributed_Character;
-+-                         Str : <b>out</b> String);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_127"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1622_14" HREF="terminal_interface-curses__adb.htm#ref_2013_14">Un_Control</A></FONT> (<FONT COLOR=red><A NAME="ref_1622_26" HREF="terminal_interface-curses__adb.htm#ref_2013_26">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>;
-++                         <FONT COLOR=red><A NAME="ref_1623_26" HREF="terminal_interface-curses__adb.htm#ref_2014_26">Str</A></FONT> : <b>out</b> String);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_util.3x.html">unctrl()</A></EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_127"#2|</EM></FONT>
-+-   <b>function</b> Un_Control (Ch  : <b>in</b> Attributed_Character) <b>return</b> String;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_128"#2|</EM></FONT>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1627_13" HREF="terminal_interface-curses__adb.htm#ref_2022_13">Un_Control</A></FONT> (<FONT COLOR=red><A NAME="ref_1627_25" HREF="terminal_interface-curses__adb.htm#ref_2022_25">Ch</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_352_9">Attributed_Character</A>) <b>return</b> String;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_util.3x.html">unctrl()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  Same as function</EM></FONT>
-+    <b>pragma</b> Inline (Un_Control);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_128"#2|</EM></FONT>
-+-   <b>procedure</b> Delay_Output (Msecs : <b>in</b> Natural);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_129"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1633_14" HREF="terminal_interface-curses__adb.htm#ref_2030_14">Delay_Output</A></FONT> (<FONT COLOR=red><A NAME="ref_1633_28" HREF="terminal_interface-curses__adb.htm#ref_2030_28">Msecs</A></FONT> : <b>in</b> Natural);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_util.3x.html">delay_output()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Delay_Output);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1633_14">Delay_Output</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_129"#2|</EM></FONT>
-+-   <b>procedure</b> Flush_Input;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_130"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1638_14" HREF="terminal_interface-curses__adb.htm#ref_2040_14">Flush_Input</A></FONT>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_util.3x.html">flushinp()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Flush_Input);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1638_14">Flush_Input</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_termattrs.3x.html">curs_termattrs.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_130"#2|</EM></FONT>
-+-   <b>function</b> Baudrate <b>return</b> Natural;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_131"#2|</EM></FONT>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1647_13" HREF="terminal_interface-curses__adb.htm#ref_2050_13">Baudrate</A></FONT> <b>return</b> Natural;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_termattrs.3x.html">baudrate()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Baudrate);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1647_13">Baudrate</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_131"#2|</EM></FONT>
-+-   <b>function</b> Erase_Character <b>return</b> Character;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_132"#2|</EM></FONT>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1652_13" HREF="terminal_interface-curses__adb.htm#ref_2058_13">Erase_Character</A></FONT> <b>return</b> Character;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_termattrs.3x.html">erasechar()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Erase_Character);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1652_13">Erase_Character</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_132"#2|</EM></FONT>
-+-   <b>function</b> Kill_Character <b>return</b> Character;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_133"#2|</EM></FONT>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1657_13" HREF="terminal_interface-curses__adb.htm#ref_2066_13">Kill_Character</A></FONT> <b>return</b> Character;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_termattrs.3x.html">killchar()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Kill_Character);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1657_13">Kill_Character</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_133"#2|</EM></FONT>
-+-   <b>function</b> Has_Insert_Character <b>return</b> Boolean;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_134"#2|</EM></FONT>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1662_13" HREF="terminal_interface-curses__adb.htm#ref_2074_13">Has_Insert_Character</A></FONT> <b>return</b> Boolean;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_termattrs.3x.html">has_ic()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Has_Insert_Character);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1662_13">Has_Insert_Character</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_134"#2|</EM></FONT>
-+-   <b>function</b> Has_Insert_Line <b>return</b> Boolean;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_135"#2|</EM></FONT>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1667_13" HREF="terminal_interface-curses__adb.htm#ref_2086_13">Has_Insert_Line</A></FONT> <b>return</b> Boolean;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_termattrs.3x.html">has_il()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Has_Insert_Line);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1667_13">Has_Insert_Line</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_135"#2|</EM></FONT>
-+-   <b>function</b> Supported_Attributes <b>return</b> Character_Attribute_Set;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_136"#2|</EM></FONT>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1672_13" HREF="terminal_interface-curses__adb.htm#ref_2098_13">Supported_Attributes</A></FONT> <b>return</b> <A HREF="terminal_interface-curses__ads.htm#ref_307_9">Character_Attribute_Set</A>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_termattrs.3x.html">termattrs()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Supported_Attributes);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1672_13">Supported_Attributes</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_136"#2|</EM></FONT>
-+-   <b>procedure</b> Long_Name (Name : <b>out</b> String);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_137"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1677_14" HREF="terminal_interface-curses__adb.htm#ref_2108_14">Long_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_1677_25" HREF="terminal_interface-curses__adb.htm#ref_2108_25">Name</A></FONT> : <b>out</b> String);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_termattrs.3x.html">longname()</A></EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_137"#2|</EM></FONT>
-+-   <b>function</b> Long_Name <b>return</b> String;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_138"#2|</EM></FONT>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1681_13" HREF="terminal_interface-curses__adb.htm#ref_2116_13">Long_Name</A></FONT> <b>return</b> String;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_termattrs.3x.html">longname()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  Same as function</EM></FONT>
-+    <b>pragma</b> Inline (Long_Name);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_138"#2|</EM></FONT>
-+-   <b>procedure</b> Terminal_Name (Name : <b>out</b> String);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_139"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1687_14" HREF="terminal_interface-curses__adb.htm#ref_2124_14">Terminal_Name</A></FONT> (<FONT COLOR=red><A NAME="ref_1687_29" HREF="terminal_interface-curses__adb.htm#ref_2124_29">Name</A></FONT> : <b>out</b> String);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_termattrs.3x.html">termname()</A></EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_139"#2|</EM></FONT>
-+-   <b>function</b> Terminal_Name <b>return</b> String;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_140"#2|</EM></FONT>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1691_13" HREF="terminal_interface-curses__adb.htm#ref_2132_13">Terminal_Name</A></FONT> <b>return</b> String;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_termattrs.3x.html">termname()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  Same as function</EM></FONT>
-+    <b>pragma</b> Inline (Terminal_Name);
-+@@ -1703,119 +1708,119 @@
-+    <FONT COLOR=green><EM>--  In C you often see something like c = c | COLOR_PAIR(n);</EM></FONT>
-+    <FONT COLOR=green><EM>--  This is equivalent to c.Color := n;</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_140"#2|</EM></FONT>
-+-   <b>procedure</b> Start_Color;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_141"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1707_14">Start_Color</A></FONT>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_color.3x.html">start_color()</A></EM></FONT>
-+    <b>pragma</b> Import (C, Start_Color, "start_color");
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_141"#2|</EM></FONT>
-+-   <b>procedure</b> Init_Pair (<FONT COLOR=red><A NAME="ref_1707_25" HREF="terminal_interface-curses__adb.htm#ref_2174_25">Pair</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Redefinable_Color_Pair</A>;
-+-                        <FONT COLOR=red><A NAME="ref_1708_25" HREF="terminal_interface-curses__adb.htm#ref_2175_25">Fore</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>;
-+-                        Back : <b>in</b> Color_Number);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_142"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1712_14" HREF="terminal_interface-curses__adb.htm#ref_2140_14">Init_Pair</A></FONT> (<FONT COLOR=red><A NAME="ref_1712_25" HREF="terminal_interface-curses__adb.htm#ref_2140_25">Pair</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_301_12">Redefinable_Color_Pair</A>;
-++                        <FONT COLOR=red><A NAME="ref_1713_25" HREF="terminal_interface-curses__adb.htm#ref_2141_25">Fore</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>;
-++                        <FONT COLOR=red><A NAME="ref_1714_25" HREF="terminal_interface-curses__adb.htm#ref_2142_25">Back</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_color.3x.html">init_pair()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Init_Pair);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1712_14">Init_Pair</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_142"#2|</EM></FONT>
-+-   <b>procedure</b> Pair_Content (<FONT COLOR=red><A NAME="ref_1714_28" HREF="terminal_interface-curses__adb.htm#ref_2195_28">Pair</A></FONT> : <b>in</b> Color_Pair;
-+-                           <FONT COLOR=red><A NAME="ref_1715_28" HREF="terminal_interface-curses__adb.htm#ref_2196_28">Fore</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>;
-+-                           Back : <b>out</b> Color_Number);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_143"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1719_14" HREF="terminal_interface-curses__adb.htm#ref_2161_14">Pair_Content</A></FONT> (<FONT COLOR=red><A NAME="ref_1719_28" HREF="terminal_interface-curses__adb.htm#ref_2161_28">Pair</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_299_9">Color_Pair</A>;
-++                           <FONT COLOR=red><A NAME="ref_1720_28" HREF="terminal_interface-curses__adb.htm#ref_2162_28">Fore</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>;
-++                           <FONT COLOR=red><A NAME="ref_1721_28" HREF="terminal_interface-curses__adb.htm#ref_2163_28">Back</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_color.3x.html">pair_content()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Pair_Content);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1719_14">Pair_Content</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_143"#2|</EM></FONT>
-+-   <b>function</b> Has_Colors <b>return</b> Boolean;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_144"#2|</EM></FONT>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1726_13" HREF="terminal_interface-curses__adb.htm#ref_2181_13">Has_Colors</A></FONT> <b>return</b> Boolean;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_color.3x.html">has_colors()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Has_Colors);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1726_13">Has_Colors</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_144"#2|</EM></FONT>
-+-   <b>procedure</b> Init_Color (<FONT COLOR=red><A NAME="ref_1726_26" HREF="terminal_interface-curses__adb.htm#ref_2227_26">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">Color_Number</A>;
-+-                         <FONT COLOR=red><A NAME="ref_1727_26" HREF="terminal_interface-curses__adb.htm#ref_2228_26">Red</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
-+-                         <FONT COLOR=red><A NAME="ref_1728_26" HREF="terminal_interface-curses__adb.htm#ref_2229_26">Green</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
-+-                         Blue  : <b>in</b> RGB_Value);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_145"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1731_14" HREF="terminal_interface-curses__adb.htm#ref_2193_14">Init_Color</A></FONT> (<FONT COLOR=red><A NAME="ref_1731_26" HREF="terminal_interface-curses__adb.htm#ref_2193_26">Color</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>;
-++                         <FONT COLOR=red><A NAME="ref_1732_26" HREF="terminal_interface-curses__adb.htm#ref_2194_26">Red</A></FONT>   : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
-++                         <FONT COLOR=red><A NAME="ref_1733_26" HREF="terminal_interface-curses__adb.htm#ref_2195_26">Green</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
-++                         <FONT COLOR=red><A NAME="ref_1734_26" HREF="terminal_interface-curses__adb.htm#ref_2196_26">Blue</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_color.3x.html">init_color()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Init_Color);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1731_14">Init_Color</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_145"#2|</EM></FONT>
-+-   <b>function</b> Can_Change_Color <b>return</b> Boolean;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_146"#2|</EM></FONT>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1739_13" HREF="terminal_interface-curses__adb.htm#ref_2210_13">Can_Change_Color</A></FONT> <b>return</b> Boolean;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_color.3x.html">can_change_color()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Can_Change_Color);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1739_13">Can_Change_Color</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_146"#2|</EM></FONT>
-+-   <b>procedure</b> Color_Content (<FONT COLOR=red><A NAME="ref_1739_29" HREF="terminal_interface-curses__adb.htm#ref_2256_29">Color</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_295_9">Color_Number</A>;
-+-                            <FONT COLOR=red><A NAME="ref_1740_29" HREF="terminal_interface-curses__adb.htm#ref_2257_29">Red</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
-+-                            <FONT COLOR=red><A NAME="ref_1741_29" HREF="terminal_interface-curses__adb.htm#ref_2258_29">Green</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
-+-                            Blue  : <b>out</b> RGB_Value);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_147"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1744_14" HREF="terminal_interface-curses__adb.htm#ref_2222_14">Color_Content</A></FONT> (<FONT COLOR=red><A NAME="ref_1744_29" HREF="terminal_interface-curses__adb.htm#ref_2222_29">Color</A></FONT> : <b>in</b>  <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A>;
-++                            <FONT COLOR=red><A NAME="ref_1745_29" HREF="terminal_interface-curses__adb.htm#ref_2223_29">Red</A></FONT>   : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
-++                            <FONT COLOR=red><A NAME="ref_1746_29" HREF="terminal_interface-curses__adb.htm#ref_2224_29">Green</A></FONT> : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>;
-++                            <FONT COLOR=red><A NAME="ref_1747_29" HREF="terminal_interface-curses__adb.htm#ref_2225_29">Blue</A></FONT>  : <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_295_9">RGB_Value</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_color.3x.html">color_content()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Color_Content);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1744_14">Color_Content</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_kernel.3x.html">curs_kernel.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Not implemented: getsyx, setsyx</EM></FONT>
-+    <FONT COLOR=green><EM>--</EM></FONT>
-+-   <b>type</b> Curses_Mode <b>is</b> (Curses, Shell);
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_1756_9">Curses_Mode</A></FONT> <b>is</b> (<FONT COLOR=red><A NAME="ref_1756_25">Curses</A></FONT>, <FONT COLOR=red><A NAME="ref_1756_33">Shell</A></FONT>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_147"#2|</EM></FONT>
-+-   <b>procedure</b> Save_Curses_Mode (Mode : <b>in</b> Curses_Mode);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_148"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1759_14" HREF="terminal_interface-curses__adb.htm#ref_2246_14">Save_Curses_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_1759_32" HREF="terminal_interface-curses__adb.htm#ref_2246_32">Mode</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1756_9">Curses_Mode</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_kernel.3x.html">def_prog_mode()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: def_shell_mode()</EM></FONT>
-+-   <b>pragma</b> Inline (Save_Curses_Mode);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1759_14">Save_Curses_Mode</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_148"#2|</EM></FONT>
-+-   <b>procedure</b> Reset_Curses_Mode (Mode : <b>in</b> Curses_Mode);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_149"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1765_14" HREF="terminal_interface-curses__adb.htm#ref_2264_14">Reset_Curses_Mode</A></FONT> (<FONT COLOR=red><A NAME="ref_1765_33" HREF="terminal_interface-curses__adb.htm#ref_2264_33">Mode</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1756_9">Curses_Mode</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_kernel.3x.html">reset_prog_mode()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  AKA: reset_shell_mode()</EM></FONT>
-+-   <b>pragma</b> Inline (Reset_Curses_Mode);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1765_14">Reset_Curses_Mode</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_149"#2|</EM></FONT>
-+-   <b>procedure</b> Save_Terminal_State;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_150"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1771_14" HREF="terminal_interface-curses__adb.htm#ref_2282_14">Save_Terminal_State</A></FONT>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_kernel.3x.html">savetty()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Save_Terminal_State);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1771_14">Save_Terminal_State</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_150"#2|</EM></FONT>
-+-   <b>procedure</b> Reset_Terminal_State;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_151"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1776_14" HREF="terminal_interface-curses__adb.htm#ref_2292_14">Reset_Terminal_State</A></FONT>;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_kernel.3x.html">resetty();</A></EM></FONT>
-+-   <b>pragma</b> Inline (Reset_Terminal_State);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1776_14">Reset_Terminal_State</A>);
-+ 
-+-   <b>type</b> Stdscr_Init_Proc <b>is</b> <b>access</b>
-+-      <b>function</b> (<FONT COLOR=red><A NAME="ref_1776_17">Win</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Window</A>;
-+-                Columns :<A HREF="terminal_interface-curses__ads.htm#ref_1774_9"> </A>Column_Count) <b>return</b> Integer;
-+-   <b>pragma</b> Convention (C, Stdscr_Init_Proc);
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_1780_9">Stdscr_Init_Proc</A></FONT> <b>is</b> <b>access</b>
-++      <b>function</b> (<FONT COLOR=red><A NAME="ref_1781_17">Win</A></FONT>     : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A>;
-++                <FONT COLOR=red><A NAME="ref_1782_17">Columns</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>) <b>return</b> Integer;
-++   <b>pragma</b> Convention (C, <A HREF="terminal_interface-curses__ads.htm#ref_1780_9">Stdscr_Init_Proc</A>);
-+    <FONT COLOR=green><EM>--  N.B.: the return value is actually ignored, but it seems to be</EM></FONT>
-+    <FONT COLOR=green><EM>--        a good practice to return 0 if you think all went fine</EM></FONT>
-+    <FONT COLOR=green><EM>--        and -1 otherwise.</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_151"#2|</EM></FONT>
-+-   <b>procedure</b> Rip_Off_Lines (<FONT COLOR=red><A NAME="ref_1784_29" HREF="terminal_interface-curses__adb.htm#ref_2336_29">Lines</A></FONT> : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1774_9">Integer</A>;
-+-                            Proc  : <b>in</b> Stdscr_Init_Proc);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_152"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1789_14" HREF="terminal_interface-curses__adb.htm#ref_2302_14">Rip_Off_Lines</A></FONT> (<FONT COLOR=red><A NAME="ref_1789_29" HREF="terminal_interface-curses__adb.htm#ref_2302_29">Lines</A></FONT> : <b>in</b> Integer;
-++                            <FONT COLOR=red><A NAME="ref_1790_29" HREF="terminal_interface-curses__adb.htm#ref_2303_29">Proc</A></FONT>  : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1780_9">Stdscr_Init_Proc</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_kernel.3x.html">ripoffline()</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  N.B.: to be more precise, this uses a ncurses specific enhancement of</EM></FONT>
-+    <FONT COLOR=green><EM>--        ripoffline(), in which the Lines argument absolute value is the</EM></FONT>
-+    <FONT COLOR=green><EM>--        number of lines to be ripped of. The official ripoffline() only</EM></FONT>
-+    <FONT COLOR=green><EM>--        uses the sign of Lines to rip of a single line from bottom or top.</EM></FONT>
-+-   <b>pragma</b> Inline (Rip_Off_Lines);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1789_14">Rip_Off_Lines</A>);
-+ 
-+-   <b>type</b> Cursor_Visibility <b>is</b> (Invisible, Normal, Very_Visible);
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_1798_9">Cursor_Visibility</A></FONT> <b>is</b> (<FONT COLOR=red><A NAME="ref_1798_31">Invisible</A></FONT>, <FONT COLOR=red><A NAME="ref_1798_42">Normal</A></FONT>, <FONT COLOR=red><A NAME="ref_1798_50">Very_Visible</A></FONT>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_152"#2|</EM></FONT>
-+-   <b>procedure</b> Set_Cursor_Visibility (Visibility : <b>in</b> <b>out</b> Cursor_Visibility);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_153"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1801_14" HREF="terminal_interface-curses__adb.htm#ref_2314_14">Set_Cursor_Visibility</A></FONT> (<FONT COLOR=red><A NAME="ref_1801_37" HREF="terminal_interface-curses__adb.htm#ref_2314_37">Visibility</A></FONT> : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_1798_9">Cursor_Visibility</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_kernel.3x.html">curs_set()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Set_Cursor_Visibility);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1801_14">Set_Cursor_Visibility</A>);
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_153"#2|</EM></FONT>
-+-   <b>procedure</b> Nap_Milli_Seconds (Ms : <b>in</b> Natural);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_154"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1806_14" HREF="terminal_interface-curses__adb.htm#ref_2327_14">Nap_Milli_Seconds</A></FONT> (<FONT COLOR=red><A NAME="ref_1806_33" HREF="terminal_interface-curses__adb.htm#ref_2327_33">Ms</A></FONT> : <b>in</b> Natural);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_kernel.3x.html">napms()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Nap_Milli_Seconds);
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1806_14">Nap_Milli_Seconds</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Some useful helpers.</EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+-   <b>type</b> Transform_Direction <b>is</b> (From_Screen, To_Screen);
-+-   <b>procedure</b> Transform_Coordinates
-+-     (<FONT COLOR=red><A NAME="ref_1810_7" HREF="terminal_interface-curses__adb.htm#ref_2421_7">W</A></FONT>      : <b>in</b> Window := Standard_Window;
-+-      <FONT COLOR=red><A NAME="ref_1811_7" HREF="terminal_interface-curses__adb.htm#ref_2422_7">Line</A></FONT>   : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Line_Position</A>;
-+-      <FONT COLOR=red><A NAME="ref_1812_7" HREF="terminal_interface-curses__adb.htm#ref_2423_7">Column</A></FONT> : <b>in</b> <b>out</b> Column_Position;
-+-      Dir    : <b>in</b> Transform_Direction := From_Screen);
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_1813_9">Transform_Direction</A></FONT> <b>is</b> (<FONT COLOR=red><A NAME="ref_1813_33">From_Screen</A></FONT>, <FONT COLOR=red><A NAME="ref_1813_46">To_Screen</A></FONT>);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1814_14" HREF="terminal_interface-curses__adb.htm#ref_2395_14">Transform_Coordinates</A></FONT>
-++     (<FONT COLOR=red><A NAME="ref_1815_7" HREF="terminal_interface-curses__adb.htm#ref_2396_7">W</A></FONT>      : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++      <FONT COLOR=red><A NAME="ref_1816_7" HREF="terminal_interface-curses__adb.htm#ref_2397_7">Line</A></FONT>   : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_60_9">Line_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1817_7" HREF="terminal_interface-curses__adb.htm#ref_2398_7">Column</A></FONT> : <b>in</b> <b>out</b> <A HREF="terminal_interface-curses__ads.htm#ref_61_9">Column_Position</A>;
-++      <FONT COLOR=red><A NAME="ref_1818_7" HREF="terminal_interface-curses__adb.htm#ref_2399_7">Dir</A></FONT>    : <b>in</b> <A HREF="terminal_interface-curses__ads.htm#ref_1813_9">Transform_Direction</A> := <A HREF="terminal_interface-curses__ads.htm#ref_1813_33">From_Screen</A>);
-+    <FONT COLOR=green><EM>--  This procedure transforms screen coordinates into coordinates relative</EM></FONT>
-+    <FONT COLOR=green><EM>--  to the window and vice versa, depending on the Dir parameter.</EM></FONT>
-+    <FONT COLOR=green><EM>--  Screen coordinates are the position informations on the physical device.</EM></FONT>
-+@@ -1824,51 +1829,59 @@
-+    <FONT COLOR=green><EM>--  We don't inline this procedure</EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+-   <FONT COLOR=green><EM>--  | Man page <A HREF="../man/dft_fgbg.3x.html">dft_fgbg.3x</A></EM></FONT>
-++   <FONT COLOR=green><EM>--  | Man page <A HREF="../man/default_colors.3x.html">default_colors.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_154"#2|</EM></FONT>
-+-   <b>procedure</b> Use_Default_Colors;
-+-   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/dft_fgbg.3x.html">use_default_colors()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Use_Default_Colors);
-+-
-+    <FONT COLOR=green><EM>--  #1A NAME="AFU_155"#2|</EM></FONT>
-+-   <b>procedure</b> Assume_Default_Colors (<FONT COLOR=red><A NAME="ref_1831_37" HREF="terminal_interface-curses__adb.htm#ref_2459_37">Fore</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := <A HREF="terminal_interface-curses__ads.htm#ref_285_4">Default_Color</A>;
-+-                                    Back : Color_Number := Default_Color);
-+-   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/dft_fgbg.3x.html">assume_default_colors()</A></EM></FONT>
-+-   <b>pragma</b> Inline (Assume_Default_Colors);
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1831_14" HREF="terminal_interface-curses__adb.htm#ref_2424_14">Use_Default_Colors</A></FONT>;
-++   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/default_colors.3x.html">use_default_colors()</A></EM></FONT>
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1831_14">Use_Default_Colors</A>);
-++
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_156"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1836_14" HREF="terminal_interface-curses__adb.htm#ref_2434_14">Assume_Default_Colors</A></FONT> (<FONT COLOR=red><A NAME="ref_1836_37" HREF="terminal_interface-curses__adb.htm#ref_2434_37">Fore</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := <A HREF="terminal_interface-curses__ads.htm#ref_285_4">Default_Color</A>;
-++                                    <FONT COLOR=red><A NAME="ref_1837_37" HREF="terminal_interface-curses__adb.htm#ref_2435_37">Back</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_278_9">Color_Number</A> := <A HREF="terminal_interface-curses__ads.htm#ref_285_4">Default_Color</A>);
-++   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/default_colors.3x.html">assume_default_colors()</A></EM></FONT>
-++   <b>pragma</b> Inline (<A HREF="terminal_interface-curses__ads.htm#ref_1836_14">Assume_Default_Colors</A>);
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_extend.3x.html">curs_extend.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_156"#2|</EM></FONT>
-+-   <b>function</b> Curses_Version <b>return</b> String;
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_157"#2|</EM></FONT>
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1846_13" HREF="terminal_interface-curses__adb.htm#ref_2449_13">Curses_Version</A></FONT> <b>return</b> String;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_extend.3x.html">curses_version()</A></EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_157"#2|</EM></FONT>
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_158"#2|</EM></FONT>
-+    <FONT COLOR=green><EM>--  The returnvalue is the previous setting of the flag</EM></FONT>
-+-   <b>function</b> Use_Extended_Names (Enable : Boolean) <b>return</b> Boolean;
-++   <b>function</b> <FONT COLOR=red><A NAME="ref_1851_13" HREF="terminal_interface-curses__adb.htm#ref_2472_13">Use_Extended_Names</A></FONT> (<FONT COLOR=red><A NAME="ref_1851_33" HREF="terminal_interface-curses__adb.htm#ref_2472_33">Enable</A></FONT> : Boolean) <b>return</b> Boolean;
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_extend.3x.html">use_extended_names()</A></EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-++   <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_trace.3x.html">curs_trace.3x</A></EM></FONT>
-++   <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-++
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_159"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1859_14" HREF="terminal_interface-curses__adb.htm#ref_2458_14">Curses_Free_All</A></FONT>;
-++   <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_trace.3x.html">_nc_freeall()</A></EM></FONT>
-++
-++   <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/curs_scr_dump.3x.html">curs_scr_dump.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_158"#2|</EM></FONT>
-+-   <b>procedure</b> Screen_Dump_To_File (Filename : <b>in</b> String);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_160"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1867_14" HREF="terminal_interface-curses__adb.htm#ref_2487_14">Screen_Dump_To_File</A></FONT> (<FONT COLOR=red><A NAME="ref_1867_35" HREF="terminal_interface-curses__adb.htm#ref_2487_35">Filename</A></FONT> : <b>in</b> String);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_scr_dump.3x.html">scr_dump()</A></EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_159"#2|</EM></FONT>
-+-   <b>procedure</b> Screen_Restore_From_File (Filename : <b>in</b> String);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_161"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1871_14" HREF="terminal_interface-curses__adb.htm#ref_2500_14">Screen_Restore_From_File</A></FONT> (<FONT COLOR=red><A NAME="ref_1871_40" HREF="terminal_interface-curses__adb.htm#ref_2500_40">Filename</A></FONT> : <b>in</b> String);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_scr_dump.3x.html">scr_restore()</A></EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_160"#2|</EM></FONT>
-+-   <b>procedure</b> Screen_Init_From_File (Filename : <b>in</b> String);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_162"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1875_14" HREF="terminal_interface-curses__adb.htm#ref_2513_14">Screen_Init_From_File</A></FONT> (<FONT COLOR=red><A NAME="ref_1875_37" HREF="terminal_interface-curses__adb.htm#ref_2513_37">Filename</A></FONT> : <b>in</b> String);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_scr_dump.3x.html">scr_init()</A></EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_161"#2|</EM></FONT>
-+-   <b>procedure</b> Screen_Set_File (Filename : <b>in</b> String);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_163"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1879_14" HREF="terminal_interface-curses__adb.htm#ref_2526_14">Screen_Set_File</A></FONT> (<FONT COLOR=red><A NAME="ref_1879_31" HREF="terminal_interface-curses__adb.htm#ref_2526_31">Filename</A></FONT> : <b>in</b> String);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/curs_scr_dump.3x.html">scr_set()</A></EM></FONT>
-+ 
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+@@ -1899,42 +1912,24 @@
-+    <FONT COLOR=green><EM>--  | Man page <A HREF="../man/wresize.3x.html">wresize.3x</A></EM></FONT>
-+    <FONT COLOR=green><EM>--  |=====================================================================</EM></FONT>
-+ 
-+-   <FONT COLOR=green><EM>--  #1A NAME="AFU_162"#2|</EM></FONT>
-+-   <b>procedure</b> Resize (<FONT COLOR=red><A NAME="ref_1898_22" HREF="terminal_interface-curses__adb.htm#ref_2550_22">Win</A></FONT>               : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Window</A> := Standard_Window;
-+-                     <FONT COLOR=red><A NAME="ref_1899_22" HREF="terminal_interface-curses__adb.htm#ref_2551_22">Number_Of_Lines</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Line_Count</A>;
-+-                     Number_Of_Columns : Column_Count);
-++   <FONT COLOR=green><EM>--  #1A NAME="AFU_164"#2|</EM></FONT>
-++   <b>procedure</b> <FONT COLOR=red><A NAME="ref_1911_14" HREF="terminal_interface-curses__adb.htm#ref_2539_14">Resize</A></FONT> (<FONT COLOR=red><A NAME="ref_1911_22" HREF="terminal_interface-curses__adb.htm#ref_2539_22">Win</A></FONT>               : <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := <A HREF="terminal_interface-curses__ads.htm#ref_476_13">Standard_Window</A>;
-++                     <FONT COLOR=red><A NAME="ref_1912_22" HREF="terminal_interface-curses__adb.htm#ref_2540_22">Number_Of_Lines</A></FONT>   : <A HREF="terminal_interface-curses__ads.htm#ref_63_12">Line_Count</A>;
-++                     <FONT COLOR=red><A NAME="ref_1913_22" HREF="terminal_interface-curses__adb.htm#ref_2541_22">Number_Of_Columns</A></FONT> : <A HREF="terminal_interface-curses__ads.htm#ref_65_12">Column_Count</A>);
-+    <FONT COLOR=green><EM>--  AKA: <A HREF="../man/wresize.3x.html">wresize()</A></EM></FONT>
-+ 
-+ <b>private</b>
-+-   <b>type</b> Window <b>is</b> <b>new</b> System.Storage_Elements.Integer_Address;
-+-   Null_Window : <b>constant</b> Window := 0;
-++   <b>type</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> <b>is</b> <b>new</b> System.Storage_Elements.Integer_Address;
-++   <A HREF="terminal_interface-curses__ads.htm#ref_58_4">Null_Window</A> : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_57_9">Window</A> := 0;
-+ 
-+    <FONT COLOR=green><EM>--  The next constants are generated and may be different on your</EM></FONT>
-+    <FONT COLOR=green><EM>--  architecture.</EM></FONT>
-+    <FONT COLOR=green><EM>--</EM></FONT>
-+-   <FONT COLOR=red><A NAME="ref_1910_4">Offset_maxy</A></FONT>        : <b>constant</b> Natural :=  2; <FONT COLOR=green><EM>--  short</EM></FONT>
-+-   <FONT COLOR=red><A NAME="ref_1911_4">Offset_maxx</A></FONT>        : <b>constant</b> Natural :=  3; <FONT COLOR=green><EM>--  short</EM></FONT>
-+-   <FONT COLOR=red><A NAME="ref_1912_4">Offset_begy</A></FONT>        : <b>constant</b> Natural :=  4; <FONT COLOR=green><EM>--  short</EM></FONT>
-+-   <FONT COLOR=red><A NAME="ref_1913_4">Offset_begx</A></FONT>        : <b>constant</b> Natural :=  5; <FONT COLOR=green><EM>--  short</EM></FONT>
-+-   <FONT COLOR=red><A NAME="ref_1914_4">Offset_cury</A></FONT>        : <b>constant</b> Natural :=  0; <FONT COLOR=green><EM>--  short</EM></FONT>
-+-   <FONT COLOR=red><A NAME="ref_1915_4">Offset_curx</A></FONT>        : <b>constant</b> Natural :=  1; <FONT COLOR=green><EM>--  short</EM></FONT>
-+-   <FONT COLOR=red><A NAME="ref_1916_4">Offset_yoffset</A></FONT>     : <b>constant</b> Natural := 36; <FONT COLOR=green><EM>--  short</EM></FONT>
-+-   <FONT COLOR=red><A NAME="ref_1917_4">Offset_pary</A></FONT>        : <b>constant</b> Natural := 13; <FONT COLOR=green><EM>--  int</EM></FONT>
-+-   <FONT COLOR=red><A NAME="ref_1918_4">Offset_parx</A></FONT>        : <b>constant</b> Natural := 12; <FONT COLOR=green><EM>--  int</EM></FONT>
-+-   <FONT COLOR=red><A NAME="ref_1919_4">Offset_notimeout</A></FONT>   : <b>constant</b> Natural := 24; <FONT COLOR=green><EM>--  char</EM></FONT>
-+-   <FONT COLOR=red><A NAME="ref_1920_4">Offset_clear</A></FONT>       : <b>constant</b> Natural := 25; <FONT COLOR=green><EM>--  char</EM></FONT>
-+-   <FONT COLOR=red><A NAME="ref_1921_4">Offset_leaveok</A></FONT>     : <b>constant</b> Natural := 26; <FONT COLOR=green><EM>--  char</EM></FONT>
-+-   <FONT COLOR=red><A NAME="ref_1922_4">Offset_scroll</A></FONT>      : <b>constant</b> Natural := 27; <FONT COLOR=green><EM>--  char</EM></FONT>
-+-   <FONT COLOR=red><A NAME="ref_1923_4">Offset_idlok</A></FONT>       : <b>constant</b> Natural := 28; <FONT COLOR=green><EM>--  char</EM></FONT>
-+-   <FONT COLOR=red><A NAME="ref_1924_4">Offset_idcok</A></FONT>       : <b>constant</b> Natural := 29; <FONT COLOR=green><EM>--  char</EM></FONT>
-+-   <FONT COLOR=red><A NAME="ref_1925_4">Offset_immed</A></FONT>       : <b>constant</b> Natural := 30; <FONT COLOR=green><EM>--  char</EM></FONT>
-+-   <FONT COLOR=red><A NAME="ref_1926_4">Offset_sync</A></FONT>        : <b>constant</b> Natural := 31; <FONT COLOR=green><EM>--  char</EM></FONT>
-+-   <FONT COLOR=red><A NAME="ref_1927_4">Offset_use_keypad</A></FONT>  : <b>constant</b> Natural := 32; <FONT COLOR=green><EM>--  char</EM></FONT>
-+-   <FONT COLOR=red><A NAME="ref_1928_4">Sizeof_bool</A></FONT>        : <b>constant</b> Natural :=  1; <FONT COLOR=green><EM>--  bool</EM></FONT>
-+-   Offset_XY          : <b>constant</b> Natural :=  1; <FONT COLOR=green><EM>--  int</EM></FONT>
-++   <FONT COLOR=red><A NAME="ref_1923_4">Sizeof_bool</A></FONT>        : <b>constant</b> Natural :=  1; <FONT COLOR=green><EM>--  bool</EM></FONT>
-++   <FONT COLOR=red><A NAME="ref_1924_4">Offset_XY</A></FONT>          : <b>constant</b> Natural :=  1; <FONT COLOR=green><EM>--  int</EM></FONT>
-+ 
-+-   <b>type</b> Curses_Bool <b>is</b> <b>mod</b> 2 ** <A HREF="terminal_interface-curses__ads.htm#ref_1930_9">Interfaces</A>.C.char'Size;
-+-   Curses_Bool_False : <b>constant</b> Curses_Bool := 0;
-++   <b>type</b> <FONT COLOR=red><A NAME="ref_1926_9">Curses_Bool</A></FONT> <b>is</b> <b>mod</b> 2 ** <A HREF="interfac__ads.htm#ref_38_9">Interfaces</A>.C.char'Size;
-++   <FONT COLOR=red><A NAME="ref_1927_4">Curses_Bool_False</A></FONT> : <b>constant</b> <A HREF="terminal_interface-curses__ads.htm#ref_1926_9">Curses_Bool</A> := 0;
-+ 
-+-<b>end</b> Terminal_Interface.Curses;
-++<b>end</b> <A HREF="terminal_interface__ads.htm#ref_42_9">Terminal_Interface</A>.<A HREF="terminal_interface-curses__ads.htm#ref_49_28">Curses</A>;
-+ </PRE></BODY></HTML>
-+Index: doc/html/man/captoinfo.1m.html
-+--- ncurses-5.6/doc/html/man/captoinfo.1m.html	2006-12-16 22:51:21.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/captoinfo.1m.html	2007-03-04 00:10:34.000000000 +0000
-+@@ -28,7 +28,7 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: captoinfo.1m,v 1.20 2006/05/13 15:14:01 tom Exp @
-++  * @Id: captoinfo.1m,v 1.21 2006/12/24 18:07:15 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -166,7 +166,7 @@
-+        GG    acs magic cookie count
-+ 
-+        If  the  single-line  capabilities occur in an entry, they
-+-       will automatically be composed into an <STRONG>acsc</STRONG>  string.   The
-++       will automatically be composed into an <EM>acsc</EM>  string.   The
-+        double-line capabilities and <STRONG>GG</STRONG> are discarded with a warn-
-+        ing message.
-+ 
-+@@ -183,11 +183,11 @@
-+        font2   s2ds
-+        font3   s3ds
-+ 
-+-       Additionally, the AIX <STRONG>box1</STRONG> capability  will  be  automati-
-+-       cally translated to an <STRONG>acsc</STRONG> string.
-++       Additionally, the AIX <EM>box1</EM> capability  will  be  automati-
-++       cally translated to an <EM>acsc</EM> string.
-+ 
-+        Hewlett-Packard's  terminfo  library supports two nonstan-
-+-       dard terminfo capabilities <STRONG>meml</STRONG>  (memory  lock)  and  <STRONG>memu</STRONG>
-++       dard terminfo capabilities <EM>meml</EM>  (memory  lock)  and  <EM>memu</EM>
-+        (memory  unlock).   These will be discarded with a warning
-+        message.
-+ 
-+@@ -195,7 +195,7 @@
-+ </PRE>
-+ <H2>NOTES</H2><PRE>
-+        This utility is actually a link to <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, running in  <EM>-I</EM>
-+-       mode.  You can use other <EM>tic</EM> options such as <STRONG>-f</STRONG> and  <STRONG>-x</STRONG>.
-++       mode.  You can use other <STRONG>tic</STRONG> options such as <STRONG>-f</STRONG> and  <STRONG>-x</STRONG>.
-+ 
-+        The  trace  option isn't identical to SVr4's.  Under SVr4,
-+        instead of following the <STRONG>-v</STRONG> with  a  trace  level  n,  you
-+@@ -206,7 +206,7 @@
-+ <H2>SEE ALSO</H2><PRE>
-+        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
-+ 
-+-       This describes <STRONG>ncurses</STRONG> version 5.5 (patch 20061209).
-++       This describes <STRONG>ncurses</STRONG> version 5.6 (patch 20070303).
-+ 
-+ 
-+ </PRE>
-+Index: doc/html/man/clear.1.html
-+--- ncurses-5.6/doc/html/man/clear.1.html	2006-12-16 22:51:21.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/clear.1.html	2007-03-04 00:10:34.000000000 +0000
-+@@ -27,7 +27,7 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: clear.1,v 1.5 2006/07/01 21:55:09 tom Exp @
-++  * @Id: clear.1,v 1.6 2006/12/24 18:07:53 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -69,7 +69,7 @@
-+ <H2>SEE ALSO</H2><PRE>
-+        <STRONG><A HREF="tput.1.html">tput(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
-+ 
-+-       This describes <STRONG>ncurses</STRONG> version 5.5 (patch 20061209).
-++       This describes <STRONG>ncurses</STRONG> version 5.6 (patch 20070303).
-+ 
-+ 
-+ 
-+Index: doc/html/man/curs_add_wch.3x.html
-+--- ncurses-5.6/doc/html/man/curs_add_wch.3x.html	2006-12-16 22:51:22.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/curs_add_wch.3x.html	2006-12-24 15:50:48.000000000 +0000
-+@@ -27,7 +27,7 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: curs_add_wch.3x,v 1.5 2006/12/02 17:02:35 tom Exp @
-++  * @Id: curs_add_wch.3x,v 1.6 2006/12/24 15:22:22 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -87,8 +87,7 @@
-+ 
-+        -    If  the  character  part  of  <EM>wch</EM>  is a tab, newline,
-+             backspace or other control character, the  window  is
-+-            updated  and  the  cursor  moves as if <STRONG><A HREF="addch.3x.html">addch(3x)</A></STRONG> were
-+-            called.
-++            updated and the cursor moves as if <STRONG>addch</STRONG> were called.
-+ 
-+        The <STRONG>echo_wchar</STRONG> function is functionally  equivalent  to  a
-+        call to <STRONG>add_wch</STRONG> followed by a call to <STRONG>refresh</STRONG>.  Similarly,
-+@@ -125,9 +124,8 @@
-+ 
-+ </PRE>
-+ <H2>SEE ALSO</H2><PRE>
-+-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,       <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>,       <STRONG><A HREF="curs_attr_get.3x.html">curs_attr_get(3x)</A></STRONG>,
-+-       <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,    <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>,     <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,
-+-       <STRONG><A HREF="putwc.3.html">putwc(3)</A></STRONG>
-++       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_addch.3x.html">curs_addch(3x)</A></STRONG>, <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>, <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,
-++       <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="putwc.3.html">putwc(3)</A></STRONG>
-+ 
-+ 
-+ 
-+Index: doc/html/man/curs_addch.3x.html
-+--- ncurses-5.6/doc/html/man/curs_addch.3x.html	2006-12-16 22:51:22.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/curs_addch.3x.html	2006-12-24 17:02:31.000000000 +0000
-+@@ -28,7 +28,7 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: curs_addch.3x,v 1.25 2006/12/02 17:02:22 tom Exp @
-++  * @Id: curs_addch.3x,v 1.26 2006/12/24 16:05:17 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -192,7 +192,7 @@
-+ </PRE>
-+ <H2>SEE ALSO</H2><PRE>
-+        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>, <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>,  <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>,
-+-       <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="putc.3S.html">putc(3S)</A></STRONG>.
-++       <STRONG><A HREF="curs_outopts.3x.html">curs_outopts(3x)</A></STRONG>, <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>, <STRONG><A HREF="putc.3.html">putc(3)</A></STRONG>.
-+ 
-+        Comparable  functions  in  the  wide-character  (ncursesw)
-+        library are described in <STRONG><A HREF="curs_add_wch.3x.html">curs_add_wch(3x)</A></STRONG>.
-+Index: doc/html/man/curs_border.3x.html
-+--- ncurses-5.6/doc/html/man/curs_border.3x.html	2006-09-23 20:43:00.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/curs_border.3x.html	2007-03-04 00:10:36.000000000 +0000
-+@@ -1,7 +1,7 @@
-+ <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
-+ <!-- 
-+   ****************************************************************************
-+-  * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++  * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+   *                                                                          *
-+   * Permission is hereby granted, free of charge, to any person obtaining a  *
-+   * copy of this software and associated documentation files (the            *
-+@@ -27,7 +27,7 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: curs_border.3x,v 1.18 2006/02/25 21:49:19 tom Exp @
-++  * @Id: curs_border.3x,v 1.19 2007/02/24 16:15:38 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -65,8 +65,8 @@
-+        <STRONG>int</STRONG> <STRONG>whline(WINDOW</STRONG> <STRONG>*win,</STRONG> <STRONG>chtype</STRONG> <STRONG>ch,</STRONG> <STRONG>int</STRONG> <STRONG>n);</STRONG>
-+        <STRONG>int</STRONG> <STRONG>vline(chtype</STRONG> <STRONG>ch,</STRONG> <STRONG>int</STRONG> <STRONG>n);</STRONG>
-+        <STRONG>int</STRONG> <STRONG>wvline(WINDOW</STRONG> <STRONG>*win,</STRONG> <STRONG>chtype</STRONG> <STRONG>ch,</STRONG> <STRONG>int</STRONG> <STRONG>n);</STRONG>
-+-       <STRONG>mvhline(int</STRONG> <STRONG>y,</STRONG> <STRONG>int</STRONG> <STRONG>x,</STRONG> <STRONG>chtype</STRONG> <STRONG>ch,</STRONG> <STRONG>int</STRONG> <STRONG>n);</STRONG>
-+-       <STRONG>mvwhline(WINDOW</STRONG> <STRONG>*,</STRONG> <STRONG>int</STRONG> <STRONG>y,</STRONG> <STRONG>int</STRONG> <STRONG>x,</STRONG> <STRONG>chtype</STRONG> <STRONG>ch,</STRONG> <STRONG>int</STRONG> <STRONG>n);</STRONG>
-++       <STRONG>int</STRONG> <STRONG>mvhline(int</STRONG> <STRONG>y,</STRONG> <STRONG>int</STRONG> <STRONG>x,</STRONG> <STRONG>chtype</STRONG> <STRONG>ch,</STRONG> <STRONG>int</STRONG> <STRONG>n);</STRONG>
-++       <STRONG>int</STRONG> <STRONG>mvwhline(WINDOW</STRONG> <STRONG>*,</STRONG> <STRONG>int</STRONG> <STRONG>y,</STRONG> <STRONG>int</STRONG> <STRONG>x,</STRONG> <STRONG>chtype</STRONG> <STRONG>ch,</STRONG> <STRONG>int</STRONG> <STRONG>n);</STRONG>
-+        <STRONG>int</STRONG> <STRONG>mvvline(int</STRONG> <STRONG>y,</STRONG> <STRONG>int</STRONG> <STRONG>x,</STRONG> <STRONG>chtype</STRONG> <STRONG>ch,</STRONG> <STRONG>int</STRONG> <STRONG>n);</STRONG>
-+        <STRONG>int</STRONG> <STRONG>mvwvline(WINDOW</STRONG> <STRONG>*,</STRONG> <STRONG>int</STRONG> <STRONG>y,</STRONG> <STRONG>int</STRONG> <STRONG>x,</STRONG> <STRONG>chtype</STRONG> <STRONG>ch,</STRONG> <STRONG>int</STRONG> <STRONG>n);</STRONG>
-+ 
-+Index: doc/html/man/curs_extend.3x.html
-+--- ncurses-5.6/doc/html/man/curs_extend.3x.html	2006-09-23 20:43:01.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/curs_extend.3x.html	2007-03-04 00:10:37.000000000 +0000
-+@@ -28,7 +28,7 @@
-+   * authorization.                                                           *
-+   ****************************************************************************
-+   * Author: Thomas E. Dickey 1999-on
-+-  * @Id: curs_extend.3x,v 1.15 2006/02/25 21:04:43 tom Exp @
-++  * @Id: curs_extend.3x,v 1.17 2006/12/24 18:01:48 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -73,7 +73,7 @@
-+        standard names which may be  compiled  into  the  terminfo
-+        description, i.e., via the terminfo or termcap interfaces.
-+        Normally these names are  available  for  use,  since  the
-+-       essential  decision  is made by using the <STRONG>-x</STRONG> option of <EM>tic</EM>
-++       essential  decision  is made by using the <STRONG>-x</STRONG> option of <STRONG>tic</STRONG>
-+        to compile extended terminal definitions.  However you can
-+        disable  this  feature  to ensure compatibility with other
-+        implementations of curses.
-+@@ -90,8 +90,8 @@
-+ </PRE>
-+ <H2>SEE ALSO</H2><PRE>
-+        <STRONG><A HREF="curs_getch.3x.html">curs_getch(3x)</A></STRONG>,       <STRONG><A HREF="curs_mouse.3x.html">curs_mouse(3x)</A></STRONG>,      <STRONG><A HREF="curs_print.3x.html">curs_print(3x)</A></STRONG>,
-+-       <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>,     <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>,      <STRONG><A HREF="keybound.3x.html">keybound(3x)</A></STRONG>,
-+-       <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>, <STRONG><A HREF="nofilter.3x.html">nofilter(3x)</A></STRONG>, <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>, <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>.
-++       <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>,  <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>,  <STRONG><A HREF="define_key.3x.html">define_key(3x)</A></STRONG>,  <STRONG>key-</STRONG>
-++       <STRONG><A HREF="keybound.3x.html">bound(3x)</A></STRONG>, <STRONG><A HREF="keyok.3x.html">keyok(3x)</A></STRONG>, <STRONG><A HREF="resizeterm.3x.html">resizeterm(3x)</A></STRONG>, <STRONG><A HREF="wresize.3x.html">wresize(3x)</A></STRONG>.
-+ 
-+ 
-+ </PRE>
-+Index: doc/html/man/curs_getcchar.3x.html
-+--- ncurses-5.6/doc/html/man/curs_getcchar.3x.html	2006-09-23 20:43:01.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/curs_getcchar.3x.html	2006-12-24 17:02:34.000000000 +0000
-+@@ -27,7 +27,7 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: curs_getcchar.3x,v 1.8 2006/07/15 22:51:07 wcmbrine Exp @
-++  * @Id: curs_getcchar.3x,v 1.10 2006/12/24 16:00:02 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -136,8 +136,8 @@
-+ 
-+ </PRE>
-+ <H2>SEE ALSO</H2><PRE>
-+-       Functions:   <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,  <STRONG><A HREF="wcwidth.3x.html">wcwidth(3x)</A></STRONG>,  <STRONG><A HREF="curs_attr_get.3x.html">curs_attr_get(3x)</A></STRONG>,
-+-       <STRONG><A HREF="can_change_color.3x.html">can_change_color(3x)</A></STRONG>.
-++       Functions:   <STRONG><A HREF="curs_attr.3x.html">curs_attr(3x)</A></STRONG>,   <STRONG><A HREF="curs_color.3x.html">curs_color(3x)</A></STRONG>,  <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,
-++       <STRONG><A HREF="wcwidth.3.html">wcwidth(3)</A></STRONG>.
-+ 
-+ 
-+ 
-+Index: doc/html/man/curs_insstr.3x.html
-+--- ncurses-5.6/doc/html/man/curs_insstr.3x.html	2006-09-23 20:43:04.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/curs_insstr.3x.html	2006-12-24 15:50:54.000000000 +0000
-+@@ -27,7 +27,7 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: curs_insstr.3x,v 1.17 2006/02/25 21:49:19 tom Exp @
-++  * @Id: curs_insstr.3x,v 1.18 2006/12/24 14:59:30 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -112,7 +112,7 @@
-+ 
-+ </PRE>
-+ <H2>SEE ALSO</H2><PRE>
-+-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="unctrl.3x.html">unctrl(3x)</A></STRONG>, <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>, <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>.
-++       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,  <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>, <STRONG><A HREF="curs_clear.3x.html">curs_clear(3x)</A></STRONG>, <STRONG><A HREF="curs_inch.3x.html">curs_inch(3x)</A></STRONG>.
-+ 
-+ 
-+ 
-+Index: doc/html/man/curs_mouse.3x.html
-+--- ncurses-5.6/doc/html/man/curs_mouse.3x.html	2005-05-15 17:05:53.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/curs_mouse.3x.html	2007-03-04 00:10:40.000000000 +0000
-+@@ -2,7 +2,7 @@
-+ <!-- 
-+   * t
-+   ****************************************************************************
-+-  * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
-++  * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+   *                                                                          *
-+   * Permission is hereby granted, free of charge, to any person obtaining a  *
-+   * copy of this software and associated documentation files (the            *
-+@@ -28,7 +28,7 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: curs_mouse.3x,v 1.28 2005/05/15 16:18:19 tom Exp @
-++  * @Id: curs_mouse.3x,v 1.30 2006/12/30 23:43:34 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -162,45 +162,48 @@
-+        screen windows enclose the location of a mouse event.
-+ 
-+        The <STRONG>wmouse_trafo</STRONG> function transforms a given pair of coor-
-+-       dinates from stdscr-relative coordinates  to  screen-rela-
-+-       tive  coordinates  or  vice  versa.  Please remember, that
-+-       stdscr-relative coordinates are not  always  identical  to
-+-       screen-relative  coordinates  due  to the mechanism to re-
-+-       serve lines on top or bottom of the screen for other  pur-
-+-       poses  (ripoff()  call,  see also slk_...  functions).  If
-+-       the parameter <STRONG>to_screen</STRONG> is <STRONG>TRUE</STRONG>, the pointers <STRONG>pY,</STRONG> <STRONG>pX</STRONG>  must
-+-       reference  the coordinates of a location inside the window
-+-       <STRONG>win</STRONG>.  They are converted  to  screen-relative  coordinates
-+-       and  returned through the pointers.  If the conversion was
-+-       successful, the function returns <STRONG>TRUE</STRONG>.  If one of the  pa-
-+-       rameters  was  NULL or the location is not inside the win-
-+-       dow, <STRONG>FALSE</STRONG> is returned.  If <STRONG>to_screen</STRONG> is <STRONG>FALSE</STRONG>, the point-
-+-       ers  <STRONG>pY,</STRONG>  <STRONG>pX</STRONG>  must  reference screen-relative coordinates.
-+-       They are converted to stdscr-relative coordinates  if  the
-+-       window <STRONG>win</STRONG> encloses this point.  In this case the function
-+-       returns <STRONG>TRUE</STRONG>.  If one of the parameters  is  NULL  or  the
-+-       point is not inside the window, <STRONG>FALSE</STRONG> is returned.  Please
-+-       notice, that the referenced coordinates are only  replaced
-+-       by  the  converted  coordinates  if the transformation was
-+-       successful.
-++       dinates from stdscr-relative  coordinates  to  coordinates
-++       relative to the given window or vice versa.  Please remem-
-++       ber, that stdscr-relative coordinates are not always iden-
-++       tical  to window-relative coordinates due to the mechanism
-++       to reserve lines on top or bottom of the screen for  other
-++       purposes (see the <STRONG>ripoffline()</STRONG> and <STRONG>slk_init</STRONG> calls, for ex-
-++       ample).  If the parameter <STRONG>to_screen</STRONG> is <STRONG>TRUE</STRONG>, the  pointers
-++       <STRONG>pY,</STRONG> <STRONG>pX</STRONG> must reference the coordinates of a location inside
-++       the window <STRONG>win</STRONG>.  They are converted to window-relative co-
-++       ordinates  and returned through the pointers.  If the con-
-++       version was successful, the function returns <STRONG>TRUE</STRONG>.  If one
-++       of  the  parameters was NULL or the location is not inside
-++       the window, <STRONG>FALSE</STRONG> is returned.  If <STRONG>to_screen</STRONG> is <STRONG>FALSE</STRONG>, the
-++       pointers  <STRONG>pY,</STRONG>  <STRONG>pX</STRONG>  must  reference window-relative coordi-
-++       nates.  They are converted to stdscr-relative  coordinates
-++       if  the  window <STRONG>win</STRONG> encloses this point.  In this case the
-++       function returns <STRONG>TRUE</STRONG>.  If one of the parameters  is  NULL
-++       or  the point is not inside the window, <STRONG>FALSE</STRONG> is returned.
-++       Please notice, that the referenced  coordinates  are  only
-++       replaced  by  the converted coordinates if the transforma-
-++       tion was successful.
-++
-++       The <STRONG>mouse_trafo</STRONG> function performs the same translation  as
-++       <STRONG>wmouse_trafo</STRONG>, using stdscr for <STRONG>win</STRONG>.
-+ 
-+        The <STRONG>mouseinterval</STRONG> function sets the maximum time (in thou-
-+-       sands  of  a second) that can elapse between press and re-
-+-       lease events for them to be recognized as  a  click.   Use
-+-       <STRONG>mouseinterval(0)</STRONG>  to disable click resolution.  This func-
-++       sands of a second) that can elapse between press  and  re-
-++       lease  events  for  them to be recognized as a click.  Use
-++       <STRONG>mouseinterval(0)</STRONG> to disable click resolution.  This  func-
-+        tion returns the previous interval value.  Use <STRONG>mouseinter-</STRONG>
-+-       <STRONG>val(-1)</STRONG>  to  obtain the interval without altering it.  The
-++       <STRONG>val(-1)</STRONG> to obtain the interval without altering  it.   The
-+        default is one sixth of a second.
-+ 
-+-       Note that mouse events will be ignored when  input  is  in
-++       Note  that  mouse  events will be ignored when input is in
-+        cooked mode, and will cause an error beep when cooked mode
-+-       is being simulated in a window by a function such as  <STRONG>get-</STRONG>
-++       is  being simulated in a window by a function such as <STRONG>get-</STRONG>
-+        <STRONG>str</STRONG> that expects a linefeed for input-loop termination.
-+ 
-+ 
-+ </PRE>
-+ <H2>RETURN VALUE</H2><PRE>
-+-       <STRONG>getmouse</STRONG>  and <STRONG>ungetmouse</STRONG> return the integer <STRONG>ERR</STRONG> upon fail-
-++       <STRONG>getmouse</STRONG> and <STRONG>ungetmouse</STRONG> return the integer <STRONG>ERR</STRONG> upon  fail-
-+        ure or <STRONG>OK</STRONG> upon successful completion.
-+ 
-+               <STRONG>getmouse</STRONG>
-+@@ -212,83 +215,85 @@
-+ 
-+        <STRONG>mousemask</STRONG> returns the mask of reportable events.
-+ 
-+-       <STRONG>mouseinterval</STRONG>  returns the previous interval value, unless
-+-       the terminal was not initialized.  In that  case,  it  re-
-++       <STRONG>mouseinterval</STRONG> returns the previous interval value,  unless
-++       the  terminal  was  not initialized.  In that case, it re-
-+        turns the maximum interval value (166).
-+ 
-+-       <STRONG>wenclose</STRONG>  and <STRONG>wmouse_trafo</STRONG> are boolean functions returning
-++       <STRONG>wenclose</STRONG> and <STRONG>wmouse_trafo</STRONG> are boolean functions  returning
-+        <STRONG>TRUE</STRONG> or <STRONG>FALSE</STRONG> depending on their test result.
-+ 
-+ 
-+ </PRE>
-+ <H2>PORTABILITY</H2><PRE>
-+-       These calls were designed for  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>,  and  are  not
-++       These  calls  were  designed  for <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, and are not
-+        found in SVr4 curses, 4.4BSD curses, or any other previous
-+        version of curses.
-+ 
-+        The feature macro <STRONG>NCURSES_MOUSE_VERSION</STRONG> is provided so the
-+-       preprocessor  can  be  used to test whether these features
-+-       are present.  If the interface is changed,  the  value  of
-+-       <STRONG>NCURSES_MOUSE_VERSION</STRONG>  will  be incremented.  These values
-+-       for <STRONG>NCURSES_MOUSE_VERSION</STRONG> may be specified when  configur-
-++       preprocessor can be used to test  whether  these  features
-++       are  present.   If  the interface is changed, the value of
-++       <STRONG>NCURSES_MOUSE_VERSION</STRONG> will be incremented.   These  values
-++       for  <STRONG>NCURSES_MOUSE_VERSION</STRONG> may be specified when configur-
-+        ing ncurses:
-+ 
-+-              1  has  definitions  for reserved events.  The mask
-++              1  has definitions for reserved events.   The  mask
-+                  uses 28 bits.
-+ 
-+               2  adds definitions for button 5, removes the defi-
-+-                 nitions  for  reserved events.  The mask uses 29
-++                 nitions for reserved events.  The mask  uses  29
-+                  bits.
-+ 
-+-       The order of the <STRONG>MEVENT</STRONG> structure members is  not  guaran-
-+-       teed.   Additional fields may be added to the structure in
-++       The  order  of the <STRONG>MEVENT</STRONG> structure members is not guaran-
-++       teed.  Additional fields may be added to the structure  in
-+        the future.
-+ 
-+-       Under <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>, these calls are implemented  using  ei-
-+-       ther  xterm's built-in mouse-tracking API or platform-spe-
-++       Under  <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG>,  these calls are implemented using ei-
-++       ther xterm's built-in mouse-tracking API or  platform-spe-
-+        cific drivers including
-+               Alessandro Rubini's gpm server.
-+               FreeBSD sysmouse
-+               OS/2 EMX
-+-       If you  are  using  an  unsupported  configuration,  mouse
-+-       events will not be visible to <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> (and the <STRONG>wmouse-</STRONG>
-++       If  you  are  using  an  unsupported  configuration, mouse
-++       events will not be visible to <STRONG><A HREF="ncurses.3x.html">ncurses(3x)</A></STRONG> (and the  <STRONG>mouse-</STRONG>
-+        <STRONG>mask</STRONG> function will always return <STRONG>0</STRONG>).
-+ 
-+-       If the terminfo entry contains a <STRONG>XM</STRONG> string, this  is  used
-+-       in  the xterm mouse driver to control the way the terminal
-++       If  the  terminfo entry contains a <STRONG>XM</STRONG> string, this is used
-++       in the xterm mouse driver to control the way the  terminal
-+        is initialized for mouse operation.  The default, if <STRONG>XM</STRONG> is
-+        not found, corresponds to private mode 1000 of xterm:
-+               \E[?1000%?%p1%{1}%=%th%el%;
-+        The z member in the event structure is not presently used.
-+-       It is intended for use with touch screens  (which  may  be
-++       It  is  intended  for use with touch screens (which may be
-+        pressure-sensitive)   or   with   3D-mice/trackballs/power
-+        gloves.
-+ 
-+ 
-+ </PRE>
-+ <H2>BUGS</H2><PRE>
-+-       Mouse events under xterm will not in fact be ignored  dur-
-+-       ing  cooked mode, if they have been enabled by <STRONG>wmousemask</STRONG>.
-+-       Instead, the xterm mouse report sequence  will  appear  in
-++       Mouse  events under xterm will not in fact be ignored dur-
-++       ing cooked mode, if they have been enabled  by  <STRONG>mousemask</STRONG>.
-++       Instead,  the  xterm  mouse report sequence will appear in
-+        the string read.
-+ 
-+        Mouse events under xterm will not be detected correctly in
-+-       a window with its keypad bit off, since  they  are  inter-
-+-       preted  as  a  variety of function key.  Your terminfo de-
-+-       scription must have <STRONG>kmous</STRONG> set to "\E[M" (the beginning  of
-+-       the response from xterm for mouse clicks).
-+-
-+-       Because  there  are  no  standard  terminal responses that
-+-       would serve to identify terminals which support the  xterm
-+-       mouse  protocol,  <STRONG>ncurses</STRONG> assumes that if your $TERM envi-
-+-       ronment variable contains "xterm", or <STRONG>kmous</STRONG> is defined  in
-++       a  window  with  its keypad bit off, since they are inter-
-++       preted as a variety of function key.   Your  terminfo  de-
-++       scription  should  have <STRONG>kmous</STRONG> set to "\E[M" (the beginning
-++       of the response from xterm for mouse clicks).  Other  val-
-++       ues  for  <STRONG>kmous</STRONG>  are permitted, but under the same assump-
-++       tion, i.e., it is the beginning of the response.
-++
-++       Because there are  no  standard  terminal  responses  that
-++       would  serve to identify terminals which support the xterm
-++       mouse protocol, <STRONG>ncurses</STRONG> assumes that if your  $TERM  envi-
-++       ronment  variable contains "xterm", or <STRONG>kmous</STRONG> is defined in
-+        the terminal description, then the terminal may send mouse
-+        events.
-+ 
-+ 
-+ </PRE>
-+ <H2>SEE ALSO</H2><PRE>
-+-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>.
-++       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>, <STRONG><A HREF="curs_slk.3x.html">curs_slk(3x)</A></STRONG>.
-+ 
-+ 
-+ 
-+Index: doc/html/man/curs_printw.3x.html
-+--- ncurses-5.6/doc/html/man/curs_printw.3x.html	2006-09-23 20:43:06.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/curs_printw.3x.html	2006-12-24 17:02:39.000000000 +0000
-+@@ -27,7 +27,7 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: curs_printw.3x,v 1.16 2006/02/25 21:49:19 tom Exp @
-++  * @Id: curs_printw.3x,v 1.17 2006/12/24 16:05:17 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -69,12 +69,12 @@
-+ </PRE>
-+ <H2>DESCRIPTION</H2><PRE>
-+        The  <STRONG>printw</STRONG>,  <STRONG>wprintw</STRONG>, <STRONG>mvprintw</STRONG> and <STRONG>mvwprintw</STRONG> routines are
-+-       analogous to <STRONG>printf</STRONG>  [see  <STRONG><A HREF="printf.3S.html">printf(3S)</A></STRONG>].   In  effect,  the
-++       analogous to  <STRONG>printf</STRONG>  [see  <STRONG><A HREF="printf.3.html">printf(3)</A></STRONG>].   In  effect,  the
-+        string that would be output by <STRONG>printf</STRONG> is output instead as
-+        though <STRONG>waddstr</STRONG> were used on the given window.
-+ 
-+        The <STRONG>vwprintw</STRONG>  and  <STRONG>wv_printw</STRONG>  routines  are  analogous  to
-+-       <STRONG>vprintf</STRONG>  [see  <STRONG><A HREF="printf.3S.html">printf(3S)</A></STRONG>]  and  perform a <STRONG>wprintw</STRONG> using a
-++       <STRONG>vprintf</STRONG>  [see  <STRONG><A HREF="printf.3.html">printf(3)</A></STRONG>]  and  perform  a <STRONG>wprintw</STRONG> using a
-+        variable argument list.  The third argument is a  <STRONG>va_list</STRONG>,
-+        a   pointer   to  a  list  of  arguments,  as  defined  in
-+        <STRONG>&lt;stdarg.h&gt;</STRONG>.
-+@@ -107,7 +107,7 @@
-+ 
-+ </PRE>
-+ <H2>SEE ALSO</H2><PRE>
-+-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="printf.3S.html">printf(3S)</A></STRONG>, <STRONG>vprintf(3S)</STRONG>
-++       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="printf.3.html">printf(3)</A></STRONG>, <STRONG>vprintf(3)</STRONG>
-+ 
-+ 
-+ 
-+Index: doc/html/man/curs_scanw.3x.html
-+--- ncurses-5.6/doc/html/man/curs_scanw.3x.html	2006-09-23 20:43:07.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/curs_scanw.3x.html	2006-12-24 17:02:39.000000000 +0000
-+@@ -27,7 +27,7 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: curs_scanw.3x,v 1.13 2006/02/25 21:42:22 tom Exp @
-++  * @Id: curs_scanw.3x,v 1.14 2006/12/24 16:05:49 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -66,7 +66,7 @@
-+ </PRE>
-+ <H2>DESCRIPTION</H2><PRE>
-+        The <STRONG>scanw</STRONG>, <STRONG>wscanw</STRONG> and <STRONG>mvscanw</STRONG> routines  are  analogous  to
-+-       <STRONG>scanf</STRONG> [see <STRONG><A HREF="scanf.3S.html">scanf(3S)</A></STRONG>].  The effect of these routines is as
-++       <STRONG>scanf</STRONG>  [see <STRONG><A HREF="scanf.3.html">scanf(3)</A></STRONG>].  The effect of these routines is as
-+        though <STRONG>wgetstr</STRONG> were called on the window, and the  result-
-+        ing line used as input for <STRONG><A HREF="sscanf.3.html">sscanf(3)</A></STRONG>.  Fields which do not
-+        map to a variable in the <EM>fmt</EM> field are lost.
-+@@ -114,7 +114,7 @@
-+ 
-+ </PRE>
-+ <H2>SEE ALSO</H2><PRE>
-+-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>, <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>, <STRONG><A HREF="scanf.3S.html">scanf(3S)</A></STRONG>
-++       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_getstr.3x.html">curs_getstr(3x)</A></STRONG>, <STRONG><A HREF="curs_printw.3x.html">curs_printw(3x)</A></STRONG>, <STRONG><A HREF="scanf.3.html">scanf(3)</A></STRONG>
-+ 
-+ 
-+ 
-+Index: doc/html/man/curs_scr_dump.3x.html
-+--- ncurses-5.6/doc/html/man/curs_scr_dump.3x.html	2006-09-23 20:43:07.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/curs_scr_dump.3x.html	2006-12-24 17:02:39.000000000 +0000
-+@@ -27,7 +27,7 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: curs_scr_dump.3x,v 1.6 2006/02/25 21:49:19 tom Exp @
-++  * @Id: curs_scr_dump.3x,v 1.7 2006/12/24 16:05:49 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -122,7 +122,7 @@
-+ </PRE>
-+ <H2>SEE ALSO</H2><PRE>
-+        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,      <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,       <STRONG><A HREF="curs_refresh.3x.html">curs_refresh(3x)</A></STRONG>,
-+-       <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>, <STRONG><A HREF="system.3S.html">system(3S)</A></STRONG>
-++       <STRONG><A HREF="curs_util.3x.html">curs_util(3x)</A></STRONG>, <STRONG><A HREF="system.3.html">system(3)</A></STRONG>
-+ 
-+ 
-+ 
-+Index: doc/html/man/curs_termcap.3x.html
-+--- ncurses-5.6/doc/html/man/curs_termcap.3x.html	2006-09-23 20:43:08.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/curs_termcap.3x.html	2006-12-24 17:02:40.000000000 +0000
-+@@ -27,7 +27,7 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: curs_termcap.3x,v 1.20 2006/02/25 21:50:01 tom Exp @
-++  * @Id: curs_termcap.3x,v 1.21 2006/12/24 16:05:49 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -175,7 +175,7 @@
-+ 
-+ </PRE>
-+ <H2>SEE ALSO</H2><PRE>
-+-       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="putc.3S.html">putc(3S)</A></STRONG>.
-++       <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>, <STRONG><A HREF="putc.3.html">putc(3)</A></STRONG>.
-+ 
-+ 
-+ 
-+Index: doc/html/man/curs_terminfo.3x.html
-+--- ncurses-5.6/doc/html/man/curs_terminfo.3x.html	2006-12-16 22:51:32.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/curs_terminfo.3x.html	2007-03-04 00:10:43.000000000 +0000
-+@@ -1,7 +1,7 @@
-+ <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
-+ <!-- 
-+   ****************************************************************************
-+-  * Copyright (c) 1999-2005,2006 Free Software Foundation, Inc.              *
-++  * Copyright (c) 1999-2006,2007 Free Software Foundation, Inc.              *
-+   *                                                                          *
-+   * Permission is hereby granted, free of charge, to any person obtaining a  *
-+   * copy of this software and associated documentation files (the            *
-+@@ -27,7 +27,7 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: curs_terminfo.3x,v 1.24 2006/11/04 21:50:03 tom Exp @
-++  * @Id: curs_terminfo.3x,v 1.26 2007/02/24 16:37:50 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -62,7 +62,7 @@
-+        <STRONG>int</STRONG> <STRONG>setterm(char</STRONG> <STRONG>*</STRONG><EM>term</EM><STRONG>);</STRONG>
-+        <STRONG>TERMINAL</STRONG> <STRONG>*set_curterm(TERMINAL</STRONG> <STRONG>*</STRONG><EM>nterm</EM><STRONG>);</STRONG>
-+        <STRONG>int</STRONG> <STRONG>del_curterm(TERMINAL</STRONG> <STRONG>*</STRONG><EM>oterm</EM><STRONG>);</STRONG>
-+-       <STRONG>int</STRONG> <STRONG>restartterm(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>term</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fildes</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG><EM>errret</EM><STRONG>);</STRONG>
-++       <STRONG>int</STRONG> <STRONG>restartterm(char</STRONG> <STRONG>*</STRONG><EM>term</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>fildes</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>*</STRONG><EM>errret</EM><STRONG>);</STRONG>
-+        <STRONG>char</STRONG> <STRONG>*tparm(char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>...);</STRONG>
-+        <STRONG>int</STRONG> <STRONG>tputs(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <EM>affcnt</EM><STRONG>,</STRONG> <STRONG>int</STRONG> <STRONG>(*</STRONG><EM>putc</EM><STRONG>)(int));</STRONG>
-+        <STRONG>int</STRONG> <STRONG>putp(const</STRONG> <STRONG>char</STRONG> <STRONG>*</STRONG><EM>str</EM><STRONG>);</STRONG>
-+@@ -318,7 +318,7 @@
-+ </PRE>
-+ <H2>SEE ALSO</H2><PRE>
-+        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,  <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>, <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>, <STRONG>curs_term-</STRONG>
-+-       <STRONG><A HREF="curs_termcap.3x.html">cap(3x)</A></STRONG>, <STRONG><A HREF="putc.3S.html">putc(3S)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
-++       <STRONG><A HREF="curs_termcap.3x.html">cap(3x)</A></STRONG>, <STRONG><A HREF="putc.3.html">putc(3)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
-+ 
-+ 
-+ 
-+Index: doc/html/man/curs_trace.3x.html
-+--- ncurses-5.6/doc/html/man/curs_trace.3x.html	2005-05-15 17:05:56.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/curs_trace.3x.html	2007-03-04 00:10:43.000000000 +0000
-+@@ -1,7 +1,7 @@
-+ <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
-+ <!-- 
-+   ****************************************************************************
-+-  * Copyright (c) 2000-2002,2005 Free Software Foundation, Inc.              *
-++  * Copyright (c) 2000-2005,2007 Free Software Foundation, Inc.              *
-+   *                                                                          *
-+   * Permission is hereby granted, free of charge, to any person obtaining a  *
-+   * copy of this software and associated documentation files (the            *
-+@@ -27,7 +27,7 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: curs_trace.3x,v 1.7 2005/05/15 17:02:54 tom Exp @
-++  * @Id: curs_trace.3x,v 1.8 2007/02/24 17:33:49 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -61,7 +61,7 @@
-+        <STRONG>char</STRONG> <STRONG>*_traceattr(attr_t</STRONG> <STRONG>attr);</STRONG>
-+        <STRONG>char</STRONG> <STRONG>*_traceattr2(int</STRONG> <STRONG>buffer,</STRONG> <STRONG>chtype</STRONG> <STRONG>ch);</STRONG>
-+        <STRONG>char</STRONG> <STRONG>*_nc_tracebits(void);</STRONG>
-+-       <STRONG>char</STRONG> <STRONG>*_tracechar(const</STRONG> <STRONG>unsigned</STRONG> <STRONG>char</STRONG> <STRONG>ch);</STRONG>
-++       <STRONG>char</STRONG> <STRONG>*_tracechar(int);</STRONG>
-+        <STRONG>char</STRONG> <STRONG>*_tracechtype(chtype</STRONG> <STRONG>ch);</STRONG>
-+        <STRONG>char</STRONG> <STRONG>*_tracechtype2(int</STRONG> <STRONG>buffer,</STRONG> <STRONG>chtype</STRONG> <STRONG>ch);</STRONG>
-+        <STRONG>char</STRONG> <STRONG>*_tracemouse(const</STRONG> <STRONG>MEVENT</STRONG> <STRONG>*event);</STRONG>
-+Index: doc/html/man/curs_util.3x.html
-+--- ncurses-5.6/doc/html/man/curs_util.3x.html	2006-09-23 20:43:09.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/curs_util.3x.html	2007-03-04 00:10:43.000000000 +0000
-+@@ -1,7 +1,7 @@
-+ <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
-+ <!-- 
-+   ****************************************************************************
-+-  * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++  * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+   *                                                                          *
-+   * Permission is hereby granted, free of charge, to any person obtaining a  *
-+   * copy of this software and associated documentation files (the            *
-+@@ -27,7 +27,7 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: curs_util.3x,v 1.21 2006/08/26 14:17:48 tom Exp @
-++  * @Id: curs_util.3x,v 1.23 2007/02/24 15:59:07 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -57,7 +57,7 @@
-+        <STRONG>#include</STRONG> <STRONG>&lt;curses.h&gt;</STRONG>
-+ 
-+        <STRONG>char</STRONG> <STRONG>*unctrl(chtype</STRONG> <STRONG>c);</STRONG>
-+-       <STRONG>char</STRONG> <STRONG>*wunctrl(cchar_t</STRONG> <STRONG>*c);</STRONG>
-++       <STRONG>wchar_t</STRONG> <STRONG>*wunctrl(cchar_t</STRONG> <STRONG>*c);</STRONG>
-+        <STRONG>char</STRONG> <STRONG>*keyname(int</STRONG> <STRONG>c);</STRONG>
-+        <STRONG>char</STRONG> <STRONG>*key_name(wchar_t</STRONG> <STRONG>w);</STRONG>
-+        <STRONG>void</STRONG> <STRONG>filter(void);</STRONG>
-+@@ -191,8 +191,8 @@
-+ 
-+ </PRE>
-+ <H2>SEE ALSO</H2><PRE>
-+-       <STRONG><A HREF="use_legacy_coding.3.html">use_legacy_coding(3)</A></STRONG>,    <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>,     <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>,
-+-       <STRONG><A HREF="curs_kernel.3x.html">curs_kernel(3x)</A></STRONG>, <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>.
-++       <STRONG><A HREF="legacy_coding.3x.html">legacy_coding(3x)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="curs_initscr.3x.html">curs_initscr(3x)</A></STRONG>, <STRONG>curs_ker-</STRONG>
-++       <STRONG><A HREF="curs_kernel.3x.html">nel(3x)</A></STRONG>, <STRONG><A HREF="curs_scr_dump.3x.html">curs_scr_dump(3x)</A></STRONG>.
-+ 
-+ 
-+ 
-+Index: doc/html/man/default_colors.3x.html
-+--- ncurses-5.6/doc/html/man/default_colors.3x.html	2006-09-23 20:43:09.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/default_colors.3x.html	2006-12-24 15:50:59.000000000 +0000
-+@@ -28,7 +28,7 @@
-+   * authorization.                                                           *
-+   ****************************************************************************
-+   * Author: Thomas E. Dickey 1997,1999,2000,2005
-+-  * @Id: default_colors.3x,v 1.19 2006/02/25 21:49:19 tom Exp @
-++  * @Id: default_colors.3x,v 1.20 2006/12/24 15:02:53 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -121,7 +121,7 @@
-+ 
-+ </PRE>
-+ <H2>NOTES</H2><PRE>
-+-       Associated with this extension, the <STRONG><A HREF="init_pair.3x.html">init_pair(3x)</A></STRONG> function
-++       Associated  with  this  extension,  the <STRONG>init_pair</STRONG> function
-+        accepts negative arguments to specify  default  foreground
-+        or background colors.
-+ 
-+Index: doc/html/man/form.3x.html
-+--- ncurses-5.6/doc/html/man/form.3x.html	2006-12-16 22:51:33.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/form.3x.html	2007-03-04 00:10:44.000000000 +0000
-+@@ -236,7 +236,7 @@
-+ 
-+ </PRE>
-+ <H2>SEE ALSO</H2><PRE>
-+-       This describes <STRONG>ncurses</STRONG> version 5.5 (patch 20061209).
-++       This describes <STRONG>ncurses</STRONG> version 5.6 (patch 20070303).
-+ 
-+ 
-+ 
-+Index: doc/html/man/form_field_new.3x.html
-+--- ncurses-5.6/doc/html/man/form_field_new.3x.html	2006-12-16 22:51:35.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/form_field_new.3x.html	2006-12-24 15:51:01.000000000 +0000
-+@@ -28,7 +28,7 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: form_field_new.3x,v 1.14 2006/11/04 17:12:00 tom Exp @
-++  * @Id: form_field_new.3x,v 1.15 2006/12/24 14:56:41 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -127,9 +127,9 @@
-+        were not supported on Version 7 or BSD versions.
-+ 
-+        It may be unwise to count on the set of attributes  copied
-+-       by  <STRONG><A HREF="dup_field.3x.html">dup_field(3x)</A></STRONG>  being  portable;  the  System  V  forms
-+-       library documents are not very explicit  about  what  gets
-+-       copied and what doesn't.
-++       by  <STRONG>dup_field</STRONG>  being  portable; the System V forms library
-++       documents are not very explicit about what gets copied and
-++       what doesn't.
-+ 
-+ 
-+ </PRE>
-+Index: doc/html/man/form_field_opts.3x.html
-+--- ncurses-5.6/doc/html/man/form_field_opts.3x.html	2006-12-16 22:51:36.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/form_field_opts.3x.html	2007-03-04 00:10:46.000000000 +0000
-+@@ -2,7 +2,7 @@
-+ <!-- 
-+   * t
-+   ****************************************************************************
-+-  * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++  * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+   *                                                                          *
-+   * Permission is hereby granted, free of charge, to any person obtaining a  *
-+   * copy of this software and associated documentation files (the            *
-+@@ -28,7 +28,7 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: form_field_opts.3x,v 1.12 2006/11/04 17:12:00 tom Exp @
-++  * @Id: form_field_opts.3x,v 1.13 2007/02/24 17:34:27 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -54,10 +54,10 @@
-+ </PRE>
-+ <H2>SYNOPSIS</H2><PRE>
-+        <STRONG>#include</STRONG> <STRONG>&lt;form.h&gt;</STRONG>
-+-       int set_field_opts(FIELD *field, OPTIONS opts);
-+-       int field_opts_on(FIELD *field, OPTIONS opts);
-+-       int field_opts_off(FIELD *field, OPTIONS opts);
-+-       OPTIONS field_opts(const FIELD *field);
-++       int set_field_opts(FIELD *field, Field_Options opts);
-++       int field_opts_on(FIELD *field, Field_Options opts);
-++       int field_opts_off(FIELD *field, Field_Options opts);
-++       Field_Options field_opts(const FIELD *field);
-+ 
-+ 
-+ </PRE>
-+Index: doc/html/man/form_field_validation.3x.html
-+--- ncurses-5.6/doc/html/man/form_field_validation.3x.html	2006-12-16 22:51:36.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/form_field_validation.3x.html	2006-12-24 17:02:44.000000000 +0000
-+@@ -27,7 +27,7 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: form_field_validation.3x,v 1.15 2006/11/04 17:14:19 tom Exp @
-++  * @Id: form_field_validation.3x,v 1.16 2006/12/24 16:08:08 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -124,16 +124,16 @@
-+             Regular expression data.  Requires a regular  expres-
-+             sion  <STRONG>(char</STRONG>  <STRONG>*)</STRONG>  third argument; the data is valid if
-+             the regular expression matches it.   Regular  expres-
-+-            sions   are   in   the   format  of  <STRONG><A HREF="regcomp.3x.html">regcomp(3x)</A></STRONG>  and
-+-            <STRONG><A HREF="regexec.3x.html">regexec(3x)</A></STRONG>. Please notice that the  regular  expres-
-+-            sion  must  match  the  whole  field. If you have for
-+-            example an eight  character  wide  field,  a  regular
-+-            expression  "^[0-9]*$"  always means that you have to
-+-            fill all eight positions with digits. If you want  to
-+-            allow  fewer digits, you may use for example "^[0-9]*
-+-            *$" which is good for trailing spaces (up to an empty
-+-            field),  or  "^ *[0-9]* *$" which is good for leading
-+-            and trailing spaces around the digits.
-++            sions  are  in  the  format  of  <STRONG>regcomp</STRONG> and <STRONG>regexec</STRONG>.
-++            Please notice that the regular expression must  match
-++            the  whole  field.  If  you have for example an eight
-++            character wide field, a regular expression "^[0-9]*$"
-++            always  means  that  you have to fill all eight posi-
-++            tions with digits. If you want to allow fewer digits,
-++            you  may  use  for example "^[0-9]* *$" which is good
-++            for trailing spaces (up to an  empty  field),  or  "^
-++            *[0-9]*  *$"  which  is good for leading and trailing
-++            spaces around the digits.
-+ 
-+        TYPE_IPV4
-+             An Internet Protocol Version 4 address. This requires
-+Index: doc/html/man/form_hook.3x.html
-+--- ncurses-5.6/doc/html/man/form_hook.3x.html	2006-12-16 22:51:36.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/form_hook.3x.html	2007-03-04 00:10:46.000000000 +0000
-+@@ -2,7 +2,7 @@
-+ <!-- 
-+   * t
-+   ****************************************************************************
-+-  * Copyright (c) 1998,2006 Free Software Foundation, Inc.                   *
-++  * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+   *                                                                          *
-+   * Permission is hereby granted, free of charge, to any person obtaining a  *
-+   * copy of this software and associated documentation files (the            *
-+@@ -28,7 +28,7 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: form_hook.3x,v 1.8 2006/11/04 17:12:00 tom Exp @
-++  * @Id: form_hook.3x,v 1.9 2007/02/24 17:34:18 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -55,14 +55,14 @@
-+ </PRE>
-+ <H2>SYNOPSIS</H2><PRE>
-+        <STRONG>#include</STRONG> <STRONG>&lt;form.h&gt;</STRONG>
-+-       int set_field_init(FORM *form, void (*func)(FORM *));
-+-       void (*)(FORM *) field_init(const FORM *form);
-+-       int set_field_term(FORM *form, void (*func)(FORM *));
-+-       void (*)(FORM *) field_term(const FORM *form);
-+-       int set_form_init(FORM *form, void (*func)(FORM *));
-+-       void (*)(FORM *) form_init(const FORM *form);
-+-       int set_form_term(FORM *form, void (*func)(FORM *));
-+-       void (*)(FORM *) form_term(const FORM *form);
-++       int set_field_init(FORM *form, Form_Hook func);
-++       Form_Hook field_init(const FORM *form);
-++       int set_field_term(FORM *form, Form_Hook func);
-++       Form_Hook field_term(const FORM *form);
-++       int set_form_init(FORM *form, Form_Hook func);
-++       Form_Hook form_init(const FORM *form);
-++       int set_form_term(FORM *form, Form_Hook func);
-++       Form_Hook form_term(const FORM *form);
-+ 
-+ 
-+ </PRE>
-+Index: doc/html/man/form_opts.3x.html
-+--- ncurses-5.6/doc/html/man/form_opts.3x.html	2006-12-16 22:51:37.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/form_opts.3x.html	2007-03-04 00:10:47.000000000 +0000
-+@@ -2,7 +2,7 @@
-+ <!-- 
-+   * t
-+   ****************************************************************************
-+-  * Copyright (c) 1998,2006 Free Software Foundation, Inc.                   *
-++  * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+   *                                                                          *
-+   * Permission is hereby granted, free of charge, to any person obtaining a  *
-+   * copy of this software and associated documentation files (the            *
-+@@ -28,7 +28,7 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: form_opts.3x,v 1.8 2006/11/04 17:12:00 tom Exp @
-++  * @Id: form_opts.3x,v 1.9 2007/02/24 17:34:36 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -54,10 +54,10 @@
-+ </PRE>
-+ <H2>SYNOPSIS</H2><PRE>
-+        <STRONG>#include</STRONG> <STRONG>&lt;form.h&gt;</STRONG>
-+-       int set_form_opts(FORM *form, OPTIONS opts);
-+-       int form_opts_on(FORM *form, OPTIONS opts);
-+-       int form_opts_off(FORM *form, OPTIONS opts);
-+-       OPTIONS form_opts(const FORM *form);
-++       int set_form_opts(FORM *form, Field_Options opts);
-++       int form_opts_on(FORM *form, Field_Options opts);
-++       int form_opts_off(FORM *form, Field_Options opts);
-++       Field_Options form_opts(const FORM *form);
-+ 
-+ 
-+ </PRE>
-+Index: doc/html/man/index.html
-+Prereq:  1.2 
-+--- ncurses-5.6/doc/html/man/index.html	2006-04-22 22:29:12.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/index.html	2006-12-24 23:05:35.000000000 +0000
-+@@ -1,6 +1,6 @@
-+ <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN">
-+ <!--
-+-  $Id: index.html,v 1.2 2006/04/22 22:29:12 tom Exp $
-++  $Id: index.html,v 1.3 2006/12/24 23:05:35 tom Exp $
-+   ****************************************************************************
-+   * Copyright (c) 1998-2001,2006 Free Software Foundation, Inc.              *
-+   *                                                                          *
-+@@ -33,7 +33,6 @@
-+ <HEAD>
-+ <TITLE>NCURSES - Manual Pages</TITLE>
-+ <LINK REV=MADE HREF="mailto:dickey@invisible-island.net">
-+-<BASE HREF="http://invisible-island.net/ncurses/man/">
-+ </HEAD>
-+ <BODY>
-+ <HR>
-+Index: doc/html/man/infocmp.1m.html
-+--- ncurses-5.6/doc/html/man/infocmp.1m.html	2006-12-16 22:51:38.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/infocmp.1m.html	2007-03-04 00:10:48.000000000 +0000
-+@@ -28,7 +28,7 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: infocmp.1m,v 1.43 2006/05/13 15:14:01 tom Exp @
-++  * @Id: infocmp.1m,v 1.44 2006/12/24 18:16:31 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -423,7 +423,7 @@
-+        <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,    <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,     <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,     <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,
-+        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
-+ 
-+-       This describes <STRONG>ncurses</STRONG> version 5.5 (patch 20061209).
-++       This describes <STRONG>ncurses</STRONG> version 5.6 (patch 20070303).
-+ 
-+ 
-+ </PRE>
-+Index: doc/html/man/infotocap.1m.html
-+--- ncurses-5.6/doc/html/man/infotocap.1m.html	2006-12-16 22:51:38.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/infotocap.1m.html	2007-03-04 00:10:48.000000000 +0000
-+@@ -28,7 +28,7 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: infotocap.1m,v 1.6 2006/05/13 15:35:45 tom Exp @
-++  * @Id: infotocap.1m,v 1.8 2006/12/24 20:13:56 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -85,7 +85,7 @@
-+ 
-+ </PRE>
-+ <H2>NOTES</H2><PRE>
-+-       This utility is actually a link to <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, running in  <EM>-C</EM>
-++       This utility is actually a link  to  <EM>tic</EM>,  running  in  <EM>-C</EM>
-+        mode.  You can use other <EM>tic</EM> options such as <STRONG>-f</STRONG> and  <STRONG>-x</STRONG>.
-+ 
-+ 
-+@@ -93,7 +93,7 @@
-+ <H2>SEE ALSO</H2><PRE>
-+        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
-+ 
-+-       This describes <STRONG>ncurses</STRONG> version 5.5 (patch 20061209).
-++       This describes <STRONG>ncurses</STRONG> version 5.6 (patch 20070303).
-+ 
-+ 
-+ 
-+Index: doc/html/man/legacy_coding.3x.html
-+--- ncurses-5.6/doc/html/man/legacy_coding.3x.html	2006-09-23 20:43:15.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/legacy_coding.3x.html	2006-12-24 15:51:05.000000000 +0000
-+@@ -28,7 +28,7 @@
-+   * authorization.                                                           *
-+   ****************************************************************************
-+   * Author: Thomas E. Dickey
-+-  * @Id: legacy_coding.3x,v 1.2 2006/02/25 21:50:01 tom Exp @
-++  * @Id: legacy_coding.3x,v 1.3 2006/12/24 15:12:55 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -70,21 +70,20 @@
-+        The <EM>level</EM> parameter controls the result:
-+ 
-+               0    the library functions normally, rendering non-
-+-                   printing   characters  as  described  in  <STRONG>unc-</STRONG>
-+-                   <STRONG><A HREF="unctrl.3x.html">trl(3x)</A></STRONG>.
-++                   printing characters as described in <STRONG>unctrl</STRONG>.
-+ 
-+-              1    the library ignores <STRONG>isprintf</STRONG> for codes in  the
-++              1    the  library ignores <STRONG>isprintf</STRONG> for codes in the
-+                    range 160-255.
-+ 
-+-              2    the  library ignores <STRONG>isprintf</STRONG> for codes in the
-++              2    the library ignores <STRONG>isprintf</STRONG> for codes in  the
-+                    range 128-255.  It also modifies the output of
-+-                   <STRONG>unctrl</STRONG>,  showing codes in the range 128-159 as
-++                   <STRONG>unctrl</STRONG>, showing codes in the range 128-159  as
-+                    is.
-+ 
-+ 
-+ </PRE>
-+ <H2>RETURN VALUE</H2><PRE>
-+-       If the screen has  not  been  initialized,  or  the  <EM>level</EM>
-++       If  the  screen  has  not  been  initialized, or the <EM>level</EM>
-+        parameter is out of range, the function returns <STRONG>ERR</STRONG>.  Oth-
-+        erwise, it returns the previous level: <STRONG>0</STRONG>, <STRONG>1</STRONG> or <STRONG>2</STRONG>.
-+ 
-+@@ -93,7 +92,7 @@
-+ <H2>PORTABILITY</H2><PRE>
-+        This routine is specific to ncurses.  It was not supported
-+        on Version 7, BSD or System V implementations.  It is rec-
-+-       ommended that any code depending on ncurses extensions  be
-++       ommended  that any code depending on ncurses extensions be
-+        conditioned using NCURSES_VERSION.
-+ 
-+ 
-+@@ -104,7 +103,7 @@
-+ 
-+ </PRE>
-+ <H2>AUTHOR</H2><PRE>
-+-       Thomas  Dickey (to support lynx's font-switching feature).
-++       Thomas Dickey (to support lynx's font-switching  feature).
-+ 
-+ 
-+ 
-+Index: doc/html/man/menu.3x.html
-+--- ncurses-5.6/doc/html/man/menu.3x.html	2006-12-16 22:51:40.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/menu.3x.html	2007-03-04 00:10:49.000000000 +0000
-+@@ -226,7 +226,7 @@
-+ 
-+ </PRE>
-+ <H2>SEE ALSO</H2><PRE>
-+-       This describes <STRONG>ncurses</STRONG> version 5.5 (patch 20061209).
-++       This describes <STRONG>ncurses</STRONG> version 5.6 (patch 20070303).
-+ 
-+ 
-+ 
-+Index: doc/html/man/menu_hook.3x.html
-+--- ncurses-5.6/doc/html/man/menu_hook.3x.html	2006-12-16 22:51:41.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/menu_hook.3x.html	2007-03-04 00:10:50.000000000 +0000
-+@@ -2,7 +2,7 @@
-+ <!-- 
-+   * t
-+   ****************************************************************************
-+-  * Copyright (c) 1998,2006 Free Software Foundation, Inc.                   *
-++  * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+   *                                                                          *
-+   * Permission is hereby granted, free of charge, to any person obtaining a  *
-+   * copy of this software and associated documentation files (the            *
-+@@ -28,7 +28,7 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: menu_hook.3x,v 1.8 2006/11/04 17:12:00 tom Exp @
-++  * @Id: menu_hook.3x,v 1.9 2007/02/24 17:34:08 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -55,14 +55,14 @@
-+ </PRE>
-+ <H2>SYNOPSIS</H2><PRE>
-+        <STRONG>#include</STRONG> <STRONG>&lt;menu.h&gt;</STRONG>
-+-       int set_item_init(MENU *menu, void (*func)(MENU *));
-+-       void (*)(MENU *) item_init(const MENU *menu);
-+-       int set_item_term(MENU *menu, void (*func)(MENU *));
-+-       void (*)(MENU *) item_term(const MENU *menu);
-+-       int set_menu_init(MENU *menu, void (*func)(MENU *));
-+-       void (*)(MENU *) menu_init(const MENU *menu);
-+-       int set_menu_term(MENU *menu, void (*func)(MENU *));
-+-       void (*)(MENU *) menu_term(const MENU *menu);
-++       int set_item_init(MENU *menu, Menu_Hook func);
-++       Menu_Hook item_init(const MENU *menu);
-++       int set_item_term(MENU *menu, Menu_Hook func);
-++       Menu_Hook item_term(const MENU *menu);
-++       int set_menu_init(MENU *menu, Menu_Hook func);
-++       Menu_Hook menu_init(const MENU *menu);
-++       int set_menu_term(MENU *menu, Menu_Hook func);
-++       Menu_Hook menu_term(const MENU *menu);
-+ 
-+ 
-+ </PRE>
-+Index: doc/html/man/menu_opts.3x.html
-+--- ncurses-5.6/doc/html/man/menu_opts.3x.html	2006-12-16 22:51:42.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/menu_opts.3x.html	2007-03-04 00:10:50.000000000 +0000
-+@@ -2,7 +2,7 @@
-+ <!-- 
-+   * t
-+   ****************************************************************************
-+-  * Copyright (c) 1998,2006 Free Software Foundation, Inc.                   *
-++  * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+   *                                                                          *
-+   * Permission is hereby granted, free of charge, to any person obtaining a  *
-+   * copy of this software and associated documentation files (the            *
-+@@ -28,7 +28,7 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: menu_opts.3x,v 1.9 2006/11/04 17:12:00 tom Exp @
-++  * @Id: menu_opts.3x,v 1.10 2007/02/24 17:33:59 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -54,10 +54,10 @@
-+ </PRE>
-+ <H2>SYNOPSIS</H2><PRE>
-+        <STRONG>#include</STRONG> <STRONG>&lt;menu.h&gt;</STRONG>
-+-       int set_menu_opts(MENU *menu, OPTIONS opts);
-+-       int menu_opts_on(MENU *menu, OPTIONS opts);
-+-       int menu_opts_off(MENU *menu, OPTIONS opts);
-+-       OPTIONS menu_opts(const MENU *menu);
-++       int set_menu_opts(MENU *menu, Menu_Options opts);
-++       int menu_opts_on(MENU *menu, Menu_Options opts);
-++       int menu_opts_off(MENU *menu, Menu_Options opts);
-++       Menu_Options menu_opts(const MENU *menu);
-+ 
-+ 
-+ </PRE>
-+Index: doc/html/man/mitem_opts.3x.html
-+--- ncurses-5.6/doc/html/man/mitem_opts.3x.html	2006-12-16 22:51:44.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/mitem_opts.3x.html	2007-03-04 00:10:52.000000000 +0000
-+@@ -2,7 +2,7 @@
-+ <!-- 
-+   * t
-+   ****************************************************************************
-+-  * Copyright (c) 1998,2006 Free Software Foundation, Inc.                   *
-++  * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+   *                                                                          *
-+   * Permission is hereby granted, free of charge, to any person obtaining a  *
-+   * copy of this software and associated documentation files (the            *
-+@@ -28,7 +28,7 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: mitem_opts.3x,v 1.8 2006/11/04 17:12:00 tom Exp @
-++  * @Id: mitem_opts.3x,v 1.9 2007/02/24 17:33:32 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -54,10 +54,10 @@
-+ </PRE>
-+ <H2>SYNOPSIS</H2><PRE>
-+        <STRONG>#include</STRONG> <STRONG>&lt;menu.h&gt;</STRONG>
-+-       int set_item_opts(ITEM *item, OPTIONS opts);
-+-       int item_opts_on(ITEM *item, OPTIONS opts);
-+-       int item_opts_off(ITEM *item, OPTIONS opts);
-+-       OPTIONS item_opts(const ITEM *item);
-++       int set_item_opts(ITEM *item, Item_Options opts);
-++       int item_opts_on(ITEM *item, Item_Options opts);
-++       int item_opts_off(ITEM *item, Item_Options opts);
-++       Item_Options item_opts(const ITEM *item);
-+ 
-+ 
-+ </PRE>
-+Index: doc/html/man/ncurses.3x.html
-+--- ncurses-5.6/doc/html/man/ncurses.3x.html	2006-12-16 22:51:45.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/ncurses.3x.html	2007-03-04 00:10:53.000000000 +0000
-+@@ -28,7 +28,7 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: ncurses.3x,v 1.81 2006/12/02 19:23:11 tom Exp @
-++  * @Id: ncurses.3x,v 1.82 2006/12/24 14:44:05 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -63,7 +63,7 @@
-+        sonable   optimization.    This  implementation  is  ``new
-+        curses'' (ncurses) and is  the  approved  replacement  for
-+        4.4BSD  classic curses, which has been discontinued.  This
-+-       describes <STRONG>ncurses</STRONG> version 5.5 (patch 20061209).
-++       describes <STRONG>ncurses</STRONG> version 5.6 (patch 20070303).
-+ 
-+        The <STRONG>ncurses</STRONG> routines emulate  the  <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>  library  of
-+        System V Release 4 UNIX, and the XPG4 curses standard (XSI
-+@@ -774,9 +774,9 @@
-+        NCURSES_ASSUMED_COLORS
-+             Override  the  compiled-in assumption that the termi-
-+             nal's  default   colors   are   white-on-black   (see
-+-            <STRONG><A HREF="assume_default_colors.3x.html">assume_default_colors(3x)</A></STRONG>).   You  may  set the fore-
-+-            ground and background color values with this environ-
-+-            ment   variable   by   proving   a   2-element  list:
-++            <STRONG><A HREF="default_colors.3x.html">default_colors(3x)</A></STRONG>).   You may set the foreground and
-++            background color values with this  environment  vari-
-++            able     by     proving     a     2-element     list:
-+             foreground,background.  For example, to tell  ncurses
-+             to  not assume anything about the colors, set this to
-+             "-1,-1".  To make it green-on-black, set it to "2,0".
-+Index: doc/html/man/panel.3x.html
-+--- ncurses-5.6/doc/html/man/panel.3x.html	2006-12-16 22:51:45.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/panel.3x.html	2007-03-04 00:10:53.000000000 +0000
-+@@ -213,7 +213,7 @@
-+ <H2>SEE ALSO</H2><PRE>
-+        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>
-+ 
-+-       This describes <STRONG>ncurses</STRONG> version 5.5 (patch 20061209).
-++       This describes <STRONG>ncurses</STRONG> version 5.6 (patch 20070303).
-+ 
-+ 
-+ </PRE>
-+Index: doc/html/man/term.5.html
-+--- ncurses-5.6/doc/html/man/term.5.html	2006-12-16 22:51:45.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/term.5.html	2007-03-04 00:10:54.000000000 +0000
-+@@ -27,20 +27,20 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: term.5,v 1.17 2006/12/03 01:08:16 tom Exp @
-++  * @Id: term.5,v 1.19 2006/12/24 18:12:38 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+-<TITLE>TERM 5</TITLE>
-++<TITLE>term 5</TITLE>
-+ <link rev=made href="mailto:bug-ncurses@gnu.org">
-+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-+ </HEAD>
-+ <BODY>
-+-<H1>TERM 5</H1>
-++<H1>term 5</H1>
-+ <HR>
-+ <PRE>
-+ <!-- Manpage converted by man2html 3.0.1 -->
-+-<STRONG><A HREF="TERM.5.html">TERM(5)</A></STRONG>                                                         <STRONG><A HREF="TERM.5.html">TERM(5)</A></STRONG>
-++<STRONG><A HREF="term.5.html">term(5)</A></STRONG>                                                         <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
-+ 
-+ 
-+ 
-+@@ -95,7 +95,7 @@
-+        assumptions about byte  ordering  or  sign  extension  are
-+        made.
-+ 
-+-       The  compiled  file  is  created with the <EM>tic</EM> program, and
-++       The  compiled  file  is  created with the <STRONG>tic</STRONG> program, and
-+        read by the routine <EM>setupterm</EM>.  The file is  divided  into
-+        six parts: the header, terminal names, boolean flags, num-
-+        bers, strings, and string table.
-+@@ -297,7 +297,7 @@
-+ 
-+ 
-+ 
-+-                                                                <STRONG><A HREF="TERM.5.html">TERM(5)</A></STRONG>
-++                                                                <STRONG><A HREF="term.5.html">term(5)</A></STRONG>
-+ </PRE>
-+ <HR>
-+ <ADDRESS>
-+Index: doc/html/man/term.7.html
-+--- ncurses-5.6/doc/html/man/term.7.html	2006-09-23 20:43:22.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/term.7.html	2007-03-04 00:10:54.000000000 +0000
-+@@ -27,20 +27,20 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: term.7,v 1.15 2006/02/25 21:47:06 tom Exp @
-++  * @Id: term.7,v 1.17 2006/12/24 18:14:09 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+-<TITLE>TERM 7</TITLE>
-++<TITLE>term 7</TITLE>
-+ <link rev=made href="mailto:bug-ncurses@gnu.org">
-+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-+ </HEAD>
-+ <BODY>
-+-<H1>TERM 7</H1>
-++<H1>term 7</H1>
-+ <HR>
-+ <PRE>
-+ <!-- Manpage converted by man2html 3.0.1 -->
-+-<STRONG><A HREF="TERM.7.html">TERM(7)</A></STRONG>                                                         <STRONG><A HREF="TERM.7.html">TERM(7)</A></STRONG>
-++<STRONG><A HREF="term.7.html">term(7)</A></STRONG>                                                         <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
-+ 
-+ 
-+ 
-+@@ -98,7 +98,7 @@
-+        from your shell.  These capability files are in  a  binary
-+        format optimized for retrieval speed (unlike the old text-
-+        based <STRONG>termcap</STRONG> format they replace); to examine  an  entry,
-+-       you  must  use  the <STRONG><A HREF="infocmp.1.html">infocmp(1)</A></STRONG> command.  Invoke it as fol-
-++       you  must  use the <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG> command.  Invoke it as fol-
-+        lows:
-+ 
-+             infocmp <EM>entry-name</EM>
-+@@ -240,7 +240,7 @@
-+ 
-+ 
-+ 
-+-                                                                <STRONG><A HREF="TERM.7.html">TERM(7)</A></STRONG>
-++                                                                <STRONG><A HREF="term.7.html">term(7)</A></STRONG>
-+ </PRE>
-+ <HR>
-+ <ADDRESS>
-+Index: doc/html/man/terminfo.5.html
-+--- ncurses-5.6/doc/html/man/terminfo.5.html	2006-12-16 22:51:46.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/terminfo.5.html	2007-03-04 00:10:54.000000000 +0000
-+@@ -32,9 +32,9 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: terminfo.head,v 1.13 2006/05/13 15:35:45 tom Exp @
-++  * @Id: terminfo.head,v 1.15 2006/12/24 18:04:42 tom Exp @
-+   * Head of terminfo man page ends here
-+-  * @Id: terminfo.tail,v 1.44 2006/04/01 22:47:01 tom Exp @
-++  * @Id: terminfo.tail,v 1.47 2006/12/24 18:14:22 tom Exp @
-+   * Beginning of terminfo.tail file
-+   * This file is part of ncurses.
-+   * See "terminfo.head" for copyright.
-+@@ -46,16 +46,16 @@
-+ -->
-+ <HTML>
-+ <HEAD>
-+-<TITLE>TERMINFO 5   File Formats</TITLE>
-++<TITLE>terminfo 5   File Formats</TITLE>
-+ <link rev=made href="mailto:bug-ncurses@gnu.org">
-+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-+ </HEAD>
-+ <BODY>
-+-<H1>TERMINFO 5   File Formats</H1>
-++<H1>terminfo 5   File Formats</H1>
-+ <HR>
-+ <PRE>
-+ <!-- Manpage converted by man2html 3.0.1 -->
-+-<STRONG><A HREF="TERMINFO.5.html">TERMINFO(5)</A></STRONG>                   File Formats                  <STRONG><A HREF="TERMINFO.5.html">TERMINFO(5)</A></STRONG>
-++<STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>                   File Formats                  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
-+ 
-+ 
-+ 
-+@@ -78,7 +78,7 @@
-+        nals by giving a set of capabilities which they  have,  by
-+        specifying how to perform screen operations, and by speci-
-+        fying padding requirements and  initialization  sequences.
-+-       This describes <STRONG>ncurses</STRONG> version 5.5 (patch 20061209).
-++       This describes <STRONG>ncurses</STRONG> version 5.6 (patch 20070303).
-+ 
-+        Entries in <EM>terminfo</EM> consist of a sequence of `,' separated
-+        fields (embedded commas may be escaped with a backslash or
-+@@ -95,13 +95,13 @@
-+ 
-+        Lines beginning with a `#' in the first column are treated
-+        as  comments.  While comment lines are legal at any point,
-+-       the output of <EM>captoinfo</EM> and <EM>infotocap</EM>  (aliases  for  <EM>tic</EM>)
-++       the output of <STRONG>captoinfo</STRONG> and <STRONG>infotocap</STRONG>  (aliases  for  <STRONG>tic</STRONG>)
-+        will move comments so they occur only between entries.
-+ 
-+        Newlines  and  leading  tabs  may  be  used for formatting
-+        entries for readability.  These are  removed  from  parsed
-+-       entries.   The  <EM>infocmp</EM> <EM>-f</EM> option relies on this to format
-+-       if-then-else expressions: the result can be read by <EM>tic</EM>.
-++       entries.   The  <STRONG>infocmp</STRONG> <STRONG>-f</STRONG> option relies on this to format
-++       if-then-else expressions: the result can be read by <STRONG>tic</STRONG>.
-+ 
-+        Terminal names (except for the last, verbose entry) should
-+        be chosen using the following conventions.  The particular
-+@@ -1234,7 +1234,7 @@
-+    <STRONG>Parameterized</STRONG> <STRONG>Strings</STRONG>
-+        Cursor addressing and other strings  requiring  parameters
-+        in  the  terminal  are described by a parameterized string
-+-       capability, with <STRONG><A HREF="printf.3S.html">printf(3S)</A></STRONG> like escapes <STRONG>%x</STRONG>  in  it.   For
-++       capability, with <STRONG><A HREF="printf.3.html">printf(3)</A></STRONG> like escapes  <STRONG>%x</STRONG>  in  it.   For
-+        example,  to  address  the  cursor,  the <STRONG>cup</STRONG> capability is
-+        given, using two parameters: the row and column to address
-+        to.  (Rows and columns are numbered from zero and refer to
-+@@ -2269,7 +2269,7 @@
-+        termcap entry.
-+ 
-+        When in -C (translate to termcap) mode, the <STRONG>ncurses</STRONG> imple-
-+-       mentation  of <STRONG><A HREF="tic.1.html">tic(1)</A></STRONG> issues warning messages when the pre-
-++       mentation of <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG> issues warning messages when the pre-
-+        tc length of a termcap translation is too  long.   The  -c
-+        (check)  option  also checks resolved (after tc expansion)
-+        lengths.
-+@@ -2351,7 +2351,7 @@
-+ 
-+ </PRE>
-+ <H2>SEE ALSO</H2><PRE>
-+-       <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="printf.3S.html">printf(3S)</A></STRONG>, <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.
-++       <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>, <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>, <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="printf.3.html">printf(3)</A></STRONG>, <STRONG><A HREF="term.5.html">term(5)</A></STRONG>.
-+ 
-+ 
-+ </PRE>
-+@@ -2361,7 +2361,7 @@
-+ 
-+ 
-+ 
-+-                                                            <STRONG><A HREF="TERMINFO.5.html">TERMINFO(5)</A></STRONG>
-++                                                            <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>
-+ </PRE>
-+ <HR>
-+ <ADDRESS>
-+Index: doc/html/man/tic.1m.html
-+--- ncurses-5.6/doc/html/man/tic.1m.html	2006-12-16 22:51:46.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/tic.1m.html	2007-03-04 00:10:55.000000000 +0000
-+@@ -27,7 +27,7 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: tic.1m,v 1.43 2006/05/13 15:14:01 tom Exp @
-++  * @Id: tic.1m,v 1.44 2006/12/24 17:59:11 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -309,7 +309,7 @@
-+        <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,    <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,   <STRONG><A HREF="toe.1m.html">toe(1m)</A></STRONG>,
-+        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
-+ 
-+-       This describes <STRONG>ncurses</STRONG> version 5.5 (patch 20061209).
-++       This describes <STRONG>ncurses</STRONG> version 5.6 (patch 20070303).
-+ 
-+ 
-+ 
-+Index: doc/html/man/toe.1m.html
-+--- ncurses-5.6/doc/html/man/toe.1m.html	2006-12-16 22:51:47.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/toe.1m.html	2007-03-04 00:10:55.000000000 +0000
-+@@ -27,7 +27,7 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: toe.1m,v 1.18 2006/05/13 15:14:01 tom Exp @
-++  * @Id: toe.1m,v 1.20 2006/12/24 17:20:37 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -92,7 +92,7 @@
-+        <STRONG>-v</STRONG><EM>n</EM>    specifies that (verbose) output be written to stan-
-+               dard error, showing <STRONG>toe</STRONG>'s progress.   The  optional
-+               parameter  <EM>n</EM>  is a number from 1 to 10, interpreted
-+-              as for <STRONG><A HREF="tic.1.html">tic(1)</A></STRONG>.
-++              as for <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>.
-+ 
-+        <STRONG>-V</STRONG>     reports the version of ncurses which  was  used  in
-+               this program, and exits.
-+@@ -109,7 +109,7 @@
-+        <STRONG><A HREF="tic.1m.html">tic(1m)</A></STRONG>,    <STRONG><A HREF="infocmp.1m.html">infocmp(1m)</A></STRONG>,   <STRONG><A HREF="captoinfo.1m.html">captoinfo(1m)</A></STRONG>,   <STRONG><A HREF="infotocap.1m.html">infotocap(1m)</A></STRONG>,
-+        <STRONG><A HREF="ncurses.3x.html">curses(3x)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
-+ 
-+-       This describes <STRONG>ncurses</STRONG> version 5.5 (patch 20061209).
-++       This describes <STRONG>ncurses</STRONG> version 5.6 (patch 20070303).
-+ 
-+ 
-+ 
-+Index: doc/html/man/tput.1.html
-+--- ncurses-5.6/doc/html/man/tput.1.html	2006-12-16 22:51:47.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/tput.1.html	2007-03-04 00:10:55.000000000 +0000
-+@@ -28,7 +28,7 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: tput.1,v 1.25 2006/05/13 15:14:01 tom Exp @
-++  * @Id: tput.1,v 1.27 2006/12/24 18:11:31 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -89,7 +89,7 @@
-+        application  should  test  the  exit  code  (e.g., <STRONG>$?</STRONG>, see
-+        <STRONG><A HREF="sh.1.html">sh(1)</A></STRONG>) to be sure it is <STRONG>0</STRONG>.  (See the <STRONG>EXIT</STRONG> <STRONG>CODES</STRONG> and  <STRONG>DIAG-</STRONG>
-+        <STRONG>NOSTICS</STRONG>  sections.)   For  a complete list of capabilities
-+-       and the <EM>capname</EM> associated with each, see <STRONG><A HREF="terminfo.1.html">terminfo(1)</A></STRONG>.
-++       and the <EM>capname</EM> associated with each, see <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
-+ 
-+        <STRONG>-T</STRONG><EM>type</EM> indicates the  <EM>type</EM>  of  terminal.   Normally  this
-+               option is unnecessary, because the default is taken
-+@@ -298,7 +298,7 @@
-+        exit code   error message
-+        ---------------------------------------------------------------------
-+        <STRONG>0</STRONG>           (<EM>capname</EM> is a numeric variable that is not specified  in
-+-                   the  <STRONG><A HREF="terminfo.1.html">terminfo(1)</A></STRONG>  database  for this terminal type, e.g.
-++                   the  <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>  database  for this terminal type, e.g.
-+                    <STRONG>tput</STRONG> <STRONG>-T450</STRONG> <STRONG>lines</STRONG> and <STRONG>tput</STRONG> <STRONG>-T2621</STRONG> <STRONG>xmc</STRONG>)
-+        <STRONG>1</STRONG>           no error message is printed, see the <STRONG>EXIT</STRONG> <STRONG>CODES</STRONG> section.
-+        <STRONG>2</STRONG>           usage error
-+@@ -328,7 +328,7 @@
-+ <H2>SEE ALSO</H2><PRE>
-+        <STRONG><A HREF="clear.1.html">clear(1)</A></STRONG>, <STRONG><A HREF="stty.1.html">stty(1)</A></STRONG>, <STRONG><A HREF="tabs.1.html">tabs(1)</A></STRONG>, <STRONG><A HREF="terminfo.5.html">terminfo(5)</A></STRONG>.
-+ 
-+-       This describes <STRONG>ncurses</STRONG> version 5.5 (patch 20061209).
-++       This describes <STRONG>ncurses</STRONG> version 5.6 (patch 20070303).
-+ 
-+ 
-+ 
-+Index: doc/html/man/tset.1.html
-+--- ncurses-5.6/doc/html/man/tset.1.html	2006-12-16 22:51:47.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/man/tset.1.html	2007-03-04 00:10:55.000000000 +0000
-+@@ -27,7 +27,7 @@
-+   * sale, use or other dealings in this Software without prior written       *
-+   * authorization.                                                           *
-+   ****************************************************************************
-+-  * @Id: tset.1,v 1.18 2006/07/29 11:34:07 tom Exp @
-++  * @Id: tset.1,v 1.19 2006/12/24 15:00:30 tom Exp @
-+ -->
-+ <HTML>
-+ <HEAD>
-+@@ -315,10 +315,10 @@
-+ 
-+ </PRE>
-+ <H2>SEE ALSO</H2><PRE>
-+-       <STRONG><A HREF="csh.1.html">csh(1)</A></STRONG>,  <STRONG><A HREF="sh.1.html">sh(1)</A></STRONG>,  <STRONG><A HREF="stty.1.html">stty(1)</A></STRONG>,  <STRONG><A HREF="setupterm.3x.html">setupterm(3x)</A></STRONG>,   <STRONG><A HREF="tty.4.html">tty(4)</A></STRONG>,   ter-
-++       <STRONG><A HREF="csh.1.html">csh(1)</A></STRONG>, <STRONG><A HREF="sh.1.html">sh(1)</A></STRONG>, <STRONG><A HREF="stty.1.html">stty(1)</A></STRONG>,  <STRONG><A HREF="curs_terminfo.3x.html">curs_terminfo(3x)</A></STRONG>,  <STRONG><A HREF="tty.4.html">tty(4)</A></STRONG>,  ter-
-+        <STRONG><A HREF="minfo.5.html">minfo(5)</A></STRONG>, <STRONG><A HREF="ttys.5.html">ttys(5)</A></STRONG>, <STRONG><A HREF="environ.7.html">environ(7)</A></STRONG>
-+ 
-+-       This describes <STRONG>ncurses</STRONG> version 5.5 (patch 20061209).
-++       This describes <STRONG>ncurses</STRONG> version 5.6 (patch 20070303).
-+ 
-+ 
-+ 
-+Index: doc/html/ncurses-intro.html
-+Prereq:  1.41 
-+--- ncurses-5.6/doc/html/ncurses-intro.html	2005-12-24 15:47:05.000000000 +0000
-++++ ncurses-5.6-20071201/doc/html/ncurses-intro.html	2007-03-03 19:31:50.000000000 +0000
-+@@ -1,8 +1,8 @@
-+ <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.0//EN">
-+ <!--
-+-  $Id: ncurses-intro.html,v 1.41 2005/12/24 15:47:05 tom Exp $
-++  $Id: ncurses-intro.html,v 1.43 2007/03/03 19:31:50 tom Exp $
-+   ****************************************************************************
-+-  * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
-++  * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+   *                                                                          *
-+   * Permission is hereby granted, free of charge, to any person obtaining a  *
-+   * copy of this software and associated documentation files (the            *
-+@@ -914,15 +914,14 @@
-+ 
-+ <H3><A NAME="xterm">Using NCURSES under XTERM</A></H3>
-+ 
-+-A resize operation in X sends SIGWINCH to the application running under xterm.
-+-The <CODE>ncurses</CODE> library provides an experimental signal
-+-handler, but in general does not catch this signal, because it cannot
-+-know how you want the screen re-painted.  You will usually have to write the
-+-SIGWINCH handler yourself.  Ncurses can give you some help. <P>
-+-
-+-The easiest way to code your SIGWINCH handler is to have it do an
-+-<CODE>endwin</CODE>, followed by an <CODE>refresh</CODE> and a screen repaint you code
-+-yourself.  The <CODE>refresh</CODE> will pick up the new screen size from the
-++A resize operation in X sends <CODE>SIGWINCH</CODE> to the application running
-++under xterm.
-++
-++The easiest way to handle <CODE>SIGWINCH</CODE>
-++is to do an <CODE>endwin</CODE>,
-++followed by an <CODE>refresh</CODE> and a screen repaint you code
-++yourself.
-++The <CODE>refresh</CODE> will pick up the new screen size from the
-+ xterm's environment. <P>
-+ 
-+ That is the standard way, of course (it even works with some vendor's curses
-+@@ -934,8 +933,17 @@
-+ are limited to the new screen dimensions, and pads <CODE>stdscr</CODE>
-+ with blanks if the screen is larger. <P>
-+ 
-+-Finally, ncurses can be configured to provide its own SIGWINCH handler,
-+-based on <CODE>resizeterm</CODE>.
-++The <CODE>ncurses</CODE> library provides a SIGWINCH signal handler,
-++which pushes a <CODE>KEY_RESIZE</CODE> via the wgetch() calls.
-++When <CODE>ncurses</CODE> returns that code,
-++it calls <code>resizeterm</CODE>
-++to update the size of the standard screen's window, repainting that
-++(filling with blanks or truncating as needed).
-++It also resizes other windows,
-++but its effect may be less satisfactory because it cannot
-++know how you want the screen re-painted.
-++You will usually have to write special-purpose code to handle
-++<CODE>KEY_RESIZE</CODE> yourself.
-+ 
-+ <H3><A NAME="screens">Handling Multiple Terminal Screens</A></H3>
-+ 
-+@@ -2184,7 +2192,7 @@
-+ from the last page goes to the first, and <CODE>REQ_PREV_PAGE</CODE> from
-+ the first page goes to the last.
-+ 
-+-<H3><A NAME="#ffield">Inter-Field Navigation Requests</A></H3>
-++<H3><A NAME="ffield">Inter-Field Navigation Requests</A></H3>
-+ 
-+ These requests handle navigation between fields on the same page.
-+ 
-+@@ -2238,7 +2246,7 @@
-+ go to B only if A, B, and C <EM>all</EM> share the same first line;
-+ otherwise it will skip over B to C.
-+ 
-+-<H3><A NAME="#fifield">Intra-Field Navigation Requests</A></H3>
-++<H3><A NAME="fifield">Intra-Field Navigation Requests</A></H3>
-+ 
-+ These requests drive movement of the edit cursor within the currently
-+ selected field.
-+Index: doc/ncurses-intro.doc
-+--- ncurses-5.6/doc/ncurses-intro.doc	2005-12-24 15:48:44.000000000 +0000
-++++ ncurses-5.6-20071201/doc/ncurses-intro.doc	2007-03-03 23:45:04.000000000 +0000
-+@@ -174,7 +174,7 @@
-+    The  ncurses  package  was  originated  by  Pavel Curtis. The original
-+    maintainer  of  this  package is Zeyd Ben-Halim <zmbenhal@netcom.com>.
-+    Eric S. Raymond <esr@snark.thyrsus.com> wrote many of the new features
-+-   in  versions  after  1.8.1 and wrote most of this introduction. Jürgen
-++   in  versions  after 1.8.1 and wrote most of this introduction. Juergen
-+    Pfeifer  wrote  all  of  the  menu and forms code as well as the Ada95
-+    binding.  Ongoing  work  is  being done by Thomas Dickey (maintainer).
-+    Contact the current maintainers at bug-ncurses@gnu.org.
-+@@ -798,15 +798,9 @@
-+   Using NCURSES under XTERM
-+ 
-+    A  resize  operation  in  X  sends SIGWINCH to the application running
-+-   under  xterm.  The  ncurses  library  provides  an experimental signal
-+-   handler,  but in general does not catch this signal, because it cannot
-+-   know  how  you  want  the  screen re-painted. You will usually have to
-+-   write the SIGWINCH handler yourself. Ncurses can give you some help.
-+-
-+-   The  easiest  way  to  code  your SIGWINCH handler is to have it do an
-+-   endwin, followed by an refresh and a screen repaint you code yourself.
-+-   The  refresh  will  pick  up  the  new  screen  size  from the xterm's
-+-   environment.
-++   under  xterm.  The  easiest way to handle SIGWINCH is to do an endwin,
-++   followed  by  an  refresh  and a screen repaint you code yourself. The
-++   refresh will pick up the new screen size from the xterm's environment.
-+ 
-+    That  is the standard way, of course (it even works with some vendor's
-+    curses  implementations). Its drawback is that it clears the screen to
-+@@ -816,8 +810,13 @@
-+    limited  to  the new screen dimensions, and pads stdscr with blanks if
-+    the screen is larger.
-+ 
-+-   Finally,  ncurses  can  be  configured  to  provide  its  own SIGWINCH
-+-   handler, based on resizeterm.
-++   The ncurses library provides a SIGWINCH signal handler, which pushes a
-++   KEY_RESIZE  via the wgetch() calls. When ncurses returns that code, it
-++   calls  resizeterm  to update the size of the standard screen's window,
-++   repainting that (filling with blanks or truncating as needed). It also
-++   resizes other windows, but its effect may be less satisfactory because
-++   it  cannot  know  how you want the screen re-painted. You will usually
-++   have to write special-purpose code to handle KEY_RESIZE yourself.
-+ 
-+   Handling Multiple Terminal Screens
-+ 
-+@@ -889,11 +888,11 @@
-+    To  understand why this is a problem, remember that screen updates are
-+    calculated  between  two  representations  of  the entire display. The
-+    documentation  says that when you refresh a window, it is first copied
-+-   to  the  virtual screen,  and  then  changes  are calculated to update
-+-   the  physical screen (and applied to the terminal). But "copied to" is
-+-   not  very  specific,  and  subtle differences in how copying works can
-+-   produce  different behaviors in the case where two overlapping windows
-+-   are each being refreshed at unpredictable intervals.
-++   to  the  virtual screen, and then changes are calculated to update the
-++   physical  screen (and applied to the terminal). But "copied to" is not
-++   very specific, and subtle differences in how copying works can produce
-++   different behaviors in the case where two overlapping windows are each
-++   being refreshed at unpredictable intervals.
-+ 
-+    What  happens to the overlapping region depends on what wnoutrefresh()
-+    does  with  its  argument  --  what portions of the argument window it
-+Index: form/Makefile.in
-+Prereq:  1.42 
-+--- ncurses-5.6/form/Makefile.in	2006-10-14 20:40:36.000000000 +0000
-++++ ncurses-5.6-20071201/form/Makefile.in	2007-04-28 14:56:11.000000000 +0000
-+@@ -1,6 +1,6 @@
-+-# $Id: Makefile.in,v 1.42 2006/10/14 20:40:36 tom Exp $
-++# $Id: Makefile.in,v 1.47 2007/04/28 14:56:11 tom Exp $
-+ ##############################################################################
-+-# Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.                #
-++# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -27,7 +27,7 @@
-+ # authorization.                                                             #
-+ ##############################################################################
-+ #
-+-# Author: Thomas E. Dickey <dickey@clark.net> 1996,1997
-++# Author: Thomas E. Dickey 1996-on
-+ #
-+ # Makefile for form source code.
-+ #
-+@@ -91,7 +91,7 @@
-+ 
-+ CFLAGS_DEFAULT	= $(CFLAGS_@DFT_UPR_MODEL@)
-+ 
-+-LINK		= $(LIBTOOL_LINK) $(CC)
-++LINK		= $(LIBTOOL_LINK)
-+ LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
-+ 
-+ SHLIB_DIRS	= -L../lib
-+@@ -106,8 +106,6 @@
-+ 
-+ RANLIB		= @LIB_PREP@
-+ 
-+-IMPORT_LIB	= @IMPORT_LIB@
-+-SHARED_LIB	= @SHARED_LIB@
-+ LIBRARIES	= @LIBS_TO_MAKE@
-+ 
-+ LINT		= @LINT@
-+@@ -126,7 +124,7 @@
-+ 
-+ $(DESTDIR)$(bindir) \
-+ $(DESTDIR)$(libdir) :
-+-	sh $(srcdir)/../mkinstalldirs $@
-++	sh $(srcdir)/../mkdirs.sh $@
-+ 
-+ # make copies to simplify include-paths while still keeping form's include
-+ # file in this directory.
-+Index: form/fld_def.c
-+Prereq:  1.33 
-+--- ncurses-5.6/form/fld_def.c	2005-04-16 17:31:17.000000000 +0000
-++++ ncurses-5.6-20071201/form/fld_def.c	2007-10-13 19:29:58.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -32,7 +32,7 @@
-+ 
-+ #include "form.priv.h"
-+ 
-+-MODULE_ID("$Id: fld_def.c,v 1.33 2005/04/16 17:31:17 tom Exp $")
-++MODULE_ID("$Id: fld_def.c,v 1.36 2007/10/13 19:29:58 tom Exp $")
-+ 
-+ /* this can't be readonly */
-+ static FIELD default_field =
-+@@ -93,7 +93,7 @@
-+       assert(err != 0 && ap != (va_list *)0);
-+       if ((typ->status & _LINKED_TYPE) != 0)
-+ 	{
-+-	  p = (TypeArgument *)malloc(sizeof(TypeArgument));
-++	  p = typeMalloc(TypeArgument, 1);
-+ 
-+ 	  if (p != 0)
-+ 	    {
-+@@ -141,7 +141,7 @@
-+       assert(err != 0 && argp != 0);
-+       if ((typ->status & _LINKED_TYPE) != 0)
-+ 	{
-+-	  p = (TypeArgument *)malloc(sizeof(TypeArgument));
-++	  p = typeMalloc(TypeArgument, 1);
-+ 
-+ 	  if (p != 0)
-+ 	    {
-+@@ -289,8 +289,9 @@
-+       nrow >= 0 &&
-+       nbuf >= 0 &&
-+       ((err = E_SYSTEM_ERROR) != 0) &&	/* trick: this resets the default error */
-+-      (New_Field = (FIELD *)malloc(sizeof(FIELD))) != 0)
-++      (New_Field = typeMalloc(FIELD, 1)) != 0)
-+     {
-++      T((T_CREATE("field %p"), New_Field));
-+       *New_Field = default_field;
-+       New_Field->rows = rows;
-+       New_Field->cols = cols;
-+@@ -304,7 +305,7 @@
-+ 
-+ #if USE_WIDEC_SUPPORT
-+       New_Field->working = newpad(1, Buffer_Length(New_Field) + 1);
-+-      New_Field->expanded = (char **)calloc(1 + (unsigned)rows, sizeof(char *));
-++      New_Field->expanded = typeCalloc(char *, 1 + (unsigned)nbuf);
-+ #endif
-+ 
-+       if (_nc_Copy_Type(New_Field, &default_field))
-+Index: form/fld_dup.c
-+Prereq:  1.10 
-+--- ncurses-5.6/form/fld_dup.c	2004-12-25 22:24:10.000000000 +0000
-++++ ncurses-5.6-20071201/form/fld_dup.c	2007-10-13 19:30:21.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2004,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -32,7 +32,7 @@
-+ 
-+ #include "form.priv.h"
-+ 
-+-MODULE_ID("$Id: fld_dup.c,v 1.10 2004/12/25 22:24:10 tom Exp $")
-++MODULE_ID("$Id: fld_dup.c,v 1.12 2007/10/13 19:30:21 tom Exp $")
-+ 
-+ /*---------------------------------------------------------------------------
-+ |   Facility      :  libnform
-+@@ -56,8 +56,9 @@
-+   T((T_CALLED("dup_field(%p,%d,%d)"), field, frow, fcol));
-+   if (field && (frow >= 0) && (fcol >= 0) &&
-+       ((err = E_SYSTEM_ERROR) != 0) &&	/* trick : this resets the default error */
-+-      (New_Field = (FIELD *)malloc(sizeof(FIELD))))
-++      (New_Field = typeMalloc(FIELD, 1)))
-+     {
-++      T((T_CREATE("field %p"), New_Field));
-+       *New_Field = *_nc_Default_Field;
-+       New_Field->frow = frow;
-+       New_Field->fcol = fcol;
-+Index: form/fld_ftlink.c
-+Prereq:  1.11 
-+--- ncurses-5.6/form/fld_ftlink.c	2004-12-25 22:24:10.000000000 +0000
-++++ ncurses-5.6-20071201/form/fld_ftlink.c	2007-10-13 19:30:35.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2004,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -32,7 +32,7 @@
-+ 
-+ #include "form.priv.h"
-+ 
-+-MODULE_ID("$Id: fld_ftlink.c,v 1.11 2004/12/25 22:24:10 tom Exp $")
-++MODULE_ID("$Id: fld_ftlink.c,v 1.13 2007/10/13 19:30:35 tom Exp $")
-+ 
-+ /*---------------------------------------------------------------------------
-+ |   Facility      :  libnform  
-+@@ -56,10 +56,11 @@
-+   T((T_CALLED("link_fieldtype(%p,%p)"), type1, type2));
-+   if (type1 && type2)
-+     {
-+-      nftyp = (FIELDTYPE *)malloc(sizeof(FIELDTYPE));
-++      nftyp = typeMalloc(FIELDTYPE, 1);
-+ 
-+       if (nftyp)
-+ 	{
-++	  T((T_CREATE("fieldtype %p"), nftyp));
-+ 	  *nftyp = *_nc_Default_FieldType;
-+ 	  nftyp->status |= _LINKED_TYPE;
-+ 	  if ((type1->status & _HAS_ARGS) || (type2->status & _HAS_ARGS))
-+Index: form/fld_link.c
-+Prereq:  1.9 
-+--- ncurses-5.6/form/fld_link.c	2004-12-25 22:24:10.000000000 +0000
-++++ ncurses-5.6-20071201/form/fld_link.c	2007-10-13 19:30:43.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2004,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -32,7 +32,7 @@
-+ 
-+ #include "form.priv.h"
-+ 
-+-MODULE_ID("$Id: fld_link.c,v 1.9 2004/12/25 22:24:10 tom Exp $")
-++MODULE_ID("$Id: fld_link.c,v 1.11 2007/10/13 19:30:43 tom Exp $")
-+ 
-+ /*---------------------------------------------------------------------------
-+ |   Facility      :  libnform  
-+@@ -57,8 +57,9 @@
-+   T((T_CALLED("link_field(%p,%d,%d)"), field, frow, fcol));
-+   if (field && (frow >= 0) && (fcol >= 0) &&
-+       ((err = E_SYSTEM_ERROR) != 0) &&	/* trick: this resets the default error */
-+-      (New_Field = (FIELD *)malloc(sizeof(FIELD))))
-++      (New_Field = typeMalloc(FIELD, 1)))
-+     {
-++      T((T_CREATE("field %p"), New_Field));
-+       *New_Field = *_nc_Default_Field;
-+       New_Field->frow = frow;
-+       New_Field->fcol = fcol;
-+Index: form/fld_newftyp.c
-+Prereq:  1.13 
-+--- ncurses-5.6/form/fld_newftyp.c	2004-12-25 22:24:10.000000000 +0000
-++++ ncurses-5.6-20071201/form/fld_newftyp.c	2007-10-13 19:30:55.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2003,2004 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2004,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -32,7 +32,7 @@
-+ 
-+ #include "form.priv.h"
-+ 
-+-MODULE_ID("$Id: fld_newftyp.c,v 1.13 2004/12/25 22:24:10 tom Exp $")
-++MODULE_ID("$Id: fld_newftyp.c,v 1.15 2007/10/13 19:30:55 tom Exp $")
-+ 
-+ static FIELDTYPE const default_fieldtype =
-+ {
-+@@ -76,10 +76,11 @@
-+   T((T_CALLED("new_fieldtype(%p,%p)"), field_check, char_check));
-+   if ((field_check) || (char_check))
-+     {
-+-      nftyp = (FIELDTYPE *)malloc(sizeof(FIELDTYPE));
-++      nftyp = typeMalloc(FIELDTYPE, 1);
-+ 
-+       if (nftyp)
-+ 	{
-++	  T((T_CREATE("fieldtype %p"), nftyp));
-+ 	  *nftyp = default_fieldtype;
-+ 	  nftyp->fcheck = field_check;
-+ 	  nftyp->ccheck = char_check;
-+Index: form/frm_def.c
-+Prereq:  1.20 
-+--- ncurses-5.6/form/frm_def.c	2006-11-04 16:57:15.000000000 +0000
-++++ ncurses-5.6-20071201/form/frm_def.c	2007-10-13 19:31:17.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -32,7 +32,7 @@
-+ 
-+ #include "form.priv.h"
-+ 
-+-MODULE_ID("$Id: frm_def.c,v 1.20 2006/11/04 16:57:15 tom Exp $")
-++MODULE_ID("$Id: frm_def.c,v 1.22 2007/10/13 19:31:17 tom Exp $")
-+ 
-+ /* this can't be readonly */
-+ static FORM default_form =
-+@@ -186,8 +186,9 @@
-+     RETURN(E_BAD_ARGUMENT);
-+ 
-+   /* allocate page structures */
-+-  if ((pg = (_PAGE *) malloc(page_nr * sizeof(_PAGE))) != (_PAGE *) 0)
-++  if ((pg = typeMalloc(_PAGE, page_nr)) != (_PAGE *) 0)
-+     {
-++      T((T_CREATE("_PAGE %p"), pg));
-+       form->page = pg;
-+     }
-+   else
-+@@ -290,11 +291,12 @@
-+ {
-+   int err = E_SYSTEM_ERROR;
-+ 
-+-  FORM *form = (FORM *)malloc(sizeof(FORM));
-++  FORM *form = typeMalloc(FORM, 1);
-+ 
-+   T((T_CALLED("new_form(%p)"), fields));
-+   if (form)
-+     {
-++      T((T_CREATE("form %p"), form));
-+       *form = *_nc_Default_Form;
-+       if ((err = Associate_Fields(form, fields)) != E_OK)
-+ 	{
-+Index: form/frm_driver.c
-+Prereq:  1.76 
-+--- ncurses-5.6/form/frm_driver.c	2006-11-04 18:45:35.000000000 +0000
-++++ ncurses-5.6-20071201/form/frm_driver.c	2007-11-24 21:32:53.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -32,7 +32,7 @@
-+ 
-+ #include "form.priv.h"
-+ 
-+-MODULE_ID("$Id: frm_driver.c,v 1.76 2006/11/04 18:45:35 tom Exp $")
-++MODULE_ID("$Id: frm_driver.c,v 1.85 2007/11/24 21:32:53 tom Exp $")
-+ 
-+ /*----------------------------------------------------------------------------
-+   This is the core module of the form library. It contains the majority
-+@@ -262,7 +262,19 @@
-+ static int
-+ fix_wchnstr(WINDOW *w, cchar_t *s, int n)
-+ {
-++  int x;
-++
-+   win_wchnstr(w, s, n);
-++  /*
-++   * This function is used to extract the text only from the window.
-++   * Strip attributes and color from the string so they will not be added
-++   * back when copying the string to the window.
-++   */
-++  for (x = 0; x < n; ++x)
-++    {
-++      RemAttr(s[x], A_ATTRIBUTES);
-++      SetPair(s[x], 0);
-++    }
-+   return n;
-+ }
-+ 
-+@@ -651,6 +663,7 @@
-+ 
-+ 	  result = TRUE;	/* allow sharing of recovery on failure */
-+ 
-++	  T((T_CREATE("fieldcell %p"), newbuf));
-+ 	  field->buf = newbuf;
-+ 	  for (i = 0; i <= field->nbuf; i++)
-+ 	    {
-+@@ -724,6 +737,34 @@
-+   return (result);
-+ }
-+ 
-++#ifdef NCURSES_MOUSE_VERSION
-++/*---------------------------------------------------------------------------
-++|   Facility      :  libnform
-++|   Function      :  int Field_encloses(FIELD *field, int ry, int rx)
-++|
-++|   Description   :  Check if the given coordinates lie within the given field.
-++|
-++|   Return Values :  E_OK              - success
-++|                    E_BAD_ARGUMENT    - invalid form pointer
-++|                    E_SYSTEM_ERROR    - form has no current field or
-++|                                        field-window
-+++--------------------------------------------------------------------------*/
-++static int
-++Field_encloses(FIELD *field, int ry, int rx)
-++{
-++  T((T_CALLED("Field_encloses(%p)"), field));
-++  if (field != 0
-++      && field->frow <= ry
-++      && (field->frow + field->rows) > ry
-++      && field->fcol <= rx
-++      && (field->fcol + field->cols) > rx)
-++    {
-++      RETURN(E_OK);
-++    }
-++  RETURN(E_INVALID_FIELD);
-++}
-++#endif
-++
-+ /*---------------------------------------------------------------------------
-+ |   Facility      :  libnform
-+ |   Function      :  int _nc_Position_Form_Cursor(FORM * form)
-+@@ -4149,6 +4190,83 @@
-+ 	    res = (BI->cmd) (form);
-+ 	}
-+     }
-++#ifdef NCURSES_MOUSE_VERSION
-++  else if (KEY_MOUSE == c)
-++    {
-++      MEVENT event;
-++      WINDOW *win = form->win ? form->win : stdscr;
-++      WINDOW *sub = form->sub ? form->sub : win;
-++
-++      getmouse(&event);
-++      if ((event.bstate & (BUTTON1_CLICKED |
-++			   BUTTON1_DOUBLE_CLICKED |
-++			   BUTTON1_TRIPLE_CLICKED))
-++	  && wenclose(win, event.y, event.x))
-++	{			/* we react only if the click was in the userwin, that means
-++				 * inside the form display area or at the decoration window.
-++				 */
-++	  int ry = event.y, rx = event.x;	/* screen coordinates */
-++
-++	  res = E_REQUEST_DENIED;
-++	  if (mouse_trafo(&ry, &rx, FALSE))
-++	    {			/* rx, ry are now "curses" coordinates */
-++	      if (ry < sub->_begy)
-++		{		/* we clicked above the display region; this is
-++				 * interpreted as "scroll up" request
-++				 */
-++		  if (event.bstate & BUTTON1_CLICKED)
-++		    res = form_driver(form, REQ_PREV_FIELD);
-++		  else if (event.bstate & BUTTON1_DOUBLE_CLICKED)
-++		    res = form_driver(form, REQ_PREV_PAGE);
-++		  else if (event.bstate & BUTTON1_TRIPLE_CLICKED)
-++		    res = form_driver(form, REQ_FIRST_FIELD);
-++		}
-++	      else if (ry > sub->_begy + sub->_maxy)
-++		{		/* we clicked below the display region; this is
-++				 * interpreted as "scroll down" request
-++				 */
-++		  if (event.bstate & BUTTON1_CLICKED)
-++		    res = form_driver(form, REQ_NEXT_FIELD);
-++		  else if (event.bstate & BUTTON1_DOUBLE_CLICKED)
-++		    res = form_driver(form, REQ_NEXT_PAGE);
-++		  else if (event.bstate & BUTTON1_TRIPLE_CLICKED)
-++		    res = form_driver(form, REQ_LAST_FIELD);
-++		}
-++	      else if (wenclose(sub, event.y, event.x))
-++		{		/* Inside the area we try to find the hit item */
-++		  int i;
-++
-++		  ry = event.y;
-++		  rx = event.x;
-++		  if (wmouse_trafo(sub, &ry, &rx, FALSE))
-++		    {
-++		      int min_field = form->page[form->curpage].pmin;
-++		      int max_field = form->page[form->curpage].pmax;
-++
-++		      for (i = min_field; i <= max_field; ++i)
-++			{
-++			  FIELD *field = form->field[i];
-++
-++			  if (Field_Is_Selectable(field)
-++			      && Field_encloses(field, ry, rx) == E_OK)
-++			    {
-++			      res = _nc_Set_Current_Field(form, field);
-++			      if (res == E_OK)
-++				res = _nc_Position_Form_Cursor(form);
-++			      if (res == E_OK
-++				  && (event.bstate & BUTTON1_DOUBLE_CLICKED))
-++				res = E_UNKNOWN_COMMAND;
-++			      break;
-++			    }
-++			}
-++		    }
-++		}
-++	    }
-++	}
-++      else
-++	res = E_REQUEST_DENIED;
-++    }
-++#endif /* NCURSES_MOUSE_VERSION */
-+   else if (!(c & (~(int)MAX_REGULAR_CHARACTER)))
-+     {
-+       /*
-+@@ -4261,7 +4379,7 @@
-+   wclear(field->working);
-+   mvwaddstr(field->working, 0, 0, value);
-+ 
-+-  if ((widevalue = (FIELD_CELL *)calloc(len, sizeof(FIELD_CELL))) == 0)
-++  if ((widevalue = typeCalloc(FIELD_CELL, len + 1)) == 0)
-+     {
-+       RETURN(E_SYSTEM_ERROR);
-+     }
-+@@ -4341,10 +4459,7 @@
-+ 	      init_mb(state);
-+ 	      next = _nc_wcrtomb(0, data[n].chars[0], &state);
-+ 	      if (!isEILSEQ(next))
-+-		{
-+-		  if (next != 0)
-+-		    need += next;
-+-		}
-++		need += next;
-+ 	    }
-+ 	}
-+ 
-+@@ -4358,7 +4473,7 @@
-+ 	{
-+ 	  wclear(field->working);
-+ 	  mvwadd_wchnstr(field->working, 0, 0, data, size);
-+-	  mvwinnstr(field->working, 0, 0, result, (int)need + 1);
-++	  mvwinnstr(field->working, 0, 0, result, (int)need);
-+ 	}
-+ #else
-+       result = Address_Of_Nth_Buffer(field, buffer);
-+Index: form/fty_alnum.c
-+Prereq:  1.19 
-+--- ncurses-5.6/form/fty_alnum.c	2006-04-22 21:33:05.000000000 +0000
-++++ ncurses-5.6-20071201/form/fty_alnum.c	2007-10-13 19:31:52.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -34,7 +34,7 @@
-+ 
-+ #include "form.priv.h"
-+ 
-+-MODULE_ID("$Id: fty_alnum.c,v 1.19 2006/04/22 21:33:05 tom Exp $")
-++MODULE_ID("$Id: fty_alnum.c,v 1.21 2007/10/13 19:31:52 tom Exp $")
-+ 
-+ #define thisARG alnumARG
-+ 
-+@@ -55,10 +55,13 @@
-+ static void *
-+ Make_This_Type(va_list *ap)
-+ {
-+-  thisARG *argp = (thisARG *) malloc(sizeof(thisARG));
-++  thisARG *argp = typeMalloc(thisARG, 1);
-+ 
-+   if (argp)
-+-    argp->width = va_arg(*ap, int);
-++    {
-++      T((T_CREATE("thisARG %p"), argp));
-++      argp->width = va_arg(*ap, int);
-++    }
-+ 
-+   return ((void *)argp);
-+ }
-+@@ -75,10 +78,13 @@
-+ Copy_This_Type(const void *argp)
-+ {
-+   const thisARG *ap = (const thisARG *)argp;
-+-  thisARG *result = (thisARG *) malloc(sizeof(thisARG));
-++  thisARG *result = typeMalloc(thisARG, 1);
-+ 
-+   if (result)
-+-    *result = *ap;
-++    {
-++      T((T_CREATE("thisARG %p"), result));
-++      *result = *ap;
-++    }
-+ 
-+   return ((void *)result);
-+ }
-+Index: form/fty_alpha.c
-+Prereq:  1.21 
-+--- ncurses-5.6/form/fty_alpha.c	2006-04-22 21:33:05.000000000 +0000
-++++ ncurses-5.6-20071201/form/fty_alpha.c	2007-10-13 19:32:09.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -34,7 +34,7 @@
-+ 
-+ #include "form.priv.h"
-+ 
-+-MODULE_ID("$Id: fty_alpha.c,v 1.21 2006/04/22 21:33:05 tom Exp $")
-++MODULE_ID("$Id: fty_alpha.c,v 1.23 2007/10/13 19:32:09 tom Exp $")
-+ 
-+ #define thisARG alphaARG
-+ 
-+@@ -55,10 +55,13 @@
-+ static void *
-+ Make_This_Type(va_list *ap)
-+ {
-+-  thisARG *argp = (thisARG *) malloc(sizeof(thisARG));
-++  thisARG *argp = typeMalloc(thisARG, 1);
-+ 
-+   if (argp)
-+-    argp->width = va_arg(*ap, int);
-++    {
-++      T((T_CREATE("thisARG %p"), argp));
-++      argp->width = va_arg(*ap, int);
-++    }
-+ 
-+   return ((void *)argp);
-+ }
-+@@ -75,10 +78,13 @@
-+ Copy_This_Type(const void *argp)
-+ {
-+   const thisARG *ap = (const thisARG *)argp;
-+-  thisARG *result = (thisARG *) malloc(sizeof(thisARG));
-++  thisARG *result = typeMalloc(thisARG, 1);
-+ 
-+   if (result)
-+-    *result = *ap;
-++    {
-++      T((T_CREATE("thisARG %p"), result));
-++      *result = *ap;
-++    }
-+ 
-+   return ((void *)result);
-+ }
-+Index: form/fty_enum.c
-+Prereq:  1.20 
-+--- ncurses-5.6/form/fty_enum.c	2006-04-22 21:33:05.000000000 +0000
-++++ ncurses-5.6-20071201/form/fty_enum.c	2007-10-13 19:32:26.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -34,7 +34,7 @@
-+ 
-+ #include "form.priv.h"
-+ 
-+-MODULE_ID("$Id: fty_enum.c,v 1.20 2006/04/22 21:33:05 tom Exp $")
-++MODULE_ID("$Id: fty_enum.c,v 1.22 2007/10/13 19:32:26 tom Exp $")
-+ 
-+ typedef struct
-+   {
-+@@ -56,7 +56,7 @@
-+ static void *
-+ Make_Enum_Type(va_list *ap)
-+ {
-+-  enumARG *argp = (enumARG *)malloc(sizeof(enumARG));
-++  enumARG *argp = typeMalloc(enumARG, 1);
-+ 
-+   if (argp)
-+     {
-+@@ -64,6 +64,7 @@
-+       char **kp = (char **)0;
-+       int ccase, cunique;
-+ 
-++      T((T_CREATE("enumARG %p"), argp));
-+       argp->kwds = va_arg(*ap, char **);
-+       ccase = va_arg(*ap, int);
-+       cunique = va_arg(*ap, int);
-+@@ -96,10 +97,13 @@
-+     {
-+       const enumARG *ap = (const enumARG *)argp;
-+ 
-+-      result = (enumARG *)malloc(sizeof(enumARG));
-++      result = typeMalloc(enumARG, 1);
-+ 
-+       if (result)
-+-	*result = *ap;
-++	{
-++	  T((T_CREATE("enumARG %p"), result));
-++	  *result = *ap;
-++	}
-+     }
-+   return (void *)result;
-+ }
-+Index: form/fty_int.c
-+Prereq:  1.20 
-+--- ncurses-5.6/form/fty_int.c	2006-04-22 21:33:05.000000000 +0000
-++++ ncurses-5.6-20071201/form/fty_int.c	2007-10-13 19:32:40.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -34,7 +34,7 @@
-+ 
-+ #include "form.priv.h"
-+ 
-+-MODULE_ID("$Id: fty_int.c,v 1.20 2006/04/22 21:33:05 tom Exp $")
-++MODULE_ID("$Id: fty_int.c,v 1.22 2007/10/13 19:32:40 tom Exp $")
-+ 
-+ #if USE_WIDEC_SUPPORT
-+ #define isDigit(c) (iswdigit((wint_t)(c)) || isdigit(UChar(c)))
-+@@ -63,10 +63,11 @@
-+ static void *
-+ Make_This_Type(va_list *ap)
-+ {
-+-  thisARG *argp = (thisARG *) malloc(sizeof(thisARG));
-++  thisARG *argp = typeMalloc(thisARG, 1);
-+ 
-+   if (argp)
-+     {
-++      T((T_CREATE("thisARG %p"), argp));
-+       argp->precision = va_arg(*ap, int);
-+       argp->low = va_arg(*ap, long);
-+       argp->high = va_arg(*ap, long);
-+@@ -90,9 +91,12 @@
-+ 
-+   if (argp)
-+     {
-+-      result = (thisARG *) malloc(sizeof(thisARG));
-++      result = typeMalloc(thisARG, 1);
-+       if (result)
-+-	*result = *ap;
-++	{
-++	  T((T_CREATE("thisARG %p"), result));
-++	  *result = *ap;
-++	}
-+     }
-+   return (void *)result;
-+ }
-+Index: form/fty_num.c
-+Prereq:  1.23 
-+--- ncurses-5.6/form/fty_num.c	2006-04-22 21:33:05.000000000 +0000
-++++ ncurses-5.6-20071201/form/fty_num.c	2007-10-13 19:32:54.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -34,7 +34,7 @@
-+ 
-+ #include "form.priv.h"
-+ 
-+-MODULE_ID("$Id: fty_num.c,v 1.23 2006/04/22 21:33:05 tom Exp $")
-++MODULE_ID("$Id: fty_num.c,v 1.25 2007/10/13 19:32:54 tom Exp $")
-+ 
-+ #if HAVE_LOCALE_H
-+ #include <locale.h>
-+@@ -74,10 +74,11 @@
-+ static void *
-+ Make_This_Type(va_list *ap)
-+ {
-+-  thisARG *argn = (thisARG *) malloc(sizeof(thisARG));
-++  thisARG *argn = typeMalloc(thisARG, 1);
-+ 
-+   if (argn)
-+     {
-++      T((T_CREATE("thisARG %p"), argn));
-+       argn->precision = va_arg(*ap, int);
-+       argn->low = va_arg(*ap, double);
-+       argn->high = va_arg(*ap, double);
-+@@ -107,9 +108,12 @@
-+ 
-+   if (argp)
-+     {
-+-      result = (thisARG *) malloc(sizeof(thisARG));
-++      result = typeMalloc(thisARG, 1);
-+       if (result)
-+-	*result = *ap;
-++	{
-++	  T((T_CREATE("thisARG %p"), result));
-++	  *result = *ap;
-++	}
-+     }
-+   return (void *)result;
-+ }
-+Index: form/fty_regex.c
-+Prereq:  1.19 
-+--- ncurses-5.6/form/fty_regex.c	2006-04-22 21:33:05.000000000 +0000
-++++ ncurses-5.6-20071201/form/fty_regex.c	2007-10-13 19:33:50.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -34,7 +34,7 @@
-+ 
-+ #include "form.priv.h"
-+ 
-+-MODULE_ID("$Id: fty_regex.c,v 1.19 2006/04/22 21:33:05 tom Exp $")
-++MODULE_ID("$Id: fty_regex.c,v 1.21 2007/10/13 19:33:50 tom Exp $")
-+ 
-+ #if HAVE_REGEX_H_FUNCS		/* We prefer POSIX regex */
-+ #include <regex.h>
-+@@ -105,15 +105,17 @@
-+   char *rx = va_arg(*ap, char *);
-+   RegExp_Arg *preg;
-+ 
-+-  preg = (RegExp_Arg *)malloc(sizeof(RegExp_Arg));
-++  preg = typeMalloc(RegExp_Arg, 1);
-+ 
-+   if (preg)
-+     {
-+-      if (((preg->pRegExp = (regex_t *) malloc(sizeof(regex_t))) != 0)
-++      T((T_CREATE("RegExp_Arg %p"), preg));
-++      if (((preg->pRegExp = typeMalloc(regex_t, 1)) != 0)
-+ 	  && !regcomp(preg->pRegExp, rx,
-+ 		      (REG_EXTENDED | REG_NOSUB | REG_NEWLINE)))
-+ 	{
-+-	  preg->refCount = (unsigned long *)malloc(sizeof(unsigned long));
-++	  T((T_CREATE("regex_t %p"), preg->pRegExp));
-++	  preg->refCount = typeMalloc(unsigned long, 1);
-+ 
-+ 	  *(preg->refCount) = 1;
-+ 	}
-+@@ -130,20 +132,21 @@
-+   char *rx = va_arg(*ap, char *);
-+   RegExp_Arg *pArg;
-+ 
-+-  pArg = (RegExp_Arg *)malloc(sizeof(RegExp_Arg));
-++  pArg = typeMalloc(RegExp_Arg, 1);
-+ 
-+   if (pArg)
-+     {
-+       int blen = RX_INCREMENT;
-+ 
-++      T((T_CREATE("RegExp_Arg %p"), pArg));
-+       pArg->compiled_expression = NULL;
-+-      pArg->refCount = (unsigned long *)malloc(sizeof(unsigned long));
-++      pArg->refCount = typeMalloc(unsigned long, 1);
-+ 
-+       *(pArg->refCount) = 1;
-+ 
-+       do
-+ 	{
-+-	  char *buf = (char *)malloc(blen);
-++	  char *buf = typeMalloc(char, blen);
-+ 
-+ 	  if (buf)
-+ 	    {
-+Index: form/headers
-+--- ncurses-5.6/form/headers	1998-02-11 12:13:43.000000000 +0000
-++++ ncurses-5.6-20071201/form/headers	2006-12-24 16:25:45.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ ##############################################################################
-+-# Copyright (c) 1998 Free Software Foundation, Inc.                          #
-++# Copyright (c) 1998,2006 Free Software Foundation, Inc.                     #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -29,3 +29,4 @@
-+ # Author: Thomas E. Dickey <dickey@clark.net> 1996
-+ #
-+ $(srcdir)/form.h
-++# vile:makemode
-+Index: form/modules
-+Prereq:  1.14 
-+--- ncurses-5.6/form/modules	2004-12-25 23:29:22.000000000 +0000
-++++ ncurses-5.6-20071201/form/modules	2006-12-24 00:52:58.000000000 +0000
-+@@ -1,6 +1,6 @@
-+-# $Id: modules,v 1.14 2004/12/25 23:29:22 tom Exp $
-++# $Id: modules,v 1.15 2006/12/24 00:52:58 tom Exp $
-+ ##############################################################################
-+-# Copyright (c) 1998,2004 Free Software Foundation, Inc.                     #
-++# Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.                #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -27,7 +27,7 @@
-+ # authorization.                                                             #
-+ ##############################################################################
-+ #
-+-# Author: Thomas E. Dickey
-++# Author: Thomas E. Dickey	1995-on
-+ #
-+ 
-+ @ base
-+@@ -72,3 +72,5 @@
-+ fty_ipv4	lib		$(srcdir)	$(FORM_PRIV_H)
-+ fty_num		lib		$(srcdir)	$(FORM_PRIV_H)
-+ fty_regex	lib		$(srcdir)	$(FORM_PRIV_H)
-++
-++# vile:makemode
-+Index: include/MKterm.h.awk.in
-+Prereq:  1.47 
-+--- ncurses-5.6/include/MKterm.h.awk.in	2006-11-26 01:18:23.000000000 +0000
-++++ ncurses-5.6-20071201/include/MKterm.h.awk.in	2007-08-18 11:44:26.000000000 +0000
-+@@ -1,6 +1,7 @@
-++# vile:awkmode
-+ BEGIN		{
-+ 		    print  "/****************************************************************************"
-+-		    print  " * Copyright (c) 1998-2003,2006 Free Software Foundation, Inc.              *"
-++		    print  " * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *"
-+ 		    print  " *                                                                          *"
-+ 		    print  " * Permission is hereby granted, free of charge, to any person obtaining a  *"
-+ 		    print  " * copy of this software and associated documentation files (the            *"
-+@@ -33,7 +34,7 @@
-+ 		    print  "/*    and: Thomas E. Dickey                        1995-on                  */"
-+ 		    print  "/****************************************************************************/"
-+ 		    print  ""
-+-		    print  "/* $Id: MKterm.h.awk.in,v 1.47 2006/11/26 01:18:23 tom Exp $ */"
-++		    print  "/* $Id: MKterm.h.awk.in,v 1.49 2007/08/18 11:44:26 tom Exp $ */"
-+ 		    print  ""
-+ 		    print  "/*"
-+ 		    print  "**	term.h -- Definition of struct term"
-+@@ -229,26 +230,26 @@
-+ 			print  ""
-+ 			print  "extern NCURSES_EXPORT_VAR(TERMINAL *) cur_term;"
-+ 			print  ""
-+-			print  "#if BROKEN_LINKER"
-+-			print  "#define boolnames  _nc_boolnames()"
-+-			print  "#define boolcodes  _nc_boolcodes()"
-+-			print  "#define boolfnames _nc_boolfnames()"
-+-			print  "#define numnames   _nc_numnames()"
-+-			print  "#define numcodes   _nc_numcodes()"
-+-			print  "#define numfnames  _nc_numfnames()"
-+-			print  "#define strnames   _nc_strnames()"
-+-			print  "#define strcodes   _nc_strcodes()"
-+-			print  "#define strfnames  _nc_strfnames()"
-+-			print  ""
-+-			print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_boolnames (void);"
-+-			print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_boolcodes (void);"
-+-			print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_boolfnames (void);"
-+-			print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_numnames (void);"
-+-			print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_numcodes (void);"
-+-			print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_numfnames (void);"
-+-			print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_strnames (void);"
-+-			print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_strcodes (void);"
-+-			print  "extern NCURSES_EXPORT(NCURSES_CONST char * const *) _nc_strfnames (void);"
-++			print  "#if @BROKEN_LINKER@ || @cf_cv_enable_reentrant@"
-++			print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolnames);"
-++			print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolcodes);"
-++			print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, boolfnames);"
-++			print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, numnames);"
-++			print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, numcodes);"
-++			print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, numfnames);"
-++			print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strnames);"
-++			print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strcodes);"
-++			print  "NCURSES_WRAPPED_VAR(NCURSES_CONST char * const *, strfnames);"
-++			print  ""
-++			print  "#define boolnames  NCURSES_PUBLIC_VAR(boolnames())"
-++			print  "#define boolcodes  NCURSES_PUBLIC_VAR(boolcodes())"
-++			print  "#define boolfnames NCURSES_PUBLIC_VAR(boolfnames())"
-++			print  "#define numnames   NCURSES_PUBLIC_VAR(numnames())"
-++			print  "#define numcodes   NCURSES_PUBLIC_VAR(numcodes())"
-++			print  "#define numfnames  NCURSES_PUBLIC_VAR(numfnames())"
-++			print  "#define strnames   NCURSES_PUBLIC_VAR(strnames())"
-++			print  "#define strcodes   NCURSES_PUBLIC_VAR(strcodes())"
-++			print  "#define strfnames  NCURSES_PUBLIC_VAR(strfnames())"
-+ 			print  ""
-+ 			print  "#else"
-+ 			print  ""
-+@@ -291,10 +292,10 @@
-+ 			print  "extern NCURSES_EXPORT(int) tigetnum (NCURSES_CONST char *);"
-+ 			print  ""
-+ 			print  "#if @NCURSES_TPARM_VARARGS@ /* NCURSES_TPARM_VARARGS */"
-+-			print  "extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...);	/* implemented */"
-++			print  "extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...);	/* special */"
-+ 			print  "#else"
-+-			print  "extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, long,long,long,long,long,long,long,long,long);	/* implemented */"
-+-			print  "extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...);	/* implemented */"
-++			print  "extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, long,long,long,long,long,long,long,long,long);	/* special */"
-++			print  "extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...);	/* special */"
-+ 			print  "#endif"
-+ 			print  ""
-+ 			print  "#endif /* __NCURSES_H */"
-+Index: include/curses.h.in
-+Prereq:  1.167 
-+--- ncurses-5.6/include/curses.h.in	2006-11-26 01:14:54.000000000 +0000
-++++ ncurses-5.6-20071201/include/curses.h.in	2007-11-18 00:32:03.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -32,7 +32,7 @@
-+  *     and: Thomas E. Dickey                        1996-on                 *
-+  ****************************************************************************/
-+ 
-+-/* $Id: curses.h.in,v 1.167 2006/11/26 01:14:54 tom Exp $ */
-++/* $Id: curses.h.in,v 1.181 2007/11/18 00:32:03 tom Exp $ */
-+ 
-+ #ifndef __NCURSES_H
-+ #define __NCURSES_H
-+@@ -103,10 +103,17 @@
-+ #define	NCURSES_COLOR_T short
-+ 
-+ /*
-++ * Definition used to make WINDOW and similar structs opaque.
-++ */
-++#ifndef @cf_cv_enable_opaque@
-++#define NCURSES_OPAQUE @NCURSES_OPAQUE@
-++#endif
-++
-++/*
-+  * The internal type used for window dimensions.
-+  */
-+ #undef	NCURSES_SIZE_T
-+-#define	NCURSES_SIZE_T short
-++#define	NCURSES_SIZE_T @NCURSES_SIZE_T@
-+ 
-+ /*
-+  * Control whether tparm() supports varargs or fixed-parameter list.
-+@@ -137,7 +144,7 @@
-+ #include <stddef.h>	/* we want wchar_t */
-+ #endif /* _XOPEN_SOURCE_EXTENDED */
-+ 
-+-/* XSI and SVr4 specify that curses implements 'bool'.  However, C++ may also
-++/* X/Open and SVr4 specify that curses implements 'bool'.  However, C++ may also
-+  * implement it.  If so, we must use the C++ compiler's type to avoid conflict
-+  * with other interfaces.
-+  *
-+@@ -184,7 +191,7 @@
-+ #endif
-+ 
-+ /*
-+- * XSI attributes.  In the ncurses implementation, they are identical to the
-++ * X/Open attributes.  In the ncurses implementation, they are identical to the
-+  * A_ attributes.
-+  */
-+ #define WA_ATTRIBUTES	A_ATTRIBUTES
-+@@ -206,9 +213,6 @@
-+ #define WA_VERTICAL	A_VERTICAL
-+ 
-+ /* colors */
-+-extern NCURSES_EXPORT_VAR(int) COLORS;
-+-extern NCURSES_EXPORT_VAR(int) COLOR_PAIRS;
-+-
-+ #define COLOR_BLACK	0
-+ #define COLOR_RED	1
-+ #define COLOR_GREEN	2
-+@@ -220,8 +224,8 @@
-+ 
-+ /* line graphics */
-+ 
-+-#if @BROKEN_LINKER@
-+-extern NCURSES_EXPORT_VAR(chtype*) _nc_acs_map(void);
-++#if @BROKEN_LINKER@ || @cf_cv_enable_reentrant@
-++NCURSES_WRAPPED_VAR(chtype*, acs_map);
-+ #define acs_map (_nc_acs_map())
-+ #else
-+ extern NCURSES_EXPORT_VAR(chtype) acs_map[];
-+@@ -346,6 +350,8 @@
-+     attr_t	attr;
-+     wchar_t	chars[CCHARW_MAX];
-+ #if @NCURSES_EXT_COLORS@
-++#undef NCURSES_EXT_COLORS
-++#define NCURSES_EXT_COLORS @NCURSES_PATCH@
-+     int		ext_color;	/* color pair, must be more than 16-bits */
-+ #endif
-+ }
-+@@ -353,6 +359,7 @@
-+ 
-+ #endif /* _XOPEN_SOURCE_EXTENDED */
-+ 
-++#if !NCURSES_OPAQUE
-+ struct ldat;
-+ 
-+ struct _win_st
-+@@ -409,41 +416,7 @@
-+ #endif
-+ #endif
-+ };
-+-
-+-extern NCURSES_EXPORT_VAR(WINDOW *)   stdscr;
-+-extern NCURSES_EXPORT_VAR(WINDOW *)   curscr;
-+-extern NCURSES_EXPORT_VAR(WINDOW *)   newscr;
-+-
-+-extern NCURSES_EXPORT_VAR(int)	LINES;
-+-extern NCURSES_EXPORT_VAR(int)	COLS;
-+-extern NCURSES_EXPORT_VAR(int)	TABSIZE;
-+-
-+-/*
-+- * This global was an undocumented feature under AIX curses.
-+- */
-+-extern NCURSES_EXPORT_VAR(int) ESCDELAY;	/* ESC expire time in milliseconds */
-+-
-+-/*
-+- * These functions are extensions - not in XSI Curses.
-+- */
-+-#if @NCURSES_EXT_FUNCS@
-+-extern NCURSES_EXPORT(bool) is_term_resized (int, int);
-+-extern NCURSES_EXPORT(char *) keybound (int, int);
-+-extern NCURSES_EXPORT(const char *) curses_version (void);
-+-extern NCURSES_EXPORT(int) assume_default_colors (int, int);
-+-extern NCURSES_EXPORT(int) define_key (const char *, int);
-+-extern NCURSES_EXPORT(int) key_defined (const char *);
-+-extern NCURSES_EXPORT(int) keyok (int, bool);
-+-extern NCURSES_EXPORT(int) resize_term (int, int);
-+-extern NCURSES_EXPORT(int) resizeterm (int, int);
-+-extern NCURSES_EXPORT(int) use_default_colors (void);
-+-extern NCURSES_EXPORT(int) use_extended_names (bool);
-+-extern NCURSES_EXPORT(int) use_legacy_coding (int);
-+-extern NCURSES_EXPORT(int) wresize (WINDOW *, int, int);
-+-extern NCURSES_EXPORT(void) nofilter(void);
-+-#else
-+-#define curses_version() NCURSES_VERSION
-+-#endif
-++#endif /* NCURSES_OPAQUE */
-+ 
-+ /*
-+  * This is an extension to support events...
-+@@ -537,7 +510,7 @@
-+ #endif
-+ 
-+ /*
-+- * Function prototypes.  This is the complete XSI Curses list of required
-++ * Function prototypes.  This is the complete X/Open Curses list of required
-+  * functions.  Those marked `generated' will have sources generated from the
-+  * macro definitions later in this file, in order to satisfy XPG4.2
-+  * requirements.
-+@@ -741,7 +714,7 @@
-+ extern NCURSES_EXPORT(int) standend (void);				/* generated */
-+ extern NCURSES_EXPORT(int) start_color (void);				/* implemented */
-+ extern NCURSES_EXPORT(WINDOW *) subpad (WINDOW *, int, int, int, int);	/* implemented */
-+-extern NCURSES_EXPORT(WINDOW *) subwin (WINDOW *,int,int,int,int);	/* implemented */
-++extern NCURSES_EXPORT(WINDOW *) subwin (WINDOW *, int, int, int, int);	/* implemented */
-+ extern NCURSES_EXPORT(int) syncok (WINDOW *, bool);			/* implemented */
-+ extern NCURSES_EXPORT(chtype) termattrs (void);				/* implemented */
-+ extern NCURSES_EXPORT(char *) termname (void);				/* implemented */
-+@@ -825,17 +798,16 @@
-+ extern NCURSES_EXPORT(int) putp (const char *);				/* implemented */
-+ 
-+ #if NCURSES_TPARM_VARARGS
-+-extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...);	/* implemented */
-++extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, ...);	/* special */
-+ #else
-+-extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, long,long,long,long,long,long,long,long,long);	/* implemented */
-+-extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...);	/* implemented */
-++extern NCURSES_EXPORT(char *) tparm (NCURSES_CONST char *, long,long,long,long,long,long,long,long,long);	/* special */
-++extern NCURSES_EXPORT(char *) tparm_varargs (NCURSES_CONST char *, ...);	/* special */
-+ #endif
-+ 
-+-extern NCURSES_EXPORT_VAR(char) ttytype[];	/* needed for backward compatibility */
-+-
-+ /*
-+  * These functions are not in X/Open, but we use them in macro definitions:
-+  */
-++extern NCURSES_EXPORT(int) getattrs (const WINDOW *);			/* generated */
-+ extern NCURSES_EXPORT(int) getcurx (const WINDOW *);			/* generated */
-+ extern NCURSES_EXPORT(int) getcury (const WINDOW *);			/* generated */
-+ extern NCURSES_EXPORT(int) getbegx (const WINDOW *);			/* generated */
-+@@ -846,12 +818,58 @@
-+ extern NCURSES_EXPORT(int) getpary (const WINDOW *);			/* generated */
-+ 
-+ /*
-+- * vid_attr() was implemented originally based on a draft of XSI curses.
-++ * vid_attr() was implemented originally based on a draft of X/Open curses.
-+  */
-+ #ifndef _XOPEN_SOURCE_EXTENDED
-+ #define vid_attr(a,pair,opts) vidattr(a)
-+ #endif
-+ 
-++/*
-++ * These functions are extensions - not in X/Open Curses.
-++ */
-++#undef  NCURSES_EXT_FUNCS
-++#if @NCURSES_EXT_FUNCS@
-++#undef  NCURSES_EXT_FUNCS
-++#define NCURSES_EXT_FUNCS @NCURSES_PATCH@
-++typedef int (*NCURSES_CALLBACK)(WINDOW *, void *);
-++extern NCURSES_EXPORT(bool) is_term_resized (int, int);
-++extern NCURSES_EXPORT(char *) keybound (int, int);
-++extern NCURSES_EXPORT(const char *) curses_version (void);
-++extern NCURSES_EXPORT(int) assume_default_colors (int, int);
-++extern NCURSES_EXPORT(int) define_key (const char *, int);
-++extern NCURSES_EXPORT(int) key_defined (const char *);
-++extern NCURSES_EXPORT(int) keyok (int, bool);
-++extern NCURSES_EXPORT(int) resize_term (int, int);
-++extern NCURSES_EXPORT(int) resizeterm (int, int);
-++extern NCURSES_EXPORT(int) use_default_colors (void);
-++extern NCURSES_EXPORT(int) use_extended_names (bool);
-++extern NCURSES_EXPORT(int) use_legacy_coding (int);
-++extern NCURSES_EXPORT(int) use_screen (SCREEN *, NCURSES_CALLBACK, void *);
-++extern NCURSES_EXPORT(int) use_window (WINDOW *, NCURSES_CALLBACK, void *);
-++extern NCURSES_EXPORT(int) wresize (WINDOW *, int, int);
-++extern NCURSES_EXPORT(void) nofilter(void);
-++
-++/*
-++ * These extensions provide access to information stored in the WINDOW even
-++ * when NCURSES_OPAQUE is set:
-++ */
-++extern NCURSES_EXPORT(WINDOW *) wgetparent (const WINDOW *);	/* generated */
-++extern NCURSES_EXPORT(bool) is_cleared (const WINDOW *);	/* generated */
-++extern NCURSES_EXPORT(bool) is_idcok (const WINDOW *);		/* generated */
-++extern NCURSES_EXPORT(bool) is_idlok (const WINDOW *);		/* generated */
-++extern NCURSES_EXPORT(bool) is_immedok (const WINDOW *);	/* generated */
-++extern NCURSES_EXPORT(bool) is_keypad (const WINDOW *);		/* generated */
-++extern NCURSES_EXPORT(bool) is_leaveok (const WINDOW *);	/* generated */
-++extern NCURSES_EXPORT(bool) is_nodelay (const WINDOW *);	/* generated */
-++extern NCURSES_EXPORT(bool) is_notimeout (const WINDOW *);	/* generated */
-++extern NCURSES_EXPORT(bool) is_scrollok (const WINDOW *);	/* generated */
-++extern NCURSES_EXPORT(bool) is_syncok (const WINDOW *);		/* generated */
-++extern NCURSES_EXPORT(int) wgetscrreg (const WINDOW *, int *, int *); /* generated */
-++
-++#else
-++#define curses_version() NCURSES_VERSION
-++#endif
-++
-+ /* attributes */
-+ 
-+ #define NCURSES_ATTR_SHIFT       8
-+@@ -892,11 +910,18 @@
-+ #define getmaxyx(win,y,x)	(y = getmaxy(win), x = getmaxx(win))
-+ #define getparyx(win,y,x)	(y = getpary(win), x = getparx(win))
-+ 
-+-#define getsyx(y,x) do { if(newscr->_leaveok) (y)=(x)=-1; \
-+-			 else getyx(newscr,(y),(x)); \
-++#define getsyx(y,x) do { if (is_leaveok(newscr)) \
-++			    (y) = (x) = -1; \
-++			 else \
-++			     getyx(newscr,(y), (x)); \
-+ 		    } while(0)
-+-#define setsyx(y,x) do { if((y)==-1 && (x)==-1) newscr->_leaveok=TRUE; \
-+-			 else {newscr->_leaveok=FALSE;wmove(newscr,(y),(x));} \
-++
-++#define setsyx(y,x) do { if ((y) == -1 && (x) == -1) \
-++			    leaveok(newscr, TRUE); \
-++			 else { \
-++			    leaveok(newscr, FALSE); \
-++			    wmove(newscr, (y), (x)); \
-++			} \
-+ 		    } while(0)
-+ 
-+ #ifndef NCURSES_NOMACROS
-+@@ -918,15 +943,17 @@
-+ #define gettmode()
-+ 
-+ /* It seems older SYSV curses versions define these */
-+-#define getattrs(win)		((win)?(win)->_attrs:A_NORMAL)
-+-#define getcurx(win)		((win)?(win)->_curx:ERR)
-+-#define getcury(win)		((win)?(win)->_cury:ERR)
-+-#define getbegx(win)		((win)?(win)->_begx:ERR)
-+-#define getbegy(win)		((win)?(win)->_begy:ERR)
-+-#define getmaxx(win)		((win)?((win)->_maxx + 1):ERR)
-+-#define getmaxy(win)		((win)?((win)->_maxy + 1):ERR)
-+-#define getparx(win)		((win)?(win)->_parx:ERR)
-+-#define getpary(win)		((win)?(win)->_pary:ERR)
-++#if !NCURSES_OPAQUE
-++#define getattrs(win)		((win) ? (win)->_attrs : A_NORMAL)
-++#define getcurx(win)		((win) ? (win)->_curx : ERR)
-++#define getcury(win)		((win) ? (win)->_cury : ERR)
-++#define getbegx(win)		((win) ? (win)->_begx : ERR)
-++#define getbegy(win)		((win) ? (win)->_begy : ERR)
-++#define getmaxx(win)		((win) ? ((win)->_maxx + 1) : ERR)
-++#define getmaxy(win)		((win) ? ((win)->_maxy + 1) : ERR)
-++#define getparx(win)		((win) ? (win)->_parx : ERR)
-++#define getpary(win)		((win) ? (win)->_pary : ERR)
-++#endif /* NCURSES_OPAQUE */
-+ 
-+ #define wstandout(win)      	(wattrset(win,A_STANDOUT))
-+ #define wstandend(win)      	(wattrset(win,A_NORMAL))
-+@@ -934,12 +961,14 @@
-+ #define wattron(win,at)		wattr_on(win, NCURSES_CAST(attr_t, at), NULL)
-+ #define wattroff(win,at)	wattr_off(win, NCURSES_CAST(attr_t, at), NULL)
-+ 
-++#if !NCURSES_OPAQUE
-+ #if defined(_XOPEN_SOURCE_EXTENDED) && @NCURSES_EXT_COLORS@
-+ #define wattrset(win,at)	((win)->_color = PAIR_NUMBER(at), \
-+ 				 (win)->_attrs = (at))
-+ #else
-+ #define wattrset(win,at)	((win)->_attrs = (at))
-+ #endif
-++#endif /* NCURSES_OPAQUE */
-+ 
-+ #define scroll(win)		wscrl(win,1)
-+ 
-+@@ -956,7 +985,10 @@
-+ #define winchstr(w, s)		winchnstr(w, s, -1)
-+ #define winsstr(w, s)		winsnstr(w, s, -1)
-+ 
-++#if !NCURSES_OPAQUE
-+ #define redrawwin(win)		wredrawln(win, 0, (win)->_maxy+1)
-++#endif /* NCURSES_OPAQUE */
-++
-+ #define waddstr(win,str)	waddnstr(win,str,-1)
-+ #define waddchstr(win,str)	waddchnstr(win,str,-1)
-+ 
-+@@ -1064,11 +1096,14 @@
-+ /*
-+  * Some wide-character functions can be implemented without the extensions.
-+  */
-++#if !NCURSES_OPAQUE
-+ #define getbkgd(win)                    ((win)->_bkgd)
-++#endif /* NCURSES_OPAQUE */
-+ 
-+ #define slk_attr_off(a,v)		((v) ? ERR : slk_attroff(a))
-+ #define slk_attr_on(a,v)		((v) ? ERR : slk_attron(a))
-+ 
-++#if !NCURSES_OPAQUE
-+ #if defined(_XOPEN_SOURCE_EXTENDED) && @NCURSES_EXT_COLORS@
-+ #define wattr_set(win,a,p,opts)		((win)->_attrs = ((a) & ~A_COLOR), \
-+ 					 (win)->_color = (p), \
-+@@ -1082,9 +1117,10 @@
-+ 					 (void)((p) != 0 && (*(p) = PAIR_NUMBER((win)->_attrs))), \
-+ 					 OK)
-+ #endif
-++#endif /* NCURSES_OPAQUE */
-+ 
-+ /*
-+- * XSI curses deprecates SVr4 vwprintw/vwscanw, which are supposed to use
-++ * X/Open curses deprecates SVr4 vwprintw/vwscanw, which are supposed to use
-+  * varargs.h.  It adds new calls vw_printw/vw_scanw, which are supposed to
-+  * use POSIX stdarg.h.  The ncurses versions of vwprintw/vwscanw already
-+  * use stdarg.h, so...
-+@@ -1100,9 +1136,76 @@
-+ NCURSES_EXPORT(int) vsscanf(const char *, const char *, va_list);
-+ #endif
-+ 
-++/*
-++ * These macros are extensions - not in X/Open Curses.
-++ */
-++#if @NCURSES_EXT_FUNCS@
-++#if !NCURSES_OPAQUE
-++#define is_cleared(win)		((win)->_clear)
-++#define is_idcok(win)		((win)->_idcok)
-++#define is_idlok(win)		((win)->_idlok)
-++#define is_immedok(win)		((win)->_immed)
-++#define is_keypad(win)		((win)->_use_keypad)
-++#define is_leaveok(win)		((win)->_leaveok)
-++#define is_nodelay(win)		((win)->_delay == 0)
-++#define is_notimeout(win)	((win)->_notimeout)
-++#define is_scrollok(win)	((win)->_scroll)
-++#define is_syncok(win)		((win)->_sync)
-++#define wgetparent(win)		((win) ? (win)->_parent : 0)
-++#define wgetscrreg(win,t,b)	((win) ? (*(t) = (win)->_regtop, *(b) = (win)->_regbottom, OK) : ERR)
-++#endif
-++#endif
-++
-+ #endif /* NCURSES_NOMACROS */
-+ 
-+ /*
-++ * Public variables.
-++ *
-++ * Notes:
-++ *	a. ESCDELAY was an undocumented feature under AIX curses.
-++ *	   It gives the ESC expire time in milliseconds.
-++ *	b. ttytype is needed for backward compatibility
-++ */
-++#if @cf_cv_enable_reentrant@
-++
-++NCURSES_WRAPPED_VAR(WINDOW *, curscr);
-++NCURSES_WRAPPED_VAR(WINDOW *, newscr);
-++NCURSES_WRAPPED_VAR(WINDOW *, stdscr);
-++NCURSES_WRAPPED_VAR(char *, ttytype);
-++NCURSES_WRAPPED_VAR(int, COLORS);
-++NCURSES_WRAPPED_VAR(int, COLOR_PAIRS);
-++NCURSES_WRAPPED_VAR(int, COLS);
-++NCURSES_WRAPPED_VAR(int, ESCDELAY);
-++NCURSES_WRAPPED_VAR(int, LINES);
-++NCURSES_WRAPPED_VAR(int, TABSIZE);
-++
-++#define curscr      NCURSES_PUBLIC_VAR(curscr())
-++#define newscr      NCURSES_PUBLIC_VAR(newscr())
-++#define stdscr      NCURSES_PUBLIC_VAR(stdscr())
-++#define ttytype     NCURSES_PUBLIC_VAR(ttytype())
-++#define COLORS      NCURSES_PUBLIC_VAR(COLORS())
-++#define COLOR_PAIRS NCURSES_PUBLIC_VAR(COLOR_PAIRS())
-++#define COLS        NCURSES_PUBLIC_VAR(COLS())
-++#define ESCDELAY    NCURSES_PUBLIC_VAR(ESCDELAY())
-++#define LINES       NCURSES_PUBLIC_VAR(LINES())
-++#define TABSIZE     NCURSES_PUBLIC_VAR(TABSIZE())
-++
-++#else
-++
-++extern NCURSES_EXPORT_VAR(WINDOW *) curscr;
-++extern NCURSES_EXPORT_VAR(WINDOW *) newscr;
-++extern NCURSES_EXPORT_VAR(WINDOW *) stdscr;
-++extern NCURSES_EXPORT_VAR(char) ttytype[];
-++extern NCURSES_EXPORT_VAR(int) COLORS;
-++extern NCURSES_EXPORT_VAR(int) COLOR_PAIRS;
-++extern NCURSES_EXPORT_VAR(int) COLS;
-++extern NCURSES_EXPORT_VAR(int) ESCDELAY;
-++extern NCURSES_EXPORT_VAR(int) LINES;
-++extern NCURSES_EXPORT_VAR(int) TABSIZE;
-++
-++#endif
-++
-++/*
-+  * Pseudo-character tokens outside ASCII range.  The curses wgetch() function
-+  * will return any given one of these only if the corresponding k- capability
-+  * is defined in your terminal's terminfo entry.
-+Index: include/curses.tail
-+Prereq:  1.14 
-+--- ncurses-5.6/include/curses.tail	2006-05-27 16:28:29.000000000 +0000
-++++ ncurses-5.6-20071201/include/curses.tail	2007-03-10 17:51:24.000000000 +0000
-+@@ -1,8 +1,9 @@
-++/* $Id: curses.tail,v 1.15 2007/03/10 17:51:24 tom Exp $ */
-+ /*
-++ * vile:cmode:
-+  * This file is part of ncurses, designed to be appended after curses.h.in
-+  * (see that file for the relevant copyright).
-+  */
-+-/* $Id: curses.tail,v 1.14 2006/05/27 16:28:29 tom Exp $ */
-+ 
-+ /* mouse interface */
-+ 
-+Index: include/curses.wide
-+Prereq:  1.32 
-+--- ncurses-5.6/include/curses.wide	2006-05-27 19:44:23.000000000 +0000
-++++ ncurses-5.6-20071201/include/curses.wide	2007-03-10 17:52:23.000000000 +0000
-+@@ -1,11 +1,11 @@
-++/* $Id: curses.wide,v 1.34 2007/03/10 17:52:23 tom Exp $ */
-+ /*
-++ * vile:cmode:
-+  * This file is part of ncurses, designed to be appended after curses.h.in
-+  * (see that file for the relevant copyright).
-+  */
-+ #ifdef _XOPEN_SOURCE_EXTENDED
-+ 
-+-/* $Id: curses.wide,v 1.32 2006/05/27 19:44:23 tom Exp $ */
-+-
-+ extern NCURSES_EXPORT_VAR(cchar_t *) _nc_wacs;
-+ 
-+ #define NCURSES_WACS(c)	(&_nc_wacs[(unsigned char)c])
-+@@ -197,10 +197,13 @@
-+ #define wadd_wchstr(win,str)		wadd_wchnstr(win,str,-1)
-+ #define waddwstr(win,wstr)		waddnwstr(win,wstr,-1)
-+ #define wget_wstr(w,t)			wgetn_wstr(w,t,-1)
-+-#define wgetbkgrnd(win,wch)		(*wch = win->_bkgrnd, OK)
-+ #define win_wchstr(w,c)			win_wchnstr(w,c,-1)
-+ #define wins_wstr(w,t)			wins_nwstr(w,t,-1)
-+ 
-++#if !NCURSES_OPAQUE
-++#define wgetbkgrnd(win,wch)		(*wch = win->_bkgrnd, OK)
-++#endif
-++
-+ #define mvadd_wch(y,x,c)		mvwadd_wch(stdscr,y,x,c)
-+ #define mvadd_wchnstr(y,x,s,n)		mvwadd_wchnstr(stdscr,y,x,s,n)
-+ #define mvadd_wchstr(y,x,s)		mvwadd_wchstr(stdscr,y,x,s)
-+Index: include/headers
-+--- ncurses-5.6/include/headers	2001-04-07 20:52:04.000000000 +0000
-++++ ncurses-5.6-20071201/include/headers	2007-01-20 19:57:04.000000000 +0000
-+@@ -1,5 +1,6 @@
-++# $Id: headers,v 1.9 2007/01/20 19:57:04 Miroslav.Lichvar Exp $
-+ ##############################################################################
-+-# Copyright (c) 1998,2000,2001 Free Software Foundation, Inc.                #
-++# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -26,10 +27,16 @@
-+ # authorization.                                                             #
-+ ##############################################################################
-+ #
-+-# Author: Thomas E. Dickey <dickey@clark.net> 1996
-++# Author: Thomas E. Dickey	1996-on
-+ #
-+ term.h
-+ curses.h
-+ unctrl.h
-+ termcap.h
-+ $(srcdir)/ncurses_dll.h
-++@ ticlib
-++$(srcdir)/tic.h
-++$(srcdir)/term_entry.h
-++$(srcdir)/nc_tparm.h
-++
-++# vile:makemode
-+Index: include/nc_alloc.h
-+Prereq:  1.13 
-+--- ncurses-5.6/include/nc_alloc.h	2005-01-16 00:27:35.000000000 +0000
-++++ ncurses-5.6-20071201/include/nc_alloc.h	2007-02-03 18:40:23.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -29,7 +29,7 @@
-+ /****************************************************************************
-+  *  Author: Thomas E. Dickey <dickey@clark.net> 1996,1997                   *
-+  ****************************************************************************/
-+-/* $Id: nc_alloc.h,v 1.13 2005/01/16 00:27:35 tom Exp $ */
-++/* $Id: nc_alloc.h,v 1.15 2007/02/03 18:40:23 tom Exp $ */
-+ 
-+ #ifndef NC_ALLOC_included
-+ #define NC_ALLOC_included 1
-+@@ -67,8 +67,11 @@
-+ #define HAVE_NC_FREEALL 1
-+ struct termtype;
-+ extern NCURSES_EXPORT(void) _nc_free_and_exit(int) GCC_NORETURN;
-++extern NCURSES_EXPORT(void) _nc_free_tinfo(int) GCC_NORETURN;
-++extern NCURSES_EXPORT(void) _nc_free_tic(int) GCC_NORETURN;
-+ extern NCURSES_EXPORT(void) _nc_free_tparm(void);
-+ extern NCURSES_EXPORT(void) _nc_leaks_dump_entry(void);
-++extern NCURSES_EXPORT(void) _nc_leaks_tic(void);
-+ #define ExitProgram(code) _nc_free_and_exit(code)
-+ #endif
-+ 
-+@@ -87,6 +90,9 @@
-+ extern NCURSES_EXPORT(char *) _nc_strdup(const char *);
-+ #endif
-+ 
-++/* entries.c */
-++extern NCURSES_EXPORT(void) _nc_leaks_tinfo(void);
-++
-+ #define typeMalloc(type,elts) (type *)malloc((elts)*sizeof(type))
-+ #define typeCalloc(type,elts) (type *)calloc((elts),sizeof(type))
-+ #define typeRealloc(type,elts,ptr) (type *)_nc_doalloc(ptr, (elts)*sizeof(type))
-+Index: include/ncurses_defs
-+Prereq:  1.30 
-+--- ncurses-5.6/include/ncurses_defs	2006-08-05 19:27:02.000000000 +0000
-++++ ncurses-5.6-20071201/include/ncurses_defs	2007-10-06 21:18:16.000000000 +0000
-+@@ -1,6 +1,6 @@
-+-# $Id: ncurses_defs,v 1.30 2006/08/05 19:27:02 tom Exp $
-++# $Id: ncurses_defs,v 1.35 2007/10/06 21:18:16 tom Exp $
-+ ##############################################################################
-+-# Copyright (c) 2000-2005,2006 Free Software Foundation, Inc.                #
-++# Copyright (c) 2000-2006,2007 Free Software Foundation, Inc.                #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -33,10 +33,8 @@
-+ 
-+ BROKEN_LINKER
-+ BSD_TPUTS
-+-CC_HAS_INLINE_FUNCS
-+ CC_HAS_PROTOS
-+ CPP_HAS_PARAM_INIT
-+-CPP_HAS_VSCAN_FUNC
-+ CURSES_ACS_ARRAY	acs_map
-+ CURSES_WACS_ARRAY	_nc_wacs
-+ DECL_ERRNO
-+@@ -68,6 +66,7 @@
-+ HAVE_GPP_BUILTIN_H
-+ HAVE_GXX_BUILTIN_H
-+ HAVE_HAS_KEY
-++HAVE_IOSTREAM
-+ HAVE_ISASCII
-+ HAVE_ISSETUGID
-+ HAVE_LANGINFO_CODESET
-+@@ -159,6 +158,7 @@
-+ HAVE_WRESIZE
-+ HAVE__DOSCAN
-+ MIXEDCASE_FILENAMES
-++NCURSES_CHAR_EQ
-+ NCURSES_EXPANDED
-+ NCURSES_EXT_COLORS
-+ NCURSES_EXT_FUNCS
-+@@ -189,12 +189,10 @@
-+ USE_MY_MEMMOVE
-+ USE_OK_BCOPY
-+ USE_RCS_IDS
-++USE_REENTRANT
-+ USE_SAFE_SPRINTF
-+ USE_SCROLL_HINTS
-+ USE_SIGWINCH
-+-USE_STDIO_VSCAN
-+-USE_STRSTREAM_VSCAN
-+-USE_STRSTREAM_VSCAN_CAST
-+ USE_SYMLINKS
-+ USE_SYSMOUSE
-+ USE_TERMCAP
-+Index: include/ncurses_dll.h
-+Prereq:  1.5 
-+--- ncurses-5.6/include/ncurses_dll.h	2006-04-22 22:07:51.000000000 +0000
-++++ ncurses-5.6-20071201/include/ncurses_dll.h	2007-03-10 19:21:49.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -25,7 +25,7 @@
-+  * sale, use or other dealings in this Software without prior written       *
-+  * authorization.                                                           *
-+  ****************************************************************************/
-+-/* $Id: ncurses_dll.h,v 1.5 2006/04/22 22:07:51 tom Exp $ */
-++/* $Id: ncurses_dll.h,v 1.6 2007/03/10 19:21:49 tom Exp $ */
-+ 
-+ #ifndef NCURSES_DLL_H_incl
-+ #define NCURSES_DLL_H_incl 1
-+@@ -76,4 +76,11 @@
-+ #  define NCURSES_EXPORT_VAR(type) NCURSES_IMPEXP type
-+ #endif
-+ 
-++/*
-++ * For reentrant code, we map the various global variables into SCREEN by
-++ * using functions to access them.
-++ */
-++#define NCURSES_PUBLIC_VAR(name) _nc_##name
-++#define NCURSES_WRAPPED_VAR(type,name) extern type NCURSES_PUBLIC_VAR(name)(void)
-++
-+ #endif /* NCURSES_DLL_H_incl */
-+Index: include/tic.h
-+Prereq:  1.55 
-+--- ncurses-5.6/include/tic.h	2006-08-19 14:17:49.000000000 +0000
-++++ ncurses-5.6-20071201/include/tic.h	2007-08-11 16:12:43.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -33,7 +33,7 @@
-+  ****************************************************************************/
-+ 
-+ /*
-+- * $Id: tic.h,v 1.55 2006/08/19 14:17:49 tom Exp $
-++ * $Id: tic.h,v 1.62 2007/08/11 16:12:43 tom Exp $
-+  *	tic.h - Global variables and structures for the terminfo
-+  *			compiler.
-+  */
-+@@ -164,16 +164,6 @@
-+ extern NCURSES_EXPORT_VAR(struct token)	_nc_curr_token;
-+ 
-+ 	/*
-+-	 * List of keynames with their corresponding code.
-+-	 */
-+-struct kn {
-+-	const char *name;
-+-	int code;
-+-};
-+-
-+-extern NCURSES_EXPORT_VAR(const struct kn) _nc_key_names[];
-+-
-+-	/*
-+ 	 * Offsets to string capabilities, with the corresponding functionkey
-+ 	 * codes.
-+ 	 */
-+@@ -185,11 +175,11 @@
-+ #if	BROKEN_LINKER
-+ 
-+ #define	_nc_tinfo_fkeys	_nc_tinfo_fkeysf()
-+-extern NCURSES_EXPORT(struct tinfo_fkeys *) _nc_tinfo_fkeysf (void);
-++extern NCURSES_EXPORT(const struct tinfo_fkeys *) _nc_tinfo_fkeysf (void);
-+ 
-+ #else
-+ 
-+-extern NCURSES_EXPORT_VAR(struct tinfo_fkeys) _nc_tinfo_fkeys[];
-++extern NCURSES_EXPORT_VAR(const struct tinfo_fkeys) _nc_tinfo_fkeys[];
-+ 
-+ #endif
-+ 
-+@@ -214,14 +204,9 @@
-+ 	const char	*source;
-+ };
-+ 
-+-extern NCURSES_EXPORT_VAR(const struct name_table_entry * const) _nc_info_hash_table[];
-+-extern NCURSES_EXPORT_VAR(const struct name_table_entry * const) _nc_cap_hash_table[];
-+-
-+-extern NCURSES_EXPORT_VAR(const struct alias) _nc_capalias_table[];
-+-extern NCURSES_EXPORT_VAR(const struct alias) _nc_infoalias_table[];
-+-
-+ extern NCURSES_EXPORT(const struct name_table_entry *) _nc_get_table (bool);
-+-extern NCURSES_EXPORT(const struct name_table_entry * const *) _nc_get_hash_table (bool);
-++extern NCURSES_EXPORT(const short *) _nc_get_hash_table (bool);
-++extern NCURSES_EXPORT(const struct alias *) _nc_get_alias_table (bool);
-+ 
-+ #define NOTFOUND	((struct name_table_entry *) 0)
-+ 
-+@@ -259,7 +244,7 @@
-+ 
-+ /* comp_hash.c: name lookup */
-+ extern NCURSES_EXPORT(struct name_table_entry const *) _nc_find_entry
-+-	(const char *, const struct name_table_entry *const *);
-++	(const char *, const short *);
-+ extern NCURSES_EXPORT(struct name_table_entry const *) _nc_find_type_entry
-+ 	(const char *, int, const struct name_table_entry *);
-+ 
-+Index: install-sh
-+--- ncurses-5.6/install-sh	2001-06-22 14:37:33.000000000 +0000
-++++ ncurses-5.6-20071201/install-sh	2003-11-29 21:30:21.000000000 +0000
-+@@ -1,19 +1,37 @@
-+ #! /bin/sh
-+ #
-+ # install - install a program, script, or datafile
-+-# This comes from X11R5 (mit/util/scripts/install.sh).
-+ #
-+-# Copyright 1991 by the Massachusetts Institute of Technology
-++# This originates from X11R5 (mit/util/scripts/install.sh), which was
-++# later released in X11R6 (xc/config/util/install.sh) with the
-++# following copyright and license.
-+ #
-+-# Permission to use, copy, modify, distribute, and sell this software and its
-+-# documentation for any purpose is hereby granted without fee, provided that
-+-# the above copyright notice appear in all copies and that both that
-+-# copyright notice and this permission notice appear in supporting
-+-# documentation, and that the name of M.I.T. not be used in advertising or
-+-# publicity pertaining to distribution of the software without specific,
-+-# written prior permission.  M.I.T. makes no representations about the
-+-# suitability of this software for any purpose.  It is provided "as is"
-+-# without express or implied warranty.
-++# Copyright (C) 1994 X Consortium
-++#
-++# Permission is hereby granted, free of charge, to any person obtaining a copy
-++# of this software and associated documentation files (the "Software"), to
-++# deal in the Software without restriction, including without limitation the
-++# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-++# sell copies of the Software, and to permit persons to whom the Software is
-++# furnished to do so, subject to the following conditions:
-++#
-++# The above copyright notice and this permission notice shall be included in
-++# all copies or substantial portions of the Software.
-++#
-++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-++# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-++# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-++# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-++#
-++# Except as contained in this notice, the name of the X Consortium shall not
-++# be used in advertising or otherwise to promote the sale, use or other deal-
-++# ings in this Software without prior written authorization from the X Consor-
-++# tium.
-++#
-++#
-++# FSF changes to this file are in the public domain.
-+ #
-+ # Calling this script install-sh is preferred over install.sh, to prevent
-+ # `make' implicit rules from creating a file called install from it
-+@@ -56,7 +74,7 @@
-+ 
-+ while [ x"$1" != x ]; do
-+     case $1 in
-+-	-c) instcmd="$cpprog"
-++	-c) instcmd=$cpprog
-+ 	    shift
-+ 	    continue;;
-+ 
-+@@ -79,7 +97,7 @@
-+ 	    shift
-+ 	    continue;;
-+ 
-+-	-s) stripcmd="$stripprog"
-++	-s) stripcmd=$stripprog
-+ 	    shift
-+ 	    continue;;
-+ 
-+@@ -106,7 +124,7 @@
-+ 
-+ if [ x"$src" = x ]
-+ then
-+-	echo "install:	no input file specified"
-++	echo "$0: no input file specified" >&2
-+ 	exit 1
-+ else
-+ 	:
-+@@ -116,7 +134,7 @@
-+ 	dst=$src
-+ 	src=""
-+ 
-+-	if [ -d $dst ]; then
-++	if [ -d "$dst" ]; then
-+ 		instcmd=:
-+ 		chmodcmd=""
-+ 	else
-+@@ -128,17 +146,17 @@
-+ # might cause directories to be created, which would be especially bad
-+ # if $src (and thus $dsttmp) contains '*'.
-+ 
-+-	if [ -f $src -o -d $src ]
-++	if [ -f "$src" ] || [ -d "$src" ]
-+ 	then
-+ 		:
-+ 	else
-+-		echo "install:  $src does not exist"
-++		echo "$0: $src does not exist" >&2
-+ 		exit 1
-+ 	fi
-+ 
-+ 	if [ x"$dst" = x ]
-+ 	then
-+-		echo "install:	no destination specified"
-++		echo "$0: no destination specified" >&2
-+ 		exit 1
-+ 	else
-+ 		:
-+@@ -147,16 +165,16 @@
-+ # If destination is a directory, append the input filename; if your system
-+ # does not like double slashes in filenames, you may need to add some logic
-+ 
-+-	if [ -d $dst ]
-++	if [ -d "$dst" ]
-+ 	then
-+-		dst="$dst"/`basename $src`
-++		dst=$dst/`basename "$src"`
-+ 	else
-+ 		:
-+ 	fi
-+ fi
-+ 
-+ ## this sed command emulates the dirname command
-+-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-++dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-+ 
-+ # Make sure that the destination directory exists.
-+ #  this part is taken from Noah Friedman's mkinstalldirs script
-+@@ -165,48 +183,48 @@
-+ if [ ! -d "$dstdir" ]; then
-+ defaultIFS='
-+ 	'
-+-IFS="${IFS-${defaultIFS}}"
-++IFS="${IFS-$defaultIFS}"
-+ 
-+-oIFS="${IFS}"
-++oIFS=$IFS
-+ # Some sh's can't handle IFS=/ for some reason.
-+ IFS='%'
-+-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-+-IFS="${oIFS}"
-++set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-++IFS=$oIFS
-+ 
-+ pathcomp=''
-+ 
-+ while [ $# -ne 0 ] ; do
-+-	pathcomp="${pathcomp}${1}"
-++	pathcomp=$pathcomp$1
-+ 	shift
-+ 
-+-	if [ ! -d "${pathcomp}" ] ;
-++	if [ ! -d "$pathcomp" ] ;
-+         then
-+-		$mkdirprog "${pathcomp}"
-++		$mkdirprog "$pathcomp"
-+ 	else
-+ 		:
-+ 	fi
-+ 
-+-	pathcomp="${pathcomp}/"
-++	pathcomp=$pathcomp/
-+ done
-+ fi
-+ 
-+ if [ x"$dir_arg" != x ]
-+ then
-+-	$doit $instcmd $dst &&
-++	$doit $instcmd "$dst" &&
-+ 
-+-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
-+-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
-+-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
-+-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
-++	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
-++	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
-++	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
-++	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
-+ else
-+ 
-+ # If we're going to rename the final executable, determine the name now.
-+ 
-+ 	if [ x"$transformarg" = x ]
-+ 	then
-+-		dstfile=`basename $dst`
-++		dstfile=`basename "$dst"`
-+ 	else
-+-		dstfile=`basename $dst $transformbasename |
-++		dstfile=`basename "$dst" $transformbasename |
-+ 			sed $transformarg`$transformbasename
-+ 	fi
-+ 
-+@@ -214,20 +232,24 @@
-+ 
-+ 	if [ x"$dstfile" = x ]
-+ 	then
-+-		dstfile=`basename $dst`
-++		dstfile=`basename "$dst"`
-+ 	else
-+ 		:
-+ 	fi
-+ 
-+-# Make a temp file name in the proper directory.
-++# Make a couple of temp file names in the proper directory.
-+ 
-+ 	dsttmp=$dstdir/#inst.$$#
-++	rmtmp=$dstdir/#rm.$$#
-+ 
-+-# Move or copy the file name to the temp name
-++# Trap to clean up temp files at exit.
-+ 
-+-	$doit $instcmd $src $dsttmp &&
-++	trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
-++	trap '(exit $?); exit' 1 2 13 15
-+ 
-+-	trap "rm -f ${dsttmp}" 0 &&
-++# Move or copy the file name to the temp name
-++
-++	$doit $instcmd "$src" "$dsttmp" &&
-+ 
-+ # and set any options; do chmod last to preserve setuid bits
-+ 
-+@@ -235,17 +257,38 @@
-+ # ignore errors from any of these, just make sure not to ignore
-+ # errors from the above "$doit $instcmd $src $dsttmp" command.
-+ 
-+-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
-+-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
-+-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
-+-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&
-++	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
-++	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
-++	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
-++	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
-++
-++# Now remove or move aside any old file at destination location.  We try this
-++# two ways since rm can't unlink itself on some systems and the destination
-++# file might be busy for other reasons.  In this case, the final cleanup
-++# might fail but the new file should still install successfully.
-++
-++{
-++	if [ -f "$dstdir/$dstfile" ]
-++	then
-++		$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
-++		$doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
-++		{
-++		  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-++		  (exit 1); exit
-++		}
-++	else
-++		:
-++	fi
-++} &&
-+ 
-+ # Now rename the file to the real destination.
-+ 
-+-	$doit $rmcmd -f $dstdir/$dstfile &&
-+-	$doit $mvcmd $dsttmp $dstdir/$dstfile
-++	$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-+ 
-+ fi &&
-+ 
-++# The final little trick to "correctly" pass the exit status to the exit trap.
-+ 
-+-exit 0
-++{
-++	(exit 0); exit
-++}
-+Index: man/Makefile.in
-+Prereq:  1.39 
-+--- ncurses-5.6/man/Makefile.in	2005-07-16 17:26:45.000000000 +0000
-++++ ncurses-5.6-20071201/man/Makefile.in	2007-03-31 15:54:06.000000000 +0000
-+@@ -1,6 +1,6 @@
-+-# $Id: Makefile.in,v 1.39 2005/07/16 17:26:45 tom Exp $
-++# $Id: Makefile.in,v 1.41 2007/03/31 15:54:06 tom Exp $
-+ ##############################################################################
-+-# Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.                #
-++# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -52,7 +52,7 @@
-+ tags :
-+ 
-+ $(DESTDIR)$(mandir) :
-+-	sh $(srcdir)/../mkinstalldirs $@
-++	sh $(srcdir)/../mkdirs.sh $@
-+ 
-+ EDITARGS = $(DESTDIR)$(mandir) $(srcdir) terminfo.5 $(srcdir)/*.[0-9]*
-+ 
-+@@ -77,4 +77,4 @@
-+ 	sh $(srcdir)/make_sed.sh @MANPAGE_RENAMES@ >../edit_man.sed
-+ 
-+ distclean realclean: clean
-+-	rm -f Makefile ../edit_man.*
-++	rm -f Makefile ../edit_man.* ../man_alias.*
-+Index: man/captoinfo.1m
-+Prereq:  1.20 
-+--- ncurses-5.6/man/captoinfo.1m	2006-05-13 15:14:01.000000000 +0000
-++++ ncurses-5.6-20071201/man/captoinfo.1m	2007-06-02 20:40:07.000000000 +0000
-+@@ -1,6 +1,6 @@
-+ '\" t
-+ .\"***************************************************************************
-+-.\" Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.              *
-++.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+ .\"                                                                          *
-+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
-+ .\" copy of this software and associated documentation files (the            *
-+@@ -27,16 +27,16 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: captoinfo.1m,v 1.20 2006/05/13 15:14:01 tom Exp $
-+-.TH captoinfo 1M ""
-++.\" $Id: captoinfo.1m,v 1.22 2007/06/02 20:40:07 tom Exp $
-++.TH @CAPTOINFO@ 1M ""
-+ .ds n 5
-+ .ds d @TERMINFO@
-+ .SH NAME
-+-\fBcaptoinfo\fR - convert a \fItermcap\fR description into a \fIterminfo\fR description
-++\fB@CAPTOINFO@\fR - convert a \fItermcap\fR description into a \fIterminfo\fR description
-+ .SH SYNOPSIS
-+-\fBcaptoinfo\fR [\fB-v\fR\fIn\fR \fIwidth\fR]  [\fB-V\fR] [\fB-1\fR] [\fB-w\fR \fIwidth\fR] \fIfile\fR . . .
-++\fB@CAPTOINFO@\fR [\fB-v\fR\fIn\fR \fIwidth\fR]  [\fB-V\fR] [\fB-1\fR] [\fB-w\fR \fIwidth\fR] \fIfile\fR . . .
-+ .SH DESCRIPTION
-+-\fBcaptoinfo\fR looks in \fIfile\fR for \fBtermcap\fR descriptions.  For each
-++\fB@CAPTOINFO@\fR looks in \fIfile\fR for \fBtermcap\fR descriptions.  For each
-+ one found, an equivalent \fBterminfo\fR description is written to standard
-+ output.  Termcap \fBtc\fR capabilities are translated directly to terminfo
-+ \fBuse\fR capabilities.
-+@@ -67,7 +67,7 @@
-+ .SH TRANSLATIONS FROM NONSTANDARD CAPABILITIES
-+ .PP
-+ Some obsolete nonstandard capabilities will automatically be translated
-+-into standard (SVr4/XSI Curses) terminfo capabilities by \fBcaptoinfo\fR.
-++into standard (SVr4/XSI Curses) terminfo capabilities by \fB@CAPTOINFO@\fR.
-+ Whenever one of these automatic translations is done, the program
-+ will issue an notification to stderr, inviting the user to check that
-+ it has not mistakenly translated a completely unknown and random
-+@@ -145,7 +145,7 @@
-+ .TE
-+ .PP
-+ If the single-line capabilities occur in an entry, they will automatically
-+-be composed into an \fBacsc\fR string.  The double-line capabilities and
-++be composed into an \fIacsc\fR string.  The double-line capabilities and
-+ \fBGG\fR are discarded with a warning message.
-+ .PP
-+ IBM's AIX has a terminfo facility descended from SVr1 terminfo but incompatible
-+@@ -164,17 +164,17 @@
-+ font3	s3ds
-+ .TE
-+ .PP
-+-Additionally, the AIX \fBbox1\fR capability will be automatically translated to
-+-an \fBacsc\fR string.
-++Additionally, the AIX \fIbox1\fR capability will be automatically translated to
-++an \fIacsc\fR string.
-+ .PP
-+ Hewlett-Packard's terminfo library supports two nonstandard terminfo
-+-capabilities \fBmeml\fR (memory lock) and \fBmemu\fR (memory unlock).
-++capabilities \fImeml\fR (memory lock) and \fImemu\fR (memory unlock).
-+ These will be discarded with a warning message.
-+ .SH NOTES
-+-This utility is actually a link to \fItic\fR(1M), running in \fI-I\fR mode.
-+-You can use other \fItic\fR options such as \fB-f\fR and  \fB-x\fR.
-++This utility is actually a link to \fB@TIC@\fR(1M), running in \fI-I\fR mode.
-++You can use other \fB@TIC@\fR options such as \fB-f\fR and  \fB-x\fR.
-+ .PP
-+-The trace option isn't identical to SVr4's.  Under SVr4, instead of following
-++The trace option is not identical to SVr4's.  Under SVr4, instead of following
-+ the \fB-v\fR with a trace level n, you repeat it n times.
-+ .SH SEE ALSO
-+ \fB@INFOCMP@\fR(1M),
-+Index: man/clear.1
-+Prereq:  1.5 
-+--- ncurses-5.6/man/clear.1	2006-07-01 21:55:09.000000000 +0000
-++++ ncurses-5.6-20071201/man/clear.1	2006-12-24 18:07:53.000000000 +0000
-+@@ -26,20 +26,20 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: clear.1,v 1.5 2006/07/01 21:55:09 tom Exp $
-+-.TH clear 1 ""
-++.\" $Id: clear.1,v 1.6 2006/12/24 18:07:53 tom Exp $
-++.TH @CLEAR@ 1 ""
-+ .ds n 5
-+ .SH NAME
-+-\fBclear\fR - clear the terminal screen
-++\fB@CLEAR@\fR - clear the terminal screen
-+ .SH SYNOPSIS
-+-\fBclear\fR
-++\fB@CLEAR@\fR
-+ .br
-+ .SH DESCRIPTION
-+-\fBclear\fR clears your screen if this is possible.  It looks in the
-++\fB@CLEAR@\fR clears your screen if this is possible.  It looks in the
-+ environment for the terminal type and then in the \fBterminfo\fR database to
-+ figure out how to clear the screen.
-+ .PP
-+-\fBclear\fR ignores any command-line parameters that may be present.
-++\fB@CLEAR@\fR ignores any command-line parameters that may be present.
-+ .SH SEE ALSO
-+ \fB@TPUT@\fR(1), \fBterminfo\fR(\*n)
-+ .PP
-+Index: man/curs_add_wch.3x
-+Prereq:  1.5 
-+--- ncurses-5.6/man/curs_add_wch.3x	2006-12-02 17:02:35.000000000 +0000
-++++ ncurses-5.6-20071201/man/curs_add_wch.3x	2006-12-24 15:22:22.000000000 +0000
-+@@ -26,7 +26,7 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: curs_add_wch.3x,v 1.5 2006/12/02 17:02:35 tom Exp $
-++.\" $Id: curs_add_wch.3x,v 1.6 2006/12/24 15:22:22 tom Exp $
-+ .TH curs_add_wch 3X ""
-+ .SH NAME
-+ \fBadd_wch\fP,
-+@@ -82,7 +82,7 @@
-+ -
-+ If the character part of \fIwch\fP is
-+ a tab, newline, backspace or other control character,
-+-the window is updated and the cursor moves as if \fBaddch\fR(3X) were called.
-++the window is updated and the cursor moves as if \fBaddch\fR were called.
-+ .PP
-+ The \fBecho_wchar\fP
-+ function is functionally equivalent to a call to
-+@@ -122,7 +122,7 @@
-+ .PP
-+ \fBcurses\fR(3X),
-+ \fBcurs_addch\fR(3X),
-+-\fBcurs_attr_get\fR(3X),
-++\fBcurs_attr\fR(3X),
-+ \fBcurs_clear\fR(3X),
-+ \fBcurs_outopts\fR(3X),
-+ \fBcurs_refresh\fR(3X),
-+Index: man/curs_addch.3x
-+Prereq:  1.25 
-+--- ncurses-5.6/man/curs_addch.3x	2006-12-02 17:02:22.000000000 +0000
-++++ ncurses-5.6-20071201/man/curs_addch.3x	2007-06-02 20:40:07.000000000 +0000
-+@@ -1,6 +1,6 @@
-+ '\" t
-+ .\"***************************************************************************
-+-.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+ .\"                                                                          *
-+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
-+ .\" copy of this software and associated documentation files (the            *
-+@@ -27,7 +27,7 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: curs_addch.3x,v 1.25 2006/12/02 17:02:22 tom Exp $
-++.\" $Id: curs_addch.3x,v 1.27 2007/06/02 20:40:07 tom Exp $
-+ .TH curs_addch 3X ""
-+ .SH NAME
-+ \fBaddch\fR, \fBwaddch\fR, \fBmvaddch\fR, \fBmvwaddch\fR,
-+@@ -87,7 +87,7 @@
-+ .SS Line Graphics
-+ The following variables may be used to add line drawing characters to the
-+ screen with routines of the \fBaddch\fR family.  The default character listed
-+-below is used if the \fBacsc\fR capability doesn't define a terminal-specific
-++below is used if the \fBacsc\fR capability does not define a terminal-specific
-+ replacement for it.
-+ The names are taken from VT100 nomenclature.
-+ .PP
-+@@ -168,7 +168,7 @@
-+ \fBcurs_inch\fR(3X),
-+ \fBcurs_outopts\fR(3X),
-+ \fBcurs_refresh\fR(3X),
-+-\fBputc\fR(3S).
-++\fBputc\fR(3).
-+ .PP
-+ Comparable functions in the wide-character (ncursesw) library are
-+ described in
-+Index: man/curs_attr.3x
-+Prereq:  1.30 
-+--- ncurses-5.6/man/curs_attr.3x	2006-07-15 18:39:05.000000000 +0000
-++++ ncurses-5.6-20071201/man/curs_attr.3x	2007-03-17 20:30:33.000000000 +0000
-+@@ -1,6 +1,6 @@
-+ '\" t
-+ .\"***************************************************************************
-+-.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+ .\"                                                                          *
-+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
-+ .\" copy of this software and associated documentation files (the            *
-+@@ -27,7 +27,7 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: curs_attr.3x,v 1.30 2006/07/15 18:39:05 tom Exp $
-++.\" $Id: curs_attr.3x,v 1.31 2007/03/17 20:30:33 tom Exp $
-+ .TH curs_attr 3X ""
-+ .na
-+ .hy 0
-+@@ -253,6 +253,9 @@
-+ if the window pointer is null.
-+ The \fBwcolor_set\fP function returns an error if the color pair parameter
-+ is outside the range 0..COLOR_PAIRS-1.
-++This implementation also provides
-++\fBgetattrs\fR
-++for compatibility with older versions of curses.
-+ .SH SEE ALSO
-+ \fBcurses\fR(3X),
-+ \fBcurs_addch\fR(3X),
-+Index: man/curs_border.3x
-+Prereq:  1.18 
-+--- ncurses-5.6/man/curs_border.3x	2006-02-25 21:49:19.000000000 +0000
-++++ ncurses-5.6-20071201/man/curs_border.3x	2007-02-24 16:15:38.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ .\"***************************************************************************
-+-.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+ .\"                                                                          *
-+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
-+ .\" copy of this software and associated documentation files (the            *
-+@@ -26,7 +26,7 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: curs_border.3x,v 1.18 2006/02/25 21:49:19 tom Exp $
-++.\" $Id: curs_border.3x,v 1.19 2007/02/24 16:15:38 tom Exp $
-+ .TH curs_border 3X ""
-+ .na
-+ .hy 0
-+@@ -64,9 +64,9 @@
-+ .br
-+ \fBint wvline(WINDOW *win, chtype ch, int n);\fR
-+ .br
-+-\fBmvhline(int y, int x, chtype ch, int n);\fR
-++\fBint mvhline(int y, int x, chtype ch, int n);\fR
-+ .br
-+-\fBmvwhline(WINDOW *, int y, int x, chtype ch, int n);\fR
-++\fBint mvwhline(WINDOW *, int y, int x, chtype ch, int n);\fR
-+ .br
-+ \fBint mvvline(int y, int x, chtype ch, int n);\fR
-+ .br
-+Index: man/curs_deleteln.3x
-+Prereq:  1.10 
-+--- ncurses-5.6/man/curs_deleteln.3x	2006-02-25 21:49:19.000000000 +0000
-++++ ncurses-5.6-20071201/man/curs_deleteln.3x	2007-06-02 20:40:07.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ .\"***************************************************************************
-+-.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+ .\"                                                                          *
-+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
-+ .\" copy of this software and associated documentation files (the            *
-+@@ -26,7 +26,7 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: curs_deleteln.3x,v 1.10 2006/02/25 21:49:19 tom Exp $
-++.\" $Id: curs_deleteln.3x,v 1.11 2007/06/02 20:40:07 tom Exp $
-+ .TH curs_deleteln 3X ""
-+ .SH NAME
-+ \fBdeleteln\fR,
-+@@ -79,7 +79,7 @@
-+ Note that all but \fBwinsdelln\fR may be macros.
-+ .PP
-+ These routines do not require a hardware line delete or insert feature in the
-+-terminal.  In fact, they won't use hardware line delete/insert unless
-++terminal.  In fact, they will not use hardware line delete/insert unless
-+ \fBidlok(..., TRUE)\fR has been set on the current window.
-+ .SH SEE ALSO
-+ \fBcurses\fR(3X)
-+Index: man/curs_extend.3x
-+Prereq:  1.15 
-+--- ncurses-5.6/man/curs_extend.3x	2006-02-25 21:04:43.000000000 +0000
-++++ ncurses-5.6-20071201/man/curs_extend.3x	2006-12-24 18:01:48.000000000 +0000
-+@@ -28,7 +28,7 @@
-+ .\"
-+ .\" Author: Thomas E. Dickey 1999-on
-+ .\"
-+-.\" $Id: curs_extend.3x,v 1.15 2006/02/25 21:04:43 tom Exp $
-++.\" $Id: curs_extend.3x,v 1.17 2006/12/24 18:01:48 tom Exp $
-+ .TH curs_extend 3X ""
-+ .SH NAME
-+ \fBcurses_version\fP,
-+@@ -56,7 +56,7 @@
-+ which may be compiled into the terminfo
-+ description, i.e., via the terminfo or termcap interfaces.
-+ Normally these names are available for use, since the essential decision
-+-is made by using the \fB-x\fP option of \fItic\fP to compile
-++is made by using the \fB-x\fP option of \fB@TIC@\fP to compile
-+ extended terminal definitions.
-+ However you can disable this feature
-+ to ensure compatibility with other implementations of curses.
-+@@ -68,11 +68,11 @@
-+ \fBcurs_getch\fR(3X),
-+ \fBcurs_mouse\fR(3X),
-+ \fBcurs_print\fR(3X),
-++\fBcurs_util\fR(3X),
-+ \fBdefault_colors\fR(3X),
-+ \fBdefine_key\fR(3X),
-+ \fBkeybound\fR(3X),
-+ \fBkeyok\fR(3X),
-+-\fBnofilter\fR(3X),
-+ \fBresizeterm\fR(3X),
-+ \fBwresize\fR(3X).
-+ .SH AUTHOR
-+Index: man/curs_getcchar.3x
-+Prereq:  1.8 
-+--- ncurses-5.6/man/curs_getcchar.3x	2006-07-15 22:51:07.000000000 +0000
-++++ ncurses-5.6-20071201/man/curs_getcchar.3x	2006-12-24 16:00:02.000000000 +0000
-+@@ -26,7 +26,7 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: curs_getcchar.3x,v 1.8 2006/07/15 22:51:07 wcmbrine Exp $
-++.\" $Id: curs_getcchar.3x,v 1.10 2006/12/24 16:00:02 tom Exp $
-+ .TH curs_getcchar 3X ""
-+ .SH NAME
-+ \fBgetcchar\fP,
-+@@ -132,10 +132,10 @@
-+ .SH SEE ALSO
-+ .PP
-+ Functions:
-++\fBcurs_attr\fR(3X),
-++\fBcurs_color\fR(3X),
-+ \fBcurses\fR(3X),
-+-\fBwcwidth\fR(3X),
-+-\fBcurs_attr_get\fR(3X),
-+-\fBcan_change_color\fR(3X).
-++\fBwcwidth\fR(3).
-+ .\"#
-+ .\"# The following sets edit modes for GNU EMACS
-+ .\"# Local Variables:
-+Index: man/curs_getyx.3x
-+Prereq:  1.13 
-+--- ncurses-5.6/man/curs_getyx.3x	2006-05-27 20:28:05.000000000 +0000
-++++ ncurses-5.6-20071201/man/curs_getyx.3x	2007-05-12 16:34:49.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ .\"***************************************************************************
-+-.\" Copyright (c) 1998-2003,2006 Free Software Foundation, Inc.              *
-++.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+ .\"                                                                          *
-+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
-+ .\" copy of this software and associated documentation files (the            *
-+@@ -26,7 +26,7 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: curs_getyx.3x,v 1.13 2006/05/27 20:28:05 tom Exp $
-++.\" $Id: curs_getyx.3x,v 1.16 2007/05/12 16:34:49 tom Exp $
-+ .TH curs_getyx 3X ""
-+ .SH NAME
-+ \fBgetyx\fR,
-+@@ -69,7 +69,7 @@
-+ \fBgetmaxyx\fR
-+ macros are described in the XSI Curses standard, Issue 4.
-+ .PP
-+-This implementation also provides
-++This implementation also provides functions
-+ \fBgetbegx\fR,
-+ \fBgetbegy\fR,
-+ \fBgetcurx\fR,
-+@@ -79,10 +79,25 @@
-+ \fBgetparx\fR and
-+ \fBgetpary\fR
-+ for compatibility with older versions of curses.
-+-X/Open does not define a corresponding \fBgetcuryx\fP function,
-+-though that would be needed to make references to the WINDOW structure opaque.
-++.PP
-++Although X/Open Curses does not address this,
-++many implementations provide members of the WINDOW structure
-++containing values corresponding to these macros.
-++For best portability, do not rely on using the data in WINDOW,
-++since some implementations make WINDOW opaque (do not allow
-++direct use of its members).
-++.PP
-++Besides the problem of opaque structures,
-++the data stored in like-named members may not have like-values in
-++different implementations.
-++For example, the WINDOW._maxx and WINDOW._maxy values in ncurses
-++have (at least since release 1.8.1) differed by one from some
-++other implementations.
-++The difference is hidden by means of the macro \fBgetmaxyx\fP.
-+ .SH SEE ALSO
-+-\fBcurses\fR(3X)
-++\fBcurses\fR(3X),
-++\fBcurs_legacy\fR(3X),
-++\fBcurs_opaque\fR(3X)
-+ .\"#
-+ .\"# The following sets edit modes for GNU EMACS
-+ .\"# Local Variables:
-+Index: man/curs_insstr.3x
-+Prereq:  1.17 
-+--- ncurses-5.6/man/curs_insstr.3x	2006-02-25 21:49:19.000000000 +0000
-++++ ncurses-5.6-20071201/man/curs_insstr.3x	2006-12-24 14:59:30.000000000 +0000
-+@@ -26,7 +26,7 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: curs_insstr.3x,v 1.17 2006/02/25 21:49:19 tom Exp $
-++.\" $Id: curs_insstr.3x,v 1.18 2006/12/24 14:59:30 tom Exp $
-+ .TH curs_insstr 3X ""
-+ .SH NAME
-+ \fBinsstr\fR,
-+@@ -90,7 +90,7 @@
-+ Also, no implementation of curses documents this inconsistency.
-+ .SH SEE ALSO
-+ \fBcurses\fR(3X),
-+-\fBunctrl\fR(3X),
-++\fBcurs_util\fR(3X),
-+ \fBcurs_clear\fR(3X),
-+ \fBcurs_inch\fR(3X).
-+ .\"#
-+Index: man/curs_legacy.3x
-+--- /dev/null	2007-12-08 19:14:25.328509000 +0000
-++++ ncurses-5.6-20071201/man/curs_legacy.3x	2007-04-07 23:54:29.000000000 +0000
-+@@ -0,0 +1,93 @@
-++.\"***************************************************************************
-++.\" Copyright (c) 2007 Free Software Foundation, Inc.                        *
-++.\"                                                                          *
-++.\" Permission is hereby granted, free of charge, to any person obtaining a  *
-++.\" copy of this software and associated documentation files (the            *
-++.\" "Software"), to deal in the Software without restriction, including      *
-++.\" without limitation the rights to use, copy, modify, merge, publish,      *
-++.\" distribute, distribute with modifications, sublicense, and/or sell       *
-++.\" copies of the Software, and to permit persons to whom the Software is    *
-++.\" furnished to do so, subject to the following conditions:                 *
-++.\"                                                                          *
-++.\" The above copyright notice and this permission notice shall be included  *
-++.\" in all copies or substantial portions of the Software.                   *
-++.\"                                                                          *
-++.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-++.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-++.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-++.\" IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-++.\" DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-++.\" OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-++.\" THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-++.\"                                                                          *
-++.\" Except as contained in this notice, the name(s) of the above copyright   *
-++.\" holders shall not be used in advertising or otherwise to promote the     *
-++.\" sale, use or other dealings in this Software without prior written       *
-++.\" authorization.                                                           *
-++.\"***************************************************************************
-++.\"
-++.\" $Id: curs_legacy.3x,v 1.1 2007/04/07 23:54:29 tom Exp $
-++.TH curs_legacy 3X ""
-++.SH NAME
-++\fBgetbegx\fR,
-++\fBgetbegy\fR,
-++\fBgetcurx\fR,
-++\fBgetcury\fR,
-++\fBgetmaxx\fR,
-++\fBgetmaxy\fR,
-++\fBgetparx\fR,
-++\fBgetpary\fR - get \fBcurses\fR cursor and window coordinates
-++.SH SYNOPSIS
-++\fB#include <curses.h>\fR
-++.sp
-++\fBint getbegx(WINDOW *win);\fR
-++.br
-++\fBint getbegy(WINDOW *win);\fR
-++.br
-++\fBint getcurx(WINDOW *win);\fR
-++.br
-++\fBint getcury(WINDOW *win);\fR
-++.br
-++\fBint getmaxx(WINDOW *win);\fR
-++.br
-++\fBint getmaxy(WINDOW *win);\fR
-++.br
-++\fBint getparx(WINDOW *win);\fR
-++.br
-++\fBint getpary(WINDOW *win);\fR
-++.br
-++.SH DESCRIPTION
-++The \fBgetbegy\fR and \fBgetbegx\fR functions return the same
-++data as \fBgetbegyx\fR.
-++.PP
-++The \fBgetcury\fR and \fBgetcurx\fR functions return the same
-++data as \fBgetyx\fR.
-++.PP
-++The \fBgetmaxy\fR and \fBgetmaxx\fR functions return the same
-++data as \fBgetmaxyx\fR.
-++.PP
-++The \fBgetpary\fR and \fBgetparx\fR functions return the same
-++data as \fBgetparyx\fR.
-++.SH RETURN VALUE
-++These functions return an integer,
-++or ERR if the window parameter is null.
-++.SH NOTES
-++All of these interfaces are provided as macros and functions.
-++The macros are suppressed (and only the functions provided)
-++when \fBNCURSES_OPAQUE\fR is defined.
-++The standard forms such as \fBgetyx\fP must be implemented as macros,
-++and (in this implementation) are defined in terms of the functions
-++described here,
-++to avoid reliance on internal details of the WINDOW structure.
-++.SH PORTABILITY
-++These functions were supported on Version 7, BSD or System V implementations.
-++.SH SEE ALSO
-++\fBcurses\fR(3X),
-++\fBcurs_getyx\fR(3X),
-++\fBcurs_opaque\fR(3X)
-++.\"#
-++.\"# The following sets edit modes for GNU EMACS
-++.\"# Local Variables:
-++.\"# mode:nroff
-++.\"# fill-column:79
-++.\"# End:
-+Index: man/curs_mouse.3x
-+Prereq:  1.28 
-+--- ncurses-5.6/man/curs_mouse.3x	2005-05-15 16:18:19.000000000 +0000
-++++ ncurses-5.6-20071201/man/curs_mouse.3x	2006-12-30 23:43:34.000000000 +0000
-+@@ -1,6 +1,6 @@
-+ '\" t
-+ .\"***************************************************************************
-+-.\" Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
-++.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ .\"                                                                          *
-+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
-+ .\" copy of this software and associated documentation files (the            *
-+@@ -27,7 +27,7 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: curs_mouse.3x,v 1.28 2005/05/15 16:18:19 tom Exp $
-++.\" $Id: curs_mouse.3x,v 1.30 2006/12/30 23:43:34 tom Exp $
-+ .TH curs_mouse 3X ""
-+ .na
-+ .hy 0
-+@@ -158,22 +158,23 @@
-+ It is useful for determining what subset of
-+ the screen windows enclose the location of a mouse event.
-+ .PP
-+-The \fBwmouse_trafo\fR function transforms a given pair of coordinates from
-+-stdscr-relative coordinates to screen-relative coordinates or vice versa.
-++The \fBwmouse_trafo\fR function transforms a given pair of coordinates
-++from stdscr-relative coordinates
-++to coordinates relative to the given window or vice versa.
-+ Please remember, that stdscr-relative coordinates are not always identical
-+-to screen-relative coordinates due to the mechanism to reserve lines on top
-+-or bottom of the screen for other purposes (ripoff() call, see also slk_...
-+-functions).
-++to window-relative coordinates due to the mechanism to reserve lines on top
-++or bottom of the screen for other purposes
-++(see the \fBripoffline()\fP and \fBslk_init\fR calls, for example).
-+ If the parameter \fBto_screen\fR is \fBTRUE\fR, the pointers
-+-\fBpY, pX\fR must reference the coordinates of a location inside the window
-+-\fBwin\fR.
-+-They are converted to screen-relative coordinates and returned
-++\fBpY, pX\fR must reference the coordinates of a location
-++inside the window \fBwin\fR.
-++They are converted to window-relative coordinates and returned
-+ through the pointers.
-+ If the conversion was successful, the function returns \fBTRUE\fR.
-+ If one of the parameters was NULL or the location is
-+ not inside the window, \fBFALSE\fR is returned.
-+ If \fBto_screen\fR is
-+-\fBFALSE\fR, the pointers \fBpY, pX\fR must reference screen-relative
-++\fBFALSE\fR, the pointers \fBpY, pX\fR must reference window-relative
-+ coordinates.
-+ They are converted to stdscr-relative coordinates if the
-+ window \fBwin\fR encloses this point.
-+@@ -184,6 +185,10 @@
-+ are only replaced by the converted coordinates if the transformation was
-+ successful.
-+ .PP
-++The \fBmouse_trafo\fR function performs the same translation
-++as \fBwmouse_trafo\fR,
-++using stdscr for \fBwin\fR.
-++.PP
-+ The \fBmouseinterval\fR function sets the maximum time (in thousands of a
-+ second) that can elapse between press and release events for them to
-+ be recognized as a click.
-+@@ -259,7 +264,7 @@
-+ .RE
-+ If you are using an unsupported configuration,
-+ mouse events will not be visible to
-+-\fBncurses\fR(3X) (and the \fBwmousemask\fR function will always
-++\fBncurses\fR(3X) (and the \fBmousemask\fR function will always
-+ return \fB0\fR).
-+ .PP
-+ If the terminfo entry contains a \fBXM\fR string,
-+@@ -276,14 +281,17 @@
-+ 3D-mice/trackballs/power gloves.
-+ .SH BUGS
-+ Mouse events under xterm will not in fact be ignored during cooked mode,
-+-if they have been enabled by \fBwmousemask\fR.
-++if they have been enabled by \fBmousemask\fR.
-+ Instead, the xterm mouse
-+ report sequence will appear in the string read.
-+ .PP
-+ Mouse events under xterm will not be detected correctly in a window with
-+ its keypad bit off, since they are interpreted as a variety of function key.
-+-Your terminfo description must have \fBkmous\fR set to "\\E[M" (the beginning
-+-of the response from xterm for mouse clicks).
-++Your terminfo description should have \fBkmous\fR set to "\\E[M"
-++(the beginning of the response from xterm for mouse clicks).
-++Other values for \fBkmous\fR are permitted,
-++but under the same assumption,
-++i.e., it is the beginning of the response.
-+ .PP
-+ Because there are no standard terminal responses that would serve to identify
-+ terminals which support the xterm mouse protocol, \fBncurses\fR assumes that
-+@@ -291,7 +299,9 @@
-+ or \fBkmous\fR is defined in
-+ the terminal description, then the terminal may send mouse events.
-+ .SH SEE ALSO
-+-\fBcurses\fR(3X).
-++\fBcurses\fR(3X),
-++\fBcurs_kernel\fR(3X),
-++\fBcurs_slk\fR(3X).
-+ .\"#
-+ .\"# The following sets edit modes for GNU EMACS
-+ .\"# Local Variables:
-+Index: man/curs_opaque.3x
-+--- /dev/null	2007-12-08 19:14:25.328509000 +0000
-++++ ncurses-5.6-20071201/man/curs_opaque.3x	2007-09-08 18:49:13.000000000 +0000
-+@@ -0,0 +1,133 @@
-++.\"***************************************************************************
-++.\" Copyright (c) 2007 Free Software Foundation, Inc.                        *
-++.\"                                                                          *
-++.\" Permission is hereby granted, free of charge, to any person obtaining a  *
-++.\" copy of this software and associated documentation files (the            *
-++.\" "Software"), to deal in the Software without restriction, including      *
-++.\" without limitation the rights to use, copy, modify, merge, publish,      *
-++.\" distribute, distribute with modifications, sublicense, and/or sell       *
-++.\" copies of the Software, and to permit persons to whom the Software is    *
-++.\" furnished to do so, subject to the following conditions:                 *
-++.\"                                                                          *
-++.\" The above copyright notice and this permission notice shall be included  *
-++.\" in all copies or substantial portions of the Software.                   *
-++.\"                                                                          *
-++.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-++.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-++.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-++.\" IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-++.\" DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-++.\" OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-++.\" THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-++.\"                                                                          *
-++.\" Except as contained in this notice, the name(s) of the above copyright   *
-++.\" holders shall not be used in advertising or otherwise to promote the     *
-++.\" sale, use or other dealings in this Software without prior written       *
-++.\" authorization.                                                           *
-++.\"***************************************************************************
-++.\"
-++.\" $Id: curs_opaque.3x,v 1.6 2007/09/08 18:49:13 tom Exp $
-++.TH curs_opaque 3X ""
-++.na
-++.hy 0
-++.SH NAME
-++\fBis_cleared\fR,
-++\fBis_idlok\fR,
-++\fBis_idcok\fR,
-++\fBis_immedok\fR,
-++\fBis_keypad\fR,
-++\fBis_leaveok\fR,
-++\fBis_nodelay\fR,
-++\fBis_timeout\fR,
-++\fBis_scrollok\fR,
-++\fBis_syncok\fR - \fBcurses\fR window properties
-++.ad
-++.hy
-++.SH SYNOPSIS
-++\fB#include <curses.h>\fR
-++.sp
-++\fBbool is_cleared(const WINDOW *win);\fR
-++.br
-++\fBbool is_idcok(const WINDOW *win);\fR
-++.br
-++\fBbool is_idlok(const WINDOW *win);\fR
-++.br
-++\fBbool is_immedok(const WINDOW *win);\fR
-++.br
-++\fBbool is_keypad(const WINDOW *win);\fR
-++.br
-++\fBbool is_leaveok(const WINDOW *win);\fR
-++.br
-++\fBbool is_nodelay(const WINDOW *win);\fR
-++.br
-++\fBbool is_notimeout(const WINDOW *win);\fR
-++.br
-++\fBbool is_scrollok(const WINDOW *win);\fR
-++.br
-++\fBbool is_syncok(const WINDOW *win);\fR
-++.br
-++\fBWINDOW * wgetparent(const WINDOW *win);\fR
-++.br
-++\fBint wgetscrreg(const WINDOW *win, int *top, int *bottom);\fR
-++.br
-++.SH DESCRIPTION
-++This implementation provides functions which return properties
-++set in the WINDOW structure, allowing it to be ``opaque'' if
-++the symbol \fBNCURSES_OPAQUE\fR is defined:
-++.TP 5
-++\fBis_cleared\fR
-++returns the value set in \fBclearok\fR
-++.TP 5
-++\fBis_idcok\fR
-++returns the value set in \fBidcok\fR
-++.TP 5
-++\fBis_idlok\fR
-++returns the value set in \fBidlok\fR
-++.TP 5
-++\fBis_immedok\fR
-++returns the value set in \fBimmedok\fR
-++.TP 5
-++\fBis_keypad\fR
-++returns the value set in \fBkeypad\fR
-++.TP 5
-++\fBis_leaveok\fR
-++returns the value set in \fBleaveok\fR
-++.TP 5
-++\fBis_nodelay\fR
-++returns the value set in \fBnodelay\fR
-++.TP 5
-++\fBis_notimeout\fR
-++returns the value set in \fBnotimeout\fR
-++.TP 5
-++\fBis_scrollok\fR
-++returns the value set in \fBscrollok\fR
-++.TP 5
-++\fBis_syncok\fR
-++returns the value set in \fBsyncok\fR
-++.TP 5
-++\fBwgetparent\fR
-++returns the parent WINDOW pointer for subwindows,
-++or NULL for windows having no parent.
-++.TP 5
-++\fBwgetscrreg\fR
-++returns the top and bottom rows for the scrolling margin as set in \fBwsetscrreg\fP.
-++.SH RETURN VALUE
-++These functions all return TRUE or FALSE, except as noted.
-++.SH NOTES
-++Both a macro and a function are provided for each name.
-++.SH PORTABILITY
-++These routines are specific to ncurses.
-++They were not supported on Version 7, BSD or System V implementations.
-++It is recommended that any code depending on ncurses extensions
-++be conditioned using NCURSES_VERSION.
-++.SH SEE ALSO
-++\fBcurses\fR(3X),
-++\fBcurs_inopts\fR(3X),
-++\fBcurs_outopts\fR(3X),
-++\fBcurs_window\fR(3X)
-++.\"#
-++.\"# The following sets edit modes for GNU EMACS
-++.\"# Local Variables:
-++.\"# mode:nroff
-++.\"# fill-column:79
-++.\"# End:
-+Index: man/curs_outopts.3x
-+Prereq:  1.20 
-+--- ncurses-5.6/man/curs_outopts.3x	2005-05-15 16:18:32.000000000 +0000
-++++ ncurses-5.6-20071201/man/curs_outopts.3x	2007-06-02 20:40:07.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ .\"***************************************************************************
-+-.\" Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
-++.\" Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-+ .\"                                                                          *
-+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
-+ .\" copy of this software and associated documentation files (the            *
-+@@ -26,7 +26,7 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: curs_outopts.3x,v 1.20 2005/05/15 16:18:32 tom Exp $
-++.\" $Id: curs_outopts.3x,v 1.21 2007/06/02 20:40:07 tom Exp $
-+ .TH curs_outopts 3X ""
-+ .na
-+ .hy 0
-+@@ -91,7 +91,7 @@
-+ application needs insert/delete line, for example, for a screen editor.
-+ It is
-+ disabled by default because insert/delete line tends to be visually annoying
-+-when used in applications where it isn't really needed.
-++when used in applications where it is not really needed.
-+ If insert/delete line
-+ cannot be used, \fBcurses\fR redraws the changed portions of all lines.
-+ .PP
-+Index: man/curs_printw.3x
-+Prereq:  1.16 
-+--- ncurses-5.6/man/curs_printw.3x	2006-02-25 21:49:19.000000000 +0000
-++++ ncurses-5.6-20071201/man/curs_printw.3x	2006-12-24 16:05:17.000000000 +0000
-+@@ -26,7 +26,7 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: curs_printw.3x,v 1.16 2006/02/25 21:49:19 tom Exp $
-++.\" $Id: curs_printw.3x,v 1.17 2006/12/24 16:05:17 tom Exp $
-+ .TH curs_printw 3X ""
-+ .na
-+ .hy 0
-+@@ -55,12 +55,12 @@
-+ .br
-+ .SH DESCRIPTION
-+ The \fBprintw\fR, \fBwprintw\fR, \fBmvprintw\fR and \fBmvwprintw\fR
-+-routines are analogous to \fBprintf\fR [see \fBprintf\fR(3S)].  In
-++routines are analogous to \fBprintf\fR [see \fBprintf\fR(3)].  In
-+ effect, the string that would be output by \fBprintf\fR is output
-+ instead as though \fBwaddstr\fR were used on the given window.
-+ .PP
-+ The \fBvwprintw\fR and \fBwv_printw\fR routines are analogous
-+-to \fBvprintf\fR [see \fBprintf\fR(3S)]
-++to \fBvprintf\fR [see \fBprintf\fR(3)]
-+ and perform a \fBwprintw\fR using a variable argument list.
-+ The third argument is a \fBva_list\fR, a pointer to a
-+ list of arguments, as defined in \fB<stdarg.h>\fR.
-+@@ -85,7 +85,7 @@
-+ This implementation uses \fB<stdarg.h>\fR for both, because that header
-+ is included in \fB<curses.h\fR>.
-+ .SH SEE ALSO
-+-\fBcurses\fR(3X), \fBprintf\fR(3S), \fBvprintf(3S)\fR
-++\fBcurses\fR(3X), \fBprintf\fR(3), \fBvprintf(3)\fR
-+ .\"#
-+ .\"# The following sets edit modes for GNU EMACS
-+ .\"# Local Variables:
-+Index: man/curs_scanw.3x
-+Prereq:  1.13 
-+--- ncurses-5.6/man/curs_scanw.3x	2006-02-25 21:42:22.000000000 +0000
-++++ ncurses-5.6-20071201/man/curs_scanw.3x	2006-12-24 16:05:49.000000000 +0000
-+@@ -26,7 +26,7 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: curs_scanw.3x,v 1.13 2006/02/25 21:42:22 tom Exp $
-++.\" $Id: curs_scanw.3x,v 1.14 2006/12/24 16:05:49 tom Exp $
-+ .TH curs_scanw 3X ""
-+ .SH NAME
-+ \fBscanw\fR,
-+@@ -50,7 +50,7 @@
-+ \fBint vwscanw(WINDOW *win, char *fmt, va_list varglist);\fR
-+ .SH DESCRIPTION
-+ The \fBscanw\fR, \fBwscanw\fR and \fBmvscanw\fR routines are analogous to
-+-\fBscanf\fR [see \fBscanf\fR(3S)].  The effect of these routines is as though
-++\fBscanf\fR [see \fBscanf\fR(3)].  The effect of these routines is as though
-+ \fBwgetstr\fR were called on the window, and the resulting line used as input
-+ for \fBsscanf\fR(3).  Fields which do not map to a variable in the \fIfmt\fR
-+ field are lost.
-+@@ -88,7 +88,7 @@
-+ One possible way to get useful results would be to use a "%n" conversion
-+ at the end of the format string to ensure that something was processed.
-+ .SH SEE ALSO
-+-\fBcurses\fR(3X), \fBcurs_getstr\fR(3X), \fBcurs_printw\fR(3X), \fBscanf\fR(3S)
-++\fBcurses\fR(3X), \fBcurs_getstr\fR(3X), \fBcurs_printw\fR(3X), \fBscanf\fR(3)
-+ .\"#
-+ .\"# The following sets edit modes for GNU EMACS
-+ .\"# Local Variables:
-+Index: man/curs_scr_dump.3x
-+Prereq:  1.6 
-+--- ncurses-5.6/man/curs_scr_dump.3x	2006-02-25 21:49:19.000000000 +0000
-++++ ncurses-5.6-20071201/man/curs_scr_dump.3x	2006-12-24 16:05:49.000000000 +0000
-+@@ -26,7 +26,7 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: curs_scr_dump.3x,v 1.6 2006/02/25 21:49:19 tom Exp $
-++.\" $Id: curs_scr_dump.3x,v 1.7 2006/12/24 16:05:49 tom Exp $
-+ .TH curs_scr_dump 3X ""
-+ .na
-+ .hy 0
-+@@ -93,7 +93,7 @@
-+ "old".
-+ .SH SEE ALSO
-+ \fBcurses\fR(3X), \fBcurs_initscr\fR(3X), \fBcurs_refresh\fR(3X),
-+-\fBcurs_util\fR(3X), \fBsystem\fR(3S)
-++\fBcurs_util\fR(3X), \fBsystem\fR(3)
-+ .\"#
-+ .\"# The following sets edit modes for GNU EMACS
-+ .\"# Local Variables:
-+Index: man/curs_slk.3x
-+Prereq:  1.15 
-+--- ncurses-5.6/man/curs_slk.3x	2006-02-25 21:49:19.000000000 +0000
-++++ ncurses-5.6-20071201/man/curs_slk.3x	2007-06-02 20:40:07.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ .\"***************************************************************************
-+-.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+ .\"                                                                          *
-+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
-+ .\" copy of this software and associated documentation files (the            *
-+@@ -26,7 +26,7 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: curs_slk.3x,v 1.15 2006/02/25 21:49:19 tom Exp $
-++.\" $Id: curs_slk.3x,v 1.16 2007/06/02 20:40:07 tom Exp $
-+ .TH curs_slk 3X ""
-+ .na
-+ .hy 0
-+@@ -95,7 +95,7 @@
-+ implementation supports a mode where it simulates 12 labels of up to five
-+ characters each. This is most common for todays PC like enduser devices.
-+ Please note that ncurses simulates this mode by taking over up to two lines at
-+-the bottom of the screen, it doesn't try to use any hardware support for this
-++the bottom of the screen, it does not try to use any hardware support for this
-+ mode.
-+ .PP
-+ The \fBslk_init\fR routine must be called before \fBinitscr\fR or \fBnewterm\fR
-+Index: man/curs_termattrs.3x
-+Prereq:  1.9 
-+--- ncurses-5.6/man/curs_termattrs.3x	2003-12-27 18:37:47.000000000 +0000
-++++ ncurses-5.6-20071201/man/curs_termattrs.3x	2007-06-02 20:40:07.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ .\"***************************************************************************
-+-.\" Copyright (c) 1998-2002,2003 Free Software Foundation, Inc.              *
-++.\" Copyright (c) 1998-2003,2007 Free Software Foundation, Inc.              *
-+ .\"                                                                          *
-+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
-+ .\" copy of this software and associated documentation files (the            *
-+@@ -26,7 +26,7 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: curs_termattrs.3x,v 1.9 2003/12/27 18:37:47 tom Exp $
-++.\" $Id: curs_termattrs.3x,v 1.10 2007/06/02 20:40:07 tom Exp $
-+ .TH curs_termattrs 3X ""
-+ .SH NAME
-+ \fBbaudrate\fR,
-+@@ -101,7 +101,7 @@
-+ \fBnewterm\fR if \fBlongname\fR is going to be used with multiple
-+ terminals.
-+ .PP
-+-If a given terminal doesn't support a video attribute that an
-++If a given terminal does not support a video attribute that an
-+ application program is trying to use, \fBcurses\fR may substitute a
-+ different video attribute for it.
-+ The \fBtermattrs\fR and \fBterm_attrs\fR functions
-+Index: man/curs_termcap.3x
-+Prereq:  1.20 
-+--- ncurses-5.6/man/curs_termcap.3x	2006-02-25 21:50:01.000000000 +0000
-++++ ncurses-5.6-20071201/man/curs_termcap.3x	2007-06-02 20:40:07.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ .\"***************************************************************************
-+-.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+ .\"                                                                          *
-+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
-+ .\" copy of this software and associated documentation files (the            *
-+@@ -26,7 +26,7 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: curs_termcap.3x,v 1.20 2006/02/25 21:50:01 tom Exp $
-++.\" $Id: curs_termcap.3x,v 1.22 2007/06/02 20:40:07 tom Exp $
-+ .TH curs_termcap 3X ""
-+ .ds n 5
-+ .SH NAME
-+@@ -122,7 +122,7 @@
-+ .SH BUGS
-+ If you call \fBtgetstr\fR to fetch \fBca\fR or any other parameterized string,
-+ be aware that it will be returned in terminfo notation, not the older and
-+-not-quite-compatible termcap notation.  This won't cause problems if all
-++not-quite-compatible termcap notation.  This will not cause problems if all
-+ you do with it is call \fBtgoto\fR or \fBtparm\fR, which both expand
-+ terminfo-style strings as terminfo.
-+ (The \fBtgoto\fR function, if configured to support termcap, will check
-+@@ -158,7 +158,7 @@
-+ In particular, some applications are reported to declare and/or
-+ modify \fBospeed\fR.
-+ .SH SEE ALSO
-+-\fBcurses\fR(3X), \fBterminfo\fR(\*n), \fBputc\fR(3S).
-++\fBcurses\fR(3X), \fBterminfo\fR(\*n), \fBputc\fR(3).
-+ .\"#
-+ .\"# The following sets edit modes for GNU EMACS
-+ .\"# Local Variables:
-+Index: man/curs_terminfo.3x
-+Prereq:  1.24 
-+--- ncurses-5.6/man/curs_terminfo.3x	2006-11-04 21:50:03.000000000 +0000
-++++ ncurses-5.6-20071201/man/curs_terminfo.3x	2007-05-26 20:09:06.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ .\"***************************************************************************
-+-.\" Copyright (c) 1999-2005,2006 Free Software Foundation, Inc.              *
-++.\" Copyright (c) 1999-2006,2007 Free Software Foundation, Inc.              *
-+ .\"                                                                          *
-+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
-+ .\" copy of this software and associated documentation files (the            *
-+@@ -26,7 +26,7 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: curs_terminfo.3x,v 1.24 2006/11/04 21:50:03 tom Exp $
-++.\" $Id: curs_terminfo.3x,v 1.28 2007/05/26 20:09:06 tom Exp $
-+ .TH curs_terminfo 3X ""
-+ .ds n 5
-+ .na
-+@@ -64,7 +64,7 @@
-+ .br
-+ \fBint del_curterm(TERMINAL *\fR\fIoterm\fR\fB);\fR
-+ .br
-+-\fBint restartterm(const char *\fR\fIterm\fR\fB, int \fR\fIfildes\fR\fB, int *\fR\fIerrret\fR\fB);\fR
-++\fBint restartterm(char *\fR\fIterm\fR\fB, int \fR\fIfildes\fR\fB, int *\fR\fIerrret\fR\fB);\fR
-+ .br
-+ \fBchar *tparm(char *\fR\fIstr\fR\fB, ...);\fR
-+ .br
-+@@ -99,16 +99,22 @@
-+ Initially, \fBsetupterm\fR should be called.  Note that
-+ \fBsetupterm\fR is automatically called by \fBinitscr\fR and
-+ \fBnewterm\fR.  This defines the set of terminal-dependent variables
-+-[listed in \fBterminfo\fR(\*n)].  The \fBterminfo\fR variables
-++[listed in \fBterminfo\fR(\*n)].
-++The \fBterminfo\fR variables
-+ \fBlines\fR and \fBcolumns\fR are initialized by \fBsetupterm\fR as
-+-follows: If \fBuse_env(FALSE)\fR has been called, values for
-++follows:
-++.RS
-++.PP
-++If \fBuse_env(FALSE)\fR has been called, values for
-+ \fBlines\fR and \fBcolumns\fR specified in \fBterminfo\fR are used.
-++.PP
-+ Otherwise, if the environment variables \fBLINES\fR and \fBCOLUMNS\fR
-+ exist, their values are used.  If these environment variables do not
-+ exist and the program is running in a window, the current window size
-+ is used.  Otherwise, if the environment variables do not exist, the
-+ values for \fBlines\fR and \fBcolumns\fR specified in the
-+ \fBterminfo\fR database are used.
-++.RE
-+ .PP
-+ The header files \fBcurses.h\fR and \fBterm.h\fR should be included (in this
-+ order) to get the definitions for these strings, numbers, and flags.
-+@@ -183,7 +189,8 @@
-+ example, when reloading a game saved as a core image dump).  It assumes that
-+ the windows and the input and output options are the same as when memory was
-+ saved, but the terminal type and baud rate may be different.  Accordingly,
-+-it saves various tty state bits, does a setupterm, and then restores the bits.
-++it saves various tty state bits, calls \fBsetupterm\fP,
-++and then restores the bits.
-+ .PP
-+ The \fBtparm\fR routine instantiates the string \fIstr\fR with
-+ parameters \fIpi\fR.  A pointer is returned to the result of \fIstr\fR
-+@@ -288,6 +295,9 @@
-+ be considered non-portable.  All other functions are as described in the XSI
-+ curses standard.
-+ .PP
-++\fBsetupterm\fP copies the terminal name to the array \fBttytype\fP.
-++This is not part of X/Open Curses, but is assumed by some applications.
-++.PP
-+ In System V Release 4, \fBset_curterm\fR has an \fBint\fR return type and
-+ returns \fBOK\fR or \fBERR\fR.  We have chosen to implement the XSI Curses
-+ semantics.
-+@@ -309,7 +319,7 @@
-+ So though it is documented as a terminfo function,
-+ \fBmvcur\fR is really a curses function which is not well specified.
-+ .PP
-+-XSI states that the old location must be given.
-++XSI states that the old location must be given for \fBmvcur\fP.
-+ This implementation allows the caller to use -1's for the old ordinates.
-+ In that case, the old location is unknown.
-+ .PP
-+@@ -317,7 +327,7 @@
-+ are not stored in the arrays described in this section.
-+ .SH SEE ALSO
-+ \fBcurses\fR(3X), \fBcurs_initscr\fR(3X), \fBcurs_kernel\fR(3X), \fBcurs_termcap\fR(3X),
-+-\fBputc\fR(3S), \fBterminfo\fR(\*n)
-++\fBputc\fR(3), \fBterminfo\fR(\*n)
-+ .\"#
-+ .\"# The following sets edit modes for GNU EMACS
-+ .\"# Local Variables:
-+Index: man/curs_trace.3x
-+Prereq:  1.7 
-+--- ncurses-5.6/man/curs_trace.3x	2005-05-15 17:02:54.000000000 +0000
-++++ ncurses-5.6-20071201/man/curs_trace.3x	2007-02-24 17:33:49.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ .\"***************************************************************************
-+-.\" Copyright (c) 2000-2002,2005 Free Software Foundation, Inc.              *
-++.\" Copyright (c) 2000-2005,2007 Free Software Foundation, Inc.              *
-+ .\"                                                                          *
-+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
-+ .\" copy of this software and associated documentation files (the            *
-+@@ -26,7 +26,7 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: curs_trace.3x,v 1.7 2005/05/15 17:02:54 tom Exp $
-++.\" $Id: curs_trace.3x,v 1.8 2007/02/24 17:33:49 tom Exp $
-+ .TH curs_trace 3X ""
-+ .na
-+ .hy 0
-+@@ -56,7 +56,7 @@
-+ .br
-+ \fBchar *_nc_tracebits(void);\fR
-+ .br
-+-\fBchar *_tracechar(const unsigned char ch);\fR
-++\fBchar *_tracechar(int);\fR
-+ .br
-+ \fBchar *_tracechtype(chtype ch);\fR
-+ .br
-+Index: man/curs_util.3x
-+Prereq:  1.21 
-+--- ncurses-5.6/man/curs_util.3x	2006-08-26 14:17:48.000000000 +0000
-++++ ncurses-5.6-20071201/man/curs_util.3x	2007-05-26 21:44:42.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ .\"***************************************************************************
-+-.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+ .\"                                                                          *
-+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
-+ .\" copy of this software and associated documentation files (the            *
-+@@ -26,7 +26,7 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: curs_util.3x,v 1.21 2006/08/26 14:17:48 tom Exp $
-++.\" $Id: curs_util.3x,v 1.25 2007/05/26 21:44:42 tom Exp $
-+ .TH curs_util 3X ""
-+ .na
-+ .hy 0
-+@@ -49,7 +49,7 @@
-+ .sp
-+ \fBchar *unctrl(chtype c);\fR
-+ .br
-+-\fBchar *wunctrl(cchar_t *c);\fR
-++\fBwchar_t *wunctrl(cchar_t *c);\fR
-+ .br
-+ \fBchar *keyname(int c);\fR
-+ .br
-+@@ -146,6 +146,29 @@
-+ The XSI Curses standard, Issue 4 describes these functions.
-+ It states that \fBunctrl\fR and \fBwunctrl\fR will return a null pointer if
-+ unsuccessful, but does not define any error conditions.
-++This implementation checks for three cases:
-++.RS
-++.TP 5
-++-
-++the parameter is a 7-bit US-ASCII code.
-++This is the case that X/Open Curses documented.
-++.TP 5
-++-
-++the parameter is in the range 128-159, i.e., a C1 control code.
-++If \fBuse_legacy_coding\fP has been called with a \fB2\fP parameter,
-++\fBunctrl\fP returns the parameter, i.e., a one-character string with
-++the parameter as the first character.
-++Otherwise, it returns ``~@'', ``~A'', etc., analogous to ``^@'', ``^A'', C0 controls.
-++.IP
-++X/Open Curses does not document whether \fBunctrl\fP can be called before
-++initializing curses.
-++This implementation permits that,
-++and returns the ``~@'', etc., values in that case.
-++.TP 5
-++-
-++parameter values outside the 0 to 255 range.
-++\fBunctrl\fP returns a null pointer.
-++.RE
-+ .PP
-+ The SVr4 documentation describes the action of \fBfilter\fR only in the vaguest
-+ terms.  The description here is adapted from the XSI Curses standard (which
-+@@ -157,13 +180,24 @@
-+ Other implementations have different conventions.
-+ For example, they may show both sets of control characters with `^',
-+ and strip the parameter to 7 bits.
-+-Or they may ignore C1 controls and treat all of the upper-1280 codes as
-++Or they may ignore C1 controls and treat all of the upper-128 codes as
-+ printable.
-+ This implementation uses 8 bits but does not modify the string to reflect
-+ locale.
-+ The \fBuse_legacy_coding\fP function allows the caller to
-+ change the output of \fBunctrl\fP.
-+ .PP
-++Likewise, the \fBmeta\fP function allows the caller to change the
-++output of \fBkeyname\fP, i.e.,
-++it determines whether to use the `M-' prefix
-++for ``meta'' keys (codes in the range 128 to 255).
-++Both \fBuse_legacy_coding\fP and \fBmeta\fP succeed only after
-++curses is initialized. 
-++X/Open Curses does not document the treatment of codes 128 to 159.
-++When treating them as ``meta'' keys
-++(or if \fBkeyname\fP is called before initializing curses),
-++this implementation returns strings ``M-^@'', ``M-^A'', etc.
-++.PP
-+ The \fBkeyname\fP function may return the names of user-defined
-+ string capabilities which are defined in the terminfo entry via the \fB-x\fP
-+ option of \fBtic\fP.
-+@@ -178,11 +212,12 @@
-+ It is recommended that any code depending on ncurses extensions
-+ be conditioned using NCURSES_VERSION.
-+ .SH SEE ALSO
-+-\fBuse_legacy_coding\fR(3),
-++\fBlegacy_coding\fR(3X),
-+ \fBcurses\fR(3X),
-+ \fBcurs_initscr\fR(3X),
-+ \fBcurs_kernel\fR(3X),
-+-\fBcurs_scr_dump\fR(3X).
-++\fBcurs_scr_dump\fR(3X),
-++\fBlegacy_coding\fR(3X).
-+ .\"#
-+ .\"# The following sets edit modes for GNU EMACS
-+ .\"# Local Variables:
-+Index: man/default_colors.3x
-+Prereq:  1.19 
-+--- ncurses-5.6/man/default_colors.3x	2006-02-25 21:49:19.000000000 +0000
-++++ ncurses-5.6-20071201/man/default_colors.3x	2006-12-24 15:02:53.000000000 +0000
-+@@ -28,7 +28,7 @@
-+ .\"
-+ .\" Author: Thomas E. Dickey 1997,1999,2000,2005
-+ .\"
-+-.\" $Id: default_colors.3x,v 1.19 2006/02/25 21:49:19 tom Exp $
-++.\" $Id: default_colors.3x,v 1.20 2006/12/24 15:02:53 tom Exp $
-+ .TH default_colors 3X ""
-+ .SH NAME
-+ \fBuse_default_colors\fR,
-+@@ -104,9 +104,8 @@
-+ If the \fIinitialize_pair\fP capability is found, this causes an
-+ error as well.
-+ .SH NOTES
-+-Associated with this extension, the \fBinit_pair\fR(3X) function accepts
-+-negative arguments to specify default foreground or background
-+-colors.
-++Associated with this extension, the \fBinit_pair\fR function accepts
-++negative arguments to specify default foreground or background colors.
-+ .PP
-+ The \fIuse_default_colors()\fP function was added to support \fIded\fP.
-+ This is a full-screen application which uses curses to manage only part
-+Index: man/form_driver.3x
-+Prereq:  1.12 
-+--- ncurses-5.6/man/form_driver.3x	2006-11-04 18:51:00.000000000 +0000
-++++ ncurses-5.6-20071201/man/form_driver.3x	2007-06-02 22:56:49.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ .\"***************************************************************************
-+-.\" Copyright (c) 1998-2002,2006 Free Software Foundation, Inc.              *
-++.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+ .\"                                                                          *
-+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
-+ .\" copy of this software and associated documentation files (the            *
-+@@ -26,7 +26,7 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: form_driver.3x,v 1.12 2006/11/04 18:51:00 tom Exp $
-++.\" $Id: form_driver.3x,v 1.15 2007/06/02 22:56:49 tom Exp $
-+ .TH form_driver 3X ""
-+ .SH NAME
-+ \fBform_driver\fR - command-processing loop of the form system
-+@@ -38,7 +38,7 @@
-+ .SH DESCRIPTION
-+ Once a form has been posted (displayed), you should funnel input events to it
-+ through \fBform_driver\fR.  This routine has two major input cases; either
-+-the input is a form navigation request or it's a printable ASCII character.
-++the input is a form navigation request or it is a printable ASCII character.
-+ The form driver requests are as follows:
-+ .TP 5
-+ REQ_NEXT_PAGE
-+@@ -221,6 +221,57 @@
-+ If the second argument is a printable ASCII character, the driver places it
-+ in the current position in the current field.  If it is one of the forms
-+ requests listed above, that request is executed.
-++.SS MOUSE HANDLING
-++.PP
-++If the second argument is the KEY_MOUSE special key, the associated
-++mouse event is translated into one of the above pre-defined requests.
-++Currently only clicks in the user window (e.g. inside the form display
-++area or the decoration window) are handled.
-++.PP
-++If you click above the display region of the form:
-++.RS
-++.TP
-++a REQ_PREV_FIELD is generated for a single click,
-++.TP
-++a REQ_PREV_PAGE is generated for a double-click and
-++.TP
-++a REQ_FIRST_FIELD is generated for a triple-click.
-++.RE
-++.PP
-++If you click below the display region of the form:
-++.RS
-++.TP
-++a REQ_NEXT_FIELD is generated for a single click,
-++.TP
-++a REQ_NEXT_PAGE is generated for a double-click and
-++.TP
-++a REQ_LAST_FIELD is generated for a triple-click.
-++.RE
-++.PP
-++If you click at an field inside the display area of the form:
-++.RS
-++.TP 3
-++-
-++the form cursor is positioned to that field.
-++.TP 3
-++-
-++If you double-click a field,
-++the form cursor is positioned to that field
-++and \fBE_UNKNOWN_COMMAND\fR is returned.
-++This return value makes sense,
-++because a double click usually means that an field-specific action should
-++be returned.
-++It is exactly the purpose of this return value to signal that an
-++application specific command should be executed.
-++.TP 3
-++-
-++If a translation
-++into a request was done, \fBform_driver\fR returns the result of this request.
-++.RE
-++.PP
-++If you clicked outside the user window or the mouse event couldn't be translated
-++into a form request an \fBE_REQUEST_DENIED\fR is returned.
-++.SS APPLICATION-DEFINED COMMANDS
-+ .PP
-+ If the second argument is neither printable ASCII nor one of the above
-+ pre-defined form requests, the driver assumes it is an application-specific
-+Index: man/form_field_new.3x
-+Prereq:  1.14 
-+--- ncurses-5.6/man/form_field_new.3x	2006-11-04 17:12:00.000000000 +0000
-++++ ncurses-5.6-20071201/man/form_field_new.3x	2007-06-02 20:40:07.000000000 +0000
-+@@ -1,6 +1,6 @@
-+ '\" t
-+ .\"***************************************************************************
-+-.\" Copyright (c) 1998-2003,2006 Free Software Foundation, Inc.              *
-++.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+ .\"                                                                          *
-+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
-+ .\" copy of this software and associated documentation files (the            *
-+@@ -27,7 +27,7 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: form_field_new.3x,v 1.14 2006/11/04 17:12:00 tom Exp $
-++.\" $Id: form_field_new.3x,v 1.16 2007/06/02 20:40:07 tom Exp $
-+ .TH form_field_new 3X ""
-+ .SH NAME
-+ \fBform_field_new\fR - create and destroy form fields
-+@@ -93,8 +93,8 @@
-+ Version 7 or BSD versions.
-+ .PP
-+ It may be unwise to count on the set of attributes copied by
-+-\fBdup_field\fR(3X) being portable; the System V forms library documents are
-+-not very explicit about what gets copied and what doesn't.
-++\fBdup_field\fR being portable; the System V forms library documents are
-++not very explicit about what gets copied and what does not.
-+ .SH AUTHORS
-+ Juergen Pfeifer.  Manual pages and adaptation for new curses by Eric
-+ S. Raymond.
-+Index: man/form_field_opts.3x
-+Prereq:  1.12 
-+--- ncurses-5.6/man/form_field_opts.3x	2006-11-04 17:12:00.000000000 +0000
-++++ ncurses-5.6-20071201/man/form_field_opts.3x	2007-02-24 17:34:27.000000000 +0000
-+@@ -1,6 +1,6 @@
-+ '\" t
-+ .\"***************************************************************************
-+-.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+ .\"                                                                          *
-+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
-+ .\" copy of this software and associated documentation files (the            *
-+@@ -27,20 +27,20 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: form_field_opts.3x,v 1.12 2006/11/04 17:12:00 tom Exp $
-++.\" $Id: form_field_opts.3x,v 1.13 2007/02/24 17:34:27 tom Exp $
-+ .TH form_field_opts 3X ""
-+ .SH NAME
-+ \fBform_field_opts\fR - set and get field options
-+ .SH SYNOPSIS
-+ \fB#include <form.h>\fR
-+ .br
-+-int set_field_opts(FIELD *field, OPTIONS opts);
-++int set_field_opts(FIELD *field, Field_Options opts);
-+ .br
-+-int field_opts_on(FIELD *field, OPTIONS opts);
-++int field_opts_on(FIELD *field, Field_Options opts);
-+ .br
-+-int field_opts_off(FIELD *field, OPTIONS opts);
-++int field_opts_off(FIELD *field, Field_Options opts);
-+ .br
-+-OPTIONS field_opts(const FIELD *field);
-++Field_Options field_opts(const FIELD *field);
-+ .br
-+ .SH DESCRIPTION
-+ The function \fBset_field_opts\fR sets all the given field's option bits (field
-+Index: man/form_field_validation.3x
-+Prereq:  1.15 
-+--- ncurses-5.6/man/form_field_validation.3x	2006-11-04 17:14:19.000000000 +0000
-++++ ncurses-5.6-20071201/man/form_field_validation.3x	2006-12-24 16:08:08.000000000 +0000
-+@@ -26,7 +26,7 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: form_field_validation.3x,v 1.15 2006/11/04 17:14:19 tom Exp $
-++.\" $Id: form_field_validation.3x,v 1.16 2006/12/24 16:08:08 tom Exp $
-+ .TH form_field_validation 3X ""
-+ .SH NAME
-+ \fBform_field_validation\fR - data type validation for fields
-+@@ -99,7 +99,7 @@
-+ TYPE_REGEXP
-+ Regular expression data.  Requires a regular expression \fB(char *)\fR third argument;
-+ the data is valid if the regular expression matches it.  Regular expressions
-+-are in the format of \fBregcomp\fR(3X) and \fBregexec\fR(3X). Please notice
-++are in the format of \fBregcomp\fR and \fBregexec\fR. Please notice
-+ that the regular expression must match the whole field. If you have for
-+ example an eight character wide field, a regular expression "^[0-9]*$" always
-+ means that you have to fill all eight positions with digits. If you want to
-+Index: man/form_hook.3x
-+Prereq:  1.8 
-+--- ncurses-5.6/man/form_hook.3x	2006-11-04 17:12:00.000000000 +0000
-++++ ncurses-5.6-20071201/man/form_hook.3x	2007-02-24 17:34:18.000000000 +0000
-+@@ -1,6 +1,6 @@
-+ '\" t
-+ .\"***************************************************************************
-+-.\" Copyright (c) 1998,2006 Free Software Foundation, Inc.                   *
-++.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+ .\"                                                                          *
-+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
-+ .\" copy of this software and associated documentation files (the            *
-+@@ -27,28 +27,28 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: form_hook.3x,v 1.8 2006/11/04 17:12:00 tom Exp $
-++.\" $Id: form_hook.3x,v 1.9 2007/02/24 17:34:18 tom Exp $
-+ .TH form_hook 3X ""
-+ .SH NAME
-+ \fBform_hook\fR - set hooks for automatic invocation by applications
-+ .SH SYNOPSIS
-+ \fB#include <form.h>\fR
-+ .br
-+-int set_field_init(FORM *form, void (*func)(FORM *));
-++int set_field_init(FORM *form, Form_Hook func);
-+ .br
-+-void (*)(FORM *) field_init(const FORM *form);
-++Form_Hook field_init(const FORM *form);
-+ .br
-+-int set_field_term(FORM *form, void (*func)(FORM *));
-++int set_field_term(FORM *form, Form_Hook func);
-+ .br
-+-void (*)(FORM *) field_term(const FORM *form);
-++Form_Hook field_term(const FORM *form);
-+ .br
-+-int set_form_init(FORM *form, void (*func)(FORM *));
-++int set_form_init(FORM *form, Form_Hook func);
-+ .br
-+-void (*)(FORM *) form_init(const FORM *form);
-++Form_Hook form_init(const FORM *form);
-+ .br
-+-int set_form_term(FORM *form, void (*func)(FORM *));
-++int set_form_term(FORM *form, Form_Hook func);
-+ .br
-+-void (*)(FORM *) form_term(const FORM *form);
-++Form_Hook form_term(const FORM *form);
-+ .br
-+ .SH DESCRIPTION
-+ These functions make it possible to set hook functions to be called at various
-+Index: man/form_opts.3x
-+Prereq:  1.8 
-+--- ncurses-5.6/man/form_opts.3x	2006-11-04 17:12:00.000000000 +0000
-++++ ncurses-5.6-20071201/man/form_opts.3x	2007-02-24 17:34:36.000000000 +0000
-+@@ -1,6 +1,6 @@
-+ '\" t
-+ .\"***************************************************************************
-+-.\" Copyright (c) 1998,2006 Free Software Foundation, Inc.                   *
-++.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+ .\"                                                                          *
-+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
-+ .\" copy of this software and associated documentation files (the            *
-+@@ -27,20 +27,20 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: form_opts.3x,v 1.8 2006/11/04 17:12:00 tom Exp $
-++.\" $Id: form_opts.3x,v 1.9 2007/02/24 17:34:36 tom Exp $
-+ .TH form_opts 3X ""
-+ .SH NAME
-+ \fBform_opts\fR - set and get form options
-+ .SH SYNOPSIS
-+ \fB#include <form.h>\fR
-+ .br
-+-int set_form_opts(FORM *form, OPTIONS opts);
-++int set_form_opts(FORM *form, Field_Options opts);
-+ .br
-+-int form_opts_on(FORM *form, OPTIONS opts);
-++int form_opts_on(FORM *form, Field_Options opts);
-+ .br
-+-int form_opts_off(FORM *form, OPTIONS opts);
-++int form_opts_off(FORM *form, Field_Options opts);
-+ .br
-+-OPTIONS form_opts(const FORM *form);
-++Field_Options form_opts(const FORM *form);
-+ .br
-+ .SH DESCRIPTION
-+ The function \fBset_form_opts\fR sets all the given form's option bits (form
-+Index: man/infocmp.1m
-+Prereq:  1.43 
-+--- ncurses-5.6/man/infocmp.1m	2006-05-13 15:14:01.000000000 +0000
-++++ ncurses-5.6-20071201/man/infocmp.1m	2006-12-24 18:16:31.000000000 +0000
-+@@ -27,14 +27,14 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: infocmp.1m,v 1.43 2006/05/13 15:14:01 tom Exp $
-+-.TH infocmp 1M ""
-++.\" $Id: infocmp.1m,v 1.44 2006/12/24 18:16:31 tom Exp $
-++.TH @INFOCMP@ 1M ""
-+ .ds n 5
-+ .ds d @TERMINFO@
-+ .SH NAME
-+-\fBinfocmp\fR - compare or print out \fIterminfo\fR descriptions
-++\fB@INFOCMP@\fR - compare or print out \fIterminfo\fR descriptions
-+ .SH SYNOPSIS
-+-\fBinfocmp\fR [\fB-\
-++\fB@INFOCMP@\fR [\fB-\
-+ 1\
-+ C\
-+ E\
-+@@ -66,7 +66,7 @@
-+ .br
-+       [\fItermname\fR...]
-+ .SH DESCRIPTION
-+-\fBinfocmp\fR can be used to compare a binary \fBterminfo\fR entry with other
-++\fB@INFOCMP@\fR can be used to compare a binary \fBterminfo\fR entry with other
-+ terminfo entries, rewrite a \fBterminfo\fR description to take advantage of the
-+ \fBuse=\fR terminfo field, or print out a \fBterminfo\fR description from the
-+ binary file (\fBterm\fR) in a variety of formats.  In all cases, the boolean
-+@@ -77,7 +77,7 @@
-+ \fB-I\fR option will be assumed.  If more than one \fItermname\fR is specified,
-+ the \fB-d\fR option will be assumed.
-+ .SS Comparison Options [-d] [-c] [-n]
-+-\fBinfocmp\fR compares the \fBterminfo\fR description of the first terminal
-++\fB@INFOCMP@\fR compares the \fBterminfo\fR description of the first terminal
-+ \fItermname\fR with each of the descriptions given by the entries for the other
-+ terminal's \fItermnames\fR.  If a capability is defined for only one of the
-+ terminals, the value returned will depend on the type of the capability:
-+@@ -114,7 +114,7 @@
-+ .PP
-+ The source produced by the \fB-C\fR option may be used directly as a
-+ \fBtermcap\fR entry, but not all parameterized strings can be changed to
-+-the \fBtermcap\fR format.  \fBinfocmp\fR will attempt to convert most of the
-++the \fBtermcap\fR format.  \fB@INFOCMP@\fR will attempt to convert most of the
-+ parameterized information, and anything not converted will be plainly marked in
-+ the output and commented out.  These should be edited by hand.
-+ .PP
-+@@ -162,7 +162,7 @@
-+ other terminals.  In this manner, it is possible to retrofit generic terminfo
-+ entries into a terminal's description.  Or, if two similar terminals exist, but
-+ were coded at different times or by different people so that each description
-+-is a full description, using \fBinfocmp\fR will show what can be done to change
-++is a full description, using \fB@INFOCMP@\fR will show what can be done to change
-+ one description to be relative to the other.
-+ .PP
-+ A capability will get printed with an at-sign (@) if it no longer exists in the
-+@@ -176,18 +176,18 @@
-+ terminfo compiler \fBtic\fR does a left-to-right scan of the capabilities,
-+ specifying two \fBuse=\fR entries that contain differing entries for the same
-+ capabilities will produce different results depending on the order that the
-+-entries are given in.  \fBinfocmp\fR will flag any such inconsistencies between
-++entries are given in.  \fB@INFOCMP@\fR will flag any such inconsistencies between
-+ the other \fItermname\fR entries as they are found.
-+ .PP
-+ Alternatively, specifying a capability \fIafter\fR a \fBuse=\fR entry that
-+ contains that capability will cause the second specification to be ignored.
-+-Using \fBinfocmp\fR to recreate a description can be a useful check to make
-++Using \fB@INFOCMP@\fR to recreate a description can be a useful check to make
-+ sure that everything was specified correctly in the original source
-+ description.
-+ .PP
-+ Another error that does not cause incorrect compiled files, but will slow down
-+ the compilation time, is specifying extra \fBuse=\fR fields that are
-+-superfluous.  \fBinfocmp\fR will flag any other \fItermname use=\fR fields that
-++superfluous.  \fB@INFOCMP@\fR will flag any other \fItermname use=\fR fields that
-+ were not needed.
-+ .SS Changing Databases [-A \fIdirectory\fR] [-B \fIdirectory\fR]
-+ The location of the compiled \fBterminfo\fR database is taken from the
-+@@ -208,7 +208,7 @@
-+ of 60 characters.
-+ .TP
-+ \fB-a\fR
-+-tells \fBinfocmp\fP to retain commented-out capabilities rather than discarding
-++tells \fB@INFOCMP@\fP to retain commented-out capabilities rather than discarding
-+ them.  Capabilities are commented by prefixing them with a period.
-+ .TP 5
-+ \fB-E\fR
-+@@ -367,9 +367,9 @@
-+ untranslatable capabilities are commented-out.
-+ .TP 5
-+ \fB-U\fR
-+-tells \fBinfocmp\fP to not post-process the data after parsing the source file.
-++tells \fB@INFOCMP@\fP to not post-process the data after parsing the source file.
-+ This feature helps when comparing the actual contents of two source files,
-+-since it excludes the inferences that \fBinfocmp\fP makes to fill in missing
-++since it excludes the inferences that \fB@INFOCMP@\fP makes to fill in missing
-+ data.
-+ .TP 5
-+ \fB-V\fR
-+@@ -413,7 +413,7 @@
-+ Actual BSD curses versions will have a more restricted set.  To see only the
-+ 4.4BSD set, use \fB-r\fR \fB-RBSD\fR.
-+ .SH BUGS
-+-The \fB-F\fR option of \fBinfocmp\fR(1M) should be a \fBtoe\fR(1M) mode.
-++The \fB-F\fR option of \fB@INFOCMP@\fR(1M) should be a \fB@TOE@\fR(1M) mode.
-+ .SH SEE ALSO
-+ \fB@CAPTOINFO@\fR(1M),
-+ \fB@INFOTOCAP@\fR(1M),
-+Index: man/infotocap.1m
-+Prereq:  1.6 
-+--- ncurses-5.6/man/infotocap.1m	2006-05-13 15:35:45.000000000 +0000
-++++ ncurses-5.6-20071201/man/infotocap.1m	2006-12-24 20:13:56.000000000 +0000
-+@@ -27,16 +27,16 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: infotocap.1m,v 1.6 2006/05/13 15:35:45 tom Exp $
-+-.TH infotocap 1M ""
-++.\" $Id: infotocap.1m,v 1.8 2006/12/24 20:13:56 tom Exp $
-++.TH @INFOTOCAP@ 1M ""
-+ .ds n 5
-+ .ds d @TERMINFO@
-+ .SH NAME
-+-\fBinfotocap\fR - convert a \fIterminfo\fR description into a \fItermcap\fR description
-++\fB@INFOTOCAP@\fR - convert a \fIterminfo\fR description into a \fItermcap\fR description
-+ .SH SYNOPSIS
-+-\fBinfotocap\fR [\fB-v\fR\fIn\fR \fIwidth\fR]  [\fB-V\fR] [\fB-1\fR] [\fB-w\fR \fIwidth\fR] \fIfile\fR . . .
-++\fB@INFOTOCAP@\fR [\fB-v\fR\fIn\fR \fIwidth\fR]  [\fB-V\fR] [\fB-1\fR] [\fB-w\fR \fIwidth\fR] \fIfile\fR . . .
-+ .SH DESCRIPTION
-+-\fBinfotocap\fR looks in \fIfile\fR for \fBterminfo\fR descriptions.  For each
-++\fB@INFOTOCAP@\fR looks in \fIfile\fR for \fBterminfo\fR descriptions.  For each
-+ one found, an equivalent \fBtermcap\fR description is written to standard
-+ output.  Terminfo \fBuse\fR capabilities are translated directly to termcap
-+ \fBtc\fR capabilities.
-+@@ -59,12 +59,12 @@
-+ \*d
-+ Compiled terminal description database.
-+ .SH NOTES
-+-This utility is actually a link to \fItic\fR(1M), running in \fI-C\fR mode.
-+-You can use other \fItic\fR options such as \fB-f\fR and  \fB-x\fR.
-++This utility is actually a link to \fI@TIC@\fR, running in \fI-C\fR mode.
-++You can use other \fI@TIC@\fR options such as \fB-f\fR and  \fB-x\fR.
-+ .SH SEE ALSO
-+ \fBcurses\fR(3X),
-+-\fBtic\fR(1M),
-+-\fBinfocmp\fR(1M),
-++\fB@TIC@\fR(1M),
-++\fB@INFOCMP@\fR(1M),
-+ \fBterminfo\fR(\*n)
-+ .PP
-+ This describes \fBncurses\fR
-+Index: man/legacy_coding.3x
-+Prereq:  1.2 
-+--- ncurses-5.6/man/legacy_coding.3x	2006-02-25 21:50:01.000000000 +0000
-++++ ncurses-5.6-20071201/man/legacy_coding.3x	2006-12-24 15:12:55.000000000 +0000
-+@@ -28,7 +28,7 @@
-+ .\"
-+ .\" Author: Thomas E. Dickey
-+ .\"
-+-.\" $Id: legacy_coding.3x,v 1.2 2006/02/25 21:50:01 tom Exp $
-++.\" $Id: legacy_coding.3x,v 1.3 2006/12/24 15:12:55 tom Exp $
-+ .TH legacy_coding 3X ""
-+ .SH NAME
-+ \fBuse_legacy_coding\fR \- use terminal's default colors
-+@@ -50,7 +50,7 @@
-+ .TP 5
-+ 0
-+ the library functions normally,
-+-rendering nonprinting characters as described in \fBunctrl\fP(3X).
-++rendering nonprinting characters as described in \fBunctrl\fP.
-+ .TP
-+ 1
-+ the library ignores \fBisprintf\fP for codes in the range 160-255.
-+Index: man/man_db.renames
-+Prereq:  0.36 
-+--- ncurses-5.6/man/man_db.renames	2006-05-13 23:47:25.000000000 +0000
-++++ ncurses-5.6-20071201/man/man_db.renames	2007-04-07 23:06:31.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ ##############################################################################
-+-# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
-++# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -25,7 +25,7 @@
-+ # use or other dealings in this Software without prior written               #
-+ # authorization.                                                             #
-+ ##############################################################################
-+-# $Id: man_db.renames,v 0.36 2006/05/13 23:47:25 tom Exp $
-++# $Id: man_db.renames,v 0.39 2007/04/07 23:06:31 tom Exp $
-+ # Manual-page renamings for the man_db program
-+ #
-+ # Files:
-+@@ -67,8 +67,10 @@
-+ curs_instr.3x			instr.3ncurses
-+ curs_inwstr.3x			inwstr.3ncurses
-+ curs_kernel.3x			kernel.3ncurses
-++curs_legacy.3x			legacy.3ncurses
-+ curs_mouse.3x			mouse.3ncurses
-+ curs_move.3x			move.3ncurses
-++curs_opaque.3x			opaque.3ncurses
-+ curs_outopts.3x			outopts.3ncurses
-+ curs_overlay.3x			overlay.3ncurses
-+ curs_pad.3x			pad.3ncurses
-+@@ -159,12 +161,15 @@
-+ vprintf.3s			vprintf.3
-+ wresize.3x			wresize.3ncurses
-+ #
-+-# Other cross-references:
-+-addch.3x			addch.3ncurses
-+-can_change_color.3x		can_change_color.3ncurses
-+-curs_attr_get.3x		attr_get.3ncurses
-+-dup_field.3x			dup_field.3ncurses
-+-init_pair.3x			init_pair.3ncurses
-+-#
-+ # Other:
-+ tack.1m				tack.1
-++#
-++getty.1				getty.8
-++scanf.3				scanf.3
-++ttys.5				ttys.4
-++termio.7			termios.3
-++system.3			system.3
-++regcomp.3x			regcomp.3
-++regexec.3x			regexec.3
-++#
-++# vile:cfgmode
-+Index: man/menu_driver.3x
-+Prereq:  1.12 
-+--- ncurses-5.6/man/menu_driver.3x	2006-11-04 17:13:50.000000000 +0000
-++++ ncurses-5.6-20071201/man/menu_driver.3x	2007-06-02 22:50:09.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ .\"***************************************************************************
-+-.\" Copyright (c) 1998-2003,2006 Free Software Foundation, Inc.              *
-++.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+ .\"                                                                          *
-+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
-+ .\" copy of this software and associated documentation files (the            *
-+@@ -26,7 +26,7 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: menu_driver.3x,v 1.12 2006/11/04 17:13:50 tom Exp $
-++.\" $Id: menu_driver.3x,v 1.14 2007/06/02 22:50:09 tom Exp $
-+ .TH menu_driver 3X ""
-+ .SH NAME
-+ \fBmenu_driver\fR - command-processing loop of the menu system
-+@@ -38,7 +38,7 @@
-+ .SH DESCRIPTION
-+ Once a menu has been posted (displayed), you should funnel input events to it
-+ through \fBmenu_driver\fR.  This routine has three major input cases; either
-+-the input is a menu navigation request, it's a printable ASCII character or it
-++the input is a menu navigation request, it is a printable ASCII character or it
-+ is the KEY_MOUSE special key associated with an mouse event.
-+ The menu driver requests are as follows:
-+ .TP 5
-+@@ -100,25 +100,56 @@
-+ .PP
-+ If the second argument is one of the above pre-defined requests, the
-+ corresponding action is performed.
-++.SS MOUSE HANDLING
-+ .PP
-+ If the second argument is the KEY_MOUSE special key, the associated
-+ mouse event is translated into one of the above pre-defined requests.
-+ Currently only clicks in the user window (e.g. inside the menu display
-+-area or the decoration window) are handled. If you click above the
-+-display region of the menu, a REQ_SCR_ULINE is generated, if you
-+-doubleclick a REQ_SCR_UPAGE is generated and if you tripleclick a
-+-REQ_FIRST_ITEM is generated. If you click below the display region of
-+-the menu, a REQ_SCR_DLINE is generated, if you doubleclick a REQ_SCR_DPAGE
-+-is generated and if you tripleclick a REQ_LAST_ITEM is generated. If you
-+-click at an item inside the display area of the menu, the menu cursor
-+-is positioned to that item. If you double-click at an item a REQ_TOGGLE_ITEM
-+-is generated and \fBE_UNKNOWN_COMMAND\fR is returned. This return value makes
-+-sense, because a double click usually means that an item-specific action should
-+-be returned. It's exactly the purpose of this return value to signal that an
-+-application specific command should be executed. If a translation
-++area or the decoration window) are handled.
-++.PP
-++If you click above the display region of the menu:
-++.RS
-++.TP
-++a REQ_SCR_ULINE is generated for a single click,
-++.TP
-++a REQ_SCR_UPAGE is generated for a double-click and
-++.TP
-++a REQ_FIRST_ITEM is generated for a triple-click.
-++.RE
-++.PP
-++If you click below the display region of the menu:
-++.RS
-++.TP
-++a REQ_SCR_DLINE is generated for a single click,
-++.TP
-++a REQ_SCR_DPAGE is generated for a double-click and
-++.TP
-++a REQ_LAST_ITEM is generated for a triple-click.
-++.RE
-++.PP
-++If you click at an item inside the display area of the menu:
-++.RS
-++.TP 3
-++-
-++the menu cursor is positioned to that item.
-++.TP 3
-++-
-++If you double-click an item a REQ_TOGGLE_ITEM
-++is generated and \fBE_UNKNOWN_COMMAND\fR is returned.
-++This return value makes sense,
-++because a double click usually means that an item-specific action should
-++be returned.
-++It is exactly the purpose of this return value to signal that an
-++application specific command should be executed.
-++.TP 3
-++-
-++If a translation
-+ into a request was done, \fBmenu_driver\fR returns the result of this request.
-++.RE
-++.PP
-+ If you clicked outside the user window or the mouse event couldn't be translated
-+ into a menu request an \fBE_REQUEST_DENIED\fR is returned.
-++.SS APPLICATION-DEFINED COMMANDS
-+ .PP
-+ If the second argument is neither printable ASCII nor one of the above
-+ pre-defined menu requests or KEY_MOUSE, the drive assumes it is an application-specific
-+Index: man/menu_hook.3x
-+Prereq:  1.8 
-+--- ncurses-5.6/man/menu_hook.3x	2006-11-04 17:12:00.000000000 +0000
-++++ ncurses-5.6-20071201/man/menu_hook.3x	2007-02-24 17:34:08.000000000 +0000
-+@@ -1,6 +1,6 @@
-+ '\" t
-+ .\"***************************************************************************
-+-.\" Copyright (c) 1998,2006 Free Software Foundation, Inc.                   *
-++.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+ .\"                                                                          *
-+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
-+ .\" copy of this software and associated documentation files (the            *
-+@@ -27,28 +27,28 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: menu_hook.3x,v 1.8 2006/11/04 17:12:00 tom Exp $
-++.\" $Id: menu_hook.3x,v 1.9 2007/02/24 17:34:08 tom Exp $
-+ .TH menu_hook 3X ""
-+ .SH NAME
-+ \fBmenu_hook\fR - set hooks for automatic invocation by applications
-+ .SH SYNOPSIS
-+ \fB#include <menu.h>\fR
-+ .br
-+-int set_item_init(MENU *menu, void (*func)(MENU *));
-++int set_item_init(MENU *menu, Menu_Hook func);
-+ .br
-+-void (*)(MENU *) item_init(const MENU *menu);
-++Menu_Hook item_init(const MENU *menu);
-+ .br
-+-int set_item_term(MENU *menu, void (*func)(MENU *));
-++int set_item_term(MENU *menu, Menu_Hook func);
-+ .br
-+-void (*)(MENU *) item_term(const MENU *menu);
-++Menu_Hook item_term(const MENU *menu);
-+ .br
-+-int set_menu_init(MENU *menu, void (*func)(MENU *));
-++int set_menu_init(MENU *menu, Menu_Hook func);
-+ .br
-+-void (*)(MENU *) menu_init(const MENU *menu);
-++Menu_Hook menu_init(const MENU *menu);
-+ .br
-+-int set_menu_term(MENU *menu, void (*func)(MENU *));
-++int set_menu_term(MENU *menu, Menu_Hook func);
-+ .br
-+-void (*)(MENU *) menu_term(const MENU *menu);
-++Menu_Hook menu_term(const MENU *menu);
-+ .br
-+ .SH DESCRIPTION
-+ These functions make it possible to set hook functions to be called at various
-+Index: man/menu_opts.3x
-+Prereq:  1.9 
-+--- ncurses-5.6/man/menu_opts.3x	2006-11-04 17:12:00.000000000 +0000
-++++ ncurses-5.6-20071201/man/menu_opts.3x	2007-02-24 17:33:59.000000000 +0000
-+@@ -1,6 +1,6 @@
-+ '\" t
-+ .\"***************************************************************************
-+-.\" Copyright (c) 1998,2006 Free Software Foundation, Inc.                   *
-++.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+ .\"                                                                          *
-+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
-+ .\" copy of this software and associated documentation files (the            *
-+@@ -27,20 +27,20 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: menu_opts.3x,v 1.9 2006/11/04 17:12:00 tom Exp $
-++.\" $Id: menu_opts.3x,v 1.10 2007/02/24 17:33:59 tom Exp $
-+ .TH menu_opts 3X ""
-+ .SH NAME
-+ \fBmenu_opts\fR - set and get menu options
-+ .SH SYNOPSIS
-+ \fB#include <menu.h>\fR
-+ .br
-+-int set_menu_opts(MENU *menu, OPTIONS opts);
-++int set_menu_opts(MENU *menu, Menu_Options opts);
-+ .br
-+-int menu_opts_on(MENU *menu, OPTIONS opts);
-++int menu_opts_on(MENU *menu, Menu_Options opts);
-+ .br
-+-int menu_opts_off(MENU *menu, OPTIONS opts);
-++int menu_opts_off(MENU *menu, Menu_Options opts);
-+ .br
-+-OPTIONS menu_opts(const MENU *menu);
-++Menu_Options menu_opts(const MENU *menu);
-+ .br
-+ .SH DESCRIPTION
-+ The function \fBset_menu_opts\fR sets all the given menu's option bits (menu
-+Index: man/mitem_opts.3x
-+Prereq:  1.8 
-+--- ncurses-5.6/man/mitem_opts.3x	2006-11-04 17:12:00.000000000 +0000
-++++ ncurses-5.6-20071201/man/mitem_opts.3x	2007-02-24 17:33:32.000000000 +0000
-+@@ -1,6 +1,6 @@
-+ '\" t
-+ .\"***************************************************************************
-+-.\" Copyright (c) 1998,2006 Free Software Foundation, Inc.                   *
-++.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+ .\"                                                                          *
-+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
-+ .\" copy of this software and associated documentation files (the            *
-+@@ -27,20 +27,20 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: mitem_opts.3x,v 1.8 2006/11/04 17:12:00 tom Exp $
-++.\" $Id: mitem_opts.3x,v 1.9 2007/02/24 17:33:32 tom Exp $
-+ .TH mitem_opts 3X ""
-+ .SH NAME
-+ \fBmitem_opts\fR - set and get menu item options
-+ .SH SYNOPSIS
-+ \fB#include <menu.h>\fR
-+ .br
-+-int set_item_opts(ITEM *item, OPTIONS opts);
-++int set_item_opts(ITEM *item, Item_Options opts);
-+ .br
-+-int item_opts_on(ITEM *item, OPTIONS opts);
-++int item_opts_on(ITEM *item, Item_Options opts);
-+ .br
-+-int item_opts_off(ITEM *item, OPTIONS opts);
-++int item_opts_off(ITEM *item, Item_Options opts);
-+ .br
-+-OPTIONS item_opts(const ITEM *item);
-++Item_Options item_opts(const ITEM *item);
-+ .br
-+ .SH DESCRIPTION
-+ The function \fBset_item_opts\fR sets all the given item's option bits (menu
-+Index: man/ncurses.3x
-+Prereq:  1.81 
-+--- ncurses-5.6/man/ncurses.3x	2006-12-02 19:23:11.000000000 +0000
-++++ ncurses-5.6-20071201/man/ncurses.3x	2007-09-01 18:57:29.000000000 +0000
-+@@ -1,6 +1,6 @@
-+ '\" t
-+ .\"***************************************************************************
-+-.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+ .\"                                                                          *
-+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
-+ .\" copy of this software and associated documentation files (the            *
-+@@ -27,7 +27,7 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: ncurses.3x,v 1.81 2006/12/02 19:23:11 tom Exp $
-++.\" $Id: ncurses.3x,v 1.89 2007/09/01 18:57:29 tom Exp $
-+ .hy 0
-+ .TH ncurses 3X ""
-+ .ds n 5
-+@@ -39,19 +39,27 @@
-+ .br
-+ .SH DESCRIPTION
-+ The \fBncurses\fR library routines give the user a terminal-independent method
-+-of updating character screens with reasonable optimization.  This
-+-implementation is ``new curses'' (ncurses) and is the approved replacement for
-++of updating character screens with reasonable optimization.
-++This implementation is ``new curses'' (ncurses) and
-++is the approved replacement for
-+ 4.4BSD classic curses, which has been discontinued.
-+ This describes \fBncurses\fR
-+ version @NCURSES_MAJOR@.@NCURSES_MINOR@ (patch @NCURSES_PATCH@).
-+ .PP
-+-The \fBncurses\fR routines emulate the \fBcurses\fR(3X) library of System V
-+-Release 4 UNIX, and the XPG4 curses standard (XSI curses) but the \fBncurses\fR
-+-library is freely redistributable in source form.  Differences from the SVr4
-++The \fBncurses\fR library emulates the \fBcurses\fR(3X) library of
-++System V Release 4 UNIX,
-++and XPG4 (X/Open Portability Guide) curses (also known as XSI curses).
-++XSI stands for X/Open System Interfaces Extension.
-++The \fBncurses\fR library is freely redistributable in source form.
-++Differences from the SVr4
-+ curses are summarized under the \fBEXTENSIONS\fP and \fBPORTABILITY\fP sections below and
-+ described in detail in the respective \fBEXTENSIONS\fP, \fBPORTABILITY\fP and \fBBUGS\fP sections
-+ of individual man pages.
-+ .PP
-++The \fBncurses\fR library also provides many useful extensions,
-++i.e., features which cannot be implemented by a simple add-on library
-++but which require access to the internals of the library.
-++.PP
-+ A program using these routines must be linked with the \fB-lncurses\fR option,
-+ or (if it has been generated) with the debugging library \fB-lncurses_g\fR.
-+ (Your system integrator may also have installed these libraries under
-+@@ -68,8 +76,9 @@
-+ .PP
-+ To initialize the routines, the routine \fBinitscr\fR or \fBnewterm\fR
-+ must be called before any of the other routines that deal with windows
-+-and screens are used.  The routine \fBendwin\fR must be called before
-+-exiting.  To get character-at-a-time input without echoing (most
-++and screens are used.
-++The routine \fBendwin\fR must be called before exiting.
-++To get character-at-a-time input without echoing (most
-+ interactive, screen oriented programs want this), the following
-+ sequence should be used:
-+ .sp
-+@@ -82,60 +91,72 @@
-+       \fBkeypad(stdscr, TRUE);\fR
-+ .sp
-+ Before a \fBcurses\fR program is run, the tab stops of the terminal
-+-should be set and its initialization strings, if defined, must be
-+-output.  This can be done by executing the \fBtput init\fR command
-++should be set and its initialization strings, if defined, must be output.
-++This can be done by executing the \fBtput init\fR command
-+ after the shell environment variable \fBTERM\fR has been exported.
-+ \fBtset(1)\fR is usually responsible for doing this.
-+ [See \fBterminfo\fR(\*n) for further details.]
-+ .PP
-+ The \fBncurses\fR library permits manipulation of data structures,
-+ called \fIwindows\fR, which can be thought of as two-dimensional
-+-arrays of characters representing all or part of a CRT screen.  A
-+-default window called \fBstdscr\fR, which is the size of the terminal
-+-screen, is supplied.  Others may be created with \fBnewwin\fR.
-++arrays of characters representing all or part of a CRT screen.
-++A default window called \fBstdscr\fR, which is the size of the terminal
-++screen, is supplied.
-++Others may be created with \fBnewwin\fR.
-+ .PP
-+ Note that \fBcurses\fR does not handle overlapping windows, that's done by
-+-the \fBpanel\fR(3X) library. This means that you can either use
-++the \fBpanel\fR(3X) library.
-++This means that you can either use
-+ \fBstdscr\fR or divide the screen into tiled windows and not using
-+-\fBstdscr\fR at all. Mixing the two will result in unpredictable, and
-+-undesired, effects.
-++\fBstdscr\fR at all.
-++Mixing the two will result in unpredictable, and undesired, effects.
-+ .PP
-+ Windows are referred to by variables declared as \fBWINDOW *\fR.
-+ These data structures are manipulated with routines described here and
-+-elsewhere in the \fBncurses\fR manual pages.  Among those, the most basic
-+-routines are \fBmove\fR and \fBaddch\fR.  More general versions of
-++elsewhere in the \fBncurses\fR manual pages.
-++Among those, the most basic
-++routines are \fBmove\fR and \fBaddch\fR.
-++More general versions of
-+ these routines are included with names beginning with \fBw\fR,
-+-allowing the user to specify a window.  The routines not beginning
-++allowing the user to specify a window.
-++The routines not beginning
-+ with \fBw\fR affect \fBstdscr\fR.
-+ .PP
-+ After using routines to manipulate a window, \fBrefresh\fR is called,
-+ telling \fBcurses\fR to make the user's CRT screen look like
-+-\fBstdscr\fR.  The characters in a window are actually of type
-++\fBstdscr\fR.
-++The characters in a window are actually of type
-+ \fBchtype\fR, (character and attribute data) so that other information
-+ about the character may also be stored with each character.
-+ .PP
-+-Special windows called \fIpads\fR may also be manipulated.  These are windows
-++Special windows called \fIpads\fR may also be manipulated.
-++These are windows
-+ which are not constrained to the size of the screen and whose contents need not
-+-be completely displayed.  See \fBcurs_pad\fR(3X) for more information.
-++be completely displayed.
-++See \fBcurs_pad\fR(3X) for more information.
-+ .PP
-+ In addition to drawing characters on the screen, video attributes and colors
-+ may be supported, causing the characters to show up in such modes as
-+ underlined, in reverse video, or in color on terminals that support such
-+-display enhancements.  Line drawing characters may be specified to be output.
-++display enhancements.
-++Line drawing characters may be specified to be output.
-+ On input, \fBcurses\fR is also able to translate arrow and function keys that
-+-transmit escape sequences into single values.  The video attributes, line
-++transmit escape sequences into single values.
-++The video attributes, line
-+ drawing characters, and input values use names, defined in \fB<curses.h>\fR,
-+ such as \fBA_REVERSE\fR, \fBACS_HLINE\fR, and \fBKEY_LEFT\fR.
-+ .PP
-+ If the environment variables \fBLINES\fR and \fBCOLUMNS\fR are set, or if the
-+ program is executing in a window environment, line and column information in
-+-the environment will override information read by \fIterminfo\fR.  This would
-+-effect a program running in an AT&T 630 layer, for example, where the size of a
-++the environment will override information read by \fIterminfo\fR.
-++This would affect a program running in an AT&T 630 layer,
-++for example, where the size of a
-+ screen is changeable (see \fBENVIRONMENT\fR).
-+ .PP
-+ If the environment variable \fBTERMINFO\fR is defined, any program using
-+ \fBcurses\fR checks for a local terminal definition before checking in the
-+-standard place.  For example, if \fBTERM\fR is set to \fBatt4424\fR, then the
-++standard place.
-++For example, if \fBTERM\fR is set to \fBatt4424\fR, then the
-+ compiled terminal definition is found in
-+ .sp
-+       \fB\*d/a/att4424\fR.
-+@@ -155,43 +176,100 @@
-+ .PP
-+ The integer variables \fBLINES\fR and \fBCOLS\fR are defined in
-+ \fB<curses.h>\fR and will be filled in by \fBinitscr\fR with the size of the
-+-screen.  The constants \fBTRUE\fR and \fBFALSE\fR have the values \fB1\fR and
-++screen.
-++The constants \fBTRUE\fR and \fBFALSE\fR have the values \fB1\fR and
-+ \fB0\fR, respectively.
-+ .PP
-+ The \fBcurses\fR routines also define the \fBWINDOW *\fR variable \fBcurscr\fR
-+ which is used for certain low-level operations like clearing and redrawing a
-+-screen containing garbage.  The \fBcurscr\fR can be used in only a few
-+-routines.
-+-.
-++screen containing garbage.
-++The \fBcurscr\fR can be used in only a few routines.
-++.\"
-+ .SS Routine and Argument Names
-+-Many \fBcurses\fR routines have two or more versions.  The routines prefixed
-+-with \fBw\fR require a window argument.  The routines prefixed with \fBp\fR
-+-require a pad argument.  Those without a prefix generally use \fBstdscr\fR.
-++Many \fBcurses\fR routines have two or more versions.
-++The routines prefixed with \fBw\fR require a window argument.
-++The routines prefixed with \fBp\fR require a pad argument.
-++Those without a prefix generally use \fBstdscr\fR.
-+ .PP
-+ The routines prefixed with \fBmv\fR require a \fIy\fR and \fIx\fR
-+-coordinate to move to before performing the appropriate action.  The
-+-\fBmv\fR routines imply a call to \fBmove\fR before the call to the
-+-other routine.  The coordinate \fIy\fR always refers to the row (of
-+-the window), and \fIx\fR always refers to the column.  The upper
-+-left-hand corner is always (0,0), not (1,1).
-++coordinate to move to before performing the appropriate action.
-++The \fBmv\fR routines imply a call to \fBmove\fR before the call to the
-++other routine.
-++The coordinate \fIy\fR always refers to the row (of
-++the window), and \fIx\fR always refers to the column.
-++The upper left-hand corner is always (0,0), not (1,1).
-+ .PP
-+ The routines prefixed with \fBmvw\fR take both a window argument and
-+-\fIx\fR and \fIy\fR coordinates.  The window argument is always
-+-specified before the coordinates.
-++\fIx\fR and \fIy\fR coordinates.
-++The window argument is always specified before the coordinates.
-+ .PP
-+ In each case, \fIwin\fR is the window affected, and \fIpad\fR is the
-+ pad affected; \fIwin\fR and \fIpad\fR are always pointers to type
-+ \fBWINDOW\fR.
-+ .PP
-+ Option setting routines require a Boolean flag \fIbf\fR with the value
-+-\fBTRUE\fR or \fBFALSE\fR; \fIbf\fR is always of type \fBbool\fR.  The
-+-variables \fIch\fR and \fIattrs\fR below are always of type
-+-\fBchtype\fR.  The types \fBWINDOW\fR, \fBSCREEN\fR, \fBbool\fR, and
-+-\fBchtype\fR are defined in \fB<curses.h>\fR.  The type \fBTERMINAL\fR
-+-is defined in \fB<term.h>\fR.  All other arguments are integers.
-++\fBTRUE\fR or \fBFALSE\fR; \fIbf\fR is always of type \fBbool\fR.
-++Most of the data types used in the library routines,
-++such as \fBWINDOW\fR, \fBSCREEN\fR, \fBbool\fR, and \fBchtype\fR
-++are defined in \fB<curses.h>\fR.
-++Types used for the terminfo routines such as
-++\fBTERMINAL\fR are defined in \fB<term.h>\fR.
-++.PP
-++This manual page describes functions which may appear in any configuration
-++of the library.
-++There are two common configurations of the library:
-++.RS
-++.TP 5
-++ncurses
-++the "normal" library, which handles 8-bit characters.
-++The normal (8-bit) library stores characters combined with attributes
-++in \fBchtype\fP data.
-++.IP
-++Attributes alone (no corresponding character) may be stored in \fBchtype\fP
-++or the equivalent \fBattr_t\fP data.
-++In either case, the data is stored in something like an integer.
-++.IP
-++Each cell (row and column) in a \fBWINDOW\fP is stored as a \fBchtype\fP.
-++.TP 5
-++ncursesw
-++the so-called "wide" library, which handles multibyte characters
-++(See the section on \fBALTERNATE CONFIGURATIONS\fP).
-++The "wide" library includes all of the calls from the "normal" library.
-++It adds about one third more calls using data types which store
-++multibyte characters:
-++.RS
-++.TP 5
-++.B cchar_t
-++corresponds to \fBchtype\fP.
-++However it is a structure, because more data is stored than can fit into
-++an integer.
-++The characters are large enough to require a full integer value - and there
-++may be more than one character per cell.
-++The video attributes and color are stored in separate fields of the structure.
-++.IP
-++Each cell (row and column) in a \fBWINDOW\fP is stored as a \fBcchar_t\fP.
-++.TP 5
-++.B wchar_t
-++stores a "wide" character.
-++Like \fBchtype\fP, this may be an integer.
-++.TP 5
-++.B wint_t
-++stores a \fBwchar_t\fP or \fBWEOF\fP - not the same, though both may have
-++the same size.
-++.RE
-++.IP
-++The "wide" library provides new functions which are analogous to
-++functions in the "normal" library.
-++There is a naming convention which relates many of the normal/wide variants:
-++a "_w" is inserted into the name.
-++For example, \fBwaddch\fP becomes \fBwadd_wch\fP.
-++.RE
-++.PP
-++.\"
-+ .SS Routine Name Index
-+ The following table lists each \fBcurses\fR routine and the name of
-+-the manual page on which it is described.  Routines flagged with `*'
-++the manual page on which it is described.
-++Routines flagged with `*'
-+ are ncurses-specific, not described by XPG4 or present in SVr4.
-+ .PP
-+ .TS
-+@@ -275,15 +353,24 @@
-+ flushinp/\fBcurs_util\fR(3X)
-+ get_wch/\fBcurs_get_wch\fR(3X)
-+ get_wstr/\fBcurs_get_wstr\fR(3X)
-++getattrs/\fBcurs_attr\fR(3X)
-++getbegx/\fBcurs_legacy\fR(3X)*
-++getbegy/\fBcurs_legacy\fR(3X)*
-+ getbegyx/\fBcurs_getyx\fR(3X)
-+ getbkgd/\fBcurs_bkgd\fR(3X)
-+ getbkgrnd/\fBcurs_bkgrnd\fR(3X)
-+ getcchar/\fBcurs_getcchar\fR(3X)
-+ getch/\fBcurs_getch\fR(3X)
-++getcurx/\fBcurs_legacy\fR(3X)*
-++getcury/\fBcurs_legacy\fR(3X)*
-++getmaxx/\fBcurs_legacy\fR(3X)*
-++getmaxy/\fBcurs_legacy\fR(3X)*
-+ getmaxyx/\fBcurs_getyx\fR(3X)
-+ getmouse/\fBcurs_mouse\fR(3X)*
-+ getn_wstr/\fBcurs_get_wstr\fR(3X)
-+ getnstr/\fBcurs_getstr\fR(3X)
-++getparx/\fBcurs_legacy\fR(3X)*
-++getpary/\fBcurs_legacy\fR(3X)*
-+ getparyx/\fBcurs_getyx\fR(3X)
-+ getstr/\fBcurs_getstr\fR(3X)
-+ getsyx/\fBcurs_kernel\fR(3X)
-+@@ -321,7 +408,18 @@
-+ instr/\fBcurs_instr\fR(3X)
-+ intrflush/\fBcurs_inopts\fR(3X)
-+ inwstr/\fBcurs_inwstr\fR(3X)
-++is_cleared/\fBcurs_opaque\fR(3X)*
-++is_idcok/\fBcurs_opaque\fR(3X)*
-++is_idlok/\fBcurs_opaque\fR(3X)*
-++is_immedok/\fBcurs_opaque\fR(3X)*
-++is_keypad/\fBcurs_opaque\fR(3X)*
-++is_leaveok/\fBcurs_opaque\fR(3X)*
-+ is_linetouched/\fBcurs_touch\fR(3X)
-++is_nodelay/\fBcurs_opaque\fR(3X)*
-++is_notimeout/\fBcurs_opaque\fR(3X)*
-++is_scrollok/\fBcurs_opaque\fR(3X)*
-++is_syncok/\fBcurs_opaque\fR(3X)*
-++is_term_resized/\fBresizeterm\fR(3X)*
-+ is_wintouched/\fBcurs_touch\fR(3X)
-+ isendwin/\fBcurs_initscr\fR(3X)
-+ key_defined/\fBkey_defined\fR(3X)*
-+@@ -431,6 +529,7 @@
-+ nocbreak/\fBcurs_inopts\fR(3X)
-+ nodelay/\fBcurs_inopts\fR(3X)
-+ noecho/\fBcurs_inopts\fR(3X)
-++nofilter/\fBcurs_util\fR(3X)*
-+ nonl/\fBcurs_outopts\fR(3X)
-+ noqiflush/\fBcurs_inopts\fR(3X)
-+ noraw/\fBcurs_inopts\fR(3X)
-+@@ -519,6 +618,7 @@
-+ use_default_colors/\fBdefault_colors\fR(3X)*
-+ use_env/\fBcurs_util\fR(3X)
-+ use_extended_names/\fBcurs_extend\fR(3X)*
-++use_legacy_coding/\fBlegacy_coding\fR(3X)*
-+ vid_attr/\fBcurs_terminfo\fR(3X)
-+ vid_puts/\fBcurs_terminfo\fR(3X)
-+ vidattr/\fBcurs_terminfo\fR(3X)
-+@@ -617,16 +717,16 @@
-+ otherwise noted in the routine descriptions.
-+ .PP
-+ All macros return the value of the \fBw\fR version, except \fBsetscrreg\fR,
-+-\fBwsetscrreg\fR, \fBgetyx\fR, \fBgetbegyx\fR, and \fBgetmaxyx\fR.  The return
-+-values of \fBsetscrreg\fR, \fBwsetscrreg\fR, \fBgetyx\fR, \fBgetbegyx\fR, and
-++\fBwsetscrreg\fR, \fBgetyx\fR, \fBgetbegyx\fR, and \fBgetmaxyx\fR.
-++The return values of \fBsetscrreg\fR, \fBwsetscrreg\fR, \fBgetyx\fR, \fBgetbegyx\fR, and
-+ \fBgetmaxyx\fR are undefined (i.e., these should not be used as the
-+ right-hand side of assignment statements).
-+ .PP
-+ Routines that return pointers return \fBNULL\fR on error.
-+ .SH ENVIRONMENT
-+ The following environment symbols are useful for customizing the
-+-runtime behavior of the \fBncurses\fR library.  The most important
-+-ones have been already discussed in detail.
-++runtime behavior of the \fBncurses\fR library.
-++The most important ones have been already discussed in detail.
-+ .TP 5
-+ BAUDRATE
-+ The debugging library checks this environment symbol when the application
-+@@ -722,7 +822,7 @@
-+ NCURSES_ASSUMED_COLORS
-+ Override the compiled-in assumption that the
-+ terminal's default colors are white-on-black
-+-(see \fBassume_default_colors\fR(3X)).
-++(see \fBdefault_colors\fR(3X)).
-+ You may set the foreground and background color values with this environment
-+ variable by proving a 2-element list: foreground,background.
-+ For example, to tell ncurses to not assume anything
-+@@ -739,7 +839,7 @@
-+ .TP 5
-+ NCURSES_NO_MAGIC_COOKIES
-+ Some terminals use a magic-cookie feature which requires special handling
-+-to make highlighting and other video attributes display properly. 
-++to make highlighting and other video attributes display properly.
-+ You can suppress the highlighting entirely for these terminals by
-+ setting this environment variable.
-+ .TP 5
-+@@ -761,18 +861,21 @@
-+ operations that the terminal does slowly, such as clearing the display.
-+ .IP
-+ As a result, many terminal descriptions (including the vt100)
-+-have delay times embedded.  You may wish to use these descriptions,
-++have delay times embedded.
-++You may wish to use these descriptions,
-+ but not want to pay the performance penalty.
-+ .IP
-+ Set the NCURSES_NO_PADDING symbol to disable all but mandatory
-+-padding.  Mandatory padding is used as a part of special control
-++padding.
-++Mandatory padding is used as a part of special control
-+ sequences such as \fIflash\fR.
-+ .TP 5
-+ NCURSES_NO_SETBUF
-+ Normally \fBncurses\fR enables buffered output during terminal initialization.
-+ This is done (as in SVr4 curses) for performance reasons.
-+ For testing purposes, both of \fBncurses\fR and certain applications,
-+-this feature is made optional.  Setting the NCURSES_NO_SETBUF variable
-++this feature is made optional.
-++Setting the NCURSES_NO_SETBUF variable
-+ disables output buffering, leaving the output in the original (usually
-+ line buffered) mode.
-+ .TP 5
-+@@ -944,12 +1047,14 @@
-+ .SH EXTENSIONS
-+ The \fBncurses\fR library can be compiled with an option (\fB-DUSE_GETCAP\fR)
-+ that falls back to the old-style /etc/termcap file if the terminal setup code
-+-cannot find a terminfo entry corresponding to \fBTERM\fR.  Use of this feature
-++cannot find a terminfo entry corresponding to \fBTERM\fR.
-++Use of this feature
-+ is not recommended, as it essentially includes an entire termcap compiler in
-+ the \fBncurses\fR startup code, at significant cost in core and startup cycles.
-+ .PP
-+ The \fBncurses\fR library includes facilities for capturing mouse events on
-+-certain terminals (including xterm). See the \fBcurs_mouse\fR(3X)
-++certain terminals (including xterm).
-++See the \fBcurs_mouse\fR(3X)
-+ manual page for details.
-+ .PP
-+ The \fBncurses\fR library includes facilities for responding to window
-+@@ -974,38 +1079,48 @@
-+ See the \fBdefault_colors\fR(3X) manual page for details.
-+ .PP
-+ The \fBncurses\fR library includes a function for directing application output
-+-to a printer attached to the terminal device.  See the \fBcurs_print\fR(3X)
-+-manual page for details.
-++to a printer attached to the terminal device.
-++See the \fBcurs_print\fR(3X) manual page for details.
-+ .SH PORTABILITY
-+-The \fBncurses\fR library is intended to be BASE-level conformant with the XSI
-+-Curses standard.  The EXTENDED XSI Curses functionality
-++The \fBncurses\fR library is intended to be BASE-level conformant with XSI
-++Curses.
-++The EXTENDED XSI Curses functionality
-+ (including color support) is supported.
-+ .PP
-+ A small number of local differences (that is, individual differences between
-+ the XSI Curses and \fBncurses\fR calls) are described in \fBPORTABILITY\fR
-+ sections of the library man pages.
-+ .PP
-+-The routine \fBhas_key\fR is not part of XPG4, nor is it present in SVr4.  See
-+-the \fBcurs_getch\fR(3X) manual page for details.
-++This implementation also contains several extensions:
-++.RS 5
-++.PP
-++The routine \fBhas_key\fR is not part of XPG4, nor is it present in SVr4.
-++See the \fBcurs_getch\fR(3X) manual page for details.
-+ .PP
-+-The routine \fBslk_attr\fR is not part of XPG4, nor is it present in SVr4.  See
-+-the \fBcurs_slk\fR(3X) manual page for details.
-++The routine \fBslk_attr\fR is not part of XPG4, nor is it present in SVr4.
-++See the \fBcurs_slk\fR(3X) manual page for details.
-+ .PP
-+ The routines \fBgetmouse\fR, \fBmousemask\fR, \fBungetmouse\fR,
-+ \fBmouseinterval\fR, and \fBwenclose\fR relating to mouse interfacing are not
-+-part of XPG4, nor are they present in SVr4.  See the \fBcurs_mouse\fR(3X)
-+-manual page for details.
-++part of XPG4, nor are they present in SVr4.
-++See the \fBcurs_mouse\fR(3X) manual page for details.
-+ .PP
-+-The routine \fBmcprint\fR was not present in any previous curses
-+-implementation.  See the \fBcurs_print\fR(3X) manual page for details.
-++The routine \fBmcprint\fR was not present in any previous curses implementation.
-++See the \fBcurs_print\fR(3X) manual page for details.
-+ .PP
-+-The routine \fBwresize\fR is not part of XPG4, nor is it present in SVr4.  See
-+-the \fBwresize\fR(3X) manual page for details.
-++The routine \fBwresize\fR is not part of XPG4, nor is it present in SVr4.
-++See the \fBwresize\fR(3X) manual page for details.
-++.PP
-++The WINDOW structure's internal details can be hidden from application
-++programs.
-++See \fBcurs_opaque\fR(3X) for the discussion of \fBis_scrollok\fR, etc.
-++.RE
-+ .PP
-+ In historic curses versions, delays embedded in the capabilities \fBcr\fR,
-+ \fBind\fR, \fBcub1\fR, \fBff\fR and \fBtab\fR activated corresponding delay
-+-bits in the UNIX tty driver.  In this implementation, all padding is done by
-+-NUL sends.  This method is slightly more expensive, but narrows the interface
-++bits in the UNIX tty driver.
-++In this implementation, all padding is done by sending NUL bytes.
-++This method is slightly more expensive, but narrows the interface
-+ to the UNIX kernel significantly and increases the package's portability
-+ correspondingly.
-+ .SH NOTES
-+@@ -1013,8 +1128,8 @@
-+ \fB<stdio.h>\fR and \fB<unctrl.h>\fR.
-+ .PP
-+ If standard output from a \fBncurses\fR program is re-directed to something
-+-which is not a tty, screen updates will be directed to standard error.  This
-+-was an undocumented feature of AT&T System V Release 3 curses.
-++which is not a tty, screen updates will be directed to standard error.
-++This was an undocumented feature of AT&T System V Release 3 curses.
-+ .SH AUTHORS
-+ Zeyd M. Ben-Halim, Eric S. Raymond, Thomas E. Dickey.
-+ Based on pcurses by Pavel Curtis.
-+Index: man/panel.3x
-+Prereq:  1.12 
-+--- ncurses-5.6/man/panel.3x	2006-05-13 15:35:45.000000000 +0000
-++++ ncurses-5.6-20071201/man/panel.3x	2007-05-12 20:45:20.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ .\"***************************************************************************
-+-.\" Copyright (c) 1998-2003,2006 Free Software Foundation, Inc.              *
-++.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+ .\"                                                                          *
-+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
-+ .\" copy of this software and associated documentation files (the            *
-+@@ -26,7 +26,7 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: panel.3x,v 1.12 2006/05/13 15:35:45 tom Exp $
-++.\" $Id: panel.3x,v 1.14 2007/05/12 20:45:20 tom Exp $
-+ .TH panel 3X ""
-+ .ds n 5
-+ .ds d @TERMINFO@
-+@@ -84,13 +84,13 @@
-+ high-level curses calls, and work anywhere terminfo curses does.
-+ .SH FUNCTIONS
-+ .TP
-+-\fBnew_panel(win)\fR
-++.B new_panel(win)
-+ allocates  a  \fBPANEL\fR structure, associates it with
-+ \fBwin\fR, places the panel on the top of the stack  (causes  it
-+ to  be  displayed above any other panel) and returns a
-+ pointer to the new panel.
-+ .TP
-+-\fBvoid update_panels()\fR
-++.B update_panels()
-+ refreshes the virtual screen to reflect the relations between the
-+ panels in the stack, but does not call doupdate() to refresh the
-+ physical screen.  Use this function and not wrefresh or wnoutrefresh.
-+@@ -98,52 +98,57 @@
-+ doupdate(), but doupdate() is the function responsible for updating
-+ the physical screen.
-+ .TP
-+-\fBdel_panel(pan)\fR
-++.B del_panel(pan)
-+ removes the given panel from the  stack and deallocates the
-+ \fBPANEL\fR structure (but not its associated window).
-+ .TP
-+-\fBhide_panel(pan)\fR
-++.B hide_panel(pan)
-+ removes the given panel from the panel stack and thus hides it from
-+ view. The \fBPANEL\fR structure is not lost, merely removed from the stack.
-+ .TP
-+-\fBshow_panel(pan)\fR
-++.B panel_hidden(pan)
-++returns TRUE if the panel is in the panel stack,
-++FALSE if it is not.
-++If the panel is a null pointer, return ERR.
-++.TP
-++.B show_panel(pan)
-+ makes a hidden panel visible by placing it on top of the panels in the
-+ panel stack. See COMPATIBILITY below.
-+ .TP
-+-\fBtop_panel(pan)\fR
-++.B top_panel(pan)
-+ puts the given visible panel on top of all panels in the stack.  See
-+ COMPATIBILITY below.
-+ .TP
-+-\fBbottom_panel(pan)\fR
-++.B bottom_panel(pan)
-+ puts panel at the bottom of all panels.
-+ .TP
-+-\fBmove_panel(pan,starty,startx)\fR
-++.B move_panel(pan,starty,startx)
-+ moves the given panel window so that its upper-left corner is at
-+ \fBstarty\fR, \fBstartx\fR.  It does not change the position of the
-+ panel in the stack.  Be sure to use this function, not \fBmvwin()\fR,
-+ to move a panel window.
-+ .TP
-+-\fBreplace_panel(pan,window)\fR
-++.B replace_panel(pan,window)
-+ replaces the current window of panel with \fBwindow\fR (useful, for
-+ example if you want to resize a panel; if you're using \fBncurses\fR,
-+ you can call \fBreplace_panel\fR on the output of \fBwresize\fR(3X)).
-+ It does not change the position of the panel in the stack.
-+ .TP
-+-\fBpanel_above(pan)\fR
-++.B panel_above(pan)
-+ returns a pointer to the panel above pan.  If the panel argument is
-+ \fB(PANEL *)0\fR, it returns a pointer to the bottom panel in the stack.
-+ .TP
-+-\fBpanel_below(pan)\fR
-++.B panel_below(pan)
-+ returns a pointer to the panel just below pan.  If the panel argument
-+ is \fB(PANEL *)0\fR, it returns a pointer to the top panel in the stack.
-+ .TP
-+-\fBset_panel_userptr(pan,ptr)\fR
-++.B set_panel_userptr(pan,ptr)
-+ sets the panel's user pointer.
-+ .TP
-+-\fBpanel_userptr(pan)\fR
-++.B panel_userptr(pan)
-+ returns the user pointer for a given panel.
-+ .TP
-+-\fBpanel_window(pan)\fR
-++.B panel_window(pan)
-+ returns a pointer to the window of the given panel.
-+ .SH DIAGNOSTICS
-+ Each routine that returns a pointer returns \fBNULL\fR if an error
-+Index: man/term.5
-+Prereq:  1.17 
-+--- ncurses-5.6/man/term.5	2006-12-03 01:08:16.000000000 +0000
-++++ ncurses-5.6-20071201/man/term.5	2006-12-24 18:12:38.000000000 +0000
-+@@ -26,8 +26,8 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: term.5,v 1.17 2006/12/03 01:08:16 tom Exp $
-+-.TH TERM 5
-++.\" $Id: term.5,v 1.19 2006/12/24 18:12:38 tom Exp $
-++.TH term 5
-+ .ds n 5
-+ .ds d @TERMINFO@
-+ .SH NAME
-+@@ -74,7 +74,7 @@
-+ or sign extension are made.
-+ .PP
-+ The compiled file is created with the
-+-.I tic
-++.B @TIC@
-+ program, and read by the routine
-+ .IR setupterm .
-+ The file is divided into six parts:
-+Index: man/term.7
-+Prereq:  1.15 
-+--- ncurses-5.6/man/term.7	2006-02-25 21:47:06.000000000 +0000
-++++ ncurses-5.6-20071201/man/term.7	2007-06-02 20:40:07.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ .\"***************************************************************************
-+-.\" Copyright (c) 1998-2003,2006 Free Software Foundation, Inc.              *
-++.\" Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+ .\"                                                                          *
-+ .\" Permission is hereby granted, free of charge, to any person obtaining a  *
-+ .\" copy of this software and associated documentation files (the            *
-+@@ -26,8 +26,8 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: term.7,v 1.15 2006/02/25 21:47:06 tom Exp $
-+-.TH TERM 7
-++.\" $Id: term.7,v 1.18 2007/06/02 20:40:07 tom Exp $
-++.TH term 7
-+ .ds n 5
-+ .ds d @TERMINFO@
-+ .SH NAME
-+@@ -66,14 +66,14 @@
-+ Terminal type descriptions are stored as files of capability data underneath
-+ \*d.  To browse a list of all terminal names recognized by the system, do
-+ .sp
-+-	toe | more
-++	@TOE@ | more
-+ .sp
-+ from your shell.  These capability files are in a binary format optimized for
-+ retrieval speed (unlike the old text-based \fBtermcap\fR format they replace);
-+-to examine an entry, you must use the \fBinfocmp\fR(1) command.  Invoke it as
-+-follows:
-++to examine an entry, you must use the \fB@INFOCMP@\fR(1M) command.
-++Invoke it as follows:
-+ .sp
-+-	infocmp \fIentry-name\fR
-++	@INFOCMP@ \fIentry-name\fR
-+ .sp
-+ where \fIentry-name\fR is the name of the type you wish to examine (and the
-+ name of its capability file the subdirectory of \*d named for its first
-+@@ -119,7 +119,7 @@
-+ multi-platform environment!  If a model number follows, it should indicate
-+ either the OS release level or the console driver release level.
-+ .PP
-+-The root name for a terminal emulator (assuming it doesn't fit one of the
-++The root name for a terminal emulator (assuming it does not fit one of the
-+ standard ANSI or vt100 types) should be the program name or a readily
-+ recognizable abbreviation of it (i.e. \fBversaterm\fR, \fBctrm\fR).
-+ .PP
-+Index: man/terminfo.head
-+Prereq:  1.13 
-+--- ncurses-5.6/man/terminfo.head	2006-05-13 15:35:45.000000000 +0000
-++++ ncurses-5.6-20071201/man/terminfo.head	2007-03-04 00:09:46.000000000 +0000
-+@@ -26,8 +26,8 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: terminfo.head,v 1.13 2006/05/13 15:35:45 tom Exp $
-+-.TH TERMINFO 5 "" "" "File Formats"
-++.\" $Id: terminfo.head,v 1.16 2007/03/04 00:09:46 tom Exp $
-++.TH terminfo 5 "" "" "File Formats"
-+ .ds n 5
-+ .ds d @TERMINFO@
-+ .SH NAME
-+@@ -51,7 +51,7 @@
-+ Entries in
-+ .I terminfo
-+ consist of a sequence of `,' separated fields (embedded commas may be
-+-escaped with a backslash or notated as \e054).
-++escaped with a backslash or notated as \\054).
-+ White space after the `,' separator is ignored.
-+ The first entry for each terminal gives the names which are known for the
-+ terminal, separated by `|' characters.
-+@@ -62,14 +62,14 @@
-+ the last name may well contain upper case and blanks for readability.
-+ .PP
-+ Lines beginning with a `#' in the first column are treated as comments.
-+-While comment lines are legal at any point, the output of \fIcaptoinfo\fP
-+-and \fIinfotocap\fP (aliases for \fItic\fP)
-++While comment lines are legal at any point, the output of \fB@CAPTOINFO@\fP
-++and \fB@INFOTOCAP@\fP (aliases for \fB@TIC@\fP)
-+ will move comments so they occur only between entries.
-+ .PP
-+ Newlines and leading tabs may be used for formatting entries for readability.
-+ These are removed from parsed entries.
-+-The \fIinfocmp\ -f\fP option relies on this to format if-then-else expressions:
-+-the result can be read by \fItic\fP.
-++The \fB@INFOCMP@\ -f\fP option relies on this to format if-then-else expressions:
-++the result can be read by \fB@TIC@\fP.
-+ .PP
-+ Terminal names (except for the last, verbose entry) should
-+ be chosen using the following conventions.
-+Index: man/terminfo.tail
-+Prereq:  1.44 
-+--- ncurses-5.6/man/terminfo.tail	2006-04-01 22:47:01.000000000 +0000
-++++ ncurses-5.6-20071201/man/terminfo.tail	2007-06-02 20:30:40.000000000 +0000
-+@@ -1,11 +1,11 @@
-+-.\" $Id: terminfo.tail,v 1.44 2006/04/01 22:47:01 tom Exp $
-++.\" $Id: terminfo.tail,v 1.48 2007/06/02 20:30:40 tom Exp $
-+ .\" Beginning of terminfo.tail file
-+ .\" This file is part of ncurses.
-+ .\" See "terminfo.head" for copyright.
-+ .ps +1
-+-..
-++.
-+ .SS A Sample Entry
-+-..
-++.
-+ The following entry, describing an ANSI-standard terminal, is representative
-+ of what a \fBterminfo\fR entry for a modern terminal typically looks like.
-+ .PP
-+@@ -297,7 +297,7 @@
-+ Cursor addressing and other strings requiring parameters
-+ in the terminal are described by a
-+ parameterized string capability, with
-+-.IR printf (3S)
-++.IR printf (3)
-+ like escapes \fB%x\fR in it.
-+ For example, to address the cursor, the
-+ .B cup
-+@@ -395,7 +395,7 @@
-+ .IP
-+ where c\di\u are conditions, b\di\u are bodies.
-+ .IP
-+-Use the \fB-f\fP option of \fBtic\fP or \fBinfocmp\fP to see
-++Use the \fB-f\fP option of \fBtic\fP or \fB@INFOCMP@\fP to see
-+ the structure of if-the-else's.
-+ Some strings, e.g., \fBsgr\fP can be very complicated when written
-+ on one line.
-+@@ -993,7 +993,7 @@
-+ They are normally sent to the terminal, by the
-+ .I init
-+ option of the
-+-.IR tput
-++.IR @TPUT@
-+ program, each time the user logs in.
-+ They will be printed in the following order:
-+ .RS
-+@@ -1578,7 +1578,7 @@
-+ *
-+ and the termcap library (like the one in BSD/OS 1.1 and GNU) reads
-+ the whole entry into the buffer, no matter what its length, to see
-+-if it's the entry it wants,
-++if it is the entry it wants,
-+ .TP 5
-+ *
-+ and \fBtgetent()\fP is searching for a terminal type that either is the
-+@@ -1599,19 +1599,19 @@
-+ .PP
-+ The "after tc expansion" length will have a similar effect to the
-+ above, but only for people who actually set TERM to that terminal
-+-type, since \fBtgetent()\fP only does "tc" expansion once it's found the
-++type, since \fBtgetent()\fP only does "tc" expansion once it is found the
-+ terminal type it was looking for, not while searching.
-+ .PP
-+ In summary, a termcap entry that is longer than 1023 bytes can cause,
-+ on various combinations of termcap libraries and applications, a core
-+ dump, warnings, or incorrect operation.
-+-If it's too long even before
-++If it is too long even before
-+ "tc" expansion, it will have this effect even for users of some other
-+ terminal types and users whose TERM variable does not have a termcap
-+ entry.
-+ .PP
-+ When in -C (translate to termcap) mode, the \fBncurses\fR implementation of
-+-\fBtic\fR(1) issues warning messages when the pre-tc length of a termcap
-++\fB@TIC@\fR(1M) issues warning messages when the pre-tc length of a termcap
-+ translation is too long.
-+ The -c (check) option also checks resolved (after tc
-+ expansion) lengths.
-+@@ -1688,7 +1688,7 @@
-+ \fB@TIC@\fR(1M),
-+ \fB@INFOCMP@\fR(1M),
-+ \fBcurses\fR(3X),
-+-\fBprintf\fR(3S),
-++\fBprintf\fR(3),
-+ \fBterm\fR(\*n).
-+ .SH AUTHORS
-+ Zeyd M. Ben-Halim, Eric S. Raymond, Thomas E. Dickey.
-+Index: man/tic.1m
-+Prereq:  1.43 
-+--- ncurses-5.6/man/tic.1m	2006-05-13 15:14:01.000000000 +0000
-++++ ncurses-5.6-20071201/man/tic.1m	2006-12-24 17:59:11.000000000 +0000
-+@@ -26,8 +26,8 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: tic.1m,v 1.43 2006/05/13 15:14:01 tom Exp $
-+-.TH tic 1M ""
-++.\" $Id: tic.1m,v 1.44 2006/12/24 17:59:11 tom Exp $
-++.TH @TIC@ 1M ""
-+ .ds n 5
-+ .ds d @TERMINFO@
-+ .SH NAME
-+@@ -92,7 +92,7 @@
-+ .TP
-+ \fB-C\fR
-+ Force source translation to termcap format.  Note: this differs from the \fB-C\fR
-+-option of \fIinfocmp\fR(1M) in that it does not merely translate capability
-++option of \fB@INFOCMP@\fR(1M) in that it does not merely translate capability
-+ names, but also translates terminfo strings to termcap format.  Capabilities
-+ that are not translatable are left in the entry under their terminfo names
-+ but commented out with two preceding dots.
-+Index: man/toe.1m
-+Prereq:  1.18 
-+--- ncurses-5.6/man/toe.1m	2006-05-13 15:14:01.000000000 +0000
-++++ ncurses-5.6-20071201/man/toe.1m	2006-12-24 17:20:37.000000000 +0000
-+@@ -26,8 +26,8 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: toe.1m,v 1.18 2006/05/13 15:14:01 tom Exp $
-+-.TH toe 1M ""
-++.\" $Id: toe.1m,v 1.20 2006/12/24 17:20:37 tom Exp $
-++.TH @TOE@ 1M ""
-+ .ds n 5
-+ .ds d @TERMINFO@
-+ .SH NAME
-+@@ -67,7 +67,7 @@
-+ specifies that (verbose) output be written to standard error,
-+ showing \fBtoe\fR's progress.
-+ The optional parameter \fIn\fR is a number from 1 to 10,
-+-interpreted as for \fBtic\fR(1).
-++interpreted as for \fB@TIC@\fR(1M).
-+ .TP
-+ \fB-V\fR
-+ reports the version of ncurses which was used in this program, and exits.
-+Index: man/tput.1
-+Prereq:  1.25 
-+--- ncurses-5.6/man/tput.1	2006-05-13 15:14:01.000000000 +0000
-++++ ncurses-5.6-20071201/man/tput.1	2006-12-24 18:11:31.000000000 +0000
-+@@ -27,27 +27,27 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: tput.1,v 1.25 2006/05/13 15:14:01 tom Exp $
-+-.TH tput 1 ""
-++.\" $Id: tput.1,v 1.27 2006/12/24 18:11:31 tom Exp $
-++.TH @TPUT@ 1 ""
-+ .ds d @TERMINFO@
-+ .ds n 1
-+ .SH NAME
-+-\fBtput\fR, \fBreset\fR - initialize a terminal or query terminfo database
-++\fB@TPUT@\fR, \fBreset\fR - initialize a terminal or query terminfo database
-+ .SH SYNOPSIS
-+-\fBtput\fR [\fB-T\fR\fItype\fR] \fIcapname\fR [\fIparms\fR ... ]
-++\fB@TPUT@\fR [\fB-T\fR\fItype\fR] \fIcapname\fR [\fIparms\fR ... ]
-+ .br
-+-\fBtput\fR [\fB-T\fR\fItype\fR] \fBinit\fR
-++\fB@TPUT@\fR [\fB-T\fR\fItype\fR] \fBinit\fR
-+ .br
-+-\fBtput\fR [\fB-T\fR\fItype\fR] \fBreset\fR
-++\fB@TPUT@\fR [\fB-T\fR\fItype\fR] \fBreset\fR
-+ .br
-+-\fBtput\fR [\fB-T\fR\fItype\fR] \fBlongname\fR
-++\fB@TPUT@\fR [\fB-T\fR\fItype\fR] \fBlongname\fR
-+ .br
-+-\fBtput -S\fR  \fB<<\fR
-++\fB@TPUT@ -S\fR  \fB<<\fR
-+ .br
-+-\fBtput -V\fR
-++\fB@TPUT@ -V\fR
-+ .br
-+ .SH DESCRIPTION
-+-The \fBtput\fR utility uses the \fBterminfo\fR database to make the
-++The \fB@TPUT@\fR utility uses the \fBterminfo\fR database to make the
-+ values of terminal-dependent capabilities and information available to
-+ the shell (see \fBsh\fR(1)), to initialize or reset the terminal, or
-+ return the long name of the requested terminal type.
-+@@ -55,15 +55,15 @@
-+ .RS
-+ .TP 5
-+ string
-+-\fBtput\fR writes the string to the standard output.
-++\fB@TPUT@\fR writes the string to the standard output.
-+ No trailing newline is supplied.
-+ .TP
-+ integer
-+-\fBtput\fR writes the decimal value to the standard output,
-++\fB@TPUT@\fR writes the decimal value to the standard output,
-+ with a trailing newline.
-+ .TP
-+ boolean
-+-\fBtput\fR simply sets the exit code
-++\fB@TPUT@\fR simply sets the exit code
-+ (\fB0\fR for TRUE if the terminal has the capability,
-+ \fB1\fR for FALSE if it does not),
-+ and writes nothing to the standard output.
-+@@ -74,7 +74,7 @@
-+ (e.g., \fB$?\fR, see \fBsh\fR(1)) to be sure it is \fB0\fR.
-+ (See the \fBEXIT CODES\fR and \fBDIAGNOSTICS\fR sections.)
-+ For a complete list of capabilities
-+-and the \fIcapname\fR associated with each, see \fBterminfo\fR(\*n).
-++and the \fIcapname\fR associated with each, see \fBterminfo\fR(5).
-+ .TP
-+ \fB-T\fR\fItype\fR
-+ indicates the \fItype\fR of terminal.  Normally this option is
-+@@ -94,21 +94,21 @@
-+ .IP
-+ Most parameters are numbers.
-+ Only a few terminfo capabilities require string parameters;
-+-\fBtput\fR uses a table to decide which to pass as strings.
-+-Normally \fBtput\fR uses \fBtparm\fR (3X) to perform the substitution.
-++\fB@TPUT@\fR uses a table to decide which to pass as strings.
-++Normally \fB@TPUT@\fR uses \fBtparm\fR (3X) to perform the substitution.
-+ If no parameters are given for the capability,
-+-\fBtput\fR writes the string without performing the substitution.
-++\fB@TPUT@\fR writes the string without performing the substitution.
-+ .TP
-+ \fB-S\fR
-+-allows more than one capability per invocation of \fBtput\fR.  The
-+-capabilities must be passed to \fBtput\fR from the standard input
-++allows more than one capability per invocation of \fB@TPUT@\fR.  The
-++capabilities must be passed to \fB@TPUT@\fR from the standard input
-+ instead of from the command line (see example).
-+ Only one \fIcapname\fR is allowed per line.
-+ The \fB-S\fR option changes the
-+ meaning of the \fB0\fR and \fB1\fR boolean and string exit codes (see the
-+ EXIT CODES section).
-+ .IP
-+-Again, \fBtput\fR uses a table and the presence of parameters in its input
-++Again, \fB@TPUT@\fR uses a table and the presence of parameters in its input
-+ to decide whether to use \fBtparm\fR (3X),
-+ and how to interpret the parameters.
-+ .TP
-+@@ -157,58 +157,58 @@
-+ name in the first line of the terminal's description in the
-+ \fBterminfo\fR database [see \fBterm\fR(5)].
-+ .PP
-+-If \fBtput\fR is invoked by a link named \fBreset\fR, this has the
-+-same effect as \fBtput reset\fR.
-++If \fB@TPUT@\fR is invoked by a link named \fBreset\fR, this has the
-++same effect as \fB@TPUT@ reset\fR.
-+ See \fBtset\fR for comparison, which has similar behavior.
-+ .SH EXAMPLES
-+ .TP 5
-+-\fBtput init\fR
-++\fB@TPUT@ init\fR
-+ Initialize the terminal according to the type of
-+ terminal in the environmental variable \fBTERM\fR.  This
-+ command should be included in everyone's .profile after
-+ the environmental variable \fBTERM\fR has been exported, as
-+ illustrated on the \fBprofile\fR(5) manual page.
-+ .TP 5
-+-\fBtput -T5620 reset\fR
-++\fB@TPUT@ -T5620 reset\fR
-+ Reset an AT&T 5620 terminal, overriding the type of
-+ terminal in the environmental variable \fBTERM\fR.
-+ .TP 5
-+-\fBtput cup 0 0\fR
-++\fB@TPUT@ cup 0 0\fR
-+ Send the sequence to move the cursor to row \fB0\fR, column \fB0\fR
-+ (the upper left corner of the screen, usually known as the "home"
-+ cursor position).
-+ .TP 5
-+-\fBtput clear\fR
-++\fB@TPUT@ clear\fR
-+ Echo the clear-screen sequence for the current terminal.
-+ .TP 5
-+-\fBtput cols\fR
-++\fB@TPUT@ cols\fR
-+ Print the number of columns for the current terminal.
-+ .TP 5
-+-\fBtput -T450 cols\fR
-++\fB@TPUT@ -T450 cols\fR
-+ Print the number of columns for the 450 terminal.
-+ .TP 5
-+-\fBbold=`tput smso` offbold=`tput rmso`\fR
-++\fBbold=`@TPUT@ smso` offbold=`@TPUT@ rmso`\fR
-+ Set the shell variables \fBbold\fR, to begin stand-out mode
-+ sequence, and \fBoffbold\fR, to end standout mode sequence,
-+ for the current terminal.  This might be followed by a
-+ prompt: \fBecho "${bold}Please type in your name: ${offbold}\\c"\fR
-+ .TP 5
-+-\fBtput hc\fR
-++\fB@TPUT@ hc\fR
-+ Set exit code to indicate if the current terminal is a hard copy terminal.
-+ .TP 5
-+-\fBtput cup 23 4\fR
-++\fB@TPUT@ cup 23 4\fR
-+ Send the sequence to move the cursor to row 23, column 4.
-+ .TP 5
-+-\fBtput cup\fR
-++\fB@TPUT@ cup\fR
-+ Send the terminfo string for cursor-movement, with no parameters substituted.
-+ .TP 5
-+-\fBtput longname\fR
-++\fB@TPUT@ longname\fR
-+ Print the long name from the \fBterminfo\fR database for the
-+ type of terminal specified in the environmental
-+ variable \fBTERM\fR.
-+ .PP
-+ .RS 5
-+-\fBtput -S <<!\fR
-++\fB@TPUT@ -S <<!\fR
-+ .br
-+ \fB> clear\fR
-+ .br
-+@@ -220,7 +220,7 @@
-+ .RE
-+ .TP 5
-+ \&
-+-This example shows \fBtput\fR processing several capabilities in one invocation.
-++This example shows \fB@TPUT@\fR processing several capabilities in one invocation.
-+ It clears the screen,
-+ moves the cursor to position 10, 10
-+ and turns on bold (extra bright) mode.
-+@@ -238,7 +238,7 @@
-+ section of \fBterminfo\fR(5)
-+ .SH EXIT CODES
-+ If the \fB-S\fR option is used,
-+-\fBtput\fR checks for errors from each line,
-++\fB@TPUT@\fR checks for errors from each line,
-+ and if any errors are found, will set the exit code to 4 plus the
-+ number of lines with errors.
-+ If no errors are found, the exit code is \fB0\fR.
-+@@ -285,8 +285,8 @@
-+ =
-+ \fB0\fR	T{
-+ (\fIcapname\fR is a numeric variable that is not specified in the
-+-\fBterminfo\fR(\*n) database for this terminal type, e.g.
-+-\fBtput -T450 lines\fR and \fBtput -T2621 xmc\fR)
-++\fBterminfo\fR(5) database for this terminal type, e.g.
-++\fB@TPUT@ -T450 lines\fR and \fB@TPUT@ -T2621 xmc\fR)
-+ T}
-+ \fB1\fR	no error message is printed, see the \fBEXIT CODES\fR section.
-+ \fB2\fR	usage error
-+Index: man/tset.1
-+Prereq:  1.18 
-+--- ncurses-5.6/man/tset.1	2006-07-29 11:34:07.000000000 +0000
-++++ ncurses-5.6-20071201/man/tset.1	2006-12-24 15:00:30.000000000 +0000
-+@@ -26,7 +26,7 @@
-+ .\" authorization.                                                           *
-+ .\"***************************************************************************
-+ .\"
-+-.\" $Id: tset.1,v 1.18 2006/07/29 11:34:07 tom Exp $
-++.\" $Id: tset.1,v 1.19 2006/12/24 15:00:30 tom Exp $
-+ .TH tset 1 ""
-+ .SH NAME
-+ \fBtset\fR, \fBreset\fR - terminal initialization
-+@@ -272,7 +272,7 @@
-+ csh(1),
-+ sh(1),
-+ stty(1),
-+-setupterm(3X),
-++curs_terminfo(3X),
-+ tty(4),
-+ terminfo(5),
-+ ttys(5),
-+Index: menu/Makefile.in
-+Prereq:  1.43 
-+--- ncurses-5.6/menu/Makefile.in	2006-10-14 20:40:36.000000000 +0000
-++++ ncurses-5.6-20071201/menu/Makefile.in	2007-04-28 14:56:11.000000000 +0000
-+@@ -1,6 +1,6 @@
-+-# $Id: Makefile.in,v 1.43 2006/10/14 20:40:36 tom Exp $
-++# $Id: Makefile.in,v 1.48 2007/04/28 14:56:11 tom Exp $
-+ ##############################################################################
-+-# Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.                #
-++# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -27,7 +27,7 @@
-+ # authorization.                                                             #
-+ ##############################################################################
-+ #
-+-# Author: Thomas E. Dickey <dickey@clark.net> 1996,1997
-++# Author: Thomas E. Dickey 1996-on
-+ #
-+ # Makefile for menu source code.
-+ #
-+@@ -91,7 +91,7 @@
-+ 
-+ CFLAGS_DEFAULT	= $(CFLAGS_@DFT_UPR_MODEL@)
-+ 
-+-LINK		= $(LIBTOOL_LINK) $(CC)
-++LINK		= $(LIBTOOL_LINK)
-+ LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
-+ 
-+ SHLIB_DIRS	= -L../lib
-+@@ -106,8 +106,6 @@
-+ 
-+ RANLIB		= @LIB_PREP@
-+ 
-+-IMPORT_LIB	= @IMPORT_LIB@
-+-SHARED_LIB	= @SHARED_LIB@
-+ LIBRARIES	= @LIBS_TO_MAKE@
-+ 
-+ LINT		= @LINT@
-+@@ -128,7 +126,7 @@
-+ 
-+ $(DESTDIR)$(bindir) \
-+ $(DESTDIR)$(libdir) :
-+-	sh $(srcdir)/../mkinstalldirs $@
-++	sh $(srcdir)/../mkdirs.sh $@
-+ 
-+ # make copies to simplify include-paths while still keeping menu's include
-+ # file in this directory.
-+Index: menu/headers
-+--- ncurses-5.6/menu/headers	1998-02-11 12:13:49.000000000 +0000
-++++ ncurses-5.6-20071201/menu/headers	2006-12-24 16:25:45.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ ##############################################################################
-+-# Copyright (c) 1998 Free Software Foundation, Inc.                          #
-++# Copyright (c) 1998,2006 Free Software Foundation, Inc.                     #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -30,3 +30,4 @@
-+ #
-+ $(srcdir)/eti.h
-+ $(srcdir)/menu.h
-++# vile:makemode
-+Index: menu/menu.h
-+Prereq:  1.18 
-+--- ncurses-5.6/menu/menu.h	2003-11-08 20:48:24.000000000 +0000
-++++ ncurses-5.6-20071201/menu/menu.h	2007-02-24 17:32:13.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2002,2003 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2003,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -30,7 +30,7 @@
-+  *   Author:  Juergen Pfeifer, 1995,1997                                    *
-+  ****************************************************************************/
-+ 
-+-/* $Id: menu.h,v 1.18 2003/11/08 20:48:24 tom Exp $ */
-++/* $Id: menu.h,v 1.19 2007/02/24 17:32:13 tom Exp $ */
-+ 
-+ #ifndef ETI_MENU
-+ #define ETI_MENU
-+@@ -217,23 +217,23 @@
-+ extern NCURSES_EXPORT(int)	post_menu (MENU *);
-+ extern NCURSES_EXPORT(int)	scale_menu (const MENU *,int *,int *);
-+ extern NCURSES_EXPORT(int)	set_current_item (MENU *menu,ITEM *item);
-+-extern NCURSES_EXPORT(int)	set_item_init (MENU *,void(*)(MENU *));
-++extern NCURSES_EXPORT(int)	set_item_init (MENU *, Menu_Hook);
-+ extern NCURSES_EXPORT(int)	set_item_opts (ITEM *,Item_Options);
-+-extern NCURSES_EXPORT(int)	set_item_term (MENU *,void(*)(MENU *));
-++extern NCURSES_EXPORT(int)	set_item_term (MENU *, Menu_Hook);
-+ extern NCURSES_EXPORT(int)	set_item_userptr (ITEM *, void *);
-+ extern NCURSES_EXPORT(int)	set_item_value (ITEM *,bool);
-+ extern NCURSES_EXPORT(int)	set_menu_back (MENU *,chtype);
-+ extern NCURSES_EXPORT(int)	set_menu_fore (MENU *,chtype);
-+ extern NCURSES_EXPORT(int)	set_menu_format (MENU *,int,int);
-+ extern NCURSES_EXPORT(int)	set_menu_grey (MENU *,chtype);
-+-extern NCURSES_EXPORT(int)	set_menu_init (MENU *,void(*)(MENU *));
-++extern NCURSES_EXPORT(int)	set_menu_init (MENU *, Menu_Hook);
-+ extern NCURSES_EXPORT(int)	set_menu_items (MENU *,ITEM **);
-+ extern NCURSES_EXPORT(int)	set_menu_mark (MENU *, const char *);
-+ extern NCURSES_EXPORT(int)	set_menu_opts (MENU *,Menu_Options);
-+ extern NCURSES_EXPORT(int)	set_menu_pad (MENU *,int);
-+ extern NCURSES_EXPORT(int)	set_menu_pattern (MENU *,const char *);
-+ extern NCURSES_EXPORT(int)	set_menu_sub (MENU *,WINDOW *);
-+-extern NCURSES_EXPORT(int)	set_menu_term (MENU *,void(*)(MENU *));
-++extern NCURSES_EXPORT(int)	set_menu_term (MENU *, Menu_Hook);
-+ extern NCURSES_EXPORT(int)	set_menu_userptr (MENU *,void *);
-+ extern NCURSES_EXPORT(int)	set_menu_win (MENU *,WINDOW *);
-+ extern NCURSES_EXPORT(int)	set_top_row (MENU *,int);
-+Index: menu/modules
-+Prereq:  1.16 
-+--- ncurses-5.6/menu/modules	2004-12-25 22:06:33.000000000 +0000
-++++ ncurses-5.6-20071201/menu/modules	2006-12-24 00:52:39.000000000 +0000
-+@@ -1,6 +1,6 @@
-+-# $Id: modules,v 1.16 2004/12/25 22:06:33 tom Exp $
-++# $Id: modules,v 1.17 2006/12/24 00:52:39 tom Exp $
-+ ##############################################################################
-+-# Copyright (c) 1998,2004 Free Software Foundation, Inc.                     #
-++# Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.                #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -27,7 +27,7 @@
-+ # authorization.                                                             #
-+ ##############################################################################
-+ #
-+-# Author: Thomas E. Dickey <dickey@clark.net> 1996,1997
-++# Author: Thomas E. Dickey	1996-on
-+ #
-+ 
-+ @ base
-+@@ -59,3 +59,5 @@
-+ m_trace		lib		$(srcdir)	$(MENU_PRIV_H)
-+ m_userptr	lib		$(srcdir)	$(MENU_PRIV_H)
-+ m_win		lib		$(srcdir)	$(MENU_PRIV_H)
-++
-++# vile:makemode
-+Index: misc/Makefile.in
-+Prereq:  1.40 
-+--- ncurses-5.6/misc/Makefile.in	2006-10-21 13:28:03.000000000 +0000
-++++ ncurses-5.6-20071201/misc/Makefile.in	2007-03-31 15:54:17.000000000 +0000
-+@@ -1,6 +1,6 @@
-+-# $Id: Makefile.in,v 1.40 2006/10/21 13:28:03 tom Exp $
-++# $Id: Makefile.in,v 1.43 2007/03/31 15:54:17 tom Exp $
-+ ##############################################################################
-+-# Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.                #
-++# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -76,7 +76,7 @@
-+ 
-+ sources :
-+ 
-+-install : install.data install.scripts
-++install : install.data install.libs
-+ 
-+ install.data :	terminfo.tmp \
-+ 		$(DESTDIR)$(libdir) \
-+@@ -103,7 +103,7 @@
-+ 
-+ NCURSES_CONFIG	= ncurses@DFT_ARG_SUFFIX@@cf_cv_abi_version@-config
-+ 
-+-install.scripts :	ncurses-config
-++install.libs : $(DESTDIR)$(bindir) ncurses-config
-+ 	$(INSTALL_PROG) ncurses-config $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
-+ 
-+ terminfo.tmp : run_tic.sed $(source)
-+@@ -115,19 +115,20 @@
-+ 	ticdir=${ticdir} \
-+ 	$(SHELL) $(srcdir)/gen_edit.sh >$@
-+ 
-++$(DESTDIR)$(bindir) \
-+ $(DESTDIR)$(libdir) \
-+ $(DESTDIR)$(datadir) \
-+ $(DESTDIR)$(tabsetdir) :
-+-	$(SHELL) $(top_srcdir)/mkinstalldirs $@
-++	$(SHELL) $(top_srcdir)/mkdirs.sh $@
-+ 
-+-uninstall : uninstall.data uninstall.scripts
-++uninstall : uninstall.data uninstall.libs
-+ 
-+ uninstall.data :
-+ 	-test -d $(DESTDIR)$(tabsetdir) && rm -rf $(DESTDIR)$(tabsetdir)
-+ 	-test -d $(DESTDIR)$(ticdir) && rm -rf $(DESTDIR)$(ticdir)
-+ 	-test -f $(DESTDIR)$(ticfile) && rm -f $(DESTDIR)$(ticfile)
-+ 
-+-uninstall.scripts :
-++uninstall.libs :
-+ 	-rm -f $(DESTDIR)$(bindir)/$(NCURSES_CONFIG)
-+ 
-+ tags :
-+Index: misc/ncurses-config.in
-+Prereq:  1.11 
-+--- ncurses-5.6/misc/ncurses-config.in	2006-10-28 20:22:52.000000000 +0000
-++++ ncurses-5.6-20071201/misc/ncurses-config.in	2007-03-17 20:02:19.000000000 +0000
-+@@ -1,7 +1,7 @@
-+ #!@SHELL@
-+-# $Id: ncurses-config.in,v 1.11 2006/10/28 20:22:52 tom Exp $
-++# $Id: ncurses-config.in,v 1.12 2007/03/17 20:02:19 tom Exp $
-+ ##############################################################################
-+-# Copyright (c) 2006 Free Software Foundation, Inc.                          #
-++# Copyright (c) 2006,2007 Free Software Foundation, Inc.                     #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -40,6 +40,11 @@
-+ 
-+ THIS="ncurses@DFT_ARG_SUFFIX@"
-+ 
-++LANG=C;		export LANG
-++LANGUAGE=C;	export LANGUAGE
-++LC_ALL=C;	export LC_ALL
-++LC_CTYPE=C;	export LC_CTYPE
-++
-+ test $# = 0 && exec @SHELL@ $0 --error
-+ 
-+ while test $# -gt 0; do
-+Index: misc/shlib
-+Prereq:  1.10 
-+--- ncurses-5.6/misc/shlib	2005-06-25 22:41:17.000000000 +0000
-++++ ncurses-5.6-20071201/misc/shlib	2007-01-13 17:09:52.000000000 +0000
-+@@ -29,7 +29,7 @@
-+ #
-+ # Author: Thomas E. Dickey <dickey@clark.net> 1996
-+ #
-+-# $Id: shlib,v 1.10 2005/06/25 22:41:17 tom Exp $
-++# $Id: shlib,v 1.11 2007/01/13 17:09:52 tom Exp $
-+ # Use this script as a wrapper when running executables linked to shared
-+ # libraries on systems that use the $LD_LIBRARY_PATH variable and don't embed
-+ # the soname's path within the linked executable (such as IRIX), e.g,
-+@@ -81,6 +81,7 @@
-+ do
-+ 	if test -d $p; then
-+ 		q=`cd $p; pwd`
-++		break
-+ 	elif test -f configure && test ! -d ../$p ; then
-+ 		break
-+ 	fi
-+Index: misc/terminfo.src
-+--- ncurses-5.6/misc/terminfo.src	2006-10-07 17:52:03.000000000 +0000
-++++ ncurses-5.6-20071201/misc/terminfo.src	2007-11-03 19:02:01.000000000 +0000
-+@@ -6,8 +6,8 @@
-+ # Report bugs and new terminal descriptions to
-+ #	bug-ncurses@gnu.org
-+ #
-+-#	$Revision: 1.303 $
-+-#	$Date: 2006/10/07 17:52:03 $
-++#	$Revision: 1.318 $
-++#	$Date: 2007/11/03 19:02:01 $
-+ #
-+ # The original header is preserved below for reference.  It is noted that there
-+ # is a "newer" version which differs in some cosmetic details (but actually
-+@@ -317,6 +317,16 @@
-+ 	OTbs,
-+ 	bel=^G, cr=^M, cud1=^J, ind=^J,
-+ 
-++# This is almost the same as "dumb", but with no prespecified width.
-++# DEL and ^C are hardcoded to act as kill characters.
-++# ^D acts as a line break (just like newline).
-++# It also interprets
-++#      \033];xxx\007 
-++# for compatibility with xterm -TD
-++9term|Plan9 terminal emulator for X,
-++	am,
-++	OTnl=^J, bel=^G, cud1=^J,
-++
-+ #### ANSI.SYS/ISO 6429/ECMA-48 Capabilities
-+ #
-+ # See the end-of-file comment for more on these.
-+@@ -2691,8 +2701,9 @@
-+ vt100-putty|Reset PuTTY to pure vt100,
-+ 	rs2=\E<\E["p\Ec\E[?3l\E]R\E[40"p\E[61"p\E[50;1;2"p,
-+ 	use=vt100,
-++# palette is hardcoded...
-+ putty-256color|PuTTY 0.58 with xterm 256-colors,
-+-	use=xterm+256color, use=putty,
-++	initc@, use=xterm+256color, use=putty,
-+ 
-+ # One of the keyboard selections is "VT100+".
-+ # pterm (the X11 port) uses shifted F1-F10 as F11-F20
-+@@ -3015,11 +3026,10 @@
-+ xterm-new|modern xterm terminal emulator,
-+ 	npc,
-+ 	indn=\E[%p1%dS, kDC=\E[3;2~, kEND=\E[1;2F, kHOM=\E[1;2H,
-+-	kIC=\E[2;2~, kLFT=\E[1;2D, kNXT=\E[6;2~, kPRV=\E[5;2~,
-+-	kRIT=\E[1;2C, kb2=\EOE, kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB,
-+-	kcuf1=\EOC, kcuu1=\EOA, kend=\EOF, kent=\EOM, khome=\EOH,
-+-	kich1=\E[2~, kind=\E[1;2B, kmous=\E[M, knp=\E[6~,
-+-	kpp=\E[5~, kri=\E[1;2A, rin=\E[%p1%dT, use=xterm+pcfkeys,
-++	kIC=\E[2;2~, kNXT=\E[6;2~, kPRV=\E[5;2~, kb2=\EOE,
-++	kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-++	kend=\EOF, kent=\EOM, khome=\EOH, kich1=\E[2~, kmous=\E[M,
-++	knp=\E[6~, kpp=\E[5~, rin=\E[%p1%dT, use=xterm+pcfkeys,
-+ 	use=xterm-basic,
-+ #
-+ # This fragment describes as much of XFree86 xterm's "pc-style" function
-+@@ -3060,25 +3070,30 @@
-+ # modifyCursorKeys resource.  These fragments list the modified cursor-keys
-+ # that might apply to xterm+pcfkeys with different values of that resource.
-+ xterm+pcc3|fragment with modifyCursorKeys:3,
-+-	kDN=\E[>1;2B, kDN5=\E[>1;5B, kDN6=\E[>1;6B,
-++	kLFT=\E[>1;2D, kRIT=\E[>1;2C, kind=\E[>1;2B,
-++	kri=\E[>1;2A, kDN=\E[>1;2B, kDN5=\E[>1;5B, kDN6=\E[>1;6B,
-+ 	kLFT5=\E[>1;5D, kLFT6=\E[>1;6D, kRIT5=\E[>1;5C,
-+ 	kRIT6=\E[>1;6C, kUP=\E[>1;2A, kUP5=\E[>1;5A,
-+ 	kUP6=\E[>1;6A,
-+ 
-+ xterm+pcc2|fragment with modifyCursorKeys:2,
-++	kLFT=\E[1;2D, kRIT=\E[1;2C, kind=\E[1;2B, kri=\E[1;2A,
-+ 	kDN=\E[1;2B, kDN5=\E[1;5B, kDN6=\E[1;6B, kLFT5=\E[1;5D,
-+ 	kLFT6=\E[1;6D, kRIT5=\E[1;5C, kRIT6=\E[1;6C, kUP=\E[1;2A,
-+ 	kUP5=\E[1;5A, kUP6=\E[1;6A,
-+ 
-+ xterm+pcc1|fragment with modifyCursorKeys:1,
-+-	kDN=\E[2B, kDN5=\E[5B, kDN6=\E[6B, kLFT5=\E[5D,
-+-	kLFT6=\E[6D, kRIT5=\E[5C, kRIT6=\E[6C, kUP=\E[2A,
-+-	kUP5=\E[5A, kUP6=\E[6A,
-++	kLFT=\E[2D, kRIT=\E[2C, kind=\E[2B, kri=\E[2A, kDN=\E[2B,
-++	kDN5=\E[5B, kDN6=\E[6B, kLFT5=\E[5D, kLFT6=\E[6D,
-++	kRIT5=\E[5C, kRIT6=\E[6C, kUP=\E[2A, kUP5=\E[5A,
-++	kUP6=\E[6A,
-+ 
-+ xterm+pcc0|fragment with modifyCursorKeys:0,
-+-	kDN=\EO2B, kDN5=\EO5B, kDN6=\EO6B, kLFT5=\EO5D,
-+-	kLFT6=\EO6D, kRIT5=\EO5C, kRIT6=\EO6C, kUP=\EO2A,
-+-	kUP5=\EO5A, kUP6=\EO6A,
-++	kLFT=\EO2D, kRIT=\EO2C, kind=\EO2B, kri=\EO2A, kDN=\EO2B,
-++	kDN5=\EO5B, kDN6=\EO6B, kLFT5=\EO5D, kLFT6=\EO6D,
-++	kRIT5=\EO5C, kRIT6=\EO6C, kUP=\EO2A, kUP5=\EO5A,
-++	kUP6=\EO6A,
-++
-+ #
-+ # Here are corresponding fragments from xterm patch #216:
-+ #
-+@@ -3101,24 +3116,37 @@
-+ 	kf59=\E[23;3~, kf6=\E[17~, kf60=\E[24;3~, kf61=\EO4P,
-+ 	kf62=\EO4Q, kf63=\EO4R, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-+ #
-+-xterm+pcf2|fragment with modifyFunctionKeys:0,
-++xterm+pcf2|fragment with modifyFunctionKeys:2,
-+ 	kf1=\EOP, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~,
-+-	kf13=\E[2P, kf14=\E[2Q, kf15=\E[2R, kf16=\E[2S,
-++	kf13=\E[1;2P, kf14=\E[1;2Q, kf15=\E[1;2R, kf16=\E[1;2S,
-+ 	kf17=\E[15;2~, kf18=\E[17;2~, kf19=\E[18;2~, kf2=\EOQ,
-+ 	kf20=\E[19;2~, kf21=\E[20;2~, kf22=\E[21;2~,
-+-	kf23=\E[23;2~, kf24=\E[24;2~, kf25=\E[5P, kf26=\E[5Q,
-+-	kf27=\E[5R, kf28=\E[5S, kf29=\E[15;5~, kf3=\EOR,
-++	kf23=\E[23;2~, kf24=\E[24;2~, kf25=\E[1;5P, kf26=\E[1;5Q,
-++	kf27=\E[1;5R, kf28=\E[1;5S, kf29=\E[15;5~, kf3=\EOR,
-+ 	kf30=\E[17;5~, kf31=\E[18;5~, kf32=\E[19;5~,
-+ 	kf33=\E[20;5~, kf34=\E[21;5~, kf35=\E[23;5~,
-+-	kf36=\E[24;5~, kf37=\E[6P, kf38=\E[6Q, kf39=\E[6R,
-+-	kf4=\EOS, kf40=\E[6S, kf41=\E[15;6~, kf42=\E[17;6~,
-++	kf36=\E[24;5~, kf37=\E[1;6P, kf38=\E[1;6Q, kf39=\E[1;6R,
-++	kf4=\EOS, kf40=\E[1;6S, kf41=\E[15;6~, kf42=\E[17;6~,
-+ 	kf43=\E[18;6~, kf44=\E[19;6~, kf45=\E[20;6~,
-+-	kf46=\E[21;6~, kf47=\E[23;6~, kf48=\E[24;6~, kf49=\E[3P,
-+-	kf5=\E[15~, kf50=\E[3Q, kf51=\E[3R, kf52=\E[3S,
-+-	kf53=\E[15;3~, kf54=\E[17;3~, kf55=\E[18;3~,
-+-	kf56=\E[19;3~, kf57=\E[20;3~, kf58=\E[21;3~,
-+-	kf59=\E[23;3~, kf6=\E[17~, kf60=\E[24;3~, kf61=\E[4P,
-+-	kf62=\E[4Q, kf63=\E[4R, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-++	kf46=\E[21;6~, kf47=\E[23;6~, kf48=\E[24;6~,
-++	kf49=\E[1;3P, kf5=\E[15~, kf50=\E[1;3Q, kf51=\E[1;3R,
-++	kf52=\E[1;3S, kf53=\E[15;3~, kf54=\E[17;3~,
-++	kf55=\E[18;3~, kf56=\E[19;3~, kf57=\E[20;3~,
-++	kf58=\E[21;3~, kf59=\E[23;3~, kf6=\E[17~, kf60=\E[24;3~,
-++	kf61=\E[1;4P, kf62=\E[1;4Q, kf63=\E[1;4R, kf7=\E[18~,
-++	kf8=\E[19~, kf9=\E[20~,
-++#
-++# Those chunks use the new-style (the xterm oldFunctionKeys resource is false).
-++# Alternatively, the same scheme with old-style function keys as in xterm-r6
-++# is shown here (because that is used in mrxvt and mlterm):
-++xterm+r6f2|xterm with oldFunctionKeys and modifyFunctionKeys:2,
-++	kf1=\E[11~, kf13=\E[11;2~, kf14=\E[12;2~, kf15=\E[13;2~,
-++	kf16=\E[14;2~, kf2=\E[12~, kf25=\E[11;5~, kf26=\E[12;5~,
-++	kf27=\E[13;5~, kf28=\E[14;5~, kf3=\E[13~, kf37=\E[11;6~,
-++	kf38=\E[12;6~, kf39=\E[13;6~, kf4=\E[14~, kf40=\E[14;6~,
-++	kf49=\E[11;3~, kf50=\E[12;3~, kf51=\E[13;3~,
-++	kf52=\E[14;3~, kf61=\E[11;4~, kf62=\E[12;4~,
-++	kf63=\E[13;4~, use=xterm+pcf2,
-+ #
-+ # This chunk is used for building the VT220/Sun/PC keyboard variants.
-+ xterm-basic|modern xterm terminal emulator - common,
-+@@ -3157,6 +3185,8 @@
-+ xterm-16color|xterm with 16 colors like aixterm,
-+ 	use=ibm+16color, use=xterm-new,
-+ 
-++# This is a compile-time feature of XFree86 xterm beginning with
-++# patch #111 (1999/7/10) -TD
-+ xterm+256color|xterm 256-color feature,
-+ 	ccc,
-+ 	colors#256, pairs#32767,
-+@@ -3165,6 +3195,18 @@
-+ 	setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m,
-+ 	setb@, setf@,
-+ 
-++# This is a compile-time feature of XFree86 xterm beginning with
-++# patch #115 (1999/9/18) -TD
-++#
-++# Note that the escape sequences used are the same as for 256-colors - xterm
-++# has a different table of default color resource values.  If built for
-++# 256-colors, it can still handle an 88-color palette by using the initc
-++# capability.
-++#
-++# At this time (2007/7/14), except for rxvt 2.7.x, none of the other terminals
-++# which support the xterm+256color feature support the associated initc
-++# capability.  So it is cancelled in the entries which use this and/or the
-++# xterm+256color block.
-+ xterm+88color|xterm 88-color feature,
-+ 	colors#88, pairs#7744, use=xterm+256color,
-+ 
-+@@ -3444,11 +3486,23 @@
-+ 	rs2=\E7\E[r\E8\E[m\E[?7h\E[!p\E[?1;3;4;6l\E[4l\E>\E[?1000l\E[?25h,
-+ 	use=ansi+enq, use=xterm+pcc0, use=gnome-rh90,
-+ 
-++# GNOME Terminal 2.18.1 (2007 snapshot)
-++#
-++# For any "recent" version of gnome-terminal, it is futile to attempt to
-++# support modifiers on cursor- and keypad keys because the program usually
-++# is hardcoded to set $TERM to "xterm", and on startup, it builds a subset
-++# of the keys (which more/less correspond to the termcap values), and will
-++# interpret those according to the $TERM value, but others not in the
-++# terminfo according to some constantly changing set of hacker guidelines -TD
-++gnome-2007|GNOME Terminal snapshot 2.18.1,
-++	use=xterm+pcc2, use=gnome-fc5,
-++
-+ gnome|GNOME Terminal,
-+-	use=gnome-fc5,
-++	use=gnome-2007,
-+ 
-++# palette is hardcoded...
-+ gnome-256color|GNOME Terminal with xterm 256-colors,
-+-	use=xterm+256color, use=gnome,
-++	initc@, use=xterm+256color, use=gnome,
-+ 
-+ # XFCE Terminal 0.2.5.4beta2
-+ #
-+@@ -3551,14 +3605,29 @@
-+ konsole|KDE console window,
-+ 	use=konsole-xf4x,
-+ 
-+-# Based on mlterm 2.9.2's mlterm.ti, with corrections/additions from reading
-+-# the source code and running tack -TD
-++# palette is hardcoded...
-++konsole-256color|KDE console window with xterm 256-colors,
-++	initc@, use=xterm+256color, use=konsole,
-++
-++# This is mlterm 2.9.3's mlterm.ti, with some additions/corrections -TD
-+ #
-+-# This is nominally a vt102 emulator, with features borrowed from rxvt and
-++# It is nominally a vt102 emulator, with features borrowed from rxvt and
-+ # xterm.
-+ #
-+-# There are some problems with vttest:
-+-#	test of character sets leaves it in line-drawing mode.
-++# The function keys are numbered based on shift/control/alt modifiers, except
-++# that the control-modifier itself is used to spawn a new copy of mlterm (the
-++# "-P" option).  So control/F1 to control/F12 may not be usable, depending on
-++# how it is configured.
-++#
-++#				kf1 to kf12	\E[11~   to \E[24~
-++#	shift			kf1 to kf12	\E[11;2~ to \E[24;2~
-++#	alt			kf1 to kf12	\E[11;3~ to \E[24;3~
-++#	shift/alt		kf1 to kf12	\E[11;4~ to \E[24;4~
-++#	control			kf1 to kf12	\E[11;5~ to \E[24;5~ (maybe)
-++#	control/shift		kf1 to kf12	\E[11;6~ to \E[24;6~
-++#	control/alt		kf1 to kf12	\E[11;7~ to \E[24;7~
-++#	control/shit/alt	kf1 to kf12	\E[11;8~ to \E[24;8~
-++#
-+ mlterm|multi lingual terminal emulator,
-+ 	am, eslok, km, mc5i, mir, msgr, npc, xenl,
-+ 	colors#8, cols#80, it#8, lines#24, pairs#64,
-+@@ -3574,21 +3643,29 @@
-+ 	ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=^J, indn=\E[%p1%dS,
-+ 	is2=\E7\E[r\E[m\E[?7h\E[?1;3;4;6l\E[4l\E8\E>,
-+ 	kbs=\177, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
-+-	kdch1=\E[3~, kend=\EOF, kent=\EOM, kf1=\E[11~, kf10=\E[21~,
-+-	kf11=\E[23~, kf12=\E[24~, kf2=\E[12~, kf3=\E[13~,
-+-	kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
-+-	kf9=\E[20~, kfnd=\E[1~, khome=\EOH, kich1=\E[2~,
-+-	kmous=\E[M, knp=\E[6~, kpp=\E[5~, kslt=\E[4~, mc0=\E[i,
-+-	nel=\EE, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM,
-+-	rin=\E[%p1%dT, rmacs=\E(B, rmam=\E[?7l,
-+-	rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=\E[?1l\E>,
-+-	rmso=\E[27m, rmul=\E[24m,
-++	kdch1=\E[3~, kend=\EOF, kent=\EOM, kfnd=\E[1~, khome=\EOH,
-++	kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~, kslt=\E[4~,
-++	mc0=\E[i, nel=\EE, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM,
-++	rin=\E[%p1%dT, rmacs=\E(B, rmam=\E[?7l, rmcup=\E[?1049l,
-++	rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
-+ 	rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;3;4;6l\E[4l\E>\E[?1000l,
-+ 	sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
-+ 	sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;,
-+-	sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smcup=\E7\E[?47h,
-++	sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smcup=\E[?1049h,
-+ 	smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
-+-	tbc=\E[3g, vpa=\E[%i%p1%dd, use=vt100+enq,
-++	tbc=\E[3g, u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?1;2c, u9=\E[c,
-++	vpa=\E[%i%p1%dd, use=mlterm+pcfkeys, use=xterm+r6f2,
-++
-++# The insert/delete/home/end keys do not respond to modifiers because mlterm
-++# looks in its termcap to decide which string to send.  If it used terminfo
-++# (when available), it could use the extended names introduced for xterm.
-++mlterm+pcfkeys|fragment for PC-style fkeys,
-++	kLFT=\EO1;2D, kNXT=\E[6;2~, kPRV=\E[5;2~, kRIT=\EO1;2C,
-++	kDN=\EO1;2B, kDN5=\EO1;5B, kDN6=\EO1;6B, kIC5=\E[2;5~,
-++	kIC6=\E[2;6~, kLFT5=\EO1;5D, kLFT6=\EO1;6D,
-++	kNXT5=\E[6;5~, kNXT6=\E[6;6~, kPRV5=\E[5;5~,
-++	kPRV6=\E[5;6~, kRIT5=\EO1;5C, kRIT6=\EO1;6C, kUP=\EO1;2A,
-++	kUP5=\EO1;5A, kUP6=\EO1;6A,
-+ 
-+ # From: Thomas Dickey <dickey@clark.net> 04 Oct 1997
-+ # Updated: Oezguer Kesim <kesim@math.fu-berlin.de> 02 Nov 1997
-+@@ -3607,7 +3684,7 @@
-+ #
-+ # rxvt is normally configured to look for "xterm" or "xterm-color" as $TERM.
-+ # Since rxvt is not really compatible with xterm, it should be configured as
-+-# "rxvt" (monochrome) and "rxvt-color".
-++# "rxvt" or "rxvt-color".
-+ #
-+ # removed dch/dch1 because they are inconsistent with bce/ech -TD
-+ # remove km as per tack test -TD
-+@@ -3677,6 +3754,7 @@
-+ #  F18              ESC [ 32 ~   ESC [ 32 $   ESC [ 32 ^   ESC [ 32 @
-+ #  F19              ESC [ 33 ~   ESC [ 33 $   ESC [ 33 ^   ESC [ 33 @
-+ #  F20              ESC [ 34 ~   ESC [ 34 $   ESC [ 34 ^   ESC [ 34 @
-++#
-+ #                                                          Application
-+ #  Up               ESC [ A      ESC [ a      ESC O a      ESC O A
-+ #  Down             ESC [ B      ESC [ b      ESC O b      ESC O B
-+@@ -3704,10 +3782,18 @@
-+ #  XK_KP_8          8                                      ESC O x
-+ #  XK_KP_9          9                                      ESC O y
-+ #
-++# The source-code for rxvt actually defines mappings for F21-F35, using
-++# "ESC [ 35 ~" to "ESC [  49 ~".  Keyboards with more than 12 function keys
-++# are rare, so this entry uses the shift- and control-modifiers as in
-++# xterm+pcfkeys to define keys past F12.
-++#
-++# kIC is normally not used, since rxvt performs a paste for that (shifted
-++# insert), unless private mode 35 is set.
-++#
-+ # kDN, kDN5, kDN6, etc are extensions based on the names from xterm+pcfkeys -TD
-+ # Removed kDN6, etc (control+shift) since rxvt does not implement this -TD
-+ rxvt+pcfkeys|fragment for PC-style fkeys,
-+-	kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E2$, kLFT=\E[d,
-++	kDC=\E[3$, kEND=\E[8$, kHOM=\E[7$, kIC=\E[2$, kLFT=\E[d,
-+ 	kNXT=\E[6$, kPRV=\E[5$, kRIT=\E[c, kcub1=\E[D, kcud1=\E[B,
-+ 	kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~, kel=\E[8\^,
-+ 	kend=\E[8~, kf1=\E[11~, kf10=\E[21~, kf11=\E[23~,
-+@@ -3722,7 +3808,10 @@
-+ 	kf41=\E[33\^, kf42=\E[34\^, kf43=\E[23@, kf44=\E[24@,
-+ 	kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
-+ 	kfnd=\E[1~, khome=\E[7~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
-+-	kslt=\E[4~, kDN=\E[b, kDN5=\EOb, kLFT5=\EOd, kRIT5=\EOc,
-++	kslt=\E[4~, kDC5=\E[3\^, kDC6=\E[3@, kDN=\E[b, kDN5=\EOb,
-++	kEND5=\E[8\^, kEND6=\E[8@, kHOM5=\E[7\^, kHOM6=\E[7@,
-++	kIC5=\E[2\^, kIC6=\E[2@, kLFT5=\EOd, kNXT5=\E[6\^,
-++	kNXT6=\E[6@, kPRV5=\E[5\^, kPRV6=\E[5@, kRIT5=\EOc,
-+ 	kUP=\E[a, kUP5=\EOa,
-+ 
-+ rxvt|rxvt terminal emulator (X Window System),
-+@@ -3747,6 +3836,13 @@
-+ rxvt-16color|xterm with 16 colors like aixterm,
-+ 	ncv#32, use=ibm+16color, use=rxvt,
-+ 
-++# mrxvt 0.5.3
-++#
-++# mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which
-++# makes its function-keys different from other flavors of rxvt -TD
-++mrxvt|multitabbed rxvt,
-++	use=xterm+pcc2, use=xterm+r6f2, use=rxvt,
-++
-+ # From: Michael Jennings <mej@valinux.com>
-+ #
-+ # Eterm 0.9.3
-+@@ -15183,6 +15279,82 @@
-+ 	sgr0=^O, smso=\E0Q\016, smul=\E0`\016,
-+ 	vpa=\013%p1%{64}%+%c,
-+ 
-++# Newbury Data Recording Limited (Newbury Data)
-++#
-++# Have been manufacturing and reselling  various peripherals for a long time
-++# They don't make terminals anymore, but are still in business (in 2007).
-++# Their e-mail address is at ndsales@newburydata.co.uk
-++# and their post address is:
-++#
-++# Newbury Data Recording Ltd,
-++# Premier Park, Road One,
-++# Winsford, Cheshire, CW7 3PT
-++#
-++# Their technical support is still good, they sent me for free a printed copy
-++# of the 9500 user manual and I got it just 1 week after I first contacted them
-++# (in 2005)!
-++
-++# NDR 9500
-++# Manufactured in the early/mid eighties, behaves almost the same as a
-++# Televideo 950.  Take a 950, change its cabinet for a more 80s-ish one (but
-++# keep the same keyboard layout), add an optional 25-line mode, replace the DIP
-++# switches with a menu and remove the "lock line" feature (ESC !  1 and ESC ! 
-++# 2), here is the NDR 9500.  Even the line-lock, albeit disabled, is
-++# recognized:  if you type in "ESC !", the next (third) character is not
-++# echoed, showing that the terminal was actually waiting for a parameter!
-++ndr9500|nd9500|Newbury Data 9500,
-++	am, bw, hs, mc5i, mir, msgr, ul, xon,
-++	cols#80, lines#24, wsl#79,
-++	acsc=qKnImAjDwNuLtMvOlBkCxJ, bel=^G, cbt=\EI, civis=\E.0,
-++	clear=\E;, cnorm=\E.1, cr=^M, cub1=^H, cud1=^V, cuf1=^L,
-++	cup=\E=%p1%{32}%+%c%p2%{32}%+%c, cuu1=^K, dch1=\EW,
-++	dim=\E), dl1=\ER, dsl=\Eh, ed=\EY, el=\ET,
-++	flash=\Eb$<50/>\Ed, fsl=^M, home=^^, ht=^I, hts=\E1,
-++	ich1=\EQ, il1=\EE, ind=^J, is2=\Ew\E'\EDF\El\Er\EO,
-++	kDC=\Er, kDL=\EO, kEOL=\Et, kIC=\Eq, kcbt=\EI, kclr=^Z,
-++	kcub1=^H, kcud1=^V, kcuf1=^L, kcuu1=^K, kdch1=\EW, kdl1=\ER,
-++	ked=\EY, kel=\ET, kent=^M, kf1=^A@\r, kf10=^AI\r, kf11=^AJ\r,
-++	kf12=^A`\r, kf13=^Aa\r, kf14=^Ab\r, kf15=^Ac\r, kf16=^Ad\r,
-++	kf17=^Ae\r, kf18=^Af\r, kf19=^Ag\r, kf2=^AA\r, kf20=^Ah\r,
-++	kf21=^Ai\r, kf22=^Aj\r, kf3=^AB\r, kf4=^AC\r, kf5=^AD\r,
-++	kf6=^AE\r, kf7=^AF\r, kf8=^AG\r, kf9=^AH\r, khome=^^,
-++	kich1=\EQ, kil1=\EE, kprt=\EP, mc4=\Ea, mc5=\E`, nel=^_,
-++	pfloc=\E|%{48}%p1%+%c2%p2\031,
-++	pfx=\E|%{48}%p1%+%c1%p2\031, prot=\E), ri=\Ej,
-++	rmacs=\E%%, rmir=\Er, rmso=\E(, rmxon=^N,
-++	sgr=\E%%\E(%?%p1%p5%p8%|%|%t\E)%;%?%p9%t\E$%;,
-++	sgr0=\EG0\E%%\E(, smacs=\E$, smir=\Eq, smso=\E), smxon=^O,
-++	tbc=\E3, tsl=\Eg\Ef\011%p1%{32}%+%c, .kbs=^H,
-++
-++ndr9500-nl|NDR 9500 with no status line,
-++	hs@,
-++	wsl@,
-++	dsl@, fsl@, tsl@, use=ndr9500,
-++
-++ndr9500-25|NDR 9500 with 25th line enabled,
-++	lines#25, use=ndr9500,
-++
-++ndr9500-25-nl|NDR 9500 with 25 lines and no status line,
-++	lines#25, use=ndr9500-nl,
-++
-++ndr9500-mc|NDR 9500 with magic cookies (enables underline inverse video invisible and blink),
-++	msgr@,
-++	xmc#1,
-++	blink=\EG2, invis=\EG1, rev=\EG4, rmso=\EG0, rmul=\EG0,
-++	sgr=\E%%\E(%?%p5%p8%|%t\E)%;%?%p9%t\E$%;\EG%{48}%?%p7%t%{1}%+%;%?%p4%t%{2}%+%;%?%p3%p1%|%t%{4}%+%;%?%p2%t%{8}%+%;%c,
-++	sgr0=\EG0\E%%\E(, smso=\EG4, smul=\EG8, use=ndr9500,
-++
-++ndr9500-25-mc|NDR 500 with 25 lines and magic cookies,
-++	lines#25, use=ndr9500-mc,
-++
-++ndr9500-mc-nl|NDR 9500 with magic cookies and no status line,
-++	hs@,
-++	wsl@,
-++	dsl@, fsl@, tsl@, use=ndr9500-mc,
-++
-++ndr9500-25-mc-nl|NDR 9500 with 25 lines and magic cookies and no status line,
-++	lines#25, use=ndr9500-mc-nl,
-++
-+ #### Perkin-Elmer (Owl)
-+ #
-+ # These are official terminfo entries from within Perkin-Elmer.
-+@@ -18147,19 +18319,19 @@
-+ h19|heath|h19-b|heathkit|heath-19|z19|zenith|heathkit h19,
-+ 	OTbs, am, eslok, hs, mir, msgr,
-+ 	cols#80, it#8, lines#24,
-+-	acsc=, bel=^G, clear=\EE, cnorm=\Ey4, cr=^M, cub1=^H, cud1=\EB,
-+-	cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA,
-+-	cvvis=\Ex4, dch1=\EN, ed=\EJ, el=\EK, fsl=\Ek\Ey5, home=\EH,
-+-	ht=^I, ind=^J, ip=<1.5/>, kbs=^H, kcub1=\ED, kcud1=\EB,
-+-	kcuf1=\EC, kcuu1=\EA, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV,
-+-	kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, khome=\EH, lf6=blue,
-+-	lf7=red, lf8=white, ri=\EI, rmacs=\EG, rmir=\EO, rmso=\Eq,
-+-	smacs=\EF, smir=\E@, smso=\Ep,
-+-	tsl=\Ej\Ex5\EY8%p1%{32}%+%c\Eo\Eo,
-++	acsc=~\^x`qanbkcjdmelfgg+hai.kwsutvutvozs{, bel=^G,
-++	clear=\EE, cnorm=\Ey4, cr=^M, cub1=^H, cud1=\EB, cuf1=\EC,
-++	cup=\EY%p1%{32}%+%c%p2%{32}%+%c, cuu1=\EA, cvvis=\Ex4,
-++	dch1=\EN, ed=\EJ, el=\EK, fsl=\Ek\Ey5, home=\EH, ht=^I, ind=^J,
-++	ip=<1.5/>, kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC,
-++	kcuu1=\EA, kf1=\ES, kf2=\ET, kf3=\EU, kf4=\EV, kf5=\EW,
-++	kf6=\EP, kf7=\EQ, kf8=\ER, khome=\EH, lf6=blue, lf7=red,
-++	lf8=white, ri=\EI, rmacs=\EG, rmir=\EO, rmso=\Eq, smacs=\EF,
-++	smir=\E@, smso=\Ep, tsl=\Ej\Ex5\EY8%p1%{32}%+%c\Eo\Eo,
-+ h19-u|heathkit with underscore cursor,
-+ 	cnorm@, cvvis@, use=h19-b,
-+ h19-g|h19g|heathkit w/block cursor,
-+-	cnorm=\Ex4, use=h19-b,
-++	cnorm=\Ex4, cvvis@, use=h19-b,
-+ alto-h19|altoh19|altoheath|alto-heath|alto emulating heathkit h19,
-+ 	lines#60,
-+ 	dl1=\EM, il1=\EL, use=h19,
-+@@ -18285,14 +18457,15 @@
-+ z100bw|h100bw|z110bw|z-100bw|h-100bw|heath/zenith z-100 pc,
-+ 	OTbs, OTpt, mir, msgr,
-+ 	OTkn#10, cols#80, it#8, lines#24,
-+-	acsc=, clear=\EE$<5*/>, cnorm=\Ey4, cub1=^H, cud1=\EB,
-+-	cuf1=\EC, cup=\EY%p1%{32}%+%c%p2%{32}%+%c$<1*/>,
-+-	cuu1=\EA, cvvis=\Ex4, dch1=\EN$<1*/>, dl1=\EM$<5*/>,
-+-	ed=\EJ, el=\EK, home=\EH, ht=^I, il1=\EL$<5*/>, kbs=^H,
-+-	kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA, kf0=\EJ, kf1=\ES,
-+-	kf2=\ET, kf3=\EU, kf4=\EV, kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER,
-+-	kf9=\EOI, khome=\EH, ri=\EI, rmacs=\EG, rmir=\EO, rmso=\Eq,
-+-	smacs=\EF, smir=\E@, smso=\Ep,
-++	acsc=~\^x`qanbkcjdmelfgg+hai.kwsutvutvozs{,
-++	clear=\EE$<5*/>, cnorm=\Ey4, cub1=^H, cud1=\EB, cuf1=\EC,
-++	cup=\EY%p1%{32}%+%c%p2%{32}%+%c$<1*/>, cuu1=\EA,
-++	cvvis=\Ex4, dch1=\EN$<1*/>, dl1=\EM$<5*/>, ed=\EJ, el=\EK,
-++	home=\EH, ht=^I, il1=\EL$<5*/>, kbs=^H, kcub1=\ED, kcud1=\EB,
-++	kcuf1=\EC, kcuu1=\EA, kf0=\EJ, kf1=\ES, kf2=\ET, kf3=\EU,
-++	kf4=\EV, kf5=\EW, kf6=\EP, kf7=\EQ, kf8=\ER, kf9=\EOI,
-++	khome=\EH, ri=\EI, rmacs=\EG, rmir=\EO, rmso=\Eq, smacs=\EF,
-++	smir=\E@, smso=\Ep,
-+ p19|h19-b with il1/dl1,
-+ 	dl1=\EM$<2*/>, il1=\EL$<2*/>, use=h19-b,
-+ # From: <ucscc!B.fiatlux@ucbvax.berkeley.edu>
-+@@ -20696,6 +20869,99 @@
-+ #	* Back off the xterm entry to use r6 as a base.
-+ # 9.13.22 (Sat Nov 30 11:51:31 EST 1996):
-+ #	* Added dec-vt220 at Adrian Garside's request.
-++#
-++#-(original-changelog-1996/12/29-to-1998/02/28-by-TD)---------------------------
-++#
-++# 10.1.0 (Sun Dec 29 02:36:31 EST 1996): withdrawn
-++#	* Minor corrections to xterm entries.
-++#	* Replaced EWAN telnet entry.
-++#	* Dropped the reorder script generator.  It was a fossil.
-++# 9.13.23 (Fri Feb 21 16:36:06 EST 1997):
-++#	* Replaced minitel-2 entry.
-++#	* Added MGR, ansi-nt.
-++# 9.13.24 (Sun Feb 23 20:55:23 EST 1997):
-++#	* Thorsten Lockert added termcap `bs' to a lot of types, working from
-++#	  the 4.4BSD Lite2 file.
-++#
-++# 10.1.1 (Sat May  3 21:41:27 EDT 1997):
-++#	* Use setaf/setab consistently with SVr4.
-++#	* Remove ech, el1 from cons25w, they do not work in FreeBSD 2.1.5
-++# 10.1.2 (Sat May 24 21:10:57 EDT 1997)
-++#	* update xterm-xf86-v32 to match XFree86 3.2A (changes F1-F4)
-++#	* add xterm-16color, for XFree86 3.3
-++# 10.1.3 (Sat May 31 12:21:05 EDT 1997)
-++#	* correct typo in emu
-++#	* correct typo in vt102-w (Robert Wuest)
-++#	* make new entry xterm-xf86-v33, restored xterm-xf86-v32.
-++# 10.1.4 (Sun Jun 15 08:29:05 EDT 1997)
-++#	* remove ech capability from rxvt (it does the wrong thing)
-++# 10.1.5 (Sat Jun 28 21:34:36 EDT 1997)
-++#	* remove spurious newlines from several entries (hp+color, wy50,
-++#	  wy350, wy370-nk, wy99gt-tek, wy370-tek, ibm3161, tek4205, ctrm,
-++#	  gs6300)
-++# 10.1.6 (Sat Jul  5 15:08:16 EDT 1997)
-++#	* correct rmso capability of wy50-mc
-++# 10.1.7 (Sat Jul 12 20:05:55 EDT 1997)
-++#	* add cbt to xterm-xf86-v32
-++#	* disentangle some entries from 'xterm', preferring xterm-r6 in case
-++#	  'xterm' is derived from xterm-xf86-v32, which implements ech and
-++#	  other capabilities not in xterm-r6.
-++#	* remove alternate character set from kterm entry.
-++# 10.1.8 (Sat Aug  2 18:43:18 EDT 1997)
-++#	* correct acsc entries for ACS_LANTERN, which is 'i', not 'I'.
-++# 10.1.9 (Sat Aug 23 17:54:38 EDT 1997)
-++#	* add xterm-8bit entry.
-++# 10.1.10 (Sat Oct  4 18:17:13 EDT 1997)
-++#	* repair several places where early version of tic replaced \, with \\\,
-++#	* make acsc entries canonical form (sorted, uniq).
-++#	* modify acsc entries for linux, linux-koi8
-++#	* new rxvt entry, from corrected copy of distribution in rxvt 2.21b
-++#	* add color, mouse support to kterm.
-++# 10.1.11 (Sat Oct 11 14:57:10 EDT 1997)
-++#	* correct wy120 smxon/tbc capabilities which were stuck together.
-++# 10.1.12 (Sat Oct 18 17:38:41 EDT 1997)
-++#	* add entry for xterm-xf86-v39t
-++# 10.1.13 (Sat Nov  8 13:43:33 EST 1997)
-++#	* add u8,u9 to sun-il description
-++# 10.1.14 (Sat Nov 22 19:59:03 EST 1997)
-++#	* add vt220-js, pilot, rbcomm, datapoint entries from esr's 27-jun-97
-++#	  version.
-++#	* add hds200 description (Walter Skorski)
-++#	* add EMX 0.9b descriptions
-++#	* correct rmso/smso capabilities in wy30-mc and wy50-mc (Daniel Weaver)
-++#	* rename xhpterm back to hpterm.
-++# 10.1.15 (Sat Nov 29 19:21:59 EST 1997)
-++#	* change initc in linux-c-nc to use 0..1000 range.
-++# 10.1.16 (Sat Dec 13 19:41:59 EST 1997)
-++#	* remove hpa/vpa from rxvt, which implements them incorrectly.
-++#	* add sgr0 for rxvt.
-++#	* remove bogus smacs/rmacs from EMX descriptions.
-++# 10.1.17 (Sat Dec 20 17:54:10 EST 1997)
-++#	* revised entry for att7300
-++# 10.1.18 (Sat Jan  3 17:58:49 EST 1998)
-++#	* use \0 rather than \200.
-++#	* rename rxvt-color to rxvt to match rxvt 2.4.5 distribution.
-++# 10.1.19 (Sat Jan 17 14:24:57 EST 1998)
-++#	* change xterm (xterm-xf86-v40), xterm-8bit rs1 to use hard reset.
-++#	* rename xterm-xf86-v39t to xterm-xf86-v40
-++#	* remove bold/underline from sun console entries since they're not
-++#	  implemented.
-++# 10.1.20 (Sat Jan 24 11:02:51 EST 1998)
-++#	* add beterm entry (Fred Fish)
-++#	* add irix-color/xwsh entry.
-++#	* turn ncv off for linux.
-++# 10.1.21 (Sat Jan 31 17:39:16 EST 1998)
-++#	* set ncv for FreeBSD console (treat colors with reverse specially).
-++#	* remove sgr string from qnx based on report by Xiaodan Tang
-++# 10.1.22 (Wed Feb 11 18:40:12 EST 1998)
-++#	* remove spurious commas from descriptions
-++#	* correct xterm-8bit to match XFree86 3.9Ad F1-F4.
-++# 10.1.23 (Sat Feb 28 17:48:38 EST 1998)
-++#	* add linux-koi8r to replace linux-koi8 (which uses a corrupt acsc,
-++#	  apparently based on cp-866).
-++#
-++#-(replaced-changelog-1998/02/28-by-ESR)----------------------------------------
-++#
-+ # 9.13.23 (Fri Feb 21 16:36:06 EST 1997):
-+ #	* Replaced minitel-2 entry.
-+ #	* Added MGR, ansi-nt.
-+@@ -20748,6 +21014,8 @@
-+ #	* Incorporated att700 from the Boundless Technology FTP site.
-+ #	* Miscellaneous contact-address and Web-page updates.
-+ #
-++#-(changelog-beginning-ncurses-4.2)---------------------------------------------
-++#
-+ # 1998/5/9
-+ #	* add nxterm and xterm-color terminfo description (request by Cristian
-+ #	  Gafton <gafton@redhat.com>).
-+@@ -21309,6 +21577,36 @@
-+ #	* add several GNU Screen variations with 16- and 256-colors, and
-+ #	  status line (Alain Bench).
-+ #
-++# 2007-03-03
-++#	* add Newbury Data entries (Jean-Charles Billaud).
-++#
-++# 2007-06-10
-++#	* corrected xterm+pcf2 modifiers for F1-F4, match xterm #226 -TD
-++#
-++# 2007-07-14
-++#	* restore section of pre-ncurses-4.2 changelog to fix attribution -TD
-++#	* add konsole-256color entry -TD
-++#
-++# 2007-08-18
-++#	* add 9term entry (request by Juhapekka Tolvanen) -TD
-++#
-++# 2007-10-13
-++#	* correct kIC in rxvt+pcfkeys (prompted by Debian #446444) -TD
-++#	* add shift-control- and control-modified keys for rxvt editing
-++#	  keypad -TD
-++#	* update mlterm entry to 2.9.3 -TD
-++#	* add mlterm+pcfkeys -TD
-++#
-++# 2007-10-20
-++#	* move kLFT, kRIT, kind and kri capabilities from xterm-new to
-++#	  xterm+pcc0, etc., to make the corresponding building blocks reflect
-++#	  xterm's capabilities -TD
-++#	* add mrxvt entry -TD
-++#	* add xterm+r6f2, use in mlterm and mrxvt entries -TD
-++#
-++# 2007-11-03
-++#	* correct acsc strings for h19 and z100 (Benjamin Sittler)
-++#
-+ # The following sets edit modes for GNU EMACS.
-+ # Local Variables:
-+ # fill-prefix:"\t"
-+Index: mk-1st.awk
-+Prereq:  1.68 
-+--- ncurses-5.6/mk-1st.awk	2006-10-08 00:14:08.000000000 +0000
-++++ ncurses-5.6-20071201/mk-1st.awk	2007-03-24 22:10:55.000000000 +0000
-+@@ -1,6 +1,6 @@
-+-# $Id: mk-1st.awk,v 1.68 2006/10/08 00:14:08 tom Exp $
-++# $Id: mk-1st.awk,v 1.78 2007/03/24 22:10:55 tom Exp $
-+ ##############################################################################
-+-# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
-++# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -37,9 +37,12 @@
-+ #	model		  (directory into which we compile, e.g., "obj")
-+ #	prefix		  (e.g., "lib", for Unix-style libraries)
-+ #	suffix		  (e.g., "_g.a", for debug libraries)
-+-#	subset		  ("none", "base", "base+ext_funcs" or "termlib")
-++#	subset		  ("none", "base", "base+ext_funcs" or "termlib", etc.)
-+ #	ShlibVer	  ("rel", "abi" or "auto", to augment DoLinks variable)
-+ #	ShlibVerInfix ("yes" or "no", determines location of version #)
-++#   TermlibRoot   ("tinfo" or other root for libterm.so)
-++#   TermlibSuffix (".so" or other suffix for libterm.so)
-++#	ReLink		  ("yes", or "no", flag to rebuild shared libs on install)
-+ #	DoLinks		  ("yes", "reverse" or "no", flag to add symbolic links)
-+ #	rmSoLocs	  ("yes" or "no", flag to add extra clean target)
-+ #	ldconfig	  (path for this tool, if used)
-+@@ -52,6 +55,64 @@
-+ #	Mixed-case variable names are ok.
-+ #	HP/UX requires shared libraries to have executable permissions.
-+ #
-++function is_ticlib() {
-++		return ( subset ~ /^ticlib$/ );
-++	}
-++function is_termlib() {
-++		return ( subset ~ /^(ticlib\+)?termlib(\+ext_tinfo)?$/ );
-++	}
-++# see lib_name
-++function lib_name_of(a_name) {
-++		return sprintf("%s%s%s", prefix, a_name, suffix)
-++	}
-++# see imp_name
-++function imp_name_of(a_name) {
-++		if (ShlibVerInfix == "cygdll") {
-++			result = sprintf("%s%s%s.a", prefix, a_name, suffix);
-++		} else {
-++			result = "";
-++		}
-++		return result;
-++	}
-++# see abi_name
-++function abi_name_of(a_name) {
-++		if (ShlibVerInfix == "cygdll") {
-++			result = sprintf("%s%s$(ABI_VERSION)%s", "cyg", a_name, suffix);
-++		} else if (ShlibVerInfix == "yes") {
-++			result = sprintf("%s%s.$(ABI_VERSION)%s", prefix, a_name, suffix);
-++		} else {
-++			result = sprintf("%s.$(ABI_VERSION)", lib_name_of(a_name));
-++		}
-++		return result;
-++	}
-++# see rel_name
-++function rel_name_of(a_name) {
-++		if (ShlibVerInfix == "cygdll") {
-++			result = sprintf("%s%s$(REL_VERSION)%s", "cyg", a_name, suffix);
-++		} else if (ShlibVerInfix == "yes") {
-++			result = sprintf("%s%s.$(REL_VERSION)%s", prefix, a_name, suffix);
-++		} else {
-++			result = sprintf("%s.$(REL_VERSION)", lib_name_of(a_name));
-++		}
-++		return result;
-++	}
-++# see end_name
-++function end_name_of(a_name) {
-++		if ( MODEL != "SHARED" ) {
-++			result = lib_name_of(a_name);
-++		} else if ( DoLinks == "reverse") {
-++			result = lib_name_of(a_name);
-++		} else {
-++			if ( ShlibVer == "rel" ) {
-++				result = rel_name_of(a_name);
-++			} else if ( ShlibVer == "abi" || ShlibVer == "cygdll" ) {
-++				result = abi_name_of(a_name);
-++			} else {
-++				result = lib_name_of(a_name);
-++			}
-++		}
-++		return result
-++	}
-+ function symlink(src,dst) {
-+ 		if ( src != dst ) {
-+ 			printf "rm -f %s; ", dst
-+@@ -64,19 +125,19 @@
-+ function removelinks(directory) {
-+ 		rmlink(directory, end_name);
-+ 		if ( DoLinks == "reverse" ) {
-+-				if ( ShlibVer == "rel" ) {
-+-					rmlink(directory, abi_name);
-+-					rmlink(directory, rel_name);
-+-				} else if ( ShlibVer == "abi" ) {
-+-					rmlink(directory, abi_name);
-+-				}
-++			if ( ShlibVer == "rel" ) {
-++				rmlink(directory, abi_name);
-++				rmlink(directory, rel_name);
-++			} else if ( ShlibVer == "abi" ) {
-++				rmlink(directory, abi_name);
-++			}
-+ 		} else {
-+-				if ( ShlibVer == "rel" ) {
-+-					rmlink(directory, abi_name);
-+-					rmlink(directory, lib_name);
-+-				} else if ( ShlibVer == "abi" ) {
-+-					rmlink(directory, lib_name);
-+-				}
-++			if ( ShlibVer == "rel" ) {
-++				rmlink(directory, abi_name);
-++				rmlink(directory, lib_name);
-++			} else if ( ShlibVer == "abi" ) {
-++				rmlink(directory, lib_name);
-++			}
-+ 		}
-+ 	}
-+ function make_shlib(objs, shlib_list) {
-+@@ -103,27 +164,53 @@
-+ 			printf ")\n"
-+ 		}
-+ 	}
-+-function shlib_rule(directory) {
-+-		if ( ShlibVer == "cygdll" ) {
-+-				dst_libs = sprintf("%s/$(SHARED_LIB) %s/$(IMPORT_LIB)", directory, directory);
-+-		} else {
-+-				dst_libs = sprintf("%s/%s", directory, end_name);
-++# termlib may be named explicitly via "--with-termlib=XXX", which overrides
-++# any suffix.  Temporarily override "suffix" to account for this.
-++function termlib_end_of() {
-++	termlib_save_suffix = suffix;
-++	suffix = TermlibSuffix;
-++	termlib_temp_result = end_name_of(TermlibRoot);
-++	suffix = termlib_save_suffix;
-++	return termlib_temp_result;
-++}
-++function shlib_build(directory) {
-++		dst_libs = sprintf("%s/%s", directory, end_name);
-++		printf "%s : \\\n", dst_libs
-++		printf "\t\t%s \\\n", directory
-++		if (subset ~ /^base/ || subset == "ticlib" ) {
-++			save_suffix = suffix
-++			sub(/^[^.]\./,".",suffix)
-++			if (directory != "../lib") {
-++				printf "\t\t%s/%s \\\n", "../lib", termlib_end_of();
-++			}
-++			printf "\t\t%s/%s \\\n", directory, termlib_end_of();
-++			suffix = save_suffix
-+ 		}
-+-		printf "%s : %s $(%s_OBJS)\n", dst_libs, directory, OBJS
-++		printf "\t\t$(%s_OBJS)\n", OBJS
-+ 		printf "\t@echo linking $@\n"
-+-		print "\t-@rm -f %s", dst_libs;
-+-		if ( subset == "termlib" || subset == "termlib+ext_tinfo" ) {
-+-				make_shlib(OBJS, "TINFO_LIST")
-++		if ( is_ticlib() ) {
-++			make_shlib(OBJS, "TICS_LIST")
-++		} else if ( is_termlib() ) {
-++			make_shlib(OBJS, "TINFO_LIST")
-+ 		} else {
-+-				make_shlib(OBJS, "SHLIB_LIST")
-++			make_shlib(OBJS, "SHLIB_LIST")
-+ 		}
-+ 		sharedlinks(directory)
-+ 	}
-++function shlib_install(directory) {
-++		src_lib1 = sprintf("../lib/%s", end_name);
-++		dst_lib1 = sprintf("%s/%s", directory, end_name);
-++		printf "%s : \\\n", dst_lib1
-++		printf "\t\t%s \\\n", directory
-++		printf "\t\t%s\n", src_lib1
-++		printf "\t@echo installing $@\n"
-++		printf "\t$(INSTALL_LIB) %s %s\n", src_lib1, dst_lib1;
-++		sharedlinks(directory)
-++	}
-+ function install_dll(directory,filename) {
-+ 		src_name = sprintf("../lib/%s", filename);
-+ 		dst_name = sprintf("$(DESTDIR)%s/%s", directory, filename);
-+ 		printf "\t@echo installing %s as %s\n", src_name, dst_name
-+-		printf "\t-@rm -f %s\n", dst_name
-+ 		if ( directory == "$(bindir)" ) {
-+ 			program = "$(INSTALL) -m 755";
-+ 		} else {
-+@@ -153,6 +240,9 @@
-+ 					printf "#  subset:        %s\n", subset 
-+ 					printf "#  ShlibVer:      %s\n", ShlibVer 
-+ 					printf "#  ShlibVerInfix: %s\n", ShlibVerInfix 
-++					printf "#  TermlibRoot:   %s\n", TermlibRoot 
-++					printf "#  TermlibSuffix: %s\n", TermlibSuffix 
-++					printf "#  ReLink:        %s\n", ReLink 
-+ 					printf "#  DoLinks:       %s\n", DoLinks 
-+ 					printf "#  rmSoLocs:      %s\n", rmSoLocs 
-+ 					printf "#  ldconfig:      %s\n", ldconfig 
-+@@ -163,7 +253,9 @@
-+ 				}
-+ 				using = 1
-+ 			}
-+-			if ( subset == "termlib" || subset == "termlib+ext_tinfo" ) {
-++			if ( is_ticlib() ) {
-++				OBJS  = MODEL "_P"
-++			} else if ( is_termlib() ) {
-+ 				OBJS  = MODEL "_T"
-+ 			} else {
-+ 				OBJS  = MODEL
-+@@ -205,33 +297,15 @@
-+ 		if ( found == 1 )
-+ 		{
-+ 			print  ""
-+-			lib_name = sprintf("%s%s%s", prefix, name, suffix)
-++			lib_name = lib_name_of(name);
-+ 			if ( MODEL == "SHARED" )
-+ 			{
-+-				if (ShlibVerInfix == "cygdll") {
-+-					abi_name = sprintf("%s%s$(ABI_VERSION)%s", "cyg", name, suffix);
-+-					rel_name = sprintf("%s%s$(REL_VERSION)%s", "cyg", name, suffix);
-+-					imp_name = sprintf("%s%s%s.a", prefix, name, suffix);
-+-				} else if (ShlibVerInfix == "yes") {
-+-					abi_name = sprintf("%s%s.$(ABI_VERSION)%s", prefix, name, suffix);
-+-					rel_name = sprintf("%s%s.$(REL_VERSION)%s", prefix, name, suffix);
-+-				} else {
-+-					abi_name = sprintf("%s.$(ABI_VERSION)", lib_name);
-+-					rel_name = sprintf("%s.$(REL_VERSION)", lib_name);
-+-				}
-+-				if ( DoLinks == "reverse") {
-+-					end_name = lib_name;
-+-				} else {
-+-					if ( ShlibVer == "rel" ) {
-+-						end_name = rel_name;
-+-					} else if ( ShlibVer == "abi" || ShlibVer == "cygdll" ) {
-+-						end_name = abi_name;
-+-					} else {
-+-						end_name = lib_name;
-+-					}
-+-				}
-++				abi_name = abi_name_of(name);
-++				rel_name = rel_name_of(name);
-++				imp_name = imp_name_of(name);
-++				end_name = end_name_of(name);
-+ 
-+-				shlib_rule("../lib")
-++				shlib_build("../lib")
-+ 
-+ 				print  ""
-+ 				print  "install \\"
-+@@ -249,7 +323,11 @@
-+ 					lib_dir = "$(DESTDIR)$(libdir)";
-+ 					printf "install.%s :: %s/%s\n", name, lib_dir, end_name
-+ 					print ""
-+-					shlib_rule(lib_dir)
-++					if ( ReLink == "yes" ) {
-++						shlib_build(lib_dir)
-++					} else {
-++						shlib_install(lib_dir)
-++					}
-+ 				}
-+ 
-+ 				if ( overwrite == "yes" && name == "ncurses" )
-+@@ -393,3 +471,4 @@
-+ 			}
-+ 		}
-+ 	}
-++# vile:ts=4 sw=4
-+Index: mk-hdr.awk
-+--- /dev/null	2007-12-08 19:14:25.328509000 +0000
-++++ ncurses-5.6-20071201/mk-hdr.awk	2007-03-31 15:48:45.000000000 +0000
-+@@ -0,0 +1,107 @@
-++# $Id: mk-hdr.awk,v 1.2 2007/03/31 15:48:45 tom Exp $
-++##############################################################################
-++# Copyright (c) 2007 Free Software Foundation, Inc.                          #
-++#                                                                            #
-++# Permission is hereby granted, free of charge, to any person obtaining a    #
-++# copy of this software and associated documentation files (the "Software"), #
-++# to deal in the Software without restriction, including without limitation  #
-++# the rights to use, copy, modify, merge, publish, distribute, distribute    #
-++# with modifications, sublicense, and/or sell copies of the Software, and to #
-++# permit persons to whom the Software is furnished to do so, subject to the  #
-++# following conditions:                                                      #
-++#                                                                            #
-++# The above copyright notice and this permission notice shall be included in #
-++# all copies or substantial portions of the Software.                        #
-++#                                                                            #
-++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
-++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,   #
-++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL    #
-++# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER      #
-++# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING    #
-++# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER        #
-++# DEALINGS IN THE SOFTWARE.                                                  #
-++#                                                                            #
-++# Except as contained in this notice, the name(s) of the above copyright     #
-++# holders shall not be used in advertising or otherwise to promote the sale, #
-++# use or other dealings in this Software without prior written               #
-++# authorization.                                                             #
-++##############################################################################
-++#
-++# Author: Thomas E. Dickey	2007
-++#
-++# Generate install/uninstall rules for header files
-++# Variables:
-++#	subset	  ("none", "base", "base+ext_funcs" or "termlib", etc.)
-++#	compat	  ("yes" or "no", flag to add link to curses.h
-++#
-++function basename(path) {
-++	sub(/^.*\//,"",path)
-++	return path;
-++}
-++BEGIN	{
-++		found = 0
-++		using = 1
-++		count = 0
-++	}
-++	/^@/ {
-++		using = 0
-++		if (subset == "none") {
-++			using = 1
-++		} else if (index(subset,$2) > 0) {
-++			using = 1
-++		} else {
-++			using = 0
-++		}
-++	}
-++	/^[@#]/ {
-++		next
-++	}
-++	{
-++		if (using && NF != 0) {
-++			if (found == 0) {
-++				print  ""
-++				print  "# generated by mk-hdr.awk"
-++				printf "#  subset:     %s\n", subset 
-++				printf "#  compat:     %s\n", compat 
-++				print  ""
-++				found = 1
-++			}
-++			data[count] = $1
-++			count = count + 1
-++		}
-++	}
-++END	{
-++		if ( count > 0 )
-++		{
-++			print "${DESTDIR}${includedir} :"
-++			print "	sh ${srcdir}/../mkdirs.sh $@"
-++			print ""
-++			print "install \\"
-++			print "install.libs \\"
-++			print "install.includes :: ${AUTO_SRC} ${DESTDIR}${includedir} \\"
-++
-++			for (i = 0; i < count - 1; ++i) {
-++				printf "		%s \\\n", data[i]
-++			}
-++			printf "		%s\n", data[count - 1]
-++
-++			for (i = 0; i < count; ++i) {
-++				printf "	@ (cd ${DESTDIR}${includedir} && rm -f %s) ; ../headers.sh ${INSTALL_DATA} ${DESTDIR}${includedir} ${srcdir} %s\n", basename(data[i]), data[i]
-++				if (data[i] == "curses.h" && compat == "yes") {
-++					printf "	@ (cd ${DESTDIR}${includedir} && rm -f ncurses.h && ${LN_S} %s ncurses.h)\n", data[i]
-++				}
-++			}
-++			print ""
-++			print "uninstall \\"
-++			print "uninstall.libs \\"
-++			print "uninstall.includes ::"
-++
-++			for (i = 0; i < count; ++i) {
-++				printf "	-@ (cd ${DESTDIR}${includedir} && rm -f %s)\n", basename(data[i])
-++				if (data[i] == "curses.h" && compat == "yes") {
-++					printf "	-@ (cd ${DESTDIR}${includedir} && rm -f ncurses.h)\n"
-++				}
-++			}
-++		}
-++	}
-++# vile:ts=4 sw=4
-+Index: mkdirs.sh
-+--- /dev/null	2007-12-08 19:14:25.328509000 +0000
-++++ ncurses-5.6-20071201/mkdirs.sh	2007-03-25 22:29:46.000000000 +0000
-+@@ -0,0 +1,51 @@
-++#! /bin/sh
-++# $Id: mkdirs.sh,v 1.5 2007/03/25 22:29:46 tom Exp $
-++# -----------------------------------------------------------------------------
-++# mkinstalldirs --- make directory hierarchy
-++# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-++# Created: 1993-05-16
-++# Last modified: 1994-03-25
-++# Public domain
-++# -----------------------------------------------------------------------------
-++
-++errstatus=0
-++umask 022
-++
-++for file in ${1+"$@"} ; do
-++   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-++   shift
-++
-++   pathcomp=
-++   for d in ${1+"$@"} ; do
-++     pathcomp="$pathcomp$d"
-++     case "$pathcomp" in
-++       -* ) pathcomp=./$pathcomp ;;
-++     esac
-++
-++     if test ! -d "$pathcomp"; then
-++        echo "mkdir $pathcomp" 1>&2
-++        case "$pathcomp" in
-++          [abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]: )
-++            ;;               # DOSISH systems
-++          * )
-++            mkdir "$pathcomp"
-++            errstatus=$?
-++            if test $errstatus != 0
-++            then
-++               # may have failed if invoked in a parallel "make -j# install"
-++               if test -d "$pathcomp"
-++               then
-++                  errstatus=0
-++               fi
-++            fi
-++            ;;
-++        esac
-++     fi
-++
-++     pathcomp="$pathcomp/"
-++   done
-++done
-++
-++exit $errstatus
-++
-++# mkinstalldirs ends here
-+Index: ncurses/Makefile.in
-+Prereq:  1.101 
-+--- ncurses-5.6/ncurses/Makefile.in	2006-10-14 19:08:11.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/Makefile.in	2007-09-01 20:45:53.000000000 +0000
-+@@ -1,6 +1,6 @@
-+-# $Id: Makefile.in,v 1.101 2006/10/14 19:08:11 tom Exp $
-++# $Id: Makefile.in,v 1.112 2007/09/01 20:45:53 tom Exp $
-+ ##############################################################################
-+-# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
-++# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -112,12 +112,13 @@
-+ 
-+ CFLAGS_DEFAULT	= $(CFLAGS_@DFT_UPR_MODEL@)
-+ 
-+-LINK		= $(LIBTOOL) $(CC)
-++LINK		= $(LIBTOOL)
-+ LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
-+ 
-+ SHLIB_DIRS	= -L../lib
-+ SHLIB_LIST	= $(SHLIB_DIRS) @SHLIB_LIST@
-+ TINFO_LIST	= $(SHLIB_DIRS) @TINFO_LIST@
-++TICS_LIST	= $(SHLIB_DIRS) @TICS_LIST@
-+ 
-+ MK_SHARED_LIB	= @MK_SHARED_LIB@
-+ 
-+@@ -128,8 +129,6 @@
-+ 
-+ RANLIB		= @LIB_PREP@
-+ 
-+-IMPORT_LIB	= @IMPORT_LIB@
-+-SHARED_LIB	= @SHARED_LIB@
-+ LIBRARIES	= @LIBS_TO_MAKE@
-+ 
-+ LINT		= @LINT@
-+@@ -138,6 +137,7 @@
-+ 
-+ FALLBACK_LIST	= @FALLBACK_LIST@
-+ 
-++USE_BIG_STRINGS	= @USE_BIG_STRINGS@
-+ TERMINFO_CAPS	= $(top_srcdir)/include/@TERMINFO_CAPS@
-+ 
-+ AUTO_SRC = \
-+@@ -151,11 +151,10 @@
-+ 	./names.c \
-+ 	./unctrl.c \
-+ 	init_keytry.h \
-+-	keys.list \
-+-	names-stamp
-++	keys.list
-+ 
-+ TEST_DEPS	= ../lib/@LIB_PREFIX@ncurses@DFT_DEP_SUFFIX@
-+-TEST_ARGS	= -L../lib -lncurses@DFT_ARG_SUFFIX@
-++TEST_ARGS	= @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@ 
-+ TEST_LDFLAGS	= @LD_MODEL@ $(TEST_ARGS) @LIBS@ @LOCAL_LDFLAGS@ @LDFLAGS@
-+ 
-+ TEST_PROGS = \
-+@@ -179,7 +178,7 @@
-+ 
-+ $(DESTDIR)$(bindir) \
-+ $(DESTDIR)$(libdir) :
-+-	sh $(srcdir)/../mkinstalldirs $@
-++	sh $(srcdir)/../mkdirs.sh $@
-+ 
-+ ../lib : ; mkdir $@
-+ 
-+@@ -197,7 +196,7 @@
-+ 
-+ make_keys$(BUILD_EXEEXT) : \
-+ 		$(tinfo)/make_keys.c \
-+-		names-stamp
-++		names.c
-+ 	$(BUILD_CC) -o $@ $(BUILD_CCFLAGS) $(tinfo)/make_keys.c $(BUILD_LDFLAGS) $(BUILD_LIBS)
-+ 
-+ make_hash$(BUILD_EXEEXT) : \
-+@@ -211,27 +210,21 @@
-+ ./comp_captab.c: \
-+ 		make_hash$(BUILD_EXEEXT) \
-+ 		../include/hashsize.h \
-++		$(tinfo)/MKcaptab.sh \
-+ 		$(tinfo)/MKcaptab.awk
-+-	sh $(tinfo)/MKcaptab.awk $(AWK) $(srcdir)/../include/@TERMINFO_CAPS@ > $@
-++	sh $(tinfo)/MKcaptab.sh $(AWK) $(USE_BIG_STRINGS) $(tinfo)/MKcaptab.awk $(srcdir)/../include/@TERMINFO_CAPS@ > $@
-+ 
-+ ./lib_keyname.c: keys.list $(base)/MKkeyname.awk
-+-	$(AWK) -f $(base)/MKkeyname.awk keys.list > $@
-++	$(AWK) -f $(base)/MKkeyname.awk bigstrings=$(USE_BIG_STRINGS) keys.list > $@
-+ 
-+-names-stamp: $(tinfo)/MKnames.awk
-+-	$(AWK) -f $(tinfo)/MKnames.awk $(srcdir)/../include/@TERMINFO_CAPS@
-+-	cat namehdr boolnames boolfnames numnames numfnames strnames strfnames nameftr >names.c
-+-	cat namehdr boolcodes numcodes strcodes codeftr >codes.c
-+-	-rm -f namehdr nameftr codeftr boolnames boolfnames boolcodes numnames numfnames numcodes strnames strfnames strcodes
-+-	@echo >$@
-++./codes.c: $(tinfo)/MKcodes.awk
-++	$(AWK) -f $(tinfo)/MKcodes.awk bigstrings=$(USE_BIG_STRINGS) $(srcdir)/../include/@TERMINFO_CAPS@ >$@
-+ 
-+-./names.c: names-stamp
-+-	@echo made $@
-+-
-+-./codes.c: names-stamp
-+-	@echo made $@
-++./names.c: $(tinfo)/MKnames.awk
-++	$(AWK) -f $(tinfo)/MKnames.awk bigstrings=$(USE_BIG_STRINGS) $(srcdir)/../include/@TERMINFO_CAPS@ >$@
-+ 
-+ ./unctrl.c: $(base)/MKunctrl.awk
-+-	echo | $(AWK) -f $(base)/MKunctrl.awk >$@
-++	echo | $(AWK) -f $(base)/MKunctrl.awk bigstrings=$(USE_BIG_STRINGS) >$@
-+ 
-+ tags:
-+ 	ctags *.[ch] */*.[ch]
-+@@ -267,17 +260,17 @@
-+ 	sh $(base)/MKlib_gen.sh "$(CPP) $(CPPFLAGS)" "$(AWK)" implemented <../include/curses.h >$@
-+ 
-+ captoinfo$x : $(tinfo)/captoinfo.c $(TEST_DEPS)
-+-	@ECHO_LINK@ $(CC) -o $@ $(CFLAGS_DEFAULT) -DMAIN $(tinfo)/captoinfo.c $(TEST_LDFLAGS)
-++	@ECHO_LINK@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DMAIN $(tinfo)/captoinfo.c $(TEST_LDFLAGS)
-+ 
-+ hardscroll$x : $(serial)/hardscroll.c $(TEST_DEPS)
-+-	@ECHO_LINK@ $(CC) -o $@ $(CFLAGS_DEFAULT) -DSCROLLDEBUG $(serial)/hardscroll.c $(TEST_LDFLAGS)
-++	@ECHO_LINK@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DSCROLLDEBUG $(serial)/hardscroll.c $(TEST_LDFLAGS)
-+ 
-+-hashmap$x : $(serial)/hashmap.c $(TEST_DEPS)
-+-	@ECHO_LINK@ $(CC) -o $@ $(CFLAGS_DEFAULT) -DHASHDEBUG $(serial)/hashmap.c $(TEST_LDFLAGS)
-++hashmap$x : $(serial)/hashmap.c $(serial)/hardscroll.c $(TEST_DEPS)
-++	@ECHO_LINK@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DHASHDEBUG $(serial)/hashmap.c $(serial)/hardscroll.c $(TEST_LDFLAGS)
-+ 
-+ lib_mvcur$x : $(serial)/lib_mvcur.c $(TEST_DEPS) \
-+ 		../@DFT_OBJ_SUBDIR@/dump_entry$o
-+-	@ECHO_LINK@ $(CC) -o $@ $(CFLAGS_DEFAULT) -DNCURSES_TEST -I$(serial)/../../progs $(serial)/lib_mvcur.c ../@DFT_OBJ_SUBDIR@/dump_entry$o $(TEST_LDFLAGS)
-++	@ECHO_LINK@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DNCURSES_TEST -I$(serial)/../../progs $(serial)/lib_mvcur.c ../@DFT_OBJ_SUBDIR@/dump_entry$o $(TEST_LDFLAGS)
-+ 
-+ link_test$x : ./link_test.c $(TEST_DEPS) \
-+ 		../@DFT_OBJ_SUBDIR@/link_test$o
-+Index: ncurses/base/MKkeyname.awk
-+Prereq:  1.30 
-+--- ncurses-5.6/ncurses/base/MKkeyname.awk	2006-05-20 17:35:30.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/MKkeyname.awk	2007-08-18 18:41:18.000000000 +0000
-+@@ -1,6 +1,6 @@
-+-# $Id: MKkeyname.awk,v 1.30 2006/05/20 17:35:30 tom Exp $
-++# $Id: MKkeyname.awk,v 1.38 2007/08/18 18:41:18 tom Exp $
-+ ##############################################################################
-+-# Copyright (c) 1999-2005,2006 Free Software Foundation, Inc.                #
-++# Copyright (c) 1999-2006,2007 Free Software Foundation, Inc.                #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -33,18 +33,39 @@
-+ 	print "#include <tic.h>"
-+ 	print "#include <term_entry.h>"
-+ 	print ""
-+-	print "const struct kn _nc_key_names[] = {"
-++	first = 1;
-+ }
-+ 
-+ /^[^#]/ {
-+-	printf "\t{ \"%s\", %s },\n", $1, $1;
-++		if (bigstrings) {
-++			if (first)  {
-++				print "struct kn { short offset; int code; };"
-++				print "static const struct kn _nc_key_names[] = {"
-++			}
-++			printf "\t{ %d, %s },\n", offset, $1
-++			offset += length($1) + 1
-++			names = names"\n\t\""$1"\\0\""
-++		} else {
-++			if (first) {
-++				print "struct kn { const char *name; int code; };"
-++				print "static const struct kn _nc_key_names[] = {"
-++			}
-++			printf "\t{ \"%s\", %s },\n", $1, $1;
-++		}
-++		first = 0;
-+ 	}
-+ 
-+ END {
-+-	printf "\t{ 0, 0 }};\n"
-++	if (bigstrings) {
-++		printf "\t{ -1, 0 }};\n"
-++		print ""
-++		print "static const char key_names[] = "names";"
-++	} else {
-++		printf "\t{ 0, 0 }};\n"
-++	}
-+ 	print ""
-+ 	print "#define SIZEOF_TABLE 256"
-+-	print "static char **keyname_table;"
-++	print "#define MyTable _nc_globals.keyname_table"
-+ 	print ""
-+ 	print "NCURSES_EXPORT(NCURSES_CONST char *) keyname (int c)"
-+ 	print "{"
-+@@ -56,21 +77,30 @@
-+ 	print "	if (c == -1) {"
-+ 	print "		result = \"-1\";"
-+ 	print "	} else {"
-+-	print "		for (i = 0; _nc_key_names[i].name != 0; i++) {"
-+-	print "			if (_nc_key_names[i].code == c) {"
-+-	print "				result = (NCURSES_CONST char *)_nc_key_names[i].name;"
-+-	print "				break;"
-+-	print "			}"
-+-	print "		}"
-++	if (bigstrings) {
-++		print "		for (i = 0; _nc_key_names[i].offset != -1; i++) {"
-++		print "			if (_nc_key_names[i].code == c) {"
-++		print "				result = (NCURSES_CONST char *)key_names + _nc_key_names[i].offset;"
-++		print "				break;"
-++		print "			}"
-++		print "		}"
-++	} else {
-++		print "		for (i = 0; _nc_key_names[i].name != 0; i++) {"
-++		print "			if (_nc_key_names[i].code == c) {"
-++		print "				result = (NCURSES_CONST char *)_nc_key_names[i].name;"
-++		print "				break;"
-++		print "			}"
-++		print "		}"
-++	}
-+ 	print ""
-+ 	print "		if (result == 0 && (c >= 0 && c < SIZEOF_TABLE)) {"
-+-	print "			if (keyname_table == 0)"
-+-	print "				keyname_table = typeCalloc(char *, SIZEOF_TABLE);"
-+-	print "			if (keyname_table != 0) {"
-+-	print "				if (keyname_table[c] == 0) {"
-++	print "			if (MyTable == 0)"
-++	print "				MyTable = typeCalloc(char *, SIZEOF_TABLE);"
-++	print "			if (MyTable != 0) {"
-++	print "				if (MyTable[c] == 0) {"
-+ 	print "					int cc = c;"
-+ 	print "					p = name;"
-+-	print "					if (cc >= 128) {"
-++	print "					if (cc >= 128 && (SP == 0 || SP->_use_meta)) {"
-+ 	print "						strcpy(p, \"M-\");"
-+ 	print "						p += 2;"
-+ 	print "						cc -= 128;"
-+@@ -81,9 +111,9 @@
-+ 	print "						strcpy(p, \"^?\");"
-+ 	print "					else"
-+ 	print "						sprintf(p, \"%c\", cc);"
-+-	print "					keyname_table[c] = strdup(name);"
-++	print "					MyTable[c] = strdup(name);"
-+ 	print "				}"
-+-	print "				result = keyname_table[c];"
-++	print "				result = MyTable[c];"
-+ 	print "			}"
-+ 	print "#if NCURSES_EXT_FUNCS && NCURSES_XNAMES"
-+ 	print "		} else if (result == 0 && cur_term != 0) {"
-+@@ -111,24 +141,15 @@
-+ 	print "	return result;"
-+ 	print "}"
-+ 	print ""
-+-	print "#if USE_WIDEC_SUPPORT"
-+-	print "NCURSES_EXPORT(NCURSES_CONST char *) key_name (wchar_t c)"
-+-	print "{"
-+-	print "	NCURSES_CONST char *result = keyname((int)c);"
-+-	print "	if (!strncmp(result, \"M-\", 2)) result = 0;"
-+-	print "	return result;"
-+-	print "}"
-+-	print "#endif"
-+-	print ""
-+ 	print "#if NO_LEAKS"
-+ 	print "void _nc_keyname_leaks(void)"
-+ 	print "{"
-+ 	print "	int j;"
-+-	print "	if (keyname_table != 0) {"
-++	print "	if (MyTable != 0) {"
-+ 	print "		for (j = 0; j < SIZEOF_TABLE; ++j) {"
-+-	print "			FreeIfNeeded(keyname_table[j]);"
-++	print "			FreeIfNeeded(MyTable[j]);"
-+ 	print "		}"
-+-	print "		FreeAndNull(keyname_table);"
-++	print "		FreeAndNull(MyTable);"
-+ 	print "	}"
-+ 	print "}"
-+ 	print "#endif /* NO_LEAKS */"
-+Index: ncurses/base/MKlib_gen.sh
-+Prereq:  1.27 
-+--- ncurses-5.6/ncurses/base/MKlib_gen.sh	2006-07-01 21:25:39.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/MKlib_gen.sh	2007-08-18 13:17:14.000000000 +0000
-+@@ -2,10 +2,10 @@
-+ #
-+ # MKlib_gen.sh -- generate sources from curses.h macro definitions
-+ #
-+-# ($Id: MKlib_gen.sh,v 1.27 2006/07/01 21:25:39 tom Exp $)
-++# ($Id: MKlib_gen.sh,v 1.29 2007/08/18 13:17:14 tom Exp $)
-+ #
-+ ##############################################################################
-+-# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
-++# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -62,7 +62,7 @@
-+ if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-+ if test "${LC_COLLATE+set}"  = set; then LC_COLLATE=C;  export LC_COLLATE;  fi
-+ 
-+-preprocessor="$1 -I../include"
-++preprocessor="$1 -DNCURSES_INTERNALS -I../include"
-+ AWK="$2"
-+ USE="$3"
-+ 
-+@@ -406,7 +406,11 @@
-+ | sed -e 's/NCURSES_EXPORT(\(.*\)) \(.*\) (\(.*\))/\1 \2(\3)/' \
-+ | sed -f $ED2 \
-+ | $AWK -f $AW1 using=$USE \
-+-| sed -e 's/^\([a-z_][a-z_]*[ *]*\)/\1 gen_/' -e 's/  / /g' >>$TMP
-++| sed \
-++	-e 's/ [ ]*$//g' \
-++	-e 's/^\([a-zA-Z_][a-zA-Z_]*[ *]*\)/\1 gen_/' \
-++	-e 's/gen_$//' \
-++	-e 's/  / /g' >>$TMP
-+ 
-+ $preprocessor $TMP 2>/dev/null \
-+ | sed \
-+Index: ncurses/base/MKunctrl.awk
-+Prereq:  1.11 
-+--- ncurses-5.6/ncurses/base/MKunctrl.awk	2005-12-17 22:48:37.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/MKunctrl.awk	2007-07-28 21:13:21.000000000 +0000
-+@@ -1,6 +1,6 @@
-+-# $Id: MKunctrl.awk,v 1.11 2005/12/17 22:48:37 tom Exp $
-++# $Id: MKunctrl.awk,v 1.14 2007/07/28 21:13:21 tom Exp $
-+ ##############################################################################
-+-# Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.                #
-++# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -42,63 +42,111 @@
-+ 		print "NCURSES_EXPORT(NCURSES_CONST char *) unctrl (register chtype ch)"
-+ 		print "{"
-+ 
-+-		printf "static const char* const table[] = {"
-++		blob=""
-++		offset=0
-++		if (bigstrings) {
-++			printf "static const short unctrl_table[] = {"
-++		} else {
-++			printf "static const char* const unctrl_table[] = {"
-++		}
-+ 		for ( ch = 0; ch < 256; ch++ ) {
-+ 			gap = ","
-+-			if ((ch % 8) == 0)
-++			part=""
-++			if ((ch % 8) == 0) {
-+ 				printf "\n    "
-++				if (ch != 0)
-++					blob = blob "\""
-++				blob = blob "\n    \""
-++			}
-++			if (bigstrings)
-++				printf "%4d%s", offset, gap;
-+ 			if (ch < 32) {
-+-				printf "\"^\\%03o\"", ch + 64
-++				part = sprintf ("^\\%03o", ch + 64);
-++				offset = offset + 3;
-+ 			} else if (ch == 127) {
-+-				printf "\"^?\""
-++				part = "^?";
-++				offset = offset + 3;
-+ 			} else if (ch >= 128 && ch < 160) {
-+-				printf "\"~\\%03o\"", ch - 64
-++				part = sprintf("~\\%03o", ch - 64);
-++				offset = offset + 3;
-+ 			} else {
-+-				printf "\"\\%03o\"", ch
-+ 				gap = gap " "
-++				part = sprintf("\\%03o", ch);
-++				offset = offset + 2;
-+ 			}
-+ 			if (ch == 255)
-+ 				gap = "\n"
-+ 			else if (((ch + 1) % 8) != 0)
-+ 				gap = gap " "
-+-			printf "%s", gap
-++			if (bigstrings) {
-++				blob = blob part "\\0";
-++			} else {
-++				printf "\"%s\"%s", part, gap
-++			}
-+ 		}
-+ 		print "};"
-++		blob = blob "\"";
-+ 
-+ 		print ""
-+ 		print "#if NCURSES_EXT_FUNCS"
-+-		printf "static const char* const table2[] = {"
-++		if (bigstrings) {
-++			blob = blob "\n#if NCURSES_EXT_FUNCS"
-++			printf "static const short unctrl_c1[] = {"
-++		} else {
-++			printf "static const char* const unctrl_c1[] = {"
-++		}
-+ 		for ( ch = 128; ch < 160; ch++ ) {
-+ 			gap = ","
-+-			if ((ch % 8) == 0)
-++			if ((ch % 8) == 0) {
-++				if (ch != 128)
-++					blob = blob "\""
-+ 				printf "\n    "
-+-			if (ch >= 128 && ch < 160) {
-+-				printf "\"\\%03o\"", ch
-+-				gap = gap " "
-++				blob = blob "\n    \""
-++			}
-++			if (bigstrings) {
-++				printf "%4d%s", offset, gap;
-++				part = sprintf("\\%03o\\0", ch);
-++				blob = blob part
-++				offset = offset + 2;
-++				if (((ch + 1) % 8) != 0)
-++					gap = gap " "
-++			} else {
-++				if (ch >= 128 && ch < 160) {
-++					printf "\"\\%03o\"", ch
-++					gap = gap " "
-++				}
-++				if (ch == 255)
-++					gap = "\n"
-++				else if (((ch + 1) % 8) != 0)
-++					gap = gap " "
-++				printf "%s", gap
-+ 			}
-+-			if (ch == 255)
-+-				gap = "\n"
-+-			else if (((ch + 1) % 8) != 0)
-+-				gap = gap " "
-+-			printf "%s", gap
-+ 		}
-+ 		print "};"
-+ 		print "#endif /* NCURSES_EXT_FUNCS */"
-++		blob = blob "\"\n#endif /* NCURSES_EXT_FUNCS */\n"
-+ 
-+ 		print ""
-++		if (bigstrings) {
-++			print "static const char unctrl_blob[] = "blob";"
-++			print ""
-++			stringname = "unctrl_blob + unctrl"
-++		} else {
-++			stringname = "unctrl"
-++		}
-+ 		print "\tint check = ChCharOf(ch);"
-+ 		print "\tconst char *result;"
-+ 		print ""
-+-		print "\tif (check >= 0 && check < (int)SIZEOF(table)) {"
-++		print "\tif (check >= 0 && check < (int)SIZEOF(unctrl_table)) {"
-+ 		print "#if NCURSES_EXT_FUNCS"
-+ 		print "\t\tif ((SP != 0)"
-+ 		print "\t\t && (SP->_legacy_coding > 1)"
-+ 		print "\t\t && (check >= 128)"
-+ 		print "\t\t && (check < 160))"
-+-		print "\t\t\tresult = table2[check - 128];"
-++		printf "\t\t\tresult = %s_c1[check - 128];\n", stringname;
-+ 		print "\t\telse"
-+ 		print "#endif /* NCURSES_EXT_FUNCS */"
-+-		print "\t\t\tresult = table[check];"
-++		printf "\t\t\tresult = %s_table[check];\n", stringname;
-+ 		print "\t} else {"
-+ 		print "\t\tresult = 0;"
-+ 		print "\t}"
-+Index: ncurses/base/define_key.c
-+Prereq:  1.10 
-+--- ncurses-5.6/ncurses/base/define_key.c	2006-06-17 18:19:48.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/define_key.c	2006-12-30 23:23:31.000000000 +0000
-+@@ -32,7 +32,7 @@
-+ 
-+ #include <curses.priv.h>
-+ 
-+-MODULE_ID("$Id: define_key.c,v 1.10 2006/06/17 18:19:48 tom Exp $")
-++MODULE_ID("$Id: define_key.c,v 1.13 2006/12/30 23:23:31 tom Exp $")
-+ 
-+ NCURSES_EXPORT(int)
-+ define_key(const char *str, int keycode)
-+@@ -43,16 +43,21 @@
-+     if (SP == 0) {
-+ 	code = ERR;
-+     } else if (keycode > 0) {
-++	unsigned ukey = (unsigned) keycode;
-++
-+ 	if (str != 0) {
-+ 	    define_key(str, 0);
-+ 	} else if (has_key(keycode)) {
-+-	    while (_nc_remove_key(&(SP->_keytry), (unsigned) keycode))
-++	    while (_nc_remove_key(&(SP->_keytry), ukey))
-+ 		code = OK;
-+ 	}
-+ 	if (str != 0) {
-+ 	    if (key_defined(str) == 0) {
-+-		(void) _nc_add_to_try(&(SP->_keytry), str, (unsigned) keycode);
-+-		code = OK;
-++		if (_nc_add_to_try(&(SP->_keytry), str, ukey) == OK) {
-++		    code = OK;
-++		} else {
-++		    code = ERR;
-++		}
-+ 	    } else {
-+ 		code = ERR;
-+ 	    }
-+Index: ncurses/base/key_defined.c
-+Prereq:  1.3 
-+--- ncurses-5.6/ncurses/base/key_defined.c	2003-05-17 23:12:27.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/key_defined.c	2006-12-30 23:22:55.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 2003 Free Software Foundation, Inc.                        *
-++ * Copyright (c) 2003,2006 Free Software Foundation, Inc.                   *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -32,26 +32,27 @@
-+ 
-+ #include <curses.priv.h>
-+ 
-+-MODULE_ID("$Id: key_defined.c,v 1.3 2003/05/17 23:12:27 tom Exp $")
-++MODULE_ID("$Id: key_defined.c,v 1.6 2006/12/30 23:22:55 tom Exp $")
-+ 
-+ static int
-+-find_definition(struct tries *tree, const char *str)
-++find_definition(TRIES * tree, const char *str)
-+ {
-+-    struct tries *ptr;
-+-    int result = 0;
-++    TRIES *ptr;
-++    int result = OK;
-+ 
-+     if (str != 0 && *str != '\0') {
-+ 	for (ptr = tree; ptr != 0; ptr = ptr->sibling) {
-+ 	    if (UChar(*str) == UChar(ptr->ch)) {
-+ 		if (str[1] == '\0' && ptr->child != 0) {
-+-		    result = -1;
-+-		} else if ((result = find_definition(ptr->child, str + 1)) == 0) {
-++		    result = ERR;
-++		} else if ((result = find_definition(ptr->child, str + 1))
-++			   == OK) {
-+ 		    result = ptr->value;
-+ 		} else if (str[1] == '\0') {
-+-		    result = -1;
-++		    result = ERR;
-+ 		}
-+ 	    }
-+-	    if (result != 0)
-++	    if (result != OK)
-+ 		break;
-+ 	}
-+     }
-+@@ -60,7 +61,8 @@
-+ 
-+ /*
-+  * Returns the keycode associated with the given string.  If none is found,
-+- * return 0.  If the string is only a prefix to other strings, return -1.
-++ * return OK.  If the string is only a prefix to other strings, return ERR.
-++ * Otherwise, return the keycode's value (neither OK/ERR).
-+  */
-+ NCURSES_EXPORT(int)
-+ key_defined(const char *str)
-+Index: ncurses/base/keyok.c
-+Prereq:  1.6 
-+--- ncurses-5.6/ncurses/base/keyok.c	2006-06-17 18:18:43.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/keyok.c	2006-12-30 16:22:33.000000000 +0000
-+@@ -27,12 +27,12 @@
-+  ****************************************************************************/
-+ 
-+ /****************************************************************************
-+- *  Author: Thomas E. Dickey <dickey@clark.net> 1997                        *
-++ *  Author: Thomas E. Dickey            1997-on                             *
-+  ****************************************************************************/
-+ 
-+ #include <curses.priv.h>
-+ 
-+-MODULE_ID("$Id: keyok.c,v 1.6 2006/06/17 18:18:43 tom Exp $")
-++MODULE_ID("$Id: keyok.c,v 1.7 2006/12/30 16:22:33 tom Exp $")
-+ 
-+ /*
-+  * Enable (or disable) ncurses' interpretation of a keycode by adding (or
-+@@ -57,18 +57,20 @@
-+ 	if (flag) {
-+ 	    while ((s = _nc_expand_try(SP->_key_ok, ch, &count, 0)) != 0
-+ 		   && _nc_remove_key(&(SP->_key_ok), ch)) {
-+-		_nc_add_to_try(&(SP->_keytry), s, ch);
-++		code = _nc_add_to_try(&(SP->_keytry), s, ch);
-+ 		free(s);
-+-		code = OK;
-+ 		count = 0;
-++		if (code != OK)
-++		    break;
-+ 	    }
-+ 	} else {
-+ 	    while ((s = _nc_expand_try(SP->_keytry, ch, &count, 0)) != 0
-+ 		   && _nc_remove_key(&(SP->_keytry), ch)) {
-+-		_nc_add_to_try(&(SP->_key_ok), s, ch);
-++		code = _nc_add_to_try(&(SP->_key_ok), s, ch);
-+ 		free(s);
-+-		code = OK;
-+ 		count = 0;
-++		if (code != OK)
-++		    break;
-+ 	    }
-+ 	}
-+     }
-+Index: ncurses/base/lib_addstr.c
-+Prereq:  1.46 
-+--- ncurses-5.6/ncurses/base/lib_addstr.c	2006-05-27 19:22:19.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/lib_addstr.c	2007-10-13 19:56:57.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -44,7 +44,7 @@
-+ 
-+ #include <curses.priv.h>
-+ 
-+-MODULE_ID("$Id: lib_addstr.c,v 1.46 2006/05/27 19:22:19 tom Exp $")
-++MODULE_ID("$Id: lib_addstr.c,v 1.48 2007/10/13 19:56:57 tom Exp $")
-+ 
-+ NCURSES_EXPORT(int)
-+ waddnstr(WINDOW *win, const char *astr, int n)
-+@@ -80,8 +80,7 @@
-+ NCURSES_EXPORT(int)
-+ waddchnstr(WINDOW *win, const chtype *astr, int n)
-+ {
-+-    NCURSES_SIZE_T y = win->_cury;
-+-    NCURSES_SIZE_T x = win->_curx;
-++    NCURSES_SIZE_T y, x;
-+     int code = OK;
-+     int i;
-+     struct ldat *line;
-+@@ -91,6 +90,8 @@
-+     if (!win)
-+ 	returnCode(ERR);
-+ 
-++    y = win->_cury;
-++    x = win->_curx;
-+     if (n < 0) {
-+ 	const chtype *str;
-+ 	n = 0;
-+@@ -128,8 +129,8 @@
-+ wadd_wchnstr(WINDOW *win, const cchar_t *astr, int n)
-+ {
-+     static const NCURSES_CH_T blank = NewChar(BLANK_TEXT);
-+-    NCURSES_SIZE_T y = win->_cury;
-+-    NCURSES_SIZE_T x = win->_curx;
-++    NCURSES_SIZE_T y;
-++    NCURSES_SIZE_T x;
-+     int code = OK;
-+     struct ldat *line;
-+     int i, j, start, len, end;
-+@@ -139,6 +140,8 @@
-+     if (!win)
-+ 	returnCode(ERR);
-+ 
-++    y = win->_cury;
-++    x = win->_curx;
-+     if (n < 0) {
-+ 	n = _nc_wchstrlen(astr);
-+     }
-+Index: ncurses/base/lib_color.c
-+Prereq:  1.80 
-+--- ncurses-5.6/ncurses/base/lib_color.c	2006-11-26 01:33:16.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/lib_color.c	2007-04-07 17:07:28.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -42,21 +42,37 @@
-+ #include <term.h>
-+ #include <tic.h>
-+ 
-+-MODULE_ID("$Id: lib_color.c,v 1.80 2006/11/26 01:33:16 tom Exp $")
-++MODULE_ID("$Id: lib_color.c,v 1.85 2007/04/07 17:07:28 tom Exp $")
-+ 
-+ /*
-+  * These should be screen structure members.  They need to be globals for
-+  * historical reasons.  So we assign them in start_color() and also in
-+  * set_term()'s screen-switching logic.
-+  */
-++#if USE_REENTRANT
-++NCURSES_EXPORT(int)
-++NCURSES_PUBLIC_VAR(COLOR_PAIRS) (void)
-++{
-++    return SP ? SP->_pair_count : -1;
-++}
-++NCURSES_EXPORT(int)
-++NCURSES_PUBLIC_VAR(COLORS) (void)
-++{
-++    return SP ? SP->_color_count : -1;
-++}
-++#else
-+ NCURSES_EXPORT_VAR(int) COLOR_PAIRS = 0;
-+ NCURSES_EXPORT_VAR(int) COLORS = 0;
-++#endif
-+ 
-+ #define DATA(r,g,b) {r,g,b, 0,0,0, 0}
-+ 
-+ #define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts))
-+ 
-++#define MAX_PALETTE	8
-++
-+ #define OkColorHi(n)	(((n) < COLORS) && ((n) < max_colors))
-++#define InPalette(n)	((n) >= 0 && (n) < MAX_PALETTE)
-+ 
-+ /*
-+  * Given a RGB range of 0..1000, we'll normally set the individual values
-+@@ -162,10 +178,10 @@
-+ 
-+     tp = (hue_lightness_saturation) ? hls_palette : cga_palette;
-+     for (n = 0; n < COLORS; n++) {
-+-	if (n < 8) {
-++	if (InPalette(n)) {
-+ 	    SP->_color_table[n] = tp[n];
-+ 	} else {
-+-	    SP->_color_table[n] = tp[n % 8];
-++	    SP->_color_table[n] = tp[n % MAX_PALETTE];
-+ 	    if (hue_lightness_saturation) {
-+ 		SP->_color_table[n].green = 100;
-+ 	    } else {
-+@@ -239,8 +255,12 @@
-+ 	}
-+ 
-+ 	if (max_pairs > 0 && max_colors > 0) {
-+-	    COLOR_PAIRS = SP->_pair_count = max_pairs;
-+-	    COLORS = SP->_color_count = max_colors;
-++	    SP->_pair_count = max_pairs;
-++	    SP->_color_count = max_colors;
-++#if !USE_REENTRANT
-++	    COLOR_PAIRS = max_pairs;
-++	    COLORS = max_colors;
-++#endif
-+ 
-+ 	    if ((SP->_color_pairs = TYPE_CALLOC(colorpair_t,
-+ 						max_pairs)) != 0) {
-+@@ -365,13 +385,14 @@
-+     if (GET_SCREEN_PAIR(SP) == pair)
-+ 	SET_SCREEN_PAIR(SP, (chtype) (~0));	/* force attribute update */
-+ 
-+-    if (initialize_pair) {
-++    if (initialize_pair && InPalette(f) && InPalette(b)) {
-+ 	const color_t *tp = hue_lightness_saturation ? hls_palette : cga_palette;
-+ 
-+-	T(("initializing pair: pair = %d, fg=(%d,%d,%d), bg=(%d,%d,%d)",
-+-	   pair,
-+-	   tp[f].red, tp[f].green, tp[f].blue,
-+-	   tp[b].red, tp[b].green, tp[b].blue));
-++	TR(TRACE_ATTRS,
-++	   ("initializing pair: pair = %d, fg=(%d,%d,%d), bg=(%d,%d,%d)",
-++	    pair,
-++	    tp[f].red, tp[f].green, tp[f].blue,
-++	    tp[b].red, tp[b].green, tp[b].blue));
-+ 
-+ 	TPUTS_TRACE("initialize_pair");
-+ 	putp(TPARM_7(initialize_pair,
-+@@ -461,7 +482,8 @@
-+ 	if (b)
-+ 	    *b = c_b;
-+ 
-+-	T(("...color_content(%d,%d,%d,%d)", color, c_r, c_g, c_b));
-++	TR(TRACE_ATTRS, ("...color_content(%d,%d,%d,%d)",
-++			 color, c_r, c_g, c_b));
-+ 	result = OK;
-+     }
-+     returnCode(result);
-+@@ -492,7 +514,7 @@
-+ 	if (b)
-+ 	    *b = bg;
-+ 
-+-	T(("...pair_content(%d,%d,%d)", pair, fg, bg));
-++	TR(TRACE_ATTRS, ("...pair_content(%d,%d,%d)", pair, fg, bg));
-+ 	result = OK;
-+     }
-+     returnCode(result);
-+Index: ncurses/base/lib_delwin.c
-+Prereq:  1.13 
-+--- ncurses-5.6/ncurses/base/lib_delwin.c	2001-08-26 00:40:20.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/lib_delwin.c	2007-11-03 20:24:15.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998,2000,2001 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2001,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -40,7 +40,7 @@
-+ 
-+ #include <curses.priv.h>
-+ 
-+-MODULE_ID("$Id: lib_delwin.c,v 1.13 2001/08/26 00:40:20 tom Exp $")
-++MODULE_ID("$Id: lib_delwin.c,v 1.14 2007/11/03 20:24:15 tom Exp $")
-+ 
-+ static bool
-+ cannot_delete(WINDOW *win)
-+@@ -63,16 +63,23 @@
-+ NCURSES_EXPORT(int)
-+ delwin(WINDOW *win)
-+ {
-++    int result = ERR;
-++
-+     T((T_CALLED("delwin(%p)"), win));
-+ 
-++    _nc_lock_global(windowlist);
-+     if (win == 0
-+-	|| cannot_delete(win))
-+-	returnCode(ERR);
-+-
-+-    if (win->_flags & _SUBWIN)
-+-	touchwin(win->_parent);
-+-    else if (curscr != 0)
-+-	touchwin(curscr);
-++	|| cannot_delete(win)) {
-++	result = ERR;
-++    } else {
-++
-++	if (win->_flags & _SUBWIN)
-++	    touchwin(win->_parent);
-++	else if (curscr != 0)
-++	    touchwin(curscr);
-+ 
-+-    returnCode(_nc_freewin(win));
-++	result = _nc_freewin(win);
-++    }
-++    _nc_unlock_global(windowlist);
-++    returnCode(result);
-+ }
-+Index: ncurses/base/lib_freeall.c
-+Prereq:  1.38 
-+--- ncurses-5.6/ncurses/base/lib_freeall.c	2006-12-02 22:36:43.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/lib_freeall.c	2007-06-02 19:40:25.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -27,7 +27,7 @@
-+  ****************************************************************************/
-+ 
-+ /****************************************************************************
-+- *  Author: Thomas E. Dickey                    1996,1997                   *
-++ *  Author: Thomas E. Dickey                    1996-on                     *
-+  ****************************************************************************/
-+ 
-+ #include <curses.priv.h>
-+@@ -40,7 +40,7 @@
-+ extern int malloc_errfd;	/* FIXME */
-+ #endif
-+ 
-+-MODULE_ID("$Id: lib_freeall.c,v 1.38 2006/12/02 22:36:43 tom Exp $")
-++MODULE_ID("$Id: lib_freeall.c,v 1.44 2007/06/02 19:40:25 tom Exp $")
-+ 
-+ /*
-+  * Free all ncurses data.  This is used for testing only (there's no practical
-+@@ -50,14 +50,14 @@
-+ _nc_freeall(void)
-+ {
-+     WINDOWLIST *p, *q;
-+-    char *s;
-+     static va_list empty_va;
-+ 
-+     T((T_CALLED("_nc_freeall()")));
-+ #if NO_LEAKS
-+-    _nc_free_tparm();
-+-    if (_nc_oldnums != 0) {
-+-	FreeAndNull(_nc_oldnums);
-++    if (SP != 0) {
-++	if (SP->_oldnum_list != 0) {
-++	    FreeAndNull(SP->_oldnum_list);
-++	}
-+     }
-+ #endif
-+     if (SP != 0) {
-+@@ -83,32 +83,23 @@
-+ 	}
-+ 	delscreen(SP);
-+     }
-+-#if NO_LEAKS
-+-    _nc_tgetent_leaks();
-+-#endif
-+-    del_curterm(cur_term);
-+-    _nc_free_entries(_nc_head);
-+-    _nc_get_type(0);
-+-    _nc_first_name(0);
-++    if (cur_term != 0)
-++	del_curterm(cur_term);
-++
-+ #if USE_WIDEC_SUPPORT
-+     FreeIfNeeded(_nc_wacs);
-+ #endif
-+-#if NO_LEAKS
-+-    _nc_alloc_entry_leaks();
-+-    _nc_captoinfo_leaks();
-+-    _nc_comp_scan_leaks();
-+-    _nc_keyname_leaks();
-+-    _nc_tic_expand(0, FALSE, 0);
-+-#endif
-+-
-+-    if ((s = _nc_home_terminfo()) != 0)
-+-	free(s);
-+-
-+     (void) _nc_printf_string(0, empty_va);
-+ #ifdef TRACE
-+     (void) _nc_trace_buf(-1, 0);
-+ #endif
-+ 
-++#if BROKEN_LINKER || USE_REENTRANT
-++    FreeIfNeeded(_nc_prescreen.real_acs_map);
-++#endif
-++
-++    _nc_leaks_tinfo();
-++
-+ #if HAVE_LIBDBMALLOC
-+     malloc_dump(malloc_errfd);
-+ #elif HAVE_LIBDMALLOC
-+Index: ncurses/base/lib_getch.c
-+Prereq:  1.75 
-+--- ncurses-5.6/ncurses/base/lib_getch.c	2006-03-04 20:06:09.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/lib_getch.c	2007-09-29 20:39:34.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -41,12 +41,20 @@
-+ 
-+ #include <curses.priv.h>
-+ 
-+-MODULE_ID("$Id: lib_getch.c,v 1.75 2006/03/04 20:06:09 tom Exp $")
-++MODULE_ID("$Id: lib_getch.c,v 1.80 2007/09/29 20:39:34 tom Exp $")
-+ 
-+ #include <fifo_defs.h>
-+ 
-++#if USE_REENTRANT
-++NCURSES_EXPORT(int)
-++NCURSES_PUBLIC_VAR(ESCDELAY) (void)
-++{
-++    return SP ? SP->_ESCDELAY : 1000;
-++}
-++#else
-+ NCURSES_EXPORT_VAR(int)
-+ ESCDELAY = 1000;		/* max interval betw. chars in funkeys, in millisecs */
-++#endif
-+ 
-+ #ifdef NCURSES_WGETCH_EVENTS
-+ #define TWAIT_MASK 7
-+@@ -104,8 +112,10 @@
-+ 	h_inc();
-+ 
-+ #ifdef TRACE
-+-    if (_nc_tracing & TRACE_IEVENT)
-++    if (USE_TRACEF(TRACE_IEVENT)) {
-+ 	_nc_fifo_dump();
-++	_nc_unlock_global(tracef);
-++    }
-+ #endif
-+     return ch;
-+ }
-+@@ -200,8 +210,10 @@
-+     t_inc();
-+     TR(TRACE_IEVENT, ("pushed %s at %d", _tracechar(ch), tail));
-+ #ifdef TRACE
-+-    if (_nc_tracing & TRACE_IEVENT)
-++    if (USE_TRACEF(TRACE_IEVENT)) {
-+ 	_nc_fifo_dump();
-++	_nc_unlock_global(tracef);
-++    }
-+ #endif
-+     return ch;
-+ }
-+@@ -234,15 +246,16 @@
-+     T((T_CALLED("_nc_wgetch(%p)"), win));
-+ 
-+     *result = 0;
-+-    if (win == 0 || SP == 0)
-++    if (win == 0 || SP == 0) {
-+ 	returnCode(ERR);
-++    }
-+ 
-+     if (cooked_key_in_fifo()) {
-+ 	if (wgetch_should_refresh(win))
-+ 	    wrefresh(win);
-+ 
-+ 	*result = fifo_pull();
-+-	returnCode(OK);
-++	returnCode(*result >= KEY_MIN ? KEY_CODE_YES : OK);
-+     }
-+ #ifdef NCURSES_WGETCH_EVENTS
-+     if (evl && (evl->count == 0))
-+@@ -281,12 +294,10 @@
-+ 	/* Return it first */
-+ 	if (rc == KEY_EVENT) {
-+ 	    *result = rc;
-+-	    returnCode(OK);
-+-	}
-++	} else
-+ #endif
-+-
-+-	*result = fifo_pull();
-+-	returnCode(OK);
-++	    *result = fifo_pull();
-++	returnCode(*result >= KEY_MIN ? KEY_CODE_YES : OK);
-+     }
-+ 
-+     if (win->_use_keypad != SP->_keypad_on)
-+@@ -318,7 +329,7 @@
-+ #ifdef NCURSES_WGETCH_EVENTS
-+ 	    if (rc & 4) {
-+ 		*result = KEY_EVENT;
-+-		returnCode(OK);
-++		returnCode(KEY_CODE_YES);
-+ 	    }
-+ #endif
-+ 	    if (!rc)
-+@@ -384,7 +395,7 @@
-+ 
-+     if (ch == ERR) {
-+ #if USE_SIZECHANGE
-+-	if (SP->_sig_winch) {
-++	if (_nc_handle_sigwinch(FALSE)) {
-+ 	    _nc_update_screensize();
-+ 	    /* resizeterm can push KEY_RESIZE */
-+ 	    if (cooked_key_in_fifo()) {
-+@@ -493,7 +504,7 @@
-+ static int
-+ kgetch(EVENTLIST_0th(_nc_eventlist * evl))
-+ {
-+-    struct tries *ptr;
-++    TRIES *ptr;
-+     int ch = 0;
-+     int timeleft = ESCDELAY;
-+ 
-+Index: ncurses/base/lib_initscr.c
-+Prereq:  1.34 
-+--- ncurses-5.6/ncurses/base/lib_initscr.c	2005-10-22 20:30:38.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/lib_initscr.c	2007-04-21 20:43:02.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -45,19 +45,18 @@
-+ #include <sys/termio.h>		/* needed for ISC */
-+ #endif
-+ 
-+-MODULE_ID("$Id: lib_initscr.c,v 1.34 2005/10/22 20:30:38 tom Exp $")
-++MODULE_ID("$Id: lib_initscr.c,v 1.35 2007/04/21 20:43:02 tom Exp $")
-+ 
-+ NCURSES_EXPORT(WINDOW *)
-+ initscr(void)
-+ {
-+-    static bool initialized = FALSE;
-+     NCURSES_CONST char *name;
-+ 
-+     START_TRACE();
-+     T((T_CALLED("initscr()")));
-+     /* Portable applications must not call initscr() more than once */
-+-    if (!initialized) {
-+-	initialized = TRUE;
-++    if (!_nc_globals.init_screen) {
-++	_nc_globals.init_screen = TRUE;
-+ 
-+ 	if ((name = getenv("TERM")) == 0
-+ 	    || *name == '\0')
-+Index: ncurses/base/lib_instr.c
-+Prereq:  1.15 
-+--- ncurses-5.6/ncurses/base/lib_instr.c	2005-11-20 01:38:03.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/lib_instr.c	2007-07-21 20:18:10.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -41,7 +41,7 @@
-+ 
-+ #include <curses.priv.h>
-+ 
-+-MODULE_ID("$Id: lib_instr.c,v 1.15 2005/11/20 01:38:03 tom Exp $")
-++MODULE_ID("$Id: lib_instr.c,v 1.16 2007/07/21 20:18:10 tom Exp $")
-+ 
-+ NCURSES_EXPORT(int)
-+ winnstr(WINDOW *win, char *str, int n)
-+@@ -81,7 +81,7 @@
-+ 			n3 = wcstombs(0, wch, 0);
-+ 			if (isEILSEQ(n3) || (n3 == 0)) {
-+ 			    ;
-+-			} else if ((int) (n3 + i) >= n) {
-++			} else if ((int) (n3 + i) > n) {
-+ 			    done = TRUE;
-+ 			} else if ((tmp = typeCalloc(char, n3 + 10)) == 0) {
-+ 			    done = TRUE;
-+@@ -102,9 +102,7 @@
-+ 	    str[i++] = (char) CharOf(win->_line[row].text[col]);
-+ #endif
-+ 	    if (++col > win->_maxx) {
-+-		col = 0;
-+-		if (++row > win->_maxy)
-+-		    break;
-++		break;
-+ 	    }
-+ 	}
-+     }
-+Index: ncurses/base/lib_mouse.c
-+Prereq:  1.85 
-+--- ncurses-5.6/ncurses/base/lib_mouse.c	2006-11-25 22:30:28.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/lib_mouse.c	2007-09-29 21:50:04.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -79,7 +79,7 @@
-+ 
-+ #include <curses.priv.h>
-+ 
-+-MODULE_ID("$Id: lib_mouse.c,v 1.85 2006/11/25 22:30:28 tom Exp $")
-++MODULE_ID("$Id: lib_mouse.c,v 1.88 2007/09/29 21:50:04 tom Exp $")
-+ 
-+ #include <term.h>
-+ #include <tic.h>
-+@@ -403,11 +403,11 @@
-+ }
-+ #endif /* USE_GPM_SUPPORT */
-+ 
-++#define xterm_kmous "\033[M"
-++
-+ static void
-+ initialize_mousetype(void)
-+ {
-+-    static const char *xterm_kmous = "\033[M";
-+-
-+     T((T_CALLED("initialize_mousetype()")));
-+ 
-+     /* Try gpm first, because gpm may be configured to run in xterm */
-+@@ -565,8 +565,8 @@
-+ 	    init_xterm_mouse();
-+ 	}
-+     } else if (strstr(cur_term->type.term_names, "xterm") != 0) {
-+-	(void) _nc_add_to_try(&(SP->_keytry), xterm_kmous, KEY_MOUSE);
-+-	init_xterm_mouse();
-++	if (_nc_add_to_try(&(SP->_keytry), xterm_kmous, KEY_MOUSE) == OK)
-++	    init_xterm_mouse();
-+     }
-+     returnVoid;
-+ }
-+@@ -985,12 +985,13 @@
-+     }
-+ 
-+ #ifdef TRACE
-+-    if (_nc_tracing & TRACE_IEVENT) {
-++    if (USE_TRACEF(TRACE_IEVENT)) {
-+ 	_trace_slot("before mouse press/release merge:");
-+ 	_tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d",
-+ 		(long) (runp - SP->_mouse_events),
-+ 		(long) ((eventp - SP->_mouse_events) + (EV_MAX - 1)) % EV_MAX,
-+ 		runcount);
-++	_nc_unlock_global(tracef);
-+     }
-+ #endif /* TRACE */
-+ 
-+@@ -1028,12 +1029,13 @@
-+ 	(merge);
-+ 
-+ #ifdef TRACE
-+-    if (_nc_tracing & TRACE_IEVENT) {
-++    if (USE_TRACEF(TRACE_IEVENT)) {
-+ 	_trace_slot("before mouse click merge:");
-+ 	_tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d",
-+ 		(long) (runp - SP->_mouse_events),
-+ 		(long) ((eventp - SP->_mouse_events) + (EV_MAX - 1)) % EV_MAX,
-+ 		runcount);
-++	_nc_unlock_global(tracef);
-+     }
-+ #endif /* TRACE */
-+ 
-+@@ -1099,12 +1101,13 @@
-+ 	(merge);
-+ 
-+ #ifdef TRACE
-+-    if (_nc_tracing & TRACE_IEVENT) {
-++    if (USE_TRACEF(TRACE_IEVENT)) {
-+ 	_trace_slot("before mouse event queue compaction:");
-+ 	_tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d",
-+ 		(long) (runp - SP->_mouse_events),
-+ 		(long) ((eventp - SP->_mouse_events) + (EV_MAX - 1)) % EV_MAX,
-+ 		runcount);
-++	_nc_unlock_global(tracef);
-+     }
-+ #endif /* TRACE */
-+ 
-+@@ -1117,12 +1120,13 @@
-+ 	    SP->_mouse_eventp = eventp = prev;
-+ 	}
-+ #ifdef TRACE
-+-    if (_nc_tracing & TRACE_IEVENT) {
-++    if (USE_TRACEF(TRACE_IEVENT)) {
-+ 	_trace_slot("after mouse event queue compaction:");
-+ 	_tracef("_nc_mouse_parse: run starts at %ld, ends at %ld, count %d",
-+ 		(long) (runp - SP->_mouse_events),
-+ 		(long) ((eventp - SP->_mouse_events) + (EV_MAX - 1)) % EV_MAX,
-+ 		runcount);
-++	_nc_unlock_global(tracef);
-+     }
-+     for (ep = runp; ep != eventp; ep = NEXT(ep))
-+ 	if (ep->id != INVALID_EVENT)
-+Index: ncurses/base/lib_newterm.c
-+Prereq:  1.64 
-+--- ncurses-5.6/ncurses/base/lib_newterm.c	2006-01-14 15:36:24.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/lib_newterm.c	2007-04-21 20:47:32.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -48,7 +48,7 @@
-+ #include <term.h>		/* clear_screen, cup & friends, cur_term */
-+ #include <tic.h>
-+ 
-+-MODULE_ID("$Id: lib_newterm.c,v 1.64 2006/01/14 15:36:24 tom Exp $")
-++MODULE_ID("$Id: lib_newterm.c,v 1.67 2007/04/21 20:47:32 tom Exp $")
-+ 
-+ #ifndef ONLCR			/* Allows compilation under the QNX 4.2 OS */
-+ #define ONLCR 0
-+@@ -94,14 +94,12 @@
-+  * aside from possibly delaying a filter() call until some terminals have been
-+  * initialized.
-+  */
-+-static bool filter_mode = FALSE;
-+-
-+ NCURSES_EXPORT(void)
-+ filter(void)
-+ {
-+     START_TRACE();
-+     T((T_CALLED("filter")));
-+-    filter_mode = TRUE;
-++    _nc_prescreen.filter_mode = TRUE;
-+     returnVoid;
-+ }
-+ 
-+@@ -115,7 +113,7 @@
-+ {
-+     START_TRACE();
-+     T((T_CALLED("nofilter")));
-+-    filter_mode = FALSE;
-++    _nc_prescreen.filter_mode = FALSE;
-+     returnVoid;
-+ }
-+ #endif
-+@@ -132,13 +130,6 @@
-+     START_TRACE();
-+     T((T_CALLED("newterm(\"%s\",%p,%p)"), name, ofp, ifp));
-+ 
-+-    _nc_handle_sigwinch(0);
-+-
-+-    /* allow user to set maximum escape delay from the environment */
-+-    if ((value = _nc_getenv_num("ESCDELAY")) >= 0) {
-+-	ESCDELAY = value;
-+-    }
-+-
-+     /* this loads the capability entry, then sets LINES and COLS */
-+     if (setupterm(name, fileno(ofp), &errret) == ERR) {
-+ 	result = 0;
-+@@ -149,7 +140,21 @@
-+ 	 */
-+ 	current = SP;
-+ 	_nc_set_screen(0);
-+-	if (_nc_setupscreen(LINES, COLS, ofp, filter_mode, slk_format) == ERR) {
-++
-++	/* allow user to set maximum escape delay from the environment */
-++	if ((value = _nc_getenv_num("ESCDELAY")) >= 0) {
-++#if USE_REENTRANT
-++	    SP->_ESCDELAY = value;
-++#else
-++	    ESCDELAY = value;
-++#endif
-++	}
-++
-++	if (_nc_setupscreen(LINES,
-++			    COLS,
-++			    ofp,
-++			    _nc_prescreen.filter_mode,
-++			    slk_format) == ERR) {
-+ 	    _nc_set_screen(current);
-+ 	    result = 0;
-+ 	} else {
-+@@ -211,6 +216,5 @@
-+ 	    result = SP;
-+ 	}
-+     }
-+-    _nc_handle_sigwinch(1);
-+     returnSP(result);
-+ }
-+Index: ncurses/base/lib_newwin.c
-+Prereq:  1.38 
-+--- ncurses-5.6/ncurses/base/lib_newwin.c	2006-10-14 20:31:19.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/lib_newwin.c	2007-10-20 20:56:07.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -41,7 +41,7 @@
-+ 
-+ #include <curses.priv.h>
-+ 
-+-MODULE_ID("$Id: lib_newwin.c,v 1.38 2006/10/14 20:31:19 tom Exp $")
-++MODULE_ID("$Id: lib_newwin.c,v 1.41 2007/10/20 20:56:07 tom Exp $")
-+ 
-+ static WINDOW *
-+ remove_window_from_screen(WINDOW *win)
-+@@ -52,16 +52,22 @@
-+ 	SCREEN *sp = *scan;
-+ 	if (sp->_curscr == win) {
-+ 	    sp->_curscr = 0;
-++#if !USE_REENTRANT
-+ 	    if (win == curscr)
-+ 		curscr = 0;
-++#endif
-+ 	} else if (sp->_stdscr == win) {
-+ 	    sp->_stdscr = 0;
-++#if !USE_REENTRANT
-+ 	    if (win == stdscr)
-+ 		stdscr = 0;
-++#endif
-+ 	} else if (sp->_newscr == win) {
-+ 	    sp->_newscr = 0;
-++#if !USE_REENTRANT
-+ 	    if (win == newscr)
-+ 		newscr = 0;
-++#endif
-+ 	} else {
-+ 	    scan = &(*scan)->_next_screen;
-+ 	    continue;
-+@@ -208,22 +214,31 @@
-+     WINDOW *win;
-+     bool is_pad = (flags & _ISPAD);
-+ 
-+-    T(("_nc_makenew(%d,%d,%d,%d)", num_lines, num_columns, begy, begx));
-++    T((T_CALLED("_nc_makenew(%d,%d,%d,%d)"), num_lines, num_columns, begy, begx));
-+ 
-+     if (SP == 0)
-+-	return 0;
-++	returnWin(0);
-+ 
-+     if (!dimension_limit(num_lines) || !dimension_limit(num_columns))
-+-	return 0;
-++	returnWin(0);
-+ 
-+     if ((wp = typeCalloc(WINDOWLIST, 1)) == 0)
-+-	return 0;
-++	returnWin(0);
-++
-++#ifdef USE_PTHREADS
-++    {
-++	pthread_mutexattr_t recattr;
-++	memset(&recattr, 0, sizeof(recattr));
-++	pthread_mutexattr_settype(&recattr, PTHREAD_MUTEX_RECURSIVE);
-++	pthread_mutex_init(&(wp->mutex_use_window), &recattr);
-++    }
-++#endif
-+ 
-+     win = &(wp->win);
-+ 
-+     if ((win->_line = typeCalloc(struct ldat, ((unsigned) num_lines))) == 0) {
-+ 	free(win);
-+-	return 0;
-++	returnWin(0);
-+     }
-+ 
-+     win->_curx = 0;
-+@@ -303,5 +318,5 @@
-+ 
-+     T((T_CREATE("window %p"), win));
-+ 
-+-    return (win);
-++    returnWin(win);
-+ }
-+Index: ncurses/base/lib_overlay.c
-+Prereq:  1.22 
-+--- ncurses-5.6/ncurses/base/lib_overlay.c	2006-10-14 20:43:31.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/lib_overlay.c	2007-04-07 17:13:52.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -40,7 +40,7 @@
-+ 
-+ #include <curses.priv.h>
-+ 
-+-MODULE_ID("$Id: lib_overlay.c,v 1.22 2006/10/14 20:43:31 tom Exp $")
-++MODULE_ID("$Id: lib_overlay.c,v 1.23 2007/04/07 17:13:52 tom Exp $")
-+ 
-+ static int
-+ overlap(const WINDOW *const s, WINDOW *const d, int const flag)
-+@@ -139,8 +139,8 @@
-+ {
-+     int sx, sy, dx, dy;
-+     bool touched;
-+-    attr_t bk = AttrOf(dst->_nc_bkgd);
-+-    attr_t mask = ~(attr_t) ((bk & A_COLOR) ? A_COLOR : 0);
-++    attr_t bk;
-++    attr_t mask;
-+ 
-+     T((T_CALLED("copywin(%p, %p, %d, %d, %d, %d, %d, %d, %d)"),
-+        src, dst, sminrow, smincol, dminrow, dmincol, dmaxrow, dmaxcol, over));
-+@@ -148,6 +148,9 @@
-+     if (!src || !dst)
-+ 	returnCode(ERR);
-+ 
-++    bk = AttrOf(dst->_nc_bkgd);
-++    mask = ~(attr_t) ((bk & A_COLOR) ? A_COLOR : 0);
-++
-+     /* make sure rectangle exists in source */
-+     if ((sminrow + dmaxrow - dminrow) > (src->_maxy + 1) ||
-+ 	(smincol + dmaxcol - dmincol) > (src->_maxx + 1)) {
-+Index: ncurses/base/lib_redrawln.c
-+Prereq:  1.11 
-+--- ncurses-5.6/ncurses/base/lib_redrawln.c	2006-11-04 23:08:47.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/lib_redrawln.c	2007-10-13 20:08:56.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2001,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -39,17 +39,20 @@
-+ 
-+ #include <curses.priv.h>
-+ 
-+-MODULE_ID("$Id: lib_redrawln.c,v 1.11 2006/11/04 23:08:47 tom Exp $")
-++MODULE_ID("$Id: lib_redrawln.c,v 1.12 2007/10/13 20:08:56 tom Exp $")
-+ 
-+ NCURSES_EXPORT(int)
-+ wredrawln(WINDOW *win, int beg, int num)
-+ {
-+     int i;
-+     int end;
-+-    size_t len = (win->_maxx + 1);
-++    size_t len;
-+ 
-+     T((T_CALLED("wredrawln(%p,%d,%d)"), win, beg, num));
-+ 
-++    if (win == 0)
-++	returnCode(ERR);
-++
-+     if (beg < 0)
-+ 	beg = 0;
-+ 
-+@@ -65,6 +68,7 @@
-+     if (end > win->_maxy + 1)
-+ 	end = win->_maxy + 1;
-+ 
-++    len = (win->_maxx + 1);
-+     if (len > (size_t) (curscr->_maxx + 1))
-+ 	len = (size_t) (curscr->_maxx + 1);
-+     len *= sizeof(curscr->_line[0].text[0]);
-+Index: ncurses/base/lib_refresh.c
-+Prereq:  1.34 
-+--- ncurses-5.6/ncurses/base/lib_refresh.c	2006-05-27 19:21:19.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/lib_refresh.c	2007-09-29 20:39:34.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -41,7 +41,7 @@
-+ 
-+ #include <curses.priv.h>
-+ 
-+-MODULE_ID("$Id: lib_refresh.c,v 1.34 2006/05/27 19:21:19 tom Exp $")
-++MODULE_ID("$Id: lib_refresh.c,v 1.41 2007/09/29 20:39:34 tom Exp $")
-+ 
-+ NCURSES_EXPORT(int)
-+ wrefresh(WINDOW *win)
-+@@ -74,18 +74,20 @@
-+ wnoutrefresh(WINDOW *win)
-+ {
-+     NCURSES_SIZE_T limit_x;
-+-    NCURSES_SIZE_T i, j;
-++    NCURSES_SIZE_T src_row, src_col;
-+     NCURSES_SIZE_T begx;
-+     NCURSES_SIZE_T begy;
-+-    NCURSES_SIZE_T m, n;
-++    NCURSES_SIZE_T dst_row, dst_col;
-+ #if USE_SCROLL_HINTS
-+     bool wide;
-+ #endif
-+ 
-+     T((T_CALLED("wnoutrefresh(%p)"), win));
-+ #ifdef TRACE
-+-    if (_nc_tracing & TRACE_UPDATE)
-++    if (USE_TRACEF(TRACE_UPDATE)) {
-+ 	_tracedump("...win", win);
-++	_nc_unlock_global(tracef);
-++    }
-+ #endif /* TRACE */
-+ 
-+     /*
-+@@ -132,28 +134,121 @@
-+      * so we'll force the issue.
-+      */
-+ 
-+-    /* limit(n) */
-++    /* limit(dst_col) */
-+     limit_x = win->_maxx;
-+-    /* limit(j) */
-++    /* limit(src_col) */
-+     if (limit_x > newscr->_maxx - begx)
-+ 	limit_x = newscr->_maxx - begx;
-+ 
-+-    for (i = 0, m = begy + win->_yoffset;
-+-	 i <= win->_maxy && m <= newscr->_maxy;
-+-	 i++, m++) {
-+-	register struct ldat *nline = &newscr->_line[m];
-+-	register struct ldat *oline = &win->_line[i];
-++    for (src_row = 0, dst_row = begy + win->_yoffset;
-++	 src_row <= win->_maxy && dst_row <= newscr->_maxy;
-++	 src_row++, dst_row++) {
-++	register struct ldat *nline = &newscr->_line[dst_row];
-++	register struct ldat *oline = &win->_line[src_row];
-+ 
-+ 	if (oline->firstchar != _NOCHANGE) {
-+-	    int last = oline->lastchar;
-++	    int last_src = oline->lastchar;
-++
-++	    if (last_src > limit_x)
-++		last_src = limit_x;
-+ 
-+-	    if (last > limit_x)
-+-		last = limit_x;
-++	    src_col = oline->firstchar;
-++	    dst_col = src_col + begx;
-++
-++	    if_WIDEC({
-++		register int j;
-++
-++		/*
-++		 * Ensure that we will copy complete multi-column characters
-++		 * on the left-boundary.
-++		 */
-++		if (isWidecExt(oline->text[src_col])) {
-++		    j = 1 + dst_col - WidecExt(oline->text[src_col]);
-++		    if (j < 0)
-++			j = 0;
-++		    if (dst_col > j) {
-++			src_col -= (dst_col - j);
-++			dst_col = j;
-++		    }
-++		}
-+ 
-+-	    for (j = oline->firstchar, n = j + begx; j <= last; j++, n++) {
-+-		if (!CharEq(oline->text[j], nline->text[n])) {
-+-		    nline->text[n] = oline->text[j];
-+-		    CHANGED_CELL(nline, n);
-++		/*
-++		 * Ensure that we will copy complete multi-column characters
-++		 * on the right-boundary.
-++		 */
-++		j = last_src;
-++		if (WidecExt(oline->text[j])) {
-++		    ++j;
-++		    while (j <= limit_x) {
-++			if (isWidecBase(oline->text[j])) {
-++			    break;
-++			} else {
-++			    last_src = j;
-++			}
-++			++j;
-++		    }
-++		}
-++	    });
-++
-++	    if_WIDEC({
-++		static cchar_t blank = BLANK;
-++		int last_dst = begx + ((last_src < win->_maxx)
-++				       ? last_src
-++				       : win->_maxx);
-++		int fix_left = dst_col;
-++		int fix_right = last_dst;
-++		register int j;
-++
-++		/*
-++		 * Check for boundary cases where we may overwrite part of a
-++		 * multi-column character.  For those, wipe the remainder of
-++		 * the character to blanks.
-++		 */
-++		j = dst_col;
-++		if (isWidecExt(nline->text[j])) {
-++		    /*
-++		     * On the left, we only care about multi-column characters
-++		     * that extend into the changed region.
-++		     */
-++		    fix_left = 1 + j - WidecExt(nline->text[j]);
-++		    if (fix_left < 0)
-++			fix_left = 0;	/* only if cell is corrupt */
-++		}
-++
-++		j = last_dst;
-++		if (WidecExt(nline->text[j]) != 0) {
-++		    /*
-++		     * On the right, any multi-column character is a problem,
-++		     * unless it happens to be contained in the change, and
-++		     * ending at the right boundary of the change.  The
-++		     * computation for 'fix_left' accounts for the left-side of
-++		     * this character.  Find the end of the character.
-++		     */
-++		    ++j;
-++		    while (j <= newscr->_maxx && isWidecExt(nline->text[j])) {
-++			fix_right = j++;
-++		    }
-++		}
-++
-++		/*
-++		 * The analysis is simpler if we do the clearing afterwards.
-++		 * Do that now.
-++		 */
-++		if (fix_left < dst_col || fix_right > last_dst) {
-++		    for (j = fix_left; j <= fix_right; ++j) {
-++			nline->text[j] = blank;
-++			CHANGED_CELL(nline, j);
-++		    }
-++		}
-++	    });
-++
-++	    /*
-++	     * Copy the changed text.
-++	     */
-++	    for (; src_col <= last_src; src_col++, dst_col++) {
-++		if (!CharEq(oline->text[src_col], nline->text[dst_col])) {
-++		    nline->text[dst_col] = oline->text[src_col];
-++		    CHANGED_CELL(nline, dst_col);
-+ 		}
-+ 	    }
-+ 
-+@@ -162,13 +257,14 @@
-+ 	if (wide) {
-+ 	    int oind = oline->oldindex;
-+ 
-+-	    nline->oldindex = (oind == _NEWINDEX) ? _NEWINDEX : begy + oind
-+-		+ win->_yoffset;
-++	    nline->oldindex = ((oind == _NEWINDEX)
-++			       ? _NEWINDEX
-++			       : (begy + oind + win->_yoffset));
-+ 	}
-+ #endif /* USE_SCROLL_HINTS */
-+ 
-+ 	oline->firstchar = oline->lastchar = _NOCHANGE;
-+-	if_USE_SCROLL_HINTS(oline->oldindex = i);
-++	if_USE_SCROLL_HINTS(oline->oldindex = src_row);
-+     }
-+ 
-+     if (win->_clear) {
-+@@ -183,8 +279,10 @@
-+     newscr->_leaveok = win->_leaveok;
-+ 
-+ #ifdef TRACE
-+-    if (_nc_tracing & TRACE_UPDATE)
-++    if (USE_TRACEF(TRACE_UPDATE)) {
-+ 	_tracedump("newscr", newscr);
-++	_nc_unlock_global(tracef);
-++    }
-+ #endif /* TRACE */
-+     returnCode(OK);
-+ }
-+Index: ncurses/base/lib_restart.c
-+Prereq:  1.6 
-+--- ncurses-5.6/ncurses/base/lib_restart.c	2006-01-14 15:58:23.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/lib_restart.c	2007-10-13 19:59:47.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -48,23 +48,22 @@
-+ 
-+ #include <term.h>		/* lines, columns, cur_term */
-+ 
-+-MODULE_ID("$Id: lib_restart.c,v 1.6 2006/01/14 15:58:23 tom Exp $")
-++MODULE_ID("$Id: lib_restart.c,v 1.8 2007/10/13 19:59:47 tom Exp $")
-+ 
-+ NCURSES_EXPORT(int)
-+ restartterm(NCURSES_CONST char *termp, int filenum, int *errret)
-+ {
-+-    int saveecho = SP->_echo;
-+-    int savecbreak = SP->_cbreak;
-+-    int saveraw = SP->_raw;
-+-    int savenl = SP->_nl;
-+     int result;
-+ 
-+     T((T_CALLED("restartterm(%s,%d,%p)"), termp, filenum, errret));
-+ 
-+-    _nc_handle_sigwinch(0);
-+     if (setupterm(termp, filenum, errret) != OK) {
-+ 	result = ERR;
-+-    } else {
-++    } else if (SP != 0) {
-++	int saveecho = SP->_echo;
-++	int savecbreak = SP->_cbreak;
-++	int saveraw = SP->_raw;
-++	int savenl = SP->_nl;
-+ 
-+ 	if (saveecho)
-+ 	    echo();
-+@@ -93,7 +92,8 @@
-+ #endif
-+ 
-+ 	result = OK;
-++    } else {
-++	result = ERR;
-+     }
-+-    _nc_handle_sigwinch(1);
-+     returnCode(result);
-+ }
-+Index: ncurses/base/lib_screen.c
-+Prereq:  1.29 
-+--- ncurses-5.6/ncurses/base/lib_screen.c	2006-05-27 19:21:38.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/lib_screen.c	2007-03-10 23:20:41.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -34,7 +34,7 @@
-+ 
-+ #include <curses.priv.h>
-+ 
-+-MODULE_ID("$Id: lib_screen.c,v 1.29 2006/05/27 19:21:38 tom Exp $")
-++MODULE_ID("$Id: lib_screen.c,v 1.30 2007/03/10 23:20:41 tom Exp $")
-+ 
-+ NCURSES_EXPORT(WINDOW *)
-+ getwin(FILE *filep)
-+@@ -146,7 +146,10 @@
-+ 	returnCode(ERR);
-+     } else {
-+ 	delwin(newscr);
-+-	SP->_newscr = newscr = getwin(fp);
-++	SP->_newscr = getwin(fp);
-++#if !USE_REENTRANT
-++	newscr = SP->_newscr;
-++#endif
-+ 	(void) fclose(fp);
-+ 	returnCode(OK);
-+     }
-+@@ -184,7 +187,10 @@
-+ 	returnCode(ERR);
-+     } else {
-+ 	delwin(curscr);
-+-	SP->_curscr = curscr = getwin(fp);
-++	SP->_curscr = getwin(fp);
-++#if !USE_REENTRANT
-++	curscr = SP->_curscr;
-++#endif
-+ 	(void) fclose(fp);
-+ 	returnCode(OK);
-+     }
-+@@ -199,7 +205,10 @@
-+ 	returnCode(ERR);
-+     } else {
-+ 	delwin(newscr);
-+-	SP->_newscr = newscr = dupwin(curscr);
-++	SP->_newscr = dupwin(curscr);
-++#if !USE_REENTRANT
-++	newscr = SP->_newscr;
-++#endif
-+ 	returnCode(OK);
-+     }
-+ }
-+Index: ncurses/base/lib_set_term.c
-+Prereq:  1.91 
-+--- ncurses-5.6/ncurses/base/lib_set_term.c	2006-05-20 14:58:02.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/lib_set_term.c	2007-09-08 21:23:43.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -44,7 +44,7 @@
-+ #include <term.h>		/* cur_term */
-+ #include <tic.h>
-+ 
-+-MODULE_ID("$Id: lib_set_term.c,v 1.91 2006/05/20 14:58:02 tom Exp $")
-++MODULE_ID("$Id: lib_set_term.c,v 1.100 2007/09/08 21:23:43 tom Exp $")
-+ 
-+ NCURSES_EXPORT(SCREEN *)
-+ set_term(SCREEN *screenp)
-+@@ -53,22 +53,28 @@
-+ 
-+     T((T_CALLED("set_term(%p)"), screenp));
-+ 
-++    _nc_lock_global(set_SP);
-++
-+     oldSP = SP;
-+     _nc_set_screen(screenp);
-+ 
-+     set_curterm(SP->_term);
-++#if !USE_REENTRANT
-+     curscr = SP->_curscr;
-+     newscr = SP->_newscr;
-+     stdscr = SP->_stdscr;
-+     COLORS = SP->_color_count;
-+     COLOR_PAIRS = SP->_pair_count;
-++#endif
-++
-++    _nc_unlock_global(set_SP);
-+ 
-+     T((T_RETURN("%p"), oldSP));
-+     return (oldSP);
-+ }
-+ 
-+ static void
-+-_nc_free_keytry(struct tries *kt)
-++_nc_free_keytry(TRIES * kt)
-+ {
-+     if (kt != 0) {
-+ 	_nc_free_keytry(kt->child);
-+@@ -88,6 +94,7 @@
-+ 
-+     T((T_CALLED("delscreen(%p)"), sp));
-+ 
-++    _nc_lock_global(set_SP);
-+     while (*scan) {
-+ 	if (*scan == sp) {
-+ 	    *scan = sp->_next_screen;
-+@@ -152,20 +159,20 @@
-+      * multiple references in different screens).
-+      */
-+     if (sp == SP) {
-++#if !USE_REENTRANT
-+ 	curscr = 0;
-+ 	newscr = 0;
-+ 	stdscr = 0;
-+ 	COLORS = 0;
-+ 	COLOR_PAIRS = 0;
-++#endif
-+ 	_nc_set_screen(0);
-+     }
-++    _nc_unlock_global(set_SP);
-++
-+     returnVoid;
-+ }
-+ 
-+-static ripoff_t rippedoff[5];
-+-static ripoff_t *rsp = rippedoff;
-+-#define N_RIPS SIZEOF(SP->_rippedoff)
-+-
-+ static bool
-+ no_mouse_event(SCREEN *sp GCC_UNUSED)
-+ {
-+@@ -214,17 +221,20 @@
-+ }
-+ #endif
-+ 
-++#define ripoff_sp	_nc_prescreen.rsp
-++#define ripoff_stack	_nc_prescreen.rippedoff
-++
-+ /* OS-independent screen initializations */
-+ NCURSES_EXPORT(int)
-+-_nc_setupscreen(int slines,
-+-		int scolumns,
-++_nc_setupscreen(int slines GCC_UNUSED,
-++		int scolumns GCC_UNUSED,
-+ 		FILE *output,
-+ 		bool filtered,
-+ 		int slk_format)
-+ {
-+     int bottom_stolen = 0;
-+-    int i;
-+     bool support_cookies = USE_XMC_SUPPORT;
-++    ripoff_t *rop;
-+ 
-+     T((T_CALLED("_nc_setupscreen(%d, %d, %p, %d, %d)"),
-+        slines, scolumns, output, filtered, slk_format));
-+@@ -243,12 +253,20 @@
-+     if ((SP->_current_attr = typeCalloc(NCURSES_CH_T, 1)) == 0)
-+ 	returnCode(ERR);
-+ 
-++    /*
-++     * We should always check the screensize, just in case.
-++     */
-++    _nc_get_screensize(&slines, &scolumns);
-++    SET_LINES(slines);
-++    SET_COLS(scolumns);
-++    T((T_CREATE("screen %s %dx%d"), termname(), LINES, COLS));
-++
-+     SP->_filtered = filtered;
-+ 
-+     /* implement filter mode */
-+     if (filtered) {
-+-	slines = LINES = 1;
-+-
-++	slines = 1;
-++	SET_LINES(slines);
-+ 	clear_screen = 0;
-+ 	cursor_down = parm_down_cursor = 0;
-+ 	cursor_address = 0;
-+@@ -258,18 +276,6 @@
-+ 	cursor_home = carriage_return;
-+ 	T(("filter screensize %dx%d", LINES, COLS));
-+     }
-+-
-+-    /* If we must simulate soft labels, grab off the line to be used.
-+-       We assume that we must simulate, if it is none of the standard
-+-       formats (4-4  or 3-2-3) for which there may be some hardware
-+-       support. */
-+-    if (num_labels <= 0 || !SLK_STDFMT(slk_format)) {
-+-	if (slk_format) {
-+-	    if (ERR == _nc_ripoffline(-SLK_LINES(slk_format),
-+-				      _nc_slk_initialize))
-+-		returnCode(ERR);
-+-	}
-+-    }
-+ #ifdef __DJGPP__
-+     T(("setting output mode to binary"));
-+     fflush(output);
-+@@ -484,6 +490,15 @@
-+     }
-+ 
-+     /* initialize normal acs before wide, since we use mapping in the latter */
-++#if !USE_WIDEC_SUPPORT
-++    if (_nc_unicode_locale() && _nc_locale_breaks_acs()) {
-++	acs_chars = NULL;
-++	ena_acs = NULL;
-++	enter_alt_charset_mode = NULL;
-++	exit_alt_charset_mode = NULL;
-++	set_attributes = NULL;
-++    }
-++#endif
-+     _nc_init_acs();
-+ #if USE_WIDEC_SUPPORT
-+     _nc_init_wacs();
-+@@ -506,15 +521,17 @@
-+     SP->newhash = 0;
-+ 
-+     T(("creating newscr"));
-+-    if ((newscr = newwin(slines, scolumns, 0, 0)) == 0)
-++    if ((SP->_newscr = newwin(slines, scolumns, 0, 0)) == 0)
-+ 	returnCode(ERR);
-+ 
-+     T(("creating curscr"));
-+-    if ((curscr = newwin(slines, scolumns, 0, 0)) == 0)
-++    if ((SP->_curscr = newwin(slines, scolumns, 0, 0)) == 0)
-+ 	returnCode(ERR);
-+ 
-+-    SP->_newscr = newscr;
-+-    SP->_curscr = curscr;
-++#if !USE_REENTRANT
-++    newscr = SP->_newscr;
-++    curscr = SP->_curscr;
-++#endif
-+ #if USE_SIZECHANGE
-+     SP->_resize = resizeterm;
-+ #endif
-+@@ -525,46 +542,63 @@
-+     def_shell_mode();
-+     def_prog_mode();
-+ 
-+-    for (i = 0, rsp = rippedoff; rsp->line && (i < (int) N_RIPS); rsp++, i++) {
-+-	T(("ripping off line %d at %s", i, rsp->line < 0 ? "bottom" : "top"));
-+-	SP->_rippedoff[i] = rippedoff[i];
-+-	if (rsp->hook) {
-+-	    int count = (rsp->line < 0) ? -rsp->line : rsp->line;
-+-
-+-	    SP->_rippedoff[i].w = newwin(count,
-+-					 scolumns,
-+-					 ((rsp->line < 0)
-+-					  ? SP->_lines_avail - count
-+-					  : 0),
-+-					 0);
-+-	    if (SP->_rippedoff[i].w != 0)
-+-		SP->_rippedoff[i].hook(SP->_rippedoff[i].w, scolumns);
-++    for (rop = ripoff_stack;
-++	 rop != ripoff_sp && (rop - ripoff_stack) < N_RIPS;
-++	 rop++) {
-++
-++	/* If we must simulate soft labels, grab off the line to be used.
-++	   We assume that we must simulate, if it is none of the standard
-++	   formats (4-4 or 3-2-3) for which there may be some hardware
-++	   support. */
-++	if (rop->hook == _nc_slk_initialize)
-++	    if (!(num_labels <= 0 || !SLK_STDFMT(slk_format)))
-++		continue;
-++	if (rop->hook) {
-++	    int count;
-++	    WINDOW *w;
-++
-++	    count = (rop->line < 0) ? -rop->line : rop->line;
-++	    T(("ripping off %i lines at %s", count,
-++	       ((rop->line < 0)
-++		? "bottom"
-++		: "top")));
-++
-++	    w = newwin(count, scolumns,
-++		       ((rop->line < 0)
-++			? SP->_lines_avail - count
-++			: 0),
-++		       0);
-++	    if (w)
-++		rop->hook(w, scolumns);
-+ 	    else
-+ 		returnCode(ERR);
-+-	    if (rsp->line < 0)
-++	    if (rop->line < 0)
-+ 		bottom_stolen += count;
-+ 	    else
-+ 		SP->_topstolen += count;
-+ 	    SP->_lines_avail -= count;
-+ 	}
-+-	rsp->line = 0;
-+     }
-+-    SP->_rip_count = i;
-+     /* reset the stack */
-+-    rsp = rippedoff;
-++    ripoff_sp = ripoff_stack;
-+ 
-+     T(("creating stdscr"));
-+     assert((SP->_lines_avail + SP->_topstolen + bottom_stolen) == slines);
-+-    if ((stdscr = newwin(LINES = SP->_lines_avail, scolumns, 0, 0)) == 0)
-++    if ((SP->_stdscr = newwin(SP->_lines_avail, scolumns, 0, 0)) == 0)
-+ 	returnCode(ERR);
-+-    SP->_stdscr = stdscr;
-++
-++    SET_LINES(SP->_lines_avail);
-++#if !USE_REENTRANT
-++    stdscr = SP->_stdscr;
-++#endif
-+ 
-+     returnCode(OK);
-+ }
-+ 
-+-/* The internal implementation interprets line as the number of
-+-   lines to rip off from the top or bottom.
-+-   */
-++/*
-++ * The internal implementation interprets line as the number of lines to rip
-++ * off from the top or bottom.
-++ */
-+ NCURSES_EXPORT(int)
-+ _nc_ripoffline(int line, int (*init) (WINDOW *, int))
-+ {
-+@@ -572,13 +606,14 @@
-+ 
-+     if (line != 0) {
-+ 
-+-	if (rsp >= rippedoff + N_RIPS)
-++	if (ripoff_sp == 0)
-++	    ripoff_sp = ripoff_stack;
-++	if (ripoff_sp >= ripoff_stack + N_RIPS)
-+ 	    returnCode(ERR);
-+ 
-+-	rsp->line = line;
-+-	rsp->hook = init;
-+-	rsp->w = 0;
-+-	rsp++;
-++	ripoff_sp->line = line;
-++	ripoff_sp->hook = init;
-++	ripoff_sp++;
-+     }
-+ 
-+     returnCode(OK);
-+Index: ncurses/base/lib_slkinit.c
-+Prereq:  1.5 
-+--- ncurses-5.6/ncurses/base/lib_slkinit.c	2000-12-10 02:43:27.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/lib_slkinit.c	2007-05-12 18:14:21.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
-++ * Copyright (c) 1998-2000,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -38,14 +38,17 @@
-+  */
-+ #include <curses.priv.h>
-+ 
-+-MODULE_ID("$Id: lib_slkinit.c,v 1.5 2000/12/10 02:43:27 tom Exp $")
-++MODULE_ID("$Id: lib_slkinit.c,v 1.6 2007/05/12 18:14:21 tom Exp $")
-+ 
-+ NCURSES_EXPORT(int)
-+ slk_init(int format)
-+ {
-++    int code = ERR;
-++
-+     T((T_CALLED("slk_init(%d)"), format));
-+-    if (format < 0 || format > 3)
-+-	returnCode(ERR);
-+-    _nc_slk_format = 1 + format;
-+-    returnCode(OK);
-++    if (format >= 0 && format <= 3 && !_nc_slk_format) {
-++	_nc_slk_format = 1 + format;
-++	code = _nc_ripoffline(-SLK_LINES(_nc_slk_format), _nc_slk_initialize);
-++    }
-++    returnCode(code);
-+ }
-+Index: ncurses/base/lib_slkset.c
-+Prereq:  1.16 
-+--- ncurses-5.6/ncurses/base/lib_slkset.c	2006-12-17 19:47:09.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/lib_slkset.c	2007-10-13 20:08:46.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -44,12 +44,12 @@
-+ #endif
-+ #endif
-+ 
-+-MODULE_ID("$Id: lib_slkset.c,v 1.16 2006/12/17 19:47:09 tom Exp $")
-++MODULE_ID("$Id: lib_slkset.c,v 1.17 2007/10/13 20:08:46 tom Exp $")
-+ 
-+ NCURSES_EXPORT(int)
-+ slk_set(int i, const char *astr, int format)
-+ {
-+-    SLK *slk = SP->_slk;
-++    SLK *slk;
-+     int offset;
-+     int numchrs;
-+     int numcols;
-+@@ -59,7 +59,12 @@
-+ 
-+     T((T_CALLED("slk_set(%d, \"%s\", %d)"), i, str, format));
-+ 
-+-    if (slk == NULL || i < 1 || i > slk->labcnt || format < 0 || format > 2)
-++    if (SP == 0
-++	|| (slk = SP->_slk) == 0
-++	|| i < 1
-++	|| i > slk->labcnt
-++	|| format < 0
-++	|| format > 2)
-+ 	returnCode(ERR);
-+     if (str == NULL)
-+ 	str = "";
-+Index: ncurses/base/lib_ungetch.c
-+Prereq:  1.8 
-+--- ncurses-5.6/ncurses/base/lib_ungetch.c	2002-08-24 22:08:48.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/lib_ungetch.c	2007-09-29 21:49:56.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2001,2002 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2002,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -40,7 +40,7 @@
-+ 
-+ #include <curses.priv.h>
-+ 
-+-MODULE_ID("$Id: lib_ungetch.c,v 1.8 2002/08/24 22:08:48 tom Exp $")
-++MODULE_ID("$Id: lib_ungetch.c,v 1.9 2007/09/29 21:49:56 tom Exp $")
-+ 
-+ #include <fifo_defs.h>
-+ 
-+@@ -72,8 +72,10 @@
-+     SP->_fifo[head] = ch;
-+     T(("ungetch %s ok", _tracechar(ch)));
-+ #ifdef TRACE
-+-    if (_nc_tracing & TRACE_IEVENT)
-++    if (USE_TRACEF(TRACE_IEVENT)) {
-+ 	_nc_fifo_dump();
-++	_nc_unlock_global(tracef);
-++    }
-+ #endif
-+     returnCode(OK);
-+ }
-+Index: ncurses/base/lib_window.c
-+Prereq:  1.22 
-+--- ncurses-5.6/ncurses/base/lib_window.c	2006-05-27 19:21:19.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/lib_window.c	2007-06-30 23:36:11.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -39,7 +39,7 @@
-+ 
-+ #include <curses.priv.h>
-+ 
-+-MODULE_ID("$Id: lib_window.c,v 1.22 2006/05/27 19:21:19 tom Exp $")
-++MODULE_ID("$Id: lib_window.c,v 1.23 2007/06/30 23:36:11 tom Exp $")
-+ 
-+ NCURSES_EXPORT(void)
-+ _nc_synchook(WINDOW *win)
-+@@ -149,7 +149,7 @@
-+ 		/* left and right character in child coordinates */
-+ 		int left = pp->_line[win->_pary + y].firstchar - win->_parx;
-+ 		int right = pp->_line[win->_pary + y].lastchar - win->_parx;
-+-		/* The change maybe outside the childs range */
-++		/* The change may be outside the child's range */
-+ 		if (left < 0)
-+ 		    left = 0;
-+ 		if (right > win->_maxx)
-+Index: ncurses/base/memmove.c
-+Prereq:  1.4 
-+--- ncurses-5.6/ncurses/base/memmove.c	2000-12-10 02:43:28.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/memmove.c	2007-08-11 17:12:43.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
-++ * Copyright (c) 1998-2000,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -28,7 +28,7 @@
-+ 
-+ #include <curses.priv.h>
-+ 
-+-MODULE_ID("$Id: memmove.c,v 1.4 2000/12/10 02:43:28 tom Exp $")
-++MODULE_ID("$Id: memmove.c,v 1.5 2007/08/11 17:12:43 tom Exp $")
-+ 
-+ /****************************************************************************
-+  *  Author: Thomas E. Dickey <dickey@clark.net> 1998                        *
-+@@ -51,7 +51,7 @@
-+ 	    }
-+ 	    for (j = 0; j < n; j++)
-+ 		bfr[j] = SRC[j];
-+-	    SRC = bfr;
-++	    s2 = bfr;
-+ 	}
-+ 	while (n-- != 0)
-+ 	    DST[n] = SRC[n];
-+Index: ncurses/base/resizeterm.c
-+Prereq:  1.18 
-+--- ncurses-5.6/ncurses/base/resizeterm.c	2006-10-14 20:43:31.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/resizeterm.c	2007-10-13 20:12:13.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -41,12 +41,24 @@
-+ #include <curses.priv.h>
-+ #include <term.h>
-+ 
-+-MODULE_ID("$Id: resizeterm.c,v 1.18 2006/10/14 20:43:31 tom Exp $")
-++MODULE_ID("$Id: resizeterm.c,v 1.23 2007/10/13 20:12:13 tom Exp $")
-+ 
-+ #define stolen_lines (screen_lines - SP->_lines_avail)
-+ 
-++/*
-++ * If we're trying to be reentrant, do not want any local statics.
-++ */
-++#if USE_REENTRANT
-++#define EXTRA_ARGS ,     CurLines,     CurCols
-++#define EXTRA_DCLS , int CurLines, int CurCols
-++#else
-+ static int current_lines;
-+ static int current_cols;
-++#define CurLines current_lines
-++#define CurCols  current_cols
-++#define EXTRA_ARGS		/* nothing */
-++#define EXTRA_DCLS		/* nothing */
-++#endif
-+ 
-+ #ifdef TRACE
-+ static void
-+@@ -121,10 +133,10 @@
-+  * FIXME: must adjust position so it's within the parent!
-+  */
-+ static int
-+-adjust_window(WINDOW *win, int ToLines, int ToCols, int stolen)
-++adjust_window(WINDOW *win, int ToLines, int ToCols, int stolen EXTRA_DCLS)
-+ {
-+     int result;
-+-    int bottom = current_lines + SP->_topstolen - stolen;
-++    int bottom = CurLines + SP->_topstolen - stolen;
-+     int myLines = win->_maxy + 1;
-+     int myCols = win->_maxx + 1;
-+ 
-+@@ -134,13 +146,13 @@
-+        (long) getbegy(win), (long) getbegx(win)));
-+ 
-+     if (win->_begy >= bottom) {
-+-	win->_begy += (ToLines - current_lines);
-++	win->_begy += (ToLines - CurLines);
-+     } else {
-+-	if (myLines == current_lines - stolen
-+-	    && ToLines != current_lines)
-++	if (myLines == CurLines - stolen
-++	    && ToLines != CurLines)
-+ 	    myLines = ToLines - stolen;
-+-	else if (myLines == current_lines
-+-		 && ToLines != current_lines)
-++	else if (myLines == CurLines
-++		 && ToLines != CurLines)
-+ 	    myLines = ToLines;
-+     }
-+ 
-+@@ -150,12 +162,12 @@
-+     if (myCols > ToCols)
-+ 	myCols = ToCols;
-+ 
-+-    if (myLines == current_lines
-+-	&& ToLines != current_lines)
-++    if (myLines == CurLines
-++	&& ToLines != CurLines)
-+ 	myLines = ToLines;
-+ 
-+-    if (myCols == current_cols
-+-	&& ToCols != current_cols)
-++    if (myCols == CurCols
-++	&& ToCols != CurCols)
-+ 	myCols = ToCols;
-+ 
-+     result = wresize(win, myLines, myCols);
-+@@ -167,7 +179,7 @@
-+  * children, decrease those to fit, then decrease the containing window, etc.
-+  */
-+ static int
-+-decrease_size(int ToLines, int ToCols, int stolen)
-++decrease_size(int ToLines, int ToCols, int stolen EXTRA_DCLS)
-+ {
-+     bool found;
-+     int depth = 0;
-+@@ -185,7 +197,8 @@
-+ 	    if (!(win->_flags & _ISPAD)) {
-+ 		if (child_depth(win) == depth) {
-+ 		    found = TRUE;
-+-		    if (adjust_window(win, ToLines, ToCols, stolen) != OK)
-++		    if (adjust_window(win, ToLines, ToCols,
-++				      stolen EXTRA_ARGS) != OK)
-+ 			returnCode(ERR);
-+ 		}
-+ 	    }
-+@@ -200,7 +213,7 @@
-+  * parent, increase those to fit, then increase the contained window, etc.
-+  */
-+ static int
-+-increase_size(int ToLines, int ToCols, int stolen)
-++increase_size(int ToLines, int ToCols, int stolen EXTRA_DCLS)
-+ {
-+     bool found;
-+     int depth = 0;
-+@@ -218,7 +231,8 @@
-+ 	    if (!(win->_flags & _ISPAD)) {
-+ 		if (parent_depth(win) == depth) {
-+ 		    found = TRUE;
-+-		    if (adjust_window(win, ToLines, ToCols, stolen) != OK)
-++		    if (adjust_window(win, ToLines, ToCols,
-++				      stolen EXTRA_ARGS) != OK)
-+ 			returnCode(ERR);
-+ 		}
-+ 	    }
-+@@ -235,36 +249,42 @@
-+ NCURSES_EXPORT(int)
-+ resize_term(int ToLines, int ToCols)
-+ {
-+-    int result = OK;
-+-    int was_stolen = (screen_lines - SP->_lines_avail);
-++    int result = OK EXTRA_ARGS;
-++    int was_stolen;
-+ 
-+     T((T_CALLED("resize_term(%d,%d) old(%d,%d)"),
-+        ToLines, ToCols,
-+        screen_lines, screen_columns));
-+ 
-++    if (SP == 0) {
-++	returnCode(ERR);
-++    }
-++    was_stolen = (screen_lines - SP->_lines_avail);
-+     if (is_term_resized(ToLines, ToCols)) {
-+-	int myLines = current_lines = screen_lines;
-+-	int myCols = current_cols = screen_columns;
-++	int myLines = CurLines = screen_lines;
-++	int myCols = CurCols = screen_columns;
-+ 
-+ #ifdef TRACE
-+-	if (_nc_tracing & TRACE_UPDATE)
-++	if (USE_TRACEF(TRACE_UPDATE)) {
-+ 	    show_window_sizes("before");
-++	    _nc_unlock_global(tracef);
-++	}
-+ #endif
-+ 	if (ToLines > screen_lines) {
-+-	    increase_size(myLines = ToLines, myCols, was_stolen);
-+-	    current_lines = myLines;
-+-	    current_cols = myCols;
-++	    increase_size(myLines = ToLines, myCols, was_stolen EXTRA_ARGS);
-++	    CurLines = myLines;
-++	    CurCols = myCols;
-+ 	}
-+ 
-+ 	if (ToCols > screen_columns) {
-+-	    increase_size(myLines, myCols = ToCols, was_stolen);
-+-	    current_lines = myLines;
-+-	    current_cols = myCols;
-++	    increase_size(myLines, myCols = ToCols, was_stolen EXTRA_ARGS);
-++	    CurLines = myLines;
-++	    CurCols = myCols;
-+ 	}
-+ 
-+ 	if (ToLines < myLines ||
-+ 	    ToCols < myCols) {
-+-	    decrease_size(ToLines, ToCols, was_stolen);
-++	    decrease_size(ToLines, ToCols, was_stolen EXTRA_ARGS);
-+ 	}
-+ 
-+ 	screen_lines = lines = ToLines;
-+@@ -279,10 +299,11 @@
-+ 	    FreeAndNull(SP->newhash);
-+ 	}
-+ #ifdef TRACE
-+-	if (_nc_tracing & TRACE_UPDATE) {
-+-	    LINES = ToLines - was_stolen;
-+-	    COLS = ToCols;
-++	if (USE_TRACEF(TRACE_UPDATE)) {
-++	    SET_LINES(ToLines - was_stolen);
-++	    SET_COLS(ToCols);
-+ 	    show_window_sizes("after");
-++	    _nc_unlock_global(tracef);
-+ 	}
-+ #endif
-+     }
-+@@ -291,8 +312,8 @@
-+      * Always update LINES, to allow for call from lib_doupdate.c which
-+      * needs to have the count adjusted by the stolen (ripped off) lines.
-+      */
-+-    LINES = ToLines - was_stolen;
-+-    COLS = ToCols;
-++    SET_LINES(ToLines - was_stolen);
-++    SET_COLS(ToCols);
-+ 
-+     returnCode(result);
-+ }
-+@@ -308,22 +329,25 @@
-+ NCURSES_EXPORT(int)
-+ resizeterm(int ToLines, int ToCols)
-+ {
-+-    int result = OK;
-+-
-+-    SP->_sig_winch = FALSE;
-++    int result = ERR;
-+ 
-+     T((T_CALLED("resizeterm(%d,%d) old(%d,%d)"),
-+        ToLines, ToCols,
-+        screen_lines, screen_columns));
-+ 
-+-    if (is_term_resized(ToLines, ToCols)) {
-++    if (SP != 0) {
-++	result = OK;
-++	SP->_sig_winch = FALSE;
-++
-++	if (is_term_resized(ToLines, ToCols)) {
-+ 
-+ #if USE_SIGWINCH
-+-	ungetch(KEY_RESIZE);	/* so application can know this */
-+-	clearok(curscr, TRUE);	/* screen contents are unknown */
-++	    ungetch(KEY_RESIZE);	/* so application can know this */
-++	    clearok(curscr, TRUE);	/* screen contents are unknown */
-+ #endif
-+ 
-+-	result = resize_term(ToLines, ToCols);
-++	    result = resize_term(ToLines, ToCols);
-++	}
-+     }
-+ 
-+     returnCode(result);
-+Index: ncurses/base/safe_sprintf.c
-+Prereq:  1.18 
-+--- ncurses-5.6/ncurses/base/safe_sprintf.c	2003-08-09 21:52:04.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/safe_sprintf.c	2007-04-21 22:28:06.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2001,2003 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2003,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -33,7 +33,7 @@
-+ #include <curses.priv.h>
-+ #include <ctype.h>
-+ 
-+-MODULE_ID("$Id: safe_sprintf.c,v 1.18 2003/08/09 21:52:04 tom Exp $")
-++MODULE_ID("$Id: safe_sprintf.c,v 1.20 2007/04/21 22:28:06 tom Exp $")
-+ 
-+ #if USE_SAFE_SPRINTF
-+ 
-+@@ -207,56 +207,58 @@
-+ }
-+ #endif
-+ 
-++#define my_buffer _nc_globals.safeprint_buf
-++#define my_length _nc_globals.safeprint_used
-++
-+ /*
-+  * Wrapper for vsprintf that allocates a buffer big enough to hold the result.
-+  */
-+ NCURSES_EXPORT(char *)
-+ _nc_printf_string(const char *fmt, va_list ap)
-+ {
-+-    static char *buf;
-+-    static size_t used;
-+     char *result = 0;
-+ 
-+     if (fmt != 0) {
-+ #if USE_SAFE_SPRINTF
-+ 	int len = _nc_printf_length(fmt, ap);
-+ 
-+-	if ((int) used < len + 1) {
-+-	    used = 2 * (len + 1);
-+-	    buf = typeRealloc(char, used, buf);
-++	if ((int) my_length < len + 1) {
-++	    my_length = 2 * (len + 1);
-++	    my_buffer = typeRealloc(char, my_length, my_buffer);
-+ 	}
-+-	if (buf != 0) {
-+-	    *buf = '\0';
-++	if (my_buffer != 0) {
-++	    *my_buffer = '\0';
-+ 	    if (len >= 0) {
-+-		vsprintf(buf, fmt, ap);
-++		vsprintf(my_buffer, fmt, ap);
-+ 	    }
-+-	    result = buf;
-++	    result = my_buffer;
-+ 	}
-+ #else
-+-	static int rows, cols;
-++#define MyCols _nc_globals.safeprint_cols
-++#define MyRows _nc_globals.safeprint_rows
-+ 
-+-	if (screen_lines > rows || screen_columns > cols) {
-+-	    if (screen_lines > rows)
-+-		rows = screen_lines;
-+-	    if (screen_columns > cols)
-+-		cols = screen_columns;
-+-	    used = (rows * (cols + 1)) + 1;
-+-	    buf = typeRealloc(char, used, buf);
-++	if (screen_lines > MyRows || screen_columns > MyCols) {
-++	    if (screen_lines > MyRows)
-++		MyRows = screen_lines;
-++	    if (screen_columns > MyCols)
-++		MyCols = screen_columns;
-++	    my_length = (MyRows * (MyCols + 1)) + 1;
-++	    my_buffer = typeRealloc(char, my_length, my_buffer);
-+ 	}
-+ 
-+-	if (buf != 0) {
-++	if (my_buffer != 0) {
-+ # if HAVE_VSNPRINTF
-+-	    vsnprintf(buf, used, fmt, ap);	/* GNU extension */
-++	    vsnprintf(my_buffer, my_length, fmt, ap);	/* GNU extension */
-+ # else
-+-	    vsprintf(buf, fmt, ap);	/* ANSI */
-++	    vsprintf(my_buffer, fmt, ap);	/* ANSI */
-+ # endif
-+-	    result = buf;
-++	    result = my_buffer;
-+ 	}
-+ #endif
-+-    } else if (buf != 0) {	/* see _nc_freeall() */
-+-	free(buf);
-+-	buf = 0;
-+-	used = 0;
-++    } else if (my_buffer != 0) {	/* see _nc_freeall() */
-++	free(my_buffer);
-++	my_buffer = 0;
-++	my_length = 0;
-+     }
-+     return result;
-+ }
-+Index: ncurses/base/tries.c
-+Prereq:  1.22 
-+--- ncurses-5.6/ncurses/base/tries.c	2005-11-26 20:09:18.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/tries.c	2007-09-29 20:37:13.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -39,16 +39,16 @@
-+ 
-+ #include <curses.priv.h>
-+ 
-+-MODULE_ID("$Id: tries.c,v 1.22 2005/11/26 20:09:18 tom Exp $")
-++MODULE_ID("$Id: tries.c,v 1.25 2007/09/29 20:37:13 tom Exp $")
-+ 
-+ /*
-+  * Expand a keycode into the string that it corresponds to, returning null if
-+  * no match was found, otherwise allocating a string of the result.
-+  */
-+ NCURSES_EXPORT(char *)
-+-_nc_expand_try(struct tries *tree, unsigned code, int *count, size_t len)
-++_nc_expand_try(TRIES * tree, unsigned code, int *count, size_t len)
-+ {
-+-    struct tries *ptr = tree;
-++    TRIES *ptr = tree;
-+     char *result = 0;
-+ 
-+     if (code != 0) {
-+@@ -68,11 +68,13 @@
-+ 	}
-+     }
-+     if (result != 0) {
-+-	if ((result[len] = ptr->ch) == 0)
-++	if (ptr != 0 && (result[len] = ptr->ch) == 0)
-+ 	    *((unsigned char *) (result + len)) = 128;
-+ #ifdef TRACE
-+-	if (len == 0 && _nc_tracing != 0)
-++	if (len == 0 && USE_TRACEF(TRACE_MAXIMUM)) {
-+ 	    _tracef("expand_key %s %s", _tracechar(code), _nc_visbuf(result));
-++	    _nc_unlock_global(tracef);
-++	}
-+ #endif
-+     }
-+     return result;
-+@@ -83,7 +85,7 @@
-+  * true if the code was found/removed.
-+  */
-+ NCURSES_EXPORT(int)
-+-_nc_remove_key(struct tries **tree, unsigned code)
-++_nc_remove_key(TRIES ** tree, unsigned code)
-+ {
-+     T((T_CALLED("_nc_remove_key(%p,%d)"), tree, code));
-+ 
-+@@ -99,7 +101,7 @@
-+ 		/* don't cut the whole sub-tree */
-+ 		(*tree)->value = 0;
-+ 	    } else {
-+-		struct tries *to_free = *tree;
-++		TRIES *to_free = *tree;
-+ 		*tree = (*tree)->sibling;
-+ 		free(to_free);
-+ 	    }
-+@@ -115,7 +117,7 @@
-+  * true if the string was found/removed.
-+  */
-+ NCURSES_EXPORT(int)
-+-_nc_remove_string(struct tries **tree, const char *string)
-++_nc_remove_string(TRIES ** tree, const char *string)
-+ {
-+     T((T_CALLED("_nc_remove_string(%p,%s)"), tree, _nc_visbuf(string)));
-+ 
-+@@ -127,7 +129,7 @@
-+ 	    if (string[1] != 0)
-+ 		returnCode(_nc_remove_string(&(*tree)->child, string + 1));
-+ 	    if ((*tree)->child == 0) {
-+-		struct tries *to_free = *tree;
-++		TRIES *to_free = *tree;
-+ 		*tree = (*tree)->sibling;
-+ 		free(to_free);
-+ 		returnCode(TRUE);
-+Index: ncurses/base/use_window.c
-+--- /dev/null	2007-12-08 19:14:25.328509000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/use_window.c	2007-10-20 19:57:55.000000000 +0000
-+@@ -0,0 +1,80 @@
-++/****************************************************************************
-++ * Copyright (c) 2007 Free Software Foundation, Inc.                        *
-++ *                                                                          *
-++ * Permission is hereby granted, free of charge, to any person obtaining a  *
-++ * copy of this software and associated documentation files (the            *
-++ * "Software"), to deal in the Software without restriction, including      *
-++ * without limitation the rights to use, copy, modify, merge, publish,      *
-++ * distribute, distribute with modifications, sublicense, and/or sell       *
-++ * copies of the Software, and to permit persons to whom the Software is    *
-++ * furnished to do so, subject to the following conditions:                 *
-++ *                                                                          *
-++ * The above copyright notice and this permission notice shall be included  *
-++ * in all copies or substantial portions of the Software.                   *
-++ *                                                                          *
-++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-++ *                                                                          *
-++ * Except as contained in this notice, the name(s) of the above copyright   *
-++ * holders shall not be used in advertising or otherwise to promote the     *
-++ * sale, use or other dealings in this Software without prior written       *
-++ * authorization.                                                           *
-++ ****************************************************************************/
-++
-++/****************************************************************************
-++ *     Author: Thomas E. Dickey                        2007                 *
-++ ****************************************************************************/
-++
-++#include <curses.priv.h>
-++
-++MODULE_ID("$Id: use_window.c,v 1.2 2007/10/20 19:57:55 tom Exp $")
-++
-++#ifdef USE_PTHREADS
-++NCURSES_EXPORT(void)
-++_nc_lock_window(WINDOW *win)
-++{
-++    WINDOWLIST *p;
-++
-++    _nc_lock_global(windowlist);
-++    for (p = _nc_windows; p != 0; p = p->next) {
-++	if (&(p->win) == win) {
-++	    pthread_mutex_lock(&(p->mutex_use_window));
-++	    break;
-++	}
-++    }
-++    _nc_unlock_global(windowlist);
-++}
-++
-++NCURSES_EXPORT(void)
-++_nc_unlock_window(WINDOW *win)
-++{
-++    WINDOWLIST *p;
-++
-++    _nc_lock_global(windowlist);
-++    for (p = _nc_windows; p != 0; p = p->next) {
-++	if (&(p->win) == win) {
-++	    pthread_mutex_unlock(&(p->mutex_use_window));
-++	    break;
-++	}
-++    }
-++    _nc_unlock_global(windowlist);
-++}
-++#endif
-++
-++NCURSES_EXPORT(int)
-++use_window(WINDOW *win, NCURSES_CALLBACK func, void *data)
-++{
-++    int code = OK;
-++
-++    T((T_CALLED("use_window(%p,%p,%p)"), win, func, data));
-++    _nc_lock_window(win);
-++    code = func(win, data);
-++    _nc_unlock_window(win);
-++
-++    returnCode(code);
-++}
-+Index: ncurses/base/wresize.c
-+Prereq:  1.24 
-+--- ncurses-5.6/ncurses/base/wresize.c	2006-10-14 20:43:31.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/base/wresize.c	2007-09-29 20:37:13.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -32,13 +32,13 @@
-+ 
-+ #include <curses.priv.h>
-+ 
-+-MODULE_ID("$Id: wresize.c,v 1.24 2006/10/14 20:43:31 tom Exp $")
-++MODULE_ID("$Id: wresize.c,v 1.26 2007/09/29 20:37:13 tom Exp $")
-+ 
-+ static int
-+ cleanup_lines(struct ldat *data, int length)
-+ {
-+     while (--length >= 0)
-+-	free(data->text);
-++	free(data[length].text);
-+     free(data);
-+     return ERR;
-+ }
-+@@ -96,8 +96,10 @@
-+ 			  (long) win->_begy, (long) win->_begx,
-+ 			  (long) win->_maxy, (long) win->_maxx,
-+ 			  (long) win->_regtop, (long) win->_regbottom));
-+-	if (_nc_tracing & TRACE_UPDATE)
-++	if (USE_TRACEF(TRACE_UPDATE)) {
-+ 	    _tracedump("...before", win);
-++	    _nc_unlock_global(tracef);
-++	}
-+     }
-+ #endif
-+ 
-+@@ -232,8 +234,10 @@
-+ 		      (long) win->_begy, (long) win->_begx,
-+ 		      (long) win->_maxy, (long) win->_maxx,
-+ 		      (long) win->_regtop, (long) win->_regbottom));
-+-    if (_nc_tracing & TRACE_UPDATE)
-++    if (USE_TRACEF(TRACE_UPDATE)) {
-+ 	_tracedump("...after:", win);
-++	_nc_unlock_global(tracef);
-++    }
-+ #endif
-+     returnCode(OK);
-+ }
-+Index: ncurses/curses.priv.h
-+Prereq:  1.314 
-+--- ncurses-5.6/ncurses/curses.priv.h	2006-12-10 00:55:14.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/curses.priv.h	2007-11-25 00:57:29.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -34,7 +34,7 @@
-+ 
-+ 
-+ /*
-+- * $Id: curses.priv.h,v 1.314 2006/12/10 00:55:14 tom Exp $
-++ * $Id: curses.priv.h,v 1.351 2007/11/25 00:57:29 tom Exp $
-+  *
-+  *	curses.priv.h
-+  *
-+@@ -202,16 +202,20 @@
-+  * delays and expansion in raw mode.
-+  */
-+ 
-+-struct tries {
-+-	struct tries    *child;     /* ptr to child.  NULL if none          */
-+-	struct tries    *sibling;   /* ptr to sibling.  NULL if none        */
-++#define TRIES struct tries
-++typedef TRIES {
-++	TRIES    *child;            /* ptr to child.  NULL if none          */
-++	TRIES    *sibling;          /* ptr to sibling.  NULL if none        */
-+ 	unsigned char    ch;        /* character at this node               */
-+ 	unsigned short   value;     /* code of string so far.  0 if none.   */
-+-};
-++#undef TRIES
-++} TRIES;
-+ 
-+ /*
-+  * Common/troublesome character definitions
-+  */
-++#define StringOf(ch) {ch, 0}
-++
-+ #define L_BRACE '{'
-+ #define R_BRACE '}'
-+ #define S_QUOTE '\''
-+@@ -248,6 +252,10 @@
-+ #define wbkgrnd	    wbkgd
-+ #endif
-+ 
-++#undef NCURSES_OPAQUE
-++#define NCURSES_INTERNALS 1
-++#define NCURSES_OPAQUE 0
-++
-+ #include <curses.h>	/* we'll use -Ipath directive to get the right one! */
-+ #include <term.h>
-+ #include <term_entry.h>
-+@@ -284,6 +292,38 @@
-+ #define GET_SCREEN_PAIR(s)	GetPair(SCREEN_ATTRS(s))
-+ #define SET_SCREEN_PAIR(s,p)	SetPair(SCREEN_ATTRS(s), p)
-+ 
-++#if USE_REENTRANT
-++#define SET_LINES(value) SP->_LINES = value
-++#define SET_COLS(value)  SP->_COLS = value
-++#else
-++#define SET_LINES(value) LINES = value
-++#define SET_COLS(value)  COLS = value
-++#endif
-++
-++#ifdef USE_PTHREADS
-++#if USE_REENTRANT
-++#include <pthread.h>
-++#define _nc_lock_global(name)	pthread_mutex_lock(&_nc_globals.mutex_##name)
-++#define _nc_unlock_global(name)	pthread_mutex_unlock(&_nc_globals.mutex_##name)
-++
-++extern NCURSES_EXPORT(void) _nc_lock_window(WINDOW *);
-++extern NCURSES_EXPORT(void) _nc_unlock_window(WINDOW *);
-++
-++#else
-++#error POSIX threads requires --enable-reentrant option
-++#endif
-++#else
-++#define _nc_lock_global(name)	/* nothing */
-++#define _nc_unlock_global(name)	/* nothing */
-++
-++#define _nc_lock_window(name)	TRUE
-++#define _nc_unlock_window(name)	/* nothing */
-++
-++#endif
-++
-++#define _nc_lock_screen(name)	/* nothing */
-++#define _nc_unlock_screen(name)	/* nothing */
-++
-+ /*
-+  * Definitions for color pairs
-+  */
-+@@ -366,7 +406,6 @@
-+ typedef	struct {
-+ 	int	line;		/* lines to take, < 0 => from bottom*/
-+ 	int	(*hook)(WINDOW *, int); /* callback for user	    */
-+-	WINDOW *w;		/* maybe we need this for cleanup   */
-+ } ripoff_t;
-+ 
-+ #if USE_GPM_SUPPORT
-+@@ -393,6 +432,186 @@
-+ #endif /* HAVE_LIBDL */
-+ #endif /* USE_GPM_SUPPORT */
-+ 
-++typedef struct {
-++    long sequence;
-++    bool last_used;
-++    char *fix_sgr0;		/* this holds the filtered sgr0 string */
-++    char *last_bufp;		/* help with fix_sgr0 leak */
-++    TERMINAL *last_term;
-++} TGETENT_CACHE;
-++
-++#define TGETENT_MAX 4
-++
-++/*
-++ * State of tparm().
-++ */
-++#define STACKSIZE 20
-++
-++typedef struct {
-++	union {
-++		int	num;
-++		char	*str;
-++	} data;
-++	bool num_type;
-++} STACK_FRAME;
-++
-++#define NUM_VARS 26
-++
-++typedef struct {
-++#ifdef TRACE
-++	const char	*tname;
-++#endif
-++	const char	*tparam_base;
-++
-++	STACK_FRAME	stack[STACKSIZE];
-++	int		stack_ptr;
-++
-++	char		*out_buff;
-++	size_t		out_size;
-++	size_t		out_used;
-++
-++	char		*fmt_buff;
-++	size_t		fmt_size;
-++
-++	int		dynamic_var[NUM_VARS];
-++	int		static_vars[NUM_VARS];
-++} TPARM_STATE;
-++
-++typedef struct {
-++    char *text;
-++    size_t size;
-++} TRACEBUF;
-++
-++/*
-++ * The filesystem database normally uses a single-letter for the lower level
-++ * of directories.  Use a hexadecimal code for filesystems which do not
-++ * preserve mixed-case names.
-++ */
-++#if MIXEDCASE_FILENAMES
-++#define LEAF_FMT "%c"
-++#else
-++#define LEAF_FMT "%02x"
-++#endif
-++
-++/*
-++ * TRACEMSE_FMT is no longer than 80 columns, there are 5 numbers that
-++ * could at most have 10 digits, and the mask contains no more than 32 bits
-++ * with each bit representing less than 15 characters.  Usually the whole
-++ * string is less than 80 columns, but this buffer size is an absolute
-++ * limit.
-++ */
-++#define TRACEMSE_MAX	(80 + (5 * 10) + (32 * 15))
-++#define TRACEMSE_FMT	"id %2d  at (%2d, %2d, %2d) state %4lx = {" /* } */
-++
-++/*
-++ * Global data which is not specific to a screen.
-++ */
-++typedef struct {
-++	SIG_ATOMIC_T	have_sigwinch;
-++	SIG_ATOMIC_T	cleanup_nested;
-++
-++	bool		init_signals;
-++	bool		init_screen;
-++
-++	const char	*comp_sourcename;
-++	char		*comp_termtype;
-++
-++	bool		have_tic_directory;
-++	bool		keep_tic_directory;
-++	const char	*tic_directory;
-++
-++	char		*dbi_list;
-++	int		dbi_size;
-++
-++	char		*first_name;
-++	char		**keyname_table;
-++
-++	char		*safeprint_buf;
-++	size_t		safeprint_used;
-++
-++	TGETENT_CACHE	tgetent_cache[TGETENT_MAX];
-++	int		tgetent_index;
-++	long		tgetent_sequence;
-++
-++#if USE_HOME_TERMINFO
-++	char		*home_terminfo;
-++#endif
-++
-++#if !USE_SAFE_SPRINTF
-++	int		safeprint_cols;
-++	int		safeprint_rows;
-++#endif
-++
-++#ifdef TRACE
-++	bool		init_trace;
-++	char		trace_fname[PATH_MAX];
-++	int		trace_level;
-++	FILE		*trace_fp;
-++
-++	char		*tracearg_buf;
-++	size_t		tracearg_used;
-++
-++	TRACEBUF	*tracebuf_ptr;
-++	size_t		tracebuf_used;
-++
-++	char		tracechr_buf[40];
-++
-++	char		*tracedmp_buf;
-++	size_t		tracedmp_used;
-++
-++	char		tracemse_buf[TRACEMSE_MAX];
-++
-++	unsigned char	*tracetry_buf;
-++	size_t		tracetry_used;
-++
-++#ifndef USE_TERMLIB
-++	char		traceatr_color_buf[2][80];
-++	int		traceatr_color_sel;
-++	int		traceatr_color_last;
-++#endif	/* USE_TERMLIB */
-++
-++#endif	/* TRACE */
-++
-++#ifdef USE_PTHREADS
-++       pthread_mutex_t	mutex_set_SP;
-++       pthread_mutex_t	mutex_use_screen;
-++       pthread_mutex_t	mutex_use_window;
-++       pthread_mutex_t	mutex_windowlist;
-++       pthread_mutex_t	mutex_tst_tracef;
-++       pthread_mutex_t	mutex_tracef;
-++       int		nested_tracef;
-++#endif
-++} NCURSES_GLOBALS;
-++
-++extern NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals;
-++
-++#define N_RIPS 5
-++
-++/*
-++ * Global data which is swept up into a SCREEN when one is created.
-++ * It may be modified before the next SCREEN is created.
-++ */
-++typedef struct {
-++	bool		use_env;
-++	bool		filter_mode;
-++	attr_t		previous_attr;
-++	ripoff_t	rippedoff[N_RIPS];
-++	ripoff_t	*rsp;
-++	TPARM_STATE	tparm_state;
-++	TTY		*saved_tty;	/* savetty/resetty information	    */
-++#if BROKEN_LINKER || USE_REENTRANT
-++	chtype		*real_acs_map;
-++	int		_LINES;
-++	int		_COLS;
-++#ifdef TRACE
-++	long		_outchars;
-++	const char	*_tputs_trace;
-++#endif
-++#endif
-++} NCURSES_PRESCREEN;
-++
-++extern NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen;
-++
-+ /*
-+  * The SCREEN structure.
-+  */
-+@@ -405,20 +624,19 @@
-+ 	bool		_buffered;	/* setvbuf uses _setbuf data	    */
-+ 	int		_checkfd;	/* filedesc for typeahead check	    */
-+ 	TERMINAL	*_term;		/* terminal type information	    */
-+-	short		_lines;		/* screen lines			    */
-+-	short		_columns;	/* screen columns		    */
-++	TTY		_saved_tty;	/* savetty/resetty information	    */
-++	NCURSES_SIZE_T	_lines;		/* screen lines			    */
-++	NCURSES_SIZE_T	_columns;	/* screen columns		    */
-+ 
-+-	short		_lines_avail;	/* lines available for stdscr	    */
-+-	short		_topstolen;	/* lines stolen from top	    */
-+-	ripoff_t	_rippedoff[5];	/* list of lines stolen		    */
-+-	int		_rip_count;	/* ...and total lines stolen	    */
-++	NCURSES_SIZE_T	_lines_avail;	/* lines available for stdscr	    */
-++	NCURSES_SIZE_T	_topstolen;	/* lines stolen from top	    */
-+ 
-+ 	WINDOW		*_curscr;	/* current screen		    */
-+ 	WINDOW		*_newscr;	/* virtual screen to be updated to  */
-+ 	WINDOW		*_stdscr;	/* screen's full-window context	    */
-+ 
-+-	struct tries	*_keytry;	/* "Try" for use with keypad mode   */
-+-	struct tries	*_key_ok;	/* Disabled keys via keyok(,FALSE)  */
-++	TRIES		*_keytry;	/* "Try" for use with keypad mode   */
-++	TRIES		*_key_ok;	/* Disabled keys via keyok(,FALSE)  */
-+ 	bool		_tried;		/* keypad mode was initialized	    */
-+ 	bool		_keypad_on;	/* keypad mode is currently on	    */
-+ 
-+@@ -597,12 +815,25 @@
-+ 	unsigned long	*oldhash, *newhash;
-+ 	HASHMAP		*hashtab;
-+ 	int		hashtab_len;
-++	int		*_oldnum_list;
-++	int		_oldnum_size;
-+ 
-+ 	bool		_cleanup;	/* cleanup after int/quit signal */
-+ 	int		(*_outch)(int); /* output handler if not putc */
-+ 
-+ 	int		_legacy_coding;	/* see use_legacy_coding() */
-+ 
-++#if USE_REENTRANT
-++	char		_ttytype[NAMESIZE];
-++	int		_ESCDELAY;
-++	int		_TABSIZE;
-++	int		_LINES;
-++	int		_COLS;
-++#ifdef TRACE
-++	int		_outchars;
-++	const char	*_tputs_trace;
-++#endif
-++#endif
-+ 	/*
-+ 	 * ncurses/ncursesw are the same up to this point.
-+ 	 */
-+@@ -615,6 +846,7 @@
-+ };
-+ 
-+ extern NCURSES_EXPORT_VAR(SCREEN *) _nc_screen_chain;
-++extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch;
-+ 
-+ 	WINDOWLIST {
-+ 	WINDOW	win;	/* first, so WINDOW_EXT() works */
-+@@ -625,6 +857,9 @@
-+ 	int addch_x;		/* x-position for addch_work[] */
-+ 	int addch_y;		/* y-position for addch_work[] */
-+ #endif
-++#ifdef USE_PTHREADS
-++	pthread_mutex_t	mutex_use_window;
-++#endif
-+ };
-+ 
-+ #define WINDOW_EXT(win,field) (((WINDOWLIST *)(win))->field)
-+@@ -691,11 +926,17 @@
-+ #endif
-+ 
-+ #ifdef TRACE
-+-#define TRACE_OUTCHARS(n) _nc_outchars += (n);
-++#if USE_REENTRANT
-++#define COUNT_OUTCHARS(n) _nc_count_outchars(n);
-++#else
-++#define COUNT_OUTCHARS(n) _nc_outchars += (n);
-++#endif
-+ #else
-+-#define TRACE_OUTCHARS(n) /* nothing */
-++#define COUNT_OUTCHARS(n) /* nothing */
-+ #endif
-+ 
-++#define RESET_OUTCHARS() COUNT_OUTCHARS(-_nc_outchars)
-++
-+ #define UChar(c)	((unsigned char)(c))
-+ #define ChCharOf(c)	((c) & (chtype)A_CHARTEXT)
-+ #define ChAttrOf(c)	((c) & (chtype)A_ATTRIBUTES)
-+@@ -705,7 +946,7 @@
-+ #endif
-+ 
-+ #if USE_WIDEC_SUPPORT /* { */
-+-#define isEILSEQ(status) ((status == (size_t)-1) && (errno == EILSEQ))
-++#define isEILSEQ(status) (((size_t)status == (size_t)-1) && (errno == EILSEQ))
-+ 
-+ #define init_mb(state)	memset(&state, 0, sizeof(state))
-+ 
-+@@ -718,12 +959,26 @@
-+ #define NulChar		0,0,0,0	/* FIXME: see CCHARW_MAX */
-+ #define CharOf(c)	((c).chars[0])
-+ #define AttrOf(c)	((c).attr)
-+-#define AddAttr(c,a)	AttrOf(c) |= ((a) & A_ATTRIBUTES)
-++
-++#define AddAttr(c,a)	AttrOf(c) |=  ((a) & A_ATTRIBUTES)
-+ #define RemAttr(c,a)	AttrOf(c) &= ~((a) & A_ATTRIBUTES)
-+-#define SetAttr(c,a)	AttrOf(c) = ((a) & A_ATTRIBUTES)
-++#define SetAttr(c,a)	AttrOf(c) =   ((a) & A_ATTRIBUTES) | WidecExt(c)
-++
-+ #define NewChar2(c,a)	{ a, { c, NulChar } NulColor }
-+ #define NewChar(ch)	NewChar2(ChCharOf(ch), ChAttrOf(ch))
-++
-++#if CCHARW_MAX == 5
-++#define CharEq(a,b)	(((a).attr == (b).attr) \
-++		       && (a).chars[0] == (b).chars[0] \
-++		       && (a).chars[1] == (b).chars[1] \
-++		       && (a).chars[2] == (b).chars[2] \
-++		       && (a).chars[3] == (b).chars[3] \
-++		       && (a).chars[4] == (b).chars[4] \
-++			if_EXT_COLORS(&& (a).ext_color == (b).ext_color))
-++#else
-+ #define CharEq(a,b)	(!memcmp(&(a), &(b), sizeof(a)))
-++#endif
-++
-+ #define SetChar(ch,c,a) do {							    \
-+ 			    NCURSES_CH_T *_cp = &ch;				    \
-+ 			    memset(_cp, 0, sizeof(ch));				    \
-+@@ -741,7 +996,7 @@
-+ #define PUTC(ch,b)	do { if(!isWidecExt(ch)) {				    \
-+ 			if (Charable(ch)) {					    \
-+ 			    fputc(CharOf(ch), b);				    \
-+-			    TRACE_OUTCHARS(1);					    \
-++			    COUNT_OUTCHARS(1);					    \
-+ 			} else {						    \
-+ 			    PUTC_INIT;						    \
-+ 			    for (PUTC_i = 0; PUTC_i < CCHARW_MAX; ++PUTC_i) {	    \
-+@@ -757,11 +1012,11 @@
-+ 				}						    \
-+ 				fwrite(PUTC_buf, (unsigned) PUTC_n, 1, b);	    \
-+ 			    }							    \
-+-			    TRACE_OUTCHARS(PUTC_i);				    \
-++			    COUNT_OUTCHARS(PUTC_i);				    \
-+ 			} } } while (0)
-+ 
-+-#define BLANK		{ WA_NORMAL, {' '} NulColor }
-+-#define ZEROS		{ WA_NORMAL, {'\0'} NulColor }
-++#define BLANK		NewChar2(' ', WA_NORMAL)
-++#define ZEROS		NewChar2('\0', WA_NORMAL)
-+ #define ISBLANK(ch)	((ch).chars[0] == L' ' && (ch).chars[1] == L'\0')
-+ 
-+ 	/*
-+@@ -887,6 +1142,12 @@
-+ 
-+ #ifdef TRACE
-+ 
-++#if USE_REENTRANT
-++#define TPUTS_TRACE(s)	_nc_set_tputs_trace(s);
-++#else
-++#define TPUTS_TRACE(s)	_nc_tputs_trace = s;
-++#endif
-++
-+ #define START_TRACE() \
-+ 	if ((_nc_tracing & TRACE_MAXIMUM) == 0) { \
-+ 	    int t = _nc_getenv_num("NCURSES_TRACE"); \
-+@@ -894,9 +1155,21 @@
-+ 		trace((unsigned) t); \
-+ 	}
-+ 
-+-#define TR(n, a)	if (_nc_tracing & (n)) _tracef a
-++/*
-++ * Many of the _tracef() calls use static buffers; lock the trace state before
-++ * trying to fill them.
-++ */
-++#if USE_REENTRANT
-++#define USE_TRACEF(mask) _nc_use_tracef(mask)
-++extern NCURSES_EXPORT(int)	_nc_use_tracef (unsigned);
-++extern NCURSES_EXPORT(void)	_nc_locked_tracef (const char *, ...) GCC_PRINTFLIKE(1,2);
-++#else
-++#define USE_TRACEF(mask) (_nc_tracing & (mask))
-++#define _nc_locked_tracef _tracef
-++#endif
-++
-++#define TR(n, a)	if (USE_TRACEF(n)) _nc_locked_tracef a
-+ #define T(a)		TR(TRACE_CALLS, a)
-+-#define TPUTS_TRACE(s)	_nc_tputs_trace = s;
-+ #define TRACE_RETURN(value,type) return _nc_retrace_##type(value)
-+ 
-+ #define returnAttr(code)	TRACE_RETURN(code,attr_t)
-+@@ -927,8 +1200,19 @@
-+ extern NCURSES_EXPORT(unsigned)         _nc_retrace_unsigned (unsigned);
-+ extern NCURSES_EXPORT(void *)           _nc_retrace_void_ptr (void *);
-+ extern NCURSES_EXPORT(void)             _nc_fifo_dump (void);
-++
-++#if USE_REENTRANT
-++NCURSES_WRAPPED_VAR(long, _nc_outchars);
-++NCURSES_WRAPPED_VAR(const char *, _nc_tputs_trace);
-++#define _nc_outchars       NCURSES_PUBLIC_VAR(_nc_outchars())
-++#define _nc_tputs_trace    NCURSES_PUBLIC_VAR(_nc_tputs_trace())
-++extern NCURSES_EXPORT(void)		_nc_set_tputs_trace (const char *);
-++extern NCURSES_EXPORT(void)		_nc_count_outchars (long);
-++#else
-+ extern NCURSES_EXPORT_VAR(const char *) _nc_tputs_trace;
-+ extern NCURSES_EXPORT_VAR(long)         _nc_outchars;
-++#endif
-++
-+ extern NCURSES_EXPORT_VAR(unsigned)     _nc_tracing;
-+ 
-+ #if USE_WIDEC_SUPPORT
-+@@ -1083,6 +1367,21 @@
-+ extern NCURSES_EXPORT(wint_t) _nc_to_widechar(int);
-+ #endif
-+ 
-++/* comp_captab.c */
-++typedef struct {
-++	short	nte_name;	/* offset of name to hash on */
-++	int	nte_type;	/* BOOLEAN, NUMBER or STRING */
-++	short	nte_index;	/* index of associated variable in its array */
-++	short	nte_link;	/* index in table of next hash, or -1 */
-++} name_table_data;
-++
-++typedef struct
-++{
-++	short	from;
-++	short	to;
-++	short	source;
-++} alias_table_data;
-++
-+ /* doupdate.c */
-+ #if USE_XMC_SUPPORT
-+ extern NCURSES_EXPORT(void) _nc_do_xmc_glitch (attr_t);
-+@@ -1141,6 +1440,7 @@
-+ extern NCURSES_EXPORT(int) _nc_unicode_locale(void);
-+ extern NCURSES_EXPORT(int) _nc_locale_breaks_acs(void);
-+ extern NCURSES_EXPORT(int) _nc_setupterm(NCURSES_CONST char *, int, int *, bool);
-++extern NCURSES_EXPORT(void) _nc_get_screensize(int *, int *);
-+ 
-+ /* lib_tstp.c */
-+ #if USE_SIGWINCH
-+@@ -1177,10 +1477,10 @@
-+ extern NCURSES_EXPORT(char *) _nc_printf_string (const char *, va_list);
-+ 
-+ /* tries.c */
-+-extern NCURSES_EXPORT(void) _nc_add_to_try (struct tries **, const char *, unsigned);
-+-extern NCURSES_EXPORT(char *) _nc_expand_try (struct tries *, unsigned, int *, size_t);
-+-extern NCURSES_EXPORT(int) _nc_remove_key (struct tries **, unsigned);
-+-extern NCURSES_EXPORT(int) _nc_remove_string (struct tries **, const char *);
-++extern NCURSES_EXPORT(int) _nc_add_to_try (TRIES **, const char *, unsigned);
-++extern NCURSES_EXPORT(char *) _nc_expand_try (TRIES *, unsigned, int *, size_t);
-++extern NCURSES_EXPORT(int) _nc_remove_key (TRIES **, unsigned);
-++extern NCURSES_EXPORT(int) _nc_remove_string (TRIES **, const char *);
-+ 
-+ /* elsewhere ... */
-+ extern NCURSES_EXPORT(ENTRY *) _nc_delink_entry(ENTRY *, TERMTYPE *);
-+@@ -1210,13 +1510,16 @@
-+ extern NCURSES_EXPORT(void) _nc_set_buffer (FILE *, bool);
-+ extern NCURSES_EXPORT(void) _nc_signal_handler (bool);
-+ extern NCURSES_EXPORT(void) _nc_synchook (WINDOW *);
-+-extern NCURSES_EXPORT(void) _nc_trace_tries (struct tries *);
-++extern NCURSES_EXPORT(void) _nc_trace_tries (TRIES *);
-+ 
-+ #if NO_LEAKS
-+ extern NCURSES_EXPORT(void) _nc_alloc_entry_leaks(void);
-+ extern NCURSES_EXPORT(void) _nc_captoinfo_leaks(void);
-++extern NCURSES_EXPORT(void) _nc_codes_leaks(void);
-++extern NCURSES_EXPORT(void) _nc_comp_captab_leaks(void);
-+ extern NCURSES_EXPORT(void) _nc_comp_scan_leaks(void);
-+ extern NCURSES_EXPORT(void) _nc_keyname_leaks(void);
-++extern NCURSES_EXPORT(void) _nc_names_leaks(void);
-+ extern NCURSES_EXPORT(void) _nc_tgetent_leaks(void);
-+ #endif
-+ 
-+@@ -1227,11 +1530,7 @@
-+ #endif
-+ 
-+ #if USE_WIDEC_SUPPORT && !defined(USE_TERMLIB)
-+-#ifdef linux
-+ extern NCURSES_EXPORT(size_t) _nc_wcrtomb (char *, wchar_t, mbstate_t *);
-+-#else
-+-#define _nc_wcrtomb(s,wc,ps) wcrtomb(s,wc,ps)
-+-#endif
-+ #endif
-+ 
-+ #if USE_SIZECHANGE
-+Index: ncurses/llib-lncurses
-+--- ncurses-5.6/ncurses/llib-lncurses	2006-10-28 22:20:51.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/llib-lncurses	2007-08-18 22:56:19.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -27,7 +27,7 @@
-+  ****************************************************************************/
-+ 
-+ /****************************************************************************
-+- *  Author: Thomas E. Dickey 1996-2006                                      *
-++ *  Author: Thomas E. Dickey 1996-2007                                      *
-+  ****************************************************************************/
-+ /* LINTLIBRARY */
-+ 
-+@@ -1017,6 +1017,11 @@
-+ 		WINDOW	*z)
-+ 		{ return(*(int *)0); }
-+ 
-++#undef getattrs
-++int	getattrs(
-++		const WINDOW *z)
-++		{ return(*(int *)0); }
-++
-+ #undef getcurx
-+ int	getcurx(
-+ 		const WINDOW *z)
-+@@ -1057,6 +1062,68 @@
-+ 		const WINDOW *z)
-+ 		{ return(*(int *)0); }
-+ 
-++#undef wgetparent
-++WINDOW	*wgetparent(
-++		const WINDOW *z)
-++		{ return(*(WINDOW **)0); }
-++
-++#undef is_cleared
-++NCURSES_BOOL is_cleared(
-++		const WINDOW *z)
-++		{ return(*(NCURSES_BOOL *)0); }
-++
-++#undef is_idcok
-++NCURSES_BOOL is_idcok(
-++		const WINDOW *z)
-++		{ return(*(NCURSES_BOOL *)0); }
-++
-++#undef is_idlok
-++NCURSES_BOOL is_idlok(
-++		const WINDOW *z)
-++		{ return(*(NCURSES_BOOL *)0); }
-++
-++#undef is_immedok
-++NCURSES_BOOL is_immedok(
-++		const WINDOW *z)
-++		{ return(*(NCURSES_BOOL *)0); }
-++
-++#undef is_keypad
-++NCURSES_BOOL is_keypad(
-++		const WINDOW *z)
-++		{ return(*(NCURSES_BOOL *)0); }
-++
-++#undef is_leaveok
-++NCURSES_BOOL is_leaveok(
-++		const WINDOW *z)
-++		{ return(*(NCURSES_BOOL *)0); }
-++
-++#undef is_nodelay
-++NCURSES_BOOL is_nodelay(
-++		const WINDOW *z)
-++		{ return(*(NCURSES_BOOL *)0); }
-++
-++#undef is_notimeout
-++NCURSES_BOOL is_notimeout(
-++		const WINDOW *z)
-++		{ return(*(NCURSES_BOOL *)0); }
-++
-++#undef is_scrollok
-++NCURSES_BOOL is_scrollok(
-++		const WINDOW *z)
-++		{ return(*(NCURSES_BOOL *)0); }
-++
-++#undef is_syncok
-++NCURSES_BOOL is_syncok(
-++		const WINDOW *z)
-++		{ return(*(NCURSES_BOOL *)0); }
-++
-++#undef wgetscrreg
-++int	wgetscrreg(
-++		const WINDOW *a1, 
-++		int	*a2, 
-++		int	*z)
-++		{ return(*(int *)0); }
-++
-+ #undef mouse_trafo
-+ NCURSES_BOOL mouse_trafo(
-+ 		int	*a1, 
-+@@ -2093,40 +2160,11 @@
-+ /* ./tinfo/add_tries.c */
-+ 
-+ #undef _nc_add_to_try
-+-void	_nc_add_to_try(
-+-		struct tries **tree, 
-++int	_nc_add_to_try(
-++		TRIES	**tree, 
-+ 		const char *str, 
-+ 		unsigned code)
-+-		{ /* void */ }
-+-
-+-/* ./tinfo/alloc_entry.c */
-+-
-+-#undef _nc_init_entry
-+-void	_nc_init_entry(
-+-		TERMTYPE *const tp)
-+-		{ /* void */ }
-+-
-+-#undef _nc_copy_entry
-+-ENTRY	*_nc_copy_entry(
-+-		ENTRY	*oldp)
-+-		{ return(*(ENTRY **)0); }
-+-
-+-#undef _nc_save_str
-+-char	*_nc_save_str(
-+-		const char *const string)
-+-		{ return(*(char **)0); }
-+-
-+-#undef _nc_wrap_entry
-+-void	_nc_wrap_entry(
-+-		ENTRY	*const ep, 
-+-		NCURSES_BOOL copy_strings)
-+-		{ /* void */ }
-+-
-+-#undef _nc_merge_entry
-+-void	_nc_merge_entry(
-+-		TERMTYPE *const to, 
-+-		TERMTYPE *const from)
-+-		{ /* void */ }
-++		{ return(*(int *)0); }
-+ 
-+ /* ./tinfo/alloc_ttype.c */
-+ 
-+@@ -2142,22 +2180,6 @@
-+ 		TERMTYPE *src)
-+ 		{ /* void */ }
-+ 
-+-/* ./tinfo/captoinfo.c */
-+-
-+-#undef _nc_captoinfo
-+-char	*_nc_captoinfo(
-+-		const char *cap, 
-+-		const char *s, 
-+-		int const parameterized)
-+-		{ return(*(char **)0); }
-+-
-+-#undef _nc_infotocap
-+-char	*_nc_infotocap(
-+-		const char *cap, 
-+-		const char *str, 
-+-		int const parameterized)
-+-		{ return(*(char **)0); }
-+-
-+ /* ./codes.c */
-+ 
-+ #undef boolcodes
-+@@ -2167,31 +2189,7 @@
-+ #undef strcodes
-+ char	*const strcodes[] = {0};
-+ 
-+-/* ./comp_captab.c */
-+-
-+-#include <ncurses_cfg.h>
-+-
-+-#undef _nc_info_hash_table
-+-const struct name_table_entry *const _nc_info_hash_table[995] = {0};
-+-#undef _nc_cap_hash_table
-+-const struct name_table_entry *const _nc_cap_hash_table[995] = {0};
-+-#undef _nc_capalias_table
-+-const struct alias _nc_capalias_table[] = {0};
-+-#undef _nc_infoalias_table
-+-const struct alias _nc_infoalias_table[] = {0};
-+-
-+-#undef _nc_get_table
-+-const struct name_table_entry *_nc_get_table(
-+-		NCURSES_BOOL termcap)
-+-		{ return(*(const struct name_table_entry **)0); }
-+-
-+-#undef _nc_get_hash_table
-+-const struct name_table_entry *const *_nc_get_hash_table(
-+-		NCURSES_BOOL termcap)
-+-		{ return(*(const struct name_table_entry **)0); }
-+-
-+ /* ./tinfo/comp_error.c */
-+-
-+ #undef _nc_suppress_warnings
-+ NCURSES_BOOL _nc_suppress_warnings;
-+ #undef _nc_curr_line
-+@@ -2236,134 +2234,6 @@
-+ 		...)
-+ 		{ /* void */ }
-+ 
-+-/* ./tinfo/comp_expand.c */
-+-
-+-#undef _nc_tic_expand
-+-char	*_nc_tic_expand(
-+-		const char *srcp, 
-+-		NCURSES_BOOL tic_format, 
-+-		int	numbers)
-+-		{ return(*(char **)0); }
-+-
-+-/* ./tinfo/comp_hash.c */
-+-
-+-#include <hashsize.h>
-+-
-+-#undef _nc_find_entry
-+-struct name_table_entry const *_nc_find_entry(
-+-		const char *string, 
-+-		const struct name_table_entry *const *hash_table)
-+-		{ return(*(struct name_table_entry const **)0); }
-+-
-+-#undef _nc_find_type_entry
-+-struct name_table_entry const *_nc_find_type_entry(
-+-		const char *string, 
-+-		int	type, 
-+-		const struct name_table_entry *table)
-+-		{ return(*(struct name_table_entry const **)0); }
-+-
-+-/* ./tinfo/comp_parse.c */
-+-
-+-#undef _nc_check_termtype2
-+-void	(*_nc_check_termtype2)(
-+-		TERMTYPE *p1, 
-+-		NCURSES_BOOL p2);
-+-#undef _nc_check_termtype
-+-void	(*_nc_check_termtype)(
-+-		TERMTYPE *p1);
-+-#undef _nc_head
-+-ENTRY	*_nc_head;
-+-#undef _nc_tail
-+-ENTRY	*_nc_tail;
-+-
-+-#undef _nc_free_entries
-+-void	_nc_free_entries(
-+-		ENTRY	*headp)
-+-		{ /* void */ }
-+-
-+-#undef _nc_delink_entry
-+-ENTRY	*_nc_delink_entry(
-+-		ENTRY	*headp, 
-+-		TERMTYPE *tterm)
-+-		{ return(*(ENTRY **)0); }
-+-
-+-#undef _nc_free_entry
-+-void	_nc_free_entry(
-+-		ENTRY	*headp, 
-+-		TERMTYPE *tterm)
-+-		{ /* void */ }
-+-
-+-#undef _nc_entry_match
-+-NCURSES_BOOL _nc_entry_match(
-+-		char	*n1, 
-+-		char	*n2)
-+-		{ return(*(NCURSES_BOOL *)0); }
-+-
-+-#undef _nc_read_entry_source
-+-void	_nc_read_entry_source(
-+-		FILE	*fp, 
-+-		char	*buf, 
-+-		int	literal, 
-+-		NCURSES_BOOL silent, 
-+-		NCURSES_BOOL (*hook)(
-+-		ENTRY	*p1))
-+-		{ /* void */ }
-+-
-+-#undef _nc_resolve_uses2
-+-int	_nc_resolve_uses2(
-+-		NCURSES_BOOL fullresolve, 
-+-		NCURSES_BOOL literal)
-+-		{ return(*(int *)0); }
-+-
-+-#undef _nc_resolve_uses
-+-int	_nc_resolve_uses(
-+-		NCURSES_BOOL fullresolve)
-+-		{ return(*(int *)0); }
-+-
-+-/* ./tinfo/comp_scan.c */
-+-
-+-#undef _nc_syntax
-+-int	_nc_syntax;
-+-#undef _nc_curr_file_pos
-+-long	_nc_curr_file_pos;
-+-#undef _nc_comment_start
-+-long	_nc_comment_start;
-+-#undef _nc_comment_end
-+-long	_nc_comment_end;
-+-#undef _nc_start_line
-+-long	_nc_start_line;
-+-#undef _nc_curr_token
-+-struct token _nc_curr_token;
-+-#undef _nc_disable_period
-+-NCURSES_BOOL _nc_disable_period;
-+-
-+-#undef _nc_reset_input
-+-void	_nc_reset_input(
-+-		FILE	*fp, 
-+-		char	*buf)
-+-		{ /* void */ }
-+-
-+-#undef _nc_get_token
-+-int	_nc_get_token(
-+-		NCURSES_BOOL silent)
-+-		{ return(*(int *)0); }
-+-
-+-#undef _nc_trans_string
-+-int	_nc_trans_string(
-+-		char	*ptr, 
-+-		char	*last)
-+-		{ return(*(int *)0); }
-+-
-+-#undef _nc_push_token
-+-void	_nc_push_token(
-+-		int	tokclass)
-+-		{ /* void */ }
-+-
-+-#undef _nc_panic_mode
-+-void	_nc_panic_mode(
-+-		char	ch)
-+-		{ /* void */ }
-+-
-+ /* ./tinfo/db_iterator.c */
-+ 
-+ #undef _nc_tic_dir
-+@@ -2400,6 +2270,34 @@
-+ 		size_t	amount)
-+ 		{ return(*(void **)0); }
-+ 
-++/* ./tinfo/entries.c */
-++
-++#undef _nc_head
-++ENTRY	*_nc_head;
-++#undef _nc_tail
-++ENTRY	*_nc_tail;
-++
-++#undef _nc_free_entry
-++void	_nc_free_entry(
-++		ENTRY	*headp, 
-++		TERMTYPE *tterm)
-++		{ /* void */ }
-++
-++#undef _nc_free_entries
-++void	_nc_free_entries(
-++		ENTRY	*headp)
-++		{ /* void */ }
-++
-++#undef _nc_delink_entry
-++ENTRY	*_nc_delink_entry(
-++		ENTRY	*headp, 
-++		TERMTYPE *tterm)
-++		{ return(*(ENTRY **)0); }
-++
-++#undef _nc_leaks_tinfo
-++void	_nc_leaks_tinfo(void)
-++		{ /* void */ }
-++
-+ /* ./fallback.c */
-+ 
-+ #undef _nc_fallback
-+@@ -2442,7 +2340,7 @@
-+ #include <init_keytry.h>
-+ 
-+ #undef _nc_tinfo_fkeys
-+-struct tinfo_fkeys _nc_tinfo_fkeys[];
-++const struct tinfo_fkeys _nc_tinfo_fkeys[] = {0};
-+ 
-+ #endif
-+ 
-+@@ -2509,6 +2407,10 @@
-+ SCREEN	*_nc_screen_chain;
-+ #undef SP
-+ SCREEN	*SP;
-++#undef _nc_globals
-++NCURSES_GLOBALS _nc_globals;
-++#undef _nc_prescreen
-++NCURSES_PRESCREEN _nc_prescreen;
-+ 
-+ /* ./tinfo/lib_has_cap.c */
-+ 
-+@@ -2536,8 +2438,7 @@
-+ 
-+ /* ./lib_keyname.c */
-+ 
-+-#undef _nc_key_names
-+-const struct kn _nc_key_names[] = {0};
-++struct kn { short offset; int code; };
-+ 
-+ #undef keyname
-+ char	*keyname(
-+@@ -2677,7 +2578,7 @@
-+ 
-+ #undef _nc_handle_sigwinch
-+ int	_nc_handle_sigwinch(
-+-		int	enable)
-++		int	update)
-+ 		{ return(*(int *)0); }
-+ 
-+ #undef use_env
-+@@ -2685,6 +2586,12 @@
-+ 		NCURSES_BOOL f)
-+ 		{ /* void */ }
-+ 
-++#undef _nc_get_screensize
-++void	_nc_get_screensize(
-++		int	*linep, 
-++		int	*colp)
-++		{ /* void */ }
-++
-+ #undef _nc_update_screensize
-+ void	_nc_update_screensize(void)
-+ 		{ /* void */ }
-+@@ -2785,14 +2692,6 @@
-+ 
-+ /* ./tinfo/lib_tparm.c */
-+ 
-+-typedef struct {
-+-    union {
-+- int num;
-+- char *str;
-+-    } data;
-+-    NCURSES_BOOL num_type;
-+-} stack_frame;
-+-
-+ #undef _nc_tparm_err
-+ int	_nc_tparm_err;
-+ 
-+@@ -3047,26 +2946,6 @@
-+ #undef strfnames
-+ char	*const strfnames[] = {0};
-+ 
-+-/* ./tinfo/parse_entry.c */
-+-
-+-#undef _nc_parse_entry
-+-int	_nc_parse_entry(
-+-		struct entry *entryp, 
-+-		int	literal, 
-+-		NCURSES_BOOL silent)
-+-		{ return(*(int *)0); }
-+-
-+-#undef _nc_capcmp
-+-int	_nc_capcmp(
-+-		const char *s, 
-+-		const char *t)
-+-		{ return(*(int *)0); }
-+-
-+-typedef struct {
-+-    const char *from;
-+-    const char *to;
-+-} assoc;
-+-
-+ /* ./tinfo/read_entry.c */
-+ 
-+ #include <hashed_db.h>
-+@@ -3144,11 +3023,6 @@
-+ 
-+ /* ./trace/trace_buf.c */
-+ 
-+-typedef struct {
-+-    char *text;
-+-    size_t size;
-+-} LIST;
-+-
-+ #undef _nc_trace_buf
-+ char	*_nc_trace_buf(
-+ 		int	bufnum, 
-+@@ -3165,14 +3039,14 @@
-+ 
-+ #undef _nc_trace_tries
-+ void	_nc_trace_tries(
-+-		struct tries *tree)
-++		TRIES	*tree)
-+ 		{ /* void */ }
-+ 
-+ /* ./base/tries.c */
-+ 
-+ #undef _nc_expand_try
-+ char	*_nc_expand_try(
-+-		struct tries *tree, 
-++		TRIES	*tree, 
-+ 		unsigned code, 
-+ 		int	*count, 
-+ 		size_t	len)
-+@@ -3180,13 +3054,13 @@
-+ 
-+ #undef _nc_remove_key
-+ int	_nc_remove_key(
-+-		struct tries **tree, 
-++		TRIES	**tree, 
-+ 		unsigned code)
-+ 		{ return(*(int *)0); }
-+ 
-+ #undef _nc_remove_string
-+ int	_nc_remove_string(
-+-		struct tries **tree, 
-++		TRIES	**tree, 
-+ 		const char *string)
-+ 		{ return(*(int *)0); }
-+ 
-+@@ -3236,6 +3110,195 @@
-+ 		int	len)
-+ 		{ return(*(const char **)0); }
-+ 
-++/* ./tinfo/alloc_entry.c */
-++
-++#undef _nc_init_entry
-++void	_nc_init_entry(
-++		TERMTYPE *const tp)
-++		{ /* void */ }
-++
-++#undef _nc_copy_entry
-++ENTRY	*_nc_copy_entry(
-++		ENTRY	*oldp)
-++		{ return(*(ENTRY **)0); }
-++
-++#undef _nc_save_str
-++char	*_nc_save_str(
-++		const char *const string)
-++		{ return(*(char **)0); }
-++
-++#undef _nc_wrap_entry
-++void	_nc_wrap_entry(
-++		ENTRY	*const ep, 
-++		NCURSES_BOOL copy_strings)
-++		{ /* void */ }
-++
-++#undef _nc_merge_entry
-++void	_nc_merge_entry(
-++		TERMTYPE *const to, 
-++		TERMTYPE *const from)
-++		{ /* void */ }
-++
-++/* ./tinfo/captoinfo.c */
-++
-++#undef _nc_captoinfo
-++char	*_nc_captoinfo(
-++		const char *cap, 
-++		const char *s, 
-++		int const parameterized)
-++		{ return(*(char **)0); }
-++
-++#undef _nc_infotocap
-++char	*_nc_infotocap(
-++		const char *cap, 
-++		const char *str, 
-++		int const parameterized)
-++		{ return(*(char **)0); }
-++
-++/* ./comp_captab.c */
-++
-++#include <hashsize.h>
-++
-++#undef _nc_get_table
-++const struct name_table_entry *_nc_get_table(
-++		NCURSES_BOOL termcap)
-++		{ return(*(const struct name_table_entry **)0); }
-++
-++#undef _nc_get_hash_table
-++const short *_nc_get_hash_table(
-++		NCURSES_BOOL termcap)
-++		{ return(*(const short **)0); }
-++
-++#undef _nc_get_alias_table
-++const struct alias *_nc_get_alias_table(
-++		NCURSES_BOOL termcap)
-++		{ return(*(const struct alias **)0); }
-++
-++/* ./tinfo/comp_expand.c */
-++
-++#undef _nc_tic_expand
-++char	*_nc_tic_expand(
-++		const char *srcp, 
-++		NCURSES_BOOL tic_format, 
-++		int	numbers)
-++		{ return(*(char **)0); }
-++
-++/* ./tinfo/comp_hash.c */
-++
-++#undef _nc_find_entry
-++struct name_table_entry const *_nc_find_entry(
-++		const char *string, 
-++		const short *hash_table)
-++		{ return(*(struct name_table_entry const **)0); }
-++
-++#undef _nc_find_type_entry
-++struct name_table_entry const *_nc_find_type_entry(
-++		const char *string, 
-++		int	type, 
-++		const struct name_table_entry *table)
-++		{ return(*(struct name_table_entry const **)0); }
-++
-++/* ./tinfo/comp_parse.c */
-++
-++#undef _nc_check_termtype2
-++void	(*_nc_check_termtype2)(
-++		TERMTYPE *p1, 
-++		NCURSES_BOOL p2);
-++#undef _nc_check_termtype
-++void	(*_nc_check_termtype)(
-++		TERMTYPE *p1);
-++
-++#undef _nc_entry_match
-++NCURSES_BOOL _nc_entry_match(
-++		char	*n1, 
-++		char	*n2)
-++		{ return(*(NCURSES_BOOL *)0); }
-++
-++#undef _nc_read_entry_source
-++void	_nc_read_entry_source(
-++		FILE	*fp, 
-++		char	*buf, 
-++		int	literal, 
-++		NCURSES_BOOL silent, 
-++		NCURSES_BOOL (*hook)(
-++		ENTRY	*p1))
-++		{ /* void */ }
-++
-++#undef _nc_resolve_uses2
-++int	_nc_resolve_uses2(
-++		NCURSES_BOOL fullresolve, 
-++		NCURSES_BOOL literal)
-++		{ return(*(int *)0); }
-++
-++#undef _nc_resolve_uses
-++int	_nc_resolve_uses(
-++		NCURSES_BOOL fullresolve)
-++		{ return(*(int *)0); }
-++
-++/* ./tinfo/comp_scan.c */
-++
-++#undef _nc_syntax
-++int	_nc_syntax;
-++#undef _nc_curr_file_pos
-++long	_nc_curr_file_pos;
-++#undef _nc_comment_start
-++long	_nc_comment_start;
-++#undef _nc_comment_end
-++long	_nc_comment_end;
-++#undef _nc_start_line
-++long	_nc_start_line;
-++#undef _nc_curr_token
-++struct token _nc_curr_token;
-++#undef _nc_disable_period
-++NCURSES_BOOL _nc_disable_period;
-++
-++#undef _nc_reset_input
-++void	_nc_reset_input(
-++		FILE	*fp, 
-++		char	*buf)
-++		{ /* void */ }
-++
-++#undef _nc_get_token
-++int	_nc_get_token(
-++		NCURSES_BOOL silent)
-++		{ return(*(int *)0); }
-++
-++#undef _nc_trans_string
-++int	_nc_trans_string(
-++		char	*ptr, 
-++		char	*last)
-++		{ return(*(int *)0); }
-++
-++#undef _nc_push_token
-++void	_nc_push_token(
-++		int	tokclass)
-++		{ /* void */ }
-++
-++#undef _nc_panic_mode
-++void	_nc_panic_mode(
-++		char	ch)
-++		{ /* void */ }
-++
-++/* ./tinfo/parse_entry.c */
-++
-++#undef _nc_parse_entry
-++int	_nc_parse_entry(
-++		struct entry *entryp, 
-++		int	literal, 
-++		NCURSES_BOOL silent)
-++		{ return(*(int *)0); }
-++
-++#undef _nc_capcmp
-++int	_nc_capcmp(
-++		const char *s, 
-++		const char *t)
-++		{ return(*(int *)0); }
-++
-++typedef struct {
-++    const char *from;
-++    const char *to;
-++} assoc;
-++
-+ /* ./tinfo/write_entry.c */
-+ 
-+ #undef _nc_set_writedir
-+Index: ncurses/llib-lncursesw
-+--- ncurses-5.6/ncurses/llib-lncursesw	2006-12-17 17:37:36.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/llib-lncursesw	2007-08-18 23:01:48.000000000 +0000
-+@@ -1066,6 +1066,11 @@
-+ 		WINDOW	*z)
-+ 		{ return(*(int *)0); }
-+ 
-++#undef getattrs
-++int	getattrs(
-++		const WINDOW *z)
-++		{ return(*(int *)0); }
-++
-+ #undef getcurx
-+ int	getcurx(
-+ 		const WINDOW *z)
-+@@ -1106,6 +1111,68 @@
-+ 		const WINDOW *z)
-+ 		{ return(*(int *)0); }
-+ 
-++#undef wgetparent
-++WINDOW	*wgetparent(
-++		const WINDOW *z)
-++		{ return(*(WINDOW **)0); }
-++
-++#undef is_cleared
-++NCURSES_BOOL is_cleared(
-++		const WINDOW *z)
-++		{ return(*(NCURSES_BOOL *)0); }
-++
-++#undef is_idcok
-++NCURSES_BOOL is_idcok(
-++		const WINDOW *z)
-++		{ return(*(NCURSES_BOOL *)0); }
-++
-++#undef is_idlok
-++NCURSES_BOOL is_idlok(
-++		const WINDOW *z)
-++		{ return(*(NCURSES_BOOL *)0); }
-++
-++#undef is_immedok
-++NCURSES_BOOL is_immedok(
-++		const WINDOW *z)
-++		{ return(*(NCURSES_BOOL *)0); }
-++
-++#undef is_keypad
-++NCURSES_BOOL is_keypad(
-++		const WINDOW *z)
-++		{ return(*(NCURSES_BOOL *)0); }
-++
-++#undef is_leaveok
-++NCURSES_BOOL is_leaveok(
-++		const WINDOW *z)
-++		{ return(*(NCURSES_BOOL *)0); }
-++
-++#undef is_nodelay
-++NCURSES_BOOL is_nodelay(
-++		const WINDOW *z)
-++		{ return(*(NCURSES_BOOL *)0); }
-++
-++#undef is_notimeout
-++NCURSES_BOOL is_notimeout(
-++		const WINDOW *z)
-++		{ return(*(NCURSES_BOOL *)0); }
-++
-++#undef is_scrollok
-++NCURSES_BOOL is_scrollok(
-++		const WINDOW *z)
-++		{ return(*(NCURSES_BOOL *)0); }
-++
-++#undef is_syncok
-++NCURSES_BOOL is_syncok(
-++		const WINDOW *z)
-++		{ return(*(NCURSES_BOOL *)0); }
-++
-++#undef wgetscrreg
-++int	wgetscrreg(
-++		const WINDOW *a1, 
-++		int	*a2, 
-++		int	*z)
-++		{ return(*(int *)0); }
-++
-+ #undef add_wch
-+ int	add_wch(
-+ 		const cchar_t *z)
-+@@ -2529,14 +2596,6 @@
-+ 		void	*opts)
-+ 		{ return(*(int *)0); }
-+ 
-+-/* ./widechar/lib_get_wch.c */
-+-
-+-#undef wget_wch
-+-int	wget_wch(
-+-		WINDOW	*win, 
-+-		wint_t	*result)
-+-		{ return(*(int *)0); }
-+-
-+ /* ./widechar/lib_erasewchar.c */
-+ 
-+ #undef erasewchar
-+@@ -2549,6 +2608,14 @@
-+ 		wchar_t	*wch)
-+ 		{ return(*(int *)0); }
-+ 
-++/* ./widechar/lib_get_wch.c */
-++
-++#undef wget_wch
-++int	wget_wch(
-++		WINDOW	*win, 
-++		wint_t	*result)
-++		{ return(*(int *)0); }
-++
-+ /* ./widechar/lib_get_wstr.c */
-+ 
-+ #undef wgetn_wstr
-+@@ -2614,6 +2681,13 @@
-+ 		wchar_t	*wstr)
-+ 		{ return(*(int *)0); }
-+ 
-++/* ./widechar/lib_key_name.c */
-++
-++#undef key_name
-++char	*key_name(
-++		wchar_t	c)
-++		{ return(*(char **)0); }
-++
-+ /* ./widechar/lib_pecho_wchar.c */
-+ 
-+ #undef pecho_wchar
-+@@ -2832,40 +2906,11 @@
-+ /* ./tinfo/add_tries.c */
-+ 
-+ #undef _nc_add_to_try
-+-void	_nc_add_to_try(
-+-		struct tries **tree, 
-++int	_nc_add_to_try(
-++		TRIES	**tree, 
-+ 		const char *str, 
-+ 		unsigned code)
-+-		{ /* void */ }
-+-
-+-/* ./tinfo/alloc_entry.c */
-+-
-+-#undef _nc_init_entry
-+-void	_nc_init_entry(
-+-		TERMTYPE *const tp)
-+-		{ /* void */ }
-+-
-+-#undef _nc_copy_entry
-+-ENTRY	*_nc_copy_entry(
-+-		ENTRY	*oldp)
-+-		{ return(*(ENTRY **)0); }
-+-
-+-#undef _nc_save_str
-+-char	*_nc_save_str(
-+-		const char *const string)
-+-		{ return(*(char **)0); }
-+-
-+-#undef _nc_wrap_entry
-+-void	_nc_wrap_entry(
-+-		ENTRY	*const ep, 
-+-		NCURSES_BOOL copy_strings)
-+-		{ /* void */ }
-+-
-+-#undef _nc_merge_entry
-+-void	_nc_merge_entry(
-+-		TERMTYPE *const to, 
-+-		TERMTYPE *const from)
-+-		{ /* void */ }
-++		{ return(*(int *)0); }
-+ 
-+ /* ./tinfo/alloc_ttype.c */
-+ 
-+@@ -2881,22 +2926,6 @@
-+ 		TERMTYPE *src)
-+ 		{ /* void */ }
-+ 
-+-/* ./tinfo/captoinfo.c */
-+-
-+-#undef _nc_captoinfo
-+-char	*_nc_captoinfo(
-+-		const char *cap, 
-+-		const char *s, 
-+-		int const parameterized)
-+-		{ return(*(char **)0); }
-+-
-+-#undef _nc_infotocap
-+-char	*_nc_infotocap(
-+-		const char *cap, 
-+-		const char *str, 
-+-		int const parameterized)
-+-		{ return(*(char **)0); }
-+-
-+ /* ./codes.c */
-+ 
-+ #undef boolcodes
-+@@ -2906,31 +2935,7 @@
-+ #undef strcodes
-+ char	*const strcodes[] = {0};
-+ 
-+-/* ./comp_captab.c */
-+-
-+-#include <ncurses_cfg.h>
-+-
-+-#undef _nc_info_hash_table
-+-const struct name_table_entry *const _nc_info_hash_table[995] = {0};
-+-#undef _nc_cap_hash_table
-+-const struct name_table_entry *const _nc_cap_hash_table[995] = {0};
-+-#undef _nc_capalias_table
-+-const struct alias _nc_capalias_table[] = {0};
-+-#undef _nc_infoalias_table
-+-const struct alias _nc_infoalias_table[] = {0};
-+-
-+-#undef _nc_get_table
-+-const struct name_table_entry *_nc_get_table(
-+-		NCURSES_BOOL termcap)
-+-		{ return(*(const struct name_table_entry **)0); }
-+-
-+-#undef _nc_get_hash_table
-+-const struct name_table_entry *const *_nc_get_hash_table(
-+-		NCURSES_BOOL termcap)
-+-		{ return(*(const struct name_table_entry **)0); }
-+-
-+ /* ./tinfo/comp_error.c */
-+-
-+ #undef _nc_suppress_warnings
-+ NCURSES_BOOL _nc_suppress_warnings;
-+ #undef _nc_curr_line
-+@@ -2975,134 +2980,6 @@
-+ 		...)
-+ 		{ /* void */ }
-+ 
-+-/* ./tinfo/comp_expand.c */
-+-
-+-#undef _nc_tic_expand
-+-char	*_nc_tic_expand(
-+-		const char *srcp, 
-+-		NCURSES_BOOL tic_format, 
-+-		int	numbers)
-+-		{ return(*(char **)0); }
-+-
-+-/* ./tinfo/comp_hash.c */
-+-
-+-#include <hashsize.h>
-+-
-+-#undef _nc_find_entry
-+-struct name_table_entry const *_nc_find_entry(
-+-		const char *string, 
-+-		const struct name_table_entry *const *hash_table)
-+-		{ return(*(struct name_table_entry const **)0); }
-+-
-+-#undef _nc_find_type_entry
-+-struct name_table_entry const *_nc_find_type_entry(
-+-		const char *string, 
-+-		int	type, 
-+-		const struct name_table_entry *table)
-+-		{ return(*(struct name_table_entry const **)0); }
-+-
-+-/* ./tinfo/comp_parse.c */
-+-
-+-#undef _nc_check_termtype2
-+-void	(*_nc_check_termtype2)(
-+-		TERMTYPE *p1, 
-+-		NCURSES_BOOL p2);
-+-#undef _nc_check_termtype
-+-void	(*_nc_check_termtype)(
-+-		TERMTYPE *p1);
-+-#undef _nc_head
-+-ENTRY	*_nc_head;
-+-#undef _nc_tail
-+-ENTRY	*_nc_tail;
-+-
-+-#undef _nc_free_entries
-+-void	_nc_free_entries(
-+-		ENTRY	*headp)
-+-		{ /* void */ }
-+-
-+-#undef _nc_delink_entry
-+-ENTRY	*_nc_delink_entry(
-+-		ENTRY	*headp, 
-+-		TERMTYPE *tterm)
-+-		{ return(*(ENTRY **)0); }
-+-
-+-#undef _nc_free_entry
-+-void	_nc_free_entry(
-+-		ENTRY	*headp, 
-+-		TERMTYPE *tterm)
-+-		{ /* void */ }
-+-
-+-#undef _nc_entry_match
-+-NCURSES_BOOL _nc_entry_match(
-+-		char	*n1, 
-+-		char	*n2)
-+-		{ return(*(NCURSES_BOOL *)0); }
-+-
-+-#undef _nc_read_entry_source
-+-void	_nc_read_entry_source(
-+-		FILE	*fp, 
-+-		char	*buf, 
-+-		int	literal, 
-+-		NCURSES_BOOL silent, 
-+-		NCURSES_BOOL (*hook)(
-+-		ENTRY	*p1))
-+-		{ /* void */ }
-+-
-+-#undef _nc_resolve_uses2
-+-int	_nc_resolve_uses2(
-+-		NCURSES_BOOL fullresolve, 
-+-		NCURSES_BOOL literal)
-+-		{ return(*(int *)0); }
-+-
-+-#undef _nc_resolve_uses
-+-int	_nc_resolve_uses(
-+-		NCURSES_BOOL fullresolve)
-+-		{ return(*(int *)0); }
-+-
-+-/* ./tinfo/comp_scan.c */
-+-
-+-#undef _nc_syntax
-+-int	_nc_syntax;
-+-#undef _nc_curr_file_pos
-+-long	_nc_curr_file_pos;
-+-#undef _nc_comment_start
-+-long	_nc_comment_start;
-+-#undef _nc_comment_end
-+-long	_nc_comment_end;
-+-#undef _nc_start_line
-+-long	_nc_start_line;
-+-#undef _nc_curr_token
-+-struct token _nc_curr_token;
-+-#undef _nc_disable_period
-+-NCURSES_BOOL _nc_disable_period;
-+-
-+-#undef _nc_reset_input
-+-void	_nc_reset_input(
-+-		FILE	*fp, 
-+-		char	*buf)
-+-		{ /* void */ }
-+-
-+-#undef _nc_get_token
-+-int	_nc_get_token(
-+-		NCURSES_BOOL silent)
-+-		{ return(*(int *)0); }
-+-
-+-#undef _nc_trans_string
-+-int	_nc_trans_string(
-+-		char	*ptr, 
-+-		char	*last)
-+-		{ return(*(int *)0); }
-+-
-+-#undef _nc_push_token
-+-void	_nc_push_token(
-+-		int	tokclass)
-+-		{ /* void */ }
-+-
-+-#undef _nc_panic_mode
-+-void	_nc_panic_mode(
-+-		char	ch)
-+-		{ /* void */ }
-+-
-+ /* ./tinfo/db_iterator.c */
-+ 
-+ #undef _nc_tic_dir
-+@@ -3139,6 +3016,34 @@
-+ 		size_t	amount)
-+ 		{ return(*(void **)0); }
-+ 
-++/* ./tinfo/entries.c */
-++
-++#undef _nc_head
-++ENTRY	*_nc_head;
-++#undef _nc_tail
-++ENTRY	*_nc_tail;
-++
-++#undef _nc_free_entry
-++void	_nc_free_entry(
-++		ENTRY	*headp, 
-++		TERMTYPE *tterm)
-++		{ /* void */ }
-++
-++#undef _nc_free_entries
-++void	_nc_free_entries(
-++		ENTRY	*headp)
-++		{ /* void */ }
-++
-++#undef _nc_delink_entry
-++ENTRY	*_nc_delink_entry(
-++		ENTRY	*headp, 
-++		TERMTYPE *tterm)
-++		{ return(*(ENTRY **)0); }
-++
-++#undef _nc_leaks_tinfo
-++void	_nc_leaks_tinfo(void)
-++		{ /* void */ }
-++
-+ /* ./fallback.c */
-+ 
-+ #undef _nc_fallback
-+@@ -3181,7 +3086,7 @@
-+ #include <init_keytry.h>
-+ 
-+ #undef _nc_tinfo_fkeys
-+-struct tinfo_fkeys _nc_tinfo_fkeys[];
-++const struct tinfo_fkeys _nc_tinfo_fkeys[] = {0};
-+ 
-+ #endif
-+ 
-+@@ -3248,6 +3153,10 @@
-+ SCREEN	*_nc_screen_chain;
-+ #undef SP
-+ SCREEN	*SP;
-++#undef _nc_globals
-++NCURSES_GLOBALS _nc_globals;
-++#undef _nc_prescreen
-++NCURSES_PRESCREEN _nc_prescreen;
-+ 
-+ /* ./tinfo/lib_has_cap.c */
-+ 
-+@@ -3275,19 +3184,13 @@
-+ 
-+ /* ./lib_keyname.c */
-+ 
-+-#undef _nc_key_names
-+-const struct kn _nc_key_names[] = {0};
-++struct kn { short offset; int code; };
-+ 
-+ #undef keyname
-+ char	*keyname(
-+ 		int	c)
-+ 		{ return(*(char **)0); }
-+ 
-+-#undef key_name
-+-char	*key_name(
-+-		wchar_t	c)
-+-		{ return(*(char **)0); }
-+-
-+ /* ./tinfo/lib_longname.c */
-+ 
-+ #undef longname
-+@@ -3421,7 +3324,7 @@
-+ 
-+ #undef _nc_handle_sigwinch
-+ int	_nc_handle_sigwinch(
-+-		int	enable)
-++		int	update)
-+ 		{ return(*(int *)0); }
-+ 
-+ #undef use_env
-+@@ -3429,6 +3332,12 @@
-+ 		NCURSES_BOOL f)
-+ 		{ /* void */ }
-+ 
-++#undef _nc_get_screensize
-++void	_nc_get_screensize(
-++		int	*linep, 
-++		int	*colp)
-++		{ /* void */ }
-++
-+ #undef _nc_update_screensize
-+ void	_nc_update_screensize(void)
-+ 		{ /* void */ }
-+@@ -3529,14 +3438,6 @@
-+ 
-+ /* ./tinfo/lib_tparm.c */
-+ 
-+-typedef struct {
-+-    union {
-+- int num;
-+- char *str;
-+-    } data;
-+-    NCURSES_BOOL num_type;
-+-} stack_frame;
-+-
-+ #undef _nc_tparm_err
-+ int	_nc_tparm_err;
-+ 
-+@@ -3802,26 +3703,6 @@
-+ #undef strfnames
-+ char	*const strfnames[] = {0};
-+ 
-+-/* ./tinfo/parse_entry.c */
-+-
-+-#undef _nc_parse_entry
-+-int	_nc_parse_entry(
-+-		struct entry *entryp, 
-+-		int	literal, 
-+-		NCURSES_BOOL silent)
-+-		{ return(*(int *)0); }
-+-
-+-#undef _nc_capcmp
-+-int	_nc_capcmp(
-+-		const char *s, 
-+-		const char *t)
-+-		{ return(*(int *)0); }
-+-
-+-typedef struct {
-+-    const char *from;
-+-    const char *to;
-+-} assoc;
-+-
-+ /* ./tinfo/read_entry.c */
-+ 
-+ #include <hashed_db.h>
-+@@ -3899,11 +3780,6 @@
-+ 
-+ /* ./trace/trace_buf.c */
-+ 
-+-typedef struct {
-+-    char *text;
-+-    size_t size;
-+-} LIST;
-+-
-+ #undef _nc_trace_buf
-+ char	*_nc_trace_buf(
-+ 		int	bufnum, 
-+@@ -3920,14 +3796,14 @@
-+ 
-+ #undef _nc_trace_tries
-+ void	_nc_trace_tries(
-+-		struct tries *tree)
-++		TRIES	*tree)
-+ 		{ /* void */ }
-+ 
-+ /* ./base/tries.c */
-+ 
-+ #undef _nc_expand_try
-+ char	*_nc_expand_try(
-+-		struct tries *tree, 
-++		TRIES	*tree, 
-+ 		unsigned code, 
-+ 		int	*count, 
-+ 		size_t	len)
-+@@ -3935,13 +3811,13 @@
-+ 
-+ #undef _nc_remove_key
-+ int	_nc_remove_key(
-+-		struct tries **tree, 
-++		TRIES	**tree, 
-+ 		unsigned code)
-+ 		{ return(*(int *)0); }
-+ 
-+ #undef _nc_remove_string
-+ int	_nc_remove_string(
-+-		struct tries **tree, 
-++		TRIES	**tree, 
-+ 		const char *string)
-+ 		{ return(*(int *)0); }
-+ 
-+@@ -4013,6 +3889,195 @@
-+ 		int	len)
-+ 		{ return(*(const char **)0); }
-+ 
-++/* ./tinfo/alloc_entry.c */
-++
-++#undef _nc_init_entry
-++void	_nc_init_entry(
-++		TERMTYPE *const tp)
-++		{ /* void */ }
-++
-++#undef _nc_copy_entry
-++ENTRY	*_nc_copy_entry(
-++		ENTRY	*oldp)
-++		{ return(*(ENTRY **)0); }
-++
-++#undef _nc_save_str
-++char	*_nc_save_str(
-++		const char *const string)
-++		{ return(*(char **)0); }
-++
-++#undef _nc_wrap_entry
-++void	_nc_wrap_entry(
-++		ENTRY	*const ep, 
-++		NCURSES_BOOL copy_strings)
-++		{ /* void */ }
-++
-++#undef _nc_merge_entry
-++void	_nc_merge_entry(
-++		TERMTYPE *const to, 
-++		TERMTYPE *const from)
-++		{ /* void */ }
-++
-++/* ./tinfo/captoinfo.c */
-++
-++#undef _nc_captoinfo
-++char	*_nc_captoinfo(
-++		const char *cap, 
-++		const char *s, 
-++		int const parameterized)
-++		{ return(*(char **)0); }
-++
-++#undef _nc_infotocap
-++char	*_nc_infotocap(
-++		const char *cap, 
-++		const char *str, 
-++		int const parameterized)
-++		{ return(*(char **)0); }
-++
-++/* ./comp_captab.c */
-++
-++#include <hashsize.h>
-++
-++#undef _nc_get_table
-++const struct name_table_entry *_nc_get_table(
-++		NCURSES_BOOL termcap)
-++		{ return(*(const struct name_table_entry **)0); }
-++
-++#undef _nc_get_hash_table
-++const short *_nc_get_hash_table(
-++		NCURSES_BOOL termcap)
-++		{ return(*(const short **)0); }
-++
-++#undef _nc_get_alias_table
-++const struct alias *_nc_get_alias_table(
-++		NCURSES_BOOL termcap)
-++		{ return(*(const struct alias **)0); }
-++
-++/* ./tinfo/comp_expand.c */
-++
-++#undef _nc_tic_expand
-++char	*_nc_tic_expand(
-++		const char *srcp, 
-++		NCURSES_BOOL tic_format, 
-++		int	numbers)
-++		{ return(*(char **)0); }
-++
-++/* ./tinfo/comp_hash.c */
-++
-++#undef _nc_find_entry
-++struct name_table_entry const *_nc_find_entry(
-++		const char *string, 
-++		const short *hash_table)
-++		{ return(*(struct name_table_entry const **)0); }
-++
-++#undef _nc_find_type_entry
-++struct name_table_entry const *_nc_find_type_entry(
-++		const char *string, 
-++		int	type, 
-++		const struct name_table_entry *table)
-++		{ return(*(struct name_table_entry const **)0); }
-++
-++/* ./tinfo/comp_parse.c */
-++
-++#undef _nc_check_termtype2
-++void	(*_nc_check_termtype2)(
-++		TERMTYPE *p1, 
-++		NCURSES_BOOL p2);
-++#undef _nc_check_termtype
-++void	(*_nc_check_termtype)(
-++		TERMTYPE *p1);
-++
-++#undef _nc_entry_match
-++NCURSES_BOOL _nc_entry_match(
-++		char	*n1, 
-++		char	*n2)
-++		{ return(*(NCURSES_BOOL *)0); }
-++
-++#undef _nc_read_entry_source
-++void	_nc_read_entry_source(
-++		FILE	*fp, 
-++		char	*buf, 
-++		int	literal, 
-++		NCURSES_BOOL silent, 
-++		NCURSES_BOOL (*hook)(
-++		ENTRY	*p1))
-++		{ /* void */ }
-++
-++#undef _nc_resolve_uses2
-++int	_nc_resolve_uses2(
-++		NCURSES_BOOL fullresolve, 
-++		NCURSES_BOOL literal)
-++		{ return(*(int *)0); }
-++
-++#undef _nc_resolve_uses
-++int	_nc_resolve_uses(
-++		NCURSES_BOOL fullresolve)
-++		{ return(*(int *)0); }
-++
-++/* ./tinfo/comp_scan.c */
-++
-++#undef _nc_syntax
-++int	_nc_syntax;
-++#undef _nc_curr_file_pos
-++long	_nc_curr_file_pos;
-++#undef _nc_comment_start
-++long	_nc_comment_start;
-++#undef _nc_comment_end
-++long	_nc_comment_end;
-++#undef _nc_start_line
-++long	_nc_start_line;
-++#undef _nc_curr_token
-++struct token _nc_curr_token;
-++#undef _nc_disable_period
-++NCURSES_BOOL _nc_disable_period;
-++
-++#undef _nc_reset_input
-++void	_nc_reset_input(
-++		FILE	*fp, 
-++		char	*buf)
-++		{ /* void */ }
-++
-++#undef _nc_get_token
-++int	_nc_get_token(
-++		NCURSES_BOOL silent)
-++		{ return(*(int *)0); }
-++
-++#undef _nc_trans_string
-++int	_nc_trans_string(
-++		char	*ptr, 
-++		char	*last)
-++		{ return(*(int *)0); }
-++
-++#undef _nc_push_token
-++void	_nc_push_token(
-++		int	tokclass)
-++		{ /* void */ }
-++
-++#undef _nc_panic_mode
-++void	_nc_panic_mode(
-++		char	ch)
-++		{ /* void */ }
-++
-++/* ./tinfo/parse_entry.c */
-++
-++#undef _nc_parse_entry
-++int	_nc_parse_entry(
-++		struct entry *entryp, 
-++		int	literal, 
-++		NCURSES_BOOL silent)
-++		{ return(*(int *)0); }
-++
-++#undef _nc_capcmp
-++int	_nc_capcmp(
-++		const char *s, 
-++		const char *t)
-++		{ return(*(int *)0); }
-++
-++typedef struct {
-++    const char *from;
-++    const char *to;
-++} assoc;
-++
-+ /* ./tinfo/write_entry.c */
-+ 
-+ #undef _nc_set_writedir
-+Index: ncurses/modules
-+Prereq:  1.107 
-+--- ncurses-5.6/ncurses/modules	2006-08-12 14:19:44.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/modules	2007-09-08 22:03:34.000000000 +0000
-+@@ -1,6 +1,6 @@
-+-# $Id: modules,v 1.107 2006/08/12 14:19:44 tom Exp $
-++# $Id: modules,v 1.112 2007/09/08 22:03:34 tom Exp $
-+ ##############################################################################
-+-# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
-++# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -127,14 +127,15 @@
-+ lib_add_wch	lib		$(wide)
-+ lib_box_set	lib		$(wide)
-+ lib_cchar	lib		$(wide)
-+-lib_get_wch	lib		$(wide)
-+ lib_erasewchar	lib		$(wide)
-++lib_get_wch	lib		$(wide)
-+ lib_get_wstr	lib		$(wide)
-+ lib_hline_set	lib		$(wide)
-+ lib_in_wch	lib		$(wide)
-+ lib_in_wchnstr	lib		$(wide)
-+ lib_ins_wch	lib		$(wide)
-+ lib_inwstr	lib		$(wide)
-++lib_key_name	lib		$(wide)
-+ lib_pecho_wchar	lib		$(wide)
-+ lib_slk_wset	lib		$(wide)
-+ lib_unget_wch	lib		$(wide)
-+@@ -151,24 +152,20 @@
-+ lib_print	lib		$(tinfo)	../include/term.h
-+ resizeterm	lib		$(base)		../include/term.h
-+ trace_xnames	lib		$(trace)	../include/term.h $(INCDIR)/term_entry.h
-++use_screen	lib		$(tinfo)
-++use_window	lib		$(base)
-+ wresize		lib		$(base)		../include/term.h
-+ 
-+ # Support for termcap (and tic, etc.), which can be a separate library
-+ @ termlib
-+ access		lib		$(tinfo)
-+ add_tries	lib		$(tinfo)
-+-alloc_entry	lib		$(tinfo)	../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
-+ alloc_ttype	lib		$(tinfo)	../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
-+-captoinfo	lib		$(tinfo)	$(INCDIR)/tic.h
-+ codes		lib		.
-+-comp_captab	lib		.		$(INCDIR)/tic.h ../include/term.h ../include/hashsize.h
-+ comp_error	lib		$(tinfo)	$(INCDIR)/tic.h
-+-comp_expand	lib		$(tinfo)	$(INCDIR)/tic.h
-+-comp_hash	lib		$(tinfo)	../include/term.h $(INCDIR)/tic.h ../include/hashsize.h
-+-comp_parse	lib		$(tinfo)	../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
-+-comp_scan	lib		$(tinfo)	$(INCDIR)/tic.h
-+ db_iterator	lib		$(tinfo)	$(INCDIR)/tic.h
-+ doalloc		lib		$(tinfo)
-++entries		lib		$(tinfo)	../include/term.h $(INCDIR)/tic.h
-+ fallback	lib		.		../include/term.h $(INCDIR)/tic.h
-+ free_ttype	lib		$(tinfo)	../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
-+ getenv_num	lib		$(tinfo)
-+@@ -200,7 +197,6 @@
-+ lib_twait	lib		$(serial)
-+ name_match	lib		$(tinfo)	../include/term.h $(INCDIR)/tic.h
-+ names		lib		.
-+-parse_entry	lib		$(tinfo)	../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h ../include/parametrized.h $(INCDIR)/capdefaults.c
-+ read_entry	lib		$(tinfo)	../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
-+ read_termcap	lib		$(tinfo)	../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
-+ setbuf		lib		$(tinfo)
-+@@ -211,6 +207,17 @@
-+ trim_sgr0	lib		$(tinfo)	../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
-+ unctrl		lib		.
-+ visbuf		lib		$(trace)	$(INCDIR)/tic.h
-++
-++# Modules used only for tic, other programs using internal interfaces
-++@ ticlib
-++alloc_entry	lib		$(tinfo)	../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
-++captoinfo	lib		$(tinfo)	$(INCDIR)/tic.h
-++comp_captab	lib		.		$(INCDIR)/tic.h ../include/term.h ../include/hashsize.h
-++comp_expand	lib		$(tinfo)	$(INCDIR)/tic.h
-++comp_hash	lib		$(tinfo)	../include/term.h $(INCDIR)/tic.h ../include/hashsize.h
-++comp_parse	lib		$(tinfo)	../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
-++comp_scan	lib		$(tinfo)	$(INCDIR)/tic.h
-++parse_entry	lib		$(tinfo)	../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h ../include/parametrized.h $(INCDIR)/capdefaults.c
-+ write_entry	lib		$(tinfo)	../include/term.h $(INCDIR)/term_entry.h $(INCDIR)/tic.h
-+ 
-+ # Extensions to the termlib library
-+@@ -221,3 +228,5 @@
-+ keybound	lib		$(base)
-+ keyok		lib		$(base)
-+ version		lib		$(base)
-++
-++# vile:makemode
-+Index: ncurses/tinfo/MKcaptab.awk
-+Prereq:  1.13 
-+--- ncurses-5.6/ncurses/tinfo/MKcaptab.awk	2006-04-22 21:46:17.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/MKcaptab.awk	2007-08-12 00:26:15.000000000 +0000
-+@@ -1,6 +1,5 @@
-+-#!/bin/sh
-+ ##############################################################################
-+-# Copyright (c) 1998-2000,2006 Free Software Foundation, Inc.                #
-++# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -26,73 +25,70 @@
-+ # use or other dealings in this Software without prior written               #
-+ # authorization.                                                             #
-+ ##############################################################################
-+-# $Id: MKcaptab.awk,v 1.13 2006/04/22 21:46:17 tom Exp $
-+-AWK=${1-awk}
-+-DATA=${2-../include/Caps}
-+-
-+-cat <<'EOF'
-+-/*
-+- *	comp_captab.c -- The names of the capabilities indexed via a hash
-+- *		         table for the compiler.
-+- *
-+- */
-+-
-+-#include <ncurses_cfg.h>
-+-#include <curses.priv.h>
-+-#include <tic.h>
-+-#include <term.h>
-+-
-+-EOF
-+-
-+-./make_hash 1 info <$DATA
-+-./make_hash 3 cap  <$DATA
-+-
-+-cat <<'EOF'
-+-const struct alias _nc_capalias_table[] =
-+-{
-+-EOF
-++# $Id: MKcaptab.awk,v 1.20 2007/08/12 00:26:15 tom Exp $
-++function add_string(text) {
-++    if (text != "IGNORE") {
-++	offsets[num_strings] = offset;
-++	offset = offset + length(text) + 1;
-++	printf "%s\\0", text;
-++    } else {
-++	offsets[num_strings] = -1;
-++    }
-++    num_strings = num_strings + 1;
-++    if ((num_strings % 3) == 0) {
-++	printf "\\\n";
-++    }
-++    return offsets[num_strings - 1];
-++}
-++BEGIN {
-++	first = 1;
-++	num_aliases = 0;
-++	num_strings = 0;
-++	offset = 0;
-++}
-+ 
-+-$AWK <$DATA '
-+-$1 == "capalias"	{
-+-		    if ($3 == "IGNORE")
-+-			to = "(char *)NULL";
-+-		    else
-+-			to = "\"" $3 "\"";
-+-		    printf "\t{\"%s\", %s, \"%s\"},\t /* %s */\n",
-+-				$2, to, $4, $5
-++/^[^#]/ {
-++	    if (first) {
-++		printf "/* generated by MKcaptab.awk %s(%d) */\n", tablename, bigstrings;
-++		print ""
-++		if (bigstrings) {
-++		    printf "static struct alias *_nc_%s_table = 0;\n", tablename;
-++		    print "";
-++		    printf "static const char %s_text[] = \"\\\n", tablename;
-++		} else {
-++		    printf "static const struct alias _nc_%s_table[] =\n", tablename;
-++		    printf "{\n";
-+ 		}
-+-'
-+-
-+-cat <<'EOF'
-+-	{(char *)NULL, (char *)NULL, (char *)NULL}
-+-};
-+-
-+-const struct alias _nc_infoalias_table[] =
-+-{
-+-EOF
-+-
-+-$AWK <$DATA '
-+-$1 == "infoalias"	{
-+-		    if ($3 == "IGNORE")
-+-			to = "(char *)NULL";
-+-		    else
-+-			to = "\"" $3 "\"";
-+-		    printf "\t{\"%s\", %s, \"%s\"},\t /* %s */\n",
-+-				$2, to, $4, $5
-++		first = 0;
-++	    }
-++	    if ($1 == tablename) {
-++		if ($3 == "IGNORE") {
-++		    to = "(char *)NULL";
-++		} else {
-++		    to = "\"" $3 "\"";
-+ 		}
-+-'
-+-
-+-cat <<'EOF'
-+-	{(char *)NULL, (char *)NULL, (char *)NULL}
-+-};
-+-
-+-NCURSES_EXPORT(const struct name_table_entry *) _nc_get_table (bool termcap)
-+-{
-+-	return termcap ? _nc_cap_table: _nc_info_table ;
-+-}
-+-
-+-NCURSES_EXPORT(const struct name_table_entry * const *) _nc_get_hash_table (bool termcap)
-+-{
-+-	return termcap ? _nc_cap_hash_table: _nc_info_hash_table ;
-+-}
-+-EOF
-++		if (bigstrings) {
-++		    c1 = add_string($2);
-++		    c2 = add_string($3);
-++		    c3 = add_string($4);
-++		    aliases[num_aliases] = sprintf("\t{%5d, %5d, %5d},\t /* %s */", c1, c2, c3, $5);
-++		    num_aliases = num_aliases + 1;
-++		} else {
-++		    printf "\t{\"%s\", %s, \"%s\"},\t /* %s */\n", $2, to, $4, $5;
-++		}
-++	    }
-++	}
-++END	{
-++	    if (bigstrings) {
-++		printf "\";\n\n";
-++		printf "static const alias_table_data %s_data[] = {\n", tablename;
-++		for (n = 0; n < num_aliases; ++n) {
-++		    printf "%s\n", aliases[n];
-++		}
-++		printf "};\n\n";
-++	    } else {
-++		printf "\t{(char *)NULL, (char *)NULL, (char *)NULL}\n";
-++		printf "};\n\n";
-++	    }
-++	}
-++# vile:sw=4:
-+Index: ncurses/tinfo/MKcaptab.sh
-+--- /dev/null	2007-12-08 19:14:25.328509000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/MKcaptab.sh	2007-08-12 13:13:51.000000000 +0000
-+@@ -0,0 +1,149 @@
-++#!/bin/sh
-++##############################################################################
-++# Copyright (c) 2007 Free Software Foundation, Inc.                          #
-++#                                                                            #
-++# Permission is hereby granted, free of charge, to any person obtaining a    #
-++# copy of this software and associated documentation files (the "Software"), #
-++# to deal in the Software without restriction, including without limitation  #
-++# the rights to use, copy, modify, merge, publish, distribute, distribute    #
-++# with modifications, sublicense, and/or sell copies of the Software, and to #
-++# permit persons to whom the Software is furnished to do so, subject to the  #
-++# following conditions:                                                      #
-++#                                                                            #
-++# The above copyright notice and this permission notice shall be included in #
-++# all copies or substantial portions of the Software.                        #
-++#                                                                            #
-++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
-++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,   #
-++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL    #
-++# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER      #
-++# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING    #
-++# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER        #
-++# DEALINGS IN THE SOFTWARE.                                                  #
-++#                                                                            #
-++# Except as contained in this notice, the name(s) of the above copyright     #
-++# holders shall not be used in advertising or otherwise to promote the sale, #
-++# use or other dealings in this Software without prior written               #
-++# authorization.                                                             #
-++##############################################################################
-++# $Id: MKcaptab.sh,v 1.8 2007/08/12 13:13:51 tom Exp $
-++AWK=${1-awk}
-++OPT1=${2-0}
-++OPT2=${3-tinfo/MKcaptab.awk}
-++DATA=${4-../include/Caps}
-++
-++cat <<'EOF'
-++/*
-++ *	comp_captab.c -- The names of the capabilities indexed via a hash
-++ *		         table for the compiler.
-++ *
-++ */
-++
-++#include <curses.priv.h>
-++#include <tic.h>
-++#include <hashsize.h>
-++
-++EOF
-++
-++./make_hash 1 info $OPT1 <$DATA
-++./make_hash 3 cap  $OPT1 <$DATA
-++
-++$AWK -f $OPT2 bigstrings=$OPT1 tablename=capalias <$DATA 
-++
-++$AWK -f $OPT2 bigstrings=$OPT1 tablename=infoalias <$DATA
-++
-++cat <<EOF
-++
-++#if $OPT1
-++static void
-++next_string(const char *strings, unsigned *offset)
-++{
-++	*offset += strlen(strings + *offset) + 1;
-++}
-++
-++static const struct name_table_entry *
-++_nc_build_names(struct name_table_entry **actual,
-++		const name_table_data *source,
-++		const char *strings)
-++{
-++	if (*actual == 0) {
-++		*actual = typeCalloc(struct name_table_entry, CAPTABSIZE);
-++		if (*actual != 0) {
-++			unsigned n;
-++			unsigned len = 0;
-++			for (n = 0; n < CAPTABSIZE; ++n) {
-++				(*actual)[n].nte_name = strings + len;
-++				(*actual)[n].nte_type = source[n].nte_type;
-++				(*actual)[n].nte_index = source[n].nte_index;
-++				(*actual)[n].nte_link = source[n].nte_link;
-++				next_string(strings, &len);
-++			}
-++		}
-++	}
-++	return *actual;
-++}
-++
-++#define add_alias(field) \\
-++	if (source[n].field >= 0) { \\
-++		(*actual)[n].field = strings + source[n].field; \\
-++	}
-++
-++static const struct alias *
-++_nc_build_alias(struct alias **actual,
-++		const alias_table_data *source,
-++		const char *strings,
-++		unsigned tablesize)
-++{
-++	if (*actual == 0) {
-++		*actual = typeCalloc(struct alias, tablesize + 1);
-++		if (*actual != 0) {
-++			unsigned n;
-++			for (n = 0; n < tablesize; ++n) {
-++				add_alias(from);
-++				add_alias(to);
-++				add_alias(source);
-++			}
-++		}
-++	}
-++	return *actual;
-++}
-++
-++#define build_names(root) _nc_build_names(&_nc_##root##_table, \\
-++					  root##_names_data, \\
-++					  root##_names_text)
-++#define build_alias(root) _nc_build_alias(&_nc_##root##alias_table, \\
-++					  root##alias_data, \\
-++					  root##alias_text, \\
-++					  SIZEOF(root##alias_data))
-++#else
-++#define build_names(root) _nc_ ## root ## _table
-++#define build_alias(root) _nc_ ## root ## alias_table
-++#endif
-++
-++NCURSES_EXPORT(const struct name_table_entry *) _nc_get_table (bool termcap)
-++{
-++	return termcap ? build_names(cap) : build_names(info) ;
-++}
-++
-++NCURSES_EXPORT(const short *) _nc_get_hash_table (bool termcap)
-++{
-++	return termcap ? _nc_cap_hash_table: _nc_info_hash_table ;
-++}
-++
-++NCURSES_EXPORT(const struct alias *) _nc_get_alias_table (bool termcap)
-++{
-++	return termcap ? build_alias(cap) : build_alias(info) ;
-++}
-++
-++#if NO_LEAKS
-++NCURSES_EXPORT(void) _nc_comp_captab_leaks(void)
-++{
-++#if $OPT1
-++	FreeIfNeeded(_nc_cap_table);
-++	FreeIfNeeded(_nc_info_table);
-++	FreeIfNeeded(_nc_capalias_table);
-++	FreeIfNeeded(_nc_infoalias_table);
-++#endif
-++}
-++#endif /* NO_LEAKS */
-++EOF
-+Index: ncurses/tinfo/MKcodes.awk
-+--- /dev/null	2007-12-08 19:14:25.328509000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/MKcodes.awk	2007-11-03 20:24:15.000000000 +0000
-+@@ -0,0 +1,161 @@
-++##############################################################################
-++# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
-++#                                                                            #
-++# Permission is hereby granted, free of charge, to any person obtaining a    #
-++# copy of this software and associated documentation files (the "Software"), #
-++# to deal in the Software without restriction, including without limitation  #
-++# the rights to use, copy, modify, merge, publish, distribute, distribute    #
-++# with modifications, sublicense, and/or sell copies of the Software, and to #
-++# permit persons to whom the Software is furnished to do so, subject to the  #
-++# following conditions:                                                      #
-++#                                                                            #
-++# The above copyright notice and this permission notice shall be included in #
-++# all copies or substantial portions of the Software.                        #
-++#                                                                            #
-++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
-++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,   #
-++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL    #
-++# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER      #
-++# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING    #
-++# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER        #
-++# DEALINGS IN THE SOFTWARE.                                                  #
-++#                                                                            #
-++# Except as contained in this notice, the name(s) of the above copyright     #
-++# holders shall not be used in advertising or otherwise to promote the sale, #
-++# use or other dealings in this Software without prior written               #
-++# authorization.                                                             #
-++##############################################################################
-++# $Id: MKcodes.awk,v 1.4 2007/11/03 20:24:15 tom Exp $
-++function large_item(value) {
-++	result = sprintf("%d,", offset);
-++	offset = offset + length(value) + 1;
-++	offcol = offcol + length(result) + 2;
-++	if (offcol > 70) {
-++		result = result "\n";
-++		offcol = 0;
-++	} else {
-++		result = result " ";
-++	}
-++	bigstr = bigstr sprintf("\"%s\\0\" ", value);
-++	bigcol = bigcol + length(value) + 5;
-++	if (bigcol > 70) {
-++		bigstr = bigstr "\\\n";
-++		bigcol = 0;
-++	}
-++	return result;
-++}
-++
-++function small_item(value) {
-++	return sprintf("\t\t\"%s\",\n", value);
-++}
-++
-++function print_strings(name,value) {
-++	printf  "DCL(%s) = {\n", name
-++	print  value
-++	print  "\t\t(NCURSES_CONST char *)0,"
-++	print  "};"
-++	print  ""
-++}
-++
-++function print_offsets(name,value) {
-++	printf  "static const short _nc_offset_%s[] = {\n", name
-++	printf "%s",  value
-++	print  "};"
-++	print  ""
-++	printf "static NCURSES_CONST char ** ptr_%s = 0;\n", name
-++	print  ""
-++}
-++
-++BEGIN	{
-++		print  "/* This file was generated by MKcodes.awk */"
-++		print  ""
-++		print  "#include <curses.priv.h>"
-++		print  ""
-++		print  "#define IT NCURSES_CONST char * const"
-++		print  ""
-++		offset = 0;
-++		offcol = 0;
-++		bigcol = 0;
-++	}
-++
-++$1 ~ /^#/		{next;}
-++
-++$1 == "SKIPWARN"	{next;}
-++
-++$3 == "bool"	{
-++			small_boolcodes = small_boolcodes small_item($4);
-++			large_boolcodes = large_boolcodes large_item($4);
-++		}
-++
-++$3 == "num"	{
-++			small_numcodes = small_numcodes small_item($4);
-++			large_numcodes = large_numcodes large_item($4);
-++		}
-++
-++$3 == "str"	{
-++			small_strcodes = small_strcodes small_item($4);
-++			large_strcodes = large_strcodes large_item($4);
-++		}
-++
-++END	{
-++		print  ""
-++		print  "#if BROKEN_LINKER || USE_REENTRANT"
-++		print  ""
-++		print  "#include <term.h>"
-++		print  ""
-++		if (bigstrings) {
-++			printf "static const char _nc_code_blob[] = \n"
-++			printf "%s;\n", bigstr;
-++			print_offsets("boolcodes", large_boolcodes);
-++			print_offsets("numcodes", large_numcodes);
-++			print_offsets("strcodes", large_strcodes);
-++			print  ""
-++			print  "static IT *"
-++			print  "alloc_array(NCURSES_CONST char ***value, const short *offsets, unsigned size)"
-++			print  "{"
-++			print  "	if (*value == 0) {"
-++			print  "		if ((*value = typeCalloc(NCURSES_CONST char *, size + 1)) != 0) {"
-++			print  "			unsigned n;"
-++			print  "			for (n = 0; n < size; ++n) {"
-++			print  "				(*value)[n] = _nc_code_blob + offsets[n];"
-++			print  "			}"
-++			print  "		}"
-++			print  "	}"
-++			print  "	return *value;"
-++			print  "}"
-++			print  ""
-++			print  "#define FIX(it) NCURSES_IMPEXP IT * NCURSES_API _nc_##it(void) { return alloc_array(&ptr_##it, _nc_offset_##it, SIZEOF(_nc_offset_##it)); }"
-++		} else {
-++			print  "#define DCL(it) static IT data##it[]"
-++			print  ""
-++			print_strings("boolcodes", small_boolcodes);
-++			print_strings("numcodes", small_numcodes);
-++			print_strings("strcodes", small_strcodes);
-++			print  "#define FIX(it) NCURSES_IMPEXP IT * NCURSES_API _nc_##it(void) { return data##it; }"
-++		}
-++		print  ""
-++		print  "FIX(boolcodes)"
-++		print  "FIX(numcodes)"
-++		print  "FIX(strcodes)"
-++		print  ""
-++		print  "#define FREE_FIX(it) if (ptr_##it) { FreeAndNull(ptr_##it); }"
-++		print  ""
-++		print  "NCURSES_EXPORT(void)"
-++		print  "_nc_codes_leaks(void)"
-++		print  "{"
-++		if (bigstrings) {
-++		print  "FREE_FIX(boolcodes)"
-++		print  "FREE_FIX(numcodes)"
-++		print  "FREE_FIX(strcodes)"
-++		}
-++		print  "}"
-++		print  "#else"
-++		print  ""
-++		print  "#define DCL(it) NCURSES_EXPORT_VAR(IT) it[]"
-++		print  ""
-++		print_strings("boolcodes", small_boolcodes);
-++		print_strings("numcodes", small_numcodes);
-++		print_strings("strcodes", small_strcodes);
-++		print  ""
-++		print  "#endif /* BROKEN_LINKER */"
-++	}
-+Index: ncurses/tinfo/MKnames.awk
-+Prereq:  1.12 
-+--- ncurses-5.6/ncurses/tinfo/MKnames.awk	2006-04-22 21:46:17.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/MKnames.awk	2007-11-03 20:24:15.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ ##############################################################################
-+-# Copyright (c) 1998-2000,2006 Free Software Foundation, Inc.                #
-++# Copyright (c) 2007 Free Software Foundation, Inc.                          #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -25,101 +25,159 @@
-+ # use or other dealings in this Software without prior written               #
-+ # authorization.                                                             #
-+ ##############################################################################
-+-# $Id: MKnames.awk,v 1.12 2006/04/22 21:46:17 tom Exp $
-+-BEGIN		{
-+-			print  "/* This file was generated by MKnames.awk */" > "namehdr"
-+-			print  ""				> "namehdr"
-+-			print  "#include <curses.priv.h>"	> "namehdr"
-+-			print  ""				> "namehdr"
-+-			print  "#define IT NCURSES_CONST char * const"	> "namehdr"
-+-			print  ""				> "namehdr"
-+-			print  "#if BROKEN_LINKER"		> "namehdr"
-+-			print  "#include <term.h>"		> "namehdr"
-+-			print  "#define DCL(it) static IT data##it[]" > "namehdr"
-+-			print  "#else"				> "namehdr"
-+-			print  "#define DCL(it) NCURSES_EXPORT_VAR(IT) it[]"	> "namehdr"
-+-			print  "#endif"				> "namehdr"
-+-			print  ""				> "namehdr"
-+-			print  "/*"				> "boolnames"
-+-			print  " *	names.c - Arrays of capability names and codes"  > "boolnames"
-+-			print  " *"				> "boolnames"
-+-			print  " */"				> "boolnames"
-+-			print  ""				> "boolnames"
-+-			print  "DCL(boolnames)  = {"		> "boolnames"
-+-			print  "DCL(boolfnames) = {"		> "boolfnames"
-+-			print  "DCL(boolcodes)  = {"		> "boolcodes"
-+-			print  "DCL(numnames)   = {"		> "numnames"
-+-			print  "DCL(numfnames)  = {"		> "numfnames"
-+-			print  "DCL(numcodes)   = {"		> "numcodes"
-+-			print  "DCL(strnames)   = {"		> "strnames"
-+-			print  "DCL(strfnames)  = {"		> "strfnames"
-+-			print  "DCL(strcodes)   = {"		> "strcodes"
-+-		}
-++# $Id: MKnames.awk,v 1.18 2007/11/03 20:24:15 tom Exp $
-++function large_item(value) {
-++	result = sprintf("%d,", offset);
-++	offset = offset + length(value) + 1;
-++	offcol = offcol + length(result) + 2;
-++	if (offcol > 70) {
-++		result = result "\n";
-++		offcol = 0;
-++	} else {
-++		result = result " ";
-++	}
-++	bigstr = bigstr sprintf("\"%s\\0\" ", value);
-++	bigcol = bigcol + length(value) + 5;
-++	if (bigcol > 70) {
-++		bigstr = bigstr "\\\n";
-++		bigcol = 0;
-++	}
-++	return result;
-++}
-++
-++function small_item(value) {
-++	return sprintf("\t\t\"%s\",\n", value);
-++}
-++
-++function print_strings(name,value) {
-++	printf  "DCL(%s) = {\n", name
-++	print  value
-++	print  "\t\t(NCURSES_CONST char *)0,"
-++	print  "};"
-++	print  ""
-++}
-++
-++function print_offsets(name,value) {
-++	printf  "static const short _nc_offset_%s[] = {\n", name
-++	printf "%s",  value
-++	print  "};"
-++	print  ""
-++	printf "static NCURSES_CONST char ** ptr_%s = 0;\n", name
-++	print  ""
-++}
-++
-++BEGIN	{
-++		print  "/* This file was generated by MKnames.awk */"
-++		print  ""
-++		print  "#include <curses.priv.h>"
-++		print  ""
-++		print  "#define IT NCURSES_CONST char * const"
-++		print  ""
-++		offset = 0;
-++		offcol = 0;
-++		bigcol = 0;
-++	}
-+ 
-+ $1 ~ /^#/		{next;}
-+ 
-+ $1 == "SKIPWARN"	{next;}
-+ 
-+ $3 == "bool"	{
-+-			printf "\t\t\"%s\",\n", $2 > "boolnames"
-+-			printf "\t\t\"%s\",\n", $1 > "boolfnames"
-+-			printf "\t\t\"%s\",\n", $4 > "boolcodes"
-++			small_boolnames = small_boolnames small_item($2);
-++			large_boolnames = large_boolnames large_item($2);
-++			small_boolfnames = small_boolfnames small_item($1);
-++			large_boolfnames = large_boolfnames large_item($1);
-+ 		}
-+ 
-+ $3 == "num"	{
-+-			printf "\t\t\"%s\",\n", $2 > "numnames"
-+-			printf "\t\t\"%s\",\n", $1 > "numfnames"
-+-			printf "\t\t\"%s\",\n", $4 > "numcodes"
-++			small_numnames = small_numnames small_item($2);
-++			large_numnames = large_numnames large_item($2);
-++			small_numfnames = small_numfnames small_item($1);
-++			large_numfnames = large_numfnames large_item($1);
-+ 		}
-+ 
-+ $3 == "str"	{
-+-			printf "\t\t\"%s\",\n", $2 > "strnames"
-+-			printf "\t\t\"%s\",\n", $1 > "strfnames"
-+-			printf "\t\t\"%s\",\n", $4 > "strcodes"
-++			small_strnames = small_strnames small_item($2);
-++			large_strnames = large_strnames large_item($2);
-++			small_strfnames = small_strfnames small_item($1);
-++			large_strfnames = large_strfnames large_item($1);
-+ 		}
-+ 
-+-END		{
-+-			print  "\t\t(NCURSES_CONST char *)0," > "boolnames"
-+-			print  "};" > "boolnames"
-+-			print  "" > "boolnames"
-+-			print  "\t\t(NCURSES_CONST char *)0," > "boolfnames"
-+-			print  "};" > "boolfnames"
-+-			print  "" > "boolfnames"
-+-			print  "\t\t(NCURSES_CONST char *)0," > "boolcodes"
-+-			print  "};" > "boolcodes"
-+-			print  "" > "boolcodes"
-+-			print  "\t\t(NCURSES_CONST char *)0," > "numnames"
-+-			print  "};" > "numnames"
-+-			print  "" > "numnames"
-+-			print  "\t\t(NCURSES_CONST char *)0," > "numfnames"
-+-			print  "};" > "numfnames"
-+-			print  "" > "numfnames"
-+-			print  "\t\t(NCURSES_CONST char *)0," > "numcodes"
-+-			print  "};" > "numcodes"
-+-			print  "" > "numcodes"
-+-			print  "\t\t(NCURSES_CONST char *)0," > "strnames"
-+-			print  "};" > "strnames"
-+-			print  "" > "strnames"
-+-			print  "\t\t(NCURSES_CONST char *)0," > "strfnames"
-+-			print  "};" > "strfnames"
-+-			print  "" > "strfnames"
-+-			print  "\t\t(NCURSES_CONST char *)0," > "strcodes"
-+-			print  "};"				> "strcodes"
-+-			print  ""				> "strcodes"
-+-			print  "#if BROKEN_LINKER"		> "nameftr"
-+-			print  "#define FIX(it) NCURSES_IMPEXP IT * NCURSES_API _nc_##it(void) { return data##it; }" > "nameftr"
-+-			print  "FIX(boolnames)"			> "nameftr"
-+-			print  "FIX(boolfnames)"		> "nameftr"
-+-			print  "FIX(numnames)"			> "nameftr"
-+-			print  "FIX(numfnames)"			> "nameftr"
-+-			print  "FIX(strnames)"			> "nameftr"
-+-			print  "FIX(strfnames)"			> "nameftr"
-+-			print  "#endif /* BROKEN_LINKER */"	> "nameftr"
-+-			print  ""				> "codeftr"
-+-			print  "#if BROKEN_LINKER"		> "codeftr"
-+-			print  "#define FIX(it) NCURSES_IMPEXP IT * NCURSES_API _nc_##it(void) { return data##it; }" > "codeftr"
-+-			print  "FIX(boolcodes)"			> "codeftr"
-+-			print  "FIX(numcodes)"			> "codeftr"
-+-			print  "FIX(strcodes)"			> "codeftr"
-+-			print  "#endif /* BROKEN_LINKER */"	> "codeftr"
-++END	{
-++		print  ""
-++		print  "#if BROKEN_LINKER || USE_REENTRANT"
-++		print  ""
-++		print  "#include <term.h>"
-++		print  ""
-++		if (bigstrings) {
-++			printf "static const char _nc_name_blob[] = \n"
-++			printf "%s;\n", bigstr;
-++			print_offsets("boolfnames", large_boolfnames);
-++			print_offsets("boolnames", large_boolnames);
-++			print_offsets("numfnames", large_numfnames);
-++			print_offsets("numnames", large_numnames);
-++			print_offsets("strfnames", large_strfnames);
-++			print_offsets("strnames", large_strnames);
-++			print  ""
-++			print  "static IT *"
-++			print  "alloc_array(NCURSES_CONST char ***value, const short *offsets, unsigned size)"
-++			print  "{"
-++			print  "	if (*value == 0) {"
-++			print  "		if ((*value = typeCalloc(NCURSES_CONST char *, size + 1)) != 0) {"
-++			print  "			unsigned n;"
-++			print  "			for (n = 0; n < size; ++n) {"
-++			print  "				(*value)[n] = _nc_name_blob + offsets[n];"
-++			print  "			}"
-++			print  "		}"
-++			print  "	}"
-++			print  "	return *value;"
-++			print  "}"
-++			print  ""
-++			print  "#define FIX(it) NCURSES_IMPEXP IT * NCURSES_API _nc_##it(void) { return alloc_array(&ptr_##it, _nc_offset_##it, SIZEOF(_nc_offset_##it)); }"
-++		} else {
-++			print  "#define DCL(it) static IT data##it[]"
-++			print  ""
-++			print_strings("boolnames", small_boolnames);
-++			print_strings("boolfnames", small_boolfnames);
-++			print_strings("numnames", small_numnames);
-++			print_strings("numfnames", small_numfnames);
-++			print_strings("strnames", small_strnames);
-++			print_strings("strfnames", small_strfnames);
-++			print  "#define FIX(it) NCURSES_IMPEXP IT * NCURSES_API _nc_##it(void) { return data##it; }"
-++		}
-++		print  ""
-++		print  "FIX(boolnames)"
-++		print  "FIX(boolfnames)"
-++		print  "FIX(numnames)"
-++		print  "FIX(numfnames)"
-++		print  "FIX(strnames)"
-++		print  "FIX(strfnames)"
-++		print  ""
-++		print  ""
-++		print  "#define FREE_FIX(it) if (ptr_##it) { FreeAndNull(ptr_##it); }"
-++		print  ""
-++		print  "NCURSES_EXPORT(void)"
-++		print  "_nc_names_leaks(void)"
-++		print  "{"
-++		if (bigstrings) {
-++		print  "FREE_FIX(boolnames)"
-++		print  "FREE_FIX(boolfnames)"
-++		print  "FREE_FIX(numnames)"
-++		print  "FREE_FIX(numfnames)"
-++		print  "FREE_FIX(strnames)"
-++		print  "FREE_FIX(strfnames)"
-+ 		}
-++		print  "}"
-++		print  "#else"
-++		print  ""
-++		print  "#define DCL(it) NCURSES_EXPORT_VAR(IT) it[]"
-++		print  ""
-++		print_strings("boolnames", small_boolnames);
-++		print_strings("boolfnames", small_boolfnames);
-++		print_strings("numnames", small_numnames);
-++		print_strings("numfnames", small_numfnames);
-++		print_strings("strnames", small_strnames);
-++		print_strings("strfnames", small_strfnames);
-++		print  ""
-++		print  "#endif /* BROKEN_LINKER */"
-++	}
-+Index: ncurses/tinfo/access.c
-+Prereq:  1.12 
-+--- ncurses-5.6/ncurses/tinfo/access.c	2006-08-05 17:18:14.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/access.c	2007-11-18 00:57:53.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2003,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -32,12 +32,13 @@
-+ 
-+ #include <curses.priv.h>
-+ 
-++#include <ctype.h>
-+ #include <sys/stat.h>
-+ 
-+ #include <tic.h>
-+ #include <nc_alloc.h>
-+ 
-+-MODULE_ID("$Id: access.c,v 1.12 2006/08/05 17:18:14 tom Exp $")
-++MODULE_ID("$Id: access.c,v 1.14 2007/11/18 00:57:53 tom Exp $")
-+ 
-+ #define LOWERCASE(c) ((isalpha(UChar(c)) && isupper(UChar(c))) ? tolower(UChar(c)) : (c))
-+ 
-+@@ -45,14 +46,13 @@
-+ _nc_rootname(char *path)
-+ {
-+     char *result = _nc_basename(path);
-+-#if !defined(MIXEDCASE_FILENAMES) || defined(PROG_EXT)
-++#if !MIXEDCASE_FILENAMES || defined(PROG_EXT)
-+     static char *temp;
-+     char *s;
-+ 
-+     temp = strdup(result);
-+     result = temp;
-+-#if !defined(MIXEDCASE_FILENAMES)
-+-    int n;
-++#if !MIXEDCASE_FILENAMES
-+     for (s = result; *s != '\0'; ++s) {
-+ 	*s = LOWERCASE(*s);
-+     }
-+Index: ncurses/tinfo/add_tries.c
-+Prereq:  1.5 
-+--- ncurses-5.6/ncurses/tinfo/add_tries.c	2005-11-20 01:32:48.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/add_tries.c	2006-12-30 23:15:26.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -27,7 +27,7 @@
-+  ****************************************************************************/
-+ 
-+ /****************************************************************************
-+- *  Author: Thomas E. Dickey <dickey@clark.net> 1998                        *
-++ *  Author: Thomas E. Dickey            1998-on                             *
-+  ****************************************************************************/
-+ 
-+ /*
-+@@ -39,20 +39,20 @@
-+ 
-+ #include <curses.priv.h>
-+ 
-+-MODULE_ID("$Id: add_tries.c,v 1.5 2005/11/20 01:32:48 tom Exp $")
-++MODULE_ID("$Id: add_tries.c,v 1.8 2006/12/30 23:15:26 tom Exp $")
-+ 
-+ #define SET_TRY(dst,src) if ((dst->ch = *src++) == 128) dst->ch = '\0'
-+ #define CMP_TRY(a,b) ((a)? (a == b) : (b == 128))
-+ 
-+-NCURSES_EXPORT(void)
-+-_nc_add_to_try(struct tries **tree, const char *str, unsigned code)
-++NCURSES_EXPORT(int)
-++_nc_add_to_try(TRIES ** tree, const char *str, unsigned code)
-+ {
-+-    static bool out_of_memory = FALSE;
-+-    struct tries *ptr, *savedptr;
-++    TRIES *ptr, *savedptr;
-+     unsigned const char *txt = (unsigned const char *) str;
-+ 
-+-    if (txt == 0 || *txt == '\0' || out_of_memory || code == 0)
-+-	return;
-++    T((T_CALLED("_nc_add_to_try(%p, %s, %u)"), *tree, _nc_visbuf(str), code));
-++    if (txt == 0 || *txt == '\0' || code == 0)
-++	returnCode(ERR);
-+ 
-+     if ((*tree) != 0) {
-+ 	ptr = savedptr = (*tree);
-+@@ -67,16 +67,15 @@
-+ 	    if (CMP_TRY(ptr->ch, cmp)) {
-+ 		if (*(++txt) == '\0') {
-+ 		    ptr->value = code;
-+-		    return;
-++		    returnCode(OK);
-+ 		}
-+ 		if (ptr->child != 0)
-+ 		    ptr = ptr->child;
-+ 		else
-+ 		    break;
-+ 	    } else {
-+-		if ((ptr->sibling = typeCalloc(struct tries, 1)) == 0) {
-+-		    out_of_memory = TRUE;
-+-		    return;
-++		if ((ptr->sibling = typeCalloc(TRIES, 1)) == 0) {
-++		    returnCode(ERR);
-+ 		}
-+ 
-+ 		savedptr = ptr = ptr->sibling;
-+@@ -87,11 +86,10 @@
-+ 	    }
-+ 	}			/* end for (;;) */
-+     } else {			/* (*tree) == 0 :: First sequence to be added */
-+-	savedptr = ptr = (*tree) = typeCalloc(struct tries, 1);
-++	savedptr = ptr = (*tree) = typeCalloc(TRIES, 1);
-+ 
-+ 	if (ptr == 0) {
-+-	    out_of_memory = TRUE;
-+-	    return;
-++	    returnCode(ERR);
-+ 	}
-+ 
-+ 	SET_TRY(ptr, txt);
-+@@ -101,19 +99,16 @@
-+     /* at this point, we are adding to the try.  ptr->child == 0 */
-+ 
-+     while (*txt) {
-+-	ptr->child = typeCalloc(struct tries, 1);
-++	ptr->child = typeCalloc(TRIES, 1);
-+ 
-+ 	ptr = ptr->child;
-+ 
-+ 	if (ptr == 0) {
-+-	    out_of_memory = TRUE;
-+-
-+ 	    while ((ptr = savedptr) != 0) {
-+ 		savedptr = ptr->child;
-+ 		free(ptr);
-+ 	    }
-+-
-+-	    return;
-++	    returnCode(ERR);
-+ 	}
-+ 
-+ 	SET_TRY(ptr, txt);
-+@@ -121,5 +116,5 @@
-+     }
-+ 
-+     ptr->value = code;
-+-    return;
-++    returnCode(OK);
-+ }
-+Index: ncurses/tinfo/comp_error.c
-+Prereq:  1.30 
-+--- ncurses-5.6/ncurses/tinfo/comp_error.c	2005-11-26 15:28:47.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/comp_error.c	2007-04-21 23:38:32.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2002,2005 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -41,36 +41,36 @@
-+ 
-+ #include <tic.h>
-+ 
-+-MODULE_ID("$Id: comp_error.c,v 1.30 2005/11/26 15:28:47 tom Exp $")
-++MODULE_ID("$Id: comp_error.c,v 1.31 2007/04/21 23:38:32 tom Exp $")
-+ 
-+ NCURSES_EXPORT_VAR(bool) _nc_suppress_warnings = FALSE;
-+ NCURSES_EXPORT_VAR(int) _nc_curr_line = 0; /* current line # in input */
-+ NCURSES_EXPORT_VAR(int) _nc_curr_col = 0; /* current column # in input */
-+ 
-+-static const char *sourcename;
-+-static char *termtype;
-++#define SourceName	_nc_globals.comp_sourcename
-++#define TermType	_nc_globals.comp_termtype
-+ 
-+ NCURSES_EXPORT(const char *)
-+ _nc_get_source(void)
-+ {
-+-    return sourcename;
-++    return SourceName;
-+ }
-+ 
-+ NCURSES_EXPORT(void)
-+ _nc_set_source(const char *const name)
-+ {
-+-    sourcename = name;
-++    SourceName = name;
-+ }
-+ 
-+ NCURSES_EXPORT(void)
-+ _nc_set_type(const char *const name)
-+ {
-+-    if (termtype == 0)
-+-	termtype = typeMalloc(char, MAX_NAME_SIZE + 1);
-+-    if (termtype != 0) {
-+-	termtype[0] = '\0';
-++    if (TermType == 0)
-++	TermType = typeMalloc(char, MAX_NAME_SIZE + 1);
-++    if (TermType != 0) {
-++	TermType[0] = '\0';
-+ 	if (name)
-+-	    strncat(termtype, name, MAX_NAME_SIZE);
-++	    strncat(TermType, name, MAX_NAME_SIZE);
-+     }
-+ }
-+ 
-+@@ -78,25 +78,25 @@
-+ _nc_get_type(char *name)
-+ {
-+ #if NO_LEAKS
-+-    if (name == 0 && termtype != 0) {
-+-	FreeAndNull(termtype);
-++    if (name == 0 && TermType != 0) {
-++	FreeAndNull(TermType);
-+ 	return;
-+     }
-+ #endif
-+     if (name != 0)
-+-	strcpy(name, termtype != 0 ? termtype : "");
-++	strcpy(name, TermType != 0 ? TermType : "");
-+ }
-+ 
-+ static NCURSES_INLINE void
-+ where_is_problem(void)
-+ {
-+-    fprintf(stderr, "\"%s\"", sourcename);
-++    fprintf(stderr, "\"%s\"", SourceName ? SourceName : "?");
-+     if (_nc_curr_line >= 0)
-+ 	fprintf(stderr, ", line %d", _nc_curr_line);
-+     if (_nc_curr_col >= 0)
-+ 	fprintf(stderr, ", col %d", _nc_curr_col);
-+-    if (termtype != 0 && termtype[0] != '\0')
-+-	fprintf(stderr, ", terminal '%s'", termtype);
-++    if (TermType != 0 && TermType[0] != '\0')
-++	fprintf(stderr, ", terminal '%s'", TermType);
-+     fputc(':', stderr);
-+     fputc(' ', stderr);
-+ }
-+Index: ncurses/tinfo/comp_hash.c
-+Prereq:  1.28 
-+--- ncurses-5.6/ncurses/tinfo/comp_hash.c	2005-08-20 19:58:18.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/comp_hash.c	2007-08-18 21:42:25.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2003,2005 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -50,7 +50,7 @@
-+ #define DEBUG(level, params)	/*nothing */
-+ #endif
-+ 
-+-MODULE_ID("$Id: comp_hash.c,v 1.28 2005/08/20 19:58:18 tom Exp $")
-++MODULE_ID("$Id: comp_hash.c,v 1.33 2007/08/18 21:42:25 tom Exp $")
-+ 
-+ static int hash_function(const char *);
-+ 
-+@@ -71,21 +71,24 @@
-+ 
-+ static void
-+ _nc_make_hash_table(struct name_table_entry *table,
-+-		    struct name_table_entry **hash_table)
-++		    short *hash_table)
-+ {
-+     int i;
-+     int hashvalue;
-+     int collisions = 0;
-+ 
-++    for (i = 0; i < HASHTABSIZE; i++) {
-++	hash_table[i] = -1;
-++    }
-+     for (i = 0; i < CAPTABSIZE; i++) {
-+ 	hashvalue = hash_function(table[i].nte_name);
-+ 
-+-	if (hash_table[hashvalue] != (struct name_table_entry *) 0)
-++	if (hash_table[hashvalue] >= 0)
-+ 	    collisions++;
-+ 
-+ 	if (hash_table[hashvalue] != 0)
-+-	    table[i].nte_link = (short) (hash_table[hashvalue] - table);
-+-	hash_table[hashvalue] = &table[i];
-++	    table[i].nte_link = hash_table[hashvalue];
-++	hash_table[hashvalue] = i;
-+     }
-+ 
-+     DEBUG(4, ("Hash table complete: %d collisions out of %d entries",
-+@@ -130,18 +133,21 @@
-+ #ifndef MAIN_PROGRAM
-+ NCURSES_EXPORT(struct name_table_entry const *)
-+ _nc_find_entry(const char *string,
-+-	       const struct name_table_entry *const *hash_table)
-++	       const short *hash_table)
-+ {
-+     int hashvalue;
-+-    struct name_table_entry const *ptr;
-++    struct name_table_entry const *ptr = 0;
-++    struct name_table_entry const *real_table;
-+ 
-+     hashvalue = hash_function(string);
-+ 
-+-    if ((ptr = hash_table[hashvalue]) != 0) {
-++    if (hash_table[hashvalue] >= 0) {
-++	real_table = _nc_get_table(hash_table != _nc_get_hash_table(FALSE));
-++	ptr = real_table + hash_table[hashvalue];
-+ 	while (strcmp(ptr->nte_name, string) != 0) {
-+ 	    if (ptr->nte_link < 0)
-+ 		return 0;
-+-	    ptr = ptr->nte_link + hash_table[HASHTABSIZE];
-++	    ptr = real_table + (ptr->nte_link + hash_table[HASHTABSIZE]);
-+ 	}
-+     }
-+ 
-+@@ -231,10 +237,10 @@
-+ {
-+     struct name_table_entry *name_table = typeCalloc(struct
-+ 						     name_table_entry, CAPTABSIZE);
-+-    struct name_table_entry **hash_table = typeCalloc(struct name_table_entry
-+-						      *, HASHTABSIZE);
-++    short *hash_table = typeCalloc(short, HASHTABSIZE);
-+     const char *root_name = "";
-+     int column = 0;
-++    int bigstring = 0;
-+     int n;
-+     char buffer[BUFSIZ];
-+ 
-+@@ -248,11 +254,12 @@
-+     /* The first argument is the column-number (starting with 0).
-+      * The second is the root name of the tables to generate.
-+      */
-+-    if (argc <= 2
-++    if (argc <= 3
-+ 	|| (column = atoi(argv[1])) <= 0
-+ 	|| (column >= MAX_COLUMNS)
-+-	|| *(root_name = argv[2]) == 0) {
-+-	fprintf(stderr, "usage: make_hash column root_name\n");
-++	|| *(root_name = argv[2]) == 0
-++	|| (bigstring = atoi(argv[3])) < 0) {
-++	fprintf(stderr, "usage: make_hash column root_name bigstring\n");
-+ 	exit(EXIT_FAILURE);
-+     }
-+ 
-+@@ -288,36 +295,64 @@
-+     /*
-+      * Write the compiled tables to standard output
-+      */
-+-    printf("static struct name_table_entry const _nc_%s_table[] =\n",
-+-	   root_name);
-+-    printf("{\n");
-+-    for (n = 0; n < CAPTABSIZE; n++) {
-+-	sprintf(buffer, "\"%s\"",
-+-		name_table[n].nte_name);
-+-	printf("\t{ %15s,\t%10s,\t%3d, %3d }%c\n",
-+-	       buffer,
-+-	       typenames[name_table[n].nte_type],
-+-	       name_table[n].nte_index,
-+-	       name_table[n].nte_link,
-+-	       n < CAPTABSIZE - 1 ? ',' : ' ');
-++    if (bigstring) {
-++	int len = 0;
-++	int nxt;
-++
-++	printf("static const char %s_names_text[] = \\\n", root_name);
-++	for (n = 0; n < CAPTABSIZE; n++) {
-++	    nxt = strlen(name_table[n].nte_name) + 5;
-++	    if (nxt + len > 72) {
-++		printf("\\\n");
-++		len = 0;
-++	    }
-++	    printf("\"%s\\0\" ", name_table[n].nte_name);
-++	    len += nxt;
-++	}
-++	printf(";\n\n");
-++
-++	len = 0;
-++	printf("static name_table_data const %s_names_data[] =\n",
-++	       root_name);
-++	printf("{\n");
-++	for (n = 0; n < CAPTABSIZE; n++) {
-++	    printf("\t{ %15d,\t%10s,\t%3d, %3d }%c\n",
-++		   len,
-++		   typenames[name_table[n].nte_type],
-++		   name_table[n].nte_index,
-++		   name_table[n].nte_link,
-++		   n < CAPTABSIZE - 1 ? ',' : ' ');
-++	    len += strlen(name_table[n].nte_name) + 1;
-++	}
-++	printf("};\n\n");
-++	printf("static struct name_table_entry *_nc_%s_table = 0;\n\n", root_name);
-++    } else {
-++
-++	printf("static struct name_table_entry %s _nc_%s_table[] =\n",
-++	       bigstring ? "" : "const",
-++	       root_name);
-++	printf("{\n");
-++	for (n = 0; n < CAPTABSIZE; n++) {
-++	    sprintf(buffer, "\"%s\"",
-++		    name_table[n].nte_name);
-++	    printf("\t{ %15s,\t%10s,\t%3d, %3d }%c\n",
-++		   buffer,
-++		   typenames[name_table[n].nte_type],
-++		   name_table[n].nte_index,
-++		   name_table[n].nte_link,
-++		   n < CAPTABSIZE - 1 ? ',' : ' ');
-++	}
-++	printf("};\n\n");
-+     }
-+-    printf("};\n\n");
-+ 
-+-    printf("const struct name_table_entry * const _nc_%s_hash_table[%d] =\n",
-++    printf("static const short _nc_%s_hash_table[%d] =\n",
-+ 	   root_name,
-+ 	   HASHTABSIZE + 1);
-+     printf("{\n");
-+     for (n = 0; n < HASHTABSIZE; n++) {
-+-	if (hash_table[n] != 0) {
-+-	    sprintf(buffer, "_nc_%s_table + %3ld",
-+-		    root_name,
-+-		    (long) (hash_table[n] - name_table));
-+-	} else {
-+-	    strcpy(buffer, "0");
-+-	}
-+-	printf("\t%s,\n", buffer);
-++	printf("\t%3d,\n", hash_table[n]);
-+     }
-+-    printf("\t_nc_%s_table\t/* base-of-table */\n", root_name);
-++    printf("\t0\t/* base-of-table */\n");
-+     printf("};\n\n");
-+ 
-+     printf("#if (BOOLCOUNT!=%d)||(NUMCOUNT!=%d)||(STRCOUNT!=%d)\n",
-+Index: ncurses/tinfo/comp_parse.c
-+Prereq:  1.63 
-+--- ncurses-5.6/ncurses/tinfo/comp_parse.c	2006-07-08 18:55:14.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/comp_parse.c	2007-11-03 20:41:46.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -53,7 +53,7 @@
-+ #include <tic.h>
-+ #include <term_entry.h>
-+ 
-+-MODULE_ID("$Id: comp_parse.c,v 1.63 2006/07/08 18:55:14 tom Exp $")
-++MODULE_ID("$Id: comp_parse.c,v 1.68 2007/11/03 20:41:46 tom Exp $")
-+ 
-+ static void sanity_check2(TERMTYPE *, bool);
-+ NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype2) (TERMTYPE *, bool) = sanity_check2;
-+@@ -62,30 +62,6 @@
-+ static void sanity_check(TERMTYPE *);
-+ NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype) (TERMTYPE *) = sanity_check;
-+ 
-+-/****************************************************************************
-+- *
-+- * Entry queue handling
-+- *
-+- ****************************************************************************/
-+-/*
-+- *  The entry list is a doubly linked list with NULLs terminating the lists:
-+- *
-+- *	  ---------   ---------   ---------
-+- *	  |       |   |       |   |       |   offset
-+- *        |-------|   |-------|   |-------|
-+- *	  |   ----+-->|   ----+-->|  NULL |   next
-+- *	  |-------|   |-------|   |-------|
-+- *	  |  NULL |<--+----   |<--+----   |   last
-+- *	  ---------   ---------   ---------
-+- *	      ^                       ^
-+- *	      |                       |
-+- *	      |                       |
-+- *	   _nc_head                _nc_tail
-+- */
-+-
-+-NCURSES_EXPORT_VAR(ENTRY *) _nc_head = 0;
-+-NCURSES_EXPORT_VAR(ENTRY *) _nc_tail = 0;
-+-
-+ static void
-+ enqueue(ENTRY * ep)
-+ /* add an entry to the in-core list */
-+@@ -103,51 +79,6 @@
-+ 	newp->last->next = newp;
-+ }
-+ 
-+-NCURSES_EXPORT(void)
-+-_nc_free_entries(ENTRY * headp)
-+-/* free the allocated storage consumed by list entries */
-+-{
-+-    (void) headp;		/* unused - _nc_head is altered here! */
-+-
-+-    while (_nc_head != 0) {
-+-	_nc_free_termtype(&(_nc_head->tterm));
-+-    }
-+-}
-+-
-+-NCURSES_EXPORT(ENTRY *)
-+-_nc_delink_entry(ENTRY * headp, TERMTYPE *tterm)
-+-/* delink the allocated storage for the given list entry */
-+-{
-+-    ENTRY *ep, *last;
-+-
-+-    for (last = 0, ep = headp; ep != 0; last = ep, ep = ep->next) {
-+-	if (&(ep->tterm) == tterm) {
-+-	    if (last != 0) {
-+-		last->next = ep->next;
-+-	    }
-+-	    if (ep == _nc_head) {
-+-		_nc_head = ep->next;
-+-	    }
-+-	    if (ep == _nc_tail) {
-+-		_nc_tail = last;
-+-	    }
-+-	    break;
-+-	}
-+-    }
-+-    return ep;
-+-}
-+-
-+-NCURSES_EXPORT(void)
-+-_nc_free_entry(ENTRY * headp, TERMTYPE *tterm)
-+-/* free the allocated storage consumed by the given list entry */
-+-{
-+-    ENTRY *ep;
-+-
-+-    if ((ep = _nc_delink_entry(headp, tterm)) != 0) {
-+-	free(ep);
-+-    }
-+-}
-+-
-+ static char *
-+ force_bar(char *dst, char *src)
-+ {
-+@@ -534,3 +465,26 @@
-+ {
-+     sanity_check2(tp, FALSE);
-+ }
-++
-++#if NO_LEAKS
-++NCURSES_EXPORT(void)
-++_nc_leaks_tic(void)
-++{
-++    _nc_alloc_entry_leaks();
-++    _nc_captoinfo_leaks();
-++    _nc_comp_captab_leaks();
-++    _nc_comp_scan_leaks();
-++#if BROKEN_LINKER || USE_REENTRANT
-++    _nc_names_leaks();
-++    _nc_codes_leaks();
-++#endif
-++    _nc_tic_expand(0, FALSE, 0);
-++}
-++
-++NCURSES_EXPORT(void)
-++_nc_free_tic(int code)
-++{
-++    _nc_leaks_tic();
-++    _nc_free_tinfo(code);
-++}
-++#endif
-+Index: ncurses/tinfo/db_iterator.c
-+Prereq:  1.5 
-+--- ncurses-5.6/ncurses/tinfo/db_iterator.c	2006-12-16 19:06:42.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/db_iterator.c	2007-04-22 00:00:26.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 2006 Free Software Foundation, Inc.                        *
-++ * Copyright (c) 2006,2007 Free Software Foundation, Inc.                   *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -27,7 +27,7 @@
-+  ****************************************************************************/
-+ 
-+ /****************************************************************************
-+- *  Author: Thomas E. Dickey                     2006                       *
-++ *  Author: Thomas E. Dickey                                                *
-+  ****************************************************************************/
-+ 
-+ /*
-+@@ -38,10 +38,11 @@
-+ 
-+ #include <tic.h>
-+ 
-+-MODULE_ID("$Id: db_iterator.c,v 1.5 2006/12/16 19:06:42 tom Exp $")
-++MODULE_ID("$Id: db_iterator.c,v 1.6 2007/04/22 00:00:26 tom Exp $")
-+ 
-+-static bool have_tic_directory = FALSE;
-+-static bool keep_tic_directory = FALSE;
-++#define HaveTicDirectory _nc_globals.have_tic_directory
-++#define KeepTicDirectory _nc_globals.keep_tic_directory
-++#define TicDirectory     _nc_globals.tic_directory
-+ 
-+ /*
-+  * Record the "official" location of the terminfo directory, according to
-+@@ -50,19 +51,17 @@
-+ NCURSES_EXPORT(const char *)
-+ _nc_tic_dir(const char *path)
-+ {
-+-    static const char *result = TERMINFO;
-+-
-+-    if (!keep_tic_directory) {
-++    if (!KeepTicDirectory) {
-+ 	if (path != 0) {
-+-	    result = path;
-+-	    have_tic_directory = TRUE;
-+-	} else if (!have_tic_directory && use_terminfo_vars()) {
-++	    TicDirectory = path;
-++	    HaveTicDirectory = TRUE;
-++	} else if (!HaveTicDirectory && use_terminfo_vars()) {
-+ 	    char *envp;
-+ 	    if ((envp = getenv("TERMINFO")) != 0)
-+ 		return _nc_tic_dir(envp);
-+ 	}
-+     }
-+-    return result;
-++    return TicDirectory;
-+ }
-+ 
-+ /*
-+@@ -74,16 +73,15 @@
-+ _nc_keep_tic_dir(const char *path)
-+ {
-+     _nc_tic_dir(path);
-+-    keep_tic_directory = TRUE;
-++    KeepTicDirectory = TRUE;
-+ }
-+ 
-+ /*
-+  * Process the list of :-separated directories, looking for the terminal type.
-+  * We don't use strtok because it does not show us empty tokens.
-+  */
-+-
-+-static char *this_db_list = 0;
-+-static int size_db_list;
-++#define ThisDbList	_nc_globals.dbi_list
-++#define ThisDbSize	_nc_globals.dbi_size
-+ 
-+ /*
-+  * Cleanup.
-+@@ -91,10 +89,10 @@
-+ NCURSES_EXPORT(void)
-+ _nc_last_db(void)
-+ {
-+-    if (this_db_list != 0) {
-+-	FreeAndNull(this_db_list);
-++    if (ThisDbList != 0) {
-++	FreeAndNull(ThisDbList);
-+     }
-+-    size_db_list = 0;
-++    ThisDbSize = 0;
-+ }
-+ 
-+ /* The TERMINFO_DIRS value, if defined by the configure script, begins with a
-+@@ -104,14 +102,14 @@
-+ next_list_item(const char *source, int *offset)
-+ {
-+     if (source != 0) {
-+-	FreeIfNeeded(this_db_list);
-+-	this_db_list = strdup(source);
-+-	size_db_list = strlen(source);
-++	FreeIfNeeded(ThisDbList);
-++	ThisDbList = strdup(source);
-++	ThisDbSize = strlen(source);
-+     }
-+ 
-+-    if (this_db_list != 0 && size_db_list && *offset < size_db_list) {
-++    if (ThisDbList != 0 && ThisDbSize && *offset < ThisDbSize) {
-+ 	static char system_db[] = TERMINFO;
-+-	char *result = this_db_list + *offset;
-++	char *result = ThisDbList + *offset;
-+ 	char *marker = strchr(result, NCURSES_PATHSEP);
-+ 
-+ 	/*
-+@@ -124,9 +122,9 @@
-+ 	    marker = result + *offset;
-+ 	} else {
-+ 	    *marker++ = 0;
-+-	    *offset = marker - this_db_list;
-++	    *offset = marker - ThisDbList;
-+ 	}
-+-	if (*result == 0 && result != (this_db_list + size_db_list))
-++	if (*result == 0 && result != (ThisDbList + ThisDbSize))
-+ 	    result = system_db;
-+ 	return result;
-+     }
-+@@ -153,7 +151,7 @@
-+ 
-+ 	switch (*state) {
-+ 	case dbdTIC:
-+-	    if (have_tic_directory)
-++	    if (HaveTicDirectory)
-+ 		result = _nc_tic_dir(0);
-+ 	    break;
-+ #if USE_DATABASE
-+Index: ncurses/tinfo/entries.c
-+--- /dev/null	2007-12-08 19:14:25.328509000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/entries.c	2007-11-03 21:00:27.000000000 +0000
-+@@ -0,0 +1,144 @@
-++/****************************************************************************
-++ * Copyright (c) 2006,2007 Free Software Foundation, Inc.                   *
-++ *                                                                          *
-++ * Permission is hereby granted, free of charge, to any person obtaining a  *
-++ * copy of this software and associated documentation files (the            *
-++ * "Software"), to deal in the Software without restriction, including      *
-++ * without limitation the rights to use, copy, modify, merge, publish,      *
-++ * distribute, distribute with modifications, sublicense, and/or sell       *
-++ * copies of the Software, and to permit persons to whom the Software is    *
-++ * furnished to do so, subject to the following conditions:                 *
-++ *                                                                          *
-++ * The above copyright notice and this permission notice shall be included  *
-++ * in all copies or substantial portions of the Software.                   *
-++ *                                                                          *
-++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-++ *                                                                          *
-++ * Except as contained in this notice, the name(s) of the above copyright   *
-++ * holders shall not be used in advertising or otherwise to promote the     *
-++ * sale, use or other dealings in this Software without prior written       *
-++ * authorization.                                                           *
-++ ****************************************************************************/
-++
-++/****************************************************************************
-++ *  Author: Thomas E. Dickey                                                *
-++ ****************************************************************************/
-++
-++#include <curses.priv.h>
-++
-++#include <ctype.h>
-++
-++#include <tic.h>
-++#include <term_entry.h>
-++
-++MODULE_ID("$Id: entries.c,v 1.4 2007/11/03 21:00:27 tom Exp $")
-++
-++/****************************************************************************
-++ *
-++ * Entry queue handling
-++ *
-++ ****************************************************************************/
-++/*
-++ *  The entry list is a doubly linked list with NULLs terminating the lists:
-++ *
-++ *	  ---------   ---------   ---------
-++ *	  |       |   |       |   |       |   offset
-++ *        |-------|   |-------|   |-------|
-++ *	  |   ----+-->|   ----+-->|  NULL |   next
-++ *	  |-------|   |-------|   |-------|
-++ *	  |  NULL |<--+----   |<--+----   |   last
-++ *	  ---------   ---------   ---------
-++ *	      ^                       ^
-++ *	      |                       |
-++ *	      |                       |
-++ *	   _nc_head                _nc_tail
-++ */
-++
-++NCURSES_EXPORT_VAR(ENTRY *) _nc_head = 0;
-++NCURSES_EXPORT_VAR(ENTRY *) _nc_tail = 0;
-++
-++NCURSES_EXPORT(void)
-++_nc_free_entry(ENTRY * headp, TERMTYPE *tterm)
-++/* free the allocated storage consumed by the given list entry */
-++{
-++    ENTRY *ep;
-++
-++    if ((ep = _nc_delink_entry(headp, tterm)) != 0) {
-++	free(ep);
-++    }
-++}
-++
-++NCURSES_EXPORT(void)
-++_nc_free_entries(ENTRY * headp)
-++/* free the allocated storage consumed by list entries */
-++{
-++    (void) headp;		/* unused - _nc_head is altered here! */
-++
-++    while (_nc_head != 0) {
-++	_nc_free_termtype(&(_nc_head->tterm));
-++    }
-++}
-++
-++NCURSES_EXPORT(ENTRY *)
-++_nc_delink_entry(ENTRY * headp, TERMTYPE *tterm)
-++/* delink the allocated storage for the given list entry */
-++{
-++    ENTRY *ep, *last;
-++
-++    for (last = 0, ep = headp; ep != 0; last = ep, ep = ep->next) {
-++	if (&(ep->tterm) == tterm) {
-++	    if (last != 0) {
-++		last->next = ep->next;
-++	    }
-++	    if (ep == _nc_head) {
-++		_nc_head = ep->next;
-++	    }
-++	    if (ep == _nc_tail) {
-++		_nc_tail = last;
-++	    }
-++	    break;
-++	}
-++    }
-++    return ep;
-++}
-++
-++NCURSES_EXPORT(void)
-++_nc_leaks_tinfo(void)
-++{
-++    char *s;
-++
-++    T((T_CALLED("_nc_free_tinfo()")));
-++#if NO_LEAKS
-++    _nc_free_tparm();
-++    _nc_tgetent_leaks();
-++#endif
-++    _nc_free_entries(_nc_head);
-++    _nc_get_type(0);
-++    _nc_first_name(0);
-++#if NO_LEAKS
-++    _nc_keyname_leaks();
-++#endif
-++#if BROKEN_LINKER || USE_REENTRANT
-++    _nc_names_leaks();
-++    _nc_codes_leaks();
-++#endif
-++
-++    if ((s = _nc_home_terminfo()) != 0)
-++	free(s);
-++    returnVoid;
-++}
-++
-++#if NO_LEAKS
-++NCURSES_EXPORT(void)
-++_nc_free_tinfo(int code)
-++{
-++    _nc_leaks_tinfo();
-++    exit(code);
-++}
-++#endif
-+Index: ncurses/tinfo/home_terminfo.c
-+Prereq:  1.9 
-+--- ncurses-5.6/ncurses/tinfo/home_terminfo.c	2005-07-02 19:43:38.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/home_terminfo.c	2007-04-21 23:11:53.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -27,7 +27,7 @@
-+  ****************************************************************************/
-+ 
-+ /****************************************************************************
-+- *  Author: Thomas E. Dickey 1998,2000,2004,2005                            *
-++ *  Author: Thomas E. Dickey                                                *
-+  ****************************************************************************/
-+ 
-+ /*
-+@@ -37,31 +37,32 @@
-+ #include <curses.priv.h>
-+ #include <tic.h>
-+ 
-+-MODULE_ID("$Id: home_terminfo.c,v 1.9 2005/07/02 19:43:38 tom Exp $")
-++MODULE_ID("$Id: home_terminfo.c,v 1.10 2007/04/21 23:11:53 tom Exp $")
-+ 
-+ #define my_length (strlen(home) + sizeof(PRIVATE_INFO))
-+ 
-+ /* ncurses extension...fall back on user's private directory */
-+ 
-++#define MyBuffer _nc_globals.home_terminfo
-++
-+ NCURSES_EXPORT(char *)
-+ _nc_home_terminfo(void)
-+ {
-+     char *result = 0;
-+-#ifdef USE_HOME_TERMINFO
-++#if USE_HOME_TERMINFO
-+     char *home;
-+-    static char *temp = 0;
-+ 
-+     if (use_terminfo_vars()) {
-+-	if (temp == 0) {
-++	if (MyBuffer == 0) {
-+ 	    if ((home = getenv("HOME")) != 0
-+ 		&& my_length <= PATH_MAX) {
-+-		temp = typeMalloc(char, my_length);
-+-		if (temp == 0)
-++		MyBuffer = typeMalloc(char, my_length);
-++		if (MyBuffer == 0)
-+ 		    _nc_err_abort(MSG_NO_MEMORY);
-+-		(void) sprintf(temp, PRIVATE_INFO, home);
-++		(void) sprintf(MyBuffer, PRIVATE_INFO, home);
-+ 	    }
-+ 	}
-+-	result = temp;
-++	result = MyBuffer;
-+     }
-+ #endif
-+     return result;
-+Index: ncurses/tinfo/init_keytry.c
-+Prereq:  1.8 
-+--- ncurses-5.6/ncurses/tinfo/init_keytry.c	2006-01-21 23:43:28.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/init_keytry.c	2007-04-29 22:57:50.000000000 +0000
-+@@ -36,7 +36,7 @@
-+ 
-+ #include <term_entry.h>
-+ 
-+-MODULE_ID("$Id: init_keytry.c,v 1.8 2006/01/21 23:43:28 tom Exp $")
-++MODULE_ID("$Id: init_keytry.c,v 1.10 2007/04/29 22:57:50 tom Exp $")
-+ 
-+ /*
-+ **      _nc_init_keytry()
-+@@ -56,7 +56,7 @@
-+ #endif*/
-+ 
-+ #if	BROKEN_LINKER
-+-struct tinfo_fkeys *
-++const struct tinfo_fkeys *
-+ _nc_tinfo_fkeysf(void)
-+ {
-+     return _nc_tinfo_fkeys;
-+@@ -76,9 +76,9 @@
-+     if (SP != 0) {
-+ 	for (n = 0; _nc_tinfo_fkeys[n].code; n++) {
-+ 	    if (_nc_tinfo_fkeys[n].offset < STRCOUNT) {
-+-		_nc_add_to_try(&(SP->_keytry),
-+-			       CUR Strings[_nc_tinfo_fkeys[n].offset],
-+-			       _nc_tinfo_fkeys[n].code);
-++		(void) _nc_add_to_try(&(SP->_keytry),
-++				      CUR Strings[_nc_tinfo_fkeys[n].offset],
-++				      _nc_tinfo_fkeys[n].code);
-+ 	    }
-+ 	}
-+ #if NCURSES_XNAMES
-+@@ -96,9 +96,9 @@
-+ 		    && *name == 'k'
-+ 		    && value != 0
-+ 		    && key_defined(value) == 0) {
-+-		    _nc_add_to_try(&(SP->_keytry),
-+-				   value,
-+-				   n - STRCOUNT + KEY_MAX);
-++		    (void) _nc_add_to_try(&(SP->_keytry),
-++					  value,
-++					  n - STRCOUNT + KEY_MAX);
-+ 		}
-+ 	    }
-+ 	}
-+Index: ncurses/tinfo/lib_acs.c
-+Prereq:  1.30 
-+--- ncurses-5.6/ncurses/tinfo/lib_acs.c	2006-01-07 21:27:15.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/lib_acs.c	2007-09-29 20:37:13.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -35,17 +35,18 @@
-+ #include <curses.priv.h>
-+ #include <term.h>		/* ena_acs, acs_chars */
-+ 
-+-MODULE_ID("$Id: lib_acs.c,v 1.30 2006/01/07 21:27:15 tom Exp $")
-++MODULE_ID("$Id: lib_acs.c,v 1.34 2007/09/29 20:37:13 tom Exp $")
-+ 
-+-#if BROKEN_LINKER
-++#if BROKEN_LINKER || USE_REENTRANT
-++#define MyBuffer _nc_prescreen.real_acs_map
-+ NCURSES_EXPORT_VAR(chtype *)
-+ _nc_acs_map(void)
-+ {
-+-    static chtype *the_map = 0;
-+-    if (the_map == 0)
-+-	the_map = typeCalloc(chtype, ACS_LEN);
-+-    return the_map;
-++    if (MyBuffer == 0)
-++	MyBuffer = typeCalloc(chtype, ACS_LEN);
-++    return MyBuffer;
-+ }
-++#undef MyBuffer
-+ #else
-+ NCURSES_EXPORT_VAR(chtype) acs_map[ACS_LEN] =
-+ {
-+@@ -117,16 +118,6 @@
-+     real_map['|'] = '!';	/* should be not-equal */
-+     real_map['}'] = 'f';	/* should be pound-sterling symbol */
-+ 
-+-#if !USE_WIDEC_SUPPORT
-+-    if (_nc_unicode_locale() && _nc_locale_breaks_acs()) {
-+-	acs_chars = NULL;
-+-	ena_acs = NULL;
-+-	enter_alt_charset_mode = NULL;
-+-	exit_alt_charset_mode = NULL;
-+-	set_attributes = NULL;
-+-    }
-+-#endif
-+-
-+     if (ena_acs != NULL) {
-+ 	TPUTS_TRACE("ena_acs");
-+ 	putp(ena_acs);
-+@@ -175,7 +166,7 @@
-+     /* Show the equivalent mapping, noting if it does not match the
-+      * given attribute, whether by re-ordering or duplication.
-+      */
-+-    if (_nc_tracing & TRACE_CALLS) {
-++    if (USE_TRACEF(TRACE_CALLS)) {
-+ 	size_t n, m;
-+ 	char show[ACS_LEN * 2 + 1];
-+ 	for (n = 1, m = 0; n < ACS_LEN; n++) {
-+@@ -196,6 +187,7 @@
-+ 		   ? "DIFF"
-+ 		   : "SAME"),
-+ 		_nc_visbuf(show));
-++	_nc_unlock_global(tracef);
-+     }
-+ #endif /* TRACE */
-+ }
-+Index: ncurses/tinfo/lib_baudrate.c
-+Prereq:  1.22 
-+--- ncurses-5.6/ncurses/tinfo/lib_baudrate.c	2002-01-19 23:07:53.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/lib_baudrate.c	2007-10-20 15:00:41.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998,2000,2002 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -29,6 +29,7 @@
-+ /****************************************************************************
-+  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
-+  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
-++ *     and: Thomas E. Dickey                        1996-on                 *
-+  ****************************************************************************/
-+ 
-+ /*
-+@@ -39,6 +40,9 @@
-+ #include <curses.priv.h>
-+ #include <term.h>		/* cur_term, pad_char */
-+ #include <termcap.h>		/* ospeed */
-++#if defined(__FreeBSD__)
-++#include <sys/param.h>
-++#endif
-+ 
-+ /*
-+  * These systems use similar header files, which define B1200 as 1200, etc.,
-+@@ -46,7 +50,7 @@
-+  * of the indices up to B115200 fit nicely in a 'short', allowing us to retain
-+  * ospeed's type for compatibility.
-+  */
-+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-++#if (defined(__FreeBSD__) && (__FreeBSD_version < 700000)) || defined(__NetBSD__) || defined(__OpenBSD__)
-+ #undef B0
-+ #undef B50
-+ #undef B75
-+@@ -76,7 +80,7 @@
-+ #undef USE_OLD_TTY
-+ #endif /* USE_OLD_TTY */
-+ 
-+-MODULE_ID("$Id: lib_baudrate.c,v 1.22 2002/01/19 23:07:53 Andrey.A.Chernov Exp $")
-++MODULE_ID("$Id: lib_baudrate.c,v 1.25 2007/10/20 15:00:41 Rong-En.Fan Exp $")
-+ 
-+ /*
-+  *	int
-+@@ -141,16 +145,20 @@
-+ NCURSES_EXPORT(int)
-+ _nc_baudrate(int OSpeed)
-+ {
-++#if !USE_REENTRANT
-+     static int last_OSpeed;
-+     static int last_baudrate;
-++#endif
-+ 
-+-    int result;
-++    int result = ERR;
-+     unsigned i;
-+ 
-++#if !USE_REENTRANT
-+     if (OSpeed == last_OSpeed) {
-+ 	result = last_baudrate;
-+-    } else {
-+-	result = ERR;
-++    }
-++#endif
-++    if (result == ERR) {
-+ 	if (OSpeed >= 0) {
-+ 	    for (i = 0; i < SIZEOF(speeds); i++) {
-+ 		if (speeds[i].s == OSpeed) {
-+@@ -159,7 +167,12 @@
-+ 		}
-+ 	    }
-+ 	}
-+-	last_baudrate = result;
-++#if !USE_REENTRANT
-++	if (OSpeed == last_OSpeed) {
-++	    last_OSpeed = OSpeed;
-++	    last_baudrate = result;
-++	}
-++#endif
-+     }
-+     return (result);
-+ }
-+Index: ncurses/tinfo/lib_data.c
-+Prereq:  1.17 
-+--- ncurses-5.6/ncurses/tinfo/lib_data.c	2005-01-22 17:39:22.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/lib_data.c	2007-11-03 20:24:15.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -41,15 +41,33 @@
-+ 
-+ #include <curses.priv.h>
-+ 
-+-MODULE_ID("$Id: lib_data.c,v 1.17 2005/01/22 17:39:22 tom Exp $")
-++MODULE_ID("$Id: lib_data.c,v 1.34 2007/10/20 21:49:10 tom Exp $")
-+ 
-+ /*
-+  * OS/2's native linker complains if we don't initialize public data when
-+  * constructing a dll (reported by J.J.G.Ripoll).
-+  */
-++#if USE_REENTRANT
-++NCURSES_EXPORT(WINDOW *)
-++NCURSES_PUBLIC_VAR(stdscr) (void)
-++{
-++    return SP ? SP->_stdscr : 0;
-++}
-++NCURSES_EXPORT(WINDOW *)
-++NCURSES_PUBLIC_VAR(curscr) (void)
-++{
-++    return SP ? SP->_curscr : 0;
-++}
-++NCURSES_EXPORT(WINDOW *)
-++NCURSES_PUBLIC_VAR(newscr) (void)
-++{
-++    return SP ? SP->_newscr : 0;
-++}
-++#else
-+ NCURSES_EXPORT_VAR(WINDOW *) stdscr = 0;
-+ NCURSES_EXPORT_VAR(WINDOW *) curscr = 0;
-+ NCURSES_EXPORT_VAR(WINDOW *) newscr = 0;
-++#endif
-+ 
-+ NCURSES_EXPORT_VAR(SCREEN *) _nc_screen_chain = 0;
-+ 
-+@@ -87,3 +105,129 @@
-+ #else
-+ NCURSES_EXPORT_VAR(SCREEN *) SP = NULL; /* Some linkers require initialized data... */
-+ #endif
-++/* *INDENT-OFF* */
-++#define CHARS_0s { '\0' }
-++
-++#define TGETENT_0 { 0L, FALSE, NULL, NULL, NULL }
-++#define TGETENT_0s { TGETENT_0, TGETENT_0, TGETENT_0, TGETENT_0 } 
-++
-++NCURSES_EXPORT_VAR(NCURSES_GLOBALS) _nc_globals = {
-++    0,				/* have_sigwinch */
-++    0,				/* cleanup_nested */
-++
-++    FALSE,			/* init_signals */
-++    FALSE,			/* init_screen */
-++
-++    NULL,			/* comp_sourcename */
-++    NULL,			/* comp_termtype */
-++
-++    FALSE,			/* have_tic_directory */
-++    FALSE,			/* keep_tic_directory */
-++    TERMINFO,			/* tic_directory */
-++
-++    NULL,			/* dbi_list */
-++    0,				/* dbi_size */
-++
-++    NULL,			/* first_name */
-++    NULL,			/* keyname_table */
-++
-++    NULL,			/* safeprint_buf */
-++    0,				/* safeprint_used */
-++
-++    TGETENT_0s,			/* tgetent_cache */
-++    0,				/* tgetent_index */
-++    0,				/* tgetent_sequence */
-++
-++#if USE_HOME_TERMINFO
-++    NULL,			/* home_terminfo */
-++#endif
-++
-++#if !USE_SAFE_SPRINTF
-++    0,				/* safeprint_cols */
-++    0,				/* safeprint_rows */
-++#endif
-++
-++#ifdef TRACE
-++    FALSE,			/* init_trace */
-++    CHARS_0s,			/* trace_fname */
-++    0,				/* trace_level */
-++    NULL,			/* trace_fp */
-++
-++    NULL,			/* tracearg_buf */
-++    0,				/* tracearg_used */
-++
-++    NULL,			/* tracebuf_ptr */
-++    0,				/* tracebuf_used */
-++
-++    CHARS_0s,			/* tracechr_buf */
-++
-++    NULL,			/* tracedmp_buf */
-++    0,				/* tracedmp_used */
-++
-++    CHARS_0s,			/* tracemse_buf */
-++
-++    NULL,			/* tracetry_buf */
-++    0,				/* tracetry_used */
-++
-++#ifndef USE_TERMLIB
-++    { CHARS_0s, CHARS_0s },	/* traceatr_color_buf */
-++    0,				/* traceatr_color_sel */
-++    -1,				/* traceatr_color_last */
-++#endif /* USE_TERMLIB */
-++
-++#endif /* TRACE */
-++#ifdef USE_PTHREADS
-++    PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP,	/* mutex_set_SP */
-++    PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP,	/* mutex_use_screen */
-++    PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP,	/* mutex_use_window */
-++    PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP,	/* mutex_windowlist */
-++    PTHREAD_MUTEX_INITIALIZER,	/* mutex_tst_tracef */
-++    PTHREAD_MUTEX_INITIALIZER,	/* mutex_tracef */
-++    0,				/* nested_tracef */
-++#endif
-++};
-++
-++#define STACK_FRAME_0	{ { 0 }, 0 }
-++#define STACK_FRAME_0s	{ STACK_FRAME_0 }
-++#define NUM_VARS_0s	{ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
-++
-++#define RIPOFF_0	{ 0,0 }
-++#define RIPOFF_0s	{ RIPOFF_0 }
-++
-++NCURSES_EXPORT_VAR(NCURSES_PRESCREEN) _nc_prescreen = {
-++    TRUE,			/* use_env */
-++    FALSE,			/* filter_mode */
-++    A_NORMAL,			/* previous_attr */
-++    RIPOFF_0s,			/* ripoff */
-++    NULL,			/* rsp */
-++    {				/* tparm_state */
-++#ifdef TRACE
-++	NULL,			/* tname */
-++#endif
-++	NULL,			/* tparam_base */
-++
-++	STACK_FRAME_0s,		/* stack */
-++	0,			/* stack_ptr */
-++
-++	NULL,			/* out_buff */
-++	0,			/* out_size */
-++	0,			/* out_used */
-++
-++	NULL,			/* fmt_buff */
-++	0,			/* fmt_size */
-++
-++	NUM_VARS_0s,		/* dynamic_var */
-++	NUM_VARS_0s,		/* static_vars */
-++    },
-++    NULL,			/* saved_tty */
-++#if BROKEN_LINKER || USE_REENTRANT
-++    NULL,			/* real_acs_map */
-++    0,				/* LINES */
-++    0,				/* COLS */
-++#ifdef TRACE
-++    0L,				/* _outchars */
-++    NULL,			/* _tputs_trace */
-++#endif
-++#endif
-++};
-++/* *INDENT-ON* */
-+Index: ncurses/tinfo/lib_options.c
-+Prereq:  1.49 
-+--- ncurses-5.6/ncurses/tinfo/lib_options.c	2006-03-04 19:28:25.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/lib_options.c	2006-12-30 16:03:27.000000000 +0000
-+@@ -43,7 +43,7 @@
-+ 
-+ #include <term.h>
-+ 
-+-MODULE_ID("$Id: lib_options.c,v 1.49 2006/03/04 19:28:25 tom Exp $")
-++MODULE_ID("$Id: lib_options.c,v 1.50 2006/12/30 16:03:27 tom Exp $")
-+ 
-+ NCURSES_EXPORT(int)
-+ idlok(WINDOW *win, bool flag)
-+@@ -220,7 +220,7 @@
-+ 
-+ #if NCURSES_EXT_FUNCS
-+ static int
-+-has_key_internal(int keycode, struct tries *tp)
-++has_key_internal(int keycode, TRIES *tp)
-+ {
-+     if (tp == 0)
-+ 	return (FALSE);
-+Index: ncurses/tinfo/lib_raw.c
-+Prereq:  1.13 
-+--- ncurses-5.6/ncurses/tinfo/lib_raw.c	2002-07-06 22:00:45.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/lib_raw.c	2007-09-29 21:50:22.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2001,2002 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2002,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -49,7 +49,7 @@
-+ #include <curses.priv.h>
-+ #include <term.h>		/* cur_term */
-+ 
-+-MODULE_ID("$Id: lib_raw.c,v 1.13 2002/07/06 22:00:45 tom Exp $")
-++MODULE_ID("$Id: lib_raw.c,v 1.14 2007/09/29 21:50:22 tom Exp $")
-+ 
-+ #if SVR4_TERMIO && !defined(_POSIX_SOURCE)
-+ #define _POSIX_SOURCE
-+@@ -69,8 +69,8 @@
-+ #define COOKED_INPUT	(IXON|BRKINT|PARMRK)
-+ 
-+ #ifdef TRACE
-+-#define BEFORE(N)	if (_nc_tracing&TRACE_BITS) _tracef("%s before bits: %s", N, _nc_tracebits())
-+-#define AFTER(N)	if (_nc_tracing&TRACE_BITS) _tracef("%s after bits: %s", N, _nc_tracebits())
-++#define BEFORE(N)	if (USE_TRACEF(TRACE_BITS)) _nc_locked_tracef("%s before bits: %s", N, _nc_tracebits())
-++#define AFTER(N)	if (USE_TRACEF(TRACE_BITS)) _nc_locked_tracef("%s after bits: %s", N, _nc_tracebits())
-+ #else
-+ #define BEFORE(s)
-+ #define AFTER(s)
-+Index: ncurses/tinfo/lib_setup.c
-+Prereq:  1.95 
-+--- ncurses-5.6/ncurses/tinfo/lib_setup.c	2006-07-28 22:58:13.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/lib_setup.c	2007-09-01 20:58:26.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -29,7 +29,7 @@
-+ /****************************************************************************
-+  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
-+  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
-+- *     and: Thomas E. Dickey 1996-2003                                      *
-++ *     and: Thomas E. Dickey                        1996-on                 *
-+  ****************************************************************************/
-+ 
-+ /*
-+@@ -53,7 +53,7 @@
-+ 
-+ #include <term.h>		/* lines, columns, cur_term */
-+ 
-+-MODULE_ID("$Id: lib_setup.c,v 1.95 2006/07/28 22:58:13 tom Exp $")
-++MODULE_ID("$Id: lib_setup.c,v 1.100 2007/09/01 20:58:26 tom Exp $")
-+ 
-+ /****************************************************************************
-+  *
-+@@ -99,55 +99,57 @@
-+ # endif
-+ #endif
-+ 
-++#if USE_REENTRANT
-++NCURSES_EXPORT(char *)
-++NCURSES_PUBLIC_VAR(ttytype) (void)
-++{
-++    static char empty[] = "";
-++    return cur_term ? cur_term->type.term_names : empty;
-++}
-++NCURSES_EXPORT(int)
-++NCURSES_PUBLIC_VAR(LINES) (void)
-++{
-++    return (SP ? SP->_LINES : _nc_prescreen._LINES);
-++}
-++NCURSES_EXPORT(int)
-++NCURSES_PUBLIC_VAR(COLS) (void)
-++{
-++    return SP ? SP->_COLS : _nc_prescreen._COLS;
-++}
-++NCURSES_EXPORT(int)
-++NCURSES_PUBLIC_VAR(TABSIZE) (void)
-++{
-++    return SP ? SP->_TABSIZE : 8;
-++}
-++#else
-+ NCURSES_EXPORT_VAR(char) ttytype[NAMESIZE] = "";
-+ NCURSES_EXPORT_VAR(int) LINES = 0;
-+ NCURSES_EXPORT_VAR(int) COLS = 0;
-+ NCURSES_EXPORT_VAR(int) TABSIZE = 0;
-+-
-+-static int _use_env = TRUE;
-++#endif
-+ 
-+ #if USE_SIGWINCH
-+-int
-+-_nc_handle_sigwinch(int enable)
-++/*
-++ * If we have a pending SIGWINCH, set the flag in each screen.
-++ */
-++NCURSES_EXPORT(int)
-++_nc_handle_sigwinch(int update)
-+ {
-+-    static int have_sigwinch = 0;	/* initially no SIGWINCH's */
-+-    static int can_resizeall = 1;	/* initially enabled */
-+     SCREEN *scan;
-+-    int result;
-+ 
-+-    switch (enable) {
-+-    default:
-+-	/* record a SIGWINCH */
-+-	have_sigwinch = 1;
-+-	break;
-+-    case 0:
-+-	/* temporarily disable the next block */
-+-	--can_resizeall;
-+-	break;
-+-    case 1:
-+-	/* temporarily enable the next block */
-+-	++can_resizeall;
-+-	break;
-+-    }
-++    (void) update;		/* no longer used */
-+ 
-+-    /*
-+-     * If we have a pending SIGWINCH, set the flag in each screen.
-+-     * But do this only if the block is enabled.
-+-     */
-+-    if (can_resizeall-- >= 0) {	/* test and disable */
-+-	if (have_sigwinch) {
-+-	    scan = _nc_screen_chain;
-+-	    while (scan) {
-+-		scan->_sig_winch = TRUE;
-+-		scan = scan->_next_screen;
-+-	    }
-+-	    have_sigwinch = 0;
-++    if (_nc_globals.have_sigwinch) {
-++	_nc_globals.have_sigwinch = 0;
-++
-++	scan = _nc_screen_chain;
-++	while (scan) {
-++	    scan->_sig_winch = TRUE;
-++	    scan = scan->_next_screen;
-+ 	}
-+     }
-+-    result = can_resizeall + 1;	/* reenable (unless disables are nested) */
-+-    can_resizeall = result;
-+ 
-+-    return result;
-++    return (SP ? SP->_sig_winch : 0);
-+ }
-+ 
-+ #endif
-+@@ -156,19 +158,20 @@
-+ use_env(bool f)
-+ {
-+     T((T_CALLED("use_env()")));
-+-    _use_env = f;
-++    _nc_prescreen.use_env = f;
-+     returnVoid;
-+ }
-+ 
-+-static void
-++NCURSES_EXPORT(void)
-+ _nc_get_screensize(int *linep, int *colp)
-+ /* Obtain lines/columns values from the environment and/or terminfo entry */
-+ {
-++    int my_tabsize;
-++
-+     /* figure out the size of the screen */
-+     T(("screen size: terminfo lines = %d columns = %d", lines, columns));
-+ 
-+-    _nc_handle_sigwinch(0);
-+-    if (!_use_env) {
-++    if (!_nc_prescreen.use_env) {
-+ 	*linep = (int) lines;
-+ 	*colp = (int) columns;
-+     } else {			/* usually want to query LINES and COLUMNS from environment */
-+@@ -246,14 +249,20 @@
-+ 	lines = (short) (*linep);
-+ 	columns = (short) (*colp);
-+     }
-+-    _nc_handle_sigwinch(1);
-+ 
-+     T(("screen size is %dx%d", *linep, *colp));
-+ 
-+     if (VALID_NUMERIC(init_tabs))
-+-	TABSIZE = (int) init_tabs;
-++	my_tabsize = (int) init_tabs;
-+     else
-+-	TABSIZE = 8;
-++	my_tabsize = 8;
-++
-++#if USE_REENTRANT
-++    if (SP != 0)
-++	SP->_TABSIZE = my_tabsize;
-++#else
-++    TABSIZE = my_tabsize;
-++#endif
-+     T(("TABSIZE = %d", TABSIZE));
-+ }
-+ 
-+@@ -536,8 +545,10 @@
-+ 	if (command_character && getenv("CC"))
-+ 	    do_prototype();
-+ 
-++#if !USE_REENTRANT
-+ 	strncpy(ttytype, cur_term->type.term_names, NAMESIZE - 1);
-+ 	ttytype[NAMESIZE - 1] = '\0';
-++#endif
-+ 
-+ 	cur_term->Filedes = Filedes;
-+ 	cur_term->_termname = strdup(tname);
-+@@ -557,13 +568,16 @@
-+     /*
-+      * We should always check the screensize, just in case.
-+      */
-++#if USE_REENTRANT
-++    _nc_get_screensize(SP ? &(SP->_LINES) : &(_nc_prescreen._LINES),
-++		       SP ? &(SP->_COLS) : &(_nc_prescreen._COLS));
-++#else
-+     _nc_get_screensize(&LINES, &COLS);
-++#endif
-+ 
-+     if (errret)
-+ 	*errret = TGETENT_YES;
-+ 
-+-    T((T_CREATE("screen %s %dx%d"), tname, LINES, COLS));
-+-
-+     if (generic_type) {
-+ 	ret_error(TGETENT_NO, "'%s': I need something more specific.\n", tname);
-+     }
-+Index: ncurses/tinfo/lib_termcap.c
-+Prereq:  1.58 
-+--- ncurses-5.6/ncurses/tinfo/lib_termcap.c	2006-09-02 19:39:46.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/lib_termcap.c	2007-06-02 19:36:03.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -45,26 +45,20 @@
-+ 
-+ #include <term_entry.h>
-+ 
-+-MODULE_ID("$Id: lib_termcap.c,v 1.58 2006/09/02 19:39:46 Miroslav.Lichvar Exp $")
-++MODULE_ID("$Id: lib_termcap.c,v 1.61 2007/06/02 19:36:03 tom Exp $")
-+ 
-+ NCURSES_EXPORT_VAR(char *) UP = 0;
-+ NCURSES_EXPORT_VAR(char *) BC = 0;
-+ 
-+-typedef struct {
-+-    long sequence;
-+-    char *fix_sgr0;		/* this holds the filtered sgr0 string */
-+-    char *last_bufp;		/* help with fix_sgr0 leak */
-+-    TERMINAL *last_term;
-+-} CACHE;
-+-
-+-#define MAX_CACHE 4
-+-static CACHE cache[MAX_CACHE];
-+-static int in_cache = 0;
-+-
-+-#define FIX_SGR0 cache[in_cache].fix_sgr0
-+-#define LAST_TRM cache[in_cache].last_term
-+-#define LAST_BUF cache[in_cache].last_bufp
-+-#define LAST_SEQ cache[in_cache].sequence
-++#define MyCache  _nc_globals.tgetent_cache
-++#define CacheInx _nc_globals.tgetent_index
-++#define CacheSeq _nc_globals.tgetent_sequence
-++
-++#define FIX_SGR0 MyCache[CacheInx].fix_sgr0
-++#define LAST_TRM MyCache[CacheInx].last_term
-++#define LAST_BUF MyCache[CacheInx].last_bufp
-++#define LAST_USE MyCache[CacheInx].last_used
-++#define LAST_SEQ MyCache[CacheInx].sequence
-+ 
-+ /***************************************************************************
-+  *
-+@@ -84,8 +78,6 @@
-+ NCURSES_EXPORT(int)
-+ tgetent(char *bufp, const char *name)
-+ {
-+-    static long sequence;
-+-
-+     int errcode;
-+     int n;
-+     bool found_cache = FALSE;
-+@@ -100,11 +92,17 @@
-+      * caller, but if tgetent() is called with the same buffer, that is
-+      * good enough, since the previous data would be invalidated by the
-+      * current call.
-++     *
-++     * bufp may be a null pointer, e.g., GNU termcap.  That allocates data,
-++     * which is good until the next tgetent() call.  The conventional termcap
-++     * is inconvenient because of the fixed buffer size, but because it uses
-++     * caller-supplied buffers, can have multiple terminal descriptions in
-++     * use at a given time.
-+      */
-+-    for (n = 0; n < MAX_CACHE; ++n) {
-+-	bool same_result = (bufp != 0 && cache[n].last_bufp == bufp);
-++    for (n = 0; n < TGETENT_MAX; ++n) {
-++	bool same_result = (MyCache[n].last_used && MyCache[n].last_bufp == bufp);
-+ 	if (same_result) {
-+-	    in_cache = n;
-++	    CacheInx = n;
-+ 	    if (FIX_SGR0 != 0) {
-+ 		FreeAndNull(FIX_SGR0);
-+ 	    }
-+@@ -114,10 +112,10 @@
-+ 	    if (LAST_TRM != 0 && LAST_TRM != cur_term) {
-+ 		TERMINAL *trm = LAST_TRM;
-+ 		del_curterm(LAST_TRM);
-+-		for (in_cache = 0; in_cache < MAX_CACHE; ++in_cache)
-++		for (CacheInx = 0; CacheInx < TGETENT_MAX; ++CacheInx)
-+ 		    if (LAST_TRM == trm)
-+ 			LAST_TRM = 0;
-+-		in_cache = n;
-++		CacheInx = n;
-+ 	    }
-+ 	    found_cache = TRUE;
-+ 	    break;
-+@@ -126,15 +124,15 @@
-+     if (!found_cache) {
-+ 	int best = 0;
-+ 
-+-	for (in_cache = 0; in_cache < MAX_CACHE; ++in_cache) {
-+-	    if (LAST_SEQ < cache[best].sequence) {
-+-		best = in_cache;
-++	for (CacheInx = 0; CacheInx < TGETENT_MAX; ++CacheInx) {
-++	    if (LAST_SEQ < MyCache[best].sequence) {
-++		best = CacheInx;
-+ 	    }
-+ 	}
-+-	in_cache = best;
-++	CacheInx = best;
-+     }
-+     LAST_TRM = cur_term;
-+-    LAST_SEQ = ++sequence;
-++    LAST_SEQ = ++CacheSeq;
-+ 
-+     PC = 0;
-+     UP = 0;
-+@@ -164,6 +162,7 @@
-+ 	    }
-+ 	}
-+ 	LAST_BUF = bufp;
-++	LAST_USE = TRUE;
-+ 
-+ 	(void) baudrate();	/* sets ospeed as a side-effect */
-+ 
-+@@ -282,9 +281,10 @@
-+ NCURSES_EXPORT(void)
-+ _nc_tgetent_leaks(void)
-+ {
-+-    for (in_cache = 0; in_cache < MAX_CACHE; ++in_cache) {
-++    for (CacheInx = 0; CacheInx < TGETENT_MAX; ++CacheInx) {
-+ 	FreeIfNeeded(FIX_SGR0);
-+-	del_curterm(LAST_TRM);
-++	if (LAST_TRM != 0)
-++	    del_curterm(LAST_TRM);
-+     }
-+ }
-+ #endif
-+Index: ncurses/tinfo/lib_tparm.c
-+Prereq:  1.71 
-+--- ncurses-5.6/ncurses/tinfo/lib_tparm.c	2006-11-26 01:12:56.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/lib_tparm.c	2007-09-29 20:37:13.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -43,7 +43,7 @@
-+ #include <term.h>
-+ #include <tic.h>
-+ 
-+-MODULE_ID("$Id: lib_tparm.c,v 1.71 2006/11/26 01:12:56 tom Exp $")
-++MODULE_ID("$Id: lib_tparm.c,v 1.74 2007/09/29 20:37:13 tom Exp $")
-+ 
-+ /*
-+  *	char *
-+@@ -105,43 +105,20 @@
-+  *	resulting in x mod y, not the reverse.
-+  */
-+ 
-+-#define STACKSIZE	20
-+-
-+-typedef struct {
-+-    union {
-+-	int num;
-+-	char *str;
-+-    } data;
-+-    bool num_type;
-+-} stack_frame;
-+-
-+ NCURSES_EXPORT_VAR(int) _nc_tparm_err = 0;
-+ 
-+-static stack_frame stack[STACKSIZE];
-+-static int stack_ptr;
-+-static const char *tparam_base = "";
-+-
-+-#ifdef TRACE
-+-static const char *tname;
-+-#endif /* TRACE */
-+-
-+-static char *out_buff;
-+-static size_t out_size;
-+-static size_t out_used;
-+-
-+-static char *fmt_buff;
-+-static size_t fmt_size;
-++#define TPS(var) _nc_prescreen.tparm_state.var
-+ 
-+ #if NO_LEAKS
-+ NCURSES_EXPORT(void)
-+ _nc_free_tparm(void)
-+ {
-+-    if (out_buff != 0) {
-+-	FreeAndNull(out_buff);
-+-	out_size = 0;
-+-	out_used = 0;
-+-	FreeAndNull(fmt_buff);
-+-	fmt_size = 0;
-++    if (TPS(out_buff) != 0) {
-++	FreeAndNull(TPS(out_buff));
-++	TPS(out_size) = 0;
-++	TPS(out_used) = 0;
-++	FreeAndNull(TPS(fmt_buff));
-++	TPS(fmt_size) = 0;
-+     }
-+ }
-+ #endif
-+@@ -149,11 +126,11 @@
-+ static NCURSES_INLINE void
-+ get_space(size_t need)
-+ {
-+-    need += out_used;
-+-    if (need > out_size) {
-+-	out_size = need * 2;
-+-	out_buff = typeRealloc(char, out_size, out_buff);
-+-	if (out_buff == 0)
-++    need += TPS(out_used);
-++    if (need > TPS(out_size)) {
-++	TPS(out_size) = need * 2;
-++	TPS(out_buff) = typeRealloc(char, TPS(out_size), TPS(out_buff));
-++	if (TPS(out_buff) == 0)
-+ 	    _nc_err_abort(MSG_NO_MEMORY);
-+     }
-+ }
-+@@ -167,8 +144,8 @@
-+ 
-+     get_space(s_len + 1);
-+ 
-+-    (void) sprintf(out_buff + out_used, fmt, s);
-+-    out_used += strlen(out_buff + out_used);
-++    (void) sprintf(TPS(out_buff) + TPS(out_used), fmt, s);
-++    TPS(out_used) += strlen(TPS(out_buff) + TPS(out_used));
-+ }
-+ 
-+ static NCURSES_INLINE void
-+@@ -179,8 +156,8 @@
-+ 
-+     get_space((unsigned) len + 1);
-+ 
-+-    (void) sprintf(out_buff + out_used, fmt, number);
-+-    out_used += strlen(out_buff + out_used);
-++    (void) sprintf(TPS(out_buff) + TPS(out_used), fmt, number);
-++    TPS(out_used) += strlen(TPS(out_buff) + TPS(out_used));
-+ }
-+ 
-+ static NCURSES_INLINE void
-+@@ -189,18 +166,18 @@
-+     if (c == 0)
-+ 	c = 0200;
-+     get_space(1);
-+-    out_buff[out_used++] = c;
-++    TPS(out_buff)[TPS(out_used)++] = c;
-+ }
-+ 
-+ static NCURSES_INLINE void
-+ npush(int x)
-+ {
-+-    if (stack_ptr < STACKSIZE) {
-+-	stack[stack_ptr].num_type = TRUE;
-+-	stack[stack_ptr].data.num = x;
-+-	stack_ptr++;
-++    if (TPS(stack_ptr) < STACKSIZE) {
-++	TPS(stack)[TPS(stack_ptr)].num_type = TRUE;
-++	TPS(stack)[TPS(stack_ptr)].data.num = x;
-++	TPS(stack_ptr)++;
-+     } else {
-+-	DEBUG(2, ("npush: stack overflow: %s", _nc_visbuf(tparam_base)));
-++	DEBUG(2, ("npush: stack overflow: %s", _nc_visbuf(TPS(tparam_base))));
-+ 	_nc_tparm_err++;
-+     }
-+ }
-+@@ -209,12 +186,12 @@
-+ npop(void)
-+ {
-+     int result = 0;
-+-    if (stack_ptr > 0) {
-+-	stack_ptr--;
-+-	if (stack[stack_ptr].num_type)
-+-	    result = stack[stack_ptr].data.num;
-++    if (TPS(stack_ptr) > 0) {
-++	TPS(stack_ptr)--;
-++	if (TPS(stack)[TPS(stack_ptr)].num_type)
-++	    result = TPS(stack)[TPS(stack_ptr)].data.num;
-+     } else {
-+-	DEBUG(2, ("npop: stack underflow: %s", _nc_visbuf(tparam_base)));
-++	DEBUG(2, ("npop: stack underflow: %s", _nc_visbuf(TPS(tparam_base))));
-+ 	_nc_tparm_err++;
-+     }
-+     return result;
-+@@ -223,12 +200,12 @@
-+ static NCURSES_INLINE void
-+ spush(char *x)
-+ {
-+-    if (stack_ptr < STACKSIZE) {
-+-	stack[stack_ptr].num_type = FALSE;
-+-	stack[stack_ptr].data.str = x;
-+-	stack_ptr++;
-++    if (TPS(stack_ptr) < STACKSIZE) {
-++	TPS(stack)[TPS(stack_ptr)].num_type = FALSE;
-++	TPS(stack)[TPS(stack_ptr)].data.str = x;
-++	TPS(stack_ptr)++;
-+     } else {
-+-	DEBUG(2, ("spush: stack overflow: %s", _nc_visbuf(tparam_base)));
-++	DEBUG(2, ("spush: stack overflow: %s", _nc_visbuf(TPS(tparam_base))));
-+ 	_nc_tparm_err++;
-+     }
-+ }
-+@@ -238,12 +215,13 @@
-+ {
-+     static char dummy[] = "";	/* avoid const-cast */
-+     char *result = dummy;
-+-    if (stack_ptr > 0) {
-+-	stack_ptr--;
-+-	if (!stack[stack_ptr].num_type && stack[stack_ptr].data.str != 0)
-+-	    result = stack[stack_ptr].data.str;
-++    if (TPS(stack_ptr) > 0) {
-++	TPS(stack_ptr)--;
-++	if (!TPS(stack)[TPS(stack_ptr)].num_type
-++	    && TPS(stack)[TPS(stack_ptr)].data.str != 0)
-++	    result = TPS(stack)[TPS(stack_ptr)].data.str;
-+     } else {
-+-	DEBUG(2, ("spop: stack underflow: %s", _nc_visbuf(tparam_base)));
-++	DEBUG(2, ("spop: stack underflow: %s", _nc_visbuf(TPS(tparam_base))));
-+ 	_nc_tparm_err++;
-+     }
-+     return result;
-+@@ -369,10 +347,11 @@
-+     if (cp == 0)
-+ 	return 0;
-+ 
-+-    if ((len2 = strlen(cp)) > fmt_size) {
-+-	fmt_size = len2 + fmt_size + 2;
-+-	if ((fmt_buff = typeRealloc(char, fmt_size, fmt_buff)) == 0)
-+-	      return 0;
-++    if ((len2 = strlen(cp)) > TPS(fmt_size)) {
-++	TPS(fmt_size) = len2 + TPS(fmt_size) + 2;
-++	TPS(fmt_buff) = typeRealloc(char, TPS(fmt_size), TPS(fmt_buff));
-++	if (TPS(fmt_buff) == 0)
-++	    return 0;
-+     }
-+ 
-+     memset(p_is_s, 0, sizeof(p_is_s[0]) * NUM_PARM);
-+@@ -381,7 +360,7 @@
-+     while ((cp - string) < (int) len2) {
-+ 	if (*cp == '%') {
-+ 	    cp++;
-+-	    cp = parse_format(cp, fmt_buff, &len);
-++	    cp = parse_format(cp, TPS(fmt_buff), &len);
-+ 	    switch (*cp) {
-+ 	    default:
-+ 		break;
-+@@ -474,7 +453,6 @@
-+ static NCURSES_INLINE char *
-+ tparam_internal(const char *string, va_list ap)
-+ {
-+-#define NUM_VARS 26
-+     char *p_is_s[NUM_PARM];
-+     TPARM_ARG param[NUM_PARM];
-+     int popcount;
-+@@ -485,13 +463,11 @@
-+     int i;
-+     const char *cp = string;
-+     size_t len2;
-+-    static int dynamic_var[NUM_VARS];
-+-    static int static_vars[NUM_VARS];
-+ 
-+     if (cp == NULL)
-+ 	return NULL;
-+ 
-+-    out_used = 0;
-++    TPS(out_used) = 0;
-+     len2 = strlen(cp);
-+ 
-+     /*
-+@@ -500,7 +476,7 @@
-+      * variable-length argument list.
-+      */
-+     number = _nc_tparm_analyze(cp, p_is_s, &popcount);
-+-    if (fmt_buff == 0)
-++    if (TPS(fmt_buff) == 0)
-+ 	return NULL;
-+ 
-+     for (i = 0; i < max(popcount, number); i++) {
-+@@ -525,22 +501,23 @@
-+      * the expansion of (for example) \E[%d;%dH work correctly in termcap
-+      * style, which means tparam() will expand termcap strings OK.
-+      */
-+-    stack_ptr = 0;
-++    TPS(stack_ptr) = 0;
-+     if (popcount == 0) {
-+ 	popcount = number;
-+ 	for (i = number - 1; i >= 0; i--)
-+ 	    npush(param[i]);
-+     }
-+ #ifdef TRACE
-+-    if (_nc_tracing & TRACE_CALLS) {
-++    if (USE_TRACEF(TRACE_CALLS)) {
-+ 	for (i = 0; i < popcount; i++) {
-+ 	    if (p_is_s[i] != 0)
-+ 		save_text(", %s", _nc_visbuf(p_is_s[i]), 0);
-+ 	    else
-+ 		save_number(", %d", param[i], 0);
-+ 	}
-+-	_tracef(T_CALLED("%s(%s%s)"), tname, _nc_visbuf(cp), out_buff);
-+-	out_used = 0;
-++	_tracef(T_CALLED("%s(%s%s)"), TPS(tname), _nc_visbuf(cp), TPS(out_buff));
-++	TPS(out_used) = 0;
-++	_nc_unlock_global(tracef);
-+     }
-+ #endif /* TRACE */
-+ 
-+@@ -548,8 +525,8 @@
-+ 	if (*cp != '%') {
-+ 	    save_char(UChar(*cp));
-+ 	} else {
-+-	    tparam_base = cp++;
-+-	    cp = parse_format(cp, fmt_buff, &len);
-++	    TPS(tparam_base) = cp++;
-++	    cp = parse_format(cp, TPS(fmt_buff), &len);
-+ 	    switch (*cp) {
-+ 	    default:
-+ 		break;
-+@@ -561,7 +538,7 @@
-+ 	    case 'o':		/* FALLTHRU */
-+ 	    case 'x':		/* FALLTHRU */
-+ 	    case 'X':		/* FALLTHRU */
-+-		save_number(fmt_buff, npop(), len);
-++		save_number(TPS(fmt_buff), npop(), len);
-+ 		break;
-+ 
-+ 	    case 'c':		/* FALLTHRU */
-+@@ -573,7 +550,7 @@
-+ 		break;
-+ 
-+ 	    case 's':
-+-		save_text(fmt_buff, spop(), len);
-++		save_text(TPS(fmt_buff), spop(), len);
-+ 		break;
-+ 
-+ 	    case 'p':
-+@@ -591,10 +568,10 @@
-+ 		cp++;
-+ 		if (isUPPER(*cp)) {
-+ 		    i = (UChar(*cp) - 'A');
-+-		    static_vars[i] = npop();
-++		    TPS(static_vars)[i] = npop();
-+ 		} else if (isLOWER(*cp)) {
-+ 		    i = (UChar(*cp) - 'a');
-+-		    dynamic_var[i] = npop();
-++		    TPS(dynamic_var)[i] = npop();
-+ 		}
-+ 		break;
-+ 
-+@@ -602,10 +579,10 @@
-+ 		cp++;
-+ 		if (isUPPER(*cp)) {
-+ 		    i = (UChar(*cp) - 'A');
-+-		    npush(static_vars[i]);
-++		    npush(TPS(static_vars)[i]);
-+ 		} else if (isLOWER(*cp)) {
-+ 		    i = (UChar(*cp) - 'a');
-+-		    npush(dynamic_var[i]);
-++		    npush(TPS(dynamic_var)[i]);
-+ 		}
-+ 		break;
-+ 
-+@@ -768,10 +745,10 @@
-+     }				/* endwhile (*cp) */
-+ 
-+     get_space(1);
-+-    out_buff[out_used] = '\0';
-++    TPS(out_buff)[TPS(out_used)] = '\0';
-+ 
-+-    T((T_RETURN("%s"), _nc_visbuf(out_buff)));
-+-    return (out_buff);
-++    T((T_RETURN("%s"), _nc_visbuf(TPS(out_buff))));
-++    return (TPS(out_buff));
-+ }
-+ 
-+ #if NCURSES_TPARM_VARARGS
-+@@ -789,7 +766,7 @@
-+     _nc_tparm_err = 0;
-+     va_start(ap, string);
-+ #ifdef TRACE
-+-    tname = "tparm";
-++    TPS(tname) = "tparm";
-+ #endif /* TRACE */
-+     result = tparam_internal(string, ap);
-+     va_end(ap);
-+Index: ncurses/tinfo/lib_tputs.c
-+Prereq:  1.62 
-+--- ncurses-5.6/ncurses/tinfo/lib_tputs.c	2003-08-23 21:39:20.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/lib_tputs.c	2007-09-29 20:37:13.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2002,2003 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2003,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -45,12 +45,12 @@
-+ #include <termcap.h>		/* ospeed */
-+ #include <tic.h>
-+ 
-+-MODULE_ID("$Id: lib_tputs.c,v 1.62 2003/08/23 21:39:20 tom Exp $")
-++MODULE_ID("$Id: lib_tputs.c,v 1.64 2007/09/29 20:37:13 tom Exp $")
-+ 
-+-NCURSES_EXPORT_VAR(char) PC = 0;		/* used by termcap library */
-+-NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0;	/* used by termcap library */
-++NCURSES_EXPORT_VAR(char) PC = 0;              /* used by termcap library */
-++NCURSES_EXPORT_VAR(NCURSES_OSPEED) ospeed = 0;        /* used by termcap library */
-+ 
-+-NCURSES_EXPORT_VAR(int) _nc_nulls_sent = 0;	/* used by 'tack' program */
-++NCURSES_EXPORT_VAR(int) _nc_nulls_sent = 0;   /* used by 'tack' program */
-+ 
-+ static int (*my_outch) (int c) = _nc_outch;
-+ 
-+@@ -84,7 +84,7 @@
-+ NCURSES_EXPORT(int)
-+ _nc_outch(int ch)
-+ {
-+-    TRACE_OUTCHARS(1);
-++    COUNT_OUTCHARS(1);
-+ 
-+     if (SP != 0
-+ 	&& SP->_cleanup) {
-+@@ -119,7 +119,7 @@
-+ #ifdef TRACE
-+     char addrbuf[32];
-+ 
-+-    if (_nc_tracing & TRACE_TPUTS) {
-++    if (USE_TRACEF(TRACE_TPUTS)) {
-+ 	if (outc == _nc_outch)
-+ 	    (void) strcpy(addrbuf, "_nc_outch");
-+ 	else
-+@@ -130,7 +130,8 @@
-+ 	} else {
-+ 	    _tracef("tputs(%s, %d, %s) called", _nc_visbuf(string), affcnt, addrbuf);
-+ 	}
-+-	_nc_tputs_trace = (char *) NULL;
-++	TPUTS_TRACE(NULL);
-++	_nc_unlock_global(tracef);
-+     }
-+ #endif /* TRACE */
-+ 
-+Index: ncurses/tinfo/lib_ttyflags.c
-+Prereq:  1.13 
-+--- ncurses-5.6/ncurses/tinfo/lib_ttyflags.c	2006-12-10 01:31:54.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/lib_ttyflags.c	2007-05-26 18:54:25.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -38,31 +38,35 @@
-+ #include <curses.priv.h>
-+ #include <term.h>		/* cur_term */
-+ 
-+-MODULE_ID("$Id: lib_ttyflags.c,v 1.13 2006/12/10 01:31:54 tom Exp $")
-++MODULE_ID("$Id: lib_ttyflags.c,v 1.15 2007/05/26 18:54:25 tom Exp $")
-+ 
-+ NCURSES_EXPORT(int)
-+ _nc_get_tty_mode(TTY * buf)
-+ {
-+     int result = OK;
-+ 
-+-    if (cur_term == 0) {
-++    if (buf == 0) {
-+ 	result = ERR;
-+     } else {
-+-	for (;;) {
-+-	    if (GET_TTY(cur_term->Filedes, buf) != 0) {
-+-		if (errno == EINTR)
-+-		    continue;
-+-		result = ERR;
-++	if (cur_term == 0) {
-++	    result = ERR;
-++	} else {
-++	    for (;;) {
-++		if (GET_TTY(cur_term->Filedes, buf) != 0) {
-++		    if (errno == EINTR)
-++			continue;
-++		    result = ERR;
-++		}
-++		break;
-+ 	    }
-+-	    break;
-+ 	}
-+-    }
-+ 
-+-    if (result == ERR)
-+-	memset(buf, 0, sizeof(*buf));
-++	if (result == ERR)
-++	    memset(buf, 0, sizeof(*buf));
-+ 
-+-    TR(TRACE_BITS, ("_nc_get_tty_mode(%d): %s",
-+-		    cur_term->Filedes, _nc_trace_ttymode(buf)));
-++	TR(TRACE_BITS, ("_nc_get_tty_mode(%d): %s",
-++			cur_term->Filedes, _nc_trace_ttymode(buf)));
-++    }
-+     return (result);
-+ }
-+ 
-+@@ -71,22 +75,26 @@
-+ {
-+     int result = OK;
-+ 
-+-    if (cur_term == 0) {
-++    if (buf == 0) {
-+ 	result = ERR;
-+     } else {
-+-	for (;;) {
-+-	    if (SET_TTY(cur_term->Filedes, buf) != 0) {
-+-		if (errno == EINTR)
-+-		    continue;
-+-		if ((errno == ENOTTY) && (SP != 0))
-+-		    SP->_notty = TRUE;
-+-		result = ERR;
-++	if (cur_term == 0) {
-++	    result = ERR;
-++	} else {
-++	    for (;;) {
-++		if (SET_TTY(cur_term->Filedes, buf) != 0) {
-++		    if (errno == EINTR)
-++			continue;
-++		    if ((errno == ENOTTY) && (SP != 0))
-++			SP->_notty = TRUE;
-++		    result = ERR;
-++		}
-++		break;
-+ 	    }
-+-	    break;
-+ 	}
-++	TR(TRACE_BITS, ("_nc_set_tty_mode(%d): %s",
-++			cur_term->Filedes, _nc_trace_ttymode(buf)));
-+     }
-+-    TR(TRACE_BITS, ("_nc_set_tty_mode(%d): %s",
-+-		    cur_term->Filedes, _nc_trace_ttymode(buf)));
-+     return (result);
-+ }
-+ 
-+@@ -164,19 +172,33 @@
-+     returnCode(ERR);
-+ }
-+ 
-++static TTY *
-++saved_tty(void)
-++{
-++    TTY *result = 0;
-++
-++    if (SP != 0) {
-++	result = &(SP->_saved_tty);
-++    } else {
-++	if (_nc_prescreen.saved_tty == 0) {
-++	    _nc_prescreen.saved_tty = typeCalloc(TTY, 1);
-++	}
-++	result = _nc_prescreen.saved_tty;
-++    }
-++    return result;
-++}
-++
-+ /*
-+ **	savetty()  and  resetty()
-+ **
-+ */
-+ 
-+-static TTY buf;
-+-
-+ NCURSES_EXPORT(int)
-+ savetty(void)
-+ {
-+     T((T_CALLED("savetty()")));
-+ 
-+-    returnCode(_nc_get_tty_mode(&buf));
-++    returnCode(_nc_get_tty_mode(saved_tty()));
-+ }
-+ 
-+ NCURSES_EXPORT(int)
-+@@ -184,5 +206,5 @@
-+ {
-+     T((T_CALLED("resetty()")));
-+ 
-+-    returnCode(_nc_set_tty_mode(&buf));
-++    returnCode(_nc_set_tty_mode(saved_tty()));
-+ }
-+Index: ncurses/tinfo/make_keys.c
-+Prereq:  1.12 
-+--- ncurses-5.6/ncurses/tinfo/make_keys.c	2005-08-20 19:58:18.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/make_keys.c	2007-01-07 00:00:14.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2000,2005 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -39,7 +39,7 @@
-+ #define USE_TERMLIB 1
-+ #include <curses.priv.h>
-+ 
-+-MODULE_ID("$Id: make_keys.c,v 1.12 2005/08/20 19:58:18 tom Exp $")
-++MODULE_ID("$Id: make_keys.c,v 1.13 2007/01/07 00:00:14 tom Exp $")
-+ 
-+ #include <names.c>
-+ 
-+@@ -113,7 +113,7 @@
-+ 	"#if BROKEN_LINKER",
-+ 	"static",
-+ 	"#endif",
-+-	"struct tinfo_fkeys _nc_tinfo_fkeys[] = {",
-++	"const struct tinfo_fkeys _nc_tinfo_fkeys[] = {",
-+ 	0
-+     };
-+     static const char *suffix[] =
-+Index: ncurses/tinfo/name_match.c
-+Prereq:  1.15 
-+--- ncurses-5.6/ncurses/tinfo/name_match.c	2005-01-22 21:47:25.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/name_match.c	2007-04-21 21:28:13.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1999-2004,2005 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1999-2005,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -34,38 +34,38 @@
-+ #include <term.h>
-+ #include <tic.h>
-+ 
-+-MODULE_ID("$Id: name_match.c,v 1.15 2005/01/22 21:47:25 tom Exp $")
-++MODULE_ID("$Id: name_match.c,v 1.16 2007/04/21 21:28:13 tom Exp $")
-+ 
-+ /*
-+  *	_nc_first_name(char *names)
-+  *
-+  *	Extract the primary name from a compiled entry.
-+  */
-++#define FirstName _nc_globals.first_name
-+ 
-+ NCURSES_EXPORT(char *)
-+ _nc_first_name(const char *const sp)
-+ /* get the first name from the given name list */
-+ {
-+-    static char *buf;
-+-    register unsigned n;
-++    unsigned n;
-+ 
-+ #if NO_LEAKS
-+     if (sp == 0) {
-+-	if (buf != 0)
-+-	    FreeAndNull(buf);	/* for leak-testing */
-++	if (FirstName != 0)
-++	    FreeAndNull(FirstName);
-+ 	return 0;
-+     }
-+ #endif
-+ 
-+-    if (buf == 0)
-+-	buf = typeMalloc(char, MAX_NAME_SIZE + 1);
-++    if (FirstName == 0)
-++	FirstName = typeMalloc(char, MAX_NAME_SIZE + 1);
-+     for (n = 0; n < MAX_NAME_SIZE; n++) {
-+-	if ((buf[n] = sp[n]) == '\0'
-+-	    || (buf[n] == '|'))
-++	if ((FirstName[n] = sp[n]) == '\0'
-++	    || (FirstName[n] == '|'))
-+ 	    break;
-+     }
-+-    buf[n] = '\0';
-+-    return (buf);
-++    FirstName[n] = '\0';
-++    return (FirstName);
-+ }
-+ 
-+ /*
-+Index: ncurses/tinfo/parse_entry.c
-+Prereq:  1.63 
-+--- ncurses-5.6/ncurses/tinfo/parse_entry.c	2006-06-17 17:57:50.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/parse_entry.c	2007-08-11 16:19:02.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -48,7 +48,7 @@
-+ #include <tic.h>
-+ #include <term_entry.h>
-+ 
-+-MODULE_ID("$Id: parse_entry.c,v 1.63 2006/06/17 17:57:50 tom Exp $")
-++MODULE_ID("$Id: parse_entry.c,v 1.65 2007/08/11 16:19:02 tom Exp $")
-+ 
-+ #ifdef LINT
-+ static short const parametrized[] =
-+@@ -283,7 +283,7 @@
-+ 	} else {
-+ 	    /* normal token lookup */
-+ 	    entry_ptr = _nc_find_entry(_nc_curr_token.tk_name,
-+-				       _nc_syntax ? _nc_cap_hash_table : _nc_info_hash_table);
-++				       _nc_get_hash_table(_nc_syntax));
-+ 
-+ 	    /*
-+ 	     * Our kluge to handle aliasing.  The reason it's done
-+@@ -300,7 +300,7 @@
-+ 		    if (entryp->nuses != 0) {
-+ 			BAD_TC_USAGE
-+ 		    }
-+-		    for (ap = _nc_capalias_table; ap->from; ap++)
-++		    for (ap = _nc_get_alias_table(TRUE); ap->from; ap++)
-+ 			if (strcmp(ap->from, _nc_curr_token.tk_name) == 0) {
-+ 			    if (ap->to == (char *) 0) {
-+ 				_nc_warning("%s (%s termcap extension) ignored",
-+@@ -308,14 +308,15 @@
-+ 				goto nexttok;
-+ 			    }
-+ 
-+-			    entry_ptr = _nc_find_entry(ap->to, _nc_cap_hash_table);
-++			    entry_ptr = _nc_find_entry(ap->to,
-++						       _nc_get_hash_table(TRUE));
-+ 			    if (entry_ptr && !silent)
-+ 				_nc_warning("%s (%s termcap extension) aliased to %s",
-+ 					    ap->from, ap->source, ap->to);
-+ 			    break;
-+ 			}
-+ 		} else {	/* if (_nc_syntax == SYN_TERMINFO) */
-+-		    for (ap = _nc_infoalias_table; ap->from; ap++)
-++		    for (ap = _nc_get_alias_table(FALSE); ap->from; ap++)
-+ 			if (strcmp(ap->from, _nc_curr_token.tk_name) == 0) {
-+ 			    if (ap->to == (char *) 0) {
-+ 				_nc_warning("%s (%s terminfo extension) ignored",
-+@@ -323,7 +324,8 @@
-+ 				goto nexttok;
-+ 			    }
-+ 
-+-			    entry_ptr = _nc_find_entry(ap->to, _nc_info_hash_table);
-++			    entry_ptr = _nc_find_entry(ap->to,
-++						       _nc_get_hash_table(FALSE));
-+ 			    if (entry_ptr && !silent)
-+ 				_nc_warning("%s (%s terminfo extension) aliased to %s",
-+ 					    ap->from, ap->source, ap->to);
-+@@ -796,8 +798,8 @@
-+ 
-+ 	    /* now we know we found a match in ko_table, so... */
-+ 
-+-	    from_ptr = _nc_find_entry(ap->from, _nc_cap_hash_table);
-+-	    to_ptr = _nc_find_entry(ap->to, _nc_info_hash_table);
-++	    from_ptr = _nc_find_entry(ap->from, _nc_get_hash_table(TRUE));
-++	    to_ptr = _nc_find_entry(ap->to, _nc_get_hash_table(FALSE));
-+ 
-+ 	    if (!from_ptr || !to_ptr)	/* should never happen! */
-+ 		_nc_err_abort("ko translation table is invalid, I give up");
-+Index: ncurses/tinfo/read_entry.c
-+Prereq:  1.99 
-+--- ncurses-5.6/ncurses/tinfo/read_entry.c	2006-08-19 15:58:50.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/read_entry.c	2007-11-17 23:56:50.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -42,7 +42,7 @@
-+ #include <tic.h>
-+ #include <term_entry.h>
-+ 
-+-MODULE_ID("$Id: read_entry.c,v 1.99 2006/08/19 15:58:50 tom Exp $")
-++MODULE_ID("$Id: read_entry.c,v 1.100 2007/11/17 23:56:50 tom Exp $")
-+ 
-+ #define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts))
-+ 
-+@@ -409,7 +409,7 @@
-+ 	unsigned need = 4 + strlen(path) + strlen(name);
-+ 
-+ 	if (need <= limit) {
-+-	    (void) sprintf(filename, "%s/%c/%s", path, *name, name);
-++	    (void) sprintf(filename, "%s/" LEAF_FMT "/%s", path, *name, name);
-+ 	    result = _nc_read_file_entry(filename, tp);
-+ 	}
-+     }
-+Index: ncurses/tinfo/setbuf.c
-+Prereq:  1.12 
-+--- ncurses-5.6/ncurses/tinfo/setbuf.c	2003-11-15 23:55:34.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/setbuf.c	2007-05-12 19:04:02.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2000,2003 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2003,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -40,7 +40,7 @@
-+ 
-+ #include <curses.priv.h>
-+ 
-+-MODULE_ID("$Id: setbuf.c,v 1.12 2003/11/15 23:55:34 tom Exp $")
-++MODULE_ID("$Id: setbuf.c,v 1.13 2007/05/12 19:04:02 tom Exp $")
-+ 
-+ /*
-+  * If the output file descriptor is connected to a tty (the typical case) it
-+@@ -102,7 +102,7 @@
-+ {
-+     /* optional optimization hack -- do before any output to ofp */
-+ #if HAVE_SETVBUF || HAVE_SETBUFFER
-+-    if (SP->_buffered != (int)buffered) {
-++    if (SP->_buffered != buffered) {
-+ 	unsigned buf_len;
-+ 	char *buf_ptr;
-+ 
-+Index: ncurses/tinfo/strings.c
-+Prereq:  1.5 
-+--- ncurses-5.6/ncurses/tinfo/strings.c	2003-08-16 23:46:00.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/strings.c	2007-08-11 17:12:17.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 2000,2003 Free Software Foundation, Inc.                   *
-++ * Copyright (c) 2000-2003,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -36,7 +36,7 @@
-+ 
-+ #include <curses.priv.h>
-+ 
-+-MODULE_ID("$Id: strings.c,v 1.5 2003/08/16 23:46:00 tom Exp $")
-++MODULE_ID("$Id: strings.c,v 1.6 2007/08/11 17:12:17 tom Exp $")
-+ 
-+ /****************************************************************************
-+  * Useful string functions (especially for mvcur)
-+@@ -52,7 +52,7 @@
-+ 
-+     while ((len1 != 0) && (len1-- >= len2)) {
-+ 	if (!strncmp(haystack, needle, len2)) {
-+-	    result = haystack;
-++	    result = (char *) haystack;
-+ 	    break;
-+ 	}
-+ 	haystack++;
-+Index: ncurses/tinfo/trim_sgr0.c
-+Prereq:  1.7 
-+--- ncurses-5.6/ncurses/tinfo/trim_sgr0.c	2006-12-02 19:37:57.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/trim_sgr0.c	2007-04-07 17:14:11.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 2005 Free Software Foundation, Inc.                        *
-++ * Copyright (c) 2005-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -37,7 +37,7 @@
-+ #include <tic.h>
-+ #include <term_entry.h>
-+ 
-+-MODULE_ID("$Id: trim_sgr0.c,v 1.7 2006/12/02 19:37:57 tom Exp $")
-++MODULE_ID("$Id: trim_sgr0.c,v 1.8 2007/04/07 17:14:11 tom Exp $")
-+ 
-+ #undef CUR
-+ #define CUR tp->
-+@@ -247,9 +247,7 @@
-+ 	if (!rewrite_sgr(on, enter_alt_charset_mode)
-+ 	    || !rewrite_sgr(off, exit_alt_charset_mode)
-+ 	    || !rewrite_sgr(end, exit_alt_charset_mode)) {
-+-	    FreeIfNeeded(on);
-+ 	    FreeIfNeeded(off);
-+-	    FreeIfNeeded(end);
-+ 	} else if (similar_sgr(off, end)
-+ 		   && !similar_sgr(off, on)) {
-+ 	    TR(TRACE_DATABASE, ("adjusting sgr(9:off) : %s", _nc_visbuf(off)));
-+@@ -315,8 +313,8 @@
-+ 	     */
-+ 	    free(off);
-+ 	}
-+-	free(end);
-+-	free(on);
-++	FreeIfNeeded(end);
-++	FreeIfNeeded(on);
-+     } else {
-+ 	/*
-+ 	 * Possibly some applications are confused if sgr0 contains rmacs,
-+Index: ncurses/tinfo/use_screen.c
-+--- /dev/null	2007-12-08 19:14:25.328509000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/use_screen.c	2007-10-20 22:46:13.000000000 +0000
-+@@ -0,0 +1,60 @@
-++/****************************************************************************
-++ * Copyright (c) 2007 Free Software Foundation, Inc.                        *
-++ *                                                                          *
-++ * Permission is hereby granted, free of charge, to any person obtaining a  *
-++ * copy of this software and associated documentation files (the            *
-++ * "Software"), to deal in the Software without restriction, including      *
-++ * without limitation the rights to use, copy, modify, merge, publish,      *
-++ * distribute, distribute with modifications, sublicense, and/or sell       *
-++ * copies of the Software, and to permit persons to whom the Software is    *
-++ * furnished to do so, subject to the following conditions:                 *
-++ *                                                                          *
-++ * The above copyright notice and this permission notice shall be included  *
-++ * in all copies or substantial portions of the Software.                   *
-++ *                                                                          *
-++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-++ *                                                                          *
-++ * Except as contained in this notice, the name(s) of the above copyright   *
-++ * holders shall not be used in advertising or otherwise to promote the     *
-++ * sale, use or other dealings in this Software without prior written       *
-++ * authorization.                                                           *
-++ ****************************************************************************/
-++
-++/****************************************************************************
-++ *     Author: Thomas E. Dickey                        2007                 *
-++ ****************************************************************************/
-++
-++#include <curses.priv.h>
-++
-++MODULE_ID("$Id: use_screen.c,v 1.2 2007/09/08 21:46:48 tom Exp $")
-++
-++NCURSES_EXPORT(int)
-++use_screen(SCREEN *screen, NCURSES_CALLBACK func, void *data)
-++{
-++    SCREEN *save_SP;
-++    int code = OK;
-++
-++    T((T_CALLED("use_screen(%p,%p,%p)"), screen, func, data));
-++
-++    /*
-++     * FIXME - add a flag so a given thread can check if _it_ has already
-++     * recurred through this point, return an error if so.
-++     */
-++    _nc_lock_global(use_screen);
-++    save_SP = SP;
-++    set_term(screen);
-++
-++    code = func(screen->_stdscr, data);
-++
-++    set_term(save_SP);
-++    _nc_unlock_global(use_screen);
-++    returnCode(code);
-++
-++    return 0;
-++}
-+Index: ncurses/tinfo/write_entry.c
-+Prereq:  1.68 
-+--- ncurses-5.6/ncurses/tinfo/write_entry.c	2006-10-14 20:45:16.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tinfo/write_entry.c	2007-11-17 23:38:28.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -54,7 +54,7 @@
-+ #define TRACE_OUT(p)		/*nothing */
-+ #endif
-+ 
-+-MODULE_ID("$Id: write_entry.c,v 1.68 2006/10/14 20:45:16 tom Exp $")
-++MODULE_ID("$Id: write_entry.c,v 1.70 2007/11/17 23:38:28 tom Exp $")
-+ 
-+ static int total_written;
-+ 
-+@@ -97,17 +97,16 @@
-+     static const char dirnames[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-+     static bool verified[sizeof(dirnames)];
-+ 
-+-    char dir[2];
-++    char dir[sizeof(LEAF_FMT)];
-+     char *s = 0;
-+ 
-+     if (code == 0 || (s = strchr(dirnames, code)) == 0)
-+-	_nc_err_abort("Illegal terminfo subdirectory \"%c\"", code);
-++	_nc_err_abort("Illegal terminfo subdirectory \"" LEAF_FMT "\"", code);
-+ 
-+     if (verified[s - dirnames])
-+ 	return;
-+ 
-+-    dir[0] = code;
-+-    dir[1] = '\0';
-++    sprintf(dir, LEAF_FMT, code);
-+     if (make_db_root(dir) < 0) {
-+ 	_nc_err_abort("%s/%s: permission denied", _nc_tic_dir(0), dir);
-+     }
-+@@ -358,7 +357,7 @@
-+     if (strlen(first_name) > sizeof(filename) - 3)
-+ 	_nc_warning("terminal name too long.");
-+ 
-+-    sprintf(filename, "%c/%s", first_name[0], first_name);
-++    sprintf(filename, LEAF_FMT "/%s", first_name[0], first_name);
-+ 
-+     /*
-+      * Has this primary name been written since the first call to
-+@@ -399,7 +398,7 @@
-+ 	}
-+ 
-+ 	check_writeable(ptr[0]);
-+-	sprintf(linkname, "%c/%s", ptr[0], ptr);
-++	sprintf(linkname, LEAF_FMT "/%s", ptr[0], ptr);
-+ 
-+ 	if (strcmp(filename, linkname) == 0) {
-+ 	    _nc_warning("self-synonym ignored");
-+@@ -502,7 +501,8 @@
-+ 	} else {
-+ 	    offsets[i] = nextfree;
-+ 	    nextfree += strlen(Strings[i]) + 1;
-+-	    TRACE_OUT(("put Strings[%d]=%s(%d)", i, _nc_visbuf(Strings[i]), nextfree));
-++	    TRACE_OUT(("put Strings[%d]=%s(%d)", (int) i,
-++		       _nc_visbuf(Strings[i]), nextfree));
-+ 	}
-+     }
-+     return nextfree;
-+@@ -740,7 +740,7 @@
-+ 	 */
-+ 	for (i = 0; i < tp->ext_Strings; i++) {
-+ 	    if (VALID_STRING(tp->Strings[i + STRCOUNT])) {
-+-		TRACE_OUT(("WRITE ext_Strings[%d]=%s", i,
-++		TRACE_OUT(("WRITE ext_Strings[%d]=%s", (int) i,
-+ 			   _nc_visbuf(tp->Strings[i + STRCOUNT])));
-+ 		if (!WRITE_STRING(tp->Strings[i + STRCOUNT]))
-+ 		    return (ERR);
-+@@ -751,7 +751,7 @@
-+ 	 * Write the extended names
-+ 	 */
-+ 	for (i = 0; i < extcnt; i++) {
-+-	    TRACE_OUT(("WRITE ext_Names[%d]=%s", i, tp->ext_Names[i]));
-++	    TRACE_OUT(("WRITE ext_Names[%d]=%s", (int) i, tp->ext_Names[i]));
-+ 	    if (!WRITE_STRING(tp->ext_Names[i]))
-+ 		return (ERR);
-+ 	}
-+Index: ncurses/trace/lib_trace.c
-+Prereq:  1.59 
-+--- ncurses-5.6/ncurses/trace/lib_trace.c	2006-08-19 12:05:25.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/trace/lib_trace.c	2007-09-29 21:47:46.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -46,37 +46,69 @@
-+ 
-+ #include <ctype.h>
-+ 
-+-MODULE_ID("$Id: lib_trace.c,v 1.59 2006/08/19 12:05:25 tom Exp $")
-++MODULE_ID("$Id: lib_trace.c,v 1.65 2007/09/29 21:47:46 tom Exp $")
-+ 
-+ NCURSES_EXPORT_VAR(unsigned) _nc_tracing = 0; /* always define this */
-+ 
-+ #ifdef TRACE
-++
-++#if USE_REENTRANT
-++NCURSES_EXPORT(const char *)
-++NCURSES_PUBLIC_VAR(_nc_tputs_trace) (void)
-++{
-++    return SP ? SP->_tputs_trace : _nc_prescreen._tputs_trace;
-++}
-++NCURSES_EXPORT(long)
-++NCURSES_PUBLIC_VAR(_nc_outchars) (void)
-++{
-++    return SP ? SP->_outchars : _nc_prescreen._outchars;
-++}
-++NCURSES_EXPORT(void)
-++_nc_set_tputs_trace(const char *s)
-++{
-++    if (SP)
-++	SP->_tputs_trace = s;
-++    else
-++	_nc_prescreen._tputs_trace = s;
-++}
-++NCURSES_EXPORT(void)
-++_nc_count_outchars(long increment)
-++{
-++    if (SP)
-++	SP->_outchars += increment;
-++    else
-++	_nc_prescreen._outchars += increment;
-++}
-++#else
-+ NCURSES_EXPORT_VAR(const char *) _nc_tputs_trace = "";
-+ NCURSES_EXPORT_VAR(long) _nc_outchars = 0;
-++#endif
-+ 
-+-static FILE *tracefp = 0;	/* default to writing to stderr */
-++#define TraceFP		_nc_globals.trace_fp
-++#define TracePath	_nc_globals.trace_fname
-++#define TraceLevel	_nc_globals.trace_level
-+ 
-+ NCURSES_EXPORT(void)
-+ trace(const unsigned int tracelevel)
-+ {
-+-    static bool been_here = FALSE;
-+-    static char my_name[PATH_MAX];
-+-
-+-    if ((tracefp == 0) && tracelevel) {
-+-	const char *mode = been_here ? "ab" : "wb";
-++    if ((TraceFP == 0) && tracelevel) {
-++	const char *mode = _nc_globals.init_trace ? "ab" : "wb";
-+ 
-+-	if (*my_name == '\0') {
-+-	    if (getcwd(my_name, sizeof(my_name) - 10) == 0) {
-++	if (TracePath[0] == '\0') {
-++	    if (getcwd(TracePath, sizeof(TracePath) - 12) == 0) {
-+ 		perror("curses: Can't get working directory");
-+ 		exit(EXIT_FAILURE);
-+ 	    }
-+-	    strcat(my_name, "/trace");
-++	    strcat(TracePath, "/trace");
-++	    if (_nc_is_dir_path(TracePath)) {
-++		strcat(TracePath, ".log");
-++	    }
-+ 	}
-+ 
-+-	been_here = TRUE;
-++	_nc_globals.init_trace = TRUE;
-+ 	_nc_tracing = tracelevel;
-+-	if (_nc_access(my_name, W_OK) < 0
-+-	    || (tracefp = fopen(my_name, mode)) == 0) {
-++	if (_nc_access(TracePath, W_OK) < 0
-++	    || (TraceFP = fopen(TracePath, mode)) == 0) {
-+ 	    perror("curses: Can't open 'trace' file");
-+ 	    exit(EXIT_FAILURE);
-+ 	}
-+@@ -85,18 +117,18 @@
-+ 	 * end of each line.  This is useful in case the program dies. 
-+ 	 */
-+ #if HAVE_SETVBUF		/* ANSI */
-+-	(void) setvbuf(tracefp, (char *) 0, _IOLBF, 0);
-++	(void) setvbuf(TraceFP, (char *) 0, _IOLBF, 0);
-+ #elif HAVE_SETBUF		/* POSIX */
-+-	(void) setbuffer(tracefp, (char *) 0);
-++	(void) setbuffer(TraceFP, (char *) 0);
-+ #endif
-+ 	_tracef("TRACING NCURSES version %s.%d (tracelevel=%#x)",
-+ 		NCURSES_VERSION,
-+ 		NCURSES_VERSION_PATCH,
-+ 		tracelevel);
-+     } else if (tracelevel == 0) {
-+-	if (tracefp != 0) {
-+-	    fclose(tracefp);
-+-	    tracefp = 0;
-++	if (TraceFP != 0) {
-++	    fclose(TraceFP);
-++	    TraceFP = 0;
-+ 	}
-+ 	_nc_tracing = tracelevel;
-+     } else if (_nc_tracing != tracelevel) {
-+@@ -105,13 +137,12 @@
-+     }
-+ }
-+ 
-+-NCURSES_EXPORT(void)
-+-_tracef(const char *fmt,...)
-++static void
-++_nc_va_tracef(const char *fmt, va_list ap)
-+ {
-+     static const char Called[] = T_CALLED("");
-+     static const char Return[] = T_RETURN("");
-+-    static int level;
-+-    va_list ap;
-++
-+     bool before = FALSE;
-+     bool after = FALSE;
-+     unsigned doit = _nc_tracing;
-+@@ -120,12 +151,12 @@
-+     if (strlen(fmt) >= sizeof(Called) - 1) {
-+ 	if (!strncmp(fmt, Called, sizeof(Called) - 1)) {
-+ 	    before = TRUE;
-+-	    level++;
-++	    TraceLevel++;
-+ 	} else if (!strncmp(fmt, Return, sizeof(Return) - 1)) {
-+ 	    after = TRUE;
-+ 	}
-+ 	if (before || after) {
-+-	    if ((level <= 1)
-++	    if ((TraceLevel <= 1)
-+ 		|| (doit & TRACE_ICALLS) != 0)
-+ 		doit &= (TRACE_CALLS | TRACE_CCALLS);
-+ 	    else
-+@@ -134,25 +165,34 @@
-+     }
-+ 
-+     if (doit != 0) {
-+-	if (tracefp == 0)
-+-	    tracefp = stderr;
-++	if (TraceFP == 0)
-++	    TraceFP = stderr;
-+ 	if (before || after) {
-+ 	    int n;
-+-	    for (n = 1; n < level; n++)
-+-		fputs("+ ", tracefp);
-++	    for (n = 1; n < TraceLevel; n++)
-++		fputs("+ ", TraceFP);
-+ 	}
-+-	va_start(ap, fmt);
-+-	vfprintf(tracefp, fmt, ap);
-+-	fputc('\n', tracefp);
-+-	va_end(ap);
-+-	fflush(tracefp);
-++	vfprintf(TraceFP, fmt, ap);
-++	fputc('\n', TraceFP);
-++	fflush(TraceFP);
-+     }
-+ 
-+-    if (after && level)
-+-	level--;
-++    if (after && TraceLevel)
-++	TraceLevel--;
-++
-+     errno = save_err;
-+ }
-+ 
-++NCURSES_EXPORT(void)
-++_tracef(const char *fmt,...)
-++{
-++    va_list ap;
-++
-++    va_start(ap, fmt);
-++    _nc_va_tracef(fmt, ap);
-++    va_end(ap);
-++}
-++
-+ /* Trace 'bool' return-values */
-+ NCURSES_EXPORT(NCURSES_BOOL)
-+ _nc_retrace_bool(NCURSES_BOOL code)
-+@@ -224,4 +264,53 @@
-+     T((T_RETURN("%p"), code));
-+     return code;
-+ }
-++
-++#if USE_REENTRANT
-++/*
-++ * Check if the given trace-mask is enabled.
-++ *
-++ * This function may be called from within one of the functions that fills
-++ * in parameters for _tracef(), but in that case we do not want to lock the
-++ * mutex, since it is already locked.
-++ */
-++NCURSES_EXPORT(int)
-++_nc_use_tracef(unsigned mask)
-++{
-++    bool result = FALSE;
-++
-++    _nc_lock_global(tst_tracef);
-++    if (!_nc_globals.nested_tracef++) {
-++	if ((result = (_nc_tracing & (mask))) != 0) {
-++	    /* we will call _nc_locked_tracef(), no nesting so far */
-++	    _nc_lock_global(tracef);
-++	} else {
-++	    /* we will not call _nc_locked_tracef() */
-++	    _nc_globals.nested_tracef = 0;
-++	}
-++    } else {
-++	/* we may call _nc_locked_tracef(), but with nested_tracef > 0 */
-++	result = (_nc_tracing & (mask));
-++    }
-++    _nc_unlock_global(tst_tracef);
-++    return result;
-++}
-++
-++/*
-++ * We call this if _nc_use_tracef() returns true, which means we must unlock
-++ * the tracef mutex.
-++ */
-++NCURSES_EXPORT(void)
-++_nc_locked_tracef(const char *fmt,...)
-++{
-++    va_list ap;
-++
-++    va_start(ap, fmt);
-++    _nc_va_tracef(fmt, ap);
-++    va_end(ap);
-++
-++    if (--(_nc_globals.nested_tracef) == 0)
-++	_nc_unlock_global(tracef);
-++}
-++#endif /* USE_REENTRANT */
-++
-+ #endif /* TRACE */
-+Index: ncurses/trace/lib_traceatr.c
-+Prereq:  1.56 
-+--- ncurses-5.6/ncurses/trace/lib_traceatr.c	2006-12-02 21:18:28.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/trace/lib_traceatr.c	2007-06-09 17:22:10.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -39,33 +39,37 @@
-+ #include <curses.priv.h>
-+ #include <term.h>		/* acs_chars */
-+ 
-+-MODULE_ID("$Id: lib_traceatr.c,v 1.56 2006/12/02 21:18:28 tom Exp $")
-++MODULE_ID("$Id: lib_traceatr.c,v 1.59 2007/06/09 17:22:10 tom Exp $")
-+ 
-+ #define COLOR_OF(c) ((c < 0) ? "default" : (c > 7 ? color_of(c) : colors[c].name))
-+ 
-+ #ifdef TRACE
-+ 
-+-static const char l_brace[] = {L_BRACE, 0};
-+-static const char r_brace[] = {R_BRACE, 0};
-++static const char l_brace[] = StringOf(L_BRACE);
-++static const char r_brace[] = StringOf(R_BRACE);
-+ 
-+ #ifndef USE_TERMLIB
-++
-++#define my_buffer _nc_globals.traceatr_color_buf
-++#define my_select _nc_globals.traceatr_color_sel
-++#define my_cached _nc_globals.traceatr_color_last
-++
-+ static char *
-+ color_of(int c)
-+ {
-+-    static char buffer[2][80];
-+-    static int sel;
-+-    static int last = -1;
-+-
-+-    if (c != last) {
-+-	last = c;
-+-	sel = !sel;
-++    if (c != my_cached) {
-++	my_cached = c;
-++	my_select = !my_select;
-+ 	if (c == COLOR_DEFAULT)
-+-	    strcpy(buffer[sel], "default");
-++	    strcpy(my_buffer[my_select], "default");
-+ 	else
-+-	    sprintf(buffer[sel], "color%d", c);
-++	    sprintf(my_buffer[my_select], "color%d", c);
-+     }
-+-    return buffer[sel];
-++    return my_buffer[my_select];
-+ }
-++
-++#undef my_buffer
-++#undef my_select
-+ #endif /* !USE_TERMLIB */
-+ 
-+ NCURSES_EXPORT(char *)
-+@@ -173,17 +177,19 @@
-+ const char *
-+ _nc_altcharset_name(attr_t attr, chtype ch)
-+ {
-++    typedef struct {
-++	unsigned int val;
-++	const char *name;
-++    } ALT_NAMES;
-++
-+     const char *result = 0;
-+ 
-+     if ((attr & A_ALTCHARSET) && (acs_chars != 0)) {
-+ 	char *cp;
-+ 	char *found = 0;
-+-	static const struct {
-+-	    unsigned int val;
-+-	    const char *name;
-+-	} names[] =
-++	/* *INDENT-OFF* */
-++	static const ALT_NAMES names[] =
-+ 	{
-+-	    /* *INDENT-OFF* */
-+ 	    { 'l', "ACS_ULCORNER" },	/* upper left corner */
-+ 	    { 'm', "ACS_LLCORNER" },	/* lower left corner */
-+ 	    { 'k', "ACS_URCORNER" },	/* upper right corner */
-+@@ -217,9 +223,9 @@
-+ 	    { '|', "ACS_NEQUAL" },	/* not equal */
-+ 	    { '}', "ACS_STERLING" },	/* UK pound sign */
-+ 	    { '\0', (char *) 0 }
-+-		/* *INDENT-OFF* */
-+-	},
-+-	    *sp;
-++	};
-++	/* *INDENT-OFF* */
-++	const ALT_NAMES *sp;
-+ 
-+ 	for (cp = acs_chars; cp[0] && cp[1]; cp += 2) {
-+ 	    if (ChCharOf(cp[1]) == ChCharOf(ch)) {
-+Index: ncurses/trace/lib_tracebits.c
-+Prereq:  1.13 
-+--- ncurses-5.6/ncurses/trace/lib_tracebits.c	2006-12-10 01:33:00.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/trace/lib_tracebits.c	2007-06-30 16:14:20.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -35,7 +35,7 @@
-+ #include <curses.priv.h>
-+ #include <term.h>		/* cur_term */
-+ 
-+-MODULE_ID("$Id: lib_tracebits.c,v 1.13 2006/12/10 01:33:00 tom Exp $")
-++MODULE_ID("$Id: lib_tracebits.c,v 1.15 2007/06/30 16:14:20 tom Exp $")
-+ 
-+ #if SVR4_TERMIO && !defined(_POSIX_SOURCE)
-+ #define _POSIX_SOURCE
-+@@ -53,10 +53,27 @@
-+ #ifndef TOSTOP
-+ #define TOSTOP 0
-+ #endif
-++
-+ #ifndef IEXTEN
-+ #define IEXTEN 0
-+ #endif
-+ 
-++#ifndef ONLCR
-++#define ONLCR 0
-++#endif
-++
-++#ifndef OCRNL
-++#define OCRNL 0
-++#endif
-++
-++#ifndef ONOCR
-++#define ONOCR 0
-++#endif
-++
-++#ifndef ONLRET
-++#define ONLRET 0
-++#endif
-++
-+ #ifdef TRACE
-+ 
-+ typedef struct {
-+@@ -108,8 +125,12 @@
-+     {
-+ 	{OPOST, "OPOST"},
-+ 	{OFLAGS_TABS, "XTABS"},
-++	{ONLCR, "ONLCR"},
-++	{OCRNL, "OCRNL"},
-++	{ONOCR, "ONOCR"},
-++	{ONLRET, "ONLRET"},
-+ 	{0, NULL}
-+-#define ALLOUT	(OPOST)
-++#define ALLOUT	(OPOST|OFLAGS_TABS|ONLCR|OCRNL|ONOCR|ONLRET)
-+     }, cflags[] =
-+     {
-+ 	{CLOCAL, "CLOCAL"},
-+Index: ncurses/trace/lib_tracechr.c
-+Prereq:  1.12 
-+--- ncurses-5.6/ncurses/trace/lib_tracechr.c	2005-04-16 16:55:46.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/trace/lib_tracechr.c	2007-04-21 23:16:37.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -39,34 +39,35 @@
-+ 
-+ #include <ctype.h>
-+ 
-+-MODULE_ID("$Id: lib_tracechr.c,v 1.12 2005/04/16 16:55:46 tom Exp $")
-++MODULE_ID("$Id: lib_tracechr.c,v 1.13 2007/04/21 23:16:37 tom Exp $")
-+ 
-+ #ifdef TRACE
-++#define MyBuffer _nc_globals.tracechr_buf
-++
-+ NCURSES_EXPORT(char *)
-+ _tracechar(int ch)
-+ {
-+-    static char result[40];
-+     NCURSES_CONST char *name;
-+ 
-+     if (ch > KEY_MIN || ch < 0) {
-+ 	name = keyname(ch);
-+ 	if (name == 0 || *name == '\0')
-+ 	    name = "NULL";
-+-	(void) sprintf(result, "'%.30s' = %#03o", name, ch);
-++	(void) sprintf(MyBuffer, "'%.30s' = %#03o", name, ch);
-+     } else if (!is8bits(ch) || !isprint(UChar(ch))) {
-+ 	/*
-+ 	 * workaround for glibc bug:
-+ 	 * sprintf changes the result from unctrl() to an empty string if it
-+ 	 * does not correspond to a valid multibyte sequence.
-+ 	 */
-+-	(void) sprintf(result, "%#03o", ch);
-++	(void) sprintf(MyBuffer, "%#03o", ch);
-+     } else {
-+ 	name = unctrl((chtype) ch);
-+ 	if (name == 0 || *name == 0)
-+ 	    name = "null";	/* shouldn't happen */
-+-	(void) sprintf(result, "'%.30s' = %#03o", name, ch);
-++	(void) sprintf(MyBuffer, "'%.30s' = %#03o", name, ch);
-+     }
-+-    return (result);
-++    return (MyBuffer);
-+ }
-+ #else
-+ empty_module(_nc_lib_tracechr)
-+Index: ncurses/trace/lib_tracedmp.c
-+Prereq:  1.27 
-+--- ncurses-5.6/ncurses/trace/lib_tracedmp.c	2006-10-14 20:43:31.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/trace/lib_tracedmp.c	2007-06-30 23:01:19.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -39,15 +39,16 @@
-+ #include <curses.priv.h>
-+ #include <ctype.h>
-+ 
-+-MODULE_ID("$Id: lib_tracedmp.c,v 1.27 2006/10/14 20:43:31 tom Exp $")
-++MODULE_ID("$Id: lib_tracedmp.c,v 1.29 2007/06/30 23:01:19 tom Exp $")
-+ 
-+ #ifdef TRACE
-++
-++#define my_buffer _nc_globals.tracedmp_buf
-++#define my_length _nc_globals.tracedmp_used
-++
-+ NCURSES_EXPORT(void)
-+ _tracedump(const char *name, WINDOW *win)
-+ {
-+-    static char *buf = 0;
-+-    static size_t used = 0;
-+-
-+     int i, j, n, width;
-+ 
-+     /* compute narrowest possible display width */
-+@@ -66,13 +67,13 @@
-+     }
-+     if (width < win->_maxx)
-+ 	++width;
-+-    if (++width + 1 > (int) used) {
-+-	used = 2 * (width + 1);
-+-	buf = typeRealloc(char, used, buf);
-++    if (++width + 1 > (int) my_length) {
-++	my_length = 2 * (width + 1);
-++	my_buffer = typeRealloc(char, my_length, my_buffer);
-+     }
-+ 
-+     for (n = 0; n <= win->_maxy; ++n) {
-+-	char *ep = buf;
-++	char *ep = my_buffer;
-+ 	bool haveattrs, havecolors;
-+ 
-+ 	/*
-+@@ -99,6 +100,30 @@
-+ 		(long) win->_line[n].lastchar,
-+ 		ep);
-+ 
-++	/* if there are multi-column characters on the line, print them now */
-++	if_WIDEC({
-++	    bool multicolumn = FALSE;
-++	    for (j = 0; j < width; ++j)
-++		if (WidecExt(win->_line[n].text[j]) != 0) {
-++		    multicolumn = TRUE;
-++		    break;
-++		}
-++	    if (multicolumn) {
-++		ep = my_buffer;
-++		for (j = 0; j < width; ++j) {
-++		    int test = WidecExt(win->_line[n].text[j]);
-++		    if (test) {
-++			ep[j] = test + '0';
-++		    } else {
-++			ep[j] = ' ';
-++		    }
-++		}
-++		ep[j] = '\0';
-++		_tracef("%*s[%2d]%*s='%s'", (int) strlen(name),
-++			"widec", n, 8, " ", my_buffer);
-++	    }
-++	});
-++
-+ 	/* dump A_COLOR part, will screw up if there are more than 96 */
-+ 	havecolors = FALSE;
-+ 	for (j = 0; j < width; ++j)
-+@@ -107,7 +132,7 @@
-+ 		break;
-+ 	    }
-+ 	if (havecolors) {
-+-	    ep = buf;
-++	    ep = my_buffer;
-+ 	    for (j = 0; j < width; ++j) {
-+ 		int pair = GetPair(win->_line[n].text[j]);
-+ 		if (pair >= 52)
-+@@ -123,7 +148,7 @@
-+ 	    }
-+ 	    ep[j] = '\0';
-+ 	    _tracef("%*s[%2d]%*s='%s'", (int) strlen(name),
-+-		    "colors", n, 8, " ", buf);
-++		    "colors", n, 8, " ", my_buffer);
-+ 	}
-+ 
-+ 	for (i = 0; i < 4; ++i) {
-+@@ -137,20 +162,20 @@
-+ 		    break;
-+ 		}
-+ 	    if (haveattrs) {
-+-		ep = buf;
-++		ep = my_buffer;
-+ 		for (j = 0; j < width; ++j)
-+ 		    ep[j] = hex[(AttrOf(win->_line[n].text[j]) & mask) >>
-+ 				((i + 4) * 4)];
-+ 		ep[j] = '\0';
-+ 		_tracef("%*s%d[%2d]%*s='%s'", (int) strlen(name) -
-+-			1, "attrs", i, n, 8, " ", buf);
-++			1, "attrs", i, n, 8, " ", my_buffer);
-+ 	    }
-+ 	}
-+     }
-+ #if NO_LEAKS
-+-    free(buf);
-+-    buf = 0;
-+-    used = 0;
-++    free(my_buffer);
-++    my_buffer = 0;
-++    my_length = 0;
-+ #endif
-+ }
-+ 
-+Index: ncurses/trace/lib_tracemse.c
-+Prereq:  1.12 
-+--- ncurses-5.6/ncurses/trace/lib_tracemse.c	2005-06-11 19:53:50.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/trace/lib_tracemse.c	2007-04-21 21:23:00.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2002,2005 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -38,30 +38,23 @@
-+ 
-+ #include <curses.priv.h>
-+ 
-+-MODULE_ID("$Id: lib_tracemse.c,v 1.12 2005/06/11 19:53:50 tom Exp $")
-++MODULE_ID("$Id: lib_tracemse.c,v 1.13 2007/04/21 21:23:00 tom Exp $")
-+ 
-+ #ifdef TRACE
-+ 
-++#define my_buffer _nc_globals.tracemse_buf
-++
-+ NCURSES_EXPORT(char *)
-+ _tracemouse(MEVENT const *ep)
-+ {
-+-    /*
-+-     * hmm - format is no longer than 80 columns, there are 5 numbers that
-+-     * could at most have 10 digits, and the mask contains no more than 32 bits
-+-     * with each bit representing less than 15 characters.  Usually the whole
-+-     * string is less than 80 columns, but this buffer size is an absolute
-+-     * limit.
-+-     */
-+-    static char buf[80 + (5 * 10) + (32 * 15)];
-+-
-+-    (void) sprintf(buf, "id %2d  at (%2d, %2d, %2d) state %4lx = {",
-++    (void) sprintf(my_buffer, TRACEMSE_FMT,
-+ 		   ep->id,
-+ 		   ep->x,
-+ 		   ep->y,
-+ 		   ep->z,
-+ 		   (unsigned long) ep->bstate);
-+ 
-+-#define SHOW(m, s) if ((ep->bstate & m) == m) strcat(strcat(buf, s), ", ")
-++#define SHOW(m, s) if ((ep->bstate & m) == m) strcat(strcat(my_buffer, s), ", ")
-+ 
-+     SHOW(BUTTON1_RELEASED, "release-1");
-+     SHOW(BUTTON1_PRESSED, "press-1");
-+@@ -115,10 +108,10 @@
-+ 
-+ #undef SHOW
-+ 
-+-    if (buf[strlen(buf) - 1] == ' ')
-+-	buf[strlen(buf) - 2] = '\0';
-+-    (void) strcat(buf, "}");
-+-    return (buf);
-++    if (my_buffer[strlen(my_buffer) - 1] == ' ')
-++	my_buffer[strlen(my_buffer) - 2] = '\0';
-++    (void) strcat(my_buffer, "}");
-++    return (my_buffer);
-+ }
-+ 
-+ #else /* !TRACE */
-+Index: ncurses/trace/trace_buf.c
-+Prereq:  1.12 
-+--- ncurses-5.6/ncurses/trace/trace_buf.c	2003-03-15 21:21:36.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/trace/trace_buf.c	2007-04-21 22:50:08.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2002,2003 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2003,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -35,46 +35,42 @@
-+ 
-+ #include <curses.priv.h>
-+ 
-+-MODULE_ID("$Id: trace_buf.c,v 1.12 2003/03/15 21:21:36 tom Exp $")
-++MODULE_ID("$Id: trace_buf.c,v 1.13 2007/04/21 22:50:08 tom Exp $")
-+ 
-+-typedef struct {
-+-    char *text;
-+-    size_t size;
-+-} LIST;
-++#define MyList _nc_globals.tracebuf_ptr
-++#define MySize _nc_globals.tracebuf_used
-+ 
-+ static char *
-+ _nc_trace_alloc(int bufnum, size_t want)
-+ {
-+     char *result = 0;
-+-    static LIST *list;
-+-    static size_t have;
-+ 
-+     if (bufnum >= 0) {
-+-	if ((size_t) (bufnum + 1) > have) {
-++	if ((size_t) (bufnum + 1) > MySize) {
-+ 	    size_t need = (bufnum + 1) * 2;
-+-	    if ((list = typeRealloc(LIST, need, list)) == 0)
-++	    if ((MyList = typeRealloc(TRACEBUF, need, MyList)) == 0)
-+ 		return (0);
-+-	    while (need > have)
-+-		list[have++].text = 0;
-++	    while (need > MySize)
-++		MyList[MySize++].text = 0;
-+ 	}
-+ 
-+-	if (list[bufnum].text == 0
-+-	    || want > list[bufnum].size) {
-+-	    if ((list[bufnum].text = typeRealloc(char, want, list[bufnum].text))
-+-		!= 0)
-+-		  list[bufnum].size = want;
-++	if (MyList[bufnum].text == 0
-++	    || want > MyList[bufnum].size) {
-++	    MyList[bufnum].text = typeRealloc(char, want, MyList[bufnum].text);
-++	    if (MyList[bufnum].text != 0)
-++		MyList[bufnum].size = want;
-+ 	}
-+ 
-+-	result = list[bufnum].text;
-++	result = MyList[bufnum].text;
-+     }
-+ #if NO_LEAKS
-+     else {
-+-	if (have) {
-+-	    while (have--) {
-+-		if (list[have].text != 0)
-+-		    free(list[have].text);
-++	if (MySize) {
-++	    while (MySize--) {
-++		if (MyList[MySize].text != 0)
-++		    free(MyList[MySize].text);
-+ 	    }
-+-	    free(list);
-++	    free(MyList);
-+ 	}
-+     }
-+ #endif
-+Index: ncurses/trace/trace_tries.c
-+Prereq:  1.10 
-+--- ncurses-5.6/ncurses/trace/trace_tries.c	2001-10-20 22:42:51.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/trace/trace_tries.c	2007-04-21 21:55:41.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1999,2000,2001 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1999-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -35,25 +35,27 @@
-+ 
-+ #include <curses.priv.h>
-+ 
-+-MODULE_ID("$Id: trace_tries.c,v 1.10 2001/10/20 22:42:51 tom Exp $")
-++MODULE_ID("$Id: trace_tries.c,v 1.12 2007/04/21 21:55:41 tom Exp $")
-+ 
-+ #ifdef TRACE
-+-static unsigned char *buffer;
-+-static unsigned len;
-++#define my_buffer _nc_globals.tracetry_buf
-++#define my_length _nc_globals.tracetry_used
-+ 
-+ static void
-+-recur_tries(struct tries *tree, unsigned level)
-++recur_tries(TRIES * tree, unsigned level)
-+ {
-+-    if (level > len)
-+-	buffer = (unsigned char *) realloc(buffer, len = (level + 1) * 4);
-++    if (level > my_length) {
-++	my_length = (level + 1) * 4;
-++	my_buffer = (unsigned char *) realloc(my_buffer, my_length);
-++    }
-+ 
-+     while (tree != 0) {
-+-	if ((buffer[level] = tree->ch) == 0)
-+-	    buffer[level] = 128;
-+-	buffer[level + 1] = 0;
-++	if ((my_buffer[level] = tree->ch) == 0)
-++	    my_buffer[level] = 128;
-++	my_buffer[level + 1] = 0;
-+ 	if (tree->value != 0) {
-+ 	    _tracef("%5d: %s (%s)", tree->value,
-+-		    _nc_visbuf((char *) buffer), keyname(tree->value));
-++		    _nc_visbuf((char *) my_buffer), keyname(tree->value));
-+ 	}
-+ 	if (tree->child)
-+ 	    recur_tries(tree->child, level + 1);
-+@@ -62,13 +64,13 @@
-+ }
-+ 
-+ NCURSES_EXPORT(void)
-+-_nc_trace_tries(struct tries *tree)
-++_nc_trace_tries(TRIES * tree)
-+ {
-+-    buffer = typeMalloc(unsigned char, len = 80);
-++    my_buffer = typeMalloc(unsigned char, my_length = 80);
-+     _tracef("BEGIN tries %p", tree);
-+     recur_tries(tree, 0);
-+     _tracef(". . . tries %p", tree);
-+-    free(buffer);
-++    free(my_buffer);
-+ }
-+ 
-+ #else
-+Index: ncurses/trace/varargs.c
-+Prereq:  1.4 
-+--- ncurses-5.6/ncurses/trace/varargs.c	2003-05-24 21:10:28.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/trace/varargs.c	2007-07-14 15:51:27.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 2001-2002,2003 Free Software Foundation, Inc.              *
-++ * Copyright (c) 2001-2003,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -34,7 +34,7 @@
-+ 
-+ #include <ctype.h>
-+ 
-+-MODULE_ID("$Id: varargs.c,v 1.4 2003/05/24 21:10:28 tom Exp $")
-++MODULE_ID("$Id: varargs.c,v 1.6 2007/07/14 15:51:27 tom Exp $")
-+ 
-+ #ifdef TRACE
-+ 
-+@@ -49,6 +49,9 @@
-+ #define VA_PTR(type) pval = (char *)va_arg(ap, type)
-+ #define VA_STR(type) sval = va_arg(ap, type)
-+ 
-++#define MyBuffer _nc_globals.tracearg_buf
-++#define MyLength _nc_globals.tracearg_used
-++
-+ /*
-+  * Returns a string that represents the parameter list of a printf-style call.
-+  */
-+@@ -56,8 +59,6 @@
-+ _nc_varargs(const char *fmt, va_list ap)
-+ {
-+     static char dummy[] = "";
-+-    static char *result_buf;
-+-    static size_t result_len;
-+ 
-+     char buffer[BUFSIZ];
-+     const char *param;
-+@@ -65,11 +66,11 @@
-+ 
-+     if (fmt == 0 || *fmt == '\0')
-+ 	return dummy;
-+-    if (result_len == 0)
-+-	result_buf = typeMalloc(char, result_len = BUFSIZ);
-+-    if (result_buf == 0)
-++    if (MyLength == 0)
-++	MyBuffer = typeMalloc(char, MyLength = BUFSIZ);
-++    if (MyBuffer == 0)
-+ 	return dummy;
-+-    *result_buf = '\0';
-++    *MyBuffer = '\0';
-+ 
-+     while (*fmt != '\0') {
-+ 	if (*fmt == '%') {
-+@@ -159,13 +160,14 @@
-+ 			case atString:
-+ 			    param = _nc_visbuf2(1, sval);
-+ 			    break;
-++			case atUnknown:
-+ 			default:
-+ 			    strcpy(buffer, "?");
-+ 			    break;
-+ 			}
-+-			result_len += strlen(param) + 2;
-+-			result_buf = typeRealloc(char, result_len, result_buf);
-+-			sprintf(result_buf + strlen(result_buf), ", %s", param);
-++			MyLength += strlen(param) + 2;
-++			MyBuffer = typeRealloc(char, MyLength, MyBuffer);
-++			sprintf(MyBuffer + strlen(MyBuffer), ", %s", param);
-+ 		    }
-+ 		}
-+ 		used = atUnknown;
-+@@ -175,7 +177,7 @@
-+ 	}
-+     }
-+ 
-+-    return (result_buf);
-++    return (MyBuffer);
-+ }
-+ #else
-+ empty_module(_nc_varargs)
-+Index: ncurses/trace/visbuf.c
-+Prereq:  1.21 
-+--- ncurses-5.6/ncurses/trace/visbuf.c	2006-12-02 21:20:28.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/trace/visbuf.c	2007-06-09 17:21:53.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 2001-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 2001-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -42,11 +42,16 @@
-+ #include <tic.h>
-+ #include <ctype.h>
-+ 
-+-MODULE_ID("$Id: visbuf.c,v 1.21 2006/12/02 21:20:28 tom Exp $")
-++MODULE_ID("$Id: visbuf.c,v 1.26 2007/06/09 17:21:53 tom Exp $")
-+ 
-+-static const char d_quote[] = {D_QUOTE, 0};
-+-static const char l_brace[] = {L_BRACE, 0};
-+-static const char r_brace[] = {R_BRACE, 0};
-++#define NormalLen(len) (unsigned) ((len + 1) * 4)
-++#define WideLen(len)   (unsigned) ((len + 1) * 4 * MB_CUR_MAX)
-++
-++#ifdef TRACE
-++static const char d_quote[] = StringOf(D_QUOTE);
-++static const char l_brace[] = StringOf(L_BRACE);
-++static const char r_brace[] = StringOf(R_BRACE);
-++#endif
-+ 
-+ static char *
-+ _nc_vischar(char *tp, unsigned c)
-+@@ -68,6 +73,10 @@
-+     } else if (c == '\033') {
-+ 	*tp++ = '\\';
-+ 	*tp++ = 'e';
-++    } else if (UChar(c) == 0x7f) {
-++	*tp++ = '\\';
-++	*tp++ = '^';
-++	*tp++ = '?';
-+     } else if (is7bits(c) && iscntrl(UChar(c))) {
-+ 	*tp++ = '\\';
-+ 	*tp++ = '^';
-+@@ -96,11 +105,11 @@
-+ 	len = strlen(buf);
-+ 
-+ #ifdef TRACE
-+-    tp = vbuf = _nc_trace_buf(bufnum, (unsigned) (len * 4) + 5);
-++    tp = vbuf = _nc_trace_buf(bufnum, NormalLen(len));
-+ #else
-+     {
-+-	static char *mybuf[2];
-+-	mybuf[bufnum] = typeRealloc(char, (unsigned) (len * 4) + 5, mybuf[bufnum]);
-++	static char *mybuf[4];
-++	mybuf[bufnum] = typeRealloc(char, NormalLen(len), mybuf[bufnum]);
-+ 	tp = vbuf = mybuf[bufnum];
-+     }
-+ #endif
-+@@ -161,11 +170,11 @@
-+ 	len = wcslen(buf);
-+ 
-+ #ifdef TRACE
-+-    tp = vbuf = _nc_trace_buf(bufnum, (unsigned) (len * 4) + 5);
-++    tp = vbuf = _nc_trace_buf(bufnum, WideLen(len));
-+ #else
-+     {
-+ 	static char *mybuf[2];
-+-	mybuf[bufnum] = typeRealloc(char, (unsigned) (len * 4) + 5, mybuf[bufnum]);
-++	mybuf[bufnum] = typeRealloc(char, WideLen(len), mybuf[bufnum]);
-+ 	tp = vbuf = mybuf[bufnum];
-+     }
-+ #endif
-+@@ -259,7 +268,8 @@
-+ 	result = _nc_trace_bufcat(bufnum, l_brace);
-+ 	result = _nc_trace_bufcat(bufnum, d_quote);
-+ 	for (j = first; j <= last; ++j) {
-+-	    if ((found = _nc_altcharset_name(attr, (chtype) CharOf(buf[j]))) != 0) {
-++	    found = _nc_altcharset_name(attr, (chtype) CharOf(buf[j]));
-++	    if (found != 0) {
-+ 		result = _nc_trace_bufcat(bufnum, found);
-+ 		attr &= ~A_ALTCHARSET;
-+ 	    } else
-+Index: ncurses/tty/hardscroll.c
-+Prereq:  1.36 
-+--- ncurses-5.6/ncurses/tty/hardscroll.c	2001-01-14 00:17:28.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tty/hardscroll.c	2007-09-29 21:48:36.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998,2000 Free Software Foundation, Inc.                   *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -145,7 +145,7 @@
-+ 
-+ #include <curses.priv.h>
-+ 
-+-MODULE_ID("$Id: hardscroll.c,v 1.36 2001/01/14 00:17:28 tom Exp $")
-++MODULE_ID("$Id: hardscroll.c,v 1.41 2007/09/29 21:48:36 tom Exp $")
-+ 
-+ #if defined(SCROLLDEBUG) || defined(HASHDEBUG)
-+ 
-+@@ -158,22 +158,25 @@
-+ # undef TR
-+ # define TR(n, a)	if (_nc_tracing & (n)) { _tracef a ; putchar('\n'); }
-+ 
-++extern NCURSES_EXPORT_VAR(unsigned) _nc_tracing;
-++
-+ #else /* no debug */
-+ 
-+ /* OLDNUM(n) indicates which line will be shifted to the position n.
-+    if OLDNUM(n) == _NEWINDEX, then the line n in new, not shifted from
-+    somewhere. */
-+ NCURSES_EXPORT_VAR(int *)
-+-_nc_oldnums = 0;
-++_nc_oldnums = 0;		/* obsolete: keep for ABI compat */
-+ 
-+ # if USE_HASHMAP
-+-     static int oldnums_allocated = 0;
-+-#  define oldnums       _nc_oldnums
-++#  define oldnums       SP->_oldnum_list
-+ #  define OLDNUM(n)	oldnums[n]
-+ # else				/* !USE_HASHMAP */
-+ #  define OLDNUM(n)	newscr->_line[n].oldindex
-+ # endif				/* !USE_HASHMAP */
-+ 
-++#define OLDNUM_SIZE     SP->_oldnum_size
-++
-+ #endif /* defined(SCROLLDEBUG) || defined(HASHDEBUG) */
-+ 
-+ NCURSES_EXPORT(void)
-+@@ -183,17 +186,17 @@
-+     int i;
-+     int start, end, shift;
-+ 
-+-    TR(TRACE_ICALLS, ("_nc_scroll_optimize() begins"));
-++    TR(TRACE_ICALLS, (T_CALLED("_nc_scroll_optimize")));
-+ 
-+ #if !defined(SCROLLDEBUG) && !defined(HASHDEBUG)
-+ #if USE_HASHMAP
-+     /* get enough storage */
-+-    if (oldnums_allocated < screen_lines) {
-++    if (OLDNUM_SIZE < screen_lines) {
-+ 	int *new_oldnums = typeRealloc(int, screen_lines, oldnums);
-+ 	if (!new_oldnums)
-+ 	    return;
-+ 	oldnums = new_oldnums;
-+-	oldnums_allocated = screen_lines;
-++	OLDNUM_SIZE = screen_lines;
-+     }
-+     /* calculate the indices */
-+     _nc_hash_map();
-+@@ -201,8 +204,10 @@
-+ #endif /* !defined(SCROLLDEBUG) && !defined(HASHDEBUG) */
-+ 
-+ #ifdef TRACE
-+-    if (_nc_tracing & (TRACE_UPDATE | TRACE_MOVE))
-++    if (USE_TRACEF(TRACE_UPDATE | TRACE_MOVE)) {
-+ 	_nc_linedump();
-++	_nc_unlock_global(tracef);
-++    }
-+ #endif /* TRACE */
-+ 
-+     /* pass 1 - from top to bottom scrolling up */
-+@@ -253,6 +258,7 @@
-+ 	}
-+ #endif /* !defined(SCROLLDEBUG) && !defined(HASHDEBUG) */
-+     }
-++    TR(TRACE_ICALLS, (T_RETURN("")));
-+ }
-+ 
-+ #if defined(TRACE) || defined(SCROLLDEBUG) || defined(HASHDEBUG)
-+@@ -260,23 +266,17 @@
-+ _nc_linedump(void)
-+ /* dump the state of the real and virtual oldnum fields */
-+ {
-+-    static size_t have;
-+-    static char *buf;
-+-
-+     int n;
-++    char *buf = 0;
-+     size_t want = (screen_lines + 1) * 4;
-+ 
-+-    if (have < want)
-+-	buf = typeMalloc(char, have = want);
-++    buf = typeMalloc(char, want);
-+ 
-+     (void) strcpy(buf, "virt");
-+     for (n = 0; n < screen_lines; n++)
-+ 	(void) sprintf(buf + strlen(buf), " %02d", OLDNUM(n));
-+     TR(TRACE_UPDATE | TRACE_MOVE, (buf));
-+-#if NO_LEAKS
-+     free(buf);
-+-    have = 0;
-+-#endif
-+ }
-+ #endif /* defined(TRACE) || defined(SCROLLDEBUG) */
-+ 
-+Index: ncurses/tty/hashmap.c
-+Prereq:  1.49 
-+--- ncurses-5.6/ncurses/tty/hashmap.c	2006-03-11 19:33:49.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tty/hashmap.c	2007-10-13 18:47:25.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                   *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                   *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -70,7 +70,7 @@
-+ #include <curses.priv.h>
-+ #include <term.h>		/* for back_color_erase */
-+ 
-+-MODULE_ID("$Id: hashmap.c,v 1.49 2006/03/11 19:33:49 tom Exp $")
-++MODULE_ID("$Id: hashmap.c,v 1.56 2007/10/13 18:47:25 Miroslav.Lichvar Exp $")
-+ 
-+ #ifdef HASHDEBUG
-+ 
-+@@ -81,7 +81,8 @@
-+ # define screen_lines MAXLINES
-+ # define TEXTWIDTH	1
-+ int oldnums[MAXLINES], reallines[MAXLINES];
-+-static chtype oldtext[MAXLINES][TEXTWIDTH], newtext[MAXLINES][TEXTWIDTH];
-++static NCURSES_CH_T oldtext[MAXLINES][TEXTWIDTH];
-++static NCURSES_CH_T newtext[MAXLINES][TEXTWIDTH];
-+ # define OLDNUM(n)	oldnums[n]
-+ # define OLDTEXT(n)	oldtext[n]
-+ # define NEWTEXT(m)	newtext[m]
-+@@ -89,7 +90,7 @@
-+ 
-+ #else /* !HASHDEBUG */
-+ 
-+-# define OLDNUM(n)	_nc_oldnums[n]
-++# define OLDNUM(n)	SP->_oldnum_list[n]
-+ # define OLDTEXT(n)	curscr->_line[n].text
-+ # define NEWTEXT(m)	newscr->_line[m].text
-+ # define TEXTWIDTH	(curscr->_maxx+1)
-+@@ -130,8 +131,8 @@
-+     int cost = 0;
-+     int i;
-+ 
-+-    for (i = TEXTWIDTH; i > 0; i--)
-+-	if (!(CharEq(*from++, *to++)))
-++    for (i = TEXTWIDTH; i > 0; i--, from++, to++)
-++	if (!(CharEq(*from, *to)))
-+ 	    cost++;
-+ 
-+     return cost;
-+@@ -147,8 +148,8 @@
-+     if (back_color_erase)
-+ 	SetPair(blank, GetPair(stdscr->_nc_bkgd));
-+ 
-+-    for (i = TEXTWIDTH; i > 0; i--)
-+-	if (!(CharEq(blank, *to++)))
-++    for (i = TEXTWIDTH; i > 0; i--, to++)
-++	if (!(CharEq(blank, *to)))
-+ 	    cost++;
-+ 
-+     return cost;
-+@@ -446,11 +447,14 @@
-+     char line[BUFSIZ], *st;
-+     int n;
-+ 
-+-    SP = typeCalloc(SCREEN, 1);
-++    if (setupterm(NULL, fileno(stdout), (int *) 0) == ERR)
-++	return EXIT_FAILURE;
-++    (void) _nc_alloc_screen();
-++
-+     for (n = 0; n < screen_lines; n++) {
-+ 	reallines[n] = n;
-+ 	oldnums[n] = _NEWINDEX;
-+-	oldtext[n][0] = newtext[n][0] = '.';
-++	CharOf(oldtext[n][0]) = CharOf(newtext[n][0]) = '.';
-+     }
-+ 
-+     if (isatty(fileno(stdin)))
-+@@ -462,7 +466,7 @@
-+     for (;;) {
-+ 	/* grab a test command */
-+ 	if (fgets(line, sizeof(line), stdin) == (char *) NULL)
-+-	    exit(EXIT_SUCCESS);
-++	    break;
-+ 
-+ 	switch (line[0]) {
-+ 	case '#':		/* comment */
-+@@ -484,22 +488,22 @@
-+ 
-+ 	case 'n':		/* use following letters as text of new lines */
-+ 	    for (n = 0; n < screen_lines; n++)
-+-		newtext[n][0] = '.';
-++		CharOf(newtext[n][0]) = '.';
-+ 	    for (n = 0; n < screen_lines; n++)
-+ 		if (line[n + 1] == '\n')
-+ 		    break;
-+ 		else
-+-		    newtext[n][0] = line[n + 1];
-++		    CharOf(newtext[n][0]) = line[n + 1];
-+ 	    break;
-+ 
-+ 	case 'o':		/* use following letters as text of old lines */
-+ 	    for (n = 0; n < screen_lines; n++)
-+-		oldtext[n][0] = '.';
-++		CharOf(oldtext[n][0]) = '.';
-+ 	    for (n = 0; n < screen_lines; n++)
-+ 		if (line[n + 1] == '\n')
-+ 		    break;
-+ 		else
-+-		    oldtext[n][0] = line[n + 1];
-++		    CharOf(oldtext[n][0]) = line[n + 1];
-+ 	    break;
-+ 
-+ 	case 'd':		/* dump state of test arrays */
-+@@ -508,12 +512,12 @@
-+ #endif
-+ 	    (void) fputs("Old lines: [", stdout);
-+ 	    for (n = 0; n < screen_lines; n++)
-+-		putchar(oldtext[n][0]);
-++		putchar(CharOf(oldtext[n][0]));
-+ 	    putchar(']');
-+ 	    putchar('\n');
-+ 	    (void) fputs("New lines: [", stdout);
-+ 	    for (n = 0; n < screen_lines; n++)
-+-		putchar(newtext[n][0]);
-++		putchar(CharOf(newtext[n][0]));
-+ 	    putchar(']');
-+ 	    putchar('\n');
-+ 	    break;
-+@@ -527,12 +531,17 @@
-+ 	    _nc_scroll_optimize();
-+ 	    (void) fputs("Done.\n", stderr);
-+ 	    break;
-++	default:
-+ 	case '?':
-+ 	    usage();
-+ 	    break;
-+ 	}
-+     }
-++#if NO_LEAKS
-++    _nc_free_and_exit(EXIT_SUCCESS);
-++#else
-+     return EXIT_SUCCESS;
-++#endif
-+ }
-+ 
-+ #endif /* HASHDEBUG */
-+Index: ncurses/tty/lib_mvcur.c
-+Prereq:  1.107 
-+--- ncurses-5.6/ncurses/tty/lib_mvcur.c	2006-11-25 22:31:59.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tty/lib_mvcur.c	2007-08-11 16:15:57.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -155,7 +155,7 @@
-+ #include <term.h>
-+ #include <ctype.h>
-+ 
-+-MODULE_ID("$Id: lib_mvcur.c,v 1.107 2006/11/25 22:31:59 tom Exp $")
-++MODULE_ID("$Id: lib_mvcur.c,v 1.110 2007/08/11 16:15:57 tom Exp $")
-+ 
-+ #define WANT_CHAR(y, x)	SP->_newscr->_line[y].text[x]	/* desired state */
-+ #define BAUDRATE	cur_term->_baudrate	/* bits per second */
-+@@ -959,6 +959,7 @@
-+ 
-+ #include <tic.h>
-+ #include <dump_entry.h>
-++#include <time.h>
-+ 
-+ NCURSES_EXPORT_VAR(const char *) _nc_progname = "mvcur";
-+ 
-+@@ -1017,7 +1018,7 @@
-+ int
-+ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
-+ {
-+-    (void) strcpy(tname, termname());
-++    strcpy(tname, getenv("TERM"));
-+     load_term();
-+     _nc_setupscreen(lines, columns, stdout, FALSE, 0);
-+     baudrate();
-+@@ -1088,7 +1089,7 @@
-+ 	    load_term();
-+ 	} else if (sscanf(buf, "d %s", capname) == 1) {
-+ 	    struct name_table_entry const *np = _nc_find_entry(capname,
-+-							       _nc_info_hash_table);
-++							       _nc_get_hash_table(FALSE));
-+ 
-+ 	    if (np == NULL)
-+ 		(void) printf("No such capability as \"%s\"\n", capname);
-+@@ -1116,7 +1117,7 @@
-+ 	    }
-+ 	} else if (buf[0] == 'i') {
-+ 	    dump_init((char *) NULL, F_TERMINFO, S_TERMINFO, 70, 0, FALSE);
-+-	    dump_entry(&cur_term->type, FALSE, TRUE, 0, 0, 0);
-++	    dump_entry(&cur_term->type, FALSE, TRUE, 0, 0);
-+ 	    putchar('\n');
-+ 	} else if (buf[0] == 'o') {
-+ 	    if (_nc_optimize_enable & OPTIMIZE_MVCUR) {
-+Index: ncurses/tty/lib_tstp.c
-+Prereq:  1.32 
-+--- ncurses-5.6/ncurses/tty/lib_tstp.c	2006-04-01 19:31:34.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tty/lib_tstp.c	2007-04-21 19:51:29.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -46,7 +46,7 @@
-+ #define _POSIX_SOURCE
-+ #endif
-+ 
-+-MODULE_ID("$Id: lib_tstp.c,v 1.32 2006/04/01 19:31:34 tom Exp $")
-++MODULE_ID("$Id: lib_tstp.c,v 1.36 2007/04/21 19:51:29 tom Exp $")
-+ 
-+ #if defined(SIGTSTP) && (HAVE_SIGACTION || HAVE_SIGVEC)
-+ #define USE_SIGTSTP 1
-+@@ -234,14 +234,12 @@
-+ static void
-+ cleanup(int sig)
-+ {
-+-    static int nested;
-+-
-+     /*
-+      * Actually, doing any sort of I/O from within an signal handler is
-+      * "unsafe".  But we'll _try_ to clean up the screen and terminal
-+      * settings on the way out.
-+      */
-+-    if (!nested++
-++    if (!_nc_globals.cleanup_nested++
-+ 	&& (sig == SIGINT
-+ 	    || sig == SIGQUIT)) {
-+ #if HAVE_SIGACTION || HAVE_SIGVEC
-+@@ -277,7 +275,7 @@
-+ static void
-+ sigwinch(int sig GCC_UNUSED)
-+ {
-+-    _nc_handle_sigwinch(-1);
-++    _nc_globals.have_sigwinch = 1;
-+ }
-+ #endif /* USE_SIGWINCH */
-+ 
-+@@ -351,29 +349,27 @@
-+ NCURSES_EXPORT(void)
-+ _nc_signal_handler(bool enable)
-+ {
-+-    static bool initialized = FALSE;
-+-
-+     T((T_CALLED("_nc_signal_handler(%d)"), enable));
-+ #if USE_SIGTSTP			/* Xenix 2.x doesn't have SIGTSTP, for example */
-+     {
-+ 	static bool ignore_tstp = FALSE;
-+ 
-+ 	if (!ignore_tstp) {
-+-	    static sigaction_t act, oact;
-++	    static sigaction_t new_sigaction, old_sigaction;
-+ 
-+ 	    if (!enable) {
-+-		act.sa_handler = SIG_IGN;
-+-		sigaction(SIGTSTP, &act, &oact);
-+-	    } else if (act.sa_handler != SIG_DFL) {
-+-		sigaction(SIGTSTP, &oact, NULL);
-+-	    } else if (sigaction(SIGTSTP, NULL, &oact) == 0
-+-		       && (oact.sa_handler == SIG_DFL)) {
-+-		sigemptyset(&act.sa_mask);
-++		new_sigaction.sa_handler = SIG_IGN;
-++		sigaction(SIGTSTP, &new_sigaction, &old_sigaction);
-++	    } else if (new_sigaction.sa_handler != SIG_DFL) {
-++		sigaction(SIGTSTP, &old_sigaction, NULL);
-++	    } else if (sigaction(SIGTSTP, NULL, &old_sigaction) == 0
-++		       && (old_sigaction.sa_handler == SIG_DFL)) {
-++		sigemptyset(&new_sigaction.sa_mask);
-+ #ifdef SA_RESTART
-+-		act.sa_flags |= SA_RESTART;
-++		new_sigaction.sa_flags |= SA_RESTART;
-+ #endif /* SA_RESTART */
-+-		act.sa_handler = tstp;
-+-		(void) sigaction(SIGTSTP, &act, NULL);
-++		new_sigaction.sa_handler = tstp;
-++		(void) sigaction(SIGTSTP, &new_sigaction, NULL);
-+ 	    } else {
-+ 		ignore_tstp = TRUE;
-+ 	    }
-+@@ -381,14 +377,14 @@
-+     }
-+ #endif /* !USE_SIGTSTP */
-+ 
-+-    if (!initialized) {
-++    if (!_nc_globals.init_signals) {
-+ 	if (enable) {
-+ 	    CatchIfDefault(SIGINT, cleanup);
-+ 	    CatchIfDefault(SIGTERM, cleanup);
-+ #if USE_SIGWINCH
-+ 	    CatchIfDefault(SIGWINCH, sigwinch);
-+ #endif
-+-	    initialized = TRUE;
-++	    _nc_globals.init_signals = TRUE;
-+ 	}
-+     }
-+     returnVoid;
-+Index: ncurses/tty/lib_twait.c
-+Prereq:  1.51 
-+--- ncurses-5.6/ncurses/tty/lib_twait.c	2006-05-27 21:57:43.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tty/lib_twait.c	2007-08-11 16:32:48.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2004,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -29,6 +29,7 @@
-+ /****************************************************************************
-+  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
-+  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
-++ *     and: Thomas E. Dickey                        1996-on                 *
-+  ****************************************************************************/
-+ 
-+ /*
-+@@ -61,38 +62,42 @@
-+ # endif
-+ #endif
-+ 
-+-MODULE_ID("$Id: lib_twait.c,v 1.51 2006/05/27 21:57:43 tom Exp $")
-++MODULE_ID("$Id: lib_twait.c,v 1.54 2007/08/11 16:32:48 tom Exp $")
-++
-++#if HAVE_GETTIMEOFDAY
-++# define PRECISE_GETTIME 1
-++# define TimeType struct timeval
-++#else
-++# define PRECISE_GETTIME 0
-++# define TimeType time_t
-++#endif
-+ 
-+ static long
-+-_nc_gettime(bool first)
-++_nc_gettime(TimeType * t0, bool first)
-+ {
-+     long res;
-+ 
-+-#if HAVE_GETTIMEOFDAY
-+-# define PRECISE_GETTIME 1
-+-    static struct timeval t0;
-+-    struct timeval t1;
-++#if PRECISE_GETTIME
-++    TimeType t1;
-+     gettimeofday(&t1, (struct timezone *) 0);
-+     if (first) {
-+-	t0 = t1;
-++	*t0 = t1;
-+ 	res = 0;
-+     } else {
-+ 	/* .tv_sec and .tv_usec are unsigned, be careful when subtracting */
-+-	if (t0.tv_usec > t1.tv_usec) {	/* Convert 1s in 1e6 microsecs */
-+-	    t1.tv_usec += 1000000;
-++	if (t0->tv_usec > t1.tv_usec) {
-++	    t1.tv_usec += 1000000;	/* Convert 1s in 1e6 microsecs */
-+ 	    t1.tv_sec--;
-+ 	}
-+-	res = (t1.tv_sec - t0.tv_sec) * 1000
-+-	    + (t1.tv_usec - t0.tv_usec) / 1000;
-++	res = (t1.tv_sec - t0->tv_sec) * 1000
-++	    + (t1.tv_usec - t0->tv_usec) / 1000;
-+     }
-+ #else
-+-# define PRECISE_GETTIME 0
-+-    static time_t t0;
-+     time_t t1 = time((time_t *) 0);
-+     if (first) {
-+-	t0 = t1;
-++	*t0 = t1;
-+     }
-+-    res = (t1 - t0) * 1000;
-++    res = (t1 - *t0) * 1000;
-+ #endif
-+     TR(TRACE_IEVENT, ("%s time: %ld msec", first ? "get" : "elapsed", res));
-+     return res;
-+@@ -147,7 +152,8 @@
-+ {
-+     int fd;
-+     int count;
-+-    int result;
-++    int result = 0;
-++    TimeType t0;
-+ 
-+ #ifdef NCURSES_WGETCH_EVENTS
-+     int timeout_is_event = 0;
-+@@ -160,7 +166,7 @@
-+     struct pollfd *fds = fd_list;
-+ #elif defined(__BEOS__)
-+ #elif HAVE_SELECT
-+-    static fd_set set;
-++    fd_set set;
-+ #endif
-+ 
-+     long starttime, returntime;
-+@@ -180,10 +186,10 @@
-+     }
-+ #endif
-+ 
-+-#if PRECISE_GETTIME
-++#if PRECISE_GETTIME && HAVE_NANOSLEEP
-+   retry:
-+ #endif
-+-    starttime = _nc_gettime(TRUE);
-++    starttime = _nc_gettime(&t0, TRUE);
-+ 
-+     count = 0;
-+ 
-+@@ -362,7 +368,7 @@
-+ 
-+ #endif /* USE_FUNC_POLL, etc */
-+ 
-+-    returntime = _nc_gettime(FALSE);
-++    returntime = _nc_gettime(&t0, FALSE);
-+ 
-+     if (milliseconds >= 0)
-+ 	milliseconds -= (returntime - starttime);
-+Index: ncurses/tty/lib_vidattr.c
-+Prereq:  1.46 
-+--- ncurses-5.6/ncurses/tty/lib_vidattr.c	2006-01-21 23:39:40.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tty/lib_vidattr.c	2007-06-30 21:58:04.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -65,7 +65,7 @@
-+ #include <curses.priv.h>
-+ #include <term.h>
-+ 
-+-MODULE_ID("$Id: lib_vidattr.c,v 1.46 2006/01/21 23:39:40 tom Exp $")
-++MODULE_ID("$Id: lib_vidattr.c,v 1.49 2007/06/30 21:58:04 tom Exp $")
-+ 
-+ #define doPut(mode) TPUTS_TRACE(#mode); tputs(mode, 1, outc)
-+ 
-+@@ -87,10 +87,11 @@
-+ 		} \
-+ 	}
-+ 
-++#define PreviousAttr _nc_prescreen.previous_attr
-++
-+ NCURSES_EXPORT(int)
-+ vidputs(chtype newmode, int (*outc) (int))
-+ {
-+-    static attr_t previous_attr = A_NORMAL;
-+     attr_t turn_on, turn_off;
-+     int pair;
-+     bool reverse = FALSE;
-+@@ -101,18 +102,19 @@
-+ #define fix_pair0 FALSE
-+ #endif
-+ 
-++    newmode &= A_ATTRIBUTES;
-+     T((T_CALLED("vidputs(%s)"), _traceattr(newmode)));
-+ 
-+     /* this allows us to go on whether or not newterm() has been called */
-+     if (SP)
-+-	previous_attr = AttrOf(SCREEN_ATTRS(SP));
-++	PreviousAttr = AttrOf(SCREEN_ATTRS(SP));
-+ 
-+-    TR(TRACE_ATTRS, ("previous attribute was %s", _traceattr(previous_attr)));
-++    TR(TRACE_ATTRS, ("previous attribute was %s", _traceattr(PreviousAttr)));
-+ 
-+     if ((SP != 0)
-+ 	&& (magic_cookie_glitch > 0)) {
-+ #if USE_XMC_SUPPORT
-+-	static chtype table[] =
-++	static const chtype table[] =
-+ 	{
-+ 	    A_STANDOUT,
-+ 	    A_UNDERLINE,
-+@@ -183,7 +185,7 @@
-+ 	newmode &= ~mask;
-+     }
-+ 
-+-    if (newmode == previous_attr)
-++    if (newmode == PreviousAttr)
-+ 	returnCode(OK);
-+ 
-+     pair = PAIR_NUMBER(newmode);
-+@@ -192,17 +194,17 @@
-+ 	newmode &= ~A_REVERSE;
-+     }
-+ 
-+-    turn_off = (~newmode & previous_attr) & ALL_BUT_COLOR;
-+-    turn_on = (newmode & ~previous_attr) & ALL_BUT_COLOR;
-++    turn_off = (~newmode & PreviousAttr) & ALL_BUT_COLOR;
-++    turn_on = (newmode & ~PreviousAttr) & ALL_BUT_COLOR;
-+ 
-+-    SetColorsIf(((pair == 0) && !fix_pair0), previous_attr);
-++    SetColorsIf(((pair == 0) && !fix_pair0), PreviousAttr);
-+ 
-+     if (newmode == A_NORMAL) {
-+-	if ((previous_attr & A_ALTCHARSET) && exit_alt_charset_mode) {
-++	if ((PreviousAttr & A_ALTCHARSET) && exit_alt_charset_mode) {
-+ 	    doPut(exit_alt_charset_mode);
-+-	    previous_attr &= ~A_ALTCHARSET;
-++	    PreviousAttr &= ~A_ALTCHARSET;
-+ 	}
-+-	if (previous_attr) {
-++	if (PreviousAttr) {
-+ 	    if (exit_attribute_mode) {
-+ 		doPut(exit_attribute_mode);
-+ 	    } else {
-+@@ -213,10 +215,10 @@
-+ 		    TurnOff(A_STANDOUT, exit_standout_mode);
-+ 		}
-+ 	    }
-+-	    previous_attr &= ALL_BUT_COLOR;
-++	    PreviousAttr &= ALL_BUT_COLOR;
-+ 	}
-+ 
-+-	SetColorsIf((pair != 0) || fix_pair0, previous_attr);
-++	SetColorsIf((pair != 0) || fix_pair0, PreviousAttr);
-+     } else if (set_attributes) {
-+ 	if (turn_on || turn_off) {
-+ 	    TPUTS_TRACE("set_attributes");
-+@@ -230,9 +232,9 @@
-+ 			(newmode & A_INVIS) != 0,
-+ 			(newmode & A_PROTECT) != 0,
-+ 			(newmode & A_ALTCHARSET) != 0), 1, outc);
-+-	    previous_attr &= ALL_BUT_COLOR;
-++	    PreviousAttr &= ALL_BUT_COLOR;
-+ 	}
-+-	SetColorsIf((pair != 0) || fix_pair0, previous_attr);
-++	SetColorsIf((pair != 0) || fix_pair0, PreviousAttr);
-+     } else {
-+ 
-+ 	TR(TRACE_ATTRS, ("turning %s off", _traceattr(turn_off)));
-+@@ -250,9 +252,9 @@
-+ 	if (turn_off && exit_attribute_mode) {
-+ 	    doPut(exit_attribute_mode);
-+ 	    turn_on |= (newmode & ALL_BUT_COLOR);
-+-	    previous_attr &= ALL_BUT_COLOR;
-++	    PreviousAttr &= ALL_BUT_COLOR;
-+ 	}
-+-	SetColorsIf((pair != 0) || fix_pair0, previous_attr);
-++	SetColorsIf((pair != 0) || fix_pair0, PreviousAttr);
-+ 
-+ 	TR(TRACE_ATTRS, ("turning %s on", _traceattr(turn_on)));
-+ 	/* *INDENT-OFF* */
-+@@ -283,7 +285,7 @@
-+     if (SP)
-+ 	SetAttr(SCREEN_ATTRS(SP), newmode);
-+     else
-+-	previous_attr = newmode;
-++	PreviousAttr = newmode;
-+ 
-+     returnCode(OK);
-+ }
-+Index: ncurses/tty/tty_update.c
-+Prereq:  1.238 
-+--- ncurses-5.6/ncurses/tty/tty_update.c	2006-11-25 22:33:21.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/tty/tty_update.c	2007-10-13 20:03:32.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -74,7 +74,7 @@
-+ #include <ctype.h>
-+ #include <term.h>
-+ 
-+-MODULE_ID("$Id: tty_update.c,v 1.238 2006/11/25 22:33:21 tom Exp $")
-++MODULE_ID("$Id: tty_update.c,v 1.243 2007/10/13 20:03:32 tom Exp $")
-+ 
-+ /*
-+  * This define controls the line-breakout optimization.  Every once in a
-+@@ -289,7 +289,7 @@
-+ #endif
-+     {
-+ 	PUTC(CHDEREF(ch), SP->_ofp);	/* macro's fastest... */
-+-	TRACE_OUTCHARS(1);
-++	COUNT_OUTCHARS(1);
-+     }
-+     SP->_curscol += chlen;
-+     if (char_padding) {
-+@@ -624,13 +624,18 @@
-+ 
-+     T((T_CALLED("doupdate()")));
-+ 
-++    if (curscr == 0
-++	|| newscr == 0)
-++	returnCode(ERR);
-++
-+ #ifdef TRACE
-+-    if (_nc_tracing & TRACE_UPDATE) {
-++    if (USE_TRACEF(TRACE_UPDATE)) {
-+ 	if (curscr->_clear)
-+ 	    _tracef("curscr is clear");
-+ 	else
-+ 	    _tracedump("curscr", curscr);
-+ 	_tracedump("newscr", newscr);
-++	_nc_unlock_global(tracef);
-+     }
-+ #endif /* TRACE */
-+ 
-+@@ -640,7 +645,7 @@
-+ 	SP->_fifohold--;
-+ 
-+ #if USE_SIZECHANGE
-+-    if (SP->_endwin || SP->_sig_winch) {
-++    if (SP->_endwin || _nc_handle_sigwinch(FALSE)) {
-+ 	/*
-+ 	 * This is a transparent extension:  XSI does not address it,
-+ 	 * and applications need not know that ncurses can do it.
-+@@ -666,7 +671,7 @@
-+     }
-+ #if USE_TRACE_TIMES
-+     /* zero the metering machinery */
-+-    _nc_outchars = 0;
-++    RESET_OUTCHARS();
-+     (void) times(&before);
-+ #endif /* USE_TRACE_TIMES */
-+ 
-+@@ -826,9 +831,10 @@
-+ 
-+ #ifdef TRACE
-+ 	/* show altered highlights after magic-cookie check */
-+-	if (_nc_tracing & TRACE_UPDATE) {
-++	if (USE_TRACEF(TRACE_UPDATE)) {
-+ 	    _tracef("After magic-cookie check...");
-+ 	    _tracedump("newscr", newscr);
-++	    _nc_unlock_global(tracef);
-+ 	}
-+ #endif /* TRACE */
-+     }
-+@@ -836,7 +842,6 @@
-+ 
-+     nonempty = 0;
-+     if (curscr->_clear || newscr->_clear) {	/* force refresh ? */
-+-	TR(TRACE_UPDATE, ("clearing and updating from scratch"));
-+ 	ClrUpdate();
-+ 	curscr->_clear = FALSE;	/* reset flag */
-+ 	newscr->_clear = FALSE;	/* reset flag */
-+@@ -967,7 +972,7 @@
-+     NCURSES_CH_T blank = ClrBlank(stdscr);
-+     int nonempty = min(screen_lines, newscr->_maxy + 1);
-+ 
-+-    TR(TRACE_UPDATE, ("ClrUpdate() called"));
-++    TR(TRACE_UPDATE, (T_CALLED("ClrUpdate")));
-+ 
-+     ClearScreen(blank);
-+ 
-+@@ -977,6 +982,8 @@
-+ 
-+     for (i = 0; i < nonempty; i++)
-+ 	TransformLine(i);
-++
-++    TR(TRACE_UPDATE, (T_RETURN("")));
-+ }
-+ 
-+ /*
-+Index: ncurses/widechar/lib_cchar.c
-+Prereq:  1.11 
-+--- ncurses-5.6/ncurses/widechar/lib_cchar.c	2005-01-29 21:29:16.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/widechar/lib_cchar.c	2007-05-12 19:03:06.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 2001-2004,2005 Free Software Foundation, Inc.              *
-++ * Copyright (c) 2001-2005,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -35,7 +35,7 @@
-+ 
-+ #include <curses.priv.h>
-+ 
-+-MODULE_ID("$Id: lib_cchar.c,v 1.11 2005/01/29 21:29:16 tom Exp $")
-++MODULE_ID("$Id: lib_cchar.c,v 1.12 2007/05/12 19:03:06 tom Exp $")
-+ 
-+ /* 
-+  * The SuSv2 description leaves some room for interpretation.  We'll assume wch
-+@@ -54,8 +54,9 @@
-+     int len;
-+     int code = OK;
-+ 
-+-    TR(TRACE_CCALLS, (T_CALLED("setcchar(%p,%s,%ld,%d,%p)"),
-+-		      wcval, _nc_viswbuf(wch), attrs, color_pair, opts));
-++    TR(TRACE_CCALLS, (T_CALLED("setcchar(%p,%s,%lu,%d,%p)"),
-++		      wcval, _nc_viswbuf(wch),
-++		      (unsigned long) attrs, color_pair, opts));
-+ 
-+     len = wcslen(wch);
-+     if (opts != NULL
-+Index: ncurses/widechar/lib_get_wch.c
-+Prereq:  1.13 
-+--- ncurses-5.6/ncurses/widechar/lib_get_wch.c	2006-06-03 17:27:57.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/widechar/lib_get_wch.c	2007-05-12 19:03:16.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 2002-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 2002-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -40,7 +40,7 @@
-+ #include <curses.priv.h>
-+ #include <ctype.h>
-+ 
-+-MODULE_ID("$Id: lib_get_wch.c,v 1.13 2006/06/03 17:27:57 tom Exp $")
-++MODULE_ID("$Id: lib_get_wch.c,v 1.14 2007/05/12 19:03:16 tom Exp $")
-+ 
-+ #if HAVE_MBTOWC && HAVE_MBLEN
-+ #define reset_mbytes(state) mblen(NULL, 0), mbtowc(NULL, NULL, 0)
-+@@ -77,7 +77,7 @@
-+      * _nc_wgetch(), while we want to return a wide character or KEY_xxx code.
-+      */
-+     for (;;) {
-+-	T(("reading %d of %d", count + 1, sizeof(buffer)));
-++	T(("reading %d of %d", (int) count + 1, (int) sizeof(buffer)));
-+ 	code = _nc_wgetch(win, &value, TRUE EVENTLIST_2nd((_nc_eventlist *) 0));
-+ 	if (code == ERR) {
-+ 	    break;
-+Index: ncurses/widechar/lib_in_wchnstr.c
-+Prereq:  1.3 
-+--- ncurses-5.6/ncurses/widechar/lib_in_wchnstr.c	2004-05-16 00:12:30.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/widechar/lib_in_wchnstr.c	2007-02-11 01:00:00.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 2002,2004 Free Software Foundation, Inc.                   *
-++ * Copyright (c) 2002-2004-2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -27,7 +27,7 @@
-+  ****************************************************************************/
-+ 
-+ /****************************************************************************
-+- * Author: Thomas Dickey 2002,2004                                          *
-++ * Author: Thomas Dickey                                                    *
-+  ****************************************************************************/
-+ 
-+ /*
-+@@ -39,27 +39,35 @@
-+ 
-+ #include <curses.priv.h>
-+ 
-+-MODULE_ID("$Id: lib_in_wchnstr.c,v 1.3 2004/05/16 00:12:30 tom Exp $")
-++MODULE_ID("$Id: lib_in_wchnstr.c,v 1.7 2007/02/11 01:00:00 tom Exp $")
-+ 
-+ NCURSES_EXPORT(int)
-+-win_wchnstr(WINDOW *win, cchar_t * wchstr, int n)
-++win_wchnstr(WINDOW *win, cchar_t *wchstr, int n)
-+ {
-+     int code = OK;
-+ 
-+-    TR(TRACE_CALLS, (T_CALLED("win_wchnstr(%p,%p,%d)"), win, wchstr, n));
-++    T((T_CALLED("win_wchnstr(%p,%p,%d)"), win, wchstr, n));
-+     if (win != 0
-+ 	&& wchstr != 0) {
-++	NCURSES_CH_T *src;
-+ 	int row, col;
-+-	int j;
-++	int j, k, limit;
-+ 
-+ 	getyx(win, row, col);
-++	limit = getmaxx(win) - col;
-++	src = &(win->_line[row].text[col]);
-+ 
-+ 	if (n < 0) {
-+-	    n = getmaxx(win) + 1 - getcurx(win);
-++	    n = limit;
-++	} else if (n > limit) {
-++	    n = limit;
-+ 	}
-+-	for (j = 0; j < n; ++j) {
-+-	    wchstr[j] = win->_line[row].text[col + j];
-++	for (j = k = 0; j < n; ++j) {
-++	    if (j == 0 || !WidecExt(src[j]) || isWidecBase(src[j])) {
-++		wchstr[k++] = src[j];
-++	    }
-+ 	}
-++	memset(&(wchstr[k]), 0, sizeof(*wchstr));
-+ 	T(("result = %s", _nc_viscbuf(wchstr, n)));
-+     } else {
-+ 	code = ERR;
-+Index: ncurses/widechar/lib_key_name.c
-+--- /dev/null	2007-12-08 19:14:25.328509000 +0000
-++++ ncurses-5.6-20071201/ncurses/widechar/lib_key_name.c	2007-06-12 21:01:13.000000000 +0000
-+@@ -0,0 +1,62 @@
-++/****************************************************************************
-++ * Copyright (c) 2007 Free Software Foundation, Inc.                        *
-++ *                                                                          *
-++ * Permission is hereby granted, free of charge, to any person obtaining a  *
-++ * copy of this software and associated documentation files (the            *
-++ * "Software"), to deal in the Software without restriction, including      *
-++ * without limitation the rights to use, copy, modify, merge, publish,      *
-++ * distribute, distribute with modifications, sublicense, and/or sell       *
-++ * copies of the Software, and to permit persons to whom the Software is    *
-++ * furnished to do so, subject to the following conditions:                 *
-++ *                                                                          *
-++ * The above copyright notice and this permission notice shall be included  *
-++ * in all copies or substantial portions of the Software.                   *
-++ *                                                                          *
-++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-++ *                                                                          *
-++ * Except as contained in this notice, the name(s) of the above copyright   *
-++ * holders shall not be used in advertising or otherwise to promote the     *
-++ * sale, use or other dealings in this Software without prior written       *
-++ * authorization.                                                           *
-++ ****************************************************************************/
-++
-++/*
-++**	lib_key_name.c
-++**
-++**	The routine key_name().
-++**
-++*/
-++
-++#include <curses.priv.h>
-++
-++MODULE_ID("$Id: lib_key_name.c,v 1.2 2007/06/12 21:01:13 tom Exp $")
-++
-++NCURSES_EXPORT(NCURSES_CONST char *)
-++key_name(wchar_t c)
-++{
-++    cchar_t my_cchar;
-++    wchar_t *my_wchars;
-++    size_t len;
-++
-++    /* FIXME: move to _nc_globals */
-++    static char result[MB_LEN_MAX + 1];
-++
-++    memset(&my_cchar, 0, sizeof(my_cchar));
-++    my_cchar.chars[0] = c;
-++    my_cchar.chars[1] = L'\0';
-++
-++    my_wchars = wunctrl(&my_cchar);
-++    len = wcstombs(result, my_wchars, sizeof(result) - 1);
-++    if (isEILSEQ(len) || (len == 0)) {
-++	return "UNKNOWN KEY";
-++    }
-++
-++    result[len] = '\0';
-++    return result;
-++}
-+Index: ncurses/widechar/lib_unget_wch.c
-+Prereq:  1.7 
-+--- ncurses-5.6/ncurses/widechar/lib_unget_wch.c	2004-12-05 01:21:31.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/widechar/lib_unget_wch.c	2007-11-25 00:57:00.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 2002-2003,2004 Free Software Foundation, Inc.              *
-++ * Copyright (c) 2002-2004,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -39,26 +39,30 @@
-+ 
-+ #include <curses.priv.h>
-+ 
-+-MODULE_ID("$Id: lib_unget_wch.c,v 1.7 2004/12/05 01:21:31 tom Exp $")
-++MODULE_ID("$Id: lib_unget_wch.c,v 1.9 2007/11/25 00:57:00 tom Exp $")
-+ 
-+-#ifdef linux
-+ /*
-+- * glibc's wcrtomb() function is broken - does not return the proper value
-+- * when target is null (noted for glibc 2.3.2).  This is a workaround.
-++ * Wrapper for wcrtomb() which obtains the length needed for the given
-++ * wide-character 'source'.
-+  */
-+ NCURSES_EXPORT(size_t)
-+ _nc_wcrtomb(char *target, wchar_t source, mbstate_t * state)
-+ {
-++    int result;
-++
-+     if (target == 0) {
-+ 	wchar_t temp[2];
-+ 	const wchar_t *tempp = temp;
-+ 	temp[0] = source;
-+ 	temp[1] = 0;
-+-	return wcsrtombs(NULL, &tempp, 0, state);
-++	result = wcsrtombs(NULL, &tempp, 0, state);
-++    } else {
-++	result = wcrtomb(target, source, state);
-+     }
-+-    return wcrtomb(target, source, state);
-++    if (!isEILSEQ(result) && (result == 0))
-++	result = 1;
-++    return result;
-+ }
-+-#endif
-+ 
-+ NCURSES_EXPORT(int)
-+ unget_wch(const wchar_t wch)
-+Index: ncurses/widechar/lib_vid_attr.c
-+Prereq:  1.4 
-+--- ncurses-5.6/ncurses/widechar/lib_vid_attr.c	2006-11-26 00:26:00.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/widechar/lib_vid_attr.c	2007-06-30 22:03:02.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 2002-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 2002-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -33,7 +33,7 @@
-+ #include <curses.priv.h>
-+ #include <term.h>
-+ 
-+-MODULE_ID("$Id: lib_vid_attr.c,v 1.4 2006/11/26 00:26:00 tom Exp $")
-++MODULE_ID("$Id: lib_vid_attr.c,v 1.5 2007/06/30 22:03:02 tom Exp $")
-+ 
-+ #define doPut(mode) TPUTS_TRACE(#mode); tputs(mode, 1, outc)
-+ 
-+@@ -72,6 +72,7 @@
-+ #define fix_pair0 FALSE
-+ #endif
-+ 
-++    newmode &= A_ATTRIBUTES;
-+     T((T_CALLED("vid_puts(%s,%d)"), _traceattr(newmode), pair));
-+ 
-+     /* this allows us to go on whether or not newterm() has been called */
-+Index: ncurses/widechar/lib_wunctrl.c
-+Prereq:  1.8 
-+--- ncurses-5.6/ncurses/widechar/lib_wunctrl.c	2005-04-16 18:10:44.000000000 +0000
-++++ ncurses-5.6-20071201/ncurses/widechar/lib_wunctrl.c	2007-06-12 20:22:32.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 2001-2003,2005 Free Software Foundation, Inc.              *
-++ * Copyright (c) 2001-2005,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -35,23 +35,21 @@
-+ 
-+ #include <curses.priv.h>
-+ 
-+-#if USE_WIDEC_SUPPORT
-+-
-+-MODULE_ID("$Id: lib_wunctrl.c,v 1.8 2005/04/16 18:10:44 tom Exp $")
-++MODULE_ID("$Id: lib_wunctrl.c,v 1.12 2007/06/12 20:22:32 tom Exp $")
-+ 
-+ NCURSES_EXPORT(wchar_t *)
-+ wunctrl(cchar_t *wc)
-+ {
-+-    static wchar_t str[5], *sp;
-++    static wchar_t str[CCHARW_MAX + 1], *sp;
-+ 
-+     if (Charable(*wc)) {
-+ 	const char *p = unctrl((unsigned) _nc_to_char((wint_t) CharOf(*wc)));
-+ 
-+-	for (sp = str; *p;)
-+-	    *sp++ = _nc_to_widechar(*p++);
-++	for (sp = str; *p; ++p) {
-++	    *sp++ = _nc_to_widechar(*p);
-++	}
-++	*sp = 0;
-+ 	return str;
-+     } else
-+ 	return wc->chars;
-+ }
-+-
-+-#endif
-+Index: panel/Makefile.in
-+Prereq:  1.47 
-+--- ncurses-5.6/panel/Makefile.in	2006-10-14 20:40:36.000000000 +0000
-++++ ncurses-5.6-20071201/panel/Makefile.in	2007-04-28 14:56:11.000000000 +0000
-+@@ -1,6 +1,6 @@
-+-# $Id: Makefile.in,v 1.47 2006/10/14 20:40:36 tom Exp $
-++# $Id: Makefile.in,v 1.52 2007/04/28 14:56:11 tom Exp $
-+ ##############################################################################
-+-# Copyright (c) 1998-2003,2006 Free Software Foundation, Inc.                #
-++# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -27,7 +27,7 @@
-+ # authorization.                                                             #
-+ ##############################################################################
-+ #
-+-# Author: Thomas E. Dickey 1996-2002
-++# Author: Thomas E. Dickey 1996-on
-+ #
-+ # Makefile for panels source code.
-+ #
-+@@ -92,7 +92,7 @@
-+ 
-+ CFLAGS_DEFAULT	= $(CFLAGS_@DFT_UPR_MODEL@)
-+ 
-+-LINK		= $(LIBTOOL_LINK) $(CC)
-++LINK		= $(LIBTOOL_LINK)
-+ LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
-+ 
-+ SHLIB_DIRS	= -L../lib
-+@@ -107,8 +107,6 @@
-+ 
-+ RANLIB		= @LIB_PREP@
-+ 
-+-IMPORT_LIB	= @IMPORT_LIB@
-+-SHARED_LIB	= @SHARED_LIB@
-+ LIBRARIES	= @LIBS_TO_MAKE@
-+ 
-+ LINT		= @LINT@
-+@@ -127,7 +125,7 @@
-+ 
-+ $(DESTDIR)$(bindir) \
-+ $(DESTDIR)$(libdir) :
-+-	sh $(srcdir)/../mkinstalldirs $@
-++	sh $(srcdir)/../mkdirs.sh $@
-+ 
-+ # make a copy to simplify include-paths while still keeping panel's include
-+ # file in this directory.
-+Index: panel/headers
-+--- ncurses-5.6/panel/headers	1998-02-11 12:14:01.000000000 +0000
-++++ ncurses-5.6-20071201/panel/headers	2006-12-24 16:25:45.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ ##############################################################################
-+-# Copyright (c) 1998 Free Software Foundation, Inc.                          #
-++# Copyright (c) 1998,2006 Free Software Foundation, Inc.                     #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -29,3 +29,4 @@
-+ # Author: Thomas E. Dickey <dickey@clark.net> 1996
-+ #
-+ $(srcdir)/panel.h
-++# vile:makemode
-+Index: panel/modules
-+--- ncurses-5.6/panel/modules	1998-02-11 12:14:02.000000000 +0000
-++++ ncurses-5.6-20071201/panel/modules	2006-12-24 00:53:17.000000000 +0000
-+@@ -1,5 +1,6 @@
-++# $Id: modules,v 1.9 2006/12/24 00:53:17 tom Exp $
-+ ##############################################################################
-+-# Copyright (c) 1998 Free Software Foundation, Inc.                          #
-++# Copyright (c) 1998,2006 Free Software Foundation, Inc.                     #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -26,7 +27,7 @@
-+ # authorization.                                                             #
-+ ##############################################################################
-+ #
-+-# Author: Thomas E. Dickey <dickey@clark.net> 1995,1997
-++# Author: Thomas E. Dickey	1995-on
-+ #
-+ 
-+ @ base
-+@@ -47,3 +48,4 @@
-+ p_user		lib		$(srcdir)	$(PANEL_PRIV_H)
-+ p_win		lib		$(srcdir)	$(PANEL_PRIV_H)
-+ 
-++# vile:makemode
-+Index: progs/Makefile.in
-+Prereq:  1.70 
-+--- ncurses-5.6/progs/Makefile.in	2006-12-17 15:55:48.000000000 +0000
-++++ ncurses-5.6-20071201/progs/Makefile.in	2007-10-13 22:25:53.000000000 +0000
-+@@ -1,6 +1,6 @@
-+-# $Id: Makefile.in,v 1.70 2006/12/17 15:55:48 tom Exp $
-++# $Id: Makefile.in,v 1.77 2007/10/13 22:25:53 tom Exp $
-+ ##############################################################################
-+-# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
-++# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -98,9 +98,8 @@
-+ LOCAL_LIBDIR	= @top_builddir@/lib
-+ 
-+ LD		= @LD@
-+-LINK		= @LINK_PROGS@ $(LIBTOOL_LINK) $(CC)
-+-LDFLAGS		= @EXTRA_LDFLAGS@ \
-+-		@TINFO_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@
-++LINK		= @LINK_PROGS@ $(LIBTOOL_LINK)
-++LDFLAGS		= @EXTRA_LDFLAGS@ @LDFLAGS@
-+ 
-+ LDFLAGS_LIBTOOL	= $(LDFLAGS) $(CFLAGS_LIBTOOL)
-+ LDFLAGS_NORMAL	= $(LDFLAGS) $(CFLAGS_NORMAL)
-+@@ -110,6 +109,12 @@
-+ 
-+ LDFLAGS_DEFAULT	= $(LDFLAGS_@DFT_UPR_MODEL@)
-+ 
-++LIBS_TIC	= @LDFLAGS_STATIC@ @TICS_ARGS@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
-++LDFLAGS_TIC	= $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TIC)
-++
-++LIBS_TINFO	= @LDFLAGS_STATIC@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
-++LDFLAGS_TINFO	= $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO)
-++
-+ LINT		= @LINT@
-+ LINT_OPTS	= @LINT_OPTS@
-+ LINT_LIBS	= -lncurses @LIBS@
-+@@ -200,7 +205,7 @@
-+ 	-@rm -f $(DESTDIR)$(bindir)/$(actual_reset)
-+ 
-+ $(DESTDIR)$(bindir) :
-+-	sh $(srcdir)/../mkinstalldirs $@
-++	sh $(srcdir)/../mkdirs.sh $@
-+ 
-+ #
-+ # Utilities normally built by make all start here
-+@@ -211,40 +216,38 @@
-+ 	$(MODEL)/dump_entry$o
-+ 
-+ tic$x: $(DEPS_TIC) $(DEPS_CURSES) transform.h
-+-	@ECHO_LINK@ $(LINK) $(DEPS_TIC) $(LDFLAGS_DEFAULT) -o $@
-++	@ECHO_LINK@ $(LINK) $(DEPS_TIC) $(LDFLAGS_TIC) -o $@
-+ 
-+ DEPS_TOE = \
-+-	$(MODEL)/toe$o \
-+-	$(MODEL)/dump_entry$o
-++	$(MODEL)/toe$o
-+ 
-+ toe$x: $(DEPS_TOE) $(DEPS_CURSES)
-+-	@ECHO_LINK@ $(LINK) $(DEPS_TOE) $(LDFLAGS_DEFAULT) -o $@
-++	@ECHO_LINK@ $(LINK) $(DEPS_TOE) $(LDFLAGS_TIC) -o $@
-+ 
-+ DEPS_CLEAR = \
-+ 	$(MODEL)/clear$o
-+ 
-+ clear$x: $(DEPS_CLEAR) $(DEPS_CURSES)
-+-	@ECHO_LINK@ $(LINK) $(DEPS_CLEAR) $(LDFLAGS_DEFAULT) -o $@
-++	@ECHO_LINK@ $(LINK) $(DEPS_CLEAR) $(LDFLAGS_TINFO) -o $@
-+ 
-+ DEPS_TPUT = \
-+ 	$(MODEL)/tput$o
-+ 
-+ tput$x: $(DEPS_TPUT) $(DEPS_CURSES) transform.h
-+-	@ECHO_LINK@ $(LINK) $(DEPS_TPUT) $(LDFLAGS_DEFAULT) -o $@
-++	@ECHO_LINK@ $(LINK) $(DEPS_TPUT) $(LDFLAGS_TINFO) -o $@
-+ 
-+ DEPS_INFOCMP = \
-+ 	$(MODEL)/infocmp$o \
-+ 	$(MODEL)/dump_entry$o
-+ 
-+ infocmp$x: $(DEPS_INFOCMP) $(DEPS_CURSES)
-+-	@ECHO_LINK@ $(LINK) $(DEPS_INFOCMP) $(LDFLAGS_DEFAULT) -o $@
-++	@ECHO_LINK@ $(LINK) $(DEPS_INFOCMP) $(LDFLAGS_TIC) -o $@
-+ 
-+ DEPS_TSET = \
-+-	$(MODEL)/tset$o \
-+-	$(MODEL)/dump_entry$o
-++	$(MODEL)/tset$o
-+ 
-+ tset$x: $(DEPS_TSET) $(DEPS_CURSES) transform.h
-+-	@ECHO_LINK@ $(LINK) $(DEPS_TSET) $(LDFLAGS_DEFAULT) -o $@
-++	@ECHO_LINK@ $(LINK) $(DEPS_TSET) $(LDFLAGS_TINFO) -o $@
-+ 
-+ termsort.c: $(srcdir)/MKtermsort.sh
-+ 	sh $(srcdir)/MKtermsort.sh $(AWK) $(srcdir)/../include/@TERMINFO_CAPS@ >$@
-+Index: progs/clear.c
-+Prereq:  1.10 
-+--- ncurses-5.6/progs/clear.c	2006-05-20 17:47:47.000000000 +0000
-++++ ncurses-5.6-20071201/progs/clear.c	2007-10-13 22:16:02.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -36,9 +36,10 @@
-+  * clear.c --  clears the terminal's screen
-+  */
-+ 
-++#define USE_LIBTINFO
-+ #include <progs.priv.h>
-+ 
-+-MODULE_ID("$Id: clear.c,v 1.10 2006/05/20 17:47:47 tom Exp $")
-++MODULE_ID("$Id: clear.c,v 1.11 2007/10/13 22:16:02 tom Exp $")
-+ 
-+ static int
-+ putch(int c)
-+Index: progs/dump_entry.c
-+Prereq:  1.79 
-+--- ncurses-5.6/progs/dump_entry.c	2006-09-30 20:18:15.000000000 +0000
-++++ ncurses-5.6-20071201/progs/dump_entry.c	2007-08-25 20:05:35.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -39,7 +39,7 @@
-+ #include "termsort.c"		/* this C file is generated */
-+ #include <parametrized.h>	/* so is this */
-+ 
-+-MODULE_ID("$Id: dump_entry.c,v 1.79 2006/09/30 20:18:15 tom Exp $")
-++MODULE_ID("$Id: dump_entry.c,v 1.81 2007/08/25 20:05:35 tom Exp $")
-+ 
-+ #define INDENT			8
-+ #define DISCARD(string) string = ABSENT_STRING
-+@@ -352,14 +352,17 @@
-+ 	}
-+ 	break;
-+ 
-++#define is_termcap(type) (idx < (int) sizeof(type##_from_termcap) && \
-++			  type##_from_termcap[idx])
-++
-+     case V_BSD:		/* BSD */
-+ 	switch (type) {
-+ 	case BOOLEAN:
-+-	    return bool_from_termcap[idx];
-++	    return is_termcap(bool);
-+ 	case NUMBER:
-+-	    return num_from_termcap[idx];
-++	    return is_termcap(num);
-+ 	case STRING:
-+-	    return str_from_termcap[idx];
-++	    return is_termcap(str);
-+ 	}
-+ 	break;
-+     }
-+@@ -788,11 +791,11 @@
-+      * Much more work should be done on this to support dumping termcaps.
-+      */
-+     if (tversion == V_HPUX) {
-+-	if (memory_lock) {
-++	if (VALID_STRING(memory_lock)) {
-+ 	    (void) sprintf(buffer, "meml=%s", memory_lock);
-+ 	    WRAP_CONCAT;
-+ 	}
-+-	if (memory_unlock) {
-++	if (VALID_STRING(memory_unlock)) {
-+ 	    (void) sprintf(buffer, "memu=%s", memory_unlock);
-+ 	    WRAP_CONCAT;
-+ 	}
-+@@ -1223,7 +1226,7 @@
-+ 	bool fix_needed = FALSE;
-+ 
-+ 	for (n = 0, source = 0; acs_chars[n] != 0; n++) {
-+-	    target = acs_chars[n];
-++	    target = UChar(acs_chars[n]);
-+ 	    if (source >= target) {
-+ 		fix_needed = TRUE;
-+ 		break;
-+@@ -1235,7 +1238,7 @@
-+ 	if (fix_needed) {
-+ 	    memset(mapped, 0, sizeof(mapped));
-+ 	    for (n = 0; acs_chars[n] != 0; n++) {
-+-		source = acs_chars[n];
-++		source = UChar(acs_chars[n]);
-+ 		if ((target = (unsigned char) acs_chars[n + 1]) != 0) {
-+ 		    mapped[source] = target;
-+ 		    n++;
-+Index: progs/infocmp.c
-+Prereq:  1.85 
-+--- ncurses-5.6/progs/infocmp.c	2006-08-19 21:20:37.000000000 +0000
-++++ ncurses-5.6-20071201/progs/infocmp.c	2007-11-17 23:34:26.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -35,18 +35,18 @@
-+ /*
-+  *	infocmp.c -- decompile an entry, or compare two entries
-+  *		written by Eric S. Raymond
-++ *		and Thomas E Dickey
-+  */
-+ 
-+ #include <progs.priv.h>
-+ 
-+ #include <dump_entry.h>
-+ 
-+-MODULE_ID("$Id: infocmp.c,v 1.85 2006/08/19 21:20:37 tom Exp $")
-++MODULE_ID("$Id: infocmp.c,v 1.94 2007/11/17 23:34:26 tom Exp $")
-+ 
-+ #define L_CURL "{"
-+ #define R_CURL "}"
-+ 
-+-#define MAXTERMS	32	/* max # terminal arguments we can handle */
-+ #define MAX_STRING	1024	/* maximum formatted string */
-+ 
-+ const char *_nc_progname = "infocmp";
-+@@ -60,8 +60,7 @@
-+  *
-+  ***************************************************************************/
-+ 
-+-static char *tname[MAXTERMS];	/* terminal type names */
-+-static ENTRY entries[MAXTERMS];	/* terminfo entries */
-++static ENTRY *entries;		/* terminfo entries */
-+ static int termcount;		/* count of terminal entries */
-+ 
-+ static bool limited = TRUE;	/* "-r" option is not set */
-+@@ -96,7 +95,8 @@
-+     while (termcount-- > 0)
-+ 	_nc_free_termtype(&entries[termcount].tterm);
-+     _nc_leaks_dump_entry();
-+-    _nc_free_and_exit(code);
-++    free(entries);
-++    _nc_free_tic(code);
-+ }
-+ #endif
-+ 
-+@@ -932,7 +932,8 @@
-+ 		case C_DIFFERENCE:
-+ 		    if (itrace)
-+ 			(void) fprintf(stderr,
-+-				       "infocmp: dumping differences\n");
-++				       "%s: dumping differences\n",
-++				       _nc_progname);
-+ 		    (void) printf("comparing %s to %s.\n", name1, name2);
-+ 		    compare_entry(compare_predicate, &entries->tterm, quiet);
-+ 		    break;
-+@@ -940,7 +941,8 @@
-+ 		case C_COMMON:
-+ 		    if (itrace)
-+ 			(void) fprintf(stderr,
-+-				       "infocmp: dumping common capabilities\n");
-++				       "%s: dumping common capabilities\n",
-++				       _nc_progname);
-+ 		    (void) printf("comparing %s to %s.\n", name1, name2);
-+ 		    compare_entry(compare_predicate, &entries->tterm, quiet);
-+ 		    break;
-+@@ -948,7 +950,8 @@
-+ 		case C_NAND:
-+ 		    if (itrace)
-+ 			(void) fprintf(stderr,
-+-				       "infocmp: dumping differences\n");
-++				       "%s: dumping differences\n",
-++				       _nc_progname);
-+ 		    (void) printf("comparing %s to %s.\n", name1, name2);
-+ 		    compare_entry(compare_predicate, &entries->tterm, quiet);
-+ 		    break;
-+@@ -1083,7 +1086,6 @@
-+ 	    }
-+ 	    *tp++ = '"';
-+ 	    *tp = '\0';
-+-	    size += (strlen(term->Strings[n]) + 1);
-+ 	    (void) printf("static char %-20s[] = %s;\n",
-+ 			  string_variable(ExtStrname(term, n, strnames)), buf);
-+ 	}
-+@@ -1237,7 +1239,8 @@
-+ 
-+     if ((terminal = getenv("TERM")) == 0) {
-+ 	(void) fprintf(stderr,
-+-		       "infocmp: environment variable TERM not set\n");
-++		       "%s: environment variable TERM not set\n",
-++		       _nc_progname);
-+ 	exit(EXIT_FAILURE);
-+     }
-+     return terminal;
-+@@ -1252,10 +1255,15 @@
-+ int
-+ main(int argc, char *argv[])
-+ {
-+-    char *firstdir, *restdir;
-+     /* Avoid "local data >32k" error with mwcc */
-+     /* Also avoid overflowing smaller stacks on systems like AmigaOS */
-+-    path *tfile = (path *) malloc(sizeof(path) * MAXTERMS);
-++    path *tfile = 0;
-++    char **tname = 0;
-++    int maxterms;
-++
-++    char **myargv;
-++
-++    char *firstdir, *restdir;
-+     int c, i, len;
-+     bool formatted = FALSE;
-+     bool filecompare = FALSE;
-+@@ -1270,9 +1278,16 @@
-+     use_extended_names(FALSE);
-+ #endif
-+ 
-++    _nc_progname = _nc_rootname(argv[0]);
-++
-++    /* make sure we have enough space to add two terminal entries */
-++    myargv = typeCalloc(char *, argc + 3);
-++    memcpy(myargv, argv, sizeof(char *) * argc);
-++    argv = myargv;
-++
-+     while ((c = getopt(argc,
-+ 		       argv,
-+-		       "1A:aB:CcdEeFfGgIiLlnpqR:rs:TtUuVv:w:x")) != EOF) {
-++		       "1A:aB:CcdEeFfGgIiLlnpqR:rs:TtUuVv:w:x")) != -1) {
-+ 	switch (c) {
-+ 	case '1':
-+ 	    mwidth = 0;
-+@@ -1373,7 +1388,6 @@
-+ 
-+ 	case 'r':
-+ 	    tversion = 0;
-+-	    limited = FALSE;
-+ 	    break;
-+ 
-+ 	case 's':
-+@@ -1387,7 +1401,8 @@
-+ 		sortmode = S_TERMCAP;
-+ 	    else {
-+ 		(void) fprintf(stderr,
-+-			       "infocmp: unknown sort mode\n");
-++			       "%s: unknown sort mode\n",
-++			       _nc_progname);
-+ 		ExitProgram(EXIT_FAILURE);
-+ 	    }
-+ 	    break;
-+@@ -1435,6 +1450,18 @@
-+ 	}
-+     }
-+ 
-++    maxterms = (argc + 1 - optind);
-++    tfile = typeMalloc(path, maxterms);
-++    tname = typeCalloc(char *, maxterms);
-++    entries = typeCalloc(ENTRY, maxterms);
-++
-++    if (tfile == 0
-++	|| tname == 0
-++	|| entries == 0) {
-++	fprintf(stderr, "%s: not enough memory\n", _nc_progname);
-++	ExitProgram(EXIT_FAILURE);
-++    }
-++
-+     /* by default, sort by terminfo name */
-+     if (sortmode == S_DEFAULT)
-+ 	sortmode = S_TERMINFO;
-+@@ -1458,53 +1485,56 @@
-+ 	/* grab the entries */
-+ 	termcount = 0;
-+ 	for (; optind < argc; optind++) {
-+-	    if (termcount >= MAXTERMS) {
-+-		(void) fprintf(stderr,
-+-			       "infocmp: too many terminal type arguments\n");
-+-		ExitProgram(EXIT_FAILURE);
-+-	    } else {
-+-		const char *directory = termcount ? restdir : firstdir;
-+-		int status;
-++	    const char *directory = termcount ? restdir : firstdir;
-++	    int status;
-+ 
-+-		tname[termcount] = argv[optind];
-++	    tname[termcount] = argv[optind];
-+ 
-+-		if (directory) {
-++	    if (directory) {
-+ #if USE_DATABASE
-+-		    (void) sprintf(tfile[termcount], "%s/%c/%s",
-+-				   directory,
-+-				   *argv[optind], argv[optind]);
-+-		    if (itrace)
-+-			(void) fprintf(stderr,
-+-				       "infocmp: reading entry %s from file %s\n",
-+-				       argv[optind], tfile[termcount]);
-+-
-+-		    status = _nc_read_file_entry(tfile[termcount],
-+-						 &entries[termcount].tterm);
-++#if MIXEDCASE_FILENAMES
-++#define LEAF_FMT "%c"
-+ #else
-+-		    (void) fprintf(stderr, "terminfo files not supported\n");
-+-		    ExitProgram(EXIT_FAILURE);
-++#define LEAF_FMT "%02x"
-+ #endif
-+-		} else {
-+-		    if (itrace)
-+-			(void) fprintf(stderr,
-+-				       "infocmp: reading entry %s from database\n",
-+-				       tname[termcount]);
-+-
-+-		    status = _nc_read_entry(tname[termcount],
-+-					    tfile[termcount],
-+-					    &entries[termcount].tterm);
-+-		    directory = TERMINFO;	/* for error message */
-+-		}
-++		(void) sprintf(tfile[termcount], "%s/" LEAF_FMT "/%s",
-++			       directory,
-++			       UChar(*argv[optind]), argv[optind]);
-++		if (itrace)
-++		    (void) fprintf(stderr,
-++				   "%s: reading entry %s from file %s\n",
-++				   _nc_progname,
-++				   argv[optind], tfile[termcount]);
-+ 
-+-		if (status <= 0) {
-++		status = _nc_read_file_entry(tfile[termcount],
-++					     &entries[termcount].tterm);
-++#else
-++		(void) fprintf(stderr, "%s: terminfo files not supported\n",
-++			       _nc_progname);
-++		ExitProgram(EXIT_FAILURE);
-++#endif
-++	    } else {
-++		if (itrace)
-+ 		    (void) fprintf(stderr,
-+-				   "infocmp: couldn't open terminfo file %s.\n",
-+-				   tfile[termcount]);
-+-		    ExitProgram(EXIT_FAILURE);
-+-		}
-+-		repair_acsc(&entries[termcount].tterm);
-+-		termcount++;
-++				   "%s: reading entry %s from database\n",
-++				   _nc_progname,
-++				   tname[termcount]);
-++
-++		status = _nc_read_entry(tname[termcount],
-++					tfile[termcount],
-++					&entries[termcount].tterm);
-++		directory = TERMINFO;	/* for error message */
-++	    }
-++
-++	    if (status <= 0) {
-++		(void) fprintf(stderr,
-++			       "%s: couldn't open terminfo file %s.\n",
-++			       _nc_progname,
-++			       tfile[termcount]);
-++		ExitProgram(EXIT_FAILURE);
-+ 	    }
-++	    repair_acsc(&entries[termcount].tterm);
-++	    termcount++;
-+ 	}
-+ 
-+ #if NCURSES_XNAMES
-+@@ -1542,7 +1572,8 @@
-+ 	    case C_DEFAULT:
-+ 		if (itrace)
-+ 		    (void) fprintf(stderr,
-+-				   "infocmp: about to dump %s\n",
-++				   "%s: about to dump %s\n",
-++				   _nc_progname,
-+ 				   tname[0]);
-+ 		(void) printf("#\tReconstructed via infocmp from file: %s\n",
-+ 			      tfile[0]);
-+@@ -1553,12 +1584,12 @@
-+ 			   NULL);
-+ 		len = show_entry();
-+ 		if (itrace)
-+-		    (void) fprintf(stderr, "infocmp: length %d\n", len);
-++		    (void) fprintf(stderr, "%s: length %d\n", _nc_progname, len);
-+ 		break;
-+ 
-+ 	    case C_DIFFERENCE:
-+ 		if (itrace)
-+-		    (void) fprintf(stderr, "infocmp: dumping differences\n");
-++		    (void) fprintf(stderr, "%s: dumping differences\n", _nc_progname);
-+ 		(void) printf("comparing %s to %s.\n", tname[0], tname[1]);
-+ 		compare_entry(compare_predicate, &entries->tterm, quiet);
-+ 		break;
-+@@ -1566,7 +1597,8 @@
-+ 	    case C_COMMON:
-+ 		if (itrace)
-+ 		    (void) fprintf(stderr,
-+-				   "infocmp: dumping common capabilities\n");
-++				   "%s: dumping common capabilities\n",
-++				   _nc_progname);
-+ 		(void) printf("comparing %s to %s.\n", tname[0], tname[1]);
-+ 		compare_entry(compare_predicate, &entries->tterm, quiet);
-+ 		break;
-+@@ -1574,14 +1606,15 @@
-+ 	    case C_NAND:
-+ 		if (itrace)
-+ 		    (void) fprintf(stderr,
-+-				   "infocmp: dumping differences\n");
-++				   "%s: dumping differences\n",
-++				   _nc_progname);
-+ 		(void) printf("comparing %s to %s.\n", tname[0], tname[1]);
-+ 		compare_entry(compare_predicate, &entries->tterm, quiet);
-+ 		break;
-+ 
-+ 	    case C_USEALL:
-+ 		if (itrace)
-+-		    (void) fprintf(stderr, "infocmp: dumping use entry\n");
-++		    (void) fprintf(stderr, "%s: dumping use entry\n", _nc_progname);
-+ 		dump_entry(&entries[0].tterm,
-+ 			   suppress_untranslatable,
-+ 			   limited,
-+@@ -1592,7 +1625,7 @@
-+ 					  || outform == F_TCONVERR));
-+ 		len = show_entry();
-+ 		if (itrace)
-+-		    (void) fprintf(stderr, "infocmp: length %d\n", len);
-++		    (void) fprintf(stderr, "%s: length %d\n", _nc_progname, len);
-+ 		break;
-+ 	    }
-+ 	}
-+@@ -1606,7 +1639,11 @@
-+     else
-+ 	file_comparison(argc - optind, argv + optind);
-+ 
-++#if NO_LEAKS
-++    free(myargv);
-+     free(tfile);
-++    free(tname);
-++#endif
-+     ExitProgram(EXIT_SUCCESS);
-+ }
-+ 
-+Index: progs/modules
-+Prereq:  1.12 
-+--- ncurses-5.6/progs/modules	2005-09-25 00:54:22.000000000 +0000
-++++ ncurses-5.6-20071201/progs/modules	2006-12-24 00:53:21.000000000 +0000
-+@@ -1,7 +1,7 @@
-+-# $Id: modules,v 1.12 2005/09/25 00:54:22 tom Exp $
-++# $Id: modules,v 1.13 2006/12/24 00:53:21 tom Exp $
-+ # Program modules (some are in ncurses lib!)
-+ ##############################################################################
-+-# Copyright (c) 1998-2000,2005 Free Software Foundation, Inc.                #
-++# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -28,7 +28,7 @@
-+ # authorization.                                                             #
-+ ##############################################################################
-+ #
-+-# Author: Thomas E. Dickey <dickey@clark.net> 1995,1997
-++# Author: Thomas E. Dickey	1995-on
-+ #
-+ 
-+ @ base
-+@@ -39,3 +39,5 @@
-+ infocmp		progs		$(srcdir)	$(HEADER_DEPS)             $(srcdir)/dump_entry.h
-+ tput		progs		$(srcdir)	$(HEADER_DEPS) transform.h termsort.c
-+ tset		progs		$(srcdir)	$(HEADER_DEPS) transform.h $(srcdir)/dump_entry.h ../include/termcap.h
-++
-++# vile:makemode
-+Index: progs/progs.priv.h
-+Prereq:  1.30 
-+--- ncurses-5.6/progs/progs.priv.h	2006-11-26 00:28:01.000000000 +0000
-++++ ncurses-5.6-20071201/progs/progs.priv.h	2007-10-13 20:33:53.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -30,7 +30,7 @@
-+  *  Author: Thomas E. Dickey                    1997-on                     *
-+  ****************************************************************************/
-+ /*
-+- * $Id: progs.priv.h,v 1.30 2006/11/26 00:28:01 tom Exp $
-++ * $Id: progs.priv.h,v 1.33 2007/10/13 20:33:53 tom Exp $
-+  *
-+  *	progs.priv.h
-+  *
-+@@ -110,7 +110,16 @@
-+ #include <term_entry.h>
-+ #include <tic.h>
-+ #include <nc_tparm.h>
-++
-+ #include <nc_alloc.h>
-++#if HAVE_NC_FREEALL
-++#undef ExitProgram
-++#ifdef USE_LIBTINFO
-++#define ExitProgram(code) _nc_free_tinfo(code)
-++#else
-++#define ExitProgram(code) _nc_free_tic(code)
-++#endif
-++#endif
-+ 
-+ /* usually in <unistd.h> */
-+ #ifndef STDOUT_FILENO
-+Index: progs/tic.c
-+Prereq:  1.131 
-+--- ncurses-5.6/progs/tic.c	2006-12-02 22:13:17.000000000 +0000
-++++ ncurses-5.6-20071201/progs/tic.c	2007-07-21 17:45:59.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -44,7 +44,7 @@
-+ #include <dump_entry.h>
-+ #include <transform.h>
-+ 
-+-MODULE_ID("$Id: tic.c,v 1.131 2006/12/02 22:13:17 tom Exp $")
-++MODULE_ID("$Id: tic.c,v 1.133 2007/07/21 17:45:59 tom Exp $")
-+ 
-+ const char *_nc_progname = "tic";
-+ 
-+@@ -353,11 +353,24 @@
-+     return fp;
-+ }
-+ 
-++#if NO_LEAKS
-++static void
-++free_namelist(char **src)
-++{
-++    if (src != 0) {
-++	int n;
-++	for (n = 0; src[n] != 0; ++n)
-++	    free(src[n]);
-++	free(src);
-++    }
-++}
-++#endif
-++
-+ /* Parse the "-e" option-value into a list of names */
-+-static const char **
-++static char **
-+ make_namelist(char *src)
-+ {
-+-    const char **dst = 0;
-++    char **dst = 0;
-+ 
-+     char *s, *base;
-+     unsigned pass, n, nn;
-+@@ -374,11 +387,13 @@
-+ 		if ((s = stripped(buffer)) != 0) {
-+ 		    if (dst != 0)
-+ 			dst[nn] = s;
-++		    else
-++			free(s);
-+ 		    nn++;
-+ 		}
-+ 	    }
-+ 	    if (pass == 1) {
-+-		dst = typeCalloc(const char *, nn + 1);
-++		dst = typeCalloc(char *, nn + 1);
-+ 		rewind(fp);
-+ 	    }
-+ 	}
-+@@ -401,10 +416,10 @@
-+ 		    break;
-+ 	    }
-+ 	    if (pass == 1)
-+-		dst = typeCalloc(const char *, nn + 1);
-++		dst = typeCalloc(char *, nn + 1);
-+ 	}
-+     }
-+-    if (showsummary) {
-++    if (showsummary && (dst != 0)) {
-+ 	fprintf(log_fp, "Entries that will be compiled:\n");
-+ 	for (n = 0; dst[n] != 0; n++)
-+ 	    fprintf(log_fp, "%u:%s\n", n + 1, dst[n]);
-+@@ -413,7 +428,7 @@
-+ }
-+ 
-+ static bool
-+-matches(const char **needle, const char *haystack)
-++matches(char **needle, const char *haystack)
-+ /* does entry in needle list match |-separated field in haystack? */
-+ {
-+     bool code = FALSE;
-+@@ -468,7 +483,7 @@
-+     bool limited = TRUE;
-+     char *tversion = (char *) NULL;
-+     const char *source_file = "terminfo";
-+-    const char **namelst = 0;
-++    char **namelst = 0;
-+     char *outdir = (char *) NULL;
-+     bool check_only = FALSE;
-+     bool suppress_untranslatable = FALSE;
-+@@ -495,7 +510,7 @@
-+      * be optional.
-+      */
-+     while ((this_opt = getopt(argc, argv,
-+-			      "0123456789CILNR:TUVace:fGgo:rstvwx")) != EOF) {
-++			      "0123456789CILNR:TUVace:fGgo:rstvwx")) != -1) {
-+ 	if (isdigit(this_opt)) {
-+ 	    switch (last_opt) {
-+ 	    case 'v':
-+@@ -784,6 +799,9 @@
-+ 	else
-+ 	    fprintf(log_fp, "No entries written\n");
-+     }
-++#if NO_LEAKS
-++    free_namelist(namelst);
-++#endif
-+     cleanup();
-+     ExitProgram(EXIT_SUCCESS);
-+ }
-+Index: progs/toe.c
-+Prereq:  1.41 
-+--- ncurses-5.6/progs/toe.c	2006-08-19 18:18:09.000000000 +0000
-++++ ncurses-5.6-20071201/progs/toe.c	2007-10-13 22:26:38.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -40,13 +40,11 @@
-+ 
-+ #include <sys/stat.h>
-+ 
-+-#include <dump_entry.h>
-+-
-+ #if USE_HASHED_DB
-+ #include <hashed_db.h>
-+ #endif
-+ 
-+-MODULE_ID("$Id: toe.c,v 1.41 2006/08/19 18:18:09 tom Exp $")
-++MODULE_ID("$Id: toe.c,v 1.46 2007/10/13 22:26:38 tom Exp $")
-+ 
-+ #define isDotname(name) (!strcmp(name, ".") || !strcmp(name, ".."))
-+ 
-+@@ -59,8 +57,7 @@
-+ ExitProgram(int code)
-+ {
-+     _nc_free_entries(_nc_head);
-+-    _nc_leaks_dump_entry();
-+-    _nc_free_and_exit(code);
-++    _nc_free_tic(code);
-+ }
-+ #endif
-+ 
-+@@ -326,7 +323,7 @@
-+ 
-+     _nc_progname = _nc_rootname(argv[0]);
-+ 
-+-    while ((this_opt = getopt(argc, argv, "0123456789ahuvUV")) != EOF) {
-++    while ((this_opt = getopt(argc, argv, "0123456789ahuvUV")) != -1) {
-+ 	/* handle optional parameter */
-+ 	if (isdigit(this_opt)) {
-+ 	    switch (last_opt) {
-+Index: progs/tput.c
-+Prereq:  1.38 
-+--- ncurses-5.6/progs/tput.c	2006-11-26 00:27:47.000000000 +0000
-++++ ncurses-5.6-20071201/progs/tput.c	2007-10-13 20:34:16.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -38,6 +38,7 @@
-+  * Ross Ridge's mytinfo package.
-+  */
-+ 
-++#define USE_LIBTINFO
-+ #include <progs.priv.h>
-+ 
-+ #if !PURE_TERMINFO
-+@@ -45,7 +46,7 @@
-+ #endif
-+ #include <transform.h>
-+ 
-+-MODULE_ID("$Id: tput.c,v 1.38 2006/11/26 00:27:47 tom Exp $")
-++MODULE_ID("$Id: tput.c,v 1.41 2007/10/13 20:34:16 tom Exp $")
-+ 
-+ #define PUTS(s)		fputs(s, stdout)
-+ #define PUTCHAR(c)	putchar(c)
-+@@ -325,6 +326,7 @@
-+ 	    case Num_Str_Str:
-+ 		s = TPARM_3(s, numbers[1], strings[2], strings[3]);
-+ 		break;
-++	    case Numbers:
-+ 	    default:
-+ 		(void) _nc_tparm_analyze(s, p_is_s, &popcount);
-+ #define myParam(n) (p_is_s[n - 1] != 0 ? ((long) strings[n]) : numbers[n])
-+@@ -363,7 +365,7 @@
-+ 
-+     term = getenv("TERM");
-+ 
-+-    while ((c = getopt(argc, argv, "ST:V")) != EOF) {
-++    while ((c = getopt(argc, argv, "ST:V")) != -1) {
-+ 	switch (c) {
-+ 	case 'S':
-+ 	    cmdline = FALSE;
-+Index: progs/tset.c
-+Prereq:  1.67 
-+--- ncurses-5.6/progs/tset.c	2006-09-16 17:51:10.000000000 +0000
-++++ ncurses-5.6-20071201/progs/tset.c	2007-10-13 22:22:04.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -73,6 +73,7 @@
-+  * SUCH DAMAGE.
-+  */
-+ 
-++#define USE_LIBTINFO
-+ #define __INTERNAL_CAPS_VISIBLE	/* we need to see has_hardware_tabs */
-+ #include <progs.priv.h>
-+ 
-+@@ -103,7 +104,7 @@
-+ #include <dump_entry.h>
-+ #include <transform.h>
-+ 
-+-MODULE_ID("$Id: tset.c,v 1.67 2006/09/16 17:51:10 tom Exp $")
-++MODULE_ID("$Id: tset.c,v 1.70 2007/10/13 22:22:04 tom Exp $")
-+ 
-+ extern char **environ;
-+ 
-+@@ -777,7 +778,22 @@
-+ 		      | OFDEL
-+ #endif
-+ #ifdef NLDLY
-+-		      | NLDLY | CRDLY | TABDLY | BSDLY | VTDLY | FFDLY
-++		      | NLDLY
-++#endif
-++#ifdef CRDLY 
-++		      | CRDLY
-++#endif
-++#ifdef TABDLY 
-++		      | TABDLY
-++#endif
-++#ifdef BSDLY 
-++		      | BSDLY
-++#endif
-++#ifdef VTDLY 
-++		      | VTDLY
-++#endif
-++#ifdef FFDLY
-++		      | FFDLY
-+ #endif
-+ 	);
-+ 
-+@@ -1129,7 +1145,7 @@
-+ 
-+     obsolete(argv);
-+     noinit = noset = quiet = Sflag = sflag = showterm = 0;
-+-    while ((ch = getopt(argc, argv, "a:cd:e:Ii:k:m:np:qQSrsVw")) != EOF) {
-++    while ((ch = getopt(argc, argv, "a:cd:e:Ii:k:m:np:qQSrsVw")) != -1) {
-+ 	switch (ch) {
-+ 	case 'c':		/* set control-chars */
-+ 	    opt_c = TRUE;
-+Index: test/Makefile.in
-+Prereq:  1.92 
-+--- ncurses-5.6/test/Makefile.in	2006-10-21 22:56:03.000000000 +0000
-++++ ncurses-5.6-20071201/test/Makefile.in	2007-04-28 15:28:28.000000000 +0000
-+@@ -1,6 +1,6 @@
-+-# $Id: Makefile.in,v 1.92 2006/10/21 22:56:03 tom Exp $
-++# $Id: Makefile.in,v 1.97 2007/04/28 15:28:28 tom Exp $
-+ ##############################################################################
-+-# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
-++# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -77,7 +77,7 @@
-+ MATH_LIB	= @MATH_LIB@
-+ 
-+ LD		= @LD@
-+-LINK		= @LINK_TESTS@ $(LIBTOOL_LINK) $(CC) $(CFLAGS)
-++LINK		= @LINK_TESTS@ $(LIBTOOL_LINK) $(CFLAGS)
-+ 
-+ LDFLAGS		= @LD_MODEL@ @LOCAL_LDFLAGS@ @LDFLAGS@
-+ 
-+@@ -87,16 +87,18 @@
-+ LDFLAGS_PROFILE	= $(LDFLAGS) $(CFLAGS_PROFILE)
-+ LDFLAGS_SHARED	= $(LDFLAGS) $(CFLAGS_SHARED) @LD_SHARED_OPTS@
-+ 
-++TEST_ARGS	= @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@ 
-++
-+ # use these for linking with all of the libraries
-+-LIBS_DEFAULT	= @TEST_ARGS@ @LIBS@ $(MATH_LIB)
-++LIBS_DEFAULT	= $(TEST_ARGS) @LIBS@ $(MATH_LIB)
-+ LDFLAGS_DEFAULT	= $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_DEFAULT)
-+ 
-+ # use these for linking with the (n)curses library
-+-LIBS_CURSES	= `echo "@TEST_ARGS@ @LIBS@" | sed -e 's/-lform.*-lpanel[^ ]*//'` $(MATH_LIB)
-++LIBS_CURSES	= `echo "$(TEST_ARGS) @LIBS@" | sed -e 's/-lform.*-lpanel[^ ]*//'` $(MATH_LIB)
-+ LDFLAGS_CURSES	= $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_CURSES)
-+ 
-+ # use these for linking with the tinfo library if we have it, or curses library if not
-+-LIBS_TINFO	= @TINFO_ARGS@ @LIBS@ $(MATH_LIB)
-++LIBS_TINFO	= @LDFLAGS_STATIC@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LIBS@ $(MATH_LIB)
-+ LDFLAGS_TINFO	= $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO)
-+ 
-+ LINT		= @LINT@
-+Index: test/README
-+Prereq:  1.28 
-+--- ncurses-5.6/test/README	2006-11-05 01:10:56.000000000 +0000
-++++ ncurses-5.6-20071201/test/README	2007-08-18 23:12:24.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ -------------------------------------------------------------------------------
-+--- Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.               --
-++-- Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.               --
-+ --                                                                           --
-+ -- Permission is hereby granted, free of charge, to any person obtaining a   --
-+ -- copy of this software and associated documentation files (the             --
-+@@ -25,7 +25,7 @@
-+ -- sale, use or other dealings in this Software without prior written        --
-+ -- authorization.                                                            --
-+ -------------------------------------------------------------------------------
-+--- $Id: README,v 1.28 2006/11/05 01:10:56 tom Exp $
-++-- $Id: README,v 1.35 2007/08/18 23:12:24 tom Exp $
-+ -------------------------------------------------------------------------------
-+ 
-+ The programs in this directory are designed to test your newest toy :-)
-+@@ -210,27 +210,27 @@
-+ libncurses:
-+ ----------
-+ BC				-
-+-COLORS				test: echochar ncurses xmas
-+-COLOR_PAIR			test: background blue bs cardfile demo_forms demo_menus echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain tclock testaddch testcurs view worm xmas
-+-COLOR_PAIRS			test: echochar ncurses newdemo
-+-COLS				test: cardfile demo_altkeys demo_defkey demo_forms demo_keyok demo_menus edit_field firework foldkeys hashtest ins_wide inserts lrtest movewindow ncurses newdemo rain tclock testcurs view worm
-++COLORS				test: echochar ncurses savescreen xmas
-++COLOR_PAIR			test: background blue bs cardfile demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain savescreen tclock testaddch testcurs view worm xmas
-++COLOR_PAIRS			test: echochar ncurses newdemo savescreen
-++COLS				test: cardfile demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels echochar edit_field firework foldkeys hashtest inch_wide inchs ins_wide inserts lrtest movewindow ncurses newdemo rain savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm
-+ ESCDELAY			lib: ncurses
-+-LINES				test: cardfile demo_defkey demo_keyok demo_menus edit_field firework hanoi hashtest ins_wide inserts lrtest movewindow ncurses newdemo rain tclock testcurs view worm xmas
-++LINES				test: cardfile demo_defkey demo_keyok demo_menus demo_panels echochar edit_field firework hanoi hashtest inch_wide inchs ins_wide inserts lrtest movewindow ncurses newdemo rain savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
-+ PAIR_NUMBER			test: ncurses
-+ PC				lib: ncurses
-+ SP				lib: ncurses
-+ TABSIZE				lib: menu
-+ UP				-
-+ acs_map				test: gdc ins_wide inserts knight movewindow ncurses newdemo testcurs
-+-add_wch				test: ncurses
-++add_wch				test: demo_panels ncurses
-+ add_wchnstr			test: ncurses
-+ add_wchstr			test: view
-+-addch				test: blue bs ditto echochar hashtest ncurses testaddch view worm
-++addch				test: blue bs ditto echochar hashtest ncurses savescreen testaddch view worm
-+ addchnstr			-
-+ addchstr			-
-+ addnstr				-
-+ addnwstr			-
-+-addstr				test: blue bs cardfile gdc hanoi lrtest ncurses
-++addstr				test: blue bs cardfile gdc hanoi lrtest ncurses savescreen
-+ addwstr				test: ncurses
-+ assume_default_colors		test: ncurses
-+ attr_get			test: ncurses
-+@@ -241,20 +241,20 @@
-+ attron				test: bs echochar filter gdc ncurses
-+ attrset				test: bs firework gdc hanoi ncurses rain tclock testaddch testcurs
-+ baudrate			lib: ncurses
-+-beep				test: blue bs cardfile chgat demo_forms demo_menus edit_field hanoi ins_wide inserts knight movewindow ncurses tclock testcurs view xmas
-+-bkgd				test: background cardfile demo_forms ncurses tclock view
-++beep				test: blue bs cardfile chgat demo_forms demo_menus demo_panels edit_field hanoi inch_wide inchs ins_wide inserts knight movewindow ncurses savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view xmas
-++bkgd				test: background cardfile demo_forms ncurses savescreen tclock view
-+ bkgdset				test: background ncurses testaddch
-+ bkgrnd				test: ncurses
-+ bkgrndset			test: ncurses
-+-boolcodes			progs: dump_entry
-+-boolfnames			progs: dump_entry
-+-boolnames			progs: dump_entry infocmp
-++boolcodes			test: test_arrays progs: dump_entry
-++boolfnames			test: test_arrays progs: dump_entry
-++boolnames			test: test_arrays progs: dump_entry infocmp
-+ border				-
-+ border_set			-
-+-box				test: cardfile chgat demo_forms demo_menus edit_field ins_wide inserts lrtest ncurses newdemo redraw testcurs
-++box				test: cardfile chgat demo_forms demo_menus demo_panels edit_field inch_wide inchs ins_wide inserts lrtest ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
-+ box_set				test: ncurses
-+ can_change_color		test: ncurses
-+-cbreak				test: background blue bs cardfile chgat color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus ditto filter firework foldkeys gdc hanoi hashtest ins_wide inserts knight lrtest movewindow ncurses newdemo tclock testcurs view worm xmas
-++cbreak				test: background blue bs cardfile chgat color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto filter firework foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts knight lrtest movewindow ncurses newdemo savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
-+ chgat				test: chgat
-+ clear				test: blue bs gdc ncurses testcurs xmas
-+ clearok				test: bs knight
-+@@ -263,26 +263,26 @@
-+ color_content			test: ncurses
-+ color_set			test: color_set ncurses
-+ copywin				test: ncurses testcurs
-+-cur_term			test: dots echochar lrtest progs: clear tic tput tset
-+-curs_set			test: echochar firework gdc hanoi lrtest ncurses newdemo rain tclock testcurs worm xmas
-+-curscr				test: edit_field knight lrtest ncurses tclock view
-++cur_term			test: dots dots_mvcur lrtest progs: clear tput tset
-++curs_set			test: echochar firework gdc hanoi lrtest ncurses newdemo rain savescreen tclock testcurs worm xmas
-++curscr				test: demo_panels edit_field knight lrtest ncurses savescreen tclock view
-+ curses_version			test: ncurses progs: infocmp tic toe tput tset
-+ def_prog_mode			test: bs ncurses
-+ def_shell_mode			lib: ncurses
-+ define_key			test: demo_altkeys demo_defkey foldkeys
-+ del_curterm			lib: ncurses
-+-delay_output			-
-++delay_output			test: newdemo
-+ delch				-
-+ deleteln			-
-+-delscreen			-
-+-delwin				test: cardfile chgat demo_forms demo_menus edit_field ins_wide inserts movewindow ncurses newdemo redraw testcurs
-+-derwin				test: cardfile chgat demo_forms demo_menus ins_wide inserts movewindow ncurses
-+-doupdate			test: cardfile demo_menus edit_field ins_wide inserts knight movewindow ncurses redraw
-++delscreen			test: dots_mvcur
-++delwin				test: cardfile chgat demo_forms demo_menus demo_panels edit_field inch_wide inchs ins_wide inserts movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
-++derwin				test: cardfile chgat demo_forms demo_menus inch_wide inchs ins_wide inserts movewindow ncurses test_get_wstr test_getstr test_instr test_inwstr test_opaque
-++doupdate			test: cardfile demo_menus demo_panels edit_field ins_wide inserts knight movewindow ncurses redraw savescreen test_get_wstr test_getstr
-+ dupwin				test: edit_field
-+-echo				test: bs hanoi ncurses testcurs testscanw
-++echo				test: bs hanoi ncurses test_get_wstr test_getstr testcurs testscanw
-+ echo_wchar			test: ncurses
-+ echochar			test: echochar ncurses
-+-endwin				test: background blue bs cardfile chgat color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus ditto echochar filter firework firstlast foldkeys gdc hanoi hashtest ins_wide inserts keynames knight lrtest movewindow ncurses newdemo rain redraw tclock testaddch testcurs testscanw view worm xmas
-++endwin				test: background blue bs cardfile chgat color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto dots_mvcur echochar filter firework firstlast foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts keynames knight lrtest movewindow ncurses newdemo rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas
-+ erase				test: cardfile demo_menus filter firework firstlast hanoi lrtest ncurses tclock testcurs
-+ erasechar			lib: ncurses
-+ erasewchar			-
-+@@ -290,45 +290,46 @@
-+ flash				test: cardfile lrtest ncurses tclock testcurs
-+ flushinp			test: ncurses newdemo testcurs
-+ get_wch				-
-+-get_wstr			-
-+-getbegx				test: chgat demo_menus movewindow ncurses newdemo redraw testcurs
-+-getbegy				test: chgat demo_menus movewindow ncurses newdemo redraw testcurs
-++get_wstr			test: test_get_wstr
-++getattrs			-
-++getbegx				test: chgat demo_menus demo_panels movewindow ncurses newdemo redraw testcurs
-++getbegy				test: chgat demo_menus demo_panels movewindow ncurses newdemo redraw testcurs
-+ getbkgd				test: ncurses
-+ getbkgrnd			test: ncurses
-+ getcchar			test: ncurses view
-+-getch				test: background blue bs chgat color_set demo_altkeys ditto filter firework firstlast foldkeys hanoi hashtest lrtest rain tclock testaddch testcurs view worm xmas
-+-getcurx				test: bs chgat demo_altkeys demo_defkey foldkeys movewindow ncurses redraw testcurs
-+-getcury				test: bs chgat demo_altkeys demo_defkey edit_field foldkeys movewindow ncurses redraw testcurs
-+-getmaxx				test: chgat movewindow ncurses newdemo redraw testcurs
-+-getmaxy				test: chgat demo_forms movewindow ncurses newdemo redraw testcurs
-++getch				test: background blue bs chgat color_set demo_altkeys ditto filter firework firstlast foldkeys hanoi hashtest lrtest rain savescreen tclock testaddch testcurs view worm xmas
-++getcurx				test: bs chgat demo_altkeys demo_defkey demo_panels foldkeys movewindow ncurses redraw savescreen test_get_wstr test_getstr testcurs
-++getcury				test: bs chgat demo_altkeys demo_defkey demo_panels edit_field foldkeys movewindow ncurses redraw savescreen testcurs
-++getmaxx				test: chgat demo_panels inch_wide inchs movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
-++getmaxy				test: chgat demo_forms demo_panels inch_wide inchs movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
-+ getmouse			test: bs knight movewindow ncurses
-+-getn_wstr			-
-+-getnstr				test: filter ncurses
-++getn_wstr			test: test_get_wstr
-++getnstr				test: filter ncurses test_getstr
-+ getparx				test: movewindow
-+ getpary				test: movewindow
-+-getstr				-
-++getstr				test: test_getstr
-+ getwin				test: ncurses
-+ halfdelay			test: view
-+-has_colors			test: background bs cardfile chgat color_set demo_forms demo_menus echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain tclock testcurs view worm xmas
-++has_colors			test: background bs cardfile chgat color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain savescreen tclock testcurs view worm xmas
-+ has_ic				test: lrtest
-+ has_il				lib: ncurses
-+ has_key				lib: ncurses
-+ hline				test: gdc ncurses
-+ hline_set			-
-+-idcok				-
-+-idlok				test: ncurses testscanw view
-+-immedok				-
-+-in_wch				-
-+-in_wchnstr			-
-+-in_wchstr			-
-+-inch				-
-+-inchnstr			-
-+-inchstr				-
-++idcok				test: test_opaque
-++idlok				test: ncurses test_opaque testscanw view
-++immedok				test: test_opaque
-++in_wch				test: inch_wide
-++in_wchnstr			test: inch_wide
-++in_wchstr			test: inch_wide
-++inch				test: inchs
-++inchnstr			test: inchs
-++inchstr				test: inchs
-+ init_color			test: ncurses
-+-init_pair			test: background blue bs cardfile chgat color_set demo_forms demo_menus echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain tclock testaddch testcurs view worm xmas
-+-initscr				test: background blue bs cardfile chgat color_set demo_defkey demo_forms demo_keyok demo_menus echochar firework firstlast gdc hanoi hashtest ins_wide inserts knight lrtest movewindow ncurses newdemo rain redraw tclock testaddch testcurs testscanw view worm xmas
-+-innstr				-
-+-innwstr				-
-++init_pair			test: background blue bs cardfile chgat color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain savescreen tclock testaddch testcurs view worm xmas
-++initscr				test: background blue bs cardfile chgat color_set demo_defkey demo_forms demo_keyok demo_menus demo_panels echochar firework firstlast gdc hanoi hashtest inch_wide inchs ins_wide inserts knight lrtest movewindow ncurses newdemo rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas
-++innstr				test: test_instr
-++innwstr				test: test_inwstr
-+ ins_nwstr			test: ins_wide
-+ ins_wch				test: ins_wide
-+ ins_wstr			test: ins_wide
-+@@ -337,29 +338,39 @@
-+ insertln			-
-+ insnstr				test: inserts
-+ insstr				test: inserts
-+-instr				-
-++instr				test: test_instr
-+ intrflush			test: demo_forms movewindow
-+-inwstr				-
-++inwstr				test: test_inwstr
-++is_cleared			test: test_opaque
-++is_idcok			test: test_opaque
-++is_idlok			test: test_opaque
-++is_immedok			test: test_opaque
-++is_keypad			test: ncurses test_opaque
-++is_leaveok			test: test_opaque
-+ is_linetouched			lib: form
-++is_nodelay			test: test_opaque
-++is_notimeout			test: test_opaque
-++is_scrollok			test: ncurses test_opaque
-++is_syncok			test: test_opaque
-+ is_term_resized			-
-+ is_wintouched			lib: ncurses
-+ isendwin			-
-+ key_defined			test: demo_defkey foldkeys
-+-key_name			test: ncurses
-++key_name			test: key_names ncurses
-+ keybound			test: demo_altkeys demo_defkey
-+ keyname				test: demo_altkeys demo_defkey demo_keyok demo_menus edit_field foldkeys keynames movewindow ncurses redraw testcurs view progs: tic
-+ keyok				test: demo_keyok foldkeys
-+-keypad				test: bs cardfile chgat demo_altkeys demo_defkey demo_forms demo_keyok demo_menus edit_field filter firework foldkeys hashtest ins_wide inserts keynames knight lrtest movewindow ncurses redraw tclock testcurs testscanw view
-++keypad				test: bs cardfile chgat demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels edit_field filter firework foldkeys hashtest inch_wide inchs ins_wide inserts keynames knight lrtest movewindow ncurses redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view
-+ killchar			lib: ncurses
-+ killwchar			-
-+-leaveok				test: hanoi
-++leaveok				test: hanoi test_opaque
-+ longname			test: testcurs progs: tput
-+ mcprint				-
-+ meta				test: ncurses
-+ mouse_trafo			-
-+ mouseinterval			-
-+-mousemask			test: bs demo_menus knight movewindow ncurses
-+-move				test: blue bs cardfile chgat demo_altkeys demo_menus echochar foldkeys gdc hanoi hashtest ins_wide inserts knight lrtest movewindow ncurses testscanw view worm xmas
-++mousemask			test: bs demo_forms demo_menus knight movewindow ncurses
-++move				test: blue bs cardfile chgat demo_altkeys demo_menus echochar foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts knight lrtest movewindow ncurses savescreen test_get_wstr test_getstr test_instr test_inwstr testscanw view worm xmas
-+ mvadd_wch			test: ncurses
-+ mvadd_wchnstr			-
-+ mvadd_wchstr			-
-+@@ -371,112 +382,112 @@
-+ mvaddstr			test: bs demo_forms gdc hanoi knight ncurses rain tclock testcurs xmas
-+ mvaddwstr			-
-+ mvchgat				test: chgat
-+-mvcur				test: redraw
-++mvcur				test: dots_mvcur redraw
-+ mvdelch				-
-+ mvderwin			test: movewindow
-+ mvget_wch			-
-+-mvget_wstr			-
-++mvget_wstr			test: test_get_wstr
-+ mvgetch				-
-+-mvgetn_wstr			-
-+-mvgetnstr			-
-+-mvgetstr			-
-++mvgetn_wstr			test: test_get_wstr
-++mvgetnstr			test: test_getstr
-++mvgetstr			test: test_getstr
-+ mvhline				test: ncurses
-+ mvhline_set			test: ncurses
-+-mvin_wch			-
-+-mvin_wchnstr			-
-+-mvin_wchstr			-
-+-mvinch				-
-+-mvinchnstr			test: gdc
-+-mvinchstr			-
-+-mvinnstr			-
-+-mvinnwstr			-
-++mvin_wch			test: inch_wide
-++mvin_wchnstr			test: inch_wide
-++mvin_wchstr			test: inch_wide
-++mvinch				test: inchs
-++mvinchnstr			test: gdc inchs
-++mvinchstr			test: inchs
-++mvinnstr			test: test_instr
-++mvinnwstr			test: test_inwstr
-+ mvins_nwstr			test: ins_wide
-+ mvins_wch			test: ins_wide
-+ mvins_wstr			test: ins_wide
-+ mvinsch				test: ins_wide inserts
-+ mvinsnstr			test: inserts
-+ mvinsstr			test: inserts
-+-mvinstr				-
-+-mvinwstr			-
-++mvinstr				test: test_instr
-++mvinwstr			test: test_inwstr
-+ mvprintw			test: bs demo_menus firework hanoi ncurses tclock view
-+ mvscanw				-
-+ mvvline				test: ncurses
-+ mvvline_set			test: ncurses
-+ mvwadd_wch			-
-+ mvwadd_wchnstr			lib: form
-+-mvwadd_wchstr			-
-++mvwadd_wchstr			test: inch_wide
-+ mvwaddch			test: movewindow newdemo testcurs xmas
-+ mvwaddchnstr			-
-+-mvwaddchstr			-
-++mvwaddchstr			test: inchs
-+ mvwaddnstr			test: newdemo testcurs
-+ mvwaddnwstr			-
-+-mvwaddstr			test: firstlast ins_wide inserts knight ncurses newdemo testcurs xmas
-+-mvwaddwstr			-
-++mvwaddstr			test: firstlast ins_wide inserts knight ncurses newdemo test_instr testcurs xmas
-++mvwaddwstr			test: test_inwstr
-+ mvwchgat			test: chgat
-+ mvwdelch			test: ncurses
-+ mvwget_wch			-
-+-mvwget_wstr			-
-+-mvwgetch			-
-+-mvwgetn_wstr			-
-+-mvwgetnstr			-
-+-mvwgetstr			-
-++mvwget_wstr			test: test_get_wstr
-++mvwgetch			test: inch_wide inchs test_get_wstr test_getstr test_instr test_inwstr test_opaque
-++mvwgetn_wstr			test: test_get_wstr
-++mvwgetnstr			test: test_getstr
-++mvwgetstr			test: test_getstr
-+ mvwhline			test: movewindow
-+ mvwhline_set			-
-+ mvwin				test: cardfile demo_menus movewindow testcurs xmas
-+-mvwin_wch			-
-+-mvwin_wchnstr			lib: form
-+-mvwin_wchstr			-
-+-mvwinch				test: newdemo testcurs
-+-mvwinchnstr			-
-+-mvwinchstr			-
-+-mvwinnstr			test: testcurs
-+-mvwinnwstr			-
-++mvwin_wch			test: inch_wide
-++mvwin_wchnstr			test: inch_wide
-++mvwin_wchstr			test: inch_wide
-++mvwinch				test: inchs newdemo testcurs
-++mvwinchnstr			test: inchs
-++mvwinchstr			test: inchs
-++mvwinnstr			test: test_instr testcurs
-++mvwinnwstr			test: test_inwstr
-+ mvwins_nwstr			test: ins_wide
-+ mvwins_wch			test: ins_wide
-+ mvwins_wstr			test: ins_wide
-+ mvwinsch			test: ins_wide inserts
-+ mvwinsnstr			test: inserts
-+ mvwinsstr			test: inserts testcurs
-+-mvwinstr			-
-+-mvwinwstr			-
-+-mvwprintw			test: chgat ncurses testcurs
-++mvwinstr			test: test_instr
-++mvwinwstr			test: test_inwstr
-++mvwprintw			test: chgat demo_panels inch_wide inchs ncurses test_instr test_inwstr testcurs
-+ mvwscanw			test: testcurs
-+ mvwvline			test: ins_wide inserts movewindow
-+ mvwvline_set			-
-+-napms				test: dots echochar firework gdc hanoi lrtest ncurses newdemo railroad rain tclock testcurs view worm xmas progs: tset
-++napms				test: demo_panels dots dots_mvcur echochar firework gdc hanoi lrtest ncurses railroad rain tclock test_opaque testcurs view worm xmas progs: tset
-+ newpad				test: edit_field ncurses testcurs
-+ newscr				lib: ncurses
-+-newterm				test: demo_altkeys ditto filter foldkeys gdc keynames
-+-newwin				test: cardfile chgat demo_defkey demo_forms demo_keyok demo_menus edit_field firstlast ins_wide inserts knight movewindow ncurses newdemo redraw testcurs xmas
-++newterm				test: demo_altkeys ditto dots_mvcur filter foldkeys gdc keynames
-++newwin				test: cardfile chgat demo_defkey demo_forms demo_keyok demo_menus demo_panels edit_field firstlast inch_wide inchs ins_wide inserts knight movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs xmas
-+ nl				test: demo_forms ncurses rain testcurs
-+ nocbreak			test: testcurs
-+-nodelay				test: firework gdc lrtest ncurses newdemo rain tclock view xmas
-+-noecho				test: background bs cardfile chgat color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus ditto firework firstlast foldkeys gdc hanoi hashtest ins_wide inserts knight lrtest movewindow ncurses rain redraw tclock testcurs view worm xmas
-++nodelay				test: firework gdc lrtest ncurses newdemo rain tclock test_opaque view xmas
-++noecho				test: background bs cardfile chgat color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto firework firstlast foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts knight lrtest movewindow ncurses rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
-+ nofilter			-
-+ nonl				test: bs demo_forms hashtest movewindow ncurses view worm xmas
-+ noqiflush			-
-+ noraw				test: demo_forms demo_menus ncurses testcurs
-+-notimeout			-
-+-numcodes			progs: dump_entry
-+-numfnames			progs: dump_entry
-+-numnames			progs: dump_entry infocmp
-++notimeout			test: test_opaque
-++numcodes			test: test_arrays progs: dump_entry
-++numfnames			test: test_arrays progs: dump_entry
-++numnames			test: test_arrays progs: dump_entry infocmp
-+ ospeed				progs: tset
-+ overlay				test: ncurses testcurs xmas
-+-overwrite			test: ncurses
-++overwrite			test: ncurses savescreen
-+ pair_content			test: background color_set
-+ pecho_wchar			-
-+ pechochar			-
-+ pnoutrefresh			test: edit_field ncurses
-+ prefresh			test: testcurs
-+-printw				test: background blue bs color_set demo_altkeys demo_defkey demo_keyok demo_menus filter foldkeys ncurses testcurs testscanw view
-++printw				test: background blue bs color_set demo_altkeys demo_defkey demo_keyok demo_menus filter foldkeys ncurses savescreen testcurs testscanw view
-+ putp				progs: tput
-+ putwin				test: ncurses
-+ qiflush				-
-+ raw				test: demo_forms ncurses redraw testcurs
-+ redrawwin			test: redraw
-+-refresh				test: blue bs demo_defkey demo_forms demo_keyok demo_menus ditto echochar filter firstlast gdc hanoi hashtest lrtest movewindow ncurses tclock testcurs view worm xmas
-++refresh				test: blue bs demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto echochar filter firstlast gdc hanoi hashtest lrtest movewindow ncurses savescreen tclock testcurs view worm xmas
-+ reset_prog_mode			test: filter ncurses
-+-reset_shell_mode		test: bs filter
-++reset_shell_mode		test: bs filter savescreen
-+ resetty				-
-+ resize_term			test: view
-+ resizeterm			lib: ncurses
-+@@ -484,16 +495,16 @@
-+ ripoffline			test: demo_menus ncurses
-+ savetty				-
-+ scanw				test: testcurs testscanw
-+-scr_dump			-
-+-scr_init			-
-+-scr_restore			-
-+-scr_set				-
-+-scrl				-
-++scr_dump			test: savescreen
-++scr_init			test: savescreen
-++scr_restore			test: savescreen
-++scr_set				test: savescreen
-++scrl				test: view
-+ scroll				test: testcurs
-+-scrollok			test: demo_altkeys demo_defkey demo_keyok ditto foldkeys hashtest knight ncurses redraw testcurs testscanw view
-++scrollok			test: demo_altkeys demo_defkey demo_keyok demo_panels ditto foldkeys hashtest knight ncurses redraw test_opaque testcurs testscanw view
-+ set_curterm			lib: ncurses
-+ set_term			test: ditto
-+-setcchar			test: ins_wide ncurses view
-++setcchar			test: demo_panels ins_wide ncurses view
-+ setscrreg			test: view
-+ setupterm			test: dots progs: clear tput tset
-+ slk_attr			-
-+@@ -515,14 +526,14 @@
-+ slk_wset			test: ncurses
-+ standend			test: blue gdc ncurses worm
-+ standout			test: blue ncurses
-+-start_color			test: background blue bs cardfile chgat color_set demo_forms demo_menus echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain tclock testaddch testcurs view worm xmas
-+-stdscr				test: bs chgat demo_altkeys demo_forms demo_menus ditto filter firework foldkeys gdc hanoi hashtest ins_wide inserts keynames knight lrtest movewindow ncurses rain redraw tclock testcurs testscanw view xmas
-+-strcodes			progs: dump_entry
-+-strfnames			progs: dump_entry
-+-strnames			test: foldkeys progs: dump_entry infocmp tic
-++start_color			test: background blue bs cardfile chgat color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain savescreen tclock testaddch testcurs view worm xmas
-++stdscr				test: bs chgat demo_altkeys demo_forms demo_menus demo_panels ditto filter firework foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts keynames knight lrtest movewindow ncurses rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view xmas
-++strcodes			test: test_arrays progs: dump_entry
-++strfnames			test: test_arrays progs: dump_entry
-++strnames			test: foldkeys test_arrays progs: dump_entry infocmp tic
-+ subpad				test: testcurs
-+ subwin				test: movewindow ncurses newdemo testcurs
-+-syncok				-
-++syncok				test: test_opaque
-+ term_attrs			test: ncurses
-+ termattrs			test: ncurses testcurs
-+ termname			test: testcurs
-+@@ -534,11 +545,11 @@
-+ tigetflag			progs: tput
-+ tigetnum			test: ncurses progs: tput
-+ tigetstr			test: blue demo_defkey foldkeys testcurs progs: tput
-+-timeout				test: rain
-++timeout				test: rain savescreen
-+ touchline			test: chgat
-+-touchwin			test: chgat demo_menus edit_field filter firstlast ins_wide inserts movewindow ncurses redraw xmas
-+-tparm				test: dots progs: tic tput
-+-tputs				test: dots railroad progs: clear tset
-++touchwin			test: chgat demo_menus edit_field filter firstlast inch_wide inchs ins_wide inserts movewindow ncurses redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque xmas
-++tparm				test: dots dots_mvcur progs: tic tput
-++tputs				test: dots dots_mvcur railroad progs: clear tset
-+ trace				test: demo_menus hanoi hashtest lrtest ncurses testcurs view worm
-+ ttytype				lib: ncurses
-+ typeahead			test: testcurs
-+@@ -561,58 +572,60 @@
-+ vw_scanw			-
-+ vwprintw			test: movewindow
-+ vwscanw				lib: ncurses
-+-wadd_wch			lib: ncurses
-++wadd_wch			test: inch_wide
-+ wadd_wchnstr			lib: form
-+ wadd_wchstr			-
-+-waddch				test: demo_forms firstlast knight ncurses
-++waddch				test: demo_forms demo_panels firstlast inch_wide inchs knight ncurses test_get_wstr test_getstr test_instr test_inwstr test_opaque
-+ waddchnstr			lib: ncurses
-+ waddchstr			-
-+ waddnstr			lib: menu
-+ waddnwstr			test: ncurses
-+-waddstr				test: chgat demo_forms edit_field firstlast ins_wide knight ncurses redraw testcurs
-+-waddwstr			test: ins_wide
-++waddstr				test: chgat demo_forms demo_panels edit_field firstlast ins_wide knight ncurses redraw testcurs
-++waddwstr			test: ins_wide test_get_wstr
-+ wattr_get			-
-+ wattr_off			lib: ncurses
-+ wattr_on			lib: ncurses
-+ wattr_set			-
-+ wattroff			test: demo_forms ncurses testcurs xmas
-+ wattron				test: testcurs xmas
-+-wattrset			test: demo_forms ncurses newdemo testcurs xmas
-++wattrset			test: demo_forms ncurses newdemo test_get_wstr test_getstr testcurs xmas
-+ wbkgd				test: cardfile demo_forms demo_menus ncurses newdemo testcurs
-+-wbkgdset			test: ins_wide inserts ncurses
-++wbkgdset			test: demo_panels ins_wide inserts ncurses
-+ wbkgrnd				lib: ncurses
-+ wbkgrndset			lib: ncurses
-+ wborder				lib: ncurses
-+ wborder_set			lib: ncurses
-+-wchgat				test: chgat view
-+-wclear				test: ncurses testcurs
-+-wclrtobot			test: firstlast ncurses testcurs
-+-wclrtoeol			test: chgat demo_defkey demo_keyok firstlast ins_wide inserts knight ncurses testcurs
-++wchgat				test: chgat test_get_wstr test_getstr view
-++wclear				test: ncurses test_opaque testcurs
-++wclrtobot			test: firstlast inch_wide inchs ncurses test_instr test_inwstr testcurs
-++wclrtoeol			test: chgat demo_defkey demo_keyok demo_panels firstlast inch_wide inchs ins_wide inserts knight ncurses test_instr test_inwstr testcurs
-+ wcolor_set			lib: ncurses
-+ wcursyncup			lib: form
-+ wdelch				test: ncurses testcurs
-+ wdeleteln			test: testcurs
-+ wecho_wchar			lib: ncurses
-+ wechochar			lib: ncurses
-+-wenclose			lib: menu
-+-werase				test: cardfile demo_forms demo_menus edit_field firstlast knight ncurses newdemo testcurs xmas
-++wenclose			lib: form
-++werase				test: cardfile demo_forms demo_menus demo_panels edit_field firstlast knight ncurses newdemo test_get_wstr test_getstr test_opaque testcurs xmas
-+ wget_wch			test: ins_wide ncurses
-+-wget_wstr			-
-++wget_wstr			test: test_get_wstr
-+ wgetbkgrnd			lib: ncurses
-+-wgetch				test: cardfile chgat demo_defkey demo_keyok demo_menus edit_field gdc inserts knight movewindow ncurses newdemo redraw testcurs
-+-wgetn_wstr			test: ncurses
-+-wgetnstr			test: ncurses
-+-wgetstr				-
-++wgetch				test: cardfile chgat demo_defkey demo_keyok demo_menus demo_panels edit_field gdc inserts knight movewindow ncurses newdemo redraw test_opaque testcurs
-++wgetn_wstr			test: ncurses test_get_wstr
-++wgetnstr			test: ncurses test_getstr
-++wgetparent			test: test_opaque
-++wgetscrreg			test: test_opaque
-++wgetstr				test: test_getstr
-+ whline				test: testcurs
-+ whline_set			lib: ncurses
-+-win_wch				lib: form
-+-win_wchnstr			lib: form
-+-win_wchstr			-
-+-winch				test: knight testcurs
-+-winchnstr			lib: ncurses
-+-winchstr			-
-+-winnstr				test: demo_altkeys demo_defkey foldkeys
-+-winnwstr			lib: ncurses
-++win_wch				test: inch_wide
-++win_wchnstr			test: inch_wide
-++win_wchstr			test: inch_wide
-++winch				test: inchs knight testcurs
-++winchnstr			test: inchs
-++winchstr			test: inchs
-++winnstr				test: demo_altkeys demo_defkey foldkeys test_instr
-++winnwstr			test: test_inwstr
-+ wins_nwstr			test: ins_wide
-+ wins_wch			test: ins_wide
-+ wins_wstr			test: ins_wide
-+@@ -621,42 +634,42 @@
-+ winsertln			test: testcurs
-+ winsnstr			test: inserts
-+ winsstr				test: inserts
-+-winstr				-
-+-winwstr				lib: ncurses
-+-wmouse_trafo			lib: menu
-+-wmove				test: chgat demo_altkeys demo_defkey demo_keyok demo_menus firstlast foldkeys ins_wide inserts knight movewindow ncurses newdemo redraw testcurs
-+-wnoutrefresh			test: demo_menus edit_field ins_wide inserts knight movewindow ncurses redraw
-+-wprintw				test: chgat demo_defkey demo_forms demo_keyok demo_menus edit_field ins_wide inserts knight movewindow ncurses testcurs
-++winstr				test: test_instr
-++winwstr				test: test_inwstr
-++wmouse_trafo			lib: form
-++wmove				test: chgat demo_altkeys demo_defkey demo_keyok demo_menus demo_panels firstlast foldkeys inch_wide inchs ins_wide inserts knight movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
-++wnoutrefresh			test: demo_menus edit_field inch_wide inchs ins_wide inserts knight movewindow ncurses redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque
-++wprintw				test: chgat demo_defkey demo_forms demo_keyok demo_menus demo_panels edit_field inch_wide inchs ins_wide inserts knight movewindow ncurses test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
-+ wredrawln			test: redraw
-+-wrefresh			test: chgat demo_forms demo_keyok demo_menus edit_field firstlast knight lrtest movewindow ncurses newdemo redraw tclock testcurs view xmas
-++wrefresh			test: chgat demo_forms demo_keyok demo_menus demo_panels edit_field firstlast knight lrtest movewindow ncurses newdemo redraw savescreen tclock testcurs view xmas
-+ wresize				test: cardfile ncurses
-+ wscanw				test: testcurs
-+-wscrl				test: ncurses testcurs view
-++wscrl				test: ncurses testcurs
-+ wsetscrreg			test: ncurses testcurs
-+-wstandend			test: xmas
-+-wstandout			test: xmas
-++wstandend			test: test_opaque xmas
-++wstandout			test: test_opaque xmas
-+ wsyncdown			test: movewindow
-+ wsyncup				lib: form
-+ wtimeout			test: ncurses
-+ wtouchln			lib: ncurses
-+-wunctrl				-
-++wunctrl				lib: ncurses
-+ wvline				test: testcurs
-+ wvline_set			lib: ncurses
-+ 
-+ libpanel:
-+ --------
-+-bottom_panel			test: ncurses
-+-del_panel			test: ncurses
-+-hide_panel			test: ncurses
-+-move_panel			test: ncurses
-+-new_panel			test: cardfile ncurses
-+-panel_above			-
-+-panel_below			-
-+-panel_hidden			-
-+-panel_userptr			test: ncurses
-+-panel_window			test: cardfile ncurses
-+-replace_panel			-
-+-set_panel_userptr		test: ncurses
-+-show_panel			test: ncurses
-+-top_panel			test: cardfile ncurses
-+-update_panels			test: cardfile ncurses
-++bottom_panel			test: demo_panels ncurses
-++del_panel			test: demo_panels ncurses
-++hide_panel			test: demo_panels ncurses
-++move_panel			test: demo_panels ncurses
-++new_panel			test: cardfile demo_panels ncurses
-++panel_above			test: demo_panels
-++panel_below			test: demo_panels
-++panel_hidden			test: demo_panels
-++panel_userptr			test: demo_panels ncurses
-++panel_window			test: cardfile demo_panels ncurses
-++replace_panel			test: demo_panels
-++set_panel_userptr		test: demo_panels ncurses
-++show_panel			test: demo_panels ncurses
-++top_panel			test: cardfile demo_panels ncurses
-++update_panels			test: cardfile demo_panels ncurses
-+Index: test/aclocal.m4
-+Prereq:  1.17 
-+--- ncurses-5.6/test/aclocal.m4	2006-12-03 00:10:15.000000000 +0000
-++++ ncurses-5.6-20071201/test/aclocal.m4	2007-06-09 20:01:31.000000000 +0000
-+@@ -26,7 +26,7 @@
-+ dnl authorization.                                                           *
-+ dnl***************************************************************************
-+ dnl
-+-dnl $Id: aclocal.m4,v 1.17 2006/12/03 00:10:15 tom Exp $
-++dnl $Id: aclocal.m4,v 1.19 2007/06/09 20:01:31 tom Exp $
-+ dnl
-+ dnl Author: Thomas E. Dickey
-+ dnl
-+@@ -230,6 +230,12 @@
-+ fi
-+ ])dnl
-+ dnl ---------------------------------------------------------------------------
-++dnl CF_ARG_DISABLE version: 3 updated: 1999/03/30 17:24:31
-++dnl --------------
-++dnl Allow user to disable a normally-on option.
-++AC_DEFUN([CF_ARG_DISABLE],
-++[CF_ARG_OPTION($1,[$2],[$3],[$4],yes)])dnl
-++dnl ---------------------------------------------------------------------------
-+ dnl CF_ARG_ENABLE version: 3 updated: 1999/03/30 17:24:31
-+ dnl -------------
-+ dnl Allow user to enable a normally-off option.
-+@@ -537,6 +543,43 @@
-+ dnl "dirname" is not portable, so we fake it with a shell script.
-+ AC_DEFUN([CF_DIRNAME],[$1=`echo $2 | sed -e 's%/[[^/]]*$%%'`])dnl
-+ dnl ---------------------------------------------------------------------------
-++dnl CF_DISABLE_ECHO version: 10 updated: 2003/04/17 22:27:11
-++dnl ---------------
-++dnl You can always use "make -n" to see the actual options, but it's hard to
-++dnl pick out/analyze warning messages when the compile-line is long.
-++dnl
-++dnl Sets:
-++dnl	ECHO_LT - symbol to control if libtool is verbose
-++dnl	ECHO_LD - symbol to prefix "cc -o" lines
-++dnl	RULE_CC - symbol to put before implicit "cc -c" lines (e.g., .c.o)
-++dnl	SHOW_CC - symbol to put before explicit "cc -c" lines
-++dnl	ECHO_CC - symbol to put before any "cc" line
-++dnl
-++AC_DEFUN([CF_DISABLE_ECHO],[
-++AC_MSG_CHECKING(if you want to see long compiling messages)
-++CF_ARG_DISABLE(echo,
-++	[  --disable-echo          display "compiling" commands],
-++	[
-++    ECHO_LT='--silent'
-++    ECHO_LD='@echo linking [$]@;'
-++    RULE_CC='	@echo compiling [$]<'
-++    SHOW_CC='	@echo compiling [$]@'
-++    ECHO_CC='@'
-++],[
-++    ECHO_LT=''
-++    ECHO_LD=''
-++    RULE_CC='# compiling'
-++    SHOW_CC='# compiling'
-++    ECHO_CC=''
-++])
-++AC_MSG_RESULT($enableval)
-++AC_SUBST(ECHO_LT)
-++AC_SUBST(ECHO_LD)
-++AC_SUBST(RULE_CC)
-++AC_SUBST(SHOW_CC)
-++AC_SUBST(ECHO_CC)
-++])dnl
-++dnl ---------------------------------------------------------------------------
-+ dnl CF_ENABLE_WARNINGS version: 3 updated: 2003/05/24 14:24:29
-+ dnl ------------------
-+ dnl Configure-option to enable gcc warnings
-+@@ -606,7 +649,7 @@
-+ ])
-+ ])dnl
-+ dnl ---------------------------------------------------------------------------
-+-dnl CF_FUNC_CURSES_VERSION version: 3 updated: 2003/05/17 22:19:02
-++dnl CF_FUNC_CURSES_VERSION version: 4 updated: 2007/04/28 09:15:55
-+ dnl ----------------------
-+ dnl Solaris has a data item 'curses_version', which confuses AC_CHECK_FUNCS.
-+ dnl It's a character string "SVR4", not documented.
-+@@ -619,7 +662,7 @@
-+ {
-+ 	char temp[1024];
-+ 	sprintf(temp, "%s\n", curses_version());
-+-	exit(0);
-++	${cf_cv_main_return-return}(0);
-+ }]
-+ ,[cf_cv_func_curses_version=yes]
-+ ,[cf_cv_func_curses_version=no]
-+@@ -1155,7 +1198,7 @@
-+ AC_DEFINE_UNQUOTED($cf_nculib_ROOT)
-+ ])dnl
-+ dnl ---------------------------------------------------------------------------
-+-dnl CF_NCURSES_VERSION version: 11 updated: 2003/11/06 19:59:57
-++dnl CF_NCURSES_VERSION version: 12 updated: 2007/04/28 09:15:55
-+ dnl ------------------
-+ dnl Check for the version of ncurses, to aid in reporting bugs, etc.
-+ dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS.  We don't use
-+@@ -1186,7 +1229,7 @@
-+ 	make an error
-+ # endif
-+ #endif
-+-	exit(0);
-++	${cf_cv_main_return-return}(0);
-+ }],[
-+ 	cf_cv_ncurses_version=`cat $cf_tempfile`],,[
-+ 
-+@@ -1442,6 +1485,41 @@
-+ 		-e 's/-[[UD]]$3\(=[[^ 	]]*\)\?[$]//g'`
-+ ])dnl
-+ dnl ---------------------------------------------------------------------------
-++dnl CF_SIG_ATOMIC_T version: 2 updated: 2005/09/18 17:27:12
-++dnl ---------------
-++dnl signal handler, but there are some gcc depedencies in that recommendation.
-++dnl Try anyway.
-++AC_DEFUN([CF_SIG_ATOMIC_T],
-++[
-++AC_MSG_CHECKING(for signal global datatype)
-++AC_CACHE_VAL(cf_cv_sig_atomic_t,[
-++	for cf_type in \
-++		"volatile sig_atomic_t" \
-++		"sig_atomic_t" \
-++		"int"
-++	do
-++	AC_TRY_COMPILE([
-++#include <sys/types.h>
-++#include <signal.h>
-++#include <stdio.h>
-++
-++extern $cf_type x;
-++$cf_type x;
-++static void handler(int sig)
-++{
-++	x = 5;
-++}],
-++		[signal(SIGINT, handler);
-++		 x = 1],
-++		[cf_cv_sig_atomic_t=$cf_type],
-++		[cf_cv_sig_atomic_t=no])
-++		test "$cf_cv_sig_atomic_t" != no && break
-++	done
-++	])
-++AC_MSG_RESULT($cf_cv_sig_atomic_t)
-++test "$cf_cv_sig_atomic_t" != no && AC_DEFINE_UNQUOTED(SIG_ATOMIC_T, $cf_cv_sig_atomic_t)
-++])dnl
-++dnl ---------------------------------------------------------------------------
-+ dnl CF_SUBDIR_PATH version: 4 updated: 2006/11/18 17:13:19
-+ dnl --------------
-+ dnl Construct a search-list for a nonstandard header/lib-file
-+@@ -1630,7 +1708,7 @@
-+ 	[cf_cv_curses_dir=no])
-+ ])dnl
-+ dnl ---------------------------------------------------------------------------
-+-dnl CF_XOPEN_SOURCE version: 24 updated: 2006/04/02 16:41:09
-++dnl CF_XOPEN_SOURCE version: 25 updated: 2007/01/29 18:36:38
-+ dnl ---------------
-+ dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
-+ dnl or adapt to the vendor's definitions to get equivalent functionality,
-+@@ -1664,7 +1742,7 @@
-+ irix[[56]].*) #(vi
-+ 	CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
-+ 	;;
-+-linux*|gnu*) #(vi
-++linux*|gnu*|k*bsd*-gnu) #(vi
-+ 	CF_GNU_SOURCE
-+ 	;;
-+ mirbsd*) #(vi
-+Index: test/bs.c
-+Prereq:  1.44 
-+--- ncurses-5.6/test/bs.c	2006-05-20 15:38:52.000000000 +0000
-++++ ncurses-5.6-20071201/test/bs.c	2007-04-07 17:13:11.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -34,7 +34,7 @@
-+  * v2.0 featuring strict ANSI/POSIX conformance, November 1993.
-+  * v2.1 with ncurses mouse support, September 1995
-+  *
-+- * $Id: bs.c,v 1.44 2006/05/20 15:38:52 tom Exp $
-++ * $Id: bs.c,v 1.45 2007/04/07 17:13:11 tom Exp $
-+  */
-+ 
-+ #include <test.priv.h>
-+@@ -459,7 +459,7 @@
-+ 	do {
-+ 	    c = getch();
-+ 	} while
-+-	    (!strchr("hjklrR", c) || c == FF);
-++	    (!(strchr("hjklrR", c) || c == FF));
-+ 
-+ 	if (c == FF) {
-+ 	    (void) clearok(stdscr, TRUE);
-+Index: test/cardfile.c
-+Prereq:  1.28 
-+--- ncurses-5.6/test/cardfile.c	2006-12-10 00:30:09.000000000 +0000
-++++ ncurses-5.6-20071201/test/cardfile.c	2007-08-11 16:34:27.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1999-2004,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1999-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -29,7 +29,7 @@
-+ /*
-+  * Author: Thomas E. Dickey
-+  *
-+- * $Id: cardfile.c,v 1.28 2006/12/10 00:30:09 tom Exp $
-++ * $Id: cardfile.c,v 1.32 2007/08/11 16:34:27 tom Exp $
-+  *
-+  * File format: text beginning in column 1 is a title; other text is content.
-+  */
-+@@ -71,7 +71,7 @@
-+ #if !HAVE_STRDUP
-+ #define strdup my_strdup
-+ static char *
-+-strdup(char *s)
-++strdup(const char *s)
-+ {
-+     char *p = (char *) malloc(strlen(s) + 1);
-+     if (p)
-+@@ -136,13 +136,15 @@
-+ 	if ((offset = strlen(card->content)) != 0) {
-+ 	    total += 1 + offset;
-+ 	    card->content = (char *) realloc(card->content, total + 1);
-+-	    strcpy(card->content + offset++, " ");
-++	    if (card->content)
-++		strcpy(card->content + offset++, " ");
-+ 	} else {
-+ 	    if (card->content != 0)
-+ 		free(card->content);
-+ 	    card->content = (char *) malloc(total + 1);
-+ 	}
-+-	strcpy(card->content + offset, content);
-++	if (card->content)
-++	    strcpy(card->content + offset, content);
-+     }
-+ }
-+ 
-+@@ -306,8 +308,8 @@
-+ 	return (MY_CTRL_N);
-+     case CTRL('P'):
-+ 	return (MY_CTRL_P);
-+-    case CTRL('Q'):
-+-    case 033:
-++    case QUIT:
-++    case ESCAPE:
-+ 	return (MY_CTRL_Q);
-+ 
-+     case KEY_BACKSPACE:
-+@@ -568,7 +570,7 @@
-+ 
-+     setlocale(LC_ALL, "");
-+ 
-+-    while ((n = getopt(argc, argv, "c")) != EOF) {
-++    while ((n = getopt(argc, argv, "c")) != -1) {
-+ 	switch (n) {
-+ 	case 'c':
-+ 	    try_color = TRUE;
-+Index: test/chgat.c
-+Prereq:  1.5 
-+--- ncurses-5.6/test/chgat.c	2006-07-15 22:48:27.000000000 +0000
-++++ ncurses-5.6-20071201/test/chgat.c	2007-06-30 17:52:17.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 2006 Free Software Foundation, Inc.                        *
-++ * Copyright (c) 2006,2007 Free Software Foundation, Inc.                   *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -26,7 +26,7 @@
-+  * authorization.                                                           *
-+  ****************************************************************************/
-+ /*
-+- * $Id: chgat.c,v 1.5 2006/07/15 22:48:27 tom Exp $
-++ * $Id: chgat.c,v 1.7 2007/06/30 17:52:17 tom Exp $
-+  *
-+  * test-driver for chgat/wchgat/mvchgat/mvwchgat
-+  */
-+@@ -47,25 +47,26 @@
-+ typedef struct {
-+     unsigned c;
-+     unsigned v;
-+-    int pair, attr;
-++    int pair;
-++    unsigned attr;
-+     int count;
-+     int ch;
-+-    char *c_msg;
-+-    char *v_msg;
-++    const char *c_msg;
-++    const char *v_msg;
-+     int y_val;
-+     int x_val;
-+     int y_beg, x_beg;
-+     int y_max, x_max;
-+ } STATUS;
-+ 
-+-static char *
-++static const char *
-+ color_params(unsigned state, int *pair)
-+ {
-+     /* *INDENT-OFF* */
-+     static struct {
-+ 	int pair;
-+ 	int fg, bg;
-+-	char *msg;
-++	const char *msg;
-+     } table[] = {
-+ 	{ 0, COLOR_DEFAULT, COLOR_DEFAULT, "default" },
-+ 	{ 1, COLOR_RED,     COLOR_BLACK,   "red/black" },
-+@@ -74,7 +75,7 @@
-+     /* *INDENT-ON* */
-+ 
-+     static bool first = TRUE;
-+-    char *result = 0;
-++    const char *result = 0;
-+ 
-+     if (has_colors()) {
-+ 	if (first) {
-+@@ -93,13 +94,13 @@
-+     return result;
-+ }
-+ 
-+-static char *
-+-video_params(unsigned state, int *attr)
-++static const char *
-++video_params(unsigned state, unsigned *attr)
-+ {
-+     /* *INDENT-OFF* */
-+     static struct {
-+-	int attr;
-+-	char *msg;
-++	unsigned attr;
-++	const char *msg;
-+     } table[] = {
-+ 	{ A_NORMAL,	"normal" },
-+ 	{ A_BOLD,	"bold" },
-+@@ -109,7 +110,7 @@
-+     };
-+     /* *INDENT-ON* */
-+ 
-+-    char *result = 0;
-++    const char *result = 0;
-+ 
-+     if (state < SIZEOF(table)) {
-+ 	*attr = table[state].attr;
-+Index: test/configure
-+--- ncurses-5.6/test/configure	2006-12-03 00:10:59.000000000 +0000
-++++ ncurses-5.6-20071201/test/configure	2007-06-09 20:03:09.000000000 +0000
-+@@ -183,6 +183,7 @@
-+ EOF
-+ cat <<\EOF
-+ --enable and --with options recognized:
-++  --disable-echo          display "compiling" commands
-+   --enable-warnings       test: turn on gcc compiler warnings
-+   --with-curses-dir=DIR   directory in which (n)curses is installed
-+   --with-5lib             use SunOS sysv-libraries
-+@@ -535,7 +536,7 @@
-+ # Uses ac_ vars as temps to allow command line to override cache and checks.
-+ # --without-x overrides everything else, but does not touch the cache.
-+ echo $ac_n "checking for X""... $ac_c" 1>&6
-+-echo "configure:539: checking for X" >&5
-++echo "configure:540: checking for X" >&5
-+ 
-+ 
-+ # Check whether --with-x or --without-x was given.
-+@@ -598,12 +599,12 @@
-+ 
-+   # First, try using that file with no special directory specified.
-+ cat > conftest.$ac_ext <<EOF
-+-#line 602 "configure"
-++#line 603 "configure"
-+ #include "confdefs.h"
-+ #include <$x_direct_test_include>
-+ EOF
-+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+-{ (eval echo configure:607: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-++{ (eval echo configure:608: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+ if test -z "$ac_err"; then
-+   rm -rf conftest*
-+@@ -672,14 +673,14 @@
-+   ac_save_LIBS="$LIBS"
-+   LIBS="-l$x_direct_test_library $LIBS"
-+ cat > conftest.$ac_ext <<EOF
-+-#line 676 "configure"
-++#line 677 "configure"
-+ #include "confdefs.h"
-+ 
-+ int main() {
-+ ${x_direct_test_function}()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   LIBS="$ac_save_LIBS"
-+ # We can link X programs with no special library path.
-+@@ -802,7 +803,7 @@
-+ fi
-+ 
-+ echo $ac_n "checking host system type""... $ac_c" 1>&6
-+-echo "configure:806: checking host system type" >&5
-++echo "configure:807: checking host system type" >&5
-+ 
-+ host_alias=$host
-+ case "$host_alias" in
-+@@ -850,7 +851,7 @@
-+ 
-+ 
-+ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-+-echo "configure:854: checking whether ${MAKE-make} sets \${MAKE}" >&5
-++echo "configure:855: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+ set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-+ if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+@@ -879,7 +880,7 @@
-+ # Extract the first word of "gcc", so it can be a program name with args.
-+ set dummy gcc; ac_word=$2
-+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+-echo "configure:883: checking for $ac_word" >&5
-++echo "configure:884: checking for $ac_word" >&5
-+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+@@ -909,7 +910,7 @@
-+   # Extract the first word of "cc", so it can be a program name with args.
-+ set dummy cc; ac_word=$2
-+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+-echo "configure:913: checking for $ac_word" >&5
-++echo "configure:914: checking for $ac_word" >&5
-+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+@@ -960,7 +961,7 @@
-+       # Extract the first word of "cl", so it can be a program name with args.
-+ set dummy cl; ac_word=$2
-+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+-echo "configure:964: checking for $ac_word" >&5
-++echo "configure:965: checking for $ac_word" >&5
-+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+@@ -992,7 +993,7 @@
-+ fi
-+ 
-+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-+-echo "configure:996: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-++echo "configure:997: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+ 
-+ ac_ext=c
-+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-+@@ -1003,12 +1004,12 @@
-+ 
-+ cat > conftest.$ac_ext << EOF
-+ 
-+-#line 1007 "configure"
-++#line 1008 "configure"
-+ #include "confdefs.h"
-+ 
-+ main(){return(0);}
-+ EOF
-+-if { (eval echo configure:1012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:1013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   ac_cv_prog_cc_works=yes
-+   # If we can't run a trivial program, we are probably using a cross compiler.
-+   if (./conftest; exit) 2>/dev/null; then
-+@@ -1034,12 +1035,12 @@
-+   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-+ fi
-+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-+-echo "configure:1038: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-++echo "configure:1039: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+ echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-+ cross_compiling=$ac_cv_prog_cc_cross
-+ 
-+ echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-+-echo "configure:1043: checking whether we are using GNU C" >&5
-++echo "configure:1044: checking whether we are using GNU C" >&5
-+ if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+@@ -1048,7 +1049,7 @@
-+   yes;
-+ #endif
-+ EOF
-+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1053: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+   ac_cv_prog_gcc=yes
-+ else
-+   ac_cv_prog_gcc=no
-+@@ -1067,7 +1068,7 @@
-+ ac_save_CFLAGS="$CFLAGS"
-+ CFLAGS=
-+ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-+-echo "configure:1071: checking whether ${CC-cc} accepts -g" >&5
-++echo "configure:1072: checking whether ${CC-cc} accepts -g" >&5
-+ if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+@@ -1099,7 +1100,7 @@
-+ fi
-+ 
-+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-+-echo "configure:1103: checking how to run the C preprocessor" >&5
-++echo "configure:1104: checking how to run the C preprocessor" >&5
-+ # On Suns, sometimes $CPP names a directory.
-+ if test -n "$CPP" && test -d "$CPP"; then
-+   CPP=
-+@@ -1114,13 +1115,13 @@
-+   # On the NeXT, cc -E runs the code through the compiler's parser,
-+   # not just through cpp.
-+   cat > conftest.$ac_ext <<EOF
-+-#line 1118 "configure"
-++#line 1119 "configure"
-+ #include "confdefs.h"
-+ #include <assert.h>
-+ Syntax Error
-+ EOF
-+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+-{ (eval echo configure:1124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-++{ (eval echo configure:1125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+ if test -z "$ac_err"; then
-+   :
-+@@ -1131,13 +1132,13 @@
-+   rm -rf conftest*
-+   CPP="${CC-cc} -E -traditional-cpp"
-+   cat > conftest.$ac_ext <<EOF
-+-#line 1135 "configure"
-++#line 1136 "configure"
-+ #include "confdefs.h"
-+ #include <assert.h>
-+ Syntax Error
-+ EOF
-+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+-{ (eval echo configure:1141: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-++{ (eval echo configure:1142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+ if test -z "$ac_err"; then
-+   :
-+@@ -1148,13 +1149,13 @@
-+   rm -rf conftest*
-+   CPP="${CC-cc} -nologo -E"
-+   cat > conftest.$ac_ext <<EOF
-+-#line 1152 "configure"
-++#line 1153 "configure"
-+ #include "confdefs.h"
-+ #include <assert.h>
-+ Syntax Error
-+ EOF
-+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+-{ (eval echo configure:1158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-++{ (eval echo configure:1159: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+ if test -z "$ac_err"; then
-+   :
-+@@ -1183,7 +1184,7 @@
-+ # Extract the first word of "$ac_prog", so it can be a program name with args.
-+ set dummy $ac_prog; ac_word=$2
-+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+-echo "configure:1187: checking for $ac_word" >&5
-++echo "configure:1188: checking for $ac_word" >&5
-+ if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+@@ -1219,15 +1220,15 @@
-+ DFT_DEP_SUFFIX=""			
-+ DFT_OBJ_SUBDIR=`pwd|sed -e's:.*/::'`	
-+ DFT_UPR_MODEL="NORMAL"			
-+-ECHO_LINK='@ echo linking $@ ... ;'	
-+ LD="ld"					
-+ LDFLAGS_SHARED=""			
-++LDFLAGS_STATIC=""			
-+ LD_MODEL=""				
-+ LD_SHARED_OPTS=""			
-+ LIBTOOL=""				
-+ LIB_CLEAN=""				
-+ LIB_COMPILE=""				
-+-LIB_LINK=""				
-++LIB_LINK='${CC}'			
-+ LINK_TESTS=""				
-+ LINT=lint				
-+ LINT_OPTS=""				
-+@@ -1243,12 +1244,12 @@
-+ cf_cv_libtype=
-+ 
-+ echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-+-echo "configure:1247: checking for Cygwin environment" >&5
-++echo "configure:1248: checking for Cygwin environment" >&5
-+ if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+   cat > conftest.$ac_ext <<EOF
-+-#line 1252 "configure"
-++#line 1253 "configure"
-+ #include "confdefs.h"
-+ 
-+ int main() {
-+@@ -1259,7 +1260,7 @@
-+ return __CYGWIN__;
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:1263: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++if { (eval echo configure:1264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+   rm -rf conftest*
-+   ac_cv_cygwin=yes
-+ else
-+@@ -1276,19 +1277,19 @@
-+ CYGWIN=
-+ test "$ac_cv_cygwin" = yes && CYGWIN=yes
-+ echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-+-echo "configure:1280: checking for mingw32 environment" >&5
-++echo "configure:1281: checking for mingw32 environment" >&5
-+ if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+   cat > conftest.$ac_ext <<EOF
-+-#line 1285 "configure"
-++#line 1286 "configure"
-+ #include "confdefs.h"
-+ 
-+ int main() {
-+ return __MINGW32__;
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:1292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++if { (eval echo configure:1293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+   rm -rf conftest*
-+   ac_cv_mingw32=yes
-+ else
-+@@ -1307,7 +1308,7 @@
-+ 
-+ 
-+ echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-+-echo "configure:1311: checking for executable suffix" >&5
-++echo "configure:1312: checking for executable suffix" >&5
-+ if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+@@ -1317,7 +1318,7 @@
-+   rm -f conftest*
-+   echo 'int main () { return 0; }' > conftest.$ac_ext
-+   ac_cv_exeext=
-+-  if { (eval echo configure:1321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-++  if { (eval echo configure:1322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+     for file in conftest.*; do
-+       case $file in
-+       *.c | *.o | *.obj) ;;
-+@@ -1338,13 +1339,13 @@
-+ ac_exeext=$EXEEXT
-+ 
-+ echo $ac_n "checking for object suffix""... $ac_c" 1>&6
-+-echo "configure:1342: checking for object suffix" >&5
-++echo "configure:1343: checking for object suffix" >&5
-+ if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+   rm -f conftest*
-+ echo 'int i = 1;' > conftest.$ac_ext
-+-if { (eval echo configure:1348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++if { (eval echo configure:1349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+   for ac_file in conftest.*; do
-+     case $ac_file in
-+     *.c) ;;
-+@@ -1364,7 +1365,7 @@
-+ 
-+ 
-+ echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
-+-echo "configure:1368: checking for ${CC-cc} option to accept ANSI C" >&5
-++echo "configure:1369: checking for ${CC-cc} option to accept ANSI C" >&5
-+ if eval "test \"`echo '$''{'cf_cv_ansi_cc'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+@@ -1460,7 +1461,7 @@
-+ 
-+ 
-+ 	cat > conftest.$ac_ext <<EOF
-+-#line 1464 "configure"
-++#line 1465 "configure"
-+ #include "confdefs.h"
-+ 
-+ #ifndef CC_HAS_PROTOS
-+@@ -1476,7 +1477,7 @@
-+ 	struct s2 {int (*f) (double a);};
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:1480: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++if { (eval echo configure:1481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+   rm -rf conftest*
-+   cf_cv_ansi_cc="$cf_arg"; break
-+ else
-+@@ -1584,175 +1585,6 @@
-+ fi
-+ 
-+ 
-+-
-+-GCC_VERSION=none
-+-if test "$GCC" = yes ; then
-+-	echo $ac_n "checking version of $CC""... $ac_c" 1>&6
-+-echo "configure:1592: checking version of $CC" >&5
-+-	GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
-+-	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-+-	echo "$ac_t""$GCC_VERSION" 1>&6
-+-fi
-+-
-+-
-+-if ( test "$GCC" = yes || test "$GXX" = yes )
-+-then
-+-echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6
-+-echo "configure:1602: checking if you want to turn on gcc warnings" >&5
-+-
-+-# Check whether --enable-warnings or --disable-warnings was given.
-+-if test "${enable_warnings+set}" = set; then
-+-  enableval="$enable_warnings"
-+-  test "$enableval" != yes && enableval=no
-+-  if test "$enableval" != "no" ; then
-+-    with_warnings=yes 
-+-  else
-+-    with_warnings=no
-+-  fi
-+-else
-+-  enableval=no 
-+-  with_warnings=no
-+-  
-+-fi
-+-
-+-echo "$ac_t""$with_warnings" 1>&6
-+-if test "$with_warnings" = "yes"
-+-then
-+-	
-+-
-+-
-+-INTEL_COMPILER=no
-+-
-+-if test "$GCC" = yes ; then
-+-	case $host_os in
-+-	linux*|gnu*)
-+-		echo $ac_n "checking if this is really Intel C compiler""... $ac_c" 1>&6
-+-echo "configure:1631: checking if this is really Intel C compiler" >&5
-+-		cf_save_CFLAGS="$CFLAGS"
-+-		CFLAGS="$CFLAGS -no-gcc"
-+-		cat > conftest.$ac_ext <<EOF
-+-#line 1635 "configure"
-+-#include "confdefs.h"
-+-
-+-int main() {
-+-
-+-#ifdef __INTEL_COMPILER
-+-#else
-+-make an error
-+-#endif
-+-
-+-; return 0; }
-+-EOF
-+-if { (eval echo configure:1647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+-  rm -rf conftest*
-+-  INTEL_COMPILER=yes
-+-cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
-+-
-+-else
-+-  echo "configure: failed program was:" >&5
-+-  cat conftest.$ac_ext >&5
-+-fi
-+-rm -f conftest*
-+-		CFLAGS="$cf_save_CFLAGS"
-+-		echo "$ac_t""$INTEL_COMPILER" 1>&6
-+-		;;
-+-	esac
-+-fi
-+-
-+-
-+-cat > conftest.$ac_ext <<EOF
-+-#line 1665 "configure"
-+-int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
-+-EOF
-+-
-+-if test "$INTEL_COMPILER" = yes
-+-then
-+-# The "-wdXXX" options suppress warnings:
-+-# remark #1419: external declaration in primary source file
-+-# remark #1682: implicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
-+-# remark #1683: explicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
-+-# remark #1684: conversion from pointer to same-sized integral type (potential portability problem)
-+-# remark #193: zero used for undefined preprocessing identifier
-+-# remark #593: variable "curs_sb_left_arrow" was set but never used
-+-# remark #810: conversion from "int" to "Dimension={unsigned short}" may lose significant bits
-+-# remark #869: parameter "tw" was never referenced
-+-# remark #981: operands are evaluated in unspecified order
-+-# warning #269: invalid format string conversion
-+-
-+-	echo "checking for $CC warning options" 1>&6
-+-echo "configure:1684: checking for $CC warning options" >&5
-+-	cf_save_CFLAGS="$CFLAGS"
-+-	EXTRA_CFLAGS="-Wall"
-+-	for cf_opt in  \
-+-		wd1419 \
-+-		wd1682 \
-+-		wd1683 \
-+-		wd1684 \
-+-		wd193 \
-+-		wd279 \
-+-		wd593 \
-+-		wd810 \
-+-		wd869 \
-+-		wd981
-+-	do
-+-		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-+-		if { (eval echo configure:1700: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+-			test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6
-+-			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
-+-		fi
-+-	done
-+-	CFLAGS="$cf_save_CFLAGS"
-+-
-+-elif test "$GCC" = yes
-+-then
-+-	echo "checking for $CC warning options" 1>&6
-+-echo "configure:1710: checking for $CC warning options" >&5
-+-	cf_save_CFLAGS="$CFLAGS"
-+-	EXTRA_CFLAGS="-W -Wall"
-+-	cf_warn_CONST=""
-+-	test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings"
-+-	for cf_opt in \
-+-		Wbad-function-cast \
-+-		Wcast-align \
-+-		Wcast-qual \
-+-		Winline \
-+-		Wmissing-declarations \
-+-		Wmissing-prototypes \
-+-		Wnested-externs \
-+-		Wpointer-arith \
-+-		Wshadow \
-+-		Wstrict-prototypes \
-+-		Wundef $cf_warn_CONST 
-+-	do
-+-		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-+-		if { (eval echo configure:1729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+-			test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6
-+-			case $cf_opt in #(vi
-+-			Wcast-qual) #(vi
-+-				CPPFLAGS="$CPPFLAGS -DXTSTRINGDEFINES"
-+-				;;
-+-			Winline) #(vi
-+-				case $GCC_VERSION in
-+-				3.3*)
-+-					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
-+-
-+-					continue;;
-+-				esac
-+-				;;
-+-			esac
-+-			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
-+-		fi
-+-	done
-+-	CFLAGS="$cf_save_CFLAGS"
-+-fi
-+-rm -f conftest*
-+-
-+-
-+-
-+-fi
-+-fi
-+-
-+-
-+ if test "$GCC" = yes
-+ then
-+ cat > conftest.i <<EOF
-+@@ -1772,9 +1604,9 @@
-+ if test "$GCC" = yes
-+ then
-+ 	echo "checking for $CC __attribute__ directives" 1>&6
-+-echo "configure:1776: checking for $CC __attribute__ directives" >&5
-++echo "configure:1608: checking for $CC __attribute__ directives" >&5
-+ cat > conftest.$ac_ext <<EOF
-+-#line 1778 "configure"
-++#line 1610 "configure"
-+ #include "confdefs.h"
-+ #include "conftest.h"
-+ #include "conftest.i"
-+@@ -1812,7 +1644,7 @@
-+ EOF
-+ 			;;
-+ 		esac
-+-		if { (eval echo configure:1816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++		if { (eval echo configure:1648: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+ 			test -n "$verbose" && echo "$ac_t""... $cf_attribute" 1>&6
-+ 			cat conftest.h >>confdefs.h
-+ 		fi
-+@@ -1825,7 +1657,7 @@
-+ 
-+ 
-+ echo $ac_n "checking if $CC -U and -D options work together""... $ac_c" 1>&6
-+-echo "configure:1829: checking if $CC -U and -D options work together" >&5
-++echo "configure:1661: checking if $CC -U and -D options work together" >&5
-+ if eval "test \"`echo '$''{'cf_cv_cc_u_d_options'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+@@ -1833,7 +1665,7 @@
-+ 	cf_save_CPPFLAGS="$CPPFLAGS"
-+ 	CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
-+ 	cat > conftest.$ac_ext <<EOF
-+-#line 1837 "configure"
-++#line 1669 "configure"
-+ #include "confdefs.h"
-+ 
-+ int main() {
-+@@ -1847,7 +1679,7 @@
-+ 	
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:1851: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++if { (eval echo configure:1683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+   rm -rf conftest*
-+   
-+ 	cf_cv_cc_u_d_options=yes
-+@@ -1890,16 +1722,16 @@
-+ irix[56].*) #(vi
-+ 	CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
-+ 	;;
-+-linux*|gnu*) #(vi
-++linux*|gnu*|k*bsd*-gnu) #(vi
-+ 	
-+ echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6
-+-echo "configure:1897: checking if we must define _GNU_SOURCE" >&5
-++echo "configure:1729: checking if we must define _GNU_SOURCE" >&5
-+ if eval "test \"`echo '$''{'cf_cv_gnu_source'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+   
-+ cat > conftest.$ac_ext <<EOF
-+-#line 1903 "configure"
-++#line 1735 "configure"
-+ #include "confdefs.h"
-+ #include <sys/types.h>
-+ int main() {
-+@@ -1909,7 +1741,7 @@
-+ #endif
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:1913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++if { (eval echo configure:1745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+   rm -rf conftest*
-+   cf_cv_gnu_source=no
-+ else
-+@@ -1919,7 +1751,7 @@
-+   cf_save="$CPPFLAGS"
-+ 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-+ 	 cat > conftest.$ac_ext <<EOF
-+-#line 1923 "configure"
-++#line 1755 "configure"
-+ #include "confdefs.h"
-+ #include <sys/types.h>
-+ int main() {
-+@@ -1929,7 +1761,7 @@
-+ #endif
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:1933: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++if { (eval echo configure:1765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+   rm -rf conftest*
-+   cf_cv_gnu_source=no
-+ else
-+@@ -1973,13 +1805,13 @@
-+ 	;;
-+ *)
-+ 	echo $ac_n "checking if we should define _XOPEN_SOURCE""... $ac_c" 1>&6
-+-echo "configure:1977: checking if we should define _XOPEN_SOURCE" >&5
-++echo "configure:1809: checking if we should define _XOPEN_SOURCE" >&5
-+ if eval "test \"`echo '$''{'cf_cv_xopen_source'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+   
-+ 	cat > conftest.$ac_ext <<EOF
-+-#line 1983 "configure"
-++#line 1815 "configure"
-+ #include "confdefs.h"
-+ #include <sys/types.h>
-+ int main() {
-+@@ -1989,7 +1821,7 @@
-+ #endif
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:1993: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++if { (eval echo configure:1825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+   rm -rf conftest*
-+   cf_cv_xopen_source=no
-+ else
-+@@ -1999,7 +1831,7 @@
-+   cf_save="$CPPFLAGS"
-+ 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
-+ 	 cat > conftest.$ac_ext <<EOF
-+-#line 2003 "configure"
-++#line 1835 "configure"
-+ #include "confdefs.h"
-+ #include <sys/types.h>
-+ int main() {
-+@@ -2009,7 +1841,7 @@
-+ #endif
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:2013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++if { (eval echo configure:1845: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+   rm -rf conftest*
-+   cf_cv_xopen_source=no
-+ else
-+@@ -2064,16 +1896,16 @@
-+ 
-+ 
-+ echo $ac_n "checking if we should define _POSIX_C_SOURCE""... $ac_c" 1>&6
-+-echo "configure:2068: checking if we should define _POSIX_C_SOURCE" >&5
-++echo "configure:1900: checking if we should define _POSIX_C_SOURCE" >&5
-+ if eval "test \"`echo '$''{'cf_cv_posix_c_source'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+   
-+ 	
-+-echo "(line 2074) testing if the symbol is already defined go no further ..." 1>&5
-++echo "(line 1906) testing if the symbol is already defined go no further ..." 1>&5
-+ 
-+ 	cat > conftest.$ac_ext <<EOF
-+-#line 2077 "configure"
-++#line 1909 "configure"
-+ #include "confdefs.h"
-+ #include <sys/types.h>
-+ int main() {
-+@@ -2083,7 +1915,7 @@
-+ #endif
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:2087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++if { (eval echo configure:1919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+   rm -rf conftest*
-+   cf_cv_posix_c_source=no
-+ else
-+@@ -2105,7 +1937,7 @@
-+ 	 esac
-+ 	 if test "$cf_want_posix_source" = yes ; then
-+ 		cat > conftest.$ac_ext <<EOF
-+-#line 2109 "configure"
-++#line 1941 "configure"
-+ #include "confdefs.h"
-+ #include <sys/types.h>
-+ int main() {
-+@@ -2115,7 +1947,7 @@
-+ #endif
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:2119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++if { (eval echo configure:1951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+   :
-+ else
-+   echo "configure: failed program was:" >&5
-+@@ -2126,15 +1958,15 @@
-+ rm -f conftest*
-+ 	 fi
-+ 	 
-+-echo "(line 2130) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-++echo "(line 1962) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+ 
-+ 	 CFLAGS="$cf_trim_CFLAGS"
-+ 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
-+ 	 
-+-echo "(line 2135) testing if the second compile does not leave our definition intact error ..." 1>&5
-++echo "(line 1967) testing if the second compile does not leave our definition intact error ..." 1>&5
-+ 
-+ 	 cat > conftest.$ac_ext <<EOF
-+-#line 2138 "configure"
-++#line 1970 "configure"
-+ #include "confdefs.h"
-+ #include <sys/types.h>
-+ int main() {
-+@@ -2144,7 +1976,7 @@
-+ #endif
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:2148: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++if { (eval echo configure:1980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+   :
-+ else
-+   echo "configure: failed program was:" >&5
-+@@ -2178,6 +2010,347 @@
-+ 	;;
-+ esac
-+ 
-++echo $ac_n "checking for working const""... $ac_c" 1>&6
-++echo "configure:2015: checking for working const" >&5
-++if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-++  echo $ac_n "(cached) $ac_c" 1>&6
-++else
-++  cat > conftest.$ac_ext <<EOF
-++#line 2020 "configure"
-++#include "confdefs.h"
-++
-++int main() {
-++
-++/* Ultrix mips cc rejects this.  */
-++typedef int charset[2]; const charset x;
-++/* SunOS 4.1.1 cc rejects this.  */
-++char const *const *ccp;
-++char **p;
-++/* NEC SVR4.0.2 mips cc rejects this.  */
-++struct point {int x, y;};
-++static struct point const zero = {0,0};
-++/* AIX XL C 1.02.0.0 rejects this.
-++   It does not let you subtract one const X* pointer from another in an arm
-++   of an if-expression whose if-part is not a constant expression */
-++const char *g = "string";
-++ccp = &g + (g ? g-g : 0);
-++/* HPUX 7.0 cc rejects these. */
-++++ccp;
-++p = (char**) ccp;
-++ccp = (char const *const *) p;
-++{ /* SCO 3.2v4 cc rejects this.  */
-++  char *t;
-++  char const *s = 0 ? (char *) 0 : (char const *) 0;
-++
-++  *t++ = 0;
-++}
-++{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-++  int x[] = {25, 17};
-++  const int *foo = &x[0];
-++  ++foo;
-++}
-++{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-++  typedef const int *iptr;
-++  iptr p = 0;
-++  ++p;
-++}
-++{ /* AIX XL C 1.02.0.0 rejects this saying
-++     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-++  struct s { int j; const int *ap[3]; };
-++  struct s *b; b->j = 5;
-++}
-++{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-++  const int foo = 10;
-++}
-++
-++; return 0; }
-++EOF
-++if { (eval echo configure:2069: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++  rm -rf conftest*
-++  ac_cv_c_const=yes
-++else
-++  echo "configure: failed program was:" >&5
-++  cat conftest.$ac_ext >&5
-++  rm -rf conftest*
-++  ac_cv_c_const=no
-++fi
-++rm -f conftest*
-++fi
-++
-++echo "$ac_t""$ac_cv_c_const" 1>&6
-++if test $ac_cv_c_const = no; then
-++  cat >> confdefs.h <<\EOF
-++#define const 
-++EOF
-++
-++fi
-++
-++
-++echo $ac_n "checking for signal global datatype""... $ac_c" 1>&6
-++echo "configure:2091: checking for signal global datatype" >&5
-++if eval "test \"`echo '$''{'cf_cv_sig_atomic_t'+set}'`\" = set"; then
-++  echo $ac_n "(cached) $ac_c" 1>&6
-++else
-++  
-++	for cf_type in \
-++		"volatile sig_atomic_t" \
-++		"sig_atomic_t" \
-++		"int"
-++	do
-++	cat > conftest.$ac_ext <<EOF
-++#line 2102 "configure"
-++#include "confdefs.h"
-++
-++#include <sys/types.h>
-++#include <signal.h>
-++#include <stdio.h>
-++
-++extern $cf_type x;
-++$cf_type x;
-++static void handler(int sig)
-++{
-++	x = 5;
-++}
-++int main() {
-++signal(SIGINT, handler);
-++		 x = 1
-++; return 0; }
-++EOF
-++if { (eval echo configure:2120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++  rm -rf conftest*
-++  cf_cv_sig_atomic_t=$cf_type
-++else
-++  echo "configure: failed program was:" >&5
-++  cat conftest.$ac_ext >&5
-++  rm -rf conftest*
-++  cf_cv_sig_atomic_t=no
-++fi
-++rm -f conftest*
-++		test "$cf_cv_sig_atomic_t" != no && break
-++	done
-++	
-++fi
-++
-++echo "$ac_t""$cf_cv_sig_atomic_t" 1>&6
-++test "$cf_cv_sig_atomic_t" != no && cat >> confdefs.h <<EOF
-++#define SIG_ATOMIC_T $cf_cv_sig_atomic_t
-++EOF
-++
-++
-++
-++
-++echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6
-++echo "configure:2144: checking if you want to see long compiling messages" >&5
-++
-++# Check whether --enable-echo or --disable-echo was given.
-++if test "${enable_echo+set}" = set; then
-++  enableval="$enable_echo"
-++  test "$enableval" != no && enableval=yes
-++  if test "$enableval" != "yes" ; then
-++    
-++    ECHO_LT='--silent'
-++    ECHO_LD='@echo linking $@;'
-++    RULE_CC='	@echo compiling $<'
-++    SHOW_CC='	@echo compiling $@'
-++    ECHO_CC='@'
-++ 
-++  else
-++    
-++    ECHO_LT=''
-++    ECHO_LD=''
-++    RULE_CC='# compiling'
-++    SHOW_CC='# compiling'
-++    ECHO_CC=''
-++
-++  fi
-++else
-++  enableval=yes 
-++  
-++    ECHO_LT=''
-++    ECHO_LD=''
-++    RULE_CC='# compiling'
-++    SHOW_CC='# compiling'
-++    ECHO_CC=''
-++
-++  
-++fi
-++
-++echo "$ac_t""$enableval" 1>&6
-++
-++
-++
-++
-++
-++
-++
-++
-++GCC_VERSION=none
-++if test "$GCC" = yes ; then
-++	echo $ac_n "checking version of $CC""... $ac_c" 1>&6
-++echo "configure:2191: checking version of $CC" >&5
-++	GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
-++	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-++	echo "$ac_t""$GCC_VERSION" 1>&6
-++fi
-++
-++
-++if ( test "$GCC" = yes || test "$GXX" = yes )
-++then
-++echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6
-++echo "configure:2201: checking if you want to turn on gcc warnings" >&5
-++
-++# Check whether --enable-warnings or --disable-warnings was given.
-++if test "${enable_warnings+set}" = set; then
-++  enableval="$enable_warnings"
-++  test "$enableval" != yes && enableval=no
-++  if test "$enableval" != "no" ; then
-++    with_warnings=yes 
-++  else
-++    with_warnings=no
-++  fi
-++else
-++  enableval=no 
-++  with_warnings=no
-++  
-++fi
-++
-++echo "$ac_t""$with_warnings" 1>&6
-++if test "$with_warnings" = "yes"
-++then
-++	
-++
-++
-++INTEL_COMPILER=no
-++
-++if test "$GCC" = yes ; then
-++	case $host_os in
-++	linux*|gnu*)
-++		echo $ac_n "checking if this is really Intel C compiler""... $ac_c" 1>&6
-++echo "configure:2230: checking if this is really Intel C compiler" >&5
-++		cf_save_CFLAGS="$CFLAGS"
-++		CFLAGS="$CFLAGS -no-gcc"
-++		cat > conftest.$ac_ext <<EOF
-++#line 2234 "configure"
-++#include "confdefs.h"
-++
-++int main() {
-++
-++#ifdef __INTEL_COMPILER
-++#else
-++make an error
-++#endif
-++
-++; return 0; }
-++EOF
-++if { (eval echo configure:2246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++  rm -rf conftest*
-++  INTEL_COMPILER=yes
-++cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
-++
-++else
-++  echo "configure: failed program was:" >&5
-++  cat conftest.$ac_ext >&5
-++fi
-++rm -f conftest*
-++		CFLAGS="$cf_save_CFLAGS"
-++		echo "$ac_t""$INTEL_COMPILER" 1>&6
-++		;;
-++	esac
-++fi
-++
-++
-++cat > conftest.$ac_ext <<EOF
-++#line 2264 "configure"
-++int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
-++EOF
-++
-++if test "$INTEL_COMPILER" = yes
-++then
-++# The "-wdXXX" options suppress warnings:
-++# remark #1419: external declaration in primary source file
-++# remark #1682: implicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
-++# remark #1683: explicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
-++# remark #1684: conversion from pointer to same-sized integral type (potential portability problem)
-++# remark #193: zero used for undefined preprocessing identifier
-++# remark #593: variable "curs_sb_left_arrow" was set but never used
-++# remark #810: conversion from "int" to "Dimension={unsigned short}" may lose significant bits
-++# remark #869: parameter "tw" was never referenced
-++# remark #981: operands are evaluated in unspecified order
-++# warning #269: invalid format string conversion
-++
-++	echo "checking for $CC warning options" 1>&6
-++echo "configure:2283: checking for $CC warning options" >&5
-++	cf_save_CFLAGS="$CFLAGS"
-++	EXTRA_CFLAGS="-Wall"
-++	for cf_opt in  \
-++		wd1419 \
-++		wd1682 \
-++		wd1683 \
-++		wd1684 \
-++		wd193 \
-++		wd279 \
-++		wd593 \
-++		wd810 \
-++		wd869 \
-++		wd981
-++	do
-++		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-++		if { (eval echo configure:2299: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++			test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6
-++			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
-++		fi
-++	done
-++	CFLAGS="$cf_save_CFLAGS"
-++
-++elif test "$GCC" = yes
-++then
-++	echo "checking for $CC warning options" 1>&6
-++echo "configure:2309: checking for $CC warning options" >&5
-++	cf_save_CFLAGS="$CFLAGS"
-++	EXTRA_CFLAGS="-W -Wall"
-++	cf_warn_CONST=""
-++	test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings"
-++	for cf_opt in \
-++		Wbad-function-cast \
-++		Wcast-align \
-++		Wcast-qual \
-++		Winline \
-++		Wmissing-declarations \
-++		Wmissing-prototypes \
-++		Wnested-externs \
-++		Wpointer-arith \
-++		Wshadow \
-++		Wstrict-prototypes \
-++		Wundef $cf_warn_CONST 
-++	do
-++		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-++		if { (eval echo configure:2328: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++			test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6
-++			case $cf_opt in #(vi
-++			Wcast-qual) #(vi
-++				CPPFLAGS="$CPPFLAGS -DXTSTRINGDEFINES"
-++				;;
-++			Winline) #(vi
-++				case $GCC_VERSION in
-++				3.3*)
-++					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
-++
-++					continue;;
-++				esac
-++				;;
-++			esac
-++			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
-++		fi
-++	done
-++	CFLAGS="$cf_save_CFLAGS"
-++fi
-++rm -f conftest*
-++
-++
-++
-++fi
-++fi
-++
-+ 
-+ 
-+ 
-+@@ -2263,7 +2436,7 @@
-+ 	
-+ 
-+ echo $ac_n "checking for extra include directories""... $ac_c" 1>&6
-+-echo "configure:2267: checking for extra include directories" >&5
-++echo "configure:2440: checking for extra include directories" >&5
-+ if eval "test \"`echo '$''{'cf_cv_curses_incdir'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+@@ -2288,7 +2461,7 @@
-+ 
-+ 
-+ echo $ac_n "checking if we have identified curses headers""... $ac_c" 1>&6
-+-echo "configure:2292: checking if we have identified curses headers" >&5
-++echo "configure:2465: checking if we have identified curses headers" >&5
-+ if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+@@ -2301,14 +2474,14 @@
-+ 	ncurses/ncurses.h
-+ do
-+ cat > conftest.$ac_ext <<EOF
-+-#line 2305 "configure"
-++#line 2478 "configure"
-+ #include "confdefs.h"
-+ #include <${cf_header}>
-+ int main() {
-+ initscr(); tgoto("?", 0,0)
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:2312: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++if { (eval echo configure:2485: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+   rm -rf conftest*
-+   cf_cv_ncurses_header=$cf_header; break
-+ else
-+@@ -2331,17 +2504,17 @@
-+ do
-+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+-echo "configure:2335: checking for $ac_hdr" >&5
-++echo "configure:2508: checking for $ac_hdr" >&5
-+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+   cat > conftest.$ac_ext <<EOF
-+-#line 2340 "configure"
-++#line 2513 "configure"
-+ #include "confdefs.h"
-+ #include <$ac_hdr>
-+ EOF
-+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+-{ (eval echo configure:2345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-++{ (eval echo configure:2518: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+ if test -z "$ac_err"; then
-+   rm -rf conftest*
-+@@ -2370,7 +2543,7 @@
-+ 
-+ 
-+ echo $ac_n "checking for terminfo header""... $ac_c" 1>&6
-+-echo "configure:2374: checking for terminfo header" >&5
-++echo "configure:2547: checking for terminfo header" >&5
-+ if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+@@ -2387,7 +2560,7 @@
-+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
-+ do
-+ cat > conftest.$ac_ext <<EOF
-+-#line 2391 "configure"
-++#line 2564 "configure"
-+ #include "confdefs.h"
-+ #include <stdio.h>
-+ #include <${cf_cv_ncurses_header-curses.h}>
-+@@ -2397,7 +2570,7 @@
-+ int x = auto_left_margin
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:2401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++if { (eval echo configure:2574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+   rm -rf conftest*
-+   
-+ 	cf_cv_term_header="$cf_test"
-+@@ -2446,7 +2619,7 @@
-+ 
-+ 	
-+ echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
-+-echo "configure:2450: checking for ncurses version" >&5
-++echo "configure:2623: checking for ncurses version" >&5
-+ if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+@@ -2472,7 +2645,7 @@
-+ #endif
-+ EOF
-+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-+-	{ (eval echo configure:2476: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
-++	{ (eval echo configure:2649: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
-+ 	if test -f conftest.out ; then
-+ 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
-+ 		test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
-+@@ -2481,7 +2654,7 @@
-+ 
-+ else
-+   cat > conftest.$ac_ext <<EOF
-+-#line 2485 "configure"
-++#line 2658 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <${cf_cv_ncurses_header-curses.h}>
-+@@ -2502,10 +2675,10 @@
-+ 	make an error
-+ # endif
-+ #endif
-+-	exit(0);
-++	${cf_cv_main_return-return}(0);
-+ }
-+ EOF
-+-if { (eval echo configure:2509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-++if { (eval echo configure:2682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+ then
-+   
-+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
-+@@ -2529,16 +2702,16 @@
-+ 	
-+ 
-+ echo $ac_n "checking if we have identified curses libraries""... $ac_c" 1>&6
-+-echo "configure:2533: checking if we have identified curses libraries" >&5
-++echo "configure:2706: checking if we have identified curses libraries" >&5
-+ cat > conftest.$ac_ext <<EOF
-+-#line 2535 "configure"
-++#line 2708 "configure"
-+ #include "confdefs.h"
-+ #include <${cf_cv_ncurses_header-curses.h}>
-+ int main() {
-+ initscr(); tgoto("?", 0,0)
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:2542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:2715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   cf_result=yes
-+ else
-+@@ -2554,7 +2727,7 @@
-+ case $host_os in #(vi
-+ freebsd*) #(vi
-+ 	echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
-+-echo "configure:2558: checking for tgoto in -lmytinfo" >&5
-++echo "configure:2731: checking for tgoto in -lmytinfo" >&5
-+ ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'`
-+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+@@ -2562,7 +2735,7 @@
-+   ac_save_LIBS="$LIBS"
-+ LIBS="-lmytinfo  $LIBS"
-+ cat > conftest.$ac_ext <<EOF
-+-#line 2566 "configure"
-++#line 2739 "configure"
-+ #include "confdefs.h"
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+ /* We use char because int might match the return type of a gcc2
-+@@ -2573,7 +2746,7 @@
-+ tgoto()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:2577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:2750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_lib_$ac_lib_var=yes"
-+ else
-+@@ -2596,7 +2769,7 @@
-+ 	;;
-+ hpux10.*) #(vi
-+ 	echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6
-+-echo "configure:2600: checking for initscr in -lcur_colr" >&5
-++echo "configure:2773: checking for initscr in -lcur_colr" >&5
-+ ac_lib_var=`echo cur_colr'_'initscr | sed 'y%./+-%__p_%'`
-+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+@@ -2604,7 +2777,7 @@
-+   ac_save_LIBS="$LIBS"
-+ LIBS="-lcur_colr  $LIBS"
-+ cat > conftest.$ac_ext <<EOF
-+-#line 2608 "configure"
-++#line 2781 "configure"
-+ #include "confdefs.h"
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+ /* We use char because int might match the return type of a gcc2
-+@@ -2615,7 +2788,7 @@
-+ initscr()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:2619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:2792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_lib_$ac_lib_var=yes"
-+ else
-+@@ -2638,7 +2811,7 @@
-+   echo "$ac_t""no" 1>&6
-+ 
-+ 	echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6
-+-echo "configure:2642: checking for initscr in -lHcurses" >&5
-++echo "configure:2815: checking for initscr in -lHcurses" >&5
-+ ac_lib_var=`echo Hcurses'_'initscr | sed 'y%./+-%__p_%'`
-+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+@@ -2646,7 +2819,7 @@
-+   ac_save_LIBS="$LIBS"
-+ LIBS="-lHcurses  $LIBS"
-+ cat > conftest.$ac_ext <<EOF
-+-#line 2650 "configure"
-++#line 2823 "configure"
-+ #include "confdefs.h"
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+ /* We use char because int might match the return type of a gcc2
-+@@ -2657,7 +2830,7 @@
-+ initscr()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:2661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:2834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_lib_$ac_lib_var=yes"
-+ else
-+@@ -2710,12 +2883,12 @@
-+ 	# Check for library containing tgoto.  Do this before curses library
-+ 	# because it may be needed to link the test-case for initscr.
-+ 	echo $ac_n "checking for tgoto""... $ac_c" 1>&6
-+-echo "configure:2714: checking for tgoto" >&5
-++echo "configure:2887: checking for tgoto" >&5
-+ if eval "test \"`echo '$''{'ac_cv_func_tgoto'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+   cat > conftest.$ac_ext <<EOF
-+-#line 2719 "configure"
-++#line 2892 "configure"
-+ #include "confdefs.h"
-+ /* System header to define __stub macros and hopefully few prototypes,
-+     which can conflict with char tgoto(); below.  */
-+@@ -2738,7 +2911,7 @@
-+ 
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:2742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:2915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_func_tgoto=yes"
-+ else
-+@@ -2759,7 +2932,7 @@
-+ 		for cf_term_lib in $cf_check_list termcap termlib unknown
-+ 		do
-+ 			echo $ac_n "checking for tgoto in -l$cf_term_lib""... $ac_c" 1>&6
-+-echo "configure:2763: checking for tgoto in -l$cf_term_lib" >&5
-++echo "configure:2936: checking for tgoto in -l$cf_term_lib" >&5
-+ ac_lib_var=`echo $cf_term_lib'_'tgoto | sed 'y%./+-%__p_%'`
-+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+@@ -2767,7 +2940,7 @@
-+   ac_save_LIBS="$LIBS"
-+ LIBS="-l$cf_term_lib  $LIBS"
-+ cat > conftest.$ac_ext <<EOF
-+-#line 2771 "configure"
-++#line 2944 "configure"
-+ #include "confdefs.h"
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+ /* We use char because int might match the return type of a gcc2
-+@@ -2778,7 +2951,7 @@
-+ tgoto()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:2782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:2955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_lib_$ac_lib_var=yes"
-+ else
-+@@ -2808,7 +2981,7 @@
-+ 	for cf_curs_lib in $cf_check_list xcurses jcurses unknown
-+ 	do
-+ 		echo $ac_n "checking for initscr in -l$cf_curs_lib""... $ac_c" 1>&6
-+-echo "configure:2812: checking for initscr in -l$cf_curs_lib" >&5
-++echo "configure:2985: checking for initscr in -l$cf_curs_lib" >&5
-+ ac_lib_var=`echo $cf_curs_lib'_'initscr | sed 'y%./+-%__p_%'`
-+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+@@ -2816,7 +2989,7 @@
-+   ac_save_LIBS="$LIBS"
-+ LIBS="-l$cf_curs_lib  $LIBS"
-+ cat > conftest.$ac_ext <<EOF
-+-#line 2820 "configure"
-++#line 2993 "configure"
-+ #include "confdefs.h"
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+ /* We use char because int might match the return type of a gcc2
-+@@ -2827,7 +3000,7 @@
-+ initscr()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:2831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:3004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_lib_$ac_lib_var=yes"
-+ else
-+@@ -2853,16 +3026,16 @@
-+ 	LIBS="-l$cf_curs_lib $cf_save_LIBS"
-+ 	if test "$cf_term_lib" = unknown ; then
-+ 		echo $ac_n "checking if we can link with $cf_curs_lib library""... $ac_c" 1>&6
-+-echo "configure:2857: checking if we can link with $cf_curs_lib library" >&5
-++echo "configure:3030: checking if we can link with $cf_curs_lib library" >&5
-+ 		cat > conftest.$ac_ext <<EOF
-+-#line 2859 "configure"
-++#line 3032 "configure"
-+ #include "confdefs.h"
-+ #include <${cf_cv_ncurses_header-curses.h}>
-+ int main() {
-+ initscr()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:2866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:3039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   cf_result=yes
-+ else
-+@@ -2878,16 +3051,16 @@
-+ 		:
-+ 	elif test "$cf_term_lib" != predefined ; then
-+ 		echo $ac_n "checking if we need both $cf_curs_lib and $cf_term_lib libraries""... $ac_c" 1>&6
-+-echo "configure:2882: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
-++echo "configure:3055: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
-+ 		cat > conftest.$ac_ext <<EOF
-+-#line 2884 "configure"
-++#line 3057 "configure"
-+ #include "confdefs.h"
-+ #include <${cf_cv_ncurses_header-curses.h}>
-+ int main() {
-+ initscr(); tgoto((char *)0, 0, 0);
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:2891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:3064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   cf_result=no
-+ else
-+@@ -2897,14 +3070,14 @@
-+   
-+ 			LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
-+ 			cat > conftest.$ac_ext <<EOF
-+-#line 2901 "configure"
-++#line 3074 "configure"
-+ #include "confdefs.h"
-+ #include <${cf_cv_ncurses_header-curses.h}>
-+ int main() {
-+ initscr()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:2908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:3081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   cf_result=yes
-+ else
-+@@ -2934,7 +3107,7 @@
-+ CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS"
-+ 
-+ echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6
-+-echo "configure:2938: checking for $cf_ncuhdr_root header in include-path" >&5
-++echo "configure:3111: checking for $cf_ncuhdr_root header in include-path" >&5
-+ if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+@@ -2945,7 +3118,7 @@
-+ 	do
-+ 		
-+ 	cat > conftest.$ac_ext <<EOF
-+-#line 2949 "configure"
-++#line 3122 "configure"
-+ #include "confdefs.h"
-+ 
-+ 
-+@@ -2966,7 +3139,7 @@
-+ 	
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:2970: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++if { (eval echo configure:3143: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+   rm -rf conftest*
-+   cf_cv_ncurses_h=$cf_header
-+ 	
-+@@ -2992,7 +3165,7 @@
-+ else
-+ 
-+ echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6
-+-echo "configure:2996: checking for $cf_ncuhdr_root include-path" >&5
-++echo "configure:3169: checking for $cf_ncuhdr_root include-path" >&5
-+ if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+@@ -3087,14 +3260,14 @@
-+ 				cf_save_CPPFLAGS="$CPPFLAGS"
-+ 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
-+ 				cat > conftest.$ac_ext <<EOF
-+-#line 3091 "configure"
-++#line 3264 "configure"
-+ #include "confdefs.h"
-+ #include <stdio.h>
-+ int main() {
-+ printf("Hello")
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:3098: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++if { (eval echo configure:3271: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+   :
-+ else
-+   echo "configure: failed program was:" >&5
-+@@ -3121,7 +3294,7 @@
-+ 		do
-+ 			
-+ 	cat > conftest.$ac_ext <<EOF
-+-#line 3125 "configure"
-++#line 3298 "configure"
-+ #include "confdefs.h"
-+ 
-+ 
-+@@ -3142,7 +3315,7 @@
-+ 	
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:3146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++if { (eval echo configure:3319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+   rm -rf conftest*
-+   cf_cv_ncurses_h2=$cf_header
-+ 	
-+@@ -3189,14 +3362,14 @@
-+ 				cf_save_CPPFLAGS="$CPPFLAGS"
-+ 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
-+ 				cat > conftest.$ac_ext <<EOF
-+-#line 3193 "configure"
-++#line 3366 "configure"
-+ #include "confdefs.h"
-+ #include <stdio.h>
-+ int main() {
-+ printf("Hello")
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:3200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++if { (eval echo configure:3373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+   :
-+ else
-+   echo "configure: failed program was:" >&5
-+@@ -3249,7 +3422,7 @@
-+ 
-+ 
-+ echo $ac_n "checking for terminfo header""... $ac_c" 1>&6
-+-echo "configure:3253: checking for terminfo header" >&5
-++echo "configure:3426: checking for terminfo header" >&5
-+ if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+@@ -3266,7 +3439,7 @@
-+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
-+ do
-+ cat > conftest.$ac_ext <<EOF
-+-#line 3270 "configure"
-++#line 3443 "configure"
-+ #include "confdefs.h"
-+ #include <stdio.h>
-+ #include <${cf_cv_ncurses_header-curses.h}>
-+@@ -3276,7 +3449,7 @@
-+ int x = auto_left_margin
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:3280: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++if { (eval echo configure:3453: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+   rm -rf conftest*
-+   
-+ 	cf_cv_term_header="$cf_test"
-+@@ -3331,7 +3504,7 @@
-+ 
-+ 
-+ echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
-+-echo "configure:3335: checking for ncurses version" >&5
-++echo "configure:3508: checking for ncurses version" >&5
-+ if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+@@ -3357,7 +3530,7 @@
-+ #endif
-+ EOF
-+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-+-	{ (eval echo configure:3361: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
-++	{ (eval echo configure:3534: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
-+ 	if test -f conftest.out ; then
-+ 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
-+ 		test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
-+@@ -3366,7 +3539,7 @@
-+ 
-+ else
-+   cat > conftest.$ac_ext <<EOF
-+-#line 3370 "configure"
-++#line 3543 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <${cf_cv_ncurses_header-curses.h}>
-+@@ -3387,10 +3560,10 @@
-+ 	make an error
-+ # endif
-+ #endif
-+-	exit(0);
-++	${cf_cv_main_return-return}(0);
-+ }
-+ EOF
-+-if { (eval echo configure:3394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-++if { (eval echo configure:3567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+ then
-+   
-+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
-+@@ -3421,7 +3594,7 @@
-+ cf_ncurses_LIBS=""
-+ cf_ncurses_SAVE="$LIBS"
-+ echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-+-echo "configure:3425: checking for Gpm_Open in -lgpm" >&5
-++echo "configure:3598: checking for Gpm_Open in -lgpm" >&5
-+ ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'`
-+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+@@ -3429,7 +3602,7 @@
-+   ac_save_LIBS="$LIBS"
-+ LIBS="-lgpm  $LIBS"
-+ cat > conftest.$ac_ext <<EOF
-+-#line 3433 "configure"
-++#line 3606 "configure"
-+ #include "confdefs.h"
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+ /* We use char because int might match the return type of a gcc2
-+@@ -3440,7 +3613,7 @@
-+ Gpm_Open()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:3444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:3617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_lib_$ac_lib_var=yes"
-+ else
-+@@ -3456,7 +3629,7 @@
-+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+   echo "$ac_t""yes" 1>&6
-+   echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6
-+-echo "configure:3460: checking for initscr in -lgpm" >&5
-++echo "configure:3633: checking for initscr in -lgpm" >&5
-+ ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'`
-+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+@@ -3464,7 +3637,7 @@
-+   ac_save_LIBS="$LIBS"
-+ LIBS="-lgpm  $LIBS"
-+ cat > conftest.$ac_ext <<EOF
-+-#line 3468 "configure"
-++#line 3641 "configure"
-+ #include "confdefs.h"
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+ /* We use char because int might match the return type of a gcc2
-+@@ -3475,7 +3648,7 @@
-+ initscr()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:3479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:3652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_lib_$ac_lib_var=yes"
-+ else
-+@@ -3507,7 +3680,7 @@
-+ 	# version of ncurses (but it should do no harm, since it's static).
-+ 	if test "$cf_nculib_root" = ncurses ; then
-+ 		echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
-+-echo "configure:3511: checking for tgoto in -lmytinfo" >&5
-++echo "configure:3684: checking for tgoto in -lmytinfo" >&5
-+ ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'`
-+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+@@ -3515,7 +3688,7 @@
-+   ac_save_LIBS="$LIBS"
-+ LIBS="-lmytinfo  $LIBS"
-+ cat > conftest.$ac_ext <<EOF
-+-#line 3519 "configure"
-++#line 3692 "configure"
-+ #include "confdefs.h"
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+ /* We use char because int might match the return type of a gcc2
-+@@ -3526,7 +3699,7 @@
-+ tgoto()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:3530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:3703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_lib_$ac_lib_var=yes"
-+ else
-+@@ -3560,12 +3733,12 @@
-+ 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
-+ 	cf_libdir=""
-+ 	echo $ac_n "checking for initscr""... $ac_c" 1>&6
-+-echo "configure:3564: checking for initscr" >&5
-++echo "configure:3737: checking for initscr" >&5
-+ if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+   cat > conftest.$ac_ext <<EOF
-+-#line 3569 "configure"
-++#line 3742 "configure"
-+ #include "confdefs.h"
-+ /* System header to define __stub macros and hopefully few prototypes,
-+     which can conflict with char initscr(); below.  */
-+@@ -3588,7 +3761,7 @@
-+ 
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:3592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:3765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_func_initscr=yes"
-+ else
-+@@ -3608,17 +3781,17 @@
-+ 
-+ 		cf_save_LIBS="$LIBS"
-+ 		echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6
-+-echo "configure:3612: checking for initscr in -l$cf_nculib_root" >&5
-++echo "configure:3785: checking for initscr in -l$cf_nculib_root" >&5
-+ 		LIBS="-l$cf_nculib_root $LIBS"
-+ 		cat > conftest.$ac_ext <<EOF
-+-#line 3615 "configure"
-++#line 3788 "configure"
-+ #include "confdefs.h"
-+ #include <${cf_cv_ncurses_header-curses.h}>
-+ int main() {
-+ initscr()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:3622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:3795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   echo "$ac_t""yes" 1>&6
-+ 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
-+@@ -3687,17 +3860,17 @@
-+ 			for cf_libdir in $cf_search
-+ 			do
-+ 				echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6
-+-echo "configure:3691: checking for -l$cf_nculib_root in $cf_libdir" >&5
-++echo "configure:3864: checking for -l$cf_nculib_root in $cf_libdir" >&5
-+ 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
-+ 				cat > conftest.$ac_ext <<EOF
-+-#line 3694 "configure"
-++#line 3867 "configure"
-+ #include "confdefs.h"
-+ #include <${cf_cv_ncurses_header-curses.h}>
-+ int main() {
-+ initscr()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:3701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:3874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   echo "$ac_t""yes" 1>&6
-+ 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
-+@@ -3728,7 +3901,7 @@
-+ 
-+ if test -n "$cf_ncurses_LIBS" ; then
-+ 	echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6
-+-echo "configure:3732: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
-++echo "configure:3905: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
-+ 	cf_ncurses_SAVE="$LIBS"
-+ 	for p in $cf_ncurses_LIBS ; do
-+ 		q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"`
-+@@ -3737,14 +3910,14 @@
-+ 		fi
-+ 	done
-+ 	cat > conftest.$ac_ext <<EOF
-+-#line 3741 "configure"
-++#line 3914 "configure"
-+ #include "confdefs.h"
-+ #include <${cf_cv_ncurses_header-curses.h}>
-+ int main() {
-+ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:3748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:3921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   echo "$ac_t""yes" 1>&6
-+ else
-+@@ -3770,14 +3943,14 @@
-+ 	cf_cv_libtype=w
-+ 	
-+ echo $ac_n "checking for multibyte character support""... $ac_c" 1>&6
-+-echo "configure:3774: checking for multibyte character support" >&5
-++echo "configure:3947: checking for multibyte character support" >&5
-+ if eval "test \"`echo '$''{'cf_cv_utf8_lib'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+   
-+ 	cf_save_LIBS="$LIBS"
-+ 	cat > conftest.$ac_ext <<EOF
-+-#line 3781 "configure"
-++#line 3954 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <stdlib.h>
-+@@ -3785,7 +3958,7 @@
-+ putwc(0,0);
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:3789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:3962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   cf_cv_utf8_lib=yes
-+ else
-+@@ -3794,7 +3967,7 @@
-+   rm -rf conftest*
-+   LIBS="-lutf8 $LIBS"
-+ 	 cat > conftest.$ac_ext <<EOF
-+-#line 3798 "configure"
-++#line 3971 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <libutf8.h>
-+@@ -3802,7 +3975,7 @@
-+ putwc(0,0);
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:3806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:3979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   cf_cv_utf8_lib=add-on
-+ else
-+@@ -3839,7 +4012,7 @@
-+ CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS"
-+ 
-+ echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6
-+-echo "configure:3843: checking for $cf_ncuhdr_root header in include-path" >&5
-++echo "configure:4016: checking for $cf_ncuhdr_root header in include-path" >&5
-+ if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+@@ -3850,7 +4023,7 @@
-+ 	do
-+ 		
-+ 	cat > conftest.$ac_ext <<EOF
-+-#line 3854 "configure"
-++#line 4027 "configure"
-+ #include "confdefs.h"
-+ 
-+ 
-+@@ -3879,7 +4052,7 @@
-+ 	
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:3883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++if { (eval echo configure:4056: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+   rm -rf conftest*
-+   cf_cv_ncurses_h=$cf_header
-+ 	
-+@@ -3905,7 +4078,7 @@
-+ else
-+ 
-+ echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6
-+-echo "configure:3909: checking for $cf_ncuhdr_root include-path" >&5
-++echo "configure:4082: checking for $cf_ncuhdr_root include-path" >&5
-+ if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+@@ -4000,14 +4173,14 @@
-+ 				cf_save_CPPFLAGS="$CPPFLAGS"
-+ 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
-+ 				cat > conftest.$ac_ext <<EOF
-+-#line 4004 "configure"
-++#line 4177 "configure"
-+ #include "confdefs.h"
-+ #include <stdio.h>
-+ int main() {
-+ printf("Hello")
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:4011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++if { (eval echo configure:4184: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+   :
-+ else
-+   echo "configure: failed program was:" >&5
-+@@ -4034,7 +4207,7 @@
-+ 		do
-+ 			
-+ 	cat > conftest.$ac_ext <<EOF
-+-#line 4038 "configure"
-++#line 4211 "configure"
-+ #include "confdefs.h"
-+ 
-+ 
-+@@ -4055,7 +4228,7 @@
-+ 	
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:4059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++if { (eval echo configure:4232: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+   rm -rf conftest*
-+   cf_cv_ncurses_h2=$cf_header
-+ 	
-+@@ -4102,14 +4275,14 @@
-+ 				cf_save_CPPFLAGS="$CPPFLAGS"
-+ 				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
-+ 				cat > conftest.$ac_ext <<EOF
-+-#line 4106 "configure"
-++#line 4279 "configure"
-+ #include "confdefs.h"
-+ #include <stdio.h>
-+ int main() {
-+ printf("Hello")
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:4113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++if { (eval echo configure:4286: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+   :
-+ else
-+   echo "configure: failed program was:" >&5
-+@@ -4162,7 +4335,7 @@
-+ 
-+ 
-+ echo $ac_n "checking for terminfo header""... $ac_c" 1>&6
-+-echo "configure:4166: checking for terminfo header" >&5
-++echo "configure:4339: checking for terminfo header" >&5
-+ if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+@@ -4179,7 +4352,7 @@
-+ for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
-+ do
-+ cat > conftest.$ac_ext <<EOF
-+-#line 4183 "configure"
-++#line 4356 "configure"
-+ #include "confdefs.h"
-+ #include <stdio.h>
-+ #include <${cf_cv_ncurses_header-curses.h}>
-+@@ -4189,7 +4362,7 @@
-+ int x = auto_left_margin
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:4193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++if { (eval echo configure:4366: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+   rm -rf conftest*
-+   
-+ 	cf_cv_term_header="$cf_test"
-+@@ -4244,7 +4417,7 @@
-+ 
-+ 
-+ echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
-+-echo "configure:4248: checking for ncurses version" >&5
-++echo "configure:4421: checking for ncurses version" >&5
-+ if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+@@ -4270,7 +4443,7 @@
-+ #endif
-+ EOF
-+ 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
-+-	{ (eval echo configure:4274: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
-++	{ (eval echo configure:4447: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
-+ 	if test -f conftest.out ; then
-+ 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
-+ 		test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
-+@@ -4279,7 +4452,7 @@
-+ 
-+ else
-+   cat > conftest.$ac_ext <<EOF
-+-#line 4283 "configure"
-++#line 4456 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <${cf_cv_ncurses_header-curses.h}>
-+@@ -4300,10 +4473,10 @@
-+ 	make an error
-+ # endif
-+ #endif
-+-	exit(0);
-++	${cf_cv_main_return-return}(0);
-+ }
-+ EOF
-+-if { (eval echo configure:4307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-++if { (eval echo configure:4480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+ then
-+   
-+ 	cf_cv_ncurses_version=`cat $cf_tempfile`
-+@@ -4334,7 +4507,7 @@
-+ cf_ncurses_LIBS=""
-+ cf_ncurses_SAVE="$LIBS"
-+ echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-+-echo "configure:4338: checking for Gpm_Open in -lgpm" >&5
-++echo "configure:4511: checking for Gpm_Open in -lgpm" >&5
-+ ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'`
-+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+@@ -4342,7 +4515,7 @@
-+   ac_save_LIBS="$LIBS"
-+ LIBS="-lgpm  $LIBS"
-+ cat > conftest.$ac_ext <<EOF
-+-#line 4346 "configure"
-++#line 4519 "configure"
-+ #include "confdefs.h"
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+ /* We use char because int might match the return type of a gcc2
-+@@ -4353,7 +4526,7 @@
-+ Gpm_Open()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:4357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:4530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_lib_$ac_lib_var=yes"
-+ else
-+@@ -4369,7 +4542,7 @@
-+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+   echo "$ac_t""yes" 1>&6
-+   echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6
-+-echo "configure:4373: checking for initscr in -lgpm" >&5
-++echo "configure:4546: checking for initscr in -lgpm" >&5
-+ ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'`
-+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+@@ -4377,7 +4550,7 @@
-+   ac_save_LIBS="$LIBS"
-+ LIBS="-lgpm  $LIBS"
-+ cat > conftest.$ac_ext <<EOF
-+-#line 4381 "configure"
-++#line 4554 "configure"
-+ #include "confdefs.h"
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+ /* We use char because int might match the return type of a gcc2
-+@@ -4388,7 +4561,7 @@
-+ initscr()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:4392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:4565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_lib_$ac_lib_var=yes"
-+ else
-+@@ -4420,7 +4593,7 @@
-+ 	# version of ncurses (but it should do no harm, since it's static).
-+ 	if test "$cf_nculib_root" = ncurses ; then
-+ 		echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
-+-echo "configure:4424: checking for tgoto in -lmytinfo" >&5
-++echo "configure:4597: checking for tgoto in -lmytinfo" >&5
-+ ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'`
-+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+@@ -4428,7 +4601,7 @@
-+   ac_save_LIBS="$LIBS"
-+ LIBS="-lmytinfo  $LIBS"
-+ cat > conftest.$ac_ext <<EOF
-+-#line 4432 "configure"
-++#line 4605 "configure"
-+ #include "confdefs.h"
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+ /* We use char because int might match the return type of a gcc2
-+@@ -4439,7 +4612,7 @@
-+ tgoto()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:4443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:4616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_lib_$ac_lib_var=yes"
-+ else
-+@@ -4473,12 +4646,12 @@
-+ 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
-+ 	cf_libdir=""
-+ 	echo $ac_n "checking for initscr""... $ac_c" 1>&6
-+-echo "configure:4477: checking for initscr" >&5
-++echo "configure:4650: checking for initscr" >&5
-+ if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+   cat > conftest.$ac_ext <<EOF
-+-#line 4482 "configure"
-++#line 4655 "configure"
-+ #include "confdefs.h"
-+ /* System header to define __stub macros and hopefully few prototypes,
-+     which can conflict with char initscr(); below.  */
-+@@ -4501,7 +4674,7 @@
-+ 
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:4505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:4678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_func_initscr=yes"
-+ else
-+@@ -4521,17 +4694,17 @@
-+ 
-+ 		cf_save_LIBS="$LIBS"
-+ 		echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6
-+-echo "configure:4525: checking for initscr in -l$cf_nculib_root" >&5
-++echo "configure:4698: checking for initscr in -l$cf_nculib_root" >&5
-+ 		LIBS="-l$cf_nculib_root $LIBS"
-+ 		cat > conftest.$ac_ext <<EOF
-+-#line 4528 "configure"
-++#line 4701 "configure"
-+ #include "confdefs.h"
-+ #include <${cf_cv_ncurses_header-curses.h}>
-+ int main() {
-+ initscr()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:4535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:4708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   echo "$ac_t""yes" 1>&6
-+ 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
-+@@ -4600,17 +4773,17 @@
-+ 			for cf_libdir in $cf_search
-+ 			do
-+ 				echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6
-+-echo "configure:4604: checking for -l$cf_nculib_root in $cf_libdir" >&5
-++echo "configure:4777: checking for -l$cf_nculib_root in $cf_libdir" >&5
-+ 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
-+ 				cat > conftest.$ac_ext <<EOF
-+-#line 4607 "configure"
-++#line 4780 "configure"
-+ #include "confdefs.h"
-+ #include <${cf_cv_ncurses_header-curses.h}>
-+ int main() {
-+ initscr()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:4614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:4787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   echo "$ac_t""yes" 1>&6
-+ 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
-+@@ -4641,7 +4814,7 @@
-+ 
-+ if test -n "$cf_ncurses_LIBS" ; then
-+ 	echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6
-+-echo "configure:4645: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
-++echo "configure:4818: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
-+ 	cf_ncurses_SAVE="$LIBS"
-+ 	for p in $cf_ncurses_LIBS ; do
-+ 		q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"`
-+@@ -4650,14 +4823,14 @@
-+ 		fi
-+ 	done
-+ 	cat > conftest.$ac_ext <<EOF
-+-#line 4654 "configure"
-++#line 4827 "configure"
-+ #include "confdefs.h"
-+ #include <${cf_cv_ncurses_header-curses.h}>
-+ int main() {
-+ initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:4661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:4834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   echo "$ac_t""yes" 1>&6
-+ else
-+@@ -4700,17 +4873,17 @@
-+     case "`(uname -sr) 2>/dev/null`" in
-+     "SunOS 5"*)
-+       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-+-echo "configure:4704: checking whether -R must be followed by a space" >&5
-++echo "configure:4877: checking whether -R must be followed by a space" >&5
-+       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
-+       cat > conftest.$ac_ext <<EOF
-+-#line 4707 "configure"
-++#line 4880 "configure"
-+ #include "confdefs.h"
-+ 
-+ int main() {
-+ 
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:4714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:4887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   ac_R_nospace=yes
-+ else
-+@@ -4726,14 +4899,14 @@
-+       else
-+ 	LIBS="$ac_xsave_LIBS -R $x_libraries"
-+ 	cat > conftest.$ac_ext <<EOF
-+-#line 4730 "configure"
-++#line 4903 "configure"
-+ #include "confdefs.h"
-+ 
-+ int main() {
-+ 
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:4737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:4910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   ac_R_space=yes
-+ else
-+@@ -4765,7 +4938,7 @@
-+     # libraries were built with DECnet support.  And karl@cs.umb.edu says
-+     # the Alpha needs dnet_stub (dnet does not exist).
-+     echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-+-echo "configure:4769: checking for dnet_ntoa in -ldnet" >&5
-++echo "configure:4942: checking for dnet_ntoa in -ldnet" >&5
-+ ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
-+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+@@ -4773,7 +4946,7 @@
-+   ac_save_LIBS="$LIBS"
-+ LIBS="-ldnet  $LIBS"
-+ cat > conftest.$ac_ext <<EOF
-+-#line 4777 "configure"
-++#line 4950 "configure"
-+ #include "confdefs.h"
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+ /* We use char because int might match the return type of a gcc2
-+@@ -4784,7 +4957,7 @@
-+ dnet_ntoa()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:4788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:4961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_lib_$ac_lib_var=yes"
-+ else
-+@@ -4806,7 +4979,7 @@
-+ 
-+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-+       echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-+-echo "configure:4810: checking for dnet_ntoa in -ldnet_stub" >&5
-++echo "configure:4983: checking for dnet_ntoa in -ldnet_stub" >&5
-+ ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
-+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+@@ -4814,7 +4987,7 @@
-+   ac_save_LIBS="$LIBS"
-+ LIBS="-ldnet_stub  $LIBS"
-+ cat > conftest.$ac_ext <<EOF
-+-#line 4818 "configure"
-++#line 4991 "configure"
-+ #include "confdefs.h"
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+ /* We use char because int might match the return type of a gcc2
-+@@ -4825,7 +4998,7 @@
-+ dnet_ntoa()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:4829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:5002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_lib_$ac_lib_var=yes"
-+ else
-+@@ -4854,12 +5027,12 @@
-+     # The nsl library prevents programs from opening the X display
-+     # on Irix 5.2, according to dickey@clark.net.
-+     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-+-echo "configure:4858: checking for gethostbyname" >&5
-++echo "configure:5031: checking for gethostbyname" >&5
-+ if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+   cat > conftest.$ac_ext <<EOF
-+-#line 4863 "configure"
-++#line 5036 "configure"
-+ #include "confdefs.h"
-+ /* System header to define __stub macros and hopefully few prototypes,
-+     which can conflict with char gethostbyname(); below.  */
-+@@ -4882,7 +5055,7 @@
-+ 
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:4886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:5059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_func_gethostbyname=yes"
-+ else
-+@@ -4903,7 +5076,7 @@
-+ 
-+     if test $ac_cv_func_gethostbyname = no; then
-+       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-+-echo "configure:4907: checking for gethostbyname in -lnsl" >&5
-++echo "configure:5080: checking for gethostbyname in -lnsl" >&5
-+ ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
-+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+@@ -4911,7 +5084,7 @@
-+   ac_save_LIBS="$LIBS"
-+ LIBS="-lnsl  $LIBS"
-+ cat > conftest.$ac_ext <<EOF
-+-#line 4915 "configure"
-++#line 5088 "configure"
-+ #include "confdefs.h"
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+ /* We use char because int might match the return type of a gcc2
-+@@ -4922,7 +5095,7 @@
-+ gethostbyname()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:4926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:5099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_lib_$ac_lib_var=yes"
-+ else
-+@@ -4952,12 +5125,12 @@
-+     # -lsocket must be given before -lnsl if both are needed.
-+     # We assume that if connect needs -lnsl, so does gethostbyname.
-+     echo $ac_n "checking for connect""... $ac_c" 1>&6
-+-echo "configure:4956: checking for connect" >&5
-++echo "configure:5129: checking for connect" >&5
-+ if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+   cat > conftest.$ac_ext <<EOF
-+-#line 4961 "configure"
-++#line 5134 "configure"
-+ #include "confdefs.h"
-+ /* System header to define __stub macros and hopefully few prototypes,
-+     which can conflict with char connect(); below.  */
-+@@ -4980,7 +5153,7 @@
-+ 
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:4984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:5157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_func_connect=yes"
-+ else
-+@@ -5001,7 +5174,7 @@
-+ 
-+     if test $ac_cv_func_connect = no; then
-+       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-+-echo "configure:5005: checking for connect in -lsocket" >&5
-++echo "configure:5178: checking for connect in -lsocket" >&5
-+ ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
-+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+@@ -5009,7 +5182,7 @@
-+   ac_save_LIBS="$LIBS"
-+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-+ cat > conftest.$ac_ext <<EOF
-+-#line 5013 "configure"
-++#line 5186 "configure"
-+ #include "confdefs.h"
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+ /* We use char because int might match the return type of a gcc2
-+@@ -5020,7 +5193,7 @@
-+ connect()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:5024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:5197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_lib_$ac_lib_var=yes"
-+ else
-+@@ -5044,12 +5217,12 @@
-+ 
-+     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
-+     echo $ac_n "checking for remove""... $ac_c" 1>&6
-+-echo "configure:5048: checking for remove" >&5
-++echo "configure:5221: checking for remove" >&5
-+ if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+   cat > conftest.$ac_ext <<EOF
-+-#line 5053 "configure"
-++#line 5226 "configure"
-+ #include "confdefs.h"
-+ /* System header to define __stub macros and hopefully few prototypes,
-+     which can conflict with char remove(); below.  */
-+@@ -5072,7 +5245,7 @@
-+ 
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:5076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:5249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_func_remove=yes"
-+ else
-+@@ -5093,7 +5266,7 @@
-+ 
-+     if test $ac_cv_func_remove = no; then
-+       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-+-echo "configure:5097: checking for remove in -lposix" >&5
-++echo "configure:5270: checking for remove in -lposix" >&5
-+ ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
-+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+@@ -5101,7 +5274,7 @@
-+   ac_save_LIBS="$LIBS"
-+ LIBS="-lposix  $LIBS"
-+ cat > conftest.$ac_ext <<EOF
-+-#line 5105 "configure"
-++#line 5278 "configure"
-+ #include "confdefs.h"
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+ /* We use char because int might match the return type of a gcc2
-+@@ -5112,7 +5285,7 @@
-+ remove()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:5116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:5289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_lib_$ac_lib_var=yes"
-+ else
-+@@ -5136,12 +5309,12 @@
-+ 
-+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-+     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-+-echo "configure:5140: checking for shmat" >&5
-++echo "configure:5313: checking for shmat" >&5
-+ if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+   cat > conftest.$ac_ext <<EOF
-+-#line 5145 "configure"
-++#line 5318 "configure"
-+ #include "confdefs.h"
-+ /* System header to define __stub macros and hopefully few prototypes,
-+     which can conflict with char shmat(); below.  */
-+@@ -5164,7 +5337,7 @@
-+ 
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:5168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:5341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_func_shmat=yes"
-+ else
-+@@ -5185,7 +5358,7 @@
-+ 
-+     if test $ac_cv_func_shmat = no; then
-+       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-+-echo "configure:5189: checking for shmat in -lipc" >&5
-++echo "configure:5362: checking for shmat in -lipc" >&5
-+ ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
-+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+@@ -5193,7 +5366,7 @@
-+   ac_save_LIBS="$LIBS"
-+ LIBS="-lipc  $LIBS"
-+ cat > conftest.$ac_ext <<EOF
-+-#line 5197 "configure"
-++#line 5370 "configure"
-+ #include "confdefs.h"
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+ /* We use char because int might match the return type of a gcc2
-+@@ -5204,7 +5377,7 @@
-+ shmat()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:5208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:5381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_lib_$ac_lib_var=yes"
-+ else
-+@@ -5237,7 +5410,7 @@
-+   # libraries we check for below, so use a different variable.
-+   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
-+   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-+-echo "configure:5241: checking for IceConnectionNumber in -lICE" >&5
-++echo "configure:5414: checking for IceConnectionNumber in -lICE" >&5
-+ ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
-+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+@@ -5245,7 +5418,7 @@
-+   ac_save_LIBS="$LIBS"
-+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-+ cat > conftest.$ac_ext <<EOF
-+-#line 5249 "configure"
-++#line 5422 "configure"
-+ #include "confdefs.h"
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+ /* We use char because int might match the return type of a gcc2
-+@@ -5256,7 +5429,7 @@
-+ IceConnectionNumber()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:5260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:5433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_lib_$ac_lib_var=yes"
-+ else
-+@@ -5371,14 +5544,14 @@
-+ 
-+ if test "$cf_check_cflags" != "$CFLAGS" ; then
-+ cat > conftest.$ac_ext <<EOF
-+-#line 5375 "configure"
-++#line 5548 "configure"
-+ #include "confdefs.h"
-+ #include <stdio.h>
-+ int main() {
-+ printf("Hello world");
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:5382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:5555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   :
-+ else
-+   echo "configure: failed program was:" >&5
-+@@ -5397,12 +5570,12 @@
-+ 
-+ 
-+ echo $ac_n "checking for XOpenDisplay""... $ac_c" 1>&6
-+-echo "configure:5401: checking for XOpenDisplay" >&5
-++echo "configure:5574: checking for XOpenDisplay" >&5
-+ if eval "test \"`echo '$''{'ac_cv_func_XOpenDisplay'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+   cat > conftest.$ac_ext <<EOF
-+-#line 5406 "configure"
-++#line 5579 "configure"
-+ #include "confdefs.h"
-+ /* System header to define __stub macros and hopefully few prototypes,
-+     which can conflict with char XOpenDisplay(); below.  */
-+@@ -5425,7 +5598,7 @@
-+ 
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:5429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:5602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_func_XOpenDisplay=yes"
-+ else
-+@@ -5444,7 +5617,7 @@
-+   echo "$ac_t""no" 1>&6
-+ 
-+ echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-+-echo "configure:5448: checking for XOpenDisplay in -lX11" >&5
-++echo "configure:5621: checking for XOpenDisplay in -lX11" >&5
-+ ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
-+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+@@ -5452,7 +5625,7 @@
-+   ac_save_LIBS="$LIBS"
-+ LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
-+ cat > conftest.$ac_ext <<EOF
-+-#line 5456 "configure"
-++#line 5629 "configure"
-+ #include "confdefs.h"
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+ /* We use char because int might match the return type of a gcc2
-+@@ -5463,7 +5636,7 @@
-+ XOpenDisplay()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:5467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:5640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_lib_$ac_lib_var=yes"
-+ else
-+@@ -5487,12 +5660,12 @@
-+ 
-+ 
-+ echo $ac_n "checking for XtAppInitialize""... $ac_c" 1>&6
-+-echo "configure:5491: checking for XtAppInitialize" >&5
-++echo "configure:5664: checking for XtAppInitialize" >&5
-+ if eval "test \"`echo '$''{'ac_cv_func_XtAppInitialize'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+   cat > conftest.$ac_ext <<EOF
-+-#line 5496 "configure"
-++#line 5669 "configure"
-+ #include "confdefs.h"
-+ /* System header to define __stub macros and hopefully few prototypes,
-+     which can conflict with char XtAppInitialize(); below.  */
-+@@ -5515,7 +5688,7 @@
-+ 
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:5519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:5692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_func_XtAppInitialize=yes"
-+ else
-+@@ -5534,7 +5707,7 @@
-+   echo "$ac_t""no" 1>&6
-+ 
-+ echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6
-+-echo "configure:5538: checking for XtAppInitialize in -lXt" >&5
-++echo "configure:5711: checking for XtAppInitialize in -lXt" >&5
-+ ac_lib_var=`echo Xt'_'XtAppInitialize | sed 'y%./+-%__p_%'`
-+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+@@ -5542,7 +5715,7 @@
-+   ac_save_LIBS="$LIBS"
-+ LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
-+ cat > conftest.$ac_ext <<EOF
-+-#line 5546 "configure"
-++#line 5719 "configure"
-+ #include "confdefs.h"
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+ /* We use char because int might match the return type of a gcc2
-+@@ -5553,7 +5726,7 @@
-+ XtAppInitialize()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:5557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:5730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_lib_$ac_lib_var=yes"
-+ else
-+@@ -5591,7 +5764,7 @@
-+ cf_x_athena=${cf_x_athena-Xaw}
-+ 
-+ echo $ac_n "checking if you want to link with Xaw 3d library""... $ac_c" 1>&6
-+-echo "configure:5595: checking if you want to link with Xaw 3d library" >&5
-++echo "configure:5768: checking if you want to link with Xaw 3d library" >&5
-+ withval=
-+ 
-+ # Check whether --with-Xaw3d or --without-Xaw3d was given.
-+@@ -5608,7 +5781,7 @@
-+ fi
-+ 
-+ echo $ac_n "checking if you want to link with neXT Athena library""... $ac_c" 1>&6
-+-echo "configure:5612: checking if you want to link with neXT Athena library" >&5
-++echo "configure:5785: checking if you want to link with neXT Athena library" >&5
-+ withval=
-+ 
-+ # Check whether --with-neXtaw or --without-neXtaw was given.
-+@@ -5625,7 +5798,7 @@
-+ fi
-+ 
-+ echo $ac_n "checking if you want to link with Athena-Plus library""... $ac_c" 1>&6
-+-echo "configure:5629: checking if you want to link with Athena-Plus library" >&5
-++echo "configure:5802: checking if you want to link with Athena-Plus library" >&5
-+ withval=
-+ 
-+ # Check whether --with-XawPlus or --without-XawPlus was given.
-+@@ -5642,7 +5815,7 @@
-+ fi
-+ 
-+ echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6
-+-echo "configure:5646: checking for XextCreateExtension in -lXext" >&5
-++echo "configure:5819: checking for XextCreateExtension in -lXext" >&5
-+ ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'`
-+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+@@ -5650,7 +5823,7 @@
-+   ac_save_LIBS="$LIBS"
-+ LIBS="-lXext  $LIBS"
-+ cat > conftest.$ac_ext <<EOF
-+-#line 5654 "configure"
-++#line 5827 "configure"
-+ #include "confdefs.h"
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+ /* We use char because int might match the return type of a gcc2
-+@@ -5661,7 +5834,7 @@
-+ XextCreateExtension()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:5665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:5838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_lib_$ac_lib_var=yes"
-+ else
-+@@ -5700,13 +5873,13 @@
-+ 		if test $cf_path != default ; then
-+ 			CPPFLAGS="-I$cf_path/include $cf_save"
-+ 			echo $ac_n "checking for $cf_test in $cf_path""... $ac_c" 1>&6
-+-echo "configure:5704: checking for $cf_test in $cf_path" >&5
-++echo "configure:5877: checking for $cf_test in $cf_path" >&5
-+ 		else
-+ 			echo $ac_n "checking for $cf_test""... $ac_c" 1>&6
-+-echo "configure:5707: checking for $cf_test" >&5
-++echo "configure:5880: checking for $cf_test" >&5
-+ 		fi
-+ 		cat > conftest.$ac_ext <<EOF
-+-#line 5710 "configure"
-++#line 5883 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <X11/Intrinsic.h>
-+@@ -5715,7 +5888,7 @@
-+ 
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:5719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++if { (eval echo configure:5892: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+   rm -rf conftest*
-+   cf_result=yes
-+ else
-+@@ -5762,21 +5935,21 @@
-+ 			if test $cf_path != default ; then
-+ 				LIBS="-L$cf_path/lib $cf_lib $LIBS"
-+ 				echo $ac_n "checking for $cf_lib in $cf_path""... $ac_c" 1>&6
-+-echo "configure:5766: checking for $cf_lib in $cf_path" >&5
-++echo "configure:5939: checking for $cf_lib in $cf_path" >&5
-+ 			else
-+ 				LIBS="$cf_lib $LIBS"
-+ 				echo $ac_n "checking for $cf_test in $cf_lib""... $ac_c" 1>&6
-+-echo "configure:5770: checking for $cf_test in $cf_lib" >&5
-++echo "configure:5943: checking for $cf_test in $cf_lib" >&5
-+ 			fi
-+ 			cat > conftest.$ac_ext <<EOF
-+-#line 5773 "configure"
-++#line 5946 "configure"
-+ #include "confdefs.h"
-+ 
-+ int main() {
-+ $cf_test()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:5780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:5953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   cf_result=yes
-+ else
-+@@ -5817,7 +5990,7 @@
-+ # Extract the first word of "$ac_prog", so it can be a program name with args.
-+ set dummy $ac_prog; ac_word=$2
-+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+-echo "configure:5821: checking for $ac_word" >&5
-++echo "configure:5994: checking for $ac_word" >&5
-+ if eval "test \"`echo '$''{'ac_cv_path_XCURSES_CONFIG'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+@@ -5946,14 +6119,14 @@
-+ 
-+ if test "$cf_check_cflags" != "$CFLAGS" ; then
-+ cat > conftest.$ac_ext <<EOF
-+-#line 5950 "configure"
-++#line 6123 "configure"
-+ #include "confdefs.h"
-+ #include <stdio.h>
-+ int main() {
-+ printf("Hello world");
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:5957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:6130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   :
-+ else
-+   echo "configure: failed program was:" >&5
-+@@ -5971,7 +6144,7 @@
-+ fi
-+ 
-+ echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-+-echo "configure:5975: checking for XOpenDisplay in -lX11" >&5
-++echo "configure:6148: checking for XOpenDisplay in -lX11" >&5
-+ ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
-+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+@@ -5979,7 +6152,7 @@
-+   ac_save_LIBS="$LIBS"
-+ LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
-+ cat > conftest.$ac_ext <<EOF
-+-#line 5983 "configure"
-++#line 6156 "configure"
-+ #include "confdefs.h"
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+ /* We use char because int might match the return type of a gcc2
-+@@ -5990,7 +6163,7 @@
-+ XOpenDisplay()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:5994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:6167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_lib_$ac_lib_var=yes"
-+ else
-+@@ -6011,14 +6184,14 @@
-+ fi
-+ 
-+ echo $ac_n "checking for XCurses library""... $ac_c" 1>&6
-+-echo "configure:6015: checking for XCurses library" >&5
-++echo "configure:6188: checking for XCurses library" >&5
-+ if eval "test \"`echo '$''{'cf_cv_lib_XCurses'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+   
-+ LIBS="-lXCurses $LIBS"
-+ cat > conftest.$ac_ext <<EOF
-+-#line 6022 "configure"
-++#line 6195 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <xcurses.h>
-+@@ -6028,7 +6201,7 @@
-+ XCursesExit();
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:6032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:6205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   cf_cv_lib_XCurses=yes
-+ else
-+@@ -6073,7 +6246,7 @@
-+ *)
-+ 	# look for curses-related libraries
-+ 	echo $ac_n "checking for new_panel in -lpanel$cf_cv_libtype""... $ac_c" 1>&6
-+-echo "configure:6077: checking for new_panel in -lpanel$cf_cv_libtype" >&5
-++echo "configure:6250: checking for new_panel in -lpanel$cf_cv_libtype" >&5
-+ ac_lib_var=`echo panel$cf_cv_libtype'_'new_panel | sed 'y%./+-%__p_%'`
-+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+@@ -6081,7 +6254,7 @@
-+   ac_save_LIBS="$LIBS"
-+ LIBS="-lpanel$cf_cv_libtype  $LIBS"
-+ cat > conftest.$ac_ext <<EOF
-+-#line 6085 "configure"
-++#line 6258 "configure"
-+ #include "confdefs.h"
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+ /* We use char because int might match the return type of a gcc2
-+@@ -6092,7 +6265,7 @@
-+ new_panel()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:6096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:6269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_lib_$ac_lib_var=yes"
-+ else
-+@@ -6120,7 +6293,7 @@
-+ fi
-+ 
-+ 	echo $ac_n "checking for menu_driver in -lmenu$cf_cv_libtype""... $ac_c" 1>&6
-+-echo "configure:6124: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
-++echo "configure:6297: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
-+ ac_lib_var=`echo menu$cf_cv_libtype'_'menu_driver | sed 'y%./+-%__p_%'`
-+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+@@ -6128,7 +6301,7 @@
-+   ac_save_LIBS="$LIBS"
-+ LIBS="-lmenu$cf_cv_libtype  $LIBS"
-+ cat > conftest.$ac_ext <<EOF
-+-#line 6132 "configure"
-++#line 6305 "configure"
-+ #include "confdefs.h"
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+ /* We use char because int might match the return type of a gcc2
-+@@ -6139,7 +6312,7 @@
-+ menu_driver()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:6143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:6316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_lib_$ac_lib_var=yes"
-+ else
-+@@ -6167,7 +6340,7 @@
-+ fi
-+ 
-+ 	echo $ac_n "checking for form_driver in -lform$cf_cv_libtype""... $ac_c" 1>&6
-+-echo "configure:6171: checking for form_driver in -lform$cf_cv_libtype" >&5
-++echo "configure:6344: checking for form_driver in -lform$cf_cv_libtype" >&5
-+ ac_lib_var=`echo form$cf_cv_libtype'_'form_driver | sed 'y%./+-%__p_%'`
-+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+@@ -6175,7 +6348,7 @@
-+   ac_save_LIBS="$LIBS"
-+ LIBS="-lform$cf_cv_libtype  $LIBS"
-+ cat > conftest.$ac_ext <<EOF
-+-#line 6179 "configure"
-++#line 6352 "configure"
-+ #include "confdefs.h"
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+ /* We use char because int might match the return type of a gcc2
-+@@ -6186,7 +6359,7 @@
-+ form_driver()
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:6190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:6363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_lib_$ac_lib_var=yes"
-+ else
-+@@ -6225,17 +6398,17 @@
-+ do
-+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+-echo "configure:6229: checking for $ac_hdr" >&5
-++echo "configure:6402: checking for $ac_hdr" >&5
-+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+   cat > conftest.$ac_ext <<EOF
-+-#line 6234 "configure"
-++#line 6407 "configure"
-+ #include "confdefs.h"
-+ #include <$ac_hdr>
-+ EOF
-+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+-{ (eval echo configure:6239: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-++{ (eval echo configure:6412: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+ if test -z "$ac_err"; then
-+   rm -rf conftest*
-+@@ -6265,12 +6438,12 @@
-+ esac
-+ 
-+ echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-+-echo "configure:6269: checking return type of signal handlers" >&5
-++echo "configure:6442: checking return type of signal handlers" >&5
-+ if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+   cat > conftest.$ac_ext <<EOF
-+-#line 6274 "configure"
-++#line 6447 "configure"
-+ #include "confdefs.h"
-+ #include <sys/types.h>
-+ #include <signal.h>
-+@@ -6287,7 +6460,7 @@
-+ int i;
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:6291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++if { (eval echo configure:6464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+   rm -rf conftest*
-+   ac_cv_type_signal=void
-+ else
-+@@ -6307,12 +6480,12 @@
-+ 
-+ 
-+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-+-echo "configure:6311: checking for ANSI C header files" >&5
-++echo "configure:6484: checking for ANSI C header files" >&5
-+ if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+   cat > conftest.$ac_ext <<EOF
-+-#line 6316 "configure"
-++#line 6489 "configure"
-+ #include "confdefs.h"
-+ #include <stdlib.h>
-+ #include <stdarg.h>
-+@@ -6320,7 +6493,7 @@
-+ #include <float.h>
-+ EOF
-+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+-{ (eval echo configure:6324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-++{ (eval echo configure:6497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+ if test -z "$ac_err"; then
-+   rm -rf conftest*
-+@@ -6337,7 +6510,7 @@
-+ if test $ac_cv_header_stdc = yes; then
-+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-+ cat > conftest.$ac_ext <<EOF
-+-#line 6341 "configure"
-++#line 6514 "configure"
-+ #include "confdefs.h"
-+ #include <string.h>
-+ EOF
-+@@ -6355,7 +6528,7 @@
-+ if test $ac_cv_header_stdc = yes; then
-+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-+ cat > conftest.$ac_ext <<EOF
-+-#line 6359 "configure"
-++#line 6532 "configure"
-+ #include "confdefs.h"
-+ #include <stdlib.h>
-+ EOF
-+@@ -6376,7 +6549,7 @@
-+   :
-+ else
-+   cat > conftest.$ac_ext <<EOF
-+-#line 6380 "configure"
-++#line 6553 "configure"
-+ #include "confdefs.h"
-+ #include <ctype.h>
-+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-+@@ -6387,7 +6560,7 @@
-+ exit (0); }
-+ 
-+ EOF
-+-if { (eval echo configure:6391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-++if { (eval echo configure:6564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+ then
-+   :
-+ else
-+@@ -6411,12 +6584,12 @@
-+ fi
-+ 
-+ echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-+-echo "configure:6415: checking whether time.h and sys/time.h may both be included" >&5
-++echo "configure:6588: checking whether time.h and sys/time.h may both be included" >&5
-+ if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+   cat > conftest.$ac_ext <<EOF
-+-#line 6420 "configure"
-++#line 6593 "configure"
-+ #include "confdefs.h"
-+ #include <sys/types.h>
-+ #include <sys/time.h>
-+@@ -6425,7 +6598,7 @@
-+ struct tm *tp;
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:6429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++if { (eval echo configure:6602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+   rm -rf conftest*
-+   ac_cv_header_time=yes
-+ else
-+@@ -6458,17 +6631,17 @@
-+ do
-+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+-echo "configure:6462: checking for $ac_hdr" >&5
-++echo "configure:6635: checking for $ac_hdr" >&5
-+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+   cat > conftest.$ac_ext <<EOF
-+-#line 6467 "configure"
-++#line 6640 "configure"
-+ #include "confdefs.h"
-+ #include <$ac_hdr>
-+ EOF
-+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+-{ (eval echo configure:6472: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-++{ (eval echo configure:6645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+ if test -z "$ac_err"; then
-+   rm -rf conftest*
-+@@ -6529,12 +6702,12 @@
-+ 
-+ do
-+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+-echo "configure:6533: checking for $ac_func" >&5
-++echo "configure:6706: checking for $ac_func" >&5
-+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+   cat > conftest.$ac_ext <<EOF
-+-#line 6538 "configure"
-++#line 6711 "configure"
-+ #include "confdefs.h"
-+ /* System header to define __stub macros and hopefully few prototypes,
-+     which can conflict with char $ac_func(); below.  */
-+@@ -6557,7 +6730,7 @@
-+ 
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:6561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:6734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   eval "ac_cv_func_$ac_func=yes"
-+ else
-+@@ -6582,8 +6755,14 @@
-+ done
-+ 
-+ 
-++echo $ac_n "checking for ncurses extended functions""... $ac_c" 1>&6
-++echo "configure:6760: checking for ncurses extended functions" >&5
-++if eval "test \"`echo '$''{'cf_cv_ncurses_ext_funcs'+set}'`\" = set"; then
-++  echo $ac_n "(cached) $ac_c" 1>&6
-++else
-++  
-+ cat > conftest.$ac_ext <<EOF
-+-#line 6587 "configure"
-++#line 6766 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <${cf_cv_ncurses_header-curses.h}>
-+@@ -6601,30 +6780,81 @@
-+ 	(void) use_default_colors ();
-+ 	(void) use_extended_names (0);
-+ 	(void) wresize (0, 0, 0);
-+-	
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:6608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:6786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+-  cat >> confdefs.h <<\EOF
-++  cf_cv_ncurses_ext_funcs=yes
-++else
-++  echo "configure: failed program was:" >&5
-++  cat conftest.$ac_ext >&5
-++  rm -rf conftest*
-++  cf_cv_ncurses_ext_funcs=no
-++fi
-++rm -f conftest*
-++
-++fi
-++
-++echo "$ac_t""$cf_cv_ncurses_ext_funcs" 1>&6
-++test "$cf_cv_ncurses_ext_funcs" != no && cat >> confdefs.h <<\EOF
-+ #define NCURSES_EXT_FUNCS 1
-+ EOF
-+ 
-++
-++echo $ac_n "checking for wide-character functions""... $ac_c" 1>&6
-++echo "configure:6806: checking for wide-character functions" >&5
-++if eval "test \"`echo '$''{'cf_cv_widechar_funcs'+set}'`\" = set"; then
-++  echo $ac_n "(cached) $ac_c" 1>&6
-++else
-++  
-++cat > conftest.$ac_ext <<EOF
-++#line 6812 "configure"
-++#include "confdefs.h"
-++
-++#include <${cf_cv_ncurses_header-curses.h}>
-++int main() {
-++
-++	static wchar_t src_wchar[2];
-++	static cchar_t dst_cchar;
-++	setcchar(&dst_cchar, src_wchar, A_NORMAL, 0, (void *) 0);
-++	
-++; return 0; }
-++EOF
-++if { (eval echo configure:6824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++  rm -rf conftest*
-++  cf_cv_widechar_funcs=yes
-+ else
-+   echo "configure: failed program was:" >&5
-+   cat conftest.$ac_ext >&5
-++  rm -rf conftest*
-++  cf_cv_widechar_funcs=no
-+ fi
-+ rm -f conftest*
-+ 
-++fi
-++
-++echo "$ac_t""$cf_cv_widechar_funcs" 1>&6
-++if test "$cf_cv_widechar_funcs" != no ; then
-++	cat >> confdefs.h <<\EOF
-++#define USE_WIDEC_SUPPORT 1
-++EOF
-++
-++else
-++	cat >> confdefs.h <<\EOF
-++#define USE_WIDEC_SUPPORT 0
-++EOF
-++
-++fi
-++
-+ 
-+ echo $ac_n "checking if sys/time.h works with sys/select.h""... $ac_c" 1>&6
-+-echo "configure:6622: checking if sys/time.h works with sys/select.h" >&5
-++echo "configure:6852: checking if sys/time.h works with sys/select.h" >&5
-+ if eval "test \"`echo '$''{'cf_cv_sys_time_select'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+   
-+ cat > conftest.$ac_ext <<EOF
-+-#line 6628 "configure"
-++#line 6858 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <sys/types.h>
-+@@ -6639,7 +6869,7 @@
-+ 
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:6643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++if { (eval echo configure:6873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+   rm -rf conftest*
-+   cf_cv_sys_time_select=yes
-+ else
-+@@ -6660,7 +6890,7 @@
-+ 
-+ 
-+ echo $ac_n "checking for function curses_version""... $ac_c" 1>&6
-+-echo "configure:6664: checking for function curses_version" >&5
-++echo "configure:6894: checking for function curses_version" >&5
-+ if eval "test \"`echo '$''{'cf_cv_func_curses_version'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+@@ -6669,7 +6899,7 @@
-+   cf_cv_func_curses_version=unknown
-+ else
-+   cat > conftest.$ac_ext <<EOF
-+-#line 6673 "configure"
-++#line 6903 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <${cf_cv_ncurses_header-curses.h}>
-+@@ -6677,11 +6907,11 @@
-+ {
-+ 	char temp[1024];
-+ 	sprintf(temp, "%s\n", curses_version());
-+-	exit(0);
-++	${cf_cv_main_return-return}(0);
-+ }
-+ 
-+ EOF
-+-if { (eval echo configure:6685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-++if { (eval echo configure:6915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+ then
-+   cf_cv_func_curses_version=yes
-+ 
-+@@ -6706,7 +6936,7 @@
-+ 
-+ 
-+ echo $ac_n "checking for alternate character set array""... $ac_c" 1>&6
-+-echo "configure:6710: checking for alternate character set array" >&5
-++echo "configure:6940: checking for alternate character set array" >&5
-+ if eval "test \"`echo '$''{'cf_cv_curses_acs_map'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+@@ -6715,7 +6945,7 @@
-+ for name in acs_map _acs_map __acs_map _nc_acs_map
-+ do
-+ cat > conftest.$ac_ext <<EOF
-+-#line 6719 "configure"
-++#line 6949 "configure"
-+ #include "confdefs.h"
-+ 
-+ #include <${cf_cv_ncurses_header-curses.h}>
-+@@ -6726,7 +6956,7 @@
-+ 
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:6730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:6960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   cf_cv_curses_acs_map=$name; break
-+ else
-+@@ -6747,7 +6977,7 @@
-+ 
-+ 
-+ echo $ac_n "checking for wide alternate character set array""... $ac_c" 1>&6
-+-echo "configure:6751: checking for wide alternate character set array" >&5
-++echo "configure:6981: checking for wide alternate character set array" >&5
-+ if eval "test \"`echo '$''{'cf_cv_curses_wacs_map'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+@@ -6756,7 +6986,7 @@
-+ 	for name in wacs_map _wacs_map __wacs_map _nc_wacs
-+ 	do
-+ 	cat > conftest.$ac_ext <<EOF
-+-#line 6760 "configure"
-++#line 6990 "configure"
-+ #include "confdefs.h"
-+ 
-+ #ifndef _XOPEN_SOURCE_EXTENDED
-+@@ -6767,7 +6997,7 @@
-+ $name['k'] = *WACS_PLUS
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:6771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-++if { (eval echo configure:7001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+   rm -rf conftest*
-+   cf_cv_curses_wacs_map=$name
-+ 	 break
-+@@ -6783,9 +7013,9 @@
-+ 
-+ 
-+ echo $ac_n "checking for type attr_t in ${cf_cv_ncurses_header-curses.h}""... $ac_c" 1>&6
-+-echo "configure:6787: checking for type attr_t in ${cf_cv_ncurses_header-curses.h}" >&5
-++echo "configure:7017: checking for type attr_t in ${cf_cv_ncurses_header-curses.h}" >&5
-+ cat > conftest.$ac_ext <<EOF
-+-#line 6789 "configure"
-++#line 7019 "configure"
-+ #include "confdefs.h"
-+ 
-+ #ifndef _XOPEN_SOURCE_EXTENDED
-+@@ -6798,7 +7028,7 @@
-+ 
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:6802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++if { (eval echo configure:7032: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+   rm -rf conftest*
-+   cf_result=yes
-+ else
-+@@ -6826,9 +7056,9 @@
-+ 
-+ 
-+ echo $ac_n "checking for type mbstate_t in ${cf_cv_ncurses_header-curses.h}""... $ac_c" 1>&6
-+-echo "configure:6830: checking for type mbstate_t in ${cf_cv_ncurses_header-curses.h}" >&5
-++echo "configure:7060: checking for type mbstate_t in ${cf_cv_ncurses_header-curses.h}" >&5
-+ cat > conftest.$ac_ext <<EOF
-+-#line 6832 "configure"
-++#line 7062 "configure"
-+ #include "confdefs.h"
-+ 
-+ #ifndef _XOPEN_SOURCE_EXTENDED
-+@@ -6841,7 +7071,7 @@
-+ 
-+ ; return 0; }
-+ EOF
-+-if { (eval echo configure:6845: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-++if { (eval echo configure:7075: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+   rm -rf conftest*
-+   cf_result=yes
-+ else
-+@@ -7018,9 +7248,9 @@
-+ s%@DFT_DEP_SUFFIX@%$DFT_DEP_SUFFIX%g
-+ s%@DFT_OBJ_SUBDIR@%$DFT_OBJ_SUBDIR%g
-+ s%@DFT_UPR_MODEL@%$DFT_UPR_MODEL%g
-+-s%@ECHO_LINK@%$ECHO_LINK%g
-+ s%@LD@%$LD%g
-+ s%@LDFLAGS_SHARED@%$LDFLAGS_SHARED%g
-++s%@LDFLAGS_STATIC@%$LDFLAGS_STATIC%g
-+ s%@LD_MODEL@%$LD_MODEL%g
-+ s%@LD_SHARED_OPTS@%$LD_SHARED_OPTS%g
-+ s%@LIBTOOL@%$LIBTOOL%g
-+@@ -7040,6 +7270,11 @@
-+ s%@EXEEXT@%$EXEEXT%g
-+ s%@OBJEXT@%$OBJEXT%g
-+ s%@EXTRA_CPPFLAGS@%$EXTRA_CPPFLAGS%g
-++s%@ECHO_LT@%$ECHO_LT%g
-++s%@ECHO_LD@%$ECHO_LD%g
-++s%@RULE_CC@%$RULE_CC%g
-++s%@SHOW_CC@%$SHOW_CC%g
-++s%@ECHO_CC@%$ECHO_CC%g
-+ s%@EXTRA_CFLAGS@%$EXTRA_CFLAGS%g
-+ s%@X_CFLAGS@%$X_CFLAGS%g
-+ s%@X_PRE_LIBS@%$X_PRE_LIBS%g
-+@@ -7247,6 +7482,7 @@
-+ # Extra initialization commands, if any
-+ 
-+ AWK="$AWK"
-++ECHO_LD="$ECHO_LD"
-+ 
-+ EOF
-+ cat >> $CONFIG_STATUS <<\EOF
-+@@ -7258,7 +7494,7 @@
-+ 	if test ! -d $srcdir/$cf_dir; then
-+ 		continue
-+ 	elif test -f $srcdir/$cf_dir/programs; then
-+-		$AWK -f $srcdir/mk-test.awk ECHO_LINK="$ECHO_LINK" $srcdir/$cf_dir/programs >>$cf_dir/Makefile
-++		$AWK -f $srcdir/mk-test.awk ECHO_LINK="$ECHO_LD" $srcdir/$cf_dir/programs >>$cf_dir/Makefile
-+ 	fi
-+ done
-+ 
-+Index: test/configure.in
-+Prereq:  1.58 
-+--- ncurses-5.6/test/configure.in	2006-07-15 18:54:07.000000000 +0000
-++++ ncurses-5.6-20071201/test/configure.in	2007-06-09 20:02:57.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ dnl***************************************************************************
-+-dnl Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
-++dnl Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+ dnl                                                                          *
-+ dnl Permission is hereby granted, free of charge, to any person obtaining a  *
-+ dnl copy of this software and associated documentation files (the            *
-+@@ -28,7 +28,7 @@
-+ dnl
-+ dnl Author: Thomas E. Dickey 1996, etc.
-+ dnl
-+-dnl $Id: configure.in,v 1.58 2006/07/15 18:54:07 tom Exp $
-++dnl $Id: configure.in,v 1.63 2007/06/09 20:02:57 tom Exp $
-+ dnl This is a simple configuration-script for the ncurses test programs that
-+ dnl allows the test-directory to be separately configured against a reference
-+ dnl system (i.e., sysvr4 curses)
-+@@ -58,15 +58,15 @@
-+ DFT_DEP_SUFFIX=""			AC_SUBST(DFT_DEP_SUFFIX)
-+ DFT_OBJ_SUBDIR=`pwd|sed -e's:.*/::'`	AC_SUBST(DFT_OBJ_SUBDIR)
-+ DFT_UPR_MODEL="NORMAL"			AC_SUBST(DFT_UPR_MODEL)
-+-ECHO_LINK='@ echo linking $@ ... ;'	AC_SUBST(ECHO_LINK)
-+ LD="ld"					AC_SUBST(LD)
-+ LDFLAGS_SHARED=""			AC_SUBST(LDFLAGS_SHARED)
-++LDFLAGS_STATIC=""			AC_SUBST(LDFLAGS_STATIC)
-+ LD_MODEL=""				AC_SUBST(LD_MODEL)
-+ LD_SHARED_OPTS=""			AC_SUBST(LD_SHARED_OPTS)
-+ LIBTOOL=""				AC_SUBST(LIBTOOL)
-+ LIB_CLEAN=""				AC_SUBST(LIB_CLEAN)
-+ LIB_COMPILE=""				AC_SUBST(LIB_COMPILE)
-+-LIB_LINK=""				AC_SUBST(LIB_LINK)
-++LIB_LINK='${CC}'			AC_SUBST(LIB_LINK)
-+ LINK_TESTS=""				AC_SUBST(LINK_TESTS)
-+ LINT=lint				AC_SUBST(LINT)
-+ LINT_OPTS=""				AC_SUBST(LINT_OPTS)
-+@@ -85,9 +85,13 @@
-+ AC_OBJEXT
-+ 
-+ CF_ANSI_CC_REQD
-+-CF_ENABLE_WARNINGS
-+ CF_GCC_ATTRIBUTES
-+ CF_XOPEN_SOURCE
-++AC_C_CONST
-++CF_SIG_ATOMIC_T
-++
-++CF_DISABLE_ECHO
-++CF_ENABLE_WARNINGS
-+ 
-+ CF_WITH_CURSES_DIR
-+ 
-+@@ -206,6 +210,7 @@
-+ wresize \
-+ )
-+ 
-++AC_CACHE_CHECK(for ncurses extended functions,cf_cv_ncurses_ext_funcs,[
-+ AC_TRY_LINK([
-+ #include <${cf_cv_ncurses_header-curses.h}>],
-+ [
-+@@ -220,8 +225,28 @@
-+ 	(void) resizeterm (0, 0);
-+ 	(void) use_default_colors ();
-+ 	(void) use_extended_names (0);
-+-	(void) wresize (0, 0, 0);
-+-	],[AC_DEFINE(NCURSES_EXT_FUNCS)])
-++	(void) wresize (0, 0, 0);],
-++	[cf_cv_ncurses_ext_funcs=yes],
-++	[cf_cv_ncurses_ext_funcs=no])
-++])
-++test "$cf_cv_ncurses_ext_funcs" != no && AC_DEFINE(NCURSES_EXT_FUNCS)
-++
-++AC_CACHE_CHECK(for wide-character functions,cf_cv_widechar_funcs,[
-++AC_TRY_LINK([
-++#include <${cf_cv_ncurses_header-curses.h}>],
-++[
-++	static wchar_t src_wchar[2];
-++	static cchar_t dst_cchar;
-++	setcchar(&dst_cchar, src_wchar, A_NORMAL, 0, (void *) 0);
-++	],
-++	[cf_cv_widechar_funcs=yes],
-++	[cf_cv_widechar_funcs=no])
-++])
-++if test "$cf_cv_widechar_funcs" != no ; then
-++	AC_DEFINE(USE_WIDEC_SUPPORT,1)
-++else
-++	AC_DEFINE(USE_WIDEC_SUPPORT,0)
-++fi
-+ 
-+ CF_SYS_TIME_SELECT
-+ CF_FUNC_CURSES_VERSION
-+@@ -236,7 +261,7 @@
-+ dnl ---------------------------------------------------------------------------
-+ 
-+ AC_OUTPUT(Makefile,[
-+-CF_PRG_RULES([$srcdir/mk-test.awk ECHO_LINK="$ECHO_LINK"], .)
-++CF_PRG_RULES([$srcdir/mk-test.awk ECHO_LINK="$ECHO_LD"], .)
-+ 	cat >>Makefile <<TEST_EOF
-+ 
-+ # These rules are generated so we do not rely on suffix rules, which do not
-+@@ -256,4 +281,5 @@
-+ done
-+ ],[
-+ AWK="$AWK"
-++ECHO_LD="$ECHO_LD"
-+ ],cat)
-+Index: test/demo_defkey.c
-+Prereq:  1.16 
-+--- ncurses-5.6/test/demo_defkey.c	2006-04-01 19:08:03.000000000 +0000
-++++ ncurses-5.6-20071201/test/demo_defkey.c	2007-04-07 17:13:03.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 2002-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 2002-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -26,7 +26,7 @@
-+  * authorization.                                                           *
-+  ****************************************************************************/
-+ /*
-+- * $Id: demo_defkey.c,v 1.16 2006/04/01 19:08:03 tom Exp $
-++ * $Id: demo_defkey.c,v 1.17 2007/04/07 17:13:03 tom Exp $
-+  *
-+  * Demonstrate the define_key() function.
-+  * Thomas Dickey - 2002/11/23
-+@@ -143,13 +143,12 @@
-+ 		code_name);
-+     }
-+     log_last_line(win);
-++
-+     if (vis_string != 0) {
-+ 	free(vis_string);
-+ 	vis_string = 0;
-+     }
-+ 
-+-    if (vis_string != 0)
-+-	free(vis_string);
-+     vis_string = visible(new_string);
-+     if ((rc = key_defined(new_string)) > 0) {
-+ 	wprintw(win, "%s was bound to %s\n", vis_string, keyname(rc));
-+Index: test/demo_forms.c
-+Prereq:  1.22 
-+--- ncurses-5.6/test/demo_forms.c	2006-12-10 00:30:24.000000000 +0000
-++++ ncurses-5.6-20071201/test/demo_forms.c	2007-07-21 17:45:09.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 2003-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 2003-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -26,7 +26,7 @@
-+  * authorization.                                                           *
-+  ****************************************************************************/
-+ /*
-+- * $Id: demo_forms.c,v 1.22 2006/12/10 00:30:24 tom Exp $
-++ * $Id: demo_forms.c,v 1.24 2007/07/21 17:45:09 tom Exp $
-+  *
-+  * Demonstrate a variety of functions from the form library.
-+  * Thomas Dickey - 2003/4/26
-+@@ -322,6 +322,10 @@
-+     int pg;
-+     WINDOW *also;
-+ 
-++#ifdef NCURSES_MOUSE_VERSION
-++    mousemask(ALL_MOUSE_EVENTS, (mmask_t *) 0);
-++#endif
-++
-+     help_edit_field();
-+ 
-+     mvaddstr(4, 57, "Forms Entry Test");
-+@@ -423,6 +427,10 @@
-+ 	free_field(f[c]);
-+     noraw();
-+     nl();
-++
-++#ifdef NCURSES_MOUSE_VERSION
-++    mousemask(0, (mmask_t *) 0);
-++#endif
-+ }
-+ 
-+ static void
-+@@ -451,7 +459,7 @@
-+ 
-+     setlocale(LC_ALL, "");
-+ 
-+-    while ((ch = getopt(argc, argv, "dj:m:o:t:")) != EOF) {
-++    while ((ch = getopt(argc, argv, "dj:m:o:t:")) != -1) {
-+ 	switch (ch) {
-+ 	case 'd':
-+ 	    d_option = TRUE;
-+Index: test/demo_menus.c
-+Prereq:  1.20 
-+--- ncurses-5.6/test/demo_menus.c	2006-06-17 17:39:37.000000000 +0000
-++++ ncurses-5.6-20071201/test/demo_menus.c	2007-07-21 17:45:09.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 2005,2006 Free Software Foundation, Inc.                   *
-++ * Copyright (c) 2005-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -26,7 +26,7 @@
-+  * authorization.                                                           *
-+  ****************************************************************************/
-+ /*
-+- * $Id: demo_menus.c,v 1.20 2006/06/17 17:39:37 tom Exp $
-++ * $Id: demo_menus.c,v 1.21 2007/07/21 17:45:09 tom Exp $
-+  *
-+  * Demonstrate a variety of functions from the menu library.
-+  * Thomas Dickey - 2005/4/9
-+@@ -834,7 +834,7 @@
-+ 
-+     setlocale(LC_ALL, "");
-+ 
-+-    while ((c = getopt(argc, argv, "a:de:fhmp:s:t:")) != EOF) {
-++    while ((c = getopt(argc, argv, "a:de:fhmp:s:t:")) != -1) {
-+ 	switch (c) {
-+ #if HAVE_RIPOFFLINE
-+ 	case 'f':
-+Index: test/demo_panels.c
-+Prereq:  1.2 
-+--- ncurses-5.6/test/demo_panels.c	2006-04-01 19:08:03.000000000 +0000
-++++ ncurses-5.6-20071201/test/demo_panels.c	2007-08-11 16:34:49.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 2003,2006 Free Software Foundation, Inc.                   *
-++ * Copyright (c) 2007 Free Software Foundation, Inc.                        *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -26,17 +26,10 @@
-+  * authorization.                                                           *
-+  ****************************************************************************/
-+ /*
-+- * $Id: demo_panels.c,v 1.2 2006/04/01 19:08:03 tom Exp $
-++ * $Id: demo_panels.c,v 1.28 2007/08/11 16:34:49 tom Exp $
-+  *
-+  * Demonstrate a variety of functions from the panel library.
-+- * Thomas Dickey - 2003/4/26
-+  */
-+-/*
-+-panel_above			-
-+-panel_below			-
-+-panel_hidden			-
-+-replace_panel			-
-+-*/
-+ 
-+ #include <test.priv.h>
-+ 
-+@@ -44,11 +37,771 @@
-+ 
-+ #include <panel.h>
-+ 
-++#define LAST_POS '@'
-++#define TEMP_POS '>'
-++
-++typedef void (*InitPanel) (void);
-++typedef void (*FillPanel) (PANEL *);
-++
-++static bool use_colors = FALSE;
-++static bool unboxed = FALSE;
-++static FILE *log_in;
-++static FILE *log_out;
-++
-++static void
-++close_input(void)
-++{
-++    if (log_in != 0) {
-++	fclose(log_in);
-++	log_in = 0;
-++    }
-++}
-++
-++static void
-++close_output(void)
-++{
-++    if (log_out != 0) {
-++	fclose(log_out);
-++	log_out = 0;
-++    }
-++}
-++
-++static WINDOW *
-++statusline(void)
-++{
-++    WINDOW *result = stdscr;
-++
-++    wmove(result, LINES - 1, 0);
-++    wclrtoeol(result);
-++    return result;
-++}
-++
-++static void
-++pflush(void)
-++{
-++    update_panels();
-++    doupdate();
-++}
-++
-++static void
-++saywhat(NCURSES_CONST char *text)
-++{
-++    WINDOW *win = statusline();
-++    if (text != 0 && *text != '\0') {
-++	waddstr(win, text);
-++	waddstr(win, "; ");
-++    }
-++    waddstr(win, "press any key to continue");
-++}
-++
-++static void
-++show_position(NCURSES_CONST char *text,
-++	      NCURSES_CONST char *also,
-++	      int which,
-++	      int ypos,
-++	      int xpos)
-++{
-++    WINDOW *win = statusline();
-++
-++    wprintw(win, "%s for panel %d now %d,%d%s", text, which, ypos, xpos, also);
-++    wmove(stdscr, ypos, xpos);
-++}
-++
-++static int
-++get_position(NCURSES_CONST char *text,
-++	     NCURSES_CONST char *also,
-++	     int which,
-++	     int *xpos,
-++	     int *ypos)
-++{
-++    int result = 0;
-++    int x1, y1;
-++    char cmd;
-++    WINDOW *win;
-++
-++    getyx(stdscr, y1, x1);
-++    win = statusline();
-++
-++    show_position(text, also, which, y1, x1);
-++
-++    if (log_in != 0) {
-++	if (fscanf(log_in, "%c%d,%d\n", &cmd, &y1, &x1) == 3) {
-++	    switch (cmd) {
-++	    case LAST_POS:
-++		result = 1;
-++		(void) wgetch(stdscr);
-++		break;
-++	    case TEMP_POS:
-++		result = 0;
-++		wrefresh(stdscr);
-++		napms(100);
-++		break;
-++	    default:
-++		result = -1;
-++		break;
-++	    }
-++	} else {
-++	    result = -1;
-++	}
-++    } else {
-++
-++	switch (wgetch(stdscr)) {
-++	case QUIT:
-++	case ESCAPE:
-++	case ERR:
-++	    result = -1;
-++	    break;
-++	case ' ':
-++	    result = 1;
-++	    break;
-++	case KEY_UP:
-++	    if (y1 > 0) {
-++		--y1;
-++	    } else {
-++		beep();
-++	    }
-++	    break;
-++	case KEY_DOWN:
-++	    if (y1 < getmaxy(stdscr)) {
-++		++y1;
-++	    } else {
-++		beep();
-++	    }
-++	    break;
-++	case KEY_LEFT:
-++	    if (x1 > 0) {
-++		--x1;
-++	    } else {
-++		beep();
-++	    }
-++	    break;
-++	case KEY_RIGHT:
-++	    if (x1 < getmaxx(stdscr)) {
-++		++x1;
-++	    } else {
-++		beep();
-++	    }
-++	    break;
-++	}
-++    }
-++
-++    wmove(stdscr, y1, x1);
-++    *ypos = y1;
-++    *xpos = x1;
-++
-++    if (result >= 0) {
-++	if (log_out)
-++	    fprintf(log_out, "%c%d,%d\n",
-++		    ((result > 0)
-++		     ? LAST_POS
-++		     : TEMP_POS),
-++		    y1, x1);
-++    }
-++    return result;
-++}
-++
-++static PANEL *
-++mkpanel(short color, int rows, int cols, int tly, int tlx)
-++{
-++    WINDOW *win;
-++    PANEL *pan = 0;
-++    char *userdata = malloc(3);
-++
-++    if ((win = newwin(rows, cols, tly, tlx)) != 0) {
-++	keypad(win, TRUE);
-++	if ((pan = new_panel(win)) == 0) {
-++	    delwin(win);
-++	} else if (use_colors) {
-++	    short fg = ((color == COLOR_BLUE)
-++			? COLOR_WHITE
-++			: COLOR_BLACK);
-++	    short bg = color;
-++
-++	    init_pair(color, fg, bg);
-++	    wbkgdset(win, (chtype) (COLOR_PAIR(color) | ' '));
-++	} else if (!unboxed) {
-++	    wbkgdset(win, A_BOLD | ' ');
-++	}
-++    }
-++    sprintf(userdata, "p%d", color % 8);
-++    set_panel_userptr(pan, (NCURSES_CONST void *) userdata);
-++    return pan;
-++}
-++
-++static void
-++my_remove_panel(PANEL ** pans, int which)
-++{
-++    if (pans[which] != 0) {
-++	PANEL *pan = pans[which];
-++	WINDOW *win = panel_window(pan);
-++	char *user = (char *) panel_userptr(pan);
-++
-++	free(user);
-++	del_panel(pan);
-++	delwin(win);
-++
-++	pans[which] = 0;
-++    }
-++}
-++
-++#define MIN(a,b) ((a) < (b) ? (a) : (b))
-++#define ABS(a)   ((a) < 0 ? -(a) : (a))
-++
-++static void
-++my_create_panel(PANEL ** pans, int which, FillPanel myFill)
-++{
-++    PANEL *pan = 0;
-++    int code;
-++    int pair = which;
-++    short fg = (pair == COLOR_BLUE) ? COLOR_WHITE : COLOR_BLACK;
-++    short bg = pair;
-++    int x0, y0, x1, y1;
-++
-++    init_pair(pair, fg, bg);
-++
-++    /* remove the old panel, if any */
-++    my_remove_panel(pans, which);
-++
-++    /* get the position of one corner */
-++    wmove(stdscr, getmaxy(stdscr) / 2, getmaxx(stdscr) / 2);
-++    getyx(stdscr, y0, x0);
-++    while ((code = get_position("First corner", "", which, &x0, &y0)) == 0) {
-++	;
-++    }
-++
-++    if (code > 0) {
-++	char also[80];
-++	sprintf(also, " (first %d,%d)", y0, x0);
-++	/* get the position of the opposite corner */
-++	while ((code = get_position("Opposite corner",
-++				    also, which, &x1, &y1)) == 0) {
-++	    ;
-++	}
-++
-++	if (code > 0) {
-++	    int tly = MIN(y0, y1);
-++	    int tlx = MIN(x0, x1);
-++	    pan = mkpanel(pair, ABS(y1 - y0) + 1, ABS(x1 - x0) + 1, tly, tlx);
-++	    /* finish */
-++	    myFill(pan);
-++	    pans[which] = pan;
-++	    pflush();
-++	    wmove(stdscr, y1, x1);
-++	}
-++    }
-++}
-++
-++static void
-++my_move_panel(PANEL ** pans, int which, bool continuous)
-++{
-++    if (pans[which] != 0) {
-++	int code;
-++	int y0, x0;
-++	int y1, x1;
-++	WINDOW *win = panel_window(pans[which]);
-++	char also[80];
-++
-++	getbegyx(win, y0, x0);
-++	sprintf(also, " (start %d,%d)", y0, x0);
-++	wmove(stdscr, y0, x0);
-++	while ((code = get_position("Move panel", also, which, &x1, &y1)) == 0) {
-++	    if (continuous) {
-++		move_panel(pans[which], y1, x1);
-++		pflush();
-++	    }
-++	}
-++	if (code > 0) {
-++	    move_panel(pans[which], y1, x1);
-++	}
-++    }
-++}
-++
-++static void
-++my_resize_panel(PANEL ** pans, int which, FillPanel myFill)
-++{
-++    if (pans[which] != 0) {
-++	int code;
-++	int y0, x0;
-++	int y1, x1;
-++	WINDOW *win = panel_window(pans[which]);
-++	char also[80];
-++
-++	getbegyx(win, y0, x0);
-++	sprintf(also, " (start %d,%d)", y0, x0);
-++	wmove(stdscr, y0, x0);
-++	while ((code = get_position("Resize panel",
-++				    also, which, &x1, &y1)) == 0) {
-++	    ;
-++	}
-++	if (code > 0) {
-++	    WINDOW *next = newwin(ABS(y1 - y0) + 1,
-++				  ABS(x1 - x0) + 1,
-++				  MIN(y0, y1),
-++				  MIN(x0, x1));
-++	    if (next != 0) {
-++		keypad(next, TRUE);
-++		if (use_colors) {
-++		    wbkgdset(next, (chtype) (COLOR_PAIR(which) | ' '));
-++		} else if (!unboxed) {
-++		    wbkgdset(next, A_BOLD | ' ');
-++		}
-++		replace_panel(pans[which], next);
-++		myFill(pans[which]);
-++		delwin(win);
-++	    }
-++	}
-++    }
-++}
-++
-++static void
-++init_panel(void)
-++{
-++    register int y, x;
-++
-++    for (y = 0; y < LINES - 1; y++) {
-++	for (x = 0; x < COLS; x++)
-++	    wprintw(stdscr, "%d", (y + x) % 10);
-++    }
-++}
-++
-++static void
-++fill_panel(PANEL * pan)
-++{
-++    WINDOW *win = panel_window(pan);
-++    int num = ((const char *) panel_userptr(pan))[1];
-++    int y, x;
-++
-++    wmove(win, 1, 1);
-++    wprintw(win, "-pan%c-", num);
-++    wclrtoeol(win);
-++    box(win, 0, 0);
-++    for (y = 2; y < getmaxy(win) - 1; y++) {
-++	for (x = 1; x < getmaxx(win) - 1; x++) {
-++	    wmove(win, y, x);
-++	    waddch(win, UChar(num));
-++	}
-++    }
-++}
-++
-++static void
-++fill_unboxed(PANEL * pan)
-++{
-++    WINDOW *win = panel_window(pan);
-++    int num = ((const char *) panel_userptr(pan))[1];
-++    int y, x;
-++
-++    for (y = 0; y < getmaxy(win); y++) {
-++	for (x = 0; x < getmaxx(win); x++) {
-++	    wmove(win, y, x);
-++	    waddch(win, UChar(num));
-++	}
-++    }
-++}
-++
-++#if USE_WIDEC_SUPPORT
-++static void
-++make_fullwidth_digit(cchar_t *target, int digit)
-++{
-++    wchar_t source[2];
-++
-++    source[0] = digit + 0xff10;
-++    source[1] = 0;
-++    setcchar(target, source, A_NORMAL, 0, 0);
-++}
-++
-++static void
-++init_wide_panel(void)
-++{
-++    int digit;
-++    cchar_t temp[10];
-++
-++    for (digit = 0; digit < 10; ++digit)
-++	make_fullwidth_digit(&temp[digit], digit);
-++
-++    do {
-++	int y, x;
-++	getyx(stdscr, y, x);
-++	digit = (y + x / 2) % 10;
-++    } while (add_wch(&temp[digit]) != ERR);
-++}
-++
-++static void
-++fill_wide_panel(PANEL * pan)
-++{
-++    WINDOW *win = panel_window(pan);
-++    int num = ((const char *) panel_userptr(pan))[1];
-++    int y, x;
-++
-++    wmove(win, 1, 1);
-++    wprintw(win, "-pan%c-", num);
-++    wclrtoeol(win);
-++    box(win, 0, 0);
-++    for (y = 2; y < getmaxy(win) - 1; y++) {
-++	for (x = 1; x < getmaxx(win) - 1; x++) {
-++	    wmove(win, y, x);
-++	    waddch(win, UChar(num));
-++	}
-++    }
-++}
-++#endif
-++
-++#define MAX_PANELS 5
-++
-++static int
-++which_panel(PANEL * px[MAX_PANELS + 1], PANEL * pan)
-++{
-++    int result = 0;
-++    int j;
-++
-++    for (j = 1; j <= MAX_PANELS; ++j) {
-++	if (px[j] == pan) {
-++	    result = j;
-++	    break;
-++	}
-++    }
-++    return result;
-++}
-++
-++static void
-++show_panels(PANEL * px[MAX_PANELS + 1])
-++{
-++    static const char *help[] =
-++    {
-++	"",
-++	"Commands are letter/digit pairs.  Digits are the panel number.",
-++	"",
-++	"  b - put the panel on the bottom of the stack",
-++	"  c - create the panel",
-++	"  d - delete the panel",
-++	"  h - hide the panel",
-++	"  m - move the panel (M for continuous move)",
-++	"  r - resize the panel",
-++	"  s - show the panel",
-++	"  b - put the panel on the top of the stack"
-++    };
-++
-++    struct {
-++	bool valid;
-++	bool hidden;
-++	PANEL *above;
-++	PANEL *below;
-++    } table[MAX_PANELS + 1];
-++
-++    WINDOW *win;
-++    PANEL *pan;
-++    int j;
-++
-++    for (j = 1; j <= MAX_PANELS; ++j) {
-++	table[j].valid = (px[j] != 0);
-++	if (table[j].valid) {
-++	    table[j].hidden = panel_hidden(px[j]);
-++	    table[j].above = panel_above(px[j]);
-++	    table[j].below = panel_below(px[j]);
-++	}
-++    }
-++
-++    if ((win = newwin(LINES - 1, COLS, 0, 0)) != 0) {
-++	keypad(win, TRUE);
-++	if ((pan = new_panel(win)) != 0) {
-++	    werase(win);
-++	    mvwprintw(win, 0, 0, "Panels:\n");
-++	    for (j = 1; j <= MAX_PANELS; ++j) {
-++		if (table[j].valid) {
-++		    wprintw(win, " %d:", j);
-++		    if (table[j].hidden) {
-++			waddstr(win, " hidden");
-++		    } else {
-++			if (table[j].above) {
-++			    wprintw(win, " above %d",
-++				    which_panel(px, table[j].above));
-++			}
-++			if (table[j].below) {
-++			    wprintw(win, "%s below %d",
-++				    table[j].above ? "," : "",
-++				    which_panel(px, table[j].below));
-++			}
-++		    }
-++		    waddch(win, '\n');
-++		}
-++	    }
-++	    for (j = 0; j < (int) SIZEOF(help); ++j) {
-++		if (wprintw(win, "%s\n", help[j]) == ERR)
-++		    break;
-++	    }
-++	    wgetch(win);
-++	    del_panel(pan);
-++	    pflush();
-++	}
-++	delwin(win);
-++    }
-++}
-++
-++#define wrapper(func) \
-++static int my_##func(PANEL *pan) \
-++{ \
-++    int code = ERR; \
-++    if (pan != 0) { \
-++	code = func(pan); \
-++    } \
-++    return code; \
-++}
-++/* *INDENT-OFF* */
-++wrapper(bottom_panel)
-++wrapper(hide_panel)
-++wrapper(show_panel)
-++wrapper(top_panel)
-++/* *INDENT-ON* */
-++
-++static void
-++do_panel(PANEL * px[MAX_PANELS + 1],
-++	 NCURSES_CONST char *cmd,
-++	 FillPanel myFill)
-++{
-++    int which = cmd[1] - '0';
-++
-++    if (which < 1 || which > MAX_PANELS) {
-++	beep();
-++	return;
-++    }
-++
-++    if (log_in != 0) {
-++	pflush();
-++    }
-++
-++    saywhat(cmd);
-++    switch (*cmd) {
-++    case 'b':
-++	my_bottom_panel(px[which]);
-++	break;
-++    case 'c':
-++	my_create_panel(px, which, myFill);
-++	break;
-++    case 'd':
-++	my_remove_panel(px, which);
-++	break;
-++    case 'h':
-++	my_hide_panel(px[which]);
-++	break;
-++    case 'm':
-++	my_move_panel(px, which, FALSE);
-++	break;
-++    case 'M':
-++	my_move_panel(px, which, TRUE);
-++	break;
-++    case 'r':
-++	my_resize_panel(px, which, myFill);
-++	break;
-++    case 's':
-++	my_show_panel(px[which]);
-++	break;
-++    case 't':
-++	my_top_panel(px[which]);
-++	break;
-++    }
-++}
-++
-++static bool
-++ok_letter(int ch)
-++{
-++    return isalpha(UChar(ch)) && strchr("bcdhmMrst", ch) != 0;
-++}
-++
-++static bool
-++ok_digit(int ch)
-++{
-++    return isdigit(UChar(ch)) && (ch >= '1') && (ch - '0' <= MAX_PANELS);
-++}
-++
-++/*
-++ * A command consists of one or more letter/digit pairs separated by a space.
-++ * Digits are limited to 1..MAX_PANELS.
-++ *
-++ * End the command with a newline.  Reject other characters.
-++ */
-++static bool
-++get_command(PANEL * px[MAX_PANELS + 1], char *buffer, int limit)
-++{
-++    int length = 0;
-++    int y0, x0;
-++    int c0, ch;
-++    WINDOW *win;
-++
-++    getyx(stdscr, y0, x0);
-++    win = statusline();
-++    waddstr(win, "Command:");
-++    buffer[length = 0] = '\0';
-++
-++    if (log_in != 0) {
-++	if (fgets(buffer, limit - 3, log_in) != 0) {
-++	    length = strlen(buffer);
-++	    while (length > 0 && isspace(buffer[length - 1]))
-++		buffer[--length] = '\0';
-++	    waddstr(win, buffer);
-++	} else {
-++	    close_input();
-++	}
-++	(void) wgetch(win);
-++    } else {
-++	c0 = 0;
-++	for (;;) {
-++	    ch = wgetch(win);
-++	    if (ch == ERR || ch == QUIT || ch == ESCAPE) {
-++		buffer[0] = '\0';
-++		break;
-++	    } else if (ch == CTRL('L')) {
-++		wrefresh(curscr);
-++	    } else if (ch == '\n' || ch == KEY_ENTER) {
-++		break;
-++	    } else if (ch == '?') {
-++		show_panels(px);
-++	    } else if (length + 3 < limit) {
-++		if (ch >= KEY_MIN) {
-++		    beep();
-++		} else if (ok_letter(UChar(ch))) {
-++		    if (isalpha(UChar(c0))) {
-++			beep();
-++		    } else if (isdigit(UChar(c0))) {
-++			wprintw(win, " %c", ch);
-++			buffer[length++] = ' ';
-++			buffer[length++] = c0 = ch;
-++		    } else {
-++			wprintw(win, "%c", ch);
-++			buffer[length++] = c0 = ch;
-++		    }
-++		} else if (ok_digit(ch)) {
-++		    if (isalpha(UChar(c0))) {
-++			wprintw(win, "%c", ch);
-++			buffer[length++] = c0 = ch;
-++		    } else {
-++			beep();
-++		    }
-++		} else if (ch == ' ') {
-++		    if (isdigit(UChar(c0))) {
-++			wprintw(win, "%c", ch);
-++			buffer[length++] = c0 = ch;
-++		    } else {
-++			beep();
-++		    }
-++		} else {
-++		    beep();
-++		}
-++	    } else {
-++		beep();
-++	    }
-++	}
-++    }
-++
-++    wmove(stdscr, y0, x0);
-++
-++    buffer[length] = '\0';
-++    if (log_out && length) {
-++	fprintf(log_out, "%s\n", buffer);
-++    }
-++    return (length != 0);
-++}
-++
-++static void
-++demo_panels(InitPanel myInit, FillPanel myFill)
-++{
-++    int itmp;
-++    PANEL *px[MAX_PANELS + 1];
-++    char buffer[BUFSIZ];
-++
-++    scrollok(stdscr, FALSE);	/* we don't want stdscr to scroll! */
-++    refresh();
-++
-++    myInit();
-++    memset(px, 0, sizeof(px));
-++
-++    while (get_command(px, buffer, sizeof(buffer))) {
-++	int limit = strlen(buffer);
-++	for (itmp = 0; itmp < limit; itmp += 3) {
-++	    do_panel(px, buffer + itmp, myFill);
-++	}
-++	pflush();
-++    }
-++#if NO_LEAKS
-++    for (itmp = 1; itmp <= MAX_PANELS; ++itmp) {
-++	my_remove_panel(px, itmp);
-++    }
-++#endif
-++}
-++
-++static void
-++usage(void)
-++{
-++    static const char *const tbl[] =
-++    {
-++	"Usage: demo_panels [options]"
-++	,""
-++	,"Options:"
-++	,"  -i file  read commands from file"
-++	,"  -o file  record commands in file"
-++	,"  -m       do not use colors"
-++#if USE_WIDEC_SUPPORT
-++	,"  -w       use wide-characters in panels and background"
-++#endif
-++	,"  -x       do not enclose panels in boxes"
-++    };
-++    size_t n;
-++    for (n = 0; n < SIZEOF(tbl); n++)
-++	fprintf(stderr, "%s\n", tbl[n]);
-++    ExitProgram(EXIT_FAILURE);
-++}
-++
-+ int
-+-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
-++main(int argc, char *argv[])
-+ {
-+-    printf("Not implemented - demo for panel library\n");
-+-    return EXIT_SUCCESS;
-++    int c;
-++    bool monochrome = FALSE;
-++    InitPanel myInit = init_panel;
-++    FillPanel myFill = fill_panel;
-++
-++    setlocale(LC_ALL, "");
-++
-++    while ((c = getopt(argc, argv, "i:o:mwx")) != -1) {
-++	switch (c) {
-++	case 'i':
-++	    log_in = fopen(optarg, "r");
-++	    break;
-++	case 'o':
-++	    log_out = fopen(optarg, "w");
-++	    break;
-++	case 'm':
-++	    monochrome = TRUE;
-++	    break;
-++#if USE_WIDEC_SUPPORT
-++	case 'w':
-++	    myInit = init_wide_panel;
-++	    myFill = fill_wide_panel;
-++	    break;
-++#endif
-++	case 'x':
-++	    unboxed = TRUE;
-++	    break;
-++	default:
-++	    usage();
-++	}
-++    }
-++    if (unboxed)
-++	myFill = fill_unboxed;
-++
-++    initscr();
-++    cbreak();
-++    noecho();
-++    keypad(stdscr, TRUE);
-++
-++    use_colors = monochrome ? FALSE : has_colors();
-++    if (use_colors)
-++	start_color();
-++
-++    demo_panels(myInit, myFill);
-++    endwin();
-++
-++    close_input();
-++    close_output();
-++
-++    ExitProgram(EXIT_SUCCESS);
-+ }
-+ #else
-+ int
-+Index: test/demo_termcap.c
-+Prereq:  1.5 
-+--- ncurses-5.6/test/demo_termcap.c	2006-05-06 19:06:36.000000000 +0000
-++++ ncurses-5.6-20071201/test/demo_termcap.c	2007-02-03 18:51:23.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 2005,2006 Free Software Foundation, Inc.                   *
-++ * Copyright (c) 2005-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -29,10 +29,11 @@
-+ /*
-+  * Author: Thomas E. Dickey
-+  *
-+- * $Id: demo_termcap.c,v 1.5 2006/05/06 19:06:36 tom Exp $
-++ * $Id: demo_termcap.c,v 1.6 2007/02/03 18:51:23 tom Exp $
-+  *
-+  * A simple demo of the termcap interface.
-+  */
-++#define USE_TINFO
-+ #include <test.priv.h>
-+ 
-+ #if HAVE_TGETENT
-+Index: test/ditto.c
-+Prereq:  1.5 
-+--- ncurses-5.6/test/ditto.c	2005-04-16 16:35:49.000000000 +0000
-++++ ncurses-5.6-20071201/test/ditto.c	2007-09-01 21:10:38.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2001,2005 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2005,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -29,7 +29,7 @@
-+ /*
-+  * Author: Thomas E. Dickey <dickey@clark.net> 1998
-+  *
-+- * $Id: ditto.c,v 1.5 2005/04/16 16:35:49 tom Exp $
-++ * $Id: ditto.c,v 1.8 2007/09/01 21:10:38 tom Exp $
-+  *
-+  * The program illustrates how to set up multiple screens from a single
-+  * program.  Invoke the program by specifying another terminal on the same
-+@@ -72,19 +72,32 @@
-+ 	errno = ENOTTY;
-+ 	failed(path);
-+     }
-+-    fp = fopen(path, "a+");
-++    fp = fopen(path, "r+");
-+     if (fp == 0)
-+ 	failed(path);
-+     printf("opened %s\n", path);
-+     return fp;
-+ }
-+ 
-++static void
-++show_ditto(DITTO * data, int count, int which, int ch)
-++{
-++    int n;
-++
-++    for (n = 0; n < count; n++) {
-++	set_term(data[n].screen);
-++	addch(UChar(ch));
-++	refresh();
-++    }
-++    set_term(data[which].screen);
-++}
-++
-+ int
-+ main(int argc GCC_UNUSED,
-+      char *argv[]GCC_UNUSED)
-+ {
-+     int j;
-+-    int active_tty = 0;
-++    int count;
-+     DITTO *data;
-+ 
-+     if (argc <= 1)
-+@@ -105,7 +118,6 @@
-+      * Set up the screens.
-+      */
-+     for (j = 0; j < argc; j++) {
-+-	active_tty++;
-+ 	data[j].screen = newterm((char *) 0,	/* assume $TERM is the same */
-+ 				 data[j].output,
-+ 				 data[j].input);
-+@@ -114,25 +126,27 @@
-+ 	cbreak();
-+ 	noecho();
-+ 	scrollok(stdscr, TRUE);
-++	nodelay(stdscr, TRUE);
-+     }
-+ 
-+     /*
-+      * Loop, reading characters from any of the inputs and writing to all
-+      * of the screens.
-+      */
-+-    for (;;) {
-++    for (count = 0;; ++count) {
-+ 	int ch;
-+-	set_term(data[0].screen);
-++	int which = (count % argc);
-++
-++	set_term(data[which].screen);
-++	napms(20);
-+ 	ch = getch();
-+-	if (ch == ERR)
-++	if (ch == ERR) {
-++	    /* echochar('.'); */
-+ 	    continue;
-+-	if (ch == 4)
-+-	    break;
-+-	for (j = 0; j < argc; j++) {
-+-	    set_term(data[j].screen);
-+-	    addch(UChar(ch));
-+-	    refresh();
-+ 	}
-++	if (ch == CTRL('D'))
-++	    break;
-++	show_ditto(data, argc, which, ch);
-+     }
-+ 
-+     /*
-+Index: test/dots.c
-+Prereq:  1.15 
-+--- ncurses-5.6/test/dots.c	2006-11-04 19:54:42.000000000 +0000
-++++ ncurses-5.6-20071201/test/dots.c	2007-02-03 18:51:23.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1999-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1999-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -29,10 +29,11 @@
-+ /*
-+  * Author: Thomas E. Dickey <dickey@clark.net> 1999
-+  *
-+- * $Id: dots.c,v 1.15 2006/11/04 19:54:42 tom Exp $
-++ * $Id: dots.c,v 1.16 2007/02/03 18:51:23 tom Exp $
-+  *
-+  * A simple demo of the terminfo interface.
-+  */
-++#define USE_TINFO
-+ #include <test.priv.h>
-+ 
-+ #if HAVE_SETUPTERM
-+Index: test/dots_mvcur.c
-+--- /dev/null	2007-12-08 19:14:25.328509000 +0000
-++++ ncurses-5.6-20071201/test/dots_mvcur.c	2007-06-02 20:01:32.000000000 +0000
-+@@ -0,0 +1,171 @@
-++/****************************************************************************
-++ * Copyright (c) 1999-2006,2007 Free Software Foundation, Inc.              *
-++ *                                                                          *
-++ * Permission is hereby granted, free of charge, to any person obtaining a  *
-++ * copy of this software and associated documentation files (the            *
-++ * "Software"), to deal in the Software without restriction, including      *
-++ * without limitation the rights to use, copy, modify, merge, publish,      *
-++ * distribute, distribute with modifications, sublicense, and/or sell       *
-++ * copies of the Software, and to permit persons to whom the Software is    *
-++ * furnished to do so, subject to the following conditions:                 *
-++ *                                                                          *
-++ * The above copyright notice and this permission notice shall be included  *
-++ * in all copies or substantial portions of the Software.                   *
-++ *                                                                          *
-++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-++ *                                                                          *
-++ * Except as contained in this notice, the name(s) of the above copyright   *
-++ * holders shall not be used in advertising or otherwise to promote the     *
-++ * sale, use or other dealings in this Software without prior written       *
-++ * authorization.                                                           *
-++ ****************************************************************************/
-++
-++/*
-++ * Author: Thomas E. Dickey - 2007
-++ *
-++ * $Id: dots_mvcur.c,v 1.1 2007/06/02 20:01:32 tom Exp $
-++ *
-++ * A simple demo of the terminfo interface, and mvcur.
-++ */
-++#define USE_TINFO
-++#include <test.priv.h>
-++
-++#if HAVE_SETUPTERM
-++
-++#include <time.h>
-++
-++#define valid(s) ((s != 0) && s != (char *)-1)
-++
-++static bool interrupted = FALSE;
-++static long total_chars = 0;
-++static time_t started;
-++
-++static int
-++outc(int c)
-++{
-++    if (interrupted) {
-++	char tmp = c;
-++	write(STDOUT_FILENO, &tmp, 1);
-++    } else {
-++	putc(c, stdout);
-++    }
-++    return 0;
-++}
-++
-++static bool
-++outs(char *s)
-++{
-++    if (valid(s)) {
-++	tputs(s, 1, outc);
-++	return TRUE;
-++    }
-++    return FALSE;
-++}
-++
-++static void
-++cleanup(void)
-++{
-++    outs(exit_attribute_mode);
-++    if (!outs(orig_colors))
-++	outs(orig_pair);
-++    outs(clear_screen);
-++    outs(cursor_normal);
-++
-++    printf("\n\n%ld total chars, rate %.2f/sec\n",
-++	   total_chars,
-++	   ((double) (total_chars) / (time((time_t *) 0) - started)));
-++}
-++
-++static void
-++onsig(int n GCC_UNUSED)
-++{
-++    interrupted = TRUE;
-++}
-++
-++static float
-++ranf(void)
-++{
-++    long r = (rand() & 077777);
-++    return ((float) r / 32768.);
-++}
-++
-++int
-++main(
-++	int argc GCC_UNUSED,
-++	char *argv[]GCC_UNUSED)
-++{
-++    int x0 = 1, y0 = 1;
-++    int x, y, z, p;
-++    float r;
-++    float c;
-++    SCREEN *sp;
-++
-++    CATCHALL(onsig);
-++
-++    srand((unsigned) time(0));
-++    sp = newterm((char *) 0, stdout, stdin);
-++    outs(clear_screen);
-++    outs(cursor_home);
-++    outs(cursor_invisible);
-++    if (max_colors > 1) {
-++	if (!valid(set_a_foreground)
-++	    || !valid(set_a_background)
-++	    || (!valid(orig_colors) && !valid(orig_pair)))
-++	    max_colors = -1;
-++    }
-++
-++    r = (float) (lines - 4);
-++    c = (float) (columns - 4);
-++    started = time((time_t *) 0);
-++
-++    while (!interrupted) {
-++	x = (int) (c * ranf()) + 2;
-++	y = (int) (r * ranf()) + 2;
-++	p = (ranf() > 0.9) ? '*' : ' ';
-++
-++	if (mvcur(y0, x0, y, x) != ERR) {
-++	    x0 = x;
-++	    y0 = y;
-++	}
-++
-++	if (max_colors > 0) {
-++	    z = (int) (ranf() * max_colors);
-++	    if (ranf() > 0.01) {
-++		tputs(tparm2(set_a_foreground, z), 1, outc);
-++	    } else {
-++		tputs(tparm2(set_a_background, z), 1, outc);
-++		napms(1);
-++	    }
-++	} else if (valid(exit_attribute_mode)
-++		   && valid(enter_reverse_mode)) {
-++	    if (ranf() <= 0.01) {
-++		outs((ranf() > 0.6)
-++		     ? enter_reverse_mode
-++		     : exit_attribute_mode);
-++		napms(1);
-++	    }
-++	}
-++	outc(p);
-++	fflush(stdout);
-++	++total_chars;
-++    }
-++    cleanup();
-++    endwin();
-++    delscreen(sp);
-++    ExitProgram(EXIT_SUCCESS);
-++}
-++#else
-++int
-++main(int argc GCC_UNUSED,
-++     char *argv[]GCC_UNUSED)
-++{
-++    fprintf(stderr, "This program requires terminfo\n");
-++    exit(EXIT_FAILURE);
-++}
-++#endif
-+Index: test/echochar.c
-+Prereq:  1.3 
-+--- ncurses-5.6/test/echochar.c	2006-12-03 00:14:29.000000000 +0000
-++++ ncurses-5.6-20071201/test/echochar.c	2007-07-21 17:41:55.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 2006 Free Software Foundation, Inc.                        *
-++ * Copyright (c) 2006,2007 Free Software Foundation, Inc.                   *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -26,7 +26,7 @@
-+  * authorization.                                                           *
-+  ****************************************************************************/
-+ /*
-+- * $Id: echochar.c,v 1.3 2006/12/03 00:14:29 tom Exp $
-++ * $Id: echochar.c,v 1.5 2007/07/21 17:41:55 tom Exp $
-+  *
-+  * Demonstrate the echochar function (compare to dots.c).
-+  * Thomas Dickey - 2006/11/4
-+@@ -89,7 +89,7 @@
-+     int last_fg = 0;
-+     int last_bg = 0;
-+ 
-+-    while ((ch = getopt(argc, argv, "r")) != EOF) {
-++    while ((ch = getopt(argc, argv, "r")) != -1) {
-+ 	switch (ch) {
-+ 	case 'r':
-+ 	    opt_r = TRUE;
-+@@ -107,7 +107,7 @@
-+     if (use_colors) {
-+ 	start_color();
-+ 	if (COLOR_PAIRS > 0) {
-+-	    my_pairs = calloc(COLOR_PAIRS, sizeof(*my_pairs));
-++	    my_pairs = calloc((unsigned) COLOR_PAIRS, sizeof(*my_pairs));
-+ 	}
-+ 	use_colors = (my_pairs != 0);
-+     }
-+@@ -146,10 +146,10 @@
-+ 	    }
-+ 	}
-+ 	if (opt_r) {
-+-	    addch(p);
-++	    addch(UChar(p));
-+ 	    refresh();
-+ 	} else {
-+-	    echochar(p);
-++	    echochar(UChar(p));
-+ 	}
-+ 	++total_chars;
-+     }
-+Index: test/gdc.c
-+Prereq:  1.28 
-+--- ncurses-5.6/test/gdc.c	2006-05-20 15:37:44.000000000 +0000
-++++ ncurses-5.6-20071201/test/gdc.c	2007-07-21 17:45:09.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -33,7 +33,7 @@
-+  * modified 10-18-89 for curses (jrl)
-+  * 10-18-89 added signal handling
-+  *
-+- * $Id: gdc.c,v 1.28 2006/05/20 15:37:44 tom Exp $
-++ * $Id: gdc.c,v 1.29 2007/07/21 17:45:09 tom Exp $
-+  */
-+ 
-+ #include <test.priv.h>
-+@@ -171,7 +171,7 @@
-+ 
-+     CATCHALL(sighndl);
-+ 
-+-    while ((k = getopt(argc, argv, "sn")) != EOF) {
-++    while ((k = getopt(argc, argv, "sn")) != -1) {
-+ 	switch (k) {
-+ 	case 's':
-+ 	    scrol = TRUE;
-+Index: test/hashtest.c
-+Prereq:  1.26 
-+--- ncurses-5.6/test/hashtest.c	2006-05-20 16:02:16.000000000 +0000
-++++ ncurses-5.6-20071201/test/hashtest.c	2007-07-21 17:45:09.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -30,7 +30,7 @@
-+  *
-+  * Generate timing statistics for vertical-motion optimization.
-+  *
-+- * $Id: hashtest.c,v 1.26 2006/05/20 16:02:16 tom Exp $
-++ * $Id: hashtest.c,v 1.27 2007/07/21 17:45:09 tom Exp $
-+  */
-+ 
-+ #ifdef TRACE
-+@@ -190,7 +190,7 @@
-+ 
-+     setlocale(LC_ALL, "");
-+ 
-+-    while ((c = getopt(argc, argv, "cf:h:l:norsx")) != EOF) {
-++    while ((c = getopt(argc, argv, "cf:h:l:norsx")) != -1) {
-+ 	switch (c) {
-+ 	case 'c':
-+ 	    continuous = TRUE;
-+Index: test/inch_wide.c
-+--- /dev/null	2007-12-08 19:14:25.328509000 +0000
-++++ ncurses-5.6-20071201/test/inch_wide.c	2007-07-21 18:37:38.000000000 +0000
-+@@ -0,0 +1,279 @@
-++/****************************************************************************
-++ * Copyright (c) 2007 Free Software Foundation, Inc.                        *
-++ *                                                                          *
-++ * Permission is hereby granted, free of charge, to any person obtaining a  *
-++ * copy of this software and associated documentation files (the            *
-++ * "Software"), to deal in the Software without restriction, including      *
-++ * without limitation the rights to use, copy, modify, merge, publish,      *
-++ * distribute, distribute with modifications, sublicense, and/or sell       *
-++ * copies of the Software, and to permit persons to whom the Software is    *
-++ * furnished to do so, subject to the following conditions:                 *
-++ *                                                                          *
-++ * The above copyright notice and this permission notice shall be included  *
-++ * in all copies or substantial portions of the Software.                   *
-++ *                                                                          *
-++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-++ *                                                                          *
-++ * Except as contained in this notice, the name(s) of the above copyright   *
-++ * holders shall not be used in advertising or otherwise to promote the     *
-++ * sale, use or other dealings in this Software without prior written       *
-++ * authorization.                                                           *
-++ ****************************************************************************/
-++/*
-++ * $Id: inch_wide.c,v 1.6 2007/07/21 18:37:38 tom Exp $
-++ */
-++/*
-++       int in_wch(cchar_t *wcval);
-++       int mvin_wch(int y, int x, cchar_t *wcval);
-++       int mvwin_wch(WINDOW *win, int y, int x, cchar_t *wcval);
-++       int win_wch(WINDOW *win, cchar_t *wcval);
-++       int in_wchstr(cchar_t *wchstr);
-++       int in_wchnstr(cchar_t *wchstr, int n);
-++       int win_wchstr(WINDOW *win, cchar_t *wchstr);
-++       int win_wchnstr(WINDOW *win, cchar_t *wchstr, int n);
-++       int mvin_wchstr(int y, int x, cchar_t *wchstr);
-++       int mvin_wchnstr(int y, int x, cchar_t *wchstr, int n);
-++       int mvwin_wchstr(WINDOW *win, int y, int x, cchar_t *wchstr);
-++       int mvwin_wchnstr(WINDOW *win, int y, int x, cchar_t *wchstr, int n);
-++*/
-++
-++#include <test.priv.h>
-++
-++#if USE_WIDEC_SUPPORT
-++
-++#define BASE_Y 7
-++#define MAX_COLS 1024
-++
-++static bool
-++Quit(int ch)
-++{
-++    return (ch == ERR || ch == 'q' || ch == QUIT || ch == ESCAPE);
-++}
-++
-++static int
-++test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
-++{
-++    WINDOW *txtbox = 0;
-++    WINDOW *txtwin = 0;
-++    FILE *fp;
-++    int j;
-++    int txt_x = 0, txt_y = 0;
-++    int base_y;
-++    int limit;
-++    cchar_t ch;
-++    cchar_t text[MAX_COLS];
-++
-++    if (argv[level] == 0) {
-++	beep();
-++	return FALSE;
-++    }
-++
-++    if (level > 1) {
-++	txtbox = newwin(LINES - BASE_Y, COLS - level, BASE_Y, level);
-++	box(txtbox, 0, 0);
-++	wnoutrefresh(txtbox);
-++
-++	txtwin = derwin(txtbox,
-++			getmaxy(txtbox) - 2,
-++			getmaxx(txtbox) - 2,
-++			1, 1);
-++	base_y = 0;
-++    } else {
-++	txtwin = stdscr;
-++	base_y = BASE_Y;
-++    }
-++
-++    keypad(txtwin, TRUE);	/* enable keyboard mapping */
-++    (void) cbreak();		/* take input chars one at a time, no wait for \n */
-++    (void) noecho();		/* don't echo input */
-++
-++    txt_y = base_y;
-++    txt_x = 0;
-++    wmove(txtwin, txt_y, txt_x);
-++
-++    if ((fp = fopen(argv[level], "r")) != 0) {
-++	while ((j = fgetc(fp)) != EOF) {
-++	    if (waddch(txtwin, UChar(j)) != OK) {
-++		break;
-++	    }
-++	}
-++	fclose(fp);
-++    } else {
-++	wprintw(txtwin, "Cannot open:\n%s", argv[1]);
-++    }
-++
-++    while (!Quit(j = mvwgetch(txtwin, txt_y, txt_x))) {
-++	switch (j) {
-++	case KEY_DOWN:
-++	case 'j':
-++	    if (txt_y < getmaxy(txtwin) - 1)
-++		txt_y++;
-++	    else
-++		beep();
-++	    break;
-++	case KEY_UP:
-++	case 'k':
-++	    if (txt_y > base_y)
-++		txt_y--;
-++	    else
-++		beep();
-++	    break;
-++	case KEY_LEFT:
-++	case 'h':
-++	    if (txt_x > 0)
-++		txt_x--;
-++	    else
-++		beep();
-++	    break;
-++	case KEY_RIGHT:
-++	case 'l':
-++	    if (txt_x < getmaxx(txtwin) - 1)
-++		txt_x++;
-++	    else
-++		beep();
-++	    break;
-++	case 'w':
-++	    test_inchs(level + 1, argv, chrwin, strwin);
-++	    if (txtbox != 0) {
-++		touchwin(txtbox);
-++		wnoutrefresh(txtbox);
-++	    } else {
-++		touchwin(txtwin);
-++		wnoutrefresh(txtwin);
-++	    }
-++	    break;
-++	default:
-++	    beep();
-++	    break;
-++	}
-++
-++	mvwprintw(chrwin, 0, 0, "char:");
-++	wclrtoeol(chrwin);
-++
-++	if (txtwin != stdscr) {
-++	    wmove(txtwin, txt_y, txt_x);
-++	    if (win_wch(txtwin, &ch) != ERR) {
-++		if (wadd_wch(chrwin, &ch) != ERR) {
-++		    for (j = txt_x + 1; j < getmaxx(txtwin); ++j) {
-++			if (mvwin_wch(txtwin, txt_y, j, &ch) != ERR) {
-++			    if (wadd_wch(chrwin, &ch) == ERR) {
-++				break;
-++			    }
-++			} else {
-++			    break;
-++			}
-++		    }
-++		}
-++	    }
-++	} else {
-++	    move(txt_y, txt_x);
-++	    if (in_wch(&ch) != ERR) {
-++		if (wadd_wch(chrwin, &ch) != ERR) {
-++		    for (j = txt_x + 1; j < getmaxx(txtwin); ++j) {
-++			if (mvin_wch(txt_y, j, &ch) != ERR) {
-++			    if (wadd_wch(chrwin, &ch) == ERR) {
-++				break;
-++			    }
-++			} else {
-++			    break;
-++			}
-++		    }
-++		}
-++	    }
-++	}
-++	wnoutrefresh(chrwin);
-++
-++	mvwprintw(strwin, 0, 0, "text:");
-++	wclrtobot(strwin);
-++
-++	limit = getmaxx(strwin) - 5;
-++
-++	if (txtwin != stdscr) {
-++	    wmove(txtwin, txt_y, txt_x);
-++	    if (win_wchstr(txtwin, text) != ERR) {
-++		mvwadd_wchstr(strwin, 0, 5, text);
-++	    }
-++
-++	    wmove(txtwin, txt_y, txt_x);
-++	    if (win_wchnstr(txtwin, text, limit) != ERR) {
-++		mvwadd_wchstr(strwin, 1, 5, text);
-++	    }
-++
-++	    if (mvwin_wchstr(txtwin, txt_y, txt_x, text) != ERR) {
-++		mvwadd_wchstr(strwin, 2, 5, text);
-++	    }
-++
-++	    if (mvwin_wchnstr(txtwin, txt_y, txt_x, text, limit) != ERR) {
-++		mvwadd_wchstr(strwin, 3, 5, text);
-++	    }
-++	} else {
-++	    move(txt_y, txt_x);
-++	    if (in_wchstr(text) != ERR) {
-++		mvwadd_wchstr(strwin, 0, 5, text);
-++	    }
-++
-++	    move(txt_y, txt_x);
-++	    if (in_wchnstr(text, limit) != ERR) {
-++		mvwadd_wchstr(strwin, 1, 5, text);
-++	    }
-++
-++	    if (mvin_wchstr(txt_y, txt_x, text) != ERR) {
-++		mvwadd_wchstr(strwin, 2, 5, text);
-++	    }
-++
-++	    if (mvin_wchnstr(txt_y, txt_x, text, limit) != ERR) {
-++		mvwadd_wchstr(strwin, 3, 5, text);
-++	    }
-++	}
-++
-++	wnoutrefresh(strwin);
-++    }
-++    if (level > 1) {
-++	delwin(txtwin);
-++	delwin(txtbox);
-++    }
-++    return TRUE;
-++}
-++
-++int
-++main(int argc, char *argv[])
-++{
-++    WINDOW *chrbox;
-++    WINDOW *chrwin;
-++    WINDOW *strwin;
-++
-++    setlocale(LC_ALL, "");
-++
-++    if (argc < 2) {
-++	fprintf(stderr, "usage: %s file\n", argv[0]);
-++	return EXIT_FAILURE;
-++    }
-++
-++    initscr();
-++
-++    chrbox = derwin(stdscr, BASE_Y, COLS, 0, 0);
-++    box(chrbox, 0, 0);
-++    wnoutrefresh(chrbox);
-++
-++    chrwin = derwin(chrbox, 1, COLS - 2, 1, 1);
-++    strwin = derwin(chrbox, 4, COLS - 2, 2, 1);
-++
-++    test_inchs(1, argv, chrwin, strwin);
-++
-++    endwin();
-++    ExitProgram(EXIT_SUCCESS);
-++}
-++#else
-++int
-++main(void)
-++{
-++    printf("This program requires the wide-ncurses library\n");
-++    ExitProgram(EXIT_FAILURE);
-++}
-++#endif
-+Index: test/inchs.c
-+--- /dev/null	2007-12-08 19:14:25.328509000 +0000
-++++ ncurses-5.6-20071201/test/inchs.c	2007-07-21 19:01:43.000000000 +0000
-+@@ -0,0 +1,272 @@
-++/****************************************************************************
-++ * Copyright (c) 2007 Free Software Foundation, Inc.                        *
-++ *                                                                          *
-++ * Permission is hereby granted, free of charge, to any person obtaining a  *
-++ * copy of this software and associated documentation files (the            *
-++ * "Software"), to deal in the Software without restriction, including      *
-++ * without limitation the rights to use, copy, modify, merge, publish,      *
-++ * distribute, distribute with modifications, sublicense, and/or sell       *
-++ * copies of the Software, and to permit persons to whom the Software is    *
-++ * furnished to do so, subject to the following conditions:                 *
-++ *                                                                          *
-++ * The above copyright notice and this permission notice shall be included  *
-++ * in all copies or substantial portions of the Software.                   *
-++ *                                                                          *
-++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-++ *                                                                          *
-++ * Except as contained in this notice, the name(s) of the above copyright   *
-++ * holders shall not be used in advertising or otherwise to promote the     *
-++ * sale, use or other dealings in this Software without prior written       *
-++ * authorization.                                                           *
-++ ****************************************************************************/
-++/*
-++ * $Id: inchs.c,v 1.9 2007/07/21 19:01:43 tom Exp $
-++ *
-++ * Author: Thomas E Dickey
-++ */
-++/*
-++       chtype inch(void);
-++       chtype winch(WINDOW *win);
-++       chtype mvinch(int y, int x);
-++       chtype mvwinch(WINDOW *win, int y, int x);
-++       int inchstr(chtype *chstr);
-++       int inchnstr(chtype *chstr, int n);
-++       int winchstr(WINDOW *win, chtype *chstr);
-++       int winchnstr(WINDOW *win, chtype *chstr, int n);
-++       int mvinchstr(int y, int x, chtype *chstr);
-++       int mvinchnstr(int y, int x, chtype *chstr, int n);
-++       int mvwinchstr(WINDOW *win, int y, int x, chtype *chstr);
-++       int mvwinchnstr(WINDOW *win, int y, int x, chtype *chstr, int n);
-++*/
-++
-++#include <test.priv.h>
-++
-++#define BASE_Y 7
-++#define MAX_COLS 1024
-++
-++static bool
-++Quit(int ch)
-++{
-++    return (ch == ERR || ch == 'q' || ch == QUIT || ch == ESCAPE);
-++}
-++
-++static int
-++test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
-++{
-++    WINDOW *txtbox = 0;
-++    WINDOW *txtwin = 0;
-++    FILE *fp;
-++    int ch, j;
-++    int txt_x = 0, txt_y = 0;
-++    int base_y;
-++    int limit;
-++    chtype text[MAX_COLS];
-++
-++    if (argv[level] == 0) {
-++	beep();
-++	return FALSE;
-++    }
-++
-++    if (level > 1) {
-++	txtbox = newwin(LINES - BASE_Y, COLS - level, BASE_Y, level);
-++	box(txtbox, 0, 0);
-++	wnoutrefresh(txtbox);
-++
-++	txtwin = derwin(txtbox,
-++			getmaxy(txtbox) - 2,
-++			getmaxx(txtbox) - 2,
-++			1, 1);
-++	base_y = 0;
-++    } else {
-++	txtwin = stdscr;
-++	base_y = BASE_Y;
-++    }
-++
-++    keypad(txtwin, TRUE);	/* enable keyboard mapping */
-++    (void) cbreak();		/* take input chars one at a time, no wait for \n */
-++    (void) noecho();		/* don't echo input */
-++
-++    txt_y = base_y;
-++    txt_x = 0;
-++    wmove(txtwin, txt_y, txt_x);
-++
-++    if ((fp = fopen(argv[level], "r")) != 0) {
-++	while ((j = fgetc(fp)) != EOF) {
-++	    if (waddch(txtwin, UChar(j)) != OK) {
-++		break;
-++	    }
-++	}
-++	fclose(fp);
-++    } else {
-++	wprintw(txtwin, "Cannot open:\n%s", argv[1]);
-++    }
-++
-++    while (!Quit(j = mvwgetch(txtwin, txt_y, txt_x))) {
-++	switch (j) {
-++	case KEY_DOWN:
-++	case 'j':
-++	    if (txt_y < getmaxy(txtwin) - 1)
-++		txt_y++;
-++	    else
-++		beep();
-++	    break;
-++	case KEY_UP:
-++	case 'k':
-++	    if (txt_y > base_y)
-++		txt_y--;
-++	    else
-++		beep();
-++	    break;
-++	case KEY_LEFT:
-++	case 'h':
-++	    if (txt_x > 0)
-++		txt_x--;
-++	    else
-++		beep();
-++	    break;
-++	case KEY_RIGHT:
-++	case 'l':
-++	    if (txt_x < getmaxx(txtwin) - 1)
-++		txt_x++;
-++	    else
-++		beep();
-++	    break;
-++	case 'w':
-++	    test_inchs(level + 1, argv, chrwin, strwin);
-++	    if (txtbox != 0) {
-++		touchwin(txtbox);
-++		wnoutrefresh(txtbox);
-++	    } else {
-++		touchwin(txtwin);
-++		wnoutrefresh(txtwin);
-++	    }
-++	    break;
-++	default:
-++	    beep();
-++	    break;
-++	}
-++
-++	mvwprintw(chrwin, 0, 0, "char:");
-++	wclrtoeol(chrwin);
-++
-++	if (txtwin != stdscr) {
-++	    wmove(txtwin, txt_y, txt_x);
-++
-++	    if ((ch = winch(txtwin)) != ERR) {
-++		if (waddch(chrwin, (chtype) ch) != ERR) {
-++		    for (j = txt_x + 1; j < getmaxx(txtwin); ++j) {
-++			if ((ch = mvwinch(txtwin, txt_y, j)) != ERR) {
-++			    if (waddch(chrwin, (chtype) ch) == ERR) {
-++				break;
-++			    }
-++			} else {
-++			    break;
-++			}
-++		    }
-++		}
-++	    }
-++	} else {
-++	    move(txt_y, txt_x);
-++
-++	    if ((ch = inch()) != ERR) {
-++		if (waddch(chrwin, (chtype) ch) != ERR) {
-++		    for (j = txt_x + 1; j < getmaxx(txtwin); ++j) {
-++			if ((ch = mvinch(txt_y, j)) != ERR) {
-++			    if (waddch(chrwin, (chtype) ch) == ERR) {
-++				break;
-++			    }
-++			} else {
-++			    break;
-++			}
-++		    }
-++		}
-++	    }
-++	}
-++	wnoutrefresh(chrwin);
-++
-++	mvwprintw(strwin, 0, 0, "text:");
-++	wclrtobot(strwin);
-++
-++	limit = getmaxx(strwin) - 5;
-++
-++	if (txtwin != stdscr) {
-++	    wmove(txtwin, txt_y, txt_x);
-++	    if (winchstr(txtwin, text) != ERR) {
-++		mvwaddchstr(strwin, 0, 5, text);
-++	    }
-++
-++	    wmove(txtwin, txt_y, txt_x);
-++	    if (winchnstr(txtwin, text, limit) != ERR) {
-++		mvwaddchstr(strwin, 1, 5, text);
-++	    }
-++
-++	    if (mvwinchstr(txtwin, txt_y, txt_x, text) != ERR) {
-++		mvwaddchstr(strwin, 2, 5, text);
-++	    }
-++
-++	    if (mvwinchnstr(txtwin, txt_y, txt_x, text, limit) != ERR) {
-++		mvwaddchstr(strwin, 3, 5, text);
-++	    }
-++	} else {
-++	    move(txt_y, txt_x);
-++	    if (inchstr(text) != ERR) {
-++		mvwaddchstr(strwin, 0, 5, text);
-++	    }
-++
-++	    move(txt_y, txt_x);
-++	    if (inchnstr(text, limit) != ERR) {
-++		mvwaddchstr(strwin, 1, 5, text);
-++	    }
-++
-++	    if (mvinchstr(txt_y, txt_x, text) != ERR) {
-++		mvwaddchstr(strwin, 2, 5, text);
-++	    }
-++
-++	    if (mvinchnstr(txt_y, txt_x, text, limit) != ERR) {
-++		mvwaddchstr(strwin, 3, 5, text);
-++	    }
-++	}
-++
-++	wnoutrefresh(strwin);
-++    }
-++    if (level > 1) {
-++	delwin(txtwin);
-++	delwin(txtbox);
-++    }
-++    return TRUE;
-++}
-++
-++int
-++main(int argc, char *argv[])
-++{
-++    WINDOW *chrbox;
-++    WINDOW *chrwin;
-++    WINDOW *strwin;
-++
-++    setlocale(LC_ALL, "");
-++
-++    if (argc < 2) {
-++	fprintf(stderr, "usage: %s file\n", argv[0]);
-++	return EXIT_FAILURE;
-++    }
-++
-++    initscr();
-++
-++    chrbox = derwin(stdscr, BASE_Y, COLS, 0, 0);
-++    box(chrbox, 0, 0);
-++    wnoutrefresh(chrbox);
-++
-++    chrwin = derwin(chrbox, 1, COLS - 2, 1, 1);
-++    strwin = derwin(chrbox, 4, COLS - 2, 2, 1);
-++
-++    test_inchs(1, argv, chrwin, strwin);
-++
-++    endwin();
-++    ExitProgram(EXIT_SUCCESS);
-++}
-+Index: test/ins_wide.c
-+Prereq:  1.7 
-+--- ncurses-5.6/test/ins_wide.c	2006-04-01 19:08:03.000000000 +0000
-++++ ncurses-5.6-20071201/test/ins_wide.c	2007-07-21 17:41:55.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 2002-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 2002-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -26,7 +26,7 @@
-+  * authorization.                                                           *
-+  ****************************************************************************/
-+ /*
-+- * $Id: ins_wide.c,v 1.7 2006/04/01 19:08:03 tom Exp $
-++ * $Id: ins_wide.c,v 1.9 2007/07/21 17:41:55 tom Exp $
-+  *
-+  * Demonstrate the wins_wstr() and wins_wch functions.
-+  * Thomas Dickey - 2002/11/23
-+@@ -55,7 +55,7 @@
-+ #define WInsNStr   wins_nwstr
-+ #define WInsStr    wins_wstr
-+ 
-+-#define TABSIZE 8
-++#define MY_TABSIZE 8
-+ 
-+ typedef enum {
-+     oDefault = 0,
-+@@ -123,7 +123,7 @@
-+ 		--result;
-+ 	    break;
-+ 	case '\t':
-+-	    result += (TABSIZE - (result % TABSIZE));
-++	    result += (MY_TABSIZE - (result % MY_TABSIZE));
-+ 	    break;
-+ 	case '\177':
-+ 	    result += 2;
-+@@ -225,7 +225,7 @@
-+     WINDOW *look = 0;
-+     WINDOW *work = 0;
-+     WINDOW *show = 0;
-+-    int margin = (2 * TABSIZE) - 1;
-++    int margin = (2 * MY_TABSIZE) - 1;
-+     Options option = ((m_opt ? oMove : oDefault)
-+ 		      | ((w_opt || (level > 0)) ? oWindow : oDefault));
-+ 
-+@@ -255,7 +255,7 @@
-+     }
-+     keypad(work, TRUE);
-+ 
-+-    for (col = margin + 1; col < COLS; col += TABSIZE)
-++    for (col = margin + 1; col < COLS; col += MY_TABSIZE)
-+ 	mvwvline(work, row, col, '.', limit - 2);
-+ 
-+     mvwvline(work, row, margin, ACS_VLINE, limit - 2);
-+@@ -490,7 +490,7 @@
-+ 
-+     setlocale(LC_ALL, "");
-+ 
-+-    while ((ch = getopt(argc, argv, "mn:w")) != EOF) {
-++    while ((ch = getopt(argc, argv, "mn:w")) != -1) {
-+ 	switch (ch) {
-+ 	case 'm':
-+ 	    m_opt = TRUE;
-+Index: test/inserts.c
-+Prereq:  1.15 
-+--- ncurses-5.6/test/inserts.c	2006-10-14 20:43:46.000000000 +0000
-++++ ncurses-5.6-20071201/test/inserts.c	2007-07-21 17:41:55.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 2002-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 2002-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -26,7 +26,7 @@
-+  * authorization.                                                           *
-+  ****************************************************************************/
-+ /*
-+- * $Id: inserts.c,v 1.15 2006/10/14 20:43:46 tom Exp $
-++ * $Id: inserts.c,v 1.18 2007/07/21 17:41:55 tom Exp $
-+  *
-+  * Demonstrate the winsstr() and winsch functions.
-+  * Thomas Dickey - 2002/10/19
-+@@ -50,7 +50,7 @@
-+ #define MvWInsCh   mvwinsch
-+ #define WInsCh     winsch
-+ 
-+-#define TABSIZE 8
-++#define MY_TABSIZE 8
-+ 
-+ typedef enum {
-+     oDefault = 0,
-+@@ -116,7 +116,7 @@
-+ 		--result;
-+ 	    break;
-+ 	case '\t':
-+-	    result += (TABSIZE - (result % TABSIZE));
-++	    result += (MY_TABSIZE - (result % MY_TABSIZE));
-+ 	    break;
-+ 	case '\177':
-+ 	    result += 2;
-+@@ -147,7 +147,7 @@
-+     WINDOW *look = 0;
-+     WINDOW *work = 0;
-+     WINDOW *show = 0;
-+-    int margin = (2 * TABSIZE) - 1;
-++    int margin = (2 * MY_TABSIZE) - 1;
-+     Options option = (Options) ((unsigned) (m_opt
-+ 					    ? oMove
-+ 					    : oDefault)
-+@@ -181,7 +181,7 @@
-+     }
-+     keypad(work, TRUE);
-+ 
-+-    for (col = margin + 1; col < COLS; col += TABSIZE)
-++    for (col = margin + 1; col < COLS; col += MY_TABSIZE)
-+ 	mvwvline(work, row, col, '.', limit - 2);
-+ 
-+     mvwvline(work, row, margin, ACS_VLINE, limit - 2);
-+@@ -405,7 +405,7 @@
-+ 
-+     setlocale(LC_ALL, "");
-+ 
-+-    while ((ch = getopt(argc, argv, "mn:w")) != EOF) {
-++    while ((ch = getopt(argc, argv, "mn:w")) != -1) {
-+ 	switch (ch) {
-+ 	case 'm':
-+ 	    m_opt = TRUE;
-+Index: test/key_names.c
-+--- /dev/null	2007-12-08 19:14:25.328509000 +0000
-++++ ncurses-5.6-20071201/test/key_names.c	2007-06-09 22:32:34.000000000 +0000
-+@@ -0,0 +1,56 @@
-++/****************************************************************************
-++ * Copyright (c) 2007 Free Software Foundation, Inc.                        *
-++ *                                                                          *
-++ * Permission is hereby granted, free of charge, to any person obtaining a  *
-++ * copy of this software and associated documentation files (the            *
-++ * "Software"), to deal in the Software without restriction, including      *
-++ * without limitation the rights to use, copy, modify, merge, publish,      *
-++ * distribute, distribute with modifications, sublicense, and/or sell       *
-++ * copies of the Software, and to permit persons to whom the Software is    *
-++ * furnished to do so, subject to the following conditions:                 *
-++ *                                                                          *
-++ * The above copyright notice and this permission notice shall be included  *
-++ * in all copies or substantial portions of the Software.                   *
-++ *                                                                          *
-++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-++ *                                                                          *
-++ * Except as contained in this notice, the name(s) of the above copyright   *
-++ * holders shall not be used in advertising or otherwise to promote the     *
-++ * sale, use or other dealings in this Software without prior written       *
-++ * authorization.                                                           *
-++ ****************************************************************************/
-++/*
-++ * $Id: key_names.c,v 1.2 2007/06/09 22:32:34 tom Exp $
-++ */
-++
-++#include <test.priv.h>
-++
-++#if USE_WIDEC_SUPPORT
-++
-++int
-++main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
-++{
-++    int n;
-++
-++    setlocale(LC_ALL, "");
-++    for (n = -1; n < KEY_MAX + 512; n++) {
-++	const char *result = key_name(n);
-++	if (result != 0)
-++	    printf("%d(%5o):%s\n", n, n, result);
-++    }
-++    ExitProgram(EXIT_SUCCESS);
-++}
-++#else
-++int
-++main(void)
-++{
-++    printf("This program requires the wide-ncurses library\n");
-++    ExitProgram(EXIT_FAILURE);
-++}
-++#endif
-+Index: test/mk-test.awk
-+Prereq:  1.4 
-+--- ncurses-5.6/test/mk-test.awk	2006-10-21 22:56:50.000000000 +0000
-++++ ncurses-5.6-20071201/test/mk-test.awk	2007-01-20 21:28:47.000000000 +0000
-+@@ -1,6 +1,6 @@
-+-# $Id: mk-test.awk,v 1.4 2006/10/21 22:56:50 tom Exp $
-++# $Id: mk-test.awk,v 1.5 2007/01/20 21:28:47 tom Exp $
-+ ##############################################################################
-+-# Copyright (c) 2006 Free Software Foundation, Inc.                          #
-++# Copyright (c) 2006,2007 Free Software Foundation, Inc.                     #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -34,7 +34,13 @@
-+ 		first = 1;
-+ 		count = 0;
-+ 	}
-+-!/^#/	{
-++/^#/	{
-++		next;
-++	}
-++/^$/	{
-++		next;
-++	}
-++	{
-+ 		if (first) {
-+ 			print "# generated by mk-test.awk\n";
-+ 			first = 0;
-+Index: test/modules
-+Prereq:  1.28 
-+--- ncurses-5.6/test/modules	2006-11-04 18:56:08.000000000 +0000
-++++ ncurses-5.6-20071201/test/modules	2007-08-18 17:57:08.000000000 +0000
-+@@ -1,7 +1,6 @@
-+-# Test-Program modules
-+-# $Id: modules,v 1.28 2006/11/04 18:56:08 tom Exp $
-++# $Id: modules,v 1.36 2007/08/18 17:57:08 tom Exp $
-+ ##############################################################################
-+-# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
-++# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -28,8 +27,9 @@
-+ # authorization.                                                             #
-+ ##############################################################################
-+ #
-+-# Author: Thomas E. Dickey 1997-on
-++# Author: Thomas E. Dickey	1997-on
-+ #
-++# Test-Program modules
-+ 
-+ @ base
-+ background	progs		$(srcdir)	$(HEADER_DEPS)
-+@@ -40,13 +40,14 @@
-+ color_set	progs		$(srcdir)	$(HEADER_DEPS)
-+ demo_altkeys	progs		$(srcdir)	$(HEADER_DEPS)
-+ demo_defkey	progs		$(srcdir)	$(HEADER_DEPS)
-+-demo_keyok	progs		$(srcdir)	$(HEADER_DEPS)
-+ demo_forms	progs		$(srcdir)	$(HEADER_DEPS)	../include/form.h $(srcdir)/edit_field.h
-++demo_keyok	progs		$(srcdir)	$(HEADER_DEPS)
-+ demo_menus	progs		$(srcdir)	$(HEADER_DEPS)	../include/menu.h
-+ demo_panels	progs		$(srcdir)	$(HEADER_DEPS)	../include/panel.h
-+ demo_termcap	progs		$(srcdir)	$(HEADER_DEPS)
-+ ditto		progs		$(srcdir)	$(HEADER_DEPS)
-+ dots		progs		$(srcdir)	$(HEADER_DEPS)
-++dots_mvcur	progs		$(srcdir)	$(HEADER_DEPS)
-+ echochar	progs		$(srcdir)	$(HEADER_DEPS)
-+ edit_field	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/edit_field.h
-+ filter		progs		$(srcdir)	$(HEADER_DEPS)	../include/form.h
-+@@ -56,22 +57,33 @@
-+ gdc		progs		$(srcdir)	$(HEADER_DEPS)
-+ hanoi		progs		$(srcdir)	$(HEADER_DEPS)
-+ hashtest	progs		$(srcdir)	$(HEADER_DEPS)
-++inch_wide	progs		$(srcdir)	$(HEADER_DEPS)
-++inchs		progs		$(srcdir)	$(HEADER_DEPS)
-+ ins_wide	progs		$(srcdir)	$(HEADER_DEPS)
-+ inserts		progs		$(srcdir)	$(HEADER_DEPS)
-++key_names	progs		$(srcdir)	$(HEADER_DEPS)
-+ keynames	progs		$(srcdir)	$(HEADER_DEPS)
-+ knight		progs		$(srcdir)	$(HEADER_DEPS)
-+ lrtest		progs		$(srcdir)	$(HEADER_DEPS)
-+-ncurses		progs		$(srcdir)	$(HEADER_DEPS)	../include/panel.h ../include/menu.h ../include/form.h
-+ movewindow	progs		$(srcdir)	$(HEADER_DEPS)
-++ncurses		progs		$(srcdir)	$(HEADER_DEPS)	../include/panel.h ../include/menu.h ../include/form.h
-+ newdemo		progs		$(srcdir)	$(HEADER_DEPS)
-+ railroad	progs		$(srcdir)	$(HEADER_DEPS)
-+ rain		progs		$(srcdir)	$(HEADER_DEPS)
-+ redraw		progs		$(srcdir)	$(HEADER_DEPS)
-+ savescreen	progs		$(srcdir)	$(HEADER_DEPS)
-+ tclock		progs		$(srcdir)	$(HEADER_DEPS)
-++test_arrays	progs		$(srcdir)	$(HEADER_DEPS)
-++test_get_wstr	progs		$(srcdir)	$(HEADER_DEPS)
-++test_getstr	progs		$(srcdir)	$(HEADER_DEPS)
-++test_instr	progs		$(srcdir)	$(HEADER_DEPS)
-++test_inwstr	progs		$(srcdir)	$(HEADER_DEPS)
-++test_opaque	progs		$(srcdir)	$(HEADER_DEPS)
-+ testaddch	progs		$(srcdir)	$(HEADER_DEPS)
-+ testcurs	progs		$(srcdir)	$(HEADER_DEPS)
-+ testscanw	progs		$(srcdir)	$(HEADER_DEPS)
-+ view		progs		$(srcdir)	$(HEADER_DEPS)
-+ worm		progs		$(srcdir)	$(HEADER_DEPS)
-+ xmas		progs		$(srcdir)	$(HEADER_DEPS)
-++
-++# vile:makemode
-+Index: test/movewindow.c
-+Prereq:  1.19 
-+--- ncurses-5.6/test/movewindow.c	2006-06-17 17:43:22.000000000 +0000
-++++ ncurses-5.6-20071201/test/movewindow.c	2007-01-06 23:28:53.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 2006 Free Software Foundation, Inc.                        *
-++ * Copyright (c) 2006,2007 Free Software Foundation, Inc.                   *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -26,7 +26,7 @@
-+  * authorization.                                                           *
-+  ****************************************************************************/
-+ /*
-+- * $Id: movewindow.c,v 1.19 2006/06/17 17:43:22 tom Exp $
-++ * $Id: movewindow.c,v 1.20 2007/01/06 23:28:53 tom Exp $
-+  *
-+  * Demonstrate move functions for windows and derived windows from the curses
-+  * library.
-+@@ -63,14 +63,14 @@
-+     WINDOW *child;		/* the actual value */
-+ } FRAME;
-+ 
-+-static void head_line(char *fmt,...) GCC_PRINTFLIKE(1, 2);
-+-static void tail_line(char *fmt,...) GCC_PRINTFLIKE(1, 2);
-++static void head_line(const char *fmt,...) GCC_PRINTFLIKE(1, 2);
-++static void tail_line(const char *fmt,...) GCC_PRINTFLIKE(1, 2);
-+ 
-+ static unsigned num_windows;
-+ static FRAME *all_windows;
-+ 
-+ static void
-+-message(int lineno, char *fmt, va_list argp)
-++message(int lineno, const char *fmt, va_list argp)
-+ {
-+     int y, x;
-+ 
-+@@ -93,7 +93,7 @@
-+ }
-+ 
-+ static void
-+-head_line(char *fmt,...)
-++head_line(const char *fmt,...)
-+ {
-+     va_list argp;
-+ 
-+@@ -103,7 +103,7 @@
-+ }
-+ 
-+ static void
-+-tail_line(char *fmt,...)
-++tail_line(const char *fmt,...)
-+ {
-+     va_list argp;
-+ 
-+@@ -511,7 +511,7 @@
-+     /* *INDENT-OFF* */
-+     static struct {
-+ 	int	key;
-+-	char *	msg;
-++	const char * msg;
-+     } help[] = {
-+ 	{ '?',		"Show this screen" },
-+ 	{ 'b',		"Draw a box inside the current window" },
-+Index: test/ncurses.c
-+Prereq:  1.280 
-+--- ncurses-5.6/test/ncurses.c	2006-12-10 00:13:15.000000000 +0000
-++++ ncurses-5.6-20071201/test/ncurses.c	2007-07-21 17:41:55.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -40,7 +40,7 @@
-+    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
-+            Thomas E. Dickey (beginning revision 1.27 in 1996).
-+ 
-+-$Id: ncurses.c,v 1.280 2006/12/10 00:13:15 tom Exp $
-++$Id: ncurses.c,v 1.292 2007/07/21 17:41:55 tom Exp $
-+ 
-+ ***************************************************************************/
-+ 
-+@@ -955,11 +955,11 @@
-+ 		for (n = 0; (wchar_buf[n] = wint_buf[n]) != 0; ++n) ;
-+ 		if ((temp = wcstos(wchar_buf)) != 0) {
-+ 		    wprintw(win, "I saw %d characters:\n\t`%s'.",
-+-			    wcslen(wchar_buf), temp);
-++			    (int) wcslen(wchar_buf), temp);
-+ 		    free(temp);
-+ 		} else {
-+ 		    wprintw(win, "I saw %d characters (cannot convert).",
-+-			    wcslen(wchar_buf));
-++			    (int) wcslen(wchar_buf));
-+ 		}
-+ 	    }
-+ 	    wclrtoeol(win);
-+@@ -3124,7 +3124,7 @@
-+ /* *INDENT-OFF* */
-+ static struct {
-+     attr_t attr;
-+-    char *name;
-++    const char *name;
-+ } attrs_to_cycle[] = {
-+     { A_NORMAL,		"normal" },
-+     { A_BOLD,		"bold" },
-+@@ -3379,12 +3379,14 @@
-+     WINDOW *wind;
-+ };
-+ 
-+-#ifdef NCURSES_VERSION
-+-#define keypad_active(win) (win)->_use_keypad
-+-#define scroll_active(win) (win)->_scroll
-++#if defined(NCURSES_VERSION)
-++#if NCURSES_VERSION_PATCH < 20070331
-++#define is_keypad(win)   (win)->_use_keypad
-++#define is_scrollok(win) (win)->_scroll
-++#endif
-+ #else
-+-#define keypad_active(win) FALSE
-+-#define scroll_active(win) FALSE
-++#define is_keypad(win)   FALSE
-++#define is_scrollok(win) FALSE
-+ #endif
-+ 
-+ /* We need to know if these flags are actually set, so don't look in FRAME.
-+@@ -3395,14 +3397,16 @@
-+ HaveKeypad(FRAME * curp)
-+ {
-+     WINDOW *win = (curp ? curp->wind : stdscr);
-+-    return keypad_active(win);
-++    (void) win;
-++    return is_keypad(win);
-+ }
-+ 
-+ static bool
-+ HaveScroll(FRAME * curp)
-+ {
-+     WINDOW *win = (curp ? curp->wind : stdscr);
-+-    return scroll_active(win);
-++    (void) win;
-++    return is_scrollok(win);
-+ }
-+ 
-+ static void
-+@@ -3945,7 +3949,11 @@
-+ {
-+     wmove(stdscr, LINES - 1, 0);
-+     wclrtoeol(stdscr);
-+-    waddstr(stdscr, text);
-++    if (text != 0 && *text != '\0') {
-++	waddstr(stdscr, text);
-++	waddstr(stdscr, "; ");
-++    }
-++    waddstr(stdscr, "press any key to continue");
-+ }				/* end of saywhat */
-+ 
-+ /*+-------------------------------------------------------------------------
-+@@ -3998,6 +4006,17 @@
-+ 	fill_panel(win)
-+ --------------------------------------------------------------------------*/
-+ static void
-++init_panel(void)
-++{
-++    register int y, x;
-++
-++    for (y = 0; y < LINES - 1; y++) {
-++	for (x = 0; x < COLS; x++)
-++	    wprintw(stdscr, "%d", (y + x) % 10);
-++    }
-++}
-++
-++static void
-+ fill_panel(PANEL * pan)
-+ {
-+     WINDOW *win = panel_window(pan);
-+@@ -4014,217 +4033,214 @@
-+ 	    waddch(win, UChar(num));
-+ 	}
-+     }
-+-}				/* end of fill_panel */
-++}
-+ 
-++#if USE_WIDEC_SUPPORT
-+ static void
-+-demo_panels(void)
-++make_fullwidth_digit(cchar_t *target, int digit)
-+ {
-+-    int itmp;
-+-    register int y, x;
-++    wchar_t source[2];
-+ 
-+-    refresh();
-++    source[0] = digit + 0xff10;
-++    source[1] = 0;
-++    setcchar(target, source, A_NORMAL, 0, 0);
-++}
-+ 
-+-    for (y = 0; y < LINES - 1; y++) {
-+-	for (x = 0; x < COLS; x++)
-+-	    wprintw(stdscr, "%d", (y + x) % 10);
-+-    }
-+-    for (y = 0; y < 5; y++) {
-+-	PANEL *p1;
-+-	PANEL *p2;
-+-	PANEL *p3;
-+-	PANEL *p4;
-+-	PANEL *p5;
-+-
-+-	p1 = mkpanel(COLOR_RED,
-+-		     LINES / 2 - 2,
-+-		     COLS / 8 + 1,
-+-		     0,
-+-		     0);
-+-	set_panel_userptr(p1, (NCURSES_CONST void *) "p1");
-+-
-+-	p2 = mkpanel(COLOR_GREEN,
-+-		     LINES / 2 + 1,
-+-		     COLS / 7,
-+-		     LINES / 4,
-+-		     COLS / 10);
-+-	set_panel_userptr(p2, (NCURSES_CONST void *) "p2");
-+-
-+-	p3 = mkpanel(COLOR_YELLOW,
-+-		     LINES / 4,
-+-		     COLS / 10,
-+-		     LINES / 2,
-+-		     COLS / 9);
-+-	set_panel_userptr(p3, (NCURSES_CONST void *) "p3");
-+-
-+-	p4 = mkpanel(COLOR_BLUE,
-+-		     LINES / 2 - 2,
-+-		     COLS / 8,
-+-		     LINES / 2 - 2,
-+-		     COLS / 3);
-+-	set_panel_userptr(p4, (NCURSES_CONST void *) "p4");
-+-
-+-	p5 = mkpanel(COLOR_MAGENTA,
-+-		     LINES / 2 - 2,
-+-		     COLS / 8,
-+-		     LINES / 2,
-+-		     COLS / 2 - 2);
-+-	set_panel_userptr(p5, (NCURSES_CONST void *) "p5");
-+-
-+-	fill_panel(p1);
-+-	fill_panel(p2);
-+-	fill_panel(p3);
-+-	fill_panel(p4);
-+-	fill_panel(p5);
-+-	hide_panel(p4);
-+-	hide_panel(p5);
-+-	pflush();
-+-	saywhat("press any key to continue");
-+-	wait_a_while(nap_msec);
-++static void
-++init_wide_panel(void)
-++{
-++    int digit;
-++    cchar_t temp[10];
-+ 
-+-	saywhat("h3 s1 s2 s4 s5; press any key to continue");
-+-	move_panel(p1, 0, 0);
-+-	hide_panel(p3);
-+-	show_panel(p1);
-+-	show_panel(p2);
-+-	show_panel(p4);
-+-	show_panel(p5);
-+-	pflush();
-+-	wait_a_while(nap_msec);
-++    for (digit = 0; digit < 10; ++digit)
-++	make_fullwidth_digit(&temp[digit], digit);
-+ 
-+-	saywhat("s1; press any key to continue");
-+-	show_panel(p1);
-+-	pflush();
-+-	wait_a_while(nap_msec);
-++    do {
-++	int y, x;
-++	getyx(stdscr, y, x);
-++	digit = (y + x / 2) % 10;
-++    } while (add_wch(&temp[digit]) != ERR);
-++}
-+ 
-+-	saywhat("s2; press any key to continue");
-+-	show_panel(p2);
-+-	pflush();
-+-	wait_a_while(nap_msec);
-++static void
-++fill_wide_panel(PANEL * pan)
-++{
-++    WINDOW *win = panel_window(pan);
-++    int num = ((const char *) panel_userptr(pan))[1];
-++    int y, x;
-+ 
-+-	saywhat("m2; press any key to continue");
-+-	move_panel(p2, LINES / 3 + 1, COLS / 8);
-+-	pflush();
-+-	wait_a_while(nap_msec);
-++    wmove(win, 1, 1);
-++    wprintw(win, "-pan%c-", num);
-++    wclrtoeol(win);
-++    box(win, 0, 0);
-++    for (y = 2; y < getmaxy(win) - 1; y++) {
-++	for (x = 1; x < getmaxx(win) - 1; x++) {
-++	    wmove(win, y, x);
-++	    waddch(win, UChar(num));
-++	}
-++    }
-++}
-++#endif
-+ 
-+-	saywhat("s3;");
-+-	show_panel(p3);
-+-	pflush();
-+-	wait_a_while(nap_msec);
-++#define MAX_PANELS 5
-+ 
-+-	saywhat("m3; press any key to continue");
-+-	move_panel(p3, LINES / 4 + 1, COLS / 15);
-+-	pflush();
-+-	wait_a_while(nap_msec);
-++static void
-++canned_panel(PANEL * px[MAX_PANELS + 1], NCURSES_CONST char *cmd)
-++{
-++    int which = cmd[1] - '0';
-+ 
-+-	saywhat("b3; press any key to continue");
-+-	bottom_panel(p3);
-+-	pflush();
-+-	wait_a_while(nap_msec);
-++    saywhat(cmd);
-++    switch (*cmd) {
-++    case 'h':
-++	hide_panel(px[which]);
-++	break;
-++    case 's':
-++	show_panel(px[which]);
-++	break;
-++    case 't':
-++	top_panel(px[which]);
-++	break;
-++    case 'b':
-++	bottom_panel(px[which]);
-++	break;
-++    case 'd':
-++	rmpanel(px[which]);
-++	break;
-++    }
-++    pflush();
-++    wait_a_while(nap_msec);
-++}
-+ 
-+-	saywhat("s4; press any key to continue");
-+-	show_panel(p4);
-+-	pflush();
-+-	wait_a_while(nap_msec);
-++static void
-++demo_panels(void (*InitPanel) (void), void (*FillPanel) (PANEL *))
-++{
-++    int count;
-++    int itmp;
-++    PANEL *px[MAX_PANELS + 1];
-+ 
-+-	saywhat("s5; press any key to continue");
-+-	show_panel(p5);
-+-	pflush();
-+-	wait_a_while(nap_msec);
-++    scrollok(stdscr, FALSE);	/* we don't want stdscr to scroll! */
-++    refresh();
-+ 
-+-	saywhat("t3; press any key to continue");
-+-	top_panel(p3);
-+-	pflush();
-+-	wait_a_while(nap_msec);
-++    InitPanel();
-++    for (count = 0; count < 5; count++) {
-++	px[1] = mkpanel(COLOR_RED,
-++			LINES / 2 - 2,
-++			COLS / 8 + 1,
-++			0,
-++			0);
-++	set_panel_userptr(px[1], (NCURSES_CONST void *) "p1");
-++
-++	px[2] = mkpanel(COLOR_GREEN,
-++			LINES / 2 + 1,
-++			COLS / 7,
-++			LINES / 4,
-++			COLS / 10);
-++	set_panel_userptr(px[2], (NCURSES_CONST void *) "p2");
-++
-++	px[3] = mkpanel(COLOR_YELLOW,
-++			LINES / 4,
-++			COLS / 10,
-++			LINES / 2,
-++			COLS / 9);
-++	set_panel_userptr(px[3], (NCURSES_CONST void *) "p3");
-++
-++	px[4] = mkpanel(COLOR_BLUE,
-++			LINES / 2 - 2,
-++			COLS / 8,
-++			LINES / 2 - 2,
-++			COLS / 3);
-++	set_panel_userptr(px[4], (NCURSES_CONST void *) "p4");
-++
-++	px[5] = mkpanel(COLOR_MAGENTA,
-++			LINES / 2 - 2,
-++			COLS / 8,
-++			LINES / 2,
-++			COLS / 2 - 2);
-++	set_panel_userptr(px[5], (NCURSES_CONST void *) "p5");
-++
-++	FillPanel(px[1]);
-++	FillPanel(px[2]);
-++	FillPanel(px[3]);
-++	FillPanel(px[4]);
-++	FillPanel(px[5]);
-+ 
-+-	saywhat("t1; press any key to continue");
-+-	top_panel(p1);
-++	hide_panel(px[4]);
-++	hide_panel(px[5]);
-+ 	pflush();
-++	saywhat("");
-+ 	wait_a_while(nap_msec);
-+ 
-+-	saywhat("t2; press any key to continue");
-+-	top_panel(p2);
-++	saywhat("h3 s1 s2 s4 s5");
-++	move_panel(px[1], 0, 0);
-++	hide_panel(px[3]);
-++	show_panel(px[1]);
-++	show_panel(px[2]);
-++	show_panel(px[4]);
-++	show_panel(px[5]);
-+ 	pflush();
-+ 	wait_a_while(nap_msec);
-+ 
-+-	saywhat("t3; press any key to continue");
-+-	top_panel(p3);
-++	canned_panel(px, "s1");
-++	canned_panel(px, "s2");
-++
-++	saywhat("m2");
-++	move_panel(px[2], LINES / 3 + 1, COLS / 8);
-+ 	pflush();
-+ 	wait_a_while(nap_msec);
-+ 
-+-	saywhat("t4; press any key to continue");
-+-	top_panel(p4);
-++	canned_panel(px, "s3");
-++
-++	saywhat("m3");
-++	move_panel(px[3], LINES / 4 + 1, COLS / 15);
-+ 	pflush();
-+ 	wait_a_while(nap_msec);
-+ 
-++	canned_panel(px, "b3");
-++	canned_panel(px, "s4");
-++	canned_panel(px, "s5");
-++	canned_panel(px, "t3");
-++	canned_panel(px, "t1");
-++	canned_panel(px, "t2");
-++	canned_panel(px, "t3");
-++	canned_panel(px, "t4");
-++
-+ 	for (itmp = 0; itmp < 6; itmp++) {
-+-	    WINDOW *w4 = panel_window(p4);
-+-	    WINDOW *w5 = panel_window(p5);
-++	    WINDOW *w4 = panel_window(px[4]);
-++	    WINDOW *w5 = panel_window(px[5]);
-+ 
-+-	    saywhat("m4; press any key to continue");
-++	    saywhat("m4");
-+ 	    wmove(w4, LINES / 8, 1);
-+ 	    waddstr(w4, mod[itmp]);
-+-	    move_panel(p4, LINES / 6, itmp * (COLS / 8));
-++	    move_panel(px[4], LINES / 6, itmp * (COLS / 8));
-+ 	    wmove(w5, LINES / 6, 1);
-+ 	    waddstr(w5, mod[itmp]);
-+ 	    pflush();
-+ 	    wait_a_while(nap_msec);
-+ 
-+-	    saywhat("m5; press any key to continue");
-++	    saywhat("m5");
-+ 	    wmove(w4, LINES / 6, 1);
-+ 	    waddstr(w4, mod[itmp]);
-+-	    move_panel(p5, LINES / 3 - 1, (itmp * 10) + 6);
-++	    move_panel(px[5], LINES / 3 - 1, (itmp * 10) + 6);
-+ 	    wmove(w5, LINES / 8, 1);
-+ 	    waddstr(w5, mod[itmp]);
-+ 	    pflush();
-+ 	    wait_a_while(nap_msec);
-+ 	}
-+ 
-+-	saywhat("m4; press any key to continue");
-+-	move_panel(p4, LINES / 6, itmp * (COLS / 8));
-+-	pflush();
-+-	wait_a_while(nap_msec);
-+-
-+-	saywhat("t5; press any key to continue");
-+-	top_panel(p5);
-+-	pflush();
-+-	wait_a_while(nap_msec);
-+-
-+-	saywhat("t2; press any key to continue");
-+-	top_panel(p2);
-+-	pflush();
-+-	wait_a_while(nap_msec);
-+-
-+-	saywhat("t1; press any key to continue");
-+-	top_panel(p1);
-+-	pflush();
-+-	wait_a_while(nap_msec);
-+-
-+-	saywhat("d2; press any key to continue");
-+-	rmpanel(p2);
-+-	pflush();
-+-	wait_a_while(nap_msec);
-+-
-+-	saywhat("h3; press any key to continue");
-+-	hide_panel(p3);
-+-	pflush();
-+-	wait_a_while(nap_msec);
-+-
-+-	saywhat("d1; press any key to continue");
-+-	rmpanel(p1);
-+-	pflush();
-+-	wait_a_while(nap_msec);
-+-
-+-	saywhat("d4; press any key to continue");
-+-	rmpanel(p4);
-++	saywhat("m4");
-++	move_panel(px[4], LINES / 6, itmp * (COLS / 8));
-+ 	pflush();
-+ 	wait_a_while(nap_msec);
-+ 
-+-	saywhat("d5; press any key to continue");
-+-	rmpanel(p5);
-+-	pflush();
-+-
-+-	rmpanel(p3);
-+-	pflush();
-++	canned_panel(px, "t5");
-++	canned_panel(px, "t2");
-++	canned_panel(px, "t1");
-++	canned_panel(px, "d2");
-++	canned_panel(px, "h3");
-++	canned_panel(px, "d1");
-++	canned_panel(px, "d4");
-++	canned_panel(px, "d5");
-++	canned_panel(px, "d3");
-+ 
-+ 	wait_a_while(nap_msec);
-+ 	if (nap_msec == 1)
-+@@ -5389,6 +5405,10 @@
-+     int finished = 0, c;
-+     unsigned n = 0;
-+ 
-++#ifdef NCURSES_MOUSE_VERSION
-++    mousemask(ALL_MOUSE_EVENTS, (mmask_t *) 0);
-++#endif
-++
-+     move(18, 0);
-+     addstr("Defined edit/traversal keys:   ^Q/ESC- exit form\n");
-+     addstr("^N   -- go to next field       ^P  -- go to previous field\n");
-+@@ -5462,6 +5482,10 @@
-+     free_fieldtype(fty_passwd);
-+     noraw();
-+     nl();
-++
-++#ifdef NCURSES_MOUSE_VERSION
-++    mousemask(ALL_MOUSE_EVENTS, (mmask_t *) 0);
-++#endif
-+ }
-+ #endif /* USE_LIBFORM */
-+ 
-+@@ -5884,7 +5908,13 @@
-+ 
-+ #if USE_LIBPANEL
-+     case 'o':
-+-	demo_panels();
-++	demo_panels(init_panel, fill_panel);
-++	break;
-++#endif
-++
-++#if USE_WIDEC_SUPPORT
-++    case 'O':
-++	demo_panels(init_wide_panel, fill_wide_panel);
-+ 	break;
-+ #endif
-+ 
-+@@ -6052,9 +6082,12 @@
-+ #endif
-+ #if USE_LIBPANEL
-+ 	(void) puts("o = exercise panels library");
-++#if USE_WIDEC_SUPPORT
-++	(void) puts("O = exercise panels with wide-characters");
-++#endif
-++#endif
-+ 	(void) puts("p = exercise pad features");
-+ 	(void) puts("q = quit");
-+-#endif
-+ #if USE_LIBFORM
-+ 	(void) puts("r = exercise forms code");
-+ #endif
-+@@ -6143,7 +6176,7 @@
-+ 
-+     setlocale(LC_ALL, "");
-+ 
-+-    while ((c = getopt(argc, argv, "a:de:fhmp:s:t:")) != EOF) {
-++    while ((c = getopt(argc, argv, "a:de:fhmp:s:t:")) != -1) {
-+ 	switch (c) {
-+ #ifdef NCURSES_VERSION
-+ 	case 'a':
-+Index: test/programs
-+Prereq:  1.5 
-+--- ncurses-5.6/test/programs	2006-11-04 18:56:49.000000000 +0000
-++++ ncurses-5.6-20071201/test/programs	2007-08-18 17:57:00.000000000 +0000
-+@@ -1,6 +1,6 @@
-+-# $Id: programs,v 1.5 2006/11/04 18:56:49 tom Exp $
-++# $Id: programs,v 1.13 2007/08/18 17:57:00 tom Exp $
-+ ##############################################################################
-+-# Copyright (c) 2006 Free Software Foundation, Inc.                          #
-++# Copyright (c) 2006,2007 Free Software Foundation, Inc.                     #
-+ #                                                                            #
-+ # Permission is hereby granted, free of charge, to any person obtaining a    #
-+ # copy of this software and associated documentation files (the "Software"), #
-+@@ -45,6 +45,7 @@
-+ demo_termcap	$(LDFLAGS_TINFO)	$(LOCAL_LIBS)	demo_termcap
-+ ditto		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	ditto
-+ dots		$(LDFLAGS_TINFO)	$(LOCAL_LIBS)	dots
-++dots_mvcur	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	dots_mvcur
-+ echochar	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	echochar
-+ filter		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	filter
-+ firework	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	firework
-+@@ -53,8 +54,11 @@
-+ gdc		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	gdc
-+ hanoi		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	hanoi
-+ hashtest	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	hashtest
-++inch_wide	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	inch_wide
-++inchs		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	inchs
-+ ins_wide	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	ins_wide
-+ inserts		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	inserts
-++key_names	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	key_names
-+ keynames	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	keynames
-+ knight		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	knight
-+ lrtest		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	lrtest
-+@@ -66,9 +70,17 @@
-+ redraw		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	redraw
-+ savescreen	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	savescreen
-+ tclock		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	tclock
-++test_arrays	$(LDFLAGS_TINFO)	$(LOCAL_LIBS)	test_arrays
-++test_get_wstr	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_get_wstr
-++test_getstr	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_getstr
-++test_instr	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_instr
-++test_inwstr	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_inwstr
-++test_opaque	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_opaque
-+ testaddch	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	testaddch
-+ testcurs	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	testcurs
-+ testscanw	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	testscanw
-+ view		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	view
-+ worm		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	worm
-+ xmas		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	xmas
-++
-++# vile:makemode
-+Index: test/railroad.c
-+Prereq:  1.14 
-+--- ncurses-5.6/test/railroad.c	2006-05-20 16:02:04.000000000 +0000
-++++ ncurses-5.6-20071201/test/railroad.c	2007-02-03 18:51:23.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 2000-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 2000-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -29,10 +29,11 @@
-+ /*
-+  * Author: Thomas E. Dickey - 2000
-+  *
-+- * $Id: railroad.c,v 1.14 2006/05/20 16:02:04 tom Exp $
-++ * $Id: railroad.c,v 1.15 2007/02/03 18:51:23 tom Exp $
-+  *
-+  * A simple demo of the termcap interface.
-+  */
-++#define USE_TINFO
-+ #include <test.priv.h>
-+ 
-+ #if HAVE_TGETENT
-+Index: test/redraw.c
-+Prereq:  1.3 
-+--- ncurses-5.6/test/redraw.c	2006-11-04 23:20:27.000000000 +0000
-++++ ncurses-5.6-20071201/test/redraw.c	2007-06-30 17:55:06.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 2006 Free Software Foundation, Inc.                        *
-++ * Copyright (c) 2006,2007 Free Software Foundation, Inc.                   *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -26,7 +26,7 @@
-+  * authorization.                                                           *
-+  ****************************************************************************/
-+ /*
-+- * $Id: redraw.c,v 1.3 2006/11/04 23:20:27 tom Exp $
-++ * $Id: redraw.c,v 1.4 2007/06/30 17:55:06 tom Exp $
-+  *
-+  * Demonstrate the redrawwin() and wredrawln() functions.
-+  * Thomas Dickey - 2006/11/4
-+@@ -148,7 +148,7 @@
-+ 	    if (ch > KEY_MIN) {
-+ 		waddstr(win, keyname(ch));
-+ 	    } else {
-+-		waddstr(win, unctrl(ch));
-++		waddstr(win, unctrl(UChar(ch)));
-+ 	    }
-+ 	    break;
-+ 	}
-+Index: test/savescreen.c
-+Prereq:  1.2 
-+--- ncurses-5.6/test/savescreen.c	2006-04-01 19:08:03.000000000 +0000
-++++ ncurses-5.6-20071201/test/savescreen.c	2007-07-21 17:57:37.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 2006 Free Software Foundation, Inc.                        *
-++ * Copyright (c) 2007 Free Software Foundation, Inc.                        *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -26,23 +26,291 @@
-+  * authorization.                                                           *
-+  ****************************************************************************/
-+ /*
-+- * $Id: savescreen.c,v 1.2 2006/04/01 19:08:03 tom Exp $
-++ * $Id: savescreen.c,v 1.10 2007/07/21 17:57:37 tom Exp $
-+  *
-+  * Demonstrate save/restore functions from the curses library.
-+- * Thomas Dickey - 2006/2/11
-++ * Thomas Dickey - 2007/7/14
-+  */
-+-/*
-+-scr_dump			-
-+-scr_init			-
-+-scr_restore			-
-+-scr_set				-
-+-*/
-+ 
-+ #include <test.priv.h>
-+ 
-++#if TIME_WITH_SYS_TIME
-++# include <sys/time.h>
-++# include <time.h>
-++#else
-++# if HAVE_SYS_TIME_H
-++#  include <sys/time.h>
-++# else
-++#  include <time.h>
-++# endif
-++#endif
-++
-++static bool use_init = FALSE;
-++
-++static void
-++setup_next(void)
-++{
-++    curs_set(1);
-++    reset_shell_mode();
-++}
-++
-++static void
-++cleanup(char *files[])
-++{
-++    int n;
-++
-++    for (n = 0; files[n] != 0; ++n) {
-++	unlink(files[n]);
-++    }
-++}
-++
-++static int
-++load_screen(char *filename)
-++{
-++    int result;
-++
-++    if (use_init) {
-++	if ((result = scr_init(filename)) != ERR)
-++	    result = scr_restore(filename);
-++    } else {
-++	result = scr_set(filename);
-++    }
-++    return result;
-++}
-++
-++/*
-++ * scr_restore() or scr_set() operates on curscr.  If we read a character using
-++ * getch() that will refresh stdscr, wiping out the result.  To avoid that,
-++ * copy the data back from curscr to stdscr.
-++ */
-++static void
-++after_load(void)
-++{
-++    overwrite(curscr, stdscr);
-++    doupdate();
-++}
-++
-++static void
-++show_what(int which, int last)
-++{
-++    int y, x;
-++    time_t now = time((time_t *) 0);
-++
-++    getyx(stdscr, y, x);
-++
-++    move(0, 0);
-++    printw("Saved %d of %d - %s", which, last + 1, ctime(&now));
-++
-++    move(y, x);
-++
-++    refresh();
-++}
-++
-++static int
-++get_command(int which, int last)
-++{
-++    int ch;
-++
-++    timeout(100);
-++
-++    do {
-++	show_what(which, last);
-++	ch = getch();
-++    } while (ch == ERR);
-++
-++    return ch;
-++}
-++
-++static void
-++usage(void)
-++{
-++    static const char *msg[] =
-++    {
-++	"Usage: savescreen [-r] files",
-++	"",
-++	"Options:",
-++	" -i  use scr_init/scr_restore rather than scr_set",
-++	" -r  replay the screen-dump files"
-++    };
-++    unsigned n;
-++    for (n = 0; n < SIZEOF(msg); ++n) {
-++	fprintf(stderr, "%s\n", msg[n]);
-++    }
-++    ExitProgram(EXIT_FAILURE);
-++}
-++
-+ int
-+-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
-++main(int argc, char *argv[])
-+ {
-+-    printf("Not implemented - demo for screen save/restore\n");
-+-    return EXIT_SUCCESS;
-++    int ch;
-++    int which = 0;
-++    int last;
-++    bool replaying = FALSE;
-++    bool done = FALSE;
-++    char **files;
-++
-++    while ((ch = getopt(argc, argv, "ir")) != -1) {
-++	switch (ch) {
-++	case 'i':
-++	    use_init = TRUE;
-++	    break;
-++	case 'r':
-++	    replaying = TRUE;
-++	    break;
-++	default:
-++	    usage();
-++	    break;
-++	}
-++    }
-++
-++    initscr();
-++    cbreak();
-++    noecho();
-++    keypad(stdscr, TRUE);
-++    curs_set(0);
-++    if (has_colors()) {
-++	start_color();
-++	for (ch = 0; ch < COLOR_PAIRS; ++ch) {
-++	    short pair = ch % COLOR_PAIRS;
-++	    init_pair(pair, COLOR_WHITE, ch % COLORS);
-++	}
-++    }
-++
-++    files = argv + optind;
-++    last = argc - optind - 1;
-++    if (replaying) {
-++
-++	/*
-++	 * Use the last file as the initial/current screen.
-++	 */
-++	if (last < 0) {
-++	    endwin();
-++	    printf("No screen-dumps given\n");
-++	    ExitProgram(EXIT_FAILURE);
-++	}
-++
-++	which = last;
-++	if (load_screen(files[which]) == ERR) {
-++	    endwin();
-++	    printf("Cannot load screen-dump %s\n", files[which]);
-++	    ExitProgram(EXIT_FAILURE);
-++	}
-++	after_load();
-++
-++	while (!done && (ch = getch()) != ERR) {
-++	    switch (ch) {
-++	    case 'n':
-++		/*
-++		 * If we got a "next" here, skip to the final screen before
-++		 * moving to the next process.
-++		 */
-++		setup_next();
-++		which = last;
-++		done = TRUE;
-++		break;
-++	    case 'q':
-++		endwin();
-++		cleanup(files);
-++		done = TRUE;
-++		break;
-++	    case KEY_BACKSPACE:
-++	    case '\b':
-++		if (--which < 0)
-++		    which = last;
-++		break;
-++	    case ' ':
-++		if (++which > last)
-++		    which = 0;
-++		break;
-++	    default:
-++		beep();
-++		continue;
-++	    }
-++
-++	    if (ch == 'q') {
-++		;
-++	    } else if (scr_restore(files[which]) == ERR) {
-++		endwin();
-++		printf("Cannot load screen-dump %s\n", files[which]);
-++		cleanup(files);
-++		ExitProgram(EXIT_FAILURE);
-++	    } else {
-++		wrefresh(curscr);
-++	    }
-++	}
-++    } else {
-++	int y;
-++	int x;
-++
-++	move(2, 0);
-++	printw("Use h,j,k,l or arrows to move around the screen\n");
-++	printw("Press 'q' to quit, ' ' to dump a screen\n");
-++	printw("When the last screen has been dumped, press 'n' to run the\n");
-++	printw("screen-loader.  That allows only 'q', backspace and ' ' for\n");
-++	printw("stepping through the dumped/restored screens.\n");
-++	getyx(stdscr, y, x);
-++
-++	while (!done) {
-++	    switch (ch = get_command(which, last)) {
-++	    case 'n':
-++		setup_next();
-++		done = TRUE;
-++		break;
-++	    case 'q':
-++		endwin();
-++		cleanup(files);
-++		done = TRUE;
-++		break;
-++	    case ' ':
-++		if (files[which] != 0) {
-++		    show_what(which + 1, last);
-++		    if (scr_dump(files[which]) == ERR) {
-++			endwin();
-++			printf("Cannot write screen-dump %s\n", files[which]);
-++			cleanup(files);
-++			done = TRUE;
-++			break;
-++		    }
-++		    ++which;
-++		    if (has_colors()) {
-++			short pair = which % COLOR_PAIRS;
-++			bkgd(COLOR_PAIR(pair));
-++		    }
-++		} else {
-++		    beep();
-++		}
-++		break;
-++	    case KEY_LEFT:
-++	    case 'h':
-++		if (--x < 0)
-++		    x = COLS - 1;
-++		break;
-++	    case KEY_DOWN:
-++	    case 'j':
-++		if (++y >= LINES)
-++		    y = 1;
-++		break;
-++	    case KEY_UP:
-++	    case 'k':
-++		if (--y < 1)
-++		    y = LINES - 1;
-++		break;
-++	    case KEY_RIGHT:
-++	    case 'l':
-++		if (++x >= COLS)
-++		    x = 0;
-++		break;
-++	    }
-++	    if (!done) {
-++		time_t now = time((time_t *) 0);
-++
-++		move(0, 0);
-++		addstr(ctime(&now));
-++		move(y, x);
-++		addch('#' | A_REVERSE);
-++		move(y, x);
-++	    }
-++	}
-++    }
-++    ExitProgram(EXIT_SUCCESS);
-+ }
-+Index: test/savescreen.sh
-+--- /dev/null	2007-12-08 19:14:25.328509000 +0000
-++++ ncurses-5.6-20071201/test/savescreen.sh	2007-07-14 21:50:26.000000000 +0000
-+@@ -0,0 +1,55 @@
-++#!/bin/sh
-++##############################################################################
-++# Copyright (c) 2007 Free Software Foundation, Inc.                          #
-++#                                                                            #
-++# Permission is hereby granted, free of charge, to any person obtaining a    #
-++# copy of this software and associated documentation files (the "Software"), #
-++# to deal in the Software without restriction, including without limitation  #
-++# the rights to use, copy, modify, merge, publish, distribute, distribute    #
-++# with modifications, sublicense, and/or sell copies of the Software, and to #
-++# permit persons to whom the Software is furnished to do so, subject to the  #
-++# following conditions:                                                      #
-++#                                                                            #
-++# The above copyright notice and this permission notice shall be included in #
-++# all copies or substantial portions of the Software.                        #
-++#                                                                            #
-++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
-++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,   #
-++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL    #
-++# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER      #
-++# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING    #
-++# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER        #
-++# DEALINGS IN THE SOFTWARE.                                                  #
-++#                                                                            #
-++# Except as contained in this notice, the name(s) of the above copyright     #
-++# holders shall not be used in advertising or otherwise to promote the sale, #
-++# use or other dealings in this Software without prior written               #
-++# authorization.                                                             #
-++##############################################################################
-++# $Id: savescreen.sh,v 1.3 2007/07/14 21:50:26 tom Exp $
-++#
-++# Use this script to exercise "savescreen".
-++# It starts by generating a series of temporary-filenames, which are passed
-++# to the test-program.  Loop as long as the first file named exists.
-++PARAMS=
-++NFILES=4
-++PREFIX=savescreen-$$
-++n=0
-++BEGINS=$PREFIX-$n.tmp
-++while test $n != $NFILES
-++do
-++	LATEST=$PREFIX-$n.tmp
-++	PARAMS="$PARAMS $LATEST"
-++	n=`expr $n + 1`
-++done
-++
-++./savescreen $PARAMS
-++if test -f $BEGINS
-++then
-++	while test -f $BEGINS
-++	do
-++		./savescreen -r $PARAMS
-++	done
-++else
-++	echo "No screens were saved"
-++fi
-+Index: test/test.priv.h
-+Prereq:  1.63 
-+--- ncurses-5.6/test/test.priv.h	2006-07-15 18:27:24.000000000 +0000
-++++ ncurses-5.6-20071201/test/test.priv.h	2007-06-30 17:53:09.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -29,7 +29,7 @@
-+ /****************************************************************************
-+  *  Author: Thomas E. Dickey                    1996-on                     *
-+  ****************************************************************************/
-+-/* $Id: test.priv.h,v 1.63 2006/07/15 18:27:24 tom Exp $ */
-++/* $Id: test.priv.h,v 1.68 2007/06/30 17:53:09 tom Exp $ */
-+ 
-+ #ifndef __TEST_PRIV_H
-+ #define __TEST_PRIV_H 1
-+@@ -309,7 +309,7 @@
-+ 
-+ #ifndef HAVE_TYPE_ATTR_T
-+ #if !USE_WIDEC_SUPPORT
-+-#define attr_t long
-++#define attr_t chtype
-+ #endif
-+ #endif
-+ 
-+@@ -320,6 +320,10 @@
-+ #define NCURSES_CH_T cchar_t
-+ #endif
-+ 
-++#ifndef NCURSES_OPAQUE
-++#define NCURSES_OPAQUE 0
-++#endif
-++
-+ #ifndef CCHARW_MAX
-+ #define CCHARW_MAX 5
-+ #endif
-+@@ -404,6 +408,10 @@
-+ 
-+ #if defined(NCURSES_VERSION) && HAVE_NC_ALLOC_H
-+ #include <nc_alloc.h>
-++#if HAVE_NC_FREEALL && defined(USE_TINFO)
-++#undef ExitProgram
-++#define ExitProgram(code) _nc_free_tinfo(code)
-++#endif
-+ #else
-+ #define typeMalloc(type,n) (type *) malloc((n) * sizeof(type))
-+ #define typeRealloc(type,n,p) (type *) realloc(p, (n) * sizeof(type))
-+Index: test/test_arrays.c
-+--- /dev/null	2007-12-08 19:14:25.328509000 +0000
-++++ ncurses-5.6-20071201/test/test_arrays.c	2007-09-01 20:11:57.000000000 +0000
-+@@ -0,0 +1,79 @@
-++/****************************************************************************
-++ * Copyright (c) 2007 Free Software Foundation, Inc.                        *
-++ *                                                                          *
-++ * Permission is hereby granted, free of charge, to any person obtaining a  *
-++ * copy of this software and associated documentation files (the            *
-++ * "Software"), to deal in the Software without restriction, including      *
-++ * without limitation the rights to use, copy, modify, merge, publish,      *
-++ * distribute, distribute with modifications, sublicense, and/or sell       *
-++ * copies of the Software, and to permit persons to whom the Software is    *
-++ * furnished to do so, subject to the following conditions:                 *
-++ *                                                                          *
-++ * The above copyright notice and this permission notice shall be included  *
-++ * in all copies or substantial portions of the Software.                   *
-++ *                                                                          *
-++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-++ *                                                                          *
-++ * Except as contained in this notice, the name(s) of the above copyright   *
-++ * holders shall not be used in advertising or otherwise to promote the     *
-++ * sale, use or other dealings in this Software without prior written       *
-++ * authorization.                                                           *
-++ ****************************************************************************/
-++/*
-++ * $Id: test_arrays.c,v 1.2 2007/09/01 20:11:57 tom Exp $
-++ *
-++ * Author: Thomas E Dickey
-++ *
-++ * Demonstrate the public arrays from the terminfo library.
-++
-++extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolnames[];
-++extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolcodes[];
-++extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolfnames[];
-++extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) numnames[];
-++extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) numcodes[];
-++extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) numfnames[];
-++extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) strnames[];
-++extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) strcodes[];
-++extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) strfnames[];
-++
-++ */
-++
-++#define USE_TINFO
-++#include <test.priv.h>
-++
-++#define DUMP(name) dump_array(#name, name)
-++
-++static void
-++dump_array(const char *name, NCURSES_CONST char *const *list)
-++{
-++    int n;
-++
-++    printf("%s:\n", name);
-++    for (n = 0; list[n] != 0; ++n) {
-++	printf("%5d:%s\n", n, list[n]);
-++    }
-++}
-++
-++int
-++main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
-++{
-++    DUMP(boolnames);
-++    DUMP(boolcodes);
-++    DUMP(boolfnames);
-++
-++    DUMP(numnames);
-++    DUMP(numcodes);
-++    DUMP(numfnames);
-++
-++    DUMP(strnames);
-++    DUMP(strcodes);
-++    DUMP(strfnames);
-++
-++    ExitProgram(EXIT_SUCCESS);
-++}
-+Index: test/test_get_wstr.c
-+--- /dev/null	2007-12-08 19:14:25.328509000 +0000
-++++ ncurses-5.6-20071201/test/test_get_wstr.c	2007-08-11 17:01:43.000000000 +0000
-+@@ -0,0 +1,361 @@
-++/****************************************************************************
-++ * Copyright (c) 2007 Free Software Foundation, Inc.                        *
-++ *                                                                          *
-++ * Permission is hereby granted, free of charge, to any person obtaining a  *
-++ * copy of this software and associated documentation files (the            *
-++ * "Software"), to deal in the Software without restriction, including      *
-++ * without limitation the rights to use, copy, modify, merge, publish,      *
-++ * distribute, distribute with modifications, sublicense, and/or sell       *
-++ * copies of the Software, and to permit persons to whom the Software is    *
-++ * furnished to do so, subject to the following conditions:                 *
-++ *                                                                          *
-++ * The above copyright notice and this permission notice shall be included  *
-++ * in all copies or substantial portions of the Software.                   *
-++ *                                                                          *
-++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-++ *                                                                          *
-++ * Except as contained in this notice, the name(s) of the above copyright   *
-++ * holders shall not be used in advertising or otherwise to promote the     *
-++ * sale, use or other dealings in this Software without prior written       *
-++ * authorization.                                                           *
-++ ****************************************************************************/
-++/*
-++ * $Id: test_get_wstr.c,v 1.5 2007/08/11 17:01:43 tom Exp $
-++ *
-++ * Author: Thomas E Dickey
-++ *
-++ * Demonstrate the get_wstr functions from the curses library.
-++
-++       int get_wstr(wint_t *wstr);
-++       int getn_wstr(wint_t *wstr, int n);
-++       int wget_wstr(WINDOW *win, wint_t *wstr);
-++       int wgetn_wstr(WINDOW *win, wint_t *wstr, int n);
-++       int mvget_wstr(int y, int x, wint_t *wstr);
-++       int mvgetn_wstr(int y, int x, wint_t *wstr, int n);
-++       int mvwget_wstr(WINDOW *win, int y, int x, wint_t *wstr);
-++       int mvwgetn_wstr(WINDOW *win, int y, int x, wint_t *wstr, int n);
-++ */
-++
-++#include <test.priv.h>
-++
-++#if USE_WIDEC_SUPPORT
-++
-++#define BASE_Y 6
-++#define MAX_COLS 1024
-++
-++typedef enum {
-++    eGetStr = 0,
-++    eGetNStr,
-++    eMvGetStr,
-++    eMvGetNStr,
-++    eMaxFlavor
-++} Flavors;
-++
-++static bool
-++Quit(int ch)
-++{
-++    return (ch == ERR || ch == 'q' || ch == QUIT || ch == ESCAPE);
-++}
-++
-++static int
-++Remainder(WINDOW *txtwin)
-++{
-++    int result = getmaxx(txtwin) - getcurx(txtwin);
-++    return (result > 0) ? result : 0;
-++}
-++
-++/*
-++ * Show a highlighted line in the place where input will happen.
-++ */
-++static void
-++ShowPrompt(WINDOW *txtwin, int limit)
-++{
-++    wchgat(txtwin, limit, A_REVERSE, 0, NULL);
-++    wnoutrefresh(txtwin);
-++}
-++
-++static void
-++MovePrompt(WINDOW *txtwin, int limit, int y, int x)
-++{
-++    wchgat(txtwin, Remainder(txtwin), A_NORMAL, 0, NULL);
-++    wmove(txtwin, y, x);
-++    ShowPrompt(txtwin, limit);
-++}
-++
-++static int
-++ShowFlavor(WINDOW *strwin, WINDOW *txtwin, int flavor, int limit)
-++{
-++    const char *name = "?";
-++    bool limited = FALSE;
-++    bool wins = (txtwin != stdscr);
-++    int result;
-++
-++    switch (flavor) {
-++    case eGetStr:
-++	name = wins ? "wget_wstr" : "get_wstr";
-++	break;
-++    case eGetNStr:
-++	limited = TRUE;
-++	name = wins ? "wgetn_wstr" : "getn_wstr";
-++	break;
-++    case eMvGetStr:
-++	name = wins ? "mvwget_wstr" : "mvget_wstr";
-++	break;
-++    case eMvGetNStr:
-++	limited = TRUE;
-++	name = wins ? "mvwgetn_wstr" : "mvgetn_wstr";
-++	break;
-++    case eMaxFlavor:
-++	break;
-++    }
-++
-++    wmove(strwin, 0, 0);
-++    werase(strwin);
-++
-++    if (limited) {
-++	wprintw(strwin, "%s(%d):", name, limit);
-++    } else {
-++	wprintw(strwin, "%s:", name);
-++    }
-++    result = limited ? limit : Remainder(txtwin);
-++    ShowPrompt(txtwin, result);
-++
-++    wnoutrefresh(strwin);
-++    return result;
-++}
-++
-++static int
-++test_get_wstr(int level, char **argv, WINDOW *strwin)
-++{
-++    WINDOW *txtbox = 0;
-++    WINDOW *txtwin = 0;
-++    FILE *fp;
-++    int ch;
-++    int rc;
-++    int txt_x = 0, txt_y = 0;
-++    int base_y;
-++    int flavor = 0;
-++    int limit = getmaxx(strwin) - 5;
-++    int actual;
-++    wint_t buffer[MAX_COLS];
-++
-++    if (argv[level] == 0) {
-++	beep();
-++	return FALSE;
-++    }
-++
-++    if (level > 1) {
-++	txtbox = newwin(LINES - BASE_Y, COLS - level, BASE_Y, level);
-++	box(txtbox, 0, 0);
-++	wnoutrefresh(txtbox);
-++
-++	txtwin = derwin(txtbox,
-++			getmaxy(txtbox) - 2,
-++			getmaxx(txtbox) - 2,
-++			1, 1);
-++	base_y = 0;
-++    } else {
-++	txtwin = stdscr;
-++	base_y = BASE_Y;
-++    }
-++
-++    keypad(txtwin, TRUE);	/* enable keyboard mapping */
-++    (void) cbreak();		/* take input chars one at a time, no wait for \n */
-++    (void) noecho();		/* don't echo input */
-++
-++    txt_y = base_y;
-++    txt_x = 0;
-++    wmove(txtwin, txt_y, txt_x);
-++
-++    if ((fp = fopen(argv[level], "r")) != 0) {
-++	while ((ch = fgetc(fp)) != EOF) {
-++	    if (waddch(txtwin, UChar(ch)) != OK) {
-++		break;
-++	    }
-++	}
-++	fclose(fp);
-++    } else {
-++	wprintw(txtwin, "Cannot open:\n%s", argv[1]);
-++    }
-++
-++    wmove(txtwin, txt_y, txt_x);
-++    actual = ShowFlavor(strwin, txtwin, flavor, limit);
-++    while (!Quit(ch = mvwgetch(txtwin, txt_y, txt_x))) {
-++	switch (ch) {
-++	case KEY_DOWN:
-++	case 'j':
-++	    if (txt_y < getmaxy(txtwin) - 1) {
-++		MovePrompt(txtwin, actual, ++txt_y, txt_x);
-++	    } else {
-++		beep();
-++	    }
-++	    break;
-++	case KEY_UP:
-++	case 'k':
-++	    if (txt_y > base_y) {
-++		MovePrompt(txtwin, actual, --txt_y, txt_x);
-++	    } else {
-++		beep();
-++	    }
-++	    break;
-++	case KEY_LEFT:
-++	case 'h':
-++	    if (txt_x > 0) {
-++		MovePrompt(txtwin, actual, txt_y, --txt_x);
-++	    } else {
-++		beep();
-++	    }
-++	    break;
-++	case KEY_RIGHT:
-++	case 'l':
-++	    if (txt_x < getmaxx(txtwin) - 1) {
-++		MovePrompt(txtwin, actual, txt_y, ++txt_x);
-++	    } else {
-++		beep();
-++	    }
-++	    break;
-++
-++	case 'w':
-++	    test_get_wstr(level + 1, argv, strwin);
-++	    if (txtbox != 0) {
-++		touchwin(txtbox);
-++		wnoutrefresh(txtbox);
-++	    } else {
-++		touchwin(txtwin);
-++		wnoutrefresh(txtwin);
-++	    }
-++	    break;
-++
-++	case '-':
-++	    if (limit > 0) {
-++		actual = ShowFlavor(strwin, txtwin, flavor, --limit);
-++		MovePrompt(txtwin, actual, txt_y, txt_x);
-++	    } else {
-++		beep();
-++	    }
-++	    break;
-++
-++	case '+':
-++	    actual = ShowFlavor(strwin, txtwin, flavor, ++limit);
-++	    MovePrompt(txtwin, actual, txt_y, txt_x);
-++	    break;
-++
-++	case '<':
-++	    if (flavor > 0) {
-++		actual = ShowFlavor(strwin, txtwin, --flavor, limit);
-++		MovePrompt(txtwin, actual, txt_y, txt_x);
-++	    } else {
-++		beep();
-++	    }
-++	    break;
-++
-++	case '>':
-++	    if (flavor + 1 < eMaxFlavor) {
-++		actual = ShowFlavor(strwin, txtwin, ++flavor, limit);
-++		MovePrompt(txtwin, actual, txt_y, txt_x);
-++	    } else {
-++		beep();
-++	    }
-++	    break;
-++
-++	case ':':
-++	    actual = ShowFlavor(strwin, txtwin, flavor, limit);
-++	    *buffer = '\0';
-++	    rc = ERR;
-++	    echo();
-++	    wattrset(txtwin, A_REVERSE);
-++	    switch (flavor) {
-++	    case eGetStr:
-++		if (txtwin != stdscr) {
-++		    wmove(txtwin, txt_y, txt_x);
-++		    rc = wget_wstr(txtwin, buffer);
-++		} else {
-++		    move(txt_y, txt_x);
-++		    rc = get_wstr(buffer);
-++		}
-++		break;
-++	    case eGetNStr:
-++		if (txtwin != stdscr) {
-++		    wmove(txtwin, txt_y, txt_x);
-++		    rc = wgetn_wstr(txtwin, buffer, limit);
-++		} else {
-++		    move(txt_y, txt_x);
-++		    rc = getn_wstr(buffer, limit);
-++		}
-++		break;
-++	    case eMvGetStr:
-++		if (txtwin != stdscr) {
-++		    rc = mvwget_wstr(txtwin, txt_y, txt_x, buffer);
-++		} else {
-++		    rc = mvget_wstr(txt_y, txt_x, buffer);
-++		}
-++		break;
-++	    case eMvGetNStr:
-++		if (txtwin != stdscr) {
-++		    rc = mvwgetn_wstr(txtwin, txt_y, txt_x, buffer, limit);
-++		} else {
-++		    rc = mvgetn_wstr(txt_y, txt_x, buffer, limit);
-++		}
-++		break;
-++	    case eMaxFlavor:
-++		break;
-++	    }
-++	    noecho();
-++	    wattrset(txtwin, A_NORMAL);
-++	    wprintw(strwin, "%d", rc);
-++	    waddwstr(strwin, (wchar_t *) buffer);
-++	    wnoutrefresh(strwin);
-++	    break;
-++	default:
-++	    beep();
-++	    break;
-++	}
-++	doupdate();
-++    }
-++    if (level > 1) {
-++	delwin(txtwin);
-++	delwin(txtbox);
-++    }
-++    return TRUE;
-++}
-++
-++int
-++main(int argc, char *argv[])
-++{
-++    WINDOW *chrbox;
-++    WINDOW *strwin;
-++
-++    setlocale(LC_ALL, "");
-++
-++    if (argc < 2) {
-++	fprintf(stderr, "usage: %s file\n", argv[0]);
-++	return EXIT_FAILURE;
-++    }
-++
-++    initscr();
-++
-++    chrbox = derwin(stdscr, BASE_Y, COLS, 0, 0);
-++    box(chrbox, 0, 0);
-++    wnoutrefresh(chrbox);
-++
-++    strwin = derwin(chrbox, 4, COLS - 2, 1, 1);
-++
-++    test_get_wstr(1, argv, strwin);
-++
-++    endwin();
-++    ExitProgram(EXIT_SUCCESS);
-++}
-++#else
-++int
-++main(void)
-++{
-++    printf("This program requires the wide-ncurses library\n");
-++    ExitProgram(EXIT_FAILURE);
-++}
-++#endif
-+Index: test/test_getstr.c
-+--- /dev/null	2007-12-08 19:14:25.328509000 +0000
-++++ ncurses-5.6-20071201/test/test_getstr.c	2007-08-11 16:56:25.000000000 +0000
-+@@ -0,0 +1,351 @@
-++/****************************************************************************
-++ * Copyright (c) 2007 Free Software Foundation, Inc.                        *
-++ *                                                                          *
-++ * Permission is hereby granted, free of charge, to any person obtaining a  *
-++ * copy of this software and associated documentation files (the            *
-++ * "Software"), to deal in the Software without restriction, including      *
-++ * without limitation the rights to use, copy, modify, merge, publish,      *
-++ * distribute, distribute with modifications, sublicense, and/or sell       *
-++ * copies of the Software, and to permit persons to whom the Software is    *
-++ * furnished to do so, subject to the following conditions:                 *
-++ *                                                                          *
-++ * The above copyright notice and this permission notice shall be included  *
-++ * in all copies or substantial portions of the Software.                   *
-++ *                                                                          *
-++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-++ *                                                                          *
-++ * Except as contained in this notice, the name(s) of the above copyright   *
-++ * holders shall not be used in advertising or otherwise to promote the     *
-++ * sale, use or other dealings in this Software without prior written       *
-++ * authorization.                                                           *
-++ ****************************************************************************/
-++/*
-++ * $Id: test_getstr.c,v 1.7 2007/08/11 16:56:25 tom Exp $
-++ *
-++ * Author: Thomas E Dickey
-++ *
-++ * Demonstrate the getstr functions from the curses library.
-++
-++       int getstr(char *str);
-++       int getnstr(char *str, int n);
-++       int wgetstr(WINDOW *win, char *str);
-++       int wgetnstr(WINDOW *win, char *str, int n);
-++       int mvgetstr(int y, int x, char *str);
-++       int mvwgetstr(WINDOW *win, int y, int x, char *str);
-++       int mvgetnstr(int y, int x, char *str, int n);
-++       int mvwgetnstr(WINDOW *, int y, int x, char *str, int n);
-++ */
-++
-++#include <test.priv.h>
-++
-++#define BASE_Y 6
-++#define MAX_COLS 1024
-++
-++typedef enum {
-++    eGetStr = 0,
-++    eGetNStr,
-++    eMvGetStr,
-++    eMvGetNStr,
-++    eMaxFlavor
-++} Flavors;
-++
-++static bool
-++Quit(int ch)
-++{
-++    return (ch == ERR || ch == 'q' || ch == QUIT || ch == ESCAPE);
-++}
-++
-++static int
-++Remainder(WINDOW *txtwin)
-++{
-++    int result = getmaxx(txtwin) - getcurx(txtwin);
-++    return (result > 0) ? result : 0;
-++}
-++
-++/*
-++ * Show a highlighted line in the place where input will happen.
-++ */
-++static void
-++ShowPrompt(WINDOW *txtwin, int limit)
-++{
-++    wchgat(txtwin, limit, A_REVERSE, 0, NULL);
-++    wnoutrefresh(txtwin);
-++}
-++
-++static void
-++MovePrompt(WINDOW *txtwin, int limit, int y, int x)
-++{
-++    wchgat(txtwin, Remainder(txtwin), A_NORMAL, 0, NULL);
-++    wmove(txtwin, y, x);
-++    ShowPrompt(txtwin, limit);
-++}
-++
-++static int
-++ShowFlavor(WINDOW *strwin, WINDOW *txtwin, int flavor, int limit)
-++{
-++    const char *name = "?";
-++    bool limited = FALSE;
-++    bool wins = (txtwin != stdscr);
-++    int result;
-++
-++    switch (flavor) {
-++    case eGetStr:
-++	name = wins ? "wgetstr" : "getstr";
-++	break;
-++    case eGetNStr:
-++	limited = TRUE;
-++	name = wins ? "wgetnstr" : "getnstr";
-++	break;
-++    case eMvGetStr:
-++	name = wins ? "mvwgetstr" : "mvgetstr";
-++	break;
-++    case eMvGetNStr:
-++	limited = TRUE;
-++	name = wins ? "mvwgetnstr" : "mvgetnstr";
-++	break;
-++    case eMaxFlavor:
-++	break;
-++    }
-++
-++    wmove(strwin, 0, 0);
-++    werase(strwin);
-++
-++    if (limited) {
-++	wprintw(strwin, "%s(%d):", name, limit);
-++    } else {
-++	wprintw(strwin, "%s:", name);
-++    }
-++    result = limited ? limit : Remainder(txtwin);
-++    ShowPrompt(txtwin, result);
-++
-++    wnoutrefresh(strwin);
-++    return result;
-++}
-++
-++static int
-++test_getstr(int level, char **argv, WINDOW *strwin)
-++{
-++    WINDOW *txtbox = 0;
-++    WINDOW *txtwin = 0;
-++    FILE *fp;
-++    int ch;
-++    int rc;
-++    int txt_x = 0, txt_y = 0;
-++    int base_y;
-++    int flavor = 0;
-++    int limit = getmaxx(strwin) - 5;
-++    int actual;
-++
-++    char buffer[MAX_COLS];
-++
-++    if (argv[level] == 0) {
-++	beep();
-++	return FALSE;
-++    }
-++
-++    if (level > 1) {
-++	txtbox = newwin(LINES - BASE_Y, COLS - level, BASE_Y, level);
-++	box(txtbox, 0, 0);
-++	wnoutrefresh(txtbox);
-++
-++	txtwin = derwin(txtbox,
-++			getmaxy(txtbox) - 2,
-++			getmaxx(txtbox) - 2,
-++			1, 1);
-++	base_y = 0;
-++    } else {
-++	txtwin = stdscr;
-++	base_y = BASE_Y;
-++    }
-++
-++    keypad(txtwin, TRUE);	/* enable keyboard mapping */
-++    (void) cbreak();		/* take input chars one at a time, no wait for \n */
-++    (void) noecho();		/* don't echo input */
-++
-++    txt_y = base_y;
-++    txt_x = 0;
-++    wmove(txtwin, txt_y, txt_x);
-++
-++    if ((fp = fopen(argv[level], "r")) != 0) {
-++	while ((ch = fgetc(fp)) != EOF) {
-++	    if (waddch(txtwin, UChar(ch)) != OK) {
-++		break;
-++	    }
-++	}
-++	fclose(fp);
-++    } else {
-++	wprintw(txtwin, "Cannot open:\n%s", argv[1]);
-++    }
-++
-++    wmove(txtwin, txt_y, txt_x);
-++    actual = ShowFlavor(strwin, txtwin, flavor, limit);
-++    while (!Quit(ch = mvwgetch(txtwin, txt_y, txt_x))) {
-++	switch (ch) {
-++	case KEY_DOWN:
-++	case 'j':
-++	    if (txt_y < getmaxy(txtwin) - 1) {
-++		MovePrompt(txtwin, actual, ++txt_y, txt_x);
-++	    } else {
-++		beep();
-++	    }
-++	    break;
-++	case KEY_UP:
-++	case 'k':
-++	    if (txt_y > base_y) {
-++		MovePrompt(txtwin, actual, --txt_y, txt_x);
-++	    } else {
-++		beep();
-++	    }
-++	    break;
-++	case KEY_LEFT:
-++	case 'h':
-++	    if (txt_x > 0) {
-++		MovePrompt(txtwin, actual, txt_y, --txt_x);
-++	    } else {
-++		beep();
-++	    }
-++	    break;
-++	case KEY_RIGHT:
-++	case 'l':
-++	    if (txt_x < getmaxx(txtwin) - 1) {
-++		MovePrompt(txtwin, actual, txt_y, ++txt_x);
-++	    } else {
-++		beep();
-++	    }
-++	    break;
-++
-++	case 'w':
-++	    test_getstr(level + 1, argv, strwin);
-++	    if (txtbox != 0) {
-++		touchwin(txtbox);
-++		wnoutrefresh(txtbox);
-++	    } else {
-++		touchwin(txtwin);
-++		wnoutrefresh(txtwin);
-++	    }
-++	    break;
-++
-++	case '-':
-++	    if (limit > 0) {
-++		actual = ShowFlavor(strwin, txtwin, flavor, --limit);
-++		MovePrompt(txtwin, actual, txt_y, txt_x);
-++	    } else {
-++		beep();
-++	    }
-++	    break;
-++
-++	case '+':
-++	    actual = ShowFlavor(strwin, txtwin, flavor, ++limit);
-++	    MovePrompt(txtwin, actual, txt_y, txt_x);
-++	    break;
-++
-++	case '<':
-++	    if (flavor > 0) {
-++		actual = ShowFlavor(strwin, txtwin, --flavor, limit);
-++		MovePrompt(txtwin, actual, txt_y, txt_x);
-++	    } else {
-++		beep();
-++	    }
-++	    break;
-++
-++	case '>':
-++	    if (flavor + 1 < eMaxFlavor) {
-++		actual = ShowFlavor(strwin, txtwin, ++flavor, limit);
-++		MovePrompt(txtwin, actual, txt_y, txt_x);
-++	    } else {
-++		beep();
-++	    }
-++	    break;
-++
-++	case ':':
-++	    actual = ShowFlavor(strwin, txtwin, flavor, limit);
-++	    *buffer = '\0';
-++	    rc = ERR;
-++	    echo();
-++	    wattrset(txtwin, A_REVERSE);
-++	    switch (flavor) {
-++	    case eGetStr:
-++		if (txtwin != stdscr) {
-++		    wmove(txtwin, txt_y, txt_x);
-++		    rc = wgetstr(txtwin, buffer);
-++		} else {
-++		    move(txt_y, txt_x);
-++		    rc = getstr(buffer);
-++		}
-++		break;
-++	    case eGetNStr:
-++		if (txtwin != stdscr) {
-++		    wmove(txtwin, txt_y, txt_x);
-++		    rc = wgetnstr(txtwin, buffer, limit);
-++		} else {
-++		    move(txt_y, txt_x);
-++		    rc = getnstr(buffer, limit);
-++		}
-++		break;
-++	    case eMvGetStr:
-++		if (txtwin != stdscr) {
-++		    rc = mvwgetstr(txtwin, txt_y, txt_x, buffer);
-++		} else {
-++		    rc = mvgetstr(txt_y, txt_x, buffer);
-++		}
-++		break;
-++	    case eMvGetNStr:
-++		if (txtwin != stdscr) {
-++		    rc = mvwgetnstr(txtwin, txt_y, txt_x, buffer, limit);
-++		} else {
-++		    rc = mvgetnstr(txt_y, txt_x, buffer, limit);
-++		}
-++		break;
-++	    case eMaxFlavor:
-++		break;
-++	    }
-++	    noecho();
-++	    wattrset(txtwin, A_NORMAL);
-++	    wprintw(strwin, "%d:%s", rc, buffer);
-++	    wnoutrefresh(strwin);
-++	    break;
-++	default:
-++	    beep();
-++	    break;
-++	}
-++	doupdate();
-++    }
-++    if (level > 1) {
-++	delwin(txtwin);
-++	delwin(txtbox);
-++    }
-++    return TRUE;
-++}
-++
-++int
-++main(int argc, char *argv[])
-++{
-++    WINDOW *chrbox;
-++    WINDOW *strwin;
-++
-++    setlocale(LC_ALL, "");
-++
-++    if (argc < 2) {
-++	fprintf(stderr, "usage: %s file\n", argv[0]);
-++	return EXIT_FAILURE;
-++    }
-++
-++    initscr();
-++
-++    chrbox = derwin(stdscr, BASE_Y, COLS, 0, 0);
-++    box(chrbox, 0, 0);
-++    wnoutrefresh(chrbox);
-++
-++    strwin = derwin(chrbox, 4, COLS - 2, 1, 1);
-++
-++    test_getstr(1, argv, strwin);
-++
-++    endwin();
-++    ExitProgram(EXIT_SUCCESS);
-++}
-+Index: test/test_instr.c
-+--- /dev/null	2007-12-08 19:14:25.328509000 +0000
-++++ ncurses-5.6-20071201/test/test_instr.c	2007-07-21 19:38:04.000000000 +0000
-+@@ -0,0 +1,260 @@
-++/****************************************************************************
-++ * Copyright (c) 2007 Free Software Foundation, Inc.                        *
-++ *                                                                          *
-++ * Permission is hereby granted, free of charge, to any person obtaining a  *
-++ * copy of this software and associated documentation files (the            *
-++ * "Software"), to deal in the Software without restriction, including      *
-++ * without limitation the rights to use, copy, modify, merge, publish,      *
-++ * distribute, distribute with modifications, sublicense, and/or sell       *
-++ * copies of the Software, and to permit persons to whom the Software is    *
-++ * furnished to do so, subject to the following conditions:                 *
-++ *                                                                          *
-++ * The above copyright notice and this permission notice shall be included  *
-++ * in all copies or substantial portions of the Software.                   *
-++ *                                                                          *
-++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-++ *                                                                          *
-++ * Except as contained in this notice, the name(s) of the above copyright   *
-++ * holders shall not be used in advertising or otherwise to promote the     *
-++ * sale, use or other dealings in this Software without prior written       *
-++ * authorization.                                                           *
-++ ****************************************************************************/
-++/*
-++ * $Id: test_instr.c,v 1.4 2007/07/21 19:38:04 tom Exp $
-++ *
-++ * Author: Thomas E Dickey
-++ *
-++ * Demonstrate the instr functions from the curses library.
-++
-++       int instr(char *str);
-++       int innstr(char *str, int n);
-++       int winstr(WINDOW *win, char *str);
-++       int winnstr(WINDOW *win, char *str, int n);
-++       int mvinstr(int y, int x, char *str);
-++       int mvinnstr(int y, int x, char *str, int n);
-++       int mvwinstr(WINDOW *win, int y, int x, char *str);
-++       int mvwinnstr(WINDOW *win, int y, int x, char *str, int n);
-++ */
-++
-++#include <test.priv.h>
-++
-++#define BASE_Y 6
-++#define MAX_COLS 1024
-++
-++static bool
-++Quit(int ch)
-++{
-++    return (ch == ERR || ch == 'q' || ch == QUIT || ch == ESCAPE);
-++}
-++
-++static void
-++show_1st(WINDOW *win, int line, char *buffer)
-++{
-++    mvwaddstr(win, line, 5, buffer);
-++}
-++
-++static void
-++showmore(WINDOW *win, int line, char *buffer)
-++{
-++    wmove(win, line, 0);
-++    wclrtoeol(win);
-++    show_1st(win, line, buffer);
-++}
-++
-++static int
-++test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
-++{
-++    WINDOW *txtbox = 0;
-++    WINDOW *txtwin = 0;
-++    FILE *fp;
-++    int ch;
-++    int txt_x = 0, txt_y = 0;
-++    int base_y;
-++    int limit = getmaxx(strwin) - 5;
-++
-++    char buffer[MAX_COLS];
-++
-++    if (argv[level] == 0) {
-++	beep();
-++	return FALSE;
-++    }
-++
-++    if (level > 1) {
-++	txtbox = newwin(LINES - BASE_Y, COLS - level, BASE_Y, level);
-++	box(txtbox, 0, 0);
-++	wnoutrefresh(txtbox);
-++
-++	txtwin = derwin(txtbox,
-++			getmaxy(txtbox) - 2,
-++			getmaxx(txtbox) - 2,
-++			1, 1);
-++	base_y = 0;
-++    } else {
-++	txtwin = stdscr;
-++	base_y = BASE_Y;
-++    }
-++
-++    keypad(txtwin, TRUE);	/* enable keyboard mapping */
-++    (void) cbreak();		/* take input chars one at a time, no wait for \n */
-++    (void) noecho();		/* don't echo input */
-++
-++    txt_y = base_y;
-++    txt_x = 0;
-++    wmove(txtwin, txt_y, txt_x);
-++
-++    if ((fp = fopen(argv[level], "r")) != 0) {
-++	while ((ch = fgetc(fp)) != EOF) {
-++	    if (waddch(txtwin, UChar(ch)) != OK) {
-++		break;
-++	    }
-++	}
-++	fclose(fp);
-++    } else {
-++	wprintw(txtwin, "Cannot open:\n%s", argv[1]);
-++    }
-++
-++    while (!Quit(ch = mvwgetch(txtwin, txt_y, txt_x))) {
-++	switch (ch) {
-++	case KEY_DOWN:
-++	case 'j':
-++	    if (txt_y < getmaxy(txtwin) - 1)
-++		txt_y++;
-++	    else
-++		beep();
-++	    break;
-++	case KEY_UP:
-++	case 'k':
-++	    if (txt_y > base_y)
-++		txt_y--;
-++	    else
-++		beep();
-++	    break;
-++	case KEY_LEFT:
-++	case 'h':
-++	    if (txt_x > 0)
-++		txt_x--;
-++	    else
-++		beep();
-++	    break;
-++	case KEY_RIGHT:
-++	case 'l':
-++	    if (txt_x < getmaxx(txtwin) - 1)
-++		txt_x++;
-++	    else
-++		beep();
-++	    break;
-++	case 'w':
-++	    test_inchs(level + 1, argv, chrwin, strwin);
-++	    if (txtbox != 0) {
-++		touchwin(txtbox);
-++		wnoutrefresh(txtbox);
-++	    } else {
-++		touchwin(txtwin);
-++		wnoutrefresh(txtwin);
-++	    }
-++	    break;
-++	case '-':
-++	    if (limit > 0) {
-++		--limit;
-++	    } else {
-++		beep();
-++	    }
-++	    break;
-++	case '+':
-++	    ++limit;
-++	    break;
-++	default:
-++	    beep();
-++	    break;
-++	}
-++
-++	mvwprintw(chrwin, 0, 0, "line:");
-++	wclrtoeol(chrwin);
-++
-++	if (txtwin != stdscr) {
-++	    wmove(txtwin, txt_y, txt_x);
-++
-++	    if (winstr(txtwin, buffer) != ERR) {
-++		show_1st(chrwin, 0, buffer);
-++	    }
-++	    if (mvwinstr(txtwin, txt_y, txt_x, buffer) != ERR) {
-++		showmore(chrwin, 1, buffer);
-++	    }
-++	} else {
-++	    move(txt_y, txt_x);
-++
-++	    if (instr(buffer) != ERR) {
-++		show_1st(chrwin, 0, buffer);
-++	    }
-++	    if (mvinstr(txt_y, txt_x, buffer) != ERR) {
-++		showmore(chrwin, 1, buffer);
-++	    }
-++	}
-++	wnoutrefresh(chrwin);
-++
-++	mvwprintw(strwin, 0, 0, "%4d:", limit);
-++	wclrtobot(strwin);
-++
-++	if (txtwin != stdscr) {
-++	    wmove(txtwin, txt_y, txt_x);
-++	    if (winnstr(txtwin, buffer, limit) != ERR) {
-++		show_1st(strwin, 0, buffer);
-++	    }
-++
-++	    if (mvwinnstr(txtwin, txt_y, txt_x, buffer, limit) != ERR) {
-++		showmore(strwin, 1, buffer);
-++	    }
-++	} else {
-++	    move(txt_y, txt_x);
-++	    if (innstr(buffer, limit) != ERR) {
-++		show_1st(strwin, 0, buffer);
-++	    }
-++
-++	    if (mvinnstr(txt_y, txt_x, buffer, limit) != ERR) {
-++		showmore(strwin, 1, buffer);
-++	    }
-++	}
-++
-++	wnoutrefresh(strwin);
-++    }
-++    if (level > 1) {
-++	delwin(txtwin);
-++	delwin(txtbox);
-++    }
-++    return TRUE;
-++}
-++
-++int
-++main(int argc, char *argv[])
-++{
-++    WINDOW *chrbox;
-++    WINDOW *chrwin;
-++    WINDOW *strwin;
-++
-++    setlocale(LC_ALL, "");
-++
-++    if (argc < 2) {
-++	fprintf(stderr, "usage: %s file\n", argv[0]);
-++	return EXIT_FAILURE;
-++    }
-++
-++    initscr();
-++
-++    chrbox = derwin(stdscr, BASE_Y, COLS, 0, 0);
-++    box(chrbox, 0, 0);
-++    wnoutrefresh(chrbox);
-++
-++    chrwin = derwin(chrbox, 2, COLS - 2, 1, 1);
-++    strwin = derwin(chrbox, 2, COLS - 2, 3, 1);
-++
-++    test_inchs(1, argv, chrwin, strwin);
-++
-++    endwin();
-++    ExitProgram(EXIT_SUCCESS);
-++}
-+Index: test/test_inwstr.c
-+--- /dev/null	2007-12-08 19:14:25.328509000 +0000
-++++ ncurses-5.6-20071201/test/test_inwstr.c	2007-07-21 22:47:42.000000000 +0000
-+@@ -0,0 +1,269 @@
-++/****************************************************************************
-++ * Copyright (c) 2007 Free Software Foundation, Inc.                        *
-++ *                                                                          *
-++ * Permission is hereby granted, free of charge, to any person obtaining a  *
-++ * copy of this software and associated documentation files (the            *
-++ * "Software"), to deal in the Software without restriction, including      *
-++ * without limitation the rights to use, copy, modify, merge, publish,      *
-++ * distribute, distribute with modifications, sublicense, and/or sell       *
-++ * copies of the Software, and to permit persons to whom the Software is    *
-++ * furnished to do so, subject to the following conditions:                 *
-++ *                                                                          *
-++ * The above copyright notice and this permission notice shall be included  *
-++ * in all copies or substantial portions of the Software.                   *
-++ *                                                                          *
-++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-++ *                                                                          *
-++ * Except as contained in this notice, the name(s) of the above copyright   *
-++ * holders shall not be used in advertising or otherwise to promote the     *
-++ * sale, use or other dealings in this Software without prior written       *
-++ * authorization.                                                           *
-++ ****************************************************************************/
-++/*
-++ * $Id: test_inwstr.c,v 1.3 2007/07/21 22:47:42 tom Exp $
-++ *
-++ * Author: Thomas E Dickey
-++ *
-++ * Demonstrate the inwstr functions from the curses library.
-++
-++       int inwstr(wchar_t *str);
-++       int innwstr(wchar_t *str, int n);
-++       int winwstr(WINDOW *win, wchar_t *str);
-++       int winnwstr(WINDOW *win, wchar_t *str, int n);
-++       int mvinwstr(int y, int x, wchar_t *str);
-++       int mvinnwstr(int y, int x, wchar_t *str, int n);
-++       int mvwinwstr(WINDOW *win, int y, int x, wchar_t *str);
-++       int mvwinnwstr(WINDOW *win, int y, int x, wchar_t *str, int n);
-++ */
-++
-++#include <test.priv.h>
-++
-++#if USE_WIDEC_SUPPORT
-++
-++#define BASE_Y 6
-++#define MAX_COLS 1024
-++
-++static bool
-++Quit(int ch)
-++{
-++    return (ch == ERR || ch == 'q' || ch == QUIT || ch == ESCAPE);
-++}
-++
-++static void
-++show_1st(WINDOW *win, int line, wchar_t *buffer)
-++{
-++    mvwaddwstr(win, line, 5, buffer);
-++}
-++
-++static void
-++showmore(WINDOW *win, int line, wchar_t *buffer)
-++{
-++    wmove(win, line, 0);
-++    wclrtoeol(win);
-++    show_1st(win, line, buffer);
-++}
-++
-++static int
-++test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
-++{
-++    WINDOW *txtbox = 0;
-++    WINDOW *txtwin = 0;
-++    FILE *fp;
-++    int ch;
-++    int txt_x = 0, txt_y = 0;
-++    int base_y;
-++    int limit = getmaxx(strwin) - 5;
-++    wchar_t buffer[MAX_COLS];
-++
-++    if (argv[level] == 0) {
-++	beep();
-++	return FALSE;
-++    }
-++
-++    if (level > 1) {
-++	txtbox = newwin(LINES - BASE_Y, COLS - level, BASE_Y, level);
-++	box(txtbox, 0, 0);
-++	wnoutrefresh(txtbox);
-++
-++	txtwin = derwin(txtbox,
-++			getmaxy(txtbox) - 2,
-++			getmaxx(txtbox) - 2,
-++			1, 1);
-++	base_y = 0;
-++    } else {
-++	txtwin = stdscr;
-++	base_y = BASE_Y;
-++    }
-++
-++    keypad(txtwin, TRUE);	/* enable keyboard mapping */
-++    (void) cbreak();		/* take input chars one at a time, no wait for \n */
-++    (void) noecho();		/* don't echo input */
-++
-++    txt_y = base_y;
-++    txt_x = 0;
-++    wmove(txtwin, txt_y, txt_x);
-++
-++    if ((fp = fopen(argv[level], "r")) != 0) {
-++	while ((ch = fgetc(fp)) != EOF) {
-++	    if (waddch(txtwin, UChar(ch)) != OK) {
-++		break;
-++	    }
-++	}
-++	fclose(fp);
-++    } else {
-++	wprintw(txtwin, "Cannot open:\n%s", argv[1]);
-++    }
-++
-++    while (!Quit(ch = mvwgetch(txtwin, txt_y, txt_x))) {
-++	switch (ch) {
-++	case KEY_DOWN:
-++	case 'j':
-++	    if (txt_y < getmaxy(txtwin) - 1)
-++		txt_y++;
-++	    else
-++		beep();
-++	    break;
-++	case KEY_UP:
-++	case 'k':
-++	    if (txt_y > base_y)
-++		txt_y--;
-++	    else
-++		beep();
-++	    break;
-++	case KEY_LEFT:
-++	case 'h':
-++	    if (txt_x > 0)
-++		txt_x--;
-++	    else
-++		beep();
-++	    break;
-++	case KEY_RIGHT:
-++	case 'l':
-++	    if (txt_x < getmaxx(txtwin) - 1)
-++		txt_x++;
-++	    else
-++		beep();
-++	    break;
-++	case 'w':
-++	    test_inchs(level + 1, argv, chrwin, strwin);
-++	    if (txtbox != 0) {
-++		touchwin(txtbox);
-++		wnoutrefresh(txtbox);
-++	    } else {
-++		touchwin(txtwin);
-++		wnoutrefresh(txtwin);
-++	    }
-++	    break;
-++	case '-':
-++	    if (limit > 0) {
-++		--limit;
-++	    } else {
-++		beep();
-++	    }
-++	    break;
-++	case '+':
-++	    ++limit;
-++	    break;
-++	default:
-++	    beep();
-++	    break;
-++	}
-++
-++	mvwprintw(chrwin, 0, 0, "line:");
-++	wclrtoeol(chrwin);
-++
-++	if (txtwin != stdscr) {
-++	    wmove(txtwin, txt_y, txt_x);
-++
-++	    if (winwstr(txtwin, buffer) != ERR) {
-++		show_1st(chrwin, 0, buffer);
-++	    }
-++	    if (mvwinwstr(txtwin, txt_y, txt_x, buffer) != ERR) {
-++		showmore(chrwin, 1, buffer);
-++	    }
-++	} else {
-++	    move(txt_y, txt_x);
-++
-++	    if (inwstr(buffer) != ERR) {
-++		show_1st(chrwin, 0, buffer);
-++	    }
-++	    if (mvinwstr(txt_y, txt_x, buffer) != ERR) {
-++		showmore(chrwin, 1, buffer);
-++	    }
-++	}
-++	wnoutrefresh(chrwin);
-++
-++	mvwprintw(strwin, 0, 0, "%4d:", limit);
-++	wclrtobot(strwin);
-++
-++	if (txtwin != stdscr) {
-++	    wmove(txtwin, txt_y, txt_x);
-++	    if (winnwstr(txtwin, buffer, limit) != ERR) {
-++		show_1st(strwin, 0, buffer);
-++	    }
-++
-++	    if (mvwinnwstr(txtwin, txt_y, txt_x, buffer, limit) != ERR) {
-++		showmore(strwin, 1, buffer);
-++	    }
-++	} else {
-++	    move(txt_y, txt_x);
-++	    if (innwstr(buffer, limit) != ERR) {
-++		show_1st(strwin, 0, buffer);
-++	    }
-++
-++	    if (mvinnwstr(txt_y, txt_x, buffer, limit) != ERR) {
-++		showmore(strwin, 1, buffer);
-++	    }
-++	}
-++
-++	wnoutrefresh(strwin);
-++    }
-++    if (level > 1) {
-++	delwin(txtwin);
-++	delwin(txtbox);
-++    }
-++    return TRUE;
-++}
-++
-++int
-++main(int argc, char *argv[])
-++{
-++    WINDOW *chrbox;
-++    WINDOW *chrwin;
-++    WINDOW *strwin;
-++
-++    setlocale(LC_ALL, "");
-++
-++    if (argc < 2) {
-++	fprintf(stderr, "usage: %s file\n", argv[0]);
-++	return EXIT_FAILURE;
-++    }
-++
-++    initscr();
-++
-++    chrbox = derwin(stdscr, BASE_Y, COLS, 0, 0);
-++    box(chrbox, 0, 0);
-++    wnoutrefresh(chrbox);
-++
-++    chrwin = derwin(chrbox, 2, COLS - 2, 1, 1);
-++    strwin = derwin(chrbox, 2, COLS - 2, 3, 1);
-++
-++    test_inchs(1, argv, chrwin, strwin);
-++
-++    endwin();
-++    ExitProgram(EXIT_SUCCESS);
-++}
-++#else
-++int
-++main(void)
-++{
-++    printf("This program requires the wide-ncurses library\n");
-++    ExitProgram(EXIT_FAILURE);
-++}
-++#endif
-+Index: test/test_opaque.c
-+--- /dev/null	2007-12-08 19:14:25.328509000 +0000
-++++ ncurses-5.6-20071201/test/test_opaque.c	2007-08-18 17:51:51.000000000 +0000
-+@@ -0,0 +1,421 @@
-++/****************************************************************************
-++ * Copyright (c) 2007 Free Software Foundation, Inc.                        *
-++ *                                                                          *
-++ * Permission is hereby granted, free of charge, to any person obtaining a  *
-++ * copy of this software and associated documentation files (the            *
-++ * "Software"), to deal in the Software without restriction, including      *
-++ * without limitation the rights to use, copy, modify, merge, publish,      *
-++ * distribute, distribute with modifications, sublicense, and/or sell       *
-++ * copies of the Software, and to permit persons to whom the Software is    *
-++ * furnished to do so, subject to the following conditions:                 *
-++ *                                                                          *
-++ * The above copyright notice and this permission notice shall be included  *
-++ * in all copies or substantial portions of the Software.                   *
-++ *                                                                          *
-++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-++ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-++ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-++ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-++ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-++ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-++ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-++ *                                                                          *
-++ * Except as contained in this notice, the name(s) of the above copyright   *
-++ * holders shall not be used in advertising or otherwise to promote the     *
-++ * sale, use or other dealings in this Software without prior written       *
-++ * authorization.                                                           *
-++ ****************************************************************************/
-++/*
-++ * $Id: test_opaque.c,v 1.4 2007/08/18 17:51:51 tom Exp $
-++ *
-++ * Author: Thomas E Dickey
-++ *
-++ * Demonstrate the opaque functions from the curses library.
-++
-++       WINDOW * wgetparent (const WINDOW *);
-++       bool is_cleared(const WINDOW *win);
-++       bool is_idcok(const WINDOW *win);
-++       bool is_idlok(const WINDOW *win);
-++       bool is_immedok(const WINDOW *win);
-++       bool is_keypad(const WINDOW *win);
-++       bool is_leaveok(const WINDOW *win);
-++       bool is_nodelay(const WINDOW *win);
-++       bool is_notimeout(const WINDOW *win);
-++       bool is_scrollok(const WINDOW *win);
-++       bool is_syncok(const WINDOW *win);
-++       int wgetscrreg (const WINDOW *, int *, int *);
-++ */
-++
-++#include <test.priv.h>
-++
-++#define BASE_Y 6
-++#define MAX_COLS 1024
-++
-++static bool
-++Quit(int ch)
-++{
-++    return (ch == 'q' || ch == QUIT || ch == ESCAPE);
-++}
-++
-++typedef bool(*BoolOpaque) (WINDOW *, int);
-++
-++static bool
-++test_opaque_cleared(WINDOW *win, int mode)
-++{
-++    if (mode >= 0) {
-++	if (mode)
-++	    wclear(win);
-++    }
-++    return is_cleared(win);
-++}
-++
-++static bool
-++test_opaque_idcok(WINDOW *win, int mode)
-++{
-++    if (mode >= 0) {
-++	idcok(win, mode);
-++    }
-++    return is_idcok(win);
-++}
-++
-++static bool
-++test_opaque_idlok(WINDOW *win, int mode)
-++{
-++    if (mode >= 0) {
-++	idlok(win, mode);
-++    }
-++    return is_idlok(win);
-++}
-++
-++static bool
-++test_opaque_immedok(WINDOW *win, int mode)
-++{
-++    if (mode >= 0) {
-++	immedok(win, mode);
-++    }
-++    return is_immedok(win);
-++}
-++
-++static bool
-++test_opaque_keypad(WINDOW *win, int mode)
-++{
-++    if (mode >= 0) {
-++	keypad(win, mode);
-++    }
-++    return is_keypad(win);
-++}
-++
-++static bool
-++test_opaque_leaveok(WINDOW *win, int mode)
-++{
-++    if (mode >= 0) {
-++	leaveok(win, mode);
-++    }
-++    return is_leaveok(win);
-++}
-++
-++static bool
-++test_opaque_nodelay(WINDOW *win, int mode)
-++{
-++    if (mode >= 0) {
-++	nodelay(win, mode);
-++    }
-++    return is_nodelay(win);
-++}
-++
-++static bool
-++test_opaque_notimeout(WINDOW *win, int mode)
-++{
-++    if (mode >= 0) {
-++	notimeout(win, mode);
-++    }
-++    return is_notimeout(win);
-++}
-++
-++static bool
-++test_opaque_scrollok(WINDOW *win, int mode)
-++{
-++    if (mode >= 0) {
-++	scrollok(win, mode);
-++    }
-++    return is_scrollok(win);
-++}
-++
-++static bool
-++test_opaque_syncok(WINDOW *win, int mode)
-++{
-++    if (mode >= 0) {
-++	syncok(win, mode);
-++    }
-++    return is_syncok(win);
-++}
-++
-++static int
-++status_y(WINDOW *stswin, int cell)
-++{
-++    return (cell % getmaxy(stswin));
-++}
-++
-++static int
-++status_x(WINDOW *stswin, int cell)
-++{
-++    return (15 * (cell / getmaxy(stswin)));
-++}
-++
-++static void
-++to_keyword(WINDOW *stswin, int cell)
-++{
-++    wmove(stswin, status_y(stswin, cell), status_x(stswin, cell));
-++}
-++
-++static void
-++to_result(WINDOW *stswin, int cell, bool before)
-++{
-++    int y = status_y(stswin, cell);
-++    int x = status_x(stswin, cell) + 11;
-++    if (!before)
-++	++x;
-++    wmove(stswin, y, x);
-++}
-++
-++static void
-++show_keyword(WINDOW *stswin, int cell, int active, const char *name)
-++{
-++    to_keyword(stswin, cell);
-++    if (active == cell)
-++	wstandout(stswin);
-++    wprintw(stswin, "%s:", name);
-++    if (active == cell)
-++	wstandend(stswin);
-++}
-++/* *INDENT-OFF* */
-++static struct {
-++    const char *name;
-++    BoolOpaque func;
-++} bool_funcs[] = {
-++    { "cleared",   test_opaque_cleared },
-++    { "idcok",     test_opaque_idcok },
-++    { "idlok",     test_opaque_idlok },
-++    { "immedok",   test_opaque_immedok },
-++    { "keypad",    test_opaque_keypad },
-++    { "leaveok",   test_opaque_leaveok },
-++    { "nodelay",   test_opaque_nodelay },
-++    { "notimeout", test_opaque_notimeout },
-++    { "scrollok",  test_opaque_scrollok },
-++    { "syncok",    test_opaque_syncok }
-++};
-++/* *INDENT-ON* */
-++
-++/*
-++ * Display and/or allow update for the properties accessed in the opaque
-++ * window.  Some may change state after refreshing the window, so we
-++ * distinguish between them using the 'before' parameter.
-++ */
-++static int
-++show_opaque(WINDOW *stswin, WINDOW *txtwin, bool before, int active)
-++{
-++    int n;
-++    int top, bottom;
-++
-++    if (before) {
-++	werase(stswin);
-++    }
-++    for (n = 0; n < (int) SIZEOF(bool_funcs); ++n) {
-++	show_keyword(stswin, n, active, bool_funcs[n].name);
-++
-++	to_result(stswin, n, before);
-++	wprintw(stswin, "%c", bool_funcs[n].func(txtwin, -1) ? 'T' : 'F');
-++    }
-++
-++    show_keyword(stswin, n, active, "wgetparent");
-++    to_result(stswin, n, TRUE);
-++    wprintw(stswin, "%p", wgetparent(txtwin));
-++
-++    ++n;
-++    show_keyword(stswin, n, active, "wgetscrreg");
-++    to_result(stswin, n, TRUE);
-++    if (wgetscrreg(txtwin, &top, &bottom) == OK)
-++	wprintw(stswin, "%d,%d", top, bottom);
-++
-++    wnoutrefresh(stswin);
-++    return active;
-++}
-++
-++static int
-++test_opaque(int level, char **argv, WINDOW *stswin)
-++{
-++    WINDOW *txtbox = 0;
-++    WINDOW *txtwin = 0;
-++    FILE *fp;
-++    int ch;
-++    int txt_x = 0, txt_y = 0;
-++    int base_y;
-++    bool in_status = FALSE;
-++    int active = 0;
-++
-++    if (argv[level] == 0) {
-++	beep();
-++	return FALSE;
-++    }
-++
-++    if (level > 1) {
-++	txtbox = newwin(LINES - BASE_Y, COLS - level, BASE_Y, level);
-++	box(txtbox, 0, 0);
-++	wnoutrefresh(txtbox);
-++
-++	txtwin = derwin(txtbox,
-++			getmaxy(txtbox) - 2,
-++			getmaxx(txtbox) - 2,
-++			1, 1);
-++	base_y = 0;
-++    } else {
-++	txtwin = stdscr;
-++	base_y = BASE_Y;
-++    }
-++
-++    keypad(txtwin, TRUE);	/* enable keyboard mapping */
-++    (void) cbreak();		/* take input chars one at a time, no wait for \n */
-++    (void) noecho();		/* don't echo input */
-++
-++    txt_y = base_y;
-++    txt_x = 0;
-++    wmove(txtwin, txt_y, txt_x);
-++
-++    if ((fp = fopen(argv[level], "r")) != 0) {
-++	while ((ch = fgetc(fp)) != EOF) {
-++	    if (waddch(txtwin, UChar(ch)) != OK) {
-++		break;
-++	    }
-++	}
-++	fclose(fp);
-++    } else {
-++	wprintw(txtwin, "Cannot open:\n%s", argv[1]);
-++    }
-++
-++    for (;;) {
-++	if (in_status) {
-++	    to_keyword(stswin, active);
-++
-++	    ch = wgetch(stswin);
-++	    show_opaque(stswin, txtwin, TRUE, active);
-++	    if (Quit(ch))
-++		break;
-++
-++	    switch (ch) {
-++	    case '\t':
-++		in_status = FALSE;
-++		break;
-++	    case KEY_DOWN:
-++	    case 'j':
-++		if (active < (int) SIZEOF(bool_funcs) - 1)
-++		    active++;
-++		else
-++		    beep();
-++		break;
-++	    case KEY_UP:
-++	    case 'k':
-++		if (active > 0)
-++		    active--;
-++		else
-++		    beep();
-++		break;
-++	    case ' ':
-++		bool_funcs[active].func(txtwin,
-++									 !bool_funcs[active].func(txtwin, -1));
-++		break;
-++	    default:
-++		beep();
-++		break;
-++	    }
-++	    show_opaque(stswin, txtwin, FALSE, in_status ? active : -1);
-++	} else {
-++	    ch = mvwgetch(txtwin, txt_y, txt_x);
-++	    show_opaque(stswin, txtwin, TRUE, -1);
-++	    if (Quit(ch))
-++		break;
-++
-++	    switch (ch) {
-++	    case '\t':
-++		in_status = TRUE;
-++		break;
-++	    case KEY_DOWN:
-++	    case 'j':
-++		if (txt_y < getmaxy(txtwin) - 1)
-++		    txt_y++;
-++		else
-++		    beep();
-++		break;
-++	    case KEY_UP:
-++	    case 'k':
-++		if (txt_y > base_y)
-++		    txt_y--;
-++		else
-++		    beep();
-++		break;
-++	    case KEY_LEFT:
-++	    case 'h':
-++		if (txt_x > 0)
-++		    txt_x--;
-++		else
-++		    beep();
-++		break;
-++	    case KEY_RIGHT:
-++	    case 'l':
-++		if (txt_x < getmaxx(txtwin) - 1)
-++		    txt_x++;
-++		else
-++		    beep();
-++		break;
-++	    case 'w':
-++		test_opaque(level + 1, argv, stswin);
-++		if (txtbox != 0) {
-++		    touchwin(txtbox);
-++		    wnoutrefresh(txtbox);
-++		} else {
-++		    touchwin(txtwin);
-++		    wnoutrefresh(txtwin);
-++		}
-++		break;
-++	    default:
-++		beep();
-++		napms(100);
-++		break;
-++	    }
-++
-++	    show_opaque(stswin, txtwin, FALSE, -1);
-++	}
-++    }
-++    if (level > 1) {
-++	delwin(txtwin);
-++	delwin(txtbox);
-++    }
-++    return TRUE;
-++}
-++
-++int
-++main(int argc, char *argv[])
-++{
-++    WINDOW *stsbox;
-++    WINDOW *stswin;
-++
-++    setlocale(LC_ALL, "");
-++
-++    if (argc < 2) {
-++	fprintf(stderr, "usage: %s file\n", argv[0]);
-++	return EXIT_FAILURE;
-++    }
-++
-++    initscr();
-++
-++    stsbox = derwin(stdscr, BASE_Y, COLS, 0, 0);
-++    box(stsbox, 0, 0);
-++    wnoutrefresh(stsbox);
-++
-++    stswin = derwin(stsbox, BASE_Y - 2, COLS - 2, 1, 1);
-++    keypad(stswin, TRUE);
-++
-++    test_opaque(1, argv, stswin);
-++
-++    endwin();
-++    ExitProgram(EXIT_SUCCESS);
-++}
-+Index: test/view.c
-+Prereq:  1.64 
-+--- ncurses-5.6/test/view.c	2006-05-20 15:37:03.000000000 +0000
-++++ ncurses-5.6-20071201/test/view.c	2007-07-21 17:41:55.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -50,7 +50,7 @@
-+  * scroll operation worked, and the refresh() code only had to do a
-+  * partial repaint.
-+  *
-+- * $Id: view.c,v 1.64 2006/05/20 15:37:03 tom Exp $
-++ * $Id: view.c,v 1.66 2007/07/21 17:41:55 tom Exp $
-+  */
-+ 
-+ #include <test.priv.h>
-+@@ -229,7 +229,7 @@
-+     (void) signal(SIGINT, finish);	/* arrange interrupts to terminate */
-+ #endif
-+ 
-+-    while ((i = getopt(argc, argv, "cin:rtT:")) != EOF) {
-++    while ((i = getopt(argc, argv, "cin:rtT:")) != -1) {
-+ 	switch (i) {
-+ 	case 'c':
-+ 	    try_color = TRUE;
-+@@ -374,7 +374,7 @@
-+ 		    lptr++;
-+ 		else
-+ 		    break;
-+-	    wscrl(stdscr, lptr - olptr);
-++	    scrl(lptr - olptr);
-+ 	    break;
-+ 
-+ 	case KEY_UP:
-+@@ -385,7 +385,7 @@
-+ 		    lptr--;
-+ 		else
-+ 		    break;
-+-	    wscrl(stdscr, lptr - olptr);
-++	    scrl(lptr - olptr);
-+ 	    break;
-+ 
-+ 	case 'h':
-+Index: test/worm.c
-+Prereq:  1.41 
-+--- ncurses-5.6/test/worm.c	2006-07-01 22:57:24.000000000 +0000
-++++ ncurses-5.6-20071201/test/worm.c	2007-09-29 17:35:57.000000000 +0000
-+@@ -1,5 +1,5 @@
-+ /****************************************************************************
-+- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-++ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-+  *                                                                          *
-+  * Permission is hereby granted, free of charge, to any person obtaining a  *
-+  * copy of this software and associated documentation files (the            *
-+@@ -61,11 +61,15 @@
-+   traces will be dumped.  The program stops and waits for one character of
-+   input at the beginning and end of the interval.
-+ 
-+-  $Id: worm.c,v 1.41 2006/07/01 22:57:24 tom Exp $
-++  $Id: worm.c,v 1.49 2007/09/29 17:35:57 tom Exp $
-+ */
-+ 
-+ #include <test.priv.h>
-+ 
-++#ifdef USE_PTHREADS
-++#include <pthread.h>
-++#endif
-++
-+ static chtype flavor[] =
-+ {
-+     'O', '*', '#', '$', '%', '0', '@',
-+@@ -77,17 +81,27 @@
-+ {
-+     -1, 0, 1, 1, 1, 0, -1, -1
-+ };
-+-static struct worm {
-+-    int orientation, head;
-+-    short *xpos, *ypos;
-+-} worm[40];
-++
-++typedef struct worm {
-++    int orientation;
-++    int head;
-++    short *xpos;
-++    short *ypos;
-++    chtype attrs;
-++#ifdef USE_PTHREADS
-++    pthread_t thread;
-++#endif
-++} WORM;
-++
-++static WORM worm[40];
-++static short **refs;
-+ 
-+ static const char *field;
-+ static int length = 16, number = 3;
-+ static chtype trail = ' ';
-+ 
-+ #ifdef TRACE
-+-static int generation, trace_start, trace_end, singlestep;
-++static int generation, trace_start, trace_end;
-+ #endif /* TRACE */
-+ /* *INDENT-OFF* */
-+ static const struct options {
-+@@ -200,15 +214,147 @@
-+     return ((float) r / 32768.);
-+ }
-+ 
-++static int
-++draw_worm(WINDOW *win, void *data)
-++{
-++    WORM *w = (WORM *) data;
-++    const struct options *op;
-++
-++    int x;
-++    int y;
-++    int h;
-++
-++    int bottom = LINES - 1;
-++    int last = COLS - 1;
-++
-++    bool done = FALSE;
-++
-++    if ((x = w->xpos[h = w->head]) < 0) {
-++	wmove(win, y = w->ypos[h] = bottom, x = w->xpos[h] = 0);
-++	waddch(win, w->attrs);
-++	refs[y][x]++;
-++    } else {
-++	y = w->ypos[h];
-++    }
-++
-++    if (x > last)
-++	x = last;
-++    if (y > bottom)
-++	y = bottom;
-++
-++    if (++h == length)
-++	h = 0;
-++
-++    if (w->xpos[w->head = h] >= 0) {
-++	int x1, y1;
-++	x1 = w->xpos[h];
-++	y1 = w->ypos[h];
-++	if (y1 < LINES
-++	    && x1 < COLS
-++	    && --refs[y1][x1] == 0) {
-++	    wmove(win, y1, x1);
-++	    waddch(win, trail);
-++	}
-++    }
-++
-++    op = &(x == 0
-++	   ? (y == 0
-++	      ? upleft
-++	      : (y == bottom
-++		 ? lowleft
-++		 : left))
-++	   : (x == last
-++	      ? (y == 0
-++		 ? upright
-++		 : (y == bottom
-++		    ? lowright
-++		    : right))
-++	      : (y == 0
-++		 ? upper
-++		 : (y == bottom
-++		    ? lower
-++		    : normal))))[w->orientation];
-++
-++    switch (op->nopts) {
-++    case 0:
-++	done = TRUE;
-++	break;
-++    case 1:
-++	w->orientation = op->opts[0];
-++	break;
-++    default:
-++	w->orientation = op->opts[(int) (ranf() * (float) op->nopts)];
-++	break;
-++    }
-++
-++    if (!done) {
-++	x += xinc[w->orientation];
-++	y += yinc[w->orientation];
-++	wmove(win, y, x);
-++
-++	if (y < 0)
-++	    y = 0;
-++	waddch(win, w->attrs);
-++
-++	w->ypos[h] = y;
-++	w->xpos[h] = x;
-++	refs[y][x]++;
-++    }
-++
-++    return done;
-++}
-++
-++#if !defined(NCURSES_VERSION_PATCH) || (NCURSES_VERSION_PATCH < 20070915)
-++static int
-++use_window(WINDOW *win, int (*func) (WINDOW *, void *), void *data)
-++{
-++    return func(win, data);
-++}
-++#endif
-++
-++#ifdef USE_PTHREADS
-++static void *
-++start_worm(void *arg)
-++{
-++    for (;;) {
-++	napms(20);
-++	use_window(stdscr, draw_worm, arg);
-++    }
-++    return NULL;
-++}
-++#endif
-++
-++static bool
-++draw_all_worms(void)
-++{
-++    bool done = FALSE;
-++    int n;
-++    struct worm *w;
-++
-++#ifdef USE_PTHREADS
-++    static bool first = TRUE;
-++    if (first) {
-++	first = FALSE;
-++	for (n = 0, w = &worm[0]; n < number; n++, w++) {
-++	    int rc;
-++	    rc = pthread_create(&(w->thread), NULL, start_worm, w);
-++	}
-++    }
-++#else
-++    for (n = 0, w = &worm[0]; n < number; n++, w++) {
-++	if (use_window(stdscr, draw_worm, w))
-++	    done = TRUE;
-++    }
-++#endif
-++    return done;
-++}
-++
-+ int
-+ main(int argc, char *argv[])
-+ {
-+-    short **ref;
-+     int x, y;
-+     int n;
-+     struct worm *w;
-+-    const struct options *op;
-+-    int h;
-+     short *ip;
-+     int last, bottom;
-+     bool done = FALSE;
-+@@ -244,9 +390,6 @@
-+ 	    trail = '.';
-+ 	    break;
-+ #ifdef TRACE
-+-	case 'S':
-+-	    singlestep = TRUE;
-+-	    break;
-+ 	case 'T':
-+ 	    trace_start = atoi(argv[++x]);
-+ 	    trace_end = atoi(argv[++x]);
-+@@ -297,21 +440,24 @@
-+     }
-+ #endif /* A_COLOR */
-+ 
-+-    ref = typeMalloc(short *, LINES);
-++    refs = typeMalloc(short *, LINES);
-+     for (y = 0; y < LINES; y++) {
-+-	ref[y] = typeMalloc(short, COLS);
-++	refs[y] = typeMalloc(short, COLS);
-+ 	for (x = 0; x < COLS; x++) {
-+-	    ref[y][x] = 0;
-++	    refs[y][x] = 0;
-+ 	}
-+     }
-+ 
-+ #ifdef BADCORNER
-+     /* if addressing the lower right corner doesn't work in your curses */
-+-    ref[bottom][last] = 1;
-++    refs[bottom][last] = 1;
-+ #endif /* BADCORNER */
-+ 
-+     for (n = number, w = &worm[0]; --n >= 0; w++) {
-+-	w->orientation = w->head = 0;
-++	w->attrs = flavor[n % SIZEOF(flavor)];
-++	w->orientation = 0;
-++	w->head = 0;
-++
-+ 	if (!(ip = typeMalloc(short, (length + 1)))) {
-+ 	    fprintf(stderr, "%s: out of memory\n", *argv);
-+ 	    ExitProgram(EXIT_FAILURE);
-+@@ -340,48 +486,43 @@
-+     }
-+     napms(10);
-+     refresh();
-+-#ifndef TRACE
-+     nodelay(stdscr, TRUE);
-+-#endif
-+ 
-+     while (!done) {
-+-#ifdef TRACE
-+-	if (trace_start || trace_end) {
-+-	    if (generation == trace_start) {
-+-		trace(TRACE_CALLS);
-+-		getch();
-+-	    } else if (generation == trace_end) {
-+-		trace(0);
-+-		getch();
-+-	    }
-+-
-+-	    if (singlestep && generation > trace_start && generation < trace_end)
-+-		getch();
-+-
-+-	    generation++;
-+-	}
-+-#else
-+ 	int ch;
-+ 
-+ 	if ((ch = getch()) > 0) {
-++#ifdef TRACE
-++	    if (trace_start || trace_end) {
-++		if (generation == trace_start) {
-++		    trace(TRACE_CALLS);
-++		    getch();
-++		} else if (generation == trace_end) {
-++		    trace(0);
-++		    getch();
-++		}
-++
-++		generation++;
-++	    }
-++#endif
-+ #ifdef KEY_RESIZE
-+ 	    if (ch == KEY_RESIZE) {
-+ 		if (last != COLS - 1) {
-+ 		    for (y = 0; y <= bottom; y++) {
-+-			ref[y] = typeRealloc(short, COLS, ref[y]);
-++			refs[y] = typeRealloc(short, COLS, refs[y]);
-+ 			for (x = last + 1; x < COLS; x++)
-+-			    ref[y][x] = 0;
-++			    refs[y][x] = 0;
-+ 		    }
-+ 		    last = COLS - 1;
-+ 		}
-+ 		if (bottom != LINES - 1) {
-+ 		    for (y = LINES; y <= bottom; y++)
-+-			free(ref[y]);
-+-		    ref = typeRealloc(short *, LINES, ref);
-++			free(refs[y]);
-++		    refs = typeRealloc(short *, LINES, refs);
-+ 		    for (y = bottom + 1; y < LINES; y++) {
-+-			ref[y] = typeMalloc(short, COLS);
-++			refs[y] = typeMalloc(short, COLS);
-+ 			for (x = 0; x < COLS; x++)
-+-			    ref[y][x] = 0;
-++			    refs[y][x] = 0;
-+ 		    }
-+ 		    bottom = LINES - 1;
-+ 		}
-+@@ -400,55 +541,8 @@
-+ 		nodelay(stdscr, TRUE);
-+ 	    }
-+ 	}
-+-#endif /* TRACE */
-+ 
-+-	for (n = 0, w = &worm[0]; n < number; n++, w++) {
-+-	    if ((x = w->xpos[h = w->head]) < 0) {
-+-		move(y = w->ypos[h] = bottom, x = w->xpos[h] = 0);
-+-		addch(flavor[n % SIZEOF(flavor)]);
-+-		ref[y][x]++;
-+-	    } else {
-+-		y = w->ypos[h];
-+-	    }
-+-	    if (x > last)
-+-		x = last;
-+-	    if (y > bottom)
-+-		y = bottom;
-+-	    if (++h == length)
-+-		h = 0;
-+-	    if (w->xpos[w->head = h] >= 0) {
-+-		int x1, y1;
-+-		x1 = w->xpos[h];
-+-		y1 = w->ypos[h];
-+-		if (y1 < LINES
-+-		    && x1 < COLS
-+-		    && --ref[y1][x1] == 0) {
-+-		    move(y1, x1);
-+-		    addch(trail);
-+-		}
-+-	    }
-+-	    op = &(x == 0 ? (y == 0 ? upleft : (y == bottom ? lowleft :
-+-						left)) :
-+-		   (x == last ? (y == 0 ? upright : (y == bottom ? lowright :
-+-						     right)) :
-+-		    (y == 0 ? upper : (y == bottom ? lower : normal))))[w->orientation];
-+-	    switch (op->nopts) {
-+-	    case 0:
-+-		done = TRUE;
-+-		continue;
-+-	    case 1:
-+-		w->orientation = op->opts[0];
-+-		break;
-+-	    default:
-+-		w->orientation = op->opts[(int) (ranf() * (float) op->nopts)];
-+-	    }
-+-	    move(y += yinc[w->orientation], x += xinc[w->orientation]);
-+-
-+-	    if (y < 0)
-+-		y = 0;
-+-	    addch(flavor[n % SIZEOF(flavor)]);
-+-	    ref[w->ypos[h] = y][w->xpos[h] = x]++;
-+-	}
-++	done = draw_all_worms();
-+ 	napms(10);
-+ 	refresh();
-+     }
-+@@ -456,9 +550,9 @@
-+     cleanup();
-+ #ifdef NO_LEAKS
-+     for (y = 0; y < LINES; y++) {
-+-	free(ref[y]);
-++	free(refs[y]);
-+     }
-+-    free(ref);
-++    free(refs);
-+     for (n = number, w = &worm[0]; --n >= 0; w++) {
-+ 	free(w->xpos);
-+ 	free(w->ypos);
-diff -Naur ncurses-5.6.orig/panel/Makefile.in ncurses-5.6/panel/Makefile.in
---- ncurses-5.6.orig/panel/Makefile.in	2006-10-14 16:40:36.000000000 -0400
-+++ ncurses-5.6/panel/Makefile.in	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
--# $Id: Makefile.in,v 1.47 2006/10/14 20:40:36 tom Exp $
-+# $Id: Makefile.in,v 1.52 2007/04/28 14:56:11 tom Exp $
- ##############################################################################
--# Copyright (c) 1998-2003,2006 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -27,7 +27,7 @@
- # authorization.                                                             #
- ##############################################################################
- #
--# Author: Thomas E. Dickey 1996-2002
-+# Author: Thomas E. Dickey 1996-on
- #
- # Makefile for panels source code.
- #
-@@ -92,7 +92,7 @@
- 
- CFLAGS_DEFAULT	= $(CFLAGS_@DFT_UPR_MODEL@)
- 
--LINK		= $(LIBTOOL_LINK) $(CC)
-+LINK		= $(LIBTOOL_LINK)
- LDFLAGS		= @LDFLAGS@ @LD_MODEL@ @LIBS@
- 
- SHLIB_DIRS	= -L../lib
-@@ -107,8 +107,6 @@
- 
- RANLIB		= @LIB_PREP@
- 
--IMPORT_LIB	= @IMPORT_LIB@
--SHARED_LIB	= @SHARED_LIB@
- LIBRARIES	= @LIBS_TO_MAKE@
- 
- LINT		= @LINT@
-@@ -127,7 +125,7 @@
- 
- $(DESTDIR)$(bindir) \
- $(DESTDIR)$(libdir) :
--	sh $(srcdir)/../mkinstalldirs $@
-+	sh $(srcdir)/../mkdirs.sh $@
- 
- # make a copy to simplify include-paths while still keeping panel's include
- # file in this directory.
-diff -Naur ncurses-5.6.orig/panel/headers ncurses-5.6/panel/headers
---- ncurses-5.6.orig/panel/headers	1998-02-11 07:14:01.000000000 -0500
-+++ ncurses-5.6/panel/headers	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- ##############################################################################
--# Copyright (c) 1998 Free Software Foundation, Inc.                          #
-+# Copyright (c) 1998,2006 Free Software Foundation, Inc.                     #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -29,3 +29,4 @@
- # Author: Thomas E. Dickey <dickey@clark.net> 1996
- #
- $(srcdir)/panel.h
-+# vile:makemode
-diff -Naur ncurses-5.6.orig/panel/modules ncurses-5.6/panel/modules
---- ncurses-5.6.orig/panel/modules	1998-02-11 07:14:02.000000000 -0500
-+++ ncurses-5.6/panel/modules	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,6 @@
-+# $Id: modules,v 1.9 2006/12/24 00:53:17 tom Exp $
- ##############################################################################
--# Copyright (c) 1998 Free Software Foundation, Inc.                          #
-+# Copyright (c) 1998,2006 Free Software Foundation, Inc.                     #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -26,7 +27,7 @@
- # authorization.                                                             #
- ##############################################################################
- #
--# Author: Thomas E. Dickey <dickey@clark.net> 1995,1997
-+# Author: Thomas E. Dickey	1995-on
- #
- 
- @ base
-@@ -47,3 +48,4 @@
- p_user		lib		$(srcdir)	$(PANEL_PRIV_H)
- p_win		lib		$(srcdir)	$(PANEL_PRIV_H)
- 
-+# vile:makemode
-diff -Naur ncurses-5.6.orig/progs/Makefile.in ncurses-5.6/progs/Makefile.in
---- ncurses-5.6.orig/progs/Makefile.in	2006-12-17 10:55:48.000000000 -0500
-+++ ncurses-5.6/progs/Makefile.in	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
--# $Id: Makefile.in,v 1.70 2006/12/17 15:55:48 tom Exp $
-+# $Id: Makefile.in,v 1.77 2007/10/13 22:25:53 tom Exp $
- ##############################################################################
--# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -98,9 +98,8 @@
- LOCAL_LIBDIR	= @top_builddir@/lib
- 
- LD		= @LD@
--LINK		= @LINK_PROGS@ $(LIBTOOL_LINK) $(CC)
--LDFLAGS		= @EXTRA_LDFLAGS@ \
--		@TINFO_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@
-+LINK		= @LINK_PROGS@ $(LIBTOOL_LINK)
-+LDFLAGS		= @EXTRA_LDFLAGS@ @LDFLAGS@
- 
- LDFLAGS_LIBTOOL	= $(LDFLAGS) $(CFLAGS_LIBTOOL)
- LDFLAGS_NORMAL	= $(LDFLAGS) $(CFLAGS_NORMAL)
-@@ -110,6 +109,12 @@
- 
- LDFLAGS_DEFAULT	= $(LDFLAGS_@DFT_UPR_MODEL@)
- 
-+LIBS_TIC	= @LDFLAGS_STATIC@ @TICS_ARGS@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
-+LDFLAGS_TIC	= $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TIC)
-+
-+LIBS_TINFO	= @LDFLAGS_STATIC@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
-+LDFLAGS_TINFO	= $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO)
-+
- LINT		= @LINT@
- LINT_OPTS	= @LINT_OPTS@
- LINT_LIBS	= -lncurses @LIBS@
-@@ -200,7 +205,7 @@
- 	-@rm -f $(DESTDIR)$(bindir)/$(actual_reset)
- 
- $(DESTDIR)$(bindir) :
--	sh $(srcdir)/../mkinstalldirs $@
-+	sh $(srcdir)/../mkdirs.sh $@
- 
- #
- # Utilities normally built by make all start here
-@@ -211,40 +216,38 @@
- 	$(MODEL)/dump_entry$o
- 
- tic$x: $(DEPS_TIC) $(DEPS_CURSES) transform.h
--	@ECHO_LINK@ $(LINK) $(DEPS_TIC) $(LDFLAGS_DEFAULT) -o $@
-+	@ECHO_LINK@ $(LINK) $(DEPS_TIC) $(LDFLAGS_TIC) -o $@
- 
- DEPS_TOE = \
--	$(MODEL)/toe$o \
--	$(MODEL)/dump_entry$o
-+	$(MODEL)/toe$o
- 
- toe$x: $(DEPS_TOE) $(DEPS_CURSES)
--	@ECHO_LINK@ $(LINK) $(DEPS_TOE) $(LDFLAGS_DEFAULT) -o $@
-+	@ECHO_LINK@ $(LINK) $(DEPS_TOE) $(LDFLAGS_TIC) -o $@
- 
- DEPS_CLEAR = \
- 	$(MODEL)/clear$o
- 
- clear$x: $(DEPS_CLEAR) $(DEPS_CURSES)
--	@ECHO_LINK@ $(LINK) $(DEPS_CLEAR) $(LDFLAGS_DEFAULT) -o $@
-+	@ECHO_LINK@ $(LINK) $(DEPS_CLEAR) $(LDFLAGS_TINFO) -o $@
- 
- DEPS_TPUT = \
- 	$(MODEL)/tput$o
- 
- tput$x: $(DEPS_TPUT) $(DEPS_CURSES) transform.h
--	@ECHO_LINK@ $(LINK) $(DEPS_TPUT) $(LDFLAGS_DEFAULT) -o $@
-+	@ECHO_LINK@ $(LINK) $(DEPS_TPUT) $(LDFLAGS_TINFO) -o $@
- 
- DEPS_INFOCMP = \
- 	$(MODEL)/infocmp$o \
- 	$(MODEL)/dump_entry$o
- 
- infocmp$x: $(DEPS_INFOCMP) $(DEPS_CURSES)
--	@ECHO_LINK@ $(LINK) $(DEPS_INFOCMP) $(LDFLAGS_DEFAULT) -o $@
-+	@ECHO_LINK@ $(LINK) $(DEPS_INFOCMP) $(LDFLAGS_TIC) -o $@
- 
- DEPS_TSET = \
--	$(MODEL)/tset$o \
--	$(MODEL)/dump_entry$o
-+	$(MODEL)/tset$o
- 
- tset$x: $(DEPS_TSET) $(DEPS_CURSES) transform.h
--	@ECHO_LINK@ $(LINK) $(DEPS_TSET) $(LDFLAGS_DEFAULT) -o $@
-+	@ECHO_LINK@ $(LINK) $(DEPS_TSET) $(LDFLAGS_TINFO) -o $@
- 
- termsort.c: $(srcdir)/MKtermsort.sh
- 	sh $(srcdir)/MKtermsort.sh $(AWK) $(srcdir)/../include/@TERMINFO_CAPS@ >$@
-diff -Naur ncurses-5.6.orig/progs/clear.c ncurses-5.6/progs/clear.c
---- ncurses-5.6.orig/progs/clear.c	2006-05-20 13:47:47.000000000 -0400
-+++ ncurses-5.6/progs/clear.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -36,9 +36,10 @@
-  * clear.c --  clears the terminal's screen
-  */
- 
-+#define USE_LIBTINFO
- #include <progs.priv.h>
- 
--MODULE_ID("$Id: clear.c,v 1.10 2006/05/20 17:47:47 tom Exp $")
-+MODULE_ID("$Id: clear.c,v 1.11 2007/10/13 22:16:02 tom Exp $")
- 
- static int
- putch(int c)
-diff -Naur ncurses-5.6.orig/progs/dump_entry.c ncurses-5.6/progs/dump_entry.c
---- ncurses-5.6.orig/progs/dump_entry.c	2006-09-30 16:18:15.000000000 -0400
-+++ ncurses-5.6/progs/dump_entry.c	2008-06-18 06:49:50.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -39,7 +39,7 @@
- #include "termsort.c"		/* this C file is generated */
- #include <parametrized.h>	/* so is this */
- 
--MODULE_ID("$Id: dump_entry.c,v 1.79 2006/09/30 20:18:15 tom Exp $")
-+MODULE_ID("$Id: dump_entry.c,v 1.82 2008/04/19 22:27:04 tom Exp $")
- 
- #define INDENT			8
- #define DISCARD(string) string = ABSENT_STRING
-@@ -352,14 +352,17 @@
- 	}
- 	break;
- 
-+#define is_termcap(type) (idx < (int) sizeof(type##_from_termcap) && \
-+			  type##_from_termcap[idx])
-+
-     case V_BSD:		/* BSD */
- 	switch (type) {
- 	case BOOLEAN:
--	    return bool_from_termcap[idx];
-+	    return is_termcap(bool);
- 	case NUMBER:
--	    return num_from_termcap[idx];
-+	    return is_termcap(num);
- 	case STRING:
--	    return str_from_termcap[idx];
-+	    return is_termcap(str);
- 	}
- 	break;
-     }
-@@ -536,6 +539,10 @@
- 	    params = FALSE;
- 	    percent = FALSE;
- 	    break;
-+	case ' ':
-+	    strncpy_DYN(&tmpbuf, "\\s", 2);
-+	    ++src;
-+	    continue;
- 	default:
- 	    percent = FALSE;
- 	    break;
-@@ -788,11 +795,11 @@
-      * Much more work should be done on this to support dumping termcaps.
-      */
-     if (tversion == V_HPUX) {
--	if (memory_lock) {
-+	if (VALID_STRING(memory_lock)) {
- 	    (void) sprintf(buffer, "meml=%s", memory_lock);
- 	    WRAP_CONCAT;
- 	}
--	if (memory_unlock) {
-+	if (VALID_STRING(memory_unlock)) {
- 	    (void) sprintf(buffer, "memu=%s", memory_unlock);
- 	    WRAP_CONCAT;
- 	}
-@@ -1223,7 +1230,7 @@
- 	bool fix_needed = FALSE;
- 
- 	for (n = 0, source = 0; acs_chars[n] != 0; n++) {
--	    target = acs_chars[n];
-+	    target = UChar(acs_chars[n]);
- 	    if (source >= target) {
- 		fix_needed = TRUE;
- 		break;
-@@ -1235,7 +1242,7 @@
- 	if (fix_needed) {
- 	    memset(mapped, 0, sizeof(mapped));
- 	    for (n = 0; acs_chars[n] != 0; n++) {
--		source = acs_chars[n];
-+		source = UChar(acs_chars[n]);
- 		if ((target = (unsigned char) acs_chars[n + 1]) != 0) {
- 		    mapped[source] = target;
- 		    n++;
-diff -Naur ncurses-5.6.orig/progs/infocmp.c ncurses-5.6/progs/infocmp.c
---- ncurses-5.6.orig/progs/infocmp.c	2006-08-19 17:20:37.000000000 -0400
-+++ ncurses-5.6/progs/infocmp.c	2008-06-18 06:49:46.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -35,18 +35,18 @@
- /*
-  *	infocmp.c -- decompile an entry, or compare two entries
-  *		written by Eric S. Raymond
-+ *		and Thomas E Dickey
-  */
- 
- #include <progs.priv.h>
- 
- #include <dump_entry.h>
- 
--MODULE_ID("$Id: infocmp.c,v 1.85 2006/08/19 21:20:37 tom Exp $")
-+MODULE_ID("$Id: infocmp.c,v 1.96 2008/01/19 21:08:07 tom Exp $")
- 
- #define L_CURL "{"
- #define R_CURL "}"
- 
--#define MAXTERMS	32	/* max # terminal arguments we can handle */
- #define MAX_STRING	1024	/* maximum formatted string */
- 
- const char *_nc_progname = "infocmp";
-@@ -60,8 +60,7 @@
-  *
-  ***************************************************************************/
- 
--static char *tname[MAXTERMS];	/* terminal type names */
--static ENTRY entries[MAXTERMS];	/* terminfo entries */
-+static ENTRY *entries;		/* terminfo entries */
- static int termcount;		/* count of terminal entries */
- 
- static bool limited = TRUE;	/* "-r" option is not set */
-@@ -96,7 +95,8 @@
-     while (termcount-- > 0)
- 	_nc_free_termtype(&entries[termcount].tterm);
-     _nc_leaks_dump_entry();
--    _nc_free_and_exit(code);
-+    free(entries);
-+    _nc_free_tic(code);
- }
- #endif
- 
-@@ -932,7 +932,8 @@
- 		case C_DIFFERENCE:
- 		    if (itrace)
- 			(void) fprintf(stderr,
--				       "infocmp: dumping differences\n");
-+				       "%s: dumping differences\n",
-+				       _nc_progname);
- 		    (void) printf("comparing %s to %s.\n", name1, name2);
- 		    compare_entry(compare_predicate, &entries->tterm, quiet);
- 		    break;
-@@ -940,7 +941,8 @@
- 		case C_COMMON:
- 		    if (itrace)
- 			(void) fprintf(stderr,
--				       "infocmp: dumping common capabilities\n");
-+				       "%s: dumping common capabilities\n",
-+				       _nc_progname);
- 		    (void) printf("comparing %s to %s.\n", name1, name2);
- 		    compare_entry(compare_predicate, &entries->tterm, quiet);
- 		    break;
-@@ -948,7 +950,8 @@
- 		case C_NAND:
- 		    if (itrace)
- 			(void) fprintf(stderr,
--				       "infocmp: dumping differences\n");
-+				       "%s: dumping differences\n",
-+				       _nc_progname);
- 		    (void) printf("comparing %s to %s.\n", name1, name2);
- 		    compare_entry(compare_predicate, &entries->tterm, quiet);
- 		    break;
-@@ -1083,7 +1086,6 @@
- 	    }
- 	    *tp++ = '"';
- 	    *tp = '\0';
--	    size += (strlen(term->Strings[n]) + 1);
- 	    (void) printf("static char %-20s[] = %s;\n",
- 			  string_variable(ExtStrname(term, n, strnames)), buf);
- 	}
-@@ -1213,6 +1215,8 @@
- 		  NUM_STRINGS(term) - STRCOUNT);
- 
-     (void) printf("#endif /* NCURSES_XNAMES */\n");
-+#else
-+    (void) term;
- #endif /* NCURSES_XNAMES */
-     (void) printf("\t%s\n", R_CURL);
- }
-@@ -1237,7 +1241,8 @@
- 
-     if ((terminal = getenv("TERM")) == 0) {
- 	(void) fprintf(stderr,
--		       "infocmp: environment variable TERM not set\n");
-+		       "%s: environment variable TERM not set\n",
-+		       _nc_progname);
- 	exit(EXIT_FAILURE);
-     }
-     return terminal;
-@@ -1252,10 +1257,15 @@
- int
- main(int argc, char *argv[])
- {
--    char *firstdir, *restdir;
-     /* Avoid "local data >32k" error with mwcc */
-     /* Also avoid overflowing smaller stacks on systems like AmigaOS */
--    path *tfile = (path *) malloc(sizeof(path) * MAXTERMS);
-+    path *tfile = 0;
-+    char **tname = 0;
-+    int maxterms;
-+
-+    char **myargv;
-+
-+    char *firstdir, *restdir;
-     int c, i, len;
-     bool formatted = FALSE;
-     bool filecompare = FALSE;
-@@ -1270,9 +1280,16 @@
-     use_extended_names(FALSE);
- #endif
- 
-+    _nc_progname = _nc_rootname(argv[0]);
-+
-+    /* make sure we have enough space to add two terminal entries */
-+    myargv = typeCalloc(char *, argc + 3);
-+    memcpy(myargv, argv, sizeof(char *) * argc);
-+    argv = myargv;
-+
-     while ((c = getopt(argc,
- 		       argv,
--		       "1A:aB:CcdEeFfGgIiLlnpqR:rs:TtUuVv:w:x")) != EOF) {
-+		       "1A:aB:CcdEeFfGgIiLlnpqR:rs:TtUuVv:w:x")) != -1) {
- 	switch (c) {
- 	case '1':
- 	    mwidth = 0;
-@@ -1373,7 +1390,6 @@
- 
- 	case 'r':
- 	    tversion = 0;
--	    limited = FALSE;
- 	    break;
- 
- 	case 's':
-@@ -1387,7 +1403,8 @@
- 		sortmode = S_TERMCAP;
- 	    else {
- 		(void) fprintf(stderr,
--			       "infocmp: unknown sort mode\n");
-+			       "%s: unknown sort mode\n",
-+			       _nc_progname);
- 		ExitProgram(EXIT_FAILURE);
- 	    }
- 	    break;
-@@ -1435,6 +1452,18 @@
- 	}
-     }
- 
-+    maxterms = (argc + 2 - optind);
-+    tfile = typeMalloc(path, maxterms);
-+    tname = typeCalloc(char *, maxterms);
-+    entries = typeCalloc(ENTRY, maxterms);
-+
-+    if (tfile == 0
-+	|| tname == 0
-+	|| entries == 0) {
-+	fprintf(stderr, "%s: not enough memory\n", _nc_progname);
-+	ExitProgram(EXIT_FAILURE);
-+    }
-+
-     /* by default, sort by terminfo name */
-     if (sortmode == S_DEFAULT)
- 	sortmode = S_TERMINFO;
-@@ -1458,53 +1487,56 @@
- 	/* grab the entries */
- 	termcount = 0;
- 	for (; optind < argc; optind++) {
--	    if (termcount >= MAXTERMS) {
--		(void) fprintf(stderr,
--			       "infocmp: too many terminal type arguments\n");
--		ExitProgram(EXIT_FAILURE);
--	    } else {
--		const char *directory = termcount ? restdir : firstdir;
--		int status;
-+	    const char *directory = termcount ? restdir : firstdir;
-+	    int status;
- 
--		tname[termcount] = argv[optind];
-+	    tname[termcount] = argv[optind];
- 
--		if (directory) {
-+	    if (directory) {
- #if USE_DATABASE
--		    (void) sprintf(tfile[termcount], "%s/%c/%s",
--				   directory,
--				   *argv[optind], argv[optind]);
--		    if (itrace)
--			(void) fprintf(stderr,
--				       "infocmp: reading entry %s from file %s\n",
--				       argv[optind], tfile[termcount]);
--
--		    status = _nc_read_file_entry(tfile[termcount],
--						 &entries[termcount].tterm);
-+#if MIXEDCASE_FILENAMES
-+#define LEAF_FMT "%c"
- #else
--		    (void) fprintf(stderr, "terminfo files not supported\n");
--		    ExitProgram(EXIT_FAILURE);
-+#define LEAF_FMT "%02x"
- #endif
--		} else {
--		    if (itrace)
--			(void) fprintf(stderr,
--				       "infocmp: reading entry %s from database\n",
--				       tname[termcount]);
--
--		    status = _nc_read_entry(tname[termcount],
--					    tfile[termcount],
--					    &entries[termcount].tterm);
--		    directory = TERMINFO;	/* for error message */
--		}
-+		(void) sprintf(tfile[termcount], "%s/" LEAF_FMT "/%s",
-+			       directory,
-+			       UChar(*argv[optind]), argv[optind]);
-+		if (itrace)
-+		    (void) fprintf(stderr,
-+				   "%s: reading entry %s from file %s\n",
-+				   _nc_progname,
-+				   argv[optind], tfile[termcount]);
- 
--		if (status <= 0) {
-+		status = _nc_read_file_entry(tfile[termcount],
-+					     &entries[termcount].tterm);
-+#else
-+		(void) fprintf(stderr, "%s: terminfo files not supported\n",
-+			       _nc_progname);
-+		ExitProgram(EXIT_FAILURE);
-+#endif
-+	    } else {
-+		if (itrace)
- 		    (void) fprintf(stderr,
--				   "infocmp: couldn't open terminfo file %s.\n",
--				   tfile[termcount]);
--		    ExitProgram(EXIT_FAILURE);
--		}
--		repair_acsc(&entries[termcount].tterm);
--		termcount++;
-+				   "%s: reading entry %s from database\n",
-+				   _nc_progname,
-+				   tname[termcount]);
-+
-+		status = _nc_read_entry(tname[termcount],
-+					tfile[termcount],
-+					&entries[termcount].tterm);
-+		directory = TERMINFO;	/* for error message */
-+	    }
-+
-+	    if (status <= 0) {
-+		(void) fprintf(stderr,
-+			       "%s: couldn't open terminfo file %s.\n",
-+			       _nc_progname,
-+			       tfile[termcount]);
-+		ExitProgram(EXIT_FAILURE);
- 	    }
-+	    repair_acsc(&entries[termcount].tterm);
-+	    termcount++;
- 	}
- 
- #if NCURSES_XNAMES
-@@ -1542,7 +1574,8 @@
- 	    case C_DEFAULT:
- 		if (itrace)
- 		    (void) fprintf(stderr,
--				   "infocmp: about to dump %s\n",
-+				   "%s: about to dump %s\n",
-+				   _nc_progname,
- 				   tname[0]);
- 		(void) printf("#\tReconstructed via infocmp from file: %s\n",
- 			      tfile[0]);
-@@ -1553,12 +1586,12 @@
- 			   NULL);
- 		len = show_entry();
- 		if (itrace)
--		    (void) fprintf(stderr, "infocmp: length %d\n", len);
-+		    (void) fprintf(stderr, "%s: length %d\n", _nc_progname, len);
- 		break;
- 
- 	    case C_DIFFERENCE:
- 		if (itrace)
--		    (void) fprintf(stderr, "infocmp: dumping differences\n");
-+		    (void) fprintf(stderr, "%s: dumping differences\n", _nc_progname);
- 		(void) printf("comparing %s to %s.\n", tname[0], tname[1]);
- 		compare_entry(compare_predicate, &entries->tterm, quiet);
- 		break;
-@@ -1566,7 +1599,8 @@
- 	    case C_COMMON:
- 		if (itrace)
- 		    (void) fprintf(stderr,
--				   "infocmp: dumping common capabilities\n");
-+				   "%s: dumping common capabilities\n",
-+				   _nc_progname);
- 		(void) printf("comparing %s to %s.\n", tname[0], tname[1]);
- 		compare_entry(compare_predicate, &entries->tterm, quiet);
- 		break;
-@@ -1574,14 +1608,15 @@
- 	    case C_NAND:
- 		if (itrace)
- 		    (void) fprintf(stderr,
--				   "infocmp: dumping differences\n");
-+				   "%s: dumping differences\n",
-+				   _nc_progname);
- 		(void) printf("comparing %s to %s.\n", tname[0], tname[1]);
- 		compare_entry(compare_predicate, &entries->tterm, quiet);
- 		break;
- 
- 	    case C_USEALL:
- 		if (itrace)
--		    (void) fprintf(stderr, "infocmp: dumping use entry\n");
-+		    (void) fprintf(stderr, "%s: dumping use entry\n", _nc_progname);
- 		dump_entry(&entries[0].tterm,
- 			   suppress_untranslatable,
- 			   limited,
-@@ -1592,7 +1627,7 @@
- 					  || outform == F_TCONVERR));
- 		len = show_entry();
- 		if (itrace)
--		    (void) fprintf(stderr, "infocmp: length %d\n", len);
-+		    (void) fprintf(stderr, "%s: length %d\n", _nc_progname, len);
- 		break;
- 	    }
- 	}
-@@ -1606,7 +1641,11 @@
-     else
- 	file_comparison(argc - optind, argv + optind);
- 
-+#if NO_LEAKS
-+    free(myargv);
-     free(tfile);
-+    free(tname);
-+#endif
-     ExitProgram(EXIT_SUCCESS);
- }
- 
-diff -Naur ncurses-5.6.orig/progs/modules ncurses-5.6/progs/modules
---- ncurses-5.6.orig/progs/modules	2005-09-24 20:54:22.000000000 -0400
-+++ ncurses-5.6/progs/modules	2008-06-18 06:49:44.000000000 -0400
-@@ -1,7 +1,7 @@
--# $Id: modules,v 1.12 2005/09/25 00:54:22 tom Exp $
-+# $Id: modules,v 1.13 2006/12/24 00:53:21 tom Exp $
- # Program modules (some are in ncurses lib!)
- ##############################################################################
--# Copyright (c) 1998-2000,2005 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -28,7 +28,7 @@
- # authorization.                                                             #
- ##############################################################################
- #
--# Author: Thomas E. Dickey <dickey@clark.net> 1995,1997
-+# Author: Thomas E. Dickey	1995-on
- #
- 
- @ base
-@@ -39,3 +39,5 @@
- infocmp		progs		$(srcdir)	$(HEADER_DEPS)             $(srcdir)/dump_entry.h
- tput		progs		$(srcdir)	$(HEADER_DEPS) transform.h termsort.c
- tset		progs		$(srcdir)	$(HEADER_DEPS) transform.h $(srcdir)/dump_entry.h ../include/termcap.h
-+
-+# vile:makemode
-diff -Naur ncurses-5.6.orig/progs/progs.priv.h ncurses-5.6/progs/progs.priv.h
---- ncurses-5.6.orig/progs/progs.priv.h	2006-11-25 19:28:01.000000000 -0500
-+++ ncurses-5.6/progs/progs.priv.h	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -30,7 +30,7 @@
-  *  Author: Thomas E. Dickey                    1997-on                     *
-  ****************************************************************************/
- /*
-- * $Id: progs.priv.h,v 1.30 2006/11/26 00:28:01 tom Exp $
-+ * $Id: progs.priv.h,v 1.33 2007/10/13 20:33:53 tom Exp $
-  *
-  *	progs.priv.h
-  *
-@@ -110,7 +110,16 @@
- #include <term_entry.h>
- #include <tic.h>
- #include <nc_tparm.h>
-+
- #include <nc_alloc.h>
-+#if HAVE_NC_FREEALL
-+#undef ExitProgram
-+#ifdef USE_LIBTINFO
-+#define ExitProgram(code) _nc_free_tinfo(code)
-+#else
-+#define ExitProgram(code) _nc_free_tic(code)
-+#endif
-+#endif
- 
- /* usually in <unistd.h> */
- #ifndef STDOUT_FILENO
-diff -Naur ncurses-5.6.orig/progs/tic.c ncurses-5.6/progs/tic.c
---- ncurses-5.6.orig/progs/tic.c	2006-12-02 17:13:17.000000000 -0500
-+++ ncurses-5.6/progs/tic.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -44,7 +44,7 @@
- #include <dump_entry.h>
- #include <transform.h>
- 
--MODULE_ID("$Id: tic.c,v 1.131 2006/12/02 22:13:17 tom Exp $")
-+MODULE_ID("$Id: tic.c,v 1.133 2007/07/21 17:45:59 tom Exp $")
- 
- const char *_nc_progname = "tic";
- 
-@@ -353,11 +353,24 @@
-     return fp;
- }
- 
-+#if NO_LEAKS
-+static void
-+free_namelist(char **src)
-+{
-+    if (src != 0) {
-+	int n;
-+	for (n = 0; src[n] != 0; ++n)
-+	    free(src[n]);
-+	free(src);
-+    }
-+}
-+#endif
-+
- /* Parse the "-e" option-value into a list of names */
--static const char **
-+static char **
- make_namelist(char *src)
- {
--    const char **dst = 0;
-+    char **dst = 0;
- 
-     char *s, *base;
-     unsigned pass, n, nn;
-@@ -374,11 +387,13 @@
- 		if ((s = stripped(buffer)) != 0) {
- 		    if (dst != 0)
- 			dst[nn] = s;
-+		    else
-+			free(s);
- 		    nn++;
- 		}
- 	    }
- 	    if (pass == 1) {
--		dst = typeCalloc(const char *, nn + 1);
-+		dst = typeCalloc(char *, nn + 1);
- 		rewind(fp);
- 	    }
- 	}
-@@ -401,10 +416,10 @@
- 		    break;
- 	    }
- 	    if (pass == 1)
--		dst = typeCalloc(const char *, nn + 1);
-+		dst = typeCalloc(char *, nn + 1);
- 	}
-     }
--    if (showsummary) {
-+    if (showsummary && (dst != 0)) {
- 	fprintf(log_fp, "Entries that will be compiled:\n");
- 	for (n = 0; dst[n] != 0; n++)
- 	    fprintf(log_fp, "%u:%s\n", n + 1, dst[n]);
-@@ -413,7 +428,7 @@
- }
- 
- static bool
--matches(const char **needle, const char *haystack)
-+matches(char **needle, const char *haystack)
- /* does entry in needle list match |-separated field in haystack? */
- {
-     bool code = FALSE;
-@@ -468,7 +483,7 @@
-     bool limited = TRUE;
-     char *tversion = (char *) NULL;
-     const char *source_file = "terminfo";
--    const char **namelst = 0;
-+    char **namelst = 0;
-     char *outdir = (char *) NULL;
-     bool check_only = FALSE;
-     bool suppress_untranslatable = FALSE;
-@@ -495,7 +510,7 @@
-      * be optional.
-      */
-     while ((this_opt = getopt(argc, argv,
--			      "0123456789CILNR:TUVace:fGgo:rstvwx")) != EOF) {
-+			      "0123456789CILNR:TUVace:fGgo:rstvwx")) != -1) {
- 	if (isdigit(this_opt)) {
- 	    switch (last_opt) {
- 	    case 'v':
-@@ -784,6 +799,9 @@
- 	else
- 	    fprintf(log_fp, "No entries written\n");
-     }
-+#if NO_LEAKS
-+    free_namelist(namelst);
-+#endif
-     cleanup();
-     ExitProgram(EXIT_SUCCESS);
- }
-diff -Naur ncurses-5.6.orig/progs/toe.c ncurses-5.6/progs/toe.c
---- ncurses-5.6.orig/progs/toe.c	2006-08-19 14:18:09.000000000 -0400
-+++ ncurses-5.6/progs/toe.c	2008-06-18 06:49:45.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -40,13 +40,11 @@
- 
- #include <sys/stat.h>
- 
--#include <dump_entry.h>
--
- #if USE_HASHED_DB
- #include <hashed_db.h>
- #endif
- 
--MODULE_ID("$Id: toe.c,v 1.41 2006/08/19 18:18:09 tom Exp $")
-+MODULE_ID("$Id: toe.c,v 1.48 2008/01/05 20:41:26 tom Exp $")
- 
- #define isDotname(name) (!strcmp(name, ".") || !strcmp(name, ".."))
- 
-@@ -59,8 +57,7 @@
- ExitProgram(int code)
- {
-     _nc_free_entries(_nc_head);
--    _nc_leaks_dump_entry();
--    _nc_free_and_exit(code);
-+    _nc_free_tic(code);
- }
- #endif
- 
-@@ -319,6 +316,7 @@
-     bool direct_dependencies = FALSE;
-     bool invert_dependencies = FALSE;
-     bool header = FALSE;
-+    char *report_file = 0;
-     int i;
-     int code;
-     int this_opt, last_opt = '?';
-@@ -326,7 +324,7 @@
- 
-     _nc_progname = _nc_rootname(argv[0]);
- 
--    while ((this_opt = getopt(argc, argv, "0123456789ahuvUV")) != EOF) {
-+    while ((this_opt = getopt(argc, argv, "0123456789ahu:vU:V")) != -1) {
- 	/* handle optional parameter */
- 	if (isdigit(this_opt)) {
- 	    switch (last_opt) {
-@@ -352,12 +350,14 @@
- 	    break;
- 	case 'u':
- 	    direct_dependencies = TRUE;
-+	    report_file = optarg;
- 	    break;
- 	case 'v':
- 	    v_opt = 1;
- 	    break;
- 	case 'U':
- 	    invert_dependencies = TRUE;
-+	    report_file = optarg;
- 	    break;
- 	case 'V':
- 	    puts(curses_version());
-@@ -368,15 +368,15 @@
-     }
-     set_trace_level(v_opt);
- 
--    if (direct_dependencies || invert_dependencies) {
--	if (freopen(argv[optind], "r", stdin) == 0) {
-+    if (report_file != 0) {
-+	if (freopen(report_file, "r", stdin) == 0) {
- 	    (void) fflush(stdout);
--	    fprintf(stderr, "%s: can't open %s\n", _nc_progname, argv[optind]);
-+	    fprintf(stderr, "%s: can't open %s\n", _nc_progname, report_file);
- 	    ExitProgram(EXIT_FAILURE);
- 	}
- 
- 	/* parse entries out of the source file */
--	_nc_set_source(argv[optind]);
-+	_nc_set_source(report_file);
- 	_nc_read_entry_source(stdin, 0, FALSE, FALSE, NULLHOOK);
-     }
- 
-diff -Naur ncurses-5.6.orig/progs/tput.c ncurses-5.6/progs/tput.c
---- ncurses-5.6.orig/progs/tput.c	2006-11-25 19:27:47.000000000 -0500
-+++ ncurses-5.6/progs/tput.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -38,6 +38,7 @@
-  * Ross Ridge's mytinfo package.
-  */
- 
-+#define USE_LIBTINFO
- #include <progs.priv.h>
- 
- #if !PURE_TERMINFO
-@@ -45,7 +46,7 @@
- #endif
- #include <transform.h>
- 
--MODULE_ID("$Id: tput.c,v 1.38 2006/11/26 00:27:47 tom Exp $")
-+MODULE_ID("$Id: tput.c,v 1.41 2007/10/13 20:34:16 tom Exp $")
- 
- #define PUTS(s)		fputs(s, stdout)
- #define PUTCHAR(c)	putchar(c)
-@@ -325,6 +326,7 @@
- 	    case Num_Str_Str:
- 		s = TPARM_3(s, numbers[1], strings[2], strings[3]);
- 		break;
-+	    case Numbers:
- 	    default:
- 		(void) _nc_tparm_analyze(s, p_is_s, &popcount);
- #define myParam(n) (p_is_s[n - 1] != 0 ? ((long) strings[n]) : numbers[n])
-@@ -363,7 +365,7 @@
- 
-     term = getenv("TERM");
- 
--    while ((c = getopt(argc, argv, "ST:V")) != EOF) {
-+    while ((c = getopt(argc, argv, "ST:V")) != -1) {
- 	switch (c) {
- 	case 'S':
- 	    cmdline = FALSE;
-diff -Naur ncurses-5.6.orig/progs/tset.c ncurses-5.6/progs/tset.c
---- ncurses-5.6.orig/progs/tset.c	2006-09-16 13:51:10.000000000 -0400
-+++ ncurses-5.6/progs/tset.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -73,6 +73,7 @@
-  * SUCH DAMAGE.
-  */
- 
-+#define USE_LIBTINFO
- #define __INTERNAL_CAPS_VISIBLE	/* we need to see has_hardware_tabs */
- #include <progs.priv.h>
- 
-@@ -103,7 +104,7 @@
- #include <dump_entry.h>
- #include <transform.h>
- 
--MODULE_ID("$Id: tset.c,v 1.67 2006/09/16 17:51:10 tom Exp $")
-+MODULE_ID("$Id: tset.c,v 1.70 2007/10/13 22:22:04 tom Exp $")
- 
- extern char **environ;
- 
-@@ -777,7 +778,22 @@
- 		      | OFDEL
- #endif
- #ifdef NLDLY
--		      | NLDLY | CRDLY | TABDLY | BSDLY | VTDLY | FFDLY
-+		      | NLDLY
-+#endif
-+#ifdef CRDLY 
-+		      | CRDLY
-+#endif
-+#ifdef TABDLY 
-+		      | TABDLY
-+#endif
-+#ifdef BSDLY 
-+		      | BSDLY
-+#endif
-+#ifdef VTDLY 
-+		      | VTDLY
-+#endif
-+#ifdef FFDLY
-+		      | FFDLY
- #endif
- 	);
- 
-@@ -1129,7 +1145,7 @@
- 
-     obsolete(argv);
-     noinit = noset = quiet = Sflag = sflag = showterm = 0;
--    while ((ch = getopt(argc, argv, "a:cd:e:Ii:k:m:np:qQSrsVw")) != EOF) {
-+    while ((ch = getopt(argc, argv, "a:cd:e:Ii:k:m:np:qQSrsVw")) != -1) {
- 	switch (ch) {
- 	case 'c':		/* set control-chars */
- 	    opt_c = TRUE;
-diff -Naur ncurses-5.6.orig/tack/COPYING ncurses-5.6/tack/COPYING
---- ncurses-5.6.orig/tack/COPYING	2005-09-17 15:46:56.000000000 -0400
-+++ ncurses-5.6/tack/COPYING	1969-12-31 19:00:00.000000000 -0500
-@@ -1,340 +0,0 @@
--		    GNU GENERAL PUBLIC LICENSE
--		       Version 2, June 1991
--
-- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
--                 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-- Everyone is permitted to copy and distribute verbatim copies
-- of this license document, but changing it is not allowed.
--
--			    Preamble
--
--  The licenses for most software are designed to take away your
--freedom to share and change it.  By contrast, the GNU General Public
--License is intended to guarantee your freedom to share and change free
--software--to make sure the software is free for all its users.  This
--General Public License applies to most of the Free Software
--Foundation's software and to any other program whose authors commit to
--using it.  (Some other Free Software Foundation software is covered by
--the GNU Library General Public License instead.)  You can apply it to
--your programs, too.
--
--  When we speak of free software, we are referring to freedom, not
--price.  Our General Public Licenses are designed to make sure that you
--have the freedom to distribute copies of free software (and charge for
--this service if you wish), that you receive source code or can get it
--if you want it, that you can change the software or use pieces of it
--in new free programs; and that you know you can do these things.
--
--  To protect your rights, we need to make restrictions that forbid
--anyone to deny you these rights or to ask you to surrender the rights.
--These restrictions translate to certain responsibilities for you if you
--distribute copies of the software, or if you modify it.
--
--  For example, if you distribute copies of such a program, whether
--gratis or for a fee, you must give the recipients all the rights that
--you have.  You must make sure that they, too, receive or can get the
--source code.  And you must show them these terms so they know their
--rights.
--
--  We protect your rights with two steps: (1) copyright the software, and
--(2) offer you this license which gives you legal permission to copy,
--distribute and/or modify the software.
--
--  Also, for each author's protection and ours, we want to make certain
--that everyone understands that there is no warranty for this free
--software.  If the software is modified by someone else and passed on, we
--want its recipients to know that what they have is not the original, so
--that any problems introduced by others will not reflect on the original
--authors' reputations.
--
--  Finally, any free program is threatened constantly by software
--patents.  We wish to avoid the danger that redistributors of a free
--program will individually obtain patent licenses, in effect making the
--program proprietary.  To prevent this, we have made it clear that any
--patent must be licensed for everyone's free use or not licensed at all.
--
--  The precise terms and conditions for copying, distribution and
--modification follow.
--
-
--		    GNU GENERAL PUBLIC LICENSE
--   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
--
--  0. This License applies to any program or other work which contains
--a notice placed by the copyright holder saying it may be distributed
--under the terms of this General Public License.  The "Program", below,
--refers to any such program or work, and a "work based on the Program"
--means either the Program or any derivative work under copyright law:
--that is to say, a work containing the Program or a portion of it,
--either verbatim or with modifications and/or translated into another
--language.  (Hereinafter, translation is included without limitation in
--the term "modification".)  Each licensee is addressed as "you".
--
--Activities other than copying, distribution and modification are not
--covered by this License; they are outside its scope.  The act of
--running the Program is not restricted, and the output from the Program
--is covered only if its contents constitute a work based on the
--Program (independent of having been made by running the Program).
--Whether that is true depends on what the Program does.
--
--  1. You may copy and distribute verbatim copies of the Program's
--source code as you receive it, in any medium, provided that you
--conspicuously and appropriately publish on each copy an appropriate
--copyright notice and disclaimer of warranty; keep intact all the
--notices that refer to this License and to the absence of any warranty;
--and give any other recipients of the Program a copy of this License
--along with the Program.
--
--You may charge a fee for the physical act of transferring a copy, and
--you may at your option offer warranty protection in exchange for a fee.
--
--  2. You may modify your copy or copies of the Program or any portion
--of it, thus forming a work based on the Program, and copy and
--distribute such modifications or work under the terms of Section 1
--above, provided that you also meet all of these conditions:
--
--    a) You must cause the modified files to carry prominent notices
--    stating that you changed the files and the date of any change.
--
--    b) You must cause any work that you distribute or publish, that in
--    whole or in part contains or is derived from the Program or any
--    part thereof, to be licensed as a whole at no charge to all third
--    parties under the terms of this License.
--
--    c) If the modified program normally reads commands interactively
--    when run, you must cause it, when started running for such
--    interactive use in the most ordinary way, to print or display an
--    announcement including an appropriate copyright notice and a
--    notice that there is no warranty (or else, saying that you provide
--    a warranty) and that users may redistribute the program under
--    these conditions, and telling the user how to view a copy of this
--    License.  (Exception: if the Program itself is interactive but
--    does not normally print such an announcement, your work based on
--    the Program is not required to print an announcement.)
--
-
--These requirements apply to the modified work as a whole.  If
--identifiable sections of that work are not derived from the Program,
--and can be reasonably considered independent and separate works in
--themselves, then this License, and its terms, do not apply to those
--sections when you distribute them as separate works.  But when you
--distribute the same sections as part of a whole which is a work based
--on the Program, the distribution of the whole must be on the terms of
--this License, whose permissions for other licensees extend to the
--entire whole, and thus to each and every part regardless of who wrote it.
--
--Thus, it is not the intent of this section to claim rights or contest
--your rights to work written entirely by you; rather, the intent is to
--exercise the right to control the distribution of derivative or
--collective works based on the Program.
--
--In addition, mere aggregation of another work not based on the Program
--with the Program (or with a work based on the Program) on a volume of
--a storage or distribution medium does not bring the other work under
--the scope of this License.
--
--  3. You may copy and distribute the Program (or a work based on it,
--under Section 2) in object code or executable form under the terms of
--Sections 1 and 2 above provided that you also do one of the following:
--
--    a) Accompany it with the complete corresponding machine-readable
--    source code, which must be distributed under the terms of Sections
--    1 and 2 above on a medium customarily used for software interchange; or,
--
--    b) Accompany it with a written offer, valid for at least three
--    years, to give any third party, for a charge no more than your
--    cost of physically performing source distribution, a complete
--    machine-readable copy of the corresponding source code, to be
--    distributed under the terms of Sections 1 and 2 above on a medium
--    customarily used for software interchange; or,
--
--    c) Accompany it with the information you received as to the offer
--    to distribute corresponding source code.  (This alternative is
--    allowed only for noncommercial distribution and only if you
--    received the program in object code or executable form with such
--    an offer, in accord with Subsection b above.)
--
--The source code for a work means the preferred form of the work for
--making modifications to it.  For an executable work, complete source
--code means all the source code for all modules it contains, plus any
--associated interface definition files, plus the scripts used to
--control compilation and installation of the executable.  However, as a
--special exception, the source code distributed need not include
--anything that is normally distributed (in either source or binary
--form) with the major components (compiler, kernel, and so on) of the
--operating system on which the executable runs, unless that component
--itself accompanies the executable.
--
--If distribution of executable or object code is made by offering
--access to copy from a designated place, then offering equivalent
--access to copy the source code from the same place counts as
--distribution of the source code, even though third parties are not
--compelled to copy the source along with the object code.
--
-
--  4. You may not copy, modify, sublicense, or distribute the Program
--except as expressly provided under this License.  Any attempt
--otherwise to copy, modify, sublicense or distribute the Program is
--void, and will automatically terminate your rights under this License.
--However, parties who have received copies, or rights, from you under
--this License will not have their licenses terminated so long as such
--parties remain in full compliance.
--
--  5. You are not required to accept this License, since you have not
--signed it.  However, nothing else grants you permission to modify or
--distribute the Program or its derivative works.  These actions are
--prohibited by law if you do not accept this License.  Therefore, by
--modifying or distributing the Program (or any work based on the
--Program), you indicate your acceptance of this License to do so, and
--all its terms and conditions for copying, distributing or modifying
--the Program or works based on it.
--
--  6. Each time you redistribute the Program (or any work based on the
--Program), the recipient automatically receives a license from the
--original licensor to copy, distribute or modify the Program subject to
--these terms and conditions.  You may not impose any further
--restrictions on the recipients' exercise of the rights granted herein.
--You are not responsible for enforcing compliance by third parties to
--this License.
--
--  7. If, as a consequence of a court judgment or allegation of patent
--infringement or for any other reason (not limited to patent issues),
--conditions are imposed on you (whether by court order, agreement or
--otherwise) that contradict the conditions of this License, they do not
--excuse you from the conditions of this License.  If you cannot
--distribute so as to satisfy simultaneously your obligations under this
--License and any other pertinent obligations, then as a consequence you
--may not distribute the Program at all.  For example, if a patent
--license would not permit royalty-free redistribution of the Program by
--all those who receive copies directly or indirectly through you, then
--the only way you could satisfy both it and this License would be to
--refrain entirely from distribution of the Program.
--
--If any portion of this section is held invalid or unenforceable under
--any particular circumstance, the balance of the section is intended to
--apply and the section as a whole is intended to apply in other
--circumstances.
--
--It is not the purpose of this section to induce you to infringe any
--patents or other property right claims or to contest validity of any
--such claims; this section has the sole purpose of protecting the
--integrity of the free software distribution system, which is
--implemented by public license practices.  Many people have made
--generous contributions to the wide range of software distributed
--through that system in reliance on consistent application of that
--system; it is up to the author/donor to decide if he or she is willing
--to distribute software through any other system and a licensee cannot
--impose that choice.
--
--This section is intended to make thoroughly clear what is believed to
--be a consequence of the rest of this License.
--
-
--  8. If the distribution and/or use of the Program is restricted in
--certain countries either by patents or by copyrighted interfaces, the
--original copyright holder who places the Program under this License
--may add an explicit geographical distribution limitation excluding
--those countries, so that distribution is permitted only in or among
--countries not thus excluded.  In such case, this License incorporates
--the limitation as if written in the body of this License.
--
--  9. The Free Software Foundation may publish revised and/or new versions
--of the General Public License from time to time.  Such new versions will
--be similar in spirit to the present version, but may differ in detail to
--address new problems or concerns.
--
--Each version is given a distinguishing version number.  If the Program
--specifies a version number of this License which applies to it and "any
--later version", you have the option of following the terms and conditions
--either of that version or of any later version published by the Free
--Software Foundation.  If the Program does not specify a version number of
--this License, you may choose any version ever published by the Free Software
--Foundation.
--
--  10. If you wish to incorporate parts of the Program into other free
--programs whose distribution conditions are different, write to the author
--to ask for permission.  For software which is copyrighted by the Free
--Software Foundation, write to the Free Software Foundation; we sometimes
--make exceptions for this.  Our decision will be guided by the two goals
--of preserving the free status of all derivatives of our free software and
--of promoting the sharing and reuse of software generally.
--
--			    NO WARRANTY
--
--  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
--FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
--OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
--PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
--OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
--MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
--TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
--PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
--REPAIR OR CORRECTION.
--
--  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
--WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
--REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
--INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
--OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
--TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
--YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
--PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
--POSSIBILITY OF SUCH DAMAGES.
--
--		     END OF TERMS AND CONDITIONS
--
-
--	    How to Apply These Terms to Your New Programs
--
--  If you develop a new program, and you want it to be of the greatest
--possible use to the public, the best way to achieve this is to make it
--free software which everyone can redistribute and change under these terms.
--
--  To do so, attach the following notices to the program.  It is safest
--to attach them to the start of each source file to most effectively
--convey the exclusion of warranty; and each file should have at least
--the "copyright" line and a pointer to where the full notice is found.
--
--    <one line to give the program's name and a brief idea of what it does.>
--    Copyright (C) <year>  <name of author>
--
--    This program is free software; you can redistribute it and/or modify
--    it under the terms of the GNU General Public License as published by
--    the Free Software Foundation; either version 2 of the License, or
--    (at your option) any later version.
--
--    This program is distributed in the hope that it will be useful,
--    but WITHOUT ANY WARRANTY; without even the implied warranty of
--    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--    GNU General Public License for more details.
--
--    You should have received a copy of the GNU General Public License
--    along with this program; if not, write to the Free Software
--    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
--
--
--Also add information on how to contact you by electronic and paper mail.
--
--If the program is interactive, make it output a short notice like this
--when it starts in an interactive mode:
--
--    Gnomovision version 69, Copyright (C) year name of author
--    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
--    This is free software, and you are welcome to redistribute it
--    under certain conditions; type `show c' for details.
--
--The hypothetical commands `show w' and `show c' should show the appropriate
--parts of the General Public License.  Of course, the commands you use may
--be called something other than `show w' and `show c'; they could even be
--mouse-clicks or menu items--whatever suits your program.
--
--You should also get your employer (if you work as a programmer) or your
--school, if any, to sign a "copyright disclaimer" for the program, if
--necessary.  Here is a sample; alter the names:
--
--  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
--  `Gnomovision' (which makes passes at compilers) written by James Hacker.
--
--  <signature of Ty Coon>, 1 April 1989
--  Ty Coon, President of Vice
--
--This General Public License does not permit incorporating your program into
--proprietary programs.  If your program is a subroutine library, you may
--consider it more useful to permit linking proprietary applications with the
--library.  If this is what you want to do, use the GNU Library General
--Public License instead of this License.
-diff -Naur ncurses-5.6.orig/tack/HISTORY ncurses-5.6/tack/HISTORY
---- ncurses-5.6.orig/tack/HISTORY	2006-11-25 19:28:49.000000000 -0500
-+++ ncurses-5.6/tack/HISTORY	1969-12-31 19:00:00.000000000 -0500
-@@ -1,49 +0,0 @@
--
--Current history:
--
--2006/11/25		Fixes for ncurses tparm() prototype.
--2006/06/24	1.02	Modify to support ncurses extended string capabilities.
--2003/10/18	1.01	Fix some logic in pad.c, improve bce test.
--2003/09/20		Modified to allow running from compiled-in terminfo.
--2001/10/20		Make menu titles agree with descriptions.
--2000/03/04		Fix a few spelling errors
--1999/09/04		Minor fix to build/link on BeOS
--1999/05/16		Minor fix to build/link on CLIX
--1999/05/09		Update to build/link on NeXT
--1999/04/17		Update to work with ncurses 5.0 beta1 (TERMTYPE struct)
--1999/02/07		Build with ncurses 4.2 981219 (renamed function)
--1998/01/09	1.00	First release under GPL
--1997/12/24	0.02	First version that requires ncurses
--1997/10/29	0.01	Second beta release to the ncurses mailing list.
--1997/10/06	0.00	First beta release to the ncurses mailing list.
--
--Ancient history:	TACK -- the terminfo action checker
--
--   The purpose of this program is to verify the correctness of
--terminfos and to calculate the pads needed for each capability.
--This program is not designed to test curses and therefore uses
--as little of curses as possible.
--
--   This program was originally called TED.  In 1991 it was
--released to USENET in comp.sources.  TED was originally written to
--test both terminfos and termcaps.  The original intent was to
--create a terminfo editor.  This code fell quite short of its goal.
--Tests were controlled by command line switches and editing was done
--with pen and paper.
--
--   In 1995 Eric S. Raymond got interested in the program and added
--a first cut at making the program menu driven.  He also converted
--the code from K&R C to an ANSI/POSIX-conforming C.  He re-christened
--the program TAC (Terminfo Action Checker).  Eric also wrote a man
--page for TAC.
--
--   In 1997 I decided to dust off the code and make it easier to
--use by the novice.  I totally rewrote the menu system and added
--the editing features I originally planned for TED.  I also did
--a total rewrite of the code that does the timings.  In the process
--of rewriting the code I changed it to be more tightly coupled
--with ncurses.  By this time someone had taken the name TAC so
--I re-christened the program TACK.
--
--Daniel Weaver
--<danw@znyx.com>
-diff -Naur ncurses-5.6.orig/tack/Makefile.in ncurses-5.6/tack/Makefile.in
---- ncurses-5.6.orig/tack/Makefile.in	2006-12-17 10:58:32.000000000 -0500
-+++ ncurses-5.6/tack/Makefile.in	1969-12-31 19:00:00.000000000 -0500
-@@ -1,211 +0,0 @@
--# $Id: Makefile.in,v 1.38 2006/12/17 15:58:32 tom Exp $
--##############################################################################
--# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
--#                                                                            #
--# Permission is hereby granted, free of charge, to any person obtaining a    #
--# copy of this software and associated documentation files (the "Software"), #
--# to deal in the Software without restriction, including without limitation  #
--# the rights to use, copy, modify, merge, publish, distribute, distribute    #
--# with modifications, sublicense, and/or sell copies of the Software, and to #
--# permit persons to whom the Software is furnished to do so, subject to the  #
--# following conditions:                                                      #
--#                                                                            #
--# The above copyright notice and this permission notice shall be included in #
--# all copies or substantial portions of the Software.                        #
--#                                                                            #
--# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
--# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,   #
--# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL    #
--# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER      #
--# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING    #
--# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER        #
--# DEALINGS IN THE SOFTWARE.                                                  #
--#                                                                            #
--# Except as contained in this notice, the name(s) of the above copyright     #
--# holders shall not be used in advertising or otherwise to promote the sale, #
--# use or other dealings in this Software without prior written               #
--# authorization.                                                             #
--##############################################################################
--# Makefile for tack
--#
--# The variable 'srcdir' refers to the source-distribution, and can be set with
--# the configure script by "--srcdir=DIR".
--#
--# The rules are organized to produce the libraries for the configured models,
--# and the programs with the configured default model.
--
--# turn off _all_ suffix rules; we'll generate our own
--.SUFFIXES:
--
--SHELL		= /bin/sh
--THIS		= Makefile
--
--CF_MFLAGS 	= @cf_cv_makeflags@
--@SET_MAKE@
--
--x		= @EXEEXT@
--o		= .@OBJEXT@
--
--MODEL		= ../@DFT_OBJ_SUBDIR@
--DESTDIR		= @DESTDIR@
--srcdir		= @srcdir@
--prefix		= @prefix@
--exec_prefix	= @exec_prefix@
--bindir		= @bindir@
--libdir		= @libdir@
--mandir		= @mandir@
--includedir	= @includedir@
--datadir		= @datadir@
--
--LIBTOOL		= @LIBTOOL@
--LIBTOOL_CLEAN	= @LIB_CLEAN@
--LIBTOOL_COMPILE	= @LIB_COMPILE@
--LIBTOOL_LINK	= @LIB_LINK@
--LIBTOOL_INSTALL	= @LIB_INSTALL@
--LIBTOOL_UNINSTALL = @LIB_UNINSTALL@
--
--INSTALL		= @INSTALL@
--INSTALL_PROG	= @INSTALL_PROGRAM@
--INSTALL_DATA	= @INSTALL_DATA@
--
--AWK		= @AWK@
--LN_S		= @LN_S@
--
--CC		= @CC@
--CPP		= @CPP@
--CFLAGS		= @CFLAGS@
--
--INCDIR		= $(srcdir)/../include
--CPPFLAGS	= -DHAVE_CONFIG_H -I../tack -I$(srcdir) @CPPFLAGS@
--
--CCFLAGS		= $(CPPFLAGS) $(CFLAGS)
--
--CFLAGS_LIBTOOL	= $(CCFLAGS)
--CFLAGS_NORMAL	= $(CCFLAGS)
--CFLAGS_DEBUG	= $(CCFLAGS) @CC_G_OPT@ -DTRACE
--CFLAGS_PROFILE	= $(CCFLAGS) -pg
--CFLAGS_SHARED	= $(CCFLAGS) @CC_SHARED_OPTS@
--
--CFLAGS_DEFAULT	= $(CFLAGS_@DFT_UPR_MODEL@)
--
--REL_VERSION	= @cf_cv_rel_version@
--ABI_VERSION	= @cf_cv_abi_version@
--LOCAL_LIBDIR	= @top_builddir@/lib
--
--LD		= @LD@
--LINK		= @LINK_PROGS@ $(LIBTOOL_LINK) $(CC)
--LDFLAGS		= @EXTRA_LDFLAGS@ \
--		@TINFO_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@
--
--LDFLAGS_LIBTOOL	= $(LDFLAGS) $(CFLAGS_LIBTOOL)
--LDFLAGS_NORMAL	= $(LDFLAGS) $(CFLAGS_NORMAL)
--LDFLAGS_DEBUG	= $(LDFLAGS) $(CFLAGS_DEBUG)
--LDFLAGS_PROFILE	= $(LDFLAGS) $(CFLAGS_PROFILE)
--LDFLAGS_SHARED	= $(LDFLAGS) $(CFLAGS_SHARED) @LD_SHARED_OPTS@
--
--LDFLAGS_DEFAULT	= $(LDFLAGS_@DFT_UPR_MODEL@)
--
--LINT		= @LINT@
--LINT_OPTS	= @LINT_OPTS@
--LINT_LIBS	= -lncurses@LIB_SUFFIX@ @LIBS@
--
--PROGS = tack$x
--
--# Default library, for linking applications
--DEPS_CURSES = ../lib/@LIB_PREFIX@ncurses@DFT_DEP_SUFFIX@
--
--################################################################################
--all:	$(PROGS)
--
--sources:
--
--install: install.tack
--uninstall: uninstall.tack
--
--# this line simplifies the configure-script
--libs \
--install.libs \
--uninstall.libs:
--
--EDITARGS = $(DESTDIR)$(mandir) $(srcdir) $(srcdir)/*.[0-9]*
--
--install.tack: $(PROGS) \
--	$(DESTDIR)$(bindir) \
--	$(DESTDIR)$(mandir)
--	$(LIBTOOL_INSTALL) $(INSTALL_PROG) tack$x $(DESTDIR)$(bindir)/tack$x
--	sh ../edit_man.sh normal installing $(EDITARGS)
--
--uninstall.tack:
--	-@$(LIBTOOL_UNINSTALL) rm -f $(DESTDIR)$(bindir)/tack$x
--	-sh ../edit_man.sh normal removing $(EDITARGS)
--
--$(DESTDIR)$(bindir) \
--$(DESTDIR)$(mandir) :
--	sh $(srcdir)/../mkinstalldirs $@
--
--#
--# Rules for building tack
--#
--
--DEPS_TACK = \
--	$(MODEL)/ansi$o \
--	$(MODEL)/charset$o \
--	$(MODEL)/color$o \
--	$(MODEL)/control$o \
--	$(MODEL)/crum$o \
--	$(MODEL)/edit$o \
--	$(MODEL)/fun$o \
--	$(MODEL)/init$o \
--	$(MODEL)/menu$o \
--	$(MODEL)/modes$o \
--	$(MODEL)/output$o \
--	$(MODEL)/pad$o \
--	$(MODEL)/scan$o \
--	$(MODEL)/sync$o \
--	$(MODEL)/sysdep$o \
--	$(MODEL)/tack$o
--
--tack$x: $(DEPS_TACK) $(DEPS_CURSES)
--	@ECHO_LINK@ $(LINK) $(DEPS_TACK) $(LDFLAGS_DEFAULT) -o $@
--
--#
--# Utility productions start here
--#
--
--tags:
--	ctags *.[ch]
--
--@MAKE_UPPER_TAGS@TAGS:
--@MAKE_UPPER_TAGS@	etags *.[ch]
--
--mostlyclean ::
--	-rm -f core tags TAGS *~ *.bak *.i *.atac trace
--
--clean :: mostlyclean
--	-sh -c "if test -n '$x' ; then $(MAKE) clean x=''; fi"
--	-rm -f $(PROGS)
--	-rm -rf .libs
--
--distclean :: clean
--	-rm -f Makefile
--
--realclean :: distclean
--
--tack.tar: Makefile.in modules *.[ch] tack.1 HISTORY COPYING
--	tar -cvf tack.tar Makefile.in modules *.[ch] tack.1 HISTORY COPYING
--
--# These rules are used to allow "make -n" to work on a clean directory-tree
--../include/hashsize.h \
--../include/parametrized.h \
--../include/term.h :
--	cd ../include; $(MAKE) $(CF_MFLAGS)
--
--$(DEPS_CURSES) :
--	cd ../ncurses; $(MAKE) $(CF_MFLAGS)
--
--lint:
--	$(LINT) $(LINT_OPTS) $(CPPFLAGS) $(srcdir)/*.c $(LINT_LIBS)
--
--###############################################################################
--# The remainder of this file is automatically generated during configuration
--###############################################################################
-diff -Naur ncurses-5.6.orig/tack/README ncurses-5.6/tack/README
---- ncurses-5.6.orig/tack/README	2000-03-11 21:39:12.000000000 -0500
-+++ ncurses-5.6/tack/README	1969-12-31 19:00:00.000000000 -0500
-@@ -1,14 +0,0 @@
---- $Id: README,v 1.2 2000/03/12 02:39:12 Daniel.Weaver Exp $
--
--The 'tack' program is a diagnostic that is designed to create and
--verify the correctness of terminfo's.  This program can be used to
--create new terminal descriptions that are not included in the standard
--release.  Although 'tack' is distributed with ncurses, it is not an
--integral part of ncurses.  It may be removed from the release without
--limiting the usefulness of ncurses on those terminals described in the
--terminfo data base.  The best way to remove 'tack' from the build is
--to delete or rename the 'tack' directory before running the configure
--script.
--
--Unlike most of ncurses the 'tack' program is covered under the GNU
--Public License.
-diff -Naur ncurses-5.6.orig/tack/ansi.c ncurses-5.6/tack/ansi.c
---- ncurses-5.6.orig/tack/ansi.c	2005-09-17 15:49:16.000000000 -0400
-+++ ncurses-5.6/tack/ansi.c	1969-12-31 19:00:00.000000000 -0500
-@@ -1,854 +0,0 @@
--/*
--** Copyright (C) 1991, 1997 Free Software Foundation, Inc.
--** 
--** This file is part of TACK.
--** 
--** TACK is free software; you can redistribute it and/or modify
--** it under the terms of the GNU General Public License as published by
--** the Free Software Foundation; either version 2, or (at your option)
--** any later version.
--** 
--** TACK is distributed in the hope that it will be useful,
--** but WITHOUT ANY WARRANTY; without even the implied warranty of
--** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--** GNU General Public License for more details.
--** 
--** You should have received a copy of the GNU General Public License
--** along with TACK; see the file COPYING.  If not, write to
--** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
--** Boston, MA 02110-1301, USA
--*/
--
--#include <tack.h>
--
--MODULE_ID("$Id: ansi.c,v 1.10 2005/09/17 19:49:16 tom Exp $")
--
--/*
-- * Standalone tests for ANSI terminals.  Three entry points:
-- * test_ansi_graphics(), test_ansi_reports() and test_ansi_sgr().
-- */
--
--/*****************************************************************************
-- *
-- * Test ANSI status reports
-- *
-- *****************************************************************************/
--
--/* ASCII control characters */
--#define A_DC1 0x11		/* Control Q */
--#define A_DC3 0x13		/* Control S */
--#define A_ESC 0x1b
--#define A_DCS 0x90
--#define A_CSI 0x9b
--#define A_ST  0x9c
--
--#define MAX_MODES 256
--
--static char default_bank[] = "\033(B\017";
--static int private_use, ape, terminal_class;
--static short ansi_value[256];
--static unsigned char ansi_buf[512], pack_buf[512];
--
--struct ansi_reports {
--	int lvl, final;
--	const char *text;
--	const char *request;
--};
--
--static struct ansi_reports report_list[] = {
--	{0, 'c', "(DA) Primary device attributes", "\033[0c"},
--	{1, 0, "(DSR) Terminal status", "\033[5n"},
--	{1, 'R', "(DSR) Cursor position", "\033[6n"},
--	{62, 0, "(DA) Secondary device attributes", "\033[>0c"},
--	{62, 0, "(DSR) Printer status", "\033[?15n"},
--	{62, 0, "(DSR) Function key definition", "\033[?25n"},
--	{62, 0, "(DSR) Keyboard language", "\033[?26n"},
--	{63, 0, "(DECRQSS) Data destination", "\033P$q$}\033\\"},
--	{63, 0, "(DECRQSS) Status line type", "\033P$q$~\033\\"},
--	{63, 0, "(DECRQSS) Erase attribute", "\033P$q\"q\033\\"},
--	{63, 0, "(DECRQSS) Personality", "\033P$q\"p\033\\"},
--	{63, 0, "(DECRQSS) Top and bottom margins", "\033P$qr\033\\"},
--	{63, 0, "(DECRQSS) Character attributes", "\033P$qm\033\\"},
--	{63, 0, "(DECRQSS) Illegal request", "\033P$q@\033\\"},
--	{63, 0, "(DECRQUPSS) User pref supplemental set", "\033[&u"},
--	{63, 0, "(DECRQPSR) Cursor information", "\033[1$w"},
--	{63, 0, "(DECRQPSR) Tab stop information", "\033[2$w"},
--	{64, 0, "(DA) Tertiary device attributes", "\033[=0c"},
--	{64, 0, "(DSR) Extended cursor position", "\033[?6n"},
--	{64, 0, "(DSR) Macro space", "\033[?62n"},
--	{64, 0, "(DSR) Memory checksum", "\033[?63n"},
--	{64, 0, "(DSR) Data integrity", "\033[?75n"},
--	{64, 0, "(DSR) Multiple session status", "\033[?85n"},
--	{64, 0, "(DECRQSS) Attribute change extent", "\033P$q*x\033\\"},
--	{64, 0, "(DECRQSS) Columns per page", "\033P$q$|\033\\"},
--	{64, 0, "(DECRQSS) Lines per page", "\033P$qt\033\\"},
--	{64, 0, "(DECRQSS) Lines per screen", "\033P$q*|\033\\"},
--	{64, 0, "(DECRQSS) Left and right margins", "\033P$qs\033\\"},
--	{64, 0, "(DECRQSS) Local functions", "\033P$q+q\033\\"},
--	{64, 0, "(DECRQSS) Local function key control", "\033P$q=}\033\\"},
--	{64, 0, "(DECRQSS) Select modifier key reporting", "\033P$q+r\033\\"},
--	{64, 0, "(DECRQDE) Window report", "\033[\"v"},
--	{0, 0, 0, 0}
--};
--
--struct request_control {
--	const char *text;
--	const char *expect;
--	const char *request;
--	const char *set_mode;
--	const char *reset_mode;
--};
--
--/* Request control function selection or setting */
--static const struct request_control rqss[] = {
--	{"Data sent to screen", "0", "$}", "\033[0$}", 0},
--	{"Data sent to disabled status line", "0", "$}", 0, 0},
--	{"\033[0$~\033[1$}", "\033[0$}", 0, 0, 0},
--	{"Data sent to enabled status line", "1", "$}", 0, 0},
--	{"\033[2$~\033[1$}", "\033[0$}", 0, 0, 0},
--	{"Disable status line", "0", "$~", "\033[0$~", 0},
--	{"Top status line", "1", "$~", "\033[1$~", 0},
--	{"Bottom status line", "2", "$~", "\033[2$~", 0},
--	{"Erasable character", "0", "\"q", "\033[0\"q", 0},
--	{"Nonerasable character", "1", "\"q", "\033[1\"q", "\033[0\"q"},
--	{"Top and bottom margins", "3;10", "r", "\0337\033[3;10r", 0},
--	{"\033[r\0338", 0, 0, 0, 0},
--	{"Top and bottom margins", "default", "r", "\0337\033[r", "\0338"},
--	{"Character attributes, dim, bold", "1", "m", "\033[2;1m", "\033[m"},
--	{"Character attributes, bold, dim", "2", "m", "\033[1;2m", "\033[m"},
--	{"Character attributes, under, rev", "4;7", "m", "\033[4;7m", "\033[m"},
--	{"Character attributes, color", "35;42", "m", "\033[35;42m", "\033[m"},
--	{"All character attributes", "", "m", "\033[1;2;3;4;5;6;7;8;9m", 0},
--	{"\033[m", 0, 0, 0, 0},
--	{0, 0, 0, 0, 0}
--};
--
--
--/*
--**	read_ansi()
--**
--**	read an ANSI status report from terminal
--*/
--static void
--read_ansi(void)
--{
--	int ch, i, j, last_escape;
--
--	fflush(stdout);
--	read_key((char *)ansi_buf, sizeof(ansi_buf));
--	/* Throw away control characters inside CSI sequences.
--	   Convert two character 7-bit sequences into 8-bit sequences. */
--	for (i = j = last_escape = 0; (ch = ansi_buf[i]) != 0; i++) {
--		if (ch == A_ESC) {
--			if (last_escape == A_ESC) {
--				pack_buf[j++] = A_ESC;
--			}
--			last_escape = A_ESC;
--		} else
--		if (last_escape == A_ESC && ch >= '@' && ch <= '_') {
--			pack_buf[j++] = last_escape = ch + 0x40;
--		} else
--		if (last_escape != A_CSI || (ch > 0x20 && ch != 0x80)) {
--			if (last_escape == A_ESC) {
--				pack_buf[j++] = A_ESC;
--			}
--			if (ch > 0x80 && ch < 0xa0) {
--				last_escape = ch;
--			}
--			pack_buf[j++] = ch;
--		}
--	}
--	if (last_escape == A_ESC) {
--		pack_buf[j++] = A_ESC;
--	}
--	pack_buf[j] = '\0';
--	return;
--}
--
--/*
--**	valid_mode(expected)
--**
--**	read a terminal mode status report and parse the result
--**	Return TRUE if we got the expected terminating character.
--*/
--static int
--valid_mode(int expected)
--{
--	unsigned char *s;
--	int ch, terminator;
--
--	read_ansi();
--
--	ape = 0;
--	ch = UChar(pack_buf[0]);
--	ansi_value[0] = 0;
--	if (ch != A_CSI && ch != A_DCS)
--		return FALSE;
--
--	s = pack_buf + 1;
--	private_use = 0;
--	if ((*s >= '<') & (*s <= '?')) {
--		private_use = *s++;
--	}
--	terminator = 0;
--	for (; (ch = *s); s++) {
--		if (ch >= '0' && ch <= '9')
--			ansi_value[ape] = ansi_value[ape] * 10 + ch - '0';
--		else if (ch == ';' || ch == ':')
--			ansi_value[++ape] = 0;
--		else if (ch >= '<' && ch <= '?')
--			private_use = ch;
--		else if (ch >= ' ')
--			terminator = (terminator << 8) | ch;
--		else
--			break;
--	}
--	return terminator == expected;
--}
--
--/*
--**	read_reports()
--**
--**	read all the reports in the ANSI report structure
--*/
--static int
--read_reports(void)
--{
--	int i, j, k, tc, vcr, lc;
--	char *s;
--	const char *t;
--
--	lc = 5;
--	terminal_class = tc = 0;
--	for (i = 0; report_list[i].text; i++, lc++) {
--		if (terminal_class < report_list[i].lvl &&
--			tc < report_list[i].lvl) {
--			put_crlf();
--			menu_prompt();
--			ptext("/status [q] > ");
--			j = wait_here();
--			if (j != 'n' && j != 'N')
--				return 0;
--			tc = report_list[i].lvl;
--			lc = 1;
--		} else if (lc + 2 >= lines) {
--			put_crlf();
--			ptext("Hit any key to continue ");
--			(void) wait_here();
--			lc = 1;
--		}
--		sprintf(temp, "%s (%s) ", report_list[i].text,
--			expand_command(report_list[i].request));
--		ptext(temp);
--		for (j = strlen(temp); j < 49; j++)
--			putchp(' ');
--		tc_putp(report_list[i].request);
--		vcr = 0;
--		if (report_list[i].final == 0) {
--			read_ansi();
--		} else if (valid_mode(report_list[i].final))
--			switch (report_list[i].final) {
--			case 'c':
--				terminal_class = ansi_value[0];
--				break;
--			case 'R':
--				vcr = TRUE;
--				break;
--			}
--		j = UChar(pack_buf[0]);
--		if (j != A_CSI && j != A_DCS) {
--			put_crlf();
--			t = "*** The above request gives illegal response ***";
--			ptext(t);
--			for (j = strlen(t); j < 49; j++)
--				putchp(' ');
--		}
--		s = expand((const char *)ansi_buf);
--		if (char_count + expand_chars >= columns) {
--			put_str("\r\n        ");
--			lc++;
--		}
--		putln(s);
--		if (vcr) {	/* find out how big the screen is */
--			tc_putp(report_list[i].request);
--			if (!valid_mode('R'))
--				continue;
--			j = ansi_value[0];
--			k = ansi_value[1];
--			tc_putp("\033[255B\033[255C\033[6n");
--			if (!valid_mode('R'))
--				continue;
--			sprintf(temp, "\033[%d;%dH", j, k);
--			tc_putp(temp);
--			ptext("(DSR) Screen size (CSI 6 n)");
--			for (j = char_count; j < 50; j++)
--				putchp(' ');
--			sprintf(temp, "%d x %d", ansi_value[1], ansi_value[0]);
--			ptextln(temp);
--
--		}
--	}
--	menu_prompt();
--	ptext("/status r->repeat test, <return> to continue > ");
--	return wait_here();
--}
--
--/*
--**	request_cfss()
--**
--**	Request Control function selection or settings
--*/
--static int
--request_cfss(void)
--{
--	int i, j, k, l, ch;
--	char *s;
--
--	put_clear();
--	ptextln("Request                         Expected  Received");
--	put_crlf();
--	for (i = 0; rqss[i].text; i++) {
--		ptext(rqss[i].text);
--		j = strlen(rqss[i].text) + strlen(rqss[i].expect);
--		putchp(' ');
--		for (j++; j < 40; j++)
--			putchp(' ');
--		ptext(rqss[i].expect);
--		putchp(' ');
--		tc_putp(rqss[i].set_mode);
--		sprintf(temp, "\033P$q%s\033\\", rqss[i].request);
--		tc_putp(temp);
--		read_ansi();
--		tc_putp(rqss[i].reset_mode);
--		putchp(' ');
--		for (j = 0; ansi_buf[j]; j++) {
--			if (ansi_buf[j] == 'r') {
--				for (k = j++; (ch = UChar(ansi_buf[k])) != 0; k++)
--					if (ch == A_ESC) {
--						break;
--					} else if (ch == A_ST) {
--						break;
--					}
--				ansi_buf[k] = '\0';
--				s = expand((const char *)&ansi_buf[j]);
--				if (char_count + expand_chars >= columns)
--					put_str("\r\n        ");
--				put_str(s);
--			}
--		}
--		put_crlf();
--	}
--	/* calculate the valid attributes */
--	ptext("Valid attributes:         0");
--	j = 0;
--	for (i = 1; i < 20; i++) {
--		sprintf(temp, "\033[0;%dm\033P$qm\033\\", i);
--		tc_putp(temp);
--		(void) valid_mode('m');
--		if (ape > 0) {
--			j = i;
--			sprintf(temp, "\033[0m; %d", i);
--			tc_putp(temp);
--		}
--	}
--	put_crlf();
--	/* calculate how many parameters can be sent */
--	ptext("Max number of parameters: ");
--	sprintf(temp, "%dm\033P$qm\033\\", j);
--	l = -1;
--	if (j > 0)
--		for (l = 1; l < 33; l++) {
--			tc_putp("\033[0");
--			for (ch = 1; ch <= l; ch++)
--				put_this(';');
--			tc_putp(temp);
--			(void) valid_mode('m');
--			if (ape == 0)
--				break;
--		}
--	tc_putp("\033[m");
--	if (l >= 0) {
--		sprintf(temp, "%d", l);
--		ptext(temp);
--	} else
--		ptext("unknown");
--	put_crlf();
--	return wait_here();
--}
--
--/*
--**	mode_display(puc, mode, initial, set, reset)
--**
--**	print the mode display entry
--*/
--static void
--mode_display(const char *p, int n, int c, char s, char r)
--{
--	int k;
--
--	sprintf(temp, "%s%d (%c, %c, %c)", p, n, c, s, r);
--	k = strlen(temp);
--	if (char_count + k >= columns)
--		put_crlf();
--	for (; k < 14; k++)
--		putchp(' ');
--	put_str(temp);
--}
--
--/*
--**	terminal_state()
--**
--**	test DECRQM status reports
--*/
--static void
--terminal_state(void)
--{
--	static const char *puc[] = {"", "<", "=", ">", "?", 0};
--
--	int i, j, k, l, modes_found;
--	char *s;
--	char buf[256], tms[256];
--	int mode_puc[MAX_MODES], mode_number[MAX_MODES];
--	char set_value[MAX_MODES], reset_value[MAX_MODES];
--	char current_value[MAX_MODES];
--
--	ptext("Testing terminal mode status. (CSI 0 $ p)");
--	tc_putp("\033[0$p");
--	modes_found = 0;
--	tms[0] = '\0';
--	if (valid_mode(('$' << 8) | 'y')) {
--		for (i = 0; puc[i]; i++) {
--			put_crlf();
--			if (i) {
--				sprintf(temp, "Private use: %c", puc[i][0]);
--			} else {
--				strcpy(temp, "Standard modes:");
--			}
--			k = strlen(temp);
--			ptext(temp);
--			for (j = 0; j < (int) sizeof(buf); buf[j++] = ' ')
--				;
--			for (j = l = 0; j < 255 && j - l < 50; j++) {
--				sprintf(temp, "\033[%s%d$p", puc[i], j);
--				tc_putp(temp);
--				if (!valid_mode(('$' << 8) | 'y')) {
--					/* not valid, save terminating value */
--					s = expand((const char *)ansi_buf);
--					sprintf(tms, "%s%s%d %s  ", tms,
--						puc[i], j, s);
--					break;
--				}
--				if (private_use != puc[i][0])
--					break;
--				if (ansi_value[0] != j)
--					break;
--				if (ansi_value[1]) {
--					l = j;
--					if (k > 70) {
--						buf[k] = '\0';
--						put_crlf();
--						ptextln(buf);
--						for (k = 0; k < (int) sizeof(buf);) {
--							buf[k++] = ' ';
--						}
--						k = 0;
--					}
--					sprintf(temp, " %d", j);
--					ptext(temp);
--					k += strlen(temp);
--					buf[k - 1] = ansi_value[1] + '0';
--					if (modes_found >= MAX_MODES)
--						continue;
--					current_value[modes_found] =
--						ansi_value[1] + '0';
--					/* some modes never return */
--					if ((i == 0 && j == 13)	/* control execution */
--						|| (puc[i][0] == '?' && j == 2))	/* VT52 */
--						set_value[modes_found] =
--							reset_value[modes_found] = '-';
--					else
--						set_value[modes_found] =
--							reset_value[modes_found] = ' ';
--					mode_puc[modes_found] = i;
--					mode_number[modes_found++] = j;
--				}
--			}
--			buf[k] = '\0';
--			if (buf[k - 1] != ' ') {
--				put_crlf();
--				ptext(buf);
--			}
--		}
--
--	if ((i = modes_found) != 0) {
--		put_crlf();
--		put_crlf();
--		if (tms[0]) {
--			ptextln(tms);
--		}
--		ptext("Hit 'Y' to test mode set/reset states: ");
--		i = wait_here();
--	}
--	if (i == 'y' || i == 'Y')
--		while (1) {
--#ifdef STATUSFIX
--			FILE *fp;
--
--#ifdef TEDANSI
--			fp = fopen("ted.ansi", "w");
--#else
--			fp = fopen("/dev/console", "w");
--#endif
--#endif
--			for (i = j = 0; j < modes_found; j = ++i >> 1) {
--				if (set_value[j] == '-')
--					continue;
--				k = (current_value[j] ^ i) & 1;
--				sprintf(temp, "\033[%s%d%c\033[%s%d$p",
--					puc[mode_puc[j]], mode_number[j],
--					k ? 'l' : 'h',
--					puc[mode_puc[j]], mode_number[j]);
--#ifdef STATUSFIX
--				if (fp) {
--					fprintf(fp, "%s\n", expand(temp));
--					fflush(fp);
--				}
--#endif
--				tc_putp(temp);
--				if (!valid_mode(('$' << 8) | 'y'))
--					continue;
--				if (k) {
--					reset_value[j] = ansi_value[1] + '0';
--				} else {
--					set_value[j] = ansi_value[1] + '0';
--				}
--			}
--			put_str("\033[30l");	/* added for GORT bug
--						   (WY-185) */
--#ifdef STATUSFIX
--			if (fp)
--				fclose(fp);
--#endif
--			tty_set();
--			/* print the results */
--			put_clear();
--			putln("mode (initial, set, reset)");
--			for (j = 0; j < modes_found; j++) {
--				mode_display(puc[mode_puc[j]], mode_number[j],
--					current_value[j], set_value[j], reset_value[j]);
--			}
--			ptext("\n\nHit 'R' to repeat test.  'S' to sort results: ");
--			i = wait_here();
--			if (i == 's' || i == 'S') {	/* print the same stuff,
--							   sorted by
--							   current_value */
--				put_crlf();
--				for (i = '1'; i <= '4'; i++) {
--					for (j = 0; j < modes_found; j++) {
--						if (current_value[j] == i)
--							mode_display(puc[mode_puc[j]],
--								mode_number[j], current_value[j],
--								set_value[j], reset_value[j]);
--					}
--				}
--				ptext("\n\nHit 'R' to repeat test: ");
--				i = wait_here();
--			}
--			if (i != 'r' && i != 'R')
--				break;
--			tty_raw(1, char_mask);
--		}
--	} else {
--		tty_set();
--	}
--}
--
--
--/*
--**	ansi_report_help()
--**
--**	Display the informational data for the ANSI report test.
--*/
--static void
--ansi_report_help(void)
--{
--	ptext("Begin ANSI status report testing. ");
--	ptext(" Parity bit set will be displayed in reverse video. ");
--	ptext(" If the terminal hangs, hit any alphabetic key. ");
--	ptextln(" Use n to continue testing.  Use q to quit.");
--	put_crlf();
--}
--
--/*
--**	test_ansi_reports()
--**
--**	Test the ANSI status report functions
--*/
--void
--tools_status(
--	struct test_list *t GCC_UNUSED,
--	int *state GCC_UNUSED,
--	int *ch)
--{
--	int i;
--
--	put_clear();
--	ansi_report_help();
--	tty_raw(1, char_mask);
--
--	do {
--		i = read_reports();
--		if (i != 'r' && i != 'R') {
--			*ch = i;
--			return;
--		}
--	} while (i);
--
--	if (terminal_class >= 63) {
--		do {
--			i = request_cfss();
--		} while (i == 'r' || i == 'R');
--		*ch = i;
--		terminal_state();
--	} else {
--		tty_set();
--	}
--}
--
--
--/*
--**	display_sgr()
--**
--**	Test a range of ANSI sgr attributes
--**	puc -> Private Use Character
--*/
--static void 
--display_sgr(int puc)
--{
--	int k;
--
--	temp[0] = puc;
--	temp[1] = '\0';
--	for (k = 0; k < 80; k++) {
--		if (char_count + 8 > 80)
--			put_crlf();
--		else if (char_count + 8 > columns)
--			put_crlf();
--		else if (k > 0)
--			printf(" ");
--		printf("\033[%s%dmMode %2d\033[0m", temp, k, k);
--		char_count += 8;
--		if (puc == '\0') {
--			if (k == 19)
--				printf("\033[10m");
--			if (k == 39)
--				printf("\033[37m");
--			if (k == 49)
--				printf("\033[40m");
--		}
--	}
--	put_crlf();
--	if (puc == '<')
--		printf("\033[<1m");
--	else if (puc)
--		printf("\033[%s0m", temp);
--	set_attr(0);
--}
--
--/*
--**	print_sgr20(on, off)
--**
--**	print the sgr line for sgr20()
--*/
--static void 
--print_sgr20(int on, int off)
--{
--	if (char_count > columns - 13) {
--		put_crlf();
--	} else if (char_count) {
--		put_str("  ");
--	}
--	char_count += 11;
--	printf("%d/%d \033[%dmon\033[%dm off\033[0m", on, off, on, off);
--}
--
--/*
--**	sgr20(void)
--**
--**	display the enter/exit attributes 1-9 and 20-29
--*/
--static void 
--sgr20(void)
--{
--	int k;
--
--	put_crlf();
--	ptextln("Test enter/exit attributes 1-9 and 21-29.");
--	for (k = 1; k < 10; k++) {
--		print_sgr20(k, k + 20);
--	}
--	print_sgr20(1, 22);	/* bold */
--	print_sgr20(2, 22);	/* dim */
--	print_sgr20(8, 22);	/* blank */
--	printf("\033[0m");
--	set_attr(0);
--}
--
--/*
--**	tools_sgr(testlist, state, ch)
--**
--**	Run the ANSI graphics rendition mode tool
--**	Return the last character typed.
--*/
--void
--tools_sgr(
--	struct test_list *t GCC_UNUSED,
--	int *state GCC_UNUSED,
--	int *ch)
--{
--	int k;
--
--	put_clear();
--	for (k = 0;;) {
--		display_sgr(k);
--		put_crlf();
--		menu_prompt();
--		ptext("/sgr Enter =><?r [<cr>] > ");
--		k = wait_here();
--		if ((k == 'r') || (k == 'R')) {
--			k = 0;
--		} else if ((k < '<') || (k > '?')) {
--			break;
--		}
--	}
--	sgr20();
--
--	put_newlines(2);
--	*ch = REQUEST_PROMPT;
--}
--
--/*****************************************************************************
-- *
-- * Test ANSI graphics
-- *
-- *****************************************************************************/
--/*
--**	select_bank(bank)
--**
--**	select a graphics character set for ANSI terminals
--*/
--static void
--select_bank(char *bank)
--{
--	tc_putp(bank);
--	switch (bank[1] & 3) {
--	case 0:
--		putchp('O' & 0x1f);	/* control O */
--		break;
--	case 1:
--		putchp('N' & 0x1f);	/* control N */
--		tc_putp("\033~");
--		break;
--	case 2:
--		tc_putp("\033n\033}");
--		break;
--	case 3:
--		tc_putp("\033o\033|");
--		break;
--	}
--}
--
--/*
--**	show_characters(bank, bias)
--**
--**	print the ANSI graphics characters
--*/
--static void
--show_characters(char *bank, int bias)
--{
--	int i;
--
--	sprintf(temp, "G%d GL   ", bank[1] & 3);
--	ptext(temp);
--	select_bank(bank);
--	for (i = ' '; i < 0x80; i++) {
--		if (char_count >= columns ||
--			(i != ' ' && (i & 31) == 0))
--			put_str("\n        ");
--		putchp(i + bias);
--	}
--	select_bank(default_bank);
--	put_str("   DEL <");
--	select_bank(bank);
--	putchp(0x7f + bias);
--	select_bank(default_bank);
--	putchp('>');
--	put_crlf();
--	put_crlf();
--}
--
--
--/* ANSI graphics test
--        94     96   character sets
--   G0   (      ,
--   G1   )      -
--   G2   *      .
--   G3   +      /
--
--Standard Definitions
--   A    UK
--   B    US ASCII
--
--Dec extended definitions
--   0    Special graphics
--
-- */
--
--/*
--**	tools_charset(testlist, state, ch)
--**
--**	Run the ANSI alt-charset mode tool
--*/
--void
--tools_charset(
--	struct test_list *t GCC_UNUSED,
--	int *state GCC_UNUSED,
--	int *chp GCC_UNUSED)
--{
--	int j, ch;
--	char bank[32];
--
--	put_clear();
--	ptext("Enter the bank ()*+,-./ followed by the character set");
--	ptext(" 0123456789:;<=>? for private use, and");
--	ptextln(" @A...Z[\\]^_`a...z{|}~ for standard sets.");
--	strcpy(bank, "\033)0");
--	for (; bank[0];) {
--		put_crlf();
--		show_characters(bank, 0);
--
--		/* G0 will not print in GR */
--		if (bank[1] & 3) {
--			show_characters(bank, 0x80);
--		}
--		ptext("bank+set> ");
--		for (j = 1; (ch = getchp(char_mask)); j++) {
--			if (ch == EOF)
--				break;
--			putchp(ch);
--			if (j == 1 && ch > '/')
--				j++;
--			bank[j] = ch;
--			if (ch < ' ' || ch > '/')
--				break;
--			if (j + 1 >= (int) sizeof(bank))
--				break;
--		}
--		if (j == 1)
--			break;
--		if (bank[j] < '0' || bank[j] > '~')
--			break;
--		bank[j + 1] = '\0';
--	}
--	put_crlf();
--}
-diff -Naur ncurses-5.6.orig/tack/charset.c ncurses-5.6/tack/charset.c
---- ncurses-5.6.orig/tack/charset.c	2006-11-25 19:13:36.000000000 -0500
-+++ ncurses-5.6/tack/charset.c	1969-12-31 19:00:00.000000000 -0500
-@@ -1,711 +0,0 @@
--/*
--** Copyright (C) 1991, 1997-2000 Free Software Foundation, Inc.
--**
--** This file is part of TACK.
--**
--** TACK is free software; you can redistribute it and/or modify
--** it under the terms of the GNU General Public License as published by
--** the Free Software Foundation; either version 2, or (at your option)
--** any later version.
--**
--** TACK is distributed in the hope that it will be useful,
--** but WITHOUT ANY WARRANTY; without even the implied warranty of
--** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--** GNU General Public License for more details.
--**
--** You should have received a copy of the GNU General Public License
--** along with TACK; see the file COPYING.  If not, write to
--** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
--** Boston, MA 02110-1301, USA
--*/
--
--#include <tack.h>
--
--MODULE_ID("$Id: charset.c,v 1.11 2006/11/26 00:13:36 tom Exp $")
--
--/*
--	Menu definitions for alternate character set and SGR tests.
--*/
--
--static void charset_bel(struct test_list *t, int *state, int *ch);
--static void charset_flash(struct test_list *t, int *state, int *ch);
--static void charset_civis(struct test_list *t, int *state, int *ch);
--static void charset_cvvis(struct test_list *t, int *state, int *ch);
--static void charset_cnorm(struct test_list *t, int *state, int *ch);
--static void charset_hs(struct test_list *t, int *state, int *ch);
--static void charset_status(struct test_list *t, int *state, int *ch);
--static void charset_dsl(struct test_list *t, int *state, int *ch);
--static void charset_enacs(struct test_list *t, int *state, int *ch);
--static void charset_smacs(struct test_list *t, int *state, int *ch);
--static void charset_attributes(struct test_list *t, int *state, int *ch);
--static void charset_sgr(struct test_list *t, int *state, int *ch);
--
--struct test_list acs_test_list[] = {
--	{0, 0, 0, 0, "e) edit terminfo", 0, &edit_menu},
--	{MENU_NEXT, 3, "bel", 0, 0, charset_bel, 0},
--	{MENU_NEXT, 3, "flash", 0, 0, charset_flash, 0},
--	{MENU_NEXT, 3, "civis", 0, 0, charset_civis, 0},
--	{MENU_NEXT, 3, "cvvis", 0, 0, charset_cvvis, 0},
--	{MENU_NEXT, 3, "cnorm", 0, 0, charset_cnorm, 0},
--	{MENU_NEXT, 3, "hs", 0, 0, charset_hs, 0},
--	{MENU_NEXT, 3, "tsl) (fsl) (wsl", "hs", 0, charset_status, 0},
--	{MENU_NEXT, 3, "dsl", "hs", 0, charset_dsl, 0},
--	{MENU_NEXT, 0, "acsc) (enacs) (smacs) (rmacs", 0, 0, charset_enacs, 0},
--	{MENU_NEXT, 0, "smacs) (rmacs", 0, 0, charset_smacs, 0},
--	{MENU_NEXT, 11, 0, 0, 0, charset_attributes, 0},
--	{MENU_NEXT, 11, "sgr) (sgr0", "ma", 0, charset_sgr, 0},
--	{MENU_LAST, 0, 0, 0, 0, 0, 0}
--};
--
--const struct mode_list alt_modes[] = {
--	{"normal", "(sgr0)", "(sgr0)", 1},
--	{"standout", "(smso)", "(rmso)", 2},
--	{"underline", "(smul)", "(rmul)", 4},
--	{"reverse", "(rev)", "(sgr0)", 8},
--	{"blink", "(blink)", "(sgr0)", 16},
--	{"dim", "(dim)", "(sgr0)", 32},
--	{"bold", "(bold)", "(sgr0)", 64},
--	{"invis", "(invis)", "(sgr0)", 128},
--	{"protect", "(prot)", "(sgr0)", 256},
--	{"altcharset", "(smacs)", "(rmacs)", 512}
--};
--
--/* On many terminals the underline attribute is the last scan line.
--   This is OK unless the following line is reverse video.
--   Then the underline attribute does not show up.  The following map
--   will reorder the display so that the underline attribute will
--   show up. */
--const int mode_map[10] = {0, 1, 3, 4, 5, 6, 7, 8, 9, 2};
--
--struct graphics_pair {
--	unsigned char c;
--	const char *name;
--};
--
--static struct graphics_pair glyph[] = {
--	{'+', "arrow pointing right"},
--	{',', "arrow pointing left"},
--	{'.', "arrow pointing down"},
--	{'0', "solid square block"},
--	{'i', "lantern symbol"},
--	{'-', "arrow pointing up"},
--	{'`', "diamond"},
--	{'a', "checker board (stipple)"},
--	{'f', "degree symbol"},
--	{'g', "plus/minus"},
--	{'h', "board of squares"},
--	{'j', "lower right corner"},
--	{'k', "upper right corner"},
--	{'l', "upper left corner"},
--	{'m', "lower left corner"},
--	{'n', "plus"},
--	{'o', "scan line 1"},
--	{'p', "scan line 3"},
--	{'q', "horizontal line"},
--	{'r', "scan line 7"},
--	{'s', "scan line 9"},
--	{'t', "left tee (|-)"},
--	{'u', "right tee (-|)"},
--	{'v', "bottom tee(_|_)"},
--	{'w', "top tee (T)"},
--	{'x', "vertical line"},
--	{'y', "less/equal"},
--	{'z', "greater/equal"},
--	{'{', "Pi"},
--	{'|', "not equal"},
--	{'}', "UK pound sign"},
--	{'~', "bullet"},
--	{'\0', "\0"}
--};
--
--/*
--**	charset_hs(test_list, status, ch)
--**
--**	(hs) test Has status line
--*/
--static void
--charset_hs(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	if (has_status_line != 1) {
--		ptext("(hs) Has-status line is not defined.  ");
--		generic_done_message(t, state, ch);
--	}
--}
--
--/*
--**	charset_status(test_list, status, ch)
--**
--**	(tsl) (fsl) (wsl) test Status line
--*/
--static void
--charset_status(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i, max;
--	char *s;
--	static char m[] = "*** status line *** 123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.123456789.";
--
--	if (has_status_line != 1) {
--		return;
--	}
--	put_clear();
--	max = width_status_line == -1 ? columns : width_status_line;
--	sprintf(temp, "Terminal has status line of %d characters", max);
--	ptextln(temp);
--
--	put_str("This line s");
--	s = TPARM_1(to_status_line, 0);
--	tc_putp(s);
--	for (i = 0; i < max; i++)
--		putchp(m[i]);
--	tc_putp(from_status_line);
--	putln("hould not be broken.");
--	ptextln("If the previous line is not a complete sentence then (tsl) to-status-line, (fsl) from-status-line, or (wsl) width-of-status-line is incorrect."  );
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	charset_dsl(test_list, status, ch)
--**
--**	(dsl) test Disable status line
--*/
--static void
--charset_dsl(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	if (has_status_line != 1) {
--		return;
--	}
--	if (dis_status_line) {
--		ptextln("Disable status line (dsl)");
--		tc_putp(dis_status_line);
--		ptext("If you can still see the status line then (dsl) disable-status-line has failed.  ");
--	} else {
--		ptext("(dsl) Disable-status-line is not defined.  ");
--	}
--	generic_done_message(t, state, ch);
--}
--
--
--void
--eat_cookie(void)
--{				/* put a blank if this is not a magic cookie
--				   terminal */
--	if (magic_cookie_glitch < 1)
--		putchp(' ');
--}
--
--
--void
--put_mode(char *s)
--{				/* send the attribute string (with or without
--				   % execution) */
--	tc_putp(TPARM_0(s));		/* allow % execution */
--}
--
--
--void
--set_attr(int a)
--{				/* set the attribute from the bits in a */
--	int i, b[32];
--
--	if (magic_cookie_glitch > 0) {
--		char_count += magic_cookie_glitch;
--	}
--	if (a == 0 && exit_attribute_mode) {
--		put_mode(exit_attribute_mode);
--		return;
--	}
--	for (i = 0; i < 31; i++) {
--		b[i] = (a >> i) & 1;
--	}
--	tc_putp(TPARM_9(set_attributes, b[1], b[2], b[3], b[4], b[5],
--			b[6], b[7], b[8], b[9]));
--}
--
--/*
--**	charset_sgr(test_list, status, ch)
--**
--**	(sgr) test Set Graphics Rendition
--*/
--static void
--charset_sgr(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i, j;
--
--	if (!set_attributes) {
--		ptext("(sgr) Set-graphics-rendition is not defined.  ");
--		generic_done_message(t, state, ch);
--		return;
--	}
--	if (!exit_attribute_mode) {
--		ptextln("(sgr0) Set-graphics-rendition-zero is not defined.");
--		/* go ahead and test anyway */
--	}
--	ptext("Test video attributes (sgr)");
--
--	for (i = 0; i < (int) (sizeof(alt_modes) / sizeof(struct mode_list));
--		i++) {
--		put_crlf();
--		sprintf(temp, "%d %-20s", i, alt_modes[i].name);
--		put_str(temp);
--		set_attr(alt_modes[i].number);
--		sprintf(temp, "%s", alt_modes[i].name);
--		put_str(temp);
--		set_attr(0);
--	}
--
--	putln("\n\nDouble mode test");
--	for (i = 0; i <= 9; i++) {
--		sprintf(temp, " %2d ", mode_map[i]);
--		put_str(temp);
--	}
--	for (i = 0; i <= 9; i++) {
--		put_crlf();
--		sprintf(temp, "%d", mode_map[i]);
--		put_str(temp);
--		for (j = 0; j <= 9; j++) {
--			eat_cookie();
--			set_attr((1 << mode_map[i]) | (1 << mode_map[j]));
--			put_str("Aa");
--			set_attr(0);
--			if (j < 9)
--				eat_cookie();
--		}
--	}
--	put_crlf();
--
--#ifdef max_attributes
--	if (max_attributes >= 0) {
--		sprintf(temp, "(ma) Maximum attributes %d  ", max_attributes);
--		ptext(temp);
--	}
--#endif
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	test_one_attr(mode-number, begin-string, end-string)
--**
--**	Display one attribute line.
--*/
--static void
--test_one_attr(
--	int n,
--	char *begin_mode,
--	char *end_mode)
--{
--	int i;
--
--	sprintf(temp, "%-10s %s ", alt_modes[n].name, alt_modes[n].begin_mode);
--	ptext(temp);
--	for (; char_count < 19;) {
--		putchp(' ');
--	}
--	if (begin_mode) {
--		putchp('.');
--		put_mode(begin_mode);
--		put_str(alt_modes[n].name);
--		for (i = strlen(alt_modes[n].name); i < 13; i++) {
--			putchp(' ');
--		}
--		if (end_mode) {
--			put_mode(end_mode);
--			sprintf(temp, ". %s", alt_modes[n].end_mode);
--		} else {
--			set_attr(0);
--			strcpy(temp, ". (sgr)");
--		}
--		ptextln(temp);
--	} else {
--		for (i = 0; i < magic_cookie_glitch; i++)
--			putchp('*');
--		put_str("*** missing ***");
--		for (i = 0; i < magic_cookie_glitch; i++)
--			putchp('*');
--		put_crlf();
--	}
--}
--
--/*
--**	charset_attributes(test_list, status, ch)
--**
--**	Test SGR
--*/
--static void
--charset_attributes(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	putln("Test video attributes");
--	test_one_attr(1, enter_standout_mode, exit_standout_mode);
--	test_one_attr(2, enter_underline_mode, exit_underline_mode);
--	test_one_attr(9, enter_alt_charset_mode, exit_alt_charset_mode);
--	if (!exit_attribute_mode && !set_attributes) {
--		ptextln("(sgr0) exit attribute mode is not defined.");
--		generic_done_message(t, state, ch);
--		return;
--	}
--	test_one_attr(3, enter_reverse_mode, exit_attribute_mode);
--	test_one_attr(4, enter_blink_mode, exit_attribute_mode);
--	test_one_attr(5, enter_dim_mode, exit_attribute_mode);
--	test_one_attr(6, enter_bold_mode, exit_attribute_mode);
--	test_one_attr(7, enter_secure_mode, exit_attribute_mode);
--	test_one_attr(8, enter_protected_mode, exit_attribute_mode);
--	generic_done_message(t, state, ch);
--}
--
--#define GLYPHS 256
--
--/*
--**	charset_smacs(test_list, status, ch)
--**
--**	display all possible acs characters
--**	(smacs) (rmacs)
--*/
--static void
--charset_smacs(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i, c;
--
--	if (enter_alt_charset_mode) {
--		put_clear();
--		ptextln("The following characters are available. (smacs) (rmacs)");
--		for (i = ' '; i <= '`'; i += 32) {
--			put_crlf();
--			put_mode(exit_alt_charset_mode);
--			for (c = 0; c < 32; c++) {
--				putchp(c + i);
--			}
--			put_crlf();
--			put_mode(enter_alt_charset_mode);
--			for (c = 0; c < 32; c++) {
--				putchp(c + i);
--			}
--			put_mode(exit_alt_charset_mode);
--			put_crlf();
--		}
--		put_mode(exit_alt_charset_mode);
--		put_crlf();
--		generic_done_message(t, state, ch);
--	}
--}
--
--
--static void
--test_acs(
--	int attr)
--{				/* alternate character set */
--	int i, j;
--	char valid_glyph[GLYPHS];
--	char acs_table[GLYPHS];
--	static unsigned char vt100[] = "`afgjklmnopqrstuvwxyz{|}~";
--
--	line_count = 0;
--	for (i = 0; i < GLYPHS; i++) {
--		valid_glyph[i] = FALSE;
--		acs_table[i] = i;
--	}
--	if (acs_chars) {
--		sprintf(temp, "Alternate character set map: %s",
--			expand(acs_chars));
--		putln(temp);
--		for (i = 0; acs_chars[i]; i += 2) {
--			if (acs_chars[i + 1] == 0) {
--				break;
--			}
--			for (j = 0;; j++) {
--				if (glyph[j].c == (unsigned char) acs_chars[i]) {
--					acs_table[glyph[j].c] = acs_chars[i + 1];
--					valid_glyph[glyph[j].c] = TRUE;
--					break;
--				}
--				if (glyph[j].name[0] == '\0') {
--					if (isgraph(UChar(acs_chars[i]))) {
--						sprintf(temp, "    %c",
--							acs_chars[i]);
--					} else {
--						sprintf(temp, " 0x%02x",
--							UChar(acs_chars[i]));
--					}
--					strcpy(&temp[5], " *** has no mapping ***");
--					putln(temp);
--					break;
--				}
--			}
--		}
--	} else {
--		ptextln("acs_chars not defined (acsc)");
--		/* enable the VT-100 graphics characters (default) */
--		for (i = 0; vt100[i]; i++) {
--			valid_glyph[vt100[i]] = TRUE;
--		}
--	}
--	if (attr) {
--		set_attr(attr);
--	}
--	_nc_init_acs();	/* puts 'ena_acs' and incidentally links acs_map[] */
--	for (i = 0; glyph[i].name[0]; i++) {
--		if (valid_glyph[glyph[i].c]) {
--			put_mode(enter_alt_charset_mode);
--			put_this(acs_table[glyph[i].c]);
--			char_count++;
--			put_mode(exit_alt_charset_mode);
--			if (magic_cookie_glitch >= 1) {
--				sprintf(temp, " %-30.30s", glyph[i].name);
--				put_str(temp);
--				if (char_count + 33 >= columns)
--					put_crlf();
--			} else {
--				sprintf(temp, " %-24.24s", glyph[i].name);
--				put_str(temp);
--				if (char_count + 26 >= columns)
--					put_crlf();
--			}
--			if (line_count >= lines) {
--				(void) wait_here();
--				put_clear();
--			}
--		}
--	}
--	if (char_count > 1) {
--		put_crlf();
--	}
--#ifdef ACS_ULCORNER
--	maybe_wait(5);
--	put_mode(enter_alt_charset_mode);
--	put_that(ACS_ULCORNER);
--	put_that(ACS_TTEE);
--	put_that(ACS_URCORNER);
--	put_that(ACS_ULCORNER);
--	put_that(ACS_HLINE);
--	put_that(ACS_URCORNER);
--	char_count += 6;
--	put_mode(exit_alt_charset_mode);
--	put_crlf();
--	put_mode(enter_alt_charset_mode);
--	put_that(ACS_LTEE);
--	put_that(ACS_PLUS);
--	put_that(ACS_RTEE);
--	put_that(ACS_VLINE);
--	if (magic_cookie_glitch >= 1)
--		put_this(' ');
--	else {
--		put_mode(exit_alt_charset_mode);
--		put_this(' ');
--		put_mode(enter_alt_charset_mode);
--	}
--	put_that(ACS_VLINE);
--	char_count += 6;
--	put_mode(exit_alt_charset_mode);
--	put_str("   Here are 2 boxes");
--	put_crlf();
--	put_mode(enter_alt_charset_mode);
--	put_that(ACS_LLCORNER);
--	put_that(ACS_BTEE);
--	put_that(ACS_LRCORNER);
--	put_that(ACS_LLCORNER);
--	put_that(ACS_HLINE);
--	put_that(ACS_LRCORNER);
--	char_count += 6;
--	put_mode(exit_alt_charset_mode);
--	put_crlf();
--#endif
--}
--
--/*
--**	charset_bel(test_list, status, ch)
--**
--**	(bel) test Bell
--*/
--static void
--charset_bel(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	if (bell) {
--		ptextln("Testing bell (bel)");
--		tc_putp(bell);
--		ptext("If you did not hear the Bell then (bel) has failed.  ");
--	} else {
--		ptext("(bel) Bell is not defined.  ");
--	}
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	charset_flash(test_list, status, ch)
--**
--**	(flash) test Visual bell
--*/
--static void
--charset_flash(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	if (flash_screen) {
--		ptextln("Testing visual bell (flash)");
--		tc_putp(flash_screen);
--		ptext("If you did not see the screen flash then (flash) has failed.  ");
--	} else {
--		ptext("(flash) Flash is not defined.  ");
--	}
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	charset_civis(test_list, status, ch)
--**
--**	(civis) test Cursor invisible
--*/
--static void
--charset_civis(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	if (cursor_normal) {
--		if (cursor_invisible) {
--			ptext("(civis) Turn off the cursor.  ");
--			tc_putp(cursor_invisible);
--			ptext("If you can still see the cursor then (civis) has failed.  ");
--		} else {
--			ptext("(civis) Cursor-invisible is not defined.  ");
--		}
--		generic_done_message(t, state, ch);
--		tc_putp(cursor_normal);
--	}
--}
--
--/*
--**	charset_cvvis(test_list, status, ch)
--**
--**	(cvvis) test Cursor very visible
--*/
--static void
--charset_cvvis(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	if (cursor_normal) {
--		if (cursor_visible) {
--			ptext("(cvvis) Make cursor very visible.  ");
--			tc_putp(cursor_visible);
--			ptext("If the cursor is not very visible then (cvvis) has failed.  ");
--		} else {
--			ptext("(cvvis) Cursor-very-visible is not defined.  ");
--		}
--		generic_done_message(t, state, ch);
--		tc_putp(cursor_normal);
--	}
--}
--
--/*
--**	charset_cnorm(test_list, status, ch)
--**
--**	(cnorm) test Cursor normal
--*/
--static void
--charset_cnorm(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	if (cursor_normal) {
--		ptext("(cnorm) Normal cursor.  ");
--		tc_putp(cursor_normal);
--		ptext("If the cursor is not normal then (cnorm) has failed.  ");
--	} else {
--		ptext("(cnorm) Cursor-normal is not defined.  ");
--	}
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	charset_enacs(test_list, status, ch)
--**
--**	test Alternate character set mode and alternate characters
--**	(acsc) (enacs) (smacs) (rmacs)
--*/
--static void
--charset_enacs(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int c, i;
--
--	if (enter_alt_charset_mode || acs_chars) {
--		c = 0;
--		while (1) {
--			put_clear();
--			/*
--			   for terminals that use separate fonts for
--			   attributes (such as X windows) the line
--			   drawing characters must be checked for
--			   each font.
--			*/
--			if (c >= '0' && c <= '9') {
--				test_acs(alt_modes[c - '0'].number);
--				set_attr(0);
--			} else {
--				test_acs(0);
--			}
--
--			while (1) {
--				ptextln("[r] to repeat, [012345789] to test with attributes on, [?] for a list of attributes, anything else to go to next test.  ");
--				generic_done_message(t, state, ch);
--				if (*ch != '?') {
--					break;
--				}
--				for (i = 0; i <= 9; i++) {
--					sprintf(temp, " %d %s %s", i, alt_modes[i].begin_mode,
--						alt_modes[i].name);
--					ptextln(temp);
--				}
--			}
--			if (*ch >= '0' && *ch <= '9') {
--				c = *ch;
--			} else
--			if (*ch != 'r') {
--				break;
--			}
--		}
--	} else {
--		ptext("(smacs) Enter-alt-char-set-mode and (acsc) Alternate-char-set are not defined.  ");
--		generic_done_message(t, state, ch);
--	}
--}
--
--/*
--**	charset_can_test()
--**
--**	Initialize the can_test data base
--*/
--void
--charset_can_test(void)
--{
--	int i;
--
--	for (i = 0; i < 9; i++) {
--		can_test(alt_modes[i].begin_mode, FLAG_CAN_TEST);
--		can_test(alt_modes[i].end_mode, FLAG_CAN_TEST);
--	}
--}
-diff -Naur ncurses-5.6.orig/tack/color.c ncurses-5.6/tack/color.c
---- ncurses-5.6.orig/tack/color.c	2006-11-25 19:14:25.000000000 -0500
-+++ ncurses-5.6/tack/color.c	1969-12-31 19:00:00.000000000 -0500
-@@ -1,769 +0,0 @@
--/*
--** Copyright (C) 1991, 1997 Free Software Foundation, Inc.
--**
--** This file is part of TACK.
--**
--** TACK is free software; you can redistribute it and/or modify
--** it under the terms of the GNU General Public License as published by
--** the Free Software Foundation; either version 2, or (at your option)
--** any later version.
--**
--** TACK is distributed in the hope that it will be useful,
--** but WITHOUT ANY WARRANTY; without even the implied warranty of
--** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--** GNU General Public License for more details.
--**
--** You should have received a copy of the GNU General Public License
--** along with TACK; see the file COPYING.  If not, write to
--** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
--** Boston, MA 02110-1301, USA
--*/
--
--#include <tack.h>
--
--MODULE_ID("$Id: color.c,v 1.7 2006/11/26 00:14:25 tom Exp $")
--
--/*
-- * Color terminal tests.  Has only one entry point: test_color().
-- */
--
--static void color_check(struct test_list *, int *, int *);
--static void color_setf(struct test_list *, int *, int *);
--static void color_matrix(struct test_list *, int *, int *);
--static void color_ncv(struct test_list *, int *, int *);
--static void color_ccc(struct test_list *, int *, int *);
--static void color_bce(struct test_list *, int *, int *);
--
--struct test_list color_test_list[] = {
--	{0, 0, 0, 0, "e) edit terminfo", 0, &edit_menu},
--	{MENU_NEXT, 2, "colors) (pairs", 0, 0, color_check, 0},
--	{MENU_NEXT, 12, "setf) (setb) (scp", 0, 0, color_setf, 0},
--	{MENU_NEXT, 24, "op", 0, 0, color_matrix, 0},
--	{MENU_NEXT, 16, "ncv", 0, 0, color_ncv, 0},
--	{MENU_NEXT, 0, "bce", 0, 0, color_bce, 0},
--	{MENU_NEXT | MENU_CLEAR, 0, "ccc) (initc) (initp", "hls op oc", 0, color_ccc, 0},
--	{MENU_LAST, 0, 0, 0, 0, 0, 0}
--};
--
--#ifndef COLOR_BLACK
--#define COLOR_BLACK     0
--#define COLOR_BLUE      1
--#define COLOR_GREEN     2
--#define COLOR_CYAN      3
--#define COLOR_RED       4
--#define COLOR_MAGENTA   5
--#define COLOR_YELLOW    6
--#define COLOR_WHITE     7
--#endif
--
--struct color_table {
--	const char *name;
--	int index;
--	int r, g, b;
--	int h, l, s;
--};
--
--static struct color_table def_colors[8] = {
--	{"black  ", COLOR_BLACK, 0, 0, 0, 0, 0, 0},
--	{"blue   ", COLOR_BLUE, 0, 0, 1000, 330, 50, 100},
--	{"green  ", COLOR_GREEN, 0, 1000, 0, 240, 50, 100},
--	{"cyan   ", COLOR_CYAN, 0, 1000, 1000, 300, 50, 100},
--	{"red    ", COLOR_RED, 1000, 0, 0, 120, 50, 100},
--	{"magenta", COLOR_MAGENTA, 1000, 0, 1000, 60, 50, 100},
--	{"yellow ", COLOR_YELLOW, 1000, 1000, 0, 180, 50, 100},
--	{"white  ", COLOR_WHITE, 1000, 1000, 1000, 0, 100, 0}
--};
--
--#define MAX_PAIR	256
--static int fg_color[MAX_PAIR] = {COLOR_BLACK, COLOR_BLUE, COLOR_GREEN,
--COLOR_CYAN, COLOR_RED, COLOR_MAGENTA, COLOR_YELLOW, COLOR_WHITE};
--static int bg_color[MAX_PAIR] = {COLOR_BLACK, COLOR_BLACK, COLOR_BLACK,
--COLOR_BLACK, COLOR_BLACK, COLOR_BLACK, COLOR_BLACK, COLOR_BLACK};
--static int pairs_used = 8;
--static int a_bright_color, bright_value;
--static int cookie_monster, color_step, colors_per_line;
--static int R, G, B;
--
--static void reset_colors(void)
--{
--	tc_putp(orig_colors);
--	tc_putp(TPARM_0(orig_pair));
--}
--
--static int
--color_trans(int c)
--{				/* translate or load the color */
--	int i;
--
--	for (i = 0; i < pairs_used; i++) {
--		if (fg_color[i] == c) {
--			return i;
--		}
--	}
--	if (!can_change) {
--		return 0;
--	}
--	if (pairs_used > max_colors || pairs_used >= MAX_PAIR) {
--		pairs_used = 0;
--		ptextln("Ran out of colors");
--	}
--	fg_color[pairs_used] = c;
--	bg_color[pairs_used] = c;
--	if (hue_lightness_saturation) {
--		tc_putp(TPARM_4(initialize_color, pairs_used,
--			def_colors[c].h, def_colors[c].l, def_colors[c].s));
--	} else {
--		tc_putp(TPARM_4(initialize_color, pairs_used,
--			def_colors[c].r, def_colors[c].g, def_colors[c].b));
--	}
--	return pairs_used++;
--}
--
--static void
--new_color(
--	int fg,
--	int bg,
--	int hungry)
--{				/* change the color to fg and bg. */
--	int i;
--
--	if (hungry) {
--		eat_cookie();
--	}
--	if (set_a_foreground) {
--		/* set ANSI color (setaf) (setab) */
--		tc_putp(TPARM_1(set_a_foreground, fg));
--		tc_putp(TPARM_1(set_a_background, bg));
--	} else if (set_foreground) {
--		/* make sure black is zero */
--		(void) color_trans(COLOR_BLACK);
--		tc_putp(TPARM_1(set_foreground, color_trans(fg)));
--		tc_putp(TPARM_1(set_background, color_trans(bg)));
--	} else {	/* set color pair */
--		for (i = 0; i < pairs_used; i++) {
--			if (fg_color[i] == fg && bg_color[i] == bg) {
--				tc_putp(TPARM_1(set_color_pair, i));
--				if (hungry) {
--					eat_cookie();
--				}
--				return;
--			}
--		}
--		if (!can_change) {
--			/* try to set just the foreground */
--			for (i = pairs_used - 1; i; i--) {
--				if (fg_color[i] == fg)
--					break;
--			}
--			tc_putp(TPARM_1(set_color_pair, i));
--			if (hungry) {
--				eat_cookie();
--			}
--			return;
--		}
--		if (pairs_used > max_pairs || pairs_used >= MAX_PAIR) {
--			pairs_used = 0;
--			ptextln("Ran out of color pairs");
--		}
--		fg_color[pairs_used] = fg;
--		bg_color[pairs_used] = bg;
--		if (hue_lightness_saturation) {
--			tc_putp(TPARM_7(initialize_pair, pairs_used,
--				def_colors[fg].h, def_colors[fg].l, def_colors[fg].s,
--				def_colors[bg].h, def_colors[bg].l, def_colors[bg].s));
--		} else {
--			tc_putp(TPARM_7(initialize_pair, pairs_used,
--				def_colors[fg].r, def_colors[fg].g, def_colors[fg].b,
--				def_colors[bg].r, def_colors[bg].g, def_colors[bg].b));
--		}
--		tc_putp(TPARM_1(set_color_pair, pairs_used));
--		pairs_used++;
--	}
--	if (hungry) {
--		eat_cookie();
--	}
--}
--
--
--static void
--set_color_step(void)
--{				/* set the color_step for the (ccc) display */
--	int i;
--
--	for (i = 2; i < 1000; i++) {
--		if ((i * i * i) >= max_colors) {
--			break;
--		}
--	}
--	color_step = 1000 / (i - 1);
--}
--
--
--static void
--rgb_2_hls(int r, int g, int b, int *h, int *l, int *s)
--{				/* convert RGB to HLS system */
--	int min, max, t;
--
--	if ((min = g < r ? g : r) > b) {
--		min = b;
--	}
--	if ((max = g > r ? g : r) < b) {
--		max = b;
--	}
--
--	/* calculate lightness */
--	*l = (min + max) / 20;
--
--	if (min == max) {	/* black, white and all shades of gray */
--		*h = 0;
--		*s = 0;
--		return;
--	}
--	/* calculate saturation */
--	if (*l < 50) {
--		*s = ((max - min) * 100) / (max + min);
--	} else {
--		*s = ((max - min) * 100) / (2000 - max - min);
--	}
--
--	/* calculate hue */
--	if (r == max) {
--		t = 120 + ((g - b) * 60) / (max - min);
--	} else if (g == max) {
--		t = 240 + ((b - r) * 60) / (max - min);
--	} else {
--		t = 360 + ((r - g) * 60) / (max - min);
--	}
--	*h = t % 360;
--}
--
--
--static void
--send_color(int p, int r, int g, int b)
--{				/* send the initialize_color (initc) command */
--	int h, l, s;
--
--	if (hue_lightness_saturation) {
--		rgb_2_hls(r, g, b, &h, &l, &s);
--		tc_putp(TPARM_4(initialize_color, p, h, l, s));
--	} else {
--		tc_putp(TPARM_4(initialize_color, p, r, g, b));
--	}
--}
--
--
--static void
--send_pair(int p, int fr, int fg, int fb, int br, int bg, int bb)
--{				/* send the initialize_pair (initp) command */
--	int fh, fl, fs, bh, bl, bs;
--
--	if (hue_lightness_saturation) {
--		rgb_2_hls(fr, fg, fb, &fh, &fl, &fs);
--		rgb_2_hls(br, bg, bb, &bh, &bl, &bs);
--		tc_putp(TPARM_7(initialize_pair, p, fh, fl, fs, bh, bl, bs));
--	} else {
--		tc_putp(TPARM_7(initialize_pair, p, fr, fg, fb, bb, bg, bb));
--	}
--}
--
--
--static int
--load_palette(int n)
--{				/* load the color palette */
--	int rgb;
--
--	for (;;) {
--		if (pairs_used >= n) {
--			return FALSE;
--		}
--		if (set_a_foreground || set_foreground) {
--			if (pairs_used >= max_colors) {
--				return FALSE;
--			}
--			send_color(pairs_used, R, G, B);
--			rgb = R + G + B;
--			if (rgb > bright_value) {
--				bright_value = rgb;
--				a_bright_color = pairs_used;
--			}
--		} else {
--			if (pairs_used >= max_pairs) {
--				return FALSE;
--			}
--			if (pairs_used == 0) {
--				send_pair(pairs_used, 1000, 1000, 1000, R, G, B);
--			} else {
--				send_pair(pairs_used, R, G, B, R, G, B);
--			}
--		}
--		pairs_used++;
--		if ((B += color_step) > 1000) {
--			B = 0;
--			if ((G += color_step) > 1000) {
--				G = 0;
--				if ((R += color_step) > 1000) {
--					return TRUE;
--				}
--			}
--		}
--	}
--}
--
--
--static int
--rainbow(int n)
--{				/* print the programmable color display */
--	int i, c, d, palette_full, initial_pair;
--	static const struct {
--		const char *name;
--		char ch;
--	}  splat[] = {
--		{"Bg normal", ' '},
--		{"Fg normal", ' '},
--		{0, 0}
--	};
--
--	if ((set_a_foreground || set_foreground)
--	  ? pairs_used >= max_colors
--	  : pairs_used >= max_pairs) {
--		ptext("New palette: ");
--		(void) wait_here();
--		initial_pair = pairs_used = 1;
--		bright_value = 0;
--	} else if (line_count + 3 >= lines) {
--		ptext("Go: ");
--		(void) wait_here();
--		put_clear();
--		initial_pair = pairs_used = 1;
--		bright_value = 0;
--		n++;
--	} else {
--		initial_pair = pairs_used;
--		n += initial_pair;
--	}
--	palette_full = load_palette(n);
--	for (d = 0; splat[d].name; d++) {
--		c = splat[d].ch;
--		if (d == 1) {
--			put_mode(enter_reverse_mode);
--		}
--		for (i = initial_pair; i < n; i++) {
--			if (i >= pairs_used) {
--				break;
--			}
--			if (set_a_foreground) {
--				if (i >= max_colors) {
--					break;
--				}
--				tc_putp(TPARM_1(set_a_foreground, i));
--				tc_putp(TPARM_1(set_a_background, i));
--			} else if (set_foreground) {
--				if (i >= max_colors) {
--					break;
--				}
--				tc_putp(TPARM_1(set_foreground, i));
--				tc_putp(TPARM_1(set_background, i));
--			} else {
--				if (i >= max_pairs) {
--					break;
--				}
--				tc_putp(TPARM_1(set_color_pair, i));
--			}
--			putchp(c);
--		}
--		if (d == 1) {
--			put_mode(exit_attribute_mode);
--		}
--		if (set_a_foreground) {
--			tc_putp(TPARM_1(set_a_foreground, a_bright_color));
--			tc_putp(TPARM_1(set_a_background, 0));
--		} else if (set_foreground) {
--			tc_putp(TPARM_1(set_foreground, a_bright_color));
--			tc_putp(TPARM_1(set_background, 0));
--		} else {
--			tc_putp(TPARM_1(set_color_pair, 0));
--		}
--		put_str("   ");
--		put_str(splat[d].name);
--		put_crlf();
--	}
--	return palette_full;
--}
--
--
--static void
--ncv_display(int m)
--{				/* print the no_color_video (ncv) test line */
--	putchp('0' + m);
--	putchp(' ');
--	eat_cookie();
--	set_attr(1 << m);
--	sprintf(temp, "%-11s", alt_modes[m].name);
--	put_str(temp);
--
--	new_color(COLOR_BLUE, COLOR_BLACK, TRUE);
--	put_str("blue");
--
--	new_color(COLOR_BLACK, COLOR_GREEN, TRUE);
--	put_str("green");
--
--	new_color(COLOR_WHITE, COLOR_BLACK, TRUE);
--	put_str(alt_modes[m].name);
--	eat_cookie();
--	set_attr(0);
--	reset_colors();
--	put_crlf();
--}
--
--
--static void
--dump_colors(void)
--{				/* display the colors in some esthetic
--				   pattern */
--	static int xmap[8] = {0, 3, 4, 7, 1, 2, 5, 6};
--	int i, j, k, xi, xj, width, p, cs;
--	int found_one;
--
--	cs = color_step <= 125 ? 125 : color_step;
--	width = (1000 / cs) + 1;
--	for (xi = 0; xi < 16; xi++) {
--		i = (xi & 8) ? xi ^ 15 : xi;
--		R = i * cs;
--		if (R <= 1000) {
--			found_one = FALSE;
--			for (xj = 0; xj < 32; xj++) {
--				j = ((xj & 8) ? xj ^ 15 : xj) & 7;
--				k = xmap[((xi >> 1) & 4) + (xj >> 3)];
--				G = j * cs;
--				B = k * cs;
--				if (G <= 1000 && B <= 1000) {
--					p = (k * width + j) * width + i;
--					if (set_a_background) {
--						if (p >= max_colors) {
--							continue;
--						}
--						send_color(p, R, G, B);
--						tc_putp(TPARM_1(set_a_background, p));
--					} else if (set_background) {
--						if (p >= max_colors) {
--							continue;
--						}
--						send_color(p, R, G, B);
--						tc_putp(TPARM_1(set_background, p));
--					} else {
--						if (p >= max_pairs) {
--							continue;
--						}
--						send_pair(p, R, G, B, R, G, B);
--						tc_putp(TPARM_1(set_color_pair, p));
--					}
--					found_one = TRUE;
--					putchp(' ');
--					putchp(' ');
--				}
--			}
--			if (found_one) {
--				put_crlf();
--			}
--		}
--	}
--}
--
--/*
--**	color_check(test_list, status, ch)
--**
--**	test (colors) and (pairs)
--*/
--static void
--color_check(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	if (max_colors <= 0 && max_pairs <= 0) {
--		ptext("This is not a color terminal; (colors) and (pairs) are missing.  ");
--		*state |= MENU_STOP;
--	} else {
--		sprintf(temp, "This terminal can display %d colors and %d color pairs.  (colors) (pairs)",
--			max_colors, max_pairs);
--		ptextln(temp);
--	}
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	color_setf(test_list, status, ch)
--**
--**	test (setf) (setb) and (scp)
--*/
--static void
--color_setf(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i, j;
--
--	if (max_colors <= 0 && max_pairs <= 0) {
--		ptext("This is not a color terminal; (colors) and (pairs) are missing.  ");
--		generic_done_message(t, state, ch);
--		*state |= MENU_STOP;
--		return;
--	}
--	if ((set_a_foreground == NULL || set_a_background == NULL)
--	 && (set_foreground == NULL   || set_background == NULL)
--	 && set_color_pair == NULL) {
--		ptextln("Both set foreground (setaf/setf) and set color pair (scp) are not present.");
--		if (!set_a_background || !set_background) {
--			ptextln("(setab/setb) set background not present");
--		}
--		ptext("These must be defined for color testing.  ");
--		generic_done_message(t, state, ch);
--		*state |= MENU_STOP;
--		return;
--	}
--	/* initialize the color palette */
--	pairs_used = max_colors >= 8 ? 8 : max_colors;
--	reset_colors();
--	new_color(COLOR_WHITE, COLOR_BLACK, FALSE);
--
--	ptextln("(setf) (setb) (scp) The following colors are predefined:");
--	ptextln("\n   Foreground     Background");
--	put_crlf();
--	j = max_colors > 8 ? 8 : max_colors;
--	/*
--	 * the black on white test is the same as the white on black test.
--	 */
--	for (i = 1; i < j; i++) {
--		putchp('0' + def_colors[i].index);
--		putchp(' ');
--		sprintf(temp, " %s ", def_colors[i].name);
--
--		new_color(def_colors[i].index, COLOR_BLACK, TRUE);
--		put_str(temp);
--
--		new_color(COLOR_BLACK, COLOR_BLACK, TRUE);
--		put_str("  ");
--
--		new_color(COLOR_BLACK, def_colors[i].index, TRUE);
--		put_str(temp);
--
--		new_color(COLOR_WHITE, COLOR_BLACK, FALSE);
--		put_crlf();
--	}
--	reset_colors();
--	put_crlf();
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	color_matrix(test_list, status, ch)
--**
--**	test (pairs) (op)
--*/
--static void
--color_matrix(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i, j, matrix_size, matrix_area, brightness;
--
--	matrix_size = max_colors > 8 ? 8 : max_colors;
--
--	sprintf(temp, "(pairs) There are %d color pairs.", max_pairs);
--	ptextln(temp);
--
--	for ( ; matrix_size; matrix_size--) {
--		if (matrix_size * matrix_size <= max_pairs) {
--			break;
--		}
--	}
--	matrix_area = matrix_size * matrix_size;
--	for (brightness = 0; brightness < 2; brightness++) {
--		put_crlf();
--		sprintf(temp,
--			"%dx%d matrix of foreground/background colors, bright *o%s*",
--			matrix_size, matrix_size, brightness ? "n" : "ff");
--		put_str(temp);
--
--		put_str("\n          ");
--		for (i = 0; i < matrix_size; i++) {
--			(void) sprintf(temp, "%-8s", def_colors[i].name);
--			put_str(temp);
--		}
--		for (j = 0; j < matrix_area; j++) {
--			if (j % matrix_size == 0) {
--				reset_colors();
--				put_crlf();
--				if (brightness) {
--					tc_putp(exit_attribute_mode);
--				}
--				(void) sprintf(temp, "%-8s", def_colors[j / matrix_size].name);
--				put_str(temp);
--				if (brightness) {
--					put_mode(enter_bold_mode);
--				}
--			}
--			new_color(def_colors[j % matrix_size].index,
--				def_colors[j / matrix_size].index,
--				FALSE);
--			put_str("  Hello ");
--		}
--		reset_colors();
--		if (brightness) {
--			tc_putp(exit_attribute_mode);
--		}
--		put_crlf();
--	}
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	color_ncv(test_list, status, ch)
--**
--**	test (ncv)
--*/
--static void
--color_ncv(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i;
--
--	if (no_color_video == -1) {
--		/* I have no idea what this means */
--		return;
--	}
--	sprintf(temp, "According to no_color_video (ncv) which is %d, the following attributes should work correctly with color.", no_color_video);
--	ptextln(temp);
--	put_crlf();
--	set_attr(0);
--	ncv_display(0);
--	for (i = 1; i <= 9; i++) {
--		if (((no_color_video >> (mode_map[i] - 1)) & 1) == 0) {
--			ncv_display(mode_map[i]);
--		}
--	}
--	if (no_color_video & 0x3ff) {
--		ptextln("\nThe following attributes should not work correctly with color. (ncv)\n");
--		for (i = 1; i <= 9; i++) {
--			if ((no_color_video >> (mode_map[i] - 1)) & 1) {
--				ncv_display(mode_map[i]);
--			}
--		}
--	}
--	reset_colors();
--	put_crlf();
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	color_bce(test_list, status, ch)
--**
--**	test (bce) background color erase
--*/
--static void
--color_bce(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	new_color(COLOR_CYAN, COLOR_BLUE, FALSE);
--	put_clear();
--	put_newlines(2);
--	reset_colors();
--	ptextln("If the two lines above are blue then back_color_erase (bce) should be true.");
--	sprintf(temp, "(bce) is %s in the data base.", back_color_erase ? "true" : "false");
--	ptextln(temp);
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	color_ccc(test_list, status, ch)
--**
--**	test (ccc) color palette test (oc) (op) (initc) (initp)
--*/
--static void
--color_ccc(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i, j;
--
--	if (!can_change) {
--		ptextln("Terminal can not change colors (ccc)");
--		generic_done_message(t, state, ch);
--		return;
--	}
--	reset_colors();
--	pairs_used = 0;
--	new_color(COLOR_WHITE, COLOR_BLACK, FALSE);
--	sprintf(temp, "Reloading colors (init%c) using %s method",
--		set_foreground ? 'c' : 'p',
--		hue_lightness_saturation ? "HLS" : "RGB");
--	ptextln(temp);
--	put_crlf();
--	j = max_colors > 7 ? 7 : max_colors;
--	/* redisplay the above test with reinitialized colors */
--	/* If these colors don't look right to you... */
--	for (i = 0; i < j; i++) {
--		sprintf(temp, " %s ", def_colors[i ^ 7].name);
--
--		new_color(i ^ 7, COLOR_BLACK, TRUE);
--		put_str(temp);
--
--		new_color(COLOR_BLACK, COLOR_BLACK, TRUE);
--		put_str("  ");
--
--		new_color(COLOR_BLACK, i ^ 7, TRUE);
--		put_str(temp);
--
--		new_color(COLOR_WHITE, COLOR_BLACK, FALSE);
--		put_crlf();
--	}
--	generic_done_message(t, state, ch);
--	if (*ch != 0 && *ch != 'n') {
--		reset_colors();
--		return;
--	}
--
--	pairs_used = 0;
--	cookie_monster = 0;
--	if (magic_cookie_glitch > 0) {
--		cookie_monster =
--			((set_a_foreground || set_foreground)
--				? magic_cookie_glitch : 0) +
--			((set_a_background || set_background)
--				? magic_cookie_glitch : 0) +
--			(set_color_pair ? magic_cookie_glitch : 0);
--	}
--	set_color_step();
--	colors_per_line = max_colors > max_pairs
--		? max_pairs : max_colors;
--	j = (columns - 14) / (cookie_monster + 1);
--	if (colors_per_line > j) {
--		colors_per_line = (j / i) * i;
--	}
--	sprintf(temp, "RGB color step %d, cookies %d", color_step,
--		cookie_monster);
--	ptextln(temp);
--
--	R = G = B = 0;
--	pairs_used = 0;
--	for (;;) {
--		if (rainbow(colors_per_line)) {
--			break;
--		}
--	}
--	generic_done_message(t, state, ch);
--	if (*ch != 0 && *ch != 'n') {
--		reset_colors();
--		return;
--	}
--	dump_colors();
--	reset_colors();
--	generic_done_message(t, state, ch);
--}
-diff -Naur ncurses-5.6.orig/tack/control.c ncurses-5.6/tack/control.c
---- ncurses-5.6.orig/tack/control.c	2006-06-24 17:27:53.000000000 -0400
-+++ ncurses-5.6/tack/control.c	1969-12-31 19:00:00.000000000 -0500
-@@ -1,664 +0,0 @@
--/*
--** Copyright (C) 1991, 1997 Free Software Foundation, Inc.
--** 
--** This file is part of TACK.
--** 
--** TACK is free software; you can redistribute it and/or modify
--** it under the terms of the GNU General Public License as published by
--** the Free Software Foundation; either version 2, or (at your option)
--** any later version.
--** 
--** TACK is distributed in the hope that it will be useful,
--** but WITHOUT ANY WARRANTY; without even the implied warranty of
--** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--** GNU General Public License for more details.
--** 
--** You should have received a copy of the GNU General Public License
--** along with TACK; see the file COPYING.  If not, write to
--** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
--** Boston, MA 02110-1301, USA
--*/
--
--#include <tack.h>
--
--#if HAVE_SYS_TIME_H
--#include <sys/time.h>
--#endif
--
--MODULE_ID("$Id: control.c,v 1.9 2006/06/24 21:27:53 tom Exp $")
--
--/* terminfo test program control subroutines */
--
--#if HAVE_GETTIMEOFDAY
--#define MY_TIMER struct timeval
--#else
--#define MY_TIMER time_t
--#endif
--
--/* globals */
--int test_complete;		/* counts number of tests completed */
--
--char txt_longer_test_time[80];	/* +) use longer time */
--char txt_shorter_test_time[80];	/* -) use shorter time */
--static int pad_test_duration = 1;	/* number of seconds for a pad test */
--int auto_pad_mode;		/* run the time tests */
--int no_alarm_event;		/* TRUE if the alarm has not gone off yet */
--unsigned long usec_run_time;	/* length of last test in microseconds */
--static MY_TIMER stop_watch[MAX_TIMERS]; /* Hold the start timers */
--
--char txt_longer_augment[80];	/* >) use bigger augment */
--char txt_shorter_augment[80];	/* <) use smaller augment */
--
--/* caps under test data base */
--int tt_delay_max;		/* max number of milliseconds we can delay */
--int tt_delay_used;		/* number of milliseconds consumed in delay */
--const char *tt_cap[TT_MAX];	/* value of string */
--int tt_affected[TT_MAX];	/* lines or columns effected (repetition factor) */
--int tt_count[TT_MAX];		/* Number of times sent */
--int tt_delay[TT_MAX];		/* Number of milliseconds delay */
--int ttp;			/* number of entries used */
--
--/* Saved value of the above data base */
--const char *tx_cap[TT_MAX];	/* value of string */
--int tx_affected[TT_MAX];	/* lines or columns effected (repetition factor) */
--int tx_count[TT_MAX];		/* Number of times sent */
--int tx_index[TT_MAX];		/* String index */
--int tx_delay[TT_MAX];		/* Number of milliseconds delay */
--int txp;			/* number of entries used */
--int tx_characters;		/* printing characters sent by test */
--unsigned long tx_cps;		/* characters per second */
--static struct test_list *tx_source;	/* The test that generated this data */
--
--#define RESULT_BLOCK		1024
--static int blocks;		/* number of result blocks available */
--static struct test_results *results;	/* pointer to next available */
--static struct test_results **pads;	/* save pad results here */
--
--static void
--alloc_arrays(void)
--{
--    	if (pads == 0) {
--	    	pads = (struct test_results **)calloc(MAX_STRINGS, sizeof(struct test_results *));
--	}
--}
--
--/*
--**	event_start(number)
--**
--**	Begin the stopwatch at the current time-of-day.
--*/
--void
--event_start(int n)
--{
--#if HAVE_GETTIMEOFDAY
--	(void) gettimeofday(&stop_watch[n], (struct timezone *)0);
--#else
--	stop_watch[n] = time((time_t *)0);
--#endif
--}
--
--/*
--**	event_time(number)
--**
--**	Return the number of milliseconds since this stop watch began.
--*/
--long
--event_time(int n)
--{
--#if HAVE_GETTIMEOFDAY
--	MY_TIMER current_time;
--
--	(void) gettimeofday(&current_time, (struct timezone *)0);
--	return ((current_time.tv_sec - stop_watch[n].tv_sec) * 1000000)
--		+ current_time.tv_usec - stop_watch[n].tv_usec;
--#else
--	return (time((time_t *)0) - stop_watch[n]) * 1000;
--#endif
--}
--
--/*****************************************************************************
-- *
-- * Execution control for string capability tests
-- *
-- *****************************************************************************/
--
--/*
--**	get_next_block()
--**
--**	Get a results block for pad test data.
--*/
--static struct test_results *
--get_next_block(void)
--{
--	if (blocks <= 0) {
--		results = (struct test_results *)
--			malloc(sizeof(struct test_results) * RESULT_BLOCK);
--		if (!results) {
--			ptextln("Malloc failed");
--			return (struct test_results *) 0;
--		}
--		blocks = RESULT_BLOCK;
--	}
--	blocks--;
--	return results++;
--}
--
--/*
--**	set_augment_txt()
--**
--**	Initialize the augment menu selections
--*/
--void
--set_augment_txt(void)
--{
--	sprintf(txt_longer_augment,
--		">) Change lines/characters effected to %d", augment << 1);
--	sprintf(txt_shorter_augment,
--		"<) Change lines/characters effected to %d", augment >> 1);
--}
--
--void
--control_init(void)
--{
--	sprintf(txt_longer_test_time, "+) Change test time to %d seconds",
--		pad_test_duration + 1);
--	sprintf(txt_shorter_test_time, "-) Change test time to %d seconds",
--		pad_test_duration - 1);
--	set_augment_txt();
--}
--
--/*
--**	msec_cost(cap, affected-count)
--**
--**	Return the number of milliseconds delay needed by the cap.
--*/
--int
--msec_cost(
--	const char *const cap,
--	int affcnt)
--{
--	int dec, value, total, star, ch;
--	const char *cp;
--
--	if (!cap) {
--		return 0;
--	}
--	total = 0;
--	for (cp = cap; *cp; cp++) {
--		if (*cp == '$' && cp[1] == '<') {
--			star = 1;
--			value = dec = 0;
--			for (cp += 2; (ch = *cp); cp++) {
--				if (ch >= '0' && ch <= '9') {
--					value = value * 10 + (ch - '0');
--					dec *= 10;
--				} else
--				if (ch == '.') {
--					dec = 1;
--				} else
--				if (ch == '*') {
--					star = affcnt;
--				} else
--				if (ch == '>') {
--					break;
--				}
--			}
--			if (dec > 1) {
--				total += (value * star) / dec;
--			} else {
--				total += (value * star);
--			}
--		}
--	}
--	return total;
--}
--
--/*
--**	liberated(cap)
--**
--**	Return the cap without padding
--*/
--char *
--liberated(char *cap)
--{
--	static char cb[1024];
--	char *ts, *ls;
--
--	cb[0] = '\0';
--	ls = NULL;
--	if (cap) {
--		for (ts = cb; (*ts = *cap); ++cap) {
--			if (*cap == '$' && cap[1] == '<') {
--				ls = ts;
--			}
--			++ts;
--			if (*cap == '>') {
--				if (ls) {
--					ts = ls;
--					ls = NULL;
--				}
--			}
--		}
--	}
--	return cb;
--}
--
--/*
--**	page_loop()
--**
--**	send CR/LF or go home and bump letter
--*/
--void
--page_loop(void)
--{
--	if (line_count + 2 >= lines) {
--		NEXT_LETTER;
--		go_home();
--	} else {
--		put_crlf();
--	}
--}
--
--/*
--**	skip_pad_test(test-list-entry, state, ch, text)
--**
--**	Print the start test line.  Handle start up commands.
--**	Return TRUE if a return is requested.
--*/
--int
--skip_pad_test(
--	struct test_list *test,
--	int *state,
--	int *ch,
--	const char *text)
--{
--	char rep_text[16];
--
--	while(1) {
--		if (text) {
--			ptext(text);
--		}
--		if ((test->flags & MENU_LC_MASK)) {
--			sprintf(rep_text, " *%d", augment);
--			ptext(rep_text);
--		}
--		ptext(" [n] > ");
--		*ch = wait_here();
--		if (*ch == 's') {
--			/* Skip is converted to next */
--			*ch = 'n';
--			return TRUE;
--		}
--		if (*ch == 'q') {
--			/* Quit is converted to help */
--			*ch = '?';
--			return TRUE;
--		}
--		if (*ch == '\r' || *ch == '\n' || *ch == 'n' || *ch == 'r') {
--			/* this is the only response that allows the test to run */
--			*ch = 0;
--		}
--		if (subtest_menu(pad_test_list, state, ch)) {
--			continue;
--		}
--		return (*ch != 0);
--	}
--}
--
--/*
--**	pad_done_message(test_list)
--**
--**	Print the Done message and request input.
--*/
--void
--pad_done_message(
--	struct test_list *test,
--	int *state,
--	int *ch)
--{
--	int default_action = 0;
--	char done_message[128];
--	char rep_text[16];
--
--	while (1) {
--		if ((test->flags & MENU_LC_MASK)) {
--			sprintf(rep_text, "*%d", augment);
--		} else {
--			rep_text[0] = '\0';
--		}
--		if (test->caps_done) {
--			sprintf(done_message, "(%s)%s Done ", test->caps_done,
--			rep_text);
--			ptext(done_message);
--		} else {
--			if (rep_text[0]) {
--				ptext(rep_text);
--				ptext(" ");
--			}
--			ptext("Done ");
--		}
--		if (debug_level & 2) {
--			dump_test_stats(test, state, ch);
--		} else {
--			*ch = wait_here();
--		}
--		if (*ch == '\r' || *ch == '\n') {
--			*ch = default_action;
--			return;
--		}
--		if (*ch == 's' || *ch == 'n') {
--			*ch = 0;
--			return;
--		}
--		if (strchr(pad_repeat_test, *ch)) {
--			/* default action is now repeat */
--			default_action = 'r';
--		}
--		if (subtest_menu(pad_test_list, state, ch)) {
--			continue;
--		}
--		return;
--	}
--}
--
--/*
--**	sliding_scale(dividend, factor, divisor)
--**
--**	Return (dividend * factor) / divisor
--*/
--int
--sliding_scale(
--	int dividend,
--	int factor,
--	unsigned long divisor)
--{
--	double d = dividend;
--
--	if (divisor) {
--		d = (d * (double) factor) / (double) divisor;
--		return (int) (d + 0.5);
--	}
--	return 0;
--}
--
--/*
--**	pad_test_startup()
--**
--**	Do the stuff needed to begin a test.
--*/
--void
--pad_test_startup(
--	int do_clear)
--{
--	if (do_clear) {
--		put_clear();
--	}
--	repeats = augment;
--	raw_characters_sent = 0;
--	test_complete = ttp = char_count = tt_delay_used = 0;
--	letter = letters[letter_number = 0];
--	if (pad_test_duration <= 0) {
--		pad_test_duration = 1;
--	}
--	tt_delay_max = pad_test_duration * 1000;
--	set_alarm_clock(pad_test_duration);
--	event_start(TIME_TEST);
--}
--
--/*
--**	still_testing()
--**
--**	This function is called to see if the test loop should be terminated.
--*/
--int
--still_testing(void)
--{
--	fflush(stdout);
--	test_complete++;
--	return EXIT_CONDITION;
--}
--
--/*
--**	pad_test_shutdown()
--**
--**	Do the stuff needed to end a test.
--*/
--void
--pad_test_shutdown(
--	struct test_list *t,
--	int crlf)
--{
--	int i;
--	int counts;			/* total counts */
--	int ss;				/* Save string index */
--	int cpo;			/* characters per operation */
--	int delta;			/* difference in characters */
--	int bogus;			/* Time is inaccurate */
--	struct test_results *r;		/* Results of current test */
--	int ss_index[TT_MAX];		/* String index */
--
--	alloc_arrays();
--	if (tty_can_sync == SYNC_TESTED) {
--		bogus = tty_sync_error();
--	} else {
--		bogus = 1;
--	}
--	usec_run_time = event_time(TIME_TEST);
--	tx_source = t;
--	tx_characters = raw_characters_sent;
--	tx_cps = sliding_scale(tx_characters, 1000000, usec_run_time);
--
--	/* save the data base */
--	for (txp = ss = counts = 0; txp < ttp; txp++) {
--		tx_cap[txp]   = tt_cap[txp];
--		tx_count[txp] = tt_count[txp];
--		tx_delay[txp] = tt_delay[txp];
--		tx_affected[txp] = tt_affected[txp];
--		tx_index[txp] = get_string_cap_byvalue(tt_cap[txp]);
--		if (tx_index[txp] >= 0) {
--			if (cap_match(t->caps_done, strnames[tx_index[txp]])) {
--				ss_index[ss++] = txp;
--				counts += tx_count[txp];
--			}
--		}
--	}
--
--	if (crlf) {
--		put_crlf();
--	}
--	if (counts == 0 || tty_cps == 0 || bogus) {
--		/* nothing to do */
--		return;
--	}
--	/* calculate the suggested pad times */
--	delta = usec_run_time - sliding_scale(tx_characters, 1000000, tty_cps);
--	if (delta < 0) {
--		/* probably should bump tx_characters */
--		delta = 0;
--	}
--	cpo = delta / counts;
--	for (i = 0; i < ss; i++) {
--		if (!(r = get_next_block())) {
--			return;
--		}
--		r->next = pads[tx_index[ss_index[i]]];
--		pads[tx_index[ss_index[i]]] = r;
--		r->test = t;
--		r->reps = tx_affected[ss_index[i]];
--		r->delay = cpo;
--	}
--}
--
--/*
--**	show_cap_results(index)
--**
--**	Display the previous results
--*/
--static void
--show_cap_results(
--	int x)
--{
--	struct test_results *r;		/* a result */
--	int delay;
--
--	alloc_arrays();
--	if ((r = pads[x])) {
--		sprintf(temp, "(%s)", strnames[x]);
--		ptext(temp);
--		while (r) {
--			sprintf(temp, "$<%d>", r->delay / 1000);
--			put_columns(temp, (int) strlen(temp), 10);
--			r = r->next;
--		}
--		r = pads[x];
--		while (r) {
--			if (r->reps > 1) {
--				delay = r->delay / (r->reps * 100);
--				sprintf(temp, "$<%d.%d*>", delay / 10, delay % 10);
--				put_columns(temp, (int) strlen(temp), 10);
--			}
--			r = r->next;
--		}
--		put_crlf();
--	}
--}
--
--/*
--**	dump_test_stats(test_list, status, ch)
--**
--**	Dump the statistics about the last test
--*/
--void
--dump_test_stats(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i, j;
--	char tbuf[32];
--	int x[32];
--
--	put_crlf();
--	if (tx_source && tx_source->caps_done) {
--		cap_index(tx_source->caps_done, x);
--		if (x[0] >= 0) {
--			sprintf(temp, "Caps summary for (%s)",
--				tx_source->caps_done);
--			ptextln(temp);
--			for (i = 0; x[i] >= 0; i++) {
--				show_cap_results(x[i]);
--			}
--			put_crlf();
--		}
--	}
--	sprintf(tbuf, "%011lu", usec_run_time);
--	sprintf(temp, "Test time: %lu.%s, characters per second %lu, characters %d",
--		usec_run_time / 1000000UL, &tbuf[5], tx_cps, tx_characters);
--	ptextln(temp);
--	for (i = 0; i < txp; i++) {
--		if ((j = get_string_cap_byvalue(tx_cap[i])) >= 0) {
--			sprintf(tbuf, "(%s)", strnames[j]);
--		} else {
--			strcpy(tbuf, "(?)");
--		}
--		sprintf(temp, "%8d  %3d  $<%3d>  %8s %s",
--			tx_count[i], tx_affected[i], tx_delay[i],
--			tbuf, expand(tx_cap[i]));
--		putln(temp);
--	}
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	longer_test_time(test_list, status, ch)
--**
--**	Extend the number of seconds for each test.
--*/
--void
--longer_test_time(
--	struct test_list *t GCC_UNUSED,
--	int *state GCC_UNUSED,
--	int *ch)
--{
--	pad_test_duration += 1;
--	sprintf(txt_longer_test_time, "+) Change test time to %d seconds",
--		pad_test_duration + 1);
--	sprintf(txt_shorter_test_time, "-) Change test time to %d seconds",
--		pad_test_duration - 1);
--	sprintf(temp, "Tests will run for %d seconds", pad_test_duration);
--	ptext(temp);
--	*ch = REQUEST_PROMPT;
--}
--
--/*
--**	shorter_test_time(test_list, status, ch)
--**
--**	Shorten the number of seconds for each test.
--*/
--void
--shorter_test_time(
--	struct test_list *t GCC_UNUSED,
--	int *state GCC_UNUSED,
--	int *ch)
--{
--	if (pad_test_duration > 1) {
--		pad_test_duration -= 1;
--		sprintf(txt_longer_test_time, "+) Change test time to %d seconds",
--			pad_test_duration + 1);
--		sprintf(txt_shorter_test_time, "-) Change test time to %d seconds",
--			pad_test_duration - 1);
--	}
--	sprintf(temp, "Tests will run for %d second%s", pad_test_duration,
--		pad_test_duration > 1 ? "s" : "");
--	ptext(temp);
--	*ch = REQUEST_PROMPT;
--}
--
--/*
--**	longer_augment(test_list, status, ch)
--**
--**	Lengthen the number of lines/characters effected
--*/
--void
--longer_augment(
--	struct test_list *t,
--	int *state GCC_UNUSED,
--	int *ch)
--{
--	augment <<= 1;
--	set_augment_txt();
--	if (augment_test) {
--		t = augment_test;
--	}
--	sprintf(temp, "The pad tests will effect %d %s.", augment,
--		((t->flags & MENU_LC_MASK) == MENU_lines) ?
--		"lines" : "characters");
--	ptextln(temp);
--	*ch = REQUEST_PROMPT;
--}
--
--/*
--**	shorter_augment(test_list, status, ch)
--**
--**	Shorten the number of lines/characters effected
--*/
--void
--shorter_augment(
--	struct test_list *t,
--	int *state GCC_UNUSED,
--	int *ch)
--{
--	if (augment > 1) {
--		/* don't let the augment go to zero */
--		augment >>= 1;
--	}
--	set_augment_txt();
--	if (augment_test) {
--		t = augment_test;
--	}
--	sprintf(temp, "The pad tests will effect %d %s.", augment,
--		((t->flags & MENU_LC_MASK) == MENU_lines) ?
--		"lines" : "characters");
--	ptextln(temp);
--	*ch = REQUEST_PROMPT;
--}
-diff -Naur ncurses-5.6.orig/tack/crum.c ncurses-5.6/tack/crum.c
---- ncurses-5.6.orig/tack/crum.c	2006-11-25 19:15:02.000000000 -0500
-+++ ncurses-5.6/tack/crum.c	1969-12-31 19:00:00.000000000 -0500
-@@ -1,426 +0,0 @@
--/*
--** Copyright (C) 1991, 1997 Free Software Foundation, Inc.
--** 
--** This file is part of TACK.
--** 
--** TACK is free software; you can redistribute it and/or modify
--** it under the terms of the GNU General Public License as published by
--** the Free Software Foundation; either version 2, or (at your option)
--** any later version.
--** 
--** TACK is distributed in the hope that it will be useful,
--** but WITHOUT ANY WARRANTY; without even the implied warranty of
--** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--** GNU General Public License for more details.
--** 
--** You should have received a copy of the GNU General Public License
--** along with TACK; see the file COPYING.  If not, write to
--** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
--** Boston, MA 02110-1301, USA
--*/
--
--#include <tack.h>
--
--MODULE_ID("$Id: crum.c,v 1.5 2006/11/26 00:15:02 tom Exp $")
--
--/*
-- * Test cursor movement.
-- */
--
--static void crum_clear(struct test_list *t, int *state, int *ch);
--static void crum_home(struct test_list *t, int *state, int *ch);
--static void crum_ll(struct test_list *t, int *state, int *ch);
--static void crum_move(struct test_list *t, int *state, int *ch);
--static void crum_os(struct test_list *t, int *state, int *ch);
--
--static char crum_text[5][80];
--
--struct test_list crum_test_list[] = {
--	{0, 0, 0, 0, "e) edit terminfo", 0, &edit_menu},
--	{MENU_NEXT, 0, "clear", 0, 0, crum_clear, 0},
--	{MENU_NEXT, 0, "home", 0, 0, crum_home, 0},
--	{MENU_NEXT, 0, "ll", 0, 0, crum_ll, 0},
--	{MENU_NEXT, 0, crum_text[0], "home cuu1", 0, crum_move, 0},
--	{MENU_NEXT + 1, 0, crum_text[1], "cub1 cud1 cuf1 cuu1", 0, crum_move, 0},
--	{MENU_NEXT + 2, 0, crum_text[2], "cub cud cuf cuu", 0, crum_move, 0},
--	{MENU_NEXT + 3, 0, crum_text[3], "vpa hpa", 0, crum_move, 0},
--	{MENU_NEXT + 4, 0, crum_text[4], "cup", 0, crum_move, 0},
--	{MENU_NEXT, 0, "cup", "os", 0, crum_os, 0},
--	{MENU_LAST, 0, 0, 0, 0, 0, 0}
--};
--
--/*
--**	move_to(from-row, from-column, to-row, to-column, selection)
--**
--**	move the cursor from (rf, cf) to (rt, ct) using sel
--*/
--static void
--move_to(
--	int rf,
--	int cf,
--	int rt,
--	int ct,
--	int sel)
--{
--	char *s;
--
--	if (sel & 16) {	/* use (cup) */
--		s = TPARM_2(cursor_address, rt, ct);
--		tputs(s, lines, tc_putch);
--		return;
--	}
--	if (sel & 8) {	/* use (hpa) (vpa) */
--		if (column_address) {
--			s = TPARM_1(column_address, ct);
--			tputs(s, 1, tc_putch);
--			cf = ct;
--		}
--		if (row_address) {
--			s = TPARM_1(row_address, rt);
--			tputs(s, 1, tc_putch);
--			rf = rt;
--		}
--	}
--	if (sel & 4) {	/* parameterized relative cursor movement */
--		if (parm_right_cursor)
--			if (cf < ct) {
--				s = TPARM_1(parm_right_cursor, ct - cf);
--				tputs(s, ct - cf, tc_putch);
--				cf = ct;
--			}
--		if (parm_left_cursor)
--			if (cf > ct) {
--				s = TPARM_1(parm_left_cursor, cf - ct);
--				tputs(s, cf - ct, tc_putch);
--				cf = ct;
--			}
--		if (parm_down_cursor)
--			if (rf < rt) {
--				s = TPARM_1(parm_down_cursor, rt - rf);
--				tputs(s, rt - rf, tc_putch);
--				rf = rt;
--			}
--		if (parm_up_cursor)
--			if (rf > rt) {
--				s = TPARM_1(parm_up_cursor, rf - rt);
--				tputs(s, rf - rt, tc_putch);
--				rf = rt;
--			}
--	}
--	if (sel & 2) {
--		if (cursor_left)
--			while (cf > ct) {
--				tc_putp(cursor_left);
--				cf--;
--			}
--		/*
--		   do vertical motion next.  Just in case cursor_down has a
--		   side effect of changing the column.  This could happen if
--		   the tty handler translates NL to CRNL.
--		*/
--		if (cursor_down)
--			while (rf < rt) {
--				tc_putp(cursor_down);
--				rf++;
--			}
--		if (cursor_up)
--			while (rf > rt) {
--				tc_putp(cursor_up);
--				rf--;
--			}
--		if (cursor_right)
--			while (cf < ct) {
--				tc_putp(cursor_right);
--				cf++;
--			}
--	}
--	/* last chance */
--	if (rf > rt) {
--		if (can_go_home) {	/* a bit drastic but ... */
--			go_home();
--			cf = 0;
--			rf = 0;
--		} else if (cursor_up) {
--			while (rf > rt) {
--				tc_putp(cursor_up);
--				rf--;
--			}
--		}
--	}
--	if (ct == 0 && rt > rf) {
--		put_crlf();
--		cf = 0;
--		rf++;
--	}
--	if (ct == 0 && cf != 0) {
--		put_cr();
--		cf = 0;
--	}
--	while (rf < rt) {
--		put_lf();
--		rf++;
--	}
--	while (cf > ct) {
--		put_str("\b");
--		cf--;
--	}
--	if (cursor_right) {
--		while (cf < ct) {
--			tc_putp(cursor_right);
--			cf++;
--		}
--	} else {
--		/* go ahead and trash my display */
--		while (cf < ct) {
--			putchp(' ');
--			cf++;
--		}
--	}
--}
--
--/*
--**	display_it(selection, text)
--**
--**	print the display using sel
--*/
--static void
--display_it(
--	int sel,
--	char *txt)
--{
--	int i, done_line;
--
--	put_clear();
--	go_home();
--	put_newlines(2);
--	ptextln("    The top line should be alternating <'s and >'s");
--	ptextln("    The left side should be alternating A's and V's");
--	ptext("    Testing ");
--	ptext(txt);
--	put_cr();
--
--	/* horizontal */
--	move_to(done_line = line_count, 0, 0, 2, sel);
--	for (i = 4; i < columns - 2; i += 2) {
--		putchp('>');
--		move_to(0, i - 1, 0, i, sel);
--	}
--	putchp('>');
--	i -= 2;
--	move_to(0, i + 1, 0, i - 1, sel);
--	for (; i > 2; i -= 2) {
--		putchp('<');
--		move_to(0, i, 0, i - 3, sel);
--	}
--	putchp('<');
--
--	/* vertical */
--	move_to(0, 2, 0, 0, sel);
--	for (i = 2; i < lines - 1; i += 2) {
--		putchp('V');
--		move_to(i - 2, 1, i, 0, sel);
--	}
--	putchp('V');
--	i -= 2;
--	move_to(i, 1, i + 1, 0, sel);
--	for (; i > 0; i -= 2) {
--		putchp('A');
--		move_to(i + 1, 1, i - 1, 0, sel);
--	}
--	putchp('A');
--	move_to(i + 1, 1, 0, 0, sel);	/* go home first */
--	move_to(0, 0, done_line + 1, 3, sel);
--	put_str(txt);
--	put_str(" Done. ");
--}
--
--/*
--**	crum_clear(test_list, status, ch)
--**
--**	(clear) test Clear screen
--*/
--static void
--crum_clear(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i;
--
--	if (clear_screen) {
--		for (i = lines; i > 1; i--) {
--			putln("garbage");
--		}
--		put_clear();
--		ptextln("This line should start in the home position.");
--		ptext("The rest of the screen should be clear.  ");
--	} else {
--		ptextln("(clear) Clear screen is not defined.  ");
--	}
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	crum_home(test_list, status, ch)
--**
--**	(home) test Home cursor
--*/
--static void
--crum_home(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	if (cursor_home) {
--		put_clear();
--		put_newlines(lines / 2);
--		go_home();
--		put_crlf();
--		ptext("The bottom line should have text.");
--		go_home();
--		put_newlines(lines - 1);
--		ptext("This line is on the bottom.");
--		go_home();
--		ptextln("This line starts in the home position.");
--		put_crlf();
--	} else {
--		ptextln("(home) Home cursor is not defined.  ");
--	}
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	crum_ll(test_list, status, ch)
--**
--**	(ll) test Last line
--*/
--static void
--crum_ll(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	/*
--	   (ll) may be simulated with (cup).  Don't complain if (cup) is present.
--	*/
--	if (cursor_to_ll) {
--		put_clear();
--		put_str("This line could be anywhere.");
--		tc_putp(cursor_to_ll);
--		ptext("This line should be on the bottom");
--		go_home();
--		put_crlf();
--	} else
--	if (cursor_address) {
--		return;
--	} else {
--		ptextln("(ll) Move to last line is not defined.  ");
--	}
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	crum_move(test_list, status, ch)
--**
--**	(*) test all cursor move commands
--*/
--static void
--crum_move(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	char buf[80];
--	int n;
--
--	switch (n = (t->flags & 15)) {
--	case 0:
--		sprintf(buf, " (cr) (nel) (cub1)%s",
--			cursor_home ? " (home)" : (cursor_up ? " (cuu1)" : ""));
--		break;
--	case 1:
--		sprintf(buf, "%s%s%s%s", cursor_left ? " (cub1)" : "",
--			cursor_down ? " (cud1)" : "", cursor_right ? " (cuf1)" : "",
--			cursor_up ? " (cuu1)" : "");
--		if (buf[0] == '\0') {
--			ptext("    (cub1) (cud1) (cuf1) (cuu1) not defined.");
--		}
--		break;
--	case 2:
--		sprintf(buf, "%s%s%s%s", parm_left_cursor ? " (cub)" : "",
--			parm_down_cursor ? " (cud)" : "",
--			parm_right_cursor ? " (cuf)" : "",
--			parm_up_cursor ? " (cuu)" : "");
--		if (buf[0] == '\0') {
--			ptext("    (cub) (cud) (cuf) (cuu) not defined.");
--		}
--		break;
--	case 3:
--		sprintf(buf, "%s%s", row_address ? " (vpa)" : "",
--			column_address ? " (hpa)" : "");
--		if (buf[0] == '\0') {
--			ptext("    (vpa) (hpa) not defined.");
--		}
--		break;
--	case 4:
--		if (!cursor_address) {
--			ptext("    (cup) not defined.  ");
--			generic_done_message(t, state, ch);
--			return;
--		}
--		strcpy(buf, " (cup)");
--		break;
--	}
--	if (buf[0] == '\0') {
--		put_str("  Done. ");
--	} else {
--		can_test(buf, FLAG_TESTED);
--		strcpy(crum_text[n], &buf[2]);
--		crum_text[n][strlen(buf) - 3] = '\0';
--
--		display_it(1 << n, buf);
--	}
--	*ch = wait_here();
--	if (*ch != 'r') {
--		put_clear();
--	}
--}
--
--/*
--**	crum_os(test_list, status, ch)
--**
--**	(cup) test Cursor position on overstrike terminals
--*/
--static void
--crum_os(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i;
--
--	if (cursor_address && over_strike) {
--		put_clear();
--		for (i = 0; i < columns - 2; i++) {
--			tc_putch('|');
--		}
--		for (i = 1; i < lines - 2; i++) {
--			put_crlf();
--			tc_putch('_');
--		}
--		for (i = 0; i < columns - 2; i++) {
--			tputs(TPARM_2(cursor_address, 0, i), lines, tc_putch);
--			tc_putch('+');
--		}
--		for (i = 0; i < lines - 2; i++) {
--			tputs(TPARM_2(cursor_address, i, 0), lines, tc_putch);
--			tc_putch(']');
--			tc_putch('_');
--		}
--		go_home();
--		put_newlines(3);
--		ptext("    All the characters should look the same.  ");
--		generic_done_message(t, state, ch);
--		put_clear();
--	}
--}
-diff -Naur ncurses-5.6.orig/tack/edit.c ncurses-5.6/tack/edit.c
---- ncurses-5.6.orig/tack/edit.c	2006-06-24 17:22:42.000000000 -0400
-+++ ncurses-5.6/tack/edit.c	1969-12-31 19:00:00.000000000 -0500
-@@ -1,992 +0,0 @@
--/*
--** Copyright (C) 1997 Free Software Foundation, Inc.
--**
--** This file is part of TACK.
--**
--** TACK is free software; you can redistribute it and/or modify
--** it under the terms of the GNU General Public License as published by
--** the Free Software Foundation; either version 2, or (at your option)
--** any later version.
--**
--** TACK is distributed in the hope that it will be useful,
--** but WITHOUT ANY WARRANTY; without even the implied warranty of
--** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--** GNU General Public License for more details.
--**
--** You should have received a copy of the GNU General Public License
--** along with TACK; see the file COPYING.  If not, write to
--** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
--** Boston, MA 02110-1301, USA
--*/
--
--#include <tack.h>
--#include <time.h>
--#include <tic.h>
--
--MODULE_ID("$Id: edit.c,v 1.11 2006/06/24 21:22:42 tom Exp $")
--
--/*
-- * Terminfo edit features
-- */
--static void show_info(struct test_list *, int *, int *);
--static void show_value(struct test_list *, int *, int *);
--static void show_untested(struct test_list *, int *, int *);
--static void show_changed(struct test_list *, int *, int *);
--
--#define SHOW_VALUE	1
--#define SHOW_EDIT	2
--#define SHOW_DELETE	3
--
--struct test_list edit_test_list[] = {
--	{MENU_CLEAR, 0, 0, 0, "i) display current terminfo", show_info, 0},
--	{0, 0, 0, 0, "w) write the current terminfo to a file", save_info, 0},
--	{SHOW_VALUE, 3, 0, 0, "v) show value of a selected cap", show_value, 0},
--	{SHOW_EDIT, 4, 0, 0, "e) edit value of a selected cap", show_value, 0},
--	{SHOW_DELETE, 3, 0, 0, "d) delete string", show_value, 0},
--	{0, 3, 0, 0, "m) show caps that have been modified", show_changed, 0},
--	{MENU_CLEAR + FLAG_CAN_TEST, 0, 0, 0, "c) show caps that can be tested", show_report, 0},
--	{MENU_CLEAR + FLAG_TESTED, 0, 0, 0, "t) show caps that have been tested", show_report, 0},
--	{MENU_CLEAR + FLAG_FUNCTION_KEY, 0, 0, 0, "f) show a list of function keys", show_report, 0},
--	{MENU_CLEAR, 0, 0, 0, "u) show caps defined that can not be tested", show_untested, 0},
--	{MENU_LAST, 0, 0, 0, 0, 0, 0}
--};
--
--static char change_pad_text[MAX_CHANGES][80];
--static struct test_list change_pad_list[MAX_CHANGES] = {
--	{MENU_LAST, 0, 0, 0, 0, 0, 0}
--};
--
--static void build_change_menu(struct test_menu *);
--static void change_one_entry(struct test_list *, int *, int *);
--
--struct test_menu change_pad_menu = {
--	0, 'q', 0,
--	"Select cap name", "change", 0,
--	build_change_menu, change_pad_list, 0, 0, 0
--};
--
--static TERMTYPE	original_term;		/* terminal type description */
--
--static char flag_boolean[BOOLCOUNT];	/* flags for booleans */
--static char flag_numerics[NUMCOUNT];	/* flags for numerics */
--static char *flag_strings;		/* flags for strings */
--static int *label_strings;
--static int xon_index;			/* Subscript for (xon) */
--static int xon_shadow;
--
--static int start_display;		/* the display has just started */
--static int display_lines;		/* number of lines displayed */
--
--static void
--alloc_arrays(void)
--{
--	if (flag_strings == 0) {
--		label_strings = (int *)calloc(MAX_STRINGS, sizeof(int));
--		flag_strings = (char *)calloc(MAX_STRINGS, sizeof(char));
--	}
--}
--
--/*
--**	send_info_string(str)
--**
--**	Return the terminfo string prefixed by the correct separator
--*/
--static void
--send_info_string(
--	const char *str,
--	int *ch)
--{
--	int len;
--
--	if (display_lines == -1) {
--		return;
--	}
--	len = strlen(str);
--	if (len + char_count + 3 >= columns) {
--		if (start_display == 0) {
--			put_str(",");
--		}
--		put_crlf();
--		if (++display_lines > lines) {
--			ptext("-- more -- ");
--			*ch = wait_here();
--			if (*ch == 'q') {
--				display_lines = -1;
--				return;
--			}
--			display_lines = 0;
--		}
--		if (len >= columns) {
--			/* if the terminal does not (am) then this loses */
--			if (columns) {
--				display_lines += ((strlen(str) + 3) / columns) + 1;
--			}
--			put_str("   ");
--			put_str(str);
--			start_display = 0;
--			return;
--		}
--		ptext("   ");
--	} else
--	if (start_display == 0) {
--		ptext(", ");
--	} else {
--		ptext("   ");
--	}
--	ptext(str);
--	start_display = 0;
--}
--
--/*
--**	show_info(test_list, status, ch)
--**
--**	Display the current terminfo
--*/
--static void
--show_info(
--	struct test_list *t GCC_UNUSED,
--	int *state GCC_UNUSED,
--	int *ch)
--{
--	int i;
--	char buf[1024];
--
--	display_lines = 1;
--	start_display = 1;
--	for (i = 0; i < BOOLCOUNT; i++) {
--		if ((i == xon_index) ? xon_shadow : CUR Booleans[i]) {
--			send_info_string(boolnames[i], ch);
--		}
--	}
--	for (i = 0; i < NUMCOUNT; i++) {
--		if (CUR Numbers[i] >= 0) {
--			sprintf(buf, "%s#%d", numnames[i], CUR Numbers[i]);
--			send_info_string(buf, ch);
--		}
--	}
--	for (i = 0; i < MAX_STRINGS; i++) {
--		if (CUR Strings[i]) {
--			sprintf(buf, "%s=%s", STR_NAME(i),
--				print_expand(CUR Strings[i]));
--			send_info_string(buf, ch);
--		}
--	}
--	put_newlines(2);
--	*ch = REQUEST_PROMPT;
--}
--
--/*
--**	save_info_string(str, fp)
--**
--**	Write the terminfo string prefixed by the correct separator
--*/
--static void
--save_info_string(
--	const char *str,
--	FILE *fp)
--{
--	int len;
--
--	len = strlen(str);
--	if (len + display_lines >= 77) {
--		if (display_lines > 0) {
--			(void) fprintf(fp, "\n\t");
--		}
--		display_lines = 8;
--	} else
--	if (display_lines > 0) {
--		(void) fprintf(fp, " ");
--		display_lines++;
--	} else {
--		(void) fprintf(fp, "\t");
--		display_lines = 8;
--	}
--	(void) fprintf(fp, "%s,", str);
--	display_lines += len + 1;
--}
--
--/*
--**	save_info(test_list, status, ch)
--**
--**	Write the current terminfo to a file
--*/
--void
--save_info(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i;
--	FILE *fp;
--	time_t now;
--	char buf[1024];
--
--	if ((fp = fopen(tty_basename, "w")) == (FILE *) NULL) {
--		(void) sprintf(temp, "can't open: %s", tty_basename);
--		ptextln(temp);
--		generic_done_message(t, state, ch);
--		return;
--	}
--	time(&now);
--	/* Note: ctime() returns a newline at the end of the string */
--	(void) fprintf(fp, "# Terminfo created by TACK for TERM=%s on %s",
--		tty_basename, ctime(&now));
--	(void) fprintf(fp, "%s|%s,\n", tty_basename, longname());
--
--	display_lines = 0;
--	for (i = 0; i < BOOLCOUNT; i++) {
--		if (i == xon_index ? xon_shadow : CUR Booleans[i]) {
--			save_info_string(boolnames[i], fp);
--		}
--	}
--	for (i = 0; i < NUMCOUNT; i++) {
--		if (CUR Numbers[i] >= 0) {
--			sprintf(buf, "%s#%d", numnames[i], CUR Numbers[i]);
--			save_info_string(buf, fp);
--		}
--	}
--	for (i = 0; i < MAX_STRINGS; i++) {
--		if (CUR Strings[i]) {
--			sprintf(buf, "%s=%s", STR_NAME(i),
--				_nc_tic_expand(CUR Strings[i], TRUE, TRUE));
--			save_info_string(buf, fp);
--		}
--	}
--	(void) fprintf(fp, "\n");
--	(void) fclose(fp);
--	sprintf(temp, "Terminfo saved as file: %s", tty_basename);
--	ptextln(temp);
--}
--
--/*
--**	show_value(test_list, status, ch)
--**
--**	Display the value of a selected cap
--*/
--static void
--show_value(
--	struct test_list *t,
--	int *state GCC_UNUSED,
--	int *ch)
--{
--	struct name_table_entry const *nt;
--	char *s;
--	int n, op, b;
--	char buf[1024];
--	char tmp[1024];
--
--	ptext("enter name: ");
--	read_string(buf, 80);
--	if (buf[0] == '\0' || buf[1] == '\0') {
--		*ch = buf[0];
--		return;
--	}
--	if (line_count + 2 >= lines) {
--		put_clear();
--	}
--	op = t->flags & 255;
--	if ((nt = _nc_find_entry(buf, _nc_info_hash_table))) {
--		switch (nt->nte_type) {
--		case BOOLEAN:
--			if (op == SHOW_DELETE) {
--				if (nt->nte_index == xon_index) {
--					xon_shadow = 0;
--				} else {
--					CUR Booleans[nt->nte_index] = 0;
--				}
--				return;
--			}
--			b = nt->nte_index == xon_index ? xon_shadow :
--				CUR Booleans[nt->nte_index];
--			sprintf(temp, "boolean  %s %s", buf,
--				b ? "True" : "False");
--			break;
--		case STRING:
--			if (op == SHOW_DELETE) {
--				CUR Strings[nt->nte_index] = (char *) 0;
--				return;
--			}
--			if (CUR Strings[nt->nte_index]) {
--				sprintf(temp, "string  %s %s", buf,
--					expand(CUR Strings[nt->nte_index]));
--			} else {
--				sprintf(temp, "undefined string %s", buf);
--			}
--			break;
--		case NUMBER:
--			if (op == SHOW_DELETE) {
--				CUR Numbers[nt->nte_index] = -1;
--				return;
--			}
--			sprintf(temp, "numeric  %s %d", buf,
--				CUR Numbers[nt->nte_index]);
--			break;
--		default:
--			sprintf(temp, "unknown");
--			break;
--		}
--		ptextln(temp);
--	} else {
--		sprintf(temp, "Cap not found: %s", buf);
--		ptextln(temp);
--		return;
--	}
--	if (op != SHOW_EDIT) {
--		return;
--	}
--	if (nt->nte_type == BOOLEAN) {
--		ptextln("Value flipped");
--		if (nt->nte_index == xon_index) {
--			xon_shadow = !xon_shadow;
--		} else {
--			CUR Booleans[nt->nte_index] = !CUR Booleans[nt->nte_index];
--		}
--		return;
--	}
--	ptextln("Enter new value");
--	read_string(buf, sizeof(buf));
--
--	switch (nt->nte_type) {
--	case STRING:
--		_nc_reset_input((FILE *) 0, buf);
--		_nc_trans_string(tmp, tmp + sizeof(tmp));
--		s = (char *)malloc(strlen(tmp) + 1);
--		strcpy(s, tmp);
--		CUR Strings[nt->nte_index] = s;
--		sprintf(temp, "new string value  %s", nt->nte_name);
--		ptextln(temp);
--		ptextln(expand(CUR Strings[nt->nte_index]));
--		break;
--	case NUMBER:
--		if (sscanf(buf, "%d", &n) == 1) {
--			CUR Numbers[nt->nte_index] = n;
--			sprintf(temp, "new numeric value  %s %d",
--				nt->nte_name, n);
--			ptextln(temp);
--		} else {
--			sprintf(temp, "Illegal number: %s", buf);
--			ptextln(temp);
--		}
--		break;
--	default:
--		break;
--	}
--}
--
--/*
--**	get_string_cap_byname(name, long_name)
--**
--**	Given a cap name, find the value
--**	Errors are quietly ignored.
--*/
--char *
--get_string_cap_byname(
--	const char *name,
--	const char **long_name)
--{
--	struct name_table_entry const *nt;
--
--	if ((nt = _nc_find_entry(name, _nc_info_hash_table))) {
--		if (nt->nte_type == STRING) {
--			*long_name = strfnames[nt->nte_index];
--			return (CUR Strings[nt->nte_index]);
--		}
--	}
--	*long_name = "??";
--	return (char *) 0;
--}
--
--/*
--**	get_string_cap_byvalue(value)
--**
--**	Given a capability string, find its position in the data base.
--**	Return the index or -1 if not found.
--*/
--int
--get_string_cap_byvalue(
--	const char *value)
--{
--	int i;
--
--	if (value) {
--		for (i = 0; i < MAX_STRINGS; i++) {
--			if (CUR Strings[i] == value) {
--				return i;
--			}
--		}
--		/* search for translated strings */
--		for (i = 0; i < TM_last; i++) {
--			if (TM_string[i].value == value) {
--				return TM_string[i].index;
--			}
--		}
--	}
--	return -1;
--}
--
--/*
--**	show_changed(test_list, status, ch)
--**
--**	Display a list of caps that have been changed.
--*/
--static void
--show_changed(
--	struct test_list *t GCC_UNUSED,
--	int *state GCC_UNUSED,
--	int *ch)
--{
--	int i, header = 1, v;
--	const char *a;
--	const char *b;
--	static char title[] = "                     old value   cap  new value";
--	char abuf[1024];
--
--	for (i = 0; i < BOOLCOUNT; i++) {
--		v = (i == xon_index) ? xon_shadow : CUR Booleans[i];
--		if (original_term.Booleans[i] != v) {
--			if (header) {
--				ptextln(title);
--				header = 0;
--			}
--			sprintf(temp, "%30d %6s %d",
--				original_term.Booleans[i], boolnames[i], v);
--			ptextln(temp);
--		}
--	}
--	for (i = 0; i < NUMCOUNT; i++) {
--		if (original_term.Numbers[i] != CUR Numbers[i]) {
--			if (header) {
--				ptextln(title);
--				header = 0;
--			}
--			sprintf(temp, "%30d %6s %d",
--				original_term.Numbers[i], numnames[i],
--				CUR Numbers[i]);
--			ptextln(temp);
--		}
--	}
--	for (i = 0; i < MAX_STRINGS; i++) {
--		a = original_term.Strings[i] ? original_term.Strings[i] : "";
--		b = CUR Strings[i] ?  CUR Strings[i] : "";
--		if (strcmp(a, b)) {
--			if (header) {
--				ptextln(title);
--				header = 0;
--			}
--			strcpy(abuf, _nc_tic_expand(a, TRUE, TRUE));
--			sprintf(temp, "%30s %6s %s", abuf, STR_NAME(i),
--				_nc_tic_expand(b, TRUE, TRUE));
--			putln(temp);
--		}
--	}
--	if (header) {
--		ptextln("No changes");
--	}
--	put_crlf();
--	*ch = REQUEST_PROMPT;
--}
--
--/*
--**	user_modified()
--**
--**	Return TRUE if the user has modified the terminfo
--*/
--int
--user_modified(void)
--{
--	const char *a, *b;
--	int i, v;
--
--	for (i = 0; i < BOOLCOUNT; i++) {
--		v = (i == xon_index) ? xon_shadow : CUR Booleans[i];
--		if (original_term.Booleans[i] != v) {
--			return TRUE;
--		}
--	}
--	for (i = 0; i < NUMCOUNT; i++) {
--		if (original_term.Numbers[i] != CUR Numbers[i]) {
--			return TRUE;
--		}
--	}
--	for (i = 0; i < MAX_STRINGS; i++) {
--		a = original_term.Strings[i] ? original_term.Strings[i] : "";
--		b = CUR Strings[i] ?  CUR Strings[i] : "";
--		if (strcmp(a, b)) {
--			return TRUE;
--		}
--	}
--	return FALSE;
--}
--
--/*****************************************************************************
-- *
-- * Maintain the list of capabilities that can be tested
-- *
-- *****************************************************************************/
--
--/*
--**	mark_cap(name, flag)
--**
--**	Mark the cap data base with the flag provided.
--*/
--static void
--mark_cap(
--	char *name,
--	int flag)
--{
--	struct name_table_entry const *nt;
--
--	alloc_arrays();
--	if ((nt = _nc_find_entry(name, _nc_info_hash_table))) {
--		switch (nt->nte_type) {
--		case BOOLEAN:
--			flag_boolean[nt->nte_index] |= flag;
--			break;
--		case STRING:
--			flag_strings[nt->nte_index] |= flag;
--			break;
--		case NUMBER:
--			flag_numerics[nt->nte_index] |= flag;
--			break;
--		default:
--			sprintf(temp, "unknown cap type (%s)", name);
--			ptextln(temp);
--			break;
--		}
--	} else {
--		sprintf(temp, "Cap not found: %s", name);
--		ptextln(temp);
--		(void) wait_here();
--	}
--}
--
--/*
--**	can_test(name-list, flags)
--**
--**	Scan the name list and get the names.
--**	Enter each name into the can-test data base.
--**	<space> ( and ) may be used as separators.
--*/
--void
--can_test(
--	const char *s,
--	int flags)
--{
--	int ch, j;
--	char name[32];
--
--	if (s) {
--		for (j = 0; (name[j] = ch = *s); s++) {
--			if (ch == ' ' || ch == ')' || ch == '(') {
--				if (j) {
--					name[j] = '\0';
--					mark_cap(name, flags);
--				}
--				j = 0;
--			} else {
--				j++;
--			}
--		}
--		if (j) {
--			mark_cap(name, flags);
--		}
--	}
--}
--
--/*
--**	cap_index(name-list, index-list)
--**
--**	Scan the name list and return a list of indexes.
--**	<space> ( and ) may be used as separators.
--**	This list is terminated with -1.
--*/
--void
--cap_index(
--	const char *s,
--	int *inx)
--{
--	struct name_table_entry const *nt;
--	int ch, j;
--	char name[32];
--
--	if (s) {
--		for (j = 0; ; s++) {
--			name[j] = ch = *s;
--			if (ch == ' ' || ch == ')' || ch == '(' || ch == 0) {
--				if (j) {
--					name[j] = '\0';
--					if ((nt = _nc_find_entry(name,
--						_nc_info_hash_table)) &&
--						(nt->nte_type == STRING)) {
--						*inx++ = nt->nte_index;
--					}
--				}
--				if (ch == 0) {
--					break;
--				}
--				j = 0;
--			} else {
--				j++;
--			}
--		}
--	}
--	*inx = -1;
--}
--
--/*
--**	cap_match(name-list, cap)
--**
--**	Scan the name list and see if the cap is in the list.
--**	Return TRUE if we find an exact match.
--**	<space> ( and ) may be used as separators.
--*/
--int
--cap_match(
--	const char *names,
--	const char *cap)
--{
--	char *s;
--	int c, l, t;
--
--	if (names) {
--		l = strlen(cap);
--		while ((s = strstr(names, cap))) {
--			c = (names == s) ? 0 : *(s - 1);
--			t = s[l];
--			if ((c == 0 || c == ' ' || c == '(') &&
--				(t == 0 || t == ' ' || t == ')')) {
--				return TRUE;
--			}
--			if (t == 0) {
--				break;
--			}
--			names = s + l;
--		}
--	}
--	return FALSE;
--}
--
--/*
--**	show_report(test_list, status, ch)
--**
--**	Display a list of caps that can be tested
--*/
--void
--show_report(
--	struct test_list *t,
--	int *state GCC_UNUSED,
--	int *ch)
--{
--	int i, j, nc, flag;
--	const char *s;
--	const char **nx = malloc(BOOLCOUNT + NUMCOUNT + MAX_STRINGS);
--
--	alloc_arrays();
--	flag = t->flags & 255;
--	nc = 0;
--	for (i = 0; i < BOOLCOUNT; i++) {
--		if (flag_boolean[i] & flag) {
--			nx[nc++] = boolnames[i];
--		}
--	}
--	for (i = 0; i < NUMCOUNT; i++) {
--		if (flag_numerics[i] & flag) {
--			nx[nc++] = numnames[i];
--		}
--	}
--	for (i = 0; i < MAX_STRINGS; i++) {
--		if (flag_strings[i] & flag) {
--			nx[nc++] = STR_NAME(i);
--		}
--	}
--	/* sort */
--	for (i = 0; i < nc - 1; i++) {
--		for (j = i + 1; j < nc; j++) {
--			if (strcmp(nx[i], nx[j]) > 0) {
--				s = nx[i];
--				nx[i] = nx[j];
--				nx[j] = s;
--			}
--		}
--	}
--	if (flag & FLAG_FUNCTION_KEY) {
--		ptextln("The following function keys can be tested:");
--	} else
--	if (flag & FLAG_CAN_TEST) {
--		ptextln("The following capabilities can be tested:");
--	} else
--	if (flag & FLAG_TESTED) {
--		ptextln("The following capabilities have been tested:");
--	}
--	put_crlf();
--	for (i = 0; i < nc; i++) {
--		sprintf(temp, "%s ", nx[i]);
--		ptext(temp);
--	}
--	put_newlines(1);
--	*ch = REQUEST_PROMPT;
--	free (nx);
--}
--
--/*
--**	show_untested(test_list, status, ch)
--**
--**	Display a list of caps that are defined but cannot be tested.
--**	Don't bother to sort this list.
--*/
--static void
--show_untested(
--	struct test_list *t GCC_UNUSED,
--	int *state GCC_UNUSED,
--	int *ch)
--{
--	int i;
--
--	alloc_arrays();
--	ptextln("Caps that are defined but cannot be tested:");
--	for (i = 0; i < BOOLCOUNT; i++) {
--		if (flag_boolean[i] == 0 && CUR Booleans[i]) {
--			sprintf(temp, "%s ", boolnames[i]);
--			ptext(temp);
--		}
--	}
--	for (i = 0; i < NUMCOUNT; i++) {
--		if (flag_numerics[i] == 0 && CUR Numbers[i] >= 0) {
--			sprintf(temp, "%s ", numnames[i]);
--			ptext(temp);
--		}
--	}
--	for (i = 0; i < MAX_STRINGS; i++) {
--		if (flag_strings[i] == 0 && CUR Strings[i]) {
--			sprintf(temp, "%s ", STR_NAME(i));
--			ptext(temp);
--		}
--	}
--	put_newlines(1);
--	*ch = REQUEST_PROMPT;
--}
--
--/*
--**	edit_init()
--**
--**	Initialize the function key data base
--*/
--void
--edit_init(void)
--{
--	int i, j, lc;
--	char *lab;
--	struct name_table_entry const *nt;
--
--	alloc_arrays();
--
--	_nc_copy_termtype(&original_term, &cur_term->type);
--	for (i = 0; i < BOOLCOUNT; i++) {
--		original_term.Booleans[i] = CUR Booleans[i];
--	}
--	for (i = 0; i < NUMCOUNT; i++) {
--		original_term.Numbers[i] = CUR Numbers[i];
--	}
--	/* scan for labels */
--	for (i = lc = 0; i < MAX_STRINGS; i++) {
--		original_term.Strings[i] = CUR Strings[i];
--		if (strncmp(STR_NAME(i), "lf", 2) == 0) {
--			flag_strings[i] |= FLAG_LABEL;
--			if (CUR Strings[i]) {
--				label_strings[lc++] = i;
--			}
--		}
--	}
--	/* scan for function keys */
--	for (i = 0; i < MAX_STRINGS; i++) {
--		const char *this_name = STR_NAME(i);
--		if ((this_name[0] == 'k') && strcmp(this_name, "kmous")) {
--			flag_strings[i] |= FLAG_FUNCTION_KEY;
--			lab = (char *) 0;
--			for (j = 0; j < lc; j++) {
--				if (!strcmp(this_name,
--					STR_NAME(label_strings[j]))) {
--					lab = CUR Strings[label_strings[j]];
--					break;
--				}
--			}
--			enter_key(this_name, CUR Strings[i], lab);
--		}
--	}
--	/* Lookup the translated strings */
--	for (i = 0; i < TM_last; i++) {
--		if ((nt = _nc_find_entry(TM_string[i].name,
--			_nc_info_hash_table)) && (nt->nte_type == STRING)) {
--			TM_string[i].index = nt->nte_index;
--		} else {
--			sprintf(temp, "TM_string lookup failed for: %s",
--				TM_string[i].name);
--			ptextln(temp);
--		}
--	}
--	if ((nt = _nc_find_entry("xon", _nc_info_hash_table)) != 0) {
--		xon_index = nt->nte_index;
--	}
--	xon_shadow = xon_xoff;
--	free(label_strings);
--}
--
--/*
--**	change_one_entry(test_list, status, ch)
--**
--**	Change the padding on the selected cap
--*/
--static void
--change_one_entry(
--	struct test_list *test,
--	int *state,
--	int *chp)
--{
--	struct name_table_entry const *nt;
--	int i, j, x, star, slash,  v, dot, ch;
--	const char *s;
--	char *t, *p;
--	const char *current_string;
--	char buf[1024];
--	char pad[1024];
--
--	i = test->flags & 255;
--	if (i == 255) {
--		/* read the cap name from the user */
--		ptext("enter name: ");
--		read_string(pad, 32);
--		if (pad[0] == '\0' || pad[1] == '\0') {
--			*chp = pad[0];
--			return;
--		}
--		if ((nt = _nc_find_entry(pad, _nc_info_hash_table)) &&
--			(nt->nte_type == STRING)) {
--			x = nt->nte_index;
--			current_string = CUR Strings[x];
--		} else {
--			sprintf(temp, "%s is not a string capability", pad);
--			ptext(temp);
--			generic_done_message(test, state, chp);
--			return;
--		}
--	} else {
--		x = tx_index[i];
--		current_string = tx_cap[i];
--		strcpy(pad, STR_NAME(x));
--	}
--	if (!current_string) {
--		ptextln("That string is not currently defined.  Please enter a new value, including the padding delay:");
--		read_string(buf, sizeof(buf));
--		_nc_reset_input((FILE *) 0, buf);
--		_nc_trans_string(pad, pad + sizeof(pad));
--		t = (char *)malloc(strlen(pad) + 1);
--		strcpy(t, pad);
--		CUR Strings[x] = t;
--		sprintf(temp, "new string value  %s", STR_NAME(x));
--		ptextln(temp);
--		ptextln(expand(t));
--		return;
--	}
--	sprintf(buf, "Current value: (%s) %s", pad, _nc_tic_expand(current_string, TRUE, TRUE));
--	putln(buf);
--	ptextln("Enter new pad.  0 for no pad.  CR for no change.");
--	read_string(buf, 32);
--	if (buf[0] == '\0' || (buf[1] == '\0' && isalpha(UChar(buf[0])))) {
--		*chp = buf[0];
--		return;
--	}
--	star = slash = FALSE;
--	for (j = v = dot = 0; (ch = buf[j]); j++) {
--		if (ch >= '0' && ch <= '9') {
--			v = ch - '0' + v * 10;
--			if (dot) {
--				dot++;
--			}
--		} else if (ch == '*') {
--			star = TRUE;
--		} else if (ch == '/') {
--			slash = TRUE;
--		} else if (ch == '.') {
--			dot = 1;
--		} else {
--			sprintf(temp, "Illegal character: %c", ch);
--			ptextln(temp);
--			ptext("General format:  99.9*/  ");
--			generic_done_message(test, state, chp);
--			return;
--		}
--	}
--	while (dot > 2) {
--		v /= 10;
--		dot--;
--	}
--	if (dot == 2) {
--		sprintf(pad, "%d.%d%s%s", v / 10, v % 10,
--				star ? "*" : "", slash ? "/" : "");
--	} else {
--		sprintf(pad, "%d%s%s",
--			v, star ? "*" : "", slash ? "/" : "");
--	}
--	s = current_string;
--	t = buf;
--	for (v = 0; (ch = *t = *s++); t++) {
--		if (v == '$' && ch == '<') {
--			while ((ch = *s++) && (ch != '>'));
--			for (p = pad; (*++t = *p++); );
--			*t++ = '>';
--			while ((*t++ = *s++));
--			pad[0] = '\0';
--			break;
--		}
--		v = ch;
--	}
--	if (pad[0]) {
--		sprintf(t, "$<%s>", pad);
--	}
--	if ((t = (char *)malloc(strlen(buf) + 1))) {
--		strcpy(t, buf);
--		CUR Strings[x] = t;
--		if (i != 255) {
--			tx_cap[i] = t;
--		}
--	}
--	generic_done_message(test, state, chp);
--}
--
--/*
--**	build_change_menu(menu_list)
--**
--**	Build the change pad menu list
--*/
--static void
--build_change_menu(
--	struct test_menu *m)
--{
--	int i, j, k;
--	char *s;
--
--	for (i = j = 0; i < txp; i++) {
--		if ((k = tx_index[i]) >= 0) {
--			s = _nc_tic_expand(tx_cap[i], TRUE, TRUE);
--			s[40] = '\0';
--			sprintf(change_pad_text[j], "%c) (%s) %s",
--				'a' + j, STR_NAME(k), s);
--			change_pad_list[j].flags = i;
--			change_pad_list[j].lines_needed = 4;
--			change_pad_list[j].menu_entry = change_pad_text[j];
--			change_pad_list[j].test_procedure = change_one_entry;
--			j++;
--		}
--	}
--	strcpy(change_pad_text[j], "z) enter name");
--	change_pad_list[j].flags = 255;
--	change_pad_list[j].lines_needed = 4;
--	change_pad_list[j].menu_entry = change_pad_text[j];
--	change_pad_list[j].test_procedure = change_one_entry;
--	j++;
--	change_pad_list[j].flags = MENU_LAST;
--	if (m->menu_title) {
--		put_crlf();
--		ptextln(m->menu_title);
--	}
--}
-diff -Naur ncurses-5.6.orig/tack/fun.c ncurses-5.6/tack/fun.c
---- ncurses-5.6.orig/tack/fun.c	2006-11-25 19:15:53.000000000 -0500
-+++ ncurses-5.6/tack/fun.c	1969-12-31 19:00:00.000000000 -0500
-@@ -1,925 +0,0 @@
--/*
--** Copyright (C) 1991, 1997 Free Software Foundation, Inc.
--**
--** This file is part of TACK.
--**
--** TACK is free software; you can redistribute it and/or modify
--** it under the terms of the GNU General Public License as published by
--** the Free Software Foundation; either version 2, or (at your option)
--** any later version.
--**
--** TACK is distributed in the hope that it will be useful,
--** but WITHOUT ANY WARRANTY; without even the implied warranty of
--** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--** GNU General Public License for more details.
--**
--** You should have received a copy of the GNU General Public License
--** along with TACK; see the file COPYING.  If not, write to
--** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
--** Boston, MA 02110-1301, USA
--*/
--
--#include <tack.h>
--
--MODULE_ID("$Id: fun.c,v 1.9 2006/11/26 00:15:53 tom Exp $")
--
--/*
-- * Test the function keys on the terminal.  The code for echo tests
-- * lives here too.
-- */
--
--static void funkey_keys(struct test_list *, int *, int *);
--static void funkey_meta(struct test_list *, int *, int *);
--static void funkey_label(struct test_list *, int *, int *);
--static void funkey_prog(struct test_list *, int *, int *);
--static void funkey_local(struct test_list *, int *, int *);
--
--struct test_list funkey_test_list[] = {
--	{0, 0, 0, 0, "e) edit terminfo", 0, &edit_menu},
--	{MENU_CLEAR + FLAG_FUNCTION_KEY, 0, 0, 0, "f) show a list of function keys", show_report, 0},
--	{MENU_NEXT | MENU_CLEAR, 0, "smkx) (rmkx", 0,
--		"k) test function keys", funkey_keys, 0},
--	{MENU_NEXT, 10, "km", "smm rmm", 0, funkey_meta, 0},
--	{MENU_NEXT, 8, "nlab) (smln) (pln) (rmln", "lw lh", 0, funkey_label, 0},
--	{MENU_NEXT, 2, "pfx", 0, 0, funkey_prog, 0},
--	{MENU_NEXT, 2, "pfloc", 0, 0, funkey_local, 0},
--	{MENU_LAST, 0, 0, 0, 0, 0, 0}
--};
--
--static void printer_on(struct test_list *, int *, int *);
--static void printer_mc0(struct test_list *, int *, int *);
--
--struct test_list printer_test_list[] = {
--	{0, 0, 0, 0, "e) edit terminfo", 0, &edit_menu},
--	{MENU_NEXT | MENU_CLEAR, 0, "mc4) (mc5) (mc5i", 0, 0, printer_on, 0},
--	{MENU_NEXT | MENU_CLEAR, 0, "mc0", 0, 0, printer_mc0, 0},
--	{MENU_LAST, 0, 0, 0, 0, 0, 0}
--};
--
--/* local definitions */
--static const char **fk_name;
--static char **fkval;
--static char **fk_label;		/* function key labels (if any) */
--static int *fk_tested;
--static int num_strings = 0;
--
--static int fkmax = 1;		/* length of longest key */
--static int got_labels = 0;	/* true if we have some labels */
--static int key_count = 0;
--static int end_state;
--
--/* unknown function keys */
--#define MAX_FK_UNK 50
--static char *fk_unknown[MAX_FK_UNK];
--static int fk_length[MAX_FK_UNK];
--static int funk;
--
--/*
-- * Initialize arrays that depend on the actual number of strings.
-- */
--static void
--alloc_strings(void)
--{
--	if (num_strings != MAX_STRINGS) {
--		num_strings = MAX_STRINGS;
--		fk_name = (const char **)calloc(num_strings, sizeof(const char *));
--		fkval = (char **)calloc(num_strings, sizeof(char *));
--		fk_label = (char **)calloc(num_strings, sizeof(char *));
--		fk_tested = (int *)calloc(num_strings, sizeof(int));
--	}
--}
--
--/*
--**	keys_tested(first-time, show-help, hex-output)
--**
--**	Display a list of the keys not tested.
--*/
--static void
--keys_tested(
--	int first_time,
--	int show_help,
--	int hex_output)
--{
--	int i, l;
--	char outbuf[256];
--
--	alloc_strings();
--	put_clear();
--	tty_set();
--	flush_input();
--	if (got_labels) {
--		putln("Function key labels:");
--		for (i = 0; i < key_count; ++i) {
--			if (fk_label[i]) {
--				sprintf(outbuf, "%s %s",
--					fk_name[i] ? fk_name[i] : "??", fk_label[i]);
--				put_columns(outbuf, (int) strlen(outbuf), 16);
--			}
--		}
--		put_newlines(2);
--	}
--	if (funk) {
--		putln("The following keys are not defined:");
--		for (i = 0; i < funk; ++i) {
--			put_columns(fk_unknown[i], fk_length[i], 16);
--		}
--		put_mode(exit_attribute_mode);
--		put_newlines(2);
--	}
--	if (first_time) {
--		putln("The following keys are defined:");
--	} else {
--		putln("The following keys have not been tested:");
--	}
--	if (scan_mode) {
--		for (i = 0; scan_down[i]; i++) {
--			if (!scan_tested[i]) {
--				if (hex_output) {
--					strcpy(outbuf, hex_expand_to(scan_down[i], 3));
--				} else {
--					strcpy(outbuf, expand(scan_down[i]));
--				}
--				l = expand_chars;
--				if (hex_output) {
--					strcat(outbuf, hex_expand_to(scan_up[i], 3));
--				} else {
--					strcat(outbuf, expand(scan_up[i]));
--				}
--				expand_chars += l;
--				l = strlen(scan_name[i]);
--				if (((char_count + 16) & ~15) +
--					((expand_chars + 7) & ~7) + l >= columns) {
--					put_crlf();
--				} else
--				if (char_count + 24 > columns) {
--					put_crlf();
--				} else if (char_count) {
--					putchp(' ');
--				}
--				put_columns(outbuf, expand_chars, 16);
--				put_columns(scan_name[i], l, 8);
--			}
--		}
--	} else {
--		for (i = 0; i < key_count; i++) {
--			if (!fk_tested[i]) {
--				if (hex_output) {
--					strcpy(outbuf, hex_expand_to(fkval[i], 3));
--				} else {
--					strcpy(outbuf, expand(fkval[i]));
--				}
--				l = strlen(fk_name[i]);
--				if (((char_count + 16) & ~15) +
--					((expand_chars + 7) & ~7) + l >= columns) {
--					put_crlf();
--				} else
--				if (char_count + 24 > columns) {
--					put_crlf();
--				} else
--				if (char_count) {
--					putchp(' ');
--				}
--				put_columns(outbuf, expand_chars, 16);
--				put_columns(fk_name[i], l, 8);
--			}
--		}
--	}
--	put_newlines(2);
--	if (show_help) {
--		ptextln("Hit any function key.  Type 'end' to quit.  Type ? to update the display.");
--		put_crlf();
--	}
--}
--
--/*
--**	enter_key(name, value, label)
--**
--**	Enter a function key into the data base
--*/
--void
--enter_key(
--	const char *name,
--	char *value,
--	char *lab)
--{
--	int j;
--
--	alloc_strings();
--	if (value) {
--		j = strlen(value);
--		fkmax = fkmax > j ? fkmax : j;
--		/* do not permit duplicates */
--		for (j = 0; j < key_count; j++) {
--			if (!strcmp(fk_name[j], name)) {
--				return;
--			}
--		}
--		fkval[key_count] = value;
--		fk_tested[key_count] = 0;
--		fk_label[key_count] = lab;
--		fk_name[key_count++] = name;
--		if (lab) {
--			got_labels = TRUE;
--		}
--	}
--}
--
--
--static void
--fresh_line(void)
--{				/* clear the line for a new function key line */
--	if (over_strike) {
--		put_crlf();
--	} else {
--		put_cr();
--		if (clr_eol) {
--			tc_putp(clr_eol);
--		} else {
--			put_str("                    \r");
--		}
--	}
--}
--
--
--static int
--end_funky(int ch)
--{				/* return true if this is the end */
--	switch (ch) {
--	case 'e':
--	case 'E':
--		end_state = 'e';
--		break;
--	case 'n':
--	case 'N':
--		if (end_state == 'e') {
--			end_state = 'n';
--		} else {
--			end_state = 0;
--		}
--		break;
--	case 'd':
--	case 'D':
--		if (end_state == 'n') {
--			end_state = 'd';
--		} else {
--			end_state = 0;
--		}
--		break;
--	case 'l':
--	case 'L':
--		if (end_state == 'l') {
--			end_state = '?';
--		} else {
--			end_state = 'l';
--		}
--		break;
--	default:
--		end_state = 0;
--		break;
--	}
--	return end_state == 'd';
--}
--
--
--static int
--found_match(char *s, int hx, int cc)
--{				/* return true if this string is a match */
--	int j, f;
--	char outbuf[256];
--
--	alloc_strings();
--	if (!*s) {
--		return 0;
--	}
--	if (scan_mode) {
--		for (j = f = 0; scan_down[j]; j++) {
--			if (scan_length[j] == 0) {
--				continue;
--			}
--			if (!strncmp(s, scan_down[j], scan_length[j])) {
--				if (!f) {	/* first match */
--					put_cr();
--					if (hx) {
--						put_str(hex_expand_to(s, 10));
--					} else {
--						put_str(expand_to(s, 10));
--					}
--					f = 1;
--				}
--				(void) end_funky(scan_name[j][0]);
--				put_str(" ");
--				put_str(scan_name[j]);
--				scan_tested[j] = 1;
--				s += scan_length[j];
--				if (strncmp(s, scan_up[j], scan_length[j])) {
--					put_str(" scan down");
--				} else {
--					s += scan_length[j];
--				}
--				if (!*s) {
--					break;
--				}
--				j = -1;
--			}
--			if (!strncmp(s, scan_up[j], scan_length[j])) {
--				if (!f) {	/* first match */
--					put_cr();
--					if (hx) {
--						put_str(hex_expand_to(s, 10));
--					} else {
--						put_str(expand_to(s, 10));
--					}
--					f = 1;
--				}
--				put_str(" ");
--				put_str(scan_name[j]);
--				put_str(" scan up");
--				s += scan_length[j];
--				if (!*s) {
--					break;
--				}
--				j = -1;
--			}
--		}
--	} else {
--		for (j = f = 0; j < key_count; j++) {
--			if (!strcmp(s, fkval[j])) {
--				if (!f) {	/* first match */
--					put_cr();
--					if (hx) {
--						put_str(hex_expand_to(s, 10));
--					} else {
--						put_str(expand_to(s, 10));
--					}
--					f = 1;
--				}
--				sprintf(outbuf, " (%s)", fk_name[j]);
--				put_str(outbuf);
--				if (fk_label[j]) {
--					sprintf(outbuf, " <%s>", fk_label[j]);
--					put_str(outbuf);
--				}
--				fk_tested[j] = 1;
--			}
--		}
--	}
--	if (end_state == '?') {
--		keys_tested(0, 1, hx);
--		tty_raw(cc, char_mask);
--		end_state = 0;
--	}
--	return f;
--}
--
--
--static int
--found_exit(char *keybuf, int hx, int cc)
--{				/* return true if the user wants to exit */
--	int j, k;
--	char *s;
--
--
--	if (scan_mode) {
--		if (*keybuf == '\0') {
--			return TRUE;
--		}
--	} else {
--		/* break is a special case */
--		if (*keybuf == '\0') {
--			fresh_line();
--			tty_set();
--			ptext("Hit X to exit: ");
--			if (wait_here() == 'X') {
--				return TRUE;
--			}
--			keys_tested(0, 1, hx);
--			tty_raw(cc, char_mask);
--			return FALSE;
--		}
--		/* is this the end? */
--		for (k = 0; (j = (keybuf[k] & STRIP_PARITY)); k++) {
--			if (end_funky(j)) {
--				return TRUE;
--			}
--		}
--
--		j = TRUE;	/* does he need an updated list? */
--		for (k = 0; keybuf[k]; k++) {
--			j &= (keybuf[k] & STRIP_PARITY) == '?';
--		}
--		if (j || end_state == '?') {
--			keys_tested(0, 1, hx);
--			tty_raw(cc, char_mask);
--			end_state = 0;
--			return FALSE;
--		}
--	}
--
--	put_cr();
--	if (hx) {
--		s = hex_expand_to(keybuf, 10);
--	} else {
--		s = expand_to(keybuf, 10);
--	}
--	sprintf(temp, "%s Unknown", s);
--	put_str(temp);
--	for (j = 0; j < MAX_FK_UNK; j++) {
--		if (j == funk) {
--			fk_length[funk] = expand_chars;
--			if ((fk_unknown[funk] = (char *)malloc(strlen(s) + 1))) {
--				strcpy(fk_unknown[funk++], s);
--			}
--			break;
--		}
--		if (fk_length[j] == expand_chars) {
--			if (!strcmp(fk_unknown[j], s)) {
--				break;
--			}
--		}
--	}
--	return FALSE;
--}
--
--/*
--**	funkey_keys(test_list, status, ch)
--**
--**	Test function keys
--*/
--static void
--funkey_keys(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	char keybuf[256];
--
--	if (keypad_xmit) {
--		tc_putp(keypad_xmit);
--	}
--	keys_tested(1, 1, hex_out);	/* also clears screen */
--	keybuf[0] = '\0';
--	end_state = 0;
--	if (scan_mode) {
--		fkmax = scan_max;
--	}
--	tty_raw(0, char_mask);
--	while (end_state != 'd') {
--		read_key(keybuf, sizeof(keybuf));
--		fresh_line();
--		if (found_match(keybuf, hex_out, 0)) {
--			continue;
--		}
--		if (found_exit(keybuf, hex_out, 0)) {
--			break;
--		}
--	}
--	if (keypad_local) {
--		tc_putp(keypad_local);
--	}
--	keys_tested(0, 0, hex_out);
--	ptext("Function key test ");
--	generic_done_message(t, state, ch);
--}
--
--int
--tty_meta_prep(void)
--{				/* print a warning before the meta key test */
--	if (not_a_tty) {
--		return 0;
--	}
--	if (initial_stty_query(TTY_8_BIT)) {
--		return 0;
--	}
--	ptext("The meta key test must be run with the");
--	ptext(" terminal set for 8 data bits.  Two stop bits");
--	ptext(" may also be needed for correct display.  I will");
--	ptext(" transmit 8 bit data but if the terminal is set for");
--	ptextln(" 7 bit data, garbage may appear on the screen.");
--	return 1;
--}
--
--/*
--**	funkey_meta(test_list, status, ch)
--**
--**	Test meta key (km) (smm) (rmm)
--*/
--static void
--funkey_meta(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i, j, k, len;
--	char outbuf[256];
--
--	if (has_meta_key) {
--		put_crlf();
--		if (char_mask != ALLOW_PARITY) {
--			if (tty_meta_prep()) {
--				ptext("\nHit any key to continue > ");
--				(void) wait_here();
--				put_crlf();
--			}
--		}
--		ptext("Begin meta key test. (km) (smm) (rmm)  Hit any key");
--		ptext(" with the meta key.  The character will be");
--		ptext(" displayed in hex.  If the meta key is working");
--		ptext(" then the most significant bit will be set.  Type");
--		ptextln(" 'end' to exit.");
--		tty_raw(1, ALLOW_PARITY);
--		tc_putp(meta_on);
--
--		for (i = j = k = len = 0; i != 'e' || j != 'n' || k != 'd';) {
--			i = j;
--			j = k;
--			k = getchp(ALLOW_PARITY);
--			if (k == EOF) {
--				break;
--			}
--			if ((len += 3) >= columns) {
--				put_crlf();
--				len = 3;
--			}
--			sprintf(outbuf, "%02X ", k);
--			put_str(outbuf);
--			k &= STRIP_PARITY;
--		}
--		tc_putp(meta_off);
--		put_crlf();
--		tty_set();
--		put_crlf();
--	} else {
--		ptext("(km) Has-meta-key is not set.  ");
--	}
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	funkey_label(test_list, status, ch)
--**
--**	Test labels (nlab) (smln) (pln) (rmln) (lw) (lh)
--*/
--static void
--funkey_label(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i;
--	char outbuf[256];
--
--	if (num_labels == -1) {
--		ptextln("Your terminal has no labels. (nlab)");
--	} else {
--		sprintf(temp, "Your terminal has %d labels (nlab) that are %d characters wide (lw) and %d lines high (lh)",
--			num_labels, label_width, label_height);
--		ptext(temp);
--		ptextln(" Testing (smln) (pln) (rmln)");
--		if (label_on) {
--			tc_putp(label_on);
--		}
--		if (label_width <= 0) {
--			label_width = sizeof(outbuf) - 1;
--		}
--		for (i = 1; i <= num_labels; i++) {
--			sprintf(outbuf, "L%d..............................", i);
--			outbuf[label_width] = '\0';
--			tc_putp(TPARM_2(plab_norm, i, outbuf));
--		}
--		if (label_off) {
--			ptext("Hit any key to remove the labels: ");
--			(void) wait_here();
--			tc_putp(label_off);
--		}
--	}
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	funkey_prog(test_list, status, ch)
--**
--**	Test program function keys (pfx)
--*/
--static void
--funkey_prog(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i, fk;
--	char mm[256];
--
--	fk = 1;	/* use function key 1 for now */
--	if (pkey_xmit) {
--		/* test program function key */
--		sprintf(temp,
--			"(pfx) Set function key %d to transmit abc\\n", fk);
--		ptextln(temp);
--		tc_putp(TPARM_2(pkey_xmit, fk, "abc\n"));
--		sprintf(temp, "Hit function key %d\n", fk);
--		ptextln(temp);
--		for (i = 0; i < 4; ++i)
--			mm[i] = getchp(STRIP_PARITY);
--		mm[i] = '\0';
--		put_crlf();
--		if (mm[0] != 'a' || mm[1] != 'b' || mm[2] != 'c') {
--			sprintf(temp, "Error string received was: %s", expand(mm));
--			ptextln(temp);
--		} else {
--			putln("Thank you\n");
--		}
--		flush_input();
--		if (key_f1) {
--			tc_putp(TPARM_2(pkey_xmit, fk, key_f1));
--		}
--	} else {
--		ptextln("Function key transmit (pfx), not present.");
--	}
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	funkey_local(test_list, status, ch)
--**
--**	Test program local function keys (pfloc)
--*/
--static void
--funkey_local(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int fk;
--
--	fk = 1;
--	if (pkey_local) {
--		/* test local function key */
--		sprintf(temp,
--			"(pfloc) Set function key %d to execute a clear and print \"Done!\"", fk);
--		ptextln(temp);
--		sprintf(temp, "%sDone!", liberated(clear_screen));
--		tc_putp(TPARM_2(pkey_local, fk, temp));
--		sprintf(temp, "Hit function key %d.  Then hit return.", fk);
--		ptextln(temp);
--		(void) wait_here();
--		flush_input();
--		if (key_f1 && pkey_xmit) {
--			tc_putp(TPARM_2(pkey_xmit, fk, key_f1));
--		}
--	} else {
--		ptextln("Function key execute local (pfloc), not present.");
--	}
--
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	printer_on(test_list, status, ch)
--**
--**	Test printer on/off (mc4) (mc5) (mc5i)
--*/
--static void
--printer_on(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	if (!prtr_on || !prtr_off) {
--		ptextln("Printer on/off missing. (mc5) (mc4)");
--	} else if (prtr_silent) {
--		ptextln("Your printer is silent. (mc5i) is set.");
--		tc_putp(prtr_on);
--		ptextln("This line should be on the printer but not your screen. (mc5)");
--		tc_putp(prtr_off);
--		ptextln("This line should be only on the screen. (mc4)");
--	} else {
--		ptextln("Your printer is not silent. (mc5i) is reset.");
--		tc_putp(prtr_on);
--		ptextln("This line should be on the printer and the screen. (mc5)");
--		tc_putp(prtr_off);
--		ptextln("This line should only be on the screen. (mc4)");
--	}
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	printer_mc0(test_list, status, ch)
--**
--**	Test screen print (mc0)
--*/
--static void
--printer_mc0(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	if (print_screen) {
--		ptext("I am going to send the contents of the screen to");
--		ptext(" the printer, then wait for a keystroke from you.");
--		ptext("  All of the text that appears on the screen");
--		ptextln(" should be printed. (mc0)");
--		tc_putp(print_screen);
--	} else {
--		ptext("(mc0) Print-screen is not present.  ");
--	}
--	generic_done_message(t, state, ch);
--}
--
--
--static void
--line_pattern(void)
--{				/* put up a pattern that will help count the
--				   number of lines */
--	int i, j;
--
--	put_clear();
--	if (over_strike) {
--		for (i = 0; i < 100; i++) {
--			if (i) {
--				put_crlf();
--			}
--			for (j = i / 10; j; j--) {
--				put_this(' ');
--			}
--			put_this('0' + ((i + 1) % 10));
--		}
--	} else	/* I assume it will scroll */ {
--		for (i = 100; i; i--) {
--			sprintf(temp, "\r\n%d", i);
--			put_str(temp);
--		}
--	}
--}
--
--
--static void
--column_pattern(void)
--{				/* put up a pattern that will help count the
--				   number of columns */
--	int i, j;
--
--	put_clear();
--	for (i = 0; i < 20; i++) {
--		for (j = 1; j < 10; j++) {
--			put_this('0' + j);
--		}
--		put_this('.');
--	}
--}
--
--/*
--**	report_help()
--**
--**	Print the help text for the echo tests
--*/
--static void
--report_help(int crx)
--{
--	ptextln("The following commands may also be entered:");
--	ptextln(" clear   clear screen.");
--	ptextln(" columns print a test pattern to help count screen width.");
--	ptextln(" lines   print a test pattern to help count screen length.");
--	ptextln(" end     exit.");
--	ptextln(" echo    redisplay last report.");
--	if (crx) {
--		ptextln(" hex     redisplay last report in hex.");
--	} else {
--		ptextln(" hex     toggle hex display mode.");
--	}
--	ptextln(" help    display this list.");
--	ptextln(" high    toggle forced high bit (0x80).");
--	ptextln(" scan    toggle scan mode.");
--	ptextln(" one     echo one character after <cr> or <lf> as is. (report mode)");
--	ptextln(" two     echo two characters after <cr> or <lf> as is.");
--	ptextln(" all     echo all characters after <cr> or <lf> as is. (echo mode)");
--}
--
--/*
--**	tools_report(testlist, state, ch)
--**
--**	Run the echo tool and report tool
--*/
--void
--tools_report(
--	struct test_list *t,
--	int *state GCC_UNUSED,
--	int *pch GCC_UNUSED)
--{
--	int i, j, ch, crp, crx, high_bit, save_scan_mode, hex_display;
--	char buf[1024];
--	char txt[8];
--
--	hex_display = hex_out;
--	put_clear();
--	if ((crx = (t->flags & 255)) == 1) {
--		ptext("Characters after a CR or LF will be echoed as");
--		ptextln(" is.  All other characters will be expanded.");
--		report_help(crx);
--	} else {	/* echo test */
--		ptextln("Begin echo test.");
--		report_help(crx);
--	}
--	memset(txt, 0, sizeof(txt));
--	save_scan_mode = scan_mode;
--	tty_raw(1, char_mask);
--	for (i = crp = high_bit = 0;;) {
--		ch = getchp(char_mask);
--		if (ch == EOF) {
--			break;
--		}
--		if (i >= (int) sizeof(buf) - 1) {
--			i = 0;
--		}
--		buf[i++] = ch;
--		buf[i] = '\0';
--		for (j = 0; j < (int) sizeof(txt) - 1; j++) {
--			txt[j] = txt[j + 1];
--		}
--		txt[sizeof(txt) - 1] = ch & STRIP_PARITY;
--		if (crx == 0) {	/* echo test */
--			if (hex_display) {
--				ptext(hex_expand_to(&buf[i - 1], 3));
--			} else {
--				tc_putch(ch | high_bit);
--			}
--		} else /* status report test */
--		if (ch == '\n' || ch == '\r') {
--			put_crlf();
--			crp = 0;
--		} else if (crp++ < crx) {
--			tc_putch(ch | high_bit);
--		} else {
--			put_str(expand(&buf[i - 1]));
--		}
--		if (!strncmp(&txt[sizeof(txt) - 7], "columns", 7)) {
--			column_pattern();
--			buf[i = 0] = '\0';
--			crp = 0;
--		}
--		if (!strncmp(&txt[sizeof(txt) - 5], "lines", 5)) {
--			line_pattern();
--			buf[i = 0] = '\0';
--			crp = 0;
--		}
--		if (!strncmp(&txt[sizeof(txt) - 5], "clear", 5)) {
--			put_clear();
--			buf[i = 0] = '\0';
--			crp = 0;
--		}
--		if (!strncmp(&txt[sizeof(txt) - 4], "high", 4)) {
--			high_bit ^= 0x80;
--			if (high_bit) {
--				ptextln("\nParity bit set");
--			} else {
--				ptextln("\nParity bit reset");
--			}
--		}
--		if (!strncmp(&txt[sizeof(txt) - 4], "help", 4)) {
--			put_crlf();
--			report_help(crx);
--		}
--		if (!strncmp(&txt[sizeof(txt) - 4], "echo", 4)) {
--			/* display the last status report */
--			/* clear bypass condition on Tek terminals */
--			put_crlf();
--			if (i >= 4) {
--				buf[i -= 4] = '\0';
--			}
--			put_str(expand(buf));
--		}
--		if (save_scan_mode &&
--			!strncmp(&txt[sizeof(txt) - 4], "scan", 4)) {
--			/* toggle scan mode */
--			scan_mode = !scan_mode;
--		}
--		if (!strncmp(&txt[sizeof(txt) - 3], "end", 3))
--			break;
--		if (!strncmp(&txt[sizeof(txt) - 3], "hex", 3)) {
--			if (crx) {
--				/* display the last status report in hex */
--				/* clear bypass condition on Tek terminals */
--				put_crlf();
--				if (i >= 3) {
--					buf[i -= 3] = '\0';
--				}
--				put_str(hex_expand_to(buf, 3));
--			} else {
--				hex_display = !hex_display;
--			}
--		}
--		if (!strncmp(&txt[sizeof(txt) - 3], "two", 3))
--			crx = 2;
--		if (!strncmp(&txt[sizeof(txt) - 3], "one", 3))
--			crx = 1;
--		if (!strncmp(&txt[sizeof(txt) - 3], "all", 3))
--			crx = 0;
--	}
--	scan_mode = save_scan_mode;
--	put_crlf();
--	tty_set();
--	if (crx) {
--		ptextln("End of status report test.");
--	} else {
--		ptextln("End of echo test.");
--	}
--}
-diff -Naur ncurses-5.6.orig/tack/init.c ncurses-5.6/tack/init.c
---- ncurses-5.6.orig/tack/init.c	2006-11-25 19:16:01.000000000 -0500
-+++ ncurses-5.6/tack/init.c	1969-12-31 19:00:00.000000000 -0500
-@@ -1,316 +0,0 @@
--/*
--** Copyright (C) 1991, 1997 Free Software Foundation, Inc.
--**
--** This file is part of TACK.
--**
--** TACK is free software; you can redistribute it and/or modify
--** it under the terms of the GNU General Public License as published by
--** the Free Software Foundation; either version 2, or (at your option)
--** any later version.
--**
--** TACK is distributed in the hope that it will be useful,
--** but WITHOUT ANY WARRANTY; without even the implied warranty of
--** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--** GNU General Public License for more details.
--**
--** You should have received a copy of the GNU General Public License
--** along with TACK; see the file COPYING.  If not, write to
--** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
--** Boston, MA 02110-1301, USA
--*/
--/* initialization and wrapup code */
--
--#include <tack.h>
--
--MODULE_ID("$Id: init.c,v 1.7 2006/11/26 00:16:01 tom Exp $")
--
--#if NCURSES_VERSION_MAJOR >= 5 || NCURSES_VERSION_PATCH >= 981219
--#define _nc_get_curterm(p) _nc_get_tty_mode(p)
--#endif
--
--FILE *debug_fp;
--char temp[1024];
--char tty_basename[64];
--
--void
--put_name(const char *cap, const char *name)
--{				/* send the cap name followed by the cap */
--	if (cap) {
--		ptext(name);
--		tc_putp(cap);
--	}
--}
--
--static void
--report_cap(const char *tag, const char *s)
--{				/* expand the cap or print *** missing *** */
--	int i;
--
--	ptext(tag);
--	for (i = char_count; i < 13; i++) {
--		putchp(' ');
--	}
--	put_str(" = ");
--	if (s) {
--		putln(expand(s));
--	} else {
--		putln("*** missing ***");
--	}
--}
--
--
--void
--reset_init(void)
--{				/* send the reset and init strings */
--	int i;
--
--	ptext("Terminal reset");
--	i = char_count;
--	put_name(reset_1string, " (rs1)");
--	put_name(reset_2string, " (rs2)");
--	/* run the reset file */
--	if (reset_file && reset_file[0]) {
--		FILE *fp;
--		int ch;
--
--		can_test("rf", FLAG_TESTED);
--		if ((fp = fopen(reset_file, "r"))) {	/* send the reset file */
--			sprintf(temp, " (rf) %s", reset_file);
--			ptextln(temp);
--			while (1) {
--				ch = getc(fp);
--				if (ch == EOF)
--					break;
--				put_this(ch);
--			}
--			fclose(fp);
--		} else {
--			sprintf(temp, "\nCannot open reset file (rf) %s", reset_file);
--			ptextln(temp);
--		}
--	}
--	put_name(reset_3string, " (rs3)");
--	if (i != char_count) {
--		put_crlf();
--	}
--	ptext(" init");
--	put_name(init_1string, " (is1)");
--	put_name(init_2string, " (is2)");
--	if (set_tab && clear_all_tabs && init_tabs != 8) {
--		put_crlf();
--		tc_putp(clear_all_tabs);
--		for (char_count = 0; char_count < columns; char_count++) {
--			put_this(' ');
--			if ((char_count & 7) == 7) {
--				tc_putp(set_tab);
--			}
--		}
--		put_cr();
--	}
--	/* run the initialization file */
--	if (init_file && init_file[0]) {
--		FILE *fp;
--		int ch;
--
--		can_test("if", FLAG_TESTED);
--		if ((fp = fopen(init_file, "r"))) {	/* send the init file */
--			sprintf(temp, " (if) %s", init_file);
--			ptextln(temp);
--			while (1) {
--				ch = getc(fp);
--				if (ch == EOF)
--					break;
--				put_this(ch);
--			}
--			fclose(fp);
--		} else {
--			sprintf(temp, "\nCannot open init file (if) %s", init_file);
--			ptextln(temp);
--		}
--	}
--	if (init_prog) {
--		can_test("iprog", FLAG_TESTED);
--		(void) system(init_prog);
--	}
--	put_name(init_3string, " (is3)");
--
--	fflush(stdout);
--}
--
--/*
--**	display_basic()
--**
--**	display the basic terminal definitions
--*/
--void
--display_basic(void)
--{
--	put_str("Name: ");
--	putln(ttytype);
--
--	report_cap("\\r ^M (cr)", carriage_return);
--	report_cap("\\n ^J (ind)", scroll_forward);
--	report_cap("\\b ^H (cub1)", cursor_left);
--	report_cap("\\t ^I (ht)", tab);
--/*      report_cap("\\f ^L (ff)", form_feed);	*/
--	if (newline) {
--		/* OK if missing */
--		report_cap("      (nel)", newline);
--	}
--	report_cap("      (clear)", clear_screen);
--	if (!cursor_home && cursor_address) {
--		report_cap("(cup) (home)", TPARM_2(cursor_address, 0, 0));
--	} else {
--		report_cap("      (home)", cursor_home);
--	}
--#ifdef user9
--	report_cap("ENQ   (u9)", user9);
--#endif
--#ifdef user8
--	report_cap("ACK   (u8)", user8);
--#endif
--
--	sprintf(temp, "\nTerminal size: %d x %d.  Baud rate: %u.  Frame size: %d.%d",
--		columns, lines,
--		tty_baud_rate,
--		tty_frame_size >> 1,
--		(tty_frame_size & 1) * 5);
--	putln(temp);
--}
--
--/*
--**	curses_setup(exec_name)
--**
--**	Startup ncurses
--*/
--void
--curses_setup(
--	char *exec_name)
--{
--	int status;
--	static TERMTYPE term;
--	char tty_filename[2048];
--
--	tty_init();
--
--	/**
--	   See if the terminal is in the terminfo data base.  This call has
--	two useful benefits, 1) it returns the filename of the terminfo entry,
--	and 2) it searches only terminfo's.  This allows us to abort before
--	ncurses starts scanning the termcap file.
--	**/
--	if ((status = _nc_read_entry(tty_basename, tty_filename, &term)) == 0) {
--		const TERMTYPE *fallback = _nc_fallback(tty_basename);
--
--		if (fallback) {
--		    term = *fallback;
--		    sprintf(tty_filename, "(fallback)%s", tty_basename);
--		    status = 1;
--		} else {
--		    fprintf(stderr, "Terminal not found: TERM=%s\n", tty_basename);
--		    show_usage(exec_name);
--		    exit(1);
--		}
--	}
--	if (status == -1) {
--		fprintf(stderr, "Terminfo database is inaccessible\n");
--		exit(1);
--	}
--
--	/**
--	   This call will load the terminfo data base and set the cur-term
--	variable.  Only terminals that actually exist will get here so its
--	OK to ignore errors.  This is a good thing since ncurses does not
--	permit (os) or (gn) to be set.
--	**/
--	setupterm(tty_basename, 1, &status);
--
--	/**
--	   Get the current terminal definitions.  This must be done before
--	getting the baudrate.
--	**/
--	_nc_get_curterm(&cur_term->Nttyb);
--	tty_baud_rate = baudrate();
--	tty_cps = (tty_baud_rate << 1) / tty_frame_size;
--
--	/* set up the defaults */
--	replace_mode = TRUE;
--	scan_mode = 0;
--	char_count = 0;
--	select_delay_type = debug_level = 0;
--	char_mask = (meta_on && meta_on[0] == '\0') ? ALLOW_PARITY : STRIP_PARITY;
--	/* Don't change the XON/XOFF modes yet. */
--	select_xon_xoff = initial_stty_query(TTY_XON_XOFF) ? 1 : needs_xon_xoff;
--
--	fflush(stdout);	/* flush any output */
--	tty_set();
--
--	go_home();	/* set can_go_home */
--	put_clear();	/* set can_clear_screen */
--
--	if (send_reset_init) {
--		reset_init();
--	}
--
--	/*
--	   I assume that the reset and init strings may not have the correct
--	   pads.  (Because that part of the test comes much later.)  Because
--	   of this, I allow the terminal some time to catch up.
--	*/
--	fflush(stdout);	/* waste some time */
--	sleep(1);	/* waste more time */
--	charset_can_test();
--	can_test("lines cols cr nxon rf if iprog rmp smcup rmcup", FLAG_CAN_TEST);
--	edit_init();			/* initialize the edit data base */
--
--	if (send_reset_init && enter_ca_mode) {
--		tc_putp(enter_ca_mode);
--		put_clear();	/* just in case we switched pages */
--	}
--	put_crlf();
--	ptext("Using terminfo from: ");
--	ptextln(tty_filename);
--	put_crlf();
--
--	if (tty_can_sync == SYNC_NEEDED) {
--		verify_time();
--	}
--
--	display_basic();
--}
--
--/*
--**	bye_kids(exit-condition)
--**
--**	Shutdown the terminal, clear the signals, and exit
--*/
--void
--bye_kids(int n)
--{				/* reset the tty and exit */
--	ignoresig();
--	if (send_reset_init) {
--		if (exit_ca_mode) {
--			tc_putp(exit_ca_mode);
--		}
--		if (initial_stty_query(TTY_XON_XOFF)) {
--			if (enter_xon_mode) {
--				tc_putp(enter_xon_mode);
--			}
--		} else if (exit_xon_mode) {
--			tc_putp(exit_xon_mode);
--		}
--	}
--	if (debug_fp) {
--		fclose(debug_fp);
--	}
--	if (log_fp) {
--		fclose(log_fp);
--	}
--	tty_reset();
--	fclose(stdin);
--	fclose(stdout);
--	fclose(stderr);
--	if (not_a_tty)
--		sleep(1);
--	exit(n);
--}
-diff -Naur ncurses-5.6.orig/tack/menu.c ncurses-5.6/tack/menu.c
---- ncurses-5.6.orig/tack/menu.c	2005-09-17 15:49:16.000000000 -0400
-+++ ncurses-5.6/tack/menu.c	1969-12-31 19:00:00.000000000 -0500
-@@ -1,421 +0,0 @@
--/*
--** Copyright (C) 1991, 1997 Free Software Foundation, Inc.
--** 
--** This file is part of TACK.
--** 
--** TACK is free software; you can redistribute it and/or modify
--** it under the terms of the GNU General Public License as published by
--** the Free Software Foundation; either version 2, or (at your option)
--** any later version.
--** 
--** TACK is distributed in the hope that it will be useful,
--** but WITHOUT ANY WARRANTY; without even the implied warranty of
--** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--** GNU General Public License for more details.
--** 
--** You should have received a copy of the GNU General Public License
--** along with TACK; see the file COPYING.  If not, write to
--** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
--** Boston, MA 02110-1301, USA
--*/
--
--#include <tack.h>
--
--MODULE_ID("$Id: menu.c,v 1.3 2005/09/17 19:49:16 tom Exp $")
--
--/*
--   Menu control
-- */
--
--static void test_byname(struct test_menu *, int *, int *);
--
--struct test_list *augment_test;
--char prompt_string[80];	/* menu prompt storage */
--
--/*
--**	menu_prompt()
--**
--**	Print the menu prompt string.
--*/
--void
--menu_prompt(void)
--{
--	ptext(&prompt_string[1]);
--}
--
--/*
--**	menu_test_loop(test-structure, state, control-character)
--**
--**	This function implements the repeat test function.
--*/
--static void
--menu_test_loop(
--	struct test_list *test,
--	int *state,
--	int *ch)
--{
--	int nch, p;
--
--	if ((test->flags & MENU_REP_MASK) && (augment_test != test)) {
--		/* set the augment variable (first time only) */
--		p = (test->flags >> 8) & 15;
--		if ((test->flags & MENU_REP_MASK) == MENU_LM1) {
--			augment = lines - 1;
--		} else
--		if ((test->flags & MENU_ONE_MASK) == MENU_ONE) {
--			augment = 1;
--		} else
--		if ((test->flags & MENU_LC_MASK) == MENU_lines) {
--			augment = lines * p / 10;
--		} else
--		if ((test->flags & MENU_LC_MASK) == MENU_columns) {
--			augment = columns * p / 10;
--		} else {
--			augment = 1;
--		}
--		augment_test = test;
--		set_augment_txt();
--	}
--	do {
--		if ((test->flags | *state) & MENU_CLEAR) {
--			put_clear();
--		} else
--		if (line_count + test->lines_needed >= lines) {
--			put_clear();
--		}
--		nch = 0;
--		if (test->test_procedure) {
--			/* The procedure takes precedence so I can pass
--			   the menu entry as an argument.
--			*/
--			can_test(test->caps_done, FLAG_TESTED);
--			can_test(test->caps_tested, FLAG_TESTED);
--			test->test_procedure(test, state, &nch);
--		} else
--		if (test->sub_menu) {
--			/* nested menu's */
--			menu_display(test->sub_menu, &nch);
--			*state = 0;
--			if (nch == 'q' || nch == 's') {
--				/* Quit and skip are killed here */
--				nch = '?';
--			}
--		} else {
--			break;	/* cya */
--		}
--		if (nch == '\r' || nch == '\n' || nch == 'n') {
--			nch = 0;
--			break;
--		}
--	} while (nch == 'r');
--	*ch = nch;
--}
--
--/*
--**	menu_display(menu-structure, flags)
--**
--**	This function implements menu control.
--*/
--void
--menu_display(
--	struct test_menu *menu,
--	int *last_ch)
--{
--	int test_state = 0, run_standard_tests;
--	int hot_topic, ch = 0, nch = 0;
--	struct test_list *mt;
--	struct test_list *repeat_tests = 0;
--	int repeat_state = 0;
--	int prompt_length;
--
--	prompt_length = strlen(prompt_string);
--	if (menu->ident) {
--		sprintf(&prompt_string[prompt_length], "/%s", menu->ident);
--	}
--	hot_topic = menu->default_action;
--	run_standard_tests = menu->standard_tests ?
--		menu->standard_tests[0] : -1;
--	if (!last_ch) {
--		last_ch = &ch;
--	}
--	while (1) {
--		if (ch == 0) {
--			/* Display the menu */
--			put_crlf();
--			if (menu->menu_function) {
--				/*
--				   this function may be used to restrict menu
--				   entries.  If used it must print the title.
--				*/
--				menu->menu_function(menu);
--			} else
--			if (menu->menu_title) {
--				ptextln(menu->menu_title);
--			}
--			for (mt = menu->tests; (mt->flags & MENU_LAST) == 0; mt++) {
--				if (mt->menu_entry) {
--					ptext(" ");
--					ptextln(mt->menu_entry);
--				}
--			}
--			if (menu->standard_tests) {
--				ptext(" ");
--				ptextln(menu->standard_tests);
--				ptextln(" r) repeat test");
--				ptextln(" s) skip to next test");
--			}
--			ptextln(" q) quit");
--			ptextln(" ?) help");
--		}
--		if (ch == 0 || ch == REQUEST_PROMPT) {
--			put_crlf();
--			ptext(&prompt_string[1]);
--			if (hot_topic) {
--				ptext(" [");
--				putchp(hot_topic);
--				ptext("]");
--			}
--			ptext(" > ");
--			/* read a character */
--			ch = wait_here();
--		}
--		if (ch == '\r' || ch == '\n') {
--			ch = hot_topic;
--		}
--		if (ch == 'q') {
--			break;
--		}
--		if (ch == '?') {
--			ch = 0;
--			continue;
--		}
--		nch = ch;
--		ch = 0;
--		/* Run one of the standard tests (by request) */
--		for (mt = menu->tests; (mt->flags & MENU_LAST) == 0; mt++) {
--			if (mt->menu_entry && (nch == mt->menu_entry[0])) {
--				if (mt->flags & MENU_MENU) {
--					test_byname(menu, &test_state, &nch);
--				} else {
--					menu_test_loop(mt, &test_state, &nch);
--				}
--				ch = nch;
--				if ((mt->flags & MENU_COMPLETE) && ch == 0) {
--					/* top level */
--					hot_topic = 'q';
--					ch = '?';
--				}
--			}
--		}
--		if (menu->standard_tests && nch == 'r') {
--			menu->resume_tests = repeat_tests;
--			test_state = repeat_state;
--			nch = run_standard_tests;
--		}
--		if (nch == run_standard_tests) {
--			if (!(mt = menu->resume_tests)) {
--				mt = menu->tests;
--			}
--			if (mt->flags & MENU_LAST) {
--				mt = menu->tests;
--			}
--			/* Run the standard test suite */
--			for ( ; (mt->flags & MENU_LAST) == 0; ) {
--				if ((mt->flags & MENU_NEXT) == MENU_NEXT) {
--					repeat_tests = mt;
--					repeat_state = test_state;
--					nch = run_standard_tests;
--					menu_test_loop(mt, &test_state, &nch);
--					if (nch != 0 && nch != 'n') {
--						ch = nch;
--						break;
--					}
--					if (test_state & MENU_STOP) {
--						break;
--					}
--				}
--				mt++;
--			}
--			if (ch == 0) {
--				ch = hot_topic;
--			}
--			menu->resume_tests = mt;
--			menu->resume_state = test_state;
--			menu->resume_char = ch;
--
--			if (ch == run_standard_tests) {
--				/* pop up a level */
--				break;
--			}
--		}
--	}
--	*last_ch = ch;
--	prompt_string[prompt_length] = '\0';
--}
--
--/*
--**	generic_done_message(test_list)
--**
--**	Print the Done message and request input.
--*/
--void
--generic_done_message(
--	struct test_list *test,
--	int *state,
--	int *ch)
--{
--	char done_message[128];
--
--	if (test->caps_done) {
--		sprintf(done_message, "(%s) Done ", test->caps_done);
--		ptext(done_message);
--	} else {
--		ptext("Done ");
--	}
--	*ch = wait_here();
--	if (*ch == '\r' || *ch == '\n' || *ch == 'n') {
--		*ch = 0;
--	}
--	if (*ch == 's') {
--		*state |= MENU_STOP;
--		*ch = 0;
--	}
--}
--
--/*
--**	menu_clear_screen(test, state, ch)
--**
--**	Just clear the screen.
--*/
--void
--menu_clear_screen(
--	struct test_list *test GCC_UNUSED,
--	int *state GCC_UNUSED,
--	int *ch GCC_UNUSED)
--{
--	put_clear();
--}
--
--/*
--**	menu_reset_init(test, state, ch)
--**
--**	Send the reset and init strings.
--*/
--void
--menu_reset_init(
--	struct test_list *test GCC_UNUSED,
--	int *state GCC_UNUSED,
--	int *ch GCC_UNUSED)
--{
--	reset_init();
--	put_crlf();
--}
--
--/*
--**	subtest_menu(test, state, ch)
--**
--**	Scan the menu looking for something to execute
--**	Return TRUE if we found anything.
--*/
--int
--subtest_menu(
--	struct test_list *test,
--	int *state,
--	int *ch)
--{
--	struct test_list *mt;
--
--	if (*ch) {
--		for (mt = test; (mt->flags & MENU_LAST) == 0; mt++) {
--			if (mt->menu_entry && (*ch == mt->menu_entry[0])) {
--				*ch = 0;
--				menu_test_loop(mt, state, ch);
--				return TRUE;
--			}
--		}
--	}
--	return FALSE;
--}
--
--/*
--**	menu_can_scan(menu-structure)
--**
--**	Recursively scan the menu tree and find which cap names can be tested.
--*/
--void
--menu_can_scan(
--	const struct test_menu *menu)
--{
--	struct test_list *mt;
--
--	for (mt = menu->tests; (mt->flags & MENU_LAST) == 0; mt++) {
--		can_test(mt->caps_done, FLAG_CAN_TEST);
--		can_test(mt->caps_tested, FLAG_CAN_TEST);
--		if (!(mt->test_procedure)) {
--			if (mt->sub_menu) {
--				menu_can_scan(mt->sub_menu);
--			}
--		}
--	}
--}
--
--/*
--**	menu_search(menu-structure, cap)
--**
--**	Recursively search the menu tree and execute any tests that use cap.
--*/
--static void
--menu_search(
--	struct test_menu *menu,
--	int *state,
--	int *ch,
--	char *cap)
--{
--	struct test_list *mt;
--	int nch;
--
--	for (mt = menu->tests; (mt->flags & MENU_LAST) == 0; mt++) {
--		nch = 0;
--		if (cap_match(mt->caps_done, cap)
--			|| cap_match(mt->caps_tested, cap)) {
--			menu_test_loop(mt, state, &nch);
--		}
--		if (!(mt->test_procedure)) {
--			if (mt->sub_menu) {
--				menu_search(mt->sub_menu, state, &nch, cap);
--			}
--		}
--		if (*state & MENU_STOP) {
--			break;
--		}
--		if (nch != 0 && nch != 'n') {
--			*ch = nch;
--			break;
--		}
--	}
--}
--
--/*
--**	test_byname(menu, state, ch)
--**
--**	Get a cap name then run all tests that use that cap.
--*/
--static void
--test_byname(
--	struct test_menu *menu,
--	int *state GCC_UNUSED,
--	int *ch)
--{
--	int test_state = 0;
--	char cap[32];
--
--	if (tty_can_sync == SYNC_NOT_TESTED) {
--		verify_time();
--	}
--	ptext("enter name: ");
--	read_string(cap, sizeof(cap));
--	if (cap[0]) {
--		menu_search(menu, &test_state, ch, cap);
--	}
--	*ch = '?';
--}
-diff -Naur ncurses-5.6.orig/tack/modes.c ncurses-5.6/tack/modes.c
---- ncurses-5.6.orig/tack/modes.c	2006-11-25 19:16:21.000000000 -0500
-+++ ncurses-5.6/tack/modes.c	1969-12-31 19:00:00.000000000 -0500
-@@ -1,913 +0,0 @@
--/*
--** Copyright (C) 1991, 1997 Free Software Foundation, Inc.
--** 
--** This file is part of TACK.
--** 
--** TACK is free software; you can redistribute it and/or modify
--** it under the terms of the GNU General Public License as published by
--** the Free Software Foundation; either version 2, or (at your option)
--** any later version.
--** 
--** TACK is distributed in the hope that it will be useful,
--** but WITHOUT ANY WARRANTY; without even the implied warranty of
--** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--** GNU General Public License for more details.
--** 
--** You should have received a copy of the GNU General Public License
--** along with TACK; see the file COPYING.  If not, write to
--** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
--** Boston, MA 02110-1301, USA
--*/
--
--#include <tack.h>
--
--MODULE_ID("$Id: modes.c,v 1.3 2006/11/26 00:16:21 tom Exp $")
--
--/*
-- * Tests boolean flags and terminal modes.
-- */
--static void subtest_os(struct test_list *, int *, int *);
--static void subtest_rmam(struct test_list *, int *, int *);
--static void subtest_smam(struct test_list *, int *, int *);
--static void subtest_am(struct test_list *, int *, int *);
--static void subtest_ul(struct test_list *, int *, int *);
--static void subtest_uc(struct test_list *, int *, int *);
--static void subtest_bw(struct test_list *, int *, int *);
--static void subtest_xenl(struct test_list *, int *, int *);
--static void subtest_eo(struct test_list *, int *, int *);
--static void subtest_xmc(struct test_list *, int *, int *);
--static void subtest_xhp(struct test_list *, int *, int *);
--static void subtest_mir(struct test_list *, int *, int *);
--static void subtest_msgr(struct test_list *, int *, int *);
--static void subtest_tbc(struct test_list *, int *, int *);
--static void subtest_xt(struct test_list *, int *, int *);
--static void subtest_hts(struct test_list *, int *, int *);
--static void subtest_cbt(struct test_list *, int *, int *);
--static void subtest_in(struct test_list *, int *, int *);
--static void subtest_dadb(struct test_list *, int *, int *);
--
--struct test_list mode_test_list[] = {
--	{0, 0, 0, 0, "e) edit terminfo", 0, &edit_menu},
--	{MENU_NEXT, 3, "os", 0, 0, subtest_os, 0},
--	{MENU_NEXT, 1, "rmam", 0, 0, subtest_rmam, 0},
--	{MENU_NEXT, 1, "smam", 0, 0, subtest_smam, 0},
--	{MENU_NEXT, 1, "am", 0, 0, subtest_am, 0},
--	{MENU_NEXT, 3, "ul", 0, 0, subtest_ul, 0},
--	{MENU_NEXT, 3, "uc", 0, 0, subtest_uc, 0},
--	{MENU_NEXT, 3, "bw", 0, 0, subtest_bw, 0},
--	{MENU_NEXT, 4, "xenl", 0, 0, subtest_xenl, 0},
--	{MENU_NEXT, 3, "eo", 0, 0, subtest_eo, 0},
--	{MENU_NEXT, 3, "xmc", 0, 0, subtest_xmc, 0},
--	{MENU_NEXT, 3, "xhp", 0, 0, subtest_xhp, 0},
--	{MENU_NEXT, 6, "mir", 0, 0, subtest_mir, 0},
--	{MENU_NEXT, 6, "msgr", 0, 0, subtest_msgr, 0},
--	{MENU_NEXT | MENU_CLEAR, 0, "tbc", "it", 0, subtest_tbc, 0},
--	{MENU_NEXT | MENU_CLEAR, 0, "hts", "it", 0, subtest_hts, 0},
--	{MENU_NEXT, 4, "xt", "it", 0, subtest_xt, 0},
--	{MENU_NEXT, 1, "cbt", "it", 0, subtest_cbt, 0},
--	{MENU_NEXT, 6, "in", 0, 0, subtest_in, 0},
--	{MENU_NEXT, 1, "da) (db", 0, 0, subtest_dadb, 0},
--	{MENU_LAST, 0, 0, 0, 0, 0, 0}
--};
--
--/*
--**	subtest_os(test_list, status, ch)
--**
--**	test over strike mode (os)
--*/
--static void
--subtest_os(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	ptext("(os) should be true, not false.");
--	put_cr();
--	ptextln("(os) should be           false.");
--	sprintf(temp, "(os) over-strike is %s in the data base.  ",
--		over_strike ? "true" : "false");
--	ptext(temp);
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	subtest_rmam(test_list, status, ch)
--**
--**	test exit automatic margins mode (rmam)
--*/
--static void
--subtest_rmam(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int j;
--
--	if (!exit_am_mode) {
--		ptext("(rmam) not present.  ");
--	} else
--	if (!can_go_home) {
--		ptext("(rmam) not tested, no way to home cursor.  ");
--	} else
--	if (over_strike) {
--		put_clear();
--		go_home();
--		tc_putp(exit_am_mode);
--		ptext("\n(rmam) will     reset (am)");
--		go_home();
--		for (j = 0; j < columns; j++)
--			put_this(' ');
--		ptext("(rmam) will not reset (am)");
--		go_home();
--		put_newlines(2);
--	} else {
--		put_clear();
--		go_home();
--		tc_putp(exit_am_mode);
--		ptext("\n(rmam) will reset (am)");
--		go_home();
--		for (j = 0; j < columns; j++)
--			put_this(' ');
--		ptext("(rmam) will not reset (am) ");
--		go_home();
--		put_str("                          ");
--		go_home();
--		put_newlines(2);
--	}
--	ptext("Exit-automatic-margins ");
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	subtest_smam(test_list, status, ch)
--**
--**	test enter automatic margins mode (smam)
--*/
--static void
--subtest_smam(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i, j;
--
--	if (!enter_am_mode) {
--		ptext("(smam) not present.  ");
--	} else
--	if (!can_go_home) {
--		ptext("(smam) not tested, no way to home cursor.  ");
--	} else
--	if (over_strike) {
--		put_clear();
--		go_home();
--		tc_putp(enter_am_mode);
--		ptext("\n(smam) will ");
--		i = char_count;
--		ptext("not set (am)");
--		go_home();
--		for (j = -i; j < columns; j++)
--			put_this(' ');
--		put_str("@@@");
--		put_newlines(2);
--	} else {
--		put_clear();
--		go_home();
--		tc_putp(enter_am_mode);
--		ptext("\n(smam) will not set (am)");
--		go_home();
--		for (j = 0; j < columns; j++)
--			put_this(' ');
--		ptext("(smam) will set (am)    ");
--		go_home();
--		put_str("                          ");
--		put_newlines(2);
--	}
--	ptext("Enter-automatic-margins ");
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	subtest_am(test_list, status, ch)
--**
--**	test automatic margins (am)
--*/
--static void
--subtest_am(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i, j;
--
--	if (!can_go_home) {
--		ptextln("(am) not tested, no way to home cursor.  ");
--	} else
--	if (over_strike) {
--		put_clear();
--		go_home();
--		ptext("\n(am) should ");
--		i = char_count;
--		ptext("not be set");
--		go_home();
--		for (j = -i; j < columns; j++)
--			put_this(' ');
--		put_str("@@@");
--		go_home();
--		put_newlines(2);
--		sprintf(temp, "(am) is %s in the data base",
--			auto_right_margin ? "true" : "false");
--		ptextln(temp);
--	} else {
--		put_clear();
--		go_home();
--		ptext("\n(am) should not be set");
--		go_home();
--		for (j = 0; j < columns; j++)
--			put_this(' ');
--		ptext("(am) should be set    ");
--		go_home();
--		put_str("                       \n\n");
--		sprintf(temp, "(am) is %s in the data base",
--			auto_right_margin ? "true" : "false");
--		ptextln(temp);
--	}
--	ptext("Automatic-right-margin ");
--	generic_done_message(t, state, ch);
--}
--
--/* Note: uprint() sends underscore back-space character, and
--        ucprint() sends character back-space underscore.  */
--
--/*
--**	uprint(string)
--**
--**	underline string for (ul) test
--*/
--static void
--uprint(const char *s)
--{
--	if (s) {
--		while (*s) {
--			put_str("_\b");
--			putchp(*s++);
--		}
--	}
--}
--
--/*
--**	ucprint(string)
--**
--**	underline string for (uc) test
--*/
--static void
--ucprint(const char *s)
--{
--	if (s) {
--		while (*s) {
--			putchp(*s++);
--			putchp('\b');
--			tc_putp(underline_char);
--		}
--	}
--}
--
--/*
--**	subtest_ul(test_list, status, ch)
--**
--**	test transparent underline (ul)
--*/
--static void
--subtest_ul(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	if (!over_strike) {
--		/* (ul) is used only if (os) is reset */
--		put_crlf();
--		sprintf(temp, "This text should %sbe underlined.",
--			transparent_underline ? "" : "not ");
--		uprint(temp);
--		put_crlf();
--		ptextln("If the above line is not underlined the (ul) should be false.");
--		sprintf(temp, "(ul) Transparent-underline is %s in the data base",
--			transparent_underline ? "true" : "false");
--		ptextln(temp);
--		generic_done_message(t, state, ch);
--	}
--}
--
--/*
--**	subtest_uc(test_list, status, ch)
--**
--**	test underline character (uc)
--*/
--static void
--subtest_uc(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	if (!over_strike) {
--		if (underline_char) {
--			ucprint("This text should be underlined.");
--			put_crlf();
--			ptextln("If the above text is not underlined the (uc) has failed.");
--			ptext("Underline-character ");
--		} else {
--			ptext("(uc) underline-character is not defined.  ");
--		}
--		generic_done_message(t, state, ch);
--	}
--}
--
--/*
--**	subtest_bw(test_list, status, ch)
--**
--**	test auto left margin (bw)
--*/
--static void
--subtest_bw(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i, j;
--
--	if (over_strike) {
--		/* test (bw) */
--		ptext("\n(bw) should ");
--		i = char_count;
--		ptextln("not be set.");
--		for (j = i; j < columns; j++)
--			put_str("\b");
--		put_str("@@@");
--		put_crlf();
--		sprintf(temp, "(bw) Auto-left-margin is %s in the data base",
--			auto_left_margin ? "true" : "false");
--		ptextln(temp);
--	} else {
--		/* test (bw) */
--		ptextln("(bw) should not be set.");
--		for (i = 12; i < columns; i++)
--			put_str("\b");
--		if (delete_character) {
--			for (i = 0; i < 4; i++)
--				tc_putp(delete_character);
--		} else {
--			put_str("   ");
--		}
--		put_crlf();
--		sprintf(temp, "(bw) Auto-left-margin is %s in the data base",
--			auto_left_margin ? "true" : "false");
--		ptextln(temp);
--	}
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	subtest_tbc(test_list, status, ch)
--**
--**	test clear tabs (tbc)
--*/
--static void
--subtest_tbc(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int tabat;		/* the tab spacing we end up with */
--	int i;
--
--	if (clear_all_tabs && !set_tab) {
--		ptext("(tbc) Clear-all-tabs is defined but (hts) set-tab is not.  ");
--		ptext("Once the tabs are cleared there is no way to set them.  ");
--	} else
--	if (clear_all_tabs) {
--		tabat = set_tab ? 8 : init_tabs;
--		tc_putp(clear_all_tabs);
--		ptext("Clear tabs (tbc)");
--		go_home();
--		put_crlf();
--		putchp('\t');
--		putchp('T');
--		go_home();
--		put_newlines(2);
--		for (i = 0; i < columns; i++) {
--			if (i == tabat) {
--				putchp('T');
--			} else {
--				putchp('.');
--			}
--		}
--		go_home();
--		ptext("\n\n\nIf the above two lines have T's in the same column then (tbc) has failed.  ");
--	} else {
--		ptext("(tbc) Clear-all-tabs is not defined.  ");
--	}
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	subtest_hts(test_list, status, ch)
--**
--**	(ht) and set tabs with (hts)
--*/
--static void
--subtest_hts(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int tabat;		/* the tab spacing we end up with */
--	int i;
--
--	tabat = init_tabs;
--	if (set_tab) {
--		ptext("Tabs set with (hts)");
--		put_crlf();
--		for (i = 1; i < columns; i++) {
--			if (i % 8 == 1) {
--				tc_putp(set_tab);
--			}
--			putchp(' ');
--		}
--		tabat = 8;
--	} else {
--		sprintf(temp, "(hts) Set-tabs not defined.  (it) Initial-tabs at %d", init_tabs);
--		ptext(temp);
--	}
--	go_home();
--	put_newlines(2);
--	if (tabat <= 0) {
--		tabat = 8;
--	}
--	for (i = tabat; i < columns; i += tabat) {
--		putchp('\t');
--		putchp('T');
--	}
--	go_home();
--	put_newlines(3);
--	for (i = 1; i < columns; i++) {
--		putchp('.');
--	}
--	go_home();
--	put_newlines(3);
--	for (i = tabat; i < columns; i += tabat) {
--		putchp('\t');
--		putchp('T');
--	}
--	go_home();
--	put_newlines(4);
--	putchp('.');
--	for (i = 2; i < columns; i++) {
--		if (i % tabat == 1) {
--			putchp('T');
--		} else {
--			putchp('.');
--		}
--	}
--	go_home();
--	put_newlines(5);
--	if (set_tab) {
--		ptextln("If the last two lines are not the same then (hts) has failed.");
--	} else
--	if (init_tabs > 0) {
--		ptextln("If the last two lines are not the same then (it) is wrong.");
--	} else {
--		ptextln("If the last two lines are the same then maybe you do have tabs and (it) should be changed.");
--	}
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	subtest_xt(test_list, status, ch)
--**
--**	(xt) glitch
--*/
--static void
--subtest_xt(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int tabat;		/* the tab spacing we end up with */
--	int cc;
--
--	tabat = set_tab ? 8 : init_tabs;
--	if (!over_strike && (tabat > 0)) {
--		ptext("(xt) should not ");
--		put_cr();
--		ptext("(xt) should");
--		cc = char_count;
--		while (cc < 16) {
--			putchp('\t');
--			cc = ((cc / tabat) + 1) * tabat;
--		}
--		putln("be set.");
--		sprintf(temp, "(xt) Destructive-tab is %s in the data base.",
--			dest_tabs_magic_smso ? "true" : "false");
--		ptextln(temp);
--		generic_done_message(t, state, ch);
--	}
--}
--
--/*
--**	subtest_cbt(test_list, status, ch)
--**
--**	(cbt) back tab
--*/
--static void
--subtest_cbt(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i;
--
--	if (back_tab) {
--		put_clear();
--		ptext("Back-tab (cbt)");
--		go_home();
--		put_crlf();
--		for (i = 1; i < columns; i++) {
--			putchp(' ');
--		}
--		for (i = 0; i < columns; i += 8) {
--			tc_putp(back_tab);
--			putchp('T');
--			tc_putp(back_tab);
--		}
--		go_home();
--		put_newlines(2);
--		for (i = 1; i < columns; i++) {
--			if (i % 8 == 1) {
--				putchp('T');
--			} else {
--				putchp(' ');
--			}
--		}
--		go_home();
--		put_newlines(3);
--		ptextln("The preceding two lines should be the same.");
--	} else {
--		ptextln("(cbt) Back-tab not present");
--	}
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	subtest_xenl(test_list, status, ch)
--**
--**	(xenl) eat newline glitch
--*/
--static void
--subtest_xenl(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i, j, k;
--
--	if (over_strike) {
--		/* test (xenl) on overstrike terminals */
--		if (!can_go_home || !can_clear_screen) {
--			ptextln("(xenl) Newline-glitch not tested, can't home cursor and clear.");
--			generic_done_message(t, state, ch);
--			return;
--		}
--		put_clear();
--		/*
--		   this test must be done in raw mode.  Otherwise UNIX will
--		   translate CR to CRLF.
--		*/
--		if (stty_query(TTY_OUT_TRANS))
--			tty_raw(1, char_mask);
--		ptext("\nreset (xenl). Does ");
--		i = char_count;
--		put_str("not ignore CR, does ");
--		k = char_count;
--		put_str("not ignore LF");
--		go_home();
--		for (j = 0; j < columns; j++)
--			put_this(' ');
--		put_cr();
--		for (j = 0; j < i; j++)
--			putchp(' ');
--		put_str("@@@\n@@");
--		go_home();
--		for (j = 0; j < columns; j++)
--			put_this(' ');
--		put_lf();
--		for (j = 0; j < k; j++)
--			putchp(' ');
--		put_str("@@@\r@@");
--		tty_set();
--		go_home();
--		put_newlines(4);
--		sprintf(temp, "(xenl) Newline-glitch is %s in the data base",
--			eat_newline_glitch ? "true" : "false");
--		ptextln(temp);
--	} else {
--		/* test (xenl) when (os) is reset */
--		if (!can_go_home) {
--			ptextln("(xenl) Newline-glitch not tested, can't home cursor");
--			generic_done_message(t, state, ch);
--			return;
--		}
--		/* (xenl) test */
--		put_clear();
--		/*
--		   this test must be done in raw mode.  Otherwise
--		   UNIX will translate CR to CRLF.
--		*/
--		if (stty_query(TTY_OUT_TRANS))
--			tty_raw(1, char_mask);
--		for (j = 0; j < columns; j++)
--			put_this(' ');
--		put_cr();
--		ptext("(xenl) should be set. Does not ignore CR");
--		go_home();
--		put_crlf();
--		for (j = 0; j < columns; j++)
--			put_this(' ');
--		put_lf();	/* test (cud1) */
--		ptext("(xenl) should be set. Ignores (cud1)");
--		go_home();
--		put_newlines(3);
--		if (scroll_forward && cursor_down &&
--			strcmp(scroll_forward, cursor_down)) {
--			for (j = 0; j < columns; j++)
--				put_this(' ');
--			put_ind();	/* test (ind) */
--			ptext("(xenl) should be set. Ignores (ind)");
--			go_home();
--			put_newlines(5);
--		}
--		tty_set();
--		ptextln("If you don't see text above telling you to set it, (xenl) should be false");
--		sprintf(temp, "(xenl) Newline-glitch is %s in the data base",
--			eat_newline_glitch ? "true" : "false");
--		ptextln(temp);
--	}
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	subtest_eo(test_list, status, ch)
--**
--**	(eo) erase overstrike
--*/
--static void
--subtest_eo(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	if (transparent_underline || over_strike || underline_char) {
--		ptext("(eo) should ");
--		if (underline_char) {
--			ucprint("not");
--		} else {
--			uprint("not");
--		}
--		put_cr();
--		ptextln("(eo) should     be set");
--		sprintf(temp, "\n(eo) Erase-overstrike is %s in the data base",
--			erase_overstrike ? "true" : "false");
--		ptextln(temp);
--		generic_done_message(t, state, ch);
--	}
--}
--
--/*
--**	subtest_xmc(test_list, status, ch)
--**
--**	(xmc) magic cookie glitch
--*/
--static void
--subtest_xmc(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i, j;
--
--	if (enter_standout_mode) {
--		sprintf(temp, "\n(xmc) Magic-cookie-glitch is %d in the data base", magic_cookie_glitch);
--		ptextln(temp);
--		j = magic_cookie_glitch * 8;
--		for (i = 0; i < j; i++) {
--			put_str(" ");
--		}
--		ptextln("        These two lines should line up.");
--		if (j > 0) {
--			char_count += j;
--		}
--		for (i = 0; i < 4; i++) {
--			put_mode(enter_standout_mode);
--			putchp(' ');
--			put_mode(exit_standout_mode);
--			putchp(' ');
--		}
--		ptextln("These two lines should line up.");
--		ptext("If they don't line up then (xmc) magic-cookie-glitch should be greater than zero.  ");
--		generic_done_message(t, state, ch);
--	}
--}
--
--/*
--**	subtest_xhp(test_list, status, ch)
--**
--**	(xhp) erase does not clear standout mode
--*/
--static void
--subtest_xhp(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	if (enter_standout_mode) {
--		put_crlf();
--		put_mode(enter_standout_mode);
--		put_str("Stand out");
--		put_mode(exit_standout_mode);
--		put_cr();
--		ptextln("If any part of this line is standout then (xhp) should be set.");
--		sprintf(temp, "(xhp) Erase-standout-glitch is %s in the data base",
--			ceol_standout_glitch ? "true" : "false");
--		ptextln(temp);
--		generic_done_message(t, state, ch);
--	}
--}
--
--/*
--**	subtest_mir(test_list, status, ch)
--**
--**	(mir) move in insert mode
--*/
--static void
--subtest_mir(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i;
--	char *s;
--
--	if (enter_insert_mode && exit_insert_mode && cursor_address) {
--		put_clear();
--		i = line_count;
--		put_str("\nXXX\nXXX\nXXX\nXXX");
--		tc_putp(enter_insert_mode);
--		s = TPARM_2(cursor_address, i + 1, 0);
--		tputs(s, lines, tc_putch);
--		putchp('X');
--		s = TPARM_2(cursor_address, i + 2, 1);
--		tputs(s, lines, tc_putch);
--		putchp('X');
--		s = TPARM_2(cursor_address, i + 3, 2);
--		tputs(s, lines, tc_putch);
--		putchp('X');
--		s = TPARM_2(cursor_address, i + 4, 3);
--		tputs(s, lines, tc_putch);
--		putchp('X');
--		tc_putp(exit_insert_mode);
--		put_newlines(2);
--		ptextln("If you see a 4 by 4 block of X's then (mir) should be true.");
--		sprintf(temp, "(mir) Move-in-insert-mode is %s in the data base",
--			move_insert_mode ? "true" : "false");
--		ptextln(temp);
--	} else {
--		ptext("(mir) Move-in-insert-mode not tested, ");
--		if (!enter_insert_mode) {
--			ptext("(smir) ");
--		}
--		if (!exit_insert_mode) {
--			ptext("(rmir) ");
--		}
--		if (!cursor_address) {
--			ptext("(cup) ");
--		}
--		ptext("not present.  ");
--	}
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	subtest_msgr(test_list, status, ch)
--**
--**	(msgr) move in sgr mode
--*/
--static void
--subtest_msgr(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i;
--
--	if (cursor_address &&
--		((enter_standout_mode && exit_standout_mode) ||
--		(enter_alt_charset_mode && exit_alt_charset_mode))) {
--		put_crlf();
--		i = line_count + 1;
--		tputs(TPARM_2(cursor_address, i, 0), lines, tc_putch);
--		put_mode(enter_alt_charset_mode);
--		put_crlf();
--		/*
--		   some versions of the wy-120 can not clear lines or
--		   screen when in alt charset mode.  If (el) and (ed)
--		   are defined then I can test them.  If they are not
--		   defined then they can not break (msgr)
--		*/
--		tc_putp(clr_eos);
--		tc_putp(clr_eol);
--		put_mode(exit_alt_charset_mode);
--		put_mode(enter_standout_mode);
--		putchp('X');
--		tputs(TPARM_2(cursor_address, i + 2, 1), lines, tc_putch);
--		putchp('X');
--		tputs(TPARM_2(cursor_address, i + 3, 2), lines, tc_putch);
--		putchp('X');
--		tputs(TPARM_2(cursor_address, i + 4, 3), lines, tc_putch);
--		putchp('X');
--		put_mode(exit_standout_mode);
--		put_crlf();
--		tc_putp(clr_eos);	/* OK if missing */
--		put_crlf();
--		ptextln("If you see a diagonal line of standout X's then (msgr) should be true.  If any of the blanks are standout then (msgr) should be false.");
--		sprintf(temp, "(msgr) Move-in-SGR-mode is %s in the data base",
--			move_standout_mode ? "true" : "false");
--		ptextln(temp);
--	} else {
--		ptextln("(smso) (rmso) (smacs) (rmacs) missing; (msgr) Move-in-SGR-mode not tested.");
--	}
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	subtest_in(test_list, status, ch)
--**
--**	(in) insert null glitch
--*/
--static void
--subtest_in(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	if (enter_insert_mode && exit_insert_mode) {
--		ptextln("\nTesting (in) with (smir) and (rmir)");
--		putln("\tIf these two lines line up ...");
--		put_str("\tIf these two lines line up ...");
--		put_cr();
--		tc_putp(enter_insert_mode);
--		putchp(' ');
--		tc_putp(exit_insert_mode);
--		ptext("\nthen (in) should be set.  ");
--		sprintf(temp,
--			"(in) Insert-null-glitch is %s in the data base.",
--			insert_null_glitch ? "true" : "false");
--		ptextln(temp);
--		generic_done_message(t, state, ch);
--	}
--}
--
--/*
--**	subtest_dadb(test_list, status, ch)
--**
--**	(da) (db) data above, (db) data below
--*/
--static void
--subtest_dadb(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	if (can_clear_screen && scroll_reverse && scroll_forward) {
--		put_clear();
--		if (scroll_reverse)
--			ptext("(da) Data-above should be set\r");
--		home_down();
--		if (scroll_forward)
--			ptext("(db) Data-below should be set\r");
--		tc_putp(scroll_forward);
--		go_home();
--		tc_putp(scroll_reverse);
--		tc_putp(scroll_reverse);
--		home_down();
--		tc_putp(scroll_forward);
--		go_home();
--		ptextln("\n\n\n\n\nIf the top line is blank then (da) should be false.");
--		ptextln("If the bottom line is blank then (db) should be false.");
--		sprintf(temp, "\n(da) Data-above is %s, and (db) Data-below is %s, in the data base.",
--			memory_above ? "true" : "false",
--			memory_below ? "true" : "false");
--		ptextln(temp);
--		line_count = lines;
--	} else {
--		ptextln("(da) Data-above, (db) Data-below not tested, scrolls or (clear) is missing.");
--	}
--	generic_done_message(t, state, ch);
--}
-diff -Naur ncurses-5.6.orig/tack/modules ncurses-5.6/tack/modules
---- ncurses-5.6.orig/tack/modules	2006-04-22 18:37:18.000000000 -0400
-+++ ncurses-5.6/tack/modules	1969-12-31 19:00:00.000000000 -0500
-@@ -1,45 +0,0 @@
--##############################################################################
--# Copyright (c) 1998-1999,2006 Free Software Foundation, Inc.                #
--#                                                                            #
--# Permission is hereby granted, free of charge, to any person obtaining a    #
--# copy of this software and associated documentation files (the "Software"), #
--# to deal in the Software without restriction, including without limitation  #
--# the rights to use, copy, modify, merge, publish, distribute, distribute    #
--# with modifications, sublicense, and/or sell copies of the Software, and to #
--# permit persons to whom the Software is furnished to do so, subject to the  #
--# following conditions:                                                      #
--#                                                                            #
--# The above copyright notice and this permission notice shall be included in #
--# all copies or substantial portions of the Software.                        #
--#                                                                            #
--# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
--# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,   #
--# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL    #
--# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER      #
--# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING    #
--# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER        #
--# DEALINGS IN THE SOFTWARE.                                                  #
--#                                                                            #
--# Except as contained in this notice, the name(s) of the above copyright     #
--# holders shall not be used in advertising or otherwise to promote the sale, #
--# use or other dealings in this Software without prior written               #
--# authorization.                                                             #
--##############################################################################
--# $Id: modules,v 1.5 2006/04/22 22:37:18 tom Exp $
--@ base
--ansi      progs   $(srcdir) $(srcdir)/tack.h ../include/term.h
--charset   progs   $(srcdir) $(srcdir)/tack.h ../include/term.h
--color     progs   $(srcdir) $(srcdir)/tack.h ../include/term.h
--control   progs   $(srcdir) $(srcdir)/tack.h ../include/term.h
--crum      progs   $(srcdir) $(srcdir)/tack.h ../include/term.h
--edit      progs   $(srcdir) $(srcdir)/tack.h ../include/term.h $(INCDIR)/tic.h
--fun       progs   $(srcdir) $(srcdir)/tack.h ../include/term.h
--init      progs   $(srcdir) $(srcdir)/tack.h ../include/term.h
--menu      progs   $(srcdir) $(srcdir)/tack.h ../include/term.h
--modes     progs   $(srcdir) $(srcdir)/tack.h ../include/term.h
--output    progs   $(srcdir) $(srcdir)/tack.h ../include/term.h
--pad       progs   $(srcdir) $(srcdir)/tack.h ../include/term.h
--scan      progs   $(srcdir) $(srcdir)/tack.h ../include/term.h
--sync      progs   $(srcdir) $(srcdir)/tack.h ../include/term.h
--sysdep    progs   $(srcdir) $(srcdir)/tack.h ../include/term.h
--tack      progs   $(srcdir) $(srcdir)/tack.h ../include/term.h
-diff -Naur ncurses-5.6.orig/tack/output.c ncurses-5.6/tack/output.c
---- ncurses-5.6.orig/tack/output.c	2006-11-25 19:16:49.000000000 -0500
-+++ ncurses-5.6/tack/output.c	1969-12-31 19:00:00.000000000 -0500
-@@ -1,818 +0,0 @@
--/*
--** Copyright (C) 1991, 1997 Free Software Foundation, Inc.
--** 
--** This file is part of TACK.
--** 
--** TACK is free software; you can redistribute it and/or modify
--** it under the terms of the GNU General Public License as published by
--** the Free Software Foundation; either version 2, or (at your option)
--** any later version.
--** 
--** TACK is distributed in the hope that it will be useful,
--** but WITHOUT ANY WARRANTY; without even the implied warranty of
--** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--** GNU General Public License for more details.
--** 
--** You should have received a copy of the GNU General Public License
--** along with TACK; see the file COPYING.  If not, write to
--** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
--** Boston, MA 02110-1301, USA
--*/
--/* screen formatting and I/O utility functions */
--
--#include <tack.h>
--#include <time.h>
--
--MODULE_ID("$Id: output.c,v 1.11 2006/11/26 00:16:49 tom Exp $")
--
--/* globals */
--long char_sent;			/* number of characters sent */
--int char_count;			/* counts characters */
--int line_count;			/* counts line feeds */
--int expand_chars;		/* length of expand() string */
--int replace_mode;		/* used to output replace mode padding */
--int can_go_home;		/* TRUE if we can fashion a home command */
--int can_clear_screen;		/* TRUE if we can somehow clear the screen */
--int raw_characters_sent;	/* Total output characters */
--static int log_count;		/* Number of characters on a log line */
--
--/* translate mode default strings */
--#define TM_carriage_return	TM_string[0].value
--#define TM_cursor_down		TM_string[1].value
--#define TM_scroll_forward	TM_string[2].value
--#define TM_newline		TM_string[3].value
--#define TM_cursor_left		TM_string[4].value
--#define TM_bell			TM_string[5].value
--#define TM_form_feed		TM_string[6].value
--#define TM_tab			TM_string[7].value
--
--struct default_string_list TM_string[TM_last] = {
--	{"cr", "\r", 0},
--	{"cud1", "\n", 0},
--	{"ind", "\n", 0},
--	{"nel", "\r\n", 0},
--	{"cub1", "\b", 0},
--	{"bel", "\007", 0},
--	{"ff", "\f", 0},
--	{"ht", "\t", 0}
--};
--
--static const char *c0[32] = {
--	"NUL", "SOH", "STX", "ETX", "EOT", "ENQ", "ACK",
--	"BEL", "BS", "HT", "LF", "VT", "FF", "CR", "SO", "SI",
--	"DLE", "DC1", "DC2", "DC3", "DC4", "NAK", "SYN", "ETB",
--	"CAN", "EM", "SUB", "ESC", "FS", "GS", "RS", "US"
--};
--
--static const char *c1[32] = {
--	"", "", "", "", "IND", "NEL", "SSA", "ESA",
--	"HTS", "HTJ", "VTS", "PLD", "PLU", "RI", "SS2", "SS3",
--	"DCS", "PU1", "PU2", "STS", "CCH", "MW", "SPA", "EPA",
--	"", "", "", "CSI", "ST", "OSC", "PM", "APC"
--};
--
--int
--getnext(int mask)
--{				/* get the next character without scan mode
--				   conversion */
--	int ch;
--	unsigned char buf;
--
--	tc_putp(req_for_input);
--	fflush(stdout);
--	if (nodelay_read)
--		while (1) {
--			ch = read(fileno(stdin), &buf, 1);
--			if (ch == -1)
--				return EOF;
--			if (ch == 1)
--				return buf;
--		}
--	ch = getchar();
--	if (ch == EOF)
--		return EOF;
--	return ch & mask;
--}
--
--
--int
--getchp(int mask)
--{				/* read a character with scan mode conversion */
--	if (scan_mode) {
--		tc_putp(req_for_input);
--		fflush(stdout);
--		return scan_key();
--	} else
--		return getnext(mask);
--}
--
--/*
--**	tc_putch(c)
--**
--**	Output one character
--*/
--int
--tc_putch(int c)
--{
--	char_sent++;
--	raw_characters_sent++;
--	putchar(c);
--	if ((raw_characters_sent & 31) == 31) {
--		fflush(stdout);
--	}
--	if (log_fp) {
--		/* terminal output logging */
--		c = UChar(c);
--		if (c < 32) {
--			fprintf(log_fp, "<%s>", c0[c]);
--			log_count += 5;
--		} else
--		if (c < 127) {
--			fprintf(log_fp, "%c", c);
--			log_count += 1;
--		} else {
--			fprintf(log_fp, "<%02x>", c);
--			log_count += 4;
--		}
--		if (c == '\n' || log_count >= 80) {
--			fprintf(log_fp, "\n");
--			log_count = 0;
--		}
--	}
--	return (c);
--}
--
--/*
--**	tt_tputs(string, reps)
--**
--**	Output a string with tputs() translation.
--**	Use this function inside timing tests.
--*/
--void
--tt_tputs(const char *string, int reps)
--{
--	int i;
--
--	if (string) {
--		for (i = 0; i < TT_MAX; i++) {
--			if (i >= ttp) {
--				tt_cap[i] = string;
--				tt_affected[i] = reps;
--				tt_count[i] = 1;
--				tt_delay[i] = msec_cost(string, reps);
--				ttp++;
--				break;
--			}
--			if (string == tt_cap[i] && reps == tt_affected[i]) {
--				tt_count[i]++;
--				tt_delay_used += tt_delay[i];
--				break;
--			}
--		}
--		(void) tputs(string, reps, tc_putch);
--	}
--}
--
--/*
--**	tt_putp(string)
--**
--**	Output a string with tputs() translation.
--**	Use this function inside timing tests.
--*/
--void
--tt_putp(const char *string)
--{
--	tt_tputs(string, 1);
--}
--
--/*
--**	tt_putparm(string, reps, arg1, arg2)
--**
--**	Send tt_tputs(tparm(string, args1, arg2), reps)
--**	Use this function inside timing tests.
--*/
--void
--tt_putparm(
--	NCURSES_CONST char *string,
--	int reps,
--	int arg1,
--	int arg2)
--{
--	int i;
--
--	if (string) {
--		for (i = 0; i < TT_MAX; i++) {
--			if (i >= ttp) {
--				tt_cap[i] = string;
--				tt_affected[i] = reps;
--				tt_count[i] = 1;
--				tt_delay[i] = msec_cost(string, reps);
--				ttp++;
--				break;
--			}
--			if (string == tt_cap[i] && reps == tt_affected[i]) {
--				tt_count[i]++;
--				tt_delay_used += tt_delay[i];
--				break;
--			}
--		}
--		(void) tputs(TPARM_2((NCURSES_CONST char *)string, arg1, arg2), reps, tc_putch);
--	}
--}
--
--/*
--**	tc_putp(string)
--**
--**	Output a string with tputs() translation.
--**	Use this function instead of putp() so we can track
--**	the actual number of characters sent.
--*/
--int
--tc_putp(const char *string)
--{
--	return tputs(string, 1, tc_putch);
--}
--
--
--void
--put_this(int c)
--{				/* output one character (with padding) */
--	tc_putch(c);
--	if (char_padding && replace_mode)
--		tt_putp(char_padding);
--}
--
--
--void
--put_cr(void)
--{
--	if (translate_mode && carriage_return) {
--		tt_putp(carriage_return);
--	} else {
--		tt_putp(TM_carriage_return);
--	}
--	char_count = 0;
--}
--
--
--void
--put_lf(void)
--{				/* send a linefeed (only works in RAW or
--				   CBREAK mode) */
--	if (translate_mode && cursor_down) {
--		tt_putp(cursor_down);
--	} else {
--		tt_putp(TM_cursor_down);
--	}
--	line_count++;
--}
--
--
--void
--put_ind(void)
--{				/* scroll forward (only works in RAW or
--				   CBREAK mode) */
--	if (translate_mode && scroll_forward) {
--		tt_putp(scroll_forward);
--	} else {
--		tt_putp(TM_scroll_forward);
--	}
--	line_count++;
--}
--
--/*
--**	put_crlf()
--**
--**	Send (nel)  or <cr> <lf>
--*/
--void
--put_crlf(void)
--{
--	if (translate_mode && newline) {
--		tt_putp(newline);
--	} else {
--		tt_putp(TM_newline);
--	}
--	char_count = 0;
--	line_count++;
--}
--
--/*
--**	put_new_lines(count)
--**
--**	Send a number of newlines. (nel)
--*/
--void
--put_newlines(int n)
--{
--	while (n-- > 0) {
--		put_crlf();
--	}
--}
--
--/*
--**	putchp(character)
--**
--**	Send one character to the terminal.
--**	This function does translation of control characters.
--*/
--void
--putchp(int c)
--{
--	switch (c) {
--	case '\b':
--		if (translate_mode && cursor_left) {
--			tt_putp(cursor_left);
--		} else {
--			tt_putp(TM_cursor_left);
--		}
--		char_count--;
--		break;
--	case 7:
--		if (translate_mode && bell) {
--			tt_putp(bell);
--		} else {
--			tt_putp(TM_bell);
--		}
--		break;
--	case '\f':
--		if (translate_mode && form_feed) {
--			tt_putp(form_feed);
--		} else {
--			tt_putp(TM_form_feed);
--		}
--		char_count = 0;
--		line_count++;
--		break;
--	case '\n':
--		put_crlf();
--		break;
--	case '\r':
--		put_cr();
--		break;
--	case '\t':
--		if (translate_mode && tab) {
--			tt_putp(tab);
--		} else {
--			tt_putp(TM_tab);
--		}
--		char_count = ((char_count / 8) + 1) * 8;
--		break;
--	default:
--		put_this(c);
--		char_count++;
--		break;
--	}
--}
--
--
--void
--put_str(const char *s)
--{				/* send the string to the terminal */
--	for (; *s; putchp(*s++));
--}
--
--
--void
--putln(const char *s)
--{				/* output a string followed by a CR LF */
--	for (; *s; putchp(*s++));
--	put_crlf();
--}
--
--
--void
--put_columns(const char *s, int len, int w)
--{				/* put out s in column format */
--	int l;
--
--	if (char_count + w > columns) {
--		put_crlf();
--	}
--	l = char_count % w;
--	if (l) {
--		while (l < w) {
--			putchp(' ');
--			l++;
--		}
--	}
--	if (char_count && char_count + len >= columns) {
--		put_crlf();
--	}
--	l = char_count;
--	put_str(s);
--	char_count = l + len;
--}
--
--
--/*
--**	ptext(string)
--**
--**	Output a string but do not assume the terminal will wrap to a
--**	new line.  Break the line at a word boundary then send a CR LF.
--**	This is more esthetic on 40 column terminals.
--*/
--void
--ptext(const char *s)
--{
--	const char *t;
--
--	while (*s) {
--		for (t = s + 1; *t > ' '; t++);
--		if ((char_count != 0) && ((t - s) + char_count >= columns)) {
--			put_crlf();
--			while (*s == ' ')
--				s++;
--		}
--		while (s < t) {
--			putchp(*s++);
--		}
--	}
--}
--
--
--void
--put_dec(char *f, int i)
--{				/* print a line with a decimal number in it */
--	char tm[128];
--
--	sprintf(tm, f, i / 10, i % 10);
--	ptext(tm);
--}
--
--
--void
--three_digit(char *tx, int i)
--{				/* convert the decimal number to a string of
--				   at least 3 digits */
--	if (i < 1000)
--		sprintf(tx, "%d.%d", i / 10, i % 10);
--	else
--		sprintf(tx, "%d", i / 10);
--}
--
--
--void
--ptextln(const char *s)
--{				/* print the text using ptext() then add a CR
--				   LF */
--	ptext(s);
--	put_crlf();
--}
--
--
--static void
--expand_one(int ch, char **v)
--{				/* expand one character */
--	char *t = *v;
--
--	if (ch & 0x80) {	/* dump it in octal (yuck) */
--		*t++ = '\\';
--		*t++ = '0' + ((ch >> 6) & 3);
--		*t++ = '0' + ((ch >> 3) & 7);
--		*t++ = '0' + (ch & 7);
--		expand_chars += 4;
--	} else if (ch == 127) {	/* DEL */
--		*t++ = '^';
--		*t++ = '?';
--		expand_chars += 2;
--	} else if (ch >= ' ') {
--		*t++ = ch;
--		expand_chars++;
--	} else {	/* control characters */
--		*t++ = '^';
--		*t++ = ch + '@';
--		expand_chars += 2;
--	}
--	*v = t;
--}
--
--
--char *
--expand(const char *s)
--{				/* convert the string to printable form */
--	static char buf[4096];
--	char *t, *v;
--	int ch;
--
--	if (magic_cookie_glitch <= 0 && exit_attribute_mode) {
--		v = enter_reverse_mode;
--	} else {
--		v = NULL;
--	}
--	expand_chars = 0;
--	t = buf;
--	if (s) {
--		for (; (ch = *s); s++) {
--			if ((ch & 0x80) && v) {	/* print it in reverse video
--						   mode */
--				strcpy(t, liberated(TPARM_0(v)));
--				for (; *t; t++);
--				expand_one(ch & 0x7f, &t);
--				strcpy(t, liberated(TPARM_0(exit_attribute_mode)));
--				for (; *t; t++);
--			} else {
--				expand_one(ch, &t);
--			}
--		}
--	}
--	*t = '\0';
--	return buf;
--}
--
--
--char *
--print_expand(char *s)
--{				/* convert the string to 7-bit printable form */
--	static char buf[4096];
--	char *t;
--	int ch;
--
--	expand_chars = 0;
--	t = buf;
--	if (s) {
--		for (; (ch = *s); s++) {
--			expand_one(ch, &t);
--		}
--	}
--	*t = '\0';
--	return buf;
--}
--
--
--char *
--expand_to(char *s, int l)
--{				/* expand s to length l */
--	char *t;
--
--	for (s = t = expand(s); *t; t++);
--	for (; expand_chars < l; expand_chars++) {
--		*t++ = ' ';
--	}
--	*t = '\0';
--	return s;
--}
--
--
--char *
--hex_expand_to(char *s, int l)
--{				/* expand s to length l in hex */
--	static char buf[4096];
--	char *t;
--
--	for (t = buf; *s; s++) {
--		sprintf(t, "%02X ", UChar(*s));
--		t += 3;
--		if (t - buf > (int) sizeof(buf) - 4) {
--			break;
--		}
--	}
--	for (; t - buf < l;) {
--		*t++ = ' ';
--	}
--	*t = '\0';
--	expand_chars = t - buf;
--	return buf;
--}
--
--
--char *
--expand_command(const char *c)
--{				/* expand an ANSI escape sequence */
--	static char buf[256];
--	int i, j, ch;
--	char *s;
--
--	s = buf;
--	for (i = FALSE; (ch = UChar(*c)) != 0; c++) {
--		if (i) {
--			*s++ = ' ';
--		}
--		i = TRUE;
--		if (ch < 32) {
--			j = UChar(c[1]);
--			if (ch == '\033' && j >= '@' && j <= '_') {
--				ch = j - '@';
--				c++;
--				for (j = 0; (*s = c1[ch][j++]); s++);
--			} else
--				for (j = 0; (*s = c0[ch][j++]); s++);
--		} else {
--			*s++ = ch;
--			j = UChar(c[1]);
--			if (ch >= '0' && ch <= '9' &&
--				j >= '0' && j <= '9') {
--				i = FALSE;
--			}
--		}
--	}
--	*s = '\0';
--	return buf;
--}
--
--/*
--**	go_home()
--**
--**	Move the cursor to the home position
--*/
--void
--go_home(void)
--{
--	int i;
--
--	if (cursor_home)
--		tt_putp(cursor_home);
--	else if (cursor_address)
--		tt_putparm(cursor_address, lines, 0, 0);
--	else if (row_address) {	/* use (vpa) */
--		put_cr();
--		tt_putparm(row_address, 1, 0, 0);
--	} else if (cursor_up && cursor_to_ll) {
--		tt_putp(cursor_to_ll);
--		for (i = 1; i < lines; i++) {
--			tt_putp(cursor_up);
--		}
--	} else {
--		can_go_home = FALSE;
--		return;
--	}
--	char_count = line_count = 0;
--	can_go_home = TRUE;
--}
--
--
--void
--home_down(void)
--{				/* move the cursor to the lower left hand
--				   corner */
--	int i;
--
--	if (cursor_to_ll)
--		tt_putp(cursor_to_ll);
--	else if (cursor_address)
--		tt_putparm(cursor_address, lines, lines - 1, 0);
--	else if (row_address) {	/* use (vpa) */
--		put_cr();
--		tt_putparm(row_address, 1, lines - 1, 0);
--	} else if (cursor_down && cursor_home) {
--		tt_putp(cursor_home);
--		for (i = 1; i < lines; i++)
--			tt_putp(cursor_down);
--	} else
--		return;
--	char_count = 0;
--	line_count = lines - 1;
--}
--
--
--void
--put_clear(void)
--{				/* clear the screen */
--	int i;
--
--	if (clear_screen)
--		tt_tputs(clear_screen, lines);
--	else if (clr_eos && can_go_home) {
--		go_home();
--		tt_tputs(clr_eos, lines);
--	} else if (scroll_forward && !over_strike && (can_go_home || cursor_up)) {
--		/* clear the screen by scrolling */
--		put_cr();
--		if (cursor_to_ll) {
--			tt_putp(cursor_to_ll);
--		} else if (cursor_address) {
--			tt_putparm(cursor_address, lines, lines - 1, 0);
--		} else if (row_address) {
--			tt_putparm(row_address, 1, lines - 1, 0);
--		} else {
--			for (i = 1; i < lines; i++) {
--				tt_putp(scroll_forward);
--			}
--		}
--		for (i = 1; i < lines; i++) {
--			tt_putp(scroll_forward);
--		}
--		if (can_go_home) {
--			go_home();
--		} else {
--			for (i = 1; i < lines; i++) {
--				tt_putp(cursor_up);
--			}
--		}
--	} else {
--		can_clear_screen = FALSE;
--		return;
--	}
--	char_count = line_count = 0;
--	can_clear_screen = TRUE;
--}
--
--/*
--**	wait_here()
--**
--**	read one character from the input stream
--**	If the terminal is not in RAW mode then this function will
--**	wait for a <cr> or <lf>.
--*/
--int
--wait_here(void)
--{
--	char ch, cc[64];
--	char message[16];
--	int i, j;
--
--	for (i = 0; i < (int) sizeof(cc); i++) {
--		cc[i] = ch = getchp(STRIP_PARITY);
--		if (ch == '\r' || ch == '\n') {
--			put_crlf();
--			char_sent = 0;
--			return cc[i ? i - 1 : 0];
--		}
--		if (ch >= ' ') {
--			if (stty_query(TTY_CHAR_MODE)) {
--				put_crlf();
--				char_sent = 0;
--				return ch;
--			}
--			continue;
--		}
--		if (ch == 023) {	/* Control S */
--			/* ignore control S, but tell me about it */
--			while (ch == 023 || ch == 021) {
--				ch = getchp(STRIP_PARITY);
--				if (i < (int) sizeof(cc))
--					cc[++i] = ch;
--			}
--			put_str("\nThe terminal sent a ^S -");
--			for (j = 0; j <= i; j++) {
--				sprintf(message, " %02X", cc[j] & 0xFF);
--				put_str(message);
--			}
--			put_crlf();
--			i = -1;
--		} else if (ch != 021) {	/* Not Control Q */
--			/* could be abort character */
--			spin_flush();
--			if (tty_can_sync == SYNC_TESTED) {
--				(void) tty_sync_error();
--			} else {
--				put_str("\n? ");
--			}
--		}
--	}
--	return '?';
--}
--
--
--/*
--**	read_string(buffer, length)
--**
--**	Read a string of characters from the input stream.
--*/
--void
--read_string(
--	char *buf,
--	int length)
--{
--	int ch, i;
--
--	for (i = 0; i < length - 1; ) {
--		ch = getchp(STRIP_PARITY);
--		if (ch == '\r' || ch == '\n') {
--			break;
--		}
--		if (ch == '\b' || ch == 127) {
--			if (i) {
--				putchp('\b');
--				putchp(' ');
--				putchp('\b');
--				i--;
--			}
--		} else {
--			buf[i++] = ch;
--			putchp(ch);
--		}
--	}
--	buf[i] = '\0';
--	put_crlf();
--	char_sent = 0;
--}
--
--/*
--**	maybe_wait(lines)
--**
--**	wait if near the end of the screen, then clear screen
--*/
--void 
--maybe_wait(int n)
--{
--	if (line_count + n >= lines) {
--		if (char_sent != 0) {
--			ptext("Go? ");
--			(void) wait_here();
--		}
--		put_clear();
--	} else {
--		put_crlf();
--	}
--}
-diff -Naur ncurses-5.6.orig/tack/pad.c ncurses-5.6/tack/pad.c
---- ncurses-5.6.orig/tack/pad.c	2005-09-17 15:49:16.000000000 -0400
-+++ ncurses-5.6/tack/pad.c	1969-12-31 19:00:00.000000000 -0500
-@@ -1,1958 +0,0 @@
--/*
--** Copyright (C) 1991, 1997 Free Software Foundation, Inc.
--** 
--** This file is part of TACK.
--** 
--** TACK is free software; you can redistribute it and/or modify
--** it under the terms of the GNU General Public License as published by
--** the Free Software Foundation; either version 2, or (at your option)
--** any later version.
--** 
--** TACK is distributed in the hope that it will be useful,
--** but WITHOUT ANY WARRANTY; without even the implied warranty of
--** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--** GNU General Public License for more details.
--** 
--** You should have received a copy of the GNU General Public License
--** along with TACK; see the file COPYING.  If not, write to
--** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
--** Boston, MA 02110-1301, USA
--*/
--
--#include <tack.h>
--
--MODULE_ID("$Id: pad.c,v 1.6 2005/09/17 19:49:16 tom Exp $")
--
--/* test the pad counts on the terminal */
--
--static void pad_standard(struct test_list *, int *, int *);
--static void init_xon_xoff(struct test_list *, int *, int *);
--static void init_cup(struct test_list *, int *, int *);
--static void pad_rmxon(struct test_list *, int *, int *);
--static void pad_home1(struct test_list *, int *, int *);
--static void pad_home2(struct test_list *, int *, int *);
--static void pad_clear(struct test_list *, int *, int *);
--static void pad_ech(struct test_list *, int *, int *);
--static void pad_el1(struct test_list *, int *, int *);
--static void pad_el(struct test_list *, int *, int *);
--static void pad_smdc(struct test_list *, int *, int *);
--static void pad_dch(struct test_list *, int *, int *);
--static void pad_dch1(struct test_list *, int *, int *);
--static void pad_smir(struct test_list *, int *, int *);
--static void pad_ich(struct test_list *, int *, int *);
--static void pad_ich1(struct test_list *, int *, int *);
--static void pad_xch1(struct test_list *, int *, int *);
--static void pad_rep(struct test_list *, int *, int *);
--static void pad_cup(struct test_list *, int *, int *);
--static void pad_hd(struct test_list *, int *, int *);
--static void pad_hu(struct test_list *, int *, int *);
--static void pad_rin(struct test_list *, int *, int *);
--static void pad_il(struct test_list *, int *, int *);
--static void pad_indn(struct test_list *, int *, int *);
--static void pad_dl(struct test_list *, int *, int *);
--static void pad_xl(struct test_list *, int *, int *);
--static void pad_scrc(struct test_list *, int *, int *);
--static void pad_csrind(struct test_list *, int *, int *);
--static void pad_sccsrrc(struct test_list *, int *, int *);
--static void pad_csr_nel(struct test_list *, int *, int *);
--static void pad_csr_cup(struct test_list *, int *, int *);
--static void pad_ht(struct test_list *, int *, int *);
--static void pad_smso(struct test_list *, int *, int *);
--static void pad_smacs(struct test_list *, int *, int *);
--static void pad_crash(struct test_list *, int *, int *);
--
--/*
--   Any command found in this list, executed from a "Done" prompt
--   will force the default action to repeat rather than next.
--*/
--const char *pad_repeat_test = {"ep-+<>"};
--
--struct test_list pad_test_list[] = {
--	{0, 0, 0, 0, "e) edit terminfo", 0, &edit_menu},
--	{0, 0, 0, 0, "p) change padding", 0, &change_pad_menu},
--	{0, 0, 0, 0, "@) display statistics about the last test", dump_test_stats, 0},
--	{0, 0, 0, 0, "c) clear screen", menu_clear_screen, 0},
--	{0, 0, 0, 0, "i) send reset and init", menu_reset_init, 0},
--	{0, 0, 0, 0, txt_longer_test_time, longer_test_time, 0},
--	{0, 0, 0, 0, txt_shorter_test_time, shorter_test_time, 0},
--	{0, 0, 0, 0, txt_longer_augment, longer_augment, 0},
--	{0, 0, 0, 0, txt_shorter_augment, shorter_augment, 0},
--	/***
--	   Phase 1: Test initialization and reset strings.
--	
--	   (rs1) (rs2) (rs3) (is1) (is2) (is3) are very difficult to test.
--	   They have no defined output.  To make matters worse, the cap
--	   builder could partition (rs1) (rs2) (rs3) by length, leaving the
--	   terminal in some unknown state between (rs1) and (rs2) or between
--	   (r2) and (rs3).  Some reset strings clear the screen when done.
--	
--	   We have no control over this.  The only thing we can do for
--	   certain is to test the pad times by checking for overruns.
--	***/
--	{MENU_NEXT, 3, "rs1", 0, 0, pad_standard, 0},
--	{MENU_NEXT, 3, "rs2", 0, 0, pad_standard, 0},
--	{MENU_NEXT, 3, "rs3", 0, 0, pad_standard, 0},
--	{MENU_NEXT | MENU_INIT, 0, 0, 0, 0, init_xon_xoff, 0},
--	{MENU_NEXT, 3, "is1", 0, 0, pad_standard, 0},
--	{MENU_NEXT, 3, "is2", 0, 0, pad_standard, 0},
--	{MENU_NEXT, 3, "is3", 0, 0, pad_standard, 0},
--	{MENU_NEXT, 3, "rmxon", "smxon", 0, pad_rmxon, 0},
--	{MENU_NEXT | MENU_INIT, 0, 0, 0, 0, init_cup, 0},
--	/*
--	   Phase 2: Test home, screen clears and erases.
--	*/
--	{MENU_NEXT, 0, "home", 0, 0, pad_home1, 0},
--	{MENU_NEXT, 0, "home) (nel", 0, 0, pad_home2, 0},
--	{MENU_NEXT | 1, 0, "clear", 0, 0, pad_clear, 0},
--	{MENU_NEXT | MENU_LM1, 0, "ed", 0, 0, pad_clear, 0},
--	{MENU_NEXT | MENU_80c, 0, "ech", 0, 0, pad_ech, 0},
--	{MENU_NEXT | MENU_80c, 0, "el1", "cub1 nel", 0, pad_el1, 0},
--	{MENU_NEXT | MENU_10c, 0, "el", "nel", 0, pad_el, 0},
--	/*
--	   Phase 3: Character deletions and insertions
--	*/
--	{MENU_NEXT, 0, "smdc) (rmdc", 0, 0, pad_smdc, 0},
--	{MENU_NEXT | MENU_80c, 0, "dch", "smdc rmdc", 0, pad_dch, 0},
--	{MENU_NEXT | MENU_80c, 0, "dch1", "smdc rmdc", 0, pad_dch1, 0},
--	{MENU_NEXT, 0, "smir) (rmir", 0, 0, pad_smir, 0},
--	{MENU_NEXT | MENU_90c, 0, "ich) (ip", "smir rmir", 0, pad_ich, 0},
--	{MENU_NEXT | MENU_90c, 0, "ich1) (ip", "smir rmir", 0, pad_ich1, 0},
--	{MENU_NEXT, 4, "ich1) (dch1", "smir rmir", 0, pad_xch1, 0},
--	{MENU_NEXT | MENU_90c, 0, "rep", 0, 0, pad_rep, 0},
--	/*
--	   Phase 4: Test cursor addressing pads.
--	*/
--	{MENU_NEXT, 0, "cup", 0, 0, pad_cup, 0},
--	/*
--	   Phase 5: Test scrolling and cursor save/restore.
--	*/
--	{MENU_NEXT, 0, "hd", 0, 0, pad_hd, 0},
--	{MENU_NEXT, 0, "hu", 0, 0, pad_hu, 0},
--	{MENU_NEXT | MENU_LM1 | 1, 0, "rin", 0, 0, pad_rin, 0},
--	{MENU_NEXT, 0, "ri", 0, 0, pad_rin, 0},
--	{MENU_NEXT | MENU_LM1 | 1, 0, "il", 0, 0, pad_il, 0},
--	{MENU_NEXT, 0, "il1", 0, 0, pad_il, 0},
--	{MENU_NEXT | MENU_LM1 | 1, 0, "indn", 0, 0, pad_indn, 0},
--	{MENU_NEXT, 0, "ind", 0, 0, pad_indn, 0},
--	{MENU_NEXT | MENU_LM1 | 1, 0, "dl", 0, 0, pad_dl, 0},
--	{MENU_NEXT, 0, "dl1", 0, 0, pad_dl, 0},
--	{MENU_NEXT, 0, "il1) (dl1", 0, 0, pad_xl, 0},
--	{MENU_NEXT, 0, "sc) (rc", 0, 0, pad_scrc, 0},
--	{MENU_NEXT | MENU_50l, 0, "csr) (ind", 0, 0, pad_csrind, 0},
--	{MENU_NEXT, 0, "sc) (csr) (rc", 0, 0, pad_sccsrrc, 0},
--	{MENU_NEXT, 0, "csr) (nel", "sc rc", 0, pad_csr_nel, 0},
--	{MENU_NEXT, 0, "csr) (cup", 0, 0, pad_csr_cup, 0},
--	/*
--	   Phase 6: Test tabs.
--	*/
--	{MENU_NEXT, 0, "ht", 0, 0, pad_ht, 0},
--	/*
--	   Phase 7: Test character-set-switch pads.
--	*/
--	{MENU_NEXT, 0, "smso) (rmso", 0, 0, pad_smso, 0},
--	{MENU_NEXT, 0, "smacs) (rmacs", 0, 0, pad_smacs, 0},
--	/*
--	   Phase 8: Tests for miscellaneous mode-switch pads.
--	*/
--	{MENU_NEXT, 3, "flash", 0, 0, pad_standard, 0},
--	{MENU_NEXT, 3, "smkx", 0, 0, pad_standard, 0},
--	{MENU_NEXT, 3, "rmkx", 0, 0, pad_standard, 0},
--	{MENU_NEXT, 3, "smm", 0, 0, pad_standard, 0},
--	{MENU_NEXT, 3, "rmm", 0, 0, pad_standard, 0},
--	/*
--	   Phase 9: Test crash-and-burn properties of unpadded (clear).
--	*/
--	{0, 0, "clear", "xon", "k) run clear test with no padding", pad_crash, 0},
--	{MENU_LAST, 0, 0, 0, 0, 0, 0}
--};
--
--/* globals */
--static int hzcc;		/* horizontal character count */
--char letter;			/* current character being displayed */
--int letter_number;		/* points into letters[] */
--int augment, repeats;		/* number of characters (or lines) effected */
--char letters[] = "AbCdefghiJklmNopQrStuVwXyZ";
--
--static char every_line[] = "This text should be on every line.";
--static char all_lines[] = "Each char on any line should be the same.  ";
--static char above_line[] = "The above lines should be all Xs.  ";
--static char no_visual[] = "This loop test has no visual failure indicator.  ";
--
--/*
--**	pad_standard(test_list, status, ch)
--**
--**	Run a single cap pad test.
--*/
--static void
--pad_standard(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	const char *long_name;
--	char *cap;
--	int l = 2, i;
--	char tbuf[128];
--
--	if ((cap = get_string_cap_byname(t->caps_done, &long_name))) {
--		sprintf(tbuf, "(%s) %s, start testing", t->caps_done,
--			long_name);
--		if (skip_pad_test(t, state, ch, tbuf)) {
--			return;
--		}
--		i = 1;
--		pad_test_startup(1);
--		do {
--			if (i >= columns) {
--				page_loop();
--				l++;
--				i = 1;
--			}
--			tt_putp(cap);
--			putchp(letter);
--			i++;
--		} while(still_testing());
--		pad_test_shutdown(t, 0);
--		if (l >= lines) {
--			home_down();
--		} else {
--			put_crlf();
--		}
--		ptextln(no_visual);
--	} else {
--		CAP_NOT_FOUND;
--		/* Note: get_string_cap_byname() always sets long_name */
--		sprintf(temp, "(%s) %s, not present.  ", t->caps_done,
--			long_name);
--		ptext(temp);
--	}
--	pad_done_message(t, state, ch);
--}
--
--/*
--**	init_xon_xoff(test_list, status, ch)
--**
--**	Initialize the xon_xoff values
--*/
--static void
--init_xon_xoff(
--	struct test_list *t GCC_UNUSED,
--	int *state GCC_UNUSED,
--	int *ch GCC_UNUSED)
--{
--	/* the reset strings may dink with the XON/XOFF modes */
--	if (select_xon_xoff == 0 && exit_xon_mode) {
--		tc_putp(exit_xon_mode);
--	}
--	if (select_xon_xoff == 1 && enter_xon_mode) {
--		tc_putp(enter_xon_mode);
--	}
--}
--
--/*
--**	pad_rmxon(test_list, status, ch)
--**
--**	Test (rmxon) exit XON/XOFF mode
--*/
--static void
--pad_rmxon(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	if (select_xon_xoff == 0 && exit_xon_mode) {
--		pad_standard(t, state, ch);
--	}
--}
--
--/*
--**	init_cup(test_list, status, ch)
--**
--**	Send the initialization strings for XON/XOFF and (smcup)
--**	Stop pad testing if clear screen is missing.
--*/
--static void
--init_cup(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	init_xon_xoff(t, state, ch);
--	if (enter_ca_mode) {
--		tc_putp(enter_ca_mode);
--	}
--	if (!can_clear_screen) {
--		ptext("(clear) clear screen not present,");
--		ptext(" pad processing terminated.  ");
--		pad_done_message(t, state, ch);
--		if (*ch == 0 || *ch == 'n' || *ch == 's' || *ch == 'r') {
--			*ch = '?';
--		}
--		return;
--	}
--}
--
--/*
--**	pad_home1(test_list, status, ch)
--**
--**	Test (home) when (am) is set.
--*/
--static void
--pad_home1(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int j, k;
--
--	if (can_go_home && auto_right_margin) {
--		/*
--		   truly brain damaged terminals will fail this test because
--		   they cannot accept data at full rate
--		*/
--		if (skip_pad_test(t, state, ch, "(home) Home start testing")) {
--			return;
--		}
--		pad_test_startup(1);
--		do {
--			go_home();
--			for (j = 1; j < lines; j++) {
--				for (k = 0; k < columns; k++) {
--					if (k & 0xF) {
--						put_this(letter);
--					} else {
--						put_this('.');
--					}
--				}
--				SLOW_TERMINAL_EXIT;
--			}
--			NEXT_LETTER;
--		} while(still_testing());
--		pad_test_shutdown(t, 0);
--		ptext("All the dots should line up.  ");
--		pad_done_message(t, state, ch);
--		put_clear();
--	}
--}
--
--/*
--**	pad_home2(test_list, status, ch)
--**
--**	Test (home) and (nel).  (am) is reset.
--*/
--static void
--pad_home2(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int j, k;
--
--	if (can_go_home) {
--		if (skip_pad_test(t, state, ch,
--			"(home) Home, (nel) newline start testing")) {
--			return;
--		}
--		pad_test_startup(1);
--		do {
--			go_home();
--			for (j = 1; j < lines; j++) {
--				for (k = 2; k < columns; k++) {
--					if (k & 0xF) {
--						put_this(letter);
--					} else {
--						put_this('.');
--					}
--				}
--				put_crlf();	/* this does the (nel) */
--				SLOW_TERMINAL_EXIT;
--			}
--			NEXT_LETTER;
--		} while(still_testing());
--		pad_test_shutdown(t, 0);
--		ptext("All the dots should line up.  ");
--		pad_done_message(t, state, ch);
--		put_clear();
--	}
--}
--
--/*
--**	pad_clear(test_list, status, ch)
--**
--**	Test (clear) and (ed)
--**	run the clear screen tests (also clear-to-end-of-screen)
--**
--**	0) full page
--**	1) sparse page
--**	2) short lines
--**	3) one full line
--**	4) one short line
--*/
--static void
--pad_clear(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	const char *end_message = 0;
--	const char *txt;
--	int j, k, is_clear;
--	int clear_select;		/* select the test number */
--
--	is_clear = t->flags & 1;
--	clear_select = auto_right_margin ? 0 : 1;
--	if (is_clear) {
--		txt = "(clear) clear-screen start testing";
--	} else {
--		if (!clr_eos) {
--			CAP_NOT_FOUND;
--			ptext("(ed) erase-to-end-of-display, not present.  ");
--			pad_done_message(t, state, ch);
--			return;
--		}
--		txt = "(ed) erase-to-end-of-display start testing";
--	}
--	if (skip_pad_test(t, state, ch, txt)) {
--		return;
--	}
--	if (enter_am_mode) {
--		tc_putp(enter_am_mode);
--		clear_select = 0;
--	}
--	for (; clear_select < 5; clear_select++) {
--		if (augment > lines || is_clear || !cursor_address) {
--			augment = lines;
--		} else {
--			if (augment <= 1) {
--				augment = 2;
--			}
--			if (augment < lines) {
--				put_clear();
--				tt_putparm(cursor_address, 1,
--					lines - augment - 1, 0);
--				ptextln("This line should not be erased (ed)");
--			}
--		}
--		repeats = augment;
--		switch (clear_select) {
--		case 0:
--			end_message = "Clear full screen.  ";
--			break;
--		case 1:
--			end_message = "Clear sparse screen.  ";
--			if (cursor_down) {
--				break;
--			}
--			clear_select++;
--			/* FALLTHRU */
--		case 2:
--			end_message = "Clear one character per line.  ";
--			if (newline) {
--				break;
--			}
--			clear_select++;
--			/* FALLTHRU */
--		case 3:
--			end_message = "Clear one full line.  ";
--			break;
--		case 4:
--			end_message = "Clear single short line.  ";
--			break;
--		}
--		pad_test_startup(0);
--		do {
--			switch (clear_select) {
--			case 0:	/* full screen test */
--				for (j = 1; j < repeats; j++) {
--					for (k = 0; k < columns; k++) {
--						if (k & 0xF) {
--							put_this(letter);
--						} else {
--							put_this('.');
--						}
--					}
--					SLOW_TERMINAL_EXIT;
--				}
--				break;
--			case 1:	/* sparse screen test */
--				for (j = columns - repeats; j > 2; j--) {
--					put_this(letter);
--				}
--				for (j = 2; j < repeats; j++) {
--					tt_putp(cursor_down);
--					put_this(letter);
--				}
--				break;
--			case 2:	/* short lines */
--				for (j = 2; j < repeats; j++) {
--					put_this(letter);
--					tt_putp(newline);
--				}
--				put_this(letter);
--				break;
--			case 3:	/* one full line */
--				for (j = columns - 5; j > 1; j--) {
--					put_this(letter);
--				}
--				break;
--			case 4:	/* one short line */
--				put_str("Erase this!");
--				break;
--			}
--			if (is_clear) {
--				put_clear();
--			} else {
--				if (augment == lines) {
--					go_home();
--				} else {
--					tt_putparm(cursor_address, 1,
--						lines - repeats, 0);
--				}
--				tt_tputs(clr_eos, repeats);
--			}
--			NEXT_LETTER;
--		} while(still_testing());
--		pad_test_shutdown(t, 1);
--		ptext(end_message);
--
--		pad_done_message(t, state, ch);
--
--		if (*ch != 0 && *ch != 'n') {
--			return;
--		}
--	}
--}
--
--/*
--**	pad_ech(test_list, status, ch)
--**
--**	Test (ech) erase characters
--*/
--static void
--pad_ech(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i, j;
--
--	if (!erase_chars) {
--		CAP_NOT_FOUND;
--		ptext("(ech) Erase-characters, not present.  ");
--		pad_done_message(t, state, ch);
--		return;
--	}
--	if (skip_pad_test(t, state, ch,
--		"(ech) Erase-characters start testing")) {
--		return;
--	}
--	if (augment > columns - 2) {
--		augment = columns - 2;
--	}
--	pad_test_startup(1);
--	do {
--		go_home();
--		for (i = 2; i < lines; i++) {
--			for (j = 0; j <= repeats; j++) {
--				putchp(letter);
--			}
--			put_cr();
--			tt_putparm(erase_chars, repeats, repeats, 0);
--			put_crlf();
--			SLOW_TERMINAL_EXIT;
--		}
--		for (i = 1; i <= repeats; i++) {
--			putchp(' ');
--		}
--		putchp(letter);
--		put_crlf();
--		NEXT_LETTER;
--	} while(still_testing());
--	pad_test_shutdown(t, 0);
--	ptext(all_lines);
--	pad_done_message(t, state, ch);
--	put_clear();
--}
--
--/*
--**	pad_el1(test_list, status, ch)
--**
--**	Test (el1) erase to start of line also (cub1) and (nel)
--*/
--static void
--pad_el1(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i, j;
--
--	if (!clr_bol) {
--		CAP_NOT_FOUND;
--		ptext("(el1) Erase-to-beginning-of-line, not present.  ");
--		pad_done_message(t, state, ch);
--		return;
--	}
--	if (skip_pad_test(t, state, ch,
--		"(el1) Erase-to-beginning-of-line start testing")) {
--		return;
--	}
--	if (augment > columns - 2) {
--		augment = columns - 2;
--	}
--	pad_test_startup(1);
--	do {
--		go_home();
--		for (i = 2; i < lines; i++) {
--			for (j = 0; j <= repeats; j++) {
--				putchp(letter);
--			}
--			tt_putp(cursor_left);
--			tt_putp(cursor_left);
--			tt_tputs(clr_bol, repeats);
--			put_crlf();
--			SLOW_TERMINAL_EXIT;
--		}
--		for (i = 1; i <= repeats; i++) {
--			putchp(' ');
--		}
--		putchp(letter);
--		put_crlf();
--		NEXT_LETTER;
--	} while(still_testing());
--	pad_test_shutdown(t, 0);
--	ptext(all_lines);
--	pad_done_message(t, state, ch);
--	put_clear();
--}
--
--/*
--**	pad_el(test_list, status, ch)
--**
--**	Test (el) clear to end of line also (nel)
--*/
--static void
--pad_el(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i, j;
--
--	if (!clr_eol) {
--		CAP_NOT_FOUND;
--		ptext("(el) Clear-to-end-of-line, not present.  ");
--		pad_done_message(t, state, ch);
--		return;
--	}
--	if (skip_pad_test(t, state, ch,
--		"(el) Clear-to-end-of-line start testing")) {
--		return;
--	}
--	hzcc = columns * 8 / 10;	/* horizontal character count */
--	if (augment > hzcc) {
--		augment = hzcc;
--	}
--	pad_test_startup(1);
--	do {
--		go_home();
--		for (i = 2; i < lines; i++) {
--			for (j = -1; j < augment; j++) {
--				putchp(letter);
--			}
--			put_cr();
--			putchp(letter);
--			tt_putp(clr_eol);
--			put_crlf();
--			SLOW_TERMINAL_EXIT;
--		}
--		putchp(letter);
--		put_crlf();
--		NEXT_LETTER;
--	} while(still_testing());
--	pad_test_shutdown(t, 0);
--	ptext(all_lines);
--	pad_done_message(t, state, ch);
--	put_clear();
--}
--
--/*
--**	pad_smdc(test_list, status, ch)
--**
--**	Test (smdc) (rmdc) Delete mode
--*/
--static void
--pad_smdc(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i;
--
--	if (!enter_delete_mode) {
--		CAP_NOT_FOUND;
--		ptext("(smdc) Enter-delete-mode");
--		if (!exit_delete_mode) {
--			ptext(", (rmdc) Exit-delete-mode");
--		}
--		ptext(", not present.  ");
--		pad_done_message(t, state, ch);
--		return;
--	}
--	if (skip_pad_test(t, state, ch,
--		"(smdc) (rmdc) Enter/Exit-delete-mode start testing")) {
--		return;
--	}
--	pad_test_startup(1);
--	do {
--		page_loop();
--		for (i = 1; i < columns; i++) {
--			tt_putp(enter_delete_mode);
--			tt_putp(exit_delete_mode);
--			putchp(letter);
--		}
--	} while(still_testing());
--	pad_test_shutdown(t, 0);
--	home_down();
--	ptext(no_visual);
--	pad_done_message(t, state, ch);
--	put_clear();
--}
--
--/*
--**	pad_dch(test_list, status, ch)
--**
--**	Test (smdc) (rmdc) Delete mode and (dch)
--*/
--static void
--pad_dch(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i, j;
--
--	if (!parm_dch) {
--		CAP_NOT_FOUND;
--		ptext("(dch) Delete-characters, not present.  ");
--		pad_done_message(t, state, ch);
--		return;
--	}
--	if (skip_pad_test(t, state, ch,
--		"(dch) Delete-characters start testing")) {
--		return;
--	}
--	hzcc = columns * 8 / 10;	/* horizontal character count */
--	if (augment > hzcc) {
--		augment = hzcc;
--	}
--	pad_test_startup(1);
--	do {
--		go_home();
--		for (i = 2; i < lines; i++) {
--			for (j = 0; j <= repeats; j++) {
--				putchp(letter);
--			}
--			put_cr();
--			tt_putp(enter_delete_mode);
--			tt_putparm(parm_dch, repeats, repeats, 0);
--			tt_putp(exit_delete_mode);
--			put_crlf();
--			SLOW_TERMINAL_EXIT;
--		}
--		putchp(letter);
--		put_crlf();
--		NEXT_LETTER;
--	} while(still_testing());
--	pad_test_shutdown(t, 0);
--	home_down();
--	ptext(all_lines);
--	pad_done_message(t, state, ch);
--	put_clear();
--}
--
--/*
--**	pad_dch1(test_list, status, ch)
--**
--**	Test (smdc) (rmdc) Delete mode and (dch1)
--*/
--static void
--pad_dch1(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i, j;
--
--	if (!delete_character) {
--		if (parm_dch) {
--			/* if the other one is defined then its OK */
--			return;
--		}
--		CAP_NOT_FOUND;
--		ptext("(dch1) Delete-character, not present.  ");
--		pad_done_message(t, state, ch);
--		return;
--	}
--	if (skip_pad_test(t, state, ch,
--		"(dch1) Delete-character start testing")) {
--		return;
--	}
--	hzcc = columns * 8 / 10;	/* horizontal character count */
--	if (augment > hzcc) {
--		augment = hzcc;
--	}
--	pad_test_startup(1);
--	do {
--		go_home();
--		for (i = 2; i < lines; i++) {
--			for (j = -1; j < augment; j++) {
--				putchp(letter);
--			}
--			put_cr();
--			tt_putp(enter_delete_mode);
--			for (j = 0; j < augment; j++) {
--				tt_putp(delete_character);
--			}
--			tt_putp(exit_delete_mode);
--			put_crlf();
--			SLOW_TERMINAL_EXIT;
--		}
--		putchp(letter);
--		put_crlf();
--		NEXT_LETTER;
--	} while(still_testing());
--	pad_test_shutdown(t, 0);
--	ptext(all_lines);
--	pad_done_message(t, state, ch);
--	put_clear();
--}
--
--/*
--**	pad_smir(test_list, status, ch)
--**
--**	Test (smir) (rmir) Insert mode
--*/
--static void
--pad_smir(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i;
--
--	if (!enter_insert_mode) {
--		CAP_NOT_FOUND;
--		ptext("(smir) Enter-insert-mode");
--		if (!exit_insert_mode) {
--			ptext(", (rmir) Exit-insert-mode");
--		}
--		ptext(", not present.  ");
--		pad_done_message(t, state, ch);
--		return;
--	}
--	if (skip_pad_test(t, state, ch,
--		"(smir) (rmir) Enter/Exit-insert-mode start testing")) {
--		return;
--	}
--	pad_test_startup(1);
--	do {
--		page_loop();
--		for (i = 1; i < columns; i++) {
--			tt_putp(enter_insert_mode);
--			tt_putp(exit_insert_mode);
--			putchp(letter);
--		}
--	} while(still_testing());
--	pad_test_shutdown(t, 0);
--	home_down();
--	ptext(no_visual);
--	pad_done_message(t, state, ch);
--	put_clear();
--}
--
--/*
--**	pad_ich(test_list, status, ch)
--**
--**	Test (smir) (rmir) Insert mode and (ich) and (ip)
--*/
--static void
--pad_ich(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i, j;
--
--	if (!parm_ich) {
--		CAP_NOT_FOUND;
--		ptext("(ich) Insert-characters, not present.  ");
--		pad_done_message(t, state, ch);
--		return;
--	}
--	if (skip_pad_test(t, state, ch,
--		"(ich) Insert-characters, (ip) Insert-padding start testing")) {
--		return;
--	}
--	j = columns * 9 / 10;
--	if (augment > j) {
--		augment = j;
--	}
--	pad_test_startup(1);
--	do {
--		go_home();
--		for (i = 2; i < lines; i++) {
--			putchp(letter);
--			put_cr();
--			tt_putp(enter_insert_mode);
--			replace_mode = 0;
--			tt_putparm(parm_ich, repeats, repeats, 0);
--			tt_putp(exit_insert_mode);
--			replace_mode = 1;
--			put_crlf();
--			SLOW_TERMINAL_EXIT;
--		}
--		for (i = 0; i < repeats; i++) {
--			putchp(' ');
--		}
--		putchp(letter);
--		NEXT_LETTER;
--		put_crlf();
--	} while(still_testing());
--	pad_test_shutdown(t, 0);
--	ptext(all_lines);
--	pad_done_message(t, state, ch);
--	tc_putp(exit_insert_mode);
--}
--
--/*
--**	pad_ich1(test_list, status, ch)
--**
--**	Test (smir) (rmir) Insert mode and (ich1) and (ip)
--*/
--static void
--pad_ich1(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i, j;
--
--	if (!insert_character) {
--		CAP_NOT_FOUND;
--		ptext("(ich1) Insert-character, not present.  ");
--		pad_done_message(t, state, ch);
--		return;
--	}
--	if (skip_pad_test(t, state, ch,
--		"(ich1) Insert-character, (ip) Insert-padding start testing")) {
--		return;
--	}
--	if (augment > columns - 2) {
--		augment = columns - 2;
--	}
--	pad_test_startup(1);
--	do {
--		put_clear();
--		for (i = 2; i < lines; i++) {
--			putchp(letter);
--			put_cr();
--			tt_putp(enter_insert_mode);
--			replace_mode = 0;
--			if (!insert_padding && !insert_character) {
--				/* only enter/exit is needed */
--				for (j = 0; j < augment; j++) {
--					putchp('.');
--				}
--			} else {
--				for (j = 0; j < augment; j++) {
--					tt_putp(insert_character);
--					putchp('.');
--					tt_putp(insert_padding);
--				}
--			}
--			tt_putp(exit_insert_mode);
--			replace_mode = 1;
--			put_crlf();
--			SLOW_TERMINAL_EXIT;
--		}
--		for (j = 0; j < augment; j++) {
--			putchp('.');
--		}
--		putchp(letter);
--		NEXT_LETTER;
--		put_crlf();
--	} while(still_testing());
--	pad_test_shutdown(t, 0);
--	ptext(all_lines);
--	pad_done_message(t, state, ch);
--	tc_putp(exit_insert_mode);
--}
--
--/*
--**	pad_xch1(test_list, status, ch)
--**
--**	Test (ich1) (ip) (dch1)
--*/
--static void
--pad_xch1(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	static char xch1[] =
--	"This line should not be garbled. It should be left justified.";
--
--	if (enter_insert_mode || exit_insert_mode ||
--		enter_delete_mode || exit_delete_mode ||
--		!insert_character || !delete_character) {
--		/* this test is quietly ignored */
--		return;
--	}
--	if (skip_pad_test(t, state, ch,
--		"(ich1) Insert-character, (dch1) Delete-character start testing")) {
--		return;
--	}
--	put_crlf();
--	ptext(xch1);
--	put_cr();
--	pad_test_startup(0);
--	do {
--		tt_putp(insert_character);
--		tt_putp(delete_character);
--	} while(still_testing());
--	pad_test_shutdown(t, 1);
--	ptextln(xch1);
--	ptext("The preceding two lines should be the same.  ");
--	pad_done_message(t, state, ch);
--}
--
--/*
--**	pad_rep(test_list, status, ch)
--**
--**	Test (rep) repeat character
--*/
--static void
--pad_rep(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i, j;
--
--	if (!repeat_char) {
--		CAP_NOT_FOUND;
--		ptext("(rep) Repeat-character, not present.  ");
--		pad_done_message(t, state, ch);
--		return;
--	}
--	if (skip_pad_test(t, state, ch,
--		"(rep) Repeat-character start testing")) {
--		return;
--	}
--	if (augment > columns - 2) {
--		augment = columns - 2;
--	}
--	if (augment < 2) {
--		augment = 2;
--	}
--	pad_test_startup(1);
--	do {
--		go_home();
--		for (i = 2; i < lines; i++) {
--			tt_putparm(repeat_char, repeats, letter, repeats);
--			put_crlf();
--		}
--		for (j = 0; j < repeats; j++) {
--			putchp(letter);
--		}
--		put_crlf();
--		NEXT_LETTER;
--	} while(still_testing());
--	pad_test_shutdown(t, 0);
--	ptextln(all_lines);
--	pad_done_message(t, state, ch);
--}
--
--/*
--**	pad_cup(test_list, status, ch)
--**
--**	Test (cup) Cursor address
--*/
--static void
--pad_cup(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i, j, l, r, c;
--
--	if (!cursor_address) {
--		CAP_NOT_FOUND;
--		ptext("(cup) Cursor-address not present.  ");
--		pad_done_message(t, state, ch);
--		return;
--	}
--	if (skip_pad_test(t, state, ch,
--		"(cup) Cursor-address start testing")) {
--		return;
--	}
--	put_clear();
--	ptext("Each line should be filled with the same letter.  There should");
--	ptext(" be no gaps, or single letters scattered over the screen.  ");
--	if (char_count + 15 > columns) {
--		put_crlf();
--	}
--	if (((lines - line_count) & 1) == 0) {
--		/* this removes the gap in the middle of the test when the
--		number of lines is odd.  */
--		put_crlf();
--	}
--	r = line_count;
--	c = char_count;
--	l = (columns - 4) >> 1;
--	pad_test_startup(0);
--	do {
--		for (i = 1; i + i + r < lines; i++) {
--			for (j = 0; j <= l; j++) {
--				tt_putparm(cursor_address, 1, r + i, j);
--				putchp(letter);
--				tt_putparm(cursor_address, 1, r + i, l + l + 1 - j);
--				putchp(letter);
--				tt_putparm(cursor_address, 1, lines - i, j);
--				putchp(letter);
--				tt_putparm(cursor_address, 1, lines - i, l + l + 1 - j);
--				putchp(letter);
--			}
--			SLOW_TERMINAL_EXIT;
--		}
--		NEXT_LETTER;
--	} while(still_testing());
--	pad_test_shutdown(t, 0);
--	tt_putparm(cursor_address, 1, line_count = r, char_count = c);
--	pad_done_message(t, state, ch);
--	put_clear();
--}
--
--/*
--**	pad_hd(test_list, status, ch)
--**
--**	Test (hd) Half down
--*/
--static void
--pad_hd(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i, j, k;
--
--	if (!down_half_line) {
--		CAP_NOT_FOUND;
--		ptext("(hd) Half-line-down not present.  ");
--		pad_done_message(t, state, ch);
--		return;
--	}
--	if (skip_pad_test(t, state, ch,
--		"(hd) Half-line-down start testing")) {
--		return;
--	}
--	pad_test_startup(1);
--	do {
--		for (i = 1; i < columns; i += 2) {
--			for (j = 1; j < i; ++j) {
--				putchp(' ');
--			}
--			tt_putp(down_half_line);
--			for (k = lines + lines; k > 4; k--) {
--				if (j++ >= columns) {
--					break;
--				}
--				tt_putp(down_half_line);
--				putchp(letter);
--			}
--			go_home();
--			SLOW_TERMINAL_EXIT;
--		}
--		NEXT_LETTER;
--	} while(still_testing());
--	pad_test_shutdown(t, 0);
--	pad_done_message(t, state, ch);
--	put_clear();
--}
--
--/*
--**	pad_hu(test_list, status, ch)
--**
--**	Test (hu) Half line up
--*/
--static void
--pad_hu(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i, j, k;
--
--	if (!up_half_line) {
--		CAP_NOT_FOUND;
--		ptext("(hu) Half-line-up not present.  ");
--		pad_done_message(t, state, ch);
--		return;
--	}
--	if (skip_pad_test(t, state, ch,
--		"(hu) Half-line-up start testing")) {
--		return;
--	}
--	pad_test_startup(1);
--	do {
--		for (i = 1; i < columns; i += 2) {
--			home_down();
--			for (j = 1; j < i; ++j) {
--				putchp(' ');
--			}
--			tt_putp(up_half_line);
--			for (k = lines + lines; k > 4; k--) {
--				if (j++ >= columns) {
--					break;
--				}
--				tt_putp(up_half_line);
--				putchp(letter);
--			}
--			SLOW_TERMINAL_EXIT;
--		}
--		go_home();
--		NEXT_LETTER;
--	} while(still_testing());
--	pad_test_shutdown(t, 0);
--	pad_done_message(t, state, ch);
--	put_clear();
--}
--
--/*
--**	pad_rin(test_list, status, ch)
--**
--**	Test (rin) and (ri) Reverse index
--*/
--static void
--pad_rin(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i;
--	const char *start_message;
--
--	if (t->flags & 1) {
--		/* rin */
--		if (!parm_rindex) {
--			CAP_NOT_FOUND;
--			ptext("(rin) Scroll-reverse-n-lines not present.  ");
--			pad_done_message(t, state, ch);
--			return;
--		}
--		start_message = "(rin) Scroll-reverse-n-lines start testing";
--	} else {
--		/* ri */
--		if (!scroll_reverse) {
--			CAP_NOT_FOUND;
--			ptext("(ri) Scroll-reverse not present.  ");
--			pad_done_message(t, state, ch);
--			return;
--		}
--		start_message = "(ri) Scroll-reverse start testing";
--		augment = 1;
--	}
--	if (skip_pad_test(t, state, ch, start_message)) {
--		return;
--	}
--	pad_test_startup(1);
--	do {
--		sprintf(temp, "%d\r", test_complete);
--		put_str(temp);
--		if (scroll_reverse && repeats == 1) {
--			tt_putp(scroll_reverse);
--		} else {
--			tt_putparm(parm_rindex, repeats, repeats, 0);
--		}
--	} while(still_testing());
--	put_str("This line should be on the bottom.\r");
--	if (scroll_reverse && augment == 1) {
--		for (i = 1; i < lines; i++) {
--			tt_putp(scroll_reverse);
--		}
--	} else {
--		tt_putparm(parm_rindex, lines - 1, lines - 1, 0);
--	}
--	putln("The screen should have text on the bottom line.");
--	sprintf(temp, "Scroll reverse %d line%s.  ", augment,
--		augment == 1 ? "" : "s");
--	put_str(temp);
--	pad_test_shutdown(t, 0);
--	pad_done_message(t, state, ch);
--	put_clear();
--}
--
--/*
--**	pad_il(test_list, status, ch)
--**
--**	Test (il) and (il1) Insert line
--*/
--static void
--pad_il(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i;
--	const char *start_message;
--
--	if (t->flags & 1) {
--		/* il */
--		if (!parm_insert_line) {
--			CAP_NOT_FOUND;
--			ptext("(il) Insert-lines not present.  ");
--			pad_done_message(t, state, ch);
--			return;
--		}
--		start_message = "(il) Insert-lines start testing";
--	} else {
--		/* il1 */
--		if (!insert_line) {
--			CAP_NOT_FOUND;
--			ptext("(il1) Insert-line not present.  ");
--			pad_done_message(t, state, ch);
--			return;
--		}
--		start_message = "(il1) Insert-line start testing";
--		augment = 1;
--	}
--	if (skip_pad_test(t, state, ch, start_message)) {
--		return;
--	}
--	pad_test_startup(1);
--	do {
--		sprintf(temp, "%d\r", test_complete);
--		put_str(temp);
--		if (insert_line && repeats == 1) {
--			tt_putp(insert_line);
--		} else {
--			tt_putparm(parm_insert_line, repeats, repeats, 0);
--		}
--	} while(still_testing());
--	put_str("This line should be on the bottom.\r");
--	if (insert_line && augment == 1) {
--		for (i = 1; i < lines; i++) {
--			tt_putp(insert_line);
--		}
--	} else {
--		tt_putparm(parm_insert_line, lines - 1, lines - 1, 0);
--	}
--	putln("The screen should have text on the bottom line.");
--	sprintf(temp, "Insert %d line%s.  ", augment,
--		augment == 1 ? "" : "s");
--	put_str(temp);
--	pad_test_shutdown(t, 0);
--	pad_done_message(t, state, ch);
--	put_clear();
--}
--
--/*
--**	pad_indn(test_list, status, ch)
--**
--**	Test (indn) and (ind) Scroll forward
--*/
--static void
--pad_indn(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i;
--	const char *start_message;
--
--	if (t->flags & 1) {
--		/* indn */
--		if (!parm_index) {
--			CAP_NOT_FOUND;
--			ptext("(indn) Scroll-forward-n-lines not present.  ");
--			pad_done_message(t, state, ch);
--			return;
--		}
--		start_message = "(indn) Scroll-forward-n-lines start testing";
--	} else {
--		/* ind */
--		if (!scroll_forward) {
--			CAP_NOT_FOUND;
--			ptext("(ind) Scroll-forward not present.  ");
--			pad_done_message(t, state, ch);
--			return;
--		}
--		if (over_strike) {
--			ptext("(ind) Scroll-forward not tested on overstrike terminals.  ");
--			pad_done_message(t, state, ch);
--			return;
--		}
--		start_message = "(ind) Scroll-forward start testing";
--		augment = 1;
--	}
--	if (skip_pad_test(t, state, ch, start_message)) {
--		return;
--	}
--	pad_test_startup(1);
--	/* go to the bottom of the screen */
--	home_down();
--	do {
--		sprintf(temp, "%d\r", test_complete);
--		put_str(temp);
--		if (scroll_forward && repeats == 1) {
--			put_ind();
--		} else {
--			tt_putparm(parm_index, repeats, repeats, 0);
--		}
--	} while(still_testing());
--	put_str("This line should be on the top.\r");
--	if (scroll_forward && augment == 1) {
--		for (i = 1; i < lines; i++) {
--			put_ind();
--		}
--	} else {
--		tt_putparm(parm_index, lines - 1, lines - 1, 0);
--	}
--	go_home();
--	sprintf(temp, "\nScroll forward %d line%s.  ", augment,
--		augment == 1 ? "" : "s");
--	put_str(temp);
--	pad_test_shutdown(t, 0);
--	pad_done_message(t, state, ch);
--}
--
--/*
--**	pad_dl(test_list, status, ch)
--**
--**	Test (dl) and (dl1) Delete lines
--*/
--static void
--pad_dl(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i = 0;
--	const char *start_message;
--
--	if (t->flags & 1) {
--		/* dl */
--		if (!parm_delete_line) {
--			CAP_NOT_FOUND;
--			ptext("(dl) Delete-lines not present.  ");
--			pad_done_message(t, state, ch);
--			return;
--		}
--		start_message = "(dl) Delete-lines start testing";
--	} else {
--		/* dl1 */
--		if (!delete_line) {
--			CAP_NOT_FOUND;
--			ptext("(dl1) Delete-line not present.  ");
--			pad_done_message(t, state, ch);
--			return;
--		}
--		start_message = "(dl1) Delete-line start testing";
--		augment = 1;
--	}
--	if (skip_pad_test(t, state, ch, start_message)) {
--		return;
--	}
--	pad_test_startup(1);
--	do {
--		sprintf(temp, "%d\r", test_complete);
--		if (augment < lines - 1) {
--			go_home();
--			putln(temp);
--		}
--		put_str(temp);
--		if (delete_line && repeats == 1) {
--			tt_putp(delete_line);
--		} else {
--			tt_putparm(parm_delete_line, repeats, repeats, 0);
--		}
--	} while(still_testing());
--	home_down();
--	put_str("This line should be on the top.");
--	go_home();
--	if (delete_line && augment == 1) {
--		for (i = 1; i < lines; i++) {
--			tt_putp(delete_line);
--		}
--	} else {
--		tt_putparm(parm_delete_line, lines - 1, lines - 1, 0);
--	}
--	sprintf(temp, "\nDelete %d line%s.  ", augment,
--		augment == 1 ? "" : "s");
--	put_str(temp);
--	pad_test_shutdown(t, 0);
--	pad_done_message(t, state, ch);
--}
--
--/*
--**	pad_xl(test_list, status, ch)
--**
--**	Test (il1) Insert and (dl1) Delete lines
--*/
--static void
--pad_xl(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	if (!insert_line && !delete_line) {
--		/* quietly skip this test */
--		return;
--	}
--	if (skip_pad_test(t, state, ch,
--		"(il1) Insert-line, (dl1) Delete-line start testing")) {
--		return;
--	}
--	put_clear();
--	putln("\rThis text is written on the first line.");
--	ptext("This sentence begins on the second line.  As this");
--	ptext(" test runs the bottom part of this paragraph will");
--	ptext(" jump up and down.  Don't worry, that's normal.  When");
--	ptext(" the jumping stops, the entire paragraph should");
--	ptext(" still be on the screen and in the same place as when");
--	ptext(" the test started.  If this paragraph has scrolled");
--	ptext(" off the top or bottom of the screen then the test");
--	ptext(" has failed.  Scrolling off the top of the screen");
--	ptext(" usually means that the delete line capability is");
--	ptext(" working better than the insert line capability.  If");
--	ptext(" the text scrolls off the bottom then delete line may");
--	ptext(" be broken.  If parts of the text are missing then");
--	ptext(" you should get professional help.");
--	put_crlf();
--	go_home();
--	put_newlines(2);
--	pad_test_startup(0);
--	do {
--		tt_putp(insert_line);
--		put_cr();
--		tt_putp(delete_line);
--	} while(still_testing());
--	pad_test_shutdown(t, 0);
--	home_down();
--	ptext("The top of the screen should have a paragraph of text.  ");
--	pad_done_message(t, state, ch);
--}
--
--/*
--**	pad_scrc(test_list, status, ch)
--**
--**	Test (sc) (rc) Save/restore cursor
--*/
--static void
--pad_scrc(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i;
--
--	if (!save_cursor || !restore_cursor) {
--		CAP_NOT_FOUND;
--		if (save_cursor) {
--			ptext("(rc) Restore-cursor");
--		} else
--		if (restore_cursor) {
--			ptext("(sc) Save-cursor");
--		} else {
--			ptext("(sc) Save-cursor, (rc) Restore-cursor");
--		}
--		ptext(" not present.  ");
--		pad_done_message(t, state, ch);
--		return;
--	}
--	if (skip_pad_test(t, state, ch,
--		"(sc) (rc) Save/Restore-cursor start testing")) {
--		return;
--	}
--	pad_test_startup(1);
--	do {
--		page_loop();
--		for (i = 1; i < columns; i++) {
--			tt_putp(save_cursor);
--			putchp(letter);
--			tt_putp(restore_cursor);
--			putchp('X');
--		}
--	} while(still_testing());
--	pad_test_shutdown(t, 0);
--	home_down();
--	ptext(above_line);
--	pad_done_message(t, state, ch);
--}
--
--/*
--**	pad_csrind(test_list, status, ch)
--**
--**	Test (csr) and (ind) Change scroll region and index.
--*/
--static void
--pad_csrind(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i;
--
--	if (!change_scroll_region) {
--		CAP_NOT_FOUND;
--		ptext("(csr) Change-scroll-region not present.  ");
--		pad_done_message(t, state, ch);
--		return;
--	}
--	if (skip_pad_test(t, state, ch,
--		"(csr) Save/Restore-cursor, (ind) index start testing")) {
--		return;
--	}
--	if (augment < 2) {
--		augment = 2;
--	}
--	if (augment > lines - 1) {
--		augment = lines - 1;
--	}
--	put_clear();
--	ptext("This text is on the top line.");
--	tt_putparm(change_scroll_region, 1, lines - augment, lines - 1);
--	/* go to the bottom of the screen */
--	home_down();
--	pad_test_startup(0);
--	do {
--		sprintf(temp, "%d\r", test_complete);
--		put_str(temp);
--		put_ind();
--	} while(still_testing());
--	ptextln("(csr) is broken.");
--	for (i = augment; i > 1; i--) {
--		put_ind();
--	}
--	pad_test_shutdown(t, 0);
--	ptext("All but top and bottom lines should be blank.  ");
--	pad_done_message(t, state, ch);
--	tt_putparm(change_scroll_region, 1, 0, lines - 1);
--	put_clear();
--}
--
--/*
--**	pad_sccsrrc(test_list, status, ch)
--**
--**	Test (sc) (csr) and (rc) Save/Change/Restore scroll region
--*/
--static void
--pad_sccsrrc(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i;
--
--	if (!save_cursor || !change_scroll_region || !restore_cursor) {
--		/* quietly ignore this test */
--		return;
--	}
--	if (skip_pad_test(t, state, ch,
--		"(sc) (csr) (rc) Save/Change/Restore-cursor, start testing")) {
--		return;
--	}
--	pad_test_startup(1);
--	do {
--		page_loop();
--		for (i = 1; i < columns; i++) {
--			tt_putp(save_cursor);
--			putchp(letter);
--			tt_putparm(change_scroll_region, 1, 0, lines - 1);
--			tt_putp(restore_cursor);
--			putchp('X');
--		}
--	} while(still_testing());
--	pad_test_shutdown(t, 0);
--	home_down();
--	ptext(above_line);
--	pad_done_message(t, state, ch);
--	tt_putparm(change_scroll_region, 1, 0, lines - 1);
--}
--
--/*
--**	pad_csr_nel(test_list, status, ch)
--**
--**	Test (sc) (csr) (nel) and (rc) Save/Change/Restore scroll region
--*/
--static void
--pad_csr_nel(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i, j;
--
--	if (!save_cursor || !change_scroll_region || !restore_cursor) {
--		/* quietly ignore this test */
--		return;
--	}
--	if (skip_pad_test(t, state, ch,
--		"(csr) Change-scroll-region, (nel) newline start testing")) {
--		return;
--	}
--	pad_test_startup(1);
--	do {
--		for (i = 0; i < lines; i++) {
--			for (j = lines - i; j > 0; j--) {
--				put_crlf();
--			}
--			tt_putp(save_cursor);
--			tt_putparm(change_scroll_region, 1, i, lines - 1);
--			tt_putp(restore_cursor);
--			put_str(every_line);
--		}
--		tt_putp(save_cursor);
--		tt_putparm(change_scroll_region, 1, 0, lines - 1);
--		tt_putp(restore_cursor);
--	} while(still_testing());
--	pad_test_shutdown(t, 0);
--	put_str("  ");
--	pad_done_message(t, state, ch);
--	tt_putparm(change_scroll_region, 1, 0, lines - 1);
--}
--
--/*
--**	pad_csr_cup(test_list, status, ch)
--**
--**	Test (csr) (cup) Change scroll region and cursor address
--*/
--static void
--pad_csr_cup(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i, j;
--
--	if (!change_scroll_region || !cursor_address) {
--		/* quietly ignore this test */
--		return;
--	}
--	if (skip_pad_test(t, state, ch,
--		"(csr) Change-scroll-region, (cup) cursor-address start testing")) {
--		return;
--	}
--	pad_test_startup(1);
--	do {
--		for (i = 0; i < lines; i++) {
--			for (j = lines - i; j > 0; j--) {
--				put_crlf();
--			}
--			tt_putparm(change_scroll_region, 1, i, lines - 1);
--			tt_putparm(cursor_address, 1, lines - 1, 0);
--			put_str(every_line);
--		}
--		tt_putparm(change_scroll_region, 1, 0, lines - 1);
--		tt_putparm(cursor_address, 1, lines - 1, (int) strlen(every_line));
--	} while(still_testing());
--	pad_test_shutdown(t, 0);
--	put_str("  ");
--	pad_done_message(t, state, ch);
--	tt_putparm(change_scroll_region, 1, 0, lines - 1);
--}
--
--/*
--**	pad_ht(test_list, status, ch)
--**
--**	Test (ht) Tabs
--*/
--static void
--pad_ht(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i, j;
--
--	if (!set_tab && init_tabs <= 0) {
--		CAP_NOT_FOUND;
--		ptext("(ht) Tab not tested.  (hts) Set-tabs and (it) initial-tabs not present.  ");
--		pad_done_message(t, state, ch);
--		return;
--	}
--	if (skip_pad_test(t, state, ch, "(ht) Tab start testing")) {
--		return;
--	}
--	pad_test_startup(1);
--	do {
--		/*
--		   it is not always possible to test tabs with caps
--		   that do not already have padding. The following
--		   test uses a mixed bag of tests in order to avoid
--		   this problem. Note: I do not scroll
--		*/
--		if (auto_right_margin && can_go_home)
--			for (i = 1, go_home(); i < lines - 2; i++) {
--				for (j = 8; j < columns; j += 8) {
--					putchp('\t');
--				}
--				put_str("A        ");
--			}
--		if (cursor_down && can_go_home)
--			for (i = 1, go_home(); i < lines - 2; i++) {
--				for (j = 8; j < columns; j += 8) {
--					putchp('\t');
--				}
--				put_str("D\r");
--				tt_putp(cursor_down);
--			}
--		if (cursor_address)
--			for (i = 1; i < lines - 2; i++) {
--				tt_putparm(cursor_address, 1, i - 1, 0);
--				for (j = 8; j < columns; j += 8) {
--					putchp('\t');
--				}
--				put_str("C");
--			}
--		go_home();
--		for (i = 1; i < lines - 2; i++) {
--			for (j = 8; j < columns; j += 8) {
--				putchp('\t');
--			}
--			putln("N");
--		}
--	} while(still_testing());
--	pad_test_shutdown(t, 0);
--	ptextln("Letters on the screen other than Ns at the right margin indicate failure.");
--	ptext("A-(am) D-(cud1) C-(cup) N-(nel)  ");
--	pad_done_message(t, state, ch);
--}
--
--/*
--**	pad_smso(test_list, status, ch)
--**
--**	Test (smso) (rmso) Enter/exit mode
--*/
--static void
--pad_smso(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i, j;
--
--	if (!enter_standout_mode || !exit_standout_mode) {
--		CAP_NOT_FOUND;
--		ptext("(smso) (rmso) Enter/Exit-standout-mode not present.  ");
--		pad_done_message(t, state, ch);
--		return;
--	}
--	if (skip_pad_test(t, state, ch,
--		"(smso) (rmso) Enter/Exit-standout-mode start testing")) {
--		return;
--	}
--	/*
--	   In terminals that emulate non-hidden attributes with hidden
--	   attributes, the amount of time that it takes to fill the screen
--	   with an attribute is nontrivial. The following test is designed to
--	   catch those delays
--	*/
--	pad_test_startup(1);
--	do {
--		page_loop();
--		j = magic_cookie_glitch > 0 ? magic_cookie_glitch : 0;
--		for (i = 2 + j + j; i < columns;) {
--			put_mode(enter_standout_mode);
--			i += j + j + 2;
--			putchp('X');
--			put_mode(exit_standout_mode);
--			putchp('X');
--		}
--	} while(still_testing());
--	pad_test_shutdown(t, 0);
--	home_down();
--	ptext(above_line);
--	pad_done_message(t, state, ch);
--	put_mode(exit_standout_mode);
--}
--
--/*
--**	pad_smacs(test_list, status, ch)
--**
--**	Test (smacs) (rmacs) Enter/exit altcharset mode
--*/
--static void
--pad_smacs(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int i, j;
--
--	/* test enter even if exit is missing */
--	if (!enter_alt_charset_mode) {
--		CAP_NOT_FOUND;
--		ptext("(smacs) Enter-altcharset-mode not present.  ");
--		pad_done_message(t, state, ch);
--		return;
--	}
--	if (skip_pad_test(t, state, ch,
--		"(smacs) (rmacs) Enter/Exit-altcharset-mode start testing")) {
--		return;
--	}
--	pad_test_startup(1);
--	do {
--		page_loop();
--		j = magic_cookie_glitch > 0 ? magic_cookie_glitch : 0;
--		for (i = 2 + j + j; i < columns;) {
--			put_mode(enter_alt_charset_mode);
--			i += j + j + 2;
--			putchp(letter);
--			put_mode(exit_alt_charset_mode);
--			putchp(letter);
--		}
--	} while(still_testing());
--	pad_test_shutdown(t, 0);
--	home_down();
--	ptext("Every other character is from the alternate character set.  ");
--	pad_done_message(t, state, ch);
--	put_mode(exit_alt_charset_mode);
--}
--
--/*
--**	pad_crash(test_list, status, ch)
--**
--**	Test (clear) without padding
--*/
--static void
--pad_crash(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int save_xon_xoff;
--
--	if (!clear_screen) {
--		ptext("(clear) Clear-screen not present.  ");
--		pad_done_message(t, state, ch);
--		return;
--	}
--	ptext("If you would like to see if the terminal will really lock up.");
--	ptextln("  I will send the clear screen sequence without the pads.");
--	if (skip_pad_test(t, state, ch,
--		"(clear) Clear-screen start crash testing")) {
--		return;
--	}
--	save_xon_xoff = xon_xoff;
--	xon_xoff = 1;
--	pad_test_startup(0);
--	do {
--		put_str("Erase this!");
--		tt_putp(clear_screen);
--	} while(still_testing());
--	xon_xoff = save_xon_xoff;
--	pad_test_shutdown(t, 1);
--	pad_done_message(t, state, ch);
--}
-diff -Naur ncurses-5.6.orig/tack/scan.c ncurses-5.6/tack/scan.c
---- ncurses-5.6.orig/tack/scan.c	2005-09-17 15:49:16.000000000 -0400
-+++ ncurses-5.6/tack/scan.c	1969-12-31 19:00:00.000000000 -0500
-@@ -1,264 +0,0 @@
--/*
--** Copyright (C) 1991, 1997 Free Software Foundation, Inc.
--** 
--** This file is part of TACK.
--** 
--** TACK is free software; you can redistribute it and/or modify
--** it under the terms of the GNU General Public License as published by
--** the Free Software Foundation; either version 2, or (at your option)
--** any later version.
--** 
--** TACK is distributed in the hope that it will be useful,
--** but WITHOUT ANY WARRANTY; without even the implied warranty of
--** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--** GNU General Public License for more details.
--** 
--** You should have received a copy of the GNU General Public License
--** along with TACK; see the file COPYING.  If not, write to
--** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
--** Boston, MA 02110-1301, USA
--*/
--/* scan mode keyboard support */
--
--#include <tack.h>
--
--MODULE_ID("$Id: scan.c,v 1.5 2005/09/17 19:49:16 tom Exp $")
--
--unsigned scan_max;		/* length of longest scan code */
--char **scan_up, **scan_down, **scan_name;
--unsigned *scan_tested, *scan_length;
--static unsigned *scan_value;
--
--static int shift_state;
--static char *str;
--static int debug_char_count;
--
--#define SHIFT_KEY   0x100
--#define CONTROL_KEY 0x200
--#define META_KEY    0x400
--#define CAPS_LOCK   0x800
--
--static const struct {
--	const char *name;
--	unsigned type;
--}  scan_special[] = {
--	{"<shift>", SHIFT_KEY},
--	{"<left shift>", SHIFT_KEY},
--	{"<right shift>", SHIFT_KEY},
--	{"<control>", CONTROL_KEY},
--	{"<left control>", CONTROL_KEY},
--	{"<right control>", CONTROL_KEY},
--	{"<meta>", META_KEY},
--	{"<left meta>", META_KEY},
--	{"<right meta>", META_KEY},
--	{"<caps lock>", CAPS_LOCK},
--	{"<tab>", '\t'},
--	{"<space>", ' '},
--	{"<return>", '\r'},
--	{"<linefeed>", '\n'},
--	{"<formfeed>", '\f'},
--	{"<backspace>", '\b'},
--	{0, 0}
--};
--
--static void
--scan_blanks(void)
--{				/* scan past the white space */
--	while (*str == ' ' || *str == '\t')
--		str++;
--}
--
--static char *
--smash(void)
--{				/* convert a string to hex */
--	char *s, *t;
--	int ch, i, j;
--
--	t = s = str;
--	for (i = 0; (ch = *str); str++) {
--		if (ch >= '0' && ch <= '9')
--			j = ch - '0';
--		else if (ch >= 'a' && ch <= 'f')
--			j = 10 - 'a' + ch;
--		else if (ch >= 'A' && ch <= 'F')
--			j = 10 - 'A' + ch;
--		else if (ch == ' ' || ch == '\t')
--			break;
--		else
--			continue;
--		if (i) {
--			*s |= j;
--			s++;
--		} else
--			*s = j << 4;
--		i ^= 1;
--	}
--	*s = '\0';
--	return t;
--}
--
--void
--scan_init(char *fn)
--{				/* read the scan mode key definitions */
--	char *s, *sl;
--	FILE *fp;
--	int ch, i, j;
--	unsigned len;
--	char home[512];
--
--	if ((str = getenv("HOME")))
--		strcpy(home, str);
--	else
--		home[0] = '\0';
--	fp = NULL;
--	if ((str = getenv("KEYBOARD"))) {
--		if (!(fp = fopen(str, "r")) && home[0]) {
--			sprintf(temp, "%s/.scan.%s", home, str);
--			fp = fopen(temp, "r");
--		}
--	}
--	if (!fp) {
--		sprintf(temp, ".scan.%s", fn);
--		fp = fopen(temp, "r");
--	}
--	if (!fp && home[0]) {
--		sprintf(temp, "%s/.scan.%s", home, fn);
--		fp = fopen(temp, "r");
--	}
--	if (!fp) {
--		ptext("Unable to open scanfile: ");
--		ptextln(temp);
--		bye_kids(1);
--		return;
--	}
--	/*
--	   scan file format:
--	
--	<down value> <up value> <name>
--	
--	values are in hex. <name> may be any string of characters
--	
--	*/
--	scan_up = (char **) malloc(sizeof(char *) * MAX_SCAN);
--	scan_down = (char **) malloc(sizeof(char *) * MAX_SCAN);
--	scan_name = (char **) malloc(sizeof(char *) * MAX_SCAN);
--	scan_tested = (unsigned *) malloc(sizeof(unsigned *) * MAX_SCAN);
--	scan_length = (unsigned *) malloc(sizeof(unsigned *) * MAX_SCAN);
--	scan_value = (unsigned *) malloc(sizeof(unsigned *) * MAX_SCAN);
--	scan_up[0] = scan_down[0] = scan_name[0] = (char *) 0;
--	str = (char *) malloc(4096);	/* buffer space */
--	sl = str + 4000;	/* an upper limit */
--	scan_max = 1;
--	for (i = 0;;) {
--		for (s = str; (ch = getc(fp)) != EOF;) {
--			if (ch == '\n' || ch == '\r')
--				break;
--			*s++ = ch;
--		}
--		*s++ = '\0';
--		if (ch == EOF)
--			break;
--		if (*str == '#' || *str == '\0')
--			continue;
--		scan_down[i] = smash();
--		scan_blanks();
--		scan_up[i] = smash();
--		scan_blanks();
--		scan_name[i] = str;
--
--		scan_length[i] = strlen(scan_down[i]);
--		len = strlen(scan_up[i]) + scan_length[i];
--		if (len > scan_max)
--			scan_max = len;
--
--		scan_value[i] = UChar(scan_name[i][0]);
--		if (scan_name[i][1])	/* multi-character name */
--			for (j = 0; scan_special[j].name; j++) {
--				if (!strcmp(scan_name[i], scan_special[j].name)) {
--					scan_value[i] = scan_special[j].type;
--					break;
--				}
--			}
--
--		i++;
--		if (str > sl) {
--			str = (char *) malloc(4096);
--			sl = str + 4000;
--		} else
--			str = s;
--	}
--	fclose(fp);
--#ifdef notdef
--	for (i = 0; scan_down[i]; i++) {
--		put_str(hex_expand_to(scan_down[i], 3));
--		put_str(hex_expand_to(scan_up[i], 3));
--		put_str("   ");
--		put_str(scan_name[i]);
--		put_crlf();
--	}
--	(void) wait_here();
--#endif
--}
--
--int
--scan_key(void)
--{				/* read a key and translate scan mode to
--				   ASCII */
--	unsigned i;
--	int j, ch;
--	char buf[64];
--
--	for (i = 1;; i++) {
--		ch = getchar();
--		if (ch == EOF)
--			return EOF;
--		if (debug_fp) {
--			fprintf(debug_fp, "%02X ", ch);
--			debug_char_count += 3;
--			if (debug_char_count > 72) {
--				fprintf(debug_fp, "\n");
--				debug_char_count = 0;
--			}
--		}
--		buf[i - 1] = ch;
--		buf[i] = '\0';
--		if (buf[0] & 0x80) {	/* scan up */
--			for (j = 0; scan_up[j]; j++) {
--				if (i == scan_length[j] &&
--					!strcmp(buf, scan_up[j])) {
--					i = 0;
--					shift_state &= ~scan_value[j];
--					break;
--				}
--			}
--			continue;
--		}
--		for (j = 0; scan_down[j]; j++) {
--			if (i == scan_length[j] && !strcmp(buf, scan_down[j])) {
--				i = 0;
--				shift_state |= scan_value[j];
--				ch = scan_value[j];
--				if (ch == CAPS_LOCK)
--					shift_state ^= SHIFT_KEY;
--				if (ch >= 256)
--					break;
--				if (shift_state & SHIFT_KEY) {
--					if (ch >= 0x60)
--						ch -= 0x20;
--					else if (ch >= 0x30 && ch <= 0x3f)
--						ch -= 0x10;
--				}
--				if (shift_state & CONTROL_KEY) {
--					if ((ch | 0x20) >= 0x60 &&
--						(ch | 0x20) <= 0x7f)
--						ch = (ch | 0x20) - 0x60;
--				}
--				if (shift_state & META_KEY)
--					ch |= 0x80;
--				return ch;
--			}
--		}
--		if (i > scan_max)
--			i = 1;
--	}
--}
-diff -Naur ncurses-5.6.orig/tack/sync.c ncurses-5.6/tack/sync.c
---- ncurses-5.6.orig/tack/sync.c	2006-05-06 16:45:48.000000000 -0400
-+++ ncurses-5.6/tack/sync.c	1969-12-31 19:00:00.000000000 -0500
-@@ -1,436 +0,0 @@
--/*
--** Copyright (C) 1991, 1997 Free Software Foundation, Inc.
--** 
--** This file is part of TACK.
--** 
--** TACK is free software; you can redistribute it and/or modify
--** it under the terms of the GNU General Public License as published by
--** the Free Software Foundation; either version 2, or (at your option)
--** any later version.
--** 
--** TACK is distributed in the hope that it will be useful,
--** but WITHOUT ANY WARRANTY; without even the implied warranty of
--** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--** GNU General Public License for more details.
--** 
--** You should have received a copy of the GNU General Public License
--** along with TACK; see the file COPYING.  If not, write to
--** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
--** Boston, MA 02110-1301, USA
--*/
--
--#include <tack.h>
--#include <time.h>
--
--MODULE_ID("$Id: sync.c,v 1.9 2006/05/06 20:45:48 tom Exp $")
--
--/* terminal-synchronization and performance tests */
--
--static void sync_home(struct test_list *, int *, int *);
--static void sync_lines(struct test_list *, int *, int *);
--static void sync_clear(struct test_list *, int *, int *);
--static void sync_summary(struct test_list *, int *, int *);
--
--static struct test_list sync_test_list[] = {
--	{MENU_NEXT, 0, 0, 0, "b) baud rate test", sync_home, 0},
--	{MENU_NEXT, 0, 0, 0, "l) scroll performance", sync_lines, 0},
--	{MENU_NEXT, 0, 0, 0, "c) clear screen performance", sync_clear, 0},
--	{MENU_NEXT, 0, 0, 0, "p) summary of results", sync_summary, 0},
--	{0, 0, 0, 0, txt_longer_test_time, longer_test_time, 0},
--	{0, 0, 0, 0, txt_shorter_test_time, shorter_test_time, 0},
--	{MENU_LAST, 0, 0, 0, 0, 0, 0}
--};
--
--struct test_menu sync_menu = {
--	0, 'n', 0,
--	"Performance tests", "perf", "n) run standard tests",
--	sync_test, sync_test_list, 0, 0, 0
--};
--
--int tty_can_sync;		/* TRUE if tty_sync_error() returned FALSE */
--static int tty_newline_rate;	/* The number of newlines per second */
--static int tty_clear_rate;	/* The number of clear-screens per second */
--unsigned long tty_cps;		/* The number of characters per second */
--
--#define TTY_ACK_SIZE 64
--
--static int ACK_terminator;	/* terminating ACK character */
--static int ACK_length;		/* length of ACK string */
--static const char *tty_ENQ;	/* enquire string */
--static char tty_ACK[TTY_ACK_SIZE]; /* ACK response, set by tty_sync_error() */
--
--/*****************************************************************************
-- *
-- * Terminal synchronization.
-- *
-- *	These functions handle the messy business of enq-ack handshaking
-- *	for timing purposes.
-- *
-- *****************************************************************************/
--
--int
--tty_sync_error(void)
--{
--	int ch, trouble, ack;
--
--	trouble = FALSE;
--	for (;;) {
--		tt_putp(tty_ENQ);	/* send ENQ */
--		ch = getnext(STRIP_PARITY);
--		event_start(TIME_SYNC);	/* start the timer */
--
--		/*
--		   The timer doesn't start until we get the first character.
--		   After that I expect to get the remaining characters of
--		   the acknowledge string in a short period of time.  If
--		   that is not true then these characters are coming from
--		   the user and we need to send the ENQ sequence out again.
--		*/
--		for (ack = 0; ; ) {
--			if (ack < TTY_ACK_SIZE - 2) {
--				tty_ACK[ack] = ch;
--				tty_ACK[ack + 1] = '\0';
--			}
--			if (ch == ACK_terminator) {
--				return trouble;
--			}
--			if (++ack >= ACK_length) {
--				return trouble;
--			}
--			ch = getnext(STRIP_PARITY);
--			if (event_time(TIME_SYNC) > 400000) {
--				break;
--			}
--		}
--
--		set_attr(0);	/* just in case */
--		put_crlf();
--		if (trouble) {
--			/* The terminal won't sync.  Life is not good. */
--			return TRUE;
--		}
--		put_str(" -- sync -- ");
--		trouble = TRUE;
--	}
--}
--
--/*
--**	flush_input()
--**
--**	Throw away any output.
--*/
--void 
--flush_input(void)
--{
--	if (tty_can_sync == SYNC_TESTED && ACK_terminator >= 0) {
--		(void) tty_sync_error();
--	} else {
--		spin_flush();
--	}
--}
--
--/*
--**	probe_enq_ok()
--**
--**	does the terminal do enq/ack handshaking?
--*/
--static void 
--probe_enq_ok(void)
--{
--	int tc, len, ulen;
--
--	put_str("Testing ENQ/ACK, standby...");
--	fflush(stdout);
--	can_test("u8 u9", FLAG_TESTED);
--
--#ifdef user9
--	tty_ENQ = user9 ? user9 : "\005";
--#else
--	tty_ENQ = "\005";
--#endif
--	tc_putp(tty_ENQ);
--	event_start(TIME_SYNC);	/* start the timer */
--	read_key(tty_ACK, TTY_ACK_SIZE - 1);
--
--	if (event_time(TIME_SYNC) > 400000 || tty_ACK[0] == '\0') {
--		/* These characters came from the user.  Sigh. */
--		tty_can_sync = SYNC_FAILED;
--		ptext("\nThis program expects the ENQ sequence to be");
--		ptext(" answered with the ACK character.  This will help");
--		ptext(" the program reestablish synchronization when");
--		ptextln(" the terminal is overrun with data.");
--		ptext("\nENQ sequence from (u9): ");
--		putln(expand(tty_ENQ));
--		ptext("ACK received: ");
--		putln(expand(tty_ACK));
--#ifdef user8
--		len = user8 ? strlen(user8) : 0;
--#else
--		len = 0;
--#endif
--		sprintf(temp, "Length of ACK %d.  Expected length of ACK %d.",
--			(int) strlen(tty_ACK), len);
--		ptextln(temp);
--#ifdef user8
--		if (len) {
--			temp[0] = user8[len - 1];
--			temp[1] = '\0';
--			ptext("Terminating character found in (u8): ");
--			putln(expand(temp));
--		}
--#endif
--		return;
--	}
--
--	tty_can_sync = SYNC_TESTED;
--	if ((len = strlen(tty_ACK)) == 1) {
--		/* single character acknowledge string */
--		ACK_terminator = tty_ACK[0];
--		ACK_length = 4096;
--		return;
--	}
--	tc = tty_ACK[len - 1];
--#ifdef user8
--	if (user8) {
--		ulen = strlen(user8);
--		if (tc == user8[ulen - 1]) {
--			/* ANSI style acknowledge string */
--			ACK_terminator = tc;
--			ACK_length = 4096;
--			return;
--		}
--	}
--#endif
--	/* fixed length acknowledge string */
--	ACK_length = len;
--	ACK_terminator = -2;
--}
--
--/*
--**	verify_time()
--**
--**	verify that the time tests are ready to run.
--**	If the baud rate is not set then compute it.
--*/
--void
--verify_time(void)
--{
--	int status, ch;
--
--	if (tty_can_sync == SYNC_FAILED) {
--		return;
--	}
--	probe_enq_ok();
--	put_crlf();
--	if (tty_can_sync == SYNC_TESTED) {
--		put_crlf();
--		if (ACK_terminator >= 0) {
--			ptext("ACK terminating character: ");
--			temp[0] = ACK_terminator;
--			temp[1] = '\0';
--			ptextln(expand(temp));
--		} else {
--			sprintf(temp, "Fixed length ACK, %d characters",
--				ACK_length);
--			ptextln(temp);
--		}
--	}
--	if (tty_baud_rate == 0) {
--		sync_home(&sync_test_list[0], &status, &ch);
--	}
--}
--
--/*****************************************************************************
-- *
-- * Terminal performance tests
-- *
-- *	Find out how fast the terminal can:
-- *	  1) accept characters
-- *	  2) scroll the screen
-- *	  3) clear the screen
-- *
-- *****************************************************************************/
--
--/*
--**	sync_home(test_list, status, ch)
--**
--**	Baudrate test
--*/
--static void
--sync_home(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int j, k;
--	unsigned long rate;
--
--	if (!cursor_home && !cursor_address && !row_address) {
--		ptext("Terminal can not home cursor.  ");
--		generic_done_message(t, state, ch);
--		return;
--	}
--	if (skip_pad_test(t, state, ch,
--		"(home) Start baudrate search")) {
--		return;
--	}
--	pad_test_startup(1);
--	do {
--		go_home();
--		for (j = 1; j < lines; j++) {
--			for (k = 0; k < columns; k++) {
--				if (k & 0xF) {
--					put_this(letter);
--				} else {
--					put_this('.');
--				}
--			}
--			SLOW_TERMINAL_EXIT;
--		}
--		NEXT_LETTER;
--	} while(still_testing());
--	pad_test_shutdown(t, auto_right_margin == 0);
--	/* note:  tty_frame_size is the real framesize times two.
--	   This takes care of half bits. */
--	rate = (tx_cps * tty_frame_size) >> 1;
--	if (rate > tty_baud_rate) {
--		tty_baud_rate = rate;
--	}
--	if (tx_cps > tty_cps) {
--		tty_cps = tx_cps;
--	}
--	sprintf(temp, "%lu characters per second.  Baudrate %d  ", tx_cps, j);
--	ptext(temp);
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	sync_lines(test_list, status, ch)
--**
--**	How many newlines/second?
--*/
--static void
--sync_lines(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int j;
--
--	if (skip_pad_test(t, state, ch,
--		"(nel) Start scroll performance test")) {
--		return;
--	}
--	pad_test_startup(0);
--	repeats = 100;
--	do {
--		sprintf(temp, "%d", test_complete);
--		put_str(temp);
--		put_newlines(repeats);
--	} while(still_testing());
--	pad_test_shutdown(t, 0);
--	j = sliding_scale(tx_count[0], 1000000, usec_run_time);
--	if (j > tty_newline_rate) {
--		tty_newline_rate = j;
--	}
--	sprintf(temp, "%d linefeeds per second.  ", j);
--	ptext(temp);
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	sync_clear(test_list, status, ch)
--**
--**	How many clear-screens/second?
--*/
--static void
--sync_clear(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	int j;
--
--	if (!clear_screen) {
--		ptext("Terminal can not clear-screen.  ");
--		generic_done_message(t, state, ch);
--		return;
--	}
--	if (skip_pad_test(t, state, ch,
--		"(clear) Start clear-screen performance test")) {
--		return;
--	}
--	pad_test_startup(0);
--	repeats = 20;
--	do {
--		sprintf(temp, "%d", test_complete);
--		put_str(temp);
--		for (j = 0; j < repeats; j++) {
--			put_clear();
--		}
--	} while(still_testing());
--	pad_test_shutdown(t, 0);
--	j = sliding_scale(tx_count[0], 1000000, usec_run_time);
--	if (j > tty_clear_rate) {
--		tty_clear_rate = j;
--	}
--	sprintf(temp, "%d clear-screens per second.  ", j);
--	ptext(temp);
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	sync_summary(test_list, status, ch)
--**
--**	Print out the test results.
--*/
--static void
--sync_summary(
--	struct test_list *t,
--	int *state,
--	int *ch)
--{
--	char size[32];
--
--	put_crlf();
--	ptextln("Terminal  size    characters/sec linefeeds/sec  clears/sec");
--	sprintf(size, "%dx%d", columns, lines);
--	sprintf(temp, "%-10s%-11s%11lu   %11d %11d", tty_basename, size,
--		tty_cps, tty_newline_rate, tty_clear_rate);
--	ptextln(temp);
--	generic_done_message(t, state, ch);
--}
--
--/*
--**	sync_test(menu)
--**
--**	Run at the beginning of the pad tests and function key tests
--*/
--void
--sync_test(
--	struct test_menu *menu)
--{
--	control_init();
--	if (tty_can_sync == SYNC_NOT_TESTED) {
--		verify_time();
--	}
--	if (menu->menu_title) {
--		put_crlf();
--		ptextln(menu->menu_title);
--	}
--}
--
--/*
--**	sync_handshake(test_list, status, ch)
--**
--**	Test or retest the ENQ/ACK handshake
--*/
--void
--sync_handshake(
--	struct test_list *t GCC_UNUSED,
--	int *state GCC_UNUSED,
--	int *ch GCC_UNUSED)
--{
--	tty_can_sync = SYNC_NOT_TESTED;
--	verify_time();
--}
-diff -Naur ncurses-5.6.orig/tack/sysdep.c ncurses-5.6/tack/sysdep.c
---- ncurses-5.6.orig/tack/sysdep.c	2005-09-17 15:49:16.000000000 -0400
-+++ ncurses-5.6/tack/sysdep.c	1969-12-31 19:00:00.000000000 -0500
-@@ -1,504 +0,0 @@
--/*
--** Copyright (C) 1991, 1997 Free Software Foundation, Inc.
--** 
--** This file is part of TACK.
--** 
--** TACK is free software; you can redistribute it and/or modify
--** it under the terms of the GNU General Public License as published by
--** the Free Software Foundation; either version 2, or (at your option)
--** any later version.
--** 
--** TACK is distributed in the hope that it will be useful,
--** but WITHOUT ANY WARRANTY; without even the implied warranty of
--** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--** GNU General Public License for more details.
--** 
--** You should have received a copy of the GNU General Public License
--** along with TACK; see the file COPYING.  If not, write to
--** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
--** Boston, MA 02110-1301, USA
--*/
--/*
-- * Operating system dependent functions.  We assume the POSIX API.
-- * Note: on strict-POSIX systems (including BSD/OS) the select_delay_type
-- * global has no effect.
-- */
--
--#ifdef HAVE_CONFIG_H
--#include <ncurses_cfg.h>
--#endif
--#include <signal.h>	/* include before curses.h to work around glibc bug */
--
--#include <tack.h>
--
--#include <term.h>
--#include <errno.h>
--
--#if defined(__BEOS__)
--#undef false
--#undef true
--#include <OS.h>
--#endif
--
--#if HAVE_SELECT
--#if HAVE_SYS_TIME_H && HAVE_SYS_TIME_SELECT
--#include <sys/time.h>
--#endif
--#if HAVE_SYS_SELECT_H
--#include <sys/select.h>
--#endif
--#endif
--
--MODULE_ID("$Id: sysdep.c,v 1.15 2005/09/17 19:49:16 tom Exp $")
--
--#if DECL_ERRNO
--extern int errno;
--#endif
--
--#ifdef TERMIOS
--#define PUT_TTY(fd, buf) tcsetattr(fd, TCSAFLUSH, buf)
--#else
--#define PUT_TTY(fd, buf) stty(fd, buf)
--#endif
--
--/* globals */
--int tty_frame_size;		/* asynch frame size times 2 */
--unsigned tty_baud_rate;		/* baud rate - bits per second */
--int not_a_tty;			/* TRUE if output is not a tty (i.e. pipe) */
--int nodelay_read;		/* TRUE if NDELAY is set */
--
--#ifdef TERMIOS
--#define TTY_IS_NOECHO	!(new_modes.c_lflag & ECHO)
--#define TTY_IS_OUT_TRANS (new_modes.c_oflag & OPOST)
--#define TTY_IS_CHAR_MODE !(new_modes.c_lflag & ICANON)
--#define TTY_WAS_CS8 ((old_modes.c_cflag & CSIZE) == CS8)
--#define TTY_WAS_XON_XOFF (old_modes.c_iflag & (IXON|IXOFF))
--#else
--#define TTY_IS_NOECHO	!(new_modes.sg_flags & (ECHO))
--#define TTY_IS_OUT_TRANS (new_modes.sg_flags & (CRMOD))
--#define TTY_IS_CHAR_MODE (new_modes.sg_flags & (RAW|CBREAK))
--#define TTY_WAS_CS8	 (old_modes.sg_flags & (PASS8))
--#define TTY_WAS_XON_XOFF (old_modes.sg_flags & (TANDEM|MDMBUF|DECCTQ))
--#endif
--
--static TTY old_modes, new_modes;
--
--void catchsig(void);
--
--/*
-- * These are a sneaky way of conditionalizing bit unsets so strict-POSIX
-- * systems won't see them.
-- */
--#ifndef XCASE
--#define XCASE	0
--#endif
--#ifndef OLCUC
--#define OLCUC	0
--#endif
--#ifndef IUCLC
--#define IUCLC	0
--#endif
--#ifndef TABDLY
--#define	TABDLY	0
--#endif
--#ifndef IXANY
--#define	IXANY	0
--#endif
--
--void
--tty_raw(int minch GCC_UNUSED, int mask)
--{				/* set tty to raw noecho */
--	new_modes = old_modes;
--#ifdef TERMIOS
--#if HAVE_SELECT
--	new_modes.c_cc[VMIN] = 1;
--#else
--	new_modes.c_cc[VMIN] = minch;
--#endif
--	new_modes.c_cc[VTIME] = 2;
--	new_modes.c_lflag &=
--		~(ISIG | ICANON | XCASE | ECHO | ECHOE | ECHOK | ECHONL);
--#ifdef LOBLK
--	new_modes.c_lflag &= ~LOBLK;
--#endif
--	new_modes.c_oflag &= ~(OPOST | OLCUC | TABDLY);
--	if (mask == ALLOW_PARITY) {
--		new_modes.c_cflag &= ~(CSIZE | PARENB | HUPCL);
--		new_modes.c_cflag |= CS8;
--	}
--	new_modes.c_iflag &=
--		~(IGNBRK | BRKINT | IGNPAR | PARMRK | INPCK | ISTRIP | INLCR | IGNCR | ICRNL |
--		IUCLC | IXON | IXANY | IXOFF);
--#else
--	new_modes.sg_flags |= RAW;
--#endif
--	if (not_a_tty)
--		return;
--	PUT_TTY(fileno(stdin), &new_modes);
--}
--
--void 
--tty_set(void)
--{				/* set tty to special modes */
--	new_modes = old_modes;
--#ifdef TERMIOS
--	new_modes.c_cc[VMIN] = 1;
--	new_modes.c_cc[VTIME] = 1;
--	new_modes.c_lflag &= ~(ISIG | ICANON | ECHO | ECHOE | ECHOK | ECHONL);
--#if defined(ONLCR) && defined(OCRNL) && defined(ONLRET) && defined(OFILL)
--	new_modes.c_oflag &= ~(ONLCR | OCRNL | ONLRET | OFILL);
--#else
--	new_modes.c_oflag &= ~(OPOST);
--#endif
--	if (char_mask == ALLOW_PARITY)
--		new_modes.c_iflag &= ~ISTRIP;
--	switch (select_xon_xoff) {
--	case 0:
--		new_modes.c_iflag &= ~(IXON | IXOFF);
--		break;
--	case 1:
--#if defined(sequent) && sequent
--		/* the sequent System V emulation is broken */
--		new_modes = old_modes;
--		new_modes.c_cc[VEOL] = 6;	/* control F  (ACK) */
--#endif
--		new_modes.c_iflag |= IXON | IXOFF;
--		break;
--	}
--	switch (select_delay_type) {
--	case 0:
--#ifdef NLDLY
--		new_modes.c_oflag &=
--			~(NLDLY | CRDLY | TABDLY | BSDLY | VTDLY | FFDLY);
--#endif	/* NLDLY */
--		break;
--	case 1:
--#ifdef NLDLY
--		new_modes.c_oflag &=
--			~(NLDLY | CRDLY | TABDLY | BSDLY | VTDLY | FFDLY);
--#endif	/* NLDLY */
--#ifdef NL1
--		new_modes.c_oflag |= NL1 | CR2;
--#endif	/* NL1 */
--		break;
--	}
--	if (!(new_modes.c_oflag & (unsigned long) ~OPOST))
--		new_modes.c_oflag &= (unsigned long) ~OPOST;
--#else
--	new_modes.sg_flags |= RAW;
--	if (not_a_tty)
--		return;
--#endif
--	PUT_TTY(fileno(stdin), &new_modes);
--}
--
--
--void 
--tty_reset(void)
--{				/* reset the tty to the original modes */
--	fflush(stdout);
--	if (not_a_tty)
--		return;
--	PUT_TTY(fileno(stdin), &old_modes);
--}
--
--
--void 
--tty_init(void)
--{				/* ATT terminal init */
--#if defined(F_GETFL) && defined(O_NDELAY)
--	int flags;
--
--	flags = fcntl(fileno(stdin), F_GETFL, 0);
--	nodelay_read = flags & O_NDELAY;
--#else
--	nodelay_read = FALSE;
--#endif
--	not_a_tty = FALSE;
--	if (GET_TTY(fileno(stdin), &old_modes) == -1) {
--		if (errno == ENOTTY) {
--			tty_frame_size = 20;
--			not_a_tty = TRUE;
--			return;
--		}
--		printf("tcgetattr error: %d\n", errno);
--		exit(1);
--	}
--	/* if TAB3 is set then setterm() wipes out tabs (ht) */
--	new_modes = old_modes;
--#ifdef TERMIOS
--#ifdef TABDLY
--	new_modes.c_oflag &= ~TABDLY;
--#endif	/* TABDLY */
--#endif
--	if (PUT_TTY(fileno(stdin), &new_modes) == -1) {
--		printf("tcsetattr error: %d\n", errno);
--		exit(1);
--	}
--#ifdef sequent
--	/* the sequent ATT emulation is broken soooo. */
--	old_modes.c_cflag &= ~(CSIZE | CSTOPB);
--	old_modes.c_cflag |= CS7 | PARENB;
--#endif
--	catchsig();
--#ifdef TERMIOS
--	switch (old_modes.c_cflag & CSIZE) {
--#if defined(CS5) && (CS5 != 0)
--	case CS5:
--		tty_frame_size = 10;
--		break;
--#endif
--#if defined(CS6) && (CS6 != 0)
--	case CS6:
--		tty_frame_size = 12;
--		break;
--#endif
--#if defined(CS7) && (CS7 != 0)
--	case CS7:
--		tty_frame_size = 14;
--		break;
--#endif
--#if defined(CS8) && (CS8 != 0)
--	case CS8:
--		tty_frame_size = 16;
--		break;
--#endif
--	}
--	tty_frame_size += 2 +
--		((old_modes.c_cflag & PARENB) ? 2 : 0) +
--		((old_modes.c_cflag & CSTOPB) ? 4 : 2);
--#else
--	tty_frame_size = 6 +
--		(old_modes.sg_flags & PASS8) ? 16 : 14;
--#endif
--}
--
--/*
--**	stty_query(question)
--**
--**	Does the current driver settings have this property?
--*/
--int
--stty_query(int q)
--{
--	switch (q) {
--		case TTY_NOECHO:
--		return TTY_IS_NOECHO;
--	case TTY_OUT_TRANS:
--		return TTY_IS_OUT_TRANS;
--	case TTY_CHAR_MODE:
--		return TTY_IS_CHAR_MODE;
--	}
--	return (-1);
--}
--
--/*
--**	initial_stty_query(question)
--**
--**	Did the initial driver settings have this property?
--*/
--int
--initial_stty_query(int q)
--{
--	switch (q) {
--	case TTY_8_BIT:
--		return TTY_WAS_CS8;
--	case TTY_XON_XOFF:
--		return TTY_WAS_XON_XOFF;
--	}
--	return (-1);
--}
--
--#if HAVE_SELECT && defined(FD_ZERO)
--static int
--char_ready(void)
--{
--	int n;
--	fd_set ifds;
--	struct timeval tv;
--
--	FD_ZERO(&ifds);
--	FD_SET(fileno(stdin), &ifds);
--	tv.tv_sec = 0;
--	tv.tv_usec = 200000;
--	n = select(fileno(stdin)+1, &ifds, NULL, NULL, &tv);
--	return (n != 0);
--}
--
--#else
--#ifdef FIONREAD
--int
--char_ready(void)
--{
--	int i, j;
--
--	/* the following loop has to be tuned for each computer */
--	for (j = 0; j < 1000; j++) {
--		ioctl(fileno(stdin), FIONREAD, &i);
--		if (i)
--			return i;
--	}
--	return i;
--}
--
--#else
--#if defined(__BEOS__)
--int
--char_ready(void)
--{
--	int n = 0;
--	int howmany = ioctl(0, 'ichr', &n);
--	return (howmany >= 0 && n > 0);
--}
--#else
--#define char_ready() 1
--#endif
--#endif
--#endif
--
--/*
--**	spin_flush()
--**
--**	Wait for the input stream to stop.
--**	Throw away all input characters.
--*/
--void
--spin_flush(void)
--{
--	unsigned char buf[64];
--
--	fflush(stdout);
--	event_start(TIME_FLUSH);	/* start the timer */
--	do {
--		if (char_ready()) {
--			(void) read(fileno(stdin), &buf, sizeof(buf));
--		}
--	} while (event_time(TIME_FLUSH) < 400000);
--}
--
--/*
--**	read_key(input-buffer, length-of-buffer)
--**
--**	read one function key from the input stream.
--**	A null character is converted to 0x80.
--*/
--void 
--read_key(char *buf, int max)
--{
--	int got, ask, i, l;
--	char *s;
--
--	*buf = '\0';
--	s = buf;
--	fflush(stdout);
--	/* ATT unix may return 0 or 1, Berkeley Unix should be 1 */
--	while (read(fileno(stdin), s, 1) == 0);
--	++s;
--	--max;
--	while (max > 0 && (ask = char_ready())) {
--		if (ask > max) {
--			ask = max;
--		}
--		if ((got = read(fileno(stdin), s, (unsigned) ask))) {
--			s += got;
--		} else {
--			break;
--		}
--		max -= got;
--	}
--	*s = '\0';
--	l = s - buf;
--	for (s = buf, i = 0; i < l; i++) {
--		if ((*s & 0x7f) == 0) {
--			/* convert nulls to 0x80 */
--			*(unsigned char *)s = 128;
--		} else {
--			/* strip high order bits (if any) */
--			*s &= char_mask;
--		}
--	}
--}
--
--
--void 
--ignoresig(void)
--{
--	/* ignore signals */
--	signal(SIGINT, SIG_IGN);
--	signal(SIGHUP, SIG_IGN);
--	signal(SIGQUIT, SIG_IGN);
--	signal(SIGTERM, SIG_IGN);
--	signal(SIGALRM, SIG_IGN);
--}
--
-- /*
--    onintr( )
-- 
-- is the interrupt handling routine onintr turns off interrupts while doing
--    clean-up
-- 
-- onintr always exits fatally
-- */
--
--
--static RETSIGTYPE 
--onintr(int sig GCC_UNUSED)
--{
--	ignoresig();
--	tty_reset();
--	exit(1);
--}
--
--
-- /*
--    catchsig( )
-- 
-- set up to field interrupts (via function onintr( )) so that if interrupted
--    we can restore the correct terminal modes
-- 
-- catchsig simply returns
-- */
--
--
--void 
--catchsig(void)
--{
--	if ((signal(SIGINT, SIG_IGN)) == SIG_DFL)
--		signal(SIGINT, onintr);
--
--	if ((signal(SIGHUP, SIG_IGN)) == SIG_DFL)
--		signal(SIGHUP, onintr);
--
--	if ((signal(SIGQUIT, SIG_IGN)) == SIG_DFL)
--		signal(SIGQUIT, onintr);
--
--	if ((signal(SIGTERM, SIG_IGN)) == SIG_DFL)
--		signal(SIGTERM, onintr);
--
--}
--
--/*
--**	alarm_event(sig)
--**
--**	Come here for an alarm event
--*/
--static void
--alarm_event(
--	int sig GCC_UNUSED)
--{
--	no_alarm_event = 0;
--}
--
--/*
--**	set_alarm_clock(seconds)
--**
--**	Set the alarm clock to fire in <seconds>
--*/
--void
--set_alarm_clock(
--	int seconds)
--{
--	signal(SIGALRM, alarm_event);
--	no_alarm_event = 1;
--	(void) alarm((unsigned) seconds);
--}
-diff -Naur ncurses-5.6.orig/tack/tack.1 ncurses-5.6/tack/tack.1
---- ncurses-5.6.orig/tack/tack.1	2006-04-22 18:26:55.000000000 -0400
-+++ ncurses-5.6/tack/tack.1	1969-12-31 19:00:00.000000000 -0500
-@@ -1,340 +0,0 @@
--.\"***************************************************************************
--.\" Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
--.\"                                                                          *
--.\" Permission is hereby granted, free of charge, to any person obtaining a  *
--.\" copy of this software and associated documentation files (the            *
--.\" "Software"), to deal in the Software without restriction, including      *
--.\" without limitation the rights to use, copy, modify, merge, publish,      *
--.\" distribute, distribute with modifications, sublicense, and/or sell       *
--.\" copies of the Software, and to permit persons to whom the Software is    *
--.\" furnished to do so, subject to the following conditions:                 *
--.\"                                                                          *
--.\" The above copyright notice and this permission notice shall be included  *
--.\" in all copies or substantial portions of the Software.                   *
--.\"                                                                          *
--.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
--.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
--.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
--.\" IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
--.\" DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
--.\" OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
--.\" THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
--.\"                                                                          *
--.\" Except as contained in this notice, the name(s) of the above copyright   *
--.\" holders shall not be used in advertising or otherwise to promote the     *
--.\" sale, use or other dealings in this Software without prior written       *
--.\" authorization.                                                           *
--.\"***************************************************************************
--.\"
--.\" $Id: tack.1,v 1.3 2006/04/22 22:26:55 tom Exp $
--.TH tack 1M ""
--.ds n 5
--.ds d @TERMINFO@
--.SH NAME
--\fBtack\fR - \fIterminfo\fR action checker
--.SH SYNOPSIS
--\fBtack\fR [-itV] [term]
--.br
--.SH DESCRIPTION
--The \fBtack\fR program has three purposes:
--(1) to help you build a new terminfo entry describing an unknown terminal,
--(2) to test the correctness of an existing entry, and
--(3) to develop the correct pad timings needed to ensure that screen updates
--don't fall behind the incoming data stream.
--.PP
--\fBTack\fR presents a series of screen-painting and interactive
--tests in ways which are intended to make any mismatches between the
--terminfo entry and reality visually obvious. 
--\fBTack\fR also provides tools that can help in understanding how
--the terminal operates.
--.SS OPTIONS
--.TP
--.I "\-i"
--Usually \fBtack\fR will send the reset and init strings to the terminal
--when the program starts up.  The \fI-i\fR option will inhibit the
--terminal initialization.
--.TP
--.I "\-t"
--Tell \fBtack\fR to override the terminfo settings for basic terminal
--functions.  When this option is set \fBtack\fR will translate
--(cr) to \\r, (cud1) to \\n, (ind) to \\n, (nel) to \\r\\n,
--(cub1) to \\b, (bel) to \\007, (ff) to \\f and (ht) to \\t.
--.TP
--.I "\-V"
--Display the version information and exit.
--.TP
--.I "term"
--Terminfo terminal name to be tested.  If not present then the $TERM
--environment variable will be used.
--.SH OVERVIEW
--Since \fBtack\fR is designed to test terminfo's it is not possible
--to rely on the correctness of the terminfo data base.  Because of this
--the menuing system used with \fBtack\fR is vary primitive.  When a
--menu is printed it will scroll the entire screen.  To compensate
--for this verbose menu system \fBtack\fR permits menu selection
--type ahead.
--If you already know what action you would like \fBtack\fR to perform
--then you can enter that value immediately and avoid the menu display.
--When in doubt the question mark (?) is a good character to type.
--A carriage return will execute the default action.  These default
--actions are designed to run all the standard tests.
--.PP
--When \fBtack\fR first comes up it will display some basic information
--about the terminal.  Take some time to verify this information.
--If it is wrong many of the subsequent tests will fail.  The most
--important item is the screen size.  If the screen size is wrong there
--is no point in proceeding.  (home) and (clear) are also critical
--to the success of subsequent tests.  The values of (cr) (ind)
--(cub1) and (ht) may effect the tests if they are defined incorrectly.
--If they are undefined \fBtack\fR will set them to reasonable defaults.
--The last two entries on the display are the enquire and acknowledge strings.
--These strings are taken from the user strings (u9) and (u8).
--.PP
--By now you must be wondering why the terminfo names are enclosed
--in parenthesis.  This has no profound meaning other than it makes
--them stand out.  The \fBtack\fR program uses this convention any time
--it displays a terminfo name.  Remember \fBtack\fR is designed to
--rely on as little of the terminfo entry as possible.
--.SH CREATING NEW ENTRIES
--\fBTack\fR has a number of tools that are designed to help gather
--information about the terminal.  Although these functions are not
--dependent on terminal type, you may wish to execute \fBtack\fR
--with options \fI\-it\fR.  This will turn off initialization
--and default the standard entries.
--.PP
--These tools may be reached from the main menu by selecting
--the 'tools' entry.
--.PP
--\fBEcho tool\fR:  All data typed from the keyboard will be echoed back
--to the terminal.  Control characters are not translated to the up arrow format
--but are sent as control characters.  This allows you to test an escape
--sequence and see what it actually does.  You may also elect to
--\fBenable hex output on echo tool\fR this will echo the characters in
--hexadecimal.  Once the test is running you may enter the 'lines'
--or 'columns' keywords which will display a pattern that will help
--you determine your screen size.  A complete list of keywords will
--be displayed when the test starts.  Type 'help' to redisplay
--the list of available commands.
--.PP
--\fBReply tool\fR:  This tool acts much like the echo tool, but
--control characters that are sent from the terminal more than one character
--after a carriage return will be expanded to the up arrow format.  For example
--on a standard ANSI terminal you may type:
--
--		CR ESC [ c
--
--and the response will be echoed as something like:
--
--		^[ [ ? 6 c
--.PP
--\fBANSI sgr display\fR:  This test assumes you have an ANSI terminal.  It
--goes through attribute numbers 0 to 79, displaying each in turn and using that
--SGR number to write the text.  This shows you which of the SGR
--modes are actually implemented by the terminal.  Note: some terminals (such as
--Tektronix color) use the private use characters to augment the functionality of
--the SGR command.  These private use characters may be interjected into the
--escape sequence by typing the character ( <, =, >, ? ) after the original
--display has been shown.
--.PP
--\fBANSI status reports\fR:  This test queries the terminal in standard
--ANSI/VT-100 fashion.  The results of this test may help
--determine what options are supported by your terminal.
--.PP
--\fBANSI character sets\fR:  This test displays the character sets
--available on a ANSI/VT-100 style terminal.
--Character sets on a real VT-100 terminal are usually defined
--with smacs=\\E(0 and rmacs=\\E(B.  The first character after the
--escape defines the font bank.  The second character defines the
--character set.  This test allows you to view any of the possible
--combinations.  Private use character sets are defined by the digits.
--Standard character sets are located in the alphabetic range.
--.SH VERIFYING AN EXISTING ENTRY
--.PP
--You can verify the correctness of an entry with the `begin testing'
--function.  This entry is the default action and will be chosen
--if you hit carriage return (or enter).  This will bring up a
--secondary menu that allows you to select more specific tests.
--.PP
--The general philosophy of the program is, for each capability, to send an
--appropriate test pattern to the terminal then send a description of
--what the user should expect.  Occasionally (as when checking function-key
--capabilities) the program will ask you to enter input for it to check.
--.PP
--If the test fails then you have the option of dynamically changing
--the terminfo entry and re-running the test.  This is done with
--the 'edit terminfo' menu item.  The edit submenu allows you to change
--the offending terminfo entry and immediately retest the capability.
--The edit menu lets you do other things with the terminfo, such as;
--display the entire terminfo entry,
--display which caps have been tested and display which caps cannot
--be tested.  This menu also allows you to write the newly modified
--terminfo to disc.  If you have made any modifications to the
--terminfo \fBtack\fR will ask you if you want to save the file
--to disc before it exits.  The filename will be the same as the terminal name.
--After the program exits you can run the tic(1M) compiler on the
--new terminfo to install it in the terminfo data base.
--.PP
--.SH CORRECTING PAD TIMINGS
--.SS Theory of Overruns and Padding
--.PP
--Some terminals require significant amounts of time (that is, more than one
--transmitted-character interval) to do screen updates that change large
--portions of the screen, such as screen clears, line insertions,
--line deletions, and scrolls (including scrolls triggered by line feeds
--or a write to the lowest, right-hand-most cell of the screen).
--.PP
--If the computer continues to send characters to the terminal while one
--of these time-consuming operations is going on, the screen may be garbled.
--Since the length of a character transmission time varies inversely with
--transmission speed in cps, entries which function at lower speeds may
--break at higher speeds.
--.PP
--Similar problems result if the host machine is simply sending characters at a
--sustained rate faster than the terminal can buffer and process them.  In either
--case, when the terminal cannot process them and can't tell the host to stop
--soon enough, it will just drop them.  The dropped characters could be text,
--escape sequences or the escape character itself, causing some really
--strange-looking displays.  This kind of glitch is called an \fIoverrun\fR.
--.PP
--In terminfo entries, you can attach a \fBpad time\fR to each string capability
--that is a number of milliseconds to delay after sending it.  This will give
--the terminal time to catch up and avoid overruns.
--.PP
--If you are running a software terminal emulator, or you are on an X pseudo-tty,
--or your terminal is on an RS-232C line which correctly handles RTS/CTS
--hardware flow control, then pads are not strictly necessary.  However, some
--display packages (such as ncurses(3X)) use the pad counts to calculate
--the fastest way to implement certain functions.
--For example: scrolling the screen may be faster than deleting the top line.
--.PP
--One common way to avoid overruns is with XON/XOFF handshaking.
--But even this handshake may have problems at high baud rates.
--This is a result of the way XON/XOFF works.  The terminal tells
--the host to stop with an XOFF.  When the host gets this character, it stops
--sending.  However, there is a small amount of time between the stop request and
--the actual stop.  During this window, the terminal must continue to accept
--characters even though it has told the host to stop.  If the terminal sends
--the stop request too late, then its internal buffer will overflow.  If it sends
--the stop character too early, then the terminal is not getting the most
--efficient use out of its internal buffers.  In a real application at high baud
--rates, a terminal could get a dozen or more characters before the host gets
--around to suspending transmission.  Connecting the terminal over a network
--will make the problem much worse.
--.PP
--(RTS/CTS handshaking does not have this problem because the UARTs are
--signal-connected and the "stop flow" is done at the lowest level, without
--software intervention).
--.PP
--.SS Timing your terminal
--.PP
--In order to get accurate timings from your terminal \fBtack\fR 
--needs to know when the terminal has finished processing all the
--characters that were sent.  This requires a different type of handshaking
--than the XON/XOFF that is supported by most terminals.  \fBTack\fR
--needs to send a request to the terminal and wait for its reply.
--Many terminals will respond with an ACK when they receive an ENQ.
--This is the preferred method since the sequence is short.
--ANSI/VT-100 style terminals can mimic this handshake with the
--escape sequence that requests 'primary device attributes'.
--
--   ESC [ c
--
--The terminal will respond with a sequence like:
--
--   ESC [ ? 1 ; 0 c
--
--\fBTack\fR assumes that (u9) is the enquire sequence and that (u8) is the
--acknowledge string.  A VT-100 style terminal could set u9=\\E[c
--and u8=\\E[?1;0c.
--Acknowledge strings fall into two categories. 
--1) Strings with a unique terminating character and,
--2) strings of fixed length.
--The acknowledge string for the VT-100 is of the first type since
--it always ends with the letter 'c'.  Some Tektronics terminals
--have fixed length acknowledge strings.  \fBTack\fR supports both
--types of strings by scanning for the terminating character until
--the length of the expected acknowledge string has arrived.
--(u8) should be set to some typical acknowledge that will be
--returned when (u9) is sent.
--.PP
--\fBTack\fR will test this sequence before running any of the pad
--tests or the function key tests.  \fBTack\fR will ask you the following:
--
--    Hit lower case g to start testing...
--
--After it sends this message it will send the enquire string.
--It will then read characters from the terminal until it sees the
--letter g.
--.PP
--.SS Testing and Repairing Pad Timings
--.PP
--The pad timings in distributed terminfo entries are often incorrect.  One
--major motivation for this program is to make it relatively easy to tune these
--timings.
--.PP
--You can verify and edit the pad timings for a terminal with
--the `test string capabilities'
--function (this is also part of the `normal test sequence' function).
--.PP
--The key to determining pad times is to find out the effective baud rate of
--the terminal.  The effective baud rate determines the number of characters
--per second that the terminal can accept without either handshaking or
--losing data.  This rate is frequently less than the nominal cps rate on the
--RS-232 line.
--.PP
--\fBTack\fR uses the effective baud rate to judge the duration of the test and
--how much a particular escape sequence will perturb the terminal.
--.PP
--Each pad test has two associated variables that can be tweaked to help verify
--the correctness of the pad timings.  One is the pad test length.  The other is
--the pad multiplier, which is used if the pad prefix includes `*'.  In curses
--use, it is often the first parameter of the capability (if there is one).
--For a capability like (dch) or (il) this will be the number of character
--positions or lines affected, respectively.
--.PP
--\fBTack\fR will run the pad tests and display the results to the terminal.
--On capabilities that have multipliers \fBtack\fR will not tell you
--if the pad needs the multiplier or not.  You must make this decision
--yourself by rerunning the test with a different multiplier.
--If the padding changes in proportion to the multiplier than the
--multiplier is required.  If the multiplier has little or no effect on
--the suggested padding then the multiplier is not needed.
--Some capabilities will take several runs to get a good feel for
--the correct values.  You may wish to make the test longer
--to get more accurate results.  System load will also effect the
--results (a heavily loaded system will not stress the
--terminal as much, possibly leading to pad timings that are too short).
--.PP
--.SH NOTE
--The tests done at the beginning of the program are assumed to be correct later
--in the code.  In particular, \fBtack\fR displays the number of lines and
--columns indicated in the terminfo entry as part of its initial output.
--If these values are wrong a large number of tests will fail or give incorrect
--results.
--.SH FILES
--.TP 12
--tack.log
--If logging is enabled then all characters written to the terminal
--will also be written to the log file.  This gives you the ability
--to see how the tests were performed.  This feature is disabled by default.
--.TP 12
--.I "term"
--If you make changes to the terminfo entry \fBtack\fR will save
--the new terminfo to a file.  The file will have the same name
--as the terminal name.
--.SH SEE ALSO
--\fBterminfo\fR(\*n), \fBncurses\fR(3X), \fBtic\fR(1M), \fBinfocmp\fR(1M).
--You should also have the documentation supplied by the terminal
--manufacturer.
--.SH BUGS
--If the screen size is incorrect, many of the tests will fail.
--.SH AUTHOR
--Concept, design, and original implementation by
--Daniel Weaver <danw@znyx.com>.  Portions of the code and
--documentation are by Eric S. Raymond <esr@snark.thyrsus.com>.
--.\"#
--.\"# The following sets edit modes for GNU EMACS
--.\"# Local Variables:
--.\"# mode:nroff
--.\"# fill-column:79
--.\"# End:
-diff -Naur ncurses-5.6.orig/tack/tack.c ncurses-5.6/tack/tack.c
---- ncurses-5.6.orig/tack/tack.c	2005-09-17 15:49:16.000000000 -0400
-+++ ncurses-5.6/tack/tack.c	1969-12-31 19:00:00.000000000 -0500
-@@ -1,603 +0,0 @@
--/*
--** Copyright (C) 1991, 1997 Free Software Foundation, Inc.
--** 
--** This file is part of TACK.
--** 
--** TACK is free software; you can redistribute it and/or modify
--** it under the terms of the GNU General Public License as published by
--** the Free Software Foundation; either version 2, or (at your option)
--** any later version.
--** 
--** TACK is distributed in the hope that it will be useful,
--** but WITHOUT ANY WARRANTY; without even the implied warranty of
--** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--** GNU General Public License for more details.
--** 
--** You should have received a copy of the GNU General Public License
--** along with TACK; see the file COPYING.  If not, write to
--** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
--** Boston, MA 02110-1301, USA
--*/
--
--#include <tack.h>
--
--MODULE_ID("$Id: tack.c,v 1.4 2005/09/17 19:49:16 tom Exp $")
--
--/*
--   This program is designed to test terminfo, not curses.  Therefore
--   I have used as little of curses as possible.
--
--   Pads associated with the following capabilities are used to set
--   delay times in the handler:  (cr), (ind), (cub1), (ff), (tab).
--
--   I use the (nxon) capability to set the tty handler with/without
--   xon/xoff.  If (smxon)/(rmxon) is defined I will change the terminal
--   too.
--
--   (xon) inhibits the sending of delay characters in putp().
--   If the terminal is defined with no padding then the (xon) boolean
--   is a don't care.  In this case I recommend that it be reset.
-- */
--
--/*****************************************************************************
-- *
-- * Option processing
-- *
-- *****************************************************************************/
--
--/* options and modes */
--int debug_level;		/* debugging level */
--int translate_mode;		/* translate tab, bs, cr, lf, ff */
--int scan_mode;			/* use scan codes */
--int char_mask;			/* either 0xFF else 0x7F, eight bit data mask */
--int select_delay_type;		/* set handler delays for <cr><lf> */
--int select_xon_xoff;		/* TTY driver XON/XOFF mode select */
--int hex_out;			/* Display output in hex */
--int send_reset_init;		/* Send the reset and initialization strings */
--FILE *log_fp;			/* Terminal logfile */
--
--/*****************************************************************************
-- *
-- * Menu definitions
-- *
-- *****************************************************************************/
--
--static void tools_hex_echo(struct test_list *, int *, int *);
--static void tools_debug(struct test_list *, int *, int *);
--
--static char hex_echo_menu_entry[80];
--
--static struct test_list tools_test_list[] = {
--	{0, 0, 0, 0, "s) ANSI status reports", tools_status, 0},
--	{0, 0, 0, 0, "g) ANSI SGR modes (bold, underline, reverse)", tools_sgr, 0},
--	{0, 0, 0, 0, "c) ANSI character sets", tools_charset, 0},
--	{0, 0, 0, 0, hex_echo_menu_entry, tools_hex_echo, 0},
--	{0, 0, 0, 0, "e) echo tool", tools_report, 0},
--	{1, 0, 0, 0, "r) reply tool", tools_report, 0},
--	{0, 0, 0, 0, "p) performance testing", 0, &sync_menu},
--	{0, 0, 0, 0, "i) send reset and init", menu_reset_init, 0},
--	{0, 0, "u8) (u9", 0, "u) test ENQ/ACK handshake", sync_handshake, 0},
--	{0, 0, 0, 0, "d) change debug level", tools_debug, 0},
--	{MENU_LAST, 0, 0, 0, 0, 0, 0}
--};
--
--static struct test_menu tools_menu = {
--	0, 'q', 0, "Tools Menu", "tools",
--	0, 0, tools_test_list, 0, 0, 0
--};
--
--static void tty_width(struct test_list *, int *, int *);
--static void tty_delay(struct test_list *, int *, int *);
--static void tty_xon(struct test_list *, int *, int *);
--static void tty_trans(struct test_list *, int *, int *);
--static void tty_show_state(struct test_menu *);
--
--static char tty_width_menu[80];
--static char tty_delay_menu[80];
--static char tty_xon_menu[80];
--static char tty_trans_menu[80];
--static char enable_xon_xoff[] = {"x) enable xon/xoff"};
--static char disable_xon_xoff[] = {"x) disable xon/xoff"};
--
--static struct test_list tty_test_list[] = {
--	{0, 0, 0, 0, tty_width_menu, tty_width, 0},
--	{0, 0, 0, 0, tty_delay_menu, tty_delay, 0},
--	{0, 0, 0, 0, tty_xon_menu, tty_xon, 0},
--	{0, 0, 0, 0, tty_trans_menu, tty_trans, 0},
--	{MENU_LAST, 0, 0, 0, 0, 0, 0}
--};
--
--static struct test_menu tty_menu = {
--	0, 'q', 0, "Terminal and driver configuration",
--	"tty", 0,
--	tty_show_state, tty_test_list, 0, 0, 0
--};
--
--struct test_menu edit_menu = {
--	0, 'q', 0, "Edit terminfo menu",
--	"edit", 0,
--	0, edit_test_list, 0, 0, 0
--};
--
--static struct test_menu mode_menu = {
--	0, 'n', 0, "Test modes and glitches:",
--	"mode", "n) run standard tests",
--	0, mode_test_list, 0, 0, 0
--};
--
--static struct test_menu acs_menu = {
--	0, 'n', 0,
--	"Test alternate character set and graphics rendition:",
--	"acs", "n) run standard tests",
--	0, acs_test_list, 0, 0, 0
--};
--
--static struct test_menu color_menu = {
--	0, 'n', 0,
--	"Test color:",
--	"color", "n) run standard tests",
--	0, color_test_list, 0, 0, 0
--};
--
--static struct test_menu crum_menu = {
--	0, 'n', 0,
--	"Test cursor movement:",
--	"move", "n) run standard tests",
--	0, crum_test_list, 0, 0, 0
--};
--
--static struct test_menu funkey_menu = {
--	0, 'n', 0,
--	"Test function keys:",
--	"fkey", "n) run standard tests",
--	sync_test, funkey_test_list, 0, 0, 0
--};
--
--static struct test_menu printer_menu = {
--	0, 'n', 0,
--	"Test printer:",
--	"printer", "n) run standard tests",
--	0, printer_test_list, 0, 0, 0
--};
--
--static void pad_gen(struct test_list *, int *, int *);
--
--static struct test_menu pad_menu = {
--	0, 'n', 0,
--	"Test padding and string capabilities:",
--	"pad", "n) run standard tests",
--	sync_test, pad_test_list, 0, 0, 0
--};
--
--static struct test_list normal_test_list[] = {
--	{0, 0, 0, 0, "e) edit terminfo", 0, &edit_menu},
--	{0, 0, 0, 0, "i) send reset and init", menu_reset_init, 0},
--	{MENU_NEXT, 0, 0, 0, "x) test modes and glitches", 0, &mode_menu},
--	{MENU_NEXT, 0, 0, 0, "a) test alternate character set and graphic rendition", 0, &acs_menu},
--	{MENU_NEXT, 0, 0, 0, "c) test color", 0, &color_menu},
--	{MENU_NEXT, 0, 0, 0, "m) test cursor movement", 0, &crum_menu},
--	{MENU_NEXT, 0, 0, 0, "f) test function keys", 0, &funkey_menu},
--	{MENU_NEXT, 0, 0, 0, "p) test padding and string capabilities", 0, &pad_menu},
--	{0, 0, 0, 0, "P) test printer", 0, &printer_menu},
--	{MENU_MENU, 0, 0, 0, "/) test a specific capability", 0, 0},
--	{0, 0, 0, 0, "t) auto generate pad delays", pad_gen, &pad_menu},
--	{0, 0, "u8) (u9", 0, 0, sync_handshake, 0},
--	{MENU_LAST, 0, 0, 0, 0, 0, 0}
--};
--
--
--static struct test_menu normal_menu = {
--	0, 'n', 0, "Main test menu",
--	"test", "n) run standard tests",
--	0, normal_test_list, 0, 0, 0
--};
--
--static void start_tools(struct test_list *, int *, int *);
--static void start_modes(struct test_list *, int *, int *);
--static void start_basic(struct test_list *, int *, int *);
--static void start_log(struct test_list *, int *, int *);
--
--static char logging_menu_entry[80] = "l) start logging";
--
--static struct test_list start_test_list[] = {
--	{0, 0, 0, 0, "b) display basic information", start_basic, 0},
--	{0, 0, 0, 0, "m) change modes", start_modes, 0},
--	{0, 0, 0, 0, "t) tools", start_tools, 0},
--	{MENU_COMPLETE, 0, 0, 0, "n) begin testing", 0, &normal_menu},
--	{0, 0, 0, 0, logging_menu_entry, start_log, 0},
--	{MENU_LAST, 0, 0, 0, 0, 0, 0}
--};
--	
--
--static struct test_menu start_menu = {
--	0, 'n', 0, "Main Menu", "tack", 0,
--	0, start_test_list, 0, 0, 0
--};
--
--static struct test_list write_terminfo_list[] = {
--	{0, 0, 0, 0, "w) write the current terminfo to a file", save_info, 0},
--	{MENU_LAST, 0, 0, 0, 0, 0, 0}
--};
--
--/*****************************************************************************
-- *
-- * Menu command interpretation.
-- *
-- *****************************************************************************/
--
--/*
--**	tools_hex_echo(testlist, state, ch)
--**
--**	Flip the hex echo flag.
--*/
--static void
--tools_hex_echo(
--	struct test_list *t GCC_UNUSED,
--	int *state GCC_UNUSED,
--	int *ch GCC_UNUSED)
--{
--	if (hex_out) {
--		hex_out = FALSE;
--		strcpy(hex_echo_menu_entry,
--			"h) enable hex output on echo tool");
--	} else {
--		hex_out = TRUE;
--		strcpy(hex_echo_menu_entry,
--			"h) disable hex output on echo tool");
--	}
--}
--
--/*
--**	tools_debug(testlist, state, ch)
--**
--**	Change the debug level.
--*/
--static void
--tools_debug(
--	struct test_list *t GCC_UNUSED,
--	int *state GCC_UNUSED,
--	int *ch)
--{
--	char buf[32];
--
--	ptext("Enter a new value: ");
--	read_string(buf, sizeof(buf));
--	if (buf[0]) {
--		sscanf(buf, "%d", &debug_level);
--	}
--	sprintf(temp, "Debug level is now %d", debug_level);
--	ptext(temp);
--	*ch = REQUEST_PROMPT;
--}
--
--/*
--**	start_tools(testlist, state, ch)
--**
--**	Run the generic test tools
--*/
--static void
--start_tools(
--	struct test_list *t GCC_UNUSED,
--	int *state GCC_UNUSED,
--	int *ch GCC_UNUSED)
--{
--	if (hex_out) {
--		strcpy(hex_echo_menu_entry,
--			"h) disable hex output on echo tool");
--	} else {
--		strcpy(hex_echo_menu_entry,
--			"h) enable hex output on echo tool");
--	}
--	menu_display(&tools_menu, 0);
--}
--
--/*
--**	tty_show_state()
--**
--**	Display the current state on the tty driver settings
--*/
--static void
--tty_show_state(
--	struct test_menu *menu GCC_UNUSED)
--{
--	put_crlf();
--	(void) sprintf(temp,
--		"Accepting %d bits, UNIX delays %d, XON/XOFF %sabled, speed %u, translate %s, scan-code mode %s.",
--		(char_mask == ALLOW_PARITY) ? 8 : 7,
--		select_delay_type,
--		select_xon_xoff ? "en" : "dis",
--		tty_baud_rate,
--		translate_mode ? "on" : "off",
--		scan_mode ? "on" : "off");
--	ptextln(temp);
--	put_crlf();
--}
--
--/*
--**	tty_width(testlist, state, ch)
--**
--**	Change the character width
--*/
--static void
--tty_width(
--	struct test_list *t GCC_UNUSED,
--	int *state GCC_UNUSED,
--	int *ch GCC_UNUSED)
--{
--	if (char_mask == STRIP_PARITY) {
--		char_mask = ALLOW_PARITY;
--		strcpy(tty_width_menu, "7) treat terminal as 7-bit");
--	} else {
--		char_mask = STRIP_PARITY;
--		strcpy(tty_width_menu, "8) treat terminal as 8-bit");
--	}
--}
--
--/*
--**	tty_delay(testlist, state, ch)
--**
--**	Change the delay for <cr><lf> in the TTY driver
--*/
--static void
--tty_delay(
--	struct test_list *t GCC_UNUSED,
--	int *state GCC_UNUSED,
--	int *ch GCC_UNUSED)
--{
--	if (select_delay_type) {
--		select_delay_type = FALSE;
--		strcpy(tty_delay_menu,
--			"d) enable UNIX tty driver delays for <cr><lf>");
--	} else {
--		select_delay_type = TRUE;
--		strcpy(tty_delay_menu,
--			"d) disable UNIX tty driver delays for <cr><lf>");
--	}
--}
--
--/*
--**	tty_xon(testlist, state, ch)
--**
--**	Change the XON/XOFF flags in the TTY driver
--*/
--static void
--tty_xon(
--	struct test_list *t GCC_UNUSED,
--	int *state GCC_UNUSED,
--	int *ch GCC_UNUSED)
--{
--	if (select_xon_xoff) {
--		if (needs_xon_xoff) {
--			ptextln("This terminal is marked as needing XON/XOFF protocol with (nxon)");
--		}
--		if (exit_xon_mode) {
--			tc_putp(exit_xon_mode);
--		}
--		xon_xoff = select_xon_xoff = FALSE;
--		strcpy(tty_xon_menu, enable_xon_xoff);
--	} else {
--		if (enter_xon_mode) {
--			tc_putp(enter_xon_mode);
--		}
--		xon_xoff = select_xon_xoff = TRUE;
--		strcpy(tty_xon_menu, disable_xon_xoff);
--	}
--	tty_set();
--}
--
--/*
--**	tty_trans(testlist, state, ch)
--**
--**	Change the translation mode for special characters
--*/
--static void
--tty_trans(
--	struct test_list *t GCC_UNUSED,
--	int *state GCC_UNUSED,
--	int *ch GCC_UNUSED)
--{
--	if (translate_mode) {
--		translate_mode = FALSE;
--		strcpy(tty_trans_menu,
--			"t) use terminfo values for \\b\\f\\n\\r\\t");
--	} else {
--		translate_mode = TRUE;
--		strcpy(tty_trans_menu,
--			"t) override terminfo values for \\b\\f\\n\\r\\t");
--	}
--}
--
--/*
--**	pad_gen(testlist, state, ch)
--**
--**	Menu function for automatic pad generation
--*/
--static void
--pad_gen(
--	struct test_list *t,
--	int *state GCC_UNUSED,
--	int *ch)
--{
--	control_init();
--	if (tty_can_sync == SYNC_NOT_TESTED) {
--		verify_time();
--	}
--	auto_pad_mode = TRUE;
--	menu_display(t->sub_menu, ch);
--	auto_pad_mode = FALSE;
--}
--
--/*
--**	start_modes(testlist, state, ch)
--**
--**	Change the TTY modes
--*/
--static void
--start_modes(
--	struct test_list *t GCC_UNUSED,
--	int *state GCC_UNUSED,
--	int *ch GCC_UNUSED)
--{
--
--	if (select_delay_type) {
--		strcpy(tty_delay_menu,
--			"d) disable UNIX tty driver delays for <cr><lf>");
--	} else {
--		strcpy(tty_delay_menu,
--			"d) enable UNIX tty driver delays for <cr><lf>");
--	}
--	if (char_mask == ALLOW_PARITY) {
--		strcpy(tty_width_menu,
--			"7) treat terminal as 7-bit");
--	} else {
--		strcpy(tty_width_menu,
--			"8) treat terminal as 8-bit");
--	}
--	if (select_xon_xoff) {
--		strcpy(tty_xon_menu, disable_xon_xoff);
--	} else {
--		strcpy(tty_xon_menu, enable_xon_xoff);
--	}
--	if (translate_mode) {
--		strcpy(tty_trans_menu,
--			"t) override terminfo values for \\b\\f\\n\\r\\t");
--	} else {
--		strcpy(tty_trans_menu,
--			"t) use terminfo values for \\b\\f\\n\\r\\t");
--	}
--	menu_display(&tty_menu, 0);
--	tty_set();
--}
--
--/*
--**	start_basic(testlist, state, ch)
--**
--**	Display basic terminal information
--*/
--static void
--start_basic(
--	struct test_list *t GCC_UNUSED,
--	int *state GCC_UNUSED,
--	int *ch)
--{
--	display_basic();
--	*ch = REQUEST_PROMPT;
--}
--
--/*
--**	start_log(testlist, state, ch)
--**
--**	Start/stop in logging function
--*/
--static void
--start_log(
--	struct test_list *t GCC_UNUSED,
--	int *state GCC_UNUSED,
--	int *ch GCC_UNUSED)
--{
--	if (logging_menu_entry[5] == 'a') {
--		ptextln("The log file will capture all characters sent to the terminal.");
--		if ((log_fp = fopen("tack.log", "w"))) {
--			ptextln("Start logging to file: tack.log");
--			strcpy(logging_menu_entry, "l) stop logging");
--		} else {
--			ptextln("File open error: tack.log");
--		}
--	} else {
--		if (log_fp) {
--			fclose(log_fp);
--			log_fp = 0;
--		}
--		ptextln("Terminal output logging stopped.");
--		strcpy(logging_menu_entry, "l) start logging");
--	}
--}
--
--/*
--**	show_usage()
--**
--**	Tell the user how its done.
--*/
--void
--show_usage(
--	char *name)
--{
--	(void) fprintf(stderr, "usage: %s [-itV] [term]\n", name);
--}
--
--/*
--**	print_version()
--**
--**	Print version and other useful information.
--*/
--void
--print_version(void)
--{
--	printf("tack version %d.%02d\n", MAJOR_VERSION, MINOR_VERSION);
--	printf("Copyright (C) 1997 Free Software Foundation, Inc.\n");
--	printf("Tack comes with NO WARRANTY, to the extent permitted by law.\n");
--	printf("You may redistribute copies of Tack under the terms of the\n");
--	printf("GNU General Public License.  For more information about\n");
--	printf("these matters, see the file named COPYING.\n");
--}
--
--
--/*****************************************************************************
-- *
-- * Main sequence
-- *
-- *****************************************************************************/
--
--int
--main(int argc, char *argv[])
--{
--	int i, j;
--	char *term_variable;
--
--	/* scan the option flags */
--	send_reset_init = TRUE;
--	translate_mode = FALSE;
--	term_variable = getenv("TERM");
--	tty_can_sync = SYNC_NOT_TESTED;
--	for (i = 1; i < argc; i++) {
--		if (argv[i][0] == '-') {
--			for (j = 1; argv[i][j]; j++) {
--				switch (argv[i][j]) {
--				case 'V':
--					print_version();
--					return (1);
--				case 'i':
--					send_reset_init = FALSE;
--					break;
--				case 't':
--					translate_mode = FALSE;
--					break;
--				default:
--					show_usage(argv[0]);
--					return (0);
--				}
--			}
--		} else {
--			term_variable = argv[i];
--		}
--	}
--	(void) strcpy(tty_basename, term_variable);
--
--	curses_setup(argv[0]);
--
--	menu_can_scan(&normal_menu);	/* extract which caps can be tested */
--	menu_display(&start_menu, 0);
--
--	if (user_modified()) {
--		sprintf(temp, "Hit y to save changes to file: %s  ? ",
--			tty_basename);
--		ptext(temp);
--		if (wait_here() == 'y') {
--			save_info(write_terminfo_list, &i, &j);
--		}
--	}
--
--	put_str("\nTerminal test complete\n");
--	bye_kids(0);
--	return (0);
--}
-diff -Naur ncurses-5.6.orig/tack/tack.h ncurses-5.6/tack/tack.h
---- ncurses-5.6.orig/tack/tack.h	2006-11-25 18:45:00.000000000 -0500
-+++ ncurses-5.6/tack/tack.h	1969-12-31 19:00:00.000000000 -0500
-@@ -1,428 +0,0 @@
--/*
--** Copyright (C) 1991, 1997 Free Software Foundation, Inc.
--** 
--** This file is part of TACK.
--** 
--** TACK is free software; you can redistribute it and/or modify
--** it under the terms of the GNU General Public License as published by
--** the Free Software Foundation; either version 2, or (at your option)
--** any later version.
--** 
--** TACK is distributed in the hope that it will be useful,
--** but WITHOUT ANY WARRANTY; without even the implied warranty of
--** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--** GNU General Public License for more details.
--** 
--** You should have received a copy of the GNU General Public License
--** along with TACK; see the file COPYING.  If not, write to
--** the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
--** Boston, MA 02110-1301, USA
--*/
--
--/* $Id: tack.h,v 1.16 2006/11/25 23:45:00 tom Exp $ */
--
--#ifndef NCURSES_TACK_H_incl
--#define NCURSES_TACK_H_incl 1
--
--/* terminfo action checker include file */
--
--#define MAJOR_VERSION 1
--#define MINOR_VERSION 1
--
--#ifdef HAVE_CONFIG_H
--#include <ncurses_cfg.h>
--#else
--#define RETSIGTYPE void
--#define GCC_UNUSED /*nothing*/
--#define HAVE_GETTIMEOFDAY 1
--#define HAVE_SELECT 1
--#define HAVE_SYS_TIME_H 1
--#define HAVE_SYS_TIME_SELECT 1
--#endif
--
--#include <sys/types.h>
--#include <stdlib.h>
--#include <unistd.h>
--#include <ctype.h>
--#include <string.h>
--
--#include <curses.h>
--#include <term_entry.h>
--#include <nc_tparm.h>
--
--#if USE_RCS_IDS
--#define MODULE_ID(id) static const char Ident[] = id;
--#else
--#define MODULE_ID(id) /*nothing*/
--#endif
--
--#if !HAVE_STRSTR
--extern char *_nc_strstr(const char *, const char *);
--#define strstr(h,n) _nc_strstr(h,n)
--#endif
--
--#define CUR_TP      (&(cur_term->type))
--#define MAX_STRINGS NUM_STRINGS(CUR_TP)
--#define STR_NAME(n) ExtStrname(CUR_TP,n,strnames)
--
--#define UChar(c)    ((unsigned char)(c))
--
--extern FILE *log_fp;
--extern FILE *debug_fp;
--extern int debug_level;
--extern char temp[];
--extern char tty_basename[];
--extern char tty_shortname[];
--
--#define SYNC_FAILED	0
--#define SYNC_TESTED	1
--#define SYNC_NOT_TESTED	2
--#define SYNC_NEEDED	3
--
--extern int tty_can_sync;
--extern int total_pads_sent;	/* count pad characters sent */
--extern int total_caps_sent;	/* count caps sent */
--extern int total_printing_characters; /* count printing characters sent */
--extern int no_alarm_event;	/* TRUE if the alarm has not gone off yet */
--extern unsigned long usec_run_time; /* length of last test in microseconds */
--extern int raw_characters_sent;	/* Total output characters */
--
--/* Stopwatch event timers */
--#define TIME_TEST 0
--#define TIME_SYNC 1
--#define TIME_FLUSH 2
--#define MAX_TIMERS 3
--
--/* definitions for pad.c */
--
--#define EXIT_CONDITION (no_alarm_event && (tt_delay_used < tt_delay_max))
--#define SLOW_TERMINAL_EXIT if (!test_complete && !EXIT_CONDITION) { break; }
--#define CAP_NOT_FOUND if (auto_pad_mode) return
--
--extern char letters[26+1];
--#define NEXT_LETTER letter = letters[letter_number =\
--	letters[letter_number + 1] ? letter_number + 1 : 0]
--
--extern int test_complete;	/* counts number of tests completed */
--extern char letter;
--extern int letter_number;
--extern int augment, repeats;
--extern long char_sent;
--extern const char *pad_repeat_test;	/* commands that force repeat */
--
--extern int replace_mode;
--extern int char_count, line_count, expand_chars;
--extern int can_go_home, can_clear_screen;
--
--extern int translate_mode, scan_mode;
--extern int auto_pad_mode;		/* TRUE for auto time tests */
--extern int char_mask;
--extern int hex_out;			/* Display output in hex */
--
--/* Parity bit macros */
--#define STRIP_PARITY 0x7f
--#define ALLOW_PARITY 0xff
--
--/* select_delay_type:	0 -> reset all delays
--			1 -> force long delays
--			2 -> do not change the delays */
--extern int select_delay_type;
--
--/* select_xon_xoff:	0 -> reset xon/xoff
--			1 -> set xon/xoff
--			2 -> do not change xon/xoff */
--extern int select_xon_xoff;
--
--extern int tty_frame_size;
--extern unsigned tty_baud_rate;
--extern unsigned long tty_cps;	/* The number of characters per second */
--extern int not_a_tty, nodelay_read;
--extern int send_reset_init;
--
--/* definitions for stty_query() and initial_stty_query() */
--#define TTY_CHAR_MODE	0
--#define TTY_NOECHO	1
--#define TTY_OUT_TRANS	2
--#define TTY_8_BIT	3
--#define TTY_XON_XOFF	4
--
--/* scan code definitions */
--#define MAX_SCAN 256
--
--/* translate mode default strings */
--struct default_string_list {
--	const char *name;	/* terminfo name */
--	const char *value;	/* value of default string */
--	int index;		/* index into the strfname[] array */
--};
--
--#define TM_last 8
--extern struct default_string_list TM_string[TM_last];
--
--/* attribute structure definition */
--struct mode_list {
--	const char *name;
--	const char *begin_mode;
--	const char *end_mode;
--	int number;
--};
--
--extern const struct mode_list alt_modes[];
--extern const int mode_map[];
--
--/* Test data base */
--
--#define FLAG_CAN_TEST	1
--#define FLAG_TESTED	2
--#define FLAG_LABEL	4
--#define FLAG_FUNCTION_KEY	8
--
--/* caps under test data base */
--
--#define TT_MAX	8
--#define MAX_CHANGES (TT_MAX+2)
--
--extern int tt_delay_max;	/* max number of milliseconds we can delay */
--extern int tt_delay_used;	/* number of milliseconds consumed in delay */
--extern const char *tt_cap[TT_MAX]; /* value of string */
--extern int tt_affected[TT_MAX];	/* lines or columns effected (repetition
--				   factor) */
--extern int tt_count[TT_MAX];	/* Number of times sent */
--extern int tt_delay[TT_MAX];	/* Number of milliseconds delay */
--extern int ttp;			/* number of entries used */
--
--extern const char *tx_cap[TT_MAX]; /* value of string */
--extern int tx_affected[TT_MAX];	/* lines or columns effected (repetition
--				   factor) */
--extern int tx_count[TT_MAX];	/* Number of times sent */
--extern int tx_delay[TT_MAX];	/* Number of milliseconds delay */
--extern int tx_index[TT_MAX];	/* String index */
--extern int txp;			/* number of entries used */
--extern int tx_characters;	/* printing characters sent by test */
--extern unsigned long tx_cps;	/* characters per second */
--
--/*
--	Menu control for tack.
--*/
--
--struct test_results {
--	struct test_results *next;	/* point to next entry */
--	struct test_list *test;	/* Test which got these results */
--	int reps;		/* repeat count */
--	int delay;		/* delay times 10 */
--};
--
--struct test_list {
--	int flags;		/* Test description flags */
--	int lines_needed;	/* Lines needed for test (0->no action) */
--	const char *caps_done;	/* Caps shown in Done message */
--	const char *caps_tested; /* Other caps also being tested */
--	const char *menu_entry;	/* Menu entry text (optional) */
--				/* Function that does testing */
--	void (*test_procedure)(struct test_list *, int *, int *);
--	struct test_menu *sub_menu;	/* Nested sub-menu */
--};
--
--struct test_menu {
--	int flags;		/* Menu feature flag */
--	int default_action;	/* Default command if <cr> <lf> entered */
--	const char *menu_text;	/* Describe this test_menu */
--	const char *menu_title;	/* Title for the menu */
--	const char *ident;	/* short menu name */
--	const char *standard_tests;	/* Standard test text */
--				/* print current settings (optional) */
--	void (*menu_function)(struct test_menu *);
--	struct test_list *tests;	/* Pointer to the menu/function pairs */
--	struct test_list *resume_tests;	/* Standard test resume point */
--	int resume_state;	/* resume state of test group */
--	int resume_char;	/* resume ch of test group */
--};
--
--
--/* menu flags */
--#define MENU_100c	0x00001a00	/* Augment 100% of columns */
--#define MENU_90c	0x00001900	/* Augment 90% of columns */
--#define MENU_80c	0x00001800	/* Augment 80% of columns */
--#define MENU_70c	0x00001700	/* Augment 70% of columns */
--#define MENU_60c	0x00001600	/* Augment 60% of columns */
--#define MENU_50c	0x00001500	/* Augment 50% of columns */
--#define MENU_40c	0x00001400	/* Augment 40% of columns */
--#define MENU_30c	0x00001300	/* Augment 30% of columns */
--#define MENU_20c	0x00001200	/* Augment 20% of columns */
--#define MENU_10c	0x00001100	/* Augment 10% of columns */
--#define MENU_LM1	0x00002e00	/* Augment lines - 1 */
--#define MENU_100l	0x00002a00	/* Augment 100% of lines */
--#define MENU_90l	0x00002900	/* Augment 90% of lines */
--#define MENU_50l	0x00002500	/* Augment 50% of lines */
--#define MENU_lines	0x00002000	/* Augment of lines */
--#define MENU_columns	0x00001000	/* Augment of columns */
--#define MENU_LC_MASK	0x00003000	/* Augment mask for lines and columns */
--#define MENU_1L		0x00002f00	/* Augment == one */
--#define MENU_1C		0x00001f00	/* Augment == one */
--#define MENU_ONE	0x00000f00	/* Augment == one */
--#define MENU_ONE_MASK	0x00000f00	/* Augment == one mask */
--#define MENU_REP_MASK	0x00003f00	/* Augment mask */
--
--#define MENU_CLEAR	0x00010000	/* clear screen */
--#define MENU_INIT	0x00020000	/* Initialization function */
--#define MENU_NEXT	0x00040000	/* Next test in sequence */
--#define MENU_LAST	0x00080000	/* End of menu list */
--#define MENU_STOP	0x00100000	/* Stop testing next-in-sequence */
--#define MENU_COMPLETE	0x00200000	/* Test complete after this */
--#define MENU_MENU	0x00400000	/* Pass the menu name not test name */
--
--#define REQUEST_PROMPT 256
--
--/* tack.c */
--extern struct test_menu edit_menu;
--extern void show_usage(char *);
--extern void print_version(void);
--
--/* output.c */
--extern char *expand(const char *);
--extern char *expand_command(const char *);
--extern char *expand_to(char *, int);
--extern char *hex_expand_to(char *, int);
--extern char *print_expand(char *);
--extern int getchp(int);
--extern int getnext(int);
--extern int tc_putch(int);
--extern int tc_putp(const char *);
--extern int wait_here(void);
--extern void go_home(void);
--extern void home_down(void);
--extern void maybe_wait(int);
--extern void ptext(const char *);
--extern void ptextln(const char *);
--extern void put_clear(void);
--extern void put_columns(const char *, int, int);
--extern void put_cr(void);
--extern void put_crlf(void);
--extern void put_dec(char *, int);
--extern void put_ind(void);
--extern void put_lf(void);
--extern void put_newlines(int);
--extern void put_str(const char *);
--extern void put_this(int);
--extern void putchp(int);
--extern void putln(const char *);
--extern void read_string(char *, int);
--extern void three_digit(char *, int);
--extern void tt_putp(const char *);
--extern void tt_putparm(NCURSES_CONST char *, int, int, int);
--extern void tt_tputs(const char *, int);
--
--#define put_that(n) put_this((int) (n))
--
--/* control.c */
--extern struct test_list color_test_list[];
--extern char *liberated(char *);
--extern char txt_longer_augment[80];
--extern char txt_longer_test_time[80];
--extern char txt_shorter_augment[80];
--extern char txt_shorter_test_time[80];
--extern int msec_cost(const char *const, int);
--extern int skip_pad_test(struct test_list *, int *, int *, const char *);
--extern int sliding_scale(int, int, unsigned long);
--extern int still_testing(void);
--extern long event_time(int);
--extern void control_init(void);
--extern void dump_test_stats(struct test_list *, int *, int *);
--extern void event_start(int);
--extern void longer_augment(struct test_list *, int *, int *);
--extern void longer_test_time(struct test_list *, int *, int *);
--extern void pad_test_shutdown(struct test_list *, int);
--extern void pad_test_startup(int);
--extern void page_loop(void);
--extern void set_augment_txt(void);
--extern void shorter_augment(struct test_list *, int *, int *);
--extern void shorter_test_time(struct test_list *, int *, int *);
--
--/* charset.c */
--extern struct test_list acs_test_list[];
--extern void set_attr(int);
--extern void eat_cookie(void);
--extern void put_mode(char *);
--
--/* crum.c */
--extern struct test_list crum_test_list[];
--
--/* ansi.c */
--extern void tools_status(struct test_list *, int *, int *);
--extern void tools_charset(struct test_list *, int *, int *);
--extern void tools_sgr(struct test_list *, int *, int *);
--
--/* edit.c */
--extern struct test_menu change_pad_menu;
--extern struct test_list edit_test_list[];
--extern char *get_string_cap_byname(const char *, const char **);
--extern int cap_match(const char *names, const char *cap);
--extern int get_string_cap_byvalue(const char *);
--extern int user_modified(void);
--extern void can_test(const char *, int);
--extern void cap_index(const char *, int *);
--extern void edit_init(void);
--extern void save_info(struct test_list *, int *, int *);
--extern void show_report(struct test_list *, int *, int *);
--
--/* fun.c */
--extern struct test_list funkey_test_list[];
--extern struct test_list printer_test_list[];
--extern void enter_key(const char *, char *, char *);
--extern int tty_meta_prep(void);
--extern void tools_report(struct test_list *, int *, int *);
--
--/* init.c */
--extern void reset_init(void);
--extern void display_basic(void);
--extern void put_name(const char *, const char *);
--extern void charset_can_test(void);
--extern void curses_setup(char *);
--extern void bye_kids(int);
--
--/* scan.c */
--extern char **scan_up, **scan_down, **scan_name;
--extern int scan_key(void);
--extern unsigned scan_max;	/* length of longest scan code */
--extern unsigned *scan_tested, *scan_length;
--extern void scan_init(char *fn);
--
--/* sysdep.c */
--extern int initial_stty_query(int);
--extern int stty_query(int);
--extern void ignoresig(void);
--extern void read_key(char *, int);
--extern void set_alarm_clock(int);
--extern void spin_flush(void);
--extern void tty_init(void);
--extern void tty_raw(int, int);
--extern void tty_reset(void);
--extern void tty_set(void);
--
--/* menu.c */
--extern char prompt_string[80];	/* menu prompt storage */
--extern int subtest_menu(struct test_list *, int *, int *);
--extern struct test_list *augment_test;
--extern void generic_done_message(struct test_list *, int *, int *);
--extern void menu_can_scan(const struct test_menu *);
--extern void menu_clear_screen(struct test_list *, int *, int *);
--extern void menu_display(struct test_menu *, int *);
--extern void menu_prompt(void);
--extern void menu_reset_init(struct test_list *, int *, int *);
--extern void pad_done_message(struct test_list *, int *, int *);
--
--/* modes.c */
--extern struct test_list mode_test_list[];
--
--/* pad.c */
--extern struct test_list pad_test_list[];
--
--/* sync.c */
--extern struct test_menu sync_menu;
--extern int tty_sync_error(void);
--extern void flush_input(void);
--extern void sync_handshake(struct test_list *, int *, int *);
--extern void sync_test(struct test_menu *);
--extern void verify_time(void);
--
--#endif /* NCURSES_TACK_H_incl */
-diff -Naur ncurses-5.6.orig/test/Makefile.in ncurses-5.6/test/Makefile.in
---- ncurses-5.6.orig/test/Makefile.in	2006-10-21 18:56:03.000000000 -0400
-+++ ncurses-5.6/test/Makefile.in	2008-06-18 06:49:49.000000000 -0400
-@@ -1,6 +1,6 @@
--# $Id: Makefile.in,v 1.92 2006/10/21 22:56:03 tom Exp $
-+# $Id: Makefile.in,v 1.98 2008/04/12 20:44:47 tom Exp $
- ##############################################################################
--# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -75,9 +75,10 @@
- LOCAL_LIBDIR	= @top_builddir@/lib
- LOCAL_LIBS	= @TEST_DEPS@
- MATH_LIB	= @MATH_LIB@
-+TEST_LIBS	= @TEST_LIBS@
- 
- LD		= @LD@
--LINK		= @LINK_TESTS@ $(LIBTOOL_LINK) $(CC) $(CFLAGS)
-+LINK		= @LINK_TESTS@ $(LIBTOOL_LINK) $(CFLAGS)
- 
- LDFLAGS		= @LD_MODEL@ @LOCAL_LDFLAGS@ @LDFLAGS@
- 
-@@ -87,16 +88,18 @@
- LDFLAGS_PROFILE	= $(LDFLAGS) $(CFLAGS_PROFILE)
- LDFLAGS_SHARED	= $(LDFLAGS) $(CFLAGS_SHARED) @LD_SHARED_OPTS@
- 
-+TEST_ARGS	= @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@ 
-+
- # use these for linking with all of the libraries
--LIBS_DEFAULT	= @TEST_ARGS@ @LIBS@ $(MATH_LIB)
-+LIBS_DEFAULT	= $(TEST_ARGS) @LIBS@ $(TEST_LIBS) $(MATH_LIB)
- LDFLAGS_DEFAULT	= $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_DEFAULT)
- 
- # use these for linking with the (n)curses library
--LIBS_CURSES	= `echo "@TEST_ARGS@ @LIBS@" | sed -e 's/-lform.*-lpanel[^ ]*//'` $(MATH_LIB)
-+LIBS_CURSES	= `echo "$(TEST_ARGS) @LIBS@" | sed -e 's/-lform.*-lpanel[^ ]*//'` $(TEST_LIBS) $(MATH_LIB)
- LDFLAGS_CURSES	= $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_CURSES)
- 
- # use these for linking with the tinfo library if we have it, or curses library if not
--LIBS_TINFO	= @TINFO_ARGS@ @LIBS@ $(MATH_LIB)
-+LIBS_TINFO	= @LDFLAGS_STATIC@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LIBS@ $(TEST_LIBS) $(MATH_LIB)
- LDFLAGS_TINFO	= $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO)
- 
- LINT		= @LINT@
-diff -Naur ncurses-5.6.orig/test/README ncurses-5.6/test/README
---- ncurses-5.6.orig/test/README	2006-11-04 20:10:56.000000000 -0500
-+++ ncurses-5.6/test/README	2008-06-18 06:49:49.000000000 -0400
-@@ -1,5 +1,5 @@
- -------------------------------------------------------------------------------
---- Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.               --
-+-- Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.               --
- --                                                                           --
- -- Permission is hereby granted, free of charge, to any person obtaining a   --
- -- copy of this software and associated documentation files (the             --
-@@ -25,7 +25,7 @@
- -- sale, use or other dealings in this Software without prior written        --
- -- authorization.                                                            --
- -------------------------------------------------------------------------------
---- $Id: README,v 1.28 2006/11/05 01:10:56 tom Exp $
-+-- $Id: README,v 1.36 2008/04/05 16:24:14 tom Exp $
- -------------------------------------------------------------------------------
- 
- The programs in this directory are designed to test your newest toy :-)
-@@ -210,27 +210,27 @@
- libncurses:
- ----------
- BC				-
--COLORS				test: echochar ncurses xmas
--COLOR_PAIR			test: background blue bs cardfile demo_forms demo_menus echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain tclock testaddch testcurs view worm xmas
--COLOR_PAIRS			test: echochar ncurses newdemo
--COLS				test: cardfile demo_altkeys demo_defkey demo_forms demo_keyok demo_menus edit_field firework foldkeys hashtest ins_wide inserts lrtest movewindow ncurses newdemo rain tclock testcurs view worm
-+COLORS				test: echochar ncurses savescreen xmas
-+COLOR_PAIR			test: background blue bs cardfile demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain savescreen tclock testaddch testcurs view worm xmas
-+COLOR_PAIRS			test: echochar ncurses newdemo savescreen
-+COLS				test: cardfile demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels echochar edit_field firework foldkeys hashtest inch_wide inchs ins_wide inserts lrtest movewindow ncurses newdemo rain savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm
- ESCDELAY			lib: ncurses
--LINES				test: cardfile demo_defkey demo_keyok demo_menus edit_field firework hanoi hashtest ins_wide inserts lrtest movewindow ncurses newdemo rain tclock testcurs view worm xmas
-+LINES				test: cardfile demo_defkey demo_keyok demo_menus demo_panels echochar edit_field firework hanoi hashtest inch_wide inchs ins_wide inserts lrtest movewindow ncurses newdemo rain savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
- PAIR_NUMBER			test: ncurses
- PC				lib: ncurses
- SP				lib: ncurses
- TABSIZE				lib: menu
- UP				-
- acs_map				test: gdc ins_wide inserts knight movewindow ncurses newdemo testcurs
--add_wch				test: ncurses
--add_wchnstr			test: ncurses
-+add_wch				test: demo_panels ncurses
-+add_wchnstr			-
- add_wchstr			test: view
--addch				test: blue bs ditto echochar hashtest ncurses testaddch view worm
-+addch				test: blue bs echochar hashtest ncurses savescreen testaddch view worm
- addchnstr			-
- addchstr			-
- addnstr				-
--addnwstr			-
--addstr				test: blue bs cardfile gdc hanoi lrtest ncurses
-+addnwstr			test: ncurses
-+addstr				test: blue bs cardfile ditto gdc hanoi lrtest ncurses savescreen
- addwstr				test: ncurses
- assume_default_colors		test: ncurses
- attr_get			test: ncurses
-@@ -241,20 +241,20 @@
- attron				test: bs echochar filter gdc ncurses
- attrset				test: bs firework gdc hanoi ncurses rain tclock testaddch testcurs
- baudrate			lib: ncurses
--beep				test: blue bs cardfile chgat demo_forms demo_menus edit_field hanoi ins_wide inserts knight movewindow ncurses tclock testcurs view xmas
--bkgd				test: background cardfile demo_forms ncurses tclock view
-+beep				test: blue bs cardfile chgat demo_forms demo_menus demo_panels edit_field hanoi inch_wide inchs ins_wide inserts knight movewindow ncurses savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view xmas
-+bkgd				test: background cardfile demo_forms ncurses savescreen tclock view
- bkgdset				test: background ncurses testaddch
- bkgrnd				test: ncurses
- bkgrndset			test: ncurses
--boolcodes			progs: dump_entry
--boolfnames			progs: dump_entry
--boolnames			progs: dump_entry infocmp
-+boolcodes			test: test_arrays progs: dump_entry
-+boolfnames			test: test_arrays progs: dump_entry
-+boolnames			test: test_arrays progs: dump_entry infocmp
- border				-
- border_set			-
--box				test: cardfile chgat demo_forms demo_menus edit_field ins_wide inserts lrtest ncurses newdemo redraw testcurs
-+box				test: cardfile chgat demo_forms demo_menus demo_panels edit_field inch_wide inchs ins_wide inserts lrtest ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
- box_set				test: ncurses
- can_change_color		test: ncurses
--cbreak				test: background blue bs cardfile chgat color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus ditto filter firework foldkeys gdc hanoi hashtest ins_wide inserts knight lrtest movewindow ncurses newdemo tclock testcurs view worm xmas
-+cbreak				test: background blue bs cardfile chgat color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto filter firework foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts knight lrtest movewindow ncurses newdemo savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
- chgat				test: chgat
- clear				test: blue bs gdc ncurses testcurs xmas
- clearok				test: bs knight
-@@ -263,26 +263,26 @@
- color_content			test: ncurses
- color_set			test: color_set ncurses
- copywin				test: ncurses testcurs
--cur_term			test: dots echochar lrtest progs: clear tic tput tset
--curs_set			test: echochar firework gdc hanoi lrtest ncurses newdemo rain tclock testcurs worm xmas
--curscr				test: edit_field knight lrtest ncurses tclock view
-+cur_term			test: dots dots_mvcur lrtest progs: clear tput tset
-+curs_set			test: echochar firework gdc hanoi lrtest ncurses newdemo rain savescreen tclock testcurs worm xmas
-+curscr				test: demo_panels edit_field knight lrtest ncurses savescreen tclock view
- curses_version			test: ncurses progs: infocmp tic toe tput tset
- def_prog_mode			test: bs ncurses
- def_shell_mode			lib: ncurses
- define_key			test: demo_altkeys demo_defkey foldkeys
- del_curterm			lib: ncurses
--delay_output			-
-+delay_output			test: newdemo
- delch				-
- deleteln			-
--delscreen			-
--delwin				test: cardfile chgat demo_forms demo_menus edit_field ins_wide inserts movewindow ncurses newdemo redraw testcurs
--derwin				test: cardfile chgat demo_forms demo_menus ins_wide inserts movewindow ncurses
--doupdate			test: cardfile demo_menus edit_field ins_wide inserts knight movewindow ncurses redraw
-+delscreen			test: ditto dots_mvcur
-+delwin				test: cardfile chgat demo_forms demo_menus demo_panels edit_field inch_wide inchs ins_wide inserts movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
-+derwin				test: cardfile chgat demo_forms demo_menus inch_wide inchs ins_wide inserts movewindow ncurses test_get_wstr test_getstr test_instr test_inwstr test_opaque
-+doupdate			test: cardfile demo_menus demo_panels edit_field ins_wide inserts knight movewindow ncurses redraw savescreen test_get_wstr test_getstr
- dupwin				test: edit_field
--echo				test: bs hanoi ncurses testcurs testscanw
-+echo				test: bs hanoi ncurses test_get_wstr test_getstr testcurs testscanw
- echo_wchar			test: ncurses
- echochar			test: echochar ncurses
--endwin				test: background blue bs cardfile chgat color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus ditto echochar filter firework firstlast foldkeys gdc hanoi hashtest ins_wide inserts keynames knight lrtest movewindow ncurses newdemo rain redraw tclock testaddch testcurs testscanw view worm xmas
-+endwin				test: background blue bs cardfile chgat color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto dots_mvcur echochar filter firework firstlast foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts keynames knight lrtest movewindow ncurses newdemo rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas
- erase				test: cardfile demo_menus filter firework firstlast hanoi lrtest ncurses tclock testcurs
- erasechar			lib: ncurses
- erasewchar			-
-@@ -290,45 +290,46 @@
- flash				test: cardfile lrtest ncurses tclock testcurs
- flushinp			test: ncurses newdemo testcurs
- get_wch				-
--get_wstr			-
--getbegx				test: chgat demo_menus movewindow ncurses newdemo redraw testcurs
--getbegy				test: chgat demo_menus movewindow ncurses newdemo redraw testcurs
-+get_wstr			test: test_get_wstr
-+getattrs			-
-+getbegx				test: chgat demo_menus demo_panels movewindow ncurses newdemo redraw testcurs
-+getbegy				test: chgat demo_menus demo_panels movewindow ncurses newdemo redraw testcurs
- getbkgd				test: ncurses
- getbkgrnd			test: ncurses
- getcchar			test: ncurses view
--getch				test: background blue bs chgat color_set demo_altkeys ditto filter firework firstlast foldkeys hanoi hashtest lrtest rain tclock testaddch testcurs view worm xmas
--getcurx				test: bs chgat demo_altkeys demo_defkey foldkeys movewindow ncurses redraw testcurs
--getcury				test: bs chgat demo_altkeys demo_defkey edit_field foldkeys movewindow ncurses redraw testcurs
--getmaxx				test: chgat movewindow ncurses newdemo redraw testcurs
--getmaxy				test: chgat demo_forms movewindow ncurses newdemo redraw testcurs
-+getch				test: background blue bs chgat color_set demo_altkeys ditto filter firework firstlast foldkeys hanoi hashtest lrtest savescreen tclock testaddch testcurs view xmas
-+getcurx				test: bs chgat demo_altkeys demo_defkey demo_panels foldkeys movewindow ncurses redraw savescreen test_get_wstr test_getstr testcurs
-+getcury				test: bs chgat demo_altkeys demo_defkey demo_panels edit_field foldkeys movewindow ncurses redraw savescreen testcurs
-+getmaxx				test: chgat demo_panels inch_wide inchs movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
-+getmaxy				test: chgat demo_forms demo_panels inch_wide inchs movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
- getmouse			test: bs knight movewindow ncurses
--getn_wstr			-
--getnstr				test: filter ncurses
-+getn_wstr			test: test_get_wstr
-+getnstr				test: filter ncurses test_getstr
- getparx				test: movewindow
- getpary				test: movewindow
--getstr				-
-+getstr				test: test_getstr
- getwin				test: ncurses
- halfdelay			test: view
--has_colors			test: background bs cardfile chgat color_set demo_forms demo_menus echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain tclock testcurs view worm xmas
-+has_colors			test: background bs cardfile chgat color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain savescreen tclock testcurs view worm xmas
- has_ic				test: lrtest
- has_il				lib: ncurses
- has_key				lib: ncurses
- hline				test: gdc ncurses
- hline_set			-
--idcok				-
--idlok				test: ncurses testscanw view
--immedok				-
--in_wch				-
--in_wchnstr			-
--in_wchstr			-
--inch				-
--inchnstr			-
--inchstr				-
-+idcok				test: test_opaque
-+idlok				test: ncurses test_opaque testscanw view
-+immedok				test: test_opaque
-+in_wch				test: inch_wide
-+in_wchnstr			test: inch_wide
-+in_wchstr			test: inch_wide
-+inch				test: inchs
-+inchnstr			test: inchs
-+inchstr				test: inchs
- init_color			test: ncurses
--init_pair			test: background blue bs cardfile chgat color_set demo_forms demo_menus echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain tclock testaddch testcurs view worm xmas
--initscr				test: background blue bs cardfile chgat color_set demo_defkey demo_forms demo_keyok demo_menus echochar firework firstlast gdc hanoi hashtest ins_wide inserts knight lrtest movewindow ncurses newdemo rain redraw tclock testaddch testcurs testscanw view worm xmas
--innstr				-
--innwstr				-
-+init_pair			test: background blue bs cardfile chgat color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain savescreen tclock testaddch testcurs view worm xmas
-+initscr				test: background blue bs cardfile chgat color_set demo_defkey demo_forms demo_keyok demo_menus demo_panels echochar firework firstlast gdc hanoi hashtest inch_wide inchs ins_wide inserts knight lrtest movewindow ncurses newdemo rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testaddch testcurs testscanw view worm xmas
-+innstr				test: test_instr
-+innwstr				test: test_inwstr
- ins_nwstr			test: ins_wide
- ins_wch				test: ins_wide
- ins_wstr			test: ins_wide
-@@ -337,29 +338,39 @@
- insertln			-
- insnstr				test: inserts
- insstr				test: inserts
--instr				-
-+instr				test: test_instr
- intrflush			test: demo_forms movewindow
--inwstr				-
-+inwstr				test: test_inwstr
-+is_cleared			test: test_opaque
-+is_idcok			test: test_opaque
-+is_idlok			test: test_opaque
-+is_immedok			test: test_opaque
-+is_keypad			test: test_opaque
-+is_leaveok			test: test_opaque
- is_linetouched			lib: form
-+is_nodelay			test: test_opaque
-+is_notimeout			test: test_opaque
-+is_scrollok			test: test_opaque
-+is_syncok			test: test_opaque
- is_term_resized			-
- is_wintouched			lib: ncurses
- isendwin			-
- key_defined			test: demo_defkey foldkeys
--key_name			test: ncurses
-+key_name			test: key_names ncurses
- keybound			test: demo_altkeys demo_defkey
- keyname				test: demo_altkeys demo_defkey demo_keyok demo_menus edit_field foldkeys keynames movewindow ncurses redraw testcurs view progs: tic
- keyok				test: demo_keyok foldkeys
--keypad				test: bs cardfile chgat demo_altkeys demo_defkey demo_forms demo_keyok demo_menus edit_field filter firework foldkeys hashtest ins_wide inserts keynames knight lrtest movewindow ncurses redraw tclock testcurs testscanw view
-+keypad				test: bs cardfile chgat demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels edit_field filter firework foldkeys hashtest inch_wide inchs ins_wide inserts keynames knight lrtest movewindow ncurses redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view
- killchar			lib: ncurses
- killwchar			-
--leaveok				test: hanoi
-+leaveok				test: hanoi test_opaque
- longname			test: testcurs progs: tput
- mcprint				-
- meta				test: ncurses
- mouse_trafo			-
- mouseinterval			-
--mousemask			test: bs demo_menus knight movewindow ncurses
--move				test: blue bs cardfile chgat demo_altkeys demo_menus echochar foldkeys gdc hanoi hashtest ins_wide inserts knight lrtest movewindow ncurses testscanw view worm xmas
-+mousemask			test: bs demo_forms demo_menus knight movewindow ncurses
-+move				test: blue bs cardfile chgat demo_altkeys demo_menus echochar foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts knight lrtest movewindow ncurses savescreen test_get_wstr test_getstr test_instr test_inwstr testscanw view xmas
- mvadd_wch			test: ncurses
- mvadd_wchnstr			-
- mvadd_wchstr			-
-@@ -371,112 +382,112 @@
- mvaddstr			test: bs demo_forms gdc hanoi knight ncurses rain tclock testcurs xmas
- mvaddwstr			-
- mvchgat				test: chgat
--mvcur				test: redraw
-+mvcur				test: dots_mvcur redraw
- mvdelch				-
- mvderwin			test: movewindow
- mvget_wch			-
--mvget_wstr			-
-+mvget_wstr			test: test_get_wstr
- mvgetch				-
--mvgetn_wstr			-
--mvgetnstr			-
--mvgetstr			-
-+mvgetn_wstr			test: test_get_wstr
-+mvgetnstr			test: test_getstr
-+mvgetstr			test: test_getstr
- mvhline				test: ncurses
- mvhline_set			test: ncurses
--mvin_wch			-
--mvin_wchnstr			-
--mvin_wchstr			-
--mvinch				-
--mvinchnstr			test: gdc
--mvinchstr			-
--mvinnstr			-
--mvinnwstr			-
-+mvin_wch			test: inch_wide
-+mvin_wchnstr			test: inch_wide
-+mvin_wchstr			test: inch_wide
-+mvinch				test: inchs
-+mvinchnstr			test: gdc inchs
-+mvinchstr			test: inchs
-+mvinnstr			test: test_instr
-+mvinnwstr			test: test_inwstr
- mvins_nwstr			test: ins_wide
- mvins_wch			test: ins_wide
- mvins_wstr			test: ins_wide
- mvinsch				test: ins_wide inserts
- mvinsnstr			test: inserts
- mvinsstr			test: inserts
--mvinstr				-
--mvinwstr			-
-+mvinstr				test: test_instr
-+mvinwstr			test: test_inwstr
- mvprintw			test: bs demo_menus firework hanoi ncurses tclock view
- mvscanw				-
- mvvline				test: ncurses
- mvvline_set			test: ncurses
- mvwadd_wch			-
- mvwadd_wchnstr			lib: form
--mvwadd_wchstr			-
-+mvwadd_wchstr			test: inch_wide
- mvwaddch			test: movewindow newdemo testcurs xmas
- mvwaddchnstr			-
--mvwaddchstr			-
-+mvwaddchstr			test: inchs
- mvwaddnstr			test: newdemo testcurs
- mvwaddnwstr			-
--mvwaddstr			test: firstlast ins_wide inserts knight ncurses newdemo testcurs xmas
--mvwaddwstr			-
-+mvwaddstr			test: firstlast ins_wide inserts knight ncurses newdemo test_instr testcurs xmas
-+mvwaddwstr			test: test_inwstr
- mvwchgat			test: chgat
- mvwdelch			test: ncurses
- mvwget_wch			-
--mvwget_wstr			-
--mvwgetch			-
--mvwgetn_wstr			-
--mvwgetnstr			-
--mvwgetstr			-
-+mvwget_wstr			test: test_get_wstr
-+mvwgetch			test: inch_wide inchs test_get_wstr test_getstr test_instr test_inwstr test_opaque
-+mvwgetn_wstr			test: test_get_wstr
-+mvwgetnstr			test: test_getstr
-+mvwgetstr			test: test_getstr
- mvwhline			test: movewindow
- mvwhline_set			-
- mvwin				test: cardfile demo_menus movewindow testcurs xmas
--mvwin_wch			-
--mvwin_wchnstr			lib: form
--mvwin_wchstr			-
--mvwinch				test: newdemo testcurs
--mvwinchnstr			-
--mvwinchstr			-
--mvwinnstr			test: testcurs
--mvwinnwstr			-
-+mvwin_wch			test: inch_wide
-+mvwin_wchnstr			test: inch_wide
-+mvwin_wchstr			test: inch_wide
-+mvwinch				test: inchs newdemo testcurs
-+mvwinchnstr			test: inchs
-+mvwinchstr			test: inchs
-+mvwinnstr			test: test_instr testcurs
-+mvwinnwstr			test: test_inwstr
- mvwins_nwstr			test: ins_wide
- mvwins_wch			test: ins_wide
- mvwins_wstr			test: ins_wide
- mvwinsch			test: ins_wide inserts
- mvwinsnstr			test: inserts
- mvwinsstr			test: inserts testcurs
--mvwinstr			-
--mvwinwstr			-
--mvwprintw			test: chgat ncurses testcurs
-+mvwinstr			test: test_instr
-+mvwinwstr			test: test_inwstr
-+mvwprintw			test: chgat demo_panels inch_wide inchs ncurses test_instr test_inwstr testcurs
- mvwscanw			test: testcurs
- mvwvline			test: ins_wide inserts movewindow
- mvwvline_set			-
--napms				test: dots echochar firework gdc hanoi lrtest ncurses newdemo railroad rain tclock testcurs view worm xmas progs: tset
-+napms				test: demo_panels ditto dots dots_mvcur echochar firework gdc hanoi lrtest ncurses railroad rain tclock test_opaque testcurs view worm xmas progs: tset
- newpad				test: edit_field ncurses testcurs
- newscr				lib: ncurses
--newterm				test: demo_altkeys ditto filter foldkeys gdc keynames
--newwin				test: cardfile chgat demo_defkey demo_forms demo_keyok demo_menus edit_field firstlast ins_wide inserts knight movewindow ncurses newdemo redraw testcurs xmas
-+newterm				test: demo_altkeys ditto dots_mvcur filter foldkeys gdc keynames
-+newwin				test: cardfile chgat demo_defkey demo_forms demo_keyok demo_menus demo_panels edit_field firstlast inch_wide inchs ins_wide inserts knight movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs xmas
- nl				test: demo_forms ncurses rain testcurs
- nocbreak			test: testcurs
--nodelay				test: firework gdc lrtest ncurses newdemo rain tclock view xmas
--noecho				test: background bs cardfile chgat color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus ditto firework firstlast foldkeys gdc hanoi hashtest ins_wide inserts knight lrtest movewindow ncurses rain redraw tclock testcurs view worm xmas
-+nodelay				test: ditto firework gdc lrtest ncurses newdemo rain tclock test_opaque view worm xmas
-+noecho				test: background bs cardfile chgat color_set demo_altkeys demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto firework firstlast foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts knight lrtest movewindow ncurses rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs view worm xmas
- nofilter			-
- nonl				test: bs demo_forms hashtest movewindow ncurses view worm xmas
- noqiflush			-
- noraw				test: demo_forms demo_menus ncurses testcurs
--notimeout			-
--numcodes			progs: dump_entry
--numfnames			progs: dump_entry
--numnames			progs: dump_entry infocmp
-+notimeout			test: test_opaque
-+numcodes			test: test_arrays progs: dump_entry
-+numfnames			test: test_arrays progs: dump_entry
-+numnames			test: test_arrays progs: dump_entry infocmp
- ospeed				progs: tset
- overlay				test: ncurses testcurs xmas
--overwrite			test: ncurses
-+overwrite			test: ncurses savescreen
- pair_content			test: background color_set
- pecho_wchar			-
- pechochar			-
- pnoutrefresh			test: edit_field ncurses
- prefresh			test: testcurs
--printw				test: background blue bs color_set demo_altkeys demo_defkey demo_keyok demo_menus filter foldkeys ncurses testcurs testscanw view
-+printw				test: background blue bs color_set demo_altkeys demo_defkey demo_keyok demo_menus filter foldkeys ncurses savescreen testcurs testscanw view
- putp				progs: tput
- putwin				test: ncurses
- qiflush				-
- raw				test: demo_forms ncurses redraw testcurs
- redrawwin			test: redraw
--refresh				test: blue bs demo_defkey demo_forms demo_keyok demo_menus ditto echochar filter firstlast gdc hanoi hashtest lrtest movewindow ncurses tclock testcurs view worm xmas
-+refresh				test: blue bs demo_defkey demo_forms demo_keyok demo_menus demo_panels ditto echochar filter firstlast gdc hanoi hashtest lrtest movewindow ncurses savescreen tclock testcurs view xmas
- reset_prog_mode			test: filter ncurses
--reset_shell_mode		test: bs filter
-+reset_shell_mode		test: bs filter savescreen
- resetty				-
- resize_term			test: view
- resizeterm			lib: ncurses
-@@ -484,16 +495,18 @@
- ripoffline			test: demo_menus ncurses
- savetty				-
- scanw				test: testcurs testscanw
--scr_dump			-
--scr_init			-
--scr_restore			-
--scr_set				-
--scrl				-
-+scr_dump			test: savescreen
-+scr_init			test: savescreen
-+scr_restore			test: savescreen
-+scr_set				test: savescreen
-+scrl				test: view
- scroll				test: testcurs
--scrollok			test: demo_altkeys demo_defkey demo_keyok ditto foldkeys hashtest knight ncurses redraw testcurs testscanw view
-+scrollok			test: demo_altkeys demo_defkey demo_keyok demo_panels ditto foldkeys hashtest knight ncurses redraw test_opaque testcurs testscanw view
- set_curterm			lib: ncurses
--set_term			test: ditto
--setcchar			test: ins_wide ncurses view
-+set_escdelay			-
-+set_tabsize			-
-+set_term			lib: ncurses
-+setcchar			test: demo_panels ins_wide ncurses view
- setscrreg			test: view
- setupterm			test: dots progs: clear tput tset
- slk_attr			-
-@@ -507,22 +520,22 @@
- slk_color			test: ncurses
- slk_init			test: ncurses
- slk_label			test: ncurses
--slk_noutrefresh			test: ncurses
-+slk_noutrefresh			-
- slk_refresh			test: ncurses
- slk_restore			test: ncurses
- slk_set				test: ncurses
--slk_touch			test: ncurses
-+slk_touch			lib: ncurses
- slk_wset			test: ncurses
--standend			test: blue gdc ncurses worm
-+standend			test: blue gdc ncurses
- standout			test: blue ncurses
--start_color			test: background blue bs cardfile chgat color_set demo_forms demo_menus echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain tclock testaddch testcurs view worm xmas
--stdscr				test: bs chgat demo_altkeys demo_forms demo_menus ditto filter firework foldkeys gdc hanoi hashtest ins_wide inserts keynames knight lrtest movewindow ncurses rain redraw tclock testcurs testscanw view xmas
--strcodes			progs: dump_entry
--strfnames			progs: dump_entry
--strnames			test: foldkeys progs: dump_entry infocmp tic
-+start_color			test: background blue bs cardfile chgat color_set demo_forms demo_menus demo_panels echochar filter firework gdc hanoi ins_wide inserts knight ncurses newdemo rain savescreen tclock testaddch testcurs view worm xmas
-+stdscr				test: bs chgat demo_altkeys demo_forms demo_menus demo_panels ditto filter firework foldkeys gdc hanoi hashtest inch_wide inchs ins_wide inserts keynames knight lrtest movewindow ncurses rain redraw savescreen tclock test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs testscanw view worm xmas
-+strcodes			test: test_arrays progs: dump_entry
-+strfnames			test: test_arrays progs: dump_entry
-+strnames			test: foldkeys test_arrays progs: dump_entry infocmp tic
- subpad				test: testcurs
- subwin				test: movewindow ncurses newdemo testcurs
--syncok				-
-+syncok				test: test_opaque
- term_attrs			test: ncurses
- termattrs			test: ncurses testcurs
- termname			test: testcurs
-@@ -534,11 +547,11 @@
- tigetflag			progs: tput
- tigetnum			test: ncurses progs: tput
- tigetstr			test: blue demo_defkey foldkeys testcurs progs: tput
--timeout				test: rain
-+timeout				test: rain savescreen
- touchline			test: chgat
--touchwin			test: chgat demo_menus edit_field filter firstlast ins_wide inserts movewindow ncurses redraw xmas
--tparm				test: dots progs: tic tput
--tputs				test: dots railroad progs: clear tset
-+touchwin			test: chgat demo_menus edit_field filter firstlast inch_wide inchs ins_wide inserts movewindow ncurses redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque xmas
-+tparm				test: dots dots_mvcur progs: tic tput
-+tputs				test: dots dots_mvcur railroad progs: clear tset
- trace				test: demo_menus hanoi hashtest lrtest ncurses testcurs view worm
- ttytype				lib: ncurses
- typeahead			test: testcurs
-@@ -551,6 +564,8 @@
- use_env				progs: tput
- use_extended_names		progs: infocmp tic
- use_legacy_coding		-
-+use_screen			test: ditto
-+use_window			test: rain worm
- vid_attr			-
- vid_puts			-
- vidattr				lib: ncurses
-@@ -561,58 +576,60 @@
- vw_scanw			-
- vwprintw			test: movewindow
- vwscanw				lib: ncurses
--wadd_wch			lib: ncurses
-+wadd_wch			test: inch_wide
- wadd_wchnstr			lib: form
- wadd_wchstr			-
--waddch				test: demo_forms firstlast knight ncurses
-+waddch				test: demo_forms demo_panels firstlast inch_wide inchs knight ncurses test_get_wstr test_getstr test_instr test_inwstr test_opaque worm
- waddchnstr			lib: ncurses
- waddchstr			-
- waddnstr			lib: menu
- waddnwstr			test: ncurses
--waddstr				test: chgat demo_forms edit_field firstlast ins_wide knight ncurses redraw testcurs
--waddwstr			test: ins_wide
-+waddstr				test: chgat demo_forms demo_panels edit_field firstlast ins_wide knight ncurses redraw testcurs
-+waddwstr			test: ins_wide test_get_wstr
- wattr_get			-
- wattr_off			lib: ncurses
- wattr_on			lib: ncurses
- wattr_set			-
- wattroff			test: demo_forms ncurses testcurs xmas
- wattron				test: testcurs xmas
--wattrset			test: demo_forms ncurses newdemo testcurs xmas
-+wattrset			test: demo_forms ncurses newdemo test_get_wstr test_getstr testcurs xmas
- wbkgd				test: cardfile demo_forms demo_menus ncurses newdemo testcurs
--wbkgdset			test: ins_wide inserts ncurses
-+wbkgdset			test: demo_panels ins_wide inserts ncurses
- wbkgrnd				lib: ncurses
- wbkgrndset			lib: ncurses
- wborder				lib: ncurses
- wborder_set			lib: ncurses
--wchgat				test: chgat view
--wclear				test: ncurses testcurs
--wclrtobot			test: firstlast ncurses testcurs
--wclrtoeol			test: chgat demo_defkey demo_keyok firstlast ins_wide inserts knight ncurses testcurs
-+wchgat				test: chgat test_get_wstr test_getstr view
-+wclear				test: ncurses test_opaque testcurs
-+wclrtobot			test: firstlast inch_wide inchs ncurses test_instr test_inwstr testcurs
-+wclrtoeol			test: chgat demo_defkey demo_keyok demo_panels firstlast inch_wide inchs ins_wide inserts knight ncurses test_instr test_inwstr testcurs
- wcolor_set			lib: ncurses
- wcursyncup			lib: form
- wdelch				test: ncurses testcurs
- wdeleteln			test: testcurs
- wecho_wchar			lib: ncurses
- wechochar			lib: ncurses
--wenclose			lib: menu
--werase				test: cardfile demo_forms demo_menus edit_field firstlast knight ncurses newdemo testcurs xmas
-+wenclose			lib: form
-+werase				test: cardfile demo_forms demo_menus demo_panels edit_field firstlast knight ncurses newdemo test_get_wstr test_getstr test_opaque testcurs xmas
- wget_wch			test: ins_wide ncurses
--wget_wstr			-
-+wget_wstr			test: test_get_wstr
- wgetbkgrnd			lib: ncurses
--wgetch				test: cardfile chgat demo_defkey demo_keyok demo_menus edit_field gdc inserts knight movewindow ncurses newdemo redraw testcurs
--wgetn_wstr			test: ncurses
--wgetnstr			test: ncurses
--wgetstr				-
-+wgetch				test: cardfile chgat demo_defkey demo_keyok demo_menus demo_panels edit_field gdc inserts knight movewindow ncurses newdemo rain redraw test_opaque testcurs worm
-+wgetn_wstr			test: ncurses test_get_wstr
-+wgetnstr			test: ncurses test_getstr
-+wgetparent			test: test_opaque
-+wgetscrreg			test: test_opaque
-+wgetstr				test: test_getstr
- whline				test: testcurs
- whline_set			lib: ncurses
--win_wch				lib: form
--win_wchnstr			lib: form
--win_wchstr			-
--winch				test: knight testcurs
--winchnstr			lib: ncurses
--winchstr			-
--winnstr				test: demo_altkeys demo_defkey foldkeys
--winnwstr			lib: ncurses
-+win_wch				test: inch_wide
-+win_wchnstr			test: inch_wide
-+win_wchstr			test: inch_wide
-+winch				test: inchs knight testcurs
-+winchnstr			test: inchs
-+winchstr			test: inchs
-+winnstr				test: demo_altkeys demo_defkey foldkeys test_instr
-+winnwstr			test: test_inwstr
- wins_nwstr			test: ins_wide
- wins_wch			test: ins_wide
- wins_wstr			test: ins_wide
-@@ -621,42 +638,42 @@
- winsertln			test: testcurs
- winsnstr			test: inserts
- winsstr				test: inserts
--winstr				-
--winwstr				lib: ncurses
--wmouse_trafo			lib: menu
--wmove				test: chgat demo_altkeys demo_defkey demo_keyok demo_menus firstlast foldkeys ins_wide inserts knight movewindow ncurses newdemo redraw testcurs
--wnoutrefresh			test: demo_menus edit_field ins_wide inserts knight movewindow ncurses redraw
--wprintw				test: chgat demo_defkey demo_forms demo_keyok demo_menus edit_field ins_wide inserts knight movewindow ncurses testcurs
-+winstr				test: test_instr
-+winwstr				test: test_inwstr
-+wmouse_trafo			lib: form
-+wmove				test: chgat demo_altkeys demo_defkey demo_keyok demo_menus demo_panels firstlast foldkeys inch_wide inchs ins_wide inserts knight movewindow ncurses newdemo redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs worm
-+wnoutrefresh			test: demo_menus edit_field inch_wide inchs ins_wide inserts knight movewindow ncurses redraw test_get_wstr test_getstr test_instr test_inwstr test_opaque
-+wprintw				test: chgat demo_defkey demo_forms demo_keyok demo_menus demo_panels edit_field inch_wide inchs ins_wide inserts knight movewindow ncurses test_get_wstr test_getstr test_instr test_inwstr test_opaque testcurs
- wredrawln			test: redraw
--wrefresh			test: chgat demo_forms demo_keyok demo_menus edit_field firstlast knight lrtest movewindow ncurses newdemo redraw tclock testcurs view xmas
-+wrefresh			test: chgat demo_forms demo_keyok demo_menus demo_panels edit_field firstlast knight lrtest movewindow ncurses newdemo redraw savescreen tclock testcurs view worm xmas
- wresize				test: cardfile ncurses
- wscanw				test: testcurs
--wscrl				test: ncurses testcurs view
-+wscrl				test: ncurses testcurs
- wsetscrreg			test: ncurses testcurs
--wstandend			test: xmas
--wstandout			test: xmas
-+wstandend			test: test_opaque xmas
-+wstandout			test: test_opaque xmas
- wsyncdown			test: movewindow
- wsyncup				lib: form
- wtimeout			test: ncurses
- wtouchln			lib: ncurses
--wunctrl				-
-+wunctrl				lib: ncurses
- wvline				test: testcurs
- wvline_set			lib: ncurses
- 
- libpanel:
- --------
--bottom_panel			test: ncurses
--del_panel			test: ncurses
--hide_panel			test: ncurses
--move_panel			test: ncurses
--new_panel			test: cardfile ncurses
--panel_above			-
--panel_below			-
--panel_hidden			-
--panel_userptr			test: ncurses
--panel_window			test: cardfile ncurses
--replace_panel			-
--set_panel_userptr		test: ncurses
--show_panel			test: ncurses
--top_panel			test: cardfile ncurses
--update_panels			test: cardfile ncurses
-+bottom_panel			test: demo_panels ncurses
-+del_panel			test: demo_panels ncurses
-+hide_panel			test: demo_panels ncurses
-+move_panel			test: demo_panels ncurses
-+new_panel			test: cardfile demo_panels ncurses
-+panel_above			test: demo_panels
-+panel_below			test: demo_panels
-+panel_hidden			test: demo_panels
-+panel_userptr			test: demo_panels ncurses
-+panel_window			test: cardfile demo_panels ncurses
-+replace_panel			test: demo_panels
-+set_panel_userptr		test: demo_panels ncurses
-+show_panel			test: demo_panels ncurses
-+top_panel			test: cardfile demo_panels ncurses
-+update_panels			test: cardfile demo_panels ncurses
-diff -Naur ncurses-5.6.orig/test/aclocal.m4 ncurses-5.6/test/aclocal.m4
---- ncurses-5.6.orig/test/aclocal.m4	2006-12-02 19:10:15.000000000 -0500
-+++ ncurses-5.6/test/aclocal.m4	2008-06-18 06:49:47.000000000 -0400
-@@ -1,5 +1,5 @@
- dnl***************************************************************************
--dnl Copyright (c) 2003-2005,2006 Free Software Foundation, Inc.              *
-+dnl Copyright (c) 2003-2007,2008 Free Software Foundation, Inc.              *
- dnl                                                                          *
- dnl Permission is hereby granted, free of charge, to any person obtaining a  *
- dnl copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
- dnl authorization.                                                           *
- dnl***************************************************************************
- dnl
--dnl $Id: aclocal.m4,v 1.17 2006/12/03 00:10:15 tom Exp $
-+dnl $Id: aclocal.m4,v 1.22 2008/02/09 18:22:17 tom Exp $
- dnl
- dnl Author: Thomas E. Dickey
- dnl
-@@ -122,42 +122,119 @@
- 
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_ADD_INCDIR version: 4 updated: 2002/12/21 14:25:52
-+dnl CF_ADD_INCDIR version: 9 updated: 2008/02/09 13:15:34
- dnl -------------
- dnl Add an include-directory to $CPPFLAGS.  Don't add /usr/include, since it's
- dnl redundant.  We don't normally need to add -I/usr/local/include for gcc,
- dnl but old versions (and some misinstalled ones) need that.  To make things
--dnl worse, gcc 3.x gives error messages if -I/usr/local/include is added to
-+dnl worse, gcc 3.x may give error messages if -I/usr/local/include is added to
- dnl the include-path).
- AC_DEFUN([CF_ADD_INCDIR],
- [
--for cf_add_incdir in $1
--do
--	while true
-+if test -n "$1" ; then
-+  for cf_add_incdir in $1
-+  do
-+	while test $cf_add_incdir != /usr/include
- 	do
--		case $cf_add_incdir in
--		/usr/include) # (vi
--			;;
--		/usr/local/include) # (vi
-+	  if test -d $cf_add_incdir
-+	  then
-+		cf_have_incdir=no
-+		if test -n "$CFLAGS$CPPFLAGS" ; then
-+		  # a loop is needed to ensure we can add subdirs of existing dirs
-+		  for cf_test_incdir in $CFLAGS $CPPFLAGS ; do
-+			if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then
-+			  cf_have_incdir=yes; break
-+			fi
-+		  done
-+		fi
-+
-+		if test "$cf_have_incdir" = no ; then
-+          if test "$cf_add_incdir" = /usr/local/include ; then
- 			if test "$GCC" = yes
- 			then
--				cf_save_CPPFLAGS="$CPPFLAGS"
--				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
--				AC_TRY_COMPILE([#include <stdio.h>],
--						[printf("Hello")],
--						[],
--						[CPPFLAGS="$cf_save_CPPFLAGS"])
-+			  cf_save_CPPFLAGS=$CPPFLAGS
-+			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
-+			  AC_TRY_COMPILE([#include <stdio.h>],
-+				  [printf("Hello")],
-+				  [],
-+				  [cf_have_incdir=yes])
-+			  CPPFLAGS=$cf_save_CPPFLAGS
- 			fi
--			;;
--		*) # (vi
--			CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
--			;;
--		esac
--		cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
--		test "$cf_top_incdir" = "$cf_add_incdir" && break
--		cf_add_incdir="$cf_top_incdir"
-+		  fi
-+		fi
-+
-+		if test "$cf_have_incdir" = no ; then
-+		  CF_VERBOSE(adding $cf_add_incdir to include-path)
-+		  ifelse($2,,CPPFLAGS,$2)="-I$cf_add_incdir $ifelse($2,,CPPFLAGS,[$]$2)"
-+
-+          cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
-+          test "$cf_top_incdir" = "$cf_add_incdir" && break
-+          cf_add_incdir="$cf_top_incdir"
-+		else
-+		  break
-+		fi
-+	  fi
- 	done
--done
-+  done
-+fi
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_ADD_LIBDIR version: 6 updated: 2008/02/09 13:15:34
-+dnl -------------
-+dnl	Adds to the library-path
-+dnl
-+dnl	Some machines have trouble with multiple -L options.
-+dnl
-+dnl $1 is the (list of) directory(s) to add
-+dnl $2 is the optional name of the variable to update (default LDFLAGS)
-+dnl
-+AC_DEFUN([CF_ADD_LIBDIR],
-+[
-+if test -n "$1" ; then
-+  for cf_add_libdir in $1
-+  do
-+    if test $cf_add_libdir = /usr/lib ; then
-+      :
-+    elif test -d $cf_add_libdir
-+    then
-+      cf_have_libdir=no
-+      if test -n "$LDFLAGS$LIBS" ; then
-+        # a loop is needed to ensure we can add subdirs of existing dirs
-+        for cf_test_libdir in $LDFLAGS $LIBS ; do
-+          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-+            cf_have_libdir=yes; break
-+          fi
-+        done
-+      fi
-+      if test "$cf_have_libdir" = no ; then
-+        CF_VERBOSE(adding $cf_add_libdir to library-path)
-+        ifelse($2,,LDFLAGS,$2)="-L$cf_add_libdir $ifelse($2,,LDFLAGS,[$]$2)"
-+      fi
-+    fi
-+  done
-+fi
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_ADD_SUBDIR_PATH version: 2 updated: 2007/07/29 10:12:59
-+dnl ------------------
-+dnl Append to a search-list for a nonstandard header/lib-file
-+dnl	$1 = the variable to return as result
-+dnl	$2 = the package name
-+dnl	$3 = the subdirectory, e.g., bin, include or lib
-+dnl $4 = the directory under which we will test for subdirectories
-+dnl $5 = a directory that we do not want $4 to match
-+AC_DEFUN([CF_ADD_SUBDIR_PATH],
-+[
-+test "$4" != "$5" && \
-+test -d "$4" && \
-+ifelse([$5],NONE,,[(test $5 = NONE || test -d $5) &&]) {
-+	test -n "$verbose" && echo "	... testing for $3-directories under $4"
-+	test -d $4/$3 &&          $1="[$]$1 $4/$3"
-+	test -d $4/$3/$2 &&       $1="[$]$1 $4/$3/$2"
-+	test -d $4/$3/$2/$3 &&    $1="[$]$1 $4/$3/$2/$3"
-+	test -d $4/$2/$3 &&       $1="[$]$1 $4/$2/$3"
-+	test -d $4/$2/$3/$2 &&    $1="[$]$1 $4/$2/$3/$2"
-+}
- ])dnl
- dnl ---------------------------------------------------------------------------
- dnl CF_ANSI_CC_CHECK version: 9 updated: 2001/12/30 17:53:34
-@@ -230,6 +307,12 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_ARG_DISABLE version: 3 updated: 1999/03/30 17:24:31
-+dnl --------------
-+dnl Allow user to disable a normally-on option.
-+AC_DEFUN([CF_ARG_DISABLE],
-+[CF_ARG_OPTION($1,[$2],[$3],[$4],yes)])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_ARG_ENABLE version: 3 updated: 1999/03/30 17:24:31
- dnl -------------
- dnl Allow user to enable a normally-off option.
-@@ -383,6 +466,60 @@
- CF_TERM_HEADER
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_CURSES_FUNCS version: 13 updated: 2007/04/28 09:15:55
-+dnl ---------------
-+dnl Curses-functions are a little complicated, since a lot of them are macros.
-+AC_DEFUN([CF_CURSES_FUNCS],
-+[
-+AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
-+AC_REQUIRE([CF_XOPEN_CURSES])
-+AC_REQUIRE([CF_CURSES_TERM_H])
-+for cf_func in $1
-+do
-+	CF_UPPER(cf_tr_func,$cf_func)
-+	AC_MSG_CHECKING(for ${cf_func})
-+	CF_MSG_LOG(${cf_func})
-+	AC_CACHE_VAL(cf_cv_func_$cf_func,[
-+		eval cf_result='$ac_cv_func_'$cf_func
-+		if test ".$cf_result" != ".no"; then
-+			AC_TRY_LINK([
-+#ifdef HAVE_XCURSES
-+#include <xcurses.h>
-+char * XCursesProgramName = "test";
-+#else
-+#include <${cf_cv_ncurses_header-curses.h}>
-+#if defined(NCURSES_VERSION) && defined(HAVE_NCURSESW_TERM_H)
-+#include <ncursesw/term.h>
-+#else
-+#if defined(NCURSES_VERSION) && defined(HAVE_NCURSES_TERM_H)
-+#include <ncurses/term.h>
-+#else
-+#ifdef HAVE_TERM_H
-+#include <term.h>
-+#endif
-+#endif
-+#endif
-+#endif],
-+			[
-+#ifndef ${cf_func}
-+long foo = (long)(&${cf_func});
-+${cf_cv_main_return-return}(foo == 0);
-+#endif
-+			],
-+			[cf_result=yes],
-+			[cf_result=no])
-+		fi
-+		eval 'cf_cv_func_'$cf_func'=$cf_result'
-+	])
-+	# use the computed/retrieved cache-value:
-+	eval 'cf_result=$cf_cv_func_'$cf_func
-+	AC_MSG_RESULT($cf_result)
-+	if test $cf_result != no; then
-+		AC_DEFINE_UNQUOTED(HAVE_${cf_tr_func})
-+	fi
-+done
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_CURSES_HEADER version: 1 updated: 2005/12/31 13:28:25
- dnl ----------------
- dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common
-@@ -412,7 +549,7 @@
- AC_CHECK_HEADERS($cf_cv_ncurses_header)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_CURSES_LIBS version: 24 updated: 2006/02/04 19:44:43
-+dnl CF_CURSES_LIBS version: 26 updated: 2007/07/29 10:32:40
- dnl --------------
- dnl Look for the curses libraries.  Older curses implementations may require
- dnl termcap/termlib to be linked as well.  Call CF_CURSES_CPPFLAGS first.
-@@ -421,97 +558,139 @@
- AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
- AC_MSG_CHECKING(if we have identified curses libraries)
- AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>],
--	[initscr(); tgoto("?", 0,0)],
--	cf_result=yes,
--	cf_result=no)
-+    [initscr(); tgoto("?", 0,0)],
-+    cf_result=yes,
-+    cf_result=no)
- AC_MSG_RESULT($cf_result)
- 
- if test "$cf_result" = no ; then
- case $host_os in #(vi
- freebsd*) #(vi
--	AC_CHECK_LIB(mytinfo,tgoto,[LIBS="-lmytinfo $LIBS"])
--	;;
-+    AC_CHECK_LIB(mytinfo,tgoto,[LIBS="-lmytinfo $LIBS"])
-+    ;;
- hpux10.*) #(vi
--	AC_CHECK_LIB(cur_colr,initscr,[
--		LIBS="-lcur_colr $LIBS"
--		ac_cv_func_initscr=yes
--		],[
--	AC_CHECK_LIB(Hcurses,initscr,[
--		# HP's header uses __HP_CURSES, but user claims _HP_CURSES.
--		LIBS="-lHcurses $LIBS"
--		CPPFLAGS="-D__HP_CURSES -D_HP_CURSES $CPPFLAGS"
--		ac_cv_func_initscr=yes
--		])])
--	;;
-+    AC_CHECK_LIB(cur_colr,initscr,[
-+        LIBS="-lcur_colr $LIBS"
-+        ac_cv_func_initscr=yes
-+        ],[
-+    AC_CHECK_LIB(Hcurses,initscr,[
-+        # HP's header uses __HP_CURSES, but user claims _HP_CURSES.
-+        LIBS="-lHcurses $LIBS"
-+        CPPFLAGS="-D__HP_CURSES -D_HP_CURSES $CPPFLAGS"
-+        ac_cv_func_initscr=yes
-+        ])])
-+    ;;
- linux*) # Suse Linux does not follow /usr/lib convention
--	LIBS="$LIBS -L/lib"
--	;;
-+    CF_ADD_LIBDIR(/lib)
-+    ;;
- sunos3*|sunos4*)
--	test -d /usr/5lib && \
--	LIBS="$LIBS -L/usr/5lib -lcurses -ltermcap"
--	ac_cv_func_initscr=yes
--	;;
-+    if test -d /usr/5lib ; then
-+      CF_ADD_LIBDIR(/usr/5lib)
-+      LIBS="$LIBS -lcurses -ltermcap"
-+    fi
-+    ac_cv_func_initscr=yes
-+    ;;
- esac
- 
- if test ".$ac_cv_func_initscr" != .yes ; then
--	cf_save_LIBS="$LIBS"
--	cf_term_lib=""
--	cf_curs_lib=""
--
--	if test ".${cf_cv_ncurses_version-no}" != .no
--	then
--		cf_check_list="ncurses curses cursesX"
--	else
--		cf_check_list="cursesX curses ncurses"
--	fi
--
--	# Check for library containing tgoto.  Do this before curses library
--	# because it may be needed to link the test-case for initscr.
--	AC_CHECK_FUNC(tgoto,[cf_term_lib=predefined],[
--		for cf_term_lib in $cf_check_list termcap termlib unknown
--		do
--			AC_CHECK_LIB($cf_term_lib,tgoto,[break])
--		done
--	])
--
--	# Check for library containing initscr
--	test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS"
--	for cf_curs_lib in $cf_check_list xcurses jcurses unknown
--	do
--		AC_CHECK_LIB($cf_curs_lib,initscr,[break])
--	done
--	test $cf_curs_lib = unknown && AC_ERROR(no curses library found)
--
--	LIBS="-l$cf_curs_lib $cf_save_LIBS"
--	if test "$cf_term_lib" = unknown ; then
--		AC_MSG_CHECKING(if we can link with $cf_curs_lib library)
--		AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>],
--			[initscr()],
--			[cf_result=yes],
--			[cf_result=no])
--		AC_MSG_RESULT($cf_result)
--		test $cf_result = no && AC_ERROR(Cannot link curses library)
--	elif test "$cf_curs_lib" = "$cf_term_lib" ; then
--		:
--	elif test "$cf_term_lib" != predefined ; then
--		AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries)
--		AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>],
--			[initscr(); tgoto((char *)0, 0, 0);],
--			[cf_result=no],
--			[
--			LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
--			AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>],
--				[initscr()],
--				[cf_result=yes],
--				[cf_result=error])
--			])
--		AC_MSG_RESULT($cf_result)
--	fi
-+    cf_save_LIBS="$LIBS"
-+    cf_term_lib=""
-+    cf_curs_lib=""
-+
-+    if test ".${cf_cv_ncurses_version-no}" != .no
-+    then
-+        cf_check_list="ncurses curses cursesX"
-+    else
-+        cf_check_list="cursesX curses ncurses"
-+    fi
-+
-+    # Check for library containing tgoto.  Do this before curses library
-+    # because it may be needed to link the test-case for initscr.
-+    AC_CHECK_FUNC(tgoto,[cf_term_lib=predefined],[
-+        for cf_term_lib in $cf_check_list termcap termlib unknown
-+        do
-+            AC_CHECK_LIB($cf_term_lib,tgoto,[break])
-+        done
-+    ])
-+
-+    # Check for library containing initscr
-+    test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS"
-+    for cf_curs_lib in $cf_check_list xcurses jcurses unknown
-+    do
-+        AC_CHECK_LIB($cf_curs_lib,initscr,[break])
-+    done
-+    test $cf_curs_lib = unknown && AC_ERROR(no curses library found)
-+
-+    LIBS="-l$cf_curs_lib $cf_save_LIBS"
-+    if test "$cf_term_lib" = unknown ; then
-+        AC_MSG_CHECKING(if we can link with $cf_curs_lib library)
-+        AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>],
-+            [initscr()],
-+            [cf_result=yes],
-+            [cf_result=no])
-+        AC_MSG_RESULT($cf_result)
-+        test $cf_result = no && AC_ERROR(Cannot link curses library)
-+    elif test "$cf_curs_lib" = "$cf_term_lib" ; then
-+        :
-+    elif test "$cf_term_lib" != predefined ; then
-+        AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib libraries)
-+        AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>],
-+            [initscr(); tgoto((char *)0, 0, 0);],
-+            [cf_result=no],
-+            [
-+            LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
-+            AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>],
-+                [initscr()],
-+                [cf_result=yes],
-+                [cf_result=error])
-+            ])
-+        AC_MSG_RESULT($cf_result)
-+    fi
- fi
- fi
- 
- ])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_CURSES_TERM_H version: 6 updated: 2003/11/06 19:59:57
-+dnl ----------------
-+dnl SVr4 curses should have term.h as well (where it puts the definitions of
-+dnl the low-level interface).  This may not be true in old/broken implementations,
-+dnl as well as in misconfigured systems (e.g., gcc configured for Solaris 2.4
-+dnl running with Solaris 2.5.1).
-+AC_DEFUN([CF_CURSES_TERM_H],
-+[
-+AC_CACHE_CHECK(for term.h, cf_cv_term_header,[
-+
-+AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
-+# If we found <ncurses/curses.h>, look for <ncurses/term.h>, but always look
-+# for <term.h> if we do not find the variant.
-+for cf_header in \
-+	`echo ${cf_cv_ncurses_header-curses.h} | sed -e 's%/.*%/%'`term.h \
-+	term.h
-+do
-+	AC_TRY_COMPILE([
-+#include <${cf_cv_ncurses_header-curses.h}>
-+#include <${cf_header}>],
-+	[WINDOW *x],
-+	[cf_cv_term_header=$cf_header
-+	 break],
-+	[cf_cv_term_header=no])
-+done
-+])
-+
-+case $cf_cv_term_header in #(vi
-+term.h) #(vi
-+	AC_DEFINE(HAVE_TERM_H)
-+	;;
-+ncurses/term.h)
-+	AC_DEFINE(HAVE_NCURSES_TERM_H)
-+	;;
-+ncursesw/term.h)
-+	AC_DEFINE(HAVE_NCURSESW_TERM_H)
-+	;;
-+esac
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_CURSES_WACS_MAP version: 3 updated: 2003/05/17 22:19:02
- dnl ------------------
- dnl Check for likely values of wacs_map[]:
-@@ -537,6 +716,43 @@
- dnl "dirname" is not portable, so we fake it with a shell script.
- AC_DEFUN([CF_DIRNAME],[$1=`echo $2 | sed -e 's%/[[^/]]*$%%'`])dnl
- dnl ---------------------------------------------------------------------------
-+dnl CF_DISABLE_ECHO version: 10 updated: 2003/04/17 22:27:11
-+dnl ---------------
-+dnl You can always use "make -n" to see the actual options, but it's hard to
-+dnl pick out/analyze warning messages when the compile-line is long.
-+dnl
-+dnl Sets:
-+dnl	ECHO_LT - symbol to control if libtool is verbose
-+dnl	ECHO_LD - symbol to prefix "cc -o" lines
-+dnl	RULE_CC - symbol to put before implicit "cc -c" lines (e.g., .c.o)
-+dnl	SHOW_CC - symbol to put before explicit "cc -c" lines
-+dnl	ECHO_CC - symbol to put before any "cc" line
-+dnl
-+AC_DEFUN([CF_DISABLE_ECHO],[
-+AC_MSG_CHECKING(if you want to see long compiling messages)
-+CF_ARG_DISABLE(echo,
-+	[  --disable-echo          display "compiling" commands],
-+	[
-+    ECHO_LT='--silent'
-+    ECHO_LD='@echo linking [$]@;'
-+    RULE_CC='	@echo compiling [$]<'
-+    SHOW_CC='	@echo compiling [$]@'
-+    ECHO_CC='@'
-+],[
-+    ECHO_LT=''
-+    ECHO_LD=''
-+    RULE_CC='# compiling'
-+    SHOW_CC='# compiling'
-+    ECHO_CC=''
-+])
-+AC_MSG_RESULT($enableval)
-+AC_SUBST(ECHO_LT)
-+AC_SUBST(ECHO_LD)
-+AC_SUBST(RULE_CC)
-+AC_SUBST(SHOW_CC)
-+AC_SUBST(ECHO_CC)
-+])dnl
-+dnl ---------------------------------------------------------------------------
- dnl CF_ENABLE_WARNINGS version: 3 updated: 2003/05/24 14:24:29
- dnl ------------------
- dnl Configure-option to enable gcc warnings
-@@ -606,7 +822,7 @@
- ])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_FUNC_CURSES_VERSION version: 3 updated: 2003/05/17 22:19:02
-+dnl CF_FUNC_CURSES_VERSION version: 4 updated: 2007/04/28 09:15:55
- dnl ----------------------
- dnl Solaris has a data item 'curses_version', which confuses AC_CHECK_FUNCS.
- dnl It's a character string "SVR4", not documented.
-@@ -619,7 +835,7 @@
- {
- 	char temp[1024];
- 	sprintf(temp, "%s\n", curses_version());
--	exit(0);
-+	${cf_cv_main_return-return}(0);
- }]
- ,[cf_cv_func_curses_version=yes]
- ,[cf_cv_func_curses_version=no]
-@@ -628,7 +844,7 @@
- test "$cf_cv_func_curses_version" = yes && AC_DEFINE(HAVE_CURSES_VERSION)
- ])
- dnl ---------------------------------------------------------------------------
--dnl CF_GCC_ATTRIBUTES version: 10 updated: 2005/05/28 13:16:28
-+dnl CF_GCC_ATTRIBUTES version: 11 updated: 2007/07/29 09:55:12
- dnl -----------------
- dnl Test for availability of useful gcc __attribute__ directives to quiet
- dnl compiler warnings.  Though useful, not all are supported -- and contrary
-@@ -655,7 +871,7 @@
- then
- 	AC_CHECKING([for $CC __attribute__ directives])
- cat > conftest.$ac_ext <<EOF
--#line __oline__ "configure"
-+#line __oline__ "${as_me-configure}"
- #include "confdefs.h"
- #include "conftest.h"
- #include "conftest.i"
-@@ -717,7 +933,7 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_GCC_WARNINGS version: 20 updated: 2005/08/06 18:37:29
-+dnl CF_GCC_WARNINGS version: 22 updated: 2007/07/29 09:55:12
- dnl ---------------
- dnl Check if the compiler supports useful warning options.  There's a few that
- dnl we don't use, simply because they're too noisy:
-@@ -742,7 +958,7 @@
- CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
- 
- cat > conftest.$ac_ext <<EOF
--#line __oline__ "configure"
-+#line __oline__ "${as_me-configure}"
- int main(int argc, char *argv[[]]) { return (argv[[argc-1]] == 0) ; }
- EOF
- 
-@@ -763,7 +979,7 @@
- 	AC_CHECKING([for $CC warning options])
- 	cf_save_CFLAGS="$CFLAGS"
- 	EXTRA_CFLAGS="-Wall"
--	for cf_opt in $1 \
-+	for cf_opt in \
- 		wd1419 \
- 		wd1682 \
- 		wd1683 \
-@@ -930,15 +1146,15 @@
- AC_DEFUN([CF_LIBRARY_PATH],
- [CF_SUBDIR_PATH($1,$2,lib)])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_MSG_LOG version: 3 updated: 1997/09/07 14:05:52
-+dnl CF_MSG_LOG version: 4 updated: 2007/07/29 09:55:12
- dnl ----------
- dnl Write a debug message to config.log, along with the line number in the
- dnl configure script.
- AC_DEFUN([CF_MSG_LOG],[
--echo "(line __oline__) testing $* ..." 1>&AC_FD_CC
-+echo "${as_me-configure}:__oline__: testing $* ..." 1>&AC_FD_CC
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_NCURSES_CC_CHECK version: 3 updated: 2003/01/12 18:59:28
-+dnl CF_NCURSES_CC_CHECK version: 4 updated: 2007/07/29 10:39:05
- dnl -------------------
- dnl Check if we can compile with ncurses' header file
- dnl $1 is the cache variable to set
-@@ -967,11 +1183,11 @@
- #endif
- #endif
- 	]
--	,[$1=$cf_header]
-+	,[$1=$2]
- 	,[$1=no])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_NCURSES_CPPFLAGS version: 18 updated: 2005/12/31 13:26:39
-+dnl CF_NCURSES_CPPFLAGS version: 19 updated: 2007/07/29 13:35:20
- dnl -------------------
- dnl Look for the SVr4 curses clone 'ncurses' in the standard places, adjusting
- dnl the CPPFLAGS variable so we can include its header.
-@@ -999,8 +1215,9 @@
- cf_ncuhdr_root=ifelse($1,,ncurses,$1)
- 
- test -n "$cf_cv_curses_dir" && \
--test "$cf_cv_curses_dir" != "no" && \
--CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS"
-+test "$cf_cv_curses_dir" != "no" && { \
-+  CF_ADD_INCDIR($cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root)
-+}
- 
- AC_CACHE_CHECK(for $cf_ncuhdr_root header in include-path, cf_cv_ncurses_h,[
- 	cf_header_list="$cf_ncuhdr_root/curses.h $cf_ncuhdr_root/ncurses.h"
-@@ -1087,7 +1304,7 @@
- 
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_NCURSES_LIBS version: 12 updated: 2004/04/27 16:26:05
-+dnl CF_NCURSES_LIBS version: 13 updated: 2007/07/29 10:29:20
- dnl ---------------
- dnl Look for the ncurses library.  This is a little complicated on Linux,
- dnl because it may be linked with the gpm (general purpose mouse) library.
-@@ -1127,7 +1344,8 @@
- 
- if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
- then
--	LIBS="-L$cf_cv_curses_dir/lib -l$cf_nculib_root $LIBS"
-+	CF_ADD_LIBDIR($cf_cv_curses_dir/lib)
-+	LIBS="-l$cf_nculib_root $LIBS"
- else
- 	CF_FIND_LIBRARY($cf_nculib_root,$cf_nculib_root,
- 		[#include <${cf_cv_ncurses_header-curses.h}>],
-@@ -1155,7 +1373,7 @@
- AC_DEFINE_UNQUOTED($cf_nculib_ROOT)
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_NCURSES_VERSION version: 11 updated: 2003/11/06 19:59:57
-+dnl CF_NCURSES_VERSION version: 12 updated: 2007/04/28 09:15:55
- dnl ------------------
- dnl Check for the version of ncurses, to aid in reporting bugs, etc.
- dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS.  We don't use
-@@ -1186,7 +1404,7 @@
- 	make an error
- # endif
- #endif
--	exit(0);
-+	${cf_cv_main_return-return}(0);
- }],[
- 	cf_cv_ncurses_version=`cat $cf_tempfile`],,[
- 
-@@ -1442,7 +1660,42 @@
- 		-e 's/-[[UD]]$3\(=[[^ 	]]*\)\?[$]//g'`
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_SUBDIR_PATH version: 4 updated: 2006/11/18 17:13:19
-+dnl CF_SIG_ATOMIC_T version: 2 updated: 2005/09/18 17:27:12
-+dnl ---------------
-+dnl signal handler, but there are some gcc depedencies in that recommendation.
-+dnl Try anyway.
-+AC_DEFUN([CF_SIG_ATOMIC_T],
-+[
-+AC_MSG_CHECKING(for signal global datatype)
-+AC_CACHE_VAL(cf_cv_sig_atomic_t,[
-+	for cf_type in \
-+		"volatile sig_atomic_t" \
-+		"sig_atomic_t" \
-+		"int"
-+	do
-+	AC_TRY_COMPILE([
-+#include <sys/types.h>
-+#include <signal.h>
-+#include <stdio.h>
-+
-+extern $cf_type x;
-+$cf_type x;
-+static void handler(int sig)
-+{
-+	x = 5;
-+}],
-+		[signal(SIGINT, handler);
-+		 x = 1],
-+		[cf_cv_sig_atomic_t=$cf_type],
-+		[cf_cv_sig_atomic_t=no])
-+		test "$cf_cv_sig_atomic_t" != no && break
-+	done
-+	])
-+AC_MSG_RESULT($cf_cv_sig_atomic_t)
-+test "$cf_cv_sig_atomic_t" != no && AC_DEFINE_UNQUOTED(SIG_ATOMIC_T, $cf_cv_sig_atomic_t)
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_SUBDIR_PATH version: 5 updated: 2007/07/29 09:55:12
- dnl --------------
- dnl Construct a search-list for a nonstandard header/lib-file
- dnl	$1 = the variable to return as result
-@@ -1451,59 +1704,11 @@
- AC_DEFUN([CF_SUBDIR_PATH],
- [$1=""
- 
--test -d "[$]HOME" && {
--	test -n "$verbose" && echo "	... testing $3-directories under [$]HOME"
--	test -d "[$]HOME/$3" &&          $1="[$]$1 [$]HOME/$3"
--	test -d "[$]HOME/$3/$2" &&       $1="[$]$1 [$]HOME/$3/$2"
--	test -d "[$]HOME/$3/$2/$3" &&    $1="[$]$1 [$]HOME/$3/$2/$3"
--}
--
--# For other stuff under the home directory, it should be sufficient to put
--# a symbolic link for $HOME/$2 to the actual package location:
--test -d "[$]HOME/$2" && {
--	test -n "$verbose" && echo "	... testing $3-directories under [$]HOME/$2"
--	test -d "[$]HOME/$2/$3" &&       $1="[$]$1 [$]HOME/$2/$3"
--	test -d "[$]HOME/$2/$3/$2" &&    $1="[$]$1 [$]HOME/$2/$3/$2"
--}
--
--test "$prefix" != /usr/local && \
--test -d /usr/local && {
--	test -n "$verbose" && echo "	... testing $3-directories under /usr/local"
--	test -d /usr/local/$3 &&       $1="[$]$1 /usr/local/$3"
--	test -d /usr/local/$3/$2 &&    $1="[$]$1 /usr/local/$3/$2"
--	test -d /usr/local/$3/$2/$3 && $1="[$]$1 /usr/local/$3/$2/$3"
--	test -d /usr/local/$2/$3 &&    $1="[$]$1 /usr/local/$2/$3"
--	test -d /usr/local/$2/$3/$2 && $1="[$]$1 /usr/local/$2/$3/$2"
--}
--
--test "$prefix" != NONE && \
--test -d $prefix && {
--	test -n "$verbose" && echo "	... testing $3-directories under $prefix"
--	test -d $prefix/$3 &&          $1="[$]$1 $prefix/$3"
--	test -d $prefix/$3/$2 &&       $1="[$]$1 $prefix/$3/$2"
--	test -d $prefix/$3/$2/$3 &&    $1="[$]$1 $prefix/$3/$2/$3"
--	test -d $prefix/$2/$3 &&       $1="[$]$1 $prefix/$2/$3"
--	test -d $prefix/$2/$3/$2 &&    $1="[$]$1 $prefix/$2/$3/$2"
--}
--
--test "$prefix" != /opt && \
--test -d /opt && {
--	test -n "$verbose" && echo "	... testing $3-directories under /opt"
--	test -d /opt/$3 &&             $1="[$]$1 /opt/$3"
--	test -d /opt/$3/$2 &&          $1="[$]$1 /opt/$3/$2"
--	test -d /opt/$3/$2/$3 &&       $1="[$]$1 /opt/$3/$2/$3"
--	test -d /opt/$2/$3 &&          $1="[$]$1 /opt/$2/$3"
--	test -d /opt/$2/$3/$2 &&       $1="[$]$1 /opt/$2/$3/$2"
--}
--
--test "$prefix" != /usr && \
--test -d /usr && {
--	test -n "$verbose" && echo "	... testing $3-directories under /usr"
--	test -d /usr/$3 &&             $1="[$]$1 /usr/$3"
--	test -d /usr/$3/$2 &&          $1="[$]$1 /usr/$3/$2"
--	test -d /usr/$3/$2/$3 &&       $1="[$]$1 /usr/$3/$2/$3"
--	test -d /usr/$2/$3 &&          $1="[$]$1 /usr/$2/$3"
--}
-+CF_ADD_SUBDIR_PATH($1,$2,$3,/usr,$prefix)
-+CF_ADD_SUBDIR_PATH($1,$2,$3,$prefix,NONE)
-+CF_ADD_SUBDIR_PATH($1,$2,$3,/usr/local,$prefix)
-+CF_ADD_SUBDIR_PATH($1,$2,$3,/opt,$prefix)
-+CF_ADD_SUBDIR_PATH($1,$2,$3,[$]HOME,$prefix)
- ])dnl
- dnl ---------------------------------------------------------------------------
- dnl CF_SYS_TIME_SELECT version: 4 updated: 2000/10/04 09:18:40
-@@ -1611,11 +1816,12 @@
- fi
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_VERBOSE version: 2 updated: 1997/09/05 10:45:14
-+dnl CF_VERBOSE version: 3 updated: 2007/07/29 09:55:12
- dnl ----------
- dnl Use AC_VERBOSE w/o the warnings
- AC_DEFUN([CF_VERBOSE],
- [test -n "$verbose" && echo "	$1" 1>&AC_FD_MSG
-+CF_MSG_LOG([$1])
- ])dnl
- dnl ---------------------------------------------------------------------------
- dnl CF_WITH_CURSES_DIR version: 2 updated: 2002/11/10 14:46:59
-@@ -1630,7 +1836,37 @@
- 	[cf_cv_curses_dir=no])
- ])dnl
- dnl ---------------------------------------------------------------------------
--dnl CF_XOPEN_SOURCE version: 24 updated: 2006/04/02 16:41:09
-+dnl CF_XOPEN_CURSES version: 8 updated: 2003/11/07 19:47:46
-+dnl ---------------
-+dnl Test if we should define X/Open source for curses, needed on Digital Unix
-+dnl 4.x, to see the extended functions, but breaks on IRIX 6.x.
-+dnl
-+dnl The getbegyx() check is needed for HPUX, which omits legacy macros such
-+dnl as getbegy().  The latter is better design, but the former is standard.
-+AC_DEFUN([CF_XOPEN_CURSES],
-+[
-+AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl
-+AC_CACHE_CHECK(if we must define _XOPEN_SOURCE_EXTENDED,cf_cv_need_xopen_extension,[
-+AC_TRY_LINK([
-+#include <stdlib.h>
-+#include <${cf_cv_ncurses_header-curses.h}>],[
-+	long x = winnstr(stdscr, "", 0);
-+	int x1, y1;
-+	getbegyx(stdscr, y1, x1)],
-+	[cf_cv_need_xopen_extension=no],
-+	[AC_TRY_LINK([
-+#define _XOPEN_SOURCE_EXTENDED
-+#include <stdlib.h>
-+#include <${cf_cv_ncurses_header-curses.h}>],[
-+	long x = winnstr(stdscr, "", 0);
-+	int x1, y1;
-+	getbegyx(stdscr, y1, x1)],
-+	[cf_cv_need_xopen_extension=yes],
-+	[cf_cv_need_xopen_extension=unknown])])])
-+test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
-+])dnl
-+dnl ---------------------------------------------------------------------------
-+dnl CF_XOPEN_SOURCE version: 25 updated: 2007/01/29 18:36:38
- dnl ---------------
- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions,
- dnl or adapt to the vendor's definitions to get equivalent functionality,
-@@ -1664,7 +1900,7 @@
- irix[[56]].*) #(vi
- 	CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
- 	;;
--linux*|gnu*) #(vi
-+linux*|gnu*|k*bsd*-gnu) #(vi
- 	CF_GNU_SOURCE
- 	;;
- mirbsd*) #(vi
-diff -Naur ncurses-5.6.orig/test/bs.c ncurses-5.6/test/bs.c
---- ncurses-5.6.orig/test/bs.c	2006-05-20 11:38:52.000000000 -0400
-+++ ncurses-5.6/test/bs.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -34,7 +34,7 @@
-  * v2.0 featuring strict ANSI/POSIX conformance, November 1993.
-  * v2.1 with ncurses mouse support, September 1995
-  *
-- * $Id: bs.c,v 1.44 2006/05/20 15:38:52 tom Exp $
-+ * $Id: bs.c,v 1.45 2007/04/07 17:13:11 tom Exp $
-  */
- 
- #include <test.priv.h>
-@@ -459,7 +459,7 @@
- 	do {
- 	    c = getch();
- 	} while
--	    (!strchr("hjklrR", c) || c == FF);
-+	    (!(strchr("hjklrR", c) || c == FF));
- 
- 	if (c == FF) {
- 	    (void) clearok(stdscr, TRUE);
-diff -Naur ncurses-5.6.orig/test/cardfile.c ncurses-5.6/test/cardfile.c
---- ncurses-5.6.orig/test/cardfile.c	2006-12-09 19:30:09.000000000 -0500
-+++ ncurses-5.6/test/cardfile.c	2008-06-18 06:49:49.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1999-2004,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1999-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -29,7 +29,7 @@
- /*
-  * Author: Thomas E. Dickey
-  *
-- * $Id: cardfile.c,v 1.28 2006/12/10 00:30:09 tom Exp $
-+ * $Id: cardfile.c,v 1.33 2008/04/12 22:05:53 tom Exp $
-  *
-  * File format: text beginning in column 1 is a title; other text is content.
-  */
-@@ -71,9 +71,9 @@
- #if !HAVE_STRDUP
- #define strdup my_strdup
- static char *
--strdup(char *s)
-+strdup(const char *s)
- {
--    char *p = (char *) malloc(strlen(s) + 1);
-+    char *p = typeMalloc(char, strlen(s) + 1);
-     if (p)
- 	strcpy(p, s);
-     return (p);
-@@ -111,7 +111,7 @@
- 	    break;
-     }
- 
--    card = (CARD *) calloc(1, sizeof(CARD));
-+    card = typeCalloc(CARD, 1);
-     card->title = strdup(title);
-     card->content = strdup("");
- 
-@@ -135,14 +135,16 @@
-     if ((total = strlen(content)) != 0) {
- 	if ((offset = strlen(card->content)) != 0) {
- 	    total += 1 + offset;
--	    card->content = (char *) realloc(card->content, total + 1);
--	    strcpy(card->content + offset++, " ");
-+	    card->content = typeRealloc(char, total + 1, card->content);
-+	    if (card->content)
-+		strcpy(card->content + offset++, " ");
- 	} else {
- 	    if (card->content != 0)
- 		free(card->content);
--	    card->content = (char *) malloc(total + 1);
-+	    card->content = typeMalloc(char, total + 1);
- 	}
--	strcpy(card->content + offset, content);
-+	if (card->content)
-+	    strcpy(card->content + offset, content);
-     }
- }
- 
-@@ -306,8 +308,8 @@
- 	return (MY_CTRL_N);
-     case CTRL('P'):
- 	return (MY_CTRL_P);
--    case CTRL('Q'):
--    case 033:
-+    case QUIT:
-+    case ESCAPE:
- 	return (MY_CTRL_Q);
- 
-     case KEY_BACKSPACE:
-@@ -334,7 +336,7 @@
- static FIELD **
- make_fields(CARD * p, int form_high, int form_wide)
- {
--    FIELD **f = (FIELD **) calloc(3, sizeof(FIELD *));
-+    FIELD **f = typeCalloc(FIELD *, 3);
- 
-     f[0] = new_field(1, form_wide, 0, 0, 0, 0);
-     set_field_back(f[0], A_REVERSE);
-@@ -568,7 +570,7 @@
- 
-     setlocale(LC_ALL, "");
- 
--    while ((n = getopt(argc, argv, "c")) != EOF) {
-+    while ((n = getopt(argc, argv, "c")) != -1) {
- 	switch (n) {
- 	case 'c':
- 	    try_color = TRUE;
-diff -Naur ncurses-5.6.orig/test/chgat.c ncurses-5.6/test/chgat.c
---- ncurses-5.6.orig/test/chgat.c	2006-07-15 18:48:27.000000000 -0400
-+++ ncurses-5.6/test/chgat.c	2008-06-18 06:49:47.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2006 Free Software Foundation, Inc.                        *
-+ * Copyright (c) 2006-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -26,14 +26,14 @@
-  * authorization.                                                           *
-  ****************************************************************************/
- /*
-- * $Id: chgat.c,v 1.5 2006/07/15 22:48:27 tom Exp $
-+ * $Id: chgat.c,v 1.8 2008/02/09 23:19:13 tom Exp $
-  *
-  * test-driver for chgat/wchgat/mvchgat/mvwchgat
-  */
- 
- #include <test.priv.h>
- 
--#ifdef HAVE_CHGAT
-+#if HAVE_CHGAT
- 
- #define SHOW(n) ((n) == ERR ? "ERR" : "OK")
- #define COLOR_DEFAULT (-1)
-@@ -47,25 +47,26 @@
- typedef struct {
-     unsigned c;
-     unsigned v;
--    int pair, attr;
-+    int pair;
-+    unsigned attr;
-     int count;
-     int ch;
--    char *c_msg;
--    char *v_msg;
-+    const char *c_msg;
-+    const char *v_msg;
-     int y_val;
-     int x_val;
-     int y_beg, x_beg;
-     int y_max, x_max;
- } STATUS;
- 
--static char *
-+static const char *
- color_params(unsigned state, int *pair)
- {
-     /* *INDENT-OFF* */
-     static struct {
- 	int pair;
- 	int fg, bg;
--	char *msg;
-+	const char *msg;
-     } table[] = {
- 	{ 0, COLOR_DEFAULT, COLOR_DEFAULT, "default" },
- 	{ 1, COLOR_RED,     COLOR_BLACK,   "red/black" },
-@@ -74,7 +75,7 @@
-     /* *INDENT-ON* */
- 
-     static bool first = TRUE;
--    char *result = 0;
-+    const char *result = 0;
- 
-     if (has_colors()) {
- 	if (first) {
-@@ -93,13 +94,13 @@
-     return result;
- }
- 
--static char *
--video_params(unsigned state, int *attr)
-+static const char *
-+video_params(unsigned state, unsigned *attr)
- {
-     /* *INDENT-OFF* */
-     static struct {
--	int attr;
--	char *msg;
-+	unsigned attr;
-+	const char *msg;
-     } table[] = {
- 	{ A_NORMAL,	"normal" },
- 	{ A_BOLD,	"bold" },
-@@ -109,7 +110,7 @@
-     };
-     /* *INDENT-ON* */
- 
--    char *result = 0;
-+    const char *result = 0;
- 
-     if (state < SIZEOF(table)) {
- 	*attr = table[state].attr;
-diff -Naur ncurses-5.6.orig/test/color_set.c ncurses-5.6/test/color_set.c
---- ncurses-5.6.orig/test/color_set.c	2006-06-03 12:40:10.000000000 -0400
-+++ ncurses-5.6/test/color_set.c	2008-06-18 06:49:47.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2003-2004,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2003-2006,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -26,12 +26,12 @@
-  * authorization.                                                           *
-  ****************************************************************************/
- /*
-- * $Id: color_set.c,v 1.5 2006/06/03 16:40:10 tom Exp $
-+ * $Id: color_set.c,v 1.6 2008/02/10 00:18:01 tom Exp $
-  */
- 
- #include <test.priv.h>
- 
--#ifdef HAVE_COLOR_SET
-+#if HAVE_COLOR_SET
- 
- #define SHOW(n) ((n) == ERR ? "ERR" : "OK")
- 
-diff -Naur ncurses-5.6.orig/test/configure ncurses-5.6/test/configure
---- ncurses-5.6.orig/test/configure	2006-12-02 19:10:59.000000000 -0500
-+++ ncurses-5.6/test/configure	2008-06-18 06:49:47.000000000 -0400
-@@ -183,6 +183,7 @@
- EOF
- cat <<\EOF
- --enable and --with options recognized:
-+  --disable-echo          display "compiling" commands
-   --enable-warnings       test: turn on gcc compiler warnings
-   --with-curses-dir=DIR   directory in which (n)curses is installed
-   --with-5lib             use SunOS sysv-libraries
-@@ -535,7 +536,7 @@
- # Uses ac_ vars as temps to allow command line to override cache and checks.
- # --without-x overrides everything else, but does not touch the cache.
- echo $ac_n "checking for X""... $ac_c" 1>&6
--echo "configure:539: checking for X" >&5
-+echo "configure:540: checking for X" >&5
- 
- 
- # Check whether --with-x or --without-x was given.
-@@ -598,12 +599,12 @@
- 
-   # First, try using that file with no special directory specified.
- cat > conftest.$ac_ext <<EOF
--#line 602 "configure"
-+#line 603 "configure"
- #include "confdefs.h"
- #include <$x_direct_test_include>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:607: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:608: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -672,14 +673,14 @@
-   ac_save_LIBS="$LIBS"
-   LIBS="-l$x_direct_test_library $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 676 "configure"
-+#line 677 "configure"
- #include "confdefs.h"
- 
- int main() {
- ${x_direct_test_function}()
- ; return 0; }
- EOF
--if { (eval echo configure:683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   LIBS="$ac_save_LIBS"
- # We can link X programs with no special library path.
-@@ -802,7 +803,7 @@
- fi
- 
- echo $ac_n "checking host system type""... $ac_c" 1>&6
--echo "configure:806: checking host system type" >&5
-+echo "configure:807: checking host system type" >&5
- 
- host_alias=$host
- case "$host_alias" in
-@@ -850,7 +851,7 @@
- 
- 
- echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
--echo "configure:854: checking whether ${MAKE-make} sets \${MAKE}" >&5
-+echo "configure:855: checking whether ${MAKE-make} sets \${MAKE}" >&5
- set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -879,7 +880,7 @@
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:883: checking for $ac_word" >&5
-+echo "configure:884: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -909,7 +910,7 @@
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:913: checking for $ac_word" >&5
-+echo "configure:914: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -960,7 +961,7 @@
-       # Extract the first word of "cl", so it can be a program name with args.
- set dummy cl; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:964: checking for $ac_word" >&5
-+echo "configure:965: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -992,7 +993,7 @@
- fi
- 
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:996: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+echo "configure:997: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
- 
- ac_ext=c
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -1003,12 +1004,12 @@
- 
- cat > conftest.$ac_ext << EOF
- 
--#line 1007 "configure"
-+#line 1008 "configure"
- #include "confdefs.h"
- 
- main(){return(0);}
- EOF
--if { (eval echo configure:1012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   ac_cv_prog_cc_works=yes
-   # If we can't run a trivial program, we are probably using a cross compiler.
-   if (./conftest; exit) 2>/dev/null; then
-@@ -1034,12 +1035,12 @@
-   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
- fi
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:1038: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "configure:1039: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
- echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
- cross_compiling=$ac_cv_prog_cc_cross
- 
- echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
--echo "configure:1043: checking whether we are using GNU C" >&5
-+echo "configure:1044: checking whether we are using GNU C" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1048,7 +1049,7 @@
-   yes;
- #endif
- EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1053: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-   ac_cv_prog_gcc=yes
- else
-   ac_cv_prog_gcc=no
-@@ -1067,7 +1068,7 @@
- ac_save_CFLAGS="$CFLAGS"
- CFLAGS=
- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--echo "configure:1071: checking whether ${CC-cc} accepts -g" >&5
-+echo "configure:1072: checking whether ${CC-cc} accepts -g" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1099,7 +1100,7 @@
- fi
- 
- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
--echo "configure:1103: checking how to run the C preprocessor" >&5
-+echo "configure:1104: checking how to run the C preprocessor" >&5
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
-   CPP=
-@@ -1114,13 +1115,13 @@
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp.
-   cat > conftest.$ac_ext <<EOF
--#line 1118 "configure"
-+#line 1119 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
-@@ -1131,13 +1132,13 @@
-   rm -rf conftest*
-   CPP="${CC-cc} -E -traditional-cpp"
-   cat > conftest.$ac_ext <<EOF
--#line 1135 "configure"
-+#line 1136 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1141: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
-@@ -1148,13 +1149,13 @@
-   rm -rf conftest*
-   CPP="${CC-cc} -nologo -E"
-   cat > conftest.$ac_ext <<EOF
--#line 1152 "configure"
-+#line 1153 "configure"
- #include "confdefs.h"
- #include <assert.h>
- Syntax Error
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:1159: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
-@@ -1183,7 +1184,7 @@
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1187: checking for $ac_word" >&5
-+echo "configure:1188: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1219,15 +1220,15 @@
- DFT_DEP_SUFFIX=""			
- DFT_OBJ_SUBDIR=`pwd|sed -e's:.*/::'`	
- DFT_UPR_MODEL="NORMAL"			
--ECHO_LINK='@ echo linking $@ ... ;'	
- LD="ld"					
- LDFLAGS_SHARED=""			
-+LDFLAGS_STATIC=""			
- LD_MODEL=""				
- LD_SHARED_OPTS=""			
- LIBTOOL=""				
- LIB_CLEAN=""				
- LIB_COMPILE=""				
--LIB_LINK=""				
-+LIB_LINK='${CC}'			
- LINK_TESTS=""				
- LINT=lint				
- LINT_OPTS=""				
-@@ -1243,12 +1244,12 @@
- cf_cv_libtype=
- 
- echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
--echo "configure:1247: checking for Cygwin environment" >&5
-+echo "configure:1248: checking for Cygwin environment" >&5
- if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1252 "configure"
-+#line 1253 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -1259,7 +1260,7 @@
- return __CYGWIN__;
- ; return 0; }
- EOF
--if { (eval echo configure:1263: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_cygwin=yes
- else
-@@ -1276,19 +1277,19 @@
- CYGWIN=
- test "$ac_cv_cygwin" = yes && CYGWIN=yes
- echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
--echo "configure:1280: checking for mingw32 environment" >&5
-+echo "configure:1281: checking for mingw32 environment" >&5
- if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 1285 "configure"
-+#line 1286 "configure"
- #include "confdefs.h"
- 
- int main() {
- return __MINGW32__;
- ; return 0; }
- EOF
--if { (eval echo configure:1292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_mingw32=yes
- else
-@@ -1307,7 +1308,7 @@
- 
- 
- echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
--echo "configure:1311: checking for executable suffix" >&5
-+echo "configure:1312: checking for executable suffix" >&5
- if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1317,7 +1318,7 @@
-   rm -f conftest*
-   echo 'int main () { return 0; }' > conftest.$ac_ext
-   ac_cv_exeext=
--  if { (eval echo configure:1321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+  if { (eval echo configure:1322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-     for file in conftest.*; do
-       case $file in
-       *.c | *.o | *.obj) ;;
-@@ -1338,13 +1339,13 @@
- ac_exeext=$EXEEXT
- 
- echo $ac_n "checking for object suffix""... $ac_c" 1>&6
--echo "configure:1342: checking for object suffix" >&5
-+echo "configure:1343: checking for object suffix" >&5
- if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   rm -f conftest*
- echo 'int i = 1;' > conftest.$ac_ext
--if { (eval echo configure:1348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   for ac_file in conftest.*; do
-     case $ac_file in
-     *.c) ;;
-@@ -1364,7 +1365,7 @@
- 
- 
- echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
--echo "configure:1368: checking for ${CC-cc} option to accept ANSI C" >&5
-+echo "configure:1369: checking for ${CC-cc} option to accept ANSI C" >&5
- if eval "test \"`echo '$''{'cf_cv_ansi_cc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1460,7 +1461,7 @@
- 
- 
- 	cat > conftest.$ac_ext <<EOF
--#line 1464 "configure"
-+#line 1465 "configure"
- #include "confdefs.h"
- 
- #ifndef CC_HAS_PROTOS
-@@ -1476,7 +1477,7 @@
- 	struct s2 {int (*f) (double a);};
- ; return 0; }
- EOF
--if { (eval echo configure:1480: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   cf_cv_ansi_cc="$cf_arg"; break
- else
-@@ -1584,175 +1585,6 @@
- fi
- 
- 
--
--GCC_VERSION=none
--if test "$GCC" = yes ; then
--	echo $ac_n "checking version of $CC""... $ac_c" 1>&6
--echo "configure:1592: checking version of $CC" >&5
--	GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
--	test -z "$GCC_VERSION" && GCC_VERSION=unknown
--	echo "$ac_t""$GCC_VERSION" 1>&6
--fi
--
--
--if ( test "$GCC" = yes || test "$GXX" = yes )
--then
--echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6
--echo "configure:1602: checking if you want to turn on gcc warnings" >&5
--
--# Check whether --enable-warnings or --disable-warnings was given.
--if test "${enable_warnings+set}" = set; then
--  enableval="$enable_warnings"
--  test "$enableval" != yes && enableval=no
--  if test "$enableval" != "no" ; then
--    with_warnings=yes 
--  else
--    with_warnings=no
--  fi
--else
--  enableval=no 
--  with_warnings=no
--  
--fi
--
--echo "$ac_t""$with_warnings" 1>&6
--if test "$with_warnings" = "yes"
--then
--	
--
--
--INTEL_COMPILER=no
--
--if test "$GCC" = yes ; then
--	case $host_os in
--	linux*|gnu*)
--		echo $ac_n "checking if this is really Intel C compiler""... $ac_c" 1>&6
--echo "configure:1631: checking if this is really Intel C compiler" >&5
--		cf_save_CFLAGS="$CFLAGS"
--		CFLAGS="$CFLAGS -no-gcc"
--		cat > conftest.$ac_ext <<EOF
--#line 1635 "configure"
--#include "confdefs.h"
--
--int main() {
--
--#ifdef __INTEL_COMPILER
--#else
--make an error
--#endif
--
--; return 0; }
--EOF
--if { (eval echo configure:1647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
--  rm -rf conftest*
--  INTEL_COMPILER=yes
--cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
--
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--fi
--rm -f conftest*
--		CFLAGS="$cf_save_CFLAGS"
--		echo "$ac_t""$INTEL_COMPILER" 1>&6
--		;;
--	esac
--fi
--
--
--cat > conftest.$ac_ext <<EOF
--#line 1665 "configure"
--int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
--EOF
--
--if test "$INTEL_COMPILER" = yes
--then
--# The "-wdXXX" options suppress warnings:
--# remark #1419: external declaration in primary source file
--# remark #1682: implicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
--# remark #1683: explicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
--# remark #1684: conversion from pointer to same-sized integral type (potential portability problem)
--# remark #193: zero used for undefined preprocessing identifier
--# remark #593: variable "curs_sb_left_arrow" was set but never used
--# remark #810: conversion from "int" to "Dimension={unsigned short}" may lose significant bits
--# remark #869: parameter "tw" was never referenced
--# remark #981: operands are evaluated in unspecified order
--# warning #269: invalid format string conversion
--
--	echo "checking for $CC warning options" 1>&6
--echo "configure:1684: checking for $CC warning options" >&5
--	cf_save_CFLAGS="$CFLAGS"
--	EXTRA_CFLAGS="-Wall"
--	for cf_opt in  \
--		wd1419 \
--		wd1682 \
--		wd1683 \
--		wd1684 \
--		wd193 \
--		wd279 \
--		wd593 \
--		wd810 \
--		wd869 \
--		wd981
--	do
--		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo configure:1700: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
--			test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6
--			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
--		fi
--	done
--	CFLAGS="$cf_save_CFLAGS"
--
--elif test "$GCC" = yes
--then
--	echo "checking for $CC warning options" 1>&6
--echo "configure:1710: checking for $CC warning options" >&5
--	cf_save_CFLAGS="$CFLAGS"
--	EXTRA_CFLAGS="-W -Wall"
--	cf_warn_CONST=""
--	test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings"
--	for cf_opt in \
--		Wbad-function-cast \
--		Wcast-align \
--		Wcast-qual \
--		Winline \
--		Wmissing-declarations \
--		Wmissing-prototypes \
--		Wnested-externs \
--		Wpointer-arith \
--		Wshadow \
--		Wstrict-prototypes \
--		Wundef $cf_warn_CONST 
--	do
--		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
--		if { (eval echo configure:1729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
--			test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6
--			case $cf_opt in #(vi
--			Wcast-qual) #(vi
--				CPPFLAGS="$CPPFLAGS -DXTSTRINGDEFINES"
--				;;
--			Winline) #(vi
--				case $GCC_VERSION in
--				3.3*)
--					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
--
--					continue;;
--				esac
--				;;
--			esac
--			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
--		fi
--	done
--	CFLAGS="$cf_save_CFLAGS"
--fi
--rm -f conftest*
--
--
--
--fi
--fi
--
--
- if test "$GCC" = yes
- then
- cat > conftest.i <<EOF
-@@ -1772,9 +1604,9 @@
- if test "$GCC" = yes
- then
- 	echo "checking for $CC __attribute__ directives" 1>&6
--echo "configure:1776: checking for $CC __attribute__ directives" >&5
-+echo "configure:1608: checking for $CC __attribute__ directives" >&5
- cat > conftest.$ac_ext <<EOF
--#line 1778 "configure"
-+#line 1610 "${as_me-configure}"
- #include "confdefs.h"
- #include "conftest.h"
- #include "conftest.i"
-@@ -1812,7 +1644,7 @@
- EOF
- 			;;
- 		esac
--		if { (eval echo configure:1816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+		if { (eval echo configure:1648: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- 			test -n "$verbose" && echo "$ac_t""... $cf_attribute" 1>&6
- 			cat conftest.h >>confdefs.h
- 		fi
-@@ -1825,7 +1657,7 @@
- 
- 
- echo $ac_n "checking if $CC -U and -D options work together""... $ac_c" 1>&6
--echo "configure:1829: checking if $CC -U and -D options work together" >&5
-+echo "configure:1661: checking if $CC -U and -D options work together" >&5
- if eval "test \"`echo '$''{'cf_cv_cc_u_d_options'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1833,7 +1665,7 @@
- 	cf_save_CPPFLAGS="$CPPFLAGS"
- 	CPPFLAGS="-UU_D_OPTIONS -DU_D_OPTIONS -DD_U_OPTIONS -UD_U_OPTIONS"
- 	cat > conftest.$ac_ext <<EOF
--#line 1837 "configure"
-+#line 1669 "configure"
- #include "confdefs.h"
- 
- int main() {
-@@ -1847,7 +1679,7 @@
- 	
- ; return 0; }
- EOF
--if { (eval echo configure:1851: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   
- 	cf_cv_cc_u_d_options=yes
-@@ -1890,16 +1722,16 @@
- irix[56].*) #(vi
- 	CPPFLAGS="$CPPFLAGS -D_SGI_SOURCE"
- 	;;
--linux*|gnu*) #(vi
-+linux*|gnu*|k*bsd*-gnu) #(vi
- 	
- echo $ac_n "checking if we must define _GNU_SOURCE""... $ac_c" 1>&6
--echo "configure:1897: checking if we must define _GNU_SOURCE" >&5
-+echo "configure:1729: checking if we must define _GNU_SOURCE" >&5
- if eval "test \"`echo '$''{'cf_cv_gnu_source'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- cat > conftest.$ac_ext <<EOF
--#line 1903 "configure"
-+#line 1735 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int main() {
-@@ -1909,7 +1741,7 @@
- #endif
- ; return 0; }
- EOF
--if { (eval echo configure:1913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   cf_cv_gnu_source=no
- else
-@@ -1919,7 +1751,7 @@
-   cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
- 	 cat > conftest.$ac_ext <<EOF
--#line 1923 "configure"
-+#line 1755 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int main() {
-@@ -1929,7 +1761,7 @@
- #endif
- ; return 0; }
- EOF
--if { (eval echo configure:1933: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1765: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   cf_cv_gnu_source=no
- else
-@@ -1973,13 +1805,13 @@
- 	;;
- *)
- 	echo $ac_n "checking if we should define _XOPEN_SOURCE""... $ac_c" 1>&6
--echo "configure:1977: checking if we should define _XOPEN_SOURCE" >&5
-+echo "configure:1809: checking if we should define _XOPEN_SOURCE" >&5
- if eval "test \"`echo '$''{'cf_cv_xopen_source'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- 	cat > conftest.$ac_ext <<EOF
--#line 1983 "configure"
-+#line 1815 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int main() {
-@@ -1989,7 +1821,7 @@
- #endif
- ; return 0; }
- EOF
--if { (eval echo configure:1993: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   cf_cv_xopen_source=no
- else
-@@ -1999,7 +1831,7 @@
-   cf_save="$CPPFLAGS"
- 	 CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=$cf_XOPEN_SOURCE"
- 	 cat > conftest.$ac_ext <<EOF
--#line 2003 "configure"
-+#line 1835 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int main() {
-@@ -2009,7 +1841,7 @@
- #endif
- ; return 0; }
- EOF
--if { (eval echo configure:2013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1845: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   cf_cv_xopen_source=no
- else
-@@ -2064,16 +1896,16 @@
- 
- 
- echo $ac_n "checking if we should define _POSIX_C_SOURCE""... $ac_c" 1>&6
--echo "configure:2068: checking if we should define _POSIX_C_SOURCE" >&5
-+echo "configure:1900: checking if we should define _POSIX_C_SOURCE" >&5
- if eval "test \"`echo '$''{'cf_cv_posix_c_source'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- 	
--echo "(line 2074) testing if the symbol is already defined go no further ..." 1>&5
-+echo "${as_me-configure}:1906: testing if the symbol is already defined go no further ..." 1>&5
- 
- 	cat > conftest.$ac_ext <<EOF
--#line 2077 "configure"
-+#line 1909 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int main() {
-@@ -2083,7 +1915,7 @@
- #endif
- ; return 0; }
- EOF
--if { (eval echo configure:2087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1919: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   cf_cv_posix_c_source=no
- else
-@@ -2105,7 +1937,7 @@
- 	 esac
- 	 if test "$cf_want_posix_source" = yes ; then
- 		cat > conftest.$ac_ext <<EOF
--#line 2109 "configure"
-+#line 1941 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int main() {
-@@ -2115,7 +1947,7 @@
- #endif
- ; return 0; }
- EOF
--if { (eval echo configure:2119: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   :
- else
-   echo "configure: failed program was:" >&5
-@@ -2126,15 +1958,15 @@
- rm -f conftest*
- 	 fi
- 	 
--echo "(line 2130) testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
-+echo "${as_me-configure}:1962: testing ifdef from value $cf_POSIX_C_SOURCE ..." 1>&5
- 
- 	 CFLAGS="$cf_trim_CFLAGS"
- 	 CPPFLAGS="$cf_trim_CPPFLAGS $cf_cv_posix_c_source"
- 	 
--echo "(line 2135) testing if the second compile does not leave our definition intact error ..." 1>&5
-+echo "${as_me-configure}:1967: testing if the second compile does not leave our definition intact error ..." 1>&5
- 
- 	 cat > conftest.$ac_ext <<EOF
--#line 2138 "configure"
-+#line 1970 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- int main() {
-@@ -2144,7 +1976,7 @@
- #endif
- ; return 0; }
- EOF
--if { (eval echo configure:2148: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   :
- else
-   echo "configure: failed program was:" >&5
-@@ -2178,6 +2010,350 @@
- 	;;
- esac
- 
-+echo $ac_n "checking for working const""... $ac_c" 1>&6
-+echo "configure:2015: checking for working const" >&5
-+if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 2020 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+
-+/* Ultrix mips cc rejects this.  */
-+typedef int charset[2]; const charset x;
-+/* SunOS 4.1.1 cc rejects this.  */
-+char const *const *ccp;
-+char **p;
-+/* NEC SVR4.0.2 mips cc rejects this.  */
-+struct point {int x, y;};
-+static struct point const zero = {0,0};
-+/* AIX XL C 1.02.0.0 rejects this.
-+   It does not let you subtract one const X* pointer from another in an arm
-+   of an if-expression whose if-part is not a constant expression */
-+const char *g = "string";
-+ccp = &g + (g ? g-g : 0);
-+/* HPUX 7.0 cc rejects these. */
-+++ccp;
-+p = (char**) ccp;
-+ccp = (char const *const *) p;
-+{ /* SCO 3.2v4 cc rejects this.  */
-+  char *t;
-+  char const *s = 0 ? (char *) 0 : (char const *) 0;
-+
-+  *t++ = 0;
-+}
-+{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-+  int x[] = {25, 17};
-+  const int *foo = &x[0];
-+  ++foo;
-+}
-+{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-+  typedef const int *iptr;
-+  iptr p = 0;
-+  ++p;
-+}
-+{ /* AIX XL C 1.02.0.0 rejects this saying
-+     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-+  struct s { int j; const int *ap[3]; };
-+  struct s *b; b->j = 5;
-+}
-+{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-+  const int foo = 10;
-+}
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:2069: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+  ac_cv_c_const=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  ac_cv_c_const=no
-+fi
-+rm -f conftest*
-+fi
-+
-+echo "$ac_t""$ac_cv_c_const" 1>&6
-+if test $ac_cv_c_const = no; then
-+  cat >> confdefs.h <<\EOF
-+#define const 
-+EOF
-+
-+fi
-+
-+
-+echo $ac_n "checking for signal global datatype""... $ac_c" 1>&6
-+echo "configure:2091: checking for signal global datatype" >&5
-+if eval "test \"`echo '$''{'cf_cv_sig_atomic_t'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  
-+	for cf_type in \
-+		"volatile sig_atomic_t" \
-+		"sig_atomic_t" \
-+		"int"
-+	do
-+	cat > conftest.$ac_ext <<EOF
-+#line 2102 "configure"
-+#include "confdefs.h"
-+
-+#include <sys/types.h>
-+#include <signal.h>
-+#include <stdio.h>
-+
-+extern $cf_type x;
-+$cf_type x;
-+static void handler(int sig)
-+{
-+	x = 5;
-+}
-+int main() {
-+signal(SIGINT, handler);
-+		 x = 1
-+; return 0; }
-+EOF
-+if { (eval echo configure:2120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+  cf_cv_sig_atomic_t=$cf_type
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  cf_cv_sig_atomic_t=no
-+fi
-+rm -f conftest*
-+		test "$cf_cv_sig_atomic_t" != no && break
-+	done
-+	
-+fi
-+
-+echo "$ac_t""$cf_cv_sig_atomic_t" 1>&6
-+test "$cf_cv_sig_atomic_t" != no && cat >> confdefs.h <<EOF
-+#define SIG_ATOMIC_T $cf_cv_sig_atomic_t
-+EOF
-+
-+
-+
-+
-+echo $ac_n "checking if you want to see long compiling messages""... $ac_c" 1>&6
-+echo "configure:2144: checking if you want to see long compiling messages" >&5
-+
-+# Check whether --enable-echo or --disable-echo was given.
-+if test "${enable_echo+set}" = set; then
-+  enableval="$enable_echo"
-+  test "$enableval" != no && enableval=yes
-+  if test "$enableval" != "yes" ; then
-+    
-+    ECHO_LT='--silent'
-+    ECHO_LD='@echo linking $@;'
-+    RULE_CC='	@echo compiling $<'
-+    SHOW_CC='	@echo compiling $@'
-+    ECHO_CC='@'
-+ 
-+  else
-+    
-+    ECHO_LT=''
-+    ECHO_LD=''
-+    RULE_CC='# compiling'
-+    SHOW_CC='# compiling'
-+    ECHO_CC=''
-+
-+  fi
-+else
-+  enableval=yes 
-+  
-+    ECHO_LT=''
-+    ECHO_LD=''
-+    RULE_CC='# compiling'
-+    SHOW_CC='# compiling'
-+    ECHO_CC=''
-+
-+  
-+fi
-+
-+echo "$ac_t""$enableval" 1>&6
-+
-+
-+
-+
-+
-+
-+
-+
-+GCC_VERSION=none
-+if test "$GCC" = yes ; then
-+	echo $ac_n "checking version of $CC""... $ac_c" 1>&6
-+echo "configure:2191: checking version of $CC" >&5
-+	GCC_VERSION="`${CC} --version| sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[^0-9.]*//' -e 's/[^0-9.].*//'`"
-+	test -z "$GCC_VERSION" && GCC_VERSION=unknown
-+	echo "$ac_t""$GCC_VERSION" 1>&6
-+fi
-+
-+
-+if ( test "$GCC" = yes || test "$GXX" = yes )
-+then
-+echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6
-+echo "configure:2201: checking if you want to turn on gcc warnings" >&5
-+
-+# Check whether --enable-warnings or --disable-warnings was given.
-+if test "${enable_warnings+set}" = set; then
-+  enableval="$enable_warnings"
-+  test "$enableval" != yes && enableval=no
-+  if test "$enableval" != "no" ; then
-+    with_warnings=yes 
-+  else
-+    with_warnings=no
-+  fi
-+else
-+  enableval=no 
-+  with_warnings=no
-+  
-+fi
-+
-+echo "$ac_t""$with_warnings" 1>&6
-+if test "$with_warnings" = "yes"
-+then
-+	
-+
-+
-+INTEL_COMPILER=no
-+
-+if test "$GCC" = yes ; then
-+	case $host_os in
-+	linux*|gnu*)
-+		echo $ac_n "checking if this is really Intel C compiler""... $ac_c" 1>&6
-+echo "configure:2230: checking if this is really Intel C compiler" >&5
-+		cf_save_CFLAGS="$CFLAGS"
-+		CFLAGS="$CFLAGS -no-gcc"
-+		cat > conftest.$ac_ext <<EOF
-+#line 2234 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+
-+#ifdef __INTEL_COMPILER
-+#else
-+make an error
-+#endif
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:2246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+  INTEL_COMPILER=yes
-+cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc"
-+
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+fi
-+rm -f conftest*
-+		CFLAGS="$cf_save_CFLAGS"
-+		echo "$ac_t""$INTEL_COMPILER" 1>&6
-+		;;
-+	esac
-+fi
-+
-+
-+cat > conftest.$ac_ext <<EOF
-+#line 2264 "${as_me-configure}"
-+int main(int argc, char *argv[]) { return (argv[argc-1] == 0) ; }
-+EOF
-+
-+if test "$INTEL_COMPILER" = yes
-+then
-+# The "-wdXXX" options suppress warnings:
-+# remark #1419: external declaration in primary source file
-+# remark #1682: implicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
-+# remark #1683: explicit conversion of a 64-bit integral type to a smaller integral type (potential portability problem)
-+# remark #1684: conversion from pointer to same-sized integral type (potential portability problem)
-+# remark #193: zero used for undefined preprocessing identifier
-+# remark #593: variable "curs_sb_left_arrow" was set but never used
-+# remark #810: conversion from "int" to "Dimension={unsigned short}" may lose significant bits
-+# remark #869: parameter "tw" was never referenced
-+# remark #981: operands are evaluated in unspecified order
-+# warning #269: invalid format string conversion
-+
-+	echo "checking for $CC warning options" 1>&6
-+echo "configure:2283: checking for $CC warning options" >&5
-+	cf_save_CFLAGS="$CFLAGS"
-+	EXTRA_CFLAGS="-Wall"
-+	for cf_opt in \
-+		wd1419 \
-+		wd1682 \
-+		wd1683 \
-+		wd1684 \
-+		wd193 \
-+		wd279 \
-+		wd593 \
-+		wd810 \
-+		wd869 \
-+		wd981
-+	do
-+		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-+		if { (eval echo configure:2299: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+			test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6
-+			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
-+		fi
-+	done
-+	CFLAGS="$cf_save_CFLAGS"
-+
-+elif test "$GCC" = yes
-+then
-+	echo "checking for $CC warning options" 1>&6
-+echo "configure:2309: checking for $CC warning options" >&5
-+	cf_save_CFLAGS="$CFLAGS"
-+	EXTRA_CFLAGS="-W -Wall"
-+	cf_warn_CONST=""
-+	test "$with_ext_const" = yes && cf_warn_CONST="Wwrite-strings"
-+	for cf_opt in \
-+		Wbad-function-cast \
-+		Wcast-align \
-+		Wcast-qual \
-+		Winline \
-+		Wmissing-declarations \
-+		Wmissing-prototypes \
-+		Wnested-externs \
-+		Wpointer-arith \
-+		Wshadow \
-+		Wstrict-prototypes \
-+		Wundef $cf_warn_CONST 
-+	do
-+		CFLAGS="$cf_save_CFLAGS $EXTRA_CFLAGS -$cf_opt"
-+		if { (eval echo configure:2328: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+			test -n "$verbose" && echo "$ac_t""... -$cf_opt" 1>&6
-+			case $cf_opt in #(vi
-+			Wcast-qual) #(vi
-+				CPPFLAGS="$CPPFLAGS -DXTSTRINGDEFINES"
-+				;;
-+			Winline) #(vi
-+				case $GCC_VERSION in
-+				3.3*)
-+					test -n "$verbose" && echo "	feature is broken in gcc $GCC_VERSION" 1>&6
-+
-+echo "${as_me-configure}:2339: testing feature is broken in gcc $GCC_VERSION ..." 1>&5
-+
-+
-+					continue;;
-+				esac
-+				;;
-+			esac
-+			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
-+		fi
-+	done
-+	CFLAGS="$cf_save_CFLAGS"
-+fi
-+rm -f conftest*
-+
-+
-+
-+fi
-+fi
-+
- 
- 
- 
-@@ -2263,7 +2439,7 @@
- 	
- 
- echo $ac_n "checking for extra include directories""... $ac_c" 1>&6
--echo "configure:2267: checking for extra include directories" >&5
-+echo "configure:2443: checking for extra include directories" >&5
- if eval "test \"`echo '$''{'cf_cv_curses_incdir'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2288,7 +2464,7 @@
- 
- 
- echo $ac_n "checking if we have identified curses headers""... $ac_c" 1>&6
--echo "configure:2292: checking if we have identified curses headers" >&5
-+echo "configure:2468: checking if we have identified curses headers" >&5
- if eval "test \"`echo '$''{'cf_cv_ncurses_header'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2301,14 +2477,14 @@
- 	ncurses/ncurses.h
- do
- cat > conftest.$ac_ext <<EOF
--#line 2305 "configure"
-+#line 2481 "configure"
- #include "confdefs.h"
- #include <${cf_header}>
- int main() {
- initscr(); tgoto("?", 0,0)
- ; return 0; }
- EOF
--if { (eval echo configure:2312: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   cf_cv_ncurses_header=$cf_header; break
- else
-@@ -2331,17 +2507,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:2335: checking for $ac_hdr" >&5
-+echo "configure:2511: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2340 "configure"
-+#line 2516 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2521: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -2370,7 +2546,7 @@
- 
- 
- echo $ac_n "checking for terminfo header""... $ac_c" 1>&6
--echo "configure:2374: checking for terminfo header" >&5
-+echo "configure:2550: checking for terminfo header" >&5
- if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2387,7 +2563,7 @@
- for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
- do
- cat > conftest.$ac_ext <<EOF
--#line 2391 "configure"
-+#line 2567 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #include <${cf_cv_ncurses_header-curses.h}>
-@@ -2397,7 +2573,7 @@
- int x = auto_left_margin
- ; return 0; }
- EOF
--if { (eval echo configure:2401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:2577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   
- 	cf_cv_term_header="$cf_test"
-@@ -2446,7 +2622,7 @@
- 
- 	
- echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
--echo "configure:2450: checking for ncurses version" >&5
-+echo "configure:2626: checking for ncurses version" >&5
- if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2472,7 +2648,7 @@
- #endif
- EOF
- 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
--	{ (eval echo configure:2476: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
-+	{ (eval echo configure:2652: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
- 	if test -f conftest.out ; then
- 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
- 		test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
-@@ -2481,7 +2657,7 @@
- 
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2485 "configure"
-+#line 2661 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header-curses.h}>
-@@ -2502,10 +2678,10 @@
- 	make an error
- # endif
- #endif
--	exit(0);
-+	${cf_cv_main_return-return}(0);
- }
- EOF
--if { (eval echo configure:2509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:2685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   
- 	cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -2529,16 +2705,16 @@
- 	
- 
- echo $ac_n "checking if we have identified curses libraries""... $ac_c" 1>&6
--echo "configure:2533: checking if we have identified curses libraries" >&5
-+echo "configure:2709: checking if we have identified curses libraries" >&5
- cat > conftest.$ac_ext <<EOF
--#line 2535 "configure"
-+#line 2711 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header-curses.h}>
- int main() {
- initscr(); tgoto("?", 0,0)
- ; return 0; }
- EOF
--if { (eval echo configure:2542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   cf_result=yes
- else
-@@ -2553,8 +2729,8 @@
- if test "$cf_result" = no ; then
- case $host_os in #(vi
- freebsd*) #(vi
--	echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
--echo "configure:2558: checking for tgoto in -lmytinfo" >&5
-+    echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
-+echo "configure:2734: checking for tgoto in -lmytinfo" >&5
- ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2562,7 +2738,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lmytinfo  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2566 "configure"
-+#line 2742 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -2573,7 +2749,7 @@
- tgoto()
- ; return 0; }
- EOF
--if { (eval echo configure:2577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2593,10 +2769,10 @@
-   echo "$ac_t""no" 1>&6
- fi
- 
--	;;
-+    ;;
- hpux10.*) #(vi
--	echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6
--echo "configure:2600: checking for initscr in -lcur_colr" >&5
-+    echo $ac_n "checking for initscr in -lcur_colr""... $ac_c" 1>&6
-+echo "configure:2776: checking for initscr in -lcur_colr" >&5
- ac_lib_var=`echo cur_colr'_'initscr | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2604,7 +2780,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lcur_colr  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2608 "configure"
-+#line 2784 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -2615,7 +2791,7 @@
- initscr()
- ; return 0; }
- EOF
--if { (eval echo configure:2619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2631,14 +2807,14 @@
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-   
--		LIBS="-lcur_colr $LIBS"
--		ac_cv_func_initscr=yes
--		
-+        LIBS="-lcur_colr $LIBS"
-+        ac_cv_func_initscr=yes
-+        
- else
-   echo "$ac_t""no" 1>&6
- 
--	echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6
--echo "configure:2642: checking for initscr in -lHcurses" >&5
-+    echo $ac_n "checking for initscr in -lHcurses""... $ac_c" 1>&6
-+echo "configure:2818: checking for initscr in -lHcurses" >&5
- ac_lib_var=`echo Hcurses'_'initscr | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2646,7 +2822,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lHcurses  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2650 "configure"
-+#line 2826 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -2657,7 +2833,7 @@
- initscr()
- ; return 0; }
- EOF
--if { (eval echo configure:2661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2673,49 +2849,107 @@
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-   
--		# HP's header uses __HP_CURSES, but user claims _HP_CURSES.
--		LIBS="-lHcurses $LIBS"
--		CPPFLAGS="-D__HP_CURSES -D_HP_CURSES $CPPFLAGS"
--		ac_cv_func_initscr=yes
--		
-+        # HP's header uses __HP_CURSES, but user claims _HP_CURSES.
-+        LIBS="-lHcurses $LIBS"
-+        CPPFLAGS="-D__HP_CURSES -D_HP_CURSES $CPPFLAGS"
-+        ac_cv_func_initscr=yes
-+        
- else
-   echo "$ac_t""no" 1>&6
- fi
- 
- fi
- 
--	;;
--linux*) # Suse Linux does not follow /usr/lib convention
--	LIBS="$LIBS -L/lib"
--	;;
-+    ;;
-+linux*) # Suse Linux does not follow /usr/lib convention
-+    
-+if test -n "/lib" ; then
-+  for cf_add_libdir in /lib
-+  do
-+    if test $cf_add_libdir = /usr/lib ; then
-+      :
-+    elif test -d $cf_add_libdir
-+    then
-+      cf_have_libdir=no
-+      if test -n "$LDFLAGS$LIBS" ; then
-+        # a loop is needed to ensure we can add subdirs of existing dirs
-+        for cf_test_libdir in $LDFLAGS $LIBS ; do
-+          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-+            cf_have_libdir=yes; break
-+          fi
-+        done
-+      fi
-+      if test "$cf_have_libdir" = no ; then
-+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
-+
-+echo "${as_me-configure}:2886: testing adding $cf_add_libdir to library-path ..." 1>&5
-+
-+
-+        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-+      fi
-+    fi
-+  done
-+fi
-+
-+    ;;
- sunos3*|sunos4*)
--	test -d /usr/5lib && \
--	LIBS="$LIBS -L/usr/5lib -lcurses -ltermcap"
--	ac_cv_func_initscr=yes
--	;;
-+    if test -d /usr/5lib ; then
-+      
-+if test -n "/usr/5lib" ; then
-+  for cf_add_libdir in /usr/5lib
-+  do
-+    if test $cf_add_libdir = /usr/lib ; then
-+      :
-+    elif test -d $cf_add_libdir
-+    then
-+      cf_have_libdir=no
-+      if test -n "$LDFLAGS$LIBS" ; then
-+        # a loop is needed to ensure we can add subdirs of existing dirs
-+        for cf_test_libdir in $LDFLAGS $LIBS ; do
-+          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-+            cf_have_libdir=yes; break
-+          fi
-+        done
-+      fi
-+      if test "$cf_have_libdir" = no ; then
-+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
-+
-+echo "${as_me-configure}:2918: testing adding $cf_add_libdir to library-path ..." 1>&5
-+
-+
-+        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-+      fi
-+    fi
-+  done
-+fi
-+
-+      LIBS="$LIBS -lcurses -ltermcap"
-+    fi
-+    ac_cv_func_initscr=yes
-+    ;;
- esac
- 
- if test ".$ac_cv_func_initscr" != .yes ; then
--	cf_save_LIBS="$LIBS"
--	cf_term_lib=""
--	cf_curs_lib=""
--
--	if test ".${cf_cv_ncurses_version-no}" != .no
--	then
--		cf_check_list="ncurses curses cursesX"
--	else
--		cf_check_list="cursesX curses ncurses"
--	fi
-+    cf_save_LIBS="$LIBS"
-+    cf_term_lib=""
-+    cf_curs_lib=""
-+
-+    if test ".${cf_cv_ncurses_version-no}" != .no
-+    then
-+        cf_check_list="ncurses curses cursesX"
-+    else
-+        cf_check_list="cursesX curses ncurses"
-+    fi
- 
--	# Check for library containing tgoto.  Do this before curses library
--	# because it may be needed to link the test-case for initscr.
--	echo $ac_n "checking for tgoto""... $ac_c" 1>&6
--echo "configure:2714: checking for tgoto" >&5
-+    # Check for library containing tgoto.  Do this before curses library
-+    # because it may be needed to link the test-case for initscr.
-+    echo $ac_n "checking for tgoto""... $ac_c" 1>&6
-+echo "configure:2948: checking for tgoto" >&5
- if eval "test \"`echo '$''{'ac_cv_func_tgoto'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2719 "configure"
-+#line 2953 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char tgoto(); below.  */
-@@ -2738,7 +2972,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:2742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_tgoto=yes"
- else
-@@ -2756,10 +2990,10 @@
- else
-   echo "$ac_t""no" 1>&6
- 
--		for cf_term_lib in $cf_check_list termcap termlib unknown
--		do
--			echo $ac_n "checking for tgoto in -l$cf_term_lib""... $ac_c" 1>&6
--echo "configure:2763: checking for tgoto in -l$cf_term_lib" >&5
-+        for cf_term_lib in $cf_check_list termcap termlib unknown
-+        do
-+            echo $ac_n "checking for tgoto in -l$cf_term_lib""... $ac_c" 1>&6
-+echo "configure:2997: checking for tgoto in -l$cf_term_lib" >&5
- ac_lib_var=`echo $cf_term_lib'_'tgoto | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2767,7 +3001,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-l$cf_term_lib  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2771 "configure"
-+#line 3005 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -2778,7 +3012,7 @@
- tgoto()
- ; return 0; }
- EOF
--if { (eval echo configure:2782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2798,17 +3032,17 @@
-   echo "$ac_t""no" 1>&6
- fi
- 
--		done
--	
-+        done
-+    
- fi
- 
- 
--	# Check for library containing initscr
--	test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS"
--	for cf_curs_lib in $cf_check_list xcurses jcurses unknown
--	do
--		echo $ac_n "checking for initscr in -l$cf_curs_lib""... $ac_c" 1>&6
--echo "configure:2812: checking for initscr in -l$cf_curs_lib" >&5
-+    # Check for library containing initscr
-+    test "$cf_term_lib" != predefined && test "$cf_term_lib" != unknown && LIBS="-l$cf_term_lib $cf_save_LIBS"
-+    for cf_curs_lib in $cf_check_list xcurses jcurses unknown
-+    do
-+        echo $ac_n "checking for initscr in -l$cf_curs_lib""... $ac_c" 1>&6
-+echo "configure:3046: checking for initscr in -l$cf_curs_lib" >&5
- ac_lib_var=`echo $cf_curs_lib'_'initscr | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2816,7 +3050,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-l$cf_curs_lib  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2820 "configure"
-+#line 3054 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -2827,7 +3061,7 @@
- initscr()
- ; return 0; }
- EOF
--if { (eval echo configure:2831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -2847,22 +3081,22 @@
-   echo "$ac_t""no" 1>&6
- fi
- 
--	done
--	test $cf_curs_lib = unknown && { echo "configure: error: no curses library found" 1>&2; exit 1; }
-+    done
-+    test $cf_curs_lib = unknown && { echo "configure: error: no curses library found" 1>&2; exit 1; }
- 
--	LIBS="-l$cf_curs_lib $cf_save_LIBS"
--	if test "$cf_term_lib" = unknown ; then
--		echo $ac_n "checking if we can link with $cf_curs_lib library""... $ac_c" 1>&6
--echo "configure:2857: checking if we can link with $cf_curs_lib library" >&5
--		cat > conftest.$ac_ext <<EOF
--#line 2859 "configure"
-+    LIBS="-l$cf_curs_lib $cf_save_LIBS"
-+    if test "$cf_term_lib" = unknown ; then
-+        echo $ac_n "checking if we can link with $cf_curs_lib library""... $ac_c" 1>&6
-+echo "configure:3091: checking if we can link with $cf_curs_lib library" >&5
-+        cat > conftest.$ac_ext <<EOF
-+#line 3093 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header-curses.h}>
- int main() {
- initscr()
- ; return 0; }
- EOF
--if { (eval echo configure:2866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   cf_result=yes
- else
-@@ -2872,22 +3106,22 @@
-   cf_result=no
- fi
- rm -f conftest*
--		echo "$ac_t""$cf_result" 1>&6
--		test $cf_result = no && { echo "configure: error: Cannot link curses library" 1>&2; exit 1; }
--	elif test "$cf_curs_lib" = "$cf_term_lib" ; then
--		:
--	elif test "$cf_term_lib" != predefined ; then
--		echo $ac_n "checking if we need both $cf_curs_lib and $cf_term_lib libraries""... $ac_c" 1>&6
--echo "configure:2882: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
--		cat > conftest.$ac_ext <<EOF
--#line 2884 "configure"
-+        echo "$ac_t""$cf_result" 1>&6
-+        test $cf_result = no && { echo "configure: error: Cannot link curses library" 1>&2; exit 1; }
-+    elif test "$cf_curs_lib" = "$cf_term_lib" ; then
-+        :
-+    elif test "$cf_term_lib" != predefined ; then
-+        echo $ac_n "checking if we need both $cf_curs_lib and $cf_term_lib libraries""... $ac_c" 1>&6
-+echo "configure:3116: checking if we need both $cf_curs_lib and $cf_term_lib libraries" >&5
-+        cat > conftest.$ac_ext <<EOF
-+#line 3118 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header-curses.h}>
- int main() {
- initscr(); tgoto((char *)0, 0, 0);
- ; return 0; }
- EOF
--if { (eval echo configure:2891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   cf_result=no
- else
-@@ -2895,16 +3129,16 @@
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   
--			LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
--			cat > conftest.$ac_ext <<EOF
--#line 2901 "configure"
-+            LIBS="-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS"
-+            cat > conftest.$ac_ext <<EOF
-+#line 3135 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header-curses.h}>
- int main() {
- initscr()
- ; return 0; }
- EOF
--if { (eval echo configure:2908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   cf_result=yes
- else
-@@ -2914,11 +3148,11 @@
-   cf_result=error
- fi
- rm -f conftest*
--			
-+            
- fi
- rm -f conftest*
--		echo "$ac_t""$cf_result" 1>&6
--	fi
-+        echo "$ac_t""$cf_result" 1>&6
-+    fi
- fi
- fi
- 
-@@ -2930,11 +3164,76 @@
- cf_ncuhdr_root=ncurses
- 
- test -n "$cf_cv_curses_dir" && \
--test "$cf_cv_curses_dir" != "no" && \
--CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS"
-+test "$cf_cv_curses_dir" != "no" && { \
-+  
-+if test -n "$cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
-+  for cf_add_incdir in $cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root
-+  do
-+	while test $cf_add_incdir != /usr/include
-+	do
-+	  if test -d $cf_add_incdir
-+	  then
-+		cf_have_incdir=no
-+		if test -n "$CFLAGS$CPPFLAGS" ; then
-+		  # a loop is needed to ensure we can add subdirs of existing dirs
-+		  for cf_test_incdir in $CFLAGS $CPPFLAGS ; do
-+			if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then
-+			  cf_have_incdir=yes; break
-+			fi
-+		  done
-+		fi
-+
-+		if test "$cf_have_incdir" = no ; then
-+          if test "$cf_add_incdir" = /usr/local/include ; then
-+			if test "$GCC" = yes
-+			then
-+			  cf_save_CPPFLAGS=$CPPFLAGS
-+			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
-+			  cat > conftest.$ac_ext <<EOF
-+#line 3194 "configure"
-+#include "confdefs.h"
-+#include <stdio.h>
-+int main() {
-+printf("Hello")
-+; return 0; }
-+EOF
-+if { (eval echo configure:3201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  :
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  cf_have_incdir=yes
-+fi
-+rm -f conftest*
-+			  CPPFLAGS=$cf_save_CPPFLAGS
-+			fi
-+		  fi
-+		fi
-+
-+		if test "$cf_have_incdir" = no ; then
-+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
-+
-+echo "${as_me-configure}:3218: testing adding $cf_add_incdir to include-path ..." 1>&5
-+
-+
-+		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
-+
-+          cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
-+          test "$cf_top_incdir" = "$cf_add_incdir" && break
-+          cf_add_incdir="$cf_top_incdir"
-+		else
-+		  break
-+		fi
-+	  fi
-+	done
-+  done
-+fi
-+
-+}
- 
- echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6
--echo "configure:2938: checking for $cf_ncuhdr_root header in include-path" >&5
-+echo "configure:3237: checking for $cf_ncuhdr_root header in include-path" >&5
- if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2945,7 +3244,7 @@
- 	do
- 		
- 	cat > conftest.$ac_ext <<EOF
--#line 2949 "configure"
-+#line 3248 "configure"
- #include "confdefs.h"
- 
- 
-@@ -2966,7 +3265,7 @@
- 	
- ; return 0; }
- EOF
--if { (eval echo configure:2970: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3269: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   cf_cv_ncurses_h=$cf_header
- 	
-@@ -2992,7 +3291,7 @@
- else
- 
- echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6
--echo "configure:2996: checking for $cf_ncuhdr_root include-path" >&5
-+echo "configure:3295: checking for $cf_ncuhdr_root include-path" >&5
- if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3000,34 +3299,23 @@
- 	test -n "$verbose" && echo
- 	cf_search=""
- 
--test -d "$HOME" && {
--	test -n "$verbose" && echo "	... testing include-directories under $HOME"
--	test -d "$HOME/include" &&          cf_search="$cf_search $HOME/include"
--	test -d "$HOME/include/$cf_ncuhdr_root" &&       cf_search="$cf_search $HOME/include/$cf_ncuhdr_root"
--	test -d "$HOME/include/$cf_ncuhdr_root/include" &&    cf_search="$cf_search $HOME/include/$cf_ncuhdr_root/include"
--}
- 
--# For other stuff under the home directory, it should be sufficient to put
--# a symbolic link for $HOME/$cf_ncuhdr_root to the actual package location:
--test -d "$HOME/$cf_ncuhdr_root" && {
--	test -n "$verbose" && echo "	... testing include-directories under $HOME/$cf_ncuhdr_root"
--	test -d "$HOME/$cf_ncuhdr_root/include" &&       cf_search="$cf_search $HOME/$cf_ncuhdr_root/include"
--	test -d "$HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root" &&    cf_search="$cf_search $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
-+test "/usr" != "$prefix" && \
-+test -d "/usr" && \
-+(test $prefix = NONE || test -d $prefix) && {
-+	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-+	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-+	test -d /usr/include/$cf_ncuhdr_root &&       cf_search="$cf_search /usr/include/$cf_ncuhdr_root"
-+	test -d /usr/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search /usr/include/$cf_ncuhdr_root/include"
-+	test -d /usr/$cf_ncuhdr_root/include &&       cf_search="$cf_search /usr/$cf_ncuhdr_root/include"
-+	test -d /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
- }
- 
--test "$prefix" != /usr/local && \
--test -d /usr/local && {
--	test -n "$verbose" && echo "	... testing include-directories under /usr/local"
--	test -d /usr/local/include &&       cf_search="$cf_search /usr/local/include"
--	test -d /usr/local/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root"
--	test -d /usr/local/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root/include"
--	test -d /usr/local/$cf_ncuhdr_root/include &&    cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include"
--	test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
--}
- 
--test "$prefix" != NONE && \
--test -d $prefix && {
--	test -n "$verbose" && echo "	... testing include-directories under $prefix"
-+test "$prefix" != "NONE" && \
-+test -d "$prefix" && \
-+ {
-+	test -n "$verbose" && echo "	... testing for include-directories under $prefix"
- 	test -d $prefix/include &&          cf_search="$cf_search $prefix/include"
- 	test -d $prefix/include/$cf_ncuhdr_root &&       cf_search="$cf_search $prefix/include/$cf_ncuhdr_root"
- 	test -d $prefix/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include"
-@@ -3035,25 +3323,43 @@
- 	test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
- }
- 
--test "$prefix" != /opt && \
--test -d /opt && {
--	test -n "$verbose" && echo "	... testing include-directories under /opt"
--	test -d /opt/include &&             cf_search="$cf_search /opt/include"
--	test -d /opt/include/$cf_ncuhdr_root &&          cf_search="$cf_search /opt/include/$cf_ncuhdr_root"
--	test -d /opt/include/$cf_ncuhdr_root/include &&       cf_search="$cf_search /opt/include/$cf_ncuhdr_root/include"
--	test -d /opt/$cf_ncuhdr_root/include &&          cf_search="$cf_search /opt/$cf_ncuhdr_root/include"
--	test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&       cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
-+
-+test "/usr/local" != "$prefix" && \
-+test -d "/usr/local" && \
-+(test $prefix = NONE || test -d $prefix) && {
-+	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-+	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-+	test -d /usr/local/include/$cf_ncuhdr_root &&       cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root"
-+	test -d /usr/local/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root/include"
-+	test -d /usr/local/$cf_ncuhdr_root/include &&       cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include"
-+	test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
-+}
-+
-+
-+test "/opt" != "$prefix" && \
-+test -d "/opt" && \
-+(test $prefix = NONE || test -d $prefix) && {
-+	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-+	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-+	test -d /opt/include/$cf_ncuhdr_root &&       cf_search="$cf_search /opt/include/$cf_ncuhdr_root"
-+	test -d /opt/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search /opt/include/$cf_ncuhdr_root/include"
-+	test -d /opt/$cf_ncuhdr_root/include &&       cf_search="$cf_search /opt/$cf_ncuhdr_root/include"
-+	test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
- }
- 
--test "$prefix" != /usr && \
--test -d /usr && {
--	test -n "$verbose" && echo "	... testing include-directories under /usr"
--	test -d /usr/include &&             cf_search="$cf_search /usr/include"
--	test -d /usr/include/$cf_ncuhdr_root &&          cf_search="$cf_search /usr/include/$cf_ncuhdr_root"
--	test -d /usr/include/$cf_ncuhdr_root/include &&       cf_search="$cf_search /usr/include/$cf_ncuhdr_root/include"
--	test -d /usr/$cf_ncuhdr_root/include &&          cf_search="$cf_search /usr/$cf_ncuhdr_root/include"
-+
-+test "$HOME" != "$prefix" && \
-+test -d "$HOME" && \
-+(test $prefix = NONE || test -d $prefix) && {
-+	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-+	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-+	test -d $HOME/include/$cf_ncuhdr_root &&       cf_search="$cf_search $HOME/include/$cf_ncuhdr_root"
-+	test -d $HOME/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $HOME/include/$cf_ncuhdr_root/include"
-+	test -d $HOME/$cf_ncuhdr_root/include &&       cf_search="$cf_search $HOME/$cf_ncuhdr_root/include"
-+	test -d $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
- }
- 
-+
- test "$includedir" != NONE && \
- test "$includedir" != "/usr/include" && \
- test -d "$includedir" && {
-@@ -3074,46 +3380,69 @@
- 	for cf_incdir in $cf_search
- 	do
- 		
--for cf_add_incdir in $cf_incdir
--do
--	while true
-+if test -n "$cf_incdir" ; then
-+  for cf_add_incdir in $cf_incdir
-+  do
-+	while test $cf_add_incdir != /usr/include
- 	do
--		case $cf_add_incdir in
--		/usr/include) # (vi
--			;;
--		/usr/local/include) # (vi
-+	  if test -d $cf_add_incdir
-+	  then
-+		cf_have_incdir=no
-+		if test -n "$CFLAGS$CPPFLAGS" ; then
-+		  # a loop is needed to ensure we can add subdirs of existing dirs
-+		  for cf_test_incdir in $CFLAGS $CPPFLAGS ; do
-+			if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then
-+			  cf_have_incdir=yes; break
-+			fi
-+		  done
-+		fi
-+
-+		if test "$cf_have_incdir" = no ; then
-+          if test "$cf_add_incdir" = /usr/local/include ; then
- 			if test "$GCC" = yes
- 			then
--				cf_save_CPPFLAGS="$CPPFLAGS"
--				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
--				cat > conftest.$ac_ext <<EOF
--#line 3091 "configure"
-+			  cf_save_CPPFLAGS=$CPPFLAGS
-+			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
-+			  cat > conftest.$ac_ext <<EOF
-+#line 3408 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int main() {
- printf("Hello")
- ; return 0; }
- EOF
--if { (eval echo configure:3098: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3415: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   :
- else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
--  CPPFLAGS="$cf_save_CPPFLAGS"
-+  cf_have_incdir=yes
- fi
- rm -f conftest*
-+			  CPPFLAGS=$cf_save_CPPFLAGS
- 			fi
--			;;
--		*) # (vi
--			CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
--			;;
--		esac
--		cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
--		test "$cf_top_incdir" = "$cf_add_incdir" && break
--		cf_add_incdir="$cf_top_incdir"
-+		  fi
-+		fi
-+
-+		if test "$cf_have_incdir" = no ; then
-+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
-+
-+echo "${as_me-configure}:3432: testing adding $cf_add_incdir to include-path ..." 1>&5
-+
-+
-+		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
-+
-+          cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
-+          test "$cf_top_incdir" = "$cf_add_incdir" && break
-+          cf_add_incdir="$cf_top_incdir"
-+		else
-+		  break
-+		fi
-+	  fi
- 	done
--done
-+  done
-+fi
- 
- 		for cf_header in \
- 			ncurses.h \
-@@ -3121,7 +3450,7 @@
- 		do
- 			
- 	cat > conftest.$ac_ext <<EOF
--#line 3125 "configure"
-+#line 3454 "configure"
- #include "confdefs.h"
- 
- 
-@@ -3142,7 +3471,7 @@
- 	
- ; return 0; }
- EOF
--if { (eval echo configure:3146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3475: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   cf_cv_ncurses_h2=$cf_header
- 	
-@@ -3176,46 +3505,69 @@
- 		cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header
- 	fi
- 	
--for cf_add_incdir in $cf_1st_incdir
--do
--	while true
-+if test -n "$cf_1st_incdir" ; then
-+  for cf_add_incdir in $cf_1st_incdir
-+  do
-+	while test $cf_add_incdir != /usr/include
- 	do
--		case $cf_add_incdir in
--		/usr/include) # (vi
--			;;
--		/usr/local/include) # (vi
-+	  if test -d $cf_add_incdir
-+	  then
-+		cf_have_incdir=no
-+		if test -n "$CFLAGS$CPPFLAGS" ; then
-+		  # a loop is needed to ensure we can add subdirs of existing dirs
-+		  for cf_test_incdir in $CFLAGS $CPPFLAGS ; do
-+			if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then
-+			  cf_have_incdir=yes; break
-+			fi
-+		  done
-+		fi
-+
-+		if test "$cf_have_incdir" = no ; then
-+          if test "$cf_add_incdir" = /usr/local/include ; then
- 			if test "$GCC" = yes
- 			then
--				cf_save_CPPFLAGS="$CPPFLAGS"
--				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
--				cat > conftest.$ac_ext <<EOF
--#line 3193 "configure"
-+			  cf_save_CPPFLAGS=$CPPFLAGS
-+			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
-+			  cat > conftest.$ac_ext <<EOF
-+#line 3533 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int main() {
- printf("Hello")
- ; return 0; }
- EOF
--if { (eval echo configure:3200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   :
- else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
--  CPPFLAGS="$cf_save_CPPFLAGS"
-+  cf_have_incdir=yes
- fi
- rm -f conftest*
-+			  CPPFLAGS=$cf_save_CPPFLAGS
- 			fi
--			;;
--		*) # (vi
--			CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
--			;;
--		esac
--		cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
--		test "$cf_top_incdir" = "$cf_add_incdir" && break
--		cf_add_incdir="$cf_top_incdir"
-+		  fi
-+		fi
-+
-+		if test "$cf_have_incdir" = no ; then
-+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
-+
-+echo "${as_me-configure}:3557: testing adding $cf_add_incdir to include-path ..." 1>&5
-+
-+
-+		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
-+
-+          cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
-+          test "$cf_top_incdir" = "$cf_add_incdir" && break
-+          cf_add_incdir="$cf_top_incdir"
-+		else
-+		  break
-+		fi
-+	  fi
- 	done
--done
-+  done
-+fi
- 
- 
- fi
-@@ -3249,7 +3601,7 @@
- 
- 
- echo $ac_n "checking for terminfo header""... $ac_c" 1>&6
--echo "configure:3253: checking for terminfo header" >&5
-+echo "configure:3605: checking for terminfo header" >&5
- if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3266,7 +3618,7 @@
- for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
- do
- cat > conftest.$ac_ext <<EOF
--#line 3270 "configure"
-+#line 3622 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #include <${cf_cv_ncurses_header-curses.h}>
-@@ -3276,7 +3628,7 @@
- int x = auto_left_margin
- ; return 0; }
- EOF
--if { (eval echo configure:3280: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3632: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   
- 	cf_cv_term_header="$cf_test"
-@@ -3331,7 +3683,7 @@
- 
- 
- echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
--echo "configure:3335: checking for ncurses version" >&5
-+echo "configure:3687: checking for ncurses version" >&5
- if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3357,7 +3709,7 @@
- #endif
- EOF
- 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
--	{ (eval echo configure:3361: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
-+	{ (eval echo configure:3713: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
- 	if test -f conftest.out ; then
- 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
- 		test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
-@@ -3366,7 +3718,7 @@
- 
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3370 "configure"
-+#line 3722 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header-curses.h}>
-@@ -3387,10 +3739,10 @@
- 	make an error
- # endif
- #endif
--	exit(0);
-+	${cf_cv_main_return-return}(0);
- }
- EOF
--if { (eval echo configure:3394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:3746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   
- 	cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -3421,7 +3773,7 @@
- cf_ncurses_LIBS=""
- cf_ncurses_SAVE="$LIBS"
- echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
--echo "configure:3425: checking for Gpm_Open in -lgpm" >&5
-+echo "configure:3777: checking for Gpm_Open in -lgpm" >&5
- ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3429,7 +3781,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lgpm  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3433 "configure"
-+#line 3785 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3440,7 +3792,7 @@
- Gpm_Open()
- ; return 0; }
- EOF
--if { (eval echo configure:3444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3456,7 +3808,7 @@
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-   echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6
--echo "configure:3460: checking for initscr in -lgpm" >&5
-+echo "configure:3812: checking for initscr in -lgpm" >&5
- ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3464,7 +3816,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lgpm  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3468 "configure"
-+#line 3820 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3475,7 +3827,7 @@
- initscr()
- ; return 0; }
- EOF
--if { (eval echo configure:3479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3507,7 +3859,7 @@
- 	# version of ncurses (but it should do no harm, since it's static).
- 	if test "$cf_nculib_root" = ncurses ; then
- 		echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
--echo "configure:3511: checking for tgoto in -lmytinfo" >&5
-+echo "configure:3863: checking for tgoto in -lmytinfo" >&5
- ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3515,7 +3867,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lmytinfo  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3519 "configure"
-+#line 3871 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -3526,7 +3878,7 @@
- tgoto()
- ; return 0; }
- EOF
--if { (eval echo configure:3530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -3554,18 +3906,47 @@
- 
- if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
- then
--	LIBS="-L$cf_cv_curses_dir/lib -l$cf_nculib_root $LIBS"
-+	
-+if test -n "$cf_cv_curses_dir/lib" ; then
-+  for cf_add_libdir in $cf_cv_curses_dir/lib
-+  do
-+    if test $cf_add_libdir = /usr/lib ; then
-+      :
-+    elif test -d $cf_add_libdir
-+    then
-+      cf_have_libdir=no
-+      if test -n "$LDFLAGS$LIBS" ; then
-+        # a loop is needed to ensure we can add subdirs of existing dirs
-+        for cf_test_libdir in $LDFLAGS $LIBS ; do
-+          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-+            cf_have_libdir=yes; break
-+          fi
-+        done
-+      fi
-+      if test "$cf_have_libdir" = no ; then
-+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
-+
-+echo "${as_me-configure}:3930: testing adding $cf_add_libdir to library-path ..." 1>&5
-+
-+
-+        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-+      fi
-+    fi
-+  done
-+fi
-+
-+	LIBS="-l$cf_nculib_root $LIBS"
- else
- 	
- 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
- 	cf_libdir=""
- 	echo $ac_n "checking for initscr""... $ac_c" 1>&6
--echo "configure:3564: checking for initscr" >&5
-+echo "configure:3945: checking for initscr" >&5
- if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3569 "configure"
-+#line 3950 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char initscr(); below.  */
-@@ -3588,7 +3969,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:3592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:3973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_initscr=yes"
- else
-@@ -3608,17 +3989,17 @@
- 
- 		cf_save_LIBS="$LIBS"
- 		echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6
--echo "configure:3612: checking for initscr in -l$cf_nculib_root" >&5
-+echo "configure:3993: checking for initscr in -l$cf_nculib_root" >&5
- 		LIBS="-l$cf_nculib_root $LIBS"
- 		cat > conftest.$ac_ext <<EOF
--#line 3615 "configure"
-+#line 3996 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header-curses.h}>
- int main() {
- initscr()
- ; return 0; }
- EOF
--if { (eval echo configure:3622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   echo "$ac_t""yes" 1>&6
- 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
-@@ -3630,34 +4011,23 @@
-   echo "$ac_t""no" 1>&6
- 			cf_search=""
- 
--test -d "$HOME" && {
--	test -n "$verbose" && echo "	... testing lib-directories under $HOME"
--	test -d "$HOME/lib" &&          cf_search="$cf_search $HOME/lib"
--	test -d "$HOME/lib/$cf_nculib_root" &&       cf_search="$cf_search $HOME/lib/$cf_nculib_root"
--	test -d "$HOME/lib/$cf_nculib_root/lib" &&    cf_search="$cf_search $HOME/lib/$cf_nculib_root/lib"
--}
- 
--# For other stuff under the home directory, it should be sufficient to put
--# a symbolic link for $HOME/$cf_nculib_root to the actual package location:
--test -d "$HOME/$cf_nculib_root" && {
--	test -n "$verbose" && echo "	... testing lib-directories under $HOME/$cf_nculib_root"
--	test -d "$HOME/$cf_nculib_root/lib" &&       cf_search="$cf_search $HOME/$cf_nculib_root/lib"
--	test -d "$HOME/$cf_nculib_root/lib/$cf_nculib_root" &&    cf_search="$cf_search $HOME/$cf_nculib_root/lib/$cf_nculib_root"
-+test "/usr" != "$prefix" && \
-+test -d "/usr" && \
-+(test $prefix = NONE || test -d $prefix) && {
-+	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-+	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-+	test -d /usr/lib/$cf_nculib_root &&       cf_search="$cf_search /usr/lib/$cf_nculib_root"
-+	test -d /usr/lib/$cf_nculib_root/lib &&    cf_search="$cf_search /usr/lib/$cf_nculib_root/lib"
-+	test -d /usr/$cf_nculib_root/lib &&       cf_search="$cf_search /usr/$cf_nculib_root/lib"
-+	test -d /usr/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/$cf_nculib_root/lib/$cf_nculib_root"
- }
- 
--test "$prefix" != /usr/local && \
--test -d /usr/local && {
--	test -n "$verbose" && echo "	... testing lib-directories under /usr/local"
--	test -d /usr/local/lib &&       cf_search="$cf_search /usr/local/lib"
--	test -d /usr/local/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/local/lib/$cf_nculib_root"
--	test -d /usr/local/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/lib/$cf_nculib_root/lib"
--	test -d /usr/local/$cf_nculib_root/lib &&    cf_search="$cf_search /usr/local/$cf_nculib_root/lib"
--	test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root"
--}
- 
--test "$prefix" != NONE && \
--test -d $prefix && {
--	test -n "$verbose" && echo "	... testing lib-directories under $prefix"
-+test "$prefix" != "NONE" && \
-+test -d "$prefix" && \
-+ {
-+	test -n "$verbose" && echo "	... testing for lib-directories under $prefix"
- 	test -d $prefix/lib &&          cf_search="$cf_search $prefix/lib"
- 	test -d $prefix/lib/$cf_nculib_root &&       cf_search="$cf_search $prefix/lib/$cf_nculib_root"
- 	test -d $prefix/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib"
-@@ -3665,39 +4035,57 @@
- 	test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"
- }
- 
--test "$prefix" != /opt && \
--test -d /opt && {
--	test -n "$verbose" && echo "	... testing lib-directories under /opt"
--	test -d /opt/lib &&             cf_search="$cf_search /opt/lib"
--	test -d /opt/lib/$cf_nculib_root &&          cf_search="$cf_search /opt/lib/$cf_nculib_root"
--	test -d /opt/lib/$cf_nculib_root/lib &&       cf_search="$cf_search /opt/lib/$cf_nculib_root/lib"
--	test -d /opt/$cf_nculib_root/lib &&          cf_search="$cf_search /opt/$cf_nculib_root/lib"
--	test -d /opt/$cf_nculib_root/lib/$cf_nculib_root &&       cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root"
-+
-+test "/usr/local" != "$prefix" && \
-+test -d "/usr/local" && \
-+(test $prefix = NONE || test -d $prefix) && {
-+	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-+	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-+	test -d /usr/local/lib/$cf_nculib_root &&       cf_search="$cf_search /usr/local/lib/$cf_nculib_root"
-+	test -d /usr/local/lib/$cf_nculib_root/lib &&    cf_search="$cf_search /usr/local/lib/$cf_nculib_root/lib"
-+	test -d /usr/local/$cf_nculib_root/lib &&       cf_search="$cf_search /usr/local/$cf_nculib_root/lib"
-+	test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root"
-+}
-+
-+
-+test "/opt" != "$prefix" && \
-+test -d "/opt" && \
-+(test $prefix = NONE || test -d $prefix) && {
-+	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-+	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-+	test -d /opt/lib/$cf_nculib_root &&       cf_search="$cf_search /opt/lib/$cf_nculib_root"
-+	test -d /opt/lib/$cf_nculib_root/lib &&    cf_search="$cf_search /opt/lib/$cf_nculib_root/lib"
-+	test -d /opt/$cf_nculib_root/lib &&       cf_search="$cf_search /opt/$cf_nculib_root/lib"
-+	test -d /opt/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root"
- }
- 
--test "$prefix" != /usr && \
--test -d /usr && {
--	test -n "$verbose" && echo "	... testing lib-directories under /usr"
--	test -d /usr/lib &&             cf_search="$cf_search /usr/lib"
--	test -d /usr/lib/$cf_nculib_root &&          cf_search="$cf_search /usr/lib/$cf_nculib_root"
--	test -d /usr/lib/$cf_nculib_root/lib &&       cf_search="$cf_search /usr/lib/$cf_nculib_root/lib"
--	test -d /usr/$cf_nculib_root/lib &&          cf_search="$cf_search /usr/$cf_nculib_root/lib"
-+
-+test "$HOME" != "$prefix" && \
-+test -d "$HOME" && \
-+(test $prefix = NONE || test -d $prefix) && {
-+	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-+	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-+	test -d $HOME/lib/$cf_nculib_root &&       cf_search="$cf_search $HOME/lib/$cf_nculib_root"
-+	test -d $HOME/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $HOME/lib/$cf_nculib_root/lib"
-+	test -d $HOME/$cf_nculib_root/lib &&       cf_search="$cf_search $HOME/$cf_nculib_root/lib"
-+	test -d $HOME/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $HOME/$cf_nculib_root/lib/$cf_nculib_root"
- }
- 
-+
- 			for cf_libdir in $cf_search
- 			do
- 				echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6
--echo "configure:3691: checking for -l$cf_nculib_root in $cf_libdir" >&5
-+echo "configure:4079: checking for -l$cf_nculib_root in $cf_libdir" >&5
- 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
- 				cat > conftest.$ac_ext <<EOF
--#line 3694 "configure"
-+#line 4082 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header-curses.h}>
- int main() {
- initscr()
- ; return 0; }
- EOF
--if { (eval echo configure:3701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   echo "$ac_t""yes" 1>&6
- 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
-@@ -3728,7 +4116,7 @@
- 
- if test -n "$cf_ncurses_LIBS" ; then
- 	echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6
--echo "configure:3732: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
-+echo "configure:4120: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
- 	cf_ncurses_SAVE="$LIBS"
- 	for p in $cf_ncurses_LIBS ; do
- 		q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"`
-@@ -3737,14 +4125,14 @@
- 		fi
- 	done
- 	cat > conftest.$ac_ext <<EOF
--#line 3741 "configure"
-+#line 4129 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header-curses.h}>
- int main() {
- initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
- ; return 0; }
- EOF
--if { (eval echo configure:3748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   echo "$ac_t""yes" 1>&6
- else
-@@ -3770,14 +4158,14 @@
- 	cf_cv_libtype=w
- 	
- echo $ac_n "checking for multibyte character support""... $ac_c" 1>&6
--echo "configure:3774: checking for multibyte character support" >&5
-+echo "configure:4162: checking for multibyte character support" >&5
- if eval "test \"`echo '$''{'cf_cv_utf8_lib'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- 	cf_save_LIBS="$LIBS"
- 	cat > conftest.$ac_ext <<EOF
--#line 3781 "configure"
-+#line 4169 "configure"
- #include "confdefs.h"
- 
- #include <stdlib.h>
-@@ -3785,7 +4173,7 @@
- putwc(0,0);
- ; return 0; }
- EOF
--if { (eval echo configure:3789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   cf_cv_utf8_lib=yes
- else
-@@ -3794,7 +4182,7 @@
-   rm -rf conftest*
-   LIBS="-lutf8 $LIBS"
- 	 cat > conftest.$ac_ext <<EOF
--#line 3798 "configure"
-+#line 4186 "configure"
- #include "confdefs.h"
- 
- #include <libutf8.h>
-@@ -3802,7 +4190,7 @@
- putwc(0,0);
- ; return 0; }
- EOF
--if { (eval echo configure:3806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   cf_cv_utf8_lib=add-on
- else
-@@ -3835,11 +4223,76 @@
- cf_ncuhdr_root=ncursesw
- 
- test -n "$cf_cv_curses_dir" && \
--test "$cf_cv_curses_dir" != "no" && \
--CPPFLAGS="-I$cf_cv_curses_dir/include -I$cf_cv_curses_dir/include/$cf_ncuhdr_root $CPPFLAGS"
-+test "$cf_cv_curses_dir" != "no" && { \
-+  
-+if test -n "$cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root" ; then
-+  for cf_add_incdir in $cf_cv_curses_dir/include $cf_cv_curses_dir/include/$cf_ncuhdr_root
-+  do
-+	while test $cf_add_incdir != /usr/include
-+	do
-+	  if test -d $cf_add_incdir
-+	  then
-+		cf_have_incdir=no
-+		if test -n "$CFLAGS$CPPFLAGS" ; then
-+		  # a loop is needed to ensure we can add subdirs of existing dirs
-+		  for cf_test_incdir in $CFLAGS $CPPFLAGS ; do
-+			if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then
-+			  cf_have_incdir=yes; break
-+			fi
-+		  done
-+		fi
-+
-+		if test "$cf_have_incdir" = no ; then
-+          if test "$cf_add_incdir" = /usr/local/include ; then
-+			if test "$GCC" = yes
-+			then
-+			  cf_save_CPPFLAGS=$CPPFLAGS
-+			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
-+			  cat > conftest.$ac_ext <<EOF
-+#line 4253 "configure"
-+#include "confdefs.h"
-+#include <stdio.h>
-+int main() {
-+printf("Hello")
-+; return 0; }
-+EOF
-+if { (eval echo configure:4260: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  :
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  cf_have_incdir=yes
-+fi
-+rm -f conftest*
-+			  CPPFLAGS=$cf_save_CPPFLAGS
-+			fi
-+		  fi
-+		fi
-+
-+		if test "$cf_have_incdir" = no ; then
-+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
-+
-+echo "${as_me-configure}:4277: testing adding $cf_add_incdir to include-path ..." 1>&5
-+
-+
-+		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
-+
-+          cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
-+          test "$cf_top_incdir" = "$cf_add_incdir" && break
-+          cf_add_incdir="$cf_top_incdir"
-+		else
-+		  break
-+		fi
-+	  fi
-+	done
-+  done
-+fi
-+
-+}
- 
- echo $ac_n "checking for $cf_ncuhdr_root header in include-path""... $ac_c" 1>&6
--echo "configure:3843: checking for $cf_ncuhdr_root header in include-path" >&5
-+echo "configure:4296: checking for $cf_ncuhdr_root header in include-path" >&5
- if eval "test \"`echo '$''{'cf_cv_ncurses_h'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3850,7 +4303,7 @@
- 	do
- 		
- 	cat > conftest.$ac_ext <<EOF
--#line 3854 "configure"
-+#line 4307 "configure"
- #include "confdefs.h"
- 
- 
-@@ -3879,7 +4332,7 @@
- 	
- ; return 0; }
- EOF
--if { (eval echo configure:3883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4336: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   cf_cv_ncurses_h=$cf_header
- 	
-@@ -3905,7 +4358,7 @@
- else
- 
- echo $ac_n "checking for $cf_ncuhdr_root include-path""... $ac_c" 1>&6
--echo "configure:3909: checking for $cf_ncuhdr_root include-path" >&5
-+echo "configure:4362: checking for $cf_ncuhdr_root include-path" >&5
- if eval "test \"`echo '$''{'cf_cv_ncurses_h2'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -3913,34 +4366,23 @@
- 	test -n "$verbose" && echo
- 	cf_search=""
- 
--test -d "$HOME" && {
--	test -n "$verbose" && echo "	... testing include-directories under $HOME"
--	test -d "$HOME/include" &&          cf_search="$cf_search $HOME/include"
--	test -d "$HOME/include/$cf_ncuhdr_root" &&       cf_search="$cf_search $HOME/include/$cf_ncuhdr_root"
--	test -d "$HOME/include/$cf_ncuhdr_root/include" &&    cf_search="$cf_search $HOME/include/$cf_ncuhdr_root/include"
--}
- 
--# For other stuff under the home directory, it should be sufficient to put
--# a symbolic link for $HOME/$cf_ncuhdr_root to the actual package location:
--test -d "$HOME/$cf_ncuhdr_root" && {
--	test -n "$verbose" && echo "	... testing include-directories under $HOME/$cf_ncuhdr_root"
--	test -d "$HOME/$cf_ncuhdr_root/include" &&       cf_search="$cf_search $HOME/$cf_ncuhdr_root/include"
--	test -d "$HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root" &&    cf_search="$cf_search $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
-+test "/usr" != "$prefix" && \
-+test -d "/usr" && \
-+(test $prefix = NONE || test -d $prefix) && {
-+	test -n "$verbose" && echo "	... testing for include-directories under /usr"
-+	test -d /usr/include &&          cf_search="$cf_search /usr/include"
-+	test -d /usr/include/$cf_ncuhdr_root &&       cf_search="$cf_search /usr/include/$cf_ncuhdr_root"
-+	test -d /usr/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search /usr/include/$cf_ncuhdr_root/include"
-+	test -d /usr/$cf_ncuhdr_root/include &&       cf_search="$cf_search /usr/$cf_ncuhdr_root/include"
-+	test -d /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
- }
- 
--test "$prefix" != /usr/local && \
--test -d /usr/local && {
--	test -n "$verbose" && echo "	... testing include-directories under /usr/local"
--	test -d /usr/local/include &&       cf_search="$cf_search /usr/local/include"
--	test -d /usr/local/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root"
--	test -d /usr/local/include/$cf_ncuhdr_root/include && cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root/include"
--	test -d /usr/local/$cf_ncuhdr_root/include &&    cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include"
--	test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root && cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
--}
- 
--test "$prefix" != NONE && \
--test -d $prefix && {
--	test -n "$verbose" && echo "	... testing include-directories under $prefix"
-+test "$prefix" != "NONE" && \
-+test -d "$prefix" && \
-+ {
-+	test -n "$verbose" && echo "	... testing for include-directories under $prefix"
- 	test -d $prefix/include &&          cf_search="$cf_search $prefix/include"
- 	test -d $prefix/include/$cf_ncuhdr_root &&       cf_search="$cf_search $prefix/include/$cf_ncuhdr_root"
- 	test -d $prefix/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $prefix/include/$cf_ncuhdr_root/include"
-@@ -3948,25 +4390,43 @@
- 	test -d $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $prefix/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
- }
- 
--test "$prefix" != /opt && \
--test -d /opt && {
--	test -n "$verbose" && echo "	... testing include-directories under /opt"
--	test -d /opt/include &&             cf_search="$cf_search /opt/include"
--	test -d /opt/include/$cf_ncuhdr_root &&          cf_search="$cf_search /opt/include/$cf_ncuhdr_root"
--	test -d /opt/include/$cf_ncuhdr_root/include &&       cf_search="$cf_search /opt/include/$cf_ncuhdr_root/include"
--	test -d /opt/$cf_ncuhdr_root/include &&          cf_search="$cf_search /opt/$cf_ncuhdr_root/include"
--	test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&       cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
-+
-+test "/usr/local" != "$prefix" && \
-+test -d "/usr/local" && \
-+(test $prefix = NONE || test -d $prefix) && {
-+	test -n "$verbose" && echo "	... testing for include-directories under /usr/local"
-+	test -d /usr/local/include &&          cf_search="$cf_search /usr/local/include"
-+	test -d /usr/local/include/$cf_ncuhdr_root &&       cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root"
-+	test -d /usr/local/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search /usr/local/include/$cf_ncuhdr_root/include"
-+	test -d /usr/local/$cf_ncuhdr_root/include &&       cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include"
-+	test -d /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /usr/local/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
-+}
-+
-+
-+test "/opt" != "$prefix" && \
-+test -d "/opt" && \
-+(test $prefix = NONE || test -d $prefix) && {
-+	test -n "$verbose" && echo "	... testing for include-directories under /opt"
-+	test -d /opt/include &&          cf_search="$cf_search /opt/include"
-+	test -d /opt/include/$cf_ncuhdr_root &&       cf_search="$cf_search /opt/include/$cf_ncuhdr_root"
-+	test -d /opt/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search /opt/include/$cf_ncuhdr_root/include"
-+	test -d /opt/$cf_ncuhdr_root/include &&       cf_search="$cf_search /opt/$cf_ncuhdr_root/include"
-+	test -d /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search /opt/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
- }
- 
--test "$prefix" != /usr && \
--test -d /usr && {
--	test -n "$verbose" && echo "	... testing include-directories under /usr"
--	test -d /usr/include &&             cf_search="$cf_search /usr/include"
--	test -d /usr/include/$cf_ncuhdr_root &&          cf_search="$cf_search /usr/include/$cf_ncuhdr_root"
--	test -d /usr/include/$cf_ncuhdr_root/include &&       cf_search="$cf_search /usr/include/$cf_ncuhdr_root/include"
--	test -d /usr/$cf_ncuhdr_root/include &&          cf_search="$cf_search /usr/$cf_ncuhdr_root/include"
-+
-+test "$HOME" != "$prefix" && \
-+test -d "$HOME" && \
-+(test $prefix = NONE || test -d $prefix) && {
-+	test -n "$verbose" && echo "	... testing for include-directories under $HOME"
-+	test -d $HOME/include &&          cf_search="$cf_search $HOME/include"
-+	test -d $HOME/include/$cf_ncuhdr_root &&       cf_search="$cf_search $HOME/include/$cf_ncuhdr_root"
-+	test -d $HOME/include/$cf_ncuhdr_root/include &&    cf_search="$cf_search $HOME/include/$cf_ncuhdr_root/include"
-+	test -d $HOME/$cf_ncuhdr_root/include &&       cf_search="$cf_search $HOME/$cf_ncuhdr_root/include"
-+	test -d $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root &&    cf_search="$cf_search $HOME/$cf_ncuhdr_root/include/$cf_ncuhdr_root"
- }
- 
-+
- test "$includedir" != NONE && \
- test "$includedir" != "/usr/include" && \
- test -d "$includedir" && {
-@@ -3987,46 +4447,69 @@
- 	for cf_incdir in $cf_search
- 	do
- 		
--for cf_add_incdir in $cf_incdir
--do
--	while true
-+if test -n "$cf_incdir" ; then
-+  for cf_add_incdir in $cf_incdir
-+  do
-+	while test $cf_add_incdir != /usr/include
- 	do
--		case $cf_add_incdir in
--		/usr/include) # (vi
--			;;
--		/usr/local/include) # (vi
-+	  if test -d $cf_add_incdir
-+	  then
-+		cf_have_incdir=no
-+		if test -n "$CFLAGS$CPPFLAGS" ; then
-+		  # a loop is needed to ensure we can add subdirs of existing dirs
-+		  for cf_test_incdir in $CFLAGS $CPPFLAGS ; do
-+			if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then
-+			  cf_have_incdir=yes; break
-+			fi
-+		  done
-+		fi
-+
-+		if test "$cf_have_incdir" = no ; then
-+          if test "$cf_add_incdir" = /usr/local/include ; then
- 			if test "$GCC" = yes
- 			then
--				cf_save_CPPFLAGS="$CPPFLAGS"
--				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
--				cat > conftest.$ac_ext <<EOF
--#line 4004 "configure"
-+			  cf_save_CPPFLAGS=$CPPFLAGS
-+			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
-+			  cat > conftest.$ac_ext <<EOF
-+#line 4475 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int main() {
- printf("Hello")
- ; return 0; }
- EOF
--if { (eval echo configure:4011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   :
- else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
--  CPPFLAGS="$cf_save_CPPFLAGS"
-+  cf_have_incdir=yes
- fi
- rm -f conftest*
-+			  CPPFLAGS=$cf_save_CPPFLAGS
- 			fi
--			;;
--		*) # (vi
--			CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
--			;;
--		esac
--		cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
--		test "$cf_top_incdir" = "$cf_add_incdir" && break
--		cf_add_incdir="$cf_top_incdir"
-+		  fi
-+		fi
-+
-+		if test "$cf_have_incdir" = no ; then
-+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
-+
-+echo "${as_me-configure}:4499: testing adding $cf_add_incdir to include-path ..." 1>&5
-+
-+
-+		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
-+
-+          cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
-+          test "$cf_top_incdir" = "$cf_add_incdir" && break
-+          cf_add_incdir="$cf_top_incdir"
-+		else
-+		  break
-+		fi
-+	  fi
- 	done
--done
-+  done
-+fi
- 
- 		for cf_header in \
- 			ncurses.h \
-@@ -4034,7 +4517,7 @@
- 		do
- 			
- 	cat > conftest.$ac_ext <<EOF
--#line 4038 "configure"
-+#line 4521 "configure"
- #include "confdefs.h"
- 
- 
-@@ -4055,7 +4538,7 @@
- 	
- ; return 0; }
- EOF
--if { (eval echo configure:4059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4542: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   cf_cv_ncurses_h2=$cf_header
- 	
-@@ -4089,46 +4572,69 @@
- 		cf_cv_ncurses_header=$cf_ncuhdr_root/$cf_cv_ncurses_header
- 	fi
- 	
--for cf_add_incdir in $cf_1st_incdir
--do
--	while true
-+if test -n "$cf_1st_incdir" ; then
-+  for cf_add_incdir in $cf_1st_incdir
-+  do
-+	while test $cf_add_incdir != /usr/include
- 	do
--		case $cf_add_incdir in
--		/usr/include) # (vi
--			;;
--		/usr/local/include) # (vi
-+	  if test -d $cf_add_incdir
-+	  then
-+		cf_have_incdir=no
-+		if test -n "$CFLAGS$CPPFLAGS" ; then
-+		  # a loop is needed to ensure we can add subdirs of existing dirs
-+		  for cf_test_incdir in $CFLAGS $CPPFLAGS ; do
-+			if test ".$cf_test_incdir" = ".-I$cf_add_incdir" ; then
-+			  cf_have_incdir=yes; break
-+			fi
-+		  done
-+		fi
-+
-+		if test "$cf_have_incdir" = no ; then
-+          if test "$cf_add_incdir" = /usr/local/include ; then
- 			if test "$GCC" = yes
- 			then
--				cf_save_CPPFLAGS="$CPPFLAGS"
--				CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
--				cat > conftest.$ac_ext <<EOF
--#line 4106 "configure"
-+			  cf_save_CPPFLAGS=$CPPFLAGS
-+			  CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
-+			  cat > conftest.$ac_ext <<EOF
-+#line 4600 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int main() {
- printf("Hello")
- ; return 0; }
- EOF
--if { (eval echo configure:4113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4607: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   :
- else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
--  CPPFLAGS="$cf_save_CPPFLAGS"
-+  cf_have_incdir=yes
- fi
- rm -f conftest*
-+			  CPPFLAGS=$cf_save_CPPFLAGS
- 			fi
--			;;
--		*) # (vi
--			CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
--			;;
--		esac
--		cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
--		test "$cf_top_incdir" = "$cf_add_incdir" && break
--		cf_add_incdir="$cf_top_incdir"
-+		  fi
-+		fi
-+
-+		if test "$cf_have_incdir" = no ; then
-+		  test -n "$verbose" && echo "	adding $cf_add_incdir to include-path" 1>&6
-+
-+echo "${as_me-configure}:4624: testing adding $cf_add_incdir to include-path ..." 1>&5
-+
-+
-+		  CPPFLAGS="-I$cf_add_incdir $CPPFLAGS"
-+
-+          cf_top_incdir=`echo $cf_add_incdir | sed -e 's%/include/.*$%/include%'`
-+          test "$cf_top_incdir" = "$cf_add_incdir" && break
-+          cf_add_incdir="$cf_top_incdir"
-+		else
-+		  break
-+		fi
-+	  fi
- 	done
--done
-+  done
-+fi
- 
- 
- fi
-@@ -4162,7 +4668,7 @@
- 
- 
- echo $ac_n "checking for terminfo header""... $ac_c" 1>&6
--echo "configure:4166: checking for terminfo header" >&5
-+echo "configure:4672: checking for terminfo header" >&5
- if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -4179,7 +4685,7 @@
- for cf_test in $cf_term_header "ncurses/term.h" "ncursesw/term.h"
- do
- cat > conftest.$ac_ext <<EOF
--#line 4183 "configure"
-+#line 4689 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- #include <${cf_cv_ncurses_header-curses.h}>
-@@ -4189,7 +4695,7 @@
- int x = auto_left_margin
- ; return 0; }
- EOF
--if { (eval echo configure:4193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:4699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   
- 	cf_cv_term_header="$cf_test"
-@@ -4244,7 +4750,7 @@
- 
- 
- echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
--echo "configure:4248: checking for ncurses version" >&5
-+echo "configure:4754: checking for ncurses version" >&5
- if eval "test \"`echo '$''{'cf_cv_ncurses_version'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -4270,7 +4776,7 @@
- #endif
- EOF
- 	cf_try="$ac_cpp conftest.$ac_ext 2>&5 | grep '^Autoconf ' >conftest.out"
--	{ (eval echo configure:4274: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
-+	{ (eval echo configure:4780: \"$cf_try\") 1>&5; (eval $cf_try) 2>&5; }
- 	if test -f conftest.out ; then
- 		cf_out=`cat conftest.out | sed -e 's%^Autoconf %%' -e 's%^[^"]*"%%' -e 's%".*%%'`
- 		test -n "$cf_out" && cf_cv_ncurses_version="$cf_out"
-@@ -4279,7 +4785,7 @@
- 
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4283 "configure"
-+#line 4789 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header-curses.h}>
-@@ -4300,10 +4806,10 @@
- 	make an error
- # endif
- #endif
--	exit(0);
-+	${cf_cv_main_return-return}(0);
- }
- EOF
--if { (eval echo configure:4307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:4813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   
- 	cf_cv_ncurses_version=`cat $cf_tempfile`
-@@ -4334,7 +4840,7 @@
- cf_ncurses_LIBS=""
- cf_ncurses_SAVE="$LIBS"
- echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
--echo "configure:4338: checking for Gpm_Open in -lgpm" >&5
-+echo "configure:4844: checking for Gpm_Open in -lgpm" >&5
- ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4342,7 +4848,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lgpm  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4346 "configure"
-+#line 4852 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4353,7 +4859,7 @@
- Gpm_Open()
- ; return 0; }
- EOF
--if { (eval echo configure:4357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4369,7 +4875,7 @@
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
-   echo $ac_n "checking for initscr in -lgpm""... $ac_c" 1>&6
--echo "configure:4373: checking for initscr in -lgpm" >&5
-+echo "configure:4879: checking for initscr in -lgpm" >&5
- ac_lib_var=`echo gpm'_'initscr | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4377,7 +4883,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lgpm  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4381 "configure"
-+#line 4887 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4388,7 +4894,7 @@
- initscr()
- ; return 0; }
- EOF
--if { (eval echo configure:4392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4420,7 +4926,7 @@
- 	# version of ncurses (but it should do no harm, since it's static).
- 	if test "$cf_nculib_root" = ncurses ; then
- 		echo $ac_n "checking for tgoto in -lmytinfo""... $ac_c" 1>&6
--echo "configure:4424: checking for tgoto in -lmytinfo" >&5
-+echo "configure:4930: checking for tgoto in -lmytinfo" >&5
- ac_lib_var=`echo mytinfo'_'tgoto | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4428,7 +4934,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lmytinfo  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4432 "configure"
-+#line 4938 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4439,7 +4945,7 @@
- tgoto()
- ; return 0; }
- EOF
--if { (eval echo configure:4443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:4949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4467,18 +4973,47 @@
- 
- if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" )
- then
--	LIBS="-L$cf_cv_curses_dir/lib -l$cf_nculib_root $LIBS"
-+	
-+if test -n "$cf_cv_curses_dir/lib" ; then
-+  for cf_add_libdir in $cf_cv_curses_dir/lib
-+  do
-+    if test $cf_add_libdir = /usr/lib ; then
-+      :
-+    elif test -d $cf_add_libdir
-+    then
-+      cf_have_libdir=no
-+      if test -n "$LDFLAGS$LIBS" ; then
-+        # a loop is needed to ensure we can add subdirs of existing dirs
-+        for cf_test_libdir in $LDFLAGS $LIBS ; do
-+          if test ".$cf_test_libdir" = ".-L$cf_add_libdir" ; then
-+            cf_have_libdir=yes; break
-+          fi
-+        done
-+      fi
-+      if test "$cf_have_libdir" = no ; then
-+        test -n "$verbose" && echo "	adding $cf_add_libdir to library-path" 1>&6
-+
-+echo "${as_me-configure}:4997: testing adding $cf_add_libdir to library-path ..." 1>&5
-+
-+
-+        LDFLAGS="-L$cf_add_libdir $LDFLAGS"
-+      fi
-+    fi
-+  done
-+fi
-+
-+	LIBS="-l$cf_nculib_root $LIBS"
- else
- 	
- 	eval 'cf_cv_have_lib_'$cf_nculib_root'=no'
- 	cf_libdir=""
- 	echo $ac_n "checking for initscr""... $ac_c" 1>&6
--echo "configure:4477: checking for initscr" >&5
-+echo "configure:5012: checking for initscr" >&5
- if eval "test \"`echo '$''{'ac_cv_func_initscr'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4482 "configure"
-+#line 5017 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char initscr(); below.  */
-@@ -4501,7 +5036,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:4505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_initscr=yes"
- else
-@@ -4521,17 +5056,17 @@
- 
- 		cf_save_LIBS="$LIBS"
- 		echo $ac_n "checking for initscr in -l$cf_nculib_root""... $ac_c" 1>&6
--echo "configure:4525: checking for initscr in -l$cf_nculib_root" >&5
-+echo "configure:5060: checking for initscr in -l$cf_nculib_root" >&5
- 		LIBS="-l$cf_nculib_root $LIBS"
- 		cat > conftest.$ac_ext <<EOF
--#line 4528 "configure"
-+#line 5063 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header-curses.h}>
- int main() {
- initscr()
- ; return 0; }
- EOF
--if { (eval echo configure:4535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   echo "$ac_t""yes" 1>&6
- 			 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
-@@ -4543,34 +5078,23 @@
-   echo "$ac_t""no" 1>&6
- 			cf_search=""
- 
--test -d "$HOME" && {
--	test -n "$verbose" && echo "	... testing lib-directories under $HOME"
--	test -d "$HOME/lib" &&          cf_search="$cf_search $HOME/lib"
--	test -d "$HOME/lib/$cf_nculib_root" &&       cf_search="$cf_search $HOME/lib/$cf_nculib_root"
--	test -d "$HOME/lib/$cf_nculib_root/lib" &&    cf_search="$cf_search $HOME/lib/$cf_nculib_root/lib"
--}
- 
--# For other stuff under the home directory, it should be sufficient to put
--# a symbolic link for $HOME/$cf_nculib_root to the actual package location:
--test -d "$HOME/$cf_nculib_root" && {
--	test -n "$verbose" && echo "	... testing lib-directories under $HOME/$cf_nculib_root"
--	test -d "$HOME/$cf_nculib_root/lib" &&       cf_search="$cf_search $HOME/$cf_nculib_root/lib"
--	test -d "$HOME/$cf_nculib_root/lib/$cf_nculib_root" &&    cf_search="$cf_search $HOME/$cf_nculib_root/lib/$cf_nculib_root"
-+test "/usr" != "$prefix" && \
-+test -d "/usr" && \
-+(test $prefix = NONE || test -d $prefix) && {
-+	test -n "$verbose" && echo "	... testing for lib-directories under /usr"
-+	test -d /usr/lib &&          cf_search="$cf_search /usr/lib"
-+	test -d /usr/lib/$cf_nculib_root &&       cf_search="$cf_search /usr/lib/$cf_nculib_root"
-+	test -d /usr/lib/$cf_nculib_root/lib &&    cf_search="$cf_search /usr/lib/$cf_nculib_root/lib"
-+	test -d /usr/$cf_nculib_root/lib &&       cf_search="$cf_search /usr/$cf_nculib_root/lib"
-+	test -d /usr/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/$cf_nculib_root/lib/$cf_nculib_root"
- }
- 
--test "$prefix" != /usr/local && \
--test -d /usr/local && {
--	test -n "$verbose" && echo "	... testing lib-directories under /usr/local"
--	test -d /usr/local/lib &&       cf_search="$cf_search /usr/local/lib"
--	test -d /usr/local/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/local/lib/$cf_nculib_root"
--	test -d /usr/local/lib/$cf_nculib_root/lib && cf_search="$cf_search /usr/local/lib/$cf_nculib_root/lib"
--	test -d /usr/local/$cf_nculib_root/lib &&    cf_search="$cf_search /usr/local/$cf_nculib_root/lib"
--	test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root && cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root"
--}
- 
--test "$prefix" != NONE && \
--test -d $prefix && {
--	test -n "$verbose" && echo "	... testing lib-directories under $prefix"
-+test "$prefix" != "NONE" && \
-+test -d "$prefix" && \
-+ {
-+	test -n "$verbose" && echo "	... testing for lib-directories under $prefix"
- 	test -d $prefix/lib &&          cf_search="$cf_search $prefix/lib"
- 	test -d $prefix/lib/$cf_nculib_root &&       cf_search="$cf_search $prefix/lib/$cf_nculib_root"
- 	test -d $prefix/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $prefix/lib/$cf_nculib_root/lib"
-@@ -4578,39 +5102,57 @@
- 	test -d $prefix/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $prefix/$cf_nculib_root/lib/$cf_nculib_root"
- }
- 
--test "$prefix" != /opt && \
--test -d /opt && {
--	test -n "$verbose" && echo "	... testing lib-directories under /opt"
--	test -d /opt/lib &&             cf_search="$cf_search /opt/lib"
--	test -d /opt/lib/$cf_nculib_root &&          cf_search="$cf_search /opt/lib/$cf_nculib_root"
--	test -d /opt/lib/$cf_nculib_root/lib &&       cf_search="$cf_search /opt/lib/$cf_nculib_root/lib"
--	test -d /opt/$cf_nculib_root/lib &&          cf_search="$cf_search /opt/$cf_nculib_root/lib"
--	test -d /opt/$cf_nculib_root/lib/$cf_nculib_root &&       cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root"
-+
-+test "/usr/local" != "$prefix" && \
-+test -d "/usr/local" && \
-+(test $prefix = NONE || test -d $prefix) && {
-+	test -n "$verbose" && echo "	... testing for lib-directories under /usr/local"
-+	test -d /usr/local/lib &&          cf_search="$cf_search /usr/local/lib"
-+	test -d /usr/local/lib/$cf_nculib_root &&       cf_search="$cf_search /usr/local/lib/$cf_nculib_root"
-+	test -d /usr/local/lib/$cf_nculib_root/lib &&    cf_search="$cf_search /usr/local/lib/$cf_nculib_root/lib"
-+	test -d /usr/local/$cf_nculib_root/lib &&       cf_search="$cf_search /usr/local/$cf_nculib_root/lib"
-+	test -d /usr/local/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /usr/local/$cf_nculib_root/lib/$cf_nculib_root"
-+}
-+
-+
-+test "/opt" != "$prefix" && \
-+test -d "/opt" && \
-+(test $prefix = NONE || test -d $prefix) && {
-+	test -n "$verbose" && echo "	... testing for lib-directories under /opt"
-+	test -d /opt/lib &&          cf_search="$cf_search /opt/lib"
-+	test -d /opt/lib/$cf_nculib_root &&       cf_search="$cf_search /opt/lib/$cf_nculib_root"
-+	test -d /opt/lib/$cf_nculib_root/lib &&    cf_search="$cf_search /opt/lib/$cf_nculib_root/lib"
-+	test -d /opt/$cf_nculib_root/lib &&       cf_search="$cf_search /opt/$cf_nculib_root/lib"
-+	test -d /opt/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search /opt/$cf_nculib_root/lib/$cf_nculib_root"
- }
- 
--test "$prefix" != /usr && \
--test -d /usr && {
--	test -n "$verbose" && echo "	... testing lib-directories under /usr"
--	test -d /usr/lib &&             cf_search="$cf_search /usr/lib"
--	test -d /usr/lib/$cf_nculib_root &&          cf_search="$cf_search /usr/lib/$cf_nculib_root"
--	test -d /usr/lib/$cf_nculib_root/lib &&       cf_search="$cf_search /usr/lib/$cf_nculib_root/lib"
--	test -d /usr/$cf_nculib_root/lib &&          cf_search="$cf_search /usr/$cf_nculib_root/lib"
-+
-+test "$HOME" != "$prefix" && \
-+test -d "$HOME" && \
-+(test $prefix = NONE || test -d $prefix) && {
-+	test -n "$verbose" && echo "	... testing for lib-directories under $HOME"
-+	test -d $HOME/lib &&          cf_search="$cf_search $HOME/lib"
-+	test -d $HOME/lib/$cf_nculib_root &&       cf_search="$cf_search $HOME/lib/$cf_nculib_root"
-+	test -d $HOME/lib/$cf_nculib_root/lib &&    cf_search="$cf_search $HOME/lib/$cf_nculib_root/lib"
-+	test -d $HOME/$cf_nculib_root/lib &&       cf_search="$cf_search $HOME/$cf_nculib_root/lib"
-+	test -d $HOME/$cf_nculib_root/lib/$cf_nculib_root &&    cf_search="$cf_search $HOME/$cf_nculib_root/lib/$cf_nculib_root"
- }
- 
-+
- 			for cf_libdir in $cf_search
- 			do
- 				echo $ac_n "checking for -l$cf_nculib_root in $cf_libdir""... $ac_c" 1>&6
--echo "configure:4604: checking for -l$cf_nculib_root in $cf_libdir" >&5
-+echo "configure:5146: checking for -l$cf_nculib_root in $cf_libdir" >&5
- 				LIBS="-L$cf_libdir -l$cf_nculib_root $cf_save_LIBS"
- 				cat > conftest.$ac_ext <<EOF
--#line 4607 "configure"
-+#line 5149 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header-curses.h}>
- int main() {
- initscr()
- ; return 0; }
- EOF
--if { (eval echo configure:4614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   echo "$ac_t""yes" 1>&6
- 			 		 eval 'cf_cv_have_lib_'$cf_nculib_root'=yes'
-@@ -4641,7 +5183,7 @@
- 
- if test -n "$cf_ncurses_LIBS" ; then
- 	echo $ac_n "checking if we can link $cf_nculib_root without $cf_ncurses_LIBS""... $ac_c" 1>&6
--echo "configure:4645: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
-+echo "configure:5187: checking if we can link $cf_nculib_root without $cf_ncurses_LIBS" >&5
- 	cf_ncurses_SAVE="$LIBS"
- 	for p in $cf_ncurses_LIBS ; do
- 		q=`echo $LIBS | sed -e "s%$p %%" -e "s%$p$%%"`
-@@ -4650,14 +5192,14 @@
- 		fi
- 	done
- 	cat > conftest.$ac_ext <<EOF
--#line 4654 "configure"
-+#line 5196 "configure"
- #include "confdefs.h"
- #include <${cf_cv_ncurses_header-curses.h}>
- int main() {
- initscr(); mousemask(0,0); tgoto((char *)0, 0, 0);
- ; return 0; }
- EOF
--if { (eval echo configure:4661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   echo "$ac_t""yes" 1>&6
- else
-@@ -4700,17 +5242,17 @@
-     case "`(uname -sr) 2>/dev/null`" in
-     "SunOS 5"*)
-       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
--echo "configure:4704: checking whether -R must be followed by a space" >&5
-+echo "configure:5246: checking whether -R must be followed by a space" >&5
-       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
-       cat > conftest.$ac_ext <<EOF
--#line 4707 "configure"
-+#line 5249 "configure"
- #include "confdefs.h"
- 
- int main() {
- 
- ; return 0; }
- EOF
--if { (eval echo configure:4714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   ac_R_nospace=yes
- else
-@@ -4726,14 +5268,14 @@
-       else
- 	LIBS="$ac_xsave_LIBS -R $x_libraries"
- 	cat > conftest.$ac_ext <<EOF
--#line 4730 "configure"
-+#line 5272 "configure"
- #include "confdefs.h"
- 
- int main() {
- 
- ; return 0; }
- EOF
--if { (eval echo configure:4737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   ac_R_space=yes
- else
-@@ -4765,7 +5307,7 @@
-     # libraries were built with DECnet support.  And karl@cs.umb.edu says
-     # the Alpha needs dnet_stub (dnet does not exist).
-     echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
--echo "configure:4769: checking for dnet_ntoa in -ldnet" >&5
-+echo "configure:5311: checking for dnet_ntoa in -ldnet" >&5
- ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4773,7 +5315,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ldnet  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4777 "configure"
-+#line 5319 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4784,7 +5326,7 @@
- dnet_ntoa()
- ; return 0; }
- EOF
--if { (eval echo configure:4788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4806,7 +5348,7 @@
- 
-     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-       echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
--echo "configure:4810: checking for dnet_ntoa in -ldnet_stub" >&5
-+echo "configure:5352: checking for dnet_ntoa in -ldnet_stub" >&5
- ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4814,7 +5356,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-ldnet_stub  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4818 "configure"
-+#line 5360 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4825,7 +5367,7 @@
- dnet_ntoa()
- ; return 0; }
- EOF
--if { (eval echo configure:4829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4854,12 +5396,12 @@
-     # The nsl library prevents programs from opening the X display
-     # on Irix 5.2, according to dickey@clark.net.
-     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
--echo "configure:4858: checking for gethostbyname" >&5
-+echo "configure:5400: checking for gethostbyname" >&5
- if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4863 "configure"
-+#line 5405 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char gethostbyname(); below.  */
-@@ -4882,7 +5424,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:4886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_gethostbyname=yes"
- else
-@@ -4903,7 +5445,7 @@
- 
-     if test $ac_cv_func_gethostbyname = no; then
-       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
--echo "configure:4907: checking for gethostbyname in -lnsl" >&5
-+echo "configure:5449: checking for gethostbyname in -lnsl" >&5
- ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -4911,7 +5453,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lnsl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4915 "configure"
-+#line 5457 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -4922,7 +5464,7 @@
- gethostbyname()
- ; return 0; }
- EOF
--if { (eval echo configure:4926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -4952,12 +5494,12 @@
-     # -lsocket must be given before -lnsl if both are needed.
-     # We assume that if connect needs -lnsl, so does gethostbyname.
-     echo $ac_n "checking for connect""... $ac_c" 1>&6
--echo "configure:4956: checking for connect" >&5
-+echo "configure:5498: checking for connect" >&5
- if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 4961 "configure"
-+#line 5503 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char connect(); below.  */
-@@ -4980,7 +5522,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:4984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_connect=yes"
- else
-@@ -5001,7 +5543,7 @@
- 
-     if test $ac_cv_func_connect = no; then
-       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
--echo "configure:5005: checking for connect in -lsocket" >&5
-+echo "configure:5547: checking for connect in -lsocket" >&5
- ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5009,7 +5551,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5013 "configure"
-+#line 5555 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5020,7 +5562,7 @@
- connect()
- ; return 0; }
- EOF
--if { (eval echo configure:5024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5044,12 +5586,12 @@
- 
-     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
-     echo $ac_n "checking for remove""... $ac_c" 1>&6
--echo "configure:5048: checking for remove" >&5
-+echo "configure:5590: checking for remove" >&5
- if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5053 "configure"
-+#line 5595 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char remove(); below.  */
-@@ -5072,7 +5614,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_remove=yes"
- else
-@@ -5093,7 +5635,7 @@
- 
-     if test $ac_cv_func_remove = no; then
-       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
--echo "configure:5097: checking for remove in -lposix" >&5
-+echo "configure:5639: checking for remove in -lposix" >&5
- ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5101,7 +5643,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lposix  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5105 "configure"
-+#line 5647 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5112,7 +5654,7 @@
- remove()
- ; return 0; }
- EOF
--if { (eval echo configure:5116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5136,12 +5678,12 @@
- 
-     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-     echo $ac_n "checking for shmat""... $ac_c" 1>&6
--echo "configure:5140: checking for shmat" >&5
-+echo "configure:5682: checking for shmat" >&5
- if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5145 "configure"
-+#line 5687 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char shmat(); below.  */
-@@ -5164,7 +5706,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_shmat=yes"
- else
-@@ -5185,7 +5727,7 @@
- 
-     if test $ac_cv_func_shmat = no; then
-       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
--echo "configure:5189: checking for shmat in -lipc" >&5
-+echo "configure:5731: checking for shmat in -lipc" >&5
- ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5193,7 +5735,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lipc  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5197 "configure"
-+#line 5739 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5204,7 +5746,7 @@
- shmat()
- ; return 0; }
- EOF
--if { (eval echo configure:5208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5237,7 +5779,7 @@
-   # libraries we check for below, so use a different variable.
-   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
-   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
--echo "configure:5241: checking for IceConnectionNumber in -lICE" >&5
-+echo "configure:5783: checking for IceConnectionNumber in -lICE" >&5
- ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5245,7 +5787,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lICE $X_EXTRA_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5249 "configure"
-+#line 5791 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5256,7 +5798,7 @@
- IceConnectionNumber()
- ; return 0; }
- EOF
--if { (eval echo configure:5260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5290,7 +5832,10 @@
- 
- LDFLAGS="$X_LIBS $LDFLAGS"
- 
--test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
-+test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
-+
-+echo "${as_me-configure}:5838: testing checking additions to CFLAGS ..." 1>&5
-+
- 
- cf_check_cflags="$CFLAGS"
- cf_check_cppflags="$CPPFLAGS"
-@@ -5351,18 +5896,27 @@
- if test -n "$cf_new_cflags" ; then
- 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
- 
-+echo "${as_me-configure}:5900: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
-+
-+
- 	CFLAGS="$CFLAGS $cf_new_cflags"
- fi
- 
- if test -n "$cf_new_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
- 
-+echo "${as_me-configure}:5909: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
-+
-+
- 	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
- fi
- 
- if test -n "$cf_new_extra_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
- 
-+echo "${as_me-configure}:5918: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
-+
-+
- 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
- fi
- 
-@@ -5371,14 +5925,14 @@
- 
- if test "$cf_check_cflags" != "$CFLAGS" ; then
- cat > conftest.$ac_ext <<EOF
--#line 5375 "configure"
-+#line 5929 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int main() {
- printf("Hello world");
- ; return 0; }
- EOF
--if { (eval echo configure:5382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   :
- else
-   echo "configure: failed program was:" >&5
-@@ -5386,9 +5940,15 @@
-   rm -rf conftest*
-   test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
- 
-+echo "${as_me-configure}:5944: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
-+
-+
- 	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
- 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
- 
-+echo "${as_me-configure}:5950: testing but keeping change to \$CPPFLAGS ..." 1>&5
-+
-+
- 	 fi
- 	 CFLAGS="$cf_check_flags"
- fi
-@@ -5397,12 +5957,12 @@
- 
- 
- echo $ac_n "checking for XOpenDisplay""... $ac_c" 1>&6
--echo "configure:5401: checking for XOpenDisplay" >&5
-+echo "configure:5961: checking for XOpenDisplay" >&5
- if eval "test \"`echo '$''{'ac_cv_func_XOpenDisplay'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5406 "configure"
-+#line 5966 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char XOpenDisplay(); below.  */
-@@ -5425,7 +5985,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:5989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_XOpenDisplay=yes"
- else
-@@ -5444,7 +6004,7 @@
-   echo "$ac_t""no" 1>&6
- 
- echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
--echo "configure:5448: checking for XOpenDisplay in -lX11" >&5
-+echo "configure:6008: checking for XOpenDisplay in -lX11" >&5
- ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5452,7 +6012,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5456 "configure"
-+#line 6016 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5463,7 +6023,7 @@
- XOpenDisplay()
- ; return 0; }
- EOF
--if { (eval echo configure:5467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5487,12 +6047,12 @@
- 
- 
- echo $ac_n "checking for XtAppInitialize""... $ac_c" 1>&6
--echo "configure:5491: checking for XtAppInitialize" >&5
-+echo "configure:6051: checking for XtAppInitialize" >&5
- if eval "test \"`echo '$''{'ac_cv_func_XtAppInitialize'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 5496 "configure"
-+#line 6056 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char XtAppInitialize(); below.  */
-@@ -5515,7 +6075,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_XtAppInitialize=yes"
- else
-@@ -5534,7 +6094,7 @@
-   echo "$ac_t""no" 1>&6
- 
- echo $ac_n "checking for XtAppInitialize in -lXt""... $ac_c" 1>&6
--echo "configure:5538: checking for XtAppInitialize in -lXt" >&5
-+echo "configure:6098: checking for XtAppInitialize in -lXt" >&5
- ac_lib_var=`echo Xt'_'XtAppInitialize | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5542,7 +6102,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lXt $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5546 "configure"
-+#line 6106 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5553,7 +6113,7 @@
- XtAppInitialize()
- ; return 0; }
- EOF
--if { (eval echo configure:5557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5591,7 +6151,7 @@
- cf_x_athena=${cf_x_athena-Xaw}
- 
- echo $ac_n "checking if you want to link with Xaw 3d library""... $ac_c" 1>&6
--echo "configure:5595: checking if you want to link with Xaw 3d library" >&5
-+echo "configure:6155: checking if you want to link with Xaw 3d library" >&5
- withval=
- 
- # Check whether --with-Xaw3d or --without-Xaw3d was given.
-@@ -5608,7 +6168,7 @@
- fi
- 
- echo $ac_n "checking if you want to link with neXT Athena library""... $ac_c" 1>&6
--echo "configure:5612: checking if you want to link with neXT Athena library" >&5
-+echo "configure:6172: checking if you want to link with neXT Athena library" >&5
- withval=
- 
- # Check whether --with-neXtaw or --without-neXtaw was given.
-@@ -5625,7 +6185,7 @@
- fi
- 
- echo $ac_n "checking if you want to link with Athena-Plus library""... $ac_c" 1>&6
--echo "configure:5629: checking if you want to link with Athena-Plus library" >&5
-+echo "configure:6189: checking if you want to link with Athena-Plus library" >&5
- withval=
- 
- # Check whether --with-XawPlus or --without-XawPlus was given.
-@@ -5642,7 +6202,7 @@
- fi
- 
- echo $ac_n "checking for XextCreateExtension in -lXext""... $ac_c" 1>&6
--echo "configure:5646: checking for XextCreateExtension in -lXext" >&5
-+echo "configure:6206: checking for XextCreateExtension in -lXext" >&5
- ac_lib_var=`echo Xext'_'XextCreateExtension | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5650,7 +6210,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lXext  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5654 "configure"
-+#line 6214 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5661,7 +6221,7 @@
- XextCreateExtension()
- ; return 0; }
- EOF
--if { (eval echo configure:5665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -5700,13 +6260,13 @@
- 		if test $cf_path != default ; then
- 			CPPFLAGS="-I$cf_path/include $cf_save"
- 			echo $ac_n "checking for $cf_test in $cf_path""... $ac_c" 1>&6
--echo "configure:5704: checking for $cf_test in $cf_path" >&5
-+echo "configure:6264: checking for $cf_test in $cf_path" >&5
- 		else
- 			echo $ac_n "checking for $cf_test""... $ac_c" 1>&6
--echo "configure:5707: checking for $cf_test" >&5
-+echo "configure:6267: checking for $cf_test" >&5
- 		fi
- 		cat > conftest.$ac_ext <<EOF
--#line 5710 "configure"
-+#line 6270 "configure"
- #include "confdefs.h"
- 
- #include <X11/Intrinsic.h>
-@@ -5715,7 +6275,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:5719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:6279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   cf_result=yes
- else
-@@ -5762,21 +6322,21 @@
- 			if test $cf_path != default ; then
- 				LIBS="-L$cf_path/lib $cf_lib $LIBS"
- 				echo $ac_n "checking for $cf_lib in $cf_path""... $ac_c" 1>&6
--echo "configure:5766: checking for $cf_lib in $cf_path" >&5
-+echo "configure:6326: checking for $cf_lib in $cf_path" >&5
- 			else
- 				LIBS="$cf_lib $LIBS"
- 				echo $ac_n "checking for $cf_test in $cf_lib""... $ac_c" 1>&6
--echo "configure:5770: checking for $cf_test in $cf_lib" >&5
-+echo "configure:6330: checking for $cf_test in $cf_lib" >&5
- 			fi
- 			cat > conftest.$ac_ext <<EOF
--#line 5773 "configure"
-+#line 6333 "configure"
- #include "confdefs.h"
- 
- int main() {
- $cf_test()
- ; return 0; }
- EOF
--if { (eval echo configure:5780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   cf_result=yes
- else
-@@ -5817,7 +6377,7 @@
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:5821: checking for $ac_word" >&5
-+echo "configure:6381: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_XCURSES_CONFIG'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -5867,6 +6427,9 @@
- 
- test -n "$verbose" && echo "	checking additions to CFLAGS" 1>&6
- 
-+echo "${as_me-configure}:6431: testing checking additions to CFLAGS ..." 1>&5
-+
-+
- cf_check_cflags="$CFLAGS"
- cf_check_cppflags="$CPPFLAGS"
- 
-@@ -5926,18 +6489,27 @@
- if test -n "$cf_new_cflags" ; then
- 	test -n "$verbose" && echo "	add to \$CFLAGS $cf_new_cflags" 1>&6
- 
-+echo "${as_me-configure}:6493: testing add to \$CFLAGS $cf_new_cflags ..." 1>&5
-+
-+
- 	CFLAGS="$CFLAGS $cf_new_cflags"
- fi
- 
- if test -n "$cf_new_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$CPPFLAGS $cf_new_cppflags" 1>&6
- 
-+echo "${as_me-configure}:6502: testing add to \$CPPFLAGS $cf_new_cppflags ..." 1>&5
-+
-+
- 	CPPFLAGS="$cf_new_cppflags $CPPFLAGS"
- fi
- 
- if test -n "$cf_new_extra_cppflags" ; then
- 	test -n "$verbose" && echo "	add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags" 1>&6
- 
-+echo "${as_me-configure}:6511: testing add to \$EXTRA_CPPFLAGS $cf_new_extra_cppflags ..." 1>&5
-+
-+
- 	EXTRA_CPPFLAGS="$cf_new_extra_cppflags $EXTRA_CPPFLAGS"
- fi
- 
-@@ -5946,14 +6518,14 @@
- 
- if test "$cf_check_cflags" != "$CFLAGS" ; then
- cat > conftest.$ac_ext <<EOF
--#line 5950 "configure"
-+#line 6522 "configure"
- #include "confdefs.h"
- #include <stdio.h>
- int main() {
- printf("Hello world");
- ; return 0; }
- EOF
--if { (eval echo configure:5957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   :
- else
-   echo "configure: failed program was:" >&5
-@@ -5961,9 +6533,15 @@
-   rm -rf conftest*
-   test -n "$verbose" && echo "	test-compile failed.  Undoing change to \$CFLAGS" 1>&6
- 
-+echo "${as_me-configure}:6537: testing test-compile failed.  Undoing change to \$CFLAGS ..." 1>&5
-+
-+
- 	 if test "$cf_check_cppflags" != "$CPPFLAGS" ; then
- 		 test -n "$verbose" && echo "	but keeping change to \$CPPFLAGS" 1>&6
- 
-+echo "${as_me-configure}:6543: testing but keeping change to \$CPPFLAGS ..." 1>&5
-+
-+
- 	 fi
- 	 CFLAGS="$cf_check_flags"
- fi
-@@ -5971,7 +6549,7 @@
- fi
- 
- echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
--echo "configure:5975: checking for XOpenDisplay in -lX11" >&5
-+echo "configure:6553: checking for XOpenDisplay in -lX11" >&5
- ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -5979,7 +6557,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lX11 $X_PRE_LIBS $LIBS $X_EXTRA_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 5983 "configure"
-+#line 6561 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -5990,7 +6568,7 @@
- XOpenDisplay()
- ; return 0; }
- EOF
--if { (eval echo configure:5994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -6011,14 +6589,14 @@
- fi
- 
- echo $ac_n "checking for XCurses library""... $ac_c" 1>&6
--echo "configure:6015: checking for XCurses library" >&5
-+echo "configure:6593: checking for XCurses library" >&5
- if eval "test \"`echo '$''{'cf_cv_lib_XCurses'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- LIBS="-lXCurses $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 6022 "configure"
-+#line 6600 "configure"
- #include "confdefs.h"
- 
- #include <xcurses.h>
-@@ -6028,7 +6606,7 @@
- XCursesExit();
- ; return 0; }
- EOF
--if { (eval echo configure:6032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   cf_cv_lib_XCurses=yes
- else
-@@ -6073,7 +6651,7 @@
- *)
- 	# look for curses-related libraries
- 	echo $ac_n "checking for new_panel in -lpanel$cf_cv_libtype""... $ac_c" 1>&6
--echo "configure:6077: checking for new_panel in -lpanel$cf_cv_libtype" >&5
-+echo "configure:6655: checking for new_panel in -lpanel$cf_cv_libtype" >&5
- ac_lib_var=`echo panel$cf_cv_libtype'_'new_panel | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -6081,7 +6659,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lpanel$cf_cv_libtype  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 6085 "configure"
-+#line 6663 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -6092,7 +6670,7 @@
- new_panel()
- ; return 0; }
- EOF
--if { (eval echo configure:6096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -6120,7 +6698,7 @@
- fi
- 
- 	echo $ac_n "checking for menu_driver in -lmenu$cf_cv_libtype""... $ac_c" 1>&6
--echo "configure:6124: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
-+echo "configure:6702: checking for menu_driver in -lmenu$cf_cv_libtype" >&5
- ac_lib_var=`echo menu$cf_cv_libtype'_'menu_driver | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -6128,7 +6706,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lmenu$cf_cv_libtype  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 6132 "configure"
-+#line 6710 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -6139,7 +6717,7 @@
- menu_driver()
- ; return 0; }
- EOF
--if { (eval echo configure:6143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -6167,7 +6745,7 @@
- fi
- 
- 	echo $ac_n "checking for form_driver in -lform$cf_cv_libtype""... $ac_c" 1>&6
--echo "configure:6171: checking for form_driver in -lform$cf_cv_libtype" >&5
-+echo "configure:6749: checking for form_driver in -lform$cf_cv_libtype" >&5
- ac_lib_var=`echo form$cf_cv_libtype'_'form_driver | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -6175,7 +6753,7 @@
-   ac_save_LIBS="$LIBS"
- LIBS="-lform$cf_cv_libtype  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 6179 "configure"
-+#line 6757 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
- /* We use char because int might match the return type of a gcc2
-@@ -6186,7 +6764,7 @@
- form_driver()
- ; return 0; }
- EOF
--if { (eval echo configure:6190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:6768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
- else
-@@ -6225,17 +6803,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:6229: checking for $ac_hdr" >&5
-+echo "configure:6807: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6234 "configure"
-+#line 6812 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:6239: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:6817: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -6265,12 +6843,12 @@
- esac
- 
- echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
--echo "configure:6269: checking return type of signal handlers" >&5
-+echo "configure:6847: checking return type of signal handlers" >&5
- if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6274 "configure"
-+#line 6852 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <signal.h>
-@@ -6287,7 +6865,7 @@
- int i;
- ; return 0; }
- EOF
--if { (eval echo configure:6291: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:6869: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_type_signal=void
- else
-@@ -6307,12 +6885,12 @@
- 
- 
- echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
--echo "configure:6311: checking for ANSI C header files" >&5
-+echo "configure:6889: checking for ANSI C header files" >&5
- if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6316 "configure"
-+#line 6894 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -6320,7 +6898,7 @@
- #include <float.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:6324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:6902: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -6337,7 +6915,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 6341 "configure"
-+#line 6919 "configure"
- #include "confdefs.h"
- #include <string.h>
- EOF
-@@ -6355,7 +6933,7 @@
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat > conftest.$ac_ext <<EOF
--#line 6359 "configure"
-+#line 6937 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -6376,7 +6954,7 @@
-   :
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6380 "configure"
-+#line 6958 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -6387,7 +6965,7 @@
- exit (0); }
- 
- EOF
--if { (eval echo configure:6391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:6969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   :
- else
-@@ -6411,12 +6989,12 @@
- fi
- 
- echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
--echo "configure:6415: checking whether time.h and sys/time.h may both be included" >&5
-+echo "configure:6993: checking whether time.h and sys/time.h may both be included" >&5
- if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6420 "configure"
-+#line 6998 "configure"
- #include "confdefs.h"
- #include <sys/types.h>
- #include <sys/time.h>
-@@ -6425,7 +7003,7 @@
- struct tm *tp;
- ; return 0; }
- EOF
--if { (eval echo configure:6429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:7007: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_header_time=yes
- else
-@@ -6458,17 +7036,17 @@
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
- echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:6462: checking for $ac_hdr" >&5
-+echo "configure:7040: checking for $ac_hdr" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6467 "configure"
-+#line 7045 "configure"
- #include "confdefs.h"
- #include <$ac_hdr>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:6472: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:7050: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
- ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -6496,45 +7074,17 @@
- 
- 
- for ac_func in \
--chgat \
--color_set \
--filter \
--getbegx \
--getcurx \
--getmaxx \
--getnstr \
- gettimeofday \
--getwin \
--mvvline \
--mvwvline \
--napms \
--putwin \
--resize_term \
--resizeterm \
--ripoffline \
--setupterm \
--slk_color \
--slk_init \
- strdup \
--termattrs \
--tgetent \
--tigetnum \
--tigetstr \
--typeahead \
--use_default_colors \
--vsscanf \
--wchgat \
--winsstr \
--wresize \
- 
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:6533: checking for $ac_func" >&5
-+echo "configure:7083: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6538 "configure"
-+#line 7088 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char $ac_func(); below.  */
-@@ -6557,7 +7107,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
- else
-@@ -6582,8 +7132,240 @@
- done
- 
- 
-+
-+echo $ac_n "checking if we must define _XOPEN_SOURCE_EXTENDED""... $ac_c" 1>&6
-+echo "configure:7138: checking if we must define _XOPEN_SOURCE_EXTENDED" >&5
-+if eval "test \"`echo '$''{'cf_cv_need_xopen_extension'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  
-+cat > conftest.$ac_ext <<EOF
-+#line 7144 "configure"
-+#include "confdefs.h"
-+
-+#include <stdlib.h>
-+#include <${cf_cv_ncurses_header-curses.h}>
-+int main() {
-+
-+	long x = winnstr(stdscr, "", 0);
-+	int x1, y1;
-+	getbegyx(stdscr, y1, x1)
-+; return 0; }
-+EOF
-+if { (eval echo configure:7156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  cf_cv_need_xopen_extension=no
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  cat > conftest.$ac_ext <<EOF
-+#line 7164 "configure"
-+#include "confdefs.h"
-+
-+#define _XOPEN_SOURCE_EXTENDED
-+#include <stdlib.h>
-+#include <${cf_cv_ncurses_header-curses.h}>
-+int main() {
-+
-+	long x = winnstr(stdscr, "", 0);
-+	int x1, y1;
-+	getbegyx(stdscr, y1, x1)
-+; return 0; }
-+EOF
-+if { (eval echo configure:7177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  cf_cv_need_xopen_extension=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  cf_cv_need_xopen_extension=unknown
-+fi
-+rm -f conftest*
-+fi
-+rm -f conftest*
-+fi
-+
-+echo "$ac_t""$cf_cv_need_xopen_extension" 1>&6
-+test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED"
-+
-+
-+echo $ac_n "checking for term.h""... $ac_c" 1>&6
-+echo "configure:7196: checking for term.h" >&5
-+if eval "test \"`echo '$''{'cf_cv_term_header'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  
-+
-+# If we found <ncurses/curses.h>, look for <ncurses/term.h>, but always look
-+# for <term.h> if we do not find the variant.
-+for cf_header in \
-+	`echo ${cf_cv_ncurses_header-curses.h} | sed -e 's%/.*%/%'`term.h \
-+	term.h
-+do
-+	cat > conftest.$ac_ext <<EOF
-+#line 7209 "configure"
-+#include "confdefs.h"
-+
-+#include <${cf_cv_ncurses_header-curses.h}>
-+#include <${cf_header}>
-+int main() {
-+WINDOW *x
-+; return 0; }
-+EOF
-+if { (eval echo configure:7218: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  rm -rf conftest*
-+  cf_cv_term_header=$cf_header
-+	 break
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  cf_cv_term_header=no
-+fi
-+rm -f conftest*
-+done
-+
-+fi
-+
-+echo "$ac_t""$cf_cv_term_header" 1>&6
-+
-+case $cf_cv_term_header in #(vi
-+term.h) #(vi
-+	cat >> confdefs.h <<\EOF
-+#define HAVE_TERM_H 1
-+EOF
-+
-+	;;
-+ncurses/term.h)
-+	cat >> confdefs.h <<\EOF
-+#define HAVE_NCURSES_TERM_H 1
-+EOF
-+
-+	;;
-+ncursesw/term.h)
-+	cat >> confdefs.h <<\EOF
-+#define HAVE_NCURSESW_TERM_H 1
-+EOF
-+
-+	;;
-+esac
-+
-+
-+
-+
-+for cf_func in \
-+chgat \
-+color_set \
-+filter \
-+getbegx \
-+getcurx \
-+getmaxx \
-+getnstr \
-+getparx \
-+getwin \
-+mvvline \
-+mvwvline \
-+napms \
-+putwin \
-+resize_term \
-+resizeterm \
-+ripoffline \
-+setupterm \
-+slk_color \
-+slk_init \
-+termattrs \
-+tgetent \
-+tigetnum \
-+tigetstr \
-+typeahead \
-+use_default_colors \
-+vsscanf \
-+wchgat \
-+winsstr \
-+wresize \
-+
-+do
-+	
-+cf_tr_func=`echo "$cf_func" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%`
-+
-+	echo $ac_n "checking for ${cf_func}""... $ac_c" 1>&6
-+echo "configure:7295: checking for ${cf_func}" >&5
-+	
-+echo "${as_me-configure}:7297: testing ${cf_func} ..." 1>&5
-+
-+	if eval "test \"`echo '$''{'cf_cv_func_$cf_func'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  
-+		eval cf_result='$ac_cv_func_'$cf_func
-+		if test ".$cf_result" != ".no"; then
-+			cat > conftest.$ac_ext <<EOF
-+#line 7306 "configure"
-+#include "confdefs.h"
-+
-+#ifdef HAVE_XCURSES
-+#include <xcurses.h>
-+char * XCursesProgramName = "test";
-+#else
-+#include <${cf_cv_ncurses_header-curses.h}>
-+#if defined(NCURSES_VERSION) && defined(HAVE_NCURSESW_TERM_H)
-+#include <ncursesw/term.h>
-+#else
-+#if defined(NCURSES_VERSION) && defined(HAVE_NCURSES_TERM_H)
-+#include <ncurses/term.h>
-+#else
-+#ifdef HAVE_TERM_H
-+#include <term.h>
-+#endif
-+#endif
-+#endif
-+#endif
-+int main() {
-+
-+#ifndef ${cf_func}
-+long foo = (long)(&${cf_func});
-+${cf_cv_main_return-return}(foo == 0);
-+#endif
-+			
-+; return 0; }
-+EOF
-+if { (eval echo configure:7335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  cf_result=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  cf_result=no
-+fi
-+rm -f conftest*
-+		fi
-+		eval 'cf_cv_func_'$cf_func'=$cf_result'
-+	
-+fi
-+
-+	# use the computed/retrieved cache-value:
-+	eval 'cf_result=$cf_cv_func_'$cf_func
-+	echo "$ac_t""$cf_result" 1>&6
-+	if test $cf_result != no; then
-+		cat >> confdefs.h <<EOF
-+#define HAVE_${cf_tr_func} 1
-+EOF
-+
-+	fi
-+done
-+
-+
-+echo $ac_n "checking for ncurses extended functions""... $ac_c" 1>&6
-+echo "configure:7363: checking for ncurses extended functions" >&5
-+if eval "test \"`echo '$''{'cf_cv_ncurses_ext_funcs'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  
- cat > conftest.$ac_ext <<EOF
--#line 6587 "configure"
-+#line 7369 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header-curses.h}>
-@@ -6601,30 +7383,81 @@
- 	(void) use_default_colors ();
- 	(void) use_extended_names (0);
- 	(void) wresize (0, 0, 0);
--	
- ; return 0; }
- EOF
--if { (eval echo configure:6608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
--  cat >> confdefs.h <<\EOF
-+  cf_cv_ncurses_ext_funcs=yes
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  cf_cv_ncurses_ext_funcs=no
-+fi
-+rm -f conftest*
-+
-+fi
-+
-+echo "$ac_t""$cf_cv_ncurses_ext_funcs" 1>&6
-+test "$cf_cv_ncurses_ext_funcs" != no && cat >> confdefs.h <<\EOF
- #define NCURSES_EXT_FUNCS 1
- EOF
- 
-+
-+echo $ac_n "checking for wide-character functions""... $ac_c" 1>&6
-+echo "configure:7409: checking for wide-character functions" >&5
-+if eval "test \"`echo '$''{'cf_cv_widechar_funcs'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  
-+cat > conftest.$ac_ext <<EOF
-+#line 7415 "configure"
-+#include "confdefs.h"
-+
-+#include <${cf_cv_ncurses_header-curses.h}>
-+int main() {
-+
-+	static wchar_t src_wchar[2];
-+	static cchar_t dst_cchar;
-+	setcchar(&dst_cchar, src_wchar, A_NORMAL, 0, (void *) 0);
-+	
-+; return 0; }
-+EOF
-+if { (eval echo configure:7427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  cf_cv_widechar_funcs=yes
- else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  cf_cv_widechar_funcs=no
- fi
- rm -f conftest*
- 
-+fi
-+
-+echo "$ac_t""$cf_cv_widechar_funcs" 1>&6
-+if test "$cf_cv_widechar_funcs" != no ; then
-+	cat >> confdefs.h <<\EOF
-+#define USE_WIDEC_SUPPORT 1
-+EOF
-+
-+else
-+	cat >> confdefs.h <<\EOF
-+#define USE_WIDEC_SUPPORT 0
-+EOF
-+
-+fi
-+
- 
- echo $ac_n "checking if sys/time.h works with sys/select.h""... $ac_c" 1>&6
--echo "configure:6622: checking if sys/time.h works with sys/select.h" >&5
-+echo "configure:7455: checking if sys/time.h works with sys/select.h" >&5
- if eval "test \"`echo '$''{'cf_cv_sys_time_select'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
- cat > conftest.$ac_ext <<EOF
--#line 6628 "configure"
-+#line 7461 "configure"
- #include "confdefs.h"
- 
- #include <sys/types.h>
-@@ -6639,7 +7472,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:7476: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   cf_cv_sys_time_select=yes
- else
-@@ -6660,7 +7493,7 @@
- 
- 
- echo $ac_n "checking for function curses_version""... $ac_c" 1>&6
--echo "configure:6664: checking for function curses_version" >&5
-+echo "configure:7497: checking for function curses_version" >&5
- if eval "test \"`echo '$''{'cf_cv_func_curses_version'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -6669,7 +7502,7 @@
-   cf_cv_func_curses_version=unknown
- else
-   cat > conftest.$ac_ext <<EOF
--#line 6673 "configure"
-+#line 7506 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header-curses.h}>
-@@ -6677,11 +7510,11 @@
- {
- 	char temp[1024];
- 	sprintf(temp, "%s\n", curses_version());
--	exit(0);
-+	${cf_cv_main_return-return}(0);
- }
- 
- EOF
--if { (eval echo configure:6685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:7518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   cf_cv_func_curses_version=yes
- 
-@@ -6706,7 +7539,7 @@
- 
- 
- echo $ac_n "checking for alternate character set array""... $ac_c" 1>&6
--echo "configure:6710: checking for alternate character set array" >&5
-+echo "configure:7543: checking for alternate character set array" >&5
- if eval "test \"`echo '$''{'cf_cv_curses_acs_map'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -6715,7 +7548,7 @@
- for name in acs_map _acs_map __acs_map _nc_acs_map
- do
- cat > conftest.$ac_ext <<EOF
--#line 6719 "configure"
-+#line 7552 "configure"
- #include "confdefs.h"
- 
- #include <${cf_cv_ncurses_header-curses.h}>
-@@ -6726,7 +7559,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   cf_cv_curses_acs_map=$name; break
- else
-@@ -6747,7 +7580,7 @@
- 
- 
- echo $ac_n "checking for wide alternate character set array""... $ac_c" 1>&6
--echo "configure:6751: checking for wide alternate character set array" >&5
-+echo "configure:7584: checking for wide alternate character set array" >&5
- if eval "test \"`echo '$''{'cf_cv_curses_wacs_map'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -6756,7 +7589,7 @@
- 	for name in wacs_map _wacs_map __wacs_map _nc_wacs
- 	do
- 	cat > conftest.$ac_ext <<EOF
--#line 6760 "configure"
-+#line 7593 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -6767,7 +7600,7 @@
- $name['k'] = *WACS_PLUS
- ; return 0; }
- EOF
--if { (eval echo configure:6771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:7604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   cf_cv_curses_wacs_map=$name
- 	 break
-@@ -6783,9 +7616,9 @@
- 
- 
- echo $ac_n "checking for type attr_t in ${cf_cv_ncurses_header-curses.h}""... $ac_c" 1>&6
--echo "configure:6787: checking for type attr_t in ${cf_cv_ncurses_header-curses.h}" >&5
-+echo "configure:7620: checking for type attr_t in ${cf_cv_ncurses_header-curses.h}" >&5
- cat > conftest.$ac_ext <<EOF
--#line 6789 "configure"
-+#line 7622 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -6798,7 +7631,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6802: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:7635: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   cf_result=yes
- else
-@@ -6826,9 +7659,9 @@
- 
- 
- echo $ac_n "checking for type mbstate_t in ${cf_cv_ncurses_header-curses.h}""... $ac_c" 1>&6
--echo "configure:6830: checking for type mbstate_t in ${cf_cv_ncurses_header-curses.h}" >&5
-+echo "configure:7663: checking for type mbstate_t in ${cf_cv_ncurses_header-curses.h}" >&5
- cat > conftest.$ac_ext <<EOF
--#line 6832 "configure"
-+#line 7665 "configure"
- #include "confdefs.h"
- 
- #ifndef _XOPEN_SOURCE_EXTENDED
-@@ -6841,7 +7674,7 @@
- 
- ; return 0; }
- EOF
--if { (eval echo configure:6845: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:7678: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   cf_result=yes
- else
-@@ -7018,9 +7851,9 @@
- s%@DFT_DEP_SUFFIX@%$DFT_DEP_SUFFIX%g
- s%@DFT_OBJ_SUBDIR@%$DFT_OBJ_SUBDIR%g
- s%@DFT_UPR_MODEL@%$DFT_UPR_MODEL%g
--s%@ECHO_LINK@%$ECHO_LINK%g
- s%@LD@%$LD%g
- s%@LDFLAGS_SHARED@%$LDFLAGS_SHARED%g
-+s%@LDFLAGS_STATIC@%$LDFLAGS_STATIC%g
- s%@LD_MODEL@%$LD_MODEL%g
- s%@LD_SHARED_OPTS@%$LD_SHARED_OPTS%g
- s%@LIBTOOL@%$LIBTOOL%g
-@@ -7040,6 +7873,11 @@
- s%@EXEEXT@%$EXEEXT%g
- s%@OBJEXT@%$OBJEXT%g
- s%@EXTRA_CPPFLAGS@%$EXTRA_CPPFLAGS%g
-+s%@ECHO_LT@%$ECHO_LT%g
-+s%@ECHO_LD@%$ECHO_LD%g
-+s%@RULE_CC@%$RULE_CC%g
-+s%@SHOW_CC@%$SHOW_CC%g
-+s%@ECHO_CC@%$ECHO_CC%g
- s%@EXTRA_CFLAGS@%$EXTRA_CFLAGS%g
- s%@X_CFLAGS@%$X_CFLAGS%g
- s%@X_PRE_LIBS@%$X_PRE_LIBS%g
-@@ -7247,6 +8085,7 @@
- # Extra initialization commands, if any
- 
- AWK="$AWK"
-+ECHO_LD="$ECHO_LD"
- 
- EOF
- cat >> $CONFIG_STATUS <<\EOF
-@@ -7258,7 +8097,7 @@
- 	if test ! -d $srcdir/$cf_dir; then
- 		continue
- 	elif test -f $srcdir/$cf_dir/programs; then
--		$AWK -f $srcdir/mk-test.awk ECHO_LINK="$ECHO_LINK" $srcdir/$cf_dir/programs >>$cf_dir/Makefile
-+		$AWK -f $srcdir/mk-test.awk ECHO_LINK="$ECHO_LD" $srcdir/$cf_dir/programs >>$cf_dir/Makefile
- 	fi
- done
- 
-diff -Naur ncurses-5.6.orig/test/configure.in ncurses-5.6/test/configure.in
---- ncurses-5.6.orig/test/configure.in	2006-07-15 14:54:07.000000000 -0400
-+++ ncurses-5.6/test/configure.in	2008-06-18 06:49:47.000000000 -0400
-@@ -1,5 +1,5 @@
- dnl***************************************************************************
--dnl Copyright (c) 1998-2004,2005 Free Software Foundation, Inc.              *
-+dnl Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
- dnl                                                                          *
- dnl Permission is hereby granted, free of charge, to any person obtaining a  *
- dnl copy of this software and associated documentation files (the            *
-@@ -28,7 +28,7 @@
- dnl
- dnl Author: Thomas E. Dickey 1996, etc.
- dnl
--dnl $Id: configure.in,v 1.58 2006/07/15 18:54:07 tom Exp $
-+dnl $Id: configure.in,v 1.65 2008/02/09 18:24:11 tom Exp $
- dnl This is a simple configuration-script for the ncurses test programs that
- dnl allows the test-directory to be separately configured against a reference
- dnl system (i.e., sysvr4 curses)
-@@ -58,15 +58,15 @@
- DFT_DEP_SUFFIX=""			AC_SUBST(DFT_DEP_SUFFIX)
- DFT_OBJ_SUBDIR=`pwd|sed -e's:.*/::'`	AC_SUBST(DFT_OBJ_SUBDIR)
- DFT_UPR_MODEL="NORMAL"			AC_SUBST(DFT_UPR_MODEL)
--ECHO_LINK='@ echo linking $@ ... ;'	AC_SUBST(ECHO_LINK)
- LD="ld"					AC_SUBST(LD)
- LDFLAGS_SHARED=""			AC_SUBST(LDFLAGS_SHARED)
-+LDFLAGS_STATIC=""			AC_SUBST(LDFLAGS_STATIC)
- LD_MODEL=""				AC_SUBST(LD_MODEL)
- LD_SHARED_OPTS=""			AC_SUBST(LD_SHARED_OPTS)
- LIBTOOL=""				AC_SUBST(LIBTOOL)
- LIB_CLEAN=""				AC_SUBST(LIB_CLEAN)
- LIB_COMPILE=""				AC_SUBST(LIB_COMPILE)
--LIB_LINK=""				AC_SUBST(LIB_LINK)
-+LIB_LINK='${CC}'			AC_SUBST(LIB_LINK)
- LINK_TESTS=""				AC_SUBST(LINK_TESTS)
- LINT=lint				AC_SUBST(LINT)
- LINT_OPTS=""				AC_SUBST(LINT_OPTS)
-@@ -85,9 +85,13 @@
- AC_OBJEXT
- 
- CF_ANSI_CC_REQD
--CF_ENABLE_WARNINGS
- CF_GCC_ATTRIBUTES
- CF_XOPEN_SOURCE
-+AC_C_CONST
-+CF_SIG_ATOMIC_T
-+
-+CF_DISABLE_ECHO
-+CF_ENABLE_WARNINGS
- 
- CF_WITH_CURSES_DIR
- 
-@@ -174,6 +178,11 @@
- )
- 
- AC_CHECK_FUNCS( \
-+gettimeofday \
-+strdup \
-+)
-+
-+CF_CURSES_FUNCS( \
- chgat \
- color_set \
- filter \
-@@ -181,7 +190,7 @@
- getcurx \
- getmaxx \
- getnstr \
--gettimeofday \
-+getparx \
- getwin \
- mvvline \
- mvwvline \
-@@ -193,7 +202,6 @@
- setupterm \
- slk_color \
- slk_init \
--strdup \
- termattrs \
- tgetent \
- tigetnum \
-@@ -206,6 +214,7 @@
- wresize \
- )
- 
-+AC_CACHE_CHECK(for ncurses extended functions,cf_cv_ncurses_ext_funcs,[
- AC_TRY_LINK([
- #include <${cf_cv_ncurses_header-curses.h}>],
- [
-@@ -220,8 +229,28 @@
- 	(void) resizeterm (0, 0);
- 	(void) use_default_colors ();
- 	(void) use_extended_names (0);
--	(void) wresize (0, 0, 0);
--	],[AC_DEFINE(NCURSES_EXT_FUNCS)])
-+	(void) wresize (0, 0, 0);],
-+	[cf_cv_ncurses_ext_funcs=yes],
-+	[cf_cv_ncurses_ext_funcs=no])
-+])
-+test "$cf_cv_ncurses_ext_funcs" != no && AC_DEFINE(NCURSES_EXT_FUNCS)
-+
-+AC_CACHE_CHECK(for wide-character functions,cf_cv_widechar_funcs,[
-+AC_TRY_LINK([
-+#include <${cf_cv_ncurses_header-curses.h}>],
-+[
-+	static wchar_t src_wchar[2];
-+	static cchar_t dst_cchar;
-+	setcchar(&dst_cchar, src_wchar, A_NORMAL, 0, (void *) 0);
-+	],
-+	[cf_cv_widechar_funcs=yes],
-+	[cf_cv_widechar_funcs=no])
-+])
-+if test "$cf_cv_widechar_funcs" != no ; then
-+	AC_DEFINE(USE_WIDEC_SUPPORT,1)
-+else
-+	AC_DEFINE(USE_WIDEC_SUPPORT,0)
-+fi
- 
- CF_SYS_TIME_SELECT
- CF_FUNC_CURSES_VERSION
-@@ -236,7 +265,7 @@
- dnl ---------------------------------------------------------------------------
- 
- AC_OUTPUT(Makefile,[
--CF_PRG_RULES([$srcdir/mk-test.awk ECHO_LINK="$ECHO_LINK"], .)
-+CF_PRG_RULES([$srcdir/mk-test.awk ECHO_LINK="$ECHO_LD"], .)
- 	cat >>Makefile <<TEST_EOF
- 
- # These rules are generated so we do not rely on suffix rules, which do not
-@@ -256,4 +285,5 @@
- done
- ],[
- AWK="$AWK"
-+ECHO_LD="$ECHO_LD"
- ],cat)
-diff -Naur ncurses-5.6.orig/test/demo_altkeys.c ncurses-5.6/test/demo_altkeys.c
---- ncurses-5.6.orig/test/demo_altkeys.c	2006-12-09 11:49:49.000000000 -0500
-+++ ncurses-5.6/test/demo_altkeys.c	2008-06-18 06:49:49.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2005,2006 Free Software Foundation, Inc.                   *
-+ * Copyright (c) 2005-2006,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
-  * authorization.                                                           *
-  ****************************************************************************/
- /*
-- * $Id: demo_altkeys.c,v 1.7 2006/12/09 16:49:49 tom Exp $
-+ * $Id: demo_altkeys.c,v 1.8 2008/04/12 22:06:22 tom Exp $
-  *
-  * Demonstrate the define_key() function.
-  * Thomas Dickey - 2005/10/22
-@@ -110,7 +110,7 @@
-     for (n = KEY_MIN; n < KEY_MAX; ++n) {
- 	char *value;
- 	if ((value = keybound(n, 0)) != 0) {
--	    char *temp = malloc(strlen(value) + 2);
-+	    char *temp = typeMalloc(char, strlen(value) + 2);
- 	    sprintf(temp, "\033%s", value);
- 	    define_key(temp, n + MY_KEYS);
- 	    free(temp);
-diff -Naur ncurses-5.6.orig/test/demo_defkey.c ncurses-5.6/test/demo_defkey.c
---- ncurses-5.6.orig/test/demo_defkey.c	2006-04-01 14:08:03.000000000 -0500
-+++ ncurses-5.6/test/demo_defkey.c	2008-06-18 06:49:49.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2002-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2002-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
-  * authorization.                                                           *
-  ****************************************************************************/
- /*
-- * $Id: demo_defkey.c,v 1.16 2006/04/01 19:08:03 tom Exp $
-+ * $Id: demo_defkey.c,v 1.18 2008/04/12 22:06:12 tom Exp $
-  *
-  * Demonstrate the define_key() function.
-  * Thomas Dickey - 2002/11/23
-@@ -112,10 +112,10 @@
- 		    need += strlen(temp);
- 	    }
- 	    if (!pass)
--		result = (char *) calloc(need, 1);
-+		result = typeCalloc(char, need);
- 	}
-     } else {
--	result = (char *) calloc(1, 1);
-+	result = typeCalloc(char, 1);
-     }
-     return result;
- }
-@@ -143,13 +143,12 @@
- 		code_name);
-     }
-     log_last_line(win);
-+
-     if (vis_string != 0) {
- 	free(vis_string);
- 	vis_string = 0;
-     }
- 
--    if (vis_string != 0)
--	free(vis_string);
-     vis_string = visible(new_string);
-     if ((rc = key_defined(new_string)) > 0) {
- 	wprintw(win, "%s was bound to %s\n", vis_string, keyname(rc));
-diff -Naur ncurses-5.6.orig/test/demo_forms.c ncurses-5.6/test/demo_forms.c
---- ncurses-5.6.orig/test/demo_forms.c	2006-12-09 19:30:24.000000000 -0500
-+++ ncurses-5.6/test/demo_forms.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2003-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2003-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
-  * authorization.                                                           *
-  ****************************************************************************/
- /*
-- * $Id: demo_forms.c,v 1.22 2006/12/10 00:30:24 tom Exp $
-+ * $Id: demo_forms.c,v 1.24 2007/07/21 17:45:09 tom Exp $
-  *
-  * Demonstrate a variety of functions from the form library.
-  * Thomas Dickey - 2003/4/26
-@@ -322,6 +322,10 @@
-     int pg;
-     WINDOW *also;
- 
-+#ifdef NCURSES_MOUSE_VERSION
-+    mousemask(ALL_MOUSE_EVENTS, (mmask_t *) 0);
-+#endif
-+
-     help_edit_field();
- 
-     mvaddstr(4, 57, "Forms Entry Test");
-@@ -423,6 +427,10 @@
- 	free_field(f[c]);
-     noraw();
-     nl();
-+
-+#ifdef NCURSES_MOUSE_VERSION
-+    mousemask(0, (mmask_t *) 0);
-+#endif
- }
- 
- static void
-@@ -451,7 +459,7 @@
- 
-     setlocale(LC_ALL, "");
- 
--    while ((ch = getopt(argc, argv, "dj:m:o:t:")) != EOF) {
-+    while ((ch = getopt(argc, argv, "dj:m:o:t:")) != -1) {
- 	switch (ch) {
- 	case 'd':
- 	    d_option = TRUE;
-diff -Naur ncurses-5.6.orig/test/demo_menus.c ncurses-5.6/test/demo_menus.c
---- ncurses-5.6.orig/test/demo_menus.c	2006-06-17 13:39:37.000000000 -0400
-+++ ncurses-5.6/test/demo_menus.c	2008-06-18 06:49:49.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2005,2006 Free Software Foundation, Inc.                   *
-+ * Copyright (c) 2005-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
-  * authorization.                                                           *
-  ****************************************************************************/
- /*
-- * $Id: demo_menus.c,v 1.20 2006/06/17 17:39:37 tom Exp $
-+ * $Id: demo_menus.c,v 1.24 2008/04/12 22:03:33 tom Exp $
-  *
-  * Demonstrate a variety of functions from the menu library.
-  * Thomas Dickey - 2005/4/9
-@@ -112,7 +112,7 @@
- static char *
- strdup(char *s)
- {
--    char *p = (char *) malloc(strlen(s) + 1);
-+    char *p = typeMalloc(char, strlen(s) + 1);
-     if (p)
- 	strcpy(p, s);
-     return (p);
-@@ -130,14 +130,14 @@
-     while ((c = wgetch(win)) == CTRL('T')) {
- 	if (_nc_tracing) {
- 	    save_trace = _nc_tracing;
--	    _tracef("TOGGLE-TRACING OFF");
-+	    Trace(("TOGGLE-TRACING OFF"));
- 	    _nc_tracing = 0;
- 	} else {
- 	    _nc_tracing = save_trace;
- 	}
- 	trace(_nc_tracing);
- 	if (_nc_tracing)
--	    _tracef("TOGGLE-TRACING ON");
-+	    Trace(("TOGGLE-TRACING ON"));
-     }
- #else
-     c = wgetch(win);
-@@ -270,7 +270,7 @@
- #if 0
- 	if (count > 0) {
- 	    while (*ip) {
--		_tracef("freeing item %d:%d", ip - menu_items(m), count);
-+		Trace(("freeing item %d:%d", ip - menu_items(m), count));
- 		free_item(*ip++);
- 	    }
- 	}
-@@ -291,7 +291,7 @@
- static void
- build_file_menu(MenuNo number)
- {
--    static const char *labels[] =
-+    static CONST_MENUS char *labels[] =
-     {
- 	"Exit",
- 	(char *) 0
-@@ -299,7 +299,7 @@
-     static ITEM *items[SIZEOF(labels)];
- 
-     ITEM **ip = items;
--    const char **ap;
-+    CONST_MENUS char **ap;
- 
-     for (ap = labels; *ap; ap++)
- 	*ip++ = new_item(*ap, "");
-@@ -319,7 +319,7 @@
- static void
- build_select_menu(MenuNo number, char *filename)
- {
--    static const char *labels[] =
-+    static CONST_MENUS char *labels[] =
-     {
- 	"Lions",
- 	"Tigers",
-@@ -339,7 +339,7 @@
-     static ITEM **items;
- 
-     ITEM **ip;
--    const char **ap = 0;
-+    CONST_MENUS char **ap = 0;
-     unsigned count = 0;
- 
-     if (filename != 0) {
-@@ -349,10 +349,10 @@
- 	    && sb.st_size != 0) {
- 	    unsigned size = sb.st_size;
- 	    unsigned j, k;
--	    char *blob = malloc(size + 1);
--	    const char **list = (const char **) calloc(sizeof(*list), size + 1);
-+	    char *blob = typeMalloc(char, size + 1);
-+	    CONST_MENUS char **list = typeCalloc(CONST_MENUS char *, size + 1);
- 
--	    items = (ITEM **) calloc(sizeof(ITEM *), size + 1);
-+	    items = typeCalloc(ITEM *, size + 1);
- 	    if (blob != 0 && list != 0) {
- 		FILE *fp = fopen(filename, "r");
- 		if (fp != 0) {
-@@ -383,7 +383,7 @@
-     }
-     if (ap == 0) {
- 	count = SIZEOF(labels) - 1;
--	items = (ITEM **) calloc(count + 1, sizeof(*items));
-+	items = typeCalloc(ITEM *, count + 1);
- 	ap = labels;
-     }
- 
-@@ -456,7 +456,7 @@
- 	size_t need = 12;
- 	for (n = 0; t_tbl[n].name != 0; n++)
- 	    need += strlen(t_tbl[n].name) + 2;
--	buf = (char *) malloc(need);
-+	buf = typeMalloc(char, need);
-     }
-     sprintf(buf, "0x%02x = {", tlevel);
-     if (tlevel == 0) {
-@@ -523,7 +523,7 @@
- 		    newtrace |= t_tbl[item_index(*ip)].mask;
- 	    }
- 	    trace(newtrace);
--	    _tracef("trace level interactively set to %s", tracetrace(_nc_tracing));
-+	    Trace(("trace level interactively set to %s", tracetrace(_nc_tracing)));
- 
- 	    (void) mvprintw(LINES - 2, 0,
- 			    "Trace level is %s\n", tracetrace(_nc_tracing));
-@@ -569,7 +569,7 @@
- static void
- build_menus(char *filename)
- {
--    static const char *labels[] =
-+    static CONST_MENUS char *labels[] =
-     {
- 	"File",
- 	"Select",
-@@ -581,7 +581,7 @@
-     static ITEM *items[SIZEOF(labels)];
- 
-     ITEM **ip = items;
--    const char **ap;
-+    CONST_MENUS char **ap;
- 
-     for (ap = labels; *ap; ap++)
- 	*ip++ = new_item(*ap, "");
-@@ -834,7 +834,7 @@
- 
-     setlocale(LC_ALL, "");
- 
--    while ((c = getopt(argc, argv, "a:de:fhmp:s:t:")) != EOF) {
-+    while ((c = getopt(argc, argv, "a:de:fhmp:s:t:")) != -1) {
- 	switch (c) {
- #if HAVE_RIPOFFLINE
- 	case 'f':
-diff -Naur ncurses-5.6.orig/test/demo_panels.c ncurses-5.6/test/demo_panels.c
---- ncurses-5.6.orig/test/demo_panels.c	2006-04-01 14:08:03.000000000 -0500
-+++ ncurses-5.6/test/demo_panels.c	2008-06-18 06:49:49.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2003,2006 Free Software Foundation, Inc.                   *
-+ * Copyright (c) 2007,2008 Free Software Foundation, Inc.                   *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -26,17 +26,10 @@
-  * authorization.                                                           *
-  ****************************************************************************/
- /*
-- * $Id: demo_panels.c,v 1.2 2006/04/01 19:08:03 tom Exp $
-+ * $Id: demo_panels.c,v 1.30 2008/04/12 21:59:49 tom Exp $
-  *
-  * Demonstrate a variety of functions from the panel library.
-- * Thomas Dickey - 2003/4/26
-  */
--/*
--panel_above			-
--panel_below			-
--panel_hidden			-
--replace_panel			-
--*/
- 
- #include <test.priv.h>
- 
-@@ -44,11 +37,771 @@
- 
- #include <panel.h>
- 
-+#define LAST_POS '@'
-+#define TEMP_POS '>'
-+
-+typedef void (*InitPanel) (void);
-+typedef void (*FillPanel) (PANEL *);
-+
-+static bool use_colors = FALSE;
-+static bool unboxed = FALSE;
-+static FILE *log_in;
-+static FILE *log_out;
-+
-+static void
-+close_input(void)
-+{
-+    if (log_in != 0) {
-+	fclose(log_in);
-+	log_in = 0;
-+    }
-+}
-+
-+static void
-+close_output(void)
-+{
-+    if (log_out != 0) {
-+	fclose(log_out);
-+	log_out = 0;
-+    }
-+}
-+
-+static WINDOW *
-+statusline(void)
-+{
-+    WINDOW *result = stdscr;
-+
-+    wmove(result, LINES - 1, 0);
-+    wclrtoeol(result);
-+    return result;
-+}
-+
-+static void
-+pflush(void)
-+{
-+    update_panels();
-+    doupdate();
-+}
-+
-+static void
-+saywhat(NCURSES_CONST char *text)
-+{
-+    WINDOW *win = statusline();
-+    if (text != 0 && *text != '\0') {
-+	waddstr(win, text);
-+	waddstr(win, "; ");
-+    }
-+    waddstr(win, "press any key to continue");
-+}
-+
-+static void
-+show_position(NCURSES_CONST char *text,
-+	      NCURSES_CONST char *also,
-+	      int which,
-+	      int ypos,
-+	      int xpos)
-+{
-+    WINDOW *win = statusline();
-+
-+    wprintw(win, "%s for panel %d now %d,%d%s", text, which, ypos, xpos, also);
-+    wmove(stdscr, ypos, xpos);
-+}
-+
-+static int
-+get_position(NCURSES_CONST char *text,
-+	     NCURSES_CONST char *also,
-+	     int which,
-+	     int *xpos,
-+	     int *ypos)
-+{
-+    int result = 0;
-+    int x1, y1;
-+    char cmd;
-+    WINDOW *win;
-+
-+    getyx(stdscr, y1, x1);
-+    win = statusline();
-+
-+    show_position(text, also, which, y1, x1);
-+
-+    if (log_in != 0) {
-+	if (fscanf(log_in, "%c%d,%d\n", &cmd, &y1, &x1) == 3) {
-+	    switch (cmd) {
-+	    case LAST_POS:
-+		result = 1;
-+		(void) wgetch(stdscr);
-+		break;
-+	    case TEMP_POS:
-+		result = 0;
-+		wrefresh(stdscr);
-+		napms(100);
-+		break;
-+	    default:
-+		result = -1;
-+		break;
-+	    }
-+	} else {
-+	    result = -1;
-+	}
-+    } else {
-+
-+	switch (wgetch(stdscr)) {
-+	case QUIT:
-+	case ESCAPE:
-+	case ERR:
-+	    result = -1;
-+	    break;
-+	case ' ':
-+	    result = 1;
-+	    break;
-+	case KEY_UP:
-+	    if (y1 > 0) {
-+		--y1;
-+	    } else {
-+		beep();
-+	    }
-+	    break;
-+	case KEY_DOWN:
-+	    if (y1 < getmaxy(stdscr)) {
-+		++y1;
-+	    } else {
-+		beep();
-+	    }
-+	    break;
-+	case KEY_LEFT:
-+	    if (x1 > 0) {
-+		--x1;
-+	    } else {
-+		beep();
-+	    }
-+	    break;
-+	case KEY_RIGHT:
-+	    if (x1 < getmaxx(stdscr)) {
-+		++x1;
-+	    } else {
-+		beep();
-+	    }
-+	    break;
-+	}
-+    }
-+
-+    wmove(stdscr, y1, x1);
-+    *ypos = y1;
-+    *xpos = x1;
-+
-+    if (result >= 0) {
-+	if (log_out)
-+	    fprintf(log_out, "%c%d,%d\n",
-+		    ((result > 0)
-+		     ? LAST_POS
-+		     : TEMP_POS),
-+		    y1, x1);
-+    }
-+    return result;
-+}
-+
-+static PANEL *
-+mkpanel(short color, int rows, int cols, int tly, int tlx)
-+{
-+    WINDOW *win;
-+    PANEL *pan = 0;
-+    char *userdata = typeMalloc(char, 3);
-+
-+    if ((win = newwin(rows, cols, tly, tlx)) != 0) {
-+	keypad(win, TRUE);
-+	if ((pan = new_panel(win)) == 0) {
-+	    delwin(win);
-+	} else if (use_colors) {
-+	    short fg = ((color == COLOR_BLUE)
-+			? COLOR_WHITE
-+			: COLOR_BLACK);
-+	    short bg = color;
-+
-+	    init_pair(color, fg, bg);
-+	    wbkgdset(win, (chtype) (COLOR_PAIR(color) | ' '));
-+	} else if (!unboxed) {
-+	    wbkgdset(win, A_BOLD | ' ');
-+	}
-+    }
-+    sprintf(userdata, "p%d", color % 8);
-+    set_panel_userptr(pan, (NCURSES_CONST void *) userdata);
-+    return pan;
-+}
-+
-+static void
-+my_remove_panel(PANEL ** pans, int which)
-+{
-+    if (pans[which] != 0) {
-+	PANEL *pan = pans[which];
-+	WINDOW *win = panel_window(pan);
-+	char *user = (char *) panel_userptr(pan);
-+
-+	free(user);
-+	del_panel(pan);
-+	delwin(win);
-+
-+	pans[which] = 0;
-+    }
-+}
-+
-+#define MIN(a,b) ((a) < (b) ? (a) : (b))
-+#define ABS(a)   ((a) < 0 ? -(a) : (a))
-+
-+static void
-+my_create_panel(PANEL ** pans, int which, FillPanel myFill)
-+{
-+    PANEL *pan = 0;
-+    int code;
-+    int pair = which;
-+    short fg = (pair == COLOR_BLUE) ? COLOR_WHITE : COLOR_BLACK;
-+    short bg = pair;
-+    int x0, y0, x1, y1;
-+
-+    init_pair(pair, fg, bg);
-+
-+    /* remove the old panel, if any */
-+    my_remove_panel(pans, which);
-+
-+    /* get the position of one corner */
-+    wmove(stdscr, getmaxy(stdscr) / 2, getmaxx(stdscr) / 2);
-+    getyx(stdscr, y0, x0);
-+    while ((code = get_position("First corner", "", which, &x0, &y0)) == 0) {
-+	;
-+    }
-+
-+    if (code > 0) {
-+	char also[80];
-+	sprintf(also, " (first %d,%d)", y0, x0);
-+	/* get the position of the opposite corner */
-+	while ((code = get_position("Opposite corner",
-+				    also, which, &x1, &y1)) == 0) {
-+	    ;
-+	}
-+
-+	if (code > 0) {
-+	    int tly = MIN(y0, y1);
-+	    int tlx = MIN(x0, x1);
-+	    pan = mkpanel(pair, ABS(y1 - y0) + 1, ABS(x1 - x0) + 1, tly, tlx);
-+	    /* finish */
-+	    myFill(pan);
-+	    pans[which] = pan;
-+	    pflush();
-+	    wmove(stdscr, y1, x1);
-+	}
-+    }
-+}
-+
-+static void
-+my_move_panel(PANEL ** pans, int which, bool continuous)
-+{
-+    if (pans[which] != 0) {
-+	int code;
-+	int y0, x0;
-+	int y1, x1;
-+	WINDOW *win = panel_window(pans[which]);
-+	char also[80];
-+
-+	getbegyx(win, y0, x0);
-+	sprintf(also, " (start %d,%d)", y0, x0);
-+	wmove(stdscr, y0, x0);
-+	while ((code = get_position("Move panel", also, which, &x1, &y1)) == 0) {
-+	    if (continuous) {
-+		move_panel(pans[which], y1, x1);
-+		pflush();
-+	    }
-+	}
-+	if (code > 0) {
-+	    move_panel(pans[which], y1, x1);
-+	}
-+    }
-+}
-+
-+static void
-+my_resize_panel(PANEL ** pans, int which, FillPanel myFill)
-+{
-+    if (pans[which] != 0) {
-+	int code;
-+	int y0, x0;
-+	int y1, x1;
-+	WINDOW *win = panel_window(pans[which]);
-+	char also[80];
-+
-+	getbegyx(win, y0, x0);
-+	sprintf(also, " (start %d,%d)", y0, x0);
-+	wmove(stdscr, y0, x0);
-+	while ((code = get_position("Resize panel",
-+				    also, which, &x1, &y1)) == 0) {
-+	    ;
-+	}
-+	if (code > 0) {
-+	    WINDOW *next = newwin(ABS(y1 - y0) + 1,
-+				  ABS(x1 - x0) + 1,
-+				  MIN(y0, y1),
-+				  MIN(x0, x1));
-+	    if (next != 0) {
-+		keypad(next, TRUE);
-+		if (use_colors) {
-+		    wbkgdset(next, (chtype) (COLOR_PAIR(which) | ' '));
-+		} else if (!unboxed) {
-+		    wbkgdset(next, A_BOLD | ' ');
-+		}
-+		replace_panel(pans[which], next);
-+		myFill(pans[which]);
-+		delwin(win);
-+	    }
-+	}
-+    }
-+}
-+
-+static void
-+init_panel(void)
-+{
-+    register int y, x;
-+
-+    for (y = 0; y < LINES - 1; y++) {
-+	for (x = 0; x < COLS; x++)
-+	    wprintw(stdscr, "%d", (y + x) % 10);
-+    }
-+}
-+
-+static void
-+fill_panel(PANEL * pan)
-+{
-+    WINDOW *win = panel_window(pan);
-+    int num = ((const char *) panel_userptr(pan))[1];
-+    int y, x;
-+
-+    wmove(win, 1, 1);
-+    wprintw(win, "-pan%c-", num);
-+    wclrtoeol(win);
-+    box(win, 0, 0);
-+    for (y = 2; y < getmaxy(win) - 1; y++) {
-+	for (x = 1; x < getmaxx(win) - 1; x++) {
-+	    wmove(win, y, x);
-+	    waddch(win, UChar(num));
-+	}
-+    }
-+}
-+
-+static void
-+fill_unboxed(PANEL * pan)
-+{
-+    WINDOW *win = panel_window(pan);
-+    int num = ((const char *) panel_userptr(pan))[1];
-+    int y, x;
-+
-+    for (y = 0; y < getmaxy(win); y++) {
-+	for (x = 0; x < getmaxx(win); x++) {
-+	    wmove(win, y, x);
-+	    waddch(win, UChar(num));
-+	}
-+    }
-+}
-+
-+#if USE_WIDEC_SUPPORT
-+static void
-+make_fullwidth_digit(cchar_t *target, int digit)
-+{
-+    wchar_t source[2];
-+
-+    source[0] = digit + 0xff10;
-+    source[1] = 0;
-+    setcchar(target, source, A_NORMAL, 0, 0);
-+}
-+
-+static void
-+init_wide_panel(void)
-+{
-+    int digit;
-+    cchar_t temp[10];
-+
-+    for (digit = 0; digit < 10; ++digit)
-+	make_fullwidth_digit(&temp[digit], digit);
-+
-+    do {
-+	int y, x;
-+	getyx(stdscr, y, x);
-+	digit = (y + x / 2) % 10;
-+    } while (add_wch(&temp[digit]) != ERR);
-+}
-+
-+static void
-+fill_wide_panel(PANEL * pan)
-+{
-+    WINDOW *win = panel_window(pan);
-+    int num = ((const char *) panel_userptr(pan))[1];
-+    int y, x;
-+
-+    wmove(win, 1, 1);
-+    wprintw(win, "-pan%c-", num);
-+    wclrtoeol(win);
-+    box(win, 0, 0);
-+    for (y = 2; y < getmaxy(win) - 1; y++) {
-+	for (x = 1; x < getmaxx(win) - 1; x++) {
-+	    wmove(win, y, x);
-+	    waddch(win, UChar(num));
-+	}
-+    }
-+}
-+#endif
-+
-+#define MAX_PANELS 5
-+
-+static int
-+which_panel(PANEL * px[MAX_PANELS + 1], PANEL * pan)
-+{
-+    int result = 0;
-+    int j;
-+
-+    for (j = 1; j <= MAX_PANELS; ++j) {
-+	if (px[j] == pan) {
-+	    result = j;
-+	    break;
-+	}
-+    }
-+    return result;
-+}
-+
-+static void
-+show_panels(PANEL * px[MAX_PANELS + 1])
-+{
-+    static const char *help[] =
-+    {
-+	"",
-+	"Commands are letter/digit pairs.  Digits are the panel number.",
-+	"",
-+	"  b - put the panel on the bottom of the stack",
-+	"  c - create the panel",
-+	"  d - delete the panel",
-+	"  h - hide the panel",
-+	"  m - move the panel (M for continuous move)",
-+	"  r - resize the panel",
-+	"  s - show the panel",
-+	"  b - put the panel on the top of the stack"
-+    };
-+
-+    struct {
-+	bool valid;
-+	bool hidden;
-+	PANEL *above;
-+	PANEL *below;
-+    } table[MAX_PANELS + 1];
-+
-+    WINDOW *win;
-+    PANEL *pan;
-+    int j;
-+
-+    for (j = 1; j <= MAX_PANELS; ++j) {
-+	table[j].valid = (px[j] != 0);
-+	if (table[j].valid) {
-+	    table[j].hidden = panel_hidden(px[j]);
-+	    table[j].above = panel_above(px[j]);
-+	    table[j].below = panel_below(px[j]);
-+	}
-+    }
-+
-+    if ((win = newwin(LINES - 1, COLS, 0, 0)) != 0) {
-+	keypad(win, TRUE);
-+	if ((pan = new_panel(win)) != 0) {
-+	    werase(win);
-+	    mvwprintw(win, 0, 0, "Panels:\n");
-+	    for (j = 1; j <= MAX_PANELS; ++j) {
-+		if (table[j].valid) {
-+		    wprintw(win, " %d:", j);
-+		    if (table[j].hidden) {
-+			waddstr(win, " hidden");
-+		    } else {
-+			if (table[j].above) {
-+			    wprintw(win, " above %d",
-+				    which_panel(px, table[j].above));
-+			}
-+			if (table[j].below) {
-+			    wprintw(win, "%s below %d",
-+				    table[j].above ? "," : "",
-+				    which_panel(px, table[j].below));
-+			}
-+		    }
-+		    waddch(win, '\n');
-+		}
-+	    }
-+	    for (j = 0; j < (int) SIZEOF(help); ++j) {
-+		if (wprintw(win, "%s\n", help[j]) == ERR)
-+		    break;
-+	    }
-+	    wgetch(win);
-+	    del_panel(pan);
-+	    pflush();
-+	}
-+	delwin(win);
-+    }
-+}
-+
-+#define wrapper(func) \
-+static int my_##func(PANEL *pan) \
-+{ \
-+    int code = ERR; \
-+    if (pan != 0) { \
-+	code = func(pan); \
-+    } \
-+    return code; \
-+}
-+/* *INDENT-OFF* */
-+wrapper(bottom_panel)
-+wrapper(hide_panel)
-+wrapper(show_panel)
-+wrapper(top_panel)
-+/* *INDENT-ON* */
-+
-+static void
-+do_panel(PANEL * px[MAX_PANELS + 1],
-+	 NCURSES_CONST char *cmd,
-+	 FillPanel myFill)
-+{
-+    int which = cmd[1] - '0';
-+
-+    if (which < 1 || which > MAX_PANELS) {
-+	beep();
-+	return;
-+    }
-+
-+    if (log_in != 0) {
-+	pflush();
-+    }
-+
-+    saywhat(cmd);
-+    switch (*cmd) {
-+    case 'b':
-+	my_bottom_panel(px[which]);
-+	break;
-+    case 'c':
-+	my_create_panel(px, which, myFill);
-+	break;
-+    case 'd':
-+	my_remove_panel(px, which);
-+	break;
-+    case 'h':
-+	my_hide_panel(px[which]);
-+	break;
-+    case 'm':
-+	my_move_panel(px, which, FALSE);
-+	break;
-+    case 'M':
-+	my_move_panel(px, which, TRUE);
-+	break;
-+    case 'r':
-+	my_resize_panel(px, which, myFill);
-+	break;
-+    case 's':
-+	my_show_panel(px[which]);
-+	break;
-+    case 't':
-+	my_top_panel(px[which]);
-+	break;
-+    }
-+}
-+
-+static bool
-+ok_letter(int ch)
-+{
-+    return isalpha(UChar(ch)) && strchr("bcdhmMrst", ch) != 0;
-+}
-+
-+static bool
-+ok_digit(int ch)
-+{
-+    return isdigit(UChar(ch)) && (ch >= '1') && (ch - '0' <= MAX_PANELS);
-+}
-+
-+/*
-+ * A command consists of one or more letter/digit pairs separated by a space.
-+ * Digits are limited to 1..MAX_PANELS.
-+ *
-+ * End the command with a newline.  Reject other characters.
-+ */
-+static bool
-+get_command(PANEL * px[MAX_PANELS + 1], char *buffer, int limit)
-+{
-+    int length = 0;
-+    int y0, x0;
-+    int c0, ch;
-+    WINDOW *win;
-+
-+    getyx(stdscr, y0, x0);
-+    win = statusline();
-+    waddstr(win, "Command:");
-+    buffer[length = 0] = '\0';
-+
-+    if (log_in != 0) {
-+	if (fgets(buffer, limit - 3, log_in) != 0) {
-+	    length = strlen(buffer);
-+	    while (length > 0 && isspace(UChar(buffer[length - 1])))
-+		buffer[--length] = '\0';
-+	    waddstr(win, buffer);
-+	} else {
-+	    close_input();
-+	}
-+	(void) wgetch(win);
-+    } else {
-+	c0 = 0;
-+	for (;;) {
-+	    ch = wgetch(win);
-+	    if (ch == ERR || ch == QUIT || ch == ESCAPE) {
-+		buffer[0] = '\0';
-+		break;
-+	    } else if (ch == CTRL('L')) {
-+		wrefresh(curscr);
-+	    } else if (ch == '\n' || ch == KEY_ENTER) {
-+		break;
-+	    } else if (ch == '?') {
-+		show_panels(px);
-+	    } else if (length + 3 < limit) {
-+		if (ch >= KEY_MIN) {
-+		    beep();
-+		} else if (ok_letter(UChar(ch))) {
-+		    if (isalpha(UChar(c0))) {
-+			beep();
-+		    } else if (isdigit(UChar(c0))) {
-+			wprintw(win, " %c", ch);
-+			buffer[length++] = ' ';
-+			buffer[length++] = c0 = ch;
-+		    } else {
-+			wprintw(win, "%c", ch);
-+			buffer[length++] = c0 = ch;
-+		    }
-+		} else if (ok_digit(ch)) {
-+		    if (isalpha(UChar(c0))) {
-+			wprintw(win, "%c", ch);
-+			buffer[length++] = c0 = ch;
-+		    } else {
-+			beep();
-+		    }
-+		} else if (ch == ' ') {
-+		    if (isdigit(UChar(c0))) {
-+			wprintw(win, "%c", ch);
-+			buffer[length++] = c0 = ch;
-+		    } else {
-+			beep();
-+		    }
-+		} else {
-+		    beep();
-+		}
-+	    } else {
-+		beep();
-+	    }
-+	}
-+    }
-+
-+    wmove(stdscr, y0, x0);
-+
-+    buffer[length] = '\0';
-+    if (log_out && length) {
-+	fprintf(log_out, "%s\n", buffer);
-+    }
-+    return (length != 0);
-+}
-+
-+static void
-+demo_panels(InitPanel myInit, FillPanel myFill)
-+{
-+    int itmp;
-+    PANEL *px[MAX_PANELS + 1];
-+    char buffer[BUFSIZ];
-+
-+    scrollok(stdscr, FALSE);	/* we don't want stdscr to scroll! */
-+    refresh();
-+
-+    myInit();
-+    memset(px, 0, sizeof(px));
-+
-+    while (get_command(px, buffer, sizeof(buffer))) {
-+	int limit = strlen(buffer);
-+	for (itmp = 0; itmp < limit; itmp += 3) {
-+	    do_panel(px, buffer + itmp, myFill);
-+	}
-+	pflush();
-+    }
-+#if NO_LEAKS
-+    for (itmp = 1; itmp <= MAX_PANELS; ++itmp) {
-+	my_remove_panel(px, itmp);
-+    }
-+#endif
-+}
-+
-+static void
-+usage(void)
-+{
-+    static const char *const tbl[] =
-+    {
-+	"Usage: demo_panels [options]"
-+	,""
-+	,"Options:"
-+	,"  -i file  read commands from file"
-+	,"  -o file  record commands in file"
-+	,"  -m       do not use colors"
-+#if USE_WIDEC_SUPPORT
-+	,"  -w       use wide-characters in panels and background"
-+#endif
-+	,"  -x       do not enclose panels in boxes"
-+    };
-+    size_t n;
-+    for (n = 0; n < SIZEOF(tbl); n++)
-+	fprintf(stderr, "%s\n", tbl[n]);
-+    ExitProgram(EXIT_FAILURE);
-+}
-+
- int
--main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
-+main(int argc, char *argv[])
- {
--    printf("Not implemented - demo for panel library\n");
--    return EXIT_SUCCESS;
-+    int c;
-+    bool monochrome = FALSE;
-+    InitPanel myInit = init_panel;
-+    FillPanel myFill = fill_panel;
-+
-+    setlocale(LC_ALL, "");
-+
-+    while ((c = getopt(argc, argv, "i:o:mwx")) != -1) {
-+	switch (c) {
-+	case 'i':
-+	    log_in = fopen(optarg, "r");
-+	    break;
-+	case 'o':
-+	    log_out = fopen(optarg, "w");
-+	    break;
-+	case 'm':
-+	    monochrome = TRUE;
-+	    break;
-+#if USE_WIDEC_SUPPORT
-+	case 'w':
-+	    myInit = init_wide_panel;
-+	    myFill = fill_wide_panel;
-+	    break;
-+#endif
-+	case 'x':
-+	    unboxed = TRUE;
-+	    break;
-+	default:
-+	    usage();
-+	}
-+    }
-+    if (unboxed)
-+	myFill = fill_unboxed;
-+
-+    initscr();
-+    cbreak();
-+    noecho();
-+    keypad(stdscr, TRUE);
-+
-+    use_colors = monochrome ? FALSE : has_colors();
-+    if (use_colors)
-+	start_color();
-+
-+    demo_panels(myInit, myFill);
-+    endwin();
-+
-+    close_input();
-+    close_output();
-+
-+    ExitProgram(EXIT_SUCCESS);
- }
- #else
- int
-diff -Naur ncurses-5.6.orig/test/demo_termcap.c ncurses-5.6/test/demo_termcap.c
---- ncurses-5.6.orig/test/demo_termcap.c	2006-05-06 15:06:36.000000000 -0400
-+++ ncurses-5.6/test/demo_termcap.c	2008-06-18 06:49:47.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2005,2006 Free Software Foundation, Inc.                   *
-+ * Copyright (c) 2005-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -29,10 +29,11 @@
- /*
-  * Author: Thomas E. Dickey
-  *
-- * $Id: demo_termcap.c,v 1.5 2006/05/06 19:06:36 tom Exp $
-+ * $Id: demo_termcap.c,v 1.7 2008/02/09 18:08:36 tom Exp $
-  *
-  * A simple demo of the termcap interface.
-  */
-+#define USE_TINFO
- #include <test.priv.h>
- 
- #if HAVE_TGETENT
-@@ -115,7 +116,7 @@
- }
- 
- static void
--demo_termcap(const char *name)
-+demo_termcap(char *name)
- {
-     char buffer[1024];
- 
-@@ -152,11 +153,13 @@
-     } else if ((name = getenv("TERM")) != 0) {
- 	demo_termcap(name);
-     } else {
--	demo_termcap("dumb");
-+	static char dumb[] = "dumb";
-+	demo_termcap(dumb);
-     }
- 
-     ExitProgram(EXIT_SUCCESS);
- }
-+
- #else
- int
- main(int argc GCC_UNUSED,
-diff -Naur ncurses-5.6.orig/test/ditto.c ncurses-5.6/test/ditto.c
---- ncurses-5.6.orig/test/ditto.c	2005-04-16 12:35:49.000000000 -0400
-+++ ncurses-5.6/test/ditto.c	2008-06-18 06:49:52.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2001,2005 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -27,25 +27,78 @@
-  ****************************************************************************/
- 
- /*
-- * Author: Thomas E. Dickey <dickey@clark.net> 1998
-+ * Author: Thomas E. Dickey (1998-on)
-  *
-- * $Id: ditto.c,v 1.5 2005/04/16 16:35:49 tom Exp $
-+ * $Id: ditto.c,v 1.30 2008/06/14 23:00:26 tom Exp $
-  *
-  * The program illustrates how to set up multiple screens from a single
-- * program.  Invoke the program by specifying another terminal on the same
-- * machine by specifying its device, e.g.,
-+ * program.
-+ *
-+ * If openpty() is supported, the command line parameters are titles for
-+ * the windows showing each screen's data.
-+ *
-+ * If openpty() is not supported, you must invoke the program by specifying
-+ * another terminal on the same machine by specifying its device, e.g.,
-  *	ditto /dev/ttyp1
-  */
- #include <test.priv.h>
- #include <sys/stat.h>
- #include <errno.h>
- 
-+#ifdef USE_PTHREADS
-+#include <pthread.h>
-+#endif
-+
-+#ifdef USE_XTERM_PTY
-+#include USE_OPENPTY_HEADER
-+#endif
-+
-+#define MAX_FIFO 256
-+
-+#define THIS_FIFO(n) ((n) % MAX_FIFO)
-+#define NEXT_FIFO(n) THIS_FIFO((n) + 1)
-+
-+typedef struct {
-+    unsigned long sequence;
-+    int head;
-+    int tail;
-+    int data[MAX_FIFO];
-+} FIFO;
-+
-+typedef struct {
-+    unsigned long sequence;
-+} PEEK;
-+
-+/*
-+ * Data "owned" for a single screen.  Each screen is divided into windows that
-+ * show the text read from each terminal.  Input from a given screen will also
-+ * be read into one window per screen.
-+ */
- typedef struct {
-     FILE *input;
-     FILE *output;
--    SCREEN *screen;
-+    SCREEN *screen;		/* this screen - curses internal data */
-+    int which1;			/* this screen's index in DITTO[] array */
-+    int length;			/* length of windows[] and peeks[] */
-+    char **titles;		/* per-window titles */
-+    WINDOW **windows;		/* display data from each screen */
-+    PEEK *peeks;		/* indices for each screen's fifo */
-+    FIFO fifo;			/* fifo for this screen */
-+#ifdef USE_PTHREADS
-+    pthread_t thread;
-+#endif
- } DITTO;
- 
-+/*
-+ * Structure used to pass multiple parameters via the use_screen()
-+ * single-parameter interface.
-+ */
-+typedef struct {
-+    int source;			/* which screen did character come from */
-+    int target;			/* which screen is character going to */
-+    DITTO *ditto;		/* data for all screens */
-+} DDATA;
-+
- static void
- failed(const char *s)
- {
-@@ -60,10 +113,60 @@
-     ExitProgram(EXIT_FAILURE);
- }
- 
-+/* Add to the head of the fifo, checking for overflow. */
-+static void
-+put_fifo(FIFO * fifo, int value)
-+{
-+    int next = NEXT_FIFO(fifo->head);
-+    if (next == fifo->tail)
-+	fifo->tail = NEXT_FIFO(fifo->tail);
-+    fifo->data[next] = value;
-+    fifo->head = next;
-+    fifo->sequence += 1;
-+}
-+
-+/* Get data from the tail (oldest part) of the fifo, returning -1 if no data.
-+ * Since each screen can peek into the fifo, we do not update the tail index,
-+ * but modify the peek-index.
-+ *
-+ * FIXME - test/workaround for case where fifo gets more than a buffer
-+ * ahead of peek.
-+ */
-+static int
-+peek_fifo(FIFO * fifo, PEEK * peek)
-+{
-+    int result = -1;
-+    if (peek->sequence < fifo->sequence) {
-+	peek->sequence += 1;
-+	result = fifo->data[THIS_FIFO(peek->sequence)];
-+    }
-+    return result;
-+}
-+
- static FILE *
- open_tty(char *path)
- {
-     FILE *fp;
-+#ifdef USE_XTERM_PTY
-+    int amaster;
-+    int aslave;
-+    char slave_name[1024];
-+    char s_option[1024];
-+    char *leaf;
-+
-+    if (openpty(&amaster, &aslave, slave_name, 0, 0) != 0)
-+	failed("openpty");
-+    if ((leaf = strrchr(slave_name, '/')) == 0) {
-+	errno = EISDIR;
-+	failed(slave_name);
-+    }
-+    sprintf(s_option, "-S%s/%d", slave_name, aslave);
-+    if (fork()) {
-+	execlp("xterm", "xterm", s_option, "-title", path, (char *) 0);
-+	_exit(0);
-+    }
-+    fp = fdopen(amaster, "r+");
-+#else
-     struct stat sb;
- 
-     if (stat(path, &sb) < 0)
-@@ -72,75 +175,243 @@
- 	errno = ENOTTY;
- 	failed(path);
-     }
--    fp = fopen(path, "a+");
-+    fp = fopen(path, "r+");
-     if (fp == 0)
- 	failed(path);
-     printf("opened %s\n", path);
-+#endif
-     return fp;
- }
- 
-+static void
-+init_screen(SCREEN *sp GCC_UNUSED, void *arg)
-+{
-+    DITTO *target = (DITTO *) arg;
-+    int high, wide;
-+    int k;
-+
-+    cbreak();
-+    noecho();
-+    scrollok(stdscr, TRUE);
-+    box(stdscr, 0, 0);
-+
-+    target->windows = typeCalloc(WINDOW *, target->length);
-+    target->peeks = typeCalloc(PEEK, target->length);
-+
-+    high = (LINES - 2) / target->length;
-+    wide = (COLS - 2);
-+    for (k = 0; k < target->length; ++k) {
-+	WINDOW *outer = newwin(high, wide, 1 + (high * k), 1);
-+	WINDOW *inner = derwin(outer, high - 2, wide - 2, 1, 1);
-+
-+	box(outer, 0, 0);
-+	mvwaddstr(outer, 0, 2, target->titles[k]);
-+	wnoutrefresh(outer);
-+
-+	scrollok(inner, TRUE);
-+	keypad(inner, TRUE);
-+#ifndef USE_PTHREADS
-+	nodelay(inner, TRUE);
-+#endif
-+
-+	target->windows[k] = inner;
-+    }
-+    doupdate();
-+}
-+
-+static void
-+open_screen(DITTO * target, char **source, int length, int which1)
-+{
-+    if (which1 != 0) {
-+	target->input =
-+	    target->output = open_tty(source[which1]);
-+    } else {
-+	target->input = stdin;
-+	target->output = stdout;
-+    }
-+
-+    target->which1 = which1;
-+    target->titles = source;
-+    target->length = length;
-+    target->screen = newterm((char *) 0,	/* assume $TERM is the same */
-+			     target->output,
-+			     target->input);
-+
-+    if (target->screen == 0)
-+	failed("newterm");
-+
-+    (void) USING_SCREEN(target->screen, init_screen, target);
-+}
-+
-+static int
-+close_screen(SCREEN *sp GCC_UNUSED, void *arg GCC_UNUSED)
-+{
-+    (void) sp;
-+    (void) arg;
-+    return endwin();
-+}
-+
-+/*
-+ * Read data from the 'source' screen.
-+ */
-+static int
-+read_screen(SCREEN *sp GCC_UNUSED, void *arg)
-+{
-+    DDATA *data = (DDATA *) arg;
-+    DITTO *ditto = &(data->ditto[data->source]);
-+    WINDOW *win = ditto->windows[data->source];
-+    int ch = wgetch(win);
-+
-+    if (ch > 0 && ch < 256)
-+	put_fifo(&(ditto->fifo), ch);
-+    else
-+	ch = ERR;
-+
-+    return ch;
-+}
-+
-+/*
-+ * Write all of the data that's in fifos for the 'target' screen.
-+ */
-+static int
-+write_screen(SCREEN *sp GCC_UNUSED, void *arg GCC_UNUSED)
-+{
-+    DDATA *data = (DDATA *) arg;
-+    DITTO *ditto = &(data->ditto[data->target]);
-+    bool changed = FALSE;
-+    int which;
-+
-+    for (which = 0; which < ditto->length; ++which) {
-+	WINDOW *win = ditto->windows[which];
-+	FIFO *fifo = &(data->ditto[which].fifo);
-+	PEEK *peek = &(ditto->peeks[which]);
-+	int ch;
-+
-+	while ((ch = peek_fifo(fifo, peek)) > 0) {
-+	    changed = TRUE;
-+
-+	    waddch(win, ch);
-+	    wnoutrefresh(win);
-+	}
-+    }
-+
-+    if (changed)
-+	doupdate();
-+    return OK;
-+}
-+
-+static void
-+show_ditto(DITTO * data, int count, DDATA * ddata)
-+{
-+    int n;
-+
-+    for (n = 0; n < count; n++) {
-+	ddata->target = n;
-+	USING_SCREEN(data[n].screen, write_screen, (void *) ddata);
-+    }
-+}
-+
-+#ifdef USE_PTHREADS
-+static void *
-+handle_screen(void *arg)
-+{
-+    DDATA ddata;
-+    int ch;
-+
-+    memset(&ddata, 0, sizeof(ddata));
-+    ddata.ditto = (DITTO *) arg;
-+    ddata.source = ddata.ditto->which1;
-+    ddata.ditto -= ddata.source;	/* -> base of array */
-+
-+    for (;;) {
-+	ch = read_screen(ddata.ditto->screen, &ddata);
-+	if (ch == CTRL('D')) {
-+	    int later = (ddata.source ? ddata.source : -1);
-+	    int j;
-+
-+	    for (j = ddata.ditto->length - 1; j > 0; --j) {
-+		if (j != later) {
-+		    pthread_cancel(ddata.ditto[j].thread);
-+		}
-+	    }
-+	    if (later > 0) {
-+		pthread_cancel(ddata.ditto[later].thread);
-+	    }
-+	    break;
-+	}
-+	show_ditto(ddata.ditto, ddata.ditto->length, &ddata);
-+    }
-+    return NULL;
-+}
-+#endif
-+
- int
--main(int argc GCC_UNUSED,
--     char *argv[]GCC_UNUSED)
-+main(int argc, char *argv[])
- {
-     int j;
--    int active_tty = 0;
-     DITTO *data;
-+#ifndef USE_PTHREADS
-+    int count;
-+#endif
- 
-     if (argc <= 1)
- 	usage();
- 
--    if ((data = (DITTO *) calloc((unsigned) argc, sizeof(DITTO))) == 0)
-+    if ((data = typeCalloc(DITTO, argc)) == 0)
- 	failed("calloc data");
- 
--    data[0].input = stdin;
--    data[0].output = stdout;
--    for (j = 1; j < argc; j++) {
--	data[j].input =
--	    data[j].output = open_tty(argv[j]);
-+    for (j = 0; j < argc; j++) {
-+	open_screen(&data[j], argv, argc, j);
-     }
- 
-+#ifdef USE_PTHREADS
-     /*
--     * If we got this far, we have open connection(s) to the terminal(s).
--     * Set up the screens.
-+     * For multi-threaded operation, set up a reader for each of the screens.
-+     * That uses blocking I/O rather than polling for input, so no calls to
-+     * napms() are needed.
-      */
-     for (j = 0; j < argc; j++) {
--	active_tty++;
--	data[j].screen = newterm((char *) 0,	/* assume $TERM is the same */
--				 data[j].output,
--				 data[j].input);
--	if (data[j].screen == 0)
--	    failed("newterm");
--	cbreak();
--	noecho();
--	scrollok(stdscr, TRUE);
-+	(void) pthread_create(&(data[j].thread), NULL, handle_screen, &data[j]);
-     }
--
-+    pthread_join(data[1].thread, NULL);
-+#else
-     /*
-      * Loop, reading characters from any of the inputs and writing to all
-      * of the screens.
-      */
--    for (;;) {
-+    for (count = 0;; ++count) {
-+	DDATA ddata;
- 	int ch;
--	set_term(data[0].screen);
--	ch = getch();
--	if (ch == ERR)
--	    continue;
--	if (ch == 4)
-+	int which = (count % argc);
-+
-+	napms(20);
-+
-+	ddata.source = which;
-+	ddata.ditto = data;
-+
-+	ch = USING_SCREEN(data[which].screen, read_screen, &ddata);
-+	if (ch == CTRL('D')) {
- 	    break;
--	for (j = 0; j < argc; j++) {
--	    set_term(data[j].screen);
--	    addch(UChar(ch));
--	    refresh();
-+	} else if (ch != ERR) {
-+	    show_ditto(data, argc, &ddata);
- 	}
-     }
-+#endif
- 
-     /*
-      * Cleanup and exit
-      */
-     for (j = argc - 1; j >= 0; j--) {
--	set_term(data[j].screen);
--	endwin();
-+	USING_SCREEN(data[j].screen, close_screen, 0);
-+	fprintf(data[j].output, "**Closed\r\n");
-+
-+	/*
-+	 * Closing before a delscreen() helps ncurses determine that there
-+	 * is no valid output buffer, and can remove the setbuf() data.
-+	 */
-+	fflush(data[j].output);
-+	fclose(data[j].output);
-+	delscreen(data[j].screen);
-     }
-     ExitProgram(EXIT_SUCCESS);
- }
-diff -Naur ncurses-5.6.orig/test/dots.c ncurses-5.6/test/dots.c
---- ncurses-5.6.orig/test/dots.c	2006-11-04 14:54:42.000000000 -0500
-+++ ncurses-5.6/test/dots.c	2008-06-18 06:49:47.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1999-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1999-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -29,10 +29,11 @@
- /*
-  * Author: Thomas E. Dickey <dickey@clark.net> 1999
-  *
-- * $Id: dots.c,v 1.15 2006/11/04 19:54:42 tom Exp $
-+ * $Id: dots.c,v 1.17 2008/02/09 18:08:50 tom Exp $
-  *
-  * A simple demo of the terminfo interface.
-  */
-+#define USE_TINFO
- #include <test.priv.h>
- 
- #if HAVE_SETUPTERM
-@@ -46,7 +47,7 @@
- static time_t started;
- 
- static int
--outc(int c)
-+outc(TPUTS_ARG c)
- {
-     if (interrupted) {
- 	char tmp = c;
-diff -Naur ncurses-5.6.orig/test/dots_mvcur.c ncurses-5.6/test/dots_mvcur.c
---- ncurses-5.6.orig/test/dots_mvcur.c	1969-12-31 19:00:00.000000000 -0500
-+++ ncurses-5.6/test/dots_mvcur.c	2008-06-18 06:49:47.000000000 -0400
-@@ -0,0 +1,171 @@
-+/****************************************************************************
-+ * Copyright (c) 1999-2007,2008 Free Software Foundation, Inc.              *
-+ *                                                                          *
-+ * Permission is hereby granted, free of charge, to any person obtaining a  *
-+ * copy of this software and associated documentation files (the            *
-+ * "Software"), to deal in the Software without restriction, including      *
-+ * without limitation the rights to use, copy, modify, merge, publish,      *
-+ * distribute, distribute with modifications, sublicense, and/or sell       *
-+ * copies of the Software, and to permit persons to whom the Software is    *
-+ * furnished to do so, subject to the following conditions:                 *
-+ *                                                                          *
-+ * The above copyright notice and this permission notice shall be included  *
-+ * in all copies or substantial portions of the Software.                   *
-+ *                                                                          *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-+ *                                                                          *
-+ * Except as contained in this notice, the name(s) of the above copyright   *
-+ * holders shall not be used in advertising or otherwise to promote the     *
-+ * sale, use or other dealings in this Software without prior written       *
-+ * authorization.                                                           *
-+ ****************************************************************************/
-+
-+/*
-+ * Author: Thomas E. Dickey - 2007
-+ *
-+ * $Id: dots_mvcur.c,v 1.2 2008/02/09 18:08:57 tom Exp $
-+ *
-+ * A simple demo of the terminfo interface, and mvcur.
-+ */
-+#define USE_TINFO
-+#include <test.priv.h>
-+
-+#if HAVE_SETUPTERM
-+
-+#include <time.h>
-+
-+#define valid(s) ((s != 0) && s != (char *)-1)
-+
-+static bool interrupted = FALSE;
-+static long total_chars = 0;
-+static time_t started;
-+
-+static int
-+outc(TPUTS_ARG c)
-+{
-+    if (interrupted) {
-+	char tmp = c;
-+	write(STDOUT_FILENO, &tmp, 1);
-+    } else {
-+	putc(c, stdout);
-+    }
-+    return 0;
-+}
-+
-+static bool
-+outs(char *s)
-+{
-+    if (valid(s)) {
-+	tputs(s, 1, outc);
-+	return TRUE;
-+    }
-+    return FALSE;
-+}
-+
-+static void
-+cleanup(void)
-+{
-+    outs(exit_attribute_mode);
-+    if (!outs(orig_colors))
-+	outs(orig_pair);
-+    outs(clear_screen);
-+    outs(cursor_normal);
-+
-+    printf("\n\n%ld total chars, rate %.2f/sec\n",
-+	   total_chars,
-+	   ((double) (total_chars) / (time((time_t *) 0) - started)));
-+}
-+
-+static void
-+onsig(int n GCC_UNUSED)
-+{
-+    interrupted = TRUE;
-+}
-+
-+static float
-+ranf(void)
-+{
-+    long r = (rand() & 077777);
-+    return ((float) r / 32768.);
-+}
-+
-+int
-+main(
-+	int argc GCC_UNUSED,
-+	char *argv[]GCC_UNUSED)
-+{
-+    int x0 = 1, y0 = 1;
-+    int x, y, z, p;
-+    float r;
-+    float c;
-+    SCREEN *sp;
-+
-+    CATCHALL(onsig);
-+
-+    srand((unsigned) time(0));
-+    sp = newterm((char *) 0, stdout, stdin);
-+    outs(clear_screen);
-+    outs(cursor_home);
-+    outs(cursor_invisible);
-+    if (max_colors > 1) {
-+	if (!valid(set_a_foreground)
-+	    || !valid(set_a_background)
-+	    || (!valid(orig_colors) && !valid(orig_pair)))
-+	    max_colors = -1;
-+    }
-+
-+    r = (float) (lines - 4);
-+    c = (float) (columns - 4);
-+    started = time((time_t *) 0);
-+
-+    while (!interrupted) {
-+	x = (int) (c * ranf()) + 2;
-+	y = (int) (r * ranf()) + 2;
-+	p = (ranf() > 0.9) ? '*' : ' ';
-+
-+	if (mvcur(y0, x0, y, x) != ERR) {
-+	    x0 = x;
-+	    y0 = y;
-+	}
-+
-+	if (max_colors > 0) {
-+	    z = (int) (ranf() * max_colors);
-+	    if (ranf() > 0.01) {
-+		tputs(tparm2(set_a_foreground, z), 1, outc);
-+	    } else {
-+		tputs(tparm2(set_a_background, z), 1, outc);
-+		napms(1);
-+	    }
-+	} else if (valid(exit_attribute_mode)
-+		   && valid(enter_reverse_mode)) {
-+	    if (ranf() <= 0.01) {
-+		outs((ranf() > 0.6)
-+		     ? enter_reverse_mode
-+		     : exit_attribute_mode);
-+		napms(1);
-+	    }
-+	}
-+	outc(p);
-+	fflush(stdout);
-+	++total_chars;
-+    }
-+    cleanup();
-+    endwin();
-+    delscreen(sp);
-+    ExitProgram(EXIT_SUCCESS);
-+}
-+#else
-+int
-+main(int argc GCC_UNUSED,
-+     char *argv[]GCC_UNUSED)
-+{
-+    fprintf(stderr, "This program requires terminfo\n");
-+    exit(EXIT_FAILURE);
-+}
-+#endif
-diff -Naur ncurses-5.6.orig/test/echochar.c ncurses-5.6/test/echochar.c
---- ncurses-5.6.orig/test/echochar.c	2006-12-02 19:14:29.000000000 -0500
-+++ ncurses-5.6/test/echochar.c	2008-06-18 06:49:49.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2006 Free Software Foundation, Inc.                        *
-+ * Copyright (c) 2006-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
-  * authorization.                                                           *
-  ****************************************************************************/
- /*
-- * $Id: echochar.c,v 1.3 2006/12/03 00:14:29 tom Exp $
-+ * $Id: echochar.c,v 1.6 2008/04/12 22:06:04 tom Exp $
-  *
-  * Demonstrate the echochar function (compare to dots.c).
-  * Thomas Dickey - 2006/11/4
-@@ -89,7 +89,7 @@
-     int last_fg = 0;
-     int last_bg = 0;
- 
--    while ((ch = getopt(argc, argv, "r")) != EOF) {
-+    while ((ch = getopt(argc, argv, "r")) != -1) {
- 	switch (ch) {
- 	case 'r':
- 	    opt_r = TRUE;
-@@ -107,7 +107,7 @@
-     if (use_colors) {
- 	start_color();
- 	if (COLOR_PAIRS > 0) {
--	    my_pairs = calloc(COLOR_PAIRS, sizeof(*my_pairs));
-+	    my_pairs = typeCalloc(char, COLOR_PAIRS);
- 	}
- 	use_colors = (my_pairs != 0);
-     }
-@@ -146,10 +146,10 @@
- 	    }
- 	}
- 	if (opt_r) {
--	    addch(p);
-+	    addch(UChar(p));
- 	    refresh();
- 	} else {
--	    echochar(p);
-+	    echochar(UChar(p));
- 	}
- 	++total_chars;
-     }
-diff -Naur ncurses-5.6.orig/test/gdc.c ncurses-5.6/test/gdc.c
---- ncurses-5.6.orig/test/gdc.c	2006-05-20 11:37:44.000000000 -0400
-+++ ncurses-5.6/test/gdc.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -33,7 +33,7 @@
-  * modified 10-18-89 for curses (jrl)
-  * 10-18-89 added signal handling
-  *
-- * $Id: gdc.c,v 1.28 2006/05/20 15:37:44 tom Exp $
-+ * $Id: gdc.c,v 1.29 2007/07/21 17:45:09 tom Exp $
-  */
- 
- #include <test.priv.h>
-@@ -171,7 +171,7 @@
- 
-     CATCHALL(sighndl);
- 
--    while ((k = getopt(argc, argv, "sn")) != EOF) {
-+    while ((k = getopt(argc, argv, "sn")) != -1) {
- 	switch (k) {
- 	case 's':
- 	    scrol = TRUE;
-diff -Naur ncurses-5.6.orig/test/hashtest.c ncurses-5.6/test/hashtest.c
---- ncurses-5.6.orig/test/hashtest.c	2006-05-20 12:02:16.000000000 -0400
-+++ ncurses-5.6/test/hashtest.c	2008-06-18 06:49:47.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -30,17 +30,9 @@
-  *
-  * Generate timing statistics for vertical-motion optimization.
-  *
-- * $Id: hashtest.c,v 1.26 2006/05/20 16:02:16 tom Exp $
-+ * $Id: hashtest.c,v 1.28 2008/02/23 23:02:41 tom Exp $
-  */
- 
--#ifdef TRACE
--#define Trace(p) _tracef p
--#define USE_TRACE 1
--#else
--#define Trace(p)		/* nothing */
--#define USE_TRACE 0
--#endif
--
- #include <test.priv.h>
- 
- #define LO_CHAR ' '
-@@ -190,7 +182,7 @@
- 
-     setlocale(LC_ALL, "");
- 
--    while ((c = getopt(argc, argv, "cf:h:l:norsx")) != EOF) {
-+    while ((c = getopt(argc, argv, "cf:h:l:norsx")) != -1) {
- 	switch (c) {
- 	case 'c':
- 	    continuous = TRUE;
-diff -Naur ncurses-5.6.orig/test/inch_wide.c ncurses-5.6/test/inch_wide.c
---- ncurses-5.6.orig/test/inch_wide.c	1969-12-31 19:00:00.000000000 -0500
-+++ ncurses-5.6/test/inch_wide.c	2008-06-18 06:49:44.000000000 -0400
-@@ -0,0 +1,279 @@
-+/****************************************************************************
-+ * Copyright (c) 2007 Free Software Foundation, Inc.                        *
-+ *                                                                          *
-+ * Permission is hereby granted, free of charge, to any person obtaining a  *
-+ * copy of this software and associated documentation files (the            *
-+ * "Software"), to deal in the Software without restriction, including      *
-+ * without limitation the rights to use, copy, modify, merge, publish,      *
-+ * distribute, distribute with modifications, sublicense, and/or sell       *
-+ * copies of the Software, and to permit persons to whom the Software is    *
-+ * furnished to do so, subject to the following conditions:                 *
-+ *                                                                          *
-+ * The above copyright notice and this permission notice shall be included  *
-+ * in all copies or substantial portions of the Software.                   *
-+ *                                                                          *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-+ *                                                                          *
-+ * Except as contained in this notice, the name(s) of the above copyright   *
-+ * holders shall not be used in advertising or otherwise to promote the     *
-+ * sale, use or other dealings in this Software without prior written       *
-+ * authorization.                                                           *
-+ ****************************************************************************/
-+/*
-+ * $Id: inch_wide.c,v 1.6 2007/07/21 18:37:38 tom Exp $
-+ */
-+/*
-+       int in_wch(cchar_t *wcval);
-+       int mvin_wch(int y, int x, cchar_t *wcval);
-+       int mvwin_wch(WINDOW *win, int y, int x, cchar_t *wcval);
-+       int win_wch(WINDOW *win, cchar_t *wcval);
-+       int in_wchstr(cchar_t *wchstr);
-+       int in_wchnstr(cchar_t *wchstr, int n);
-+       int win_wchstr(WINDOW *win, cchar_t *wchstr);
-+       int win_wchnstr(WINDOW *win, cchar_t *wchstr, int n);
-+       int mvin_wchstr(int y, int x, cchar_t *wchstr);
-+       int mvin_wchnstr(int y, int x, cchar_t *wchstr, int n);
-+       int mvwin_wchstr(WINDOW *win, int y, int x, cchar_t *wchstr);
-+       int mvwin_wchnstr(WINDOW *win, int y, int x, cchar_t *wchstr, int n);
-+*/
-+
-+#include <test.priv.h>
-+
-+#if USE_WIDEC_SUPPORT
-+
-+#define BASE_Y 7
-+#define MAX_COLS 1024
-+
-+static bool
-+Quit(int ch)
-+{
-+    return (ch == ERR || ch == 'q' || ch == QUIT || ch == ESCAPE);
-+}
-+
-+static int
-+test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
-+{
-+    WINDOW *txtbox = 0;
-+    WINDOW *txtwin = 0;
-+    FILE *fp;
-+    int j;
-+    int txt_x = 0, txt_y = 0;
-+    int base_y;
-+    int limit;
-+    cchar_t ch;
-+    cchar_t text[MAX_COLS];
-+
-+    if (argv[level] == 0) {
-+	beep();
-+	return FALSE;
-+    }
-+
-+    if (level > 1) {
-+	txtbox = newwin(LINES - BASE_Y, COLS - level, BASE_Y, level);
-+	box(txtbox, 0, 0);
-+	wnoutrefresh(txtbox);
-+
-+	txtwin = derwin(txtbox,
-+			getmaxy(txtbox) - 2,
-+			getmaxx(txtbox) - 2,
-+			1, 1);
-+	base_y = 0;
-+    } else {
-+	txtwin = stdscr;
-+	base_y = BASE_Y;
-+    }
-+
-+    keypad(txtwin, TRUE);	/* enable keyboard mapping */
-+    (void) cbreak();		/* take input chars one at a time, no wait for \n */
-+    (void) noecho();		/* don't echo input */
-+
-+    txt_y = base_y;
-+    txt_x = 0;
-+    wmove(txtwin, txt_y, txt_x);
-+
-+    if ((fp = fopen(argv[level], "r")) != 0) {
-+	while ((j = fgetc(fp)) != EOF) {
-+	    if (waddch(txtwin, UChar(j)) != OK) {
-+		break;
-+	    }
-+	}
-+	fclose(fp);
-+    } else {
-+	wprintw(txtwin, "Cannot open:\n%s", argv[1]);
-+    }
-+
-+    while (!Quit(j = mvwgetch(txtwin, txt_y, txt_x))) {
-+	switch (j) {
-+	case KEY_DOWN:
-+	case 'j':
-+	    if (txt_y < getmaxy(txtwin) - 1)
-+		txt_y++;
-+	    else
-+		beep();
-+	    break;
-+	case KEY_UP:
-+	case 'k':
-+	    if (txt_y > base_y)
-+		txt_y--;
-+	    else
-+		beep();
-+	    break;
-+	case KEY_LEFT:
-+	case 'h':
-+	    if (txt_x > 0)
-+		txt_x--;
-+	    else
-+		beep();
-+	    break;
-+	case KEY_RIGHT:
-+	case 'l':
-+	    if (txt_x < getmaxx(txtwin) - 1)
-+		txt_x++;
-+	    else
-+		beep();
-+	    break;
-+	case 'w':
-+	    test_inchs(level + 1, argv, chrwin, strwin);
-+	    if (txtbox != 0) {
-+		touchwin(txtbox);
-+		wnoutrefresh(txtbox);
-+	    } else {
-+		touchwin(txtwin);
-+		wnoutrefresh(txtwin);
-+	    }
-+	    break;
-+	default:
-+	    beep();
-+	    break;
-+	}
-+
-+	mvwprintw(chrwin, 0, 0, "char:");
-+	wclrtoeol(chrwin);
-+
-+	if (txtwin != stdscr) {
-+	    wmove(txtwin, txt_y, txt_x);
-+	    if (win_wch(txtwin, &ch) != ERR) {
-+		if (wadd_wch(chrwin, &ch) != ERR) {
-+		    for (j = txt_x + 1; j < getmaxx(txtwin); ++j) {
-+			if (mvwin_wch(txtwin, txt_y, j, &ch) != ERR) {
-+			    if (wadd_wch(chrwin, &ch) == ERR) {
-+				break;
-+			    }
-+			} else {
-+			    break;
-+			}
-+		    }
-+		}
-+	    }
-+	} else {
-+	    move(txt_y, txt_x);
-+	    if (in_wch(&ch) != ERR) {
-+		if (wadd_wch(chrwin, &ch) != ERR) {
-+		    for (j = txt_x + 1; j < getmaxx(txtwin); ++j) {
-+			if (mvin_wch(txt_y, j, &ch) != ERR) {
-+			    if (wadd_wch(chrwin, &ch) == ERR) {
-+				break;
-+			    }
-+			} else {
-+			    break;
-+			}
-+		    }
-+		}
-+	    }
-+	}
-+	wnoutrefresh(chrwin);
-+
-+	mvwprintw(strwin, 0, 0, "text:");
-+	wclrtobot(strwin);
-+
-+	limit = getmaxx(strwin) - 5;
-+
-+	if (txtwin != stdscr) {
-+	    wmove(txtwin, txt_y, txt_x);
-+	    if (win_wchstr(txtwin, text) != ERR) {
-+		mvwadd_wchstr(strwin, 0, 5, text);
-+	    }
-+
-+	    wmove(txtwin, txt_y, txt_x);
-+	    if (win_wchnstr(txtwin, text, limit) != ERR) {
-+		mvwadd_wchstr(strwin, 1, 5, text);
-+	    }
-+
-+	    if (mvwin_wchstr(txtwin, txt_y, txt_x, text) != ERR) {
-+		mvwadd_wchstr(strwin, 2, 5, text);
-+	    }
-+
-+	    if (mvwin_wchnstr(txtwin, txt_y, txt_x, text, limit) != ERR) {
-+		mvwadd_wchstr(strwin, 3, 5, text);
-+	    }
-+	} else {
-+	    move(txt_y, txt_x);
-+	    if (in_wchstr(text) != ERR) {
-+		mvwadd_wchstr(strwin, 0, 5, text);
-+	    }
-+
-+	    move(txt_y, txt_x);
-+	    if (in_wchnstr(text, limit) != ERR) {
-+		mvwadd_wchstr(strwin, 1, 5, text);
-+	    }
-+
-+	    if (mvin_wchstr(txt_y, txt_x, text) != ERR) {
-+		mvwadd_wchstr(strwin, 2, 5, text);
-+	    }
-+
-+	    if (mvin_wchnstr(txt_y, txt_x, text, limit) != ERR) {
-+		mvwadd_wchstr(strwin, 3, 5, text);
-+	    }
-+	}
-+
-+	wnoutrefresh(strwin);
-+    }
-+    if (level > 1) {
-+	delwin(txtwin);
-+	delwin(txtbox);
-+    }
-+    return TRUE;
-+}
-+
-+int
-+main(int argc, char *argv[])
-+{
-+    WINDOW *chrbox;
-+    WINDOW *chrwin;
-+    WINDOW *strwin;
-+
-+    setlocale(LC_ALL, "");
-+
-+    if (argc < 2) {
-+	fprintf(stderr, "usage: %s file\n", argv[0]);
-+	return EXIT_FAILURE;
-+    }
-+
-+    initscr();
-+
-+    chrbox = derwin(stdscr, BASE_Y, COLS, 0, 0);
-+    box(chrbox, 0, 0);
-+    wnoutrefresh(chrbox);
-+
-+    chrwin = derwin(chrbox, 1, COLS - 2, 1, 1);
-+    strwin = derwin(chrbox, 4, COLS - 2, 2, 1);
-+
-+    test_inchs(1, argv, chrwin, strwin);
-+
-+    endwin();
-+    ExitProgram(EXIT_SUCCESS);
-+}
-+#else
-+int
-+main(void)
-+{
-+    printf("This program requires the wide-ncurses library\n");
-+    ExitProgram(EXIT_FAILURE);
-+}
-+#endif
-diff -Naur ncurses-5.6.orig/test/inchs.c ncurses-5.6/test/inchs.c
---- ncurses-5.6.orig/test/inchs.c	1969-12-31 19:00:00.000000000 -0500
-+++ ncurses-5.6/test/inchs.c	2008-06-18 06:49:44.000000000 -0400
-@@ -0,0 +1,272 @@
-+/****************************************************************************
-+ * Copyright (c) 2007 Free Software Foundation, Inc.                        *
-+ *                                                                          *
-+ * Permission is hereby granted, free of charge, to any person obtaining a  *
-+ * copy of this software and associated documentation files (the            *
-+ * "Software"), to deal in the Software without restriction, including      *
-+ * without limitation the rights to use, copy, modify, merge, publish,      *
-+ * distribute, distribute with modifications, sublicense, and/or sell       *
-+ * copies of the Software, and to permit persons to whom the Software is    *
-+ * furnished to do so, subject to the following conditions:                 *
-+ *                                                                          *
-+ * The above copyright notice and this permission notice shall be included  *
-+ * in all copies or substantial portions of the Software.                   *
-+ *                                                                          *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-+ *                                                                          *
-+ * Except as contained in this notice, the name(s) of the above copyright   *
-+ * holders shall not be used in advertising or otherwise to promote the     *
-+ * sale, use or other dealings in this Software without prior written       *
-+ * authorization.                                                           *
-+ ****************************************************************************/
-+/*
-+ * $Id: inchs.c,v 1.9 2007/07/21 19:01:43 tom Exp $
-+ *
-+ * Author: Thomas E Dickey
-+ */
-+/*
-+       chtype inch(void);
-+       chtype winch(WINDOW *win);
-+       chtype mvinch(int y, int x);
-+       chtype mvwinch(WINDOW *win, int y, int x);
-+       int inchstr(chtype *chstr);
-+       int inchnstr(chtype *chstr, int n);
-+       int winchstr(WINDOW *win, chtype *chstr);
-+       int winchnstr(WINDOW *win, chtype *chstr, int n);
-+       int mvinchstr(int y, int x, chtype *chstr);
-+       int mvinchnstr(int y, int x, chtype *chstr, int n);
-+       int mvwinchstr(WINDOW *win, int y, int x, chtype *chstr);
-+       int mvwinchnstr(WINDOW *win, int y, int x, chtype *chstr, int n);
-+*/
-+
-+#include <test.priv.h>
-+
-+#define BASE_Y 7
-+#define MAX_COLS 1024
-+
-+static bool
-+Quit(int ch)
-+{
-+    return (ch == ERR || ch == 'q' || ch == QUIT || ch == ESCAPE);
-+}
-+
-+static int
-+test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
-+{
-+    WINDOW *txtbox = 0;
-+    WINDOW *txtwin = 0;
-+    FILE *fp;
-+    int ch, j;
-+    int txt_x = 0, txt_y = 0;
-+    int base_y;
-+    int limit;
-+    chtype text[MAX_COLS];
-+
-+    if (argv[level] == 0) {
-+	beep();
-+	return FALSE;
-+    }
-+
-+    if (level > 1) {
-+	txtbox = newwin(LINES - BASE_Y, COLS - level, BASE_Y, level);
-+	box(txtbox, 0, 0);
-+	wnoutrefresh(txtbox);
-+
-+	txtwin = derwin(txtbox,
-+			getmaxy(txtbox) - 2,
-+			getmaxx(txtbox) - 2,
-+			1, 1);
-+	base_y = 0;
-+    } else {
-+	txtwin = stdscr;
-+	base_y = BASE_Y;
-+    }
-+
-+    keypad(txtwin, TRUE);	/* enable keyboard mapping */
-+    (void) cbreak();		/* take input chars one at a time, no wait for \n */
-+    (void) noecho();		/* don't echo input */
-+
-+    txt_y = base_y;
-+    txt_x = 0;
-+    wmove(txtwin, txt_y, txt_x);
-+
-+    if ((fp = fopen(argv[level], "r")) != 0) {
-+	while ((j = fgetc(fp)) != EOF) {
-+	    if (waddch(txtwin, UChar(j)) != OK) {
-+		break;
-+	    }
-+	}
-+	fclose(fp);
-+    } else {
-+	wprintw(txtwin, "Cannot open:\n%s", argv[1]);
-+    }
-+
-+    while (!Quit(j = mvwgetch(txtwin, txt_y, txt_x))) {
-+	switch (j) {
-+	case KEY_DOWN:
-+	case 'j':
-+	    if (txt_y < getmaxy(txtwin) - 1)
-+		txt_y++;
-+	    else
-+		beep();
-+	    break;
-+	case KEY_UP:
-+	case 'k':
-+	    if (txt_y > base_y)
-+		txt_y--;
-+	    else
-+		beep();
-+	    break;
-+	case KEY_LEFT:
-+	case 'h':
-+	    if (txt_x > 0)
-+		txt_x--;
-+	    else
-+		beep();
-+	    break;
-+	case KEY_RIGHT:
-+	case 'l':
-+	    if (txt_x < getmaxx(txtwin) - 1)
-+		txt_x++;
-+	    else
-+		beep();
-+	    break;
-+	case 'w':
-+	    test_inchs(level + 1, argv, chrwin, strwin);
-+	    if (txtbox != 0) {
-+		touchwin(txtbox);
-+		wnoutrefresh(txtbox);
-+	    } else {
-+		touchwin(txtwin);
-+		wnoutrefresh(txtwin);
-+	    }
-+	    break;
-+	default:
-+	    beep();
-+	    break;
-+	}
-+
-+	mvwprintw(chrwin, 0, 0, "char:");
-+	wclrtoeol(chrwin);
-+
-+	if (txtwin != stdscr) {
-+	    wmove(txtwin, txt_y, txt_x);
-+
-+	    if ((ch = winch(txtwin)) != ERR) {
-+		if (waddch(chrwin, (chtype) ch) != ERR) {
-+		    for (j = txt_x + 1; j < getmaxx(txtwin); ++j) {
-+			if ((ch = mvwinch(txtwin, txt_y, j)) != ERR) {
-+			    if (waddch(chrwin, (chtype) ch) == ERR) {
-+				break;
-+			    }
-+			} else {
-+			    break;
-+			}
-+		    }
-+		}
-+	    }
-+	} else {
-+	    move(txt_y, txt_x);
-+
-+	    if ((ch = inch()) != ERR) {
-+		if (waddch(chrwin, (chtype) ch) != ERR) {
-+		    for (j = txt_x + 1; j < getmaxx(txtwin); ++j) {
-+			if ((ch = mvinch(txt_y, j)) != ERR) {
-+			    if (waddch(chrwin, (chtype) ch) == ERR) {
-+				break;
-+			    }
-+			} else {
-+			    break;
-+			}
-+		    }
-+		}
-+	    }
-+	}
-+	wnoutrefresh(chrwin);
-+
-+	mvwprintw(strwin, 0, 0, "text:");
-+	wclrtobot(strwin);
-+
-+	limit = getmaxx(strwin) - 5;
-+
-+	if (txtwin != stdscr) {
-+	    wmove(txtwin, txt_y, txt_x);
-+	    if (winchstr(txtwin, text) != ERR) {
-+		mvwaddchstr(strwin, 0, 5, text);
-+	    }
-+
-+	    wmove(txtwin, txt_y, txt_x);
-+	    if (winchnstr(txtwin, text, limit) != ERR) {
-+		mvwaddchstr(strwin, 1, 5, text);
-+	    }
-+
-+	    if (mvwinchstr(txtwin, txt_y, txt_x, text) != ERR) {
-+		mvwaddchstr(strwin, 2, 5, text);
-+	    }
-+
-+	    if (mvwinchnstr(txtwin, txt_y, txt_x, text, limit) != ERR) {
-+		mvwaddchstr(strwin, 3, 5, text);
-+	    }
-+	} else {
-+	    move(txt_y, txt_x);
-+	    if (inchstr(text) != ERR) {
-+		mvwaddchstr(strwin, 0, 5, text);
-+	    }
-+
-+	    move(txt_y, txt_x);
-+	    if (inchnstr(text, limit) != ERR) {
-+		mvwaddchstr(strwin, 1, 5, text);
-+	    }
-+
-+	    if (mvinchstr(txt_y, txt_x, text) != ERR) {
-+		mvwaddchstr(strwin, 2, 5, text);
-+	    }
-+
-+	    if (mvinchnstr(txt_y, txt_x, text, limit) != ERR) {
-+		mvwaddchstr(strwin, 3, 5, text);
-+	    }
-+	}
-+
-+	wnoutrefresh(strwin);
-+    }
-+    if (level > 1) {
-+	delwin(txtwin);
-+	delwin(txtbox);
-+    }
-+    return TRUE;
-+}
-+
-+int
-+main(int argc, char *argv[])
-+{
-+    WINDOW *chrbox;
-+    WINDOW *chrwin;
-+    WINDOW *strwin;
-+
-+    setlocale(LC_ALL, "");
-+
-+    if (argc < 2) {
-+	fprintf(stderr, "usage: %s file\n", argv[0]);
-+	return EXIT_FAILURE;
-+    }
-+
-+    initscr();
-+
-+    chrbox = derwin(stdscr, BASE_Y, COLS, 0, 0);
-+    box(chrbox, 0, 0);
-+    wnoutrefresh(chrbox);
-+
-+    chrwin = derwin(chrbox, 1, COLS - 2, 1, 1);
-+    strwin = derwin(chrbox, 4, COLS - 2, 2, 1);
-+
-+    test_inchs(1, argv, chrwin, strwin);
-+
-+    endwin();
-+    ExitProgram(EXIT_SUCCESS);
-+}
-diff -Naur ncurses-5.6.orig/test/ins_wide.c ncurses-5.6/test/ins_wide.c
---- ncurses-5.6.orig/test/ins_wide.c	2006-04-01 14:08:03.000000000 -0500
-+++ ncurses-5.6/test/ins_wide.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2002-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2002-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
-  * authorization.                                                           *
-  ****************************************************************************/
- /*
-- * $Id: ins_wide.c,v 1.7 2006/04/01 19:08:03 tom Exp $
-+ * $Id: ins_wide.c,v 1.9 2007/07/21 17:41:55 tom Exp $
-  *
-  * Demonstrate the wins_wstr() and wins_wch functions.
-  * Thomas Dickey - 2002/11/23
-@@ -55,7 +55,7 @@
- #define WInsNStr   wins_nwstr
- #define WInsStr    wins_wstr
- 
--#define TABSIZE 8
-+#define MY_TABSIZE 8
- 
- typedef enum {
-     oDefault = 0,
-@@ -123,7 +123,7 @@
- 		--result;
- 	    break;
- 	case '\t':
--	    result += (TABSIZE - (result % TABSIZE));
-+	    result += (MY_TABSIZE - (result % MY_TABSIZE));
- 	    break;
- 	case '\177':
- 	    result += 2;
-@@ -225,7 +225,7 @@
-     WINDOW *look = 0;
-     WINDOW *work = 0;
-     WINDOW *show = 0;
--    int margin = (2 * TABSIZE) - 1;
-+    int margin = (2 * MY_TABSIZE) - 1;
-     Options option = ((m_opt ? oMove : oDefault)
- 		      | ((w_opt || (level > 0)) ? oWindow : oDefault));
- 
-@@ -255,7 +255,7 @@
-     }
-     keypad(work, TRUE);
- 
--    for (col = margin + 1; col < COLS; col += TABSIZE)
-+    for (col = margin + 1; col < COLS; col += MY_TABSIZE)
- 	mvwvline(work, row, col, '.', limit - 2);
- 
-     mvwvline(work, row, margin, ACS_VLINE, limit - 2);
-@@ -490,7 +490,7 @@
- 
-     setlocale(LC_ALL, "");
- 
--    while ((ch = getopt(argc, argv, "mn:w")) != EOF) {
-+    while ((ch = getopt(argc, argv, "mn:w")) != -1) {
- 	switch (ch) {
- 	case 'm':
- 	    m_opt = TRUE;
-diff -Naur ncurses-5.6.orig/test/inserts.c ncurses-5.6/test/inserts.c
---- ncurses-5.6.orig/test/inserts.c	2006-10-14 16:43:46.000000000 -0400
-+++ ncurses-5.6/test/inserts.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2002-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2002-2006,2007 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
-  * authorization.                                                           *
-  ****************************************************************************/
- /*
-- * $Id: inserts.c,v 1.15 2006/10/14 20:43:46 tom Exp $
-+ * $Id: inserts.c,v 1.18 2007/07/21 17:41:55 tom Exp $
-  *
-  * Demonstrate the winsstr() and winsch functions.
-  * Thomas Dickey - 2002/10/19
-@@ -50,7 +50,7 @@
- #define MvWInsCh   mvwinsch
- #define WInsCh     winsch
- 
--#define TABSIZE 8
-+#define MY_TABSIZE 8
- 
- typedef enum {
-     oDefault = 0,
-@@ -116,7 +116,7 @@
- 		--result;
- 	    break;
- 	case '\t':
--	    result += (TABSIZE - (result % TABSIZE));
-+	    result += (MY_TABSIZE - (result % MY_TABSIZE));
- 	    break;
- 	case '\177':
- 	    result += 2;
-@@ -147,7 +147,7 @@
-     WINDOW *look = 0;
-     WINDOW *work = 0;
-     WINDOW *show = 0;
--    int margin = (2 * TABSIZE) - 1;
-+    int margin = (2 * MY_TABSIZE) - 1;
-     Options option = (Options) ((unsigned) (m_opt
- 					    ? oMove
- 					    : oDefault)
-@@ -181,7 +181,7 @@
-     }
-     keypad(work, TRUE);
- 
--    for (col = margin + 1; col < COLS; col += TABSIZE)
-+    for (col = margin + 1; col < COLS; col += MY_TABSIZE)
- 	mvwvline(work, row, col, '.', limit - 2);
- 
-     mvwvline(work, row, margin, ACS_VLINE, limit - 2);
-@@ -405,7 +405,7 @@
- 
-     setlocale(LC_ALL, "");
- 
--    while ((ch = getopt(argc, argv, "mn:w")) != EOF) {
-+    while ((ch = getopt(argc, argv, "mn:w")) != -1) {
- 	switch (ch) {
- 	case 'm':
- 	    m_opt = TRUE;
-diff -Naur ncurses-5.6.orig/test/key_names.c ncurses-5.6/test/key_names.c
---- ncurses-5.6.orig/test/key_names.c	1969-12-31 19:00:00.000000000 -0500
-+++ ncurses-5.6/test/key_names.c	2008-06-18 06:49:47.000000000 -0400
-@@ -0,0 +1,56 @@
-+/****************************************************************************
-+ * Copyright (c) 2007,2008 Free Software Foundation, Inc.                   *
-+ *                                                                          *
-+ * Permission is hereby granted, free of charge, to any person obtaining a  *
-+ * copy of this software and associated documentation files (the            *
-+ * "Software"), to deal in the Software without restriction, including      *
-+ * without limitation the rights to use, copy, modify, merge, publish,      *
-+ * distribute, distribute with modifications, sublicense, and/or sell       *
-+ * copies of the Software, and to permit persons to whom the Software is    *
-+ * furnished to do so, subject to the following conditions:                 *
-+ *                                                                          *
-+ * The above copyright notice and this permission notice shall be included  *
-+ * in all copies or substantial portions of the Software.                   *
-+ *                                                                          *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-+ *                                                                          *
-+ * Except as contained in this notice, the name(s) of the above copyright   *
-+ * holders shall not be used in advertising or otherwise to promote the     *
-+ * sale, use or other dealings in this Software without prior written       *
-+ * authorization.                                                           *
-+ ****************************************************************************/
-+/*
-+ * $Id: key_names.c,v 1.3 2008/02/09 18:09:18 tom Exp $
-+ */
-+
-+#include <test.priv.h>
-+
-+#if USE_WIDEC_SUPPORT
-+
-+int
-+main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
-+{
-+    int n;
-+
-+    setlocale(LC_ALL, "");
-+    for (n = KEY_MIN; n < KEY_MAX + 512; n++) {
-+	const char *result = key_name(n);
-+	if (result != 0)
-+	    printf("%d(%5o):%s\n", n, n, result);
-+    }
-+    ExitProgram(EXIT_SUCCESS);
-+}
-+#else
-+int
-+main(void)
-+{
-+    printf("This program requires the wide-ncurses library\n");
-+    ExitProgram(EXIT_FAILURE);
-+}
-+#endif
-diff -Naur ncurses-5.6.orig/test/mk-test.awk ncurses-5.6/test/mk-test.awk
---- ncurses-5.6.orig/test/mk-test.awk	2006-10-21 18:56:50.000000000 -0400
-+++ ncurses-5.6/test/mk-test.awk	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
--# $Id: mk-test.awk,v 1.4 2006/10/21 22:56:50 tom Exp $
-+# $Id: mk-test.awk,v 1.5 2007/01/20 21:28:47 tom Exp $
- ##############################################################################
--# Copyright (c) 2006 Free Software Foundation, Inc.                          #
-+# Copyright (c) 2006,2007 Free Software Foundation, Inc.                     #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -34,7 +34,13 @@
- 		first = 1;
- 		count = 0;
- 	}
--!/^#/	{
-+/^#/	{
-+		next;
-+	}
-+/^$/	{
-+		next;
-+	}
-+	{
- 		if (first) {
- 			print "# generated by mk-test.awk\n";
- 			first = 0;
-diff -Naur ncurses-5.6.orig/test/modules ncurses-5.6/test/modules
---- ncurses-5.6.orig/test/modules	2006-11-04 13:56:08.000000000 -0500
-+++ ncurses-5.6/test/modules	2008-06-18 06:49:44.000000000 -0400
-@@ -1,7 +1,6 @@
--# Test-Program modules
--# $Id: modules,v 1.28 2006/11/04 18:56:08 tom Exp $
-+# $Id: modules,v 1.36 2007/08/18 17:57:08 tom Exp $
- ##############################################################################
--# Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.                #
-+# Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.                #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -28,8 +27,9 @@
- # authorization.                                                             #
- ##############################################################################
- #
--# Author: Thomas E. Dickey 1997-on
-+# Author: Thomas E. Dickey	1997-on
- #
-+# Test-Program modules
- 
- @ base
- background	progs		$(srcdir)	$(HEADER_DEPS)
-@@ -40,13 +40,14 @@
- color_set	progs		$(srcdir)	$(HEADER_DEPS)
- demo_altkeys	progs		$(srcdir)	$(HEADER_DEPS)
- demo_defkey	progs		$(srcdir)	$(HEADER_DEPS)
--demo_keyok	progs		$(srcdir)	$(HEADER_DEPS)
- demo_forms	progs		$(srcdir)	$(HEADER_DEPS)	../include/form.h $(srcdir)/edit_field.h
-+demo_keyok	progs		$(srcdir)	$(HEADER_DEPS)
- demo_menus	progs		$(srcdir)	$(HEADER_DEPS)	../include/menu.h
- demo_panels	progs		$(srcdir)	$(HEADER_DEPS)	../include/panel.h
- demo_termcap	progs		$(srcdir)	$(HEADER_DEPS)
- ditto		progs		$(srcdir)	$(HEADER_DEPS)
- dots		progs		$(srcdir)	$(HEADER_DEPS)
-+dots_mvcur	progs		$(srcdir)	$(HEADER_DEPS)
- echochar	progs		$(srcdir)	$(HEADER_DEPS)
- edit_field	progs		$(srcdir)	$(HEADER_DEPS)	$(srcdir)/edit_field.h
- filter		progs		$(srcdir)	$(HEADER_DEPS)	../include/form.h
-@@ -56,22 +57,33 @@
- gdc		progs		$(srcdir)	$(HEADER_DEPS)
- hanoi		progs		$(srcdir)	$(HEADER_DEPS)
- hashtest	progs		$(srcdir)	$(HEADER_DEPS)
-+inch_wide	progs		$(srcdir)	$(HEADER_DEPS)
-+inchs		progs		$(srcdir)	$(HEADER_DEPS)
- ins_wide	progs		$(srcdir)	$(HEADER_DEPS)
- inserts		progs		$(srcdir)	$(HEADER_DEPS)
-+key_names	progs		$(srcdir)	$(HEADER_DEPS)
- keynames	progs		$(srcdir)	$(HEADER_DEPS)
- knight		progs		$(srcdir)	$(HEADER_DEPS)
- lrtest		progs		$(srcdir)	$(HEADER_DEPS)
--ncurses		progs		$(srcdir)	$(HEADER_DEPS)	../include/panel.h ../include/menu.h ../include/form.h
- movewindow	progs		$(srcdir)	$(HEADER_DEPS)
-+ncurses		progs		$(srcdir)	$(HEADER_DEPS)	../include/panel.h ../include/menu.h ../include/form.h
- newdemo		progs		$(srcdir)	$(HEADER_DEPS)
- railroad	progs		$(srcdir)	$(HEADER_DEPS)
- rain		progs		$(srcdir)	$(HEADER_DEPS)
- redraw		progs		$(srcdir)	$(HEADER_DEPS)
- savescreen	progs		$(srcdir)	$(HEADER_DEPS)
- tclock		progs		$(srcdir)	$(HEADER_DEPS)
-+test_arrays	progs		$(srcdir)	$(HEADER_DEPS)
-+test_get_wstr	progs		$(srcdir)	$(HEADER_DEPS)
-+test_getstr	progs		$(srcdir)	$(HEADER_DEPS)
-+test_instr	progs		$(srcdir)	$(HEADER_DEPS)
-+test_inwstr	progs		$(srcdir)	$(HEADER_DEPS)
-+test_opaque	progs		$(srcdir)	$(HEADER_DEPS)
- testaddch	progs		$(srcdir)	$(HEADER_DEPS)
- testcurs	progs		$(srcdir)	$(HEADER_DEPS)
- testscanw	progs		$(srcdir)	$(HEADER_DEPS)
- view		progs		$(srcdir)	$(HEADER_DEPS)
- worm		progs		$(srcdir)	$(HEADER_DEPS)
- xmas		progs		$(srcdir)	$(HEADER_DEPS)
-+
-+# vile:makemode
-diff -Naur ncurses-5.6.orig/test/movewindow.c ncurses-5.6/test/movewindow.c
---- ncurses-5.6.orig/test/movewindow.c	2006-06-17 13:43:22.000000000 -0400
-+++ ncurses-5.6/test/movewindow.c	2008-06-18 06:49:49.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2006 Free Software Foundation, Inc.                        *
-+ * Copyright (c) 2006-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
-  * authorization.                                                           *
-  ****************************************************************************/
- /*
-- * $Id: movewindow.c,v 1.19 2006/06/17 17:43:22 tom Exp $
-+ * $Id: movewindow.c,v 1.22 2008/04/12 22:01:41 tom Exp $
-  *
-  * Demonstrate move functions for windows and derived windows from the curses
-  * library.
-@@ -47,6 +47,12 @@
- #undef derwin
- #endif
- 
-+#ifdef NCURSES_VERSION
-+#define CONST_FMT const
-+#else
-+#define CONST_FMT		/* nothing */
-+#endif
-+
- #undef LINE_MAX
- 
- #define LINE_MIN	2
-@@ -63,14 +69,14 @@
-     WINDOW *child;		/* the actual value */
- } FRAME;
- 
--static void head_line(char *fmt,...) GCC_PRINTFLIKE(1, 2);
--static void tail_line(char *fmt,...) GCC_PRINTFLIKE(1, 2);
-+static void head_line(CONST_FMT char *fmt,...) GCC_PRINTFLIKE(1, 2);
-+static void tail_line(CONST_FMT char *fmt,...) GCC_PRINTFLIKE(1, 2);
- 
- static unsigned num_windows;
- static FRAME *all_windows;
- 
- static void
--message(int lineno, char *fmt, va_list argp)
-+message(int lineno, CONST_FMT char *fmt, va_list argp)
- {
-     int y, x;
- 
-@@ -93,7 +99,7 @@
- }
- 
- static void
--head_line(char *fmt,...)
-+head_line(CONST_FMT char *fmt,...)
- {
-     va_list argp;
- 
-@@ -103,7 +109,7 @@
- }
- 
- static void
--tail_line(char *fmt,...)
-+tail_line(CONST_FMT char *fmt,...)
- {
-     va_list argp;
- 
-@@ -245,7 +251,7 @@
- 
-     keypad(child, TRUE);
-     if (need > have) {
--	all_windows = (FRAME *) realloc(all_windows, need * sizeof(FRAME));
-+	all_windows = typeRealloc(FRAME, need, all_windows);
-     }
-     all_windows[num_windows].parent = parent;
-     all_windows[num_windows].child = child;
-@@ -511,7 +517,7 @@
-     /* *INDENT-OFF* */
-     static struct {
- 	int	key;
--	char *	msg;
-+	CONST_FMT char * msg;
-     } help[] = {
- 	{ '?',		"Show this screen" },
- 	{ 'b',		"Draw a box inside the current window" },
-diff -Naur ncurses-5.6.orig/test/ncurses.c ncurses-5.6/test/ncurses.c
---- ncurses-5.6.orig/test/ncurses.c	2006-12-09 19:13:15.000000000 -0500
-+++ ncurses-5.6/test/ncurses.c	2008-06-18 06:49:49.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -40,7 +40,7 @@
-    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
-            Thomas E. Dickey (beginning revision 1.27 in 1996).
- 
--$Id: ncurses.c,v 1.280 2006/12/10 00:13:15 tom Exp $
-+$Id: ncurses.c,v 1.313 2008/04/12 22:04:42 tom Exp $
- 
- ***************************************************************************/
- 
-@@ -76,7 +76,7 @@
- #define NCURSES_CONST_PARAM const void
- 
- #ifdef TRACE
--static unsigned save_trace = TRACE_ORDINARY | TRACE_CALLS;
-+static unsigned save_trace = TRACE_ORDINARY | TRACE_ICALLS | TRACE_CALLS;
- extern unsigned _nc_tracing;
- #endif
- 
-@@ -118,6 +118,8 @@
- 
- #endif
- 
-+#define ToggleAcs(temp,real) temp = ((temp == real) ? 0 : real)
-+
- #define P(string)	printw("%s\n", string)
- 
- #define BLANK		' '	/* this is the background character */
-@@ -170,7 +172,7 @@
- {
-     return ((c) == QUIT || (c) == ESCAPE);
- }
--#define case_QUIT	case QUIT: case ESCAPE
-+#define case_QUIT	QUIT: case ESCAPE
- 
- /* Common function to allow ^T to toggle trace-mode in the middle of a test
-  * so that trace-files can be made smaller.
-@@ -183,14 +185,14 @@
-     while ((c = wgetch(win)) == CTRL('T')) {
- 	if (_nc_tracing) {
- 	    save_trace = _nc_tracing;
--	    _tracef("TOGGLE-TRACING OFF");
-+	    Trace(("TOGGLE-TRACING OFF"));
- 	    _nc_tracing = 0;
- 	} else {
- 	    _nc_tracing = save_trace;
- 	}
- 	trace(_nc_tracing);
- 	if (_nc_tracing)
--	    _tracef("TOGGLE-TRACING ON");
-+	    Trace(("TOGGLE-TRACING ON"));
-     }
- #else
-     c = wgetch(win);
-@@ -268,6 +270,42 @@
- }
- 
- #if USE_WIDEC_SUPPORT
-+static wchar_t
-+fullwidth_of(int ch)
-+{
-+    return (ch + 0xff10 - '0');
-+}
-+
-+static void
-+make_fullwidth_text(wchar_t *target, const char *source)
-+{
-+    int ch;
-+    while ((ch = *source++) != 0) {
-+	*target++ = fullwidth_of(ch);
-+    }
-+    *target = 0;
-+}
-+
-+static void
-+make_narrow_text(wchar_t *target, const char *source)
-+{
-+    int ch;
-+    while ((ch = *source++) != 0) {
-+	*target++ = ch;
-+    }
-+    *target = 0;
-+}
-+
-+static void
-+make_fullwidth_digit(cchar_t *target, int digit)
-+{
-+    wchar_t source[2];
-+
-+    source[0] = fullwidth_of(digit + '0');
-+    source[1] = 0;
-+    setcchar(target, source, A_NORMAL, 0, 0);
-+}
-+
- static int
- wGet_wchar(WINDOW *win, wint_t *result)
- {
-@@ -276,14 +314,14 @@
-     while ((c = wget_wch(win, result)) == CTRL('T')) {
- 	if (_nc_tracing) {
- 	    save_trace = _nc_tracing;
--	    _tracef("TOGGLE-TRACING OFF");
-+	    Trace(("TOGGLE-TRACING OFF"));
- 	    _nc_tracing = 0;
- 	} else {
- 	    _nc_tracing = save_trace;
- 	}
- 	trace(_nc_tracing);
- 	if (_nc_tracing)
--	    _tracef("TOGGLE-TRACING ON");
-+	    Trace(("TOGGLE-TRACING ON"));
-     }
- #else
-     c = wget_wch(win, result);
-@@ -599,15 +637,29 @@
- 
-     if (winstack == 0) {
- 	len_winstack = 20;
--	winstack = (WINSTACK *) malloc(len_winstack * sizeof(WINSTACK));
-+	winstack = typeMalloc(WINSTACK, len_winstack);
-     } else if (need >= len_winstack) {
- 	len_winstack = need;
--	winstack = (WINSTACK *) realloc(winstack, len_winstack * sizeof(WINSTACK));
-+	winstack = typeRealloc(WINSTACK, len_winstack, winstack);
-     }
-     winstack[level].text = txt_win;
-     winstack[level].frame = box_win;
- }
- 
-+#if USE_SOFTKEYS && (NCURSES_VERSION_PATCH < 20071229) && NCURSES_EXT_FUNCS
-+static void
-+slk_repaint(void)
-+{
-+    /* this chunk is now done in resize_term() */
-+    slk_touch();
-+    slk_clear();
-+    slk_noutrefresh();
-+}
-+
-+#else
-+#define slk_repaint()		/* nothing */
-+#endif
-+
- /*
-  * For wgetch_test(), we create pairs of windows - one for a box, one for text.
-  * Resize both and paint the box in the parent.
-@@ -623,12 +675,7 @@
-     touchwin(stdscr);
-     wnoutrefresh(stdscr);
- 
--#if USE_SOFTKEYS
--    /* FIXME: this chunk should be done in resizeterm() */
--    slk_touch();
--    slk_clear();
--    slk_noutrefresh();
--#endif
-+    slk_repaint();
- 
-     for (n = 0; n < level; ++n) {
- 	wresize(winstack[n].frame, high, wide);
-@@ -829,6 +876,8 @@
- getch_test(void)
- {
-     int delay = begin_getch_test();
-+
-+    slk_restore();
-     wgetch_test(0, stdscr, delay);
-     forget_boxes();
-     finish_getch_test();
-@@ -836,10 +885,10 @@
- 
- #if USE_WIDEC_SUPPORT
- /*
-- * For wgetch_test(), we create pairs of windows - one for a box, one for text.
-+ * For wget_wch_test(), we create pairs of windows - one for a box, one for text.
-  * Resize both and paint the box in the parent.
-  */
--#ifdef KEY_RESIZE
-+#if defined(KEY_RESIZE) && HAVE_WRESIZE
- static void
- resize_wide_boxes(unsigned level, WINDOW *win)
- {
-@@ -851,12 +900,7 @@
-     touchwin(stdscr);
-     wnoutrefresh(stdscr);
- 
--#if USE_SOFTKEYS
--    /* FIXME: this chunk should be done in resizeterm() */
--    slk_touch();
--    slk_clear();
--    slk_noutrefresh();
--#endif
-+    slk_repaint();
- 
-     for (n = 0; n < level; ++n) {
- 	wresize(winstack[n].frame, high, wide);
-@@ -889,7 +933,7 @@
-     memset(&state, 0, sizeof(state));
-     if ((need = wcsrtombs(0, &tmp, 0, &state)) > 0) {
- 	unsigned have = need;
--	result = (char *) calloc(have + 1, 1);
-+	result = typeCalloc(char, have + 1);
- 	tmp = src;
- 	if (wcsrtombs(result, &tmp, have, &state) != have) {
- 	    free(result);
-@@ -955,11 +999,11 @@
- 		for (n = 0; (wchar_buf[n] = wint_buf[n]) != 0; ++n) ;
- 		if ((temp = wcstos(wchar_buf)) != 0) {
- 		    wprintw(win, "I saw %d characters:\n\t`%s'.",
--			    wcslen(wchar_buf), temp);
-+			    (int) wcslen(wchar_buf), temp);
- 		    free(temp);
- 		} else {
- 		    wprintw(win, "I saw %d characters (cannot convert).",
--			    wcslen(wchar_buf));
-+			    (int) wcslen(wchar_buf));
- 		}
- 	    }
- 	    wclrtoeol(win);
-@@ -1018,7 +1062,7 @@
- 	    } else
- #endif /* NCURSES_MOUSE_VERSION */
- 	    if (code == KEY_CODE_YES) {
--#ifdef KEY_RESIZE
-+#if defined(KEY_RESIZE) && HAVE_WRESIZE
- 		if (c == KEY_RESIZE) {
- 		    resize_wide_boxes(level, win);
- 		}
-@@ -1044,6 +1088,8 @@
- get_wch_test(void)
- {
-     int delay = begin_getch_test();
-+
-+    slk_restore();
-     wget_wch_test(0, stdscr, delay);
-     forget_boxes();
-     finish_getch_test();
-@@ -1302,7 +1348,7 @@
- }
- /* *INDENT-OFF* */
- static const struct {
--    attr_t			attr;
-+    chtype			attr;
-     NCURSES_CONST char *	name;
- } attrs_to_test[] = {
-     { A_STANDOUT,	"STANDOUT" },
-@@ -1368,7 +1414,7 @@
- 	    case '>':
- 		adjust_attr_string(1);
- 		break;
--	      case_QUIT:
-+	    case case_QUIT:
- 		result = FALSE;
- 		break;
- 	    default:
-@@ -1644,7 +1690,7 @@
- 	    case '>':
- 		wide_adjust_attr_string(1);
- 		break;
--	      case_QUIT:
-+	    case case_QUIT:
- 		result = FALSE;
- 		break;
- 	    default:
-@@ -1773,7 +1819,7 @@
- }
- 
- static void
--color_legend(WINDOW *helpwin)
-+color_legend(WINDOW *helpwin, bool wide)
- {
-     int row = 1;
-     int col = 1;
-@@ -1786,18 +1832,30 @@
-     mvwprintw(helpwin, row++, col,
- 	      "longer than one screen. Control/N and Control/P can be used");
-     mvwprintw(helpwin, row++, col,
--	      "in place up up/down arrow.  Use pageup/pagedown to scroll a");
-+	      "in place of up/down arrow.  Use pageup/pagedown to scroll a");
-     mvwprintw(helpwin, row++, col,
- 	      "full screen; control/B and control/F can be used here.");
-     ++row;
-     mvwprintw(helpwin, row++, col,
- 	      "Toggles:");
-     mvwprintw(helpwin, row++, col,
-+	      "  a/A     toggle altcharset off/on");
-+    mvwprintw(helpwin, row++, col,
- 	      "  b/B     toggle bold off/on");
-     mvwprintw(helpwin, row++, col,
- 	      "  n/N     toggle text/number on/off");
-     mvwprintw(helpwin, row++, col,
- 	      "  w/W     toggle width between 8/16 colors");
-+#if USE_WIDEC_SUPPORT
-+    if (wide) {
-+	mvwprintw(helpwin, row++, col,
-+		  "Wide characters:");
-+	mvwprintw(helpwin, row++, col,
-+		  "  x/X     toggle text between ASCII and wide-character");
-+    }
-+#else
-+    (void) wide;
-+#endif
- }
- 
- #define set_color_test(name, value) if (name != value) { name = value; base_row = 0; }
-@@ -1817,6 +1875,7 @@
-     char numbered[80];
-     const char *hello;
-     bool done = FALSE;
-+    bool opt_acsc = FALSE;
-     bool opt_bold = FALSE;
-     bool opt_wide = FALSE;
-     bool opt_nums = FALSE;
-@@ -1868,6 +1927,8 @@
- 
- 		init_pair(pair, fg, bg);
- 		attron((attr_t) COLOR_PAIR(pair));
-+		if (opt_acsc)
-+		    attron((attr_t) A_ALTCHARSET);
- 		if (opt_bold)
- 		    attron((attr_t) A_BOLD);
- 
-@@ -1888,6 +1949,12 @@
- 	}
- 
- 	switch (wGetchar(stdscr)) {
-+	case 'a':
-+	    opt_acsc = FALSE;
-+	    break;
-+	case 'A':
-+	    opt_acsc = TRUE;
-+	    break;
- 	case 'b':
- 	    opt_bold = FALSE;
- 	    break;
-@@ -1900,7 +1967,7 @@
- 	case 'N':
- 	    opt_nums = TRUE;
- 	    break;
--	  case_QUIT:
-+	case case_QUIT:
- 	    done = TRUE;
- 	    continue;
- 	case 'w':
-@@ -1951,7 +2018,7 @@
- 	case '?':
- 	    if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != 0) {
- 		box(helpwin, 0, 0);
--		color_legend(helpwin);
-+		color_legend(helpwin, FALSE);
- 		wGetchar(helpwin);
- 		delwin(helpwin);
- 	    }
-@@ -1983,9 +2050,12 @@
-     char numbered[80];
-     const char *hello;
-     bool done = FALSE;
-+    bool opt_acsc = FALSE;
-     bool opt_bold = FALSE;
-     bool opt_wide = FALSE;
-     bool opt_nums = FALSE;
-+    bool opt_xchr = FALSE;
-+    wchar_t buffer[10];
-     WINDOW *helpwin;
- 
-     while (!done) {
-@@ -2001,6 +2071,13 @@
- 	    hello = "Hello";
- 	    per_row = 8;
- 	}
-+	if (opt_xchr) {
-+	    make_fullwidth_text(buffer, hello);
-+	    width *= 2;
-+	    per_row /= 2;
-+	} else {
-+	    make_narrow_text(buffer, hello);
-+	}
- 
- 	row_limit = (pairs_max + per_row - 1) / per_row;
- 
-@@ -2028,14 +2105,20 @@
- 	    if (row >= 0 && move(row, col) != ERR) {
- 		init_pair(pair, i % COLORS, i / COLORS);
- 		color_set(pair, NULL);
-+		if (opt_acsc)
-+		    attr_on((attr_t) A_ALTCHARSET, NULL);
- 		if (opt_bold)
- 		    attr_on((attr_t) A_BOLD, NULL);
- 
- 		if (opt_nums) {
- 		    sprintf(numbered, "{%02X}", i);
--		    hello = numbered;
-+		    if (opt_xchr) {
-+			make_fullwidth_text(buffer, numbered);
-+		    } else {
-+			make_narrow_text(buffer, numbered);
-+		    }
- 		}
--		printw("%-*.*s", width, width, hello);
-+		addnwstr(buffer, width);
- 		attr_set(A_NORMAL, 0, NULL);
- 
- 		if ((i % per_row) == 0 && (i % COLORS) == 0) {
-@@ -2048,6 +2131,12 @@
- 	}
- 
- 	switch (c = wGetchar(stdscr)) {
-+	case 'a':
-+	    opt_acsc = FALSE;
-+	    break;
-+	case 'A':
-+	    opt_acsc = TRUE;
-+	    break;
- 	case 'b':
- 	    opt_bold = FALSE;
- 	    break;
-@@ -2060,7 +2149,7 @@
- 	case 'N':
- 	    opt_nums = TRUE;
- 	    break;
--	  case_QUIT:
-+	case case_QUIT:
- 	    done = TRUE;
- 	    continue;
- 	case 'w':
-@@ -2069,6 +2158,12 @@
- 	case 'W':
- 	    set_color_test(opt_wide, TRUE);
- 	    break;
-+	case 'x':
-+	    opt_xchr = FALSE;
-+	    break;
-+	case 'X':
-+	    opt_xchr = TRUE;
-+	    break;
- 	case CTRL('p'):
- 	case KEY_UP:
- 	    if (base_row <= 0) {
-@@ -2111,7 +2206,7 @@
- 	case '?':
- 	    if ((helpwin = newwin(LINES - 1, COLS - 2, 0, 0)) != 0) {
- 		box(helpwin, 0, 0);
--		color_legend(helpwin);
-+		color_legend(helpwin, TRUE);
- 		wGetchar(helpwin);
- 		delwin(helpwin);
- 	    }
-@@ -2328,7 +2423,7 @@
- 	    refresh();
- 	    break;
- 
--	  case_QUIT:
-+	case case_QUIT:
- 	    break;
- 
- 	default:
-@@ -2498,7 +2593,7 @@
- 	    clrtobot();
- 	    break;
- 
--	  case_QUIT:
-+	case case_QUIT:
- 	    goto done;
- 
- #if HAVE_SLK_COLOR
-@@ -2515,12 +2610,16 @@
- 	    }
- 	    break;
- #endif
-+#if defined(NCURSES_VERSION) && defined(KEY_RESIZE) && HAVE_WRESIZE
-+	case KEY_RESIZE:
-+	    wnoutrefresh(stdscr);
-+	    break;
-+#endif
- 
- 	default:
- 	    beep();
- 	}
--    } while
--	((c = Getchar()) != EOF);
-+    } while (!isQuit(c = Getchar()));
- 
-   done:
-     slk_clear();
-@@ -2627,7 +2726,7 @@
- 	    clrtobot();
- 	    break;
- 
--	  case_QUIT:
-+	case case_QUIT:
- 	    goto done;
- 
- 	case 'F':
-@@ -2642,12 +2741,15 @@
- 		call_slk_color(fg, bg);
- 	    }
- 	    break;
--
-+#if defined(NCURSES_VERSION) && defined(KEY_RESIZE) && HAVE_WRESIZE
-+	case KEY_RESIZE:
-+	    wnoutrefresh(stdscr);
-+	    break;
-+#endif
- 	default:
- 	    beep();
- 	}
--    } while
--	((c = Getchar()) != EOF);
-+    } while (!isQuit(c = Getchar()));
- 
-   done:
-     slk_clear();
-@@ -2662,12 +2764,89 @@
-  * Alternate character-set stuff
-  *
-  ****************************************************************************/
-+/* *INDENT-OFF* */
-+static struct {
-+    chtype attr;
-+    const char *name;
-+} attrs_to_cycle[] = {
-+    { A_NORMAL,		"normal" },
-+    { A_BOLD,		"bold" },
-+    { A_REVERSE,	"reverse" },
-+    { A_UNDERLINE,	"underline" },
-+};
-+/* *INDENT-ON* */
-+
-+static bool
-+cycle_attr(int ch, unsigned *at_code, chtype *attr)
-+{
-+    bool result = TRUE;
-+
-+    switch (ch) {
-+    case 'v':
-+	if ((*at_code += 1) >= SIZEOF(attrs_to_cycle))
-+	    *at_code = 0;
-+	break;
-+    case 'V':
-+	if (*at_code == 1)
-+	    *at_code = SIZEOF(attrs_to_cycle) - 1;
-+	else
-+	    *at_code -= 1;
-+	break;
-+    default:
-+	result = FALSE;
-+	break;
-+    }
-+    if (result)
-+	*attr = attrs_to_cycle[*at_code].attr;
-+    return result;
-+}
-+
-+static bool
-+cycle_colors(int ch, int *fg, int *bg, short *pair)
-+{
-+    bool result = FALSE;
-+
-+    if (use_colors) {
-+	result = TRUE;
-+	switch (ch) {
-+	case 'F':
-+	    if ((*fg -= 1) < 0)
-+		*fg = COLORS - 1;
-+	    break;
-+	case 'f':
-+	    if ((*fg += 1) >= COLORS)
-+		*fg = 0;
-+	    break;
-+	case 'B':
-+	    if ((*bg -= 1) < 0)
-+		*bg = COLORS - 1;
-+	    break;
-+	case 'b':
-+	    if ((*bg += 1) >= COLORS)
-+		*bg = 0;
-+	    break;
-+	default:
-+	    result = FALSE;
-+	    break;
-+	}
-+	if (result) {
-+	    *pair = (*fg != COLOR_BLACK || *bg != COLOR_BLACK);
-+	    if (*pair != 0) {
-+		*pair = 1;
-+		if (init_pair(*pair, *fg, *bg) == ERR) {
-+		    result = FALSE;
-+		}
-+	    }
-+	}
-+    }
-+    return result;
-+}
- 
- /* ISO 6429:  codes 0x80 to 0x9f may be control characters that cause the
-  * terminal to perform functions.  The remaining codes can be graphic.
-  */
- static void
--show_upper_chars(unsigned first)
-+show_upper_chars(unsigned first, int repeat, attr_t attr, short pair)
- {
-     bool C1 = (first == 128);
-     unsigned code;
-@@ -2682,27 +2861,33 @@
-     refresh();
- 
-     for (code = first; code <= last; code++) {
-+	int count = repeat;
- 	int row = 2 + ((code - first) % 16);
- 	int col = ((code - first) / 16) * COLS / 2;
- 	char tmp[80];
- 	sprintf(tmp, "%3u (0x%x)", code, code);
- 	mvprintw(row, col, "%*s: ", COLS / 4, tmp);
--	if (C1)
--	    nodelay(stdscr, TRUE);
--	echochar(code);
--	if (C1) {
--	    /* (yes, this _is_ crude) */
--	    while ((reply = Getchar()) != ERR) {
--		addch(UChar(reply));
--		napms(10);
-+
-+	do {
-+	    if (C1)
-+		nodelay(stdscr, TRUE);
-+	    echochar(code | attr | COLOR_PAIR(pair));
-+	    if (C1) {
-+		/* (yes, this _is_ crude) */
-+		while ((reply = Getchar()) != ERR) {
-+		    addch(UChar(reply));
-+		    napms(10);
-+		}
-+		nodelay(stdscr, FALSE);
- 	    }
--	    nodelay(stdscr, FALSE);
--	}
-+	} while (--count > 0);
-     }
- }
- 
-+#define PC_COLS 4
-+
- static void
--show_pc_chars(void)
-+show_pc_chars(int repeat, attr_t attr, short pair)
- {
-     unsigned code;
- 
-@@ -2713,35 +2898,41 @@
-     refresh();
- 
-     for (code = 0; code < 16; ++code) {
--	mvprintw(2, (int) code * 3 + 8, "%X", code);
-+	mvprintw(2, (int) code * PC_COLS + 8, "%X", code);
-     }
-     for (code = 0; code < 256; code++) {
-+	int count = repeat;
- 	int row = 3 + (code / 16) + (code >= 128);
--	int col = 8 + (code % 16) * 3;
-+	int col = 8 + (code % 16) * PC_COLS;
- 	if ((code % 16) == 0)
- 	    mvprintw(row, 0, "0x%02x:", code);
- 	move(row, col);
--	switch (code) {
--	case '\n':
--	case '\r':
--	case '\b':
--	case '\f':
--	case '\033':
--	case 0x9b:
--	    /*
--	     * Skip the ones that do not work.
--	     */
--	    break;
--	default:
--	    addch(code | A_ALTCHARSET);
--	    break;
--	}
-+	do {
-+	    switch (code) {
-+	    case '\n':
-+	    case '\r':
-+	    case '\b':
-+	    case '\f':
-+	    case '\033':
-+	    case 0x9b:
-+		/*
-+		 * Skip the ones that do not work.
-+		 */
-+		break;
-+	    default:
-+		addch(code | A_ALTCHARSET | attr | COLOR_PAIR(pair));
-+		break;
-+	    }
-+	} while (--count > 0);
-     }
- }
- 
- static void
--show_box_chars(void)
-+show_box_chars(int repeat, attr_t attr, short pair)
- {
-+    (void) repeat;
-+    attr |= COLOR_PAIR(pair);
-+
-     erase();
-     attron(A_BOLD);
-     mvaddstr(0, 20, "Display of the ACS Line-Drawing Set");
-@@ -2749,35 +2940,38 @@
-     refresh();
-     box(stdscr, 0, 0);
-     /* *INDENT-OFF* */
--    mvhline(LINES / 2, 0,        ACS_HLINE, COLS);
--    mvvline(0,         COLS / 2, ACS_VLINE, LINES);
--    mvaddch(0,         COLS / 2, ACS_TTEE);
--    mvaddch(LINES / 2, COLS / 2, ACS_PLUS);
--    mvaddch(LINES - 1, COLS / 2, ACS_BTEE);
--    mvaddch(LINES / 2, 0,        ACS_LTEE);
--    mvaddch(LINES / 2, COLS - 1, ACS_RTEE);
-+    mvhline(LINES / 2, 0,        ACS_HLINE | attr, COLS);
-+    mvvline(0,         COLS / 2, ACS_VLINE | attr, LINES);
-+    mvaddch(0,         COLS / 2, ACS_TTEE | attr);
-+    mvaddch(LINES / 2, COLS / 2, ACS_PLUS | attr);
-+    mvaddch(LINES - 1, COLS / 2, ACS_BTEE | attr);
-+    mvaddch(LINES / 2, 0,        ACS_LTEE | attr);
-+    mvaddch(LINES / 2, COLS - 1, ACS_RTEE | attr);
-     /* *INDENT-ON* */
- 
- }
- 
- static int
--show_1_acs(int n, const char *name, chtype code)
-+show_1_acs(int n, int repeat, const char *name, chtype code)
- {
-     const int height = 16;
-     int row = 2 + (n % height);
-     int col = (n / height) * COLS / 2;
-+
-     mvprintw(row, col, "%*s : ", COLS / 4, name);
--    addch(code);
-+    do {
-+	addch(code);
-+    } while (--repeat > 0);
-     return n + 1;
- }
- 
- static void
--show_acs_chars(void)
-+show_acs_chars(int repeat, attr_t attr, short pair)
- /* display the ACS character set */
- {
-     int n;
- 
--#define BOTH(name) #name, name
-+#define BOTH(name) #name, (name | attr | COLOR_PAIR(pair))
- 
-     erase();
-     attron(A_BOLD);
-@@ -2785,48 +2979,48 @@
-     attroff(A_BOLD);
-     refresh();
- 
--    n = show_1_acs(0, BOTH(ACS_ULCORNER));
--    n = show_1_acs(n, BOTH(ACS_URCORNER));
--    n = show_1_acs(n, BOTH(ACS_LLCORNER));
--    n = show_1_acs(n, BOTH(ACS_LRCORNER));
--
--    n = show_1_acs(n, BOTH(ACS_LTEE));
--    n = show_1_acs(n, BOTH(ACS_RTEE));
--    n = show_1_acs(n, BOTH(ACS_TTEE));
--    n = show_1_acs(n, BOTH(ACS_BTEE));
-+    n = show_1_acs(0, repeat, BOTH(ACS_ULCORNER));
-+    n = show_1_acs(n, repeat, BOTH(ACS_URCORNER));
-+    n = show_1_acs(n, repeat, BOTH(ACS_LLCORNER));
-+    n = show_1_acs(n, repeat, BOTH(ACS_LRCORNER));
-+
-+    n = show_1_acs(n, repeat, BOTH(ACS_LTEE));
-+    n = show_1_acs(n, repeat, BOTH(ACS_RTEE));
-+    n = show_1_acs(n, repeat, BOTH(ACS_TTEE));
-+    n = show_1_acs(n, repeat, BOTH(ACS_BTEE));
- 
--    n = show_1_acs(n, BOTH(ACS_HLINE));
--    n = show_1_acs(n, BOTH(ACS_VLINE));
-+    n = show_1_acs(n, repeat, BOTH(ACS_HLINE));
-+    n = show_1_acs(n, repeat, BOTH(ACS_VLINE));
- 
-     /*
-      * HPUX's ACS definitions are broken here.  Just give up.
-      */
- #if !(defined(__hpux) && !defined(NCURSES_VERSION))
--    n = show_1_acs(n, BOTH(ACS_LARROW));
--    n = show_1_acs(n, BOTH(ACS_RARROW));
--    n = show_1_acs(n, BOTH(ACS_UARROW));
--    n = show_1_acs(n, BOTH(ACS_DARROW));
--
--    n = show_1_acs(n, BOTH(ACS_BLOCK));
--    n = show_1_acs(n, BOTH(ACS_BOARD));
--    n = show_1_acs(n, BOTH(ACS_LANTERN));
--    n = show_1_acs(n, BOTH(ACS_BULLET));
--    n = show_1_acs(n, BOTH(ACS_CKBOARD));
--    n = show_1_acs(n, BOTH(ACS_DEGREE));
--    n = show_1_acs(n, BOTH(ACS_DIAMOND));
--    n = show_1_acs(n, BOTH(ACS_PLMINUS));
--    n = show_1_acs(n, BOTH(ACS_PLUS));
--
--    n = show_1_acs(n, BOTH(ACS_GEQUAL));
--    n = show_1_acs(n, BOTH(ACS_NEQUAL));
--    n = show_1_acs(n, BOTH(ACS_LEQUAL));
--
--    n = show_1_acs(n, BOTH(ACS_STERLING));
--    n = show_1_acs(n, BOTH(ACS_PI));
--    n = show_1_acs(n, BOTH(ACS_S1));
--    n = show_1_acs(n, BOTH(ACS_S3));
--    n = show_1_acs(n, BOTH(ACS_S7));
--    n = show_1_acs(n, BOTH(ACS_S9));
-+    n = show_1_acs(n, repeat, BOTH(ACS_LARROW));
-+    n = show_1_acs(n, repeat, BOTH(ACS_RARROW));
-+    n = show_1_acs(n, repeat, BOTH(ACS_UARROW));
-+    n = show_1_acs(n, repeat, BOTH(ACS_DARROW));
-+
-+    n = show_1_acs(n, repeat, BOTH(ACS_BLOCK));
-+    n = show_1_acs(n, repeat, BOTH(ACS_BOARD));
-+    n = show_1_acs(n, repeat, BOTH(ACS_LANTERN));
-+    n = show_1_acs(n, repeat, BOTH(ACS_BULLET));
-+    n = show_1_acs(n, repeat, BOTH(ACS_CKBOARD));
-+    n = show_1_acs(n, repeat, BOTH(ACS_DEGREE));
-+    n = show_1_acs(n, repeat, BOTH(ACS_DIAMOND));
-+    n = show_1_acs(n, repeat, BOTH(ACS_PLMINUS));
-+    n = show_1_acs(n, repeat, BOTH(ACS_PLUS));
-+
-+    n = show_1_acs(n, repeat, BOTH(ACS_GEQUAL));
-+    n = show_1_acs(n, repeat, BOTH(ACS_NEQUAL));
-+    n = show_1_acs(n, repeat, BOTH(ACS_LEQUAL));
-+
-+    n = show_1_acs(n, repeat, BOTH(ACS_STERLING));
-+    n = show_1_acs(n, repeat, BOTH(ACS_PI));
-+    n = show_1_acs(n, repeat, BOTH(ACS_S1));
-+    n = show_1_acs(n, repeat, BOTH(ACS_S3));
-+    n = show_1_acs(n, repeat, BOTH(ACS_S7));
-+    n = show_1_acs(n, repeat, BOTH(ACS_S9));
- #endif
- }
- 
-@@ -2838,6 +3032,14 @@
-     const char *pch_kludge = ((term != 0 && strstr(term, "linux"))
- 			      ? "p=PC, "
- 			      : "");
-+    chtype attr = A_NORMAL;
-+    int digit = 0;
-+    int repeat = 1;
-+    int fg = COLOR_BLACK;
-+    int bg = COLOR_BLACK;
-+    unsigned at_code = 0;
-+    short pair = 0;
-+    void (*last_show_acs) (int, attr_t, short) = 0;
- 
-     do {
- 	switch (c) {
-@@ -2845,29 +3047,77 @@
- 	    Repaint();
- 	    break;
- 	case 'a':
--	    show_acs_chars();
-+	    ToggleAcs(last_show_acs, show_acs_chars);
-+	    break;
-+	case 'p':
-+	    if (*pch_kludge)
-+		ToggleAcs(last_show_acs, show_pc_chars);
-+	    else
-+		beep();
- 	    break;
- 	case 'x':
--	    show_box_chars();
-+	    ToggleAcs(last_show_acs, show_box_chars);
- 	    break;
- 	case '0':
- 	case '1':
- 	case '2':
- 	case '3':
--	    show_upper_chars((unsigned) ((c - '0') * 32 + 128));
-+	    digit = (c - '0');
-+	    last_show_acs = 0;
- 	    break;
--	case 'p':
--	    show_pc_chars();
-+	case '-':
-+	    if (digit > 0) {
-+		--digit;
-+		last_show_acs = 0;
-+	    } else {
-+		beep();
-+	    }
-+	    break;
-+	case '+':
-+	    if (digit < 3) {
-+		++digit;
-+		last_show_acs = 0;
-+	    } else {
-+		beep();
-+	    }
-+	    break;
-+	case '>':
-+	    if (repeat < (COLS / 4))
-+		++repeat;
-+	    break;
-+	case '<':
-+	    if (repeat > 1)
-+		--repeat;
- 	    break;
- 	default:
--	    beep();
-+	    if (cycle_attr(c, &at_code, &attr)
-+		|| cycle_colors(c, &fg, &bg, &pair)) {
-+		break;
-+	    } else {
-+		beep();
-+	    }
- 	    break;
- 	}
-+	if (last_show_acs != 0)
-+	    last_show_acs(repeat, attr, pair);
-+	else
-+	    show_upper_chars(digit * 32 + 128, repeat, attr, pair);
-+
- 	mvprintw(LINES - 3, 0,
- 		 "Note: ANSI terminals may not display C1 characters.");
- 	mvprintw(LINES - 2, 0,
--		 "Select: a=ACS, x=box, %s0=C1, 1,2,3=GR characters, ESC=quit",
-+		 "Select: a=ACS, x=box, %s0=C1, 1-3,+/- non-ASCII, </> repeat, ESC=quit",
- 		 pch_kludge);
-+	if (use_colors) {
-+	    mvprintw(LINES - 1, 0,
-+		     "v/V, f/F, b/B cycle through video attributes (%s) and color %d/%d.",
-+		     attrs_to_cycle[at_code].name,
-+		     fg, bg);
-+	} else {
-+	    mvprintw(LINES - 1, 0,
-+		     "v/V cycles through video attributes (%s).",
-+		     attrs_to_cycle[at_code].name);
-+	}
- 	refresh();
-     } while (!isQuit(c = Getchar()));
- 
-@@ -2878,7 +3128,7 @@
- 
- #if USE_WIDEC_SUPPORT
- static cchar_t *
--merge_wide_attr(cchar_t *dst, cchar_t *src, attr_t attr, short pair)
-+merge_wide_attr(cchar_t *dst, const cchar_t *src, attr_t attr, short pair)
- {
-     int count = getcchar(src, NULL, NULL, NULL, 0);
-     wchar_t *wch = 0;
-@@ -2887,7 +3137,7 @@
- 
-     *dst = *src;
-     if (count > 0) {
--	if ((wch = typeMalloc(wchar_t, count)) != 0) {
-+	if ((wch = typeMalloc(wchar_t, count + 1)) != 0) {
- 	    if (getcchar(src, wch, &ignore_attr, &ignore_pair, 0) != ERR) {
- 		attr |= (ignore_attr & A_ALTCHARSET);
- 		setcchar(dst, wch, attr, pair, 0);
-@@ -2950,20 +3200,23 @@
- }
- 
- static int
--show_1_wacs(int n, const char *name, const cchar_t *code)
-+show_1_wacs(int n, int repeat, const char *name, const cchar_t *code)
- {
-     const int height = 16;
-     int row = 2 + (n % height);
-     int col = (n / height) * COLS / 2;
-+
-     mvprintw(row, col, "%*s : ", COLS / 4, name);
--    add_wchnstr(code, 1);
-+    while (repeat-- >= 0) {
-+	add_wch(code);
-+    }
-     return n + 1;
- }
- 
- #define MERGE_ATTR(wch) merge_wide_attr(&temp, wch, attr, pair)
- 
- static void
--show_wacs_chars(attr_t attr, short pair)
-+show_wacs_chars(int repeat, attr_t attr, short pair)
- /* display the wide-ACS character set */
- {
-     cchar_t temp;
-@@ -2979,45 +3232,45 @@
-     attroff(A_BOLD);
-     refresh();
- 
--    n = show_1_wacs(0, BOTH2(WACS_ULCORNER));
--    n = show_1_wacs(n, BOTH2(WACS_URCORNER));
--    n = show_1_wacs(n, BOTH2(WACS_LLCORNER));
--    n = show_1_wacs(n, BOTH2(WACS_LRCORNER));
--
--    n = show_1_wacs(n, BOTH2(WACS_LTEE));
--    n = show_1_wacs(n, BOTH2(WACS_RTEE));
--    n = show_1_wacs(n, BOTH2(WACS_TTEE));
--    n = show_1_wacs(n, BOTH2(WACS_BTEE));
--
--    n = show_1_wacs(n, BOTH2(WACS_HLINE));
--    n = show_1_wacs(n, BOTH2(WACS_VLINE));
--
--    n = show_1_wacs(n, BOTH2(WACS_LARROW));
--    n = show_1_wacs(n, BOTH2(WACS_RARROW));
--    n = show_1_wacs(n, BOTH2(WACS_UARROW));
--    n = show_1_wacs(n, BOTH2(WACS_DARROW));
--
--    n = show_1_wacs(n, BOTH2(WACS_BLOCK));
--    n = show_1_wacs(n, BOTH2(WACS_BOARD));
--    n = show_1_wacs(n, BOTH2(WACS_LANTERN));
--    n = show_1_wacs(n, BOTH2(WACS_BULLET));
--    n = show_1_wacs(n, BOTH2(WACS_CKBOARD));
--    n = show_1_wacs(n, BOTH2(WACS_DEGREE));
--    n = show_1_wacs(n, BOTH2(WACS_DIAMOND));
--    n = show_1_wacs(n, BOTH2(WACS_PLMINUS));
--    n = show_1_wacs(n, BOTH2(WACS_PLUS));
-+    n = show_1_wacs(0, repeat, BOTH2(WACS_ULCORNER));
-+    n = show_1_wacs(n, repeat, BOTH2(WACS_URCORNER));
-+    n = show_1_wacs(n, repeat, BOTH2(WACS_LLCORNER));
-+    n = show_1_wacs(n, repeat, BOTH2(WACS_LRCORNER));
-+
-+    n = show_1_wacs(n, repeat, BOTH2(WACS_LTEE));
-+    n = show_1_wacs(n, repeat, BOTH2(WACS_RTEE));
-+    n = show_1_wacs(n, repeat, BOTH2(WACS_TTEE));
-+    n = show_1_wacs(n, repeat, BOTH2(WACS_BTEE));
-+
-+    n = show_1_wacs(n, repeat, BOTH2(WACS_HLINE));
-+    n = show_1_wacs(n, repeat, BOTH2(WACS_VLINE));
-+
-+    n = show_1_wacs(n, repeat, BOTH2(WACS_LARROW));
-+    n = show_1_wacs(n, repeat, BOTH2(WACS_RARROW));
-+    n = show_1_wacs(n, repeat, BOTH2(WACS_UARROW));
-+    n = show_1_wacs(n, repeat, BOTH2(WACS_DARROW));
-+
-+    n = show_1_wacs(n, repeat, BOTH2(WACS_BLOCK));
-+    n = show_1_wacs(n, repeat, BOTH2(WACS_BOARD));
-+    n = show_1_wacs(n, repeat, BOTH2(WACS_LANTERN));
-+    n = show_1_wacs(n, repeat, BOTH2(WACS_BULLET));
-+    n = show_1_wacs(n, repeat, BOTH2(WACS_CKBOARD));
-+    n = show_1_wacs(n, repeat, BOTH2(WACS_DEGREE));
-+    n = show_1_wacs(n, repeat, BOTH2(WACS_DIAMOND));
-+    n = show_1_wacs(n, repeat, BOTH2(WACS_PLMINUS));
-+    n = show_1_wacs(n, repeat, BOTH2(WACS_PLUS));
- 
- #ifdef CURSES_WACS_ARRAY
--    n = show_1_wacs(n, BOTH2(WACS_GEQUAL));
--    n = show_1_wacs(n, BOTH2(WACS_NEQUAL));
--    n = show_1_wacs(n, BOTH2(WACS_LEQUAL));
--
--    n = show_1_wacs(n, BOTH2(WACS_STERLING));
--    n = show_1_wacs(n, BOTH2(WACS_PI));
--    n = show_1_wacs(n, BOTH2(WACS_S1));
--    n = show_1_wacs(n, BOTH2(WACS_S3));
--    n = show_1_wacs(n, BOTH2(WACS_S7));
--    n = show_1_wacs(n, BOTH2(WACS_S9));
-+    n = show_1_wacs(n, repeat, BOTH2(WACS_GEQUAL));
-+    n = show_1_wacs(n, repeat, BOTH2(WACS_NEQUAL));
-+    n = show_1_wacs(n, repeat, BOTH2(WACS_LEQUAL));
-+
-+    n = show_1_wacs(n, repeat, BOTH2(WACS_STERLING));
-+    n = show_1_wacs(n, repeat, BOTH2(WACS_PI));
-+    n = show_1_wacs(n, repeat, BOTH2(WACS_S1));
-+    n = show_1_wacs(n, repeat, BOTH2(WACS_S3));
-+    n = show_1_wacs(n, repeat, BOTH2(WACS_S7));
-+    n = show_1_wacs(n, repeat, BOTH2(WACS_S9));
- #endif
- }
- 
-@@ -3026,10 +3279,11 @@
- #define MERGE_ATTR(wch) merge_wide_attr(&temp, wch, attr, pair)
- 
- static void
--show_wbox_chars(attr_t attr, short pair)
-+show_wbox_chars(int repeat, attr_t attr, short pair)
- {
-     cchar_t temp;
- 
-+    (void) repeat;
-     erase();
-     attron(A_BOLD);
-     mvaddstr(0, 20, "Display of the Wide-ACS Line-Drawing Set");
-@@ -3071,10 +3325,11 @@
- #define SHOW_UTF8(n, name, code) show_2_wacs(n, name, code, attr, pair)
- 
- static void
--show_utf8_chars(attr_t attr, short pair)
-+show_utf8_chars(int repeat, attr_t attr, short pair)
- {
-     int n;
- 
-+    (void) repeat;
-     erase();
-     attron(A_BOLD);
-     mvaddstr(0, 20, "Display of the Wide-ACS Character Set");
-@@ -3121,83 +3376,6 @@
-     /* *INDENT-ON* */
- 
- }
--/* *INDENT-OFF* */
--static struct {
--    attr_t attr;
--    char *name;
--} attrs_to_cycle[] = {
--    { A_NORMAL,		"normal" },
--    { A_BOLD,		"bold" },
--    { A_REVERSE,	"reverse" },
--    { A_UNDERLINE,	"underline" },
--};
--/* *INDENT-ON* */
--
--static bool
--cycle_attr(int ch, unsigned *at_code, chtype *attr)
--{
--    bool result = TRUE;
--
--    switch (ch) {
--    case 'v':
--	if ((*at_code += 1) >= SIZEOF(attrs_to_cycle))
--	    *at_code = 0;
--	break;
--    case 'V':
--	if (*at_code == 1)
--	    *at_code = SIZEOF(attrs_to_cycle) - 1;
--	else
--	    *at_code -= 1;
--	break;
--    default:
--	result = FALSE;
--	break;
--    }
--    if (result)
--	*attr = attrs_to_cycle[*at_code].attr;
--    return result;
--}
--
--static bool
--cycle_colors(int ch, int *fg, int *bg, short *pair)
--{
--    bool result = FALSE;
--
--    if (use_colors) {
--	result = TRUE;
--	switch (ch) {
--	case 'F':
--	    if ((*fg -= 1) < 0)
--		*fg = COLORS - 1;
--	    break;
--	case 'f':
--	    if ((*fg += 1) >= COLORS)
--		*fg = 0;
--	    break;
--	case 'B':
--	    if ((*bg -= 1) < 0)
--		*bg = COLORS - 1;
--	    break;
--	case 'b':
--	    if ((*bg += 1) < 0)
--		*bg = 0;
--	    break;
--	default:
--	    result = FALSE;
--	    break;
--	}
--	if (result) {
--	    *pair = (*fg != COLOR_BLACK || *bg != COLOR_BLACK);
--	    if (*pair != 0) {
--		*pair = 1;
--		if (init_pair(*pair, *fg, *bg) == ERR) {
--		    result = FALSE;
--		}
--	    }
--	}
--    }
--    return result;
--}
- 
- /* display the wide-ACS character set */
- static void
-@@ -3205,14 +3383,14 @@
- {
-     int c = 'a';
-     int digit = 0;
--    int repeat = 0;
-+    int repeat = 1;
-     int space = ' ';
-     chtype attr = A_NORMAL;
-     int fg = COLOR_BLACK;
-     int bg = COLOR_BLACK;
-     unsigned at_code = 0;
-     short pair = 0;
--    void (*last_show_wacs) (attr_t, short) = 0;
-+    void (*last_show_wacs) (int, attr_t, short) = 0;
- 
-     do {
- 	switch (c) {
-@@ -3220,27 +3398,31 @@
- 	    Repaint();
- 	    break;
- 	case 'a':
--	    last_show_wacs = show_wacs_chars;
-+	    ToggleAcs(last_show_wacs, show_wacs_chars);
- 	    break;
- 	case 'x':
--	    last_show_wacs = show_wbox_chars;
-+	    ToggleAcs(last_show_wacs, show_wbox_chars);
- 	    break;
- 	case 'u':
--	    last_show_wacs = show_utf8_chars;
-+	    ToggleAcs(last_show_wacs, show_utf8_chars);
- 	    break;
- 	default:
- 	    if (c < 256 && isdigit(c)) {
- 		digit = (c - '0');
-+		last_show_wacs = 0;
- 	    } else if (c == '+') {
- 		++digit;
-+		last_show_wacs = 0;
- 	    } else if (c == '-' && digit > 0) {
- 		--digit;
-+		last_show_wacs = 0;
- 	    } else if (c == '>' && repeat < (COLS / 4)) {
- 		++repeat;
--	    } else if (c == '<' && repeat > 0) {
-+	    } else if (c == '<' && repeat > 1) {
- 		--repeat;
- 	    } else if (c == '_') {
- 		space = (space == ' ') ? '_' : ' ';
-+		last_show_wacs = 0;
- 	    } else if (cycle_attr(c, &at_code, &attr)
- 		       || cycle_colors(c, &fg, &bg, &pair)) {
- 		if (last_show_wacs != 0)
-@@ -3249,12 +3431,12 @@
- 		beep();
- 		break;
- 	    }
--	    last_show_wacs = 0;
--	    show_upper_widechars(digit * 32 + 128, repeat, space, attr, pair);
- 	    break;
- 	}
- 	if (last_show_wacs != 0)
--	    last_show_wacs(attr, pair);
-+	    last_show_wacs(repeat, attr, pair);
-+	else
-+	    show_upper_widechars(digit * 32 + 128, repeat, space, attr, pair);
- 
- 	mvprintw(LINES - 3, 0,
- 		 "Select: a WACS, x box, u UTF-8, 0-9,+/- non-ASCII, </> repeat, ESC=quit");
-@@ -3379,12 +3561,17 @@
-     WINDOW *wind;
- };
- 
--#ifdef NCURSES_VERSION
--#define keypad_active(win) (win)->_use_keypad
--#define scroll_active(win) (win)->_scroll
-+#if defined(NCURSES_VERSION)
-+#if (NCURSES_VERSION_PATCH < 20070331) && NCURSES_EXT_FUNCS
-+#define is_keypad(win)   (win)->_use_keypad
-+#define is_scrollok(win) (win)->_scroll
-+#elif !defined(is_keypad)
-+#define is_keypad(win)   FALSE
-+#define is_scrollok(win) FALSE
-+#endif
- #else
--#define keypad_active(win) FALSE
--#define scroll_active(win) FALSE
-+#define is_keypad(win)   FALSE
-+#define is_scrollok(win) FALSE
- #endif
- 
- /* We need to know if these flags are actually set, so don't look in FRAME.
-@@ -3395,14 +3582,16 @@
- HaveKeypad(FRAME * curp)
- {
-     WINDOW *win = (curp ? curp->wind : stdscr);
--    return keypad_active(win);
-+    (void) win;
-+    return is_keypad(win);
- }
- 
- static bool
- HaveScroll(FRAME * curp)
- {
-     WINDOW *win = (curp ? curp->wind : stdscr);
--    return scroll_active(win);
-+    (void) win;
-+    return is_scrollok(win);
- }
- 
- static void
-@@ -3540,7 +3729,7 @@
- 	case KEY_RIGHT:
- 	    j++;
- 	    break;
--	  case_QUIT:
-+	case case_QUIT:
- 	    return ((pair *) 0);
- #ifdef NCURSES_MOUSE_VERSION
- 	case KEY_MOUSE:
-@@ -3665,7 +3854,7 @@
- acs_and_scroll(void)
- /* Demonstrate windows */
- {
--    int c, i;
-+    int c;
-     FRAME *current = (FRAME *) 0, *neww;
-     WINDOW *usescr = stdscr;
- #if HAVE_PUTWIN && HAVE_GETWIN
-@@ -3683,7 +3872,7 @@
- 	transient((FRAME *) 0, (char *) 0);
- 	switch (c) {
- 	case CTRL('C'):
--	    neww = (FRAME *) calloc(1, sizeof(FRAME));
-+	    neww = typeCalloc(FRAME, 1);
- 	    if ((neww->wind = getwindow()) == (WINDOW *) 0)
- 		goto breakout;
- 
-@@ -3759,7 +3948,7 @@
- 	    if ((fp = fopen(DUMPFILE, "r")) == (FILE *) 0) {
- 		transient(current, "Can't open screen dump file");
- 	    } else {
--		neww = (FRAME *) calloc(1, sizeof(FRAME));
-+		neww = typeCalloc(FRAME, 1);
- 
- 		neww->next = current->next;
- 		neww->last = current;
-@@ -3778,7 +3967,7 @@
- 	case CTRL('X'):	/* resize window */
- 	    if (current) {
- 		pair *tmp, ul, lr;
--		int mx, my;
-+		int i, mx, my;
- 
- 		move(0, 0);
- 		clrtoeol();
-@@ -3945,7 +4134,11 @@
- {
-     wmove(stdscr, LINES - 1, 0);
-     wclrtoeol(stdscr);
--    waddstr(stdscr, text);
-+    if (text != 0 && *text != '\0') {
-+	waddstr(stdscr, text);
-+	waddstr(stdscr, "; ");
-+    }
-+    waddstr(stdscr, "press any key to continue");
- }				/* end of saywhat */
- 
- /*+-------------------------------------------------------------------------
-@@ -3998,6 +4191,17 @@
- 	fill_panel(win)
- --------------------------------------------------------------------------*/
- static void
-+init_panel(void)
-+{
-+    register int y, x;
-+
-+    for (y = 0; y < LINES - 1; y++) {
-+	for (x = 0; x < COLS; x++)
-+	    wprintw(stdscr, "%d", (y + x) % 10);
-+    }
-+}
-+
-+static void
- fill_panel(PANEL * pan)
- {
-     WINDOW *win = panel_window(pan);
-@@ -4014,217 +4218,204 @@
- 	    waddch(win, UChar(num));
- 	}
-     }
--}				/* end of fill_panel */
-+}
- 
-+#if USE_WIDEC_SUPPORT
- static void
--demo_panels(void)
-+init_wide_panel(void)
- {
--    int itmp;
--    register int y, x;
-+    int digit;
-+    cchar_t temp[10];
- 
--    refresh();
-+    for (digit = 0; digit < 10; ++digit)
-+	make_fullwidth_digit(&temp[digit], digit);
- 
--    for (y = 0; y < LINES - 1; y++) {
--	for (x = 0; x < COLS; x++)
--	    wprintw(stdscr, "%d", (y + x) % 10);
--    }
--    for (y = 0; y < 5; y++) {
--	PANEL *p1;
--	PANEL *p2;
--	PANEL *p3;
--	PANEL *p4;
--	PANEL *p5;
--
--	p1 = mkpanel(COLOR_RED,
--		     LINES / 2 - 2,
--		     COLS / 8 + 1,
--		     0,
--		     0);
--	set_panel_userptr(p1, (NCURSES_CONST void *) "p1");
--
--	p2 = mkpanel(COLOR_GREEN,
--		     LINES / 2 + 1,
--		     COLS / 7,
--		     LINES / 4,
--		     COLS / 10);
--	set_panel_userptr(p2, (NCURSES_CONST void *) "p2");
--
--	p3 = mkpanel(COLOR_YELLOW,
--		     LINES / 4,
--		     COLS / 10,
--		     LINES / 2,
--		     COLS / 9);
--	set_panel_userptr(p3, (NCURSES_CONST void *) "p3");
--
--	p4 = mkpanel(COLOR_BLUE,
--		     LINES / 2 - 2,
--		     COLS / 8,
--		     LINES / 2 - 2,
--		     COLS / 3);
--	set_panel_userptr(p4, (NCURSES_CONST void *) "p4");
--
--	p5 = mkpanel(COLOR_MAGENTA,
--		     LINES / 2 - 2,
--		     COLS / 8,
--		     LINES / 2,
--		     COLS / 2 - 2);
--	set_panel_userptr(p5, (NCURSES_CONST void *) "p5");
--
--	fill_panel(p1);
--	fill_panel(p2);
--	fill_panel(p3);
--	fill_panel(p4);
--	fill_panel(p5);
--	hide_panel(p4);
--	hide_panel(p5);
--	pflush();
--	saywhat("press any key to continue");
--	wait_a_while(nap_msec);
-+    do {
-+	int y, x;
-+	getyx(stdscr, y, x);
-+	digit = (y + x / 2) % 10;
-+    } while (add_wch(&temp[digit]) != ERR);
-+}
- 
--	saywhat("h3 s1 s2 s4 s5; press any key to continue");
--	move_panel(p1, 0, 0);
--	hide_panel(p3);
--	show_panel(p1);
--	show_panel(p2);
--	show_panel(p4);
--	show_panel(p5);
--	pflush();
--	wait_a_while(nap_msec);
-+static void
-+fill_wide_panel(PANEL * pan)
-+{
-+    WINDOW *win = panel_window(pan);
-+    int num = ((const char *) panel_userptr(pan))[1];
-+    int y, x;
- 
--	saywhat("s1; press any key to continue");
--	show_panel(p1);
--	pflush();
--	wait_a_while(nap_msec);
-+    wmove(win, 1, 1);
-+    wprintw(win, "-pan%c-", num);
-+    wclrtoeol(win);
-+    box(win, 0, 0);
-+    for (y = 2; y < getmaxy(win) - 1; y++) {
-+	for (x = 1; x < getmaxx(win) - 1; x++) {
-+	    wmove(win, y, x);
-+	    waddch(win, UChar(num));
-+	}
-+    }
-+}
-+#endif
- 
--	saywhat("s2; press any key to continue");
--	show_panel(p2);
--	pflush();
--	wait_a_while(nap_msec);
-+#define MAX_PANELS 5
- 
--	saywhat("m2; press any key to continue");
--	move_panel(p2, LINES / 3 + 1, COLS / 8);
--	pflush();
--	wait_a_while(nap_msec);
-+static void
-+canned_panel(PANEL * px[MAX_PANELS + 1], NCURSES_CONST char *cmd)
-+{
-+    int which = cmd[1] - '0';
- 
--	saywhat("s3;");
--	show_panel(p3);
--	pflush();
--	wait_a_while(nap_msec);
-+    saywhat(cmd);
-+    switch (*cmd) {
-+    case 'h':
-+	hide_panel(px[which]);
-+	break;
-+    case 's':
-+	show_panel(px[which]);
-+	break;
-+    case 't':
-+	top_panel(px[which]);
-+	break;
-+    case 'b':
-+	bottom_panel(px[which]);
-+	break;
-+    case 'd':
-+	rmpanel(px[which]);
-+	break;
-+    }
-+    pflush();
-+    wait_a_while(nap_msec);
-+}
- 
--	saywhat("m3; press any key to continue");
--	move_panel(p3, LINES / 4 + 1, COLS / 15);
--	pflush();
--	wait_a_while(nap_msec);
-+static void
-+demo_panels(void (*InitPanel) (void), void (*FillPanel) (PANEL *))
-+{
-+    int count;
-+    int itmp;
-+    PANEL *px[MAX_PANELS + 1];
- 
--	saywhat("b3; press any key to continue");
--	bottom_panel(p3);
--	pflush();
--	wait_a_while(nap_msec);
-+    scrollok(stdscr, FALSE);	/* we don't want stdscr to scroll! */
-+    refresh();
- 
--	saywhat("s4; press any key to continue");
--	show_panel(p4);
--	pflush();
--	wait_a_while(nap_msec);
-+    InitPanel();
-+    for (count = 0; count < 5; count++) {
-+	px[1] = mkpanel(COLOR_RED,
-+			LINES / 2 - 2,
-+			COLS / 8 + 1,
-+			0,
-+			0);
-+	set_panel_userptr(px[1], (NCURSES_CONST void *) "p1");
-+
-+	px[2] = mkpanel(COLOR_GREEN,
-+			LINES / 2 + 1,
-+			COLS / 7,
-+			LINES / 4,
-+			COLS / 10);
-+	set_panel_userptr(px[2], (NCURSES_CONST void *) "p2");
-+
-+	px[3] = mkpanel(COLOR_YELLOW,
-+			LINES / 4,
-+			COLS / 10,
-+			LINES / 2,
-+			COLS / 9);
-+	set_panel_userptr(px[3], (NCURSES_CONST void *) "p3");
-+
-+	px[4] = mkpanel(COLOR_BLUE,
-+			LINES / 2 - 2,
-+			COLS / 8,
-+			LINES / 2 - 2,
-+			COLS / 3);
-+	set_panel_userptr(px[4], (NCURSES_CONST void *) "p4");
-+
-+	px[5] = mkpanel(COLOR_MAGENTA,
-+			LINES / 2 - 2,
-+			COLS / 8,
-+			LINES / 2,
-+			COLS / 2 - 2);
-+	set_panel_userptr(px[5], (NCURSES_CONST void *) "p5");
-+
-+	FillPanel(px[1]);
-+	FillPanel(px[2]);
-+	FillPanel(px[3]);
-+	FillPanel(px[4]);
-+	FillPanel(px[5]);
- 
--	saywhat("s5; press any key to continue");
--	show_panel(p5);
-+	hide_panel(px[4]);
-+	hide_panel(px[5]);
- 	pflush();
-+	saywhat("");
- 	wait_a_while(nap_msec);
- 
--	saywhat("t3; press any key to continue");
--	top_panel(p3);
-+	saywhat("h3 s1 s2 s4 s5");
-+	move_panel(px[1], 0, 0);
-+	hide_panel(px[3]);
-+	show_panel(px[1]);
-+	show_panel(px[2]);
-+	show_panel(px[4]);
-+	show_panel(px[5]);
- 	pflush();
- 	wait_a_while(nap_msec);
- 
--	saywhat("t1; press any key to continue");
--	top_panel(p1);
--	pflush();
--	wait_a_while(nap_msec);
-+	canned_panel(px, "s1");
-+	canned_panel(px, "s2");
- 
--	saywhat("t2; press any key to continue");
--	top_panel(p2);
-+	saywhat("m2");
-+	move_panel(px[2], LINES / 3 + 1, COLS / 8);
- 	pflush();
- 	wait_a_while(nap_msec);
- 
--	saywhat("t3; press any key to continue");
--	top_panel(p3);
--	pflush();
--	wait_a_while(nap_msec);
-+	canned_panel(px, "s3");
- 
--	saywhat("t4; press any key to continue");
--	top_panel(p4);
-+	saywhat("m3");
-+	move_panel(px[3], LINES / 4 + 1, COLS / 15);
- 	pflush();
- 	wait_a_while(nap_msec);
- 
-+	canned_panel(px, "b3");
-+	canned_panel(px, "s4");
-+	canned_panel(px, "s5");
-+	canned_panel(px, "t3");
-+	canned_panel(px, "t1");
-+	canned_panel(px, "t2");
-+	canned_panel(px, "t3");
-+	canned_panel(px, "t4");
-+
- 	for (itmp = 0; itmp < 6; itmp++) {
--	    WINDOW *w4 = panel_window(p4);
--	    WINDOW *w5 = panel_window(p5);
-+	    WINDOW *w4 = panel_window(px[4]);
-+	    WINDOW *w5 = panel_window(px[5]);
- 
--	    saywhat("m4; press any key to continue");
-+	    saywhat("m4");
- 	    wmove(w4, LINES / 8, 1);
- 	    waddstr(w4, mod[itmp]);
--	    move_panel(p4, LINES / 6, itmp * (COLS / 8));
-+	    move_panel(px[4], LINES / 6, itmp * (COLS / 8));
- 	    wmove(w5, LINES / 6, 1);
- 	    waddstr(w5, mod[itmp]);
- 	    pflush();
- 	    wait_a_while(nap_msec);
- 
--	    saywhat("m5; press any key to continue");
-+	    saywhat("m5");
- 	    wmove(w4, LINES / 6, 1);
- 	    waddstr(w4, mod[itmp]);
--	    move_panel(p5, LINES / 3 - 1, (itmp * 10) + 6);
-+	    move_panel(px[5], LINES / 3 - 1, (itmp * 10) + 6);
- 	    wmove(w5, LINES / 8, 1);
- 	    waddstr(w5, mod[itmp]);
- 	    pflush();
- 	    wait_a_while(nap_msec);
- 	}
- 
--	saywhat("m4; press any key to continue");
--	move_panel(p4, LINES / 6, itmp * (COLS / 8));
-+	saywhat("m4");
-+	move_panel(px[4], LINES / 6, itmp * (COLS / 8));
- 	pflush();
- 	wait_a_while(nap_msec);
- 
--	saywhat("t5; press any key to continue");
--	top_panel(p5);
--	pflush();
--	wait_a_while(nap_msec);
--
--	saywhat("t2; press any key to continue");
--	top_panel(p2);
--	pflush();
--	wait_a_while(nap_msec);
--
--	saywhat("t1; press any key to continue");
--	top_panel(p1);
--	pflush();
--	wait_a_while(nap_msec);
--
--	saywhat("d2; press any key to continue");
--	rmpanel(p2);
--	pflush();
--	wait_a_while(nap_msec);
--
--	saywhat("h3; press any key to continue");
--	hide_panel(p3);
--	pflush();
--	wait_a_while(nap_msec);
--
--	saywhat("d1; press any key to continue");
--	rmpanel(p1);
--	pflush();
--	wait_a_while(nap_msec);
--
--	saywhat("d4; press any key to continue");
--	rmpanel(p4);
--	pflush();
--	wait_a_while(nap_msec);
--
--	saywhat("d5; press any key to continue");
--	rmpanel(p5);
--	pflush();
--
--	rmpanel(p3);
--	pflush();
-+	canned_panel(px, "t5");
-+	canned_panel(px, "t2");
-+	canned_panel(px, "t1");
-+	canned_panel(px, "d2");
-+	canned_panel(px, "h3");
-+	canned_panel(px, "d1");
-+	canned_panel(px, "d4");
-+	canned_panel(px, "d5");
-+	canned_panel(px, "d3");
- 
- 	wait_a_while(nap_msec);
- 	if (nap_msec == 1)
-@@ -4625,7 +4816,7 @@
- 		c = KEY_DC;
- 		break;
- 	    case ERR:		/* FALLTHRU */
--	      case_QUIT:
-+	    case case_QUIT:
- 		count = 0;
- 		c = KEY_EXIT;
- 		break;
-@@ -4815,7 +5006,7 @@
-     }
- }
- 
--static const char *animals[] =
-+static CONST_MENUS char *animals[] =
- {
-     "Lions",
-     "Tigers",
-@@ -4839,7 +5030,7 @@
-     MENU *m;
-     ITEM *items[SIZEOF(animals)];
-     ITEM **ip = items;
--    const char **ap;
-+    CONST_MENUS char **ap;
-     int mrows, mcols, c;
-     WINDOW *menuwin;
- 
-@@ -4934,7 +5125,7 @@
- 	size_t need = 12;
- 	for (n = 0; t_tbl[n].name != 0; n++)
- 	    need += strlen(t_tbl[n].name) + 2;
--	buf = (char *) malloc(need);
-+	buf = typeMalloc(char, need);
-     }
-     sprintf(buf, "0x%02x = {", tlevel);
-     if (tlevel == 0) {
-@@ -5045,7 +5236,7 @@
- 	if (item_value(*ip))
- 	    newtrace |= t_tbl[item_index(*ip)].mask;
-     trace(newtrace);
--    _tracef("trace level interactively set to %s", tracetrace(_nc_tracing));
-+    Trace(("trace level interactively set to %s", tracetrace(_nc_tracing)));
- 
-     (void) mvprintw(LINES - 2, 0,
- 		    "Trace level is %s\n", tracetrace(_nc_tracing));
-@@ -5389,6 +5580,10 @@
-     int finished = 0, c;
-     unsigned n = 0;
- 
-+#ifdef NCURSES_MOUSE_VERSION
-+    mousemask(ALL_MOUSE_EVENTS, (mmask_t *) 0);
-+#endif
-+
-     move(18, 0);
-     addstr("Defined edit/traversal keys:   ^Q/ESC- exit form\n");
-     addstr("^N   -- go to next field       ^P  -- go to previous field\n");
-@@ -5462,6 +5657,10 @@
-     free_fieldtype(fty_passwd);
-     noraw();
-     nl();
-+
-+#ifdef NCURSES_MOUSE_VERSION
-+    mousemask(ALL_MOUSE_EVENTS, (mmask_t *) 0);
-+#endif
- }
- #endif /* USE_LIBFORM */
- 
-@@ -5884,7 +6083,13 @@
- 
- #if USE_LIBPANEL
-     case 'o':
--	demo_panels();
-+	demo_panels(init_panel, fill_panel);
-+	break;
-+#endif
-+
-+#if USE_WIDEC_SUPPORT && USE_LIBPANEL
-+    case 'O':
-+	demo_panels(init_wide_panel, fill_wide_panel);
- 	break;
- #endif
- 
-@@ -5996,7 +6201,7 @@
-     wbkgd(win, A_REVERSE);
-     werase(win);
-     wmove(win, 0, 0);
--    wprintw(win, "footer: %d columns", cols);
-+    wprintw(win, "footer: window %p, %d columns", win, cols);
-     wnoutrefresh(win);
-     return OK;
- }
-@@ -6007,7 +6212,7 @@
-     wbkgd(win, A_REVERSE);
-     werase(win);
-     wmove(win, 0, 0);
--    wprintw(win, "header: %d columns", cols);
-+    wprintw(win, "header: window %p, %d columns", win, cols);
-     wnoutrefresh(win);
-     return OK;
- }
-@@ -6052,9 +6257,12 @@
- #endif
- #if USE_LIBPANEL
- 	(void) puts("o = exercise panels library");
-+#if USE_WIDEC_SUPPORT
-+	(void) puts("O = exercise panels with wide-characters");
-+#endif
-+#endif
- 	(void) puts("p = exercise pad features");
- 	(void) puts("q = quit");
--#endif
- #if USE_LIBFORM
- 	(void) puts("r = exercise forms code");
- #endif
-@@ -6143,7 +6351,7 @@
- 
-     setlocale(LC_ALL, "");
- 
--    while ((c = getopt(argc, argv, "a:de:fhmp:s:t:")) != EOF) {
-+    while ((c = getopt(argc, argv, "a:de:fhmp:s:t:")) != -1) {
- 	switch (c) {
- #ifdef NCURSES_VERSION
- 	case 'a':
-@@ -6246,7 +6454,7 @@
- 
- 	if (can_change_color()) {
- 	    short cp;
--	    all_colors = (RGB_DATA *) malloc(max_colors * sizeof(RGB_DATA));
-+	    all_colors = typeMalloc(RGB_DATA, max_colors);
- 	    for (cp = 0; cp < max_colors; ++cp) {
- 		color_content(cp,
- 			      &all_colors[cp].red,
-diff -Naur ncurses-5.6.orig/test/newdemo.c ncurses-5.6/test/newdemo.c
---- ncurses-5.6.orig/test/newdemo.c	2006-12-02 19:15:28.000000000 -0500
-+++ ncurses-5.6/test/newdemo.c	2008-06-18 06:49:47.000000000 -0400
-@@ -2,7 +2,7 @@
-  *  newdemo.c	-	A demo program using PDCurses. The program illustrate
-  *  	 		the use of colours for text output.
-  *
-- * $Id: newdemo.c,v 1.29 2006/12/03 00:15:28 tom Exp $
-+ * $Id: newdemo.c,v 1.30 2008/02/09 16:41:29 tom Exp $
-  */
- 
- #include <test.priv.h>
-@@ -12,7 +12,7 @@
- /*
-  *  The Australian map
-  */
--static const char *AusMap[16] =
-+static CONST_MENUS char *AusMap[16] =
- {
-     "           A           A ",
-     "    N.T. AAAAA       AAAA ",
-diff -Naur ncurses-5.6.orig/test/programs ncurses-5.6/test/programs
---- ncurses-5.6.orig/test/programs	2006-11-04 13:56:49.000000000 -0500
-+++ ncurses-5.6/test/programs	2008-06-18 06:49:44.000000000 -0400
-@@ -1,6 +1,6 @@
--# $Id: programs,v 1.5 2006/11/04 18:56:49 tom Exp $
-+# $Id: programs,v 1.13 2007/08/18 17:57:00 tom Exp $
- ##############################################################################
--# Copyright (c) 2006 Free Software Foundation, Inc.                          #
-+# Copyright (c) 2006,2007 Free Software Foundation, Inc.                     #
- #                                                                            #
- # Permission is hereby granted, free of charge, to any person obtaining a    #
- # copy of this software and associated documentation files (the "Software"), #
-@@ -45,6 +45,7 @@
- demo_termcap	$(LDFLAGS_TINFO)	$(LOCAL_LIBS)	demo_termcap
- ditto		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	ditto
- dots		$(LDFLAGS_TINFO)	$(LOCAL_LIBS)	dots
-+dots_mvcur	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	dots_mvcur
- echochar	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	echochar
- filter		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	filter
- firework	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	firework
-@@ -53,8 +54,11 @@
- gdc		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	gdc
- hanoi		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	hanoi
- hashtest	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	hashtest
-+inch_wide	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	inch_wide
-+inchs		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	inchs
- ins_wide	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	ins_wide
- inserts		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	inserts
-+key_names	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	key_names
- keynames	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	keynames
- knight		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	knight
- lrtest		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	lrtest
-@@ -66,9 +70,17 @@
- redraw		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	redraw
- savescreen	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	savescreen
- tclock		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	tclock
-+test_arrays	$(LDFLAGS_TINFO)	$(LOCAL_LIBS)	test_arrays
-+test_get_wstr	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_get_wstr
-+test_getstr	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_getstr
-+test_instr	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_instr
-+test_inwstr	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_inwstr
-+test_opaque	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	test_opaque
- testaddch	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	testaddch
- testcurs	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	testcurs
- testscanw	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	testscanw
- view		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	view
- worm		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	worm
- xmas		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	xmas
-+
-+# vile:makemode
-diff -Naur ncurses-5.6.orig/test/railroad.c ncurses-5.6/test/railroad.c
---- ncurses-5.6.orig/test/railroad.c	2006-05-20 12:02:04.000000000 -0400
-+++ ncurses-5.6/test/railroad.c	2008-06-18 06:49:47.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2000-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 2000-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -29,10 +29,11 @@
- /*
-  * Author: Thomas E. Dickey - 2000
-  *
-- * $Id: railroad.c,v 1.14 2006/05/20 16:02:04 tom Exp $
-+ * $Id: railroad.c,v 1.16 2008/02/09 18:08:43 tom Exp $
-  *
-  * A simple demo of the termcap interface.
-  */
-+#define USE_TINFO
- #include <test.priv.h>
- 
- #if HAVE_TGETENT
-@@ -55,7 +56,7 @@
- static bool interrupted = FALSE;
- 
- static int
--outc(int c)
-+outc(TPUTS_ARG c)
- {
-     if (interrupted) {
- 	char tmp = c;
-diff -Naur ncurses-5.6.orig/test/rain.c ncurses-5.6/test/rain.c
---- ncurses-5.6.orig/test/rain.c	2006-05-20 11:34:27.000000000 -0400
-+++ ncurses-5.6/test/rain.c	2008-06-18 06:49:51.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2002,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -26,20 +26,78 @@
-  * authorization.                                                           *
-  ****************************************************************************/
- /*
-- * $Id: rain.c,v 1.22 2006/05/20 15:34:27 tom Exp $
-+ * $Id: rain.c,v 1.34 2008/05/24 23:34:34 tom Exp $
-  */
- #include <test.priv.h>
- 
- /* rain 11/3/1980 EPS/CITHEP */
- 
--static float ranf(void);
--static void onsig(int sig);
-+#ifdef USE_PTHREADS
-+#include <pthread.h>
-+#endif
-+
-+WANT_USE_WINDOW();
-+
-+#define MAX_THREADS	10
-+#define MAX_DROP	5
-+
-+struct DATA;
-+
-+typedef void (*DrawPart) (struct DATA *);
-+
-+typedef struct DATA {
-+    int y, x;
-+#ifdef USE_PTHREADS
-+    DrawPart func;
-+    int state;
-+#endif
-+} DATA;
-+
-+#ifdef USE_PTHREADS
-+pthread_cond_t cond_next_drop;
-+pthread_mutex_t mutex_next_drop;
-+static int used_threads;
-+
-+typedef struct {
-+    pthread_t myself;
-+    long counter;
-+} STATS;
-+
-+static STATS drop_threads[MAX_THREADS];
-+#endif
-+
-+static void
-+onsig(int n GCC_UNUSED)
-+{
-+    curs_set(1);
-+    endwin();
-+    ExitProgram(EXIT_FAILURE);
-+}
-+
-+static float
-+ranf(void)
-+{
-+    long r = (rand() & 077777);
-+    return ((float) r / 32768.);
-+}
-+
-+static int
-+random_x(void)
-+{
-+    return (((float) (COLS - 4) * ranf()) + 2);
-+}
-+
-+static int
-+random_y(void)
-+{
-+    return (((float) (LINES - 4) * ranf()) + 2);
-+}
- 
- static int
- next_j(int j)
- {
-     if (j == 0)
--	j = 4;
-+	j = MAX_DROP - 1;
-     else
- 	--j;
-     if (has_colors()) {
-@@ -52,15 +110,193 @@
-     return j;
- }
- 
-+static void
-+part1(DATA * drop)
-+{
-+    mvaddch(drop->y, drop->x, '.');
-+}
-+
-+static void
-+part2(DATA * drop)
-+{
-+    mvaddch(drop->y, drop->x, 'o');
-+}
-+
-+static void
-+part3(DATA * drop)
-+{
-+    mvaddch(drop->y, drop->x, 'O');
-+}
-+
-+static void
-+part4(DATA * drop)
-+{
-+    mvaddch(drop->y - 1, drop->x, '-');
-+    mvaddstr(drop->y, drop->x - 1, "|.|");
-+    mvaddch(drop->y + 1, drop->x, '-');
-+}
-+
-+static void
-+part5(DATA * drop)
-+{
-+    mvaddch(drop->y - 2, drop->x, '-');
-+    mvaddstr(drop->y - 1, drop->x - 1, "/ \\");
-+    mvaddstr(drop->y, drop->x - 2, "| O |");
-+    mvaddstr(drop->y + 1, drop->x - 1, "\\ /");
-+    mvaddch(drop->y + 2, drop->x, '-');
-+}
-+
-+static void
-+part6(DATA * drop)
-+{
-+    mvaddch(drop->y - 2, drop->x, ' ');
-+    mvaddstr(drop->y - 1, drop->x - 1, "   ");
-+    mvaddstr(drop->y, drop->x - 2, "     ");
-+    mvaddstr(drop->y + 1, drop->x - 1, "   ");
-+    mvaddch(drop->y + 2, drop->x, ' ');
-+}
-+
-+#ifdef USE_PTHREADS
-+static void
-+napsome(void)
-+{
-+    napms(60);
-+}
-+
-+/*
-+ * This runs inside the use_window() mutex.
-+ */
-+static int
-+really_draw(WINDOW *win, void *arg)
-+{
-+    DATA *data = (DATA *) arg;
-+
-+    (void) win;
-+    next_j(data->state);
-+    data->func(data);
-+    refresh();
-+    return OK;
-+}
-+
-+static void
-+draw_part(void (*func) (DATA *), int state, DATA * data)
-+{
-+    data->func = func;
-+    data->state = state;
-+    use_window(stdscr, really_draw, (void *) data);
-+    napsome();
-+}
-+
-+/*
-+ * Tell the threads that one of them can start work on a new raindrop.
-+ * They may all be busy if we're sending requests too rapidly.
-+ */
-+static int
-+put_next_drop(void)
-+{
-+    pthread_cond_signal(&cond_next_drop);
-+    pthread_mutex_unlock(&mutex_next_drop);
-+
-+    return 0;
-+}
-+
-+/*
-+ * Wait until we're assigned the task of drawing a new raindrop.
-+ */
-+static int
-+get_next_drop(void)
-+{
-+    pthread_mutex_lock(&mutex_next_drop);
-+    pthread_cond_wait(&cond_next_drop, &mutex_next_drop);
-+
-+    return TRUE;
-+}
-+
-+static void *
-+draw_drop(void *arg)
-+{
-+    DATA mydata;
-+    int mystats;
-+
-+    /*
-+     * Find myself in the list of threads so we can count the number of loops.
-+     */
-+    for (mystats = 0; mystats < MAX_THREADS; ++mystats) {
-+	if (drop_threads[mystats].myself == pthread_self())
-+	    break;
-+    }
-+
-+    do {
-+	if (mystats < MAX_THREADS)
-+	    drop_threads[mystats].counter++;
-+
-+	/*
-+	 * Make a copy of caller's data.  We're cheating for the cases after
-+	 * the first loop since we still have a pointer into the main thread
-+	 * to the data which it uses for setting up this thread (but it has
-+	 * been modified to use different coordinates).
-+	 */
-+	mydata = *(DATA *) arg;
-+
-+	draw_part(part1, 0, &mydata);
-+	draw_part(part2, 1, &mydata);
-+	draw_part(part3, 2, &mydata);
-+	draw_part(part4, 3, &mydata);
-+	draw_part(part5, 4, &mydata);
-+	draw_part(part6, 0, &mydata);
-+    } while (get_next_drop());
-+
-+    return NULL;
-+}
-+
-+/*
-+ * The description of pthread_create() is misleading, since it implies that
-+ * threads will exit cleanly after their function returns.
-+ * 
-+ * Since they do not (and the number of threads is limited by system
-+ * resources), make a limited number of threads, and signal any that are
-+ * waiting when we want a thread past that limit.
-+ */
-+static int
-+start_drop(DATA * data)
-+{
-+    int rc;
-+
-+    if (!used_threads) {
-+	/* mutex and condition for signalling thread */
-+	pthread_mutex_init(&mutex_next_drop, NULL);
-+	pthread_cond_init(&cond_next_drop, NULL);
-+    }
-+
-+    if (used_threads < MAX_THREADS) {
-+	rc = pthread_create(&(drop_threads[used_threads].myself),
-+			    NULL,
-+			    draw_drop,
-+			    data);
-+	++used_threads;
-+    } else {
-+	rc = put_next_drop();
-+    }
-+    return rc;
-+}
-+#endif
-+
-+static int
-+get_input(void)
-+{
-+    return USING_WINDOW(stdscr, wgetch);
-+}
-+
- int
--main(
--	int argc GCC_UNUSED,
--	char *argv[]GCC_UNUSED)
--{
--    int x, y, j;
--    static int xpos[5], ypos[5];
--    float r;
--    float c;
-+main(int argc GCC_UNUSED,
-+     char *argv[]GCC_UNUSED)
-+{
-+    bool done = FALSE;
-+    DATA drop;
-+#ifndef USE_PTHREADS
-+    DATA last[MAX_DROP];
-+#endif
-+    int j = 0;
- 
-     setlocale(LC_ALL, "");
- 
-@@ -82,52 +318,50 @@
-     curs_set(0);
-     timeout(0);
- 
--    r = (float) (LINES - 4);
--    c = (float) (COLS - 4);
--    for (j = 5; --j >= 0;) {
--	xpos[j] = (int) (c * ranf()) + 2;
--	ypos[j] = (int) (r * ranf()) + 2;
-+#ifndef USE_PTHREADS
-+    for (j = MAX_DROP; --j >= 0;) {
-+	last[j].x = random_x();
-+	last[j].y = random_y();
-     }
-+    j = 0;
-+#endif
- 
--    for (j = 0;;) {
--	x = (int) (c * ranf()) + 2;
--	y = (int) (r * ranf()) + 2;
--
--	mvaddch(y, x, '.');
-+    while (!done) {
-+	drop.x = random_x();
-+	drop.y = random_y();
-+
-+#ifdef USE_PTHREADS
-+	if (start_drop(&drop) != 0) {
-+	    beep();
-+	}
-+#else
-+	/*
-+	 * The non-threaded code draws parts of each drop on each loop.
-+	 */
-+	part1(&drop);
- 
--	mvaddch(ypos[j], xpos[j], 'o');
-+	part2(&last[j]);
- 
- 	j = next_j(j);
--	mvaddch(ypos[j], xpos[j], 'O');
-+	part3(&last[j]);
- 
- 	j = next_j(j);
--	mvaddch(ypos[j] - 1, xpos[j], '-');
--	mvaddstr(ypos[j], xpos[j] - 1, "|.|");
--	mvaddch(ypos[j] + 1, xpos[j], '-');
-+	part4(&last[j]);
- 
- 	j = next_j(j);
--	mvaddch(ypos[j] - 2, xpos[j], '-');
--	mvaddstr(ypos[j] - 1, xpos[j] - 1, "/ \\");
--	mvaddstr(ypos[j], xpos[j] - 2, "| O |");
--	mvaddstr(ypos[j] + 1, xpos[j] - 1, "\\ /");
--	mvaddch(ypos[j] + 2, xpos[j], '-');
-+	part5(&last[j]);
- 
- 	j = next_j(j);
--	mvaddch(ypos[j] - 2, xpos[j], ' ');
--	mvaddstr(ypos[j] - 1, xpos[j] - 1, "   ");
--	mvaddstr(ypos[j], xpos[j] - 2, "     ");
--	mvaddstr(ypos[j] + 1, xpos[j] - 1, "   ");
--	mvaddch(ypos[j] + 2, xpos[j], ' ');
-+	part6(&last[j]);
- 
--	xpos[j] = x;
--	ypos[j] = y;
-+	last[j] = drop;
-+#endif
- 
--	switch (getch()) {
-+	switch (get_input()) {
- 	case ('q'):
- 	case ('Q'):
--	    curs_set(1);
--	    endwin();
--	    ExitProgram(EXIT_SUCCESS);
-+	    done = TRUE;
-+	    break;
- 	case 's':
- 	    nodelay(stdscr, FALSE);
- 	    break;
-@@ -136,26 +370,17 @@
- 	    break;
- #ifdef KEY_RESIZE
- 	case (KEY_RESIZE):
--	    r = (float) (LINES - 4);
--	    c = (float) (COLS - 4);
- 	    break;
- #endif
- 	}
- 	napms(50);
-     }
--}
--
--static void
--onsig(int n GCC_UNUSED)
--{
-     curs_set(1);
-     endwin();
--    ExitProgram(EXIT_FAILURE);
--}
--
--static float
--ranf(void)
--{
--    long r = (rand() & 077777);
--    return ((float) r / 32768.);
-+#ifdef USE_PTHREADS
-+    printf("Counts per thread:\n");
-+    for (j = 0; j < MAX_THREADS; ++j)
-+	printf("  %d:%ld\n", j, drop_threads[j].counter);
-+#endif
-+    ExitProgram(EXIT_SUCCESS);
- }
-diff -Naur ncurses-5.6.orig/test/redraw.c ncurses-5.6/test/redraw.c
---- ncurses-5.6.orig/test/redraw.c	2006-11-04 18:20:27.000000000 -0500
-+++ ncurses-5.6/test/redraw.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2006 Free Software Foundation, Inc.                        *
-+ * Copyright (c) 2006,2007 Free Software Foundation, Inc.                   *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -26,7 +26,7 @@
-  * authorization.                                                           *
-  ****************************************************************************/
- /*
-- * $Id: redraw.c,v 1.3 2006/11/04 23:20:27 tom Exp $
-+ * $Id: redraw.c,v 1.4 2007/06/30 17:55:06 tom Exp $
-  *
-  * Demonstrate the redrawwin() and wredrawln() functions.
-  * Thomas Dickey - 2006/11/4
-@@ -148,7 +148,7 @@
- 	    if (ch > KEY_MIN) {
- 		waddstr(win, keyname(ch));
- 	    } else {
--		waddstr(win, unctrl(ch));
-+		waddstr(win, unctrl(UChar(ch)));
- 	    }
- 	    break;
- 	}
-diff -Naur ncurses-5.6.orig/test/savescreen.c ncurses-5.6/test/savescreen.c
---- ncurses-5.6.orig/test/savescreen.c	2006-04-01 14:08:03.000000000 -0500
-+++ ncurses-5.6/test/savescreen.c	2008-06-18 06:49:44.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 2006 Free Software Foundation, Inc.                        *
-+ * Copyright (c) 2007 Free Software Foundation, Inc.                        *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -26,23 +26,291 @@
-  * authorization.                                                           *
-  ****************************************************************************/
- /*
-- * $Id: savescreen.c,v 1.2 2006/04/01 19:08:03 tom Exp $
-+ * $Id: savescreen.c,v 1.10 2007/07/21 17:57:37 tom Exp $
-  *
-  * Demonstrate save/restore functions from the curses library.
-- * Thomas Dickey - 2006/2/11
-+ * Thomas Dickey - 2007/7/14
-  */
--/*
--scr_dump			-
--scr_init			-
--scr_restore			-
--scr_set				-
--*/
- 
- #include <test.priv.h>
- 
-+#if TIME_WITH_SYS_TIME
-+# include <sys/time.h>
-+# include <time.h>
-+#else
-+# if HAVE_SYS_TIME_H
-+#  include <sys/time.h>
-+# else
-+#  include <time.h>
-+# endif
-+#endif
-+
-+static bool use_init = FALSE;
-+
-+static void
-+setup_next(void)
-+{
-+    curs_set(1);
-+    reset_shell_mode();
-+}
-+
-+static void
-+cleanup(char *files[])
-+{
-+    int n;
-+
-+    for (n = 0; files[n] != 0; ++n) {
-+	unlink(files[n]);
-+    }
-+}
-+
-+static int
-+load_screen(char *filename)
-+{
-+    int result;
-+
-+    if (use_init) {
-+	if ((result = scr_init(filename)) != ERR)
-+	    result = scr_restore(filename);
-+    } else {
-+	result = scr_set(filename);
-+    }
-+    return result;
-+}
-+
-+/*
-+ * scr_restore() or scr_set() operates on curscr.  If we read a character using
-+ * getch() that will refresh stdscr, wiping out the result.  To avoid that,
-+ * copy the data back from curscr to stdscr.
-+ */
-+static void
-+after_load(void)
-+{
-+    overwrite(curscr, stdscr);
-+    doupdate();
-+}
-+
-+static void
-+show_what(int which, int last)
-+{
-+    int y, x;
-+    time_t now = time((time_t *) 0);
-+
-+    getyx(stdscr, y, x);
-+
-+    move(0, 0);
-+    printw("Saved %d of %d - %s", which, last + 1, ctime(&now));
-+
-+    move(y, x);
-+
-+    refresh();
-+}
-+
-+static int
-+get_command(int which, int last)
-+{
-+    int ch;
-+
-+    timeout(100);
-+
-+    do {
-+	show_what(which, last);
-+	ch = getch();
-+    } while (ch == ERR);
-+
-+    return ch;
-+}
-+
-+static void
-+usage(void)
-+{
-+    static const char *msg[] =
-+    {
-+	"Usage: savescreen [-r] files",
-+	"",
-+	"Options:",
-+	" -i  use scr_init/scr_restore rather than scr_set",
-+	" -r  replay the screen-dump files"
-+    };
-+    unsigned n;
-+    for (n = 0; n < SIZEOF(msg); ++n) {
-+	fprintf(stderr, "%s\n", msg[n]);
-+    }
-+    ExitProgram(EXIT_FAILURE);
-+}
-+
- int
--main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
-+main(int argc, char *argv[])
- {
--    printf("Not implemented - demo for screen save/restore\n");
--    return EXIT_SUCCESS;
-+    int ch;
-+    int which = 0;
-+    int last;
-+    bool replaying = FALSE;
-+    bool done = FALSE;
-+    char **files;
-+
-+    while ((ch = getopt(argc, argv, "ir")) != -1) {
-+	switch (ch) {
-+	case 'i':
-+	    use_init = TRUE;
-+	    break;
-+	case 'r':
-+	    replaying = TRUE;
-+	    break;
-+	default:
-+	    usage();
-+	    break;
-+	}
-+    }
-+
-+    initscr();
-+    cbreak();
-+    noecho();
-+    keypad(stdscr, TRUE);
-+    curs_set(0);
-+    if (has_colors()) {
-+	start_color();
-+	for (ch = 0; ch < COLOR_PAIRS; ++ch) {
-+	    short pair = ch % COLOR_PAIRS;
-+	    init_pair(pair, COLOR_WHITE, ch % COLORS);
-+	}
-+    }
-+
-+    files = argv + optind;
-+    last = argc - optind - 1;
-+    if (replaying) {
-+
-+	/*
-+	 * Use the last file as the initial/current screen.
-+	 */
-+	if (last < 0) {
-+	    endwin();
-+	    printf("No screen-dumps given\n");
-+	    ExitProgram(EXIT_FAILURE);
-+	}
-+
-+	which = last;
-+	if (load_screen(files[which]) == ERR) {
-+	    endwin();
-+	    printf("Cannot load screen-dump %s\n", files[which]);
-+	    ExitProgram(EXIT_FAILURE);
-+	}
-+	after_load();
-+
-+	while (!done && (ch = getch()) != ERR) {
-+	    switch (ch) {
-+	    case 'n':
-+		/*
-+		 * If we got a "next" here, skip to the final screen before
-+		 * moving to the next process.
-+		 */
-+		setup_next();
-+		which = last;
-+		done = TRUE;
-+		break;
-+	    case 'q':
-+		endwin();
-+		cleanup(files);
-+		done = TRUE;
-+		break;
-+	    case KEY_BACKSPACE:
-+	    case '\b':
-+		if (--which < 0)
-+		    which = last;
-+		break;
-+	    case ' ':
-+		if (++which > last)
-+		    which = 0;
-+		break;
-+	    default:
-+		beep();
-+		continue;
-+	    }
-+
-+	    if (ch == 'q') {
-+		;
-+	    } else if (scr_restore(files[which]) == ERR) {
-+		endwin();
-+		printf("Cannot load screen-dump %s\n", files[which]);
-+		cleanup(files);
-+		ExitProgram(EXIT_FAILURE);
-+	    } else {
-+		wrefresh(curscr);
-+	    }
-+	}
-+    } else {
-+	int y;
-+	int x;
-+
-+	move(2, 0);
-+	printw("Use h,j,k,l or arrows to move around the screen\n");
-+	printw("Press 'q' to quit, ' ' to dump a screen\n");
-+	printw("When the last screen has been dumped, press 'n' to run the\n");
-+	printw("screen-loader.  That allows only 'q', backspace and ' ' for\n");
-+	printw("stepping through the dumped/restored screens.\n");
-+	getyx(stdscr, y, x);
-+
-+	while (!done) {
-+	    switch (ch = get_command(which, last)) {
-+	    case 'n':
-+		setup_next();
-+		done = TRUE;
-+		break;
-+	    case 'q':
-+		endwin();
-+		cleanup(files);
-+		done = TRUE;
-+		break;
-+	    case ' ':
-+		if (files[which] != 0) {
-+		    show_what(which + 1, last);
-+		    if (scr_dump(files[which]) == ERR) {
-+			endwin();
-+			printf("Cannot write screen-dump %s\n", files[which]);
-+			cleanup(files);
-+			done = TRUE;
-+			break;
-+		    }
-+		    ++which;
-+		    if (has_colors()) {
-+			short pair = which % COLOR_PAIRS;
-+			bkgd(COLOR_PAIR(pair));
-+		    }
-+		} else {
-+		    beep();
-+		}
-+		break;
-+	    case KEY_LEFT:
-+	    case 'h':
-+		if (--x < 0)
-+		    x = COLS - 1;
-+		break;
-+	    case KEY_DOWN:
-+	    case 'j':
-+		if (++y >= LINES)
-+		    y = 1;
-+		break;
-+	    case KEY_UP:
-+	    case 'k':
-+		if (--y < 1)
-+		    y = LINES - 1;
-+		break;
-+	    case KEY_RIGHT:
-+	    case 'l':
-+		if (++x >= COLS)
-+		    x = 0;
-+		break;
-+	    }
-+	    if (!done) {
-+		time_t now = time((time_t *) 0);
-+
-+		move(0, 0);
-+		addstr(ctime(&now));
-+		move(y, x);
-+		addch('#' | A_REVERSE);
-+		move(y, x);
-+	    }
-+	}
-+    }
-+    ExitProgram(EXIT_SUCCESS);
- }
-diff -Naur ncurses-5.6.orig/test/savescreen.sh ncurses-5.6/test/savescreen.sh
---- ncurses-5.6.orig/test/savescreen.sh	1969-12-31 19:00:00.000000000 -0500
-+++ ncurses-5.6/test/savescreen.sh	2008-06-18 06:49:44.000000000 -0400
-@@ -0,0 +1,55 @@
-+#!/bin/sh
-+##############################################################################
-+# Copyright (c) 2007 Free Software Foundation, Inc.                          #
-+#                                                                            #
-+# Permission is hereby granted, free of charge, to any person obtaining a    #
-+# copy of this software and associated documentation files (the "Software"), #
-+# to deal in the Software without restriction, including without limitation  #
-+# the rights to use, copy, modify, merge, publish, distribute, distribute    #
-+# with modifications, sublicense, and/or sell copies of the Software, and to #
-+# permit persons to whom the Software is furnished to do so, subject to the  #
-+# following conditions:                                                      #
-+#                                                                            #
-+# The above copyright notice and this permission notice shall be included in #
-+# all copies or substantial portions of the Software.                        #
-+#                                                                            #
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR #
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,   #
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL    #
-+# THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER      #
-+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING    #
-+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER        #
-+# DEALINGS IN THE SOFTWARE.                                                  #
-+#                                                                            #
-+# Except as contained in this notice, the name(s) of the above copyright     #
-+# holders shall not be used in advertising or otherwise to promote the sale, #
-+# use or other dealings in this Software without prior written               #
-+# authorization.                                                             #
-+##############################################################################
-+# $Id: savescreen.sh,v 1.3 2007/07/14 21:50:26 tom Exp $
-+#
-+# Use this script to exercise "savescreen".
-+# It starts by generating a series of temporary-filenames, which are passed
-+# to the test-program.  Loop as long as the first file named exists.
-+PARAMS=
-+NFILES=4
-+PREFIX=savescreen-$$
-+n=0
-+BEGINS=$PREFIX-$n.tmp
-+while test $n != $NFILES
-+do
-+	LATEST=$PREFIX-$n.tmp
-+	PARAMS="$PARAMS $LATEST"
-+	n=`expr $n + 1`
-+done
-+
-+./savescreen $PARAMS
-+if test -f $BEGINS
-+then
-+	while test -f $BEGINS
-+	do
-+		./savescreen -r $PARAMS
-+	done
-+else
-+	echo "No screens were saved"
-+fi
-diff -Naur ncurses-5.6.orig/test/test.priv.h ncurses-5.6/test/test.priv.h
---- ncurses-5.6.orig/test/test.priv.h	2006-07-15 14:27:24.000000000 -0400
-+++ ncurses-5.6/test/test.priv.h	2008-06-18 06:49:49.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -29,7 +29,7 @@
- /****************************************************************************
-  *  Author: Thomas E. Dickey                    1996-on                     *
-  ****************************************************************************/
--/* $Id: test.priv.h,v 1.63 2006/07/15 18:27:24 tom Exp $ */
-+/* $Id: test.priv.h,v 1.77 2008/04/12 19:25:48 tom Exp $ */
- 
- #ifndef __TEST_PRIV_H
- #define __TEST_PRIV_H 1
-@@ -59,6 +59,14 @@
- #define HAVE_CURSES_VERSION 0
- #endif
- 
-+#ifndef HAVE_CHGAT
-+#define HAVE_CHGAT 0
-+#endif
-+
-+#ifndef HAVE_COLOR_SET
-+#define HAVE_COLOR_SET 0
-+#endif
-+
- #ifndef HAVE_FILTER
- #define HAVE_FILTER 0
- #endif
-@@ -83,6 +91,10 @@
- #define HAVE_GETOPT_H 0
- #endif
- 
-+#ifndef HAVE_GETPARX
-+#define HAVE_GETPARX 0
-+#endif
-+
- #ifndef HAVE_GETWIN
- #define HAVE_GETWIN 0
- #endif
-@@ -235,9 +247,18 @@
- #include <term.h>
- #endif
- 
--#ifdef NCURSES_VERSION
--#define HAVE_COLOR_SET 1
--#define HAVE_CHGAT 1
-+/*
-+ * Not all curses.h implementations include unctrl.h,
-+ * Solaris 10 xpg4 for example.
-+ */
-+#if defined(NCURSES_VERSION) || defined(_XOPEN_CURSES)
-+#if defined(HAVE_NCURSESW_NCURSES_H)
-+#include <ncursesw/unctrl.h>
-+#elif defined(HAVE_NCURSES_NCURSES_H)
-+#include <ncurses/unctrl.h>
-+#else
-+#include <unctrl.h>
-+#endif
- #endif
- 
- #if HAVE_GETOPT_H
-@@ -308,8 +329,8 @@
- #endif
- 
- #ifndef HAVE_TYPE_ATTR_T
--#if !USE_WIDEC_SUPPORT
--#define attr_t long
-+#if !USE_WIDEC_SUPPORT && !defined(attr_t)
-+#define attr_t chtype
- #endif
- #endif
- 
-@@ -320,13 +341,16 @@
- #define NCURSES_CH_T cchar_t
- #endif
- 
-+#ifndef NCURSES_OPAQUE
-+#define NCURSES_OPAQUE 0
-+#endif
-+
- #ifndef CCHARW_MAX
- #define CCHARW_MAX 5
- #endif
- 
--#ifndef CTRL
--#define CTRL(x)		((x) & 0x1f)
--#endif
-+#undef CTRL
-+#define CTRL(x)	((x) & 0x1f)
- 
- #define QUIT		CTRL('Q')
- #define ESCAPE		CTRL('[')
-@@ -367,6 +391,21 @@
- #define getmaxy(win)            ((win)?((win)->_maxy + 1):ERR)
- #endif
- 
-+/*
-+ * Solaris 10 xpg4:
-+#define	__m_getparx(w)		((w)->_parent == (WINDOW *) 0 ? -1 \
-+				: (w)->_begx - (w)->_parent->_begx)
-+ */
-+#if !defined(getparx) && !HAVE_GETPARX
-+#ifdef __m_getparx
-+#define getparx(win)            __m_getparx(win)
-+#define getpary(win)            __m_getpary(win)
-+#else
-+#define getparx(win)            ((win)?((win)->_parx + 1):ERR)
-+#define getpary(win)            ((win)?((win)->_pary + 1):ERR)
-+#endif
-+#endif
-+
- #if !defined(mvwvline) && !HAVE_MVWVLINE
- #define mvwvline(w,y,x,ch,n)    (move(y,x) == ERR ? ERR : wvline(w,ch,n))
- #define mvwhline(w,y,x,ch,n)    (move(y,x) == ERR ? ERR : whline(w,ch,n))
-@@ -404,8 +443,13 @@
- 
- #if defined(NCURSES_VERSION) && HAVE_NC_ALLOC_H
- #include <nc_alloc.h>
-+#if HAVE_NC_FREEALL && defined(USE_TINFO)
-+#undef ExitProgram
-+#define ExitProgram(code) _nc_free_tinfo(code)
-+#endif
- #else
- #define typeMalloc(type,n) (type *) malloc((n) * sizeof(type))
-+#define typeCalloc(type,elts) (type *) calloc((elts), sizeof(type))
- #define typeRealloc(type,n,p) (type *) realloc(p, (n) * sizeof(type))
- #endif
- 
-@@ -451,4 +495,79 @@
- 			signal(nsig, handler); \
- 	    }
- 
-+/*
-+ * Workaround for clean(er) compile with Solaris's legacy curses.
-+ * The same would be needed for HPUX 10.20
-+ */
-+#ifndef TPUTS_ARG
-+#if defined(sun) && !defined(_XOPEN_CURSES) && !defined(NCURSES_VERSION_PATCH)
-+#define TPUTS_ARG char
-+extern char *tgoto(char *, int, int);	/* available, but not prototyped */
-+#else
-+#define TPUTS_ARG int
-+#endif
-+#endif
-+
-+/*
-+ * Workarounds for Solaris's X/Open curses
-+ */
-+#if defined(sun) && defined(_XOPEN_CURSES) && !defined(NCURSES_VERSION_PATCH)
-+#if !defined(KEY_MIN) && defined(__KEY_MIN)
-+#define KEY_MIN __KEY_MIN
-+#endif
-+#if !defined(KEY_MAX) && defined(__KEY_MIN)
-+#define KEY_MAX __KEY_MAX
-+#endif
-+#endif
-+
-+/*
-+ * ncurses uses const in some places where X/Open does (or did) not allow.
-+ */
-+#ifdef NCURSES_VERSION
-+#define CONST_MENUS const
-+#else
-+#define CONST_MENUS /* nothing */
-+#endif
-+
-+#ifndef HAVE_USE_WINDOW
-+#if !defined(NCURSES_VERSION_PATCH) || (NCURSES_VERSION_PATCH < 20070915) || !NCURSES_EXT_FUNCS
-+#define HAVE_USE_WINDOW 0
-+#else
-+#define HAVE_USE_WINDOW 1
-+#endif
-+#endif
-+
-+/*
-+ * Simplify setting up demo of threading with these macros.
-+ */
-+
-+#if !HAVE_USE_WINDOW
-+typedef int (*NCURSES_WINDOW_CB)(WINDOW *, void *);
-+typedef int (*NCURSES_SCREEN_CB)(SCREEN *, void *);
-+#endif
-+
-+#if HAVE_USE_WINDOW
-+#define USING_WINDOW(w,func) use_window(w, (NCURSES_WINDOW_CB) func, w)
-+#define WANT_USE_WINDOW() extern void _nc_want_use_window(void)
-+#else
-+#define USING_WINDOW(w,func) func(w)
-+#define WANT_USE_WINDOW() extern void _nc_want_use_window(void)
-+#endif
-+
-+#if HAVE_USE_WINDOW
-+#define USING_SCREEN(s,func,data) use_screen(s, (NCURSES_SCREEN_CB) func, data)
-+#define WANT_USE_SCREEN() extern void _nc_want_use_screen(void)
-+#else
-+#define USING_SCREEN(s,func,data) func(data)
-+#define WANT_USE_SCREEN() extern void _nc_want_use_screen(void)
-+#endif
-+
-+#ifdef TRACE
-+#define Trace(p) _tracef p
-+#define USE_TRACE 1
-+#else
-+#define Trace(p)		/* nothing */
-+#define USE_TRACE 0
-+#endif
-+
- #endif /* __TEST_PRIV_H */
-diff -Naur ncurses-5.6.orig/test/test_arrays.c ncurses-5.6/test/test_arrays.c
---- ncurses-5.6.orig/test/test_arrays.c	1969-12-31 19:00:00.000000000 -0500
-+++ ncurses-5.6/test/test_arrays.c	2008-06-18 06:49:47.000000000 -0400
-@@ -0,0 +1,90 @@
-+/****************************************************************************
-+ * Copyright (c) 2007,2008 Free Software Foundation, Inc.                   *
-+ *                                                                          *
-+ * Permission is hereby granted, free of charge, to any person obtaining a  *
-+ * copy of this software and associated documentation files (the            *
-+ * "Software"), to deal in the Software without restriction, including      *
-+ * without limitation the rights to use, copy, modify, merge, publish,      *
-+ * distribute, distribute with modifications, sublicense, and/or sell       *
-+ * copies of the Software, and to permit persons to whom the Software is    *
-+ * furnished to do so, subject to the following conditions:                 *
-+ *                                                                          *
-+ * The above copyright notice and this permission notice shall be included  *
-+ * in all copies or substantial portions of the Software.                   *
-+ *                                                                          *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-+ *                                                                          *
-+ * Except as contained in this notice, the name(s) of the above copyright   *
-+ * holders shall not be used in advertising or otherwise to promote the     *
-+ * sale, use or other dealings in this Software without prior written       *
-+ * authorization.                                                           *
-+ ****************************************************************************/
-+/*
-+ * $Id: test_arrays.c,v 1.3 2008/02/09 18:09:43 tom Exp $
-+ *
-+ * Author: Thomas E Dickey
-+ *
-+ * Demonstrate the public arrays from the terminfo library.
-+
-+extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolnames[];
-+extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolcodes[];
-+extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) boolfnames[];
-+extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) numnames[];
-+extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) numcodes[];
-+extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) numfnames[];
-+extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) strnames[];
-+extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) strcodes[];
-+extern NCURSES_EXPORT_VAR(NCURSES_CONST char * const ) strfnames[];
-+
-+ */
-+
-+#define USE_TINFO
-+#include <test.priv.h>
-+
-+#if defined(NCURSES_VERSION) || !defined(_XOPEN_CURSES)
-+
-+#define DUMP(name) dump_array(#name, name)
-+
-+static void
-+dump_array(const char *name, NCURSES_CONST char *const *list)
-+{
-+    int n;
-+
-+    printf("%s:\n", name);
-+    for (n = 0; list[n] != 0; ++n) {
-+	printf("%5d:%s\n", n, list[n]);
-+    }
-+}
-+
-+int
-+main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
-+{
-+    DUMP(boolnames);
-+    DUMP(boolcodes);
-+    DUMP(boolfnames);
-+
-+    DUMP(numnames);
-+    DUMP(numcodes);
-+    DUMP(numfnames);
-+
-+    DUMP(strnames);
-+    DUMP(strcodes);
-+    DUMP(strfnames);
-+
-+    ExitProgram(EXIT_SUCCESS);
-+}
-+
-+#else
-+int
-+main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
-+{
-+    printf("This program requires the terminfo arrays\n");
-+    ExitProgram(EXIT_FAILURE);
-+}
-+#endif
-diff -Naur ncurses-5.6.orig/test/test_get_wstr.c ncurses-5.6/test/test_get_wstr.c
---- ncurses-5.6.orig/test/test_get_wstr.c	1969-12-31 19:00:00.000000000 -0500
-+++ ncurses-5.6/test/test_get_wstr.c	2008-06-18 06:49:44.000000000 -0400
-@@ -0,0 +1,361 @@
-+/****************************************************************************
-+ * Copyright (c) 2007 Free Software Foundation, Inc.                        *
-+ *                                                                          *
-+ * Permission is hereby granted, free of charge, to any person obtaining a  *
-+ * copy of this software and associated documentation files (the            *
-+ * "Software"), to deal in the Software without restriction, including      *
-+ * without limitation the rights to use, copy, modify, merge, publish,      *
-+ * distribute, distribute with modifications, sublicense, and/or sell       *
-+ * copies of the Software, and to permit persons to whom the Software is    *
-+ * furnished to do so, subject to the following conditions:                 *
-+ *                                                                          *
-+ * The above copyright notice and this permission notice shall be included  *
-+ * in all copies or substantial portions of the Software.                   *
-+ *                                                                          *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-+ *                                                                          *
-+ * Except as contained in this notice, the name(s) of the above copyright   *
-+ * holders shall not be used in advertising or otherwise to promote the     *
-+ * sale, use or other dealings in this Software without prior written       *
-+ * authorization.                                                           *
-+ ****************************************************************************/
-+/*
-+ * $Id: test_get_wstr.c,v 1.5 2007/08/11 17:01:43 tom Exp $
-+ *
-+ * Author: Thomas E Dickey
-+ *
-+ * Demonstrate the get_wstr functions from the curses library.
-+
-+       int get_wstr(wint_t *wstr);
-+       int getn_wstr(wint_t *wstr, int n);
-+       int wget_wstr(WINDOW *win, wint_t *wstr);
-+       int wgetn_wstr(WINDOW *win, wint_t *wstr, int n);
-+       int mvget_wstr(int y, int x, wint_t *wstr);
-+       int mvgetn_wstr(int y, int x, wint_t *wstr, int n);
-+       int mvwget_wstr(WINDOW *win, int y, int x, wint_t *wstr);
-+       int mvwgetn_wstr(WINDOW *win, int y, int x, wint_t *wstr, int n);
-+ */
-+
-+#include <test.priv.h>
-+
-+#if USE_WIDEC_SUPPORT
-+
-+#define BASE_Y 6
-+#define MAX_COLS 1024
-+
-+typedef enum {
-+    eGetStr = 0,
-+    eGetNStr,
-+    eMvGetStr,
-+    eMvGetNStr,
-+    eMaxFlavor
-+} Flavors;
-+
-+static bool
-+Quit(int ch)
-+{
-+    return (ch == ERR || ch == 'q' || ch == QUIT || ch == ESCAPE);
-+}
-+
-+static int
-+Remainder(WINDOW *txtwin)
-+{
-+    int result = getmaxx(txtwin) - getcurx(txtwin);
-+    return (result > 0) ? result : 0;
-+}
-+
-+/*
-+ * Show a highlighted line in the place where input will happen.
-+ */
-+static void
-+ShowPrompt(WINDOW *txtwin, int limit)
-+{
-+    wchgat(txtwin, limit, A_REVERSE, 0, NULL);
-+    wnoutrefresh(txtwin);
-+}
-+
-+static void
-+MovePrompt(WINDOW *txtwin, int limit, int y, int x)
-+{
-+    wchgat(txtwin, Remainder(txtwin), A_NORMAL, 0, NULL);
-+    wmove(txtwin, y, x);
-+    ShowPrompt(txtwin, limit);
-+}
-+
-+static int
-+ShowFlavor(WINDOW *strwin, WINDOW *txtwin, int flavor, int limit)
-+{
-+    const char *name = "?";
-+    bool limited = FALSE;
-+    bool wins = (txtwin != stdscr);
-+    int result;
-+
-+    switch (flavor) {
-+    case eGetStr:
-+	name = wins ? "wget_wstr" : "get_wstr";
-+	break;
-+    case eGetNStr:
-+	limited = TRUE;
-+	name = wins ? "wgetn_wstr" : "getn_wstr";
-+	break;
-+    case eMvGetStr:
-+	name = wins ? "mvwget_wstr" : "mvget_wstr";
-+	break;
-+    case eMvGetNStr:
-+	limited = TRUE;
-+	name = wins ? "mvwgetn_wstr" : "mvgetn_wstr";
-+	break;
-+    case eMaxFlavor:
-+	break;
-+    }
-+
-+    wmove(strwin, 0, 0);
-+    werase(strwin);
-+
-+    if (limited) {
-+	wprintw(strwin, "%s(%d):", name, limit);
-+    } else {
-+	wprintw(strwin, "%s:", name);
-+    }
-+    result = limited ? limit : Remainder(txtwin);
-+    ShowPrompt(txtwin, result);
-+
-+    wnoutrefresh(strwin);
-+    return result;
-+}
-+
-+static int
-+test_get_wstr(int level, char **argv, WINDOW *strwin)
-+{
-+    WINDOW *txtbox = 0;
-+    WINDOW *txtwin = 0;
-+    FILE *fp;
-+    int ch;
-+    int rc;
-+    int txt_x = 0, txt_y = 0;
-+    int base_y;
-+    int flavor = 0;
-+    int limit = getmaxx(strwin) - 5;
-+    int actual;
-+    wint_t buffer[MAX_COLS];
-+
-+    if (argv[level] == 0) {
-+	beep();
-+	return FALSE;
-+    }
-+
-+    if (level > 1) {
-+	txtbox = newwin(LINES - BASE_Y, COLS - level, BASE_Y, level);
-+	box(txtbox, 0, 0);
-+	wnoutrefresh(txtbox);
-+
-+	txtwin = derwin(txtbox,
-+			getmaxy(txtbox) - 2,
-+			getmaxx(txtbox) - 2,
-+			1, 1);
-+	base_y = 0;
-+    } else {
-+	txtwin = stdscr;
-+	base_y = BASE_Y;
-+    }
-+
-+    keypad(txtwin, TRUE);	/* enable keyboard mapping */
-+    (void) cbreak();		/* take input chars one at a time, no wait for \n */
-+    (void) noecho();		/* don't echo input */
-+
-+    txt_y = base_y;
-+    txt_x = 0;
-+    wmove(txtwin, txt_y, txt_x);
-+
-+    if ((fp = fopen(argv[level], "r")) != 0) {
-+	while ((ch = fgetc(fp)) != EOF) {
-+	    if (waddch(txtwin, UChar(ch)) != OK) {
-+		break;
-+	    }
-+	}
-+	fclose(fp);
-+    } else {
-+	wprintw(txtwin, "Cannot open:\n%s", argv[1]);
-+    }
-+
-+    wmove(txtwin, txt_y, txt_x);
-+    actual = ShowFlavor(strwin, txtwin, flavor, limit);
-+    while (!Quit(ch = mvwgetch(txtwin, txt_y, txt_x))) {
-+	switch (ch) {
-+	case KEY_DOWN:
-+	case 'j':
-+	    if (txt_y < getmaxy(txtwin) - 1) {
-+		MovePrompt(txtwin, actual, ++txt_y, txt_x);
-+	    } else {
-+		beep();
-+	    }
-+	    break;
-+	case KEY_UP:
-+	case 'k':
-+	    if (txt_y > base_y) {
-+		MovePrompt(txtwin, actual, --txt_y, txt_x);
-+	    } else {
-+		beep();
-+	    }
-+	    break;
-+	case KEY_LEFT:
-+	case 'h':
-+	    if (txt_x > 0) {
-+		MovePrompt(txtwin, actual, txt_y, --txt_x);
-+	    } else {
-+		beep();
-+	    }
-+	    break;
-+	case KEY_RIGHT:
-+	case 'l':
-+	    if (txt_x < getmaxx(txtwin) - 1) {
-+		MovePrompt(txtwin, actual, txt_y, ++txt_x);
-+	    } else {
-+		beep();
-+	    }
-+	    break;
-+
-+	case 'w':
-+	    test_get_wstr(level + 1, argv, strwin);
-+	    if (txtbox != 0) {
-+		touchwin(txtbox);
-+		wnoutrefresh(txtbox);
-+	    } else {
-+		touchwin(txtwin);
-+		wnoutrefresh(txtwin);
-+	    }
-+	    break;
-+
-+	case '-':
-+	    if (limit > 0) {
-+		actual = ShowFlavor(strwin, txtwin, flavor, --limit);
-+		MovePrompt(txtwin, actual, txt_y, txt_x);
-+	    } else {
-+		beep();
-+	    }
-+	    break;
-+
-+	case '+':
-+	    actual = ShowFlavor(strwin, txtwin, flavor, ++limit);
-+	    MovePrompt(txtwin, actual, txt_y, txt_x);
-+	    break;
-+
-+	case '<':
-+	    if (flavor > 0) {
-+		actual = ShowFlavor(strwin, txtwin, --flavor, limit);
-+		MovePrompt(txtwin, actual, txt_y, txt_x);
-+	    } else {
-+		beep();
-+	    }
-+	    break;
-+
-+	case '>':
-+	    if (flavor + 1 < eMaxFlavor) {
-+		actual = ShowFlavor(strwin, txtwin, ++flavor, limit);
-+		MovePrompt(txtwin, actual, txt_y, txt_x);
-+	    } else {
-+		beep();
-+	    }
-+	    break;
-+
-+	case ':':
-+	    actual = ShowFlavor(strwin, txtwin, flavor, limit);
-+	    *buffer = '\0';
-+	    rc = ERR;
-+	    echo();
-+	    wattrset(txtwin, A_REVERSE);
-+	    switch (flavor) {
-+	    case eGetStr:
-+		if (txtwin != stdscr) {
-+		    wmove(txtwin, txt_y, txt_x);
-+		    rc = wget_wstr(txtwin, buffer);
-+		} else {
-+		    move(txt_y, txt_x);
-+		    rc = get_wstr(buffer);
-+		}
-+		break;
-+	    case eGetNStr:
-+		if (txtwin != stdscr) {
-+		    wmove(txtwin, txt_y, txt_x);
-+		    rc = wgetn_wstr(txtwin, buffer, limit);
-+		} else {
-+		    move(txt_y, txt_x);
-+		    rc = getn_wstr(buffer, limit);
-+		}
-+		break;
-+	    case eMvGetStr:
-+		if (txtwin != stdscr) {
-+		    rc = mvwget_wstr(txtwin, txt_y, txt_x, buffer);
-+		} else {
-+		    rc = mvget_wstr(txt_y, txt_x, buffer);
-+		}
-+		break;
-+	    case eMvGetNStr:
-+		if (txtwin != stdscr) {
-+		    rc = mvwgetn_wstr(txtwin, txt_y, txt_x, buffer, limit);
-+		} else {
-+		    rc = mvgetn_wstr(txt_y, txt_x, buffer, limit);
-+		}
-+		break;
-+	    case eMaxFlavor:
-+		break;
-+	    }
-+	    noecho();
-+	    wattrset(txtwin, A_NORMAL);
-+	    wprintw(strwin, "%d", rc);
-+	    waddwstr(strwin, (wchar_t *) buffer);
-+	    wnoutrefresh(strwin);
-+	    break;
-+	default:
-+	    beep();
-+	    break;
-+	}
-+	doupdate();
-+    }
-+    if (level > 1) {
-+	delwin(txtwin);
-+	delwin(txtbox);
-+    }
-+    return TRUE;
-+}
-+
-+int
-+main(int argc, char *argv[])
-+{
-+    WINDOW *chrbox;
-+    WINDOW *strwin;
-+
-+    setlocale(LC_ALL, "");
-+
-+    if (argc < 2) {
-+	fprintf(stderr, "usage: %s file\n", argv[0]);
-+	return EXIT_FAILURE;
-+    }
-+
-+    initscr();
-+
-+    chrbox = derwin(stdscr, BASE_Y, COLS, 0, 0);
-+    box(chrbox, 0, 0);
-+    wnoutrefresh(chrbox);
-+
-+    strwin = derwin(chrbox, 4, COLS - 2, 1, 1);
-+
-+    test_get_wstr(1, argv, strwin);
-+
-+    endwin();
-+    ExitProgram(EXIT_SUCCESS);
-+}
-+#else
-+int
-+main(void)
-+{
-+    printf("This program requires the wide-ncurses library\n");
-+    ExitProgram(EXIT_FAILURE);
-+}
-+#endif
-diff -Naur ncurses-5.6.orig/test/test_getstr.c ncurses-5.6/test/test_getstr.c
---- ncurses-5.6.orig/test/test_getstr.c	1969-12-31 19:00:00.000000000 -0500
-+++ ncurses-5.6/test/test_getstr.c	2008-06-18 06:49:47.000000000 -0400
-@@ -0,0 +1,363 @@
-+/****************************************************************************
-+ * Copyright (c) 2007,2008 Free Software Foundation, Inc.                   *
-+ *                                                                          *
-+ * Permission is hereby granted, free of charge, to any person obtaining a  *
-+ * copy of this software and associated documentation files (the            *
-+ * "Software"), to deal in the Software without restriction, including      *
-+ * without limitation the rights to use, copy, modify, merge, publish,      *
-+ * distribute, distribute with modifications, sublicense, and/or sell       *
-+ * copies of the Software, and to permit persons to whom the Software is    *
-+ * furnished to do so, subject to the following conditions:                 *
-+ *                                                                          *
-+ * The above copyright notice and this permission notice shall be included  *
-+ * in all copies or substantial portions of the Software.                   *
-+ *                                                                          *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-+ *                                                                          *
-+ * Except as contained in this notice, the name(s) of the above copyright   *
-+ * holders shall not be used in advertising or otherwise to promote the     *
-+ * sale, use or other dealings in this Software without prior written       *
-+ * authorization.                                                           *
-+ ****************************************************************************/
-+/*
-+ * $Id: test_getstr.c,v 1.8 2008/02/09 18:09:35 tom Exp $
-+ *
-+ * Author: Thomas E Dickey
-+ *
-+ * Demonstrate the getstr functions from the curses library.
-+
-+       int getstr(char *str);
-+       int getnstr(char *str, int n);
-+       int wgetstr(WINDOW *win, char *str);
-+       int wgetnstr(WINDOW *win, char *str, int n);
-+       int mvgetstr(int y, int x, char *str);
-+       int mvwgetstr(WINDOW *win, int y, int x, char *str);
-+       int mvgetnstr(int y, int x, char *str, int n);
-+       int mvwgetnstr(WINDOW *, int y, int x, char *str, int n);
-+ */
-+
-+#include <test.priv.h>
-+
-+#if HAVE_CHGAT
-+/* Solaris SVr4 curses lacks wchgat, mvgetnstr, mvwgetnstr */
-+
-+#define BASE_Y 6
-+#define MAX_COLS 1024
-+
-+typedef enum {
-+    eGetStr = 0,
-+    eGetNStr,
-+    eMvGetStr,
-+    eMvGetNStr,
-+    eMaxFlavor
-+} Flavors;
-+
-+static bool
-+Quit(int ch)
-+{
-+    return (ch == ERR || ch == 'q' || ch == QUIT || ch == ESCAPE);
-+}
-+
-+static int
-+Remainder(WINDOW *txtwin)
-+{
-+    int result = getmaxx(txtwin) - getcurx(txtwin);
-+    return (result > 0) ? result : 0;
-+}
-+
-+/*
-+ * Show a highlighted line in the place where input will happen.
-+ */
-+static void
-+ShowPrompt(WINDOW *txtwin, int limit)
-+{
-+    wchgat(txtwin, limit, A_REVERSE, 0, NULL);
-+    wnoutrefresh(txtwin);
-+}
-+
-+static void
-+MovePrompt(WINDOW *txtwin, int limit, int y, int x)
-+{
-+    wchgat(txtwin, Remainder(txtwin), A_NORMAL, 0, NULL);
-+    wmove(txtwin, y, x);
-+    ShowPrompt(txtwin, limit);
-+}
-+
-+static int
-+ShowFlavor(WINDOW *strwin, WINDOW *txtwin, int flavor, int limit)
-+{
-+    const char *name = "?";
-+    bool limited = FALSE;
-+    bool wins = (txtwin != stdscr);
-+    int result;
-+
-+    switch (flavor) {
-+    case eGetStr:
-+	name = wins ? "wgetstr" : "getstr";
-+	break;
-+    case eGetNStr:
-+	limited = TRUE;
-+	name = wins ? "wgetnstr" : "getnstr";
-+	break;
-+    case eMvGetStr:
-+	name = wins ? "mvwgetstr" : "mvgetstr";
-+	break;
-+    case eMvGetNStr:
-+	limited = TRUE;
-+	name = wins ? "mvwgetnstr" : "mvgetnstr";
-+	break;
-+    case eMaxFlavor:
-+	break;
-+    }
-+
-+    wmove(strwin, 0, 0);
-+    werase(strwin);
-+
-+    if (limited) {
-+	wprintw(strwin, "%s(%d):", name, limit);
-+    } else {
-+	wprintw(strwin, "%s:", name);
-+    }
-+    result = limited ? limit : Remainder(txtwin);
-+    ShowPrompt(txtwin, result);
-+
-+    wnoutrefresh(strwin);
-+    return result;
-+}
-+
-+static int
-+test_getstr(int level, char **argv, WINDOW *strwin)
-+{
-+    WINDOW *txtbox = 0;
-+    WINDOW *txtwin = 0;
-+    FILE *fp;
-+    int ch;
-+    int rc;
-+    int txt_x = 0, txt_y = 0;
-+    int base_y;
-+    int flavor = 0;
-+    int limit = getmaxx(strwin) - 5;
-+    int actual;
-+
-+    char buffer[MAX_COLS];
-+
-+    if (argv[level] == 0) {
-+	beep();
-+	return FALSE;
-+    }
-+
-+    if (level > 1) {
-+	txtbox = newwin(LINES - BASE_Y, COLS - level, BASE_Y, level);
-+	box(txtbox, 0, 0);
-+	wnoutrefresh(txtbox);
-+
-+	txtwin = derwin(txtbox,
-+			getmaxy(txtbox) - 2,
-+			getmaxx(txtbox) - 2,
-+			1, 1);
-+	base_y = 0;
-+    } else {
-+	txtwin = stdscr;
-+	base_y = BASE_Y;
-+    }
-+
-+    keypad(txtwin, TRUE);	/* enable keyboard mapping */
-+    (void) cbreak();		/* take input chars one at a time, no wait for \n */
-+    (void) noecho();		/* don't echo input */
-+
-+    txt_y = base_y;
-+    txt_x = 0;
-+    wmove(txtwin, txt_y, txt_x);
-+
-+    if ((fp = fopen(argv[level], "r")) != 0) {
-+	while ((ch = fgetc(fp)) != EOF) {
-+	    if (waddch(txtwin, UChar(ch)) != OK) {
-+		break;
-+	    }
-+	}
-+	fclose(fp);
-+    } else {
-+	wprintw(txtwin, "Cannot open:\n%s", argv[1]);
-+    }
-+
-+    wmove(txtwin, txt_y, txt_x);
-+    actual = ShowFlavor(strwin, txtwin, flavor, limit);
-+    while (!Quit(ch = mvwgetch(txtwin, txt_y, txt_x))) {
-+	switch (ch) {
-+	case KEY_DOWN:
-+	case 'j':
-+	    if (txt_y < getmaxy(txtwin) - 1) {
-+		MovePrompt(txtwin, actual, ++txt_y, txt_x);
-+	    } else {
-+		beep();
-+	    }
-+	    break;
-+	case KEY_UP:
-+	case 'k':
-+	    if (txt_y > base_y) {
-+		MovePrompt(txtwin, actual, --txt_y, txt_x);
-+	    } else {
-+		beep();
-+	    }
-+	    break;
-+	case KEY_LEFT:
-+	case 'h':
-+	    if (txt_x > 0) {
-+		MovePrompt(txtwin, actual, txt_y, --txt_x);
-+	    } else {
-+		beep();
-+	    }
-+	    break;
-+	case KEY_RIGHT:
-+	case 'l':
-+	    if (txt_x < getmaxx(txtwin) - 1) {
-+		MovePrompt(txtwin, actual, txt_y, ++txt_x);
-+	    } else {
-+		beep();
-+	    }
-+	    break;
-+
-+	case 'w':
-+	    test_getstr(level + 1, argv, strwin);
-+	    if (txtbox != 0) {
-+		touchwin(txtbox);
-+		wnoutrefresh(txtbox);
-+	    } else {
-+		touchwin(txtwin);
-+		wnoutrefresh(txtwin);
-+	    }
-+	    break;
-+
-+	case '-':
-+	    if (limit > 0) {
-+		actual = ShowFlavor(strwin, txtwin, flavor, --limit);
-+		MovePrompt(txtwin, actual, txt_y, txt_x);
-+	    } else {
-+		beep();
-+	    }
-+	    break;
-+
-+	case '+':
-+	    actual = ShowFlavor(strwin, txtwin, flavor, ++limit);
-+	    MovePrompt(txtwin, actual, txt_y, txt_x);
-+	    break;
-+
-+	case '<':
-+	    if (flavor > 0) {
-+		actual = ShowFlavor(strwin, txtwin, --flavor, limit);
-+		MovePrompt(txtwin, actual, txt_y, txt_x);
-+	    } else {
-+		beep();
-+	    }
-+	    break;
-+
-+	case '>':
-+	    if (flavor + 1 < eMaxFlavor) {
-+		actual = ShowFlavor(strwin, txtwin, ++flavor, limit);
-+		MovePrompt(txtwin, actual, txt_y, txt_x);
-+	    } else {
-+		beep();
-+	    }
-+	    break;
-+
-+	case ':':
-+	    actual = ShowFlavor(strwin, txtwin, flavor, limit);
-+	    *buffer = '\0';
-+	    rc = ERR;
-+	    echo();
-+	    wattrset(txtwin, A_REVERSE);
-+	    switch (flavor) {
-+	    case eGetStr:
-+		if (txtwin != stdscr) {
-+		    wmove(txtwin, txt_y, txt_x);
-+		    rc = wgetstr(txtwin, buffer);
-+		} else {
-+		    move(txt_y, txt_x);
-+		    rc = getstr(buffer);
-+		}
-+		break;
-+	    case eGetNStr:
-+		if (txtwin != stdscr) {
-+		    wmove(txtwin, txt_y, txt_x);
-+		    rc = wgetnstr(txtwin, buffer, limit);
-+		} else {
-+		    move(txt_y, txt_x);
-+		    rc = getnstr(buffer, limit);
-+		}
-+		break;
-+	    case eMvGetStr:
-+		if (txtwin != stdscr) {
-+		    rc = mvwgetstr(txtwin, txt_y, txt_x, buffer);
-+		} else {
-+		    rc = mvgetstr(txt_y, txt_x, buffer);
-+		}
-+		break;
-+	    case eMvGetNStr:
-+		if (txtwin != stdscr) {
-+		    rc = mvwgetnstr(txtwin, txt_y, txt_x, buffer, limit);
-+		} else {
-+		    rc = mvgetnstr(txt_y, txt_x, buffer, limit);
-+		}
-+		break;
-+	    case eMaxFlavor:
-+		break;
-+	    }
-+	    noecho();
-+	    wattrset(txtwin, A_NORMAL);
-+	    wprintw(strwin, "%d:%s", rc, buffer);
-+	    wnoutrefresh(strwin);
-+	    break;
-+	default:
-+	    beep();
-+	    break;
-+	}
-+	doupdate();
-+    }
-+    if (level > 1) {
-+	delwin(txtwin);
-+	delwin(txtbox);
-+    }
-+    return TRUE;
-+}
-+
-+int
-+main(int argc, char *argv[])
-+{
-+    WINDOW *chrbox;
-+    WINDOW *strwin;
-+
-+    setlocale(LC_ALL, "");
-+
-+    if (argc < 2) {
-+	fprintf(stderr, "usage: %s file\n", argv[0]);
-+	return EXIT_FAILURE;
-+    }
-+
-+    initscr();
-+
-+    chrbox = derwin(stdscr, BASE_Y, COLS, 0, 0);
-+    box(chrbox, 0, 0);
-+    wnoutrefresh(chrbox);
-+
-+    strwin = derwin(chrbox, 4, COLS - 2, 1, 1);
-+
-+    test_getstr(1, argv, strwin);
-+
-+    endwin();
-+    ExitProgram(EXIT_SUCCESS);
-+}
-+
-+#else
-+int
-+main(void)
-+{
-+    printf("This program requires the curses chgat function\n");
-+    ExitProgram(EXIT_FAILURE);
-+}
-+#endif
-diff -Naur ncurses-5.6.orig/test/test_instr.c ncurses-5.6/test/test_instr.c
---- ncurses-5.6.orig/test/test_instr.c	1969-12-31 19:00:00.000000000 -0500
-+++ ncurses-5.6/test/test_instr.c	2008-06-18 06:49:44.000000000 -0400
-@@ -0,0 +1,260 @@
-+/****************************************************************************
-+ * Copyright (c) 2007 Free Software Foundation, Inc.                        *
-+ *                                                                          *
-+ * Permission is hereby granted, free of charge, to any person obtaining a  *
-+ * copy of this software and associated documentation files (the            *
-+ * "Software"), to deal in the Software without restriction, including      *
-+ * without limitation the rights to use, copy, modify, merge, publish,      *
-+ * distribute, distribute with modifications, sublicense, and/or sell       *
-+ * copies of the Software, and to permit persons to whom the Software is    *
-+ * furnished to do so, subject to the following conditions:                 *
-+ *                                                                          *
-+ * The above copyright notice and this permission notice shall be included  *
-+ * in all copies or substantial portions of the Software.                   *
-+ *                                                                          *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-+ *                                                                          *
-+ * Except as contained in this notice, the name(s) of the above copyright   *
-+ * holders shall not be used in advertising or otherwise to promote the     *
-+ * sale, use or other dealings in this Software without prior written       *
-+ * authorization.                                                           *
-+ ****************************************************************************/
-+/*
-+ * $Id: test_instr.c,v 1.4 2007/07/21 19:38:04 tom Exp $
-+ *
-+ * Author: Thomas E Dickey
-+ *
-+ * Demonstrate the instr functions from the curses library.
-+
-+       int instr(char *str);
-+       int innstr(char *str, int n);
-+       int winstr(WINDOW *win, char *str);
-+       int winnstr(WINDOW *win, char *str, int n);
-+       int mvinstr(int y, int x, char *str);
-+       int mvinnstr(int y, int x, char *str, int n);
-+       int mvwinstr(WINDOW *win, int y, int x, char *str);
-+       int mvwinnstr(WINDOW *win, int y, int x, char *str, int n);
-+ */
-+
-+#include <test.priv.h>
-+
-+#define BASE_Y 6
-+#define MAX_COLS 1024
-+
-+static bool
-+Quit(int ch)
-+{
-+    return (ch == ERR || ch == 'q' || ch == QUIT || ch == ESCAPE);
-+}
-+
-+static void
-+show_1st(WINDOW *win, int line, char *buffer)
-+{
-+    mvwaddstr(win, line, 5, buffer);
-+}
-+
-+static void
-+showmore(WINDOW *win, int line, char *buffer)
-+{
-+    wmove(win, line, 0);
-+    wclrtoeol(win);
-+    show_1st(win, line, buffer);
-+}
-+
-+static int
-+test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
-+{
-+    WINDOW *txtbox = 0;
-+    WINDOW *txtwin = 0;
-+    FILE *fp;
-+    int ch;
-+    int txt_x = 0, txt_y = 0;
-+    int base_y;
-+    int limit = getmaxx(strwin) - 5;
-+
-+    char buffer[MAX_COLS];
-+
-+    if (argv[level] == 0) {
-+	beep();
-+	return FALSE;
-+    }
-+
-+    if (level > 1) {
-+	txtbox = newwin(LINES - BASE_Y, COLS - level, BASE_Y, level);
-+	box(txtbox, 0, 0);
-+	wnoutrefresh(txtbox);
-+
-+	txtwin = derwin(txtbox,
-+			getmaxy(txtbox) - 2,
-+			getmaxx(txtbox) - 2,
-+			1, 1);
-+	base_y = 0;
-+    } else {
-+	txtwin = stdscr;
-+	base_y = BASE_Y;
-+    }
-+
-+    keypad(txtwin, TRUE);	/* enable keyboard mapping */
-+    (void) cbreak();		/* take input chars one at a time, no wait for \n */
-+    (void) noecho();		/* don't echo input */
-+
-+    txt_y = base_y;
-+    txt_x = 0;
-+    wmove(txtwin, txt_y, txt_x);
-+
-+    if ((fp = fopen(argv[level], "r")) != 0) {
-+	while ((ch = fgetc(fp)) != EOF) {
-+	    if (waddch(txtwin, UChar(ch)) != OK) {
-+		break;
-+	    }
-+	}
-+	fclose(fp);
-+    } else {
-+	wprintw(txtwin, "Cannot open:\n%s", argv[1]);
-+    }
-+
-+    while (!Quit(ch = mvwgetch(txtwin, txt_y, txt_x))) {
-+	switch (ch) {
-+	case KEY_DOWN:
-+	case 'j':
-+	    if (txt_y < getmaxy(txtwin) - 1)
-+		txt_y++;
-+	    else
-+		beep();
-+	    break;
-+	case KEY_UP:
-+	case 'k':
-+	    if (txt_y > base_y)
-+		txt_y--;
-+	    else
-+		beep();
-+	    break;
-+	case KEY_LEFT:
-+	case 'h':
-+	    if (txt_x > 0)
-+		txt_x--;
-+	    else
-+		beep();
-+	    break;
-+	case KEY_RIGHT:
-+	case 'l':
-+	    if (txt_x < getmaxx(txtwin) - 1)
-+		txt_x++;
-+	    else
-+		beep();
-+	    break;
-+	case 'w':
-+	    test_inchs(level + 1, argv, chrwin, strwin);
-+	    if (txtbox != 0) {
-+		touchwin(txtbox);
-+		wnoutrefresh(txtbox);
-+	    } else {
-+		touchwin(txtwin);
-+		wnoutrefresh(txtwin);
-+	    }
-+	    break;
-+	case '-':
-+	    if (limit > 0) {
-+		--limit;
-+	    } else {
-+		beep();
-+	    }
-+	    break;
-+	case '+':
-+	    ++limit;
-+	    break;
-+	default:
-+	    beep();
-+	    break;
-+	}
-+
-+	mvwprintw(chrwin, 0, 0, "line:");
-+	wclrtoeol(chrwin);
-+
-+	if (txtwin != stdscr) {
-+	    wmove(txtwin, txt_y, txt_x);
-+
-+	    if (winstr(txtwin, buffer) != ERR) {
-+		show_1st(chrwin, 0, buffer);
-+	    }
-+	    if (mvwinstr(txtwin, txt_y, txt_x, buffer) != ERR) {
-+		showmore(chrwin, 1, buffer);
-+	    }
-+	} else {
-+	    move(txt_y, txt_x);
-+
-+	    if (instr(buffer) != ERR) {
-+		show_1st(chrwin, 0, buffer);
-+	    }
-+	    if (mvinstr(txt_y, txt_x, buffer) != ERR) {
-+		showmore(chrwin, 1, buffer);
-+	    }
-+	}
-+	wnoutrefresh(chrwin);
-+
-+	mvwprintw(strwin, 0, 0, "%4d:", limit);
-+	wclrtobot(strwin);
-+
-+	if (txtwin != stdscr) {
-+	    wmove(txtwin, txt_y, txt_x);
-+	    if (winnstr(txtwin, buffer, limit) != ERR) {
-+		show_1st(strwin, 0, buffer);
-+	    }
-+
-+	    if (mvwinnstr(txtwin, txt_y, txt_x, buffer, limit) != ERR) {
-+		showmore(strwin, 1, buffer);
-+	    }
-+	} else {
-+	    move(txt_y, txt_x);
-+	    if (innstr(buffer, limit) != ERR) {
-+		show_1st(strwin, 0, buffer);
-+	    }
-+
-+	    if (mvinnstr(txt_y, txt_x, buffer, limit) != ERR) {
-+		showmore(strwin, 1, buffer);
-+	    }
-+	}
-+
-+	wnoutrefresh(strwin);
-+    }
-+    if (level > 1) {
-+	delwin(txtwin);
-+	delwin(txtbox);
-+    }
-+    return TRUE;
-+}
-+
-+int
-+main(int argc, char *argv[])
-+{
-+    WINDOW *chrbox;
-+    WINDOW *chrwin;
-+    WINDOW *strwin;
-+
-+    setlocale(LC_ALL, "");
-+
-+    if (argc < 2) {
-+	fprintf(stderr, "usage: %s file\n", argv[0]);
-+	return EXIT_FAILURE;
-+    }
-+
-+    initscr();
-+
-+    chrbox = derwin(stdscr, BASE_Y, COLS, 0, 0);
-+    box(chrbox, 0, 0);
-+    wnoutrefresh(chrbox);
-+
-+    chrwin = derwin(chrbox, 2, COLS - 2, 1, 1);
-+    strwin = derwin(chrbox, 2, COLS - 2, 3, 1);
-+
-+    test_inchs(1, argv, chrwin, strwin);
-+
-+    endwin();
-+    ExitProgram(EXIT_SUCCESS);
-+}
-diff -Naur ncurses-5.6.orig/test/test_inwstr.c ncurses-5.6/test/test_inwstr.c
---- ncurses-5.6.orig/test/test_inwstr.c	1969-12-31 19:00:00.000000000 -0500
-+++ ncurses-5.6/test/test_inwstr.c	2008-06-18 06:49:44.000000000 -0400
-@@ -0,0 +1,269 @@
-+/****************************************************************************
-+ * Copyright (c) 2007 Free Software Foundation, Inc.                        *
-+ *                                                                          *
-+ * Permission is hereby granted, free of charge, to any person obtaining a  *
-+ * copy of this software and associated documentation files (the            *
-+ * "Software"), to deal in the Software without restriction, including      *
-+ * without limitation the rights to use, copy, modify, merge, publish,      *
-+ * distribute, distribute with modifications, sublicense, and/or sell       *
-+ * copies of the Software, and to permit persons to whom the Software is    *
-+ * furnished to do so, subject to the following conditions:                 *
-+ *                                                                          *
-+ * The above copyright notice and this permission notice shall be included  *
-+ * in all copies or substantial portions of the Software.                   *
-+ *                                                                          *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-+ *                                                                          *
-+ * Except as contained in this notice, the name(s) of the above copyright   *
-+ * holders shall not be used in advertising or otherwise to promote the     *
-+ * sale, use or other dealings in this Software without prior written       *
-+ * authorization.                                                           *
-+ ****************************************************************************/
-+/*
-+ * $Id: test_inwstr.c,v 1.3 2007/07/21 22:47:42 tom Exp $
-+ *
-+ * Author: Thomas E Dickey
-+ *
-+ * Demonstrate the inwstr functions from the curses library.
-+
-+       int inwstr(wchar_t *str);
-+       int innwstr(wchar_t *str, int n);
-+       int winwstr(WINDOW *win, wchar_t *str);
-+       int winnwstr(WINDOW *win, wchar_t *str, int n);
-+       int mvinwstr(int y, int x, wchar_t *str);
-+       int mvinnwstr(int y, int x, wchar_t *str, int n);
-+       int mvwinwstr(WINDOW *win, int y, int x, wchar_t *str);
-+       int mvwinnwstr(WINDOW *win, int y, int x, wchar_t *str, int n);
-+ */
-+
-+#include <test.priv.h>
-+
-+#if USE_WIDEC_SUPPORT
-+
-+#define BASE_Y 6
-+#define MAX_COLS 1024
-+
-+static bool
-+Quit(int ch)
-+{
-+    return (ch == ERR || ch == 'q' || ch == QUIT || ch == ESCAPE);
-+}
-+
-+static void
-+show_1st(WINDOW *win, int line, wchar_t *buffer)
-+{
-+    mvwaddwstr(win, line, 5, buffer);
-+}
-+
-+static void
-+showmore(WINDOW *win, int line, wchar_t *buffer)
-+{
-+    wmove(win, line, 0);
-+    wclrtoeol(win);
-+    show_1st(win, line, buffer);
-+}
-+
-+static int
-+test_inchs(int level, char **argv, WINDOW *chrwin, WINDOW *strwin)
-+{
-+    WINDOW *txtbox = 0;
-+    WINDOW *txtwin = 0;
-+    FILE *fp;
-+    int ch;
-+    int txt_x = 0, txt_y = 0;
-+    int base_y;
-+    int limit = getmaxx(strwin) - 5;
-+    wchar_t buffer[MAX_COLS];
-+
-+    if (argv[level] == 0) {
-+	beep();
-+	return FALSE;
-+    }
-+
-+    if (level > 1) {
-+	txtbox = newwin(LINES - BASE_Y, COLS - level, BASE_Y, level);
-+	box(txtbox, 0, 0);
-+	wnoutrefresh(txtbox);
-+
-+	txtwin = derwin(txtbox,
-+			getmaxy(txtbox) - 2,
-+			getmaxx(txtbox) - 2,
-+			1, 1);
-+	base_y = 0;
-+    } else {
-+	txtwin = stdscr;
-+	base_y = BASE_Y;
-+    }
-+
-+    keypad(txtwin, TRUE);	/* enable keyboard mapping */
-+    (void) cbreak();		/* take input chars one at a time, no wait for \n */
-+    (void) noecho();		/* don't echo input */
-+
-+    txt_y = base_y;
-+    txt_x = 0;
-+    wmove(txtwin, txt_y, txt_x);
-+
-+    if ((fp = fopen(argv[level], "r")) != 0) {
-+	while ((ch = fgetc(fp)) != EOF) {
-+	    if (waddch(txtwin, UChar(ch)) != OK) {
-+		break;
-+	    }
-+	}
-+	fclose(fp);
-+    } else {
-+	wprintw(txtwin, "Cannot open:\n%s", argv[1]);
-+    }
-+
-+    while (!Quit(ch = mvwgetch(txtwin, txt_y, txt_x))) {
-+	switch (ch) {
-+	case KEY_DOWN:
-+	case 'j':
-+	    if (txt_y < getmaxy(txtwin) - 1)
-+		txt_y++;
-+	    else
-+		beep();
-+	    break;
-+	case KEY_UP:
-+	case 'k':
-+	    if (txt_y > base_y)
-+		txt_y--;
-+	    else
-+		beep();
-+	    break;
-+	case KEY_LEFT:
-+	case 'h':
-+	    if (txt_x > 0)
-+		txt_x--;
-+	    else
-+		beep();
-+	    break;
-+	case KEY_RIGHT:
-+	case 'l':
-+	    if (txt_x < getmaxx(txtwin) - 1)
-+		txt_x++;
-+	    else
-+		beep();
-+	    break;
-+	case 'w':
-+	    test_inchs(level + 1, argv, chrwin, strwin);
-+	    if (txtbox != 0) {
-+		touchwin(txtbox);
-+		wnoutrefresh(txtbox);
-+	    } else {
-+		touchwin(txtwin);
-+		wnoutrefresh(txtwin);
-+	    }
-+	    break;
-+	case '-':
-+	    if (limit > 0) {
-+		--limit;
-+	    } else {
-+		beep();
-+	    }
-+	    break;
-+	case '+':
-+	    ++limit;
-+	    break;
-+	default:
-+	    beep();
-+	    break;
-+	}
-+
-+	mvwprintw(chrwin, 0, 0, "line:");
-+	wclrtoeol(chrwin);
-+
-+	if (txtwin != stdscr) {
-+	    wmove(txtwin, txt_y, txt_x);
-+
-+	    if (winwstr(txtwin, buffer) != ERR) {
-+		show_1st(chrwin, 0, buffer);
-+	    }
-+	    if (mvwinwstr(txtwin, txt_y, txt_x, buffer) != ERR) {
-+		showmore(chrwin, 1, buffer);
-+	    }
-+	} else {
-+	    move(txt_y, txt_x);
-+
-+	    if (inwstr(buffer) != ERR) {
-+		show_1st(chrwin, 0, buffer);
-+	    }
-+	    if (mvinwstr(txt_y, txt_x, buffer) != ERR) {
-+		showmore(chrwin, 1, buffer);
-+	    }
-+	}
-+	wnoutrefresh(chrwin);
-+
-+	mvwprintw(strwin, 0, 0, "%4d:", limit);
-+	wclrtobot(strwin);
-+
-+	if (txtwin != stdscr) {
-+	    wmove(txtwin, txt_y, txt_x);
-+	    if (winnwstr(txtwin, buffer, limit) != ERR) {
-+		show_1st(strwin, 0, buffer);
-+	    }
-+
-+	    if (mvwinnwstr(txtwin, txt_y, txt_x, buffer, limit) != ERR) {
-+		showmore(strwin, 1, buffer);
-+	    }
-+	} else {
-+	    move(txt_y, txt_x);
-+	    if (innwstr(buffer, limit) != ERR) {
-+		show_1st(strwin, 0, buffer);
-+	    }
-+
-+	    if (mvinnwstr(txt_y, txt_x, buffer, limit) != ERR) {
-+		showmore(strwin, 1, buffer);
-+	    }
-+	}
-+
-+	wnoutrefresh(strwin);
-+    }
-+    if (level > 1) {
-+	delwin(txtwin);
-+	delwin(txtbox);
-+    }
-+    return TRUE;
-+}
-+
-+int
-+main(int argc, char *argv[])
-+{
-+    WINDOW *chrbox;
-+    WINDOW *chrwin;
-+    WINDOW *strwin;
-+
-+    setlocale(LC_ALL, "");
-+
-+    if (argc < 2) {
-+	fprintf(stderr, "usage: %s file\n", argv[0]);
-+	return EXIT_FAILURE;
-+    }
-+
-+    initscr();
-+
-+    chrbox = derwin(stdscr, BASE_Y, COLS, 0, 0);
-+    box(chrbox, 0, 0);
-+    wnoutrefresh(chrbox);
-+
-+    chrwin = derwin(chrbox, 2, COLS - 2, 1, 1);
-+    strwin = derwin(chrbox, 2, COLS - 2, 3, 1);
-+
-+    test_inchs(1, argv, chrwin, strwin);
-+
-+    endwin();
-+    ExitProgram(EXIT_SUCCESS);
-+}
-+#else
-+int
-+main(void)
-+{
-+    printf("This program requires the wide-ncurses library\n");
-+    ExitProgram(EXIT_FAILURE);
-+}
-+#endif
-diff -Naur ncurses-5.6.orig/test/test_opaque.c ncurses-5.6/test/test_opaque.c
---- ncurses-5.6.orig/test/test_opaque.c	1969-12-31 19:00:00.000000000 -0500
-+++ ncurses-5.6/test/test_opaque.c	2008-06-18 06:49:49.000000000 -0400
-@@ -0,0 +1,474 @@
-+/****************************************************************************
-+ * Copyright (c) 2007,2008 Free Software Foundation, Inc.                   *
-+ *                                                                          *
-+ * Permission is hereby granted, free of charge, to any person obtaining a  *
-+ * copy of this software and associated documentation files (the            *
-+ * "Software"), to deal in the Software without restriction, including      *
-+ * without limitation the rights to use, copy, modify, merge, publish,      *
-+ * distribute, distribute with modifications, sublicense, and/or sell       *
-+ * copies of the Software, and to permit persons to whom the Software is    *
-+ * furnished to do so, subject to the following conditions:                 *
-+ *                                                                          *
-+ * The above copyright notice and this permission notice shall be included  *
-+ * in all copies or substantial portions of the Software.                   *
-+ *                                                                          *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS  *
-+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF               *
-+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.   *
-+ * IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,   *
-+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR    *
-+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR    *
-+ * THE USE OR OTHER DEALINGS IN THE SOFTWARE.                               *
-+ *                                                                          *
-+ * Except as contained in this notice, the name(s) of the above copyright   *
-+ * holders shall not be used in advertising or otherwise to promote the     *
-+ * sale, use or other dealings in this Software without prior written       *
-+ * authorization.                                                           *
-+ ****************************************************************************/
-+/*
-+ * $Id: test_opaque.c,v 1.6 2008/04/05 18:03:57 tom Exp $
-+ *
-+ * Author: Thomas E Dickey
-+ *
-+ * Demonstrate the opaque functions from the curses library.
-+
-+       WINDOW * wgetparent (const WINDOW *);
-+       bool is_cleared(const WINDOW *win);
-+       bool is_idcok(const WINDOW *win);
-+       bool is_idlok(const WINDOW *win);
-+       bool is_immedok(const WINDOW *win);
-+       bool is_keypad(const WINDOW *win);
-+       bool is_leaveok(const WINDOW *win);
-+       bool is_nodelay(const WINDOW *win);
-+       bool is_notimeout(const WINDOW *win);
-+       bool is_scrollok(const WINDOW *win);
-+       bool is_syncok(const WINDOW *win);
-+       int wgetscrreg (const WINDOW *, int *, int *);
-+ */
-+
-+#include <test.priv.h>
-+
-+#define BASE_Y 6
-+#define MAX_COLS 1024
-+
-+#if defined(NCURSES_VERSION_PATCH) && (NCURSES_VERSION_PATCH >= 20080119) && NCURSES_EXT_FUNCS
-+
-+static bool
-+Quit(int ch)
-+{
-+    return (ch == 'q' || ch == QUIT || ch == ESCAPE);
-+}
-+
-+typedef bool(*BoolOpaque) (WINDOW *, int);
-+
-+static bool
-+test_opaque_cleared(WINDOW *win, int mode)
-+{
-+    if (mode >= 0) {
-+	if (mode)
-+	    wclear(win);
-+    }
-+    return is_cleared(win);
-+}
-+
-+static bool
-+test_opaque_idcok(WINDOW *win, int mode)
-+{
-+    if (mode >= 0) {
-+	idcok(win, mode);
-+    }
-+    return is_idcok(win);
-+}
-+
-+static bool
-+test_opaque_idlok(WINDOW *win, int mode)
-+{
-+    if (mode >= 0) {
-+	idlok(win, mode);
-+    }
-+    return is_idlok(win);
-+}
-+
-+static bool
-+test_opaque_immedok(WINDOW *win, int mode)
-+{
-+    if (mode >= 0) {
-+	immedok(win, mode);
-+    }
-+    return is_immedok(win);
-+}
-+
-+static bool
-+test_opaque_keypad(WINDOW *win, int mode)
-+{
-+    if (mode >= 0) {
-+	keypad(win, mode);
-+    }
-+    return is_keypad(win);
-+}
-+
-+static bool
-+test_opaque_leaveok(WINDOW *win, int mode)
-+{
-+    if (mode >= 0) {
-+	leaveok(win, mode);
-+    }
-+    return is_leaveok(win);
-+}
-+
-+static bool
-+test_opaque_nodelay(WINDOW *win, int mode)
-+{
-+    if (mode >= 0) {
-+	nodelay(win, mode);
-+    }
-+    return is_nodelay(win);
-+}
-+
-+static bool
-+test_opaque_notimeout(WINDOW *win, int mode)
-+{
-+    if (mode >= 0) {
-+	notimeout(win, mode);
-+    }
-+    return is_notimeout(win);
-+}
-+
-+static bool
-+test_opaque_scrollok(WINDOW *win, int mode)
-+{
-+    if (mode >= 0) {
-+	scrollok(win, mode);
-+    }
-+    return is_scrollok(win);
-+}
-+
-+static bool
-+test_opaque_syncok(WINDOW *win, int mode)
-+{
-+    if (mode >= 0) {
-+	syncok(win, mode);
-+    }
-+    return is_syncok(win);
-+}
-+
-+static int
-+status_y(WINDOW *stswin, int cell)
-+{
-+    return (cell % getmaxy(stswin));
-+}
-+
-+static int
-+status_x(WINDOW *stswin, int cell)
-+{
-+    return (15 * (cell / getmaxy(stswin)));
-+}
-+
-+static void
-+to_keyword(WINDOW *stswin, int cell)
-+{
-+    wmove(stswin, status_y(stswin, cell), status_x(stswin, cell));
-+}
-+
-+static void
-+to_result(WINDOW *stswin, int cell, bool before)
-+{
-+    int y = status_y(stswin, cell);
-+    int x = status_x(stswin, cell) + 11;
-+    if (!before)
-+	++x;
-+    wmove(stswin, y, x);
-+}
-+
-+static void
-+show_keyword(WINDOW *stswin, int cell, int active, const char *name)
-+{
-+    to_keyword(stswin, cell);
-+    if (active == cell)
-+	wstandout(stswin);
-+    wprintw(stswin, "%s:", name);
-+    if (active == cell)
-+	wstandend(stswin);
-+}
-+/* *INDENT-OFF* */
-+static struct {
-+    const char *name;
-+    BoolOpaque func;
-+} bool_funcs[] = {
-+    { "cleared",   test_opaque_cleared },
-+    { "idcok",     test_opaque_idcok },
-+    { "idlok",     test_opaque_idlok },
-+    { "immedok",   test_opaque_immedok },
-+    { "keypad",    test_opaque_keypad },
-+    { "leaveok",   test_opaque_leaveok },
-+    { "nodelay",   test_opaque_nodelay },
-+    { "notimeout", test_opaque_notimeout },
-+    { "scrollok",  test_opaque_scrollok },
-+    { "syncok",    test_opaque_syncok }
-+};
-+/* *INDENT-ON* */
-+
-+/*
-+ * Display and/or allow update for the properties accessed in the opaque
-+ * window.  Some may change state after refreshing the window, so we
-+ * distinguish between them using the 'before' parameter.
-+ */
-+static int
-+show_opaque(WINDOW *stswin, WINDOW *txtwin, bool before, int active)
-+{
-+    int n;
-+    int top, bottom;
-+
-+    if (before) {
-+	werase(stswin);
-+    }
-+    for (n = 0; n < (int) SIZEOF(bool_funcs); ++n) {
-+	show_keyword(stswin, n, active, bool_funcs[n].name);
-+
-+	to_result(stswin, n, before);
-+	wprintw(stswin, "%c", bool_funcs[n].func(txtwin, -1) ? 'T' : 'F');
-+    }
-+
-+    show_keyword(stswin, n, active, "wgetparent");
-+    to_result(stswin, n, TRUE);
-+    wprintw(stswin, "%p", wgetparent(txtwin));
-+
-+    ++n;
-+    show_keyword(stswin, n, active, "wgetscrreg");
-+    to_result(stswin, n, TRUE);
-+    if (wgetscrreg(txtwin, &top, &bottom) == OK)
-+	wprintw(stswin, "%d,%d", top, bottom);
-+
-+    wnoutrefresh(stswin);
-+    return active;
-+}
-+
-+static int
-+test_opaque(int level, char **argv, WINDOW *stswin)
-+{
-+    WINDOW *txtbox = 0;
-+    WINDOW *txtwin = 0;
-+    FILE *fp;
-+    int ch;
-+    int txt_x = 0, txt_y = 0;
-+    int base_y;
-+    bool in_status = FALSE;
-+    int active = 0;
-+
-+    if (argv[level] == 0) {
-+	beep();
-+	return FALSE;
-+    }
-+
-+    if (level > 1) {
-+	txtbox = newwin(LINES - BASE_Y, COLS - level, BASE_Y, level);
-+	box(txtbox, 0, 0);
-+	wnoutrefresh(txtbox);
-+
-+	txtwin = derwin(txtbox,
-+			getmaxy(txtbox) - 2,
-+			getmaxx(txtbox) - 2,
-+			1, 1);
-+	base_y = 0;
-+    } else {
-+	txtwin = stdscr;
-+	base_y = BASE_Y;
-+    }
-+
-+    keypad(txtwin, TRUE);	/* enable keyboard mapping */
-+    (void) cbreak();		/* take input chars one at a time, no wait for \n */
-+    (void) noecho();		/* don't echo input */
-+
-+    txt_y = base_y;
-+    txt_x = 0;
-+    wmove(txtwin, txt_y, txt_x);
-+
-+    if ((fp = fopen(argv[level], "r")) != 0) {
-+	while ((ch = fgetc(fp)) != EOF) {
-+	    if (waddch(txtwin, UChar(ch)) != OK) {
-+		break;
-+	    }
-+	}
-+	fclose(fp);
-+    } else {
-+	wprintw(txtwin, "Cannot open:\n%s", argv[1]);
-+    }
-+
-+    for (;;) {
-+	if (in_status) {
-+	    to_keyword(stswin, active);
-+
-+	    ch = wgetch(stswin);
-+	    show_opaque(stswin, txtwin, TRUE, active);
-+	    if (Quit(ch))
-+		break;
-+
-+	    switch (ch) {
-+	    case '\t':
-+		in_status = FALSE;
-+		break;
-+	    case KEY_DOWN:
-+	    case 'j':
-+		if (active < (int) SIZEOF(bool_funcs) - 1)
-+		    active++;
-+		else
-+		    beep();
-+		break;
-+	    case KEY_UP:
-+	    case 'k':
-+		if (active > 0)
-+		    active--;
-+		else
-+		    beep();
-+		break;
-+	    case ' ':
-+		bool_funcs[active].func(txtwin,
-+					!bool_funcs[active].func(txtwin, -1));
-+		break;
-+	    default:
-+		beep();
-+		break;
-+	    }
-+	    show_opaque(stswin, txtwin, FALSE, in_status ? active : -1);
-+	} else {
-+	    ch = mvwgetch(txtwin, txt_y, txt_x);
-+	    show_opaque(stswin, txtwin, TRUE, -1);
-+	    if (Quit(ch))
-+		break;
-+
-+	    switch (ch) {
-+	    case '\t':
-+		in_status = TRUE;
-+		break;
-+	    case KEY_DOWN:
-+	    case 'j':
-+		if (txt_y < getmaxy(txtwin) - 1)
-+		    txt_y++;
-+		else
-+		    beep();
-+		break;
-+	    case KEY_UP:
-+	    case 'k':
-+		if (txt_y > base_y)
-+		    txt_y--;
-+		else
-+		    beep();
-+		break;
-+	    case KEY_LEFT:
-+	    case 'h':
-+		if (txt_x > 0)
-+		    txt_x--;
-+		else
-+		    beep();
-+		break;
-+	    case KEY_RIGHT:
-+	    case 'l':
-+		if (txt_x < getmaxx(txtwin) - 1)
-+		    txt_x++;
-+		else
-+		    beep();
-+		break;
-+	    case 'w':
-+		test_opaque(level + 1, argv, stswin);
-+		if (txtbox != 0) {
-+		    touchwin(txtbox);
-+		    wnoutrefresh(txtbox);
-+		} else {
-+		    touchwin(txtwin);
-+		    wnoutrefresh(txtwin);
-+		}
-+		break;
-+	    default:
-+		beep();
-+		napms(100);
-+		break;
-+	    }
-+
-+	    show_opaque(stswin, txtwin, FALSE, -1);
-+	}
-+    }
-+    if (level > 1) {
-+	delwin(txtwin);
-+	delwin(txtbox);
-+    }
-+    return TRUE;
-+}
-+
-+static void
-+test_set_escdelay(void)
-+{
-+    set_escdelay((100 + ESCDELAY) / 2);
-+}
-+
-+static void
-+test_set_tabsize(void)
-+{
-+    int y0, x0;
-+    int y, x;
-+    int save_tabsize = TABSIZE;
-+    bool done = FALSE;
-+
-+    (void) cbreak();		/* take input chars one at a time, no wait for \n */
-+    (void) noecho();		/* don't echo input */
-+
-+    for (y = 0; y < LINES; ++y) {
-+	set_tabsize(y + 1);
-+	if (move(y, 0) == ERR)
-+	    break;
-+	for (x = 0; x < COLS;) {
-+	    addch('\t');
-+	    if (addch('*') == ERR) {
-+		done = TRUE;
-+		break;
-+	    }
-+	    getyx(stdscr, y0, x0);
-+	    if (y0 != y || x0 == x) {
-+		done = TRUE;
-+		break;
-+	    }
-+	}
-+    }
-+    getch();
-+    erase();
-+
-+    set_tabsize(save_tabsize);
-+}
-+
-+int
-+main(int argc, char *argv[])
-+{
-+    WINDOW *stsbox;
-+    WINDOW *stswin;
-+
-+    setlocale(LC_ALL, "");
-+
-+    if (argc < 2) {
-+	fprintf(stderr, "usage: %s file\n", argv[0]);
-+	return EXIT_FAILURE;
-+    }
-+
-+    initscr();
-+
-+    test_set_escdelay();
-+    test_set_tabsize();
-+
-+    stsbox = derwin(stdscr, BASE_Y, COLS, 0, 0);
-+    box(stsbox, 0, 0);
-+    wnoutrefresh(stsbox);
-+
-+    stswin = derwin(stsbox, BASE_Y - 2, COLS - 2, 1, 1);
-+    keypad(stswin, TRUE);
-+
-+    test_opaque(1, argv, stswin);
-+
-+    endwin();
-+    ExitProgram(EXIT_SUCCESS);
-+}
-+#else
-+int
-+main(void)
-+{
-+    printf("This program requires the ncurses library\n");
-+    ExitProgram(EXIT_FAILURE);
-+}
-+#endif
-diff -Naur ncurses-5.6.orig/test/testcurs.c ncurses-5.6/test/testcurs.c
---- ncurses-5.6.orig/test/testcurs.c	2005-12-31 15:23:09.000000000 -0500
-+++ ncurses-5.6/test/testcurs.c	2008-06-18 06:49:49.000000000 -0400
-@@ -7,7 +7,7 @@
-  *  wrs(5/28/93) -- modified to be consistent (perform identically) with either
-  *                  PDCurses or under Unix System V, R4
-  *
-- * $Id: testcurs.c,v 1.37 2005/12/31 20:23:09 tom Exp $
-+ * $Id: testcurs.c,v 1.38 2008/04/12 22:00:27 tom Exp $
-  */
- 
- #include <test.priv.h>
-@@ -51,7 +51,7 @@
- static char *
- strdup(char *s)
- {
--    char *p = (char *) malloc(strlen(s) + 1);
-+    char *p = typeMalloc(char, strlen(s) + 1);
-     if (p)
- 	strcpy(p, s);
-     return (p);
-diff -Naur ncurses-5.6.orig/test/view.c ncurses-5.6/test/view.c
---- ncurses-5.6.orig/test/view.c	2006-05-20 11:37:03.000000000 -0400
-+++ ncurses-5.6/test/view.c	2008-06-18 06:49:46.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -50,7 +50,7 @@
-  * scroll operation worked, and the refresh() code only had to do a
-  * partial repaint.
-  *
-- * $Id: view.c,v 1.64 2006/05/20 15:37:03 tom Exp $
-+ * $Id: view.c,v 1.67 2008/01/19 21:01:21 tom Exp $
-  */
- 
- #include <test.priv.h>
-@@ -229,7 +229,7 @@
-     (void) signal(SIGINT, finish);	/* arrange interrupts to terminate */
- #endif
- 
--    while ((i = getopt(argc, argv, "cin:rtT:")) != EOF) {
-+    while ((i = getopt(argc, argv, "cin:rtT:")) != -1) {
- 	switch (i) {
- 	case 'c':
- 	    try_color = TRUE;
-@@ -374,7 +374,7 @@
- 		    lptr++;
- 		else
- 		    break;
--	    wscrl(stdscr, lptr - olptr);
-+	    scrl(lptr - olptr);
- 	    break;
- 
- 	case KEY_UP:
-@@ -385,7 +385,7 @@
- 		    lptr--;
- 		else
- 		    break;
--	    wscrl(stdscr, lptr - olptr);
-+	    scrl(lptr - olptr);
- 	    break;
- 
- 	case 'h':
-@@ -512,6 +512,7 @@
-     i = strlen(temp);
-     sprintf(temp + i, "view %.*s", (int) (sizeof(temp) - 7 - i), fname);
- #else
-+    (void) tag;
-     sprintf(temp, "view %.*s", (int) sizeof(temp) - 7, fname);
- #endif
-     move(0, 0);
-diff -Naur ncurses-5.6.orig/test/worm.c ncurses-5.6/test/worm.c
---- ncurses-5.6.orig/test/worm.c	2006-07-01 18:57:24.000000000 -0400
-+++ ncurses-5.6/test/worm.c	2008-06-18 06:49:48.000000000 -0400
-@@ -1,5 +1,5 @@
- /****************************************************************************
-- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
-+ * Copyright (c) 1998-2007,2008 Free Software Foundation, Inc.              *
-  *                                                                          *
-  * Permission is hereby granted, free of charge, to any person obtaining a  *
-  * copy of this software and associated documentation files (the            *
-@@ -61,11 +61,20 @@
-   traces will be dumped.  The program stops and waits for one character of
-   input at the beginning and end of the interval.
- 
--  $Id: worm.c,v 1.41 2006/07/01 22:57:24 tom Exp $
-+  $Id: worm.c,v 1.57 2008/03/02 01:43:35 tom Exp $
- */
- 
- #include <test.priv.h>
- 
-+#ifdef USE_PTHREADS
-+#include <pthread.h>
-+#endif
-+
-+WANT_USE_WINDOW();
-+
-+#define MAX_WORMS	40
-+#define MAX_LENGTH	1024
-+
- static chtype flavor[] =
- {
-     'O', '*', '#', '$', '%', '0', '@',
-@@ -77,17 +86,32 @@
- {
-     -1, 0, 1, 1, 1, 0, -1, -1
- };
--static struct worm {
--    int orientation, head;
--    short *xpos, *ypos;
--} worm[40];
-+
-+typedef struct worm {
-+    int orientation;
-+    int head;
-+    short *xpos;
-+    short *ypos;
-+    chtype attrs;
-+#ifdef USE_PTHREADS
-+    pthread_t thread;
-+#endif
-+} WORM;
-+
-+static unsigned long sequence = 0;
-+static bool quitting = FALSE;
-+
-+static WORM worm[MAX_WORMS];
-+static short **refs;
-+static int last_x, last_y;
- 
- static const char *field;
- static int length = 16, number = 3;
- static chtype trail = ' ';
- 
-+static unsigned pending;
- #ifdef TRACE
--static int generation, trace_start, trace_end, singlestep;
-+static int generation, trace_start, trace_end;
- #endif /* TRACE */
- /* *INDENT-OFF* */
- static const struct options {
-@@ -180,8 +204,7 @@
- static void
- cleanup(void)
- {
--    standend();
--    refresh();
-+    USING_WINDOW(stdscr, wrefresh);
-     curs_set(1);
-     endwin();
- }
-@@ -200,17 +223,191 @@
-     return ((float) r / 32768.);
- }
- 
-+static int
-+draw_worm(WINDOW *win, void *data)
-+{
-+    WORM *w = (WORM *) data;
-+    const struct options *op;
-+    unsigned mask = ~(1 << (w - worm));
-+    chtype attrs = w->attrs | ((mask & pending) ? A_REVERSE : 0);
-+
-+    int x;
-+    int y;
-+    int h;
-+
-+    bool done = FALSE;
-+
-+    if ((x = w->xpos[h = w->head]) < 0) {
-+	wmove(win, y = w->ypos[h] = last_y, x = w->xpos[h] = 0);
-+	waddch(win, attrs);
-+	refs[y][x]++;
-+    } else {
-+	y = w->ypos[h];
-+    }
-+
-+    if (x > last_x)
-+	x = last_x;
-+    if (y > last_y)
-+	y = last_y;
-+
-+    if (++h == length)
-+	h = 0;
-+
-+    if (w->xpos[w->head = h] >= 0) {
-+	int x1, y1;
-+	x1 = w->xpos[h];
-+	y1 = w->ypos[h];
-+	if (y1 < LINES
-+	    && x1 < COLS
-+	    && --refs[y1][x1] == 0) {
-+	    wmove(win, y1, x1);
-+	    waddch(win, trail);
-+	}
-+    }
-+
-+    op = &(x == 0
-+	   ? (y == 0
-+	      ? upleft
-+	      : (y == last_y
-+		 ? lowleft
-+		 : left))
-+	   : (x == last_x
-+	      ? (y == 0
-+		 ? upright
-+		 : (y == last_y
-+		    ? lowright
-+		    : right))
-+	      : (y == 0
-+		 ? upper
-+		 : (y == last_y
-+		    ? lower
-+		    : normal))))[w->orientation];
-+
-+    switch (op->nopts) {
-+    case 0:
-+	done = TRUE;
-+	break;
-+    case 1:
-+	w->orientation = op->opts[0];
-+	break;
-+    default:
-+	w->orientation = op->opts[(int) (ranf() * (float) op->nopts)];
-+	break;
-+    }
-+
-+    if (!done) {
-+	x += xinc[w->orientation];
-+	y += yinc[w->orientation];
-+	wmove(win, y, x);
-+
-+	if (y < 0)
-+	    y = 0;
-+	waddch(win, attrs);
-+
-+	w->ypos[h] = y;
-+	w->xpos[h] = x;
-+	refs[y][x]++;
-+    }
-+
-+    return done;
-+}
-+
-+#ifdef USE_PTHREADS
-+static bool
-+quit_worm(int bitnum)
-+{
-+    pending |= (1 << bitnum);
-+    napms(10);			/* let the other thread(s) have a chance */
-+    pending &= ~(1 << bitnum);
-+    return quitting;
-+}
-+
-+static void *
-+start_worm(void *arg)
-+{
-+    unsigned long compare = 0;
-+    Trace(("start_worm"));
-+    while (!quit_worm(((struct worm *) arg) - worm)) {
-+	while (compare < sequence) {
-+	    ++compare;
-+	    use_window(stdscr, draw_worm, arg);
-+	}
-+    }
-+    Trace(("...start_worm (done)"));
-+    return NULL;
-+}
-+#endif
-+
-+static bool
-+draw_all_worms(void)
-+{
-+    bool done = FALSE;
-+    int n;
-+    struct worm *w;
-+
-+#ifdef USE_PTHREADS
-+    static bool first = TRUE;
-+    if (first) {
-+	first = FALSE;
-+	for (n = 0, w = &worm[0]; n < number; n++, w++) {
-+	    int rc;
-+	    rc = pthread_create(&(w->thread), NULL, start_worm, w);
-+	}
-+    }
-+#else
-+    for (n = 0, w = &worm[0]; n < number; n++, w++) {
-+	if (use_window(stdscr, draw_worm, w))
-+	    done = TRUE;
-+    }
-+#endif
-+    return done;
-+}
-+
-+static int
-+get_input(void)
-+{
-+    int ch;
-+    ch = USING_WINDOW(stdscr, wgetch);
-+    return ch;
-+}
-+
-+#ifdef KEY_RESIZE
-+static int
-+update_refs(WINDOW *win)
-+{
-+    int x, y;
-+
-+    (void) win;
-+    if (last_x != COLS - 1) {
-+	for (y = 0; y <= last_y; y++) {
-+	    refs[y] = typeRealloc(short, COLS, refs[y]);
-+	    for (x = last_x + 1; x < COLS; x++)
-+		refs[y][x] = 0;
-+	}
-+	last_x = COLS - 1;
-+    }
-+    if (last_y != LINES - 1) {
-+	for (y = LINES; y <= last_y; y++)
-+	    free(refs[y]);
-+	refs = typeRealloc(short *, LINES, refs);
-+	for (y = last_y + 1; y < LINES; y++) {
-+	    refs[y] = typeMalloc(short, COLS);
-+	    for (x = 0; x < COLS; x++)
-+		refs[y][x] = 0;
-+	}
-+	last_y = LINES - 1;
-+    }
-+    return OK;
-+}
-+#endif
-+
- int
- main(int argc, char *argv[])
- {
--    short **ref;
-     int x, y;
-     int n;
-     struct worm *w;
--    const struct options *op;
--    int h;
-     short *ip;
--    int last, bottom;
-     bool done = FALSE;
- 
-     setlocale(LC_ALL, "");
-@@ -227,7 +424,7 @@
- 	case 'l':
- 	    if (++x == argc)
- 		goto usage;
--	    if ((length = atoi(argv[x])) < 2 || length > 1024) {
-+	    if ((length = atoi(argv[x])) < 2 || length > MAX_LENGTH) {
- 		fprintf(stderr, "%s: Invalid length\n", *argv);
- 		ExitProgram(EXIT_FAILURE);
- 	    }
-@@ -235,7 +432,7 @@
- 	case 'n':
- 	    if (++x == argc)
- 		goto usage;
--	    if ((number = atoi(argv[x])) < 1 || number > 40) {
-+	    if ((number = atoi(argv[x])) < 1 || number > MAX_WORMS) {
- 		fprintf(stderr, "%s: Invalid number of worms\n", *argv);
- 		ExitProgram(EXIT_FAILURE);
- 	    }
-@@ -244,9 +441,6 @@
- 	    trail = '.';
- 	    break;
- #ifdef TRACE
--	case 'S':
--	    singlestep = TRUE;
--	    break;
- 	case 'T':
- 	    trace_start = atoi(argv[++x]);
- 	    trace_end = atoi(argv[++x]);
-@@ -271,8 +465,8 @@
- 
-     curs_set(0);
- 
--    bottom = LINES - 1;
--    last = COLS - 1;
-+    last_y = LINES - 1;
-+    last_x = COLS - 1;
- 
- #ifdef A_COLOR
-     if (has_colors()) {
-@@ -297,21 +491,24 @@
-     }
- #endif /* A_COLOR */
- 
--    ref = typeMalloc(short *, LINES);
-+    refs = typeMalloc(short *, LINES);
-     for (y = 0; y < LINES; y++) {
--	ref[y] = typeMalloc(short, COLS);
-+	refs[y] = typeMalloc(short, COLS);
- 	for (x = 0; x < COLS; x++) {
--	    ref[y][x] = 0;
-+	    refs[y][x] = 0;
- 	}
-     }
- 
- #ifdef BADCORNER
-     /* if addressing the lower right corner doesn't work in your curses */
--    ref[bottom][last] = 1;
-+    refs[last_y][last_x] = 1;
- #endif /* BADCORNER */
- 
-     for (n = number, w = &worm[0]; --n >= 0; w++) {
--	w->orientation = w->head = 0;
-+	w->attrs = flavor[n % SIZEOF(flavor)];
-+	w->orientation = 0;
-+	w->head = 0;
-+
- 	if (!(ip = typeMalloc(short, (length + 1)))) {
- 	    fprintf(stderr, "%s: out of memory\n", *argv);
- 	    ExitProgram(EXIT_FAILURE);
-@@ -330,7 +527,7 @@
-     if (field) {
- 	const char *p;
- 	p = field;
--	for (y = bottom; --y >= 0;) {
-+	for (y = last_y; --y >= 0;) {
- 	    for (x = COLS; --x >= 0;) {
- 		addch((chtype) (*p++));
- 		if (!*p)
-@@ -338,60 +535,40 @@
- 	    }
- 	}
-     }
--    napms(10);
--    refresh();
--#ifndef TRACE
-+    USING_WINDOW(stdscr, wrefresh);
-     nodelay(stdscr, TRUE);
--#endif
- 
-     while (!done) {
--#ifdef TRACE
--	if (trace_start || trace_end) {
--	    if (generation == trace_start) {
--		trace(TRACE_CALLS);
--		getch();
--	    } else if (generation == trace_end) {
--		trace(0);
--		getch();
--	    }
-+	int ch;
- 
--	    if (singlestep && generation > trace_start && generation < trace_end)
--		getch();
-+	++sequence;
-+	if ((ch = get_input()) > 0) {
-+#ifdef TRACE
-+	    if (trace_start || trace_end) {
-+		if (generation == trace_start) {
-+		    trace(TRACE_CALLS);
-+		    get_input();
-+		} else if (generation == trace_end) {
-+		    trace(0);
-+		    get_input();
-+		}
- 
--	    generation++;
--	}
--#else
--	int ch;
-+		generation++;
-+	    }
-+#endif
- 
--	if ((ch = getch()) > 0) {
- #ifdef KEY_RESIZE
- 	    if (ch == KEY_RESIZE) {
--		if (last != COLS - 1) {
--		    for (y = 0; y <= bottom; y++) {
--			ref[y] = typeRealloc(short, COLS, ref[y]);
--			for (x = last + 1; x < COLS; x++)
--			    ref[y][x] = 0;
--		    }
--		    last = COLS - 1;
--		}
--		if (bottom != LINES - 1) {
--		    for (y = LINES; y <= bottom; y++)
--			free(ref[y]);
--		    ref = typeRealloc(short *, LINES, ref);
--		    for (y = bottom + 1; y < LINES; y++) {
--			ref[y] = typeMalloc(short, COLS);
--			for (x = 0; x < COLS; x++)
--			    ref[y][x] = 0;
--		    }
--		    bottom = LINES - 1;
--		}
-+		USING_WINDOW(stdscr, update_refs);
- 	    }
- #endif
-+
- 	    /*
- 	     * Make it simple to put this into single-step mode, or resume
- 	     * normal operation -T.Dickey
- 	     */
- 	    if (ch == 'q') {
-+		quitting = TRUE;
- 		done = TRUE;
- 		continue;
- 	    } else if (ch == 's') {
-@@ -400,69 +577,32 @@
- 		nodelay(stdscr, TRUE);
- 	    }
- 	}
--#endif /* TRACE */
- 
--	for (n = 0, w = &worm[0]; n < number; n++, w++) {
--	    if ((x = w->xpos[h = w->head]) < 0) {
--		move(y = w->ypos[h] = bottom, x = w->xpos[h] = 0);
--		addch(flavor[n % SIZEOF(flavor)]);
--		ref[y][x]++;
--	    } else {
--		y = w->ypos[h];
--	    }
--	    if (x > last)
--		x = last;
--	    if (y > bottom)
--		y = bottom;
--	    if (++h == length)
--		h = 0;
--	    if (w->xpos[w->head = h] >= 0) {
--		int x1, y1;
--		x1 = w->xpos[h];
--		y1 = w->ypos[h];
--		if (y1 < LINES
--		    && x1 < COLS
--		    && --ref[y1][x1] == 0) {
--		    move(y1, x1);
--		    addch(trail);
--		}
--	    }
--	    op = &(x == 0 ? (y == 0 ? upleft : (y == bottom ? lowleft :
--						left)) :
--		   (x == last ? (y == 0 ? upright : (y == bottom ? lowright :
--						     right)) :
--		    (y == 0 ? upper : (y == bottom ? lower : normal))))[w->orientation];
--	    switch (op->nopts) {
--	    case 0:
--		done = TRUE;
--		continue;
--	    case 1:
--		w->orientation = op->opts[0];
--		break;
--	    default:
--		w->orientation = op->opts[(int) (ranf() * (float) op->nopts)];
--	    }
--	    move(y += yinc[w->orientation], x += xinc[w->orientation]);
--
--	    if (y < 0)
--		y = 0;
--	    addch(flavor[n % SIZEOF(flavor)]);
--	    ref[w->ypos[h] = y][w->xpos[h] = x]++;
--	}
-+	done = draw_all_worms();
- 	napms(10);
--	refresh();
-+	USING_WINDOW(stdscr, wrefresh);
-     }
- 
-+    Trace(("Cleanup"));
-     cleanup();
- #ifdef NO_LEAKS
-     for (y = 0; y < LINES; y++) {
--	free(ref[y]);
-+	free(refs[y]);
-     }
--    free(ref);
-+    free(refs);
-     for (n = number, w = &worm[0]; --n >= 0; w++) {
- 	free(w->xpos);
- 	free(w->ypos);
-     }
- #endif
-+#ifdef USE_PTHREADS
-+    /*
-+     * Do this just in case one of the threads did not really exit.
-+     */
-+    Trace(("join all threads"));
-+    for (n = 0; n < number; n++) {
-+	pthread_join(worm[n].thread, NULL);
-+    }
-+#endif
-     ExitProgram(EXIT_SUCCESS);
- }
-diff -Naur ncurses-5.6.orig/test/xmas.c ncurses-5.6/test/xmas.c
---- ncurses-5.6.orig/test/xmas.c	2006-05-20 11:35:47.000000000 -0400
-+++ ncurses-5.6/test/xmas.c	2008-06-18 06:49:49.000000000 -0400
-@@ -92,7 +92,7 @@
- /******************************************************************************/
- 
- /*
-- * $Id: xmas.c,v 1.22 2006/05/20 15:35:47 tom Exp $
-+ * $Id: xmas.c,v 1.23 2008/04/12 22:05:04 tom Exp $
-  */
- #include <test.priv.h>
- 
-@@ -156,7 +156,7 @@
-     if (has_colors()) {
- 	int n = (color + 1);
- 	if (my_pairs == 0)
--	    my_pairs = (bool *) calloc((unsigned) (COLORS + 1), sizeof(bool));
-+	    my_pairs = typeCalloc(bool, COLORS + 1);
- 	if (!my_pairs[n]) {
- 	    init_pair(n, color, my_bg);
- 	    my_pairs[n] = TRUE;
Index: patches/net-tools-1.60-gcc34-2.patch
===================================================================
--- patches/net-tools-1.60-gcc34-2.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/net-tools-1.60-gcc34-2.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,76 @@
+Submitted By: Zack Winkles <winkie AT linuxfromscratch DOT org>
+Date: 2004-04-09
+Initial Package Version: 1.60
+Origin: N/A
+Description: Fix some occurrences of syntax that GCC 3.4 doesn't like.
+
+diff -Naur net-tools-1.60.orig/hostname.c net-tools-1.60/hostname.c
+--- net-tools-1.60.orig/hostname.c	2001-04-08 13:04:23.000000000 -0400
++++ net-tools-1.60/hostname.c	2004-04-09 13:07:20.229598908 -0400
+@@ -98,6 +98,7 @@
+ 	    fprintf(stderr, _("%s: name too long\n"), program_name);
+ 	    break;
+ 	default:
++	    ((void)0);
+ 	}
+ 	exit(1);
+     };
+@@ -117,6 +118,7 @@
+ 	    fprintf(stderr, _("%s: name too long\n"), program_name);
+ 	    break;
+ 	default:
++	    ((void)0);
+ 	}
+ 	exit(1);
+     };
+@@ -174,6 +176,7 @@
+ 	printf("%s\n", hp->h_name);
+ 	break;
+     default:
++	((void)0);
+     }
+ }
+ 
+diff -Naur net-tools-1.60.orig/lib/inet_sr.c net-tools-1.60/lib/inet_sr.c
+--- net-tools-1.60.orig/lib/inet_sr.c	2000-02-20 16:46:45.000000000 -0500
++++ net-tools-1.60/lib/inet_sr.c	2004-04-09 13:07:20.229598908 -0400
+@@ -105,6 +105,7 @@
+     case 2:
+        isnet = 0; break;
+     default:
++       ((void)0);
+     }
+ 
+     /* Fill in the other fields. */
+diff -Naur net-tools-1.60.orig/mii-tool.c net-tools-1.60/mii-tool.c
+--- net-tools-1.60.orig/mii-tool.c	2000-05-21 10:31:17.000000000 -0400
++++ net-tools-1.60/mii-tool.c	2004-04-09 13:07:18.090313038 -0400
+@@ -379,17 +379,17 @@
+ /*--------------------------------------------------------------------*/
+ 
+ const char *usage =
+-"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]
+-       -V, --version               display version information
+-       -v, --verbose               more verbose output
+-       -R, --reset                 reset MII to poweron state
+-       -r, --restart               restart autonegotiation
+-       -w, --watch                 monitor for link status changes
+-       -l, --log                   with -w, write events to syslog
+-       -A, --advertise=media,...   advertise only specified media
+-       -F, --force=media           force specified media technology
+-media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,
+-       (to advertise both HD and FD) 100baseTx, 10baseT\n";
++"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]\n"
++"       -V, --version               display version information\n"
++"       -v, --verbose               more verbose output\n"
++"       -R, --reset                 reset MII to poweron state\n"
++"       -r, --restart               restart autonegotiation\n"
++"       -w, --watch                 monitor for link status changes\n"
++"       -l, --log                   with -w, write events to syslog\n"
++"       -A, --advertise=media,...   advertise only specified media\n"
++"       -F, --force=media           force specified media technology\n"
++"media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,\n"
++"       (to advertise both HD and FD) 100baseTx, 10baseT\n";
+ 
+ int main(int argc, char **argv)
+ {
Index: patches/net-tools-1.60-gcc34-3.patch
===================================================================
--- patches/net-tools-1.60-gcc34-3.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/net-tools-1.60-gcc34-3.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,78 @@
+diff -uNr net-tools-1.60-orig/hostname.c net-tools-1.60/hostname.c
+--- net-tools-1.60-orig/hostname.c	2001-04-09 03:04:23.000000000 +1000
++++ net-tools-1.60/hostname.c	2005-04-23 12:35:54.000000000 +1000
+@@ -78,6 +78,7 @@
+             fprintf(stderr, _("%s: name too long\n"), program_name);
+             break;
+         default:
++	    ((void)0);
+         }
+ 	exit(1);
+     }
+@@ -98,6 +99,7 @@
+ 	    fprintf(stderr, _("%s: name too long\n"), program_name);
+ 	    break;
+ 	default:
++	    ((void)0);
+ 	}
+ 	exit(1);
+     };
+@@ -117,6 +119,7 @@
+ 	    fprintf(stderr, _("%s: name too long\n"), program_name);
+ 	    break;
+ 	default:
++	    ((void)0);
+ 	}
+ 	exit(1);
+     };
+@@ -174,6 +177,7 @@
+ 	printf("%s\n", hp->h_name);
+ 	break;
+     default:
++	((void)0);
+     }
+ }
+ 
+diff -uNr net-tools-1.60-orig/lib/inet_sr.c net-tools-1.60/lib/inet_sr.c
+--- net-tools-1.60-orig/lib/inet_sr.c	2000-02-21 08:46:45.000000000 +1100
++++ net-tools-1.60/lib/inet_sr.c	2005-04-23 12:36:29.000000000 +1000
+@@ -105,6 +105,7 @@
+     case 2:
+        isnet = 0; break;
+     default:
++       ((void)0);
+     }
+ 
+     /* Fill in the other fields. */
+diff -uNr net-tools-1.60-orig/mii-tool.c net-tools-1.60/mii-tool.c
+--- net-tools-1.60-orig/mii-tool.c	2000-05-22 00:31:17.000000000 +1000
++++ net-tools-1.60/mii-tool.c	2005-04-23 12:35:06.000000000 +1000
+@@ -379,17 +379,17 @@
+ /*--------------------------------------------------------------------*/
+ 
+ const char *usage =
+-"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]
+-       -V, --version               display version information
+-       -v, --verbose               more verbose output
+-       -R, --reset                 reset MII to poweron state
+-       -r, --restart               restart autonegotiation
+-       -w, --watch                 monitor for link status changes
+-       -l, --log                   with -w, write events to syslog
+-       -A, --advertise=media,...   advertise only specified media
+-       -F, --force=media           force specified media technology
+-media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,
+-       (to advertise both HD and FD) 100baseTx, 10baseT\n";
++"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]\n"
++"       -V, --version               display version information\n"
++"       -v, --verbose               more verbose output\n"
++"       -R, --reset                 reset MII to poweron state\n"
++"       -r, --restart               restart autonegotiation\n"
++"       -w, --watch                 monitor for link status changes\n"
++"       -l, --log                   with -w, write events to syslog\n"
++"       -A, --advertise=media,...   advertise only specified media\n"
++"       -F, --force=media           force specified media technology\n"
++"media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,\n"
++"       (to advertise both HD and FD) 100baseTx, 10baseT\n";
+ 
+ int main(int argc, char **argv)
+ {
Index: patches/net-tools-1.60-gcc4_fixes-1.patch
===================================================================
--- patches/net-tools-1.60-gcc4_fixes-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/net-tools-1.60-gcc4_fixes-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,39 @@
+Fixes "error: label at end of compound statement" issues
+diff -uNr net-tools-1.60-orig/hostname.c net-tools-1.60/hostname.c
+--- net-tools-1.60-orig/hostname.c	2001-04-09 03:04:23.000000000 +1000
++++ net-tools-1.60/hostname.c	2005-04-23 12:10:31.000000000 +1000
+@@ -98,6 +98,7 @@
+ 	    fprintf(stderr, _("%s: name too long\n"), program_name);
+ 	    break;
+ 	default:
++            ;
+ 	}
+ 	exit(1);
+     };
+@@ -117,6 +118,7 @@
+ 	    fprintf(stderr, _("%s: name too long\n"), program_name);
+ 	    break;
+ 	default:
++            ;
+ 	}
+ 	exit(1);
+     };
+@@ -174,6 +176,7 @@
+ 	printf("%s\n", hp->h_name);
+ 	break;
+     default:
++        ;
+     }
+ }
+ 
+diff -uNr net-tools-1.60-orig/lib/inet_sr.c net-tools-1.60/lib/inet_sr.c
+--- net-tools-1.60-orig/lib/inet_sr.c	2000-02-21 08:46:45.000000000 +1100
++++ net-tools-1.60/lib/inet_sr.c	2005-04-23 12:09:17.000000000 +1000
+@@ -105,6 +105,7 @@
+     case 2:
+        isnet = 0; break;
+     default:
++        ;
+     }
+ 
+     /* Fill in the other fields. */
Index: patches/net-tools-1.60-kernel-headers-1.patch
===================================================================
--- patches/net-tools-1.60-kernel-headers-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/net-tools-1.60-kernel-headers-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,29 @@
+Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
+Date: 2004-01-30
+Initial Package Version: 2.6
+Origin: Gentoo
+Description: Fixes Compile Issues with the 2.6 Kernel
+ 
+diff -Naur net-tools-1.60.orig/lib/x25_sr.c net-tools-1.60/lib/x25_sr.c
+--- net-tools-1.60.orig/lib/x25_sr.c	2000-05-20 13:38:10.000000000 +0000
++++ net-tools-1.60/lib/x25_sr.c	2004-01-30 19:46:39.000000000 +0000
+@@ -22,6 +22,7 @@
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+ #include <linux/x25.h>
++#include <linux/version.h>
+ #include <ctype.h>
+ #include <errno.h>
+ #include <netdb.h>
+@@ -77,7 +78,11 @@
+   rt.sigdigits=sigdigits;
+ 
+   /* x25_route_struct.address isn't type struct sockaddr_x25, Why? */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
+   memcpy(&rt.address, &sx25.sx25_addr, sizeof(x25_address));
++#else
++  memcpy(&rt.address, &sx25.sx25_addr, sizeof(struct x25_address));
++#endif
+ 
+   while (*args) {
+ 	if (!strcmp(*args,"device") || !strcmp(*args,"dev")) {
Index: patches/net-tools-1.60-miitool-gcc33-1.patch
===================================================================
--- patches/net-tools-1.60-miitool-gcc33-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/net-tools-1.60-miitool-gcc33-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,38 @@
+Submitted By: Ronald Hummelink <ronald at hummelink dot xs4all dot nl>
+Date: 2003-08-24
+Initial Package Version: 1.60
+Origin: Ronald Hummelink
+Description: mii-tool.c doesn't compile using gcc 3.3.1 and probably any gcc 3.3.x. This patch fixes a string block to a syntax gcc 3.3 likes.
+
+diff -Naur net-tools-1.60.orig/mii-tool.c net-tools-1.60/mii-tool.c
+--- net-tools-1.60.orig/mii-tool.c	2000-05-21 14:31:17.000000000 +0000
++++ net-tools-1.60/mii-tool.c	2003-08-24 20:04:38.000000000 +0000
+@@ -379,17 +379,17 @@
+ /*--------------------------------------------------------------------*/
+ 
+ const char *usage =
+-"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]
+-       -V, --version               display version information
+-       -v, --verbose               more verbose output
+-       -R, --reset                 reset MII to poweron state
+-       -r, --restart               restart autonegotiation
+-       -w, --watch                 monitor for link status changes
+-       -l, --log                   with -w, write events to syslog
+-       -A, --advertise=media,...   advertise only specified media
+-       -F, --force=media           force specified media technology
+-media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,
+-       (to advertise both HD and FD) 100baseTx, 10baseT\n";
++"usage: %s [-VvRrwl] [-A media,... | -F media] [interface ...]\n"
++"       -V, --version               display version information\n"
++"       -v, --verbose               more verbose output\n"
++"       -R, --reset                 reset MII to poweron state\n"
++"       -r, --restart               restart autonegotiation\n"
++"       -w, --watch                 monitor for link status changes\n"
++"       -l, --log                   with -w, write events to syslog\n"
++"       -A, --advertise=media,...   advertise only specified media\n"
++"       -F, --force=media           force specified media technology\n"
++"media: 100baseT4, 100baseTx-FD, 100baseTx-HD, 10baseT-FD, 10baseT-HD,\n"
++"       (to advertise both HD and FD) 100baseTx, 10baseT\n";
+ 
+ int main(int argc, char **argv)
+ {
Index: patches/ntp-4.2.0-gcc4.patch
===================================================================
--- patches/ntp-4.2.0-gcc4.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/ntp-4.2.0-gcc4.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,51 @@
+Submitted By: Ryan Oliver <ryan.oliver@pha.com.au>
+Date: 2005-04-25
+Initial Package Version: 4.2.0
+Origin: Fedora Project 
+        http://cvs.fedora.redhat.com/viewcvs/*checkout*/rpms/ntp/devel/
+Description: Fix compilation issues with gcc4
+
+--- ntp-stable-4.2.0a-20040617/include/ntp_stdlib.h.gcc4	2005-03-08 14:29:42.940559784 +0100
++++ ntp-stable-4.2.0a-20040617/include/ntp_stdlib.h	2005-03-08 14:29:43.015548384 +0100
+@@ -133,10 +133,6 @@
+ extern u_char *	cache_key;		/* key pointer */
+ extern u_int	cache_keylen;		/* key length */
+ 
+-/* clocktypes.c */
+-struct clktype;
+-extern struct clktype clktypes[];
+-
+ /* getopt.c */
+ extern char *	ntp_optarg;		/* global argument pointer */
+ extern int	ntp_optind;		/* global argv index */
+--- ntp-stable-4.2.0a-20040617/include/ntp_refclock.h.gcc4	2004-02-25 06:57:56.000000000 +0100
++++ ntp-stable-4.2.0a-20040617/include/ntp_refclock.h	2005-03-08 14:29:43.015548384 +0100
+@@ -65,6 +65,7 @@
+ 	const char *clocktype;	/* long description */
+ 	const char *abbrev;	/* short description */
+ };
++extern struct clktype clktypes[];
+ 
+ /*
+  * Configuration flag values
+--- ntp-stable-4.2.0a-20040617/include/ntpd.h.gcc4	2004-05-25 13:02:24.000000000 +0200
++++ ntp-stable-4.2.0a-20040617/include/ntpd.h	2005-03-08 14:29:43.016548232 +0100
+@@ -225,8 +225,6 @@
+ #endif
+ 
+ /* ntp_control.c */
+-struct ctl_trap;
+-extern struct ctl_trap ctl_trap[];
+ extern int	num_ctl_traps;
+ extern keyid_t	ctl_auth_keyid;		/* keyid used for authenticating write requests */
+ 
+--- ntp-stable-4.2.0a-20040617/include/ntp_control.h.gcc4	2004-05-25 13:02:23.000000000 +0200
++++ ntp-stable-4.2.0a-20040617/include/ntp_control.h	2005-03-08 14:29:43.016548232 +0100
+@@ -268,6 +268,7 @@
+ 	u_char tr_flags;		/* trap flags */
+ 	u_char tr_version;		/* version number of trapper */
+ };
++extern struct ctl_trap ctl_trap[];
+ 
+ /*
+  * Flag bits
Index: patches/openssl-0.9.7d-32bit_x86_64.patch
===================================================================
--- patches/openssl-0.9.7d-32bit_x86_64.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/openssl-0.9.7d-32bit_x86_64.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,19 @@
+Submitted By: Ryan Oliver <ryan.oliver AT pha.com.au>
+Date: 2004-10-24
+Initial Package Version: 0.9.7d
+Origin: Ryan Oliver
+Description: This patch adds a CONFIG_TARGET for x86_64 which sets
+  compiler/linker flags correctly when building openssl 32bit on a bi-arch
+  system. To build 32bit on bi-arch x86_64, configure with
+    ./Configure linux-x86_64-32 ...
+diff -uNr openssl-0.9.7d-orig/Configure openssl-0.9.7d/Configure
+--- openssl-0.9.7d-orig/Configure	2004-03-13 08:24:44.000000000 +1100
++++ openssl-0.9.7d/Configure	2004-10-24 23:34:54.291349800 +1000
+@@ -393,6 +393,7 @@
+ "linux-ia64",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-ia64-ecc",   "ecc:-DL_ENDIAN -DTERMIO -O2 -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-x86_64-32",	"gcc:-m32 -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -mcpu=k8 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC:-m32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "NetBSD-sparc",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "NetBSD-m68",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "NetBSD-x86",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
Index: patches/openssl-0.9.7d-allow_lib64.patch
===================================================================
--- patches/openssl-0.9.7d-allow_lib64.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/openssl-0.9.7d-allow_lib64.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,111 @@
+Submitted By: Ryan Oliver <ryan.oliver AT pha.com.au>
+Date: 2004-10-24
+Initial Package Version: 0.9.7d 
+Origin: Ryan Oliver
+Description: This patch allows you to alter the default library install 
+  directory (ie: */lib) to whatever is required (eg: */lib64).
+  Adds env var LIBDIR to the openssl Makefile to override the default (lib)
+  eg: for a biarch x86_64 system invoke make, make test and make install
+    make LIBDIR=lib64 ...
+diff -uNr openssl-0.9.7d-orig/Makefile.org openssl-0.9.7d/Makefile.org
+--- openssl-0.9.7d-orig/Makefile.org	2004-03-13 08:33:04.000000000 +1100
++++ openssl-0.9.7d/Makefile.org	2004-11-04 15:35:27.000000000 +1100
+@@ -71,6 +71,7 @@
+ TAR= tar
+ TARFLAGS= --no-recursion
+ MAKEDEPPROG=makedepend
++LIBDIR=lib
+ 
+ # We let the C compiler driver to take care of .s files. This is done in
+ # order to be excused from maintaining a separate set of architecture
+@@ -302,7 +303,7 @@
+ 	( set -x; ${CC} --verbose -dynamiclib -o lib$$i${SHLIB_EXT} \
+ 		lib$$i.a $$libs -all_load -current_version ${SHLIB_MAJOR}.${SHLIB_MINOR} \
+ 		-compatibility_version ${SHLIB_MAJOR}.`echo ${SHLIB_MINOR} | cut -d. -f1` \
+-		-install_name ${INSTALLTOP}/lib/lib$$i${SHLIB_EXT} ) || exit 1; \
++		-install_name ${INSTALLTOP}/$(LIBDIR)/lib$$i${SHLIB_EXT} ) || exit 1; \
+ 	libs="-l`basename $$i${SHLIB_EXT} .dylib` $$libs"; \
+ 	echo "" ; \
+ 	done
+@@ -580,7 +581,7 @@
+ openssl.pc: Makefile.ssl
+ 	@ ( echo 'prefix=$(INSTALLTOP)'; \
+ 	    echo 'exec_prefix=$${prefix}'; \
+-	    echo 'libdir=$${exec_prefix}/lib'; \
++	    echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
+ 	    echo 'includedir=$${prefix}/include'; \
+ 	    echo ''; \
+ 	    echo 'Name: OpenSSL'; \
+@@ -772,13 +773,13 @@
+ 
+ install: all install_docs
+ 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
+-		$(INSTALL_PREFIX)$(INSTALLTOP)/lib \
+-		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \
++		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
++		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \
+ 		$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
+ 		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
+ 		$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
+ 		$(INSTALL_PREFIX)$(OPENSSLDIR)/private \
+-		$(INSTALL_PREFIX)$(OPENSSLDIR)/lib
++		$(INSTALL_PREFIX)$(OPENSSLDIR)/$(LIBDIR)
+ 	@for i in $(EXHEADER) ;\
+ 	do \
+ 	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+@@ -795,10 +796,10 @@
+ 	do \
+ 		if [ -f "$$i" ]; then \
+ 		(       echo installing $$i; \
+-			cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+-			$(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+-			chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+-			mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \
++			cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++			$(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++			chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++			mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i ); \
+ 		fi; \
+ 	done;
+ 	@if [ -n "$(SHARED_LIBS)" ]; then \
+@@ -808,22 +809,22 @@
+ 			if [ -f "$$i" -o -f "$$i.a" ]; then \
+ 			(       echo installing $$i; \
+ 				if [ "$(PLATFORM)" != "Cygwin" ]; then \
+-					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+-					chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+-					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
++					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++					chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
+ 				else \
+ 					c=`echo $$i | sed 's/^lib\(.*\)\.dll/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \
+ 					cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
+ 					chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
+ 					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \
+-					cp $$i.a $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a.new; \
+-					chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a.new; \
+-					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a; \
++					cp $$i.a $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.a.new; \
++					chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.a.new; \
++					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.a.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.a; \
+ 				fi ); \
+ 			fi; \
+ 		done; \
+ 		(	here="`pwd`"; \
+-			cd $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \
++			cd $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR); \
+ 			set $(MAKE); \
+ 			$$1 -f $$here/Makefile link-shared ); \
+ 		if [ "$(INSTALLTOP)" != "/usr" ]; then \
+@@ -833,8 +834,8 @@
+ 			sed -e '1,/^$$/d' doc/openssl-shared.txt; \
+ 		fi; \
+ 	fi
+-	cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig
+-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/openssl.pc
++	cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
++	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc
+ 
+ install_docs:
+ 	@$(PERL) $(TOP)/util/mkdir-p.pl \
Index: patches/openssl-0.9.7d-mit_krb5.patch
===================================================================
--- patches/openssl-0.9.7d-mit_krb5.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/openssl-0.9.7d-mit_krb5.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,29 @@
+Submitted By: Ryan Oliver <ryan.oliver AT pha.com.au>
+Date: 2004-10-26
+Initial Package Version: 0.9.7d
+Origin: 
+Description: This patch fixes breakage when attempting to build against
+  MIT kerberos 5 
+diff -uNr openssl-0.9.7d-orig/ssl/kssl.h openssl-0.9.7d/ssl/kssl.h
+--- openssl-0.9.7d-orig/ssl/kssl.h	2003-09-28 03:55:18.000000000 +1000
++++ openssl-0.9.7d/ssl/kssl.h	2004-10-26 14:44:41.000000000 +1000
+@@ -81,9 +81,19 @@
+ */
+ #ifdef KRB5_HEIMDAL
+ typedef unsigned char krb5_octet;
++#endif
++
++#ifndef FAR
+ #define FAR
+ #endif
+ 
++/*
++**	Need errno.h w MIT Krb5
++*/
++#ifdef KRB5_MIT
++#include <errno.h>
++#endif
++
+ /*	Uncomment this to debug kssl problems or
+ **	to trace usage of the Kerberos session key
+ **
Index: patches/openssl-0.9.7f-32bit_x86_64.patch
===================================================================
--- patches/openssl-0.9.7f-32bit_x86_64.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/openssl-0.9.7f-32bit_x86_64.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,20 @@
+Submitted By: Ryan Oliver <ryan.oliver AT pha.com.au>
+Date: 2005-03-28
+Initial Package Version: 0.9.7f (need to check 0.9.7e)
+Origin: Ryan Oliver
+Description: This patch adds a CONFIG_TARGET for x86_64 which sets
+  compiler/linker flags correctly when building openssl 32bit on a bi-arch
+  system. To build 32bit on bi-arch x86_64, configure with
+    ./Configure linux-x86_64-32 ...
+
+diff -uNr openssl-0.9.7f-orig/Configure openssl-0.9.7f/Configure
+--- openssl-0.9.7f-orig/Configure	2005-03-12 22:28:21.000000000 +1100
++++ openssl-0.9.7f/Configure	2005-03-28 18:57:13.000000000 +1000
+@@ -402,6 +402,7 @@
+ "linux-ia64",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK:asm/ia64.o::::asm/sha1-ia64.o::asm/rc4-ia64.o:::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-ia64-ecc",   "ecc:-DL_ENDIAN -DTERMIO -O2 -Wall -no_cpprt::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK:asm/ia64.o::::asm/sha1-ia64.o::asm/rc4-ia64.o:::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o::::::asm/rc4-amd64.o:::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-x86_64-32", "gcc:-m32 -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -mcpu=k8 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC:-m32:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "linux-em64t", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "NetBSD-sparc",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ "NetBSD-m68",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
Index: patches/openssl-0.9.7f-allow_lib64.patch
===================================================================
--- patches/openssl-0.9.7f-allow_lib64.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/openssl-0.9.7f-allow_lib64.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,118 @@
+Submitted By: Ryan Oliver <ryan.oliver AT pha.com.au>
+Date: 2005-03-28
+Initial Package Version: 0.9.7f (need to see if this applies to 0.9.7e)
+Origin: Ryan Oliver
+Description: This patch allows you to alter the default library install
+  directory (ie: */lib) to whatever is required (eg: */lib64).
+  Adds env var LIBDIR to the openssl Makefile to override the default (lib)
+  eg: for a biarch x86_64 system invoke make, make test and make install
+    make LIBDIR=lib64 ...
+
+diff -uNr openssl-0.9.7f-orig/Makefile.org openssl-0.9.7f/Makefile.org
+--- openssl-0.9.7f-orig/Makefile.org	2005-03-15 20:46:13.000000000 +1100
++++ openssl-0.9.7f/Makefile.org	2005-03-28 16:05:32.000000000 +1000
+@@ -71,6 +71,7 @@
+ TAR= tar
+ TARFLAGS= --no-recursion
+ MAKEDEPPROG=makedepend
++LIBDIR=lib
+ 
+ # We let the C compiler driver to take care of .s files. This is done in
+ # order to be excused from maintaining a separate set of architecture
+@@ -324,7 +325,7 @@
+ 	( set -x; ${CC} --verbose -dynamiclib -o lib$$i${SHLIB_EXT} \
+ 		lib$$i.a $$libs -all_load -current_version ${SHLIB_MAJOR}.${SHLIB_MINOR} \
+ 		-compatibility_version ${SHLIB_MAJOR}.`echo ${SHLIB_MINOR} | cut -d. -f1` \
+-		-install_name ${INSTALLTOP}/lib/lib$$i${SHLIB_EXT} ) || exit 1; \
++		-install_name ${INSTALLTOP}/$(LIBDIR)/lib$$i${SHLIB_EXT} ) || exit 1; \
+ 	libs="-l`basename $$i${SHLIB_EXT} .dylib` $$libs"; \
+ 	echo "" ; \
+ 	done
+@@ -622,7 +623,7 @@
+ openssl.pc: Makefile
+ 	@ ( echo 'prefix=$(INSTALLTOP)'; \
+ 	    echo 'exec_prefix=$${prefix}'; \
+-	    echo 'libdir=$${exec_prefix}/lib'; \
++	    echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
+ 	    echo 'includedir=$${prefix}/include'; \
+ 	    echo ''; \
+ 	    echo 'Name: OpenSSL'; \
+@@ -802,8 +803,8 @@
+ 
+ install_sw:
+ 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
+-		$(INSTALL_PREFIX)$(INSTALLTOP)/lib \
+-		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \
++		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
++		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \
+ 		$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
+ 		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
+ 		$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
+@@ -824,14 +825,14 @@
+ 	do \
+ 		if [ -f "$$i" ]; then \
+ 		(       echo installing $$i; \
+-			cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
++			cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+ 			if egrep 'define OPENSSL_FIPS' $(TOP)/include/openssl/opensslconf.h > /dev/null; then \
+ 				: ; \
+ 			else \
+-				$(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
++				$(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
+ 			fi; \
+-			chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+-			mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \
++			chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++			mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i ); \
+ 		fi; \
+ 	done;
+ 	@if [ -n "$(SHARED_LIBS)" ]; then \
+@@ -841,22 +842,22 @@
+ 			if [ -f "$$i" -o -f "$$i.a" ]; then \
+ 			(       echo installing $$i; \
+ 				if [ "$(PLATFORM)" != "Cygwin" ]; then \
+-					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+-					chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+-					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
++					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++					chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
+ 				else \
+ 					c=`echo $$i | sed 's/^lib\(.*\)\.dll/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \
+ 					cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
+ 					chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
+ 					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \
+-					cp $$i.a $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a.new; \
+-					chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a.new; \
+-					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a; \
++					cp $$i.a $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.a.new; \
++					chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.a.new; \
++					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.a.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.a; \
+ 				fi ); \
+ 			fi; \
+ 		done; \
+ 		(	here="`pwd`"; \
+-			cd $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \
++			cd $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR); \
+ 			set $(MAKE); \
+ 			$$1 -f $$here/Makefile link-shared ); \
+ 		if [ "$(INSTALLTOP)" != "/usr" ]; then \
+@@ -870,13 +871,13 @@
+ 	do \
+ 		if [ -f "$$i" ]; then \
+ 		(       echo installing $$i; \
+-			cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+-			chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+-			mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \
++			cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++			chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++			mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i ); \
+ 		fi; \
+ 	done;
+-	cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig
+-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/openssl.pc
++	cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
++	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc
+ 
+ install_docs:
+ 	@$(PERL) $(TOP)/util/mkdir-p.pl \
Index: patches/patch.4.2.52.1
===================================================================
--- patches/patch.4.2.52.1	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/patch.4.2.52.1	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,36 @@
+*** mp/mp_fget.c.orig	25 Sep 2003 02:15:16 -0000	11.81
+--- mp/mp_fget.c	9 Dec 2003 19:06:28 -0000	11.82
+***************
+*** 440,446 ****
+  		c_mp->stat.st_pages--;
+  		alloc_bhp = NULL;
+  		R_UNLOCK(dbenv, &dbmp->reginfo[n_cache]);
+- 		MUTEX_LOCK(dbenv, &hp->hash_mutex);
+  
+  		/*
+  		 * We can't use the page we found in the pool if DB_MPOOL_NEW
+--- 440,445 ----
+***************
+*** 455,460 ****
+--- 454,462 ----
+  			b_incr = 0;
+  			goto alloc;
+  		}
++ 
++ 		/* We can use the page -- get the bucket lock. */
++ 		MUTEX_LOCK(dbenv, &hp->hash_mutex);
+  		break;
+  	case SECOND_MISS:
+  		/*
+*** mp/mp_fput.c.orig	30 Sep 2003 17:12:00 -0000	11.48
+--- mp/mp_fput.c	13 Dec 2003 00:08:29 -0000	11.49
+***************
+*** 285,290 ****
+--- 285,291 ----
+  		    bhp != NULL; bhp = SH_TAILQ_NEXT(bhp, hq, __bh))
+  			if (bhp->priority != UINT32_T_MAX &&
+  			    bhp->priority > MPOOL_BASE_DECREMENT)
++ 				bhp->priority -= MPOOL_BASE_DECREMENT;
+  		MUTEX_UNLOCK(dbenv, &hp->hash_mutex);
+  	}
+  }
Index: patches/patch.4.2.52.2
===================================================================
--- patches/patch.4.2.52.2	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/patch.4.2.52.2	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,45 @@
+*** lock/lock.c.save	2004-01-30 10:48:33.000000000 -0800
+--- lock/lock.c	2004-01-30 10:55:58.000000000 -0800
+***************
+*** 2216,2226 ****
+  					dp = (u_int8_t *)dp +		\
+  					    sizeof(db_pgno_t);		\
+  				} while (0)
+! #define COPY_OBJ(dp, obj)	do {					   \
+! 					memcpy(dp, obj->data, obj->size);  \
+! 					dp = (u_int8_t *)dp +		   \
+! 					     ALIGN(obj->size,		   \
+! 					     sizeof(u_int32_t)); 	   \
+  				} while (0)
+  
+  #define GET_COUNT(dp, count)	do {					\
+--- 2216,2227 ----
+  					dp = (u_int8_t *)dp +		\
+  					    sizeof(db_pgno_t);		\
+  				} while (0)
+! #define COPY_OBJ(dp, obj)	do {					\
+! 					memcpy(dp,			\
+! 					    (obj)->data, (obj)->size);  \
+! 					dp = (u_int8_t *)dp +		\
+! 					     ALIGN((obj)->size,		\
+! 					    sizeof(u_int32_t)); 	\
+  				} while (0)
+  
+  #define GET_COUNT(dp, count)	do {					\
+***************
+*** 2339,2345 ****
+  		for (i = 0; i < nlocks; i = j) {
+  			PUT_PCOUNT(dp, obj[i].ulen);
+  			PUT_SIZE(dp, obj[i].size);
+! 			COPY_OBJ(dp, obj);
+  			lock = (DB_LOCK_ILOCK *)obj[i].data;
+  			for (j = i + 1; j <= i + obj[i].ulen; j++) {
+  				lock = (DB_LOCK_ILOCK *)obj[j].data;
+--- 2340,2346 ----
+  		for (i = 0; i < nlocks; i = j) {
+  			PUT_PCOUNT(dp, obj[i].ulen);
+  			PUT_SIZE(dp, obj[i].size);
+! 			COPY_OBJ(dp, &obj[i]);
+  			lock = (DB_LOCK_ILOCK *)obj[i].data;
+  			for (j = i + 1; j <= i + obj[i].ulen; j++) {
+  				lock = (DB_LOCK_ILOCK *)obj[j].data;
Index: patches/patch.4.3.27.1
===================================================================
--- patches/patch.4.3.27.1	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/patch.4.3.27.1	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,19 @@
+*** cxx/cxx_env.cpp.orig	Thu Sep 23 12:10:12 2004
+--- cxx/cxx_env.cpp	Thu Feb  3 10:28:21 2005
+***************
+*** 848,854 ****
+  DBENV_METHOD(rep_elect,
+      (int nsites,
+      int nvotes, int priority, u_int32_t timeout, int *eidp, u_int32_t flags),
+!     (dbenv, nvotes, nsites, priority, timeout, eidp, flags))
+  
+  int DbEnv::rep_process_message(Dbt *control,
+      Dbt *rec, int *idp, DbLsn *ret_lsnp)
+--- 848,854 ----
+  DBENV_METHOD(rep_elect,
+      (int nsites,
+      int nvotes, int priority, u_int32_t timeout, int *eidp, u_int32_t flags),
+!     (dbenv, nsites, nvotes, priority, timeout, eidp, flags))
+  
+  int DbEnv::rep_process_message(Dbt *control,
+      Dbt *rec, int *idp, DbLsn *ret_lsnp)
Index: patches/patch.4.3.27.2
===================================================================
--- patches/patch.4.3.27.2	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/patch.4.3.27.2	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,51 @@
+*** build_win32/win_db.h	2004-12-23 13:59:15.000000000 +1100
+--- build_win32/win_db.h	2005-02-02 18:14:34.211471343 +1100
+***************
+*** 47,52 ****
+--- 47,58 ----
+  #define	vsnprintf		_vsnprintf
+  
+  /*
++  * Windows defines off_t to long (i.e., 32 bits).
++  */
++ #define	off_t	__db_off_t
++ typedef __int64 off_t;
++ 
++ /*
+   * Win32 does not define getopt and friends in any header file, so we must.
+   */
+  #if defined(__cplusplus)
+*** build_win64/win_db.h	2004-12-23 13:59:15.000000000 +1100
+--- build_win64/win_db.h	2005-02-02 18:14:34.216470661 +1100
+***************
+*** 47,52 ****
+--- 47,58 ----
+  #define	vsnprintf		_vsnprintf
+  
+  /*
++  * Windows defines off_t to long (i.e., 32 bits).
++  */
++ #define	off_t	__db_off_t
++ typedef __int64 off_t;
++ 
++ /*
+   * Win32 does not define getopt and friends in any header file, so we must.
+   */
+  #if defined(__cplusplus)
+*** dist/win_db.in	2004-10-08 04:41:35.000000000 +1000
+--- dist/win_db.in	2005-02-02 18:14:28.905194820 +1100
+***************
+*** 47,52 ****
+--- 47,58 ----
+  #define	vsnprintf		_vsnprintf
+  
+  /*
++  * Windows defines off_t to long (i.e., 32 bits).
++  */
++ #define	off_t	__db_off_t
++ typedef __int64 off_t;
++ 
++ /*
+   * Win32 does not define getopt and friends in any header file, so we must.
+   */
+  #if defined(__cplusplus)
Index: patches/patch.4.3.27.3
===================================================================
--- patches/patch.4.3.27.3	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/patch.4.3.27.3	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,13 @@
+*** rep/rep_region.c.orig	30 Dec 2004 21:28:00 -0000	12.1
+--- rep/rep_region.c	17 Jan 2005 15:46:40 -0000	12.3
+***************
+*** 104,109 ****
+--- 104,111 ----
+  		rep->max_gap = DB_REP_MAX_GAP;
+  		F_SET(rep, REP_F_NOARCHIVE);
+  		(void)time(&renv->rep_timestamp);
++ 		renv->op_timestamp = 0;
++ 		F_CLR(renv, DB_REGENV_REPLOCKED);
+  	} else
+  		rep = R_ADDR(infop, renv->rep_off);
+  	MUTEX_UNLOCK(dbenv, &renv->mutex);
Index: tches/perl-5.8.8-Configure_multilib-1.patch
===================================================================
--- patches/perl-5.8.8-Configure_multilib-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,35 +1,0 @@
-Submitted By: Ryan Oliver <ryan(dot)oliver(at)pha(dot)com(dot)au>
-Date: 2005-10-20
-Initial Package Version: 5.8.7
-Origin: Ryan Oliver
-Description: this patch allows perl to be installed in /usr/lib32 or /usr/lib64 instead of /usr/lib.
-
---- perl-5.8.7/Configure-ORIG	2005-10-20 11:49:47.571389008 +1000
-+++ perl-5.8.7/Configure	2005-10-20 12:30:35.571236464 +1000
-@@ -5930,6 +5930,8 @@
- : The default "style" setting is made in installstyle.U
- case "$installstyle" in
- *lib/perl5*) set dflt privlib lib/$package/$version ;;
-+*lib32/perl5*) set dflt privlib lib32/$package/$version ;;
-+*lib64/perl5*) set dflt privlib lib64/$package/$version ;;
- *)	 set dflt privlib lib/$version ;;
- esac
- eval $prefixit
-@@ -6433,6 +6435,8 @@
- case "$sitelib" in
- '') case "$installstyle" in
- 	*lib/perl5*) dflt=$siteprefix/lib/$package/site_$prog/$version ;;
-+	*lib32/perl5*) dflt=$siteprefix/lib32/$package/site_$prog/$version ;;
-+	*lib64/perl5*) dflt=$siteprefix/lib64/$package/site_$prog/$version ;;
- 	*)	 dflt=$siteprefix/lib/site_$prog/$version ;;
- 	esac
- 	;;
-@@ -6560,6 +6564,8 @@
- 		prog=`echo $package | $sed 's/-*[0-9.]*$//'`
- 		case "$installstyle" in
- 		*lib/perl5*) dflt=$vendorprefix/lib/$package/vendor_$prog/$version ;;
-+		*lib32/perl5*) dflt=$vendorprefix/lib32/$package/vendor_$prog/$version ;;
-+		*lib64/perl5*) dflt=$vendorprefix/lib64/$package/vendor_$prog/$version ;;
- 		*)	     dflt=$vendorprefix/lib/vendor_$prog/$version ;;
- 		esac
- 		;;
Index: tches/perl-5.8.8-fPIC-1.patch
===================================================================
--- patches/perl-5.8.8-fPIC-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,32 +1,0 @@
-Submitted By: Joe Ciccone <jciccone@linuxfromscratch.org>
-Date: 2006-08-20
-Initial Package Version: 5.8.8
-Upstream Status: Unknown
-Origin: http://cvs.fedora.redhat.com/viewcvs/*checkout*/devel/perl/perl-5.8.1-fpic.patch
-Description: Fixes a test that checks to see which paramater needs to be used
-             for -fPIC and forces the objects in DynaLoader to be built
-             with -fPIC.
-
-diff -Naur perl-5.8.8.orig/Configure perl-5.8.8/Configure
---- perl-5.8.8.orig/Configure	2006-08-20 15:18:40.000000000 -0400
-+++ perl-5.8.8/Configure	2006-08-20 15:21:39.000000000 -0400
-@@ -7586,7 +7586,7 @@
- 			;;
- 		*)  case "$osname" in
- 	                darwin) dflt='none' ;;
--			svr4*|esix*|solaris|nonstopux) dflt='-fPIC' ;;
-+			linux*|svr4*|esix*|solaris|nonstopux) dflt='-fPIC' ;;
- 			*)	dflt='-fpic' ;;
- 		    esac ;;
- 	    esac ;;
-diff -Naur perl-5.8.8.orig/ext/DynaLoader/hints/linux.pl perl-5.8.8/ext/DynaLoader/hints/linux.pl
---- perl-5.8.8.orig/ext/DynaLoader/hints/linux.pl	2006-08-20 15:18:41.000000000 -0400
-+++ perl-5.8.8/ext/DynaLoader/hints/linux.pl	2006-08-20 15:35:29.000000000 -0400
-@@ -2,4 +2,7 @@
- # Some Linux releases like to hide their <nlist.h>
- $self->{CCFLAGS} = $Config{ccflags} . ' -I/usr/include/libelf'
- 	if -f "/usr/include/libelf/nlist.h";
-+# Some silly modules like mod_perl use DynaLoader.a in a shared
-+# moduke, so add cccdlflags if we're going for a shared libperl
-+$self->{CCFLAGS} = ($self->{CCFLAGS} || $Config{ccflags}) . " $Config{cccdlflags}";
- 1;
Index: tches/perl-5.8.8-gcc42_fix-1.patch
===================================================================
--- patches/perl-5.8.8-gcc42_fix-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,18 +1,0 @@
-Submitted By: Joe Ciccone <jciccone@linuxfromscratch.org>
-Date: 2007-03-10
-Initial Package Version: 5.8.8
-Upstream Status: From Upstream
-Origin: http://www.nntp.perl.org/group/perl.perl5.changes/2006/07/msg16428.html
-Description: Account for a change in gcc-4.2.0.
-
-diff -Naur perl-5.8.8.orig/makedepend.SH perl-5.8.8/makedepend.SH
---- perl-5.8.8.orig/makedepend.SH	2007-03-10 08:55:07.000000000 -0500
-+++ perl-5.8.8/makedepend.SH	2007-03-10 08:55:20.000000000 -0500
-@@ -167,6 +167,7 @@
-             -e '/^#.*<builtin>/d' \
-             -e '/^#.*<built-in>/d' \
-             -e '/^#.*<command line>/d' \
-+            -e '/^#.*<command-line>/d' \
- 	    -e '/^#.*"-"/d' \
- 	    -e '/: file path prefix .* never used$/d' \
- 	    -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \
Index: tches/perl-5.8.8-libc-2.patch
===================================================================
--- patches/perl-5.8.8-libc-2.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,32 +1,0 @@
-Submitted By: Anderson Lizardo <andersonlizardo(at)yahoo(dot)com(dot)br>
-Date: 2006-02-15
-Initial Package Version: 5.8.8
-Origin: based on current LFS-BOOK patch (perl-5.8.0-libc-2.patch)
-Description: this patch adapts some hard-wired paths to the C library.
-             It uses the $prefix variable to locate the correct libc.
-
-diff -Naur perl-5.8.8.orig/hints/linux.sh perl-5.8.8/hints/linux.sh
---- perl-5.8.8.orig/hints/linux.sh	2005-11-18 01:18:45.000000000 +0000
-+++ perl-5.8.8/hints/linux.sh	2006-02-12 12:20:32.000000000 +0000
-@@ -52,9 +52,9 @@
- # We don't use __GLIBC__ and  __GLIBC_MINOR__ because they
- # are insufficiently precise to distinguish things like
- # libc-2.0.6 and libc-2.0.7.
--if test -L /lib/libc.so.6; then
--    libc=`ls -l /lib/libc.so.6 | awk '{print $NF}'`
--    libc=/lib/$libc
-+if test -L ${prefix}/lib/libc.so.6; then
-+    libc=`ls -l ${prefix}/lib/libc.so.6 | awk '{print $NF}'`
-+    libc=${prefix}/lib/$libc
- fi
- 
- # Configure may fail to find lstat() since it's a static/inline
-@@ -330,3 +330,8 @@
-     libswanted="$*"
-     ;;
- esac
-+
-+locincpth=""
-+loclibpth=""
-+glibpth="${prefix}/lib"
-+usrinc="${prefix}/include"
Index: tches/perl-5.8.8-libc_lib64-1.patch
===================================================================
--- patches/perl-5.8.8-libc_lib64-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,22 +1,0 @@
-Submitted By: Thomas Pegg <thomasp at linuxfromscratch dot org>
-Date: 2005-10-27
-Initial Package Version: 5.8.7
-Origin: based on perl-5.8.7-libc-1.patch 
-Description: this patch adapts some hard-wired paths to the C library and points it to use lib64 instead of lib.
-
-diff -uNr perl-5.8.0.orig/hints/linux.sh perl-5.8.0/hints/linux.sh
---- perl-5.8.0.orig/hints/linux.sh	2002-06-05 23:46:00.000000000 +1000
-+++ perl-5.8.0/hints/linux.sh	2003-02-19 16:32:18.000000000 +1100
-@@ -51,9 +51,9 @@
- # We don't use __GLIBC__ and  __GLIBC_MINOR__ because they 
- # are insufficiently precise to distinguish things like
- # libc-2.0.6 and libc-2.0.7.
--if test -L /lib/libc.so.6; then
--    libc=`ls -l /lib/libc.so.6 | awk '{print $NF}'`
--    libc=/lib/$libc
-+if test -L /lib64/libc.so.6; then
-+    libc=`ls -l /lib64/libc.so.6 | awk '{print $NF}'`
-+    libc=/lib64/$libc
- fi
- 
- # Configure may fail to find lstat() since it's a static/inline
Index: tches/perl-5.8.8-no_page_h-1.patch
===================================================================
--- patches/perl-5.8.8-no_page_h-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,20 +1,0 @@
-Submitted By: Joe Ciccone <jciccone@gmail.com>
-Date: 2008-06-28
-Initial Package Version: 5.8.8
-Upstream Status: Unknown
-Origin: http://trac.cross-lfs.org/ticket/160
-Description: Removes the only asm/page.h inclusion from perl.
-
-diff -Naur perl-5.8.8.orig/ext/IPC/SysV/SysV.xs perl-5.8.8/ext/IPC/SysV/SysV.xs
---- perl-5.8.8.orig/ext/IPC/SysV/SysV.xs	2001-06-30 14:46:07.000000000 -0400
-+++ perl-5.8.8/ext/IPC/SysV/SysV.xs	2008-06-28 14:03:42.804556568 -0400
-@@ -3,9 +3,6 @@
- #include "XSUB.h"
- 
- #include <sys/types.h>
--#ifdef __linux__
--#   include <asm/page.h>
--#endif
- #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
- #ifndef HAS_SEM
- #   include <sys/ipc.h>
Index: tches/perl-5.8.8-security_fixes-1.patch
===================================================================
--- patches/perl-5.8.8-security_fixes-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,306 +1,0 @@
-Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
-Date: 2008-07-09
-Initial Package Version: 5.8.8
-Upstream Status: unknown
-Origin: Extracted from redhat-enterprise.
-Description: Fixes CVE-2007-5116 and CVE-2008-1927.  NB - anyone who
-thinks we should just upgrade to 5.10.0 needs to find a fix for
-CVE-2008-2827 : no doubt 5.10.1 will fix that when it is released.
-Edited to remove the creation of regcomp.c~ which I had overlooked.
-
-diff -Naur perl-5.8.8.orig/embed.fnc perl-5.8.8/embed.fnc
---- perl-5.8.8.orig/embed.fnc	2006-01-31 14:40:27.000000000 +0000
-+++ perl-5.8.8/embed.fnc	2008-07-09 23:13:32.000000000 +0100
-@@ -1168,6 +1168,7 @@
- Es	|regnode*|regclass	|NN struct RExC_state_t *state
- ERs	|I32	|regcurly	|NN const char *
- Es	|regnode*|reg_node	|NN struct RExC_state_t *state|U8 op
-+Es	|UV	|reg_recode	|const char value|NULLOK SV **encp
- Es	|regnode*|regpiece	|NN struct RExC_state_t *state|NN I32 *flagp
- Es	|void	|reginsert	|NN struct RExC_state_t *state|U8 op|NN regnode *opnd
- Es	|void	|regoptail	|NN struct RExC_state_t *state|NN regnode *p|NN regnode *val
-diff -Naur perl-5.8.8.orig/embed.h perl-5.8.8/embed.h
---- perl-5.8.8.orig/embed.h	2006-01-31 15:50:34.000000000 +0000
-+++ perl-5.8.8/embed.h	2008-07-09 23:13:32.000000000 +0100
-@@ -1234,6 +1234,7 @@
- #define regclass		S_regclass
- #define regcurly		S_regcurly
- #define reg_node		S_reg_node
-+#define reg_recode		S_reg_recode
- #define regpiece		S_regpiece
- #define reginsert		S_reginsert
- #define regoptail		S_regoptail
-@@ -3277,6 +3278,7 @@
- #define regclass(a)		S_regclass(aTHX_ a)
- #define regcurly(a)		S_regcurly(aTHX_ a)
- #define reg_node(a,b)		S_reg_node(aTHX_ a,b)
-+#define reg_recode(a,b)		S_reg_recode(aTHX_ a,b)
- #define regpiece(a,b)		S_regpiece(aTHX_ a,b)
- #define reginsert(a,b,c)	S_reginsert(aTHX_ a,b,c)
- #define regoptail(a,b,c)	S_regoptail(aTHX_ a,b,c)
-diff -Naur perl-5.8.8.orig/pod/perldiag.pod perl-5.8.8/pod/perldiag.pod
---- perl-5.8.8.orig/pod/perldiag.pod	2006-01-06 23:16:08.000000000 +0000
-+++ perl-5.8.8/pod/perldiag.pod	2008-07-09 23:13:32.000000000 +0100
-@@ -1900,6 +1900,15 @@
- (W printf) Perl does not understand the given format conversion.  See
- L<perlfunc/sprintf>.
- 
-+=item Invalid escape in the specified encoding in regex; marked by <-- HERE in m/%s/
-+
-+(W regexp) The numeric escape (for example C<\xHH>) of value < 256
-+didn't correspond to a single character through the conversion
-+from the encoding specified by the encoding pragma.
-+The escape was replaced with REPLACEMENT CHARACTER (U+FFFD) instead.
-+The <-- HERE shows in the regular expression about where the
-+escape was discovered.
-+
- =item Invalid [] range "%s" in regex; marked by <-- HERE in m/%s/
- 
- (F) The range specified in a character class had a minimum character
-diff -Naur perl-5.8.8.orig/proto.h perl-5.8.8/proto.h
---- perl-5.8.8.orig/proto.h	2006-01-31 15:50:34.000000000 +0000
-+++ perl-5.8.8/proto.h	2008-07-09 23:13:32.000000000 +0100
-@@ -1748,6 +1748,7 @@
- 			__attribute__warn_unused_result__;
- 
- STATIC regnode*	S_reg_node(pTHX_ struct RExC_state_t *state, U8 op);
-+STATIC UV	S_reg_recode(pTHX_ const char value, SV **encp);
- STATIC regnode*	S_regpiece(pTHX_ struct RExC_state_t *state, I32 *flagp);
- STATIC void	S_reginsert(pTHX_ struct RExC_state_t *state, U8 op, regnode *opnd);
- STATIC void	S_regoptail(pTHX_ struct RExC_state_t *state, regnode *p, regnode *val);
-diff -Naur perl-5.8.8.orig/regcomp.c perl-5.8.8/regcomp.c
---- perl-5.8.8.orig/regcomp.c	2006-01-08 20:59:27.000000000 +0000
-+++ perl-5.8.8/regcomp.c	2008-07-09 23:13:32.000000000 +0100
-@@ -136,6 +136,7 @@
-     I32		seen_zerolen;
-     I32		seen_evals;
-     I32		utf8;
-+    I32		orig_utf8;
- #if ADD_TO_REGEXEC
-     char 	*starttry;		/* -Dr: where regtry was called. */
- #define RExC_starttry	(pRExC_state->starttry)
-@@ -161,6 +162,7 @@
- #define RExC_seen_zerolen	(pRExC_state->seen_zerolen)
- #define RExC_seen_evals	(pRExC_state->seen_evals)
- #define RExC_utf8	(pRExC_state->utf8)
-+#define RExC_orig_utf8 (pRExC_state->orig_utf8)
- 
- #define	ISMULT1(c)	((c) == '*' || (c) == '+' || (c) == '?')
- #define	ISMULT2(s)	((*s) == '*' || (*s) == '+' || (*s) == '?' || \
-@@ -1749,15 +1751,17 @@
-     if (exp == NULL)
- 	FAIL("NULL regexp argument");
- 
--    RExC_utf8 = pm->op_pmdynflags & PMdf_CMP_UTF8;
-+    RExC_orig_utf8 = RExC_utf8 = pm->op_pmdynflags & PMdf_CMP_UTF8;
- 
--    RExC_precomp = exp;
-     DEBUG_r({
- 	 if (!PL_colorset) reginitcolors();
- 	 PerlIO_printf(Perl_debug_log, "%sCompiling REx%s `%s%*s%s'\n",
- 		       PL_colors[4],PL_colors[5],PL_colors[0],
--		       (int)(xend - exp), RExC_precomp, PL_colors[1]);
-+		       (int)(xend - exp), exp, PL_colors[1]);
-     });
-+
-+redo_first_pass:
-+    RExC_precomp = exp;
-     RExC_flags = pm->op_pmflags;
-     RExC_sawback = 0;
- 
-@@ -1783,6 +1787,17 @@
- 	RExC_precomp = Nullch;
- 	return(NULL);
-     }
-+    if (RExC_utf8 && !RExC_orig_utf8) {
-+    	STRLEN len = xend-exp;
-+    	DEBUG_r(PerlIO_printf(Perl_debug_log,
-+	   "UTF8 mismatch! Converting to utf8 for resizing and compile\n"));
-+	exp = (char*)Perl_bytes_to_utf8(aTHX_ (U8*)exp, &len);
-+	xend = exp + len;
-+	RExC_orig_utf8 = RExC_utf8;
-+	SAVEFREEPV(exp);
-+	goto redo_first_pass;
-+    }
-+
-     DEBUG_r(PerlIO_printf(Perl_debug_log, "size %"IVdf" ", (IV)RExC_size));
- 
-     /* Small enough for pointer-storage convention?
-@@ -2775,6 +2790,39 @@
- }
- 
- /*
-+ * reg_recode
-+ *
-+ * It returns the code point in utf8 for the value in *encp.
-+ *    value: a code value in the source encoding
-+ *    encp:  a pointer to an Encode object
-+ *
-+ * If the result from Encode is not a single character,
-+ * it returns U+FFFD (Replacement character) and sets *encp to NULL.
-+ */
-+STATIC UV
-+S_reg_recode(pTHX_ const char value, SV **encp)
-+{
-+    STRLEN numlen = 1;
-+    SV * const sv = sv_2mortal(newSVpvn(&value, numlen));
-+    const char * const s = encp && *encp ? sv_recode_to_utf8(sv, *encp)
-+					 : SvPVX(sv);
-+    const STRLEN newlen = SvCUR(sv);
-+    UV uv = UNICODE_REPLACEMENT;
-+
-+    if (newlen)
-+	uv = SvUTF8(sv)
-+	     ? utf8n_to_uvchr((U8*)s, newlen, &numlen, UTF8_ALLOW_DEFAULT)
-+	     : *(U8*)s;
-+
-+    if (!newlen || numlen != newlen) {
-+	uv = UNICODE_REPLACEMENT;
-+	if (encp)
-+	    *encp = NULL;
-+    }
-+    return uv;
-+}
-+
-+/*
-  - regatom - the lowest level
-  *
-  * Optimization:  gobbles an entire sequence of ordinary characters so that
-@@ -3166,6 +3214,8 @@
- 			    ender = grok_hex(p, &numlen, &flags, NULL);
- 			    p += numlen;
- 			}
-+			if (PL_encoding && ender < 0x100)
-+			    goto recode_encoding;
- 			break;
- 		    case 'c':
- 			p++;
-@@ -3185,6 +3235,17 @@
- 			    --p;
- 			    goto loopdone;
- 			}
-+			if (PL_encoding && ender < 0x100)
-+			    goto recode_encoding;
-+			break;
-+		    recode_encoding:
-+			{
-+			    SV* enc = PL_encoding;
-+			    ender = reg_recode((const char)(U8)ender, &enc);
-+			    if (!enc && SIZE_ONLY && ckWARN(WARN_REGEXP))
-+				vWARN(p, "Invalid escape in the specified encoding");
-+			    RExC_utf8 = 1;
-+			}
- 			break;
- 		    case '\0':
- 			if (p >= RExC_end)
-@@ -3315,32 +3376,6 @@
- 	break;
-     }
- 
--    /* If the encoding pragma is in effect recode the text of
--     * any EXACT-kind nodes. */
--    if (PL_encoding && PL_regkind[(U8)OP(ret)] == EXACT) {
--	STRLEN oldlen = STR_LEN(ret);
--	SV *sv        = sv_2mortal(newSVpvn(STRING(ret), oldlen));
--
--	if (RExC_utf8)
--	    SvUTF8_on(sv);
--	if (sv_utf8_downgrade(sv, TRUE)) {
--	    const char * const s = sv_recode_to_utf8(sv, PL_encoding);
--	    const STRLEN newlen = SvCUR(sv);
--
--	    if (SvUTF8(sv))
--		RExC_utf8 = 1;
--	    if (!SIZE_ONLY) {
--		DEBUG_r(PerlIO_printf(Perl_debug_log, "recode %*s to %*s\n",
--				      (int)oldlen, STRING(ret),
--				      (int)newlen, s));
--		Copy(s, STRING(ret), newlen, char);
--		STR_LEN(ret) += newlen - oldlen;
--		RExC_emit += STR_SZ(newlen) - STR_SZ(oldlen);
--	    } else
--		RExC_size += STR_SZ(newlen) - STR_SZ(oldlen);
--	}
--    }
--
-     return(ret);
- }
- 
-@@ -3718,6 +3753,8 @@
- 		    value = grok_hex(RExC_parse, &numlen, &flags, NULL);
- 		    RExC_parse += numlen;
- 		}
-+		if (PL_encoding && value < 0x100)
-+		    goto recode_encoding;
- 		break;
- 	    case 'c':
- 		value = UCHARAT(RExC_parse++);
-@@ -3725,13 +3762,24 @@
- 		break;
- 	    case '0': case '1': case '2': case '3': case '4':
- 	    case '5': case '6': case '7': case '8': case '9':
--            {
--                I32 flags = 0;
--		numlen = 3;
--		value = grok_oct(--RExC_parse, &numlen, &flags, NULL);
--		RExC_parse += numlen;
--		break;
--            }
-+		{
-+		    I32 flags = 0;
-+		    numlen = 3;
-+		    value = grok_oct(--RExC_parse, &numlen, &flags, NULL);
-+		    RExC_parse += numlen;
-+		    if (PL_encoding && value < 0x100)
-+			goto recode_encoding;
-+		    break;
-+		}
-+	    recode_encoding:
-+		{
-+		    SV* enc = PL_encoding;
-+		    value = reg_recode((const char)(U8)value, &enc);
-+		    if (!enc && SIZE_ONLY && ckWARN(WARN_REGEXP))
-+			vWARN(RExC_parse,
-+			      "Invalid escape in the specified encoding");
-+		    break;
-+		}
- 	    default:
- 		if (!SIZE_ONLY && isALPHA(value) && ckWARN(WARN_REGEXP))
- 		    vWARN2(RExC_parse,
-diff -Naur perl-5.8.8.orig/t/uni/tr_utf8.t perl-5.8.8/t/uni/tr_utf8.t
---- perl-5.8.8.orig/t/uni/tr_utf8.t	2004-06-25 09:53:16.000000000 +0100
-+++ perl-5.8.8/t/uni/tr_utf8.t	2008-07-09 23:13:32.000000000 +0100
-@@ -31,7 +31,7 @@
- }
- 
- use strict;
--use Test::More tests => 7;
-+use Test::More tests => 8;
- 
- use encoding 'utf8';
- 
-@@ -67,4 +67,12 @@
-   $line =~ tr/bcdeghijklmnprstvwxyz$02578/××Š××¢××××²×§××× ×€ÖŒ×š×¡××°×©××××©×±×ª×²××/;
-   is($line, "a××Š××¢f××××²×§××× o×€qÖŒ×š×¡u××°×©××××©1×±34×ª6×²×9", "[perl #16843]");
- }
-+
-+{
-+  # [perl #40641]
-+  my $str = qq/GebÃ€Ã€Ã€Ã€Ã€Ã€Ã€Ã€Ã€Ã€Ã€Ã€Ã€Ã€Ã€Ã€Ã€Ã€Ã€Ã€ude/;
-+  my $reg = qr/GebÃ€Ã€Ã€Ã€Ã€Ã€Ã€Ã€Ã€Ã€Ã€Ã€Ã€Ã€Ã€Ã€Ã€Ã€Ã€Ã€ude/;
-+  ok($str =~ /$reg/, "[perl #40641]");
-+}
-+
- __END__
-diff -Naur perl-5.8.8.orig/utf8.h perl-5.8.8/utf8.h
---- perl-5.8.8.orig/utf8.h	2006-01-08 21:11:27.000000000 +0000
-+++ perl-5.8.8/utf8.h	2008-07-09 23:13:32.000000000 +0100
-@@ -198,6 +198,8 @@
- 					 UTF8_ALLOW_SURROGATE|UTF8_ALLOW_FFFF)
- #define UTF8_ALLOW_ANY			0x00FF
- #define UTF8_CHECK_ONLY			0x0200
-+#define UTF8_ALLOW_DEFAULT             (ckWARN(WARN_UTF8) ? 0 : \
-+                                        UTF8_ALLOW_ANYUV)
- 
- #define UNICODE_SURROGATE_FIRST		0xD800
- #define UNICODE_SURROGATE_LAST		0xDFFF
Index: patches/portmap-5beta-compilation_fixes-3.patch
===================================================================
--- patches/portmap-5beta-compilation_fixes-3.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/portmap-5beta-compilation_fixes-3.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,709 @@
+Submitted By: Kevin P. Fleming <kpfleming at linuxfromscratch dot org>
+Date: 2004-05-02
+Initial Package Version: 5beta
+Origin: http://archives.linuxfromscratch.org/mail-archives/blfs-dev/2003-January/001960.html
+Description: The patch was created from the portmap modified package by Mark Heerdink.
+This patch provides the following improvements:
+    * Link against dynamic tcp_wrappers.
+    * Create an install target for portmap.
+    * Compilation and security fixes.
+    * Documentation fixes.
+
+Originally created by Tushar Teredesai, updated by kpfleming to ensure
+portmap will compile without tcp_wrappers installed.
+
+$LastChangedBy: randy $
+$Date: 2004-08-15 10:47:20 -0600 (Sun, 15 Aug 2004) $
+
+diff -Naur portmap_5beta/BLURB portmap_5beta.gimli/BLURB
+--- portmap_5beta/BLURB	1996-07-06 16:09:46.000000000 -0500
++++ portmap_5beta.gimli/BLURB	2002-01-07 09:13:58.000000000 -0600
+@@ -1,3 +1,6 @@
++
++###############################################################################
++
+ @(#) BLURB 1.5 96/07/06 23:09:45
+ 
+ This is the fifth replacement portmapper release.
+diff -Naur portmap_5beta/Makefile portmap_5beta.gimli/Makefile
+--- portmap_5beta/Makefile	1996-07-06 16:06:19.000000000 -0500
++++ portmap_5beta.gimli/Makefile	2002-07-15 16:00:07.000000000 -0500
+@@ -8,7 +8,7 @@
+ # if you disagree. See `man 3 syslog' for examples. Some syslog versions
+ # do not provide this flexibility.
+ #
+-FACILITY=LOG_MAIL
++FACILITY=LOG_DAEMON
+ 
+ # To disable tcp-wrapper style access control, comment out the following
+ # macro definitions.  Access control can also be turned off by providing
+@@ -16,7 +16,8 @@
+ # daemon, is always treated as an authorized host.
+ 
+ HOSTS_ACCESS= -DHOSTS_ACCESS
+-WRAP_LIB = $(WRAP_DIR)/libwrap.a
++#WRAP_LIB = $(WRAP_DIR)/libwrap.a
++WRAP_LIB = -lwrap
+ 
+ # Comment out if your RPC library does not allocate privileged ports for
+ # requests from processes with root privilege, or the new portmap will
+@@ -71,7 +72,7 @@
+ # With verbose logging on, HP-UX 9.x and AIX 4.1 leave zombies behind when
+ # SIGCHLD is not ignored. Enable next macro for a fix.
+ #
+-# ZOMBIES = -DIGNORE_SIGCHLD	# AIX 4.x, HP-UX 9.x
++ZOMBIES = -DIGNORE_SIGCHLD	# AIX 4.x, HP-UX 9.x
+ 
+ # Uncomment the following macro if your system does not have u_long.
+ #
+@@ -81,7 +82,7 @@
+ # libwrap.a object library. WRAP_DIR should specify the directory with
+ # that library.
+ 
+-WRAP_DIR= ../tcp_wrappers
++WRAP_DIR= $(TCPD_DIR)
+ 
+ # Auxiliary object files that may be missing from your C library.
+ #
+@@ -99,22 +100,31 @@
+ 
+ # Comment out if your compiler talks ANSI and understands const
+ #
+-CONST   = -Dconst=
++#CONST   = -Dconst=
+ 
+ ### End of configurable stuff.
+ ##############################
+ 
++GLIBC=$(shell grep -s -c __GLIBC__ /usr/include/features.h)
++
++ifeq ($(GLIBC),0)
++LIBS   += # -lbsd
++else
++LIBS   += -lnsl
++endif
++
++
+ SHELL	= /bin/sh
+ 
+-COPT	= $(CONST) -Dperror=xperror $(HOSTS_ACCESS) $(CHECK_PORT) \
++COPT	= $(CONST) $(HOSTS_ACCESS) $(CHECK_PORT) \
+ 	$(SYS) -DFACILITY=$(FACILITY) $(ULONG) $(ZOMBIES) $(SA_LEN) \
+ 	$(LOOPBACK) $(SETPGRP)
+-CFLAGS	= $(COPT) -O $(NSARCHS)
++CFLAGS	= -Wall $(COPT) -O2 $(NSARCHS)
+ OBJECTS	= portmap.o pmap_check.o from_local.o $(AUX)
+ 
+ all:	portmap pmap_dump pmap_set
+ 
+-portmap: $(OBJECTS) $(WRAP_DIR)/libwrap.a
++portmap: $(OBJECTS) # $(WRAP_DIR)/libwrap.a
+ 	$(CC) $(CFLAGS) -o $@ $(OBJECTS) $(WRAP_LIB) $(LIBS)
+ 
+ pmap_dump: pmap_dump.c
+@@ -129,6 +139,17 @@
+ get_myaddress: get_myaddress.c
+ 	cc $(CFLAGS) -DTEST -o $@ get_myaddress.c $(LIBS)
+ 
++install: all
++	install -o root -g root -m 0755 -s portmap ${BASEDIR}/sbin
++	install -o root -g root -m 0755 -s pmap_dump ${BASEDIR}/usr/sbin
++	install -o root -g root -m 0755 -s pmap_set ${BASEDIR}/usr/sbin
++	install -o root -g root -m 0644 portmap.8 ${BASEDIR}/usr/share/man/man8
++	install -o root -g root -m 0644 pmap_dump.8 ${BASEDIR}/usr/share/man/man8
++	install -o root -g root -m 0644 pmap_set.8 ${BASEDIR}/usr/share/man/man8
++#	cat README BLURB >${BASEDIR}/usr/share/doc/portmap/portmapper.txt
++#	gzip -9f ${BASEDIR}/usr/share/doc/portmap/portmapper.txt
++
++
+ lint:	
+ 	lint $(COPT) $(OBJECTS:%.o=%.c)
+ 
+diff -Naur portmap_5beta/daemon.c portmap_5beta.gimli/daemon.c
+--- portmap_5beta/daemon.c	1992-06-11 15:53:12.000000000 -0500
++++ portmap_5beta.gimli/daemon.c	2002-01-07 09:22:24.000000000 -0600
+@@ -36,16 +36,13 @@
+ #endif /* LIBC_SCCS and not lint */
+ 
+ #include <fcntl.h>
+-
+-/* From unistd.h */
+-#define STDIN_FILENO	0
+-#define STDOUT_FILENO	1
+-#define STDERR_FILENO	2
++#include <unistd.h>
++#include <sys/types.h>
+ 
+ /* From paths.h */
+ #define _PATH_DEVNULL	"/dev/null"
+ 
+-daemon(nochdir, noclose)
++int daemon(nochdir, noclose)
+ 	int nochdir, noclose;
+ {
+ 	int cpid;
+diff -Naur portmap_5beta/from_local.c portmap_5beta.gimli/from_local.c
+--- portmap_5beta/from_local.c	1996-05-31 08:52:58.000000000 -0500
++++ portmap_5beta.gimli/from_local.c	2002-01-07 09:25:49.000000000 -0600
+@@ -35,7 +35,7 @@
+  * Mountain View, California  94043
+  */
+ 
+-#ifndef lint
++#ifdef lint
+ static char sccsid[] = "@(#) from_local.c 1.3 96/05/31 15:52:57";
+ #endif
+ 
+@@ -51,6 +51,9 @@
+ #include <net/if.h>
+ #include <sys/ioctl.h>
+ #include <syslog.h>
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
+ 
+ #ifndef TRUE
+ #define	TRUE	1
+@@ -96,7 +99,7 @@
+ 
+ /* find_local - find all IP addresses for this host */
+ 
+-find_local()
++int find_local()
+ {
+     struct ifconf ifc;
+     struct ifreq ifreq;
+@@ -154,7 +157,7 @@
+ 
+ /* from_local - determine whether request comes from the local system */
+ 
+-from_local(addr)
++int from_local(addr)
+ struct sockaddr_in *addr;
+ {
+     int     i;
+diff -Naur portmap_5beta/pmap_check.c portmap_5beta.gimli/pmap_check.c
+--- portmap_5beta/pmap_check.c	1996-07-07 03:49:10.000000000 -0500
++++ portmap_5beta.gimli/pmap_check.c	2002-01-07 09:37:58.000000000 -0600
+@@ -32,7 +32,7 @@
+   * Computing Science, Eindhoven University of Technology, The Netherlands.
+   */
+ 
+-#ifndef lint
++#ifdef lint
+ static char sccsid[] = "@(#) pmap_check.c 1.8 96/07/07 10:49:10";
+ #endif
+ 
+@@ -45,6 +45,11 @@
+ #include <netinet/in.h>
+ #include <rpc/rpcent.h>
+ #endif
++#include <sys/types.h>
++#include <unistd.h>
++#ifdef HOSTS_ACCESS
++#include <tcpd.h>
++#endif
+ 
+ extern char *inet_ntoa();
+ 
+@@ -110,7 +113,7 @@
+ 
+ /* check_default - additional checks for NULL, DUMP, GETPORT and unknown */
+ 
+-check_default(addr, proc, prog)
++int check_default(addr, proc, prog)
+ struct sockaddr_in *addr;
+ u_long  proc;
+ u_long  prog;
+@@ -128,7 +131,7 @@
+ 
+ /* check_privileged_port - additional checks for privileged-port updates */
+ 
+-check_privileged_port(addr, proc, prog, port)
++int check_privileged_port(addr, proc, prog, port)
+ struct sockaddr_in *addr;
+ u_long  proc;
+ u_long  prog;
+@@ -173,7 +176,7 @@
+ 
+ #else
+ 
+-check_setunset(addr, proc, prog, port)
++int check_setunset(addr, proc, prog, port)
+ struct sockaddr_in *addr;
+ u_long  proc;
+ u_long  prog;
+@@ -197,7 +200,7 @@
+ 
+ /* check_callit - additional checks for forwarded requests */
+ 
+-check_callit(addr, proc, prog, aproc)
++int check_callit(addr, proc, prog, aproc)
+ struct sockaddr_in *addr;
+ u_long  proc;
+ u_long  prog;
+@@ -249,13 +252,13 @@
+     };
+     struct proc_map *procp;
+     static struct proc_map procmap[] = {
+-	PMAPPROC_CALLIT, "callit",
+-	PMAPPROC_DUMP, "dump",
+-	PMAPPROC_GETPORT, "getport",
+-	PMAPPROC_NULL, "null",
+-	PMAPPROC_SET, "set",
+-	PMAPPROC_UNSET, "unset",
+-	0, 0,
++	{ PMAPPROC_CALLIT, "callit" },
++	{ PMAPPROC_DUMP, "dump" },
++	{ PMAPPROC_GETPORT, "getport" },
++	{ PMAPPROC_NULL, "null" },
++	{ PMAPPROC_SET, "set" },
++	{ PMAPPROC_UNSET, "unset" },
++	{ 0, 0 }
+     };
+ 
+     /*
+@@ -269,7 +272,7 @@
+ 
+ 	if (prognum == 0) {
+ 	    progname = "";
+-	} else if (rpc = getrpcbynumber((int) prognum)) {
++	} else if ((rpc = getrpcbynumber((int) prognum)) != NULL) {
+ 	    progname = rpc->r_name;
+ 	} else {
+ 	    sprintf(progname = progbuf, "%lu", prognum);
+diff -Naur portmap_5beta/pmap_dump.8 portmap_5beta.gimli/pmap_dump.8
+--- portmap_5beta/pmap_dump.8	1969-12-31 18:00:00.000000000 -0600
++++ portmap_5beta.gimli/pmap_dump.8	2002-01-07 09:13:58.000000000 -0600
+@@ -0,0 +1,24 @@
++.TH PMAP_DUMP 8 "21th June 1997" Linux "Linux Programmer's Manual"
++.SH NAME
++pmap_dump \- print a list of all registered RPC programs
++.SH SYNOPSIS
++.B pmap_dump
++.SH DESCRIPTION
++The
++.B pmap_dump
++command can be used to restart a running portmapper or to print
++a list of all registered RPC programs on the local host. If you
++want to use the program to restart the portmapper you have to
++redirect the output of
++.B pmap_dump
++to a file. After this you can restart the portmapper and restore
++the list of the registered RPC programs by feeding the output
++of
++.B pmap_dump
++to the
++.B pmap_set
++command.
++.SH SEE ALSO
++.BR pmap_set (8),
++.BR rpc.portmap (8)
++
+diff -Naur portmap_5beta/pmap_dump.c portmap_5beta.gimli/pmap_dump.c
+--- portmap_5beta/pmap_dump.c	1992-06-11 15:53:16.000000000 -0500
++++ portmap_5beta.gimli/pmap_dump.c	2002-01-07 09:20:19.000000000 -0600
+@@ -5,7 +5,7 @@
+   * Computing Science, Eindhoven University of Technology, The Netherlands.
+   */
+ 
+-#ifndef lint
++#ifdef lint
+ static char sccsid[] = "@(#) pmap_dump.c 1.1 92/06/11 22:53:15";
+ #endif
+ 
+@@ -23,7 +23,20 @@
+ 
+ static char *protoname();
+ 
+-main(argc, argv)
++#ifndef INADDR_LOOPBACK
++#define INADDR_LOOPBACK ntohl(inet_addr("127.0.0.1"))
++#endif
++
++static void    get_myloopaddress(addrp)
++struct sockaddr_in *addrp;
++{
++    memset((char *) addrp, 0, sizeof(*addrp));
++    addrp->sin_family = AF_INET;
++    addrp->sin_port = htons(PMAPPORT);
++    addrp->sin_addr.s_addr = htonl(INADDR_LOOPBACK);
++}
++
++int main(argc, argv)
+ int     argc;
+ char  **argv;
+ {
+@@ -31,7 +44,7 @@
+     register struct pmaplist *list;
+     register struct rpcent *rpc;
+ 
+-    get_myaddress(&addr);
++    get_myloopaddress(&addr);
+ 
+     for (list = pmap_getmaps(&addr); list; list = list->pml_next) {
+ 	rpc = getrpcbynumber((int) list->pml_map.pm_prog);
+diff -Naur portmap_5beta/pmap_set.8 portmap_5beta.gimli/pmap_set.8
+--- portmap_5beta/pmap_set.8	1969-12-31 18:00:00.000000000 -0600
++++ portmap_5beta.gimli/pmap_set.8	2002-01-07 09:13:58.000000000 -0600
+@@ -0,0 +1,24 @@
++.TH PMAP_SET 8 "21th June 1997" Linux "Linux Programmer's Manual"
++.SH NAME
++pmap_set \- set the list of registered RPC programs
++.SH SYNOPSIS
++.B pmap_set
++.SH DESCRIPTION
++The
++.B pmap_set
++command can be used to restart a running portmapper or to set
++the list of registered RPC programs on the local host. If you
++want to use the program to restart the portmapper you have to
++redirect the output of
++.B pmap_dump
++to a file. After this you can restart the portmapper and restore
++the list of the registered RPC programs by feeding the output
++of
++.B pmap_dump
++to the
++.B pmap_set
++command.
++.SH SEE ALSO
++.BR pmap_dump (8),
++.BR rpc.portmap (8)
++
+diff -Naur portmap_5beta/pmap_set.c portmap_5beta.gimli/pmap_set.c
+--- portmap_5beta/pmap_set.c	1996-07-06 16:06:23.000000000 -0500
++++ portmap_5beta.gimli/pmap_set.c	2002-01-07 09:22:10.000000000 -0600
+@@ -5,7 +5,7 @@
+   * Computing Science, Eindhoven University of Technology, The Netherlands.
+   */
+ 
+-#ifndef lint
++#ifdef lint
+ static char sccsid[] = "@(#) pmap_set.c 1.2 96/07/06 23:06:23";
+ #endif
+ 
+@@ -17,7 +17,9 @@
+ #include <rpc/rpc.h>
+ #include <rpc/pmap_clnt.h>
+ 
+-main(argc, argv)
++int parse_line(char *buf, u_long *prog, u_long *vers, int *prot, unsigned *port);
++
++int main(argc, argv)
+ int     argc;
+ char  **argv;
+ {
+@@ -40,16 +42,16 @@
+ 
+ /* parse_line - convert line to numbers */
+ 
+-parse_line(buf, prog, vers, prot, port)
++int parse_line(buf, prog, vers, prot, port)
+ char   *buf;
+ u_long *prog;
+ u_long *vers;
+ int    *prot;
+ unsigned *port;
+ {
+-    char    proto_name[BUFSIZ];
++    char    proto_name[256];
+ 
+-    if (sscanf(buf, "%lu %lu %s %u", prog, vers, proto_name, port) != 4) {
++    if (sscanf(buf, "%lu %lu %255s %u", prog, vers, proto_name, port) != 4) {
+ 	return (0);
+     }
+     if (strcmp(proto_name, "tcp") == 0) {
+diff -Naur portmap_5beta/portmap.8 portmap_5beta.gimli/portmap.8
+--- portmap_5beta/portmap.8	1969-12-31 18:00:00.000000000 -0600
++++ portmap_5beta.gimli/portmap.8	2002-01-07 09:13:58.000000000 -0600
+@@ -0,0 +1,146 @@
++.\" Copyright (c) 1987 Sun Microsystems
++.\" Copyright (c) 1990, 1991 The Regents of the University of California.
++.\" All rights reserved.
++.\"
++.\" Redistribution and use in source and binary forms, with or without
++.\" modification, are permitted provided that the following conditions
++.\" are met:
++.\" 1. Redistributions of source code must retain the above copyright
++.\"    notice, this list of conditions and the following disclaimer.
++.\" 2. Redistributions in binary form must reproduce the above copyright
++.\"    notice, this list of conditions and the following disclaimer in the
++.\"    documentation and/or other materials provided with the distribution.
++.\" 3. All advertising materials mentioning features or use of this software
++.\"    must display the following acknowledgement:
++.\"	This product includes software developed by the University of
++.\"	California, Berkeley and its contributors.
++.\" 4. Neither the name of the University nor the names of its contributors
++.\"    may be used to endorse or promote products derived from this software
++.\"    without specific prior written permission.
++.\"
++.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
++.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++.\" SUCH DAMAGE.
++.\"
++.\"     from: @(#)portmap.8	5.3 (Berkeley) 3/16/91
++.\"	$Id: portmap-5beta-compilation_fixes-3.patch,v 1.1 2004/06/08 04:53:09 jim Exp $
++.\"
++.Dd March 16, 1991
++.Dt PORTMAP 8
++.Os BSD 4.3
++.Sh NAME
++.Nm portmap
++.Nd
++.Tn DARPA
++port to
++.Tn RPC
++program number mapper
++.Sh SYNOPSIS
++.Nm portmap
++.Op Fl d
++.Op Fl v
++.Sh DESCRIPTION
++.Nm Portmap
++is a server that converts
++.Tn RPC
++program numbers into
++.Tn DARPA
++protocol port numbers.
++It must be running in order to make
++.Tn RPC
++calls.
++.Pp
++When an
++.Tn RPC
++server is started, it will tell
++.Nm portmap
++what port number it is listening to, and what
++.Tn RPC
++program numbers it is prepared to serve.
++When a client wishes to make an
++.Tn RPC
++call to a given program number,
++it will first contact
++.Nm portmap
++on the server machine to determine
++the port number where
++.Tn RPC
++packets should be sent.
++.Pp
++.Nm Portmap
++must be started before any
++.Tn RPC
++servers are invoked.
++.Pp
++Normally
++.Nm portmap
++forks and dissociates itself from the terminal
++like any other daemon.
++.Nm Portmap
++then logs errors using
++.Xr syslog 3 .
++.Pp
++Option available:
++.Bl -tag -width Ds
++.It Fl d
++(debug) prevents
++.Nm portmap
++from running as a daemon,
++and causes errors and debugging information
++to be printed to the standard error output.
++.It Fl v
++(verbose) run
++.Nm portmap
++in verbose mode.
++.El
++
++This
++.Nm portmap
++version is protected by the
++.Nm tcp_wrapper
++library. You have to give the clients access to
++.Nm portmap
++if they should be allowed to use it. To allow connects from clients of
++the .bar.com domain you could use the following line in /etc/hosts.allow:
++
++portmap: .bar.com
++
++You have to use the daemon name 
++.Nm portmap
++for the daemon name (even if the binary has a different name). For the
++client names you can only use the keyword ALL or IP addresses (NOT
++host or domain names).
++
++For further information please have a look at the
++.Xr tcpd 8 ,
++.Xr hosts_allow 5
++and
++.Xr hosts_access 5
++manual pages.
++
++.Sh SEE ALSO
++.Xr inetd.conf 5 ,
++.Xr rpcinfo 8 ,
++.Xr pmap_set 8 ,
++.Xr pmap_dump 8 ,
++.Xr inetd 8
++.Xr tcpd 8
++.Xr hosts_access 5
++.Xr hosts_options 5
++.Sh BUGS
++If
++.Nm portmap
++crashes, all servers must be restarted.
++.Sh HISTORY
++The
++.Nm
++command appeared in
++.Bx 4.3
+diff -Naur portmap_5beta/portmap.c portmap_5beta.gimli/portmap.c
+--- portmap_5beta/portmap.c	1996-07-06 16:06:24.000000000 -0500
++++ portmap_5beta.gimli/portmap.c	2002-01-07 09:26:41.000000000 -0600
+@@ -37,7 +37,7 @@
+  All rights reserved.\n";
+ #endif /* not lint */
+ 
+-#ifndef lint
++#ifdef lint
+ static char sccsid[] = "@(#) portmap.c 1.6 96/07/06 23:06:23";
+ #endif /* not lint */
+ 
+@@ -80,6 +80,9 @@
+  * Mountain View, California  94043
+  */
+ 
++#if defined(__GLIBC__)
++#include <rpc/xdr.h>
++#endif /* __GLIBC__ */
+ #include <rpc/rpc.h>
+ #include <rpc/pmap_prot.h>
+ #include <stdio.h>
+@@ -94,6 +97,8 @@
+ #ifdef SYSV40
+ #include <netinet/in.h>
+ #endif
++#include <sys/types.h>
++#include <unistd.h>
+ 
+ extern char *strerror();
+ #include <stdlib.h>
+@@ -148,7 +153,7 @@
+ #endif
+ #endif
+ 
+-main(argc, argv)
++int main(argc, argv)
+ 	int argc;
+ 	char **argv;
+ {
+@@ -350,7 +355,7 @@
+ 		 */
+ 		/* remote host authorization check */
+ 		check_default(svc_getcaller(xprt), rqstp->rq_proc, (u_long) 0);
+-		if (!svc_sendreply(xprt, xdr_void, (caddr_t)0) && debugging) {
++		if (!svc_sendreply(xprt, (xdrproc_t) xdr_void, (caddr_t)0) && debugging) {
+ 			abort();
+ 		}
+ 		break;
+@@ -359,7 +364,7 @@
+ 		/*
+ 		 * Set a program,version to port mapping
+ 		 */
+-		if (!svc_getargs(xprt, xdr_pmap, &reg))
++		if (!svc_getargs(xprt, (xdrproc_t) xdr_pmap, (caddr_t) &reg))
+ 			svcerr_decode(xprt);
+ 		else {
+ 			/* reject non-local requests, protect priv. ports */
+@@ -401,7 +406,7 @@
+ 				ans = 1;
+ 			}
+ 		done:
+-			if ((!svc_sendreply(xprt, xdr_int, (caddr_t)&ans)) &&
++			if ((!svc_sendreply(xprt, (xdrproc_t) xdr_int, (caddr_t)&ans)) &&
+ 			    debugging) {
+ 				(void) fprintf(stderr, "svc_sendreply\n");
+ 				abort();
+@@ -413,7 +418,7 @@
+ 		/*
+ 		 * Remove a program,version to port mapping.
+ 		 */
+-		if (!svc_getargs(xprt, xdr_pmap, &reg))
++		if (!svc_getargs(xprt, (xdrproc_t) xdr_pmap, (caddr_t) &reg))
+ 			svcerr_decode(xprt);
+ 		else {
+ 			ans = 0;
+@@ -447,7 +452,7 @@
+ 					prevpml->pml_next = pml;
+ 				free(t);
+ 			}
+-			if ((!svc_sendreply(xprt, xdr_int, (caddr_t)&ans)) &&
++			if ((!svc_sendreply(xprt, (xdrproc_t) xdr_int, (caddr_t)&ans)) &&
+ 			    debugging) {
+ 				(void) fprintf(stderr, "svc_sendreply\n");
+ 				abort();
+@@ -459,7 +464,7 @@
+ 		/*
+ 		 * Lookup the mapping for a program,version and return its port
+ 		 */
+-		if (!svc_getargs(xprt, xdr_pmap, &reg))
++		if (!svc_getargs(xprt, (xdrproc_t) xdr_pmap, (caddr_t) &reg))
+ 			svcerr_decode(xprt);
+ 		else {
+ 			/* remote host authorization check */
+@@ -474,7 +479,7 @@
+ 				port = fnd->pml_map.pm_port;
+ 			else
+ 				port = 0;
+-			if ((!svc_sendreply(xprt, xdr_int, (caddr_t)&port)) &&
++			if ((!svc_sendreply(xprt, (xdrproc_t) xdr_int, (caddr_t)&port)) &&
+ 			    debugging) {
+ 				(void) fprintf(stderr, "svc_sendreply\n");
+ 				abort();
+@@ -486,7 +491,7 @@
+ 		/*
+ 		 * Return the current set of mapped program,version
+ 		 */
+-		if (!svc_getargs(xprt, xdr_void, NULL))
++		if (!svc_getargs(xprt, (xdrproc_t) xdr_void, (caddr_t) NULL))
+ 			svcerr_decode(xprt);
+ 		else {
+ 			/* remote host authorization check */
+@@ -497,7 +502,7 @@
+ 			} else {
+ 				p = pmaplist;
+ 			}
+-			if ((!svc_sendreply(xprt, xdr_pmaplist,
++			if ((!svc_sendreply(xprt, (xdrproc_t) xdr_pmaplist,
+ 			    (caddr_t)&p)) && debugging) {
+ 				(void) fprintf(stderr, "svc_sendreply\n");
+ 				abort();
+@@ -645,7 +650,7 @@
+ 	timeout.tv_sec = 5;
+ 	timeout.tv_usec = 0;
+ 	a.rmt_args.args = buf;
+-	if (!svc_getargs(xprt, xdr_rmtcall_args, &a))
++	if (!svc_getargs(xprt, (xdrproc_t) xdr_rmtcall_args, (caddr_t) &a))
+ 		return;
+ 	/* host and service access control */
+ 	if (!check_callit(svc_getcaller(xprt), 
+@@ -674,9 +679,9 @@
+ 			   au->aup_uid, au->aup_gid, au->aup_len, au->aup_gids);
+ 		}
+ 		a.rmt_port = (u_long)port;
+-		if (clnt_call(client, a.rmt_proc, xdr_opaque_parms, &a,
+-		    xdr_len_opaque_parms, &a, timeout) == RPC_SUCCESS) {
+-			svc_sendreply(xprt, xdr_rmtcall_result, (caddr_t)&a);
++		if (clnt_call(client, a.rmt_proc, (xdrproc_t) xdr_opaque_parms, (char*) &a,
++		    (xdrproc_t) xdr_len_opaque_parms, (char*) &a, timeout) == RPC_SUCCESS) {
++			svc_sendreply(xprt, (xdrproc_t) xdr_rmtcall_result, (caddr_t)&a);
+ 		}
+ 		AUTH_DESTROY(client->cl_auth);
+ 		clnt_destroy(client);
Index: patches/portmap-5beta-glibc_errno_fix-1.patch
===================================================================
--- patches/portmap-5beta-glibc_errno_fix-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/portmap-5beta-glibc_errno_fix-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,21 @@
+Submitted By: Tushar Teredesai <tushar@linuxfromscratch.org>
+Date: 2003-10-04
+Initial Package Version: 5beta
+Origin: None
+Description: Fix compilation with recent glibc versions.
+
+$LastChangedBy: bdubbs $
+$Date: 2004-08-07 18:56:30 -0600 (Sat, 07 Aug 2004) $
+
+--- portmap_5beta/portmap.c	2003-03-10 12:32:26.000000000 -0600
++++ portmap_5beta/portmap.c.new	2003-03-10 12:38:01.000000000 -0600
+@@ -129,7 +129,8 @@
+ static void callit();
+ struct pmaplist *pmaplist;
+ int debugging = 0;
+-extern int errno;
++#include <errno.h>
++/* extern int errno; */
+ 
+ #include "pmap_check.h"
+ 
Index: tches/powerpc-utils_1.1.3-fixes-2.patch
===================================================================
--- patches/powerpc-utils_1.1.3-fixes-2.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,963 +1,0 @@
-Submitted By: Ken Moffat <ken@linuxfromscratch.org>
-Date: 2005-11-23
-Initial Package Version: 1.1.3
-Upstream Status: Package is maintained by debian, this cherry-picks
-Origin: From debian 1.1.3-18.diff, edited
-Description: Makes it work on New World, fixes compile error, updated to
- allow -m32 to be passed via EXTRACFLAGS in multilib.
-
- Some of the debian powerpc-utils_1.1.3-18.diff, but only the parts relevant
-to nvsetenv and nvsetvol - the remainder may be useful on an Old World Mac,
-but they are no use on New World.  The -D_GNU_SOURCE apparently helps on
-powerpc64.  I've also removed bogus messages advising you to update your
-headers when IOC_NVRAM_SYNC isn't defined : it hasn't existed for a long
-time.  Finally, I ran the nvsetenv.sgml through docbook2txt -man to get a
-proper man page, because most people won't have docbook utils installed. 
-
-diff -Nuar pmac-utils.orig/Makefile pmac-utils/Makefile
---- pmac-utils.orig/Makefile	1998-07-21 14:22:28.000000000 +0100
-+++ pmac-utils/Makefile	2005-11-17 15:16:52.000000000 +0000
-@@ -22,8 +22,8 @@
- 
- SGMLMAN	= sgml2txt -man
- CC	= gcc -Wall -Wstrict-prototypes
--CFLAGS	= -O2 -fsigned-char 
--LDFLAGS = -s
-+CFLAGS	= $(EXTRACFLAGS) -O2 -fsigned-char -D_GNU_SOURCE
-+LDFLAGS =
- INSTALL	= /usr/bin/install -c
- SOUND_INC = -I.
- 
-@@ -42,8 +42,12 @@
- mousemode:
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.c
- 
--nvsetenv:
-+nvsetenv: nvsetenv.c nwnvsetenv.c
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.c nwnvsetenv.c
-+
-+nvsetvol:
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.c
-+ 
- 
- nvvideo:
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.c
-diff -Nuar pmac-utils.orig/nvsetenv.8 pmac-utils/nvsetenv.8
---- pmac-utils.orig/nvsetenv.8	1970-01-01 01:00:00.000000000 +0100
-+++ pmac-utils/nvsetenv.8	2005-11-17 20:39:47.000000000 +0000
-@@ -0,0 +1,256 @@
-+.if n .ds Q \&"
-+.if t .ds Q ``
-+.if n .ds U \&"
-+.if t .ds U ''
-+.TH "NVSETENV" 8 
-+.tr \&
-+.nr bi 0
-+.nr ll 0
-+.nr el 0
-+.de DS
-+..
-+.de DE
-+..
-+.de Pp
-+.ie \\n(ll>0 \{\
-+.ie \\n(bi=1 \{\
-+.nr bi 0
-+.if \\n(t\\n(ll=0 \{.IP \\(bu\}
-+.if \\n(t\\n(ll=1 \{.IP \\n+(e\\n(el.\}
-+.\}
-+.el .sp 
-+.\}
-+.el \{\
-+.ie \\nh=1 \{\
-+.LP
-+.nr h 0
-+.\}
-+.el .PP 
-+.\}
-+..
-+.SH NAME
-+
-+.Pp
-+\fBnvsetenv\fP - change/view Open Firmware environment variables 
-+.Pp
-+.SH SYNOPSIS
-+
-+.Pp
-+\fBnvsetenv 
-+\f(CR[\fP\fIvariable\fP \f(CR[\fP\fIvalue\fP\f(CR\fB]]\fP\fP\fP
-+.Pp
-+.SH DESCRIPTION
-+
-+.Pp
-+\fBnvsetenv\fP is a program to adjust or view the Open Firmware (OF)
-+boot parameters stored in non-volatile (battery-powered) RAM.
-+\fBnvsetenv\fP will show the current values of all OF's environment
-+variables when no parameters are given.
-+.Pp
-+.SH OPTIONS
-+
-+.Pp
-+.nr ll +1
-+.nr t\n(ll 2
-+.if \n(ll>1 .RS
-+.IP "\fIvariable\fP"
-+.nr bi 1
-+.Pp
-+nvsetenv will show current value of an OF's
-+variable, if no value is given
-+.IP "\fIvariable value\fP"
-+.nr bi 1
-+.Pp
-+nvsetenv will set \fIvariable\fP to
-+\fIvalue\fP
-+.if \n(ll>1 .RE
-+.nr ll -1
-+.Pp
-+.SH EXAMPLES
-+
-+.Pp
-+This example will set the boot device to the first SCSI disk on the
-+internal SCSI bus, using /vmlinux as boot image, trying to
-+use the third partition as root partition.
-+.DS
-+.sp 
-+.ft RR
-+.nf
-+        > nvsetenv boot-device  \&"scsi-int/sd@0:0\&"
-+        > nvsetenv boot-file    \&" /vmlinux root=/dev/sda3\&"
-+.DE
-+.fi 
-+.ec
-+.ft P
-+.sp
-+.Pp
-+Alternatives boot devices are: 
-+.DS
-+.sp 
-+.ft RR
-+.nf
-+        scsi/sd@1:0             SCSI disk at ID 1
-+        ata/ata-disk@0:0        Internal IDE disk
-+.DE
-+.fi 
-+.ec
-+.ft P
-+.sp
-+.Pp
-+You can also boot from a floppy, you need a XCOFF-format kernel image
-+(in this example: vmlinux.coff), copied to a HFS format high-density
-+(1.44Mb) floppy.
-+.DS
-+.sp 
-+.ft RR
-+.nf
-+        > nvsetenv boot-device  \&"fd:vmlinux.coff\&"
-+        > nvsetenv boot-file    \&" root=/dev/sda3\&"
-+.DE
-+.fi 
-+.ec
-+.ft P
-+.sp
-+
-+To return to MacOS, do:
-+.DS
-+.sp 
-+.ft RR
-+.nf
-+        > nvsetenv boot-device  \&"/AAPL,ROM\&"
-+.DE
-+.fi 
-+.ec
-+.ft P
-+.sp
-+.Pp
-+Valid values for \&"input-devices\&" are:
-+.DS
-+.sp 
-+.ft RR
-+.nf
-+        ttya                    Modem serial port
-+        ttyb                    Printer serial port
-+        kbd                     Keyboard
-+        enet                    Ethernet interface
-+.DE
-+.fi 
-+.ec
-+.ft P
-+.sp
-+.Pp
-+Valid values for \&"output-devices\&" are (machine and/or OF dependent):
-+.DS
-+.sp 
-+.ft RR
-+.nf
-+        screen                  Screen display (newer machines)
-+        /chaos/control          Screen display (7500, 7600 and 8500)
-+        /bandit/ATY,264GT-B     Screen display (6500)
-+.DE
-+.fi 
-+.ec
-+.ft P
-+.sp
-+.Pp
-+OF is not designed to wait for your hard disk to spin up
-+(remember MacOS boots from ROM).
-+Use the following setting to have OF retry to boot from your disk 
-+until is has spun up:
-+.DS
-+.sp 
-+.ft RR
-+.nf
-+        > nvsetenv boot-command \&"begin ['] boot catch 1000 ms cr again\&"
-+.DE
-+.fi 
-+.ec
-+.ft P
-+.sp
-+.Pp
-+You only have to append an \&"S\&" to the \&"boot-file\&" variable to boot
-+Linux in single user mode.
-+.Pp
-+You can use install your own nvramrc patch using the following command:
-+.DS
-+.sp 
-+.ft RR
-+.nf
-+        > nvsetenv nvramrc \&"`cat file.patch`\&"
-+.DE
-+.fi 
-+.ec
-+.ft P
-+.sp
-+
-+(please note the backticks!), or: 
-+.DS
-+.sp 
-+.ft RR
-+.nf
-+        > nvsetenv nvramrc \&"$(cat file.patch)\&"
-+.DE
-+.fi 
-+.ec
-+.ft P
-+.sp
-+.Pp
-+.SH FILES
-+
-+.Pp
-+.nr ll +1
-+.nr t\n(ll 2
-+.if \n(ll>1 .RS
-+.IP "\fI/dev/nvram\fP"
-+.nr bi 1
-+.Pp
-+character device with major number 10
-+and minor number 144
-+.IP "\fI/proc/cpuinfo\fP"
-+.nr bi 1
-+.Pp
-+to identify New/Old-World machines
-+.if \n(ll>1 .RE
-+.nr ll -1
-+.Pp
-+.SH SEE ALSO
-+
-+.Pp
-+macos(8)
-+.Pp
-+.SH AUTHORS
-+
-+.Pp
-+.DS
-+.sp 
-+.ft RR
-+.nf
-+Paul Mackerras <paulus@cs.anu.edu.au> (program)
-+.DE
-+.fi 
-+.ec
-+.ft P
-+.sp
-+
-+.DS
-+.sp 
-+.ft RR
-+.nf
-+Richard van Hees <R.M.vanHees@phys.uu.nl> (documentation)
-+.DE
-+.fi 
-+.ec
-+.ft P
-+.sp
-+
-+.DS
-+.sp 
-+.ft RR
-+.nf
-+Klaus Halfmann  <halfmann@libra.de> (NewWorld code)
-+.DE
-+.fi 
-+.ec
-+.ft P
-+.sp
-+.Pp
-diff -Nuar pmac-utils.orig/nvsetenv.c pmac-utils/nvsetenv.c
---- pmac-utils.orig/nvsetenv.c	1997-04-28 14:29:05.000000000 +0100
-+++ pmac-utils/nvsetenv.c	2005-11-17 14:57:57.000000000 +0000
-@@ -1,15 +1,32 @@
-+/*	nvsetnv.c
-+
-+	used to set the Envenrioment variables in power macs NVram.
-+	Decides via /proc/cpuinfo which type of machine is used.
-+
-+		Copyright (C) 1996-1998 by Paul Mackerras.
-+	nwcode: Copyright (C) 2000	by Klaus Halfmann
-+
-+	see README for details
-+*/
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#include <sys/ioctl.h>
-+#include <asm/nvram.h>
-+#ifndef IOC_NVRAM_SYNC
-+#define IOC_NVRAM_SYNC _IO('p', 0x43)
-+#endif
- 
--#define NVSTART	0x1800
--#define NVSIZE	0x800
-+#define NVSTART		0x1800 	// Start of the NVRam OF partition
-+#define NVSIZE		0x800	// Size of of the NVRam
- #define MXSTRING        128
- #define N_NVVARS	(int)(sizeof(nvvars) / sizeof(nvvars[0]))
-+#define NVMAGIC		0x1275
- 
--static int nvfd, nvstr_used;
-+static int  nvstr_used;
- static char nvstrbuf[NVSIZE];
- 
- struct nvram {
-@@ -24,12 +41,13 @@
-     unsigned long  vals[1];
- };
- 
--union {
--    struct nvram nv;
--    char c[NVSIZE];
--    unsigned short s[NVSIZE/2];
--} nvbuf;
-+typedef union {
-+    struct nvram 	nv;
-+    char 		c[NVSIZE];
-+    unsigned short 	s[NVSIZE/2];
-+} nvbuftype;
- 
-+nvbuftype nvbuf;
- 
- enum nvtype {
-     boolean,
-@@ -70,16 +88,21 @@
-     {"boot-command", string},
- };
- 
-+	// Calculated number of variables
-+#define N_NVVARS	(int)(sizeof(nvvars) / sizeof(nvvars[0]))
-+
- union nvval {
--    unsigned long word_val;
--    char *str_val;
-+    unsigned long 	word_val;
-+    char 		*str_val;
- } nvvals[32];
- 
--int
--nvcsum( void )
-+extern int checkNewWorld(void); 		// from nwnvsetenv
-+extern int nvNew(int ac, char** av, int nfd); 	// from nwnvsetenv
-+
-+int nvcsum( void )
- {
--    int i;
--    unsigned c;
-+    int 	i;
-+    unsigned	c;
-     
-     c = 0;
-     for (i = 0; i < NVSIZE/2; ++i)
-@@ -89,28 +112,29 @@
-     return c & 0xffff;
- }
- 
--void
--nvload( void )
-+static void nvload( int nvfd )
- {
-     int s;
- 
-     if (lseek(nvfd, NVSTART, 0) < 0
- 	|| read(nvfd, &nvbuf, NVSIZE) != NVSIZE) {
--	perror("Error reading /dev/nvram");
-+	perror("Error reading nvram device");
- 	exit(EXIT_FAILURE);
-     }
-+    if (nvbuf.nv.magic != NVMAGIC)
-+	(void) fprintf(stderr, "Warning: Bad magic number %x\n",
-+			 nvbuf.nv.magic);
-     s = nvcsum();
-     if (s != 0xffff)
-        (void) fprintf(stderr, "Warning: checksum error (%x) on nvram\n", 
- 		      s ^ 0xffff);
- }
- 
--void
--nvstore(void)
-+static void nvstore(int nvfd)
- {
-     if (lseek(nvfd, NVSTART, 0) < 0
- 	|| write(nvfd, &nvbuf, NVSIZE) != NVSIZE) {
--	perror("Error writing /dev/nvram");
-+	perror("Error writing nvram device");
- 	exit(EXIT_FAILURE);
-     }
- }
-@@ -145,8 +169,7 @@
-     }
- }
- 
--void
--nvpack( void )
-+void nvpack( void )
- {
-     int     i, vi;
-     size_t  off, len;
-@@ -184,7 +207,7 @@
-     nvbuf.nv.cksum = (unsigned short int) (~nvcsum());
- }
- 
--void
-+static void
- print_var(int i, int indent)
- {
-     char *p;
-@@ -207,8 +230,7 @@
-     (void) printf("\n");
- }
- 
--void
--parse_val(int i, char *str)
-+void parse_val(int i, char *str)
- {
-     char *endp;
- 
-@@ -238,12 +260,38 @@
-     }
- }
- 
--int 
--main(int ac, char **av)
-+
-+void nvOld(int ac, char** av, int i, int nvfd)
-+{
-+    nvload(nvfd);
-+    nvunpack();
-+
-+    switch (ac) {
-+    case 1:
-+	for (i = 0; i < N_NVVARS; ++i) {
-+	    (void) printf("%-16s", nvvars[i].name);
-+	    print_var(i, 16);
-+	}
-+	break;
-+
-+    case 2:
-+	print_var(i, 0);
-+	break;
-+	
-+    case 3:
-+	parse_val(i, av[2]);
-+	nvpack();
-+	nvstore(nvfd);
-+	break;
-+    }
-+}
-+
-+int main(int ac, char **av)
- {
--    int i = 0, l, print;
-+    int i = 0, l, print, nvfd, newWorld;
- 
-     l = (int) strlen(av[0]);
-+    // print when no value is set OR we are aclled as <xxx>printenv
-     print = (int) (ac <= 2 || 
- 		   (l > 8 && strcmp(&av[0][l-8], "printenv") == 0));
-     if (print != 0 && ac > 2) {
-@@ -255,7 +303,9 @@
- 	exit(EXIT_FAILURE);
-     }
- 
--    if (ac >= 2) {
-+    newWorld = checkNewWorld();
-+    
-+    if (!newWorld && ac >= 2) {
- 	for (i = 0; i < N_NVVARS; ++i)
- 	    if (strcmp(av[1], nvvars[i].name) == 0)
- 		break;
-@@ -266,33 +316,21 @@
- 	}
-     }
- 
--    nvfd = open("/dev/nvram", ac <= 2 ? O_RDONLY: O_RDWR);
-+    nvfd = open("/dev/misc/nvram", ac <= 2 ? O_RDONLY: O_RDWR);
-     if (nvfd < 0) {
--	perror("Couldn't open /dev/nvram");
-+      nvfd = open("/dev/nvram", ac <= 2 ? O_RDONLY: O_RDWR);
-+      if (nvfd < 0) {
-+	perror("Couldn't open nvram device");
- 	exit(EXIT_FAILURE);
--    }
--    nvload();
--    nvunpack();
--
--    switch (ac) {
--    case 1:
--	for (i = 0; i < N_NVVARS; ++i) {
--	    (void) printf("%-16s", nvvars[i].name);
--	    print_var(i, 16);
--	}
--	break;
--
--    case 2:
--	print_var(i, 0);
--	break;
--	
--    case 3:
--	parse_val(i, av[2]);
--	nvpack();
--	nvstore();
--	break;
-+      }
-     }
- 
-+    if (newWorld)
-+    	nvNew(ac, av, nvfd);
-+    else
-+    	nvOld(ac, av, i, nvfd);
-+    
-+    (void) ioctl(nvfd, IOC_NVRAM_SYNC);
-     (void) close(nvfd);
-     exit(EXIT_SUCCESS);
- }
-diff -Nuar pmac-utils.orig/nvsetvol.8 pmac-utils/nvsetvol.8
---- pmac-utils.orig/nvsetvol.8	1970-01-01 01:00:00.000000000 +0100
-+++ pmac-utils/nvsetvol.8	2005-11-17 21:37:20.000000000 +0000
-@@ -0,0 +1,27 @@
-+.TH NVSETVOL 8 "16th February 2003"
-+
-+.SH NAME
-+nvsetvol \- tool for changing startup volume of PowerMac machines
-+
-+.SH SYNOPSIS
-+.B nvsetvol
-+[
-+.B volume
-+]
-+
-+.SH DESCRIPTION
-+.B nvsetvol
-+queries and sets the base volume of a PowerMac machine.  With no options,
-+.B nvsetvol
-+displays the current volume; with a numerical argument, it sets the volume.
-+The
-+.B volume
-+argument should be a number from 0 to 255.  0 will turn off the annoying
-+startup chime.
-+
-+.SH AUTHOR
-+.B nvsetvol
-+was written by Matteo Frigo <athena@fftw.org>.
-+
-+This manual page was written by Daniel Jacobowitz <dan@debian.org> for the
-+Debian GNU/Linux distribution.
-diff -Nuar pmac-utils.orig/nvsetvol.c pmac-utils/nvsetvol.c
---- pmac-utils.orig/nvsetvol.c	1970-01-01 01:00:00.000000000 +0100
-+++ pmac-utils/nvsetvol.c	2005-11-17 21:43:16.000000000 +0000
-@@ -0,0 +1,110 @@
-+/* set volume of the startup chime in the PowerMac nvram. 
-+
-+   Written by Matteo Frigo <athena@fftw.org>.
-+   $Id: nvsetvol.c,v 1.1 2003/01/11 11:26:30 athena Exp $
-+
-+   This program is in the public domain.
-+*/
-+
-+/* The volume is stored as a byte at address 8 in the parameter ram. */
-+
-+#include <string.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <unistd.h>
-+#include <fcntl.h>
-+#include <sys/ioctl.h>
-+#include <asm/nvram.h>
-+#ifndef IOC_NVRAM_SYNC
-+#define IOC_NVRAM_SYNC _IO('p', 0x43)
-+#endif
-+
-+typedef struct {
-+     unsigned char sig;
-+     unsigned char cksum;
-+     unsigned short len;
-+     char name[12];
-+} header;
-+
-+void die(const char *s) __attribute__((noreturn));
-+void die(const char *s)
-+{
-+     perror(s);
-+     exit(1);
-+}
-+
-+void seek_pram(int fd, int offset)
-+{
-+     if (lseek(fd, offset, SEEK_SET) < 0)
-+	  die("lseek");
-+}
-+
-+// MSch: only works for newworld - oldworld have XPRAM at offset 0x1300 fixed. 
-+
-+int find_pram(int fd, int *size)
-+{
-+     header buf;
-+     int offset = 0;
-+     int rc = 0;
-+     while((rc = read(fd, &buf, sizeof(header))) == sizeof(header)) {
-+	  int sz = buf.len * 16;
-+	  // what's the sig in char?
-+	  // if (buf.sig == 0x1275) fprintf(stderr, "sig at offset %d rc %d buf.len %d buf.name %s \n", offset, rc, buf.len, buf.name);
-+	  // if (buf.sig == 0x5a) fprintf(stderr, "sig at offset %x rc %d buf.len %x buf.name %s \n", offset, rc, buf.len, buf.name);
-+	  // if (sz) fprintf(stderr, "offset %x rc %d sig %x buf.len %x buf.name %s \n", offset, rc, buf.sig, buf.len, buf.name);
-+	  if (!strncmp(buf.name, "APL,MacOS75", 11)) {
-+	       *size = sz - sizeof(header);
-+	       // fprintf(stderr, "XPRAM offset %x size %x\n", offset + sizeof(header), *size); 
-+	       return offset + sizeof(header);
-+	  }
-+	  if (sz)
-+	    offset += sz;
-+          else
-+            offset += sizeof(header);
-+	  seek_pram(fd, offset);
-+     }
-+     // no Core99 style PRAM found - just assume hard coded values as set in kernel:
-+     // XPRAM 0x1300
-+     // NR    0x1400
-+     // OF    0x1800
-+     // TODO: use ioctl to get PRAM offset
-+     // fprintf(stderr, "no NW PRAM found, assuming OW XPRAM offset 0x1300 size 0x100\n");
-+     *size = 0x100;
-+     return (0x1300);
-+     die("no PRAM found");
-+}
-+
-+#define VOLADDR 8
-+
-+int main(int argc, char *argv[])
-+{
-+     int fd, offset, size;
-+     char *buf;
-+
-+     fd = open("/dev/nvram", O_RDWR);
-+     if (fd < 0) die("can't open /dev/nvram");
-+     
-+     offset = find_pram(fd, &size);
-+     buf = malloc(size);
-+     if (!buf) die("can't malloc()");
-+
-+     seek_pram(fd, offset);
-+     if (read(fd, buf, size) != size)
-+	  die("error reading /dev/nvram");
-+
-+     printf("current volume is %d\n", (unsigned char) buf[VOLADDR]);
-+     
-+     if (argc > 1) {
-+	  buf[VOLADDR] = atoi(argv[1]);
-+
-+	  seek_pram(fd, offset);
-+	  if (write(fd, buf, size) != size)
-+	       die("error writing /dev/nvram");
-+	  printf("new volume is %d\n", (unsigned char) buf[VOLADDR]);
-+     }
-+     ioctl(fd, IOC_NVRAM_SYNC);
-+     close(fd);
-+     return 0;
-+}
-diff -Nuar pmac-utils.orig/nwnvsetenv.c pmac-utils/nwnvsetenv.c
---- pmac-utils.orig/nwnvsetenv.c	1970-01-01 01:00:00.000000000 +0100
-+++ pmac-utils/nwnvsetenv.c	2005-11-17 21:37:27.000000000 +0000
-@@ -0,0 +1,261 @@
-+/*	nwnvsetnv.c
-+
-+	used to set the Envenrioment variables in power macs NVram.
-+	This is for the NewWorld nvram only
-+
-+	nwcode: Copyright (C) 2000	by Klaus Halfmann
-+
-+	see README for details
-+*/
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+#define __USE_GNU	// need strnlen
-+
-+#include <string.h>
-+#include <unistd.h>
-+#include <fcntl.h>
-+
-+// #define MXSTRING        128:
-+// #define N_NVVARS	(int)(sizeof(nvvars) / sizeof(nvvars[0]))
-+// #define NVMAGIC		0x1275
-+
-+/* CHRP NVRAM header */
-+typedef struct {
-+  unsigned char		signature;
-+  unsigned char		cksum;
-+  unsigned short	len;
-+  char			name[12];
-+  // unsigned char data[0];
-+} chrp_header;
-+
-+/* Check in proc/cpuinfo if this is a new world machine */
-+
-+int checkNewWorld(void)
-+{
-+    FILE* cpuf = fopen("/proc/cpuinfo","r");
-+    char  buf[256]; // "pmac-generation    : NewWolrd|OldWorld 
-+    int	  result = 0, found = 0;
-+
-+    if (!cpuf) {
-+	perror("Couldn't open /proc/cpuinfo");
-+	exit(EXIT_FAILURE);
-+    }
-+
-+    while (NULL != fgets(buf, 255, cpuf))
-+    {
-+	if (!strncmp(buf, "pmac-generation" ,15))
-+	{
-+	    char* index = strchr(buf, ':') + 2;
-+	    if (!index) // ???
-+		continue;
-+	    result = !strncmp(index,"NewWorld",8);
-+	    found = 1;
-+	    break;
-+	}
-+    }
-+    fclose(cpuf);
-+
-+    /* Some kernels don't have pmac-generation ( <= 2.2.15 and earlier 2.3.x ) */
-+    /* Look for AAPL in /proc/device-tree/compatible instead. */
-+    if (!found) {
-+	cpuf = fopen("/proc/device-tree/compatible", "r");
-+	if(!cpuf)
-+	    return 0;
-+	
-+	fgets(buf, 255, cpuf);
-+	fclose(cpuf);
-+	if (strncmp(buf, "AAPL", 4) != 0)
-+	    result = 1;
-+    }
-+
-+    return result; // assume OldWorld
-+}
-+
-+/* seek NVRAM until common (OF) part 
-+   return the lenght of the part in case of sucess,
-+   	  0 otherwise.
-+   chrph is set to the value of the "coommon" blocek eventually found
-+   *nvstart is set to the seekpoint where common block starts.
-+*/
-+   
-+int nvscan(int nvfd, chrp_header* chrph, int* nvstart)
-+{
-+    int		start = 0;
-+    
-+    while (read(nvfd, chrph, sizeof(chrp_header)) == sizeof(chrp_header))
-+    {
-+	int size = chrph->len * 0x10 - sizeof(chrp_header);    	
-+	if (!strncmp(chrph->name, "common", 7))
-+	{
-+	    *nvstart = start;
-+	    return size; // seeked upto start
-+	}
-+	if (lseek(nvfd, size, SEEK_CUR) < 0)
-+	   break;
-+	start += size + sizeof(chrp_header);
-+    }
-+    fprintf(stderr,"No common Block found\n");
-+    exit(EXIT_FAILURE);
-+}
-+
-+static char* nvload( int nvfd , int nvsize)
-+{
-+    char* nvbuf = malloc(nvsize);
-+
-+    if (!nvbuf) {
-+	perror("Error allocating buffer");
-+	exit(EXIT_FAILURE);
-+    }
-+    if (read(nvfd, nvbuf, nvsize) != nvsize) {
-+	perror("Error reading /dev/nvram");
-+	exit(EXIT_FAILURE);
-+    }
-+    return nvbuf;
-+}
-+
-+static void
-+print_vars(char* nvbuf, int nvsize)
-+{
-+    int i = 0;
-+
-+    while (i < nvsize)
-+    {
-+ 	int size = strnlen(nvbuf, nvsize);
-+	if (size == 0)
-+	    break;
-+	printf("%s\n",nvbuf);
-+	nvbuf += (size + 1);	// count 0-byte, too
-+    }
-+}
-+
-+/* move memory around to insert the value.
-+ *
-+ * @param nvbufend 	byte AFTER the end of the buffer
-+ * @param varsize 	length of the variable name
-+ * @param buf		byte where varaible NAME starts
-+ * @param newval	new value to replace old one
-+ * @param foundsize 	lenght of varible + '=' + value
-+ * @param equalpos 	position relative to buf where '=' was found
-+ */
-+static void 
-+insert_val (char* nvbufend, int varsize,   char* buf, 
-+	    char* newval,   int foundsize, int equalpos)
-+{
-+    int 	oldlen 	= foundsize - equalpos -1; // account for the '='
-+    int		newlen 	= strlen(newval);
-+    char* 	valpos 	= buf + varsize + 1;
-+    int 	delta 	= newlen - oldlen;
-+
-+    if (delta > 0) // expand mem
-+	memmove(valpos + newlen,
-+		valpos + oldlen, (nvbufend - valpos - newlen));
-+    else if (delta < 0) // shrink mem
-+    {
-+	memmove(valpos + newlen, 
-+		valpos + oldlen, (nvbufend - valpos - oldlen));
-+	memset (nvbufend + delta, 0, -delta );
-+    }
-+    strncpy(valpos, newval, newlen);
-+}
-+
-+/* return position where variable is found,
-+ * newval may be null.
-+ */
-+
-+static char* set_var(char* nvbuf, int nvsize, char* varname, char* newval)
-+{
-+    int i =0;
-+    int varsize = strlen(varname);
-+    int equalpos;
-+    while (i < nvsize)
-+    {
-+	char* buf = &nvbuf[i];
-+ 	int foundsize = strnlen(buf, nvsize -i);
-+	if (foundsize == 0)
-+	    break;
-+	equalpos = (int) (strchr(buf, '=') - buf);
-+	if (equalpos == varsize &&
-+	    !strncmp(buf, varname, equalpos))
-+	{
-+	    if (newval)	// set the value 
-+		insert_val(nvbuf + nvsize, varsize, buf, 
-+			   newval, foundsize, equalpos);
-+	    return buf;
-+	}
-+	i += foundsize + 1;	// count 0-byte, too
-+    }
-+    return NULL;
-+}
-+
-+static void
-+print_var(char* nvbuf, int nvsize, char* varname)
-+{
-+    char* buf = set_var(nvbuf, nvsize, varname, NULL);
-+    if (buf)
-+	printf("%s\n",buf);
-+}
-+
-+/* This fucntion is not used here, it is left
-+   her for the curious */
-+
-+unsigned short chrp_checksum(chrp_header* hdr, char* nvbuf, int nvsize)
-+{
-+    unsigned char* 	ptr = (unsigned char*) &hdr->len;
-+    unsigned char* 	end = ptr + sizeof(chrp_header);
-+    unsigned short 	sum = hdr->signature;
-+	// this in fact skips the checksum
-+    for (; ptr < end; ptr++)
-+	sum += *ptr;
-+    while (sum > 0xFF)
-+	sum = (sum & 0xFF) + (sum>>8);
-+    return sum;
-+}                                                                                                 
-+
-+static void
-+nvstore(int nvfd, chrp_header* chrph, char* nvbuf, int nvstart, int nvsize)
-+{
-+    // mmh, the checksum is calculated for the header only
-+    // since we did not modify the header we can just ignore it.
-+    ssize_t written;
-+    ssize_t seek =  nvstart + sizeof(chrp_header);
-+    written = lseek(nvfd, seek, SEEK_SET);
-+    if (written != seek)
-+    {
-+    	fprintf(stderr,"Error seeking /dev/nvram\n");
-+	exit(EXIT_FAILURE);
-+    }
-+    written = write(nvfd, nvbuf, nvsize);
-+    if (written != nvsize)
-+    {
-+    	fprintf(stderr,"Error writing /dev/nvram %x %x\n", nvsize, seek);
-+	exit(EXIT_FAILURE);
-+    }
-+}
-+
-+/* print / set the New World NVRAM */
-+
-+void nvNew(int ac, char** av, int nvfd)
-+{
-+    int 		nvsize, nvstart;
-+    chrp_header		chrph;
-+    char*		nvbuf;
-+
-+    nvsize = nvscan(nvfd, &chrph, &nvstart);
-+    nvbuf  = nvload(nvfd, nvsize);
-+
-+    switch (ac) {
-+    case 1:
-+	print_vars(nvbuf, nvsize);
-+	break;
-+
-+    case 2:
-+	print_var(nvbuf, nvsize, av[1]);
-+	break;
-+	
-+    case 3:
-+	set_var(nvbuf, nvsize, av[1], av[2]);
-+	nvstore(nvfd, &chrph, nvbuf, nvstart, nvsize);
-+	break;
-+    }
-+}
Index: patches/procps-3.2.5-fix_mips-1.patch
===================================================================
--- patches/procps-3.2.5-fix_mips-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/procps-3.2.5-fix_mips-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,21 @@
+Submitted By: Ryan Oliver <ryan.oliver@pha.com.au>
+Date: 2005-02-04
+Initial Package Version: 3.2.5
+Upstream Status:
+Origin: Jim Gifford, Ryan Oliver
+Description: Fixes procps build for mips32 with glibc > 20041124
+(changes in sysdeps/mips/sgidefs.h). Don't only test whether _ABIN32
+is defined, also test that it matches _MIPS_SIM before setting KLONG.
+
+diff -uNr procps-3.2.5-orig/proc/procps.h procps-3.2.5/proc/procps.h
+--- procps-3.2.5-orig/proc/procps.h     2004-08-20 15:40:13 -0700
++++ procps-3.2.5/proc/procps.h  2005-02-02 22:46:11 -0800
+@@ -31,7 +31,7 @@
+ //
+ // Unknown: PA-RISC and zSeries
+ //
+-#if defined(k64test) || defined(_ABIN32)
++#if defined(k64test) || (defined(_ABIN32) && _MIPS_SIM == _ABIN32)
+ #define KLONG long long    // not typedef; want "unsigned KLONG" to work
+ #define KLF "L"
+ #define STRTOUKL strtoull
Index: patches/readline-4.3-gnu_fixes-1.patch
===================================================================
--- patches/readline-4.3-gnu_fixes-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/readline-4.3-gnu_fixes-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,174 @@
+Submitted By: Jeremy Utley (jeremy@linuxfromscratch.org)
+Date: 2003-11-20
+Inital Package Version: 4.3
+Origin: GNU archive (http://ftp.gnu.org/gnu/readline/readline-4.3-patches)
+Description: Conglomeration of the 5 posted GNU patches to the Readline
+             4.3 source code.
+
+diff -Naur readline-4.3/bind.c readline-4.3-new/bind.c
+--- readline-4.3/bind.c	2002-01-24 16:15:52.000000000 +0000
++++ readline-4.3-new/bind.c	2003-11-20 06:35:07.000000000 +0000
+@@ -311,7 +311,7 @@
+ 	     mapped to something, `abc' to be mapped to something else,
+ 	     and the function bound  to `a' to be executed when the user
+ 	     types `abx', leaving `bx' in the input queue. */
+-	  if (k.function /* && k.type == ISFUNC */)
++	  if (k.function && ((k.type == ISFUNC && k.function != rl_do_lowercase_version) || k.type == ISMACR))
+ 	    {
+ 	      map[ANYOTHERKEY] = k;
+ 	      k.function = 0;
+diff -Naur readline-4.3/display.c readline-4.3-new/display.c
+--- readline-4.3/display.c	2002-06-04 14:54:47.000000000 +0000
++++ readline-4.3-new/display.c	2003-11-20 06:35:07.000000000 +0000
+@@ -70,7 +70,7 @@
+ static void cr PARAMS((void));
+ 
+ #if defined (HANDLE_MULTIBYTE)
+-static int _rl_col_width PARAMS((char *, int, int));
++static int _rl_col_width PARAMS((const char *, int, int));
+ static int *_rl_wrapped_line;
+ #else
+ #  define _rl_col_width(l, s, e)	(((e) <= (s)) ? 0 : (e) - (s))
+@@ -1348,9 +1348,9 @@
+ 	    {
+ 	      _rl_output_some_chars (nfd + lendiff, temp - lendiff);
+ #if 0
+-	      _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-lendiff) - col_lendiff;
+-#else
+ 	      _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-col_lendiff);
++#else
++	      _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-lendiff);
+ #endif
+ 	    }
+ 	}
+@@ -1510,8 +1510,15 @@
+ #if defined (HANDLE_MULTIBYTE)
+   /* If we have multibyte characters, NEW is indexed by the buffer point in
+      a multibyte string, but _rl_last_c_pos is the display position.  In
+-     this case, NEW's display position is not obvious. */
+-  if ((MB_CUR_MAX == 1 || rl_byte_oriented ) && _rl_last_c_pos == new) return;
++     this case, NEW's display position is not obvious and must be
++     calculated. */
++  if (MB_CUR_MAX == 1 || rl_byte_oriented)
++    {
++      if (_rl_last_c_pos == new)
++	return;
++    }
++  else if (_rl_last_c_pos == _rl_col_width (data, 0, new))
++    return;
+ #else
+   if (_rl_last_c_pos == new) return;
+ #endif
+@@ -1594,11 +1601,7 @@
+ #endif
+     {
+       if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+-	{
+-	  tputs (_rl_term_cr, 1, _rl_output_character_function);
+-	  for (i = 0; i < new; i++)
+-	    putc (data[i], rl_outstream);
+-	}
++	_rl_backspace (_rl_last_c_pos - _rl_col_width (data, 0, new));
+       else
+ 	_rl_backspace (_rl_last_c_pos - new);
+     }
+@@ -2117,7 +2120,7 @@
+    scan from the beginning of the string to take the state into account. */
+ static int
+ _rl_col_width (str, start, end)
+-     char *str;
++     const char *str;
+      int start, end;
+ {
+   wchar_t wc;
+@@ -2193,4 +2196,3 @@
+   return width;
+ }
+ #endif /* HANDLE_MULTIBYTE */
+-	  
+diff -Naur readline-4.3/mbutil.c readline-4.3-new/mbutil.c
+--- readline-4.3/mbutil.c	2002-06-04 15:54:29.000000000 +0000
++++ readline-4.3-new/mbutil.c	2003-11-20 06:35:07.000000000 +0000
+@@ -205,14 +205,16 @@
+   if (tmp == (size_t)(-2))
+     {
+       /* shorted to compose multibyte char */
+-      memset (ps, 0, sizeof(mbstate_t));
++      if (ps)
++	memset (ps, 0, sizeof(mbstate_t));
+       return -2;
+     }
+   else if (tmp == (size_t)(-1))
+     {
+       /* invalid to compose multibyte char */
+       /* initialize the conversion state */
+-      memset (ps, 0, sizeof(mbstate_t));
++      if (ps)
++	memset (ps, 0, sizeof(mbstate_t));
+       return -1;
+     }
+   else if (tmp == (size_t)0)
+@@ -225,9 +227,12 @@
+    return 1. Otherwise return 0. */
+ int
+ _rl_compare_chars (buf1, pos1, ps1, buf2, pos2, ps2)
+-     char *buf1, *buf2;
+-     mbstate_t *ps1, *ps2;
+-     int pos1, pos2;
++     char *buf1;
++     int pos1;
++     mbstate_t *ps1;
++     char *buf2;
++     int pos2;
++     mbstate_t *ps2;
+ {
+   int i, w1, w2;
+ 
+@@ -276,8 +281,11 @@
+ 	  pos++;
+ 	  /* clear the state of the byte sequence, because
+ 	     in this case effect of mbstate is undefined  */
+-	  memset (ps, 0, sizeof (mbstate_t));
++	  if (ps)
++	    memset (ps, 0, sizeof (mbstate_t));
+ 	}
++      else if (tmp == 0)
++	pos++;
+       else
+ 	pos += tmp;
+     }
+diff -Naur readline-4.3/readline.c readline-4.3-new/readline.c
+--- readline-4.3/readline.c	2002-03-13 22:10:46.000000000 +0000
++++ readline-4.3-new/readline.c	2003-11-20 06:35:07.000000000 +0000
+@@ -684,6 +684,7 @@
+     }
+ #if defined (VI_MODE)
+   if (rl_editing_mode == vi_mode && _rl_keymap == vi_movement_keymap &&
++      key != ANYOTHERKEY &&
+       _rl_vi_textmod_command (key))
+     _rl_vi_set_last (key, rl_numeric_arg, rl_arg_sign);
+ #endif
+diff -Naur readline-4.3/vi_mode.c readline-4.3-new/vi_mode.c
+--- readline-4.3/vi_mode.c	2002-05-23 17:27:58.000000000 +0000
++++ readline-4.3-new/vi_mode.c	2003-11-20 06:35:07.000000000 +0000
+@@ -680,7 +680,8 @@
+      int count;
+ {
+   wchar_t wc;
+-  char mb[MB_LEN_MAX];
++  char mb[MB_LEN_MAX+1];
++  int mblen;
+   mbstate_t ps;
+ 
+   memset (&ps, 0, sizeof (mbstate_t));
+@@ -703,7 +704,9 @@
+       /* Vi is kind of strange here. */
+       if (wc)
+ 	{
+-	  wctomb (mb, wc);
++	  mblen = wctomb (mb, wc);
++	  if (mblen >= 0)
++	    mb[mblen] = '\0';
+ 	  rl_begin_undo_group ();
+ 	  rl_delete (1, 0);
+ 	  rl_insert_text (mb);
Index: patches/readline-5.0-fixes-1.patch
===================================================================
--- patches/readline-5.0-fixes-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/readline-5.0-fixes-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,232 @@
+Submitted By: Jim Gifford (patches at jg555 dot com)
+Date: 2004-09-29
+Initial Package Version: 5.0
+Origin: Various
+Upstream Status: Already Applied
+Description: This patch contains various fixes recommended
+	     by the author Chet. The original patches are
+	     avaiable at ftp://ftp.cwru.edu/pub/bash/readline-5.0-patches
+
+ 
+diff -Naur readline-5.0.orig/display.c readline-5.0/display.c
+--- readline-5.0.orig/display.c	2004-05-28 02:57:51.000000000 +0000
++++ readline-5.0/display.c	2004-09-29 16:50:55.112047008 +0000
+@@ -201,7 +201,7 @@
+      int *lp, *lip, *niflp, *vlp;
+ {
+   char *r, *ret, *p;
+-  int l, rl, last, ignoring, ninvis, invfl, ind, pind, physchars;
++  int l, rl, last, ignoring, ninvis, invfl, invflset, ind, pind, physchars;
+ 
+   /* Short-circuit if we can. */
+   if ((MB_CUR_MAX <= 1 || rl_byte_oriented) && strchr (pmt, RL_PROMPT_START_IGNORE) == 0)
+@@ -222,6 +222,7 @@
+   r = ret = (char *)xmalloc (l + 1);
+ 
+   invfl = 0;	/* invisible chars in first line of prompt */
++  invflset = 0;	/* we only want to set invfl once */
+ 
+   for (rl = ignoring = last = ninvis = physchars = 0, p = pmt; p && *p; p++)
+     {
+@@ -249,7 +250,10 @@
+ 	      while (l--)
+ 	        *r++ = *p++;
+ 	      if (!ignoring)
+-		rl += ind - pind;
++		{
++		  rl += ind - pind;
++		  physchars += _rl_col_width (pmt, pind, ind);
++		}
+ 	      else
+ 		ninvis += ind - pind;
+ 	      p--;			/* compensate for later increment */
+@@ -259,16 +263,19 @@
+ 	    {
+ 	      *r++ = *p;
+ 	      if (!ignoring)
+-		rl++;			/* visible length byte counter */
++		{
++		  rl++;			/* visible length byte counter */
++		  physchars++;
++		}
+ 	      else
+ 		ninvis++;		/* invisible chars byte counter */
+ 	    }
+ 
+-	  if (rl >= _rl_screenwidth)
+-	    invfl = ninvis;
+-
+-	  if (ignoring == 0)
+-	    physchars++;
++	  if (invflset == 0 && rl >= _rl_screenwidth)
++	    {
++	      invfl = ninvis;
++	      invflset = 1;
++	    }
+ 	}
+     }
+ 
+@@ -351,14 +358,14 @@
+       local_prompt = expand_prompt (p, &prompt_visible_length,
+ 				       &prompt_last_invisible,
+ 				       (int *)NULL,
+-				       (int *)NULL);
++				       &prompt_physical_chars);
+       c = *t; *t = '\0';
+       /* The portion of the prompt string up to and including the
+ 	 final newline is now null-terminated. */
+       local_prompt_prefix = expand_prompt (prompt, &prompt_prefix_length,
+ 						   (int *)NULL,
+ 						   &prompt_invis_chars_first_line,
+-						   &prompt_physical_chars);
++						   (int *)NULL);
+       *t = c;
+       return (prompt_prefix_length);
+     }
+@@ -417,7 +424,7 @@
+   register int in, out, c, linenum, cursor_linenum;
+   register char *line;
+   int c_pos, inv_botlin, lb_botlin, lb_linenum;
+-  int newlines, lpos, temp, modmark;
++  int newlines, lpos, temp, modmark, n0, num;
+   char *prompt_this_line;
+ #if defined (HANDLE_MULTIBYTE)
+   wchar_t wc;
+@@ -573,6 +580,7 @@
+ 
+ #if defined (HANDLE_MULTIBYTE)
+   memset (_rl_wrapped_line, 0, vis_lbsize);
++  num = 0;
+ #endif
+ 
+   /* prompt_invis_chars_first_line is the number of invisible characters in
+@@ -591,13 +599,32 @@
+          probably too much work for the benefit gained.  How many people have
+          prompts that exceed two physical lines?
+          Additional logic fix from Edward Catmur <ed@catmur.co.uk> */
++#if defined (HANDLE_MULTIBYTE)
++      n0 = num;
++      temp = local_prompt ? strlen (local_prompt) : 0;
++      while (num < temp)
++	{
++	  if (_rl_col_width  (local_prompt, n0, num) > _rl_screenwidth)
++	    {
++	      num = _rl_find_prev_mbchar (local_prompt, num, MB_FIND_ANY);
++	      break;
++	    }
++	  num++;
++	}
++      temp = num +
++#else
+       temp = ((newlines + 1) * _rl_screenwidth) +
++#endif /* !HANDLE_MULTIBYTE */
+              ((local_prompt_prefix == 0) ? ((newlines == 0) ? prompt_invis_chars_first_line
+ 							    : ((newlines == 1) ? wrap_offset : 0))
+ 					 : ((newlines == 0) ? wrap_offset :0));
+              
+       inv_lbreaks[++newlines] = temp;
++#if defined (HANDLE_MULTIBYTE)
++      lpos -= _rl_col_width (local_prompt, n0, num);
++#else
+       lpos -= _rl_screenwidth;
++#endif
+     }
+ 
+   prompt_last_screen_line = newlines;
+diff -Naur readline-5.0.orig/mbutil.c readline-5.0/mbutil.c
+--- readline-5.0.orig/mbutil.c	2004-01-14 14:44:52.000000000 +0000
++++ readline-5.0/mbutil.c	2004-09-29 16:50:58.864476552 +0000
+@@ -126,11 +126,11 @@
+   if (find_non_zero)
+     {
+       tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps);
+-      while (wcwidth (wc) == 0)
++      while (tmp > 0 && wcwidth (wc) == 0)
+ 	{
+ 	  point += tmp;
+ 	  tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps);
+-	  if (tmp == (size_t)(0) || tmp == (size_t)(-1) || tmp == (size_t)(-2))
++	  if (MB_NULLWCH (tmp) || MB_INVALIDCH (tmp))
+ 	    break;
+ 	}
+     }
+diff -Naur readline-5.0.orig/misc.c readline-5.0/misc.c
+--- readline-5.0.orig/misc.c	2004-07-07 12:56:32.000000000 +0000
++++ readline-5.0/misc.c	2004-09-29 16:50:53.976219680 +0000
+@@ -276,12 +276,6 @@
+       _rl_saved_line_for_history->line = savestring (rl_line_buffer);
+       _rl_saved_line_for_history->data = (char *)rl_undo_list;
+     }
+-  else if (STREQ (rl_line_buffer, _rl_saved_line_for_history->line) == 0)
+-    {
+-      free (_rl_saved_line_for_history->line);
+-      _rl_saved_line_for_history->line = savestring (rl_line_buffer);
+-      _rl_saved_line_for_history->data = (char *)rl_undo_list;	/* XXX possible memleak */
+-    }
+ 
+   return 0;
+ }
+diff -Naur readline-5.0.orig/vi_mode.c readline-5.0/vi_mode.c
+--- readline-5.0.orig/vi_mode.c	2004-07-13 18:08:27.000000000 +0000
++++ readline-5.0/vi_mode.c	2004-09-29 16:50:56.286868408 +0000
+@@ -272,10 +272,12 @@
+   switch (key)
+     {
+     case '?':
++      _rl_free_saved_history_line ();
+       rl_noninc_forward_search (count, key);
+       break;
+ 
+     case '/':
++      _rl_free_saved_history_line ();
+       rl_noninc_reverse_search (count, key);
+       break;
+ 
+@@ -690,7 +692,7 @@
+ {
+   wchar_t wc;
+   char mb[MB_LEN_MAX+1];
+-  int mblen;
++  int mblen, p;
+   mbstate_t ps;
+ 
+   memset (&ps, 0, sizeof (mbstate_t));
+@@ -713,11 +715,14 @@
+       /* Vi is kind of strange here. */
+       if (wc)
+ 	{
++	  p = rl_point;
+ 	  mblen = wcrtomb (mb, wc, &ps);
+ 	  if (mblen >= 0)
+ 	    mb[mblen] = '\0';
+ 	  rl_begin_undo_group ();
+-	  rl_delete (1, 0);
++	  rl_vi_delete (1, 0);
++	  if (rl_point < p)	/* Did we retreat at EOL? */
++	    rl_point++;	/* XXX - should we advance more than 1 for mbchar? */
+ 	  rl_insert_text (mb);
+ 	  rl_end_undo_group ();
+ 	  rl_vi_check ();
+@@ -1310,12 +1315,16 @@
+       rl_vi_delete (1, c);
+ #if defined (HANDLE_MULTIBYTE)
+       if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
+-	while (_rl_insert_char (1, c))
+-	  {
+-	    RL_SETSTATE (RL_STATE_MOREINPUT);
+-	    c = rl_read_key ();
+-	    RL_UNSETSTATE (RL_STATE_MOREINPUT);
+-	  }
++	{
++	  if (rl_point < p)		/* Did we retreat at EOL? */
++	    rl_point++;
++	  while (_rl_insert_char (1, c))
++	    {
++	      RL_SETSTATE (RL_STATE_MOREINPUT);
++	      c = rl_read_key ();
++	      RL_UNSETSTATE (RL_STATE_MOREINPUT);
++	    }
++	}
+       else
+ #endif
+ 	{
Index: tches/readline-5.2-fixes-4.patch
===================================================================
--- patches/readline-5.2-fixes-4.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,612 +1,0 @@
-Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
-Date: 12-21-2007
-Initial Package Version: 5.2
-Origin: Upstream
-Upstream Status: Applied
-Description: Contains all upstream patches up to 5.2-012
-
-diff -Naur readline-5.2.orig/complete.c readline-5.2/complete.c
---- readline-5.2.orig/complete.c	2006-07-28 11:35:49.000000000 -0400
-+++ readline-5.2/complete.c	2007-12-21 00:06:28.000000000 -0500
-@@ -428,7 +428,7 @@
- 	return (1);
-       if (c == 'n' || c == 'N' || c == RUBOUT)
- 	return (0);
--      if (c == ABORT_CHAR)
-+      if (c == ABORT_CHAR || c < 0)
- 	_rl_abort_internal ();
-       if (for_pager && (c == NEWLINE || c == RETURN))
- 	return (2);
-diff -Naur readline-5.2.orig/display.c readline-5.2/display.c
---- readline-5.2.orig/display.c	2006-09-14 14:20:12.000000000 -0400
-+++ readline-5.2/display.c	2007-12-21 00:06:31.000000000 -0500
-@@ -391,14 +391,14 @@
-       t = ++p;
-       local_prompt = expand_prompt (p, &prompt_visible_length,
- 				       &prompt_last_invisible,
--				       (int *)NULL,
-+				       &prompt_invis_chars_first_line,
- 				       &prompt_physical_chars);
-       c = *t; *t = '\0';
-       /* The portion of the prompt string up to and including the
- 	 final newline is now null-terminated. */
-       local_prompt_prefix = expand_prompt (prompt, &prompt_prefix_length,
- 						   (int *)NULL,
--						   &prompt_invis_chars_first_line,
-+						   (int *)NULL,
- 						   (int *)NULL);
-       *t = c;
-       local_prompt_len = local_prompt ? strlen (local_prompt) : 0;
-@@ -561,6 +561,17 @@
-       wrap_offset = prompt_invis_chars_first_line = 0;
-     }
- 
-+#if defined (HANDLE_MULTIBYTE)
-+#define CHECK_INV_LBREAKS() \
-+      do { \
-+	if (newlines >= (inv_lbsize - 2)) \
-+	  { \
-+	    inv_lbsize *= 2; \
-+	    inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \
-+	    _rl_wrapped_line = (int *)xrealloc (_rl_wrapped_line, inv_lbsize * sizeof (int)); \
-+	  } \
-+      } while (0)
-+#else
- #define CHECK_INV_LBREAKS() \
-       do { \
- 	if (newlines >= (inv_lbsize - 2)) \
-@@ -569,6 +580,7 @@
- 	    inv_lbreaks = (int *)xrealloc (inv_lbreaks, inv_lbsize * sizeof (int)); \
- 	  } \
-       } while (0)
-+#endif /* HANDLE_MULTIBYTE */
- 
- #if defined (HANDLE_MULTIBYTE)	  
- #define CHECK_LPOS() \
-@@ -1036,7 +1048,7 @@
- 		tx = _rl_col_width (&visible_line[pos], 0, nleft) - visible_wrap_offset;
- 	      else
- 		tx = nleft;
--	      if (_rl_last_c_pos > tx)
-+	      if (tx >= 0 && _rl_last_c_pos > tx)
- 		{
- 	          _rl_backspace (_rl_last_c_pos - tx);	/* XXX */
- 	          _rl_last_c_pos = tx;
-@@ -1192,7 +1204,7 @@
-      int current_line, omax, nmax, inv_botlin;
- {
-   register char *ofd, *ols, *oe, *nfd, *nls, *ne;
--  int temp, lendiff, wsatend, od, nd;
-+  int temp, lendiff, wsatend, od, nd, o_cpos;
-   int current_invis_chars;
-   int col_lendiff, col_temp;
- #if defined (HANDLE_MULTIBYTE)
-@@ -1453,6 +1465,8 @@
- 	_rl_last_c_pos = lendiff;
-     }
- 
-+  o_cpos = _rl_last_c_pos;
-+
-   /* When this function returns, _rl_last_c_pos is correct, and an absolute
-      cursor postion in multibyte mode, but a buffer index when not in a
-      multibyte locale. */
-@@ -1462,7 +1476,9 @@
-   /* We need to indicate that the cursor position is correct in the presence of
-      invisible characters in the prompt string.  Let's see if setting this when
-      we make sure we're at the end of the drawn prompt string works. */
--  if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 && _rl_last_c_pos == prompt_physical_chars)
-+  if (current_line == 0 && MB_CUR_MAX > 1 && rl_byte_oriented == 0 && 
-+      (_rl_last_c_pos > 0 || o_cpos > 0) &&
-+      _rl_last_c_pos == prompt_physical_chars)
-     cpos_adjusted = 1;
- #endif
- #endif
-@@ -1506,11 +1522,31 @@
-     {
-       /* Non-zero if we're increasing the number of lines. */
-       int gl = current_line >= _rl_vis_botlin && inv_botlin > _rl_vis_botlin;
-+      /* If col_lendiff is > 0, implying that the new string takes up more
-+	 screen real estate than the old, but lendiff is < 0, meaning that it
-+	 takes fewer bytes, we need to just output the characters starting
-+	 from the first difference.  These will overwrite what is on the
-+	 display, so there's no reason to do a smart update.  This can really
-+	 only happen in a multibyte environment. */
-+      if (lendiff < 0)
-+	{
-+	  _rl_output_some_chars (nfd, temp);
-+	  _rl_last_c_pos += _rl_col_width (nfd, 0, temp);
-+	  /* If nfd begins before any invisible characters in the prompt,
-+	     adjust _rl_last_c_pos to account for wrap_offset and set
-+	     cpos_adjusted to let the caller know. */
-+	  if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible))
-+	    {
-+	      _rl_last_c_pos -= wrap_offset;
-+	      cpos_adjusted = 1;
-+	    }
-+	  return;
-+	}
-       /* Sometimes it is cheaper to print the characters rather than
- 	 use the terminal's capabilities.  If we're growing the number
- 	 of lines, make sure we actually cause the new line to wrap
- 	 around on auto-wrapping terminals. */
--      if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl))
-+      else if (_rl_terminal_can_insert && ((2 * col_temp) >= col_lendiff || _rl_term_IC) && (!_rl_term_autowrap || !gl))
- 	{
- 	  /* If lendiff > prompt_visible_length and _rl_last_c_pos == 0 and
- 	     _rl_horizontal_scroll_mode == 1, inserting the characters with
-@@ -1533,11 +1569,16 @@
- 	    }
- 	  else
- 	    {
--	      /* We have horizontal scrolling and we are not inserting at
--		 the end.  We have invisible characters in this line.  This
--		 is a dumb update. */
- 	      _rl_output_some_chars (nfd, temp);
- 	      _rl_last_c_pos += col_temp;
-+	      /* If nfd begins before any invisible characters in the prompt,
-+		 adjust _rl_last_c_pos to account for wrap_offset and set
-+		 cpos_adjusted to let the caller know. */
-+	      if (current_line == 0 && wrap_offset && ((nfd - new) <= prompt_last_invisible))
-+		{
-+		  _rl_last_c_pos -= wrap_offset;
-+		  cpos_adjusted = 1;
-+		}
- 	      return;
- 	    }
- 	  /* Copy (new) chars to screen from first diff to last match. */
-@@ -1586,8 +1627,22 @@
- 	  temp = nls - nfd;
- 	  if (temp > 0)
- 	    {
-+	      /* If nfd begins at the prompt, or before the invisible
-+		 characters in the prompt, we need to adjust _rl_last_c_pos
-+		 in a multibyte locale to account for the wrap offset and
-+		 set cpos_adjusted accordingly. */
- 	      _rl_output_some_chars (nfd, temp);
--	      _rl_last_c_pos += _rl_col_width (nfd, 0, temp);;
-+	      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+		{
-+                  _rl_last_c_pos += _rl_col_width (nfd, 0, temp);
-+                  if (current_line == 0 && wrap_offset &&  ((nfd - new) <= prompt_last_invisible))
-+		    {
-+		      _rl_last_c_pos -= wrap_offset;
-+		      cpos_adjusted = 1;
-+		    }
-+		}
-+              else
-+                _rl_last_c_pos += temp;
- 	    }
- 	}
-       /* Otherwise, print over the existing material. */
-@@ -1595,8 +1650,20 @@
- 	{
- 	  if (temp > 0)
- 	    {
-+	      /* If nfd begins at the prompt, or before the invisible
-+		 characters in the prompt, we need to adjust _rl_last_c_pos
-+		 in a multibyte locale to account for the wrap offset and
-+		 set cpos_adjusted accordingly. */
- 	      _rl_output_some_chars (nfd, temp);
- 	      _rl_last_c_pos += col_temp;		/* XXX */
-+	      if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-+		{
-+		  if (current_line == 0 && wrap_offset &&  ((nfd - new) <= prompt_last_invisible))
-+		    {
-+		      _rl_last_c_pos -= wrap_offset;
-+		      cpos_adjusted = 1;
-+		    }
-+		}
- 	    }
- 	  lendiff = (oe - old) - (ne - new);
- 	  if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-@@ -1732,7 +1799,10 @@
-   if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-     {
-       dpos = _rl_col_width (data, 0, new);
--      if (dpos > prompt_last_invisible)		/* XXX - don't use woff here */
-+      /* Use NEW when comparing against the last invisible character in the
-+	 prompt string, since they're both buffer indices and DPOS is a
-+	 desired display position. */
-+      if (new > prompt_last_invisible)		/* XXX - don't use woff here */
- 	{
- 	  dpos -= woff;
- 	  /* Since this will be assigned to _rl_last_c_pos at the end (more
-@@ -2380,6 +2450,8 @@
- 
-   if (end <= start)
-     return 0;
-+  if (MB_CUR_MAX == 1 || rl_byte_oriented)
-+    return (end - start);
- 
-   memset (&ps, 0, sizeof (mbstate_t));
- 
-diff -Naur readline-5.2.orig/input.c readline-5.2/input.c
---- readline-5.2.orig/input.c	2006-08-16 15:15:16.000000000 -0400
-+++ readline-5.2/input.c	2007-12-21 00:06:32.000000000 -0500
-@@ -133,8 +133,11 @@
-     return (0);
- 
-   *key = ibuffer[pop_index++];
--
-+#if 0
-   if (pop_index >= ibuffer_len)
-+#else
-+  if (pop_index > ibuffer_len)
-+#endif
-     pop_index = 0;
- 
-   return (1);
-@@ -151,7 +154,7 @@
-     {
-       pop_index--;
-       if (pop_index < 0)
--	pop_index = ibuffer_len - 1;
-+	pop_index = ibuffer_len;
-       ibuffer[pop_index] = key;
-       return (1);
-     }
-@@ -250,7 +253,8 @@
-       while (chars_avail--)
- 	{
- 	  k = (*rl_getc_function) (rl_instream);
--	  rl_stuff_char (k);
-+	  if (rl_stuff_char (k) == 0)
-+	    break;			/* some problem; no more room */
- 	  if (k == NEWLINE || k == RETURN)
- 	    break;
- 	}
-@@ -373,7 +377,11 @@
-       RL_SETSTATE (RL_STATE_INPUTPENDING);
-     }
-   ibuffer[push_index++] = key;
-+#if 0
-   if (push_index >= ibuffer_len)
-+#else
-+  if (push_index > ibuffer_len)
-+#endif
-     push_index = 0;
- 
-   return 1;
-@@ -513,20 +521,26 @@
-      char *mbchar;
-      int size;
- {
--  int mb_len = 0;
-+  int mb_len, c;
-   size_t mbchar_bytes_length;
-   wchar_t wc;
-   mbstate_t ps, ps_back;
- 
-   memset(&ps, 0, sizeof (mbstate_t));
-   memset(&ps_back, 0, sizeof (mbstate_t));
--  
-+
-+  mb_len = 0;  
-   while (mb_len < size)
-     {
-       RL_SETSTATE(RL_STATE_MOREINPUT);
--      mbchar[mb_len++] = rl_read_key ();
-+      c = rl_read_key ();
-       RL_UNSETSTATE(RL_STATE_MOREINPUT);
- 
-+      if (c < 0)
-+	break;
-+
-+      mbchar[mb_len++] = c;
-+
-       mbchar_bytes_length = mbrtowc (&wc, mbchar, mb_len, &ps);
-       if (mbchar_bytes_length == (size_t)(-1))
- 	break;		/* invalid byte sequence for the current locale */
-@@ -564,7 +578,7 @@
- 
-   c = first;
-   memset (mb, 0, mlen);
--  for (i = 0; i < mlen; i++)
-+  for (i = 0; c >= 0 && i < mlen; i++)
-     {
-       mb[i] = (char)c;
-       memset (&ps, 0, sizeof (mbstate_t));
-diff -Naur readline-5.2.orig/isearch.c readline-5.2/isearch.c
---- readline-5.2.orig/isearch.c	2005-12-26 17:18:53.000000000 -0500
-+++ readline-5.2/isearch.c	2007-12-21 00:06:28.000000000 -0500
-@@ -327,8 +327,15 @@
-   rl_command_func_t *f;
- 
-   f = (rl_command_func_t *)NULL;
-- 
-- /* Translate the keys we do something with to opcodes. */
-+
-+  if (c < 0)
-+    {
-+      cxt->sflags |= SF_FAILED;
-+      cxt->history_pos = cxt->last_found_line;
-+      return -1;
-+    }
-+
-+  /* Translate the keys we do something with to opcodes. */
-   if (c >= 0 && _rl_keymap[c].type == ISFUNC)
-     {
-       f = _rl_keymap[c].function;
-diff -Naur readline-5.2.orig/misc.c readline-5.2/misc.c
---- readline-5.2.orig/misc.c	2005-12-26 17:20:46.000000000 -0500
-+++ readline-5.2/misc.c	2007-12-21 00:06:28.000000000 -0500
-@@ -146,6 +146,8 @@
- 	  rl_restore_prompt ();
- 	  rl_clear_message ();
- 	  RL_UNSETSTATE(RL_STATE_NUMERICARG);
-+	  if (key < 0)
-+	    return -1;
- 	  return (_rl_dispatch (key, _rl_keymap));
- 	}
-     }
-diff -Naur readline-5.2.orig/readline.c readline-5.2/readline.c
---- readline-5.2.orig/readline.c	2006-08-16 15:00:36.000000000 -0400
-+++ readline-5.2/readline.c	2007-12-21 00:06:28.000000000 -0500
-@@ -645,6 +645,11 @@
-   if ((cxt->flags & KSEQ_DISPATCHED) == 0)
-     {
-       nkey = _rl_subseq_getchar (cxt->okey);
-+      if (nkey < 0)
-+	{
-+	  _rl_abort_internal ();
-+	  return -1;
-+	}
-       r = _rl_dispatch_subseq (nkey, cxt->dmap, cxt->subseq_arg);
-       cxt->flags |= KSEQ_DISPATCHED;
-     }
-diff -Naur readline-5.2.orig/support/shobj-conf readline-5.2/support/shobj-conf
---- readline-5.2.orig/support/shobj-conf	2006-04-11 09:15:43.000000000 -0400
-+++ readline-5.2/support/shobj-conf	2007-12-21 00:06:32.000000000 -0500
-@@ -10,7 +10,7 @@
- # Chet Ramey
- # chet@po.cwru.edu
- 
--# Copyright (C) 1996-2002 Free Software Foundation, Inc.
-+# Copyright (C) 1996-2007 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
-@@ -114,7 +114,7 @@
- 	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)$(SHLIB_MINOR)'
- 	;;
- 
--freebsd2* | netbsd*)
-+freebsd2*)
- 	SHOBJ_CFLAGS=-fpic
- 	SHOBJ_LD=ld
- 	SHOBJ_LDFLAGS='-x -Bshareable'
-@@ -125,7 +125,7 @@
- 
- # FreeBSD-3.x ELF
- freebsd[3-9]*|freebsdelf[3-9]*|freebsdaout[3-9]*|dragonfly*)
--	SHOBJ_CFLAGS=-fpic
-+	SHOBJ_CFLAGS=-fPIC
- 	SHOBJ_LD='${CC}'
- 
- 	if [ -x /usr/bin/objformat ] && [ "`/usr/bin/objformat`" = "elf" ]; then
-@@ -142,7 +142,7 @@
- 	;;
- 
- # Darwin/MacOS X
--darwin8*)
-+darwin[89]*)
- 	SHOBJ_STATUS=supported
- 	SHLIB_STATUS=supported
- 	
-@@ -153,7 +153,7 @@
- 	SHLIB_LIBVERSION='$(SHLIB_MAJOR)$(SHLIB_MINOR).$(SHLIB_LIBSUFF)'
- 	SHLIB_LIBSUFF='dylib'
- 
--	SHOBJ_LDFLAGS='-undefined dynamic_lookup'
-+	SHOBJ_LDFLAGS='-dynamiclib -dynamic -undefined dynamic_lookup -arch_only `/usr/bin/arch`'
- 	SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
- 
- 	SHLIB_LIBS='-lncurses'	# see if -lcurses works on MacOS X 10.1 
-@@ -171,7 +171,7 @@
- 	SHLIB_LIBSUFF='dylib'
- 
- 	case "${host_os}" in
--	darwin[78]*)	SHOBJ_LDFLAGS=''
-+	darwin[789]*)	SHOBJ_LDFLAGS=''
- 			SHLIB_XLDFLAGS='-dynamiclib -arch_only `/usr/bin/arch` -install_name $(libdir)/$@ -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v'
- 			;;
- 	*)		SHOBJ_LDFLAGS='-dynamic'
-@@ -182,7 +182,7 @@
- 	SHLIB_LIBS='-lncurses'	# see if -lcurses works on MacOS X 10.1 
- 	;;
- 
--openbsd*)
-+openbsd*|netbsd*)
- 	SHOBJ_CFLAGS=-fPIC
- 	SHOBJ_LD='${CC}'
- 	SHOBJ_LDFLAGS='-shared'
-@@ -247,7 +247,7 @@
- 	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
- 	;;
- 
--aix4.[2-9]*-*gcc*)		# lightly tested by jik@cisco.com
-+aix4.[2-9]*-*gcc*|aix[5-9].*-*gcc*)		# lightly tested by jik@cisco.com
- 	SHOBJ_CFLAGS=-fpic
- 	SHOBJ_LD='ld'
- 	SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpall'
-@@ -258,7 +258,7 @@
- 	SHLIB_LIBVERSION='$(SHLIB_LIBSUFF).$(SHLIB_MAJOR)'
- 	;;
- 
--aix4.[2-9]*)
-+aix4.[2-9]*|aix[5-9].*)
- 	SHOBJ_CFLAGS=-K
- 	SHOBJ_LD='ld'
- 	SHOBJ_LDFLAGS='-bdynamic -bnoentry -bexpall'
-@@ -329,7 +329,7 @@
- 	SHOBJ_LD='${CC}'
- 	# if you have problems linking here, moving the `-Wl,+h,$@' from
- 	# SHLIB_XLDFLAGS to SHOBJ_LDFLAGS has been reported to work
--	SHOBJ_LDFLAGS='-shared -Wl,-b -Wl,+s'
-+	SHOBJ_LDFLAGS='-shared -fpic -Wl,-b -Wl,+s'
- 
- 	SHLIB_XLDFLAGS='-Wl,+h,$@ -Wl,+b,$(libdir)'
- 	SHLIB_LIBSUFF='sl'
-diff -Naur readline-5.2.orig/text.c readline-5.2/text.c
---- readline-5.2.orig/text.c	2006-07-28 11:55:27.000000000 -0400
-+++ readline-5.2/text.c	2007-12-21 00:06:28.000000000 -0500
-@@ -857,6 +857,9 @@
-   c = rl_read_key ();
-   RL_UNSETSTATE(RL_STATE_MOREINPUT);
- 
-+  if (c < 0)
-+    return -1;
-+
- #if defined (HANDLE_SIGNALS)
-   if (RL_ISSTATE (RL_STATE_CALLBACK) == 0)
-     _rl_restore_tty_signals ();
-@@ -1520,6 +1523,9 @@
- 
-   mb_len = _rl_read_mbchar (mbchar, MB_LEN_MAX);
- 
-+  if (mb_len <= 0)
-+    return -1;
-+
-   if (count < 0)
-     return (_rl_char_search_internal (-count, bdir, mbchar, mb_len));
-   else
-@@ -1536,6 +1542,9 @@
-   c = rl_read_key ();
-   RL_UNSETSTATE(RL_STATE_MOREINPUT);
- 
-+  if (c < 0)
-+    return -1;
-+
-   if (count < 0)
-     return (_rl_char_search_internal (-count, bdir, c));
-   else
-diff -Naur readline-5.2.orig/vi_mode.c readline-5.2/vi_mode.c
---- readline-5.2.orig/vi_mode.c	2006-07-29 16:42:28.000000000 -0400
-+++ readline-5.2/vi_mode.c	2007-12-21 00:06:28.000000000 -0500
-@@ -886,6 +886,13 @@
-   RL_SETSTATE(RL_STATE_MOREINPUT);
-   c = rl_read_key ();
-   RL_UNSETSTATE(RL_STATE_MOREINPUT);
-+
-+  if (c < 0)
-+    {
-+      *nextkey = 0;
-+      return -1;
-+    }
-+
-   *nextkey = c;
- 
-   if (!member (c, vi_motion))
-@@ -902,6 +909,11 @@
- 	  RL_SETSTATE(RL_STATE_MOREINPUT);
- 	  c = rl_read_key ();	/* real command */
- 	  RL_UNSETSTATE(RL_STATE_MOREINPUT);
-+	  if (c < 0)
-+	    {
-+	      *nextkey = 0;
-+	      return -1;
-+	    }
- 	  *nextkey = c;
- 	}
-       else if (key == c && (key == 'd' || key == 'y' || key == 'c'))
-@@ -1224,14 +1236,22 @@
- _rl_vi_callback_char_search (data)
-      _rl_callback_generic_arg *data;
- {
-+  int c;
- #if defined (HANDLE_MULTIBYTE)
--  _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
-+  c = _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
- #else
-   RL_SETSTATE(RL_STATE_MOREINPUT);
--  _rl_vi_last_search_char = rl_read_key ();
-+  c = rl_read_key ();
-   RL_UNSETSTATE(RL_STATE_MOREINPUT);
- #endif
- 
-+  if (c <= 0)
-+    return -1;
-+
-+#if !defined (HANDLE_MULTIBYTE)
-+  _rl_vi_last_search_char = c;
-+#endif
-+
-   _rl_callback_func = 0;
-   _rl_want_redisplay = 1;
- 
-@@ -1247,6 +1267,7 @@
- rl_vi_char_search (count, key)
-      int count, key;
- {
-+  int c;
- #if defined (HANDLE_MULTIBYTE)
-   static char *target;
-   static int tlen;
-@@ -1293,11 +1314,17 @@
-       else
- 	{
- #if defined (HANDLE_MULTIBYTE)
--	  _rl_vi_last_search_mblen = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
-+	  c = _rl_read_mbchar (_rl_vi_last_search_mbchar, MB_LEN_MAX);
-+	  if (c <= 0)
-+	    return -1;
-+	  _rl_vi_last_search_mblen = c;
- #else
- 	  RL_SETSTATE(RL_STATE_MOREINPUT);
--	  _rl_vi_last_search_char = rl_read_key ();
-+	  c = rl_read_key ();
- 	  RL_UNSETSTATE(RL_STATE_MOREINPUT);
-+	  if (c < 0)
-+	    return -1;
-+	  _rl_vi_last_search_char = c;
- #endif
- 	}
-     }
-@@ -1467,6 +1494,9 @@
-   c = rl_read_key ();
-   RL_UNSETSTATE(RL_STATE_MOREINPUT);
- 
-+  if (c < 0)
-+    return -1;
-+
- #if defined (HANDLE_MULTIBYTE)
-   if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
-     c = _rl_read_mbstring (c, mb, mlen);
-@@ -1485,6 +1515,9 @@
- 
-   _rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX);
- 
-+  if (c < 0)
-+    return -1;
-+
-   _rl_callback_func = 0;
-   _rl_want_redisplay = 1;
- 
-@@ -1516,6 +1549,9 @@
-   else
-     _rl_vi_last_replacement = c = _rl_vi_callback_getchar (mb, MB_LEN_MAX);
- 
-+  if (c < 0)
-+    return -1;
-+
-   return (_rl_vi_change_char (count, c, mb));
- }
- 
-@@ -1650,7 +1686,7 @@
-   ch = rl_read_key ();
-   RL_UNSETSTATE(RL_STATE_MOREINPUT);
- 
--  if (ch < 'a' || ch > 'z')
-+  if (ch < 0 || ch < 'a' || ch > 'z')	/* make test against 0 explicit */
-     {
-       rl_ding ();
-       return -1;
-@@ -1702,7 +1738,7 @@
-       rl_point = rl_mark;
-       return 0;
-     }
--  else if (ch < 'a' || ch > 'z')
-+  else if (ch < 0 || ch < 'a' || ch > 'z')	/* make test against 0 explicit */
-     {
-       rl_ding ();
-       return -1;
Index: patches/sed-4.1-permissions-1.patch
===================================================================
--- patches/sed-4.1-permissions-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/sed-4.1-permissions-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,22 @@
+Submitted By:            Matthew Burgess
+Date:                    2004-06-17
+Initial Package Version: 4.1
+Upstream Status:         Submitted and accepted upstream
+Origin:                  Bruce Dubbs
+                         (http://www.linuxfromscratch.org/pipermail/lfs-dev/2004-June/046773.html)
+Description:             When using the in-place function, sed 4.1 changes
+                         permissions. Specifically, when using sed on a bash
+                         script with permissions 755, the updated file has
+                         permissions 600.
+
+diff -Naur sed-4.1.orig/sed/execute.c sed-4.1/sed/execute.c
+--- sed-4.1.orig/sed/execute.c	2004-03-13 09:30:39.000000000 +0000
++++ sed-4.1/sed/execute.c	2004-06-17 20:05:20.000000000 +0000
+@@ -668,6 +668,7 @@
+       
+       input->in_file_name = name;
+       output_file.fp = ck_mkstemp (&input->out_file_name, tmpdir, "sed");
++      output_fd = fileno(output_file.fp);
+       free (tmpdir);
+ 
+       fstat (fileno (input->fp), &st);
Index: patches/shadow-4.0.4.1-pam-1.patch
===================================================================
--- patches/shadow-4.0.4.1-pam-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/shadow-4.0.4.1-pam-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,164 @@
+Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
+Date: 2004-01-14
+Initial Package Version: 4.0.4.1
+Origin: Jim Gifford
+Description: Fixes PAM Compile Issues with Shadow
+
+
+ 
+$LastChangedBy: bdubbs $
+$Date: 2004-08-07 18:56:30 -0600 (Sat, 07 Aug 2004) $
+
+diff -Naur shadow-4.0.4.1.orig/src/Makefile.in shadow-4.0.4.1/src/Makefile.in
+--- shadow-4.0.4.1.orig/src/Makefile.in	2004-01-14 14:15:28.000000000 +0000
++++ shadow-4.0.4.1/src/Makefile.in	2004-01-14 19:22:35.000000000 +0000
+@@ -211,17 +211,35 @@
+ chage_LDADD = $(LDADD) $(LIBPAM)
+ chfn_LDADD = $(LDADD) $(LIBPAM)
+ chsh_LDADD = $(LDADD) $(LIBPAM)
++dpasswd_LDADD = $(LDADD) $(LIBPAM)
++expiry_LDADD = $(LDADD) $(LIBPAM)
++faillog_LDADD = $(LDADD) $(LIBPAM)
++gpasswd_LDADD = $(LDADD) $(LIBPAM)
+ groupadd_LDADD = $(LDADD) $(LIBPAM)
+ groupdel_LDADD = $(LDADD) $(LIBPAM)
+ groupmod_LDADD = $(LDADD) $(LIBPAM)
++groups_LDADD = $(LDADD) $(LIBPAM)
++grpck_LDADD = $(LDADD) $(LIBPAM)
++grpconv_LDADD = $(LDADD) $(LIBPAM)
++grpunconv_LDADD = $(LDADD) $(LIBPAM)
++id_LDADD = $(LDADD) $(LIBPAM)
++lastlog_LDADD = $(LDADD) $(LIBPAM)
+ login_LDADD = $(LDADD) $(LIBPAM)
++logoutd_LDADD = $(LDADD) $(LIBPAM)
++mkpasswd_LDADD = $(LDADD) $(LIBPAM)
++newgrp_LDADD = $(LDADD) $(LIBPAM)
+ newusers_LDADD = $(LDADD) $(LIBPAM)
+ passwd_LDADD = $(LDADD) $(LIBPAM) $(LIBCRACK)
++pwck_LDADD = $(LDADD) $(LIBPAM)
++pwconv_LDADD = $(LDADD) $(LIBPAM)
++pwunconv_LDADD = $(LDADD) $(LIBPAM)
+ su_SOURCES = su.c suauth.c
+ su_LDADD = $(LDADD) $(LIBPAM)
++sulogin_LDADD = $(LDADD) $(LIBPAM)
+ useradd_LDADD = $(LDADD) $(LIBPAM)
+ userdel_LDADD = $(LDADD) $(LIBPAM)
+ usermod_LDADD = $(LDADD) $(LIBPAM)
++vipw_LDADD = $(LDADD) $(LIBPAM)
+ subdir = src
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -263,19 +281,16 @@
+ chsh_LDFLAGS =
+ expiry_SOURCES = expiry.c
+ expiry_OBJECTS = expiry.$(OBJEXT)
+-expiry_LDADD = $(LDADD)
+ expiry_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.la \
+ 	$(top_builddir)/lib/libshadow.la
+ expiry_LDFLAGS =
+ faillog_SOURCES = faillog.c
+ faillog_OBJECTS = faillog.$(OBJEXT)
+-faillog_LDADD = $(LDADD)
+ faillog_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.la \
+ 	$(top_builddir)/lib/libshadow.la
+ faillog_LDFLAGS =
+ gpasswd_SOURCES = gpasswd.c
+ gpasswd_OBJECTS = gpasswd.$(OBJEXT)
+-gpasswd_LDADD = $(LDADD)
+ gpasswd_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.la \
+ 	$(top_builddir)/lib/libshadow.la
+ gpasswd_LDFLAGS =
+@@ -296,37 +311,31 @@
+ groupmod_LDFLAGS =
+ groups_SOURCES = groups.c
+ groups_OBJECTS = groups.$(OBJEXT)
+-groups_LDADD = $(LDADD)
+ groups_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.la \
+ 	$(top_builddir)/lib/libshadow.la
+ groups_LDFLAGS =
+ grpck_SOURCES = grpck.c
+ grpck_OBJECTS = grpck.$(OBJEXT)
+-grpck_LDADD = $(LDADD)
+ grpck_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.la \
+ 	$(top_builddir)/lib/libshadow.la
+ grpck_LDFLAGS =
+ grpconv_SOURCES = grpconv.c
+ grpconv_OBJECTS = grpconv.$(OBJEXT)
+-grpconv_LDADD = $(LDADD)
+ grpconv_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.la \
+ 	$(top_builddir)/lib/libshadow.la
+ grpconv_LDFLAGS =
+ grpunconv_SOURCES = grpunconv.c
+ grpunconv_OBJECTS = grpunconv.$(OBJEXT)
+-grpunconv_LDADD = $(LDADD)
+ grpunconv_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.la \
+ 	$(top_builddir)/lib/libshadow.la
+ grpunconv_LDFLAGS =
+ id_SOURCES = id.c
+ id_OBJECTS = id.$(OBJEXT)
+-id_LDADD = $(LDADD)
+ id_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.la \
+ 	$(top_builddir)/lib/libshadow.la
+ id_LDFLAGS =
+ lastlog_SOURCES = lastlog.c
+ lastlog_OBJECTS = lastlog.$(OBJEXT)
+-lastlog_LDADD = $(LDADD)
+ lastlog_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.la \
+ 	$(top_builddir)/lib/libshadow.la
+ lastlog_LDFLAGS =
+@@ -337,19 +346,16 @@
+ login_LDFLAGS =
+ logoutd_SOURCES = logoutd.c
+ logoutd_OBJECTS = logoutd.$(OBJEXT)
+-logoutd_LDADD = $(LDADD)
+ logoutd_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.la \
+ 	$(top_builddir)/lib/libshadow.la
+ logoutd_LDFLAGS =
+ mkpasswd_SOURCES = mkpasswd.c
+ mkpasswd_OBJECTS = mkpasswd.$(OBJEXT)
+-mkpasswd_LDADD = $(LDADD)
+ mkpasswd_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.la \
+ 	$(top_builddir)/lib/libshadow.la
+ mkpasswd_LDFLAGS =
+ newgrp_SOURCES = newgrp.c
+ newgrp_OBJECTS = newgrp.$(OBJEXT)
+-newgrp_LDADD = $(LDADD)
+ newgrp_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.la \
+ 	$(top_builddir)/lib/libshadow.la
+ newgrp_LDFLAGS =
+@@ -365,19 +371,16 @@
+ passwd_LDFLAGS =
+ pwck_SOURCES = pwck.c
+ pwck_OBJECTS = pwck.$(OBJEXT)
+-pwck_LDADD = $(LDADD)
+ pwck_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.la \
+ 	$(top_builddir)/lib/libshadow.la
+ pwck_LDFLAGS =
+ pwconv_SOURCES = pwconv.c
+ pwconv_OBJECTS = pwconv.$(OBJEXT)
+-pwconv_LDADD = $(LDADD)
+ pwconv_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.la \
+ 	$(top_builddir)/lib/libshadow.la
+ pwconv_LDFLAGS =
+ pwunconv_SOURCES = pwunconv.c
+ pwunconv_OBJECTS = pwunconv.$(OBJEXT)
+-pwunconv_LDADD = $(LDADD)
+ pwunconv_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.la \
+ 	$(top_builddir)/lib/libshadow.la
+ pwunconv_LDFLAGS =
+@@ -388,7 +391,6 @@
+ su_LDFLAGS =
+ sulogin_SOURCES = sulogin.c
+ sulogin_OBJECTS = sulogin.$(OBJEXT)
+-sulogin_LDADD = $(LDADD)
+ sulogin_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.la \
+ 	$(top_builddir)/lib/libshadow.la
+ sulogin_LDFLAGS =
+@@ -409,7 +411,6 @@
+ usermod_LDFLAGS =
+ vipw_SOURCES = vipw.c
+ vipw_OBJECTS = vipw.$(OBJEXT)
+-vipw_LDADD = $(LDADD)
+ vipw_DEPENDENCIES = $(top_builddir)/libmisc/libmisc.la \
+ 	$(top_builddir)/lib/libshadow.la
+ vipw_LDFLAGS =
Index: patches/shadow-4.0.7-fix_lastlog-1.patch
===================================================================
--- patches/shadow-4.0.7-fix_lastlog-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/shadow-4.0.7-fix_lastlog-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,20 @@
+Submitted By: Archaic <archaic at linuxfromscratch dot org>
+Date: 2005-03-22
+Initial Package Version: 4.0.7
+Origin: http://cvs.pld.org.pl/shadow/libmisc/log.c?r1=1.7&r2=1.8
+Upstream Status: Already in CVS
+Description: Shadow fails to update the time of last login as noted by lastlog
+when logging into a regular console. The Port (tty) column does get updated.
+Remote logins and xterm logins seem to be not be broken, just console.
+
+diff -Naur shadow-4.0.7.orig/libmisc/log.c shadow-4.0.7/libmisc/log.c
+--- shadow-4.0.7.orig/libmisc/log.c	2003-12-17 12:52:25.000000000 +0000
++++ shadow-4.0.7/libmisc/log.c	2005-03-22 05:53:59.000000000 +0000
+@@ -89,6 +89,7 @@
+ 
+ 	ll_time = newlog.ll_time;
+ 	time (&ll_time);
++	newlog.ll_time = ll_time;
+ 	strncpy (newlog.ll_line, line, sizeof newlog.ll_line);
+ #if HAVE_LL_HOST
+ 	strncpy (newlog.ll_host, host, sizeof newlog.ll_host);
Index: tches/silo-1.4.13-fixes-3.patch
===================================================================
--- patches/silo-1.4.13-fixes-3.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,24489 +1,0 @@
-Submitted By: Joe Ciccone <joeciccone at crazyeyesoft dot com>
-Date: 2007-04-05
-Initial Package Version: 1.4.13
-Upstream Status: Unknown
-Origin: Rocklinux and Jim Gifford and Joe Ciccone
-Description: Fixes cross-compilation issues and silo no longer links to
-        libext2fs.so, it is integrated instead. Also allows silo to build
-        and work properly on pure64 systems.
-
-diff -Naur silo-1.4.13.orig/common/Makefile silo-1.4.13/common/Makefile
---- silo-1.4.13.orig/common/Makefile	2006-06-01 13:24:53.000000000 -0400
-+++ silo-1.4.13/common/Makefile	2007-04-03 17:02:53.000000000 -0400
-@@ -5,19 +5,22 @@
- include ../Rules.make
- 
- .c.o:
--	$(CC) $(CFLAGS) -c $*.c
-+	$(CC-SILO) $(CFLAGS) -c $*.c
- 
- .S.o:
--	$(CC) $(CFLAGS) -c $*.S
-+	$(CC-SILO) $(CFLAGS) -c $*.S
- 
- OBJS = sdiv.o rem.o udiv.o urem.o jmp.o printf.o console.o prom.o tree.o stringops2.o\
- 	stringops1.o ffs.o divdi3.o udivdi3.o
--PROGRAMS = bin2h
- 
--all: $(OBJS) $(PROGRAMS)
-+bin2h:
-+	$(BUILD_CC) $(CFLAGS) -o bin2h bin2h.c
-+
-+all: $(OBJS) bin2h
- 
- prom.o: prom.c
--	$(CC) $(CFLAGS) -c -Wa,-Av9 -o prom.o prom.c
-+	$(CC-SILO) $(CFLAGS) -c -Wa,-Av9 -o prom.o prom.c
- 
- clean:
--	$(RM) $(PROGRAMS) *.o
-+	$(RM) bin2h *.o
-+
-diff -Naur silo-1.4.13.orig/first/Makefile silo-1.4.13/first/Makefile
---- silo-1.4.13.orig/first/Makefile	2006-06-01 13:24:53.000000000 -0400
-+++ silo-1.4.13/first/Makefile	2007-04-05 19:48:31.000000000 -0400
-@@ -1,4 +1,4 @@
--##
-+#
- ## Linux Loader for SPARC
- ##
- #
-@@ -13,7 +13,7 @@
- LDFLAGS=-N -Ttext 0x4000
- 
- .S.o:
--	$(CC) $(CFLAGS) -c $*.S
-+	$(CC-SILO) $(CFLAGS) -c $*.S
- 
- all: first.b first.h ultra.b ultra.h generic.b generic.h fd.b ieee32.b
- 
-@@ -33,7 +33,7 @@
- 	sed -n 's/^\(000000000000\|0000\)4\([0-9a-f][0-9a-f][0-9a-f]\) .*letter_here.*$$/#define FD_LETTER_OFFSET_TMP 0x\2/p' < fd.map >> fd.h
- 
- first.o: first.S
--	$(CC) $(CFLAGS) -c first.S -o first.o
-+	$(CC-SILO) $(CFLAGS) -c first.S -o first.o
- 
- first: first.o
- 	$(LD) $(LDFLAGS) -o first first.o
-@@ -46,7 +46,7 @@
- 	$(DD) if=/dev/zero of=first.b bs=4 count=1 seek=127
- 
- ultra.o: ultra.S
--	$(CC) $(CFLAGS) -c -Wa,-Av9a ultra.S
-+	$(CC-SILO) $(CFLAGS) -c -Wa,-Av9a ultra.S
- 
- ultra: ultra.o
- 	$(LD) $(LDFLAGS) -o ultra ultra.o
-@@ -56,11 +56,11 @@
- ultra.b: ultra
- 	$(ELFTOAOUT) -o ultra.b ultra
- 	echo -n 'SILO'$(IMGVERSION) | $(DD) of=ultra.b bs=8 conv=notrunc seek=3 count=1
--	echo -n -e '\340' | $(DD) of=ultra.b bs=1 count=1 seek=7 conv=notrunc
-+	echo -n -e '\0340' | $(DD) of=ultra.b bs=1 count=1 seek=7 conv=notrunc
- 	$(DD) if=/dev/zero of=ultra.b bs=4 count=1 seek=127
- 
- generic.o: generic.S
--	$(CC) $(CFLAGS) -c -Wa,-Av9a generic.S
-+	$(CC-SILO) $(CFLAGS) -c -Wa,-Av9a generic.S
- 
- generic: generic.o
- 	$(LD) $(LDFLAGS) -o generic generic.o
-@@ -70,11 +70,11 @@
- generic.b: generic
- 	$(ELFTOAOUT) -o generic.b generic
- 	echo -n 'SILO'$(IMGVERSION) | $(DD) of=generic.b bs=8 conv=notrunc seek=3 count=1
--	echo -n -e '\340' | $(DD) of=generic.b bs=1 count=1 seek=7 conv=notrunc
-+	echo -n -e '\0340' | $(DD) of=generic.b bs=1 count=1 seek=7 conv=notrunc
- 	$(DD) if=/dev/zero of=generic.b bs=4 count=1 seek=255
- 
- fd.o: fd.S
--	$(CC) $(CFLAGS) -c -Wa,-Av9a fd.S
-+	$(CC-SILO) $(CFLAGS) -c -Wa,-Av9a fd.S
- 
- fd: fd.o
- 	$(LD) $(LDFLAGS) -o fd fd.o
-@@ -84,11 +84,11 @@
- fd.b: fd
- 	$(ELFTOAOUT) -o fd.b fd
- 	echo -n 'SILO'$(IMGVERSION) | $(DD) of=fd.b bs=8 conv=notrunc seek=3 count=1
--	echo -n -e '\340' | $(DD) of=fd.b bs=1 count=1 seek=7 conv=notrunc
-+	echo -n -e '\0340' | $(DD) of=fd.b bs=1 count=1 seek=7 conv=notrunc
- 	$(DD) if=/dev/zero of=fd.b bs=4 count=1 seek=255
- 
- ieee32.o: ieee32.S ieee32.h
--	$(CC) $(CFLAGS) -DIMGVERSION='"SILO$(IMGVERSION)"' -c ieee32.S
-+	$(CC-SILO) $(CFLAGS) -DIMGVERSION='"SILO$(IMGVERSION)"' -c ieee32.S
- 
- ieee32.b: ieee32.o
- 	$(LD) $(LDFLAGS) -o ieee32.b ieee32.o
-diff -Naur silo-1.4.13.orig/first-isofs/Makefile silo-1.4.13/first-isofs/Makefile
---- silo-1.4.13.orig/first-isofs/Makefile	2006-06-01 13:24:53.000000000 -0400
-+++ silo-1.4.13/first-isofs/Makefile	2007-04-03 17:02:53.000000000 -0400
-@@ -11,10 +11,10 @@
- all: $(NAME).b
- 
- .c.o:
--	$(CC) $(CFLAGS) -c $*.c
-+	$(CC-SILO) $(CFLAGS) -c $*.c
- 
- .S.o:
--	$(CC) $(CFLAGS) -c $*.S
-+	$(CC-SILO) $(CFLAGS) -c $*.S
- 
- OBJS_COMMON = ../common/prom.o ../common/console.o ../common/tree.o
- OBJS = crt0.o $(NAME).o $(OBJS_COMMON)
-@@ -28,7 +28,7 @@
- 	cat $<.aout >> $@
- 
- crt0.o:	crt0.S
--	$(CC) $(CFLAGS) -c -Wa,-Av9 -o $@ $<
-+	$(CC-SILO) $(CFLAGS) -c -Wa,-Av9 -o $@ $<
- 
- clean:
- 	$(RM) *.o $(NAME) $(NAME).b $(NAME).aout
-diff -Naur silo-1.4.13.orig/include/emul_32/asm/elf.h silo-1.4.13/include/emul_32/asm/elf.h
---- silo-1.4.13.orig/include/emul_32/asm/elf.h	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/include/emul_32/asm/elf.h	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,162 @@
-+#ifndef __ASMSPARC_ELF_H
-+#define __ASMSPARC_ELF_H
-+
-+/*
-+ * ELF register definitions..
-+ */
-+
-+
-+/*
-+ * Sparc section types
-+ */
-+#define STT_REGISTER		13
-+
-+/*
-+ * Sparc ELF relocation types
-+ */
-+#define	R_SPARC_NONE		0
-+#define	R_SPARC_8		1
-+#define	R_SPARC_16		2
-+#define	R_SPARC_32		3
-+#define	R_SPARC_DISP8		4
-+#define	R_SPARC_DISP16		5
-+#define	R_SPARC_DISP32		6
-+#define	R_SPARC_WDISP30		7
-+#define	R_SPARC_WDISP22		8
-+#define	R_SPARC_HI22		9
-+#define	R_SPARC_22		10
-+#define	R_SPARC_13		11
-+#define	R_SPARC_LO10		12
-+#define	R_SPARC_GOT10		13
-+#define	R_SPARC_GOT13		14
-+#define	R_SPARC_GOT22		15
-+#define	R_SPARC_PC10		16
-+#define	R_SPARC_PC22		17
-+#define	R_SPARC_WPLT30		18
-+#define	R_SPARC_COPY		19
-+#define	R_SPARC_GLOB_DAT	20
-+#define	R_SPARC_JMP_SLOT	21
-+#define	R_SPARC_RELATIVE	22
-+#define	R_SPARC_UA32		23
-+#define R_SPARC_PLT32		24
-+#define R_SPARC_HIPLT22		25
-+#define R_SPARC_LOPLT10		26
-+#define R_SPARC_PCPLT32		27
-+#define R_SPARC_PCPLT22		28
-+#define R_SPARC_PCPLT10		29
-+#define R_SPARC_10		30
-+#define R_SPARC_11		31
-+#define R_SPARC_64		32
-+#define R_SPARC_OLO10		33
-+#define R_SPARC_WDISP16		40
-+#define R_SPARC_WDISP19		41
-+#define R_SPARC_7		43
-+#define R_SPARC_5		44
-+#define R_SPARC_6		45
-+
-+/* Bits present in AT_HWCAP, primarily for Sparc32.  */
-+
-+#define HWCAP_SPARC_FLUSH       1    /* CPU supports flush instruction. */
-+#define HWCAP_SPARC_STBAR       2
-+#define HWCAP_SPARC_SWAP        4
-+#define HWCAP_SPARC_MULDIV      8
-+#define HWCAP_SPARC_V9		16
-+#define HWCAP_SPARC_ULTRA3	32
-+
-+/* For the most part we present code dumps in the format
-+ * Solaris does.
-+ */
-+typedef unsigned long elf_greg_t;
-+#define ELF_NGREG 38
-+typedef elf_greg_t elf_gregset_t[ELF_NGREG];
-+
-+/* Format is:
-+ * 	G0 --> G7
-+ *	O0 --> O7
-+ *	L0 --> L7
-+ *	I0 --> I7
-+ *	PSR, PC, nPC, Y, WIM, TBR
-+ */
-+#define ELF_CORE_COPY_REGS(__elf_regs, __pt_regs)	\
-+do {	unsigned long *dest = &(__elf_regs[0]);		\
-+	struct pt_regs *src = (__pt_regs);		\
-+	unsigned long *sp;				\
-+	memcpy(&dest[0], &src->u_regs[0],		\
-+	       sizeof(unsigned long) * 16);		\
-+	/* Don't try this at home kids... */		\
-+	sp = (unsigned long *) src->u_regs[14];		\
-+	copy_from_user(&dest[16], sp,			\
-+		       sizeof(unsigned long) * 16);	\
-+	dest[32] = src->psr;				\
-+	dest[33] = src->pc;				\
-+	dest[34] = src->npc;				\
-+	dest[35] = src->y;				\
-+	dest[36] = dest[37] = 0; /* XXX */		\
-+} while(0); /* Janitors: Don't touch this colon. */
-+
-+typedef struct {
-+	union {
-+		unsigned long	pr_regs[32];
-+		double		pr_dregs[16];
-+	} pr_fr;
-+	unsigned long __unused;
-+	unsigned long	pr_fsr;
-+	unsigned char	pr_qcnt;
-+	unsigned char	pr_q_entrysize;
-+	unsigned char	pr_en;
-+	unsigned int	pr_q[64];
-+} elf_fpregset_t;
-+
-+#define ELF_CORE_COPY_TASK_REGS(__tsk, __elf_regs)	\
-+	({ ELF_CORE_COPY_REGS((*(__elf_regs)), (__tsk)->thread.kregs); 1; })
-+
-+/*
-+ * This is used to ensure we don't load something for the wrong architecture.
-+ */
-+#define elf_check_arch(x) ((x)->e_machine == EM_SPARC)
-+
-+/*
-+ * These are used to set parameters in the core dumps.
-+ */
-+#define ELF_ARCH	EM_SPARC
-+#define ELF_CLASS	ELFCLASS32
-+#define ELF_DATA	ELFDATA2MSB
-+
-+#define USE_ELF_CORE_DUMP
-+#ifndef CONFIG_SUN4
-+#define ELF_EXEC_PAGESIZE	4096
-+#else
-+#define ELF_EXEC_PAGESIZE	8192
-+#endif
-+
-+
-+/* This is the location that an ET_DYN program is loaded if exec'ed.  Typical
-+   use of this is to invoke "./ld.so someprog" to test out a new version of
-+   the loader.  We need to make sure that it is out of the way of the program
-+   that it will "exec", and that there is sufficient room for the brk.  */
-+
-+#define ELF_ET_DYN_BASE         (TASK_UNMAPPED_BASE)
-+
-+/* This yields a mask that user programs can use to figure out what
-+   instruction set this cpu supports.  This can NOT be done in userspace
-+   on Sparc.  */
-+
-+/* Sun4c has none of the capabilities, most sun4m's have them all.
-+ * XXX This is gross, set some global variable at boot time. -DaveM
-+ */
-+#define ELF_HWCAP	((ARCH_SUN4C_SUN4) ? 0 : \
-+			 (HWCAP_SPARC_FLUSH | HWCAP_SPARC_STBAR | \
-+			  HWCAP_SPARC_SWAP | \
-+			  ((srmmu_modtype != Cypress && \
-+			    srmmu_modtype != Cypress_vE && \
-+			    srmmu_modtype != Cypress_vD) ? \
-+			   HWCAP_SPARC_MULDIV : 0)))
-+
-+/* This yields a string that ld.so will use to load implementation
-+   specific libraries for optimization.  This is more specific in
-+   intent than poking at uname or /proc/cpuinfo. */
-+
-+#define ELF_PLATFORM	(NULL)
-+
-+
-+#endif /* !(__ASMSPARC_ELF_H) */
-diff -Naur silo-1.4.13.orig/include/emul_32/asm/posix_types.h silo-1.4.13/include/emul_32/asm/posix_types.h
---- silo-1.4.13.orig/include/emul_32/asm/posix_types.h	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/include/emul_32/asm/posix_types.h	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,122 @@
-+#ifndef __ARCH_SPARC_POSIX_TYPES_H
-+#define __ARCH_SPARC_POSIX_TYPES_H
-+
-+/*
-+ * This file is generally used by user-level software, so you need to
-+ * be a little careful about namespace pollution etc.  Also, we cannot
-+ * assume GCC is being used.
-+ */
-+
-+typedef unsigned int           __kernel_size_t;
-+typedef int                    __kernel_ssize_t;
-+typedef long int               __kernel_ptrdiff_t;
-+typedef long                   __kernel_time_t;
-+typedef long		       __kernel_suseconds_t;
-+typedef long                   __kernel_clock_t;
-+typedef int                    __kernel_pid_t;
-+typedef unsigned short         __kernel_ipc_pid_t;
-+typedef unsigned short         __kernel_uid_t;
-+typedef unsigned short         __kernel_gid_t;
-+typedef unsigned long          __kernel_ino_t;
-+typedef unsigned short         __kernel_mode_t;
-+typedef unsigned short         __kernel_umode_t;
-+typedef short                  __kernel_nlink_t;
-+typedef long                   __kernel_daddr_t;
-+typedef long                   __kernel_off_t;
-+typedef char *                 __kernel_caddr_t;
-+typedef unsigned short	       __kernel_uid16_t;
-+typedef unsigned short	       __kernel_gid16_t;
-+typedef unsigned int	       __kernel_uid32_t;
-+typedef unsigned int	       __kernel_gid32_t;
-+typedef unsigned short	       __kernel_old_uid_t;
-+typedef unsigned short	       __kernel_old_gid_t;
-+typedef unsigned short	       __kernel_old_dev_t;
-+typedef int                    __kernel_clockid_t;
-+typedef int                    __kernel_timer_t;
-+
-+#if (defined(__GNUC__) && !defined(__STRICT_ANSI__)) || (__STDC_VERSION__ >= 199901L)
-+typedef long long	__kernel_loff_t;
-+#endif
-+
-+typedef struct {
-+#if defined(__KERNEL__) || defined(__USE_ALL)
-+	int	val[2];
-+#else /* !defined(__KERNEL__) && !defined(__USE_ALL) */
-+	int     __val[2];
-+#endif /* !defined(__KERNEL__) && !defined(__USE_ALL) */
-+} __kernel_fsid_t;
-+
-+#if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2)
-+
-+#undef __FD_SET
-+static __inline__ void __FD_SET(unsigned long fd, __kernel_fd_set *fdsetp)
-+{
-+	unsigned long _tmp = fd / __NFDBITS;
-+	unsigned long _rem = fd % __NFDBITS;
-+	fdsetp->fds_bits[_tmp] |= (1UL<<_rem);
-+}
-+
-+#undef __FD_CLR
-+static __inline__ void __FD_CLR(unsigned long fd, __kernel_fd_set *fdsetp)
-+{
-+	unsigned long _tmp = fd / __NFDBITS;
-+	unsigned long _rem = fd % __NFDBITS;
-+	fdsetp->fds_bits[_tmp] &= ~(1UL<<_rem);
-+}
-+
-+#undef __FD_ISSET
-+static __inline__ int __FD_ISSET(unsigned long fd, __const__ __kernel_fd_set *p)
-+{ 
-+	unsigned long _tmp = fd / __NFDBITS;
-+	unsigned long _rem = fd % __NFDBITS;
-+	return (p->fds_bits[_tmp] & (1UL<<_rem)) != 0;
-+}
-+
-+/*
-+ * This will unroll the loop for the normal constant cases (8 or 32 longs,
-+ * for 256 and 1024-bit fd_sets respectively)
-+ */
-+#undef __FD_ZERO
-+static __inline__ void __FD_ZERO(__kernel_fd_set *p)
-+{
-+	unsigned long *tmp = p->fds_bits;
-+	int i;
-+
-+	if (__builtin_constant_p(__FDSET_LONGS)) {
-+		switch (__FDSET_LONGS) {
-+			case 32:
-+			  tmp[ 0] = 0; tmp[ 1] = 0; tmp[ 2] = 0; tmp[ 3] = 0;
-+			  tmp[ 4] = 0; tmp[ 5] = 0; tmp[ 6] = 0; tmp[ 7] = 0;
-+			  tmp[ 8] = 0; tmp[ 9] = 0; tmp[10] = 0; tmp[11] = 0;
-+			  tmp[12] = 0; tmp[13] = 0; tmp[14] = 0; tmp[15] = 0;
-+			  tmp[16] = 0; tmp[17] = 0; tmp[18] = 0; tmp[19] = 0;
-+			  tmp[20] = 0; tmp[21] = 0; tmp[22] = 0; tmp[23] = 0;
-+			  tmp[24] = 0; tmp[25] = 0; tmp[26] = 0; tmp[27] = 0;
-+			  tmp[28] = 0; tmp[29] = 0; tmp[30] = 0; tmp[31] = 0;
-+			  return;
-+			case 16:
-+			  tmp[ 0] = 0; tmp[ 1] = 0; tmp[ 2] = 0; tmp[ 3] = 0;
-+			  tmp[ 4] = 0; tmp[ 5] = 0; tmp[ 6] = 0; tmp[ 7] = 0;
-+			  tmp[ 8] = 0; tmp[ 9] = 0; tmp[10] = 0; tmp[11] = 0;
-+			  tmp[12] = 0; tmp[13] = 0; tmp[14] = 0; tmp[15] = 0;
-+			  return;
-+			case 8:
-+			  tmp[ 0] = 0; tmp[ 1] = 0; tmp[ 2] = 0; tmp[ 3] = 0;
-+			  tmp[ 4] = 0; tmp[ 5] = 0; tmp[ 6] = 0; tmp[ 7] = 0;
-+			  return;
-+			case 4:
-+			  tmp[ 0] = 0; tmp[ 1] = 0; tmp[ 2] = 0; tmp[ 3] = 0;
-+			  return;
-+		}
-+	}
-+	i = __FDSET_LONGS;
-+	while (i) {
-+		i--;
-+		*tmp = 0;
-+		tmp++;
-+	}
-+}
-+
-+#endif /* defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) */
-+
-+#endif /* !(__ARCH_SPARC_POSIX_TYPES_H) */
-diff -Naur silo-1.4.13.orig/include/emul_32/asm/types.h silo-1.4.13/include/emul_32/asm/types.h
---- silo-1.4.13.orig/include/emul_32/asm/types.h	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/include/emul_32/asm/types.h	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,41 @@
-+#ifndef _SPARC_TYPES_H
-+#define _SPARC_TYPES_H
-+
-+/*
-+ * _xx is ok: it doesn't pollute the POSIX namespace. Use these in the
-+ * header files exported to user space.
-+ */
-+
-+/*
-+ * This file is never included by application software unless
-+ * explicitly requested (e.g., via linux/types.h) in which case the
-+ * application is Linux specific so (user-) name space pollution is
-+ * not a major issue.  However, for interoperability, libraries still
-+ * need to be careful to avoid a name clashes.
-+ */
-+
-+#ifndef __ASSEMBLY__
-+
-+typedef unsigned short umode_t;
-+
-+typedef __signed__ char __s8;
-+typedef unsigned char __u8;
-+
-+typedef __signed__ short __s16;
-+typedef unsigned short __u16;
-+
-+typedef __signed__ int __s32;
-+typedef unsigned int __u32;
-+
-+#if (defined(__GNUC__) && !defined(__STRICT_ANSI__)) || (__STDC_VERSION__ >= 199901L)
-+typedef __signed__ long long __s64;
-+typedef unsigned long long __u64;
-+#endif
-+
-+#if (defined(__STRICT_ANSI__) && !defined(inline))
-+#define inline __inline__
-+#endif
-+
-+#endif /* __ASSEMBLY__ */
-+
-+#endif /* defined(_SPARC_TYPES_H) */
-diff -Naur silo-1.4.13.orig/include/ext2fs/ext2_err.h silo-1.4.13/include/ext2fs/ext2_err.h
---- silo-1.4.13.orig/include/ext2fs/ext2_err.h	2006-06-01 13:24:53.000000000 -0400
-+++ silo-1.4.13/include/ext2fs/ext2_err.h	2007-04-03 17:02:53.000000000 -0400
-@@ -3,6 +3,8 @@
-  * This file is automatically generated; please do not edit it.
-  */
- 
-+#include <et/com_err.h>
-+
- #define EXT2_ET_BASE                             (2133571328L)
- #define EXT2_ET_MAGIC_EXT2FS_FILSYS              (2133571329L)
- #define EXT2_ET_MAGIC_BADBLOCKS_LIST             (2133571330L)
-@@ -19,8 +21,8 @@
- #define EXT2_ET_MAGIC_ICOUNT                     (2133571341L)
- #define EXT2_ET_MAGIC_PQ_IO_CHANNEL              (2133571342L)
- #define EXT2_ET_MAGIC_EXT2_FILE                  (2133571343L)
--#define EXT2_ET_MAGIC_RESERVED_7                 (2133571344L)
--#define EXT2_ET_MAGIC_RESERVED_8                 (2133571345L)
-+#define EXT2_ET_MAGIC_E2IMAGE                    (2133571344L)
-+#define EXT2_ET_MAGIC_INODE_IO_CHANNEL           (2133571345L)
- #define EXT2_ET_MAGIC_RESERVED_9                 (2133571346L)
- #define EXT2_ET_BAD_MAGIC                        (2133571347L)
- #define EXT2_ET_REV_TOO_HIGH                     (2133571348L)
-@@ -86,7 +88,25 @@
- #define EXT2_ET_UNIMPLEMENTED                    (2133571408L)
- #define EXT2_ET_CANCEL_REQUESTED                 (2133571409L)
- #define EXT2_ET_FILE_TOO_BIG                     (2133571410L)
-+#define EXT2_ET_JOURNAL_NOT_BLOCK                (2133571411L)
-+#define EXT2_ET_NO_JOURNAL_SB                    (2133571412L)
-+#define EXT2_ET_JOURNAL_TOO_SMALL                (2133571413L)
-+#define EXT2_ET_JOURNAL_UNSUPP_VERSION           (2133571414L)
-+#define EXT2_ET_LOAD_EXT_JOURNAL                 (2133571415L)
-+#define EXT2_ET_NO_JOURNAL                       (2133571416L)
-+#define EXT2_ET_DIRHASH_UNSUPP                   (2133571417L)
-+#define EXT2_ET_BAD_EA_BLOCK_NUM                 (2133571418L)
-+#define EXT2_ET_TOO_MANY_INODES                  (2133571419L)
-+#define EXT2_ET_NOT_IMAGE_FILE                   (2133571420L)
-+#define EXT2_ET_RES_GDT_BLOCKS                   (2133571421L)
-+#define EXT2_ET_RESIZE_INODE_CORRUPT             (2133571422L)
-+#define EXT2_ET_SET_BMAP_NO_IND                  (2133571423L)
-+extern const struct error_table et_ext2_error_table;
- extern void initialize_ext2_error_table(void);
-+
-+/* For compatibility with Heimdal */
-+extern void initialize_ext2_error_table_r(struct et_list **list);
-+
- #define ERROR_TABLE_BASE_ext2 (2133571328L)
- 
- /* for compatibility with older versions... */
-diff -Naur silo-1.4.13.orig/include/ext2fs/ext2_io.h silo-1.4.13/include/ext2fs/ext2_io.h
---- silo-1.4.13.orig/include/ext2fs/ext2_io.h	2006-06-01 13:24:53.000000000 -0400
-+++ silo-1.4.13/include/ext2fs/ext2_io.h	2007-04-03 17:02:53.000000000 -0400
-@@ -27,6 +27,8 @@
- typedef struct struct_io_manager *io_manager;
- typedef struct struct_io_channel *io_channel;
- 
-+#define CHANNEL_FLAGS_WRITETHROUGH	0x01
-+
- struct struct_io_channel {
- 	errcode_t	magic;
- 	io_manager	manager;
-@@ -47,7 +49,8 @@
- 				       int actual_bytes_written,
- 				       errcode_t error);
- 	int		refcount;
--	int		reserved[15];
-+	int		flags;
-+	int		reserved[14];
- 	void		*private_data;
- 	void		*app_data;
- };
-@@ -63,7 +66,11 @@
- 	errcode_t (*write_blk)(io_channel channel, unsigned long block,
- 			       int count, const void *data);
- 	errcode_t (*flush)(io_channel channel);
--	int		reserved[16];
-+	errcode_t (*write_byte)(io_channel channel, unsigned long offset,
-+				int count, const void *data);
-+	errcode_t (*set_option)(io_channel channel, const char *option, 
-+				const char *arg);
-+	int		reserved[14];
- };
- 
- #define IO_FLAG_RW	1
-@@ -78,6 +85,13 @@
- #define io_channel_flush(c) 		((c)->manager->flush((c)))
- #define io_channel_bumpcount(c)		((c)->refcount++)
- 	
-+/* io_manager.c */
-+extern errcode_t io_channel_set_options(io_channel channel, 
-+					const char *options);
-+extern errcode_t io_channel_write_byte(io_channel channel, 
-+				       unsigned long offset,
-+				       int count, const void *data);
-+
- /* unix_io.c */
- extern io_manager unix_io_manager;
- 
-diff -Naur silo-1.4.13.orig/libext2fs/alloc.c silo-1.4.13/libext2fs/alloc.c
---- silo-1.4.13.orig/libext2fs/alloc.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/alloc.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,173 @@
-+/*
-+ * alloc.c --- allocate new inodes, blocks for ext2fs
-+ *
-+ * Copyright (C) 1993, 1994, 1995, 1996 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ * 
-+ */
-+
-+#include <stdio.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <time.h>
-+#include <string.h>
-+#if HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+/*
-+ * Right now, just search forward from the parent directory's block
-+ * group to find the next free inode.
-+ *
-+ * Should have a special policy for directories.
-+ */
-+errcode_t ext2fs_new_inode(ext2_filsys fs, ext2_ino_t dir, 
-+			   int mode EXT2FS_ATTR((unused)),
-+			   ext2fs_inode_bitmap map, ext2_ino_t *ret)
-+{
-+	ext2_ino_t	dir_group = 0;
-+	ext2_ino_t	i;
-+	ext2_ino_t	start_inode;
-+
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+	
-+	if (!map)
-+		map = fs->inode_map;
-+	if (!map)
-+		return EXT2_ET_NO_INODE_BITMAP;
-+	
-+	if (dir > 0) 
-+		dir_group = (dir - 1) / EXT2_INODES_PER_GROUP(fs->super);
-+
-+	start_inode = (dir_group * EXT2_INODES_PER_GROUP(fs->super)) + 1;
-+	if (start_inode < EXT2_FIRST_INODE(fs->super))
-+		start_inode = EXT2_FIRST_INODE(fs->super);
-+	i = start_inode;
-+
-+	do {
-+		if (!ext2fs_fast_test_inode_bitmap(map, i))
-+			break;
-+		i++;
-+		if (i > fs->super->s_inodes_count)
-+			i = EXT2_FIRST_INODE(fs->super);
-+	} while (i != start_inode);
-+	
-+	if (ext2fs_test_inode_bitmap(map, i))
-+		return EXT2_ET_INODE_ALLOC_FAIL;
-+	*ret = i;
-+	return 0;
-+}
-+
-+/*
-+ * Stupid algorithm --- we now just search forward starting from the
-+ * goal.  Should put in a smarter one someday....
-+ */
-+errcode_t ext2fs_new_block(ext2_filsys fs, blk_t goal,
-+			   ext2fs_block_bitmap map, blk_t *ret)
-+{
-+	blk_t	i;
-+
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	if (!map)
-+		map = fs->block_map;
-+	if (!map)
-+		return EXT2_ET_NO_BLOCK_BITMAP;
-+	if (!goal || (goal >= fs->super->s_blocks_count))
-+		goal = fs->super->s_first_data_block;
-+	i = goal;
-+	do {
-+		if (!ext2fs_fast_test_block_bitmap(map, i)) {
-+			*ret = i;
-+			return 0;
-+		}
-+		i++;
-+		if (i >= fs->super->s_blocks_count)
-+			i = fs->super->s_first_data_block;
-+	} while (i != goal);
-+	return EXT2_ET_BLOCK_ALLOC_FAIL;
-+}
-+
-+/*
-+ * This function zeros out the allocated block, and updates all of the
-+ * appropriate filesystem records.
-+ */
-+errcode_t ext2fs_alloc_block(ext2_filsys fs, blk_t goal,
-+			     char *block_buf, blk_t *ret)
-+{
-+	errcode_t	retval;
-+	blk_t		block;
-+	char		*buf = 0;
-+
-+	if (!block_buf) {
-+		retval = ext2fs_get_mem(fs->blocksize, &buf);
-+		if (retval)
-+			return retval;
-+		block_buf = buf;
-+	}
-+	memset(block_buf, 0, fs->blocksize);
-+
-+	if (!fs->block_map) {
-+		retval = ext2fs_read_block_bitmap(fs);
-+		if (retval)
-+			goto fail;
-+	}
-+
-+	retval = ext2fs_new_block(fs, goal, 0, &block);
-+	if (retval)
-+		goto fail;
-+
-+	retval = io_channel_write_blk(fs->io, block, 1, block_buf);
-+	if (retval)
-+		goto fail;
-+	
-+	ext2fs_block_alloc_stats(fs, block, +1);
-+	*ret = block;
-+	return 0;
-+
-+fail:
-+	if (buf)
-+		ext2fs_free_mem(&buf);
-+	return retval;
-+}
-+
-+errcode_t ext2fs_get_free_blocks(ext2_filsys fs, blk_t start, blk_t finish,
-+				 int num, ext2fs_block_bitmap map, blk_t *ret)
-+{
-+	blk_t	b = start;
-+
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	if (!map)
-+		map = fs->block_map;
-+	if (!map)
-+		return EXT2_ET_NO_BLOCK_BITMAP;
-+	if (!b)
-+		b = fs->super->s_first_data_block;
-+	if (!finish)
-+		finish = start;
-+	if (!num)
-+		num = 1;
-+	do {
-+		if (b+num-1 > fs->super->s_blocks_count)
-+			b = fs->super->s_first_data_block;
-+		if (ext2fs_fast_test_block_bitmap_range(map, b, num)) {
-+			*ret = b;
-+			return 0;
-+		}
-+		b++;
-+	} while (b != finish);
-+	return EXT2_ET_BLOCK_ALLOC_FAIL;
-+}
-+
-diff -Naur silo-1.4.13.orig/libext2fs/alloc_sb.c silo-1.4.13/libext2fs/alloc_sb.c
---- silo-1.4.13.orig/libext2fs/alloc_sb.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/alloc_sb.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,57 @@
-+/*
-+ * alloc_sb.c --- Allocate the superblock and block group descriptors for a 
-+ * newly initialized filesystem.  Used by mke2fs when initializing a filesystem
-+ *
-+ * Copyright (C) 1994, 1995, 1996, 2003 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <fcntl.h>
-+#include <time.h>
-+#if HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+int ext2fs_reserve_super_and_bgd(ext2_filsys fs, 
-+				 dgrp_t group,
-+				 ext2fs_block_bitmap bmap)
-+{
-+	blk_t	super_blk, old_desc_blk, new_desc_blk;
-+	int	j, old_desc_blocks, num_blocks;
-+
-+	num_blocks = ext2fs_super_and_bgd_loc(fs, group, &super_blk, 
-+					      &old_desc_blk, &new_desc_blk, 0);
-+
-+	if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG)
-+		old_desc_blocks = fs->super->s_first_meta_bg;
-+	else
-+		old_desc_blocks = 
-+			fs->desc_blocks + fs->super->s_reserved_gdt_blocks;
-+
-+	if (super_blk || (group == 0))
-+		ext2fs_mark_block_bitmap(bmap, super_blk);
-+
-+	if (old_desc_blk) {
-+		for (j=0; j < old_desc_blocks; j++)
-+			ext2fs_mark_block_bitmap(bmap, old_desc_blk + j);
-+	}
-+	if (new_desc_blk)
-+		ext2fs_mark_block_bitmap(bmap, new_desc_blk);
-+
-+	return num_blocks;
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/alloc_stats.c silo-1.4.13/libext2fs/alloc_stats.c
---- silo-1.4.13.orig/libext2fs/alloc_stats.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/alloc_stats.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,52 @@
-+/*
-+ * alloc_stats.c --- Update allocation statistics for ext2fs
-+ *
-+ * Copyright (C) 2001 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ * 
-+ */
-+
-+#include <stdio.h>
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+void ext2fs_inode_alloc_stats2(ext2_filsys fs, ext2_ino_t ino,
-+			       int inuse, int isdir)
-+{
-+	int	group = ext2fs_group_of_ino(fs, ino);
-+
-+	if (inuse > 0)
-+		ext2fs_mark_inode_bitmap(fs->inode_map, ino);
-+	else
-+		ext2fs_unmark_inode_bitmap(fs->inode_map, ino);
-+	fs->group_desc[group].bg_free_inodes_count -= inuse;
-+	if (isdir)
-+		fs->group_desc[group].bg_used_dirs_count += inuse;
-+	fs->super->s_free_inodes_count -= inuse;
-+	ext2fs_mark_super_dirty(fs);
-+	ext2fs_mark_ib_dirty(fs);
-+}
-+
-+void ext2fs_inode_alloc_stats(ext2_filsys fs, ext2_ino_t ino, int inuse)
-+{
-+	ext2fs_inode_alloc_stats2(fs, ino, inuse, 0);
-+}
-+
-+void ext2fs_block_alloc_stats(ext2_filsys fs, blk_t blk, int inuse)
-+{
-+	int	group = ext2fs_group_of_blk(fs, blk);
-+
-+	if (inuse > 0)
-+		ext2fs_mark_block_bitmap(fs->block_map, blk);
-+	else
-+		ext2fs_unmark_block_bitmap(fs->block_map, blk);
-+	fs->group_desc[group].bg_free_blocks_count -= inuse;
-+	fs->super->s_free_blocks_count -= inuse;
-+	ext2fs_mark_super_dirty(fs);
-+	ext2fs_mark_bb_dirty(fs);
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/alloc_tables.c silo-1.4.13/libext2fs/alloc_tables.c
---- silo-1.4.13.orig/libext2fs/alloc_tables.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/alloc_tables.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,117 @@
-+/*
-+ * alloc_tables.c --- Allocate tables for a newly initialized
-+ * filesystem.  Used by mke2fs when initializing a filesystem
-+ *
-+ * Copyright (C) 1996 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <fcntl.h>
-+#include <time.h>
-+#if HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+errcode_t ext2fs_allocate_group_table(ext2_filsys fs, dgrp_t group,
-+				      ext2fs_block_bitmap bmap)
-+{
-+	errcode_t	retval;
-+	blk_t		group_blk, start_blk, last_blk, new_blk, blk;
-+	int		j;
-+
-+	group_blk = fs->super->s_first_data_block +
-+		(group * fs->super->s_blocks_per_group);
-+	
-+	last_blk = group_blk + fs->super->s_blocks_per_group;
-+	if (last_blk >= fs->super->s_blocks_count)
-+		last_blk = fs->super->s_blocks_count - 1;
-+
-+	if (!bmap)
-+		bmap = fs->block_map;
-+	
-+	/*
-+	 * Allocate the block and inode bitmaps, if necessary
-+	 */
-+	if (fs->stride) {
-+		start_blk = group_blk + fs->inode_blocks_per_group;
-+		start_blk += ((fs->stride * group) %
-+			      (last_blk - start_blk));
-+		if (start_blk > last_blk)
-+			start_blk = group_blk;
-+	} else
-+		start_blk = group_blk;
-+
-+	if (!fs->group_desc[group].bg_block_bitmap) {
-+		retval = ext2fs_get_free_blocks(fs, start_blk, last_blk,
-+						1, bmap, &new_blk);
-+		if (retval == EXT2_ET_BLOCK_ALLOC_FAIL) 
-+			retval = ext2fs_get_free_blocks(fs, group_blk,
-+					last_blk, 1, bmap, &new_blk);
-+		if (retval)
-+			return retval;
-+		ext2fs_mark_block_bitmap(bmap, new_blk);
-+		fs->group_desc[group].bg_block_bitmap = new_blk;
-+	}
-+
-+	if (!fs->group_desc[group].bg_inode_bitmap) {
-+		retval = ext2fs_get_free_blocks(fs, start_blk, last_blk,
-+						1, bmap, &new_blk);
-+		if (retval == EXT2_ET_BLOCK_ALLOC_FAIL) 
-+			retval = ext2fs_get_free_blocks(fs, group_blk,
-+					last_blk, 1, bmap, &new_blk);
-+		if (retval)
-+			return retval;
-+		ext2fs_mark_block_bitmap(bmap, new_blk);
-+		fs->group_desc[group].bg_inode_bitmap = new_blk;
-+	}
-+
-+	/*
-+	 * Allocate the inode table
-+	 */
-+	if (!fs->group_desc[group].bg_inode_table) {
-+		retval = ext2fs_get_free_blocks(fs, group_blk, last_blk,
-+						fs->inode_blocks_per_group,
-+						bmap, &new_blk);
-+		if (retval)
-+			return retval;
-+		for (j=0, blk = new_blk;
-+		     j < fs->inode_blocks_per_group;
-+		     j++, blk++)
-+			ext2fs_mark_block_bitmap(bmap, blk);
-+		fs->group_desc[group].bg_inode_table = new_blk;
-+	}
-+
-+	
-+	return 0;
-+}
-+
-+	
-+
-+errcode_t ext2fs_allocate_tables(ext2_filsys fs)
-+{
-+	errcode_t	retval;
-+	dgrp_t		i;
-+
-+	for (i = 0; i < fs->group_desc_count; i++) {
-+		retval = ext2fs_allocate_group_table(fs, i, fs->block_map);
-+		if (retval)
-+			return retval;
-+	}
-+	return 0;
-+}
-+
-diff -Naur silo-1.4.13.orig/libext2fs/badblocks.c silo-1.4.13/libext2fs/badblocks.c
---- silo-1.4.13.orig/libext2fs/badblocks.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/badblocks.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,327 @@
-+/*
-+ * badblocks.c --- routines to manipulate the bad block structure
-+ * 
-+ * Copyright (C) 1994, 1995, 1996 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <fcntl.h>
-+#include <time.h>
-+#if HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fsP.h"
-+
-+/*
-+ * Helper function for making a badblocks list
-+ */
-+static errcode_t make_u32_list(int size, int num, __u32 *list,
-+			       ext2_u32_list *ret)
-+{
-+	ext2_u32_list	bb;
-+	errcode_t	retval;
-+	
-+	retval = ext2fs_get_mem(sizeof(struct ext2_struct_u32_list), &bb);
-+	if (retval)
-+		return retval;
-+	memset(bb, 0, sizeof(struct ext2_struct_u32_list));
-+	bb->magic = EXT2_ET_MAGIC_BADBLOCKS_LIST;
-+	bb->size = size ? size : 10;
-+	bb->num = num;
-+	retval = ext2fs_get_mem(bb->size * sizeof(blk_t), &bb->list);
-+	if (!bb->list) {
-+		ext2fs_free_mem(&bb);
-+		return retval;
-+	}
-+	if (list)
-+		memcpy(bb->list, list, bb->size * sizeof(blk_t));
-+	else
-+		memset(bb->list, 0, bb->size * sizeof(blk_t));
-+	*ret = bb;
-+	return 0;
-+}
-+	
-+
-+/*
-+ * This procedure creates an empty u32 list.
-+ */
-+errcode_t ext2fs_u32_list_create(ext2_u32_list *ret, int size)
-+{
-+	return make_u32_list(size, 0, 0, ret);
-+}
-+
-+/*
-+ * This procedure creates an empty badblocks list.
-+ */
-+errcode_t ext2fs_badblocks_list_create(ext2_badblocks_list *ret, int size)
-+{
-+	return make_u32_list(size, 0, 0, (ext2_badblocks_list *) ret);
-+}
-+
-+
-+/*
-+ * This procedure copies a badblocks list
-+ */
-+errcode_t ext2fs_u32_copy(ext2_u32_list src, ext2_u32_list *dest)
-+{
-+	errcode_t	retval;
-+	
-+	retval = make_u32_list(src->size, src->num, src->list, dest);
-+	if (retval)
-+		return retval;
-+	(*dest)->badblocks_flags = src->badblocks_flags;
-+	return 0;
-+}
-+
-+errcode_t ext2fs_badblocks_copy(ext2_badblocks_list src,
-+				ext2_badblocks_list *dest)
-+{
-+	return ext2fs_u32_copy((ext2_u32_list) src,
-+			       (ext2_u32_list *) dest);
-+}
-+
-+/*
-+ * This procedure frees a badblocks list.
-+ *
-+ * (note: moved to closefs.c)
-+ */
-+
-+
-+/*
-+ * This procedure adds a block to a badblocks list.
-+ */
-+errcode_t ext2fs_u32_list_add(ext2_u32_list bb, __u32 blk)
-+{
-+	errcode_t	retval;
-+	int		i, j;
-+	unsigned long	old_size;
-+
-+	EXT2_CHECK_MAGIC(bb, EXT2_ET_MAGIC_BADBLOCKS_LIST);
-+
-+	if (bb->num >= bb->size) {
-+		old_size = bb->size * sizeof(__u32);
-+		bb->size += 100;
-+		retval = ext2fs_resize_mem(old_size, bb->size * sizeof(__u32),
-+					   &bb->list);
-+		if (retval) {
-+			bb->size -= 100;
-+			return retval;
-+		}
-+	}
-+
-+	/*
-+	 * Add special case code for appending to the end of the list
-+	 */
-+	i = bb->num-1;
-+	if ((bb->num != 0) && (bb->list[i] == blk))
-+		return 0;
-+	if ((bb->num == 0) || (bb->list[i] < blk)) {
-+		bb->list[bb->num++] = blk;
-+		return 0;
-+	}
-+
-+	j = bb->num;
-+	for (i=0; i < bb->num; i++) {
-+		if (bb->list[i] == blk)
-+			return 0;
-+		if (bb->list[i] > blk) {
-+			j = i;
-+			break;
-+		}
-+	}
-+	for (i=bb->num; i > j; i--)
-+		bb->list[i] = bb->list[i-1];
-+	bb->list[j] = blk;
-+	bb->num++;
-+	return 0;
-+}
-+
-+errcode_t ext2fs_badblocks_list_add(ext2_badblocks_list bb, blk_t blk)
-+{
-+	return ext2fs_u32_list_add((ext2_u32_list) bb, (__u32) blk);
-+}
-+
-+/*
-+ * This procedure finds a particular block is on a badblocks
-+ * list.
-+ */
-+int ext2fs_u32_list_find(ext2_u32_list bb, __u32 blk)
-+{
-+	int	low, high, mid;
-+
-+	if (bb->magic != EXT2_ET_MAGIC_BADBLOCKS_LIST)
-+		return -1;
-+
-+	if (bb->num == 0)
-+		return -1;
-+
-+	low = 0;
-+	high = bb->num-1;
-+	if (blk == bb->list[low])
-+		return low;
-+	if (blk == bb->list[high])
-+		return high;
-+
-+	while (low < high) {
-+		mid = (low+high)/2;
-+		if (mid == low || mid == high)
-+			break;
-+		if (blk == bb->list[mid])
-+			return mid;
-+		if (blk < bb->list[mid])
-+			high = mid;
-+		else
-+			low = mid;
-+	}
-+	return -1;
-+}
-+
-+/*
-+ * This procedure tests to see if a particular block is on a badblocks
-+ * list.
-+ */
-+int ext2fs_u32_list_test(ext2_u32_list bb, __u32 blk)
-+{
-+	if (ext2fs_u32_list_find(bb, blk) < 0)
-+		return 0;
-+	else
-+		return 1;
-+}
-+
-+int ext2fs_badblocks_list_test(ext2_badblocks_list bb, blk_t blk)
-+{
-+	return ext2fs_u32_list_test((ext2_u32_list) bb, (__u32) blk);
-+}
-+
-+
-+/*
-+ * Remove a block from the badblock list
-+ */
-+int ext2fs_u32_list_del(ext2_u32_list bb, __u32 blk)
-+{
-+	int	remloc, i;
-+
-+	if (bb->num == 0)
-+		return -1;
-+
-+	remloc = ext2fs_u32_list_find(bb, blk);
-+	if (remloc < 0)
-+		return -1;
-+
-+	for (i = remloc ; i < bb->num-1; i++)
-+		bb->list[i] = bb->list[i+1];
-+	bb->num--;
-+	return 0;
-+}
-+
-+void ext2fs_badblocks_list_del(ext2_u32_list bb, __u32 blk)
-+{
-+	ext2fs_u32_list_del(bb, blk);
-+}
-+
-+errcode_t ext2fs_u32_list_iterate_begin(ext2_u32_list bb,
-+					ext2_u32_iterate *ret)
-+{
-+	ext2_u32_iterate iter;
-+	errcode_t		retval;
-+
-+	EXT2_CHECK_MAGIC(bb, EXT2_ET_MAGIC_BADBLOCKS_LIST);
-+
-+	retval = ext2fs_get_mem(sizeof(struct ext2_struct_u32_iterate), &iter);
-+	if (retval)
-+		return retval;
-+
-+	iter->magic = EXT2_ET_MAGIC_BADBLOCKS_ITERATE;
-+	iter->bb = bb;
-+	iter->ptr = 0;
-+	*ret = iter;
-+	return 0;
-+}
-+
-+errcode_t ext2fs_badblocks_list_iterate_begin(ext2_badblocks_list bb,
-+					      ext2_badblocks_iterate *ret)
-+{
-+	return ext2fs_u32_list_iterate_begin((ext2_u32_list) bb,
-+					      (ext2_u32_iterate *) ret);
-+}
-+
-+
-+int ext2fs_u32_list_iterate(ext2_u32_iterate iter, __u32 *blk)
-+{
-+	ext2_u32_list	bb;
-+
-+	if (iter->magic != EXT2_ET_MAGIC_BADBLOCKS_ITERATE)
-+		return 0;
-+
-+	bb = iter->bb;
-+
-+	if (bb->magic != EXT2_ET_MAGIC_BADBLOCKS_LIST)
-+		return 0;
-+	
-+	if (iter->ptr < bb->num) {
-+		*blk = bb->list[iter->ptr++];
-+		return 1;
-+	} 
-+	*blk = 0;
-+	return 0;
-+}
-+
-+int ext2fs_badblocks_list_iterate(ext2_badblocks_iterate iter, blk_t *blk)
-+{
-+	return ext2fs_u32_list_iterate((ext2_u32_iterate) iter,
-+				       (__u32 *) blk);
-+}
-+
-+
-+void ext2fs_u32_list_iterate_end(ext2_u32_iterate iter)
-+{
-+	if (!iter || (iter->magic != EXT2_ET_MAGIC_BADBLOCKS_ITERATE))
-+		return;
-+
-+	iter->bb = 0;
-+	ext2fs_free_mem(&iter);
-+}
-+
-+void ext2fs_badblocks_list_iterate_end(ext2_badblocks_iterate iter)
-+{
-+	ext2fs_u32_list_iterate_end((ext2_u32_iterate) iter);
-+}
-+
-+
-+int ext2fs_u32_list_equal(ext2_u32_list bb1, ext2_u32_list bb2)
-+{
-+	EXT2_CHECK_MAGIC(bb1, EXT2_ET_MAGIC_BADBLOCKS_LIST);
-+	EXT2_CHECK_MAGIC(bb2, EXT2_ET_MAGIC_BADBLOCKS_LIST);
-+
-+	if (bb1->num != bb2->num)
-+		return 0;
-+
-+	if (memcmp(bb1->list, bb2->list, bb1->num * sizeof(blk_t)) != 0)
-+		return 0;
-+	return 1;
-+}
-+
-+int ext2fs_badblocks_equal(ext2_badblocks_list bb1, ext2_badblocks_list bb2)
-+{
-+	return ext2fs_u32_list_equal((ext2_u32_list) bb1,
-+				     (ext2_u32_list) bb2);
-+}
-+
-+int ext2fs_u32_list_count(ext2_u32_list bb)
-+{
-+	return bb->num;
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/bb_compat.c silo-1.4.13/libext2fs/bb_compat.c
---- silo-1.4.13.orig/libext2fs/bb_compat.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/bb_compat.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,63 @@
-+/*
-+ * bb_compat.c --- compatibility badblocks routines
-+ * 
-+ * Copyright (C) 1997 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <fcntl.h>
-+#include <time.h>
-+#if HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fsP.h"
-+
-+errcode_t badblocks_list_create(badblocks_list *ret, int size)
-+{
-+	return ext2fs_badblocks_list_create(ret, size);
-+}
-+
-+void badblocks_list_free(badblocks_list bb)
-+{
-+	ext2fs_badblocks_list_free(bb);
-+}
-+
-+errcode_t badblocks_list_add(badblocks_list bb, blk_t blk)
-+{
-+	return ext2fs_badblocks_list_add(bb, blk);
-+}
-+
-+int badblocks_list_test(badblocks_list bb, blk_t blk)
-+{
-+	return ext2fs_badblocks_list_test(bb, blk);
-+}
-+
-+errcode_t badblocks_list_iterate_begin(badblocks_list bb,
-+				       badblocks_iterate *ret)
-+{
-+	return ext2fs_badblocks_list_iterate_begin(bb, ret);
-+}
-+
-+int badblocks_list_iterate(badblocks_iterate iter, blk_t *blk)
-+{
-+	return ext2fs_badblocks_list_iterate(iter, blk);
-+}
-+
-+void badblocks_list_iterate_end(badblocks_iterate iter)
-+{
-+	ext2fs_badblocks_list_iterate_end(iter);
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/bb_inode.c silo-1.4.13/libext2fs/bb_inode.c
---- silo-1.4.13.orig/libext2fs/bb_inode.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/bb_inode.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,267 @@
-+/*
-+ * bb_inode.c --- routines to update the bad block inode.
-+ * 
-+ * WARNING: This routine modifies a lot of state in the filesystem; if
-+ * this routine returns an error, the bad block inode may be in an
-+ * inconsistent state.
-+ * 
-+ * Copyright (C) 1994, 1995 Theodore Ts'o.
-+ * 
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <fcntl.h>
-+#include <time.h>
-+#if HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+struct set_badblock_record {
-+	ext2_badblocks_iterate	bb_iter;
-+	int		bad_block_count;
-+	blk_t		*ind_blocks;
-+	int		max_ind_blocks;
-+	int		ind_blocks_size;
-+	int		ind_blocks_ptr;
-+	char		*block_buf;
-+	errcode_t	err;
-+};
-+
-+static int set_bad_block_proc(ext2_filsys fs, blk_t *block_nr,
-+			      e2_blkcnt_t blockcnt,
-+			      blk_t ref_block, int ref_offset,
-+			      void *priv_data);
-+static int clear_bad_block_proc(ext2_filsys fs, blk_t *block_nr,
-+				e2_blkcnt_t blockcnt,
-+				blk_t ref_block, int ref_offset,
-+				void *priv_data);
-+	
-+/*
-+ * Given a bad blocks bitmap, update the bad blocks inode to reflect
-+ * the map.
-+ */
-+errcode_t ext2fs_update_bb_inode(ext2_filsys fs, ext2_badblocks_list bb_list)
-+{
-+	errcode_t			retval;
-+	struct set_badblock_record 	rec;
-+	struct ext2_inode		inode;
-+	
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	if (!fs->block_map)
-+		return EXT2_ET_NO_BLOCK_BITMAP;
-+	
-+	rec.bad_block_count = 0;
-+	rec.ind_blocks_size = rec.ind_blocks_ptr = 0;
-+	rec.max_ind_blocks = 10;
-+	retval = ext2fs_get_mem(rec.max_ind_blocks * sizeof(blk_t),
-+				&rec.ind_blocks);
-+	if (retval)
-+		return retval;
-+	memset(rec.ind_blocks, 0, rec.max_ind_blocks * sizeof(blk_t));
-+	retval = ext2fs_get_mem(fs->blocksize, &rec.block_buf);
-+	if (retval)
-+		goto cleanup;
-+	memset(rec.block_buf, 0, fs->blocksize);
-+	rec.err = 0;
-+	
-+	/*
-+	 * First clear the old bad blocks (while saving the indirect blocks) 
-+	 */
-+	retval = ext2fs_block_iterate2(fs, EXT2_BAD_INO,
-+				       BLOCK_FLAG_DEPTH_TRAVERSE, 0,
-+				       clear_bad_block_proc, &rec);
-+	if (retval)
-+		goto cleanup;
-+	if (rec.err) {
-+		retval = rec.err;
-+		goto cleanup;
-+	}
-+	
-+	/*
-+	 * Now set the bad blocks!
-+	 *
-+	 * First, mark the bad blocks as used.  This prevents a bad
-+	 * block from being used as an indirecto block for the bad
-+	 * block inode (!).
-+	 */
-+	if (bb_list) {
-+		retval = ext2fs_badblocks_list_iterate_begin(bb_list,
-+							     &rec.bb_iter);
-+		if (retval)
-+			goto cleanup;
-+		retval = ext2fs_block_iterate2(fs, EXT2_BAD_INO,
-+					       BLOCK_FLAG_APPEND, 0,
-+					       set_bad_block_proc, &rec);
-+		ext2fs_badblocks_list_iterate_end(rec.bb_iter);
-+		if (retval) 
-+			goto cleanup;
-+		if (rec.err) {
-+			retval = rec.err;
-+			goto cleanup;
-+		}
-+	}
-+	
-+	/*
-+	 * Update the bad block inode's mod time and block count
-+	 * field.  
-+	 */
-+	retval = ext2fs_read_inode(fs, EXT2_BAD_INO, &inode);
-+	if (retval)
-+		goto cleanup;
-+	
-+	inode.i_atime = inode.i_mtime = time(0);
-+	if (!inode.i_ctime)
-+		inode.i_ctime = time(0);
-+	inode.i_blocks = rec.bad_block_count * (fs->blocksize / 512);
-+	inode.i_size = rec.bad_block_count * fs->blocksize;
-+
-+	retval = ext2fs_write_inode(fs, EXT2_BAD_INO, &inode);
-+	if (retval)
-+		goto cleanup;
-+	
-+cleanup:
-+	ext2fs_free_mem(&rec.ind_blocks);
-+	ext2fs_free_mem(&rec.block_buf);
-+	return retval;
-+}
-+
-+/*
-+ * Helper function for update_bb_inode()
-+ *
-+ * Clear the bad blocks in the bad block inode, while saving the
-+ * indirect blocks.
-+ */
-+#ifdef __TURBOC__
-+ #pragma argsused
-+#endif
-+static int clear_bad_block_proc(ext2_filsys fs, blk_t *block_nr,
-+				e2_blkcnt_t blockcnt,
-+				blk_t ref_block EXT2FS_ATTR((unused)),
-+				int ref_offset EXT2FS_ATTR((unused)),
-+				void *priv_data)
-+{
-+	struct set_badblock_record *rec = (struct set_badblock_record *)
-+		priv_data;
-+	errcode_t	retval;
-+	unsigned long 	old_size;
-+
-+	if (!*block_nr)
-+		return 0;
-+
-+	/*
-+	 * If the block number is outrageous, clear it and ignore it.
-+	 */
-+	if (*block_nr >= fs->super->s_blocks_count ||
-+	    *block_nr < fs->super->s_first_data_block) {
-+		*block_nr = 0;
-+		return BLOCK_CHANGED;
-+	}
-+
-+	if (blockcnt < 0) {
-+		if (rec->ind_blocks_size >= rec->max_ind_blocks) {
-+			old_size = rec->max_ind_blocks * sizeof(blk_t);
-+			rec->max_ind_blocks += 10;
-+			retval = ext2fs_resize_mem(old_size, 
-+				   rec->max_ind_blocks * sizeof(blk_t),
-+				   &rec->ind_blocks);
-+			if (retval) {
-+				rec->max_ind_blocks -= 10;
-+				rec->err = retval;
-+				return BLOCK_ABORT;
-+			}
-+		}
-+		rec->ind_blocks[rec->ind_blocks_size++] = *block_nr;
-+	}
-+
-+	/*
-+	 * Mark the block as unused, and update accounting information
-+	 */
-+	ext2fs_block_alloc_stats(fs, *block_nr, -1);
-+	
-+	*block_nr = 0;
-+	return BLOCK_CHANGED;
-+}
-+
-+	
-+/*
-+ * Helper function for update_bb_inode()
-+ *
-+ * Set the block list in the bad block inode, using the supplied bitmap.
-+ */
-+#ifdef __TURBOC__
-+ #pragma argsused
-+#endif
-+static int set_bad_block_proc(ext2_filsys fs, blk_t *block_nr,
-+			      e2_blkcnt_t blockcnt,
-+			      blk_t ref_block EXT2FS_ATTR((unused)),
-+			      int ref_offset EXT2FS_ATTR((unused)),
-+			      void *priv_data)
-+{
-+	struct set_badblock_record *rec = (struct set_badblock_record *)
-+		priv_data;
-+	errcode_t	retval;
-+	blk_t		blk;
-+
-+	if (blockcnt >= 0) {
-+		/*
-+		 * Get the next bad block.
-+		 */
-+		if (!ext2fs_badblocks_list_iterate(rec->bb_iter, &blk))
-+			return BLOCK_ABORT;
-+		rec->bad_block_count++;
-+	} else {
-+		/*
-+		 * An indirect block; fetch a block from the
-+		 * previously used indirect block list.  The block
-+		 * most be not marked as used; if so, get another one.
-+		 * If we run out of reserved indirect blocks, allocate
-+		 * a new one.
-+		 */
-+	retry:
-+		if (rec->ind_blocks_ptr < rec->ind_blocks_size) {
-+			blk = rec->ind_blocks[rec->ind_blocks_ptr++];
-+			if (ext2fs_test_block_bitmap(fs->block_map, blk))
-+				goto retry;
-+		} else {
-+			retval = ext2fs_new_block(fs, 0, 0, &blk);
-+			if (retval) {
-+				rec->err = retval;
-+				return BLOCK_ABORT;
-+			}
-+		}
-+		retval = io_channel_write_blk(fs->io, blk, 1, rec->block_buf);
-+		if (retval) {
-+			rec->err = retval;
-+			return BLOCK_ABORT;
-+		}
-+	}
-+	
-+	/*
-+	 * Update block counts
-+	 */
-+	ext2fs_block_alloc_stats(fs, blk, +1);
-+	
-+	*block_nr = blk;
-+	return BLOCK_CHANGED;
-+}
-+
-+
-+
-+
-+
-+
-diff -Naur silo-1.4.13.orig/libext2fs/bitmaps.c silo-1.4.13/libext2fs/bitmaps.c
---- silo-1.4.13.orig/libext2fs/bitmaps.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/bitmaps.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,212 @@
-+/*
-+ * bitmaps.c --- routines to read, write, and manipulate the inode and
-+ * block bitmaps.
-+ *
-+ * Copyright (C) 1993, 1994, 1995, 1996 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <fcntl.h>
-+#include <time.h>
-+#if HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+static errcode_t make_bitmap(__u32 start, __u32 end, __u32 real_end,
-+			     const char *descr, char *init_map,
-+			     ext2fs_generic_bitmap *ret)
-+{
-+	ext2fs_generic_bitmap	bitmap;
-+	errcode_t		retval;
-+	size_t			size;
-+
-+	retval = ext2fs_get_mem(sizeof(struct ext2fs_struct_generic_bitmap), 
-+				&bitmap);
-+	if (retval)
-+		return retval;
-+
-+	bitmap->magic = EXT2_ET_MAGIC_GENERIC_BITMAP;
-+	bitmap->fs = NULL;
-+	bitmap->start = start;
-+	bitmap->end = end;
-+	bitmap->real_end = real_end;
-+	bitmap->base_error_code = EXT2_ET_BAD_GENERIC_MARK;
-+	if (descr) {
-+		retval = ext2fs_get_mem(strlen(descr)+1, &bitmap->description);
-+		if (retval) {
-+			ext2fs_free_mem(&bitmap);
-+			return retval;
-+		}
-+		strcpy(bitmap->description, descr);
-+	} else
-+		bitmap->description = 0;
-+
-+	size = (size_t) (((bitmap->real_end - bitmap->start) / 8) + 1);
-+	retval = ext2fs_get_mem(size, &bitmap->bitmap);
-+	if (retval) {
-+		ext2fs_free_mem(&bitmap->description);
-+		ext2fs_free_mem(&bitmap);
-+		return retval;
-+	}
-+
-+	if (init_map)
-+		memcpy(bitmap->bitmap, init_map, size);
-+	else
-+		memset(bitmap->bitmap, 0, size);
-+	*ret = bitmap;
-+	return 0;
-+}
-+
-+errcode_t ext2fs_allocate_generic_bitmap(__u32 start,
-+					 __u32 end,
-+					 __u32 real_end,
-+					 const char *descr,
-+					 ext2fs_generic_bitmap *ret)
-+{
-+	return make_bitmap(start, end, real_end, descr, 0, ret);
-+}
-+
-+errcode_t ext2fs_copy_bitmap(ext2fs_generic_bitmap src,
-+			     ext2fs_generic_bitmap *dest)
-+{
-+	errcode_t		retval;
-+	ext2fs_generic_bitmap	new_map;
-+
-+	retval = make_bitmap(src->start, src->end, src->real_end,
-+			     src->description, src->bitmap, &new_map);
-+	if (retval)
-+		return retval;
-+	new_map->magic = src->magic;
-+	new_map->fs = src->fs;
-+	new_map->base_error_code = src->base_error_code;
-+	*dest = new_map;
-+	return 0;
-+}
-+
-+void ext2fs_set_bitmap_padding(ext2fs_generic_bitmap map)
-+{
-+	__u32	i, j;
-+
-+	for (i=map->end+1, j = i - map->start; i <= map->real_end; i++, j++)
-+		ext2fs_set_bit(j, map->bitmap);
-+
-+	return;
-+}	
-+
-+errcode_t ext2fs_allocate_inode_bitmap(ext2_filsys fs,
-+				       const char *descr,
-+				       ext2fs_inode_bitmap *ret)
-+{
-+	ext2fs_inode_bitmap bitmap;
-+	errcode_t	retval;
-+	__u32		start, end, real_end;
-+
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	fs->write_bitmaps = ext2fs_write_bitmaps;
-+
-+	start = 1;
-+	end = fs->super->s_inodes_count;
-+	real_end = (EXT2_INODES_PER_GROUP(fs->super) * fs->group_desc_count);
-+
-+	retval = ext2fs_allocate_generic_bitmap(start, end, real_end,
-+						descr, &bitmap);
-+	if (retval)
-+		return retval;
-+	
-+	bitmap->magic = EXT2_ET_MAGIC_INODE_BITMAP;
-+	bitmap->fs = fs;
-+	bitmap->base_error_code = EXT2_ET_BAD_INODE_MARK;
-+	
-+	*ret = bitmap;
-+	return 0;
-+}
-+
-+errcode_t ext2fs_allocate_block_bitmap(ext2_filsys fs,
-+				       const char *descr,
-+				       ext2fs_block_bitmap *ret)
-+{
-+	ext2fs_block_bitmap bitmap;
-+	errcode_t	retval;
-+	__u32		start, end, real_end;
-+
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	fs->write_bitmaps = ext2fs_write_bitmaps;
-+
-+	start = fs->super->s_first_data_block;
-+	end = fs->super->s_blocks_count-1;
-+	real_end = (EXT2_BLOCKS_PER_GROUP(fs->super)  
-+		    * fs->group_desc_count)-1 + start;
-+	
-+	retval = ext2fs_allocate_generic_bitmap(start, end, real_end,
-+						descr, &bitmap);
-+	if (retval)
-+		return retval;
-+
-+	bitmap->magic = EXT2_ET_MAGIC_BLOCK_BITMAP;
-+	bitmap->fs = fs;
-+	bitmap->base_error_code = EXT2_ET_BAD_BLOCK_MARK;
-+	
-+	*ret = bitmap;
-+	return 0;
-+}
-+
-+errcode_t ext2fs_fudge_inode_bitmap_end(ext2fs_inode_bitmap bitmap,
-+					ext2_ino_t end, ext2_ino_t *oend)
-+{
-+	EXT2_CHECK_MAGIC(bitmap, EXT2_ET_MAGIC_INODE_BITMAP);
-+	
-+	if (end > bitmap->real_end)
-+		return EXT2_ET_FUDGE_INODE_BITMAP_END;
-+	if (oend)
-+		*oend = bitmap->end;
-+	bitmap->end = end;
-+	return 0;
-+}
-+
-+errcode_t ext2fs_fudge_block_bitmap_end(ext2fs_block_bitmap bitmap,
-+					blk_t end, blk_t *oend)
-+{
-+	EXT2_CHECK_MAGIC(bitmap, EXT2_ET_MAGIC_BLOCK_BITMAP);
-+	
-+	if (end > bitmap->real_end)
-+		return EXT2_ET_FUDGE_BLOCK_BITMAP_END;
-+	if (oend)
-+		*oend = bitmap->end;
-+	bitmap->end = end;
-+	return 0;
-+}
-+
-+void ext2fs_clear_inode_bitmap(ext2fs_inode_bitmap bitmap)
-+{
-+	if (!bitmap || (bitmap->magic != EXT2_ET_MAGIC_INODE_BITMAP))
-+		return;
-+
-+	memset(bitmap->bitmap, 0,
-+	       (size_t) (((bitmap->real_end - bitmap->start) / 8) + 1));
-+}
-+
-+void ext2fs_clear_block_bitmap(ext2fs_block_bitmap bitmap)
-+{
-+	if (!bitmap || (bitmap->magic != EXT2_ET_MAGIC_BLOCK_BITMAP))
-+		return;
-+
-+	memset(bitmap->bitmap, 0,
-+	       (size_t) (((bitmap->real_end - bitmap->start) / 8) + 1));
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/bitops.c silo-1.4.13/libext2fs/bitops.c
---- silo-1.4.13.orig/libext2fs/bitops.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/bitops.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,91 @@
-+/*
-+ * bitops.c --- Bitmap frobbing code.  See bitops.h for the inlined
-+ * 	routines.
-+ * 
-+ * Copyright (C) 1993, 1994, 1995, 1996 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+#ifndef _EXT2_HAVE_ASM_BITOPS_
-+
-+/*
-+ * For the benefit of those who are trying to port Linux to another
-+ * architecture, here are some C-language equivalents.  You should
-+ * recode these in the native assmebly language, if at all possible.
-+ *
-+ * C language equivalents written by Theodore Ts'o, 9/26/92.
-+ * Modified by Pete A. Zaitcev 7/14/95 to be portable to big endian
-+ * systems, as well as non-32 bit systems.
-+ */
-+
-+int ext2fs_set_bit(unsigned int nr,void * addr)
-+{
-+	int		mask, retval;
-+	unsigned char	*ADDR = (unsigned char *) addr;
-+
-+	ADDR += nr >> 3;
-+	mask = 1 << (nr & 0x07);
-+	retval = mask & *ADDR;
-+	*ADDR |= mask;
-+	return retval;
-+}
-+
-+int ext2fs_clear_bit(unsigned int nr, void * addr)
-+{
-+	int		mask, retval;
-+	unsigned char	*ADDR = (unsigned char *) addr;
-+
-+	ADDR += nr >> 3;
-+	mask = 1 << (nr & 0x07);
-+	retval = mask & *ADDR;
-+	*ADDR &= ~mask;
-+	return retval;
-+}
-+
-+int ext2fs_test_bit(unsigned int nr, const void * addr)
-+{
-+	int			mask;
-+	const unsigned char	*ADDR = (const unsigned char *) addr;
-+
-+	ADDR += nr >> 3;
-+	mask = 1 << (nr & 0x07);
-+	return (mask & *ADDR);
-+}
-+
-+#endif	/* !_EXT2_HAVE_ASM_BITOPS_ */
-+
-+void ext2fs_warn_bitmap(errcode_t errcode, unsigned long arg,
-+			const char *description)
-+{
-+#ifndef OMIT_COM_ERR
-+	if (description)
-+		com_err(0, errcode, "#%lu for %s", arg, description);
-+	else
-+		com_err(0, errcode, "#%lu", arg);
-+#endif
-+}
-+
-+void ext2fs_warn_bitmap2(ext2fs_generic_bitmap bitmap,
-+			    int code, unsigned long arg)
-+{
-+#ifndef OMIT_COM_ERR
-+	if (bitmap->description)
-+		com_err(0, bitmap->base_error_code+code,
-+			"#%lu for %s", arg, bitmap->description);
-+	else
-+		com_err(0, bitmap->base_error_code + code, "#%lu", arg);
-+#endif
-+}
-+
-diff -Naur silo-1.4.13.orig/libext2fs/bitops.h silo-1.4.13/libext2fs/bitops.h
---- silo-1.4.13.orig/libext2fs/bitops.h	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/bitops.h	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,617 @@
-+/*
-+ * bitops.h --- Bitmap frobbing code.  The byte swapping routines are
-+ * 	also included here.
-+ * 
-+ * Copyright (C) 1993, 1994, 1995, 1996 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ * 
-+ * i386 bitops operations taken from <asm/bitops.h>, Copyright 1992,
-+ * Linus Torvalds.
-+ */
-+
-+
-+extern int ext2fs_set_bit(unsigned int nr,void * addr);
-+extern int ext2fs_clear_bit(unsigned int nr, void * addr);
-+extern int ext2fs_test_bit(unsigned int nr, const void * addr);
-+extern __u16 ext2fs_swab16(__u16 val);
-+extern __u32 ext2fs_swab32(__u32 val);
-+
-+#ifdef WORDS_BIGENDIAN
-+#define ext2fs_cpu_to_le32(x) ext2fs_swab32((x))
-+#define ext2fs_le32_to_cpu(x) ext2fs_swab32((x))
-+#define ext2fs_cpu_to_le16(x) ext2fs_swab16((x))
-+#define ext2fs_le16_to_cpu(x) ext2fs_swab16((x))
-+#define ext2fs_cpu_to_be32(x) ((__u32)(x))
-+#define ext2fs_be32_to_cpu(x) ((__u32)(x))
-+#define ext2fs_cpu_to_be16(x) ((__u16)(x))
-+#define ext2fs_be16_to_cpu(x) ((__u16)(x))
-+#else
-+#define ext2fs_cpu_to_le32(x) ((__u32)(x))
-+#define ext2fs_le32_to_cpu(x) ((__u32)(x))
-+#define ext2fs_cpu_to_le16(x) ((__u16)(x))
-+#define ext2fs_le16_to_cpu(x) ((__u16)(x))
-+#define ext2fs_cpu_to_be32(x) ext2fs_swab32((x))
-+#define ext2fs_be32_to_cpu(x) ext2fs_swab32((x))
-+#define ext2fs_cpu_to_be16(x) ext2fs_swab16((x))
-+#define ext2fs_be16_to_cpu(x) ext2fs_swab16((x))
-+#endif
-+
-+/*
-+ * EXT2FS bitmap manipulation routines.
-+ */
-+
-+/* Support for sending warning messages from the inline subroutines */
-+extern const char *ext2fs_block_string;
-+extern const char *ext2fs_inode_string;
-+extern const char *ext2fs_mark_string;
-+extern const char *ext2fs_unmark_string;
-+extern const char *ext2fs_test_string;
-+extern void ext2fs_warn_bitmap(errcode_t errcode, unsigned long arg,
-+			       const char *description);
-+extern void ext2fs_warn_bitmap2(ext2fs_generic_bitmap bitmap,
-+				int code, unsigned long arg);
-+
-+extern int ext2fs_mark_block_bitmap(ext2fs_block_bitmap bitmap, blk_t block);
-+extern int ext2fs_unmark_block_bitmap(ext2fs_block_bitmap bitmap,
-+				       blk_t block);
-+extern int ext2fs_test_block_bitmap(ext2fs_block_bitmap bitmap, blk_t block);
-+
-+extern int ext2fs_mark_inode_bitmap(ext2fs_inode_bitmap bitmap, ext2_ino_t inode);
-+extern int ext2fs_unmark_inode_bitmap(ext2fs_inode_bitmap bitmap,
-+				       ext2_ino_t inode);
-+extern int ext2fs_test_inode_bitmap(ext2fs_inode_bitmap bitmap, ext2_ino_t inode);
-+
-+extern void ext2fs_fast_mark_block_bitmap(ext2fs_block_bitmap bitmap,
-+					  blk_t block);
-+extern void ext2fs_fast_unmark_block_bitmap(ext2fs_block_bitmap bitmap,
-+					    blk_t block);
-+extern int ext2fs_fast_test_block_bitmap(ext2fs_block_bitmap bitmap,
-+					 blk_t block);
-+
-+extern void ext2fs_fast_mark_inode_bitmap(ext2fs_inode_bitmap bitmap,
-+					  ext2_ino_t inode);
-+extern void ext2fs_fast_unmark_inode_bitmap(ext2fs_inode_bitmap bitmap,
-+					    ext2_ino_t inode);
-+extern int ext2fs_fast_test_inode_bitmap(ext2fs_inode_bitmap bitmap,
-+					 ext2_ino_t inode);
-+extern blk_t ext2fs_get_block_bitmap_start(ext2fs_block_bitmap bitmap);
-+extern ext2_ino_t ext2fs_get_inode_bitmap_start(ext2fs_inode_bitmap bitmap);
-+extern blk_t ext2fs_get_block_bitmap_end(ext2fs_block_bitmap bitmap);
-+extern ext2_ino_t ext2fs_get_inode_bitmap_end(ext2fs_inode_bitmap bitmap);
-+
-+extern void ext2fs_mark_block_bitmap_range(ext2fs_block_bitmap bitmap,
-+					   blk_t block, int num);
-+extern void ext2fs_unmark_block_bitmap_range(ext2fs_block_bitmap bitmap,
-+					     blk_t block, int num);
-+extern int ext2fs_test_block_bitmap_range(ext2fs_block_bitmap bitmap,
-+					  blk_t block, int num);
-+extern void ext2fs_fast_mark_block_bitmap_range(ext2fs_block_bitmap bitmap,
-+						blk_t block, int num);
-+extern void ext2fs_fast_unmark_block_bitmap_range(ext2fs_block_bitmap bitmap,
-+						  blk_t block, int num);
-+extern int ext2fs_fast_test_block_bitmap_range(ext2fs_block_bitmap bitmap,
-+					       blk_t block, int num);
-+extern void ext2fs_set_bitmap_padding(ext2fs_generic_bitmap map);
-+
-+/* These two routines moved to gen_bitmap.c */
-+extern int ext2fs_mark_generic_bitmap(ext2fs_generic_bitmap bitmap,
-+					 __u32 bitno);
-+extern int ext2fs_unmark_generic_bitmap(ext2fs_generic_bitmap bitmap,
-+					   blk_t bitno);
-+/*
-+ * The inline routines themselves...
-+ * 
-+ * If NO_INLINE_FUNCS is defined, then we won't try to do inline
-+ * functions at all; they will be included as normal functions in
-+ * inline.c
-+ */
-+#ifdef NO_INLINE_FUNCS
-+#if (defined(__GNUC__) && (defined(__i386__) || defined(__i486__) || \
-+			   defined(__i586__) || defined(__mc68000__) || \
-+			   defined(__sparc__)))
-+	/* This prevents bitops.c from trying to include the C */
-+	/* function version of these functions */
-+#define _EXT2_HAVE_ASM_BITOPS_
-+#endif
-+#endif /* NO_INLINE_FUNCS */
-+
-+#if (defined(INCLUDE_INLINE_FUNCS) || !defined(NO_INLINE_FUNCS))
-+#ifdef INCLUDE_INLINE_FUNCS
-+#define _INLINE_ extern
-+#else
-+#ifdef __GNUC__
-+#define _INLINE_ extern __inline__
-+#else				/* For Watcom C */
-+#define _INLINE_ extern inline
-+#endif
-+#endif
-+
-+#if ((defined __GNUC__) && !defined(_EXT2_USE_C_VERSIONS_) && \
-+     (defined(__i386__) || defined(__i486__) || defined(__i586__)))
-+
-+#define _EXT2_HAVE_ASM_BITOPS_
-+#define _EXT2_HAVE_ASM_SWAB_
-+#define _EXT2_HAVE_ASM_FINDBIT_
-+
-+/*
-+ * These are done by inline assembly for speed reasons.....
-+ *
-+ * All bitoperations return 0 if the bit was cleared before the
-+ * operation and != 0 if it was not.  Bit 0 is the LSB of addr; bit 32
-+ * is the LSB of (addr+1).
-+ */
-+
-+/*
-+ * Some hacks to defeat gcc over-optimizations..
-+ */
-+struct __dummy_h { unsigned long a[100]; };
-+#define EXT2FS_ADDR (*(struct __dummy_h *) addr)
-+#define EXT2FS_CONST_ADDR (*(const struct __dummy_h *) addr)	
-+
-+_INLINE_ int ext2fs_set_bit(unsigned int nr, void * addr)
-+{
-+	int oldbit;
-+
-+	__asm__ __volatile__("btsl %2,%1\n\tsbbl %0,%0"
-+		:"=r" (oldbit),"=m" (EXT2FS_ADDR)
-+		:"r" (nr));
-+	return oldbit;
-+}
-+
-+_INLINE_ int ext2fs_clear_bit(unsigned int nr, void * addr)
-+{
-+	int oldbit;
-+
-+	__asm__ __volatile__("btrl %2,%1\n\tsbbl %0,%0"
-+		:"=r" (oldbit),"=m" (EXT2FS_ADDR)
-+		:"r" (nr));
-+	return oldbit;
-+}
-+
-+_INLINE_ int ext2fs_test_bit(unsigned int nr, const void * addr)
-+{
-+	int oldbit;
-+
-+	__asm__ __volatile__("btl %2,%1\n\tsbbl %0,%0"
-+		:"=r" (oldbit)
-+		:"m" (EXT2FS_CONST_ADDR),"r" (nr));
-+	return oldbit;
-+}
-+
-+#if 0
-+_INLINE_ int ext2fs_find_first_bit_set(void * addr, unsigned size)
-+{
-+	int d0, d1, d2;
-+	int res;
-+
-+	if (!size)
-+		return 0;
-+	/* This looks at memory. Mark it volatile to tell gcc not to move it around */
-+	__asm__ __volatile__(
-+		"cld\n\t"			     
-+		"xorl %%eax,%%eax\n\t"
-+		"xorl %%edx,%%edx\n\t"
-+		"repe; scasl\n\t"
-+		"je 1f\n\t"
-+		"movl -4(%%edi),%%eax\n\t"
-+		"subl $4,%%edi\n\t"
-+		"bsfl %%eax,%%edx\n"
-+		"1:\tsubl %%esi,%%edi\n\t"
-+		"shll $3,%%edi\n\t"
-+		"addl %%edi,%%edx"
-+		:"=d" (res), "=&c" (d0), "=&D" (d1), "=&a" (d2)
-+		:"1" ((size + 31) >> 5), "2" (addr), "S" (addr));
-+	return res;
-+}
-+
-+_INLINE_ int ext2fs_find_next_bit_set (void * addr, int size, int offset)
-+{
-+	unsigned long * p = ((unsigned long *) addr) + (offset >> 5);
-+	int set = 0, bit = offset & 31, res;
-+	
-+	if (bit) {
-+		/*
-+		 * Look for zero in first byte
-+		 */
-+		__asm__("bsfl %1,%0\n\t"
-+			"jne 1f\n\t"
-+			"movl $32, %0\n"
-+			"1:"
-+			: "=r" (set)
-+			: "r" (*p >> bit));
-+		if (set < (32 - bit))
-+			return set + offset;
-+		set = 32 - bit;
-+		p++;
-+	}
-+	/*
-+	 * No bit found yet, search remaining full bytes for a bit
-+	 */
-+	res = ext2fs_find_first_bit_set(p, size - 32 * (p - (unsigned long *) addr));
-+	return (offset + set + res);
-+}
-+#endif
-+
-+#ifdef EXT2FS_ENABLE_SWAPFS
-+_INLINE_ __u32 ext2fs_swab32(__u32 val)
-+{
-+#ifdef EXT2FS_REQUIRE_486
-+	__asm__("bswap %0" : "=r" (val) : "0" (val));
-+#else
-+	__asm__("xchgb %b0,%h0\n\t"	/* swap lower bytes	*/
-+		"rorl $16,%0\n\t"	/* swap words		*/
-+		"xchgb %b0,%h0"		/* swap higher bytes	*/
-+		:"=q" (val)
-+		: "0" (val));
-+#endif
-+	return val;
-+}
-+
-+_INLINE_ __u16 ext2fs_swab16(__u16 val)
-+{
-+	__asm__("xchgb %b0,%h0"		/* swap bytes		*/ \
-+		: "=q" (val) \
-+		:  "0" (val)); \
-+		return val;
-+}
-+#endif
-+
-+#undef EXT2FS_ADDR
-+
-+#endif	/* i386 */
-+
-+#ifdef __mc68000__
-+
-+#define _EXT2_HAVE_ASM_BITOPS_
-+
-+_INLINE_ int ext2fs_set_bit(unsigned int nr,void * addr)
-+{
-+	char retval;
-+
-+	__asm__ __volatile__ ("bfset %2@{%1:#1}; sne %0"
-+	     : "=d" (retval) : "d" (nr^7), "a" (addr));
-+
-+	return retval;
-+}
-+
-+_INLINE_ int ext2fs_clear_bit(unsigned int nr, void * addr)
-+{
-+	char retval;
-+
-+	__asm__ __volatile__ ("bfclr %2@{%1:#1}; sne %0"
-+	     : "=d" (retval) : "d" (nr^7), "a" (addr));
-+
-+	return retval;
-+}
-+
-+_INLINE_ int ext2fs_test_bit(unsigned int nr, const void * addr)
-+{
-+	char retval;
-+
-+	__asm__ __volatile__ ("bftst %2@{%1:#1}; sne %0"
-+	     : "=d" (retval) : "d" (nr^7), "a" (addr));
-+
-+	return retval;
-+}
-+
-+#endif /* __mc68000__ */
-+
-+
-+#if !defined(_EXT2_HAVE_ASM_SWAB_) && defined(EXT2FS_ENABLE_SWAPFS)
-+
-+_INLINE_ __u16 ext2fs_swab16(__u16 val)
-+{
-+	return (val >> 8) | (val << 8);
-+}
-+
-+_INLINE_ __u32 ext2fs_swab32(__u32 val)
-+{
-+	return ((val>>24) | ((val>>8)&0xFF00) |
-+		((val<<8)&0xFF0000) | (val<<24));
-+}
-+
-+#endif /* !_EXT2_HAVE_ASM_SWAB */
-+
-+#if !defined(_EXT2_HAVE_ASM_FINDBIT_)
-+_INLINE_ int ext2fs_find_first_bit_set(void * addr, unsigned size)
-+{
-+	char	*cp = (unsigned char *) addr;
-+	int 	res = 0, d0;
-+
-+	if (!size)
-+		return 0;
-+
-+	while ((size > res) && (*cp == 0)) {
-+		cp++;
-+		res += 8;
-+	}
-+	d0 = ffs(*cp);
-+	if (d0 == 0)
-+		return size;
-+	
-+	return res + d0 - 1;
-+}
-+
-+_INLINE_ int ext2fs_find_next_bit_set (void * addr, int size, int offset)
-+{
-+	unsigned char * p;
-+	int set = 0, bit = offset & 7, res = 0, d0;
-+	
-+	res = offset >> 3;
-+	p = ((unsigned char *) addr) + res;
-+	
-+	if (bit) {
-+		set = ffs(*p & ~((1 << bit) - 1));
-+		if (set)
-+			return (offset & ~7) + set - 1;
-+		p++;
-+		res += 8;
-+	}
-+	while ((size > res) && (*p == 0)) {
-+		p++;
-+		res += 8;
-+	}
-+	d0 = ffs(*p);
-+	if (d0 == 0)
-+		return size;
-+
-+	return (res + d0 - 1);
-+}
-+#endif	
-+
-+_INLINE_ int ext2fs_test_generic_bitmap(ext2fs_generic_bitmap bitmap,
-+					blk_t bitno);
-+
-+_INLINE_ int ext2fs_test_generic_bitmap(ext2fs_generic_bitmap bitmap,
-+					blk_t bitno)
-+{
-+	if ((bitno < bitmap->start) || (bitno > bitmap->end)) {
-+		ext2fs_warn_bitmap2(bitmap, EXT2FS_TEST_ERROR, bitno);
-+		return 0;
-+	}
-+	return ext2fs_test_bit(bitno - bitmap->start, bitmap->bitmap);
-+}
-+
-+_INLINE_ int ext2fs_mark_block_bitmap(ext2fs_block_bitmap bitmap,
-+				       blk_t block)
-+{
-+	return ext2fs_mark_generic_bitmap((ext2fs_generic_bitmap)
-+				       bitmap,
-+					  block);
-+}
-+
-+_INLINE_ int ext2fs_unmark_block_bitmap(ext2fs_block_bitmap bitmap,
-+					 blk_t block)
-+{
-+	return ext2fs_unmark_generic_bitmap((ext2fs_generic_bitmap) bitmap, 
-+					    block);
-+}
-+
-+_INLINE_ int ext2fs_test_block_bitmap(ext2fs_block_bitmap bitmap,
-+				       blk_t block)
-+{
-+	return ext2fs_test_generic_bitmap((ext2fs_generic_bitmap) bitmap, 
-+					  block);
-+}
-+
-+_INLINE_ int ext2fs_mark_inode_bitmap(ext2fs_inode_bitmap bitmap,
-+				       ext2_ino_t inode)
-+{
-+	return ext2fs_mark_generic_bitmap((ext2fs_generic_bitmap) bitmap, 
-+					  inode);
-+}
-+
-+_INLINE_ int ext2fs_unmark_inode_bitmap(ext2fs_inode_bitmap bitmap,
-+					 ext2_ino_t inode)
-+{
-+	return ext2fs_unmark_generic_bitmap((ext2fs_generic_bitmap) bitmap, 
-+				     inode);
-+}
-+
-+_INLINE_ int ext2fs_test_inode_bitmap(ext2fs_inode_bitmap bitmap,
-+				       ext2_ino_t inode)
-+{
-+	return ext2fs_test_generic_bitmap((ext2fs_generic_bitmap) bitmap, 
-+					  inode);
-+}
-+
-+_INLINE_ void ext2fs_fast_mark_block_bitmap(ext2fs_block_bitmap bitmap,
-+					    blk_t block)
-+{
-+#ifdef EXT2FS_DEBUG_FAST_OPS
-+	if ((block < bitmap->start) || (block > bitmap->end)) {
-+		ext2fs_warn_bitmap(EXT2_ET_BAD_BLOCK_MARK, block,
-+				   bitmap->description);
-+		return;
-+	}
-+#endif	
-+	ext2fs_set_bit(block - bitmap->start, bitmap->bitmap);
-+}
-+
-+_INLINE_ void ext2fs_fast_unmark_block_bitmap(ext2fs_block_bitmap bitmap,
-+					      blk_t block)
-+{
-+#ifdef EXT2FS_DEBUG_FAST_OPS
-+	if ((block < bitmap->start) || (block > bitmap->end)) {
-+		ext2fs_warn_bitmap(EXT2_ET_BAD_BLOCK_UNMARK,
-+				   block, bitmap->description);
-+		return;
-+	}
-+#endif
-+	ext2fs_clear_bit(block - bitmap->start, bitmap->bitmap);
-+}
-+
-+_INLINE_ int ext2fs_fast_test_block_bitmap(ext2fs_block_bitmap bitmap,
-+					    blk_t block)
-+{
-+#ifdef EXT2FS_DEBUG_FAST_OPS
-+	if ((block < bitmap->start) || (block > bitmap->end)) {
-+		ext2fs_warn_bitmap(EXT2_ET_BAD_BLOCK_TEST,
-+				   block, bitmap->description);
-+		return 0;
-+	}
-+#endif
-+	return ext2fs_test_bit(block - bitmap->start, bitmap->bitmap);
-+}
-+
-+_INLINE_ void ext2fs_fast_mark_inode_bitmap(ext2fs_inode_bitmap bitmap,
-+					    ext2_ino_t inode)
-+{
-+#ifdef EXT2FS_DEBUG_FAST_OPS
-+	if ((inode < bitmap->start) || (inode > bitmap->end)) {
-+		ext2fs_warn_bitmap(EXT2_ET_BAD_INODE_MARK,
-+				   inode, bitmap->description);
-+		return;
-+	}
-+#endif
-+	ext2fs_set_bit(inode - bitmap->start, bitmap->bitmap);
-+}
-+
-+_INLINE_ void ext2fs_fast_unmark_inode_bitmap(ext2fs_inode_bitmap bitmap,
-+					      ext2_ino_t inode)
-+{
-+#ifdef EXT2FS_DEBUG_FAST_OPS
-+	if ((inode < bitmap->start) || (inode > bitmap->end)) {
-+		ext2fs_warn_bitmap(EXT2_ET_BAD_INODE_UNMARK,
-+				   inode, bitmap->description);
-+		return;
-+	}
-+#endif
-+	ext2fs_clear_bit(inode - bitmap->start, bitmap->bitmap);
-+}
-+
-+_INLINE_ int ext2fs_fast_test_inode_bitmap(ext2fs_inode_bitmap bitmap,
-+					   ext2_ino_t inode)
-+{
-+#ifdef EXT2FS_DEBUG_FAST_OPS
-+	if ((inode < bitmap->start) || (inode > bitmap->end)) {
-+		ext2fs_warn_bitmap(EXT2_ET_BAD_INODE_TEST,
-+				   inode, bitmap->description);
-+		return 0;
-+	}
-+#endif
-+	return ext2fs_test_bit(inode - bitmap->start, bitmap->bitmap);
-+}
-+
-+_INLINE_ blk_t ext2fs_get_block_bitmap_start(ext2fs_block_bitmap bitmap)
-+{
-+	return bitmap->start;
-+}
-+
-+_INLINE_ ext2_ino_t ext2fs_get_inode_bitmap_start(ext2fs_inode_bitmap bitmap)
-+{
-+	return bitmap->start;
-+}
-+
-+_INLINE_ blk_t ext2fs_get_block_bitmap_end(ext2fs_block_bitmap bitmap)
-+{
-+	return bitmap->end;
-+}
-+
-+_INLINE_ ext2_ino_t ext2fs_get_inode_bitmap_end(ext2fs_inode_bitmap bitmap)
-+{
-+	return bitmap->end;
-+}
-+
-+_INLINE_ int ext2fs_test_block_bitmap_range(ext2fs_block_bitmap bitmap,
-+					    blk_t block, int num)
-+{
-+	int	i;
-+
-+	if ((block < bitmap->start) || (block+num-1 > bitmap->end)) {
-+		ext2fs_warn_bitmap(EXT2_ET_BAD_BLOCK_TEST,
-+				   block, bitmap->description);
-+		return 0;
-+	}
-+	for (i=0; i < num; i++) {
-+		if (ext2fs_fast_test_block_bitmap(bitmap, block+i))
-+			return 0;
-+	}
-+	return 1;
-+}
-+
-+_INLINE_ int ext2fs_fast_test_block_bitmap_range(ext2fs_block_bitmap bitmap,
-+						 blk_t block, int num)
-+{
-+	int	i;
-+
-+#ifdef EXT2FS_DEBUG_FAST_OPS
-+	if ((block < bitmap->start) || (block+num-1 > bitmap->end)) {
-+		ext2fs_warn_bitmap(EXT2_ET_BAD_BLOCK_TEST,
-+				   block, bitmap->description);
-+		return 0;
-+	}
-+#endif
-+	for (i=0; i < num; i++) {
-+		if (ext2fs_fast_test_block_bitmap(bitmap, block+i))
-+			return 0;
-+	}
-+	return 1;
-+}
-+
-+_INLINE_ void ext2fs_mark_block_bitmap_range(ext2fs_block_bitmap bitmap,
-+					     blk_t block, int num)
-+{
-+	int	i;
-+	
-+	if ((block < bitmap->start) || (block+num-1 > bitmap->end)) {
-+		ext2fs_warn_bitmap(EXT2_ET_BAD_BLOCK_MARK, block,
-+				   bitmap->description);
-+		return;
-+	}
-+	for (i=0; i < num; i++)
-+		ext2fs_set_bit(block + i - bitmap->start, bitmap->bitmap);
-+}
-+
-+_INLINE_ void ext2fs_fast_mark_block_bitmap_range(ext2fs_block_bitmap bitmap,
-+						  blk_t block, int num)
-+{
-+	int	i;
-+	
-+#ifdef EXT2FS_DEBUG_FAST_OPS
-+	if ((block < bitmap->start) || (block+num-1 > bitmap->end)) {
-+		ext2fs_warn_bitmap(EXT2_ET_BAD_BLOCK_MARK, block,
-+				   bitmap->description);
-+		return;
-+	}
-+#endif	
-+	for (i=0; i < num; i++)
-+		ext2fs_set_bit(block + i - bitmap->start, bitmap->bitmap);
-+}
-+
-+_INLINE_ void ext2fs_unmark_block_bitmap_range(ext2fs_block_bitmap bitmap,
-+					       blk_t block, int num)
-+{
-+	int	i;
-+	
-+	if ((block < bitmap->start) || (block+num-1 > bitmap->end)) {
-+		ext2fs_warn_bitmap(EXT2_ET_BAD_BLOCK_UNMARK, block,
-+				   bitmap->description);
-+		return;
-+	}
-+	for (i=0; i < num; i++)
-+		ext2fs_clear_bit(block + i - bitmap->start, bitmap->bitmap);
-+}
-+
-+_INLINE_ void ext2fs_fast_unmark_block_bitmap_range(ext2fs_block_bitmap bitmap,
-+						    blk_t block, int num)
-+{
-+	int	i;
-+	
-+#ifdef EXT2FS_DEBUG_FAST_OPS
-+	if ((block < bitmap->start) || (block+num-1 > bitmap->end)) {
-+		ext2fs_warn_bitmap(EXT2_ET_BAD_BLOCK_UNMARK, block,
-+				   bitmap->description);
-+		return;
-+	}
-+#endif	
-+	for (i=0; i < num; i++)
-+		ext2fs_clear_bit(block + i - bitmap->start, bitmap->bitmap);
-+}
-+#undef _INLINE_
-+#endif
-+
-diff -Naur silo-1.4.13.orig/libext2fs/block.c silo-1.4.13/libext2fs/block.c
---- silo-1.4.13.orig/libext2fs/block.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/block.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,437 @@
-+/*
-+ * block.c --- iterate over all blocks in an inode
-+ * 
-+ * Copyright (C) 1993, 1994, 1995, 1996 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+struct block_context {
-+	ext2_filsys	fs;
-+	int (*func)(ext2_filsys	fs,
-+		    blk_t	*blocknr,
-+		    e2_blkcnt_t	bcount,
-+		    blk_t	ref_blk,
-+		    int		ref_offset,
-+		    void	*priv_data);
-+	e2_blkcnt_t	bcount;
-+	int		bsize;
-+	int		flags;
-+	errcode_t	errcode;
-+	char	*ind_buf;
-+	char	*dind_buf;
-+	char	*tind_buf;
-+	void	*priv_data;
-+};
-+
-+static int block_iterate_ind(blk_t *ind_block, blk_t ref_block,
-+			     int ref_offset, struct block_context *ctx)
-+{
-+	int	ret = 0, changed = 0;
-+	int	i, flags, limit, offset;
-+	blk_t	*block_nr;
-+
-+	limit = ctx->fs->blocksize >> 2;
-+	if (!(ctx->flags & BLOCK_FLAG_DEPTH_TRAVERSE) &&
-+	    !(ctx->flags & BLOCK_FLAG_DATA_ONLY))
-+		ret = (*ctx->func)(ctx->fs, ind_block,
-+				   BLOCK_COUNT_IND, ref_block,
-+				   ref_offset, ctx->priv_data);
-+	if (!*ind_block || (ret & BLOCK_ABORT)) {
-+		ctx->bcount += limit;
-+		return ret;
-+	}
-+	if (*ind_block >= ctx->fs->super->s_blocks_count ||
-+	    *ind_block < ctx->fs->super->s_first_data_block) {
-+		ctx->errcode = EXT2_ET_BAD_IND_BLOCK;
-+		ret |= BLOCK_ERROR;
-+		return ret;
-+	}
-+	ctx->errcode = ext2fs_read_ind_block(ctx->fs, *ind_block, 
-+					     ctx->ind_buf);
-+	if (ctx->errcode) {
-+		ret |= BLOCK_ERROR;
-+		return ret;
-+	}
-+
-+	block_nr = (blk_t *) ctx->ind_buf;
-+	offset = 0;
-+	if (ctx->flags & BLOCK_FLAG_APPEND) {
-+		for (i = 0; i < limit; i++, ctx->bcount++, block_nr++) {
-+			flags = (*ctx->func)(ctx->fs, block_nr, ctx->bcount,
-+					     *ind_block, offset, 
-+					     ctx->priv_data);
-+			changed	|= flags;
-+			if (flags & BLOCK_ABORT) {
-+				ret |= BLOCK_ABORT;
-+				break;
-+			}
-+			offset += sizeof(blk_t);
-+		}
-+	} else {
-+		for (i = 0; i < limit; i++, ctx->bcount++, block_nr++) {
-+			if (*block_nr == 0)
-+				continue;
-+			flags = (*ctx->func)(ctx->fs, block_nr, ctx->bcount,
-+					     *ind_block, offset, 
-+					     ctx->priv_data);
-+			changed	|= flags;
-+			if (flags & BLOCK_ABORT) {
-+				ret |= BLOCK_ABORT;
-+				break;
-+			}
-+			offset += sizeof(blk_t);
-+		}
-+	}
-+	if (changed & BLOCK_CHANGED) {
-+		ctx->errcode = ext2fs_write_ind_block(ctx->fs, *ind_block,
-+						      ctx->ind_buf);
-+		if (ctx->errcode)
-+			ret |= BLOCK_ERROR | BLOCK_ABORT;
-+	}
-+	if ((ctx->flags & BLOCK_FLAG_DEPTH_TRAVERSE) &&
-+	    !(ctx->flags & BLOCK_FLAG_DATA_ONLY) &&
-+	    !(ret & BLOCK_ABORT))
-+		ret |= (*ctx->func)(ctx->fs, ind_block,
-+				    BLOCK_COUNT_IND, ref_block,
-+				    ref_offset, ctx->priv_data);
-+	return ret;
-+}
-+	
-+static int block_iterate_dind(blk_t *dind_block, blk_t ref_block,
-+			      int ref_offset, struct block_context *ctx)
-+{
-+	int	ret = 0, changed = 0;
-+	int	i, flags, limit, offset;
-+	blk_t	*block_nr;
-+
-+	limit = ctx->fs->blocksize >> 2;
-+	if (!(ctx->flags & (BLOCK_FLAG_DEPTH_TRAVERSE |
-+			    BLOCK_FLAG_DATA_ONLY)))
-+		ret = (*ctx->func)(ctx->fs, dind_block,
-+				   BLOCK_COUNT_DIND, ref_block,
-+				   ref_offset, ctx->priv_data);
-+	if (!*dind_block || (ret & BLOCK_ABORT)) {
-+		ctx->bcount += limit*limit;
-+		return ret;
-+	}
-+	if (*dind_block >= ctx->fs->super->s_blocks_count ||
-+	    *dind_block < ctx->fs->super->s_first_data_block) {
-+		ctx->errcode = EXT2_ET_BAD_DIND_BLOCK;
-+		ret |= BLOCK_ERROR;
-+		return ret;
-+	}
-+	ctx->errcode = ext2fs_read_ind_block(ctx->fs, *dind_block, 
-+					     ctx->dind_buf);
-+	if (ctx->errcode) {
-+		ret |= BLOCK_ERROR;
-+		return ret;
-+	}
-+
-+	block_nr = (blk_t *) ctx->dind_buf;
-+	offset = 0;
-+	if (ctx->flags & BLOCK_FLAG_APPEND) {
-+		for (i = 0; i < limit; i++, block_nr++) {
-+			flags = block_iterate_ind(block_nr,
-+						  *dind_block, offset,
-+						  ctx);
-+			changed |= flags;
-+			if (flags & (BLOCK_ABORT | BLOCK_ERROR)) {
-+				ret |= flags & (BLOCK_ABORT | BLOCK_ERROR);
-+				break;
-+			}
-+			offset += sizeof(blk_t);
-+		}
-+	} else {
-+		for (i = 0; i < limit; i++, block_nr++) {
-+			if (*block_nr == 0) {
-+				ctx->bcount += limit;
-+				continue;
-+			}
-+			flags = block_iterate_ind(block_nr,
-+						  *dind_block, offset,
-+						  ctx);
-+			changed |= flags;
-+			if (flags & (BLOCK_ABORT | BLOCK_ERROR)) {
-+				ret |= flags & (BLOCK_ABORT | BLOCK_ERROR);
-+				break;
-+			}
-+			offset += sizeof(blk_t);
-+		}
-+	}
-+	if (changed & BLOCK_CHANGED) {
-+		ctx->errcode = ext2fs_write_ind_block(ctx->fs, *dind_block,
-+						      ctx->dind_buf);
-+		if (ctx->errcode)
-+			ret |= BLOCK_ERROR | BLOCK_ABORT;
-+	}
-+	if ((ctx->flags & BLOCK_FLAG_DEPTH_TRAVERSE) &&
-+	    !(ctx->flags & BLOCK_FLAG_DATA_ONLY) &&
-+	    !(ret & BLOCK_ABORT))
-+		ret |= (*ctx->func)(ctx->fs, dind_block,
-+				    BLOCK_COUNT_DIND, ref_block,
-+				    ref_offset, ctx->priv_data);
-+	return ret;
-+}
-+	
-+static int block_iterate_tind(blk_t *tind_block, blk_t ref_block,
-+			      int ref_offset, struct block_context *ctx)
-+{
-+	int	ret = 0, changed = 0;
-+	int	i, flags, limit, offset;
-+	blk_t	*block_nr;
-+
-+	limit = ctx->fs->blocksize >> 2;
-+	if (!(ctx->flags & (BLOCK_FLAG_DEPTH_TRAVERSE |
-+			    BLOCK_FLAG_DATA_ONLY)))
-+		ret = (*ctx->func)(ctx->fs, tind_block,
-+				   BLOCK_COUNT_TIND, ref_block,
-+				   ref_offset, ctx->priv_data);
-+	if (!*tind_block || (ret & BLOCK_ABORT)) {
-+		ctx->bcount += limit*limit*limit;
-+		return ret;
-+	}
-+	if (*tind_block >= ctx->fs->super->s_blocks_count ||
-+	    *tind_block < ctx->fs->super->s_first_data_block) {
-+		ctx->errcode = EXT2_ET_BAD_TIND_BLOCK;
-+		ret |= BLOCK_ERROR;
-+		return ret;
-+	}
-+	ctx->errcode = ext2fs_read_ind_block(ctx->fs, *tind_block, 
-+					     ctx->tind_buf);
-+	if (ctx->errcode) {
-+		ret |= BLOCK_ERROR;
-+		return ret;
-+	}
-+
-+	block_nr = (blk_t *) ctx->tind_buf;
-+	offset = 0;
-+	if (ctx->flags & BLOCK_FLAG_APPEND) {
-+		for (i = 0; i < limit; i++, block_nr++) {
-+			flags = block_iterate_dind(block_nr,
-+						   *tind_block,
-+						   offset, ctx);
-+			changed |= flags;
-+			if (flags & (BLOCK_ABORT | BLOCK_ERROR)) {
-+				ret |= flags & (BLOCK_ABORT | BLOCK_ERROR);
-+				break;
-+			}
-+			offset += sizeof(blk_t);
-+		}
-+	} else {
-+		for (i = 0; i < limit; i++, block_nr++) {
-+			if (*block_nr == 0) {
-+				ctx->bcount += limit*limit;
-+				continue;
-+			}
-+			flags = block_iterate_dind(block_nr,
-+						   *tind_block,
-+						   offset, ctx);
-+			changed |= flags;
-+			if (flags & (BLOCK_ABORT | BLOCK_ERROR)) {
-+				ret |= flags & (BLOCK_ABORT | BLOCK_ERROR);
-+				break;
-+			}
-+			offset += sizeof(blk_t);
-+		}
-+	}
-+	if (changed & BLOCK_CHANGED) {
-+		ctx->errcode = ext2fs_write_ind_block(ctx->fs, *tind_block,
-+						      ctx->tind_buf);
-+		if (ctx->errcode)
-+			ret |= BLOCK_ERROR | BLOCK_ABORT;
-+	}
-+	if ((ctx->flags & BLOCK_FLAG_DEPTH_TRAVERSE) &&
-+	    !(ctx->flags & BLOCK_FLAG_DATA_ONLY) &&
-+	    !(ret & BLOCK_ABORT))
-+		ret |= (*ctx->func)(ctx->fs, tind_block,
-+				    BLOCK_COUNT_TIND, ref_block,
-+				    ref_offset, ctx->priv_data);
-+	
-+	return ret;
-+}
-+	
-+errcode_t ext2fs_block_iterate2(ext2_filsys fs,
-+				ext2_ino_t ino,
-+				int	flags,
-+				char *block_buf,
-+				int (*func)(ext2_filsys fs,
-+					    blk_t	*blocknr,
-+					    e2_blkcnt_t	blockcnt,
-+					    blk_t	ref_blk,
-+					    int		ref_offset,
-+					    void	*priv_data),
-+				void *priv_data)
-+{
-+	int	i;
-+	int	got_inode = 0;
-+	int	ret = 0;
-+	blk_t	blocks[EXT2_N_BLOCKS];	/* directory data blocks */
-+	struct ext2_inode inode;
-+	errcode_t	retval;
-+	struct block_context ctx;
-+	int	limit;
-+
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	/*
-+	 * Check to see if we need to limit large files
-+	 */
-+	if (flags & BLOCK_FLAG_NO_LARGE) {
-+		ctx.errcode = ext2fs_read_inode(fs, ino, &inode);
-+		if (ctx.errcode)
-+			return ctx.errcode;
-+		got_inode = 1;
-+		if (!LINUX_S_ISDIR(inode.i_mode) &&
-+		    (inode.i_size_high != 0))
-+			return EXT2_ET_FILE_TOO_BIG;
-+	}
-+
-+	retval = ext2fs_get_blocks(fs, ino, blocks);
-+	if (retval)
-+		return retval;
-+
-+	limit = fs->blocksize >> 2;
-+
-+	ctx.fs = fs;
-+	ctx.func = func;
-+	ctx.priv_data = priv_data;
-+	ctx.flags = flags;
-+	ctx.bcount = 0;
-+	if (block_buf) {
-+		ctx.ind_buf = block_buf;
-+	} else {
-+		retval = ext2fs_get_mem(fs->blocksize * 3, &ctx.ind_buf);
-+		if (retval)
-+			return retval;
-+	}
-+	ctx.dind_buf = ctx.ind_buf + fs->blocksize;
-+	ctx.tind_buf = ctx.dind_buf + fs->blocksize;
-+
-+	/*
-+	 * Iterate over the HURD translator block (if present)
-+	 */
-+	if ((fs->super->s_creator_os == EXT2_OS_HURD) &&
-+	    !(flags & BLOCK_FLAG_DATA_ONLY)) {
-+		ctx.errcode = ext2fs_read_inode(fs, ino, &inode);
-+		if (ctx.errcode)
-+			goto abort_exit;
-+		got_inode = 1;
-+		if (inode.osd1.hurd1.h_i_translator) {
-+			ret |= (*ctx.func)(fs,
-+					   &inode.osd1.hurd1.h_i_translator,
-+					   BLOCK_COUNT_TRANSLATOR,
-+					   0, 0, priv_data);
-+			if (ret & BLOCK_ABORT)
-+				goto abort_exit;
-+		}
-+	}
-+	
-+	/*
-+	 * Iterate over normal data blocks
-+	 */
-+	for (i = 0; i < EXT2_NDIR_BLOCKS ; i++, ctx.bcount++) {
-+		if (blocks[i] || (flags & BLOCK_FLAG_APPEND)) {
-+			ret |= (*ctx.func)(fs, &blocks[i],
-+					    ctx.bcount, 0, i, priv_data);
-+			if (ret & BLOCK_ABORT)
-+				goto abort_exit;
-+		}
-+	}
-+	if (*(blocks + EXT2_IND_BLOCK) || (flags & BLOCK_FLAG_APPEND)) {
-+		ret |= block_iterate_ind(blocks + EXT2_IND_BLOCK,
-+					 0, EXT2_IND_BLOCK, &ctx);
-+		if (ret & BLOCK_ABORT)
-+			goto abort_exit;
-+	} else
-+		ctx.bcount += limit;
-+	if (*(blocks + EXT2_DIND_BLOCK) || (flags & BLOCK_FLAG_APPEND)) {
-+		ret |= block_iterate_dind(blocks + EXT2_DIND_BLOCK,
-+					  0, EXT2_DIND_BLOCK, &ctx);
-+		if (ret & BLOCK_ABORT)
-+			goto abort_exit;
-+	} else
-+		ctx.bcount += limit * limit;
-+	if (*(blocks + EXT2_TIND_BLOCK) || (flags & BLOCK_FLAG_APPEND)) {
-+		ret |= block_iterate_tind(blocks + EXT2_TIND_BLOCK,
-+					  0, EXT2_TIND_BLOCK, &ctx);
-+		if (ret & BLOCK_ABORT)
-+			goto abort_exit;
-+	}
-+
-+abort_exit:
-+	if (ret & BLOCK_CHANGED) {
-+		if (!got_inode) {
-+			retval = ext2fs_read_inode(fs, ino, &inode);
-+			if (retval)
-+				return retval;
-+		}
-+		for (i=0; i < EXT2_N_BLOCKS; i++)
-+			inode.i_block[i] = blocks[i];
-+		retval = ext2fs_write_inode(fs, ino, &inode);
-+		if (retval)
-+			return retval;
-+	}
-+
-+	if (!block_buf)
-+		ext2fs_free_mem(&ctx.ind_buf);
-+
-+	return (ret & BLOCK_ERROR) ? ctx.errcode : 0;
-+}
-+
-+/*
-+ * Emulate the old ext2fs_block_iterate function!
-+ */
-+
-+struct xlate {
-+	int (*func)(ext2_filsys	fs,
-+		    blk_t	*blocknr,
-+		    int		bcount,
-+		    void	*priv_data);
-+	void *real_private;
-+};
-+
-+#ifdef __TURBOC__
-+ #pragma argsused
-+#endif
-+static int xlate_func(ext2_filsys fs, blk_t *blocknr, e2_blkcnt_t blockcnt,
-+		      blk_t ref_block EXT2FS_ATTR((unused)),
-+		      int ref_offset EXT2FS_ATTR((unused)),
-+		      void *priv_data)
-+{
-+	struct xlate *xl = (struct xlate *) priv_data;
-+
-+	return (*xl->func)(fs, blocknr, (int) blockcnt, xl->real_private);
-+}
-+
-+errcode_t ext2fs_block_iterate(ext2_filsys fs,
-+			       ext2_ino_t ino,
-+			       int	flags,
-+			       char *block_buf,
-+			       int (*func)(ext2_filsys fs,
-+					   blk_t	*blocknr,
-+					   int	blockcnt,
-+					   void	*priv_data),
-+			       void *priv_data)
-+{
-+	struct xlate xl;
-+	
-+	xl.real_private = priv_data;
-+	xl.func = func;
-+
-+	return ext2fs_block_iterate2(fs, ino, BLOCK_FLAG_NO_LARGE | flags,
-+				     block_buf, xlate_func, &xl);
-+}
-+
-diff -Naur silo-1.4.13.orig/libext2fs/bmap.c silo-1.4.13/libext2fs/bmap.c
---- silo-1.4.13.orig/libext2fs/bmap.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/bmap.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,270 @@
-+/*
-+ * bmap.c --- logical to physical block mapping
-+ *
-+ * Copyright (C) 1997 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+#if defined(__GNUC__) && !defined(NO_INLINE_FUNCS)
-+#define _BMAP_INLINE_	__inline__
-+#else
-+#define _BMAP_INLINE_
-+#endif
-+
-+extern errcode_t ext2fs_bmap(ext2_filsys fs, ext2_ino_t ino,
-+			     struct ext2_inode *inode, 
-+			     char *block_buf, int bmap_flags,
-+			     blk_t block, blk_t *phys_blk);
-+
-+#define inode_bmap(inode, nr) ((inode)->i_block[(nr)])
-+
-+static _BMAP_INLINE_ errcode_t block_ind_bmap(ext2_filsys fs, int flags, 
-+					      blk_t ind, char *block_buf, 
-+					      int *blocks_alloc,
-+					      blk_t nr, blk_t *ret_blk)
-+{
-+	errcode_t	retval;
-+	blk_t		b;
-+
-+	if (!ind) {
-+		if (flags & BMAP_SET)
-+			return EXT2_ET_SET_BMAP_NO_IND;
-+		*ret_blk = 0;
-+		return 0;
-+	}
-+	retval = io_channel_read_blk(fs->io, ind, 1, block_buf);
-+	if (retval)
-+		return retval;
-+
-+	if (flags & BMAP_SET) {
-+		b = *ret_blk;
-+#ifdef EXT2FS_ENABLE_SWAPFS
-+		if ((fs->flags & EXT2_FLAG_SWAP_BYTES) ||
-+		    (fs->flags & EXT2_FLAG_SWAP_BYTES_WRITE))
-+			b = ext2fs_swab32(b);
-+#endif
-+		((blk_t *) block_buf)[nr] = b;
-+		return io_channel_write_blk(fs->io, ind, 1, block_buf);
-+	}
-+
-+	b = ((blk_t *) block_buf)[nr];
-+
-+#ifdef EXT2FS_ENABLE_SWAPFS
-+	if ((fs->flags & EXT2_FLAG_SWAP_BYTES) ||
-+	    (fs->flags & EXT2_FLAG_SWAP_BYTES_READ))
-+		b = ext2fs_swab32(b);
-+#endif
-+
-+	if (!b && (flags & BMAP_ALLOC)) {
-+		b = nr ? ((blk_t *) block_buf)[nr-1] : 0;
-+		retval = ext2fs_alloc_block(fs, b,
-+					    block_buf + fs->blocksize, &b);
-+		if (retval)
-+			return retval;
-+
-+#ifdef EXT2FS_ENABLE_SWAPFS
-+		if ((fs->flags & EXT2_FLAG_SWAP_BYTES) ||
-+		    (fs->flags & EXT2_FLAG_SWAP_BYTES_WRITE))
-+			((blk_t *) block_buf)[nr] = ext2fs_swab32(b);
-+		else
-+#endif
-+			((blk_t *) block_buf)[nr] = b;
-+
-+		retval = io_channel_write_blk(fs->io, ind, 1, block_buf);
-+		if (retval)
-+			return retval;
-+
-+		(*blocks_alloc)++;
-+	}
-+
-+	*ret_blk = b;
-+	return 0;
-+}
-+
-+static _BMAP_INLINE_ errcode_t block_dind_bmap(ext2_filsys fs, int flags,
-+					       blk_t dind, char *block_buf, 
-+					       int *blocks_alloc,
-+					       blk_t nr, blk_t *ret_blk)
-+{
-+	blk_t		b;
-+	errcode_t	retval;
-+	blk_t		addr_per_block;
-+	
-+	addr_per_block = (blk_t) fs->blocksize >> 2;
-+
-+	retval = block_ind_bmap(fs, flags & ~BMAP_SET, dind, block_buf, 
-+				blocks_alloc, nr / addr_per_block, &b);
-+	if (retval)
-+		return retval;
-+	retval = block_ind_bmap(fs, flags, b, block_buf, blocks_alloc,
-+				nr % addr_per_block, ret_blk);
-+	return retval;
-+}
-+
-+static _BMAP_INLINE_ errcode_t block_tind_bmap(ext2_filsys fs, int flags,
-+					       blk_t tind, char *block_buf, 
-+					       int *blocks_alloc,
-+					       blk_t nr, blk_t *ret_blk)
-+{
-+	blk_t		b;
-+	errcode_t	retval;
-+	blk_t		addr_per_block;
-+	
-+	addr_per_block = (blk_t) fs->blocksize >> 2;
-+
-+	retval = block_dind_bmap(fs, flags & ~BMAP_SET, tind, block_buf, 
-+				 blocks_alloc, nr / addr_per_block, &b);
-+	if (retval)
-+		return retval;
-+	retval = block_ind_bmap(fs, flags, b, block_buf, blocks_alloc,
-+				nr % addr_per_block, ret_blk);
-+	return retval;
-+}
-+
-+errcode_t ext2fs_bmap(ext2_filsys fs, ext2_ino_t ino, struct ext2_inode *inode,
-+		      char *block_buf, int bmap_flags, blk_t block,
-+		      blk_t *phys_blk)
-+{
-+	struct ext2_inode inode_buf;
-+	blk_t addr_per_block;
-+	blk_t	b;
-+	char	*buf = 0;
-+	errcode_t	retval = 0;
-+	int		blocks_alloc = 0, inode_dirty = 0;
-+
-+	if (!(bmap_flags & BMAP_SET))
-+		*phys_blk = 0;
-+
-+	/* Read inode structure if necessary */
-+	if (!inode) {
-+		retval = ext2fs_read_inode(fs, ino, &inode_buf);
-+		if (retval)
-+			return retval;
-+		inode = &inode_buf;
-+	}
-+	addr_per_block = (blk_t) fs->blocksize >> 2;
-+
-+	if (!block_buf) {
-+		retval = ext2fs_get_mem(fs->blocksize * 2, &buf);
-+		if (retval)
-+			return retval;
-+		block_buf = buf;
-+	}
-+
-+	if (block < EXT2_NDIR_BLOCKS) {
-+		if (bmap_flags & BMAP_SET) {
-+			b = *phys_blk;
-+#ifdef EXT2FS_ENABLE_SWAPFS
-+			if ((fs->flags & EXT2_FLAG_SWAP_BYTES) ||
-+			    (fs->flags & EXT2_FLAG_SWAP_BYTES_READ))
-+				b = ext2fs_swab32(b);
-+#endif
-+			inode_bmap(inode, block) = b;
-+			inode_dirty++;
-+			goto done;
-+		}
-+
-+		*phys_blk = inode_bmap(inode, block);
-+		b = block ? inode_bmap(inode, block-1) : 0;
-+		
-+		if ((*phys_blk == 0) && (bmap_flags & BMAP_ALLOC)) {
-+			retval = ext2fs_alloc_block(fs, b, block_buf, &b);
-+			if (retval)
-+				goto done;
-+			inode_bmap(inode, block) = b;
-+			blocks_alloc++;
-+			*phys_blk = b;
-+		}
-+		goto done;
-+	}
-+	
-+	/* Indirect block */
-+	block -= EXT2_NDIR_BLOCKS;
-+	if (block < addr_per_block) {
-+		b = inode_bmap(inode, EXT2_IND_BLOCK);
-+		if (!b) {
-+			if (!(bmap_flags & BMAP_ALLOC)) {
-+				if (bmap_flags & BMAP_SET)
-+					retval = EXT2_ET_SET_BMAP_NO_IND;
-+				goto done;
-+			}
-+
-+			b = inode_bmap(inode, EXT2_IND_BLOCK-1);
-+ 			retval = ext2fs_alloc_block(fs, b, block_buf, &b);
-+			if (retval)
-+				goto done;
-+			inode_bmap(inode, EXT2_IND_BLOCK) = b;
-+			blocks_alloc++;
-+		}
-+		retval = block_ind_bmap(fs, bmap_flags, b, block_buf, 
-+					&blocks_alloc, block, phys_blk);
-+		goto done;
-+	}
-+	
-+	/* Doubly indirect block  */
-+	block -= addr_per_block;
-+	if (block < addr_per_block * addr_per_block) {
-+		b = inode_bmap(inode, EXT2_DIND_BLOCK);
-+		if (!b) {
-+			if (!(bmap_flags & BMAP_ALLOC)) {
-+				if (bmap_flags & BMAP_SET)
-+					retval = EXT2_ET_SET_BMAP_NO_IND;
-+				goto done;
-+			}
-+
-+			b = inode_bmap(inode, EXT2_IND_BLOCK);
-+ 			retval = ext2fs_alloc_block(fs, b, block_buf, &b);
-+			if (retval)
-+				goto done;
-+			inode_bmap(inode, EXT2_DIND_BLOCK) = b;
-+			blocks_alloc++;
-+		}
-+		retval = block_dind_bmap(fs, bmap_flags, b, block_buf, 
-+					 &blocks_alloc, block, phys_blk);
-+		goto done;
-+	}
-+
-+	/* Triply indirect block */
-+	block -= addr_per_block * addr_per_block;
-+	b = inode_bmap(inode, EXT2_TIND_BLOCK);
-+	if (!b) {
-+		if (!(bmap_flags & BMAP_ALLOC)) {
-+			if (bmap_flags & BMAP_SET)
-+				retval = EXT2_ET_SET_BMAP_NO_IND;
-+			goto done;
-+		}
-+
-+		b = inode_bmap(inode, EXT2_DIND_BLOCK);
-+		retval = ext2fs_alloc_block(fs, b, block_buf, &b);
-+		if (retval)
-+			goto done;
-+		inode_bmap(inode, EXT2_TIND_BLOCK) = b;
-+		blocks_alloc++;
-+	}
-+	retval = block_tind_bmap(fs, bmap_flags, b, block_buf, 
-+				 &blocks_alloc, block, phys_blk);
-+done:
-+	if (buf)
-+		ext2fs_free_mem(&buf);
-+	if ((retval == 0) && (blocks_alloc || inode_dirty)) {
-+		inode->i_blocks += (blocks_alloc * fs->blocksize) / 512;
-+		retval = ext2fs_write_inode(fs, ino, inode);
-+	}
-+	return retval;
-+}
-+
-+
-+
-diff -Naur silo-1.4.13.orig/libext2fs/bmove.c silo-1.4.13/libext2fs/bmove.c
---- silo-1.4.13.orig/libext2fs/bmove.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/bmove.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,160 @@
-+/*
-+ * bmove.c --- Move blocks around to make way for a particular
-+ * 	filesystem structure.
-+ *
-+ * Copyright (C) 1997 Theodore Ts'o.  This file may be redistributed
-+ * under the terms of the GNU Public License.
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+#if HAVE_SYS_TIME_H
-+#include <sys/time.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fsP.h"
-+
-+struct process_block_struct {
-+	ext2_ino_t		ino;
-+	struct ext2_inode *	inode;
-+	ext2fs_block_bitmap	reserve;
-+	ext2fs_block_bitmap	alloc_map;
-+	errcode_t		error;
-+	char			*buf;
-+	int			add_dir;
-+	int			flags;
-+};
-+
-+static int process_block(ext2_filsys fs, blk_t	*block_nr,
-+			 e2_blkcnt_t blockcnt, blk_t ref_block,
-+			 int ref_offset, void *priv_data)
-+{
-+	struct process_block_struct *pb;
-+	errcode_t	retval;
-+	int		ret;
-+	blk_t		block, orig;
-+
-+	pb = (struct process_block_struct *) priv_data;
-+	block = orig = *block_nr;
-+	ret = 0;
-+	
-+	/*
-+	 * Let's see if this is one which we need to relocate
-+	 */
-+	if (ext2fs_test_block_bitmap(pb->reserve, block)) {
-+		do {
-+			if (++block >= fs->super->s_blocks_count)
-+				block = fs->super->s_first_data_block;
-+			if (block == orig) {
-+				pb->error = EXT2_ET_BLOCK_ALLOC_FAIL;
-+				return BLOCK_ABORT;
-+			}
-+		} while (ext2fs_test_block_bitmap(pb->reserve, block) ||
-+			 ext2fs_test_block_bitmap(pb->alloc_map, block));
-+
-+		retval = io_channel_read_blk(fs->io, orig, 1, pb->buf);
-+		if (retval) {
-+			pb->error = retval;
-+			return BLOCK_ABORT;
-+		}
-+		retval = io_channel_write_blk(fs->io, block, 1, pb->buf);
-+		if (retval) {
-+			pb->error = retval;
-+			return BLOCK_ABORT;
-+		}
-+		*block_nr = block;
-+		ext2fs_mark_block_bitmap(pb->alloc_map, block);
-+		ret = BLOCK_CHANGED;
-+		if (pb->flags & EXT2_BMOVE_DEBUG)
-+			printf("ino=%ld, blockcnt=%lld, %d->%d\n", pb->ino,
-+			       blockcnt, orig, block);
-+	}
-+	if (pb->add_dir) {
-+		retval = ext2fs_add_dir_block(fs->dblist, pb->ino,
-+					      block, (int) blockcnt);
-+		if (retval) {
-+			pb->error = retval;
-+			ret |= BLOCK_ABORT;
-+		}
-+	}
-+	return ret;
-+}
-+
-+errcode_t ext2fs_move_blocks(ext2_filsys fs,
-+			     ext2fs_block_bitmap reserve,
-+			     ext2fs_block_bitmap alloc_map,
-+			     int flags)
-+{
-+	ext2_ino_t	ino;
-+	struct ext2_inode inode;
-+	errcode_t	retval;
-+	struct process_block_struct pb;
-+	ext2_inode_scan	scan;
-+	char		*block_buf;
-+	
-+	retval = ext2fs_open_inode_scan(fs, 0, &scan);
-+	if (retval)
-+		return retval;
-+
-+	pb.reserve = reserve;
-+	pb.error = 0;
-+	pb.alloc_map = alloc_map ? alloc_map : fs->block_map;
-+	pb.flags = flags;
-+	
-+	retval = ext2fs_get_mem(fs->blocksize * 4, &block_buf);
-+	if (retval)
-+		return retval;
-+	pb.buf = block_buf + fs->blocksize * 3;
-+
-+	/*
-+	 * If GET_DBLIST is set in the flags field, then we should
-+	 * gather directory block information while we're doing the
-+	 * block move.
-+	 */
-+	if (flags & EXT2_BMOVE_GET_DBLIST) {
-+		if (fs->dblist) {
-+			ext2fs_free_dblist(fs->dblist);
-+			fs->dblist = NULL;
-+		}
-+		retval = ext2fs_init_dblist(fs, 0);
-+		if (retval)
-+			return retval;
-+	}
-+
-+	retval = ext2fs_get_next_inode(scan, &ino, &inode);
-+	if (retval)
-+		return retval;
-+	
-+	while (ino) {
-+		if ((inode.i_links_count == 0) ||
-+		    !ext2fs_inode_has_valid_blocks(&inode))
-+			goto next;
-+		
-+		pb.ino = ino;
-+		pb.inode = &inode;
-+
-+		pb.add_dir = (LINUX_S_ISDIR(inode.i_mode) &&
-+			      flags & EXT2_BMOVE_GET_DBLIST);
-+
-+		retval = ext2fs_block_iterate2(fs, ino, 0, block_buf,
-+					      process_block, &pb);
-+		if (retval)
-+			return retval;
-+		if (pb.error)
-+			return pb.error;
-+
-+	next:
-+		retval = ext2fs_get_next_inode(scan, &ino, &inode);
-+		if (retval == EXT2_ET_BAD_BLOCK_IN_INODE_TABLE)
-+			goto next;
-+	}
-+	return 0;
-+}
-+
-diff -Naur silo-1.4.13.orig/libext2fs/brel.h silo-1.4.13/libext2fs/brel.h
---- silo-1.4.13.orig/libext2fs/brel.h	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/brel.h	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,86 @@
-+/*
-+ * brel.h
-+ * 
-+ * Copyright (C) 1996, 1997 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+struct ext2_block_relocate_entry {
-+	blk_t	new;
-+	__s16	offset;
-+	__u16	flags;
-+	union {
-+		blk_t		block_ref;
-+		ext2_ino_t	inode_ref;
-+	} owner;
-+};
-+
-+#define RELOCATE_TYPE_REF  0x0007
-+#define RELOCATE_BLOCK_REF 0x0001
-+#define RELOCATE_INODE_REF 0x0002
-+
-+typedef struct ext2_block_relocation_table *ext2_brel;
-+
-+struct ext2_block_relocation_table {
-+	__u32	magic;
-+	char	*name;
-+	blk_t	current;
-+	void	*priv_data;
-+
-+	/*
-+	 * Add a block relocation entry.
-+	 */
-+	errcode_t (*put)(ext2_brel brel, blk_t old,
-+			      struct ext2_block_relocate_entry *ent);
-+
-+	/*
-+	 * Get a block relocation entry.
-+	 */
-+	errcode_t (*get)(ext2_brel brel, blk_t old,
-+			      struct ext2_block_relocate_entry *ent);
-+
-+	/*
-+	 * Initialize for iterating over the block relocation entries.
-+	 */
-+	errcode_t (*start_iter)(ext2_brel brel);
-+	
-+	/*
-+	 * The iterator function for the inode relocation entries.
-+	 * Returns an inode number of 0 when out of entries.
-+	 */
-+	errcode_t (*next)(ext2_brel brel, blk_t *old,
-+			  struct ext2_block_relocate_entry *ent);
-+
-+	/*
-+	 * Move the inode relocation table from one block number to
-+	 * another.
-+	 */
-+	errcode_t (*move)(ext2_brel brel, blk_t old, blk_t new);
-+
-+	/*
-+	 * Remove a block relocation entry.
-+	 */
-+	errcode_t (*delete)(ext2_brel brel, blk_t old);
-+
-+
-+	/*
-+	 * Free the block relocation table.
-+	 */
-+	errcode_t (*free)(ext2_brel brel);
-+};
-+
-+errcode_t ext2fs_brel_memarray_create(char *name, blk_t max_block,
-+				    ext2_brel *brel);
-+
-+#define ext2fs_brel_put(brel, old, ent) ((brel)->put((brel), old, ent))
-+#define ext2fs_brel_get(brel, old, ent) ((brel)->get((brel), old, ent))
-+#define ext2fs_brel_start_iter(brel) ((brel)->start_iter((brel)))
-+#define ext2fs_brel_next(brel, old, ent) ((brel)->next((brel), old, ent))
-+#define ext2fs_brel_move(brel, old, new) ((brel)->move((brel), old, new))
-+#define ext2fs_brel_delete(brel, old) ((brel)->delete((brel), old))
-+#define ext2fs_brel_free(brel) ((brel)->free((brel)))
-+
-diff -Naur silo-1.4.13.orig/libext2fs/brel_ma.c silo-1.4.13/libext2fs/brel_ma.c
---- silo-1.4.13.orig/libext2fs/brel_ma.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/brel_ma.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,197 @@
-+/*
-+ * brel_ma.c
-+ * 
-+ * Copyright (C) 1996, 1997 Theodore Ts'o.
-+ *
-+ * TODO: rewrite to not use a direct array!!!  (Fortunately this
-+ * module isn't really used yet.)
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <fcntl.h>
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#if HAVE_ERRNO_H
-+#include <errno.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+#include "brel.h"
-+
-+static errcode_t bma_put(ext2_brel brel, blk_t old,
-+			struct ext2_block_relocate_entry *ent);
-+static errcode_t bma_get(ext2_brel brel, blk_t old,
-+			struct ext2_block_relocate_entry *ent);
-+static errcode_t bma_start_iter(ext2_brel brel);
-+static errcode_t bma_next(ext2_brel brel, blk_t *old,
-+			 struct ext2_block_relocate_entry *ent);
-+static errcode_t bma_move(ext2_brel brel, blk_t old, blk_t new);
-+static errcode_t bma_delete(ext2_brel brel, blk_t old);
-+static errcode_t bma_free(ext2_brel brel);
-+
-+struct brel_ma {
-+	__u32 magic;
-+	blk_t max_block;
-+	struct ext2_block_relocate_entry *entries;
-+};
-+
-+errcode_t ext2fs_brel_memarray_create(char *name, blk_t max_block,
-+				      ext2_brel *new_brel)
-+{
-+	ext2_brel		brel = 0;
-+	errcode_t	retval;
-+	struct brel_ma 	*ma = 0;
-+	size_t		size;
-+
-+	*new_brel = 0;
-+
-+	/*
-+	 * Allocate memory structures
-+	 */
-+	retval = ext2fs_get_mem(sizeof(struct ext2_block_relocation_table),
-+				&brel);
-+	if (retval)
-+		goto errout;
-+	memset(brel, 0, sizeof(struct ext2_block_relocation_table));
-+	
-+	retval = ext2fs_get_mem(strlen(name)+1, &brel->name);
-+	if (retval)
-+		goto errout;
-+	strcpy(brel->name, name);
-+	
-+	retval = ext2fs_get_mem(sizeof(struct brel_ma), &ma);
-+	if (retval)
-+		goto errout;
-+	memset(ma, 0, sizeof(struct brel_ma));
-+	brel->priv_data = ma;
-+	
-+	size = (size_t) (sizeof(struct ext2_block_relocate_entry) *
-+			 (max_block+1));
-+	retval = ext2fs_get_mem(size, &ma->entries);
-+	if (retval)
-+		goto errout;
-+	memset(ma->entries, 0, size);
-+	ma->max_block = max_block;
-+
-+	/*
-+	 * Fill in the brel data structure
-+	 */
-+	brel->put = bma_put;
-+	brel->get = bma_get;
-+	brel->start_iter = bma_start_iter;
-+	brel->next = bma_next;
-+	brel->move = bma_move;
-+	brel->delete = bma_delete;
-+	brel->free = bma_free;
-+	
-+	*new_brel = brel;
-+	return 0;
-+
-+errout:
-+	bma_free(brel);
-+	return retval;
-+}
-+
-+static errcode_t bma_put(ext2_brel brel, blk_t old,
-+			struct ext2_block_relocate_entry *ent)
-+{
-+	struct brel_ma 	*ma;
-+
-+	ma = brel->priv_data;
-+	if (old > ma->max_block)
-+		return EXT2_ET_INVALID_ARGUMENT;
-+	ma->entries[(unsigned)old] = *ent;
-+	return 0;
-+}
-+
-+static errcode_t bma_get(ext2_brel brel, blk_t old,
-+			struct ext2_block_relocate_entry *ent)
-+{
-+	struct brel_ma 	*ma;
-+
-+	ma = brel->priv_data;
-+	if (old > ma->max_block)
-+		return EXT2_ET_INVALID_ARGUMENT;
-+	if (ma->entries[(unsigned)old].new == 0)
-+		return ENOENT;
-+	*ent = ma->entries[old];
-+	return 0;
-+}
-+
-+static errcode_t bma_start_iter(ext2_brel brel)
-+{
-+	brel->current = 0;
-+	return 0;
-+}
-+
-+static errcode_t bma_next(ext2_brel brel, blk_t *old,
-+			  struct ext2_block_relocate_entry *ent)
-+{
-+	struct brel_ma 	*ma;
-+
-+	ma = brel->priv_data;
-+	while (++brel->current < ma->max_block) {
-+		if (ma->entries[(unsigned)brel->current].new == 0)
-+			continue;
-+		*old = brel->current;
-+		*ent = ma->entries[(unsigned)brel->current];
-+		return 0;
-+	}
-+	*old = 0;
-+	return 0;
-+}
-+
-+static errcode_t bma_move(ext2_brel brel, blk_t old, blk_t new)
-+{
-+	struct brel_ma 	*ma;
-+
-+	ma = brel->priv_data;
-+	if ((old > ma->max_block) || (new > ma->max_block))
-+		return EXT2_ET_INVALID_ARGUMENT;
-+	if (ma->entries[(unsigned)old].new == 0)
-+		return ENOENT;
-+	ma->entries[(unsigned)new] = ma->entries[old];
-+	ma->entries[(unsigned)old].new = 0;
-+	return 0;
-+}
-+
-+static errcode_t bma_delete(ext2_brel brel, blk_t old)
-+{
-+	struct brel_ma 	*ma;
-+
-+	ma = brel->priv_data;
-+	if (old > ma->max_block)
-+		return EXT2_ET_INVALID_ARGUMENT;
-+	if (ma->entries[(unsigned)old].new == 0)
-+		return ENOENT;
-+	ma->entries[(unsigned)old].new = 0;
-+	return 0;
-+}
-+
-+static errcode_t bma_free(ext2_brel brel)
-+{
-+	struct brel_ma 	*ma;
-+
-+	if (!brel)
-+		return 0;
-+
-+	ma = brel->priv_data;
-+
-+	if (ma) {
-+		if (ma->entries)
-+			ext2fs_free_mem(&ma->entries);
-+		ext2fs_free_mem(&ma);
-+	}
-+	if (brel->name)
-+		ext2fs_free_mem(&brel->name);
-+	ext2fs_free_mem(&brel);
-+	return 0;
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/ChangeLog silo-1.4.13/libext2fs/ChangeLog
---- silo-1.4.13.orig/libext2fs/ChangeLog	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/ChangeLog	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,3311 @@
-+2006-06-30  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* Release of E2fsprogs 1.38
-+
-+2005-06-30  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* bitops.h, bitops.c (ext2fs_set_bit, ext2fs_clear_bit,
-+		ext2fs_test_bit): Change these function prototypes to be
-+		unsigned int's.  Negative bit numbers were never allowed
-+		(and never made any sense), so this should be a safe
-+		change.  This is needed to allow safe use of block numbers
-+		greater than or equal to 2**31.
-+
-+2005-06-27  Stephen Tweedie  <sct@redhat.com>
-+
-+	* ext2fs.h (ext2fs_resize_mem): Fix C99 strict type aliasing
-+		problems.  Addresses Red Hat Bugzilla #161183.
-+
-+2005-06-19  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* getsectsize.c (BLKSSZGET): Clean up test for when to manually
-+		define the BLKSSZGET ioctl.
-+
-+2005-05-29  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* ismounted.c (ext2fs_check_mount_point): Add test to see if the
-+		device appears to be busy; this only works on Linux 2.6+
-+		systems, but provides some additional bullet-proofing in
-+		those cases.
-+
-+2005-05-08  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* test_io.c (safe_getenv): Fix bug so it would fetch the right
-+		environment variable.
-+
-+2005-04-09  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* inode.c (ext2fs_write_new_inode), 
-+		ind_block.c (ext2fs_read_ind_block): Add missing return
-+		value in error return case.  (Otherwise we return garbage
-+		instead of the error code.)
-+
-+2005-03-31  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* test_io.c (test_open): If called by a setuid/setgid or an
-+		otherwise privileged program, be paranoid and ignore the
-+		TEST_IO_* environment variables.
-+
-+2005-03-21  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* Release of E2fsprogs 1.37
-+
-+2005-03-21  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* ext2_ext_attr.h (EXT2_XATTR_LEN, EXT2_XATTR_SIZE): Add new
-+		convenience cpp macros.
-+
-+2005-03-20  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* mkdir.c (ext2fs_mkdir): Call ext2fs_write_new_inode() instead of
-+		ext2fs_write_inode().
-+
-+	* inode.c (ext2fs_write_new_inode): New function which should be
-+		used when the caller is writing an inode for the first
-+		time.  It makes sure that the extra portion of the large
-+		inode is initialized properly.
-+
-+2005-03-18  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* Makefile.in: Fix clean target to remove tst_getsectsize.
-+
-+	* getsize.c (ext2fs_get_device_size): Check to see if the number
-+		of blocks is greater than 2**32 when we are doing a binary
-+		search to determine the device size.  Thanks to Stephen
-+		Tweedie for the patch.
-+	
-+2006-02-05  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* Release of E2fsprogs 1.36
-+
-+2005-02-05  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* Makefile.in: Remove ext2fs.pc on a "make distclean"
-+
-+2005-02-04  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* Makefile.in (clean): Remove tst_getsize when doing a make clean
-+
-+2005-02-03  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* bitops.c: Make the generic functions more efficient.
-+
-+	* bitops.h: Drop SPARC assembly code. It's less efficient than GCC
-+		3.4 compiled code and also triggers nasty compiler
-+		warnings on sparc64.  Thanks to Matthias Andree for his
-+		analysis and suggestion.
-+	
-+2005-01-27  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* res_gdt.c (ext2fs_create_resize_inode): Create the resize inode
-+		even if s_reserved_gdt_blocks is zero.
-+
-+2005-01-26  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* ext2fs.pc.in: Add pkg-config files.
-+
-+2005-01-25  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* ext2fs.h: Add definition of struct ext2_inode_large
-+
-+	* ext2_fs.h: Add new function prototypes
-+
-+	* ext_attr.c (ext2fs_read_ext_attr, ext2fs_write_ext_attr): The
-+		ext2fs_swap_ext_attr() has been moved to swapfs.c, and
-+		given a new argument, has_header.
-+
-+	* swapfs.c (ext2fs_swap_ext_attr): Moved from ext_attr.c, and
-+		takes an argument which controls whether or not there is
-+		an EA header which needs to be byteswaped.
-+		(ext2fs_swap_inode_full): New function which byte-swaps
-+		the EA in inode.
-+
-+	* inode.c (ext2fs_get_next_inode_full, ext2fs_read_inode_full,
-+		ext2fs_write_inode_full): New functions, originally from
-+		Alex Tomas, but which needed to be substantially fixed so
-+		that the tests wouldn't cause major stack overwrite bugs
-+		in byte-swapping is enabled.
-+	
-+2005-01-18  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* Makefile.in: Fix the kernel compile-time echo commands to be
-+		consistent and portable
-+
-+2005-01-07  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* unlink.c (ext2fs_unlink): If both the name and the inode number
-+		are unspecified, then return an error, so that we don't do
-+		something surprising such as unconditionally deleting the
-+		first directory entry.
-+		(unlink_proc): Delete directory entries by coalescing it
-+		with the previous entry, to avoid directory fragmentation.
-+
-+2005-01-06  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* version.c (ext2fs_parse_version_string): Change parsing
-+		algorithm so that version strings such as 1.36-rc1 returns
-+		a non-surprising result (i.e., 136, and not 1361).
-+
-+2005-01-05  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* block.c (block_iterate_ind, block_iterate_dind,
-+		block_iterate_tind): Move the code which byte swaps and
-+		read/writes indirect blocks to ext2fs_{read,write}_ind_block.
-+		This saves 400 bytes, and we need them for the
-+		resize_inode handling. 
-+
-+	* ind_block.c (ext2fs_read_ind_block, ext2fs_write_ind_block): New
-+		functions.
-+
-+	* res_gdt.c (ext2fs_create_resize_inode): Use 
-+		ext2fs_{read,write}_ind_block so that byte swapping is
-+		handled on big-endian systems.
-+
-+	* dupfs.c (ext2fs_dup_handle): Make sure the new filesystem handle
-+		has its own copy of the orig_super data structure.  (This
-+		is a better way of fixing a double-free problem in
-+		resize2fs which Fedora attempted to fix in 
-+		e2fsprogs-1.35-double_free.patch.   Addresses Red Hat
-+		Bugzilla #132707.)
-+	
-+2004-12-23  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* inode.c (ext2fs_flush_icache): When flushing the icache, clear
-+		the last-read block information as well.
-+
-+	* ext2fs.h (BMAP_SET), bmap.c (ext2fs_bmap): Add support for new
-+		flag, BMAP_SET, which allows the caller to set a
-+		particular logical->physical block mapping.
-+
-+	* ext2_err.et.in (EXT2_ET_SET_BMAP_NO_IND): New error code
-+
-+	* initialize.c (calc_reserved_gdt_blocks): #ifdef out all
-+		debugging printf statements.
-+	
-+	* res_gdt.c (ext2fs_create_resize_inode): Return
-+		EXT2_ET_RESIZE_INODE_CORRUPT if the resize inode is not
-+		what we expect.  #ifdef out all debugging printf
-+		statements.
-+
-+	* ext2_err.et.in (EXT2_ET_RESIZE_INODE_CORRUPT): Add new error code.
-+
-+2004-12-22  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* swapfs.c (ext2fs_swap_super): Byteswap the reserved_gdt_blocks
-+		superblocks field.
-+
-+2004-12-15  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* sparse.c (ext2fs_list_backups, ext2fs_bg_has_super),
-+		res_gdt.c (list_backups), closefs.c (ext2fs_bg_has_super),
-+		ext2fs.h: Move ext2fs_list_backups() to res_gdt.c, and
-+		ext2fs_bg_has_super() back to closefs.c.  There's no
-+		reason for the new file, since list_backups() isn't being
-+		used by any other functions, and can be made static, and
-+		all users of the ext2fs filesystem will have to call
-+		ext2fs_close() anyway.
-+
-+2004-12-15  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* Applied resize inode patch from Andreas Dilger
-+
-+	* res_gdt.c (ext2fs_create_resize_inode): New function that
-+		creates the resize inode.
-+
-+	* initialize.c (ext2fs_initialize): Reserve space for the resize
-+		inode.
-+
-+	* ext2fs.h (EXT2_LIB_FEATURE_COMPAT_SUPP): Add
-+		EXT2_FEATURE_COMPAT_RESIZE_INODE to the list of supported
-+		capabilities.
-+		Add function prototypes for res_gdt.c and sparse.c.
-+
-+	* closefs.c (ext2fs_super_and_bgd_loc): Take the reserved blocks
-+		into account when calculating the number of overhead
-+		blocks.
-+
-+	* closefs.c (ext2fs_bg_has_super, test_root), sparse.c: Move these
-+		functions to the new file sparse.c
-+
-+	* alloc_sb.c (ext2fs_reserve_super_and_bgd): Reserve the blocks
-+		saved in the resize inode as being in use.
-+
-+	* ext2_err.et.in (EXT2_ET_RES_GDT_BLOCKS): Add new error code.
-+
-+	* Makefile.in (srcdir): Add res_gdt.c and sparse.c to the ext2fs
-+		library.
-+
-+2004-12-14  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* Makefile.in: Use Linux-kernel-style makefile output for "make
-+		install"
-+
-+	* Makefile.in (installdirs): Use $(MKINSTALLDIRS) macro
-+		Update dependencies.
-+
-+2004-11-30  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* unix_io.c (unix_set_option): Add support for the offset option.
-+
-+	* test_io.c (test_set_option): Add support for the set_option method.
-+
-+	* ext2_io.h: Add new io_channel method, set_option(), and change
-+		io_channel_write_byte() from a macro to a library function.
-+
-+	* ext2fs.h, openfs.c(ext2fs_open2): New version of ext2fs_open
-+		which adds a new parameter, io_options.
-+		(ext2fs_open): If there is a question mark in the
-+		filename, and no io_options are specified, assumed that
-+		the text following the question mark are io_options.
-+	
-+	* io_manager.c, Makefile.in: New source file which contains
-+		high-level functions for the io_channel layer.
-+
-+	* freefs.c (ext2fs_free): Make sure we don't free the io_channel
-+		if image_io is NULL.
-+
-+	* Makefile.in: Use Linux-kernel-style makefile output to make it
-+		easier to see errors/warnings.
-+
-+2004-11-29  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* ext2_fs.h (EXT2_EXTENTS_FL, EXT3_FEATURE_INCOMPAT_EXTENTS, 
-+		EXT2_MAX_BLOCK_LOG_SIZE): Add definition for extent
-+		feature and inode flag.  Change maximum allowable block
-+		size to be 65536.
-+
-+2004-10-08  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* getsize.c (ext2fs_get_device_size): Add support for Windows
-+		9x/NT under Cygwin.  Thanks to Sam Robb
-+		(samrobb@users.sourceforge.net) for pointing this and the
-+		suggested code patch.
-+
-+2004-09-17  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* getsize.c: Clean up header #include's.
-+
-+	* llseek.c (ext2fs_llseek): On non-linux systems, use lseek64() if
-+		it is present.  (Addresses Debian bug #269044)
-+
-+2004-07-28  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* rw_bitmaps.c (read_bitmaps), block.c (block_iterate_ind,
-+		block_iterate_dind, block_iterate_tind), inode.c
-+		(ext2fs_read_inode): If EXT2_FLAG_IMAGE_FILE is set, so
-+		read the metadata from fs->image_io instead of fs->io.
-+
-+	* initialize.c (ext2fs_initialize), openfs.c (ext2fs_open):
-+		Initialize fs->image_io to be the same as fs->io.
-+	
-+	* ext2_err.et.in (EXT2_ET_NOT_IMAGE_FILE): Add new error code. 
-+
-+	* openfs.c (ext2fs_get_data_io, ext2fs_set_data_io,
-+		ext2fs_rewrite_to_io): New functions that allow
-+		applications to manipulate fs->image_io and fs->io safely.
-+
-+	* freefs.c (ext2fs_free): If fs->image_io is different fs->io,
-+		then call io_channel_close on fs->image_io.
-+
-+	* ext2fs.h: Add image_io element to the ext2_filsys data
-+		structure.  Add ext2fs_get_data_io() ext2fs_set_data_io(),
-+		and ext2fs_rewrite_to_io() prototypes.
-+
-+2004-05-26  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* closefs.c (ext2fs_flush): Make sure the master superblock is
-+		written last, and only after other I/O has been flushed to
-+		disk.  Thanks to Junfeng Yang from the Stanford
-+		Metacompilation group for pointing a potential ordering
-+		constraint problem if we don't write things out in the
-+		right order.
-+
-+	* test_io.c: Implement the ability to abort after n reads or
-+		writes to a particular block.  The block is specified by
-+		TEST_IO_BLOCK environment variable, and the read/write
-+		count by the TEST_IO_READ_ABORT and TEST_IO_WRITE_ABORT
-+		environment variables.  The block data is now only dumped
-+		if the 0x10 bit is set in TEST_IO_FLAGS.
-+
-+2004-04-03  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* ext2_types.h.in: Remove check for _UUID_TYPES since uuid_types.h
-+		is no longer used.
-+
-+2004-03-08  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* getsize.c (ext2fs_get_device_size): Only use the BLKGETSIZE64
-+		ioctl on Linux 2.6 since it is unreliable in Linux 2.4.
-+		(Addresses Debian Bug #236528).  Fix typo in the ioctl
-+		used for Mac OS X.
-+
-+2004-03-02  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* getsize.c (ext2fs_get_device_size): Update getsize functions to
-+		use Apple Darwin and Linux 64-bit ioctl's
-+
-+2004-02-29  Brian Bergstrand  <brian@bergstrand.org>
-+
-+	* Makefile.in: Use $(BSDLIB_PIC_FLAG) to determine whether to use
-+		-fpic or -fPIC
-+
-+2004-02-28  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* Release of E2fsprogs 1.35
-+
-+2004-02-21  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* ext2fs.h (ext2fs_resize_mem): Fix C++ problem.  (Addresses Red
-+		Hat Bugzilla #112448; thanks Thomas Woerner from Red Hat.)
-+
-+2004-02-14  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* namei.c (follow_link): Correctly deal with symlinks that have
-+		extended attribute information.  (Addresses Debian Bug
-+		#232328)
-+
-+2004-01-30  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* ext2_fs.h: Reserve an extra 4 bytes for the journal backup,
-+		which we're using due to a typo in the e2fsck code.  (Oops)
-+
-+	* swapfs.c (ext2fs_swap_inode): Fix byte swap bug which causes SE
-+		Linux created symlinks with mandatory attributes to fail
-+		to be properly handled on big endian systems.  (Addresses
-+		Debian Bug #228723).
-+		(ext2fs_swap_super): Byte swap some new fields in the
-+		superblock, including the journal backup fields.
-+
-+2003-12-02  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* alloc.c, bb_inode.c, bitops.c, block.c, check_desc.c, closefs.c,
-+		dir_iterate.c, dirblock.c, expanddir.c, ext2fs.h,
-+		get_pathname.c, icount.c, imager.c, initalize.c, inode.c,
-+		lookup.c, openfs.c, read_bb.c, read_bb_file.c,
-+		rw_bitmaps.c, unix_io.c, unlink.c, write_bb_file.c: Fix
-+		gcc -Wall complaints.  Mainly marking variables as being
-+		unsued, and catching signed vs. unsigned comparisons.
-+
-+2003-09-03  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* closefs.c (ext2fs_super_and_bgd_loc): New function which
-+		centralizes the calculation of the superblock and block
-+		group descriptors.
-+		(ext2fs_flush): Use ext2fs_super_and_bgd_lock to figure
-+		out where to write the superblock and block group
-+		descriptors.
-+
-+	* alloc_sb.c (ext2fs_reserve_super_and_bgd): New function which
-+		reserves space in the block bitmap using
-+		ext2fs_super_and_bgd_loc.
-+
-+	* initialize.c (ext2fs_initialize): Use
-+		ext2fs_reserve_super_and_bgd to initialize the block bitmap.
-+
-+2003-08-20  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* inode_io.c (ext2fs_inode_io_intern2), ext2fs.h: Add new function
-+		allows the caller to pass in the inode data structure.
-+
-+	* fileio.c (ext2fs_file_open2), ext2fs.h: Add new function which
-+		allows the caller to pass in the inode to be used in the
-+		file I/O.
-+
-+	* ext2_fs.h: Add a backup of the location of the journal inode
-+		blocks to the superblock.
-+
-+	* mkjournal.c (write_journal_inode): Save the location of the
-+		journal inode to the backup location in the superblock.
-+
-+2003-08-01  Philipp Thomas <pthomas@suse.de>
-+
-+	* alloc.c, badblocks.c, bb_inode.c, bitmaps.c, block.c, bmap.c,
-+		bmove.c, brel_ma.c, closefs.c, dblist.c, dblist_dir.c,
-+		dir_iterate.c, dirblock.c, dupfs.c, expanddir.c, ext2fs.h,
-+		ext_attr.c, fileio.c, freefs.c, get_pathname.c, icount.c,
-+		initialize.c, inode.c, inode_io.c, irel_ma.c, mkdir.c,
-+		mkjournal.c, namei.c, newdir.c, openfs.c, rs_bitmap.c,
-+		rw_bitmaps.c, test_io.c, unix_io.c: ext2fs_getmem(),
-+		ext2fs_free_mem(), and ext2fs_resize_mem() all now take a
-+		'void *' instead of a 'void **' in order to avoid pointer
-+		aliasing problems with GCC 3.x.
-+
-+2003-07-25  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* Release of E2fsprogs 1.34
-+
-+2003-07-06  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* kernel-jbd.h, flushb.c: Fix gcc -Wall nitpicks (indented cpp
-+		directives)
-+
-+	* ext2_types.h.in, initialize.c: Fix gcc -Wall nitpicks 
-+		(don't use #elsif)
-+
-+	* ismounted.c: Fix gcc -Wall nitpicks (Don't use exit as a goto label)
-+
-+	* llseek.c: Fix gcc -Wall nitpicks (don't use #elsif)
-+
-+	* lookup.c, read_bb.c: Fix gcc -Wall nitpicks (indent
-+		non-traditional #pragma)
-+
-+	* test_io.c: Fix gcc -Wall nitpicks (const/unsigned type issues)
-+
-+2003-06-24    <tytso@snap.thunk.org>
-+
-+	* badblocks.c, ext2fs.h (ext2fs_u32_list_find,
-+		ext2fs_u32_list_test, ext2fs_u32_list_del,
-+		ext2fs_badblocks_list_del): Add functions to delete a
-+		block from the badblocks list.
-+	* tst_badblocks.c: Add test cases for ext2fs_badblocks_list_del().
-+
-+2003-05-21  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* getsectsize.c (ext2fs_get_device_sectsize): New function which
-+		returns the hardware sector size (if it is available).
-+
-+2003-05-13  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* unix_io.c: Add #ifdef NO_IO_CACHE which disables all userspace
-+		caching by the unix_io layer.  Not enabled, only for
-+		debugging. 
-+
-+2003-05-05  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* test_io.c: Pay attention to the environment variables
-+		TEST_IO_LOGFILE, TEST_IO_FLAGS, and TEST_IO_BLOCK to
-+		determine whether or not we should log io activity, and to
-+		where.
-+
-+2003-05-03  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* tst_badblocks.c (file_test): Use tmpfile() instead of mktemp().
-+
-+2003-04-29  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* getsize.c (ext2fs_get_device_size): Allow windows code to get
-+		the resize for filesystems that are in regular files.
-+
-+2003-04-21  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* Release of E2fsprogs 1.33
-+
-+2003-04-21  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* Makefile.in: Use DYLD_LIBRAY_PATH so that "make check" works on
-+		Darwin systems when building with shared libraries.
-+
-+2003-04-18  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* unix_io.c: Use __CYGWIN__ instead of CYGWIN.
-+
-+2003-04-17  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* getsize.c: Add Cygwin/Windows version of ext2fs_get_device_size()
-+
-+2003-04-12  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* unix_io.c (raw_read_blk): Add Cygwin support (the Windows block
-+		device only accepts sector aligned read requests.
-+
-+	* ismounted.c (check_mntent_file): Deal with OS's that don't
-+		define MNTOPT_RO.
-+
-+	* imager.c: If the OS doesn't define ssize_t, typedef it to int.
-+
-+2003-04-11  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* ext2_fs.h (EXT2_FEATURE_RO_COMPAT_BTREE_DIR): Comment out unused
-+		feature flag
-+
-+2003-03-30  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* Makefile.in: Use the compile_et --build-tree option.
-+
-+2003-03-14  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* getsize.c: Add support for Apple Darwin's ioctl to get the hard
-+		disk size.
-+
-+	* badblocks.c (ext2fs_u32_list_count), ext2fs.h: Add new function
-+		which returns the number of entries in the list.
-+
-+2003-03-10  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* fileio.c (ext2fs_file_lseek): Fix bug added when adding 64-bit
-+		support; avoid null dereference when ret_pos is NULL.
-+
-+2003-03-06  Theodore Tso  <tytso@mit.edu>
-+
-+	* ext2_types.h.in: Don't redefine types if other e2fsprogs
-+		*_types.h files have been included already.
-+
-+	* kernel-jbd.h: Use C99 variadic cpp macros if not using GCC.
-+		(Older GCC's don't support the C99 variadic macros.)
-+
-+	* flushb.c (ext2fs_sync_device), 
-+	ismounted.c (ext2fs_check_mount_point): Avoid GCC extension: 
-+	#warning not supported by Solaris suncc
-+
-+	* ext2_ext_attr.h: Avoid GCC extension: 0 length arrays in
-+		structure definition.  Not needed for now in 
-+		ext2_ext_attr_entry.
-+
-+2003-01-25  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* dirhash.c: Fix gcc -Wall nits.
-+
-+2003-01-22  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* unix_io.c (unix_write_blk): Fix up GCC -Wall nits.
-+
-+2003-01-21  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* fileio.c (ext2fs_file_read, ext2_file_lseek,
-+		ext2_file_get_size): Add 64-bit support.
-+
-+	* ext2fs.h (EXT2_I_SIZE): Add macro which caluates a 64bit size
-+		from i_size and i_size_high.
-+
-+2003-01-19  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* initialize.c (ext2fs_initialize): If the user specifies a really
-+		large number of inodes, then reduce the number of blocks
-+		per group until we find a workable set of filesystem
-+		parameters.
-+
-+	* ext2_err.et.in (EXT2_ET_TOO_MANY_INODES): Add new error code.
-+
-+2002-11-09  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* Release of E2fsprogs 1.32
-+
-+2002-11-09  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* unix_io.c (find_cached_block, reuse_cache, unix_read_blk, 
-+		unix_write_blk): Optimize routines so that we don't end up
-+		searching the cache twice when a block isn't in the
-+		cache.  If reads are larger than READ_DIRECT_SIZE, don't
-+		let them go through the cache.
-+
-+	* unix_io.c (find_cached_block): Fixed bug which caused some clean
-+		blocks to be erroneously marked as dirty, so they would
-+		get written back to the disk before they are evicted from
-+		the cache.  Harmless, but it slows down e2fsck
-+		significantly.
-+
-+2002-11-08  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* Release of E2fsprogs 1.31
-+
-+2002-11-08    <tytso@snap.thunk.org>
-+
-+	* Makefile.in (check): Skip trying to compile test_byteswap
-+		if --disable-byteswaap had been given to configure.
-+
-+2002-11-07    <tytso@snap.thunk.org>
-+
-+	* closefs.c (write_bgdesc, ext2fs_flush): Fix bug in meta_bg
-+		support when the MASTER_SB_ONLY flag is set.  Some of
-+		the descriptor blocks that should have been written out
-+		were getting skipped.
-+
-+2002-10-31  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* Release of E2fsprogs 1.30
-+
-+2002-10-31  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* ext2_fs.h: Add support for a new inode flag, which is to be used
-+		for indicating the top of directory hierarchies for the
-+		Orlov block allocator.
-+	
-+	* ismounted.c (check_mntent, check_mntent_file): Add better
-+		support for loopback-mounted filesystems.  Check /etc/mtab
-+		if /proc/mounts doesn't turn up any mount flags, since
-+		/etc/mtab has the loopback image filename, instead of
-+		/dev/loop0.  Also, check based on st_dev and st_ino, so
-+		that if a relative pathname or a pathnames using symbolic
-+		links are used, we can detect the the filesystem correctly
-+		in those cases.  (Addresses Sourceforge bug #619119)
-+
-+	* flushb.c (ext2fs_sync_device): If the BLKFLSBUF ioctl succeeds,
-+		don't try the FDFLUSH ioctl that was required for floppies
-+		with older kernels.  This avoids needless whining from the
-+		MD device driver.  (Addresses Sourceforge bug #545832).
-+
-+	* openfs.c (ext2fs_open): Fix bug which caused us to pass the
-+		wrong group_block to ext2fs_descriptor_block_loc if we're
-+		using the backup superblock/block group descriptors.
-+		(ext2fs_descriptor_block_loc): If we're using the backup
-+		superblock descriptors, use the backup descriptor block in
-+		the next block group.
-+
-+2002-10-30  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* alloc_tables.c (ext2fs_allocate_group_table): Allocate the inode
-+		table so that it buts up against the bitmap blocks, to
-+		avoid block fragmentation.
-+
-+	* closefs.c (write_bgdesc), initalize.c (ext2fs_initialize): Fix
-+		bug; only allocate group descriptor blocks up to
-+		s_first_meta_bg.
-+
-+2002-10-25  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* ext2_fs.h: Add a new superblock field, s_mkfs_time, so that we
-+		know when a filesystem was created.  (Sometimes this can
-+		be useful...)
-+
-+	* initialize.c (ext2fs_initialize): Set the s_mkfs_time field.
-+
-+2002-10-20  Theodore Ts'o  <tytso@valinux.com>
-+
-+	* ext2_fs.h (EXT3_DEFM_JMODE): Add new default mount options for
-+		the journal data mode.
-+
-+	* closefs.c (ext2fs_flush, write_bgdesc), ext2_fs.h, ext2fs.h,
-+	openfs.c (ext2fs_descriptor_block_loc, ext2fs_open), initialize.c
-+	(ext2fs_initialize), swapfs.c (ext2fs_swap_super): Add support for
-+	the meta_blockgroup filesystem format.
-+
-+2002-10-15    <tytso@snap.thunk.org>
-+
-+	* ext2_fs.h: Add new field in superblock for default mount options.
-+
-+2002-10-13  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* ext2fs.h: Add #include of header files necessary for ext2fs.h to
-+		compile cleanly.
-+
-+2002-10-02  Theodore Y. Ts'o  <tytso@mit.edu>
-+
-+	* rw_bitmaps.c (ext2fs_write_block_bitmap,
-+		ext2fs_read_block_bitmap): Don't set the CHANGED bit just
-+		because the bitmap is getting written to disk.  Make
-+		ext2fs_swap_bitmap be a static function, since it's not
-+		intended to be exported.
-+
-+	* swapfs.c (ext2fs_swap_super): Byte-swap the hash seed
-+
-+2001-09-24  Theodore Tso  <tytso@mit.edu>
-+
-+	* Release of E2fsprogs 1.29
-+
-+2001-08-31  Theodore Tso  <tytso@thunk.org>
-+
-+	* Release of E2fsprogs 1.28
-+
-+2002-08-31  Theodore Ts'o  <tytso@valinux.com>
-+
-+	* dblist.c (ext2fs_dblist_sort): New function which allows the
-+		caller to pass in a special sort comparison function.
-+
-+2002-08-20  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* valid_blk.c (ext2fs_inode_has_valid_blocks): Fix bug which
-+		failed to accurately characterize non-standard slow
-+		symlinks.  (Which don't appear in practice on real-life
-+		systems, fortunately.)
-+
-+2002-08-17  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* Makefile.in: Remove inode_io.o from the standard object files,
-+		and only build it if debugfs is enabled (it requires
-+		fileio.o, which is only built if --disable-debugfs isn't
-+		specified to configure).
-+
-+	* dirhash.c (ext2fs_dirhash): Change the MD4 hash in a backwards
-+		incompatible way so that it is no longer
-+		endian-dependent.  Add the TEA hash.  Allow the seed
-+		parameter to be optional.
-+
-+	* ext2_fs.h: Remove the HALF_MD4_SEED and HALF_MD4_64 hashes.
-+		These features are all now in the HALF_MD4 hash.  Add
-+		definition for EXT2_HASH_TEA.
-+
-+	* ext2fs.h (ext2fs_dirhash): Change function prototype so it takes
-+		a pointer instead of an array.
-+
-+2002-08-16  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* ext2_err.et.in (EXT2_ET_BAD_EA_BLOCK_NUM): New error code
-+
-+	* ext2fs.h (ext2fs_inode_data_blocks): New function which returns
-+		the number of data blocks used by an inode exclusive of
-+		the EA block.
-+
-+	* ext_attr.c (ext2fs_adjust_ea_refcount): New function which
-+		adjusts the reference count in an extended attribute block.
-+
-+	* valid_blk.c (ext2fs_inode_has_valid_blocks): Add code to
-+		correctly deal with extended attribute blocks in symbolic
-+		links. 
-+
-+2002-08-13    <tytso@snap.thunk.org>
-+
-+	* Makefile.in: Move dupfs.o and test_io.o from the
-+		needed-by-debugfs object list to the needed-by-resizer
-+		object list.  Fixes compile problem if the system is built
-+		with only --disable-debugfs.
-+
-+2002-07-29  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* link.c (ext2fs_link): When adding a new link to a directory,
-+		clear the HTREE bit.
-+
-+2002-07-23  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* dirhash.c (ext2fs_dirhash): Fix bug which caused MD4
-+		calculations for names > 32 characters to be completely
-+		bogus.  Changed MD4 calculation to match what is currently
-+		being used in the CVS gkernel tree.
-+
-+2002-07-19  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* ext2_fs.h: Add s_hash_seed and s_def_hash_version to the
-+		superblock definition.
-+
-+	* badblocks.c, freefs.c, ext2fs.h: Use the badblocks functions to
-+		create a set of u32_list functions.
-+
-+	* dirhash.c (halfMD4Transform): Shift the hash by one bit,
-+		since that's required by the directory indexing code.
-+
-+2002-07-14  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* ext2fs.h, read_bb_file.c: Change private to priv_data, to avoid
-+		using a C++ reserved word.
-+
-+	* unix_io.c (unix_open): Only attempt the setrlimit workaround if
-+		the kernel version is 2.4.10 -- 2.4.17, since otherwise an
-+		old version of glibc (built against 2.2 headers) will
-+		interact badly with the workaround to actually cause more
-+		problems.  I hate it when the glibc folks think they're
-+		being smarter than the kernel....
-+
-+2002-06-28  Andreas Dilger <adilger@clusterfs.com>
-+
-+	* ext2_fs.h: Add superblock field for reserved group descriptors.
-+
-+2002-06-28  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* bitops.h: Add #define's for ext2fs_{l,b}e{32,16}_to_cpu and
-+		ext2fs_cpu_to_{l,b}e{32,16}
-+
-+2002-06-27  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* ismounted.c (check_mntent): In AIX 4.3, MOUNTED isn't defined.
-+		Add appropriate fallbacks in this case.
-+
-+2002-06-26  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* dirhash.c (ext2fs_dirhash): Change function signature to support
-+		a hash seed, and to return the minor hash (for 64-bit hash
-+		support).   Add support for the half MD4, half MD4 with
-+		seed, and half MD4 with seed and 64 bits.
-+
-+2002-06-15  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* ext2_fs.h (EXT2_DIRSYNC_FL): Add new file.
-+
-+2002-06-09  Andreas Dilger <adilger@clusterfs.com>
-+
-+	* ext2_fs.h: Add macros for maximum block/inode counts:
-+		EXT2_INODES_PER_BLOCK, EXT2_MAX_BLOCKS_PER_GROUP,
-+		and EXT2_MAX_INODES_PER_GROUP.
-+
-+	* openfs.c (ext2fs_open): Check that the number of blocks in a group
-+		is less than 2^16, otherwise we need an INCOMPAT flag (not
-+		in existence yet, if ever) to open such a filesystem.
-+
-+	* initialize.c (ext2fs_initialize): Limit the number of blocks and
-+		inodes in a group to less than 2^16.
-+
-+2002-06-09  Andreas Dilger <adilger@clusterfs.com>
-+
-+	* ext2_fs.h: Further minor cleanups of the header.  Consolidate
-+		some checks for __KERNEL__ into one place.
-+
-+2002-05-22  Andreas Dilger <adilger@clusterfs.com>
-+
-+	* ext2_fs.h: Remove macros accessing u.ext2_sb field and use
-+		the EXT2_SB() macro instead.  Remove kernel function
-+		prototypes also.  This matches the 2.5 kernel, and
-+		is also cleaner for other reasons.  Whitespace cleanup.
-+
-+2002-05-21  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* ext2_ext_attr.h: Update to V2 version of the Bestbits format.
-+
-+2002-05-16  Andreas Dilger <adilger@clusterfs.com>
-+
-+	* ext2_fs.h: Change limits to support filesystems with 8k blocks.
-+
-+	* initialize.c (ext2fs_initialize): Remove assumption that
-+		blocksizes are always <= 4k.
-+
-+2002-05-11  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* bmap.c (ext2fs_bmap): Fix bug which caused ext2fs_bmap to fail
-+		silently if inode pointer is NULL (and ext2fs_bmap is
-+		expected to read the inode itself).
-+
-+2002-04-27  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* ismounted.c (check_mntent_file, is_swap_device): Verify that the
-+		file we are checking is a block device file before looking
-+		at st_rdev, since it's not valid for normal files.
-+		(is_swap_device): Move so that it is outside the
-+		HAVE_MNTENT_H, so that it is always built.
-+
-+2002-03-11  Theodore Tso  <tytso@mit.edu>
-+
-+	* dirblock.c (ext2fs_read_dir_block2, ext2fs_write_dir_block): New
-+		functions which take an extra flags argument.  The flag
-+		EXT2_DIRBLOCK_V2_STRUCT will reverse when the name_len
-+		field is byte swampped on big-endian machines, since in
-+		the V2 structure, name_len is a char field which is
-+		doesn't need to be byte swapped --- except if an
-+		old-style kernel had byte-swapped the name_len field
-+		as part of the V1 structure.
-+
-+	* ext2_err.et.in (EXT2_ET_DIRHASH_UNSUPP): New error code
-+
-+	* dirhash.c (ext2fs_dirhash): New function which calculates the
-+		hash for a filename in an indexed directory.
-+
-+2002-03-08  Theodore Tso  <tytso@mit.edu>
-+
-+	* Release of E2fsprogs 1.27
-+
-+2002-03-07  Theodore Tso  <tytso@mit.edu>
-+
-+	* ext2fs.h (ext2fs_inode_io_intern): Add missing function prototype.
-+
-+	* bmap.c, fileio.c, inode_io.c, tst_badblocks.c, 
-+		tst_byteswap.c: Fix gcc -Wall complaints
-+
-+	* Makefile.in (check): Use LD_LIBRARY_PATH to run test programs.
-+		(From Philipp Thomas <pthomas@suse.de>)
-+
-+2002-02-25  Theodore Tso  <tytso@mit.edu>
-+
-+	* ext2_fs.h: Add structure definitions for the directory indexing
-+		extension.
-+
-+2002-02-23  Theodore Tso  <tytso@mit.edu>
-+
-+	* unix_io.c (unix_open): Fix 2.4 resource limit workaround so that
-+		it doesn't break things on mis32, sparc32, and alpha
-+		platforms.
-+
-+2002-02-21  Theodore Tso  <tytso@mit.edu>
-+
-+	* ismounted.c (is_swap_device): Fix file descriptor/memory leak;
-+		we were missing an fclose().
-+
-+2002-02-20  Theodore Tso  <tytso@mit.edu>
-+
-+	* Makefile.in, inode_io.c, ext2fs.h, ext2_err.et.in: Add new io
-+		abstraction interface which exports an ext2 inode.
-+
-+	* ext2fs.h, fileio.c (ext2fs_file_flush): Export ext2fs_file_flush
-+		as a public interface.  Change void * to const void * in
-+		ext2fs_file_write's interface.
-+
-+	* test_io.c (test_close), unix_io.c (unix_close): Remove unneeded
-+		conditional; save a few bytes.
-+	
-+2002-02-12  Theodore Tso  <tytso@mit.edu>
-+
-+	* Makefile.in (tst_badblocks): Add some extra .o files when
-+		linking the debugging program tst_badblocks which are
-+		needed if we aren't compiling with inline functions enable.
-+
-+	* kernel-list.h (__inline__): On non-gcc and non-Watcom compilers,
-+		define away __inline__ since it may not be supported.
-+
-+	* kernel-jbd.h (jbd_debug): For systems that don't do STDC, use a
-+		stripped down jbd_debug that doesn't use variadic
-+		arguments.  This will cause warnings under AIX, but things
-+		should still build.
-+
-+2002-02-03  Theodore Tso  <tytso@thunk.org>
-+
-+	* Release of E2fsprogs 1.26
-+
-+2002-02-03  Theodore Tso  <tytso@mit.edu>
-+
-+	* mkdir.c (ext2fs_mkdir): Change to use ext2fs_inode_alloc_stats2
-+		so that the number of directories in use is adjusted
-+		appropriately.
-+
-+	* alloc_stats.c (ext2fs_inode_alloc_stats2): Add new function
-+		which optionally will modify the number of directories
-+		count.
-+
-+2002-01-03  Theodore Tso  <tytso@mit.edu>
-+
-+	* dir_iterate.c (ext2fs_dir_iterate2, ext2fs_process_dir_block):
-+		Add support for a new flag, DIRENT_FLAG_INCLUDE_REMOVED,
-+		which will return deleted directory entries.
-+		ext2fs_dir_iterate2 takes a new callback function which
-+		is identical with the one used by
-+		ext2fs_dblist_dir_iterate().  If the directory entry is
-+		deleted, the callback function will be called with the
-+		entry paraemter set to DIRENT_DELETED_FILE.
-+
-+	* Makefile.in, alloc_stats.c (ext2fs_inode_alloc_stats,
-+		ext2fs_block_alloc_stats): New functions which update
-+		block/inode allocation statistics in the bitmaps, block
-+		group descriptors, and superblock.
-+
-+	* mkjournal.c (mkjournal_proc), mkdir.c (ext2fs_mkdir),
-+		expanddir.c (expand_dir_proc), bb_inode.c
-+		(clear_bad_block_proc, set_bad_block_proc,
-+		ext2fs_update_bb_inode), alloc.c (ext2fs_alloc_block):
-+		Update to use new block/inode allocation statistics.
-+
-+2001-12-24  Theodore Tso  <tytso@mit.edu>
-+
-+	* ismounted.c (is_swap_device): New function used by
-+		ext2fs_check_if_mounted and ext2fs_check_mount_point which
-+		determines whether or not the specified device is a swap
-+		device by using /proc/swaps.  More bulletproofing for
-+		idiotic/careless system administrators!
-+
-+	* ext2fs.h, openfs.c (ext2fs_open), initialize.c
-+		(ext2fs_initialize), mkdir.c (ext2fs_mkdir): Add a new
-+		field to struct_ext2_filsys, umask.  This field is
-+		initialize to 022, and affects ext2fs_mkdir in the obvious
-+		way.  (In the future umask should also affect new file
-+		creation routines, but the fileio functions don't
-+		currently support this yes.)
-+
-+	* ismounted.c (check_mntent_file): Stat all of the entries in
-+		/etc/mtab and/or /proc/mounts in order to catch dim-witted
-+		system administrators who might have created alias
-+		devices.
-+ 
-+2001-12-23  Theodore Tso  <tytso@mit.edu>
-+
-+	* Makefile.in, jfs_user.h: Move linux/jbd.h to
-+		ext2fs/kernel-jbd.h, to avoid using the system header
-+		file version of hbd.h when using diet glibc (since it
-+		forcibly adds /usr/include to the beginning of the
-+		include search path.)
-+
-+	* kernel-jbd.h, kernel-list.h, jfs_compat.h: Move files from
-+		include/linux directory.
-+
-+2001-12-16  Theodore Tso  <tytso@mit.edu>
-+
-+	* bitops.h (ext2fs_mark_generic_bitmap, ext2fs_unmark_generic_bitmap),
-+		ext_attr.c (ext2fs_read_ext_attr, ext2fs_write_ext_attr),
-+		fileio.c (ext2fs_file_write): Fix gcc -Wall nits
-+
-+	* Makefile.in, jfs_user.h: linux/jfs.h has been renamed to
-+		linux/jbd.h
-+
-+2001-12-03  Theodore Tso  <tytso@mit.edu>
-+
-+	* unix_io.c (unix_open): Make sure the ulimit workaround works
-+		regardless of the version of glibc which is used to
-+		compild e2fsprogs.
-+
-+2001-11-26  Theodore Tso  <tytso@mit.edu>
-+
-+	* unix_io.c (unix_open): Work around a bug in 2.4.10+ kernels by
-+		trying to unset the filesize limit if at all possible,
-+		if a block device is getting opened.  (The filesize limit
-+		shouldn't be applied against writes to a block device, but
-+		starting in 2.4.10, the kernel is doing this.)
-+	
-+2001-11-05  Theodore Tso  <tytso@mit.edu>
-+
-+	* mkjournal.c (ext2fs_add_journal_inode): When creating a .journal
-+		file on adding a journal to an already-mounted filesystem,
-+		try to clear the ext2 file attributes on an already
-+		existing .journal file so that we don't fail if on a
-+		partially added journal to the filesystem.
-+
-+	* ext2_fs.h: Define a new ext2 file attribute, EXT2_NOTAIL_FL,
-+		which signals that a particular inode should not have the
-+		last bits of data (the "tail") be merged with another
-+		file.  This is necessary to keep LILO happy.
-+
-+2001-09-20  Theodore Tso  <tytso@thunk.org>
-+
-+	* Release of E2fsprogs 1.25
-+
-+2001-09-16  Theodore Tso  <tytso@mit.edu>
-+
-+	* ext2_ext_attr.h: Remove unneeded #include of <linux/config.h>
-+		which was breaking the build on the Hurd.  (Addresses
-+		Debian bug #112414).
-+
-+2001-09-13  Theodore Ts'o  <tytso@mit.edu>
-+
-+	* ismounted.c (check_mntent_file): We now validate the entry in
-+		/etc/mtab to make sure the filesystem is really mounted,
-+		since some broken distributions (read: Slackware) have
-+		buggy boot scripts that don't initialize /etc/mtab before
-+		checking non-root filesystems.  (Slackware also doesn't
-+		check the root filesystem separately, and reboot if the
-+		root filesystem had changes applied to it, which is
-+		dangerous and broken.)   
-+
-+2001-09-02  Theodore Tso  <tytso@thunk.org>
-+
-+	* Release of E2fsprogs 1.24a
-+
-+2001-08-30  Theodore Tso  <tytso@thunk.org>
-+
-+	* Release of E2fsprogs 1.24
-+
-+2001-08-30  Theodore Tso  <tytso@valinux.com>
-+
-+	* getsize.c (ext2fs_get_device_size): Back out BLKGETSIZE64
-+		changes, since the ioctl number has been reused by another
-+		unofficial patch.
-+
-+2001-08-15  Theodore Tso  <tytso@valinux.com>
-+
-+	* Release of E2fsprogs 1.23
-+
-+2001-08-05  Theodore Tso  <tytso@valinux.com>
-+
-+	* alloc.c (ext2fs_new_inode, ext2fs_new_block): Use the fast
-+		version of the bitmap test routines to speed up these
-+		routines.  (At some point I may want to make these
-+		routines use the find_first_bit functions, but that will
-+		add a lot of complexity since it means that these
-+		functions will have to break the bitmap abstraction
-+		boundary.  It's not clear it's worth it.)
-+
-+	* mkjournal.c (mkjournal_proc): Remember the last block allocated
-+		to speed up ext2fs_new_block().
-+
-+2001-07-29  Theodore Tso  <tytso@valinux.com>
-+
-+	* finddev.c (scan_dir): Fix memory leak; we weren't calling
-+		closedir() when exiting the function in all cases.
-+
-+2001-07-27  Theodore Tso  <tytso@valinux.com>
-+
-+	* mkjournal.c (ext2fs_create_journal_superblock): Set the first
-+		block usable in the journal for external journals to be 2
-+		or 3, depending on the blocksize, so that the existing
-+		kernel code does the right thing.
-+
-+	* getsize.c (ext2fs_get_device_size): Add support for the
-+		BLKGETSIZE64 ioctl.  (Ioctl defined by unofficial patches
-+		from Ben LaHaise, but it's likely this interface won't
-+		change.)
-+
-+	* mkjournal.c (ext2fs_add_journal_device): Use the correct block
-+		when writing the journal superblock, too.  (Oops! Needed
-+		to make 1k filesystems with external journal to work.)
-+
-+2001-07-26  Theodore Tso  <tytso@valinux.com>
-+
-+	* mkjournal.c (ext2fs_add_journal_device): Use the correct block
-+		to find the journal superblock if the blocksize is 1024.
-+
-+2001-07-21  Theodore Tso  <tytso@valinux.com>
-+
-+	* ext2_err.et.in (EXT2_ET_LOAD_EXT_JOURNAL): Add new error code
-+
-+2001-07-20  Theodore Tso  <tytso@valinux.com>
-+
-+	* ext_attr.c (ext2fs_write_ext_attr): When writing the extended
-+		attribute block, set the filesystem changed bit.
-+
-+	* bitops.h (ext2fs_find_first_bit_set, ext2fs_find_next_bit_set):
-+		Comment out these functions since we're not using them.
-+
-+2001-07-10  Theodore Tso  <tytso@valinux.com>
-+
-+	* closefs.c (write_primary_superblock): After writing changes to
-+		the primary superblock, update the original superblock
-+		copy so we don't have to re-write those changes in the
-+		future.
-+		(ext2fs_flush): Clear the superblock dirty flag after
-+		we've flushed out changes to disk.
-+
-+2001-07-07  Theodore Tso  <tytso@valinux.com>
-+
-+	* bitops.h (ext2fs_find_first_bit_set): Use %esi instead of %ebx
-+		to avoid register conflicts when compiling in PIC mode.
-+
-+2001-07-04  Theodore Tso  <tytso@valinux.com>
-+
-+	* bitops.h (ext2fs_find_first_bit_set, ext2fs_find_next_bit_set):
-+		Add new functions (C and in i386 assembler) which quickly
-+		find bits set in a bitmask.
-+
-+2001-06-23  Theodore Tso  <tytso@valinux.com>
-+
-+	* Makefile.in, ext_attr.c, ext2_attr.c, ext2fs.h: Add new files
-+		ext2_ext_attr.h and ext_attr.c for extended attributes
-+		support.
-+
-+	* Release of E2fsprogs 1.22
-+
-+2001-06-22  Theodore Tso  <tytso@valinux.com>
-+
-+	* mkjournal.c (ext2fs_add_journal_inode): Move close of file
-+		descriptor so that adding a journal to a mounted
-+		filesystem doesn't die.  (Fixes a bug accidentally
-+		introduced in e2fsprogs 1.21.)
-+
-+	* mkjournal.c (ext2fs_add_journal_inode): Only use fchflags if
-+		HAVE_CHFLAGS and UF_NODUMP are defined, since the Hurd has
-+		fchflags without defining UF_NODUMP.  (Addresses Debian
-+		bug #101361)
-+
-+	* flushb.c: Use platform independent method of defining the
-+		BLKFLSBUF and FDFLUSH ioctl's.  Also include sys/mount.h
-+		since on newer glibc's BLKFLSBUF is defined there.
-+
-+	* bitops.h: The C language versions of ext2fs_swab16/32 need to be
-+		included if EXT2FS_ENABLE_SWAPFS is defined, since we need
-+		to support byte swapping even if we don't support the
-+		conversion functions.  (Fixes Debian bug #101686).
-+
-+	* dirblock.c (ext2fs_read_dir_block): Remove use of dir_entry_2
-+		since the byte-swapping code all assumes the
-+		ext2_dir_entry structure.  (It's a question of whether or
-+		not name_len should be byte-swapped or not, and whether
-+		it's a 16 bit or 8 bit field.)
-+
-+2001-06-15  Theodore Tso  <tytso@valinux.com>
-+
-+	* Release of E2fsprogs 1.21
-+
-+2001-06-15  Theodore Tso  <tytso@valinux.com>
-+
-+	* Makefile.in: Fix bug in installation of ext2_types.h.  It is a
-+		file which is generated and is therefore found in the
-+		build directory, not source directory.
-+
-+	* ismounted.c (check_mntent_file): Use a test file in / to check
-+		to see if the root filesystem is mounted read-only.  This
-+		protects against the case where /etc might not be on /, as
-+		well as the case where /etc/mtab doesn't exist.  (Both are
-+		should-never happen scenarios, but you never know...)
-+
-+2001-06-14  Theodore Tso  <tytso@valinux.com>
-+
-+	* ismounted.c (ext2fs_check_if_mounted): Fix grammer in comment.
-+		Remove unneeded #pragma argsused, since the arguments are
-+		always used.
-+
-+2001-06-13  Theodore Tso  <tytso@valinux.com>
-+
-+	* ext2_types.h.in: If linux/types.h has been defined, then don't
-+		try to redefine the typedefs.
-+
-+	* Makefile.in (HFILES): Add ext2_types.h to the list of files
-+		which should be installed.
-+
-+	* ismounted.c (check_mntent_file): Work around GNU hurd brain
-+		damage.  Addresses Debian bug #100304.
-+
-+	* Makefile.in: Limit some .o files from being included into the
-+		library if --disable-debugfs, --disable-swapfs,
-+		--disable-imager, or --disable-resizer are used.
-+
-+2001-06-12  Theodore Tso  <tytso@valinux.com>
-+
-+	* inode.c, tst_iscan.c: Stop using the compatibility badblocks
-+		function, and use the ext2fs_badblocks_* functions
-+		instead.
-+
-+2001-06-11  Theodore Tso  <tytso@valinux.com>
-+
-+	* Makefile.in, gen_bitmap.c, bitops.h: Move inline functions
-+		ext2fs_mark_generic_bitmap and
-+		ext2fs_unmark_generic_bitmap to gen_bitmap.c as normal
-+		functions.  (This saves space and doesn't significantly
-+		change the speed of e2fsck on a P-III.)
-+
-+	* ext2fs.h, bitops.h, block.c, bmap.c, closefs.c, dirblock.c,
-+		inode.c, native.c, openfs.c, rw_bitmaps.c, swapfs.c: Only
-+		include the byte-swapping logic if ENABLE_SWAPFS is turned
-+		on or if we're on a big-endian machine.
-+	
-+	* initialize.c (ext2fs_initialize):Use WORDS_BIGENDIAN directly to
-+		set EXT2_FLAG_SWAP_BYTES, instead of using
-+		ext2fs_native_flag.
-+	
-+	* native.c (ext2fs_native_flag): Use WORDS_BIGENDIAN provided by
-+		autoconf to determine whether or not return
-+		EXT2_FLAG_SWAP_BYTES.
-+
-+2001-06-10  Theodore Tso  <tytso@valinux.com>
-+
-+	* Makefile.in: Remove the dependence on the libe2p library.
-+
-+	* mkjournal.c (ext2fs_add_journal_inode): Replace use of fsetflags
-+		with direct usage of the ioctl/fchflags so that we don't
-+		have to depend on the libe2p library.
-+
-+2001-06-08  Theodore Tso  <tytso@valinux.com>
-+
-+	* ext2_types.h.in: Use unsigned ints in favor of unsigned longs
-+		when trying to find a 32-bit wide type.
-+
-+	* icount.c (insert_icount_el): Fix the code used to estimate the
-+		size of the new icount array to be more intelligent, to
-+		avoid reallocating the array too many times.  Thanks to
-+		Enrique Perez-Terron for pointing this out.
-+
-+2001-06-02  Theodore Tso  <tytso@valinux.com>
-+
-+	* valid_blk.c (ext2fs_inode_has_valid_blocks): Only check i_blocks
-+		for a symlink to determine whether it is a fast symlink.
-+
-+2001-06-01  Theodore Tso  <tytso@valinux.com>
-+
-+	* Makefile.in, dosio.c, ext2_fs.h, ext2_types.h.in, ext2fs.h:
-+		Move include/asm/types.h.in to lib/ext2fs/ext2_types.h.in.
-+
-+2001-05-25  Theodore Tso  <tytso@valinux.com>
-+
-+	* Release of E2fsprogs 1.20
-+
-+2001-05-25  Theodore Tso  <tytso@valinux.com>
-+
-+	* ismounted.c: More cleanups for ismounted.c, some from Andreas,
-+		some to clean up Andreas's patches.  Use strncpy instead
-+		of strcpy to save the root's mountpoint.  Clean up #ifdef
-+		structure.  Remove uneeded variable in testing/debug driver.
-+
-+2001-05-24  Andreas Dilger  <adilger@turbolinux.com>
-+
-+	* ismounted.c: Add check for root device which doesn't depend on
-+		/etc/fstab or /proc/mounts to be correct.  Don't call
-+		endmntent() before we are done with mnt struct.
-+
-+2001-05-23  Theodore Tso  <tytso@valinux.com>
-+
-+	* ext2_err.et.in (EXT2_ET_JOURNAL_UNSUPP_VERSION): Added new error
-+		code.
-+
-+2001-05-21  Theodore Tso  <tytso@valinux.com>
-+
-+	* ext2_fs.h: Change assignment of EXT2_FEATURE_COMPAT_DIR_INDEX to
-+		make room for pre-existing usage of
-+		EXT2_FEATURE_COMPAT_EXT_ATTR.  Add flag EXT2_INDEX_FL with
-+		the same codepoint as EXT2_BTREE_FL.
-+
-+2001-05-20  Theodore Tso  <tytso@valinux.com>
-+
-+	* ext2fs.h: #include <> instead of "" for ext2fs and et header
-+		files, since they will be installed in /usr/include
-+
-+2001-05-14  Theodore Tso  <tytso@valinux.com>
-+
-+	* alloc.c, alloc_tables.c, badblocks.c, bb_compat.c, bb_inode.c,
-+		bitmaps.c, bitops.c, block.c, bmap.c, bmove.c, brel_ma.c,
-+		check_desc.c, closefs.c, cmp_bitmaps.c, dblist.c,
-+		dblist_dir.c, dir_iterate.c, dirblock.c, dupfs.c,
-+		expanddir.c, ext2_fs.h, fileio.c, finddev.c, flushb.c,
-+		freefs.c, get_pathname.c, getsize.c, icount.c, imager.c,
-+		initialize.c, inline.c, inode.c, irel_ma.c, ismounted.c,
-+		link.c, lookup.c, mkdir.c, mkjournal.c, namei.c, native.c,
-+		newdir.c, nt_io.c, openfs.c, read_bb.c, read_bb_file.c,
-+		rs_bitmap.c, rw_bitmaps.c, swapfs.c, test_io.c,
-+		tst_badblocks.c, tst_byteswap.c, tst_getsize.c,
-+		tst_iscan.c, unix_io.c, unlink.c, valid_blk.c, version.c,
-+		write_bb_file.c, ext2_fs.h: Moved file from include/linux.
-+		Adjust all files in this directroy to include this file.
-+
-+	* mkjournal.c (ext2fs_create_journal_superblock): Remove redundant
-+		code.
-+
-+2001-05-05  Theodore Tso  <tytso@valinux.com>
-+
-+	* fileio.c (ext2fs_file_read): Factored out common code and
-+		cleaned up function.  Fixed a bug where if there was an
-+		error reading from the disk, the number of bytes read
-+		wasn't reliably set.  (Fixes Debian bug #79163)
-+		(ext2fs_file_write): Factored out common code and made
-+		function more efficient; if writing a full block, don't
-+		bother to do a read-modify-write cycle.
-+
-+2001-05-04  Theodore Tso  <tytso@valinux.com>
-+
-+	* dirblock.c (ext2fs_read_dir_block): Check for an directory
-+		record length which isn't a multiple four, and treat that
-+		as an invalid.  Scan the directory and return an error
-+		(EXT2_ET_DIR_CORRUPTED) if the directory records are
-+		corrupted.
-+		(ext2fs_write_dir_block): If while byte-swapping the
-+		directory block, if there's an error, abort and return
-+		EXT2_ET_DIR_CORRUPTED.
-+
-+2001-05-02  Theodore Tso  <tytso@valinux.com>
-+
-+	* ext2fs.h (EXT2_FLAG_IMAGE_FILE): Add new flag, and add
-+		image_header field in the ext2_filsys structure
-+
-+	* block.c (block_iterate_ind, block_iterate_dind, block_iterate_tind): 
-+	* inode.c (ext2fs_read_inode): 
-+	* rw_bitmaps.c (read_bitmaps): 
-+	* openfs.c (ext2fs_open): Add support for EXT2_FLAG_IMAGE_FILE
-+
-+	* imager.c (ext2fs_image_bitmap_read): Fix bug in imager to make
-+		sure the full bitmap is saved.
-+
-+2001-05-01  Theodore Tso  <tytso@valinux.com>
-+
-+	* e2image.h (struct ext2_image_hdr): Add space for the device name
-+		in the image header.
-+
-+	* dir_iterate.c (ext2fs_process_dir_block): Add a double-check to
-+		make sure the rec_len is a multiple of 4, to prevent
-+		bus-errors on architectures which care about mis-aligned
-+		pointer references.
-+
-+2001-04-25  Theodore Tso  <tytso@valinux.com>
-+
-+	* getsize.c (ext2fs_get_device_size): Use an unsigned long to
-+		query the device sizes using the BLKGETSIZE ioctl.
-+
-+2001-04-16  Theodore Tso  <tytso@valinux.com>
-+
-+	* ismounted.c (check_mntent): Check /proc/mounts on Linux systems
-+		before checking /etc/mtab.  The EXT2_MF_READONLY flag is
-+		now set from the /etc/mtab options field for all
-+		filesystems, not just the root filesystem.  Add debugging
-+		code to make it easier to test ext2fs_check_if_mounted().
-+
-+	* mkjournal.c (ext2fs_create_journal_superblock): Add safety
-+		check; return an error if there's an attempt to create a
-+		journal less than 1024 filesystem blocks.
-+
-+	* ext2_err.et.in, mkjournal.c: Change EXT2_JOURNAL_NOT_BLOCK and
-+		EXT2_NO_JOURNAL_SB to be EXT2_ET_*.
-+
-+2001-02-20  Theodore Tso  <tytso@valinux.com>
-+
-+	* bitops.h (ext2fs_swab16, ext2fs_swab32): Add i386 assembly
-+		inline functions.
-+
-+	* tst_byteswap.c: New function to test the byteswap functions.
-+		Add to regression test suite.
-+
-+2001-02-08  Theodore Tso  <tytso@valinux.com>
-+
-+	* e2image.h (struct ext2_image_hdr): Fix type for fs_hostname
-+
-+2001-02-07  Theodore Tso  <tytso@valinux.com>
-+
-+	* mkjournal.c (ext2fs_create_journal_superblock): Fix the setting
-+		of s_first for external devices to always be 1, since
-+		jsb->s_first is always relative to the start of the
-+		journal superblock.  Use htonl(1) when setting s_nr_users.
-+
-+2001-01-17  Theodore Ts'o  <tytso@valinux.com>
-+
-+	* mkjournal.c (ext2fs_add_journal_device): Fix bug where the
-+		device number of the filesystem (instead of the journal)
-+		was being dropped into s_journal_dev.
-+
-+2001-01-15  Theodore Ts'o  <tytso@valinux.com>
-+
-+	* initialize.c (ext2fs_initialize): Add support for initializing
-+		the ext2 superblock for external journal devices.  This
-+		basically means we don't bother to allocate any block
-+		group descriptors.
-+
-+	* openfs.c (ext2fs_open): Only open external journal devices if
-+		the new flag EXT2_FLAG_JOURNAL_DEV_OK is passed to
-+		ext2fs_open.  When opening such devices, don't try to read
-+		the block group descriptors, since they're not there.
-+
-+	* ext2_err.et.in (EXT2_NO_JOURNAL_SB): Add new error code 
-+	
-+	* mkjournal.c: Export a new function,
-+		ext2fs_create_journal_superblock(), which allocates and
-+		returns a buffer containing a journal superblock.  This is
-+		needed by mke2fs to create an external journal.  Rewrote
-+		ext2fs_add_journal_device() so that it no longer creates
-+		the external journal, but rather adds a filesystem to an
-+		existing external journal.  It handles all of the UUID
-+		manipulation.
-+
-+	* ext2fs.h: List the EXT3_FEATURE_JOURNAL_DEV as a flag supported
-+		by the library.  Define the EXT2_FLAG_JOURNAL_DEV_OK.
-+		Changed function prototype for ext2fs_add_journal_device().
-+		
-+2001-01-14  Theodore Ts'o  <tytso@valinux.com>
-+
-+	* closefs.c (ext2fs_flush): Don't write out anything beyond the
-+		 primary superblock if EXT2_INCOMPAT_JOURNAL_DEV is
-+		 listed.
-+
-+2001-01-12  Theodore Ts'o  <tytso@valinux.com>
-+
-+	* imager.c: Fix gcc -Wall complaints and a series of bugs where
-+		retval wasn't set correctly.  (Thanks to Andreas Dilger
-+		for pointing this out.)
-+
-+2001-01-11    <tytso@snap.thunk.org>
-+
-+	* flushb.c (ext2fs_sync_device): New function which centralizes
-+		all of the places which might try to use the BLKFLSBUF
-+		or FDFLUSH ioctls (and usually failing to define them
-+		since the system header files don't usually do this for
-+		us, and we're trying to avoid usage of kernel include
-+		files now).
-+
-+2001-01-10    <tytso@snap.thunk.org>
-+
-+	* alloc.c, bb_inode.c, bitmaps.c, bitops.h, block.c, bmap.c, 
-+		bmove.c, brel.h, cmp_bitmaps.c, dblist.c, dblist_dir.c, 
-+		dir_iterate.c, expanddir.c, ext2fs.h, ext2fsP.h, fileio.c,
-+		finddev.c, get_pathname.c, icount.c, inode.c, irel.h, 
-+		irel_ma.c, ismounted.c, link.c, lookup.c, mkdir.c, 
-+		mkjournal.c, namei.c, newdir.c, read_bb_file.c, test_io.c,
-+		tst_iscan.c, unix_io.c, unlink.c: Change use of ino_t to
-+		ext2_ino_t, to protect applications that attempt to
-+		compile -D_FILE_OFFSET_BITS=64, since this inexplicably
-+		changes ino_t(!?).  So we use ext2_ino_t  to avoid an
-+		unexpected ABI change.
-+
-+2001-01-05    <tytso@snap.thunk.org>
-+
-+	* dirblock.c (ext2fs_read_dir_block): Fix a potential case where
-+		we may overrun allocated memory in case of a corrupted
-+		filesystem (or an e2fsck test case :-) when byte-swapping
-+		the directory block.
-+
-+	* ext2fs.h: Indent the #warning to fix gcc -Wall complaint.
-+
-+	* mkjournal.c (ext2fs_add_journal_device): Fix various gcc -Wall
-+		complaints including a missing return 0 at the end of
-+		ext2fs_add_journal_device.
-+
-+2001-01-03    <tytso@snap.thunk.org>
-+
-+	* Makefile.in: Link in libe2p when creating libext2fs as a shared
-+		library, since mkjournal.c now references fsetflags().
-+
-+	* mkjournal.c (ext2fs_add_journal_inode): Folded in Andreas
-+		Dilger's changes (with fixups) to allow on-line creation
-+		of a journal file.
-+
-+	* ext2fs.h, closefs.c (ext2fs_flush): Add new flag,
-+		EXT2_FLAG_SUPER_ONLY, which the close routines to only
-+		update the superblock, and not the group descriptors.
-+
-+2000-12-30  Andreas Dilger  <adilger@turbolinux.com>
-+
-+	* ismounted.c: add ext2fs_check_mount_point() function, which will
-+		optionally return the mount point of a device if mounted
-+
-+2000-12-14  Andreas Dilger  <adilger@turbolinux.com>
-+
-+	* mkjournal.c: rename ext2fs_add_journal_fs() to the more descriptive
-+		ext2fs_add_journal_inode()
-+
-+2001-01-01    <tytso@snap.thunk.org>
-+
-+	* ext2fs.h: Remove definition of ext2fs_sb.  Note: this may break
-+		source (but not binary) compatibility of some users of the
-+		ext2 library.  They should just simply do a global search
-+		and replace of struct ext2fs_sb with struct
-+		ext2_super_block, and use their own private copy of
-+		ext2_fs.h if they aren't already.
-+
-+	* closefs.c, initialize.c, link.c, newdir.c, openfs.c, swapfs.c:
-+		Replace use of ext2fs_sb with ext2_super_block.
-+
-+2000-12-31    <tytso@snap.thunk.org>
-+
-+	* ext2fs.h: Cleaned up header file by removing definitions of
-+		feature flags that might not have been defined in older
-+		ext2 header files.  Now that we're using our own
-+		include/linux/ext2fs.h header file, this can never happen.
-+
-+	* jfs_dat.h: Removed old header file which is no longer needed.
-+
-+2000-12-13  Theodore Ts'o  <tytso@valinux.com>
-+
-+	* closefs.c (ext2fs_update_dynamic_rev): New function suggested
-+		by Andreas Dilger to update the filesystem revision to
-+		EXT2_DYNAMIC_REV.
-+
-+	* swapfs.c (ext2fs_swap_super): Add byte swapping for the journal
-+		fields.
-+
-+2000-12-09    <tytso@snap.thunk.org>
-+
-+	* ext2fs.h, mkjournal.c (ext2fs_add_journal_inode,
-+		ext2fs_add_journal_device): Add a new argument to the APIs
-+		of these function, which is a flags word.  This is used to
-+		allow the creation of a V1 superblock for those folks who
-+		are using ext3 0.3b in production.  Note, the user-land
-+		interface for getting at this flag won't be documented, as
-+		the V1 superblock is deprecated.
-+
-+	* mkjournal.c (init_journal_superblock): Sync Stephen's changes
-+		which creates a V2 superblock instead of a V1 superblock.
-+
-+2000-11-21    <tytso@snap.thunk.org>
-+
-+	* test_io.c (test_write_blk, test_write_byte): Fix typos pointed
-+		out by Andreas Dilger.
-+
-+2000-11-05    <tytso@snap.thunk.org>
-+
-+	* imager.c (ext2fs_image_{inode,super,bitmap}_{read,write},
-+		ext2_fs.h, Makefile.in: New file that has routines that
-+		save ext2fs metadata to a file.
-+
-+	* ext2_err.et.in (EXT2_ET_MAGIC_E2IMAGE): New error code assigned.
-+
-+	* e2image.h: New file which defines the file format for the ext2
-+		image file.  (Saved copy of ext2 metadata to a file as a
-+		saving throw against worst-case damage.)
-+
-+2000-11-01    <tytso@snap.thunk.org>
-+
-+	* inode.c (ext2fs_flush_icache): Add new function
-+		ext2fs_flush_icache() which flushes the internal inode
-+		cache.  Applications which modify the inode table blocks
-+		directly must call this function.
-+
-+2000-10-26    <tytso@snap.thunk.org>
-+
-+	* mkjournal.c: Add #include of netinet/in.h, since Solaris
-+		requires it for ntohl().
-+
-+	* ext2_io.h (io_channel_write_byte): Add new interface to allow
-+		callers to write specific byte ranges.  This is an
-+		optional interface, which not all IO channels may
-+		implement.
-+
-+	* unix_io.c (unix_write_byte):
-+	* test_io.c (test_write_byte): Add implementation of the
-+		write_byte function.
-+
-+	* closefs.c (write_primary_superblock, ext2fs_flush): Add a new
-+		function which writes the primary superblock.  If the IO
-+		channel supports writing raw bytes directly, only fields
-+		which were modified are written to the disk.  This makes
-+		it safe(r) to use utilities like tune2fs on a mounted
-+		filesystem. 
-+
-+	* freefs.c (ext2fs_free): Free the original superblock if it is
-+		available. 
-+
-+	* openfs.c (ext2fs_open): Store a copy of the original superblock
-+		when opening it.
-+
-+	* ext2fs.h: Add a field to store the original superblock in the
-+		ext2 context structure.
-+
-+2000-10-24    <tytso@snap.thunk.org>
-+
-+	* llseek.c: Add #ifdef's for IA64 (it's a 64-bit platform, so we
-+		don't need to use llseek).
-+
-+2000-10-24    <tytso@valinux.com>
-+
-+	* Makefile.in, ext2fs.h, jfs_dat.h, mkjournal.c: Add functions for
-+		creating an ext3 journal on a filesystem.
-+
-+2000-08-21    <tytso@valinux.com>
-+
-+	* ext2_err.et.in (EXT2_JOURNAL_NOT_BLOCK): Add new error code.
-+
-+2000-08-22    <tytso@valinux.com>
-+
-+	* unix_io.c: Make massive changes to support a multiple block
-+		writethrough cacheing.
-+
-+	* ext2_io.h: Added flags field to the io_channel structure.
-+
-+2000-08-19    <tytso@valinux.com>
-+
-+	* finddev.c, ext2fs.h, Makefile.in: Add new file, finddev.c, which
-+		provides the function ext2fs_find_block_device().  This
-+		function returns the pathname to a block device, given its
-+		device number.
-+
-+2000-07-13    <tytso@valinux.com>
-+
-+	* Release of E2fsprogs 1.19
-+
-+2000-07-07  Theodore Ts'o  <tytso@valinux.com>
-+
-+	* ext2fs.h (EXT2_LIB_FEATURE_INCOMPAT_SUPP): Add
-+		EXT3_FEATURE_INCOMPAT_RECOVER (aka needs_recovery) to the
-+		list of filesystem flags supported by the library.
-+
-+2000-07-04  Theodore Ts'o  <tytso@valinux.com>
-+
-+	* ext2fs.h: Update to include latest journalling additions to the
-+		superblock.
-+
-+	* dll/jump.funcs: Add new jumptable entries for
-+		ext2fs_write_bb_FILE, ext2fs_read_bb_FILE2, and
-+		ext2fs_badblocks_equal.
-+
-+	* tst_badblocks.c: Update test program to test
-+		ext2fs_read_bb_FILE2 and ext2fs_write_FILE.
-+
-+	* write_bb_file.c (ext2fs_write_bb_FILE): New function which
-+		writes out bad blocks list to a file.
-+
-+	* read_bb_file.c (ext2fs_read_bb_FILE2): Add new function which
-+		changes the callback function to take two additional
-+		arguments; a private blind pointer supplied by the caller,
-+		and pointer to a char * containing a pointer to the
-+		invalid string.
-+
-+	* badblocks.c (ext2fs_badblocks_equal): Add new function which
-+		returns true if two badblocks list are equal.
-+
-+	* Makefile.in: Remove explicit link of -lc in the shared library.
-+		(It shouldn't be necessary, and is harmful in some cases).
-+
-+2000-06-10  Theodore Ts'o  <tytso@valinux.com>
-+
-+	* getsize.c (main): Add debugging code under #ifdef DEBUG
-+
-+2000-05-27  Theodore Ts'o  <tytso@valinux.com>
-+
-+	* mkdir.c (ext2fs_mkdir): Read the parent directory's inode
-+		earlier, so that if there's an error reading it, we can
-+		more cleanly back out of the operation.
-+
-+2000-05-25    <tytso@snap.thunk.org>
-+
-+	* getsize.c (ext2fs_get_device_size): Use open64() instead of
-+		open() if it exists.  Under linux, manually define the
-+		ioctl for BLKGETSIZE if it isn't already defined and it's
-+		safe to do so.
-+
-+	* unix_io.c (unix_open): Use open64() instead of open() if it
-+		exists. 
-+
-+	* llseek.c: Simplify header includes of unistd.h.  If lseek64 is
-+		available (and prototypes are defined) use it in
-+		preference to llseek.
-+
-+	* Makefile: Add hack dependency rule so that parallel makes work
-+		correctly. 
-+
-+2000-05-18  Theodore Ts'o  <tytso@valinux.com>
-+
-+	* ext2fs.h: Add appropriate ifdef's to support C++ compilation.
-+
-+2000-04-03  Theodore Ts'o  <tytso@valinux.com>
-+
-+	* block.c: Readibility tweak in conditionals involving
-+		ctx->fs->flags.
-+
-+	* ext2fs.h: Use AUTOCONF SIZEOF_* macros if available to determine
-+		how to define __s64 and __u64.  Turn off "compression is
-+		experimental" warning if the cpp macro
-+		I_KNOW_THAT_COMPRESSION_IS_EXPERIMENTAL is defined.
-+
-+2000-02-11    <tytso@snap.thunk.org>
-+
-+	* ext2fs.h: Define EXT2FS_COMPRESSED_BLKADDR and HOLE_BLKADDR.
-+		Conditionally include Compression as a supported type if
-+		ENABLE_COMPRESSION (via --enable-compression) is turned on.
-+
-+	* swapfs.c (ext2fs_swap_super): Swap the compression usage bitmap.
-+
-+2000-02-08    <tytso@snap.thunk.org>
-+
-+	* bitops.h (ext2fs_mark_generic_bitmap, ext2fs_unmark_generic_bitmap,
-+		ext2fs_mark_block_bitmap, ext2fs_unmark_block_bitmap,
-+		ext2fs_mark_inode_bitmap, ext2fs_unmark_inode_bitmap):
-+		Change to return the previous state of the bit that is
-+		being marked or unmarked.  For speed optimization.
-+	
-+2000-02-02  Theodore Ts'o  <tytso@valinux.com>
-+
-+	* getsize.c, ismounted.c: Remove unneeded include of linux/fs.h
-+
-+	* swapfs.c: Remove #ifdef HAVE_EXT2_INODE_VERSION since it's not
-+		needed any more; we know it will always be i_generation.
-+		Add support for swapping the high bits of the uid and gid.
-+
-+1999-11-19    <tytso@valinux.com>
-+
-+	* mkdir.c (ext2fs_mkdir): Only update the parent's inode link
-+		counts if the link was successful.  Patch suggested by
-+		jeremy@goop.org.
-+
-+	* Makefile.in (distclean): Remove TAGS and Makefile.in.old from
-+		the source directory.
-+
-+1999-11-10    <tytso@valinux.com>
-+
-+	* Release of E2fsprogs 1.18
-+
-+1999-11-08    <tytso@valinux.com>
-+
-+	* Makefile.in (tst_badblocks): Add freefs.o to the object list,
-+		since ext2fs_badblocks_list_free was moved to freefs.c.
-+
-+	* tst_badblocks.c: Use the newer badblocks API names.  Add
-+		duplicate blocks to the test inputs to test dealing with
-+		adding blocks which are already in the badblocks list.
-+
-+	* badblocks.c (ext2fs_badblocks_list_add): If appending to the end
-+		of the list, use a shortcut O(1) operations instead of an
-+		O(n) operation.  (Idea suggested by David Beattie.)
-+
-+	* freefs.c (ext2fs_free): Use ext2fs_badblocks_list_free() instead
-+		of badblocks_list_free(), to save a procedure call.
-+
-+1999-10-26    <tytso@valinux.com>
-+
-+	* Release of E2fsprogs 1.17
-+
-+1999-10-26    <tytso@valinux.com>
-+
-+	* ext2fs.h: Add kludge to deal with the fact that egcs cpp doesn't
-+		seem to handle ~0UL the same way as they used to.
-+
-+1999-10-25    <tytso@valinux.com>
-+
-+	* nt_io.c (_OpenNtName): Open the device using
-+		FILE_SYNCHRONOUS_IO_NONALERT instead of
-+		FILE_SYNCHRONOUS_IO_ALERT
-+		(nt_open): At the end of the device open routine, unlock 
-+		the drive but do not dismount it.
-+
-+	* initialize.c (CREATOR_OS): Use __GNU__ instead of __gnu__ to
-+		detect the Hurd OS.
-+
-+1999-10-22    <tytso@valinux.com>
-+
-+	* Release of E2fsprogs 1.16
-+
-+1999-10-22    <tytso@valinux.com>
-+
-+	* mkdir.c (ext2fs_mkdir): Pass EXT2_FT_DIR flag to ext2fs_link().
-+
-+	* link.c (ext2fs_link): This call now uses the low three bits of
-+		the flags parameter to pass the directory filetype
-+		information; it will set the directory entry FILETYPE
-+		information if the filesystem supports it.
-+
-+	* newdir.c (ext2fs_new_dir_block): If the FILETYPE superblock
-+		option is set, then create the '.' and '..' entries with
-+		the filetype set to EXT2_FT_DIR.
-+
-+1999-09-24    <tytso@valinux.com>
-+
-+	* nt_io.c: New file which supports I/O under Windows NT.
-+
-+1999-09-07    <tytso@valinux.com>
-+
-+	* ext2fs.h: Add new fields for journalling and define new
-+		feature bits used by newer filesystems: IMAGIC_INODES,
-+		HAS_JOURNAL, RECOVER.
-+
-+	* expanddir.c (ext2fs_expand_dir, expand_dir_proc): Change where
-+		we update the inode block count and size files so that the
-+		block count field is updated correctly when we create an
-+		indirect block.
-+
-+1999-07-18  Theodore Ts'o  <tytso@valinux.com>
-+
-+	* Release of E2fsprogs 1.15
-+
-+1999-06-23    <tytso@valinux.com>
-+
-+	* swapfs.c (ext2fs_swap_inode): Add compatibility for Linux 2.3
-+		kernels that use i_generation instead of i_version.  Patch
-+		supplied by Jon Bright <sircus@sircus.demon.co.uk>.
-+
-+1999-06-21    <tytso@valinux.com>
-+
-+	* dir_iterate.c (ext2fs_process_dir_block): Check for corrupted
-+		directory entry before calling the callback function.
-+		This should prevent some core dumps of insufficiently
-+		paranoid callback functions.
-+
-+1999-05-29    <tytso@rsts-11.mit.edu>
-+
-+	* ext2fs.h: Add feature definition for AFS IMAGIC inodes.
-+
-+	* fileio.c (ext2fs_file_open): Remove obsolete comment stating
-+		that we don't handle writing yet (we do).  Fixed bug where
-+		we weren't allocating a big enough buffer for ext2_bmap.
-+
-+1999-05-03    <tytso@rsts-11.mit.edu>
-+
-+	* openfs.c (ext2fs_open): Check to make sure that the number of
-+		blocks per group is not zero --- if so, it must be a bad
-+		superblock!
-+
-+1999-01-09  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* Release of E2fsprogs 1.14
-+
-+1999-01-07  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* inode.c (ext2fs_read_inode, ext2fs_write_inode): Check to see if
-+		the inode number is zero; if it's zero, return
-+		EXT2_ET_BAD_INODE_NUM.
-+
-+1998-12-30  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* initialize.c (ext2fs_initialize): Use EXT2_FIRST_INODE instead
-+		of EXT2_FIRST_INO to ensure compatibility with Linux 1.2
-+		header files.
-+
-+Mon Jan  4 02:32:09 1999  Theodore Y. Ts'o  <tytso@mit.edu>
-+
-+	* llseek.c (ext2fs_llseek): Change ext2fs_llseek() in the
-+ 		non-Linux case to use EINVAL by default, unless it isn't
-+ 		defined, in which case we use EXT2_ET_INVALID_ARGUMENT
-+ 		instead.
-+
-+1998-12-15  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* Release of E2fsprogs 1.13
-+
-+1998-12-03  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* Makefile.in: Updated dependencies.
-+
-+1998-09-22  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* initialize.c (ext2fs_initialize): Make sure that we allocate
-+		enough inodes so that we can make a valid filesystem.
-+
-+1998-09-02  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* rw_bitmaps.c: Fixed signed/unsigned warnings.
-+
-+	* fileio.c (ext2fs_file_set_size): Remove unneeded extern from the
-+		function declaration.
-+
-+	* dblist.c (make_dblist): Add safety check in case the dblist
-+		pointer passed in is null (in which case, assign it to
-+		fs->dblist).  Fixed some signed/unsigned warnings.
-+
-+	* bmap.c: Make addr_per_block be of type blk_t to avoid
-+		signed/unsigned warnings.
-+
-+	* namei.c (ext2fs_follow_link): Remove uneeded extern from the
-+		function declaration.
-+
-+	* get_pathname.c (get_pathname_proc): Use return value from
-+		ext2fs_get_mem, instead of checking if &gp->name is
-+		NULL.
-+
-+	* dir_iterate.c (ext2fs_process_dir_block): 
-+	* dblist_dir.c (ext2fs_dblist_dir_iterate): Remove uneeded extern
-+		from the function declaration.
-+
-+	* block.c (ext2fs_block_iterate2): If the read_inode call fails,
-+		return the error directly instead of jumping to the
-+		cleanup routine, since we don't need to do any cleanup.
-+
-+	* alloc_table.c (ext2fs_allocate_group_table): Make this
-+		function take a dgrp_t for its group argument.
-+
-+	* ext2fs.h: Make dgrp_t an __u32 type, and make
-+		fs->desc_group_count be of type dgrp_t.
-+
-+1998-07-27  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* badblocks.c (ext2fs_badblocks_list_add): Use a bigger increment
-+		than 10 blocks when we need to expand the size of the
-+		badblocks list.
-+
-+1998-07-09  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* Release of E2fsprogs 1.12
-+
-+1998-06-30  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* closefs.c (ext2fs_flush): Update the s_block_group_nr field as
-+		appropriate for all of the block group copies, so that
-+		it's clear where the beginning of the filesystem is on the
-+		disk.  (For when the partition table gets scrod.)
-+
-+	* ext2fs.h: Change the name of the feature from
-+		EXT2_FEATURE_INCOMPAT_DIRNAME_SIZE to
-+		EXT2_FEATURE_INCOMPAT_FILESIZE (to match with the kernel).
-+
-+1998-06-18  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* inode.c (get_next_blockgroup): Fix bug where if
-+		get_next_blockgroup() is called early because of a missing
-+		inode table in a block group, the current_inode counter
-+		wasn't incremented correctly.
-+
-+1998-06-16  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* read_bb.c (ext2fs_read_bb_inode): Make function more robust
-+		against a completely trashed bad block inode.
-+
-+1998-06-10  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* alloc_tables.c (ext2fs_allocate_group_table): Fix bug so that if
-+		the stride length hits a bad value, we retry the block
-+		allocation starting at the beginning of the block group.
-+
-+	* ext2fs.h, bb_inode.c, block.c, bmove.c, dir_iterate.c,
-+		expanddir.c, ext2fsP.h, read_bb.c: Change blkcnt_t to be
-+		e2_blkcnt_t to avoid collision with LFS API.
-+
-+1998-05-01  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* initialize.c (ext2fs_initialize): Initialize s_inodes_count in a
-+		way that avoids overflows on disk sizes greater than 4GB.
-+
-+1998-04-28  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* ext2fs.h: Define EXT2_QSORT_TYPE appropriately for the
-+		return type for comparison functions for qsort.
-+
-+	* dblist.c (dir_block_cmp): Use EXT2_QSORT_TYPE in function
-+		declaration.
-+
-+1998-04-26  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* ext2fs.h, bitops.h: Add support for the Watcom C compiler to do
-+		inline functions.
-+
-+	* ext2fs.h, dosio.c: Use asm/types.h instead of linux/types.h to
-+		evade a potential problem with glibc's header files trying
-+		to spike out linux/types.h.
-+
-+	* ext2fs.h (ext2fs_resize_mem): Change the function prototype to
-+		include the old size of the memory, which is needed for
-+		some braindamaged memory allocation systems that don't
-+		support realloc().
-+
-+	* badblocks.c (ext2fs_badblocks_list_add):
-+	  bb_inode.c (clear_bad_block_proc):
-+	  dblist.c (ext2fs_add_dir_block):
-+	  icount.c (insert_icount_el):
-+	  irel_ma.c (ima_put):
-+	  rs_bitmap.c (ext2fs_resize_generic_bitmap): Update functions to
-+		  pass the old size of the memory to be resized to
-+		  ext2fs_resize_mem(). 
-+
-+1998-03-30  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* Makefile.in: Change to use new installation directory variables
-+		convention.  Fix uninstall rules to take $(DESTDIR) into
-+		account.
-+
-+1998-03-29  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* ext2fs.h: If __STRICT_ANSI__ is defined and we're on a platform
-+		with 32 bit longs, then we need to manually define __s64
-+		and __u64, since the current kernel header files don't
-+		define these if __STRICT_ANSI__ is defined.  This is a
-+		problem if we are compiling with full GCC warnings, since
-+		we do need 64 bit support.
-+	
-+	* Makefile.in (OBJS): Remove bmove.o from files to be built,
-+		since we're not using ext2fs_move_blocks() and there
-+		is some question as to its usefulness in its current
-+		form.
-+
-+	* bmap.c (block_bmap): Remove unused function.
-+
-+	* bmove.c (process_block): Fix -Wall warning.
-+
-+1998-03-23  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* block.c (ext2fs_block_iterate3): Make the ref_offset field
-+		contain the offset into the inode.i_blocks array when
-+		ref_block is zero.  Since we haven't done a formal
-+		release of e2fsprogs since block_iterate2 was first
-+		introduced, I removed block_iterate2, and renamed
-+		block_iterate3 to be block_iterate2.
-+
-+	* bb_inode.c, bmove.c, dblist_dir.c, dir_iterate.c,
-+		expanddir.c, ext2fs.h, ext2fsP.h, read_bb.c: Change
-+		use of block_iterate and block_iterate2 to
-+		block_iterate2 with the new prototype for the
-+		interator function.  (using blkcnt_t forr blockcount)
-+
-+1998-03-21  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* ext2fs.h: Add new superblock fields (s_algorithm_usage_bitmap, 
-+		s_prealloc_blocks, s_prealloc_dir_blocks).  Added
-+		conditional defines of new features COMPAT_DIR_PREALLOC,
-+		RO_COMPAT_LARGE_FILE RO_COMPAT_BTREE_DIR,
-+		INCOMPAT_COMPRESSION, INCOMPAT_DIRNAME_SIZE.  Changed
-+		the library to declare that we support COMPAT_DIR_PREALLOC, 
-+		INCOMPAT_DIRNAME_SIZE, RO_COMPAT_LARGE_FILE.
-+
-+	* fileio.c: Rename function ext2fs_file_llseek to be
-+		ext2fs_file_lseek, which is more accurate.
-+
-+	* block.c: Add new function ext2fs_block_iterate3 which calls
-+		the iterator function with the blockcount argument of
-+		type blkcnt_t.  This version of the function is
-+		allowed to handle large files; the other fucntions are
-+		not.
-+
-+	* ext2fs.h: Add new type blkcnt_t
-+
-+	* ext2_err.et.in: Add error code EXT2_ET_FILE_TOO_BIG
-+
-+	* block.c (ext2fs_block_iterate2): Fix bug where the block count
-+		field wasn't getting correctly incremented for sparse
-+		files when the indirect or doubly-indirect block
-+		specified in the inode was zero.
-+
-+Sun Mar  8 22:42:47 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* unlink.c (unlink_proc): 
-+	* lookup.c (lookup_proc): 
-+	* link.c (link_proc): 
-+	* get_pathname.c (get_pathname_proc): 
-+	* dir_iterate.c (ext2fs_process_dir_block): Mask off high 8 bits
-+		from dirent->name_len, so it can be used for other
-+		purposes.
-+
-+	* ext2fs.h: Add definition of EXT2_FEATURE_INCOMPAT_DIRNAME_SIZE,
-+		and indicate that we have support for this incompatible
-+		option.
-+
-+Mon Feb 23 08:46:33 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* ext2_err.et.in: Added new error code, EXT2_ET_CANCEL_REQUESTED.
-+
-+Fri Feb 20 23:58:01 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* dblist.c (ext2fs_get_num_dirs): Improve the estimation of the
-+ 		number of directories when the block group information is
-+ 		unreliable.
-+
-+1998-02-20  Theodore Y. Ts'o  <tytso@edt.mit.edu>
-+
-+	* inode.c (ext2fs_get_next_inode): Always do the check to see if the
-+		inode table is missing so that we catch the case where the
-+		first block group is missing.
-+
-+	* getsize.c, ismounted.c, unix_io.c: #include errno.h since it's
-+		needed.
-+
-+Mon Feb 16 16:16:00 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* ext2_io.h, ext2fs.h: Protect against being included multiple times.
-+
-+	* bmove.c: #include ext2fsP.h instead of "ext2fs/ext2fs.h"
-+
-+	* test_io.c (test_flush): Add a debugging printf when the flush
-+		method is called.
-+
-+	* rw_bitmaps.c (ext2fs_read_bitmaps): If the bitmaps are already
-+		read in, return right away.
-+
-+Sun Feb  1 08:20:24 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* bitops.h: Don't try to do i386 inline asm functions if the
-+ 		compiler isn't GCC.
-+
-+	* ext2fs.h: If EXT2_FLAT_INCLUDES is defined, #include e2_types.h,
-+ 		instead of linux/types.h, and e2_bitops.h instead of
-+ 		ext2fs/bitops.h.
-+
-+	* icount.c, version.c: Don't #include <et/com_err.h>, as it isn't
-+		necessary. 
-+
-+Sat Jan 17 13:13:31 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* inode.c (ext2fs_open_inode_scan): Initialize the group variables
-+		so that we don't need to call get_next_blockgroup() the
-+		first time around.  Saves a bit of time, and prevents us
-+		from needing to assign -1 to current_group (which is an
-+		unsigned value).
-+
-+	* icount.c (insert_icount_el): Cast the estimated number of inodes
-+		from a float to an ino_t.
-+
-+	* alloc.c, alloc_tables.c, badlbocks.c, bb_compat.c, bb_inode.c,
-+ 		bitmaps.c, bitops.c, block.c, bmap.c, bmove.c, brel_ma.c,
-+ 		check_desc.c, closefs.c, cmp_bitmaps.c, dblist.c,
-+ 		dblist_dir.c, dir_iterate.c, dirblock.c, dupfs.c,
-+		expanddir.c, ext2fs.h, fileio.c, freefs.c,
-+		get_pathname.c, getsize.c, icount.c, initialize.c,
-+		inline.c, inode.c, irel_ma.c, ismounted.c, link.c,
-+		lookup.c, mkdir.c, namei.c, native.c, newdir.c,
-+		openfs.c, read_bb.c, read_bb_file.c, rs_bitmap.c,
-+		rw_bitmaps.c, swapfs.c, test_io.c, tst_badblocks.c,
-+		tst_getsize.c, tst_iscan.c, unix_io.c, unlink.c,
-+		valid_blk.c, version.c: If EXT2_FLAT_INCLUDES is
-+		defined, then assume all of the
-+ 		ext2-specific header files are in a flat directory.
-+
-+	* block.c, bmove.c, dirblock.c, fileio.c: Explicitly cast
-+		all assignments from void * to be compatible with C++.
-+
-+Tue Jan  6 11:28:15 1998  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* closefs.c (ext2fs_flush): Add a call to io_channel_flush() to
-+		make sure the contents of the disk are flushed to disk.
-+
-+Mon Dec 29 14:39:13 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* dblist.c (ext2fs_add_dir_block): Change new to be new_entry to
-+		avoid C++ namespace clash.
-+
-+	* bitmaps.c (ext2fs_copy_bitmap): Change new to be new_map to
-+		avoid C++ namespace clash.
-+
-+	* ext2fs.h, bb_inode.c, block.c, bmove.c, brel.h, brel_ma.c,
-+ 	 	irel.h, irel_ma.c, dblist.c, dblist_dir.c, dir_iterate.c,
-+ 	 	ext2fsP.h, expanddir.c, get_pathname.c, inode.c, link.c,
-+ 	 	unlink.c: Change private to be priv_data (to avoid C++
-+ 	 	namespace clash)
-+
-+Fri Nov 28 09:26:31 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* dblist.c (ext2fs_get_num_dirs): Make ext2fs_get_num_dirs more
-+		paranoid about validating the directory counts from the
-+		block group information.
-+
-+	* all files: Don't include stdlib.h anymore; include it in
-+		ext2_fs.h, since that file requires stdlib.h
-+
-+Thu Nov 20 16:07:38 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* expanddir.c (ext2fs_expand_dir): Check to make sure the block
-+		bitmap is loaded, and return an error if it is not.
-+		(expand_dir_proc): Only use ext2fs_write_dir_block when
-+		writing a directory block, not when writing out a fresh
-+		indirect block.
-+
-+Tue Nov 11 22:46:45 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* Makefile.in, tst_getsize.c: Added new file which is used to test
-+		the ext2fs_get_device_size function.
-+
-+	* ext2_err.et.in (EXT2_ET_UNIMPLEMENTED): Added new error code.
-+
-+Sun Nov  2 20:36:13 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* ext2fs.h: Make ext2fs_get_mem take an unsigned argument.
-+
-+	* fileio.c (ext2fs_file_get_size, ext2fs_file_set_size,
-+		ext2fs_file_get_fs): New functions added.
-+
-+
-+Fri Oct 31 12:16:52 1997    <tytso@EDT.MIT.EDU>
-+
-+	* bitops.c (ext2fs_warn_bitmap, ext2fs_warn_bitmap2): Don't call
-+	 	com_err if OMIT_COM_ERR is defined.
-+
-+Thu Oct 30 11:33:57 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* Rename new error codes to _ET_ in them for consistency.
-+
-+Sat Oct 25 00:06:58 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* [all files, basically]: Added definition of ext2fs_get_mem, 
-+		ext2fs_free_mem, and ext2fs_resize_mem in ext2fs.h, and
-+		changed all library routines to use these wrapper functions.
-+
-+	* dblist.c, mkdir.c: use EXT2_DIR_EXISTS and EXT2_DB_NOT_FOUND
-+		instead of the system error messages.
-+	
-+	* ext2_err.et.in: Added new error messages EXT2_DIR_EXISTS and
-+	 	EXT2_DB_NOT_FOUND
-+
-+	* ext2fs.h: Added function declarations and constants for bmap.c
-+	 	and fileio.c.
-+
-+	* ext2_err.et.in: Added new error messages EXT2_FILE_RO and
-+	 	EXT2_ET_MAGIC_EXT2_FILE
-+
-+	* Makefile.in: Added files bmap.c and fileio.c, and temporarily
-+		commented out brel_ma.c and irel_ma.c
-+
-+	* bmap.c: New file which maps a file's logical block number to its
-+		physical block number.
-+
-+	* fileio.c: New file which implements simple file reading and
-+		writing primitives.
-+
-+	* alloc.c (ext2fs_alloc_block): New function which allocates a
-+ 		block, zeros it, and updates the filesystem accounting
-+ 		records appropriately.
-+
-+Wed Oct 22 16:47:27 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* ext2_err.et.in: Added new error codes: EXT2_NO_MEMORY,
-+		EXT2_INVALID_ARGUMENT, EXT2_BLOCK_ALLOC_FAIL,
-+		EXT2_INODE_ALLOC_FAIL, EXT2_NOT_DIRECTORY
-+
-+	* Change various library files to use these functions instead of
-+		EINVAL, ENOENT, etc.
-+
-+Mon Oct 20 19:32:40 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* llseek.c: Check HAVE_LLSEEK_PROTOTYPE to see whether or not we
-+		need to declare llseek().
-+
-+Sun Oct 19 18:56:22 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* Rename io.h to be ext2_io.h (avoid namespace collisions)
-+
-+	* Add #ifdef's for HAVE_SYS_STAT_H and HAVE_SYS_TYPES_H
-+
-+Fri Oct  3 13:35:59 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* llseek.c (ext2fs_llseek): Fix type error for ext2fs_llseek()
-+
-+	* icount.c (ext2fs_icount_validate): 
-+	* bmove.c (process_block): Fix lint error in type for fprintf().
-+
-+Mon Sep 15 11:45:09 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* inode.c (ext2fs_check_directory): Add support for the callback
-+		to return the error code EXT2_ET_CALLBACK_NOTHANDLED.
-+
-+Thu Sep  4 12:28:22 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* bitmaps.c (ext2fs_set_bitmap_padding): New function which sets the
-+		padding of the bitmap to be all one's.
-+
-+Wed Sep  3 14:27:30 1997  Theodore Y. Ts'o  <tytso@edt.mit.edu>
-+
-+	* llseek.c: Added missing semicolon to glibc fixup declaration of
-+ 	llseek().
-+
-+	* bmove.c: Add #include of errno.h
-+
-+Sat Aug 23 22:47:46 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* Makefile.in (ELF_SO_VERSION): Bump version to be 2.4 since we've
-+		added a new field to the io_channel (app_data).
-+
-+	* io.h: Add a new element to the io_channel structure, app_data.
-+
-+	* initialize.c, openfs.c: Set io->app_data to point at the
-+	 	filesystem handle.
-+
-+Thu Aug 14 08:14:17 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* io.h: Change the prototype of ext2fs_llseek() to use int's
-+		instead of unsigned int's.
-+
-+	* llseek.c: Change to allow PIC and !HAVE_LLSEEK.  Add a prototype
-+		to make life easer for GNU Libc 2.
-+
-+	* rw_bitmaps.c: On the PowerPC, the big-endian variant of the ext2
-+ 		filesystem has its bitmaps stored as 32-bit words with bit
-+ 		0 as the LSB of each word.  Thus a bitmap with only bit 0
-+ 		set would be, as a string of bytes, 00 00 00 01 00 ...  To
-+ 		cope with this, we byte-reverse each word of a bitmap if
-+ 		we have a big-endian filesystem, that is, if we are *not*
-+ 		byte-swapping other word-sized numbers.
-+
-+Mon Aug 11 03:30:48 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* dosio.c: New file to do DOS/BIOS disk accesses.
-+
-+	* namei.c (open_namei): Make pathlen be of type size_t.
-+
-+	* llseek.c: Always #include stdlib.h since it's need to define
-+		size_t.  
-+
-+	* io.h: Use errcode_t for magic numbers.
-+
-+	* icount.c (get_icount_el): Use size_t where appropriate
-+	
-+	* dupfs.c (ext2fs_dup_handle): 
-+	* dblist.c (dir_block_cmp): Use size_t where appropriate.
-+
-+	* read_bb.c (ext2fs_read_bb_inode): 
-+	* cmp_bitmaps.c (ext2fs_compare_inode_bitmap): Use blk_t, ino_t
-+		and size_t where appropriate.
-+
-+	* closefs.c (ext2fs_flush): Use dgrp_t instead of int where
-+		appropriate.
-+
-+	* openfs.c (ext2fs_open): 
-+	* check_desc.c (ext2fs_check_desc): Use blk_t instead of int where
-+		appropriate.
-+
-+	* rw_bitmaps.c (read_bitmaps): 
-+	* irel_ma.c: 
-+	* inode.c (ext2fs_write_inode): 
-+	* initialize.c (ext2fs_initialize):
-+	* brel_ma.c: Fix to make be 16-bit safe.
-+
-+	* link.c (ext2fs_link): 
-+	* unlink.c (ext2fs_unlink):
-+	* lookup.c (lookup_proc): 
-+	* ismounted.c (ext2fs_check_if_mounted): 
-+	* block.c (xlate_func): Add #pragma argsused for Turbo C.
-+
-+Sun Aug 10 10:05:22 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* block.c (ext2fs_block_iterate2): Use retval which is a errcode_t
-+		type.
-+
-+	* bitmaps.c (make_bitmap): Use size_t instead of int where
-+		appropriate.
-+
-+	* bb_inode.c (set_bad_block_proc): Add #pragma argsused for Turbo C.
-+
-+	* alloc.c (ext2fs_new_inode): Use ino_t instead of int for the
-+		group number.
-+
-+	* get_pathname.c: Use ino_t instead of int where appropriate.
-+
-+	* ext2fs.h: Make the magic structure element be errcode_t instead
-+		of int.
-+
-+	* alloc.c alloc_tables.c badblocks.c bb_compat.c bb_inode.c
-+ 	 	bitmaps.c block.c bmove.c brel_ma.c check_desc.c closefs.c
-+ 	 	cmp_bitmaps.c dblist.c dblist_dir.c dir_iterate.c
-+ 	 	dirblock.c dupfs.c expanddir.c freefs.c get_pathname.c
-+ 	 	icount.c initialize.c inline.c inode.c irel_ma.c link.c
-+ 	 	llseek.c lookup.c mkdir.c namei.c newdir.c read_bb.c
-+ 	 	read_bb_file.c rs_bitmap.c rw_bitmaps.c swapfs.c 
-+ 	 	test_io.c tst_badblocks.c tst_iscan.c unix_io.c unlink.c
-+ 	 	valid_blk.c version.c: Add an #ifdef for HAVE_UNISTD_H
-+
-+Tue Jun 17 01:33:20 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* unix_io.c (unix_read_blk): If ext2fs_llseek() fails, but errno
-+		is zero, then return EXT2_IO_LLSEEK_FAILED.
-+
-+	* ext2_err.et.in: Add a new error code, EXT2_IO_LLSEEK_FAILED.
-+
-+	* Release of E2fsprogs 1.11
-+
-+Mon Jun 16 23:53:06 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* dblist.c (ext2fs_dblist_count): Added new function which returns
-+		the number of directory blocks in dblist.
-+
-+Sat Jun 14 01:39:13 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* unix_io.c (unix_flush): Make the io_channel flush function do a
-+		fsync to flush the kernel buffers to disk.
-+
-+Wed Jun 11 18:25:31 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* inode.c (ext2fs_inode_scan_goto_blockgroup): Fix bug; the
-+		current inode number wasn't being set by the
-+		goto_blockgroup function.
-+
-+Mon Jun  9 10:45:48 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* bmove.c (ext2fs_move_blocks): New function which takes a bitmap
-+		of blocks which need to be moved, and moves those blocks
-+		to another location in the filesystem.
-+
-+	* rs_bitmap.c (ext2fs_resize_generic_bitmap): When expanding a
-+		bitmap, make sure all of the new parts of the bitmap are
-+		zero. 
-+
-+Sun Jun  8 16:24:39 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* bitmaps.c (ext2fs_copy_bitmap): Fix bug; the destination bitmap
-+		wasn't being returned to the caller.
-+
-+	* alloc_tables.c (ext2fs_allocate_group_table): Add new function
-+		ext2fs_allocate_group_table() which sets the group tables
-+		for a particular block group.  The relevant code was
-+		factored out of ext2fs_allocate_tables().
-+
-+	* dblist.c (make_dblist): Adjust the initial size of the directory
-+ 		block list to be a bit more realistic (ten plus twice the
-+ 		number of directories in the filesystem).
-+
-+Thu May  8 22:19:09 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* badblocks.c (ext2fs_badblocks_list_test): Fix bug where
-+ 		ext2fs_badblocks_list_test would test the list (and exceed
-+ 		array boundaries) if there were no bad blocks on the bad
-+ 		blocks list.  (Showed up when user tried: mke2fs -c -b 4096).
-+
-+Thu Apr 24 12:16:42 1997  Theodre Ts'o  <tytso@localhost.mit.edu>
-+
-+	* Release of E2fsprogs version 1.10
-+
-+Thu Apr 24 10:13:42 1997  Theodre Ts'o  <tytso@localhost.mit.edu>
-+
-+	* alloc_tables.c (ext2fs_allocate_tables): Correctly place the
-+		inode and block bitmaps based on the RAID 0 stride
-+		parameter (which is passed by mke2fs).
-+
-+	* ext2fs.h: Add "stride" parameter to ext2_filsys, to be used by
-+ 		mke2fs to communicate the stride length to
-+ 		ext2fs_allocate_tables()
-+
-+Wed Apr 23 21:50:42 1997  Theodre Ts'o  <tytso@localhost.mit.edu>
-+
-+	* initialize.c (ext2fs_initialize): Fix to compile under Linux 1.2
-+		systems.  (We can't assume that the new filesystem types
-+		are supported.)
-+
-+Wed Apr 23 18:40:53 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* alloc_tables.c (ext2fs_allocate_tables): Make sure that we
-+		allocate the inode and block bitmaps inside block group at
-+		all times.
-+
-+Mon Apr 21 00:06:28 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* alloc.c (ext2fs_new_block): Fix bug where if goal==0 and the
-+		filesystem has no free blocks, ext2fs_new_block would loop
-+		forever.
-+
-+	* dupfs.c (ext2fs_dup_handle): Duplicate an ext2 filesystem handle
-+
-+	* freefs.c (ext2fs_free_inode_cache): Decrement refcount and only
-+		free if refcount goes to zero.
-+
-+	* inode.c (create_icache): Initialize refcount to 1.
-+
-+	* ext2fsP.h: Added refcount to ext2_inode_cache
-+
-+	* dblist.c (ext2fs_copy_dblist): New function to copy a directory
-+		block list.
-+
-+	* badblocks.c (ext2fs_badblocks_copy): New function to copy a
-+		badblocks structure.
-+
-+Sun Apr 20 23:19:51 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* bitmaps.c (ext2fs_copy_bitmap): New function to copy a bitmap.
-+
-+	* unix_io.c, test_io.c (unix_open, test_open): Initialize the
-+ 	 	refcount to 1.
-+		(unix_close, test_close): Decrement the refcount and only
-+ 		close the io_channel if the refcount goes to 0.
-+
-+	* io.h: Add refcount to the io_channel structure.  Add new macro
-+		interface io_channel_bumpcount() to bump the refcount.
-+
-+Thu Apr 17 20:25:03 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* inode.c (ext2fs_read_inode, ext2fs_write_inode): Use the inode
-+		cache in the filesystem handle, instead of the inode cache
-+		in a static variable.
-+
-+	* freefs.c: Added static function to free the inode cache (called by
-+		ext2fs_free). 
-+
-+	* ext2fsP.h: Added definition of the ext2_inode_cache structures.
-+
-+	* ext2fs.h: Added pointer to the inode_cache structure.
-+
-+	* block.c (block_iterate_ind, block_iterate_dind, 
-+		block_iterate_tind): If there are holes in the indirect,
-+		doubly indirect, or triply indirect blocks, increment the
-+		block count field automatically.
-+
-+Thu Apr 17 12:23:38 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* Release of E2fsprogs version 1.09
-+
-+Mon Apr 14 20:38:56 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* version.c (ext2fs_parse_version_string): Check the passed in
-+		version string (instead of the hard-coded one).
-+
-+	* alloc_tables.c (ext2fs_allocate_tables): If the last block is
-+		greater filesystem size, clamp it to prevent allocating a
-+		block or inode bitmap beyond the filesystem.
-+
-+	* initialize.c (ext2fs_initialize): Fix bug where the metatdata
-+	 	overhead calculation was accidentally removed.
-+
-+Fri Apr 11 18:56:26 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* Release of E2fsprogs version 1.08
-+
-+Thu Apr 10 13:15:15 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* dblist.c (ext2fs_set_dir_block): New function which sets the
-+ 		block of a dblist entry, given the directory inode and
-+ 		blockcnt.
-+
-+Sat Apr  5 12:42:42 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* alloc_tables.c (ext2fs_allocate_tables): Allocate the bitmap and
-+		inode bitmaps at staggered locations across the block
-+		groups, to avoid concentrating the bitmaps on a small
-+		number of disks when using striped RAID arrays.
-+
-+	* initialize.c (ext2fs_initialize): By default, choose the maximum
-+		possible number of blocks per group (based on the size of
-+		the bitmaps in the blocksize).
-+
-+Fri Apr  4 11:28:16 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* initialize.c (ext2fs_initialize): Add support for
-+		EXT2_COMPAT_SPARSE_SUPER feature.
-+
-+	* closefs.c (ext2fs_bg_has_super): New function to determine
-+		whether or a particular block group should have a
-+		superblock and block group descriptor.  Used for the
-+		EXT2_COMPAT_SPARSE_SUPER feature is turned on.
-+		(ext2fs_flush):  Check ext2fs_bg_has_super to see whether
-+		or not the superblock should be written out for the block
-+		group. 
-+
-+	* ext2fs.h (EXT2_COMPAT_SPARSE_SUPER): Define compatibility flag
-+		for sparse duplicate superblocks.
-+
-+	* version.c (ext2fs_get_library_version): New function which
-+		returns the library version.
-+
-+	* version.c (ext2fs_parse_version_string): New function which
-+		parses a version string and returns a version number,
-+		so application programs can compare version numbers as
-+		integers.
-+
-+Wed Mar 26 00:43:52 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* icount.c (ext2fs_create_icount): Change function so that it also
-+		takes a new argument which contains a "hint" icount
-+		structure.  This "hint" icount allows the create function
-+		to set up the sorted list in advance.  This reduces
-+		significantly the amount of data moving needed to insert
-+		these inodes into the list later.
-+	
-+	* icount.c (ext2fs_icount_validate): New function which validates
-+		that the icount structure's rep invariant.
-+
-+	* icount.c (get_icount_el): Completely revamped implementation
-+		to subsume put_icount_el().  Put_icount_el() used to
-+		use an O(N) implementation to insert in the middle
-+		of the icount list.  It now uses a O(ln N) to search
-+		for where the icount should be inserted, and then uses
-+		a memcpy to move the list down (instead of a for loop).
-+	
-+	* icount.c (ext2fs_icount_fetch, ext2fs_icount_store,
-+ 		ext2fs_icount_increment, ext2fs_icount_decrement): Check
-+ 		to see if the inode is within bounds; if it isn't, return
-+ 		EINVAL.
-+
-+	* bitops.h (ext2fs_test_generic_bitmap): Fix error message given
-+ 		when a bad inode number is passed to test_generic_bitmap
-+ 		to be EXT2FS_TEST_ERROR instead of the wrong
-+ 		EXT2FS_UNMARK_ERROR.
-+
-+Wed Mar 12 13:32:05 1997  Theodore Y. Ts'o  <tytso@mit.edu>
-+
-+	* Release of E2fsprogs version 1.07
-+
-+Sun Mar  2 16:46:18 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* Makefile.in (ELF_VERSION): Change version to be 2.2
-+
-+Tue Feb 11 14:54:02 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* alloc.c (ext2fs_get_free_blocks): Change routine to use
-+	 	ext2fs_fast_test_block_bitmap_range().
-+
-+	* bitops.h (ext2fs_fast_test_block_bitmap_range,
-+ 		ext2fs_test_block_bitmap_range: New inline functions which
-+ 		test to see whether a contiguous range of blocks is
-+ 		available.
-+
-+Thu Feb  6 10:00:13 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* badblocks.c (ext2fs_badblocks_list_create): Rename sybmols to use
-+ 		use ext2fs_badblocks_* instead of badblocks_*
-+
-+	* bb_compat.c: New file which translates between old badblocks_*()
-+		names to ext2fs_badblocks_*()
-+
-+	* unlink.c (ext2fs_unlink): New file, moved ext2fs_unlink() from
-+	 	link.c (since e2fsck doesn't use ext2fs_unlink()).
-+
-+	* rs_bitmap.c (ext2fs_resize_generic_bitmap): New file, contains
-+ 		bitmap resizing routine moved from bitmaps.c, since e2fsck
-+ 		doesn't need to use this function.
-+
-+	* lookup.c (ext2fs_lookup): Moved ext2fs_lookup to its own file,
-+		since e2fsck only needs ext2fs_lookup.
-+
-+Mon Feb  3 10:11:40 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* inode.c (ext2fs_open_inode_scan): Set fs->badblocks if it is not
-+		already set; this is needed so that programs like dump
-+		which use the inode scan functions will deal with
-+		filesystems that have bad blocks in the inode table.
-+
-+Sun Feb  2 00:17:36 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* ext2fs.h (struct_badblocks_list, struct_badblocks_iterate): 
-+		Moved to ext2fsP.h, since it doesn't need to be part of
-+		the public interface.
-+
-+	* dir_iterate.c: Move ext2_dir_iterate out of namei.c.
-+
-+Sat Feb  1 10:14:55 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* dblist.c (ext2fs_get_num_dirs): New file, which implements a
-+ 		directory block list abstraction.  (Code moved from
-+ 		e2fsck).
-+
-+	* ext2fs.h, inode.c: Moved definition of ext2_struct_inode_scan to
-+		to inode.c (since no one else should be peeking inside it!)
-+
-+	* valid_blk.c (ext2_inode_has_valid_blocks): New function.
-+
-+	* openfs.c (ext2fs_open): Check the feature set in the ext2
-+		superblock, and refuse to open filesystems if they contain
-+		incompatible features.  (Can be overriden with the
-+		EXT2_FLAG_FORCE 
-+
-+Sun Jan 12 11:31:46 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* block.c (ext2fs_block_iterate2): Added new function
-+	 	ext2fs_block_iterate2 which changes the function
-+	 	signature of the callback function to include the
-+	 	referencing block and offset.
-+
-+	* inode.c (ext2fs_inode_scan_goto_blockgroup): Added new function
-+	 	ext2fs_inode_scan_goto_blockgroup which allows an
-+	 	application to jump to a particular block group while
-+	 	doing an inode scan.
-+
-+Wed Jan  1 23:50:12 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* dirblock.c: Include string.h, since we use memcpy().
-+
-+Tue Dec  3 12:27:29 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* getsize.c (ext2fs_get_device_size): The ioctl BLKGETSIZE returns
-+		a long not an int; this doesn't matter on i386 machines,
-+		but it does on Alpha's.
-+	
-+Fri Nov 29 20:57:37 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* inode.c (ext2fs_write_inode, ext2fs_read_inode): If the inode
-+ 		table pointer is NULL, then return an error indicating
-+ 		that the inode table is missing.
-+		(get_next_blockgroup, get_next_blocks,
-+ 		ext2fs_get_next_inode): Don't treat a missing inode table
-+ 		as permanent error.  Return MISSING_INODE_TABLE, but as an
-+ 		advisory error code, much like BAD_BLOCK_IN_INODE_TABLE.
-+
-+	* rw_bitmaps.c (ext2fs_write_block_bitmap,
-+ 	 	ext2fs_write_inode_bitmap): If the inode or block bitmap
-+ 	 	block is zero, then don't write out the inode or block
-+ 	 	bitmap.  The idea here is to avoid stomping on the
-+ 	 	superblock.
-+		(read_bitmaps): If the inode or block bitmap block is
-+	 	zero, then fill in that portion of the inode or block
-+	 	bitmap with all zeros.
-+
-+	* inode.c (ext2fs_get_next_inode): Fix bug in handling of bad
-+ 		blocks in inode table when the inode table size is
-+ 		non-standard (and can therefore span blocks).
-+
-+Tue Oct 29 20:13:14 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* alloc.c (ext2fs_new_block): Fix fencepost error in
-+		ext2fs_new_block; make sure we don't try to allocate the
-+		first block beyond the end of the filesystem.
-+
-+Mon Oct 14 11:00:48 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* inode.c (check_for_inode_bad_blocks): New function called by
-+		get_next_blocks() to avoid reading in bad blocks marked in
-+		fs->badblocks.  Inodes located in bad blocks are returned
-+		by ext2fs_get_next_inode() returns the error code 
-+		EXT2_ET_BAD_BLOCK_IN_INODE_TABLE.
-+	
-+	* alloc_tables.c (ext2fs_allocate_tables): New function which
-+		performs the part of mke2fs's job of allocating the 
-+		filesystem tables.
-+
-+	* test_io.c (test_close): IO manager which is used for testing
-+	 	purposes.
-+
-+Sun Oct 13 04:31:57 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* inode.c (ext2fs_get_next_inode): Separate out the function of
-+ 		setting up for a new block group to get_next_blockgroup().
-+		Separate out the function of reading in blocks of the
-+		inode table to get_next_blocks().
-+
-+	* ext2fs.h: Add the badblocks list to the ext2_filsys entry
-+
-+	* badblocks.c (badblocks_list_add, badblocks_list_test): Add
-+ 		blocks to the badblock list in sorted order.  This allows
-+ 		badblocks_list_test to be coded using a binary search for
-+ 		speed.
-+
-+Tue Oct  8 02:02:03 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* Release of E2fsprogs version 1.06
-+
-+Mon Oct  7 00:44:17 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* ext2fs.h, block.c, closefs.c, dirblock.c, inode.c, native.c,
-+	 	open.c: Change EXT2_SWAP to EXT2_FLAG_SWAP for
-+	 	consistency's sake.
-+	
-+	* closefs.c (ext2fs_flush): If the flag EXT2_MASTER_SB_ONLY is
-+		set, then only write out the master superblock.
-+
-+Sun Oct  6 21:45:26 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* block.c (ext2fs_block_iterate): Fixed bug which caused
-+ 		block_iterate to fail to handle HURD created filesystems;
-+ 		it tested the inode translator field before the inode was
-+ 		loaded.
-+
-+Tue Sep 17 14:08:24 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* initialize.c (ext2fs_initialize): Make sure the description for
-+		the inode bitmap is set correctly.
-+
-+	* bitmaps.c (ext2fs_allocate_generic_bitmap): Fix minor type typo.
-+
-+Thu Sep 12 15:23:07 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* Release of E2fsprogs version 1.05
-+
-+Sat Sep  7 07:36:03 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* initialize.c: Override the kernel's idea of default
-+		checkinterval from 0 (never) to 180 days.
-+
-+Wed Aug 28 03:20:03 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* namei.c (ext2fs_namei_follow): New function which follows
-+		symbolic link (if any) at the target.
-+
-+Tue Aug 27 01:48:43 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* inode.c (ext2fs_read_inode, ext2fs_write_inode): Add support
-+		for shortcut function fs->read_inode() and fs->write_inode().
-+		Added inode_cache to reduce CPU time spent in doing
-+		byte swapping.
-+
-+	* swapfs.c (ext2fs_swap_super): Swap the new fields in a V2
-+	 	superblock.
-+
-+	* namei.c (ext2fs_follow_link): New function.
-+		(ext2fs_namei): Extended to have support for chasing
-+ 		symbolic links.  ext2fs_namei() still returns an inode
-+ 		which is a symbolic link.  Symbolic links are only chased
-+ 		while resolving the containing directory.  To chase
-+ 		symbolic links of the final result, use
-+ 		ext2fs_follow_link().
-+
-+Mon Aug 26 23:46:07 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* ext2_err.et.in: Added new error code EXT2_ET_SYMLINK_LOOP.
-+
-+	* bitops.h (ext2fs_set_bit, ext2fs_celar_bit): Use asm inlines
-+		provided by Pete A. Zaitcev (zaitcev@lab.sun.mcst.ru).
-+
-+Thu Aug 22 00:40:18 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* initialize.c (ext2fs_initialize): On systems where the byte
-+		order is not i386 compatible, set the swap_byte flag.
-+
-+	* inode.c (inocpy_with_swap): Check to see if inode contains a
-+		fast symlink before swapping the inode block fields.  This
-+		required adding a new argument to inocpy_with_swap to
-+		determine whether the mode field is in host order or not.
-+
-+Wed Aug 21 00:45:42 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* bitops.h (ext2fs_set_bit, ext2fs_clear_bit, ext2fs_test_bit): On
-+		the sparc, if EXT2_STD_BITOPS set, use the standard
-+		i386-compatible bitmask operations, instead on the
-+		non-standard native bitmask operators.
-+
-+Fri Aug  9 11:11:35 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* block.c (ext2fs_block_iterate): Cause block iterator to return
-+		the HURD translator block (along with everything else).
-+		If the flag BLOCK_FLAG_DATA_ONLY is passed to the block
-+		iterator, then don't return any meta data blocks
-+		(including the HURD translator).
-+
-+Wed Jul 17 17:13:34 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* gen_uuid.c: New file, which generates DCE-compatible UUIDs.
-+
-+	* uuid.c: New file, containing UUID utility functions.
-+
-+Tue Jul 16 10:19:16 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* ext2fs.h: Add a definition of the "real" ext2 superblock.
-+
-+Fri May 24 14:54:55 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* ext2fs.h: Fix erroneous ino_t type used in block_bitmap type.
-+
-+Sun May 19 15:39:03 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* openfs.c (ext2fs_open): If the blocksize in the superblock is
-+		zero, return the error EXT2_ET_CORRUPT_SUPERBLOCK, since
-+		that's a basic value that must be correct for the rest of
-+		the library to work.
-+
-+	* ext2_err.et.in (EXT2_ET_CORRUPT_SUPERBLOCK): Added new error
-+	 	code.
-+
-+Thu May 16 11:12:30 1996  Theodore Ts'o  <tytso@rsts-11.mit.edu>
-+
-+	* Release of E2fsprogs version 1.04
-+
-+Wed Mar 27 00:33:40 1996    <tytso@rsts-11.mit.edu>
-+
-+	* Release of E2fsprogs version 1.03
-+
-+Tue Mar 26 12:06:32 1996    <tytso@rsts-11.mit.edu>
-+
-+	* bitops.h (ext2fs_set_bit, ext2fs_clear_bit, ext2fs_test_bit):
-+		Change the m68k bit numbering for bitmasks to match with
-+		the bit numbering used by all other ext2 implementations.
-+
-+Thu Mar  7 03:37:00 1996    <tytso@rsts-11.mit.edu>
-+
-+	* inode.c (ext2fs_get_next_inode, ext2fs_close_inode_scan, 
-+	ext2fs_open_inode_scan): Support dynamically-sized inodes.
-+
-+Wed Mar  6 12:26:29 1996    <tytso@rsts-11.mit.edu>
-+
-+	* inode.c (ext2fs_read_inode, ext2fs_write_inode): Support
-+		dynamically-sized inodes.
-+
-+	* openfs.c (ext2fs_open): Allow dynamic revision filesystem to be
-+	        loaded.
-+
-+Tue Mar  5 03:49:37 1996    <tytso@rsts-11.mit.edu>
-+
-+	* initialize.c (ext2fs_initialize): Catch an error condition where
-+		the passed in size is *really* too small.
-+
-+	* alloc.c (ext2fs_new_inode): 
-+	* ext2fs.h (EXT2_FIRST_INODE): Add support for dynamic revision to
-+		get first inode.
-+
-+Wed Feb 21 15:56:17 1996    <tytso@rsts-11.mit.edu>
-+
-+	* getsize.c (ext2fs_get_device_size): Open the device read-only
-+		when trying to determine its size.
-+
-+Wed Jan 31 11:06:08 1996    <tytso@rsts-11.mit.edu>
-+
-+	* Release of E2fsprogs version 1.02
-+
-+Sat Dec  9 09:57:50 1995    <tytso@rsts-11.mit.edu>
-+
-+	* rw_bitops.c (ext2fs_write_block_bitmap):
-+	* bitops.c (ext2fs_test_bit, ext2fs_clear_bit, ext2fs_set_bit):
-+	* bitops.h (ext2fs_test_bit, ext2fs_clear_bit, ext2fs_set_bit):
-+		Rename {test,set,clear}_bit to ext2fs_{test,set,clear}_bit, 
-+		to avoid conflicts with with kernel include files.  Also
-+		rename ADDR and CONST_ADDR to EXT2FS_ADDR and
-+		EXT2FS_CONST_ADDR. 
-+
-+Thu Oct 26 12:09:16 1995    <tytso@rsts-11.mit.edu>
-+
-+	* ext2_err.et: Updated message in EXT2_ET_BASE to say version 0.5c
-+
-+	* swapfs.c (ext2fs_swap_super): Put an #ifdef check around
-+		s_def_resuid and s_def_resgid for backwards compatibility.
-+
-+Fri Oct 20 23:33:31 1995    <tytso@rsts-11.mit.edu>
-+
-+	* bitops.h: Added #ifdef's for Sparc.
-+
-+Wed Sep  6 22:14:46 1995    <tytso@rsts-11.mit.edu>
-+
-+	* getsize.c: #include <sys/ioctl.h> under Linux to pick up ioctl()
-+	        declaration
-+
-+	* closefs.c: #include <string.h> to pick up memset() declaration
-+
-+Mon Sep  4 21:45:29 1995  Remy Card  <card@bbj>
-+
-+	* Makefile.in: Added support for BSD shared libraries.
-+
-+	* initialize.c (ext2fs_initialize): Correctly set the s_creator_os
-+		flag.
-+
-+Mon Sep  4 09:55:30 1995    <tytso@rsts-11.mit.edu>
-+
-+	* unix_io.c (unix_open): Add a double check; if the passed in name
-+		is NULL, return EXT2_ET_BAD_DEVICE_NAME.
-+
-+	* ext2_err.et (EXT2_ET_BAD_DEVICE_NAME): Added new error code
-+
-+Wed Aug 16 15:44:10 1995    <tytso@rsts-11.mit.edu>
-+
-+	* inode.c (ext2fs_check_directory): Use LINUX_S_ISDIR instead of
-+		S_ISDIR.
-+
-+Tue Aug 15 13:08:36 1995    <tytso@rsts-11.mit.edu>
-+
-+	* getsize.c (ext2fs_get_device_size): Add support for reading the
-+		partition size from a BSD disk label.
-+
-+Thu Aug 10 09:33:26 1995  Theodore Y. Ts'o  <tytso@lurch.mit.edu>
-+
-+	* getsize.c (ext2fs_get_device_size): New function that determins
-+		the size of a device.  Used by mke2fs and e2fsck.
-+
-+Sat Aug 12 03:09:54 1995  Remy Card  <card@bbj>
-+
-+	* Makefile.in (install): Install static libraries in $(ulibdir)
-+		(/usr/lib on Linux) instead of $(libdir) (/lib on Linux).
-+
-+Wed Aug  9 17:04:23 1995  Theodore Y. Ts'o  <tytso@dcl>
-+
-+	* bitmaps.c (ext2fs_free_inode_bitmap, ext2fs_free_block_bitmap):
-+		Move these functions to freefs.c.
-+
-+	* closefs.c (ext2fs_flush): If swapping blocks, clear the group
-+		descriptors shadow memory to keep purify quiet.  (This
-+		also has the nice benefit that the unused portion of the
-+		shadow descriptors are zeroed out.)
-+
-+	* dirblock.c (ext2fs_write_dir_block): We need to use
-+		dirent->rec_len *before* it's byteswapped to find the
-+		location of the next directory structure!
-+
-+	* alloc.c (ext2fs_new_inode): Fix bug which could potentially
-+		cause ext2fs_new_inode to loop infinitely if we're trying
-+		to allocate an inode in group #0 and there are no free
-+		inodes at all in the system.
-+
-+	* closefs.c: #include <errno.h> if it exists.
-+
-+Sun Aug  6 13:27:50 1995  Theodore Y. Ts'o  <tytso@lurch.mit.edu>
-+
-+	* ext2fs.h (BLOCK_FLAG_HOLE): Added new definition for
-+		BLOCK_FLAG_APPEND.  Added documentation for the block
-+		interator flags.
-+
-+Sat Aug  5 11:44:05 1995  Theodore Y. Ts'o  <tytso@lurch.mit.edu>
-+
-+	* Makefile.in (DLL_INSTALL_DIR, ELF_INSTALL_DIR): Set the
-+		installation directories correctly.
-+
-+Tue Jul 18 09:27:38 1995    <tytso@rsx-11.mit.edu>
-+
-+	* namei.c (process_dir_block): 
-+	* mkdir.c (ext2fs_mkdir): 
-+	* expanddir.c (expand_dir_proc): Use ext2fs_{read,write}_dir_block
-+		to read/write the directory block.
-+
-+	* dirblock.c (ext2fs_read_dir_block), ext2fs_write_dir_block): New
-+		file containing functions for reading and writing
-+		directory blocks (byte swapping if necesssary)
-+
-+	* block.c (block_iterate_ind, block_iterate_dind, 
-+		block_iterate_tind): Byte swap the block addresses if
-+		EXT2_SWAP_BYTES is set (and swap them back before writing
-+		them out.)
-+
-+	* inode.c (inocpy_with_swap): New function.
-+	(ext2fs_get_next_inode, ext2fs_read_inode, ext2fs_write_inode):
-+		Call inocpy_with_swap if EXT2_SWAP_BYTES if set.
-+
-+	* closefs.c (ext2fs_flush): If EXT2_SWAP_BYTES is set, then swap
-+		the superblock and group descriptors before writing it out.
-+
-+	* openfs.c (ext2fs_open): If the magic number is byte-swapped,
-+		then set the EXT2_SWAP_BYTES and byte-swap the superblock
-+		and group descriptors.
-+
-+	* swapfs.c (ext2fs_swap_super, ext2fs_swap_group_desc): New functions
-+		to desp ext2 filesystem structures.
-+
-+	* bitops.c (set_bit, clear_bit, test_bit): Use modifications
-+		supplied by Pete A. Zaitcev so that the C language
-+		versions of these functions are more portable.  They will
-+		now work on both little and big endian systems, and the
-+		assumption that 32-bit integers are used is gone.
-+
-+	* bitops.h (ext2_swab16, ext2_swab32): Added new functions for
-+		doing byte swapping.
-+
-+	* ext2fs.h (EXT2_SWAP_BYTES): Add new flag which indicates that
-+		byte swapping should take place.
-+
-+Sun Jul 16 06:21:43 1995    <tytso@rsx-11.mit.edu>
-+
-+	* Makefile.in, cmp_bitmaps.c (ext2fs_compare_block_bitmap_end,
-+	        ext2fs_compare_inode_bitmap_end): Added new file
-+		containing routines to compare bitmaps.
-+
-+	* ext2_err.et (EXT2_ET_NEQ_BLOCK_BITMAP, EXT2_ET_NEQ_INODE_BITMAP): 
-+		Added new error codes.
-+
-+Sat Jul 15 04:23:37 1995    <tytso@rsx-11.mit.edu>
-+
-+	* inode.c (ext2fs_get_next_inode): Don't check scan->inode_buffer;
-+		if the magic number is correct, it will be allocated.
-+
-+Fri Jul 14 19:02:59 1995    <tytso@rsx-11.mit.edu>
-+
-+	* block.c (block_iterate_ind, block_iterate_dind, 
-+		block_iterate_tind): Don't recompute block_nr each loop;
-+		just increment it!  Factor check of BLOCK_FLAG_APPEND out
-+		of the loop.  Factor mask of BLOCK_CHANGED into changed
-+		variable out of the loop.  (block_iterate_ind, in
-+		particular, gets called a lot, so every little
-+		optimization helps.)
-+
-+Thu Jul 13 08:02:45 1995    <tytso@rsx-11.mit.edu>
-+
-+	* block.c (block_iterate_ind, block_iterate_dind, 
-+		block_iterate_tind): Precompute limit of loop to speed up
-+		block_iterate_ind and company.
-+
-+	* bitops.h (ext2fs_fast_mark_block_bitmap, 
-+		ext2fs_fast_unmark_block_bitmap, ext2fs_fast_test_block_bitmap,
-+		ext2fs_fast_mark_inode_bitmap, ext2fs_fast_unmark_inode_bitmap,
-+		ext2fs_fast_test_inode_bitmap): Add fast version of these
-+		functions, which don't do range checking.
-+
-+	* bitops.h (ext2fs_get_block_bitmap_start, 
-+		ext2fs_get_inode_bitmap_start, ext2fs_get_block_bitmap_end,
-+		ext2fs_get_inode_bitmap_end): Add new accessor functions
-+		which return the start and end points of the bitmaps.
-+
-+Tue Jul 11 18:59:41 1995    <tytso@rsx-11.mit.edu>
-+
-+	* llseek.c (ext2_llseek): If the offset is small enough, use lseek
-+		instead of llseek.  The errno if the offset is too large
-+		and lseek is not supported should be EINVAL, not -EINVAL.
-+
-+Thu Jun 15 23:43:02 1995  Remy Card  <card@bbj>
-+
-+	* Makefile.in: Added support for ELF shared libraries.
-+		Fixed typos in the compilation rules.
-+		(distclean): Added Makefile.
-+
-+	* llseek.c (llseek): New function, if llseek() does not exist in the
-+	C library.
-+	(ext2_llseek): Changed to call llseek().
-+
-+Mon Jun 12 08:29:07 1995  Theodore Y. Ts'o  <tytso@lurch.mit.edu>
-+
-+	* ext2fs.h: Use __u32 to define blk_t, instead of unsigned long.
-+
-+Sun Jun 11 15:02:54 1995  Theodore Y. Ts'o  <tytso@lurch.mit.edu>
-+
-+	* mkdir.c (ext2fs_mkdir): Use LINUX_S_IFDIR instead of S_IFDIR.
-+
-+	* ext2fs.h (LINUX_S_IFDIR): Define a linux specific versions of
-+		the S_*, which are normally defined in <sys/stat.h>.  This
-+		allows us to compile e2fsprogs on a non-Linux system,
-+		which may have a different value for S_IFDIR.
-+
-+Sat Jun 10 23:47:05 1995  Theodore Y. Ts'o  <tytso@lurch.mit.edu>
-+
-+	* bitops.c (clear_bit, set_bit): Remove calls to cli() and sti();
-+		this is a user-mode application!
-+
-+Thu Jun  8 13:13:22 1995  Miles Bader  <miles@churchy.gnu.ai.mit.edu>
-+
-+	* llseek.c: Put the include of <linux/unistd.h> inside the #ifdef
-+	__linux__ so that non-linux systems won't see it.
-+
-+	* alloc.c: Include <errno.h> if possible.
-+	* badblocks.c: Ditto.
-+	* bb_inode.c: Ditto.
-+	* bitmaps.c: Ditto.
-+	* block.c: Ditto.
-+	* expanddir.c: Ditto.
-+	* get_pathname.c: Ditto.
-+	* initialize.c: Ditto.
-+	* inode.c: Ditto.
-+	* llseek.c: Ditto.
-+	* mkdir.c: Ditto.
-+	* namei.c: Ditto.
-+	* newdir.c: Ditto.
-+	* openfs.c: Ditto.
-+	* rw_bitmaps.c: Ditto.
-+	* unix_io.c: Ditto.
-+
-+	* Makefile.in: Rewritten to conform to GNU coding standards and
-+	support separate compilation directories.
-+
-+Thu May 11 04:13:12 1995    <tytso@rsx-11.mit.edu>
-+
-+	* initialize.c (ext2fs_initialize): Don't allow more than one
-+		bitmaps's worth of inodes in a group.
-+
-+Sat Mar 11 14:07:11 1995  Theodore Y. Ts'o  <tytso@localhost>
-+
-+	* llseek.c (ext2_llseek): Added error checking to the llseek()
-+		compat code to protect against overflow.  This only
-+		applies to 1.0 and early 1.1 kernels, which don't support
-+		the llseek() system call.
-+
-+Thu Nov 24 16:29:00 1994  Theodore Y. Ts'o  (tytso@rt-11)
-+
-+	* unix_io.c (unix_open): Initialize the read_error and write_error
-+		io_channel pointers to be null.
-+
-+	* bb_inode.c (clear_bad_block_proc): If an illegal block number is
-+		found, clear it but don't try to update the filesystem
-+		accounting information, since that's hopeless anyway.
-+
-+	* block.c (bloblock_iterate_ind, bloblock_iterate_dind,
-+	bloblock_iterate_tind): Check to see if the indirect blocks are
-+		valid before trying to read them.
-+
-+	* ext2_err.et (EXT2_ET_BAD_IND_BLOCK, EX2_ET_BAD_DIND_BLOCK,
-+	EXT2_ET_BAD_TIND_BLOCK): Add new error codes.
-+
-+	* bitops.h (ext2fs_mark_block_bitmap, ext2fs_unmark_block_bitmap,
-+	ext2fs_test_block_bitmap, ext2fs_mark_inode_bitmap,
-+	ext2fs_unmark_inode_bitmap, ext2fs_test_inode_bitmap):  If an
-+		illegal block or inode number is passed in, return instead
-+		of trying to test, set, or clear the bit.
-+
-+Mon Nov  7 21:32:33 1994  Remy Card  <card@bbj>
-+
-+	* Makefile: Added a dummy install target in case shared libraries
-+		are not built.
-+
-+Mon Oct 24 14:11:44 1994    (tytso@rsx-11)
-+
-+	* bitmaps.c (ext2fs_allocate_block_bitmap): Fix calculation of how
-+		the real last block of the bitmap should be calculated.
-+
-+Wed Sep  7 10:05:36 1994    (tytso@rsx-11)
-+
-+	* bitmaps.c (ext2fs_fudge_inode_bitmap_end, 
-+		ext2fs_fudge_block_bitmap_end, ext2fs_clear_inode_bitmap,
-+		ext2fs_clear_block_bitmap, ext2fs_free_inode_bitmap,
-+		ext2fs_free_block_bitmap): Add magic number checking for
-+		the inode and block bitmaps.
-+
-+	* bitmaps.c (ext2fs_allocate_block_bitmap): Fix to set the correct
-+		magic number for a block bitmap instead of an inode bitmap.
-+
-+	* inode.c (ext2fs_close_inode_scan, ext2fs_get_next_inode):  Add
-+		magic number checking for the inode_scan structure.
-+
-+	* badblocks.c (badblocks_list_free, badblocks_list_add, 
-+		badblocks_list_test, badblocks_list_iterate_begin,
-+		badblocks_list_iterate, badblocks_list_iterate_end): Add
-+		magic number checking for the badblocks_list and
-+		badblocks_iterate structures.
-+
-+	* ext2_err.et (EXT2_ET_MAGIC_UNIX_IO_CHANNEL): 
-+	* unix_io.c (unix_open, unix_close, unix_set_blksize, unix_read_blk,
-+		unix_write_blk, unix_flush): Add magic number checking
-+		both for io_channel structure and unix_private_data
-+		structure.
-+
-+	* openfs.c (ext2fs_open): Add check for io_manager structure's
-+		magic number.
-+
-+	* rw_bitmaps.c (ext2fs_write_inode_bitmap, ext2fs_write_block_bitmap,
-+		ext2fs_read_inode_bitmap, ext2fs_read_block_bitmap,
-+		ext2fs_read_bitmaps, ext2fs_write_bitmaps): 
-+	* read_bb.c (ext2fs_read_bb_inode): 
-+	* read_bb_file.c (ext2fs_read_bb_FILE): 
-+	* newdir.c (ext2fs_new_dir_block): 
-+	* namei.c (ext2fs_dir_iterate, ext2fs_lookup, ext2fs_namei): 
-+	* link.c (ext2fs_link, ext2fs_unlink): 
-+	* inode.c (ext2fs_open_inode_scan, ext2fs_read_inode,
-+		ext2fs_write_inode, ext2fs_get_blocks, 
-+		ext2fs_check_directory): 
-+	* get_pathname.c (ext2fs_get_pathname): 
-+	* expanddir.c (ext2fs_expand_dir): 
-+	* block.c (ext2fs_block_iterate): 
-+	* bitmaps.c (ext2fs_allocate_inode_bitmap, 
-+		ext2fs_allocate_block_bitmap): 
-+	* bb_inode.c (ext2fs_update_bb_inode): 
-+	* alloc.c (ext2fs_new_inode,ext2fs_new_block,ext2fs_get_free_blocks): 
-+	* check_desc.c (ext2fs_check_desc): 
-+	* closefs.c (ext2fs_close, ext2fs_flush): 
-+	* freefs.c (ext2fs_free): Add check for ext2_filsys magic number.
-+
-+	* Makefile:
-+	* ext2fs.h:
-+	* openfs.c:
-+	* check_desc.c (ext2fs_check_desc): Move ext2fs_check_desc from
-+	openfs.c into its own file.
-+
-+	* ext2fs.h (EXT2_CHECK_MAGIC): Added macro for checking for
-+	structure magic numbers.
-+
-+	* closefs.c (ext2fs_flush): Folded in Remy Card's changes to clear
-+	the EXT2_VALID_FS flag in the backup superblock blocks, so that if
-+	someone uses the -b option to specify the use of the backup
-+	superblock --- this usually means that the main superblock is
-+	toast.  :-)
-+
-+	* ext2fs.h: 
-+	* ext2_err.et (EXT2_ET_REV_TOO_HIGH): 
-+	* openfs.c (ext2fs_open): Folded in Remy Card's changes to add a
-+	revision level to the superblock.
-+
-+Sun Aug 21 00:50:08 1994  Theodore Y. Ts'o  (tytso@rt-11)
-+
-+	* ext2fs.h:
-+	* bitmaps.c:
-+	* bitops.c
-+	* bitops.h:
-+	* openfs.c:
-+	* initialize.c: Completely revamped the inode and block bitmap
-+	structures, so that they can be better chance of being extensible
-+	in a shared library.  They are now their own type, instead of
-+	being a char *.  Also, the function signatures of
-+	ext2fs_test_block_bitmap, ext2fs_mark_block_bitmap,
-+	ext2fs_unmark_block_bitmap, ext2fs_test_inode_bitmap,
-+	ext2fs_mark_inode_bitmap, and ext2fs_unmark_inode_bitmap were
-+	changed to eliminate the ext2_filsys argument, since it is no
-+	longer necessary.
-+
-+Wed Aug 17 21:46:44 1994  Remy Card  (card@bbj)
-+
-+	* unix_io.c (unix_read_blk and unix_write_blk): use the llseek
-+	system call if available.
-+
-+	* llseek.c: new file.  This is the stub calling the llseek system
-+	call which allows supports for 2GB+ file systems.
-+
-+	* initialize.c (ext2fs_initialize): Ext2fs_initialize now stores
-+	the creator operating system.
-+
-+Wed Aug 17 10:03:24 1994  Theodore Y. Ts'o  (tytso@rt-11)
-+
-+	* initialize.c (ext2fs_initialize): Ext2fs_initialize now sets up
-+	the group descriptor statistics in addition to everything else.
-+	This relieves mke2fs of the responsibility of doing it.
-+
-+	* bitops.c, bitops.h: Add assembly inline functions for the 68000.
-+	Added a new #define, _EXT2_HAVE_ASM_BITOPS_ to control whether or
-+	not the generic C function equivalents should be included or not.
-+
-+	* openfs.c (ext2fs_open): If a superblock is specified, then use
-+	the backup group descriptors that go along with this superblock,
-+	instead of using the primary group descriptors.  This allows
-+	e2fsck to recover filesystems where the primary group descriptors
-+	have been trashed.
-+
-+
-diff -Naur silo-1.4.13.orig/libext2fs/check_desc.c silo-1.4.13/libext2fs/check_desc.c
---- silo-1.4.13.orig/libext2fs/check_desc.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/check_desc.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,68 @@
-+/*
-+ * check_desc.c --- Check the group descriptors of an ext2 filesystem
-+ * 
-+ * Copyright (C) 1993, 1994, 1995, 1996 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <fcntl.h>
-+#include <time.h>
-+#if HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+/*
-+ * This routine sanity checks the group descriptors
-+ */
-+errcode_t ext2fs_check_desc(ext2_filsys fs)
-+{
-+	dgrp_t i;
-+	blk_t block = fs->super->s_first_data_block;
-+	blk_t next;
-+
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	for (i = 0; i < fs->group_desc_count; i++) {
-+		next = block + fs->super->s_blocks_per_group;
-+		/*
-+		 * Check to make sure block bitmap for group is
-+		 * located within the group.
-+		 */
-+		if (fs->group_desc[i].bg_block_bitmap < block ||
-+		    fs->group_desc[i].bg_block_bitmap >= next)
-+			return EXT2_ET_GDESC_BAD_BLOCK_MAP;
-+		/*
-+		 * Check to make sure inode bitmap for group is
-+		 * located within the group
-+		 */
-+		if (fs->group_desc[i].bg_inode_bitmap < block ||
-+		    fs->group_desc[i].bg_inode_bitmap >= next)
-+			return EXT2_ET_GDESC_BAD_INODE_MAP;
-+		/*
-+		 * Check to make sure inode table for group is located
-+		 * within the group
-+		 */
-+		if (fs->group_desc[i].bg_inode_table < block ||
-+		    ((fs->group_desc[i].bg_inode_table +
-+		      fs->inode_blocks_per_group) >= next))
-+			return EXT2_ET_GDESC_BAD_INODE_TABLE;
-+		
-+		block = next;
-+	}
-+	return 0;
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/closefs.c silo-1.4.13/libext2fs/closefs.c
---- silo-1.4.13.orig/libext2fs/closefs.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/closefs.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,381 @@
-+/*
-+ * closefs.c --- close an ext2 filesystem
-+ * 
-+ * Copyright (C) 1993, 1994, 1995, 1996 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <time.h>
-+#include <string.h>
-+
-+#include "ext2_fs.h"
-+#include "ext2fsP.h"
-+
-+static int test_root(int a, int b)
-+{
-+	if (a == 0)
-+		return 1;
-+	while (1) {
-+		if (a == 1)
-+			return 1;
-+		if (a % b)
-+			return 0;
-+		a = a / b;
-+	}
-+}
-+
-+int ext2fs_bg_has_super(ext2_filsys fs, int group_block)
-+{
-+	if (!(fs->super->s_feature_ro_compat &
-+	      EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER))
-+		return 1;
-+
-+	if (test_root(group_block, 3) || (test_root(group_block, 5)) ||
-+	    test_root(group_block, 7))
-+		return 1;
-+
-+	return 0;
-+}
-+
-+int ext2fs_super_and_bgd_loc(ext2_filsys fs, 
-+			     dgrp_t group,
-+			     blk_t *ret_super_blk,
-+			     blk_t *ret_old_desc_blk,
-+			     blk_t *ret_new_desc_blk,
-+			     int *ret_meta_bg)
-+{
-+	blk_t	group_block, super_blk = 0, old_desc_blk = 0, new_desc_blk = 0;
-+	unsigned int meta_bg, meta_bg_size;
-+	int	numblocks, has_super;
-+	int	old_desc_blocks;
-+
-+	group_block = fs->super->s_first_data_block +
-+		(group * fs->super->s_blocks_per_group);
-+
-+	if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG)
-+		old_desc_blocks = fs->super->s_first_meta_bg;
-+	else
-+		old_desc_blocks = 
-+			fs->desc_blocks + fs->super->s_reserved_gdt_blocks;
-+
-+	if (group == fs->group_desc_count-1) {
-+		numblocks = (fs->super->s_blocks_count -
-+			     fs->super->s_first_data_block) %
-+			fs->super->s_blocks_per_group;
-+		if (!numblocks)
-+			numblocks = fs->super->s_blocks_per_group;
-+	} else
-+		numblocks = fs->super->s_blocks_per_group;
-+
-+	has_super = ext2fs_bg_has_super(fs, group);
-+
-+	if (has_super) {
-+		super_blk = group_block;
-+		numblocks--;
-+	}
-+	meta_bg_size = (fs->blocksize / sizeof (struct ext2_group_desc));
-+	meta_bg = group / meta_bg_size;
-+
-+	if (!(fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) ||
-+	    (meta_bg < fs->super->s_first_meta_bg)) {
-+		if (has_super) {
-+			old_desc_blk = group_block + 1;
-+			numblocks -= old_desc_blocks;
-+		}
-+	} else {
-+		if (((group % meta_bg_size) == 0) ||
-+		    ((group % meta_bg_size) == 1) ||
-+		    ((group % meta_bg_size) == (meta_bg_size-1))) {
-+			if (has_super)
-+				has_super = 1;
-+			new_desc_blk = group_block + has_super;
-+			numblocks--;
-+		}
-+	}
-+		
-+	numblocks -= 2 + fs->inode_blocks_per_group;
-+
-+	if (ret_super_blk)
-+		*ret_super_blk = super_blk;
-+	if (ret_old_desc_blk)
-+		*ret_old_desc_blk = old_desc_blk;
-+	if (ret_new_desc_blk)
-+		*ret_new_desc_blk = new_desc_blk;
-+	if (ret_meta_bg)
-+		*ret_meta_bg = meta_bg;
-+	return (numblocks);
-+}
-+
-+
-+/*
-+ * This function forces out the primary superblock.  We need to only
-+ * write out those fields which we have changed, since if the
-+ * filesystem is mounted, it may have changed some of the other
-+ * fields.
-+ *
-+ * It takes as input a superblock which has already been byte swapped
-+ * (if necessary).
-+ *
-+ */
-+static errcode_t write_primary_superblock(ext2_filsys fs,
-+					  struct ext2_super_block *super)
-+{
-+	__u16		*old_super, *new_super;
-+	int		check_idx, write_idx, size;
-+	errcode_t	retval;
-+
-+	if (!fs->io->manager->write_byte || !fs->orig_super) {
-+		io_channel_set_blksize(fs->io, SUPERBLOCK_OFFSET);
-+		retval = io_channel_write_blk(fs->io, 1, -SUPERBLOCK_SIZE,
-+					      super);
-+		io_channel_set_blksize(fs->io, fs->blocksize);
-+		return retval;
-+	}
-+
-+	old_super = (__u16 *) fs->orig_super;
-+	new_super = (__u16 *) super;
-+
-+	for (check_idx = 0; check_idx < SUPERBLOCK_SIZE/2; check_idx++) {
-+		if (old_super[check_idx] == new_super[check_idx])
-+			continue;
-+		write_idx = check_idx;
-+		for (check_idx++; check_idx < SUPERBLOCK_SIZE/2; check_idx++)
-+			if (old_super[check_idx] == new_super[check_idx])
-+				break;
-+		size = 2 * (check_idx - write_idx);
-+#if 0
-+		printf("Writing %d bytes starting at %d\n",
-+		       size, write_idx*2);
-+#endif
-+		retval = io_channel_write_byte(fs->io,
-+			       SUPERBLOCK_OFFSET + (2 * write_idx), size,
-+					       new_super + write_idx);
-+		if (retval)
-+			return retval;
-+	}
-+	memcpy(fs->orig_super, super, SUPERBLOCK_SIZE);
-+	return 0;
-+}
-+
-+
-+/*
-+ * Updates the revision to EXT2_DYNAMIC_REV
-+ */
-+void ext2fs_update_dynamic_rev(ext2_filsys fs)
-+{
-+	struct ext2_super_block *sb = fs->super;
-+
-+	if (sb->s_rev_level > EXT2_GOOD_OLD_REV)
-+		return;
-+
-+	sb->s_rev_level = EXT2_DYNAMIC_REV;
-+	sb->s_first_ino = EXT2_GOOD_OLD_FIRST_INO;
-+	sb->s_inode_size = EXT2_GOOD_OLD_INODE_SIZE;
-+	/* s_uuid is handled by e2fsck already */
-+	/* other fields should be left alone */
-+}
-+
-+static errcode_t write_backup_super(ext2_filsys fs, dgrp_t group,
-+				    blk_t group_block,
-+				    struct ext2_super_block *super_shadow)
-+{
-+	dgrp_t	sgrp = group;
-+	
-+	if (sgrp > ((1 << 16) - 1))
-+		sgrp = (1 << 16) - 1;
-+#ifdef EXT2FS_ENABLE_SWAPFS
-+	if (fs->flags & EXT2_FLAG_SWAP_BYTES)
-+		super_shadow->s_block_group_nr = ext2fs_swab16(sgrp);
-+	else
-+#endif
-+		fs->super->s_block_group_nr = sgrp;
-+
-+	return io_channel_write_blk(fs->io, group_block, -SUPERBLOCK_SIZE, 
-+				    super_shadow);
-+}
-+
-+
-+errcode_t ext2fs_flush(ext2_filsys fs)
-+{
-+	dgrp_t		i,j;
-+	blk_t		group_block;
-+	errcode_t	retval;
-+	unsigned long	fs_state;
-+	struct ext2_super_block *super_shadow = 0;
-+	struct ext2_group_desc *group_shadow = 0;
-+	struct ext2_group_desc *s, *t;
-+	char	*group_ptr;
-+	int	old_desc_blocks;
-+	
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	fs_state = fs->super->s_state;
-+
-+	fs->super->s_wtime = time(NULL);
-+	fs->super->s_block_group_nr = 0;
-+#ifdef EXT2FS_ENABLE_SWAPFS
-+	if (fs->flags & EXT2_FLAG_SWAP_BYTES) {
-+		retval = EXT2_ET_NO_MEMORY;
-+		retval = ext2fs_get_mem(SUPERBLOCK_SIZE, &super_shadow);
-+		if (retval)
-+			goto errout;
-+		retval = ext2fs_get_mem((size_t)(fs->blocksize *
-+						 fs->desc_blocks),
-+					&group_shadow);
-+		if (retval)
-+			goto errout;
-+		memset(group_shadow, 0, (size_t) fs->blocksize *
-+		       fs->desc_blocks);
-+
-+		/* swap the group descriptors */
-+		for (j=0, s=fs->group_desc, t=group_shadow;
-+		     j < fs->group_desc_count; j++, t++, s++) {
-+			*t = *s;
-+			ext2fs_swap_group_desc(t);
-+		}
-+	} else {
-+		super_shadow = fs->super;
-+		group_shadow = fs->group_desc;
-+	}
-+#else
-+	super_shadow = fs->super;
-+	group_shadow = fs->group_desc;
-+#endif
-+	
-+	/*
-+	 * If this is an external journal device, don't write out the
-+	 * block group descriptors or any of the backup superblocks
-+	 */
-+	if (fs->super->s_feature_incompat &
-+	    EXT3_FEATURE_INCOMPAT_JOURNAL_DEV)
-+		goto write_primary_superblock_only;
-+
-+	/*
-+	 * Set the state of the FS to be non-valid.  (The state has
-+	 * already been backed up earlier, and will be restored after
-+	 * we write out the backup superblocks.)
-+	 */
-+	fs->super->s_state &= ~EXT2_VALID_FS;
-+#ifdef EXT2FS_ENABLE_SWAPFS
-+	if (fs->flags & EXT2_FLAG_SWAP_BYTES) {
-+		*super_shadow = *fs->super;
-+		ext2fs_swap_super(super_shadow);
-+	}
-+#endif
-+
-+	/*
-+	 * Write out the master group descriptors, and the backup
-+	 * superblocks and group descriptors.
-+	 */
-+	group_block = fs->super->s_first_data_block;
-+	group_ptr = (char *) group_shadow;
-+	if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG)
-+		old_desc_blocks = fs->super->s_first_meta_bg;
-+	else
-+		old_desc_blocks = fs->desc_blocks;
-+
-+	for (i = 0; i < fs->group_desc_count; i++) {
-+		blk_t	super_blk, old_desc_blk, new_desc_blk;
-+		int	meta_bg;
-+
-+		ext2fs_super_and_bgd_loc(fs, i, &super_blk, &old_desc_blk, 
-+					 &new_desc_blk, &meta_bg);
-+
-+		if (!(fs->flags & EXT2_FLAG_MASTER_SB_ONLY) &&i && super_blk) {
-+			retval = write_backup_super(fs, i, super_blk,
-+						    super_shadow);
-+			if (retval)
-+				goto errout;
-+		}
-+		if (fs->flags & EXT2_FLAG_SUPER_ONLY)
-+			continue;
-+		if ((old_desc_blk) && 
-+		    (!(fs->flags & EXT2_FLAG_MASTER_SB_ONLY) || (i == 0))) {
-+			retval = io_channel_write_blk(fs->io,
-+			      old_desc_blk, old_desc_blocks, group_ptr);
-+			if (retval)
-+				goto errout;
-+		}
-+		if (new_desc_blk) {
-+			retval = io_channel_write_blk(fs->io, new_desc_blk,
-+				1, group_ptr + (meta_bg*fs->blocksize));
-+			if (retval)
-+				goto errout;
-+		}
-+	}
-+	fs->super->s_block_group_nr = 0;
-+	fs->super->s_state = fs_state;
-+#ifdef EXT2FS_ENABLE_SWAPFS
-+	if (fs->flags & EXT2_FLAG_SWAP_BYTES) {
-+		*super_shadow = *fs->super;
-+		ext2fs_swap_super(super_shadow);
-+	}
-+#endif
-+
-+	/*
-+	 * If the write_bitmaps() function is present, call it to
-+	 * flush the bitmaps.  This is done this way so that a simple
-+	 * program that doesn't mess with the bitmaps doesn't need to
-+	 * drag in the bitmaps.c code.
-+	 */
-+	if (fs->write_bitmaps) {
-+		retval = fs->write_bitmaps(fs);
-+		if (retval)
-+			goto errout;
-+	}
-+
-+write_primary_superblock_only:
-+	/*
-+	 * Write out master superblock.  This has to be done
-+	 * separately, since it is located at a fixed location
-+	 * (SUPERBLOCK_OFFSET).  We flush all other pending changes
-+	 * out to disk first, just to avoid a race condition with an
-+	 * insy-tinsy window....
-+	 */
-+	retval = io_channel_flush(fs->io);
-+	retval = write_primary_superblock(fs, super_shadow);
-+	if (retval)
-+		goto errout;
-+
-+	fs->flags &= ~EXT2_FLAG_DIRTY;
-+
-+	retval = io_channel_flush(fs->io);
-+errout:
-+	fs->super->s_state = fs_state;
-+	if (fs->flags & EXT2_FLAG_SWAP_BYTES) {
-+		if (super_shadow)
-+			ext2fs_free_mem(&super_shadow);
-+		if (group_shadow)
-+			ext2fs_free_mem(&group_shadow);
-+	}
-+	return retval;
-+}
-+
-+errcode_t ext2fs_close(ext2_filsys fs)
-+{
-+	errcode_t	retval;
-+	
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	if (fs->flags & EXT2_FLAG_DIRTY) {
-+		retval = ext2fs_flush(fs);
-+		if (retval)
-+			return retval;
-+	}
-+	if (fs->write_bitmaps) {
-+		retval = fs->write_bitmaps(fs);
-+		if (retval)
-+			return retval;
-+	}
-+	ext2fs_free(fs);
-+	return 0;
-+}
-+
-diff -Naur silo-1.4.13.orig/libext2fs/cmp_bitmaps.c silo-1.4.13/libext2fs/cmp_bitmaps.c
---- silo-1.4.13.orig/libext2fs/cmp_bitmaps.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/cmp_bitmaps.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,72 @@
-+/*
-+ * cmp_bitmaps.c --- routines to compare inode and block bitmaps.
-+ *
-+ * Copyright (C) 1995 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <fcntl.h>
-+#include <time.h>
-+#if HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+errcode_t ext2fs_compare_block_bitmap(ext2fs_block_bitmap bm1,
-+				      ext2fs_block_bitmap bm2)
-+{
-+	blk_t	i;
-+	
-+	EXT2_CHECK_MAGIC(bm1, EXT2_ET_MAGIC_BLOCK_BITMAP);
-+	EXT2_CHECK_MAGIC(bm2, EXT2_ET_MAGIC_BLOCK_BITMAP);
-+
-+	if ((bm1->start != bm2->start) ||
-+	    (bm1->end != bm2->end) ||
-+	    (memcmp(bm1->bitmap, bm2->bitmap,
-+		    (size_t) (bm1->end - bm1->start)/8)))
-+		return EXT2_ET_NEQ_BLOCK_BITMAP;
-+
-+	for (i = bm1->end - ((bm1->end - bm1->start) % 8); i <= bm1->end; i++)
-+		if (ext2fs_fast_test_block_bitmap(bm1, i) !=
-+		    ext2fs_fast_test_block_bitmap(bm2, i))
-+			return EXT2_ET_NEQ_BLOCK_BITMAP;
-+
-+	return 0;
-+}
-+
-+errcode_t ext2fs_compare_inode_bitmap(ext2fs_inode_bitmap bm1,
-+				      ext2fs_inode_bitmap bm2)
-+{
-+	ext2_ino_t	i;
-+	
-+	EXT2_CHECK_MAGIC(bm1, EXT2_ET_MAGIC_INODE_BITMAP);
-+	EXT2_CHECK_MAGIC(bm2, EXT2_ET_MAGIC_INODE_BITMAP);
-+
-+	if ((bm1->start != bm2->start) ||
-+	    (bm1->end != bm2->end) ||
-+	    (memcmp(bm1->bitmap, bm2->bitmap,
-+		    (size_t) (bm1->end - bm1->start)/8)))
-+		return EXT2_ET_NEQ_INODE_BITMAP;
-+
-+	for (i = bm1->end - ((bm1->end - bm1->start) % 8); i <= bm1->end; i++)
-+		if (ext2fs_fast_test_inode_bitmap(bm1, i) !=
-+		    ext2fs_fast_test_inode_bitmap(bm2, i))
-+			return EXT2_ET_NEQ_INODE_BITMAP;
-+
-+	return 0;
-+}
-+
-diff -Naur silo-1.4.13.orig/libext2fs/dblist.c silo-1.4.13/libext2fs/dblist.c
---- silo-1.4.13.orig/libext2fs/dblist.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/dblist.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,260 @@
-+/*
-+ * dblist.c -- directory block list functions
-+ * 
-+ * Copyright 1997 by Theodore Ts'o
-+ * 
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ * 
-+ */
-+
-+#include <stdio.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <string.h>
-+#include <time.h>
-+
-+#include "ext2_fs.h"
-+#include "ext2fsP.h"
-+
-+static EXT2_QSORT_TYPE dir_block_cmp(const void *a, const void *b);
-+
-+/*
-+ * Returns the number of directories in the filesystem as reported by
-+ * the group descriptors.  Of course, the group descriptors could be
-+ * wrong!
-+ */
-+errcode_t ext2fs_get_num_dirs(ext2_filsys fs, ext2_ino_t *ret_num_dirs)
-+{
-+	dgrp_t	i;
-+	ext2_ino_t	num_dirs, max_dirs;
-+
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+	
-+	num_dirs = 0;
-+	max_dirs = fs->super->s_inodes_per_group;
-+	for (i = 0; i < fs->group_desc_count; i++) {
-+		if (fs->group_desc[i].bg_used_dirs_count > max_dirs)
-+			num_dirs += max_dirs / 8;
-+		else
-+			num_dirs += fs->group_desc[i].bg_used_dirs_count;
-+	}
-+	if (num_dirs > fs->super->s_inodes_count)
-+		num_dirs = fs->super->s_inodes_count;
-+
-+	*ret_num_dirs = num_dirs;
-+
-+	return 0;
-+}
-+
-+/*
-+ * helper function for making a new directory block list (for
-+ * initialize and copy).
-+ */
-+static errcode_t make_dblist(ext2_filsys fs, ext2_ino_t size, ext2_ino_t count,
-+			     struct ext2_db_entry *list,
-+			     ext2_dblist *ret_dblist)
-+{
-+	ext2_dblist	dblist;
-+	errcode_t	retval;
-+	size_t		len;
-+
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	if ((ret_dblist == 0) && fs->dblist &&
-+	    (fs->dblist->magic == EXT2_ET_MAGIC_DBLIST))
-+		return 0;
-+
-+	retval = ext2fs_get_mem(sizeof(struct ext2_struct_dblist), &dblist);
-+	if (retval)
-+		return retval;
-+	memset(dblist, 0, sizeof(struct ext2_struct_dblist));
-+
-+	dblist->magic = EXT2_ET_MAGIC_DBLIST;
-+	dblist->fs = fs;
-+	if (size)
-+		dblist->size = size;
-+	else {
-+		retval = ext2fs_get_num_dirs(fs, &dblist->size);
-+		if (retval)
-+			goto cleanup;
-+		dblist->size = (dblist->size * 2) + 12;
-+	}
-+	len = (size_t) sizeof(struct ext2_db_entry) * dblist->size;
-+	dblist->count = count;
-+	retval = ext2fs_get_mem(len, &dblist->list);
-+	if (retval)
-+		goto cleanup;
-+	
-+	if (list)
-+		memcpy(dblist->list, list, len);
-+	else
-+		memset(dblist->list, 0, len);
-+	if (ret_dblist)
-+		*ret_dblist = dblist;
-+	else
-+		fs->dblist = dblist;
-+	return 0;
-+cleanup:
-+	if (dblist)
-+		ext2fs_free_mem(&dblist);
-+	return retval;
-+}
-+
-+/*
-+ * Initialize a directory block list
-+ */
-+errcode_t ext2fs_init_dblist(ext2_filsys fs, ext2_dblist *ret_dblist)
-+{
-+	ext2_dblist	dblist;
-+	errcode_t	retval;
-+
-+	retval = make_dblist(fs, 0, 0, 0, &dblist);
-+	if (retval)
-+		return retval;
-+
-+	dblist->sorted = 1;
-+	if (ret_dblist)
-+		*ret_dblist = dblist;
-+	else
-+		fs->dblist = dblist;
-+
-+	return 0;
-+}
-+
-+/*
-+ * Copy a directory block list
-+ */
-+errcode_t ext2fs_copy_dblist(ext2_dblist src, ext2_dblist *dest)
-+{
-+	ext2_dblist	dblist;
-+	errcode_t	retval;
-+
-+	retval = make_dblist(src->fs, src->size, src->count, src->list,
-+			     &dblist);
-+	if (retval)
-+		return retval;
-+	dblist->sorted = src->sorted;
-+	*dest = dblist;
-+	return 0;
-+}
-+
-+/*
-+ * Close a directory block list
-+ *
-+ * (moved to closefs.c)
-+ */
-+
-+
-+/*
-+ * Add a directory block to the directory block list
-+ */
-+errcode_t ext2fs_add_dir_block(ext2_dblist dblist, ext2_ino_t ino, blk_t blk,
-+			       int blockcnt)
-+{
-+	struct ext2_db_entry 	*new_entry;
-+	errcode_t		retval;
-+	unsigned long		old_size;
-+	
-+	EXT2_CHECK_MAGIC(dblist, EXT2_ET_MAGIC_DBLIST);
-+
-+	if (dblist->count >= dblist->size) {
-+		old_size = dblist->size * sizeof(struct ext2_db_entry);
-+		dblist->size += 100;
-+		retval = ext2fs_resize_mem(old_size, (size_t) dblist->size *
-+					   sizeof(struct ext2_db_entry),
-+					   &dblist->list);
-+		if (retval) {
-+			dblist->size -= 100;
-+			return retval;
-+		}
-+	}
-+	new_entry = dblist->list + ( (int) dblist->count++);
-+	new_entry->blk = blk;
-+	new_entry->ino = ino;
-+	new_entry->blockcnt = blockcnt;
-+
-+	dblist->sorted = 0;
-+
-+	return 0;
-+}
-+
-+/*
-+ * Change the directory block to the directory block list
-+ */
-+errcode_t ext2fs_set_dir_block(ext2_dblist dblist, ext2_ino_t ino, blk_t blk,
-+			       int blockcnt)
-+{
-+	dgrp_t			i;
-+	
-+	EXT2_CHECK_MAGIC(dblist, EXT2_ET_MAGIC_DBLIST);
-+
-+	for (i=0; i < dblist->count; i++) {
-+		if ((dblist->list[i].ino != ino) ||
-+		    (dblist->list[i].blockcnt != blockcnt))
-+			continue;
-+		dblist->list[i].blk = blk;
-+		dblist->sorted = 0;
-+		return 0;
-+	}
-+	return EXT2_ET_DB_NOT_FOUND;
-+}
-+
-+void ext2fs_dblist_sort(ext2_dblist dblist,
-+			EXT2_QSORT_TYPE (*sortfunc)(const void *,
-+						    const void *))
-+{
-+	if (!sortfunc)
-+		sortfunc = dir_block_cmp;
-+	qsort(dblist->list, (size_t) dblist->count,
-+	      sizeof(struct ext2_db_entry), sortfunc);
-+	dblist->sorted = 1;
-+}
-+
-+/*
-+ * This function iterates over the directory block list
-+ */
-+errcode_t ext2fs_dblist_iterate(ext2_dblist dblist,
-+				int (*func)(ext2_filsys fs,
-+					    struct ext2_db_entry *db_info,
-+					    void	*priv_data),
-+				void *priv_data)
-+{
-+	ext2_ino_t	i;
-+	int		ret;
-+	
-+	EXT2_CHECK_MAGIC(dblist, EXT2_ET_MAGIC_DBLIST);
-+
-+	if (!dblist->sorted)
-+		ext2fs_dblist_sort(dblist, 0);
-+	for (i=0; i < dblist->count; i++) {
-+		ret = (*func)(dblist->fs, &dblist->list[(int)i], priv_data);
-+		if (ret & DBLIST_ABORT)
-+			return 0;
-+	}
-+	return 0;
-+}
-+
-+static EXT2_QSORT_TYPE dir_block_cmp(const void *a, const void *b)
-+{
-+	const struct ext2_db_entry *db_a =
-+		(const struct ext2_db_entry *) a;
-+	const struct ext2_db_entry *db_b =
-+		(const struct ext2_db_entry *) b;
-+
-+	if (db_a->blk != db_b->blk)
-+		return (int) (db_a->blk - db_b->blk);
-+	
-+	if (db_a->ino != db_b->ino)
-+		return (int) (db_a->ino - db_b->ino);
-+
-+	return (int) (db_a->blockcnt - db_b->blockcnt);
-+}
-+
-+int ext2fs_dblist_count(ext2_dblist dblist)
-+{
-+	return (int) dblist->count;
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/dblist_dir.c silo-1.4.13/libext2fs/dblist_dir.c
---- silo-1.4.13.orig/libext2fs/dblist_dir.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/dblist_dir.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,75 @@
-+/*
-+ * dblist_dir.c --- iterate by directory entry
-+ *
-+ * Copyright 1997 by Theodore Ts'o
-+ * 
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ * 
-+ */
-+
-+#include <stdio.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <string.h>
-+#include <time.h>
-+
-+#include "ext2_fs.h"
-+#include "ext2fsP.h"
-+
-+static int db_dir_proc(ext2_filsys fs, struct ext2_db_entry *db_info,
-+		       void *priv_data);
-+
-+errcode_t ext2fs_dblist_dir_iterate(ext2_dblist dblist,
-+				    int	flags,
-+				    char	*block_buf,
-+				    int (*func)(ext2_ino_t dir,
-+						int	entry,
-+						struct ext2_dir_entry *dirent,
-+						int	offset,
-+						int	blocksize,
-+						char	*buf,
-+						void	*priv_data),
-+				    void *priv_data)
-+{
-+	errcode_t		retval;
-+	struct dir_context	ctx;
-+
-+	EXT2_CHECK_MAGIC(dblist, EXT2_ET_MAGIC_DBLIST);
-+
-+	ctx.dir = 0;
-+	ctx.flags = flags;
-+	if (block_buf)
-+		ctx.buf = block_buf;
-+	else {
-+		retval = ext2fs_get_mem(dblist->fs->blocksize, &ctx.buf);
-+		if (retval)
-+			return retval;
-+	}
-+	ctx.func = func;
-+	ctx.priv_data = priv_data;
-+	ctx.errcode = 0;
-+
-+	retval = ext2fs_dblist_iterate(dblist, db_dir_proc, &ctx);
-+	
-+	if (!block_buf)
-+		ext2fs_free_mem(&ctx.buf);
-+	if (retval)
-+		return retval;
-+	return ctx.errcode;
-+}
-+
-+static int db_dir_proc(ext2_filsys fs, struct ext2_db_entry *db_info,
-+		       void *priv_data)
-+{
-+	struct dir_context	*ctx;
-+
-+	ctx = (struct dir_context *) priv_data;
-+	ctx->dir = db_info->ino;
-+	
-+	return ext2fs_process_dir_block(fs, &db_info->blk,
-+					db_info->blockcnt, 0, 0, priv_data);
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/dirblock.c silo-1.4.13/libext2fs/dirblock.c
---- silo-1.4.13.orig/libext2fs/dirblock.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/dirblock.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,130 @@
-+/*
-+ * dirblock.c --- directory block routines.
-+ * 
-+ * Copyright (C) 1995, 1996 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <string.h>
-+#include <time.h>
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+errcode_t ext2fs_read_dir_block2(ext2_filsys fs, blk_t block,
-+				 void *buf, int flags EXT2FS_ATTR((unused)))
-+{
-+	errcode_t	retval;
-+	char		*p, *end;
-+	struct ext2_dir_entry *dirent;
-+	unsigned int	name_len, rec_len, do_swap;
-+	
-+
-+ 	retval = io_channel_read_blk(fs->io, block, 1, buf);
-+	if (retval)
-+		return retval;
-+#ifdef EXT2FS_ENABLE_SWAPFS
-+	do_swap = (fs->flags & (EXT2_FLAG_SWAP_BYTES|
-+				EXT2_FLAG_SWAP_BYTES_READ)) != 0;
-+#endif
-+	p = (char *) buf;
-+	end = (char *) buf + fs->blocksize;
-+	while (p < end-8) {
-+		dirent = (struct ext2_dir_entry *) p;
-+#ifdef EXT2FS_ENABLE_SWAPFS
-+		if (do_swap) {
-+			dirent->inode = ext2fs_swab32(dirent->inode);
-+			dirent->rec_len = ext2fs_swab16(dirent->rec_len);
-+			dirent->name_len = ext2fs_swab16(dirent->name_len);
-+		}
-+#endif
-+		name_len = dirent->name_len;
-+#ifdef WORDS_BIGENDIAN
-+		if (flags & EXT2_DIRBLOCK_V2_STRUCT)
-+			dirent->name_len = ext2fs_swab16(dirent->name_len);
-+#endif
-+		rec_len = dirent->rec_len;
-+		if ((rec_len < 8) || (rec_len % 4)) {
-+			rec_len = 8;
-+			retval = EXT2_ET_DIR_CORRUPTED;
-+		}
-+		if (((name_len & 0xFF) + 8) > dirent->rec_len)
-+			retval = EXT2_ET_DIR_CORRUPTED;
-+		p += rec_len;
-+	}
-+	return retval;
-+}
-+
-+errcode_t ext2fs_read_dir_block(ext2_filsys fs, blk_t block,
-+				 void *buf)
-+{
-+	return ext2fs_read_dir_block2(fs, block, buf, 0);
-+}
-+
-+
-+errcode_t ext2fs_write_dir_block2(ext2_filsys fs, blk_t block,
-+				  void *inbuf, int flags EXT2FS_ATTR((unused)))
-+{
-+#ifdef EXT2FS_ENABLE_SWAPFS
-+	int		do_swap = 0;
-+	errcode_t	retval;
-+	char		*p, *end;
-+	char		*buf = 0;
-+	struct ext2_dir_entry *dirent;
-+
-+	if ((fs->flags & EXT2_FLAG_SWAP_BYTES) ||
-+	    (fs->flags & EXT2_FLAG_SWAP_BYTES_WRITE))
-+		do_swap = 1;
-+
-+#ifndef WORDS_BIGENDIAN
-+	if (!do_swap)
-+		return io_channel_write_blk(fs->io, block, 1, (char *) inbuf);
-+#endif
-+
-+	retval = ext2fs_get_mem(fs->blocksize, &buf);
-+	if (retval)
-+		return retval;
-+	memcpy(buf, inbuf, fs->blocksize);
-+	p = buf;
-+	end = buf + fs->blocksize;
-+	while (p < end) {
-+		dirent = (struct ext2_dir_entry *) p;
-+		if ((dirent->rec_len < 8) ||
-+		    (dirent->rec_len % 4)) {
-+			ext2fs_free_mem(&buf);
-+			return (EXT2_ET_DIR_CORRUPTED);
-+		}
-+		p += dirent->rec_len;
-+		if (do_swap) {
-+			dirent->inode = ext2fs_swab32(dirent->inode);
-+			dirent->rec_len = ext2fs_swab16(dirent->rec_len);
-+			dirent->name_len = ext2fs_swab16(dirent->name_len);
-+		}
-+#ifdef WORDS_BIGENDIAN 
-+		if (flags & EXT2_DIRBLOCK_V2_STRUCT)
-+			dirent->name_len = ext2fs_swab16(dirent->name_len);
-+#endif
-+	}
-+ 	retval = io_channel_write_blk(fs->io, block, 1, buf);
-+	ext2fs_free_mem(&buf);
-+	return retval;
-+#else
-+ 	return io_channel_write_blk(fs->io, block, 1, (char *) inbuf);
-+#endif
-+}
-+
-+
-+errcode_t ext2fs_write_dir_block(ext2_filsys fs, blk_t block,
-+				 void *inbuf)
-+{
-+	return ext2fs_write_dir_block2(fs, block, inbuf, 0);
-+}
-+
-diff -Naur silo-1.4.13.orig/libext2fs/dirhash.c silo-1.4.13/libext2fs/dirhash.c
---- silo-1.4.13.orig/libext2fs/dirhash.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/dirhash.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,233 @@
-+/*
-+ * dirhash.c -- Calculate the hash of a directory entry
-+ *
-+ * Copyright (c) 2001  Daniel Phillips
-+ * 
-+ * Copyright (c) 2002 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+/*
-+ * Keyed 32-bit hash function using TEA in a Davis-Meyer function
-+ *   H0 = Key
-+ *   Hi = E Mi(Hi-1) + Hi-1
-+ *
-+ * (see Applied Cryptography, 2nd edition, p448).
-+ *
-+ * Jeremy Fitzhardinge <jeremy@zip.com.au> 1998
-+ * 
-+ * This code is made available under the terms of the GPL
-+ */
-+#define DELTA 0x9E3779B9
-+
-+static void TEA_transform(__u32 buf[4], __u32 const in[])
-+{
-+	__u32	sum = 0;
-+	__u32	b0 = buf[0], b1 = buf[1];
-+	__u32	a = in[0], b = in[1], c = in[2], d = in[3];
-+	int	n = 16;
-+
-+	do {							
-+		sum += DELTA;					
-+		b0 += ((b1 << 4)+a) ^ (b1+sum) ^ ((b1 >> 5)+b);	
-+		b1 += ((b0 << 4)+c) ^ (b0+sum) ^ ((b0 >> 5)+d);	
-+	} while(--n);
-+
-+	buf[0] += b0;
-+	buf[1] += b1;
-+}
-+
-+/* F, G and H are basic MD4 functions: selection, majority, parity */
-+#define F(x, y, z) ((z) ^ ((x) & ((y) ^ (z))))
-+#define G(x, y, z) (((x) & (y)) + (((x) ^ (y)) & (z)))
-+#define H(x, y, z) ((x) ^ (y) ^ (z))
-+
-+/*
-+ * The generic round function.  The application is so specific that
-+ * we don't bother protecting all the arguments with parens, as is generally
-+ * good macro practice, in favor of extra legibility.
-+ * Rotation is separate from addition to prevent recomputation
-+ */
-+#define ROUND(f, a, b, c, d, x, s)	\
-+	(a += f(b, c, d) + x, a = (a << s) | (a >> (32-s)))
-+#define K1 0
-+#define K2 013240474631UL
-+#define K3 015666365641UL
-+
-+/*
-+ * Basic cut-down MD4 transform.  Returns only 32 bits of result.
-+ */
-+static void halfMD4Transform (__u32 buf[4], __u32 const in[])
-+{
-+	__u32	a = buf[0], b = buf[1], c = buf[2], d = buf[3];
-+
-+	/* Round 1 */
-+	ROUND(F, a, b, c, d, in[0] + K1,  3);
-+	ROUND(F, d, a, b, c, in[1] + K1,  7);
-+	ROUND(F, c, d, a, b, in[2] + K1, 11);
-+	ROUND(F, b, c, d, a, in[3] + K1, 19);
-+	ROUND(F, a, b, c, d, in[4] + K1,  3);
-+	ROUND(F, d, a, b, c, in[5] + K1,  7);
-+	ROUND(F, c, d, a, b, in[6] + K1, 11);
-+	ROUND(F, b, c, d, a, in[7] + K1, 19);
-+
-+	/* Round 2 */
-+	ROUND(G, a, b, c, d, in[1] + K2,  3);
-+	ROUND(G, d, a, b, c, in[3] + K2,  5);
-+	ROUND(G, c, d, a, b, in[5] + K2,  9);
-+	ROUND(G, b, c, d, a, in[7] + K2, 13);
-+	ROUND(G, a, b, c, d, in[0] + K2,  3);
-+	ROUND(G, d, a, b, c, in[2] + K2,  5);
-+	ROUND(G, c, d, a, b, in[4] + K2,  9);
-+	ROUND(G, b, c, d, a, in[6] + K2, 13);
-+
-+	/* Round 3 */
-+	ROUND(H, a, b, c, d, in[3] + K3,  3);
-+	ROUND(H, d, a, b, c, in[7] + K3,  9);
-+	ROUND(H, c, d, a, b, in[2] + K3, 11);
-+	ROUND(H, b, c, d, a, in[6] + K3, 15);
-+	ROUND(H, a, b, c, d, in[1] + K3,  3);
-+	ROUND(H, d, a, b, c, in[5] + K3,  9);
-+	ROUND(H, c, d, a, b, in[0] + K3, 11);
-+	ROUND(H, b, c, d, a, in[4] + K3, 15);
-+
-+	buf[0] += a;
-+	buf[1] += b;
-+	buf[2] += c;
-+	buf[3] += d;
-+}
-+
-+#undef ROUND
-+#undef F
-+#undef G
-+#undef H
-+#undef K1
-+#undef K2
-+#undef K3
-+
-+/* The old legacy hash */
-+static ext2_dirhash_t dx_hack_hash (const char *name, int len)
-+{
-+	__u32 hash0 = 0x12a3fe2d, hash1 = 0x37abe8f9;
-+	while (len--) {
-+		__u32 hash = hash1 + (hash0 ^ (*name++ * 7152373));
-+		
-+		if (hash & 0x80000000) hash -= 0x7fffffff;
-+		hash1 = hash0;
-+		hash0 = hash;
-+	}
-+	return (hash0 << 1);
-+}
-+
-+static void str2hashbuf(const char *msg, int len, __u32 *buf, int num)
-+{
-+	__u32	pad, val;
-+	int	i;
-+
-+	pad = (__u32)len | ((__u32)len << 8);
-+	pad |= pad << 16;
-+
-+	val = pad;
-+	if (len > num*4)
-+		len = num * 4;
-+	for (i=0; i < len; i++) {
-+		if ((i % 4) == 0)
-+			val = pad;
-+		val = msg[i] + (val << 8);
-+		if ((i % 4) == 3) {
-+			*buf++ = val;
-+			val = pad;
-+			num--;
-+		}
-+	}
-+	if (--num >= 0)
-+		*buf++ = val;
-+	while (--num >= 0)
-+		*buf++ = pad;
-+}
-+
-+/*
-+ * Returns the hash of a filename.  If len is 0 and name is NULL, then
-+ * this function can be used to test whether or not a hash version is
-+ * supported.
-+ * 
-+ * The seed is an 4 longword (32 bits) "secret" which can be used to
-+ * uniquify a hash.  If the seed is all zero's, then some default seed
-+ * may be used.
-+ * 
-+ * A particular hash version specifies whether or not the seed is
-+ * represented, and whether or not the returned hash is 32 bits or 64
-+ * bits.  32 bit hashes will return 0 for the minor hash.
-+ */
-+errcode_t ext2fs_dirhash(int version, const char *name, int len,
-+			 const __u32 *seed,
-+			 ext2_dirhash_t *ret_hash,
-+			 ext2_dirhash_t *ret_minor_hash)
-+{
-+	__u32	hash;
-+	__u32	minor_hash = 0;
-+	const char	*p;
-+	int		i;
-+	__u32 		in[8], buf[4];
-+
-+	/* Initialize the default seed for the hash checksum functions */
-+	buf[0] = 0x67452301;
-+	buf[1] = 0xefcdab89;
-+	buf[2] = 0x98badcfe;
-+	buf[3] = 0x10325476;
-+
-+	/* Check to see if the seed is all zero's */
-+	if (seed) {
-+		for (i=0; i < 4; i++) {
-+			if (seed[i])
-+				break;
-+		}
-+		if (i < 4)
-+			memcpy(buf, seed, sizeof(buf));
-+	}
-+		
-+	switch (version) {
-+	case EXT2_HASH_LEGACY:
-+		hash = dx_hack_hash(name, len);
-+		break;
-+	case EXT2_HASH_HALF_MD4:
-+		p = name;
-+		while (len > 0) {
-+			str2hashbuf(p, len, in, 8);
-+			halfMD4Transform(buf, in);
-+			len -= 32;
-+			p += 32;
-+		}
-+		minor_hash = buf[2];
-+		hash = buf[1];
-+		break;
-+	case EXT2_HASH_TEA:
-+		p = name;
-+		while (len > 0) {
-+			str2hashbuf(p, len, in, 4);
-+			TEA_transform(buf, in);
-+			len -= 16;
-+			p += 16;
-+		}
-+		hash = buf[0];
-+		minor_hash = buf[1];
-+		break;
-+	default:
-+		*ret_hash = 0;
-+		return EXT2_ET_DIRHASH_UNSUPP;
-+	}
-+	*ret_hash = hash & ~1;
-+	if (ret_minor_hash)
-+		*ret_minor_hash = minor_hash;
-+	return 0;
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/dir_iterate.c silo-1.4.13/libext2fs/dir_iterate.c
---- silo-1.4.13.orig/libext2fs/dir_iterate.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/dir_iterate.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,219 @@
-+/*
-+ * dir_iterate.c --- ext2fs directory iteration operations
-+ * 
-+ * Copyright (C) 1993, 1994, 1994, 1995, 1996, 1997 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#if HAVE_ERRNO_H
-+#include <errno.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fsP.h"
-+
-+/*
-+ * This function checks to see whether or not a potential deleted
-+ * directory entry looks valid.  What we do is check the deleted entry
-+ * and each successive entry to make sure that they all look valid and
-+ * that the last deleted entry ends at the beginning of the next
-+ * undeleted entry.  Returns 1 if the deleted entry looks valid, zero
-+ * if not valid.
-+ */
-+static int ext2fs_validate_entry(char *buf, int offset, int final_offset)
-+{
-+	struct ext2_dir_entry *dirent;
-+	
-+	while (offset < final_offset) {
-+		dirent = (struct ext2_dir_entry *)(buf + offset);
-+		offset += dirent->rec_len;
-+		if ((dirent->rec_len < 8) ||
-+		    ((dirent->rec_len % 4) != 0) ||
-+		    (((dirent->name_len & 0xFF)+8) > dirent->rec_len))
-+			return 0;
-+	}
-+	return (offset == final_offset);
-+}
-+
-+errcode_t ext2fs_dir_iterate2(ext2_filsys fs,
-+			      ext2_ino_t dir,
-+			      int flags,
-+			      char *block_buf,
-+			      int (*func)(ext2_ino_t	dir,
-+					  int		entry,
-+					  struct ext2_dir_entry *dirent,
-+					  int	offset,
-+					  int	blocksize,
-+					  char	*buf,
-+					  void	*priv_data),
-+			      void *priv_data)
-+{
-+	struct		dir_context	ctx;
-+	errcode_t	retval;
-+	
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	retval = ext2fs_check_directory(fs, dir);
-+	if (retval)
-+		return retval;
-+	
-+	ctx.dir = dir;
-+	ctx.flags = flags;
-+	if (block_buf)
-+		ctx.buf = block_buf;
-+	else {
-+		retval = ext2fs_get_mem(fs->blocksize, &ctx.buf);
-+		if (retval)
-+			return retval;
-+	}
-+	ctx.func = func;
-+	ctx.priv_data = priv_data;
-+	ctx.errcode = 0;
-+	retval = ext2fs_block_iterate2(fs, dir, 0, 0,
-+				       ext2fs_process_dir_block, &ctx);
-+	if (!block_buf)
-+		ext2fs_free_mem(&ctx.buf);
-+	if (retval)
-+		return retval;
-+	return ctx.errcode;
-+}
-+
-+struct xlate {
-+	int (*func)(struct ext2_dir_entry *dirent,
-+		    int		offset,
-+		    int		blocksize,
-+		    char	*buf,
-+		    void	*priv_data);
-+	void *real_private;
-+};
-+
-+static int xlate_func(ext2_ino_t dir EXT2FS_ATTR((unused)),
-+		      int entry EXT2FS_ATTR((unused)),
-+		      struct ext2_dir_entry *dirent, int offset,
-+		      int blocksize, char *buf, void *priv_data)
-+{
-+	struct xlate *xl = (struct xlate *) priv_data;
-+
-+	return (*xl->func)(dirent, offset, blocksize, buf, xl->real_private);
-+}
-+
-+extern errcode_t ext2fs_dir_iterate(ext2_filsys fs, 
-+			      ext2_ino_t dir,
-+			      int flags,
-+			      char *block_buf,
-+			      int (*func)(struct ext2_dir_entry *dirent,
-+					  int	offset,
-+					  int	blocksize,
-+					  char	*buf,
-+					  void	*priv_data),
-+			      void *priv_data)
-+{
-+	struct xlate xl;
-+	
-+	xl.real_private = priv_data;
-+	xl.func = func;
-+
-+	return ext2fs_dir_iterate2(fs, dir, flags, block_buf,
-+				   xlate_func, &xl);
-+}
-+
-+
-+/*
-+ * Helper function which is private to this module.  Used by
-+ * ext2fs_dir_iterate() and ext2fs_dblist_dir_iterate()
-+ */
-+int ext2fs_process_dir_block(ext2_filsys fs,
-+			     blk_t	*blocknr,
-+			     e2_blkcnt_t blockcnt,
-+			     blk_t	ref_block EXT2FS_ATTR((unused)),
-+			     int	ref_offset EXT2FS_ATTR((unused)),
-+			     void	*priv_data)
-+{
-+	struct dir_context *ctx = (struct dir_context *) priv_data;
-+	unsigned int	offset = 0;
-+	unsigned int	next_real_entry = 0;
-+	int		ret = 0;
-+	int		changed = 0;
-+	int		do_abort = 0;
-+	int		entry, size;
-+	struct ext2_dir_entry *dirent;
-+
-+	if (blockcnt < 0)
-+		return 0;
-+
-+	entry = blockcnt ? DIRENT_OTHER_FILE : DIRENT_DOT_FILE;
-+	
-+	ctx->errcode = ext2fs_read_dir_block(fs, *blocknr, ctx->buf);
-+	if (ctx->errcode)
-+		return BLOCK_ABORT;
-+
-+	while (offset < fs->blocksize) {
-+		dirent = (struct ext2_dir_entry *) (ctx->buf + offset);
-+		if (((offset + dirent->rec_len) > fs->blocksize) ||
-+		    (dirent->rec_len < 8) ||
-+		    ((dirent->rec_len % 4) != 0) ||
-+		    (((dirent->name_len & 0xFF)+8) > dirent->rec_len)) {
-+			ctx->errcode = EXT2_ET_DIR_CORRUPTED;
-+			return BLOCK_ABORT;
-+		}
-+		if (!dirent->inode &&
-+		    !(ctx->flags & DIRENT_FLAG_INCLUDE_EMPTY))
-+			goto next;
-+
-+		ret = (ctx->func)(ctx->dir,
-+				  (next_real_entry > offset) ?
-+				  DIRENT_DELETED_FILE : entry,
-+				  dirent, offset,
-+				  fs->blocksize, ctx->buf,
-+				  ctx->priv_data);
-+		if (entry < DIRENT_OTHER_FILE)
-+			entry++;
-+			
-+		if (ret & DIRENT_CHANGED)
-+			changed++;
-+		if (ret & DIRENT_ABORT) {
-+			do_abort++;
-+			break;
-+		}
-+next:		
-+ 		if (next_real_entry == offset)
-+			next_real_entry += dirent->rec_len;
-+ 
-+ 		if (ctx->flags & DIRENT_FLAG_INCLUDE_REMOVED) {
-+			size = ((dirent->name_len & 0xFF) + 11) & ~3;
-+
-+			if (dirent->rec_len != size)  {
-+				unsigned int final_offset;
-+
-+				final_offset = offset + dirent->rec_len;
-+				offset += size;
-+				while (offset < final_offset &&
-+				       !ext2fs_validate_entry(ctx->buf,
-+							      offset,
-+							      final_offset))
-+					offset += 4;
-+				continue;
-+			}
-+		}
-+		offset += dirent->rec_len;
-+	}
-+
-+	if (changed) {
-+		ctx->errcode = ext2fs_write_dir_block(fs, *blocknr, ctx->buf);
-+		if (ctx->errcode)
-+			return BLOCK_ABORT;
-+	}
-+	if (do_abort)
-+		return BLOCK_ABORT;
-+	return 0;
-+}
-+
-diff -Naur silo-1.4.13.orig/libext2fs/dosio.c silo-1.4.13/libext2fs/dosio.c
---- silo-1.4.13.orig/libext2fs/dosio.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/dosio.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,456 @@
-+/*
-+ * dosio.c -- Disk I/O module for the ext2fs/DOS library.
-+ *
-+ * Copyright (c) 1997 by Theodore Ts'o.
-+ * 
-+ * Copyright (c) 1997 Mark Habersack
-+ * This file may be distributed under the terms of the GNU Public License.
-+ *
-+ */
-+
-+#include <stdio.h>
-+#include <bios.h>
-+#include <string.h>
-+#include <ctype.h>
-+#include <io.h>
-+#ifdef HAVE_ERRNO_H
-+#include <errno.h>
-+#endif
-+
-+#include <ext2fs/ext2_types.h>
-+#include "utils.h"
-+#include "dosio.h"
-+#include "et/com_err.h"
-+#include "ext2_err.h"
-+#include "ext2fs/io.h"
-+
-+/*
-+ * Some helper macros
-+ */
-+#define LINUX_EXT2FS       0x83
-+#define LINUX_SWAP         0x82
-+#define WRITE_ERR(_msg_) write(2, _msg_, strlen(_msg_))
-+#define WRITE_ERR_S(_msg_) write(2, _msg_, sizeof(_msg_))
-+
-+/*
-+ * Exported variables
-+ */
-+unsigned long        _dio_error;
-+unsigned long        _dio_hw_error;
-+
-+/*
-+ * Array of all opened partitions
-+ */
-+static PARTITION        **partitions = NULL;
-+static unsigned short   npart = 0; /* Number of mapped partitions */
-+static PARTITION        *active = NULL;
-+
-+/*
-+ * I/O Manager routine prototypes
-+ */
-+static errcode_t dos_open(const char *dev, int flags, io_channel *channel);
-+static errcode_t dos_close(io_channel channel);
-+static errcode_t dos_set_blksize(io_channel channel, int blksize);
-+static errcode_t dos_read_blk(io_channel channel, unsigned long block,
-+                                             int count, void *buf);
-+static errcode_t dos_write_blk(io_channel channel, unsigned long block,
-+                               int count, const void *buf);
-+static errcode_t dos_flush(io_channel channel);
-+
-+static struct struct_io_manager struct_dos_manager = {
-+        EXT2_ET_MAGIC_IO_MANAGER,
-+        "DOS I/O Manager",
-+        dos_open,
-+        dos_close,
-+        dos_set_blksize,
-+        dos_read_blk,
-+        dos_write_blk,
-+        dos_flush
-+};
-+io_manager dos_io_manager = &struct_dos_manager;
-+
-+/*
-+ * Macro taken from unix_io.c
-+ */
-+/*
-+ * For checking structure magic numbers...
-+ */
-+
-+#define EXT2_CHECK_MAGIC(struct, code) \
-+          if ((struct)->magic != (code)) return (code)
-+
-+/*
-+ * Calculates a CHS address of a sector from its LBA
-+ * offset for the given partition.
-+ */
-+static void lba2chs(unsigned long lba_addr, CHS *chs, PARTITION *part)
-+{
-+  unsigned long      abss;
-+
-+  chs->offset = lba_addr & 0x000001FF;
-+  abss = (lba_addr >> 9) + part->start;
-+  chs->cyl    = abss / (part->sects * part->heads);
-+  chs->head   = (abss / part->sects) % part->heads;
-+  chs->sector = (abss % part->sects) + 1;
-+}
-+
-+#ifdef __TURBOC__
-+#pragma argsused
-+#endif
-+/*
-+ * Scans the passed partition table looking for *pno partition
-+ * that has LINUX_EXT2FS type.
-+ *
-+ * TODO:
-+ * For partition numbers >5 Linux uses DOS extended partitions -
-+ * dive into them an return an appropriate entry. Also dive into
-+ * extended partitions when scanning for a first Linux/ext2fs.
-+ */
-+static PTABLE_ENTRY *scan_partition_table(PTABLE_ENTRY *pentry,
-+                                          unsigned short phys,
-+                                          unsigned char *pno)
-+{
-+  unsigned        i;
-+
-+  if(*pno != 0xFF && *pno >= 5)
-+     return NULL; /* We don't support extended partitions for now */
-+
-+  if(*pno != 0xFF)
-+  {
-+    if(pentry[*pno].type == LINUX_EXT2FS)
-+      return &pentry[*pno];
-+    else
-+    {
-+      if(!pentry[*pno].type)
-+        *pno = 0xFE;
-+      else if(pentry[*pno].type == LINUX_SWAP)
-+        *pno = 0xFD;
-+      return NULL;
-+    }
-+  }
-+
-+  for(i = 0; i < 4; i++)
-+    if(pentry[i].type == LINUX_EXT2FS)
-+    {
-+      *pno = i;
-+      return &pentry[i];
-+    }
-+
-+  return NULL;
-+}
-+
-+/*
-+ * Allocate libext2fs structures associated with I/O manager
-+ */
-+static io_channel alloc_io_channel(PARTITION *part)
-+{
-+  io_channel     ioch;
-+
-+  ioch = (io_channel)malloc(sizeof(struct struct_io_channel));
-+  if (!ioch)
-+	  return NULL;
-+  memset(ioch, 0, sizeof(struct struct_io_channel));
-+  ioch->magic = EXT2_ET_MAGIC_IO_CHANNEL;
-+  ioch->manager = dos_io_manager;
-+  ioch->name = (char *)malloc(strlen(part->dev)+1);
-+  if (!ioch->name) {
-+	  free(ioch);
-+	  return NULL;
-+  }
-+  strcpy(ioch->name, part->dev);
-+  ioch->private_data = part;
-+  ioch->block_size = 1024; /* The smallest ext2fs block size */
-+  ioch->read_error = 0;
-+  ioch->write_error = 0;
-+
-+  return ioch;
-+}
-+
-+#ifdef __TURBOC__
-+#pragma argsused
-+#endif
-+/*
-+ * Open the 'name' partition, initialize all information structures
-+ * we need to keep and create libext2fs I/O manager.
-+ */
-+static errcode_t dos_open(const char *dev, int flags, io_channel *channel)
-+{
-+  unsigned char  *tmp, sec[512];
-+  PARTITION      *part;
-+  PTABLE_ENTRY   *pent;
-+  PARTITION        **newparts;
-+  
-+  if(!dev)
-+  {
-+    _dio_error = ERR_BADDEV;
-+    return EXT2_ET_BAD_DEVICE_NAME;
-+  }
-+
-+  /*
-+   * First check whether the dev name is OK
-+   */
-+  tmp = (unsigned char*)strrchr(dev, '/');
-+  if(!tmp)
-+  {
-+    _dio_error = ERR_BADDEV;
-+    return EXT2_ET_BAD_DEVICE_NAME;
-+  }
-+  *tmp = 0;
-+  if(strcmp(dev, "/dev"))
-+  {
-+    _dio_error = ERR_BADDEV;
-+    return EXT2_ET_BAD_DEVICE_NAME;
-+  }
-+  *tmp++ = '/';
-+
-+  /*
-+   * Check whether the partition data is already in cache
-+   */
-+
-+  part = (PARTITION*)malloc(sizeof(PARTITION));
-+  if (!part)
-+	  return ENOMEM;
-+  {
-+    int   i = 0;
-+
-+    for(;i < npart; i++)
-+      if(!strcmp(partitions[i]->dev, dev))
-+      {
-+        /* Found it! Make it the active one */
-+        active = partitions[i];
-+        *channel = alloc_io_channel(active);
-+	if (!*channel)
-+		return ENOMEM;
-+        return 0;
-+      }
-+  }
-+
-+  /*
-+   * Drive number & optionally partn number
-+   */
-+  switch(tmp[0])
-+  {
-+    case 'h':
-+    case 's':
-+      part->phys = 0x80;
-+      part->phys += toupper(tmp[2]) - 'A';
-+      /*
-+       * Do we have the partition number?
-+       */
-+      if(tmp[3])
-+        part->pno = isdigit((int)tmp[3]) ? tmp[3] - '0' - 1: 0;
-+      else
-+        part->pno = 0xFF;
-+      break;
-+
-+    case 'f':
-+      if(tmp[2])
-+        part->phys = isdigit((int)tmp[2]) ? tmp[2] - '0' : 0;
-+      else
-+        part->phys = 0x00; /* We'll assume /dev/fd0 */
-+      break;
-+
-+    default:
-+      _dio_error = ERR_BADDEV;
-+      return ENODEV;
-+  }
-+
-+  if(part->phys < 0x80)
-+  {
-+     /* We don't support floppies for now */
-+     _dio_error = ERR_NOTSUPP;
-+     return EINVAL;
-+  }
-+
-+  part->dev = strdup(dev);
-+
-+  /*
-+   * Get drive's geometry
-+   */
-+  _dio_hw_error = biosdisk(DISK_GET_GEOMETRY,
-+                           part->phys,
-+                           0, /* head */
-+                           0, /* cylinder */
-+                           1, /* sector */
-+                           1, /* just one sector */
-+                           sec);
-+
-+  if(!HW_OK())
-+  {
-+    _dio_error = ERR_HARDWARE;
-+    if (part)
-+	    free(part);
-+    return EFAULT;
-+  }
-+
-+  /*
-+   * Calculate the geometry
-+   */
-+  part->cyls  = (unsigned short)(((sec[0] >> 6) << 8) + sec[1] + 1);
-+  part->heads = sec[3] + 1;
-+  part->sects = sec[0] & 0x3F;
-+
-+  /*
-+   * Now that we know all we need, let's look for the partition
-+   */
-+  _dio_hw_error = biosdisk(DISK_READ, part->phys, 0, 0, 1, 1, sec);
-+
-+  if(!HW_OK())
-+  {
-+    _dio_error = ERR_HARDWARE;
-+    if (part)
-+	    free(part);
-+    return EFAULT;
-+  }
-+
-+  pent = (PTABLE_ENTRY*)&sec[0x1BE];
-+  pent = scan_partition_table(pent, part->phys, &part->pno);
-+
-+  if(!pent)
-+  {
-+    _dio_error = part->pno == 0xFE ? ERR_EMPTYPART :
-+                 part->pno == 0xFD ? ERR_LINUXSWAP : ERR_NOTEXT2FS;
-+    if (part)
-+	    free(part);
-+    return ENODEV;
-+  }
-+
-+  /*
-+   * Calculate the remaining figures
-+   */
-+  {
-+    unsigned long    fsec, fhead, fcyl;
-+
-+    fsec = (unsigned long)(pent->start_sec & 0x3F);
-+    fhead = (unsigned long)pent->start_head;
-+    fcyl = ((pent->start_sec >> 6) << 8) + pent->start_cyl;
-+    part->start = fsec + fhead * part->sects + fcyl *
-+                  (part->heads * part->sects) - 1;
-+    part->len = pent->size;
-+  }
-+
-+  /*
-+   * Add the partition to the table
-+   */
-+  newparts = (PARTITION**)realloc(partitions, sizeof(PARTITION) * npart);
-+  if (!newparts) {
-+	  free(part);
-+	  return ENOMEM;
-+  }
-+  partitions = newparts;
-+  partitions[npart++] = active = part;
-+
-+  /*
-+   * Now alloc all libe2fs structures
-+   */
-+  *channel = alloc_io_channel(active);
-+  if (!*channel)
-+	  return ENOMEM;
-+
-+  return 0;
-+}
-+
-+static errcode_t dos_close(io_channel channel)
-+{
-+	if (channel->name)
-+		free(channel->name);
-+	if (channel)
-+		free(channel);
-+
-+	return 0;
-+}
-+
-+static errcode_t dos_set_blksize(io_channel channel, int blksize)
-+{
-+  channel->block_size = blksize;
-+
-+  return 0;
-+}
-+
-+static errcode_t dos_read_blk(io_channel channel, unsigned long block,
-+                                             int count, void *buf)
-+{
-+  PARTITION     *part;
-+  size_t        size;
-+  ext2_loff_t   loc;
-+  CHS           chs;
-+
-+  EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
-+  part = (PARTITION*)channel->private_data;
-+
-+  size = (size_t)((count < 0) ? -count : count * channel->block_size);
-+  loc = (ext2_loff_t) block * channel->block_size;
-+
-+  lba2chs(loc, &chs, part);
-+  /*
-+   * Potential bug here:
-+   *   If DJGPP is used then reads of >18 sectors will fail!
-+   *   Have to rewrite biosdisk.
-+   */
-+  _dio_hw_error = biosdisk(DISK_READ,
-+                           part->phys,
-+                           chs.head,
-+                           chs.cyl,
-+                           chs.sector,
-+                           size < 512 ? 1 : size/512,
-+                           buf);
-+
-+  if(!HW_OK())
-+  {
-+    _dio_error = ERR_HARDWARE;
-+    return EFAULT;
-+  }
-+
-+  return 0;
-+}
-+
-+static errcode_t dos_write_blk(io_channel channel, unsigned long block,
-+                               int count, const void *buf)
-+{
-+  PARTITION     *part;
-+  size_t        size;
-+  ext2_loff_t   loc;
-+  CHS           chs;
-+
-+  EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
-+  part = (PARTITION*)channel->private_data;
-+
-+  if(count == 1)
-+    size = (size_t)channel->block_size;
-+  else
-+  {
-+    if (count < 0)
-+      size = (size_t)-count;
-+    else
-+      size = (size_t)(count * channel->block_size);
-+  }
-+
-+  loc = (ext2_loff_t)block * channel->block_size;
-+  lba2chs(loc, &chs, part);
-+  _dio_hw_error = biosdisk(DISK_WRITE,
-+                           part->phys,
-+                           chs.head,
-+                           chs.cyl,
-+                           chs.sector,
-+                           size < 512 ? 1 : size/512,
-+                           (void*)buf);
-+
-+  if(!HW_OK())
-+  {
-+    _dio_error = ERR_HARDWARE;
-+    return EFAULT;
-+  }
-+
-+  return 0;
-+}
-+
-+#ifdef __TURBOC__
-+#pragma argsused
-+#endif
-+static errcode_t dos_flush(io_channel channel)
-+{
-+  /*
-+   * No buffers, no flush...
-+   */
-+  return 0;
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/dosio.h silo-1.4.13/libext2fs/dosio.h
---- silo-1.4.13.orig/libext2fs/dosio.h	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/dosio.h	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,153 @@
-+/*
-+ * v1.0
-+ *
-+ * Disk I/O include file for the ext2fs/DOS library.
-+ *
-+ * Copyright (c) 1997 Mark Habersack
-+ * This file may be distributed under the terms of the GNU Public License.
-+ *
-+ */
-+#ifndef __diskio_h
-+#define __diskio_h
-+#ifdef __TURBOC__
-+#ifndef __LARGE__
-+# error "ext2fs/DOS library requires LARGE model!"
-+#endif
-+#endif
-+
-+#ifdef __TURBOC__
-+#include "msdos.h"
-+#endif
-+
-+/*
-+ * A helper structure used in LBA => CHS conversion
-+ */
-+typedef struct
-+{
-+  unsigned short       cyl;     /* Cylinder (or track) */
-+  unsigned short       head;
-+  unsigned short       sector;
-+  unsigned short       offset;  /* Offset of byte within the sector */
-+} CHS;
-+
-+/*
-+ * All partition data we need is here
-+ */
-+typedef struct
-+{
-+  char                 *dev;  /* _Linux_ device name (like "/dev/hda1") */
-+  unsigned char        phys;  /* Physical DOS drive number */
-+  unsigned long        start; /* LBA address of partition start */
-+  unsigned long        len;   /* length of partition in sectors */
-+  unsigned char        pno;   /* Partition number (read from *dev) */
-+
-+  /* This partition's drive geometry */
-+  unsigned short       cyls;
-+  unsigned short       heads;
-+  unsigned short       sects;
-+} PARTITION;
-+
-+/*
-+ * PC partition table entry format
-+ */
-+#ifdef __DJGPP__
-+#pragma pack(1)
-+#endif
-+typedef struct
-+{
-+  unsigned char        active;
-+  unsigned char        start_head;
-+  unsigned char        start_sec;
-+  unsigned char        start_cyl;
-+  unsigned char        type;
-+  unsigned char        end_head;
-+  unsigned char        end_sec;
-+  unsigned char        end_cyl;
-+  unsigned long        first_sec_rel;
-+  unsigned long        size;
-+} PTABLE_ENTRY;
-+#ifdef __DJGPP__
-+#pragma pack()
-+#endif
-+
-+/*
-+ * INT 0x13 operation codes
-+ */
-+#define DISK_READ          0x02
-+#define DISK_WRITE         0x03
-+#define DISK_GET_GEOMETRY  0x08
-+#define DISK_READY         0x10
-+
-+/*
-+ * Errors to put in _dio_error
-+ */
-+#define ERR_BADDEV         0x00000001L
-+#define ERR_HARDWARE       0x00000002L
-+#define ERR_NOTSUPP        0x00000003L
-+#define ERR_NOTEXT2FS      0x00000004L
-+#define ERR_EMPTYPART      0x00000005L
-+#define ERR_LINUXSWAP      0x00000006L
-+
-+/*
-+ * Functions in diskio.c
-+ */
-+
-+/*
-+ * Variable contains last module's error
-+ */
-+extern unsigned long        _dio_error;
-+
-+/*
-+ * This one contains last hardware error (if _dio_error == ERR_HARDWARE)
-+ */
-+extern unsigned long        _dio_hw_error;
-+
-+/*
-+ * Macros to check for disk hardware errors
-+ */
-+#define HW_OK()             ((unsigned char)_dio_hw_error == 0x00)
-+#define HW_BAD_CMD()        ((unsigned char)_dio_hw_error == 0x01)
-+#define HW_NO_ADDR_MARK()   ((unsigned char)_dio_hw_error == 0x02)
-+#define HW_WRITE_PROT()     ((unsigned char)_dio_hw_error == 0x03)
-+#define HW_NO_SECTOR()      ((unsigned char)_dio_hw_error == 0x04)
-+#define HW_RESET_FAIL()     ((unsigned char)_dio_hw_error == 0x05)
-+#define HW_DISK_CHANGED()   ((unsigned char)_dio_hw_error == 0x06)
-+#define HW_DRIVE_FAIL()     ((unsigned char)_dio_hw_error == 0x07)
-+#define HW_DMA_OVERRUN()    ((unsigned char)_dio_hw_error == 0x08)
-+#define HW_DMA_BOUNDARY()   ((unsigned char)_dio_hw_error == 0x09)
-+#define HW_BAD_SECTOR()     ((unsigned char)_dio_hw_error == 0x0A)
-+#define HW_BAD_TRACK()      ((unsigned char)_dio_hw_error == 0x0B)
-+#define HW_UNSUPP_TRACK()   ((unsigned char)_dio_hw_error == 0x0C)
-+#define HW_BAD_CRC_ECC()    ((unsigned char)_dio_hw_error == 0x10)
-+#define HW_CRC_ECC_CORR()   ((unsigned char)_dio_hw_error == 0x11)
-+#define HW_CONTR_FAIL()     ((unsigned char)_dio_hw_error == 0x20)
-+#define HW_SEEK_FAIL()      ((unsigned char)_dio_hw_error == 0x40)
-+#define HW_ATTACH_FAIL()    ((unsigned char)_dio_hw_error == 0x80)
-+#define HW_DRIVE_NREADY()   ((unsigned char)_dio_hw_error == 0xAA)
-+#define HW_UNDEF_ERROR()    ((unsigned char)_dio_hw_error == 0xBB)
-+#define HW_WRITE_FAULT()    ((unsigned char)_dio_hw_error == 0xCC)
-+#define HW_STATUS_ERROR()   ((unsigned char)_dio_hw_error == 0xE0)
-+#define HW_SENSE_FAIL()     ((unsigned char)_dio_hw_error == 0xFF)
-+
-+
-+/*
-+ * Open the specified partition.
-+ * String 'dev' must have a format:
-+ *
-+ *  /dev/{sd|hd|fd}[X]
-+ *
-+ * where,
-+ *
-+ *  only one of the option in curly braces can be used and X is an optional
-+ *  partition number for the given device. If X is not specified, function
-+ *  scans the drive's partition table in search for the first Linux ext2fs
-+ *  partition (signature 0x83). Along the way it dives into every extended
-+ *  partition encountered.
-+ *  Scan ends if either (a) there are no more used partition entries, or
-+ *  (b) there is no Xth partition.
-+ *
-+ * Routine returns 0 on success and !=0 otherwise.
-+ */
-+int open_partition(char *dev);
-+
-+#endif /* __diskio_h */
-diff -Naur silo-1.4.13.orig/libext2fs/dupfs.c silo-1.4.13/libext2fs/dupfs.c
---- silo-1.4.13.orig/libext2fs/dupfs.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/dupfs.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,96 @@
-+/*
-+ * dupfs.c --- duplicate a ext2 filesystem handle
-+ * 
-+ * Copyright (C) 1997, 1998, 2001, 2003, 2005 by Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <time.h>
-+#include <string.h>
-+
-+#include "ext2_fs.h"
-+#include "ext2fsP.h"
-+
-+errcode_t ext2fs_dup_handle(ext2_filsys src, ext2_filsys *dest)
-+{
-+	ext2_filsys	fs;
-+	errcode_t	retval;
-+
-+	EXT2_CHECK_MAGIC(src, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+	
-+	retval = ext2fs_get_mem(sizeof(struct struct_ext2_filsys), &fs);
-+	if (retval)
-+		return retval;
-+
-+	*fs = *src;
-+	fs->device_name = 0;
-+	fs->super = 0;
-+	fs->orig_super = 0;
-+	fs->group_desc = 0;
-+	fs->inode_map = 0;
-+	fs->block_map = 0;
-+	fs->badblocks = 0;
-+	fs->dblist = 0;
-+
-+	io_channel_bumpcount(fs->io);
-+	if (fs->icache)
-+		fs->icache->refcount++;
-+
-+	retval = ext2fs_get_mem(strlen(src->device_name)+1, &fs->device_name);
-+	if (retval)
-+		goto errout;
-+	strcpy(fs->device_name, src->device_name);
-+
-+	retval = ext2fs_get_mem(SUPERBLOCK_SIZE, &fs->super);
-+	if (retval)
-+		goto errout;
-+	memcpy(fs->super, src->super, SUPERBLOCK_SIZE);
-+
-+	retval = ext2fs_get_mem(SUPERBLOCK_SIZE, &fs->orig_super);
-+	if (retval)
-+		goto errout;
-+	memcpy(fs->orig_super, src->orig_super, SUPERBLOCK_SIZE);
-+
-+	retval = ext2fs_get_mem((size_t) fs->desc_blocks * fs->blocksize,
-+				&fs->group_desc);
-+	if (retval)
-+		goto errout;
-+	memcpy(fs->group_desc, src->group_desc,
-+	       (size_t) fs->desc_blocks * fs->blocksize);
-+
-+	if (src->inode_map) {
-+		retval = ext2fs_copy_bitmap(src->inode_map, &fs->inode_map);
-+		if (retval)
-+			goto errout;
-+	}
-+	if (src->block_map) {
-+		retval = ext2fs_copy_bitmap(src->block_map, &fs->block_map);
-+		if (retval)
-+			goto errout;
-+	}
-+	if (src->badblocks) {
-+		retval = ext2fs_badblocks_copy(src->badblocks, &fs->badblocks);
-+		if (retval)
-+			goto errout;
-+	}
-+	if (src->dblist) {
-+		retval = ext2fs_copy_dblist(src->dblist, &fs->dblist);
-+		if (retval)
-+			goto errout;
-+	}
-+	*dest = fs;
-+	return 0;
-+errout:
-+	ext2fs_free(fs);
-+	return retval;
-+	
-+}
-+
-diff -Naur silo-1.4.13.orig/libext2fs/e2image.h silo-1.4.13/libext2fs/e2image.h
---- silo-1.4.13.orig/libext2fs/e2image.h	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/e2image.h	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,51 @@
-+/*
-+ * e2image.h --- header file describing the ext2 image format
-+ * 
-+ * Copyright (C) 2000 Theodore Ts'o.
-+ *
-+ * Note: this uses the POSIX IO interfaces, unlike most of the other
-+ * functions in this library.  So sue me.  
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+
-+struct ext2_image_hdr {
-+	__u32	magic_number;	/* This must be EXT2_ET_MAGIC_E2IMAGE */
-+	char	magic_descriptor[16]; /* "Ext2 Image 1.0", w/ null padding */
-+	char	fs_hostname[64];/* Hostname of machine of image */
-+	char	fs_netaddr[32];	/* Network address */
-+	__u32	fs_netaddr_type;/* 0 = IPV4, 1 = IPV6, etc. */
-+	__u32	fs_device;	/* Device number of image */
-+	char	fs_device_name[64]; /* Device name */
-+	char	fs_uuid[16];	/* UUID of filesystem */
-+	__u32	fs_blocksize;	/* Block size of the filesystem */
-+	__u32	fs_reserved[8];
-+	
-+	__u32	image_device;	/* Device number of image file */
-+	__u32	image_inode;	/* Inode number of image file */
-+	__u32	image_time;	/* Time of image creation */
-+	__u32	image_reserved[8];
-+
-+	__u32	offset_super;	/* Byte offset of the sb and descriptors */
-+	__u32	offset_inode;	/* Byte offset of the inode table  */
-+	__u32	offset_inodemap; /* Byte offset of the inode bitmaps */
-+	__u32	offset_blockmap; /* Byte offset of the inode bitmaps */
-+	__u32	offset_reserved[8];
-+};
-+
-+	
-+	
-+	
-+	
-+	
-+	
-+	
-+	
-+	
-+	
-+	
-+	
-diff -Naur silo-1.4.13.orig/libext2fs/expanddir.c silo-1.4.13/libext2fs/expanddir.c
---- silo-1.4.13.orig/libext2fs/expanddir.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/expanddir.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,126 @@
-+/*
-+ * expand.c --- expand an ext2fs directory
-+ * 
-+ * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999  Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+struct expand_dir_struct {
-+	int		done;
-+	int		newblocks;
-+	errcode_t	err;
-+};
-+
-+static int expand_dir_proc(ext2_filsys	fs,
-+			   blk_t	*blocknr,
-+			   e2_blkcnt_t	blockcnt,
-+			   blk_t	ref_block EXT2FS_ATTR((unused)),
-+			   int		ref_offset EXT2FS_ATTR((unused)),
-+			   void		*priv_data)
-+{
-+	struct expand_dir_struct *es = (struct expand_dir_struct *) priv_data;
-+	blk_t	new_blk;
-+	static blk_t	last_blk = 0;
-+	char		*block;
-+	errcode_t	retval;
-+	
-+	if (*blocknr) {
-+		last_blk = *blocknr;
-+		return 0;
-+	}
-+	retval = ext2fs_new_block(fs, last_blk, 0, &new_blk);
-+	if (retval) {
-+		es->err = retval;
-+		return BLOCK_ABORT;
-+	}
-+	if (blockcnt > 0) {
-+		retval = ext2fs_new_dir_block(fs, 0, 0, &block);
-+		if (retval) {
-+			es->err = retval;
-+			return BLOCK_ABORT;
-+		}
-+		es->done = 1;
-+		retval = ext2fs_write_dir_block(fs, new_blk, block);
-+	} else {
-+		retval = ext2fs_get_mem(fs->blocksize, &block);
-+		if (retval) {
-+			es->err = retval;
-+			return BLOCK_ABORT;
-+		}
-+		memset(block, 0, fs->blocksize);
-+		retval = io_channel_write_blk(fs->io, new_blk, 1, block);
-+	}	
-+	if (retval) {
-+		es->err = retval;
-+		return BLOCK_ABORT;
-+	}
-+	ext2fs_free_mem(&block);
-+	*blocknr = new_blk;
-+	ext2fs_block_alloc_stats(fs, new_blk, +1);
-+	es->newblocks++;
-+
-+	if (es->done)
-+		return (BLOCK_CHANGED | BLOCK_ABORT);
-+	else
-+		return BLOCK_CHANGED;
-+}
-+
-+errcode_t ext2fs_expand_dir(ext2_filsys fs, ext2_ino_t dir)
-+{
-+	errcode_t	retval;
-+	struct expand_dir_struct es;
-+	struct ext2_inode	inode;
-+	
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	if (!(fs->flags & EXT2_FLAG_RW))
-+		return EXT2_ET_RO_FILSYS;
-+
-+	if (!fs->block_map)
-+		return EXT2_ET_NO_BLOCK_BITMAP;
-+
-+	retval = ext2fs_check_directory(fs, dir);
-+	if (retval)
-+		return retval;
-+	
-+	es.done = 0;
-+	es.err = 0;
-+	es.newblocks = 0;
-+	
-+	retval = ext2fs_block_iterate2(fs, dir, BLOCK_FLAG_APPEND,
-+				       0, expand_dir_proc, &es);
-+
-+	if (es.err)
-+		return es.err;
-+	if (!es.done)
-+		return EXT2_ET_EXPAND_DIR_ERR;
-+
-+	/*
-+	 * Update the size and block count fields in the inode.
-+	 */
-+	retval = ext2fs_read_inode(fs, dir, &inode);
-+	if (retval)
-+		return retval;
-+	
-+	inode.i_size += fs->blocksize;
-+	inode.i_blocks += (fs->blocksize / 512) * es.newblocks;
-+
-+	retval = ext2fs_write_inode(fs, dir, &inode);
-+	if (retval)
-+		return retval;
-+
-+	return 0;
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/ext2_err.c silo-1.4.13/libext2fs/ext2_err.c
---- silo-1.4.13.orig/libext2fs/ext2_err.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/ext2_err.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,148 @@
-+/*
-+ * ext2_err.c:
-+ * This file is automatically generated; please do not edit it.
-+ */
-+
-+#include <stdlib.h>
-+
-+static const char * const text[] = {
-+		"EXT2FS Library version 1.38",
-+		"Wrong magic number for ext2_filsys structure",
-+		"Wrong magic number for badblocks_list structure",
-+		"Wrong magic number for badblocks_iterate structure",
-+		"Wrong magic number for inode_scan structure",
-+		"Wrong magic number for io_channel structure",
-+		"Wrong magic number for unix io_channel structure",
-+		"Wrong magic number for io_manager structure",
-+		"Wrong magic number for block_bitmap structure",
-+		"Wrong magic number for inode_bitmap structure",
-+		"Wrong magic number for generic_bitmap structure",
-+		"Wrong magic number for test io_channel structure",
-+		"Wrong magic number for directory block list structure",
-+		"Wrong magic number for icount structure",
-+		"Wrong magic number for Powerquest io_channel structure",
-+		"Wrong magic number for ext2 file structure",
-+		"Wrong magic number for Ext2 Image Header",
-+		"Wrong magic number for inode io_channel structure",
-+		"Wrong magic number --- RESERVED_9",
-+		"Bad magic number in super-block",
-+		"Filesystem revision too high",
-+		"Attempt to write to filesystem opened read-only",
-+		"Can't read group descriptors",
-+		"Can't write group descriptors",
-+		"Corrupt group descriptor: bad block for block bitmap",
-+		"Corrupt group descriptor: bad block for inode bitmap",
-+		"Corrupt group descriptor: bad block for inode table",
-+		"Can't write an inode bitmap",
-+		"Can't read an inode bitmap",
-+		"Can't write an block bitmap",
-+		"Can't read an block bitmap",
-+		"Can't write an inode table",
-+		"Can't read an inode table",
-+		"Can't read next inode",
-+		"Filesystem has unexpected block size",
-+		"EXT2 directory corrupted",
-+		"Attempt to read block from filesystem resulted in short read",
-+		"Attempt to write block from filesystem resulted in short write",
-+		"No free space in the directory",
-+		"Inode bitmap not loaded",
-+		"Block bitmap not loaded",
-+		"Illegal inode number",
-+		"Illegal block number",
-+		"Internal error in ext2fs_expand_dir",
-+		"Not enough space to build proposed filesystem",
-+		"Illegal block number passed to ext2fs_mark_block_bitmap",
-+		"Illegal block number passed to ext2fs_unmark_block_bitmap",
-+		"Illegal block number passed to ext2fs_test_block_bitmap",
-+		"Illegal inode number passed to ext2fs_mark_inode_bitmap",
-+		"Illegal inode number passed to ext2fs_unmark_inode_bitmap",
-+		"Illegal inode number passed to ext2fs_test_inode_bitmap",
-+		"Attempt to fudge end of block bitmap past the real end",
-+		"Attempt to fudge end of inode bitmap past the real end",
-+		"Illegal indirect block found" ,
-+		"Illegal doubly indirect block found" ,
-+		"Illegal triply indirect block found" ,
-+		"Block bitmaps are not the same",
-+		"Inode bitmaps are not the same",
-+		"Illegal or malformed device name",
-+		"A block group is missing an inode table",
-+		"The ext2 superblock is corrupt",
-+		"Illegal generic bit number passed to ext2fs_mark_generic_bitmap",
-+		"Illegal generic bit number passed to ext2fs_unmark_generic_bitmap",
-+		"Illegal generic bit number passed to ext2fs_test_generic_bitmap",
-+		"Too many symbolic links encountered.",
-+		"The callback function will not handle this case",
-+		"The inode is from a bad block in the inode table",
-+		"Filesystem has unsupported feature(s)",
-+		"Filesystem has unsupported read-only feature(s)",
-+		"IO Channel failed to seek on read or write",
-+		"Memory allocation failed",
-+		"Invalid argument passed to ext2 library",
-+		"Could not allocate block in ext2 filesystem",
-+		"Could not allocate inode in ext2 filesystem",
-+		"Ext2 inode is not a directory",
-+		"Too many references in table",
-+		"File not found by ext2_lookup",
-+		"File open read-only",
-+		"Ext2 directory block not found",
-+		"Ext2 directory already exists",
-+		"Unimplemented ext2 library function",
-+		"User cancel requested",
-+		"Ext2 file too big",
-+		"Supplied journal device not a block device",
-+		"Journal superblock not found",
-+		"Journal must be at least 1024 blocks",
-+		"Unsupported journal version",
-+		"Error loading external journal",
-+		"Journal not found",
-+		"Directory hash unsupported",
-+		"Illegal extended attribute block number",
-+		"Cannot create filesystem with requested number of inodes",
-+		"E2image snapshot not in use",
-+		"Too many reserved group descriptor blocks",
-+		"Resize inode is corrupt",
-+		"Missing indirect block not present",
-+    0
-+};
-+
-+struct error_table {
-+    char const * const * msgs;
-+    long base;
-+    int n_msgs;
-+};
-+struct et_list {
-+    struct et_list *next;
-+    const struct error_table * table;
-+};
-+extern struct et_list *_et_list;
-+
-+const struct error_table et_ext2_error_table = { text, 2133571328L, 96 };
-+
-+static struct et_list link = { 0, 0 };
-+
-+void initialize_ext2_error_table_r(struct et_list **list);
-+void initialize_ext2_error_table(void);
-+
-+void initialize_ext2_error_table(void) {
-+    initialize_ext2_error_table_r(&_et_list);
-+}
-+
-+/* For Heimdal compatibility */
-+void initialize_ext2_error_table_r(struct et_list **list)
-+{
-+    struct et_list *et, **end;
-+
-+    for (end = list, et = *list; et; end = &et->next, et = et->next)
-+        if (et->table->msgs == text)
-+            return;
-+    et = malloc(sizeof(struct et_list));
-+    if (et == 0) {
-+        if (!link.table)
-+            et = &link;
-+        else
-+            return;
-+    }
-+    et->table = &et_ext2_error_table;
-+    et->next = 0;
-+    *end = et;
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/ext2_ext_attr.h silo-1.4.13/libext2fs/ext2_ext_attr.h
---- silo-1.4.13.orig/libext2fs/ext2_ext_attr.h	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/ext2_ext_attr.h	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,69 @@
-+/*
-+  File: linux/ext2_ext_attr.h
-+
-+  On-disk format of extended attributes for the ext2 filesystem.
-+
-+  (C) 2000 Andreas Gruenbacher, <a.gruenbacher@computer.org>
-+*/
-+
-+/* Magic value in attribute blocks */
-+#define EXT2_EXT_ATTR_MAGIC_v1		0xEA010000
-+#define EXT2_EXT_ATTR_MAGIC		0xEA020000
-+
-+/* Maximum number of references to one attribute block */
-+#define EXT2_EXT_ATTR_REFCOUNT_MAX	1024
-+
-+struct ext2_ext_attr_header {
-+	__u32	h_magic;	/* magic number for identification */
-+	__u32	h_refcount;	/* reference count */
-+	__u32	h_blocks;	/* number of disk blocks used */
-+	__u32	h_hash;		/* hash value of all attributes */
-+	__u32	h_reserved[4];	/* zero right now */
-+};
-+
-+struct ext2_ext_attr_entry {
-+	__u8	e_name_len;	/* length of name */
-+	__u8	e_name_index;	/* attribute name index */
-+	__u16	e_value_offs;	/* offset in disk block of value */
-+	__u32	e_value_block;	/* disk block attribute is stored on (n/i) */
-+	__u32	e_value_size;	/* size of attribute value */
-+	__u32	e_hash;		/* hash value of name and value */
-+#if 0
-+	char	e_name[0];	/* attribute name */
-+#endif
-+};
-+
-+#define EXT2_EXT_ATTR_PAD_BITS		2
-+#define EXT2_EXT_ATTR_PAD		(1<<EXT2_EXT_ATTR_PAD_BITS)
-+#define EXT2_EXT_ATTR_ROUND		(EXT2_EXT_ATTR_PAD-1)
-+#define EXT2_EXT_ATTR_LEN(name_len) \
-+	(((name_len) + EXT2_EXT_ATTR_ROUND + \
-+	sizeof(struct ext2_ext_attr_entry)) & ~EXT2_EXT_ATTR_ROUND)
-+#define EXT2_EXT_ATTR_NEXT(entry) \
-+	( (struct ext2_ext_attr_entry *)( \
-+	  (char *)(entry) + EXT2_EXT_ATTR_LEN((entry)->e_name_len)) )
-+#define EXT2_EXT_ATTR_SIZE(size) \
-+	(((size) + EXT2_EXT_ATTR_ROUND) & ~EXT2_EXT_ATTR_ROUND)
-+#define EXT2_EXT_IS_LAST_ENTRY(entry) (*((__u32 *)(entry)) == 0UL)
-+#define EXT2_EXT_ATTR_NAME(entry) \
-+	(((char *) (entry)) + sizeof(struct ext2_ext_attr_entry))
-+#define EXT2_XATTR_LEN(name_len) \
-+	(((name_len) + EXT2_EXT_ATTR_ROUND + \
-+	sizeof(struct ext2_xattr_entry)) & ~EXT2_EXT_ATTR_ROUND)
-+#define EXT2_XATTR_SIZE(size) \
-+	(((size) + EXT2_EXT_ATTR_ROUND) & ~EXT2_EXT_ATTR_ROUND)
-+
-+#ifdef __KERNEL__
-+# ifdef CONFIG_EXT2_FS_EXT_ATTR
-+extern int ext2_get_ext_attr(struct inode *, const char *, char *, size_t, int);
-+extern int ext2_set_ext_attr(struct inode *, const char *, char *, size_t, int);
-+extern void ext2_ext_attr_free_inode(struct inode *inode);
-+extern void ext2_ext_attr_put_super(struct super_block *sb);
-+extern int ext2_ext_attr_init(void);
-+extern void ext2_ext_attr_done(void);
-+# else
-+#  define ext2_get_ext_attr NULL
-+#  define ext2_set_ext_attr NULL
-+# endif
-+#endif  /* __KERNEL__ */
-+
-diff -Naur silo-1.4.13.orig/libext2fs/ext2_fs.h silo-1.4.13/libext2fs/ext2_fs.h
---- silo-1.4.13.orig/libext2fs/ext2_fs.h	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/ext2_fs.h	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,644 @@
-+/*
-+ *  linux/include/linux/ext2_fs.h
-+ *
-+ * Copyright (C) 1992, 1993, 1994, 1995
-+ * Remy Card (card@masi.ibp.fr)
-+ * Laboratoire MASI - Institut Blaise Pascal
-+ * Universite Pierre et Marie Curie (Paris VI)
-+ *
-+ *  from
-+ *
-+ *  linux/include/linux/minix_fs.h
-+ *
-+ *  Copyright (C) 1991, 1992  Linus Torvalds
-+ */
-+
-+#ifndef _LINUX_EXT2_FS_H
-+#define _LINUX_EXT2_FS_H
-+
-+#include <ext2fs/ext2_types.h>		/* Changed from linux/types.h */
-+
-+/*
-+ * The second extended filesystem constants/structures
-+ */
-+
-+/*
-+ * Define EXT2FS_DEBUG to produce debug messages
-+ */
-+#undef EXT2FS_DEBUG
-+
-+/*
-+ * Define EXT2_PREALLOCATE to preallocate data blocks for expanding files
-+ */
-+#define EXT2_PREALLOCATE
-+#define EXT2_DEFAULT_PREALLOC_BLOCKS	8
-+
-+/*
-+ * The second extended file system version
-+ */
-+#define EXT2FS_DATE		"95/08/09"
-+#define EXT2FS_VERSION		"0.5b"
-+
-+/*
-+ * Special inode numbers
-+ */
-+#define EXT2_BAD_INO		 1	/* Bad blocks inode */
-+#define EXT2_ROOT_INO		 2	/* Root inode */
-+#define EXT2_ACL_IDX_INO	 3	/* ACL inode */
-+#define EXT2_ACL_DATA_INO	 4	/* ACL inode */
-+#define EXT2_BOOT_LOADER_INO	 5	/* Boot loader inode */
-+#define EXT2_UNDEL_DIR_INO	 6	/* Undelete directory inode */
-+#define EXT2_RESIZE_INO		 7	/* Reserved group descriptors inode */
-+#define EXT2_JOURNAL_INO	 8	/* Journal inode */
-+
-+/* First non-reserved inode for old ext2 filesystems */
-+#define EXT2_GOOD_OLD_FIRST_INO	11
-+
-+/*
-+ * The second extended file system magic number
-+ */
-+#define EXT2_SUPER_MAGIC	0xEF53
-+
-+#ifdef __KERNEL__
-+#define EXT2_SB(sb)	(&((sb)->u.ext2_sb))
-+#else
-+/* Assume that user mode programs are passing in an ext2fs superblock, not
-+ * a kernel struct super_block.  This will allow us to call the feature-test
-+ * macros from user land. */
-+#define EXT2_SB(sb)	(sb)
-+#endif
-+
-+/*
-+ * Maximal count of links to a file
-+ */
-+#define EXT2_LINK_MAX		32000
-+
-+/*
-+ * Macro-instructions used to manage several block sizes
-+ */
-+#define EXT2_MIN_BLOCK_LOG_SIZE		10	/* 1024 */
-+#define EXT2_MAX_BLOCK_LOG_SIZE		16	/* 65536 */
-+#define EXT2_MIN_BLOCK_SIZE	(1 << EXT2_MIN_BLOCK_LOG_SIZE)
-+#define EXT2_MAX_BLOCK_SIZE	(1 << EXT2_MAX_BLOCK_LOG_SIZE)
-+#ifdef __KERNEL__
-+#define EXT2_BLOCK_SIZE(s)	((s)->s_blocksize)
-+#define EXT2_BLOCK_SIZE_BITS(s)	((s)->s_blocksize_bits)
-+#define EXT2_ADDR_PER_BLOCK_BITS(s)	(EXT2_SB(s)->addr_per_block_bits)
-+#define EXT2_INODE_SIZE(s)	(EXT2_SB(s)->s_inode_size)
-+#define EXT2_FIRST_INO(s)	(EXT2_SB(s)->s_first_ino)
-+#else
-+#define EXT2_BLOCK_SIZE(s)	(EXT2_MIN_BLOCK_SIZE << (s)->s_log_block_size)
-+#define EXT2_BLOCK_SIZE_BITS(s)	((s)->s_log_block_size + 10)
-+#define EXT2_INODE_SIZE(s)	(((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \
-+				 EXT2_GOOD_OLD_INODE_SIZE : (s)->s_inode_size)
-+#define EXT2_FIRST_INO(s)	(((s)->s_rev_level == EXT2_GOOD_OLD_REV) ? \
-+				 EXT2_GOOD_OLD_FIRST_INO : (s)->s_first_ino)
-+#endif
-+#define EXT2_ADDR_PER_BLOCK(s)	(EXT2_BLOCK_SIZE(s) / sizeof(__u32))
-+
-+/*
-+ * Macro-instructions used to manage fragments
-+ */
-+#define EXT2_MIN_FRAG_SIZE		EXT2_MIN_BLOCK_SIZE
-+#define EXT2_MAX_FRAG_SIZE		EXT2_MAX_BLOCK_SIZE
-+#define EXT2_MIN_FRAG_LOG_SIZE		EXT2_MIN_BLOCK_LOG_SIZE
-+#ifdef __KERNEL__
-+# define EXT2_FRAG_SIZE(s)		(EXT2_SB(s)->s_frag_size)
-+# define EXT2_FRAGS_PER_BLOCK(s)	(EXT2_SB(s)->s_frags_per_block)
-+#else
-+# define EXT2_FRAG_SIZE(s)		(EXT2_MIN_FRAG_SIZE << (s)->s_log_frag_size)
-+# define EXT2_FRAGS_PER_BLOCK(s)	(EXT2_BLOCK_SIZE(s) / EXT2_FRAG_SIZE(s))
-+#endif
-+
-+/*
-+ * ACL structures
-+ */
-+struct ext2_acl_header	/* Header of Access Control Lists */
-+{
-+	__u32	aclh_size;
-+	__u32	aclh_file_count;
-+	__u32	aclh_acle_count;
-+	__u32	aclh_first_acle;
-+};
-+
-+struct ext2_acl_entry	/* Access Control List Entry */
-+{
-+	__u32	acle_size;
-+	__u16	acle_perms;	/* Access permissions */
-+	__u16	acle_type;	/* Type of entry */
-+	__u16	acle_tag;	/* User or group identity */
-+	__u16	acle_pad1;
-+	__u32	acle_next;	/* Pointer on next entry for the */
-+					/* same inode or on next free entry */
-+};
-+
-+/*
-+ * Structure of a blocks group descriptor
-+ */
-+struct ext2_group_desc
-+{
-+	__u32	bg_block_bitmap;		/* Blocks bitmap block */
-+	__u32	bg_inode_bitmap;		/* Inodes bitmap block */
-+	__u32	bg_inode_table;		/* Inodes table block */
-+	__u16	bg_free_blocks_count;	/* Free blocks count */
-+	__u16	bg_free_inodes_count;	/* Free inodes count */
-+	__u16	bg_used_dirs_count;	/* Directories count */
-+	__u16	bg_pad;
-+	__u32	bg_reserved[3];
-+};
-+
-+/*
-+ * Data structures used by the directory indexing feature
-+ *
-+ * Note: all of the multibyte integer fields are little endian.
-+ */
-+
-+/*
-+ * Note: dx_root_info is laid out so that if it should somehow get
-+ * overlaid by a dirent the two low bits of the hash version will be
-+ * zero.  Therefore, the hash version mod 4 should never be 0.
-+ * Sincerely, the paranoia department.
-+ */
-+struct ext2_dx_root_info {
-+	__u32 reserved_zero;
-+	__u8 hash_version; /* 0 now, 1 at release */
-+	__u8 info_length; /* 8 */
-+	__u8 indirect_levels;
-+	__u8 unused_flags;
-+};
-+
-+#define EXT2_HASH_LEGACY	0
-+#define EXT2_HASH_HALF_MD4	1
-+#define EXT2_HASH_TEA		2
-+
-+#define EXT2_HASH_FLAG_INCOMPAT	0x1
-+
-+struct ext2_dx_entry {
-+	__u32 hash;
-+	__u32 block;
-+};
-+
-+struct ext2_dx_countlimit {
-+	__u16 limit;
-+	__u16 count;
-+};
-+
-+
-+/*
-+ * Macro-instructions used to manage group descriptors
-+ */
-+#define EXT2_BLOCKS_PER_GROUP(s)	(EXT2_SB(s)->s_blocks_per_group)
-+#define EXT2_INODES_PER_GROUP(s)	(EXT2_SB(s)->s_inodes_per_group)
-+#define EXT2_INODES_PER_BLOCK(s)	(EXT2_BLOCK_SIZE(s)/EXT2_INODE_SIZE(s))
-+/* limits imposed by 16-bit value gd_free_{blocks,inode}_count */
-+#define EXT2_MAX_BLOCKS_PER_GROUP(s)	((1 << 16) - 8)
-+#define EXT2_MAX_INODES_PER_GROUP(s)	((1 << 16) - EXT2_INODES_PER_BLOCK(s))
-+#ifdef __KERNEL__
-+#define EXT2_DESC_PER_BLOCK(s)		(EXT2_SB(s)->s_desc_per_block)
-+#define EXT2_DESC_PER_BLOCK_BITS(s)	(EXT2_SB(s)->s_desc_per_block_bits)
-+#else
-+#define EXT2_DESC_PER_BLOCK(s)		(EXT2_BLOCK_SIZE(s) / sizeof (struct ext2_group_desc))
-+#endif
-+
-+/*
-+ * Constants relative to the data blocks
-+ */
-+#define EXT2_NDIR_BLOCKS		12
-+#define EXT2_IND_BLOCK			EXT2_NDIR_BLOCKS
-+#define EXT2_DIND_BLOCK			(EXT2_IND_BLOCK + 1)
-+#define EXT2_TIND_BLOCK			(EXT2_DIND_BLOCK + 1)
-+#define EXT2_N_BLOCKS			(EXT2_TIND_BLOCK + 1)
-+
-+/*
-+ * Inode flags
-+ */
-+#define EXT2_SECRM_FL			0x00000001 /* Secure deletion */
-+#define EXT2_UNRM_FL			0x00000002 /* Undelete */
-+#define EXT2_COMPR_FL			0x00000004 /* Compress file */
-+#define EXT2_SYNC_FL			0x00000008 /* Synchronous updates */
-+#define EXT2_IMMUTABLE_FL		0x00000010 /* Immutable file */
-+#define EXT2_APPEND_FL			0x00000020 /* writes to file may only append */
-+#define EXT2_NODUMP_FL			0x00000040 /* do not dump file */
-+#define EXT2_NOATIME_FL			0x00000080 /* do not update atime */
-+/* Reserved for compression usage... */
-+#define EXT2_DIRTY_FL			0x00000100
-+#define EXT2_COMPRBLK_FL		0x00000200 /* One or more compressed clusters */
-+#define EXT2_NOCOMPR_FL			0x00000400 /* Access raw compressed data */
-+#define EXT2_ECOMPR_FL			0x00000800 /* Compression error */
-+/* End compression flags --- maybe not all used */
-+#define EXT2_BTREE_FL			0x00001000 /* btree format dir */
-+#define EXT2_INDEX_FL			0x00001000 /* hash-indexed directory */
-+#define EXT2_IMAGIC_FL			0x00002000
-+#define EXT3_JOURNAL_DATA_FL		0x00004000 /* file data should be journaled */
-+#define EXT2_NOTAIL_FL			0x00008000 /* file tail should not be merged */
-+#define EXT2_DIRSYNC_FL 		0x00010000 /* Synchronous directory modifications */
-+#define EXT2_TOPDIR_FL			0x00020000 /* Top of directory hierarchies*/
-+#define EXT3_EXTENTS_FL 		0x00080000 /* Inode uses extents */
-+#define EXT2_RESERVED_FL		0x80000000 /* reserved for ext2 lib */
-+
-+#define EXT2_FL_USER_VISIBLE		0x0003DFFF /* User visible flags */
-+#define EXT2_FL_USER_MODIFIABLE		0x000080FF /* User modifiable flags */
-+
-+/*
-+ * ioctl commands
-+ */
-+#define EXT2_IOC_GETFLAGS		_IOR('f', 1, long)
-+#define EXT2_IOC_SETFLAGS		_IOW('f', 2, long)
-+#define EXT2_IOC_GETVERSION		_IOR('v', 1, long)
-+#define EXT2_IOC_SETVERSION		_IOW('v', 2, long)
-+
-+/*
-+ * Structure of an inode on the disk
-+ */
-+struct ext2_inode {
-+	__u16	i_mode;		/* File mode */
-+	__u16	i_uid;		/* Low 16 bits of Owner Uid */
-+	__u32	i_size;		/* Size in bytes */
-+	__u32	i_atime;	/* Access time */
-+	__u32	i_ctime;	/* Creation time */
-+	__u32	i_mtime;	/* Modification time */
-+	__u32	i_dtime;	/* Deletion Time */
-+	__u16	i_gid;		/* Low 16 bits of Group Id */
-+	__u16	i_links_count;	/* Links count */
-+	__u32	i_blocks;	/* Blocks count */
-+	__u32	i_flags;	/* File flags */
-+	union {
-+		struct {
-+			__u32  l_i_reserved1;
-+		} linux1;
-+		struct {
-+			__u32  h_i_translator;
-+		} hurd1;
-+		struct {
-+			__u32  m_i_reserved1;
-+		} masix1;
-+	} osd1;				/* OS dependent 1 */
-+	__u32	i_block[EXT2_N_BLOCKS];/* Pointers to blocks */
-+	__u32	i_generation;	/* File version (for NFS) */
-+	__u32	i_file_acl;	/* File ACL */
-+	__u32	i_dir_acl;	/* Directory ACL */
-+	__u32	i_faddr;	/* Fragment address */
-+	union {
-+		struct {
-+			__u8	l_i_frag;	/* Fragment number */
-+			__u8	l_i_fsize;	/* Fragment size */
-+			__u16	i_pad1;
-+			__u16	l_i_uid_high;	/* these 2 fields    */
-+			__u16	l_i_gid_high;	/* were reserved2[0] */
-+			__u32	l_i_reserved2;
-+		} linux2;
-+		struct {
-+			__u8	h_i_frag;	/* Fragment number */
-+			__u8	h_i_fsize;	/* Fragment size */
-+			__u16	h_i_mode_high;
-+			__u16	h_i_uid_high;
-+			__u16	h_i_gid_high;
-+			__u32	h_i_author;
-+		} hurd2;
-+		struct {
-+			__u8	m_i_frag;	/* Fragment number */
-+			__u8	m_i_fsize;	/* Fragment size */
-+			__u16	m_pad1;
-+			__u32	m_i_reserved2[2];
-+		} masix2;
-+	} osd2;				/* OS dependent 2 */
-+};
-+
-+/*
-+ * Permanent part of an large inode on the disk
-+ */
-+struct ext2_inode_large {
-+	__u16	i_mode;		/* File mode */
-+	__u16	i_uid;		/* Low 16 bits of Owner Uid */
-+	__u32	i_size;		/* Size in bytes */
-+	__u32	i_atime;	/* Access time */
-+	__u32	i_ctime;	/* Creation time */
-+	__u32	i_mtime;	/* Modification time */
-+	__u32	i_dtime;	/* Deletion Time */
-+	__u16	i_gid;		/* Low 16 bits of Group Id */
-+	__u16	i_links_count;	/* Links count */
-+	__u32	i_blocks;	/* Blocks count */
-+	__u32	i_flags;	/* File flags */
-+	union {
-+		struct {
-+			__u32  l_i_reserved1;
-+		} linux1;
-+		struct {
-+			__u32  h_i_translator;
-+		} hurd1;
-+		struct {
-+			__u32  m_i_reserved1;
-+		} masix1;
-+	} osd1;				/* OS dependent 1 */
-+	__u32	i_block[EXT2_N_BLOCKS];/* Pointers to blocks */
-+	__u32	i_generation;	/* File version (for NFS) */
-+	__u32	i_file_acl;	/* File ACL */
-+	__u32	i_dir_acl;	/* Directory ACL */
-+	__u32	i_faddr;	/* Fragment address */
-+	union {
-+		struct {
-+			__u8	l_i_frag;	/* Fragment number */
-+			__u8	l_i_fsize;	/* Fragment size */
-+			__u16	i_pad1;
-+			__u16	l_i_uid_high;	/* these 2 fields    */
-+			__u16	l_i_gid_high;	/* were reserved2[0] */
-+			__u32	l_i_reserved2;
-+		} linux2;
-+		struct {
-+			__u8	h_i_frag;	/* Fragment number */
-+			__u8	h_i_fsize;	/* Fragment size */
-+			__u16	h_i_mode_high;
-+			__u16	h_i_uid_high;
-+			__u16	h_i_gid_high;
-+			__u32	h_i_author;
-+		} hurd2;
-+		struct {
-+			__u8	m_i_frag;	/* Fragment number */
-+			__u8	m_i_fsize;	/* Fragment size */
-+			__u16	m_pad1;
-+			__u32	m_i_reserved2[2];
-+		} masix2;
-+	} osd2;				/* OS dependent 2 */
-+	__u16	i_extra_isize;
-+	__u16	i_pad1;
-+};
-+
-+#define i_size_high	i_dir_acl
-+
-+#if defined(__KERNEL__) || defined(__linux__)
-+#define i_reserved1	osd1.linux1.l_i_reserved1
-+#define i_frag		osd2.linux2.l_i_frag
-+#define i_fsize		osd2.linux2.l_i_fsize
-+#define i_uid_low	i_uid
-+#define i_gid_low	i_gid
-+#define i_uid_high	osd2.linux2.l_i_uid_high
-+#define i_gid_high	osd2.linux2.l_i_gid_high
-+#define i_reserved2	osd2.linux2.l_i_reserved2
-+
-+#else
-+#if defined(__GNU__)
-+
-+#define i_translator	osd1.hurd1.h_i_translator
-+#define i_frag		osd2.hurd2.h_i_frag;
-+#define i_fsize		osd2.hurd2.h_i_fsize;
-+#define i_uid_high	osd2.hurd2.h_i_uid_high
-+#define i_gid_high	osd2.hurd2.h_i_gid_high
-+#define i_author	osd2.hurd2.h_i_author
-+
-+#else
-+#if defined(__masix__)
-+
-+#define i_reserved1	osd1.masix1.m_i_reserved1
-+#define i_frag		osd2.masix2.m_i_frag
-+#define i_fsize		osd2.masix2.m_i_fsize
-+#define i_reserved2	osd2.masix2.m_i_reserved2
-+
-+#endif  /* __masix__ */
-+#endif  /* __GNU__ */
-+#endif	/* defined(__KERNEL__) || defined(__linux__) */
-+
-+/*
-+ * File system states
-+ */
-+#define EXT2_VALID_FS			0x0001	/* Unmounted cleanly */
-+#define EXT2_ERROR_FS			0x0002	/* Errors detected */
-+
-+/*
-+ * Mount flags
-+ */
-+#define EXT2_MOUNT_CHECK		0x0001	/* Do mount-time checks */
-+#define EXT2_MOUNT_GRPID		0x0004	/* Create files with directory's group */
-+#define EXT2_MOUNT_DEBUG		0x0008	/* Some debugging messages */
-+#define EXT2_MOUNT_ERRORS_CONT		0x0010	/* Continue on errors */
-+#define EXT2_MOUNT_ERRORS_RO		0x0020	/* Remount fs ro on errors */
-+#define EXT2_MOUNT_ERRORS_PANIC		0x0040	/* Panic on errors */
-+#define EXT2_MOUNT_MINIX_DF		0x0080	/* Mimics the Minix statfs */
-+#define EXT2_MOUNT_NO_UID32		0x0200  /* Disable 32-bit UIDs */
-+
-+#define clear_opt(o, opt)		o &= ~EXT2_MOUNT_##opt
-+#define set_opt(o, opt)			o |= EXT2_MOUNT_##opt
-+#define test_opt(sb, opt)		(EXT2_SB(sb)->s_mount_opt & \
-+					 EXT2_MOUNT_##opt)
-+/*
-+ * Maximal mount counts between two filesystem checks
-+ */
-+#define EXT2_DFL_MAX_MNT_COUNT		20	/* Allow 20 mounts */
-+#define EXT2_DFL_CHECKINTERVAL		0	/* Don't use interval check */
-+
-+/*
-+ * Behaviour when detecting errors
-+ */
-+#define EXT2_ERRORS_CONTINUE		1	/* Continue execution */
-+#define EXT2_ERRORS_RO			2	/* Remount fs read-only */
-+#define EXT2_ERRORS_PANIC		3	/* Panic */
-+#define EXT2_ERRORS_DEFAULT		EXT2_ERRORS_CONTINUE
-+
-+/*
-+ * Structure of the super block
-+ */
-+struct ext2_super_block {
-+	__u32	s_inodes_count;		/* Inodes count */
-+	__u32	s_blocks_count;		/* Blocks count */
-+	__u32	s_r_blocks_count;	/* Reserved blocks count */
-+	__u32	s_free_blocks_count;	/* Free blocks count */
-+	__u32	s_free_inodes_count;	/* Free inodes count */
-+	__u32	s_first_data_block;	/* First Data Block */
-+	__u32	s_log_block_size;	/* Block size */
-+	__s32	s_log_frag_size;	/* Fragment size */
-+	__u32	s_blocks_per_group;	/* # Blocks per group */
-+	__u32	s_frags_per_group;	/* # Fragments per group */
-+	__u32	s_inodes_per_group;	/* # Inodes per group */
-+	__u32	s_mtime;		/* Mount time */
-+	__u32	s_wtime;		/* Write time */
-+	__u16	s_mnt_count;		/* Mount count */
-+	__s16	s_max_mnt_count;	/* Maximal mount count */
-+	__u16	s_magic;		/* Magic signature */
-+	__u16	s_state;		/* File system state */
-+	__u16	s_errors;		/* Behaviour when detecting errors */
-+	__u16	s_minor_rev_level;	/* minor revision level */
-+	__u32	s_lastcheck;		/* time of last check */
-+	__u32	s_checkinterval;	/* max. time between checks */
-+	__u32	s_creator_os;		/* OS */
-+	__u32	s_rev_level;		/* Revision level */
-+	__u16	s_def_resuid;		/* Default uid for reserved blocks */
-+	__u16	s_def_resgid;		/* Default gid for reserved blocks */
-+	/*
-+	 * These fields are for EXT2_DYNAMIC_REV superblocks only.
-+	 *
-+	 * Note: the difference between the compatible feature set and
-+	 * the incompatible feature set is that if there is a bit set
-+	 * in the incompatible feature set that the kernel doesn't
-+	 * know about, it should refuse to mount the filesystem.
-+	 *
-+	 * e2fsck's requirements are more strict; if it doesn't know
-+	 * about a feature in either the compatible or incompatible
-+	 * feature set, it must abort and not try to meddle with
-+	 * things it doesn't understand...
-+	 */
-+	__u32	s_first_ino;		/* First non-reserved inode */
-+	__u16   s_inode_size;		/* size of inode structure */
-+	__u16	s_block_group_nr;	/* block group # of this superblock */
-+	__u32	s_feature_compat;	/* compatible feature set */
-+	__u32	s_feature_incompat;	/* incompatible feature set */
-+	__u32	s_feature_ro_compat;	/* readonly-compatible feature set */
-+	__u8	s_uuid[16];		/* 128-bit uuid for volume */
-+	char	s_volume_name[16];	/* volume name */
-+	char	s_last_mounted[64];	/* directory where last mounted */
-+	__u32	s_algorithm_usage_bitmap; /* For compression */
-+	/*
-+	 * Performance hints.  Directory preallocation should only
-+	 * happen if the EXT2_FEATURE_COMPAT_DIR_PREALLOC flag is on.
-+	 */
-+	__u8	s_prealloc_blocks;	/* Nr of blocks to try to preallocate*/
-+	__u8	s_prealloc_dir_blocks;	/* Nr to preallocate for dirs */
-+	__u16	s_reserved_gdt_blocks;	/* Per group table for online growth */
-+	/*
-+	 * Journaling support valid if EXT2_FEATURE_COMPAT_HAS_JOURNAL set.
-+	 */
-+	__u8	s_journal_uuid[16];	/* uuid of journal superblock */
-+	__u32	s_journal_inum;		/* inode number of journal file */
-+	__u32	s_journal_dev;		/* device number of journal file */
-+	__u32	s_last_orphan;		/* start of list of inodes to delete */
-+	__u32	s_hash_seed[4];		/* HTREE hash seed */
-+	__u8	s_def_hash_version;	/* Default hash version to use */
-+	__u8	s_jnl_backup_type; 	/* Default type of journal backup */
-+	__u16	s_reserved_word_pad;
-+	__u32	s_default_mount_opts;
-+	__u32	s_first_meta_bg;	/* First metablock group */
-+	__u32	s_mkfs_time;		/* When the filesystem was created */
-+	__u32	s_jnl_blocks[17]; 	/* Backup of the journal inode */
-+	__u32	s_reserved[172];	/* Padding to the end of the block */
-+};
-+
-+/*
-+ * Codes for operating systems
-+ */
-+#define EXT2_OS_LINUX		0
-+#define EXT2_OS_HURD		1
-+#define EXT2_OS_MASIX		2
-+#define EXT2_OS_FREEBSD		3
-+#define EXT2_OS_LITES		4
-+
-+/*
-+ * Revision levels
-+ */
-+#define EXT2_GOOD_OLD_REV	0	/* The good old (original) format */
-+#define EXT2_DYNAMIC_REV	1	/* V2 format w/ dynamic inode sizes */
-+
-+#define EXT2_CURRENT_REV	EXT2_GOOD_OLD_REV
-+#define EXT2_MAX_SUPP_REV	EXT2_DYNAMIC_REV
-+
-+#define EXT2_GOOD_OLD_INODE_SIZE 128
-+
-+/*
-+ * Journal inode backup types
-+ */
-+#define EXT3_JNL_BACKUP_BLOCKS	1
-+
-+/*
-+ * Feature set definitions
-+ */
-+
-+#define EXT2_HAS_COMPAT_FEATURE(sb,mask)			\
-+	( EXT2_SB(sb)->s_feature_compat & (mask) )
-+#define EXT2_HAS_RO_COMPAT_FEATURE(sb,mask)			\
-+	( EXT2_SB(sb)->s_feature_ro_compat & (mask) )
-+#define EXT2_HAS_INCOMPAT_FEATURE(sb,mask)			\
-+	( EXT2_SB(sb)->s_feature_incompat & (mask) )
-+
-+#define EXT2_FEATURE_COMPAT_DIR_PREALLOC	0x0001
-+#define EXT2_FEATURE_COMPAT_IMAGIC_INODES	0x0002
-+#define EXT3_FEATURE_COMPAT_HAS_JOURNAL		0x0004
-+#define EXT2_FEATURE_COMPAT_EXT_ATTR		0x0008
-+#define EXT2_FEATURE_COMPAT_RESIZE_INODE	0x0010
-+#define EXT2_FEATURE_COMPAT_DIR_INDEX		0x0020
-+
-+#define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER	0x0001
-+#define EXT2_FEATURE_RO_COMPAT_LARGE_FILE	0x0002
-+/* #define EXT2_FEATURE_RO_COMPAT_BTREE_DIR	0x0004 not used */
-+
-+#define EXT2_FEATURE_INCOMPAT_COMPRESSION	0x0001
-+#define EXT2_FEATURE_INCOMPAT_FILETYPE		0x0002
-+#define EXT3_FEATURE_INCOMPAT_RECOVER		0x0004 /* Needs recovery */
-+#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV	0x0008 /* Journal device */
-+#define EXT2_FEATURE_INCOMPAT_META_BG		0x0010
-+#define EXT3_FEATURE_INCOMPAT_EXTENTS		0x0040
-+
-+
-+#define EXT2_FEATURE_COMPAT_SUPP	0
-+#define EXT2_FEATURE_INCOMPAT_SUPP	(EXT2_FEATURE_INCOMPAT_FILETYPE)
-+#define EXT2_FEATURE_RO_COMPAT_SUPP	(EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER| \
-+					 EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
-+					 EXT2_FEATURE_RO_COMPAT_BTREE_DIR)
-+
-+/*
-+ * Default values for user and/or group using reserved blocks
-+ */
-+#define EXT2_DEF_RESUID		0
-+#define EXT2_DEF_RESGID		0
-+
-+/*
-+ * Default mount options
-+ */
-+#define EXT2_DEFM_DEBUG		0x0001
-+#define EXT2_DEFM_BSDGROUPS	0x0002
-+#define EXT2_DEFM_XATTR_USER	0x0004
-+#define EXT2_DEFM_ACL		0x0008
-+#define EXT2_DEFM_UID16		0x0010
-+#define EXT3_DEFM_JMODE		0x0060 
-+#define EXT3_DEFM_JMODE_DATA	0x0020
-+#define EXT3_DEFM_JMODE_ORDERED	0x0040
-+#define EXT3_DEFM_JMODE_WBACK	0x0060
-+
-+/*
-+ * Structure of a directory entry
-+ */
-+#define EXT2_NAME_LEN 255
-+
-+struct ext2_dir_entry {
-+	__u32	inode;			/* Inode number */
-+	__u16	rec_len;		/* Directory entry length */
-+	__u16	name_len;		/* Name length */
-+	char	name[EXT2_NAME_LEN];	/* File name */
-+};
-+
-+/*
-+ * The new version of the directory entry.  Since EXT2 structures are
-+ * stored in intel byte order, and the name_len field could never be
-+ * bigger than 255 chars, it's safe to reclaim the extra byte for the
-+ * file_type field.
-+ */
-+struct ext2_dir_entry_2 {
-+	__u32	inode;			/* Inode number */
-+	__u16	rec_len;		/* Directory entry length */
-+	__u8	name_len;		/* Name length */
-+	__u8	file_type;
-+	char	name[EXT2_NAME_LEN];	/* File name */
-+};
-+
-+/*
-+ * Ext2 directory file types.  Only the low 3 bits are used.  The
-+ * other bits are reserved for now.
-+ */
-+#define EXT2_FT_UNKNOWN		0
-+#define EXT2_FT_REG_FILE	1
-+#define EXT2_FT_DIR		2
-+#define EXT2_FT_CHRDEV		3
-+#define EXT2_FT_BLKDEV		4
-+#define EXT2_FT_FIFO		5
-+#define EXT2_FT_SOCK		6
-+#define EXT2_FT_SYMLINK		7
-+
-+#define EXT2_FT_MAX		8
-+
-+/*
-+ * EXT2_DIR_PAD defines the directory entries boundaries
-+ *
-+ * NOTE: It must be a multiple of 4
-+ */
-+#define EXT2_DIR_PAD			4
-+#define EXT2_DIR_ROUND			(EXT2_DIR_PAD - 1)
-+#define EXT2_DIR_REC_LEN(name_len)	(((name_len) + 8 + EXT2_DIR_ROUND) & \
-+					 ~EXT2_DIR_ROUND)
-+
-+#endif	/* _LINUX_EXT2_FS_H */
-diff -Naur silo-1.4.13.orig/libext2fs/ext2fs.h silo-1.4.13/libext2fs/ext2fs.h
---- silo-1.4.13.orig/libext2fs/ext2fs.h	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/ext2fs.h	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,1140 @@
-+/*
-+ * ext2fs.h --- ext2fs
-+ * 
-+ * Copyright (C) 1993, 1994, 1995, 1996 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#ifndef _EXT2FS_EXT2FS_H
-+#define _EXT2FS_EXT2FS_H
-+
-+#ifdef __GNUC__
-+#define EXT2FS_ATTR(x) __attribute__(x)
-+#else
-+#define EXT2FS_ATTR(x)
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/*
-+ * Non-GNU C compilers won't necessarily understand inline
-+ */
-+#if (!defined(__GNUC__) && !defined(__WATCOMC__))
-+#define NO_INLINE_FUNCS
-+#endif
-+
-+/*
-+ * Build in support for byte-swapping filesystems if we the feature
-+ * has been configured or if we're being built on a CPU architecture
-+ * with a non-native byte order.
-+ */
-+#if defined(ENABLE_SWAPFS) || defined(WORDS_BIGENDIAN)
-+#define EXT2FS_ENABLE_SWAPFS
-+#endif
-+
-+/*
-+ * Where the master copy of the superblock is located, and how big
-+ * superblocks are supposed to be.  We define SUPERBLOCK_SIZE because
-+ * the size of the superblock structure is not necessarily trustworthy
-+ * (some versions have the padding set up so that the superblock is
-+ * 1032 bytes long).
-+ */
-+#define SUPERBLOCK_OFFSET	1024
-+#define SUPERBLOCK_SIZE 	1024
-+
-+/*
-+ * The last ext2fs revision level that this version of the library is
-+ * able to support.
-+ */
-+#define EXT2_LIB_CURRENT_REV	EXT2_DYNAMIC_REV
-+
-+#ifdef HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+#if EXT2_FLAT_INCLUDES
-+#include "e2_types.h"
-+#include "ext2_fs.h"
-+#else
-+#include <ext2fs/ext2_types.h>
-+#include <ext2fs/ext2_fs.h>
-+#endif /* EXT2_FLAT_INCLUDES */
-+
-+typedef __u32		ext2_ino_t;
-+typedef __u32		blk_t;
-+typedef __u32		dgrp_t;
-+typedef __u32		ext2_off_t;
-+typedef __s64		e2_blkcnt_t;
-+typedef __u32		ext2_dirhash_t;
-+
-+#if EXT2_FLAT_INCLUDES
-+#include "com_err.h"
-+#include "ext2_io.h"
-+#include "ext2_err.h"
-+#else
-+#include <et/com_err.h>
-+#include <ext2fs/ext2_io.h>
-+#include <ext2fs/ext2_err.h>
-+#endif
-+
-+/*
-+ * Portability help for Microsoft Visual C++
-+ */
-+#ifdef _MSC_VER
-+#define EXT2_QSORT_TYPE int __cdecl
-+#else
-+#define EXT2_QSORT_TYPE int
-+#endif
-+
-+typedef struct struct_ext2_filsys *ext2_filsys;
-+
-+struct ext2fs_struct_generic_bitmap {
-+	errcode_t	magic;
-+	ext2_filsys 	fs;
-+	__u32		start, end;
-+	__u32		real_end;
-+	char	*	description;
-+	char	*	bitmap;
-+	errcode_t	base_error_code;
-+	__u32		reserved[7];
-+};
-+
-+#define EXT2FS_MARK_ERROR 	0
-+#define EXT2FS_UNMARK_ERROR 	1
-+#define EXT2FS_TEST_ERROR	2
-+
-+typedef struct ext2fs_struct_generic_bitmap *ext2fs_generic_bitmap;
-+typedef struct ext2fs_struct_generic_bitmap *ext2fs_inode_bitmap;
-+typedef struct ext2fs_struct_generic_bitmap *ext2fs_block_bitmap;
-+
-+#ifdef EXT2_DYNAMIC_REV
-+#define EXT2_FIRST_INODE(s)	EXT2_FIRST_INO(s)
-+#else
-+#define EXT2_FIRST_INODE(s)	EXT2_FIRST_INO
-+#define EXT2_INODE_SIZE(s)	sizeof(struct ext2_inode)
-+#endif
-+
-+/*
-+ * badblocks list definitions
-+ */
-+
-+typedef struct ext2_struct_u32_list *ext2_badblocks_list;
-+typedef struct ext2_struct_u32_iterate *ext2_badblocks_iterate;
-+
-+typedef struct ext2_struct_u32_list *ext2_u32_list;
-+typedef struct ext2_struct_u32_iterate *ext2_u32_iterate;
-+
-+/* old */
-+typedef struct ext2_struct_u32_list *badblocks_list;
-+typedef struct ext2_struct_u32_iterate *badblocks_iterate;
-+
-+#define BADBLOCKS_FLAG_DIRTY	1
-+
-+/*
-+ * ext2_dblist structure and abstractions (see dblist.c)
-+ */
-+struct ext2_db_entry {
-+	ext2_ino_t	ino;
-+	blk_t	blk;
-+	int	blockcnt;
-+};
-+
-+typedef struct ext2_struct_dblist *ext2_dblist;
-+
-+#define DBLIST_ABORT	1
-+
-+/*
-+ * ext2_fileio definitions
-+ */
-+
-+#define EXT2_FILE_WRITE		0x0001
-+#define EXT2_FILE_CREATE	0x0002
-+
-+#define EXT2_FILE_MASK		0x00FF
-+
-+#define EXT2_FILE_BUF_DIRTY	0x4000
-+#define EXT2_FILE_BUF_VALID	0x2000
-+
-+typedef struct ext2_file *ext2_file_t;
-+
-+#define EXT2_SEEK_SET	0
-+#define EXT2_SEEK_CUR	1
-+#define EXT2_SEEK_END	2
-+
-+/*
-+ * Flags for the ext2_filsys structure and for ext2fs_open()
-+ */
-+#define EXT2_FLAG_RW			0x01
-+#define EXT2_FLAG_CHANGED		0x02
-+#define EXT2_FLAG_DIRTY			0x04
-+#define EXT2_FLAG_VALID			0x08
-+#define EXT2_FLAG_IB_DIRTY		0x10
-+#define EXT2_FLAG_BB_DIRTY		0x20
-+#define EXT2_FLAG_SWAP_BYTES		0x40
-+#define EXT2_FLAG_SWAP_BYTES_READ	0x80
-+#define EXT2_FLAG_SWAP_BYTES_WRITE	0x100
-+#define EXT2_FLAG_MASTER_SB_ONLY	0x200
-+#define EXT2_FLAG_FORCE			0x400
-+#define EXT2_FLAG_SUPER_ONLY		0x800
-+#define EXT2_FLAG_JOURNAL_DEV_OK	0x1000
-+#define EXT2_FLAG_IMAGE_FILE		0x2000
-+
-+/*
-+ * Special flag in the ext2 inode i_flag field that means that this is
-+ * a new inode.  (So that ext2_write_inode() can clear extra fields.)
-+ */
-+#define EXT2_NEW_INODE_FL	0x80000000
-+
-+/*
-+ * Flags for mkjournal
-+ *
-+ * EXT2_MKJOURNAL_V1_SUPER	Make a (deprecated) V1 journal superblock
-+ */
-+#define EXT2_MKJOURNAL_V1_SUPER	0x0000001
-+
-+struct struct_ext2_filsys {
-+	errcode_t			magic;
-+	io_channel			io;
-+	int				flags;
-+	char *				device_name;
-+	struct ext2_super_block	* 	super;
-+	unsigned int			blocksize;
-+	int				fragsize;
-+	dgrp_t				group_desc_count;
-+	unsigned long			desc_blocks;
-+	struct ext2_group_desc *	group_desc;
-+	int				inode_blocks_per_group;
-+	ext2fs_inode_bitmap		inode_map;
-+	ext2fs_block_bitmap		block_map;
-+	errcode_t (*get_blocks)(ext2_filsys fs, ext2_ino_t ino, blk_t *blocks);
-+	errcode_t (*check_directory)(ext2_filsys fs, ext2_ino_t ino);
-+	errcode_t (*write_bitmaps)(ext2_filsys fs);
-+	errcode_t (*read_inode)(ext2_filsys fs, ext2_ino_t ino,
-+				struct ext2_inode *inode);
-+	errcode_t (*write_inode)(ext2_filsys fs, ext2_ino_t ino,
-+				struct ext2_inode *inode);
-+	ext2_badblocks_list		badblocks;
-+	ext2_dblist			dblist;
-+	__u32				stride;	/* for mke2fs */
-+	struct ext2_super_block *	orig_super;
-+	struct ext2_image_hdr *		image_header;
-+	__u32				umask;
-+	/*
-+	 * Reserved for future expansion
-+	 */
-+	__u32				reserved[8];
-+
-+	/*
-+	 * Reserved for the use of the calling application.
-+	 */
-+	void *				priv_data;
-+
-+	/*
-+	 * Inode cache
-+	 */
-+	struct ext2_inode_cache		*icache;
-+	io_channel			image_io;
-+};
-+
-+#if EXT2_FLAT_INCLUDES
-+#include "e2_bitops.h"
-+#else
-+#include <ext2fs/bitops.h>
-+#endif
-+
-+/*
-+ * Return flags for the block iterator functions
-+ */
-+#define BLOCK_CHANGED	1
-+#define BLOCK_ABORT	2
-+#define BLOCK_ERROR	4
-+
-+/*
-+ * Block interate flags
-+ *
-+ * BLOCK_FLAG_APPEND, or BLOCK_FLAG_HOLE, indicates that the interator
-+ * function should be called on blocks where the block number is zero.
-+ * This is used by ext2fs_expand_dir() to be able to add a new block
-+ * to an inode.  It can also be used for programs that want to be able
-+ * to deal with files that contain "holes".
-+ * 
-+ * BLOCK_FLAG_TRAVERSE indicates that the iterator function for the
-+ * indirect, doubly indirect, etc. blocks should be called after all
-+ * of the blocks containined in the indirect blocks are processed.
-+ * This is useful if you are going to be deallocating blocks from an
-+ * inode.
-+ *
-+ * BLOCK_FLAG_DATA_ONLY indicates that the iterator function should be
-+ * called for data blocks only.
-+ *
-+ * BLOCK_FLAG_NO_LARGE is for internal use only.  It informs
-+ * ext2fs_block_iterate2 that large files won't be accepted.
-+ */
-+#define BLOCK_FLAG_APPEND	1
-+#define BLOCK_FLAG_HOLE		1
-+#define BLOCK_FLAG_DEPTH_TRAVERSE	2
-+#define BLOCK_FLAG_DATA_ONLY	4
-+
-+#define BLOCK_FLAG_NO_LARGE	0x1000
-+
-+/*
-+ * Magic "block count" return values for the block iterator function.
-+ */
-+#define BLOCK_COUNT_IND		(-1)
-+#define BLOCK_COUNT_DIND	(-2)
-+#define BLOCK_COUNT_TIND	(-3)
-+#define BLOCK_COUNT_TRANSLATOR	(-4)
-+
-+#if 0
-+/*
-+ * Flags for ext2fs_move_blocks
-+ */
-+#define EXT2_BMOVE_GET_DBLIST	0x0001	
-+#define EXT2_BMOVE_DEBUG	0x0002
-+#endif
-+
-+/*
-+ * Flags for directory block reading and writing functions
-+ */
-+#define EXT2_DIRBLOCK_V2_STRUCT	0x0001
-+
-+/*
-+ * Return flags for the directory iterator functions
-+ */
-+#define DIRENT_CHANGED	1
-+#define DIRENT_ABORT	2
-+#define DIRENT_ERROR	3
-+
-+/*
-+ * Directory iterator flags
-+ */
-+
-+#define DIRENT_FLAG_INCLUDE_EMPTY	1
-+#define DIRENT_FLAG_INCLUDE_REMOVED	2
-+
-+#define DIRENT_DOT_FILE		1
-+#define DIRENT_DOT_DOT_FILE	2
-+#define DIRENT_OTHER_FILE	3
-+#define DIRENT_DELETED_FILE	4
-+
-+/*
-+ * Inode scan definitions
-+ */
-+typedef struct ext2_struct_inode_scan *ext2_inode_scan;
-+
-+/*
-+ * ext2fs_scan flags
-+ */
-+#define EXT2_SF_CHK_BADBLOCKS	0x0001
-+#define EXT2_SF_BAD_INODE_BLK	0x0002
-+#define EXT2_SF_BAD_EXTRA_BYTES	0x0004
-+#define EXT2_SF_SKIP_MISSING_ITABLE	0x0008
-+
-+/*
-+ * ext2fs_check_if_mounted flags
-+ */
-+#define EXT2_MF_MOUNTED		1
-+#define EXT2_MF_ISROOT		2
-+#define EXT2_MF_READONLY	4
-+#define EXT2_MF_SWAP		8
-+#define EXT2_MF_BUSY		16
-+
-+/*
-+ * Ext2/linux mode flags.  We define them here so that we don't need
-+ * to depend on the OS's sys/stat.h, since we may be compiling on a
-+ * non-Linux system.
-+ */
-+#define LINUX_S_IFMT  00170000
-+#define LINUX_S_IFSOCK 0140000
-+#define LINUX_S_IFLNK	 0120000
-+#define LINUX_S_IFREG  0100000
-+#define LINUX_S_IFBLK  0060000
-+#define LINUX_S_IFDIR  0040000
-+#define LINUX_S_IFCHR  0020000
-+#define LINUX_S_IFIFO  0010000
-+#define LINUX_S_ISUID  0004000
-+#define LINUX_S_ISGID  0002000
-+#define LINUX_S_ISVTX  0001000
-+
-+#define LINUX_S_IRWXU 00700
-+#define LINUX_S_IRUSR 00400
-+#define LINUX_S_IWUSR 00200
-+#define LINUX_S_IXUSR 00100
-+
-+#define LINUX_S_IRWXG 00070
-+#define LINUX_S_IRGRP 00040
-+#define LINUX_S_IWGRP 00020
-+#define LINUX_S_IXGRP 00010
-+
-+#define LINUX_S_IRWXO 00007
-+#define LINUX_S_IROTH 00004
-+#define LINUX_S_IWOTH 00002
-+#define LINUX_S_IXOTH 00001
-+
-+#define LINUX_S_ISLNK(m)	(((m) & LINUX_S_IFMT) == LINUX_S_IFLNK)
-+#define LINUX_S_ISREG(m)	(((m) & LINUX_S_IFMT) == LINUX_S_IFREG)
-+#define LINUX_S_ISDIR(m)	(((m) & LINUX_S_IFMT) == LINUX_S_IFDIR)
-+#define LINUX_S_ISCHR(m)	(((m) & LINUX_S_IFMT) == LINUX_S_IFCHR)
-+#define LINUX_S_ISBLK(m)	(((m) & LINUX_S_IFMT) == LINUX_S_IFBLK)
-+#define LINUX_S_ISFIFO(m)	(((m) & LINUX_S_IFMT) == LINUX_S_IFIFO)
-+#define LINUX_S_ISSOCK(m)	(((m) & LINUX_S_IFMT) == LINUX_S_IFSOCK)
-+
-+/*
-+ * ext2 size of an inode
-+ */
-+#define EXT2_I_SIZE(i)	((i)->i_size | ((__u64) (i)->i_size_high << 32))
-+
-+/*
-+ * ext2_icount_t abstraction
-+ */
-+#define EXT2_ICOUNT_OPT_INCREMENT	0x01
-+
-+typedef struct ext2_icount *ext2_icount_t;
-+
-+/*
-+ * Flags for ext2fs_bmap
-+ */
-+#define BMAP_ALLOC	0x0001
-+#define BMAP_SET	0x0002
-+
-+/*
-+ * Flags for imager.c functions
-+ */
-+#define IMAGER_FLAG_INODEMAP	1
-+#define IMAGER_FLAG_SPARSEWRITE	2
-+
-+/*
-+ * For checking structure magic numbers...
-+ */
-+
-+#define EXT2_CHECK_MAGIC(struct, code) \
-+	  if ((struct)->magic != (code)) return (code)
-+
-+
-+/*
-+ * For ext2 compression support
-+ */
-+#define EXT2FS_COMPRESSED_BLKADDR ((blk_t) 0xffffffff)
-+#define HOLE_BLKADDR(_b) ((_b) == 0 || (_b) == EXT2FS_COMPRESSED_BLKADDR)
-+
-+/*
-+ * Features supported by this version of the library
-+ */
-+#define EXT2_LIB_FEATURE_COMPAT_SUPP	(EXT2_FEATURE_COMPAT_DIR_PREALLOC|\
-+					 EXT2_FEATURE_COMPAT_IMAGIC_INODES|\
-+					 EXT3_FEATURE_COMPAT_HAS_JOURNAL|\
-+					 EXT2_FEATURE_COMPAT_RESIZE_INODE|\
-+					 EXT2_FEATURE_COMPAT_DIR_INDEX|\
-+					 EXT2_FEATURE_COMPAT_EXT_ATTR)
-+
-+/* This #ifdef is temporary until compression is fully supported */
-+#ifdef ENABLE_COMPRESSION
-+#ifndef I_KNOW_THAT_COMPRESSION_IS_EXPERIMENTAL
-+/* If the below warning bugs you, then have
-+   `CPPFLAGS=-DI_KNOW_THAT_COMPRESSION_IS_EXPERIMENTAL' in your
-+   environment at configure time. */
-+ #warning "Compression support is experimental"
-+#endif
-+#define EXT2_LIB_FEATURE_INCOMPAT_SUPP	(EXT2_FEATURE_INCOMPAT_FILETYPE|\
-+					 EXT2_FEATURE_INCOMPAT_COMPRESSION|\
-+					 EXT3_FEATURE_INCOMPAT_JOURNAL_DEV|\
-+					 EXT2_FEATURE_INCOMPAT_META_BG|\
-+					 EXT3_FEATURE_INCOMPAT_RECOVER)
-+#else
-+#define EXT2_LIB_FEATURE_INCOMPAT_SUPP	(EXT2_FEATURE_INCOMPAT_FILETYPE|\
-+					 EXT3_FEATURE_INCOMPAT_JOURNAL_DEV|\
-+					 EXT2_FEATURE_INCOMPAT_META_BG|\
-+					 EXT3_FEATURE_INCOMPAT_RECOVER)
-+#endif
-+#define EXT2_LIB_FEATURE_RO_COMPAT_SUPP	(EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER|\
-+					 EXT2_FEATURE_RO_COMPAT_LARGE_FILE)
-+/*
-+ * function prototypes
-+ */
-+
-+/* alloc.c */
-+extern errcode_t ext2fs_new_inode(ext2_filsys fs, ext2_ino_t dir, int mode,
-+				  ext2fs_inode_bitmap map, ext2_ino_t *ret);
-+extern errcode_t ext2fs_new_block(ext2_filsys fs, blk_t goal,
-+				  ext2fs_block_bitmap map, blk_t *ret);
-+extern errcode_t ext2fs_get_free_blocks(ext2_filsys fs, blk_t start,
-+					blk_t finish, int num,
-+					ext2fs_block_bitmap map,
-+					blk_t *ret);
-+extern errcode_t ext2fs_alloc_block(ext2_filsys fs, blk_t goal,
-+				    char *block_buf, blk_t *ret);
-+
-+/* alloc_sb.c */
-+extern int ext2fs_reserve_super_and_bgd(ext2_filsys fs, 
-+					dgrp_t group,
-+					ext2fs_block_bitmap bmap);
-+
-+/* alloc_stats.c */
-+void ext2fs_inode_alloc_stats(ext2_filsys fs, ext2_ino_t ino, int inuse);
-+void ext2fs_inode_alloc_stats2(ext2_filsys fs, ext2_ino_t ino,
-+			       int inuse, int isdir);
-+void ext2fs_block_alloc_stats(ext2_filsys fs, blk_t blk, int inuse);
-+
-+/* alloc_tables.c */
-+extern errcode_t ext2fs_allocate_tables(ext2_filsys fs);
-+extern errcode_t ext2fs_allocate_group_table(ext2_filsys fs, dgrp_t group,
-+					     ext2fs_block_bitmap bmap);
-+
-+/* badblocks.c */
-+extern errcode_t ext2fs_u32_list_create(ext2_u32_list *ret, int size);
-+extern errcode_t ext2fs_u32_list_add(ext2_u32_list bb, __u32 blk);
-+extern int ext2fs_u32_list_find(ext2_u32_list bb, __u32 blk);
-+extern int ext2fs_u32_list_test(ext2_u32_list bb, blk_t blk);
-+extern errcode_t ext2fs_u32_list_iterate_begin(ext2_u32_list bb,
-+					       ext2_u32_iterate *ret);
-+extern int ext2fs_u32_list_iterate(ext2_u32_iterate iter, blk_t *blk);
-+extern void ext2fs_u32_list_iterate_end(ext2_u32_iterate iter);
-+extern errcode_t ext2fs_u32_copy(ext2_u32_list src, ext2_u32_list *dest);
-+extern int ext2fs_u32_list_equal(ext2_u32_list bb1, ext2_u32_list bb2);
-+
-+extern errcode_t ext2fs_badblocks_list_create(ext2_badblocks_list *ret,
-+					    int size);
-+extern errcode_t ext2fs_badblocks_list_add(ext2_badblocks_list bb,
-+					   blk_t blk);
-+extern int ext2fs_badblocks_list_test(ext2_badblocks_list bb,
-+				    blk_t blk);
-+extern int ext2fs_u32_list_del(ext2_u32_list bb, __u32 blk);
-+extern void ext2fs_badblocks_list_del(ext2_u32_list bb, __u32 blk);
-+extern errcode_t
-+	ext2fs_badblocks_list_iterate_begin(ext2_badblocks_list bb,
-+					    ext2_badblocks_iterate *ret);
-+extern int ext2fs_badblocks_list_iterate(ext2_badblocks_iterate iter,
-+					 blk_t *blk);
-+extern void ext2fs_badblocks_list_iterate_end(ext2_badblocks_iterate iter);
-+extern errcode_t ext2fs_badblocks_copy(ext2_badblocks_list src,
-+				       ext2_badblocks_list *dest);
-+extern int ext2fs_badblocks_equal(ext2_badblocks_list bb1,
-+				  ext2_badblocks_list bb2);
-+extern int ext2fs_u32_list_count(ext2_u32_list bb);
-+
-+/* bb_compat */
-+extern errcode_t badblocks_list_create(badblocks_list *ret, int size);
-+extern errcode_t badblocks_list_add(badblocks_list bb, blk_t blk);
-+extern int badblocks_list_test(badblocks_list bb, blk_t blk);
-+extern errcode_t badblocks_list_iterate_begin(badblocks_list bb,
-+					      badblocks_iterate *ret);
-+extern int badblocks_list_iterate(badblocks_iterate iter, blk_t *blk);
-+extern void badblocks_list_iterate_end(badblocks_iterate iter);
-+extern void badblocks_list_free(badblocks_list bb);
-+
-+/* bb_inode.c */
-+extern errcode_t ext2fs_update_bb_inode(ext2_filsys fs,
-+					ext2_badblocks_list bb_list);
-+
-+/* bitmaps.c */
-+extern errcode_t ext2fs_write_inode_bitmap(ext2_filsys fs);
-+extern errcode_t ext2fs_write_block_bitmap (ext2_filsys fs);
-+extern errcode_t ext2fs_read_inode_bitmap (ext2_filsys fs);
-+extern errcode_t ext2fs_read_block_bitmap(ext2_filsys fs);
-+extern errcode_t ext2fs_allocate_generic_bitmap(__u32 start,
-+						__u32 end,
-+						__u32 real_end,
-+						const char *descr,
-+						ext2fs_generic_bitmap *ret);
-+extern errcode_t ext2fs_allocate_block_bitmap(ext2_filsys fs,
-+					      const char *descr,
-+					      ext2fs_block_bitmap *ret);
-+extern errcode_t ext2fs_allocate_inode_bitmap(ext2_filsys fs,
-+					      const char *descr,
-+					      ext2fs_inode_bitmap *ret);
-+extern errcode_t ext2fs_fudge_inode_bitmap_end(ext2fs_inode_bitmap bitmap,
-+					       ext2_ino_t end, ext2_ino_t *oend);
-+extern errcode_t ext2fs_fudge_block_bitmap_end(ext2fs_block_bitmap bitmap,
-+					       blk_t end, blk_t *oend);
-+extern void ext2fs_clear_inode_bitmap(ext2fs_inode_bitmap bitmap);
-+extern void ext2fs_clear_block_bitmap(ext2fs_block_bitmap bitmap);
-+extern errcode_t ext2fs_read_bitmaps(ext2_filsys fs);
-+extern errcode_t ext2fs_write_bitmaps(ext2_filsys fs);
-+
-+/* block.c */
-+extern errcode_t ext2fs_block_iterate(ext2_filsys fs,
-+				      ext2_ino_t	ino,
-+				      int	flags,
-+				      char *block_buf,
-+				      int (*func)(ext2_filsys fs,
-+						  blk_t	*blocknr,
-+						  int	blockcnt,
-+						  void	*priv_data),
-+				      void *priv_data);
-+errcode_t ext2fs_block_iterate2(ext2_filsys fs,
-+				ext2_ino_t	ino,
-+				int	flags,
-+				char *block_buf,
-+				int (*func)(ext2_filsys fs,
-+					    blk_t	*blocknr,
-+					    e2_blkcnt_t	blockcnt,
-+					    blk_t	ref_blk,
-+					    int		ref_offset,
-+					    void	*priv_data),
-+				void *priv_data);
-+
-+/* bmap.c */
-+extern errcode_t ext2fs_bmap(ext2_filsys fs, ext2_ino_t ino,
-+			     struct ext2_inode *inode, 
-+			     char *block_buf, int bmap_flags,
-+			     blk_t block, blk_t *phys_blk);
-+
-+
-+#if 0
-+/* bmove.c */
-+extern errcode_t ext2fs_move_blocks(ext2_filsys fs,
-+				    ext2fs_block_bitmap reserve,
-+				    ext2fs_block_bitmap alloc_map,
-+				    int flags);
-+#endif
-+
-+/* check_desc.c */
-+extern errcode_t ext2fs_check_desc(ext2_filsys fs);
-+
-+/* closefs.c */
-+extern errcode_t ext2fs_close(ext2_filsys fs);
-+extern errcode_t ext2fs_flush(ext2_filsys fs);
-+extern int ext2fs_bg_has_super(ext2_filsys fs, int group_block);
-+extern int ext2fs_super_and_bgd_loc(ext2_filsys fs, 
-+				    dgrp_t group,
-+				    blk_t *ret_super_blk,
-+				    blk_t *ret_old_desc_blk,
-+				    blk_t *ret_new_desc_blk,
-+				    int *ret_meta_bg);
-+extern void ext2fs_update_dynamic_rev(ext2_filsys fs);
-+
-+/* cmp_bitmaps.c */
-+extern errcode_t ext2fs_compare_block_bitmap(ext2fs_block_bitmap bm1,
-+					     ext2fs_block_bitmap bm2);
-+extern errcode_t ext2fs_compare_inode_bitmap(ext2fs_inode_bitmap bm1,
-+					     ext2fs_inode_bitmap bm2);
-+
-+/* dblist.c */
-+
-+extern errcode_t ext2fs_get_num_dirs(ext2_filsys fs, ext2_ino_t *ret_num_dirs);
-+extern errcode_t ext2fs_init_dblist(ext2_filsys fs, ext2_dblist *ret_dblist);
-+extern errcode_t ext2fs_add_dir_block(ext2_dblist dblist, ext2_ino_t ino,
-+				      blk_t blk, int blockcnt);
-+extern void ext2fs_dblist_sort(ext2_dblist dblist,
-+			       EXT2_QSORT_TYPE (*sortfunc)(const void *,
-+							   const void *));
-+extern errcode_t ext2fs_dblist_iterate(ext2_dblist dblist,
-+	int (*func)(ext2_filsys fs, struct ext2_db_entry *db_info,
-+		    void	*priv_data),
-+       void *priv_data);
-+extern errcode_t ext2fs_set_dir_block(ext2_dblist dblist, ext2_ino_t ino,
-+				      blk_t blk, int blockcnt);
-+extern errcode_t ext2fs_copy_dblist(ext2_dblist src,
-+				    ext2_dblist *dest);
-+extern int ext2fs_dblist_count(ext2_dblist dblist);
-+
-+/* dblist_dir.c */
-+extern errcode_t
-+	ext2fs_dblist_dir_iterate(ext2_dblist dblist,
-+				  int	flags,
-+				  char	*block_buf,
-+				  int (*func)(ext2_ino_t	dir,
-+					      int		entry,
-+					      struct ext2_dir_entry *dirent,
-+					      int	offset,
-+					      int	blocksize,
-+					      char	*buf,
-+					      void	*priv_data),
-+				  void *priv_data);
-+
-+/* dirblock.c */
-+extern errcode_t ext2fs_read_dir_block(ext2_filsys fs, blk_t block,
-+				       void *buf);
-+extern errcode_t ext2fs_read_dir_block2(ext2_filsys fs, blk_t block,
-+					void *buf, int flags);
-+extern errcode_t ext2fs_write_dir_block(ext2_filsys fs, blk_t block,
-+					void *buf);
-+extern errcode_t ext2fs_write_dir_block2(ext2_filsys fs, blk_t block,
-+					 void *buf, int flags);
-+
-+/* dirhash.c */
-+extern errcode_t ext2fs_dirhash(int version, const char *name, int len,
-+				const __u32 *seed,
-+				ext2_dirhash_t *ret_hash,
-+				ext2_dirhash_t *ret_minor_hash);
-+
-+
-+/* dir_iterate.c */
-+extern errcode_t ext2fs_dir_iterate(ext2_filsys fs, 
-+			      ext2_ino_t dir,
-+			      int flags,
-+			      char *block_buf,
-+			      int (*func)(struct ext2_dir_entry *dirent,
-+					  int	offset,
-+					  int	blocksize,
-+					  char	*buf,
-+					  void	*priv_data),
-+			      void *priv_data);
-+extern errcode_t ext2fs_dir_iterate2(ext2_filsys fs, 
-+			      ext2_ino_t dir,
-+			      int flags,
-+			      char *block_buf,
-+			      int (*func)(ext2_ino_t	dir,
-+					  int	entry,
-+					  struct ext2_dir_entry *dirent,
-+					  int	offset,
-+					  int	blocksize,
-+					  char	*buf,
-+					  void	*priv_data),
-+			      void *priv_data);
-+
-+/* dupfs.c */
-+extern errcode_t ext2fs_dup_handle(ext2_filsys src, ext2_filsys *dest);
-+
-+/* expanddir.c */
-+extern errcode_t ext2fs_expand_dir(ext2_filsys fs, ext2_ino_t dir);
-+
-+/* ext_attr.c */
-+extern errcode_t ext2fs_read_ext_attr(ext2_filsys fs, blk_t block, void *buf);
-+extern errcode_t ext2fs_write_ext_attr(ext2_filsys fs, blk_t block,
-+				       void *buf);
-+extern errcode_t ext2fs_adjust_ea_refcount(ext2_filsys fs, blk_t blk,
-+					   char *block_buf,
-+					   int adjust, __u32 *newcount);
-+
-+/* fileio.c */
-+extern errcode_t ext2fs_file_open2(ext2_filsys fs, ext2_ino_t ino,
-+				   struct ext2_inode *inode,
-+				   int flags, ext2_file_t *ret);
-+extern errcode_t ext2fs_file_open(ext2_filsys fs, ext2_ino_t ino,
-+				  int flags, ext2_file_t *ret);
-+extern ext2_filsys ext2fs_file_get_fs(ext2_file_t file);
-+extern errcode_t ext2fs_file_close(ext2_file_t file);
-+extern errcode_t ext2fs_file_flush(ext2_file_t file);
-+extern errcode_t ext2fs_file_read(ext2_file_t file, void *buf,
-+				  unsigned int wanted, unsigned int *got);
-+extern errcode_t ext2fs_file_write(ext2_file_t file, const void *buf,
-+				   unsigned int nbytes, unsigned int *written);
-+extern errcode_t ext2fs_file_llseek(ext2_file_t file, __u64 offset,
-+				   int whence, __u64 *ret_pos);
-+extern errcode_t ext2fs_file_lseek(ext2_file_t file, ext2_off_t offset,
-+				   int whence, ext2_off_t *ret_pos);
-+errcode_t ext2fs_file_get_lsize(ext2_file_t file, __u64 *ret_size);
-+extern ext2_off_t ext2fs_file_get_size(ext2_file_t file);
-+extern errcode_t ext2fs_file_set_size(ext2_file_t file, ext2_off_t size);
-+
-+/* finddev.c */
-+extern char *ext2fs_find_block_device(dev_t device);
-+
-+/* flushb.c */
-+extern errcode_t ext2fs_sync_device(int fd, int flushb);
-+
-+/* freefs.c */
-+extern void ext2fs_free(ext2_filsys fs);
-+extern void ext2fs_free_generic_bitmap(ext2fs_inode_bitmap bitmap);
-+extern void ext2fs_free_block_bitmap(ext2fs_block_bitmap bitmap);
-+extern void ext2fs_free_inode_bitmap(ext2fs_inode_bitmap bitmap);
-+extern void ext2fs_free_dblist(ext2_dblist dblist);
-+extern void ext2fs_badblocks_list_free(ext2_badblocks_list bb);
-+extern void ext2fs_u32_list_free(ext2_u32_list bb);
-+
-+/* getsize.c */
-+extern errcode_t ext2fs_get_device_size(const char *file, int blocksize,
-+					blk_t *retblocks);
-+
-+/* getsectsize.c */
-+errcode_t ext2fs_get_device_sectsize(const char *file, int *sectsize);
-+
-+/* imager.c */
-+extern errcode_t ext2fs_image_inode_write(ext2_filsys fs, int fd, int flags);
-+extern errcode_t ext2fs_image_inode_read(ext2_filsys fs, int fd, int flags);
-+extern errcode_t ext2fs_image_super_write(ext2_filsys fs, int fd, int flags);
-+extern errcode_t ext2fs_image_super_read(ext2_filsys fs, int fd, int flags);
-+extern errcode_t ext2fs_image_bitmap_write(ext2_filsys fs, int fd, int flags);
-+extern errcode_t ext2fs_image_bitmap_read(ext2_filsys fs, int fd, int flags);
-+
-+/* ind_block.c */
-+errcode_t ext2fs_read_ind_block(ext2_filsys fs, blk_t blk, void *buf);
-+errcode_t ext2fs_write_ind_block(ext2_filsys fs, blk_t blk, void *buf);
-+
-+/* initialize.c */
-+extern errcode_t ext2fs_initialize(const char *name, int flags,
-+				   struct ext2_super_block *param,
-+				   io_manager manager, ext2_filsys *ret_fs);
-+
-+/* icount.c */
-+extern void ext2fs_free_icount(ext2_icount_t icount);
-+extern errcode_t ext2fs_create_icount2(ext2_filsys fs, int flags, 
-+				       unsigned int size,
-+				       ext2_icount_t hint, ext2_icount_t *ret);
-+extern errcode_t ext2fs_create_icount(ext2_filsys fs, int flags, 
-+				      unsigned int size,
-+				      ext2_icount_t *ret);
-+extern errcode_t ext2fs_icount_fetch(ext2_icount_t icount, ext2_ino_t ino,
-+				     __u16 *ret);
-+extern errcode_t ext2fs_icount_increment(ext2_icount_t icount, ext2_ino_t ino,
-+					 __u16 *ret);
-+extern errcode_t ext2fs_icount_decrement(ext2_icount_t icount, ext2_ino_t ino,
-+					 __u16 *ret);
-+extern errcode_t ext2fs_icount_store(ext2_icount_t icount, ext2_ino_t ino,
-+				     __u16 count);
-+extern ext2_ino_t ext2fs_get_icount_size(ext2_icount_t icount);
-+errcode_t ext2fs_icount_validate(ext2_icount_t icount, FILE *);
-+
-+/* inode.c */
-+extern errcode_t ext2fs_flush_icache(ext2_filsys fs);
-+extern errcode_t ext2fs_get_next_inode_full(ext2_inode_scan scan, 
-+					    ext2_ino_t *ino,
-+					    struct ext2_inode *inode, 
-+					    int bufsize);
-+extern errcode_t ext2fs_open_inode_scan(ext2_filsys fs, int buffer_blocks,
-+				  ext2_inode_scan *ret_scan);
-+extern void ext2fs_close_inode_scan(ext2_inode_scan scan);
-+extern errcode_t ext2fs_get_next_inode(ext2_inode_scan scan, ext2_ino_t *ino,
-+			       struct ext2_inode *inode);
-+extern errcode_t ext2fs_inode_scan_goto_blockgroup(ext2_inode_scan scan,
-+						   int	group);
-+extern void ext2fs_set_inode_callback
-+	(ext2_inode_scan scan,
-+	 errcode_t (*done_group)(ext2_filsys fs,
-+				 ext2_inode_scan scan,
-+				 dgrp_t group,
-+				 void * priv_data),
-+	 void *done_group_data);
-+extern int ext2fs_inode_scan_flags(ext2_inode_scan scan, int set_flags,
-+				   int clear_flags);
-+extern errcode_t ext2fs_read_inode_full(ext2_filsys fs, ext2_ino_t ino,
-+					struct ext2_inode * inode, 
-+					int bufsize);
-+extern errcode_t ext2fs_read_inode (ext2_filsys fs, ext2_ino_t ino,
-+			    struct ext2_inode * inode);
-+extern errcode_t ext2fs_write_inode_full(ext2_filsys fs, ext2_ino_t ino,
-+					 struct ext2_inode * inode, 
-+					 int bufsize);
-+extern errcode_t ext2fs_write_inode(ext2_filsys fs, ext2_ino_t ino,
-+			    struct ext2_inode * inode);
-+extern errcode_t ext2fs_write_new_inode(ext2_filsys fs, ext2_ino_t ino,
-+			    struct ext2_inode * inode);
-+extern errcode_t ext2fs_get_blocks(ext2_filsys fs, ext2_ino_t ino, blk_t *blocks);
-+extern errcode_t ext2fs_check_directory(ext2_filsys fs, ext2_ino_t ino);
-+
-+/* inode_io.c */
-+extern io_manager inode_io_manager;
-+extern errcode_t ext2fs_inode_io_intern(ext2_filsys fs, ext2_ino_t ino, 
-+					char **name);
-+extern errcode_t ext2fs_inode_io_intern2(ext2_filsys fs, ext2_ino_t ino,
-+					 struct ext2_inode *inode,
-+					 char **name);
-+	
-+/* ismounted.c */
-+extern errcode_t ext2fs_check_if_mounted(const char *file, int *mount_flags);
-+extern errcode_t ext2fs_check_mount_point(const char *device, int *mount_flags,
-+					  char *mtpt, int mtlen);
-+
-+/* namei.c */
-+extern errcode_t ext2fs_lookup(ext2_filsys fs, ext2_ino_t dir, const char *name,
-+			 int namelen, char *buf, ext2_ino_t *inode);
-+extern errcode_t ext2fs_namei(ext2_filsys fs, ext2_ino_t root, ext2_ino_t cwd,
-+			const char *name, ext2_ino_t *inode);
-+errcode_t ext2fs_namei_follow(ext2_filsys fs, ext2_ino_t root, ext2_ino_t cwd,
-+			      const char *name, ext2_ino_t *inode);
-+extern errcode_t ext2fs_follow_link(ext2_filsys fs, ext2_ino_t root, ext2_ino_t cwd,
-+			ext2_ino_t inode, ext2_ino_t *res_inode);
-+
-+/* native.c */
-+int ext2fs_native_flag(void);
-+
-+/* newdir.c */
-+extern errcode_t ext2fs_new_dir_block(ext2_filsys fs, ext2_ino_t dir_ino,
-+				ext2_ino_t parent_ino, char **block);
-+
-+/* mkdir.c */
-+extern errcode_t ext2fs_mkdir(ext2_filsys fs, ext2_ino_t parent, ext2_ino_t inum,
-+			      const char *name);
-+
-+/* mkjournal.c */
-+extern errcode_t ext2fs_create_journal_superblock(ext2_filsys fs,
-+						  __u32 size, int flags,
-+						  char  **ret_jsb);
-+extern errcode_t ext2fs_add_journal_device(ext2_filsys fs,
-+					   ext2_filsys journal_dev);
-+extern errcode_t ext2fs_add_journal_inode(ext2_filsys fs, blk_t size,
-+					  int flags);
-+
-+/* openfs.c */
-+extern errcode_t ext2fs_open(const char *name, int flags, int superblock,
-+			     unsigned int block_size, io_manager manager,
-+			     ext2_filsys *ret_fs);
-+extern errcode_t ext2fs_open2(const char *name, const char *io_options, 
-+			      int flags, int superblock, 
-+			      unsigned int block_size, io_manager manager,
-+			      ext2_filsys *ret_fs);
-+extern blk_t ext2fs_descriptor_block_loc(ext2_filsys fs, blk_t group_block, 
-+					 dgrp_t i);
-+errcode_t ext2fs_get_data_io(ext2_filsys fs, io_channel *old_io);
-+errcode_t ext2fs_set_data_io(ext2_filsys fs, io_channel new_io);
-+errcode_t ext2fs_rewrite_to_io(ext2_filsys fs, io_channel new_io);
-+
-+/* get_pathname.c */
-+extern errcode_t ext2fs_get_pathname(ext2_filsys fs, ext2_ino_t dir, ext2_ino_t ino,
-+			       char **name);
-+
-+/* link.c */
-+errcode_t ext2fs_link(ext2_filsys fs, ext2_ino_t dir, const char *name,
-+		      ext2_ino_t ino, int flags);
-+errcode_t ext2fs_unlink(ext2_filsys fs, ext2_ino_t dir, const char *name,
-+			ext2_ino_t ino, int flags);
-+
-+/* read_bb.c */
-+extern errcode_t ext2fs_read_bb_inode(ext2_filsys fs,
-+				      ext2_badblocks_list *bb_list);
-+
-+/* read_bb_file.c */
-+extern errcode_t ext2fs_read_bb_FILE2(ext2_filsys fs, FILE *f, 
-+				      ext2_badblocks_list *bb_list,
-+				      void *priv_data,
-+				      void (*invalid)(ext2_filsys fs,
-+						      blk_t blk,
-+						      char *badstr,
-+						      void *priv_data));
-+extern errcode_t ext2fs_read_bb_FILE(ext2_filsys fs, FILE *f, 
-+				     ext2_badblocks_list *bb_list,
-+				     void (*invalid)(ext2_filsys fs,
-+						     blk_t blk));
-+
-+/* res_gdt.c */
-+extern errcode_t ext2fs_create_resize_inode(ext2_filsys fs);
-+
-+/* rs_bitmap.c */
-+extern errcode_t ext2fs_resize_generic_bitmap(__u32 new_end,
-+					      __u32 new_real_end,
-+					      ext2fs_generic_bitmap bmap);
-+extern errcode_t ext2fs_resize_inode_bitmap(__u32 new_end, __u32 new_real_end,
-+					    ext2fs_inode_bitmap bmap);
-+extern errcode_t ext2fs_resize_block_bitmap(__u32 new_end, __u32 new_real_end,
-+					    ext2fs_block_bitmap bmap);
-+extern errcode_t ext2fs_copy_bitmap(ext2fs_generic_bitmap src,
-+				    ext2fs_generic_bitmap *dest);
-+
-+/* swapfs.c */
-+extern void ext2fs_swap_ext_attr(char *to, char *from, int bufsize, 
-+				 int has_header);
-+extern void ext2fs_swap_super(struct ext2_super_block * super);
-+extern void ext2fs_swap_group_desc(struct ext2_group_desc *gdp);
-+extern void ext2fs_swap_inode_full(ext2_filsys fs, struct ext2_inode_large *t,
-+				   struct ext2_inode_large *f, int hostorder,
-+				   int bufsize);
-+extern void ext2fs_swap_inode(ext2_filsys fs,struct ext2_inode *t,
-+			      struct ext2_inode *f, int hostorder);
-+
-+/* valid_blk.c */
-+extern int ext2fs_inode_has_valid_blocks(struct ext2_inode *inode);
-+
-+/* version.c */
-+extern int ext2fs_parse_version_string(const char *ver_string);
-+extern int ext2fs_get_library_version(const char **ver_string,
-+				      const char **date_string);
-+
-+/* write_bb_file.c */
-+extern errcode_t ext2fs_write_bb_FILE(ext2_badblocks_list bb_list,
-+				      unsigned int flags,
-+				      FILE *f);
-+
-+
-+/* inline functions */
-+extern errcode_t ext2fs_get_mem(unsigned long size, void *ptr);
-+extern errcode_t ext2fs_free_mem(void *ptr);
-+extern errcode_t ext2fs_resize_mem(unsigned long old_size,
-+				   unsigned long size, void *ptr);
-+extern void ext2fs_mark_super_dirty(ext2_filsys fs);
-+extern void ext2fs_mark_changed(ext2_filsys fs);
-+extern int ext2fs_test_changed(ext2_filsys fs);
-+extern void ext2fs_mark_valid(ext2_filsys fs);
-+extern void ext2fs_unmark_valid(ext2_filsys fs);
-+extern int ext2fs_test_valid(ext2_filsys fs);
-+extern void ext2fs_mark_ib_dirty(ext2_filsys fs);
-+extern void ext2fs_mark_bb_dirty(ext2_filsys fs);
-+extern int ext2fs_test_ib_dirty(ext2_filsys fs);
-+extern int ext2fs_test_bb_dirty(ext2_filsys fs);
-+extern int ext2fs_group_of_blk(ext2_filsys fs, blk_t blk);
-+extern int ext2fs_group_of_ino(ext2_filsys fs, ext2_ino_t ino);
-+extern blk_t ext2fs_inode_data_blocks(ext2_filsys fs,
-+				      struct ext2_inode *inode);
-+
-+/*
-+ * The actual inlined functions definitions themselves...
-+ *
-+ * If NO_INLINE_FUNCS is defined, then we won't try to do inline
-+ * functions at all!
-+ */
-+#if (defined(INCLUDE_INLINE_FUNCS) || !defined(NO_INLINE_FUNCS))
-+#ifdef INCLUDE_INLINE_FUNCS
-+#define _INLINE_ extern
-+#else
-+#ifdef __GNUC__
-+#define _INLINE_ extern __inline__
-+#else				/* For Watcom C */
-+#define _INLINE_ extern inline
-+#endif
-+#endif
-+
-+#ifndef EXT2_CUSTOM_MEMORY_ROUTINES
-+/*
-+ *  Allocate memory
-+ */
-+_INLINE_ errcode_t ext2fs_get_mem(unsigned long size, void *ptr)
-+{
-+	void **pp = (void **)ptr;
-+
-+	*pp = malloc(size);
-+	if (!*pp)
-+		return EXT2_ET_NO_MEMORY;
-+	return 0;
-+}
-+
-+/*
-+ * Free memory
-+ */
-+_INLINE_ errcode_t ext2fs_free_mem(void *ptr)
-+{
-+	void **pp = (void **)ptr;
-+
-+	free(*pp);
-+	*pp = 0;
-+	return 0;
-+}
-+	
-+/*
-+ *  Resize memory
-+ */
-+_INLINE_ errcode_t ext2fs_resize_mem(unsigned long EXT2FS_ATTR((unused)) old_size,
-+				     unsigned long size, void *ptr)
-+{
-+	void *p;
-+
-+	/* Use "memcpy" for pointer assignments here to avoid problems
-+	 * with C99 strict type aliasing rules. */
-+	memcpy(&p, ptr, sizeof (p));
-+	p = realloc(p, size);
-+	if (!p)
-+		return EXT2_ET_NO_MEMORY;
-+	memcpy(ptr, &p, sizeof (p));
-+	return 0;
-+}
-+#endif	/* Custom memory routines */
-+
-+/*
-+ * Mark a filesystem superblock as dirty
-+ */
-+_INLINE_ void ext2fs_mark_super_dirty(ext2_filsys fs)
-+{
-+	fs->flags |= EXT2_FLAG_DIRTY | EXT2_FLAG_CHANGED;
-+}
-+
-+/*
-+ * Mark a filesystem as changed
-+ */
-+_INLINE_ void ext2fs_mark_changed(ext2_filsys fs)
-+{
-+	fs->flags |= EXT2_FLAG_CHANGED;
-+}
-+
-+/*
-+ * Check to see if a filesystem has changed
-+ */
-+_INLINE_ int ext2fs_test_changed(ext2_filsys fs)
-+{
-+	return (fs->flags & EXT2_FLAG_CHANGED);
-+}
-+
-+/*
-+ * Mark a filesystem as valid
-+ */
-+_INLINE_ void ext2fs_mark_valid(ext2_filsys fs)
-+{
-+	fs->flags |= EXT2_FLAG_VALID;
-+}
-+
-+/*
-+ * Mark a filesystem as NOT valid
-+ */
-+_INLINE_ void ext2fs_unmark_valid(ext2_filsys fs)
-+{
-+	fs->flags &= ~EXT2_FLAG_VALID;
-+}
-+
-+/*
-+ * Check to see if a filesystem is valid
-+ */
-+_INLINE_ int ext2fs_test_valid(ext2_filsys fs)
-+{
-+	return (fs->flags & EXT2_FLAG_VALID);
-+}
-+
-+/*
-+ * Mark the inode bitmap as dirty
-+ */
-+_INLINE_ void ext2fs_mark_ib_dirty(ext2_filsys fs)
-+{
-+	fs->flags |= EXT2_FLAG_IB_DIRTY | EXT2_FLAG_CHANGED;
-+}
-+
-+/*
-+ * Mark the block bitmap as dirty
-+ */
-+_INLINE_ void ext2fs_mark_bb_dirty(ext2_filsys fs)
-+{
-+	fs->flags |= EXT2_FLAG_BB_DIRTY | EXT2_FLAG_CHANGED;
-+}
-+
-+/*
-+ * Check to see if a filesystem's inode bitmap is dirty
-+ */
-+_INLINE_ int ext2fs_test_ib_dirty(ext2_filsys fs)
-+{
-+	return (fs->flags & EXT2_FLAG_IB_DIRTY);
-+}
-+
-+/*
-+ * Check to see if a filesystem's block bitmap is dirty
-+ */
-+_INLINE_ int ext2fs_test_bb_dirty(ext2_filsys fs)
-+{
-+	return (fs->flags & EXT2_FLAG_BB_DIRTY);
-+}
-+
-+/*
-+ * Return the group # of a block
-+ */
-+_INLINE_ int ext2fs_group_of_blk(ext2_filsys fs, blk_t blk)
-+{
-+	return (blk - fs->super->s_first_data_block) /
-+		fs->super->s_blocks_per_group;
-+}
-+
-+/*
-+ * Return the group # of an inode number
-+ */
-+_INLINE_ int ext2fs_group_of_ino(ext2_filsys fs, ext2_ino_t ino)
-+{
-+	return (ino - 1) / fs->super->s_inodes_per_group;
-+}
-+
-+_INLINE_ blk_t ext2fs_inode_data_blocks(ext2_filsys fs,
-+					struct ext2_inode *inode)
-+{
-+       return inode->i_blocks -
-+              (inode->i_file_acl ? fs->blocksize >> 9 : 0);
-+}
-+#undef _INLINE_
-+#endif
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _EXT2FS_EXT2FS_H */
-diff -Naur silo-1.4.13.orig/libext2fs/ext2fsP.h silo-1.4.13/libext2fs/ext2fsP.h
---- silo-1.4.13.orig/libext2fs/ext2fsP.h	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/ext2fsP.h	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,88 @@
-+/*
-+ * ext2fsP.h --- private header file for ext2 library
-+ * 
-+ * Copyright (C) 1997 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include "ext2fs.h"
-+
-+/*
-+ * Badblocks list
-+ */
-+struct ext2_struct_u32_list {
-+	int	magic;
-+	int	num;
-+	int	size;
-+	__u32	*list;
-+	int	badblocks_flags;
-+};
-+
-+struct ext2_struct_u32_iterate {
-+	int			magic;
-+	ext2_u32_list		bb;
-+	int			ptr;
-+};
-+
-+
-+/*
-+ * Directory block iterator definition
-+ */
-+struct ext2_struct_dblist {
-+	int			magic;
-+	ext2_filsys		fs;
-+	ext2_ino_t		size;
-+	ext2_ino_t		count;
-+	int			sorted;
-+	struct ext2_db_entry *	list;
-+};
-+
-+/*
-+ * For directory iterators
-+ */
-+struct dir_context {
-+	ext2_ino_t		dir;
-+	int		flags;
-+	char		*buf;
-+	int (*func)(ext2_ino_t	dir,
-+		    int	entry,
-+		    struct ext2_dir_entry *dirent,
-+		    int	offset,
-+		    int	blocksize,
-+		    char	*buf,
-+		    void	*priv_data);
-+	void		*priv_data;
-+	errcode_t	errcode;
-+};
-+
-+/*
-+ * Inode cache structure
-+ */
-+struct ext2_inode_cache {
-+	void *				buffer;
-+	blk_t				buffer_blk;
-+	int				cache_last;
-+	int				cache_size;
-+	int				refcount;
-+	struct ext2_inode_cache_ent	*cache;
-+};
-+
-+struct ext2_inode_cache_ent {
-+	ext2_ino_t		ino;
-+	struct ext2_inode	inode;
-+};
-+
-+/* Function prototypes */
-+
-+extern int ext2fs_process_dir_block(ext2_filsys  	fs,
-+				    blk_t		*blocknr,
-+				    e2_blkcnt_t		blockcnt,
-+				    blk_t		ref_block,
-+				    int			ref_offset,
-+				    void		*priv_data);
-+
-+
-diff -Naur silo-1.4.13.orig/libext2fs/ext2_io.h silo-1.4.13/libext2fs/ext2_io.h
---- silo-1.4.13.orig/libext2fs/ext2_io.h	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/ext2_io.h	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,108 @@
-+/*
-+ * io.h --- the I/O manager abstraction
-+ * 
-+ * Copyright (C) 1993, 1994, 1995, 1996 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#ifndef _EXT2FS_EXT2_IO_H
-+#define _EXT2FS_EXT2_IO_H
-+
-+/*
-+ * ext2_loff_t is defined here since unix_io.c needs it.
-+ */
-+#if defined(__GNUC__) || defined(HAS_LONG_LONG)
-+typedef long long	ext2_loff_t;
-+#else
-+typedef long		ext2_loff_t;
-+#endif
-+
-+/* llseek.c */
-+ext2_loff_t ext2fs_llseek (int, ext2_loff_t, int);
-+
-+typedef struct struct_io_manager *io_manager;
-+typedef struct struct_io_channel *io_channel;
-+
-+#define CHANNEL_FLAGS_WRITETHROUGH	0x01
-+
-+struct struct_io_channel {
-+	errcode_t	magic;
-+	io_manager	manager;
-+	char		*name;
-+	int		block_size;
-+	errcode_t	(*read_error)(io_channel channel,
-+				      unsigned long block,
-+				      int count,
-+				      void *data,
-+				      size_t size,
-+				      int actual_bytes_read,
-+				      errcode_t	error);
-+	errcode_t	(*write_error)(io_channel channel,
-+				       unsigned long block,
-+				       int count,
-+				       const void *data,
-+				       size_t size,
-+				       int actual_bytes_written,
-+				       errcode_t error);
-+	int		refcount;
-+	int		flags;
-+	int		reserved[14];
-+	void		*private_data;
-+	void		*app_data;
-+};
-+
-+struct struct_io_manager {
-+	errcode_t magic;
-+	const char *name;
-+	errcode_t (*open)(const char *name, int flags, io_channel *channel);
-+	errcode_t (*close)(io_channel channel);
-+	errcode_t (*set_blksize)(io_channel channel, int blksize);
-+	errcode_t (*read_blk)(io_channel channel, unsigned long block,
-+			      int count, void *data);
-+	errcode_t (*write_blk)(io_channel channel, unsigned long block,
-+			       int count, const void *data);
-+	errcode_t (*flush)(io_channel channel);
-+	errcode_t (*write_byte)(io_channel channel, unsigned long offset,
-+				int count, const void *data);
-+	errcode_t (*set_option)(io_channel channel, const char *option, 
-+				const char *arg);
-+	int		reserved[14];
-+};
-+
-+#define IO_FLAG_RW	1
-+
-+/*
-+ * Convenience functions....
-+ */
-+#define io_channel_close(c) 		((c)->manager->close((c)))
-+#define io_channel_set_blksize(c,s)	((c)->manager->set_blksize((c),s))
-+#define io_channel_read_blk(c,b,n,d)	((c)->manager->read_blk((c),b,n,d))
-+#define io_channel_write_blk(c,b,n,d)	((c)->manager->write_blk((c),b,n,d))
-+#define io_channel_flush(c) 		((c)->manager->flush((c)))
-+#define io_channel_bumpcount(c)		((c)->refcount++)
-+	
-+/* io_manager.c */
-+extern errcode_t io_channel_set_options(io_channel channel, 
-+					const char *options);
-+extern errcode_t io_channel_write_byte(io_channel channel, 
-+				       unsigned long offset,
-+				       int count, const void *data);
-+
-+/* unix_io.c */
-+extern io_manager unix_io_manager;
-+
-+/* test_io.c */
-+extern io_manager test_io_manager, test_io_backing_manager;
-+extern void (*test_io_cb_read_blk)
-+	(unsigned long block, int count, errcode_t err);
-+extern void (*test_io_cb_write_blk)
-+	(unsigned long block, int count, errcode_t err);
-+extern void (*test_io_cb_set_blksize)
-+	(int blksize, errcode_t err);
-+
-+#endif /* _EXT2FS_EXT2_IO_H */
-+	
-diff -Naur silo-1.4.13.orig/libext2fs/ext_attr.c silo-1.4.13/libext2fs/ext_attr.c
---- silo-1.4.13.orig/libext2fs/ext_attr.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/ext_attr.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,105 @@
-+/*
-+ * ext_attr.c --- extended attribute blocks
-+ * 
-+ * Copyright (C) 2001 Andreas Gruenbacher, <a.gruenbacher@computer.org>
-+ *
-+ * Copyright (C) 2002 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <string.h>
-+#include <time.h>
-+
-+#include "ext2_fs.h"
-+#include "ext2_ext_attr.h"
-+
-+#include "ext2fs.h"
-+
-+errcode_t ext2fs_read_ext_attr(ext2_filsys fs, blk_t block, void *buf)
-+{
-+	errcode_t	retval;
-+
-+ 	retval = io_channel_read_blk(fs->io, block, 1, buf);
-+	if (retval)
-+		return retval;
-+#ifdef EXT2FS_ENABLE_SWAPFS
-+	if ((fs->flags & (EXT2_FLAG_SWAP_BYTES|
-+			  EXT2_FLAG_SWAP_BYTES_READ)) != 0)
-+		ext2fs_swap_ext_attr(buf, buf, fs->blocksize, 1);
-+#endif
-+	return 0;
-+}
-+
-+errcode_t ext2fs_write_ext_attr(ext2_filsys fs, blk_t block, void *inbuf)
-+{
-+	errcode_t	retval;
-+	char		*write_buf;
-+	char		*buf = NULL;
-+
-+#ifdef EXT2FS_ENABLE_SWAPFS
-+	if ((fs->flags & EXT2_FLAG_SWAP_BYTES) ||
-+	    (fs->flags & EXT2_FLAG_SWAP_BYTES_WRITE)) {
-+		retval = ext2fs_get_mem(fs->blocksize, &buf);
-+		if (retval)
-+			return retval;
-+		write_buf = buf;
-+		ext2fs_swap_ext_attr(buf, inbuf, fs->blocksize, 1);
-+	} else
-+#endif
-+		write_buf = (char *) inbuf;
-+ 	retval = io_channel_write_blk(fs->io, block, 1, write_buf);
-+	if (buf)
-+		ext2fs_free_mem(&buf);
-+	if (!retval)
-+		ext2fs_mark_changed(fs);
-+	return retval;
-+}
-+
-+/*
-+ * This function adjusts the reference count of the EA block.
-+ */
-+errcode_t ext2fs_adjust_ea_refcount(ext2_filsys fs, blk_t blk,
-+				    char *block_buf, int adjust,
-+				    __u32 *newcount)
-+{
-+	errcode_t	retval;
-+	struct ext2_ext_attr_header *header;
-+	char	*buf = 0;
-+
-+	if ((blk >= fs->super->s_blocks_count) ||
-+	    (blk < fs->super->s_first_data_block))
-+		return EXT2_ET_BAD_EA_BLOCK_NUM;
-+
-+	if (!block_buf) {
-+		retval = ext2fs_get_mem(fs->blocksize, &buf);
-+		if (retval)
-+			return retval;
-+		block_buf = buf;
-+	}
-+
-+	retval = ext2fs_read_ext_attr(fs, blk, block_buf);
-+	if (retval)
-+		goto errout;
-+
-+	header = (struct ext2_ext_attr_header *) block_buf;
-+	header->h_refcount += adjust;
-+	if (newcount)
-+		*newcount = header->h_refcount;
-+
-+	retval = ext2fs_write_ext_attr(fs, blk, block_buf);
-+	if (retval)
-+		goto errout;
-+
-+errout:
-+	if (buf)
-+		ext2fs_free_mem(&buf);
-+	return retval;
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/fileio.c silo-1.4.13/libext2fs/fileio.c
---- silo-1.4.13.orig/libext2fs/fileio.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/fileio.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,378 @@
-+/*
-+ * fileio.c --- Simple file I/O routines
-+ * 
-+ * Copyright (C) 1997 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+struct ext2_file {
-+	errcode_t		magic;
-+	ext2_filsys 		fs;
-+	ext2_ino_t		ino;
-+	struct ext2_inode	inode;
-+	int 			flags;
-+	__u64			pos;
-+	blk_t			blockno;
-+	blk_t			physblock;
-+	char 			*buf;
-+};
-+
-+#define BMAP_BUFFER (file->buf + fs->blocksize)
-+
-+errcode_t ext2fs_file_open2(ext2_filsys fs, ext2_ino_t ino,
-+			    struct ext2_inode *inode,
-+			    int flags, ext2_file_t *ret)
-+{
-+	ext2_file_t 	file;
-+	errcode_t	retval;
-+
-+	/*
-+	 * Don't let caller create or open a file for writing if the
-+	 * filesystem is read-only.
-+	 */
-+	if ((flags & (EXT2_FILE_WRITE | EXT2_FILE_CREATE)) &&
-+	    !(fs->flags & EXT2_FLAG_RW))
-+		return EXT2_ET_RO_FILSYS;
-+
-+	retval = ext2fs_get_mem(sizeof(struct ext2_file), &file);
-+	if (retval)
-+		return retval;
-+	
-+	memset(file, 0, sizeof(struct ext2_file));
-+	file->magic = EXT2_ET_MAGIC_EXT2_FILE;
-+	file->fs = fs;
-+	file->ino = ino;
-+	file->flags = flags & EXT2_FILE_MASK;
-+
-+	if (inode) {
-+		memcpy(&file->inode, inode, sizeof(struct ext2_inode));
-+	} else {
-+		retval = ext2fs_read_inode(fs, ino, &file->inode);
-+		if (retval)
-+			goto fail;
-+	}
-+	
-+	retval = ext2fs_get_mem(fs->blocksize * 3, &file->buf);
-+	if (retval)
-+		goto fail;
-+
-+	*ret = file;
-+	return 0;
-+	
-+fail:
-+	if (file->buf)
-+		ext2fs_free_mem(&file->buf);
-+	ext2fs_free_mem(&file);
-+	return retval;
-+}
-+
-+errcode_t ext2fs_file_open(ext2_filsys fs, ext2_ino_t ino,
-+			   int flags, ext2_file_t *ret)
-+{
-+	return ext2fs_file_open2(fs, ino, NULL, flags, ret);
-+}
-+
-+/*
-+ * This function returns the filesystem handle of a file from the structure
-+ */
-+ext2_filsys ext2fs_file_get_fs(ext2_file_t file)
-+{
-+	if (file->magic != EXT2_ET_MAGIC_EXT2_FILE)
-+		return 0;
-+	return file->fs;
-+}
-+
-+/*
-+ * This function flushes the dirty block buffer out to disk if
-+ * necessary.
-+ */
-+errcode_t ext2fs_file_flush(ext2_file_t file)
-+{
-+	errcode_t	retval;
-+	ext2_filsys fs;
-+	
-+	EXT2_CHECK_MAGIC(file, EXT2_ET_MAGIC_EXT2_FILE);
-+	fs = file->fs;
-+
-+	if (!(file->flags & EXT2_FILE_BUF_VALID) ||
-+	    !(file->flags & EXT2_FILE_BUF_DIRTY))
-+		return 0;
-+
-+	/*
-+	 * OK, the physical block hasn't been allocated yet.
-+	 * Allocate it.
-+	 */
-+	if (!file->physblock) {
-+		retval = ext2fs_bmap(fs, file->ino, &file->inode,
-+				     BMAP_BUFFER, file->ino ? BMAP_ALLOC : 0,
-+				     file->blockno, &file->physblock);
-+		if (retval)
-+			return retval;
-+	}
-+
-+	retval = io_channel_write_blk(fs->io, file->physblock,
-+				      1, file->buf);
-+	if (retval)
-+		return retval;
-+
-+	file->flags &= ~EXT2_FILE_BUF_DIRTY;
-+
-+	return retval;
-+}
-+
-+/*
-+ * This function synchronizes the file's block buffer and the current
-+ * file position, possibly invalidating block buffer if necessary
-+ */
-+static errcode_t sync_buffer_position(ext2_file_t file)
-+{
-+	blk_t	b;
-+	errcode_t	retval;
-+
-+	b = file->pos / file->fs->blocksize;
-+	if (b != file->blockno) {
-+		retval = ext2fs_file_flush(file);
-+		if (retval)
-+			return retval;
-+		file->flags &= ~EXT2_FILE_BUF_VALID;
-+	}
-+	file->blockno = b;
-+	return 0;
-+}
-+
-+/*
-+ * This function loads the file's block buffer with valid data from
-+ * the disk as necessary.
-+ *
-+ * If dontfill is true, then skip initializing the buffer since we're
-+ * going to be replacing its entire contents anyway.  If set, then the
-+ * function basically only sets file->physblock and EXT2_FILE_BUF_VALID
-+ */
-+#define DONTFILL 1
-+static errcode_t load_buffer(ext2_file_t file, int dontfill)
-+{
-+	ext2_filsys	fs = file->fs;
-+	errcode_t	retval;
-+
-+	if (!(file->flags & EXT2_FILE_BUF_VALID)) {
-+		retval = ext2fs_bmap(fs, file->ino, &file->inode,
-+				     BMAP_BUFFER, 0, file->blockno,
-+				     &file->physblock);
-+		if (retval)
-+			return retval;
-+		if (!dontfill) {
-+			if (file->physblock) {
-+				retval = io_channel_read_blk(fs->io,
-+							     file->physblock, 
-+							     1, file->buf);
-+				if (retval)
-+					return retval;
-+			} else
-+				memset(file->buf, 0, fs->blocksize);
-+		}
-+		file->flags |= EXT2_FILE_BUF_VALID;
-+	}
-+	return 0;
-+}
-+	
-+
-+errcode_t ext2fs_file_close(ext2_file_t file)
-+{
-+	errcode_t	retval;
-+	
-+	EXT2_CHECK_MAGIC(file, EXT2_ET_MAGIC_EXT2_FILE);
-+
-+	retval = ext2fs_file_flush(file);
-+	
-+	if (file->buf)
-+		ext2fs_free_mem(&file->buf);
-+	ext2fs_free_mem(&file);
-+
-+	return retval;
-+}
-+
-+
-+errcode_t ext2fs_file_read(ext2_file_t file, void *buf,
-+			   unsigned int wanted, unsigned int *got)
-+{
-+	ext2_filsys	fs;
-+	errcode_t	retval = 0;
-+	unsigned int	start, c, count = 0;
-+	__u64		left;
-+	char		*ptr = (char *) buf;
-+
-+	EXT2_CHECK_MAGIC(file, EXT2_ET_MAGIC_EXT2_FILE);
-+	fs = file->fs;
-+
-+	while ((file->pos < EXT2_I_SIZE(&file->inode)) && (wanted > 0)) {
-+		retval = sync_buffer_position(file);
-+		if (retval)
-+			goto fail;
-+		retval = load_buffer(file, 0);
-+		if (retval)
-+			goto fail;
-+
-+		start = file->pos % fs->blocksize;
-+		c = fs->blocksize - start;
-+		if (c > wanted)
-+			c = wanted;
-+		left = EXT2_I_SIZE(&file->inode) - file->pos ;
-+		if (c > left)
-+			c = left;
-+	
-+		memcpy(ptr, file->buf+start, c);
-+		file->pos += c;
-+		ptr += c;
-+		count += c;
-+		wanted -= c;
-+	}
-+	
-+fail:
-+	if (got)
-+		*got = count;
-+	return retval;
-+}
-+
-+
-+errcode_t ext2fs_file_write(ext2_file_t file, const void *buf,
-+			    unsigned int nbytes, unsigned int *written)
-+{
-+	ext2_filsys	fs;
-+	errcode_t	retval = 0;
-+	unsigned int	start, c, count = 0;
-+	const char	*ptr = (const char *) buf;
-+
-+	EXT2_CHECK_MAGIC(file, EXT2_ET_MAGIC_EXT2_FILE);
-+	fs = file->fs;
-+
-+	if (!(file->flags & EXT2_FILE_WRITE))
-+		return EXT2_ET_FILE_RO;
-+
-+	while (nbytes > 0) {
-+		retval = sync_buffer_position(file);
-+		if (retval)
-+			goto fail;
-+		
-+		start = file->pos % fs->blocksize;
-+		c = fs->blocksize - start;
-+		if (c > nbytes)
-+			c = nbytes;
-+
-+		/*
-+		 * We only need to do a read-modify-update cycle if
-+		 * we're doing a partial write.
-+		 */
-+		retval = load_buffer(file, (c == fs->blocksize));
-+		if (retval)
-+			goto fail;
-+
-+		file->flags |= EXT2_FILE_BUF_DIRTY;
-+		memcpy(file->buf+start, ptr, c);
-+		file->pos += c;
-+		ptr += c;
-+		count += c;
-+		nbytes -= c;
-+	}
-+	
-+fail:
-+	if (written)
-+		*written = count;
-+	return retval;
-+}
-+
-+errcode_t ext2fs_file_llseek(ext2_file_t file, __u64 offset,
-+			    int whence, __u64 *ret_pos)
-+{
-+	EXT2_CHECK_MAGIC(file, EXT2_ET_MAGIC_EXT2_FILE);
-+
-+	if (whence == EXT2_SEEK_SET)
-+		file->pos = offset;
-+	else if (whence == EXT2_SEEK_CUR)
-+		file->pos += offset;
-+	else if (whence == EXT2_SEEK_END)
-+		file->pos = EXT2_I_SIZE(&file->inode) + offset;
-+	else
-+		return EXT2_ET_INVALID_ARGUMENT;
-+
-+	if (ret_pos)
-+		*ret_pos = file->pos;
-+
-+	return 0;
-+}
-+
-+errcode_t ext2fs_file_lseek(ext2_file_t file, ext2_off_t offset,
-+			    int whence, ext2_off_t *ret_pos)
-+{
-+	__u64		loffset, ret_loffset;
-+	errcode_t	retval;
-+	
-+	loffset = offset;
-+	retval = ext2fs_file_llseek(file, loffset, whence, &ret_loffset);
-+	if (ret_pos)
-+		*ret_pos = (ext2_off_t) ret_loffset;
-+	return retval;
-+}
-+
-+
-+/*
-+ * This function returns the size of the file, according to the inode
-+ */
-+errcode_t ext2fs_file_get_lsize(ext2_file_t file, __u64 *ret_size)
-+{
-+	if (file->magic != EXT2_ET_MAGIC_EXT2_FILE)
-+		return EXT2_ET_MAGIC_EXT2_FILE;
-+	*ret_size = EXT2_I_SIZE(&file->inode);
-+	return 0;
-+}
-+
-+/*
-+ * This function returns the size of the file, according to the inode
-+ */
-+ext2_off_t ext2fs_file_get_size(ext2_file_t file)
-+{
-+	__u64	size;
-+
-+	if (ext2fs_file_get_lsize(file, &size))
-+		return 0;
-+	if ((size >> 32) != 0)
-+		return 0;
-+	return size;
-+}
-+
-+/*
-+ * This function sets the size of the file, truncating it if necessary
-+ * 
-+ * XXX still need to call truncate
-+ */
-+errcode_t ext2fs_file_set_size(ext2_file_t file, ext2_off_t size)
-+{
-+	errcode_t	retval;
-+	EXT2_CHECK_MAGIC(file, EXT2_ET_MAGIC_EXT2_FILE);
-+	
-+	file->inode.i_size = size;
-+	file->inode.i_size_high = 0;
-+	if (file->ino) {
-+		retval = ext2fs_write_inode(file->fs, file->ino, &file->inode);
-+		if (retval)
-+			return retval;
-+	}
-+
-+	/* 
-+	 * XXX truncate inode if necessary
-+	 */
-+
-+	return 0;
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/finddev.c silo-1.4.13/libext2fs/finddev.c
---- silo-1.4.13.orig/libext2fs/finddev.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/finddev.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,208 @@
-+/*
-+ * finddev.c -- this routine attempts to find a particular device in
-+ * 	/dev
-+ * 
-+ * Copyright (C) 2000 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <stdlib.h>
-+#include <string.h>
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+#if HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
-+#include <dirent.h>
-+#if HAVE_ERRNO_H
-+#include <errno.h>
-+#endif
-+#if HAVE_SYS_MKDEV_H
-+#include <sys/mkdev.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+struct dir_list {
-+	char	*name;
-+	struct dir_list *next;
-+};
-+
-+/*
-+ * This function adds an entry to the directory list
-+ */
-+static void add_to_dirlist(const char *name, struct dir_list **list)
-+{
-+	struct dir_list *dp;
-+
-+	dp = malloc(sizeof(struct dir_list));
-+	if (!dp)
-+		return;
-+	dp->name = malloc(strlen(name)+1);
-+	if (!dp->name) {
-+		free(dp);
-+		return;
-+	}
-+	strcpy(dp->name, name);
-+	dp->next = *list;
-+	*list = dp;
-+}
-+
-+/*
-+ * This function frees a directory list
-+ */
-+static void free_dirlist(struct dir_list **list)
-+{
-+	struct dir_list *dp, *next;
-+
-+	for (dp = *list; dp; dp = next) {
-+		next = dp->next;
-+		free(dp->name);
-+		free(dp);
-+	}
-+	*list = 0;
-+}
-+
-+static int scan_dir(char *dirname, dev_t device, struct dir_list **list,
-+		    char **ret_path)
-+{
-+	DIR	*dir;
-+	struct dirent *dp;
-+	char	path[1024], *cp;
-+	int	dirlen;
-+	struct stat st;
-+
-+	dirlen = strlen(dirname);
-+	if ((dir = opendir(dirname)) == NULL)
-+		return errno;
-+	dp = readdir(dir);
-+	while (dp) {
-+		if (dirlen + strlen(dp->d_name) + 2 >= sizeof(path))
-+			goto skip_to_next;
-+		if (dp->d_name[0] == '.' &&
-+		    ((dp->d_name[1] == 0) ||
-+		     ((dp->d_name[1] == '.') && (dp->d_name[2] == 0))))
-+			goto skip_to_next;
-+		sprintf(path, "%s/%s", dirname, dp->d_name);
-+		if (stat(path, &st) < 0)
-+			goto skip_to_next;
-+		if (S_ISDIR(st.st_mode))
-+			add_to_dirlist(path, list);
-+		if (S_ISBLK(st.st_mode) && st.st_rdev == device) {
-+			cp = malloc(strlen(path)+1);
-+			if (!cp) {
-+				closedir(dir);
-+				return ENOMEM;
-+			}
-+			strcpy(cp, path);
-+			*ret_path = cp;
-+			goto success;
-+		}
-+	skip_to_next:
-+		dp = readdir(dir);
-+	}
-+success:
-+	closedir(dir);
-+	return 0;
-+}
-+
-+/*
-+ * This function finds the pathname to a block device with a given
-+ * device number.  It returns a pointer to allocated memory to the
-+ * pathname on success, and NULL on failure.
-+ */
-+char *ext2fs_find_block_device(dev_t device)
-+{
-+	struct dir_list *list = 0, *new_list = 0;
-+	struct dir_list *current;
-+	char	*ret_path = 0;
-+
-+	/*
-+	 * Add the starting directories to search...
-+	 */
-+	add_to_dirlist("/devices", &list);
-+	add_to_dirlist("/devfs", &list);
-+	add_to_dirlist("/dev", &list);
-+	
-+	while (list) {
-+		current = list;
-+		list = list->next;
-+#ifdef DEBUG
-+		printf("Scanning directory %s\n", current->name);
-+#endif
-+		scan_dir(current->name, device, &new_list, &ret_path);
-+		free(current->name);
-+		free(current);
-+		if (ret_path)
-+			break;
-+		/*
-+		 * If we're done checking at this level, descend to
-+		 * the next level of subdirectories. (breadth-first)
-+		 */
-+		if (list == 0) {
-+			list = new_list;
-+			new_list = 0;
-+		}
-+	}
-+	free_dirlist(&list);
-+	free_dirlist(&new_list);
-+	return ret_path;
-+}
-+
-+	
-+#ifdef DEBUG
-+int main(int argc, char** argv)
-+{
-+	char	*devname, *tmp;
-+	int	major, minor;
-+	dev_t	device;
-+	const char *errmsg = "Couldn't parse %s: %s\n";
-+
-+	if ((argc != 2) && (argc != 3)) {
-+		fprintf(stderr, "Usage: %s device_number\n", argv[0]);
-+		fprintf(stderr, "\t: %s major minor\n", argv[0]);
-+		exit(1);
-+	}
-+	if (argc == 2) {
-+		device = strtoul(argv[1], &tmp, 0);
-+		if (*tmp) {
-+			fprintf(stderr, errmsg, "device number", argv[1]);
-+			exit(1);
-+		}
-+	} else {
-+		major = strtoul(argv[1], &tmp, 0);
-+		if (*tmp) {
-+			fprintf(stderr, errmsg, "major number", argv[1]);
-+			exit(1);
-+		}
-+		minor = strtoul(argv[2], &tmp, 0);
-+		if (*tmp) {
-+			fprintf(stderr, errmsg, "minor number", argv[2]);
-+			exit(1);
-+		}
-+		device = makedev(major, minor);
-+		printf("Looking for device 0x%04x (%d:%d)\n", device,
-+		       major, minor);
-+	}
-+	devname = ext2fs_find_block_device(device);
-+	if (devname) {
-+		printf("Found device!  %s\n", devname);
-+		free(devname);
-+	} else {
-+		printf("Couldn't find device.\n");
-+	}
-+	return 0;
-+}
-+	
-+#endif
-diff -Naur silo-1.4.13.orig/libext2fs/flushb.c silo-1.4.13/libext2fs/flushb.c
---- silo-1.4.13.orig/libext2fs/flushb.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/flushb.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,82 @@
-+/*
-+ * flushb.c --- Hides system-dependent information for both syncing a
-+ * 	device to disk and to flush any buffers from disk cache.
-+ * 
-+ * Copyright (C) 2000 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#if HAVE_ERRNO_H
-+#include <errno.h>
-+#endif
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#if HAVE_SYS_IOCTL_H
-+#include <sys/ioctl.h>
-+#endif
-+#if HAVE_SYS_MOUNT_H
-+#include <sys/param.h>
-+#include <sys/mount.h>		/* This may define BLKFLSBUF */
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+/*
-+ * For Linux, define BLKFLSBUF and FDFLUSH if necessary, since 
-+ * not all portable header file does so for us.  This really should be
-+ * fixed in the glibc header files.  (Recent glibcs appear to define
-+ * BLKFLSBUF in sys/mount.h, but FDFLUSH still doesn't seem to be
-+ * defined anywhere portable.)  Until then....
-+ */
-+#ifdef __linux__
-+#ifndef BLKFLSBUF
-+#define BLKFLSBUF	_IO(0x12,97)	/* flush buffer cache */
-+#endif
-+#ifndef FDFLUSH
-+#define FDFLUSH		_IO(2,0x4b)	/* flush floppy disk */
-+#endif
-+#endif
-+
-+/*
-+ * This function will sync a device/file, and optionally attempt to
-+ * flush the buffer cache.  The latter is basically only useful for
-+ * system benchmarks and for torturing systems in burn-in tests.  :)
-+ */
-+errcode_t ext2fs_sync_device(int fd, int flushb)
-+{
-+	/*
-+	 * We always sync the device in case we're running on old
-+	 * kernels for which we can lose data if we don't.  (There
-+	 * still is a race condition for those kernels, but this
-+	 * reduces it greatly.)
-+	 */
-+	if (fsync (fd) == -1)
-+		return errno;
-+
-+	if (flushb) {
-+
-+#ifdef BLKFLSBUF
-+		if (ioctl (fd, BLKFLSBUF, 0) == 0)
-+			return 0;
-+#else
-+#ifdef __GNUC__
-+ #warning BLKFLSBUF not defined
-+#endif /* __GNUC__ */
-+#endif
-+#ifdef FDFLUSH
-+		ioctl (fd, FDFLUSH, 0);   /* In case this is a floppy */
-+#else
-+#ifdef __GNUC__
-+ #warning FDFLUSH not defined
-+#endif /* __GNUC__ */
-+#endif
-+	}
-+	return 0;
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/freefs.c silo-1.4.13/libext2fs/freefs.c
---- silo-1.4.13.orig/libext2fs/freefs.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/freefs.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,147 @@
-+/*
-+ * freefs.c --- free an ext2 filesystem
-+ * 
-+ * Copyright (C) 1993, 1994, 1995, 1996 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fsP.h"
-+
-+static void ext2fs_free_inode_cache(struct ext2_inode_cache *icache);
-+
-+void ext2fs_free(ext2_filsys fs)
-+{
-+	if (!fs || (fs->magic != EXT2_ET_MAGIC_EXT2FS_FILSYS))
-+		return;
-+	if (fs->image_io != fs->io) {
-+		if (fs->image_io)
-+			io_channel_close(fs->image_io);
-+	}
-+	if (fs->io) {
-+		io_channel_close(fs->io);
-+	}
-+	if (fs->device_name)
-+		ext2fs_free_mem(&fs->device_name);
-+	if (fs->super)
-+		ext2fs_free_mem(&fs->super);
-+	if (fs->orig_super)
-+		ext2fs_free_mem(&fs->orig_super);
-+	if (fs->group_desc)
-+		ext2fs_free_mem(&fs->group_desc);
-+	if (fs->block_map)
-+		ext2fs_free_block_bitmap(fs->block_map);
-+	if (fs->inode_map)
-+		ext2fs_free_inode_bitmap(fs->inode_map);
-+
-+	if (fs->badblocks)
-+		ext2fs_badblocks_list_free(fs->badblocks);
-+	fs->badblocks = 0;
-+
-+	if (fs->dblist)
-+		ext2fs_free_dblist(fs->dblist);
-+
-+	if (fs->icache)
-+		ext2fs_free_inode_cache(fs->icache);
-+	
-+	fs->magic = 0;
-+
-+	ext2fs_free_mem(&fs);
-+}
-+
-+void ext2fs_free_generic_bitmap(ext2fs_inode_bitmap bitmap)
-+{
-+	if (!bitmap || (bitmap->magic != EXT2_ET_MAGIC_GENERIC_BITMAP))
-+		return;
-+
-+	bitmap->magic = 0;
-+	if (bitmap->description) {
-+		ext2fs_free_mem(&bitmap->description);
-+		bitmap->description = 0;
-+	}
-+	if (bitmap->bitmap) {
-+		ext2fs_free_mem(&bitmap->bitmap);
-+		bitmap->bitmap = 0;
-+	}
-+	ext2fs_free_mem(&bitmap);
-+}
-+
-+void ext2fs_free_inode_bitmap(ext2fs_inode_bitmap bitmap)
-+{
-+	if (!bitmap || (bitmap->magic != EXT2_ET_MAGIC_INODE_BITMAP))
-+		return;
-+
-+	bitmap->magic = EXT2_ET_MAGIC_GENERIC_BITMAP;
-+	ext2fs_free_generic_bitmap(bitmap);
-+}
-+
-+void ext2fs_free_block_bitmap(ext2fs_block_bitmap bitmap)
-+{
-+	if (!bitmap || (bitmap->magic != EXT2_ET_MAGIC_BLOCK_BITMAP))
-+		return;
-+
-+	bitmap->magic = EXT2_ET_MAGIC_GENERIC_BITMAP;
-+	ext2fs_free_generic_bitmap(bitmap);
-+}
-+
-+/*
-+ * Free the inode cache structure
-+ */
-+static void ext2fs_free_inode_cache(struct ext2_inode_cache *icache)
-+{
-+	if (--icache->refcount)
-+		return;
-+	if (icache->buffer)
-+		ext2fs_free_mem(&icache->buffer);
-+	if (icache->cache)
-+		ext2fs_free_mem(&icache->cache);
-+	icache->buffer_blk = 0;
-+	ext2fs_free_mem(&icache);
-+}
-+
-+/*
-+ * This procedure frees a badblocks list.
-+ */
-+void ext2fs_u32_list_free(ext2_u32_list bb)
-+{
-+	if (bb->magic != EXT2_ET_MAGIC_BADBLOCKS_LIST)
-+		return;
-+
-+	if (bb->list)
-+		ext2fs_free_mem(&bb->list);
-+	bb->list = 0;
-+	ext2fs_free_mem(&bb);
-+}
-+
-+void ext2fs_badblocks_list_free(ext2_badblocks_list bb)
-+{
-+	ext2fs_u32_list_free((ext2_u32_list) bb);
-+}
-+
-+
-+/*
-+ * Free a directory block list
-+ */
-+void ext2fs_free_dblist(ext2_dblist dblist)
-+{
-+	if (!dblist || (dblist->magic != EXT2_ET_MAGIC_DBLIST))
-+		return;
-+
-+	if (dblist->list)
-+		ext2fs_free_mem(&dblist->list);
-+	dblist->list = 0;
-+	if (dblist->fs && dblist->fs->dblist == dblist)
-+		dblist->fs->dblist = 0;
-+	dblist->magic = 0;
-+	ext2fs_free_mem(&dblist);
-+}
-+
-diff -Naur silo-1.4.13.orig/libext2fs/gen_bitmap.c silo-1.4.13/libext2fs/gen_bitmap.c
---- silo-1.4.13.orig/libext2fs/gen_bitmap.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/gen_bitmap.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,48 @@
-+/*
-+ * gen_bitmap.c --- Generic bitmap routines that used to be inlined.
-+ * 
-+ * Copyright (C) 2001 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <fcntl.h>
-+#include <time.h>
-+#if HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+int ext2fs_mark_generic_bitmap(ext2fs_generic_bitmap bitmap,
-+					 __u32 bitno)
-+{
-+	if ((bitno < bitmap->start) || (bitno > bitmap->end)) {
-+		ext2fs_warn_bitmap2(bitmap, EXT2FS_MARK_ERROR, bitno);
-+		return 0;
-+	}
-+	return ext2fs_set_bit(bitno - bitmap->start, bitmap->bitmap);
-+}
-+
-+int ext2fs_unmark_generic_bitmap(ext2fs_generic_bitmap bitmap,
-+					   blk_t bitno)
-+{
-+	if ((bitno < bitmap->start) || (bitno > bitmap->end)) {
-+		ext2fs_warn_bitmap2(bitmap, EXT2FS_UNMARK_ERROR, bitno);
-+		return 0;
-+	}
-+	return ext2fs_clear_bit(bitno - bitmap->start, bitmap->bitmap);
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/get_pathname.c silo-1.4.13/libext2fs/get_pathname.c
---- silo-1.4.13.orig/libext2fs/get_pathname.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/get_pathname.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,157 @@
-+/*
-+ * get_pathname.c --- do directry/inode -> name translation
-+ * 
-+ * Copyright (C) 1993, 1994, 1995 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ *
-+ * 	ext2fs_get_pathname(fs, dir, ino, name)
-+ *
-+ * 	This function translates takes two inode numbers into a
-+ * 	string, placing the result in <name>.  <dir> is the containing
-+ * 	directory inode, and <ino> is the inode number itself.  If
-+ * 	<ino> is zero, then ext2fs_get_pathname will return pathname
-+ * 	of the the directory <dir>.
-+ * 
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+struct get_pathname_struct {
-+	ext2_ino_t	search_ino;
-+	ext2_ino_t	parent;
-+	char		*name;
-+	errcode_t	errcode;
-+};
-+
-+#ifdef __TURBOC__
-+ #pragma argsused
-+#endif
-+static int get_pathname_proc(struct ext2_dir_entry *dirent,
-+			     int	offset EXT2FS_ATTR((unused)),
-+			     int	blocksize EXT2FS_ATTR((unused)),
-+			     char	*buf EXT2FS_ATTR((unused)),
-+			     void	*priv_data)
-+{
-+	struct get_pathname_struct	*gp;
-+	errcode_t			retval;
-+
-+	gp = (struct get_pathname_struct *) priv_data;
-+
-+	if (((dirent->name_len & 0xFF) == 2) &&
-+	    !strncmp(dirent->name, "..", 2))
-+		gp->parent = dirent->inode;
-+	if (dirent->inode == gp->search_ino) {
-+		retval = ext2fs_get_mem((dirent->name_len & 0xFF) + 1,
-+					&gp->name);
-+		if (retval) {
-+			gp->errcode = retval;
-+			return DIRENT_ABORT;
-+		}
-+		strncpy(gp->name, dirent->name, (dirent->name_len & 0xFF));
-+		gp->name[dirent->name_len & 0xFF] = '\0';
-+		return DIRENT_ABORT;
-+	}
-+	return 0;
-+}
-+
-+static errcode_t ext2fs_get_pathname_int(ext2_filsys fs, ext2_ino_t dir, 
-+					 ext2_ino_t ino, int maxdepth, 
-+					 char *buf, char **name)
-+{
-+	struct get_pathname_struct gp;
-+	char	*parent_name, *ret;
-+	errcode_t	retval;
-+
-+	if (dir == ino) {
-+		retval = ext2fs_get_mem(2, name);
-+		if (retval)
-+			return retval;
-+		strcpy(*name, (dir == EXT2_ROOT_INO) ? "/" : ".");
-+		return 0;
-+	}
-+
-+	if (!dir || (maxdepth < 0)) {
-+		retval = ext2fs_get_mem(4, name);
-+		if (retval)
-+			return retval;
-+		strcpy(*name, "...");
-+		return 0;
-+	}
-+
-+	gp.search_ino = ino;
-+	gp.parent = 0;
-+	gp.name = 0;
-+	gp.errcode = 0;
-+	
-+	retval = ext2fs_dir_iterate(fs, dir, 0, buf, get_pathname_proc, &gp);
-+	if (retval)
-+		goto cleanup;
-+	if (gp.errcode) {
-+		retval = gp.errcode;
-+		goto cleanup;
-+	}
-+
-+	retval = ext2fs_get_pathname_int(fs, gp.parent, dir, maxdepth-1,
-+					 buf, &parent_name);
-+	if (retval)
-+		goto cleanup;
-+	if (!ino) {
-+		*name = parent_name;
-+		return 0;
-+	}
-+	
-+	if (gp.name) 
-+		retval = ext2fs_get_mem(strlen(parent_name)+strlen(gp.name)+2,
-+					&ret);
-+	else
-+		retval = ext2fs_get_mem(strlen(parent_name)+5, &ret);
-+	if (retval)
-+		goto cleanup;
-+	
-+	ret[0] = 0;
-+	if (parent_name[1])
-+		strcat(ret, parent_name);
-+	strcat(ret, "/");
-+	if (gp.name)
-+		strcat(ret, gp.name);
-+	else
-+		strcat(ret, "???");
-+	*name = ret;
-+	ext2fs_free_mem(&parent_name);
-+	retval = 0;
-+	
-+cleanup:
-+	if (gp.name)
-+		ext2fs_free_mem(&gp.name);
-+	return retval;
-+}
-+
-+errcode_t ext2fs_get_pathname(ext2_filsys fs, ext2_ino_t dir, ext2_ino_t ino,
-+			      char **name)
-+{
-+	char	*buf;
-+	errcode_t	retval;
-+
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	retval = ext2fs_get_mem(fs->blocksize, &buf);
-+	if (retval)
-+		return retval;
-+	if (dir == ino)
-+		ino = 0;
-+	retval = ext2fs_get_pathname_int(fs, dir, ino, 32, buf, name);
-+	ext2fs_free_mem(&buf);
-+	return retval;
-+	
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/getsectsize.c silo-1.4.13/libext2fs/getsectsize.c
---- silo-1.4.13.orig/libext2fs/getsectsize.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/getsectsize.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,60 @@
-+/*
-+ * getsectsize.c --- get the sector size of a device.
-+ * 
-+ * Copyright (C) 1995, 1995 Theodore Ts'o.
-+ * Copyright (C) 2003 VMware, Inc.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#define _LARGEFILE_SOURCE
-+#define _LARGEFILE64_SOURCE
-+
-+#include <stdio.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#if HAVE_ERRNO_H
-+#include <errno.h>
-+#endif
-+#include <fcntl.h>
-+#ifdef HAVE_LINUX_FD_H
-+#include <sys/ioctl.h>
-+#include <linux/fd.h>
-+#endif
-+
-+#if defined(__linux__) && defined(_IO) && !defined(BLKSSZGET)
-+#define BLKSSZGET  _IO(0x12,104)/* get block device sector size */
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+/*
-+ * Returns the number of blocks in a partition
-+ */
-+errcode_t ext2fs_get_device_sectsize(const char *file, int *sectsize)
-+{
-+	int	fd;
-+
-+#ifdef HAVE_OPEN64
-+	fd = open64(file, O_RDONLY);
-+#else
-+	fd = open(file, O_RDONLY);
-+#endif
-+	if (fd < 0)
-+		return errno;
-+
-+#ifdef BLKSSZGET
-+	if (ioctl(fd, BLKSSZGET, sectsize) >= 0) {
-+		close(fd);
-+		return 0;
-+	}
-+#endif
-+	*sectsize = 0;
-+	close(fd);
-+	return 0;
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/getsize.c silo-1.4.13/libext2fs/getsize.c
---- silo-1.4.13.orig/libext2fs/getsize.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/getsize.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,293 @@
-+/*
-+ * getsize.c --- get the size of a partition.
-+ * 
-+ * Copyright (C) 1995, 1995 Theodore Ts'o.
-+ * Copyright (C) 2003 VMware, Inc.
-+ *
-+ * Windows version of ext2fs_get_device_size by Chris Li, VMware.
-+ * 
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#define _LARGEFILE_SOURCE
-+#define _LARGEFILE64_SOURCE
-+
-+#include <stdio.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#if HAVE_ERRNO_H
-+#include <errno.h>
-+#endif
-+#include <fcntl.h>
-+#ifdef HAVE_SYS_IOCTL_H
-+#include <sys/ioctl.h>
-+#endif
-+#ifdef HAVE_LINUX_FD_H
-+#include <linux/fd.h>
-+#endif
-+#ifdef HAVE_SYS_DISKLABEL_H
-+#include <sys/disklabel.h>
-+#endif
-+#ifdef HAVE_SYS_DISK_H
-+#ifdef HAVE_SYS_QUEUE_H
-+#include <sys/queue.h> /* for LIST_HEAD */
-+#endif
-+#include <sys/disk.h>
-+#endif
-+#ifdef __linux__
-+#include <sys/utsname.h>
-+#endif
-+
-+#if defined(__linux__) && defined(_IO) && !defined(BLKGETSIZE)
-+#define BLKGETSIZE _IO(0x12,96)	/* return device size */
-+#endif
-+
-+#if defined(__linux__) && defined(_IOR) && !defined(BLKGETSIZE64)
-+#define BLKGETSIZE64 _IOR(0x12,114,size_t)	/* return device size in bytes (u64 *arg) */
-+#endif
-+
-+#ifdef APPLE_DARWIN
-+#define BLKGETSIZE DKIOCGETBLOCKCOUNT32
-+#endif /* APPLE_DARWIN */
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+#if defined(__CYGWIN__) || defined (WIN32)
-+#include "windows.h"
-+#include "winioctl.h"
-+
-+#if (_WIN32_WINNT >= 0x0500)
-+#define HAVE_GET_FILE_SIZE_EX 1
-+#endif
-+
-+errcode_t ext2fs_get_device_size(const char *file, int blocksize,
-+				 blk_t *retblocks)
-+{
-+	HANDLE dev;
-+	PARTITION_INFORMATION pi;
-+	DISK_GEOMETRY gi;
-+	DWORD retbytes;
-+#ifdef HAVE_GET_FILE_SIZE_EX
-+	LARGE_INTEGER filesize;
-+#else
-+	DWORD filesize;
-+#endif /* HAVE_GET_FILE_SIZE_EX */
-+
-+	dev = CreateFile(file, GENERIC_READ, 
-+			 FILE_SHARE_READ | FILE_SHARE_WRITE ,
-+                	 NULL,  OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL,  NULL); 
-+ 
-+	if (dev == INVALID_HANDLE_VALUE)
-+		return EBADF;
-+	if (DeviceIoControl(dev, IOCTL_DISK_GET_PARTITION_INFO,
-+			    &pi, sizeof(PARTITION_INFORMATION),
-+			    &pi, sizeof(PARTITION_INFORMATION),
-+			    &retbytes, NULL)) {
-+
-+		*retblocks = pi.PartitionLength.QuadPart / blocksize;
-+	
-+	} else if (DeviceIoControl(dev, IOCTL_DISK_GET_DRIVE_GEOMETRY,
-+				&gi, sizeof(DISK_GEOMETRY),
-+				&gi, sizeof(DISK_GEOMETRY),
-+				&retbytes, NULL)) {
-+
-+		*retblocks = gi.BytesPerSector *
-+			     gi.SectorsPerTrack *
-+			     gi.TracksPerCylinder *
-+			     gi.Cylinders.QuadPart / blocksize;
-+
-+#ifdef HAVE_GET_FILE_SIZE_EX
-+	} else if (GetFileSizeEx(dev, &filesize)) {
-+		*retblocks = filesize.QuadPart / blocksize;
-+	}
-+#else
-+	} else {
-+		filesize = GetFileSize(dev, NULL);
-+		if (INVALID_FILE_SIZE != filesize) {
-+			*retblocks = filesize / blocksize;
-+		}
-+	}
-+#endif /* HAVE_GET_FILE_SIZE_EX */
-+
-+	CloseHandle(dev);
-+	return 0;
-+}
-+
-+#else
-+
-+static int valid_offset (int fd, ext2_loff_t offset)
-+{
-+	char ch;
-+
-+	if (ext2fs_llseek (fd, offset, 0) < 0)
-+		return 0;
-+	if (read (fd, &ch, 1) < 1)
-+		return 0;
-+	return 1;
-+}
-+
-+/*
-+ * Returns the number of blocks in a partition
-+ */
-+errcode_t ext2fs_get_device_size(const char *file, int blocksize,
-+				 blk_t *retblocks)
-+{
-+	int	fd;
-+	int valid_blkgetsize64 = 1;
-+#ifdef __linux__
-+	struct 		utsname ut;
-+#endif
-+	unsigned long long size64;
-+	unsigned long	size;
-+	ext2_loff_t high, low;
-+#ifdef FDGETPRM
-+	struct floppy_struct this_floppy;
-+#endif
-+#ifdef HAVE_SYS_DISKLABEL_H
-+	int part;
-+	struct disklabel lab;
-+	struct partition *pp;
-+	char ch;
-+#endif /* HAVE_SYS_DISKLABEL_H */
-+
-+#ifdef HAVE_OPEN64
-+	fd = open64(file, O_RDONLY);
-+#else
-+	fd = open(file, O_RDONLY);
-+#endif
-+	if (fd < 0)
-+		return errno;
-+
-+#ifdef DKIOCGETBLOCKCOUNT	/* For Apple Darwin */
-+	if (ioctl(fd, DKIOCGETBLOCKCOUNT, &size64) >= 0) {
-+		if ((sizeof(*retblocks) < sizeof(unsigned long long))
-+		    && ((size64 / (blocksize / 512)) > 0xFFFFFFFF))
-+			return EFBIG;
-+		close(fd);
-+		*retblocks = size64 / (blocksize / 512);
-+		return 0;
-+	}
-+#endif
-+
-+#ifdef BLKGETSIZE64
-+#ifdef __linux__
-+	if ((uname(&ut) == 0) &&
-+	    ((ut.release[0] == '2') && (ut.release[1] == '.') &&
-+	     (ut.release[2] < '6') && (ut.release[3] == '.')))
-+		valid_blkgetsize64 = 0;
-+#endif
-+	if (valid_blkgetsize64 &&
-+	    ioctl(fd, BLKGETSIZE64, &size64) >= 0) {
-+		if ((sizeof(*retblocks) < sizeof(unsigned long long))
-+		    && ((size64 / blocksize) > 0xFFFFFFFF))
-+			return EFBIG;
-+		close(fd);
-+		*retblocks = size64 / blocksize;
-+		return 0;
-+	}
-+#endif
-+
-+#ifdef BLKGETSIZE
-+	if (ioctl(fd, BLKGETSIZE, &size) >= 0) {
-+		close(fd);
-+		*retblocks = size / (blocksize / 512);
-+		return 0;
-+	}
-+#endif
-+
-+#ifdef FDGETPRM
-+	if (ioctl(fd, FDGETPRM, &this_floppy) >= 0) {
-+		close(fd);
-+		*retblocks = this_floppy.size / (blocksize / 512);
-+		return 0;
-+	}
-+#endif
-+
-+#ifdef HAVE_SYS_DISKLABEL_H
-+#if defined(DIOCGMEDIASIZE)
-+	{
-+	    off_t ms;
-+	    u_int bs;
-+	    if (ioctl(fd, DIOCGMEDIASIZE, &ms) >= 0) {
-+		*retblocks = ms / blocksize;
-+		return 0;
-+	    }
-+	}
-+#elif defined(DIOCGDINFO)
-+	/* old disklabel interface */
-+	part = strlen(file) - 1;
-+	if (part >= 0) {
-+		ch = file[part];
-+		if (isdigit(ch))
-+			part = 0;
-+		else if (ch >= 'a' && ch <= 'h')
-+			part = ch - 'a';
-+		else
-+			part = -1;
-+	}
-+	if (part >= 0 && (ioctl(fd, DIOCGDINFO, (char *)&lab) >= 0)) {
-+		pp = &lab.d_partitions[part];
-+		if (pp->p_size) {
-+			close(fd);
-+			*retblocks = pp->p_size / (blocksize / 512);
-+			return 0;
-+		}
-+	}
-+#endif /* defined(DIOCG*) */
-+#endif /* HAVE_SYS_DISKLABEL_H */
-+
-+	/*
-+	 * OK, we couldn't figure it out by using a specialized ioctl,
-+	 * which is generally the best way.  So do binary search to
-+	 * find the size of the partition.
-+	 */
-+	low = 0;
-+	for (high = 1024; valid_offset (fd, high); high *= 2)
-+		low = high;
-+	while (low < high - 1)
-+	{
-+		const ext2_loff_t mid = (low + high) / 2;
-+
-+		if (valid_offset (fd, mid))
-+			low = mid;
-+		else
-+			high = mid;
-+	}
-+	valid_offset (fd, 0);
-+	close(fd);
-+	size64 = low + 1;
-+	if ((sizeof(*retblocks) < sizeof(unsigned long long))
-+	    && ((size64 / blocksize) > 0xFFFFFFFF))
-+		return EFBIG;
-+	*retblocks = size64 / blocksize;
-+	return 0;
-+}
-+
-+#endif /* WIN32 */
-+
-+#ifdef DEBUG
-+int main(int argc, char **argv)
-+{
-+	blk_t	blocks;
-+	int	retval;
-+	
-+	if (argc < 2) {
-+		fprintf(stderr, "Usage: %s device\n", argv[0]);
-+		exit(1);
-+	}
-+
-+	retval = ext2fs_get_device_size(argv[1], 1024, &blocks);
-+	if (retval) {
-+		com_err(argv[0], retval,
-+			"while calling ext2fs_get_device_size");
-+		exit(1);
-+	}
-+	printf("Device %s has %d 1k blocks.\n", argv[1], blocks);
-+	exit(0);
-+}
-+#endif
-diff -Naur silo-1.4.13.orig/libext2fs/icount.c silo-1.4.13/libext2fs/icount.c
---- silo-1.4.13.orig/libext2fs/icount.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/icount.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,483 @@
-+/*
-+ * icount.c --- an efficient inode count abstraction
-+ *
-+ * Copyright (C) 1997 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <string.h>
-+#include <stdio.h>
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+/*
-+ * The data storage strategy used by icount relies on the observation
-+ * that most inode counts are either zero (for non-allocated inodes),
-+ * one (for most files), and only a few that are two or more
-+ * (directories and files that are linked to more than one directory).
-+ *
-+ * Also, e2fsck tends to load the icount data sequentially.
-+ *
-+ * So, we use an inode bitmap to indicate which inodes have a count of
-+ * one, and then use a sorted list to store the counts for inodes
-+ * which are greater than one.
-+ *
-+ * We also use an optional bitmap to indicate which inodes are already
-+ * in the sorted list, to speed up the use of this abstraction by
-+ * e2fsck's pass 2.  Pass 2 increments inode counts as it finds them,
-+ * so this extra bitmap avoids searching the sorted list to see if a
-+ * particular inode is on the sorted list already.
-+ */
-+
-+struct ext2_icount_el {
-+	ext2_ino_t	ino;
-+	__u16	count;
-+};
-+
-+struct ext2_icount {
-+	errcode_t		magic;
-+	ext2fs_inode_bitmap	single;
-+	ext2fs_inode_bitmap	multiple;
-+	ext2_ino_t		count;
-+	ext2_ino_t		size;
-+	ext2_ino_t		num_inodes;
-+	ext2_ino_t		cursor;
-+	struct ext2_icount_el	*list;
-+};
-+
-+void ext2fs_free_icount(ext2_icount_t icount)
-+{
-+	if (!icount)
-+		return;
-+
-+	icount->magic = 0;
-+	if (icount->list)
-+		ext2fs_free_mem(&icount->list);
-+	if (icount->single)
-+		ext2fs_free_inode_bitmap(icount->single);
-+	if (icount->multiple)
-+		ext2fs_free_inode_bitmap(icount->multiple);
-+	ext2fs_free_mem(&icount);
-+}
-+
-+errcode_t ext2fs_create_icount2(ext2_filsys fs, int flags, unsigned int size,
-+				ext2_icount_t hint, ext2_icount_t *ret)
-+{
-+	ext2_icount_t	icount;
-+	errcode_t	retval;
-+	size_t		bytes;
-+	ext2_ino_t	i;
-+
-+	if (hint) {
-+		EXT2_CHECK_MAGIC(hint, EXT2_ET_MAGIC_ICOUNT);
-+		if (hint->size > size)
-+			size = (size_t) hint->size;
-+	}
-+	
-+	retval = ext2fs_get_mem(sizeof(struct ext2_icount), &icount);
-+	if (retval)
-+		return retval;
-+	memset(icount, 0, sizeof(struct ext2_icount));
-+
-+	retval = ext2fs_allocate_inode_bitmap(fs, 0, 
-+					      &icount->single);
-+	if (retval)
-+		goto errout;
-+
-+	if (flags & EXT2_ICOUNT_OPT_INCREMENT) {
-+		retval = ext2fs_allocate_inode_bitmap(fs, 0, 
-+						      &icount->multiple);
-+		if (retval)
-+			goto errout;
-+	} else
-+		icount->multiple = 0;
-+
-+	if (size) {
-+		icount->size = size;
-+	} else {
-+		/*
-+		 * Figure out how many special case inode counts we will
-+		 * have.  We know we will need one for each directory;
-+		 * we also need to reserve some extra room for file links
-+		 */
-+		retval = ext2fs_get_num_dirs(fs, &icount->size);
-+		if (retval)
-+			goto errout;
-+		icount->size += fs->super->s_inodes_count / 50;
-+	}
-+	
-+	bytes = (size_t) (icount->size * sizeof(struct ext2_icount_el));
-+#if 0
-+	printf("Icount allocated %d entries, %d bytes.\n",
-+	       icount->size, bytes);
-+#endif
-+	retval = ext2fs_get_mem(bytes, &icount->list);
-+	if (retval)
-+		goto errout;
-+	memset(icount->list, 0, bytes);
-+
-+	icount->magic = EXT2_ET_MAGIC_ICOUNT;
-+	icount->count = 0;
-+	icount->cursor = 0;
-+	icount->num_inodes = fs->super->s_inodes_count;
-+
-+	/*
-+	 * Populate the sorted list with those entries which were
-+	 * found in the hint icount (since those are ones which will
-+	 * likely need to be in the sorted list this time around).
-+	 */
-+	if (hint) {
-+		for (i=0; i < hint->count; i++)
-+			icount->list[i].ino = hint->list[i].ino;
-+		icount->count = hint->count;
-+	}
-+
-+	*ret = icount;
-+	return 0;
-+
-+errout:
-+	ext2fs_free_icount(icount);
-+	return(retval);
-+}
-+
-+errcode_t ext2fs_create_icount(ext2_filsys fs, int flags, 
-+			       unsigned int size,
-+			       ext2_icount_t *ret)
-+{
-+	return ext2fs_create_icount2(fs, flags, size, 0, ret);
-+}
-+
-+/*
-+ * insert_icount_el() --- Insert a new entry into the sorted list at a
-+ * 	specified position.
-+ */
-+static struct ext2_icount_el *insert_icount_el(ext2_icount_t icount,
-+					    ext2_ino_t ino, int pos)
-+{
-+	struct ext2_icount_el 	*el;
-+	errcode_t		retval;
-+	ext2_ino_t			new_size = 0;
-+	int			num;
-+
-+	if (icount->count >= icount->size) {
-+		if (icount->count) {
-+			new_size = icount->list[(unsigned)icount->count-1].ino;
-+			new_size = (ext2_ino_t) (icount->count * 
-+				((float) icount->num_inodes / new_size));
-+		}
-+		if (new_size < (icount->size + 100))
-+			new_size = icount->size + 100;
-+#if 0
-+		printf("Reallocating icount %d entries...\n", new_size);
-+#endif	
-+		retval = ext2fs_resize_mem((size_t) icount->size *
-+					   sizeof(struct ext2_icount_el),
-+					   (size_t) new_size *
-+					   sizeof(struct ext2_icount_el),
-+					   &icount->list);
-+		if (retval)
-+			return 0;
-+		icount->size = new_size;
-+	}
-+	num = (int) icount->count - pos;
-+	if (num < 0)
-+		return 0;	/* should never happen */
-+	if (num) {
-+		memmove(&icount->list[pos+1], &icount->list[pos],
-+			sizeof(struct ext2_icount_el) * num);
-+	}
-+	icount->count++;
-+	el = &icount->list[pos];
-+	el->count = 0;
-+	el->ino = ino;
-+	return el;
-+}
-+
-+/*
-+ * get_icount_el() --- given an inode number, try to find icount
-+ * 	information in the sorted list.  If the create flag is set,
-+ * 	and we can't find an entry, create one in the sorted list.
-+ */
-+static struct ext2_icount_el *get_icount_el(ext2_icount_t icount,
-+					    ext2_ino_t ino, int create)
-+{
-+	float	range;
-+	int	low, high, mid;
-+	ext2_ino_t	lowval, highval;
-+
-+	if (!icount || !icount->list)
-+		return 0;
-+
-+	if (create && ((icount->count == 0) ||
-+		       (ino > icount->list[(unsigned)icount->count-1].ino))) {
-+		return insert_icount_el(icount, ino, (unsigned) icount->count);
-+	}
-+	if (icount->count == 0)
-+		return 0;
-+	
-+	if (icount->cursor >= icount->count)
-+		icount->cursor = 0;
-+	if (ino == icount->list[icount->cursor].ino)
-+		return &icount->list[icount->cursor++];
-+#if 0
-+	printf("Non-cursor get_icount_el: %u\n", ino);
-+#endif
-+	low = 0;
-+	high = (int) icount->count-1;
-+	while (low <= high) {
-+#if 0
-+		mid = (low+high)/2;
-+#else
-+		if (low == high)
-+			mid = low;
-+		else {
-+			/* Interpolate for efficiency */
-+			lowval = icount->list[low].ino;
-+			highval = icount->list[high].ino;
-+
-+			if (ino < lowval)
-+				range = 0;
-+			else if (ino > highval)
-+				range = 1;
-+			else 
-+				range = ((float) (ino - lowval)) /
-+					(highval - lowval);
-+			mid = low + ((int) (range * (high-low)));
-+		}
-+#endif
-+		if (ino == icount->list[mid].ino) {
-+			icount->cursor = mid+1;
-+			return &icount->list[mid];
-+		}
-+		if (ino < icount->list[mid].ino)
-+			high = mid-1;
-+		else
-+			low = mid+1;
-+	}
-+	/*
-+	 * If we need to create a new entry, it should be right at
-+	 * low (where high will be left at low-1).
-+	 */
-+	if (create)
-+		return insert_icount_el(icount, ino, low);
-+	return 0;
-+}
-+
-+errcode_t ext2fs_icount_validate(ext2_icount_t icount, FILE *out)
-+{
-+	errcode_t	ret = 0;
-+	unsigned int	i;
-+	const char *bad = "bad icount";
-+	
-+	EXT2_CHECK_MAGIC(icount, EXT2_ET_MAGIC_ICOUNT);
-+
-+	if (icount->count > icount->size) {
-+		fprintf(out, "%s: count > size\n", bad);
-+		return EXT2_ET_INVALID_ARGUMENT;
-+	}
-+	for (i=1; i < icount->count; i++) {
-+		if (icount->list[i-1].ino >= icount->list[i].ino) {
-+			fprintf(out, "%s: list[%d].ino=%u, list[%d].ino=%u\n",
-+				bad, i-1, icount->list[i-1].ino,
-+				i, icount->list[i].ino);
-+			ret = EXT2_ET_INVALID_ARGUMENT;
-+		}
-+	}
-+	return ret;
-+}
-+
-+errcode_t ext2fs_icount_fetch(ext2_icount_t icount, ext2_ino_t ino, __u16 *ret)
-+{
-+	struct ext2_icount_el	*el;
-+	
-+	EXT2_CHECK_MAGIC(icount, EXT2_ET_MAGIC_ICOUNT);
-+
-+	if (!ino || (ino > icount->num_inodes))
-+		return EXT2_ET_INVALID_ARGUMENT;
-+
-+	if (ext2fs_test_inode_bitmap(icount->single, ino)) {
-+		*ret = 1;
-+		return 0;
-+	}
-+	if (icount->multiple &&
-+	    !ext2fs_test_inode_bitmap(icount->multiple, ino)) {
-+		*ret = 0;
-+		return 0;
-+	}
-+	el = get_icount_el(icount, ino, 0);
-+	if (!el) {
-+		*ret = 0;
-+		return 0;
-+	}
-+	*ret = el->count;
-+	return 0;
-+}
-+
-+errcode_t ext2fs_icount_increment(ext2_icount_t icount, ext2_ino_t ino,
-+				  __u16 *ret)
-+{
-+	struct ext2_icount_el	*el;
-+
-+	EXT2_CHECK_MAGIC(icount, EXT2_ET_MAGIC_ICOUNT);
-+
-+	if (!ino || (ino > icount->num_inodes))
-+		return EXT2_ET_INVALID_ARGUMENT;
-+
-+	if (ext2fs_test_inode_bitmap(icount->single, ino)) {
-+		/*
-+		 * If the existing count is 1, then we know there is
-+		 * no entry in the list.
-+		 */
-+		el = get_icount_el(icount, ino, 1);
-+		if (!el)
-+			return EXT2_ET_NO_MEMORY;
-+		ext2fs_unmark_inode_bitmap(icount->single, ino);
-+		el->count = 2;
-+	} else if (icount->multiple) {
-+		/*
-+		 * The count is either zero or greater than 1; if the
-+		 * inode is set in icount->multiple, then there should
-+		 * be an entry in the list, so find it using
-+		 * get_icount_el().
-+		 */
-+		if (ext2fs_test_inode_bitmap(icount->multiple, ino)) {
-+			el = get_icount_el(icount, ino, 1);
-+			if (!el)
-+				return EXT2_ET_NO_MEMORY;
-+			el->count++;
-+		} else {
-+			/*
-+			 * The count was zero; mark the single bitmap
-+			 * and return.
-+			 */
-+		zero_count:
-+			ext2fs_mark_inode_bitmap(icount->single, ino);
-+			if (ret)
-+				*ret = 1;
-+			return 0;
-+		}
-+	} else {
-+		/*
-+		 * The count is either zero or greater than 1; try to
-+		 * find an entry in the list to determine which.
-+		 */
-+		el = get_icount_el(icount, ino, 0);
-+		if (!el) {
-+			/* No entry means the count was zero */
-+			goto zero_count;
-+		}
-+		el = get_icount_el(icount, ino, 1);
-+		if (!el)
-+			return EXT2_ET_NO_MEMORY;
-+		el->count++;
-+	}
-+	if (icount->multiple)
-+		ext2fs_mark_inode_bitmap(icount->multiple, ino);
-+	if (ret)
-+		*ret = el->count;
-+	return 0;
-+}
-+
-+errcode_t ext2fs_icount_decrement(ext2_icount_t icount, ext2_ino_t ino,
-+				  __u16 *ret)
-+{
-+	struct ext2_icount_el	*el;
-+
-+	if (!ino || (ino > icount->num_inodes))
-+		return EXT2_ET_INVALID_ARGUMENT;
-+
-+	EXT2_CHECK_MAGIC(icount, EXT2_ET_MAGIC_ICOUNT);
-+
-+	if (ext2fs_test_inode_bitmap(icount->single, ino)) {
-+		ext2fs_unmark_inode_bitmap(icount->single, ino);
-+		if (icount->multiple)
-+			ext2fs_unmark_inode_bitmap(icount->multiple, ino);
-+		else {
-+			el = get_icount_el(icount, ino, 0);
-+			if (el)
-+				el->count = 0;
-+		}
-+		if (ret)
-+			*ret = 0;
-+		return 0;
-+	}
-+
-+	if (icount->multiple &&
-+	    !ext2fs_test_inode_bitmap(icount->multiple, ino))
-+		return EXT2_ET_INVALID_ARGUMENT;
-+	
-+	el = get_icount_el(icount, ino, 0);
-+	if (!el || el->count == 0)
-+		return EXT2_ET_INVALID_ARGUMENT;
-+
-+	el->count--;
-+	if (el->count == 1)
-+		ext2fs_mark_inode_bitmap(icount->single, ino);
-+	if ((el->count == 0) && icount->multiple)
-+		ext2fs_unmark_inode_bitmap(icount->multiple, ino);
-+
-+	if (ret)
-+		*ret = el->count;
-+	return 0;
-+}
-+
-+errcode_t ext2fs_icount_store(ext2_icount_t icount, ext2_ino_t ino,
-+			      __u16 count)
-+{
-+	struct ext2_icount_el	*el;
-+
-+	if (!ino || (ino > icount->num_inodes))
-+		return EXT2_ET_INVALID_ARGUMENT;
-+
-+	EXT2_CHECK_MAGIC(icount, EXT2_ET_MAGIC_ICOUNT);
-+
-+	if (count == 1) {
-+		ext2fs_mark_inode_bitmap(icount->single, ino);
-+		if (icount->multiple)
-+			ext2fs_unmark_inode_bitmap(icount->multiple, ino);
-+		return 0;
-+	}
-+	if (count == 0) {
-+		ext2fs_unmark_inode_bitmap(icount->single, ino);
-+		if (icount->multiple) {
-+			/*
-+			 * If the icount->multiple bitmap is enabled,
-+			 * we can just clear both bitmaps and we're done
-+			 */
-+			ext2fs_unmark_inode_bitmap(icount->multiple, ino);
-+		} else {
-+			el = get_icount_el(icount, ino, 0);
-+			if (el)
-+				el->count = 0;
-+		}
-+		return 0;
-+	}
-+
-+	/*
-+	 * Get the icount element
-+	 */
-+	el = get_icount_el(icount, ino, 1);
-+	if (!el)
-+		return EXT2_ET_NO_MEMORY;
-+	el->count = count;
-+	ext2fs_unmark_inode_bitmap(icount->single, ino);
-+	if (icount->multiple)
-+		ext2fs_mark_inode_bitmap(icount->multiple, ino);
-+	return 0;
-+}
-+
-+ext2_ino_t ext2fs_get_icount_size(ext2_icount_t icount)
-+{
-+	if (!icount || icount->magic != EXT2_ET_MAGIC_ICOUNT)
-+		return 0;
-+
-+	return icount->size;
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/imager.c silo-1.4.13/libext2fs/imager.c
---- silo-1.4.13.orig/libext2fs/imager.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/imager.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,387 @@
-+/*
-+ * image.c --- writes out the critical parts of the filesystem as a
-+ * 	flat file.
-+ *
-+ * Copyright (C) 2000 Theodore Ts'o.
-+ *
-+ * Note: this uses the POSIX IO interfaces, unlike most of the other
-+ * functions in this library.  So sue me.  
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#if HAVE_ERRNO_H
-+#include <errno.h>
-+#endif
-+#include <fcntl.h>
-+#include <time.h>
-+#if HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+#ifndef HAVE_TYPE_SSIZE_T
-+typedef int ssize_t;
-+#endif
-+
-+/*
-+ * This function returns 1 if the specified block is all zeros
-+ */
-+static int check_zero_block(char *buf, int blocksize)
-+{
-+	char	*cp = buf;
-+	int	left = blocksize;
-+
-+	while (left > 0) {
-+		if (*cp++)
-+			return 0;
-+		left--;
-+	}
-+	return 1;
-+}
-+
-+/*
-+ * Write the inode table out as a single block.
-+ */
-+#define BUF_BLOCKS	32
-+
-+errcode_t ext2fs_image_inode_write(ext2_filsys fs, int fd, int flags)
-+{
-+	unsigned int	group, left, c, d;
-+	char		*buf, *cp;
-+	blk_t		blk;
-+	ssize_t		actual;
-+	errcode_t	retval;
-+
-+	buf = malloc(fs->blocksize * BUF_BLOCKS);
-+	if (!buf)
-+		return ENOMEM;
-+	
-+	for (group = 0; group < fs->group_desc_count; group++) {
-+		blk = fs->group_desc[(unsigned)group].bg_inode_table;
-+		if (!blk)
-+			return EXT2_ET_MISSING_INODE_TABLE;
-+		left = fs->inode_blocks_per_group;
-+		while (left) {
-+			c = BUF_BLOCKS;
-+			if (c > left)
-+				c = left;
-+			retval = io_channel_read_blk(fs->io, blk, c, buf);
-+			if (retval)
-+				goto errout;
-+			cp = buf;
-+			while (c) {
-+				if (!(flags & IMAGER_FLAG_SPARSEWRITE)) {
-+					d = c;
-+					goto skip_sparse;
-+				}
-+				/* Skip zero blocks */
-+				if (check_zero_block(cp, fs->blocksize)) {
-+					c--;
-+					blk++;
-+					left--;
-+					cp += fs->blocksize;
-+					lseek(fd, fs->blocksize, SEEK_CUR);
-+					continue;
-+				}
-+				/* Find non-zero blocks */
-+				for (d=1; d < c; d++) {
-+					if (check_zero_block(cp + d*fs->blocksize, fs->blocksize))
-+						break;
-+				}
-+			skip_sparse:
-+				actual = write(fd, cp, fs->blocksize * d);
-+				if (actual == -1) {
-+					retval = errno;
-+					goto errout;
-+				}
-+				if (actual != (ssize_t) (fs->blocksize * d)) {
-+					retval = EXT2_ET_SHORT_WRITE;
-+					goto errout;
-+				}
-+				blk += d;
-+				left -= d;
-+				cp += fs->blocksize * d;
-+				c -= d;
-+			}
-+		}
-+	}
-+	retval = 0;
-+
-+errout:
-+	free(buf);
-+	return retval;
-+}
-+
-+/*
-+ * Read in the inode table and stuff it into place
-+ */
-+errcode_t ext2fs_image_inode_read(ext2_filsys fs, int fd, 
-+				  int flags EXT2FS_ATTR((unused)))
-+{
-+	unsigned int	group, c, left;
-+	char		*buf;
-+	blk_t		blk;
-+	ssize_t		actual;
-+	errcode_t	retval;
-+
-+	buf = malloc(fs->blocksize * BUF_BLOCKS);
-+	if (!buf)
-+		return ENOMEM;
-+	
-+	for (group = 0; group < fs->group_desc_count; group++) {
-+		blk = fs->group_desc[(unsigned)group].bg_inode_table;
-+		if (!blk) {
-+			retval = EXT2_ET_MISSING_INODE_TABLE;
-+			goto errout;
-+		}
-+		left = fs->inode_blocks_per_group;
-+		while (left) {
-+			c = BUF_BLOCKS;
-+			if (c > left)
-+				c = left;
-+			actual = read(fd, buf, fs->blocksize * c);
-+			if (actual == -1) {
-+				retval = errno;
-+				goto errout;
-+			}
-+			if (actual != (ssize_t) (fs->blocksize * c)) {
-+				retval = EXT2_ET_SHORT_READ;
-+				goto errout;
-+			}
-+			retval = io_channel_write_blk(fs->io, blk, c, buf);
-+			if (retval)
-+				goto errout;
-+			
-+			blk += c;
-+			left -= c;
-+		}
-+	}
-+	retval = ext2fs_flush_icache(fs);
-+
-+errout:
-+	free(buf);
-+	return retval;
-+}
-+
-+/*
-+ * Write out superblock and group descriptors
-+ */
-+errcode_t ext2fs_image_super_write(ext2_filsys fs, int fd, 
-+				   int flags EXT2FS_ATTR((unused)))
-+{
-+	char		*buf, *cp;
-+	ssize_t		actual;
-+	errcode_t	retval;
-+
-+	buf = malloc(fs->blocksize);
-+	if (!buf)
-+		return ENOMEM;
-+
-+	/*
-+	 * Write out the superblock
-+	 */
-+	memset(buf, 0, fs->blocksize);
-+	memcpy(buf, fs->super, SUPERBLOCK_SIZE);
-+	actual = write(fd, buf, fs->blocksize);
-+	if (actual == -1) {
-+		retval = errno;
-+		goto errout;
-+	}
-+	if (actual != (ssize_t) fs->blocksize) {
-+		retval = EXT2_ET_SHORT_WRITE;
-+		goto errout;
-+	}
-+
-+	/*
-+	 * Now write out the block group descriptors
-+	 */
-+	cp = (char *) fs->group_desc;
-+	actual = write(fd, cp, fs->blocksize * fs->desc_blocks);
-+	if (actual == -1) {
-+		retval = errno;
-+		goto errout;
-+	}
-+	if (actual != (ssize_t) (fs->blocksize * fs->desc_blocks)) {
-+		retval = EXT2_ET_SHORT_WRITE;
-+		goto errout;
-+	}
-+	
-+	retval = 0;
-+
-+errout:
-+	free(buf);
-+	return retval;
-+}
-+
-+/*
-+ * Read the superblock and group descriptors and overwrite them.
-+ */
-+errcode_t ext2fs_image_super_read(ext2_filsys fs, int fd, 
-+				  int flags EXT2FS_ATTR((unused)))
-+{
-+	char		*buf;
-+	ssize_t		actual, size;
-+	errcode_t	retval;
-+
-+	size = fs->blocksize * (fs->group_desc_count + 1);
-+	buf = malloc(size);
-+	if (!buf)
-+		return ENOMEM;
-+
-+	/*
-+	 * Read it all in.
-+	 */
-+	actual = read(fd, buf, size);
-+	if (actual == -1) {
-+		retval = errno;
-+		goto errout;
-+	}
-+	if (actual != size) {
-+		retval = EXT2_ET_SHORT_READ;
-+		goto errout;
-+	}
-+
-+	/*
-+	 * Now copy in the superblock and group descriptors
-+	 */
-+	memcpy(fs->super, buf, SUPERBLOCK_SIZE);
-+
-+	memcpy(fs->group_desc, buf + fs->blocksize,
-+	       fs->blocksize * fs->group_desc_count);
-+
-+	retval = 0;
-+
-+errout:
-+	free(buf);
-+	return retval;
-+}
-+
-+/*
-+ * Write the block/inode bitmaps.
-+ */
-+errcode_t ext2fs_image_bitmap_write(ext2_filsys fs, int fd, int flags)
-+{
-+	char		*ptr;
-+	int		c, size;
-+	char		zero_buf[1024];
-+	ssize_t		actual;
-+	errcode_t	retval;
-+
-+	if (flags & IMAGER_FLAG_INODEMAP) {
-+		if (!fs->inode_map) {
-+			retval = ext2fs_read_inode_bitmap(fs);
-+			if (retval)
-+				return retval;
-+		}
-+		ptr = fs->inode_map->bitmap;
-+		size = (EXT2_INODES_PER_GROUP(fs->super) / 8);
-+	} else {
-+		if (!fs->block_map) {
-+			retval = ext2fs_read_block_bitmap(fs);
-+			if (retval)
-+				return retval;
-+		}
-+		ptr = fs->block_map->bitmap;
-+		size = EXT2_BLOCKS_PER_GROUP(fs->super) / 8;
-+	}
-+	size = size * fs->group_desc_count;
-+
-+	actual = write(fd, ptr, size);
-+	if (actual == -1) {
-+		retval = errno;
-+		goto errout;
-+	}
-+	if (actual != size) {
-+		retval = EXT2_ET_SHORT_WRITE;
-+		goto errout;
-+	}
-+	size = size % fs->blocksize;
-+	memset(zero_buf, 0, sizeof(zero_buf));
-+	if (size) {
-+		size = fs->blocksize - size;
-+		while (size) {
-+			c = size;
-+			if (c > (int) sizeof(zero_buf))
-+				c = sizeof(zero_buf);
-+			actual = write(fd, zero_buf, c);
-+			if (actual == -1) {
-+				retval = errno;
-+				goto errout;
-+			}
-+			if (actual != c) {
-+				retval = EXT2_ET_SHORT_WRITE;
-+				goto errout;
-+			}
-+			size -= c;
-+		}
-+	}
-+	retval = 0;
-+errout:
-+	return (retval);
-+}
-+
-+
-+/*
-+ * Read the block/inode bitmaps.
-+ */
-+errcode_t ext2fs_image_bitmap_read(ext2_filsys fs, int fd, int flags)
-+{
-+	char		*ptr, *buf = 0;
-+	int		size;
-+	ssize_t		actual;
-+	errcode_t	retval;
-+
-+	if (flags & IMAGER_FLAG_INODEMAP) {
-+		if (!fs->inode_map) {
-+			retval = ext2fs_read_inode_bitmap(fs);
-+			if (retval)
-+				return retval;
-+		}
-+		ptr = fs->inode_map->bitmap;
-+		size = (EXT2_INODES_PER_GROUP(fs->super) / 8);
-+	} else {
-+		if (!fs->block_map) {
-+			retval = ext2fs_read_block_bitmap(fs);
-+			if (retval)
-+				return retval;
-+		}
-+		ptr = fs->block_map->bitmap;
-+		size = EXT2_BLOCKS_PER_GROUP(fs->super) / 8;
-+	}
-+	size = size * fs->group_desc_count;
-+
-+	buf = malloc(size);
-+	if (!buf)
-+		return ENOMEM;
-+
-+	actual = read(fd, buf, size);
-+	if (actual == -1) {
-+		retval = errno;
-+		goto errout;
-+	}
-+	if (actual != size) {
-+		retval = EXT2_ET_SHORT_WRITE;
-+		goto errout;
-+	}
-+	memcpy(ptr, buf, size);
-+	
-+	retval = 0;
-+errout:
-+	if (buf)
-+		free(buf);
-+	return (retval);
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/ind_block.c silo-1.4.13/libext2fs/ind_block.c
---- silo-1.4.13.orig/libext2fs/ind_block.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/ind_block.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,66 @@
-+/*
-+ * ind_block.c --- indirect block I/O routines
-+ * 
-+ * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 
-+ * 	2001, 2002, 2003, 2004, 2005 by  Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+errcode_t ext2fs_read_ind_block(ext2_filsys fs, blk_t blk, void *buf)
-+{
-+	errcode_t	retval;
-+	blk_t		*block_nr;
-+	int		i;
-+	int		limit = fs->blocksize >> 2;
-+
-+	if ((fs->flags & EXT2_FLAG_IMAGE_FILE) &&
-+	    (fs->io != fs->image_io))
-+		memset(buf, 0, fs->blocksize);
-+	else {
-+		retval = io_channel_read_blk(fs->io, blk, 1, buf);
-+		if (retval)
-+			return retval;
-+	}
-+#ifdef EXT2FS_ENABLE_SWAPFS
-+	if (fs->flags & (EXT2_FLAG_SWAP_BYTES | EXT2_FLAG_SWAP_BYTES_READ)) {
-+		block_nr = (blk_t *) buf;
-+		for (i = 0; i < limit; i++, block_nr++)
-+			*block_nr = ext2fs_swab32(*block_nr);
-+	}
-+#endif
-+	return 0;
-+}
-+
-+errcode_t ext2fs_write_ind_block(ext2_filsys fs, blk_t blk, void *buf)
-+{
-+	blk_t		*block_nr;
-+	int		i;
-+	int		limit = fs->blocksize >> 2;
-+
-+	if (fs->flags & EXT2_FLAG_IMAGE_FILE)
-+		return 0;
-+
-+#ifdef EXT2FS_ENABLE_SWAPFS
-+	if (fs->flags & (EXT2_FLAG_SWAP_BYTES | EXT2_FLAG_SWAP_BYTES_WRITE)) {
-+		block_nr = (blk_t *) buf;
-+		for (i = 0; i < limit; i++, block_nr++)
-+			*block_nr = ext2fs_swab32(*block_nr);
-+	}
-+#endif
-+	return io_channel_write_blk(fs->io, blk, 1, buf);
-+}
-+
-+
-diff -Naur silo-1.4.13.orig/libext2fs/initialize.c silo-1.4.13/libext2fs/initialize.c
---- silo-1.4.13.orig/libext2fs/initialize.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/initialize.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,387 @@
-+/*
-+ * initialize.c --- initialize a filesystem handle given superblock
-+ * 	parameters.  Used by mke2fs when initializing a filesystem.
-+ * 
-+ * Copyright (C) 1994, 1995, 1996 Theodore Ts'o.
-+ * 
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <fcntl.h>
-+#include <time.h>
-+#if HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+#if defined(__linux__)    &&	defined(EXT2_OS_LINUX)
-+#define CREATOR_OS EXT2_OS_LINUX
-+#else
-+#if defined(__GNU__)     &&	defined(EXT2_OS_HURD)
-+#define CREATOR_OS EXT2_OS_HURD
-+#else
-+#if defined(__FreeBSD__) &&	defined(EXT2_OS_FREEBSD)
-+#define CREATOR_OS EXT2_OS_FREEBSD
-+#else
-+#if defined(LITES) 	   &&	defined(EXT2_OS_LITES)
-+#define CREATOR_OS EXT2_OS_LITES
-+#else
-+#define CREATOR_OS EXT2_OS_LINUX /* by default */
-+#endif /* defined(LITES) && defined(EXT2_OS_LITES) */
-+#endif /* defined(__FreeBSD__) && defined(EXT2_OS_FREEBSD) */
-+#endif /* defined(__GNU__)     && defined(EXT2_OS_HURD) */
-+#endif /* defined(__linux__)   && defined(EXT2_OS_LINUX) */
-+	
-+/*
-+ * Note we override the kernel include file's idea of what the default
-+ * check interval (never) should be.  It's a good idea to check at
-+ * least *occasionally*, specially since servers will never rarely get
-+ * to reboot, since Linux is so robust these days.  :-)
-+ * 
-+ * 180 days (six months) seems like a good value.
-+ */
-+#ifdef EXT2_DFL_CHECKINTERVAL
-+#undef EXT2_DFL_CHECKINTERVAL
-+#endif
-+#define EXT2_DFL_CHECKINTERVAL (86400L * 180L)
-+
-+/*
-+ * Calculate the number of GDT blocks to reserve for online filesystem growth.
-+ * The absolute maximum number of GDT blocks we can reserve is determined by
-+ * the number of block pointers that can fit into a single block.
-+ */
-+static int calc_reserved_gdt_blocks(ext2_filsys fs)
-+{
-+	struct ext2_super_block *sb = fs->super;
-+	unsigned long bpg = sb->s_blocks_per_group;
-+	unsigned int gdpb = fs->blocksize / sizeof(struct ext2_group_desc);
-+	unsigned long max_blocks = 0xffffffff;
-+	unsigned long rsv_groups;
-+	int rsv_gdb;
-+
-+	/* We set it at 1024x the current filesystem size, or
-+	 * the upper block count limit (2^32), whichever is lower.
-+	 */
-+	if (sb->s_blocks_count < max_blocks / 1024)
-+		max_blocks = sb->s_blocks_count * 1024;
-+	rsv_groups = (max_blocks - sb->s_first_data_block + bpg - 1) / bpg;
-+	rsv_gdb = (rsv_groups + gdpb - 1) / gdpb - fs->desc_blocks;
-+	if (rsv_gdb > EXT2_ADDR_PER_BLOCK(sb))
-+		rsv_gdb = EXT2_ADDR_PER_BLOCK(sb);
-+#ifdef RES_GDT_DEBUG
-+	printf("max_blocks %lu, rsv_groups = %lu, rsv_gdb = %lu\n",
-+	       max_blocks, rsv_groups, rsv_gdb);
-+#endif
-+
-+	return rsv_gdb;
-+}
-+
-+errcode_t ext2fs_initialize(const char *name, int flags,
-+			    struct ext2_super_block *param,
-+			    io_manager manager, ext2_filsys *ret_fs)
-+{
-+	ext2_filsys	fs;
-+	errcode_t	retval;
-+	struct ext2_super_block *super;
-+	int		frags_per_block;
-+	unsigned int	rem;
-+	unsigned int	overhead = 0;
-+	blk_t		group_block;
-+	unsigned int	ipg;
-+	dgrp_t		i;
-+	blk_t		numblocks;
-+	int		rsv_gdt;
-+	char		*buf;
-+
-+	if (!param || !param->s_blocks_count)
-+		return EXT2_ET_INVALID_ARGUMENT;
-+	
-+	retval = ext2fs_get_mem(sizeof(struct struct_ext2_filsys), &fs);
-+	if (retval)
-+		return retval;
-+	
-+	memset(fs, 0, sizeof(struct struct_ext2_filsys));
-+	fs->magic = EXT2_ET_MAGIC_EXT2FS_FILSYS;
-+	fs->flags = flags | EXT2_FLAG_RW;
-+	fs->umask = 022;
-+#ifdef WORDS_BIGENDIAN
-+	fs->flags |= EXT2_FLAG_SWAP_BYTES;
-+#endif
-+	retval = manager->open(name, IO_FLAG_RW, &fs->io);
-+	if (retval)
-+		goto cleanup;
-+	fs->image_io = fs->io;
-+	fs->io->app_data = fs;
-+	retval = ext2fs_get_mem(strlen(name)+1, &fs->device_name);
-+	if (retval)
-+		goto cleanup;
-+
-+	strcpy(fs->device_name, name);
-+	retval = ext2fs_get_mem(SUPERBLOCK_SIZE, &super);
-+	if (retval)
-+		goto cleanup;
-+	fs->super = super;
-+
-+	memset(super, 0, SUPERBLOCK_SIZE);
-+
-+#define set_field(field, default) (super->field = param->field ? \
-+				   param->field : (default))
-+
-+	super->s_magic = EXT2_SUPER_MAGIC;
-+	super->s_state = EXT2_VALID_FS;
-+
-+	set_field(s_log_block_size, 0);	/* default blocksize: 1024 bytes */
-+	set_field(s_log_frag_size, 0); /* default fragsize: 1024 bytes */
-+	set_field(s_first_data_block, super->s_log_block_size ? 0 : 1);
-+	set_field(s_max_mnt_count, EXT2_DFL_MAX_MNT_COUNT);
-+	set_field(s_errors, EXT2_ERRORS_DEFAULT);
-+	set_field(s_feature_compat, 0);
-+	set_field(s_feature_incompat, 0);
-+	set_field(s_feature_ro_compat, 0);
-+	set_field(s_first_meta_bg, 0);
-+	if (super->s_feature_incompat & ~EXT2_LIB_FEATURE_INCOMPAT_SUPP) {
-+		retval = EXT2_ET_UNSUPP_FEATURE;
-+		goto cleanup;
-+	}
-+	if (super->s_feature_ro_compat & ~EXT2_LIB_FEATURE_RO_COMPAT_SUPP) {
-+		retval = EXT2_ET_RO_UNSUPP_FEATURE;
-+		goto cleanup;
-+	}
-+
-+	set_field(s_rev_level, EXT2_GOOD_OLD_REV);
-+	if (super->s_rev_level >= EXT2_DYNAMIC_REV) {
-+		set_field(s_first_ino, EXT2_GOOD_OLD_FIRST_INO);
-+		set_field(s_inode_size, EXT2_GOOD_OLD_INODE_SIZE);
-+	}
-+
-+	set_field(s_checkinterval, EXT2_DFL_CHECKINTERVAL);
-+	super->s_mkfs_time = super->s_lastcheck = time(NULL);
-+
-+	super->s_creator_os = CREATOR_OS;
-+
-+	fs->blocksize = EXT2_BLOCK_SIZE(super);
-+	fs->fragsize = EXT2_FRAG_SIZE(super);
-+	frags_per_block = fs->blocksize / fs->fragsize;
-+
-+	/* default: (fs->blocksize*8) blocks/group, up to 2^16 (GDT limit) */
-+	set_field(s_blocks_per_group, fs->blocksize * 8);
-+	if (super->s_blocks_per_group > EXT2_MAX_BLOCKS_PER_GROUP(super))
-+		super->s_blocks_per_group = EXT2_MAX_BLOCKS_PER_GROUP(super);
-+	super->s_frags_per_group = super->s_blocks_per_group * frags_per_block;
-+	
-+	super->s_blocks_count = param->s_blocks_count;
-+	super->s_r_blocks_count = param->s_r_blocks_count;
-+	if (super->s_r_blocks_count >= param->s_blocks_count) {
-+		retval = EXT2_ET_INVALID_ARGUMENT;
-+		goto cleanup;
-+	}
-+
-+	/*
-+	 * If we're creating an external journal device, we don't need
-+	 * to bother with the rest.
-+	 */
-+	if (super->s_feature_incompat & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) {
-+		fs->group_desc_count = 0;
-+		ext2fs_mark_super_dirty(fs);
-+		*ret_fs = fs;
-+		return 0;
-+	}
-+
-+retry:
-+	fs->group_desc_count = (super->s_blocks_count -
-+				super->s_first_data_block +
-+				EXT2_BLOCKS_PER_GROUP(super) - 1)
-+		/ EXT2_BLOCKS_PER_GROUP(super);
-+	if (fs->group_desc_count == 0) {
-+		retval = EXT2_ET_TOOSMALL;
-+		goto cleanup;
-+	}
-+	fs->desc_blocks = (fs->group_desc_count +
-+			   EXT2_DESC_PER_BLOCK(super) - 1)
-+		/ EXT2_DESC_PER_BLOCK(super);
-+
-+	i = fs->blocksize >= 4096 ? 1 : 4096 / fs->blocksize;
-+	set_field(s_inodes_count, super->s_blocks_count / i);
-+
-+	/*
-+	 * Make sure we have at least EXT2_FIRST_INO + 1 inodes, so
-+	 * that we have enough inodes for the filesystem(!)
-+	 */
-+	if (super->s_inodes_count < EXT2_FIRST_INODE(super)+1)
-+		super->s_inodes_count = EXT2_FIRST_INODE(super)+1;
-+	
-+	/*
-+	 * There should be at least as many inodes as the user
-+	 * requested.  Figure out how many inodes per group that
-+	 * should be.  But make sure that we don't allocate more than
-+	 * one bitmap's worth of inodes each group.
-+	 */
-+	ipg = (super->s_inodes_count + fs->group_desc_count - 1) /
-+		fs->group_desc_count;
-+	if (ipg > fs->blocksize * 8) {
-+		if (super->s_blocks_per_group >= 256) {
-+			/* Try again with slightly different parameters */
-+			super->s_blocks_per_group -= 8;
-+			super->s_blocks_count = param->s_blocks_count;
-+			super->s_frags_per_group = super->s_blocks_per_group *
-+				frags_per_block;
-+			goto retry;
-+		} else
-+			return EXT2_ET_TOO_MANY_INODES;
-+	}
-+
-+	if (ipg > (unsigned) EXT2_MAX_INODES_PER_GROUP(super))
-+		ipg = EXT2_MAX_INODES_PER_GROUP(super);
-+
-+	super->s_inodes_per_group = ipg;
-+	if (super->s_inodes_count > ipg * fs->group_desc_count)
-+		super->s_inodes_count = ipg * fs->group_desc_count;
-+
-+	/*
-+	 * Make sure the number of inodes per group completely fills
-+	 * the inode table blocks in the descriptor.  If not, add some
-+	 * additional inodes/group.  Waste not, want not...
-+	 */
-+	fs->inode_blocks_per_group = (((super->s_inodes_per_group *
-+					EXT2_INODE_SIZE(super)) +
-+				       EXT2_BLOCK_SIZE(super) - 1) /
-+				      EXT2_BLOCK_SIZE(super));
-+	super->s_inodes_per_group = ((fs->inode_blocks_per_group *
-+				      EXT2_BLOCK_SIZE(super)) /
-+				     EXT2_INODE_SIZE(super));
-+	/*
-+	 * Finally, make sure the number of inodes per group is a
-+	 * multiple of 8.  This is needed to simplify the bitmap
-+	 * splicing code.
-+	 */
-+	super->s_inodes_per_group &= ~7;
-+	fs->inode_blocks_per_group = (((super->s_inodes_per_group *
-+					EXT2_INODE_SIZE(super)) +
-+				       EXT2_BLOCK_SIZE(super) - 1) /
-+				      EXT2_BLOCK_SIZE(super));
-+
-+	/*
-+	 * adjust inode count to reflect the adjusted inodes_per_group
-+	 */
-+	super->s_inodes_count = super->s_inodes_per_group *
-+		fs->group_desc_count;
-+	super->s_free_inodes_count = super->s_inodes_count;
-+
-+	/*
-+	 * check the number of reserved group descriptor table blocks
-+	 */
-+	if (super->s_feature_compat & EXT2_FEATURE_COMPAT_RESIZE_INODE)
-+		rsv_gdt = calc_reserved_gdt_blocks(fs);
-+	else
-+		rsv_gdt = 0;
-+	set_field(s_reserved_gdt_blocks, rsv_gdt);
-+	if (super->s_reserved_gdt_blocks > EXT2_ADDR_PER_BLOCK(super)) {
-+		retval = EXT2_ET_RES_GDT_BLOCKS;
-+		goto cleanup;
-+	}
-+
-+	/*
-+	 * Overhead is the number of bookkeeping blocks per group.  It
-+	 * includes the superblock backup, the group descriptor
-+	 * backups, the inode bitmap, the block bitmap, and the inode
-+	 * table.
-+	 */
-+
-+	overhead = (int) (2 + fs->inode_blocks_per_group);
-+
-+	if (ext2fs_bg_has_super(fs, fs->group_desc_count - 1))
-+		overhead += 1 + fs->desc_blocks + super->s_reserved_gdt_blocks;
-+
-+	/* This can only happen if the user requested too many inodes */
-+	if (overhead > super->s_blocks_per_group)
-+		return EXT2_ET_TOO_MANY_INODES;
-+
-+	/*
-+	 * See if the last group is big enough to support the
-+	 * necessary data structures.  If not, we need to get rid of
-+	 * it.
-+	 */
-+	rem = ((super->s_blocks_count - super->s_first_data_block) %
-+	       super->s_blocks_per_group);
-+	if ((fs->group_desc_count == 1) && rem && (rem < overhead))
-+		return EXT2_ET_TOOSMALL;
-+	if (rem && (rem < overhead+50)) {
-+		super->s_blocks_count -= rem;
-+		goto retry;
-+	}
-+
-+	/*
-+	 * At this point we know how big the filesystem will be.  So
-+	 * we can do any and all allocations that depend on the block
-+	 * count.
-+	 */
-+
-+	retval = ext2fs_get_mem(strlen(fs->device_name) + 80, &buf);
-+	if (retval)
-+		goto cleanup;
-+	
-+	sprintf(buf, "block bitmap for %s", fs->device_name);
-+	retval = ext2fs_allocate_block_bitmap(fs, buf, &fs->block_map);
-+	if (retval)
-+		goto cleanup;
-+	
-+	sprintf(buf, "inode bitmap for %s", fs->device_name);
-+	retval = ext2fs_allocate_inode_bitmap(fs, buf, &fs->inode_map);
-+	if (retval)
-+		goto cleanup;
-+
-+	ext2fs_free_mem(&buf);
-+
-+	retval = ext2fs_get_mem((size_t) fs->desc_blocks * fs->blocksize,
-+				&fs->group_desc);
-+	if (retval)
-+		goto cleanup;
-+
-+	memset(fs->group_desc, 0, (size_t) fs->desc_blocks * fs->blocksize);
-+
-+	/*
-+	 * Reserve the superblock and group descriptors for each
-+	 * group, and fill in the correct group statistics for group.
-+	 * Note that although the block bitmap, inode bitmap, and
-+	 * inode table have not been allocated (and in fact won't be
-+	 * by this routine), they are accounted for nevertheless.
-+	 */
-+	group_block = super->s_first_data_block;
-+	super->s_free_blocks_count = 0;
-+	for (i = 0; i < fs->group_desc_count; i++) {
-+		numblocks = ext2fs_reserve_super_and_bgd(fs, i, fs->block_map);
-+
-+		super->s_free_blocks_count += numblocks;
-+		fs->group_desc[i].bg_free_blocks_count = numblocks;
-+		fs->group_desc[i].bg_free_inodes_count =
-+			fs->super->s_inodes_per_group;
-+		fs->group_desc[i].bg_used_dirs_count = 0;
-+		
-+		group_block += super->s_blocks_per_group;
-+	}
-+	
-+	ext2fs_mark_super_dirty(fs);
-+	ext2fs_mark_bb_dirty(fs);
-+	ext2fs_mark_ib_dirty(fs);
-+	
-+	io_channel_set_blksize(fs->io, fs->blocksize);
-+
-+	*ret_fs = fs;
-+	return 0;
-+cleanup:
-+	ext2fs_free(fs);
-+	return retval;
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/inline.c silo-1.4.13/libext2fs/inline.c
---- silo-1.4.13.orig/libext2fs/inline.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/inline.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,32 @@
-+/*
-+ * inline.c --- Includes the inlined functions defined in the header
-+ * 	files as standalone functions, in case the application program
-+ * 	is compiled with inlining turned off.
-+ * 
-+ * Copyright (C) 1993, 1994 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <fcntl.h>
-+#include <time.h>
-+#if HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#define INCLUDE_INLINE_FUNCS
-+#include "ext2fs.h"
-+
-diff -Naur silo-1.4.13.orig/libext2fs/inode.c silo-1.4.13/libext2fs/inode.c
---- silo-1.4.13.orig/libext2fs/inode.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/inode.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,794 @@
-+/*
-+ * inode.c --- utility routines to read and write inodes
-+ * 
-+ * Copyright (C) 1993, 1994, 1995, 1996, 1997 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#if HAVE_ERRNO_H
-+#include <errno.h>
-+#endif
-+#if HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fsP.h"
-+#include "e2image.h"
-+
-+struct ext2_struct_inode_scan {
-+	errcode_t		magic;
-+	ext2_filsys		fs;
-+	ext2_ino_t		current_inode;
-+	blk_t			current_block;
-+	dgrp_t			current_group;
-+	ext2_ino_t		inodes_left;
-+	blk_t			blocks_left;
-+	dgrp_t			groups_left;
-+	blk_t			inode_buffer_blocks;
-+	char *			inode_buffer;
-+	int			inode_size;
-+	char *			ptr;
-+	int			bytes_left;
-+	char			*temp_buffer;
-+	errcode_t		(*done_group)(ext2_filsys fs,
-+					      ext2_inode_scan scan,
-+					      dgrp_t group,
-+					      void * priv_data);
-+	void *			done_group_data;
-+	int			bad_block_ptr;
-+	int			scan_flags;
-+	int			reserved[6];
-+};
-+
-+/*
-+ * This routine flushes the icache, if it exists.
-+ */
-+errcode_t ext2fs_flush_icache(ext2_filsys fs)
-+{
-+	int	i;
-+	
-+	if (!fs->icache)
-+		return 0;
-+
-+	for (i=0; i < fs->icache->cache_size; i++)
-+		fs->icache->cache[i].ino = 0;
-+
-+	fs->icache->buffer_blk = 0;
-+	return 0;
-+}
-+
-+static errcode_t create_icache(ext2_filsys fs)
-+{
-+	errcode_t	retval;
-+	
-+	if (fs->icache)
-+		return 0;
-+	retval = ext2fs_get_mem(sizeof(struct ext2_inode_cache), &fs->icache);
-+	if (retval)
-+		return retval;
-+
-+	memset(fs->icache, 0, sizeof(struct ext2_inode_cache));
-+	retval = ext2fs_get_mem(fs->blocksize, &fs->icache->buffer);
-+	if (retval) {
-+		ext2fs_free_mem(&fs->icache);
-+		return retval;
-+	}
-+	fs->icache->buffer_blk = 0;
-+	fs->icache->cache_last = -1;
-+	fs->icache->cache_size = 4;
-+	fs->icache->refcount = 1;
-+	retval = ext2fs_get_mem(sizeof(struct ext2_inode_cache_ent)
-+				* fs->icache->cache_size,
-+				&fs->icache->cache);
-+	if (retval) {
-+		ext2fs_free_mem(&fs->icache->buffer);
-+		ext2fs_free_mem(&fs->icache);
-+		return retval;
-+	}
-+	ext2fs_flush_icache(fs);
-+	return 0;
-+}
-+
-+errcode_t ext2fs_open_inode_scan(ext2_filsys fs, int buffer_blocks,
-+				 ext2_inode_scan *ret_scan)
-+{
-+	ext2_inode_scan	scan;
-+	errcode_t	retval;
-+	errcode_t (*save_get_blocks)(ext2_filsys f, ext2_ino_t ino, blk_t *blocks);
-+
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	/*
-+	 * If fs->badblocks isn't set, then set it --- since the inode
-+	 * scanning functions require it.
-+	 */
-+	if (fs->badblocks == 0) {
-+		/*
-+		 * Temporarly save fs->get_blocks and set it to zero,
-+		 * for compatibility with old e2fsck's.
-+		 */
-+		save_get_blocks = fs->get_blocks;
-+		fs->get_blocks = 0;
-+		retval = ext2fs_read_bb_inode(fs, &fs->badblocks);
-+		if (retval && fs->badblocks) {
-+			ext2fs_badblocks_list_free(fs->badblocks);
-+			fs->badblocks = 0;
-+		}
-+		fs->get_blocks = save_get_blocks;
-+	}
-+
-+	retval = ext2fs_get_mem(sizeof(struct ext2_struct_inode_scan), &scan);
-+	if (retval)
-+		return retval;
-+	memset(scan, 0, sizeof(struct ext2_struct_inode_scan));
-+
-+	scan->magic = EXT2_ET_MAGIC_INODE_SCAN;
-+	scan->fs = fs;
-+	scan->inode_size = EXT2_INODE_SIZE(fs->super);
-+	scan->bytes_left = 0;
-+	scan->current_group = 0;
-+	scan->groups_left = fs->group_desc_count - 1;
-+	scan->inode_buffer_blocks = buffer_blocks ? buffer_blocks : 8;
-+	scan->current_block = scan->fs->
-+		group_desc[scan->current_group].bg_inode_table;
-+	scan->inodes_left = EXT2_INODES_PER_GROUP(scan->fs->super);
-+	scan->blocks_left = scan->fs->inode_blocks_per_group;
-+	retval = ext2fs_get_mem((size_t) (scan->inode_buffer_blocks * 
-+					  fs->blocksize),
-+				&scan->inode_buffer);
-+	scan->done_group = 0;
-+	scan->done_group_data = 0;
-+	scan->bad_block_ptr = 0;
-+	if (retval) {
-+		ext2fs_free_mem(&scan);
-+		return retval;
-+	}
-+	retval = ext2fs_get_mem(scan->inode_size, &scan->temp_buffer);
-+	if (retval) {
-+		ext2fs_free_mem(&scan->inode_buffer);
-+		ext2fs_free_mem(&scan);
-+		return retval;
-+	}
-+	if (scan->fs->badblocks && scan->fs->badblocks->num)
-+		scan->scan_flags |= EXT2_SF_CHK_BADBLOCKS;
-+	*ret_scan = scan;
-+	return 0;
-+}
-+
-+void ext2fs_close_inode_scan(ext2_inode_scan scan)
-+{
-+	if (!scan || (scan->magic != EXT2_ET_MAGIC_INODE_SCAN))
-+		return;
-+	
-+	ext2fs_free_mem(&scan->inode_buffer);
-+	scan->inode_buffer = NULL;
-+	ext2fs_free_mem(&scan->temp_buffer);
-+	scan->temp_buffer = NULL;
-+	ext2fs_free_mem(&scan);
-+	return;
-+}
-+
-+void ext2fs_set_inode_callback(ext2_inode_scan scan,
-+			       errcode_t (*done_group)(ext2_filsys fs,
-+						       ext2_inode_scan scan,
-+						       dgrp_t group,
-+						       void * priv_data),
-+			       void *done_group_data)
-+{
-+	if (!scan || (scan->magic != EXT2_ET_MAGIC_INODE_SCAN))
-+		return;
-+	
-+	scan->done_group = done_group;
-+	scan->done_group_data = done_group_data;
-+}
-+
-+int ext2fs_inode_scan_flags(ext2_inode_scan scan, int set_flags,
-+			    int clear_flags)
-+{
-+	int	old_flags;
-+
-+	if (!scan || (scan->magic != EXT2_ET_MAGIC_INODE_SCAN))
-+		return 0;
-+
-+	old_flags = scan->scan_flags;
-+	scan->scan_flags &= ~clear_flags;
-+	scan->scan_flags |= set_flags;
-+	return old_flags;
-+}
-+
-+/*
-+ * This function is called by ext2fs_get_next_inode when it needs to
-+ * get ready to read in a new blockgroup.
-+ */
-+static errcode_t get_next_blockgroup(ext2_inode_scan scan)
-+{
-+	scan->current_group++;
-+	scan->groups_left--;
-+			
-+	scan->current_block = scan->fs->
-+		group_desc[scan->current_group].bg_inode_table;
-+
-+	scan->current_inode = scan->current_group *
-+		EXT2_INODES_PER_GROUP(scan->fs->super);
-+
-+	scan->bytes_left = 0;
-+	scan->inodes_left = EXT2_INODES_PER_GROUP(scan->fs->super);
-+	scan->blocks_left = scan->fs->inode_blocks_per_group;
-+	return 0;
-+}
-+
-+errcode_t ext2fs_inode_scan_goto_blockgroup(ext2_inode_scan scan,
-+					    int	group)
-+{
-+	scan->current_group = group - 1;
-+	scan->groups_left = scan->fs->group_desc_count - group;
-+	return get_next_blockgroup(scan);
-+}
-+
-+/*
-+ * This function is called by get_next_blocks() to check for bad
-+ * blocks in the inode table.
-+ *
-+ * This function assumes that badblocks_list->list is sorted in
-+ * increasing order.
-+ */
-+static errcode_t check_for_inode_bad_blocks(ext2_inode_scan scan,
-+					    blk_t *num_blocks)
-+{
-+	blk_t	blk = scan->current_block;
-+	badblocks_list	bb = scan->fs->badblocks;
-+
-+	/*
-+	 * If the inode table is missing, then obviously there are no
-+	 * bad blocks.  :-)
-+	 */
-+	if (blk == 0)
-+		return 0;
-+
-+	/*
-+	 * If the current block is greater than the bad block listed
-+	 * in the bad block list, then advance the pointer until this
-+	 * is no longer the case.  If we run out of bad blocks, then
-+	 * we don't need to do any more checking!
-+	 */
-+	while (blk > bb->list[scan->bad_block_ptr]) {
-+		if (++scan->bad_block_ptr >= bb->num) {
-+			scan->scan_flags &= ~EXT2_SF_CHK_BADBLOCKS;
-+			return 0;
-+		}
-+	}
-+
-+	/*
-+	 * If the current block is equal to the bad block listed in
-+	 * the bad block list, then handle that one block specially.
-+	 * (We could try to handle runs of bad blocks, but that
-+	 * only increases CPU efficiency by a small amount, at the
-+	 * expense of a huge expense of code complexity, and for an
-+	 * uncommon case at that.)
-+	 */
-+	if (blk == bb->list[scan->bad_block_ptr]) {
-+		scan->scan_flags |= EXT2_SF_BAD_INODE_BLK;
-+		*num_blocks = 1;
-+		if (++scan->bad_block_ptr >= bb->num)
-+			scan->scan_flags &= ~EXT2_SF_CHK_BADBLOCKS;
-+		return 0;
-+	}
-+
-+	/*
-+	 * If there is a bad block in the range that we're about to
-+	 * read in, adjust the number of blocks to read so that we we
-+	 * don't read in the bad block.  (Then the next block to read
-+	 * will be the bad block, which is handled in the above case.)
-+	 */
-+	if ((blk + *num_blocks) > bb->list[scan->bad_block_ptr])
-+		*num_blocks = (int) (bb->list[scan->bad_block_ptr] - blk);
-+
-+	return 0;
-+}
-+
-+/*
-+ * This function is called by ext2fs_get_next_inode when it needs to
-+ * read in more blocks from the current blockgroup's inode table.
-+ */
-+static errcode_t get_next_blocks(ext2_inode_scan scan)
-+{
-+	blk_t		num_blocks;
-+	errcode_t	retval;
-+
-+	/*
-+	 * Figure out how many blocks to read; we read at most
-+	 * inode_buffer_blocks, and perhaps less if there aren't that
-+	 * many blocks left to read.
-+	 */
-+	num_blocks = scan->inode_buffer_blocks;
-+	if (num_blocks > scan->blocks_left)
-+		num_blocks = scan->blocks_left;
-+
-+	/*
-+	 * If the past block "read" was a bad block, then mark the
-+	 * left-over extra bytes as also being bad.
-+	 */
-+	if (scan->scan_flags & EXT2_SF_BAD_INODE_BLK) {
-+		if (scan->bytes_left)
-+			scan->scan_flags |= EXT2_SF_BAD_EXTRA_BYTES;
-+		scan->scan_flags &= ~EXT2_SF_BAD_INODE_BLK;
-+	}
-+
-+	/*
-+	 * Do inode bad block processing, if necessary.
-+	 */
-+	if (scan->scan_flags & EXT2_SF_CHK_BADBLOCKS) {
-+		retval = check_for_inode_bad_blocks(scan, &num_blocks);
-+		if (retval)
-+			return retval;
-+	}
-+		
-+	if ((scan->scan_flags & EXT2_SF_BAD_INODE_BLK) ||
-+	    (scan->current_block == 0)) {
-+		memset(scan->inode_buffer, 0,
-+		       (size_t) num_blocks * scan->fs->blocksize);
-+	} else {
-+		retval = io_channel_read_blk(scan->fs->io,
-+					     scan->current_block,
-+					     (int) num_blocks,
-+					     scan->inode_buffer);
-+		if (retval)
-+			return EXT2_ET_NEXT_INODE_READ;
-+	}
-+	scan->ptr = scan->inode_buffer;
-+	scan->bytes_left = num_blocks * scan->fs->blocksize;
-+
-+	scan->blocks_left -= num_blocks;
-+	if (scan->current_block)
-+		scan->current_block += num_blocks;
-+	return 0;
-+}
-+
-+#if 0
-+/*
-+ * Returns 1 if the entire inode_buffer has a non-zero size and
-+ * contains all zeros.  (Not just deleted inodes, since that means
-+ * that part of the inode table was used at one point; we want all
-+ * zeros, which means that the inode table is pristine.)
-+ */
-+static inline int is_empty_scan(ext2_inode_scan scan)
-+{
-+	int	i;
-+	
-+	if (scan->bytes_left == 0)
-+		return 0;
-+
-+	for (i=0; i < scan->bytes_left; i++)
-+		if (scan->ptr[i])
-+			return 0;
-+	return 1;
-+}
-+#endif
-+
-+errcode_t ext2fs_get_next_inode_full(ext2_inode_scan scan, ext2_ino_t *ino,
-+				     struct ext2_inode *inode, int bufsize)
-+{
-+	errcode_t	retval;
-+	int		extra_bytes = 0;
-+	
-+	EXT2_CHECK_MAGIC(scan, EXT2_ET_MAGIC_INODE_SCAN);
-+
-+	/*
-+	 * Do we need to start reading a new block group?
-+	 */
-+	if (scan->inodes_left <= 0) {
-+	force_new_group:
-+		if (scan->done_group) {
-+			retval = (scan->done_group)
-+				(scan->fs, scan, scan->current_group,
-+				 scan->done_group_data);
-+			if (retval)
-+				return retval;
-+		}
-+		if (scan->groups_left <= 0) {
-+			*ino = 0;
-+			return 0;
-+		}
-+		retval = get_next_blockgroup(scan);
-+		if (retval)
-+			return retval;
-+	}
-+	/*
-+	 * This is done outside the above if statement so that the
-+	 * check can be done for block group #0.
-+	 */
-+	if (scan->current_block == 0) {
-+		if (scan->scan_flags & EXT2_SF_SKIP_MISSING_ITABLE) {
-+			goto force_new_group;
-+		} else
-+			return EXT2_ET_MISSING_INODE_TABLE;
-+	}
-+	
-+
-+	/*
-+	 * Have we run out of space in the inode buffer?  If so, we
-+	 * need to read in more blocks.
-+	 */
-+	if (scan->bytes_left < scan->inode_size) {
-+		memcpy(scan->temp_buffer, scan->ptr, scan->bytes_left);
-+		extra_bytes = scan->bytes_left;
-+
-+		retval = get_next_blocks(scan);
-+		if (retval)
-+			return retval;
-+#if 0
-+		/*
-+		 * XXX test  Need check for used inode somehow.
-+		 * (Note: this is hard.)
-+		 */
-+		if (is_empty_scan(scan))
-+			goto force_new_group;
-+#endif
-+	}
-+
-+	retval = 0;
-+	if (extra_bytes) {
-+		memcpy(scan->temp_buffer+extra_bytes, scan->ptr,
-+		       scan->inode_size - extra_bytes);
-+		scan->ptr += scan->inode_size - extra_bytes;
-+		scan->bytes_left -= scan->inode_size - extra_bytes;
-+
-+#ifdef EXT2FS_ENABLE_SWAPFS
-+		if ((scan->fs->flags & EXT2_FLAG_SWAP_BYTES) ||
-+		    (scan->fs->flags & EXT2_FLAG_SWAP_BYTES_READ))
-+			ext2fs_swap_inode_full(scan->fs, 
-+				(struct ext2_inode_large *) inode,
-+				(struct ext2_inode_large *) scan->temp_buffer, 
-+				0, bufsize);
-+		else
-+#endif
-+			*inode = *((struct ext2_inode *) scan->temp_buffer);
-+		if (scan->scan_flags & EXT2_SF_BAD_EXTRA_BYTES)
-+			retval = EXT2_ET_BAD_BLOCK_IN_INODE_TABLE;
-+		scan->scan_flags &= ~EXT2_SF_BAD_EXTRA_BYTES;
-+	} else {
-+#ifdef EXT2FS_ENABLE_SWAPFS
-+		if ((scan->fs->flags & EXT2_FLAG_SWAP_BYTES) ||
-+		    (scan->fs->flags & EXT2_FLAG_SWAP_BYTES_READ))
-+			ext2fs_swap_inode_full(scan->fs, 
-+				(struct ext2_inode_large *) inode,
-+				(struct ext2_inode_large *) scan->ptr,
-+				0, bufsize);
-+		else
-+#endif
-+			memcpy(inode, scan->ptr, bufsize);
-+		scan->ptr += scan->inode_size;
-+		scan->bytes_left -= scan->inode_size;
-+		if (scan->scan_flags & EXT2_SF_BAD_INODE_BLK)
-+			retval = EXT2_ET_BAD_BLOCK_IN_INODE_TABLE;
-+	}
-+
-+	scan->inodes_left--;
-+	scan->current_inode++;
-+	*ino = scan->current_inode;
-+	return retval;
-+}
-+
-+errcode_t ext2fs_get_next_inode(ext2_inode_scan scan, ext2_ino_t *ino,
-+				struct ext2_inode *inode)
-+{
-+	return ext2fs_get_next_inode_full(scan, ino, inode,
-+						sizeof(struct ext2_inode));
-+}
-+
-+/*
-+ * Functions to read and write a single inode.
-+ */
-+errcode_t ext2fs_read_inode_full(ext2_filsys fs, ext2_ino_t ino,
-+				 struct ext2_inode * inode, int bufsize)
-+{
-+	unsigned long 	group, block, block_nr, offset;
-+	char 		*ptr;
-+	errcode_t	retval;
-+	int 		clen, i, inodes_per_block, length;
-+	io_channel	io;
-+
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	/* Check to see if user has an override function */
-+	if (fs->read_inode) {
-+		retval = (fs->read_inode)(fs, ino, inode);
-+		if (retval != EXT2_ET_CALLBACK_NOTHANDLED)
-+			return retval;
-+	}
-+	/* Create inode cache if not present */
-+	if (!fs->icache) {
-+		retval = create_icache(fs);
-+		if (retval)
-+			return retval;
-+	}
-+	/* Check to see if it's in the inode cache */
-+	if (bufsize == sizeof(struct ext2_inode)) {
-+		/* only old good inode can be retrieve from the cache */
-+		for (i=0; i < fs->icache->cache_size; i++) {
-+			if (fs->icache->cache[i].ino == ino) {
-+				*inode = fs->icache->cache[i].inode;
-+				return 0;
-+			}
-+		}
-+	}
-+	if ((ino == 0) || (ino > fs->super->s_inodes_count))
-+		return EXT2_ET_BAD_INODE_NUM;
-+	if (fs->flags & EXT2_FLAG_IMAGE_FILE) {
-+		inodes_per_block = fs->blocksize / EXT2_INODE_SIZE(fs->super);
-+		block_nr = fs->image_header->offset_inode / fs->blocksize;
-+		block_nr += (ino - 1) / inodes_per_block;
-+		offset = ((ino - 1) % inodes_per_block) *
-+			EXT2_INODE_SIZE(fs->super);
-+		io = fs->image_io;
-+	} else {
-+		group = (ino - 1) / EXT2_INODES_PER_GROUP(fs->super);
-+		offset = ((ino - 1) % EXT2_INODES_PER_GROUP(fs->super)) *
-+			EXT2_INODE_SIZE(fs->super);
-+		block = offset >> EXT2_BLOCK_SIZE_BITS(fs->super);
-+		if (!fs->group_desc[(unsigned)group].bg_inode_table)
-+			return EXT2_ET_MISSING_INODE_TABLE;
-+		block_nr = fs->group_desc[(unsigned)group].bg_inode_table + 
-+			block;
-+		io = fs->io;
-+	}
-+	offset &= (EXT2_BLOCK_SIZE(fs->super) - 1);
-+
-+	length = EXT2_INODE_SIZE(fs->super);
-+	if (bufsize < length)
-+		length = bufsize;
-+
-+	ptr = (char *) inode;
-+	while (length) {
-+		clen = length;
-+		if ((offset + length) > fs->blocksize)
-+			clen = fs->blocksize - offset;
-+
-+		if (block_nr != fs->icache->buffer_blk) {
-+			retval = io_channel_read_blk(io, block_nr, 1,
-+						     fs->icache->buffer);
-+			if (retval)
-+				return retval;
-+			fs->icache->buffer_blk = block_nr;
-+		}
-+
-+		memcpy(ptr, ((char *) fs->icache->buffer) + (unsigned) offset,
-+		       clen);
-+
-+		offset = 0;
-+		length -= clen;
-+		ptr += clen;
-+		block_nr++;
-+	}
-+
-+#ifdef EXT2FS_ENABLE_SWAPFS
-+	if ((fs->flags & EXT2_FLAG_SWAP_BYTES) ||
-+	    (fs->flags & EXT2_FLAG_SWAP_BYTES_READ))
-+		ext2fs_swap_inode_full(fs, (struct ext2_inode_large *) inode, 
-+				       (struct ext2_inode_large *) inode, 
-+				       0, length);
-+#endif
-+
-+	/* Update the inode cache */
-+	fs->icache->cache_last = (fs->icache->cache_last + 1) %
-+		fs->icache->cache_size;
-+	fs->icache->cache[fs->icache->cache_last].ino = ino;
-+	fs->icache->cache[fs->icache->cache_last].inode = *inode;
-+	
-+	return 0;
-+}
-+
-+errcode_t ext2fs_read_inode(ext2_filsys fs, ext2_ino_t ino,
-+			    struct ext2_inode * inode)
-+{
-+	return ext2fs_read_inode_full(fs, ino, inode,
-+					sizeof(struct ext2_inode));
-+}
-+
-+errcode_t ext2fs_write_inode_full(ext2_filsys fs, ext2_ino_t ino,
-+				  struct ext2_inode * inode, int bufsize)
-+{
-+	unsigned long group, block, block_nr, offset;
-+	errcode_t retval = 0;
-+	struct ext2_inode_large temp_inode, *w_inode;
-+	char *ptr;
-+	int clen, i, length;
-+
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	/* Check to see if user provided an override function */
-+	if (fs->write_inode) {
-+		retval = (fs->write_inode)(fs, ino, inode);
-+		if (retval != EXT2_ET_CALLBACK_NOTHANDLED)
-+			return retval;
-+	}
-+
-+	/* Check to see if the inode cache needs to be updated */
-+	if (fs->icache) {
-+		for (i=0; i < fs->icache->cache_size; i++) {
-+			if (fs->icache->cache[i].ino == ino) {
-+				fs->icache->cache[i].inode = *inode;
-+				break;
-+			}
-+		}
-+	} else {
-+		retval = create_icache(fs);
-+		if (retval)
-+			return retval;
-+	}
-+		
-+	if (!(fs->flags & EXT2_FLAG_RW))
-+		return EXT2_ET_RO_FILSYS;
-+
-+	if ((ino == 0) || (ino > fs->super->s_inodes_count))
-+		return EXT2_ET_BAD_INODE_NUM;
-+
-+	length = bufsize;
-+	if (length < EXT2_INODE_SIZE(fs->super))
-+		length = EXT2_INODE_SIZE(fs->super);
-+
-+	if (length > (int) sizeof(struct ext2_inode_large)) {
-+		w_inode = malloc(length);
-+		if (!w_inode)
-+			return ENOMEM;
-+	} else
-+		w_inode = &temp_inode;
-+	memset(w_inode, 0, length);
-+
-+#ifdef EXT2FS_ENABLE_SWAPFS
-+	if ((fs->flags & EXT2_FLAG_SWAP_BYTES) ||
-+	    (fs->flags & EXT2_FLAG_SWAP_BYTES_WRITE))
-+		ext2fs_swap_inode_full(fs, w_inode, 
-+				       (struct ext2_inode_large *) inode, 
-+				       1, bufsize);
-+	else
-+#endif
-+		memcpy(w_inode, inode, bufsize);
-+	
-+	group = (ino - 1) / EXT2_INODES_PER_GROUP(fs->super);
-+	offset = ((ino - 1) % EXT2_INODES_PER_GROUP(fs->super)) *
-+		EXT2_INODE_SIZE(fs->super);
-+	block = offset >> EXT2_BLOCK_SIZE_BITS(fs->super);
-+	if (!fs->group_desc[(unsigned) group].bg_inode_table)
-+		return EXT2_ET_MISSING_INODE_TABLE;
-+	block_nr = fs->group_desc[(unsigned) group].bg_inode_table + block;
-+
-+	offset &= (EXT2_BLOCK_SIZE(fs->super) - 1);
-+
-+	length = EXT2_INODE_SIZE(fs->super);
-+	if (length > bufsize)
-+		length = bufsize;
-+
-+	ptr = (char *) w_inode;
-+
-+	while (length) {
-+		clen = length;
-+		if ((offset + length) > fs->blocksize)
-+			clen = fs->blocksize - offset;
-+
-+		if (fs->icache->buffer_blk != block_nr) {
-+			retval = io_channel_read_blk(fs->io, block_nr, 1,
-+						     fs->icache->buffer);
-+			if (retval)
-+				goto errout;
-+			fs->icache->buffer_blk = block_nr;
-+		}
-+
-+	
-+		memcpy((char *) fs->icache->buffer + (unsigned) offset, 
-+		       ptr, clen);
-+
-+		retval = io_channel_write_blk(fs->io, block_nr, 1, 
-+					      fs->icache->buffer);
-+		if (retval)
-+			goto errout;
-+
-+		offset = 0;
-+		ptr += clen;
-+		length -= clen;
-+		block_nr++;
-+	}
-+		
-+	fs->flags |= EXT2_FLAG_CHANGED;
-+errout:
-+	if (w_inode && w_inode != &temp_inode)
-+		free(w_inode);
-+	return retval;
-+}
-+
-+errcode_t ext2fs_write_inode(ext2_filsys fs, ext2_ino_t ino,
-+			     struct ext2_inode *inode)
-+{
-+	return ext2fs_write_inode_full(fs, ino, inode,
-+				       sizeof(struct ext2_inode));
-+}
-+
-+/* 
-+ * This function should be called when writing a new inode.  It makes
-+ * sure that extra part of large inodes is initialized properly.
-+ */
-+errcode_t ext2fs_write_new_inode(ext2_filsys fs, ext2_ino_t ino,
-+				 struct ext2_inode *inode)
-+{
-+	struct ext2_inode	*buf;
-+	int 			size = EXT2_INODE_SIZE(fs->super);
-+	struct ext2_inode_large	*large_inode;
-+
-+	if (size == sizeof(struct ext2_inode))
-+		return ext2fs_write_inode_full(fs, ino, inode,
-+					       sizeof(struct ext2_inode));
-+
-+	buf = malloc(size);
-+	if (!buf)
-+		return ENOMEM;
-+
-+	memset(buf, 0, size);
-+	*buf = *inode;
-+
-+	large_inode = (struct ext2_inode_large *) buf;
-+	large_inode->i_extra_isize = sizeof(struct ext2_inode_large) - 
-+		EXT2_GOOD_OLD_INODE_SIZE;
-+
-+	return ext2fs_write_inode_full(fs, ino, buf, size);
-+}
-+
-+ 
-+errcode_t ext2fs_get_blocks(ext2_filsys fs, ext2_ino_t ino, blk_t *blocks)
-+{
-+	struct ext2_inode	inode;
-+	int			i;
-+	errcode_t		retval;
-+	
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	if (ino > fs->super->s_inodes_count)
-+		return EXT2_ET_BAD_INODE_NUM;
-+
-+	if (fs->get_blocks) {
-+		if (!(*fs->get_blocks)(fs, ino, blocks))
-+			return 0;
-+	}
-+	retval = ext2fs_read_inode(fs, ino, &inode);
-+	if (retval)
-+		return retval;
-+	for (i=0; i < EXT2_N_BLOCKS; i++)
-+		blocks[i] = inode.i_block[i];
-+	return 0;
-+}
-+
-+errcode_t ext2fs_check_directory(ext2_filsys fs, ext2_ino_t ino)
-+{
-+	struct	ext2_inode	inode;
-+	errcode_t		retval;
-+	
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	if (ino > fs->super->s_inodes_count)
-+		return EXT2_ET_BAD_INODE_NUM;
-+
-+	if (fs->check_directory) {
-+		retval = (fs->check_directory)(fs, ino);
-+		if (retval != EXT2_ET_CALLBACK_NOTHANDLED)
-+			return retval;
-+	}
-+	retval = ext2fs_read_inode(fs, ino, &inode);
-+	if (retval)
-+		return retval;
-+	if (!LINUX_S_ISDIR(inode.i_mode))
-+		return EXT2_ET_NO_DIRECTORY;
-+	return 0;
-+}
-+
-diff -Naur silo-1.4.13.orig/libext2fs/inode_io.c silo-1.4.13/libext2fs/inode_io.c
---- silo-1.4.13.orig/libext2fs/inode_io.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/inode_io.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,270 @@
-+/*
-+ * inode_io.c --- This is allows an inode in an ext2 filesystem image
-+ * 	to be accessed via the I/O manager interface.
-+ *
-+ * Copyright (C) 2002 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#if HAVE_ERRNO_H
-+#include <errno.h>
-+#endif
-+#include <time.h>
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+/*
-+ * For checking structure magic numbers...
-+ */
-+
-+#define EXT2_CHECK_MAGIC(struct, code) \
-+	  if ((struct)->magic != (code)) return (code)
-+
-+struct inode_private_data {
-+	int				magic;
-+	char				name[32];
-+	ext2_file_t			file;
-+	ext2_filsys			fs;
-+	ext2_ino_t 			ino;
-+	struct ext2_inode		inode;
-+	int				flags;
-+	struct inode_private_data	*next;
-+};
-+
-+#define CHANNEL_HAS_INODE	0x8000
-+
-+static struct inode_private_data *top_intern;
-+static int ino_unique = 0;
-+
-+static errcode_t inode_open(const char *name, int flags, io_channel *channel);
-+static errcode_t inode_close(io_channel channel);
-+static errcode_t inode_set_blksize(io_channel channel, int blksize);
-+static errcode_t inode_read_blk(io_channel channel, unsigned long block,
-+			       int count, void *data);
-+static errcode_t inode_write_blk(io_channel channel, unsigned long block,
-+				int count, const void *data);
-+static errcode_t inode_flush(io_channel channel);
-+static errcode_t inode_write_byte(io_channel channel, unsigned long offset,
-+				int size, const void *data);
-+
-+static struct struct_io_manager struct_inode_manager = {
-+	EXT2_ET_MAGIC_IO_MANAGER,
-+	"Inode I/O Manager",
-+	inode_open,
-+	inode_close,
-+	inode_set_blksize,
-+	inode_read_blk,
-+	inode_write_blk,
-+	inode_flush,
-+	inode_write_byte
-+};
-+
-+io_manager inode_io_manager = &struct_inode_manager;
-+
-+errcode_t ext2fs_inode_io_intern2(ext2_filsys fs, ext2_ino_t ino,
-+				  struct ext2_inode *inode,
-+				  char **name)
-+{
-+	struct inode_private_data 	*data;
-+	errcode_t			retval;
-+
-+	if ((retval = ext2fs_get_mem(sizeof(struct inode_private_data),
-+				     &data)))
-+		return retval;
-+	data->magic = EXT2_ET_MAGIC_INODE_IO_CHANNEL;
-+	sprintf(data->name, "%u:%d", ino, ino_unique++);
-+	data->file = 0;
-+	data->fs = fs;
-+	data->ino = ino;
-+	data->flags = 0;
-+	if (inode) {
-+		memcpy(&data->inode, inode, sizeof(struct ext2_inode));
-+		data->flags |= CHANNEL_HAS_INODE;
-+	}
-+	data->next = top_intern;
-+	top_intern = data;
-+	*name = data->name;
-+	return 0;
-+}
-+
-+errcode_t ext2fs_inode_io_intern(ext2_filsys fs, ext2_ino_t ino,
-+				 char **name)
-+{
-+	return ext2fs_inode_io_intern2(fs, ino, NULL, name);
-+}
-+
-+
-+static errcode_t inode_open(const char *name, int flags, io_channel *channel)
-+{
-+	io_channel	io = NULL;
-+	struct inode_private_data *prev, *data = NULL;
-+	errcode_t	retval;
-+	int		open_flags;
-+
-+	if (name == 0)
-+		return EXT2_ET_BAD_DEVICE_NAME;
-+
-+	for (data = top_intern, prev = NULL; data;
-+	     prev = data, data = data->next)
-+		if (strcmp(name, data->name) == 0)
-+			break;
-+	if (!data)
-+		return ENOENT;
-+	if (prev)
-+		prev->next = data->next;
-+	else
-+		top_intern = data->next;
-+
-+	retval = ext2fs_get_mem(sizeof(struct struct_io_channel), &io);
-+	if (retval)
-+		goto cleanup;
-+	memset(io, 0, sizeof(struct struct_io_channel));
-+
-+	io->magic = EXT2_ET_MAGIC_IO_CHANNEL;
-+	io->manager = inode_io_manager;
-+	retval = ext2fs_get_mem(strlen(name)+1, &io->name);
-+	if (retval)
-+		goto cleanup;
-+
-+	strcpy(io->name, name);
-+	io->private_data = data;
-+	io->block_size = 1024;
-+	io->read_error = 0;
-+	io->write_error = 0;
-+	io->refcount = 1;
-+
-+	open_flags = (flags & IO_FLAG_RW) ? EXT2_FILE_WRITE : 0;
-+	retval = ext2fs_file_open2(data->fs, data->ino,
-+				   (data->flags & CHANNEL_HAS_INODE) ?
-+				   &data->inode : 0, open_flags,
-+				   &data->file);
-+	if (retval)
-+		goto cleanup;
-+		
-+	*channel = io;
-+	return 0;
-+
-+cleanup:
-+	if (data) {
-+		ext2fs_free_mem(&data);
-+	}
-+	if (io)
-+		ext2fs_free_mem(&io);
-+	return retval;
-+}
-+
-+static errcode_t inode_close(io_channel channel)
-+{
-+	struct inode_private_data *data;
-+	errcode_t	retval = 0;
-+
-+	EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
-+	data = (struct inode_private_data *) channel->private_data;
-+	EXT2_CHECK_MAGIC(data, EXT2_ET_MAGIC_INODE_IO_CHANNEL);
-+
-+	if (--channel->refcount > 0)
-+		return 0;
-+
-+	retval = ext2fs_file_close(data->file);
-+	
-+	ext2fs_free_mem(&channel->private_data);
-+	if (channel->name)
-+		ext2fs_free_mem(&channel->name);
-+	ext2fs_free_mem(&channel);
-+	return retval;
-+}
-+
-+static errcode_t inode_set_blksize(io_channel channel, int blksize)
-+{
-+	struct inode_private_data *data;
-+
-+	EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
-+	data = (struct inode_private_data *) channel->private_data;
-+	EXT2_CHECK_MAGIC(data, EXT2_ET_MAGIC_INODE_IO_CHANNEL);
-+
-+	channel->block_size = blksize;
-+	return 0;
-+}
-+
-+
-+static errcode_t inode_read_blk(io_channel channel, unsigned long block,
-+			       int count, void *buf)
-+{
-+	struct inode_private_data *data;
-+	errcode_t	retval;
-+
-+	EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
-+	data = (struct inode_private_data *) channel->private_data;
-+	EXT2_CHECK_MAGIC(data, EXT2_ET_MAGIC_INODE_IO_CHANNEL);
-+
-+	if ((retval = ext2fs_file_lseek(data->file,
-+					block * channel->block_size,
-+					EXT2_SEEK_SET, 0)))
-+		return retval;
-+
-+	count = (count < 0) ? -count : (count * channel->block_size);
-+
-+	return ext2fs_file_read(data->file, buf, count, 0);
-+}
-+
-+static errcode_t inode_write_blk(io_channel channel, unsigned long block,
-+				int count, const void *buf)
-+{
-+	struct inode_private_data *data;
-+	errcode_t	retval;
-+
-+	EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
-+	data = (struct inode_private_data *) channel->private_data;
-+	EXT2_CHECK_MAGIC(data, EXT2_ET_MAGIC_INODE_IO_CHANNEL);
-+
-+	if ((retval = ext2fs_file_lseek(data->file,
-+					block * channel->block_size,
-+					EXT2_SEEK_SET, 0)))
-+		return retval;
-+
-+	count = (count < 0) ? -count : (count * channel->block_size);
-+
-+	return ext2fs_file_write(data->file, buf, count, 0);
-+}
-+
-+static errcode_t inode_write_byte(io_channel channel, unsigned long offset,
-+				 int size, const void *buf)
-+{
-+	struct inode_private_data *data;
-+	errcode_t	retval = 0;
-+
-+	EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
-+	data = (struct inode_private_data *) channel->private_data;
-+	EXT2_CHECK_MAGIC(data, EXT2_ET_MAGIC_INODE_IO_CHANNEL);
-+
-+	if ((retval = ext2fs_file_lseek(data->file, offset,
-+					EXT2_SEEK_SET, 0)))
-+		return retval;
-+
-+	return ext2fs_file_write(data->file, buf, size, 0);
-+}
-+
-+/*
-+ * Flush data buffers to disk.  
-+ */
-+static errcode_t inode_flush(io_channel channel)
-+{
-+	struct inode_private_data *data;
-+	
-+	EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
-+	data = (struct inode_private_data *) channel->private_data;
-+	EXT2_CHECK_MAGIC(data, EXT2_ET_MAGIC_INODE_IO_CHANNEL);
-+
-+	return ext2fs_file_flush(data->file);
-+}
-+
-diff -Naur silo-1.4.13.orig/libext2fs/io_manager.c silo-1.4.13/libext2fs/io_manager.c
---- silo-1.4.13.orig/libext2fs/io_manager.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/io_manager.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,69 @@
-+/*
-+ * io_manager.c --- the I/O manager abstraction
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <fcntl.h>
-+#include <time.h>
-+#if HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+errcode_t io_channel_set_options(io_channel channel, const char *opts)
-+{
-+	errcode_t retval = 0;
-+	char *next, *ptr, *options, *arg;
-+
-+	EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
-+
-+	if (!opts)
-+		return 0;
-+
-+	if (!channel->manager->set_option)
-+		return EXT2_ET_INVALID_ARGUMENT;
-+
-+	options = malloc(strlen(opts)+1);
-+	if (!options)
-+		return EXT2_ET_NO_MEMORY;
-+	strcpy(options, opts);
-+	ptr = options;
-+
-+	while (ptr && *ptr) {
-+		next = strchr(ptr, '&');
-+		if (next)
-+			*next++ = 0;
-+
-+		arg = strchr(ptr, '=');
-+		if (arg)
-+			*arg++ = 0;
-+
-+		retval = (channel->manager->set_option)(channel, ptr, arg);
-+		if (retval)
-+			break;
-+		ptr = next;
-+	}
-+	free(options);
-+	return retval;
-+}
-+
-+errcode_t io_channel_write_byte(io_channel channel, unsigned long offset,
-+				int count, const void *data)
-+{
-+	EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
-+
-+	if (channel->manager->write_byte) 
-+		return channel->manager->write_byte(channel, offset, 
-+						    count, data);
-+
-+	return EXT2_ET_UNIMPLEMENTED;
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/irel.h silo-1.4.13/libext2fs/irel.h
---- silo-1.4.13.orig/libext2fs/irel.h	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/irel.h	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,114 @@
-+/*
-+ * irel.h
-+ * 
-+ * Copyright (C) 1996, 1997 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+struct ext2_inode_reference {
-+	blk_t	block;
-+	__u16 offset;
-+};
-+
-+struct ext2_inode_relocate_entry {
-+	ext2_ino_t	new;
-+	ext2_ino_t	orig;
-+	__u16		flags;
-+	__u16		max_refs;
-+};
-+
-+typedef struct ext2_inode_relocation_table *ext2_irel;
-+
-+struct ext2_inode_relocation_table {
-+	__u32	magic;
-+	char	*name;
-+	ext2_ino_t	current;
-+	void	*priv_data;
-+
-+	/*
-+	 * Add an inode relocation entry.
-+	 */
-+	errcode_t (*put)(ext2_irel irel, ext2_ino_t old,
-+			      struct ext2_inode_relocate_entry *ent);
-+	/*
-+	 * Get an inode relocation entry.
-+	 */
-+	errcode_t (*get)(ext2_irel irel, ext2_ino_t old,
-+			      struct ext2_inode_relocate_entry *ent);
-+
-+	/*
-+	 * Get an inode relocation entry by its original inode number
-+	 */
-+	errcode_t (*get_by_orig)(ext2_irel irel, ext2_ino_t orig, ext2_ino_t *old,
-+				 struct ext2_inode_relocate_entry *ent);
-+
-+	/*
-+	 * Initialize for iterating over the inode relocation entries.
-+	 */
-+	errcode_t (*start_iter)(ext2_irel irel);
-+
-+	/*
-+	 * The iterator function for the inode relocation entries.
-+	 * Returns an inode number of 0 when out of entries.
-+	 */
-+	errcode_t (*next)(ext2_irel irel, ext2_ino_t *old,
-+			  struct ext2_inode_relocate_entry *ent);
-+
-+	/*
-+	 * Add an inode reference (i.e., note the fact that a
-+	 * particular block/offset contains a reference to an inode)
-+	 */
-+	errcode_t (*add_ref)(ext2_irel irel, ext2_ino_t ino,
-+			     struct ext2_inode_reference *ref);
-+
-+	/*
-+	 * Initialize for iterating over the inode references for a
-+	 * particular inode.
-+	 */
-+	errcode_t (*start_iter_ref)(ext2_irel irel, ext2_ino_t ino);
-+
-+	/*
-+	 * The iterator function for the inode references for an
-+	 * inode.  The references for only one inode can be interator
-+	 * over at a time, as the iterator state is stored in ext2_irel.
-+	 */
-+	errcode_t (*next_ref)(ext2_irel irel,
-+			      struct ext2_inode_reference *ref);
-+
-+	/*
-+	 * Move the inode relocation table from one inode number to
-+	 * another.  Note that the inode references also must move.
-+	 */
-+	errcode_t (*move)(ext2_irel irel, ext2_ino_t old, ext2_ino_t new);
-+
-+	/*
-+	 * Remove an inode relocation entry, along with all of the
-+	 * inode references.
-+	 */
-+	errcode_t (*delete)(ext2_irel irel, ext2_ino_t old);
-+
-+	/*
-+	 * Free the inode relocation table.
-+	 */
-+	errcode_t (*free)(ext2_irel irel);
-+};
-+
-+errcode_t ext2fs_irel_memarray_create(char *name, ext2_ino_t max_inode,
-+				    ext2_irel *irel);
-+
-+#define ext2fs_irel_put(irel, old, ent) ((irel)->put((irel), old, ent))
-+#define ext2fs_irel_get(irel, old, ent) ((irel)->get((irel), old, ent))
-+#define ext2fs_irel_get_by_orig(irel, orig, old, ent) \
-+			((irel)->get_by_orig((irel), orig, old, ent))
-+#define ext2fs_irel_start_iter(irel) ((irel)->start_iter((irel)))
-+#define ext2fs_irel_next(irel, old, ent) ((irel)->next((irel), old, ent))
-+#define ext2fs_irel_add_ref(irel, ino, ref) ((irel)->add_ref((irel), ino, ref))
-+#define ext2fs_irel_start_iter_ref(irel, ino) ((irel)->start_iter_ref((irel), ino))
-+#define ext2fs_irel_next_ref(irel, ref) ((irel)->next_ref((irel), ref))
-+#define ext2fs_irel_move(irel, old, new) ((irel)->move((irel), old, new))
-+#define ext2fs_irel_delete(irel, old) ((irel)->delete((irel), old))
-+#define ext2fs_irel_free(irel) ((irel)->free((irel)))
-diff -Naur silo-1.4.13.orig/libext2fs/irel_ma.c silo-1.4.13/libext2fs/irel_ma.c
---- silo-1.4.13.orig/libext2fs/irel_ma.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/irel_ma.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,372 @@
-+/*
-+ * irel_ma.c
-+ * 
-+ * Copyright (C) 1996, 1997 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <fcntl.h>
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#if HAVE_ERRNO_H
-+#include <errno.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+#include "irel.h"
-+
-+static errcode_t ima_put(ext2_irel irel, ext2_ino_t old,
-+			 struct ext2_inode_relocate_entry *ent);
-+static errcode_t ima_get(ext2_irel irel, ext2_ino_t old,
-+			 struct ext2_inode_relocate_entry *ent);
-+static errcode_t ima_get_by_orig(ext2_irel irel, ext2_ino_t orig, ext2_ino_t *old,
-+				 struct ext2_inode_relocate_entry *ent);
-+static errcode_t ima_start_iter(ext2_irel irel);
-+static errcode_t ima_next(ext2_irel irel, ext2_ino_t *old,
-+			  struct ext2_inode_relocate_entry *ent);
-+static errcode_t ima_add_ref(ext2_irel irel, ext2_ino_t ino,
-+			     struct ext2_inode_reference *ref);
-+static errcode_t ima_start_iter_ref(ext2_irel irel, ext2_ino_t ino);
-+static errcode_t ima_next_ref(ext2_irel irel, struct ext2_inode_reference *ref);
-+static errcode_t ima_move(ext2_irel irel, ext2_ino_t old, ext2_ino_t new);
-+static errcode_t ima_delete(ext2_irel irel, ext2_ino_t old);
-+static errcode_t ima_free(ext2_irel irel);
-+
-+/*
-+ * This data structure stores the array of inode references; there is
-+ * a structure for each inode.
-+ */
-+struct inode_reference_entry {
-+	__u16 num;
-+	struct ext2_inode_reference *refs;
-+};
-+
-+struct irel_ma {
-+	__u32 magic;
-+	ext2_ino_t max_inode;
-+	ext2_ino_t ref_current;
-+	int   ref_iter;
-+	ext2_ino_t	*orig_map;
-+	struct ext2_inode_relocate_entry *entries;
-+	struct inode_reference_entry *ref_entries;
-+};
-+
-+errcode_t ext2fs_irel_memarray_create(char *name, ext2_ino_t max_inode,
-+				      ext2_irel *new_irel)
-+{
-+	ext2_irel		irel = 0;
-+	errcode_t	retval;
-+	struct irel_ma 	*ma = 0;
-+	size_t		size;
-+
-+	*new_irel = 0;
-+
-+	/*
-+	 * Allocate memory structures
-+	 */
-+	retval = ext2fs_get_mem(sizeof(struct ext2_inode_relocation_table),
-+				&irel);
-+	if (retval)
-+		goto errout;
-+	memset(irel, 0, sizeof(struct ext2_inode_relocation_table));
-+	
-+	retval = ext2fs_get_mem(strlen(name)+1, &irel->name);
-+	if (retval)
-+		goto errout;
-+	strcpy(irel->name, name);
-+	
-+	retval = ext2fs_get_mem(sizeof(struct irel_ma), &ma);
-+	if (retval)
-+		goto errout;
-+	memset(ma, 0, sizeof(struct irel_ma));
-+	irel->priv_data = ma;
-+	
-+	size = (size_t) (sizeof(ext2_ino_t) * (max_inode+1));
-+	retval = ext2fs_get_mem(size, &ma->orig_map);
-+	if (retval)
-+		goto errout;
-+	memset(ma->orig_map, 0, size);
-+
-+	size = (size_t) (sizeof(struct ext2_inode_relocate_entry) *
-+			 (max_inode+1));
-+	retval = ext2fs_get_mem(size, &ma->entries);
-+	if (retval)
-+		goto errout;
-+	memset(ma->entries, 0, size);
-+
-+	size = (size_t) (sizeof(struct inode_reference_entry) *
-+			 (max_inode+1));
-+	retval = ext2fs_get_mem(size, &ma->ref_entries);
-+	if (retval)
-+		goto errout;
-+	memset(ma->ref_entries, 0, size);
-+	ma->max_inode = max_inode;
-+
-+	/*
-+	 * Fill in the irel data structure
-+	 */
-+	irel->put = ima_put;
-+	irel->get = ima_get;
-+	irel->get_by_orig = ima_get_by_orig;
-+	irel->start_iter = ima_start_iter;
-+	irel->next = ima_next;
-+	irel->add_ref = ima_add_ref;
-+	irel->start_iter_ref = ima_start_iter_ref;
-+	irel->next_ref = ima_next_ref;
-+	irel->move = ima_move;
-+	irel->delete = ima_delete;
-+	irel->free = ima_free;
-+	
-+	*new_irel = irel;
-+	return 0;
-+
-+errout:
-+	ima_free(irel);
-+	return retval;
-+}
-+
-+static errcode_t ima_put(ext2_irel irel, ext2_ino_t old,
-+			struct ext2_inode_relocate_entry *ent)
-+{
-+	struct inode_reference_entry	*ref_ent;
-+	struct irel_ma 			*ma;
-+	errcode_t			retval;
-+	size_t				size, old_size;
-+
-+	ma = irel->priv_data;
-+	if (old > ma->max_inode)
-+		return EXT2_ET_INVALID_ARGUMENT;
-+
-+	/*
-+	 * Force the orig field to the correct value; the application
-+	 * program shouldn't be messing with this field.
-+	 */
-+	if (ma->entries[(unsigned) old].new == 0)
-+		ent->orig = old;
-+	else
-+		ent->orig = ma->entries[(unsigned) old].orig;
-+	
-+	/*
-+	 * If max_refs has changed, reallocate the refs array
-+	 */
-+	ref_ent = ma->ref_entries + (unsigned) old;
-+	if (ref_ent->refs && ent->max_refs !=
-+	    ma->entries[(unsigned) old].max_refs) {
-+		size = (sizeof(struct ext2_inode_reference) * ent->max_refs);
-+		old_size = (sizeof(struct ext2_inode_reference) *
-+			    ma->entries[(unsigned) old].max_refs);
-+		retval = ext2fs_resize_mem(old_size, size, &ref_ent->refs);
-+		if (retval)
-+			return retval;
-+	}
-+
-+	ma->entries[(unsigned) old] = *ent;
-+	ma->orig_map[(unsigned) ent->orig] = old;
-+	return 0;
-+}
-+
-+static errcode_t ima_get(ext2_irel irel, ext2_ino_t old,
-+			struct ext2_inode_relocate_entry *ent)
-+{
-+	struct irel_ma 	*ma;
-+
-+	ma = irel->priv_data;
-+	if (old > ma->max_inode)
-+		return EXT2_ET_INVALID_ARGUMENT;
-+	if (ma->entries[(unsigned) old].new == 0)
-+		return ENOENT;
-+	*ent = ma->entries[(unsigned) old];
-+	return 0;
-+}
-+
-+static errcode_t ima_get_by_orig(ext2_irel irel, ext2_ino_t orig, ext2_ino_t *old,
-+			struct ext2_inode_relocate_entry *ent)
-+{
-+	struct irel_ma 	*ma;
-+	ext2_ino_t	ino;
-+
-+	ma = irel->priv_data;
-+	if (orig > ma->max_inode)
-+		return EXT2_ET_INVALID_ARGUMENT;
-+	ino = ma->orig_map[(unsigned) orig];
-+	if (ino == 0)
-+		return ENOENT;
-+	*old = ino;
-+	*ent = ma->entries[(unsigned) ino];
-+	return 0;
-+}
-+
-+static errcode_t ima_start_iter(ext2_irel irel)
-+{
-+	irel->current = 0;
-+	return 0;
-+}
-+
-+static errcode_t ima_next(ext2_irel irel, ext2_ino_t *old,
-+			 struct ext2_inode_relocate_entry *ent)
-+{
-+	struct irel_ma 	*ma;
-+
-+	ma = irel->priv_data;
-+	while (++irel->current < ma->max_inode) {
-+		if (ma->entries[(unsigned) irel->current].new == 0)
-+			continue;
-+		*old = irel->current;
-+		*ent = ma->entries[(unsigned) irel->current];
-+		return 0;
-+	}
-+	*old = 0;
-+	return 0;
-+}
-+
-+static errcode_t ima_add_ref(ext2_irel irel, ext2_ino_t ino,
-+			     struct ext2_inode_reference *ref)
-+{
-+	struct irel_ma 	*ma;
-+	size_t		size;
-+	struct inode_reference_entry *ref_ent;
-+	struct ext2_inode_relocate_entry *ent;
-+	errcode_t		retval;
-+
-+	ma = irel->priv_data;
-+	if (ino > ma->max_inode)
-+		return EXT2_ET_INVALID_ARGUMENT;
-+
-+	ref_ent = ma->ref_entries + (unsigned) ino;
-+	ent = ma->entries + (unsigned) ino;
-+	
-+	/*
-+	 * If the inode reference array doesn't exist, create it.
-+	 */
-+	if (ref_ent->refs == 0) {
-+		size = (size_t) ((sizeof(struct ext2_inode_reference) * 
-+				  ent->max_refs));
-+		retval = ext2fs_get_mem(size, &ref_ent->refs);
-+		if (retval)
-+			return retval;
-+		memset(ref_ent->refs, 0, size);
-+		ref_ent->num = 0;
-+	}
-+
-+	if (ref_ent->num >= ent->max_refs)
-+		return EXT2_ET_TOO_MANY_REFS;
-+
-+	ref_ent->refs[(unsigned) ref_ent->num++] = *ref;
-+	return 0;
-+}
-+
-+static errcode_t ima_start_iter_ref(ext2_irel irel, ext2_ino_t ino)
-+{
-+	struct irel_ma 	*ma;
-+
-+	ma = irel->priv_data;
-+	if (ino > ma->max_inode)
-+		return EXT2_ET_INVALID_ARGUMENT;
-+	if (ma->entries[(unsigned) ino].new == 0)
-+		return ENOENT;
-+	ma->ref_current = ino;
-+	ma->ref_iter = 0;
-+	return 0;
-+}
-+
-+static errcode_t ima_next_ref(ext2_irel irel,
-+			      struct ext2_inode_reference *ref)
-+{
-+	struct irel_ma 	*ma;
-+	struct inode_reference_entry *ref_ent;
-+
-+	ma = irel->priv_data;
-+	
-+	ref_ent = ma->ref_entries + ma->ref_current;
-+
-+	if ((ref_ent->refs == NULL) ||
-+	    (ma->ref_iter >= ref_ent->num)) {
-+		ref->block = 0;
-+		ref->offset = 0;
-+		return 0;
-+	}
-+	*ref = ref_ent->refs[ma->ref_iter++];
-+	return 0;
-+}
-+
-+
-+static errcode_t ima_move(ext2_irel irel, ext2_ino_t old, ext2_ino_t new)
-+{
-+	struct irel_ma 	*ma;
-+
-+	ma = irel->priv_data;
-+	if ((old > ma->max_inode) || (new > ma->max_inode))
-+		return EXT2_ET_INVALID_ARGUMENT;
-+	if (ma->entries[(unsigned) old].new == 0)
-+		return ENOENT;
-+	
-+	ma->entries[(unsigned) new] = ma->entries[(unsigned) old];
-+	if (ma->ref_entries[(unsigned) new].refs)
-+		ext2fs_free_mem(&ma->ref_entries[(unsigned) new].refs);
-+	ma->ref_entries[(unsigned) new] = ma->ref_entries[(unsigned) old];
-+	
-+	ma->entries[(unsigned) old].new = 0;
-+	ma->ref_entries[(unsigned) old].num = 0;
-+	ma->ref_entries[(unsigned) old].refs = 0;
-+
-+	ma->orig_map[ma->entries[new].orig] = new;
-+	return 0;
-+}
-+
-+static errcode_t ima_delete(ext2_irel irel, ext2_ino_t old)
-+{
-+	struct irel_ma 	*ma;
-+
-+	ma = irel->priv_data;
-+	if (old > ma->max_inode)
-+		return EXT2_ET_INVALID_ARGUMENT;
-+	if (ma->entries[(unsigned) old].new == 0)
-+		return ENOENT;
-+	
-+	ma->entries[old].new = 0;
-+	if (ma->ref_entries[(unsigned) old].refs)
-+		ext2fs_free_mem(&ma->ref_entries[(unsigned) old].refs);
-+	ma->orig_map[ma->entries[(unsigned) old].orig] = 0;
-+	
-+	ma->ref_entries[(unsigned) old].num = 0;
-+	ma->ref_entries[(unsigned) old].refs = 0;
-+	return 0;
-+}
-+
-+static errcode_t ima_free(ext2_irel irel)
-+{
-+	struct irel_ma 	*ma;
-+	ext2_ino_t	ino;
-+
-+	if (!irel)
-+		return 0;
-+
-+	ma = irel->priv_data;
-+
-+	if (ma) {
-+		if (ma->orig_map)
-+			ext2fs_free_mem(&ma->orig_map);
-+		if (ma->entries)
-+			ext2fs_free_mem(&ma->entries);
-+		if (ma->ref_entries) {
-+			for (ino = 0; ino <= ma->max_inode; ino++) {
-+				if (ma->ref_entries[(unsigned) ino].refs)
-+					ext2fs_free_mem(&ma->ref_entries[(unsigned) ino].refs);
-+			}
-+			ext2fs_free_mem(&ma->ref_entries);
-+		}
-+		ext2fs_free_mem(&ma);
-+	}
-+	if (irel->name)
-+		ext2fs_free_mem(&irel->name);
-+	ext2fs_free_mem(&irel);
-+	return 0;
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/ismounted.c silo-1.4.13/libext2fs/ismounted.c
---- silo-1.4.13.orig/libext2fs/ismounted.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/ismounted.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,377 @@
-+/*
-+ * ismounted.c --- Check to see if the filesystem was mounted
-+ * 
-+ * Copyright (C) 1995,1996,1997,1998,1999,2000 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#if HAVE_ERRNO_H
-+#include <errno.h>
-+#endif
-+#include <fcntl.h>
-+#ifdef HAVE_LINUX_FD_H
-+#include <linux/fd.h>
-+#endif
-+#ifdef HAVE_MNTENT_H
-+#include <mntent.h>
-+#endif
-+#ifdef HAVE_GETMNTINFO
-+#include <paths.h>
-+#include <sys/param.h>
-+#include <sys/mount.h>
-+#endif /* HAVE_GETMNTINFO */
-+#include <string.h>
-+#include <sys/stat.h>
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+#ifdef HAVE_MNTENT_H
-+/*
-+ * Helper function which checks a file in /etc/mtab format to see if a
-+ * filesystem is mounted.  Returns an error if the file doesn't exist
-+ * or can't be opened.  
-+ */
-+static errcode_t check_mntent_file(const char *mtab_file, const char *file, 
-+				   int *mount_flags, char *mtpt, int mtlen)
-+{
-+	struct mntent 	*mnt;
-+	struct stat	st_buf;
-+	errcode_t	retval = 0;
-+	dev_t		file_dev=0, file_rdev=0;
-+	ino_t		file_ino=0;
-+	FILE 		*f;
-+	int		fd;
-+
-+	*mount_flags = 0;
-+	if ((f = setmntent (mtab_file, "r")) == NULL)
-+		return errno;
-+	if (stat(file, &st_buf) == 0) {
-+		if (S_ISBLK(st_buf.st_mode)) {
-+#ifndef __GNU__ /* The GNU hurd is broken with respect to stat devices */
-+			file_rdev = st_buf.st_rdev;
-+#endif	/* __GNU__ */
-+		} else {
-+			file_dev = st_buf.st_dev;
-+			file_ino = st_buf.st_ino;
-+		}
-+	}
-+	while ((mnt = getmntent (f)) != NULL) {
-+		if (strcmp(file, mnt->mnt_fsname) == 0)
-+			break;
-+		if (stat(mnt->mnt_fsname, &st_buf) == 0) {
-+			if (S_ISBLK(st_buf.st_mode)) {
-+#ifndef __GNU__
-+				if (file_rdev && (file_rdev == st_buf.st_rdev))
-+					break;
-+#endif	/* __GNU__ */
-+			} else {
-+				if (file_dev && ((file_dev == st_buf.st_dev) &&
-+						 (file_ino == st_buf.st_ino)))
-+					break;
-+			}
-+		}
-+	}
-+
-+	if (mnt == 0) {
-+#ifndef __GNU__ /* The GNU hurd is broken with respect to stat devices */
-+		/*
-+		 * Do an extra check to see if this is the root device.  We
-+		 * can't trust /etc/mtab, and /proc/mounts will only list
-+		 * /dev/root for the root filesystem.  Argh.  Instead we
-+		 * check if the given device has the same major/minor number
-+		 * as the device that the root directory is on.
-+		 */
-+		if (file_rdev && stat("/", &st_buf) == 0) {
-+			if (st_buf.st_dev == file_rdev) {
-+				*mount_flags = EXT2_MF_MOUNTED;
-+				if (mtpt)
-+					strncpy(mtpt, "/", mtlen);
-+				goto is_root;
-+			}
-+		}
-+#endif	/* __GNU__ */
-+		goto errout;
-+	}
-+#ifndef __GNU__ /* The GNU hurd is deficient; what else is new? */
-+	/* Validate the entry in case /etc/mtab is out of date */
-+	/* 
-+	 * We need to be paranoid, because some broken distributions
-+	 * (read: Slackware) don't initialize /etc/mtab before checking
-+	 * all of the non-root filesystems on the disk.
-+	 */
-+	if (stat(mnt->mnt_dir, &st_buf) < 0) {
-+		retval = errno;
-+		if (retval == ENOENT) {
-+#ifdef DEBUG
-+			printf("Bogus entry in %s!  (%s does not exist)\n",
-+			       mtab_file, mnt->mnt_dir);
-+#endif /* DEBUG */
-+			retval = 0;
-+		}
-+		goto errout;
-+	}
-+	if (file_rdev && (st_buf.st_dev != file_rdev)) {
-+#ifdef DEBUG
-+		printf("Bogus entry in %s!  (%s not mounted on %s)\n",
-+		       mtab_file, file, mnt->mnt_dir);
-+#endif /* DEBUG */
-+		goto errout;
-+	}
-+#endif /* __GNU__ */
-+	*mount_flags = EXT2_MF_MOUNTED;
-+	
-+#ifdef MNTOPT_RO
-+	/* Check to see if the ro option is set */
-+	if (hasmntopt(mnt, MNTOPT_RO))
-+		*mount_flags |= EXT2_MF_READONLY;
-+#endif
-+
-+	if (mtpt)
-+		strncpy(mtpt, mnt->mnt_dir, mtlen);
-+	/*
-+	 * Check to see if we're referring to the root filesystem.
-+	 * If so, do a manual check to see if we can open /etc/mtab
-+	 * read/write, since if the root is mounted read/only, the
-+	 * contents of /etc/mtab may not be accurate.
-+	 */
-+	if (!strcmp(mnt->mnt_dir, "/")) {
-+is_root:
-+#define TEST_FILE "/.ismount-test-file"		
-+		*mount_flags |= EXT2_MF_ISROOT;
-+		fd = open(TEST_FILE, O_RDWR|O_CREAT);
-+		if (fd < 0) {
-+			if (errno == EROFS)
-+				*mount_flags |= EXT2_MF_READONLY;
-+		} else
-+			close(fd);
-+		(void) unlink(TEST_FILE);
-+	}
-+	retval = 0;
-+errout:
-+	endmntent (f);
-+	return retval;
-+}
-+
-+static errcode_t check_mntent(const char *file, int *mount_flags,
-+			      char *mtpt, int mtlen)
-+{
-+	errcode_t	retval;
-+
-+#ifdef DEBUG
-+	retval = check_mntent_file("/tmp/mtab", file, mount_flags,
-+				   mtpt, mtlen);
-+	if (retval == 0)
-+		return 0;
-+#endif /* DEBUG */
-+#ifdef __linux__
-+	retval = check_mntent_file("/proc/mounts", file, mount_flags,
-+				   mtpt, mtlen);
-+	if (retval == 0 && (*mount_flags != 0))
-+		return 0;
-+#endif /* __linux__ */
-+#if defined(MOUNTED) || defined(_PATH_MOUNTED)
-+#ifndef MOUNTED
-+#define MOUNTED _PATH_MOUNTED
-+#endif /* MOUNTED */
-+	retval = check_mntent_file(MOUNTED, file, mount_flags, mtpt, mtlen);
-+	return retval;
-+#else 
-+	*mount_flags = 0;
-+	return 0;
-+#endif /* defined(MOUNTED) || defined(_PATH_MOUNTED) */
-+}
-+
-+#else
-+#if defined(HAVE_GETMNTINFO)
-+
-+static errcode_t check_getmntinfo(const char *file, int *mount_flags,
-+				  char *mtpt, int mtlen)
-+{
-+	struct statfs *mp;
-+        int    len, n;
-+        const  char   *s1;
-+	char	*s2;
-+
-+        n = getmntinfo(&mp, MNT_NOWAIT);
-+        if (n == 0)
-+		return errno;
-+
-+        len = sizeof(_PATH_DEV) - 1;
-+        s1 = file;
-+        if (strncmp(_PATH_DEV, s1, len) == 0)
-+                s1 += len;
-+ 
-+	*mount_flags = 0;
-+        while (--n >= 0) {
-+                s2 = mp->f_mntfromname;
-+                if (strncmp(_PATH_DEV, s2, len) == 0) {
-+                        s2 += len - 1;
-+                        *s2 = 'r';
-+                }
-+                if (strcmp(s1, s2) == 0 || strcmp(s1, &s2[1]) == 0) {
-+			*mount_flags = EXT2_MF_MOUNTED;
-+			break;
-+		}
-+                ++mp;
-+	}
-+	if (mtpt)
-+		strncpy(mtpt, mp->f_mntonname, mtlen);
-+	return 0;
-+}
-+#endif /* HAVE_GETMNTINFO */
-+#endif /* HAVE_MNTENT_H */
-+
-+/*
-+ * Check to see if we're dealing with the swap device.
-+ */
-+static int is_swap_device(const char *file)
-+{
-+	FILE		*f;
-+	char		buf[1024], *cp;
-+	dev_t		file_dev;
-+	struct stat	st_buf;
-+	int		ret = 0;
-+
-+	file_dev = 0;
-+#ifndef __GNU__ /* The GNU hurd is broken with respect to stat devices */
-+	if ((stat(file, &st_buf) == 0) &&
-+	    S_ISBLK(st_buf.st_mode))
-+		file_dev = st_buf.st_rdev;
-+#endif	/* __GNU__ */
-+
-+	if (!(f = fopen("/proc/swaps", "r")))
-+		return 0;
-+	/* Skip the first line */
-+	fgets(buf, sizeof(buf), f);
-+	while (!feof(f)) {
-+		if (!fgets(buf, sizeof(buf), f))
-+			break;
-+		if ((cp = strchr(buf, ' ')) != NULL)
-+			*cp = 0;
-+		if ((cp = strchr(buf, '\t')) != NULL)
-+			*cp = 0;
-+		if (strcmp(buf, file) == 0) {
-+			ret++;
-+			break;
-+		}
-+#ifndef __GNU__
-+		if (file_dev && (stat(buf, &st_buf) == 0) &&
-+		    S_ISBLK(st_buf.st_mode) &&
-+		    file_dev == st_buf.st_rdev) {
-+			ret++;
-+			break;
-+		}
-+#endif 	/* __GNU__ */
-+	}
-+	fclose(f);
-+	return ret;
-+}
-+
-+
-+/*
-+ * ext2fs_check_mount_point() fills determines if the device is
-+ * mounted or otherwise busy, and fills in mount_flags with one or
-+ * more of the following flags: EXT2_MF_MOUNTED, EXT2_MF_ISROOT,
-+ * EXT2_MF_READONLY, EXT2_MF_SWAP, and EXT2_MF_BUSY.  If mtpt is
-+ * non-NULL, the directory where the device is mounted is copied to
-+ * where mtpt is pointing, up to mtlen characters.
-+ */
-+#ifdef __TURBOC__
-+ #pragma argsused
-+#endif
-+errcode_t ext2fs_check_mount_point(const char *device, int *mount_flags,
-+				  char *mtpt, int mtlen)
-+{
-+	struct stat	st_buf;
-+	errcode_t	retval = 0;
-+	int		fd;
-+
-+	if (is_swap_device(device)) {
-+		*mount_flags = EXT2_MF_MOUNTED | EXT2_MF_SWAP;
-+		strncpy(mtpt, "<swap>", mtlen);
-+	} else {
-+#ifdef HAVE_MNTENT_H
-+		retval = check_mntent(device, mount_flags, mtpt, mtlen);
-+#else 
-+#ifdef HAVE_GETMNTINFO
-+		retval = check_getmntinfo(device, mount_flags, mtpt, mtlen);
-+#else
-+#ifdef __GNUC__
-+ #warning "Can't use getmntent or getmntinfo to check for mounted filesystems!"
-+#endif
-+		*mount_flags = 0;
-+#endif /* HAVE_GETMNTINFO */
-+#endif /* HAVE_MNTENT_H */
-+	}
-+	if (retval)
-+		return retval;
-+
-+#ifdef __linux__ /* This only works on Linux 2.6+ systems */
-+	if ((stat(device, &st_buf) != 0) ||
-+	    !S_ISBLK(st_buf.st_mode))
-+		return 0;
-+	fd = open(device, O_RDONLY | O_EXCL);
-+	if (fd < 0) {
-+		if (errno == EBUSY)
-+			*mount_flags |= EXT2_MF_BUSY;
-+	} else
-+		close(fd);
-+
-+	return 0;
-+#endif
-+}
-+
-+/*
-+ * ext2fs_check_if_mounted() sets the mount_flags EXT2_MF_MOUNTED,
-+ * EXT2_MF_READONLY, and EXT2_MF_ROOT
-+ * 
-+ */
-+errcode_t ext2fs_check_if_mounted(const char *file, int *mount_flags)
-+{
-+	return ext2fs_check_mount_point(file, mount_flags, NULL, 0);
-+}
-+
-+#ifdef DEBUG
-+int main(int argc, char **argv)
-+{
-+	int	retval, mount_flags;
-+	char	mntpt[80];
-+	
-+	if (argc < 2) {
-+		fprintf(stderr, "Usage: %s device\n", argv[0]);
-+		exit(1);
-+	}
-+
-+	mntpt[0] = 0;
-+	retval = ext2fs_check_mount_point(argv[1], &mount_flags,
-+					  mntpt, sizeof(mntpt));
-+	if (retval) {
-+		com_err(argv[0], retval,
-+			"while calling ext2fs_check_if_mounted");
-+		exit(1);
-+	}
-+	printf("Device %s reports flags %02x\n", argv[1], mount_flags);
-+	if (mount_flags & EXT2_MF_BUSY)
-+		printf("\t%s is apparently in use.\n", argv[1]);
-+	if (mount_flags & EXT2_MF_MOUNTED)
-+		printf("\t%s is mounted.\n", argv[1]);
-+	if (mount_flags & EXT2_MF_SWAP)
-+		printf("\t%s is a swap device.\n", argv[1]);
-+	if (mount_flags & EXT2_MF_READONLY)
-+		printf("\t%s is read-only.\n", argv[1]);
-+	if (mount_flags & EXT2_MF_ISROOT)
-+		printf("\t%s is the root filesystem.\n", argv[1]);
-+	if (mntpt[0])
-+		printf("\t%s is mounted on %s.\n", argv[1], mntpt);
-+	exit(0);
-+}
-+#endif /* DEBUG */
-diff -Naur silo-1.4.13.orig/libext2fs/jfs_compat.h silo-1.4.13/libext2fs/jfs_compat.h
---- silo-1.4.13.orig/libext2fs/jfs_compat.h	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/jfs_compat.h	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,67 @@
-+
-+#ifndef _JFS_COMPAT_H
-+#define _JFS_COMPAT_H
-+
-+#include "kernel-list.h"
-+#include <errno.h>
-+#ifdef HAVE_NETINET_IN_H
-+#include <netinet/in.h>
-+#endif
-+
-+#define printk printf
-+#define KERN_ERR ""
-+#define KERN_DEBUG ""
-+
-+#define READ 0
-+#define WRITE 1
-+
-+#define cpu_to_be32(n) htonl(n)
-+#define be32_to_cpu(n) ntohl(n)
-+
-+typedef unsigned int tid_t;
-+typedef struct journal_s journal_t;
-+
-+struct buffer_head;
-+struct inode;
-+
-+struct journal_s
-+{
-+	unsigned long		j_flags;
-+	int			j_errno;
-+	struct buffer_head *	j_sb_buffer;
-+	struct journal_superblock_s *j_superblock;
-+	int			j_format_version;
-+	unsigned long		j_head;
-+	unsigned long		j_tail;
-+	unsigned long		j_free;
-+	unsigned long		j_first, j_last;
-+	kdev_t			j_dev;
-+	kdev_t			j_fs_dev;
-+	int			j_blocksize;
-+	unsigned int		j_blk_offset;
-+	unsigned int		j_maxlen;
-+	struct inode *		j_inode;
-+	tid_t			j_tail_sequence;
-+	tid_t			j_transaction_sequence;
-+	__u8			j_uuid[16];
-+	struct jbd_revoke_table_s *j_revoke;
-+};
-+
-+#define J_ASSERT(assert)						\
-+	do { if (!(assert)) {						\
-+		printf ("Assertion failure in %s() at %s line %d: "	\
-+			"\"%s\"\n",					\
-+			__FUNCTION__, __FILE__, __LINE__, # assert);	\
-+		fatal_error(e2fsck_global_ctx, 0);			\
-+	} } while (0)
-+
-+#define is_journal_abort(x) 0
-+
-+#define BUFFER_TRACE(bh, info)	do {} while (0)
-+
-+/* Need this so we can compile with configure --enable-gcc-wall */
-+#ifdef NO_INLINE_FUNCS
-+#define inline
-+#endif
-+
-+#endif /* _JFS_COMPAT_H */
-diff -Naur silo-1.4.13.orig/libext2fs/jfs_dat.h silo-1.4.13/libext2fs/jfs_dat.h
---- silo-1.4.13.orig/libext2fs/jfs_dat.h	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/jfs_dat.h	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,64 @@
-+/*
-+ * jfs_dat.h --- stripped down header file which only contains the JFS
-+ * 	on-disk data structures
-+ */
-+
-+#define JFS_MAGIC_NUMBER 0xc03b3998U /* The first 4 bytes of /dev/random! */
-+
-+/*
-+ * On-disk structures
-+ */
-+
-+/* 
-+ * Descriptor block types:
-+ */
-+
-+#define JFS_DESCRIPTOR_BLOCK	1
-+#define JFS_COMMIT_BLOCK	2
-+#define JFS_SUPERBLOCK		3
-+
-+/*
-+ * Standard header for all descriptor blocks:
-+ */
-+typedef struct journal_header_s
-+{
-+	__u32		h_magic;
-+	__u32		h_blocktype;
-+	__u32		h_sequence;
-+} journal_header_t;
-+
-+
-+/* 
-+ * The block tag: used to describe a single buffer in the journal 
-+ */
-+typedef struct journal_block_tag_s
-+{
-+	__u32		t_blocknr;	/* The on-disk block number */
-+	__u32		t_flags;	/* See below */
-+} journal_block_tag_t;
-+
-+/* Definitions for the journal tag flags word: */
-+#define JFS_FLAG_ESCAPE		1	/* on-disk block is escaped */
-+#define JFS_FLAG_SAME_UUID	2	/* block has same uuid as previous */
-+#define JFS_FLAG_DELETED	4	/* block deleted by this transaction */
-+#define JFS_FLAG_LAST_TAG	8	/* last tag in this descriptor block */
-+
-+
-+/*
-+ * The journal superblock
-+ */
-+typedef struct journal_superblock_s
-+{
-+	journal_header_t s_header;
-+
-+	/* Static information describing the journal */
-+	__u32		s_blocksize;	/* journal device blocksize */
-+	__u32		s_maxlen;	/* total blocks in journal file */
-+	__u32		s_first;	/* first block of log information */
-+	
-+	/* Dynamic information describing the current state of the log */
-+	__u32		s_sequence;	/* first commit ID expected in log */
-+	__u32		s_start;	/* blocknr of start of log */
-+	
-+} journal_superblock_t;
-+
-diff -Naur silo-1.4.13.orig/libext2fs/jfs_user.h silo-1.4.13/libext2fs/jfs_user.h
---- silo-1.4.13.orig/libext2fs/jfs_user.h	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/jfs_user.h	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,8 @@
-+#ifndef _JFS_USER_H
-+#define _JFS_USER_H
-+
-+typedef unsigned short kdev_t;
-+
-+#include "kernel-jbd.h"
-+
-+#endif /* _JFS_USER_H */
-diff -Naur silo-1.4.13.orig/libext2fs/kernel-jbd.h silo-1.4.13/libext2fs/kernel-jbd.h
---- silo-1.4.13.orig/libext2fs/kernel-jbd.h	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/kernel-jbd.h	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,910 @@
-+/*
-+ * linux/include/linux/jbd.h
-+ * 
-+ * Written by Stephen C. Tweedie <sct@redhat.com>
-+ *
-+ * Copyright 1998-2000 Red Hat, Inc --- All Rights Reserved
-+ *
-+ * This file is part of the Linux kernel and is made available under
-+ * the terms of the GNU General Public License, version 2, or at your
-+ * option, any later version, incorporated herein by reference.
-+ *
-+ * Definitions for transaction data structures for the buffer cache
-+ * filesystem journaling support.
-+ */
-+
-+#ifndef _LINUX_JBD_H
-+#define _LINUX_JBD_H
-+
-+#if defined(CONFIG_JBD) || defined(CONFIG_JBD_MODULE) || !defined(__KERNEL__)
-+
-+/* Allow this file to be included directly into e2fsprogs */
-+#ifndef __KERNEL__
-+#include "jfs_compat.h"
-+#define JFS_DEBUG
-+#define jfs_debug jbd_debug
-+#else
-+
-+#include <linux/journal-head.h>
-+#include <linux/stddef.h>
-+#include <asm/semaphore.h>
-+#endif
-+
-+#ifndef __GNUC__
-+#define __FUNCTION__ ""
-+#endif
-+
-+#define journal_oom_retry 1
-+
-+#ifdef __STDC__
-+#ifdef CONFIG_JBD_DEBUG
-+/*
-+ * Define JBD_EXPENSIVE_CHECKING to enable more expensive internal
-+ * consistency checks.  By default we don't do this unless
-+ * CONFIG_JBD_DEBUG is on.
-+ */
-+#define JBD_EXPENSIVE_CHECKING
-+extern int journal_enable_debug;
-+
-+#define jbd_debug(n, f, a...)						\
-+	do {								\
-+		if ((n) <= journal_enable_debug) {			\
-+			printk (KERN_DEBUG "(%s, %d): %s: ",		\
-+				__FILE__, __LINE__, __FUNCTION__);	\
-+		  	printk (f, ## a);				\
-+		}							\
-+	} while (0)
-+#else
-+#ifdef __GNUC__
-+#define jbd_debug(f, a...)	/**/
-+#else
-+#define jbd_debug(f, ...)	/**/
-+#endif	
-+#endif
-+#else
-+#define jbd_debug(x)		/* AIX doesn't do STDC */
-+#endif
-+
-+extern void * __jbd_kmalloc (char *where, size_t size, int flags, int retry);
-+#define jbd_kmalloc(size, flags) \
-+	__jbd_kmalloc(__FUNCTION__, (size), (flags), journal_oom_retry)
-+#define jbd_rep_kmalloc(size, flags) \
-+	__jbd_kmalloc(__FUNCTION__, (size), (flags), 1)
-+
-+#define JFS_MIN_JOURNAL_BLOCKS 1024
-+
-+#ifdef __KERNEL__
-+typedef struct handle_s		handle_t;	/* Atomic operation type */
-+typedef struct journal_s	journal_t;	/* Journal control structure */
-+#endif
-+
-+/*
-+ * Internal structures used by the logging mechanism:
-+ */
-+
-+#define JFS_MAGIC_NUMBER 0xc03b3998U /* The first 4 bytes of /dev/random! */
-+
-+/*
-+ * On-disk structures
-+ */
-+
-+/* 
-+ * Descriptor block types:
-+ */
-+
-+#define JFS_DESCRIPTOR_BLOCK	1
-+#define JFS_COMMIT_BLOCK	2
-+#define JFS_SUPERBLOCK_V1	3
-+#define JFS_SUPERBLOCK_V2	4
-+#define JFS_REVOKE_BLOCK	5
-+
-+/*
-+ * Standard header for all descriptor blocks:
-+ */
-+typedef struct journal_header_s
-+{
-+	__u32		h_magic;
-+	__u32		h_blocktype;
-+	__u32		h_sequence;
-+} journal_header_t;
-+
-+
-+/* 
-+ * The block tag: used to describe a single buffer in the journal 
-+ */
-+typedef struct journal_block_tag_s
-+{
-+	__u32		t_blocknr;	/* The on-disk block number */
-+	__u32		t_flags;	/* See below */
-+} journal_block_tag_t;
-+
-+/* 
-+ * The revoke descriptor: used on disk to describe a series of blocks to
-+ * be revoked from the log 
-+ */
-+typedef struct journal_revoke_header_s
-+{
-+	journal_header_t r_header;
-+	int		 r_count;	/* Count of bytes used in the block */
-+} journal_revoke_header_t;
-+
-+
-+/* Definitions for the journal tag flags word: */
-+#define JFS_FLAG_ESCAPE		1	/* on-disk block is escaped */
-+#define JFS_FLAG_SAME_UUID	2	/* block has same uuid as previous */
-+#define JFS_FLAG_DELETED	4	/* block deleted by this transaction */
-+#define JFS_FLAG_LAST_TAG	8	/* last tag in this descriptor block */
-+
-+
-+/*
-+ * The journal superblock.  All fields are in big-endian byte order.
-+ */
-+typedef struct journal_superblock_s
-+{
-+/* 0x0000 */
-+	journal_header_t s_header;
-+
-+/* 0x000C */
-+	/* Static information describing the journal */
-+	__u32	s_blocksize;		/* journal device blocksize */
-+	__u32	s_maxlen;		/* total blocks in journal file */
-+	__u32	s_first;		/* first block of log information */
-+	
-+/* 0x0018 */
-+	/* Dynamic information describing the current state of the log */
-+	__u32	s_sequence;		/* first commit ID expected in log */
-+	__u32	s_start;		/* blocknr of start of log */
-+
-+/* 0x0020 */
-+	/* Error value, as set by journal_abort(). */
-+	__s32	s_errno;
-+
-+/* 0x0024 */
-+	/* Remaining fields are only valid in a version-2 superblock */
-+	__u32	s_feature_compat; 	/* compatible feature set */
-+	__u32	s_feature_incompat; 	/* incompatible feature set */
-+	__u32	s_feature_ro_compat; 	/* readonly-compatible feature set */
-+/* 0x0030 */
-+	__u8	s_uuid[16];		/* 128-bit uuid for journal */
-+
-+/* 0x0040 */
-+	__u32	s_nr_users;		/* Nr of filesystems sharing log */
-+	
-+	__u32	s_dynsuper;		/* Blocknr of dynamic superblock copy*/
-+	
-+/* 0x0048 */
-+	__u32	s_max_transaction;	/* Limit of journal blocks per trans.*/
-+	__u32	s_max_trans_data;	/* Limit of data blocks per trans. */
-+
-+/* 0x0050 */
-+	__u32	s_padding[44];
-+
-+/* 0x0100 */
-+	__u8	s_users[16*48];		/* ids of all fs'es sharing the log */
-+/* 0x0400 */
-+} journal_superblock_t;
-+
-+#define JFS_HAS_COMPAT_FEATURE(j,mask)					\
-+	((j)->j_format_version >= 2 &&					\
-+	 ((j)->j_superblock->s_feature_compat & cpu_to_be32((mask))))
-+#define JFS_HAS_RO_COMPAT_FEATURE(j,mask)				\
-+	((j)->j_format_version >= 2 &&					\
-+	 ((j)->j_superblock->s_feature_ro_compat & cpu_to_be32((mask))))
-+#define JFS_HAS_INCOMPAT_FEATURE(j,mask)				\
-+	((j)->j_format_version >= 2 &&					\
-+	 ((j)->j_superblock->s_feature_incompat & cpu_to_be32((mask))))
-+
-+#define JFS_FEATURE_INCOMPAT_REVOKE	0x00000001
-+
-+/* Features known to this kernel version: */
-+#define JFS_KNOWN_COMPAT_FEATURES	0
-+#define JFS_KNOWN_ROCOMPAT_FEATURES	0
-+#define JFS_KNOWN_INCOMPAT_FEATURES	JFS_FEATURE_INCOMPAT_REVOKE
-+
-+#ifdef __KERNEL__
-+
-+#include <linux/fs.h>
-+#include <linux/sched.h>
-+
-+#define JBD_ASSERTIONS
-+#ifdef JBD_ASSERTIONS
-+#define J_ASSERT(assert)						\
-+do {									\
-+	if (!(assert)) {						\
-+		printk (KERN_EMERG					\
-+			"Assertion failure in %s() at %s:%d: \"%s\"\n",	\
-+			__FUNCTION__, __FILE__, __LINE__, # assert);	\
-+		BUG();							\
-+	}								\
-+} while (0)
-+
-+#if defined(CONFIG_BUFFER_DEBUG)
-+void buffer_assertion_failure(struct buffer_head *bh);
-+#define J_ASSERT_BH(bh, expr)						\
-+	do {								\
-+		if (!(expr))						\
-+			buffer_assertion_failure(bh);			\
-+		J_ASSERT(expr);						\
-+	} while (0)
-+#define J_ASSERT_JH(jh, expr)	J_ASSERT_BH(jh2bh(jh), expr)
-+#else
-+#define J_ASSERT_BH(bh, expr)	J_ASSERT(expr)
-+#define J_ASSERT_JH(jh, expr)	J_ASSERT(expr)
-+#endif
-+
-+#else
-+#define J_ASSERT(assert)
-+#endif		/* JBD_ASSERTIONS */
-+
-+enum jbd_state_bits {
-+	BH_JWrite
-+	  = BH_PrivateStart,	/* 1 if being written to log (@@@ DEBUGGING) */
-+	BH_Freed,		/* 1 if buffer has been freed (truncated) */
-+	BH_Revoked,		/* 1 if buffer has been revoked from the log */
-+	BH_RevokeValid,		/* 1 if buffer revoked flag is valid */
-+	BH_JBDDirty,		/* 1 if buffer is dirty but journaled */
-+};
-+
-+/* Return true if the buffer is one which JBD is managing */
-+static inline int buffer_jbd(struct buffer_head *bh)
-+{
-+	return __buffer_state(bh, JBD);
-+}
-+
-+static inline struct buffer_head *jh2bh(struct journal_head *jh)
-+{
-+	return jh->b_bh;
-+}
-+
-+static inline struct journal_head *bh2jh(struct buffer_head *bh)
-+{
-+	return bh->b_private;
-+}
-+
-+struct jbd_revoke_table_s;
-+
-+/* The handle_t type represents a single atomic update being performed
-+ * by some process.  All filesystem modifications made by the process go
-+ * through this handle.  Recursive operations (such as quota operations)
-+ * are gathered into a single update.
-+ *
-+ * The buffer credits field is used to account for journaled buffers
-+ * being modified by the running process.  To ensure that there is
-+ * enough log space for all outstanding operations, we need to limit the
-+ * number of outstanding buffers possible at any time.  When the
-+ * operation completes, any buffer credits not used are credited back to
-+ * the transaction, so that at all times we know how many buffers the
-+ * outstanding updates on a transaction might possibly touch. */
-+
-+struct handle_s 
-+{
-+	/* Which compound transaction is this update a part of? */
-+	transaction_t	      * h_transaction;
-+
-+	/* Number of remaining buffers we are allowed to dirty: */
-+	int			h_buffer_credits;
-+
-+	/* Reference count on this handle */
-+	int			h_ref;
-+
-+	/* Field for caller's use to track errors through large fs
-+	   operations */
-+	int			h_err;
-+
-+	/* Flags */
-+	unsigned int	h_sync:		1;	/* sync-on-close */
-+	unsigned int	h_jdata:	1;	/* force data journaling */
-+	unsigned int	h_aborted:	1;	/* fatal error on handle */
-+};
-+
-+
-+/* The transaction_t type is the guts of the journaling mechanism.  It
-+ * tracks a compound transaction through its various states:
-+ *
-+ * RUNNING:	accepting new updates
-+ * LOCKED:	Updates still running but we don't accept new ones
-+ * RUNDOWN:	Updates are tidying up but have finished requesting
-+ *		new buffers to modify (state not used for now)
-+ * FLUSH:       All updates complete, but we are still writing to disk
-+ * COMMIT:      All data on disk, writing commit record
-+ * FINISHED:	We still have to keep the transaction for checkpointing.
-+ *
-+ * The transaction keeps track of all of the buffers modified by a
-+ * running transaction, and all of the buffers committed but not yet
-+ * flushed to home for finished transactions.
-+ */
-+
-+struct transaction_s 
-+{
-+	/* Pointer to the journal for this transaction. */
-+	journal_t *		t_journal;
-+	
-+	/* Sequence number for this transaction */
-+	tid_t			t_tid;
-+	
-+	/* Transaction's current state */
-+	enum {
-+		T_RUNNING,
-+		T_LOCKED,
-+		T_RUNDOWN,
-+		T_FLUSH,
-+		T_COMMIT,
-+		T_FINISHED 
-+	}			t_state;
-+
-+	/* Where in the log does this transaction's commit start? */
-+	unsigned long		t_log_start;
-+	
-+	/* Doubly-linked circular list of all inodes owned by this
-+           transaction */	/* AKPM: unused */
-+	struct inode *		t_ilist;
-+	
-+	/* Number of buffers on the t_buffers list */
-+	int			t_nr_buffers;
-+	
-+	/* Doubly-linked circular list of all buffers reserved but not
-+           yet modified by this transaction */
-+	struct journal_head *	t_reserved_list;
-+	
-+	/* Doubly-linked circular list of all metadata buffers owned by this
-+           transaction */
-+	struct journal_head *	t_buffers;
-+	
-+	/*
-+	 * Doubly-linked circular list of all data buffers still to be
-+	 * flushed before this transaction can be committed.
-+	 * Protected by journal_datalist_lock.
-+	 */
-+	struct journal_head *	t_sync_datalist;
-+	
-+	/*
-+	 * Doubly-linked circular list of all writepage data buffers
-+	 * still to be written before this transaction can be committed.
-+	 * Protected by journal_datalist_lock.
-+	 */
-+	struct journal_head *	t_async_datalist;
-+	
-+	/* Doubly-linked circular list of all forget buffers (superceded
-+           buffers which we can un-checkpoint once this transaction
-+           commits) */
-+	struct journal_head *	t_forget;
-+	
-+	/*
-+	 * Doubly-linked circular list of all buffers still to be
-+	 * flushed before this transaction can be checkpointed.
-+	 */
-+	/* Protected by journal_datalist_lock */
-+	struct journal_head *	t_checkpoint_list;
-+	
-+	/* Doubly-linked circular list of temporary buffers currently
-+           undergoing IO in the log */
-+	struct journal_head *	t_iobuf_list;
-+	
-+	/* Doubly-linked circular list of metadata buffers being
-+           shadowed by log IO.  The IO buffers on the iobuf list and the
-+           shadow buffers on this list match each other one for one at
-+           all times. */
-+	struct journal_head *	t_shadow_list;
-+	
-+	/* Doubly-linked circular list of control buffers being written
-+           to the log. */
-+	struct journal_head *	t_log_list;
-+	
-+	/* Number of outstanding updates running on this transaction */
-+	int			t_updates;
-+
-+	/* Number of buffers reserved for use by all handles in this
-+	 * transaction handle but not yet modified. */
-+	int			t_outstanding_credits;
-+	
-+	/*
-+	 * Forward and backward links for the circular list of all
-+	 * transactions awaiting checkpoint.
-+	 */
-+	/* Protected by journal_datalist_lock */
-+	transaction_t		*t_cpnext, *t_cpprev;
-+
-+	/* When will the transaction expire (become due for commit), in
-+	 * jiffies ? */
-+	unsigned long		t_expires;
-+
-+	/* How many handles used this transaction? */
-+	int t_handle_count;
-+};
-+
-+
-+/* The journal_t maintains all of the journaling state information for a
-+ * single filesystem.  It is linked to from the fs superblock structure.
-+ * 
-+ * We use the journal_t to keep track of all outstanding transaction
-+ * activity on the filesystem, and to manage the state of the log
-+ * writing process. */
-+
-+struct journal_s
-+{
-+	/* General journaling state flags */
-+	unsigned long		j_flags;
-+
-+	/* Is there an outstanding uncleared error on the journal (from
-+	 * a prior abort)? */
-+	int			j_errno;
-+	
-+	/* The superblock buffer */
-+	struct buffer_head *	j_sb_buffer;
-+	journal_superblock_t *	j_superblock;
-+
-+	/* Version of the superblock format */
-+	int			j_format_version;
-+
-+	/* Number of processes waiting to create a barrier lock */
-+	int			j_barrier_count;
-+	
-+	/* The barrier lock itself */
-+	struct semaphore	j_barrier;
-+	
-+	/* Transactions: The current running transaction... */
-+	transaction_t *		j_running_transaction;
-+	
-+	/* ... the transaction we are pushing to disk ... */
-+	transaction_t *		j_committing_transaction;
-+	
-+	/* ... and a linked circular list of all transactions waiting
-+	 * for checkpointing. */
-+	/* Protected by journal_datalist_lock */
-+	transaction_t *		j_checkpoint_transactions;
-+
-+	/* Wait queue for waiting for a locked transaction to start
-+           committing, or for a barrier lock to be released */
-+	wait_queue_head_t	j_wait_transaction_locked;
-+	
-+	/* Wait queue for waiting for checkpointing to complete */
-+	wait_queue_head_t	j_wait_logspace;
-+	
-+	/* Wait queue for waiting for commit to complete */
-+	wait_queue_head_t	j_wait_done_commit;
-+	
-+	/* Wait queue to trigger checkpointing */
-+	wait_queue_head_t	j_wait_checkpoint;
-+	
-+	/* Wait queue to trigger commit */
-+	wait_queue_head_t	j_wait_commit;
-+	
-+	/* Wait queue to wait for updates to complete */
-+	wait_queue_head_t	j_wait_updates;
-+
-+	/* Semaphore for locking against concurrent checkpoints */
-+	struct semaphore 	j_checkpoint_sem;
-+
-+	/* The main journal lock, used by lock_journal() */
-+	struct semaphore	j_sem;
-+		
-+	/* Journal head: identifies the first unused block in the journal. */
-+	unsigned long		j_head;
-+	
-+	/* Journal tail: identifies the oldest still-used block in the
-+	 * journal. */
-+	unsigned long		j_tail;
-+
-+	/* Journal free: how many free blocks are there in the journal? */
-+	unsigned long		j_free;
-+
-+	/* Journal start and end: the block numbers of the first usable
-+	 * block and one beyond the last usable block in the journal. */
-+	unsigned long		j_first, j_last;
-+
-+	/* Device, blocksize and starting block offset for the location
-+	 * where we store the journal. */
-+	kdev_t			j_dev;
-+	int			j_blocksize;
-+	unsigned int		j_blk_offset;
-+
-+	/* Device which holds the client fs.  For internal journal this
-+	 * will be equal to j_dev. */
-+	kdev_t			j_fs_dev;
-+
-+	/* Total maximum capacity of the journal region on disk. */
-+	unsigned int		j_maxlen;
-+
-+	/* Optional inode where we store the journal.  If present, all
-+	 * journal block numbers are mapped into this inode via
-+	 * bmap(). */
-+	struct inode *		j_inode;
-+
-+	/* Sequence number of the oldest transaction in the log */
-+	tid_t			j_tail_sequence;
-+	/* Sequence number of the next transaction to grant */
-+	tid_t			j_transaction_sequence;
-+	/* Sequence number of the most recently committed transaction */
-+	tid_t			j_commit_sequence;
-+	/* Sequence number of the most recent transaction wanting commit */
-+	tid_t			j_commit_request;
-+
-+	/* Journal uuid: identifies the object (filesystem, LVM volume
-+	 * etc) backed by this journal.  This will eventually be
-+	 * replaced by an array of uuids, allowing us to index multiple
-+	 * devices within a single journal and to perform atomic updates
-+	 * across them.  */
-+
-+	__u8			j_uuid[16];
-+
-+	/* Pointer to the current commit thread for this journal */
-+	struct task_struct *	j_task;
-+
-+	/* Maximum number of metadata buffers to allow in a single
-+	 * compound commit transaction */
-+	int			j_max_transaction_buffers;
-+
-+	/* What is the maximum transaction lifetime before we begin a
-+	 * commit? */
-+	unsigned long		j_commit_interval;
-+
-+	/* The timer used to wakeup the commit thread: */
-+	struct timer_list *	j_commit_timer;
-+	int			j_commit_timer_active;
-+
-+	/* Link all journals together - system-wide */
-+	struct list_head	j_all_journals;
-+
-+	/* The revoke table: maintains the list of revoked blocks in the
-+           current transaction. */
-+	struct jbd_revoke_table_s *j_revoke;
-+};
-+
-+/* 
-+ * Journal flag definitions 
-+ */
-+#define JFS_UNMOUNT	0x001	/* Journal thread is being destroyed */
-+#define JFS_ABORT	0x002	/* Journaling has been aborted for errors. */
-+#define JFS_ACK_ERR	0x004	/* The errno in the sb has been acked */
-+#define JFS_FLUSHED	0x008	/* The journal superblock has been flushed */
-+#define JFS_LOADED	0x010	/* The journal superblock has been loaded */
-+
-+/* 
-+ * Function declarations for the journaling transaction and buffer
-+ * management
-+ */
-+
-+/* Filing buffers */
-+extern void __journal_unfile_buffer(struct journal_head *);
-+extern void journal_unfile_buffer(struct journal_head *);
-+extern void __journal_refile_buffer(struct journal_head *);
-+extern void journal_refile_buffer(struct journal_head *);
-+extern void __journal_file_buffer(struct journal_head *, transaction_t *, int);
-+extern void __journal_free_buffer(struct journal_head *bh);
-+extern void journal_file_buffer(struct journal_head *, transaction_t *, int);
-+extern void __journal_clean_data_list(transaction_t *transaction);
-+
-+/* Log buffer allocation */
-+extern struct journal_head * journal_get_descriptor_buffer(journal_t *);
-+extern unsigned long journal_next_log_block(journal_t *);
-+
-+/* Commit management */
-+extern void journal_commit_transaction(journal_t *);
-+
-+/* Checkpoint list management */
-+int __journal_clean_checkpoint_list(journal_t *journal);
-+extern void journal_remove_checkpoint(struct journal_head *);
-+extern void __journal_remove_checkpoint(struct journal_head *);
-+extern void journal_insert_checkpoint(struct journal_head *, transaction_t *);
-+extern void __journal_insert_checkpoint(struct journal_head *,transaction_t *);
-+
-+/* Buffer IO */
-+extern int 
-+journal_write_metadata_buffer(transaction_t	  *transaction,
-+			      struct journal_head  *jh_in,
-+			      struct journal_head **jh_out,
-+			      int		   blocknr);
-+
-+/* Transaction locking */
-+extern void		__wait_on_journal (journal_t *);
-+
-+/*
-+ * Journal locking.
-+ *
-+ * We need to lock the journal during transaction state changes so that
-+ * nobody ever tries to take a handle on the running transaction while
-+ * we are in the middle of moving it to the commit phase.  
-+ *
-+ * Note that the locking is completely interrupt unsafe.  We never touch
-+ * journal structures from interrupts.
-+ *
-+ * In 2.2, the BKL was required for lock_journal.  This is no longer
-+ * the case.
-+ */
-+
-+static inline void lock_journal(journal_t *journal)
-+{
-+	down(&journal->j_sem);
-+}
-+
-+/* This returns zero if we acquired the semaphore */
-+static inline int try_lock_journal(journal_t * journal)
-+{
-+	return down_trylock(&journal->j_sem);
-+}
-+
-+static inline void unlock_journal(journal_t * journal)
-+{
-+	up(&journal->j_sem);
-+}
-+
-+
-+static inline handle_t *journal_current_handle(void)
-+{
-+	return current->journal_info;
-+}
-+
-+/* The journaling code user interface:
-+ *
-+ * Create and destroy handles
-+ * Register buffer modifications against the current transaction. 
-+ */
-+
-+extern handle_t *journal_start(journal_t *, int nblocks);
-+extern handle_t *journal_try_start(journal_t *, int nblocks);
-+extern int	 journal_restart (handle_t *, int nblocks);
-+extern int	 journal_extend (handle_t *, int nblocks);
-+extern int	 journal_get_write_access (handle_t *, struct buffer_head *);
-+extern int	 journal_get_create_access (handle_t *, struct buffer_head *);
-+extern int	 journal_get_undo_access (handle_t *, struct buffer_head *);
-+extern int	 journal_dirty_data (handle_t *,
-+				struct buffer_head *, int async);
-+extern int	 journal_dirty_metadata (handle_t *, struct buffer_head *);
-+extern void	 journal_release_buffer (handle_t *, struct buffer_head *);
-+extern void	 journal_forget (handle_t *, struct buffer_head *);
-+extern void	 journal_sync_buffer (struct buffer_head *);
-+extern int	 journal_flushpage(journal_t *, struct page *, unsigned long);
-+extern int	 journal_try_to_free_buffers(journal_t *, struct page *, int);
-+extern int	 journal_stop(handle_t *);
-+extern int	 journal_flush (journal_t *);
-+
-+extern void	 journal_lock_updates (journal_t *);
-+extern void	 journal_unlock_updates (journal_t *);
-+
-+extern journal_t * journal_init_dev(kdev_t dev, kdev_t fs_dev,
-+				int start, int len, int bsize);
-+extern journal_t * journal_init_inode (struct inode *);
-+extern int	   journal_update_format (journal_t *);
-+extern int	   journal_check_used_features 
-+		   (journal_t *, unsigned long, unsigned long, unsigned long);
-+extern int	   journal_check_available_features 
-+		   (journal_t *, unsigned long, unsigned long, unsigned long);
-+extern int	   journal_set_features 
-+		   (journal_t *, unsigned long, unsigned long, unsigned long);
-+extern int	   journal_create     (journal_t *);
-+extern int	   journal_load       (journal_t *journal);
-+extern void	   journal_destroy    (journal_t *);
-+extern int	   journal_recover    (journal_t *journal);
-+extern int	   journal_wipe       (journal_t *, int);
-+extern int	   journal_skip_recovery (journal_t *);
-+extern void	   journal_update_superblock (journal_t *, int);
-+extern void	   __journal_abort      (journal_t *);
-+extern void	   journal_abort      (journal_t *, int);
-+extern int	   journal_errno      (journal_t *);
-+extern void	   journal_ack_err    (journal_t *);
-+extern int	   journal_clear_err  (journal_t *);
-+extern unsigned long journal_bmap(journal_t *journal, unsigned long blocknr);
-+extern int	    journal_force_commit(journal_t *journal);
-+
-+/*
-+ * journal_head management
-+ */
-+extern struct journal_head
-+		*journal_add_journal_head(struct buffer_head *bh);
-+extern void	journal_remove_journal_head(struct buffer_head *bh);
-+extern void	__journal_remove_journal_head(struct buffer_head *bh);
-+extern void	journal_unlock_journal_head(struct journal_head *jh);
-+
-+/* Primary revoke support */
-+#define JOURNAL_REVOKE_DEFAULT_HASH 256
-+extern int	   journal_init_revoke(journal_t *, int);
-+extern void	   journal_destroy_revoke_caches(void);
-+extern int	   journal_init_revoke_caches(void);
-+
-+extern void	   journal_destroy_revoke(journal_t *);
-+extern int	   journal_revoke (handle_t *,
-+				unsigned long, struct buffer_head *);
-+extern int	   journal_cancel_revoke(handle_t *, struct journal_head *);
-+extern void	   journal_write_revoke_records(journal_t *, transaction_t *);
-+
-+/* Recovery revoke support */
-+extern int	   journal_set_revoke(journal_t *, unsigned long, tid_t);
-+extern int	   journal_test_revoke(journal_t *, unsigned long, tid_t);
-+extern void	   journal_clear_revoke(journal_t *);
-+extern void	   journal_brelse_array(struct buffer_head *b[], int n);
-+
-+/* The log thread user interface:
-+ *
-+ * Request space in the current transaction, and force transaction commit
-+ * transitions on demand.
-+ */
-+
-+extern int	log_space_left (journal_t *); /* Called with journal locked */
-+extern tid_t	log_start_commit (journal_t *, transaction_t *);
-+extern void	log_wait_commit (journal_t *, tid_t);
-+extern int	log_do_checkpoint (journal_t *, int);
-+
-+extern void	log_wait_for_space(journal_t *, int nblocks);
-+extern void	__journal_drop_transaction(journal_t *, transaction_t *);
-+extern int	cleanup_journal_tail(journal_t *);
-+
-+/* Reduce journal memory usage by flushing */
-+extern void shrink_journal_memory(void);
-+
-+/* Debugging code only: */
-+
-+#define jbd_ENOSYS() \
-+do {								      \
-+	printk (KERN_ERR "JBD unimplemented function " __FUNCTION__); \
-+	current->state = TASK_UNINTERRUPTIBLE;			      \
-+	schedule();						      \
-+} while (1)
-+
-+/*
-+ * is_journal_abort
-+ *
-+ * Simple test wrapper function to test the JFS_ABORT state flag.  This
-+ * bit, when set, indicates that we have had a fatal error somewhere,
-+ * either inside the journaling layer or indicated to us by the client
-+ * (eg. ext3), and that we and should not commit any further
-+ * transactions.  
-+ */
-+
-+static inline int is_journal_aborted(journal_t *journal)
-+{
-+	return journal->j_flags & JFS_ABORT;
-+}
-+
-+static inline int is_handle_aborted(handle_t *handle)
-+{
-+	if (handle->h_aborted)
-+		return 1;
-+	return is_journal_aborted(handle->h_transaction->t_journal);
-+}
-+
-+static inline void journal_abort_handle(handle_t *handle)
-+{
-+	handle->h_aborted = 1;
-+}
-+
-+/* Not all architectures define BUG() */
-+#ifndef BUG
-+#define BUG() do { \
-+        printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
-+	* ((char *) 0) = 0; \
-+ } while (0)
-+#endif /* BUG */
-+
-+#else
-+
-+extern int	   journal_recover    (journal_t *journal);
-+extern int	   journal_skip_recovery (journal_t *);
-+
-+/* Primary revoke support */
-+extern int	   journal_init_revoke(journal_t *, int);
-+extern void	   journal_destroy_revoke_caches(void);
-+extern int	   journal_init_revoke_caches(void);
-+
-+/* Recovery revoke support */
-+extern int	   journal_set_revoke(journal_t *, unsigned long, tid_t);
-+extern int	   journal_test_revoke(journal_t *, unsigned long, tid_t);
-+extern void	   journal_clear_revoke(journal_t *);
-+extern void	   journal_brelse_array(struct buffer_head *b[], int n);
-+
-+extern void	   journal_destroy_revoke(journal_t *);
-+#endif /* __KERNEL__   */
-+
-+/* Comparison functions for transaction IDs: perform comparisons using
-+ * modulo arithmetic so that they work over sequence number wraps. */
-+
-+static inline int tid_gt(tid_t x, tid_t y)
-+{
-+	int difference = (x - y);
-+	return (difference > 0);
-+}
-+
-+static inline int tid_geq(tid_t x, tid_t y)
-+{
-+	int difference = (x - y);
-+	return (difference >= 0);
-+}
-+
-+extern int journal_blocks_per_page(struct inode *inode);
-+
-+/*
-+ * Definitions which augment the buffer_head layer
-+ */
-+
-+/* journaling buffer types */
-+#define BJ_None		0	/* Not journaled */
-+#define BJ_SyncData	1	/* Normal data: flush before commit */
-+#define BJ_AsyncData	2	/* writepage data: wait on it before commit */
-+#define BJ_Metadata	3	/* Normal journaled metadata */
-+#define BJ_Forget	4	/* Buffer superceded by this transaction */
-+#define BJ_IO		5	/* Buffer is for temporary IO use */
-+#define BJ_Shadow	6	/* Buffer contents being shadowed to the log */
-+#define BJ_LogCtl	7	/* Buffer contains log descriptors */
-+#define BJ_Reserved	8	/* Buffer is reserved for access by journal */
-+#define BJ_Types	9
-+ 
-+extern int jbd_blocks_per_page(struct inode *inode);
-+
-+#ifdef __KERNEL__
-+
-+extern spinlock_t jh_splice_lock;
-+/*
-+ * Once `expr1' has been found true, take jh_splice_lock
-+ * and then reevaluate everything.
-+ */
-+#define SPLICE_LOCK(expr1, expr2)				\
-+	({							\
-+		int ret = (expr1);				\
-+		if (ret) {					\
-+			spin_lock(&jh_splice_lock);		\
-+			ret = (expr1) && (expr2);		\
-+			spin_unlock(&jh_splice_lock);		\
-+		}						\
-+		ret;						\
-+	})
-+
-+/*
-+ * A number of buffer state predicates.  They test for
-+ * buffer_jbd() because they are used in core kernel code.
-+ *
-+ * These will be racy on SMP unless we're *sure* that the
-+ * buffer won't be detached from the journalling system
-+ * in parallel.
-+ */
-+
-+/* Return true if the buffer is on journal list `list' */
-+static inline int buffer_jlist_eq(struct buffer_head *bh, int list)
-+{
-+	return SPLICE_LOCK(buffer_jbd(bh), bh2jh(bh)->b_jlist == list);
-+}
-+
-+/* Return true if this bufer is dirty wrt the journal */
-+static inline int buffer_jdirty(struct buffer_head *bh)
-+{
-+	return buffer_jbd(bh) && __buffer_state(bh, JBDDirty);
-+}
-+
-+/* Return true if it's a data buffer which journalling is managing */
-+static inline int buffer_jbd_data(struct buffer_head *bh)
-+{
-+	return SPLICE_LOCK(buffer_jbd(bh),
-+			bh2jh(bh)->b_jlist == BJ_SyncData ||
-+			bh2jh(bh)->b_jlist == BJ_AsyncData);
-+}
-+
-+#ifdef CONFIG_SMP
-+#define assert_spin_locked(lock)	J_ASSERT(spin_is_locked(lock))
-+#else
-+#define assert_spin_locked(lock)	do {} while(0)
-+#endif
-+
-+#define buffer_trace_init(bh)	do {} while (0)
-+#define print_buffer_fields(bh)	do {} while (0)
-+#define print_buffer_trace(bh)	do {} while (0)
-+#define BUFFER_TRACE(bh, info)	do {} while (0)
-+#define BUFFER_TRACE2(bh, bh2, info)	do {} while (0)
-+#define JBUFFER_TRACE(jh, info)	do {} while (0)
-+
-+#endif	/* __KERNEL__ */
-+
-+#endif	/* CONFIG_JBD || CONFIG_JBD_MODULE || !__KERNEL__ */
-+
-+/*
-+ * Compatibility no-ops which allow the kernel to compile without CONFIG_JBD
-+ * go here.
-+ */
-+
-+#if defined(__KERNEL__) && !(defined(CONFIG_JBD) || defined(CONFIG_JBD_MODULE))
-+
-+#define J_ASSERT(expr)			do {} while (0)
-+#define J_ASSERT_BH(bh, expr)		do {} while (0)
-+#define buffer_jbd(bh)			0
-+#define buffer_jlist_eq(bh, val)	0
-+#define journal_buffer_journal_lru(bh)	0
-+
-+#endif	/* defined(__KERNEL__) && !defined(CONFIG_JBD) */
-+#endif	/* _LINUX_JBD_H */
-diff -Naur silo-1.4.13.orig/libext2fs/kernel-list.h silo-1.4.13/libext2fs/kernel-list.h
---- silo-1.4.13.orig/libext2fs/kernel-list.h	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/kernel-list.h	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,112 @@
-+#ifndef _LINUX_LIST_H
-+#define _LINUX_LIST_H
-+
-+/*
-+ * Simple doubly linked list implementation.
-+ *
-+ * Some of the internal functions ("__xxx") are useful when
-+ * manipulating whole lists rather than single entries, as
-+ * sometimes we already know the next/prev entries and we can
-+ * generate better code by using them directly rather than
-+ * using the generic single-entry routines.
-+ */
-+
-+struct list_head {
-+	struct list_head *next, *prev;
-+};
-+
-+#define LIST_HEAD_INIT(name) { &(name), &(name) }
-+
-+#define LIST_HEAD(name) \
-+	struct list_head name = { &name, &name }
-+
-+#define INIT_LIST_HEAD(ptr) do { \
-+	(ptr)->next = (ptr); (ptr)->prev = (ptr); \
-+} while (0)
-+
-+#if (!defined(__GNUC__) && !defined(__WATCOMC__))
-+#define __inline__
-+#endif
-+
-+/*
-+ * Insert a new entry between two known consecutive entries. 
-+ *
-+ * This is only for internal list manipulation where we know
-+ * the prev/next entries already!
-+ */
-+static __inline__ void __list_add(struct list_head * new,
-+	struct list_head * prev,
-+	struct list_head * next)
-+{
-+	next->prev = new;
-+	new->next = next;
-+	new->prev = prev;
-+	prev->next = new;
-+}
-+
-+/*
-+ * Insert a new entry after the specified head..
-+ */
-+static __inline__ void list_add(struct list_head *new, struct list_head *head)
-+{
-+	__list_add(new, head, head->next);
-+}
-+
-+/*
-+ * Insert a new entry at the tail
-+ */
-+static __inline__ void list_add_tail(struct list_head *new, struct list_head *head)
-+{
-+	__list_add(new, head->prev, head);
-+}
-+
-+/*
-+ * Delete a list entry by making the prev/next entries
-+ * point to each other.
-+ *
-+ * This is only for internal list manipulation where we know
-+ * the prev/next entries already!
-+ */
-+static __inline__ void __list_del(struct list_head * prev,
-+				  struct list_head * next)
-+{
-+	next->prev = prev;
-+	prev->next = next;
-+}
-+
-+static __inline__ void list_del(struct list_head *entry)
-+{
-+	__list_del(entry->prev, entry->next);
-+}
-+
-+static __inline__ int list_empty(struct list_head *head)
-+{
-+	return head->next == head;
-+}
-+
-+/*
-+ * Splice in "list" into "head"
-+ */
-+static __inline__ void list_splice(struct list_head *list, struct list_head *head)
-+{
-+	struct list_head *first = list->next;
-+
-+	if (first != list) {
-+		struct list_head *last = list->prev;
-+		struct list_head *at = head->next;
-+
-+		first->prev = head;
-+		head->next = first;
-+
-+		last->next = at;
-+		at->prev = last;
-+	}
-+}
-+
-+#define list_entry(ptr, type, member) \
-+	((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))
-+
-+#define list_for_each(pos, head) \
-+        for (pos = (head)->next; pos != (head); pos = pos->next)
-+
-+#endif
-diff -Naur silo-1.4.13.orig/libext2fs/link.c silo-1.4.13/libext2fs/link.c
---- silo-1.4.13.orig/libext2fs/link.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/link.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,134 @@
-+/*
-+ * link.c --- create links in a ext2fs directory
-+ * 
-+ * Copyright (C) 1993, 1994 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+struct link_struct  {
-+	const char	*name;
-+	int		namelen;
-+	ext2_ino_t	inode;
-+	int		flags;
-+	int		done;
-+	struct ext2_super_block *sb;
-+};	
-+
-+static int link_proc(struct ext2_dir_entry *dirent,
-+		     int	offset,
-+		     int	blocksize,
-+		     char	*buf,
-+		     void	*priv_data)
-+{
-+	struct link_struct *ls = (struct link_struct *) priv_data;
-+	struct ext2_dir_entry *next;
-+	int rec_len, min_rec_len;
-+	int ret = 0;
-+
-+	rec_len = EXT2_DIR_REC_LEN(ls->namelen);
-+
-+	/*
-+	 * See if the following directory entry (if any) is unused;
-+	 * if so, absorb it into this one.
-+	 */
-+	next = (struct ext2_dir_entry *) (buf + offset + dirent->rec_len);
-+	if ((offset + dirent->rec_len < blocksize - 8) &&
-+	    (next->inode == 0) &&
-+	    (offset + dirent->rec_len + next->rec_len <= blocksize)) {
-+		dirent->rec_len += next->rec_len;
-+		ret = DIRENT_CHANGED;
-+	}
-+
-+	/*
-+	 * If the directory entry is used, see if we can split the
-+	 * directory entry to make room for the new name.  If so,
-+	 * truncate it and return.
-+	 */
-+	if (dirent->inode) {
-+		min_rec_len = EXT2_DIR_REC_LEN(dirent->name_len & 0xFF);
-+		if (dirent->rec_len < (min_rec_len + rec_len))
-+			return ret;
-+		rec_len = dirent->rec_len - min_rec_len;
-+		dirent->rec_len = min_rec_len;
-+		next = (struct ext2_dir_entry *) (buf + offset +
-+						  dirent->rec_len);
-+		next->inode = 0;
-+		next->name_len = 0;
-+		next->rec_len = rec_len;
-+		return DIRENT_CHANGED;
-+	}
-+
-+	/*
-+	 * If we get this far, then the directory entry is not used.
-+	 * See if we can fit the request entry in.  If so, do it.
-+	 */
-+	if (dirent->rec_len < rec_len)
-+		return ret;
-+	dirent->inode = ls->inode;
-+	dirent->name_len = ls->namelen;
-+	strncpy(dirent->name, ls->name, ls->namelen);
-+	if (ls->sb->s_feature_incompat & EXT2_FEATURE_INCOMPAT_FILETYPE)
-+		dirent->name_len |= (ls->flags & 0x7) << 8;
-+
-+	ls->done++;
-+	return DIRENT_ABORT|DIRENT_CHANGED;
-+}
-+
-+/*
-+ * Note: the low 3 bits of the flags field are used as the directory
-+ * entry filetype.
-+ */
-+#ifdef __TURBOC__
-+ #pragma argsused
-+#endif
-+errcode_t ext2fs_link(ext2_filsys fs, ext2_ino_t dir, const char *name, 
-+		      ext2_ino_t ino, int flags)
-+{
-+	errcode_t		retval;
-+	struct link_struct	ls;
-+	struct ext2_inode	inode;
-+
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	if (!(fs->flags & EXT2_FLAG_RW))
-+		return EXT2_ET_RO_FILSYS;
-+
-+	ls.name = name;
-+	ls.namelen = name ? strlen(name) : 0;
-+	ls.inode = ino;
-+	ls.flags = flags;
-+	ls.done = 0;
-+	ls.sb = fs->super;
-+
-+	retval = ext2fs_dir_iterate(fs, dir, DIRENT_FLAG_INCLUDE_EMPTY,
-+				    0, link_proc, &ls);
-+	if (retval)
-+		return retval;
-+
-+	if (!ls.done)
-+		return EXT2_ET_DIR_NO_SPACE;
-+
-+	if ((retval = ext2fs_read_inode(fs, dir, &inode)) != 0)
-+		return retval;
-+
-+	if (inode.i_flags & EXT2_INDEX_FL) {
-+		inode.i_flags &= ~EXT2_INDEX_FL;
-+		if ((retval = ext2fs_write_inode(fs, dir, &inode)) != 0)
-+			return retval;
-+	}
-+
-+	return 0;
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/llseek.c silo-1.4.13/libext2fs/llseek.c
---- silo-1.4.13.orig/libext2fs/llseek.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/llseek.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,138 @@
-+/*
-+ * llseek.c -- stub calling the llseek system call
-+ *
-+ * Copyright (C) 1994, 1995, 1996, 1997 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#define _LARGEFILE_SOURCE
-+#define _LARGEFILE64_SOURCE
-+
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+
-+#if HAVE_ERRNO_H
-+#include <errno.h>
-+#endif
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#ifdef __MSDOS__
-+#include <io.h>
-+#endif
-+#include "et/com_err.h"
-+#include "ext2fs/ext2_io.h"
-+
-+#ifdef __linux__
-+
-+#if defined(HAVE_LSEEK64) && defined(HAVE_LSEEK64_PROTOTYPE)
-+
-+#define my_llseek lseek64
-+
-+#else
-+#if defined(HAVE_LLSEEK)
-+#include <syscall.h>
-+
-+#ifndef HAVE_LLSEEK_PROTOTYPE
-+extern long long llseek (int fd, long long offset, int origin);
-+#endif
-+
-+#define my_llseek llseek
-+
-+#else	/* ! HAVE_LLSEEK */
-+
-+#if defined(__alpha__) || defined (__ia64__)
-+
-+#define llseek lseek
-+
-+#else /* !__alpha__ && !__ia64__*/
-+
-+#include <linux/unistd.h>
-+
-+#ifndef __NR__llseek
-+#define __NR__llseek            140
-+#endif
-+
-+#ifndef __i386__
-+static int _llseek (unsigned int, unsigned long,
-+		   unsigned long, ext2_loff_t *, unsigned int);
-+
-+static _syscall5(int,_llseek,unsigned int,fd,unsigned long,offset_high,
-+		 unsigned long, offset_low,ext2_loff_t *,result,
-+		 unsigned int, origin)
-+#endif
-+
-+static ext2_loff_t my_llseek (int fd, ext2_loff_t offset, int origin)
-+{
-+	ext2_loff_t result;
-+	int retval;
-+
-+#ifndef __i386__
-+	retval = _llseek(fd, ((unsigned long long) offset) >> 32,
-+#else			  
-+	retval = syscall(__NR__llseek, fd, (unsigned long long) (offset >> 32),
-+#endif
-+			  ((unsigned long long) offset) & 0xffffffff,
-+			&result, origin);
-+	return (retval == -1 ? (ext2_loff_t) retval : result);
-+}
-+
-+#endif	/* __alpha__ || __ia64__ */
-+
-+#endif /* HAVE_LLSEEK */
-+#endif /* defined(HAVE_LSEEK64) && defined(HAVE_LSEEK64_PROTOTYPE) */
-+
-+ext2_loff_t ext2fs_llseek (int fd, ext2_loff_t offset, int origin)
-+{
-+	ext2_loff_t result;
-+	static int do_compat = 0;
-+
-+	if ((sizeof(off_t) >= sizeof(ext2_loff_t)) ||
-+	    (offset < ((ext2_loff_t) 1 << ((sizeof(off_t)*8) -1))))
-+		return lseek(fd, (off_t) offset, origin);
-+
-+	if (do_compat) {
-+		errno = EINVAL;
-+		return -1;
-+	}
-+	
-+	result = my_llseek (fd, offset, origin);
-+	if (result == -1 && errno == ENOSYS) {
-+		/*
-+		 * Just in case this code runs on top of an old kernel
-+		 * which does not support the llseek system call
-+		 */
-+		do_compat++;
-+		errno = EINVAL;
-+	}
-+	return result;
-+}
-+
-+#else /* !linux */
-+
-+#ifndef EINVAL
-+#define EINVAL EXT2_ET_INVALID_ARGUMENT
-+#endif
-+
-+ext2_loff_t ext2fs_llseek (int fd, ext2_loff_t offset, int origin)
-+{
-+#if defined(HAVE_LSEEK64) && defined(HAVE_LSEEK64_PROTOTYPE)
-+	return lseek64 (fd, offset, origin);
-+#else
-+	if ((sizeof(off_t) < sizeof(ext2_loff_t)) &&
-+	    (offset >= ((ext2_loff_t) 1 << ((sizeof(off_t)*8) -1)))) {
-+		errno = EINVAL;
-+		return -1;
-+	}
-+	return lseek (fd, (off_t) offset, origin);
-+#endif
-+}
-+
-+#endif 	/* linux */
-+
-+
-diff -Naur silo-1.4.13.orig/libext2fs/lookup.c silo-1.4.13/libext2fs/lookup.c
---- silo-1.4.13.orig/libext2fs/lookup.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/lookup.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,69 @@
-+/*
-+ * lookup.c --- ext2fs directory lookup operations
-+ * 
-+ * Copyright (C) 1993, 1994, 1994, 1995 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+struct lookup_struct  {
-+	const char	*name;
-+	int		len;
-+	ext2_ino_t	*inode;
-+	int		found;
-+};	
-+
-+#ifdef __TURBOC__
-+ #pragma argsused
-+#endif
-+static int lookup_proc(struct ext2_dir_entry *dirent,
-+		       int	offset EXT2FS_ATTR((unused)),
-+		       int	blocksize EXT2FS_ATTR((unused)),
-+		       char	*buf EXT2FS_ATTR((unused)),
-+		       void	*priv_data)
-+{
-+	struct lookup_struct *ls = (struct lookup_struct *) priv_data;
-+
-+	if (ls->len != (dirent->name_len & 0xFF))
-+		return 0;
-+	if (strncmp(ls->name, dirent->name, (dirent->name_len & 0xFF)))
-+		return 0;
-+	*ls->inode = dirent->inode;
-+	ls->found++;
-+	return DIRENT_ABORT;
-+}
-+
-+
-+errcode_t ext2fs_lookup(ext2_filsys fs, ext2_ino_t dir, const char *name,
-+			int namelen, char *buf, ext2_ino_t *inode)
-+{
-+	errcode_t	retval;
-+	struct lookup_struct ls;
-+
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	ls.name = name;
-+	ls.len = namelen;
-+	ls.inode = inode;
-+	ls.found = 0;
-+
-+	retval = ext2fs_dir_iterate(fs, dir, 0, buf, lookup_proc, &ls);
-+	if (retval)
-+		return retval;
-+
-+	return (ls.found) ? 0 : EXT2_ET_FILE_NOT_FOUND;
-+}
-+
-+
-diff -Naur silo-1.4.13.orig/libext2fs/Makefile silo-1.4.13/libext2fs/Makefile
---- silo-1.4.13.orig/libext2fs/Makefile	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/Makefile	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,21 @@
-+
-+include ../Rules.make
-+
-+DEFS = -DLOCALEDIR=\"$(localedir)\" -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DENABLE_HTREE=1 -DENABLE_SWAPFS=1 -DPACKAGE=\"e2fsprogs\" -DVERSION=\"0.14.1\" -DHAVE_LONG_LONG=1 -DHAVE_LONG_DOUBLE=1 -DHAVE_WCHAR_T=1 -DHAVE_WINT_T=1 -DHAVE_INTTYPES_H_WITH_UINTMAX=1 -DHAVE_STDINT_H_WITH_UINTMAX=1 -DHAVE_INTMAX_T=1 -DHAVE_POSIX_PRINTF=1 -DHAVE_ALLOCA_H=1 -DHAVE_ALLOCA=1 -DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_GETPAGESIZE=1 -DHAVE_MMAP=1 -DINTDIV0_RAISES_SIGFPE=1 -DHAVE_UNSIGNED_LONG_LONG=1 -DHAVE_UINTMAX_T=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_STDINT_H=1 -DHAVE_ARGZ_H=1 -DHAVE_LIMITS_H=1 -DHAVE_LOCALE_H=1 -DHAVE_NL_TYPES_H=1 -DHAVE_MALLOC_H=1 -DHAVE_STDDEF_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_PARAM_H=1 -DHAVE_ASPRINTF=1 -DHAVE_FWPRINTF=1 -DHAVE_GETCWD=1 -DHAVE_GETEGID=1 -DHAVE_GETEUID=1 -DHAVE_GETGID=1 -DHAVE_GETUID=1 -DHAVE_MEMPCPY=1 -DHAVE_MUNMAP=1 -DHAVE_PUTENV=1 -DHAVE_SETENV=1 -DHAVE_SETLOCALE=1 -DHAVE_SNPRINTF=1 -DHAVE_STPCPY=1 -DHAVE_STRCASECMP=1 -DHAVE_STRDUP=1 -DHAVE_STRTOUL=1 -DHAVE_TSEARCH=1 -DHAVE_WCSLEN=1 -DHAVE___ARGZ_COUNT=1 -DHAVE___ARGZ_STRINGIFY=1 -DHAVE___ARGZ_NEXT=1 -DHAVE___FSETLOCKING=1 -DHAVE_DECL__SNPRINTF=0 -DHAVE_DECL__SNWPRINTF=0 -DHAVE_DECL_FEOF_UNLOCKED=1 -DHAVE_DECL_FGETS_UNLOCKED=0 -DHAVE_DECL_GETC_UNLOCKED=1 -DHAVE_ICONV=1 -DICONV_CONST= -DHAVE_LANGINFO_CODESET=1 -DHAVE_LC_MESSAGES=1 -DENABLE_NLS=1 -DHAVE_GETTEXT=1 -DHAVE_DCGETTEXT=1 -DHAVE_STDLIB_H=1 -DHAVE_UNISTD_H=1 -DHAVE_STDARG_H=1 -DHAVE_STDINT_H=1 -DHAVE_ERRNO_H=1 -DHAVE_MALLOC_H=1 -DHAVE_MNTENT_H=1 -DHAVE_PATHS_H=1 -DHAVE_DIRENT_H=1 -DHAVE_GETOPT_H=1 -DHAVE_SETJMP_H=1 -DHAVE_SIGNAL_H=1 -DHAVE_TERMIOS_H=1 -DHAVE_LINUX_FD_H=1 -DHAVE_LINUX_MAJOR_H=1 -DHAVE_SYS_IOCTL_H=1 -DHAVE_SYS_PRCTL_H=1 -DHAVE_SYS_QUEUE_H=1 -DHAVE_SYS_SOCKET_H=1 -DHAVE_SYS_SYSMACROS_H=1 -DHAVE_SYS_TIME_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_WAIT_H=1 -DHAVE_SYS_RESOURCE_H=1 -DHAVE_NETINET_IN_H=1 -DHAVE_SYS_MOUNT_H=1 -DHAVE_NET_IF_H=1 -DHAVE_VPRINTF=1 -DHAVE_RECLEN_DIRENT=1 -DHAVE_TYPE_SSIZE_T=1 -DHAVE_LSEEK64_PROTOTYPE=1 -DSIZEOF_SHORT=2 -DSIZEOF_INT=4 -DSIZEOF_LONG=4 -DSIZEOF_LONG_LONG=8 -DHAVE_INTTYPES_H=1 -DHAVE_INTPTR_T=1 -DHAVE_GETRUSAGE=1 -DHAVE_LLSEEK=1 -DHAVE_LSEEK64=1 -DHAVE_OPEN64=1 -DHAVE_STRTOULL=1 -DHAVE_STRCASECMP=1 -DHAVE_SRANDOM=1 -DHAVE_FCHOWN=1 -DHAVE_MALLINFO=1 -DHAVE_FDATASYNC=1 -DHAVE_STRNLEN=1 -DHAVE_STRPTIME=1 -DHAVE_SYSCONF=1 -DHAVE_PATHCONF=1 -DHAVE_POSIX_MEMALIGN=1 -DHAVE_MEMALIGN=1 -DHAVE_VALLOC=1 -DHAVE___SECURE_GETENV=1 -DHAVE_PRCTL=1 -DHAVE_DLOPEN=1 -DHAVE_EXT2_IOCTLS=1
-+
-+DEBUGFS_LIB_OBJS = inode_io.o namei.o write_bb_file.o 
-+RESIZE_LIB_OBJS = rs_bitmap.o dupfs.o test_io.o 
-+E2IMAGE_LIB_OBJS = imager.o
-+OBJS= $(DEBUGFS_LIB_OBJS) $(RESIZE_LIB_OBJS) $(E2IMAGE_LIB_OBJS) ext2_err.o alloc.o alloc_sb.o alloc_stats.o alloc_tables.o badblocks.o bb_inode.o bitmaps.o bitops.o block.o bmap.o check_desc.o closefs.o dblist.o dblist_dir.o dirblock.o dirhash.o dir_iterate.o expanddir.o ext_attr.o finddev.o flushb.o freefs.o gen_bitmap.o get_pathname.o getsize.o getsectsize.o icount.o ind_block.o initialize.o inline.o inode.o io_manager.o ismounted.o link.o llseek.o lookup.o mkdir.o mkjournal.o native.o newdir.o openfs.o read_bb.o read_bb_file.o res_gdt.o rw_bitmaps.o swapfs.o unix_io.o unlink.o valid_blk.o version.o
-+
-+all: libext2fs.a
-+
-+libext2fs.a: $(OBJS)
-+	$(RM) libext2fs.a
-+	$(AR) rc libext2fs.a $(OBJS)
-+
-+clean:
-+	$(RM) -f libext2fs.a $(OBJS)
-+
-+.c.o:
-+	$(CC-SILO) $(CFLAGS) $(DEFS) -c $< -o $@
-diff -Naur silo-1.4.13.orig/libext2fs/mkdir.c silo-1.4.13/libext2fs/mkdir.c
---- silo-1.4.13.orig/libext2fs/mkdir.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/mkdir.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,142 @@
-+/*
-+ * mkdir.c --- make a directory in the filesystem
-+ * 
-+ * Copyright (C) 1994, 1995 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <fcntl.h>
-+#include <time.h>
-+#if HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+#ifndef EXT2_FT_DIR
-+#define EXT2_FT_DIR		2
-+#endif
-+
-+errcode_t ext2fs_mkdir(ext2_filsys fs, ext2_ino_t parent, ext2_ino_t inum,
-+		       const char *name)
-+{
-+	errcode_t		retval;
-+	struct ext2_inode	parent_inode, inode;
-+	ext2_ino_t		ino = inum;
-+	ext2_ino_t		scratch_ino;
-+	blk_t			blk;
-+	char			*block = 0;
-+
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	/*
-+	 * Allocate an inode, if necessary
-+	 */
-+	if (!ino) {
-+		retval = ext2fs_new_inode(fs, parent, LINUX_S_IFDIR | 0755,
-+					  0, &ino);
-+		if (retval)
-+			goto cleanup;
-+	}
-+
-+	/*
-+	 * Allocate a data block for the directory
-+	 */
-+	retval = ext2fs_new_block(fs, 0, 0, &blk);
-+	if (retval)
-+		goto cleanup;
-+
-+	/*
-+	 * Create a scratch template for the directory
-+	 */
-+	retval = ext2fs_new_dir_block(fs, ino, parent, &block);
-+	if (retval)
-+		goto cleanup;
-+
-+	/*
-+	 * Get the parent's inode, if necessary
-+	 */
-+	if (parent != ino) {
-+		retval = ext2fs_read_inode(fs, parent, &parent_inode);
-+		if (retval)
-+			goto cleanup;
-+	} else
-+		memset(&parent_inode, 0, sizeof(parent_inode));
-+
-+	/*
-+	 * Create the inode structure....
-+	 */
-+	memset(&inode, 0, sizeof(struct ext2_inode));
-+	inode.i_mode = LINUX_S_IFDIR | (0777 & ~fs->umask);
-+	inode.i_uid = inode.i_gid = 0;
-+	inode.i_blocks = fs->blocksize / 512;
-+	inode.i_block[0] = blk;
-+	inode.i_links_count = 2;
-+	inode.i_ctime = inode.i_atime = inode.i_mtime = time(NULL);
-+	inode.i_size = fs->blocksize;
-+
-+	/*
-+	 * Write out the inode and inode data block
-+	 */
-+	retval = ext2fs_write_dir_block(fs, blk, block);
-+	if (retval)
-+		goto cleanup;
-+	retval = ext2fs_write_new_inode(fs, ino, &inode); 
-+	if (retval)
-+		goto cleanup;
-+
-+	/*
-+	 * Link the directory into the filesystem hierarchy
-+	 */
-+	if (name) {
-+		retval = ext2fs_lookup(fs, parent, name, strlen(name), 0,
-+				       &scratch_ino);
-+		if (!retval) {
-+			retval = EXT2_ET_DIR_EXISTS;
-+			name = 0;
-+			goto cleanup;
-+		}
-+		if (retval != EXT2_ET_FILE_NOT_FOUND)
-+			goto cleanup;
-+		retval = ext2fs_link(fs, parent, name, ino, EXT2_FT_DIR);
-+		if (retval)
-+			goto cleanup;
-+	}
-+
-+	/*
-+	 * Update parent inode's counts
-+	 */
-+	if (parent != ino) {
-+		parent_inode.i_links_count++;
-+		retval = ext2fs_write_inode(fs, parent, &parent_inode);
-+		if (retval)
-+			goto cleanup;
-+	}
-+	
-+	/*
-+	 * Update accounting....
-+	 */
-+	ext2fs_block_alloc_stats(fs, blk, +1);
-+	ext2fs_inode_alloc_stats2(fs, ino, +1, 1);
-+
-+cleanup:
-+	if (block)
-+		ext2fs_free_mem(&block);
-+	return retval;
-+
-+}
-+
-+
-diff -Naur silo-1.4.13.orig/libext2fs/mkjournal.c silo-1.4.13/libext2fs/mkjournal.c
---- silo-1.4.13.orig/libext2fs/mkjournal.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/mkjournal.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,425 @@
-+/*
-+ * mkjournal.c --- make a journal for a filesystem
-+ *
-+ * Copyright (C) 2000 Theodore Ts'o.
-+ * 
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#if HAVE_ERRNO_H
-+#include <errno.h>
-+#endif
-+#include <fcntl.h>
-+#include <time.h>
-+#if HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+#if HAVE_SYS_IOCTL_H
-+#include <sys/ioctl.h>
-+#endif
-+#if HAVE_NETINET_IN_H
-+#include <netinet/in.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "e2p/e2p.h"
-+#include "ext2fs.h"
-+#include "jfs_user.h"
-+
-+/*
-+ * This function automatically sets up the journal superblock and
-+ * returns it as an allocated block.
-+ */
-+errcode_t ext2fs_create_journal_superblock(ext2_filsys fs,
-+					   __u32 size, int flags,
-+					   char  **ret_jsb)
-+{
-+	errcode_t		retval;
-+	journal_superblock_t	*jsb;
-+
-+	if (size < 1024)
-+		return EXT2_ET_JOURNAL_TOO_SMALL;
-+
-+	if ((retval = ext2fs_get_mem(fs->blocksize, &jsb)))
-+		return retval;
-+
-+	memset (jsb, 0, fs->blocksize);
-+
-+	jsb->s_header.h_magic = htonl(JFS_MAGIC_NUMBER);
-+	if (flags & EXT2_MKJOURNAL_V1_SUPER)
-+		jsb->s_header.h_blocktype = htonl(JFS_SUPERBLOCK_V1);
-+	else
-+		jsb->s_header.h_blocktype = htonl(JFS_SUPERBLOCK_V2);
-+	jsb->s_blocksize = htonl(fs->blocksize);
-+	jsb->s_maxlen = htonl(size);
-+	jsb->s_nr_users = htonl(1);
-+	jsb->s_first = htonl(1);
-+	jsb->s_sequence = htonl(1);
-+	memcpy(jsb->s_uuid, fs->super->s_uuid, sizeof(fs->super->s_uuid));
-+	/*
-+	 * If we're creating an external journal device, we need to
-+	 * adjust these fields.
-+	 */
-+	if (fs->super->s_feature_incompat &
-+	    EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) {
-+		jsb->s_nr_users = 0;
-+		if (fs->blocksize == 1024)
-+			jsb->s_first = htonl(3);
-+		else
-+			jsb->s_first = htonl(2);
-+	}
-+
-+	*ret_jsb = (char *) jsb;
-+	return 0;
-+}
-+
-+/*
-+ * This function writes a journal using POSIX routines.  It is used
-+ * for creating external journals and creating journals on live
-+ * filesystems.
-+ */
-+static errcode_t write_journal_file(ext2_filsys fs, char *filename,
-+				    blk_t size, int flags)
-+{
-+	errcode_t	retval;
-+	char		*buf = 0;
-+	int		fd, ret_size;
-+	blk_t		i;
-+
-+	if ((retval = ext2fs_create_journal_superblock(fs, size, flags, &buf)))
-+		return retval;
-+
-+	/* Open the device or journal file */
-+	if ((fd = open(filename, O_WRONLY)) < 0) {
-+		retval = errno;
-+		goto errout;
-+	}
-+
-+	/* Write the superblock out */
-+	retval = EXT2_ET_SHORT_WRITE;
-+	ret_size = write(fd, buf, fs->blocksize);
-+	if (ret_size < 0) {
-+		retval = errno;
-+		goto errout;
-+	}
-+	if (ret_size != (int) fs->blocksize)
-+		goto errout;
-+	memset(buf, 0, fs->blocksize);
-+
-+	for (i = 1; i < size; i++) {
-+		ret_size = write(fd, buf, fs->blocksize);
-+		if (ret_size < 0) {
-+			retval = errno;
-+			goto errout;
-+		}
-+		if (ret_size != (int) fs->blocksize)
-+			goto errout;
-+	}
-+	close(fd);
-+
-+	retval = 0;
-+errout:
-+	ext2fs_free_mem(&buf);
-+	return retval;
-+}
-+
-+/*
-+ * Helper function for creating the journal using direct I/O routines
-+ */
-+struct mkjournal_struct {
-+	int		num_blocks;
-+	int		newblocks;
-+	char		*buf;
-+	errcode_t	err;
-+};
-+
-+static int mkjournal_proc(ext2_filsys	fs,
-+			   blk_t	*blocknr,
-+			   e2_blkcnt_t	blockcnt,
-+			   blk_t	ref_block EXT2FS_ATTR((unused)),
-+			   int		ref_offset EXT2FS_ATTR((unused)),
-+			   void		*priv_data)
-+{
-+	struct mkjournal_struct *es = (struct mkjournal_struct *) priv_data;
-+	blk_t	new_blk;
-+	static blk_t	last_blk = 0;
-+	errcode_t	retval;
-+	
-+	if (*blocknr) {
-+		last_blk = *blocknr;
-+		return 0;
-+	}
-+	retval = ext2fs_new_block(fs, last_blk, 0, &new_blk);
-+	if (retval) {
-+		es->err = retval;
-+		return BLOCK_ABORT;
-+	}
-+	if (blockcnt > 0)
-+		es->num_blocks--;
-+
-+	es->newblocks++;
-+	retval = io_channel_write_blk(fs->io, new_blk, 1, es->buf);
-+
-+	if (blockcnt == 0)
-+		memset(es->buf, 0, fs->blocksize);
-+
-+	if (retval) {
-+		es->err = retval;
-+		return BLOCK_ABORT;
-+	}
-+	*blocknr = new_blk;
-+	last_blk = new_blk;
-+	ext2fs_block_alloc_stats(fs, new_blk, +1);
-+
-+	if (es->num_blocks == 0)
-+		return (BLOCK_CHANGED | BLOCK_ABORT);
-+	else
-+		return BLOCK_CHANGED;
-+	
-+}
-+
-+/*
-+ * This function creates a journal using direct I/O routines.
-+ */
-+static errcode_t write_journal_inode(ext2_filsys fs, ext2_ino_t journal_ino,
-+				     blk_t size, int flags)
-+{
-+	char			*buf;
-+	errcode_t		retval;
-+	struct ext2_inode	inode;
-+	struct mkjournal_struct	es;
-+
-+	if ((retval = ext2fs_create_journal_superblock(fs, size, flags, &buf)))
-+		return retval;
-+	
-+	if ((retval = ext2fs_read_bitmaps(fs)))
-+		return retval;
-+
-+	if ((retval = ext2fs_read_inode(fs, journal_ino, &inode)))
-+		return retval;
-+
-+	if (inode.i_blocks > 0)
-+		return EEXIST;
-+
-+	es.num_blocks = size;
-+	es.newblocks = 0;
-+	es.buf = buf;
-+	es.err = 0;
-+
-+	retval = ext2fs_block_iterate2(fs, journal_ino, BLOCK_FLAG_APPEND,
-+				       0, mkjournal_proc, &es);
-+	if (es.err) {
-+		retval = es.err;
-+		goto errout;
-+	}
-+
-+	if ((retval = ext2fs_read_inode(fs, journal_ino, &inode)))
-+		goto errout;
-+
-+ 	inode.i_size += fs->blocksize * size;
-+	inode.i_blocks += (fs->blocksize / 512) * es.newblocks;
-+	inode.i_mtime = inode.i_ctime = time(0);
-+	inode.i_links_count = 1;
-+	inode.i_mode = LINUX_S_IFREG | 0600;
-+
-+	if ((retval = ext2fs_write_inode(fs, journal_ino, &inode)))
-+		goto errout;
-+	retval = 0;
-+
-+	memcpy(fs->super->s_jnl_blocks, inode.i_block, EXT2_N_BLOCKS*4);
-+	fs->super->s_jnl_blocks[16] = inode.i_size;
-+	fs->super->s_jnl_backup_type = EXT3_JNL_BACKUP_BLOCKS;
-+	ext2fs_mark_super_dirty(fs);
-+
-+errout:
-+	ext2fs_free_mem(&buf);
-+	return retval;
-+}
-+
-+/*
-+ * This function adds a journal device to a filesystem
-+ */
-+errcode_t ext2fs_add_journal_device(ext2_filsys fs, ext2_filsys journal_dev)
-+{
-+	struct stat	st;
-+	errcode_t	retval;
-+	char		buf[1024];
-+	journal_superblock_t	*jsb;
-+	int		start;
-+	__u32		i, nr_users;
-+
-+	/* Make sure the device exists and is a block device */
-+	if (stat(journal_dev->device_name, &st) < 0)
-+		return errno;
-+	
-+	if (!S_ISBLK(st.st_mode))
-+		return EXT2_ET_JOURNAL_NOT_BLOCK; /* Must be a block device */
-+
-+	/* Get the journal superblock */
-+	start = 1;
-+	if (journal_dev->blocksize == 1024)
-+		start++;
-+	if ((retval = io_channel_read_blk(journal_dev->io, start, -1024, buf)))
-+		return retval;
-+
-+	jsb = (journal_superblock_t *) buf;
-+	if ((jsb->s_header.h_magic != (unsigned) ntohl(JFS_MAGIC_NUMBER)) ||
-+	    (jsb->s_header.h_blocktype != (unsigned) ntohl(JFS_SUPERBLOCK_V2)))
-+		return EXT2_ET_NO_JOURNAL_SB;
-+
-+	if (ntohl(jsb->s_blocksize) != (unsigned long) fs->blocksize)
-+		return EXT2_ET_UNEXPECTED_BLOCK_SIZE;
-+
-+	/* Check and see if this filesystem has already been added */
-+	nr_users = ntohl(jsb->s_nr_users);
-+	for (i=0; i < nr_users; i++) {
-+		if (memcmp(fs->super->s_uuid,
-+			   &jsb->s_users[i*16], 16) == 0)
-+			break;
-+	}
-+	if (i >= nr_users) {
-+		memcpy(&jsb->s_users[nr_users*16],
-+		       fs->super->s_uuid, 16);
-+		jsb->s_nr_users = htonl(nr_users+1);
-+	}
-+
-+	/* Writeback the journal superblock */
-+	if ((retval = io_channel_write_blk(journal_dev->io, start, -1024, buf)))
-+		return retval;
-+	
-+	fs->super->s_journal_inum = 0;
-+	fs->super->s_journal_dev = st.st_rdev;
-+	memcpy(fs->super->s_journal_uuid, jsb->s_uuid,
-+	       sizeof(fs->super->s_journal_uuid));
-+	fs->super->s_feature_compat |= EXT3_FEATURE_COMPAT_HAS_JOURNAL;
-+	ext2fs_mark_super_dirty(fs);
-+	return 0;
-+}
-+
-+/*
-+ * This function adds a journal inode to a filesystem, using either
-+ * POSIX routines if the filesystem is mounted, or using direct I/O
-+ * functions if it is not.
-+ */
-+errcode_t ext2fs_add_journal_inode(ext2_filsys fs, blk_t size, int flags)
-+{
-+	errcode_t		retval;
-+	ext2_ino_t		journal_ino;
-+	struct stat		st;
-+	char			jfile[1024];
-+	int			fd, mount_flags, f;
-+
-+	if ((retval = ext2fs_check_mount_point(fs->device_name, &mount_flags,
-+					       jfile, sizeof(jfile)-10)))
-+		return retval;
-+
-+	if (mount_flags & EXT2_MF_MOUNTED) {
-+		strcat(jfile, "/.journal");
-+
-+		/*
-+		 * If .../.journal already exists, make sure any 
-+		 * immutable or append-only flags are cleared.
-+		 */
-+#if defined(HAVE_CHFLAGS) && defined(UF_NODUMP)
-+		(void) chflags (jfile, 0);
-+#else
-+#if HAVE_EXT2_IOCTLS
-+		fd = open(jfile, O_RDONLY);
-+		if (fd >= 0) {
-+			f = 0;
-+			ioctl(fd, EXT2_IOC_SETFLAGS, &f);
-+			close(fd);
-+		}
-+#endif
-+#endif
-+
-+		/* Create the journal file */
-+		if ((fd = open(jfile, O_CREAT|O_WRONLY, 0600)) < 0)
-+			return errno;
-+
-+		if ((retval = write_journal_file(fs, jfile, size, flags)))
-+			goto errout;
-+		
-+		/* Get inode number of the journal file */
-+		if (fstat(fd, &st) < 0)
-+			goto errout;
-+
-+#if defined(HAVE_CHFLAGS) && defined(UF_NODUMP)
-+		retval = fchflags (fd, UF_NODUMP|UF_IMMUTABLE);
-+#else
-+#if HAVE_EXT2_IOCTLS
-+		f = EXT2_NODUMP_FL | EXT2_IMMUTABLE_FL;
-+		retval = ioctl(fd, EXT2_IOC_SETFLAGS, &f);
-+#endif
-+#endif
-+		if (retval)
-+			goto errout;
-+		
-+		close(fd);
-+		journal_ino = st.st_ino;
-+	} else {
-+		journal_ino = EXT2_JOURNAL_INO;
-+		if ((retval = write_journal_inode(fs, journal_ino,
-+						  size, flags)))
-+			return retval;
-+	}
-+	
-+	fs->super->s_journal_inum = journal_ino;
-+	fs->super->s_journal_dev = 0;
-+	memset(fs->super->s_journal_uuid, 0,
-+	       sizeof(fs->super->s_journal_uuid));
-+	fs->super->s_feature_compat |= EXT3_FEATURE_COMPAT_HAS_JOURNAL;
-+
-+	ext2fs_mark_super_dirty(fs);
-+	return 0;
-+errout:
-+	close(fd);
-+	return retval;
-+}
-+
-+#ifdef DEBUG
-+main(int argc, char **argv)
-+{
-+	errcode_t	retval;
-+	char		*device_name;
-+	ext2_filsys 	fs;
-+
-+	if (argc < 2) {
-+		fprintf(stderr, "Usage: %s filesystem\n", argv[0]);
-+		exit(1);
-+	}
-+	device_name = argv[1];
-+	
-+	retval = ext2fs_open (device_name, EXT2_FLAG_RW, 0, 0,
-+			      unix_io_manager, &fs);
-+	if (retval) {
-+		com_err(argv[0], retval, "while opening %s", device_name);
-+		exit(1);
-+	}
-+
-+	retval = ext2fs_add_journal_inode(fs, 1024);
-+	if (retval) {
-+		com_err(argv[0], retval, "while adding journal to %s",
-+			device_name);
-+		exit(1);
-+	}
-+	retval = ext2fs_flush(fs);
-+	if (retval) {
-+		printf("Warning, had trouble writing out superblocks.\n");
-+	}
-+	ext2fs_close(fs);
-+	exit(0);
-+	
-+}
-+#endif
-diff -Naur silo-1.4.13.orig/libext2fs/namei.c silo-1.4.13/libext2fs/namei.c
---- silo-1.4.13.orig/libext2fs/namei.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/namei.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,205 @@
-+/*
-+ * namei.c --- ext2fs directory lookup operations
-+ * 
-+ * Copyright (C) 1993, 1994, 1994, 1995 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+
-+/* #define NAMEI_DEBUG */
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+static errcode_t open_namei(ext2_filsys fs, ext2_ino_t root, ext2_ino_t base,
-+			    const char *pathname, size_t pathlen, int follow,
-+			    int link_count, char *buf, ext2_ino_t *res_inode);
-+
-+static errcode_t follow_link(ext2_filsys fs, ext2_ino_t root, ext2_ino_t dir,
-+			     ext2_ino_t inode, int link_count,
-+			     char *buf, ext2_ino_t *res_inode)
-+{
-+	char *pathname;
-+	char *buffer = 0;
-+	errcode_t retval;
-+	struct ext2_inode ei;
-+
-+#ifdef NAMEI_DEBUG
-+	printf("follow_link: root=%lu, dir=%lu, inode=%lu, lc=%d\n",
-+	       root, dir, inode, link_count);
-+	
-+#endif
-+	retval = ext2fs_read_inode (fs, inode, &ei);
-+	if (retval) return retval;
-+	if (!LINUX_S_ISLNK (ei.i_mode)) {
-+		*res_inode = inode;
-+		return 0;
-+	}
-+	if (link_count++ > 5) {
-+		return EXT2_ET_SYMLINK_LOOP;
-+	}
-+	if (ext2fs_inode_data_blocks(fs,&ei)) {
-+		retval = ext2fs_get_mem(fs->blocksize, &buffer);
-+		if (retval)
-+			return retval;
-+		retval = io_channel_read_blk(fs->io, ei.i_block[0], 1, buffer);
-+		if (retval) {
-+			ext2fs_free_mem(&buffer);
-+			return retval;
-+		}
-+		pathname = buffer;
-+	} else
-+		pathname = (char *)&(ei.i_block[0]);
-+	retval = open_namei(fs, root, dir, pathname, ei.i_size, 1,
-+			    link_count, buf, res_inode);
-+	if (buffer)
-+		ext2fs_free_mem(&buffer);
-+	return retval;
-+}
-+
-+/*
-+ * This routine interprets a pathname in the context of the current
-+ * directory and the root directory, and returns the inode of the
-+ * containing directory, and a pointer to the filename of the file
-+ * (pointing into the pathname) and the length of the filename.
-+ */
-+static errcode_t dir_namei(ext2_filsys fs, ext2_ino_t root, ext2_ino_t dir,
-+			   const char *pathname, int pathlen,
-+			   int link_count, char *buf,
-+			   const char **name, int *namelen,
-+			   ext2_ino_t *res_inode)
-+{
-+	char c;
-+	const char *thisname;
-+	int len;
-+	ext2_ino_t inode;
-+	errcode_t retval;
-+
-+	if ((c = *pathname) == '/') {
-+        	dir = root;
-+		pathname++;
-+		pathlen--;
-+	}
-+	while (1) {
-+        	thisname = pathname;
-+		for (len=0; --pathlen >= 0;len++) {
-+			c = *(pathname++);
-+			if (c == '/')
-+				break;
-+		}
-+		if (pathlen < 0)
-+			break;
-+		retval = ext2fs_lookup (fs, dir, thisname, len, buf, &inode);
-+		if (retval) return retval;
-+        	retval = follow_link (fs, root, dir, inode,
-+				      link_count, buf, &dir);
-+        	if (retval) return retval;
-+    	}
-+	*name = thisname;
-+	*namelen = len;
-+	*res_inode = dir;
-+	return 0;
-+}
-+
-+static errcode_t open_namei(ext2_filsys fs, ext2_ino_t root, ext2_ino_t base,
-+			    const char *pathname, size_t pathlen, int follow,
-+			    int link_count, char *buf, ext2_ino_t *res_inode)
-+{
-+	const char *basename;
-+	int namelen;
-+	ext2_ino_t dir, inode;
-+	errcode_t retval;
-+
-+#ifdef NAMEI_DEBUG
-+	printf("open_namei: root=%lu, dir=%lu, path=%*s, lc=%d\n",
-+	       root, base, pathlen, pathname, link_count);
-+#endif
-+	retval = dir_namei(fs, root, base, pathname, pathlen,
-+			   link_count, buf, &basename, &namelen, &dir);
-+	if (retval) return retval;
-+	if (!namelen) {                     /* special case: '/usr/' etc */
-+		*res_inode=dir;
-+		return 0;
-+	}
-+	retval = ext2fs_lookup (fs, dir, basename, namelen, buf, &inode);
-+	if (retval)
-+		return retval;
-+	if (follow) {
-+		retval = follow_link(fs, root, dir, inode, link_count,
-+				     buf, &inode);
-+		if (retval)
-+			return retval;
-+	}
-+#ifdef NAMEI_DEBUG
-+	printf("open_namei: (link_count=%d) returns %lu\n",
-+	       link_count, inode);
-+#endif
-+	*res_inode = inode;
-+	return 0;
-+}
-+
-+errcode_t ext2fs_namei(ext2_filsys fs, ext2_ino_t root, ext2_ino_t cwd,
-+		       const char *name, ext2_ino_t *inode)
-+{
-+	char *buf;
-+	errcode_t retval;
-+	
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	retval = ext2fs_get_mem(fs->blocksize, &buf);
-+	if (retval)
-+		return retval;
-+	
-+	retval = open_namei(fs, root, cwd, name, strlen(name), 0, 0,
-+			    buf, inode);
-+
-+	ext2fs_free_mem(&buf);
-+	return retval;
-+}
-+
-+errcode_t ext2fs_namei_follow(ext2_filsys fs, ext2_ino_t root, ext2_ino_t cwd,
-+			      const char *name, ext2_ino_t *inode)
-+{
-+	char *buf;
-+	errcode_t retval;
-+	
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	retval = ext2fs_get_mem(fs->blocksize, &buf);
-+	if (retval)
-+		return retval;
-+	
-+	retval = open_namei(fs, root, cwd, name, strlen(name), 1, 0,
-+			    buf, inode);
-+
-+	ext2fs_free_mem(&buf);
-+	return retval;
-+}
-+
-+errcode_t ext2fs_follow_link(ext2_filsys fs, ext2_ino_t root, ext2_ino_t cwd,
-+			ext2_ino_t inode, ext2_ino_t *res_inode)
-+{
-+	char *buf;
-+	errcode_t retval;
-+	
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	retval = ext2fs_get_mem(fs->blocksize, &buf);
-+	if (retval)
-+		return retval;
-+
-+	retval = follow_link(fs, root, cwd, inode, 0, buf, res_inode);
-+
-+	ext2fs_free_mem(&buf);
-+	return retval;
-+}
-+
-diff -Naur silo-1.4.13.orig/libext2fs/native.c silo-1.4.13/libext2fs/native.c
---- silo-1.4.13.orig/libext2fs/native.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/native.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,27 @@
-+/*
-+ * native.c --- returns the ext2_flag for a native byte order
-+ * 
-+ * Copyright (C) 1996 Theodore Ts'o.
-+ * 
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+int ext2fs_native_flag(void)
-+{
-+#ifdef WORDS_BIGENDIAN
-+	return EXT2_FLAG_SWAP_BYTES;
-+#else
-+	return 0;
-+#endif
-+}
-+
-+	
-+	
-diff -Naur silo-1.4.13.orig/libext2fs/newdir.c silo-1.4.13/libext2fs/newdir.c
---- silo-1.4.13.orig/libext2fs/newdir.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/newdir.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,72 @@
-+/*
-+ * newdir.c --- create a new directory block
-+ * 
-+ * Copyright (C) 1994, 1995 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+#ifndef EXT2_FT_DIR
-+#define EXT2_FT_DIR		2
-+#endif
-+
-+/*
-+ * Create new directory block
-+ */
-+errcode_t ext2fs_new_dir_block(ext2_filsys fs, ext2_ino_t dir_ino,
-+			       ext2_ino_t parent_ino, char **block)
-+{
-+	struct ext2_dir_entry 	*dir = NULL;
-+	errcode_t		retval;
-+	char			*buf;
-+	int			rec_len;
-+	int			filetype = 0;
-+
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	retval = ext2fs_get_mem(fs->blocksize, &buf);
-+	if (retval)
-+		return retval;
-+	memset(buf, 0, fs->blocksize);
-+	dir = (struct ext2_dir_entry *) buf;
-+	dir->rec_len = fs->blocksize;
-+
-+	if (dir_ino) {
-+		if (fs->super->s_feature_incompat &
-+		    EXT2_FEATURE_INCOMPAT_FILETYPE)
-+			filetype = EXT2_FT_DIR << 8;
-+		/*
-+		 * Set up entry for '.'
-+		 */
-+		dir->inode = dir_ino;
-+		dir->name_len = 1 | filetype;
-+		dir->name[0] = '.';
-+		rec_len = dir->rec_len - EXT2_DIR_REC_LEN(1);
-+		dir->rec_len = EXT2_DIR_REC_LEN(1);
-+
-+		/*
-+		 * Set up entry for '..'
-+		 */
-+		dir = (struct ext2_dir_entry *) (buf + dir->rec_len);
-+		dir->rec_len = rec_len;
-+		dir->inode = parent_ino;
-+		dir->name_len = 2 | filetype;
-+		dir->name[0] = '.';
-+		dir->name[1] = '.';
-+		
-+	}
-+	*block = buf;
-+	return 0;
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/nt_io.c silo-1.4.13/libext2fs/nt_io.c
---- silo-1.4.13.orig/libext2fs/nt_io.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/nt_io.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,1513 @@
-+/*
-+ * nt_io.c --- This is the Nt I/O interface to the I/O manager.
-+ *
-+ * Implements a one-block write-through cache.
-+ *
-+ * Copyright (C) 1993, 1994, 1995 Theodore Ts'o.
-+ * Copyright (C) 1998 Andrey Shedel (andreys@ns.cr.cyco.com)
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+
-+//
-+// I need some warnings to disable...
-+//
-+
-+
-+#pragma warning(disable:4514) // unreferenced inline function has been removed
-+#pragma warning(push,4)
-+
-+#pragma warning(disable:4201) // nonstandard extension used : nameless struct/union)
-+#pragma warning(disable:4214) // nonstandard extension used : bit field types other than int
-+#pragma warning(disable:4115) // named type definition in parentheses
-+
-+#include <ntddk.h>
-+#include <ntdddisk.h>
-+#include <ntstatus.h>
-+
-+#pragma warning(pop)
-+
-+
-+//
-+// Some native APIs.
-+//
-+
-+NTSYSAPI
-+ULONG
-+NTAPI
-+RtlNtStatusToDosError(
-+    IN NTSTATUS Status
-+   );
-+
-+NTSYSAPI
-+NTSTATUS
-+NTAPI
-+NtClose(
-+    IN HANDLE Handle
-+   );
-+
-+
-+NTSYSAPI
-+NTSTATUS
-+NTAPI
-+NtOpenFile(
-+    OUT PHANDLE FileHandle,
-+    IN ACCESS_MASK DesiredAccess,
-+    IN POBJECT_ATTRIBUTES ObjectAttributes,
-+    OUT PIO_STATUS_BLOCK IoStatusBlock,
-+    IN ULONG ShareAccess,
-+    IN ULONG OpenOptions
-+    );
-+
-+NTSYSAPI
-+NTSTATUS
-+NTAPI
-+NtFlushBuffersFile(
-+    IN HANDLE FileHandle,
-+    OUT PIO_STATUS_BLOCK IoStatusBlock
-+   );
-+
-+
-+NTSYSAPI
-+NTSTATUS
-+NTAPI
-+NtReadFile(
-+    IN HANDLE FileHandle,
-+    IN HANDLE Event OPTIONAL,
-+    IN PIO_APC_ROUTINE ApcRoutine OPTIONAL,
-+    IN PVOID ApcContext OPTIONAL,
-+    OUT PIO_STATUS_BLOCK IoStatusBlock,
-+    OUT PVOID Buffer,
-+    IN ULONG Length,
-+    IN PLARGE_INTEGER ByteOffset OPTIONAL,
-+    IN PULONG Key OPTIONAL
-+    );
-+
-+NTSYSAPI
-+NTSTATUS
-+NTAPI
-+NtWriteFile(
-+    IN HANDLE FileHandle,
-+    IN HANDLE Event OPTIONAL,
-+    IN PIO_APC_ROUTINE ApcRoutine OPTIONAL,
-+    IN PVOID ApcContext OPTIONAL,
-+    OUT PIO_STATUS_BLOCK IoStatusBlock,
-+    IN PVOID Buffer,
-+    IN ULONG Length,
-+    IN PLARGE_INTEGER ByteOffset OPTIONAL,
-+    IN PULONG Key OPTIONAL
-+    );
-+
-+NTSYSAPI
-+NTSTATUS
-+NTAPI
-+NtDeviceIoControlFile(
-+    IN HANDLE FileHandle,
-+    IN HANDLE Event OPTIONAL,
-+    IN PIO_APC_ROUTINE ApcRoutine OPTIONAL,
-+    IN PVOID ApcContext OPTIONAL,
-+    OUT PIO_STATUS_BLOCK IoStatusBlock,
-+    IN ULONG IoControlCode,
-+    IN PVOID InputBuffer OPTIONAL,
-+    IN ULONG InputBufferLength,
-+    OUT PVOID OutputBuffer OPTIONAL,
-+    IN ULONG OutputBufferLength
-+    );
-+
-+NTSYSAPI
-+NTSTATUS
-+NTAPI
-+NtFsControlFile(
-+    IN HANDLE FileHandle,
-+    IN HANDLE Event OPTIONAL,
-+    IN PIO_APC_ROUTINE ApcRoutine OPTIONAL,
-+    IN PVOID ApcContext OPTIONAL,
-+    OUT PIO_STATUS_BLOCK IoStatusBlock,
-+    IN ULONG IoControlCode,
-+    IN PVOID InputBuffer OPTIONAL,
-+    IN ULONG InputBufferLength,
-+    OUT PVOID OutputBuffer OPTIONAL,
-+    IN ULONG OutputBufferLength
-+    );
-+
-+
-+NTSYSAPI
-+NTSTATUS
-+NTAPI
-+NtDelayExecution(
-+    IN BOOLEAN Alertable,
-+    IN PLARGE_INTEGER Interval
-+    );
-+
-+
-+#define FSCTL_LOCK_VOLUME               CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 6, METHOD_BUFFERED, FILE_ANY_ACCESS)
-+#define FSCTL_UNLOCK_VOLUME             CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 7, METHOD_BUFFERED, FILE_ANY_ACCESS)
-+#define FSCTL_DISMOUNT_VOLUME           CTL_CODE(FILE_DEVICE_FILE_SYSTEM, 8, METHOD_BUFFERED, FILE_ANY_ACCESS)
-+#define FSCTL_IS_VOLUME_MOUNTED         CTL_CODE(FILE_DEVICE_FILE_SYSTEM,10, METHOD_BUFFERED, FILE_ANY_ACCESS)
-+
-+
-+//
-+// useful macros
-+//
-+
-+#define BooleanFlagOn(Flags,SingleFlag) ((BOOLEAN)((((Flags) & (SingleFlag)) != 0)))
-+
-+
-+//
-+// Include Win32 error codes.
-+//
-+
-+#include <winerror.h>
-+
-+//
-+// standard stuff
-+//
-+
-+#include <assert.h>
-+#include <stdio.h>
-+#include <string.h>
-+#include <stdlib.h>
-+#include <malloc.h>
-+
-+#include <linux/types.h>
-+#include "ext2_fs.h"
-+#include <errno.h>
-+
-+#include "et/com_err.h"
-+#include "ext2fs/ext2fs.h"
-+#include "ext2fs/ext2_err.h"
-+
-+
-+
-+
-+//
-+// For checking structure magic numbers...
-+//
-+
-+
-+#define EXT2_CHECK_MAGIC(struct, code) \
-+	  if ((struct)->magic != (code)) return (code)
-+
-+#define EXT2_ET_MAGIC_NT_IO_CHANNEL  0x10ed
-+
-+
-+//
-+// Private data block
-+//
-+
-+typedef struct _NT_PRIVATE_DATA {
-+	int	   magic;
-+	HANDLE Handle;
-+	int	   Flags;
-+	PCHAR  Buffer;
-+	__u32  BufferBlockNumber;
-+	ULONG  BufferSize;
-+	BOOLEAN OpenedReadonly;
-+	BOOLEAN Written;
-+}NT_PRIVATE_DATA, *PNT_PRIVATE_DATA;
-+
-+
-+
-+//
-+// Standard interface prototypes
-+//
-+
-+static errcode_t nt_open(const char *name, int flags, io_channel *channel);
-+static errcode_t nt_close(io_channel channel);
-+static errcode_t nt_set_blksize(io_channel channel, int blksize);
-+static errcode_t nt_read_blk(io_channel channel, unsigned long block,
-+			       int count, void *data);
-+static errcode_t nt_write_blk(io_channel channel, unsigned long block,
-+				int count, const void *data);
-+static errcode_t nt_flush(io_channel channel);
-+
-+static struct struct_io_manager struct_nt_manager = {
-+	EXT2_ET_MAGIC_IO_MANAGER,
-+	"NT I/O Manager",
-+	nt_open,
-+	nt_close,
-+	nt_set_blksize,
-+	nt_read_blk,
-+	nt_write_blk,
-+	nt_flush
-+};
-+
-+
-+
-+//
-+// function to get API
-+//
-+
-+io_manager nt_io_manager()
-+{
-+	return &struct_nt_manager;
-+}
-+
-+
-+
-+
-+
-+//
-+// This is a code to convert Win32 errors to unix errno
-+//
-+
-+typedef struct {
-+	ULONG WinError;
-+	int errnocode;
-+}ERROR_ENTRY;
-+
-+static ERROR_ENTRY ErrorTable[] = {
-+        {  ERROR_INVALID_FUNCTION,       EINVAL    },
-+        {  ERROR_FILE_NOT_FOUND,         ENOENT    },
-+        {  ERROR_PATH_NOT_FOUND,         ENOENT    },
-+        {  ERROR_TOO_MANY_OPEN_FILES,    EMFILE    },
-+        {  ERROR_ACCESS_DENIED,          EACCES    },
-+        {  ERROR_INVALID_HANDLE,         EBADF     },
-+        {  ERROR_ARENA_TRASHED,          ENOMEM    },
-+        {  ERROR_NOT_ENOUGH_MEMORY,      ENOMEM    },
-+        {  ERROR_INVALID_BLOCK,          ENOMEM    },
-+        {  ERROR_BAD_ENVIRONMENT,        E2BIG     },
-+        {  ERROR_BAD_FORMAT,             ENOEXEC   },
-+        {  ERROR_INVALID_ACCESS,         EINVAL    },
-+        {  ERROR_INVALID_DATA,           EINVAL    },
-+        {  ERROR_INVALID_DRIVE,          ENOENT    },
-+        {  ERROR_CURRENT_DIRECTORY,      EACCES    },
-+        {  ERROR_NOT_SAME_DEVICE,        EXDEV     },
-+        {  ERROR_NO_MORE_FILES,          ENOENT    },
-+        {  ERROR_LOCK_VIOLATION,         EACCES    },
-+        {  ERROR_BAD_NETPATH,            ENOENT    },
-+        {  ERROR_NETWORK_ACCESS_DENIED,  EACCES    },
-+        {  ERROR_BAD_NET_NAME,           ENOENT    },
-+        {  ERROR_FILE_EXISTS,            EEXIST    },
-+        {  ERROR_CANNOT_MAKE,            EACCES    },
-+        {  ERROR_FAIL_I24,               EACCES    },
-+        {  ERROR_INVALID_PARAMETER,      EINVAL    },
-+        {  ERROR_NO_PROC_SLOTS,          EAGAIN    },
-+        {  ERROR_DRIVE_LOCKED,           EACCES    },
-+        {  ERROR_BROKEN_PIPE,            EPIPE     },
-+        {  ERROR_DISK_FULL,              ENOSPC    },
-+        {  ERROR_INVALID_TARGET_HANDLE,  EBADF     },
-+        {  ERROR_INVALID_HANDLE,         EINVAL    },
-+        {  ERROR_WAIT_NO_CHILDREN,       ECHILD    },
-+        {  ERROR_CHILD_NOT_COMPLETE,     ECHILD    },
-+        {  ERROR_DIRECT_ACCESS_HANDLE,   EBADF     },
-+        {  ERROR_NEGATIVE_SEEK,          EINVAL    },
-+        {  ERROR_SEEK_ON_DEVICE,         EACCES    },
-+        {  ERROR_DIR_NOT_EMPTY,          ENOTEMPTY },
-+        {  ERROR_NOT_LOCKED,             EACCES    },
-+        {  ERROR_BAD_PATHNAME,           ENOENT    },
-+        {  ERROR_MAX_THRDS_REACHED,      EAGAIN    },
-+        {  ERROR_LOCK_FAILED,            EACCES    },
-+        {  ERROR_ALREADY_EXISTS,         EEXIST    },
-+        {  ERROR_FILENAME_EXCED_RANGE,   ENOENT    },
-+        {  ERROR_NESTING_NOT_ALLOWED,    EAGAIN    },
-+        {  ERROR_NOT_ENOUGH_QUOTA,       ENOMEM    }
-+};
-+
-+
-+
-+
-+static
-+unsigned
-+_MapDosError (
-+    IN ULONG WinError
-+   )
-+{
-+	int i;
-+
-+	//
-+	// Lookup
-+	//
-+
-+	for (i = 0; i < (sizeof(ErrorTable)/sizeof(ErrorTable[0])); ++i)
-+	{
-+		if (WinError == ErrorTable[i].WinError)
-+		{
-+			return ErrorTable[i].errnocode;
-+		}
-+	}
-+
-+	//
-+	// not in table. Check ranges
-+	//
-+
-+	if ((WinError >= ERROR_WRITE_PROTECT) &&
-+		(WinError <= ERROR_SHARING_BUFFER_EXCEEDED))
-+	{
-+		return EACCES;
-+	}
-+	else if ((WinError >= ERROR_INVALID_STARTING_CODESEG) &&
-+			 (WinError <= ERROR_INFLOOP_IN_RELOC_CHAIN))
-+	{
-+		return ENOEXEC;
-+	}
-+	else
-+	{
-+		return EINVAL;
-+	}
-+}
-+
-+
-+
-+
-+
-+
-+
-+//
-+// Function to map NT status to dos error.
-+//
-+
-+static
-+__inline
-+unsigned
-+_MapNtStatus(
-+    IN NTSTATUS Status
-+   )
-+{
-+	return _MapDosError(RtlNtStatusToDosError(Status));
-+}
-+
-+
-+
-+
-+
-+//
-+// Helper functions to make things easyer
-+//
-+
-+static
-+NTSTATUS
-+_OpenNtName(
-+    IN PCSTR Name,
-+    IN BOOLEAN Readonly,
-+    OUT PHANDLE Handle,
-+    OUT PBOOLEAN OpenedReadonly OPTIONAL
-+   )
-+{
-+	UNICODE_STRING UnicodeString;
-+	ANSI_STRING    AnsiString;
-+	WCHAR Buffer[512];
-+	NTSTATUS Status;
-+	OBJECT_ATTRIBUTES ObjectAttributes;
-+	IO_STATUS_BLOCK IoStatusBlock;
-+
-+	//
-+	// Make Unicode name from inlut string
-+	//
-+
-+	UnicodeString.Buffer = &Buffer[0];
-+	UnicodeString.Length = 0;
-+	UnicodeString.MaximumLength = sizeof(Buffer); // in bytes!!!
-+
-+	RtlInitAnsiString(&AnsiString, Name);
-+
-+	Status = RtlAnsiStringToUnicodeString(&UnicodeString, &AnsiString, FALSE);
-+
-+	if(!NT_SUCCESS(Status))
-+	{
-+		return Status; // Unpappable character?
-+	}
-+
-+	//
-+	// Initialize object
-+	//
-+
-+	InitializeObjectAttributes(&ObjectAttributes,
-+							   &UnicodeString,
-+							   OBJ_CASE_INSENSITIVE,
-+							   NULL,
-+							   NULL );
-+
-+	//
-+	// Try to open it in initial mode
-+	//
-+
-+	if(ARGUMENT_PRESENT(OpenedReadonly))
-+	{
-+		*OpenedReadonly = Readonly;
-+	}
-+
-+
-+	Status = NtOpenFile(Handle,
-+						SYNCHRONIZE | FILE_READ_DATA | (Readonly ? 0 : FILE_WRITE_DATA),
-+						&ObjectAttributes,
-+						&IoStatusBlock,
-+						FILE_SHARE_WRITE | FILE_SHARE_READ,
-+						FILE_SYNCHRONOUS_IO_NONALERT);
-+
-+	if(!NT_SUCCESS(Status))
-+	{
-+		//
-+		// Maybe was just mounted? wait 0.5 sec and retry.
-+		//
-+
-+		LARGE_INTEGER Interval;
-+		Interval.QuadPart = -5000000; // 0.5 sec. from now
-+
-+		NtDelayExecution(FALSE, &Interval);
-+
-+		Status = NtOpenFile(Handle,
-+							SYNCHRONIZE | FILE_READ_DATA | (Readonly ? 0 : FILE_WRITE_DATA),
-+							&ObjectAttributes,
-+							&IoStatusBlock,
-+							FILE_SHARE_WRITE | FILE_SHARE_READ,
-+							FILE_SYNCHRONOUS_IO_NONALERT);
-+
-+		//
-+		// Try to satisfy mode
-+		//
-+
-+		if((STATUS_ACCESS_DENIED == Status) && !Readonly)
-+		{
-+			if(ARGUMENT_PRESENT(OpenedReadonly))
-+			{
-+				*OpenedReadonly = TRUE;
-+			}
-+
-+			Status = NtOpenFile(Handle,
-+							SYNCHRONIZE | FILE_READ_DATA,
-+							&ObjectAttributes,
-+							&IoStatusBlock,
-+							FILE_SHARE_WRITE | FILE_SHARE_READ,
-+							FILE_SYNCHRONOUS_IO_NONALERT);
-+		}
-+	}
-+
-+
-+
-+	//
-+	// done
-+	//
-+
-+	return Status;
-+}
-+
-+
-+static
-+NTSTATUS
-+_OpenDriveLetter(
-+    IN CHAR Letter,
-+    IN BOOLEAN ReadOnly,
-+    OUT PHANDLE Handle,
-+    OUT PBOOLEAN OpenedReadonly OPTIONAL
-+   )
-+{
-+	CHAR Buffer[100];
-+
-+	sprintf(Buffer, "\\DosDevices\\%c:", Letter);
-+
-+	return _OpenNtName(Buffer, ReadOnly, Handle, OpenedReadonly);
-+}
-+
-+
-+//
-+// Flush device
-+//
-+
-+static
-+__inline
-+NTSTATUS
-+_FlushDrive(
-+		IN HANDLE Handle
-+		)
-+{
-+	IO_STATUS_BLOCK IoStatusBlock;
-+	return NtFlushBuffersFile(Handle, &IoStatusBlock);
-+}
-+
-+
-+//
-+// lock drive
-+//
-+
-+static
-+__inline
-+NTSTATUS
-+_LockDrive(
-+		IN HANDLE Handle
-+		)
-+{
-+	IO_STATUS_BLOCK IoStatusBlock;
-+	return NtFsControlFile(Handle, 0, 0, 0, &IoStatusBlock, FSCTL_LOCK_VOLUME, 0, 0, 0, 0);
-+}
-+
-+
-+//
-+// unlock drive
-+//
-+
-+static
-+__inline
-+NTSTATUS
-+_UnlockDrive(
-+	IN HANDLE Handle
-+	)
-+{
-+	IO_STATUS_BLOCK IoStatusBlock;
-+	return NtFsControlFile(Handle, 0, 0, 0, &IoStatusBlock, FSCTL_UNLOCK_VOLUME, 0, 0, 0, 0);
-+}
-+
-+static
-+__inline
-+NTSTATUS
-+_DismountDrive(
-+	IN HANDLE Handle
-+	)
-+{
-+	IO_STATUS_BLOCK IoStatusBlock;
-+	return NtFsControlFile(Handle, 0, 0, 0, &IoStatusBlock, FSCTL_DISMOUNT_VOLUME, 0, 0, 0, 0);
-+}
-+
-+
-+//
-+// is mounted
-+//
-+
-+static
-+__inline
-+BOOLEAN
-+_IsMounted(
-+	IN HANDLE Handle
-+	)
-+{
-+	IO_STATUS_BLOCK IoStatusBlock;
-+	NTSTATUS Status;
-+	Status = NtFsControlFile(Handle, 0, 0, 0, &IoStatusBlock, FSCTL_IS_VOLUME_MOUNTED, 0, 0, 0, 0);
-+	return (BOOLEAN)(STATUS_SUCCESS == Status);
-+}
-+
-+
-+static
-+__inline
-+NTSTATUS
-+_CloseDisk(
-+		IN HANDLE Handle
-+		)
-+{
-+	return NtClose(Handle);
-+}
-+
-+
-+
-+
-+//
-+// Make NT name from any recognized name
-+//
-+
-+static
-+PCSTR
-+_NormalizeDeviceName(
-+    IN PCSTR Device,
-+    IN PSTR NormalizedDeviceNameBuffer
-+   )
-+{
-+	int PartitionNumber = -1;
-+	UCHAR DiskNumber;
-+	PSTR p;
-+
-+
-+	//
-+	// Do not try to parse NT name
-+	//
-+
-+	if('\\' == *Device)
-+		return Device;
-+
-+
-+
-+	//
-+	// Strip leading '/dev/' if any
-+	//
-+
-+	if(('/' == *(Device)) &&
-+		('d' == *(Device + 1)) &&
-+		('e' == *(Device + 2)) &&
-+		('v' == *(Device + 3)) &&
-+		('/' == *(Device + 4)))
-+	{
-+		Device += 5;
-+	}
-+
-+	if('\0' == *Device)
-+	{
-+		return NULL;
-+	}
-+
-+
-+	//
-+	// forms: hda[n], fd[n]
-+	//
-+
-+	if('d' != *(Device + 1))
-+	{
-+		return NULL;
-+	}
-+
-+	if('h' == *Device)
-+	{
-+		if((*(Device + 2) < 'a') || (*(Device + 2) > ('a' + 9)) ||
-+		   ((*(Device + 3) != '\0') &&
-+			((*(Device + 4) != '\0') ||
-+			 ((*(Device + 3) < '0') || (*(Device + 3) > '9'))
-+			)
-+		   )
-+		  )
-+		{
-+			return NULL;
-+		}
-+
-+		DiskNumber = (UCHAR)(*(Device + 2) - 'a');
-+
-+		if(*(Device + 3) != '\0')
-+		{
-+			PartitionNumber = (*(Device + 3) - '0');
-+		}
-+
-+	}
-+	else if('f' == *Device)
-+	{
-+		//
-+		// 3-d letted should be a digit.
-+		//
-+
-+		if((*(Device + 3) != '\0') ||
-+		   (*(Device + 2) < '0') || (*(Device + 2) > '9'))
-+		{
-+			return NULL;
-+		}
-+
-+		DiskNumber = (UCHAR)(*(Device + 2) - '0');
-+
-+	}
-+	else
-+	{
-+		//
-+		// invalid prefix
-+		//
-+
-+		return NULL;
-+	}
-+
-+
-+
-+	//
-+	// Prefix
-+	//
-+
-+	strcpy(NormalizedDeviceNameBuffer, "\\Device\\");
-+
-+	//
-+	// Media name
-+	//
-+
-+	switch(*Device)
-+	{
-+
-+	case 'f':
-+		strcat(NormalizedDeviceNameBuffer, "Floppy0");
-+		break;
-+
-+	case 'h':
-+		strcat(NormalizedDeviceNameBuffer, "Harddisk0");
-+		break;
-+	}
-+
-+
-+	p = NormalizedDeviceNameBuffer + strlen(NormalizedDeviceNameBuffer) - 1;
-+	*p = (CHAR)(*p + DiskNumber);
-+
-+
-+	//
-+	// Partition nr.
-+	//
-+
-+	if(PartitionNumber >= 0)
-+	{
-+		strcat(NormalizedDeviceNameBuffer, "\\Partition0");
-+
-+		p = NormalizedDeviceNameBuffer + strlen(NormalizedDeviceNameBuffer) - 1;
-+		*p = (CHAR)(*p + PartitionNumber);
-+	}
-+
-+
-+	return NormalizedDeviceNameBuffer;
-+}
-+
-+
-+
-+
-+static
-+VOID
-+_GetDeviceSize(
-+    IN HANDLE h,
-+    OUT unsigned __int64 *FsSize
-+   )
-+{
-+	PARTITION_INFORMATION pi;
-+	DISK_GEOMETRY gi;
-+	NTSTATUS Status;
-+	IO_STATUS_BLOCK IoStatusBlock;
-+
-+	//
-+	// Zero it
-+	//
-+
-+	*FsSize = 0;
-+
-+	//
-+	// Call driver
-+	//
-+
-+	RtlZeroMemory(&pi, sizeof(PARTITION_INFORMATION));
-+
-+	Status = NtDeviceIoControlFile(
-+		h, NULL, NULL, NULL, &IoStatusBlock, IOCTL_DISK_GET_PARTITION_INFO,
-+		&pi, sizeof(PARTITION_INFORMATION),
-+		&pi, sizeof(PARTITION_INFORMATION));
-+
-+
-+	if(NT_SUCCESS(Status))
-+	{
-+		*FsSize = pi.PartitionLength.QuadPart;
-+	}
-+	else if(STATUS_INVALID_DEVICE_REQUEST == Status)
-+	{
-+		//
-+		// No partitions: get device info.
-+		//
-+
-+		RtlZeroMemory(&gi, sizeof(DISK_GEOMETRY));
-+
-+		Status = NtDeviceIoControlFile(
-+				h, NULL, NULL, NULL, &IoStatusBlock, IOCTL_DISK_GET_DRIVE_GEOMETRY,
-+				&gi, sizeof(DISK_GEOMETRY),
-+				&gi, sizeof(DISK_GEOMETRY));
-+
-+
-+		if(NT_SUCCESS(Status))
-+		{
-+			*FsSize =
-+				gi.BytesPerSector *
-+				gi.SectorsPerTrack *
-+				gi.TracksPerCylinder *
-+				gi.Cylinders.QuadPart;
-+		}
-+
-+	}
-+}
-+
-+
-+
-+//
-+// Open device by name.
-+//
-+
-+static
-+BOOLEAN
-+_Ext2OpenDevice(
-+    IN PCSTR Name,
-+    IN BOOLEAN ReadOnly,
-+    OUT PHANDLE Handle,
-+    OUT PBOOLEAN OpenedReadonly OPTIONAL,
-+    OUT unsigned *Errno OPTIONAL
-+   )
-+{
-+	CHAR NormalizedDeviceName[512];
-+	NTSTATUS Status;
-+
-+	if(NULL == Name)
-+	{
-+		//
-+		// Set not found
-+		//
-+
-+		if(ARGUMENT_PRESENT(Errno))
-+			*Errno = ENOENT;
-+
-+		return FALSE;
-+	}
-+
-+
-+	if((((*Name) | 0x20) >= 'a') && (((*Name) | 0x20) <= 'z') &&
-+		(':' == *(Name + 1)) && ('\0' == *(Name + 2)))
-+	{
-+		Status = _OpenDriveLetter(*Name, ReadOnly, Handle, OpenedReadonly);
-+	}
-+	else
-+	{
-+		//
-+		// Make name
-+		//
-+
-+		Name = _NormalizeDeviceName(Name, NormalizedDeviceName);
-+
-+		if(NULL == Name)
-+		{
-+			//
-+			// Set not found
-+			//
-+
-+			if(ARGUMENT_PRESENT(Errno))
-+				*Errno = ENOENT;
-+
-+			return FALSE;
-+		}
-+
-+		//
-+		// Try to open it
-+		//
-+
-+		Status = _OpenNtName(Name, ReadOnly, Handle, OpenedReadonly);
-+	}
-+
-+
-+	if(!NT_SUCCESS(Status))
-+	{
-+		if(ARGUMENT_PRESENT(Errno))
-+			*Errno = _MapNtStatus(Status);
-+
-+		return FALSE;
-+	}
-+
-+	return TRUE;
-+}
-+
-+
-+//
-+// Raw block io. Sets dos errno
-+//
-+
-+static
-+BOOLEAN
-+_BlockIo(
-+    IN HANDLE Handle,
-+    IN LARGE_INTEGER Offset,
-+    IN ULONG Bytes,
-+    IN OUT PCHAR Buffer,
-+    IN BOOLEAN Read,
-+    OUT unsigned* Errno
-+   )
-+{
-+	IO_STATUS_BLOCK IoStatusBlock;
-+	NTSTATUS Status;
-+
-+	//
-+	// Should be aligned
-+	//
-+
-+	ASSERT(0 == (Bytes % 512));
-+	ASSERT(0 == (Offset.LowPart % 512));
-+
-+
-+	//
-+	// perform io
-+	//
-+
-+	if(Read)
-+	{
-+		Status = NtReadFile(Handle, NULL, NULL, NULL,
-+			&IoStatusBlock, Buffer, Bytes, &Offset, NULL);
-+	}
-+	else
-+	{
-+		Status = NtWriteFile(Handle, NULL, NULL, NULL,
-+			&IoStatusBlock, Buffer, Bytes, &Offset, NULL);
-+	}
-+
-+
-+	//
-+	// translate error
-+	//
-+
-+	if(NT_SUCCESS(Status))
-+	{
-+		*Errno = 0;
-+		return TRUE;
-+	}
-+
-+	*Errno = _MapNtStatus(Status);
-+
-+	return FALSE;
-+}
-+
-+
-+
-+__inline
-+BOOLEAN
-+_RawWrite(
-+    IN HANDLE Handle,
-+    IN LARGE_INTEGER Offset,
-+    IN ULONG Bytes,
-+    OUT const CHAR* Buffer,
-+    OUT unsigned* Errno
-+   )
-+{
-+	return _BlockIo(Handle, Offset, Bytes, (PCHAR)Buffer, FALSE, Errno);
-+}
-+
-+__inline
-+BOOLEAN
-+_RawRead(
-+    IN HANDLE Handle,
-+    IN LARGE_INTEGER Offset,
-+    IN ULONG Bytes,
-+    IN PCHAR Buffer,
-+    OUT unsigned* Errno
-+   )
-+{
-+	return _BlockIo(Handle, Offset, Bytes, Buffer, TRUE, Errno);
-+}
-+
-+
-+
-+__inline
-+BOOLEAN
-+_SetPartType(
-+    IN HANDLE Handle,
-+    IN UCHAR Type
-+   )
-+{
-+	IO_STATUS_BLOCK IoStatusBlock;
-+	return STATUS_SUCCESS == NtDeviceIoControlFile(
-+												   Handle, NULL, NULL, NULL, &IoStatusBlock, IOCTL_DISK_SET_PARTITION_INFO,
-+												   &Type, sizeof(Type),
-+												   NULL, 0);
-+}
-+
-+
-+
-+//--------------------- interface part
-+
-+//
-+// Interface functions.
-+// Is_mounted is set to 1 if the device is mounted, 0 otherwise
-+//
-+
-+errcode_t
-+ext2fs_check_if_mounted(const char *file, int *mount_flags)
-+{
-+	HANDLE h;
-+	BOOLEAN Readonly;
-+
-+	*mount_flags = 0;
-+
-+	if(!_Ext2OpenDevice(file, TRUE, &h, &Readonly, NULL))
-+	{
-+		return 0;
-+	}
-+
-+
-+	__try{
-+		*mount_flags &= _IsMounted(h) ? EXT2_MF_MOUNTED : 0;
-+	}
-+	__finally{
-+		_CloseDisk(h);
-+	}
-+
-+	return 0;
-+}
-+
-+
-+
-+//
-+// Returns the number of blocks in a partition
-+//
-+
-+static __int64 FsSize = 0;
-+static char knowndevice[1024] = "";
-+
-+
-+errcode_t
-+ext2fs_get_device_size(const char *file, int blocksize,
-+				 blk_t *retblocks)
-+{
-+	HANDLE h;
-+	BOOLEAN Readonly;
-+
-+	if((0 == FsSize) || (0 != strcmp(knowndevice, file)))
-+	{
-+
-+		if(!_Ext2OpenDevice(file, TRUE, &h, &Readonly, NULL))
-+		{
-+			return 0;
-+		}
-+
-+
-+		__try{
-+
-+			//
-+			// Get size
-+			//
-+
-+			_GetDeviceSize(h, &FsSize);
-+			strcpy(knowndevice, file);
-+		}
-+		__finally{
-+			_CloseDisk(h);
-+		}
-+
-+	}
-+
-+	*retblocks = (blk_t)(unsigned __int64)(FsSize / blocksize);
-+	UNREFERENCED_PARAMETER(file);
-+	return 0;
-+}
-+
-+
-+
-+
-+
-+
-+//
-+// Table elements
-+//
-+
-+
-+static
-+errcode_t
-+nt_open(const char *name, int flags, io_channel *channel)
-+{
-+	io_channel      io = NULL;
-+	PNT_PRIVATE_DATA NtData = NULL;
-+	errcode_t Errno = 0;
-+
-+	//
-+	// Check name
-+	//
-+
-+	if (NULL == name)
-+	{
-+		return EXT2_ET_BAD_DEVICE_NAME;
-+	}
-+
-+	__try{
-+
-+		//
-+		// Allocate channel handle
-+		//
-+
-+		io = (io_channel) malloc(sizeof(struct struct_io_channel));
-+
-+		if (NULL == io)
-+		{
-+			Errno = ENOMEM;
-+			__leave;
-+		}
-+
-+		RtlZeroMemory(io, sizeof(struct struct_io_channel));
-+		io->magic = EXT2_ET_MAGIC_IO_CHANNEL;
-+
-+		NtData = (PNT_PRIVATE_DATA)malloc(sizeof(NT_PRIVATE_DATA));
-+
-+		if (NULL == NtData)
-+		{
-+			Errno = ENOMEM;
-+			__leave;
-+		}
-+
-+
-+		io->manager = nt_io_manager();
-+		io->name = malloc(strlen(name) + 1);
-+		if (NULL == io->name)
-+		{
-+			Errno = ENOMEM;
-+			__leave;
-+		}
-+
-+		strcpy(io->name, name);
-+		io->private_data = NtData;
-+		io->block_size = 1024;
-+		io->read_error = 0;
-+		io->write_error = 0;
-+		io->refcount = 1;
-+
-+		//
-+		// Initialize data
-+		//
-+
-+		RtlZeroMemory(NtData, sizeof(NT_PRIVATE_DATA));
-+
-+		NtData->magic = EXT2_ET_MAGIC_NT_IO_CHANNEL;
-+		NtData->BufferBlockNumber = 0xffffffff;
-+		NtData->BufferSize = 1024;
-+		NtData->Buffer = malloc(NtData->BufferSize);
-+
-+		if (NULL == NtData->Buffer)
-+		{
-+			Errno = ENOMEM;
-+			__leave;
-+		}
-+
-+		//
-+		// Open it
-+		//
-+
-+		if(!_Ext2OpenDevice(name, (BOOLEAN)!BooleanFlagOn(flags, EXT2_FLAG_RW), &NtData->Handle, &NtData->OpenedReadonly, &Errno))
-+		{
-+			__leave;
-+		}
-+
-+
-+		//
-+		// get size
-+		//
-+
-+		_GetDeviceSize(NtData->Handle, &FsSize);
-+		strcpy(knowndevice, name);
-+
-+
-+		//
-+		// Lock/dismount
-+		//
-+
-+		if(!NT_SUCCESS(_LockDrive(NtData->Handle)) /*|| !NT_SUCCESS(_DismountDrive(NtData->Handle))*/)
-+		{
-+			NtData->OpenedReadonly = TRUE;
-+		}
-+
-+		//
-+		// Done
-+		//
-+
-+		*channel = io;
-+
-+
-+	}
-+	__finally{
-+
-+		if(0 != Errno)
-+		{
-+			//
-+			// Cleanup
-+			//
-+
-+			if (NULL != io)
-+			{
-+				if(NULL != io->name)
-+				{
-+					free(io->name);
-+				}
-+
-+				free(io);
-+			}
-+
-+			if (NULL != NtData)
-+			{
-+				if(NULL != NtData->Handle)
-+				{
-+					_UnlockDrive(NtData->Handle);
-+					_CloseDisk(NtData->Handle);
-+				}
-+
-+				if(NULL != NtData->Buffer)
-+				{
-+					free(NtData->Buffer);
-+				}
-+
-+				free(NtData);
-+			}
-+		}
-+	}
-+
-+	return Errno;
-+}
-+
-+
-+//
-+// Close api
-+//
-+
-+static
-+errcode_t
-+nt_close(io_channel channel)
-+{
-+	PNT_PRIVATE_DATA NtData = NULL;
-+
-+	if(NULL == channel)
-+	{
-+		return 0;
-+	}
-+
-+	EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
-+	NtData = (PNT_PRIVATE_DATA) channel->private_data;
-+	EXT2_CHECK_MAGIC(NtData, EXT2_ET_MAGIC_NT_IO_CHANNEL);
-+
-+	if (--channel->refcount > 0)
-+	{
-+		return 0;
-+	}
-+
-+	if(NULL != channel->name)
-+	{
-+		free(channel->name);
-+	}
-+
-+
-+	free(channel);
-+
-+	if (NULL != NtData)
-+	{
-+		if(NULL != NtData->Handle)
-+		{
-+			_DismountDrive(NtData->Handle);
-+			_UnlockDrive(NtData->Handle);
-+			_CloseDisk(NtData->Handle);
-+		}
-+
-+		if(NULL != NtData->Buffer)
-+		{
-+			free(NtData->Buffer);
-+		}
-+
-+		free(NtData);
-+	}
-+
-+	return 0;
-+}
-+
-+
-+
-+//
-+// set block size
-+//
-+
-+static
-+errcode_t
-+nt_set_blksize(io_channel channel, int blksize)
-+{
-+	PNT_PRIVATE_DATA NtData = NULL;
-+
-+	EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
-+	NtData = (PNT_PRIVATE_DATA) channel->private_data;
-+	EXT2_CHECK_MAGIC(NtData, EXT2_ET_MAGIC_NT_IO_CHANNEL);
-+
-+	if (channel->block_size != blksize)
-+	{
-+		channel->block_size = blksize;
-+
-+		free(NtData->Buffer);
-+		NtData->BufferBlockNumber = 0xffffffff;
-+		NtData->BufferSize = channel->block_size;
-+		ASSERT(0 == (NtData->BufferSize % 512));
-+
-+		NtData->Buffer = malloc(NtData->BufferSize);
-+
-+		if (NULL == NtData->Buffer)
-+		{
-+			return ENOMEM;
-+		}
-+
-+	}
-+
-+	return 0;
-+}
-+
-+
-+//
-+// read block
-+//
-+
-+static
-+errcode_t
-+nt_read_blk(io_channel channel, unsigned long block,
-+			       int count, void *buf)
-+{
-+	PVOID BufferToRead;
-+	ULONG SizeToRead;
-+	ULONG Size;
-+	LARGE_INTEGER Offset;
-+	PNT_PRIVATE_DATA NtData = NULL;
-+	unsigned Errno = 0;
-+
-+	EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
-+	NtData = (PNT_PRIVATE_DATA) channel->private_data;
-+	EXT2_CHECK_MAGIC(NtData, EXT2_ET_MAGIC_NT_IO_CHANNEL);
-+
-+	//
-+	// If it's in the cache, use it!
-+	//
-+
-+	if ((1 == count) &&
-+		(block == NtData->BufferBlockNumber) &&
-+		(NtData->BufferBlockNumber != 0xffffffff))
-+	{
-+		memcpy(buf, NtData->Buffer, channel->block_size);
-+		return 0;
-+	}
-+
-+	Size = (count < 0) ? (ULONG)(-count) : (ULONG)(count * channel->block_size);
-+
-+	Offset.QuadPart = block * channel->block_size;
-+
-+	//
-+	// If not fit to the block
-+	//
-+
-+	if(Size <= NtData->BufferSize)
-+	{
-+		//
-+		// Update the cache
-+		//
-+
-+		NtData->BufferBlockNumber = block;
-+		BufferToRead = NtData->Buffer;
-+		SizeToRead = NtData->BufferSize;
-+	}
-+	else
-+	{
-+		SizeToRead = Size;
-+		BufferToRead = buf;
-+		ASSERT(0 == (SizeToRead % channel->block_size));
-+	}
-+
-+	if(!_RawRead(NtData->Handle, Offset, SizeToRead, BufferToRead, &Errno))
-+	{
-+
-+		if (channel->read_error)
-+		{
-+			return (channel->read_error)(channel, block, count, buf,
-+					       Size, 0, Errno);
-+		}
-+		else
-+		{
-+			return Errno;
-+		}
-+	}
-+
-+
-+	if(BufferToRead != buf)
-+	{
-+		ASSERT(Size <= SizeToRead);
-+		memcpy(buf, BufferToRead, Size);
-+	}
-+
-+	return 0;
-+}
-+
-+
-+//
-+// write block
-+//
-+
-+static
-+errcode_t
-+nt_write_blk(io_channel channel, unsigned long block,
-+				int count, const void *buf)
-+{
-+	ULONG SizeToWrite;
-+	LARGE_INTEGER Offset;
-+	PNT_PRIVATE_DATA NtData = NULL;
-+	unsigned Errno = 0;
-+
-+	EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
-+	NtData = (PNT_PRIVATE_DATA) channel->private_data;
-+	EXT2_CHECK_MAGIC(NtData, EXT2_ET_MAGIC_NT_IO_CHANNEL);
-+
-+	if(NtData->OpenedReadonly)
-+	{
-+		return EACCES;
-+	}
-+
-+	if (count == 1)
-+	{
-+		SizeToWrite = channel->block_size;
-+	}
-+	else
-+	{
-+		NtData->BufferBlockNumber = 0xffffffff;
-+
-+		if (count < 0)
-+		{
-+			SizeToWrite = (ULONG)(-count);
-+		}
-+		else
-+		{
-+			SizeToWrite = (ULONG)(count * channel->block_size);
-+		}
-+	}
-+
-+
-+	ASSERT(0 == (SizeToWrite % 512));
-+	Offset.QuadPart = block * channel->block_size;
-+
-+	if(!_RawWrite(NtData->Handle, Offset, SizeToWrite, buf, &Errno))
-+	{
-+		if (channel->write_error)
-+		{
-+			return (channel->write_error)(channel, block, count, buf,
-+						SizeToWrite, 0, Errno);
-+		}
-+		else
-+		{
-+			return Errno;
-+		}
-+	}
-+
-+
-+	//
-+	// Stash a copy.
-+	//
-+
-+	if(SizeToWrite >= NtData->BufferSize)
-+	{
-+		NtData->BufferBlockNumber = block;
-+		memcpy(NtData->Buffer, buf, NtData->BufferSize);
-+	}
-+
-+	NtData->Written = TRUE;
-+
-+	return 0;
-+
-+}
-+
-+
-+
-+//
-+// Flush data buffers to disk.  Since we are currently using a
-+// write-through cache, this is a no-op.
-+//
-+
-+static
-+errcode_t
-+nt_flush(io_channel channel)
-+{
-+	PNT_PRIVATE_DATA NtData = NULL;
-+
-+	EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
-+	NtData = (PNT_PRIVATE_DATA) channel->private_data;
-+	EXT2_CHECK_MAGIC(NtData, EXT2_ET_MAGIC_NT_IO_CHANNEL);
-+
-+	if(NtData->OpenedReadonly)
-+	{
-+		return 0; // EACCESS;
-+	}
-+
-+
-+	//
-+	// Flush file buffers.
-+	//
-+
-+	_FlushDrive(NtData->Handle);
-+
-+
-+	//
-+	// Test and correct partition type.
-+	//
-+
-+	if(NtData->Written)
-+	{
-+		_SetPartType(NtData->Handle, 0x83);
-+	}
-+
-+	return 0;
-+}
-+
-+
-diff -Naur silo-1.4.13.orig/libext2fs/openfs.c silo-1.4.13/libext2fs/openfs.c
---- silo-1.4.13.orig/libext2fs/openfs.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/openfs.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,326 @@
-+/*
-+ * openfs.c --- open an ext2 filesystem
-+ * 
-+ * Copyright (C) 1993, 1994, 1995, 1996 Theodore Ts'o.
-+ * 
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <fcntl.h>
-+#include <time.h>
-+#if HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+
-+
-+#include "ext2fs.h"
-+#include "e2image.h"
-+
-+blk_t ext2fs_descriptor_block_loc(ext2_filsys fs, blk_t group_block, dgrp_t i)
-+{
-+	int	bg;
-+	int	has_super = 0;
-+	int	ret_blk;
-+
-+	if (!(fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG) ||
-+	    (i < fs->super->s_first_meta_bg))
-+		return (group_block + i + 1);
-+
-+	bg = (fs->blocksize / sizeof (struct ext2_group_desc)) * i;
-+	if (ext2fs_bg_has_super(fs, bg))
-+		has_super = 1;
-+	ret_blk = (fs->super->s_first_data_block + has_super + 
-+		   (bg * fs->super->s_blocks_per_group));
-+	/*
-+	 * If group_block is not the normal value, we're trying to use
-+	 * the backup group descriptors and superblock --- so use the
-+	 * alternate location of the second block group in the
-+	 * metablock group.  Ideally we should be testing each bg
-+	 * descriptor block individually for correctness, but we don't
-+	 * have the infrastructure in place to do that.
-+	 */
-+	if (group_block != fs->super->s_first_data_block &&
-+	    ((ret_blk + fs->super->s_blocks_per_group) <
-+	     fs->super->s_blocks_count))
-+		ret_blk += fs->super->s_blocks_per_group;
-+	return ret_blk;
-+}
-+
-+errcode_t ext2fs_open(const char *name, int flags, int superblock,
-+		      unsigned int block_size, io_manager manager, 
-+		      ext2_filsys *ret_fs)
-+{
-+	return ext2fs_open2(name, 0, flags, superblock, block_size, 
-+			    manager, ret_fs);
-+}
-+
-+/*
-+ *  Note: if superblock is non-zero, block-size must also be non-zero.
-+ * 	Superblock and block_size can be zero to use the default size.
-+ *
-+ * Valid flags for ext2fs_open()
-+ * 
-+ * 	EXT2_FLAG_RW	- Open the filesystem for read/write.
-+ * 	EXT2_FLAG_FORCE - Open the filesystem even if some of the
-+ *				features aren't supported.
-+ *	EXT2_FLAG_JOURNAL_DEV_OK - Open an ext3 journal device
-+ */
-+errcode_t ext2fs_open2(const char *name, const char *io_options,
-+		       int flags, int superblock,
-+		       unsigned int block_size, io_manager manager, 
-+		       ext2_filsys *ret_fs)
-+{
-+	ext2_filsys	fs;
-+	errcode_t	retval;
-+	unsigned long	i;
-+	int		j, groups_per_block, blocks_per_group;
-+	blk_t		group_block, blk;
-+	char		*dest, *cp;
-+	struct ext2_group_desc *gdp;
-+	
-+	EXT2_CHECK_MAGIC(manager, EXT2_ET_MAGIC_IO_MANAGER);
-+
-+	retval = ext2fs_get_mem(sizeof(struct struct_ext2_filsys), &fs);
-+	if (retval)
-+		return retval;
-+	
-+	memset(fs, 0, sizeof(struct struct_ext2_filsys));
-+	fs->magic = EXT2_ET_MAGIC_EXT2FS_FILSYS;
-+	fs->flags = flags;
-+	fs->umask = 022;
-+	retval = ext2fs_get_mem(strlen(name)+1, &fs->device_name);
-+	if (retval)
-+		goto cleanup;
-+	strcpy(fs->device_name, name);
-+	cp = strchr(fs->device_name, '?');
-+	if (!io_options && cp) {
-+		*cp++ = 0;
-+		io_options = cp;
-+	}
-+		
-+	retval = manager->open(fs->device_name, 
-+			       (flags & EXT2_FLAG_RW) ? IO_FLAG_RW : 0,
-+			       &fs->io);
-+	if (retval)
-+		goto cleanup;
-+	if (io_options && 
-+	    (retval = io_channel_set_options(fs->io, io_options)))
-+		goto cleanup;
-+	fs->image_io = fs->io;
-+	fs->io->app_data = fs;
-+	retval = ext2fs_get_mem(SUPERBLOCK_SIZE, &fs->super);
-+	if (retval)
-+		goto cleanup;
-+	if (flags & EXT2_FLAG_IMAGE_FILE) {
-+		retval = ext2fs_get_mem(sizeof(struct ext2_image_hdr),
-+					&fs->image_header);
-+		if (retval)
-+			goto cleanup;
-+		retval = io_channel_read_blk(fs->io, 0,
-+					     -sizeof(struct ext2_image_hdr),
-+					     fs->image_header);
-+		if (retval)
-+			goto cleanup;
-+		if (fs->image_header->magic_number != EXT2_ET_MAGIC_E2IMAGE)
-+			return EXT2_ET_MAGIC_E2IMAGE;
-+		superblock = 1;
-+		block_size = fs->image_header->fs_blocksize;
-+	}
-+
-+	/*
-+	 * If the user specifies a specific block # for the
-+	 * superblock, then he/she must also specify the block size!
-+	 * Otherwise, read the master superblock located at offset
-+	 * SUPERBLOCK_OFFSET from the start of the partition.
-+	 *
-+	 * Note: we only save a backup copy of the superblock if we
-+	 * are reading the superblock from the primary superblock location.
-+	 */
-+	if (superblock) {
-+		if (!block_size) {
-+			retval = EXT2_ET_INVALID_ARGUMENT;
-+			goto cleanup;
-+		}
-+		io_channel_set_blksize(fs->io, block_size);
-+		group_block = superblock;
-+		fs->orig_super = 0;
-+	} else {
-+		io_channel_set_blksize(fs->io, SUPERBLOCK_OFFSET);
-+		superblock = 1;
-+		group_block = 0;
-+		retval = ext2fs_get_mem(SUPERBLOCK_SIZE, &fs->orig_super);
-+		if (retval)
-+			goto cleanup;
-+	}
-+	retval = io_channel_read_blk(fs->io, superblock, -SUPERBLOCK_SIZE,
-+				     fs->super);
-+	if (retval)
-+		goto cleanup;
-+	if (fs->orig_super)
-+		memcpy(fs->orig_super, fs->super, SUPERBLOCK_SIZE);
-+
-+#ifdef EXT2FS_ENABLE_SWAPFS
-+	if ((fs->super->s_magic == ext2fs_swab16(EXT2_SUPER_MAGIC)) ||
-+	    (fs->flags & EXT2_FLAG_SWAP_BYTES)) {
-+		fs->flags |= EXT2_FLAG_SWAP_BYTES;
-+
-+		ext2fs_swap_super(fs->super);
-+	}
-+#endif
-+	
-+	if (fs->super->s_magic != EXT2_SUPER_MAGIC) {
-+		retval = EXT2_ET_BAD_MAGIC;
-+		goto cleanup;
-+	}
-+	if (fs->super->s_rev_level > EXT2_LIB_CURRENT_REV) {
-+		retval = EXT2_ET_REV_TOO_HIGH;
-+		goto cleanup;
-+	}
-+
-+	/*
-+	 * Check for feature set incompatibility
-+	 */
-+	if (!(flags & EXT2_FLAG_FORCE)) {
-+		if (fs->super->s_feature_incompat &
-+		    ~EXT2_LIB_FEATURE_INCOMPAT_SUPP) {
-+			retval = EXT2_ET_UNSUPP_FEATURE;
-+			goto cleanup;
-+		}
-+		if ((flags & EXT2_FLAG_RW) &&
-+		    (fs->super->s_feature_ro_compat &
-+		     ~EXT2_LIB_FEATURE_RO_COMPAT_SUPP)) {
-+			retval = EXT2_ET_RO_UNSUPP_FEATURE;
-+			goto cleanup;
-+		}
-+		if (!(flags & EXT2_FLAG_JOURNAL_DEV_OK) &&
-+		    (fs->super->s_feature_incompat &
-+		     EXT3_FEATURE_INCOMPAT_JOURNAL_DEV)) {
-+			retval = EXT2_ET_UNSUPP_FEATURE;
-+			goto cleanup;
-+		}
-+	}
-+	
-+	fs->blocksize = EXT2_BLOCK_SIZE(fs->super);
-+	if (fs->blocksize == 0) {
-+		retval = EXT2_ET_CORRUPT_SUPERBLOCK;
-+		goto cleanup;
-+	}
-+	fs->fragsize = EXT2_FRAG_SIZE(fs->super);
-+	fs->inode_blocks_per_group = ((fs->super->s_inodes_per_group *
-+				       EXT2_INODE_SIZE(fs->super) +
-+				       EXT2_BLOCK_SIZE(fs->super) - 1) /
-+				      EXT2_BLOCK_SIZE(fs->super));
-+	if (block_size) {
-+		if (block_size != fs->blocksize) {
-+			retval = EXT2_ET_UNEXPECTED_BLOCK_SIZE;
-+			goto cleanup;
-+		}
-+	}
-+	/*
-+	 * Set the blocksize to the filesystem's blocksize.
-+	 */
-+	io_channel_set_blksize(fs->io, fs->blocksize);
-+
-+	/*
-+	 * If this is an external journal device, don't try to read
-+	 * the group descriptors, because they're not there.
-+	 */
-+	if (fs->super->s_feature_incompat &
-+	    EXT3_FEATURE_INCOMPAT_JOURNAL_DEV) {
-+		fs->group_desc_count = 0;
-+		*ret_fs = fs;
-+		return 0;
-+	}
-+	
-+	/*
-+	 * Read group descriptors
-+	 */
-+	blocks_per_group = EXT2_BLOCKS_PER_GROUP(fs->super);
-+	if (blocks_per_group == 0 ||
-+	    blocks_per_group > EXT2_MAX_BLOCKS_PER_GROUP(fs->super) ||
-+	    fs->inode_blocks_per_group > EXT2_MAX_INODES_PER_GROUP(fs->super)) {
-+		retval = EXT2_ET_CORRUPT_SUPERBLOCK;
-+		goto cleanup;
-+	}
-+	fs->group_desc_count = (fs->super->s_blocks_count -
-+				fs->super->s_first_data_block +
-+				blocks_per_group - 1) / blocks_per_group;
-+	fs->desc_blocks = (fs->group_desc_count +
-+			   EXT2_DESC_PER_BLOCK(fs->super) - 1)
-+		/ EXT2_DESC_PER_BLOCK(fs->super);
-+	retval = ext2fs_get_mem(fs->desc_blocks * fs->blocksize,
-+				&fs->group_desc);
-+	if (retval)
-+		goto cleanup;
-+	if (!group_block)
-+		group_block = fs->super->s_first_data_block;
-+	dest = (char *) fs->group_desc;
-+	groups_per_block = fs->blocksize / sizeof(struct ext2_group_desc);
-+	for (i=0 ; i < fs->desc_blocks; i++) {
-+		blk = ext2fs_descriptor_block_loc(fs, group_block, i);
-+		retval = io_channel_read_blk(fs->io, blk, 1, dest);
-+		if (retval)
-+			goto cleanup;
-+#ifdef EXT2FS_ENABLE_SWAPFS
-+		if (fs->flags & EXT2_FLAG_SWAP_BYTES) {
-+			gdp = (struct ext2_group_desc *) dest;
-+			for (j=0; j < groups_per_block; j++)
-+				ext2fs_swap_group_desc(gdp++);
-+		}
-+#endif
-+		dest += fs->blocksize;
-+	}
-+
-+	*ret_fs = fs;
-+	return 0;
-+cleanup:
-+	ext2fs_free(fs);
-+	return retval;
-+}
-+
-+/*
-+ * Set/get the filesystem data I/O channel.
-+ * 
-+ * These functions are only valid if EXT2_FLAG_IMAGE_FILE is true.
-+ */
-+errcode_t ext2fs_get_data_io(ext2_filsys fs, io_channel *old_io)
-+{
-+	if ((fs->flags & EXT2_FLAG_IMAGE_FILE) == 0)
-+		return EXT2_ET_NOT_IMAGE_FILE;
-+	if (old_io) {
-+		*old_io = (fs->image_io == fs->io) ? 0 : fs->io;
-+	}
-+	return 0;
-+}
-+
-+errcode_t ext2fs_set_data_io(ext2_filsys fs, io_channel new_io)
-+{
-+	if ((fs->flags & EXT2_FLAG_IMAGE_FILE) == 0)
-+		return EXT2_ET_NOT_IMAGE_FILE;
-+	fs->io = new_io ? new_io : fs->image_io;
-+	return 0;
-+}
-+
-+errcode_t ext2fs_rewrite_to_io(ext2_filsys fs, io_channel new_io)
-+{
-+	if ((fs->flags & EXT2_FLAG_IMAGE_FILE) == 0)
-+		return EXT2_ET_NOT_IMAGE_FILE;
-+	fs->io = fs->image_io = new_io;
-+	fs->flags |= EXT2_FLAG_DIRTY | EXT2_FLAG_RW | 
-+		EXT2_FLAG_BB_DIRTY | EXT2_FLAG_IB_DIRTY;
-+	fs->flags &= ~EXT2_FLAG_IMAGE_FILE;
-+	return 0;
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/read_bb.c silo-1.4.13/libext2fs/read_bb.c
---- silo-1.4.13.orig/libext2fs/read_bb.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/read_bb.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,97 @@
-+/*
-+ * read_bb --- read the bad blocks inode
-+ *
-+ * Copyright (C) 1994 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <fcntl.h>
-+#include <time.h>
-+#if HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+struct read_bb_record {
-+	ext2_badblocks_list	bb_list;
-+	errcode_t	err;
-+};
-+
-+/*
-+ * Helper function for ext2fs_read_bb_inode()
-+ */
-+#ifdef __TURBOC__
-+ #pragma argsused
-+#endif
-+static int mark_bad_block(ext2_filsys fs, blk_t *block_nr,
-+			  e2_blkcnt_t blockcnt EXT2FS_ATTR((unused)), 
-+			  blk_t ref_block EXT2FS_ATTR((unused)),
-+			  int ref_offset EXT2FS_ATTR((unused)), 
-+			  void *priv_data)
-+{
-+	struct read_bb_record *rb = (struct read_bb_record *) priv_data;
-+	
-+	if (blockcnt < 0)
-+		return 0;
-+	
-+	if ((*block_nr < fs->super->s_first_data_block) ||
-+	    (*block_nr >= fs->super->s_blocks_count))
-+		return 0;	/* Ignore illegal blocks */
-+
-+	rb->err = ext2fs_badblocks_list_add(rb->bb_list, *block_nr);
-+	if (rb->err)
-+		return BLOCK_ABORT;
-+	return 0;
-+}
-+
-+/*
-+ * Reads the current bad blocks from the bad blocks inode.
-+ */
-+errcode_t ext2fs_read_bb_inode(ext2_filsys fs, ext2_badblocks_list *bb_list)
-+{
-+	errcode_t	retval;
-+	struct read_bb_record rb;
-+	struct ext2_inode inode;
-+	blk_t	numblocks;
-+
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	if (!*bb_list) {
-+		retval = ext2fs_read_inode(fs, EXT2_BAD_INO, &inode);
-+		if (retval)
-+			return retval;
-+		if (inode.i_blocks < 500)
-+			numblocks = (inode.i_blocks /
-+				     (fs->blocksize / 512)) + 20;
-+		else
-+			numblocks = 500;
-+		retval = ext2fs_badblocks_list_create(bb_list, numblocks);
-+		if (retval)
-+			return retval;
-+	}
-+
-+	rb.bb_list = *bb_list;
-+	rb.err = 0;
-+	retval = ext2fs_block_iterate2(fs, EXT2_BAD_INO, 0, 0,
-+				      mark_bad_block, &rb);
-+	if (retval)
-+		return retval;
-+
-+	return rb.err;
-+}
-+
-+
-diff -Naur silo-1.4.13.orig/libext2fs/read_bb_file.c silo-1.4.13/libext2fs/read_bb_file.c
---- silo-1.4.13.orig/libext2fs/read_bb_file.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/read_bb_file.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,97 @@
-+/*
-+ * read_bb_file.c --- read a list of bad blocks from a FILE *
-+ *
-+ * Copyright (C) 1994, 1995, 2000 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <fcntl.h>
-+#include <time.h>
-+#if HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+/*
-+ * Reads a list of bad blocks from  a FILE *
-+ */
-+errcode_t ext2fs_read_bb_FILE2(ext2_filsys fs, FILE *f, 
-+			       ext2_badblocks_list *bb_list,
-+			       void *priv_data,
-+			       void (*invalid)(ext2_filsys fs,
-+					       blk_t blk,
-+					       char *badstr,
-+					       void *priv_data))
-+{
-+	errcode_t	retval;
-+	blk_t		blockno;
-+	int		count;
-+	char		buf[128];
-+
-+	if (fs)
-+		EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	if (!*bb_list) {
-+		retval = ext2fs_badblocks_list_create(bb_list, 10);
-+		if (retval)
-+			return retval;
-+	}
-+
-+	while (!feof (f)) {
-+		if (fgets(buf, sizeof(buf), f) == NULL)
-+			break;
-+		count = sscanf(buf, "%u", &blockno);
-+		if (count <= 0)
-+			continue;
-+		if (fs &&
-+		    ((blockno < fs->super->s_first_data_block) ||
-+		    (blockno >= fs->super->s_blocks_count))) {
-+			if (invalid)
-+				(invalid)(fs, blockno, buf, priv_data);
-+			continue;
-+		}
-+		retval = ext2fs_badblocks_list_add(*bb_list, blockno);
-+		if (retval)
-+			return retval;
-+	}
-+	return 0;
-+}
-+
-+static void call_compat_invalid(ext2_filsys fs, blk_t blk,
-+				char *badstr EXT2FS_ATTR((unused)), 
-+				void *priv_data)
-+{
-+	void (*invalid)(ext2_filsys, blk_t);
-+
-+	invalid = (void (*)(ext2_filsys, blk_t)) priv_data;
-+	if (invalid)
-+		invalid(fs, blk);
-+}
-+
-+
-+/*
-+ * Reads a list of bad blocks from  a FILE *
-+ */
-+errcode_t ext2fs_read_bb_FILE(ext2_filsys fs, FILE *f, 
-+			      ext2_badblocks_list *bb_list,
-+			      void (*invalid)(ext2_filsys fs, blk_t blk))
-+{
-+	return ext2fs_read_bb_FILE2(fs, f, bb_list, (void *) invalid,
-+				    call_compat_invalid);
-+}
-+
-+
-diff -Naur silo-1.4.13.orig/libext2fs/res_gdt.c silo-1.4.13/libext2fs/res_gdt.c
---- silo-1.4.13.orig/libext2fs/res_gdt.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/res_gdt.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,220 @@
-+/*
-+ * res_gdt.c --- reserve blocks for growing the group descriptor table
-+ *               during online resizing.
-+ *
-+ * Copyright (C) 2002 Andreas Dilger
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#include <time.h>
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+/*
-+ * Iterate through the groups which hold BACKUP superblock/GDT copies in an
-+ * ext3 filesystem.  The counters should be initialized to 1, 5, and 7 before
-+ * calling this for the first time.  In a sparse filesystem it will be the
-+ * sequence of powers of 3, 5, and 7: 1, 3, 5, 7, 9, 25, 27, 49, 81, ...
-+ * For a non-sparse filesystem it will be every group: 1, 2, 3, 4, ...
-+ */
-+static unsigned int list_backups(ext2_filsys fs, unsigned int *three,
-+				 unsigned int *five, unsigned int *seven)
-+{
-+	unsigned int *min = three;
-+	int mult = 3;
-+	unsigned int ret;
-+
-+	if (!(fs->super->s_feature_ro_compat &
-+	      EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER)) {
-+		ret = *min;
-+		*min += 1;
-+		return ret;
-+	}
-+
-+	if (*five < *min) {
-+		min = five;
-+		mult = 5;
-+	}
-+	if (*seven < *min) {
-+		min = seven;
-+		mult = 7;
-+	}
-+
-+	ret = *min;
-+	*min *= mult;
-+
-+	return ret;
-+}
-+
-+/*
-+ * This code assumes that the reserved blocks have already been marked in-use
-+ * during ext2fs_initialize(), so that they are not allocated for other
-+ * uses before we can add them to the resize inode (which has to come
-+ * after the creation of the inode table).
-+ */
-+errcode_t ext2fs_create_resize_inode(ext2_filsys fs)
-+{
-+	errcode_t		retval, retval2;
-+	struct ext2_super_block	*sb;
-+	struct ext2_inode	inode;
-+	__u32			*dindir_buf, *gdt_buf;
-+	int			rsv_add;
-+	unsigned long long	apb, inode_size;
-+	blk_t			dindir_blk, rsv_off, gdt_off, gdt_blk;
-+	int			dindir_dirty = 0, inode_dirty = 0;
-+
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	sb = fs->super;
-+
-+	retval = ext2fs_get_mem(2 * fs->blocksize, (void **)&dindir_buf);
-+	if (retval)
-+		goto out_free;
-+	gdt_buf = (__u32 *)((char *)dindir_buf + fs->blocksize);
-+
-+	retval = ext2fs_read_inode(fs, EXT2_RESIZE_INO, &inode);
-+	if (retval)
-+		goto out_free;
-+
-+	/* Maximum possible file size (we donly use the dindirect blocks) */
-+	apb = EXT2_ADDR_PER_BLOCK(sb);
-+	rsv_add = fs->blocksize / 512;
-+	if ((dindir_blk = inode.i_block[EXT2_DIND_BLOCK])) {
-+#ifdef RES_GDT_DEBUG
-+		printf("reading GDT dindir %u\n", dindir_blk);
-+#endif
-+		retval = ext2fs_read_ind_block(fs, dindir_blk, dindir_buf);
-+		if (retval)
-+			goto out_inode;
-+	} else {
-+		blk_t goal = 3 + sb->s_reserved_gdt_blocks +
-+			fs->desc_blocks + fs->inode_blocks_per_group;
-+
-+		retval = ext2fs_alloc_block(fs, goal, 0, &dindir_blk);
-+		if (retval)
-+			goto out_free;
-+		inode.i_mode = LINUX_S_IFREG | 0600;
-+		inode.i_links_count = 1;
-+		inode.i_block[EXT2_DIND_BLOCK] = dindir_blk;
-+		inode.i_blocks = rsv_add;
-+		memset(dindir_buf, 0, fs->blocksize);
-+#ifdef RES_GDT_DEBUG
-+		printf("allocated GDT dindir %u\n", dindir_blk);
-+#endif
-+		dindir_dirty = inode_dirty = 1;
-+		inode_size = apb*apb + apb + EXT2_NDIR_BLOCKS;
-+		inode_size *= fs->blocksize;
-+		inode.i_size = inode_size & 0xFFFFFFFF;
-+		inode.i_size_high = (inode_size >> 32) & 0xFFFFFFFF;
-+		if(inode.i_size_high) {
-+			sb->s_feature_ro_compat |=
-+				EXT2_FEATURE_RO_COMPAT_LARGE_FILE;
-+		}
-+		inode.i_ctime = time(0);
-+	}
-+
-+	for (rsv_off = 0, gdt_off = fs->desc_blocks,
-+	     gdt_blk = sb->s_first_data_block + 1 + fs->desc_blocks;
-+	     rsv_off < sb->s_reserved_gdt_blocks;
-+	     rsv_off++, gdt_off++, gdt_blk++) {
-+		unsigned int three = 1, five = 5, seven = 7;
-+		unsigned int grp, last = 0;
-+		int gdt_dirty = 0;
-+
-+		gdt_off %= apb;
-+		if (!dindir_buf[gdt_off]) {
-+			/* FIXME XXX XXX
-+			blk_t new_blk;
-+
-+			retval = ext2fs_new_block(fs, gdt_blk, 0, &new_blk);
-+			if (retval)
-+				goto out_free;
-+			if (new_blk != gdt_blk) {
-+				// XXX free block
-+				retval = -1; // XXX
-+			}
-+			*/
-+			gdt_dirty = dindir_dirty = inode_dirty = 1;
-+			memset(gdt_buf, 0, fs->blocksize);
-+			dindir_buf[gdt_off] = gdt_blk;
-+			inode.i_blocks += rsv_add;
-+#ifdef RES_GDT_DEBUG
-+			printf("added primary GDT block %u at %u[%u]\n",
-+			       gdt_blk, dindir_blk, gdt_off);
-+#endif
-+		} else if (dindir_buf[gdt_off] == gdt_blk) {
-+#ifdef RES_GDT_DEBUG
-+			printf("reading primary GDT block %u\n", gdt_blk);
-+#endif
-+			retval = ext2fs_read_ind_block(fs, gdt_blk, gdt_buf);
-+			if (retval)
-+				goto out_dindir;
-+		} else {
-+#ifdef RES_GDT_DEBUG
-+			printf("bad primary GDT %u != %u at %u[%u]\n",
-+			       dindir_buf[gdt_off], gdt_blk,dindir_blk,gdt_off);
-+#endif
-+			retval = EXT2_ET_RESIZE_INODE_CORRUPT;
-+			goto out_dindir;
-+		}
-+
-+		while ((grp = list_backups(fs, &three, &five, &seven)) <
-+		       fs->group_desc_count) {
-+			blk_t expect = gdt_blk + grp * sb->s_blocks_per_group;
-+
-+			if (!gdt_buf[last]) {
-+#ifdef RES_GDT_DEBUG
-+				printf("added backup GDT %u grp %u@%u[%u]\n",
-+				       expect, grp, gdt_blk, last);
-+#endif
-+				gdt_buf[last] = expect;
-+				inode.i_blocks += rsv_add;
-+				gdt_dirty = inode_dirty = 1;
-+			} else if (gdt_buf[last] != expect) {
-+#ifdef RES_GDT_DEBUG
-+				printf("bad backup GDT %u != %u at %u[%u]\n",
-+				       gdt_buf[last], expect, gdt_blk, last);
-+#endif
-+				retval = EXT2_ET_RESIZE_INODE_CORRUPT;
-+				goto out_dindir;
-+			}
-+			last++;
-+		}
-+		if (gdt_dirty) {
-+#ifdef RES_GDT_DEBUG
-+			printf("writing primary GDT block %u\n", gdt_blk);
-+#endif
-+			retval = ext2fs_write_ind_block(fs, gdt_blk, gdt_buf);
-+			if (retval)
-+				goto out_dindir;
-+		}
-+	}
-+
-+out_dindir:
-+	if (dindir_dirty) {
-+		retval2 = ext2fs_write_ind_block(fs, dindir_blk, dindir_buf);
-+		if (!retval)
-+			retval = retval2;
-+	}
-+out_inode:
-+#ifdef RES_GDT_DEBUG
-+	printf("inode.i_blocks = %u, i_size = %u\n", inode.i_blocks,
-+	       inode.i_size);
-+#endif
-+	if (inode_dirty) {
-+		inode.i_atime = inode.i_mtime = time(0);
-+		retval2 = ext2fs_write_inode(fs, EXT2_RESIZE_INO, &inode);
-+		if (!retval)
-+			retval = retval2;
-+	}
-+out_free:
-+	ext2fs_free_mem((void **)&dindir_buf);
-+	return retval;
-+}
-+
-diff -Naur silo-1.4.13.orig/libext2fs/rs_bitmap.c silo-1.4.13/libext2fs/rs_bitmap.c
---- silo-1.4.13.orig/libext2fs/rs_bitmap.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/rs_bitmap.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,106 @@
-+/*
-+ * rs_bitmap.c --- routine for changing the size of a bitmap
-+ *
-+ * Copyright (C) 1996, 1997 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <fcntl.h>
-+#include <time.h>
-+#ifdef HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
-+#ifdef HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+errcode_t ext2fs_resize_generic_bitmap(__u32 new_end, __u32 new_real_end,
-+				       ext2fs_generic_bitmap bmap)
-+{
-+	errcode_t	retval;
-+	size_t		size, new_size;
-+	__u32		bitno;
-+
-+	if (!bmap)
-+		return EXT2_ET_INVALID_ARGUMENT;
-+
-+	EXT2_CHECK_MAGIC(bmap, EXT2_ET_MAGIC_GENERIC_BITMAP);
-+
-+	/*
-+	 * If we're expanding the bitmap, make sure all of the new
-+	 * parts of the bitmap are zero.
-+	 */
-+	if (new_end > bmap->end) {
-+		bitno = bmap->real_end;
-+		if (bitno > new_end)
-+			bitno = new_end;
-+		for (; bitno > bmap->end; bitno--)
-+			ext2fs_clear_bit(bitno - bmap->start, bmap->bitmap);
-+	}
-+	if (new_real_end == bmap->real_end) {
-+		bmap->end = new_end;
-+		return 0;
-+	}
-+	
-+	size = ((bmap->real_end - bmap->start) / 8) + 1;
-+	new_size = ((new_real_end - bmap->start) / 8) + 1;
-+
-+	if (size != new_size) {
-+		retval = ext2fs_resize_mem(size, new_size, &bmap->bitmap);
-+		if (retval)
-+			return retval;
-+	}
-+	if (new_size > size)
-+		memset(bmap->bitmap + size, 0, new_size - size);
-+
-+	bmap->end = new_end;
-+	bmap->real_end = new_real_end;
-+	return 0;
-+}
-+
-+errcode_t ext2fs_resize_inode_bitmap(__u32 new_end, __u32 new_real_end,
-+				     ext2fs_inode_bitmap bmap)
-+{
-+	errcode_t	retval;
-+	
-+	if (!bmap)
-+		return EXT2_ET_INVALID_ARGUMENT;
-+
-+	EXT2_CHECK_MAGIC(bmap, EXT2_ET_MAGIC_INODE_BITMAP);
-+
-+	bmap->magic = EXT2_ET_MAGIC_GENERIC_BITMAP;
-+	retval = ext2fs_resize_generic_bitmap(new_end, new_real_end,
-+					      bmap);
-+	bmap->magic = EXT2_ET_MAGIC_INODE_BITMAP;
-+	return retval;
-+}
-+
-+errcode_t ext2fs_resize_block_bitmap(__u32 new_end, __u32 new_real_end,
-+				     ext2fs_block_bitmap bmap)
-+{
-+	errcode_t	retval;
-+	
-+	if (!bmap)
-+		return EXT2_ET_INVALID_ARGUMENT;
-+
-+	EXT2_CHECK_MAGIC(bmap, EXT2_ET_MAGIC_BLOCK_BITMAP);
-+
-+	bmap->magic = EXT2_ET_MAGIC_GENERIC_BITMAP;
-+	retval = ext2fs_resize_generic_bitmap(new_end, new_real_end,
-+					      bmap);
-+	bmap->magic = EXT2_ET_MAGIC_BLOCK_BITMAP;
-+	return retval;
-+}
-+
-diff -Naur silo-1.4.13.orig/libext2fs/rw_bitmaps.c silo-1.4.13/libext2fs/rw_bitmaps.c
---- silo-1.4.13.orig/libext2fs/rw_bitmaps.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/rw_bitmaps.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,300 @@
-+/*
-+ * rw_bitmaps.c --- routines to read and write the  inode and block bitmaps.
-+ *
-+ * Copyright (C) 1993, 1994, 1994, 1996 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <fcntl.h>
-+#include <time.h>
-+#ifdef HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
-+#ifdef HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+#include "e2image.h"
-+
-+#if defined(__powerpc__) && defined(EXT2FS_ENABLE_SWAPFS)
-+/*
-+ * On the PowerPC, the big-endian variant of the ext2 filesystem
-+ * has its bitmaps stored as 32-bit words with bit 0 as the LSB
-+ * of each word.  Thus a bitmap with only bit 0 set would be, as
-+ * a string of bytes, 00 00 00 01 00 ...
-+ * To cope with this, we byte-reverse each word of a bitmap if
-+ * we have a big-endian filesystem, that is, if we are *not*
-+ * byte-swapping other word-sized numbers.
-+ */
-+#define EXT2_BIG_ENDIAN_BITMAPS
-+#endif
-+
-+#ifdef EXT2_BIG_ENDIAN_BITMAPS
-+static void ext2fs_swap_bitmap(ext2_filsys fs, char *bitmap, int nbytes)
-+{
-+	__u32 *p = (__u32 *) bitmap;
-+	int n;
-+		
-+	for (n = nbytes / sizeof(__u32); n > 0; --n, ++p)
-+		*p = ext2fs_swab32(*p);
-+}
-+#endif
-+
-+errcode_t ext2fs_write_inode_bitmap(ext2_filsys fs)
-+{
-+	dgrp_t 		i;
-+	size_t		nbytes;
-+	errcode_t	retval;
-+	char * inode_bitmap = fs->inode_map->bitmap;
-+	char * bitmap_block = NULL;
-+	blk_t		blk;
-+
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	if (!(fs->flags & EXT2_FLAG_RW))
-+		return EXT2_ET_RO_FILSYS;
-+	if (!inode_bitmap)
-+		return 0;
-+	nbytes = (size_t) ((EXT2_INODES_PER_GROUP(fs->super)+7) / 8);
-+	
-+	retval = ext2fs_get_mem(fs->blocksize, &bitmap_block);
-+	if (retval)
-+		return retval;
-+	memset(bitmap_block, 0xff, fs->blocksize);
-+	for (i = 0; i < fs->group_desc_count; i++) {
-+		memcpy(bitmap_block, inode_bitmap, nbytes);
-+		blk = fs->group_desc[i].bg_inode_bitmap;
-+		if (blk) {
-+#ifdef EXT2_BIG_ENDIAN_BITMAPS
-+			if (!((fs->flags & EXT2_FLAG_SWAP_BYTES) ||
-+			      (fs->flags & EXT2_FLAG_SWAP_BYTES_WRITE)))
-+				ext2fs_swap_bitmap(fs, bitmap_block, nbytes);
-+#endif
-+			retval = io_channel_write_blk(fs->io, blk, 1,
-+						      bitmap_block);
-+			if (retval)
-+				return EXT2_ET_INODE_BITMAP_WRITE;
-+		}
-+		inode_bitmap += nbytes;
-+	}
-+	fs->flags &= ~EXT2_FLAG_IB_DIRTY;
-+	ext2fs_free_mem(&bitmap_block);
-+	return 0;
-+}
-+
-+errcode_t ext2fs_write_block_bitmap (ext2_filsys fs)
-+{
-+	dgrp_t 		i;
-+	unsigned int	j;
-+	int		nbytes;
-+	unsigned int	nbits;
-+	errcode_t	retval;
-+	char * block_bitmap = fs->block_map->bitmap;
-+	char * bitmap_block = NULL;
-+	blk_t		blk;
-+
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	if (!(fs->flags & EXT2_FLAG_RW))
-+		return EXT2_ET_RO_FILSYS;
-+	if (!block_bitmap)
-+		return 0;
-+	nbytes = EXT2_BLOCKS_PER_GROUP(fs->super) / 8;
-+	retval = ext2fs_get_mem(fs->blocksize, &bitmap_block);
-+	if (retval)
-+		return retval;
-+	memset(bitmap_block, 0xff, fs->blocksize);
-+	for (i = 0; i < fs->group_desc_count; i++) {
-+		memcpy(bitmap_block, block_bitmap, nbytes);
-+		if (i == fs->group_desc_count - 1) {
-+			/* Force bitmap padding for the last group */
-+			nbits = ((fs->super->s_blocks_count
-+				  - fs->super->s_first_data_block)
-+				 % EXT2_BLOCKS_PER_GROUP(fs->super));
-+			if (nbits)
-+				for (j = nbits; j < fs->blocksize * 8; j++)
-+					ext2fs_set_bit(j, bitmap_block);
-+		}
-+		blk = fs->group_desc[i].bg_block_bitmap;
-+		if (blk) {
-+#ifdef EXT2_BIG_ENDIAN_BITMAPS
-+			if (!((fs->flags & EXT2_FLAG_SWAP_BYTES) ||
-+			      (fs->flags & EXT2_FLAG_SWAP_BYTES_WRITE)))
-+				ext2fs_swap_bitmap(fs, bitmap_block, nbytes);
-+#endif
-+			retval = io_channel_write_blk(fs->io, blk, 1,
-+						      bitmap_block);
-+			if (retval)
-+				return EXT2_ET_BLOCK_BITMAP_WRITE;
-+		}
-+		block_bitmap += nbytes;
-+	}
-+	fs->flags &= ~EXT2_FLAG_BB_DIRTY;
-+	ext2fs_free_mem(&bitmap_block);
-+	return 0;
-+}
-+
-+static errcode_t read_bitmaps(ext2_filsys fs, int do_inode, int do_block)
-+{
-+	dgrp_t i;
-+	char *block_bitmap = 0, *inode_bitmap = 0;
-+	char *buf;
-+	errcode_t retval;
-+	int block_nbytes = (int) EXT2_BLOCKS_PER_GROUP(fs->super) / 8;
-+	int inode_nbytes = (int) EXT2_INODES_PER_GROUP(fs->super) / 8;
-+	blk_t	blk;
-+
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	fs->write_bitmaps = ext2fs_write_bitmaps;
-+
-+	retval = ext2fs_get_mem(strlen(fs->device_name) + 80, &buf);
-+	if (retval)
-+		return retval;
-+	if (do_block) {
-+		if (fs->block_map)
-+			ext2fs_free_block_bitmap(fs->block_map);
-+		sprintf(buf, "block bitmap for %s", fs->device_name);
-+		retval = ext2fs_allocate_block_bitmap(fs, buf, &fs->block_map);
-+		if (retval)
-+			goto cleanup;
-+		block_bitmap = fs->block_map->bitmap;
-+	}
-+	if (do_inode) {
-+		if (fs->inode_map)
-+			ext2fs_free_inode_bitmap(fs->inode_map);
-+		sprintf(buf, "inode bitmap for %s", fs->device_name);
-+		retval = ext2fs_allocate_inode_bitmap(fs, buf, &fs->inode_map);
-+		if (retval)
-+			goto cleanup;
-+		inode_bitmap = fs->inode_map->bitmap;
-+	}
-+	ext2fs_free_mem(&buf);
-+
-+	if (fs->flags & EXT2_FLAG_IMAGE_FILE) {
-+		if (inode_bitmap) {
-+			blk = (fs->image_header->offset_inodemap /
-+			       fs->blocksize);
-+			retval = io_channel_read_blk(fs->image_io, blk,
-+			     -(inode_nbytes * fs->group_desc_count),
-+			     inode_bitmap);
-+			if (retval)
-+				goto cleanup;
-+		}
-+		if (block_bitmap) {
-+			blk = (fs->image_header->offset_blockmap /
-+			       fs->blocksize);
-+			retval = io_channel_read_blk(fs->image_io, blk, 
-+			     -(block_nbytes * fs->group_desc_count),
-+			     block_bitmap);
-+			if (retval)
-+				goto cleanup;
-+		}
-+		return 0;
-+	}
-+
-+	for (i = 0; i < fs->group_desc_count; i++) {
-+		if (block_bitmap) {
-+			blk = fs->group_desc[i].bg_block_bitmap;
-+			if (blk) {
-+				retval = io_channel_read_blk(fs->io, blk,
-+					     -block_nbytes, block_bitmap);
-+				if (retval) {
-+					retval = EXT2_ET_BLOCK_BITMAP_READ;
-+					goto cleanup;
-+				}
-+#ifdef EXT2_BIG_ENDIAN_BITMAPS
-+				if (!((fs->flags & EXT2_FLAG_SWAP_BYTES) ||
-+				      (fs->flags & EXT2_FLAG_SWAP_BYTES_READ)))
-+					ext2fs_swap_bitmap(fs, block_bitmap, block_nbytes);
-+#endif
-+			} else
-+				memset(block_bitmap, 0, block_nbytes);
-+			block_bitmap += block_nbytes;
-+		}
-+		if (inode_bitmap) {
-+			blk = fs->group_desc[i].bg_inode_bitmap;
-+			if (blk) {
-+				retval = io_channel_read_blk(fs->io, blk,
-+					     -inode_nbytes, inode_bitmap);
-+				if (retval) {
-+					retval = EXT2_ET_INODE_BITMAP_READ;
-+					goto cleanup;
-+				}
-+#ifdef EXT2_BIG_ENDIAN_BITMAPS
-+				if (!((fs->flags & EXT2_FLAG_SWAP_BYTES) ||
-+				      (fs->flags & EXT2_FLAG_SWAP_BYTES_READ)))
-+					ext2fs_swap_bitmap(fs, inode_bitmap, inode_nbytes);
-+#endif
-+			} else
-+				memset(inode_bitmap, 0, inode_nbytes);
-+			inode_bitmap += inode_nbytes;
-+		}
-+	}
-+	return 0;
-+	
-+cleanup:
-+	if (do_block) {
-+		ext2fs_free_mem(&fs->block_map);
-+		fs->block_map = 0;
-+	}
-+	if (do_inode) {
-+		ext2fs_free_mem(&fs->inode_map);
-+		fs->inode_map = 0;
-+	}
-+	if (buf)
-+		ext2fs_free_mem(&buf);
-+	return retval;
-+}
-+
-+errcode_t ext2fs_read_inode_bitmap (ext2_filsys fs)
-+{
-+	return read_bitmaps(fs, 1, 0);
-+}
-+
-+errcode_t ext2fs_read_block_bitmap(ext2_filsys fs)
-+{
-+	return read_bitmaps(fs, 0, 1);
-+}
-+
-+errcode_t ext2fs_read_bitmaps(ext2_filsys fs)
-+{
-+
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	if (fs->inode_map && fs->block_map)
-+		return 0;
-+
-+	return read_bitmaps(fs, !fs->inode_map, !fs->block_map);
-+}
-+
-+errcode_t ext2fs_write_bitmaps(ext2_filsys fs)
-+{
-+	errcode_t	retval;
-+
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	if (fs->block_map && ext2fs_test_bb_dirty(fs)) {
-+		retval = ext2fs_write_block_bitmap(fs);
-+		if (retval)
-+			return retval;
-+	}
-+	if (fs->inode_map && ext2fs_test_ib_dirty(fs)) {
-+		retval = ext2fs_write_inode_bitmap(fs);
-+		if (retval)
-+			return retval;
-+	}
-+	return 0;
-+}	
-+
-diff -Naur silo-1.4.13.orig/libext2fs/sparse.c silo-1.4.13/libext2fs/sparse.c
---- silo-1.4.13.orig/libext2fs/sparse.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/sparse.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,78 @@
-+/*
-+ * sparse.c --- find the groups in an ext2 filesystem with metadata backups
-+ *
-+ * Copyright (C) 1993, 1994, 1995, 1996 Theodore Ts'o.
-+ * Copyright (C) 2002 Andreas Dilger.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+
-+#include "ext2_fs.h"
-+#include "ext2fsP.h"
-+
-+static int test_root(int a, int b)
-+{
-+	if (a == 0)
-+		return 1;
-+	while (1) {
-+		if (a == 1)
-+			return 1;
-+		if (a % b)
-+			return 0;
-+		a = a / b;
-+	}
-+}
-+
-+int ext2fs_bg_has_super(ext2_filsys fs, int group_block)
-+{
-+	if (!(fs->super->s_feature_ro_compat &
-+	      EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER))
-+		return 1;
-+
-+	if (test_root(group_block, 3) || (test_root(group_block, 5)) ||
-+	    test_root(group_block, 7))
-+		return 1;
-+
-+	return 0;
-+}
-+
-+/*
-+ * Iterate through the groups which hold BACKUP superblock/GDT copies in an
-+ * ext3 filesystem.  The counters should be initialized to 1, 5, and 7 before
-+ * calling this for the first time.  In a sparse filesystem it will be the
-+ * sequence of powers of 3, 5, and 7: 1, 3, 5, 7, 9, 25, 27, 49, 81, ...
-+ * For a non-sparse filesystem it will be every group: 1, 2, 3, 4, ...
-+ */
-+unsigned int ext2fs_list_backups(ext2_filsys fs, unsigned int *three,
-+				 unsigned int *five, unsigned int *seven)
-+{
-+	unsigned int *min = three;
-+	int mult = 3;
-+	unsigned int ret;
-+
-+	if (!(fs->super->s_feature_ro_compat &
-+	      EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER)) {
-+		ret = *min;
-+		*min += 1;
-+		return ret;
-+	}
-+
-+	if (*five < *min) {
-+		min = five;
-+		mult = 5;
-+	}
-+	if (*seven < *min) {
-+		min = seven;
-+		mult = 7;
-+	}
-+
-+	ret = *min;
-+	*min *= mult;
-+
-+	return ret;
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/swapfs.c silo-1.4.13/libext2fs/swapfs.c
---- silo-1.4.13.orig/libext2fs/swapfs.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/swapfs.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,237 @@
-+/*
-+ * swapfs.c --- swap ext2 filesystem data structures
-+ * 
-+ * Copyright (C) 1995, 1996, 2002 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <string.h>
-+#include <time.h>
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+#include <ext2fs/ext2_ext_attr.h>
-+
-+#ifdef EXT2FS_ENABLE_SWAPFS
-+void ext2fs_swap_super(struct ext2_super_block * sb)
-+{
-+  	int i;
-+	sb->s_inodes_count = ext2fs_swab32(sb->s_inodes_count);
-+	sb->s_blocks_count = ext2fs_swab32(sb->s_blocks_count);
-+	sb->s_r_blocks_count = ext2fs_swab32(sb->s_r_blocks_count);
-+	sb->s_free_blocks_count = ext2fs_swab32(sb->s_free_blocks_count);
-+	sb->s_free_inodes_count = ext2fs_swab32(sb->s_free_inodes_count);
-+	sb->s_first_data_block = ext2fs_swab32(sb->s_first_data_block);
-+	sb->s_log_block_size = ext2fs_swab32(sb->s_log_block_size);
-+	sb->s_log_frag_size = ext2fs_swab32(sb->s_log_frag_size);
-+	sb->s_blocks_per_group = ext2fs_swab32(sb->s_blocks_per_group);
-+	sb->s_frags_per_group = ext2fs_swab32(sb->s_frags_per_group);
-+	sb->s_inodes_per_group = ext2fs_swab32(sb->s_inodes_per_group);
-+	sb->s_mtime = ext2fs_swab32(sb->s_mtime);
-+	sb->s_wtime = ext2fs_swab32(sb->s_wtime);
-+	sb->s_mnt_count = ext2fs_swab16(sb->s_mnt_count);
-+	sb->s_max_mnt_count = ext2fs_swab16(sb->s_max_mnt_count);
-+	sb->s_magic = ext2fs_swab16(sb->s_magic);
-+	sb->s_state = ext2fs_swab16(sb->s_state);
-+	sb->s_errors = ext2fs_swab16(sb->s_errors);
-+	sb->s_minor_rev_level = ext2fs_swab16(sb->s_minor_rev_level);
-+	sb->s_lastcheck = ext2fs_swab32(sb->s_lastcheck);
-+	sb->s_checkinterval = ext2fs_swab32(sb->s_checkinterval);
-+	sb->s_creator_os = ext2fs_swab32(sb->s_creator_os);
-+	sb->s_rev_level = ext2fs_swab32(sb->s_rev_level);
-+	sb->s_def_resuid = ext2fs_swab16(sb->s_def_resuid);
-+	sb->s_def_resgid = ext2fs_swab16(sb->s_def_resgid);
-+	sb->s_first_ino = ext2fs_swab32(sb->s_first_ino);
-+	sb->s_inode_size = ext2fs_swab16(sb->s_inode_size);
-+	sb->s_block_group_nr = ext2fs_swab16(sb->s_block_group_nr);
-+	sb->s_feature_compat = ext2fs_swab32(sb->s_feature_compat);
-+	sb->s_feature_incompat = ext2fs_swab32(sb->s_feature_incompat);
-+	sb->s_feature_ro_compat = ext2fs_swab32(sb->s_feature_ro_compat);
-+	sb->s_algorithm_usage_bitmap = ext2fs_swab32(sb->s_algorithm_usage_bitmap);
-+	sb->s_reserved_gdt_blocks = ext2fs_swab16(sb->s_reserved_gdt_blocks);
-+	sb->s_journal_inum = ext2fs_swab32(sb->s_journal_inum);
-+	sb->s_journal_dev = ext2fs_swab32(sb->s_journal_dev);
-+	sb->s_last_orphan = ext2fs_swab32(sb->s_last_orphan);
-+	sb->s_default_mount_opts = ext2fs_swab32(sb->s_default_mount_opts);
-+	sb->s_first_meta_bg = ext2fs_swab32(sb->s_first_meta_bg);
-+	sb->s_mkfs_time = ext2fs_swab32(sb->s_mkfs_time);
-+	for (i=0; i < 4; i++)
-+		sb->s_hash_seed[i] = ext2fs_swab32(sb->s_hash_seed[i]);
-+	for (i=0; i < 17; i++)
-+		sb->s_jnl_blocks[i] = ext2fs_swab32(sb->s_jnl_blocks[i]);
-+
-+}
-+
-+void ext2fs_swap_group_desc(struct ext2_group_desc *gdp)
-+{
-+	gdp->bg_block_bitmap = ext2fs_swab32(gdp->bg_block_bitmap);
-+	gdp->bg_inode_bitmap = ext2fs_swab32(gdp->bg_inode_bitmap);
-+	gdp->bg_inode_table = ext2fs_swab32(gdp->bg_inode_table);
-+	gdp->bg_free_blocks_count = ext2fs_swab16(gdp->bg_free_blocks_count);
-+	gdp->bg_free_inodes_count = ext2fs_swab16(gdp->bg_free_inodes_count);
-+	gdp->bg_used_dirs_count = ext2fs_swab16(gdp->bg_used_dirs_count);
-+}
-+
-+void ext2fs_swap_ext_attr(char *to, char *from, int bufsize, int has_header)
-+{
-+	struct ext2_ext_attr_header *from_header =
-+		(struct ext2_ext_attr_header *)from;
-+	struct ext2_ext_attr_header *to_header =
-+		(struct ext2_ext_attr_header *)to;
-+	struct ext2_ext_attr_entry *from_entry, *to_entry;
-+	char *from_end = (char *)from_header + bufsize;
-+	int n;
-+
-+	if (to_header != from_header)
-+		memcpy(to_header, from_header, bufsize);
-+
-+	from_entry = (struct ext2_ext_attr_entry *)from_header;
-+	to_entry   = (struct ext2_ext_attr_entry *)to_header;
-+
-+	if (has_header) {
-+		to_header->h_magic    = ext2fs_swab32(from_header->h_magic);
-+		to_header->h_blocks   = ext2fs_swab32(from_header->h_blocks);
-+		to_header->h_refcount = ext2fs_swab32(from_header->h_refcount);
-+		for (n=0; n<4; n++)
-+			to_header->h_reserved[n] =
-+				ext2fs_swab32(from_header->h_reserved[n]);
-+		from_entry = (struct ext2_ext_attr_entry *)(from_header+1);
-+		to_entry   = (struct ext2_ext_attr_entry *)(to_header+1);
-+	}
-+
-+	while ((char *)from_entry < from_end && *(__u32 *)from_entry) {
-+		to_entry->e_value_offs  =	
-+			ext2fs_swab16(from_entry->e_value_offs);
-+		to_entry->e_value_block =	
-+			ext2fs_swab32(from_entry->e_value_block);
-+		to_entry->e_value_size  =	
-+			ext2fs_swab32(from_entry->e_value_size);
-+		from_entry = EXT2_EXT_ATTR_NEXT(from_entry);
-+		to_entry   = EXT2_EXT_ATTR_NEXT(to_entry);
-+	}
-+}
-+
-+void ext2fs_swap_inode_full(ext2_filsys fs, struct ext2_inode_large *t,
-+			    struct ext2_inode_large *f, int hostorder,
-+			    int bufsize)
-+{
-+	unsigned i;
-+	int islnk = 0;
-+	__u32 *eaf, *eat;
-+
-+	if (hostorder && LINUX_S_ISLNK(f->i_mode))
-+		islnk = 1;
-+	t->i_mode = ext2fs_swab16(f->i_mode);
-+	if (!hostorder && LINUX_S_ISLNK(t->i_mode))
-+		islnk = 1;
-+	t->i_uid = ext2fs_swab16(f->i_uid);
-+	t->i_size = ext2fs_swab32(f->i_size);
-+	t->i_atime = ext2fs_swab32(f->i_atime);
-+	t->i_ctime = ext2fs_swab32(f->i_ctime);
-+	t->i_mtime = ext2fs_swab32(f->i_mtime);
-+	t->i_dtime = ext2fs_swab32(f->i_dtime);
-+	t->i_gid = ext2fs_swab16(f->i_gid);
-+	t->i_links_count = ext2fs_swab16(f->i_links_count);
-+	t->i_blocks = ext2fs_swab32(f->i_blocks);
-+	t->i_flags = ext2fs_swab32(f->i_flags);
-+	t->i_file_acl = ext2fs_swab32(f->i_file_acl);
-+	t->i_dir_acl = ext2fs_swab32(f->i_dir_acl);
-+	if (!islnk || ext2fs_inode_data_blocks(fs, (struct ext2_inode *)t)) {
-+		for (i = 0; i < EXT2_N_BLOCKS; i++)
-+			t->i_block[i] = ext2fs_swab32(f->i_block[i]);
-+	} else if (t != f) {
-+		for (i = 0; i < EXT2_N_BLOCKS; i++)
-+			t->i_block[i] = f->i_block[i];
-+	}
-+	t->i_generation = ext2fs_swab32(f->i_generation);
-+	t->i_faddr = ext2fs_swab32(f->i_faddr);
-+
-+	switch (fs->super->s_creator_os) {
-+	case EXT2_OS_LINUX:
-+		t->osd1.linux1.l_i_reserved1 =
-+			ext2fs_swab32(f->osd1.linux1.l_i_reserved1);
-+		t->osd2.linux2.l_i_frag = f->osd2.linux2.l_i_frag;
-+		t->osd2.linux2.l_i_fsize = f->osd2.linux2.l_i_fsize;
-+		t->osd2.linux2.i_pad1 = ext2fs_swab16(f->osd2.linux2.i_pad1);
-+		t->osd2.linux2.l_i_uid_high =
-+		  ext2fs_swab16 (f->osd2.linux2.l_i_uid_high);
-+		t->osd2.linux2.l_i_gid_high =
-+		  ext2fs_swab16 (f->osd2.linux2.l_i_gid_high);
-+		t->osd2.linux2.l_i_reserved2 =
-+			ext2fs_swab32(f->osd2.linux2.l_i_reserved2);
-+		break;
-+	case EXT2_OS_HURD:
-+		t->osd1.hurd1.h_i_translator =
-+		  ext2fs_swab32 (f->osd1.hurd1.h_i_translator);
-+		t->osd2.hurd2.h_i_frag = f->osd2.hurd2.h_i_frag;
-+		t->osd2.hurd2.h_i_fsize = f->osd2.hurd2.h_i_fsize;
-+		t->osd2.hurd2.h_i_mode_high =
-+		  ext2fs_swab16 (f->osd2.hurd2.h_i_mode_high);
-+		t->osd2.hurd2.h_i_uid_high =
-+		  ext2fs_swab16 (f->osd2.hurd2.h_i_uid_high);
-+		t->osd2.hurd2.h_i_gid_high =
-+		  ext2fs_swab16 (f->osd2.hurd2.h_i_gid_high);
-+		t->osd2.hurd2.h_i_author =
-+		  ext2fs_swab32 (f->osd2.hurd2.h_i_author);
-+		break;
-+	case EXT2_OS_MASIX:
-+		t->osd1.masix1.m_i_reserved1 =
-+			ext2fs_swab32(f->osd1.masix1.m_i_reserved1);
-+		t->osd2.masix2.m_i_frag = f->osd2.masix2.m_i_frag;
-+		t->osd2.masix2.m_i_fsize = f->osd2.masix2.m_i_fsize;
-+		t->osd2.masix2.m_pad1 = ext2fs_swab16(f->osd2.masix2.m_pad1);
-+		t->osd2.masix2.m_i_reserved2[0] =
-+			ext2fs_swab32(f->osd2.masix2.m_i_reserved2[0]);
-+		t->osd2.masix2.m_i_reserved2[1] =
-+			ext2fs_swab32(f->osd2.masix2.m_i_reserved2[1]);
-+		break;
-+	}
-+
-+	if (bufsize < (int) (sizeof(struct ext2_inode) + sizeof(__u16)))
-+		return; /* no i_extra_isize field */
-+
-+	t->i_extra_isize = ext2fs_swab16(f->i_extra_isize);
-+	if (t->i_extra_isize > EXT2_INODE_SIZE(fs->super) -
-+				sizeof(struct ext2_inode)) {
-+		/* this is error case: i_extra_size is too large */
-+		return;
-+	}
-+
-+	i = sizeof(struct ext2_inode) + t->i_extra_isize + sizeof(__u32);
-+	if (bufsize < (int) i)
-+		return; /* no space for EA magic */
-+
-+	eaf = (__u32 *) (((char *) f) + sizeof(struct ext2_inode) +
-+					f->i_extra_isize);
-+
-+	if (ext2fs_swab32(*eaf) != EXT2_EXT_ATTR_MAGIC)
-+		return; /* it seems no magic here */
-+
-+	eat = (__u32 *) (((char *) t) + sizeof(struct ext2_inode) +
-+					f->i_extra_isize);
-+	*eat = ext2fs_swab32(*eaf);
-+
-+	/* convert EA(s) */
-+	ext2fs_swap_ext_attr((char *) (eat + 1), (char *) (eaf + 1),
-+			     bufsize - sizeof(struct ext2_inode) -
-+			     t->i_extra_isize - sizeof(__u32), 0);
-+
-+}
-+
-+void ext2fs_swap_inode(ext2_filsys fs, struct ext2_inode *t,
-+		       struct ext2_inode *f, int hostorder)
-+{
-+	ext2fs_swap_inode_full(fs, (struct ext2_inode_large *) t,
-+				(struct ext2_inode_large *) f, hostorder,
-+				sizeof(struct ext2_inode));
-+}
-+
-+#endif
-diff -Naur silo-1.4.13.orig/libext2fs/test_io.c silo-1.4.13/libext2fs/test_io.c
---- silo-1.4.13.orig/libext2fs/test_io.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/test_io.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,411 @@
-+/*
-+ * test_io.c --- This is the Test I/O interface.
-+ *
-+ * Copyright (C) 1996 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <fcntl.h>
-+#include <time.h>
-+#if HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+#ifdef HAVE_SYS_PRCTL_H
-+#include <sys/prctl.h>
-+#else
-+#define PR_GET_DUMPABLE 3
-+#endif
-+#if (!defined(HAVE_PRCTL) && defined(linux))
-+#include <sys/syscall.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+/*
-+ * For checking structure magic numbers...
-+ */
-+
-+#define EXT2_CHECK_MAGIC(struct, code) \
-+	  if ((struct)->magic != (code)) return (code)
-+  
-+struct test_private_data {
-+	int	magic;
-+	io_channel real;
-+	int flags;
-+	FILE *outfile;
-+	unsigned long block;
-+	int read_abort_count, write_abort_count;
-+	void (*read_blk)(unsigned long block, int count, errcode_t err);
-+	void (*write_blk)(unsigned long block, int count, errcode_t err);
-+	void (*set_blksize)(int blksize, errcode_t err);
-+	void (*write_byte)(unsigned long block, int count, errcode_t err);
-+};
-+
-+static errcode_t test_open(const char *name, int flags, io_channel *channel);
-+static errcode_t test_close(io_channel channel);
-+static errcode_t test_set_blksize(io_channel channel, int blksize);
-+static errcode_t test_read_blk(io_channel channel, unsigned long block,
-+			       int count, void *data);
-+static errcode_t test_write_blk(io_channel channel, unsigned long block,
-+				int count, const void *data);
-+static errcode_t test_flush(io_channel channel);
-+static errcode_t test_write_byte(io_channel channel, unsigned long offset,
-+				 int count, const void *buf);
-+static errcode_t test_set_option(io_channel channel, const char *option, 
-+				 const char *arg);
-+
-+static struct struct_io_manager struct_test_manager = {
-+	EXT2_ET_MAGIC_IO_MANAGER,
-+	"Test I/O Manager",
-+	test_open,
-+	test_close,
-+	test_set_blksize,
-+	test_read_blk,
-+	test_write_blk,
-+	test_flush,
-+	test_write_byte,
-+	test_set_option
-+};
-+
-+io_manager test_io_manager = &struct_test_manager;
-+
-+/*
-+ * These global variable can be set by the test program as
-+ * necessary *before* calling test_open
-+ */
-+io_manager test_io_backing_manager = 0;
-+void (*test_io_cb_read_blk)
-+	(unsigned long block, int count, errcode_t err) = 0;
-+void (*test_io_cb_write_blk)
-+	(unsigned long block, int count, errcode_t err) = 0;
-+void (*test_io_cb_set_blksize)
-+	(int blksize, errcode_t err) = 0;
-+void (*test_io_cb_write_byte)
-+	(unsigned long block, int count, errcode_t err) = 0;
-+
-+/*
-+ * Test flags
-+ */
-+#define TEST_FLAG_READ			0x01
-+#define TEST_FLAG_WRITE			0x02
-+#define TEST_FLAG_SET_BLKSIZE		0x04
-+#define TEST_FLAG_FLUSH			0x08
-+#define TEST_FLAG_DUMP			0x10
-+#define TEST_FLAG_SET_OPTION		0x20
-+
-+static void test_dump_block(io_channel channel,
-+			    struct test_private_data *data,
-+			    unsigned long block, const void *buf)
-+{
-+	const unsigned char *cp;
-+	FILE *f = data->outfile;
-+	int	i;
-+	unsigned long	cksum = 0;
-+
-+	for (i=0, cp = buf; i < channel->block_size; i++, cp++) {
-+		cksum += *cp;
-+	}
-+	fprintf(f, "Contents of block %lu, checksum %08lu: \n", block, cksum);
-+	for (i=0, cp = buf; i < channel->block_size; i++, cp++) {
-+		if ((i % 16) == 0)
-+			fprintf(f, "%04x: ", i);
-+		fprintf(f, "%02x%c", *cp, ((i % 16) == 15) ? '\n' : ' ');
-+	}
-+}
-+
-+static void test_abort(io_channel channel, unsigned long block)
-+{
-+	struct test_private_data *data;
-+	FILE *f;
-+
-+	data = (struct test_private_data *) channel->private_data;
-+	f = data->outfile;
-+	test_flush(channel);
-+
-+	fprintf(f, "Aborting due to I/O to block %lu\n", block);
-+	fflush(f);
-+	abort();
-+}
-+
-+static char *safe_getenv(const char *arg)
-+{
-+	if ((getuid() != geteuid()) || (getgid() != getegid()))
-+		return NULL;
-+#if HAVE_PRCTL
-+	if (prctl(PR_GET_DUMPABLE) == 0)
-+		return NULL;
-+#else
-+#if (defined(linux) && defined(SYS_prctl))
-+	if (syscall(SYS_prctl, PR_GET_DUMPABLE) == 0)
-+		return NULL;
-+#endif
-+#endif
-+
-+#ifdef HAVE___SECURE_GETENV
-+	return __secure_getenv(arg);
-+#else
-+	return getenv(arg);
-+#endif
-+}
-+
-+static errcode_t test_open(const char *name, int flags, io_channel *channel)
-+{
-+	io_channel	io = NULL;
-+	struct test_private_data *data = NULL;
-+	errcode_t	retval;
-+	char		*value;
-+
-+	if (name == 0)
-+		return EXT2_ET_BAD_DEVICE_NAME;
-+	retval = ext2fs_get_mem(sizeof(struct struct_io_channel), &io);
-+	if (retval)
-+		return retval;
-+	memset(io, 0, sizeof(struct struct_io_channel));
-+	io->magic = EXT2_ET_MAGIC_IO_CHANNEL;
-+	retval = ext2fs_get_mem(sizeof(struct test_private_data), &data);
-+	if (retval) {
-+		retval = EXT2_ET_NO_MEMORY;
-+		goto cleanup;
-+	}
-+	io->manager = test_io_manager;
-+	retval = ext2fs_get_mem(strlen(name)+1, &io->name);
-+	if (retval)
-+		goto cleanup;
-+
-+	strcpy(io->name, name);
-+	io->private_data = data;
-+	io->block_size = 1024;
-+	io->read_error = 0;
-+	io->write_error = 0;
-+	io->refcount = 1;
-+
-+	memset(data, 0, sizeof(struct test_private_data));
-+	data->magic = EXT2_ET_MAGIC_TEST_IO_CHANNEL;
-+	if (test_io_backing_manager) {
-+		retval = test_io_backing_manager->open(name, flags,
-+						       &data->real);
-+		if (retval)
-+			goto cleanup;
-+	} else
-+		data->real = 0;
-+	data->read_blk = 	test_io_cb_read_blk;
-+	data->write_blk = 	test_io_cb_write_blk;
-+	data->set_blksize = 	test_io_cb_set_blksize;
-+	data->write_byte = 	test_io_cb_write_byte;
-+
-+	data->outfile = NULL;
-+	if ((value = safe_getenv("TEST_IO_LOGFILE")) != NULL)
-+		data->outfile = fopen(value, "w");
-+	if (!data->outfile)
-+		data->outfile = stderr;
-+
-+	data->flags = 0;
-+	if ((value = safe_getenv("TEST_IO_FLAGS")) != NULL)
-+		data->flags = strtoul(value, NULL, 0);
-+	
-+	data->block = 0;
-+	if ((value = safe_getenv("TEST_IO_BLOCK")) != NULL)
-+		data->block = strtoul(value, NULL, 0);
-+
-+	data->read_abort_count = 0;
-+	if ((value = safe_getenv("TEST_IO_READ_ABORT")) != NULL)
-+		data->read_abort_count = strtoul(value, NULL, 0);
-+
-+	data->write_abort_count = 0;
-+	if ((value = safe_getenv("TEST_IO_WRITE_ABORT")) != NULL)
-+		data->write_abort_count = strtoul(value, NULL, 0);
-+	
-+	*channel = io;
-+	return 0;
-+
-+cleanup:
-+	if (io)
-+		ext2fs_free_mem(&io);
-+	if (data)
-+		ext2fs_free_mem(&data);
-+	return retval;
-+}
-+
-+static errcode_t test_close(io_channel channel)
-+{
-+	struct test_private_data *data;
-+	errcode_t	retval = 0;
-+
-+	EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
-+	data = (struct test_private_data *) channel->private_data;
-+	EXT2_CHECK_MAGIC(data, EXT2_ET_MAGIC_TEST_IO_CHANNEL);
-+
-+	if (--channel->refcount > 0)
-+		return 0;
-+	
-+	if (data->real)
-+		retval = io_channel_close(data->real);
-+
-+	if (data->outfile && data->outfile != stderr)
-+		fclose(data->outfile);
-+	
-+	ext2fs_free_mem(&channel->private_data);
-+	if (channel->name)
-+		ext2fs_free_mem(&channel->name);
-+	ext2fs_free_mem(&channel);
-+	return retval;
-+}
-+
-+static errcode_t test_set_blksize(io_channel channel, int blksize)
-+{
-+	struct test_private_data *data;
-+	errcode_t	retval = 0;
-+
-+	EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
-+	data = (struct test_private_data *) channel->private_data;
-+	EXT2_CHECK_MAGIC(data, EXT2_ET_MAGIC_TEST_IO_CHANNEL);
-+
-+	if (data->real)
-+		retval = io_channel_set_blksize(data->real, blksize);
-+	if (data->set_blksize)
-+		data->set_blksize(blksize, retval);
-+	if (data->flags & TEST_FLAG_SET_BLKSIZE)
-+		fprintf(data->outfile,
-+			"Test_io: set_blksize(%d) returned %s\n",
-+			blksize, retval ? error_message(retval) : "OK");
-+	channel->block_size = blksize;
-+	return retval;
-+}
-+
-+
-+static errcode_t test_read_blk(io_channel channel, unsigned long block,
-+			       int count, void *buf)
-+{
-+	struct test_private_data *data;
-+	errcode_t	retval = 0;
-+
-+	EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
-+	data = (struct test_private_data *) channel->private_data;
-+	EXT2_CHECK_MAGIC(data, EXT2_ET_MAGIC_TEST_IO_CHANNEL);
-+
-+	if (data->real)
-+		retval = io_channel_read_blk(data->real, block, count, buf);
-+	if (data->read_blk)
-+		data->read_blk(block, count, retval);
-+	if (data->flags & TEST_FLAG_READ)
-+		fprintf(data->outfile,
-+			"Test_io: read_blk(%lu, %d) returned %s\n",
-+			block, count, retval ? error_message(retval) : "OK");
-+	if (data->block && data->block == block) {
-+		if (data->flags & TEST_FLAG_DUMP)
-+			test_dump_block(channel, data, block, buf);
-+		if (--data->read_abort_count == 0)
-+			test_abort(channel, block);
-+	} 
-+	return retval;
-+}
-+
-+static errcode_t test_write_blk(io_channel channel, unsigned long block,
-+			       int count, const void *buf)
-+{
-+	struct test_private_data *data;
-+	errcode_t	retval = 0;
-+
-+	EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
-+	data = (struct test_private_data *) channel->private_data;
-+	EXT2_CHECK_MAGIC(data, EXT2_ET_MAGIC_TEST_IO_CHANNEL);
-+
-+	if (data->real)
-+		retval = io_channel_write_blk(data->real, block, count, buf);
-+	if (data->write_blk)
-+		data->write_blk(block, count, retval);
-+	if (data->flags & TEST_FLAG_WRITE)
-+		fprintf(data->outfile,
-+			"Test_io: write_blk(%lu, %d) returned %s\n",
-+			block, count, retval ? error_message(retval) : "OK");
-+	if (data->block && data->block == block) {
-+		if (data->flags & TEST_FLAG_DUMP)
-+			test_dump_block(channel, data, block, buf);
-+		if (--data->write_abort_count == 0)
-+			test_abort(channel, block);
-+	}
-+	return retval;
-+}
-+
-+static errcode_t test_write_byte(io_channel channel, unsigned long offset,
-+			       int count, const void *buf)
-+{
-+	struct test_private_data *data;
-+	errcode_t	retval = 0;
-+
-+	EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
-+	data = (struct test_private_data *) channel->private_data;
-+	EXT2_CHECK_MAGIC(data, EXT2_ET_MAGIC_TEST_IO_CHANNEL);
-+
-+	if (data->real && data->real->manager->write_byte)
-+		retval = io_channel_write_byte(data->real, offset, count, buf);
-+	if (data->write_byte)
-+		data->write_byte(offset, count, retval);
-+	if (data->flags & TEST_FLAG_WRITE)
-+		fprintf(data->outfile,
-+			"Test_io: write_byte(%lu, %d) returned %s\n",
-+			offset, count, retval ? error_message(retval) : "OK");
-+	return retval;
-+}
-+
-+/*
-+ * Flush data buffers to disk.
-+ */
-+static errcode_t test_flush(io_channel channel)
-+{
-+	struct test_private_data *data;
-+	errcode_t	retval = 0;
-+	
-+	EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
-+	data = (struct test_private_data *) channel->private_data;
-+	EXT2_CHECK_MAGIC(data, EXT2_ET_MAGIC_TEST_IO_CHANNEL);
-+
-+	if (data->real)
-+		retval = io_channel_flush(data->real);
-+	
-+	if (data->flags & TEST_FLAG_FLUSH)
-+		fprintf(data->outfile, "Test_io: flush() returned %s\n",
-+			retval ? error_message(retval) : "OK");
-+	
-+	return retval;
-+}
-+
-+static errcode_t test_set_option(io_channel channel, const char *option, 
-+				 const char *arg)
-+{
-+	struct test_private_data *data;
-+	errcode_t	retval = 0;
-+
-+	EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
-+	data = (struct test_private_data *) channel->private_data;
-+	EXT2_CHECK_MAGIC(data, EXT2_ET_MAGIC_TEST_IO_CHANNEL);
-+
-+
-+	if (data->flags & TEST_FLAG_SET_OPTION)
-+		fprintf(data->outfile, "Test_io: set_option(%s, %s) ", 
-+			option, arg);
-+	if (data->real && data->real->manager->set_option) {
-+		retval = (data->real->manager->set_option)(data->real, 
-+							   option, arg);
-+		if (data->flags & TEST_FLAG_SET_OPTION)
-+			fprintf(data->outfile, "returned %s\n",
-+				retval ? error_message(retval) : "OK");
-+	} else {
-+		if (data->flags & TEST_FLAG_SET_OPTION)
-+			fprintf(data->outfile, "not implemented\n");
-+	}
-+	return retval;
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/tst_badblocks.c silo-1.4.13/libext2fs/tst_badblocks.c
---- silo-1.4.13.orig/libext2fs/tst_badblocks.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/tst_badblocks.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,293 @@
-+/*
-+ * This testing program makes sure the badblocks implementation works.
-+ *
-+ * Copyright (C) 1996 by Theodore Ts'o.
-+ * 
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <fcntl.h>
-+#include <time.h>
-+#include <sys/stat.h>
-+#include <sys/types.h>
-+#if HAVE_ERRNO_H
-+#include <errno.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+#define ADD_BLK	0x0001
-+#define DEL_BLK	0x0002
-+
-+blk_t test1[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 0 };
-+blk_t test2[] = { 11, 10, 9, 8, 7, 6, 5, 4, 3, 3, 2, 1 };
-+blk_t test3[] = { 3, 1, 4, 5, 9, 2, 7, 10, 5, 6, 10, 8, 0 };
-+blk_t test4[] = { 20, 50, 12, 17, 13, 2, 66, 23, 56, 0 };
-+blk_t test4a[] = {
-+ 	20, 1,
-+	50, 1,
-+	3, 0,
-+	17, 1,
-+	18, 0,
-+	16, 0,
-+	11, 0,
-+	12, 1,
-+	13, 1,
-+	14, 0, 
-+	80, 0,
-+	45, 0,
-+	66, 1,
-+	0 };
-+blk_t test5[] = { 31, 20, 17, 51, 23, 1, 56, 57, 0 };
-+blk_t test5a[] = {
-+	50, ADD_BLK,
-+	51, DEL_BLK,
-+	57, DEL_BLK,
-+	66, ADD_BLK,
-+	31, DEL_BLK,
-+	12, ADD_BLK,
-+	2, ADD_BLK,
-+	13, ADD_BLK,
-+	1, DEL_BLK,
-+	0
-+	};
-+		
-+
-+static int test_fail = 0;
-+
-+static errcode_t create_test_list(blk_t *vec, badblocks_list *ret)
-+{
-+	errcode_t	retval;
-+	badblocks_list	bb;
-+	int		i;
-+	
-+	retval = ext2fs_badblocks_list_create(&bb, 5);
-+	if (retval) {
-+		com_err("create_test_list", retval, "while creating list");
-+		return retval;
-+	}
-+	for (i=0; vec[i]; i++) {
-+		retval = ext2fs_badblocks_list_add(bb, vec[i]);
-+		if (retval) {
-+			com_err("create_test_list", retval,
-+				"while adding test vector %d", i);
-+			ext2fs_badblocks_list_free(bb);
-+			return retval;
-+		}
-+	}
-+	*ret = bb;
-+	return 0;
-+}
-+
-+static void print_list(badblocks_list bb, int verify)
-+{
-+	errcode_t	retval;
-+	badblocks_iterate	iter;
-+	blk_t			blk;
-+	int			i, ok;
-+	
-+	retval = ext2fs_badblocks_list_iterate_begin(bb, &iter);
-+	if (retval) {
-+		com_err("print_list", retval, "while setting up iterator");
-+		return;
-+	}
-+	ok = i = 1;
-+	while (ext2fs_badblocks_list_iterate(iter, &blk)) {
-+		printf("%d ", blk);
-+		if (i++ != blk)
-+			ok = 0;
-+	}
-+	ext2fs_badblocks_list_iterate_end(iter);
-+	if (verify) {
-+		if (ok)
-+			printf("--- OK");
-+		else {
-+			printf("--- NOT OK");
-+			test_fail++;
-+		}
-+	}
-+}
-+
-+static void validate_test_seq(badblocks_list bb, blk_t *vec)
-+{
-+	int	i, match, ok;
-+
-+	for (i = 0; vec[i]; i += 2) {
-+		match = ext2fs_badblocks_list_test(bb, vec[i]);
-+		if (match == vec[i+1])
-+			ok = 1;
-+		else {
-+			ok = 0;
-+			test_fail++;
-+		}
-+		printf("\tblock %d is %s --- %s\n", vec[i],
-+		       match ? "present" : "absent",
-+		       ok ? "OK" : "NOT OK");
-+	}
-+}
-+
-+static void do_test_seq(badblocks_list bb, blk_t *vec)
-+{
-+	int	i, match;
-+
-+	for (i = 0; vec[i]; i += 2) {
-+		switch (vec[i+1]) {
-+		case ADD_BLK:
-+			ext2fs_badblocks_list_add(bb, vec[i]);
-+			match = ext2fs_badblocks_list_test(bb, vec[i]);
-+			printf("Adding block %d --- now %s\n", vec[i], 
-+			       match ? "present" : "absent");
-+			if (!match) {
-+				printf("FAILURE!\n");
-+				test_fail++;
-+			}
-+			break;
-+		case DEL_BLK:
-+			ext2fs_badblocks_list_del(bb, vec[i]);
-+			match = ext2fs_badblocks_list_test(bb, vec[i]);
-+			printf("Removing block %d --- now %s\n", vec[i], 
-+			       ext2fs_badblocks_list_test(bb, vec[i]) ? 
-+			       "present" : "absent");
-+			if (match) {
-+				printf("FAILURE!\n");
-+				test_fail++;
-+			}
-+			break;
-+		}
-+	}
-+}
-+
-+
-+int file_test(badblocks_list bb)
-+{
-+	badblocks_list new_bb = 0;
-+	errcode_t	retval;
-+	FILE	*f;
-+
-+	f = tmpfile();
-+	if (!f) {
-+		fprintf(stderr, "Error opening temp file: %s\n",
-+			error_message(errno));
-+		return 1;
-+	}
-+	retval = ext2fs_write_bb_FILE(bb, 0, f);
-+	if (retval) {
-+		com_err("file_test", retval, "while writing bad blocks");
-+		return 1;
-+	}
-+
-+	rewind(f);
-+	retval = ext2fs_read_bb_FILE2(0, f, &new_bb, 0, 0);
-+	if (retval) {
-+		com_err("file_test", retval, "while reading bad blocks");
-+		return 1;
-+	}
-+	fclose(f);
-+
-+	if (ext2fs_badblocks_equal(bb, new_bb)) {
-+		printf("Block bitmap matched after reading and writing.\n");
-+	} else {
-+		printf("Block bitmap NOT matched.\n");
-+		test_fail++;
-+	}
-+	return 0;
-+}
-+
-+
-+int main(int argc, char **argv)
-+{
-+	badblocks_list bb1, bb2, bb3, bb4, bb5;
-+	int	equal;
-+	errcode_t	retval;
-+
-+	bb1 = bb2 = bb3 = bb4 = bb5 = 0;
-+
-+	printf("test1: ");
-+	retval = create_test_list(test1, &bb1);
-+	if (retval == 0)
-+		print_list(bb1, 1);
-+	printf("\n");
-+	
-+	printf("test2: ");
-+	retval = create_test_list(test2, &bb2);
-+	if (retval == 0)
-+		print_list(bb2, 1);
-+	printf("\n");
-+
-+	printf("test3: ");
-+	retval = create_test_list(test3, &bb3);
-+	if (retval == 0)
-+		print_list(bb3, 1);
-+	printf("\n");
-+	
-+	printf("test4: ");
-+	retval = create_test_list(test4, &bb4);
-+	if (retval == 0) {
-+		print_list(bb4, 0);
-+		printf("\n");
-+		validate_test_seq(bb4, test4a);
-+	}
-+	printf("\n");
-+
-+	printf("test5: ");
-+	retval = create_test_list(test5, &bb5);
-+	if (retval == 0) {
-+		print_list(bb5, 0);
-+		printf("\n");
-+		do_test_seq(bb5, test5a);
-+		printf("After test5 sequence: ");
-+		print_list(bb5, 0);
-+		printf("\n");
-+	}
-+	printf("\n");
-+
-+	if (bb1 && bb2 && bb3 && bb4 && bb5) {
-+		printf("Comparison tests:\n");
-+		equal = ext2fs_badblocks_equal(bb1, bb2);
-+		printf("bb1 and bb2 are %sequal.\n", equal ? "" : "NOT "); 
-+		if (equal)
-+			test_fail++;
-+
-+		equal = ext2fs_badblocks_equal(bb1, bb3);
-+		printf("bb1 and bb3 are %sequal.\n", equal ? "" : "NOT "); 
-+		if (!equal)
-+			test_fail++;
-+		
-+		equal = ext2fs_badblocks_equal(bb1, bb4);
-+		printf("bb1 and bb4 are %sequal.\n", equal ? "" : "NOT "); 
-+		if (equal)
-+			test_fail++;
-+
-+		equal = ext2fs_badblocks_equal(bb4, bb5);
-+		printf("bb4 and bb5 are %sequal.\n", equal ? "" : "NOT "); 
-+		if (!equal)
-+			test_fail++;
-+		printf("\n");
-+	}
-+	
-+	file_test(bb4);
-+	
-+	if (test_fail == 0)
-+		printf("ext2fs library badblocks tests checks out OK!\n");
-+
-+	if (bb1)
-+		ext2fs_badblocks_list_free(bb1);
-+	if (bb2)
-+		ext2fs_badblocks_list_free(bb2);
-+	if (bb3)
-+		ext2fs_badblocks_list_free(bb3);
-+	if (bb4)
-+		ext2fs_badblocks_list_free(bb4);
-+
-+	return test_fail;
-+
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/tst_bitops.c silo-1.4.13/libext2fs/tst_bitops.c
---- silo-1.4.13.orig/libext2fs/tst_bitops.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/tst_bitops.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,44 @@
-+/*
-+ * This testing program makes sure the bitops functions work
-+ *
-+ * Copyright (C) 2001 by Theodore Ts'o.
-+ * 
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+/* #define _EXT2_USE_C_VERSIONS_ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <fcntl.h>
-+#include <time.h>
-+#include <sys/stat.h>
-+#include <sys/types.h>
-+#if HAVE_ERRNO_H
-+#include <errno.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+unsigned char bitarray[] = {
-+	0x80, 0xF0, 0x40, 0x40, 0x0, 0x0, 0x0, 0x0, 0x10, 0x20, 0x00, 0x00
-+	};
-+
-+main(int argc, char **argv)
-+{
-+	int	i, size;
-+
-+	size = sizeof(bitarray)*8;
-+	i = ext2fs_find_first_bit_set(bitarray, size);
-+	while (i < size) {
-+		printf("Bit set: %d\n", i);
-+		i = ext2fs_find_next_bit_set(bitarray, size, i+1);
-+	}
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/tst_byteswap.c silo-1.4.13/libext2fs/tst_byteswap.c
---- silo-1.4.13.orig/libext2fs/tst_byteswap.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/tst_byteswap.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,92 @@
-+/*
-+ * This testing program makes sure the byteswap functions work
-+ *
-+ * Copyright (C) 2000 by Theodore Ts'o.
-+ * 
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <fcntl.h>
-+#include <time.h>
-+#include <sys/stat.h>
-+#include <sys/types.h>
-+#if HAVE_ERRNO_H
-+#include <errno.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+__u16 test1[] = {
-+	0x0001, 0x0100,
-+	0x1234, 0x3412,
-+	0xff00, 0x00ff,
-+	0x4000, 0x0040,
-+	0xfeff, 0xfffe,
-+	0x0000, 0x0000
-+	};
-+
-+__u32 test2[] = {
-+	0x00000001, 0x01000000,
-+	0x80000000, 0x00000080,
-+	0x12345678, 0x78563412,
-+	0xffff0000, 0x0000ffff,
-+	0x00ff0000, 0x0000ff00,
-+	0xff000000, 0x000000ff,
-+	0x00000000, 0x00000000
-+	};
-+
-+int main(int argc, char **argv)
-+{
-+	int	i;
-+	int	errors = 0;
-+
-+	printf("Testing ext2fs_swab16\n");
-+	i=0;
-+	do {
-+		printf("swab16(0x%04x) = 0x%04x\n", test1[i],
-+		       ext2fs_swab16(test1[i]));
-+		if (ext2fs_swab16(test1[i]) != test1[i+1]) {
-+			printf("Error!!!   %04x != %04x\n",
-+			       ext2fs_swab16(test1[i]), test1[i+1]);
-+			errors++;
-+		}
-+		if (ext2fs_swab16(test1[i+1]) != test1[i]) {
-+			printf("Error!!!   %04x != %04x\n",
-+			       ext2fs_swab16(test1[i+1]), test1[i]);
-+			errors++;
-+		}
-+		i += 2;
-+	} while (test1[i] != 0);
-+	
-+	printf("Testing ext2fs_swab32\n");
-+	i = 0;
-+	do {
-+		printf("swab32(0x%08x) = 0x%08x\n", test2[i],
-+		       ext2fs_swab32(test2[i]));
-+		if (ext2fs_swab32(test2[i]) != test2[i+1]) {
-+			printf("Error!!!   %04x != %04x\n",
-+			       ext2fs_swab32(test2[i]), test2[i+1]);
-+			errors++;
-+		}
-+		if (ext2fs_swab32(test2[i+1]) != test2[i]) {
-+			printf("Error!!!   %04x != %04x\n",
-+			       ext2fs_swab32(test2[i+1]), test2[i]);
-+			errors++;
-+		}
-+		i += 2;
-+	} while (test2[i] != 0);
-+
-+	if (!errors)
-+		printf("No errors found in the byteswap implementation!\n");
-+	
-+	return errors;
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/tst_getsectsize.c silo-1.4.13/libext2fs/tst_getsectsize.c
---- silo-1.4.13.orig/libext2fs/tst_getsectsize.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/tst_getsectsize.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,47 @@
-+/*
-+ * tst_getsize.c --- this function tests the getsize function
-+ * 
-+ * Copyright (C) 1997 by Theodore Ts'o.
-+ * 
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <fcntl.h>
-+#include <time.h>
-+#include <sys/stat.h>
-+#include <sys/types.h>
-+#if HAVE_ERRNO_H
-+#include <errno.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+int main(int argc, char **argv)
-+{
-+	int	sectsize;
-+	int	retval;
-+	
-+	if (argc < 2) {
-+		fprintf(stderr, "Usage: %s device\n", argv[0]);
-+		exit(1);
-+	}
-+
-+	retval = ext2fs_get_device_sectsize(argv[1], &sectsize);
-+	if (retval) {
-+		com_err(argv[0], retval,
-+			"while calling ext2fs_get_device_sectsize");
-+		exit(1);
-+	}
-+	printf("Device %s has a hardware sector size of %d.\n",
-+	       argv[1], sectsize);
-+	exit(0);
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/tst_getsize.c silo-1.4.13/libext2fs/tst_getsize.c
---- silo-1.4.13.orig/libext2fs/tst_getsize.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/tst_getsize.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,44 @@
-+/*
-+ * tst_getsize.c --- this function tests the getsize function
-+ * 
-+ * Copyright (C) 1997 by Theodore Ts'o.
-+ * 
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <fcntl.h>
-+#include <time.h>
-+#include <sys/stat.h>
-+#include <sys/types.h>
-+#if HAVE_ERRNO_H
-+#include <errno.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+int main(int argc, const char *argv[])
-+{
-+	errcode_t	retval;
-+	blk_t		blocks;
-+
-+	if (argc < 2) {
-+		fprintf(stderr, "%s device\n", argv[0]);
-+		exit(1);
-+	}
-+	retval = ext2fs_get_device_size(argv[1], 1024, &blocks);
-+	if (retval) {
-+		com_err(argv[0], retval, "while getting device size");
-+		exit(1);
-+	}
-+	printf("%s is device has %d blocks.\n", argv[1], blocks);
-+	return 0;
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/tst_iscan.c silo-1.4.13/libext2fs/tst_iscan.c
---- silo-1.4.13.orig/libext2fs/tst_iscan.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/tst_iscan.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,218 @@
-+/*
-+ * tst_inode.c --- this function tests the inode scan function
-+ * 
-+ * Copyright (C) 1996 by Theodore Ts'o.
-+ * 
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <fcntl.h>
-+#include <time.h>
-+#include <sys/stat.h>
-+#include <sys/types.h>
-+#if HAVE_ERRNO_H
-+#include <errno.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+blk_t test_vec[] = { 8, 12, 24, 34, 43, 44, 100, 0 };
-+
-+ext2_filsys	test_fs;
-+ext2fs_block_bitmap bad_block_map, touched_map;
-+ext2fs_inode_bitmap bad_inode_map;
-+badblocks_list	test_badblocks;
-+
-+int first_no_comma = 1;
-+int failed = 0;
-+
-+static void test_read_blk(unsigned long block, int count, errcode_t err)
-+{
-+	int	i;
-+
-+	if (first_no_comma)
-+		first_no_comma = 0;
-+	else
-+		printf(", ");
-+
-+	if (count > 1)
-+		printf("%lu-%lu", block, block+count-1);
-+	else
-+		printf("%lu", block);
-+
-+	for (i=0; i < count; i++, block++) {
-+		if (ext2fs_test_block_bitmap(touched_map, block)) {
-+			printf("\nDuplicate block?!? --- %lu\n", block);
-+			failed++;
-+			first_no_comma = 1;
-+		}
-+		ext2fs_mark_block_bitmap(touched_map, block);
-+	}
-+}
-+
-+/*
-+ * Setup the variables for doing the inode scan test.
-+ */
-+static void setup(void)
-+{
-+	errcode_t	retval;
-+	int		i;
-+	struct ext2_super_block param;
-+
-+	initialize_ext2_error_table();
-+
-+	memset(&param, 0, sizeof(param));
-+	param.s_blocks_count = 12000;
-+
-+
-+	test_io_cb_read_blk = test_read_blk;
-+	
-+	retval = ext2fs_initialize("test fs", 0, &param,
-+				   test_io_manager, &test_fs);
-+	if (retval) {
-+		com_err("setup", retval,
-+			"While initializing filesystem");
-+		exit(1);
-+	}
-+	retval = ext2fs_allocate_tables(test_fs);
-+	if (retval) {
-+		com_err("setup", retval,
-+			"While allocating tables for test filesystem");
-+		exit(1);
-+	}
-+	retval = ext2fs_allocate_block_bitmap(test_fs, "bad block map",
-+					      &bad_block_map);
-+	if (retval) {
-+		com_err("setup", retval,
-+			"While allocating bad_block bitmap");
-+		exit(1);
-+	}
-+	retval = ext2fs_allocate_block_bitmap(test_fs, "touched map",
-+					      &touched_map);
-+	if (retval) {
-+		com_err("setup", retval,
-+			"While allocating touched block bitmap");
-+		exit(1);
-+	}
-+	retval = ext2fs_allocate_inode_bitmap(test_fs, "bad inode map",
-+					      &bad_inode_map);
-+	if (retval) {
-+		com_err("setup", retval,
-+			"While allocating bad inode bitmap");
-+		exit(1);
-+	}
-+	
-+	retval = ext2fs_badblocks_list_create(&test_badblocks, 5);
-+	if (retval) {
-+		com_err("setup", retval, "while creating badblocks list");
-+		exit(1);
-+	}
-+	for (i=0; test_vec[i]; i++) {
-+		retval = ext2fs_badblocks_list_add(test_badblocks, test_vec[i]);
-+		if (retval) {
-+			com_err("setup", retval,
-+				"while adding test vector %d", i);
-+			exit(1);
-+		}
-+		ext2fs_mark_block_bitmap(bad_block_map, test_vec[i]);
-+	}
-+	test_fs->badblocks = test_badblocks;
-+}
-+
-+/*
-+ * Iterate using inode_scan
-+ */
-+static void iterate(void)
-+{
-+	struct ext2_inode inode;
-+	ext2_inode_scan	scan;
-+	errcode_t	retval;
-+	ext2_ino_t	ino;
-+
-+	retval = ext2fs_open_inode_scan(test_fs, 8, &scan);
-+	if (retval) {
-+		com_err("iterate", retval, "While opening inode scan");
-+		exit(1);
-+	}
-+	printf("Reading blocks: ");
-+	retval = ext2fs_get_next_inode(scan, &ino, &inode);
-+	if (retval) {
-+		com_err("iterate", retval, "while reading first inode");
-+		exit(1);
-+	}
-+	while (ino) {
-+		retval = ext2fs_get_next_inode(scan, &ino, &inode);
-+		if (retval == EXT2_ET_BAD_BLOCK_IN_INODE_TABLE) {
-+			ext2fs_mark_inode_bitmap(bad_inode_map, ino);
-+			continue;
-+		}
-+		if (retval) {
-+			com_err("iterate", retval,
-+				"while getting next inode");
-+			exit(1);
-+		}
-+	}
-+	printf("\n");
-+	ext2fs_close_inode_scan(scan);
-+}
-+
-+/*
-+ * Verify the touched map
-+ */
-+static void check_map(void)
-+{
-+	int	i, j, first=1;
-+	unsigned long	blk;
-+
-+	for (i=0; test_vec[i]; i++) {
-+		if (ext2fs_test_block_bitmap(touched_map, test_vec[i])) {
-+			printf("Bad block was touched --- %d\n", test_vec[i]);
-+			failed++;
-+			first_no_comma = 1;
-+		}
-+		ext2fs_mark_block_bitmap(touched_map, test_vec[i]);
-+	}
-+	for (i = 0; i < test_fs->group_desc_count; i++) {
-+		for (j=0, blk = test_fs->group_desc[i].bg_inode_table;
-+		     j < test_fs->inode_blocks_per_group;
-+		     j++, blk++) {
-+			if (!ext2fs_test_block_bitmap(touched_map, blk) &&
-+			    !ext2fs_test_block_bitmap(bad_block_map, blk)) {
-+				printf("Missing block --- %lu\n", blk);
-+				failed++;
-+			}
-+		}
-+	}
-+	printf("Bad inodes: ");
-+	for (i=1; i <= test_fs->super->s_inodes_count; i++) {
-+		if (ext2fs_test_inode_bitmap(bad_inode_map, i)) {
-+			if (first)
-+				first = 0;
-+			else
-+				printf(", ");
-+			printf("%d", i);
-+		}
-+	}
-+	printf("\n");
-+}
-+
-+
-+int main(int argc, char **argv)
-+{
-+	setup();
-+	iterate();
-+	check_map();
-+	if (!failed)
-+		printf("Inode scan tested OK!\n");
-+	return failed;
-+}
-+
-diff -Naur silo-1.4.13.orig/libext2fs/unix_io.c silo-1.4.13/libext2fs/unix_io.c
---- silo-1.4.13.orig/libext2fs/unix_io.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/unix_io.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,710 @@
-+/*
-+ * unix_io.c --- This is the Unix (well, really POSIX) implementation
-+ * 	of the I/O manager.
-+ *
-+ * Implements a one-block write-through cache.
-+ *
-+ * Includes support for Windows NT support under Cygwin. 
-+ *
-+ * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-+ * 	2002 by Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#define _LARGEFILE_SOURCE
-+#define _LARGEFILE64_SOURCE
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#if HAVE_ERRNO_H
-+#include <errno.h>
-+#endif
-+#include <fcntl.h>
-+#include <time.h>
-+#ifdef __linux__
-+#include <sys/utsname.h>
-+#endif
-+#if HAVE_SYS_STAT_H
-+#include <sys/stat.h>
-+#endif
-+#if HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+#if HAVE_SYS_RESOURCE_H
-+#include <sys/resource.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+/*
-+ * For checking structure magic numbers...
-+ */
-+
-+#define EXT2_CHECK_MAGIC(struct, code) \
-+	  if ((struct)->magic != (code)) return (code)
-+
-+struct unix_cache {
-+	char		*buf;
-+	unsigned long	block;
-+	int		access_time;
-+	unsigned	dirty:1;
-+	unsigned	in_use:1;
-+};
-+
-+#define CACHE_SIZE 8
-+#define WRITE_DIRECT_SIZE 4	/* Must be smaller than CACHE_SIZE */
-+#define READ_DIRECT_SIZE 4	/* Should be smaller than CACHE_SIZE */
-+
-+struct unix_private_data {
-+	int	magic;
-+	int	dev;
-+	int	flags;
-+	int	access_time;
-+	ext2_loff_t offset;
-+	struct unix_cache cache[CACHE_SIZE];
-+};
-+
-+static errcode_t unix_open(const char *name, int flags, io_channel *channel);
-+static errcode_t unix_close(io_channel channel);
-+static errcode_t unix_set_blksize(io_channel channel, int blksize);
-+static errcode_t unix_read_blk(io_channel channel, unsigned long block,
-+			       int count, void *data);
-+static errcode_t unix_write_blk(io_channel channel, unsigned long block,
-+				int count, const void *data);
-+static errcode_t unix_flush(io_channel channel);
-+static errcode_t unix_write_byte(io_channel channel, unsigned long offset,
-+				int size, const void *data);
-+static errcode_t unix_set_option(io_channel channel, const char *option, 
-+				 const char *arg);
-+
-+static void reuse_cache(io_channel channel, struct unix_private_data *data,
-+		 struct unix_cache *cache, unsigned long block);
-+
-+/* __FreeBSD_kernel__ is defined by GNU/kFreeBSD - the FreeBSD kernel
-+ * does not know buffered block devices - everything is raw. */
-+#if defined(__CYGWIN__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+#define NEED_BOUNCE_BUFFER
-+#else
-+#undef NEED_BOUNCE_BUFFER
-+#endif
-+
-+static struct struct_io_manager struct_unix_manager = {
-+	EXT2_ET_MAGIC_IO_MANAGER,
-+	"Unix I/O Manager",
-+	unix_open,
-+	unix_close,
-+	unix_set_blksize,
-+	unix_read_blk,
-+	unix_write_blk,
-+	unix_flush,
-+#ifdef NEED_BOUNCE_BUFFER
-+	0,
-+#else
-+	unix_write_byte,
-+#endif
-+	unix_set_option
-+};
-+
-+io_manager unix_io_manager = &struct_unix_manager;
-+
-+/*
-+ * Here are the raw I/O functions
-+ */
-+#ifndef NEED_BOUNCE_BUFFER
-+static errcode_t raw_read_blk(io_channel channel,
-+			      struct unix_private_data *data,
-+			      unsigned long block,
-+			      int count, void *buf)
-+{
-+	errcode_t	retval;
-+	ssize_t		size;
-+	ext2_loff_t	location;
-+	int		actual = 0;
-+
-+	size = (count < 0) ? -count : count * channel->block_size;
-+	location = ((ext2_loff_t) block * channel->block_size) + data->offset;
-+	if (ext2fs_llseek(data->dev, location, SEEK_SET) != location) {
-+		retval = errno ? errno : EXT2_ET_LLSEEK_FAILED;
-+		goto error_out;
-+	}
-+	actual = read(data->dev, buf, size);
-+	if (actual != size) {
-+		if (actual < 0)
-+			actual = 0;
-+		retval = EXT2_ET_SHORT_READ;
-+		goto error_out;
-+	}
-+	return 0;
-+	
-+error_out:
-+	memset((char *) buf+actual, 0, size-actual);
-+	if (channel->read_error)
-+		retval = (channel->read_error)(channel, block, count, buf,
-+					       size, actual, retval);
-+	return retval;
-+}
-+#else /* NEED_BOUNCE_BUFFER */
-+/*
-+ * Windows and FreeBSD block devices only allow sector alignment IO in offset and size
-+ */
-+static errcode_t raw_read_blk(io_channel channel,
-+			      struct unix_private_data *data,
-+			      unsigned long block,
-+			      int count, void *buf)
-+{
-+	errcode_t	retval;
-+	size_t		size, alignsize, fragment;
-+	ext2_loff_t	location;
-+	int		total = 0, actual;
-+#define BLOCKALIGN 512
-+	char		sector[BLOCKALIGN];
-+
-+	size = (count < 0) ? -count : count * channel->block_size;
-+	location = ((ext2_loff_t) block * channel->block_size) + data->offset;
-+#ifdef DEBUG
-+	printf("count=%d, size=%d, block=%d, blk_size=%d, location=%lx\n",
-+	 		count, size, block, channel->block_size, location);
-+#endif
-+	if (ext2fs_llseek(data->dev, location, SEEK_SET) != location) {
-+		retval = errno ? errno : EXT2_ET_LLSEEK_FAILED;
-+		goto error_out;
-+	}
-+	fragment = size % BLOCKALIGN;
-+	alignsize = size - fragment;
-+	if (alignsize) {
-+		actual = read(data->dev, buf, alignsize);
-+		if (actual != alignsize)
-+			goto short_read;
-+	}
-+	if (fragment) {
-+		actual = read(data->dev, sector, BLOCKALIGN);
-+		if (actual != BLOCKALIGN)
-+			goto short_read;
-+		memcpy(buf+alignsize, sector, fragment);
-+	}
-+	return 0;
-+
-+short_read:
-+	if (actual>0)
-+		total += actual;
-+	retval = EXT2_ET_SHORT_READ;
-+
-+error_out:
-+	memset((char *) buf+total, 0, size-actual);
-+	if (channel->read_error)
-+		retval = (channel->read_error)(channel, block, count, buf,
-+					       size, actual, retval);
-+	return retval;
-+}
-+#endif
-+
-+static errcode_t raw_write_blk(io_channel channel,
-+			       struct unix_private_data *data,
-+			       unsigned long block,
-+			       int count, const void *buf)
-+{
-+	ssize_t		size;
-+	ext2_loff_t	location;
-+	int		actual = 0;
-+	errcode_t	retval;
-+
-+	if (count == 1)
-+		size = channel->block_size;
-+	else {
-+		if (count < 0)
-+			size = -count;
-+		else
-+			size = count * channel->block_size;
-+	}
-+
-+	location = ((ext2_loff_t) block * channel->block_size) + data->offset;
-+	if (ext2fs_llseek(data->dev, location, SEEK_SET) != location) {
-+		retval = errno ? errno : EXT2_ET_LLSEEK_FAILED;
-+		goto error_out;
-+	}
-+	
-+	actual = write(data->dev, buf, size);
-+	if (actual != size) {
-+		retval = EXT2_ET_SHORT_WRITE;
-+		goto error_out;
-+	}
-+	return 0;
-+	
-+error_out:
-+	if (channel->write_error)
-+		retval = (channel->write_error)(channel, block, count, buf,
-+						size, actual, retval);
-+	return retval;
-+}
-+
-+
-+/*
-+ * Here we implement the cache functions
-+ */
-+
-+/* Allocate the cache buffers */
-+static errcode_t alloc_cache(io_channel channel,
-+			     struct unix_private_data *data)
-+{
-+	errcode_t		retval;
-+	struct unix_cache	*cache;
-+	int			i;
-+	
-+	data->access_time = 0;
-+	for (i=0, cache = data->cache; i < CACHE_SIZE; i++, cache++) {
-+		cache->block = 0;
-+		cache->access_time = 0;
-+		cache->dirty = 0;
-+		cache->in_use = 0;
-+		if ((retval = ext2fs_get_mem(channel->block_size,
-+					     &cache->buf)))
-+			return retval;
-+	}
-+	return 0;
-+}
-+
-+/* Free the cache buffers */
-+static void free_cache(struct unix_private_data *data)
-+{
-+	struct unix_cache	*cache;
-+	int			i;
-+	
-+	data->access_time = 0;
-+	for (i=0, cache = data->cache; i < CACHE_SIZE; i++, cache++) {
-+		cache->block = 0;
-+		cache->access_time = 0;
-+		cache->dirty = 0;
-+		cache->in_use = 0;
-+		if (cache->buf)
-+			ext2fs_free_mem(&cache->buf);
-+		cache->buf = 0;
-+	}
-+}
-+
-+#ifndef NO_IO_CACHE
-+/*
-+ * Try to find a block in the cache.  If the block is not found, and
-+ * eldest is a non-zero pointer, then fill in eldest with the cache
-+ * entry to that should be reused.
-+ */
-+static struct unix_cache *find_cached_block(struct unix_private_data *data,
-+					    unsigned long block,
-+					    struct unix_cache **eldest)
-+{
-+	struct unix_cache	*cache, *unused_cache, *oldest_cache;
-+	int			i;
-+	
-+	unused_cache = oldest_cache = 0;
-+	for (i=0, cache = data->cache; i < CACHE_SIZE; i++, cache++) {
-+		if (!cache->in_use) {
-+			if (!unused_cache)
-+				unused_cache = cache;
-+			continue;
-+		}
-+		if (cache->block == block) {
-+			cache->access_time = ++data->access_time;
-+			return cache;
-+		}
-+		if (!oldest_cache ||
-+		    (cache->access_time < oldest_cache->access_time))
-+			oldest_cache = cache;
-+	}
-+	if (eldest)
-+		*eldest = (unused_cache) ? unused_cache : oldest_cache;
-+	return 0;
-+}
-+
-+/*
-+ * Reuse a particular cache entry for another block.
-+ */
-+static void reuse_cache(io_channel channel, struct unix_private_data *data,
-+		 struct unix_cache *cache, unsigned long block)
-+{
-+	if (cache->dirty && cache->in_use)
-+		raw_write_blk(channel, data, cache->block, 1, cache->buf);
-+
-+	cache->in_use = 1;
-+	cache->dirty = 0;
-+	cache->block = block;
-+	cache->access_time = ++data->access_time;
-+}
-+
-+/*
-+ * Flush all of the blocks in the cache
-+ */
-+static errcode_t flush_cached_blocks(io_channel channel,
-+				     struct unix_private_data *data,
-+				     int invalidate)
-+
-+{
-+	struct unix_cache	*cache;
-+	errcode_t		retval, retval2;
-+	int			i;
-+	
-+	retval2 = 0;
-+	for (i=0, cache = data->cache; i < CACHE_SIZE; i++, cache++) {
-+		if (!cache->in_use)
-+			continue;
-+		
-+		if (invalidate)
-+			cache->in_use = 0;
-+		
-+		if (!cache->dirty)
-+			continue;
-+		
-+		retval = raw_write_blk(channel, data,
-+				       cache->block, 1, cache->buf);
-+		if (retval)
-+			retval2 = retval;
-+		else
-+			cache->dirty = 0;
-+	}
-+	return retval2;
-+}
-+#endif /* NO_IO_CACHE */
-+
-+static errcode_t unix_open(const char *name, int flags, io_channel *channel)
-+{
-+	io_channel	io = NULL;
-+	struct unix_private_data *data = NULL;
-+	errcode_t	retval;
-+	int		open_flags;
-+	struct stat	st;
-+#ifdef __linux__
-+	struct 		utsname ut;
-+#endif
-+
-+	if (name == 0)
-+		return EXT2_ET_BAD_DEVICE_NAME;
-+	retval = ext2fs_get_mem(sizeof(struct struct_io_channel), &io);
-+	if (retval)
-+		return retval;
-+	memset(io, 0, sizeof(struct struct_io_channel));
-+	io->magic = EXT2_ET_MAGIC_IO_CHANNEL;
-+	retval = ext2fs_get_mem(sizeof(struct unix_private_data), &data);
-+	if (retval)
-+		goto cleanup;
-+
-+	io->manager = unix_io_manager;
-+	retval = ext2fs_get_mem(strlen(name)+1, &io->name);
-+	if (retval)
-+		goto cleanup;
-+
-+	strcpy(io->name, name);
-+	io->private_data = data;
-+	io->block_size = 1024;
-+	io->read_error = 0;
-+	io->write_error = 0;
-+	io->refcount = 1;
-+
-+	memset(data, 0, sizeof(struct unix_private_data));
-+	data->magic = EXT2_ET_MAGIC_UNIX_IO_CHANNEL;
-+
-+	if ((retval = alloc_cache(io, data)))
-+		goto cleanup;
-+
-+	open_flags = (flags & IO_FLAG_RW) ? O_RDWR : O_RDONLY;
-+#ifdef HAVE_OPEN64
-+	data->dev = open64(io->name, open_flags);
-+#else
-+	data->dev = open(io->name, open_flags);
-+#endif
-+	if (data->dev < 0) {
-+		retval = errno;
-+		goto cleanup;
-+	}
-+
-+#ifdef __linux__
-+#undef RLIM_INFINITY
-+#if (defined(__alpha__) || ((defined(__sparc__) || defined(__mips__)) && (SIZEOF_LONG == 4)))
-+#define RLIM_INFINITY	((unsigned long)(~0UL>>1))
-+#else
-+#define RLIM_INFINITY  (~0UL)
-+#endif
-+	/*
-+	 * Work around a bug in 2.4.10-2.4.18 kernels where writes to
-+	 * block devices are wrongly getting hit by the filesize
-+	 * limit.  This workaround isn't perfect, since it won't work
-+	 * if glibc wasn't built against 2.2 header files.  (Sigh.)
-+	 * 
-+	 */
-+	if ((flags & IO_FLAG_RW) &&
-+	    (uname(&ut) == 0) &&
-+	    ((ut.release[0] == '2') && (ut.release[1] == '.') &&
-+	     (ut.release[2] == '4') && (ut.release[3] == '.') &&
-+	     (ut.release[4] == '1') && (ut.release[5] >= '0') &&
-+	     (ut.release[5] < '8')) &&
-+	    (fstat(data->dev, &st) == 0) &&
-+	    (S_ISBLK(st.st_mode))) {
-+		struct rlimit	rlim;
-+		
-+		rlim.rlim_cur = rlim.rlim_max = (unsigned long) RLIM_INFINITY;
-+		setrlimit(RLIMIT_FSIZE, &rlim);
-+		getrlimit(RLIMIT_FSIZE, &rlim);
-+		if (((unsigned long) rlim.rlim_cur) <
-+		    ((unsigned long) rlim.rlim_max)) {
-+			rlim.rlim_cur = rlim.rlim_max;
-+			setrlimit(RLIMIT_FSIZE, &rlim);
-+		}
-+	}
-+#endif
-+	*channel = io;
-+	return 0;
-+
-+cleanup:
-+	if (data) {
-+		free_cache(data);
-+		ext2fs_free_mem(&data);
-+	}
-+	if (io)
-+		ext2fs_free_mem(&io);
-+	return retval;
-+}
-+
-+static errcode_t unix_close(io_channel channel)
-+{
-+	struct unix_private_data *data;
-+	errcode_t	retval = 0;
-+
-+	EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
-+	data = (struct unix_private_data *) channel->private_data;
-+	EXT2_CHECK_MAGIC(data, EXT2_ET_MAGIC_UNIX_IO_CHANNEL);
-+
-+	if (--channel->refcount > 0)
-+		return 0;
-+
-+#ifndef NO_IO_CACHE
-+	retval = flush_cached_blocks(channel, data, 0);
-+#endif
-+
-+	if (close(data->dev) < 0)
-+		retval = errno;
-+	free_cache(data);
-+
-+	ext2fs_free_mem(&channel->private_data);
-+	if (channel->name)
-+		ext2fs_free_mem(&channel->name);
-+	ext2fs_free_mem(&channel);
-+	return retval;
-+}
-+
-+static errcode_t unix_set_blksize(io_channel channel, int blksize)
-+{
-+	struct unix_private_data *data;
-+	errcode_t		retval;
-+
-+	EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
-+	data = (struct unix_private_data *) channel->private_data;
-+	EXT2_CHECK_MAGIC(data, EXT2_ET_MAGIC_UNIX_IO_CHANNEL);
-+
-+	if (channel->block_size != blksize) {
-+#ifndef NO_IO_CACHE
-+		if ((retval = flush_cached_blocks(channel, data, 0)))
-+			return retval;
-+#endif
-+		
-+		channel->block_size = blksize;
-+		free_cache(data);
-+		if ((retval = alloc_cache(channel, data)))
-+			return retval;
-+	}
-+	return 0;
-+}
-+
-+
-+static errcode_t unix_read_blk(io_channel channel, unsigned long block,
-+			       int count, void *buf)
-+{
-+	struct unix_private_data *data;
-+	struct unix_cache *cache, *reuse[READ_DIRECT_SIZE];
-+	errcode_t	retval;
-+	char		*cp;
-+	int		i, j;
-+
-+	EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
-+	data = (struct unix_private_data *) channel->private_data;
-+	EXT2_CHECK_MAGIC(data, EXT2_ET_MAGIC_UNIX_IO_CHANNEL);
-+
-+#ifdef NO_IO_CACHE
-+	return raw_read_blk(channel, data, block, count, buf);
-+#else
-+	/*
-+	 * If we're doing an odd-sized read or a very large read,
-+	 * flush out the cache and then do a direct read.
-+	 */
-+	if (count < 0 || count > WRITE_DIRECT_SIZE) {
-+		if ((retval = flush_cached_blocks(channel, data, 0)))
-+			return retval;
-+		return raw_read_blk(channel, data, block, count, buf);
-+	}
-+
-+	cp = buf;
-+	while (count > 0) {
-+		/* If it's in the cache, use it! */
-+		if ((cache = find_cached_block(data, block, &reuse[0]))) {
-+#ifdef DEBUG
-+			printf("Using cached block %d\n", block);
-+#endif
-+			memcpy(cp, cache->buf, channel->block_size);
-+			count--;
-+			block++;
-+			cp += channel->block_size;
-+			continue;
-+		}
-+		/*
-+		 * Find the number of uncached blocks so we can do a
-+		 * single read request
-+		 */
-+		for (i=1; i < count; i++)
-+			if (find_cached_block(data, block+i, &reuse[i]))
-+				break;
-+#ifdef DEBUG
-+		printf("Reading %d blocks starting at %d\n", i, block);
-+#endif
-+		if ((retval = raw_read_blk(channel, data, block, i, cp)))
-+			return retval;
-+		
-+		/* Save the results in the cache */
-+		for (j=0; j < i; j++) {
-+			count--;
-+			cache = reuse[j];
-+			reuse_cache(channel, data, cache, block++);
-+			memcpy(cache->buf, cp, channel->block_size);
-+			cp += channel->block_size;
-+		}
-+	}
-+	return 0;
-+#endif /* NO_IO_CACHE */
-+}
-+
-+static errcode_t unix_write_blk(io_channel channel, unsigned long block,
-+				int count, const void *buf)
-+{
-+	struct unix_private_data *data;
-+	struct unix_cache *cache, *reuse;
-+	errcode_t	retval = 0;
-+	const char	*cp;
-+	int		writethrough;
-+
-+	EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
-+	data = (struct unix_private_data *) channel->private_data;
-+	EXT2_CHECK_MAGIC(data, EXT2_ET_MAGIC_UNIX_IO_CHANNEL);
-+
-+#ifdef NO_IO_CACHE
-+	return raw_write_blk(channel, data, block, count, buf);
-+#else	
-+	/*
-+	 * If we're doing an odd-sized write or a very large write,
-+	 * flush out the cache completely and then do a direct write.
-+	 */
-+	if (count < 0 || count > WRITE_DIRECT_SIZE) {
-+		if ((retval = flush_cached_blocks(channel, data, 1)))
-+			return retval;
-+		return raw_write_blk(channel, data, block, count, buf);
-+	}
-+
-+	/*
-+	 * For a moderate-sized multi-block write, first force a write
-+	 * if we're in write-through cache mode, and then fill the
-+	 * cache with the blocks.
-+	 */
-+	writethrough = channel->flags & CHANNEL_FLAGS_WRITETHROUGH;
-+	if (writethrough)
-+		retval = raw_write_blk(channel, data, block, count, buf);
-+	
-+	cp = buf;
-+	while (count > 0) {
-+		cache = find_cached_block(data, block, &reuse);
-+		if (!cache) {
-+			cache = reuse;
-+			reuse_cache(channel, data, cache, block);
-+		}
-+		memcpy(cache->buf, cp, channel->block_size);
-+		cache->dirty = !writethrough;
-+		count--;
-+		block++;
-+		cp += channel->block_size;
-+	}
-+	return retval;
-+#endif /* NO_IO_CACHE */
-+}
-+
-+static errcode_t unix_write_byte(io_channel channel, unsigned long offset,
-+				 int size, const void *buf)
-+{
-+	struct unix_private_data *data;
-+	errcode_t	retval = 0;
-+	ssize_t		actual;
-+
-+	EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
-+	data = (struct unix_private_data *) channel->private_data;
-+	EXT2_CHECK_MAGIC(data, EXT2_ET_MAGIC_UNIX_IO_CHANNEL);
-+
-+#ifndef NO_IO_CACHE
-+	/*
-+	 * Flush out the cache completely
-+	 */
-+	if ((retval = flush_cached_blocks(channel, data, 1)))
-+		return retval;
-+#endif
-+
-+	if (lseek(data->dev, offset + data->offset, SEEK_SET) < 0)
-+		return errno;
-+	
-+	actual = write(data->dev, buf, size);
-+	if (actual != size)
-+		return EXT2_ET_SHORT_WRITE;
-+
-+	return 0;
-+}
-+
-+/*
-+ * Flush data buffers to disk.  
-+ */
-+static errcode_t unix_flush(io_channel channel)
-+{
-+	struct unix_private_data *data;
-+	errcode_t retval = 0;
-+	
-+	EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
-+	data = (struct unix_private_data *) channel->private_data;
-+	EXT2_CHECK_MAGIC(data, EXT2_ET_MAGIC_UNIX_IO_CHANNEL);
-+
-+#ifndef NO_IO_CACHE
-+	retval = flush_cached_blocks(channel, data, 0);
-+#endif
-+	fsync(data->dev);
-+	return retval;
-+}
-+
-+static errcode_t unix_set_option(io_channel channel, const char *option, 
-+				 const char *arg)
-+{
-+	struct unix_private_data *data;
-+	unsigned long tmp;
-+	char *end;
-+
-+	EXT2_CHECK_MAGIC(channel, EXT2_ET_MAGIC_IO_CHANNEL);
-+	data = (struct unix_private_data *) channel->private_data;
-+	EXT2_CHECK_MAGIC(data, EXT2_ET_MAGIC_UNIX_IO_CHANNEL);
-+
-+	if (!strcmp(option, "offset")) {
-+		if (!arg)
-+			return EXT2_ET_INVALID_ARGUMENT;
-+
-+		tmp = strtoul(arg, &end, 0);
-+		if (*end)
-+			return EXT2_ET_INVALID_ARGUMENT;
-+		data->offset = tmp;
-+		return 0;
-+	}
-+	return EXT2_ET_INVALID_ARGUMENT;
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/unlink.c silo-1.4.13/libext2fs/unlink.c
---- silo-1.4.13.orig/libext2fs/unlink.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/unlink.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,99 @@
-+/*
-+ * unlink.c --- delete links in a ext2fs directory
-+ * 
-+ * Copyright (C) 1993, 1994, 1997 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+#include <string.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+struct link_struct  {
-+	const char	*name;
-+	int		namelen;
-+	ext2_ino_t	inode;
-+	int		flags;
-+	struct ext2_dir_entry *prev;
-+	int		done;
-+};	
-+
-+#ifdef __TURBOC__
-+ #pragma argsused
-+#endif
-+static int unlink_proc(struct ext2_dir_entry *dirent,
-+		     int	offset EXT2FS_ATTR((unused)),
-+		     int	blocksize EXT2FS_ATTR((unused)),
-+		     char	*buf EXT2FS_ATTR((unused)),
-+		     void	*priv_data)
-+{
-+	struct link_struct *ls = (struct link_struct *) priv_data;
-+	struct ext2_dir_entry *prev;
-+
-+	prev = ls->prev;
-+	ls->prev = dirent;
-+
-+	if (ls->name) {
-+		if ((dirent->name_len & 0xFF) != ls->namelen)
-+			return 0;
-+		if (strncmp(ls->name, dirent->name, dirent->name_len & 0xFF))
-+			return 0;
-+	}
-+	if (ls->inode) {
-+		if (dirent->inode != ls->inode)
-+			return 0;
-+	} else {
-+		if (!dirent->inode)
-+			return 0;
-+	}
-+
-+	if (prev) 
-+		prev->rec_len += dirent->rec_len;
-+	else
-+		dirent->inode = 0;
-+	ls->done++;
-+	return DIRENT_ABORT|DIRENT_CHANGED;
-+}
-+
-+#ifdef __TURBOC__
-+ #pragma argsused
-+#endif
-+errcode_t ext2fs_unlink(ext2_filsys fs, ext2_ino_t dir,
-+			const char *name, ext2_ino_t ino,
-+			int flags EXT2FS_ATTR((unused)))
-+{
-+	errcode_t	retval;
-+	struct link_struct ls;
-+
-+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
-+
-+	if (!name && !ino)
-+		return EXT2_ET_INVALID_ARGUMENT;
-+
-+	if (!(fs->flags & EXT2_FLAG_RW))
-+		return EXT2_ET_RO_FILSYS;
-+
-+	ls.name = name;
-+	ls.namelen = name ? strlen(name) : 0;
-+	ls.inode = ino;
-+	ls.flags = 0;
-+	ls.done = 0;
-+	ls.prev = 0;
-+
-+	retval = ext2fs_dir_iterate(fs, dir, DIRENT_FLAG_INCLUDE_EMPTY, 
-+				    0, unlink_proc, &ls);
-+	if (retval)
-+		return retval;
-+
-+	return (ls.done) ? 0 : EXT2_ET_DIR_NO_SPACE;
-+}
-+
-diff -Naur silo-1.4.13.orig/libext2fs/valid_blk.c silo-1.4.13/libext2fs/valid_blk.c
---- silo-1.4.13.orig/libext2fs/valid_blk.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/valid_blk.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,56 @@
-+/*
-+ * valid_blk.c --- does the inode have valid blocks?
-+ *
-+ * Copyright 1997 by Theodore Ts'o
-+ * 
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ * 
-+ */
-+
-+#include <stdio.h>
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <string.h>
-+#include <time.h>
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+/*
-+ * This function returns 1 if the inode's block entries actually
-+ * contain block entries.
-+ */
-+int ext2fs_inode_has_valid_blocks(struct ext2_inode *inode)
-+{
-+	/*
-+	 * Only directories, regular files, and some symbolic links
-+	 * have valid block entries.
-+	 */
-+	if (!LINUX_S_ISDIR(inode->i_mode) && !LINUX_S_ISREG(inode->i_mode) &&
-+	    !LINUX_S_ISLNK(inode->i_mode))
-+		return 0;
-+	
-+	/*
-+	 * If the symbolic link is a "fast symlink", then the symlink
-+	 * target is stored in the block entries.
-+	 */
-+	if (LINUX_S_ISLNK (inode->i_mode)) {
-+		if (inode->i_file_acl == 0) {
-+			/* With no EA block, we can rely on i_blocks */
-+			if (inode->i_blocks == 0)
-+				return 0;
-+		} else {
-+			/* With an EA block, life gets more tricky */
-+			if (inode->i_size >= EXT2_N_BLOCKS*4)
-+				return 1; /* definitely using i_block[] */
-+			if (inode->i_size > 4 && inode->i_block[1] == 0)
-+				return 1; /* definitely using i_block[] */
-+			return 0; /* Probably a fast symlink */
-+		}
-+	}
-+	return 1;
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/version.c silo-1.4.13/libext2fs/version.c
---- silo-1.4.13.orig/libext2fs/version.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/version.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,52 @@
-+/*
-+ * version.c --- Return the version of the ext2 library
-+ *
-+ * Copyright (C) 1997 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#if HAVE_UNISTD_H
-+#include <unistd.h>
-+#endif
-+#include <string.h>
-+#include <stdio.h>
-+#include <ctype.h>
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+#include "version.h"
-+
-+static const char *lib_version = E2FSPROGS_VERSION;
-+static const char *lib_date = E2FSPROGS_DATE;
-+
-+int ext2fs_parse_version_string(const char *ver_string)
-+{
-+	const char *cp;
-+	int version = 0;
-+
-+	for (cp = ver_string; *cp; cp++) {
-+		if (*cp == '.')
-+			continue;
-+		if (!isdigit(*cp))
-+			break;
-+		version = (version * 10) + (*cp - '0');
-+	}
-+	return version;
-+}
-+
-+
-+int ext2fs_get_library_version(const char **ver_string,
-+			       const char **date_string)
-+{
-+	if (ver_string)
-+		*ver_string = lib_version;
-+	if (date_string)
-+		*date_string = lib_date;
-+
-+	return ext2fs_parse_version_string(lib_version);
-+}
-diff -Naur silo-1.4.13.orig/libext2fs/version.h silo-1.4.13/libext2fs/version.h
---- silo-1.4.13.orig/libext2fs/version.h	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/version.h	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,11 @@
-+/*
-+ * version.h --- controls the version number printed by the e2fs
-+ * programs.
-+ * 
-+ * Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-+ * 2004, 2005 by Theodore Ts'o.  This file may be redistributed under
-+ * the GNU Public License.
-+ */
-+
-+#define E2FSPROGS_VERSION "1.38"
-+#define E2FSPROGS_DATE "30-Jun-2005"
-diff -Naur silo-1.4.13.orig/libext2fs/write_bb_file.c silo-1.4.13/libext2fs/write_bb_file.c
---- silo-1.4.13.orig/libext2fs/write_bb_file.c	1969-12-31 19:00:00.000000000 -0500
-+++ silo-1.4.13/libext2fs/write_bb_file.c	2007-04-03 17:02:53.000000000 -0400
-@@ -0,0 +1,34 @@
-+/*
-+ * write_bb_file.c --- write a list of bad blocks to a FILE *
-+ *
-+ * Copyright (C) 1994, 1995 Theodore Ts'o.
-+ *
-+ * %Begin-Header%
-+ * This file may be redistributed under the terms of the GNU Public
-+ * License.
-+ * %End-Header%
-+ */
-+
-+#include <stdio.h>
-+
-+#include "ext2_fs.h"
-+#include "ext2fs.h"
-+
-+errcode_t ext2fs_write_bb_FILE(ext2_badblocks_list bb_list,
-+			       unsigned int flags EXT2FS_ATTR((unused)),
-+			       FILE *f)
-+{
-+	badblocks_iterate	bb_iter;
-+	blk_t			blk;
-+	errcode_t		retval;
-+
-+	retval = ext2fs_badblocks_list_iterate_begin(bb_list, &bb_iter);
-+	if (retval)
-+		return retval;
-+
-+	while (ext2fs_badblocks_list_iterate(bb_iter, &blk)) {
-+		fprintf(f, "%d\n", blk);
-+	}
-+	ext2fs_badblocks_list_iterate_end(bb_iter);
-+	return 0;
-+}
-diff -Naur silo-1.4.13.orig/Makefile silo-1.4.13/Makefile
---- silo-1.4.13.orig/Makefile	2006-06-01 13:24:53.000000000 -0400
-+++ silo-1.4.13/Makefile	2007-04-03 17:02:53.000000000 -0400
-@@ -3,7 +3,7 @@
- 
- # These only get built on Linux
- ifeq ($(OPSYS),Linux)
--  SUBDIRS  = common first second first-isofs tilo
-+  SUBDIRS  = common first libext2fs second first-isofs tilo
-   MANPAGES = maketilo.1 tilo.1
- endif
- 
-diff -Naur silo-1.4.13.orig/Rules.make silo-1.4.13/Rules.make
---- silo-1.4.13.orig/Rules.make	2006-06-21 03:51:03.000000000 -0400
-+++ silo-1.4.13/Rules.make	2007-04-03 17:02:53.000000000 -0400
-@@ -1,12 +1,14 @@
- VERSION=1.4.13
- IMGVERSION=0.99
- RM=rm -f
--# We want to force 32-bit builds
--CC=gcc -m32
--LD=ld -m elf32_sparc
--AS=as
--STRIP=strip
--NM=nm
-+CC=$(CROSS_COMPILE)gcc
-+CC-SILO=$(CC) -m32 -Wa,-32 -I../include/emul_32
-+BUILD_CC=gcc
-+LD=$(CROSS_COMPILE)ld -m elf32_sparc
-+AS=$(CROSS_COMPILE)as
-+STRIP=$(CROSS_COMPILE)strip
-+NM=$(CROSS_COMPILE)nm
-+
- ELFTOAOUT=elftoaout
- BIN2H=../common/bin2h
- 
-diff -Naur silo-1.4.13.orig/second/fs/ufs.c silo-1.4.13/second/fs/ufs.c
---- silo-1.4.13.orig/second/fs/ufs.c	2006-06-01 13:24:53.000000000 -0400
-+++ silo-1.4.13/second/fs/ufs.c	2007-04-03 17:02:53.000000000 -0400
-@@ -40,28 +40,18 @@
- 
- ino_t inode = 0;
- 
--#ifdef UFS_CIGAM
--/* Apparently new header */
--
- #define ufsi_size(x) ((unsigned int)((x)->ui_size))
- #define ufsi_db(x) ((unsigned int *)((x)->ui_u2.ui_addr.ui_db))
- #define ufsi_ib(x) ((unsigned int *)((x)->ui_u2.ui_addr.ui_ib))
- #define ufsd_namlen(x) ((unsigned char)((x)->d_u.d_44.d_namlen))
- 
--#ifdef UFS_MINFREE
--/* Apparently even newer header */
--#define ufs_superblock ufs_super_block
-+struct ufs_superblock_full {
-+	struct ufs_super_block_first first;
-+	struct ufs_super_block_second second;
-+	struct ufs_super_block_third third;
-+};
-+#define ufs_superblock ufs_super_block_first
- #define ufs_direct ufs_dir_entry
--#endif
--
--#else
--
--#define ufsi_size(x) (((x)->ui_size.val[1]))
--#define ufsi_db(x) ((unsigned int *)((x)->ui_db))
--#define ufsi_ib(x) ((unsigned int *)((x)->ui_ib))
--#define ufsd_namlen(x) ((unsigned char)((x)->d_namlen))
--
--#endif
- 
- #ifndef S_ISLNK
- #include <sys/stat.h>
-@@ -92,25 +82,22 @@
-         return p;
- }
- 
--static struct ufs_superblock *ufs_read_super(ufs_filsys fs)
-+static struct ufs_superblock_full *ufs_read_super(ufs_filsys fs)
- {
--    struct ufs_superblock *usb;
-+    struct ufs_superblock_full *usb;
- 
--    usb = (struct ufs_superblock *) malloc (2048);
-+    usb = (struct ufs_superblock_full *) malloc (2048);
-     if (!usb) return 0;
-     if (io_channel_read_blk (fs->io, UFS_SBLOCK/1024, -2048, (char *)usb))
-         return 0;
--    if (usb->fs_magic != UFS_MAGIC) {
--	/* XXX - replace hard-coded constant with a byte-swap macro */
--	if (usb->fs_magic == 0x54190100) {
--	}
-+    if (usb->third.fs_magic != UFS_MAGIC) {
- 	return 0;
-     }
--    if (usb->fs_bsize != UFS_BSIZE)
-+    if (usb->first.fs_bsize != UFS_BSIZE)
-         return 0;
--    if (usb->fs_fsize != UFS_FSIZE)
-+    if (usb->first.fs_fsize != UFS_FSIZE)
-         return 0;
--    io_channel_set_blksize (fs->io, usb->fs_fsize);
-+    io_channel_set_blksize (fs->io, usb->first.fs_fsize);
-     return usb;
- }
- 
-diff -Naur silo-1.4.13.orig/second/ls.c silo-1.4.13/second/ls.c
---- silo-1.4.13.orig/second/ls.c	2006-06-01 13:24:53.000000000 -0400
-+++ silo-1.4.13/second/ls.c	2007-04-03 17:02:53.000000000 -0400
-@@ -19,10 +19,10 @@
-    USA.  */
- 
- #include <silo.h>
-+#include <linux/types.h>
- #include <stringops.h>
- 
- typedef int FILE;
--#include <linux/types.h>
- #include <ext2fs/ext2_fs.h>
- #include <ext2fs/ext2fs.h>
- 
-diff -Naur silo-1.4.13.orig/second/Makefile silo-1.4.13/second/Makefile
---- silo-1.4.13.orig/second/Makefile	2006-06-01 13:24:53.000000000 -0400
-+++ silo-1.4.13/second/Makefile	2007-04-05 19:48:45.000000000 -0400
-@@ -27,10 +27,10 @@
- LDFLAGS_LARGE=-N -Ttext $(LARGE_RELOC)
- 
- .c.o:
--	$(CC) $(CFLAGS) -c $*.c -o $@
-+	$(CC-SILO) $(CFLAGS) -c $*.c -o $@
- 
- .S.o:
--	$(CC) $(CFLAGS) -c $*.S -o $@
-+	$(CC-SILO) $(CFLAGS) -c $*.S -o $@
- 
- # The ordering here is very significant. Please add new object files to OBJS5 only.
- OBJS1 = crt0.o
-@@ -43,8 +43,8 @@
- OBJS4 = main.o
- OBJS4N = mainnet.o
- OBJS5 = cmdline.o disk.o file.o misc.o cfg.o strtol.o ranges.o timer.o \
--	memory.o fs/libfs.a mul.o ../common/rem.o ../common/sdiv.o umul.o \
--	../common/stringops2.o ls.o muldi3.o
-+	memory.o fs/libfs.a ../common/rem.o ../common/sdiv.o umul.o \
-+	../common/stringops2.o ls.o muldi3.o ../libext2fs/libext2fs.a
- OBJS = $(OBJS1) $(OBJS2) $(OBJS3) bmark.o $(OBJS4) $(OBJS5)
- OBJSNET = $(OBJS1) $(OBJS2N) $(OBJS3) bmark.o $(OBJS4N) $(OBJS5)
- 
-@@ -53,18 +53,21 @@
- # Should really switch to autoconf...
- all: second.b silotftp.b
- 
-+../libext2fs/libext2fs.a:
-+	@make -C ../libext2fs
-+
- fs/libfs.a: $(FS_OBJS)
- 	$(RM) $@
- 	$(AR) rc $@ $(FS_OBJS)
- 
- second: $(OBJS) mark.o
--	$(LD) $(LDFLAGS_SMALL) -Bstatic -o second $(OBJS) -lext2fs mark.o
--	$(LD) $(LDFLAGS_LARGE) -Bstatic -o second2 $(OBJS) -lext2fs mark.o
-+	$(LD) $(LDFLAGS_SMALL) -Bstatic -o second $(OBJS) mark.o
-+	$(LD) $(LDFLAGS_LARGE) -Bstatic -o second2 $(OBJS) mark.o
- 	$(NM) second | grep -v '*ABS*' | sort > second.map
- 
- silotftp: $(OBJSNET) mark.o
--	$(LD) $(LDFLAGS_SMALL) -Bstatic -o silotftp $(OBJSNET) -lext2fs mark.o
--	$(LD) $(LDFLAGS_LARGE) -Bstatic -o silotftp2 $(OBJSNET) -lext2fs mark.o
-+	$(LD) $(LDFLAGS_SMALL) -Bstatic -o silotftp $(OBJSNET) mark.o
-+	$(LD) $(LDFLAGS_LARGE) -Bstatic -o silotftp2 $(OBJSNET) mark.o
- 	$(NM) silotftp | grep -v '*ABS*' | sort > silotftp.map
- 
- second.l: second
-@@ -73,31 +76,31 @@
- file.o:	       file.c
- 
- decompnet.o:   decomp.c
--	$(CC) $(CFLAGS) -DTFTP -DVERSION='"$(VERSION)"' -c -o $@ $<
-+	$(CC-SILO) $(CFLAGS) -DTFTP -DVERSION='"$(VERSION)"' -c -o $@ $<
- 
- decomp.o: decomp.c
--	$(CC) $(CFLAGS) -DVERSION='"$(VERSION)"' -c $<
-+	$(CC-SILO) $(CFLAGS) -DVERSION='"$(VERSION)"' -c $<
- 
- mainnet.o:   main.c
--	$(CC) $(CFLAGS) -DTFTP -c -o $@ $<
-+	$(CC-SILO) $(CFLAGS) -DTFTP -c -o $@ $<
- 
- malloc.o: ../common/malloc.c
--	$(CC) $(CFLAGS) -c -o $@ $<
-+	$(CC-SILO) $(CFLAGS) -c -o $@ $<
- 
- util:	util.c
--	$(CC) -DSMALL_RELOC=$(SMALL_RELOC) -DLARGE_RELOC=$(LARGE_RELOC) -o $@ $<
-+	$(BUILD_CC) -DSMALL_RELOC=$(SMALL_RELOC) -DLARGE_RELOC=$(LARGE_RELOC) -o $@ $<
- 
- clean:
- 	$(RM) *.o fs/*.o second* silotftp* util fs/libfs.a
- 
- crt0.o:	crt0.S
--	$(CC) $(CFLAGS) -c -Wa,-Av9 -DIMGVERSION='"SILO$(IMGVERSION)"' crt0.S
-+	$(CC-SILO) $(CFLAGS) -c -Wa,-Av9 -DIMGVERSION='"SILO$(IMGVERSION)"' crt0.S
- 
- memory.o: memory.c
--	$(CC) $(CFLAGS) -c -Wa,-Av9 memory.c
-+	$(CC-SILO) $(CFLAGS) -c -Wa,-Av9 memory.c
- 
- timer.o: timer.c
--	$(CC) $(CFLAGS) -c -Wa,-Av9a timer.c
-+	$(CC-SILO) $(CFLAGS) -c -Wa,-Av9a timer.c
- 
- second.b: second util
- 	$(ELFTOAOUT) -o second.aout second
-diff -Naur silo-1.4.13.orig/silo/silo.c silo-1.4.13/silo/silo.c
---- silo-1.4.13.orig/silo/silo.c	2006-06-01 13:24:53.000000000 -0400
-+++ silo-1.4.13/silo/silo.c	2007-04-03 17:02:53.000000000 -0400
-@@ -128,8 +128,8 @@
-     unsigned short nsect;	/* Sectors per track */
-     unsigned char spare3[4];	/* Even more magic... */
-     struct sun_partition {
--	unsigned long start_cylinder;
--	unsigned long num_sectors;
-+	unsigned int start_cylinder;
-+	unsigned int num_sectors;
-     } partitions[8];
-     unsigned short magic;	/* Magic number */
-     unsigned short csum;	/* Label xor'd checksum */
-diff -Naur silo-1.4.13.orig/silo/silocheck.c silo-1.4.13/silo/silocheck.c
---- silo-1.4.13.orig/silo/silocheck.c	2006-06-01 13:24:53.000000000 -0400
-+++ silo-1.4.13/silo/silocheck.c	2007-04-03 17:02:53.000000000 -0400
-@@ -100,8 +100,8 @@
-     unsigned short nsect;	/* Sectors per track */
-     unsigned char spare3[4];	/* Even more magic... */
-     struct sun_partition {
--	unsigned long start_cylinder;
--	unsigned long num_sectors;
-+	unsigned int start_cylinder;
-+	unsigned int num_sectors;
-     } partitions[8];
-     unsigned short magic;	/* Magic number */
-     unsigned short csum;	/* Label xor'd checksum */
-diff -Naur silo-1.4.13.orig/tilo/Makefile silo-1.4.13/tilo/Makefile
---- silo-1.4.13.orig/tilo/Makefile	2006-06-01 13:24:53.000000000 -0400
-+++ silo-1.4.13/tilo/Makefile	2007-04-03 17:02:53.000000000 -0400
-@@ -14,10 +14,10 @@
- all: maketilo
- 
- .c.o:
--	$(CC) $(CFLAGS) -c $*.c
-+	$(CC-SILO) $(CFLAGS) -c $*.c
- 
- .S.o:
--	$(CC) $(CFLAGS) -c $*.S
-+	$(CC-SILO) $(CFLAGS) -c $*.S
- 
- OBJS_COMMON = ../common/printf.o ../common/jmp.o ../common/prom.o \
- 	../common/tree.o ../common/console.o ../common/stringops1.o \
-@@ -45,19 +45,19 @@
- 
- 
- mallocl.o: ../common/malloc.c
--	$(CC) $(CFLAGS) -DMALLOC_BASE=0x4D0000 -c -o $@ $<
-+	$(CC-SILO) $(CFLAGS) -DMALLOC_BASE=0x4D0000 -c -o $@ $<
- 
- malloc.o: ../common/malloc.c
--	$(CC) $(CFLAGS) -DMALLOC_BASE=0x3D0000 -c -o $@ $<
-+	$(CC-SILO) $(CFLAGS) -DMALLOC_BASE=0x3D0000 -c -o $@ $<
- 
- tilol.o: tilo.c
--	$(CC) $(CFLAGS) -DLARGETILO -c -o $@ $<
-+	$(CC-SILO) $(CFLAGS) -DLARGETILO -c -o $@ $<
- 
- crt0.o:	crt0.S
--	$(CC) $(CFLAGS) -c -Wa,-Av9 -o $@ $<
-+	$(CC-SILO) $(CFLAGS) -c -Wa,-Av9 -o $@ $<
- 
- crt0l.o: crt0.S
--	$(CC) $(CFLAGS) -c -Wa,-Av9 -DLARGETILO -o $@ $<
-+	$(CC-SILO) $(CFLAGS) -c -Wa,-Av9 -DLARGETILO -o $@ $<
- 
- clean:
- 	$(RM) *.o boot boot2 *.out b.h b2.h maketilo
Index: patches/sysklogd-1.4.1-cross.patch
===================================================================
--- patches/sysklogd-1.4.1-cross.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/sysklogd-1.4.1-cross.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,13 @@
+--- sysklogd-1.4.1/Makefile.orig	2004-06-27 01:29:41.337269648 +1000
++++ sysklogd-1.4.1/Makefile	2004-06-27 01:30:02.409650803 +1000
+@@ -112,8 +112,8 @@
+ 	rm -f syslogd klogd ksym syslog_tst oops_test TAGS tsyslogd tklogd
+ 
+ install_exec: syslogd klogd
+-	${INSTALL} -m 500 -s syslogd ${BINDIR}/syslogd
+-	${INSTALL} -m 500 -s klogd ${BINDIR}/klogd
++	${INSTALL} -m 500 syslogd ${BINDIR}/syslogd
++	${INSTALL} -m 500 klogd ${BINDIR}/klogd
+ 
+ install_man:
+ 	${INSTALL} -o ${MAN_OWNER} -g ${MAN_OWNER} -m 644 sysklogd.8 ${MANDIR}/man8/sysklogd.8
Index: patches/sysklogd-1.4.1-kernel_headers-1.patch
===================================================================
--- patches/sysklogd-1.4.1-kernel_headers-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/sysklogd-1.4.1-kernel_headers-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,100 @@
+Submitted By: DJ Lucas (dj_at_lucasit_dot_com)
+Date: 2003-08-17
+Initial Package Version: 1.4.1
+Origin: Linux Standard Base Project
+Description: This patch fixes a dependacy on kernel includes.
+  Specifically, it removes the need to have kernel/module.h around.  It
+  is usable when building a linux-2.6 based system to get around
+  compile problems. Source link:
+  http://freestandards.org/pipermail/lsb-impl/2002-October/000466.html
+
+diff -Naur sysklogd-1.4.1-orig/Makefile sysklogd-1.4.1/Makefile
+--- sysklogd-1.4.1-orig/Makefile	1998-10-12 20:25:15.000000000 +0000
++++ sysklogd-1.4.1/Makefile	2003-08-17 19:14:38.000000000 +0000
+@@ -3,7 +3,7 @@
+ CC= gcc
+ #CFLAGS= -g -DSYSV -Wall
+ #LDFLAGS= -g
+-CFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce
++CFLAGS= $(RPM_OPT_FLAGS) -DSYSV -D_GNU_SOURCE -Wall
+ LDFLAGS= -s
+ 
+ # Look where your install program is.
+diff -Naur sysklogd-1.4.1-orig/ksym_mod.c sysklogd-1.4.1/ksym_mod.c
+--- sysklogd-1.4.1-orig/ksym_mod.c	2000-09-12 21:15:28.000000000 +0000
++++ sysklogd-1.4.1/ksym_mod.c	2003-08-17 19:14:38.000000000 +0000
+@@ -93,7 +93,7 @@
+ #include <linux/time.h>
+ #include <linux/module.h>
+ #else /* __GLIBC__ */
+-#include <linux/module.h>
++#include "module.h"
+ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
+ extern int get_kernel_syms __P ((struct kernel_sym *__table));
+ #endif /* __GLIBC__ */
+diff -Naur sysklogd-1.4.1-orig/module.h sysklogd-1.4.1/module.h
+--- sysklogd-1.4.1-orig/module.h	1970-01-01 00:00:00.000000000 +0000
++++ sysklogd-1.4.1/module.h	2003-08-17 19:14:38.000000000 +0000
+@@ -0,0 +1,62 @@
++/* this file eliminates the need to include <kernel/module.h> */
++/* Module definitions for klogd's module support */
++struct kernel_sym
++{
++	        unsigned long value;
++	        char name[60];
++};
++
++struct module_symbol
++{
++	unsigned long value;
++	const char *name;
++};
++
++struct module_ref
++{
++	struct module *dep;     /* "parent" pointer */
++	struct module *ref;     /* "child" pointer */
++	struct module_ref *next_ref;
++};
++
++struct module_info
++{
++	unsigned long addr;
++	unsigned long size;
++	unsigned long flags;
++	long usecount;
++};
++
++
++typedef struct { volatile int counter; } atomic_t;
++
++struct module
++{
++	unsigned long size_of_struct;   /* == sizeof(module) */
++	struct module *next;
++	const char *name;
++	unsigned long size;
++	
++	union
++	{
++		atomic_t usecount;
++		long pad;
++        } uc;                           /* Needs to keep its size - so says rth */
++	
++	unsigned long flags;            /* AUTOCLEAN et al */
++	
++	unsigned nsyms;
++	unsigned ndeps;
++	
++	struct module_symbol *syms;
++	struct module_ref *deps;
++	struct module_ref *refs;
++	int (*init)(void);
++	void (*cleanup)(void);
++	const struct exception_table_entry *ex_table_start;
++	const struct exception_table_entry *ex_table_end;
++#ifdef __alpha__
++	unsigned long gp;
++#endif
++};
++	
Index: patches/sysklogd-1.4.1-signal-1.patch
===================================================================
--- patches/sysklogd-1.4.1-signal-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/sysklogd-1.4.1-signal-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,22 @@
+Submitted By: Tyler Berry (loki at arete dot cc)
+Date: 2003-11-19
+Initial Package Version: 1.4.1
+Origin: http://www.geocrawler.com/mail/msg.php3?msg_id=6612801&list=709
+Description: Fixes problems starting/restarting syslogd.
+ 
+diff -Naur sysklogd-1.4.1.orig/syslogd.c sysklogd-1.4.1/syslogd.c
+--- sysklogd-1.4.1.orig/syslogd.c	2001-03-11 19:40:10.000000000 +0000
++++ sysklogd-1.4.1/syslogd.c	2003-11-19 16:03:11.376442834 +0000
+@@ -890,11 +890,11 @@
+ 		dprintf("Checking pidfile.\n");
+ 		if (!check_pid(PidFile))
+ 		{
++			signal (SIGTERM, doexit);
+ 			if (fork()) {
+ 				/*
+ 				 * Parent process
+ 				 */
+-				signal (SIGTERM, doexit);
+ 				sleep(300);
+ 				/*
+ 				 * Not reached unless something major went wrong.  5
Index: patches/sysklogd-1.4.1.patch
===================================================================
--- patches/sysklogd-1.4.1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/sysklogd-1.4.1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,92 @@
+diff -Naurw sysklogd-1.4.1/Makefile sysklogd-1.4.1.lsb/Makefile
+--- sysklogd-1.4.1/Makefile	Mon Oct 12 14:25:15 1998
++++ sysklogd-1.4.1.lsb/Makefile	Thu Oct 10 14:47:27 2002
+@@ -3,7 +3,7 @@
+ CC= gcc
+ #CFLAGS= -g -DSYSV -Wall
+ #LDFLAGS= -g
+-CFLAGS= $(RPM_OPT_FLAGS) -O3 -DSYSV -fomit-frame-pointer -Wall -fno-strength-reduce
++CFLAGS= $(RPM_OPT_FLAGS) -DSYSV -D_GNU_SOURCE -Wall
+ LDFLAGS= -s
+ 
+ # Look where your install program is.
+diff -Naurw sysklogd-1.4.1/ksym_mod.c sysklogd-1.4.1.lsb/ksym_mod.c
+--- sysklogd-1.4.1/ksym_mod.c	Tue Sep 12 15:15:28 2000
++++ sysklogd-1.4.1.lsb/ksym_mod.c	Thu Oct 10 14:46:27 2002
+@@ -93,7 +93,7 @@
+ #include <linux/time.h>
+ #include <linux/module.h>
+ #else /* __GLIBC__ */
+-#include <linux/module.h>
++#include "module.h"
+ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
+ extern int get_kernel_syms __P ((struct kernel_sym *__table));
+ #endif /* __GLIBC__ */
+diff -Naurw sysklogd-1.4.1/module.h sysklogd-1.4.1.lsb/module.h
+--- sysklogd-1.4.1/module.h	Wed Dec 31 17:00:00 1969
++++ sysklogd-1.4.1.lsb/module.h	Thu Oct 10 14:46:06 2002
+@@ -0,0 +1,62 @@
++/* this file eliminates the need to include <kernel/module.h> */
++/* Module definitions for klogd's module support */
++struct kernel_sym
++{
++	        unsigned long value;
++	        char name[60];
++};
++
++struct module_symbol
++{
++	unsigned long value;
++	const char *name;
++};
++
++struct module_ref
++{
++	struct module *dep;     /* "parent" pointer */
++	struct module *ref;     /* "child" pointer */
++	struct module_ref *next_ref;
++};
++
++struct module_info
++{
++	unsigned long addr;
++	unsigned long size;
++	unsigned long flags;
++	long usecount;
++};
++
++
++typedef struct { volatile int counter; } atomic_t;
++
++struct module
++{
++	unsigned long size_of_struct;   /* == sizeof(module) */
++	struct module *next;
++	const char *name;
++	unsigned long size;
++	
++	union
++	{
++		atomic_t usecount;
++		long pad;
++        } uc;                           /* Needs to keep its size - so says rth */
++	
++	unsigned long flags;            /* AUTOCLEAN et al */
++	
++	unsigned nsyms;
++	unsigned ndeps;
++	
++	struct module_symbol *syms;
++	struct module_ref *deps;
++	struct module_ref *refs;
++	int (*init)(void);
++	void (*cleanup)(void);
++	const struct exception_table_entry *ex_table_start;
++	const struct exception_table_entry *ex_table_end;
++#ifdef __alpha__
++	unsigned long gp;
++#endif
++};
++	
+
+
Index: patches/sysvinit-2.85-proclen-1.patch
===================================================================
--- patches/sysvinit-2.85-proclen-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/sysvinit-2.85-proclen-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,20 @@
+Submitted By: Alexander E. Patrakov (semzx at newmail dot ru)
+Origin: Alexander E. Patrakov
+Date: 2003-11-22
+Initial Package Version: 2.85
+Description: Without this patch, init sometimes clobbers environment variables
+set by kernel (such as TERM) when trying to change process title for ps
+due to out-of-bounds access to the command line arguments.
+
+diff -ur sysvinit-2.85/src/init.c sysvinit-2.85-fixed/src/init.c
+--- sysvinit-2.85/src/init.c	2003-04-15 17:16:41.000000000 +0600
++++ sysvinit-2.85-fixed/src/init.c	2003-11-22 19:46:03.000000000 +0500
+@@ -432,7 +432,7 @@
+ 	len = vsnprintf(buf, sizeof(buf), fmt, ap);
+ 	va_end(ap);
+ 
+-	memset(argv0, 0, maxproclen + 1);
++	memset(argv0, 0, maxproclen);
+ 	strncpy(argv0, buf, maxproclen - 1);
+ 
+ 	return len;
Index: patches/tar-1.15.1-gcc4_fix_tests.patch
===================================================================
--- patches/tar-1.15.1-gcc4_fix_tests.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/tar-1.15.1-gcc4_fix_tests.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,26 @@
+Submitted By: Ryan Oliver <ryan.oliver@pha.com.au>
+Date: 2005-04-25
+Initial Package Version: 1.15.1
+Origin: Ryan Oliver
+Description: Fix compilation issues with gcc4
+
+if gcc -DHAVE_CONFIG_H -I. -I. -I.. -I../lib -I../lib -I../src    -O2 -pipe -MT genfile.o -MD -MP -MF ".deps/genfile.Tpo" -c -o genfile.o genfile.c; \
+then mv -f ".deps/genfile.Tpo" ".deps/genfile.Po"; else rm -f ".deps/genfile.Tpo"; exit 1; fi
+genfile.c:63: error: static declaration of 'argp_program_version' follows non-static declaration
+../lib/argp.h:428: error: previous declaration of 'argp_program_version' was here
+genfile.c:64: error: static declaration of 'argp_program_bug_address' follows non-static declaration
+../lib/argp.h:444: error: previous declaration of 'argp_program_bug_address' was here
+
+--- tar-1.15.1/tests/genfile.c-orig	2005-04-25 15:23:47.000000000 +1000
++++ tar-1.15.1/tests/genfile.c	2005-04-25 15:24:08.000000000 +1000
+@@ -60,8 +60,8 @@
+ /* Block buffer for sparse file */
+ char *buffer;
+ 
+-static const char *argp_program_version = "genfile (" PACKAGE ") " VERSION;
+-static const char *argp_program_bug_address = "<" PACKAGE_BUGREPORT ">";
++const char *argp_program_version = "genfile (" PACKAGE ") " VERSION;
++const char *argp_program_bug_address = "<" PACKAGE_BUGREPORT ">";
+ static char doc[] = N_("genfile generates data files for GNU paxutils test suite");
+ 
+ static struct argp_option options[] = {
Index: patches/tar-1.15.1-sparse_fix-1.patch
===================================================================
--- patches/tar-1.15.1-sparse_fix-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/tar-1.15.1-sparse_fix-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,26 @@
+Submitted By: Jim Gifford (patches at jg555 dot com)
+Date: 2005-03-19
+Initial Package Version: 1.15.1
+Origin: Tar Bug Reports List
+Upstream Status: Applied
+Description: Fixes large file corruptions using option -S
+	http://lists.gnu.org/archive/html/bug-tar/2005-03/msg00004.html
+--- tar-1.15.1/src/sparse.c.orig	2005-03-20 04:23:34.144506120 +0000
++++ tar-1.15.1/src/sparse.c	2005-03-20 04:23:56.842055568 +0000
+@@ -1,6 +1,6 @@
+ /* Functions for dealing with sparse files
+ 
+-   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
++   Copyright (C) 2003, 2004, 2005 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 the
+@@ -182,7 +182,7 @@
+ {
+   static char buffer[BLOCKSIZE];
+   size_t count;
+-  size_t offset = 0;
++  off_t offset = 0;
+   struct sp_array sp = {0, 0};
+ 
+   if (!lseek_or_error (file, 0, SEEK_SET))
Index: patches/tcp_wrappers-7.6-gcc34-1.patch
===================================================================
--- patches/tcp_wrappers-7.6-gcc34-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/tcp_wrappers-7.6-gcc34-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,21 @@
+Submitted By: Jeremy Utley (jeremy@linuxfromscratch.org)
+Date: 2004-04-10
+Initial Package Version: 7.6
+Upstream Status: Not Submitted
+Origin: Self-created, with assistance from Zack Winkles
+Description: Fixes compile problem with GCC 3.4 Prerelease  - apply on
+	     top of current shared-lib-plus-plus patch
+
+$LastChangedBy: bdubbs $
+$Date: 2004-08-07 18:56:30 -0600 (Sat, 07 Aug 2004) $
+
+diff -aur tcp_wrappers_7.6/scaffold.c tcp_wrappers_7.6-new/scaffold.c
+--- tcp_wrappers_7.6/scaffold.c	1997-03-21 10:27:24.000000000 -0800
++++ tcp_wrappers_7.6-new/scaffold.c	2004-04-10 14:11:01.653193120 -0700
+@@ -25,7 +25,6 @@
+ #define	INADDR_NONE	(-1)		/* XXX should be 0xffffffff */
+ #endif
+ 
+-extern char *malloc();
+ 
+ /* Application-specific. */
Index: patches/tcp_wrappers-7.6-shared_lib_plus_plus-1.patch
===================================================================
--- patches/tcp_wrappers-7.6-shared_lib_plus_plus-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/tcp_wrappers-7.6-shared_lib_plus_plus-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1039 @@
+Submitted By: Tushar Teredesai <tushar@linuxfromscratch.org>
+Date: 2003-10-04
+Initial Package Version: 7.6
+Origin: http://archives.linuxfromscratch.org/mail-archives/blfs-dev/2003-January/001960.html
+Description: The patch was created from the tcp_wrappers modified package by Mark Heerdink.
+This patch provides the following improvements:
+    * Install libwrap.so along with libwrap.a.
+    * Create an install target for tcp_wrappers.
+    * Compilation and security fixes.
+    * Documentation fixes.
+
+$LastChangedBy: bdubbs $
+$Date: 2004-08-07 18:56:30 -0600 (Sat, 07 Aug 2004) $
+
+diff -Naur tcp_wrappers_7.6/Makefile tcp_wrappers_7.6.gimli/Makefile
+--- tcp_wrappers_7.6/Makefile	1997-03-21 12:27:21.000000000 -0600
++++ tcp_wrappers_7.6.gimli/Makefile	2002-07-15 16:07:21.000000000 -0500
+@@ -1,5 +1,10 @@
++GLIBC=$(shell grep -s -c __GLIBC__ /usr/include/features.h)
++
+ # @(#) Makefile 1.23 97/03/21 19:27:20
+ 
++# unset the HOSTNAME environment variable
++HOSTNAME =
++
+ what:
+ 	@echo
+ 	@echo "Usage: edit the REAL_DAEMON_DIR definition in the Makefile then:"
+@@ -19,7 +24,7 @@
+ 	@echo "	generic (most bsd-ish systems with sys5 compatibility)"
+ 	@echo "	386bsd aix alpha apollo bsdos convex-ultranet dell-gcc dgux dgux543"
+ 	@echo "	dynix epix esix freebsd hpux irix4 irix5 irix6 isc iunix"
+-	@echo "	linux machten mips(untested) ncrsvr4 netbsd next osf power_unix_211"
++	@echo "	linux gnu machten mips(untested) ncrsvr4 netbsd next osf power_unix_211"
+ 	@echo "	ptx-2.x ptx-generic pyramid sco sco-nis sco-od2 sco-os5 sinix sunos4"
+ 	@echo "	sunos40 sunos5 sysv4 tandem ultrix unicos7 unicos8 unixware1 unixware2"
+ 	@echo "	uts215 uxp"
+@@ -43,8 +48,8 @@
+ # Ultrix 4.x SunOS 4.x ConvexOS 10.x Dynix/ptx
+ #REAL_DAEMON_DIR=/usr/etc
+ #
+-# SysV.4 Solaris 2.x OSF AIX
+-#REAL_DAEMON_DIR=/usr/sbin
++# SysV.4 Solaris 2.x OSF AIX Linux
++REAL_DAEMON_DIR=/usr/sbin
+ #
+ # BSD 4.4
+ #REAL_DAEMON_DIR=/usr/libexec
+@@ -141,10 +146,21 @@
+ 	LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ= NETGROUP= TLI= \
+ 	EXTRA_CFLAGS=-DSYS_ERRLIST_DEFINED VSYSLOG= all
+ 
++ifneq ($(GLIBC),0)
++MYLIB=-lnsl
++endif
++
+ linux:
+ 	@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
+-	LIBS= RANLIB=ranlib ARFLAGS=rv AUX_OBJ=setenv.o \
+-	NETGROUP= TLI= EXTRA_CFLAGS="-DBROKEN_SO_LINGER" all
++	LIBS=$(MYLIB) RANLIB=ranlib ARFLAGS=rv AUX_OBJ=weak_symbols.o \
++	NETGROUP=-DNETGROUP TLI= VSYSLOG= BUGS= all \
++	EXTRA_CFLAGS="-DSYS_ERRLIST_DEFINED -DHAVE_WEAKSYMS -D_REENTRANT"
++
++gnu:
++	@make REAL_DAEMON_DIR=$(REAL_DAEMON_DIR) STYLE=$(STYLE) \
++	LIBS=$(MYLIB) RANLIB=ranlib ARFLAGS=rv AUX_OBJ=weak_symbols.o \
++	NETGROUP=-DNETGROUP TLI= VSYSLOG= BUGS= all \
++	EXTRA_CFLAGS="-DHAVE_STRERROR -DHAVE_WEAKSYMS -D_REENTRANT"
+ 
+ # This is good for many SYSV+BSD hybrids with NIS, probably also for HP-UX 7.x.
+ hpux hpux8 hpux9 hpux10:
+@@ -391,7 +407,7 @@
+ # the ones provided with this source distribution. The environ.c module
+ # implements setenv(), getenv(), and putenv().
+ 
+-AUX_OBJ= setenv.o
++#AUX_OBJ= setenv.o
+ #AUX_OBJ= environ.o
+ #AUX_OBJ= environ.o strcasecmp.o
+ 
+@@ -454,7 +470,8 @@
+ # host name aliases. Compile with -DSOLARIS_24_GETHOSTBYNAME_BUG to work
+ # around this. The workaround does no harm on other Solaris versions.
+ 
+-BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DLIBC_CALLS_STRTOK
++BUGS =
++#BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DLIBC_CALLS_STRTOK
+ #BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DINET_ADDR_BUG
+ #BUGS = -DGETPEERNAME_BUG -DBROKEN_FGETS -DSOLARIS_24_GETHOSTBYNAME_BUG
+ 
+@@ -464,7 +481,7 @@
+ # If your system supports NIS or YP-style netgroups, enable the following
+ # macro definition. Netgroups are used only for host access control.
+ #
+-#NETGROUP= -DNETGROUP
++NETGROUP= -DNETGROUP
+ 
+ ###############################################################
+ # System dependencies: whether or not your system has vsyslog()
+@@ -491,7 +508,7 @@
+ # Uncomment the next definition to turn on the language extensions
+ # (examples: allow, deny, banners, twist and spawn).
+ # 
+-#STYLE	= -DPROCESS_OPTIONS	# Enable language extensions.
++STYLE	= -DPROCESS_OPTIONS	# Enable language extensions.
+ 
+ ################################################################
+ # Optional: Changing the default disposition of logfile records
+@@ -514,7 +531,7 @@
+ #
+ # The LOG_XXX names below are taken from the /usr/include/syslog.h file.
+ 
+-FACILITY= LOG_MAIL	# LOG_MAIL is what most sendmail daemons use
++FACILITY= LOG_DAEMON	# LOG_MAIL is what most sendmail daemons use
+ 
+ # The syslog priority at which successful connections are logged.
+ 
+@@ -610,7 +627,7 @@
+ # Paranoid mode implies hostname lookup. In order to disable hostname
+ # lookups altogether, see the next section.
+ 
+-PARANOID= -DPARANOID
++#PARANOID= -DPARANOID
+ 
+ ########################################
+ # Optional: turning off hostname lookups
+@@ -623,7 +640,7 @@
+ # In order to perform selective hostname lookups, disable paranoid
+ # mode (see previous section) and comment out the following definition.
+ 
+-HOSTNAME= -DALWAYS_HOSTNAME
++#HOSTNAME= -DALWAYS_HOSTNAME
+ 
+ #############################################
+ # Optional: Turning on host ADDRESS checking
+@@ -649,28 +666,46 @@
+ # source-routed traffic in the kernel. Examples: 4.4BSD derivatives,
+ # Solaris 2.x, and Linux. See your system documentation for details.
+ #
+-# KILL_OPT= -DKILL_IP_OPTIONS
++KILL_OPT= -DKILL_IP_OPTIONS
+ 
+ ## End configuration options
+ ############################
+ 
+ # Protection against weird shells or weird make programs.
+ 
++CC	= gcc
+ SHELL	= /bin/sh
+-.c.o:;	$(CC) $(CFLAGS) -c $*.c
++.c.o:;	$(CC) $(CFLAGS) -o $*.o -c $*.c
++
++SOMAJOR = 0
++SOMINOR = 7.6
++
++LIB	= libwrap.a
++SHLIB	= shared/libwrap.so.$(SOMAJOR).$(SOMINOR)
++SHLIBSOMAJ= shared/libwrap.so.$(SOMAJOR)
++SHLIBSO	= shared/libwrap.so
++SHLIBFLAGS = -Lshared -lwrap
+ 
+-CFLAGS	= -O -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \
++shared/%.o: %.c
++	$(CC) $(CFLAGS) $(SHCFLAGS) -c $< -o $@
++
++CFLAGS	= -O2 -DFACILITY=$(FACILITY) $(ACCESS) $(PARANOID) $(NETGROUP) \
+ 	$(BUGS) $(SYSTYPE) $(AUTH) $(UMASK) \
+ 	-DREAL_DAEMON_DIR=\"$(REAL_DAEMON_DIR)\" $(STYLE) $(KILL_OPT) \
+ 	-DSEVERITY=$(SEVERITY) -DRFC931_TIMEOUT=$(RFC931_TIMEOUT) \
+ 	$(UCHAR) $(TABLES) $(STRINGS) $(TLI) $(EXTRA_CFLAGS) $(DOT) \
+ 	$(VSYSLOG) $(HOSTNAME)
+ 
++SHLINKFLAGS = -shared -Xlinker -soname -Xlinker libwrap.so.$(SOMAJOR) -lc $(LIBS)
++SHCFLAGS = -fPIC -shared -D_REENTRANT
++
+ LIB_OBJ= hosts_access.o options.o shell_cmd.o rfc931.o eval.o \
+ 	hosts_ctl.o refuse.o percent_x.o clean_exit.o $(AUX_OBJ) \
+ 	$(FROM_OBJ) fix_options.o socket.o tli.o workarounds.o \
+ 	update.o misc.o diag.o percent_m.o myvsyslog.o
+ 
++SHLIB_OBJ= $(addprefix shared/, $(LIB_OBJ));
++
+ FROM_OBJ= fromhost.o
+ 
+ KIT	= README miscd.c tcpd.c fromhost.c hosts_access.c shell_cmd.c \
+@@ -684,46 +719,80 @@
+ 	refuse.c tcpdchk.8 setenv.c inetcf.c inetcf.h scaffold.c \
+ 	scaffold.h tcpdmatch.8 README.NIS
+ 
+-LIB	= libwrap.a
+-
+-all other: config-check tcpd tcpdmatch try-from safe_finger tcpdchk
++all other: config-check tcpd tcpdmatch try-from safe_finger tcpdchk $(LIB)
+ 
+ # Invalidate all object files when the compiler options (CFLAGS) have changed.
+ 
+ config-check:
+ 	@set +e; test -n "$(REAL_DAEMON_DIR)" || { make; exit 1; }
+-	@set +e; echo $(CFLAGS) >/tmp/cflags.$$$$ ; \
+-	if cmp cflags /tmp/cflags.$$$$ ; \
+-	then rm /tmp/cflags.$$$$ ; \
+-	else mv /tmp/cflags.$$$$ cflags ; \
++	@set +e; echo $(CFLAGS) >cflags.new ; \
++	if cmp cflags cflags.new ; \
++	then rm cflags.new ; \
++	else mv cflags.new cflags ; \
+ 	fi >/dev/null 2>/dev/null
++	@if [ ! -d shared ]; then mkdir shared; fi
+ 
+ $(LIB):	$(LIB_OBJ)
+ 	rm -f $(LIB)
+ 	$(AR) $(ARFLAGS) $(LIB) $(LIB_OBJ)
+ 	-$(RANLIB) $(LIB)
+ 
+-tcpd:	tcpd.o $(LIB)
+-	$(CC) $(CFLAGS) -o $@ tcpd.o $(LIB) $(LIBS)
++$(SHLIB): $(SHLIB_OBJ)
++	rm -f $(SHLIB)
++	$(CC) -o $(SHLIB) $(SHLINKFLAGS) $(SHLIB_OBJ)
++	ln -s $(notdir $(SHLIB)) $(SHLIBSOMAJ)
++	ln -s $(notdir $(SHLIBSOMAJ)) $(SHLIBSO)
++
++tcpd:	tcpd.o $(SHLIB)
++	$(CC) $(CFLAGS) -o $@ tcpd.o $(SHLIBFLAGS)
+ 
+-miscd:	miscd.o $(LIB)
+-	$(CC) $(CFLAGS) -o $@ miscd.o $(LIB) $(LIBS)
++miscd:	miscd.o $(SHLIB)
++	$(CC) $(CFLAGS) -o $@ miscd.o $(SHLIBFLAGS)
+ 
+-safe_finger: safe_finger.o $(LIB)
+-	$(CC) $(CFLAGS) -o $@ safe_finger.o $(LIB) $(LIBS)
++safe_finger: safe_finger.o $(SHLIB)
++	$(CC) $(CFLAGS) -o $@ safe_finger.o $(SHLIBFLAGS)
+ 
+ TCPDMATCH_OBJ = tcpdmatch.o fakelog.o inetcf.o scaffold.o
+ 
+-tcpdmatch: $(TCPDMATCH_OBJ) $(LIB)
+-	$(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(LIB) $(LIBS)
++tcpdmatch: $(TCPDMATCH_OBJ) $(SHLIB)
++	$(CC) $(CFLAGS) -o $@ $(TCPDMATCH_OBJ) $(SHLIBFLAGS)
+ 
+-try-from: try-from.o fakelog.o $(LIB)
+-	$(CC) $(CFLAGS) -o $@ try-from.o fakelog.o $(LIB) $(LIBS)
++try-from: try-from.o fakelog.o $(SHLIB)
++	$(CC) $(CFLAGS) -o $@ try-from.o fakelog.o $(SHLIBFLAGS)
+ 
+ TCPDCHK_OBJ = tcpdchk.o fakelog.o inetcf.o scaffold.o
+ 
+-tcpdchk: $(TCPDCHK_OBJ) $(LIB)
+-	$(CC) $(CFLAGS) -o $@ $(TCPDCHK_OBJ) $(LIB) $(LIBS)
++tcpdchk: $(TCPDCHK_OBJ) $(SHLIB)
++	$(CC) $(CFLAGS) -o $@ $(TCPDCHK_OBJ) $(SHLIBFLAGS)
++
++install: install-lib install-bin install-dev
++
++install-lib:
++	install -o root -g root -m 0755 $(SHLIB) ${DESTDIR}/usr/lib/
++	ln -sf $(notdir $(SHLIB)) ${DESTDIR}/usr/lib/$(notdir $(SHLIBSOMAJ))
++	ln -sf $(notdir $(SHLIBSOMAJ)) ${DESTDIR}/usr/lib/$(notdir $(SHLIBSO))
++
++install-bin:
++	install -o root -g root -m 0755 tcpd ${DESTDIR}/usr/sbin/
++	install -o root -g root -m 0755 tcpdchk ${DESTDIR}/usr/sbin/
++	install -o root -g root -m 0755 tcpdmatch ${DESTDIR}/usr/sbin/
++	install -o root -g root -m 0755 try-from ${DESTDIR}/usr/sbin/
++	install -o root -g root -m 0755 safe_finger ${DESTDIR}/usr/sbin/
++	install -o root -g root -m 0644 tcpd.8 ${DESTDIR}/usr/share/man/man8/
++	install -o root -g root -m 0644 tcpdchk.8 ${DESTDIR}/usr/share/man/man8/
++	install -o root -g root -m 0644 try-from.8 ${DESTDIR}/usr/share/man/man8/
++	install -o root -g root -m 0644 tcpdmatch.8 ${DESTDIR}/usr/share/man/man8/
++	install -o root -g root -m 0644 safe_finger.8 ${DESTDIR}/usr/share/man/man8/
++	install -o root -g root -m 0644 hosts_access.5 ${DESTDIR}/usr/share/man/man5/
++	install -o root -g root -m 0644 hosts_options.5 ${DESTDIR}/usr/share/man/man5/
++
++install-dev:
++	install -o root -g root -m 0644 hosts_access.3 ${DESTDIR}/usr/share/man/man3/
++	install -o root -g root -m 0644 tcpd.h ${DESTDIR}/usr/include/
++	install -o root -g root -m 0644 $(LIB) ${DESTDIR}/usr/lib/
++	ln -sf hosts_access.3 ${DESTDIR}/usr/share/man/man3/hosts_ctl.3
++	ln -sf hosts_access.3 ${DESTDIR}/usr/share/man/man3/request_init.3
++	ln -sf hosts_access.3 ${DESTDIR}/usr/share/man/man3/request_set.3
+ 
+ shar:	$(KIT)
+ 	@shar $(KIT)
+@@ -739,7 +808,8 @@
+ 
+ clean:
+ 	rm -f tcpd miscd safe_finger tcpdmatch tcpdchk try-from *.[oa] core \
+-	cflags
++	cflags libwrap*.so*
++	rm -rf shared
+ 
+ tidy:	clean
+ 	chmod -R a+r .
+@@ -885,5 +955,6 @@
+ update.o: mystdarg.h
+ update.o: tcpd.h
+ vfprintf.o: cflags
++weak_symbols.o: tcpd.h
+ workarounds.o: cflags
+ workarounds.o: tcpd.h
+diff -Naur tcp_wrappers_7.6/fix_options.c tcp_wrappers_7.6.gimli/fix_options.c
+--- tcp_wrappers_7.6/fix_options.c	1997-04-07 19:29:19.000000000 -0500
++++ tcp_wrappers_7.6.gimli/fix_options.c	2002-01-07 08:50:19.000000000 -0600
+@@ -35,7 +35,12 @@
+ #ifdef IP_OPTIONS
+     unsigned char optbuf[BUFFER_SIZE / 3], *cp;
+     char    lbuf[BUFFER_SIZE], *lp;
++#if !defined(__GLIBC__)
+     int     optsize = sizeof(optbuf), ipproto;
++#else /* __GLIBC__ */
++    size_t  optsize = sizeof(optbuf);
++    int     ipproto;
++#endif /* __GLIBC__ */
+     struct protoent *ip;
+     int     fd = request->fd;
+     unsigned int opt;
+diff -Naur tcp_wrappers_7.6/hosts_access.3 tcp_wrappers_7.6.gimli/hosts_access.3
+--- tcp_wrappers_7.6/hosts_access.3	1996-02-11 10:01:27.000000000 -0600
++++ tcp_wrappers_7.6.gimli/hosts_access.3	2002-01-07 08:50:19.000000000 -0600
+@@ -3,7 +3,7 @@
+ hosts_access, hosts_ctl, request_init, request_set \- access control library
+ .SH SYNOPSIS
+ .nf
+-#include "tcpd.h"
++#include <tcpd.h>
+ 
+ extern int allow_severity;
+ extern int deny_severity;
+diff -Naur tcp_wrappers_7.6/hosts_access.5 tcp_wrappers_7.6.gimli/hosts_access.5
+--- tcp_wrappers_7.6/hosts_access.5	1995-01-30 12:51:47.000000000 -0600
++++ tcp_wrappers_7.6.gimli/hosts_access.5	2002-01-07 08:50:19.000000000 -0600
+@@ -8,9 +8,9 @@
+ impatient reader is encouraged to skip to the EXAMPLES section for a
+ quick introduction.
+ .PP
+-An extended version of the access control language is described in the
+-\fIhosts_options\fR(5) document. The extensions are turned on at
+-program build time by building with -DPROCESS_OPTIONS.
++The extended version of the access control language is described in the
++\fIhosts_options\fR(5) document. \fBNote that this language supersedes
++the meaning of \fIshell_command\fB as documented below.\fR
+ .PP
+ In the following text, \fIdaemon\fR is the the process name of a
+ network daemon process, and \fIclient\fR is the name and/or address of
+@@ -40,7 +40,7 @@
+ character. This permits you to break up long lines so that they are
+ easier to edit.
+ .IP \(bu
+-Blank lines or lines that begin with a `#\' character are ignored.
++Blank lines or lines that begin with a `#' character are ignored.
+ This permits you to insert comments and whitespace so that the tables
+ are easier to read.
+ .IP \(bu
+@@ -69,26 +69,33 @@
+ .SH PATTERNS
+ The access control language implements the following patterns:
+ .IP \(bu
+-A string that begins with a `.\' character. A host name is matched if
++A string that begins with a `.' character. A host name is matched if
+ the last components of its name match the specified pattern.  For
+-example, the pattern `.tue.nl\' matches the host name
+-`wzv.win.tue.nl\'.
++example, the pattern `.tue.nl' matches the host name
++`wzv.win.tue.nl'.
+ .IP \(bu
+-A string that ends with a `.\' character. A host address is matched if
++A string that ends with a `.' character. A host address is matched if
+ its first numeric fields match the given string.  For example, the
+-pattern `131.155.\' matches the address of (almost) every host on the
++pattern `131.155.' matches the address of (almost) every host on the
+ Eind\%hoven University network (131.155.x.x).
+ .IP \(bu
+-A string that begins with an `@\' character is treated as an NIS
++A string that begins with an `@' character is treated as an NIS
+ (formerly YP) netgroup name. A host name is matched if it is a host
+ member of the specified netgroup. Netgroup matches are not supported
+ for daemon process names or for client user names.
+ .IP \(bu
+-An expression of the form `n.n.n.n/m.m.m.m\' is interpreted as a
+-`net/mask\' pair. A host address is matched if `net\' is equal to the
+-bitwise AND of the address and the `mask\'. For example, the net/mask
+-pattern `131.155.72.0/255.255.254.0\' matches every address in the
+-range `131.155.72.0\' through `131.155.73.255\'.
++An expression of the form `n.n.n.n/m.m.m.m' is interpreted as a
++`net/mask' pair. A host address is matched if `net' is equal to the
++bitwise AND of the address and the `mask'. For example, the net/mask
++pattern `131.155.72.0/255.255.254.0' matches every address in the
++range `131.155.72.0' through `131.155.73.255'.
++.IP \(bu
++A string that begins with a `/' character is treated as a file
++name. A host name or address is matched if it matches any host name
++or address pattern listed in the named file. The file format is
++zero or more lines with zero or more host name or address patterns
++separated by whitespace.  A file name pattern can be used anywhere
++a host name or address pattern can be used.
+ .SH WILDCARDS
+ The access control language supports explicit wildcards:
+ .IP ALL
+@@ -115,19 +122,19 @@
+ .ne 6
+ .SH OPERATORS
+ .IP EXCEPT
+-Intended use is of the form: `list_1 EXCEPT list_2\'; this construct
++Intended use is of the form: `list_1 EXCEPT list_2'; this construct
+ matches anything that matches \fIlist_1\fR unless it matches
+ \fIlist_2\fR.  The EXCEPT operator can be used in daemon_lists and in
+ client_lists. The EXCEPT operator can be nested: if the control
+-language would permit the use of parentheses, `a EXCEPT b EXCEPT c\'
+-would parse as `(a EXCEPT (b EXCEPT c))\'.
++language would permit the use of parentheses, `a EXCEPT b EXCEPT c'
++would parse as `(a EXCEPT (b EXCEPT c))'.
+ .br
+ .ne 6
+ .SH SHELL COMMANDS
+ If the first-matched access control rule contains a shell command, that
+ command is subjected to %<letter> substitutions (see next section).
+ The result is executed by a \fI/bin/sh\fR child process with standard
+-input, output and error connected to \fI/dev/null\fR.  Specify an `&\'
++input, output and error connected to \fI/dev/null\fR.  Specify an `&'
+ at the end of the command if you do not want to wait until it has
+ completed.
+ .PP
+@@ -159,7 +166,7 @@
+ .IP %u
+ The client user name (or "unknown").
+ .IP %%
+-Expands to a single `%\' character.
++Expands to a single `%' character.
+ .PP
+ Characters in % expansions that may confuse the shell are replaced by
+ underscores.
+@@ -243,9 +250,9 @@
+ less trustworthy. It is possible for an intruder to spoof both the
+ client connection and the IDENT lookup, although doing so is much
+ harder than spoofing just a client connection. It may also be that
+-the client\'s IDENT server is lying.
++the client's IDENT server is lying.
+ .PP
+-Note: IDENT lookups don\'t work with UDP services. 
++Note: IDENT lookups don't work with UDP services. 
+ .SH EXAMPLES
+ The language is flexible enough that different types of access control
+ policy can be expressed with a minimum of fuss. Although the language
+@@ -285,7 +292,7 @@
+ .br
+ ALL: .foobar.edu EXCEPT terminalserver.foobar.edu
+ .PP
+-The first rule permits access from hosts in the local domain (no `.\'
++The first rule permits access from hosts in the local domain (no `.'
+ in the host name) and from members of the \fIsome_netgroup\fP
+ netgroup.  The second rule permits access from all hosts in the
+ \fIfoobar.edu\fP domain (notice the leading dot), with the exception of
+@@ -322,8 +329,8 @@
+ /etc/hosts.deny:
+ .in +3
+ .nf
+-in.tftpd: ALL: (/some/where/safe_finger -l @%h | \\
+-	/usr/ucb/mail -s %d-%h root) &
++in.tftpd: ALL: (/usr/sbin/safe_finger -l @%h | \\
++	/usr/bin/mail -s %d-%h root) &
+ .fi
+ .PP
+ The safe_finger command comes with the tcpd wrapper and should be
+@@ -349,7 +356,7 @@
+ capacity of an internal buffer; when an access control rule is not
+ terminated by a newline character; when the result of %<letter>
+ expansion would overflow an internal buffer; when a system call fails
+-that shouldn\'t.  All problems are reported via the syslog daemon.
++that shouldn't.  All problems are reported via the syslog daemon.
+ .SH FILES
+ .na
+ .nf
+diff -Naur tcp_wrappers_7.6/hosts_access.c tcp_wrappers_7.6.gimli/hosts_access.c
+--- tcp_wrappers_7.6/hosts_access.c	1997-02-11 19:13:23.000000000 -0600
++++ tcp_wrappers_7.6.gimli/hosts_access.c	2002-01-07 08:50:19.000000000 -0600
+@@ -240,6 +240,26 @@
+     }
+ }
+ 
++/* hostfile_match - look up host patterns from file */
++
++static int hostfile_match(path, host)
++char   *path;
++struct hosts_info *host;
++{
++    char    tok[BUFSIZ];
++    int     match = NO;
++    FILE   *fp;
++
++    if ((fp = fopen(path, "r")) != 0) {
++        while (fscanf(fp, "%s", tok) == 1 && !(match = host_match(tok, host)))
++            /* void */ ;
++        fclose(fp);
++    } else if (errno != ENOENT) {
++        tcpd_warn("open %s: %m", path);
++    }
++    return (match);
++}
++
+ /* host_match - match host name and/or address against pattern */
+ 
+ static int host_match(tok, host)
+@@ -267,6 +287,8 @@
+ 	tcpd_warn("netgroup support is disabled");	/* not tcpd_jump() */
+ 	return (NO);
+ #endif
++    } else if (tok[0] == '/') {                         /* /file hack */
++        return (hostfile_match(tok, host));
+     } else if (STR_EQ(tok, "KNOWN")) {		/* check address and name */
+ 	char   *name = eval_hostname(host);
+ 	return (STR_NE(eval_hostaddr(host), unknown) && HOSTNAME_KNOWN(name));
+diff -Naur tcp_wrappers_7.6/hosts_options.5 tcp_wrappers_7.6.gimli/hosts_options.5
+--- tcp_wrappers_7.6/hosts_options.5	1994-12-28 10:42:29.000000000 -0600
++++ tcp_wrappers_7.6.gimli/hosts_options.5	2002-01-07 08:50:19.000000000 -0600
+@@ -58,12 +58,12 @@
+ Execute, in a child process, the specified shell command, after
+ performing the %<letter> expansions described in the hosts_access(5)
+ manual page.  The command is executed with stdin, stdout and stderr
+-connected to the null device, so that it won\'t mess up the
++connected to the null device, so that it won't mess up the
+ conversation with the client host. Example:
+ .sp
+ .nf
+ .ti +3
+-spawn (/some/where/safe_finger -l @%h | /usr/ucb/mail root) &
++spawn (/usr/sbin/safe_finger -l @%h | /usr/bin/mail root) &
+ .fi
+ .sp
+ executes, in a background child process, the shell command "safe_finger
+diff -Naur tcp_wrappers_7.6/options.c tcp_wrappers_7.6.gimli/options.c
+--- tcp_wrappers_7.6/options.c	1996-02-11 10:01:32.000000000 -0600
++++ tcp_wrappers_7.6.gimli/options.c	2002-01-07 08:50:19.000000000 -0600
+@@ -473,6 +473,9 @@
+ #ifdef LOG_CRON
+     "cron", LOG_CRON,
+ #endif
++#ifdef LOG_FTP
++    "ftp", LOG_FTP,
++#endif
+ #ifdef LOG_LOCAL0
+     "local0", LOG_LOCAL0,
+ #endif
+diff -Naur tcp_wrappers_7.6/percent_m.c tcp_wrappers_7.6.gimli/percent_m.c
+--- tcp_wrappers_7.6/percent_m.c	1994-12-28 10:42:37.000000000 -0600
++++ tcp_wrappers_7.6.gimli/percent_m.c	2002-01-07 08:50:19.000000000 -0600
+@@ -13,7 +13,7 @@
+ #include <string.h>
+ 
+ extern int errno;
+-#ifndef SYS_ERRLIST_DEFINED
++#if !defined(SYS_ERRLIST_DEFINED) && !defined(HAVE_STRERROR)
+ extern char *sys_errlist[];
+ extern int sys_nerr;
+ #endif
+@@ -29,11 +29,15 @@
+ 
+     while (*bp = *cp)
+ 	if (*cp == '%' && cp[1] == 'm') {
++#ifdef HAVE_STRERROR
++            strcpy(bp, strerror(errno));
++#else
+ 	    if (errno < sys_nerr && errno > 0) {
+ 		strcpy(bp, sys_errlist[errno]);
+ 	    } else {
+ 		sprintf(bp, "Unknown error %d", errno);
+ 	    }
++#endif
+ 	    bp += strlen(bp);
+ 	    cp += 2;
+ 	} else {
+diff -Naur tcp_wrappers_7.6/rfc931.c tcp_wrappers_7.6.gimli/rfc931.c
+--- tcp_wrappers_7.6/rfc931.c	1995-01-02 09:11:34.000000000 -0600
++++ tcp_wrappers_7.6.gimli/rfc931.c	2002-01-07 08:50:19.000000000 -0600
+@@ -33,7 +33,7 @@
+ 
+ int     rfc931_timeout = RFC931_TIMEOUT;/* Global so it can be changed */
+ 
+-static jmp_buf timebuf;
++static sigjmp_buf timebuf;
+ 
+ /* fsocket - open stdio stream on top of socket */
+ 
+@@ -62,7 +62,7 @@
+ static void timeout(sig)
+ int     sig;
+ {
+-    longjmp(timebuf, sig);
++    siglongjmp(timebuf, sig);
+ }
+ 
+ /* rfc931 - return remote user name, given socket structures */
+@@ -99,7 +99,7 @@
+ 	 * Set up a timer so we won't get stuck while waiting for the server.
+ 	 */
+ 
+-	if (setjmp(timebuf) == 0) {
++	if (sigsetjmp(timebuf,1) == 0) {
+ 	    signal(SIGALRM, timeout);
+ 	    alarm(rfc931_timeout);
+ 
+diff -Naur tcp_wrappers_7.6/safe_finger.8 tcp_wrappers_7.6.gimli/safe_finger.8
+--- tcp_wrappers_7.6/safe_finger.8	1969-12-31 18:00:00.000000000 -0600
++++ tcp_wrappers_7.6.gimli/safe_finger.8	2002-01-07 08:50:19.000000000 -0600
+@@ -0,0 +1,34 @@
++.TH SAFE_FINGER 8 "21th June 1997" Linux "Linux Programmer's Manual"
++.SH NAME
++safe_finger \- finger client wrapper that protects against nasty stuff
++from finger servers
++.SH SYNOPSIS
++.B safe_finger [finger_options]
++.SH DESCRIPTION
++The
++.B safe_finger
++command protects against nasty stuff from finger servers. Use this
++program for automatic reverse finger probes from the
++.B tcp_wrapper
++.B (tcpd)
++, not the raw finger command. The
++.B safe_finger
++command makes sure that the finger client is not run with root
++privileges. It also runs the finger client with a defined PATH
++environment.
++.B safe_finger
++will also protect you from problems caused by the output of some
++finger servers. The problem: some programs may react to stuff in
++the first column. Other programs may get upset by thrash anywhere
++on a line. File systems may fill up as the finger server keeps
++sending data. Text editors may bomb out on extremely long lines.
++The finger server may take forever because it is somehow wedged.
++.B safe_finger
++takes care of all this badness.
++.SH SEE ALSO
++.BR hosts_access (5),
++.BR hosts_options (5),
++.BR tcpd (8)
++.SH AUTHOR
++Wietse Venema, Eindhoven University of Technology, The Netherlands.
++
+diff -Naur tcp_wrappers_7.6/safe_finger.c tcp_wrappers_7.6.gimli/safe_finger.c
+--- tcp_wrappers_7.6/safe_finger.c	1994-12-28 10:42:42.000000000 -0600
++++ tcp_wrappers_7.6.gimli/safe_finger.c	2002-01-07 08:50:19.000000000 -0600
+@@ -26,21 +26,24 @@
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <pwd.h>
++#include <syslog.h>
+ 
+ extern void exit();
+ 
+ /* Local stuff */
+ 
+-char    path[] = "PATH=/bin:/usr/bin:/usr/ucb:/usr/bsd:/etc:/usr/etc:/usr/sbin";
++char    path[] = "PATH=/bin:/usr/bin:/sbin:/usr/sbin";
+ 
+ #define	TIME_LIMIT	60		/* Do not keep listinging forever */
+ #define	INPUT_LENGTH	100000		/* Do not keep listinging forever */
+ #define	LINE_LENGTH	128		/* Editors can choke on long lines */
+ #define	FINGER_PROGRAM	"finger"	/* Most, if not all, UNIX systems */
+ #define	UNPRIV_NAME	"nobody"	/* Preferred privilege level */
+-#define	UNPRIV_UGID	32767		/* Default uid and gid */
++#define	UNPRIV_UGID	65534		/* Default uid and gid */
+ 
+ int     finger_pid;
++int	allow_severity = SEVERITY;
++int	deny_severity = LOG_WARNING;
+ 
+ void    cleanup(sig)
+ int     sig;
+diff -Naur tcp_wrappers_7.6/scaffold.c tcp_wrappers_7.6.gimli/scaffold.c
+--- tcp_wrappers_7.6/scaffold.c	1997-03-21 12:27:24.000000000 -0600
++++ tcp_wrappers_7.6.gimli/scaffold.c	2002-01-07 08:50:19.000000000 -0600
+@@ -180,10 +180,12 @@
+ 
+ /* ARGSUSED */
+ 
+-void    rfc931(request)
+-struct request_info *request;
++void    rfc931(rmt_sin, our_sin, dest)
++struct sockaddr_in *rmt_sin;
++struct sockaddr_in *our_sin;
++char   *dest;
+ {
+-    strcpy(request->user, unknown);
++    strcpy(dest, unknown);
+ }
+ 
+ /* check_path - examine accessibility */
+diff -Naur tcp_wrappers_7.6/socket.c tcp_wrappers_7.6.gimli/socket.c
+--- tcp_wrappers_7.6/socket.c	1997-03-21 12:27:25.000000000 -0600
++++ tcp_wrappers_7.6.gimli/socket.c	2002-01-07 08:50:19.000000000 -0600
+@@ -76,7 +76,11 @@
+ {
+     static struct sockaddr_in client;
+     static struct sockaddr_in server;
++#if !defined (__GLIBC__)
+     int     len;
++#else /* __GLIBC__ */
++    size_t  len;
++#endif /* __GLIBC__ */
+     char    buf[BUFSIZ];
+     int     fd = request->fd;
+ 
+@@ -224,7 +228,11 @@
+ {
+     char    buf[BUFSIZ];
+     struct sockaddr_in sin;
++#if !defined(__GLIBC__)
+     int     size = sizeof(sin);
++#else /* __GLIBC__ */
++    size_t  size = sizeof(sin);
++#endif /* __GLIBC__ */
+ 
+     /*
+      * Eat up the not-yet received datagram. Some systems insist on a
+diff -Naur tcp_wrappers_7.6/tcpd.8 tcp_wrappers_7.6.gimli/tcpd.8
+--- tcp_wrappers_7.6/tcpd.8	1996-02-21 09:39:16.000000000 -0600
++++ tcp_wrappers_7.6.gimli/tcpd.8	2002-01-07 08:50:19.000000000 -0600
+@@ -94,7 +94,7 @@
+ .PP
+ The example assumes that the network daemons live in /usr/etc. On some
+ systems, network daemons live in /usr/sbin or in /usr/libexec, or have
+-no `in.\' prefix to their name.
++no `in.' prefix to their name.
+ .SH EXAMPLE 2
+ This example applies when \fItcpd\fR expects that the network daemons
+ are left in their original place.
+@@ -110,26 +110,26 @@
+ becomes:
+ .sp
+ .ti +5
+-finger  stream  tcp  nowait  nobody  /some/where/tcpd     in.fingerd
++finger  stream  tcp  nowait  nobody  /usr/sbin/tcpd       in.fingerd
+ .sp
+ .fi
+ .PP
+ The example assumes that the network daemons live in /usr/etc. On some
+ systems, network daemons live in /usr/sbin or in /usr/libexec, the
+-daemons have no `in.\' prefix to their name, or there is no userid
++daemons have no `in.' prefix to their name, or there is no userid
+ field in the inetd configuration file.
+ .PP
+ Similar changes will be needed for the other services that are to be
+-covered by \fItcpd\fR.  Send a `kill -HUP\' to the \fIinetd\fR(8)
++covered by \fItcpd\fR.  Send a `kill -HUP' to the \fIinetd\fR(8)
+ process to make the changes effective. AIX users may also have to
+-execute the `inetimp\' command.
++execute the `inetimp' command.
+ .SH EXAMPLE 3
+ In the case of daemons that do not live in a common directory ("secret"
+ or otherwise), edit the \fIinetd\fR configuration file so that it
+ specifies an absolute path name for the process name field. For example:
+ .nf
+ .sp
+-    ntalk  dgram  udp  wait  root  /some/where/tcpd  /usr/local/lib/ntalkd
++    ntalk  dgram  udp  wait  root  /usr/sbin/tcpd  /usr/sbin/in.ntalkd
+ .sp
+ .fi
+ .PP
+diff -Naur tcp_wrappers_7.6/tcpd.h tcp_wrappers_7.6.gimli/tcpd.h
+--- tcp_wrappers_7.6/tcpd.h	1996-03-19 09:22:25.000000000 -0600
++++ tcp_wrappers_7.6.gimli/tcpd.h	2002-01-07 08:50:19.000000000 -0600
+@@ -4,6 +4,25 @@
+   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
+   */
+ 
++#ifndef _TCPWRAPPERS_TCPD_H
++#define _TCPWRAPPERS_TCPD_H
++
++/* someone else may have defined this */
++#undef  __P
++
++/* use prototypes if we have an ANSI C compiler or are using C++ */
++#if defined(__STDC__) || defined(__cplusplus)
++#define __P(args)       args
++#else
++#define __P(args)       ()
++#endif
++
++/* Need definitions of struct sockaddr_in and FILE. */
++#include <netinet/in.h>
++#include <stdio.h>
++
++__BEGIN_DECLS
++
+ /* Structure to describe one communications endpoint. */
+ 
+ #define STRING_LENGTH	128		/* hosts, users, processes */
+@@ -25,10 +44,10 @@
+     char    pid[10];			/* access via eval_pid(request) */
+     struct host_info client[1];		/* client endpoint info */
+     struct host_info server[1];		/* server endpoint info */
+-    void  (*sink) ();			/* datagram sink function or 0 */
+-    void  (*hostname) ();		/* address to printable hostname */
+-    void  (*hostaddr) ();		/* address to printable address */
+-    void  (*cleanup) ();		/* cleanup function or 0 */
++    void  (*sink) __P((int));		/* datagram sink function or 0 */
++    void  (*hostname) __P((struct host_info *)); /* address to printable hostname */
++    void  (*hostaddr) __P((struct host_info *)); /* address to printable address */
++    void  (*cleanup) __P((struct request_info *)); /* cleanup function or 0 */
+     struct netconfig *config;		/* netdir handle */
+ };
+ 
+@@ -61,25 +80,30 @@
+ /* Global functions. */
+ 
+ #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT)
+-extern void fromhost();			/* get/validate client host info */
++extern void fromhost __P((struct request_info *));	/* get/validate client host info */
+ #else
+ #define fromhost sock_host		/* no TLI support needed */
+ #endif
+ 
+-extern int hosts_access();		/* access control */
+-extern void shell_cmd();		/* execute shell command */
+-extern char *percent_x();		/* do %<char> expansion */
+-extern void rfc931();			/* client name from RFC 931 daemon */
+-extern void clean_exit();		/* clean up and exit */
+-extern void refuse();			/* clean up and exit */
+-extern char *xgets();			/* fgets() on steroids */
+-extern char *split_at();		/* strchr() and split */
+-extern unsigned long dot_quad_addr();	/* restricted inet_addr() */
++extern void shell_cmd __P((char *));	/* execute shell command */
++extern char *percent_x __P((char *, int, char *, struct request_info *)); /* do %<char> expansion */
++extern void rfc931 __P((struct sockaddr_in *, struct sockaddr_in *, char *)); /* client name from RFC 931 daemon */
++extern void clean_exit __P((struct request_info *)); /* clean up and exit */
++extern void refuse __P((struct request_info *));	/* clean up and exit */
++extern char *xgets __P((char *, int, FILE *));	/* fgets() on steroids */
++extern char *split_at __P((char *, int));	/* strchr() and split */
++extern unsigned long dot_quad_addr __P((char *)); /* restricted inet_addr() */
+ 
+ /* Global variables. */
+ 
++#ifdef HAVE_WEAKSYMS
++extern int allow_severity __attribute__ ((weak)); /* for connection logging */
++extern int deny_severity __attribute__ ((weak)); /* for connection logging */
++#else
+ extern int allow_severity;		/* for connection logging */
+ extern int deny_severity;		/* for connection logging */
++#endif
++
+ extern char *hosts_allow_table;		/* for verification mode redirection */
+ extern char *hosts_deny_table;		/* for verification mode redirection */
+ extern int hosts_access_verbose;	/* for verbose matching mode */
+@@ -92,9 +116,14 @@
+   */
+ 
+ #ifdef __STDC__
++extern int hosts_access(struct request_info *request);
++extern int hosts_ctl(char *daemon, char *client_name, char *client_addr, 
++                     char *client_user);
+ extern struct request_info *request_init(struct request_info *,...);
+ extern struct request_info *request_set(struct request_info *,...);
+ #else
++extern int hosts_access();
++extern int hosts_ctl();
+ extern struct request_info *request_init();	/* initialize request */
+ extern struct request_info *request_set();	/* update request structure */
+ #endif
+@@ -117,27 +146,31 @@
+   * host_info structures serve as caches for the lookup results.
+   */
+ 
+-extern char *eval_user();		/* client user */
+-extern char *eval_hostname();		/* printable hostname */
+-extern char *eval_hostaddr();		/* printable host address */
+-extern char *eval_hostinfo();		/* host name or address */
+-extern char *eval_client();		/* whatever is available */
+-extern char *eval_server();		/* whatever is available */
++extern char *eval_user __P((struct request_info *));	/* client user */
++extern char *eval_hostname __P((struct host_info *));	/* printable hostname */
++extern char *eval_hostaddr __P((struct host_info *));	/* printable host address */
++extern char *eval_hostinfo __P((struct host_info *));	/* host name or address */
++extern char *eval_client __P((struct request_info *));	/* whatever is available */
++extern char *eval_server __P((struct request_info *));	/* whatever is available */
+ #define eval_daemon(r)	((r)->daemon)	/* daemon process name */
+ #define eval_pid(r)	((r)->pid)	/* process id */
+ 
+ /* Socket-specific methods, including DNS hostname lookups. */
+ 
+-extern void sock_host();		/* look up endpoint addresses */
+-extern void sock_hostname();		/* translate address to hostname */
+-extern void sock_hostaddr();		/* address to printable address */
++/* look up endpoint addresses */
++extern void sock_host __P((struct request_info *));
++/* translate address to hostname */
++extern void sock_hostname __P((struct host_info *));
++/* address to printable address */
++extern void sock_hostaddr __P((struct host_info *));
++
+ #define sock_methods(r) \
+ 	{ (r)->hostname = sock_hostname; (r)->hostaddr = sock_hostaddr; }
+ 
+ /* The System V Transport-Level Interface (TLI) interface. */
+ 
+ #if defined(TLI) || defined(PTX) || defined(TLI_SEQUENT)
+-extern void tli_host();			/* look up endpoint addresses etc. */
++extern void tli_host __P((struct request_info *));	/* look up endpoint addresses etc. */
+ #endif
+ 
+  /*
+@@ -178,7 +211,7 @@
+   * behavior.
+   */
+ 
+-extern void process_options();		/* execute options */
++extern void process_options __P((char *, struct request_info *)); /* execute options */
+ extern int dry_run;			/* verification flag */
+ 
+ /* Bug workarounds. */
+@@ -217,3 +250,7 @@
+ #define strtok	my_strtok
+ extern char *my_strtok();
+ #endif
++
++__END_DECLS
++
++#endif /* tcpd.h */
+diff -Naur tcp_wrappers_7.6/tcpdchk.c tcp_wrappers_7.6.gimli/tcpdchk.c
+--- tcp_wrappers_7.6/tcpdchk.c	1997-02-11 19:13:25.000000000 -0600
++++ tcp_wrappers_7.6.gimli/tcpdchk.c	2002-01-07 08:50:19.000000000 -0600
+@@ -350,6 +350,8 @@
+ {
+     if (pat[0] == '@') {
+ 	tcpd_warn("%s: daemon name begins with \"@\"", pat);
++    } else if (pat[0] == '/') {
++        tcpd_warn("%s: daemon name begins with \"/\"", pat);
+     } else if (pat[0] == '.') {
+ 	tcpd_warn("%s: daemon name begins with dot", pat);
+     } else if (pat[strlen(pat) - 1] == '.') {
+@@ -382,6 +384,8 @@
+ {
+     if (pat[0] == '@') {			/* @netgroup */
+ 	tcpd_warn("%s: user name begins with \"@\"", pat);
++    } else if (pat[0] == '/') {
++        tcpd_warn("%s: user name begins with \"/\"", pat);
+     } else if (pat[0] == '.') {
+ 	tcpd_warn("%s: user name begins with dot", pat);
+     } else if (pat[strlen(pat) - 1] == '.') {
+@@ -402,8 +406,13 @@
+ static int check_host(pat)
+ char   *pat;
+ {
++    char    buf[BUFSIZ];
+     char   *mask;
+     int     addr_count = 1;
++    FILE   *fp;
++    struct tcpd_context saved_context;
++    char   *cp;
++    char   *wsp = " \t\r\n";
+ 
+     if (pat[0] == '@') {			/* @netgroup */
+ #ifdef NO_NETGRENT
+@@ -422,6 +431,21 @@
+ 	tcpd_warn("netgroup support disabled");
+ #endif
+ #endif
++    } else if (pat[0] == '/') {                 /* /path/name */
++        if ((fp = fopen(pat, "r")) != 0) {
++            saved_context = tcpd_context;
++            tcpd_context.file = pat;
++            tcpd_context.line = 0;
++            while (fgets(buf, sizeof(buf), fp)) {
++                tcpd_context.line++;
++                for (cp = strtok(buf, wsp); cp; cp = strtok((char *) 0, wsp))
++                    check_host(cp);
++            }
++            tcpd_context = saved_context;
++            fclose(fp);
++        } else if (errno != ENOENT) {
++            tcpd_warn("open %s: %m", pat);
++        }
+     } else if (mask = split_at(pat, '/')) {	/* network/netmask */
+ 	if (dot_quad_addr(pat) == INADDR_NONE
+ 	    || dot_quad_addr(mask) == INADDR_NONE)
+diff -Naur tcp_wrappers_7.6/try-from.8 tcp_wrappers_7.6.gimli/try-from.8
+--- tcp_wrappers_7.6/try-from.8	1969-12-31 18:00:00.000000000 -0600
++++ tcp_wrappers_7.6.gimli/try-from.8	2002-01-07 08:50:19.000000000 -0600
+@@ -0,0 +1,28 @@
++.TH TRY-FROM 8 "21th June 1997" Linux "Linux Programmer's Manual"
++.SH NAME
++try-from \- test program for the tcp_wrapper
++.SH SYNOPSIS
++.B try-from
++.SH DESCRIPTION
++The
++.B try-from
++command can be called via a remote shell command to find out
++if the hostname and address are properly recognized
++by the
++.B tcp_wrapper
++library, if username lookup works, and (SysV only) if the TLI
++on top of IP heuristics work. Diagnostics are reported through
++.BR syslog (3)
++and redirected to stderr.
++
++Example:
++
++rsh host /some/where/try-from
++
++.SH SEE ALSO
++.BR hosts_access (5),
++.BR hosts_options (5),
++.BR tcpd (8)
++.SH AUTHOR
++Wietse Venema, Eindhoven University of Technology, The Netherlands.
++
+diff -Naur tcp_wrappers_7.6/weak_symbols.c tcp_wrappers_7.6.gimli/weak_symbols.c
+--- tcp_wrappers_7.6/weak_symbols.c	1969-12-31 18:00:00.000000000 -0600
++++ tcp_wrappers_7.6.gimli/weak_symbols.c	2002-01-07 08:50:19.000000000 -0600
+@@ -0,0 +1,11 @@
++ /*
++  * @(#) weak_symbols.h 1.5 99/12/29 23:50
++  * 
++  * Author: Anthony Towns <ajt@debian.org>
++  */
++
++#ifdef HAVE_WEAKSYMS
++#include <syslog.h>
++int deny_severity = LOG_WARNING;
++int allow_severity = SEVERITY; 
++#endif
+diff -Naur tcp_wrappers_7.6/workarounds.c tcp_wrappers_7.6.gimli/workarounds.c
+--- tcp_wrappers_7.6/workarounds.c	1996-03-19 09:22:26.000000000 -0600
++++ tcp_wrappers_7.6.gimli/workarounds.c	2002-01-07 08:50:19.000000000 -0600
+@@ -163,7 +163,11 @@
+ int     fix_getpeername(sock, sa, len)
+ int     sock;
+ struct sockaddr *sa;
++#if !defined(__GLIBC__)
+ int    *len;
++#else /* __GLIBC__ */
++size_t *len;
++#endif /* __GLIBC__ */
+ {
+     int     ret;
+     struct sockaddr_in *sin = (struct sockaddr_in *) sa;
Index: tches/texinfo-4.11-mbstate_fix-1.patch
===================================================================
--- patches/texinfo-4.11-mbstate_fix-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,18 +1,0 @@
-Submitted By: Jim Gifford (patches at jg555 dot com)
-Date: 2007-10-03
-Initial Package Version: 4.11
-Origin: T2-Project
-Upstream Status: Unknown
-Description: Fixes undeclared mbstate
- 
-diff -Naur texinfo-4.11.orig/gnulib/lib/wchar_.h texinfo-4.11/gnulib/lib/wchar_.h
---- texinfo-4.11.orig/gnulib/lib/wchar_.h	2007-07-08 08:14:45.000000000 +0000
-+++ texinfo-4.11/gnulib/lib/wchar_.h	2007-10-03 15:31:39.000000000 +0000
-@@ -40,6 +40,7 @@
-    Some builds of uClibc lack it.  */
- /* The include_next requires a split double-inclusion guard.  */
- #if @HAVE_WCHAR_H@
-+# undef __need_mbstate_t
- # @INCLUDE_NEXT@ @NEXT_WCHAR_H@
- #endif
- 
Index: patches/udev-027-permissions-1.patch
===================================================================
--- patches/udev-027-permissions-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/udev-027-permissions-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,126 @@
+Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
+Date: 2004-06-21
+Initial Package Version: 027
+Origin: Jim Gifford and Zack Winkles
+Upstream Status: N/A
+Description: Reverts tweak node unlink handling
+ 	http://linuxusb.bkbits.net:8080/udev/cset@1.759?nav=index.html|tags|ChangeSet@..1.7601
+
+	Symptons of problem: When cron executes a bash script, /dev/null changes from the
+	permissions lists in udev.rules to 600. This patch seems to correct the issue,
+	I am submitting it as a temporary fix util a better fix can be found.
+
+diff -Naur udev-027.orig/udev-add.c udev-027/udev-add.c
+--- udev-027.orig/udev-add.c	2004-06-14 16:38:35.000000000 -0400
++++ udev-027/udev-add.c	2004-06-21 12:44:15.422138488 -0400
+@@ -105,46 +105,29 @@
+ 	return 0;
+ }
+ 
+-static int make_node(char *file, int major, int minor, unsigned int mode, uid_t uid, gid_t gid)
++static int make_node(char *filename, int major, int minor, unsigned int mode, uid_t uid, gid_t gid)
+ {
+-	struct stat stats;
+-	int retval = 0;
+-
+-	if (stat(file, &stats) != 0)
+-		goto create;
+-
+-	/* preserve node with already correct numbers, to not change the inode number */
+-	if (((stats.st_mode & S_IFMT) == S_IFBLK || (stats.st_mode & S_IFMT) == S_IFCHR) &&
+-	    (stats.st_rdev == makedev(major, minor))) {
+-		dbg("preserve file '%s', cause it has correct dev_t", file);
+-		goto perms;
+-	}
+-
+-	if (unlink(file) != 0)
+-		dbg("unlink(%s) failed with error '%s'", file, strerror(errno));
+-	else
+-		dbg("already present file '%s' unlinked", file);
++	int retval;
+ 
+-create:
+-	retval = mknod(file, mode, makedev(major, minor));
++	retval = mknod(filename, mode, makedev(major, minor));
+ 	if (retval != 0) {
+ 		dbg("mknod(%s, %#o, %u, %u) failed with error '%s'",
+-		    file, mode, major, minor, strerror(errno));
++		    filename, mode, major, minor, strerror(errno));
+ 		goto exit;
+ 	}
+ 
+-perms:
+-	dbg("chmod(%s, %#o)", file, mode);
+-	if (chmod(file, mode) != 0) {
+-		dbg("chmod(%s, %#o) failed with error '%s'", file, mode, strerror(errno));
++	dbg("chmod(%s, %#o)", filename, mode);
++	if (chmod(filename, mode) != 0) {
++		dbg("chmod(%s, %#o) failed with error '%s'",
++		    filename, mode, strerror(errno));
+ 		goto exit;
+ 	}
+ 
+ 	if (uid != 0 || gid != 0) {
+-		dbg("chown(%s, %u, %u)", file, uid, gid);
+-		if (chown(file, uid, gid) != 0) {
++		dbg("chown(%s, %u, %u)", filename, uid, gid);
++		if (chown(filename, uid, gid) != 0) {
+ 			dbg("chown(%s, %u, %u) failed with error '%s'",
+-			    file, uid, gid, strerror(errno));
++			    filename, uid, gid, strerror(errno));
+ 			goto exit;
+ 		}
+ 	}
+@@ -184,6 +167,23 @@
+ 	endutent();
+ }
+ 
++static int unlink_entry(char *filename)
++{
++	struct stat stats;
++	int retval = 0;
++	
++	if (lstat(filename, &stats) == 0) {
++		if ((stats.st_mode & S_IFMT) != S_IFDIR) {
++			retval = unlink(filename);
++			if (retval) {
++				dbg("unlink(%s) failed with error '%s'",
++				    filename, strerror(errno));
++			}
++		}
++	}
++	return retval;
++}
++
+ static int create_node(struct udevice *dev, int fake)
+ {
+ 	char filename[NAME_SIZE];
+@@ -253,6 +253,7 @@
+ 	}
+ 
+ 	if (!fake) {
++		unlink_entry(filename);
+ 		info("creating device node '%s'", filename);
+ 		if (make_node(filename, dev->major, dev->minor, dev->mode, uid, gid) != 0)
+ 			goto error;
+@@ -269,6 +270,7 @@
+ 			for (i = 1; i <= dev->partitions; i++) {
+ 				strfieldcpy(partitionname, filename);
+ 				strintcat(partitionname, i);
++				unlink_entry(partitionname);
+ 				make_node(partitionname, dev->major,
+ 					  dev->minor + i, dev->mode, uid, gid);
+ 			}
+@@ -302,9 +304,11 @@
+ 
+ 		strfieldcat(linktarget, &dev->name[tail]);
+ 
++		if (!fake)
++			unlink_entry(filename);
++
+ 		dbg("symlink(%s, %s)", linktarget, filename);
+ 		if (!fake) {
+-			unlink(filename);
+ 			if (symlink(linktarget, filename) != 0)
+ 				dbg("symlink(%s, %s) failed with error '%s'",
+ 				    linktarget, filename, strerror(errno));
Index: tches/udev-124-lib64-2.patch
===================================================================
--- patches/udev-124-lib64-2.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,251 +1,0 @@
-Submitted By: Jim Gifford <jim@linuxfromscratch.org>
-Date: 2008-07-07
-Upstream Status: CLFS Specific
-Origin: Jim Gifford
-Description: Change /lib/udev to /lib64/udev
-
-diff -Naur udev-124.orig/etc/udev/rules.d/50-udev-default.rules udev-124/etc/udev/rules.d/50-udev-default.rules
---- udev-124.orig/etc/udev/rules.d/50-udev-default.rules	2008-06-12 01:24:30.000000000 -0400
-+++ udev-124/etc/udev/rules.d/50-udev-default.rules	2008-07-07 20:29:35.000000000 -0400
-@@ -103,5 +103,5 @@
- KERNEL=="iowarrior[0-9]*",	NAME="usb/%k"
- 
- # do not delete static device nodes
--ACTION=="remove", NAME=="?*", TEST=="/lib/udev/devices/$name", OPTIONS+="ignore_remove"
-+ACTION=="remove", NAME=="?*", TEST=="/lib64/udev/devices/$name", OPTIONS+="ignore_remove"
- 
-diff -Naur udev-124.orig/extras/ata_id/Makefile udev-124/extras/ata_id/Makefile
---- udev-124.orig/extras/ata_id/Makefile	2008-06-12 01:24:30.000000000 -0400
-+++ udev-124/extras/ata_id/Makefile	2008-07-07 20:29:35.000000000 -0400
-@@ -16,7 +16,7 @@
- sbindir =	${prefix}/sbin
- usrbindir =	${prefix}/usr/bin
- usrsbindir =	${prefix}/usr/sbin
--libudevdir =	${prefix}/lib/udev
-+libudevdir =	${prefix}/lib64/udev
- mandir =	${prefix}/usr/share/man
- configdir =	${etcdir}/udev/
- 
-diff -Naur udev-124.orig/extras/cdrom_id/Makefile udev-124/extras/cdrom_id/Makefile
---- udev-124.orig/extras/cdrom_id/Makefile	2008-06-12 01:24:30.000000000 -0400
-+++ udev-124/extras/cdrom_id/Makefile	2008-07-07 20:29:35.000000000 -0400
-@@ -16,7 +16,7 @@
- sbindir =	${prefix}/sbin
- usrbindir =	${prefix}/usr/bin
- usrsbindir =	${prefix}/usr/sbin
--libudevdir =	${prefix}/lib/udev
-+libudevdir =	${prefix}/lib64/udev
- mandir =	${prefix}/usr/share/man
- configdir =	${etcdir}/udev
- 
-diff -Naur udev-124.orig/extras/collect/Makefile udev-124/extras/collect/Makefile
---- udev-124.orig/extras/collect/Makefile	2008-06-12 01:24:30.000000000 -0400
-+++ udev-124/extras/collect/Makefile	2008-07-07 20:29:35.000000000 -0400
-@@ -11,7 +11,7 @@
- sbindir =	${prefix}/sbin
- usrbindir =	${prefix}/usr/bin
- usrsbindir =	${prefix}/usr/sbin
--libudevdir =	${prefix}/lib/udev
-+libudevdir =	${prefix}/lib64/udev
- mandir =	${prefix}/usr/share/man
- configdir =	${etcdir}/udev/
- 
-diff -Naur udev-124.orig/extras/edd_id/Makefile udev-124/extras/edd_id/Makefile
---- udev-124.orig/extras/edd_id/Makefile	2008-06-12 01:24:30.000000000 -0400
-+++ udev-124/extras/edd_id/Makefile	2008-07-07 20:29:35.000000000 -0400
-@@ -16,7 +16,7 @@
- sbindir =	${prefix}/sbin
- usrbindir =	${prefix}/usr/bin
- usrsbindir =	${prefix}/usr/sbin
--libudevdir =	${prefix}/lib/udev
-+libudevdir =	${prefix}/lib64/udev
- mandir =	${prefix}/usr/share/man
- configdir =	${etcdir}/udev/
- 
-diff -Naur udev-124.orig/extras/firmware/firmware.sh udev-124/extras/firmware/firmware.sh
---- udev-124.orig/extras/firmware/firmware.sh	2008-06-12 01:24:30.000000000 -0400
-+++ udev-124/extras/firmware/firmware.sh	2008-07-07 20:29:35.000000000 -0400
-@@ -1,6 +1,6 @@
- #!/bin/sh -e
- 
--FIRMWARE_DIRS="/lib/firmware /usr/local/lib/firmware"
-+FIRMWARE_DIRS="/lib64/firmware /lib/firmware /usr/local/lib64/firmware /usr/local/lib/firmware"
- 
- err() {
- 	echo "$@" >&2
-diff -Naur udev-124.orig/extras/firmware/Makefile udev-124/extras/firmware/Makefile
---- udev-124.orig/extras/firmware/Makefile	2008-06-12 01:24:30.000000000 -0400
-+++ udev-124/extras/firmware/Makefile	2008-07-07 20:29:35.000000000 -0400
-@@ -13,7 +13,7 @@
- sbindir =	${prefix}/sbin
- usrbindir =	${prefix}/usr/bin
- usrsbindir =	${prefix}/usr/sbin
--libudevdir =	${prefix}/lib/udev
-+libudevdir =	${prefix}/lib64/udev
- mandir =	${prefix}/usr/share/man
- configdir =	${etcdir}/udev/
- 
-diff -Naur udev-124.orig/extras/floppy/Makefile udev-124/extras/floppy/Makefile
---- udev-124.orig/extras/floppy/Makefile	2008-06-12 01:24:30.000000000 -0400
-+++ udev-124/extras/floppy/Makefile	2008-07-07 20:29:35.000000000 -0400
-@@ -16,7 +16,7 @@
- sbindir =	${prefix}/sbin
- usrbindir =	${prefix}/usr/bin
- usrsbindir =	${prefix}/usr/sbin
--libudevdir =	${prefix}/lib/udev
-+libudevdir =	${prefix}/lib64/udev
- mandir =	${prefix}/usr/share/man
- configdir =	${etcdir}/udev/
- 
-diff -Naur udev-124.orig/extras/fstab_import/Makefile udev-124/extras/fstab_import/Makefile
---- udev-124.orig/extras/fstab_import/Makefile	2008-06-12 01:24:30.000000000 -0400
-+++ udev-124/extras/fstab_import/Makefile	2008-07-07 20:29:35.000000000 -0400
-@@ -16,7 +16,7 @@
- sbindir =	${prefix}/sbin
- usrbindir =	${prefix}/usr/bin
- usrsbindir =	${prefix}/usr/sbin
--libudevdir =	${prefix}/lib/udev
-+libudevdir =	${prefix}/lib64/udev
- mandir =	${prefix}/usr/share/man
- configdir =	${etcdir}/udev/
- 
-diff -Naur udev-124.orig/extras/path_id/Makefile udev-124/extras/path_id/Makefile
---- udev-124.orig/extras/path_id/Makefile	2008-06-12 01:24:30.000000000 -0400
-+++ udev-124/extras/path_id/Makefile	2008-07-07 20:29:35.000000000 -0400
-@@ -13,7 +13,7 @@
- sbindir =	${prefix}/sbin
- usrbindir =	${prefix}/usr/bin
- usrsbindir =	${prefix}/usr/sbin
--libudevdir =	${prefix}/lib/udev
-+libudevdir =	${prefix}/lib64/udev
- mandir =	${prefix}/usr/share/man
- configdir =	${etcdir}/udev/
- 
-diff -Naur udev-124.orig/extras/rule_generator/Makefile udev-124/extras/rule_generator/Makefile
---- udev-124.orig/extras/rule_generator/Makefile	2008-06-12 01:24:30.000000000 -0400
-+++ udev-124/extras/rule_generator/Makefile	2008-07-07 20:29:35.000000000 -0400
-@@ -13,7 +13,7 @@
- sbindir =	${prefix}/sbin
- usrbindir =	${prefix}/usr/bin
- usrsbindir =	${prefix}/usr/sbin
--libudevdir =	${prefix}/lib/udev
-+libudevdir =	${prefix}/lib64/udev
- mandir =	${prefix}/usr/share/man
- configdir =	${etcdir}/udev
- 
-diff -Naur udev-124.orig/extras/rule_generator/write_cd_rules udev-124/extras/rule_generator/write_cd_rules
---- udev-124.orig/extras/rule_generator/write_cd_rules	2008-06-12 01:24:30.000000000 -0400
-+++ udev-124/extras/rule_generator/write_cd_rules	2008-07-07 20:29:35.000000000 -0400
-@@ -13,7 +13,7 @@
- 
- RULES_FILE="/etc/udev/rules.d/70-persistent-cd.rules"
- 
--. /lib/udev/rule_generator.functions
-+. /lib64/udev/rule_generator.functions
- 
- find_next_available() {
- 	raw_find_next_available "$(find_all_rules 'SYMLINK+=' "$1")"
-diff -Naur udev-124.orig/extras/rule_generator/write_net_rules udev-124/extras/rule_generator/write_net_rules
---- udev-124.orig/extras/rule_generator/write_net_rules	2008-06-12 01:24:30.000000000 -0400
-+++ udev-124/extras/rule_generator/write_net_rules	2008-07-07 20:29:35.000000000 -0400
-@@ -24,7 +24,7 @@
- 
- RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules'
- 
--. /lib/udev/rule_generator.functions
-+. /lib64/udev/rule_generator.functions
- 
- interface_name_taken() {
- 	local value="$(find_all_rules 'NAME=' $INTERFACE)"
-diff -Naur udev-124.orig/extras/scsi_id/Makefile udev-124/extras/scsi_id/Makefile
---- udev-124.orig/extras/scsi_id/Makefile	2008-06-12 01:24:30.000000000 -0400
-+++ udev-124/extras/scsi_id/Makefile	2008-07-07 20:29:35.000000000 -0400
-@@ -19,7 +19,7 @@
- sbindir =	${prefix}/sbin
- usrbindir =	${prefix}/usr/bin
- usrsbindir =	${prefix}/usr/sbin
--libudevdir =	${prefix}/lib/udev
-+libudevdir =	${prefix}/lib64/udev
- mandir =	${prefix}/usr/share/man
- configdir =	${etcdir}/udev/
- 
-diff -Naur udev-124.orig/extras/usb_id/Makefile udev-124/extras/usb_id/Makefile
---- udev-124.orig/extras/usb_id/Makefile	2008-06-12 01:24:30.000000000 -0400
-+++ udev-124/extras/usb_id/Makefile	2008-07-07 20:29:35.000000000 -0400
-@@ -16,7 +16,7 @@
- sbindir =	${prefix}/sbin
- usrbindir =	${prefix}/usr/bin
- usrsbindir =	${prefix}/usr/sbin
--libudevdir =	${prefix}/lib/udev
-+libudevdir =	${prefix}/lib64/udev
- mandir =	${prefix}/usr/share/man
- configdir =	${etcdir}/udev/
- 
-diff -Naur udev-124.orig/extras/volume_id/lib/Makefile udev-124/extras/volume_id/lib/Makefile
---- udev-124.orig/extras/volume_id/lib/Makefile	2008-06-12 01:24:30.000000000 -0400
-+++ udev-124/extras/volume_id/lib/Makefile	2008-07-07 20:31:21.000000000 -0400
-@@ -5,8 +5,8 @@
- # Released under the GNU General Public License, version 2.
- #
- includedir = 	${prefix}/usr/include
--libdir =	${prefix}/lib
--usrlibdir =	${prefix}/usr/lib
-+libdir =	${prefix}/lib64
-+usrlibdir =	${prefix}/usr/lib64
- 
- INSTALL = install -c
- INSTALL_DATA  = ${INSTALL} -m 644
-diff -Naur udev-124.orig/extras/volume_id/Makefile udev-124/extras/volume_id/Makefile
---- udev-124.orig/extras/volume_id/Makefile	2008-06-12 01:24:30.000000000 -0400
-+++ udev-124/extras/volume_id/Makefile	2008-07-07 20:29:35.000000000 -0400
-@@ -14,7 +14,7 @@
- sbindir =	${prefix}/sbin
- usrbindir =	${prefix}/usr/bin
- usrsbindir =	${prefix}/usr/sbin
--libudevdir =	${prefix}/lib/udev
-+libudevdir =	${prefix}/lib64/udev
- mandir =	${prefix}/usr/share/man
- configdir =	${etcdir}/udev/
- 
-diff -Naur udev-124.orig/Makefile udev-124/Makefile
---- udev-124.orig/Makefile	2008-06-12 01:24:30.000000000 -0400
-+++ udev-124/Makefile	2008-07-07 20:29:35.000000000 -0400
-@@ -88,7 +88,7 @@
- etcdir =	${prefix}/etc
- sbindir =	${prefix}/sbin
- usrbindir =	${prefix}/usr/bin
--libudevdir =	${prefix}/lib/udev
-+libudevdir =	${prefix}/lib64/udev
- mandir =	${prefix}/usr/share/man
- configdir =	${etcdir}/udev
- udevdir =	/dev
-diff -Naur udev-124.orig/udev_rules.c udev-124/udev_rules.c
---- udev-124.orig/udev_rules.c	2008-06-12 01:24:30.000000000 -0400
-+++ udev-124/udev_rules.c	2008-07-07 20:29:35.000000000 -0400
-@@ -172,9 +172,9 @@
- 		}
- 	}
- 
--	/* allow programs in /lib/udev called without the path */
-+	/* allow programs in /lib64/udev called without the path */
- 	if (strchr(argv[0], '/') == NULL) {
--		strlcpy(program, "/lib/udev/", sizeof(program));
-+		strlcpy(program, "/lib64/udev/", sizeof(program));
- 		strlcat(program, argv[0], sizeof(program));
- 		argv[0] = program;
- 	}
-diff -Naur udev-124.orig/udev_rules_parse.c udev-124/udev_rules_parse.c
---- udev-124.orig/udev_rules_parse.c	2008-06-12 01:24:30.000000000 -0400
-+++ udev-124/udev_rules_parse.c	2008-07-07 20:29:35.000000000 -0400
-@@ -447,9 +447,9 @@
- 				if (pos)
- 					pos[0] = '\0';
- 
--				/* allow programs in /lib/udev called without the path */
-+				/* allow programs in /lib64/udev called without the path */
- 				if (strchr(file, '/') == NULL) {
--					strlcpy(file, "/lib/udev/", sizeof(file));
-+					strlcpy(file, "/lib64/udev/", sizeof(file));
- 					strlcat(file, value, sizeof(file));
- 					pos = strchr(file, ' ');
- 					if (pos)
Index: patches/util-linux-2.12a-cross-lfs-fixes.patch
===================================================================
--- patches/util-linux-2.12a-cross-lfs-fixes.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/util-linux-2.12a-cross-lfs-fixes.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,22 @@
+diff -aur util-linux-2.12a-orig util-linux-2.12a
+--- util-linux-2.12a-orig/fdisk/fdiskbsdlabel.h	2002-11-01 00:45:34.000000000 +1100
++++ util-linux-2.12a/fdisk/fdiskbsdlabel.h	2004-06-19 14:43:31.771051000 +1000
+@@ -43,7 +43,7 @@
+ 
+ #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec"
+ 
+-#if defined (i386) || defined (__sparc__) || defined (__arm__) || defined (__mips__) || defined (__s390__) || defined (__sh__) || defined(__x86_64__)
++#if defined (i386) || defined (__sparc__) || defined (__arm__) || defined (__mips__) || defined (__s390__) || defined (__sh__) || defined(__x86_64__) || defined (__mc68000__)
+ #define BSD_LABELSECTOR   1
+ #define BSD_LABELOFFSET   0
+ #elif defined (__alpha__) || defined (__powerpc__) || defined (__ia64__) || defined (__hppa__)
+--- util-linux-2.12a-orig/mount/swapon.c	2002-11-01 11:38:49.000000000 +1100
++++ util-linux-2.12a/mount/swapon.c	2004-06-19 14:31:52.020342000 +1000
+@@ -21,6 +21,7 @@
+ #include <mntent.h>
+ #include <errno.h>
+ #include <sys/stat.h>
++#include <unistd.h>
+ #include "swap_constants.h"
+ #include "swapargs.h"
+ #include "nls.h"
Index: patches/util-linux-2.12a-kernel_headers-1.patch
===================================================================
--- patches/util-linux-2.12a-kernel_headers-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/util-linux-2.12a-kernel_headers-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,93 @@
+Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
+Date: 2004-01-30
+Initial Package Version: 2.12
+Origin: Gentoo
+Description: Fixes Compile Issues with the 2.6 Kernel
+ 
+diff -Naur util-linux-2.12.orig/disk-utils/blockdev.c util-linux-2.12/disk-utils/blockdev.c
+--- util-linux-2.12.orig/disk-utils/blockdev.c	2002-03-08 22:57:02.000000000 +0000
++++ util-linux-2.12/disk-utils/blockdev.c	2004-01-30 19:49:39.000000000 +0000
+@@ -9,6 +9,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/ioctl.h>
++#include <linux/version.h>
+ 
+ #include "nls.h"
+ 
+@@ -24,8 +25,13 @@
+ #define BLKRASET   _IO(0x12,98)
+ #define BLKRAGET   _IO(0x12,99)
+ #define BLKSSZGET  _IO(0x12,104)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
+ #define BLKBSZGET  _IOR(0x12,112,sizeof(int))
+ #define BLKBSZSET  _IOW(0x12,113,sizeof(int))
++#else
++#define BLKBSZGET  _IOR(0x12,112,int)
++#define BLKBSZSET  _IOW(0x12,113,int)
++#endif
+ #endif
+ 
+ /* Maybe <linux/hdreg.h> could be included */
+diff -Naur util-linux-2.12.orig/disk-utils/elvtune.c util-linux-2.12/disk-utils/elvtune.c
+--- util-linux-2.12.orig/disk-utils/elvtune.c	2002-03-08 22:57:49.000000000 +0000
++++ util-linux-2.12/disk-utils/elvtune.c	2004-01-30 19:49:39.000000000 +0000
+@@ -26,6 +26,8 @@
+ #include <sys/ioctl.h>
+ #include <unistd.h>
+ #include <stdlib.h>
++#include <linux/version.h>
++
+ #include "nls.h"
+ 
+ /* this has to match with the kernel structure */
+@@ -37,8 +39,13 @@
+ 	int max_bomb_segments;
+ } blkelv_ioctl_arg_t;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
+ #define BLKELVGET   _IOR(0x12,106,sizeof(blkelv_ioctl_arg_t))
+ #define BLKELVSET   _IOW(0x12,107,sizeof(blkelv_ioctl_arg_t))
++#else
++#define BLKELVGET   _IOR(0x12,106,blkelv_ioctl_arg_t)
++#define BLKELVSET   _IOW(0x12,107,blkelv_ioctl_arg_t)
++#endif
+ 
+ static void
+ usage(void) {
+diff -Naur util-linux-2.12.orig/fdisk/common.h util-linux-2.12/fdisk/common.h
+--- util-linux-2.12.orig/fdisk/common.h	2003-07-13 13:59:53.000000000 +0000
++++ util-linux-2.12/fdisk/common.h	2004-01-30 19:49:39.000000000 +0000
+@@ -2,11 +2,18 @@
+ 
+ /* including <linux/fs.h> fails */
+ #include <sys/ioctl.h>
++#include <linux/version.h>
++
+ #define BLKRRPART    _IO(0x12,95)    /* re-read partition table */
+ #define BLKGETSIZE   _IO(0x12,96)    /* return device size */
+ #define BLKFLSBUF    _IO(0x12,97)    /* flush buffer cache */
+ #define BLKSSZGET    _IO(0x12,104)   /* get block device sector size */
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
+ #define BLKGETSIZE64 _IOR(0x12,114,8)	/* 8 = sizeof(u64) */
++#else
++#define BLKGETSIZE64 _IOR(0x12,114,unsigned long long)
++#endif
+ 
+ /* including <linux/hdreg.h> also fails */
+ struct hd_geometry {
+diff -Naur util-linux-2.12.orig/mount/my_dev_t.h util-linux-2.12/mount/my_dev_t.h
+--- util-linux-2.12.orig/mount/my_dev_t.h	2003-07-16 20:05:50.000000000 +0000
++++ util-linux-2.12/mount/my_dev_t.h	2004-01-30 19:49:39.000000000 +0000
+@@ -4,4 +4,10 @@
+ /* for ancient systems use "unsigned short" */
+ 
+ #include <linux/posix_types.h>
++#include <linux/version.h>
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
+ #define my_dev_t __kernel_dev_t
++#else
++#define my_dev_t int
++#endif
Index: patches/util-linux-2.12n-cross-lfs-fixes.patch
===================================================================
--- patches/util-linux-2.12n-cross-lfs-fixes.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/util-linux-2.12n-cross-lfs-fixes.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,12 @@
+diff -aur util-linux-2.12a-orig util-linux-2.12a
+--- util-linux-2.12a-orig/fdisk/fdiskbsdlabel.h	2002-11-01 00:45:34.000000000 +1100
++++ util-linux-2.12a/fdisk/fdiskbsdlabel.h	2004-06-19 14:43:31.771051000 +1000
+@@ -43,7 +43,7 @@
+ 
+ #define BSD_LINUX_BOOTDIR "/usr/ucb/mdec"
+ 
+-#if defined (i386) || defined (__sparc__) || defined (__arm__) || defined (__mips__) || defined (__s390__) || defined (__sh__) || defined(__x86_64__)
++#if defined (i386) || defined (__sparc__) || defined (__arm__) || defined (__mips__) || defined (__s390__) || defined (__sh__) || defined(__x86_64__) || defined (__mc68000__)
+ #define BSD_LABELSECTOR   1
+ #define BSD_LABELOFFSET   0
+ #elif defined (__alpha__) || defined (__powerpc__) || defined (__ia64__) || defined (__hppa__)
Index: patches/util-linux-2.12q-cramfs-1.patch
===================================================================
--- patches/util-linux-2.12q-cramfs-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/util-linux-2.12q-cramfs-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,93 @@
+Submitted by: Jeremy Utley <jeremy@linuxfromscratch.org>
+Date: 2004-12-25
+Initial Package Version: 2.12p (should apply to versions back to at least k)
+Upstream Status: Not Submitted - Test Version
+Origin: Alexander Patrakov, adapted from debian build of cramfs utilities
+Description: Util-Linux fails in cramfs compilation due to changes in the
+linux-libc-headers package 2.6.9 and after.  This patch is a proper fix to the
+problem, but may in fact not be accepted upstream.
+
+
+diff -Naur util-linux-2.12p/disk-utils/fsck.cramfs.c util-linux-2.12p-new/disk-utils/fsck.cramfs.c
+--- util-linux-2.12p/disk-utils/fsck.cramfs.c	2004-12-11 14:53:16.000000000 +0000
++++ util-linux-2.12p-new/disk-utils/fsck.cramfs.c	2004-12-26 00:53:10.665199086 +0000
+@@ -76,16 +76,7 @@
+ 
+ #define PAD_SIZE 512
+ 
+-#include <asm/page.h>
+-#ifdef PAGE_SIZE
+-#define PAGE_CACHE_SIZE ((int) PAGE_SIZE)
+-#elif defined __ia64__
+-#define PAGE_CACHE_SIZE (16384)
+-#elif defined __alpha__
+-#define PAGE_CACHE_SIZE (8192)
+-#else
+-#define PAGE_CACHE_SIZE (4096)
+-#endif
++#define PAGE_CACHE_SIZE  page_size
+ 
+ /* Guarantee access to at least 8kB at a time */
+ #define ROMBUFFER_BITS	13
+@@ -95,11 +86,13 @@
+ static unsigned long read_buffer_block = ~0UL;
+ 
+ /* Uncompressing data structures... */
+-static char outbuffer[PAGE_CACHE_SIZE*2];
++static char *outbuffer;
+ z_stream stream;
+ 
+ #endif /* INCLUDE_FS_TESTS */
+ 
++static size_t page_size;
++
+ /* Input status of 0 to print help and exit without an error. */
+ static void usage(int status)
+ {
+@@ -464,9 +457,17 @@
+ 	int c;			/* for getopt */
+ 	int start = 0;
+ 
++	page_size = sysconf(_SC_PAGESIZE);
++	
+ 	if (argc)
+ 		progname = argv[0];
+ 
++	outbuffer = malloc(page_size * 2);
++	if (!outbuffer) {
++		fprintf(stderr, _("failed to allocate outbuffer\n"));
++		exit(8);
++	}
++
+ 	/* command line options */
+ 	while ((c = getopt(argc, argv, "hx:v")) != EOF) {
+ 		switch (c) {
+diff -Naur util-linux-2.12p/disk-utils/mkfs.cramfs.c util-linux-2.12p-new/disk-utils/mkfs.cramfs.c
+--- util-linux-2.12p/disk-utils/mkfs.cramfs.c	2004-12-11 14:56:01.000000000 +0000
++++ util-linux-2.12p-new/disk-utils/mkfs.cramfs.c	2004-12-26 00:53:10.666198928 +0000
+@@ -46,16 +46,8 @@
+ static const char *progname = "mkcramfs";
+ static int verbose = 0;
+ 
+-#ifdef __ia64__
+-#define PAGE_CACHE_SIZE (16384)
+-#elif defined __alpha__
+-#define PAGE_CACHE_SIZE (8192)
+-#else
+-#define PAGE_CACHE_SIZE (4096)
+-#endif
+-
+ /* The kernel assumes PAGE_CACHE_SIZE as block size. */
+-static unsigned int blksize = PAGE_CACHE_SIZE; /* settable via -b option */
++static unsigned int blksize;                   /* settable via -b option */
+ static long total_blocks = 0, total_nodes = 1; /* pre-count the root node */
+ static int image_length = 0;
+ 
+@@ -730,6 +722,7 @@
+ 	u32 crc = crc32(0L, Z_NULL, 0);
+ 	int c;
+ 
++	blksize = sysconf(_SC_PAGESIZE);
+ 	total_blocks = 0;
+ 
+ 	if (argc) {
Index: patches/util-linux-2.12q-sfdisk_use_lseek_for_mips64-1.patch
===================================================================
--- patches/util-linux-2.12q-sfdisk_use_lseek_for_mips64-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/util-linux-2.12q-sfdisk_use_lseek_for_mips64-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,12 @@
+diff -uNr util-linux-2.12q-orig/fdisk/sfdisk.c util-linux-2.12q/fdisk/sfdisk.c
+--- util-linux-2.12q-orig/fdisk/sfdisk.c	2005-01-05 09:31:57.000000000 +1100
++++ util-linux-2.12q/fdisk/sfdisk.c	2005-04-04 23:01:08.000000000 +1000
+@@ -172,7 +172,7 @@
+  * Note: we use 512-byte sectors here, irrespective of the hardware ss.
+  */
+ #undef use_lseek
+-#if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__) || defined (__s390x__)
++#if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__) || defined (__s390x__) || defined(__mips64)
+ #define use_lseek
+ #endif
+ 
Index: tches/vim-7.1-branch_update-2.patch
===================================================================
--- patches/vim-7.1-branch_update-2.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,9755 +1,0 @@
-Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
-Date: 12-21-2007
-Initial Package Version: 7.1
-Origin: Upstream
-Upstream Status: Applied
-Description: Contains all upstream patches up to 7.1.175
-             The following patches were skipped
-             003 007 041 065 070 072 080 088 091 092 124 126 128 129 134 146 158 168
-
-diff -Naur vim71.orig/runtime/doc/change.txt vim71/runtime/doc/change.txt
---- vim71.orig/runtime/doc/change.txt	2007-05-12 06:18:46.000000000 -0400
-+++ vim71/runtime/doc/change.txt	2007-12-20 23:57:04.000000000 -0500
-@@ -1571,6 +1571,10 @@
- 			in their original order, right before the sorted
- 			lines.
- 
-+			If {pattern} is empty (e.g. // is specified), the
-+			last search pattern is used.  This allows trying out
-+			a pattern first.
-+
- Note that using ":sort" with ":global" doesn't sort the matching lines, it's
- quite useless.
- 
-diff -Naur vim71.orig/runtime/doc/eval.txt vim71/runtime/doc/eval.txt
---- vim71.orig/runtime/doc/eval.txt	2007-05-12 06:18:46.000000000 -0400
-+++ vim71/runtime/doc/eval.txt	2007-12-20 23:58:59.000000000 -0500
-@@ -1,4 +1,4 @@
--*eval.txt*      For Vim version 7.1.  Last change: 2007 May 11
-+*eval.txt*      For Vim version 7.1.  Last change: 2007 Sep 25
- 
- 
- 		  VIM REFERENCE MANUAL    by Bram Moolenaar
-@@ -1557,6 +1557,7 @@
- changenr()			Number  current change number
- char2nr( {expr})		Number	ASCII value of first char in {expr}
- cindent( {lnum})		Number	C indent for line {lnum}
-+clearmatches()			None	clear all matches
- col( {expr})			Number	column nr of cursor or mark
- complete({startcol}, {matches})	String  set Insert mode completion
- complete_add( {expr})		Number	add completion match
-@@ -1602,7 +1603,7 @@
- foldtextresult( {lnum})		String	text for closed fold at {lnum}
- foreground( )			Number	bring the Vim window to the foreground
- function( {name})		Funcref reference to function {name}
--garbagecollect()		none	free memory, breaking cyclic references
-+garbagecollect( [at_exit])	none	free memory, breaking cyclic references
- get( {list}, {idx} [, {def}])	any	get item {idx} from {list} or {def}
- get( {dict}, {key} [, {def}])	any	get item {key} from {dict} or {def}
- getbufline( {expr}, {lnum} [, {end}])
-@@ -1622,6 +1623,7 @@
- getline( {lnum})		String	line {lnum} of current buffer
- getline( {lnum}, {end})		List	lines {lnum} to {end} of current buffer
- getloclist({nr})		List	list of location list items
-+getmatches()			List	list of current matches
- getpos( {expr})			List	position of cursor, mark, etc.
- getqflist()			List	list of quickfix items
- getreg( [{regname} [, 1]])	String	contents of register
-@@ -1676,7 +1678,10 @@
- 				String	check for mappings matching {name}
- match( {expr}, {pat}[, {start}[, {count}]])
- 				Number	position where {pat} matches in {expr}
-+matchadd( {group}, {pattern}[, {priority}[, {id}]])
-+				Number	highlight {pattern} with {group}
- matcharg( {nr})			List	arguments of |:match|
-+matchdelete( {id})		Number	delete match identified by {id}
- matchend( {expr}, {pat}[, {start}[, {count}]])
- 				Number	position where {pat} ends in {expr}
- matchlist( {expr}, {pat}[, {start}[, {count}]])
-@@ -1731,6 +1736,7 @@
- setline( {lnum}, {line})	Number	set line {lnum} to {line}
- setloclist( {nr}, {list}[, {action}])
- 				Number	modify location list using {list}
-+setmatches( {list})		Number	restore a list of matches
- setpos( {expr}, {list})		none	set the {expr} position to {list}
- setqflist( {list}[, {action}])	Number	modify quickfix list using {list}
- setreg( {n}, {v}[, {opt}])	Number	set register to value and type
-@@ -2012,6 +2018,10 @@
- 		feature, -1 is returned.
- 		See |C-indenting|.
- 
-+clearmatches()						*clearmatches()*
-+		Clears all matches previously defined by |matchadd()| and the
-+		|:match| commands.
-+
- 							*col()*
- col({expr})	The result is a Number, which is the byte index of the column
- 		position given with {expr}.  The accepted positions are:
-@@ -2020,6 +2030,10 @@
- 			    number of characters in the cursor line plus one)
- 		    'x	    position of mark x (if the mark is not set, 0 is
- 			    returned)
-+		Additionally {expr} can be [lnum, col]: a |List| with the line
-+		and column number. Most useful when the column is "$", to get
-+		the las column of a specific line.  When "lnum" or "col" is
-+		out of range then col() returns zero.
- 		To get the line number use |line()|.  To get both use
- 		|getpos()|.
- 		For the screen column position use |virtcol()|.
-@@ -2659,7 +2673,7 @@
- 		{name} can be a user defined function or an internal function.
- 
- 
--garbagecollect()					*garbagecollect()*
-+garbagecollect([at_exit])				*garbagecollect()*
- 		Cleanup unused |Lists| and |Dictionaries| that have circular
- 		references.  There is hardly ever a need to invoke this
- 		function, as it is automatically done when Vim runs out of
-@@ -2669,6 +2683,9 @@
- 		This is useful if you have deleted a very big |List| and/or
- 		|Dictionary| with circular references in a script that runs
- 		for a long time.
-+		When the optional "at_exit" argument is one, garbage
-+		collection will also be done when exiting Vim, if it wasn't
-+		done before.  This is useful when checking for memory leaks.
- 
- get({list}, {idx} [, {default}])			*get()*
- 		Get item {idx} from |List| {list}.  When this item is not
-@@ -2824,6 +2841,8 @@
- 		given file {fname}.
- 		If {fname} is a directory, 0 is returned.
- 		If the file {fname} can't be found, -1 is returned.
-+		If the size of {fname} is too big to fit in a Number then -2
-+		is returned.
- 
- getfontname([{name}])					*getfontname()*
- 		Without an argument returns the name of the normal font being
-@@ -2912,6 +2931,28 @@
- 		returned.  For an invalid window number {nr}, an empty list is
- 		returned. Otherwise, same as getqflist().
- 
-+getmatches()						*getmatches()*
-+		Returns a |List| with all matches previously defined by
-+		|matchadd()| and the |:match| commands.  |getmatches()| is
-+		useful in combination with |setmatches()|, as |setmatches()|
-+		can restore a list of matches saved by |getmatches()|.
-+		Example: >
-+			:echo getmatches()
-+<			[{'group': 'MyGroup1', 'pattern': 'TODO',
-+			'priority': 10, 'id': 1}, {'group': 'MyGroup2',
-+			'pattern': 'FIXME', 'priority': 10, 'id': 2}] >
-+			:let m = getmatches()
-+			:call clearmatches()
-+			:echo getmatches()
-+<			[] >
-+			:call setmatches(m)
-+			:echo getmatches()
-+<			[{'group': 'MyGroup1', 'pattern': 'TODO',
-+			'priority': 10, 'id': 1}, {'group': 'MyGroup2',
-+			'pattern': 'FIXME', 'priority': 10, 'id': 2}] >
-+			:unlet m
-+<
-+
- getqflist()						*getqflist()*
- 		Returns a list with all the current quickfix errors.  Each
- 		list item is a dictionary with these entries:
-@@ -3616,6 +3657,44 @@
- 		the pattern.  'smartcase' is NOT used.  The matching is always
- 		done like 'magic' is set and 'cpoptions' is empty.
- 
-+					*matchadd()* *E798* *E799* *E801*
-+matchadd({group}, {pattern}[, {priority}[, {id}]])
-+		Defines a pattern to be highlighted in the current window (a
-+		"match").  It will be highlighted with {group}.  Returns an
-+		identification number (ID), which can be used to delete the
-+		match using |matchdelete()|.
-+
-+		The optional {priority} argument assigns a priority to the
-+		match.  A match with a high priority will have its
-+		highlighting overrule that of a match with a lower priority.
-+		A priority is specified as an integer (negative numbers are no
-+		exception).  If the {priority} argument is not specified, the
-+		default priority is 10.  The priority of 'hlsearch' is zero,
-+		hence all matches with a priority greater than zero will
-+		overrule it.  Syntax highlighting (see 'syntax') is a separate
-+		mechanism, and regardless of the chosen priority a match will
-+		always overrule syntax highlighting.
-+
-+		The optional {id} argument allows the request for a specific
-+		match ID.  If a specified ID is already taken, an error
-+		message will appear and the match will not be added.  An ID
-+		is specified as a positive integer (zero excluded).  IDs 1, 2
-+		and 3 are reserved for |:match|, |:2match| and |:3match|,
-+		respectively.  If the {id} argument is not specified,
-+		|matchadd()| automatically chooses a free ID.
-+
-+		The number of matches is not limited, as it is the case with
-+		the |:match| commands.
-+
-+		Example: >
-+			:highlight MyGroup ctermbg=green guibg=green
-+			:let m = matchadd("MyGroup", "TODO")
-+<		Deletion of the pattern: >
-+			:call matchdelete(m)
-+
-+<		A list of matches defined by |matchadd()| and |:match| are
-+		available from |getmatches()|.  All matches can be deleted in
-+		one operation by |clearmatches()|.
- 
- matcharg({nr})							*matcharg()*
- 		Selects the {nr} match item, as set with a |:match|,
-@@ -3625,8 +3704,15 @@
- 			The pattern used.
- 		When {nr} is not 1, 2 or 3 returns an empty |List|.
- 		When there is no match item set returns ['', ''].
--		This is usef to save and restore a |:match|.
--
-+		This is useful to save and restore a |:match|.
-+		Highlighting matches using the |:match| commands are limited
-+		to three matches. |matchadd()| does not have this limitation.
-+
-+matchdelete({id})			       *matchdelete()* *E802* *E803*
-+		Deletes a match with ID {id} previously defined by |matchadd()|
-+		or one of the |:match| commands.  Returns 0 if succesfull,
-+		otherwise -1.  See example for |matchadd()|.  All matches can
-+		be deleted in one operation by |clearmatches()|.
- 
- matchend({expr}, {pat}[, {start}[, {count}]])			*matchend()*
- 		Same as match(), but return the index of first character after
-@@ -4379,7 +4465,13 @@
- 		When {nr} is zero the current window is used. For a location
- 		list window, the displayed location list is modified.  For an
- 		invalid window number {nr}, -1 is returned.
--		Otherwise, same as setqflist().
-+		Otherwise, same as |setqflist()|.
-+		Also see |location-list|.
-+
-+setmatches({list})					*setmatches()*
-+		Restores a list of matches saved by |getmatches()|.  Returns 0
-+		if succesfull, otherwise -1.  All current matches are cleared
-+		before the list is restored.  See example for |getmatches()|.
- 
- 							*setpos()*
- setpos({expr}, {list})
-@@ -5022,14 +5114,12 @@
- 		position, the returned Number will be the column at the end of
- 		the <Tab>.  For example, for a <Tab> in column 1, with 'ts'
- 		set to 8, it returns 8.
--		For the use of {expr} see |col()|.  Additionally you can use
--		[lnum, col]: a |List| with the line and column number.  When
--		"lnum" or "col" is out of range then virtcol() returns zero.
--		When 'virtualedit' is used it can be [lnum, col, off], where
-+		For the byte position use |col()|.
-+		For the use of {expr} see |col()|.
-+		When 'virtualedit' is used {expr} can be [lnum, col, off], where
- 		"off" is the offset in screen columns from the start of the
- 		character.  E.g., a position within a <Tab> or after the last
- 		character.
--		For the byte position use |col()|.
- 		When Virtual editing is active in the current mode, a position
- 		beyond the end of the line can be returned. |'virtualedit'|
- 		The accepted positions are:
-diff -Naur vim71.orig/runtime/doc/options.txt vim71/runtime/doc/options.txt
---- vim71.orig/runtime/doc/options.txt	2007-05-12 06:18:47.000000000 -0400
-+++ vim71/runtime/doc/options.txt	2007-12-20 23:57:54.000000000 -0500
-@@ -1,4 +1,4 @@
--*options.txt*	For Vim version 7.1.  Last change: 2007 May 11
-+*options.txt*	For Vim version 7.1.  Last change: 2007 Aug 10
- 
- 
- 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
-@@ -2415,8 +2415,8 @@
- 	When mixing vertically and horizontally split windows, a minimal size
- 	is computed and some windows may be larger if there is room.  The
- 	'eadirection' option tells in which direction the size is affected.
--	Changing the height of a window can be avoided by setting
--	'winfixheight'.
-+	Changing the height and width of a window can be avoided by setting
-+	'winfixheight' and 'winfixwidth', respectively.
- 
- 						*'equalprg'* *'ep'*
- 'equalprg' 'ep'		string	(default "")
-diff -Naur vim71.orig/runtime/doc/pattern.txt vim71/runtime/doc/pattern.txt
---- vim71.orig/runtime/doc/pattern.txt	2007-05-12 06:18:47.000000000 -0400
-+++ vim71/runtime/doc/pattern.txt	2007-12-20 23:57:20.000000000 -0500
-@@ -1212,7 +1212,10 @@
- 		{group} must exist at the moment this command is executed.
- 
- 		The {group} highlighting still applies when a character is
--		to be highlighted for 'hlsearch'.
-+		to be highlighted for 'hlsearch', as the highlighting for
-+		matches is given higher priority than that of 'hlsearch'.
-+		Syntax highlighting (see 'syntax') is also overruled by
-+		matches.
- 
- 		Note that highlighting the last used search pattern with
- 		'hlsearch' is used in all windows, while the pattern defined
-@@ -1226,8 +1229,15 @@
- 		display you may get unexpected results.  That is because Vim
- 		looks for a match in the line where redrawing starts.
- 
--		Also see |matcharg()|, it returns the highlight group and
--		pattern of a previous :match command.
-+		Also see |matcharg()|and |getmatches()|. The former returns
-+		the highlight group and pattern of a previous |:match|
-+		command.  The latter returns a list with highlight groups and
-+		patterns defined by both |matchadd()| and |:match|.
-+
-+		Highlighting matches using |:match| are limited to three
-+		matches (aside from |:match|, |:2match| and |:3match|are
-+		available). |matchadd()| does not have this limitation and in
-+		addition makes it possible to prioritize matches.
- 
- 		Another example, which highlights all characters in virtual
- 		column 72 and more: >
-diff -Naur vim71.orig/runtime/doc/pi_paren.txt vim71/runtime/doc/pi_paren.txt
---- vim71.orig/runtime/doc/pi_paren.txt	2007-05-12 06:18:47.000000000 -0400
-+++ vim71/runtime/doc/pi_paren.txt	2007-12-20 23:58:11.000000000 -0500
-@@ -12,8 +12,8 @@
- You can avoid loading this plugin by setting the "loaded_matchparen" variable: >
- 	:let loaded_matchparen = 1
- 
--The plugin installs CursorMoved autocommands to redefine the match
--highlighting.
-+The plugin installs CursorMoved, CursorMovedI and WinEnter autocommands to
-+redefine the match highlighting.
- 
- To disable the plugin after it was loaded use this command: >
- 
-diff -Naur vim71.orig/runtime/doc/usr_41.txt vim71/runtime/doc/usr_41.txt
---- vim71.orig/runtime/doc/usr_41.txt	2007-05-12 06:18:48.000000000 -0400
-+++ vim71/runtime/doc/usr_41.txt	2007-12-20 23:57:20.000000000 -0500
-@@ -763,13 +763,22 @@
- 	foldtextresult()	get the text displayed for a closed fold
- 
- Syntax and highlighting:
-+	clearmatches()		clear all matches defined by |matchadd()| and
-+				the |:match| commands
-+	getmatches()		get all matches defined by |matchadd()| and
-+				the |:match| commands
- 	hlexists()		check if a highlight group exists
- 	hlID()			get ID of a highlight group
- 	synID()			get syntax ID at a specific position
- 	synIDattr()		get a specific attribute of a syntax ID
- 	synIDtrans()		get translated syntax ID
- 	diff_hlID()		get highlight ID for diff mode at a position
-+	matchadd()		define a pattern to highlight (a "match")
- 	matcharg()		get info about |:match| arguments
-+	matchdelete()		delete a match defined by |matchadd()| or a
-+				|:match| command
-+	setmatches()		restore a list of matches saved by
-+				|getmatches()|
- 
- Spelling:
- 	spellbadword()		locate badly spelled word at or after cursor
-diff -Naur vim71.orig/runtime/doc/windows.txt vim71/runtime/doc/windows.txt
---- vim71.orig/runtime/doc/windows.txt	2007-05-12 06:18:49.000000000 -0400
-+++ vim71/runtime/doc/windows.txt	2007-12-20 23:57:54.000000000 -0500
-@@ -132,7 +132,8 @@
- 		the same file.  Make new window N high (default is to use half
- 		the height of the current window).  Reduces the current window
- 		height to create room (and others, if the 'equalalways' option
--		is set and 'eadirection' isn't "hor").
-+		is set, 'eadirection' isn't "hor", and one of them is higher
-+		than the current or the new window).
- 		Note: CTRL-S does not work on all terminals and might block
- 		further input, use CTRL-Q to get going again.
- 		Also see |++opt| and |+cmd|.
-@@ -140,9 +141,13 @@
- CTRL-W CTRL-V						*CTRL-W_CTRL-V*
- CTRL-W v						*CTRL-W_v*
- :[N]vs[plit] [++opt] [+cmd] [file]			*:vs* *:vsplit*
--		Like |:split|, but split vertically.  If 'equalalways' is set
--		and 'eadirection' isn't "ver" the windows will be spread out
--		horizontally, unless a width was specified.
-+		Like |:split|, but split vertically.  The windows will be
-+		spread out horizontally if
-+		1. a width was not specified,
-+		2. 'equalalways' is set,
-+		3. 'eadirection' isn't "ver", and
-+		4. one of the other windows are wider than the current or new
-+		   window.
- 		Note: In other places CTRL-Q does the same as CTRL-V, but here
- 		it doesn't!
- 
-diff -Naur vim71.orig/runtime/filetype.vim vim71/runtime/filetype.vim
---- vim71.orig/runtime/filetype.vim	2007-05-10 11:14:37.000000000 -0400
-+++ vim71/runtime/filetype.vim	2007-12-20 23:56:32.000000000 -0500
-@@ -1,7 +1,7 @@
- " Vim support file to detect file types
- "
- " Maintainer:	Bram Moolenaar <Bram@vim.org>
--" Last Change:	2007 May 10
-+" Last Change:	2007 May 15
- 
- " Listen very carefully, I will say this only once
- if exists("did_load_filetypes")
-@@ -1286,7 +1286,7 @@
- au BufNewFile,BufRead *.it,*.ih			setf ppwiz
- 
- " Oracle Pro*C/C++
--au BufNewFile,BufRead .pc			setf proc
-+au BufNewFile,BufRead *.pc			setf proc
- 
- " Privoxy actions file
- au BufNewFile,BufRead *.action			setf privoxy
-diff -Naur vim71.orig/runtime/menu.vim vim71/runtime/menu.vim
---- vim71.orig/runtime/menu.vim	2007-01-09 08:31:40.000000000 -0500
-+++ vim71/runtime/menu.vim	2007-12-20 23:59:53.000000000 -0500
-@@ -2,7 +2,7 @@
- " You can also use this as a start for your own set of menus.
- "
- " Maintainer:	Bram Moolenaar <Bram@vim.org>
--" Last Change:	2007 Jan 09
-+" Last Change:	2007 Nov 19
- 
- " Note that ":an" (short for ":anoremenu") is often used to make a menu work
- " in all modes and avoid side effects from mappings defined by the user.
-@@ -658,7 +658,6 @@
-   let buf = 1
-   while buf <= bufnr('$')
-     if bufexists(buf) && !isdirectory(bufname(buf)) && buflisted(buf)
--					    \ && !getbufvar(buf, "&bufsecret")
-       let s:bmenu_count = s:bmenu_count + 1
-     endif
-     let buf = buf + 1
-@@ -671,7 +670,6 @@
-   let buf = 1
-   while buf <= bufnr('$')
-     if bufexists(buf) && !isdirectory(bufname(buf)) && buflisted(buf)
--					    \ && !getbufvar(buf, "&bufsecret")
-       call <SID>BMFilename(bufname(buf), buf)
-     endif
-     let buf = buf + 1
-diff -Naur vim71.orig/runtime/plugin/matchparen.vim vim71/runtime/plugin/matchparen.vim
---- vim71.orig/runtime/plugin/matchparen.vim	2006-10-12 16:05:05.000000000 -0400
-+++ vim71/runtime/plugin/matchparen.vim	2007-12-20 23:58:11.000000000 -0500
-@@ -1,6 +1,6 @@
- " Vim plugin for showing matching parens
- " Maintainer:  Bram Moolenaar <Bram@vim.org>
--" Last Change: 2006 Oct 12
-+" Last Change: 2007 Aug 8
- 
- " Exit quickly when:
- " - this plugin was already loaded (or disabled)
-@@ -13,7 +13,7 @@
- 
- augroup matchparen
-   " Replace all matchparen autocommands
--  autocmd! CursorMoved,CursorMovedI * call s:Highlight_Matching_Pair()
-+  autocmd! CursorMoved,CursorMovedI,WinEnter * call s:Highlight_Matching_Pair()
- augroup END
- 
- " Skip the rest if it was already done.
-@@ -62,25 +62,37 @@
-   " Figure out the arguments for searchpairpos().
-   " Restrict the search to visible lines with "stopline".
-   " And avoid searching very far (e.g., for closed folds and long lines)
-+  " The "viewable" variables give a range in which we can scroll while keeping
-+  " the cursor at the same position
-+  " adjustedScrolloff accounts for very large numbers of scrolloff
-+  let adjustedScrolloff = min([&scrolloff, (line('w$') - line('w0')) / 2])
-+  let bottom_viewable = min([line('$'), c_lnum + &lines - adjustedScrolloff - 2])
-+  let top_viewable = max([1, c_lnum-&lines+adjustedScrolloff + 2])
-+  " one of these stoplines will be adjusted below, but the current values are
-+  " minimal boundaries within the current window
-+  let stoplinebottom = line('w$')
-+  let stoplinetop = line('w0')
-   if i % 2 == 0
-     let s_flags = 'nW'
-     let c2 = plist[i + 1]
-     if has("byte_offset") && has("syntax_items") && &smc > 0
-       let stopbyte = min([line2byte("$"), line2byte(".") + col(".") + &smc * 2])
--      let stopline = min([line('w$'), byte2line(stopbyte)])
-+      let stopline = min([bottom_viewable, byte2line(stopbyte)])
-     else
--      let stopline = min([line('w$'), c_lnum + 100])
-+      let stopline = min([bottom_viewable, c_lnum + 100])
-     endif
-+    let stoplinebottom = stopline
-   else
-     let s_flags = 'nbW'
-     let c2 = c
-     let c = plist[i - 1]
-     if has("byte_offset") && has("syntax_items") && &smc > 0
-       let stopbyte = max([1, line2byte(".") + col(".") - &smc * 2])
--      let stopline = max([line('w0'), byte2line(stopbyte)])
-+      let stopline = max([top_viewable, byte2line(stopbyte)])
-     else
--      let stopline = max([line('w0'), c_lnum - 100])
-+      let stopline = max([top_viewable, c_lnum - 100])
-     endif
-+    let stoplinetop = stopline
-   endif
-   if c == '['
-     let c = '\['
-@@ -106,7 +118,7 @@
-   endif
- 
-   " If a match is found setup match highlighting.
--  if m_lnum > 0 && m_lnum >= line('w0') && m_lnum <= line('w$')
-+  if m_lnum > 0 && m_lnum >= stoplinetop && m_lnum <= stoplinebottom 
-     exe '3match MatchParen /\(\%' . c_lnum . 'l\%' . (c_col - before) .
- 	  \ 'c\)\|\(\%' . m_lnum . 'l\%' . m_col . 'c\)/'
-     let w:paren_hl_on = 1
-@@ -114,7 +126,8 @@
- endfunction
- 
- " Define commands that will disable and enable the plugin.
--command! NoMatchParen 3match none | unlet! g:loaded_matchparen | au! matchparen
--command! DoMatchParen runtime plugin/matchparen.vim | doau CursorMoved
-+command! NoMatchParen windo 3match none | unlet! g:loaded_matchparen |
-+	  \ au! matchparen
-+command! DoMatchParen runtime plugin/matchparen.vim | windo doau CursorMoved
- 
- let &cpo = cpo_save
-diff -Naur vim71.orig/src/auto/configure vim71/src/auto/configure
---- vim71.orig/src/auto/configure	2007-05-12 07:49:09.000000000 -0400
-+++ vim71/src/auto/configure	2007-12-20 23:59:34.000000000 -0500
-@@ -3843,7 +3843,9 @@
-   fi
- 
-   if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
--    if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then
-+    if test "x$MACOSX" = "xyes"; then
-+      MZSCHEME_LIBS="-framework PLT_MzScheme"
-+    elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then
-       MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
-     else
-       MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"
-@@ -10263,8 +10265,9 @@
- 
- 
- 
-+
- for ac_header in stdarg.h stdlib.h string.h sys/select.h sys/utsname.h \
--	termcap.h fcntl.h sgtty.h sys/ioctl.h sys/time.h termio.h \
-+	termcap.h fcntl.h sgtty.h sys/ioctl.h sys/time.h sys/types.h termio.h \
- 	iconv.h langinfo.h unistd.h stropts.h errno.h \
- 	sys/resource.h sys/systeminfo.h locale.h \
- 	sys/stream.h sys/ptem.h termios.h libc.h sys/statfs.h \
-diff -Naur vim71.orig/src/buffer.c vim71/src/buffer.c
---- vim71.orig/src/buffer.c	2007-05-10 11:25:59.000000000 -0400
-+++ vim71/src/buffer.c	2007-12-20 23:59:17.000000000 -0500
-@@ -171,6 +171,13 @@
- 	    /* Put the cursor on the first line. */
- 	    curwin->w_cursor.lnum = 1;
- 	    curwin->w_cursor.col = 0;
-+
-+	    /* Set or reset 'modified' before executing autocommands, so that
-+	     * it can be changed there. */
-+	    if (!readonlymode && !bufempty())
-+		changed();
-+	    else if (retval != FAIL)
-+		unchanged(curbuf, FALSE);
- #ifdef FEAT_AUTOCMD
- # ifdef FEAT_EVAL
- 	    apply_autocmds_retval(EVENT_STDINREADPOST, NULL, NULL, FALSE,
-@@ -194,16 +201,16 @@
-     /* When reading stdin, the buffer contents always needs writing, so set
-      * the changed flag.  Unless in readonly mode: "ls | gview -".
-      * When interrupted and 'cpoptions' contains 'i' set changed flag. */
--    if ((read_stdin && !readonlymode && !bufempty())
-+    if ((got_int && vim_strchr(p_cpo, CPO_INTMOD) != NULL)
- #ifdef FEAT_AUTOCMD
- 		|| modified_was_set	/* ":set modified" used in autocmd */
- # ifdef FEAT_EVAL
- 		|| (aborting() && vim_strchr(p_cpo, CPO_INTMOD) != NULL)
- # endif
- #endif
--		|| (got_int && vim_strchr(p_cpo, CPO_INTMOD) != NULL))
-+       )
- 	changed();
--    else if (retval != FAIL)
-+    else if (retval != FAIL && !read_stdin)
- 	unchanged(curbuf, FALSE);
-     save_file_ff(curbuf);		/* keep this fileformat */
- 
-@@ -495,6 +502,7 @@
-     buf->b_start_eol = TRUE;
- #ifdef FEAT_MBYTE
-     buf->b_p_bomb = FALSE;
-+    buf->b_start_bomb = FALSE;
- #endif
-     buf->b_ml.ml_mfp = NULL;
-     buf->b_ml.ml_flags = ML_EMPTY;		/* empty buffer */
-@@ -4167,29 +4175,35 @@
-      * mess up the full path name, even though it starts with a '/'.
-      * Also expand when there is ".." in the file name, try to remove it,
-      * because "c:/src/../README" is equal to "c:/README".
-+     * Similarly "c:/src//file" is equal to "c:/src/file".
-      * For MS-Windows also expand names like "longna~1" to "longname".
-      */
- #ifdef UNIX
-     return FullName_save(fname, TRUE);
- #else
--    if (!vim_isAbsName(fname) || strstr((char *)fname, "..") != NULL
--#if defined(MSWIN) || defined(DJGPP)
-+    if (!vim_isAbsName(fname)
-+	    || strstr((char *)fname, "..") != NULL
-+	    || strstr((char *)fname, "//") != NULL
-+# ifdef BACKSLASH_IN_FILENAME
-+	    || strstr((char *)fname, "\\\\") != NULL
-+# endif
-+# if defined(MSWIN) || defined(DJGPP)
- 	    || vim_strchr(fname, '~') != NULL
--#endif
-+# endif
- 	    )
- 	return FullName_save(fname, FALSE);
- 
-     fname = vim_strsave(fname);
- 
--#ifdef USE_FNAME_CASE
--# ifdef USE_LONG_FNAME
-+# ifdef USE_FNAME_CASE
-+#  ifdef USE_LONG_FNAME
-     if (USE_LONG_FNAME)
--# endif
-+#  endif
-     {
- 	if (fname != NULL)
- 	    fname_case(fname, 0);	/* set correct case for file name */
-     }
--#endif
-+# endif
- 
-     return fname;
- #endif
-@@ -4853,7 +4867,7 @@
- 	     */
- 	    for (e = s; *e != ':' && *e != NUL; ++e)
- 		if (e[0] == '\\' && e[1] == ':')
--		    STRCPY(e, e + 1);
-+		    mch_memmove(e, e + 1, STRLEN(e));
- 	    if (*e == NUL)
- 		end = TRUE;
- 
-@@ -5507,11 +5521,11 @@
- 
- #ifdef FEAT_AUTOCMD
-     if (!aucmd)		    /* Don't trigger BufDelete autocommands here. */
--	++autocmd_block;
-+	block_autocmds();
- #endif
-     close_buffer(NULL, buf, DOBUF_WIPE);
- #ifdef FEAT_AUTOCMD
-     if (!aucmd)
--	--autocmd_block;
-+	unblock_autocmds();
- #endif
- }
-diff -Naur vim71.orig/src/charset.c vim71/src/charset.c
---- vim71.orig/src/charset.c	2007-03-24 16:10:37.000000000 -0400
-+++ vim71/src/charset.c	2007-12-20 23:58:12.000000000 -0500
-@@ -207,7 +207,10 @@
- 	    }
- 	    while (c <= c2)
- 	    {
--		if (!do_isalpha || isalpha(c)
-+		/* Use the MB_ functions here, because isalpha() doesn't
-+		 * work properly when 'encoding' is "latin1" and the locale is
-+		 * "C".  */
-+		if (!do_isalpha || MB_ISLOWER(c) || MB_ISUPPER(c)
- #ifdef FEAT_FKMAP
- 			|| (p_altkeymap && (F_isalpha(c) || F_isdigit(c)))
- #endif
-@@ -929,6 +932,23 @@
- }
- 
- /*
-+ * return TRUE if 'c' is a valid file-name character or a wildcard character
-+ * Assume characters above 0x100 are valid (multi-byte).
-+ * Explicitly interpret ']' as a wildcard character as mch_has_wildcard("]")
-+ * returns false.
-+ */
-+    int
-+vim_isfilec_or_wc(c)
-+    int c;
-+{
-+    char_u buf[2];
-+
-+    buf[0] = (char_u)c;
-+    buf[1] = NUL;
-+    return vim_isfilec(c) || c == ']' || mch_has_wildcard(buf);
-+}
-+
-+/*
-  * return TRUE if 'c' is a printable character
-  * Assume characters above 0x100 are printable (multi-byte), except for
-  * Unicode.
-@@ -1898,7 +1918,7 @@
- {
-     for ( ; *p; ++p)
- 	if (rem_backslash(p))
--	    STRCPY(p, p + 1);
-+	    mch_memmove(p, p + 1, STRLEN(p));
- }
- 
- /*
-diff -Naur vim71.orig/src/configure.in vim71/src/configure.in
---- vim71.orig/src/configure.in	2007-05-12 05:19:27.000000000 -0400
-+++ vim71/src/configure.in	2007-12-20 23:59:34.000000000 -0500
-@@ -423,7 +423,9 @@
-   fi
- 
-   if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
--    if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then
-+    if test "x$MACOSX" = "xyes"; then
-+      MZSCHEME_LIBS="-framework PLT_MzScheme"
-+    elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then
-       MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
-     else
-       MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"
-@@ -2024,7 +2026,7 @@
- fi
- 
- AC_CHECK_HEADERS(stdarg.h stdlib.h string.h sys/select.h sys/utsname.h \
--	termcap.h fcntl.h sgtty.h sys/ioctl.h sys/time.h termio.h \
-+	termcap.h fcntl.h sgtty.h sys/ioctl.h sys/time.h sys/types.h termio.h \
- 	iconv.h langinfo.h unistd.h stropts.h errno.h \
- 	sys/resource.h sys/systeminfo.h locale.h \
- 	sys/stream.h sys/ptem.h termios.h libc.h sys/statfs.h \
-diff -Naur vim71.orig/src/diff.c vim71/src/diff.c
---- vim71.orig/src/diff.c	2007-02-15 19:18:41.000000000 -0500
-+++ vim71/src/diff.c	2007-12-20 23:59:28.000000000 -0500
-@@ -791,6 +791,9 @@
-     }
-     mch_remove(tmp_orig);
- 
-+    /* force updating cursor position on screen */
-+    curwin->w_valid_cursor.lnum = 0;
-+
-     diff_redraw(TRUE);
- 
- theend:
-@@ -840,11 +843,11 @@
- 		    tmp_orig, tmp_new);
- 	    append_redir(cmd, p_srr, tmp_diff);
- #ifdef FEAT_AUTOCMD
--	    ++autocmd_block;	/* Avoid ShellCmdPost stuff */
-+	    block_autocmds();	/* Avoid ShellCmdPost stuff */
- #endif
- 	    (void)call_shell(cmd, SHELL_FILTER|SHELL_SILENT|SHELL_DOOUT);
- #ifdef FEAT_AUTOCMD
--	    --autocmd_block;
-+	    unblock_autocmds();
- #endif
- 	    vim_free(cmd);
- 	}
-@@ -949,11 +952,11 @@
- # endif
- 		eap->arg);
- #ifdef FEAT_AUTOCMD
--	++autocmd_block;	/* Avoid ShellCmdPost stuff */
-+	block_autocmds();	/* Avoid ShellCmdPost stuff */
- #endif
- 	(void)call_shell(buf, SHELL_FILTER | SHELL_COOKED);
- #ifdef FEAT_AUTOCMD
--	--autocmd_block;
-+	unblock_autocmds();
- #endif
-     }
- 
-@@ -1310,7 +1313,7 @@
- 		    dp->df_count[idx_new] += -off;
- 		off = 0;
- 	    }
--	    for (i = idx_orig; i < idx_new + !notset; ++i)
-+	    for (i = idx_orig; i < idx_new; ++i)
- 		if (curtab->tp_diffbuf[i] != NULL)
- 		    dp->df_count[i] = dpl->df_lnum[i] + dpl->df_count[i]
- 						       - dp->df_lnum[i] + off;
-diff -Naur vim71.orig/src/digraph.c vim71/src/digraph.c
---- vim71.orig/src/digraph.c	2006-05-02 14:24:04.000000000 -0400
-+++ vim71/src/digraph.c	2007-12-20 23:58:39.000000000 -0500
-@@ -2028,7 +2028,7 @@
- 
-     ++no_mapping;
-     ++allow_keys;
--    c = safe_vgetc();
-+    c = plain_vgetc();
-     --no_mapping;
-     --allow_keys;
-     if (c != ESC)		/* ESC cancels CTRL-K */
-@@ -2050,7 +2050,7 @@
- #endif
- 	++no_mapping;
- 	++allow_keys;
--	cc = safe_vgetc();
-+	cc = plain_vgetc();
- 	--no_mapping;
- 	--allow_keys;
- 	if (cc != ESC)	    /* ESC cancels CTRL-K */
-@@ -2349,8 +2349,10 @@
- 
-     if (*curbuf->b_p_keymap == NUL)
-     {
--	/* Stop any active keymap and clear the table. */
-+	/* Stop any active keymap and clear the table.  Also remove
-+	 * b:keymap_name, as no keymap is active now. */
- 	keymap_unload();
-+	do_cmdline_cmd((char_u *)"unlet! b:keymap_name");
-     }
-     else
-     {
-@@ -2500,7 +2502,6 @@
- 
-     ga_clear(&curbuf->b_kmap_ga);
-     curbuf->b_kmap_state &= ~KEYMAP_LOADED;
--    do_cmdline_cmd((char_u *)"unlet! b:keymap_name");
- #ifdef FEAT_WINDOWS
-     status_redraw_curbuf();
- #endif
-diff -Naur vim71.orig/src/edit.c vim71/src/edit.c
---- vim71.orig/src/edit.c	2007-05-07 15:43:55.000000000 -0400
-+++ vim71/src/edit.c	2007-12-21 00:00:07.000000000 -0500
-@@ -129,6 +129,7 @@
- 
- static void ins_ctrl_x __ARGS((void));
- static int  has_compl_option __ARGS((int dict_opt));
-+static int  ins_compl_accept_char __ARGS((int c));
- static int ins_compl_add __ARGS((char_u *str, int len, int icase, char_u *fname, char_u **cptext, int cdir, int flags, int adup));
- static int  ins_compl_equal __ARGS((compl_T *match, char_u *str, int len));
- static void ins_compl_longest_match __ARGS((compl_T *match));
-@@ -754,8 +755,9 @@
- 		    continue;
- 		}
- 
--		/* A printable, non-white character: Add to "compl_leader". */
--		if (vim_isprintc(c) && !vim_iswhite(c))
-+		/* A non-white character that fits in with the current
-+		 * completion: Add to "compl_leader". */
-+		if (ins_compl_accept_char(c))
- 		{
- 		    ins_compl_addleader(c);
- 		    continue;
-@@ -788,7 +790,7 @@
- 	    ins_redraw(FALSE);
- 	    ++no_mapping;
- 	    ++allow_keys;
--	    c = safe_vgetc();
-+	    c = plain_vgetc();
- 	    --no_mapping;
- 	    --allow_keys;
- 	    if (c != Ctrl_N && c != Ctrl_G && c != Ctrl_O)
-@@ -981,7 +983,7 @@
- #ifdef FEAT_NETBEANS_INTG
- 	case K_F21:	/* NetBeans command */
- 	    ++no_mapping;		/* don't map the next key hits */
--	    i = safe_vgetc();
-+	    i = plain_vgetc();
- 	    --no_mapping;
- 	    netbeans_keycommand(i);
- 	    break;
-@@ -2053,11 +2055,44 @@
- }
- 
- /*
-+ * Return TRUE when character "c" is part of the item currently being
-+ * completed.  Used to decide whether to abandon complete mode when the menu
-+ * is visible.
-+ */
-+    static int
-+ins_compl_accept_char(c)
-+    int c;
-+{
-+    if (ctrl_x_mode & CTRL_X_WANT_IDENT)
-+	/* When expanding an identifier only accept identifier chars. */
-+	return vim_isIDc(c);
-+
-+    switch (ctrl_x_mode)
-+    {
-+	case CTRL_X_FILES:
-+	    /* When expanding file name only accept file name chars. But not
-+	     * path separators, so that "proto/<Tab>" expands files in
-+	     * "proto", not "proto/" as a whole */
-+	    return vim_isfilec(c) && !vim_ispathsep(c);
-+
-+	case CTRL_X_CMDLINE:
-+	case CTRL_X_OMNI:
-+	    /* Command line and Omni completion can work with just about any
-+	     * printable character, but do stop at white space. */
-+	    return vim_isprintc(c) && !vim_iswhite(c);
-+
-+	case CTRL_X_WHOLE_LINE:
-+	    /* For while line completion a space can be part of the line. */
-+	    return vim_isprintc(c);
-+    }
-+    return vim_iswordc(c);
-+}
-+
-+/*
-  * This is like ins_compl_add(), but if 'ic' and 'inf' are set, then the
-  * case of the originally typed text is used, and the case of the completed
-  * text is inferred, ie this tries to work out what case you probably wanted
-  * the rest of the word to be in -- webb
-- * TODO: make this work for multi-byte characters.
-  */
-     int
- ins_compl_add_infercase(str, len, icase, fname, dir, flags)
-@@ -2068,54 +2103,147 @@
-     int		dir;
-     int		flags;
- {
-+    char_u	*p;
-+    int		i, c;
-+    int		actual_len;		/* Take multi-byte characters */
-+    int		actual_compl_length;	/* into account. */
-+    int		*wca;		        /* Wide character array. */
-     int		has_lower = FALSE;
-     int		was_letter = FALSE;
--    int		idx;
- 
--    if (p_ic && curbuf->b_p_inf && len < IOSIZE)
-+    if (p_ic && curbuf->b_p_inf && len > 0)
-     {
--	/* Infer case of completed part -- webb */
--	/* Use IObuff, str would change text in buffer! */
--	vim_strncpy(IObuff, str, len);
-+	/* Infer case of completed part. */
- 
--	/* Rule 1: Were any chars converted to lower? */
--	for (idx = 0; idx < compl_length; ++idx)
-+	/* Find actual length of completion. */
-+#ifdef FEAT_MBYTE
-+	if (has_mbyte)
- 	{
--	    if (islower(compl_orig_text[idx]))
-+	    p = str;
-+	    actual_len = 0;
-+	    while (*p != NUL)
- 	    {
--		has_lower = TRUE;
--		if (isupper(IObuff[idx]))
--		{
--		    /* Rule 1 is satisfied */
--		    for (idx = compl_length; idx < len; ++idx)
--			IObuff[idx] = TOLOWER_LOC(IObuff[idx]);
--		    break;
--		}
-+		mb_ptr_adv(p);
-+		++actual_len;
- 	    }
- 	}
-+	else
-+#endif
-+	    actual_len = len;
- 
--	/*
--	 * Rule 2: No lower case, 2nd consecutive letter converted to
--	 * upper case.
--	 */
--	if (!has_lower)
-+	/* Find actual length of original text. */
-+#ifdef FEAT_MBYTE
-+	if (has_mbyte)
-+	{
-+	    p = compl_orig_text;
-+	    actual_compl_length = 0;
-+	    while (*p != NUL)
-+	    {
-+		mb_ptr_adv(p);
-+		++actual_compl_length;
-+	    }
-+	}
-+	else
-+#endif
-+	    actual_compl_length = compl_length;
-+
-+	/* Allocate wide character array for the completion and fill it. */
-+	wca = (int *)alloc(actual_len * sizeof(int));
-+	if (wca != NULL)
- 	{
--	    for (idx = 0; idx < compl_length; ++idx)
-+	    p = str;
-+	    for (i = 0; i < actual_len; ++i)
-+#ifdef FEAT_MBYTE
-+		if (has_mbyte)
-+		    wca[i] = mb_ptr2char_adv(&p);
-+		else
-+#endif
-+		    wca[i] = *(p++);
-+
-+	    /* Rule 1: Were any chars converted to lower? */
-+	    p = compl_orig_text;
-+	    for (i = 0; i < actual_compl_length; ++i)
- 	    {
--		if (was_letter && isupper(compl_orig_text[idx])
--						      && islower(IObuff[idx]))
-+#ifdef FEAT_MBYTE
-+		if (has_mbyte)
-+		    c = mb_ptr2char_adv(&p);
-+		else
-+#endif
-+		    c = *(p++);
-+		if (MB_ISLOWER(c))
- 		{
--		    /* Rule 2 is satisfied */
--		    for (idx = compl_length; idx < len; ++idx)
--			IObuff[idx] = TOUPPER_LOC(IObuff[idx]);
--		    break;
-+		    has_lower = TRUE;
-+		    if (MB_ISUPPER(wca[i]))
-+		    {
-+			/* Rule 1 is satisfied. */
-+			for (i = actual_compl_length; i < actual_len; ++i)
-+			    wca[i] = MB_TOLOWER(wca[i]);
-+			break;
-+		    }
- 		}
--		was_letter = isalpha(compl_orig_text[idx]);
- 	    }
--	}
- 
--	/* Copy the original case of the part we typed */
--	STRNCPY(IObuff, compl_orig_text, compl_length);
-+	    /*
-+	     * Rule 2: No lower case, 2nd consecutive letter converted to
-+	     * upper case.
-+	     */
-+	    if (!has_lower)
-+	    {
-+		p = compl_orig_text;
-+		for (i = 0; i < actual_compl_length; ++i)
-+		{
-+#ifdef FEAT_MBYTE
-+		    if (has_mbyte)
-+			c = mb_ptr2char_adv(&p);
-+		    else
-+#endif
-+			c = *(p++);
-+		    if (was_letter && MB_ISUPPER(c) && MB_ISLOWER(wca[i]))
-+		    {
-+			/* Rule 2 is satisfied. */
-+			for (i = actual_compl_length; i < actual_len; ++i)
-+			    wca[i] = MB_TOUPPER(wca[i]);
-+			break;
-+		    }
-+		    was_letter = MB_ISLOWER(c) || MB_ISUPPER(c);
-+		}
-+	    }
-+
-+	    /* Copy the original case of the part we typed. */
-+	    p = compl_orig_text;
-+	    for (i = 0; i < actual_compl_length; ++i)
-+	    {
-+#ifdef FEAT_MBYTE
-+		if (has_mbyte)
-+		    c = mb_ptr2char_adv(&p);
-+		else
-+#endif
-+		    c = *(p++);
-+		if (MB_ISLOWER(c))
-+		    wca[i] = MB_TOLOWER(wca[i]);
-+		else if (MB_ISUPPER(c))
-+		    wca[i] = MB_TOUPPER(wca[i]);
-+	    }
-+
-+	    /*
-+	     * Generate encoding specific output from wide character array.
-+	     * Multi-byte characters can occupy up to five bytes more than
-+	     * ASCII characters, and we also need one byte for NUL, so stay
-+	     * six bytes away from the edge of IObuff.
-+	     */
-+	    p = IObuff;
-+	    i = 0;
-+	    while (i < actual_len && (p - IObuff + 6) < IOSIZE)
-+#ifdef FEAT_MBYTE
-+		if (has_mbyte)
-+		    p += (*mb_char2bytes)(wca[i++], p);
-+		else
-+#endif
-+		    *(p++) = wca[i++];
-+	    *p = NUL;
-+
-+	    vim_free(wca);
-+	}
- 
- 	return ins_compl_add(IObuff, len, icase, fname, NULL, dir,
- 								flags, FALSE);
-@@ -2842,6 +2970,7 @@
- 			/*
- 			 * Add the other matches on the line
- 			 */
-+			ptr = buf;
- 			while (!got_int)
- 			{
- 			    /* Find start of the next word.  Skip white
-@@ -2851,7 +2980,7 @@
- 				break;
- 			    wstart = ptr;
- 
--			    /* Find end of the word and add it. */
-+			    /* Find end of the word. */
- #ifdef FEAT_MBYTE
- 			    if (has_mbyte)
- 				/* Japanese words may have characters in
-@@ -2868,9 +2997,12 @@
- 			    else
- #endif
- 				ptr = find_word_end(ptr);
--			    add_r = ins_compl_add_infercase(wstart,
--				    (int)(ptr - wstart),
--				    p_ic, files[i], *dir, 0);
-+
-+			    /* Add the word. Skip the regexp match. */
-+			    if (wstart != regmatch->startp[0])
-+				add_r = ins_compl_add_infercase(wstart,
-+					(int)(ptr - wstart),
-+					p_ic, files[i], *dir, 0);
- 			}
- 		    }
- 		    if (add_r == OK)
-@@ -3032,8 +3164,11 @@
-     p = line + curwin->w_cursor.col;
-     mb_ptr_back(line, p);
- 
--    /* Stop completion when the whole word was deleted. */
--    if ((int)(p - line) - (int)compl_col <= 0)
-+    /* Stop completion when the whole word was deleted.  For Omni completion
-+     * allow the word to be deleted, we won't match everything. */
-+    if ((int)(p - line) - (int)compl_col < 0
-+	    || ((int)(p - line) - (int)compl_col == 0
-+		&& (ctrl_x_mode & CTRL_X_OMNI) == 0))
- 	return K_BS;
- 
-     /* Deleted more than what was used to find matches or didn't finish
-@@ -3250,8 +3385,8 @@
-     if (c != Ctrl_R && vim_is_ctrl_x_key(c))
- 	edit_submode_extra = NULL;
- 
--    /* Ignore end of Select mode mapping */
--    if (c == K_SELECT)
-+    /* Ignore end of Select mode mapping and mouse scroll buttons. */
-+    if (c == K_SELECT || c == K_MOUSEDOWN || c == K_MOUSEUP)
- 	return retval;
- 
-     /* Set "compl_get_longest" when finding the first matches. */
-@@ -4495,14 +4630,13 @@
- 	curs_col = curwin->w_cursor.col;
- 	compl_pending = 0;
- 
--	/* if this same ctrl_x_mode has been interrupted use the text from
-+	/* If this same ctrl_x_mode has been interrupted use the text from
- 	 * "compl_startpos" to the cursor as a pattern to add a new word
- 	 * instead of expand the one before the cursor, in word-wise if
--	 * "compl_startpos"
--	 * is not in the same line as the cursor then fix it (the line has
--	 * been split because it was longer than 'tw').  if SOL is set then
--	 * skip the previous pattern, a word at the beginning of the line has
--	 * been inserted, we'll look for that  -- Acevedo. */
-+	 * "compl_startpos" is not in the same line as the cursor then fix it
-+	 * (the line has been split because it was longer than 'tw').  if SOL
-+	 * is set then skip the previous pattern, a word at the beginning of
-+	 * the line has been inserted, we'll look for that  -- Acevedo. */
- 	if ((compl_cont_status & CONT_INTRPT) == CONT_INTRPT
- 					    && compl_cont_mode == ctrl_x_mode)
- 	{
-@@ -5128,10 +5262,7 @@
-     i = 0;
-     for (;;)
-     {
--	do
--	    nc = safe_vgetc();
--	while (nc == K_IGNORE || nc == K_VER_SCROLLBAR
--						    || nc == K_HOR_SCROLLBAR);
-+	nc = plain_vgetc();
- #ifdef FEAT_CMDL_INFO
- 	if (!(State & CMDLINE)
- # ifdef FEAT_MBYTE
-@@ -6313,8 +6444,10 @@
- {
-     vim_free(last_insert);
-     last_insert = NULL;
-+# ifdef FEAT_INS_EXPAND
-     vim_free(compl_orig_text);
-     compl_orig_text = NULL;
-+# endif
- }
- #endif
- 
-@@ -7215,6 +7348,8 @@
- 		p = ml_get_curline();
- 		if (cin_iscase(p) || cin_isscopedecl(p) || cin_islabel(30))
- 		    return TRUE;
-+		/* Need to get the line again after cin_islabel(). */
-+		p = ml_get_curline();
- 		if (curwin->w_cursor.col > 2
- 			&& p[curwin->w_cursor.col - 1] == ':'
- 			&& p[curwin->w_cursor.col - 2] == ':')
-@@ -7477,7 +7612,7 @@
-      * deleted when ESC is hit.
-      */
-     ++no_mapping;
--    regname = safe_vgetc();
-+    regname = plain_vgetc();
- #ifdef FEAT_LANGMAP
-     LANGMAP_ADJUST(regname, TRUE);
- #endif
-@@ -7488,7 +7623,7 @@
- #ifdef FEAT_CMDL_INFO
- 	add_to_showcmd_c(literally);
- #endif
--	regname = safe_vgetc();
-+	regname = plain_vgetc();
- #ifdef FEAT_LANGMAP
- 	LANGMAP_ADJUST(regname, TRUE);
- #endif
-@@ -7579,7 +7714,7 @@
-      * deleted when ESC is hit.
-      */
-     ++no_mapping;
--    c = safe_vgetc();
-+    c = plain_vgetc();
-     --no_mapping;
-     switch (c)
-     {
-@@ -7998,7 +8133,8 @@
-     /*
-      * 0^D and ^^D: remove all indent.
-      */
--    if ((lastc == '0' || lastc == '^') && curwin->w_cursor.col)
-+    if (c == Ctrl_D && (lastc == '0' || lastc == '^')
-+						  && curwin->w_cursor.col > 0)
-     {
- 	--curwin->w_cursor.col;
- 	(void)del_char(FALSE);		/* delete the '^' or '0' */
-@@ -8053,6 +8189,29 @@
-     AppendCharToRedobuff(K_DEL);
- }
- 
-+static void ins_bs_one __ARGS((colnr_T *vcolp));
-+
-+/*
-+ * Delete one character for ins_bs().
-+ */
-+    static void
-+ins_bs_one(vcolp)
-+    colnr_T	*vcolp;
-+{
-+    dec_cursor();
-+    getvcol(curwin, &curwin->w_cursor, vcolp, NULL, NULL);
-+    if (State & REPLACE_FLAG)
-+    {
-+	/* Don't delete characters before the insert point when in
-+	 * Replace mode */
-+	if (curwin->w_cursor.lnum != Insstart.lnum
-+		|| curwin->w_cursor.col >= Insstart.col)
-+	    replace_do_bs();
-+    }
-+    else
-+	(void)del_char(FALSE);
-+}
-+
- /*
-  * Handle Backspace, delete-word and delete-line in Insert mode.
-  * Return TRUE when backspace was actually used.
-@@ -8282,9 +8441,7 @@
- 	    int		ts;
- 	    colnr_T	vcol;
- 	    colnr_T	want_vcol;
--#if 0
--	    int		extra = 0;
--#endif
-+	    colnr_T	start_vcol;
- 
- 	    *inserted_space_p = FALSE;
- 	    if (p_sta && in_indent)
-@@ -8295,6 +8452,7 @@
- 	     * 'showbreak' may get in the way, need to get the last column of
- 	     * the previous character. */
- 	    getvcol(curwin, &curwin->w_cursor, &vcol, NULL, NULL);
-+	    start_vcol = vcol;
- 	    dec_cursor();
- 	    getvcol(curwin, &curwin->w_cursor, NULL, NULL, &want_vcol);
- 	    inc_cursor();
-@@ -8303,30 +8461,7 @@
- 	    /* delete characters until we are at or before want_vcol */
- 	    while (vcol > want_vcol
- 		    && (cc = *(ml_get_cursor() - 1), vim_iswhite(cc)))
--	    {
--		dec_cursor();
--		getvcol(curwin, &curwin->w_cursor, &vcol, NULL, NULL);
--		if (State & REPLACE_FLAG)
--		{
--		    /* Don't delete characters before the insert point when in
--		     * Replace mode */
--		    if (curwin->w_cursor.lnum != Insstart.lnum
--			    || curwin->w_cursor.col >= Insstart.col)
--		    {
--#if 0	/* what was this for?  It causes problems when sw != ts. */
--			if (State == REPLACE && (int)vcol < want_vcol)
--			{
--			    (void)del_char(FALSE);
--			    extra = 2;	/* don't pop too much */
--			}
--			else
--#endif
--			    replace_do_bs();
--		    }
--		}
--		else
--		    (void)del_char(FALSE);
--	    }
-+		ins_bs_one(&vcol);
- 
- 	    /* insert extra spaces until we are at want_vcol */
- 	    while (vcol < want_vcol)
-@@ -8343,22 +8478,16 @@
- #endif
- 		{
- 		    ins_str((char_u *)" ");
--		    if ((State & REPLACE_FLAG) /* && extra <= 1 */)
--		    {
--#if 0
--			if (extra)
--			    replace_push_off(NUL);
--			else
--#endif
--			    replace_push(NUL);
--		    }
--#if 0
--		    if (extra == 2)
--			extra = 1;
--#endif
-+		    if ((State & REPLACE_FLAG))
-+			replace_push(NUL);
- 		}
- 		getvcol(curwin, &curwin->w_cursor, &vcol, NULL, NULL);
- 	    }
-+
-+	    /* If we are now back where we started delete one character.  Can
-+	     * happen when using 'sts' and 'linebreak'. */
-+	    if (vcol >= start_vcol)
-+		ins_bs_one(&vcol);
- 	}
- 
- 	/*
-@@ -8518,15 +8647,16 @@
-     int		up;
- {
-     pos_T	tpos;
--# if defined(FEAT_GUI) && defined(FEAT_WINDOWS)
--    win_T	*old_curwin;
-+# if defined(FEAT_WINDOWS)
-+    win_T	*old_curwin = curwin;
-+# endif
-+# ifdef FEAT_INS_EXPAND
-+    int		did_scroll = FALSE;
- # endif
- 
-     tpos = curwin->w_cursor;
- 
- # if defined(FEAT_GUI) && defined(FEAT_WINDOWS)
--    old_curwin = curwin;
--
-     /* Currently the mouse coordinates are only known in the GUI. */
-     if (gui.in_use && mouse_row >= 0 && mouse_col >= 0)
-     {
-@@ -8543,10 +8673,23 @@
- # endif
- 	undisplay_dollar();
- 
--    if (mod_mask & (MOD_MASK_SHIFT | MOD_MASK_CTRL))
--	scroll_redraw(up, (long)(curwin->w_botline - curwin->w_topline));
--    else
--	scroll_redraw(up, 3L);
-+# ifdef FEAT_INS_EXPAND
-+    /* Don't scroll the window in which completion is being done. */
-+    if (!pum_visible()
-+#  if defined(FEAT_WINDOWS)
-+	    || curwin != old_curwin
-+#  endif
-+	    )
-+# endif
-+    {
-+	if (mod_mask & (MOD_MASK_SHIFT | MOD_MASK_CTRL))
-+	    scroll_redraw(up, (long)(curwin->w_botline - curwin->w_topline));
-+	else
-+	    scroll_redraw(up, 3L);
-+# ifdef FEAT_INS_EXPAND
-+	did_scroll = TRUE;
-+# endif
-+    }
- 
- # if defined(FEAT_GUI) && defined(FEAT_WINDOWS)
-     curwin->w_redr_status = TRUE;
-@@ -8555,6 +8698,17 @@
-     curbuf = curwin->w_buffer;
- # endif
- 
-+# ifdef FEAT_INS_EXPAND
-+    /* The popup menu may overlay the window, need to redraw it.
-+     * TODO: Would be more efficient to only redraw the windows that are
-+     * overlapped by the popup menu. */
-+    if (pum_visible() && did_scroll)
-+    {
-+	redraw_all_later(NOT_VALID);
-+	ins_compl_show_pum();
-+    }
-+# endif
-+
-     if (!equalpos(curwin->w_cursor, tpos))
-     {
- 	start_arrow(&tpos);
-@@ -9257,7 +9411,7 @@
-      * mode message to be deleted when ESC is hit */
-     ++no_mapping;
-     ++allow_keys;
--    c = safe_vgetc();
-+    c = plain_vgetc();
-     --no_mapping;
-     --allow_keys;
-     if (IS_SPECIAL(c) || mod_mask)	    /* special key */
-@@ -9289,7 +9443,7 @@
- 	}
- 	++no_mapping;
- 	++allow_keys;
--	cc = safe_vgetc();
-+	cc = plain_vgetc();
- 	--no_mapping;
- 	--allow_keys;
- 	if (cc != ESC)
-diff -Naur vim71.orig/src/eval.c vim71/src/eval.c
---- vim71.orig/src/eval.c	2007-05-07 15:47:32.000000000 -0400
-+++ vim71/src/eval.c	2007-12-21 00:00:00.000000000 -0500
-@@ -369,17 +369,17 @@
- static int ex_let_vars __ARGS((char_u *arg, typval_T *tv, int copy, int semicolon, int var_count, char_u *nextchars));
- static char_u *skip_var_list __ARGS((char_u *arg, int *var_count, int *semicolon));
- static char_u *skip_var_one __ARGS((char_u *arg));
--static void list_hashtable_vars __ARGS((hashtab_T *ht, char_u *prefix, int empty));
--static void list_glob_vars __ARGS((void));
--static void list_buf_vars __ARGS((void));
--static void list_win_vars __ARGS((void));
-+static void list_hashtable_vars __ARGS((hashtab_T *ht, char_u *prefix, int empty, int *first));
-+static void list_glob_vars __ARGS((int *first));
-+static void list_buf_vars __ARGS((int *first));
-+static void list_win_vars __ARGS((int *first));
- #ifdef FEAT_WINDOWS
--static void list_tab_vars __ARGS((void));
-+static void list_tab_vars __ARGS((int *first));
- #endif
--static void list_vim_vars __ARGS((void));
--static void list_script_vars __ARGS((void));
--static void list_func_vars __ARGS((void));
--static char_u *list_arg_vars __ARGS((exarg_T *eap, char_u *arg));
-+static void list_vim_vars __ARGS((int *first));
-+static void list_script_vars __ARGS((int *first));
-+static void list_func_vars __ARGS((int *first));
-+static char_u *list_arg_vars __ARGS((exarg_T *eap, char_u *arg, int *first));
- static char_u *ex_let_one __ARGS((char_u *arg, typval_T *tv, int copy, char_u *endchars, char_u *op));
- static int check_changedtick __ARGS((char_u *arg));
- static char_u *get_lval __ARGS((char_u *name, typval_T *rettv, lval_T *lp, int unlet, int skip, int quiet, int fne_flags));
-@@ -475,6 +475,7 @@
- static void f_changenr __ARGS((typval_T *argvars, typval_T *rettv));
- static void f_char2nr __ARGS((typval_T *argvars, typval_T *rettv));
- static void f_cindent __ARGS((typval_T *argvars, typval_T *rettv));
-+static void f_clearmatches __ARGS((typval_T *argvars, typval_T *rettv));
- static void f_col __ARGS((typval_T *argvars, typval_T *rettv));
- #if defined(FEAT_INS_EXPAND)
- static void f_complete __ARGS((typval_T *argvars, typval_T *rettv));
-@@ -529,6 +530,7 @@
- static void f_getftime __ARGS((typval_T *argvars, typval_T *rettv));
- static void f_getftype __ARGS((typval_T *argvars, typval_T *rettv));
- static void f_getline __ARGS((typval_T *argvars, typval_T *rettv));
-+static void f_getmatches __ARGS((typval_T *argvars, typval_T *rettv));
- static void f_getpos __ARGS((typval_T *argvars, typval_T *rettv));
- static void f_getqflist __ARGS((typval_T *argvars, typval_T *rettv));
- static void f_getreg __ARGS((typval_T *argvars, typval_T *rettv));
-@@ -577,7 +579,9 @@
- static void f_maparg __ARGS((typval_T *argvars, typval_T *rettv));
- static void f_mapcheck __ARGS((typval_T *argvars, typval_T *rettv));
- static void f_match __ARGS((typval_T *argvars, typval_T *rettv));
-+static void f_matchadd __ARGS((typval_T *argvars, typval_T *rettv));
- static void f_matcharg __ARGS((typval_T *argvars, typval_T *rettv));
-+static void f_matchdelete __ARGS((typval_T *argvars, typval_T *rettv));
- static void f_matchend __ARGS((typval_T *argvars, typval_T *rettv));
- static void f_matchlist __ARGS((typval_T *argvars, typval_T *rettv));
- static void f_matchstr __ARGS((typval_T *argvars, typval_T *rettv));
-@@ -618,6 +622,7 @@
- static void f_setcmdpos __ARGS((typval_T *argvars, typval_T *rettv));
- static void f_setline __ARGS((typval_T *argvars, typval_T *rettv));
- static void f_setloclist __ARGS((typval_T *argvars, typval_T *rettv));
-+static void f_setmatches __ARGS((typval_T *argvars, typval_T *rettv));
- static void f_setpos __ARGS((typval_T *argvars, typval_T *rettv));
- static void f_setqflist __ARGS((typval_T *argvars, typval_T *rettv));
- static void f_setreg __ARGS((typval_T *argvars, typval_T *rettv));
-@@ -672,7 +677,7 @@
- static void f_writefile __ARGS((typval_T *argvars, typval_T *rettv));
- 
- static int list2fpos __ARGS((typval_T *arg, pos_T *posp, int *fnump));
--static pos_T *var2fpos __ARGS((typval_T *varp, int lnum, int *fnum));
-+static pos_T *var2fpos __ARGS((typval_T *varp, int dollar_lnum, int *fnum));
- static int get_env_len __ARGS((char_u **arg));
- static int get_id_len __ARGS((char_u **arg));
- static int get_name_len __ARGS((char_u **arg, char_u **alias, int evaluate, int verbose));
-@@ -699,8 +704,8 @@
- static hashtab_T *find_var_ht __ARGS((char_u *name, char_u **varname));
- static void vars_clear_ext __ARGS((hashtab_T *ht, int free_val));
- static void delete_var __ARGS((hashtab_T *ht, hashitem_T *hi));
--static void list_one_var __ARGS((dictitem_T *v, char_u *prefix));
--static void list_one_var_a __ARGS((char_u *prefix, char_u *name, int type, char_u *string));
-+static void list_one_var __ARGS((dictitem_T *v, char_u *prefix, int *first));
-+static void list_one_var_a __ARGS((char_u *prefix, char_u *name, int type, char_u *string, int *first));
- static void set_var __ARGS((char_u *name, typval_T *varp, int copy));
- static int var_check_ro __ARGS((int flags, char_u *name));
- static int var_check_fixed __ARGS((int flags, char_u *name));
-@@ -992,20 +997,20 @@
-     char_u	*value;
-     int		value_len;
- {
--    size_t	len;
-+    int		len;
- 
-     if (redir_lval == NULL)
- 	return;
- 
-     if (value_len == -1)
--	len = STRLEN(value);	/* Append the entire string */
-+	len = (int)STRLEN(value);	/* Append the entire string */
-     else
--	len = value_len;	/* Append only "value_len" characters */
-+	len = value_len;		/* Append only "value_len" characters */
- 
--    if (ga_grow(&redir_ga, (int)len) == OK)
-+    if (ga_grow(&redir_ga, len) == OK)
-     {
- 	mch_memmove((char *)redir_ga.ga_data + redir_ga.ga_len, value, len);
--	redir_ga.ga_len += (int)len;
-+	redir_ga.ga_len += len;
-     }
-     else
- 	var_redir_stop();
-@@ -1313,7 +1318,6 @@
- {
-     hashitem_T	*hi;
- 
--    clear_tv(&vimvars[idx].vv_tv);
-     vimvars[idx].vv_tv = *save_tv;
-     if (vimvars[idx].vv_type == VAR_UNKNOWN)
-     {
-@@ -1357,7 +1361,6 @@
- 
-     if (p_verbose == 0)
- 	--emsg_off;
--    vimvars[VV_VAL].vv_str = NULL;
-     restore_vimvar(VV_VAL, &save_val);
- 
-     return list;
-@@ -1411,7 +1414,8 @@
- }
- 
- 
--#if (defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL)) || defined(PROTO)
-+#if (defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL)) \
-+	|| defined(FEAT_COMPL_FUNC) || defined(PROTO)
- /*
-  * Call some vimL function and return the result in "*rettv".
-  * Uses argv[argc] for the function arguments.
-@@ -1484,6 +1488,7 @@
-     return ret;
- }
- 
-+# if (defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL)) || defined(PROTO)
- /*
-  * Call vimL function "func" and return the result as a string.
-  * Returns NULL when calling the function fails.
-@@ -1506,8 +1511,9 @@
-     clear_tv(&rettv);
-     return retval;
- }
-+# endif
- 
--#if defined(FEAT_COMPL_FUNC) || defined(PROTO)
-+# if defined(FEAT_COMPL_FUNC) || defined(PROTO)
- /*
-  * Call vimL function "func" and return the result as a number.
-  * Returns -1 when calling the function fails.
-@@ -1530,7 +1536,7 @@
-     clear_tv(&rettv);
-     return retval;
- }
--#endif
-+# endif
- 
- /*
-  * Call vimL function "func" and return the result as a list
-@@ -1556,9 +1562,9 @@
- 
-     return rettv.vval.v_list;
- }
--
- #endif
- 
-+
- /*
-  * Save the current function call pointer, and set it to NULL.
-  * Used when executing autocommands and for ":source".
-@@ -1691,6 +1697,7 @@
-     int		semicolon = 0;
-     char_u	op[2];
-     char_u	*argend;
-+    int		first = TRUE;
- 
-     argend = skip_var_list(arg, &var_count, &semicolon);
-     if (argend == NULL)
-@@ -1707,19 +1714,19 @@
- 	    EMSG(_(e_invarg));
- 	else if (!ends_excmd(*arg))
- 	    /* ":let var1 var2" */
--	    arg = list_arg_vars(eap, arg);
-+	    arg = list_arg_vars(eap, arg, &first);
- 	else if (!eap->skip)
- 	{
- 	    /* ":let" */
--	    list_glob_vars();
--	    list_buf_vars();
--	    list_win_vars();
-+	    list_glob_vars(&first);
-+	    list_buf_vars(&first);
-+	    list_win_vars(&first);
- #ifdef FEAT_WINDOWS
--	    list_tab_vars();
-+	    list_tab_vars(&first);
- #endif
--	    list_script_vars();
--	    list_func_vars();
--	    list_vim_vars();
-+	    list_script_vars(&first);
-+	    list_func_vars(&first);
-+	    list_vim_vars(&first);
- 	}
- 	eap->nextcmd = check_nextcmd(arg);
-     }
-@@ -1924,10 +1931,11 @@
-  * If "empty" is TRUE also list NULL strings as empty strings.
-  */
-     static void
--list_hashtable_vars(ht, prefix, empty)
-+list_hashtable_vars(ht, prefix, empty, first)
-     hashtab_T	*ht;
-     char_u	*prefix;
-     int		empty;
-+    int		*first;
- {
-     hashitem_T	*hi;
-     dictitem_T	*di;
-@@ -1942,7 +1950,7 @@
- 	    di = HI2DI(hi);
- 	    if (empty || di->di_tv.v_type != VAR_STRING
- 					   || di->di_tv.vval.v_string != NULL)
--		list_one_var(di, prefix);
-+		list_one_var(di, prefix, first);
- 	}
-     }
- }
-@@ -1951,32 +1959,38 @@
-  * List global variables.
-  */
-     static void
--list_glob_vars()
-+list_glob_vars(first)
-+    int *first;
- {
--    list_hashtable_vars(&globvarht, (char_u *)"", TRUE);
-+    list_hashtable_vars(&globvarht, (char_u *)"", TRUE, first);
- }
- 
- /*
-  * List buffer variables.
-  */
-     static void
--list_buf_vars()
-+list_buf_vars(first)
-+    int *first;
- {
-     char_u	numbuf[NUMBUFLEN];
- 
--    list_hashtable_vars(&curbuf->b_vars.dv_hashtab, (char_u *)"b:", TRUE);
-+    list_hashtable_vars(&curbuf->b_vars.dv_hashtab, (char_u *)"b:",
-+								 TRUE, first);
- 
-     sprintf((char *)numbuf, "%ld", (long)curbuf->b_changedtick);
--    list_one_var_a((char_u *)"b:", (char_u *)"changedtick", VAR_NUMBER, numbuf);
-+    list_one_var_a((char_u *)"b:", (char_u *)"changedtick", VAR_NUMBER,
-+							       numbuf, first);
- }
- 
- /*
-  * List window variables.
-  */
-     static void
--list_win_vars()
-+list_win_vars(first)
-+    int *first;
- {
--    list_hashtable_vars(&curwin->w_vars.dv_hashtab, (char_u *)"w:", TRUE);
-+    list_hashtable_vars(&curwin->w_vars.dv_hashtab,
-+						 (char_u *)"w:", TRUE, first);
- }
- 
- #ifdef FEAT_WINDOWS
-@@ -1984,9 +1998,11 @@
-  * List tab page variables.
-  */
-     static void
--list_tab_vars()
-+list_tab_vars(first)
-+    int *first;
- {
--    list_hashtable_vars(&curtab->tp_vars.dv_hashtab, (char_u *)"t:", TRUE);
-+    list_hashtable_vars(&curtab->tp_vars.dv_hashtab,
-+						 (char_u *)"t:", TRUE, first);
- }
- #endif
- 
-@@ -1994,39 +2010,44 @@
-  * List Vim variables.
-  */
-     static void
--list_vim_vars()
-+list_vim_vars(first)
-+    int *first;
- {
--    list_hashtable_vars(&vimvarht, (char_u *)"v:", FALSE);
-+    list_hashtable_vars(&vimvarht, (char_u *)"v:", FALSE, first);
- }
- 
- /*
-  * List script-local variables, if there is a script.
-  */
-     static void
--list_script_vars()
-+list_script_vars(first)
-+    int *first;
- {
-     if (current_SID > 0 && current_SID <= ga_scripts.ga_len)
--	list_hashtable_vars(&SCRIPT_VARS(current_SID), (char_u *)"s:", FALSE);
-+	list_hashtable_vars(&SCRIPT_VARS(current_SID),
-+						(char_u *)"s:", FALSE, first);
- }
- 
- /*
-  * List function variables, if there is a function.
-  */
-     static void
--list_func_vars()
-+list_func_vars(first)
-+    int *first;
- {
-     if (current_funccal != NULL)
- 	list_hashtable_vars(&current_funccal->l_vars.dv_hashtab,
--						       (char_u *)"l:", FALSE);
-+						(char_u *)"l:", FALSE, first);
- }
- 
- /*
-  * List variables in "arg".
-  */
-     static char_u *
--list_arg_vars(eap, arg)
-+list_arg_vars(eap, arg, first)
-     exarg_T	*eap;
-     char_u	*arg;
-+    int		*first;
- {
-     int		error = FALSE;
-     int		len;
-@@ -2083,15 +2104,15 @@
- 			{
- 			    switch (*name)
- 			    {
--				case 'g': list_glob_vars(); break;
--				case 'b': list_buf_vars(); break;
--				case 'w': list_win_vars(); break;
-+				case 'g': list_glob_vars(first); break;
-+				case 'b': list_buf_vars(first); break;
-+				case 'w': list_win_vars(first); break;
- #ifdef FEAT_WINDOWS
--				case 't': list_tab_vars(); break;
-+				case 't': list_tab_vars(first); break;
- #endif
--				case 'v': list_vim_vars(); break;
--				case 's': list_script_vars(); break;
--				case 'l': list_func_vars(); break;
-+				case 'v': list_vim_vars(first); break;
-+				case 's': list_script_vars(first); break;
-+				case 'l': list_func_vars(first); break;
- 				default:
- 					  EMSG2(_("E738: Can't list variables for %s"), name);
- 			    }
-@@ -2108,7 +2129,9 @@
- 			    *arg = NUL;
- 			    list_one_var_a((char_u *)"",
- 				    arg == arg_subsc ? name : name_start,
--				    tv.v_type, s == NULL ? (char_u *)"" : s);
-+				    tv.v_type,
-+				    s == NULL ? (char_u *)"" : s,
-+				    first);
- 			    *arg = c;
- 			    vim_free(tf);
- 			}
-@@ -6105,6 +6128,7 @@
-     /* Only do this once. */
-     want_garbage_collect = FALSE;
-     may_garbage_collect = FALSE;
-+    garbage_collect_at_exit = FALSE;
- 
-     /*
-      * 1. Go through all accessible variables and mark all lists and dicts
-@@ -6681,7 +6705,7 @@
-     dict_T	*d = NULL;
-     typval_T	tvkey;
-     typval_T	tv;
--    char_u	*key;
-+    char_u	*key = NULL;
-     dictitem_T	*item;
-     char_u	*start = skipwhite(*arg + 1);
-     char_u	buf[NUMBUFLEN];
-@@ -6721,20 +6745,24 @@
- 	    clear_tv(&tvkey);
- 	    goto failret;
- 	}
--	key = get_tv_string_buf_chk(&tvkey, buf);
--	if (key == NULL || *key == NUL)
-+	if (evaluate)
- 	{
--	    /* "key" is NULL when get_tv_string_buf_chk() gave an errmsg */
--	    if (key != NULL)
--		EMSG(_(e_emptykey));
--	    clear_tv(&tvkey);
--	    goto failret;
-+	    key = get_tv_string_buf_chk(&tvkey, buf);
-+	    if (key == NULL || *key == NUL)
-+	    {
-+		/* "key" is NULL when get_tv_string_buf_chk() gave an errmsg */
-+		if (key != NULL)
-+		    EMSG(_(e_emptykey));
-+		clear_tv(&tvkey);
-+		goto failret;
-+	    }
- 	}
- 
- 	*arg = skipwhite(*arg + 1);
- 	if (eval1(arg, &tv, evaluate) == FAIL)	/* recursive! */
- 	{
--	    clear_tv(&tvkey);
-+	    if (evaluate)
-+		clear_tv(&tvkey);
- 	    goto failret;
- 	}
- 	if (evaluate)
-@@ -6794,7 +6822,7 @@
-  * "numbuf" is used for a number.
-  * Does not put quotes around strings, as ":echo" displays values.
-  * When "copyID" is not NULL replace recursive lists and dicts with "...".
-- * May return NULL;
-+ * May return NULL.
-  */
-     static char_u *
- echo_string(tv, tofree, numbuf, copyID)
-@@ -6879,7 +6907,7 @@
-  * If the memory is allocated "tofree" is set to it, otherwise NULL.
-  * "numbuf" is used for a number.
-  * Puts quotes around strings, so that they can be parsed back by eval().
-- * May return NULL;
-+ * May return NULL.
-  */
-     static char_u *
- tv2string(tv, tofree, numbuf, copyID)
-@@ -7043,6 +7071,7 @@
-     {"changenr",	0, 0, f_changenr},
-     {"char2nr",		1, 1, f_char2nr},
-     {"cindent",		1, 1, f_cindent},
-+    {"clearmatches",	0, 0, f_clearmatches},
-     {"col",		1, 1, f_col},
- #if defined(FEAT_INS_EXPAND)
-     {"complete",	2, 2, f_complete},
-@@ -7082,7 +7111,7 @@
-     {"foldtextresult",	1, 1, f_foldtextresult},
-     {"foreground",	0, 0, f_foreground},
-     {"function",	1, 1, f_function},
--    {"garbagecollect",	0, 0, f_garbagecollect},
-+    {"garbagecollect",	0, 1, f_garbagecollect},
-     {"get",		2, 3, f_get},
-     {"getbufline",	2, 3, f_getbufline},
-     {"getbufvar",	2, 2, f_getbufvar},
-@@ -7099,6 +7128,7 @@
-     {"getftype",	1, 1, f_getftype},
-     {"getline",		1, 2, f_getline},
-     {"getloclist",	1, 1, f_getqflist},
-+    {"getmatches",	0, 0, f_getmatches},
-     {"getpos",		1, 1, f_getpos},
-     {"getqflist",	0, 0, f_getqflist},
-     {"getreg",		0, 2, f_getreg},
-@@ -7149,7 +7179,9 @@
-     {"maparg",		1, 3, f_maparg},
-     {"mapcheck",	1, 3, f_mapcheck},
-     {"match",		2, 4, f_match},
-+    {"matchadd",	2, 4, f_matchadd},
-     {"matcharg",	1, 1, f_matcharg},
-+    {"matchdelete",	1, 1, f_matchdelete},
-     {"matchend",	2, 4, f_matchend},
-     {"matchlist",	2, 4, f_matchlist},
-     {"matchstr",	2, 4, f_matchstr},
-@@ -7190,6 +7222,7 @@
-     {"setcmdpos",	1, 1, f_setcmdpos},
-     {"setline",		2, 2, f_setline},
-     {"setloclist",	2, 3, f_setloclist},
-+    {"setmatches",	1, 1, f_setmatches},
-     {"setpos",		2, 2, f_setpos},
-     {"setqflist",	1, 2, f_setqflist},
-     {"setreg",		2, 3, f_setreg},
-@@ -8240,6 +8273,20 @@
- }
- 
- /*
-+ * "clearmatches()" function
-+ */
-+/*ARGSUSED*/
-+    static void
-+f_clearmatches(argvars, rettv)
-+    typval_T	*argvars;
-+    typval_T	*rettv;
-+{
-+#ifdef FEAT_SEARCH_EXTRA
-+    clear_matches(curwin);
-+#endif
-+}
-+
-+/*
-  * "col(string)" function
-  */
-     static void
-@@ -8682,7 +8729,7 @@
-     static int		fnum = 0;
-     static int		change_start = 0;
-     static int		change_end = 0;
--    static hlf_T	hlID = 0;
-+    static hlf_T	hlID = (hlf_T)0;
-     int			filler_lines;
-     int			col;
- 
-@@ -9339,15 +9386,16 @@
- {
-     typval_T	rettv;
-     char_u	*s;
-+    int		retval = FAIL;
- 
-     copy_tv(tv, &vimvars[VV_VAL].vv_tv);
-     s = expr;
-     if (eval1(&s, &rettv, TRUE) == FAIL)
--	return FAIL;
-+	goto theend;
-     if (*s != NUL)  /* check for trailing chars after expr */
-     {
- 	EMSG2(_(e_invexpr2), s);
--	return FAIL;
-+	goto theend;
-     }
-     if (map)
-     {
-@@ -9366,10 +9414,12 @@
- 	/* On type error, nothing has been removed; return FAIL to stop the
- 	 * loop.  The error message was given by get_tv_number_chk(). */
- 	if (error)
--	    return FAIL;
-+	    goto theend;
-     }
-+    retval = OK;
-+theend:
-     clear_tv(&vimvars[VV_VAL].vv_tv);
--    return OK;
-+    return retval;
- }
- 
- /*
-@@ -9670,6 +9720,9 @@
-     /* This is postponed until we are back at the toplevel, because we may be
-      * using Lists and Dicts internally.  E.g.: ":echo [garbagecollect()]". */
-     want_garbage_collect = TRUE;
-+
-+    if (argvars[0].v_type != VAR_UNKNOWN && get_tv_number(&argvars[0]) == 1)
-+	garbage_collect_at_exit = TRUE;
- }
- 
- /*
-@@ -9868,18 +9921,24 @@
- 
-     ++no_mapping;
-     ++allow_keys;
--    if (argvars[0].v_type == VAR_UNKNOWN)
--	/* getchar(): blocking wait. */
--	n = safe_vgetc();
--    else if (get_tv_number_chk(&argvars[0], &error) == 1)
--	/* getchar(1): only check if char avail */
--	n = vpeekc();
--    else if (error || vpeekc() == NUL)
--	/* illegal argument or getchar(0) and no char avail: return zero */
--	n = 0;
--    else
--	/* getchar(0) and char avail: return char */
--	n = safe_vgetc();
-+    for (;;)
-+    {
-+	if (argvars[0].v_type == VAR_UNKNOWN)
-+	    /* getchar(): blocking wait. */
-+	    n = safe_vgetc();
-+	else if (get_tv_number_chk(&argvars[0], &error) == 1)
-+	    /* getchar(1): only check if char avail */
-+	    n = vpeekc();
-+	else if (error || vpeekc() == NUL)
-+	    /* illegal argument or getchar(0) and no char avail: return zero */
-+	    n = 0;
-+	else
-+	    /* getchar(0) and char avail: return char */
-+	    n = safe_vgetc();
-+	if (n == K_IGNORE)
-+	    continue;
-+	break;
-+    }
-     --no_mapping;
-     --allow_keys;
- 
-@@ -10136,7 +10195,13 @@
- 	if (mch_isdir(fname))
- 	    rettv->vval.v_number = 0;
- 	else
-+	{
- 	    rettv->vval.v_number = (varnumber_T)st.st_size;
-+
-+	    /* non-perfect check for overflow */
-+	    if ((off_t)rettv->vval.v_number != (off_t)st.st_size)
-+		rettv->vval.v_number = -2;
-+	}
-     }
-     else
- 	  rettv->vval.v_number = -1;
-@@ -10269,6 +10334,39 @@
- }
- 
- /*
-+ * "getmatches()" function
-+ */
-+/*ARGSUSED*/
-+    static void
-+f_getmatches(argvars, rettv)
-+    typval_T	*argvars;
-+    typval_T	*rettv;
-+{
-+#ifdef FEAT_SEARCH_EXTRA
-+    dict_T	*dict;
-+    matchitem_T	*cur = curwin->w_match_head;
-+
-+    rettv->vval.v_number = 0;
-+
-+    if (rettv_list_alloc(rettv) == OK)
-+    {
-+	while (cur != NULL)
-+	{
-+	    dict = dict_alloc();
-+	    if (dict == NULL)
-+		return;
-+	    dict_add_nr_str(dict, "group", 0L, syn_id2name(cur->hlg_id));
-+	    dict_add_nr_str(dict, "pattern", 0L, cur->pattern);
-+	    dict_add_nr_str(dict, "priority", (long)cur->priority, NULL);
-+	    dict_add_nr_str(dict, "id", (long)cur->id, NULL);
-+	    list_append_dict(rettv->vval.v_list, dict);
-+	    cur = cur->next;
-+	}
-+    }
-+#endif
-+}
-+
-+/*
-  * "getpos(string)" function
-  */
-     static void
-@@ -10290,7 +10388,8 @@
- 	    list_append_number(l, (varnumber_T)0);
- 	list_append_number(l, (fp != NULL) ? (varnumber_T)fp->lnum
- 							    : (varnumber_T)0);
--	list_append_number(l, (fp != NULL) ? (varnumber_T)fp->col + 1
-+	list_append_number(l, (fp != NULL)
-+		     ? (varnumber_T)(fp->col == MAXCOL ? MAXCOL : fp->col + 1)
- 							    : (varnumber_T)0);
- 	list_append_number(l,
- #ifdef FEAT_VIRTUALEDIT
-@@ -10785,6 +10884,9 @@
- 	"gui_gtk2",
- # endif
- #endif
-+#ifdef FEAT_GUI_GNOME
-+	"gui_gnome",
-+#endif
- #ifdef FEAT_GUI_MAC
- 	"gui_mac",
- #endif
-@@ -11471,14 +11573,12 @@
-     char_u	*xp_arg = NULL;
- 
-     rettv->v_type = VAR_STRING;
-+    rettv->vval.v_string = NULL;
- 
- #ifdef NO_CONSOLE_INPUT
-     /* While starting up, there is no place to enter text. */
-     if (no_console_input())
--    {
--	rettv->vval.v_string = NULL;
- 	return;
--    }
- #endif
- 
-     cmd_silent = FALSE;		/* Want to see the prompt. */
-@@ -12439,6 +12539,44 @@
- }
- 
- /*
-+ * "matchadd()" function
-+ */
-+    static void
-+f_matchadd(argvars, rettv)
-+    typval_T	*argvars;
-+    typval_T	*rettv;
-+{
-+#ifdef FEAT_SEARCH_EXTRA
-+    char_u	buf[NUMBUFLEN];
-+    char_u	*grp = get_tv_string_buf_chk(&argvars[0], buf);	/* group */
-+    char_u	*pat = get_tv_string_buf_chk(&argvars[1], buf);	/* pattern */
-+    int		prio = 10;	/* default priority */
-+    int		id = -1;
-+    int		error = FALSE;
-+
-+    rettv->vval.v_number = -1;
-+
-+    if (grp == NULL || pat == NULL)
-+	return;
-+    if (argvars[2].v_type != VAR_UNKNOWN)
-+    {
-+	prio = get_tv_number_chk(&argvars[2], &error);
-+	if (argvars[3].v_type != VAR_UNKNOWN)
-+	    id = get_tv_number_chk(&argvars[3], &error);
-+    }
-+    if (error == TRUE)
-+	return;
-+    if (id >= 1 && id <= 3)
-+    {
-+	EMSGN("E798: ID is reserved for \":match\": %ld", id);
-+	return;
-+    }
-+
-+    rettv->vval.v_number = match_add(curwin, grp, pat, prio, id);
-+#endif
-+}
-+
-+/*
-  * "matcharg()" function
-  */
-     static void
-@@ -12449,20 +12587,42 @@
-     if (rettv_list_alloc(rettv) == OK)
-     {
- #ifdef FEAT_SEARCH_EXTRA
--	int	mi = get_tv_number(&argvars[0]);
-+	int	    id = get_tv_number(&argvars[0]);
-+	matchitem_T *m;
- 
--	if (mi >= 1 && mi <= 3)
-+	if (id >= 1 && id <= 3)
- 	{
--	    list_append_string(rettv->vval.v_list,
--				 syn_id2name(curwin->w_match_id[mi - 1]), -1);
--	    list_append_string(rettv->vval.v_list,
--					     curwin->w_match_pat[mi - 1], -1);
-+	    if ((m = (matchitem_T *)get_match(curwin, id)) != NULL)
-+	    {
-+		list_append_string(rettv->vval.v_list,
-+						syn_id2name(m->hlg_id), -1);
-+		list_append_string(rettv->vval.v_list, m->pattern, -1);
-+	    }
-+	    else
-+	    {
-+		list_append_string(rettv->vval.v_list, NUL, -1);
-+		list_append_string(rettv->vval.v_list, NUL, -1);
-+	    }
- 	}
- #endif
-     }
- }
- 
- /*
-+ * "matchdelete()" function
-+ */
-+    static void
-+f_matchdelete(argvars, rettv)
-+    typval_T	*argvars;
-+    typval_T	*rettv;
-+{
-+#ifdef FEAT_SEARCH_EXTRA
-+    rettv->vval.v_number = match_delete(curwin,
-+				       (int)get_tv_number(&argvars[0]), TRUE);
-+#endif
-+}
-+
-+/*
-  * "matchend()" function
-  */
-     static void
-@@ -13680,7 +13840,7 @@
- 	    }
- 	    /* Shorten "remain". */
- 	    if (*q != NUL)
--		STRCPY(remain, q - 1);
-+		mch_memmove(remain, q - 1, STRLEN(q - 1) + 1);
- 	    else
- 	    {
- 		vim_free(remain);
-@@ -13919,6 +14079,8 @@
-     /* If 'n' flag is used: restore cursor position. */
-     if (flags & SP_NOMOVE)
- 	curwin->w_cursor = save_cursor;
-+    else
-+	curwin->w_set_curswant = TRUE;
- theend:
-     p_ws = save_p_ws;
- 
-@@ -14498,6 +14660,66 @@
- }
- 
- /*
-+ * "setmatches()" function
-+ */
-+    static void
-+f_setmatches(argvars, rettv)
-+    typval_T	*argvars;
-+    typval_T	*rettv;
-+{
-+#ifdef FEAT_SEARCH_EXTRA
-+    list_T	*l;
-+    listitem_T	*li;
-+    dict_T	*d;
-+
-+    rettv->vval.v_number = -1;
-+    if (argvars[0].v_type != VAR_LIST)
-+    {
-+	EMSG(_(e_listreq));
-+	return;
-+    }
-+    if ((l = argvars[0].vval.v_list) != NULL)
-+    {
-+
-+	/* To some extent make sure that we are dealing with a list from
-+	 * "getmatches()". */
-+	li = l->lv_first;
-+	while (li != NULL)
-+	{
-+	    if (li->li_tv.v_type != VAR_DICT
-+		    || (d = li->li_tv.vval.v_dict) == NULL)
-+	    {
-+		EMSG(_(e_invarg));
-+		return;
-+	    }
-+	    if (!(dict_find(d, (char_u *)"group", -1) != NULL
-+			&& dict_find(d, (char_u *)"pattern", -1) != NULL
-+			&& dict_find(d, (char_u *)"priority", -1) != NULL
-+			&& dict_find(d, (char_u *)"id", -1) != NULL))
-+	    {
-+		EMSG(_(e_invarg));
-+		return;
-+	    }
-+	    li = li->li_next;
-+	}
-+
-+	clear_matches(curwin);
-+	li = l->lv_first;
-+	while (li != NULL)
-+	{
-+	    d = li->li_tv.vval.v_dict;
-+	    match_add(curwin, get_dict_string(d, (char_u *)"group", FALSE),
-+		    get_dict_string(d, (char_u *)"pattern", FALSE),
-+		    (int)get_dict_number(d, (char_u *)"priority"),
-+		    (int)get_dict_number(d, (char_u *)"id"));
-+	    li = li->li_next;
-+	}
-+	rettv->vval.v_number = 0;
-+    }
-+#endif
-+}
-+
-+/*
-  * "setpos()" function
-  */
- /*ARGSUSED*/
-@@ -14785,6 +15007,10 @@
- 
-     p1 = tv2string(&(*(listitem_T **)s1)->li_tv, &tofree1, numbuf1, 0);
-     p2 = tv2string(&(*(listitem_T **)s2)->li_tv, &tofree2, numbuf2, 0);
-+    if (p1 == NULL)
-+	p1 = (char_u *)"";
-+    if (p2 == NULL)
-+	p2 = (char_u *)"";
-     if (item_compare_ic)
- 	res = STRICMP(p1, p2);
-     else
-@@ -15274,7 +15500,8 @@
- 
-     rettv->v_type = VAR_STRING;
-     rettv->vval.v_string = tv2string(&argvars[0], &tofree, numbuf, 0);
--    if (tofree == NULL)
-+    /* Make a copy if we have a value but it's not in allocate memory. */
-+    if (rettv->vval.v_string != NULL && tofree == NULL)
- 	rettv->vval.v_string = vim_strsave(rettv->vval.v_string);
- }
- 
-@@ -15599,7 +15826,7 @@
-     FILE	*fd;
- 
-     if (check_restricted() || check_secure())
--	return;
-+	goto done;
- 
-     if (argvars[1].v_type != VAR_UNKNOWN)
-     {
-@@ -15610,7 +15837,7 @@
- 	if ((infile = vim_tempname('i')) == NULL)
- 	{
- 	    EMSG(_(e_notmp));
--	    return;
-+	    goto done;
- 	}
- 
- 	fd = mch_fopen((char *)infile, WRITEBIN);
-@@ -16497,9 +16724,9 @@
-  * Returns NULL when there is an error.
-  */
-     static pos_T *
--var2fpos(varp, lnum, fnum)
-+var2fpos(varp, dollar_lnum, fnum)
-     typval_T	*varp;
--    int		lnum;		/* TRUE when $ is last line */
-+    int		dollar_lnum;	/* TRUE when $ is last line */
-     int		*fnum;		/* set to fnum for '0, 'A, etc. */
- {
-     char_u		*name;
-@@ -16512,6 +16739,7 @@
- 	list_T		*l;
- 	int		len;
- 	int		error = FALSE;
-+	listitem_T	*li;
- 
- 	l = varp->vval.v_list;
- 	if (l == NULL)
-@@ -16527,6 +16755,14 @@
- 	if (error)
- 	    return NULL;
- 	len = (long)STRLEN(ml_get(pos.lnum));
-+
-+	/* We accept "$" for the column number: last column. */
-+	li = list_find(l, 1L);
-+	if (li != NULL && li->li_tv.v_type == VAR_STRING
-+		&& li->li_tv.vval.v_string != NULL
-+		&& STRCMP(li->li_tv.vval.v_string, "$") == 0)
-+	    pos.col = len + 1;
-+
- 	/* Accept a position up to the NUL after the line. */
- 	if (pos.col == 0 || (int)pos.col > len + 1)
- 	    return NULL;	/* invalid column number */
-@@ -16559,7 +16795,7 @@
-     pos.coladd = 0;
- #endif
- 
--    if (name[0] == 'w' && lnum)
-+    if (name[0] == 'w' && dollar_lnum)
-     {
- 	pos.col = 0;
- 	if (name[1] == '0')		/* "w0": first visible line */
-@@ -16577,7 +16813,7 @@
-     }
-     else if (name[0] == '$')		/* last column or line */
-     {
--	if (lnum)
-+	if (dollar_lnum)
- 	{
- 	    pos.lnum = curbuf->b_ml.ml_line_count;
- 	    pos.col = 0;
-@@ -17798,9 +18034,10 @@
-  * List the value of one internal variable.
-  */
-     static void
--list_one_var(v, prefix)
-+list_one_var(v, prefix, first)
-     dictitem_T	*v;
-     char_u	*prefix;
-+    int		*first;
- {
-     char_u	*tofree;
-     char_u	*s;
-@@ -17808,18 +18045,21 @@
- 
-     s = echo_string(&v->di_tv, &tofree, numbuf, ++current_copyID);
-     list_one_var_a(prefix, v->di_key, v->di_tv.v_type,
--						s == NULL ? (char_u *)"" : s);
-+					 s == NULL ? (char_u *)"" : s, first);
-     vim_free(tofree);
- }
- 
-     static void
--list_one_var_a(prefix, name, type, string)
-+list_one_var_a(prefix, name, type, string, first)
-     char_u	*prefix;
-     char_u	*name;
-     int		type;
-     char_u	*string;
-+    int		*first;  /* when TRUE clear rest of screen and set to FALSE */
- {
--    msg_attr(prefix, 0);    /* don't use msg(), it overwrites "v:statusmsg" */
-+    /* don't use msg() or msg_attr() to avoid overwriting "v:statusmsg" */
-+    msg_start();
-+    msg_puts(prefix);
-     if (name != NULL)	/* "a:" vars don't have a name stored */
- 	msg_puts(name);
-     msg_putchar(' ');
-@@ -17847,6 +18087,11 @@
- 
-     if (type == VAR_FUNC)
- 	msg_puts((char_u *)"()");
-+    if (*first)
-+    {
-+	msg_clr_eos();
-+	*first = FALSE;
-+    }
- }
- 
- /*
-@@ -19136,6 +19381,28 @@
- 	goto theend;
-     }
- 
-+    /* Check if the name is a Funcref.  If so, use the value. */
-+    if (lv.ll_exp_name != NULL)
-+    {
-+	len = (int)STRLEN(lv.ll_exp_name);
-+	name = deref_func_name(lv.ll_exp_name, &len);
-+	if (name == lv.ll_exp_name)
-+	    name = NULL;
-+    }
-+    else
-+    {
-+	len = (int)(end - *pp);
-+	name = deref_func_name(*pp, &len);
-+	if (name == *pp)
-+	    name = NULL;
-+    }
-+    if (name != NULL)
-+    {
-+	name = vim_strsave(name);
-+	*pp = end;
-+	goto theend;
-+    }
-+
-     if (lv.ll_exp_name != NULL)
-     {
- 	len = (int)STRLEN(lv.ll_exp_name);
-@@ -19969,6 +20236,7 @@
- 		char_u	buf[MSG_BUF_LEN];
- 		char_u	numbuf2[NUMBUFLEN];
- 		char_u	*tofree;
-+		char_u	*s;
- 
- 		msg_puts((char_u *)"(");
- 		for (i = 0; i < argcount; ++i)
-@@ -19979,10 +20247,13 @@
- 			msg_outnum((long)argvars[i].vval.v_number);
- 		    else
- 		    {
--			trunc_string(tv2string(&argvars[i], &tofree,
--					      numbuf2, 0), buf, MSG_BUF_CLEN);
--			msg_puts(buf);
--			vim_free(tofree);
-+			s = tv2string(&argvars[i], &tofree, numbuf2, 0);
-+			if (s != NULL)
-+			{
-+			    trunc_string(s, buf, MSG_BUF_CLEN);
-+			    msg_puts(buf);
-+			    vim_free(tofree);
-+			}
- 		    }
- 		}
- 		msg_puts((char_u *)")");
-@@ -20060,14 +20331,18 @@
- 	    char_u	buf[MSG_BUF_LEN];
- 	    char_u	numbuf2[NUMBUFLEN];
- 	    char_u	*tofree;
-+	    char_u	*s;
- 
- 	    /* The value may be very long.  Skip the middle part, so that we
- 	     * have some idea how it starts and ends. smsg() would always
- 	     * truncate it at the end. */
--	    trunc_string(tv2string(fc.rettv, &tofree, numbuf2, 0),
--							   buf, MSG_BUF_CLEN);
--	    smsg((char_u *)_("%s returning %s"), sourcing_name, buf);
--	    vim_free(tofree);
-+	    s = tv2string(fc.rettv, &tofree, numbuf2, 0);
-+	    if (s != NULL)
-+	    {
-+		trunc_string(s, buf, MSG_BUF_CLEN);
-+		smsg((char_u *)_("%s returning %s"), sourcing_name, buf);
-+		vim_free(tofree);
-+	    }
- 	}
- 	msg_puts((char_u *)"\n");   /* don't overwrite this either */
- 
-@@ -21034,14 +21309,27 @@
- 	*usedlen += 2;
- 	s = get_past_head(*fnamep);
- 	while (tail > s && after_pathsep(s, tail))
--	    --tail;
-+	    mb_ptr_back(*fnamep, tail);
- 	*fnamelen = (int)(tail - *fnamep);
- #ifdef VMS
- 	if (*fnamelen > 0)
- 	    *fnamelen += 1; /* the path separator is part of the path */
- #endif
--	while (tail > s && !after_pathsep(s, tail))
--	    mb_ptr_back(*fnamep, tail);
-+	if (*fnamelen == 0)
-+	{
-+	    /* Result is empty.  Turn it into "." to make ":cd %:h" work. */
-+	    p = vim_strsave((char_u *)".");
-+	    if (p == NULL)
-+		return -1;
-+	    vim_free(*bufp);
-+	    *bufp = *fnamep = tail = p;
-+	    *fnamelen = 1;
-+	}
-+	else
-+	{
-+	    while (tail > s && !after_pathsep(s, tail))
-+		mb_ptr_back(*fnamep, tail);
-+	}
-     }
- 
-     /* ":8" - shortname  */
-diff -Naur vim71.orig/src/ex_cmds.c vim71/src/ex_cmds.c
---- vim71.orig/src/ex_cmds.c	2007-05-07 15:41:01.000000000 -0400
-+++ vim71/src/ex_cmds.c	2007-12-21 00:00:05.000000000 -0500
-@@ -408,7 +408,11 @@
- 		goto sortend;
- 	    }
- 	    *s = NUL;
--	    regmatch.regprog = vim_regcomp(p + 1, RE_MAGIC);
-+	    /* Use last search pattern if sort pattern is empty. */
-+	    if (s == p + 1 && last_search_pat() != NULL)
-+		regmatch.regprog = vim_regcomp(last_search_pat(), RE_MAGIC);
-+	    else
-+		regmatch.regprog = vim_regcomp(p + 1, RE_MAGIC);
- 	    if (regmatch.regprog == NULL)
- 		goto sortend;
- 	    p = s;		/* continue after the regexp */
-@@ -1646,7 +1650,7 @@
- {
-     vim_snprintf((char *)IObuff, IOSIZE, _("%sviminfo: %s in line: "),
- 							     errnum, message);
--    STRNCAT(IObuff, line, IOSIZE - STRLEN(IObuff));
-+    STRNCAT(IObuff, line, IOSIZE - STRLEN(IObuff) - 1);
-     if (IObuff[STRLEN(IObuff) - 1] == '\n')
- 	IObuff[STRLEN(IObuff) - 1] = NUL;
-     emsg(IObuff);
-@@ -1770,7 +1774,8 @@
- 	 * overwrite a user's viminfo file after a "su root", with a
- 	 * viminfo file that the user can't read.
- 	 */
--	st_old.st_dev = st_old.st_ino = 0;
-+	st_old.st_dev = 0;
-+	st_old.st_ino = 0;
- 	st_old.st_mode = 0600;
- 	if (mch_stat((char *)fname, &st_old) == 0
- 		&& getuid() != ROOT_UID
-@@ -2727,6 +2732,9 @@
- 		    && vim_strchr(p_cpo, CPO_OVERNEW) == NULL)
- 		|| (buf->b_flags & BF_READERR))
- 	    && !p_wa
-+#ifdef FEAT_QUICKFIX
-+	    && !bt_nofile(buf)
-+#endif
- 	    && vim_fexists(ffname))
-     {
- 	if (!eap->forceit && !eap->append)
-@@ -2912,22 +2920,35 @@
- }
- 
- /*
-- * Check if a buffer is read-only.  Ask for overruling in a dialog.
-- * Return TRUE and give an error message when the buffer is readonly.
-+ * Check if a buffer is read-only (either 'readonly' option is set or file is
-+ * read-only). Ask for overruling in a dialog. Return TRUE and give an error
-+ * message when the buffer is readonly.
-  */
-     static int
- check_readonly(forceit, buf)
-     int		*forceit;
-     buf_T	*buf;
- {
--    if (!*forceit && buf->b_p_ro)
-+    struct stat	st;
-+
-+    /* Handle a file being readonly when the 'readonly' option is set or when
-+     * the file exists and permissions are read-only.
-+     * We will send 0777 to check_file_readonly(), as the "perm" variable is
-+     * important for device checks but not here. */
-+    if (!*forceit && (buf->b_p_ro
-+		|| (mch_stat((char *)buf->b_ffname, &st) >= 0
-+		    && check_file_readonly(buf->b_ffname, 0777))))
-     {
- #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
- 	if ((p_confirm || cmdmod.confirm) && buf->b_fname != NULL)
- 	{
- 	    char_u	buff[IOSIZE];
- 
--	    dialog_msg(buff, _("'readonly' option is set for \"%s\".\nDo you wish to write anyway?"),
-+	    if (buf->b_p_ro)
-+		dialog_msg(buff, _("'readonly' option is set for \"%s\".\nDo you wish to write anyway?"),
-+		    buf->b_fname);
-+	    else
-+		dialog_msg(buff, _("File permissions of \"%s\" are read-only.\nIt may still be possible to write it.\nDo you wish to try?"),
- 		    buf->b_fname);
- 
- 	    if (vim_dialog_yesno(VIM_QUESTION, NULL, buff, 2) == VIM_YES)
-@@ -2941,9 +2962,14 @@
- 	}
- 	else
- #endif
-+	if (buf->b_p_ro)
- 	    EMSG(_(e_readonly));
-+	else
-+	    EMSG2(_("E505: \"%s\" is read-only (add ! to override)"),
-+		    buf->b_fname);
- 	return TRUE;
-     }
-+
-     return FALSE;
- }
- 
-@@ -2952,7 +2978,7 @@
-  * 'fnum' is the number of the file, if zero use ffname/sfname.
-  *
-  * Return 1 for "normal" error, 2 for "not written" error, 0 for success
-- * -1 for succesfully opening another file.
-+ * -1 for successfully opening another file.
-  * 'lnum' is the line number for the cursor in the new file (if non-zero).
-  */
-     int
-@@ -3367,7 +3393,7 @@
- 		 * was in this window (or another window).  If not used
- 		 * before, reset the local window options to the global
- 		 * values.  Also restores old folding stuff. */
--		get_winopts(buf);
-+		get_winopts(curbuf);
- #ifdef FEAT_SPELL
- 		did_get_winopts = TRUE;
- #endif
-@@ -3562,9 +3588,20 @@
- 	curwin_init();
- 
- #ifdef FEAT_FOLDING
--	/* It's like all lines in the buffer changed.  Need to update
--	 * automatic folding. */
-+	/* It's possible that all lines in the buffer changed.  Need to update
-+	 * automatic folding for all windows where it's used. */
-+# ifdef FEAT_WINDOWS
-+	{
-+	    win_T	    *win;
-+	    tabpage_T	    *tp;
-+
-+	    FOR_ALL_TAB_WINDOWS(tp, win)
-+		if (win->w_buffer == curbuf)
-+		    foldUpdateAll(win);
-+	}
-+# else
- 	foldUpdateAll(curwin);
-+# endif
- #endif
- 
- 	/* Change directories when the 'acd' option is set. */
-@@ -3649,8 +3686,8 @@
- #ifdef FEAT_SPELL
-     /* If the window options were changed may need to set the spell language.
-      * Can only do this after the buffer has been properly setup. */
--    if (did_get_winopts && curwin->w_p_spell && *buf->b_p_spl != NUL)
--	did_set_spelllang(buf);
-+    if (did_get_winopts && curwin->w_p_spell && *curbuf->b_p_spl != NUL)
-+	did_set_spelllang(curbuf);
- #endif
- 
-     if (command == NULL)
-@@ -3754,7 +3791,7 @@
- 	    workshop_file_opened((char *)curbuf->b_ffname, curbuf->b_p_ro);
- # endif
- # ifdef FEAT_NETBEANS_INTG
--	if (usingNetbeans & ((flags & ECMD_SET_HELP) != ECMD_SET_HELP))
-+	if (usingNetbeans && ((flags & ECMD_SET_HELP) != ECMD_SET_HELP))
- 	    netbeans_file_opened(curbuf);
- # endif
-     }
-@@ -4294,6 +4331,7 @@
- 	do_error = TRUE;
- 	do_print = FALSE;
- 	do_count = FALSE;
-+	do_number = FALSE;
- 	do_ic = 0;
-     }
-     while (*cmd)
-@@ -4464,7 +4502,7 @@
- 	     *
- 	     * The new text is built up in new_start[].  It has some extra
- 	     * room to avoid using alloc()/free() too often.  new_start_len is
--	     * the lenght of the allocated memory at new_start.
-+	     * the length of the allocated memory at new_start.
- 	     *
- 	     * Make a copy of the old line, so it won't be taken away when
- 	     * updating the screen or handling a multi-line match.  The "old_"
-@@ -4635,7 +4673,7 @@
- #endif
- 			    ++no_mapping;	/* don't map this key */
- 			    ++allow_keys;	/* allow special keys */
--			    i = safe_vgetc();
-+			    i = plain_vgetc();
- 			    --allow_keys;
- 			    --no_mapping;
- 
-@@ -4850,7 +4888,8 @@
- 			    ++line2;
- 			    /* move the cursor to the new line, like Vi */
- 			    ++curwin->w_cursor.lnum;
--			    STRCPY(new_start, p1 + 1);	/* copy the rest */
-+			    /* copy the rest */
-+			    mch_memmove(new_start, p1 + 1, STRLEN(p1 + 1) + 1);
- 			    p1 = new_start - 1;
- 			}
- 		    }
-@@ -6351,9 +6390,9 @@
- 	for (i = 0; i < ga.ga_len; ++i)
- 	{
- 	    s = ((char_u **)ga.ga_data)[i];
--	    if (STRNCMP(s, "help-tags", 9) == 0)
-+	    if (STRNCMP(s, "help-tags\t", 10) == 0)
- 		/* help-tags entry was added in formatted form */
--		fprintf(fd_tags, (char *)s);
-+		fputs((char *)s, fd_tags);
- 	    else
- 	    {
- 		fprintf(fd_tags, "%s\t/*", s);
-diff -Naur vim71.orig/src/ex_docmd.c vim71/src/ex_docmd.c
---- vim71.orig/src/ex_docmd.c	2007-05-07 15:49:38.000000000 -0400
-+++ vim71/src/ex_docmd.c	2007-12-21 00:00:05.000000000 -0500
-@@ -133,6 +133,7 @@
- static void	get_flags __ARGS((exarg_T *eap));
- #if !defined(FEAT_PERL) || !defined(FEAT_PYTHON) || !defined(FEAT_TCL) \
- 	|| !defined(FEAT_RUBY) || !defined(FEAT_MZSCHEME)
-+# define HAVE_EX_SCRIPT_NI
- static void	ex_script_ni __ARGS((exarg_T *eap));
- #endif
- static char_u	*invalid_range __ARGS((exarg_T *eap));
-@@ -666,7 +667,7 @@
- 		if (ex_pressedreturn)
- 		{
- 		    /* go up one line, to overwrite the ":<CR>" line, so the
--		     * output doensn't contain empty lines. */
-+		     * output doesn't contain empty lines. */
- 		    msg_row = prev_msg_row;
- 		    if (prev_msg_row == Rows - 1)
- 			msg_row--;
-@@ -1741,7 +1742,9 @@
- 	}
- 
- 	/* ignore comment and empty lines */
--	if (*ea.cmd == '"' || *ea.cmd == NUL)
-+	if (*ea.cmd == '"')
-+	    goto doend;
-+	if (*ea.cmd == NUL)
- 	{
- 	    ex_pressedreturn = TRUE;
- 	    goto doend;
-@@ -2118,7 +2121,11 @@
- #ifdef FEAT_USR_CMDS
- 	    !USER_CMDIDX(ea.cmdidx) &&
- #endif
--	    cmdnames[ea.cmdidx].cmd_func == ex_ni);
-+	    (cmdnames[ea.cmdidx].cmd_func == ex_ni
-+#ifdef HAVE_EX_SCRIPT_NI
-+	     || cmdnames[ea.cmdidx].cmd_func == ex_script_ni
-+#endif
-+	     ));
- 
- #ifndef FEAT_EVAL
-     /*
-@@ -2654,7 +2661,7 @@
- 		errormsg = IObuff;
- 	    }
- 	    STRCAT(errormsg, ": ");
--	    STRNCAT(errormsg, *cmdlinep, IOSIZE - STRLEN(IObuff));
-+	    STRNCAT(errormsg, *cmdlinep, IOSIZE - STRLEN(IObuff) - 1);
- 	}
- 	emsg(errormsg);
-     }
-@@ -2756,7 +2763,7 @@
- 
-     /*
-      * Isolate the command and search for it in the command table.
--     * Exeptions:
-+     * Exceptions:
-      * - the 'k' command can directly be followed by any character.
-      * - the 's' command can be followed directly by 'c', 'g', 'i', 'I' or 'r'
-      *	    but :sre[wind] is another command, as are :scrip[tnames],
-@@ -2957,6 +2964,57 @@
- #endif
- 
- #if defined(FEAT_EVAL) || defined(PROTO)
-+static struct cmdmod
-+{
-+    char	*name;
-+    int		minlen;
-+    int		has_count;  /* :123verbose  :3tab */
-+} cmdmods[] = {
-+    {"aboveleft", 3, FALSE},
-+    {"belowright", 3, FALSE},
-+    {"botright", 2, FALSE},
-+    {"browse", 3, FALSE},
-+    {"confirm", 4, FALSE},
-+    {"hide", 3, FALSE},
-+    {"keepalt", 5, FALSE},
-+    {"keepjumps", 5, FALSE},
-+    {"keepmarks", 3, FALSE},
-+    {"leftabove", 5, FALSE},
-+    {"lockmarks", 3, FALSE},
-+    {"rightbelow", 6, FALSE},
-+    {"sandbox", 3, FALSE},
-+    {"silent", 3, FALSE},
-+    {"tab", 3, TRUE},
-+    {"topleft", 2, FALSE},
-+    {"verbose", 4, TRUE},
-+    {"vertical", 4, FALSE},
-+};
-+
-+/*
-+ * Return length of a command modifier (including optional count).
-+ * Return zero when it's not a modifier.
-+ */
-+    int
-+modifier_len(cmd)
-+    char_u	*cmd;
-+{
-+    int		i, j;
-+    char_u	*p = cmd;
-+
-+    if (VIM_ISDIGIT(*cmd))
-+	p = skipwhite(skipdigits(cmd));
-+    for (i = 0; i < sizeof(cmdmods) / sizeof(struct cmdmod); ++i)
-+    {
-+	for (j = 0; p[j] != NUL; ++j)
-+	    if (p[j] != cmdmods[i].name[j])
-+		break;
-+	if (!isalpha(p[j]) && j >= cmdmods[i].minlen
-+					&& (p == cmd || cmdmods[i].has_count))
-+	    return j + (p - cmd);
-+    }
-+    return 0;
-+}
-+
- /*
-  * Return > 0 if an Ex command "name" exists.
-  * Return 2 if there is an exact match.
-@@ -2971,30 +3029,6 @@
-     int		i;
-     int		j;
-     char_u	*p;
--    static struct cmdmod
--    {
--	char	*name;
--	int	minlen;
--    } cmdmods[] = {
--	{"aboveleft", 3},
--	{"belowright", 3},
--	{"botright", 2},
--	{"browse", 3},
--	{"confirm", 4},
--	{"hide", 3},
--	{"keepalt", 5},
--	{"keepjumps", 5},
--	{"keepmarks", 3},
--	{"leftabove", 5},
--	{"lockmarks", 3},
--	{"rightbelow", 6},
--	{"sandbox", 3},
--	{"silent", 3},
--	{"tab", 3},
--	{"topleft", 2},
--	{"verbose", 4},
--	{"vertical", 4},
--    };
- 
-     /* Check command modifiers. */
-     for (i = 0; i < sizeof(cmdmods) / sizeof(struct cmdmod); ++i)
-@@ -3276,39 +3310,65 @@
- 
-     if (ea.argt & XFILE)
-     {
--	int in_quote = FALSE;
--	char_u *bow = NULL;	/* Beginning of word */
-+	int	c;
-+	int	in_quote = FALSE;
-+	char_u	*bow = NULL;	/* Beginning of word */
- 
- 	/*
- 	 * Allow spaces within back-quotes to count as part of the argument
- 	 * being expanded.
- 	 */
- 	xp->xp_pattern = skipwhite(arg);
--	for (p = xp->xp_pattern; *p; )
-+	p = xp->xp_pattern;
-+	while (*p != NUL)
- 	{
--	    if (*p == '\\' && p[1] != NUL)
-+#ifdef FEAT_MBYTE
-+	    if (has_mbyte)
-+		c = mb_ptr2char(p);
-+	    else
-+#endif
-+		c = *p;
-+	    if (c == '\\' && p[1] != NUL)
- 		++p;
-+	    else if (c == '`')
-+	    {
-+		if (!in_quote)
-+		{
-+		    xp->xp_pattern = p;
-+		    bow = p + 1;
-+		}
-+		in_quote = !in_quote;
-+	    }
- #ifdef SPACE_IN_FILENAME
--	    else if (vim_iswhite(*p) && (!(ea.argt & NOSPC) || usefilter))
-+	    else if (!vim_isfilec_or_wc(c)
-+					 && (!(ea.argt & NOSPC) || usefilter))
- #else
--	    else if (vim_iswhite(*p))
-+	    else if (!vim_isfilec_or_wc(c))
- #endif
- 	    {
--		p = skipwhite(p);
-+		while (*p != NUL)
-+		{
-+#ifdef FEAT_MBYTE
-+		    if (has_mbyte)
-+			c = mb_ptr2char(p);
-+		    else
-+#endif
-+			c = *p;
-+		    if (c == '`' || vim_isfilec_or_wc(c))
-+			break;
-+#ifdef FEAT_MBYTE
-+		    if (has_mbyte)
-+			len = (*mb_ptr2len)(p);
-+		    else
-+#endif
-+			len = 1;
-+		    mb_ptr_adv(p);
-+		}
- 		if (in_quote)
- 		    bow = p;
- 		else
- 		    xp->xp_pattern = p;
--		--p;
--	    }
--	    else if (*p == '`')
--	    {
--		if (!in_quote)
--		{
--		    xp->xp_pattern = p;
--		    bow = p + 1;
--		}
--		in_quote = !in_quote;
-+		p -= len;
- 	    }
- 	    mb_ptr_adv(p);
- 	}
-@@ -3401,14 +3461,13 @@
- 	case CMD_windo:
- 	    return arg;
- 
--#ifdef FEAT_SEARCH_EXTRA
-+#ifdef FEAT_CMDL_COMPL
-+# ifdef FEAT_SEARCH_EXTRA
- 	case CMD_match:
- 	    if (*arg == NUL || !ends_excmd(*arg))
- 	    {
--		/* Dummy call to clear variables. */
--		set_context_in_highlight_cmd(xp, (char_u *)"link n");
--		xp->xp_context = EXPAND_HIGHLIGHT;
--		xp->xp_pattern = arg;
-+		/* also complete "None" */
-+		set_context_in_echohl_cmd(xp, arg);
- 		arg = skipwhite(skiptowhite(arg));
- 		if (*arg != NUL)
- 		{
-@@ -3417,9 +3476,8 @@
- 		}
- 	    }
- 	    return find_nextcmd(arg);
--#endif
-+# endif
- 
--#ifdef FEAT_CMDL_COMPL
- /*
-  * All completion for the +cmdline_compl feature goes here.
-  */
-@@ -3617,8 +3675,7 @@
- 	    break;
- 
- 	case CMD_echohl:
--	    xp->xp_context = EXPAND_HIGHLIGHT;
--	    xp->xp_pattern = arg;
-+	    set_context_in_echohl_cmd(xp, arg);
- 	    break;
- #endif
- 	case CMD_highlight:
-@@ -3997,8 +4054,7 @@
- 	eap->errmsg = (char_u *)N_("E319: Sorry, the command is not available in this version");
- }
- 
--#if !defined(FEAT_PERL) || !defined(FEAT_PYTHON) || !defined(FEAT_TCL) \
--	|| !defined(FEAT_RUBY) || !defined(FEAT_MZSCHEME)
-+#ifdef HAVE_EX_SCRIPT_NI
- /*
-  * Function called for script command which is Not Implemented.  NI!
-  * Skips over ":perl <<EOF" constructs.
-@@ -4376,7 +4432,7 @@
- 			    || vim_strchr(eap->arg, '~') != NULL)
- 		    {
- 			expand_env_esc(eap->arg, NameBuff, MAXPATHL,
--								 TRUE, NULL);
-+							    TRUE, TRUE, NULL);
- 			has_wildcards = mch_has_wildcard(NameBuff);
- 			p = NameBuff;
- 		    }
-@@ -4492,7 +4548,8 @@
- 	    if (eap->argt & (USECTRLV | XFILE))
- 		++p;		/* skip CTRL-V and next char */
- 	    else
--		STRCPY(p, p + 1);	/* remove CTRL-V and skip next char */
-+				/* remove CTRL-V and skip next char */
-+		mch_memmove(p, p + 1, STRLEN(p));
- 	    if (*p == NUL)		/* stop at NUL after CTRL-V */
- 		break;
- 	}
-@@ -6650,7 +6707,7 @@
-  * The list should be allocated using alloc(), as should each item in the
-  * list. This function takes over responsibility for freeing the list.
-  *
-- * XXX The list is made into the arggument list. This is freed using
-+ * XXX The list is made into the argument list. This is freed using
-  * FreeWild(), which does a series of vim_free() calls, unless the two defines
-  * __EMX__ and __ALWAYS_HAS_TRAILING_NUL_POINTER are set. In this case, a
-  * routine _fnexplodefree() is used. This may cause problems, but as the drop
-@@ -7768,7 +7825,7 @@
- 	if (vim_strchr(p_cpo, CPO_CHDIR) != NULL && curbufIsChanged()
- 							     && !eap->forceit)
- 	{
--	    EMSG(_("E747: Cannot change directory, buffer is modifed (add ! to override)"));
-+	    EMSG(_("E747: Cannot change directory, buffer is modified (add ! to override)"));
- 	    return;
- 	}
- 
-@@ -8399,21 +8456,17 @@
- 		    || *arg == '"')
- 	    {
- 		redir_reg = *arg++;
--		if (*arg == '>' && arg[1] == '>')
-+		if (*arg == '>' && arg[1] == '>')  /* append */
- 		    arg += 2;
--		else if ((*arg == NUL || (*arg == '>' && arg[1] == NUL)) &&
--			 (islower(redir_reg)
--# ifdef FEAT_CLIPBOARD
--			    || redir_reg == '*'
--			    || redir_reg == '+'
--# endif
--			    || redir_reg == '"'))
-+		else
- 		{
-+		    /* Can use both "@a" and "@a>". */
- 		    if (*arg == '>')
- 			arg++;
--
--		    /* make register empty */
--		    write_reg_contents(redir_reg, (char_u *)"", -1, FALSE);
-+		    /* Make register empty when not using @A-@Z and the
-+		     * command is valid. */
-+		    if (*arg == NUL && !isupper(redir_reg))
-+			write_reg_contents(redir_reg, (char_u *)"", -1, FALSE);
- 		}
- 	    }
- 	    if (*arg != NUL)
-@@ -9368,7 +9421,7 @@
-     if (src > srcstart && src[-1] == '\\')
-     {
- 	*usedlen = 0;
--	STRCPY(src - 1, src);		/* remove backslash */
-+	mch_memmove(src - 1, src, STRLEN(src) + 1);	/* remove backslash */
- 	return NULL;
-     }
- 
-@@ -10816,12 +10869,13 @@
-     exarg_T	*eap;
- {
-     char_u	*p;
-+    char_u	*g = NULL;
-     char_u	*end;
-     int		c;
--    int		mi;
-+    int		id;
- 
-     if (eap->line2 <= 3)
--	mi = eap->line2 - 1;
-+	id = eap->line2;
-     else
-     {
- 	EMSG(e_invcmd);
-@@ -10830,13 +10884,7 @@
- 
-     /* First clear any old pattern. */
-     if (!eap->skip)
--    {
--	vim_free(curwin->w_match[mi].regprog);
--	curwin->w_match[mi].regprog = NULL;
--	vim_free(curwin->w_match_pat[mi]);
--	curwin->w_match_pat[mi] = NULL;
--	redraw_later(SOME_VALID);	/* always need a redraw */
--    }
-+	match_delete(curwin, id, FALSE);
- 
-     if (ends_excmd(*eap->arg))
- 	end = eap->arg;
-@@ -10847,15 +10895,7 @@
-     {
- 	p = skiptowhite(eap->arg);
- 	if (!eap->skip)
--	{
--	    curwin->w_match_id[mi] = syn_namen2id(eap->arg,
--							 (int)(p - eap->arg));
--	    if (curwin->w_match_id[mi] == 0)
--	    {
--		EMSG2(_(e_nogroup), eap->arg);
--		return;
--	    }
--	}
-+	    g = vim_strnsave(eap->arg, (int)(p - eap->arg));
- 	p = skipwhite(p);
- 	if (*p == NUL)
- 	{
-@@ -10879,14 +10919,8 @@
- 
- 	    c = *end;
- 	    *end = NUL;
--	    curwin->w_match[mi].regprog = vim_regcomp(p + 1, RE_MAGIC);
--	    if (curwin->w_match[mi].regprog == NULL)
--	    {
--		EMSG2(_(e_invarg2), p);
--		*end = c;
--		return;
--	    }
--	    curwin->w_match_pat[mi] = vim_strsave(p + 1);
-+	    match_add(curwin, g, p + 1, 10, id);
-+	    vim_free(g);
- 	    *end = c;
- 	}
-     }
-diff -Naur vim71.orig/src/ex_eval.c vim71/src/ex_eval.c
---- vim71.orig/src/ex_eval.c	2007-05-07 15:47:50.000000000 -0400
-+++ vim71/src/ex_eval.c	2007-12-20 23:59:51.000000000 -0500
-@@ -1551,7 +1551,7 @@
- 		}
- 		save_cpo  = p_cpo;
- 		p_cpo = (char_u *)"";
--		regmatch.regprog = vim_regcomp(pat, TRUE);
-+		regmatch.regprog = vim_regcomp(pat, RE_MAGIC + RE_STRING);
- 		regmatch.rm_ic = FALSE;
- 		if (end != NULL)
- 		    *end = save_char;
-@@ -2269,9 +2269,18 @@
- has_loop_cmd(p)
-     char_u	*p;
- {
--    p = skipwhite(p);
--    while (*p == ':')
--	p = skipwhite(p + 1);
-+    int		len;
-+
-+    /* skip modifiers, white space and ':' */
-+    for (;;)
-+    {
-+	while (*p == ' ' || *p == '\t' || *p == ':')
-+	    ++p;
-+	len = modifier_len(p);
-+	if (len == 0)
-+	    break;
-+	p += len;
-+    }
-     if ((p[0] == 'w' && p[1] == 'h')
- 	    || (p[0] == 'f' && p[1] == 'o' && p[2] == 'r'))
- 	return TRUE;
-diff -Naur vim71.orig/src/ex_getln.c vim71/src/ex_getln.c
---- vim71.orig/src/ex_getln.c	2007-05-07 15:47:23.000000000 -0400
-+++ vim71/src/ex_getln.c	2007-12-21 00:00:02.000000000 -0500
-@@ -268,7 +268,9 @@
-     {
- 	xpc.xp_context = ccline.xp_context;
- 	xpc.xp_pattern = ccline.cmdbuff;
-+# if defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL)
- 	xpc.xp_arg = ccline.xp_arg;
-+# endif
-     }
- #endif
- 
-@@ -484,7 +486,8 @@
- 	if (xpc.xp_context == EXPAND_MENUNAMES && p_wmnu)
- 	{
- 	    /* Hitting <Down> after "emenu Name.": complete submenu */
--	    if (ccline.cmdbuff[ccline.cmdpos - 1] == '.' && c == K_DOWN)
-+	    if (c == K_DOWN && ccline.cmdpos > 0
-+				  && ccline.cmdbuff[ccline.cmdpos - 1] == '.')
- 		c = p_wc;
- 	    else if (c == K_UP)
- 	    {
-@@ -533,9 +536,11 @@
- 	    upseg[3] = PATHSEP;
- 	    upseg[4] = NUL;
- 
--	    if (ccline.cmdbuff[ccline.cmdpos - 1] == PATHSEP
--		    && c == K_DOWN
--		    && (ccline.cmdbuff[ccline.cmdpos - 2] != '.'
-+	    if (c == K_DOWN
-+		    && ccline.cmdpos > 0
-+		    && ccline.cmdbuff[ccline.cmdpos - 1] == PATHSEP
-+		    && (ccline.cmdpos < 3
-+			|| ccline.cmdbuff[ccline.cmdpos - 2] != '.'
- 			|| ccline.cmdbuff[ccline.cmdpos - 3] != '.'))
- 	    {
- 		/* go down a directory */
-@@ -636,7 +641,7 @@
- 	{
- 	    ++no_mapping;
- 	    ++allow_keys;
--	    c = safe_vgetc();
-+	    c = plain_vgetc();
- 	    --no_mapping;
- 	    --allow_keys;
- 	    /* CTRL-\ e doesn't work when obtaining an expression. */
-@@ -730,8 +735,8 @@
- 	    /* In Ex mode a backslash escapes a newline. */
- 	    if (exmode_active
- 		    && c != ESC
--		    && ccline.cmdpos > 0
- 		    && ccline.cmdpos == ccline.cmdlen
-+		    && ccline.cmdpos > 0
- 		    && ccline.cmdbuff[ccline.cmdpos - 1] == '\\')
- 	    {
- 		if (c == K_KENTER)
-@@ -1086,11 +1091,11 @@
- #endif
- 		putcmdline('"', TRUE);
- 		++no_mapping;
--		i = c = safe_vgetc();	/* CTRL-R <char> */
-+		i = c = plain_vgetc();	/* CTRL-R <char> */
- 		if (i == Ctrl_O)
- 		    i = Ctrl_R;		/* CTRL-R CTRL-O == CTRL-R CTRL-R */
- 		if (i == Ctrl_R)
--		    c = safe_vgetc();	/* CTRL-R CTRL-R <char> */
-+		    c = plain_vgetc();	/* CTRL-R CTRL-R <char> */
- 		--no_mapping;
- #ifdef FEAT_EVAL
- 		/*
-@@ -1181,10 +1186,10 @@
- 	case K_LEFT:
- 	case K_S_LEFT:
- 	case K_C_LEFT:
-+		if (ccline.cmdpos == 0)
-+		    goto cmdline_not_changed;
- 		do
- 		{
--		    if (ccline.cmdpos == 0)
--			break;
- 		    --ccline.cmdpos;
- #ifdef FEAT_MBYTE
- 		    if (has_mbyte)	/* move to first byte of char */
-@@ -1193,7 +1198,8 @@
- #endif
- 		    ccline.cmdspos -= cmdline_charsize(ccline.cmdpos);
- 		}
--		while ((c == K_S_LEFT || c == K_C_LEFT
-+		while (ccline.cmdpos > 0
-+			&& (c == K_S_LEFT || c == K_C_LEFT
- 			       || (mod_mask & (MOD_MASK_SHIFT|MOD_MASK_CTRL)))
- 			&& ccline.cmdbuff[ccline.cmdpos - 1] != ' ');
- #ifdef FEAT_MBYTE
-@@ -2090,11 +2096,11 @@
-     garray_T	line_ga;
-     char_u	*pend;
-     int		startcol = 0;
--    int		c1;
-+    int		c1 = 0;
-     int		escaped = FALSE;	/* CTRL-V typed */
-     int		vcol = 0;
-     char_u	*p;
--    int		prev_char = 0;
-+    int		prev_char;
- 
-     /* Switch cursor on now.  This avoids that it happens after the "\n", which
-      * confuses the system function that computes tabstops. */
-@@ -2147,6 +2153,7 @@
- 
- 	/* Get one character at a time.  Don't use inchar(), it can't handle
- 	 * special characters. */
-+	prev_char = c1;
- 	c1 = vgetc();
- 
- 	/*
-@@ -2204,7 +2211,6 @@
- redraw:
- 		/* redraw the line */
- 		msg_col = startcol;
--		windgoto(msg_row, msg_col);
- 		vcol = 0;
- 		for (p = (char_u *)line_ga.ga_data;
- 			  p < (char_u *)line_ga.ga_data + line_ga.ga_len; ++p)
-@@ -2223,6 +2229,7 @@
- 		    }
- 		}
- 		msg_clr_eos();
-+		windgoto(msg_row, msg_col);
- 		continue;
- 	    }
- 
-@@ -2268,7 +2275,6 @@
- 	if (IS_SPECIAL(c1))
- 	    c1 = '?';
- 	((char_u *)line_ga.ga_data)[line_ga.ga_len] = c1;
--	prev_char = c1;
- 	if (c1 == '\n')
- 	    msg_putchar('\n');
- 	else if (c1 == TAB)
-@@ -3311,6 +3317,10 @@
-  * Return a pointer to alloced memory containing the new string.
-  * Return NULL for failure.
-  *
-+ * "orig" is the originally expanded string, copied to allocated memory.  It
-+ * should either be kept in orig_save or freed.  When "mode" is WILD_NEXT or
-+ * WILD_PREV "orig" should be NULL.
-+ *
-  * Results are cached in xp->xp_files and xp->xp_numfiles, except when "mode"
-  * is WILD_EXPAND_FREE or WILD_ALL.
-  *
-@@ -3344,6 +3354,7 @@
-     char_u	*ss = NULL;
-     static int	findex;
-     static char_u *orig_save = NULL;	/* kept value of orig */
-+    int		orig_saved = FALSE;
-     int		i;
-     long_u	len;
-     int		non_suf_match;		/* number without matching suffix */
-@@ -3395,7 +3406,7 @@
- 	    return NULL;
-     }
- 
--/* free old names */
-+    /* free old names */
-     if (xp->xp_numfiles != -1 && mode != WILD_ALL && mode != WILD_LONGEST)
-     {
- 	FreeWild(xp->xp_numfiles, xp->xp_files);
-@@ -3412,6 +3423,7 @@
-     {
- 	vim_free(orig_save);
- 	orig_save = orig;
-+	orig_saved = TRUE;
- 
- 	/*
- 	 * Do the expansion.
-@@ -3536,6 +3548,10 @@
-     if (mode == WILD_EXPAND_FREE || mode == WILD_ALL)
- 	ExpandCleanup(xp);
- 
-+    /* Free "orig" if it wasn't stored in "orig_save". */
-+    if (!orig_saved)
-+	vim_free(orig);
-+
-     return ss;
- }
- 
-@@ -4148,13 +4164,19 @@
- 
- #ifdef FEAT_EVAL
-     if (ccline.cmdfirstc == '=')
-+    {
-+# ifdef FEAT_CMDL_COMPL
- 	/* pass CMD_SIZE because there is no real command */
- 	set_context_for_expression(xp, str, CMD_SIZE);
-+# endif
-+    }
-     else if (ccline.input_fn)
-     {
- 	xp->xp_context = ccline.xp_context;
- 	xp->xp_pattern = ccline.cmdbuff;
-+# if defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL)
- 	xp->xp_arg = ccline.xp_arg;
-+# endif
-     }
-     else
- #endif
-@@ -4295,10 +4317,11 @@
- 			    && pat[i + 1] == '\\'
- 			    && pat[i + 2] == '\\'
- 			    && pat[i + 3] == ' ')
--			STRCPY(pat + i, pat + i + 3);
-+			mch_memmove(pat + i, pat + i + 3,
-+						     STRLEN(pat + i + 3) + 1);
- 		    if (xp->xp_backslash == XP_BS_ONE
- 			    && pat[i + 1] == ' ')
--			STRCPY(pat + i, pat + i + 1);
-+			mch_memmove(pat + i, pat + i + 1, STRLEN(pat + i));
- 		}
- 	}
- 
-@@ -4502,6 +4525,12 @@
-     if (xp->xp_context != EXPAND_MENUNAMES && xp->xp_context != EXPAND_MENUS)
- 	sort_strings(*file, *num_file);
- 
-+#ifdef FEAT_CMDL_COMPL
-+    /* Reset the variables used for special highlight names expansion, so that
-+     * they don't show up when getting normal highlight names by ID. */
-+    reset_expand_highlight();
-+#endif
-+
-     return OK;
- }
- 
-@@ -4535,7 +4564,7 @@
-     pat = vim_strsave(filepat);
-     for (i = 0; pat[i]; ++i)
- 	if (pat[i] == '\\' && pat[i + 1] == ' ')
--	    STRCPY(pat + i, pat + i + 1);
-+	    mch_memmove(pat + i, pat + i + 1, STRLEN(pat + i));
- 
-     flags |= EW_FILE | EW_EXEC;
- 
-@@ -5907,7 +5936,7 @@
- 
- # ifdef FEAT_AUTOCMD
-     /* Don't execute autocommands while creating the window. */
--    ++autocmd_block;
-+    block_autocmds();
- # endif
-     /* don't use a new tab page */
-     cmdmod.tab = 0;
-@@ -5916,6 +5945,9 @@
-     if (win_split((int)p_cwh, WSP_BOT) == FAIL)
-     {
- 	beep_flush();
-+# ifdef FEAT_AUTOCMD
-+	unblock_autocmds();
-+# endif
- 	return K_IGNORE;
-     }
-     cmdwin_type = ccline.cmdfirstc;
-@@ -5938,7 +5970,7 @@
- 
- # ifdef FEAT_AUTOCMD
-     /* Do execute autocommands for setting the filetype (load syntax). */
--    --autocmd_block;
-+    unblock_autocmds();
- # endif
- 
-     /* Showing the prompt may have set need_wait_return, reset it. */
-@@ -6092,7 +6124,7 @@
- 
- # ifdef FEAT_AUTOCMD
- 	/* Don't execute autocommands while deleting the window. */
--	++autocmd_block;
-+	block_autocmds();
- # endif
- 	wp = curwin;
- 	bp = curbuf;
-@@ -6104,7 +6136,7 @@
- 	win_size_restore(&winsizes);
- 
- # ifdef FEAT_AUTOCMD
--	--autocmd_block;
-+	unblock_autocmds();
- # endif
-     }
- 
-diff -Naur vim71.orig/src/feature.h vim71/src/feature.h
---- vim71.orig/src/feature.h	2007-05-07 15:33:19.000000000 -0400
-+++ vim71/src/feature.h	2007-12-20 23:57:30.000000000 -0500
-@@ -673,7 +673,7 @@
- # define ESC_CHG_TO_ENG_MODE		/* if defined, when ESC pressed,
- 					 * turn to english mode
- 					 */
--# if !defined(FEAT_XFONTSET) && defined(HAVE_X11)
-+# if !defined(FEAT_XFONTSET) && defined(HAVE_X11) && !defined(HAVE_GTK2)
- #  define FEAT_XFONTSET			/* Hangul input requires xfontset */
- # endif
- # if defined(FEAT_XIM) && !defined(LINT)
-diff -Naur vim71.orig/src/fileio.c vim71/src/fileio.c
---- vim71.orig/src/fileio.c	2007-05-10 07:29:44.000000000 -0400
-+++ vim71/src/fileio.c	2007-12-20 23:59:40.000000000 -0500
-@@ -44,6 +44,10 @@
- /* Is there any system that doesn't have access()? */
- #define USE_MCH_ACCESS
- 
-+#if defined(sun) && defined(S_ISCHR)
-+# define OPEN_CHR_FILES
-+static int is_dev_fd_file(char_u *fname);
-+#endif
- #ifdef FEAT_MBYTE
- static char_u *next_fenc __ARGS((char_u **pp));
- # ifdef FEAT_EVAL
-@@ -406,6 +410,10 @@
- # ifdef S_ISSOCK
- 		      && !S_ISSOCK(perm)	    /* ... or socket */
- # endif
-+# ifdef OPEN_CHR_FILES
-+		      && !(S_ISCHR(perm) && is_dev_fd_file(fname))
-+			/* ... or a character special file named /dev/fd/<n> */
-+# endif
- 						)
- 	{
- 	    if (S_ISDIR(perm))
-@@ -424,7 +432,7 @@
- 	 */
- 	if (!p_odev && mch_nodetype(fname) == NODE_WRITABLE)
- 	{
--	    filemess(curbuf, fname, (char_u *)_("is a device (disabled with 'opendevice' option"), 0);
-+	    filemess(curbuf, fname, (char_u *)_("is a device (disabled with 'opendevice' option)"), 0);
- 	    msg_end();
- 	    msg_scroll = msg_save;
- 	    return FAIL;
-@@ -646,6 +654,7 @@
- 	curbuf->b_start_eol = TRUE;
- #ifdef FEAT_MBYTE
- 	curbuf->b_p_bomb = FALSE;
-+	curbuf->b_start_bomb = FALSE;
- #endif
-     }
- 
-@@ -904,7 +913,10 @@
- 	file_rewind = FALSE;
- #ifdef FEAT_MBYTE
- 	if (set_options)
-+	{
- 	    curbuf->b_p_bomb = FALSE;
-+	    curbuf->b_start_bomb = FALSE;
-+	}
- 	conv_error = 0;
- #endif
-     }
-@@ -1353,7 +1365,10 @@
- 		    size -= blen;
- 		    mch_memmove(ptr, ptr + blen, (size_t)size);
- 		    if (set_options)
-+		    {
- 			curbuf->b_p_bomb = TRUE;
-+			curbuf->b_start_bomb = TRUE;
-+		    }
- 		}
- 
- 		if (fio_flags == FIO_UCSBOM)
-@@ -2265,6 +2280,13 @@
- 	    }
- #  endif
- # endif
-+# ifdef OPEN_CHR_FILES
-+	    if (S_ISCHR(perm))			    /* or character special */
-+	    {
-+		STRCAT(IObuff, _("[character special]"));
-+		c = TRUE;
-+	    }
-+# endif
- #endif
- 	    if (curbuf->b_p_ro)
- 	    {
-@@ -2464,6 +2486,25 @@
-     return OK;
- }
- 
-+#ifdef OPEN_CHR_FILES
-+/*
-+ * Returns TRUE if the file name argument is of the form "/dev/fd/\d\+",
-+ * which is the name of files used for process substitution output by
-+ * some shells on some operating systems, e.g., bash on SunOS.
-+ * Do not accept "/dev/fd/[012]", opening these may hang Vim.
-+ */
-+    static int
-+is_dev_fd_file(fname)
-+    char_u	*fname;
-+{
-+    return (STRNCMP(fname, "/dev/fd/", 8) == 0
-+	    && VIM_ISDIGIT(fname[8])
-+	    && *skipdigits(fname + 9) == NUL
-+	    && (fname[9] != NUL
-+		|| (fname[8] != '0' && fname[8] != '1' && fname[8] != '2')));
-+}
-+#endif
-+
- #ifdef FEAT_MBYTE
- 
- /*
-@@ -2734,6 +2775,32 @@
- #endif
- 
- /*
-+ * Return TRUE if a file appears to be read-only from the file permissions.
-+ */
-+    int
-+check_file_readonly(fname, perm)
-+    char_u	*fname;		/* full path to file */
-+    int		perm;		/* known permissions on file */
-+{
-+#ifndef USE_MCH_ACCESS
-+    int	    fd = 0;
-+#endif
-+
-+    return (
-+#ifdef USE_MCH_ACCESS
-+# ifdef UNIX
-+	(perm & 0222) == 0 ||
-+# endif
-+	mch_access((char *)fname, W_OK)
-+#else
-+	(fd = mch_open((char *)fname, O_RDWR | O_EXTRA, 0)) < 0
-+					? TRUE : (close(fd), FALSE)
-+#endif
-+	);
-+}
-+
-+
-+/*
-  * buf_write() - write to file "fname" lines "start" through "end"
-  *
-  * We do our own buffering here because fwrite() is so slow.
-@@ -3142,7 +3209,8 @@
-      * Get information about original file (if there is one).
-      */
- #if defined(UNIX) && !defined(ARCHIE)
--    st_old.st_dev = st_old.st_ino = 0;
-+    st_old.st_dev = 0;
-+    st_old.st_ino = 0;
-     perm = -1;
-     if (mch_stat((char *)fname, &st_old) < 0)
- 	newfile = TRUE;
-@@ -3219,17 +3287,8 @@
- 	 * Check if the file is really writable (when renaming the file to
- 	 * make a backup we won't discover it later).
- 	 */
--	file_readonly = (
--# ifdef USE_MCH_ACCESS
--#  ifdef UNIX
--		    (perm & 0222) == 0 ||
--#  endif
--		    mch_access((char *)fname, W_OK)
--# else
--		    (fd = mch_open((char *)fname, O_RDWR | O_EXTRA, 0)) < 0
--						   ? TRUE : (close(fd), FALSE)
--# endif
--		    );
-+	file_readonly = check_file_readonly(fname, (int)perm);
-+
- 	if (!forceit && file_readonly)
- 	{
- 	    if (vim_strchr(p_cpo, CPO_FWRITE) != NULL)
-@@ -5495,6 +5554,8 @@
- }
- #endif
- 
-+#if defined(FEAT_VIMINFO) || defined(FEAT_BROWSE) || \
-+    defined(FEAT_QUICKFIX) || defined(PROTO)
- /*
-  * Try to find a shortname by comparing the fullname with the current
-  * directory.
-@@ -5548,6 +5609,7 @@
- 	p = NULL;
-     return p;
- }
-+#endif
- 
- /*
-  * Shorten filenames for all buffers.
-@@ -7107,6 +7169,7 @@
- 
- static event_T	last_event;
- static int	last_group;
-+static int	autocmd_blocked = 0;	/* block all autocmds */
- 
- /*
-  * Show the autocommands for one AutoPat.
-@@ -8396,7 +8459,7 @@
-      * Quickly return if there are no autocommands for this event or
-      * autocommands are blocked.
-      */
--    if (first_autopat[(int)event] == NULL || autocmd_block > 0)
-+    if (first_autopat[(int)event] == NULL || autocmd_blocked > 0)
- 	goto BYPASS_AU;
- 
-     /*
-@@ -8710,6 +8773,40 @@
-     return retval;
- }
- 
-+# ifdef FEAT_EVAL
-+static char_u	*old_termresponse = NULL;
-+# endif
-+
-+/*
-+ * Block triggering autocommands until unblock_autocmd() is called.
-+ * Can be used recursively, so long as it's symmetric.
-+ */
-+    void
-+block_autocmds()
-+{
-+# ifdef FEAT_EVAL
-+    /* Remember the value of v:termresponse. */
-+    if (autocmd_blocked == 0)
-+	old_termresponse = get_vim_var_str(VV_TERMRESPONSE);
-+# endif
-+    ++autocmd_blocked;
-+}
-+
-+    void
-+unblock_autocmds()
-+{
-+    --autocmd_blocked;
-+
-+# ifdef FEAT_EVAL
-+    /* When v:termresponse was set while autocommands were blocked, trigger
-+     * the autocommands now.  Esp. useful when executing a shell command
-+     * during startup (vimdiff). */
-+    if (autocmd_blocked == 0
-+		      && get_vim_var_str(VV_TERMRESPONSE) != old_termresponse)
-+	apply_autocmds(EVENT_TERMRESPONSE, NULL, NULL, FALSE, curbuf);
-+# endif
-+}
-+
- /*
-  * Find next autocommand pattern that matches.
-  */
-diff -Naur vim71.orig/src/fold.c vim71/src/fold.c
---- vim71.orig/src/fold.c	2007-05-07 15:46:32.000000000 -0400
-+++ vim71/src/fold.c	2007-12-20 23:59:22.000000000 -0500
-@@ -858,7 +858,14 @@
- 	    || foldmethodIsDiff(wp)
- #endif
- 	    || foldmethodIsSyntax(wp))
-+    {
-+	int save_got_int = got_int;
-+
-+	/* reset got_int here, otherwise it won't work */
-+	got_int = FALSE;
- 	foldUpdateIEMS(wp, top, bot);
-+	got_int |= save_got_int;
-+    }
- }
- 
- /* foldUpdateAll() {{{2 */
-diff -Naur vim71.orig/src/getchar.c vim71/src/getchar.c
---- vim71.orig/src/getchar.c	2007-05-07 15:18:20.000000000 -0400
-+++ vim71/src/getchar.c	2007-12-21 00:00:01.000000000 -0500
-@@ -253,8 +253,9 @@
- 	return;
-     }
-     else if (buf->bh_index != 0)
--	STRCPY(buf->bh_first.b_next->b_str,
--				 buf->bh_first.b_next->b_str + buf->bh_index);
-+	mch_memmove(buf->bh_first.b_next->b_str,
-+		    buf->bh_first.b_next->b_str + buf->bh_index,
-+		    STRLEN(buf->bh_first.b_next->b_str + buf->bh_index) + 1);
-     buf->bh_index = 0;
- 
-     if (buf->bh_space >= (int)slen)
-@@ -1596,8 +1597,16 @@
- 		continue;
- 	    }
- #endif
--
- #ifdef FEAT_GUI
-+	    /* Handle focus event here, so that the caller doesn't need to
-+	     * know about it.  Return K_IGNORE so that we loop once (needed if
-+	     * 'lazyredraw' is set). */
-+	    if (c == K_FOCUSGAINED || c == K_FOCUSLOST)
-+	    {
-+		ui_focus_change(c == K_FOCUSGAINED);
-+		c = K_IGNORE;
-+	    }
-+
- 	    /* Translate K_CSI to CSI.  The special key is only used to avoid
- 	     * it being recognized as the start of a special key. */
- 	    if (c == K_CSI)
-@@ -1741,6 +1750,22 @@
- }
- 
- /*
-+ * Like safe_vgetc(), but loop to handle K_IGNORE.
-+ * Also ignore scrollbar events.
-+ */
-+    int
-+plain_vgetc()
-+{
-+    int c;
-+
-+    do
-+    {
-+	c = safe_vgetc();
-+    } while (c == K_IGNORE || c == K_VER_SCROLLBAR || c == K_HOR_SCROLLBAR);
-+    return c;
-+}
-+
-+/*
-  * Check if a character is available, such that vgetc() will not block.
-  * If the next character is a special character or multi-byte, the returned
-  * character is not valid!.
-diff -Naur vim71.orig/src/globals.h vim71/src/globals.h
---- vim71.orig/src/globals.h	2007-05-07 15:44:26.000000000 -0400
-+++ vim71/src/globals.h	2007-12-20 23:59:05.000000000 -0500
-@@ -301,13 +301,17 @@
- #endif
- 
- #ifdef FEAT_EVAL
--/* Garbage collection can only take place when we are sure there are no Lists
-+/*
-+ * Garbage collection can only take place when we are sure there are no Lists
-  * or Dictionaries being used internally.  This is flagged with
-  * "may_garbage_collect" when we are at the toplevel.
-  * "want_garbage_collect" is set by the garbagecollect() function, which means
-- * we do garbage collection before waiting for a char at the toplevel. */
-+ * we do garbage collection before waiting for a char at the toplevel.
-+ * "garbage_collect_at_exit" indicates garbagecollect(1) was called.
-+ */
- EXTERN int	may_garbage_collect INIT(= FALSE);
- EXTERN int	want_garbage_collect INIT(= FALSE);
-+EXTERN int	garbage_collect_at_exit INIT(= FALSE);
- 
- /* ID of script being sourced or was sourced to define the current function. */
- EXTERN scid_T	current_SID INIT(= 0);
-@@ -362,7 +366,6 @@
- EXTERN int	autocmd_busy INIT(= FALSE);	/* Is apply_autocmds() busy? */
- EXTERN int	autocmd_no_enter INIT(= FALSE); /* *Enter autocmds disabled */
- EXTERN int	autocmd_no_leave INIT(= FALSE); /* *Leave autocmds disabled */
--EXTERN int	autocmd_block INIT(= 0);	/* block all autocmds */
- EXTERN int	modified_was_set;		/* did ":set modified" */
- EXTERN int	did_filetype INIT(= FALSE);	/* FileType event found */
- EXTERN int	keep_filetype INIT(= FALSE);	/* value for did_filetype when
-@@ -801,7 +804,7 @@
- EXTERN int (*mb_char2bytes) __ARGS((int c, char_u *buf)) INIT(= latin_char2bytes);
- EXTERN int (*mb_ptr2cells) __ARGS((char_u *p)) INIT(= latin_ptr2cells);
- EXTERN int (*mb_char2cells) __ARGS((int c)) INIT(= latin_char2cells);
--EXTERN int (*mb_off2cells) __ARGS((unsigned off)) INIT(= latin_off2cells);
-+EXTERN int (*mb_off2cells) __ARGS((unsigned off, unsigned max_off)) INIT(= latin_off2cells);
- EXTERN int (*mb_ptr2char) __ARGS((char_u *p)) INIT(= latin_ptr2char);
- EXTERN int (*mb_head_off) __ARGS((char_u *base, char_u *p)) INIT(= latin_head_off);
- 
-diff -Naur vim71.orig/src/gui.c vim71/src/gui.c
---- vim71.orig/src/gui.c	2007-05-07 15:50:55.000000000 -0400
-+++ vim71/src/gui.c	2007-12-20 23:59:35.000000000 -0500
-@@ -1080,7 +1080,8 @@
- 		cur_width = gui.char_width;
- 	    }
- #ifdef FEAT_MBYTE
--	    if (has_mbyte && (*mb_off2cells)(LineOffset[gui.row] + gui.col) > 1)
-+	    if (has_mbyte && (*mb_off2cells)(LineOffset[gui.row] + gui.col,
-+				    LineOffset[gui.row] + screen_Columns) > 1)
- 	    {
- 		/* Double wide character. */
- 		if (shape_table[idx].shape != SHAPE_VER)
-@@ -1159,7 +1160,7 @@
- #endif
- 
- # if defined(FEAT_GUI_TABLINE) && (defined(FEAT_GUI_MSWIN) \
-- 	|| defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_MAC))
-+	|| defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_MAC))
-     if (gui_has_tabline())
- 	text_area_y += gui.tabline_height;
- #endif
-@@ -4213,7 +4214,19 @@
- #endif
- 	    )
-     {
--	redraw_win_later(wp, VALID);
-+	int type = VALID;
-+
-+#ifdef FEAT_INS_EXPAND
-+	if (pum_visible())
-+	{
-+	    type = NOT_VALID;
-+	    wp->w_lines_valid = 0;
-+	}
-+#endif
-+	/* Don't set must_redraw here, it may cause the popup menu to
-+	 * disappear when losing focus after a scrollbar drag. */
-+	if (wp->w_redr_type < type)
-+	    wp->w_redr_type = type;
- 	updateWindow(wp);   /* update window, status line, and cmdline */
-     }
- 
-@@ -4518,7 +4531,18 @@
-     xim_set_focus(in_focus);
- # endif
- 
--    ui_focus_change(in_focus);
-+    /* Put events in the input queue only when allowed.
-+     * ui_focus_change() isn't called directly, because it invokes
-+     * autocommands and that must not happen asynchronously. */
-+    if (!hold_gui_events)
-+    {
-+	char_u  bytes[3];
-+
-+	bytes[0] = CSI;
-+	bytes[1] = KS_EXTRA;
-+	bytes[2] = in_focus ? (int)KE_FOCUSGAINED : (int)KE_FOCUSLOST;
-+	add_to_input_buf(bytes, 3);
-+    }
- #endif
- }
- 
-@@ -5117,7 +5141,7 @@
- 		p = vim_strsave_escaped(fnames[i], (char_u *)"\\ \t\"|");
- # endif
- 		if (p != NULL)
--		    add_to_input_buf(p, (int)STRLEN(p));
-+		    add_to_input_buf_csi(p, (int)STRLEN(p));
- 		vim_free(p);
- 		vim_free(fnames[i]);
- 	    }
-diff -Naur vim71.orig/src/gui_gtk.c vim71/src/gui_gtk.c
---- vim71.orig/src/gui_gtk.c	2007-05-10 04:37:37.000000000 -0400
-+++ vim71/src/gui_gtk.c	2007-12-20 23:57:55.000000000 -0500
-@@ -53,8 +53,8 @@
- # ifdef bindtextdomain
- #  undef bindtextdomain
- # endif
--# ifdef bindtextdomain_codeset
--#  undef bindtextdomain_codeset
-+# ifdef bind_textdomain_codeset
-+#  undef bind_textdomain_codeset
- # endif
- # if defined(FEAT_GETTEXT) && !defined(ENABLE_NLS)
- #  define ENABLE_NLS	/* so the texts in the dialog boxes are translated */
-@@ -1630,11 +1630,14 @@
-  */
- /*ARGSUSED*/
-     static int
--dlg_key_press_event(GtkWidget * widget, GdkEventKey * event, CancelData *data)
-+dlg_key_press_event(GtkWidget *widget, GdkEventKey *event, CancelData *data)
- {
--    /* Ignore hitting Enter when there is no default button. */
--    if (data->ignore_enter && event->keyval == GDK_Return)
-+    /* Ignore hitting Enter (or Space) when there is no default button. */
-+    if (data->ignore_enter && (event->keyval == GDK_Return
-+						     || event->keyval == ' '))
- 	return TRUE;
-+    else    /* A different key was pressed, return to normal behavior */
-+	data->ignore_enter = FALSE;
- 
-     if (event->keyval != GDK_Escape && event->keyval != GDK_Return)
- 	return FALSE;
-@@ -2224,6 +2227,13 @@
- {
-     DialogInfo *di = (DialogInfo *)data;
- 
-+    /* Ignore hitting Enter (or Space) when there is no default button. */
-+    if (di->ignore_enter && (event->keyval == GDK_Return
-+						     || event->keyval == ' '))
-+	return TRUE;
-+    else    /* A different key was pressed, return to normal behavior */
-+	di->ignore_enter = FALSE;
-+
-     /* Close the dialog when hitting "Esc". */
-     if (event->keyval == GDK_Escape)
-     {
-diff -Naur vim71.orig/src/gui_gtk_x11.c vim71/src/gui_gtk_x11.c
---- vim71.orig/src/gui_gtk_x11.c	2007-05-10 04:37:49.000000000 -0400
-+++ vim71/src/gui_gtk_x11.c	2007-12-20 23:59:24.000000000 -0500
-@@ -36,8 +36,8 @@
- # ifdef bindtextdomain
- #  undef bindtextdomain
- # endif
--# ifdef bindtextdomain_codeset
--#  undef bindtextdomain_codeset
-+# ifdef bind_textdomain_codeset
-+#  undef bind_textdomain_codeset
- # endif
- # if defined(FEAT_GETTEXT) && !defined(ENABLE_NLS)
- #  define ENABLE_NLS	/* so the texts in the dialog boxes are translated */
-@@ -813,10 +813,15 @@
-     if (blink_state == BLINK_NONE)
- 	gui_mch_start_blink();
- 
--    /* make sure keyboard input goes to the draw area (if this is focus for a window) */
-+    /* make sure keyboard input goes to the draw area (if this is focus for a
-+     * window) */
-     if (widget != gui.drawarea)
- 	gtk_widget_grab_focus(gui.drawarea);
- 
-+    /* make sure the input buffer is read */
-+    if (gtk_main_level() > 0)
-+	gtk_main_quit();
-+
-     return TRUE;
- }
- 
-@@ -829,6 +834,10 @@
-     if (blink_state != BLINK_NONE)
- 	gui_mch_stop_blink();
- 
-+    /* make sure the input buffer is read */
-+    if (gtk_main_level() > 0)
-+	gtk_main_quit();
-+
-     return TRUE;
- }
- 
-@@ -2188,8 +2197,10 @@
-     escaped_filename = vim_strsave_escaped(filename, escape_chars);
-     if (escaped_filename == NULL)
- 	return FALSE;
--    mksession_cmdline = g_strconcat("mksession ", (char *)escaped_filename, NULL);
-+    mksession_cmdline = g_strconcat("mksession ", (char *)escaped_filename,
-+									NULL);
-     vim_free(escaped_filename);
-+
-     /*
-      * Use a reasonable hardcoded set of 'sessionoptions' flags to avoid
-      * unpredictable effects when the session is saved automatically.  Also,
-@@ -2199,7 +2210,7 @@
-      */
-     save_ssop_flags = ssop_flags;
-     ssop_flags = (SSOP_BLANK|SSOP_CURDIR|SSOP_FOLDS|SSOP_GLOBALS
--		  |SSOP_HELP|SSOP_OPTIONS|SSOP_WINSIZE);
-+		  |SSOP_HELP|SSOP_OPTIONS|SSOP_WINSIZE|SSOP_TABPAGES);
- 
-     do_cmdline_cmd((char_u *)"let Save_VV_this_session = v:this_session");
-     failed = (do_cmdline_cmd((char_u *)mksession_cmdline) == FAIL);
-@@ -3212,8 +3223,9 @@
- 	{
- 	    if (clicked_page == 0)
- 	    {
--		/* Click after all tabs moves to next tab page. */
--		if (send_tabline_event(0) && gtk_main_level() > 0)
-+		/* Click after all tabs moves to next tab page.  When "x" is
-+		 * small guess it's the left button. */
-+		if (send_tabline_event(x < 50 ? -1 : 0) && gtk_main_level() > 0)
- 		    gtk_main_quit();
- 	    }
- #ifndef HAVE_GTK2
-@@ -4032,6 +4044,8 @@
- 	unsigned int	w, h;
- 	int		x = 0;
- 	int		y = 0;
-+	guint		pixel_width;
-+	guint		pixel_height;
- 
- 	mask = XParseGeometry((char *)gui.geom, &x, &y, &w, &h);
- 
-@@ -4043,12 +4057,31 @@
- 		p_window = h - 1;
- 	    Rows = h;
- 	}
-+
-+	pixel_width = (guint)(gui_get_base_width() + Columns * gui.char_width);
-+	pixel_height = (guint)(gui_get_base_height() + Rows * gui.char_height);
-+
-+#ifdef HAVE_GTK2
-+	pixel_width  += get_menu_tool_width();
-+	pixel_height += get_menu_tool_height();
-+#endif
-+
- 	if (mask & (XValue | YValue))
-+	{
-+	    int w, h;
-+	    gui_mch_get_screen_dimensions(&w, &h);
-+	    h += p_ghr + get_menu_tool_height();
-+	    w += get_menu_tool_width();
-+	    if (mask & XNegative)
-+		x += w - pixel_width;
-+	    if (mask & YNegative)
-+		y += h - pixel_height;
- #ifdef HAVE_GTK2
- 	    gtk_window_move(GTK_WINDOW(gui.mainwin), x, y);
- #else
- 	    gtk_widget_set_uposition(gui.mainwin, x, y);
- #endif
-+	}
- 	vim_free(gui.geom);
- 	gui.geom = NULL;
- 
-@@ -4059,14 +4092,6 @@
- 	 */
- 	if (gtk_socket_id != 0  &&  (mask & WidthValue || mask & HeightValue))
- 	{
--	    guint pixel_width = (guint)(gui_get_base_width() + Columns * gui.char_width);
--	    guint pixel_height = (guint)(gui_get_base_height() + Rows * gui.char_height);
--
--#ifdef HAVE_GTK2
--	    pixel_width  += get_menu_tool_width();
--	    pixel_height += get_menu_tool_height();
--#endif
--
- 	    update_window_manager_hints(pixel_width, pixel_height);
- 	    init_window_hints_state = 1;
- 	    g_timeout_add(1000, check_startup_plug_hints, NULL);
-diff -Naur vim71.orig/src/gui_xmebw.c vim71/src/gui_xmebw.c
---- vim71.orig/src/gui_xmebw.c	2007-05-07 15:30:49.000000000 -0400
-+++ vim71/src/gui_xmebw.c	2007-12-20 23:59:40.000000000 -0500
-@@ -395,11 +395,15 @@
- 
-     /* Create the "highlight" pixmap. */
-     color[4].pixel = eb->primitive.bottom_shadow_color;
-+#ifdef XpmAllocColor /* SGI doesn't have it */
-     attr.valuemask = XpmColorSymbols | XpmCloseness | XpmAllocColor;
-+    attr.alloc_color = alloc_color;
-+#else
-+    attr.valuemask = XpmColorSymbols | XpmCloseness;
-+#endif
-     attr.closeness = 65535;	/* accuracy isn't crucial */
-     attr.colorsymbols = color;
-     attr.numsymbols = XtNumber(color);
--    attr.alloc_color = alloc_color;
- 
-     status = XpmCreatePixmapFromData(dpy, root, data, &pix, NULL, &attr);
-     XpmFreeAttributes(&attr);
-diff -Naur vim71.orig/src/if_cscope.c vim71/src/if_cscope.c
---- vim71.orig/src/if_cscope.c	2007-03-11 10:29:57.000000000 -0400
-+++ vim71/src/if_cscope.c	2007-12-20 23:58:44.000000000 -0500
-@@ -24,11 +24,6 @@
-     /* not UNIX, must be WIN32 */
- # include "vimio.h"
- # include <fcntl.h>
--# include <process.h>
--# define STDIN_FILENO    0
--# define STDOUT_FILENO   1
--# define STDERR_FILENO   2
--# define pipe(fds) _pipe(fds, 256, O_TEXT|O_NOINHERIT)
- #endif
- #include "if_cscope.h"
- 
-@@ -65,7 +60,7 @@
- static char *	    cs_parse_results __ARGS((int cnumber, char *buf, int bufsize, char **context, char **linenumber, char **search));
- static char *	    cs_pathcomponents __ARGS((char *path));
- static void	    cs_print_tags_priv __ARGS((char **, char **, int));
--static int	    cs_read_prompt __ARGS((int ));
-+static int	    cs_read_prompt __ARGS((int));
- static void	    cs_release_csp __ARGS((int, int freefnpp));
- static int	    cs_reset __ARGS((exarg_T *eap));
- static char *	    cs_resolve_file __ARGS((int, char *));
-@@ -73,6 +68,8 @@
- 
- 
- static csinfo_T	    csinfo[CSCOPE_MAX_CONNECTIONS];
-+static int	    eap_arg_len;    /* length of eap->arg, set in
-+				       cs_lookup_cmd() */
- static cscmd_T	    cs_cmds[] =
- {
-     { "add",	cs_add,
-@@ -260,14 +257,7 @@
- 
-     if ((p = cs_manage_matches(NULL, NULL, -1, Get)) == NULL)
- 	return TRUE;
--
--    if ((int)strlen(p) > size)
--    {
--	strncpy((char *)buf, p, size - 1);
--	buf[size] = '\0';
--    }
--    else
--	(void)strcpy((char *)buf, p);
-+    vim_strncpy(buf, (char_u *)p, size - 1);
- 
-     return FALSE;
- } /* cs_fgets */
-@@ -386,7 +376,7 @@
-  * PRIVATE: cs_add
-  *
-  * add cscope database or a directory name (to look for cscope.out)
-- * the the cscope connection list
-+ * to the cscope connection list
-  *
-  * MAXPATHL 256
-  */
-@@ -509,7 +499,7 @@
- #if defined(UNIX)
-     else if (S_ISREG(statbuf.st_mode) || S_ISLNK(statbuf.st_mode))
- #else
--	/* substitute define S_ISREG from os_unix.h */
-+	/* WIN32 - substitute define S_ISREG from os_unix.h */
-     else if (((statbuf.st_mode) & S_IFMT) == S_IFREG)
- #endif
-     {
-@@ -722,17 +712,32 @@
- cs_create_connection(i)
-     int i;
- {
--    int to_cs[2], from_cs[2], len;
--    char *prog, *cmd, *ppath = NULL;
--#ifndef UNIX
--    int in_save, out_save, err_save;
--    long_i ph;
--# ifdef FEAT_GUI
--    HWND activewnd = NULL;
--    HWND consolewnd = NULL;
-+#ifdef UNIX
-+    int		to_cs[2], from_cs[2];
-+#endif
-+    int		len;
-+    char	*prog, *cmd, *ppath = NULL;
-+#ifdef WIN32
-+    int		fd;
-+    SECURITY_ATTRIBUTES sa;
-+    PROCESS_INFORMATION pi;
-+    STARTUPINFO si;
-+    BOOL	pipe_stdin = FALSE, pipe_stdout = FALSE;
-+    HANDLE	stdin_rd, stdout_rd;
-+    HANDLE	stdout_wr, stdin_wr;
-+    BOOL	created;
-+# ifdef __BORLANDC__
-+#  define OPEN_OH_ARGTYPE long
-+# else
-+#  if (_MSC_VER >= 1300)
-+#   define OPEN_OH_ARGTYPE intptr_t
-+#  else
-+#   define OPEN_OH_ARGTYPE long
-+#  endif
- # endif
- #endif
- 
-+#if defined(UNIX)
-     /*
-      * Cscope reads from to_cs[0] and writes to from_cs[1]; vi reads from
-      * from_cs[0] and writes to to_cs[1].
-@@ -753,18 +758,12 @@
- 	return CSCOPE_FAILURE;
-     }
- 
--#if defined(UNIX)
-     switch (csinfo[i].pid = fork())
-     {
-     case -1:
- 	(void)EMSG(_("E622: Could not fork for cscope"));
- 	goto err_closing;
-     case 0:				/* child: run cscope. */
--#else
--	in_save = dup(STDIN_FILENO);
--	out_save = dup(STDOUT_FILENO);
--	err_save = dup(STDERR_FILENO);
--#endif
- 	if (dup2(to_cs[0], STDIN_FILENO) == -1)
- 	    PERROR("cs_create_connection 1");
- 	if (dup2(from_cs[1], STDOUT_FILENO) == -1)
-@@ -773,15 +772,32 @@
- 	    PERROR("cs_create_connection 3");
- 
- 	/* close unused */
--#if defined(UNIX)
- 	(void)close(to_cs[1]);
- 	(void)close(from_cs[0]);
- #else
--	/* On win32 we must close opposite ends because we are the parent */
--	(void)close(to_cs[0]);
--	to_cs[0] = -1;
--	(void)close(from_cs[1]);
--	from_cs[1] = -1;
-+	/* WIN32 */
-+	/* Create pipes to communicate with cscope */
-+	sa.nLength = sizeof(SECURITY_ATTRIBUTES);
-+	sa.bInheritHandle = TRUE;
-+	sa.lpSecurityDescriptor = NULL;
-+
-+	if (!(pipe_stdin = CreatePipe(&stdin_rd, &stdin_wr, &sa, 0))
-+		|| !(pipe_stdout = CreatePipe(&stdout_rd, &stdout_wr, &sa, 0)))
-+	{
-+	    (void)EMSG(_("E566: Could not create cscope pipes"));
-+err_closing:
-+	    if (pipe_stdin)
-+	    {
-+		CloseHandle(stdin_rd);
-+		CloseHandle(stdin_wr);
-+	    }
-+	    if (pipe_stdout)
-+	    {
-+		CloseHandle(stdout_rd);
-+		CloseHandle(stdout_wr);
-+	    }
-+	    return CSCOPE_FAILURE;
-+	}
- #endif
- 	/* expand the cscope exec for env var's */
- 	if ((prog = (char *)alloc(MAXPATHL + 1)) == NULL)
-@@ -789,6 +805,7 @@
- #ifdef UNIX
- 	    return CSCOPE_FAILURE;
- #else
-+	    /* WIN32 */
- 	    goto err_closing;
- #endif
- 	}
-@@ -805,6 +822,7 @@
- #ifdef UNIX
- 		return CSCOPE_FAILURE;
- #else
-+		/* WIN32 */
- 		goto err_closing;
- #endif
- 	    }
-@@ -823,6 +841,7 @@
- #ifdef UNIX
- 	    return CSCOPE_FAILURE;
- #else
-+	    /* WIN32 */
- 	    goto err_closing;
- #endif
- 	}
-@@ -831,6 +850,7 @@
- #if defined(UNIX)
- 	(void)sprintf(cmd, "exec %s -dl -f %s", prog, csinfo[i].fname);
- #else
-+	/* WIN32 */
- 	(void)sprintf(cmd, "%s -dl -f %s", prog, csinfo[i].fname);
- #endif
- 	if (csinfo[i].ppath != NULL)
-@@ -856,60 +876,6 @@
- 	exit(127);
- 	/* NOTREACHED */
-     default:	/* parent. */
--#else
--# ifdef FEAT_GUI
--	activewnd = GetForegroundWindow(); /* on win9x cscope steals focus */
--	/* Dirty hack to hide annoying console window */
--	if (AllocConsole())
--	{
--	    char *title;
--	    title = (char *)alloc(1024);
--	    if (title == NULL)
--		FreeConsole();
--	    else
--	    {
--		GetConsoleTitle(title, 1024); /* save for future restore */
--		SetConsoleTitle(
--		    "GVIMCS{5499421B-CBEF-45b0-85EF-38167FDEA5C5}GVIMCS");
--		Sleep(40); /* as stated in MS KB we must wait 40 ms */
--		consolewnd = FindWindow(NULL,
--			"GVIMCS{5499421B-CBEF-45b0-85EF-38167FDEA5C5}GVIMCS");
--		if (consolewnd != NULL)
--		    ShowWindow(consolewnd, SW_HIDE);
--		SetConsoleTitle(title);
--		vim_free(title);
--	    }
--	}
--# endif
--	/* May be use &shell, &shellquote etc */
--# ifdef __BORLANDC__
--	/* BCC 5.5 uses a different function name for spawnlp */
--	ph = (long_i)spawnlp(P_NOWAIT, prog, cmd, NULL);
--# else
--	ph = (long_i)_spawnlp(_P_NOWAIT, prog, cmd, NULL);
--# endif
--	vim_free(prog);
--	vim_free(cmd);
--# ifdef FEAT_GUI
--	/* Dirty hack part two */
--	if (activewnd != NULL)
--	    /* restoring focus */
--	    SetForegroundWindow(activewnd);
--	if (consolewnd != NULL)
--	    FreeConsole();
--
--# endif
--	if (ph == -1)
--	{
--	    PERROR(_("cs_create_connection exec failed"));
--	    (void)EMSG(_("E623: Could not spawn cscope process"));
--	    goto err_closing;
--	}
--	/* else */
--	csinfo[i].pid = 0;
--	csinfo[i].hProc = (HANDLE)ph;
--
--#endif /* !UNIX */
- 	/*
- 	 * Save the file descriptors for later duplication, and
- 	 * reopen as streams.
-@@ -919,22 +885,54 @@
- 	if ((csinfo[i].fr_fp = fdopen(from_cs[0], "r")) == NULL)
- 	    PERROR(_("cs_create_connection: fdopen for fr_fp failed"));
- 
--#if defined(UNIX)
- 	/* close unused */
- 	(void)close(to_cs[0]);
- 	(void)close(from_cs[1]);
- 
- 	break;
-     }
-+
- #else
--	/* restore stdhandles */
--    dup2(in_save, STDIN_FILENO);
--    dup2(out_save, STDOUT_FILENO);
--    dup2(err_save, STDERR_FILENO);
--    close(in_save);
--    close(out_save);
--    close(err_save);
--#endif
-+    /* WIN32 */
-+    /* Create a new process to run cscope and use pipes to talk with it */
-+    GetStartupInfo(&si);
-+    si.dwFlags = STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW;
-+    si.wShowWindow = SW_HIDE;  /* Hide child application window */
-+    si.hStdOutput = stdout_wr;
-+    si.hStdError  = stdout_wr;
-+    si.hStdInput  = stdin_rd;
-+    created = CreateProcess(NULL, cmd, NULL, NULL, TRUE, CREATE_NEW_CONSOLE,
-+							NULL, NULL, &si, &pi);
-+    vim_free(prog);
-+    vim_free(cmd);
-+
-+    if (!created)
-+    {
-+	PERROR(_("cs_create_connection exec failed"));
-+	(void)EMSG(_("E623: Could not spawn cscope process"));
-+	goto err_closing;
-+    }
-+    /* else */
-+    csinfo[i].pid = pi.dwProcessId;
-+    csinfo[i].hProc = pi.hProcess;
-+    CloseHandle(pi.hThread);
-+
-+    /* TODO - tidy up after failure to create files on pipe handles. */
-+    if (((fd = _open_osfhandle((OPEN_OH_ARGTYPE)stdin_wr,
-+						      _O_TEXT|_O_APPEND)) < 0)
-+	    || ((csinfo[i].to_fp = _fdopen(fd, "w")) == NULL))
-+	PERROR(_("cs_create_connection: fdopen for to_fp failed"));
-+    if (((fd = _open_osfhandle((OPEN_OH_ARGTYPE)stdout_rd,
-+						      _O_TEXT|_O_RDONLY)) < 0)
-+	    || ((csinfo[i].fr_fp = _fdopen(fd, "r")) == NULL))
-+	PERROR(_("cs_create_connection: fdopen for fr_fp failed"));
-+
-+    /* Close handles for file descriptors inherited by the cscope process */
-+    CloseHandle(stdin_rd);
-+    CloseHandle(stdout_wr);
-+
-+#endif /* !UNIX */
-+
-     return CSCOPE_SUCCESS;
- } /* cs_create_connection */
- 
-@@ -966,7 +964,7 @@
-     }
- 
-     pat = opt + strlen(opt) + 1;
--    if (pat == NULL || (pat != NULL && pat[0] == '\0'))
-+    if (pat >= (char *)eap->arg + eap_arg_len)
-     {
- 	cs_usage_msg(Find);
- 	return FALSE;
-@@ -1317,7 +1315,7 @@
- #else
- 	    /* compare pathnames first */
- 	    && ((fullpathcmp(csinfo[j].fname, fname, FALSE) & FPC_SAME)
--		/* if not Windows 9x, test index file atributes too */
-+		/* if not Windows 9x, test index file attributes too */
- 		|| (!mch_windows95()
- 		    && csinfo[j].nVolume == bhfi.dwVolumeSerialNumber
- 		    && csinfo[j].nIndexHigh == bhfi.nFileIndexHigh
-@@ -1401,6 +1399,9 @@
-     if (eap->arg == NULL)
- 	return NULL;
- 
-+    /* Store length of eap->arg before it gets modified by strtok(). */
-+    eap_arg_len = STRLEN(eap->arg);
-+
-     if ((stok = strtok((char *)(eap->arg), (const char *)" ")) == NULL)
- 	return NULL;
- 
-@@ -2099,8 +2100,8 @@
- /*
-  * PRIVATE: cs_release_csp
-  *
-- * does the actual free'ing for the cs ptr with an optional flag of whether
-- * or not to free the filename.  called by cs_kill and cs_reset.
-+ * Does the actual free'ing for the cs ptr with an optional flag of whether
-+ * or not to free the filename.  Called by cs_kill and cs_reset.
-  */
-     static void
- cs_release_csp(i, freefnpp)
-@@ -2118,10 +2119,13 @@
- 	(void)fputs("q\n", csinfo[i].to_fp);
- 	(void)fflush(csinfo[i].to_fp);
-     }
--    /* give cscope chance to exit normally */
--    if (csinfo[i].hProc != NULL
--	    && WaitForSingleObject(csinfo[i].hProc, 1000) == WAIT_TIMEOUT)
--	TerminateProcess(csinfo[i].hProc, 0);
-+    if (csinfo[i].hProc != NULL)
-+    {
-+	/* Give cscope a chance to exit normally */
-+	if (WaitForSingleObject(csinfo[i].hProc, 1000) == WAIT_TIMEOUT)
-+	    TerminateProcess(csinfo[i].hProc, 0);
-+	CloseHandle(csinfo[i].hProc);
-+    }
- #endif
- 
-     if (csinfo[i].fr_fp != NULL)
-@@ -2195,7 +2199,7 @@
- 	    cs_add_common(dblist[i], pplist[i], fllist[i]);
- 	    if (p_csverbose)
- 	    {
--		/* dont' use smsg_attr because want to display
-+		/* don't use smsg_attr() because we want to display the
- 		 * connection number in the same line as
- 		 * "Added cscope database..."
- 		 */
-@@ -2304,6 +2308,21 @@
-     return CSCOPE_SUCCESS;
- } /* cs_show */
- 
-+
-+/*
-+ * PUBLIC: cs_end
-+ *
-+ * Only called when VIM exits to quit any cscope sessions.
-+ */
-+    void
-+cs_end()
-+{
-+    int i;
-+
-+    for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
-+	cs_release_csp(i, TRUE);
-+}
-+
- #endif	/* FEAT_CSCOPE */
- 
- /* the end */
-diff -Naur vim71.orig/src/if_cscope.h vim71/src/if_cscope.h
---- vim71.orig/src/if_cscope.h	2005-06-30 13:14:22.000000000 -0400
-+++ vim71/src/if_cscope.h	2007-12-20 23:58:34.000000000 -0500
-@@ -72,7 +72,7 @@
-     ino_t	    st_ino;	/* inode number of cscope db */
- #else
- # if defined(WIN32)
--    int	    pid;	/* Can't get pid so set it to 0 ;) */
-+    DWORD	    pid;	/* PID of the connected cscope process. */
-     HANDLE	    hProc;	/* cscope process handle */
-     DWORD	    nVolume;	/* Volume serial number, instead of st_dev */
-     DWORD	    nIndexHigh;	/* st_ino has no meaning in the Windows */
-diff -Naur vim71.orig/src/if_mzsch.c vim71/src/if_mzsch.c
---- vim71.orig/src/if_mzsch.c	2007-05-12 07:13:47.000000000 -0400
-+++ vim71/src/if_mzsch.c	2007-12-20 23:56:55.000000000 -0500
-@@ -308,6 +308,8 @@
- static Scheme_Config *(*dll_scheme_current_config)(void);
- static Scheme_Object *(*dll_scheme_char_string_to_byte_string)
-     (Scheme_Object *s);
-+static Scheme_Object *(*dll_scheme_char_string_to_path)
-+    (Scheme_Object *s);
- # endif
- 
- /* arrays are imported directly */
-@@ -398,6 +400,8 @@
- #  define scheme_current_config dll_scheme_current_config
- #  define scheme_char_string_to_byte_string \
-     dll_scheme_char_string_to_byte_string
-+#  define scheme_char_string_to_path \
-+    dll_scheme_char_string_to_path
- # endif
- 
- typedef struct
-@@ -498,6 +502,8 @@
-     {"scheme_current_config", (void **)&dll_scheme_current_config},
-     {"scheme_char_string_to_byte_string",
- 	(void **)&dll_scheme_char_string_to_byte_string},
-+    {"scheme_char_string_to_path",
-+	(void **)&dll_scheme_char_string_to_path},
- # endif
-     {NULL, NULL}};
- 
-@@ -773,7 +779,14 @@
- #ifdef MZSCHEME_COLLECTS
-     /* setup 'current-library-collection-paths' parameter */
-     scheme_set_param(scheme_config, MZCONFIG_COLLECTION_PATHS,
--	    scheme_make_pair(scheme_make_string(MZSCHEME_COLLECTS),
-+	    scheme_make_pair(
-+# if MZSCHEME_VERSION_MAJOR >= 299
-+		scheme_char_string_to_path(
-+		    scheme_byte_string_to_char_string(
-+			scheme_make_byte_string(MZSCHEME_COLLECTS))),
-+# else
-+		scheme_make_string(MZSCHEME_COLLECTS),
-+# endif
- 		scheme_null));
- #endif
- #ifdef HAVE_SANDBOX
-diff -Naur vim71.orig/src/if_perl.xs vim71/src/if_perl.xs
---- vim71.orig/src/if_perl.xs	2006-08-16 08:45:15.000000000 -0400
-+++ vim71/src/if_perl.xs	2007-12-20 23:59:21.000000000 -0500
-@@ -40,6 +40,28 @@
- #    define PERL_SUBVERSION SUBVERSION
- #endif
- 
-+/*
-+ * Quoting Jan Dubois of Active State:
-+ *    ActivePerl build 822 still identifies itself as 5.8.8 but already
-+ *    contains many of the changes from the upcoming Perl 5.8.9 release.
-+ *
-+ * The changes include addition of two symbols (Perl_sv_2iv_flags,
-+ * Perl_newXS_flags) not present in earlier releases.
-+ *
-+ * Jan Dubois suggested the following guarding scheme.
-+ *
-+ * Active State defined ACTIVEPERL_VERSION as a string in versions before
-+ * 5.8.8; and so the comparison to 822 below needs to be guarded.
-+ */
-+#if (PERL_REVISION == 5) && (PERL_VERSION == 8) && (PERL_SUBVERSION >= 8)
-+# if (ACTIVEPERL_VERSION >= 822) || (PERL_SUBVERSION >= 9)
-+#  define PERL589_OR_LATER
-+# endif
-+#endif
-+#if (PERL_REVISION == 5) && (PERL_VERSION >= 9)
-+# define PERL589_OR_LATER
-+#endif
-+
- #ifndef pTHX
- #    define pTHX void
- #    define pTHX_
-@@ -109,6 +131,10 @@
- # else
- #  define Perl_sv_catpvn dll_Perl_sv_catpvn
- # endif
-+#ifdef PERL589_OR_LATER
-+#  define Perl_sv_2iv_flags dll_Perl_sv_2iv_flags
-+#  define Perl_newXS_flags dll_Perl_newXS_flags
-+#endif
- # define Perl_sv_free dll_Perl_sv_free
- # define Perl_sv_isa dll_Perl_sv_isa
- # define Perl_sv_magic dll_Perl_sv_magic
-@@ -192,6 +218,10 @@
- #else
- static void (*Perl_sv_catpvn)(pTHX_ SV*, const char*, STRLEN);
- #endif
-+#ifdef PERL589_OR_LATER
-+static IV (*Perl_sv_2iv_flags)(pTHX_ SV* sv, I32 flags);
-+static CV * (*Perl_newXS_flags)(pTHX_ const char *name, XSUBADDR_t subaddr, const char *const filename, const char *const proto, U32 flags);
-+#endif
- static void (*Perl_sv_free)(pTHX_ SV*);
- static int (*Perl_sv_isa)(pTHX_ SV*, const char*);
- static void (*Perl_sv_magic)(pTHX_ SV*, SV*, int, const char*, I32);
-@@ -267,6 +297,10 @@
- #else
-     {"Perl_sv_2pv", (PERL_PROC*)&Perl_sv_2pv},
- #endif
-+#ifdef PERL589_OR_LATER
-+    {"Perl_sv_2iv_flags", (PERL_PROC*)&Perl_sv_2iv_flags},
-+    {"Perl_newXS_flags", (PERL_PROC*)&Perl_newXS_flags},
-+#endif
-     {"Perl_sv_bless", (PERL_PROC*)&Perl_sv_bless},
- #if (PERL_REVISION == 5) && (PERL_VERSION >= 8)
-     {"Perl_sv_catpvn_flags", (PERL_PROC*)&Perl_sv_catpvn_flags},
-@@ -411,13 +445,13 @@
-     char *next;
-     char *token = (char *)s;
- 
--    while ((next = strchr(token, '\n')))
-+    while ((next = strchr(token, '\n')) && !got_int)
-     {
- 	*next++ = '\0';			/* replace \n with \0 */
- 	msg_attr((char_u *)token, attr);
- 	token = next;
-     }
--    if (*token)
-+    if (*token && !got_int)
- 	msg_attr((char_u *)token, attr);
- }
- 
-diff -Naur vim71.orig/src/if_ruby.c vim71/src/if_ruby.c
---- vim71.orig/src/if_ruby.c	2007-05-12 05:54:12.000000000 -0400
-+++ vim71/src/if_ruby.c	2007-12-20 23:58:35.000000000 -0500
-@@ -789,7 +789,7 @@
-     return get_buffer_line(curbuf, curwin->w_cursor.lnum);
- }
- 
--static VALUE set_current_line(VALUE str)
-+static VALUE set_current_line(VALUE self, VALUE str)
- {
-     return set_buffer_line(curbuf, curwin->w_cursor.lnum, str);
- }
-diff -Naur vim71.orig/src/keymap.h vim71/src/keymap.h
---- vim71.orig/src/keymap.h	2006-08-22 07:38:38.000000000 -0400
-+++ vim71/src/keymap.h	2007-12-20 23:58:27.000000000 -0500
-@@ -254,6 +254,8 @@
-     , KE_DROP		/* DnD data is available */
-     , KE_CURSORHOLD	/* CursorHold event */
-     , KE_NOP		/* doesn't do something */
-+    , KE_FOCUSGAINED	/* focus gained */
-+    , KE_FOCUSLOST	/* focus lost */
- };
- 
- /*
-@@ -445,6 +447,8 @@
- #define K_CMDWIN	TERMCAP2KEY(KS_EXTRA, KE_CMDWIN)
- 
- #define K_DROP		TERMCAP2KEY(KS_EXTRA, KE_DROP)
-+#define K_FOCUSGAINED	TERMCAP2KEY(KS_EXTRA, KE_FOCUSGAINED)
-+#define K_FOCUSLOST	TERMCAP2KEY(KS_EXTRA, KE_FOCUSLOST)
- 
- #define K_CURSORHOLD	TERMCAP2KEY(KS_EXTRA, KE_CURSORHOLD)
- 
-diff -Naur vim71.orig/src/macros.h vim71/src/macros.h
---- vim71.orig/src/macros.h	2007-05-07 15:38:22.000000000 -0400
-+++ vim71/src/macros.h	2007-12-20 23:58:07.000000000 -0500
-@@ -54,10 +54,12 @@
- 
- /*
-  * toupper() and tolower() that use the current locale.
-- * On some systems toupper()/tolower() only work on lower/uppercase characters
-+ * On some systems toupper()/tolower() only work on lower/uppercase
-+ * characters, first use islower() or isupper() then.
-  * Careful: Only call TOUPPER_LOC() and TOLOWER_LOC() with a character in the
-  * range 0 - 255.  toupper()/tolower() on some systems can't handle others.
-- * Note: for UTF-8 use utf_toupper() and utf_tolower().
-+ * Note: It is often better to use MB_TOLOWER() and MB_TOUPPER(), because many
-+ * toupper() and tolower() implementations only work for ASCII.
-  */
- #ifdef MSWIN
- #  define TOUPPER_LOC(c)	toupper_tab[(c) & 255]
-diff -Naur vim71.orig/src/main.aap vim71/src/main.aap
---- vim71.orig/src/main.aap	2007-05-07 15:46:43.000000000 -0400
-+++ vim71/src/main.aap	2007-12-20 23:59:01.000000000 -0500
-@@ -56,9 +56,16 @@
-     config {virtual} auto/config.h auto/config.aap :
-                          auto/configure.aap configure.aap
-                          config.arg config.h.in config.aap.in
-+        # Use "uname -a" to detect the architecture of the system.
-+        @ok, uname = redir_system('uname -a', 0)
-+        @if string.find(uname, "i386") >= 0:
-+        @   arch = "i386"
-+        @else:
-+        @   arch = "ppc"
-+        :print Building for $arch system
-         :sys CONFIG_STATUS=auto/config.status
-                 ./configure.aap `file2string("config.arg")`
--                    --with-mac-arch=ppc
-+                    --with-mac-arch=$arch
-                     --cache-file=auto/config.cache
- 
-     # Configure arguments: create an empty "config.arg" file when its missing
-@@ -1167,7 +1174,7 @@
-         :symlink `os.getcwd()`/../runtime $RESDIR/vim/runtime
- # TODO: Create the vimtutor application.
- 
--gui_bundle {virtual}: $(RESDIR) bundle-dir bundle-executable bundle-info
-+gui_bundle {virtual}: $(RESDIR) bundle-dir bundle-executable bundle-info \
-                         bundle-resource bundle-language
- 
- bundle-dir {virtual}: $(APPDIR)/Contents $(VIMTARGET)
-@@ -1187,7 +1194,7 @@
-         :sys m4 $(M4FLAGSX) infplist.xml > $(APPDIR)/Contents/Info.plist
- 
- bundle-resource {virtual}: bundle-dir bundle-rsrc
--    :copy {force} $(RSRC_DIR)/*.icns $(RESDIR)
-+        :copy {force} $(RSRC_DIR)/*.icns $(RESDIR)
- 
- ### Classic resources
- # Resource fork (in the form of a .rsrc file) for Classic Vim (Mac OS 9)
-diff -Naur vim71.orig/src/main.c vim71/src/main.c
---- vim71.orig/src/main.c	2007-05-07 15:38:44.000000000 -0400
-+++ vim71/src/main.c	2007-12-20 23:58:59.000000000 -0500
-@@ -954,7 +954,8 @@
-     int		cmdwin;	    /* TRUE when working in the command-line window */
-     int		noexmode;   /* TRUE when return on entering Ex mode */
- {
--    oparg_T	oa;	/* operator arguments */
-+    oparg_T	oa;				/* operator arguments */
-+    int		previous_got_int = FALSE;	/* "got_int" was TRUE */
- 
- #if defined(FEAT_X11) && defined(FEAT_XCLIPBOARD)
-     /* Setup to catch a terminating error from the X server.  Just ignore
-@@ -1015,12 +1016,32 @@
- 		need_fileinfo = FALSE;
- 	    }
- 	}
--	if (got_int && !global_busy)
-+
-+	/* Reset "got_int" now that we got back to the main loop.  Except when
-+	 * inside a ":g/pat/cmd" command, then the "got_int" needs to abort
-+	 * the ":g" command.
-+	 * For ":g/pat/vi" we reset "got_int" when used once.  When used
-+	 * a second time we go back to Ex mode and abort the ":g" command. */
-+	if (got_int)
- 	{
--	    if (!quit_more)
--		(void)vgetc();		/* flush all buffers */
--	    got_int = FALSE;
-+	    if (noexmode && global_busy && !exmode_active && previous_got_int)
-+	    {
-+		/* Typed two CTRL-C in a row: go back to ex mode as if "Q" was
-+		 * used and keep "got_int" set, so that it aborts ":g". */
-+		exmode_active = EXMODE_NORMAL;
-+		State = NORMAL;
-+	    }
-+	    else if (!global_busy || !exmode_active)
-+	    {
-+		if (!quit_more)
-+		    (void)vgetc();		/* flush all buffers */
-+		got_int = FALSE;
-+	    }
-+	    previous_got_int = TRUE;
- 	}
-+	else
-+	    previous_got_int = FALSE;
-+
- 	if (!exmode_active)
- 	    msg_scroll = FALSE;
- 	quit_more = FALSE;
-@@ -1309,6 +1330,13 @@
- #ifdef FEAT_NETBEANS_INTG
-     netbeans_end();
- #endif
-+#ifdef FEAT_CSCOPE
-+    cs_end();
-+#endif
-+#ifdef FEAT_EVAL
-+    if (garbage_collect_at_exit)
-+	garbage_collect();
-+#endif
- 
-     mch_exit(exitval);
- }
-@@ -1360,8 +1388,7 @@
- 	p = vim_getenv((char_u *)"VIMRUNTIME", &mustfree);
- 	if (p != NULL && *p != NUL)
- 	{
--	    STRCPY(NameBuff, p);
--	    STRCAT(NameBuff, "/lang");
-+	    vim_snprintf((char *)NameBuff, MAXPATHL, "%s/lang", p);
- 	    bindtextdomain(VIMPACKAGE, (char *)NameBuff);
- 	}
- 	if (mustfree)
-@@ -3632,7 +3659,13 @@
- 	mainerr_arg_missing((char_u *)filev[-1]);
-     if (mch_dirname(cwd, MAXPATHL) != OK)
- 	return NULL;
--    if ((p = vim_strsave_escaped_ext(cwd, PATH_ESC_CHARS, '\\', TRUE)) == NULL)
-+    if ((p = vim_strsave_escaped_ext(cwd,
-+#ifdef BACKSLASH_IN_FILENAME
-+		    "",  /* rem_backslash() will tell what chars to escape */
-+#else
-+		    PATH_ESC_CHARS,
-+#endif
-+		    '\\', TRUE)) == NULL)
- 	return NULL;
-     ga_init2(&ga, 1, 100);
-     ga_concat(&ga, (char_u *)"<C-\\><C-N>:cd ");
-diff -Naur vim71.orig/src/mbyte.c vim71/src/mbyte.c
---- vim71.orig/src/mbyte.c	2007-05-07 15:47:09.000000000 -0400
-+++ vim71/src/mbyte.c	2007-12-20 23:58:25.000000000 -0500
-@@ -1310,20 +1310,26 @@
- /*
-  * mb_off2cells() function pointer.
-  * Return number of display cells for char at ScreenLines[off].
-- * Caller must make sure "off" and "off + 1" are valid!
-+ * We make sure that the offset used is less than "max_off".
-  */
- /*ARGSUSED*/
-     int
--latin_off2cells(off)
-+latin_off2cells(off, max_off)
-     unsigned	off;
-+    unsigned	max_off;
- {
-     return 1;
- }
- 
-     int
--dbcs_off2cells(off)
-+dbcs_off2cells(off, max_off)
-     unsigned	off;
-+    unsigned	max_off;
- {
-+    /* never check beyond end of the line */
-+    if (off >= max_off)
-+	return 1;
-+
-     /* Number of cells is equal to number of bytes, except for euc-jp when
-      * the first byte is 0x8e. */
-     if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e)
-@@ -1332,10 +1338,11 @@
- }
- 
-     int
--utf_off2cells(off)
-+utf_off2cells(off, max_off)
-     unsigned	off;
-+    unsigned	max_off;
- {
--    return ScreenLines[off + 1] == 0 ? 2 : 1;
-+    return (off + 1 < max_off && ScreenLines[off + 1] == 0) ? 2 : 1;
- }
- 
- /*
-@@ -2320,7 +2327,7 @@
- 		/* Single byte: first check normally, then with ignore case. */
- 		if (s1[i] != s2[i])
- 		{
--		    cdiff = TOLOWER_LOC(s1[i]) - TOLOWER_LOC(s2[i]);
-+		    cdiff = MB_TOLOWER(s1[i]) - MB_TOLOWER(s2[i]);
- 		    if (cdiff != 0)
- 			return cdiff;
- 		}
-@@ -2899,12 +2906,8 @@
-     if (composing_hangul)
- 	return TRUE;
- #endif
--    if (enc_dbcs != 0)
--	return dbcs_off2cells(LineOffset[row] + col) > 1;
--    if (enc_utf8)
--	return (col + 1 < Columns
--		&& ScreenLines[LineOffset[row] + col + 1] == 0);
--    return FALSE;
-+    return (*mb_off2cells)(LineOffset[row] + col,
-+					LineOffset[row] + screen_Columns) > 1;
- }
- 
- # if defined(FEAT_CLIPBOARD) || defined(FEAT_GUI) || defined(FEAT_RIGHTLEFT) \
-diff -Naur vim71.orig/src/message.c vim71/src/message.c
---- vim71.orig/src/message.c	2007-05-07 15:31:59.000000000 -0400
-+++ vim71/src/message.c	2007-12-20 23:59:49.000000000 -0500
-@@ -828,7 +828,7 @@
- 		_("Messages maintainer: Bram Moolenaar <Bram@vim.org>"),
- 		hl_attr(HLF_T));
- 
--    for (p = first_msg_hist; p != NULL; p = p->next)
-+    for (p = first_msg_hist; p != NULL && !got_int; p = p->next)
- 	if (p->msg != NULL)
- 	    msg_attr(p->msg, p->attr);
- 
-@@ -944,6 +944,7 @@
- 		c = K_IGNORE;
- 	    }
- #endif
-+
- 	    /*
- 	     * Allow scrolling back in the messages.
- 	     * Also accept scroll-down commands when messages fill the screen,
-@@ -1840,9 +1841,10 @@
-     char_u	*sb_str = str;
-     int		sb_col = msg_col;
-     int		wrap;
-+    int		did_last_char;
- 
-     did_wait_return = FALSE;
--    while (*s != NUL && (maxlen < 0 || (int)(s - str) < maxlen))
-+    while ((maxlen < 0 || (int)(s - str) < maxlen) && *s != NUL)
-     {
- 	/*
- 	 * We are at the end of the screen line when:
-@@ -1878,7 +1880,7 @@
- 		/* output postponed text */
- 		t_puts(&t_col, t_s, s, attr);
- 
--	    /* When no more prompt an no more room, truncate here */
-+	    /* When no more prompt and no more room, truncate here */
- 	    if (msg_no_more && lines_left == 0)
- 		break;
- 
-@@ -1909,7 +1911,10 @@
- 		else
- #endif
- 		    msg_screen_putchar(*s++, attr);
-+		did_last_char = TRUE;
- 	    }
-+	    else
-+		did_last_char = FALSE;
- 
- 	    if (p_more)
- 		/* store text for scrolling back */
-@@ -1927,7 +1932,8 @@
- 	     * If screen is completely filled and 'more' is set then wait
- 	     * for a character.
- 	     */
--	    --lines_left;
-+	    if (lines_left > 0)
-+		--lines_left;
- 	    if (p_more && lines_left == 0 && State != HITRETURN
- 					    && !msg_no_more && !exmode_active)
- 	    {
-@@ -1943,11 +1949,7 @@
- 
- 	    /* When we displayed a char in last column need to check if there
- 	     * is still more. */
--	    if (*s >= ' '
--#ifdef FEAT_RIGHTLEFT
--		    && !cmdmsg_rl
--#endif
--	       )
-+	    if (did_last_char)
- 		continue;
- 	}
- 
-@@ -2234,7 +2236,7 @@
- {
-     msgchunk_T	*mp;
- 
--    /* Only show somethign if there is more than one line, otherwise it looks
-+    /* Only show something if there is more than one line, otherwise it looks
-      * weird, typing a command without output results in one line. */
-     mp = msg_sb_start(last_msgchunk);
-     if (mp == NULL || mp->sb_prev == NULL)
-@@ -2622,7 +2624,7 @@
- 		}
- 	    }
- 
--	    if (scroll < 0 || (scroll == 0 && mp_last != NULL))
-+	    if (scroll <= 0)
- 	    {
- 		/* displayed the requested text, more prompt again */
- 		screen_fill((int)Rows - 1, (int)Rows, 0,
-@@ -2848,6 +2850,15 @@
-     }
-     else if (State == HITRETURN || State == SETWSIZE)
-     {
-+	if (msg_row == Rows - 1)
-+	{
-+	    /* Avoid drawing the "hit-enter" prompt below the previous one,
-+	     * overwrite it.  Esp. useful when regaining focus and a
-+	     * FocusGained autocmd exists but didn't draw anything. */
-+	    msg_didout = FALSE;
-+	    msg_col = 0;
-+	    msg_clr_eos();
-+	}
- 	hit_return_msg();
- 	msg_row = Rows - 1;
-     }
-@@ -3456,11 +3467,11 @@
- 		    /* advance to next hotkey and set default hotkey */
- #ifdef FEAT_MBYTE
- 		    if (has_mbyte)
--			hotkp += (*mb_ptr2len)(hotkp);
-+			hotkp += STRLEN(hotkp);
- 		    else
- #endif
- 			++hotkp;
--		    (void)copy_char(r + 1, hotkp, TRUE);
-+		    hotkp[copy_char(r + 1, hotkp, TRUE)] = NUL;
- 		    if (dfltbutton)
- 			--dfltbutton;
- 
-@@ -3493,7 +3504,7 @@
- 			*msgp++ = (dfltbutton == 1) ? ']' : ')';
- 
- 			/* redefine hotkey */
--			(void)copy_char(r, hotkp, TRUE);
-+			hotkp[copy_char(r, hotkp, TRUE)] = NUL;
- 		    }
- 		}
- 		else
-@@ -3519,8 +3530,6 @@
- 	    *msgp++ = ':';
- 	    *msgp++ = ' ';
- 	    *msgp = NUL;
--	    mb_ptr_adv(hotkp);
--	    *hotkp = NUL;
- 	}
- 	else
- 	{
-@@ -3555,8 +3564,9 @@
- 	    msgp = confirm_msg + 1 + STRLEN(message);
- 	    hotkp = hotk;
- 
--	    /* define first default hotkey */
--	    (void)copy_char(buttons, hotkp, TRUE);
-+	    /* Define first default hotkey.  Keep the hotkey string NUL
-+	     * terminated to avoid reading past the end. */
-+	    hotkp[copy_char(buttons, hotkp, TRUE)] = NUL;
- 
- 	    /* Remember where the choices start, displaying starts here when
- 	     * "hotkp" typed at the more prompt. */
-diff -Naur vim71.orig/src/misc1.c vim71/src/misc1.c
---- vim71.orig/src/misc1.c	2007-05-07 15:49:03.000000000 -0400
-+++ vim71/src/misc1.c	2007-12-20 23:59:02.000000000 -0500
-@@ -90,7 +90,7 @@
-  */
-     int
- set_indent(size, flags)
--    int		size;
-+    int		size;		    /* measured in spaces */
-     int		flags;
- {
-     char_u	*p;
-@@ -98,12 +98,14 @@
-     char_u	*oldline;
-     char_u	*s;
-     int		todo;
--    int		ind_len;
-+    int		ind_len;	    /* measured in characters */
-     int		line_len;
-     int		doit = FALSE;
--    int		ind_done;
-+    int		ind_done = 0;	    /* measured in spaces */
-     int		tab_pad;
-     int		retval = FALSE;
-+    int		orig_char_len = -1; /* number of initial whitespace chars when
-+				       'et' and 'pi' are both set */
- 
-     /*
-      * First check if there is anything to do and compute the number of
-@@ -116,8 +118,10 @@
-     /* Calculate the buffer size for the new indent, and check to see if it
-      * isn't already set */
- 
--    /* if 'expandtab' isn't set: use TABs */
--    if (!curbuf->b_p_et)
-+    /* if 'expandtab' isn't set: use TABs; if both 'expandtab' and
-+     * 'preserveindent' are set count the number of characters at the
-+     * beginning of the line to be copied */
-+    if (!curbuf->b_p_et || (!(flags & SIN_INSERT) && curbuf->b_p_pi))
-     {
- 	/* If 'preserveindent' is set then reuse as much as possible of
- 	 * the existing indent structure for the new indent */
-@@ -148,9 +152,14 @@
- 		++p;
- 	    }
- 
-+	    /* Set initial number of whitespace chars to copy if we are
-+	     * preserving indent but expandtab is set */
-+	    if (curbuf->b_p_et)
-+		orig_char_len = ind_len;
-+
- 	    /* Fill to next tabstop with a tab, if possible */
- 	    tab_pad = (int)curbuf->b_p_ts - (ind_done % (int)curbuf->b_p_ts);
--	    if (todo >= tab_pad)
-+	    if (todo >= tab_pad && orig_char_len == -1)
- 	    {
- 		doit = TRUE;
- 		todo -= tab_pad;
-@@ -193,13 +202,42 @@
-     else
- 	p = skipwhite(p);
-     line_len = (int)STRLEN(p) + 1;
--    newline = alloc(ind_len + line_len);
--    if (newline == NULL)
--	return FALSE;
-+
-+    /* If 'preserveindent' and 'expandtab' are both set keep the original
-+     * characters and allocate accordingly.  We will fill the rest with spaces
-+     * after the if (!curbuf->b_p_et) below. */
-+    if (orig_char_len != -1)
-+    {
-+	newline = alloc(orig_char_len + size - ind_done + line_len);
-+	if (newline == NULL)
-+	    return FALSE;
-+	todo = size - ind_done;
-+	ind_len = orig_char_len + todo;    /* Set total length of indent in
-+					    * characters, which may have been
-+					    * undercounted until now  */
-+	p = oldline;
-+	s = newline;
-+	while (orig_char_len > 0)
-+	{
-+	    *s++ = *p++;
-+	    orig_char_len--;
-+	}
-+	/* Skip over any additional white space (useful when newindent is less
-+	 * than old) */
-+	while (vim_iswhite(*p))
-+	    (void)*p++;
-+
-+    }
-+    else
-+    {
-+	todo = size;
-+	newline = alloc(ind_len + line_len);
-+	if (newline == NULL)
-+	    return FALSE;
-+	s = newline;
-+    }
- 
-     /* Put the characters in the new line. */
--    s = newline;
--    todo = size;
-     /* if 'expandtab' isn't set: use TABs */
-     if (!curbuf->b_p_et)
-     {
-@@ -1320,8 +1358,8 @@
- 	    newindent += (int)curbuf->b_p_sw;
- 	}
- #endif
--	/* Copy the indent only if expand tab is disabled */
--	if (curbuf->b_p_ci && !curbuf->b_p_et)
-+	/* Copy the indent */
-+	if (curbuf->b_p_ci)
- 	{
- 	    (void)copy_indent(newindent, saved_line);
- 
-@@ -3468,9 +3506,38 @@
- #endif
- 
- /*
-+ * Call expand_env() and store the result in an allocated string.
-+ * This is not very memory efficient, this expects the result to be freed
-+ * again soon.
-+ */
-+    char_u *
-+expand_env_save(src)
-+    char_u	*src;
-+{
-+    return expand_env_save_opt(src, FALSE);
-+}
-+
-+/*
-+ * Idem, but when "one" is TRUE handle the string as one file name, only
-+ * expand "~" at the start.
-+ */
-+    char_u *
-+expand_env_save_opt(src, one)
-+    char_u	*src;
-+    int		one;
-+{
-+    char_u	*p;
-+
-+    p = alloc(MAXPATHL);
-+    if (p != NULL)
-+	expand_env_esc(src, p, MAXPATHL, FALSE, one, NULL);
-+    return p;
-+}
-+
-+/*
-  * Expand environment variable with path name.
-  * "~/" is also expanded, using $HOME.	For Unix "~user/" is expanded.
-- * Skips over "\ ", "\~" and "\$".
-+ * Skips over "\ ", "\~" and "\$" (not for Win32 though).
-  * If anything fails no expansion is done and dst equals src.
-  */
-     void
-@@ -3479,15 +3546,16 @@
-     char_u	*dst;		/* where to put the result */
-     int		dstlen;		/* maximum length of the result */
- {
--    expand_env_esc(src, dst, dstlen, FALSE, NULL);
-+    expand_env_esc(src, dst, dstlen, FALSE, FALSE, NULL);
- }
- 
-     void
--expand_env_esc(srcp, dst, dstlen, esc, startstr)
-+expand_env_esc(srcp, dst, dstlen, esc, one, startstr)
-     char_u	*srcp;		/* input string e.g. "$HOME/vim.hlp" */
-     char_u	*dst;		/* where to put the result */
-     int		dstlen;		/* maximum length of the result */
-     int		esc;		/* escape spaces in expanded variables */
-+    int		one;		/* "srcp" is one file name */
-     char_u	*startstr;	/* start again after this (can be NULL) */
- {
-     char_u	*src;
-@@ -3728,6 +3796,8 @@
- 	{
- 	    /*
- 	     * Recognize the start of a new name, for '~'.
-+	     * Don't do this when "one" is TRUE, to avoid expanding "~" in
-+	     * ":edit foo ~ foo".
- 	     */
- 	    at_start = FALSE;
- 	    if (src[0] == '\\' && src[1] != NUL)
-@@ -3735,7 +3805,7 @@
- 		*dst++ = *src++;
- 		--dstlen;
- 	    }
--	    else if (src[0] == ' ' || src[0] == ',')
-+	    else if ((src[0] == ' ' || src[0] == ',') && !one)
- 		at_start = TRUE;
- 	    *dst++ = *src++;
- 	    --dstlen;
-@@ -4032,23 +4102,6 @@
- }
- 
- /*
-- * Call expand_env() and store the result in an allocated string.
-- * This is not very memory efficient, this expects the result to be freed
-- * again soon.
-- */
--    char_u *
--expand_env_save(src)
--    char_u	*src;
--{
--    char_u	*p;
--
--    p = alloc(MAXPATHL);
--    if (p != NULL)
--	expand_env(src, p, MAXPATHL);
--    return p;
--}
--
--/*
-  * Our portable version of setenv.
-  */
-     void
-@@ -4786,7 +4839,7 @@
- static int	cin_iswhileofdo __ARGS((char_u *, linenr_T, int));
- static int	cin_iswhileofdo_end __ARGS((int terminated, int	ind_maxparen, int ind_maxcomment));
- static int	cin_isbreak __ARGS((char_u *));
--static int	cin_is_cpp_baseclass __ARGS((char_u *line, colnr_T *col));
-+static int	cin_is_cpp_baseclass __ARGS((colnr_T *col));
- static int	get_baseclass_amount __ARGS((int col, int ind_maxparen, int ind_maxcomment, int ind_cpp_baseclass));
- static int	cin_ends_in __ARGS((char_u *, char_u *, char_u *));
- static int	cin_skip2pos __ARGS((pos_T *trypos));
-@@ -5551,13 +5604,13 @@
-  * This is a lot of guessing.  Watch out for "cond ? func() : foo".
-  */
-     static int
--cin_is_cpp_baseclass(line, col)
--    char_u	*line;
-+cin_is_cpp_baseclass(col)
-     colnr_T	*col;	    /* return: column to align with */
- {
-     char_u	*s;
-     int		class_or_struct, lookfor_ctor_init, cpp_base_class;
-     linenr_T	lnum = curwin->w_cursor.lnum;
-+    char_u	*line = ml_get_curline();
- 
-     *col = 0;
- 
-@@ -5585,7 +5638,8 @@
-      */
-     while (lnum > 1)
-     {
--	s = skipwhite(ml_get(lnum - 1));
-+	line = ml_get(lnum - 1);
-+	s = skipwhite(line);
- 	if (*s == '#' || *s == NUL)
- 	    break;
- 	while (*s != NUL)
-@@ -5602,7 +5656,8 @@
- 	--lnum;
-     }
- 
--    s = cin_skipcomment(ml_get(lnum));
-+    line = ml_get(lnum);
-+    s = cin_skipcomment(line);
-     for (;;)
-     {
- 	if (*s == NUL)
-@@ -5610,7 +5665,10 @@
- 	    if (lnum == curwin->w_cursor.lnum)
- 		break;
- 	    /* Continue in the cursor line. */
--	    s = cin_skipcomment(ml_get(++lnum));
-+	    line = ml_get(++lnum);
-+	    s = cin_skipcomment(line);
-+	    if (*s == NUL)
-+		continue;
- 	}
- 
- 	if (s[0] == ':')
-@@ -7079,7 +7137,7 @@
- 		n = FALSE;
- 		if (lookfor != LOOKFOR_TERM && ind_cpp_baseclass > 0)
- 		{
--		    n = cin_is_cpp_baseclass(l, &col);
-+		    n = cin_is_cpp_baseclass(&col);
- 		    l = ml_get_curline();
- 		}
- 		if (n)
-@@ -7670,7 +7728,7 @@
- 		n = FALSE;
- 		if (ind_cpp_baseclass != 0 && theline[0] != '{')
- 		{
--		    n = cin_is_cpp_baseclass(l, &col);
-+		    n = cin_is_cpp_baseclass(&col);
- 		    l = ml_get_curline();
- 		}
- 		if (n)
-@@ -8596,7 +8654,7 @@
-     for (p = buf + wildoff; p < s; ++p)
- 	if (rem_backslash(p))
- 	{
--	    STRCPY(p, p + 1);
-+	    mch_memmove(p, p + 1, STRLEN(p));
- 	    --e;
- 	    --s;
- 	}
-@@ -8897,7 +8955,7 @@
-     for (p = buf + wildoff; p < s; ++p)
- 	if (rem_backslash(p))
- 	{
--	    STRCPY(p, p + 1);
-+	    mch_memmove(p, p + 1, STRLEN(p));
- 	    --e;
- 	    --s;
- 	}
-@@ -9096,7 +9154,7 @@
- 	     */
- 	    if (vim_strpbrk(p, (char_u *)"$~") != NULL)
- 	    {
--		p = expand_env_save(p);
-+		p = expand_env_save_opt(p, TRUE);
- 		if (p == NULL)
- 		    p = pat[i];
- #ifdef UNIX
-diff -Naur vim71.orig/src/misc2.c vim71/src/misc2.c
---- vim71.orig/src/misc2.c	2007-05-07 15:49:26.000000000 -0400
-+++ vim71/src/misc2.c	2007-12-20 23:59:50.000000000 -0500
-@@ -964,7 +964,6 @@
- {
-     buf_T	*buf, *nextbuf;
-     static int	entered = FALSE;
--    win_T	*win;
- 
-     /* When we cause a crash here it is caught and Vim tries to exit cleanly.
-      * Don't try freeing everything again. */
-@@ -972,15 +971,17 @@
- 	return;
-     entered = TRUE;
- 
--    ++autocmd_block;	    /* don't want to trigger autocommands here */
-+# ifdef FEAT_AUTOCMD
-+    block_autocmds();	    /* don't want to trigger autocommands here */
-+# endif
- 
--#ifdef FEAT_WINDOWS
-+# ifdef FEAT_WINDOWS
-     /* close all tabs and windows */
-     if (first_tabpage->tp_next != NULL)
- 	do_cmdline_cmd((char_u *)"tabonly!");
-     if (firstwin != lastwin)
- 	do_cmdline_cmd((char_u *)"only!");
--#endif
-+# endif
- 
- # if defined(FEAT_SPELL)
-     /* Free all spell info. */
-@@ -1031,27 +1032,41 @@
-     free_regexp_stuff();
-     free_tag_stuff();
-     free_cd_dir();
-+# ifdef FEAT_EVAL
-     set_expr_line(NULL);
-+# endif
-+# ifdef FEAT_DIFF
-     diff_clear(curtab);
-+# endif
-     clear_sb_text();	      /* free any scrollback text */
- 
-     /* Free some global vars. */
-     vim_free(username);
-+# ifdef FEAT_CLIPBOARD
-     vim_free(clip_exclude_prog);
-+# endif
-     vim_free(last_cmdline);
-+# ifdef FEAT_CMDHIST
-     vim_free(new_last_cmdline);
-+# endif
-     set_keep_msg(NULL, 0);
-     vim_free(ff_expand_buffer);
- 
-     /* Clear cmdline history. */
-     p_hi = 0;
-+# ifdef FEAT_CMDHIST
-     init_history();
-+# endif
- 
- #ifdef FEAT_QUICKFIX
--    qf_free_all(NULL);
--    /* Free all location lists */
--    FOR_ALL_WINDOWS(win)
--	qf_free_all(win);
-+    {
-+	win_T	*win;
-+
-+	qf_free_all(NULL);
-+	/* Free all location lists */
-+	FOR_ALL_WINDOWS(win)
-+	    qf_free_all(win);
-+    }
- #endif
- 
-     /* Close all script inputs. */
-@@ -5922,7 +5937,11 @@
- {
-     if (emsg_not_now())
- 	return TRUE;		/* no error messages at the moment */
-+#ifdef HAVE_STDARG_H
-+    vim_snprintf((char *)IObuff, IOSIZE, (char *)s, a1, a2);
-+#else
-     vim_snprintf((char *)IObuff, IOSIZE, (char *)s, (long_u)a1, (long_u)a2);
-+#endif
-     return emsg(IObuff);
- }
- 
-diff -Naur vim71.orig/src/normal.c vim71/src/normal.c
---- vim71.orig/src/normal.c	2007-05-07 15:34:39.000000000 -0400
-+++ vim71/src/normal.c	2007-12-20 23:59:23.000000000 -0500
-@@ -690,13 +690,20 @@
- 		ca.count0 = ca.count0 * 10 + (c - '0');
- 	    if (ca.count0 < 0)	    /* got too large! */
- 		ca.count0 = 999999999L;
-+#ifdef FEAT_EVAL
-+	    /* Set v:count here, when called from main() and not a stuffed
-+	     * command, so that v:count can be used in an expression mapping
-+	     * right after the count. */
-+	    if (toplevel && stuff_empty())
-+		set_vcount(ca.count0, ca.count0 == 0 ? 1 : ca.count0);
-+#endif
- 	    if (ctrl_w)
- 	    {
- 		++no_mapping;
- 		++allow_keys;		/* no mapping for nchar, but keys */
- 	    }
- 	    ++no_zero_mapping;		/* don't map zero here */
--	    c = safe_vgetc();
-+	    c = plain_vgetc();
- #ifdef FEAT_LANGMAP
- 	    LANGMAP_ADJUST(c, TRUE);
- #endif
-@@ -721,7 +728,7 @@
- 	    ca.count0 = 0;
- 	    ++no_mapping;
- 	    ++allow_keys;		/* no mapping for nchar, but keys */
--	    c = safe_vgetc();		/* get next character */
-+	    c = plain_vgetc();		/* get next character */
- #ifdef FEAT_LANGMAP
- 	    LANGMAP_ADJUST(c, TRUE);
- #endif
-@@ -889,13 +896,18 @@
- 
- 	++no_mapping;
- 	++allow_keys;		/* no mapping for nchar, but allow key codes */
-+#ifdef FEAT_AUTOCMD
-+	/* Don't generate a CursorHold event here, most commands can't handle
-+	 * it, e.g., nv_replace(), nv_csearch(). */
-+	did_cursorhold = TRUE;
-+#endif
- 	if (ca.cmdchar == 'g')
- 	{
- 	    /*
- 	     * For 'g' get the next character now, so that we can check for
- 	     * "gr", "g'" and "g`".
- 	     */
--	    ca.nchar = safe_vgetc();
-+	    ca.nchar = plain_vgetc();
- #ifdef FEAT_LANGMAP
- 	    LANGMAP_ADJUST(ca.nchar, TRUE);
- #endif
-@@ -952,7 +964,7 @@
- 		im_set_active(TRUE);
- #endif
- 
--	    *cp = safe_vgetc();
-+	    *cp = plain_vgetc();
- 
- 	    if (langmap_active)
- 	    {
-@@ -1040,7 +1052,7 @@
- 		}
- 		if (c > 0)
- 		{
--		    c = safe_vgetc();
-+		    c = plain_vgetc();
- 		    if (c != Ctrl_N && c != Ctrl_G)
- 			vungetc(c);
- 		    else
-@@ -1059,7 +1071,7 @@
- 	    while (enc_utf8 && lang && (c = vpeekc()) > 0
- 				 && (c >= 0x100 || MB_BYTE2LEN(vpeekc()) > 1))
- 	    {
--		c = safe_vgetc();
-+		c = plain_vgetc();
- 		if (!utf_iscomposing(c))
- 		{
- 		    vungetc(c);		/* it wasn't, put it back */
-@@ -3755,7 +3767,8 @@
-     extra_len = (int)STRLEN(p);
-     overflow = old_len + extra_len - SHOWCMD_COLS;
-     if (overflow > 0)
--	STRCPY(showcmd_buf, showcmd_buf + overflow);
-+	mch_memmove(showcmd_buf, showcmd_buf + overflow,
-+						      old_len - overflow + 1);
-     STRCAT(showcmd_buf, p);
- 
-     if (char_avail())
-@@ -4558,7 +4571,7 @@
- #endif
- 	    ++no_mapping;
- 	    ++allow_keys;   /* no mapping for nchar, but allow key codes */
--	    nchar = safe_vgetc();
-+	    nchar = plain_vgetc();
- #ifdef FEAT_LANGMAP
- 	    LANGMAP_ADJUST(nchar, TRUE);
- #endif
-@@ -4916,7 +4929,7 @@
-     case 'u':	/* "zug" and "zuw": undo "zg" and "zw" */
- 		++no_mapping;
- 		++allow_keys;   /* no mapping for nchar, but allow key codes */
--		nchar = safe_vgetc();
-+		nchar = plain_vgetc();
- #ifdef FEAT_LANGMAP
- 		LANGMAP_ADJUST(nchar, TRUE);
- #endif
-@@ -6379,7 +6392,7 @@
-      */
-     else if (cap->nchar == 'p' || cap->nchar == 'P')
-     {
--	if (!checkclearopq(cap->oap))
-+	if (!checkclearop(cap->oap))
- 	{
- 	    prep_redo_cmd(cap);
- 	    do_put(cap->oap->regname,
-@@ -6662,6 +6675,13 @@
-     else
- 	had_ctrl_v = NUL;
- 
-+    /* Abort if the character is a special key. */
-+    if (IS_SPECIAL(cap->nchar))
-+    {
-+	clearopbeep(cap->oap);
-+	return;
-+    }
-+
- #ifdef FEAT_VISUAL
-     /* Visual mode "r" */
-     if (VIsual_active)
-@@ -6688,11 +6708,9 @@
-     }
- #endif
- 
--    /*
--     * Check for a special key or not enough characters to replace.
--     */
-+    /* Abort if not enough characters to replace. */
-     ptr = ml_get_cursor();
--    if (IS_SPECIAL(cap->nchar) || STRLEN(ptr) < (unsigned)cap->count1
-+    if (STRLEN(ptr) < (unsigned)cap->count1
- #ifdef FEAT_MBYTE
- 	    || (has_mbyte && mb_charlen(ptr) < cap->count1)
- #endif
-@@ -8353,7 +8371,7 @@
- 	n = fwd_word(cap->count1, cap->arg, cap->oap->op_type != OP_NOP);
- 
-     /* Don't leave the cursor on the NUL past a line */
--    if (curwin->w_cursor.col && gchar_cursor() == NUL)
-+    if (n != FAIL && curwin->w_cursor.col > 0 && gchar_cursor() == NUL)
-     {
- 	--curwin->w_cursor.col;
- 	cap->oap->inclusive = TRUE;
-diff -Naur vim71.orig/src/ops.c vim71/src/ops.c
---- vim71.orig/src/ops.c	2007-05-07 15:33:47.000000000 -0400
-+++ vim71/src/ops.c	2007-12-20 23:59:56.000000000 -0500
-@@ -927,15 +927,16 @@
-     int		name;
-     int		copy;	/* make a copy, if FALSE make register empty. */
- {
--    static struct yankreg	*reg;
--    int				i;
-+    struct yankreg	*reg;
-+    int			i;
- 
- #ifdef FEAT_CLIPBOARD
-     /* When Visual area changed, may have to update selection.  Obtain the
-      * selection too. */
--    if (name == '*' && clip_star.available && clip_isautosel())
-+    if (name == '*' && clip_star.available)
-     {
--	clip_update_selection();
-+	if (clip_isautosel())
-+	    clip_update_selection();
- 	may_get_selection(name);
-     }
- #endif
-@@ -966,7 +967,7 @@
- }
- 
- /*
-- * Put "reg" into register "name".  Free any previous contents.
-+ * Put "reg" into register "name".  Free any previous contents and "reg".
-  */
-     void
- put_register(name, reg)
-@@ -976,6 +977,7 @@
-     get_yank_register(name, 0);
-     free_yank_all();
-     *y_current = *(struct yankreg *)reg;
-+    vim_free(reg);
- 
- # ifdef FEAT_CLIPBOARD
-     /* Send text written to clipboard register to the clipboard. */
-@@ -2477,7 +2479,7 @@
- 
- 	/*
- 	 * Spaces and tabs in the indent may have changed to other spaces and
--	 * tabs.  Get the starting column again and correct the lenght.
-+	 * tabs.  Get the starting column again and correct the length.
- 	 * Don't do this when "$" used, end-of-line will have changed.
- 	 */
- 	block_prep(oap, &bd2, oap->start.lnum, TRUE);
-@@ -2534,7 +2536,9 @@
- #ifdef FEAT_VISUALEXTRA
-     long		offset;
-     linenr_T		linenr;
--    long		ins_len, pre_textlen = 0;
-+    long		ins_len;
-+    long		pre_textlen = 0;
-+    long		pre_indent = 0;
-     char_u		*firstline;
-     char_u		*ins_text, *newp, *oldp;
-     struct block_def	bd;
-@@ -2579,7 +2583,9 @@
- 						    || gchar_cursor() == NUL))
- 	    coladvance_force(getviscol());
- # endif
--	pre_textlen = (long)STRLEN(ml_get(oap->start.lnum));
-+	firstline = ml_get(oap->start.lnum);
-+	pre_textlen = (long)STRLEN(firstline);
-+	pre_indent = (long)(skipwhite(firstline) - firstline);
- 	bd.textcol = curwin->w_cursor.col;
-     }
- #endif
-@@ -2598,13 +2604,22 @@
-      */
-     if (oap->block_mode && oap->start.lnum != oap->end.lnum)
-     {
-+	/* Auto-indenting may have changed the indent.  If the cursor was past
-+	 * the indent, exclude that indent change from the inserted text. */
- 	firstline = ml_get(oap->start.lnum);
--	/*
--	 * Subsequent calls to ml_get() flush the firstline data - take a
--	 * copy of the required bit.
--	 */
--	if ((ins_len = (long)STRLEN(firstline) - pre_textlen) > 0)
-+	if (bd.textcol > (colnr_T)pre_indent)
-+	{
-+	    long new_indent = (long)(skipwhite(firstline) - firstline);
-+
-+	    pre_textlen += new_indent - pre_indent;
-+	    bd.textcol += new_indent - pre_indent;
-+	}
-+
-+	ins_len = (long)STRLEN(firstline) - pre_textlen;
-+	if (ins_len > 0)
- 	{
-+	    /* Subsequent calls to ml_get() flush the firstline data - take a
-+	     * copy of the inserted text.  */
- 	    if ((ins_text = alloc_check((unsigned)(ins_len + 1))) != NULL)
- 	    {
- 		vim_strncpy(ins_text, firstline + bd.textcol, (size_t)ins_len);
-@@ -3404,7 +3419,9 @@
- 
- #ifdef FEAT_VIRTUALEDIT
- 	col += curwin->w_cursor.coladd;
--	if (ve_flags == VE_ALL && curwin->w_cursor.coladd > 0)
-+	if (ve_flags == VE_ALL
-+		&& (curwin->w_cursor.coladd > 0
-+		    || endcol2 == curwin->w_cursor.col))
- 	{
- 	    if (dir == FORWARD && c == NUL)
- 		++col;
-diff -Naur vim71.orig/src/option.c vim71/src/option.c
---- vim71.orig/src/option.c	2007-05-01 07:26:10.000000000 -0400
-+++ vim71/src/option.c	2007-12-20 23:59:12.000000000 -0500
-@@ -427,6 +427,8 @@
- #define P_NOGLOB       0x100000L/* do not use local value for global vimrc */
- #define P_NFNAME       0x200000L/* only normal file name chars allowed */
- #define P_INSECURE     0x400000L/* option was set from a modeline */
-+#define P_PRI_MKRC     0x800000L/* priority for :mkvimrc (setting option has
-+				   side effects) */
- 
- #define ISK_LATIN1  (char_u *)"@,48-57,_,192-255"
- 
-@@ -773,6 +775,8 @@
- 			    {(char_u *)0L, (char_u *)0L}
- #endif
- 			    },
-+			    /* P_PRI_MKRC isn't needed here, optval_default()
-+			     * always returns TRUE for 'compatible' */
-     {"compatible",  "cp",   P_BOOL|P_RALL,
- 			    (char_u *)&p_cp, PV_NONE,
- 			    {(char_u *)TRUE, (char_u *)FALSE}},
-@@ -1515,7 +1519,7 @@
- 			    {(char_u *)0L, (char_u *)0L}
- #endif
- 			    },
--    {"keymap",	    "kmp",  P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF|P_RSTAT|P_NFNAME,
-+    {"keymap",	    "kmp",  P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF|P_RSTAT|P_NFNAME|P_PRI_MKRC,
- #ifdef FEAT_KEYMAP
- 			    (char_u *)&p_keymap, PV_KMAP,
- 			    {(char_u *)"", (char_u *)0L}
-@@ -1836,7 +1840,7 @@
-     {"paragraphs",  "para", P_STRING|P_VI_DEF,
- 			    (char_u *)&p_para, PV_NONE,
- 			    {(char_u *)"IPLPPPQPP LIpplpipbp", (char_u *)0L}},
--    {"paste",	    NULL,   P_BOOL|P_VI_DEF,
-+    {"paste",	    NULL,   P_BOOL|P_VI_DEF|P_PRI_MKRC,
- 			    (char_u *)&p_paste, PV_NONE,
- 			    {(char_u *)FALSE, (char_u *)0L}},
-     {"pastetoggle", "pt",   P_STRING|P_VI_DEF,
-@@ -4628,7 +4632,7 @@
- 				    if ((!(flags & P_COMMA) || *s != ',')
- 					    && vim_strchr(s + 1, *s) != NULL)
- 				    {
--					STRCPY(s, s + 1);
-+					mch_memmove(s, s + 1, STRLEN(s));
- 					--s;
- 				    }
- 			    }
-@@ -4992,7 +4996,7 @@
-      * For 'spellsuggest' expand after "file:".
-      */
-     expand_env_esc(val, NameBuff, MAXPATHL,
--	    (char_u **)options[opt_idx].var == &p_tags,
-+	    (char_u **)options[opt_idx].var == &p_tags, FALSE,
- #ifdef FEAT_SPELL
- 	    (char_u **)options[opt_idx].var == &p_sps ? (char_u *)"file:" :
- #endif
-@@ -6348,7 +6352,7 @@
- 		errmsg = check_stl_option(p_ruf);
- 	}
- 	/* check 'statusline' only if it doesn't start with "%!" */
--	else if (varp != &p_stl || s[0] != '%' || s[1] != '!')
-+	else if (varp == &p_ruf || s[0] != '%' || s[1] != '!')
- 	    errmsg = check_stl_option(s);
- 	if (varp == &p_ruf && errmsg == NULL)
- 	    comp_col();
-@@ -7118,6 +7122,11 @@
-     /* when 'endofline' is changed, redraw the window title */
-     else if ((int *)varp == &curbuf->b_p_eol)
- 	need_maketitle = TRUE;
-+#ifdef FEAT_MBYTE
-+    /* when 'bomb' is changed, redraw the window title */
-+    else if ((int *)varp == &curbuf->b_p_bomb)
-+	need_maketitle = TRUE;
-+#endif
- #endif
- 
-     /* when 'bin' is set also set some other options */
-@@ -7815,6 +7824,8 @@
- 	    errmsg = e_positive;
- 	    p_ch = 1;
- 	}
-+	if (p_ch > Rows - min_rows() + 1)
-+	    p_ch = Rows - min_rows() + 1;
- 
- 	/* Only compute the new window layout when startup has been
- 	 * completed. Otherwise the frame sizes may be wrong. */
-@@ -8219,6 +8230,25 @@
- 	    varp = get_varp(&options[opt_idx]);
- 	    if (varp != NULL)	/* hidden option is not changed */
- 	    {
-+		if (number == 0 && string != NULL)
-+		{
-+		    int index;
-+
-+		    /* Either we are given a string or we are setting option
-+		     * to zero. */
-+		    for (index = 0; string[index] == '0'; ++index)
-+			;
-+		    if (string[index] != NUL || index == 0)
-+		    {
-+			/* There's another character after zeros or the string
-+			 * is empty.  In both cases, we are trying to set a
-+			 * num option using a string. */
-+			EMSG3(_("E521: Number required: &%s = '%s'"),
-+								name, string);
-+			return;     /* do nothing as we hit an error */
-+
-+		    }
-+		}
- 		if (flags & P_NUM)
- 		    (void)set_num_option(opt_idx, varp, number,
- 							  NULL, 0, opt_flags);
-@@ -8511,13 +8541,20 @@
-     char_u		*varp_local = NULL;	/* fresh value */
-     char		*cmd;
-     int			round;
-+    int			pri;
- 
-     /*
-      * The options that don't have a default (terminal name, columns, lines)
-      * are never written.  Terminal options are also not written.
-+     * Do the loop over "options[]" twice: once for options with the
-+     * P_PRI_MKRC flag and once without.
-      */
--    for (p = &options[0]; !istermoption(p); p++)
--	if (!(p->flags & P_NO_MKRC) && !istermoption(p))
-+    for (pri = 1; pri >= 0; --pri)
-+    {
-+      for (p = &options[0]; !istermoption(p); p++)
-+	if (!(p->flags & P_NO_MKRC)
-+		&& !istermoption(p)
-+		&& ((pri == 1) == ((p->flags & P_PRI_MKRC) != 0)))
- 	{
- 	    /* skip global option when only doing locals */
- 	    if (p->indir == PV_NONE && !(opt_flags & OPT_GLOBAL))
-@@ -8613,6 +8650,7 @@
- 		}
- 	    }
- 	}
-+    }
-     return OK;
- }
- 
-@@ -8715,6 +8753,8 @@
-     char	*name;
-     int		value;
- {
-+    if (value < 0)	/* global/local option using global value */
-+	return OK;
-     if (fprintf(fd, "%s %s%s", cmd, value ? "" : "no", name) < 0
- 	    || put_eol(fd) < 0)
- 	return FAIL;
-@@ -10585,6 +10625,8 @@
-     buf->b_start_ffc = *buf->b_p_ff;
-     buf->b_start_eol = buf->b_p_eol;
- #ifdef FEAT_MBYTE
-+    buf->b_start_bomb = buf->b_p_bomb;
-+
-     /* Only use free/alloc when necessary, they take time. */
-     if (buf->b_start_fenc == NULL
- 			     || STRCMP(buf->b_start_fenc, buf->b_p_fenc) != 0)
-@@ -10598,13 +10640,17 @@
- /*
-  * Return TRUE if 'fileformat' and/or 'fileencoding' has a different value
-  * from when editing started (save_file_ff() called).
-- * Also when 'endofline' was changed and 'binary' is set.
-+ * Also when 'endofline' was changed and 'binary' is set, or when 'bomb' was
-+ * changed and 'binary' is not set.
-  * Don't consider a new, empty buffer to be changed.
-  */
-     int
- file_ff_differs(buf)
-     buf_T	*buf;
- {
-+    /* In a buffer that was never loaded the options are not valid. */
-+    if (buf->b_flags & BF_NEVERLOADED)
-+	return FALSE;
-     if ((buf->b_flags & BF_NEW)
- 	    && buf->b_ml.ml_line_count == 1
- 	    && *ml_get_buf(buf, (linenr_T)1, FALSE) == NUL)
-@@ -10614,6 +10660,8 @@
-     if (buf->b_p_bin && buf->b_start_eol != buf->b_p_eol)
- 	return TRUE;
- #ifdef FEAT_MBYTE
-+    if (!buf->b_p_bin && buf->b_start_bomb != buf->b_p_bomb)
-+	return TRUE;
-     if (buf->b_start_fenc == NULL)
- 	return (*buf->b_p_fenc != NUL);
-     return (STRCMP(buf->b_start_fenc, buf->b_p_fenc) != 0);
-diff -Naur vim71.orig/src/os_unix.c vim71/src/os_unix.c
---- vim71.orig/src/os_unix.c	2007-05-09 15:41:58.000000000 -0400
-+++ vim71/src/os_unix.c	2007-12-20 23:59:55.000000000 -0500
-@@ -310,7 +310,7 @@
- }
- 
- /*
-- * mch_inchar(): low level input funcion.
-+ * mch_inchar(): low level input function.
-  * Get a characters from the keyboard.
-  * Return the number of characters that are available.
-  * If wtime == 0 do not wait for characters.
-@@ -753,7 +753,8 @@
-     if (signal_stack != NULL)
-     {
- # ifdef HAVE_SIGALTSTACK
--#  ifdef __APPLE__
-+#  if defined(__APPLE__) && (!defined(MAC_OS_X_VERSION_MAX_ALLOWED) \
-+		|| MAC_OS_X_VERSION_MAX_ALLOWED <= 1040)
- 	/* missing prototype.  Adding it to osdef?.h.in doesn't work, because
- 	 * "struct sigaltstack" needs to be declared. */
- 	extern int sigaltstack __ARGS((const struct sigaltstack *ss, struct sigaltstack *oss));
-@@ -1566,18 +1567,19 @@
- #ifdef FEAT_XCLIPBOARD
-     if (xterm_dpy != NULL && x11_window != 0)
-     {
--	/* Checked it already. */
--	if (x11_display_from == XD_XTERM)
--	    return OK;
--
--	/*
--	 * If the X11 display was opened here before, for the window where Vim
--	 * was started, close that one now to avoid a memory leak.
--	 */
--	if (x11_display_from == XD_HERE && x11_display != NULL)
--	    XCloseDisplay(x11_display);
--	x11_display = xterm_dpy;
--	x11_display_from = XD_XTERM;
-+	/* We may have checked it already, but Gnome terminal can move us to
-+	 * another window, so we need to check every time. */
-+	if (x11_display_from != XD_XTERM)
-+	{
-+	    /*
-+	     * If the X11 display was opened here before, for the window where
-+	     * Vim was started, close that one now to avoid a memory leak.
-+	     */
-+	    if (x11_display_from == XD_HERE && x11_display != NULL)
-+		XCloseDisplay(x11_display);
-+	    x11_display = xterm_dpy;
-+	    x11_display_from = XD_XTERM;
-+	}
- 	if (test_x11_window(x11_display) == FAIL)
- 	{
- 	    /* probably bad $WINDOWID */
-@@ -2420,7 +2422,7 @@
- /*
-  * Set the case of the file name, if it already exists.  This will cause the
-  * file name to remain exactly the same.
-- * Only required for file systems where case is ingored and preserved.
-+ * Only required for file systems where case is ignored and preserved.
-  */
- /*ARGSUSED*/
-     void
-@@ -2499,7 +2501,13 @@
-     if (stat((char *)name, &statb))
- #endif
- 	return -1;
-+#ifdef __INTERIX
-+    /* The top bit makes the value negative, which means the file doesn't
-+     * exist.  Remove the bit, we don't use it. */
-+    return statb.st_mode & ~S_ADDACE;
-+#else
-     return statb.st_mode;
-+#endif
- }
- 
- /*
-@@ -4646,7 +4654,7 @@
- 	ret = poll(fds, nfd, towait);
- # ifdef FEAT_MZSCHEME
- 	if (ret == 0 && mzquantum_used)
--	    /* MzThreads scheduling is required and timeout occured */
-+	    /* MzThreads scheduling is required and timeout occurred */
- 	    finished = FALSE;
- # endif
- 
-@@ -4794,7 +4802,7 @@
- #endif
- # ifdef FEAT_MZSCHEME
- 	if (ret == 0 && mzquantum_used)
--	    /* loop if MzThreads must be scheduled and timeout occured */
-+	    /* loop if MzThreads must be scheduled and timeout occurred */
- 	    finished = FALSE;
- # endif
- 
-@@ -5184,7 +5192,7 @@
- 	{
- 	    /* When using system() always add extra quotes, because the shell
- 	     * is started twice.  Otherwise put a backslash before special
--	     * characters, except insice ``. */
-+	     * characters, except inside ``. */
- #ifdef USE_SYSTEM
- 	    STRCAT(command, " \"");
- 	    STRCAT(command, pat[i]);
-@@ -5668,7 +5676,7 @@
- 	    /* gpm library tries to handling TSTP causes
- 	     * problems. Anyways, we close connection to Gpm whenever
- 	     * we are going to suspend or starting an external process
--	     * so we should'nt  have problem with this
-+	     * so we shouldn't  have problem with this
- 	     */
- 	    signal(SIGTSTP, restricted ? SIG_IGN : SIG_DFL);
- 	    return 1; /* succeed */
-@@ -5682,7 +5690,7 @@
- 
- /*
-  * Closes connection to gpm
-- * returns non-zero if connection succesfully closed
-+ * returns non-zero if connection successfully closed
-  */
-     static void
- gpm_close()
-diff -Naur vim71.orig/src/os_unix.h vim71/src/os_unix.h
---- vim71.orig/src/os_unix.h	2007-05-07 15:35:05.000000000 -0400
-+++ vim71/src/os_unix.h	2007-12-20 23:57:02.000000000 -0500
-@@ -508,6 +508,9 @@
- #if !defined(S_ISFIFO) && defined(S_IFIFO)
- # define	S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO)
- #endif
-+#if !defined(S_ISCHR) && defined(S_IFCHR)
-+# define	S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR)
-+#endif
- 
- /* Note: Some systems need both string.h and strings.h (Savage).  However,
-  * some systems can't handle both, only use string.h in that case. */
-diff -Naur vim71.orig/src/popupmnu.c vim71/src/popupmnu.c
---- vim71.orig/src/popupmnu.c	2007-03-24 16:07:39.000000000 -0400
-+++ vim71/src/popupmnu.c	2007-12-20 23:57:41.000000000 -0500
-@@ -75,7 +75,6 @@
- 
-     row = curwin->w_cline_row + W_WINROW(curwin);
-     height = curwin->w_cline_height;
--    col = curwin->w_wcol + W_WINCOL(curwin) - curwin->w_leftcol;
- 
-     if (firstwin->w_p_pvw)
- 	top_clear = firstwin->w_height;
-@@ -167,6 +166,15 @@
-     pum_base_width = max_width;
-     pum_kind_width = kind_width;
- 
-+    /* Calculate column */
-+#ifdef FEAT_RIGHTLEFT
-+    if (curwin->w_p_rl)
-+	col = W_WINCOL(curwin) + W_WIDTH(curwin) - curwin->w_wcol -
-+							curwin->w_leftcol - 1;
-+    else
-+#endif
-+	col = W_WINCOL(curwin) + curwin->w_wcol - curwin->w_leftcol;
-+
-     /* if there are more items than room we need a scrollbar */
-     if (pum_height < size)
-     {
-@@ -179,11 +187,23 @@
-     if (def_width < max_width)
- 	def_width = max_width;
- 
--    if (col < Columns - PUM_DEF_WIDTH || col < Columns - max_width)
-+    if (((col < Columns - PUM_DEF_WIDTH || col < Columns - max_width)
-+#ifdef FEAT_RIGHTLEFT
-+		&& !curwin->w_p_rl)
-+	    || (curwin->w_p_rl && (col > PUM_DEF_WIDTH || col > max_width)
-+#endif
-+       ))
-     {
- 	/* align pum column with "col" */
- 	pum_col = col;
--	pum_width = Columns - pum_col - pum_scrollbar;
-+
-+#ifdef FEAT_RIGHTLEFT
-+	if (curwin->w_p_rl)
-+	    pum_width = pum_col - pum_scrollbar + 1;
-+	else
-+#endif
-+	    pum_width = Columns - pum_col - pum_scrollbar;
-+
- 	if (pum_width > max_width + kind_width + extra_width + 1
- 						 && pum_width > PUM_DEF_WIDTH)
- 	{
-@@ -195,14 +215,24 @@
-     else if (Columns < def_width)
-     {
- 	/* not enough room, will use what we have */
--	pum_col = 0;
-+#ifdef FEAT_RIGHTLEFT
-+	if (curwin->w_p_rl)
-+	    pum_col = Columns - 1;
-+	else
-+#endif
-+	    pum_col = 0;
- 	pum_width = Columns - 1;
-     }
-     else
-     {
- 	if (max_width > PUM_DEF_WIDTH)
- 	    max_width = PUM_DEF_WIDTH;	/* truncate */
--	pum_col = Columns - max_width;
-+#ifdef FEAT_RIGHTLEFT
-+	if (curwin->w_p_rl)
-+	    pum_col = max_width - 1;
-+	else
-+#endif
-+	    pum_col = Columns - max_width;
- 	pum_width = max_width - pum_scrollbar;
-     }
- 
-@@ -255,8 +285,16 @@
- 	attr = (idx == pum_selected) ? attr_select : attr_norm;
- 
- 	/* prepend a space if there is room */
--	if (pum_col > 0)
--	    screen_putchar(' ', row, pum_col - 1, attr);
-+#ifdef FEAT_RIGHTLEFT
-+	if (curwin->w_p_rl)
-+	{
-+	    if (pum_col < W_WINCOL(curwin) + W_WIDTH(curwin) - 1)
-+		screen_putchar(' ', row, pum_col + 1, attr);
-+	}
-+	else
-+#endif
-+	    if (pum_col > 0)
-+		screen_putchar(' ', row, pum_col - 1, attr);
- 
- 	/* Display each entry, use two spaces for a Tab.
- 	 * Do this 3 times: For the main text, kind and extra info */
-@@ -282,26 +320,67 @@
- 		    {
- 			/* Display the text that fits or comes before a Tab.
- 			 * First convert it to printable characters. */
--			char_u *st;
--			int  saved = *p;
-+			char_u	*st;
-+			int	saved = *p;
- 
- 			*p = NUL;
- 			st = transstr(s);
- 			*p = saved;
--			if (st != NULL)
-+#ifdef FEAT_RIGHTLEFT
-+			if (curwin->w_p_rl)
- 			{
--			    screen_puts_len(st, (int)STRLEN(st), row, col,
-+			    if (st != NULL)
-+			    {
-+				char_u	*rt = reverse_text(st);
-+				char_u	*rt_saved = rt;
-+				int	len, j;
-+
-+				if (rt != NULL)
-+				{
-+				    len = STRLEN(rt);
-+				    if (len > pum_width)
-+				    {
-+					for (j = pum_width; j < len; ++j)
-+					    mb_ptr_adv(rt);
-+					len = pum_width;
-+				    }
-+				    screen_puts_len(rt, len, row,
-+							col - len + 1, attr);
-+				    vim_free(rt_saved);
-+				}
-+				vim_free(st);
-+			    }
-+			    col -= width;
-+			}
-+			else
-+#endif
-+			{
-+			    if (st != NULL)
-+			    {
-+				screen_puts_len(st, (int)STRLEN(st), row, col,
- 									attr);
--			    vim_free(st);
-+				vim_free(st);
-+			    }
-+			    col += width;
- 			}
--			col += width;
- 
- 			if (*p != TAB)
- 			    break;
- 
- 			/* Display two spaces for a Tab. */
--			screen_puts_len((char_u *)"  ", 2, row, col, attr);
--			col += 2;
-+#ifdef FEAT_RIGHTLEFT
-+			if (curwin->w_p_rl)
-+			{
-+			    screen_puts_len((char_u *)"  ", 2, row, col - 1,
-+									attr);
-+			    col -= 2;
-+			}
-+			else
-+#endif
-+			{
-+			    screen_puts_len((char_u *)"  ", 2, row, col, attr);
-+			    col += 2;
-+			}
- 			totwidth += 2;
- 			s = NULL;	    /* start text at next char */
- 			width = 0;
-@@ -322,17 +401,44 @@
- 					  && pum_array[idx].pum_extra == NULL)
- 		    || pum_base_width + n >= pum_width)
- 		break;
--	    screen_fill(row, row + 1, col, pum_col + pum_base_width + n,
-+#ifdef FEAT_RIGHTLEFT
-+	    if (curwin->w_p_rl)
-+	    {
-+		screen_fill(row, row + 1, pum_col - pum_base_width - n + 1,
-+						    col + 1, ' ', ' ', attr);
-+		col = pum_col - pum_base_width - n + 1;
-+	    }
-+	    else
-+#endif
-+	    {
-+		screen_fill(row, row + 1, col, pum_col + pum_base_width + n,
- 							      ' ', ' ', attr);
--	    col = pum_col + pum_base_width + n;
-+		col = pum_col + pum_base_width + n;
-+	    }
- 	    totwidth = pum_base_width + n;
- 	}
- 
--	screen_fill(row, row + 1, col, pum_col + pum_width, ' ', ' ', attr);
-+#ifdef FEAT_RIGHTLEFT
-+	if (curwin->w_p_rl)
-+	    screen_fill(row, row + 1, pum_col - pum_width + 1, col + 1, ' ',
-+								    ' ', attr);
-+	else
-+#endif
-+	    screen_fill(row, row + 1, col, pum_col + pum_width, ' ', ' ',
-+									attr);
- 	if (pum_scrollbar > 0)
--	    screen_putchar(' ', row, pum_col + pum_width,
--		    i >= thumb_pos && i < thumb_pos + thumb_heigth
-+	{
-+#ifdef FEAT_RIGHTLEFT
-+	    if (curwin->w_p_rl)
-+		screen_putchar(' ', row, pum_col - pum_width,
-+			i >= thumb_pos && i < thumb_pos + thumb_heigth
- 						  ? attr_thumb : attr_scroll);
-+	    else
-+#endif
-+		screen_putchar(' ', row, pum_col + pum_width,
-+			i >= thumb_pos && i < thumb_pos + thumb_heigth
-+						  ? attr_thumb : attr_scroll);
-+	}
- 
- 	++row;
-     }
-@@ -466,7 +572,7 @@
- 			set_option_value((char_u *)"bh", 0L,
- 						 (char_u *)"wipe", OPT_LOCAL);
- 			set_option_value((char_u *)"diff", 0L,
--						     (char_u *)"", OPT_LOCAL);
-+							     NULL, OPT_LOCAL);
- 		    }
- 		}
- 		if (res == OK)
-diff -Naur vim71.orig/src/proto/charset.pro vim71/src/proto/charset.pro
---- vim71.orig/src/proto/charset.pro	2007-05-12 06:39:01.000000000 -0400
-+++ vim71/src/proto/charset.pro	2007-12-20 23:58:12.000000000 -0500
-@@ -21,6 +21,7 @@
- int vim_iswordp __ARGS((char_u *p));
- int vim_iswordc_buf __ARGS((char_u *p, buf_T *buf));
- int vim_isfilec __ARGS((int c));
-+int vim_isfilec_or_wc __ARGS((int c));
- int vim_isprintc __ARGS((int c));
- int vim_isprintc_strict __ARGS((int c));
- int lbr_chartabsize __ARGS((unsigned char *s, colnr_T col));
-diff -Naur vim71.orig/src/proto/ex_docmd.pro vim71/src/proto/ex_docmd.pro
---- vim71.orig/src/proto/ex_docmd.pro	2007-05-12 06:39:10.000000000 -0400
-+++ vim71/src/proto/ex_docmd.pro	2007-12-20 23:59:51.000000000 -0500
-@@ -5,6 +5,7 @@
- int getline_equal __ARGS((char_u *(*fgetline)(int, void *, int), void *cookie, char_u *(*func)(int, void *, int)));
- void *getline_cookie __ARGS((char_u *(*fgetline)(int, void *, int), void *cookie));
- int checkforcmd __ARGS((char_u **pp, char *cmd, int len));
-+int modifier_len __ARGS((char_u *cmd));
- int cmd_exists __ARGS((char_u *name));
- char_u *set_one_cmd_context __ARGS((expand_T *xp, char_u *buff));
- char_u *skip_range __ARGS((char_u *cmd, int *ctx));
-diff -Naur vim71.orig/src/proto/fileio.pro vim71/src/proto/fileio.pro
---- vim71.orig/src/proto/fileio.pro	2007-05-12 06:39:14.000000000 -0400
-+++ vim71/src/proto/fileio.pro	2007-12-20 23:59:05.000000000 -0500
-@@ -2,6 +2,7 @@
- void filemess __ARGS((buf_T *buf, char_u *name, char_u *s, int attr));
- int readfile __ARGS((char_u *fname, char_u *sfname, linenr_T from, linenr_T lines_to_skip, linenr_T lines_to_read, exarg_T *eap, int flags));
- int prep_exarg __ARGS((exarg_T *eap, buf_T *buf));
-+int check_file_readonly __ARGS((char_u *fname, int perm));
- int buf_write __ARGS((buf_T *buf, char_u *fname, char_u *sfname, linenr_T start, linenr_T end, exarg_T *eap, int append, int forceit, int reset_changed, int filtering));
- void msg_add_fname __ARGS((buf_T *buf, char_u *fname));
- void msg_add_lines __ARGS((int insert_space, long lnum, long nchars));
-@@ -39,6 +40,8 @@
- int trigger_cursorhold __ARGS((void));
- int has_cursormoved __ARGS((void));
- int has_cursormovedI __ARGS((void));
-+void block_autocmds __ARGS((void));
-+void unblock_autocmds __ARGS((void));
- int has_autocmd __ARGS((event_T event, char_u *sfname, buf_T *buf));
- char_u *get_augroup_name __ARGS((expand_T *xp, int idx));
- char_u *set_context_in_autocmd __ARGS((expand_T *xp, char_u *arg, int doautocmd));
-diff -Naur vim71.orig/src/proto/getchar.pro vim71/src/proto/getchar.pro
---- vim71.orig/src/proto/getchar.pro	2007-05-12 06:39:16.000000000 -0400
-+++ vim71/src/proto/getchar.pro	2007-12-20 23:58:39.000000000 -0500
-@@ -38,6 +38,7 @@
- void updatescript __ARGS((int c));
- int vgetc __ARGS((void));
- int safe_vgetc __ARGS((void));
-+int plain_vgetc __ARGS((void));
- int vpeekc __ARGS((void));
- int vpeekc_nomap __ARGS((void));
- int vpeekc_any __ARGS((void));
-diff -Naur vim71.orig/src/proto/if_cscope.pro vim71/src/proto/if_cscope.pro
---- vim71.orig/src/proto/if_cscope.pro	2007-05-12 06:39:21.000000000 -0400
-+++ vim71/src/proto/if_cscope.pro	2007-12-20 23:58:34.000000000 -0500
-@@ -6,4 +6,5 @@
- void cs_free_tags __ARGS((void));
- void cs_print_tags __ARGS((void));
- int cs_connection __ARGS((int num, char_u *dbpath, char_u *ppath));
-+void cs_end __ARGS((void));
- /* vim: set ft=c : */
-diff -Naur vim71.orig/src/proto/mbyte.pro vim71/src/proto/mbyte.pro
---- vim71.orig/src/proto/mbyte.pro	2007-05-12 06:39:38.000000000 -0400
-+++ vim71/src/proto/mbyte.pro	2007-12-20 23:58:25.000000000 -0500
-@@ -12,9 +12,9 @@
- int utf_ptr2cells __ARGS((char_u *p));
- int dbcs_ptr2cells __ARGS((char_u *p));
- int latin_char2cells __ARGS((int c));
--int latin_off2cells __ARGS((unsigned off));
--int dbcs_off2cells __ARGS((unsigned off));
--int utf_off2cells __ARGS((unsigned off));
-+int latin_off2cells __ARGS((unsigned off, unsigned max_off));
-+int dbcs_off2cells __ARGS((unsigned off, unsigned max_off));
-+int utf_off2cells __ARGS((unsigned off, unsigned max_off));
- int latin_ptr2char __ARGS((char_u *p));
- int utf_ptr2char __ARGS((char_u *p));
- int mb_ptr2char_adv __ARGS((char_u **pp));
-diff -Naur vim71.orig/src/proto/misc1.pro vim71/src/proto/misc1.pro
---- vim71.orig/src/proto/misc1.pro	2007-05-12 06:39:34.000000000 -0400
-+++ vim71/src/proto/misc1.pro	2007-12-20 23:59:02.000000000 -0500
-@@ -48,10 +48,11 @@
- void vim_beep __ARGS((void));
- void init_homedir __ARGS((void));
- void free_homedir __ARGS((void));
-+char_u *expand_env_save __ARGS((char_u *src));
-+char_u *expand_env_save_opt __ARGS((char_u *src, int one));
- void expand_env __ARGS((char_u *src, char_u *dst, int dstlen));
--void expand_env_esc __ARGS((char_u *srcp, char_u *dst, int dstlen, int esc, char_u *startstr));
-+void expand_env_esc __ARGS((char_u *srcp, char_u *dst, int dstlen, int esc, int one, char_u *startstr));
- char_u *vim_getenv __ARGS((char_u *name, int *mustfree));
--char_u *expand_env_save __ARGS((char_u *src));
- void vim_setenv __ARGS((char_u *name, char_u *val));
- char_u *get_env_name __ARGS((expand_T *xp, int idx));
- void home_replace __ARGS((buf_T *buf, char_u *src, char_u *dst, int dstlen, int one));
-diff -Naur vim71.orig/src/proto/search.pro vim71/src/proto/search.pro
---- vim71.orig/src/proto/search.pro	2007-05-12 06:39:50.000000000 -0400
-+++ vim71/src/proto/search.pro	2007-12-20 23:57:41.000000000 -0500
-@@ -1,6 +1,7 @@
- /* search.c */
- int search_regcomp __ARGS((char_u *pat, int pat_save, int pat_use, int options, regmmatch_T *regmatch));
- char_u *get_search_pat __ARGS((void));
-+char_u *reverse_text __ARGS((char_u *s));
- void save_search_patterns __ARGS((void));
- void restore_search_patterns __ARGS((void));
- void free_search_patterns __ARGS((void));
-diff -Naur vim71.orig/src/proto/syntax.pro vim71/src/proto/syntax.pro
---- vim71.orig/src/proto/syntax.pro	2007-05-12 06:39:52.000000000 -0400
-+++ vim71/src/proto/syntax.pro	2007-12-20 23:57:14.000000000 -0500
-@@ -8,6 +8,8 @@
- void syntax_clear __ARGS((buf_T *buf));
- void ex_syntax __ARGS((exarg_T *eap));
- int syntax_present __ARGS((buf_T *buf));
-+void reset_expand_highlight __ARGS((void));
-+void set_context_in_echohl_cmd __ARGS((expand_T *xp, char_u *arg));
- void set_context_in_syntax_cmd __ARGS((expand_T *xp, char_u *arg));
- char_u *get_syntax_name __ARGS((expand_T *xp, int idx));
- int syn_get_id __ARGS((win_T *wp, long lnum, colnr_T col, int trans, int *spellp));
-diff -Naur vim71.orig/src/proto/window.pro vim71/src/proto/window.pro
---- vim71.orig/src/proto/window.pro	2007-05-12 06:40:00.000000000 -0400
-+++ vim71/src/proto/window.pro	2007-12-20 23:57:20.000000000 -0500
-@@ -59,4 +59,8 @@
- int only_one_window __ARGS((void));
- void check_lnums __ARGS((int do_curwin));
- int win_hasvertsplit __ARGS((void));
-+int match_add __ARGS((win_T *wp, char_u *grp, char_u *pat, int prio, int id));
-+int match_delete __ARGS((win_T *wp, int id, int perr));
-+void clear_matches __ARGS((win_T *wp));
-+matchitem_T *get_match __ARGS((win_T *wp, int id));
- /* vim: set ft=c : */
-diff -Naur vim71.orig/src/quickfix.c vim71/src/quickfix.c
---- vim71.orig/src/quickfix.c	2007-02-03 19:50:17.000000000 -0500
-+++ vim71/src/quickfix.c	2007-12-20 23:58:47.000000000 -0500
-@@ -1612,8 +1612,8 @@
- 	}
- 
- 	/*
--	 * If there is only one window and is the quickfix window, create a new
--	 * one above the quickfix window.
-+	 * If there is only one window and it is the quickfix window, create a
-+	 * new one above the quickfix window.
- 	 */
- 	if (((firstwin == lastwin) && bt_quickfix(curbuf)) || !usable_win)
- 	{
-@@ -2331,7 +2331,7 @@
- 	    set_option_value((char_u *)"bt", 0L, (char_u *)"quickfix",
- 								   OPT_LOCAL);
- 	    set_option_value((char_u *)"bh", 0L, (char_u *)"wipe", OPT_LOCAL);
--	    set_option_value((char_u *)"diff", 0L, (char_u *)"", OPT_LOCAL);
-+	    set_option_value((char_u *)"diff", 0L, NULL, OPT_LOCAL);
- 	}
- 
- 	/* Only set the height when still in the same tab page and there is no
-@@ -2981,6 +2981,7 @@
-     buf_T	*buf;
-     int		duplicate_name = FALSE;
-     int		using_dummy;
-+    int		redraw_for_dummy = FALSE;
-     int		found_match;
-     buf_T	*first_match_buf = NULL;
-     time_t	seconds = 0;
-@@ -3097,6 +3098,7 @@
- 	    /* Remember that a buffer with this name already exists. */
- 	    duplicate_name = (buf != NULL);
- 	    using_dummy = TRUE;
-+	    redraw_for_dummy = TRUE;
- 
- #if defined(FEAT_AUTOCMD) && defined(FEAT_SYN_HL)
- 	    /* Don't do Filetype autocommands to avoid loading syntax and
-@@ -3243,11 +3245,29 @@
-     if (qi->qf_lists[qi->qf_curlist].qf_count > 0)
-     {
- 	if ((flags & VGR_NOJUMP) == 0)
-+	{
-+	    buf = curbuf;
- 	    qf_jump(qi, 0, 0, eap->forceit);
-+	    if (buf != curbuf)
-+		/* If we jumped to another buffer redrawing will already be
-+		 * taken care of. */
-+		redraw_for_dummy = FALSE;
-+	}
-     }
-     else
- 	EMSG2(_(e_nomatch2), s);
- 
-+    /* If we loaded a dummy buffer into the current window, the autocommands
-+     * may have messed up things, need to redraw and recompute folds. */
-+    if (redraw_for_dummy)
-+    {
-+#ifdef FEAT_FOLDING
-+	foldUpdateAll(curwin);
-+#else
-+	redraw_later(NOT_VALID);
-+#endif
-+    }
-+
- theend:
-     vim_free(regmatch.regprog);
- }
-diff -Naur vim71.orig/src/regexp.c vim71/src/regexp.c
---- vim71.orig/src/regexp.c	2007-05-07 15:50:03.000000000 -0400
-+++ vim71/src/regexp.c	2007-12-21 00:00:04.000000000 -0500
-@@ -2220,7 +2220,7 @@
- 				break;
- 			    case CLASS_LOWER:
- 				for (cu = 1; cu <= 255; cu++)
--				    if (islower(cu))
-+				    if (MB_ISLOWER(cu))
- 					regc(cu);
- 				break;
- 			    case CLASS_PRINT:
-@@ -2240,7 +2240,7 @@
- 				break;
- 			    case CLASS_UPPER:
- 				for (cu = 1; cu <= 255; cu++)
--				    if (isupper(cu))
-+				    if (MB_ISUPPER(cu))
- 					regc(cu);
- 				break;
- 			    case CLASS_XDIGIT:
-@@ -2770,7 +2770,8 @@
-     {
- #ifdef FEAT_MBYTE
- 	if (enc_utf8)
--	    prevchr_len += utf_char2len(mb_ptr2char(regparse + prevchr_len));
-+	    /* exclude composing chars that mb_ptr2len does include */
-+	    prevchr_len += utf_ptr2len(regparse + prevchr_len);
- 	else if (has_mbyte)
- 	    prevchr_len += (*mb_ptr2len)(regparse + prevchr_len);
- 	else
-@@ -3465,7 +3466,7 @@
- 			(enc_utf8 && utf_fold(prog->regstart) == utf_fold(c)))
- 			|| (c < 255 && prog->regstart < 255 &&
- #endif
--			    TOLOWER_LOC(prog->regstart) == TOLOWER_LOC(c)))))
-+			    MB_TOLOWER(prog->regstart) == MB_TOLOWER(c)))))
- 	    retval = regtry(prog, col);
- 	else
- 	    retval = 0;
-@@ -3809,11 +3810,11 @@
- 	    break;
- 
- 	  case RE_BOF:
--	    /* Passing -1 to the getline() function provided for the search
--	     * should always return NULL if the current line is the first
--	     * line of the file. */
-+	    /* We're not at the beginning of the file when below the first
-+	     * line where we started, not at the start of the line or we
-+	     * didn't start at the first line of the buffer. */
- 	    if (reglnum != 0 || reginput != regline
--			|| (REG_MULTI && reg_getline((linenr_T)-1) != NULL))
-+					  || (REG_MULTI && reg_firstlnum > 1))
- 		status = RA_NOMATCH;
- 	    break;
- 
-@@ -4200,7 +4201,7 @@
- #ifdef FEAT_MBYTE
- 			    !enc_utf8 &&
- #endif
--			    TOLOWER_LOC(*opnd) != TOLOWER_LOC(*reginput))))
-+			    MB_TOLOWER(*opnd) != MB_TOLOWER(*reginput))))
- 		    status = RA_NOMATCH;
- 		else if (*opnd == NUL)
- 		{
-@@ -4733,10 +4734,10 @@
- 		    rst.nextb = *OPERAND(next);
- 		    if (ireg_ic)
- 		    {
--			if (isupper(rst.nextb))
--			    rst.nextb_ic = TOLOWER_LOC(rst.nextb);
-+			if (MB_ISUPPER(rst.nextb))
-+			    rst.nextb_ic = MB_TOLOWER(rst.nextb);
- 			else
--			    rst.nextb_ic = TOUPPER_LOC(rst.nextb);
-+			    rst.nextb_ic = MB_TOUPPER(rst.nextb);
- 		    }
- 		    else
- 			rst.nextb_ic = rst.nextb;
-@@ -5558,11 +5559,12 @@
- 	    int	    cu, cl;
- 
- 	    /* This doesn't do a multi-byte character, because a MULTIBYTECODE
--	     * would have been used for it. */
-+	     * would have been used for it.  It does handle single-byte
-+	     * characters, such as latin1. */
- 	    if (ireg_ic)
- 	    {
--		cu = TOUPPER_LOC(*opnd);
--		cl = TOLOWER_LOC(*opnd);
-+		cu = MB_TOUPPER(*opnd);
-+		cl = MB_TOLOWER(*opnd);
- 		while (count < maxcount && (*scan == cu || *scan == cl))
- 		{
- 		    count++;
-@@ -6490,10 +6492,10 @@
- 	cc = utf_fold(c);
-     else
- #endif
--	 if (isupper(c))
--	cc = TOLOWER_LOC(c);
--    else if (islower(c))
--	cc = TOUPPER_LOC(c);
-+	 if (MB_ISUPPER(c))
-+	cc = MB_TOLOWER(c);
-+    else if (MB_ISLOWER(c))
-+	cc = MB_TOUPPER(c);
-     else
- 	return vim_strchr(s, c);
- 
-@@ -6637,9 +6639,9 @@
- 		}
- 	    }
- 	    else if (magic)
--		STRCPY(p, p + 1);		/* remove '~' */
-+		mch_memmove(p, p + 1, STRLEN(p));	/* remove '~' */
- 	    else
--		STRCPY(p, p + 2);		/* remove '\~' */
-+		mch_memmove(p, p + 2, STRLEN(p) - 1);	/* remove '\~' */
- 	    --p;
- 	}
- 	else
-@@ -7014,7 +7016,14 @@
- #ifdef FEAT_MBYTE
- 			    if (has_mbyte)
- 			    {
--				int l = mb_ptr2len(s) - 1;
-+				int l;
-+
-+				/* Copy composing characters separately, one
-+				 * at a time. */
-+				if (enc_utf8)
-+				    l = utf_ptr2len(s) - 1;
-+				else
-+				    l = mb_ptr2len(s) - 1;
- 
- 				s += l;
- 				len -= l;
-diff -Naur vim71.orig/src/screen.c vim71/src/screen.c
---- vim71.orig/src/screen.c	2007-05-07 15:27:53.000000000 -0400
-+++ vim71/src/screen.c	2007-12-20 23:59:41.000000000 -0500
-@@ -100,27 +100,7 @@
- static int	screen_cur_row, screen_cur_col;	/* last known cursor position */
- 
- #ifdef FEAT_SEARCH_EXTRA
--/*
-- * Struct used for highlighting 'hlsearch' matches for the last use search
-- * pattern or a ":match" item.
-- * For 'hlsearch' there is one pattern for all windows.  For ":match" there is
-- * a different pattern for each window.
-- */
--typedef struct
--{
--    regmmatch_T	rm;	/* points to the regexp program; contains last found
--			   match (may continue in next line) */
--    buf_T	*buf;	/* the buffer to search for a match */
--    linenr_T	lnum;	/* the line to search for a match */
--    int		attr;	/* attributes to be used for a match */
--    int		attr_cur; /* attributes currently active in win_line() */
--    linenr_T	first_lnum;	/* first lnum to search for multi-line pat */
--    colnr_T	startcol; /* in win_line() points to char where HL starts */
--    colnr_T	endcol;	 /* in win_line() points to char where HL ends */
--} match_T;
--
- static match_T search_hl;	/* used for 'hlsearch' highlight matching */
--static match_T match_hl[3];	/* used for ":match" highlight matching */
- #endif
- 
- #ifdef FEAT_FOLDING
-@@ -155,6 +135,7 @@
- static void redraw_custum_statusline __ARGS((win_T *wp));
- #endif
- #ifdef FEAT_SEARCH_EXTRA
-+#define SEARCH_HL_PRIORITY 0
- static void start_search_hl __ARGS((void));
- static void end_search_hl __ARGS((void));
- static void prepare_search_hl __ARGS((win_T *wp, linenr_T lnum));
-@@ -350,6 +331,11 @@
-     {
- 	if (type < must_redraw)	    /* use maximal type */
- 	    type = must_redraw;
-+
-+	/* must_redraw is reset here, so that when we run into some weird
-+	 * reason to redraw while busy redrawing (e.g., asynchronous
-+	 * scrolling), or update_topline() in win_update() will cause a
-+	 * scroll, the screen will be redrawn later or in win_update(). */
- 	must_redraw = 0;
-     }
- 
-@@ -787,6 +773,7 @@
- 					   w_topline got smaller a bit */
- #endif
- #ifdef FEAT_SEARCH_EXTRA
-+    matchitem_T *cur;		/* points to the match list */
-     int		top_to_mod = FALSE;    /* redraw above mod_top */
- #endif
- 
-@@ -848,18 +835,20 @@
- #endif
- 
- #ifdef FEAT_SEARCH_EXTRA
--    /* Setup for ":match" and 'hlsearch' highlighting.  Disable any previous
-+    /* Setup for match and 'hlsearch' highlighting.  Disable any previous
-      * match */
--    for (i = 0; i < 3; ++i)
-+    cur = wp->w_match_head;
-+    while (cur != NULL)
-     {
--	match_hl[i].rm = wp->w_match[i];
--	if (wp->w_match_id[i] == 0)
--	    match_hl[i].attr = 0;
--	else
--	    match_hl[i].attr = syn_id2attr(wp->w_match_id[i]);
--	match_hl[i].buf = buf;
--	match_hl[i].lnum = 0;
--	match_hl[i].first_lnum = 0;
-+	cur->hl.rm = cur->match;
-+	if (cur->hlg_id == 0)
-+	    cur->hl.attr = 0;
-+	else
-+	    cur->hl.attr = syn_id2attr(cur->hlg_id);
-+	cur->hl.buf = buf;
-+	cur->hl.lnum = 0;
-+	cur->hl.first_lnum = 0;
-+	cur = cur->next;
-     }
-     search_hl.buf = buf;
-     search_hl.lnum = 0;
-@@ -923,19 +912,25 @@
- 	     * change in one line may make the Search highlighting in a
- 	     * previous line invalid.  Simple solution: redraw all visible
- 	     * lines above the change.
--	     * Same for a ":match" pattern.
-+	     * Same for a match pattern.
- 	     */
- 	    if (search_hl.rm.regprog != NULL
- 					&& re_multiline(search_hl.rm.regprog))
- 		top_to_mod = TRUE;
- 	    else
--		for (i = 0; i < 3; ++i)
--		    if (match_hl[i].rm.regprog != NULL
--				      && re_multiline(match_hl[i].rm.regprog))
-+	    {
-+		cur = wp->w_match_head;
-+		while (cur != NULL)
-+		{
-+		    if (cur->match.regprog != NULL
-+					   && re_multiline(cur->match.regprog))
- 		    {
- 			top_to_mod = TRUE;
- 			break;
- 		    }
-+		    cur = cur->next;
-+		}
-+	    }
- #endif
- 	}
- #ifdef FEAT_FOLDING
-@@ -1029,6 +1024,13 @@
- 	    type = VALID;
-     }
- 
-+    /* Trick: we want to avoid clearing the screen twice.  screenclear() will
-+     * set "screen_cleared" to TRUE.  The special value MAYBE (which is still
-+     * non-zero and thus not FALSE) will indicate that screenclear() was not
-+     * called. */
-+    if (screen_cleared)
-+	screen_cleared = MAYBE;
-+
-     /*
-      * If there are no changes on the screen that require a complete redraw,
-      * handle three cases:
-@@ -1230,7 +1232,11 @@
- 	    mid_end = wp->w_height;
- 	    if (lastwin == firstwin)
- 	    {
--		screenclear();
-+		/* Clear the screen when it was not done by win_del_lines() or
-+		 * win_ins_lines() above, "screen_cleared" is FALSE or MAYBE
-+		 * then. */
-+		if (screen_cleared != TRUE)
-+		    screenclear();
- #ifdef FEAT_WINDOWS
- 		/* The screen was cleared, redraw the tab pages line. */
- 		if (redraw_tabline)
-@@ -1238,6 +1244,13 @@
- #endif
- 	    }
- 	}
-+
-+	/* When win_del_lines() or win_ins_lines() caused the screen to be
-+	 * cleared (only happens for the first window) or when screenclear()
-+	 * was called directly above, "must_redraw" will have been set to
-+	 * NOT_VALID, need to reset it here to avoid redrawing twice. */
-+	if (screen_cleared == TRUE)
-+	    must_redraw = 0;
-     }
-     else
-     {
-@@ -2292,9 +2305,11 @@
- 			prev_c = u8c;
- #endif
- 		    /* Non-BMP character: display as ? or fullwidth ?. */
-+#ifdef UNICODE16
- 		    if (u8c >= 0x10000)
- 			ScreenLinesUC[idx] = (cells == 2) ? 0xff1f : (int)'?';
- 		    else
-+#endif
- 			ScreenLinesUC[idx] = u8c;
- 		    for (i = 0; i < Screen_mco; ++i)
- 		    {
-@@ -2542,7 +2557,7 @@
- 
-     char_u	extra[18];		/* "%ld" and 'fdc' must fit in here */
-     int		n_extra = 0;		/* number of extra chars */
--    char_u	*p_extra = NULL;	/* string of extra chars */
-+    char_u	*p_extra = NULL;	/* string of extra chars, plus NUL */
-     int		c_extra = NUL;		/* extra chars, all the same */
-     int		extra_attr = 0;		/* attributes when n_extra != 0 */
-     static char_u *at_end_str = (char_u *)""; /* used for p_extra when
-@@ -2584,6 +2599,7 @@
-     int		syntax_attr = 0;	/* attributes desired by syntax */
-     int		has_syntax = FALSE;	/* this buffer has syntax highl. */
-     int		save_did_emsg;
-+    int		eol_hl_off = 0;		/* 1 if highlighted char after EOL */
- #endif
- #ifdef FEAT_SPELL
-     int		has_spell = FALSE;	/* this buffer has spell checking */
-@@ -2626,10 +2642,13 @@
-     int		line_attr = 0;		/* atrribute for the whole line */
- #endif
- #ifdef FEAT_SEARCH_EXTRA
--    match_T	*shl;			/* points to search_hl or match_hl */
--#endif
--#if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_MBYTE)
--    int		i;
-+    matchitem_T *cur;			/* points to the match list */
-+    match_T	*shl;			/* points to search_hl or a match */
-+    int		shl_flag;		/* flag to indicate whether search_hl
-+					   has been processed or not */
-+    int		prevcol_hl_flag;	/* flag to indicate whether prevcol
-+					   equals startcol of search_hl or one
-+					   of the matches */
- #endif
- #ifdef FEAT_ARABIC
-     int		prev_c = 0;		/* previous Arabic character */
-@@ -3074,12 +3093,20 @@
- 
- #ifdef FEAT_SEARCH_EXTRA
-     /*
--     * Handle highlighting the last used search pattern and ":match".
--     * Do this for both search_hl and match_hl[3].
-+     * Handle highlighting the last used search pattern and matches.
-+     * Do this for both search_hl and the match list.
-      */
--    for (i = 3; i >= 0; --i)
-+    cur = wp->w_match_head;
-+    shl_flag = FALSE;
-+    while (cur != NULL || shl_flag == FALSE)
-     {
--	shl = (i == 3) ? &search_hl : &match_hl[i];
-+	if (shl_flag == FALSE)
-+	{
-+	    shl = &search_hl;
-+	    shl_flag = TRUE;
-+	}
-+	else
-+	    shl = &cur->hl;
- 	shl->startcol = MAXCOL;
- 	shl->endcol = MAXCOL;
- 	shl->attr_cur = 0;
-@@ -3122,6 +3149,8 @@
- 		area_highlighting = TRUE;
- 	    }
- 	}
-+	if (shl != &search_hl && cur != NULL)
-+	    cur = cur->next;
-     }
- #endif
- 
-@@ -3163,10 +3192,8 @@
- 		if (cmdwin_type != 0 && wp == curwin)
- 		{
- 		    /* Draw the cmdline character. */
--		    *extra = cmdwin_type;
- 		    n_extra = 1;
--		    p_extra = extra;
--		    c_extra = NUL;
-+		    c_extra = cmdwin_type;
- 		    char_attr = hl_attr(HLF_AT);
- 		}
- 	    }
-@@ -3182,6 +3209,7 @@
- 		    fill_foldcolumn(extra, wp, FALSE, lnum);
- 		    n_extra = wp->w_p_fdc;
- 		    p_extra = extra;
-+		    p_extra[n_extra] = NUL;
- 		    c_extra = NUL;
- 		    char_attr = hl_attr(HLF_FC);
- 		}
-@@ -3388,13 +3416,24 @@
- 		 * After end, check for start/end of next match.
- 		 * When another match, have to check for start again.
- 		 * Watch out for matching an empty string!
--		 * Do this first for search_hl, then for match_hl, so that
--		 * ":match" overrules 'hlsearch'.
-+		 * Do this for 'search_hl' and the match list (ordered by
-+		 * priority).
- 		 */
- 		v = (long)(ptr - line);
--		for (i = 3; i >= 0; --i)
--		{
--		    shl = (i == 3) ? &search_hl : &match_hl[i];
-+		cur = wp->w_match_head;
-+		shl_flag = FALSE;
-+		while (cur != NULL || shl_flag == FALSE)
-+		{
-+		    if (shl_flag == FALSE
-+			    && ((cur != NULL
-+				    && cur->priority > SEARCH_HL_PRIORITY)
-+				|| cur == NULL))
-+		    {
-+			shl = &search_hl;
-+			shl_flag = TRUE;
-+		    }
-+		    else
-+			shl = &cur->hl;
- 		    while (shl->rm.regprog != NULL)
- 		    {
- 			if (shl->startcol != MAXCOL
-@@ -3442,26 +3481,43 @@
- 			}
- 			break;
- 		    }
-+		    if (shl != &search_hl && cur != NULL)
-+			cur = cur->next;
- 		}
- 
--		/* ":match" highlighting overrules 'hlsearch' */
--		for (i = 0; i <= 3; ++i)
--		    if (i == 3)
--			search_attr = search_hl.attr_cur;
--		    else if (match_hl[i].attr_cur != 0)
-+		/* Use attributes from match with highest priority among
-+		 * 'search_hl' and the match list. */
-+		search_attr = search_hl.attr_cur;
-+		cur = wp->w_match_head;
-+		shl_flag = FALSE;
-+		while (cur != NULL || shl_flag == FALSE)
-+		{
-+		    if (shl_flag == FALSE
-+			    && ((cur != NULL
-+				    && cur->priority > SEARCH_HL_PRIORITY)
-+				|| cur == NULL))
- 		    {
--			search_attr = match_hl[i].attr_cur;
--			break;
-+			shl = &search_hl;
-+			shl_flag = TRUE;
- 		    }
-+		    else
-+			shl = &cur->hl;
-+		    if (shl->attr_cur != 0)
-+			search_attr = shl->attr_cur;
-+		    if (shl != &search_hl && cur != NULL)
-+			cur = cur->next;
-+		}
- 	    }
- #endif
- 
- #ifdef FEAT_DIFF
- 	    if (diff_hlf != (hlf_T)0)
- 	    {
--		if (diff_hlf == HLF_CHD && ptr - line >= change_start)
-+		if (diff_hlf == HLF_CHD && ptr - line >= change_start
-+							      && n_extra == 0)
- 		    diff_hlf = HLF_TXD;		/* changed text */
--		if (diff_hlf == HLF_TXD && ptr - line > change_end)
-+		if (diff_hlf == HLF_TXD && ptr - line > change_end
-+							      && n_extra == 0)
- 		    diff_hlf = HLF_CHD;		/* changed line */
- 		line_attr = hl_attr(diff_hlf);
- 	    }
-@@ -3496,9 +3552,11 @@
- 	 * Get the next character to put on the screen.
- 	 */
- 	/*
--	 * The 'extra' array contains the extra stuff that is inserted to
--	 * represent special characters (non-printable stuff).  When all
--	 * characters are the same, c_extra is used.
-+	 * The "p_extra" points to the extra stuff that is inserted to
-+	 * represent special characters (non-printable stuff) and other
-+	 * things.  When all characters are the same, c_extra is used.
-+	 * "p_extra" must end in a NUL to avoid mb_ptr2len() reads past
-+	 * "p_extra[n_extra]".
- 	 * For the '$' of the 'list' option, n_extra == 1, p_extra == "".
- 	 */
- 	if (n_extra > 0)
-@@ -3611,6 +3669,8 @@
- 			 * Draw it as a space with a composing char. */
- 			if (utf_iscomposing(mb_c))
- 			{
-+			    int i;
-+
- 			    for (i = Screen_mco - 1; i > 0; --i)
- 				u8cc[i] = u8cc[i - 1];
- 			    u8cc[0] = mb_c;
-@@ -3621,13 +3681,18 @@
- 		    if ((mb_l == 1 && c >= 0x80)
- 			    || (mb_l >= 1 && mb_c == 0)
- 			    || (mb_l > 1 && (!vim_isprintc(mb_c)
--							 || mb_c >= 0x10000)))
-+# ifdef UNICODE16
-+							 || mb_c >= 0x10000
-+# endif
-+							 )))
- 		    {
- 			/*
- 			 * Illegal UTF-8 byte: display as <xx>.
- 			 * Non-BMP character : display as ? or fullwidth ?.
- 			 */
-+# ifdef UNICODE16
- 			if (mb_c < 0x10000)
-+# endif
- 			{
- 			    transchar_hex(extra, mb_c);
- # ifdef FEAT_RIGHTLEFT
-@@ -3635,11 +3700,13 @@
- 				rl_mirror(extra);
- # endif
- 			}
-+# ifdef UNICODE16
- 			else if (utf_char2cells(mb_c) != 2)
- 			    STRCPY(extra, "?");
- 			else
- 			    /* 0xff1f in UTF-8: full-width '?' */
- 			    STRCPY(extra, "\357\274\237");
-+# endif
- 
- 			p_extra = extra;
- 			c = *p_extra;
-@@ -3752,10 +3819,8 @@
- 		 * a '<' in the first column. */
- 		if (n_skip > 0 && mb_l > 1)
- 		{
--		    extra[0] = '<';
--		    p_extra = extra;
- 		    n_extra = 1;
--		    c_extra = NUL;
-+		    c_extra = '<';
- 		    c = ' ';
- 		    if (area_attr == 0 && search_attr == 0)
- 		    {
-@@ -4248,20 +4313,39 @@
- 	{
- #ifdef FEAT_SEARCH_EXTRA
- 	    long prevcol = (long)(ptr - line) - (c == NUL);
-+
-+	    /* we're not really at that column when skipping some text */
-+	    if ((long)(wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol)
-+		++prevcol;
- #endif
- 
- 	    /* invert at least one char, used for Visual and empty line or
- 	     * highlight match at end of line. If it's beyond the last
- 	     * char on the screen, just overwrite that one (tricky!)  Not
- 	     * needed when a '$' was displayed for 'list'. */
-+#ifdef FEAT_SEARCH_EXTRA
-+	    prevcol_hl_flag = FALSE;
-+	    if (prevcol == (long)search_hl.startcol)
-+		prevcol_hl_flag = TRUE;
-+	    else
-+	    {
-+		cur = wp->w_match_head;
-+		while (cur != NULL)
-+		{
-+		    if (prevcol == (long)cur->hl.startcol)
-+		    {
-+			prevcol_hl_flag = TRUE;
-+			break;
-+		    }
-+		    cur = cur->next;
-+		}
-+	    }
-+#endif
- 	    if (lcs_eol == lcs_eol_one
- 		    && ((area_attr != 0 && vcol == fromcol && c == NUL)
- #ifdef FEAT_SEARCH_EXTRA
- 			/* highlight 'hlsearch' match at end of line */
--			|| ((prevcol == (long)search_hl.startcol
--				|| prevcol == (long)match_hl[0].startcol
--				|| prevcol == (long)match_hl[1].startcol
--				|| prevcol == (long)match_hl[2].startcol)
-+			|| (prevcol_hl_flag == TRUE
- # if defined(LINE_ATTR)
- 			    && did_line_attr <= 1
- # endif
-@@ -4302,26 +4386,47 @@
- #ifdef FEAT_SEARCH_EXTRA
- 		if (area_attr == 0)
- 		{
--		    for (i = 0; i <= 3; ++i)
--		    {
--			if (i == 3)
--			    char_attr = search_hl.attr;
--			else if ((ptr - line) - 1 == (long)match_hl[i].startcol)
-+		    /* Use attributes from match with highest priority among
-+		     * 'search_hl' and the match list. */
-+		    char_attr = search_hl.attr;
-+		    cur = wp->w_match_head;
-+		    shl_flag = FALSE;
-+		    while (cur != NULL || shl_flag == FALSE)
-+		    {
-+			if (shl_flag == FALSE
-+				&& ((cur != NULL
-+					&& cur->priority > SEARCH_HL_PRIORITY)
-+				    || cur == NULL))
- 			{
--			    char_attr = match_hl[i].attr;
--			    break;
-+			    shl = &search_hl;
-+			    shl_flag = TRUE;
- 			}
-+			else
-+			    shl = &cur->hl;
-+			if ((ptr - line) - 1 == (long)shl->startcol)
-+			    char_attr = shl->attr;
-+			if (shl != &search_hl && cur != NULL)
-+			    cur = cur->next;
- 		    }
- 		}
- #endif
- 		ScreenAttrs[off] = char_attr;
- #ifdef FEAT_RIGHTLEFT
- 		if (wp->w_p_rl)
-+		{
- 		    --col;
-+		    --off;
-+		}
- 		else
- #endif
-+		{
- 		    ++col;
-+		    ++off;
-+		}
- 		++vcol;
-+#ifdef FEAT_SYN_HL
-+		eol_hl_off = 1;
-+#endif
- 	    }
- 	}
- 
-@@ -4331,6 +4436,14 @@
- 	if (c == NUL)
- 	{
- #ifdef FEAT_SYN_HL
-+	    if (eol_hl_off > 0 && vcol - eol_hl_off == (long)wp->w_virtcol)
-+	    {
-+		/* highlight last char after line */
-+		--col;
-+		--off;
-+		--vcol;
-+	    }
-+
- 	    /* Highlight 'cursorcolumn' past end of the line. */
- 	    if (wp->w_p_wrap)
- 		v = wp->w_skipcol;
-@@ -4341,7 +4454,7 @@
- 
- 		vcol = v + col - win_col_off(wp);
- 	    if (wp->w_p_cuc
--		    && (int)wp->w_virtcol >= vcol
-+		    && (int)wp->w_virtcol >= vcol - eol_hl_off
- 		    && (int)wp->w_virtcol < W_WIDTH(wp) * (row - startrow + 1)
- 									   + v
- 		    && lnum != wp->w_cursor.lnum
-@@ -4460,6 +4573,8 @@
- 	    {
- 		if (mb_utf8)
- 		{
-+		    int i;
-+
- 		    ScreenLinesUC[off] = mb_c;
- 		    if ((c & 0xff) == 0)
- 			ScreenLines[off] = 0x80;   /* avoid storing zero */
-@@ -4548,7 +4663,7 @@
- 
- 	/*
- 	 * At end of screen line and there is more to come: Display the line
--	 * so far.  If there is no more to display it is catched above.
-+	 * so far.  If there is no more to display it is caught above.
- 	 */
- 	if ((
- #ifdef FEAT_RIGHTLEFT
-@@ -4625,9 +4740,13 @@
- #endif
- #ifdef FEAT_MBYTE
- 			 && !(has_mbyte
--			     && ((*mb_off2cells)(LineOffset[screen_row]) == 2
-+			     && ((*mb_off2cells)(LineOffset[screen_row],
-+				     LineOffset[screen_row] + screen_Columns)
-+									  == 2
- 				 || (*mb_off2cells)(LineOffset[screen_row - 1]
--							+ (int)Columns - 2) == 2))
-+							+ (int)Columns - 2,
-+				     LineOffset[screen_row] + screen_Columns)
-+									== 2))
- #endif
- 		   )
- 		{
-@@ -4787,6 +4906,10 @@
- {
-     unsigned	    off_from;
-     unsigned	    off_to;
-+#ifdef FEAT_MBYTE
-+    unsigned	    max_off_from;
-+    unsigned	    max_off_to;
-+#endif
-     int		    col = 0;
- #if defined(FEAT_GUI) || defined(UNIX) || defined(FEAT_VERTSPLIT)
-     int		    hl;
-@@ -4813,6 +4936,10 @@
- 
-     off_from = (unsigned)(current_ScreenLine - ScreenLines);
-     off_to = LineOffset[row] + coloff;
-+#ifdef FEAT_MBYTE
-+    max_off_from = off_from + screen_Columns;
-+    max_off_to = LineOffset[row] + screen_Columns;
-+#endif
- 
- #ifdef FEAT_RIGHTLEFT
-     if (rlflag)
-@@ -4847,7 +4974,7 @@
-     {
- #ifdef FEAT_MBYTE
- 	if (has_mbyte && (col + 1 < endcol))
--	    char_cells = (*mb_off2cells)(off_from);
-+	    char_cells = (*mb_off2cells)(off_from, max_off_from);
- 	else
- 	    char_cells = 1;
- #endif
-@@ -4924,7 +5051,7 @@
- 		 * ScreenLinesUC[] is sufficient. */
- 		if (char_cells == 1
- 			&& col + 1 < endcol
--			&& (*mb_off2cells)(off_to) > 1)
-+			&& (*mb_off2cells)(off_to, max_off_to) > 1)
- 		{
- 		    /* Writing a single-cell character over a double-cell
- 		     * character: need to redraw the next cell. */
-@@ -4933,8 +5060,8 @@
- 		}
- 		else if (char_cells == 2
- 			&& col + 2 < endcol
--			&& (*mb_off2cells)(off_to) == 1
--			&& (*mb_off2cells)(off_to + 1) > 1)
-+			&& (*mb_off2cells)(off_to, max_off_to) == 1
-+			&& (*mb_off2cells)(off_to + 1, max_off_to) > 1)
- 		{
- 		    /* Writing the second half of a double-cell character over
- 		     * a double-cell character: need to redraw the second
-@@ -4953,10 +5080,10 @@
- 	     * char over the left halve of an existing one. */
- 	    if (has_mbyte && col + char_cells == endcol
- 		    && ((char_cells == 1
--			    && (*mb_off2cells)(off_to) > 1)
-+			    && (*mb_off2cells)(off_to, max_off_to) > 1)
- 			|| (char_cells == 2
--			    && (*mb_off2cells)(off_to) == 1
--			    && (*mb_off2cells)(off_to + 1) > 1)))
-+			    && (*mb_off2cells)(off_to, max_off_to) == 1
-+			    && (*mb_off2cells)(off_to + 1, max_off_to) > 1)))
- 		clear_next = TRUE;
- #endif
- 
-@@ -5096,10 +5223,11 @@
- 			/* find previous character by counting from first
- 			 * column and get its width. */
- 			unsigned off = LineOffset[row];
-+			unsigned max_off = LineOffset[row] + screen_Columns;
- 
- 			while (off < off_to)
- 			{
--			    prev_cells = (*mb_off2cells)(off);
-+			    prev_cells = (*mb_off2cells)(off, max_off);
- 			    off += prev_cells;
- 			}
- 		    }
-@@ -5285,7 +5413,7 @@
- static int skip_status_match_char __ARGS((expand_T *xp, char_u *s));
- 
- /*
-- * Get the lenght of an item as it will be shown in the status line.
-+ * Get the length of an item as it will be shown in the status line.
-  */
-     static int
- status_match_len(xp, s)
-@@ -5351,7 +5479,7 @@
-     int		row;
-     char_u	*buf;
-     int		len;
--    int		clen;		/* lenght in screen cells */
-+    int		clen;		/* length in screen cells */
-     int		fillchar;
-     int		attr;
-     int		i;
-@@ -6103,6 +6231,7 @@
-     char_u	*ptr = text;
-     int		c;
- #ifdef FEAT_MBYTE
-+    unsigned	max_off;
-     int		mbyte_blen = 1;
-     int		mbyte_cells = 1;
-     int		u8c = 0;
-@@ -6119,8 +6248,12 @@
- 	return;
- 
-     off = LineOffset[row] + col;
--    while (*ptr != NUL && col < screen_Columns
--				      && (len < 0 || (int)(ptr - text) < len))
-+#ifdef FEAT_MBYTE
-+    max_off = LineOffset[row] + screen_Columns;
-+#endif
-+    while (col < screen_Columns
-+	    && (len < 0 || (int)(ptr - text) < len)
-+	    && *ptr != NUL)
-     {
- 	c = *ptr;
- #ifdef FEAT_MBYTE
-@@ -6143,6 +6276,7 @@
- 		else
- 		    u8c = utfc_ptr2char(ptr, u8cc);
- 		mbyte_cells = utf_char2cells(u8c);
-+# ifdef UNICODE16
- 		/* Non-BMP character: display as ? or fullwidth ?. */
- 		if (u8c >= 0x10000)
- 		{
-@@ -6150,6 +6284,7 @@
- 		    if (attr == 0)
- 			attr = hl_attr(HLF_8);
- 		}
-+# endif
- # ifdef FEAT_ARABIC
- 		if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c))
- 		{
-@@ -6241,19 +6376,19 @@
- 	    else if (has_mbyte
- 		    && (len < 0 ? ptr[mbyte_blen] == NUL
- 					     : ptr + mbyte_blen >= text + len)
--		    && ((mbyte_cells == 1 && (*mb_off2cells)(off) > 1)
-+		    && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1)
- 			|| (mbyte_cells == 2
--			    && (*mb_off2cells)(off) == 1
--			    && (*mb_off2cells)(off + 1) > 1)))
-+			    && (*mb_off2cells)(off, max_off) == 1
-+			    && (*mb_off2cells)(off + 1, max_off) > 1)))
- 		clear_next_cell = TRUE;
- 
- 	    /* Make sure we never leave a second byte of a double-byte behind,
- 	     * it confuses mb_off2cells(). */
- 	    if (enc_dbcs
--		    && ((mbyte_cells == 1 && (*mb_off2cells)(off) > 1)
-+		    && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1)
- 			|| (mbyte_cells == 2
--			    && (*mb_off2cells)(off) == 1
--			    && (*mb_off2cells)(off + 1) > 1)))
-+			    && (*mb_off2cells)(off, max_off) == 1
-+			    && (*mb_off2cells)(off + 1, max_off) > 1)))
- 		ScreenLines[off + mbyte_blen] = 0;
- #endif
- 	    ScreenLines[off] = c;
-@@ -6318,7 +6453,7 @@
- 
- #ifdef FEAT_SEARCH_EXTRA
- /*
-- * Prepare for 'searchhl' highlighting.
-+ * Prepare for 'hlsearch' highlighting.
-  */
-     static void
- start_search_hl()
-@@ -6331,7 +6466,7 @@
- }
- 
- /*
-- * Clean up for 'searchhl' highlighting.
-+ * Clean up for 'hlsearch' highlighting.
-  */
-     static void
- end_search_hl()
-@@ -6351,18 +6486,28 @@
-     win_T	*wp;
-     linenr_T	lnum;
- {
--    match_T	*shl;		/* points to search_hl or match_hl */
-+    matchitem_T *cur;		/* points to the match list */
-+    match_T	*shl;		/* points to search_hl or a match */
-+    int		shl_flag;	/* flag to indicate whether search_hl
-+				   has been processed or not */
-     int		n;
--    int		i;
- 
-     /*
-      * When using a multi-line pattern, start searching at the top
-      * of the window or just after a closed fold.
--     * Do this both for search_hl and match_hl[3].
-+     * Do this both for search_hl and the match list.
-      */
--    for (i = 3; i >= 0; --i)
-+    cur = wp->w_match_head;
-+    shl_flag = FALSE;
-+    while (cur != NULL || shl_flag == FALSE)
-     {
--	shl = (i == 3) ? &search_hl : &match_hl[i];
-+	if (shl_flag == FALSE)
-+	{
-+	    shl = &search_hl;
-+	    shl_flag = TRUE;
-+	}
-+	else
-+	    shl = &cur->hl;
- 	if (shl->rm.regprog != NULL
- 		&& shl->lnum == 0
- 		&& re_multiline(shl->rm.regprog))
-@@ -6397,11 +6542,13 @@
- 		}
- 	    }
- 	}
-+	if (shl != &search_hl && cur != NULL)
-+	    cur = cur->next;
-     }
- }
- 
- /*
-- * Search for a next 'searchl' or ":match" match.
-+ * Search for a next 'hlsearch' or match.
-  * Uses shl->buf.
-  * Sets shl->lnum and shl->rm contents.
-  * Note: Assumes a previous match is always before "lnum", unless
-@@ -6411,7 +6558,7 @@
-     static void
- next_search_hl(win, shl, lnum, mincol)
-     win_T	*win;
--    match_T	*shl;		/* points to search_hl or match_hl */
-+    match_T	*shl;		/* points to search_hl or a match */
-     linenr_T	lnum;
-     colnr_T	mincol;		/* minimal column for a match */
- {
-@@ -6479,7 +6626,7 @@
- 	    /* Error while handling regexp: stop using this regexp. */
- 	    if (shl == &search_hl)
- 	    {
--		/* don't free the regprog in match_hl[], it's a copy */
-+		/* don't free regprog in the match list, it's a copy */
- 		vim_free(shl->rm.regprog);
- 		no_hlsearch = TRUE;
- 	    }
-@@ -6827,6 +6974,9 @@
- {
-     int		r, c;
-     int		off;
-+#ifdef FEAT_MBYTE
-+    int		max_off;
-+#endif
- 
-     /* Can't use ScreenLines unless initialized */
-     if (ScreenLines == NULL)
-@@ -6837,10 +6987,13 @@
-     for (r = row; r < row + height; ++r)
-     {
- 	off = LineOffset[r];
-+#ifdef FEAT_MBYTE
-+	max_off = off + screen_Columns;
-+#endif
- 	for (c = col; c < col + width; ++c)
- 	{
- #ifdef FEAT_MBYTE
--	    if (enc_dbcs != 0 && dbcs_off2cells(off + c) > 1)
-+	    if (enc_dbcs != 0 && dbcs_off2cells(off + c, max_off) > 1)
- 	    {
- 		screen_char_2(off + c, r, c);
- 		++c;
-@@ -6850,7 +7003,7 @@
- 	    {
- 		screen_char(off + c, r, c);
- #ifdef FEAT_MBYTE
--		if (utf_off2cells(off + c) > 1)
-+		if (utf_off2cells(off + c, max_off) > 1)
- 		    ++c;
- #endif
- 	    }
-diff -Naur vim71.orig/src/search.c vim71/src/search.c
---- vim71.orig/src/search.c	2007-05-07 15:42:02.000000000 -0400
-+++ vim71/src/search.c	2007-12-20 23:57:41.000000000 -0500
-@@ -101,7 +101,6 @@
- static char_u	    *mr_pattern = NULL;	/* pattern used by search_regcomp() */
- #ifdef FEAT_RIGHTLEFT
- static int	    mr_pattern_alloced = FALSE; /* mr_pattern was allocated */
--static char_u	    *reverse_text __ARGS((char_u *s));
- #endif
- 
- #ifdef FEAT_FIND_ID
-@@ -228,12 +227,12 @@
-     return mr_pattern;
- }
- 
--#ifdef FEAT_RIGHTLEFT
-+#if defined(FEAT_RIGHTLEFT) || defined(PROTO)
- /*
-  * Reverse text into allocated memory.
-  * Returns the allocated string, NULL when out of memory.
-  */
--    static char_u *
-+    char_u *
- reverse_text(s)
-     char_u *s;
- {
-@@ -573,8 +572,12 @@
- 	/*
- 	 * Start searching in current line, unless searching backwards and
- 	 * we're in column 0.
-+	 * If we are searching backwards, in column 0, and not including the
-+	 * current position, gain some efficiency by skipping back a line.
-+	 * Otherwise begin the search in the current line.
- 	 */
--	if (dir == BACKWARD && start_pos.col == 0)
-+	if (dir == BACKWARD && start_pos.col == 0
-+					     && (options & SEARCH_START) == 0)
- 	{
- 	    lnum = pos->lnum - 1;
- 	    at_first_line = FALSE;
-@@ -1894,7 +1897,7 @@
-     }
- 
- #ifdef FEAT_RIGHTLEFT
--    /* This is just guessing: when 'rightleft' is set, search for a maching
-+    /* This is just guessing: when 'rightleft' is set, search for a matching
-      * paren/brace in the other direction. */
-     if (curwin->w_p_rl && vim_strchr((char_u *)"()[]{}<>", initc) != NULL)
- 	backwards = !backwards;
-@@ -2124,6 +2127,9 @@
- 			else if (!backwards)
- 			    inquote = TRUE;
- 		    }
-+
-+		    /* ml_get() only keeps one line, need to get linep again */
-+		    linep = ml_get(pos.lnum);
- 		}
- 	    }
- 	}
-@@ -2795,7 +2801,7 @@
- 	i = inc_cursor();
- 	if (i == -1 || (i >= 1 && last_line)) /* started at last char in file */
- 	    return FAIL;
--	if (i == 1 && eol && count == 0)      /* started at last char in line */
-+	if (i >= 1 && eol && count == 0)      /* started at last char in line */
- 	    return OK;
- 
- 	/*
-@@ -3600,13 +3606,16 @@
-     {
- 	oap->start = start_pos;
- 	oap->motion_type = MCHAR;
-+	oap->inclusive = FALSE;
- 	if (sol)
--	{
- 	    incl(&curwin->w_cursor);
--	    oap->inclusive = FALSE;
--	}
--	else
-+	else if (lt(start_pos, curwin->w_cursor))
-+	    /* Include the character under the cursor. */
- 	    oap->inclusive = TRUE;
-+	else
-+	    /* End is before the start (no text in between <>, [], etc.): don't
-+	     * operate on any text. */
-+	    curwin->w_cursor = start_pos;
-     }
- 
-     return OK;
-@@ -3734,7 +3743,7 @@
- 
- 	if (in_html_tag(FALSE))
- 	{
--	    /* cursor on start tag, move to just after it */
-+	    /* cursor on start tag, move to its '>' */
- 	    while (*ml_get_cursor() != '>')
- 		if (inc_cursor() < 0)
- 		    break;
-@@ -3838,7 +3847,7 @@
- 	/* Exclude the start tag. */
- 	curwin->w_cursor = start_pos;
- 	while (inc_cursor() >= 0)
--	    if (*ml_get_cursor() == '>' && lt(curwin->w_cursor, end_pos))
-+	    if (*ml_get_cursor() == '>')
- 	    {
- 		inc_cursor();
- 		start_pos = curwin->w_cursor;
-@@ -3860,7 +3869,11 @@
- #ifdef FEAT_VISUAL
-     if (VIsual_active)
-     {
--	if (*p_sel == 'e')
-+	/* If the end is before the start there is no text between tags, select
-+	 * the char under the cursor. */
-+	if (lt(end_pos, start_pos))
-+	    curwin->w_cursor = start_pos;
-+	else if (*p_sel == 'e')
- 	    ++curwin->w_cursor.col;
- 	VIsual = start_pos;
- 	VIsual_mode = 'v';
-@@ -3872,7 +3885,15 @@
-     {
- 	oap->start = start_pos;
- 	oap->motion_type = MCHAR;
--	oap->inclusive = TRUE;
-+	if (lt(end_pos, start_pos))
-+	{
-+	    /* End is before the start: there is no text between tags; operate
-+	     * on an empty area. */
-+	    curwin->w_cursor = start_pos;
-+	    oap->inclusive = FALSE;
-+	}
-+	else
-+	    oap->inclusive = TRUE;
-     }
-     retval = OK;
- 
-diff -Naur vim71.orig/src/spell.c vim71/src/spell.c
---- vim71.orig/src/spell.c	2007-05-07 15:48:38.000000000 -0400
-+++ vim71/src/spell.c	2007-12-20 23:57:33.000000000 -0500
-@@ -7829,7 +7829,7 @@
- # if (_MSC_VER <= 1200)
- /* This line is required for VC6 without the service pack.  Also see the
-  * matching #pragma below. */
--/* # pragma optimize("", off) */
-+ #  pragma optimize("", off)
- # endif
- #endif
- 
-@@ -7859,7 +7859,7 @@
- 
- #ifdef _MSC_VER
- # if (_MSC_VER <= 1200)
--/* # pragma optimize("", on) */
-+ #  pragma optimize("", on)
- # endif
- #endif
- 
-@@ -12182,7 +12182,9 @@
- 	    {
- 		n = mb_cptr2len(p);
- 		c = mb_ptr2char(p);
--		if (!soundfold && !spell_iswordp(p + n, curbuf))
-+		if (p[n] == NUL)
-+		    c2 = NUL;
-+		else if (!soundfold && !spell_iswordp(p + n, curbuf))
- 		    c2 = c; /* don't swap non-word char */
- 		else
- 		    c2 = mb_ptr2char(p + n);
-@@ -12190,12 +12192,21 @@
- 	    else
- #endif
- 	    {
--		if (!soundfold && !spell_iswordp(p + 1, curbuf))
-+		if (p[1] == NUL)
-+		    c2 = NUL;
-+		else if (!soundfold && !spell_iswordp(p + 1, curbuf))
- 		    c2 = c; /* don't swap non-word char */
- 		else
- 		    c2 = p[1];
- 	    }
- 
-+	    /* When the second character is NUL we can't swap. */
-+	    if (c2 == NUL)
-+	    {
-+		sp->ts_state = STATE_REP_INI;
-+		break;
-+	    }
-+
- 	    /* When characters are identical, swap won't do anything.
- 	     * Also get here if the second char is not a word character. */
- 	    if (c == c2)
-diff -Naur vim71.orig/src/structs.h vim71/src/structs.h
---- vim71.orig/src/structs.h	2007-05-07 15:50:49.000000000 -0400
-+++ vim71/src/structs.h	2007-12-20 23:59:11.000000000 -0500
-@@ -278,6 +278,9 @@
-     linenr_T	ue_lcount;	/* linecount when u_save called */
-     char_u	**ue_array;	/* array of lines in undo block */
-     long	ue_size;	/* number of lines in ue_array */
-+#ifdef U_DEBUG
-+    int		ue_magic;	/* magic number to check allocation */
-+#endif
- };
- 
- struct u_header
-@@ -300,6 +303,9 @@
-     visualinfo_T uh_visual;	/* Visual areas before undo/after redo */
- #endif
-     time_t	uh_time;	/* timestamp when the change was made */
-+#ifdef U_DEBUG
-+    int		uh_magic;	/* magic number to check allocation */
-+#endif
- };
- 
- /* values for uh_flags */
-@@ -1453,6 +1459,7 @@
- #ifdef FEAT_MBYTE
-     char_u	*b_start_fenc;	/* 'fileencoding' when edit started or NULL */
-     int		b_bad_char;	/* "++bad=" argument when edit started or 0 */
-+    int		b_start_bomb;	/* 'bomb' when it was read */
- #endif
- 
- #ifdef FEAT_EVAL
-@@ -1694,6 +1701,41 @@
- #define FR_COL	2	/* frame with a column of windows */
- 
- /*
-+ * Struct used for highlighting 'hlsearch' matches, matches defined by
-+ * ":match" and matches defined by match functions.
-+ * For 'hlsearch' there is one pattern for all windows.  For ":match" and the
-+ * match functions there is a different pattern for each window.
-+ */
-+typedef struct
-+{
-+    regmmatch_T	rm;	/* points to the regexp program; contains last found
-+			   match (may continue in next line) */
-+    buf_T	*buf;	/* the buffer to search for a match */
-+    linenr_T	lnum;	/* the line to search for a match */
-+    int		attr;	/* attributes to be used for a match */
-+    int		attr_cur; /* attributes currently active in win_line() */
-+    linenr_T	first_lnum;	/* first lnum to search for multi-line pat */
-+    colnr_T	startcol; /* in win_line() points to char where HL starts */
-+    colnr_T	endcol;	 /* in win_line() points to char where HL ends */
-+} match_T;
-+
-+/*
-+ * matchitem_T provides a linked list for storing match items for ":match" and
-+ * the match functions.
-+ */
-+typedef struct matchitem matchitem_T;
-+struct matchitem
-+{
-+    matchitem_T	*next;
-+    int		id;	    /* match ID */
-+    int		priority;   /* match priority */
-+    char_u	*pattern;   /* pattern to highlight */
-+    int		hlg_id;	    /* highlight group ID */
-+    regmmatch_T	match;	    /* regexp program for pattern */
-+    match_T	hl;	    /* struct for doing the actual highlighting */
-+};
-+
-+/*
-  * Structure which contains all information that belongs to a window
-  *
-  * All row numbers are relative to the start of the window, except w_winrow.
-@@ -1934,9 +1976,8 @@
- #endif
- 
- #ifdef FEAT_SEARCH_EXTRA
--    regmmatch_T	w_match[3];	    /* regexp programs for ":match" */
--    char_u	*(w_match_pat[3]);  /* patterns for ":match" */
--    int		w_match_id[3];	    /* highlight IDs for ":match" */
-+    matchitem_T	*w_match_head;		/* head of match list */
-+    int		w_next_match_id;	/* next match ID */
- #endif
- 
-     /*
-diff -Naur vim71.orig/src/syntax.c vim71/src/syntax.c
---- vim71.orig/src/syntax.c	2007-05-07 15:42:55.000000000 -0400
-+++ vim71/src/syntax.c	2007-12-20 23:59:18.000000000 -0500
-@@ -66,8 +66,10 @@
- #define HL_TABLE() ((struct hl_group *)((highlight_ga.ga_data)))
- 
- #ifdef FEAT_CMDL_COMPL
--static int include_default = FALSE;	/* include "default" for expansion */
--static int include_link = FALSE;	/* include "link" for expansion */
-+/* Flags to indicate an additional string for highlight name completion. */
-+static int include_none = 0;	/* when 1 include "None" */
-+static int include_default = 0;	/* when 1 include "default" */
-+static int include_link = 0;	/* when 2 include "link" and "clear" */
- #endif
- 
- /*
-@@ -277,7 +279,8 @@
-  */
- typedef struct state_item
- {
--    int		si_idx;			/* index of syntax pattern */
-+    int		si_idx;			/* index of syntax pattern or
-+					   KEYWORD_IDX */
-     int		si_id;			/* highlight group ID for keywords */
-     int		si_trans_id;		/* idem, transparancy removed */
-     int		si_m_lnum;		/* lnum of the match */
-@@ -835,9 +838,18 @@
- 			    current_lnum = end_lnum;
- 			    break;
- 			}
--			spp = &(SYN_ITEMS(syn_buf)[cur_si->si_idx]);
--			found_flags = spp->sp_flags;
--			found_match_idx = spp->sp_sync_idx;
-+			if (cur_si->si_idx < 0)
-+			{
-+			    /* Cannot happen? */
-+			    found_flags = 0;
-+			    found_match_idx = KEYWORD_IDX;
-+			}
-+			else
-+			{
-+			    spp = &(SYN_ITEMS(syn_buf)[cur_si->si_idx]);
-+			    found_flags = spp->sp_flags;
-+			    found_match_idx = spp->sp_sync_idx;
-+			}
- 			found_current_lnum = current_lnum;
- 			found_current_col = current_col;
- 			found_m_endpos = cur_si->si_m_endpos;
-@@ -1725,6 +1737,13 @@
- {
-     int	    attr = 0;
- 
-+    if (can_spell != NULL)
-+	/* Default: Only do spelling when there is no @Spell cluster or when
-+	 * ":syn spell toplevel" was used. */
-+	*can_spell = syn_buf->b_syn_spell == SYNSPL_DEFAULT
-+		    ? (syn_buf->b_spell_cluster_id == 0)
-+		    : (syn_buf->b_syn_spell == SYNSPL_TOP);
-+
-     /* check for out of memory situation */
-     if (syn_buf->b_sst_array == NULL)
- 	return 0;
-@@ -2524,6 +2543,10 @@
-     stateitem_T	*sip = &CUR_STATE(idx);
-     synpat_T	*spp;
- 
-+    /* This should not happen... */
-+    if (sip->si_idx < 0)
-+	return;
-+
-     spp = &(SYN_ITEMS(syn_buf)[sip->si_idx]);
-     if (sip->si_flags & HL_MATCH)
- 	sip->si_id = spp->sp_syn_match_id;
-@@ -2639,6 +2662,10 @@
-     lpos_T	end_endpos;
-     int		end_idx;
- 
-+    /* return quickly for a keyword */
-+    if (sip->si_idx < 0)
-+	return;
-+
-     /* Don't update when it's already done.  Can be a match of an end pattern
-      * that started in a previous line.  Watch out: can also be a "keepend"
-      * from a containing item. */
-@@ -2751,6 +2778,10 @@
-     char_u	*line;
-     int		had_match = FALSE;
- 
-+    /* just in case we are invoked for a keyword */
-+    if (idx < 0)
-+	return;
-+
-     /*
-      * Check for being called with a START pattern.
-      * Can happen with a match that continues to the next line, because it
-@@ -3323,6 +3354,7 @@
-     {
- 	vim_free(SYN_ITEMS(buf)[i].sp_cont_list);
- 	vim_free(SYN_ITEMS(buf)[i].sp_next_list);
-+	vim_free(SYN_ITEMS(buf)[i].sp_syn.cont_in_list);
-     }
- }
- 
-@@ -4460,8 +4492,8 @@
-     current_syn_inc_tag = ++running_syn_inc_tag;
-     prev_toplvl_grp = curbuf->b_syn_topgrp;
-     curbuf->b_syn_topgrp = sgl_id;
--    if (source ? do_source(eap->arg, FALSE, FALSE) == FAIL
--				: source_runtime(eap->arg, DOSO_NONE) == FAIL)
-+    if (source ? do_source(eap->arg, FALSE, DOSO_NONE) == FAIL
-+				: source_runtime(eap->arg, TRUE) == FAIL)
- 	EMSG2(_(e_notopen), eap->arg);
-     curbuf->b_syn_topgrp = prev_toplvl_grp;
-     current_syn_inc_tag = prev_syn_inc_tag;
-@@ -5956,8 +5988,8 @@
- {
-     return (buf->b_syn_patterns.ga_len != 0
- 	    || buf->b_syn_clusters.ga_len != 0
--	    || curbuf->b_keywtab.ht_used > 0
--	    || curbuf->b_keywtab_ic.ht_used > 0);
-+	    || buf->b_keywtab.ht_used > 0
-+	    || buf->b_keywtab_ic.ht_used > 0);
- }
- 
- #if defined(FEAT_CMDL_COMPL) || defined(PROTO)
-@@ -5968,6 +6000,29 @@
-     EXP_CASE	    /* expand ":syn case" arguments */
- } expand_what;
- 
-+/*
-+ * Reset include_link, include_default, include_none to 0.
-+ * Called when we are done expanding.
-+ */
-+    void
-+reset_expand_highlight()
-+{
-+    include_link = include_default = include_none = 0;
-+}
-+
-+/*
-+ * Handle command line completion for :match and :echohl command: Add "None"
-+ * as highlight group.
-+ */
-+    void
-+set_context_in_echohl_cmd(xp, arg)
-+    expand_T	*xp;
-+    char_u	*arg;
-+{
-+    xp->xp_context = EXPAND_HIGHLIGHT;
-+    xp->xp_pattern = arg;
-+    include_none = 1;
-+}
- 
- /*
-  * Handle command line completion for :syntax command.
-@@ -5983,8 +6038,8 @@
-     xp->xp_context = EXPAND_SYNTAX;
-     expand_what = EXP_SUBCMD;
-     xp->xp_pattern = arg;
--    include_link = FALSE;
--    include_default = FALSE;
-+    include_link = 0;
-+    include_default = 0;
- 
-     /* (part of) subcommand already typed */
-     if (*arg != NUL)
-@@ -8479,7 +8534,7 @@
- syn_id2name(id)
-     int		id;
- {
--    if (id <= 0 || id >= highlight_ga.ga_len)
-+    if (id <= 0 || id > highlight_ga.ga_len)
- 	return (char_u *)"";
-     return HL_TABLE()[id - 1].sg_name;
- }
-@@ -8949,7 +9004,7 @@
-     return OK;
- }
- 
--#ifdef FEAT_CMDL_COMPL
-+#if defined(FEAT_CMDL_COMPL) || defined(PROTO)
- 
- static void highlight_list __ARGS((void));
- static void highlight_list_two __ARGS((int cnt, int attr));
-@@ -8967,8 +9022,8 @@
-     /* Default: expand group names */
-     xp->xp_context = EXPAND_HIGHLIGHT;
-     xp->xp_pattern = arg;
--    include_link = TRUE;
--    include_default = TRUE;
-+    include_link = 2;
-+    include_default = 1;
- 
-     /* (part of) subcommand already typed */
-     if (*arg != NUL)
-@@ -8976,7 +9031,7 @@
- 	p = skiptowhite(arg);
- 	if (*p != NUL)			/* past "default" or group name */
- 	{
--	    include_default = FALSE;
-+	    include_default = 0;
- 	    if (STRNCMP("default", arg, p - arg) == 0)
- 	    {
- 		arg = skipwhite(p);
-@@ -8985,7 +9040,7 @@
- 	    }
- 	    if (*p != NUL)			/* past group name */
- 	    {
--		include_link = FALSE;
-+		include_link = 0;
- 		if (arg[1] == 'i' && arg[0] == 'N')
- 		    highlight_list();
- 		if (STRNCMP("link", arg, p - arg) == 0
-@@ -9045,31 +9100,25 @@
-     expand_T	*xp;
-     int		idx;
- {
--    if (idx == highlight_ga.ga_len
- #ifdef FEAT_CMDL_COMPL
--	    && include_link
--#endif
--	    )
-+    if (idx == highlight_ga.ga_len && include_none != 0)
-+	return (char_u *)"none";
-+    if (idx == highlight_ga.ga_len + include_none && include_default != 0)
-+	return (char_u *)"default";
-+    if (idx == highlight_ga.ga_len + include_none + include_default
-+							 && include_link != 0)
- 	return (char_u *)"link";
--    if (idx == highlight_ga.ga_len + 1
--#ifdef FEAT_CMDL_COMPL
--	    && include_link
--#endif
--	    )
-+    if (idx == highlight_ga.ga_len + include_none + include_default + 1
-+							 && include_link != 0)
- 	return (char_u *)"clear";
--    if (idx == highlight_ga.ga_len + 2
--#ifdef FEAT_CMDL_COMPL
--	    && include_default
- #endif
--	    )
--	return (char_u *)"default";
-     if (idx < 0 || idx >= highlight_ga.ga_len)
- 	return NULL;
-     return HL_TABLE()[idx].sg_name;
- }
- #endif
- 
--#ifdef FEAT_GUI
-+#if defined(FEAT_GUI) || defined(PROTO)
- /*
-  * Free all the highlight group fonts.
-  * Used when quitting for systems which need it.
-diff -Naur vim71.orig/src/term.c vim71/src/term.c
---- vim71.orig/src/term.c	2007-05-07 15:39:11.000000000 -0400
-+++ vim71/src/term.c	2007-12-20 23:58:45.000000000 -0500
-@@ -4809,6 +4809,8 @@
- 	    if (num_bytes == -1)
- 		return -1;
- 	    current_tab = (int)bytes[0];
-+	    if (current_tab == 255)	/* -1 in a byte gives 255 */
-+		current_tab = -1;
- 	    slen += num_bytes;
- 	}
- 	else if (key_name[0] == (int)KS_TABMENU)
-diff -Naur vim71.orig/src/termlib.c vim71/src/termlib.c
---- vim71.orig/src/termlib.c	2007-05-07 15:39:49.000000000 -0400
-+++ vim71/src/termlib.c	2007-12-20 23:57:38.000000000 -0500
-@@ -191,7 +191,7 @@
- 	    lbuf[0] == '\t' &&
- 	    lbuf[1] == ':')
- 	{
--	    strcpy(lbuf, lbuf+2);
-+	    mch_memmove(lbuf, lbuf + 2, strlen(lbuf + 2) + 1);
- 	    llen -= 2;
- 	}
- 	if (lbuf[llen-2] == '\\')		/* and continuations */
-diff -Naur vim71.orig/src/testdir/Makefile vim71/src/testdir/Makefile
---- vim71.orig/src/testdir/Makefile	2006-04-30 07:08:01.000000000 -0400
-+++ vim71/src/testdir/Makefile	2007-12-20 23:58:59.000000000 -0500
-@@ -1,9 +1,13 @@
- #
--# Makefile to run al tests for Vim
-+# Makefile to run all tests for Vim
- #
- 
- VIMPROG = ../vim
- 
-+# Uncomment this line for using valgrind.
-+# The output goes into a file "valgrind.$PID" (sorry, no test number).
-+# VALGRIND = valgrind --tool=memcheck --leak-check=yes --num-callers=15 --logfile=valgrind
-+
- SCRIPTS = test1.out test2.out test3.out test4.out test5.out test6.out \
- 		test7.out test8.out test9.out test10.out test11.out \
- 		test12.out  test13.out test14.out test15.out test17.out \
-@@ -15,7 +19,8 @@
- 		test43.out test44.out test45.out test46.out test47.out \
- 		test48.out test49.out test51.out test52.out test53.out \
- 		test54.out test55.out test56.out test57.out test58.out \
--		test59.out test60.out test61.out test62.out
-+		test59.out test60.out test61.out test62.out test63.out \
-+		test64.out
- 
- SCRIPTS_GUI = test16.out
- 
-@@ -34,11 +39,11 @@
- $(SCRIPTS) $(SCRIPTS_GUI): $(VIMPROG)
- 
- clean:
--	-rm -rf *.out *.failed *.rej *.orig test.log tiny.vim small.vim mbyte.vim test.ok X* viminfo
-+	-rm -rf *.out *.failed *.rej *.orig test.log tiny.vim small.vim mbyte.vim test.ok X* valgrind.pid* viminfo
- 
- test1.out: test1.in
- 	-rm -f $*.failed tiny.vim small.vim mbyte.vim test.ok X* viminfo
--	$(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in $*.in
-+	$(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in $*.in
- 	@/bin/sh -c "if diff test.out $*.ok; \
- 		then mv -f test.out $*.out; \
- 		else echo; \
-@@ -51,7 +56,7 @@
- 	cp $*.ok test.ok
- 	# Sleep a moment to avoid that the xterm title is messed up
- 	@-sleep .2
--	-$(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in $*.in
-+	-$(VALGRIND) $(VIMPROG) -u unix.vim -U NONE --noplugin -s dotest.in $*.in
- 	@/bin/sh -c "if test -f test.out; then\
- 		  if diff test.out $*.ok; \
- 		  then mv -f test.out $*.out; \
-@@ -61,5 +66,9 @@
- 		fi"
- 	-rm -rf X* test.ok viminfo
- 
-+test49.out: test49.vim
-+
-+test60.out: test60.vim
-+
- nolog:
- 	-echo Test results: >test.log
-diff -Naur vim71.orig/src/testdir/test14.in vim71/src/testdir/test14.in
---- vim71.orig/src/testdir/test14.in	2004-06-07 10:32:05.000000000 -0400
-+++ vim71/src/testdir/test14.in	2007-12-20 23:58:59.000000000 -0500
-@@ -18,6 +18,7 @@
- : let tt = "o\<C-V>65\<C-V>x42\<C-V>o103 \<C-V>33a\<C-V>xfg\<C-V>o78\<Esc>"
- :endif
- :exe "normal " . tt
-+:unlet tt
- :.w >>test.out
- :set vb
- /^Piece
-diff -Naur vim71.orig/src/testdir/test26.in vim71/src/testdir/test26.in
---- vim71.orig/src/testdir/test26.in	2004-06-07 10:32:05.000000000 -0400
-+++ vim71/src/testdir/test26.in	2007-12-20 23:58:59.000000000 -0500
-@@ -37,6 +37,7 @@
- :    endif
- :  endif
- :endwhile
-+:unlet i j
- :'t,$w! test.out
- :qa!
- ENDTEST
-diff -Naur vim71.orig/src/testdir/test34.in vim71/src/testdir/test34.in
---- vim71.orig/src/testdir/test34.in	2006-04-30 09:33:24.000000000 -0400
-+++ vim71/src/testdir/test34.in	2007-12-20 23:58:59.000000000 -0500
-@@ -52,7 +52,15 @@
- ---*---
- (one
- (two
--[(one again:$-5,$wq! test.out
-+[(one again:$-5,$w! test.out
-+:delfunc Table
-+:delfunc Compute
-+:delfunc Expr1
-+:delfunc Expr2
-+:delfunc ListItem
-+:delfunc ListReset
-+:unlet retval counter
-+:q!
- ENDTEST
- 
- here
-diff -Naur vim71.orig/src/testdir/test45.in vim71/src/testdir/test45.in
---- vim71.orig/src/testdir/test45.in	2004-06-07 10:32:05.000000000 -0400
-+++ vim71/src/testdir/test45.in	2007-12-20 23:58:59.000000000 -0500
-@@ -55,6 +55,7 @@
- /kk$
- :call append("$", foldlevel("."))
- :/^last/+1,$w! test.out
-+:delfun Flvl
- :qa!
- ENDTEST
- 
-diff -Naur vim71.orig/src/testdir/test47.in vim71/src/testdir/test47.in
---- vim71.orig/src/testdir/test47.in	2004-06-07 10:32:05.000000000 -0400
-+++ vim71/src/testdir/test47.in	2007-12-20 23:58:59.000000000 -0500
-@@ -34,6 +34,7 @@
- :call append("$", two)
- :call append("$", three)
- :$-2,$w! test.out
-+:unlet one two three
- :qa!
- ENDTEST
- 
-diff -Naur vim71.orig/src/testdir/test49.in vim71/src/testdir/test49.in
---- vim71.orig/src/testdir/test49.in	2006-04-28 05:29:54.000000000 -0400
-+++ vim71/src/testdir/test49.in	2007-12-20 23:58:59.000000000 -0500
-@@ -1,13 +1,29 @@
- This is a test of the script language.
- 
- If after adding a new test, the test output doesn't appear properly in
--test49.failed, try to add one ore more "G"s at the line before ENDTEST.
-+test49.failed, try to add one ore more "G"s at the line ending in "test.out"
- 
- STARTTEST
- :so small.vim
- :se nocp nomore viminfo+=nviminfo
- :so test49.vim
--GGGGGGGGGG"rp:.-,$wq! test.out
-+GGGGGGGGGGGGGG"rp:.-,$w! test.out
-+:"
-+:" make valgrind happy
-+:redir => funclist
-+:silent func
-+:redir END
-+:for line in split(funclist, "\n")
-+:  let name = matchstr(line, 'function \zs[A-Z]\w*\ze(')
-+:  if name != ''
-+:    exe "delfunc " . name
-+:  endif
-+:endfor
-+:for v in keys(g:)
-+:  silent! exe "unlet " . v
-+:endfor
-+:unlet v
-+:qa!
- ENDTEST
- 
- Results of test49.vim:
-diff -Naur vim71.orig/src/testdir/test55.in vim71/src/testdir/test55.in
---- vim71.orig/src/testdir/test55.in	2006-10-15 10:07:05.000000000 -0400
-+++ vim71/src/testdir/test55.in	2007-12-20 23:58:59.000000000 -0500
-@@ -345,6 +345,10 @@
- :endfun
- :call Test(1, 2, [3, 4], {5: 6})  " This may take a while
- :"
-+:delfunc Test
-+:unlet dict
-+:call garbagecollect(1)
-+:"
- :/^start:/,$wq! test.out
- ENDTEST
- 
-diff -Naur vim71.orig/src/testdir/test56.in vim71/src/testdir/test56.in
---- vim71.orig/src/testdir/test56.in	2006-09-03 10:28:41.000000000 -0400
-+++ vim71/src/testdir/test56.in	2007-12-20 23:58:59.000000000 -0500
-@@ -17,5 +17,5 @@
- fun s:DoNothing()
-   call append(line('$'), "nothing line")
- endfun
--nnoremap <buffer> _x	:call <SID>DoNothing()<bar>call <SID>DoLast()<cr>
-+nnoremap <buffer> _x	:call <SID>DoNothing()<bar>call <SID>DoLast()<bar>delfunc <SID>DoNothing<bar>delfunc <SID>DoLast<cr>
- end:
-diff -Naur vim71.orig/src/testdir/test58.in vim71/src/testdir/test58.in
---- vim71.orig/src/testdir/test58.in	2006-04-03 14:24:04.000000000 -0400
-+++ vim71/src/testdir/test58.in	2007-12-20 23:58:59.000000000 -0500
-@@ -86,6 +86,7 @@
- :$put =str
- `m]s:let [str, a] = spellbadword()
- :$put =str
-+:unlet str a
- :"
- :" Postponed prefixes
- :call TestOne('2', '1')
-@@ -100,6 +101,10 @@
- :" NOSLITSUGS
- :call TestOne('8', '8')
- :"
-+:" clean up for valgrind
-+:delfunc TestOne
-+:set spl= enc=latin1
-+:"
- gg:/^test output:/,$wq! test.out
- ENDTEST
- 
-diff -Naur vim71.orig/src/testdir/test59.in vim71/src/testdir/test59.in
---- vim71.orig/src/testdir/test59.in	2006-04-03 14:29:24.000000000 -0400
-+++ vim71/src/testdir/test59.in	2007-12-20 23:58:59.000000000 -0500
-@@ -90,6 +90,7 @@
- :$put =str
- `m]s:let [str, a] = spellbadword()
- :$put =str
-+:unlet str a
- :"
- :" Postponed prefixes
- :call TestOne('2', '1')
-@@ -101,6 +102,10 @@
- :call TestOne('6', '6')
- :call TestOne('7', '7')
- :"
-+:" clean up for valgrind
-+:delfunc TestOne
-+:set spl= enc=latin1
-+:"
- gg:/^test output:/,$wq! test.out
- ENDTEST
- 
-diff -Naur vim71.orig/src/testdir/test60.in vim71/src/testdir/test60.in
---- vim71.orig/src/testdir/test60.in	2006-05-05 14:41:18.000000000 -0400
-+++ vim71/src/testdir/test60.in	2007-12-20 23:58:59.000000000 -0500
-@@ -569,6 +569,9 @@
-     redir END
- endfunction
- :call TestExists()
-+:delfunc TestExists
-+:delfunc RunTest
-+:delfunc TestFuncArg
- :edit! test.out
- :set ff=unix
- :w
-diff -Naur vim71.orig/src/testdir/test60.vim vim71/src/testdir/test60.vim
---- vim71.orig/src/testdir/test60.vim	2006-01-12 14:45:59.000000000 -0500
-+++ vim71/src/testdir/test60.vim	2007-12-20 23:58:59.000000000 -0500
-@@ -94,4 +94,5 @@
- else
-     echo "FAILED"
- endif
-+unlet str
- 
-diff -Naur vim71.orig/src/testdir/test62.in vim71/src/testdir/test62.in
---- vim71.orig/src/testdir/test62.in	2006-04-30 07:29:15.000000000 -0400
-+++ vim71/src/testdir/test62.in	2007-12-20 23:58:59.000000000 -0500
-@@ -7,6 +7,7 @@
- :let nr = tabpagenr()
- :q
- :call append(line('$'), 'tab page ' . nr)
-+:unlet nr
- :"
- :" Open three tab pages and use ":tabdo"
- :0tabnew
-@@ -23,6 +24,7 @@
- :q!
- :call append(line('$'), line1)
- :call append(line('$'), line2)
-+:unlet line1 line2
- :"
- :"
- :/^Results/,$w! test.out
-diff -Naur vim71.orig/src/testdir/test63.in vim71/src/testdir/test63.in
---- vim71.orig/src/testdir/test63.in	1969-12-31 19:00:00.000000000 -0500
-+++ vim71/src/testdir/test63.in	2007-12-20 23:58:59.000000000 -0500
-@@ -0,0 +1,157 @@
-+Test for ":match", ":2match", ":3match", "clearmatches()", "getmatches()",
-+"matchadd()", "matcharg()", "matchdelete()", and "setmatches()".
-+
-+STARTTEST
-+:so small.vim
-+:" --- Check that "matcharg()" returns the correct group and pattern if a match
-+:" --- is defined.
-+:let @r = "*** Test 1: "
-+:highlight MyGroup1 ctermbg=red
-+:highlight MyGroup2 ctermbg=green
-+:highlight MyGroup3 ctermbg=blue
-+:match MyGroup1 /TODO/
-+:2match MyGroup2 /FIXME/
-+:3match MyGroup3 /XXX/
-+:if matcharg(1) == ['MyGroup1', 'TODO'] && matcharg(2) == ['MyGroup2', 'FIXME'] && matcharg(3) == ['MyGroup3', 'XXX']
-+:  let @r .= "OK\n"
-+:else
-+:  let @r .= "FAILED\n"
-+:endif
-+:" --- Check that "matcharg()" returns an empty list if the argument is not 1,
-+:" --- 2 or 3 (only 0 and 4 are tested).
-+:let @r .= "*** Test 2: "
-+:if matcharg(0) == [] && matcharg(4) == []
-+:  let @r .= "OK\n"
-+:else
-+:  let @r .= "FAILED\n"
-+:endif
-+:" --- Check that "matcharg()" returns ['', ''] if a match is not defined.
-+:let @r .= "*** Test 3: "
-+:match
-+:2match
-+:3match
-+:if matcharg(1) == ['', ''] && matcharg(2) == ['', ''] && matcharg(3) == ['', '']
-+:  let @r .= "OK\n"
-+:else
-+:  let @r .= "FAILED\n"
-+:endif
-+:" --- Check that "matchadd()" and "getmatches()" agree on added matches and
-+:" --- that default values apply.
-+:let @r .= "*** Test 4: "
-+:let m1 = matchadd("MyGroup1", "TODO")
-+:let m2 = matchadd("MyGroup2", "FIXME", 42)
-+:let m3 = matchadd("MyGroup3", "XXX", 60, 17)
-+:if getmatches() == [{'group': 'MyGroup1', 'pattern': 'TODO', 'priority': 10, 'id': 4}, {'group': 'MyGroup2', 'pattern': 'FIXME', 'priority': 42, 'id': 5}, {'group': 'MyGroup3', 'pattern': 'XXX', 'priority': 60, 'id': 17}]
-+:  let @r .= "OK\n"
-+:else
-+:  let @r .= "FAILED\n"
-+:endif
-+:" --- Check that "matchdelete()" deletes the matches defined in the previous
-+:" --- test correctly.
-+:let @r .= "*** Test 5: "
-+:call matchdelete(m1)
-+:call matchdelete(m2)
-+:call matchdelete(m3)
-+:unlet m1
-+:unlet m2
-+:unlet m3
-+:if getmatches() == []
-+:  let @r .= "OK\n"
-+:else
-+:  let @r .= "FAILED\n"
-+:endif
-+:" --- Check that "matchdelete()" returns 0 if successful and otherwise -1.
-+:let @r .= "*** Test 6: "
-+:let m = matchadd("MyGroup1", "TODO")
-+:let r1 = matchdelete(m)
-+:let r2 = matchdelete(42)
-+:if r1 == 0 && r2 == -1
-+:  let @r .= "OK\n"
-+:else
-+:  let @r .= "FAILED\n"
-+:endif
-+:unlet m
-+:unlet r1
-+:unlet r2
-+:" --- Check that "clearmatches()" clears all matches defined by ":match" and
-+:" --- "matchadd()".
-+:let @r .= "*** Test 7: "
-+:let m1 = matchadd("MyGroup1", "TODO")
-+:let m2 = matchadd("MyGroup2", "FIXME", 42)
-+:let m3 = matchadd("MyGroup3", "XXX", 60, 17)
-+:match MyGroup1 /COFFEE/
-+:2match MyGroup2 /HUMPPA/
-+:3match MyGroup3 /VIM/
-+:call clearmatches()
-+:if getmatches() == []
-+:  let @r .= "OK\n"
-+:else
-+:  let @r .= "FAILED\n"
-+:endif
-+:unlet m1
-+:unlet m2
-+:unlet m3
-+:" --- Check that "setmatches()" restores a list of matches saved by
-+:" --- "getmatches()" without changes. (Matches with equal priority must also
-+:" --- remain in the same order.)
-+:let @r .= "*** Test 8: "
-+:let m1 = matchadd("MyGroup1", "TODO")
-+:let m2 = matchadd("MyGroup2", "FIXME", 42)
-+:let m3 = matchadd("MyGroup3", "XXX", 60, 17)
-+:match MyGroup1 /COFFEE/
-+:2match MyGroup2 /HUMPPA/
-+:3match MyGroup3 /VIM/
-+:let ml = getmatches()
-+:call clearmatches()
-+:call setmatches(ml)
-+:if getmatches() == ml
-+:  let @r .= "OK\n"
-+:else
-+:  let @r .= "FAILED\n"
-+:endif
-+:call clearmatches()
-+:unlet m1
-+:unlet m2
-+:unlet m3
-+:unlet ml
-+:" --- Check that "setmatches()" will not add two matches with the same ID. The
-+:" --- expected behaviour (for now) is to add the first match but not the
-+:" --- second and to return 0 (even though it is a matter of debate whether
-+:" --- this can be considered successful behaviour).
-+:let @r .= "*** Test 9: "
-+:let r1 = setmatches([{'group': 'MyGroup1', 'pattern': 'TODO', 'priority': 10, 'id': 1}, {'group': 'MyGroup2', 'pattern': 'FIXME', 'priority': 10, 'id': 1}])
-+:if getmatches() == [{'group': 'MyGroup1', 'pattern': 'TODO', 'priority': 10, 'id': 1}] && r1 == 0
-+:  let @r .= "OK\n"
-+:else
-+:  let @r .= "FAILED\n"
-+:endif
-+:call clearmatches()
-+:unlet r1
-+:" --- Check that "setmatches()" returns 0 if successful and otherwise -1.
-+:" --- (A range of valid and invalid input values are tried out to generate the
-+:" --- return values.)
-+:let @r .= "*** Test 10: "
-+:let rs1 = setmatches([])
-+:let rs2 = setmatches([{'group': 'MyGroup1', 'pattern': 'TODO', 'priority': 10, 'id': 1}])
-+:call clearmatches()
-+:let rf1 = setmatches(0)
-+:let rf2 = setmatches([0])
-+:let rf3 = setmatches([{'wrong key': 'wrong value'}])
-+:if rs1 == 0 && rs2 == 0 && rf1 == -1 && rf2 == -1 && rf3 == -1
-+:  let @r .= "OK\n"
-+:else
-+:  let @r .= "FAILED\n"
-+:endif
-+:unlet rs1
-+:unlet rs2
-+:unlet rf1
-+:unlet rf2
-+:unlet rf3
-+:highlight clear MyGroup1
-+:highlight clear MyGroup2
-+:highlight clear MyGroup3
-+G"rp
-+:/^Results/,$wq! test.out
-+ENDTEST
-+
-+Results of test63:
-diff -Naur vim71.orig/src/testdir/test63.ok vim71/src/testdir/test63.ok
---- vim71.orig/src/testdir/test63.ok	1969-12-31 19:00:00.000000000 -0500
-+++ vim71/src/testdir/test63.ok	2007-12-20 23:57:20.000000000 -0500
-@@ -0,0 +1,11 @@
-+Results of test63:
-+*** Test 1: OK
-+*** Test 2: OK
-+*** Test 3: OK
-+*** Test 4: OK
-+*** Test 5: OK
-+*** Test 6: OK
-+*** Test 7: OK
-+*** Test 8: OK
-+*** Test 9: OK
-+*** Test 10: OK
-diff -Naur vim71.orig/src/testdir/test64.in vim71/src/testdir/test64.in
---- vim71.orig/src/testdir/test64.in	1969-12-31 19:00:00.000000000 -0500
-+++ vim71/src/testdir/test64.in	2007-12-20 23:58:59.000000000 -0500
-@@ -0,0 +1,54 @@
-+Test for regexp patterns.
-+
-+A pattern that gives the expected result produces OK, so that we know it was
-+actually tried.
-+
-+STARTTEST
-+:so small.vim
-+:" tl is a List of Lists with:
-+:"    regexp pattern
-+:"    text to test the pattern on
-+:"    expected match (optional)
-+:"    expected submatch 1 (optional)
-+:"    expected submatch 2 (optional)
-+:"    etc.
-+:"  When there is no match use only the first two items.
-+:let tl = []
-+:call add(tl, ['b', 'abcdef', 'b'])
-+:call add(tl, ['bc*', 'abccccdef', 'bcccc'])
-+:call add(tl, ['bc\{-}', 'abccccdef', 'b'])
-+:call add(tl, ['bc\{-}\(d\)', 'abccccdef', 'bccccd', 'd'])
-+:call add(tl, ['x', 'abcdef'])
-+:"
-+:for t in tl
-+:  let l = matchlist(t[1], t[0])
-+:" check the match itself
-+:  if len(l) == 0 && len(t) > 2
-+:    $put ='ERROR: pat: \"' . t[0] . '\", text: \"' . t[1] . '\", did not match, expected: \"' . t[2] . '\"'
-+:  elseif len(l) > 0 && len(t) == 2
-+:    $put ='ERROR: pat: \"' . t[0] . '\", text: \"' . t[1] . '\", match: \"' . l[0] . '\", expected no match'
-+:  elseif len(t) > 2 && l[0] != t[2]
-+:    $put ='ERROR: pat: \"' . t[0] . '\", text: \"' . t[1] . '\", match: \"' . l[0] . '\", expected: \"' . t[2] . '\"'
-+:  else
-+:    $put ='OK'
-+:  endif
-+:  if len(l) > 0
-+:"   check all the nine submatches
-+:    for i in range(1, 9)
-+:      if len(t) <= i + 2
-+:        let e = ''
-+:      else
-+:        let e = t[i + 2]
-+:      endif
-+:      if l[i] != e
-+:        $put ='ERROR: pat: \"' . t[0] . '\", text: \"' . t[1] . '\", submatch ' . i . ': \"' . l[i] . '\", expected: \"' . e . '\"'
-+:      endif
-+:    endfor
-+:    unlet i
-+:  endif
-+:endfor
-+:unlet t tl e l
-+:/^Results/,$wq! test.out
-+ENDTEST
-+
-+Results of test64:
-diff -Naur vim71.orig/src/testdir/test64.ok vim71/src/testdir/test64.ok
---- vim71.orig/src/testdir/test64.ok	1969-12-31 19:00:00.000000000 -0500
-+++ vim71/src/testdir/test64.ok	2007-12-20 23:57:57.000000000 -0500
-@@ -0,0 +1,6 @@
-+Results of test64:
-+OK
-+OK
-+OK
-+OK
-+OK
-diff -Naur vim71.orig/src/ui.c vim71/src/ui.c
---- vim71.orig/src/ui.c	2007-05-07 15:49:09.000000000 -0400
-+++ vim71/src/ui.c	2007-12-20 23:58:05.000000000 -0500
-@@ -1603,8 +1603,6 @@
- #if defined(FEAT_GUI) || defined(FEAT_MOUSE_GPM) \
- 	|| defined(FEAT_XCLIPBOARD) || defined(VMS) \
- 	|| defined(FEAT_SNIFF) || defined(FEAT_CLIENTSERVER) \
--	|| (defined(FEAT_GUI) && (!defined(USE_ON_FLY_SCROLL) \
--		|| defined(FEAT_MENU))) \
- 	|| defined(PROTO)
- /*
-  * Add the given bytes to the input buffer
-@@ -1630,7 +1628,9 @@
- }
- #endif
- 
--#if (defined(FEAT_XIM) && defined(FEAT_GUI_GTK)) \
-+#if ((defined(FEAT_XIM) || defined(FEAT_DND)) && defined(FEAT_GUI_GTK)) \
-+	|| defined(FEAT_GUI_MSWIN) \
-+	|| defined(FEAT_GUI_MAC) \
- 	|| (defined(FEAT_MBYTE) && defined(FEAT_MBYTE_IME)) \
- 	|| (defined(FEAT_GUI) && (!defined(USE_ON_FLY_SCROLL) \
- 		|| defined(FEAT_MENU))) \
-diff -Naur vim71.orig/src/undo.c vim71/src/undo.c
---- vim71.orig/src/undo.c	2007-05-07 15:21:14.000000000 -0400
-+++ vim71/src/undo.c	2007-12-20 23:59:42.000000000 -0500
-@@ -76,6 +76,12 @@
-  * buffer is unloaded.
-  */
- 
-+/* Uncomment the next line for including the u_check() function.  This warns
-+ * for errors in the debug information. */
-+/* #define U_DEBUG 1 */
-+#define UH_MAGIC 0x18dade	/* value for uh_magic when in use */
-+#define UE_MAGIC 0xabc123	/* value for ue_magic when in use */
-+
- #include "vim.h"
- 
- /* See below: use malloc()/free() for memory management. */
-@@ -113,6 +119,95 @@
-  */
- static int	undo_undoes = FALSE;
- 
-+#ifdef U_DEBUG
-+/*
-+ * Check the undo structures for being valid.  Print a warning when something
-+ * looks wrong.
-+ */
-+static int seen_b_u_curhead;
-+static int seen_b_u_newhead;
-+static int header_count;
-+
-+    static void
-+u_check_tree(u_header_T *uhp,
-+	u_header_T *exp_uh_next,
-+	u_header_T *exp_uh_alt_prev)
-+{
-+    u_entry_T *uep;
-+
-+    if (uhp == NULL)
-+	return;
-+    ++header_count;
-+    if (uhp == curbuf->b_u_curhead && ++seen_b_u_curhead > 1)
-+    {
-+	EMSG("b_u_curhead found twice (looping?)");
-+	return;
-+    }
-+    if (uhp == curbuf->b_u_newhead && ++seen_b_u_newhead > 1)
-+    {
-+	EMSG("b_u_newhead found twice (looping?)");
-+	return;
-+    }
-+
-+    if (uhp->uh_magic != UH_MAGIC)
-+	EMSG("uh_magic wrong (may be using freed memory)");
-+    else
-+    {
-+	/* Check pointers back are correct. */
-+	if (uhp->uh_next != exp_uh_next)
-+	{
-+	    EMSG("uh_next wrong");
-+	    smsg((char_u *)"expected: 0x%x, actual: 0x%x",
-+						   exp_uh_next, uhp->uh_next);
-+	}
-+	if (uhp->uh_alt_prev != exp_uh_alt_prev)
-+	{
-+	    EMSG("uh_alt_prev wrong");
-+	    smsg((char_u *)"expected: 0x%x, actual: 0x%x",
-+					   exp_uh_alt_prev, uhp->uh_alt_prev);
-+	}
-+
-+	/* Check the undo tree at this header. */
-+	for (uep = uhp->uh_entry; uep != NULL; uep = uep->ue_next)
-+	{
-+	    if (uep->ue_magic != UE_MAGIC)
-+	    {
-+		EMSG("ue_magic wrong (may be using freed memory)");
-+		break;
-+	    }
-+	}
-+
-+	/* Check the next alt tree. */
-+	u_check_tree(uhp->uh_alt_next, uhp->uh_next, uhp);
-+
-+	/* Check the next header in this branch. */
-+	u_check_tree(uhp->uh_prev, uhp, NULL);
-+    }
-+}
-+
-+    void
-+u_check(int newhead_may_be_NULL)
-+{
-+    seen_b_u_newhead = 0;
-+    seen_b_u_curhead = 0;
-+    header_count = 0;
-+
-+    u_check_tree(curbuf->b_u_oldhead, NULL, NULL);
-+
-+    if (seen_b_u_newhead == 0 && curbuf->b_u_oldhead != NULL
-+	    && !(newhead_may_be_NULL && curbuf->b_u_newhead == NULL))
-+	EMSGN("b_u_newhead invalid: 0x%x", curbuf->b_u_newhead);
-+    if (curbuf->b_u_curhead != NULL && seen_b_u_curhead == 0)
-+	EMSGN("b_u_curhead invalid: 0x%x", curbuf->b_u_curhead);
-+    if (header_count != curbuf->b_u_numhead)
-+    {
-+	EMSG("b_u_numhead invalid");
-+	smsg((char_u *)"expected: %ld, actual: %ld",
-+			       (long)header_count, (long)curbuf->b_u_numhead);
-+    }
-+}
-+#endif
-+
- /*
-  * Save the current line for both the "u" and "U" command.
-  * Returns OK or FAIL.
-@@ -243,6 +338,9 @@
-     if (!undo_allowed())
- 	return FAIL;
- 
-+#ifdef U_DEBUG
-+    u_check(FALSE);
-+#endif
- #ifdef FEAT_NETBEANS_INTG
-     /*
-      * Netbeans defines areas that cannot be modified.  Bail out here when
-@@ -294,6 +392,9 @@
- 	    uhp = (u_header_T *)U_ALLOC_LINE((unsigned)sizeof(u_header_T));
- 	    if (uhp == NULL)
- 		goto nomem;
-+#ifdef U_DEBUG
-+	    uhp->uh_magic = UH_MAGIC;
-+#endif
- 	}
- 	else
- 	    uhp = NULL;
-@@ -316,8 +417,11 @@
- 	{
- 	    u_header_T	    *uhfree = curbuf->b_u_oldhead;
- 
--	    /* If there is no branch only free one header. */
--	    if (uhfree->uh_alt_next == NULL)
-+	    if (uhfree == old_curhead)
-+		/* Can't reconnect the branch, delete all of it. */
-+		u_freebranch(curbuf, uhfree, &old_curhead);
-+	    else if (uhfree->uh_alt_next == NULL)
-+		/* There is no branch, only free one header. */
- 		u_freeheader(curbuf, uhfree, &old_curhead);
- 	    else
- 	    {
-@@ -326,6 +430,9 @@
- 		    uhfree = uhfree->uh_alt_next;
- 		u_freebranch(curbuf, uhfree, &old_curhead);
- 	    }
-+#ifdef U_DEBUG
-+	    u_check(TRUE);
-+#endif
- 	}
- 
- 	if (uhp == NULL)		/* no undo at all */
-@@ -478,6 +585,9 @@
-     uep = (u_entry_T *)U_ALLOC_LINE((unsigned)sizeof(u_entry_T));
-     if (uep == NULL)
- 	goto nomem;
-+#ifdef U_DEBUG
-+    uep->ue_magic = UE_MAGIC;
-+#endif
- 
-     uep->ue_size = size;
-     uep->ue_top = top;
-@@ -525,6 +635,9 @@
-     curbuf->b_u_synced = FALSE;
-     undo_undoes = FALSE;
- 
-+#ifdef U_DEBUG
-+    u_check(FALSE);
-+#endif
-     return OK;
- 
- nomem:
-@@ -955,6 +1068,9 @@
-     int		empty_buffer;		    /* buffer became empty */
-     u_header_T	*curhead = curbuf->b_u_curhead;
- 
-+#ifdef U_DEBUG
-+    u_check(FALSE);
-+#endif
-     old_flags = curhead->uh_flags;
-     new_flags = (curbuf->b_changed ? UH_CHANGED : 0) +
- 	       ((curbuf->b_ml.ml_flags & ML_EMPTY) ? UH_EMPTYBUF : 0);
-@@ -1186,6 +1302,9 @@
-     /* The timestamp can be the same for multiple changes, just use the one of
-      * the undone/redone change. */
-     curbuf->b_u_seq_time = curhead->uh_time;
-+#ifdef U_DEBUG
-+    u_check(FALSE);
-+#endif
- }
- 
- /*
-@@ -1515,7 +1634,7 @@
- }
- 
- /*
-- * Free one header and its entry list and adjust the pointers.
-+ * Free one header "uhp" and its entry list and adjust the pointers.
-  */
-     static void
- u_freeheader(buf, uhp, uhpp)
-@@ -1523,6 +1642,8 @@
-     u_header_T	    *uhp;
-     u_header_T	    **uhpp;	/* if not NULL reset when freeing this header */
- {
-+    u_header_T	    *uhap;
-+
-     /* When there is an alternate redo list free that branch completely,
-      * because we can never go there. */
-     if (uhp->uh_alt_next != NULL)
-@@ -1540,7 +1661,8 @@
-     if (uhp->uh_prev == NULL)
- 	buf->b_u_newhead = uhp->uh_next;
-     else
--	uhp->uh_prev->uh_next = uhp->uh_next;
-+	for (uhap = uhp->uh_prev; uhap != NULL; uhap = uhap->uh_alt_next)
-+	    uhap->uh_next = uhp->uh_next;
- 
-     u_freeentries(buf, uhp, uhpp);
- }
-@@ -1556,6 +1678,14 @@
- {
-     u_header_T	    *tofree, *next;
- 
-+    /* If this is the top branch we may need to use u_freeheader() to update
-+     * all the pointers. */
-+    if (uhp == buf->b_u_oldhead)
-+    {
-+	u_freeheader(buf, uhp, uhpp);
-+	return;
-+    }
-+
-     if (uhp->uh_alt_prev != NULL)
- 	uhp->uh_alt_prev->uh_alt_next = NULL;
- 
-@@ -1585,6 +1715,8 @@
-     /* Check for pointers to the header that become invalid now. */
-     if (buf->b_u_curhead == uhp)
- 	buf->b_u_curhead = NULL;
-+    if (buf->b_u_newhead == uhp)
-+	buf->b_u_newhead = NULL;  /* freeing the newest entry */
-     if (uhpp != NULL && uhp == *uhpp)
- 	*uhpp = NULL;
- 
-@@ -1594,6 +1726,9 @@
- 	u_freeentry(uep, uep->ue_size);
-     }
- 
-+#ifdef U_DEBUG
-+    uhp->uh_magic = 0;
-+#endif
-     U_FREE_LINE((char_u *)uhp);
-     --buf->b_u_numhead;
- }
-@@ -1609,6 +1744,9 @@
-     while (n > 0)
- 	U_FREE_LINE(uep->ue_array[--n]);
-     U_FREE_LINE((char_u *)uep->ue_array);
-+#ifdef U_DEBUG
-+    uep->ue_magic = 0;
-+#endif
-     U_FREE_LINE((char_u *)uep);
- }
- 
-diff -Naur vim71.orig/src/version.c vim71/src/version.c
---- vim71.orig/src/version.c	2007-05-12 06:23:44.000000000 -0400
-+++ vim71/src/version.c	2007-12-21 00:00:07.000000000 -0500
-@@ -667,6 +667,320 @@
- static int included_patches[] =
- {   /* Add new patch number below this line */
- /**/
-+    175,
-+/**/
-+    174,
-+/**/
-+    173,
-+/**/
-+    172,
-+/**/
-+    171,
-+/**/
-+    170,
-+/**/
-+    169,
-+/**/
-+    167,
-+/**/
-+    166,
-+/**/
-+    165,
-+/**/
-+    164,
-+/**/
-+    163,
-+/**/
-+    162,
-+/**/
-+    161,
-+/**/
-+    160,
-+/**/
-+    159,
-+/**/
-+    157,
-+/**/
-+    156,
-+/**/
-+    155,
-+/**/
-+    154,
-+/**/
-+    153,
-+/**/
-+    152,
-+/**/
-+    151,
-+/**/
-+    150,
-+/**/
-+    149,
-+/**/
-+    148,
-+/**/
-+    147,
-+/**/
-+    145,
-+/**/
-+    144,
-+/**/
-+    143,
-+/**/
-+    142,
-+/**/
-+    141,
-+/**/
-+    140,
-+/**/
-+    139,
-+/**/
-+    138,
-+/**/
-+    137,
-+/**/
-+    136,
-+/**/
-+    135,
-+/**/
-+    133,
-+/**/
-+    132,
-+/**/
-+    131,
-+/**/
-+    130,
-+/**/
-+    127,
-+/**/
-+    125,
-+/**/
-+    123,
-+/**/
-+    122,
-+/**/
-+    121,
-+/**/
-+    120,
-+/**/
-+    119,
-+/**/
-+    118,
-+/**/
-+    117,
-+/**/
-+    116,
-+/**/
-+    115,
-+/**/
-+    114,
-+/**/
-+    113,
-+/**/
-+    112,
-+/**/
-+    111,
-+/**/
-+    110,
-+/**/
-+    109,
-+/**/
-+    108,
-+/**/
-+    107,
-+/**/
-+    106,
-+/**/
-+    105,
-+/**/
-+    104,
-+/**/
-+    103,
-+/**/
-+    102,
-+/**/
-+    101,
-+/**/
-+    100,
-+/**/
-+    99,
-+/**/
-+    98,
-+/**/
-+    97,
-+/**/
-+    96,
-+/**/
-+    95,
-+/**/
-+    94,
-+/**/
-+    93,
-+/**/
-+    90,
-+/**/
-+    89,
-+/**/
-+    87,
-+/**/
-+    86,
-+/**/
-+    85,
-+/**/
-+    84,
-+/**/
-+    83,
-+/**/
-+    82,
-+/**/
-+    81,
-+/**/
-+    79,
-+/**/
-+    78,
-+/**/
-+    77,
-+/**/
-+    76,
-+/**/
-+    75,
-+/**/
-+    74,
-+/**/
-+    73,
-+/**/
-+    71,
-+/**/
-+    69,
-+/**/
-+    68,
-+/**/
-+    67,
-+/**/
-+    66,
-+/**/
-+    64,
-+/**/
-+    63,
-+/**/
-+    62,
-+/**/
-+    61,
-+/**/
-+    60,
-+/**/
-+    59,
-+/**/
-+    58,
-+/**/
-+    57,
-+/**/
-+    56,
-+/**/
-+    55,
-+/**/
-+    54,
-+/**/
-+    53,
-+/**/
-+    52,
-+/**/
-+    51,
-+/**/
-+    50,
-+/**/
-+    49,
-+/**/
-+    48,
-+/**/
-+    47,
-+/**/
-+    46,
-+/**/
-+    45,
-+/**/
-+    44,
-+/**/
-+    43,
-+/**/
-+    42,
-+/**/
-+    40,
-+/**/
-+    39,
-+/**/
-+    38,
-+/**/
-+    37,
-+/**/
-+    36,
-+/**/
-+    35,
-+/**/
-+    34,
-+/**/
-+    33,
-+/**/
-+    32,
-+/**/
-+    31,
-+/**/
-+    30,
-+/**/
-+    29,
-+/**/
-+    28,
-+/**/
-+    27,
-+/**/
-+    26,
-+/**/
-+    25,
-+/**/
-+    24,
-+/**/
-+    23,
-+/**/
-+    22,
-+/**/
-+    21,
-+/**/
-+    20,
-+/**/
-+    19,
-+/**/
-+    18,
-+/**/
-+    17,
-+/**/
-+    16,
-+/**/
-+    15,
-+/**/
-+    14,
-+/**/
-+    13,
-+/**/
-+    12,
-+/**/
-+    11,
-+/**/
-+    10,
-+/**/
-+    9,
-+/**/
-+    8,
-+/**/
-+    6,
-+/**/
-+    5,
-+/**/
-+    4,
-+/**/
-+    2,
-+/**/
-+    1,
-+/**/
-     0
- };
- 
-diff -Naur vim71.orig/src/vim.h vim71/src/vim.h
---- vim71.orig/src/vim.h	2007-05-12 05:53:29.000000000 -0400
-+++ vim71/src/vim.h	2007-12-20 23:57:45.000000000 -0500
-@@ -1380,8 +1380,14 @@
- #endif
- 
- #ifdef FEAT_MBYTE
--# define MB_STRICMP(d, s)	(has_mbyte ? mb_strnicmp((char_u *)(d), (char_u *)(s), (int)MAXCOL) : STRICMP((d), (s)))
--# define MB_STRNICMP(d, s, n)	(has_mbyte ? mb_strnicmp((char_u *)(d), (char_u *)(s), (int)(n)) : STRNICMP((d), (s), (n)))
-+/* We need to call mb_stricmp() even when we aren't dealing with a multi-byte
-+ * encoding because mb_stricmp() takes care of all ascii and non-ascii
-+ * encodings, including characters with umluats in latin1, etc., while
-+ * STRICMP() only handles the system locale version, which often does not
-+ * handle non-ascii properly. */
-+
-+# define MB_STRICMP(d, s)	mb_strnicmp((char_u *)(d), (char_u *)(s), (int)MAXCOL)
-+# define MB_STRNICMP(d, s, n)	mb_strnicmp((char_u *)(d), (char_u *)(s), (int)(n))
- #else
- # define MB_STRICMP(d, s)	STRICMP((d), (s))
- # define MB_STRNICMP(d, s, n)	STRNICMP((d), (s), (n))
-diff -Naur vim71.orig/src/vimtutor vim71/src/vimtutor
---- vim71.orig/src/vimtutor	2004-06-07 10:32:27.000000000 -0400
-+++ vim71/src/vimtutor	2007-12-20 23:57:06.000000000 -0500
-@@ -39,18 +39,22 @@
- # remove the copy of the tutor on exit
- trap "rm -rf $TODELETE" 0 1 2 3 9 11 13 15
- 
--# Vim could be called "vim" or "vi".  Also check for "vim6", for people who
--# have Vim 5.x installed as "vim" and Vim 6.0 as "vim6".
--testvim=`which vim6 2>/dev/null`
--if test -f "$testvim"; then
--	VIM=vim6
--else
--	testvim=`which vim`
-+# Vim could be called "vim" or "vi".  Also check for "vimN", for people who
-+# have Vim installed with its version number.
-+# We anticipate up to a future Vim 8 version :-).
-+seq="vim vim8 vim75 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi"
-+for i in $seq; do
-+	testvim=`which $i 2>/dev/null`
- 	if test -f "$testvim"; then
--		VIM=vim
--	else
--		VIM=vi
-+		VIM=$i
-+		break
- 	fi
-+done
-+
-+# When no Vim version was found fall back to "vim", you'll get an error message
-+# below.
-+if test -z "$VIM"; then
-+	VIM=vim
- fi
- 
- # Use Vim to copy the tutor, it knows the value of $VIMRUNTIME
-diff -Naur vim71.orig/src/window.c vim71/src/window.c
---- vim71.orig/src/window.c	2007-05-07 15:25:30.000000000 -0400
-+++ vim71/src/window.c	2007-12-20 23:59:05.000000000 -0500
-@@ -75,6 +75,7 @@
- static win_T *restore_snapshot_rec __ARGS((frame_T *sn, frame_T *fr));
- 
- #endif /* FEAT_WINDOWS */
-+
- static win_T *win_alloc __ARGS((win_T *after));
- static void win_new_height __ARGS((win_T *, int));
- 
-@@ -583,7 +584,7 @@
- 		++no_mapping;
- 		++allow_keys;   /* no mapping for xchar, but allow key codes */
- 		if (xchar == NUL)
--		    xchar = safe_vgetc();
-+		    xchar = plain_vgetc();
- #ifdef FEAT_LANGMAP
- 		LANGMAP_ADJUST(xchar, TRUE);
- #endif
-@@ -732,7 +733,6 @@
-     if (flags & WSP_VERT)
-     {
- 	layout = FR_ROW;
--	do_equal = (p_ea && new_size == 0 && *p_ead != 'v');
- 
- 	/*
- 	 * Check if we are able to split the current window and compute its
-@@ -769,16 +769,31 @@
- 	 * instead, if possible. */
- 	if (oldwin->w_p_wfw)
- 	    win_setwidth_win(oldwin->w_width + new_size, oldwin);
-+
-+	/* Only make all windows the same width if one of them (except oldwin)
-+	 * is wider than one of the split windows. */
-+	if (!do_equal && p_ea && size == 0 && *p_ead != 'v'
-+	   && oldwin->w_frame->fr_parent != NULL)
-+	{
-+	    frp = oldwin->w_frame->fr_parent->fr_child;
-+	    while (frp != NULL)
-+	    {
-+		if (frp->fr_win != oldwin && frp->fr_win != NULL
-+			&& (frp->fr_win->w_width > new_size
-+			    || frp->fr_win->w_width > oldwin->w_width
-+						   - new_size - STATUS_HEIGHT))
-+		{
-+		    do_equal = TRUE;
-+		    break;
-+		}
-+		frp = frp->fr_next;
-+	    }
-+	}
-     }
-     else
- #endif
-     {
- 	layout = FR_COL;
--	do_equal = (p_ea && new_size == 0
--#ifdef FEAT_VERTSPLIT
--		&& *p_ead != 'h'
--#endif
--		);
- 
- 	/*
- 	 * Check if we are able to split the current window and compute its
-@@ -831,6 +846,29 @@
- 	    if (need_status)
- 		oldwin_height -= STATUS_HEIGHT;
- 	}
-+
-+	/* Only make all windows the same height if one of them (except oldwin)
-+	 * is higher than one of the split windows. */
-+	if (!do_equal && p_ea && size == 0
-+#ifdef FEAT_VERTSPLIT
-+		&& *p_ead != 'h'
-+#endif
-+	   && oldwin->w_frame->fr_parent != NULL)
-+	{
-+	    frp = oldwin->w_frame->fr_parent->fr_child;
-+	    while (frp != NULL)
-+	    {
-+		if (frp->fr_win != oldwin && frp->fr_win != NULL
-+			&& (frp->fr_win->w_height > new_size
-+			    || frp->fr_win->w_height > oldwin_height - new_size
-+							      - STATUS_HEIGHT))
-+		{
-+		    do_equal = TRUE;
-+		    break;
-+		}
-+		frp = frp->fr_next;
-+	    }
-+	}
-     }
- 
-     /*
-@@ -1253,7 +1291,7 @@
-      * Don't execute autocommands while creating the windows.  Must do that
-      * when putting the buffers in the windows.
-      */
--    ++autocmd_block;
-+    block_autocmds();
- #endif
- 
-     /* todo is number of windows left to create */
-@@ -1275,7 +1313,7 @@
- 	}
- 
- #ifdef FEAT_AUTOCMD
--    --autocmd_block;
-+    unblock_autocmds();
- #endif
- 
-     /* return actual number of windows */
-@@ -2120,7 +2158,7 @@
- 	if (wp->w_p_pvw || bt_quickfix(wp->w_buffer))
- 	{
- 	    /*
--	     * The cursor goes to the preview or the quickfix window, try
-+	     * If the cursor goes to the preview or the quickfix window, try
- 	     * finding another window to go to.
- 	     */
- 	    for (;;)
-@@ -2307,7 +2345,6 @@
-     frame_T	*frp, *frp2, *frp3;
-     frame_T	*frp_close = win->w_frame;
-     win_T	*wp;
--    int		old_size = 0;
- 
-     /*
-      * If there is only one window there is nothing to remove.
-@@ -2328,33 +2365,77 @@
-     if (frp_close->fr_parent->fr_layout == FR_COL)
-     {
- #endif
--	/* When 'winfixheight' is set, remember its old size and restore
--	 * it later (it's a simplistic solution...).  Don't do this if the
--	 * window will occupy the full height of the screen. */
--	if (frp2->fr_win != NULL
--		&& (frp2->fr_next != NULL || frp2->fr_prev != NULL)
--		&& frp2->fr_win->w_p_wfh)
--	    old_size = frp2->fr_win->w_height;
-+	/* When 'winfixheight' is set, try to find another frame in the column
-+	 * (as close to the closed frame as possible) to distribute the height
-+	 * to. */
-+	if (frp2->fr_win != NULL && frp2->fr_win->w_p_wfh)
-+	{
-+	    frp = frp_close->fr_prev;
-+	    frp3 = frp_close->fr_next;
-+	    while (frp != NULL || frp3 != NULL)
-+	    {
-+		if (frp != NULL)
-+		{
-+		    if (frp->fr_win != NULL && !frp->fr_win->w_p_wfh)
-+		    {
-+			frp2 = frp;
-+			wp = frp->fr_win;
-+			break;
-+		    }
-+		    frp = frp->fr_prev;
-+		}
-+		if (frp3 != NULL)
-+		{
-+		    if (frp3->fr_win != NULL && !frp3->fr_win->w_p_wfh)
-+		    {
-+			frp2 = frp3;
-+			wp = frp3->fr_win;
-+			break;
-+		    }
-+		    frp3 = frp3->fr_next;
-+		}
-+	    }
-+	}
- 	frame_new_height(frp2, frp2->fr_height + frp_close->fr_height,
- 			    frp2 == frp_close->fr_next ? TRUE : FALSE, FALSE);
--	if (old_size != 0)
--	    win_setheight_win(old_size, frp2->fr_win);
- #ifdef FEAT_VERTSPLIT
- 	*dirp = 'v';
-     }
-     else
-     {
--	/* When 'winfixwidth' is set, remember its old size and restore
--	 * it later (it's a simplistic solution...).  Don't do this if the
--	 * window will occupy the full width of the screen. */
--	if (frp2->fr_win != NULL
--		&& (frp2->fr_next != NULL || frp2->fr_prev != NULL)
--		&& frp2->fr_win->w_p_wfw)
--	    old_size = frp2->fr_win->w_width;
-+	/* When 'winfixwidth' is set, try to find another frame in the column
-+	 * (as close to the closed frame as possible) to distribute the width
-+	 * to. */
-+	if (frp2->fr_win != NULL && frp2->fr_win->w_p_wfw)
-+	{
-+	    frp = frp_close->fr_prev;
-+	    frp3 = frp_close->fr_next;
-+	    while (frp != NULL || frp3 != NULL)
-+	    {
-+		if (frp != NULL)
-+		{
-+		    if (frp->fr_win != NULL && !frp->fr_win->w_p_wfw)
-+		    {
-+			frp2 = frp;
-+			wp = frp->fr_win;
-+			break;
-+		    }
-+		    frp = frp->fr_prev;
-+		}
-+		if (frp3 != NULL)
-+		{
-+		    if (frp3->fr_win != NULL && !frp3->fr_win->w_p_wfw)
-+		    {
-+			frp2 = frp3;
-+			wp = frp3->fr_win;
-+			break;
-+		    }
-+		    frp3 = frp3->fr_next;
-+		}
-+	    }
-+	}
- 	frame_new_width(frp2, frp2->fr_width + frp_close->fr_width,
- 			    frp2 == frp_close->fr_next ? TRUE : FALSE, FALSE);
--	if (old_size != 0)
--	    win_setwidth_win(old_size, frp2->fr_win);
- 	*dirp = 'h';
-     }
- #endif
-@@ -3334,7 +3415,7 @@
-      * Don't execute autocommands while creating the tab pages.  Must do that
-      * when putting the buffers in the windows.
-      */
--    ++autocmd_block;
-+    block_autocmds();
- #endif
- 
-     for (todo = count - 1; todo > 0; --todo)
-@@ -3342,7 +3423,7 @@
- 	    break;
- 
- #ifdef FEAT_AUTOCMD
--    --autocmd_block;
-+    unblock_autocmds();
- #endif
- 
-     /* return actual number of tab pages */
-@@ -4081,7 +4162,7 @@
- 	/* Don't execute autocommands while the window is not properly
- 	 * initialized yet.  gui_create_scrollbar() may trigger a FocusGained
- 	 * event. */
--	++autocmd_block;
-+	block_autocmds();
- #endif
- 	/*
- 	 * link the window in the window list
-@@ -4126,7 +4207,11 @@
- 	foldInitWin(newwin);
- #endif
- #ifdef FEAT_AUTOCMD
--	--autocmd_block;
-+	unblock_autocmds();
-+#endif
-+#ifdef FEAT_SEARCH_EXTRA
-+	newwin->w_match_head = NULL;
-+	newwin->w_next_match_id = 4;
- #endif
-     }
-     return newwin;
-@@ -4147,7 +4232,7 @@
- #ifdef FEAT_AUTOCMD
-     /* Don't execute autocommands while the window is halfway being deleted.
-      * gui_mch_destroy_scrollbar() may trigger a FocusGained event. */
--    ++autocmd_block;
-+    block_autocmds();
- #endif
- 
- #ifdef FEAT_MZSCHEME
-@@ -4185,11 +4270,11 @@
- 	vim_free(wp->w_tagstack[i].tagname);
- 
-     vim_free(wp->w_localdir);
-+
- #ifdef FEAT_SEARCH_EXTRA
--    vim_free(wp->w_match[0].regprog);
--    vim_free(wp->w_match[1].regprog);
--    vim_free(wp->w_match[2].regprog);
-+    clear_matches(wp);
- #endif
-+
- #ifdef FEAT_JUMPLIST
-     free_jumplist(wp);
- #endif
-@@ -4210,7 +4295,7 @@
-     vim_free(wp);
- 
- #ifdef FEAT_AUTOCMD
--    --autocmd_block;
-+    unblock_autocmds();
- #endif
- }
- 
-@@ -5438,6 +5523,7 @@
- 		{
- 		    EMSG(_(e_noroom));
- 		    p_ch = old_p_ch;
-+		    curtab->tp_ch_used = p_ch;
- 		    cmdline_row = Rows - p_ch;
- 		    break;
- 		}
-@@ -6174,3 +6260,175 @@
-     return FALSE;
- }
- #endif
-+
-+#if defined(FEAT_SEARCH_EXTRA) || defined(PROTO)
-+/*
-+ * Add match to the match list of window 'wp'.  The pattern 'pat' will be
-+ * highligted with the group 'grp' with priority 'prio'.
-+ * Optionally, a desired ID 'id' can be specified (greater than or equal to 1).
-+ * If no particular ID is desired, -1 must be specified for 'id'.
-+ * Return ID of added match, -1 on failure.
-+ */
-+    int
-+match_add(wp, grp, pat, prio, id)
-+    win_T	*wp;
-+    char_u	*grp;
-+    char_u	*pat;
-+    int		prio;
-+    int		id;
-+{
-+    matchitem_T *cur;
-+    matchitem_T *prev;
-+    matchitem_T *m;
-+    int		hlg_id;
-+    regprog_T	*regprog;
-+
-+    if (*grp == NUL || *pat == NUL)
-+	return -1;
-+    if (id < -1 || id == 0)
-+    {
-+	EMSGN("E799: Invalid ID: %ld (must be greater than or equal to 1)", id);
-+	return -1;
-+    }
-+    if (id != -1)
-+    {
-+	cur = wp->w_match_head;
-+	while (cur != NULL)
-+	{
-+	    if (cur->id == id)
-+	    {
-+		EMSGN("E801: ID already taken: %ld", id);
-+		return -1;
-+	    }
-+	    cur = cur->next;
-+	}
-+    }
-+    if ((hlg_id = syn_namen2id(grp, STRLEN(grp))) == 0)
-+    {
-+	EMSG2(_(e_nogroup), grp);
-+	return -1;
-+    }
-+    if ((regprog = vim_regcomp(pat, RE_MAGIC)) == NULL)
-+    {
-+	EMSG2(_(e_invarg2), pat);
-+	return -1;
-+    }
-+
-+    /* Find available match ID. */
-+    while (id == -1)
-+    {
-+	cur = wp->w_match_head;
-+	while (cur != NULL && cur->id != wp->w_next_match_id)
-+	    cur = cur->next;
-+	if (cur == NULL)
-+	    id = wp->w_next_match_id;
-+	wp->w_next_match_id++;
-+    }
-+
-+    /* Build new match. */
-+    m = (matchitem_T *)alloc(sizeof(matchitem_T));
-+    m->id = id;
-+    m->priority = prio;
-+    m->pattern = vim_strsave(pat);
-+    m->hlg_id = hlg_id;
-+    m->match.regprog = regprog;
-+    m->match.rmm_ic = FALSE;
-+    m->match.rmm_maxcol = 0;
-+
-+    /* Insert new match.  The match list is in ascending order with regard to
-+     * the match priorities. */
-+    cur = wp->w_match_head;
-+    prev = cur;
-+    while (cur != NULL && prio >= cur->priority)
-+    {
-+	prev = cur;
-+	cur = cur->next;
-+    }
-+    if (cur == prev)
-+	wp->w_match_head = m;
-+    else
-+	prev->next = m;
-+    m->next = cur;
-+
-+    redraw_later(SOME_VALID);
-+    return id;
-+}
-+
-+/*
-+ * Delete match with ID 'id' in the match list of window 'wp'.
-+ * Print error messages if 'perr' is TRUE.
-+ */
-+    int
-+match_delete(wp, id, perr)
-+    win_T	*wp;
-+    int		id;
-+    int		perr;
-+{
-+    matchitem_T *cur = wp->w_match_head;
-+    matchitem_T *prev = cur;
-+
-+    if (id < 1)
-+    {
-+	if (perr == TRUE)
-+	    EMSGN("E802: Invalid ID: %ld (must be greater than or equal to 1)",
-+									  id);
-+	return -1;
-+    }
-+    while (cur != NULL && cur->id != id)
-+    {
-+	prev = cur;
-+	cur = cur->next;
-+    }
-+    if (cur == NULL)
-+    {
-+	if (perr == TRUE)
-+	    EMSGN("E803: ID not found: %ld", id);
-+	return -1;
-+    }
-+    if (cur == prev)
-+	wp->w_match_head = cur->next;
-+    else
-+	prev->next = cur->next;
-+    vim_free(cur->match.regprog);
-+    vim_free(cur->pattern);
-+    vim_free(cur);
-+    redraw_later(SOME_VALID);
-+    return 0;
-+}
-+
-+/*
-+ * Delete all matches in the match list of window 'wp'.
-+ */
-+    void
-+clear_matches(wp)
-+    win_T	*wp;
-+{
-+    matchitem_T *m;
-+
-+    while (wp->w_match_head != NULL)
-+    {
-+	m = wp->w_match_head->next;
-+	vim_free(wp->w_match_head->match.regprog);
-+	vim_free(wp->w_match_head->pattern);
-+	vim_free(wp->w_match_head);
-+	wp->w_match_head = m;
-+    }
-+    redraw_later(SOME_VALID);
-+}
-+
-+/*
-+ * Get match from ID 'id' in window 'wp'.
-+ * Return NULL if match not found.
-+ */
-+    matchitem_T *
-+get_match(wp, id)
-+    win_T	*wp;
-+    int		id;
-+{
-+    matchitem_T *cur = wp->w_match_head;
-+
-+    while (cur != NULL && cur->id != id)
-+	cur = cur->next;
-+    return cur;
-+}
-+#endif
-diff -Naur vim71.orig/src/xxd/xxd.c vim71/src/xxd/xxd.c
---- vim71.orig/src/xxd/xxd.c	2007-05-07 15:41:57.000000000 -0400
-+++ vim71/src/xxd/xxd.c	2007-12-20 23:59:57.000000000 -0500
-@@ -212,7 +212,7 @@
- 
- #define TRY_SEEK	/* attempt to use lseek, or skip forward by reading */
- #define COLS 256	/* change here, if you ever need more columns */
--#define LLEN (9 + (5*COLS-1)/2 + 2 + COLS)
-+#define LLEN (11 + (9*COLS-1)/1 + COLS + 2)
- 
- char hexxa[] = "0123456789abcdef0123456789ABCDEF", *hexx = hexxa;
- 
-@@ -590,7 +590,8 @@
-       default:			octspergrp = 0; break;
-       }
- 
--  if (cols < 1 || (!hextype && (cols > COLS)))
-+  if (cols < 1 || ((hextype == HEX_NORMAL || hextype == HEX_BITS)
-+							    && (cols > COLS)))
-     {
-       fprintf(stderr, "%s: invalid number of columns (max. %d).\n", pname, COLS);
-       exit(1);
-@@ -750,6 +751,7 @@
- 	}
-       if (ebcdic)
- 	e = (e < 64) ? '.' : etoa64[e-64];
-+      /* When changing this update definition of LLEN above. */
-       l[11 + (grplen * cols - 1)/octspergrp + p] =
- #ifdef __MVS__
- 	  (e >= 64)
Index: tches/yaboot-1.3.13-fix-1.patch
===================================================================
--- patches/yaboot-1.3.13-fix-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,21 +1,0 @@
-Submitted By: Jeremy Huntwork <jhuntwork@linuxfromscratch.org>
-Date: 2005-03-23
-Initial Package Version: 1.3.13
-Upstream Status: Applied
-Origin: Jeremy Huntwork
-Description: Fixes Compile Error.
-
-diff -Naur yaboot-1.3.13.orig/lib/strstr.c yaboot-1.3.13/lib/strstr.c
---- yaboot-1.3.13.orig/lib/strstr.c	2001-09-20 09:15:31.000000000 -0400
-+++ yaboot-1.3.13/lib/strstr.c	2005-02-20 22:03:10.215796824 -0500
-@@ -76,7 +76,9 @@
- 	      a = *++haystack;
- 	      if (a == '\0')
- 		goto ret0;
--shloop:	    }
-+shloop:	
-+		a = a;
-+	}
-           while (a != b);
- 
- jin:	  a = *++haystack;
Index: tches/yaboot-1.3.13-ofpath_path_prefix-1.patch
===================================================================
--- patches/yaboot-1.3.13-ofpath_path_prefix-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,19 +1,0 @@
-Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
-Date: 2006-05-16
-Initial Package Version: 1.3.13
-Upstream Status: Not submitted, CLFS-specific
-Origin: copied from the other scripts in ybin directory
-Description: Allows ofpath to use PATH_PREFIX like the other scripts.
-
---- yaboot-1.3.13/ybin/ofpath.orig	2006-05-16 22:32:26.000000000 +0100
-+++ yaboot-1.3.13/ybin/ofpath	2006-05-16 22:33:13.000000000 +0100
-@@ -26,6 +26,9 @@
- ###############################################################################
- 
- PATH="/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin"
-+if [ -n "$PATH_PREFIX" ] ; then
-+    PATH="${PATH}:${PATH_PREFIX}/sbin:${PATH_PREFIX}/bin:${PATH_PREFIX}/usr/sbin:${PATH_PREFIX}/usr/bin:${PATH_PREFIX}/usr/local/sbin:${PATH_PREFIX}/usr/local/bin"
-+fi
- PRG="${0##*/}"
- VERSION=1.0.7
- DEBUG=0
Index: tches/yaboot-1.3.13-ofpath_sata-1.patch
===================================================================
--- patches/yaboot-1.3.13-ofpath_sata-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,25 +1,0 @@
-Submitted By: Ken Moffat <ken at linuxfromscratch.org>
-Date: 2005-11-29
-Initial Package Version: 1.3.13
-Upstream Status: Submitted and merged
-Origin: fedora
-Description: Fixes ofpath (needed for initial install) for SATA disks,
-following the flattening of /proc/device-tree circa 2.6.12.
-
---- yaboot-1.3.12/ybin/ofpath.nobootx	2004-04-17 20:22:00.000000000 -0400
-+++ yaboot-1.3.12/ybin/ofpath	2005-08-04 07:47:19.000000000 -0400
-@@ -425,14 +425,6 @@
- {
-     case "$DEVNODE" in
- 	sd*)
--	    if ls -l /proc/device-tree | grep -q ^lr ; then
--		true
--	    else
--		echo 1>&2 "$PRG: /proc/device-tree is broken.  Do not use BootX to boot, use yaboot."
--		echo 1>&2 "$PRG: The yaboot HOWTO can be found here: http://www.alaska.net/~erbenson/doc"
--		return 1
--	    fi
--
- 	    ## use common scsiinfo function to get info we need.
- 	    scsiinfo || return 1
- 
Index: patches/zlib-1.2.2-add_DESTDIR-1.patch
===================================================================
--- patches/zlib-1.2.2-add_DESTDIR-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ patches/zlib-1.2.2-add_DESTDIR-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,60 @@
+--- zlib-1.2.2/Makefile.in-ORIG	2005-04-09 16:58:51.000000000 +1000
++++ zlib-1.2.2/Makefile.in	2005-04-09 17:04:08.000000000 +1000
+@@ -23,7 +23,7 @@
+ #CFLAGS=-g -DDEBUG
+ #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
+ #           -Wstrict-prototypes -Wmissing-prototypes
+-
++DESTDIR=
+ LDFLAGS=libz.a
+ LDSHARED=$(CC)
+ CPP=$(CC) -E
+@@ -90,33 +90,33 @@
+ 	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
+ 
+ install: $(LIBS)
+-	-@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi
+-	-@if [ ! -d $(includedir)  ]; then mkdir -p $(includedir); fi
+-	-@if [ ! -d $(libdir)      ]; then mkdir -p $(libdir); fi
+-	-@if [ ! -d $(man3dir)     ]; then mkdir -p $(man3dir); fi
+-	cp zlib.h zconf.h $(includedir)
+-	chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h
+-	cp $(LIBS) $(libdir)
+-	cd $(libdir); chmod 755 $(LIBS)
+-	-@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
+-	cd $(libdir); if test -f $(SHAREDLIBV); then \
++	-@if [ ! -d $(DESTDIR)$(exec_prefix) ]; then mkdir -p $(DESTDIR)$(exec_prefix); fi
++	-@if [ ! -d $(DESTDIR)$(includedir)  ]; then mkdir -p $(DESTDIR)$(includedir); fi
++	-@if [ ! -d $(DESTDIR)$(libdir)      ]; then mkdir -p $(DESTDIR)$(libdir); fi
++	-@if [ ! -d $(DESTDIR)$(man3dir)     ]; then mkdir -p $(DESTDIR)$(man3dir); fi
++	cp zlib.h zconf.h $(DESTDIR)$(includedir)
++	chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
++	cp $(LIBS) $(DESTDIR)$(libdir)
++	cd $(DESTDIR)$(libdir); chmod 755 $(LIBS)
++	-@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
++	cd $(DESTDIR)$(libdir); if test -f $(SHAREDLIBV); then \
+ 	  rm -f $(SHAREDLIB) $(SHAREDLIBM); \
+ 	  ln -s $(SHAREDLIBV) $(SHAREDLIB); \
+ 	  ln -s $(SHAREDLIBV) $(SHAREDLIBM); \
+ 	  (ldconfig || true)  >/dev/null 2>&1; \
+ 	fi
+-	cp zlib.3 $(man3dir)
+-	chmod 644 $(man3dir)/zlib.3
++	cp zlib.3 $(DESTDIR)$(man3dir)
++	chmod 644 $(DESTDIR)$(man3dir)/zlib.3
+ # The ranlib in install is needed on NeXTSTEP which checks file times
+ # ldconfig is for Linux
+ 
+ uninstall:
+-	cd $(includedir); \
+-	cd $(libdir); rm -f libz.a; \
++	cd $(DESTDIR)$(includedir); \
++	cd $(DESTDIR)$(libdir); rm -f libz.a; \
+ 	if test -f $(SHAREDLIBV); then \
+ 	  rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \
+ 	fi
+-	cd $(man3dir); rm -f zlib.3
++	cd $(DESTDIR)$(man3dir); rm -f zlib.3
+ 
+ mostlyclean: clean
+ clean:
Index: tches/zlib-1.2.3-fPIC-1.patch
===================================================================
--- patches/zlib-1.2.3-fPIC-1.patch	(revision dc4f9f27f197a5f4724720810a848a94d199cafb)
+++ 	(revision )
@@ -1,93 +1,0 @@
-Submitted By: Tushar Teredesai <tushar@linuxfromscratch.org>
-Date: 2005-06-14
-Initial Package Version: 1.2.2
-Origin: Gentoo ebuild?
-Upstream Status: Not submitted
-Description:
- 1. Build shared and static lib in one pass
- 2. Always add -fPIC when building shared lib, don't expect the user to set it.
-
-To build the shared and static library:
-	./configure --prefix=<prefix> --shared &&
-	make &&
-	make install
-Remove the --shared if you don't want the shared lib.
-
-diff -Naur zlib-1.2.2.orig/configure zlib-1.2.2/configure
---- zlib-1.2.2.orig/configure	2004-09-07 00:50:06.000000000 -0500
-+++ zlib-1.2.2/configure	2005-02-05 01:34:08.553292416 -0600
-@@ -73,7 +73,11 @@
- 
- if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) 2>/dev/null; then
-   CC="$cc"
--  SFLAGS=${CFLAGS-"-fPIC -O3"}
-+  #SFLAGS=${CFLAGS-"-fPIC -O3"}
-+  # the above is horribly wrong on a few archs where -fPIC should ALWAYS be
-+  # used in the creation of shared libraries. without the following, the
-+  # shared lib test will sometimes fail even when shared libs -can- be created.
-+  SFLAGS="${CFLAGS-"-O3"} -fPIC"
-   CFLAGS="$cflags"
-   case `(uname -s || echo unknown) 2>/dev/null` in
-   Linux | linux | GNU | GNU/*) LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1"};;
-@@ -158,7 +162,7 @@
-   if test "`($CC -c $SFLAGS $test.c) 2>&1`" = "" &&
-      test "`($LDSHARED -o $test$shared_ext $test.o) 2>&1`" = ""; then
-     CFLAGS="$SFLAGS"
--    LIBS="$SHAREDLIBV"
-+    LIBS="$LIBS $SHAREDLIBV"
-     echo Building shared library $SHAREDLIBV with $CC.
-   elif test -z "$old_cc" -a -z "$old_cflags"; then
-     echo No shared library support.
-diff -Naur zlib-1.2.2.orig/Makefile.in zlib-1.2.2/Makefile.in
---- zlib-1.2.2.orig/Makefile.in	2004-09-15 09:27:20.000000000 -0500
-+++ zlib-1.2.2/Makefile.in	2005-02-05 01:33:49.703158072 -0600
-@@ -49,6 +49,8 @@
- OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
-        zutil.o inflate.o infback.o inftrees.o inffast.o
- 
-+PIC_OBJS = $(OBJS:%.o=%.lo)
-+
- OBJA =
- # to use the asm code: make OBJA=match.o
- 
-@@ -77,8 +79,11 @@
- 	mv _match.o match.o
- 	rm -f _match.s
- 
--$(SHAREDLIBV): $(OBJS)
--	$(LDSHARED) -o $@ $(OBJS)
-+%.lo: %.c
-+	$(CC) $(CFLAGS) -DPIC -fPIC -c $< -o $@
-+
-+$(SHAREDLIBV): $(PIC_OBJS)
-+	$(LDSHARED) -o $@ $(PIC_OBJS) -lc
- 	rm -f $(SHAREDLIB) $(SHAREDLIBM)
- 	ln -s $@ $(SHAREDLIB)
- 	ln -s $@ $(SHAREDLIBM)
-@@ -89,13 +94,10 @@
- minigzip$(EXE): minigzip.o $(LIBS)
- 	$(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
- 
--install: $(LIBS)
-+install-libs: $(LIBS)
- 	-@if [ ! -d $(exec_prefix) ]; then mkdir -p $(exec_prefix); fi
--	-@if [ ! -d $(includedir)  ]; then mkdir -p $(includedir); fi
- 	-@if [ ! -d $(libdir)      ]; then mkdir -p $(libdir); fi
- 	-@if [ ! -d $(man3dir)     ]; then mkdir -p $(man3dir); fi
--	cp zlib.h zconf.h $(includedir)
--	chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h
- 	cp $(LIBS) $(libdir)
- 	cd $(libdir); chmod 755 $(LIBS)
- 	-@(cd $(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
-@@ -110,6 +112,11 @@
- # The ranlib in install is needed on NeXTSTEP which checks file times
- # ldconfig is for Linux
- 
-+install: install-libs
-+	-@if [ ! -d $(includedir)  ]; then mkdir $(includedir); fi
-+	cp zlib.h zconf.h $(includedir)
-+	chmod 644 $(includedir)/zlib.h $(includedir)/zconf.h
-+
- uninstall:
- 	cd $(includedir); \
- 	cd $(libdir); rm -f libz.a; \
Index: scripts/blfs-packages
===================================================================
--- scripts/blfs-packages	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-packages	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+plfs-configs/blfs-packages-20050419
Index: scripts/blfs-scripts/blfs-bdb-32.sh
===================================================================
--- scripts/blfs-scripts/blfs-bdb-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-bdb-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-bdb.sh
Index: scripts/blfs-scripts/blfs-bdb-64.sh
===================================================================
--- scripts/blfs-scripts/blfs-bdb-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-bdb-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-bdb.sh
Index: scripts/blfs-scripts/blfs-bdb.sh
===================================================================
--- scripts/blfs-scripts/blfs-bdb.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-bdb.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,66 @@
+#!/bin/bash
+#
+# Berkeley DB
+# (script needs to be checked)
+#
+cd ${SRC}
+LOG=bdb-blfs.log
+
+# Test if the 64 script has been called.
+# This should only really get called during bi-arch builds
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball db-${BDB_VER} &&
+
+# Patching goes here
+cd ${PKGDIR}
+
+case ${BDB_VER} in
+   4.2.52 )
+      #apply_patch patch.4.2.52.1 -Np0
+      #apply_patch patch.4.2.52.2 -Np0
+      patch -Np0 -i ${PATCHES}/patch.4.2.52.1
+      patch -Np0 -i ${PATCHES}/patch.4.2.52.2 -Np0
+
+      # Issue with older libtool stuff determining if ld used is GNU ld
+      # Breaks when linking with g++ as non-gnu ld case for linking does not 
+      # pass -nostdlib .
+      # see 'Re: libtool update - the "duplicate _init and _fini" problem' 
+      # http://lists.gnu.org/archive/html/libtool-patches/2003-06/msg00056.html
+      apply_patch db-4.2.52-libtool_fixes
+   ;;
+   4.3.27 )
+      patch -Np0 -i ${PATCHES}/patch.4.3.27.1
+      patch -Np0 -i ${PATCHES}/patch.4.3.27.2
+      patch -Np0 -i ${PATCHES}/patch.4.3.27.3
+   ;;
+esac
+
+cd ${SRC}/${PKGDIR}/build_unix
+
+max_log_init BDB ${BDB_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+../dist/configure --prefix=/usr ${extra_conf} \
+   --enable-compat185 --enable-cxx \
+   --with-tcl=/usr/${libdirname} --enable-tcl \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make LIBSO_LIBS="-lpthread" LIBXSO_LIBS="-lpthread" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make docdir=/usr/share/doc/${PKGDIR} install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/blfs-scripts/blfs-cracklib-32.sh
===================================================================
--- scripts/blfs-scripts/blfs-cracklib-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-cracklib-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-cracklib.sh
Index: scripts/blfs-scripts/blfs-cracklib-64.sh
===================================================================
--- scripts/blfs-scripts/blfs-cracklib-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-cracklib-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-cracklib.sh
Index: scripts/blfs-scripts/blfs-cracklib.sh
===================================================================
--- scripts/blfs-scripts/blfs-cracklib.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-cracklib.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+### cracklib ###
+
+cd ${SRC}
+LOG=cracklib-blfs.log
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+
+# Install the wordlist
+WORDLIST=cracklib_wordlist
+install -d -m755 /usr/share/dict
+install -m644 ${CONFIGS}/cracklib/${WORDLIST} /usr/share/dict
+ln -sf ${WORDLIST} /usr/share/dict/words
+echo `hostname` >> /usr/share/dict/extra.words
+
+unpack_tarball cracklib,${CRACKLIB_VER}
+cd ${PKGDIR}
+apply_patch cracklib,2.7-blfs-1
+
+if [ ! "${libdirname}" = "lib" ]; then
+   sed -i -e "s@/lib@/${libdirname}@g" Makefile
+   sed -i -e "s@/lib@/${libdirname}@g" cracklib/Makefile
+fi
+
+max_log_init cracklib ${CRACKLIB_VER} "blfs (shared)" ${BUILDLOGS} ${LOG}
+make CC="${CC-gcc} ${ARCH_CFLAGS}" \
+     LD="${LD-ld} ${ARCH_LDFLAGS}" \
+     DICTPATH=/${libdirname}/cracklib_dict all \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make CC="${CC-gcc} ${ARCH_CFLAGS}" \
+     LD="${LD-ld} ${ARCH_LDFLAGS}" \
+     DICTPATH=/${libdirname}/cracklib_dict install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/blfs-scripts/blfs-cyrus-sasl-32.sh
===================================================================
--- scripts/blfs-scripts/blfs-cyrus-sasl-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-cyrus-sasl-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-cyrus-sasl.sh
Index: scripts/blfs-scripts/blfs-cyrus-sasl-64.sh
===================================================================
--- scripts/blfs-scripts/blfs-cyrus-sasl-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-cyrus-sasl-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-cyrus-sasl.sh
Index: scripts/blfs-scripts/blfs-cyrus-sasl.sh
===================================================================
--- scripts/blfs-scripts/blfs-cyrus-sasl.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-cyrus-sasl.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,64 @@
+#!/bin/sh
+#
+# Cyrus-SASL
+#
+cd ${SRC}
+LOG=cyrus-sasl-blfs.log
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+
+unpack_tarball cyrus-sasl-${CYRUS_SASL_VER} &&
+cd ${PKGDIR}
+
+# Apply patch to adjust the install location of the plugins so that
+# it installs under ${libdir}/sasl2, instead of the default /usr/lib/sasl2
+# This is so bi-arch builds stay neat
+apply_patch  cyrus-sasl-2.1.20-set_plugindir_from_libdir
+
+# Fix brokenness with gcc4
+apply_patch cyrus-sasl-2.1.20-gcc4_fixes
+
+max_log_init Cyrus-SASL ${CYRUS_SASL_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+#CC="${CC-gcc} ${ARCH_CFLAGS}" \
+#./configure --prefix=/usr --sysconfdir=/etc ${extra_conf} \
+#   --with-dbpath=/var/lib/sasl/sasldb2 --with-saslauthd=/var/run \
+#   >> ${LOGFILE} 2>&1 &&
+#echo " o Configure OK" &&
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr --sysconfdir=/etc --libdir=/usr/${libdirname} \
+   --with-dbpath=/var/lib/sasl2/sasldb2 --with-saslauthd=/var/lib/sasl2 \
+   --with-dblib=berkeley --with-openssl \
+   --mandir=/usr/share/man --infodir=/usr/share/info \
+   --enable-login \
+   --enable-plain \
+   --enable-ntlm \
+   --enable-gssapi \
+   --disable-krb4 \
+   --disable-otp \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+#   --with-plugindir=/usr/lib/sasl2 \
+
+# Doesn't like to be built parallel
+min_log_init ${BUILDLOGS} &&
+make LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+install -m644 -oroot -groot saslauthd/saslauthd.mdoc \
+    /usr/share/man/man8/saslauthd.8 &&
+install -d -m755 /usr/share/doc/sasl &&
+install -m644 -oroot -groot doc/{*.{html,txt,fig},ONEWS,TODO} \
+    /usr/share/doc/sasl &&
+install -m644 -oroot -groot saslauthd/LDAP_SASLAUTHD \
+    /usr/share/doc/sasl &&
+install -d -m755 /var/lib/sasl2
+
Index: scripts/blfs-scripts/blfs-expat-32.sh
===================================================================
--- scripts/blfs-scripts/blfs-expat-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-expat-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-expat.sh
Index: scripts/blfs-scripts/blfs-expat-64.sh
===================================================================
--- scripts/blfs-scripts/blfs-expat-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-expat-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-expat.sh
Index: scripts/blfs-scripts/blfs-expat.sh
===================================================================
--- scripts/blfs-scripts/blfs-expat.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-expat.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# Expat
+# (script needs to be checked)
+#
+cd ${SRC}
+LOG=expat-blfs.log
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball expat-${EXPAT_VER} &&
+
+cd ${PKGDIR}
+
+max_log_init Expat ${EXPAT_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/blfs-scripts/blfs-fontconfig-32.sh
===================================================================
--- scripts/blfs-scripts/blfs-fontconfig-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-fontconfig-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-fontconfig.sh
Index: scripts/blfs-scripts/blfs-fontconfig-64.sh
===================================================================
--- scripts/blfs-scripts/blfs-fontconfig-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-fontconfig-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-fontconfig.sh
Index: scripts/blfs-scripts/blfs-fontconfig.sh
===================================================================
--- scripts/blfs-scripts/blfs-fontconfig.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-fontconfig.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,44 @@
+#!/bin/sh
+#
+# Fontconfig
+#
+cd ${SRC}
+LOG=fontconfig-blfs.log
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball fontconfig-${FONTCONFIG_VER} &&
+
+cd ${PKGDIR}
+
+max_log_init Fontconfig ${FONTCONFIG_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   --sysconfdir=/etc \
+   --disable-docs \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+# HACK: this is most likely NOT needed...
+if [ "Y" = "${MULTIARCH}" ]; then
+   use_wrapper /usr/bin/fc-cache /usr/bin/fc-list 
+fi
+
Index: scripts/blfs-scripts/blfs-freetype2-32.sh
===================================================================
--- scripts/blfs-scripts/blfs-freetype2-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-freetype2-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-freetype2.sh
Index: scripts/blfs-scripts/blfs-freetype2-64.sh
===================================================================
--- scripts/blfs-scripts/blfs-freetype2-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-freetype2-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-freetype2.sh
Index: scripts/blfs-scripts/blfs-freetype2.sh
===================================================================
--- scripts/blfs-scripts/blfs-freetype2.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-freetype2.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,64 @@
+#!/bin/sh
+#
+# Freetype2
+#
+cd ${SRC}
+LOG=freetype2-blfs.log
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball freetype-${FREETYPE2_VER} &&
+
+cd ${PKGDIR}
+
+case ${FREETYPE2_VER} in
+   2.1.9 )
+      apply_patch freetype-2.1.9-bytecode_interpreter-1
+   ;;
+   * )
+      echo "WARNING: freetype-2.1.9-bytecode_interpreter-1 patch not applied"
+      echo "         Please check if freetype-${FREETYPE2VER} requires this or not,"
+      echo "         if so please update this script and send patches to"
+      echo "         either ryan@pha.com.au or ryan@linuxfromscratch.org"
+   ;;
+esac
+
+# TODO: May need to supply -fno-strict-aliasing for some architectures
+#       Investigate
+
+# TODO: should hack freetype-config during bi-arch so we dont hardcoe rpaths
+#       in unnecessarily
+
+max_log_init Freetype2 ${FREETYPE2_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+# Here is a hack, if we are biarch, move freetype-config 
+# to freetype-config-32 or 64 and provide a symlink.
+# This symlink will have to be adjusted for packages that use
+# freetype-config so they get the right settings.
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   use_wrapper /usr/bin/freetype-config
+   create_stub_hdrs /usr/include/freetype2/freetype/config/ftconfig.h
+fi
Index: scripts/blfs-scripts/blfs-libpng-32.sh
===================================================================
--- scripts/blfs-scripts/blfs-libpng-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-libpng-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-libpng.sh
Index: scripts/blfs-scripts/blfs-libpng-64.sh
===================================================================
--- scripts/blfs-scripts/blfs-libpng-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-libpng-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-libpng.sh
Index: scripts/blfs-scripts/blfs-libpng.sh
===================================================================
--- scripts/blfs-scripts/blfs-libpng.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-libpng.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+### libpng ###
+
+cd ${SRC}
+LOG=libpng-blfs.log
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+
+unpack_tarball libpng-${LIBPNG_VER}
+cd ${PKGDIR}
+
+case ${LIBPNG_VER} in
+   1.2.7 )
+      apply_patch libpng-1.2.7-link_to_proper_libs-1
+   ;;
+   1.2.8 )
+      apply_patch libpng-1.2.8-link_to_proper_libs-1
+   ;;
+esac
+apply_patch libpng-1.2.7-fix_pc_for_biarch
+
+max_log_init libpng ${LIBPNG_VER} "blfs (shared)" ${BUILDLOGS} ${LOG}
+make CC="${CC-gcc} ${ARCH_CFLAGS}" \
+   prefix=/usr LIBPATH=/usr/${libdirname} \
+   ZLIBINC=/usr/include ZLIBLIB=/usr/${libdirname} \
+   -f scripts/makefile.linux \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make CC="${CC-gcc} ${ARCH_CFLAGS}" \
+   prefix=/usr LIBPATH=/usr/${libdirname} install \
+   -f scripts/makefile.linux \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   use_wrapper /usr/bin/libpng12-config
+   # Added as libpng-config is a symlink to libpng12-config (which uses the wrapper)
+   # so that the wrapper will find libpng-config-${BUILDENV}
+   ln -sf libpng12-config-${BUILDENV} /usr/bin/libpng-config-${BUILDENV}
+fi
Index: scripts/blfs-scripts/blfs-linux-pam-32.sh
===================================================================
--- scripts/blfs-scripts/blfs-linux-pam-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-linux-pam-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-linux-pam.sh
Index: scripts/blfs-scripts/blfs-linux-pam-64.sh
===================================================================
--- scripts/blfs-scripts/blfs-linux-pam-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-linux-pam-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-linux-pam.sh
Index: scripts/blfs-scripts/blfs-linux-pam.sh
===================================================================
--- scripts/blfs-scripts/blfs-linux-pam.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-linux-pam.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,74 @@
+#!/bin/bash
+
+### Linux-PAM ###
+cd ${SRC}
+
+LOG=linux-pam-blfs.log
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+    extra_conf="--libdir=/${libdirname}"
+fi
+
+unpack_tarball Linux-PAM-${LINUX_PAM_VER}
+cd ${PKGDIR}
+
+apply_patch Linux-PAM-0.77-linkage-3
+autoconf
+
+# Fixes
+sed -i -e "s@^LD\(\|_L\)=.*@& ${ARCH_LDFLAGS}@g" Make.Rules.in
+sed -i -e "s@^\(CC\|CC_STATIC\|LD_D\)=.*@& ${ARCH_CFLAGS} -fPIC@g" Make.Rules.in
+
+max_log_init Linux-PAM ${LINUX_PAM_VER} "native (shared)" ${CONFLOGS} ${LOG}
+./configure --enable-static-libpam --with-mailspool=/var/mail \
+   --enable-read-both-confs --sysconfdir=/etc ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make CC="gcc ${ARCH_CFLAGS} -fPIC" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+mv /${libdirname}/libpam.a /${libdirname}/libpam_misc.a /${libdirname}/libpamc.a \
+   /usr/${libdirname} &&
+
+ln -sf ../../${libdirname}/libpam.so.0.77 /usr/${libdirname}/libpam.so &&
+ln -sf libpam.so.0.77 /${libdirname}/libpam.so.0 &&
+ln -sf ../../${libdirname}/libpam_misc.so.0.77 /usr/${libdirname}/libpam_misc.so &&
+ln -sf libpam_misc.so.0.77 /${libdirname}/libpam_misc.so.0 &&
+ln -sf ../../${libdirname}/libpamc.so.0.77 /usr/${libdirname}/libpamc.so
+ln -sf libpamc.so.0.77 /${libdirname}/libpamc.so.0
+
+# Create some sample pam files
+mkdir /etc/pam.d
+cat > /etc/pam.d/other <<EOF
+# Begin /etc/pam.d/other
+
+auth            required        pam_unix.so     nullok
+account         required        pam_unix.so
+session         required        pam_unix.so
+password        required        pam_unix.so     nullok
+
+# End /etc/pam.d/other
+EOF
+
+cat > /etc/pam.conf <<EOF
+# Begin /etc/pam.conf
+
+other           auth            required        pam_unix.so     nullok
+other           account         required        pam_unix.so
+other           session         required        pam_unix.so
+other           password        required        pam_unix.so     nullok
+
+# End /etc/pam.conf
+EOF
+
Index: scripts/blfs-scripts/blfs-mit-krb5-32.sh
===================================================================
--- scripts/blfs-scripts/blfs-mit-krb5-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-mit-krb5-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-mit-krb5.sh
Index: scripts/blfs-scripts/blfs-mit-krb5-64.sh
===================================================================
--- scripts/blfs-scripts/blfs-mit-krb5-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-mit-krb5-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-mit-krb5.sh
Index: scripts/blfs-scripts/blfs-mit-krb5.sh
===================================================================
--- scripts/blfs-scripts/blfs-mit-krb5.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-mit-krb5.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+### MIT_KRB5 ###
+# deps
+# zlib
+
+cd ${SRC}
+LOG=mit-krb5-blfs.log
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+# This wont work, we will need to unpack the dist .tar file, then
+# unpack the tarball it contains...
+# Assuming we have stored the src tarball from the dist tarball under
+# ${TARBALLS}
+
+unpack_tarball krb5-${MIT_KRB5_VER} &&
+cd ${PKGDIR}/src
+
+# HACK: for x86_64 biarch, 64bit
+echo "ac_cv_lib_resolv_res_search=${ac_cv_lib_resolv_res_search=yes}" \
+  >> config.cache
+extra_conf="${extra_conf} --cache-file=config.cache"
+
+max_log_init MIT-krb5 ${MIT_KRB5_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="gcc ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+./configure \
+   --prefix=/usr --sysconfdir=/etc --localstatedir=/var/lib \
+   --enable-dns --enable-shared \
+   --infodir=/usr/share/info --mandir=/usr/share/man \
+   --with-tcl=/usr/${libdirname} ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+#   --with-system-db --with-system-et --with-system-ss \
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+#min_log_init ${TESTLOGS} &&
+#make test \
+#   >>  ${LOGFILE} 2>&1 &&
+#echo " o Test OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+# TODO: Revisit these symlinks
+test -f /bin/login.shadow ||
+   mv /bin/login /bin/login.shadow
+ln -sf login.shadow /bin/login
+
+cp /usr/sbin/login.krb5 /bin/login.krb5 &&
+mv /usr/bin/ksu /bin 
+
+mv /usr/${libdirname}/libkrb5.so.3* /${libdirname} &&
+ln -sf ../../${libdirname}/libkrb5.so.3 /usr/${libdirname} &&
+ln -sf libkrb5.so.3 /usr/${libdirname}/libkrb5.so
+ 
+mv /usr/${libdirname}/libkrb4.so.2* /${libdirname} &&
+ln -sf ../../${libdirname}/libkrb4.so.2 /usr/${libdirname} &&
+ln -sf libkrb4.so.2 /usr/${libdirname}/libkrb4.so
+ 
+mv /usr/${libdirname}/libdes425.so.3* /${libdirname} &&
+ln -sf ../../${libdirname}/libdes425.so.3 /usr/${libdirname} &&
+ln -sf libdes425.so.3 /usr/${libdirname}/libdes425.so 
+
+mv /usr/${libdirname}/libk5crypto.so.3* /${libdirname} &&
+ln -sf ../../${libdirname}/libk5crypto.so.3 /usr/${libdirname} &&
+ln -sf libk5crypto.so.3 /usr/${libdirname}/libk5crypto.so
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   use_wrapper /usr/bin/krb5-config
+   create_stub_hdrs /usr/include/krb5.h /usr/include/gssapi/gssapi.h
+fi
+
Index: scripts/blfs-scripts/blfs-nfs-utils.sh
===================================================================
--- scripts/blfs-scripts/blfs-nfs-utils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-nfs-utils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+### nfs-utils ###
+
+set_libdirname
+setup_multiarch
+
+cd ${SRC}
+LOG=nfs-utils-blfs.log
+
+unpack_tarball nfs-utils-${NFSUTILS_VER}
+cd ${PKGDIR}
+
+# Unset TARGET env var, it b0rks things here...
+unset TARGET 
+
+max_log_init nfs-utils ${NFSUTILS_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="-O2 ${TGT_CFLAGS}" \
+./configure --prefix=/usr --sysconfdir=/etc \
+   --mandir=/usr/share/man --infodir=/usr/share/info \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" || barf
+
+min_log_init ${BUILDLOGS} &&
+env -i make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+env -i make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Install OK" || barf
+
Index: scripts/blfs-scripts/blfs-nssldap-32.sh
===================================================================
--- scripts/blfs-scripts/blfs-nssldap-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-nssldap-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-nssldap.sh
Index: scripts/blfs-scripts/blfs-nssldap-64.sh
===================================================================
--- scripts/blfs-scripts/blfs-nssldap-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-nssldap-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-nssldap.sh
Index: scripts/blfs-scripts/blfs-nssldap.sh
===================================================================
--- scripts/blfs-scripts/blfs-nssldap.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-nssldap.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,39 @@
+#!/bin/sh
+#
+# NSS LDAP
+#
+cd ${SRC}
+LOG=nssldap-blfs.log
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/${libdirname}"
+fi
+
+# hmmm, tarball has no version...
+unpack_tarball nss_ldap &&
+cd ${PKGDIR}
+
+max_log_init nss_ldap ${NSSLDAP_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+ ./configure --enable-threads ${extra_conf} \
+   --enable-rfc2307bis \
+   --enable-schema-mapping \
+   --enable-paged-results \
+   --enable-configurable-krb5ccname-gssapi \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/blfs-scripts/blfs-ntp.sh
===================================================================
--- scripts/blfs-scripts/blfs-ntp.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-ntp.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,33 @@
+#!/bin/sh
+#
+# NTP
+#
+cd ${SRC}
+LOG=ntp-blfs.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball ntp-${NTP_VER} &&
+cd ${PKGDIR}
+
+# Fix issues when compiling with gcc4 (shouldn't hurt for gcc versions)
+apply_patch ntp-4.2.0-gcc4
+
+max_log_init ntp ${NTP_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+./configure --prefix=/usr --bindir=/usr/sbin --sysconfdir=/etc \
+   --with-crypto \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/blfs-scripts/blfs-openldap-32.sh
===================================================================
--- scripts/blfs-scripts/blfs-openldap-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-openldap-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-openldap.sh
Index: scripts/blfs-scripts/blfs-openldap-64.sh
===================================================================
--- scripts/blfs-scripts/blfs-openldap-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-openldap-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-openldap.sh
Index: scripts/blfs-scripts/blfs-openldap.sh
===================================================================
--- scripts/blfs-scripts/blfs-openldap.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-openldap.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,72 @@
+#!/bin/sh
+
+### OPENLDAP ###
+# deps
+# zlib
+# krb5 (optional)
+# TODO: for krb5 support some hackery is required
+
+cd ${SRC}
+LOG=openldap-blfs.log
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball openldap-${OPENLDAP_VER} &&
+cd ${PKGDIR}
+
+max_log_init OpenLDAP ${OPENLDAP_VER} "native (shared)" ${CONFLOGS} ${LOG}
+# May not need extra LDFLAGS...
+CC="${CC-gcc} ${ARCH_CFLAGS}" LDFLAGS="-lpthread" CFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr \
+   --libexecdir=/usr/${libdirname}/openldap ${extra_conf} \
+   --infodir=/usr/share/info --mandir=/usr/share/man \
+   --sysconfdir=/etc \
+   --localstatedir=/var/lib/ldap \
+   --enable-bdb \
+   --enable-wrappers \
+   --with-cyrus-sasl \
+   --enable-crypt \
+   --enable-spasswd \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+#   --disable-debug \
+
+# default is without this
+#   --enable-dynamic \
+
+min_log_init ${BUILDLOGS} &&
+make depend \
+   >> ${LOGFILE} 2>&1 &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+env -i make test \
+   >>  ${LOGFILE} 2>&1 &&
+echo " o Test OK" || barf
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+# create a slapd wrapper script so we can specify the krb5 keytab
+file /usr/sbin/slapd | grep -q text || {
+   cat > /usr/sbin/slapd <<EOF
+#!/bin/sh
+# slapd wrapper script
+#
+# export the location of the krb5 keytab for slapd
+env KRB5_KTNAME=/etc/openldap/slapd.keytab /usr/${libdiriname}/openldap/slapd \${@}
+
+EOF
+}
+
+chmod 755 /usr/sbin/slapd
+
Index: scripts/blfs-scripts/blfs-openssh.sh
===================================================================
--- scripts/blfs-scripts/blfs-openssh.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-openssh.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,65 @@
+#!/bin/sh
+#
+# Openssh
+#
+# TODO: work to be done to make opensshConfig.sh behave
+cd ${SRC}
+LOG=openssh-blfs.log
+
+set_libdirname
+setup_multiarch
+
+# We require an sshd user and group
+# set to uid 22, gid 22
+id sshd > /dev/null 2>&1 ||
+{
+   echo " o Adding sshd user"
+   groupadd -g 22 sshd
+   useradd -u 22 -g sshd -c 'sshd privsep' -d /var/empty -s /bin/false sshd
+}
+
+if [ ! -d /var/empty ]; then mkdir -p /var/empty; chown root:sys /var/empty; fi
+
+unpack_tarball openssh-${OPENSSH_VER} &&
+cd ${PKGDIR}
+
+max_log_init Openssh ${OPENSSH_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr --sysconfdir=/etc/ssh \
+   --libexecdir=/usr/${libdirname}/openssh \
+   --mandir=/usr/share/man --infodir=/usr/share/info \
+   --with-md5-passwords \
+   --with-kerberos5=/usr \
+   --with-tcp-wrappers \
+   --without-pam \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+# create an sshd wrapper script so we can specify the krb5 keytab
+# Moce sshd to /usr/${libdirname}/openssh
+file /usr/sbin/sshd | grep -q text || {
+   mv /usr/sbin/sshd /usr/${libdirname}/openssh
+
+   cat > /usr/sbin/sshd <<EOF
+#!/bin/sh
+# sshd wrapper script
+#
+# export the location of the krb5 keytab for sshd
+export KRB5_KTNAME=/etc/ssh/sshd.keytab
+/usr/${libdirname}/openssh/sshd \${@}
+
+EOF
+}
+
+chmod 750 /usr/sbin/sshd
+
Index: scripts/blfs-scripts/blfs-openssl-32.sh
===================================================================
--- scripts/blfs-scripts/blfs-openssl-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-openssl-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-openssl.sh
Index: scripts/blfs-scripts/blfs-openssl-64.sh
===================================================================
--- scripts/blfs-scripts/blfs-openssl-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-openssl-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-openssl.sh
Index: scripts/blfs-scripts/blfs-openssl.sh
===================================================================
--- scripts/blfs-scripts/blfs-openssl.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-openssl.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,139 @@
+#!/bin/bash
+
+### OPENSSL ###
+# deps
+# zlib
+# krb5 (optional)
+# TODO: for krb5 support some hackery is required
+
+cd ${SRC}
+LOG=openssl-blfs.log
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+
+unpack_tarball openssl-${OPENSSL_VER} &&
+cd ${PKGDIR}
+
+# patching...
+# TODO: check 0.9.7e to see which patches apply
+case ${OPENSSL_VER} in
+   0.9.7d ) 
+      # Adds a Configure target for linux-x86_64-32
+      apply_patch openssl-0.9.7d-32bit_x86_64
+      # Adds a make option ( LIBDIR ) for setting ${libdirname}
+      apply_patch openssl-0.9.7d-allow_lib64
+      # Fix for brokenness in kssl.h 
+      # ( applies to 0.9.7f. For mit krb5 1.3.5, test for 1.4 )
+      apply_patch openssl-0.9.7d-mit_krb5
+   ;;
+   0.9.7f ) 
+      # Adds a Configure target for linux-x86_64-32
+      apply_patch openssl-0.9.7f-32bit_x86_64
+      # Adds a make option ( LIBDIR ) for setting ${libdirname}
+      apply_patch openssl-0.9.7f-allow_lib64
+      # Fix for brokenness in kssl.h 
+      # ( applies to 0.9.7f. For mit krb5 1.3.5, test for 1.4 )
+      apply_patch openssl-0.9.7d-mit_krb5
+   ;;
+   0.9.7g ) 
+      # Adds a Configure target for linux-x86_64-32
+      apply_patch openssl-0.9.7f-32bit_x86_64
+      # Adds a make option ( LIBDIR ) for setting ${libdirname}
+      apply_patch openssl-0.9.7f-allow_lib64
+   ;;
+esac
+
+# TODO: *** MORE WILL NEED TO GO HERE ###
+#       Only known to work with x86_64 so far... further edits to Configure
+#       may be required to hardcode ARCH_CFLAGS in (depending on arch)
+CONFIG="config"
+if [ "Y" = "${MULTIARCH}" ]; then
+   case ${BUILDENV} in
+      64 )
+         # set arch specific 64 bit compilation flags
+         case ${TGT_ARCH} in
+            x86_64 )
+               CONFIG_TARGET="linux-x86_64"
+               CONFIG="Configure"
+            ;;
+            sparc* )
+               CONFIG_TARGET="linux64-sparcv9"
+               CONFIG="Configure"
+            ;;
+            powerpc* | ppc* )
+            ;;
+            s390* )
+               CONFIG_TARGET="linux-s390x"
+               CONFIG="Configure"
+            ;;
+         esac
+      ;;
+      32 )
+         case ${TGT_ARCH} in
+            x86_64 | x86-64 )
+               CONFIG_TARGET="linux-x86_64-32"
+               CONFIG="Configure"
+            ;;
+            sparc* )
+               # ultrasparc specific here ...
+               CONFIG_TARGET="linux-sparcv9"
+               CONFIG="Configure"
+            ;;
+            powerpc* | ppc* )
+            ;;
+         esac
+      ;;
+      31 )
+         case ${TGT_ARCH} in
+            s390* )
+               CONFIG_TARGET="linux-s390"
+               CONFIG="Configure"
+            ;;
+         esac
+      ;;
+   esac
+fi
+
+# Dont clobber existing docs
+sed 's/^passwd/openssl-passwd/' doc/apps/passwd.pod \
+    > doc/apps/openssl-passwd.pod &&
+rm doc/apps/passwd.pod &&
+mv doc/crypto/{,openssl_}threads.pod &&
+
+#TODO: use -mtune or -march?
+#      also need to cater for non-x86
+sed -i -e 's/-m486/-mtune=i486/' \
+       -e 's/-mcpu=/-mtune=/' Configure
+
+# HACK: hack Configure to find krb libraries under ${libdirname}...
+#if [ ! "${libdirname}" = "lib" ]; then
+#   sed -i -e "s@/lib\( \|\"\)@/${libdirname}\1@g" Configure
+#fi
+
+max_log_init OpenSSL ${OPENSSL_VER} "native (shared)" ${CONFLOGS} ${LOG}
+./${CONFIG} ${CONFIG_TARGET} \
+  --prefix=/usr \
+  --openssldir=/etc/ssl \
+  --with-krb5-dir=/usr \
+  --with-krb5-flavor=MIT \
+  threads zlib-dynamic shared \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LIBDIR=${libdirname} MANPATH=/usr/share/man \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${TESTLOGS} &&
+make LIBDIR=${libdirname} test \
+   >>  ${LOGFILE} 2>&1 &&
+echo " o Test OK" &&
+
+min_log_init ${INSTLOGS} &&
+make MANDIR=/usr/share/man LIBDIR=${libdirname} install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/blfs-scripts/blfs-portmap.sh
===================================================================
--- scripts/blfs-scripts/blfs-portmap.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-portmap.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+### portmap ###
+
+cd ${SRC}
+LOG=blfs-portmap.log
+set_libdirname
+setup_multiarch
+
+unpack_tarball portmap_${PORTMAP_VER}
+cd ${PKGDIR}
+apply_patch portmap-5beta-compilation_fixes-3 
+apply_patch portmap-5beta-glibc_errno_fix-1
+
+max_log_init portmap ${PORTMAP_VER} "native (shared)" ${BUILDLOGS} ${LOG}
+make CC="${CC-gcc} ${ARCH_CFLAGS} ${TGT_CFLAGS}" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/blfs-scripts/blfs-shadow-pam.sh
===================================================================
--- scripts/blfs-scripts/blfs-shadow-pam.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-shadow-pam.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,194 @@
+#!/bin/sh
+
+### SHADOW ###
+cd ${SRC}
+LOG="shadow-pam-native.log"
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball shadow-${SHADOW_VER} &&
+cd ${PKGDIR}
+
+apply_patch shadow-${SHADOW_VER}-pam-1
+# HACK
+# Issue noted with glibc-2.3-20040701 and linux-libc-headers-2.6.7
+test -f libmisc/xmalloc.c-ORIG ||
+   cp -p libmisc/xmalloc.c libmisc/xmalloc.c-ORIG
+
+sed 's@^extern char \*malloc ();@/* & */@g' \
+   libmisc/xmalloc.c-ORIG > libmisc/xmalloc.c
+
+# Set to Y if you want a shared libmisc and libshadow and have
+# passwd etc linked dynamically to these
+BUILD_SHADOW_SHARED="Y"
+if [ "Y" = "${BUILD_SHADOW_SHARED}" ]; then 
+   extra_conf="${extra_conf} --enable-shared"
+fi
+
+# If not there touch /usr/bin/passwd
+if [ ! -f /usr/bin/passwd ]; then touch /usr/bin/passwd ; fi
+
+max_log_init Shadow ${SHADOW_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+LIBS="-lpam -lpam_misc" \
+./configure --prefix=/usr ${extra_conf} \
+   --with-libpam --without-libcrack \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+echo '#define HAVE_SETLOCALE 1' >> config.h
+
+min_log_init ${BUILDLOGS} &&
+make LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >>  ${LOGFILE} 2>&1 &&
+echo " o Test OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+shadowfiles="limits login.access"
+for file in ${shadowfiles} ; do
+   if [ ! -f /etc/${file} ]; then
+      cp -v etc/${file} /etc
+      chmod -c 644 /etc/limits
+   fi
+done
+
+# LFS:  User mailboxes belong in /var/mail not /var/spool/mail
+# From Nico's: use MD5
+sed -e 's%/var/spool/mail%/var/mail%' \
+    -e 's%^#MD5_CRYPT_ENAB.*no%MD5_CRYPT_ENAB yes%' \
+    etc/login.defs.linux > /etc/login.defs 
+
+#ln -sf vipw /usr/sbin/vigr
+# Nico: create symlink for vigr man page
+#ln -sf vipw.8 /usr/share/man/man8/vigr.8
+
+# Broken symlinks
+mv -f /bin/vigr /usr/sbin
+mv -f /bin/sg /usr/bin 
+# Wrong location
+mv -f /usr/bin/passwd /bin
+
+# Only need to move these if we built shared
+if [ "Y" = "${BUILD_SHADOW_SHARED}" ]; then
+   mv -f /usr/${libdiriname}/lib{shadow,misc}.so.0* /${libdirname} 
+   ln -sf ../../${libdirname}/libshadow.so.0 /usr/${libdirname}/libshadow.so 
+   ln -sf ../../${libdirname}/libmisc.so.0 /usr/${libdirname}/libmisc.so 
+   ldconfig
+fi
+
+# Create shadow password file if not already built
+if [ ! -f /etc/shadow ]; then /usr/sbin/pwconv ; fi
+
+if [ ! -d /etc/pam.d ]; then mkdir /etc/pam.d ; fi
+# Will blow the existing files away...
+cat > /etc/pam.d/login << "EOF"
+# Begin /etc/pam.d/login
+
+auth        requisite      pam_securetty.so
+auth        requisite      pam_nologin.so
+auth        required       pam_env.so
+auth        required       pam_unix.so
+account     required       pam_access.so
+account     required       pam_unix.so
+session     required       pam_motd.so
+session     required       pam_limits.so
+session     optional       pam_mail.so     dir=/var/mail standard
+session     optional       pam_lastlog.so
+session     required       pam_unix.so
+
+# End /etc/pam.d/login
+EOF
+
+cat > /etc/pam.d/passwd-nocracklib << "EOF"
+# Begin /etc/pam.d/passwd
+
+password    required       pam_unix.so     md5 shadow 
+
+# End /etc/pam.d/passwd
+EOF
+
+cat > /etc/pam.d/shadow << "EOF"
+# Begin /etc/pam.d/shadow
+
+auth        sufficient      pam_rootok.so
+auth        required        pam_unix.so
+account     required        pam_unix.so
+session     required        pam_unix.so
+password    required        pam_permit.so
+
+# End /etc/pam.d/shadow
+EOF
+
+cat > /etc/pam.d/su << "EOF"
+# Begin /etc/pam.d/su
+
+auth        sufficient      pam_rootok.so
+auth        required        pam_unix.so
+account     required        pam_unix.so
+session     required        pam_unix.so
+
+# End /etc/pam.d/su
+EOF
+cat > /etc/pam.d/useradd << "EOF"
+# Begin /etc/pam.d/useradd
+
+auth        sufficient      pam_rootok.so
+auth        required        pam_unix.so
+account     required        pam_unix.so
+session     required        pam_unix.so
+password    required        pam_permit.so
+
+# End /etc/pam.d/useradd
+EOF
+cat > /etc/pam.d/chage << "EOF"
+# Begin /etc/pam.d/chage
+
+auth        sufficient      pam_rootok.so
+auth        required        pam_unix.so
+account     required        pam_unix.so
+session     required        pam_unix.so
+password    required        pam_permit.so
+
+# End /etc/pam.d/chage
+EOF
+
+cat > /etc/pam.d/passwd << "EOF" 
+# Begin /etc/pam.d/passwd
+
+password    required    pam_cracklib.so     \
+    retry=3  difok=8  minlen=5  dcredit=3  ocredit=3  ucredit=2  lcredit=2
+password    required    pam_unix.so     md5 shadow use_authtok
+
+# End /etc/pam.d/passwd
+EOF
+
+cat > /etc/pam.d/other << "EOF"
+# Begin /etc/pam.d/other
+
+auth        required        pam_deny.so
+auth        required        pam_warn.so
+account     required        pam_deny.so
+session     required        pam_deny.so
+password    required        pam_deny.so
+password    required        pam_warn.so
+
+# End /etc/pam.d/other
+EOF
+
+# MORE TO DO FOR login.defs edits...
Index: scripts/blfs-scripts/blfs-tcl-32.sh
===================================================================
--- scripts/blfs-scripts/blfs-tcl-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-tcl-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-tcl.sh
Index: scripts/blfs-scripts/blfs-tcl-64.sh
===================================================================
--- scripts/blfs-scripts/blfs-tcl-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-tcl-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-tcl.sh
Index: scripts/blfs-scripts/blfs-tcl.sh
===================================================================
--- scripts/blfs-scripts/blfs-tcl.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-tcl.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,77 @@
+#!/bin/sh
+#
+# Tcl ( Reqd for expect )
+#
+# TODO: work to be done to make tclConfig.sh behave
+cd ${SRC}
+LOG=tcl-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+
+unpack_tarball tcl${TCL_VER}-src &&
+cd ${PKGDIR}/unix
+
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+   # change TCL_LIBRARY in Makefile so it is under $(libdir)
+   if [ ! -f Makefile.in-ORIG ]; then cp -p Makefile.in Makefile.in-ORIG ; fi
+   sed '/TCL_LIBRARY/s@\$(prefix)/lib@$(libdir)@g' Makefile.in-ORIG > Makefile.in
+fi
+
+max_log_init Tcl ${TCL_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+ ./configure --prefix=/usr --enable-threads ${extra_conf} \
+   --mandir=/usr/share/man --infodir=/usr/share/info \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${TESTLOGS} &&
+make test \
+   >>  ${LOGFILE} 2>&1 &&
+echo " o Test OK" &&
+# clock test may fail... not a real concern for our purposes...
+
+# TODO: get version from tcl itself
+V=`echo ${TCL_VER} | cut -d "." -f 1,2`
+
+sed -i "s@${SRC}/${PKGDIR}/unix@/usr/${libdirname}@" tclConfig.sh &&
+sed -i "s@${SRC}/${PKGDIR}@/usr/include/tcl${V}@" tclConfig.sh &&
+sed -i "s@^TCL_LIB_FILE='libtcl${V}..TCL_DBGX..so'@TCL_LIB_FILE=\"libtcl${V}\$\{TCL_DBGX\}.so\"@" \
+    tclConfig.sh
+
+# The following isn't required for tcl 8.4.9 ...
+# TODO: check which versions (apart from 8.4.6) this is needed for
+case ${TCL_VER} in
+   8.4.6 )
+      mv ../doc/{,Tcl_}Thread.3 &&
+      sed -i 's/ Thread.3/ Tcl_Thread.3/' mkLinks
+   ;;
+esac
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+install -d /usr/include/tcl${V}/unix &&
+install -m644 *.h /usr/include/tcl${V}/unix/ &&
+install -d /usr/include/tcl${V}/generic &&
+install -c -m644 ../generic/*.h /usr/include/tcl${V}/generic/ &&
+rm -f /usr/include/tcl${V}/generic/{tcl,tclDecls,tclPlatDecls}.h &&
+ln -nsf ../../include/tcl${V} /usr/${libdirname}/tcl${V}/include &&
+ln -sf libtcl${V}.so /usr/${libdirname}/libtcl.so
+
+# Create symlink for tclsh
+TCLSH=$(basename $(find /usr/bin -type f -name tclsh\*))
+test "tclsh" != "${TCLSH}" &&
+   ln -sf ./${TCLSH} /usr/bin/tclsh
+
Index: scripts/blfs-scripts/blfs-tcp-wrappers-32.sh
===================================================================
--- scripts/blfs-scripts/blfs-tcp-wrappers-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-tcp-wrappers-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-tcp-wrappers.sh
Index: scripts/blfs-scripts/blfs-tcp-wrappers-64.sh
===================================================================
--- scripts/blfs-scripts/blfs-tcp-wrappers-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-tcp-wrappers-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-tcp-wrappers.sh
Index: scripts/blfs-scripts/blfs-tcp-wrappers.sh
===================================================================
--- scripts/blfs-scripts/blfs-tcp-wrappers.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-tcp-wrappers.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+### tcp-wrappers ###
+
+cd ${SRC}
+LOG="tcp-wrappers-blfs.log"
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+
+unpack_tarball tcp_wrappers_${TCPWRAP_VER}
+cd ${PKGDIR}
+apply_patch tcp_wrappers-7.6-shared_lib_plus_plus-1
+apply_patch tcp_wrappers-7.6-gcc34-1
+
+if [ ! "${libdirname}" = "lib" ]; then
+   sed -i -e "s@/lib/@/${libdirname}/@g" Makefile
+fi
+
+max_log_init tcp-wrappers ${TCPWRAP_VER} "native (shared)" ${BUILDLOGS} ${LOG}
+make CC="${CC-gcc} ${ARCH_CFLAGS}" REAL_DAEMON_DIR=/usr/sbin \
+   STYLE=-DPROCESS_OPTIONS linux \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/blfs-scripts/blfs-xorg-32.sh
===================================================================
--- scripts/blfs-scripts/blfs-xorg-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-xorg-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-xorg.sh
Index: scripts/blfs-scripts/blfs-xorg-64.sh
===================================================================
--- scripts/blfs-scripts/blfs-xorg-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-xorg-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-xorg.sh
Index: scripts/blfs-scripts/blfs-xorg.sh
===================================================================
--- scripts/blfs-scripts/blfs-xorg.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/blfs-scripts/blfs-xorg.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,161 @@
+#!/bin/sh
+#
+# Xorg
+#
+
+# NOTE: Xorg handles bi-arch very well (at least on x86_64, havent tried 
+#       others).
+#       No need to set libdir or hack, libs automagically go to lib64 
+#       or lib based on the emulation used.
+#
+#       /usr/X11R6/lib/X11 holds fonts etc, and handles locales under
+#       there in lib/lib64 depending
+#
+# TODO: set libdir and libdirname in host.def to /usr/X11R6/lib and lib
+#       respectively if doing uni-arch x86_64 build.
+#       Will need to check how nvidia installer will deal with things though
+
+cd ${SRC}
+LOG=xorg-blfs.log
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+
+unpack_tarball X11R${XORG_VER}-src &&
+cd ${PKGDIR}
+
+# From blfs 20050112 (Xorg 6.8.1):
+# Xorg insists on putting its boot and profile scripts into the /etc directory
+# even if we specifically tell it not to compile anything Xprint server or
+# client related (see host.def below). The following command will suppress any
+# such modifications: 
+sed -i '/^SUBDIRS =/s/ etc$//' programs/Xserver/Xprint/Imakefile
+
+# First patch ensures objects packed into static libs get built position
+# independant, so they can be linked into shared libs. A notable barf
+# without this patch is with NAS linking against a static libXau 
+apply_patch X11R6.8.1-IncludeSharedObjectInNormalLib-1
+
+# This patch ensures that if SharedLibXau is defined in host.def that it
+# links correctly
+apply_patch X11R6.8.1-fix_shared_libXau_link-1
+
+# Build lndir ( NOTE: we don't particularly care whether this is 64 or 32 )
+pushd config/util &&
+make -f Makefile.ini lndir &&
+cp lndir /usr/bin/ &&
+popd
+
+test -d ${SRC}/xcbuild${suffix} &&
+   rm -rf ${SRC}/xcbuild${suffix}
+
+mkdir ${SRC}/xcbuild${suffix}
+
+# Create shadow tree
+cd ${SRC}/xcbuild${suffix}
+lndir ${SRC}/${PKGDIR} > /dev/null 2>&1
+
+# Create host.def file
+echo " o creating config/cf/host.def"
+
+cat > config/cf/host.def << "EOF"
+/* Begin Xorg host.def file */
+ 
+/* System Related Information.  If you read and configure only one
+ * section then it should be this one.  The Intel architecture defaults are
+ * set for a i686 and higher.  Axp is for the Alpha architecture and Ppc is
+ * for the Power PC.  AMD64 is for the Opteron processor. Note that there have 
+ * been reports that the Ppc optimization line causes segmentation faults during 
+ * build.  If that happens, try building without the DefaultGcc2PpcOpt line.  ***********/
+ 
+/* #define DefaultGcc2i386Opt -O2 -fno-strength-reduce -fno-strict-aliasing -march=i686 */
+/* #define DefaultGccAMD64Opt -O2 -fno-strength-reduce -fno-strict-aliasing -march=athlon64 */
+/* #define DefaultGcc2AxpOpt  -O2 -mcpu=ev6 */
+/* #define DefaultGcc2PpcOpt  -O2 -mcpu=750 */
+
+#define HasFreetype2            YES
+#define HasFontconfig           YES
+#define HasExpat                YES
+#define HasLibpng               YES
+#define HasZlib                 YES
+
+/*
+ * Which drivers to build.  When building a static server, each of these
+ * will be included in it.  When building the loadable server each of these
+ * modules will be built.
+ *
+#define XF86CardDrivers         mga glint nv tga s3virge sis rendition \
+                                neomagic i740 tdfx savage \
+                                cirrus vmware tseng trident chips apm \
+                                GlideDriver fbdev i128 \
+                                ati AgpGartDrivers DevelDrivers ark cyrix \
+                                siliconmotion \
+                                vesa vga XF86OSCardDrivers XF86ExtraCardDrivers
+ */
+/*
+ * Select the XInput devices you want by uncommenting this.
+ *
+#define XInputDrivers           mouse keyboard acecad calcomp citron \
+                                digitaledge dmc dynapro elographics \
+                                microtouch mutouch penmount spaceorb summa \
+                                wacom void magictouch aiptek
+ */
+/* Most installs will only need this */
+
+#define XInputDrivers           mouse keyboard
+
+/* Disable building Xprint server and clients until we get them figured
+ * out but build Xprint libraries to allow precompiled binaries such as
+ * Acrobat Reader to run.
+ */
+
+#define XprtServer              NO
+#define BuildXprintClients      NO
+
+/* #define LibDirName		lib64 */
+
+/* #define LibDir			/usr/X11R6/lib64/X11 */
+
+/* End Xorg host.def file */
+EOF
+
+# remove references to linux/config.h (when using linux-libc-headers)
+sed -i -e "s@#include <linux/config.h>@/* & */@" \
+    `grep -lr linux/config.h *`
+
+# TODO: check if CFLAGS/CXXFLAGS can be defined...
+#       when applied in CC= or CXX= TGT_CFLAGS tend to be left out...
+max_log_init Xorg ${XORG_VER} "blfs (shared)" ${BUILDLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${CFLAGS}" \
+make World \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+#make DESTDIR=/mnt/scriptcheck/Xorg${suffix} install \
+make install \
+   >> ${LOGFILE} 2>&1 &&
+#make DESTDIR=/mnt/scriptcheck/Xorg${suffix} install.man \
+make install.man \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+ln -sf ../X11R6/bin /usr/bin/X11 &&
+ln -sf ../X11R6/lib/X11 /usr/lib/X11 &&
+ln -sf ../X11R6/include/X11 /usr/include/X11
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   use_wrapper /usr/X11R6/bin/xft-config /usr/X11R6/bin/xcursor-config \
+               /usr/X11R6/bin/gccmakedep /usr/X11R6/bin/ccmakedep \
+               /usr/X11R6/bin/imake /usr/X11R6/bin/xmkmf
+fi
+
+echo "---------------------------------------------------------------"
+echo "To configure/setup Xorg fonts / DRI  please see blfs Chapter 25"
+echo "---------------------------------------------------------------"
+echo
+
Index: scripts/build-blfs.sh
===================================================================
--- scripts/build-blfs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/build-blfs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,218 @@
+#!/bin/bash
+
+# build-blfs.sh 
+#
+# Script to build blfs packages
+# 
+# Authors: Ryan Oliver <ryan.oliver@pha.com.au
+#
+# $LastChangedBy: ryan $
+# $LastChangedDate: 2004-09-28 17:23:32 +1000 (Tue, 28 Sep 2004) $
+# $LastChangedRevision: 238 $
+
+# Set SELF to be name of script called, minus any path...
+SELF=$(basename ${0})
+echo "Running ${SELF}"
+VERSION="3.0.1"
+DATE=$(date +'%Y%m%d')
+export DATE
+
+# Read in build configuration information
+# plfs-config should reside in the same directory as this script.
+# We need to use dirname to determine where to find it as SCRIPTS
+# env var is not set yet (set in plfs-config itself)
+. `dirname ${0}`/plfs-config
+
+# Sanity check, are ${LFS}, ${HST_TOOLS} and ${TGT_TOOLS} set?
+if [ "X${LFS}" = "X" -o "X${HST_TOOLS}" = "X" -o "X${TGT_TOOLS}" = "X" ]; then
+   echo "Error: Not all required environment vars have been set." 1>&2
+   echo "       Check plfs-config" 1>&2
+   exit 1
+fi
+
+export LFS=""
+
+# Get package version information
+. ${SCRIPTS}/plfs-packages
+. ${SCRIPTS}/blfs-packages
+
+# Source Functions and definitions
+. ${SCRIPTS}/build-init.sh
+
+
+set +x
+unset LD_LIBRARY_PATH
+unset LD_PRELOAD
+
+# Configure uses these if set, and will not look for a cross-compiler
+unset CC CXX
+
+export LDFLAGS="-s"
+
+# Setup PATH
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin
+
+# If ${SRC} does not exist, create it
+test -d ${SRC} || mkdir -p ${SRC}
+
+mkdir -p ${CONFLOGS}
+mkdir -p ${BUILDLOGS}
+mkdir -p ${INSTLOGS}
+mkdir -p ${TESTLOGS}
+cd ${SRC}
+
+#scripts_dir="cross-scripts-${VERSION}"
+scripts_dir="blfs-scripts"
+
+# scripts for building target tools
+
+##############
+# NFS support
+##############
+test "Y" = "${MULTIARCH}" &&
+{
+script_list="blfs-tcp-wrappers-32.sh
+blfs-tcp-wrappers-64.sh"
+} || {
+script_list="blfs-tcp-wrappers.sh"
+}
+
+script_list="${script_list}
+blfs-portmap.sh
+blfs-nfs-utils.sh"
+
+###################
+#
+###################
+# TCL here so we can test kerberos.
+# BDB also dependant
+test "Y" = "${MULTIARCH}" &&
+{
+script_list="${script_list}
+blfs-tcl-32.sh
+blfs-tcl-64.sh"
+} || {
+script_list="${script_list}
+blfs-tcl.sh"
+}
+
+test "Y" = "${MULTIARCH}" &&
+{
+script_list="${script_list}
+blfs-cracklib-32.sh
+blfs-cracklib-64.sh
+blfs-linux-pam-32.sh
+blfs-linux-pam-64.sh
+blfs-mit-krb5-32.sh
+blfs-mit-krb5-64.sh
+blfs-bdb-32.sh
+blfs-bdb-64.sh"
+} || {
+script_list="${script_list}
+blfs-cracklib.sh
+blfs-linux-pam.sh
+blfs-mit-krb5.sh
+blfs-bdb.sh"
+}
+#script_list="blfs-shadow-pam.sh"
+
+####################
+# OPENSSL + OPENSSH
+####################
+# Depends on krb5 libs (MIT)
+test "Y" = "${MULTIARCH}" &&
+{
+script_list="${script_list}
+blfs-openssl-32.sh
+blfs-openssl-64.sh
+blfs-openssh.sh"
+} || {
+script_list="${script_list}
+blfs-openssl.sh
+blfs-openssh.sh"
+}
+
+# reqs openssl, krb5, bdb, tcpwrappers (ldap)
+test "Y" = "${MULTIARCH}" &&
+{
+script_list="${script_list}
+blfs-cyrus-sasl-32.sh
+blfs-cyrus-sasl-64.sh
+blfs-openldap-32.sh
+blfs-openldap-64.sh
+blfs-nssldap-32.sh
+blfs-nssldap-64.sh
+blfs-ntp.sh"
+} || {
+script_list="${script_list}
+blfs-cyrus-sasl.sh
+blfs-openldap.sh
+blfs-nssldap.sh
+blfs-ntp.sh"
+}
+
+# TODO: have to do something with catering for 2 freetype-configs
+#       for biarch, specifying the right freetype-config for
+#       fontconfig, and fix the biarch libtool issues w fontconfig
+test "Y" = "${MULTIARCH}" &&
+{
+script_list="${script_list}
+blfs-libpng-32.sh
+blfs-libpng-64.sh
+blfs-freetype2-32.sh
+blfs-freetype2-64.sh
+blfs-expat-32.sh
+blfs-expat-64.sh"
+} || {
+script_list="${script_list}
+blfs-libpng.sh
+blfs-freetype2.sh
+blfs-expat.sh"
+}
+
+test "Y" = "${MULTIARCH}" &&
+{
+script_list="${script_list}
+blfs-fontconfig-32.sh
+blfs-fontconfig-64.sh
+blfs-xorg-32.sh
+blfs-xorg-64.sh"
+} || {
+script_list="${script_list}
+blfs-fontconfig.sh
+blfs-xorg.sh"
+}
+
+SCRIPTLIST=`echo "${script_list}" | \
+  sed "s@\(.*\)@${scripts_dir}/\1@"`
+
+# Check if we are resuming from a particular script
+test ! -z "${1}" &&
+{
+   SCRIPTLIST=`echo ${SCRIPTLIST} | sed "s@.*\(${1}.*\)@\1@g"`
+}
+                                                                                
+echo ' o Checking for needed sources and tarballs'
+check_tarballs ${SCRIPTLIST}
+                                                                                
+for script in ${SCRIPTLIST}; do
+   echo "Running ${SCRIPTS}/${script}"
+   # HACK: export SELF to be the script we are running
+   #       (keeps logfile output correct)
+   export SELF=${script}
+   ${SCRIPTS}/${script}
+
+   test 0 = ${?} ||
+   {
+      echo
+      echo "Failed script was ${script}"
+      echo "Please fix the error above from"
+      echo "   ${SCRIPTS}/${script}"
+      echo "and rerun the build with the command"
+      echo
+      echo "   ${0} $script"
+      echo
+      echo "to resume the build."
+      exit 1
+   }
+done
Index: scripts/build-cross-triarch.sh
===================================================================
--- scripts/build-cross-triarch.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/build-cross-triarch.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,162 @@
+#!/bin/bash
+
+# build-cross-2.4.4.sh 
+#
+# Master script for cross building LFS chapter 5.
+# 
+# Authors: Ryan Oliver <ryan.oliver@pha.com.au
+#          Finn Thain
+#
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+
+# Set SELF to be name of script called, minus any path...
+
+# turn off bash command hash
+set +h
+
+SELF=$(basename ${0})
+echo "Running ${SELF}"
+VERSION="2.4.4"
+DATE=$(date +'%Y%m%d')
+export DATE
+
+# Read in build configuration information
+# plfs-config should reside in the same directory as this script.
+# We need to use dirname to determine where to find it as SCRIPTS
+# env var is not set yet (set in plfs-config itself)
+. `dirname ${0}`/plfs-config
+
+# Sanity check, are ${LFS}, ${HST_TOOLS} and ${TGT_TOOLS} set?
+if [ "X${LFS}" = "X" -o "X${HST_TOOLS}" = "X" -o "X${TGT_TOOLS}" = "X" ]; then
+   echo "Error: Not all required environment vars have been set." 1>&2
+   echo "       Check plfs-config" 1>&2
+   exit 1
+fi
+
+# Get package version information
+. ${SCRIPTS}/plfs-packages
+
+# Source Functions and definitions
+. ${SCRIPTS}/build-init.sh
+
+
+set +x
+unset LD_LIBRARY_PATH
+unset LD_PRELOAD
+                                                                                
+export LDFLAGS="-s"
+
+# Setup PATH
+#export PATH=/bin:/sbin:/usr/bin:/usr/sbin
+export PATH=${HST_TOOLS}/bin:${HST_TOOLS}/sbin:${PATH}
+
+# If using distcc, expect that user has set up their own symlinks
+#export DISTCC_HOSTS="localhost sirius"
+#DISTCCDIR=/usr/distcc/bin
+#export PATH=${DISTCCDIR}:${PATH}
+
+# If ${SRC} does not exist, create it
+test -d ${SRC} || mkdir -p ${SRC}
+
+# If ${LFS} directory doesn't exist, create it
+test -d ${LFS} || mkdir -p ${LFS}
+
+if [ ! "${USE_SYSROOT}" = "Y" ]; then                                                      
+   # If ${LFS}${TGT_TOOLS} directory doesn't exist, create it
+   test -d ${LFS}${TGT_TOOLS} || mkdir -p ${LFS}${TGT_TOOLS}
+
+   # create it ${TGT_TOOLS} symlink
+   if [ ! -d `dirname ${TGT_TOOLS}` ]; then mkdir -p `dirname ${TGT_TOOLS}` ; fi
+   ln -sf ${LFS}${TGT_TOOLS} `dirname ${TGT_TOOLS}`
+fi
+
+mkdir -p ${CONFLOGS}
+mkdir -p ${BUILDLOGS}
+mkdir -p ${INSTLOGS}
+mkdir -p ${TESTLOGS}
+cd ${SRC}
+
+#scripts_dir="cross-scripts-${VERSION}"
+scripts_dir="cross-scripts"
+
+test "Y" = "${USE_SANITISED_HEADERS}" &&
+{
+   script_list="cross-kern-hdrs.sh
+cross-san-kern-hdrs.sh"
+} || {
+   script_list="cross-kern-hdrs.sh"
+}
+
+test "Y" = "${MULTIARCH}" &&
+{
+   script_list="${script_list}
+cross-binutils.sh
+cross-gcc-static-no-thread.sh
+cross-glibc-hdrs.sh
+cross-gcc-static.sh
+cross-glibc-crtobjs-32.sh
+cross-glibc-crtobjs-n32.sh
+cross-glibc-crtobjs-64.sh
+cross-gcc-shared.sh"
+
+   test "N" = "${DEFAULT_64}" &&
+   {
+      script_list="${script_list}
+cross-glibc-full-64.sh
+cross-glibc-full-32.sh
+cross-gcc-final.sh"
+   } || {
+      script_list="${script_list}
+cross-glibc-full-32.sh
+cross-glibc-full-n32.sh
+cross-glibc-full-64.sh
+cross-gcc-final.sh"
+   }
+
+} || {
+   script_list="${script_list}
+cross-binutils.sh
+cross-gcc-static-no-thread.sh
+cross-glibc-hdrs.sh
+cross-gcc-static.sh
+cross-glibc-crtobjs.sh
+cross-gcc-shared.sh
+cross-glibc-full.sh
+cross-gcc-final.sh"
+}
+
+SCRIPTLIST=`echo "${script_list}" | \
+  sed "s@\(.*\)@${scripts_dir}/\1@"`
+
+# Check if we are resuming from a particular script
+test ! -z "${1}" &&
+{
+   SCRIPTLIST=`echo ${SCRIPTLIST} | sed "s@.*\(${1}.*\)@\1@g"`
+}
+                                                                                
+echo ' o Checking for needed sources and tarballs'
+check_tarballs ${SCRIPTLIST}
+                                                                                
+for script in ${SCRIPTLIST}; do
+   echo "Running ${SCRIPTS}/${script}"
+   # HACK: export SELF to be the script we are running
+   #       (keeps logfile output correct)
+   export SELF=${script}
+   ${SCRIPTS}/${script}
+
+   test 0 = ${?} ||
+   {
+      echo
+      echo "Failed script was ${script}"
+      echo "Please fix the error above from"
+      echo "   ${SCRIPTS}/${script}"
+      echo "and rerun the build with the command"
+      echo
+      echo "   ${0} $script"
+      echo
+      echo "to resume the build."
+      exit 1
+   }
+done
Index: scripts/build-cross.sh
===================================================================
--- scripts/build-cross.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/build-cross.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,158 @@
+#!/bin/bash
+
+# build-cross-2.4.4.sh 
+#
+# Master script for cross building LFS chapter 5.
+# 
+# Authors: Ryan Oliver <ryan.oliver@pha.com.au
+#          Finn Thain
+#
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+
+# Set SELF to be name of script called, minus any path...
+
+# turn off bash command hash
+set +h
+
+SELF=$(basename ${0})
+echo "Running ${SELF}"
+VERSION="2.4.4"
+DATE=$(date +'%Y%m%d')
+export DATE
+
+# Read in build configuration information
+# plfs-config should reside in the same directory as this script.
+# We need to use dirname to determine where to find it as SCRIPTS
+# env var is not set yet (set in plfs-config itself)
+. `dirname ${0}`/plfs-config
+
+# Sanity check, are ${LFS}, ${HST_TOOLS} and ${TGT_TOOLS} set?
+if [ "X${LFS}" = "X" -o "X${HST_TOOLS}" = "X" -o "X${TGT_TOOLS}" = "X" ]; then
+   echo "Error: Not all required environment vars have been set." 1>&2
+   echo "       Check plfs-config" 1>&2
+   exit 1
+fi
+
+# Get package version information
+. ${SCRIPTS}/plfs-packages
+
+# Source Functions and definitions
+. ${SCRIPTS}/build-init.sh
+
+
+set +x
+unset LD_LIBRARY_PATH
+unset LD_PRELOAD
+                                                                                
+export LDFLAGS="-s"
+
+# Setup PATH
+#export PATH=/bin:/sbin:/usr/bin:/usr/sbin
+export PATH=${HST_TOOLS}/bin:${HST_TOOLS}/sbin:${PATH}
+
+# If using distcc, expect that user has set up their own symlinks
+#export DISTCC_HOSTS="localhost sirius"
+#DISTCCDIR=/usr/distcc/bin
+#export PATH=${DISTCCDIR}:${PATH}
+
+# If ${SRC} does not exist, create it
+test -d ${SRC} || mkdir -p ${SRC}
+
+# If ${LFS} directory doesn't exist, create it
+test -d ${LFS} || mkdir -p ${LFS}
+
+if [ ! "${USE_SYSROOT}" = "Y" ]; then                                                                                
+   # If ${LFS}${TGT_TOOLS} directory doesn't exist, create it
+   test -d ${LFS}${TGT_TOOLS} || mkdir -p ${LFS}${TGT_TOOLS}
+                                                                                
+   # create it ${TGT_TOOLS} symlink
+   if [ ! -d `dirname ${TGT_TOOLS}` ]; then mkdir -p `dirname ${TGT_TOOLS}` ; fi
+   ln -sf ${LFS}${TGT_TOOLS} `dirname ${TGT_TOOLS}`
+fi
+
+mkdir -p ${CONFLOGS}
+mkdir -p ${BUILDLOGS}
+mkdir -p ${INSTLOGS}
+mkdir -p ${TESTLOGS}
+cd ${SRC}
+
+#scripts_dir="cross-scripts-${VERSION}"
+scripts_dir="cross-scripts"
+
+test "Y" = "${USE_SANITISED_HEADERS}" &&
+{
+   script_list="cross-kern-hdrs.sh
+cross-san-kern-hdrs.sh"
+} || {
+   script_list="cross-kern-hdrs.sh"
+}
+
+test "Y" = "${MULTIARCH}" &&
+{
+   script_list="${script_list}
+cross-binutils.sh
+cross-glibc-hdrs.sh
+cross-gcc-static.sh
+cross-glibc-crtobjs-32.sh
+cross-glibc-crtobjs-64.sh
+cross-gcc-shared.sh"
+
+   test "N" = "${DEFAULT_64}" &&
+   {
+      script_list="${script_list}
+cross-glibc-full-64.sh
+cross-glibc-full-32.sh
+cross-gcc-final.sh"
+   } || {
+      script_list="${script_list}
+cross-glibc-full-32.sh
+cross-glibc-full-64.sh
+cross-gcc-final.sh"
+   }
+
+} || {
+   script_list="${script_list}
+cross-binutils.sh
+cross-glibc-hdrs.sh
+cross-gcc-static.sh
+cross-glibc-crtobjs.sh
+cross-gcc-shared.sh
+cross-glibc-full.sh
+cross-gcc-final.sh"
+}
+
+SCRIPTLIST=`echo "${script_list}" | \
+  sed "s@\(.*\)@${scripts_dir}/\1@"`
+
+# Check if we are resuming from a particular script
+test ! -z "${1}" &&
+{
+   SCRIPTLIST=`echo ${SCRIPTLIST} | sed "s@.*\(${1}.*\)@\1@g"`
+}
+                                                                                
+echo ' o Checking for needed sources and tarballs'
+check_tarballs ${SCRIPTLIST}
+                                                                                
+for script in ${SCRIPTLIST}; do
+   echo "Running ${SCRIPTS}/${script}"
+   # HACK: export SELF to be the script we are running
+   #       (keeps logfile output correct)
+   export SELF=${script}
+   ${SCRIPTS}/${script}
+
+   test 0 = ${?} ||
+   {
+      echo
+      echo "Failed script was ${script}"
+      echo "Please fix the error above from"
+      echo "   ${SCRIPTS}/${script}"
+      echo "and rerun the build with the command"
+      echo
+      echo "   ${0} $script"
+      echo
+      echo "to resume the build."
+      exit 1
+   }
+done
Index: scripts/build-host.sh
===================================================================
--- scripts/build-host.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/build-host.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,123 @@
+#!/bin/bash
+
+# build-host.sh
+# (was build-native-2.4.4.sh)
+#
+# Master script for building native tools on the build host
+# required for the creation of a cross-toolchain
+# 
+# Authors: Ryan Oliver <ryan.oliver@pha.com.au
+#          Finn Thain
+#
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+#
+
+# Set SELF to be name of script called, minus any path...
+SELF=`basename ${0}`
+echo "Running ${SELF}"
+VERSION="2.4.4"
+DATE=`date +'%Y%m%d'`
+export DATE
+
+# Read in build configuration information
+# plfs-config should reside in the same directory as this script.
+# We need to use dirname to determine where to find it as SCRIPTS
+# env var is not set yet (set in plfs-config itself)
+. `dirname ${0}`/plfs-config
+
+# Sanity check, are ${LFS}, ${HST_TOOLS} and ${TGT_TOOLS} set?
+if [ "X${LFS}" = "X" -o "X${HST_TOOLS}" = "X" -o "X${TGT_TOOLS}" = "X" ]; then
+   echo "Error: Not all required environment vars have been set." 1>&2
+   echo "       Check plfs-config" 1>&2
+   exit 1
+fi
+
+# Get package version information
+. ${SCRIPTS}/plfs-packages
+
+# Source Functions and definitions
+. ${SCRIPTS}/build-init.sh
+
+# Setup PATH
+export PATH=${HST_TOOLS}/bin:${HST_TOOLS}/sbin:${PATH}
+
+set +x
+unset LD_LIBRARY_PATH
+unset LD_PRELOAD
+                                                                                
+export LDFLAGS="-s"
+
+# If ${SRC} does not exist, create it
+test -d ${SRC} || mkdir -p ${SRC}
+
+# If ${LFS}${TOOLS} directory doesn't exist, create it
+test -d ${LFS}${TGT_TOOLS} || mkdir -p ${LFS}${TGT_TOOLS}
+                                                                                
+# If ${TGT_TOOLS} symlink doesn't exist, create it
+test -L ${TGT_TOOLS} || ln -sf ${LFS}${TGT_TOOLS} ${TGT_TOOLS}
+echo ' o Checking for needed tarballs'
+                                                                                
+mkdir -p ${CONFLOGS}
+mkdir -p ${BUILDLOGS}
+mkdir -p ${INSTLOGS}
+mkdir -p ${TESTLOGS}
+cd ${SRC}
+
+scripts_dir="host-scripts"
+
+# Ideally we'd have flex before make, but flex doesn't like being
+# built with sun's make...
+
+script_list="host-m4.sh
+host-bison.sh
+host-make.sh
+host-flex.sh
+host-gawk.sh
+host-grep.sh
+host-sed.sh
+host-coreutils-binaries.sh
+host-autoconf.sh
+host-automake.sh
+host-libtool.sh
+host-patch.sh
+host-binutils.sh
+host-gcc.sh
+host-gettext.sh
+host-ncurses.sh
+host-texinfo.sh"
+
+SCRIPTLIST=`echo "${script_list}" | \
+  sed "s@\(.*\)@${scripts_dir}/\1@"`
+
+# Check if we are resuming from a particular script
+test ! -z "${1}" &&
+{
+   SCRIPTLIST=`echo ${SCRIPTLIST} | sed "s@.*\(${1}.*\)@\1@g"`
+}
+                                                                                
+echo ' o Checking for needed sources and tarballs'
+check_tarballs ${SCRIPTLIST}
+                                                                                
+for script in ${SCRIPTLIST}; do
+   echo "Running ${SCRIPTS}/${script}"
+   # HACK: export SELF to be the script we are running
+   #       (keeps logfile output correct)
+   export SELF=${script}
+   ${SCRIPTS}/${script}
+
+   test 0 = ${?} ||
+   {
+      echo
+      echo "Failed script was ${script}"
+      echo "Please fix the error above from"
+      echo "   ${SCRIPTS}/${script}"
+      echo "and rerun the build with the command"
+      echo
+      echo "   ${0} $script"
+      echo
+      echo "to resume the build."
+      exit 1
+   }
+done
Index: scripts/build-init.sh
===================================================================
--- scripts/build-init.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/build-init.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,48 @@
+#!/bin/bash
+#
+# build-init.sh
+#
+# Source Functions for cross-lfs build
+# -----------------------------------------
+# Authors:  Ryan Oliver  (ryan.oliver@pha.com.au)
+#
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+#
+
+# Check for stuff
+#----------------
+
+# Check for a grep which takes -E
+for path in "" /bin/ /usr/bin/ /usr/xpg4/bin/ /usr/local/bin/ ; do
+   echo X | ${path}grep -E X > /dev/null 2>&1 &&
+   {
+      export GREP="${path}grep"
+      break
+   }
+done
+
+GREP=egrep
+if [ "${GREP}" = "" ]; then
+   echo "install a grep on the system that handles -E"
+   exit 1
+fi
+
+# Set your umask
+umask 0022
+
+#set shell to allow glob style matches
+# ( bash specific )
+shopt -s extglob
+
+set +h
+
+. ${SCRIPTS}/funcs/log-funcs.sh
+. ${SCRIPTS}/funcs/tarball-funcs.sh
+. ${SCRIPTS}/funcs/patching-funcs.sh
+. ${SCRIPTS}/funcs/kernel_stub_header-funcs.sh
+. ${SCRIPTS}/funcs/binutils-funcs.sh
+. ${SCRIPTS}/funcs/multiarch-funcs.sh
+. ${SCRIPTS}/funcs/stub_header-funcs.sh
+. ${SCRIPTS}/funcs/glibc-funcs.sh
Index: scripts/build-native-triarch.sh
===================================================================
--- scripts/build-native-triarch.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/build-native-triarch.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,283 @@
+#!/bin/bash
+
+# build-native.sh 
+#
+# Script to finish build for target natively
+# 
+# Authors: Ryan Oliver <ryan.oliver@pha.com.au
+#          Finn Thain
+#
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+
+set +h
+
+# Set SELF to be name of script called, minus any path...
+SELF=$(basename ${0})
+echo "Running ${SELF}"
+VERSION="3.0.1"
+DATE=$(date +'%Y%m%d')
+export DATE
+
+# Read in build configuration information
+# plfs-config should reside in the same directory as this script.
+# We need to use dirname to determine where to find it as SCRIPTS
+# env var is not set yet (set in plfs-config itself)
+. `dirname ${0}`/plfs-config
+
+# Sanity check, are ${LFS}, ${HST_TOOLS} and ${TGT_TOOLS} set?
+if [ "X${LFS}" = "X" -o "X${HST_TOOLS}" = "X" -o "X${TGT_TOOLS}" = "X" ]; then
+   echo "Error: Not all required environment vars have been set." 1>&2
+   echo "       Check plfs-config" 1>&2
+   exit 1
+fi
+
+export LFS=""
+
+# Get package version information
+. ${SCRIPTS}/plfs-packages
+
+# Source Functions and definitions
+. ${SCRIPTS}/build-init.sh
+
+
+set +x
+unset LD_LIBRARY_PATH
+unset LD_PRELOAD
+
+# Configure uses these if set, and will not look for a cross-compiler
+unset CC CXX
+
+export LDFLAGS="-s"
+
+# Setup PATH
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin
+export PATH=${PATH}:${TGT_TOOLS}/bin:${TGT_TOOLS}/sbin
+
+# If ${SRC} does not exist, create it
+test -d ${SRC} || mkdir -p ${SRC}
+
+mkdir -p ${CONFLOGS}
+mkdir -p ${BUILDLOGS}
+mkdir -p ${INSTLOGS}
+mkdir -p ${TESTLOGS}
+cd ${SRC}
+
+#scripts_dir="cross-scripts-${VERSION}"
+scripts_dir="native-scripts"
+
+# scripts for building target tools
+test "Y" = "${MULTIARCH}" &&
+{
+script_list="temp-tcl-32.sh
+temp-tcl-n32.sh
+temp-tcl-64.sh
+temp-expect-32.sh
+temp-expect-n32.sh
+temp-expect-64.sh
+temp-dejagnu.sh
+temp-texinfo.sh
+temp-perl-32.sh
+temp-perl-n32.sh
+temp-perl-64.sh
+copy-kern-hdrs.sh
+native-glibc-32.sh
+native-glibc-n32.sh
+native-glibc-64.sh"
+} || {
+script_list="temp-tcl.sh
+temp-expect.sh
+temp-dejagnu.sh
+temp-texinfo.sh
+temp-perl.sh
+copy-kern-hdrs.sh
+native-glibc.sh"
+}
+
+script_list="${script_list}
+temp-binutils.sh
+specs-mod.sh
+native-binutils.sh
+native-gcc.sh"
+
+test Y = "${MULTIARCH}" && 
+{
+script_list="${script_list}
+native-zlib-32.sh
+native-zlib-n32.sh
+native-zlib-64.sh"
+} || {
+script_list="${script_list}
+native-zlib.sh"
+}
+
+script_list="${script_list}
+native-findutils.sh
+native-gawk.sh"
+
+test Y = "${MULTIARCH}" && 
+{
+script_list="${script_list}
+native-ncurses-32.sh
+native-ncurses-n32.sh
+native-ncurses-64.sh"
+} || {
+script_list="${script_list}
+native-ncurses.sh"
+}
+
+test Y = "${USE_READLINE}" && 
+{
+test Y = "${MULTIARCH}" && 
+{
+script_list="${script_list}
+native-readline-32.sh
+native-readline-n32.sh
+native-readline-64.sh"
+} || {
+script_list="${script_list}
+native-readline.sh"
+}
+}
+
+script_list="${script_list}
+native-vim.sh
+native-m4.sh
+native-bison.sh
+native-less.sh
+native-groff.sh
+native-coreutils.sh
+native-sed.sh"
+
+test Y = "${MULTIARCH}" && 
+{
+script_list="${script_list}
+native-flex-32.sh
+native-flex-n32.sh
+native-flex-64.sh
+native-gettext-32.sh
+native-gettext-n32.sh
+native-gettext-64.sh
+native-nettools.sh
+native-inetutils.sh
+native-iproute2.sh
+native-perl-32.sh
+native-perl-n32.sh
+native-perl-64.sh
+native-texinfo.sh
+native-autoconf.sh
+native-automake.sh
+native-bash.sh
+native-file-32.sh
+native-file-n32.sh
+native-file-64.sh"
+} || {
+script_list="${script_list}
+native-flex.sh
+native-gettext.sh
+native-nettools.sh
+native-inetutils.sh
+native-iproute2.sh
+native-perl.sh
+native-texinfo.sh
+native-autoconf.sh
+native-automake.sh
+native-bash.sh
+native-file.sh"
+}
+
+# ARGH libtool.. gonna have to do some 
+# thinking about how to handle this for bi-arch...
+test Y = "${MULTIARCH}" && 
+{
+script_list="${script_list}
+native-libtool-32.sh
+native-libtool-n32.sh
+native-libtool-64.sh"
+} || {
+script_list="${script_list}
+native-libtool.sh"
+}
+
+test Y = "${MULTIARCH}" && 
+{
+script_list="${script_list}
+native-bzip2-32.sh
+native-bzip2-n32.sh
+native-bzip2-64.sh"
+} || {
+script_list="${script_list}
+native-bzip2.sh"
+}
+
+script_list="${script_list}
+native-diffutils.sh
+native-ed.sh
+native-kbd.sh
+native-e2fsprogs.sh
+native-grep.sh
+native-gzip.sh
+native-man.sh
+native-make.sh
+native-module-init-tools.sh
+native-patch.sh
+native-procinfo.sh"
+
+test Y = "${MULTIARCH}" && 
+{
+script_list="${script_list}
+native-procps-32.sh
+native-procps-n32.sh
+native-procps-64.sh
+native-shadow-32.sh
+native-shadow-n32.sh
+native-shadow-64.sh"
+} || {
+script_list="${script_list}
+native-procps.sh
+native-shadow.sh"
+}
+
+script_list="${script_list}
+native-sysklogd.sh
+native-sysvinit.sh
+native-tar.sh
+native-util-linux.sh
+native-dev.sh"
+
+
+
+SCRIPTLIST=`echo "${script_list}" | \
+  sed "s@\(.*\)@${scripts_dir}/\1@"`
+
+# Check if we are resuming from a particular script
+test ! -z "${1}" &&
+{
+   SCRIPTLIST=`echo ${SCRIPTLIST} | sed "s@.*\(${1}.*\)@\1@g"`
+}
+                                                                                
+echo ' o Checking for needed sources and tarballs'
+check_tarballs ${SCRIPTLIST}
+                                                                                
+for script in ${SCRIPTLIST}; do
+   echo "Running ${SCRIPTS}/${script}"
+   # HACK: export SELF to be the script we are running
+   #       (keeps logfile output correct)
+   export SELF=${script}
+   ${SCRIPTS}/${script}
+
+   test 0 = ${?} ||
+   {
+      echo
+      echo "Failed script was ${script}"
+      echo "Please fix the error above from"
+      echo "   ${SCRIPTS}/${script}"
+      echo "and rerun the build with the command"
+      echo
+      echo "   ${0} $script"
+      echo
+      echo "to resume the build."
+      exit 1
+   }
+done
Index: scripts/build-native.sh
===================================================================
--- scripts/build-native.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/build-native.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,270 @@
+#!/bin/bash
+
+# build-native.sh 
+#
+# Script to finish build for target natively
+# 
+# Authors: Ryan Oliver <ryan.oliver@pha.com.au
+#          Finn Thain
+#
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+
+set +h
+
+# Set SELF to be name of script called, minus any path...
+SELF=$(basename ${0})
+echo "Running ${SELF}"
+VERSION="3.0.1"
+DATE=$(date +'%Y%m%d')
+export DATE
+
+# Read in build configuration information
+# plfs-config should reside in the same directory as this script.
+# We need to use dirname to determine where to find it as SCRIPTS
+# env var is not set yet (set in plfs-config itself)
+. `dirname ${0}`/plfs-config
+
+# Sanity check, are ${LFS}, ${HST_TOOLS} and ${TGT_TOOLS} set?
+if [ "X${LFS}" = "X" -o "X${HST_TOOLS}" = "X" -o "X${TGT_TOOLS}" = "X" ]; then
+   echo "Error: Not all required environment vars have been set." 1>&2
+   echo "       Check plfs-config" 1>&2
+   exit 1
+fi
+
+export LFS=""
+
+# Get package version information
+. ${SCRIPTS}/plfs-packages
+
+# Source Functions and definitions
+. ${SCRIPTS}/build-init.sh
+
+
+set +x
+unset LD_LIBRARY_PATH
+unset LD_PRELOAD
+
+# Configure uses these if set, and will not look for a cross-compiler
+unset CC CXX
+
+export LDFLAGS="-s"
+
+# Setup PATH
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin
+export PATH=${PATH}:${TGT_TOOLS}/bin:${TGT_TOOLS}/sbin
+
+# If ${SRC} does not exist, create it
+test -d ${SRC} || mkdir -p ${SRC}
+
+mkdir -p ${CONFLOGS}
+mkdir -p ${BUILDLOGS}
+mkdir -p ${INSTLOGS}
+mkdir -p ${TESTLOGS}
+cd ${SRC}
+
+#scripts_dir="cross-scripts-${VERSION}"
+scripts_dir="native-scripts"
+
+# scripts for building target tools
+test "Y" = "${MULTIARCH}" &&
+{
+script_list="temp-tcl-32.sh
+temp-tcl-64.sh
+temp-expect-32.sh
+temp-expect-64.sh
+temp-dejagnu.sh
+temp-texinfo.sh
+temp-perl-32.sh
+temp-perl-64.sh
+copy-kern-hdrs.sh
+native-glibc-32.sh
+native-glibc-64.sh"
+} || {
+script_list="temp-tcl.sh
+temp-expect.sh
+temp-dejagnu.sh
+temp-texinfo.sh
+temp-perl.sh
+copy-kern-hdrs.sh
+native-glibc.sh"
+}
+
+script_list="${script_list}
+temp-binutils.sh
+specs-mod.sh
+native-binutils.sh
+native-gcc.sh"
+
+test Y = "${MULTIARCH}" && 
+{
+script_list="${script_list}
+native-zlib-32.sh
+native-zlib-64.sh"
+} || {
+script_list="${script_list}
+native-zlib.sh"
+}
+
+script_list="${script_list}
+native-findutils.sh
+native-gawk.sh"
+
+test Y = "${MULTIARCH}" && 
+{
+script_list="${script_list}
+native-ncurses-32.sh
+native-ncurses-64.sh"
+} || {
+script_list="${script_list}
+native-ncurses.sh"
+}
+
+test Y = "${USE_READLINE}" && 
+{
+test Y = "${MULTIARCH}" && 
+{
+script_list="${script_list}
+native-readline-32.sh
+native-readline-64.sh"
+} || {
+script_list="${script_list}
+native-readline.sh"
+}
+}
+
+script_list="${script_list}
+native-vim.sh
+native-m4.sh
+native-bison.sh
+native-less.sh
+native-groff.sh
+native-coreutils.sh
+native-sed.sh"
+
+test Y = "${MULTIARCH}" && 
+{
+script_list="${script_list}
+native-flex-32.sh
+native-flex-64.sh
+native-gettext-32.sh
+native-gettext-64.sh
+native-nettools.sh
+native-inetutils.sh
+native-iproute2.sh
+native-perl-32.sh
+native-perl-64.sh
+native-texinfo.sh
+native-autoconf.sh
+native-automake.sh
+native-bash.sh
+native-file-32.sh
+native-file-64.sh"
+} || {
+script_list="${script_list}
+native-flex.sh
+native-gettext.sh
+native-nettools.sh
+native-inetutils.sh
+native-iproute2.sh
+native-perl.sh
+native-texinfo.sh
+native-autoconf.sh
+native-automake.sh
+native-bash.sh
+native-file.sh"
+}
+
+# ARGH libtool.. gonna have to do some 
+# thinking about how to handle this for bi-arch...
+test Y = "${MULTIARCH}" && 
+{
+script_list="${script_list}
+native-libtool-32.sh
+native-libtool-64.sh"
+} || {
+script_list="${script_list}
+native-libtool.sh"
+}
+
+test Y = "${MULTIARCH}" && 
+{
+script_list="${script_list}
+native-bzip2-32.sh
+native-bzip2-64.sh"
+} || {
+script_list="${script_list}
+native-bzip2.sh"
+}
+
+script_list="${script_list}
+native-diffutils.sh
+native-ed.sh
+native-kbd.sh
+native-e2fsprogs.sh
+native-grep.sh
+native-gzip.sh
+native-man.sh
+native-make.sh
+native-module-init-tools.sh
+native-patch.sh
+native-procinfo.sh"
+
+test Y = "${MULTIARCH}" && 
+{
+script_list="${script_list}
+native-procps-32.sh
+native-procps-64.sh
+native-shadow-32.sh
+native-shadow-64.sh"
+} || {
+script_list="${script_list}
+native-procps.sh
+native-shadow.sh"
+}
+
+script_list="${script_list}
+native-sysklogd.sh
+native-sysvinit.sh
+native-tar.sh
+native-util-linux.sh
+native-dev.sh"
+
+# Final setup of profile/bashrc scripts etc
+script_list="${script_list}
+post-lfs-configuration.sh"
+
+SCRIPTLIST=`echo "${script_list}" | \
+  sed "s@\(.*\)@${scripts_dir}/\1@"`
+
+# Check if we are resuming from a particular script
+test ! -z "${1}" &&
+{
+   SCRIPTLIST=`echo ${SCRIPTLIST} | sed "s@.*\(${1}.*\)@\1@g"`
+}
+                                                                                
+echo ' o Checking for needed sources and tarballs'
+check_tarballs ${SCRIPTLIST}
+                                                                                
+for script in ${SCRIPTLIST}; do
+   echo "Running ${SCRIPTS}/${script}"
+   # HACK: export SELF to be the script we are running
+   #       (keeps logfile output correct)
+   export SELF=${script}
+   ${SCRIPTS}/${script}
+
+   test 0 = ${?} ||
+   {
+      echo
+      echo "Failed script was ${script}"
+      echo "Please fix the error above from"
+      echo "   ${SCRIPTS}/${script}"
+      echo "and rerun the build with the command"
+      echo
+      echo "   ${0} $script"
+      echo
+      echo "to resume the build."
+      exit 1
+   }
+done
Index: scripts/build-target-triarch.sh
===================================================================
--- scripts/build-target-triarch.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/build-target-triarch.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,210 @@
+#!/bin/bash
+
+# build-target.sh 
+#
+# Script for cross building target native tools
+# 
+# Authors: Ryan Oliver <ryan.oliver@pha.com.au
+#          Finn Thain
+#
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+
+set +h
+
+# Set SELF to be name of script called, minus any path...
+SELF=$(basename ${0})
+echo "Running ${SELF}"
+VERSION="2.4.4"
+DATE=$(date +'%Y%m%d')
+export DATE
+
+# Read in build configuration information
+# plfs-config should reside in the same directory as this script.
+# We need to use dirname to determine where to find it as SCRIPTS
+# env var is not set yet (set in plfs-config itself)
+. `dirname ${0}`/plfs-config
+
+# Sanity check, are ${LFS}, ${HST_TOOLS} and ${TGT_TOOLS} set?
+if [ "X${LFS}" = "X" -o "X${HST_TOOLS}" = "X" -o "X${TGT_TOOLS}" = "X" ]; then
+   echo "Error: Not all required environment vars have been set." 1>&2
+   echo "       Check plfs-config" 1>&2
+   exit 1
+fi
+
+# Get package version information
+. ${SCRIPTS}/plfs-packages
+
+# Source Functions and definitions
+. ${SCRIPTS}/build-init.sh
+
+
+set +x
+unset LD_LIBRARY_PATH
+unset LD_PRELOAD
+
+# Configure uses these if set, and will not look for a cross-compiler
+unset CC CXX
+
+export LDFLAGS="-s"
+
+# Setup PATH
+#export PATH=/bin:/sbin:/usr/bin:/usr/sbin
+export PATH=${HST_TOOLS}/bin:${HST_TOOLS}/sbin:${PATH}
+
+# If ${SRC} does not exist, create it
+test -d ${SRC} || mkdir -p ${SRC}
+
+if [ ! "${USE_SYSROOT}" = "Y" ]; then                                                      
+   # If ${LFS}${TGT_TOOLS} directory doesn't exist, create it
+   test -d ${LFS}${TGT_TOOLS} || mkdir -p ${LFS}${TGT_TOOLS}
+
+   # create it ${TGT_TOOLS} symlink
+   if [ ! -d `dirname ${TGT_TOOLS}` ]; then mkdir -p `dirname ${TGT_TOOLS}` ; fi
+   ln -sf ${LFS}${TGT_TOOLS} `dirname ${TGT_TOOLS}`
+fi
+
+mkdir -p ${CONFLOGS}
+mkdir -p ${BUILDLOGS}
+mkdir -p ${INSTLOGS}
+mkdir -p ${TESTLOGS}
+cd ${SRC}
+
+#scripts_dir="cross-scripts-${VERSION}"
+scripts_dir="target-scripts"
+
+# scripts for building target tools
+test "Y" = "${MULTIARCH}" &&
+{
+script_list="target-binutils.sh
+target-gcc.sh
+target-zlib-32.sh
+target-zlib-n32.sh
+target-zlib-64.sh
+target-gawk.sh
+target-coreutils.sh
+target-bzip2-32.sh
+target-bzip2-n32.sh
+target-bzip2-64.sh
+target-gzip.sh
+target-diffutils.sh
+target-findutils.sh
+target-m4.sh
+target-bison.sh
+target-flex.sh
+target-make.sh
+target-grep.sh
+target-sed.sh
+target-gettext-32.sh
+target-gettext-n32.sh
+target-gettext-64.sh
+target-ncurses-32.sh
+target-ncurses-n32.sh
+target-ncurses-64.sh
+target-patch.sh
+target-tar.sh
+target-bash.sh"
+} || {
+script_list="target-binutils.sh
+target-gcc.sh
+target-zlib.sh
+target-gawk.sh
+target-coreutils.sh
+target-bzip2.sh
+target-gzip.sh
+target-diffutils.sh
+target-findutils.sh
+target-m4.sh
+target-bison.sh
+target-flex.sh
+target-make.sh
+target-grep.sh
+target-sed.sh
+target-gettext.sh
+target-ncurses.sh
+target-patch.sh
+target-tar.sh
+target-bash.sh"
+}
+
+# Packages common to both BIARCH and non-BIARCH
+script_list="${script_list}
+target-e2fsprogs.sh
+target-procps.sh
+target-sysvinit.sh
+target-module-init-tools.sh
+target-nettools.sh
+target-inetutils.sh
+target-util-linux.sh
+target-strace.sh
+target-sysklogd.sh"
+
+if [ "${USE_HOTPLUG}" = "Y" ]; then
+script_list="${script_list}
+target-hotplug.sh"
+fi
+
+script_list="${script_list}
+target-dev.sh
+target-lfs-bootscripts.sh
+target-kernel.sh
+target-iana-etc.sh"
+
+#target-modutils.sh
+# Lilo bootloader
+if [ "${USE_LILO}" = "Y" ]; then
+script_list="${script_list}
+host-nasm.sh
+host-bin86.sh
+host-lilo.sh
+target-nasm.sh
+target-bin86.sh
+target-lilo.sh"
+fi
+
+# TODO: add nfs client, tcpwrappers portmap etc scripts
+#       ( to allow us to nfs mount root on target box )
+script_list="${script_list}
+target-nfsutils.sh
+target-tcp-wrappers.sh
+target-portmap.sh"
+
+script_list="${script_list}
+target-iproute2.sh
+target-final-prep-wrapper.sh"
+
+
+SCRIPTLIST=`echo "${script_list}" | \
+  sed "s@\(.*\)@${scripts_dir}/\1@"`
+
+# Check if we are resuming from a particular script
+test ! -z "${1}" &&
+{
+   SCRIPTLIST=`echo ${SCRIPTLIST} | sed "s@.*\(${1}.*\)@\1@g"`
+}
+                                                                                
+echo ' o Checking for needed sources and tarballs'
+check_tarballs ${SCRIPTLIST}
+                                                                                
+for script in ${SCRIPTLIST}; do
+   echo "Running ${SCRIPTS}/${script}"
+   # HACK: export SELF to be the script we are running
+   #       (keeps logfile output correct)
+   export SELF=${script}
+   ${SCRIPTS}/${script}
+
+   test 0 = ${?} ||
+   {
+      echo
+      echo "Failed script was ${script}"
+      echo "Please fix the error above from"
+      echo "   ${SCRIPTS}/${script}"
+      echo "and rerun the build with the command"
+      echo
+      echo "   ${0} $script"
+      echo
+      echo "to resume the build."
+      exit 1
+   }
+done
Index: scripts/build-target.sh
===================================================================
--- scripts/build-target.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/build-target.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,208 @@
+#!/bin/bash
+
+# build-target.sh 
+#
+# Script for cross building target native tools
+# 
+# Authors: Ryan Oliver <ryan.oliver@pha.com.au
+#          Finn Thain
+#
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+
+set +h
+
+# Set SELF to be name of script called, minus any path...
+SELF=$(basename ${0})
+echo "Running ${SELF}"
+VERSION="2.4.4"
+DATE=$(date +'%Y%m%d')
+export DATE
+
+# Read in build configuration information
+# plfs-config should reside in the same directory as this script.
+# We need to use dirname to determine where to find it as SCRIPTS
+# env var is not set yet (set in plfs-config itself)
+. `dirname ${0}`/plfs-config
+
+# Sanity check, are ${LFS}, ${HST_TOOLS} and ${TGT_TOOLS} set?
+if [ "X${LFS}" = "X" -o "X${HST_TOOLS}" = "X" -o "X${TGT_TOOLS}" = "X" ]; then
+   echo "Error: Not all required environment vars have been set." 1>&2
+   echo "       Check plfs-config" 1>&2
+   exit 1
+fi
+
+# Get package version information
+. ${SCRIPTS}/plfs-packages
+
+# Source Functions and definitions
+. ${SCRIPTS}/build-init.sh
+
+
+set +x
+unset LD_LIBRARY_PATH
+unset LD_PRELOAD
+
+# Configure uses these if set, and will not look for a cross-compiler
+unset CC CXX
+
+export LDFLAGS="-s"
+
+# Setup PATH
+#export PATH=/bin:/sbin:/usr/bin:/usr/sbin
+export PATH=${HST_TOOLS}/bin:${HST_TOOLS}/sbin:${PATH}
+
+# If ${SRC} does not exist, create it
+test -d ${SRC} || mkdir -p ${SRC}
+
+if [ ! "${USE_SYSROOT}" = "Y" ]; then
+
+   # If ${LFS}${TGT_TOOLS} directory doesn't exist, create it
+   test -d ${LFS}${TGT_TOOLS} || mkdir -p ${LFS}${TGT_TOOLS}
+                                                                                
+   # Create ${TGT_TOOLS} symlink
+   if [ ! -d `dirname ${TGT_TOOLS}` ]; then mkdir -p `dirname ${TGT_TOOLS}` ; fi
+   ln -sf ${LFS}${TGT_TOOLS} `dirname ${TGT_TOOLS}`
+
+fi
+
+mkdir -p ${CONFLOGS}
+mkdir -p ${BUILDLOGS}
+mkdir -p ${INSTLOGS}
+mkdir -p ${TESTLOGS}
+cd ${SRC}
+
+#scripts_dir="cross-scripts-${VERSION}"
+scripts_dir="target-scripts"
+
+# scripts for building target tools
+test "Y" = "${MULTIARCH}" &&
+{
+script_list="target-binutils.sh
+target-gcc.sh
+target-zlib-32.sh
+target-zlib-64.sh
+target-gawk.sh
+target-coreutils.sh
+target-bzip2-32.sh
+target-bzip2-64.sh
+target-gzip.sh
+target-diffutils.sh
+target-findutils.sh
+target-m4.sh
+target-bison.sh
+target-flex.sh
+target-make.sh
+target-grep.sh
+target-sed.sh
+target-gettext-32.sh
+target-gettext-64.sh
+target-ncurses-32.sh
+target-ncurses-64.sh
+target-patch.sh
+target-tar.sh
+target-bash.sh"
+} || {
+script_list="target-binutils.sh
+target-gcc.sh
+target-zlib.sh
+target-gawk.sh
+target-coreutils.sh
+target-bzip2.sh
+target-gzip.sh
+target-diffutils.sh
+target-findutils.sh
+target-m4.sh
+target-bison.sh
+target-flex.sh
+target-make.sh
+target-grep.sh
+target-sed.sh
+target-gettext.sh
+target-ncurses.sh
+target-patch.sh
+target-tar.sh
+target-bash.sh"
+}
+
+# Packages common to both BIARCH and non-BIARCH
+script_list="${script_list}
+target-e2fsprogs.sh
+target-procps.sh
+target-sysvinit.sh
+target-module-init-tools.sh
+target-nettools.sh
+target-inetutils.sh
+target-util-linux.sh
+target-strace.sh
+target-sysklogd.sh"
+
+if [ "${USE_HOTPLUG}" = "Y" ]; then
+script_list="${script_list}
+target-hotplug.sh"
+fi
+
+script_list="${script_list}
+target-dev.sh
+target-lfs-bootscripts.sh
+target-kernel.sh
+target-iana-etc.sh"
+
+#target-modutils.sh
+# Lilo bootloader
+if [ "${USE_LILO}" = "Y" ]; then
+script_list="${script_list}
+host-nasm.sh
+host-bin86.sh
+host-lilo.sh
+target-nasm.sh
+target-bin86.sh
+target-lilo.sh"
+fi
+
+# TODO: add nfs client, tcpwrappers portmap etc scripts
+#       ( to allow us to nfs mount root on target box )
+script_list="${script_list}
+target-nfsutils.sh
+target-tcp-wrappers.sh
+target-portmap.sh"
+
+script_list="${script_list}
+target-iproute2.sh
+target-final-prep-wrapper.sh"
+
+
+SCRIPTLIST=`echo "${script_list}" | \
+  sed "s@\(.*\)@${scripts_dir}/\1@"`
+
+# Check if we are resuming from a particular script
+test ! -z "${1}" &&
+{
+   SCRIPTLIST=`echo ${SCRIPTLIST} | sed "s@.*\(${1}.*\)@\1@g"`
+}
+                                                                                
+echo ' o Checking for needed sources and tarballs'
+check_tarballs ${SCRIPTLIST}
+                                                                                
+for script in ${SCRIPTLIST}; do
+   echo "Running ${SCRIPTS}/${script}"
+   # HACK: export SELF to be the script we are running
+   #       (keeps logfile output correct)
+   export SELF=${script}
+   ${SCRIPTS}/${script}
+
+   test 0 = ${?} ||
+   {
+      echo
+      echo "Failed script was ${script}"
+      echo "Please fix the error above from"
+      echo "   ${SCRIPTS}/${script}"
+      echo "and rerun the build with the command"
+      echo
+      echo "   ${0} $script"
+      echo
+      echo "to resume the build."
+      exit 1
+   }
+done
Index: scripts/cross-scripts/cross-binutils.sh
===================================================================
--- scripts/cross-scripts/cross-binutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/cross-scripts/cross-binutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,148 @@
+#!/bin/bash
+
+# cross-lfs cross-binutils build
+# ------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG="binutils-cross.log"
+
+#NOTE: This to be revisited... could well be satisfied by setup_multiarch...
+set -x
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   vendor_os=`echo ${TARGET} | sed 's@\([^-]*\)-\(.*\)@\2@'`
+   case ${TGT_ARCH} in
+      x86_64 )
+      ;;
+      mipsel* | mips64el )
+         TARGET=mips64el-${vendor_os}
+      ;;
+      sparc* )
+         TARGET=sparc64-${vendor_os}
+      ;;
+      powerpc* | ppc* )
+         TARGET=powerpc64-${vendor_os}
+      ;;
+      s390* )
+         TARGET=s390x-${vendor_os}
+      ;;
+      * )
+         # TODO: add some error messages etc
+         barf
+      ;;
+   esac
+fi
+
+# if target is same as build host, adjust host slightly to
+# trick configure so we do not produce native tools
+if [ "${TARGET}" = "${BUILD}" ]; then
+   althost=`echo ${BUILD} | sed 's@\([_a-zA-Z0-9]*\)\(-[_a-zA-Z0-9]*\)\(.*\)@\1\2x\3@'`
+   extra_conf="--host=${althost}"
+fi
+     
+set +x
+ 
+unpack_tarball binutils-${BINUTILS_VER} &&
+                                                                                
+# Determine whether this binutils requires
+# 'make configure-host' and whether
+# ld search path can be set with --with-lib-path.
+# Returned in ${BINUTILS_CONF_HOST} and
+# ${BINUTILS_WITH_LIB_PATH} respectively
+                                                                                
+# TODO: check for architecture specific patches in check_binutils
+#       ( alpha )
+check_binutils
+
+cd ${SRC}/${PKGDIR}
+                                                                                
+case ${BINUTILS_VER} in
+   # 20031015 - fix static linking issues during testsuite
+   #            with current CVS glibc. kernel 2.5.68+
+   #            Will only patch HJL 2.14.90.0.[6-7]
+   2.14.90.0.[6-7] ) apply_patch binutils-2.14.90.0.7-fix-static-link ;;
+
+   # Issue with HJL binutils 2.15.94.0.1 stripping needed information
+   # one manifestation is with stripping TLS info from libc.a 
+   2.15.94.0.1 ) apply_patch binutils-2.15.94.0.1-fix-strip-1 ;;
+esac
+                                                                                
+# Check if we have sysroot set
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   # if sysroot not already defined, set it to ${LFS}
+   extra_conf="${extra_conf} --with-sysroot=${LFS}"
+   INSTALL_PREFIX=${LFS}/usr
+else
+   # sysroot not set, just set libpath
+   test Y == "${BINUTILS_WITH_LIB_PATH}" &&
+      BINUTILS_LIB_PATH="--with-lib-path=${TGT_TOOLS}/lib" ||
+      BINUTILS_LIB_PATH=""
+
+   INSTALL_PREFIX=${TGT_TOOLS}
+fi
+
+# These are probably not required for sysrooted builds, but
+# they don't hurt...
+case ${BINUTILS_VER} in
+   2.14 )
+      apply_patch binutils-2.14-genscripts-multilib
+   ;;
+   2.14.90.0.8 )
+      apply_patch binutils-2.14.90.0.8-genscripts-multilib
+   ;;
+   # Following works for HJL and FSF binutils 2.15
+   2.15.9[0124].0.* | 2.15 )
+      apply_patch binutils-2.15.91.0.1-genscripts-multilib-2
+   ;;
+   # Following works for HJL and FSF binutils 2.15
+   2.16* )
+      apply_patch binutils-2.15.91.0.1-genscripts-multilib-2
+   ;;
+esac
+
+cd ${SRC}
+                                                                                
+# Remove pre-existing build directory and recreate
+test -d binutils-${BINUTILS_VER}-cross-build &&
+   rm -rf binutils-${BINUTILS_VER}-cross-build
+                                                                                
+mkdir binutils-${BINUTILS_VER}-cross-build
+cd binutils-${BINUTILS_VER}-cross-build
+
+max_log_init Binutils ${BINUTILS_VER} Cross ${CONFLOGS} ${LOG}
+../${PKGDIR}/configure --prefix=${HST_TOOLS} \
+   --target=${TARGET} ${extra_conf} --disable-nls \
+   --enable-shared ${SYSROOT_OPTS} \
+   --enable-64-bit-bfd ${BINUTILS_LIB_PATH} \
+   >> ${LOGFILE} 2>&1 &&
+{
+   # Run make configure-host if required
+   test Y != "${BINUTILS_CONF_HOST}" ||
+   {
+      echo -e "\nmake configure-host\n${BRKLN}" >> ${LOGFILE}
+      make configure-host >> ${LOGFILE} 2>&1
+   }
+} &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+#make ${PMFLAGS} headers -C bfd \
+make headers -C bfd \
+   >> ${LOGFILE} 2>&1 &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o All OK" || barf
+
+# Copy over libiberty.h
+cp -p ${SRC}/${PKGDIR}/include/libiberty.h ${INSTALL_PREFIX}/include/libiberty.h
+
Index: scripts/cross-scripts/cross-gcc-final.sh
===================================================================
--- scripts/cross-scripts/cross-gcc-final.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/cross-scripts/cross-gcc-final.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,164 @@
+#!/bin/bash
+
+# cross-lfs cross-gcc final build
+# -------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+### GCC ( shared ) ###
+
+cd ${SRC}
+
+LOG="gcc-cross-final.log"
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   vendor_os=`echo ${TARGET} | sed 's@\([^-]*\)-\(.*\)@\2@'`
+   case ${TGT_ARCH} in
+      x86_64 )
+      ;;
+      sparc* )
+         TARGET=sparc64-${vendor_os}
+      ;;
+      powerpc* | ppc* )
+         TARGET=powerpc64-${vendor_os}
+      ;;
+      s390* )
+         TARGET=s390x-${vendor_os}
+      ;;
+      mips*el* )
+         TARGET=mips64el-${vendor_os}
+      ;;
+      * )
+         # TODO: add some error messages etc
+         barf
+      ;;
+   esac
+
+else
+   # If we are not multi-arch, disable multilib
+   extra_conf="--enable-multilib=no"
+
+   # HACK: this sets abi to n32 with mips... this should be handled
+   # by the multiarch funcs somehow... and set according to DEFAULTENV
+   case ${TGT_ARCH} in
+      mips* )
+         extra_conf="${extra_conf} --with-abi=${DEFAULTENV}"
+      ;;
+   esac
+fi
+
+# if target is same as build host, adjust host slightly to
+# trick configure so we do not produce native tools
+if [ "${TARGET}" = "${BUILD}" ]; then
+   althost=`echo ${BUILD} | sed 's@\([_a-zA-Z0-9]*\)\(-[_a-zA-Z0-9]*\)\(.*\)@\1\2x\3@'`
+   extra_conf="--host=${althost} ${extra_conf}"
+fi
+
+# if target has no floating point unit, use soft float
+if [ "${WITHOUT_FPU}" = "Y" ]; then
+   extra_conf="${extra_conf} --with-float=soft"
+fi
+
+unpack_tarball gcc-${GCC_VER}
+
+#3.0 20030427
+# Cannot trust ${GCC_VER} to supply us with the correct
+# gcc version (especially if cvs).
+# Grab it straight from version.c
+cd ${SRC}/${PKGDIR}
+target_gcc_ver=`grep version_string gcc/version.c | \
+                sed 's@.* = \(\|"\)\([0-9.]*\).*@\2@g'`
+# As of gcc4, the above doesn't cut it... check gcc/BASE-VER
+if [ -z "${target_gcc_ver}" -a -f gcc/BASE-VER ]; then
+   target_gcc_ver=`cat gcc/BASE-VER`
+fi
+
+# Apply linkonce patch for gcc (should be fixed come gcc 3.4.4)
+cd ${SRC}/${PKGDIR}
+case ${target_gcc_ver} in
+   3.4.3 ) apply_patch gcc-3.4.3-linkonce-1
+           apply_patch gcc-3.4.0-arm-bigendian
+           apply_patch gcc-3.4.0-arm-nolibfloat
+           apply_patch gcc-3.4.0-arm-lib1asm
+           apply_patch gcc-3.4.3-clean_exec_and_lib_search_paths_when_cross-1
+   ;;
+   4.0.0 ) apply_patch gcc-4.0.0-fix_tree_optimisation_PR21173
+           apply_patch gcc-4.0.0-reload_check_uninitialized_pseudos_PR20973
+           apply_patch gcc-4.0.0-clean_exec_and_lib_search_paths_when_cross-1
+   ;;
+esac
+
+# if we are using gcc-3.4x, set libexecdir to */${libdirname}
+case ${target_gcc_ver} in
+   3.4* | 4.* )
+      extra_conf="${extra_conf} --libexecdir=${HST_TOOLS}/${libdirname}"
+   ;;
+esac
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   extra_conf="${extra_conf} --with-sysroot=${LFS}"
+else
+   # LFS style build
+   #----------------
+
+   # source functions for required gcc modifications
+   . ${SCRIPTS}/funcs/cross_gcc-funcs.sh
+
+   # Alter the generated specs file to 
+   #  o set dynamic linker to be under ${TGT_TOOLS}/lib{,32,64}
+   #  o set startfile_prefix_spec so we search for startfiles
+   #    under ${TGT_TOOLS}/lib/lib{,32,64}
+   gcc_specs_mod
+
+   # Set cpp's default include search path, and the header search path 
+   # used by fixincludes to be ${TGT_TOOLS}/include
+   cpp_set_cross_system_header_dir
+
+   # fix configure so that shared libgcc gets built against the correct
+   # startfiles if the user sets ${TGT_TOOLS} = ${HOST_TOOLS}/${TARGET}
+   configure_fix_flags_for_target
+fi
+
+test -d ${SRC}/gcc-${GCC_VER}-cross-final &&
+   rm -rf ${SRC}/gcc-${GCC_VER}-cross-final
+
+mkdir -p ${SRC}/gcc-${GCC_VER}-cross-final &&
+cd ${SRC}/gcc-${GCC_VER}-cross-final &&
+
+# NOTE:
+# Some errors occur on solaris where bash syntax is used with a
+# standard /bin/sh ( ie: expecting $(command) to be evaluated )
+# To avoid this issue we override make's default shell with
+# /bin/bash
+# This is done via passing CONFIG_SHELL=/bin/bash to
+# configure, which uses this when it specifies SHELL in
+# the Makefiles.
+
+max_log_init Gcc ${GCC_VER} cross-pt2 ${CONFLOGS} ${LOG}
+#CONFIG_SHELL=/bin/bash \
+CFLAGS="-O2 ${HOST_CFLAGS} -pipe" \
+../${PKGDIR}/configure --prefix=${HST_TOOLS} \
+   --target=${TARGET} ${extra_conf} --with-local-prefix=${TGT_TOOLS} \
+   --enable-languages=c,c++ --enable-__cxa_atexit \
+   --enable-c99 --enable-long-long --enable-threads=posix \
+   --disable-nls --enable-shared \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" || barf
+#   --enable-languages=c,c++,f77,objc,ada,java,pascal,treelang --enable-__cxa_atexit \
+
+min_log_init ${BUILDLOGS} &&
+#make ${PMFLAGS} BOOT_CFLAGS="-O2 ${HOST_CFLAGS} -pipe" \
+#   STAGE1_CFLAGS="-O2 ${HOST_CFLAGS} -pipe" all \
+make ${PMFLAGS} \
+   CFLAGS_FOR_TARGET="-O2 -pipe ${TGT_CFLAGS}" \
+   CXXFLAGS_FOR_TARGET="-O2 -pipe ${TGT_CFLAGS}" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Install OK" || barf
+
Index: scripts/cross-scripts/cross-gcc-shared.sh
===================================================================
--- scripts/cross-scripts/cross-gcc-shared.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/cross-scripts/cross-gcc-shared.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,177 @@
+#!/bin/bash
+
+# cross-lfs cross-gcc w shared libgcc build
+# -----------------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+
+LOG="gcc-cross-shared.log"
+
+if [ "Y" = "${MULTIARCH}" ]; then
+
+   vendor_os=`echo ${TARGET} | sed 's@\([^-]*\)-\(.*\)@\2@'`
+
+   case ${TGT_ARCH} in
+      x86_64 )
+      ;;
+      sparc* )
+         TARGET=sparc64-${vendor_os}
+      ;;
+      powerpc* | ppc* )
+         TARGET=powerpc64-${vendor_os}
+      ;;
+      s390* )
+         TARGET=s390x-${vendor_os}
+      ;;
+      mips*el* )
+         TARGET=mips64el-${vendor_os}
+      ;;
+      * )
+         # TODO: add some error messages etc
+         barf
+      ;;
+   esac
+
+else
+   # If we are not bi-arch, disable multilib
+   extra_conf="--enable-multilib=no"
+
+   # HACK: this sets abi to n32 with mips... this should be handled
+   # by the multiarch funcs somehow... and set according to DEFAULTENV
+   case ${TGT_ARCH} in
+      mips* )
+         extra_conf="${extra_conf} --with-abi=${DEFAULTENV}"
+      ;;
+   esac
+fi
+
+# if target is same as build host, adjust host slightly to
+# trick configure so we do not produce native tools
+if [ "${TARGET}" = "${BUILD}" ]; then
+#   extra_conf="--host=${BUILD}x"
+   althost=`echo ${BUILD} | sed 's@\([_a-zA-Z0-9]*\)\(-[_a-zA-Z0-9]*\)\(.*\)@\1\2x\3@'`
+   extra_conf="--host=${althost} ${extra_conf}"
+fi
+
+# if target has no floating point unit, use soft float
+if [ "${WITHOUT_FPU}" = "Y" ]; then
+   extra_conf="${extra_conf} --with-float=soft"
+fi
+
+unpack_tarball gcc-${GCC_VER}
+
+#3.0 20030427
+# Cannot trust ${GCC_VER} to supply us with the correct
+# gcc version (especially if cvs).
+# Grab it straight from version.c
+cd ${SRC}/${PKGDIR}
+target_gcc_ver=`grep version_string gcc/version.c | \
+                sed 's@.* = \(\|"\)\([0-9.]*\).*@\2@g'`
+# As of gcc4, the above doesn't cut it... check gcc/BASE-VER
+if [ -z "${target_gcc_ver}" -a -f gcc/BASE-VER ]; then
+   target_gcc_ver=`cat gcc/BASE-VER`
+fi
+
+# Apply linkonce patch for gcc (should be fixed come gcc 3.4.4)
+cd ${SRC}/${PKGDIR}
+case ${target_gcc_ver} in
+   3.4.3 ) apply_patch gcc-3.4.3-linkonce-1
+           apply_patch gcc-3.4.0-arm-bigendian
+           apply_patch gcc-3.4.0-arm-nolibfloat
+           apply_patch gcc-3.4.0-arm-lib1asm
+           apply_patch gcc-3.4.3-clean_exec_and_lib_search_paths_when_cross-1
+   ;;
+   4.0.0 ) apply_patch gcc-4.0.0-fix_tree_optimisation_PR21173
+           apply_patch gcc-4.0.0-reload_check_uninitialized_pseudos_PR20973
+           apply_patch gcc-4.0.0-clean_exec_and_lib_search_paths_when_cross-1
+   ;;
+esac
+
+# if we are using gcc-3.4x, set libexecdir to */${libdirname}
+case ${target_gcc_ver} in
+   3.4* | 4.* )
+      extra_conf="${extra_conf} --libexecdir=${HST_TOOLS}/${libdirname}"
+   ;;
+esac
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   extra_conf="${extra_conf} --with-sysroot=${LFS}"
+else
+   # LFS style build
+   #----------------
+
+   # source functions for required gcc modifications
+   . ${SCRIPTS}/funcs/cross_gcc-funcs.sh
+
+   # Alter the generated specs file to 
+   #  o set dynamic linker to be under ${TGT_TOOLS}/lib{,32,64}
+   #  o set startfile_prefix_spec so we search for startfiles
+   #    under ${TGT_TOOLS}/lib/lib{,32,64}
+   gcc_specs_mod
+
+   # Set cpp's default include search path, and the header search path 
+   # used by fixincludes to be ${TGT_TOOLS}/include
+   cpp_set_cross_system_header_dir
+
+   # fix configure so that shared libgcc gets built against the correct
+   # startfiles if the user sets ${TGT_TOOLS} = ${HOST_TOOLS}/${TARGET}
+   configure_fix_flags_for_target
+fi
+
+
+# The following needs to be done if we are configuring gcc without
+#   --disable-shared
+# We need to Strip "-lc" from the shared libs list. We don't have libc yet...
+# Altered files are
+#    gcc/config/t-slibgcc-elf-ver and
+#    gcc/config/t-libunwind (for ia64)
+#
+cd ${SRC}/${PKGDIR}/gcc
+for file in config/t-slibgcc-elf-ver config/t-libunwind; do
+   test -f ${file}-ORIG ||
+      mv ${file} ${file}-ORIG
+   sed '/^SHLIB_LC = /s@-lc@@' ${file}-ORIG > ${file}
+done
+
+test -d ${SRC}/gcc-${GCC_VER}-cross-shared &&
+   rm -rf ${SRC}/gcc-${GCC_VER}-cross-shared
+
+mkdir -p ${SRC}/gcc-${GCC_VER}-cross-shared &&
+cd ${SRC}/gcc-${GCC_VER}-cross-shared &&
+
+# NOTE:
+# Some errors occur on solaris where bash syntax is used with a
+# standard /bin/sh ( ie: expecting $(command) to be evaluated )
+# To avoid this issue we override make's default shell with
+# /bin/bash
+# This is done via passing CONFIG_SHELL=/bin/bash to
+# configure, which uses this when it specifies SHELL in
+# the Makefiles.
+
+max_log_init Gcc ${GCC_VER} cross-pt2 ${CONFLOGS} ${LOG}
+#CONFIG_SHELL=/bin/bash \
+CFLAGS="-O2 ${HOST_CFLAGS} -pipe" \
+../${PKGDIR}/configure --prefix=${HST_TOOLS} \
+   --target=${TARGET} ${extra_conf} \
+   --with-local-prefix=${TGT_TOOLS} --enable-languages=c \
+   --disable-nls --enable-shared \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" || barf
+
+min_log_init ${BUILDLOGS} &&
+#make ${PMFLAGS} BOOT_CFLAGS="-O2 ${HOST_CFLAGS} -pipe" \
+#   STAGE1_CFLAGS="-O ${HOST_CFLAGS} -pipe" all-gcc \
+make ${PMFLAGS} CFLAGS_FOR_TARGET="-O2 -pipe ${TGT_CFLAGS}" all-gcc \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${INSTLOGS} &&
+make install-gcc \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Install OK" || barf
+
Index: scripts/cross-scripts/cross-gcc-static-no-thread.sh
===================================================================
--- scripts/cross-scripts/cross-gcc-static-no-thread.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/cross-scripts/cross-gcc-static-no-thread.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,157 @@
+#!/bin/bash
+
+# cross-lfs cross-gcc w static libgcc (no threads) build
+# ------------------------------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+
+LOG="gcc-cross-static-no-threads.log"
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   vendor_os=`echo ${TARGET} | sed 's@\([^-]*\)-\(.*\)@\2@'`
+   case ${TGT_ARCH} in
+      x86_64 )
+      ;;
+      sparc* )
+         TARGET=sparc64-${vendor_os}
+      ;;
+      powerpc* | ppc* )
+         TARGET=powerpc64-${vendor_os}
+      ;;
+      s390* )
+         TARGET=s390x-${vendor_os}
+      ;;
+      mips*el* )
+         TARGET=mips64el-${vendor_os}
+      ;;
+      * )
+         # TODO: add some error messages etc
+         barf
+      ;;
+   esac
+
+else
+   # If we are not bi-arch, disable multilib
+   extra_conf="--enable-multilib=no"
+
+   # HACK: this sets abi to n32 with mips... this should be handled
+   # by the multiarch funcs somehow... and set according to DEFAULTENV
+   case ${TGT_ARCH} in
+      mips* )
+         extra_conf="${extra_conf} --with-abi=${DEFAULTENV}"
+      ;;
+   esac
+fi
+
+# if target is same as build host, adjust host slightly to
+# trick configure so we do not produce native tools
+if [ "${TARGET}" = "${BUILD}" ]; then
+   althost=`echo ${BUILD} | sed 's@\([_a-zA-Z0-9]*\)\(-[_a-zA-Z0-9]*\)\(.*\)@\1\2x\3@'`
+   extra_conf="--host=${althost} ${extra_conf}"
+fi
+
+unpack_tarball gcc-${GCC_VER}
+
+#3.0 20030427
+# Cannot trust ${GCC_VER} to supply us with the correct
+# gcc version (especially if cvs).
+# Grab it straight from version.c
+cd ${SRC}/${PKGDIR}
+target_gcc_ver=`grep version_string gcc/version.c | \
+                sed 's@.* = \(\|"\)\([0-9.]*\).*@\2@g'`
+# As of gcc4, the above doesn't cut it... check gcc/BASE-VER
+if [ -z "${target_gcc_ver}" -a -f gcc/BASE-VER ]; then
+   target_gcc_ver=`cat gcc/BASE-VER`
+fi
+
+# Apply linkonce patch for gcc (should be fixed come gcc 3.4.4)
+cd ${SRC}/${PKGDIR}
+case ${target_gcc_ver} in
+   3.4.3 ) apply_patch gcc-3.4.3-linkonce-1
+           apply_patch gcc-3.4.0-arm-bigendian
+           apply_patch gcc-3.4.0-arm-nolibfloat
+           apply_patch gcc-3.4.0-arm-lib1asm
+           apply_patch gcc-3.4.3-clean_exec_and_lib_search_paths_when_cross-1
+   ;;
+   4.0.0 ) apply_patch gcc-4.0.0-fix_tree_optimisation_PR21173
+           apply_patch gcc-4.0.0-reload_check_uninitialized_pseudos_PR20973
+           apply_patch gcc-4.0.0-clean_exec_and_lib_search_paths_when_cross-1
+   ;;
+esac
+
+# if we are using gcc-3.4x, set libexecdir to */${libdirname}
+case ${target_gcc_ver} in
+   3.4* | 4.* )
+      extra_conf="${extra_conf} --libexecdir=${HST_TOOLS}/${libdirname}"
+   ;;
+esac
+
+# for some reason the build breaks in the absence of any target glibc headers if
+# a sysroot is used. 
+if [ ! "${USE_SYSROOT}" = "Y" ]; then
+   # LFS style build
+   #----------------
+
+   # source functions for required gcc modifications
+   . ${SCRIPTS}/funcs/cross_gcc-funcs.sh
+
+   # Alter the generated specs file to 
+   #  o set dynamic linker to be under ${TGT_TOOLS}/lib{,32,64}
+   #  o set startfile_prefix_spec so we search for startfiles
+   #    under ${TGT_TOOLS}/lib/lib{,32,64}
+   gcc_specs_mod
+
+   # Set cpp's default include search path, and the header search path 
+   # used by fixincludes to be ${TGT_TOOLS}/include
+   cpp_set_cross_system_header_dir
+fi
+
+test -d ${SRC}/gcc-${GCC_VER}-cross-static-no-threads &&
+   rm -rf ${SRC}/gcc-${GCC_VER}-cross-static-no-threads
+
+mkdir -p ${SRC}/gcc-${GCC_VER}-cross-static-no-threads &&
+cd ${SRC}/gcc-${GCC_VER}-cross-static-no-threads
+
+# initial run does not produce a libgcc_eh.a, nor 
+# libgcc_s.so, gcc_eh objects are packed into the standard libgcc.a .
+# We'd need crt[i1n].o to build these.
+#
+# Unfortunately glibc requires we have libgcc_eh.a for building against
+# 
+
+# NOTE:
+# Some errors occur on solaris where bash syntax is used with a
+# standard /bin/sh ( ie: expecting $(command) to be evaluated )
+# To avoid this issue we override make's default shell with
+# /bin/bash
+# This is done via passing CONFIG_SHELL=/bin/bash to
+# configure, which uses this when it specifies SHELL in 
+# the Makefiles.
+ 
+max_log_init Gcc ${GCC_VER} cross-pt1 ${CONFLOGS} ${LOG}
+#CONFIG_SHELL=/bin/bash \
+CFLAGS="-O2 ${HOST_CFLAGS} -pipe" \
+../${PKGDIR}/configure --prefix=${HST_TOOLS} \
+   --target=${TARGET} ${extra_conf} \
+   --with-local-prefix=${TGT_TOOLS} --enable-languages=c \
+   --disable-nls --disable-shared --disable-threads \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" || barf
+
+min_log_init ${BUILDLOGS} &&
+#make ${PMFLAGS} BOOT_CFLAGS="-O2 ${HOST_CFLAGS} -pipe" \
+ #  STAGE1_CFLAGS="-O ${HOST_CFLAGS} -pipe" all-gcc \
+make all-gcc \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${INSTLOGS} &&
+make install-gcc \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Install OK" || barf
+
Index: scripts/cross-scripts/cross-gcc-static.sh
===================================================================
--- scripts/cross-scripts/cross-gcc-static.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/cross-scripts/cross-gcc-static.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,163 @@
+#!/bin/bash
+
+# cross-lfs cross-gcc w static libgcc build
+# -----------------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+
+LOG="gcc-cross-static.log"
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   vendor_os=`echo ${TARGET} | sed 's@\([^-]*\)-\(.*\)@\2@'`
+   case ${TGT_ARCH} in
+      x86_64 )
+      ;;
+      sparc* )
+         TARGET=sparc64-${vendor_os}
+      ;;
+      powerpc* | ppc* )
+         TARGET=powerpc64-${vendor_os}
+      ;;
+      s390* )
+         TARGET=s390x-${vendor_os}
+      ;;
+      mips*el* )
+         TARGET=mips64el-${vendor_os}
+      ;;
+      * )
+         # TODO: add some error messages etc
+         barf
+      ;;
+   esac
+
+else
+   # If we are not bi-arch, disable multilib
+   extra_conf="--enable-multilib=no"
+
+   # HACK: this sets abi to n32 with mips... this should be handled
+   # by the multiarch funcs somehow... and set according to DEFAULTENV
+   case ${TGT_ARCH} in
+      mips* )
+         extra_conf="${extra_conf} --with-abi=${DEFAULTENV}"
+      ;;
+   esac
+fi
+
+# if target is same as build host, adjust host slightly to
+# trick configure so we do not produce native tools
+if [ "${TARGET}" = "${BUILD}" ]; then
+   althost=`echo ${BUILD} | sed 's@\([_a-zA-Z0-9]*\)\(-[_a-zA-Z0-9]*\)\(.*\)@\1\2x\3@'`
+   extra_conf="--host=${althost} ${extra_conf}"
+fi
+
+# if target has no floating point unit, use soft float
+if [ "${WITHOUT_FPU}" = "Y" ]; then
+   extra_conf="${extra_conf} --with-float=soft"
+fi
+
+unpack_tarball gcc-${GCC_VER}
+
+#3.0 20030427
+# Cannot trust ${GCC_VER} to supply us with the correct
+# gcc version (especially if cvs).
+# Grab it straight from version.c
+cd ${SRC}/${PKGDIR}
+target_gcc_ver=`grep version_string gcc/version.c | \
+                sed 's@.* = \(\|"\)\([0-9.]*\).*@\2@g'`
+# As of gcc4, the above doesn't cut it... check gcc/BASE-VER
+if [ -z "${target_gcc_ver}" -a -f gcc/BASE-VER ]; then
+   target_gcc_ver=`cat gcc/BASE-VER`
+fi
+
+# Apply linkonce patch for gcc (should be fixed come gcc 3.4.4)
+cd ${SRC}/${PKGDIR}
+case ${target_gcc_ver} in
+   3.4.3 ) apply_patch gcc-3.4.3-linkonce-1
+           apply_patch gcc-3.4.0-arm-bigendian
+           apply_patch gcc-3.4.0-arm-nolibfloat
+           apply_patch gcc-3.4.0-arm-lib1asm
+           apply_patch gcc-3.4.3-clean_exec_and_lib_search_paths_when_cross-1
+   ;;
+   4.0.0 ) apply_patch gcc-4.0.0-fix_tree_optimisation_PR21173
+           apply_patch gcc-4.0.0-reload_check_uninitialized_pseudos_PR20973
+           apply_patch gcc-4.0.0-clean_exec_and_lib_search_paths_when_cross-1
+   ;;
+esac
+
+# if we are using gcc-3.4x, set libexecdir to */${libdirname}
+case ${target_gcc_ver} in
+   3.4* | 4.* )
+      extra_conf="${extra_conf} --libexecdir=${HST_TOOLS}/${libdirname}"
+   ;;
+esac
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   extra_conf="${extra_conf} --with-sysroot=${LFS}"
+else
+   # LFS style build
+   #----------------
+
+   # source functions for required gcc modifications
+   . ${SCRIPTS}/funcs/cross_gcc-funcs.sh
+
+   # Alter the generated specs file to 
+   #  o set dynamic linker to be under ${TGT_TOOLS}/lib{,32,64}
+   #  o set startfile_prefix_spec so we search for startfiles
+   #    under ${TGT_TOOLS}/lib/lib{,32,64}
+   gcc_specs_mod
+
+   # Set cpp's default include search path, and the header search path 
+   # used by fixincludes to be ${TGT_TOOLS}/include
+   cpp_set_cross_system_header_dir
+fi
+
+test -d ${SRC}/gcc-${GCC_VER}-cross-static &&
+   rm -rf ${SRC}/gcc-${GCC_VER}-cross-static
+
+mkdir -p ${SRC}/gcc-${GCC_VER}-cross-static &&
+cd ${SRC}/gcc-${GCC_VER}-cross-static
+
+# initial run does not produce a libgcc_eh.a, nor 
+# libgcc_s.so, gcc_eh objects are packed into the standard libgcc.a .
+# We'd need crt[i1n].o to build these.
+#
+# Unfortunately glibc requires we have libgcc_eh.a for building against
+# 
+
+# NOTE:
+# Some errors occur on solaris where bash syntax is used with a
+# standard /bin/sh ( ie: expecting $(command) to be evaluated )
+# To avoid this issue we override make's default shell with
+# /bin/bash
+# This is done via passing CONFIG_SHELL=/bin/bash to
+# configure, which uses this when it specifies SHELL in 
+# the Makefiles.
+ 
+max_log_init Gcc ${GCC_VER} cross-pt1 ${CONFLOGS} ${LOG}
+#CONFIG_SHELL=/bin/bash \
+CFLAGS="-O2 ${HOST_CFLAGS} -pipe" \
+../${PKGDIR}/configure --prefix=${HST_TOOLS} \
+   --target=${TARGET} ${extra_conf} \
+   --with-local-prefix=${TGT_TOOLS} --enable-languages=c \
+   --disable-nls --disable-shared \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" || barf
+
+min_log_init ${BUILDLOGS} &&
+#make ${PMFLAGS} BOOT_CFLAGS="-O2 ${HOST_CFLAGS} -pipe" \
+#  STAGE1_CFLAGS="-O ${HOST_CFLAGS} -pipe" all-gcc \
+#     LIBGCC2_CFLAGS="${TGT_CFLAGS}" all-gcc \
+make CFLAGS_FOR_TARGET="-O2 -pipe ${TGT_CFLAGS}"  all-gcc \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${INSTLOGS} &&
+make install-gcc \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Install OK" || barf
+
Index: scripts/cross-scripts/cross-glibc-crtobjs-32.sh
===================================================================
--- scripts/cross-scripts/cross-glibc-crtobjs-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/cross-scripts/cross-glibc-crtobjs-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+cross-glibc-crtobjs.sh
Index: scripts/cross-scripts/cross-glibc-crtobjs-64.sh
===================================================================
--- scripts/cross-scripts/cross-glibc-crtobjs-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/cross-scripts/cross-glibc-crtobjs-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+cross-glibc-crtobjs.sh
Index: scripts/cross-scripts/cross-glibc-crtobjs-n32.sh
===================================================================
--- scripts/cross-scripts/cross-glibc-crtobjs-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/cross-scripts/cross-glibc-crtobjs-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+cross-glibc-crtobjs.sh
Index: scripts/cross-scripts/cross-glibc-crtobjs.sh
===================================================================
--- scripts/cross-scripts/cross-glibc-crtobjs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/cross-scripts/cross-glibc-crtobjs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,154 @@
+#!/bin/bash
+
+# cross-lfs glibc startfiles build
+# --------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+
+# Defaults
+LOG="glibc-cross-crt-objs.log"
+libdirname=lib
+
+
+# Test how this script has been called.
+# This should only really get called during bi-arch/multi-lib  builds
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+
+if [ -z "${ALT_TGT}" ]; then ALT_TGT="${TARGET}" ; fi
+
+# if target = build, modify build slightly to
+# trick configure into believing we are cross compiling
+# and avoid some configure checks
+if [ "${TARGET}" = "${BUILD}" -o "${ALT_TGT}" = "${BUILD}" ]; then
+   BUILD=`echo ${BUILD} | sed 's@\([_a-zA-Z0-9]*\)\(-[_a-zA-Z0-9]*\)\(.*\)@\1\2x\3@'`
+fi
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+   INSTALL_PREFIX="${LFS}${BUILD_PREFIX}"
+else
+   BUILD_PREFIX=${TGT_TOOLS}
+   INSTALL_PREFIX="${TGT_TOOLS}"
+fi
+
+if [ "${USE_SANITISED_HEADERS}" = "Y" ]; then
+   KERN_HDR_DIR="${INSTALL_PREFIX}/kernel-hdrs"
+else
+   KERN_HDR_DIR="${INSTALL_PREFIX}/include"
+fi
+
+unpack_tarball glibc-${GLIBC_VER}
+cd ${PKGDIR}
+
+# Gather package version information
+#-----------------------------------
+target_glibc_ver=`grep VERSION version.h | \
+   sed 's@.*\"\([0-9.]*\)\"@\1@'`
+export target_glibc_ver
+
+# Retrieve target_gcc_ver from gcc -v output
+target_gcc_ver=`${TARGET}-gcc -v 2>&1 | grep " version " | \
+   sed 's@.*version \([0-9.]*\).*@\1@g'`
+
+# check kernel headers for version
+kernver=`grep UTS_RELEASE ${KERN_HDR_DIR}/linux/version.h | \
+         sed 's@.*\"\([0-9.]*\).*\"@\1@g' `
+
+if [ ! -d linuxthreads -o ! -d linuxthreads_db ]; then
+   cd ${SRC}/${PKGDIR}
+   OLDPKGDIR=${PKGDIR} ; unpack_tarball glibc-linuxthreads-${GLIBC_VER}
+   PKGDIR=${OLDPKGDIR}
+fi
+
+# unpack libidn add-on if required (should be supplied with cvs versions)
+case ${target_glibc_ver} in
+   2.3.[4-9]* | 2.4* )
+      cd ${SRC}/${PKGDIR}
+      if [ ! -d libidn ]; then
+         OLDPKGDIR=${PKGDIR} ; unpack_tarball glibc-libidn-${GLIBC_VER}
+         PKGDIR=${OLDPKGDIR}
+      fi
+   ;;
+esac
+
+# apply glibc patches as required depending on the above gcc/kernel versions
+# see funcs/glibc_funcs.sh
+apply_glibc_patches
+
+# set without-fp if target has no floating point unit
+if [ "${WITHOUT_FPU}" = "Y" ]; then
+   extra_conf="${extra_conf} --without-fp"
+fi
+
+# set --enable-kernel to match the kernel version 
+# of the kernel headers glibc is to be built against
+#-------------------------------------------------
+# HACK: hack around 2.6.8.1 release
+case ${kernver} in 2.6.8.* ) kernver=2.6.8 ;; esac
+extra_conf="${extra_conf} --enable-kernel=${kernver}"
+
+test -d ${SRC}/glibc-${GLIBC_VER}-crtobjs${suffix} &&
+   rm -rf ${SRC}/glibc-${GLIBC_VER}-crtobjs${suffix}
+
+mkdir -p ${SRC}/glibc-${GLIBC_VER}-crtobjs${suffix}
+cd ${SRC}/glibc-${GLIBC_VER}-crtobjs${suffix}
+
+if [ "${USE_NPTL}" = "Y" ]; then
+   extra_conf="${extra_conf} --enable-add-ons=nptl"
+   extra_conf="${extra_conf} --with-tls --with-__thread"
+   echo "libc_cv_forced_unwind=yes" > config.cache
+   echo "libc_cv_c_cleanup=yes" >> config.cache
+
+   # TODO: check for biarch etc
+   case ${TGT_ARCH} in
+      sparc64* | ultrasparc* )
+         echo "libc_cv_sparc64_tls=yes" >> config.cache
+      ;;
+   esac
+
+   extra_conf="${extra_conf} --cache-file=config.cache"
+else
+   extra_conf="${extra_conf} --enable-add-ons=linuxthreads"
+fi
+
+max_log_init Glibc ${GLIBC_VER} Cross ${CONFLOGS} ${LOG}
+BUILD_CC=gcc BUILD_CFLAGS="-O2 ${HOST_CFLAGS} -pipe" \
+CFLAGS="-O2 -pipe" \
+CC="${TARGET}-gcc ${ARCH_CFLAGS} ${TGT_CFLAGS}" \
+AR="${TARGET}-ar" RANLIB="${TARGET}-ranlib" \
+../${PKGDIR}/configure --prefix=${BUILD_PREFIX} \
+   --host=${ALT_TGT} --build=${BUILD} \
+   --without-cvs \
+   --disable-profile ${extra_conf} \
+   --with-headers=${KERN_HDR_DIR} \
+   --with-binutils=${HST_TOOLS}/bin \
+     >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" || barf
+
+# OK, we have an issue when building on solaris, make invokes /bin/sh
+# by default. Issue is primarily with the System V /bin/echo which always
+# expands and interprets special characters (such as \n) instead of just
+# echoing the string. The invoked /bin/sh does not inherit our set PATH and
+# use the bsd style echo we created earlier. 
+# To get around this issue we will just force make to use "bash" as
+# its shell and use bash's internal echo, which works how we would expect it.
+
+min_log_init ${BUILDLOGS} &&
+make SHELL="bash" PARALLELMFLAGS="${PMFLAGS}" csu/subdir_lib \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${INSTLOGS} &&
+
+mkdir -p ${INSTALL_PREFIX}/${libdirname} &&
+cp -fp csu/crt[1in].o ${INSTALL_PREFIX}/${libdirname} &&
+echo " o install OK"
+
Index: scripts/cross-scripts/cross-glibc-full-32.sh
===================================================================
--- scripts/cross-scripts/cross-glibc-full-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/cross-scripts/cross-glibc-full-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+cross-glibc-full.sh
Index: scripts/cross-scripts/cross-glibc-full-64.sh
===================================================================
--- scripts/cross-scripts/cross-glibc-full-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/cross-scripts/cross-glibc-full-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+cross-glibc-full.sh
Index: scripts/cross-scripts/cross-glibc-full-n32.sh
===================================================================
--- scripts/cross-scripts/cross-glibc-full-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/cross-scripts/cross-glibc-full-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+cross-glibc-full.sh
Index: scripts/cross-scripts/cross-glibc-full.sh
===================================================================
--- scripts/cross-scripts/cross-glibc-full.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/cross-scripts/cross-glibc-full.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,184 @@
+#!/bin/bash
+
+# cross-lfs cross glibc full build
+# --------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+
+LOG="glibc-cross.log"
+libdirname=lib
+
+# Test how this script has been called.
+# This should only really get called during bi-arch/multi-lib  builds
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+
+if [ -z ${ALT_TGT} ]; then ALT_TGT="${TARGET}" ; fi
+
+# if target = build, modify build slightly to
+# trick configure to believing we are cross compiling
+if [ "${TARGET}" = "${BUILD}" -o "${ALT_TGT}" = "${BUILD}" ]; then
+   BUILD=`echo ${BUILD} | sed 's@\([_a-zA-Z0-9]*\)\(-[_a-zA-Z0-9]*\)\(.*\)@\1\2x\3@'`
+fi
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+   INSTALL_PREFIX="${LFS}${BUILD_PREFIX}"
+   INSTALL_OPTIONS="install_root=${LFS}"
+else
+   BUILD_PREFIX=${TGT_TOOLS}
+   INSTALL_PREFIX="${TGT_TOOLS}"
+   INSTALL_OPTIONS=""
+fi
+
+if [ "${USE_SANITISED_HEADERS}" = "Y" ]; then
+   KERN_HDR_DIR="${INSTALL_PREFIX}/kernel-hdrs"
+else
+   KERN_HDR_DIR="${INSTALL_PREFIX}/include"
+fi
+
+unpack_tarball glibc-${GLIBC_VER}
+cd ${PKGDIR}
+
+# Gather package version information
+#-----------------------------------
+target_glibc_ver=`grep VERSION version.h | \
+   sed 's@.*\"\([0-9.]*\)\"@\1@'`
+export target_glibc_ver
+
+# Retrieve target_gcc_ver from gcc -v output
+target_gcc_ver=`${TARGET}-gcc -v 2>&1 | grep " version " | \
+   sed 's@.*version \([0-9.]*\).*@\1@g'`
+
+# check kernel headers for version
+kernver=`grep UTS_RELEASE ${KERN_HDR_DIR}/linux/version.h | \
+         sed 's@.*\"\([0-9.]*\).*\"@\1@g' `
+
+# if we don't have linuxthreads dirs (ie: a glibc release), then
+# unpack the linuxthreads tarball
+if [ ! -d linuxthreads -o ! -d linuxthreads_db ]; then
+   OLDPKGDIR=${PKGDIR} ; unpack_tarball glibc-linuxthreads-${GLIBC_VER}
+   PKGDIR=${OLDPKGDIR}
+fi
+
+# unpack libidn add-on if required (should be supplied with cvs versions)
+case ${target_glibc_ver} in
+   2.3.[4-9]* | 2.4* )
+      cd ${SRC}/${PKGDIR}
+      if [ ! -d libidn ]; then
+         OLDPKGDIR=${PKGDIR} ; unpack_tarball glibc-libidn-${GLIBC_VER}
+         PKGDIR=${OLDPKGDIR}
+      fi
+   ;;
+esac
+
+# apply glibc patches as required depending on the above gcc/kernel versions
+# see funcs/glibc_funcs.sh
+apply_glibc_patches
+
+# HACK: nptl for sparc64 wont build
+case ${TGT_ARCH} in
+   sparc64 )
+      USE_NPTL=N
+   ;;
+esac
+
+if [ "Y" = "${USE_NPTL}" ]; then
+   # remove linuxthreads dirs if they exist
+   # (CVS source contains linuxthreads)
+   if [ -d linuxthreads ]; then rm -rf linuxthreads* ; fi
+
+   # As of ~2003-10-06 nptl is included in glibc cvs
+   #test -d ./nptl &&
+   #test -d ./nptl_db ||
+   #unpack_tarball nptl-${NPTL_VER}
+
+   # fix tst-cancelx7 test
+   fname="${SRC}/${PKGDIR}/nptl/Makefile"
+   grep tst-cancelx7-ARGS ${fname} > /dev/null 2>&1 ||
+   {
+      echo " - patching ${fname}"
+      mv ${fname} ${fname}-ORIG
+      sed -e '/tst-cancel7-ARGS = --command "$(built-program-cmd)"/a\
+tst-cancelx7-ARGS = --command "$(built-program-cmd)"' \
+         ${fname}-ORIG > ${fname}
+   }
+
+   extra_conf="${extra_conf} --with-tls --with-__thread"
+else
+   if [ -d nptl ]; then rm -rf nptl* ; fi
+fi
+
+# set without-fp if target has no floating point unit
+if [ "${WITHOUT_FPU}" = "Y" ]; then
+   extra_conf="${extra_conf} --without-fp"
+fi
+
+# set --enable-kernel to match the kernel version 
+# of the kernel headers glibc is to be built against
+#-------------------------------------------------
+# HACK: hack around 2.6.8.1 release
+case ${kernver} in 2.6.8.* ) kernver=2.6.8 ;; esac
+extra_conf="${extra_conf} --enable-kernel=${kernver}"
+
+test -d ${SRC}/glibc-${GLIBC_VER}-cross${suffix} &&
+   rm -rf ${SRC}/glibc-${GLIBC_VER}-cross${suffix}
+
+mkdir -p ${SRC}/glibc-${GLIBC_VER}-cross${suffix}
+cd ${SRC}/glibc-${GLIBC_VER}-cross${suffix}
+
+
+if [ "${USE_NPTL}" = "Y" ]; then
+   echo "libc_cv_forced_unwind=yes" > config.cache
+   echo "libc_cv_c_cleanup=yes" >> config.cache
+   case ${TGT_ARCH} in
+      sparc64 )
+         echo "libc_cv_sparc64_tls=yes" >> config.cache
+      ;;
+   esac
+   extra_conf="${extra_conf} --cache-file=config.cache"
+fi
+
+# Are libs to be installed into a non-standard place? 
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="${extra_conf} --libdir=${BUILD_PREFIX}/${libdirname}"
+   # Also create a configparms file setting slibdir to */${libdirname}
+   if [ "${USE_SYSROOT}" = "Y" ]; then
+      echo "slibdir=/${libdirname}" >> configparms
+   else
+      echo "slibdir=${TGT_TOOLS}/${libdirname}" >> configparms
+   fi
+fi
+
+max_log_init Glibc ${GLIBC_VER} Cross ${CONFLOGS} ${LOG}
+BUILD_CC=gcc BUILD_CFLAGS="-O2 ${HOST_CFLAGS} -pipe" CFLAGS="-O2 -pipe" \
+CC="${TARGET}-gcc ${ARCH_CFLAGS} ${TGT_CFLAGS}" \
+AR="${TARGET}-ar" RANLIB="${TARGET}-ranlib" \
+../${PKGDIR}/configure --prefix=${BUILD_PREFIX} \
+   --host=${ALT_TGT} --build=${BUILD} \
+   --without-cvs --disable-profile --enable-add-ons \
+   --with-headers=${KERN_HDR_DIR} ${extra_conf} \
+   --with-binutils=${HST_TOOLS}/bin --without-gd \
+   --mandir=${BUILD_PREFIX}/share/man \
+   --infodir=${BUILD_PREFIX}/share/info \
+   --libexecdir=${BUILD_PREFIX}/${libdirname}/glibc \
+     >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" || barf
+
+min_log_init ${BUILDLOGS} &&
+make SHELL="bash" PARALLELMFLAGS="${PMFLAGS}"  \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${INSTLOGS} &&
+make ${INSTALL_OPTIONS} install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o install OK"
+
Index: scripts/cross-scripts/cross-glibc-hdrs.sh
===================================================================
--- scripts/cross-scripts/cross-glibc-hdrs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/cross-scripts/cross-glibc-hdrs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,197 @@
+#!/bin/bash
+
+# cross-lfs cross glibc header creation
+# -------------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG="glibc-cross-headers.log"
+unpack_tarball glibc-${GLIBC_VER}
+
+cd ${PKGDIR}
+#3.1b1 - get real version of the glibc we are installing 20030527
+target_glibc_ver=`grep VERSION version.h | \
+   sed 's@.*\"\([0-9.]*\)\"@\1@'`
+export target_glibc_ver
+
+# if target is same as build host, adjust build slightly
+if [ "${TARGET}" = "${BUILD}" ]; then
+   BUILD=`echo ${BUILD} | sed 's@\([_a-zA-Z0-9]*\)\(-[_a-zA-Z0-9]*\)\(.*\)@\1\2x\3@'`
+fi
+
+# unpack linuxthreads add-on if required
+if [ ! "Y" = "${USE_NPTL}" -a ! -d ${SRC}/${PKGDIR}/linuxthreads ]; then
+   cd ${SRC}/${PKGDIR}
+   OLDPKGDIR=${PKGDIR} ; unpack_tarball glibc-linuxthreads-${GLIBC_VER}
+   PKGDIR=${OLDPKGDIR}
+fi
+
+# unpack libidn add-on if required (should be supplied with cvs versions)
+case ${target_glibc_ver} in
+   2.3.[4-9]* | 2.4* )
+      cd ${SRC}/${PKGDIR}
+      if [ ! -d libidn ]; then
+         OLDPKGDIR=${PKGDIR} ; unpack_tarball glibc-libidn-${GLIBC_VER}
+         PKGDIR=${OLDPKGDIR}
+      fi
+   ;;
+esac
+
+# MIPS specific fixes   
+case ${TGT_ARCH} in
+   mips* )
+     # Fix syscalls for mips w 2.3.4 
+      case ${GLIBC_VER} in
+         2.3.[45] ) apply_patch glibc-2.3.4-mips_syscall-2 ;;
+      esac
+      # For mips we need to use a mips compiler for generating headers
+      # this should have been created by cross-gcc-static-no-thread.sh
+      CC="${TARGET}-gcc"
+   ;;
+esac
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+   INSTALL_PREFIX="${LFS}${BUILD_PREFIX}"
+   INSTALL_OPTIONS="install_root=${LFS}"
+else
+   BUILD_PREFIX=${TGT_TOOLS}
+   INSTALL_PREFIX="${TGT_TOOLS}"
+   INSTALL_OPTIONS=""
+fi
+
+if [ "${USE_SANITISED_HEADERS}" = "Y" ]; then
+   KERN_HDR_DIR="${INSTALL_PREFIX}/kernel-hdrs"
+else
+   KERN_HDR_DIR="${INSTALL_PREFIX}/include"
+fi
+
+test -d ${SRC}/glibc-${GLIBC_VER}-hdrs &&
+   rm -rf ${SRC}/glibc-${GLIBC_VER}-hdrs
+
+mkdir -p ${SRC}/glibc-${GLIBC_VER}-hdrs
+cd ${SRC}/glibc-${GLIBC_VER}-hdrs
+max_log_init Glibc ${GLIBC_VER} Cross ${CONFLOGS} ${LOG}
+
+# NOTE: ran into this during nptl configury
+# TODO: look into if this is required wo nptl
+if [ "Y" = ${USE_NPTL} ]; then
+   case ${TGT_ARCH} in
+      powerpc* | ppc* )
+         echo "libc_cv_ppc_machine=yes" >> config.cache
+      ;;
+   esac
+fi
+
+# set without-fp if target has no floating point unit
+if [ "${WITHOUT_FPU}" = "Y" ]; then
+   extra_conf="${extra_conf} --without-fp"
+fi
+
+# HACK: hack around 2.6.8.1 release
+case ${KERNEL_VER} in 2.6.8.* ) KERNEL_VER=2.6.8 ;; esac
+
+# Have to use the hosts cpp to generate the headers
+CC=${CC-gcc} ../${PKGDIR}/configure --prefix=${BUILD_PREFIX} \
+   --host=${TARGET} --build=${BUILD} \
+   --without-cvs --disable-sanity-checks \
+   --enable-kernel=${KERNEL_VER} \
+   --with-headers=${KERN_HDR_DIR} \
+   --with-binutils=${HST_TOOLS}/${TARGET}/bin \
+   --cache-file=config.cache ${extra_conf} \
+     >> ${LOGFILE} 2>&1 &&
+
+# Use target ld gas et al
+PATH=${HST_TOOLS}/${TARGET}/bin:${PATH} \
+make ${INSTALL_OPTIONS} install-headers \
+   >> ${LOGFILE} 2>&1 &&
+echo " o install-headers OK" || barf
+
+echo " include/bits should have been created"
+cp bits/stdio_lim.h ${INSTALL_PREFIX}/include/bits &&
+touch ${INSTALL_PREFIX}/include/gnu/stubs.h 
+
+# copy across threading headers
+cd ${SRC}/${PKGDIR}
+
+# Firstly we need to use the correct directory for our target
+# arch. All ix86 builds should point to i386, sparc/sparc32/sparc64
+# to point to sparc, powerpc/powerpc64 to powerpc etc...
+case ${TGT_ARCH} in
+   i?86 )
+     ARCH=i386
+   ;;
+   x86_64 )
+     ARCH=x86_64
+     TYPE=x86_64
+   ;;
+   sparc64* )
+     ARCH=sparc
+     TYPE=sparc64
+   ;;
+   sparc* )
+     ARCH=sparc
+     TYPE=sparc32
+   ;;
+   alpha )
+     ARCH=alpha
+   ;;
+   powerpc64 | ppc64 )
+     ARCH=powerpc
+     TYPE=powerpc64
+   ;;
+   powerpc | ppc )
+     ARCH=powerpc
+     TYPE=powerpc32
+   ;;
+   s390x )
+     ARCH=s390
+     TYPE=s390x
+   ;;
+   s390 )
+     ARCH=s390
+     TYPE=s390
+   ;;
+   mips* )
+     ARCH=mips
+   ;;
+esac
+
+if [ "${USE_NPTL}" = "Y" ]; then
+
+   #NPTL
+   cp nptl/sysdeps/pthread/pthread.h ${INSTALL_PREFIX}/include/
+   cp nptl/sysdeps/unix/sysv/linux/${ARCH}/bits/pthreadtypes.h \
+      ${INSTALL_PREFIX}/include/bits/
+
+   # On s390, powerpc and sparc we also need to get 
+   # sysdeps/${ARCH}/${TGT_ARCH}/bits/wordsize.h
+
+   # As of 20040909 pthread.h pulls in bits/wordsize.h .
+   # TODO: investigate whether the correct wordsize.h gets copied
+   #       across for a straight 64bit target (alpha) when doing this
+   #       on a 32bit system. ( see sysdeps/wordsize-{32,64} )
+   if [ -f sysdeps/${ARCH}/${TYPE}/bits/wordsize.h ]; then
+      if [ ! -f ${INSTALL_PREFIX}/include/bits/wordsize.h ]; then
+         echo " - copying sysdeps/${ARCH}/${TYPE}/bits/wordsize.h"
+         cp sysdeps/${ARCH}/${TYPE}/bits/wordsize.h ${INSTALL_PREFIX}/include/bits/
+      fi
+   fi
+
+else
+
+   #Linuxthreads
+   cp linuxthreads/sysdeps/pthread/pthread.h ${INSTALL_PREFIX}/include/
+   cp linuxthreads/sysdeps/pthread/bits/pthreadtypes.h \
+      ${INSTALL_PREFIX}/include/bits/
+
+   # TODO: on hppa we'd probably want 
+   #       sysdeps/unix/sysv/linux/hppa/bits/initspin.h
+   #       instead
+   cp linuxthreads/sysdeps/pthread/bits/initspin.h \
+      ${INSTALL_PREFIX}/include/bits/
+fi
Index: scripts/cross-scripts/cross-kern-hdrs.sh
===================================================================
--- scripts/cross-scripts/cross-kern-hdrs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/cross-scripts/cross-kern-hdrs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,149 @@
+#!/bin/bash
+
+# cross-lfs kernel header creation
+# --------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+# install kernel headers 
+
+cd ${SRC}
+LOG=kernel-headers.log
+unpack_tarball linux-${KERNEL_VER} &&
+cd ${PKGDIR}
+
+# 20030510
+# If we are building for x86_64, and the kernel is greater than 2.6.4,
+# we need to fix unistd.h so glibc doesn't barf during assembly.
+# TODO: track this issue, still exists as of 2.6.6 ...
+case ${KERNEL_VER} in
+   2.6.[4-6] )
+      apply_patch linux-2.6.6-x86_64-unistd_h-fix
+   ;;
+esac
+                                                                                
+max_log_init kernel-headers ${KERNEL_VER} '' ${INSTLOGS} ${LOG}
+
+#
+case ${TGT_ARCH} in
+   i?86 )                   ARCH=i386    ;;
+   x86_64 | x86-64 )        ARCH=i386    ;;
+   sparc64* | ultrasparc* ) ARCH=sparc64 ;;
+   sparc* )                 ARCH=sparc   ;;
+   powerpc64 | ppc64 )      ARCH=ppc64   ;;
+   powerpc | ppc )          ARCH=ppc     ;;
+   s390* )                  ARCH=s390    ;;
+   mips* )                  ARCH=mips    ;;
+   arm* )                   ARCH=arm     ;;
+   * )                      ARCH=${TGT_ARCH} ;;
+esac
+
+set -x
+ARCH=${ARCH} CROSS_COMPILE=${TARGET}- make mrproper \
+   >> ${LOGFILE} 2>&1 &&
+set +x                                                                                
+# Pre-configure kernel
+# TODO: for want of somewhere better, put kernel .config files
+#       in ${SCRIPTS}. Should really let user supply filename
+#       via plfs-config
+# Kernel .config files should reside under ${CONFIGS}/kernel
+test -f ${CONFIGS}/kernel/linux-${KERNEL_VER}-${TGT_ARCH}.config &&
+{
+   echo "got kernel config"
+   cp ${CONFIGS}/kernel/linux-${KERNEL_VER}-${TGT_ARCH}.config .config
+   yes "" | make ARCH=${ARCH} CROSS_COMPILE=${TARGET}- oldconfig 
+} >> ${LOGFILE} 2>&1
+                                                                                
+# 2.5/2.6 series kernels dont have "make symlinks" target but use
+# "make include/asm"
+# Check for the include/asm target and use it if its available
+make ARCH=${ARCH} CROSS_COMPILE=${TARGET}- include/linux/version.h &&
+grep "^include/asm:" Makefile > /dev/null 2>&1 &&
+{
+   case ${ARCH} in
+      arm | cris ) make ARCH=${ARCH} CROSS_COMPILE=${TARGET}- \
+                        include/asm include/asm-${ARCH}/.arch ;;
+      * )          make ARCH=${ARCH} CROSS_COMPILE=${TARGET}- include/asm ;;
+   esac
+} || {
+   make ARCH=${ARCH} CROSS_COMPILE=${TARGET}- symlinks
+} >> ${LOGFILE} 2>&1 &&
+
+# Install the headers.
+
+# If we are using sanitised headers, and we are installing the
+# raw kernel headers, install raw headers into
+# ${TGT_TOOLS}/kernel-hdrs and the sanitised ones into
+# ${TGT_TOOLS}/include
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   INSTALL_PREFIX="${LFS}/usr"
+else
+   INSTALL_PREFIX="${TGT_TOOLS}"
+fi
+
+if [ "${USE_SANITISED_HEADERS}" = "Y" ]; then
+   KERN_HDR_DIR="${INSTALL_PREFIX}/kernel-hdrs"
+else
+   KERN_HDR_DIR="${INSTALL_PREFIX}/include"
+fi
+
+# If we are doing a multiarch build we will need the kernel headers for
+# both architectures and will have to create stub headers in include/asm
+
+test "Y" = "${MULTIARCH}" &&
+{
+   case ${TGT_ARCH} in
+   x86_64 | x86-64 )
+      ARCH1_SWITCH=__x86_64__
+      ARCH1=x86_64
+      ARCH2=i386
+   ;;
+   sparc* | ultrasparc* )
+      ARCH1_SWITCH=__arch64__
+      ARCH1=sparc64
+      ARCH2=sparc
+   ;;
+   ppc* | powerpc* )
+      ARCH1_SWITCH=__powerpc64__
+      ARCH1=ppc64
+      ARCH2=ppc
+   ;;
+   s390* )
+      ARCH1_SWITCH=__s390x__
+      ARCH1=s390x
+      ARCH2=s390
+   ;;
+   esac
+
+   # TODO: This needs to be done better
+   #       Here we are handling the case of mips, where only the one set of
+   #       asm headers are provided (and needed) for multi-arch.
+   if [ -z "${ARCH1_SWITCH}" ]; then
+      mkdir -p ${KERN_HDR_DIR}/asm
+      yes | cp -Rp include/asm/* ${KERN_HDR_DIR}/asm
+   else
+      mkdir -p ${KERN_HDR_DIR}/asm
+      yes | cp -Rp include/asm-${ARCH1} ${KERN_HDR_DIR}
+      yes | cp -Rp include/asm-${ARCH2} ${KERN_HDR_DIR}
+
+      # Create stubs ( see build-init.x.x.x.sh )
+      create_kernel_stubs ${ARCH1} ${ARCH1_SWITCH} ${ARCH2} ${KERN_HDR_DIR}
+   fi
+   
+} || {
+   # Install kernel headers in
+   #  ${TGT_TOOLS}/include 
+   mkdir -p ${KERN_HDR_DIR}/asm
+   yes | cp -Rp include/asm/* ${KERN_HDR_DIR}/asm
+}
+
+yes | cp -Rp include/asm-generic ${KERN_HDR_DIR}
+yes | cp -Rp include/linux ${KERN_HDR_DIR}
+
+# Don't need this if we pre-configured the kernel
+touch ${KERN_HDR_DIR}/linux/autoconf.h
+
Index: scripts/cross-scripts/cross-san-kern-hdrs.sh
===================================================================
--- scripts/cross-scripts/cross-san-kern-hdrs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/cross-scripts/cross-san-kern-hdrs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,118 @@
+#!/bin/bash
+
+# cross-lfs sanitized kernel header installation
+# ----------------------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+# install kernel headers 
+
+cd ${SRC}
+LOG=sanitised-kernel-headers.log
+unpack_tarball linux-libc-headers-${LINUX_LIBC_HDRS_VER} &&
+cd ${PKGDIR}
+
+# Setup ownership and permissions properly
+# TODO: This assumes you are root...
+#chown -R 0 *
+#chgrp -R 0 *
+
+# Setup permissions
+find . -type d | xargs chmod 755
+find . -type f | xargs chmod 644
+
+max_log_init sanitised-kernel-headers ${LINUX_LIBC_HDRS_VER} '' ${INSTLOGS} ${LOG}
+
+# Install the headers.
+
+# If we are using sanitised headers,
+# install the sanitised ones into
+# ${TGT_TOOLS}/include
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   INSTALL_PREFIX="${LFS}/usr"
+else
+   INSTALL_PREFIX="${TGT_TOOLS}"
+fi
+KERN_HDR_DIR=${INSTALL_PREFIX}/include
+
+# If we are doing a biarch build we will need the kernel headers for
+# both architectures and will have to create stub headers in include/asm
+
+test "Y" = "${MULTIARCH}" &&
+{
+   case ${TGT_ARCH} in
+      x86_64 | x86-64 )
+         ARCH1_SWITCH=__x86_64__
+         ARCH1=x86_64
+         ARCH2=i386
+      ;;
+      sparc* | ultrasparc* )
+         ARCH1_SWITCH=__arch64__
+         ARCH1=sparc64
+         ARCH2=sparc
+      ;;
+      ppc* | powerpc* )
+         ARCH1_SWITCH=__powerpc64__
+         ARCH1=ppc64
+         ARCH2=ppc
+      ;;
+      s390* )
+         ARCH1_SWITCH=__s390x__
+         ARCH1=s390x
+         ARCH2=s390
+      ;;
+      mips* )
+         ARCH1=mips
+      ;;
+   esac
+
+   # TODO: This needs to be done better
+   #       Here we are handling the case of mips, where only the one set of
+   #       asm headers are provided (and needed) for multi-arch.
+   if [ -z "${ARCH1_SWITCH}" ]; then
+      mkdir -p ${KERN_HDR_DIR}/asm
+      yes | cp -Rp include/asm-${ARCH1}/* ${KERN_HDR_DIR}/asm
+   else
+      mkdir -p ${KERN_HDR_DIR}/asm
+      yes | cp -Rp include/asm-${ARCH1} ${KERN_HDR_DIR}
+      yes | cp -Rp include/asm-${ARCH2} ${KERN_HDR_DIR}
+
+      # Create stubs ( see build-init.x.x.x.sh )
+      create_kernel_stubs ${ARCH1} ${ARCH1_SWITCH} ${ARCH2} ${KERN_HDR_DIR}
+   fi
+   
+} || {
+   # Install kernel headers in
+   #  ${TGT_TOOLS}/include 
+   # TODO: this needs to be done better...
+   case ${TGT_ARCH} in
+      i?86 )                   ARCH=i386    ;;
+      x86_64 | x86-64 )        ARCH=x86_64  ;;
+      powerpc | ppc )          ARCH=ppc     ;;
+      powerpc64 | ppc64 )      ARCH=ppc64   ;;
+      sparc64* | ultrasparc* ) ARCH=sparc64 ;;
+      sparc* )                 ARCH=sparc   ;;
+      s390 )                   ARCH=s390    ;;
+      s390x )                  ARCH=s390x   ;;
+      mips* )                  ARCH=mips    ;;
+      arm* )                   ARCH=arm     ;;
+      * )                      ARCH=${TGT_ARCH} ;;
+   esac
+
+   mkdir -p ${KERN_HDR_DIR}/asm
+   yes | cp -Rp include/asm-${ARCH}/* ${KERN_HDR_DIR}/asm
+   # TODO: probably more here to do for arm...
+
+   # This should be replaced by a var, for the moment defaulting to
+   # ebsa285
+   case ${TGT_ARCH} in
+      arm* )  ln -sf arch-ebsa285 ${KERN_HDR_DIR}/asm/arch ;;
+   esac
+
+}
+
+yes | cp -Rp include/linux ${KERN_HDR_DIR}
+
Index: scripts/cross-scripts/make_symlinks.sh
===================================================================
--- scripts/cross-scripts/make_symlinks.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/cross-scripts/make_symlinks.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,2 @@
+ln -s cross-glibc-crtobjs.sh ${SCRIPTS}/cross-scripts/cross-glibc-crtobjs-64.sh 
+ln -s cross-glibc-full.sh    ${SCRIPTS}/cross-scripts/cross-glibc-full-64.sh 
Index: scripts/funcs/binutils-funcs.sh
===================================================================
--- scripts/funcs/binutils-funcs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/funcs/binutils-funcs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,51 @@
+#!/bin/bash
+#
+# functions for cross-lfs binutils build
+# -----------------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+check_binutils () {
+   # This should be run immediately after unpack_tarballs for binutils
+   # so PKGDIR is set to the right directory
+
+   # Check if this version of binutils requires
+   # 'make configure-host'
+   echo -e "Checking Binutils features...\n${BRKLN}"
+   grep configure-host ${SRC}/${PKGDIR}/Makefile.in > /dev/null 2>&1 &&
+      export BINUTILS_CONF_HOST=Y ||
+      export BINUTILS_CONF_HOST=N 
+   echo -e " o Requires 'make configure-host' ........... ${BINUTILS_CONF_HOST}"
+
+   # Do we have --with-lib-path option to ld/configure 
+   grep with-lib-path ${SRC}/${PKGDIR}/ld/configure > /dev/null 2>&1 &&
+      export BINUTILS_WITH_LIB_PATH=Y ||
+      export BINUTILS_WITH_LIB_PATH=N
+   echo -e " o Has '--with-lib-path=' configure option .. ${BINUTILS_WITH_LIB_PATH}\n"
+
+   # Modify ld/Makefile.in if necessary
+   grep "GENSCRIPTS = LIB_PATH" ${SRC}/${PKGDIR}/ld/Makefile.in \
+      > /dev/null 2>&1 ||
+   {
+      echo " o adding 'LIB_PATH = \$(LIB_PATH)' to GENSCRIPTS definition"
+      echo "   in ld/Makefile.in"
+      echo "   ( Passes value of LIB_PATH to genscripts.sh environment"
+      echo -e "     for ldscript creation. )\n"
+
+      test -f ${SRC}/${PKGDIR}/ld/Makefile.in-ORIG ||
+         cp ${SRC}/${PKGDIR}/ld/Makefile.in \
+            ${SRC}/${PKGDIR}/ld/Makefile.in-ORIG
+      
+      #TODO: fix this sed
+      sed 's@^GENSCRIPTS = @GENSCRIPTS = LIB_PATH=\$\(LIB_PATH\) @g' \
+         ${SRC}/${PKGDIR}/ld/Makefile.in-ORIG \
+         > ${SRC}/${PKGDIR}/ld/Makefile.in
+   }
+}
+
+# Export functions
+export -f check_binutils
+
Index: scripts/funcs/cross_gcc-funcs.sh
===================================================================
--- scripts/funcs/cross_gcc-funcs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/funcs/cross_gcc-funcs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,243 @@
+#!/bin/bash
+
+# functions for cross-lfs gcc builds
+# -----------------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+
+gcc_specs_mod() {
+
+   # LFS style build
+   #----------------
+
+   # Set ARCH for header modifications.
+   # Set dl_hfiles to contain the list of header file(s) requiring modification
+   # of the location for the dynmamic linker.
+   # Set sf_hfiles to contain the list of header file(s) where we have to define
+   # startfile_prefix_spec.
+   case ${TGT_ARCH} in
+      i?86 | x86_64 )
+         ARCH=i386
+         dl_hfiles="${ARCH}/linux.h ${ARCH}/linux64.h"
+         sf_hfiles="linux.h"
+      ;;
+      ia64* )
+         ARCH=ia64
+         dl_hfiles="${ARCH}/linux.h"
+         sf_hfiles="linux.h"
+      ;;
+      powerpc* | ppc* )
+         ARCH=rs6000
+         dl_hfiles="${ARCH}/sysv4.h ${ARCH}/linux64.h"
+         sf_hfiles="${ARCH}/linux.h ${ARCH}/linux64.h"
+      ;;
+      sparc* )
+         ARCH=sparc
+         dl_hfiles="${ARCH}/linux.h ${ARCH}/linux64.h"
+         sf_hfiles="${ARCH}/linux.h ${ARCH}/linux64.h"
+      ;;
+      alpha )
+         ARCH=alpha
+         dl_hfiles="${ARCH}/linux-elf.h"
+         sf_hfiles="${ARCH}/linux.h"
+      ;;
+      arm* )
+         ARCH=arm
+         dl_hfiles="${ARCH}/linux-elf.h"
+         sf_hfiles="linux.h"
+      ;;
+      s390* )
+         ARCH=s390
+         dl_hfiles="${ARCH}/linux.h"
+         sf_hfiles="linux.h"
+      ;;
+      m68k )
+         ARCH=m68k
+         dl_hfiles="${ARCH}/linux.h"
+         sf_hfiles="linux.h"
+      ;;
+      m32r* )
+         ARCH=m32r
+         dl_hfiles="${ARCH}/linux.h"
+         sf_hfiles="linux.h"
+      ;;
+      mips* )
+         ARCH=mips
+         dl_hfiles="${ARCH}/linux.h ${ARCH}/linux64.h"
+         sf_hfiles="linux.h"
+      ;;
+      parisc* | hppa* )
+         ARCH=pa
+         dl_hfiles="${ARCH}/pa-linux.h"
+         sf_hfiles="linux.h"
+      ;;
+      xtensa )
+         ARCH=xtensa
+         dl_hfiles="${ARCH}/linux.h"
+         sf_hfiles="linux.h"
+      ;;
+      * )
+         # No support
+         echo "No support for ${TGT_ARCH}" 1>&2
+         barf
+      ;;
+   esac
+
+   specs_set_dynamic_linker
+   specs_set_startfile_prefix_spec
+}
+
+specs_set_dynamic_linker() {
+   # We want our new gcc to use our new dynamic linker
+   # ( ${TGT_TOOLS}/lib/ld-linux.so.2 ) so we will need to modify
+   # gcc/config/$ARCH/linux.h and or linux64.h
+   # also sysv4.h for ppc and linux-elf.h for alpha
+   # (where $ARCH is cpu-series type)
+   #
+   # LINK_SPEC needs to get defined so that
+   #  -dynamic-linker is ${TGT_TOOLS}/lib/ld-linux.so.2 or 
+   #  ${TOOLS}/lib64/ld-linux.so.2#
+   # This sets --dynamic-linker correctly in the generated spec file
+
+   cd ${SRC}/${PKGDIR}/gcc/config
+   for hfile in ${dl_hfiles} ; do
+      if [ -f ${hfile} ]; then
+         if [ ! -f ${hfile}-ORIG ]; then
+            cp ${hfile} ${hfile}-ORIG
+         fi
+
+         sed -e "s@\(/lib\(\|32\|64\)\)\(/ld\(\|64\)\.so\.1\|/ld-linux\(\|-ia64\|-x86-64\)\.so\.\(1\|2\)\)@${TGT_TOOLS}&@g" \
+             -e "/elf.._sparc -Y P/s@/usr/lib@${TGT_TOOLS}/lib@g" \
+             ${hfile}-ORIG > ${hfile}
+      else
+         echo "${0}: specs_set_dynamic_linker" 1>&2
+         echo "   header file ${hfile} does not exist" 1>&2
+         echo "" 1>&2
+         echo "   Please check that the gcc_specs_mod function" 1>&2
+         echo "   ( in cross-lfs/scripts/funcs/cross_gcc_funcs }" 1>&2
+         echo "   is correct for your target arch." 1>&2
+         barf
+      fi
+   done
+
+}
+
+specs_set_startfile_prefix_spec() {
+
+   # Set STARTFILE_PREFIX_SPEC appropriately.
+   echo " o setting STARTFILE_PREFIX_SPEC"
+
+   cd ${SRC}/${PKGDIR}/gcc/config
+   for hfile in ${sf_hfiles} ; do
+      if [ -f ${hfile} ]; then
+         echo "" >> ${hfile}
+         echo "#undef STARTFILE_PREFIX_SPEC" >> ${hfile}
+         echo "#define STARTFILE_PREFIX_SPEC \"${TGT_TOOLS}/lib/\"" >> ${hfile}
+      else
+         echo "${0}: specs_set_startfile_prefix_spec" 1>&2
+         echo "   header file ${hfile} does not exist" 1>&2
+         echo "" 1>&2
+         echo "   Please check that the gcc_specs_mod function" 1>&2
+         echo "   ( in cross-lfs/scripts/funcs/cross_gcc_funcs }" 1>&2
+         echo "   is correct for your target arch." 1>&2
+         barf
+      fi
+   done
+}
+
+cpp_set_cross_system_header_dir() {
+
+   # Set cpp's default include search path, and the path 
+   # fixincludes uses to search for headers
+   echo " o setting ${TGT_TOOLS}/include as cpp's default include search dir"
+   cd ${SRC}/${PKGDIR}/gcc
+   test -f Makefile.in-ORIG ||
+      mv Makefile.in Makefile.in-ORIG
+
+   sed "s@\(^CROSS_SYSTEM_HEADER_DIR =\).*@\1 ${TGT_TOOLS}/include@g" \
+      Makefile.in-ORIG > Makefile.in
+}
+
+cpp_undef_standard_include_dir() {
+
+   # We need to stop cpp using /usr/include as the standard include directory
+   # when cross-building a target-native gcc.
+   # This is defined in gcc/cppdefault.c using STANDARD_INCLUDE_DIR
+   cd ${SRC}/${PKGDIR}/gcc
+   test ! -f cppdefault.c-ORIG &&
+      cp -p cppdefault.c cppdefault.c-ORIG
+
+   sed -e '/#define STANDARD_INCLUDE_DIR/s@"/usr/include"@0@g' \
+      cppdefault.c-ORIG > cppdefault.c
+}
+
+fixincludes_set_native_system_header_dir() {
+ 
+   # For cross-building a target native gcc.
+   # Set the path fixincludes uses to search for headers
+   echo " o setting NATIVE_SYSTEM_HEADER_DIR to ${TGT_TOOLS}/include"
+   cd ${SRC}/${PKGDIR}/gcc
+   test -f Makefile.in-ORIG ||
+      mv Makefile.in Makefile.in-ORIG
+
+   sed "s@\(^NATIVE_SYSTEM_HEADER_DIR =\).*@\1 ${TGT_TOOLS}/include@g" \
+      Makefile.in-ORIG > Makefile.in
+
+}
+
+configure_fix_flags_for_target() {
+
+   # This is only necessary if 
+   #  o you are building a multi-lib cross-compiler
+   #  o you are not building into a sys-root
+   #  o if ${TGT_TOOLS} = ${HST_TOOLS}/${TARGET} 
+   # but doesn't hurt to apply in general.
+
+   if [ "${TGT_TOOLS}" = "${HST_TOOLS}/${TARGET}" -a ! "${USE_SYSROOT}" = "Y" ]
+   then
+
+      # -B${HST_TOOLS}/${TARGET}/lib (set in FLAGS_FOR_TARGET)
+      # is passed during the build, which causes issues if you are installing 
+      # all your target startfiles/libraries under 
+      # ${HST_TOOLS}/${TARGET}/lib{,32,64}
+      #
+      # -B takes precedence over -L and doesn't get altered by
+      # the multilib spec, so you always end up linking in startfiles
+      # from ${HST_TOOLS}/${TARGET}/lib when creating a shared libgcc.
+      #
+      # This is kinda painful when it should be, say, linking 64bit 
+      # startfiles in from under */lib64 when creating the 64bit shared libgcc
+      #
+      # Here we just remove -B*/lib from FLAGS_FOR_TARGET.
+      #
+      # NOTE: for gcc-3.3.3 all we had do edit was configure.in,
+      #       FLAGS_FOR_TARGET was only specified here.
+      #       As of gcc-3.4.0 we need to edit configure itself.
+      #       So, we'll just attempt to edit both
+   
+      cd ${SRC}/${PKGDIR}
+      for file in configure configure.in; do
+         grep FLAGS_FOR_TARGET ${file} > /dev/null 2>&1 &&
+         {
+            test -f ${file}-ORIG ||
+               cp -p ${file} ${file}-ORIG
+
+            sed '/FLAGS_FOR_TARGET.*\/lib\//s@-B[^ ]*/lib/@@g' \
+               ${file}-ORIG > ${file}
+         }
+      done
+   fi
+
+}
+
+export -f specs_set_startfile_prefix_spec
+export -f specs_set_dynamic_linker
+export -f gcc_specs_mod
+
+export -f fixincludes_set_native_system_header_dir
+
+export -f cpp_set_cross_system_header_dir
+export -f cpp_undef_standard_include_dir
+export -f configure_fix_flags_for_target
Index: scripts/funcs/glibc-funcs.sh
===================================================================
--- scripts/funcs/glibc-funcs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/funcs/glibc-funcs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,150 @@
+#!/bin/bash
+
+# functions for cross-lfs glibc builds
+# -----------------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+
+apply_glibc_patches() {
+   
+   # This function should only be called from inside the unpacked glibc source
+   # This function also expects the following vars to be set by the caller
+   #
+   # target_gcc_ver   : should be derived either from gcc itself or gcc headers
+   # target_glibc_ver : should be derived from glibc headers
+   # kernver          : should be derived from kernel headers
+
+   # Patching 
+   #---------
+   # TODO: check if patches still reqd for < glibc 2.3.3 with later gcc's
+   #       (ie 3.4+)
+   case ${target_gcc_ver} in
+      4.* )
+         echo " o compiling with gcc 4.x"
+         case ${target_glibc_ver} in
+            2.3.[6-9]* | 2.4.* ) ;;
+            2.3.5 )
+               # gcc4 support is working in CVS glibc
+               if [ ! -d ${SRC}/${PKGDIR}/CVS ]; then
+                  echo "   - applying gcc4 fixes"
+                  apply_patch glibc-2.3.4-gcc4_elf_fixes
+                  apply_patch glibc-2.3.4-allow-gcc-4.0-iconvdata
+                  apply_patch glibc-2.3.4-allow-gcc-4.0-powerpc-procfs
+                  apply_patch glibc-2.3.5-allow-gcc-4.0-wordexp
+                  apply_patch glibc-2.3.5-allow-gcc4-string
+                  apply_patch glibc-2.3.5-allow-gcc4-symbols
+                  apply_patch glibc-2.3.5-allow-gcc4-wcstol_l
+               fi
+               case ${TGT_ARCH} in
+               sparc* )
+                  # fix CFLAGS-rtld to remove deprecated sparc compiler options
+                  # from sysdeps/unix/sysv/linux/sparc/sparc32/Makefile 
+                  # ( -mv8 is no longer supported ). Use -mcpu -mtune options 
+                  # from TGT_CFLAGS (which get passed regardless)
+                  echo "   - removing deprecated gcc options from sysdeps/unix/sysv/linux/sparc/sparc32/Makefile"
+                  file="sysdeps/unix/sysv/linux/sparc/sparc32/Makefile"
+                  if [ ! -f ${file}-ORIG ]; then cp -p ${file} ${file}-ORIG ; fi
+                  grep -v \\-mv8 ${file}-ORIG > ${file}
+               ;;
+               esac
+               
+            ;;
+            2.3.4* )
+               echo "   - applying gcc4 fixes"
+               apply_patch glibc-2.3.4-gcc4_elf_fixes
+               apply_patch glibc-2.3.4-allow-gcc-4.0-iconvdata
+               apply_patch glibc-2.3.4-allow-gcc-4.0-powerpc-procfs
+               apply_patch glibc-2.3.5-allow-gcc4-string
+               apply_patch glibc-2.3.5-allow-gcc4-symbols
+               apply_patch glibc-2.3.5-allow-gcc4-wcstol_l
+
+               case ${TGT_ARCH} in
+               sparc* )
+                  # fix CFLAGS-rtld to remove deprecated sparc compiler options
+                  # from sysdeps/unix/sysv/linux/sparc/sparc32/Makefile 
+                  # ( -mv8 is no longer supported ). Use -mcpu -mtune options 
+                  # from TGT_CFLAGS (which get passed regardless)
+                  echo "   - removing deprecated gcc options from sysdeps/unix/sysv/linux/sparc/sparc32/Makefile"
+                  file="sysdeps/unix/sysv/linux/sparc/sparc32/Makefile"
+                  if [ ! -f ${file}-ORIG ]; then cp -p ${file} ${file}-ORIG ; fi
+                  grep -v \\-mv8 ${file}-ORIG > ${file}
+               ;;
+               esac
+
+            ;;
+            * )
+               echo " compiling with gcc4 for ${target_glibc_ver} not supported" 1>&2
+               barf
+            ;;
+         esac
+      ;;
+      3.3* )
+         echo " o compiling with gcc 3.3x"
+         case ${target_glibc_ver} in
+            2.3.[345] ) ;;
+            2.3.2 )
+               # CVS glibc doesn't require gcc-33 patch
+               if [ ! -d ${SRC}/${PKGDIR}/CVS ]; then
+                  apply_patch glibc-2.3.2-gcc33
+               fi
+            ;;
+            2.3* )
+               apply_patch glibc-2.3.2-gcc33
+            ;;
+         esac
+      ;;
+   esac
+   
+   # 20031008 - add patch to fix assertion in rtld.c
+   #            this smells hackish but we will see...
+   # TODO: should check for presence of sysinfo DSO in kernel source
+   # 20040711 - not required for current ( 2.3.3 + 2.3.4 ) glibc's
+   #apply_patch glibc-${XXX}2.3.2-fix-rtld
+   
+   case ${kernver} in
+      2.[56].* )
+         # 2.3.1b2 20030630
+         # We have to patch sysdeps/unix/sysv/linux/sys/sysctl.h to
+         # so we can build against 2.5/2.6 kernels (if not fixed already).
+         fname="${SRC}/${PKGDIR}/sysdeps/unix/sysv/linux/sys/sysctl.h"
+         grep "linux/compiler.h" ${fname} > /dev/null 2>&1 ||
+         {
+            echo " - patching ${fname}"
+            mv ${fname} ${fname}-ORIG
+            sed -e '/#include <linux\/sysctl.h>/i\
+#include <linux/compiler.h>' \
+            ${fname}-ORIG > ${fname}
+         }
+         case ${TGT_ARCH} in
+            m68k* )
+               echo - applying m68k no-precision-timers patch
+               patch -p1 < ${PATCHES}/glibc-2.3.3-lfh-m68k-no-precision-timers.patch
+            ;;
+            arm* ) apply_patch glibc-arm-ctl_bus_isa ;;
+         esac
+      ;;
+      2.4.2[4-9] | 2.4.3* )
+         case ${TGT_ARCH} in
+            arm* ) apply_patch glibc-arm-ctl_bus_isa ;;
+         esac
+      ;;
+   esac
+
+   case ${TGT_ARCH} in
+      m68k* )
+         # TODO: wrap some logic around this to check glibc ver
+         #       before applying this patch
+         apply_patch glibc-2.3.3-lfs-5.1-m68k_fix_fcntl
+      ;;
+      mips* )
+         # Fix syscalls for mips w 2.3.4 
+          case ${target_glibc_ver} in
+             2.3.[45] ) apply_patch glibc-2.3.4-mips_syscall-2 ;;
+          esac
+      ;;
+   esac
+}
+
+export -f apply_glibc_patches
Index: scripts/funcs/kernel_stub_header-funcs.sh
===================================================================
--- scripts/funcs/kernel_stub_header-funcs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/funcs/kernel_stub_header-funcs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,112 @@
+#!/bin/bash
+#
+# Kernel stub header creation functions for cross-lfs build
+# ---------------------------------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+set_stub_arch_switch() {
+   case ${TGT_ARCH} in
+   x86_64 | x86-64 )
+      ARCH_SWITCH=__x86_64__
+#      ARCH1=x86_64
+#      ARCH2=i386
+   ;;
+   sparc* | ultrasparc* )
+      ARCH_SWITCH=__arch64__
+#      ARCH1=sparc64
+#      ARCH2=sparc
+   ;;
+   ppc* | powerpc* )
+      ARCH_SWITCH=__powerpc64__
+#      ARCH1=ppc64
+#      ARCH2=ppc
+   ;;
+   s390* )
+      ARCH_SWITCH=__s390x__
+#      ARCH1=s390x
+#      ARCH2=s390
+   ;;
+   esac
+}
+
+# Creates kernel header stubs for biarch builds
+create_kernel_stubs() {
+   ARCH1=${1}
+   ARCH1_SWITCH=${2}
+   ARCH2=${3}
+   KERN_HDR_DIR=${4}
+
+   # Store the current directory so we can return.
+   startdir=`pwd`
+   for arch in ${ARCH1} ${ARCH2}; do
+      cd ${KERN_HDR_DIR}/asm-${arch}
+      dirs=`find . -type d | sed 's@^\.*\(\|/\)@@g'`
+      hdrs=`find . -type f -name \*.h | sed 's@^\.*\(\|/\)@@g'`
+      DIRS=`echo ${DIRS} ${dirs} | sort | uniq`
+      HDRS=`echo ${HDRS} ${hdrs} | sort | uniq`
+   done
+   cd ${startdir}
+
+   # Create directories (if required) under include/asm
+   if [ "${DIRS}" != "" ]; then
+      for dir in ${DIRS}; do
+         mkdir -p ${KERN_HDR_DIR}/asm/${dir}
+      done
+   fi
+
+   for hdr in ${HDRS}; do
+      # include barrier
+      name=`basename ${hdr} | tr [a-z]. [A-Z]_`
+      cat > ${KERN_HDR_DIR}/asm/${hdr} << EOF
+#ifndef __STUB__${name}__
+#define __STUB__${name}__
+
+EOF
+
+      # check whether we exist in arch1
+      if [ -f ${KERN_HDR_DIR}/asm-${ARCH1}/${hdr} ]; then
+         # check if we also exist arch2
+         if [ -f ${KERN_HDR_DIR}/asm-${ARCH2}/${hdr} ]; then
+            # we exist in both
+            cat >> ${KERN_HDR_DIR}/asm/${hdr} << EOF
+#ifdef ${ARCH1_SWITCH}
+#include <asm-${ARCH1}/${hdr}>
+#else
+#include <asm-${ARCH2}/${hdr}>
+#endif
+EOF
+         else
+            # we only exist in arch1
+            cat >> ${KERN_HDR_DIR}/asm/${hdr} << EOF
+#ifdef ${ARCH1_SWITCH}
+#include <asm-${ARCH1}/${hdr}>
+#endif
+EOF
+         fi
+      # end arch1
+      else
+         # if we get here we only exist in arch2
+         cat >> ${KERN_HDR_DIR}/asm/${hdr} << EOF
+#ifndef ${ARCH1_SWITCH}
+#include <asm-${ARCH2}/${hdr}>
+#endif
+EOF
+
+      fi
+      cat >> ${KERN_HDR_DIR}/asm/${hdr} << EOF
+
+#endif /* __STUB__${name}__ */
+EOF
+      echo " - ${KERN_HDR_DIR}/asm/${hdr} created"
+
+   done
+}
+
+# Export functions
+export -f set_stub_arch_switch
+export -f create_kernel_stubs
+
Index: scripts/funcs/log-funcs.sh
===================================================================
--- scripts/funcs/log-funcs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/funcs/log-funcs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,63 @@
+#!/bin/bash
+#
+# Log and Error handling funcrions 
+# -----------------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+#---------------------------------------
+# Standard log initialization functions
+#---------------------------------------
+
+BRKLN='================================================================================' # Break line
+export BRKLN
+
+
+max_log_init() { # $1=pkg $2=vers or text $3=dynam|stat|init|some text
+              # $4=<log-directory> $5=<log-filename>
+
+    LOGFNAME="${5}-${DATE}"
+    min_log_init ${4} ||
+    return 1  # Control in mainline. Chg to exit for bail out!
+
+    echo "### ${1} ${2} - ${3} - ${TS} ###"
+    
+}
+
+min_log_init() { # $1=<log-directory>
+    # If log start fails, error out w/message and return code
+    TS=$(date)        # Save a call
+    LOGFILE="${1}/${LOGFNAME}"
+    echo -e "${SELF} - ${LOGFNAME} - ${TS}\n${BRKLN}" > ${LOGFILE} ||
+    {
+      echo "min_log_init: writing ${LOGFILE} fail. Space/permissions?" \
+        &>/dev/tty
+      return 2  # Control in mainline. Chg to exit for bail out!
+    }
+}
+
+
+#---------------------------------------
+# Standard error handling functions
+#---------------------------------------
+errmsg() {
+   # Simply prints an error message, indicating which
+   # logfile to look at.
+   echo "XXXXXX NOT OK - CHECK LOG ${LOGFILE} XXXXXX"
+}
+
+barf() {
+   # prints error message and exits
+   errmsg
+   exit 1
+}
+
+# Export functions
+export -f max_log_init
+export -f min_log_init
+export -f errmsg
+export -f barf
+
Index: scripts/funcs/multiarch-funcs.sh
===================================================================
--- scripts/funcs/multiarch-funcs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/funcs/multiarch-funcs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,209 @@
+#!/bin/bash
+#
+# Multi-arch handling functions for cross-lfs build
+# -------------------------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+# TODO: should really check if DEFAULTENV and LIBDIRENV have been set
+#       in plfs-config and bail out if they have not...
+
+set_buildenv() {
+   case ${SELF} in
+      *-64.sh )  BUILDENV=64 ;;
+      *-32.sh )  BUILDENV=32 ;;
+      *-n32.sh ) BUILDENV=n32 ;;
+      *-o32.sh ) BUILDENV=o32 ;;
+      *-o64.sh ) BUILDENV=o64 ;;
+      * )        BUILDENV=${DEFAULTENV} ;;
+   esac
+
+   export BUILDENV
+}
+
+set_libdirname() {
+   # TODO: this will barf on mips if setting 64bit libs to go to */lib
+   #       but will work if setting
+   if [ -z "${BUILDENV}" ]; then 
+      BUILDENV=${DEFAULTENV}
+      export BUILDENV
+   fi
+   if [ ! "${BUILDENV}" = "${LIBDIRENV}" ]; then
+      case ${BUILDENV} in
+         32 | o32 | n32 )   libdirname=lib32 ;;
+         64 | o64 )         libdirname=lib64 ;;
+         * )   echo "unknown buildenv ${BUILDENV}"; return 1
+      esac
+      LOG=`echo ${LOG} | sed "s@\.log@-${BUILDENV}&@"`
+   else
+      libdirname=lib
+   fi
+
+   # Adjust PKG_CONFIG_PATH 
+   PKG_CONFIG_PATH=`echo "${PKG_CONFIG_PATH}" | \
+                    sed -e "s@lib[36][124]@lib@g"  -e "s@lib@${libdirname}@g" `
+
+   # Adjust GNOME_LIBCONF_PATH
+   GNOME_LIBCONF_PATH=`echo "${GNOME_LIBCONF_PATH}" | \
+                    sed -e "s@lib[36][124]@lib@g"  -e "s@lib@${libdirname}@g" `
+
+   if [ "${MULTIARCH}" = "Y" ]; then
+      export PERL=`which_func perl-${BUILDENV}`
+      export PYTHON=`which_func python-${BUILDENV}`
+   else
+      export PERL=`which_func perl`
+      export PYTHON=`which_func python`
+   fi
+
+}
+
+which_func() {
+   type ${1} | \
+   sed -e 's@.* \(.*\)$@\1@g' \
+       -e 's@[()]@@g'
+}
+
+
+# Following function sets compiler options
+setup_multiarch() {
+   if [ "Y" = "${MULTIARCH}" ]; then
+      vendor_os=`echo ${TARGET} | sed 's@\([^-]*\)-\(.*\)@\2@'`
+      TGT_ARCH=`echo ${TARGET} | sed 's@\([^-]*\).*@\1@'`
+
+      ARCH_CFLAGS=""
+      ALT_TGT=""
+
+      case ${BUILDENV} in
+      64 )
+         case ${TGT_ARCH} in
+            x86_64 )   ARCH_CFLAGS="-m${BUILDENV}" 
+                       ARCH_LDFLAGS="-m elf_x86_64" ;;
+            powerpc* | ppc* | s390* )
+                       ARCH_CFLAGS="-m${BUILDENV}" ;;
+            sparc* )   ARCH_CFLAGS="-m${BUILDENV}" 
+                       ALT_TGT=sparc64-${vendor_os} ;;
+            mips*el* ) ARCH_CFLAGS="-mabi=${BUILDENV}"
+                       ALT_TGT="mips64el-${vendor_os}" ;;
+            * )
+               echo "### Unknown: ${TGT_ARCH} -  ${BUILDENV} ###" 1>&2
+               return 1
+            ;;
+         esac
+      ;;
+      32 )
+         case ${TGT_ARCH} in
+            x86_64 | x86-64 )   ARCH_CFLAGS="-m${BUILDENV}"
+                                ARCH_LDFLAGS="-m elf_i386"
+                                ALT_TGT="i686-${vendor_os}" ;;
+            powerpc* | ppc* )   ARCH_CFLAGS="-m${BUILDENV}"
+                                ALT_TGT="ppc-${vendor_os}" ;;
+            sparc* )            ARCH_CFLAGS="-m${BUILDENV}"
+                                ALT_TGT="sparcv9-${vendor_os}" ;;
+            mips*el* )          ARCH_CFLAGS="-mabi=${BUILDENV}"
+                                ALT_TGT="mipsel-${vendor_os}" ;;
+            * )
+               echo "### Unknown: ${TGT_ARCH} -  ${BUILDENV} ###" 1>&2
+               return 1
+            ;;
+         esac
+      ;;
+      n32 )
+         case ${TGT_ARCH} in
+            mips*el* )          ARCH_CFLAGS="-mabi=${BUILDENV}" ;;
+            * )
+               echo "### Unknown: ${TGT_ARCH} -  ${BUILDENV} ###" 1>&2
+               return 1
+            ;;
+         esac
+      ;;
+      31 )
+         case ${TGT_ARCH} in
+            s390* ) ARCH_CFLAGS="-m${BUILDENV}"
+                    ALT_TGT="s390-${vender_os}" ;;
+            * )
+               echo "### Unknown: ${TGT_ARCH} -  ${BUILDENV} ###" 1>&2
+               return 1
+            ;;
+         esac
+      ;;
+      * )
+         echo "### Unknown biarch system ###" 1>&2
+         return 1
+      ;;
+      esac
+
+      suffix="-${BUILDENV}"
+   fi
+}
+
+create_wrapper() {
+   # want one arg only, the name of the wrapper file to create
+   if [ ! "${#}" = "1" ]; then
+      echo "create_wrapper: error, use create_wrapper /path/to/wrapper" 1>&2
+      return 1
+   fi
+   wrapper=${1}
+
+   if [ -z "${DEFAULTENV}" ]; then
+      echo "create_wrapper: error, DEFAULTENV not set" 1>&2
+      return 1
+   fi
+
+   wrapperdir=`dirname ${wrapper}`
+   if [ ! -d ${wrapperdir} ]; then mkdir -p ${wrapperdir} ; fi
+
+   cat > ${wrapper} <<EOF
+#!/bin/sh
+
+# Set to default if BUILDENV not set
+if [ -z \${BUILDENV} ]; then BUILDENV=${DEFAULTENV} ; fi
+export BUILDENV
+exec \${0}-\${BUILDENV} \${@}
+EOF
+
+   chmod 755 ${wrapper}
+
+}
+
+use_wrapper() {
+   # Use full path
+   wrapper=/usr/bin/multilib_wrapper
+
+   if [ "${#}" = "0" ]; then
+         echo "use_wrapper: error, no files specified" 1>&2
+         return 1
+   fi
+   if [ -z "${BUILDENV}" ]; then
+         echo "use_wrapper: error, BUILDENV not set" 1>&2
+         return 1
+   fi
+
+   echo " o set files to use multi-arch wrapper ( ${wrapper} )"
+   if [ ! -f ${wrapper} ]; then create_wrapper ${wrapper} || return 1 ; fi
+
+   for file in ${@} ; do
+      if [ ! -f ${file} ]; then
+         echo "use_wrapper: error, ${file} is not a regular file" 1>&2
+         return 1
+      fi
+
+      # do the work
+      mv ${file} ${file}-${BUILDENV} &&
+      ln -sf ${wrapper} ${file} &&
+      echo "   - ${file}" || {
+         echo "use_wrapper: error creating ${file}" 1>&2 
+         return 1
+      }
+
+   done
+}
+
+export -f set_buildenv
+export -f set_libdirname
+export -f setup_multiarch
+export -f create_wrapper
+export -f use_wrapper
+export -f which_func
Index: scripts/funcs/patching-funcs.sh
===================================================================
--- scripts/funcs/patching-funcs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/funcs/patching-funcs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,69 @@
+#!/bin/bash
+#
+# Patching functions for cross-lfs 
+# ---------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+# Check for stuff
+#----------------
+
+# Check for a grep which takes -E
+for dir in "" /bin/ /usr/bin/ /usr/xpg4/bin/ /usr/local/bin/ ; do
+   echo X | ${dir}grep -E X > /dev/null 2>&1 &&
+   {
+      export GREP="${path}grep"
+      break
+   }
+done
+
+if [ "${GREP}" = "" ]; then
+   echo "install a grep on the system that handles -E"
+   exit 1
+fi
+
+apply_patch () { # ${1}=<package-${PATCH_VER}> ${2}= patch flag (defaults to -Np1)
+   local patchname=${1}
+   local patchflags=${2}
+
+   local patch=`ls -t ${PATCHES}/${patchname}.* 2> /dev/null | \
+      ${GREP} -E ${patchname}.\(patch\|patch.gz\|patch.bz2\)$ | head -n 1`
+      
+
+   test -e ${PATCHES}/${patchname} || 
+   test -z ${patch} &&
+    {
+       echo "apply_patch: unable to locate patch '${patchname}' in ${PATCHES} ... exiting"
+       exit 1
+    }
+
+   test -z ${patchflags} && patchflags='-Np1'
+
+   case ${patch} in
+      *.patch.gz )   local CAT="gzip -dc" ;;
+      *.patch.bz2 )  local CAT="bzcat"    ;;
+      *.patch )      local CAT="cat"      ;;
+      * )   echo "apply_patch: unable to determine patch type... exiting"
+            exit 1 ;;
+   esac
+
+   echo "Applying ${patch}"
+   
+   ${CAT} ${patch} | patch ${patchflags} 2> /dev/null
+
+   # PIPESTATUS not available under bash 1.14.7 (RH 6.2)
+   #if [ "${PIPESTATUS[*]}" = "0 0" ]
+   if [ 0 = "${?}" ]; then
+      echo " o ${patch} applied successfully"
+   else
+      echo "apply_patch: unable to apply patch ${patch}... exiting"
+      exit 1
+   fi
+}
+
+# Export functions
+export -f apply_patch
+
Index: scripts/funcs/stub_header-funcs.sh
===================================================================
--- scripts/funcs/stub_header-funcs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/funcs/stub_header-funcs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,161 @@
+#!/bin/bash
+#
+# Stub Header Functions for cross-lfs build
+# -----------------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+set_stub_arch_switch() {
+   # TODO: this needs to be revisited... only handles 2 arches
+   case ${TGT_ARCH} in
+   x86_64 )
+      LIBDIRENV=${LIBDIRENV-32}
+      DEFAULTENV=${DEFAULTENV-64}
+      ARCH_SWITCH=__x86_64__
+      ENV1=64
+      ENV2=32
+   ;;
+   sparc* | ultrasparc* )
+      LIBDIRENV=${LIBDIRENV-32}
+      DEFAULTENV=${DEFAULTENV-64}
+      ARCH_SWITCH=__arch64__
+      ENV1=64
+      ENV2=32
+   ;;
+   ppc* | powerpc* )
+      LIBDIRENV=${LIBDIRENV-32}
+      DEFAULTENV=${DEFAULTENV-64}
+      ARCH_SWITCH=__powerpc64__
+      ENV1=64
+      ENV2=32
+   ;;
+   s390* )
+      LIBDIRENV=${LIBDIRENV-31}
+      DEFAULTENV=${DEFAULTENV-64}
+      ARCH_SWITCH=__s390x__
+      ENV1=64
+      ENV2=31
+   ;;
+   * )
+      echo "set_stub_arch_switch: error, TGT_ARCH=${TGT_ARCH} unknown" 1>&2
+      return 1
+   ;;
+   esac
+}
+
+create_stub_hdrs() {
+   if [ "${#}" = "0" ]; then
+      echo "create_stub_hdrs: error, no headers specified" 1>&2
+      return 1
+   fi
+
+   if [ -z "${BUILDENV}" ]; then
+      echo "create_stub_hdrs: error, BUILDENV not set" 1>&2
+      return 1
+   fi
+
+   set_stub_arch_switch || return 1
+
+   echo " o creating stub headers"
+
+   for file in ${@} ; do
+      hdr=`basename ${file}`
+      hdrdir=`dirname ${file}`
+      barrier="__STUB__$( echo ${hdr} | tr [a-z]. [A-Z]_ )__"
+
+      if [ ! -f ${file} ]; then
+         echo "create_stub_hdrs: error, header ${file} does not exist" 1>&2
+         return 1
+      fi
+
+      # If the header we are making a stub for is a stub header we created earlier,
+      # do not continue as something has gone wrong...
+      head -n 1 ${file} | grep "#ifndef ${barrier}" > /dev/null 2>&1 && {
+         echo "create_stub_hdrs: error, ${file} is a stub header" 1>&2
+         return 1
+      }
+
+      # create the dirctory to house the real header (if it does not already exist)
+      if [ ! -d ${hdrdir}/${BUILDENV} ]; then
+         mkdir ${hdrdir}/${BUILDENV}
+      fi
+
+      # move the real header
+      mv ${file} ${hdrdir}/${BUILDENV} || {
+         echo "create_stub_hdrs: error, unable to move ${file} to ${hdrdir}/${BUILDENV}" 1>&2
+         return 1
+      }
+
+      # Generate the header stub
+
+      # include barrier
+      echo "#ifndef ${barrier}" > ${hdrdir}/${hdr}
+      echo "#define ${barrier}" >> ${hdrdir}/${hdr}
+      echo ""                   >> ${hdrdir}/${hdr}
+
+      if [ -f ${hdrdir}/${ENV1}/${hdr} ]; then
+         echo "#ifdef ${ARCH_SWITCH}"       >> ${hdrdir}/${hdr}
+         echo "#include \"${ENV1}/${hdr}\"" >> ${hdrdir}/${hdr}
+         if [ -f ${hdrdir}/${ENV2}/${hdr} ]; then
+            echo "#else"                       >> ${hdrdir}/${hdr}
+            echo "#include \"${ENV2}/${hdr}\"" >> ${hdrdir}/${hdr}
+         fi
+      elif [ -f ${hdrdir}/${ENV2}/${hdr} ]; then
+         echo "#ifndef ${ARCH_SWITCH}"      >> ${hdrdir}/${hdr}
+         echo "#include \"${ENV2}/${hdr}\"" >> ${hdrdir}/${hdr}
+      else
+         echo "create_stub_hdr: error, something really b0rked here" 1>&2
+         return 1
+      fi
+      echo "#endif /* ${ARCH_SWITCH} */" >> ${hdrdir}/${hdr}
+   
+      echo ""                        >> ${hdrdir}/${hdr}
+      echo "#endif /* ${barrier} */" >> ${hdrdir}/${hdr}
+
+      echo "   - ${hdrdir}/${hdr}"
+
+   done
+}
+
+create_stub_hdr() {
+   hdr=`basename ${1}`
+   hdrdir=`dirname ${1}`
+   barrier="__STUB__$( echo ${hdr} | tr [a-z]. [A-Z]_ )__"
+
+   set_stub_arch_switch
+
+   # setup include barrier
+   echo "#ifndef ${barrier}" > ${hdrdir}/${hdr}
+   echo "#define ${barrier}" >> ${hdrdir}/${hdr}
+   echo ""                   >> ${hdrdir}/${hdr}
+
+   if [ -f ${hdrdir}/${ENV1}/${hdr} ]; then
+      echo "#ifdef ${ARCH_SWITCH}"       >> ${hdrdir}/${hdr}
+      echo "#include \"${ENV1}/${hdr}\"" >> ${hdrdir}/${hdr}
+      if [ -f ${hdrdir}/${ENV2}/${hdr} ]; then
+         echo "#else"                       >> ${hdrdir}/${hdr}
+         echo "#include \"${ENV2}/${hdr}\"" >> ${hdrdir}/${hdr}
+      fi
+   elif [ -f ${hdrdir}/${ENV2}/${hdr} ]; then
+      echo "#ifndef ${ARCH_SWITCH}"      >> ${hdrdir}/${hdr}
+      echo "#include \"${ENV2}/${hdr}\"" >> ${hdrdir}/${hdr}
+   else
+      echo "create_stub_hdr: error, something really b0rked here" 1>&2
+      return 1
+   fi
+   echo "#endif /* ${ARCH_SWITCH} */" >> ${hdrdir}/${hdr}
+
+   echo ""                        >> ${hdrdir}/${hdr}
+   echo "#endif /* ${barrier} */" >> ${hdrdir}/${hdr}
+
+   echo "   - ${hdrdir}/${hdr}"
+
+}
+
+      
+# Export functions
+export -f set_stub_arch_switch
+export -f create_stub_hdrs
Index: scripts/funcs/tarball-funcs.sh
===================================================================
--- scripts/funcs/tarball-funcs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/funcs/tarball-funcs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,244 @@
+#!/bin/bash
+#
+# Tarball handling functions for cross-lfs build
+# -----------------------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+# Check for stuff
+#----------------
+
+# Check for a grep which takes -E
+for dir in "" /bin/ /usr/bin/ /usr/xpg4/bin/ /usr/local/bin/ ; do
+   echo X | ${dir}grep -E X > /dev/null 2>&1 &&
+   {
+      export GREP="${dir}grep"
+      break
+   }
+done
+
+if [ "${GREP}" = "" ]; then
+   echo "install a grep on the system that handles -E"
+   exit 1
+fi
+
+fetch() {
+
+   # find and fetch files with wget by using the google "I'm feeling lucky" search
+   #------------------------------------------------------------------------------
+   # Many, many thanks to Glenn Sommer <glemsom_at_hotpop.com> for this damn cool
+   # bit of scriptage ;-)
+   #
+   # Probably a bit more sanity checking wouldn't go astray... but hey ;-)
+
+   if [ -z "${1}" ]; then
+      echo "fetch: error, no file specified" 2>&1
+      return 1
+   fi
+
+   echo -n " o searching for ${1} tarball ... "
+
+   # We search for "Index of" - hoping to catch some ftp server
+   # And then we search for the filename
+   google_lucky_search="http://www.google.com/search?hl=en&q=%22Index+of%22+${1}&btnI=I%27m+Feeling+Lucky&meta="
+
+   location=`wget -c -U Mozilla ${google_lucky_search} 2>&1 | 
+   grep Location | \
+   head -n 1 | \
+   sed -e 's/Location: \(.*\) \[following\].*$/\1/'`
+   rm -f index.html
+
+   if [ -z "${location}" ]; then
+      echo "failed"
+      return 1
+   fi
+
+   echo -e "found"
+   echo " o retrieving ${location}${1}"
+   wget -c ${location}${1} 2>&1
+
+}
+
+fetch_tarball() { # ${1} should be a package name w version
+   for type in tar.bz2 tar.gz tgz tar bleh; do
+      fetch ${1}.${type}
+      if [ "${?}" = "0" ]; then return 0 ; fi
+      # if the following is true, we failed in our mission
+      if [ "${type}" = "bleh" ]; then return 1 ; fi
+   done
+}
+
+unpack_tarball() { # ${1}=<package-${PACKAGE_VER}> ${2}
+   local pkgname=${1}
+   shift
+   local filelist="${@}"
+   # Easier add of .tgz
+
+   # if PACKAGE_VER was not set for this package, warn but exit with no error.
+   # this is so we can disable the build of a package by not exporting its
+   # PACKAGE_VER variable in plfs-packages
+   echo "${pkgname}" | ${GREP} -E \\-$ > /dev/null 2>&1
+   if [ "${?}" = 0 ]; then
+      echo "unpack_tarball: skipping script ${0}, package version not set"
+      exit 0
+   fi
+   
+   local archive=`ls -t ${TARBALLS}/${pkgname}* 2> /dev/null | \
+      ${GREP} -E ${pkgname}.\(tgz\|tar.gz\|tar.bz2\|tar\)$ | head -n 1`
+
+   if [ -z ${archive} ]; then
+      echo "unpack_tarball: unable to locate tarball for '${pkgname}' in ${TARBALLS} ... exiting"
+      exit 1
+   fi
+
+   case ${archive} in
+      *.gz | *.tgz )   local CAT="gzip -dc" ;;
+      *.bz2 )          local CAT="bzcat"    ;;
+      *.tar )          local CAT="cat"    ;;
+      * )   echo "unpack_tarball: unable to determine tarball type... exiting"
+            exit 1 ;;
+   esac
+
+   # May as well provide a method for passing back the directory the tarball 
+   # unpacks to.
+   # Should save some trauma when a tarball doesn't extract to where is expected
+   # ( usually package-${PACKAGE_VER} but not always... )
+   # store in environment as PKGDIR.
+
+   echo -e "\n${BRKLN}"
+   echo -n "Checking tarball install directory... "
+   export PKGDIR=`${CAT} ${archive} | tar -tf - | \
+      head -n 1 | sed -e 's@^\./@@g' -e 's@/.*$@@g'`
+
+   if [ -z ${PKGDIR} ]; then
+      echo "Error: unable to determine tarball contents, exiting"
+      exit 1
+   else
+      echo "${PKGDIR}"
+   fi
+
+   # If we are not doing a full unpack of the tarball, don't delete ${PKGDIR}
+   if [ ! -z "${filelist}" ]; then
+      # prepend ${PKGDIR} to each required file 
+      filelist=`echo ${filelist} | \
+         sed "s@\([-+_a-zA-Z0-9/.]* \?\)@${PKGDIR}/\1@g"`
+   elif [ -d ${PKGDIR} ]; then
+      echo -n "Removing existing ${PKGDIR} directory... "
+      rm -rf ${PKGDIR} && echo "DONE" || 
+      echo "Error removing ${PKGDIR}... "; #return 1
+   fi
+
+
+   echo "Unpacking ${archive}"
+   ${CAT} ${archive} | tar -xf - ${filelist} 2> /dev/null &&
+   echo " o ${1} unpacked successfully" ||
+   {
+      echo "unpack_tarball: unable to unpack tarball ${archive}... exiting"
+      exit 1
+   }
+
+   return 0
+}
+
+check_tarballs () {
+   # ${GREP}s through the either the calling script or the script(s)
+   # passed as args for calls to unpack_tarball.
+   # This function expects the scripts to be stored in ${SCRIPTS}.
+   #
+   # It will store the list of packages required in the list PKGS
+   # All will have their variable components unexpanded.
+
+   LIST=""
+   ARGS="${@}"
+   if [ ! -z "${ARGS}" ]; then
+      for script in ${ARGS}; do
+         if [ -f ${SCRIPTS}/${script} ]; then
+            LIST="${LIST} ${SCRIPTS}/${script}"
+         else
+            echo "check_tarballs: build script ${SCRIPTS}/${script} not found... skipping" 1>&2
+         fi
+      done
+   elif [ ! -z ${SELF} -a -f ${SCRIPTS}/${SELF} ]; then
+      LIST=${SCRIPTS}/${SELF}
+   fi
+
+   test -z "${LIST}" &&
+   {
+      echo "check_tarballs: no build scripts found... exiting"
+      exit 1
+   }
+
+   # Retrieve package defs from unpack_tarball calls into a list
+   local PKGS="$( cat ${LIST} | \
+                 ${GREP} -E '^[[:blank:]]*unpack_tarball (\w|-)*\${\w*}' | \
+                 awk '{print $2}' | sort -u )"
+
+   echo -e "\nChecking for required tarballs in ${TARBALLS}\n${BRKLN}"
+
+   # loop through list
+   for pkg in ${PKGS} ; do
+
+      # check if the ${PKG_VER} variable is set in plfs-config
+      # If not ignore the package
+      ver_var=`echo ${pkg} | sed 's@.*\(${.*}\).*@\1@g'`
+      eval ver=${ver_var}
+      if [ -z ${ver} ]; then continue ; fi
+
+      # do variable expansion on ${pkg}
+      eval pkgname=${pkg}
+      # check if this package is used
+      check_pkg_used ${pkgname} || continue
+      echo -n " o Looking for ${pkgname}... "
+      # check for the existence of the tarball
+      #local archive=`ls -t ${TARBALLS}/${pkgname}.@(tgz|tar.gz|tar.bz2) \
+      #  2> /dev/null | head -n 1`
+      local archive=`ls -t ${TARBALLS}/${pkgname}* 2> /dev/null | \
+      ${GREP} -E ${pkgname}.\(tgz\|tar.gz\|tar.bz2\|tar\)$ | head -n 1`
+
+      if [ -z "${archive}" ]; then
+         echo "not found"
+
+         # Attempt to download it from the net
+         cd ${TARBALLS}
+         fetch_tarball ${pkgname} || {
+            echo -e "XXXXXX NOT FOUND: Unable to locate tarball for '${pkgname}'  XXXXXX"
+            exit 1
+         }
+      else
+         echo -e "OK\n   Found: ${archive}"
+      fi
+
+   done
+   echo -e " o ALL OK\n${BRKLN}\n"
+}
+
+# Following two functions are interim hacks for check_patches and
+# check_tarballs to get around conditional packages/patches
+# these will be revisited
+
+check_pkg_used () {
+   case ${1} in
+      glibc-linuxthreads* )
+         #test Y = "${USE_NPTL}" && return 1
+         return 1
+      ;;
+      nptl-* )
+         test Y = "${USE_NPTL}" || return 1
+      ;;
+      udev-* )
+         test Y = "${UDEV}" || return 1
+      ;;
+   esac
+   return 0
+}
+
+# Export functions
+export -f check_tarballs
+export -f fetch
+export -f fetch_tarball
+export -f unpack_tarball
+export -f check_pkg_used
+
Index: scripts/host-scripts/host-autoconf.sh
===================================================================
--- scripts/host-scripts/host-autoconf.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/host-scripts/host-autoconf.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+### AUTOCONF ###
+
+cd ${SRC}
+LOG=autoconf-buildhost.log
+
+unpack_tarball autoconf-${AUTOCONF_VER} &&
+cd ${PKGDIR}
+
+max_log_init Autoconf ${AUTOCONF_VER} "buildhost (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc}" CFLAGS="-O2 -pipe" \
+./configure --prefix=${HST_TOOLS} \
+   --disable-nls \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+      >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/host-scripts/host-automake.sh
===================================================================
--- scripts/host-scripts/host-automake.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/host-scripts/host-automake.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+### AUTOMAKE ###
+
+cd ${SRC}
+LOG=automake-buildhost.log
+
+unpack_tarball automake-${AUTOMAKE_VER} &&
+cd ${PKGDIR}
+
+max_log_init Automake ${AUTOMAKE_VER} "buildhost (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc}" CFLAGS="-O2 -pipe" \
+./configure --prefix=${HST_TOOLS} \
+   --disable-nls \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+# TODO: do we need to do the same for aclocal?
+rel=`echo ${AUTOMAKE_VER} | sed 's@\([0-9]\.[0-9]\).*@\1@g'`
+ln -sf automake-${rel} ${HST_TOOLS}/share/automake
+
Index: scripts/host-scripts/host-binutils.sh
===================================================================
--- scripts/host-scripts/host-binutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/host-scripts/host-binutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,72 @@
+#!/bin/bash
+
+### BINUTILS ###
+
+cd ${SRC}
+LOG="binutils-buildhost.log"
+
+unpack_tarball binutils-${NATIVE_BINUTILS_VER} &&
+
+# Determine whether this binutils requires
+# 'make configure-host' and whether
+# ld search path can be set with --with-lib-path.
+# Returned in ${BINUTILS_CONF_HOST} and
+# ${BINUTILS_WITH_LIB_PATH} respectively
+                                                                                
+# TODO: check for architecture specific patches in check_binutils
+#       ( alpha )
+check_binutils
+
+cd ${SRC}/${PKGDIR}
+                                                                                
+# 20031015 - fix static linking issues during testsuite
+#            with current CVS glibc. kernel 2.5.68+
+#            Will only patch HJL 2.14.90.0.[6-7]
+                                                                                
+case ${NATIVE_BINUTILS_VER} in
+   2.14.90.0.[6-7] )
+      apply_patch binutils-2.14.90.0.7-fix-static-link
+   ;;
+esac
+                                                                                
+cd ${SRC}
+                                                                                
+# Remove pre-existing build directory and recreate
+test -d binutils-${NATIVE_BINUTILS_VER}-buildhost-build &&
+   rm -rf binutils-${NATIVE_BINUTILS_VER}-buildhost-build
+                                                                                
+mkdir binutils-${NATIVE_BINUTILS_VER}-buildhost-build
+cd binutils-${NATIVE_BINUTILS_VER}-buildhost-build
+
+max_log_init Binutils ${NATIVE_BINUTILS_VER} target ${CONFLOGS} ${LOG}
+CC="${CC-gcc}" ../${PKGDIR}/configure \
+   --prefix=${HST_TOOLS} \
+   --disable-nls \
+   --enable-shared \
+   --enable-64-bit-bfd \
+   >> ${LOGFILE} 2>&1 &&
+{
+   # Run make configure-host if required
+   test Y != "${BINUTILS_CONF_HOST}" ||
+   {
+      echo -e "\nmake configure-host\n${BRKLN}" >> ${LOGFILE}
+      make configure-host >> ${LOGFILE} 2>&1
+   }
+} &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+make -k check \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o All OK" || barf
+
Index: scripts/host-scripts/host-bison.sh
===================================================================
--- scripts/host-scripts/host-bison.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/host-scripts/host-bison.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+### BISON ###
+
+cd ${SRC}
+LOG=bison-buildhost.log
+
+unpack_tarball bison-${BISON_VER} &&
+cd ${PKGDIR}
+
+max_log_init Bison ${BISON_VER} "buildhost (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc}" CFLAGS="-O2 -pipe" ./configure --prefix=${HST_TOOLS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >>  ${LOGFILE} 2>&1 &&
+echo " o Test OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+test -f ${HST_TOOLS}/bin/yacc ||
+   cat > ${HST_TOOLS}/bin/yacc << "EOF"
+#!/bin/sh
+# Begin ${HST_TOOLS}/bin/yacc
+
+exec ${HST_TOOLS}/bin/bison -y "$@"
+
+# End ${HST_TOOLS}/bin/yacc
+EOF
+
+chmod 755 ${HST_TOOLS}/bin/yacc
Index: scripts/host-scripts/host-coreutils-binaries.sh
===================================================================
--- scripts/host-scripts/host-coreutils-binaries.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/host-scripts/host-coreutils-binaries.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,94 @@
+#!/bin/bash
+
+### COREUTILS BINARIES ###
+
+# NOTE: Here we are only creating a small subset of the coreutils binaries.
+
+cd ${SRC}
+LOG=coreutils-buildhost.log
+
+unpack_tarball coreutils-${COREUTILS_VER}
+cd ${PKGDIR}
+
+# If we don't want to conform to POSIX 200212L, override
+# NOTE: This is coreutils 5.0 specific, later versions will have
+#       a configure/compile time option
+case ${COREUTILS_VER} in
+   5.1.7 | 5.[2-9]* ) ;;
+   * )   mv lib/posixver.c lib/posixver.c-ORIG
+         sed '/\/\* The POSIX version that utilities should conform to/i\
+#undef _POSIX2_VERSION\
+#define _POSIX2_VERSION 199209L\
+' lib/posixver.c-ORIG > lib/posixver.c
+   ;;
+esac
+
+max_log_init Coreutils ${COREUTILS_VER} "buildhost echo (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc}" \
+CFLAGS="-O2 -pipe" \
+DEFAULT_POSIX2_VERSION=199209 \
+./configure --prefix=${HST_TOOLS} \
+   --disable-nls \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" -C lib \
+   >> ${LOGFILE} 2>&1 || barf
+
+case ${COREUTILS_VER} in
+   5.2* )
+      # coreutils-5.2.1+ - Create localedir.h
+      make ${PMFLAGS} LDFLAGS="-s" -C src localedir.h
+         >> ${LOGFILE} 2>&1 || barf
+   ;;
+esac
+
+# glibc build gets upset by systems with a non BSDish echo program which
+# always expands \n regardless if it is contained inside single quotes.
+# (solaris)
+
+# NOTE: building echo doesn't solve this issue when echo is issued from
+#       make, as make invokes /bin/sh which for some reason doesn't use
+#       what you would expect to be the first echo in PATH.
+#       This is avoided later by passing SHELL="bash" to affected makes
+#       to force use of bash's internal echo
+
+make ${PMFLAGS} LDFLAGS="-s" -C src echo \
+   >> ${LOGFILE} 2>&1 &&
+
+# Fix issues with binutils brokenness when it cannot find a working
+# bsd compatible install on the system
+# (solaris)
+
+make ${PMFLAGS} LDFLAGS="-s" -C src ginstall \
+   >> ${LOGFILE} 2>&1 &&
+
+
+# During kernel headers install, solaris expr causes a syntax error.
+
+make ${PMFLAGS} LDFLAGS="-s" -C src expr \
+   >> ${LOGFILE} 2>&1 &&
+
+
+# ensure we have a cp which takes -a ( -dpR)
+
+make ${PMFLAGS} LDFLAGS="-s" -C src cp \
+   >> ${LOGFILE} 2>&1 &&
+
+
+# ensure we have a ln which properly handles -sf
+# (on solaris it errors out if name of link being created already exists)
+
+make ${PMFLAGS} LDFLAGS="-s" -C src ln \
+   >> ${LOGFILE} 2>&1 &&
+
+echo " o Build OK" &&
+
+cp -p src/echo ${HST_TOOLS}/bin/echo &&
+cp -p src/ginstall ${HST_TOOLS}/bin/install &&
+cp -p src/expr ${HST_TOOLS}/bin/expr &&
+cp -p src/cp ${HST_TOOLS}/bin/cp &&
+cp -p src/ln ${HST_TOOLS}/bin/ln &&
+echo " o Install OK" 
+
Index: scripts/host-scripts/host-flex.sh
===================================================================
--- scripts/host-scripts/host-flex.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/host-scripts/host-flex.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+### FLEX ###
+
+cd ${SRC}
+LOG=flex-buildhost.build
+
+unpack_tarball flex-${FLEX_VER} &&
+cd ${PKGDIR}
+
+case ${FLEX_VER} in
+   2.5.31 )
+      # Fix brokenness in flex-2.5.31
+      apply_patch flex-2.5.31-debian_fixes-2
+   ;;
+esac
+
+max_log_init Flex ${FLEX_VER} "buildhost (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc}" CFLAGS="-O2 -pipe" ./configure --prefix=${HST_TOOLS} \
+   --disable-nls >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+grep "^bigcheck:" Makefile &&
+{ 
+   make bigcheck \
+      >> ${LOGFILE} 2>&1
+} || {
+   make check \
+      >> ${LOGFILE} 2>&1
+} &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+# Create lex wrapper
+cat > ${HST_TOOLS}/bin/lex << "EOF"
+#!/bin/sh
+# Begin ${HST_TOOLS}/bin/lex
+
+exec ${HST_TOOLS}/bin/flex -l "$@"
+
+# End ${HST_TOOLS}/bin/lex
+EOF
+
+chmod 755 ${HST_TOOLS}/bin/lex
+
Index: scripts/host-scripts/host-gawk.sh
===================================================================
--- scripts/host-scripts/host-gawk.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/host-scripts/host-gawk.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+### GAWK ###
+
+cd ${SRC}
+LOG=gawk-buildhost.log
+
+unpack_tarball gawk-${GAWK_VER} &&
+cd ${PKGDIR}
+
+max_log_init Gawk ${GAWK_VER} "buildhost (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc}" CFLAGS="-O2 -pipe" ./configure --prefix=${HST_TOOLS} \
+   --disable-nls \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >>  ${LOGFILE} 2>&1 &&
+echo " o Test OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/host-scripts/host-gcc.sh
===================================================================
--- scripts/host-scripts/host-gcc.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/host-scripts/host-gcc.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+### GCC ( static ) ###
+
+cd ${SRC}
+
+LOG="gcc-buildhost.log"
+
+unpack_tarball gcc-${GCC_VER}
+
+# 20030427
+# Cannot trust ${GCC_VER} to supply us with the correct
+# gcc version (especially if cvs).
+# Grab it straight from version.c
+cd ${SRC}/${PKGDIR}
+target_gcc_ver=`grep version_string gcc/version.c | \
+                sed 's@.* = "\([0-9.]*\).*@\1@g'`
+
+test -d ${SRC}/gcc-${GCC_VER}-buildhost &&
+   rm -rf ${SRC}/gcc-${GCC_VER}-buildhost
+
+mkdir -p ${SRC}/gcc-${GCC_VER}-buildhost &&
+cd ${SRC}/gcc-${GCC_VER}-buildhost &&
+
+max_log_init Gcc ${GCC_VER} "buildhost (static)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc}" CFLAGS="-O2 -pipe" CXXFLAGS="-O2 -pipe" \
+../${PKGDIR}/configure --prefix=${HST_TOOLS} \
+   --enable-languages=c --enable-__cxa_atexit \
+   --enable-c99 --enable-long-long --enable-threads=posix \
+   --disable-nls --disable-shared \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" || barf
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} BOOT_LDFLAGS="-s" BOOT_CFLAGS="-O2 -pipe" \
+   STAGE1_CFLAGS="-O2 -pipe" bootstrap \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+make -k check \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Install OK" || barf
+
+test -L ${HST_TOOLS}/bin/cc || ln -s gcc ${HST_TOOLS}/bin/cc
+
Index: scripts/host-scripts/host-gettext.sh
===================================================================
--- scripts/host-scripts/host-gettext.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/host-scripts/host-gettext.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+### GETTEXT ###
+
+cd ${SRC}
+LOG=gettext-buildhost.log
+
+unpack_tarball gettext-${GETTEXT_VER} &&
+cd ${PKGDIR}
+
+max_log_init Gettext ${GETTEXT_VER}  "buildhost (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc}" CFLAGS="-O2 -pipe" ./configure --prefix=${HST_TOOLS} \
+   --disable-shared \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+#min_log_init ${TESTLOGS} &&
+#make check \
+#   >>  ${LOGFILE} 2>&1 &&
+#echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/host-scripts/host-grep.sh
===================================================================
--- scripts/host-scripts/host-grep.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/host-scripts/host-grep.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+### GREP ###
+
+cd ${SRC}
+LOG=grep-buildhost.log
+
+unpack_tarball grep-${GREP_VER} &&
+cd ${PKGDIR}
+
+max_log_init Grep ${GREP_VER} "buildhost (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc}" CFLAGS="-O2 -pipe" \
+./configure --prefix=${HST_TOOLS} --with-included-regex \
+   --disable-nls \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+# Make Grep tests executable
+chmod 750 ./tests/* &&
+
+min_log_init ${TESTLOGS} &&
+# May fail 2 tests...
+make check \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/host-scripts/host-libtool.sh
===================================================================
--- scripts/host-scripts/host-libtool.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/host-scripts/host-libtool.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+### LIBTOOL ###
+
+cd ${SRC}
+LOG=libtool-buildhost.log
+
+unpack_tarball libtool-${LIBTOOL_VER} &&
+cd ${PKGDIR}
+
+max_log_init Libtool ${LIBTOOL_VER} "buildhost (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc}" CFLAGS="-O2 -pipe" \
+./configure --prefix=${HST_TOOLS} \
+   --disable-nls \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${INSTLOGS} &&
+make install \
+      >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/host-scripts/host-m4.sh
===================================================================
--- scripts/host-scripts/host-m4.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/host-scripts/host-m4.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+### M4 ###
+
+cd ${SRC}
+LOG=m4-buildhost.log
+
+unpack_tarball m4-${M4_VER} &&
+cd ${PKGDIR} 
+
+max_log_init M4 ${M4_VER} "buildhost (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc}" CFLAGS="-O2 -pipe" ./configure --prefix=${HST_TOOLS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >>  ${LOGFILE} 2>&1 &&
+echo " o Test OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/host-scripts/host-make.sh
===================================================================
--- scripts/host-scripts/host-make.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/host-scripts/host-make.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+### MAKE ###
+
+cd ${SRC}
+LOG=make-buildhost.log
+
+unpack_tarball make-${MAKE_VER} &&
+cd ${PKGDIR}
+
+max_log_init Make ${MAKE_VER} "buildhost (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc}" CFLAGS="-O2 -pipe" ./configure --prefix=${HST_TOOLS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >>  ${LOGFILE} 2>&1 &&
+echo " o Test OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+chmod 755 ${HST_TOOLS}/bin/make
+
Index: scripts/host-scripts/host-ncurses.sh
===================================================================
--- scripts/host-scripts/host-ncurses.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/host-scripts/host-ncurses.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+### NCURSES ###
+
+cd ${SRC}
+LOG=ncurse-buildhost.log
+
+unpack_tarball ncurses-${NCURSES_VER} &&
+cd ${PKGDIR}
+
+# replace some deprecated headers
+# strstream deprecated in favour of sstream
+cd c++
+test -f cursesw.h-ORIG ||
+   mv cursesw.h cursesw.h-ORIG
+sed 's/include <strstream.h>/include <sstream>/g' ./cursesw.h-ORIG > ./cursesw.h
+
+# CHECK THIS... Should only affect ncurses 5.2 and less, 
+# must check whether vsscanf is picked up or not in 5.3
+
+test 5.2 = "${NCURSES_VER}" &&
+{
+   # Apply cursesw.cc vsscanf patch
+   # Unsure who provided the original patch used.
+   # Please contact the authors so we can attribute you correctly.
+   test -f ./cursesw.cc-ORIG ||
+      cp cursesw.cc cursesw.cc-ORIG
+   grep -v strstreambuf cursesw.cc-ORIG |
+   sed 's@ss.vscan(@::vsscanf(buf, @' > cursesw.cc
+}
+cd ${SRC}/${PKGDIR}
+
+max_log_init Ncurses ${NCURSES_VER} "buildhost (static)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc}" ./configure --prefix=${HST_TOOLS} \
+   --without-debug \
+   --without-cxx \
+   --without-cxx-binding \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+chmod 755 ${HST_TOOLS}/lib/*.${NCURSES_VER} &&
+ln -s libncurses.a ${HST_TOOLS}/lib/libcurses.a
+
+#ldconfig
+
+# Some braindead apps (util-linux) don't check for term.h under include/ncurses
+# Create link
+ln -sf ncurses/term.h ${HST_TOOLS}/include
+# Also create curses.h symlink
+ln -sf ncurses/curses.h ${HST_TOOLS}/include
+
Index: scripts/host-scripts/host-patch.sh
===================================================================
--- scripts/host-scripts/host-patch.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/host-scripts/host-patch.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+### PATCH ###
+
+cd ${SRC}
+LOG=patch-buildhost.log
+
+unpack_tarball patch-${PATCH_VER}
+cd ${PKGDIR}
+
+max_log_init Patch ${PATCH_VER} "buildhost (shared)" ${CONFLOGS} ${LOG}
+
+# TODO: Probably should do a check to see if we need GNU_SOURCE
+#       on the OS we are running the script from... 
+
+#CPPFLAGS=-D_GNU_SOURCE \
+CC="${CC-gcc}" CFLAGS="-O2 -pipe" ./configure --prefix=${HST_TOOLS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/host-scripts/host-sed.sh
===================================================================
--- scripts/host-scripts/host-sed.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/host-scripts/host-sed.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+### SED ###
+
+cd ${SRC}
+LOG=sed-buildhost.build
+
+unpack_tarball sed-${SED_VER} &&
+cd ${PKGDIR}
+
+case ${SED_VER} in
+   4.1 )
+      # when sed'ing in-place the target files permissions are changed
+      # this fixes this behaviour
+      apply_patch sed-4.1-permissions-1
+   ;;
+esac
+
+max_log_init Sed ${SED_VER} "buildhost (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc}" CFLAGS="-O2 -pipe" \
+./configure --prefix=${HST_TOOLS} \
+   --disable-nls \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/host-scripts/host-tar.sh
===================================================================
--- scripts/host-scripts/host-tar.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/host-scripts/host-tar.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+### TAR ###
+
+cd ${SRC}
+LOG=tar-buildhost.log
+
+unpack_tarball tar-${TAR_VER}
+cd ${PKGDIR}
+
+test 1.13 = "${TAR_VER}" &&
+   apply_patch tar-${TAR_VER}
+
+max_log_init Tar ${TAR_VER} "buildhost (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc}" CFLAGS="-O2 -pipe" ./configure --prefix=${HST_TOOLS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >>  ${LOGFILE} 2>&1 &&
+echo " o Test OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/host-scripts/host-texinfo.sh
===================================================================
--- scripts/host-scripts/host-texinfo.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/host-scripts/host-texinfo.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+### TEXINFO ###
+
+cd ${SRC}
+LOG=texinfo-buildhost.log
+
+unpack_tarball texinfo-${TEXINFO_VER} &&
+cd ${PKGDIR}
+
+max_log_init Texinfo ${TEXINFO_VER} "buildhost (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc}" CFLAGS="-O2 -pipe" \
+./configure --prefix=${HST_TOOLS} \
+   --disable-nls \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >>  ${LOGFILE} 2>&1 &&
+echo " o Test OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+#min_log_init ${INSTLOGS} &&
+#make TEXMF=${HST_TOOLS}/share/texmf install-tex \
+#   >> ${LOGFILE} 2>&1 &&
+#echo " o ALL OK" || barf
+
Index: scripts/native-scripts/copy-kern-hdrs.sh
===================================================================
--- scripts/native-scripts/copy-kern-hdrs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/copy-kern-hdrs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# cross-lfs native copy kernel headers
+# ------------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+if [ ! -d /usr/include ]; then mkdir /usr/include; fi
+
+if [ ! -d /usr/include/asm ]; then
+   echo " o Copying kernel headers from"
+   echo "   ${TGT_TOOLS}/include to /usr/include"
+   cp -Rp ${TGT_TOOLS}/include/asm* /usr/include
+   cp -Rp ${TGT_TOOLS}/include/linux /usr/include
+fi
+
Index: scripts/native-scripts/make_symlinks.sh
===================================================================
--- scripts/native-scripts/make_symlinks.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/make_symlinks.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+if [ -z ${SCRIPTS} ]; then exit 1 ;fi
+
+ln -s native-bzip2.sh		${SCRIPTS}/native-scripts/native-bzip2-64.sh 
+ln -s native-file.sh		${SCRIPTS}/native-scripts/native-file-64.sh 
+ln -s native-flex.sh		${SCRIPTS}/native-scripts/native-flex-64.sh 
+ln -s native-gettext.sh		${SCRIPTS}/native-scripts/native-gettext-64.sh 
+ln -s native-glibc.sh		${SCRIPTS}/native-scripts/native-glibc-64.sh 
+ln -s native-libtool.sh		${SCRIPTS}/native-scripts/native-libtool-64.sh 
+ln -s native-ncurses.sh		${SCRIPTS}/native-scripts/native-ncurses-64.sh 
+ln -s native-perl.sh		${SCRIPTS}/native-scripts/native-perl-64.sh 
+ln -s native-procps.sh		${SCRIPTS}/native-scripts/native-procps-64.sh 
+ln -s native-readline.sh	${SCRIPTS}/native-scripts/native-readline-64.sh 
+ln -s native-shadow.sh		${SCRIPTS}/native-scripts/native-shadow-64.sh 
+ln -s native-zlib.sh		${SCRIPTS}/native-scripts/native-zlib-64.sh 
+ln -s temp-expect.sh		${SCRIPTS}/native-scripts/temp-expect-64.sh 
+ln -s temp-perl.sh		${SCRIPTS}/native-scripts/temp-perl-64.sh 
+ln -s temp-tcl.sh		${SCRIPTS}/native-scripts/temp-tcl-64.sh 
Index: scripts/native-scripts/native-autoconf.sh
===================================================================
--- scripts/native-scripts/native-autoconf.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-autoconf.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# cross-lfs native autoconf build
+# -------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=autoconf-native.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball autoconf-${AUTOCONF_VER} &&
+cd ${PKGDIR}
+
+max_log_init Autoconf ${AUTOCONF_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=/usr \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" || barf
+
+min_log_init ${BUILDLOGS} &&
+make LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >>  ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+      >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/native-scripts/native-automake.sh
===================================================================
--- scripts/native-scripts/native-automake.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-automake.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+# cross-lfs native automake build
+# -------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=automake-native.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball automake-${AUTOMAKE_VER} &&
+cd ${PKGDIR}
+
+max_log_init Automake ${AUTOMAKE_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=/usr \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+# Reported by Erik-Jan Post <ej.post@xs4all.nl> 20040924
+#
+# insthook test fails as insthook.test makefile uses a SCRIPTS variable
+# and make is called with "-e". 
+# Therefore our SCRIPTS env var we use for specifying the location of our
+# scripts clobbers the insthook.test's expected SCRIPTS
+#
+# Here we just unset it (only will affect this script)
+unset SCRIPTS
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >>  ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+# TODO: do we need to do the same for aclocal?
+rel=`echo ${AUTOMAKE_VER} | sed 's@\([0-9]\.[0-9]\).*@\1@g'`
+ln -sf automake-${rel} /usr/share/automake
+
Index: scripts/native-scripts/native-bash.sh
===================================================================
--- scripts/native-scripts/native-bash.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-bash.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,75 @@
+#!/bin/bash
+
+# cross-lfs native bash build
+# ---------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=bash-native.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball bash-${BASH_VER} &&
+cd ${PKGDIR}
+
+# If using gcc-3.4.x, patch some syntax gcc-3.4 doesn't like
+# TODO: Get gcc version from cross-gcc itself
+
+case ${BASH_VER} in
+   2.05b )
+      # Apply published official patches for bash-2.05b
+      apply_patch bash-2.05b-gnu_fixes-2
+      case ${GCC_VER} in
+         3.4* )
+            apply_patch bash-2.05b-gcc34-1
+         ;;
+      esac
+   ;;
+   3.0 )
+      # Reported on bug-bash by Tim Waugh <twaugh@redhat.com>
+      # http://lists.gnu.org/archive/html/bug-bash/2004-09/msg00081.html
+      apply_patch bash-3.0-fixes-1
+      apply_patch bash-3.0-avoid_WCONTINUED-1
+   ;;
+esac
+
+if [ "${USE_READLINE}" = "Y" ]; then
+   extra_conf="--with-installed-readline"
+else
+   # as was used with 2.05b w/o readline in the way old days
+   extra_conf="--with-curses"
+fi
+
+max_log_init Bash ${BASH_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+CXXFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=/usr --bindir=/bin \
+   --without-bash-malloc ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" || barf
+
+min_log_init ${BUILDLOGS} &&
+make LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+make tests \
+   >>  ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+# Added symlink for /bin/sh
+ln -sf bash /bin/sh
+
Index: scripts/native-scripts/native-binutils.sh
===================================================================
--- scripts/native-scripts/native-binutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-binutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,110 @@
+#!/bin/bash
+
+# cross-lfs native binutils build
+# -------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG="binutils-native.log"
+
+set_libdirname
+setup_multiarch
+
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball binutils-${BINUTILS_VER} &&
+
+# Determine whether this binutils requires
+# 'make configure-host' and whether
+# ld search path can be set with --with-lib-path.
+# Returned in ${BINUTILS_CONF_HOST} and
+# ${BINUTILS_WITH_LIB_PATH} respectively
+                                                                                
+# TODO: check for architecture specific patches in check_binutils
+#       ( alpha )
+check_binutils
+
+cd ${SRC}/${PKGDIR}
+
+case ${BINUTILS_VER} in
+   # 20031015 - fix static linking issues during testsuite
+   #            with current CVS glibc. kernel 2.5.68+
+   #            Will only patch HJL 2.14.90.0.[6-7]
+   2.14.90.0.[6-7] ) apply_patch binutils-2.14.90.0.7-fix-static-link ;;
+
+   # Issue with HJL binutils 2.15.94.0.1 stripping needed information
+   # one manifestation is with stripping TLS info from libc.a
+   2.15.94.0.1 ) apply_patch binutils-2.15.94.0.1-fix-strip-1 ;;
+esac
+
+# remove libpath from ldscript search paths so we can use
+# --libpath= to set library install location 
+# ( ie /usr/lib64 if building binutils bins and libs 64bit )
+# TODO: we dont need the whole genscripts-multilib patch, we only really
+#       need to remove libpath
+# TODO: also need to update patches for 2.14.x
+
+case ${BINUTILS_VER} in
+   2.14 )
+      apply_patch binutils-2.14-genscripts-multilib
+   ;;
+   2.14.90.0.8 )
+      apply_patch binutils-2.14.90.0.8-genscripts-multilib
+   ;;
+   2.15.9[0124].0.* | 2.15 )
+      apply_patch binutils-2.15.91.0.1-genscripts-multilib-2
+   ;;
+esac
+
+cd ${SRC}
+                                                                                
+# Remove pre-existing build directory and recreate
+test -d binutils-${BINUTILS_VER}-native-build &&
+   rm -rf binutils-${BINUTILS_VER}-native-build
+                                                                                
+mkdir binutils-${BINUTILS_VER}-native-build
+cd binutils-${BINUTILS_VER}-native-build
+
+# --host=${TARGET} here, or it will be set *-unknown-linux-gnu
+max_log_init Binutils ${BINUTILS_VER} native ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+../${PKGDIR}/configure \
+   --prefix=/usr \
+   --host=${TARGET} \
+   --disable-nls ${extra_conf} \
+   --enable-shared \
+   --enable-64-bit-bfd \
+   >> ${LOGFILE} 2>&1 &&
+{
+   # Run make configure-host if required
+   test Y != "${BINUTILS_CONF_HOST}" ||
+   {
+      echo -e "\nmake configure-host\n${BRKLN}" >> ${LOGFILE}
+      make configure-host >> ${LOGFILE} 2>&1
+   }
+} &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+make -k check \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o All OK" || barf
+
+# Copy over libiberty.h
+cp -p ${SRC}/${PKGDIR}/include/libiberty.h /usr/include/libiberty.h
Index: scripts/native-scripts/native-bison.sh
===================================================================
--- scripts/native-scripts/native-bison.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-bison.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+# cross-lfs native bison build
+# ----------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=bison-native.log
+
+set_libdirname
+setup_multiarch
+
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball bison-${BISON_VER} &&
+cd ${PKGDIR}
+
+max_log_init Bison ${BISON_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=/usr \
+   --host=${TARGET} ${extra_conf} \
+   --mandir=/usr/share/man --infodir=/usr/share/info \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" || barf
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Install OK" || barf
+
+test -f /usr/bin/yacc ||
+   cat > /usr/bin/yacc << "EOF"
+#!/bin/sh
+# Begin /usr/bin/yacc
+
+exec /usr/bin/bison -y "$@"
+
+# End /usr/bin/yacc
+EOF
+
+chmod 755 /usr/bin/yacc
Index: scripts/native-scripts/native-bzip2-32.sh
===================================================================
--- scripts/native-scripts/native-bzip2-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-bzip2-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-bzip2.sh
Index: scripts/native-scripts/native-bzip2-64.sh
===================================================================
--- scripts/native-scripts/native-bzip2-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-bzip2-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-bzip2.sh
Index: scripts/native-scripts/native-bzip2-n32.sh
===================================================================
--- scripts/native-scripts/native-bzip2-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-bzip2-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-bzip2.sh
Index: scripts/native-scripts/native-bzip2.sh
===================================================================
--- scripts/native-scripts/native-bzip2.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-bzip2.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,66 @@
+#!/bin/bash
+
+# cross-lfs native bzip2 build
+# ----------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG="bzip2-native.log"
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+
+unpack_tarball bzip2-${BZIP2_VER} &&
+cd ${PKGDIR}
+
+# Edit Makefiles
+for file in Makefile-libbz2_so Makefile ; do
+   test -f ${file}-ORIG ||
+      mv ${file} ${file}-ORIG
+
+   sed -e "s@/lib\(/\| \|$\)@/${libdirname}\1@g" \
+       ${file}-ORIG > ${file}
+done
+
+max_log_init Bzip2 ${BZIP2_VER} "target (shared)" ${BUILDLOGS} ${LOG}
+make \
+   CC="${CC-gcc} ${ARCH_CFLAGS}" \
+   CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+   LDFLAGS="-s" -f Makefile-libbz2_so \
+   >> ${LOGFILE} 2>&1 &&
+echo -e "\n${BRKLN}" >> ${LOGFILE} &&
+make ${PMFLAGS} \
+   CC="${CC-gcc} ${ARCH_CFLAGS}" \
+   CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+   LDFLAGS="-s" \
+   -f Makefile-libbz2_so \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+# Remove existing symlinks/files
+rm -f /usr/bin/bz* /bin/bz* &&
+
+min_log_init ${INSTLOGS} &&
+make \
+   CC="${CC-gcc} ${ARCH_CFLAGS}" \
+   CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+   PREFIX=/usr install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+cp -f bzip2-shared /bin/bzip2
+cp -af libbz2.so* /${libdirname} &&
+ln -sf ../../${libdirname}/libbz2.so.1.0 /usr/${libdirname}/libbz2.so &&
+rm -f /usr/bin/{bunzip2,bzcat,bzip2} &&
+mv -f /usr/bin/{bzip2recover,bzless,bzmore} /bin &&
+ln -sf bzip2 /bin/bunzip2 &&
+ln -sf bzip2 /bin/bzcat &&
+
+/sbin/ldconfig
+
Index: scripts/native-scripts/native-coreutils.sh
===================================================================
--- scripts/native-scripts/native-coreutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-coreutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,86 @@
+#!/bin/bash
+
+# cross-lfs native coreutils build
+# --------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+#export COREUTILS_VER=5.2.1
+
+cd ${SRC}
+LOG=coreutils-native.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball coreutils-${COREUTILS_VER}
+cd ${PKGDIR}
+
+# If we don't want to conform to POSIX 200212L, override
+# NOTE: This is coreutils 5.0 specific, later versions will have
+#       a configure/compile time option
+case ${COREUTILS_VER} in
+   5.1.7 | 5.[2-9]* ) ;;
+   * )   mv lib/posixver.c lib/posixver.c-ORIG
+         sed '/\/\* The POSIX version that utilities should conform to/i\
+#undef _POSIX2_VERSION\
+#define _POSIX2_VERSION 199209L\
+   ' lib/posixver.c-ORIG > lib/posixver.c
+   ;;
+esac
+
+max_log_init Coreutils ${COREUTILS_VER} "native (shared)" ${CONFLOGS} ${LOG}
+#env CFLAGS="-O2 -pipe ${TGT_CFLAGS}" ${extra_env} \
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" DEFAULT_POSIX2_VERSION=199209 \
+./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" || barf
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+echo -e "\n Root Tests \n------------" >> ${LOGFILE} &&
+make check-root \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Root tests OK" || errmsg
+
+echo "plfstest:x:1000:plfstest" >> /etc/group
+
+echo -e "\n User Tests \n------------" >> ${LOGFILE} &&
+su plfstest -c "env RUN_EXPENSIVE_TESTS=yes make check" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o User tests OK" || errmsg
+
+mv /etc/group /etc/Xgroup
+grep -v plfstest /etc/Xgroup > /etc/group
+rm -rf /etc/Xgroup
+chmod 644 /etc/group
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+# Fileutils binaries
+mv -f /usr/bin/{chgrp,chmod,chown,cp,dd,df,install} /bin
+mv -f /usr/bin/{ln,ls,mkdir,mknod,mv,rm,rmdir,sync} /bin
+# Create /usr/bin/install -> /bin/install symlink
+ln -sf ../../bin/install /usr/bin
+
+# Textutils binaries
+mv -f /usr/bin/{cat,head} /bin
+
+# Sh-utils binaries
+mv -f /usr/bin/{basename,date,echo,false,pwd} /bin
+mv -f /usr/bin/{sleep,stty,su,test,true,uname} /bin
+mv -f /usr/bin/chroot /usr/sbin
+
+# For FHS compliance
+ln -sf test "/bin/["
Index: scripts/native-scripts/native-dev.sh
===================================================================
--- scripts/native-scripts/native-dev.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-dev.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,105 @@
+#!/bin/bash
+
+# cross-lfs native /dev tree creation
+# -----------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+
+#set -x
+cd ${SRC}
+LOG=dev-native.log
+
+do_makedev() {
+   ### MAKEDEV ###
+   LOG="MAKEDEV.log"
+   max_log_init MAKEDEV ${MAKEDEV_VER} "" ${INSTLOGS} ${LOG}
+   bzcat < ${TARBALLS}/MAKEDEV-${MAKEDEV_VER}.bz2 > /dev/MAKEDEV &&
+   echo " o unpacked OK" &&
+   cd /dev &&
+   chmod 754 MAKEDEV &&
+   echo "Password: " &&
+   su -c "./MAKEDEV -v generic-nopty" > ${LOGFILE} 2>&1 &&
+   echo " o Devices created OK" || barf
+}
+
+do_udev() {
+   LOG=udev-native.log
+
+   set_libdirname
+   setup_multiarch
+
+   unpack_tarball udev-${UDEV_VER}
+   cd ${PKGDIR}
+
+   # apply a patch to fix permissions on /dev/null being reset root 600 by
+   # fcron. This behaviour appeared with udev-027
+   case ${UDEV_VER} in
+      027 )
+         apply_patch udev-027-permissions-1
+      ;;
+   esac
+
+   max_log_init udev ${UDEV_VER} "" ${BUILDLOGS} ${LOG}
+   CFLAGS="${TGT_CFLAGS}" \
+   make CC="${CC-gcc} ${ARCH_CFLAGS}" \
+        LD="${CC-gcc} ${ARCH_CFLAGS}" \
+        V="true" \
+        udevdir=/dev \
+      > ${LOGFILE} 2>&1 &&
+   echo " o Build OK" || barf
+
+   min_log_init ${INSTLOGS} &&
+   CFLAGS="${TGT_CFLAGS}" \
+   make CC="${CC-gcc} ${ARCH_CFLAGS}" \
+        LD="${CC-gcc} ${ARCH_CFLAGS}" \
+        V="true" \
+        udevdir=/dev install \
+      > ${LOGFILE} 2>&1 &&
+   echo " o Install OK" || barf
+
+   # Create bare minimum devices required
+   mknod -m 600 /dev/console c 5 1
+   mknod -m 666 /dev/null c 1 3
+
+   # create rules and permissions files
+   echo " - Adding rules/permissions files"
+   case ${UDEV_VER} in
+      02[7-9] | 0[3-4]* | 050 )
+         cp ${CONFIGS}/udev/udev-config-2.permissions \
+            /etc/udev/permissions.d/25-lfs.permissions
+         cp ${CONFIGS}/udev/udev-config-1.rules \
+            /etc/udev/rules.d/25-lfs.rules
+      ;;
+      # This was last updated for 056, this will need to be tracked...
+      05[1-9] | 0[6-9]* )
+         cp ${CONFIGS}/udev/udev-config-3.rules \
+            /etc/udev/rules.d/25-lfs.rules
+      ;;
+   esac
+}
+
+case "${KERNEL_VER}" in
+   2.5* | 2.6* )
+      if [ "Y" = "${UDEV}" ]; then
+         do_udev
+      elif [ "Y" = "${DEVFS}" ]; then
+         do_devfsd
+      else
+         do_makedev
+      fi
+   ;;
+   2.4* )
+      if [ "Y" = "${DEVFS}" ]; then
+         do_devfs
+      else
+         do_makedev
+      fi
+   ;;
+   2.2* )
+      do_makedev
+   ;;
+esac
Index: scripts/native-scripts/native-diffutils.sh
===================================================================
--- scripts/native-scripts/native-diffutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-diffutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# cross-lfs native diffutils build
+# --------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=diffutils-native.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball diffutils-${DIFFUTILS_VER} &&
+cd ${PKGDIR}
+
+max_log_init Diffutils ${DIFFUTILS_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=/usr \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >>  ${LOGFILE} 2>&1 &&
+echo " o Test OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/native-scripts/native-e2fsprogs.sh
===================================================================
--- scripts/native-scripts/native-e2fsprogs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-e2fsprogs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,105 @@
+#!/bin/bash
+
+# cross-lfs native e2fsprogs build
+# --------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=e2fsprogs-native.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball e2fsprogs-${E2FSPROGS_VER}
+
+# Apply patch for HTREE problem posted by GS 3/19/2003
+cd ${PKGDIR}
+#apply_patch e2fsprogs-${E2FSPROGS_VER}
+
+case ${KERNEL_VER} in
+   2.6* )
+   # patch util.c to remove SCSI_BLOCK_MAJOR references
+   # SCSI_DISK_MAJOR is no longer defined in linux/major.h for 2.6 kernel 
+   # TODO: check future e2fsprogs versions to see if this is fixed
+   case ${E2FSPROGS_VER} in
+      1.34* )
+         # check if SCSI_DISK_MAJOR defined in linux/major.h
+         grep SCSI_DISK_MAJOR /usr/include/linux/major.h > /dev/null 2>&1 ||
+            apply_patch e2fsprogs-${E2FSPROGS_VER}-2.6.0hdr-fix
+      ;;
+   esac
+   ;;
+esac
+
+# Fix some permissions issues when building the e2fsprogs 1.35 tarball
+# as a normal user. Need to check if previous versions are affected
+case ${E2FSPROGS_VER} in
+   1.35 )
+      chmod 755 configure
+      chmod 644 po/*
+   ;;
+   1.37 )
+      # Fix braindead error in e2p tests where include paths aren't
+      # being passed 
+      if [ ! -f lib/e2p/Makefile.in-ORIG ]; then
+         mv lib/e2p/Makefile.in lib/e2p/Makefile.in-ORIG
+      fi
+
+      sed 's@-DTEST_PROGRAM@$(ALL_CFLAGS) &@g' \
+         lib/e2p/Makefile.in-ORIG > lib/e2p/Makefile.in         
+   ;;
+esac
+
+# Edit configure so libdir and root_libdir point at */lib64 .
+# Also handles additional_libdir (used if --with-libiconv-prefix is set,
+# if we did set it (which we dont) we'd want the 64bit one anyway) ...
+test -f configure-ORIG ||
+   cp -p configure configure-ORIG
+
+sed "/libdir=.*\/lib/s@/lib@/${libdirname}@g" \
+   configure-ORIG > configure
+
+cd ${SRC}
+
+test -d ${SRC}/e2fsprogs-${E2FSPROGS_VER}-build &&
+    rm -rf ${SRC}/e2fsprogs-${E2FSPROGS_VER}-build
+
+mkdir ${SRC}/e2fsprogs-${E2FSPROGS_VER}-build &&
+cd ${SRC}/e2fsprogs-${E2FSPROGS_VER}-build
+
+max_log_init E2fsprogs ${E2FSPROGS_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe" \
+../${PKGDIR}/configure \
+   --prefix=/usr \
+   --with-root-prefix="" \
+   --enable-elf-shlibs \
+   --mandir=/usr/share/man \
+   --infodir=/usr/share/info \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >>  ${LOGFILE} 2>&1 &&
+echo " o Test OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+make install-libs \
+   >> ${LOGFILE} 2>&1 &&
+install-info /usr/share/info/libext2fs.info /usr/share/info/dir &&
+echo " o ALL OK" || barf
+
+/sbin/ldconfig
+
Index: scripts/native-scripts/native-ed.sh
===================================================================
--- scripts/native-scripts/native-ed.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-ed.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+# cross-lfs native ed build
+# -------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=ed-native.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball ed-${ED_VER}
+cd ${PKGDIR}
+
+# TODO: patch is for ed 0.2, if this barfs check if patch needed
+#       for this version of ed 
+apply_patch ed-0.2-mkstemp-1
+
+max_log_init Ed ${ED_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=/usr \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >>  ${LOGFILE} 2>&1 &&
+echo " o Test OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+mv -f /usr/bin/{ed,red} /bin
+
Index: scripts/native-scripts/native-file-32.sh
===================================================================
--- scripts/native-scripts/native-file-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-file-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-file.sh
Index: scripts/native-scripts/native-file-64.sh
===================================================================
--- scripts/native-scripts/native-file-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-file-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-file.sh
Index: scripts/native-scripts/native-file-n32.sh
===================================================================
--- scripts/native-scripts/native-file-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-file-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-file.sh
Index: scripts/native-scripts/native-file.sh
===================================================================
--- scripts/native-scripts/native-file.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-file.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+# cross-lfs native file build
+# ---------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=file-native.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball file-${FILE_VER} &&
+cd ${PKGDIR}
+
+# Kelledins patch: Using 4.02 file package, this not needed
+case ${FILE_VER} in
+   4.01 ) apply_patch file-${FILE_VER}-lstat ;;
+esac
+
+max_log_init File ${FILE_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=/usr \
+   --datadir=/usr/share/misc ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" || barf
+
+min_log_init ${BUILDLOGS} &&
+make LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf 
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >>  ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+      >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/native-scripts/native-findutils.sh
===================================================================
--- scripts/native-scripts/native-findutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-findutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# cross-lfs native findutils build
+# --------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=findutils-native.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball findutils-${FINDUTILS_VER} &&
+cd ${PKGDIR}
+test 4.1 = "${FINDUTILS_VER}" &&
+   apply_patch findutils-${FINDUTILS_VER}
+
+# TODO: had to hack config.sub so it accepted powerpc64...
+#       come up with a check and a hack here...
+
+max_log_init Findutils ${FINDUTILS_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=/usr \
+   --localstatedir=/var/lib/misc \
+   --libexecdir=/usr/${libdirname}/locate \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o install OK" || barf
+
Index: scripts/native-scripts/native-flex-32.sh
===================================================================
--- scripts/native-scripts/native-flex-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-flex-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-flex.sh
Index: scripts/native-scripts/native-flex-64.sh
===================================================================
--- scripts/native-scripts/native-flex-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-flex-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-flex.sh
Index: scripts/native-scripts/native-flex-n32.sh
===================================================================
--- scripts/native-scripts/native-flex-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-flex-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-flex.sh
Index: scripts/native-scripts/native-flex.sh
===================================================================
--- scripts/native-scripts/native-flex.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-flex.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+# cross-lfs native flex build
+# ----------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=flex-native.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball flex-${FLEX_VER} &&
+cd ${PKGDIR}
+
+case ${FLEX_VER} in
+   2.5.31 )
+      # Fix brokenness in flex-2.5.31
+      apply_patch flex-2.5.31-debian_fixes-2
+      # do not regen doc (triggered by above patch)
+      touch ./doc/flex.1
+   ;;
+esac
+
+max_log_init Flex ${FLEX_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=/usr \
+   --mandir=/usr/share/man --infodir=/usr/share/info ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" || barf
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || barf
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+# Create lex wrapper
+cat > /usr/bin/lex << "EOF"
+#!/bin/sh
+# Begin /usr/bin/lex
+
+exec /usr/bin/flex -l "$@"
+
+# End /usr/bin/lex
+EOF
+
+chmod 755 /usr/bin/lex
+
Index: scripts/native-scripts/native-gawk.sh
===================================================================
--- scripts/native-scripts/native-gawk.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-gawk.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+# cross-lfs native gawk build
+# ---------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=gawk-native.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball gawk-${GAWK_VER} &&
+cd ${PKGDIR}
+
+# Following mimics gawk patch
+files="Makefile.in awklib/Makefile.in"
+for file in ${files}; do
+
+   test -f ${file}-ORIG ||
+      cp ${file} ${file}-ORIG
+
+   sed -e 's:libexecdir = @libexecdir@/awk:libexecdir = @libexecdir@:g' \
+       -e 's:datadir = @datadir@/awk:datadir = @datadir@/gawk:g' \
+       ${file}-ORIG > ${file}
+done
+
+max_log_init Gawk ${GAWK_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=/usr \
+   --libexecdir=/usr/${libdirname}/gawk \
+   --bindir=/bin \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+# When specifying --bindir the symlink doesn't get created (???)
+ln -sf gawk /bin/awk
+
Index: scripts/native-scripts/native-gcc.sh
===================================================================
--- scripts/native-scripts/native-gcc.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-gcc.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,279 @@
+#!/bin/bash
+
+# cross-lfs native gcc build
+# --------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+
+LOG="gcc-native.log"
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball gcc-${GCC_VER}
+
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+#3.0 20030427
+# Cannot trust ${GCC_VER} to supply us with the correct
+# gcc version (especially if cvs).
+# Grab it straight from version.c
+cd ${SRC}/${PKGDIR}
+target_gcc_ver=`grep version_string gcc/version.c | \
+                sed 's@.* = \(\|"\)\([0-9.]*\).*@\2@g'`
+# As of gcc4, the above doesn't cut it... check gcc/BASE-VER
+if [ -z "${target_gcc_ver}" -a -f gcc/BASE-VER ]; then
+   target_gcc_ver=`cat gcc/BASE-VER`
+fi
+
+# if target has no floating point unit, use soft float
+if [ "${WITHOUT_FPU}" = "Y" ]; then
+   extra_conf="${extra_conf} --with-float=soft"
+fi
+
+if [ ! "Y" = "${MULTIARCH}" ]; then
+   # If we are not multi-arch, disable multilib
+   extra_conf="${extra_conf} --enable-multilib=no"
+
+   # HACK: this sets abi to n32 with mips... this should be handled
+   # by the multiarch funcs somehow... and set according to DEFAULTENV
+   case ${TGT_ARCH} in
+      mips* )
+         extra_conf="${extra_conf} --with-abi=${DEFAULTENV}"
+      ;;
+   esac
+fi
+
+# if we are using gcc-3.4x, set libexecdir to /usr/${libdirname}
+case ${target_gcc_ver} in
+   3.4* | 4.* )
+      extra_conf="${extra_conf} --libexecdir=/usr/${libdirname}"
+   ;;
+esac
+
+# Set in build-init to enable version specific runtime libs, and whether
+# to use a program suffix
+if [ "Y" = "${USE_VER_SPEC_RT_LIBS}" ]; then
+   extra_conf="${extra_conf} --enable-version-specific-runtime-libs" ; fi
+if [ "Y" = "${USE_PROGRAM_SUFFIX}" ]; then
+   extra_conf="${extra_conf} --program-suffix=-${target_gcc_ver}" ; fi
+
+cd ${SRC}/${PKGDIR}
+case ${target_gcc_ver} in
+   3.4.3 )
+      # Apply linkonce patch for gcc (should be fixed come gcc 3.4.4)
+      apply_patch gcc-3.4.3-linkonce-1 
+      # Remove library search paths that cause issues with libtool on 
+      # multi-arch systems
+      # TODO: check to see if this applies to ealier gcc versions, and
+      #       decide if this should only be applied if doing a multi-archi
+      #       build
+      apply_patch gcc-3.4.3-remove_standard_startfile_prefix_from_startfile_prefixes-1
+
+      # Arm fixes
+      apply_patch gcc-3.4.0-arm-bigendian
+      apply_patch gcc-3.4.0-arm-nolibfloat
+      apply_patch gcc-3.4.0-arm-lib1asm
+   ;;
+   4.0.1 | 4.1.* )
+      apply_patch gcc-4.0.0-remove_standard_startfile_prefix_from_startfile_prefixes-1
+   ;;
+   4.0.0 )
+      apply_patch gcc-4.0.0-fix_tree_optimisation_PR21173
+      apply_patch gcc-4.0.0-reload_check_uninitialized_pseudos_PR20973
+      apply_patch gcc-4.0.0-remove_standard_startfile_prefix_from_startfile_prefixes-1
+   ;;
+esac
+
+
+# Dont run fixincludes
+# ( Following mimics the nofixincludes patch )
+# NOTE: This needs to be fixed for gcc4
+# Also avoid debug symbols in libgcc2
+cd ${SRC}/${PKGDIR}/gcc
+
+test -f Makefile.in-ORIG ||
+   cp Makefile.in Makefile.in-ORIG
+                                                                                
+#grep -Ev '(README| ./fixinc.sh )' Makefile.in-ORIG | \
+sed 's@LIBGCC2_DEBUG_CFLAGS = -g@LIBGCC2_DEBUG_CFLAGS =@g' Makefile.in-ORIG \
+   > Makefile.in
+
+# Problems arise when building 64bit libgcc_s during a multilib
+# build if the 64bit crt objects reside under */lib64 as
+# -B${HST_TOOLS}/${TARGET}/lib is passed during the build causing
+# us to link in the 32bit crt objects.,
+# This is because -B*/lib overrides the specs file so the  multilib
+# spec isnt used to determine lib dir.
+# Here we just remove -B*/lib from FLAGS_FOR_TARGET.
+#
+# NOTE: for gcc-3.3.3 all we had do edit was configure.in,
+#       FLAGS_FOR_TARGET was only specified here.
+#       As of gcc-3.4.0 we need to edit configure itself.
+#       So, we'll just attempt to edit both
+
+cd ${SRC}/${PKGDIR}
+for file in configure configure.in; do
+   grep FLAGS_FOR_TARGET ${file} > /dev/null 2>&1 &&
+   {
+      # copy instead of move, we will want to retain perms
+      test -f ${file}-ORIG ||
+         cp -p ${file} ${file}-ORIG
+
+      sed '/FLAGS_FOR_TARGET.*\/lib\//s@-B[^ ]*/lib/@@g' \
+         ${file}-ORIG > ${file}
+   }
+done
+
+test -d ${SRC}/gcc-${GCC_VER}-native &&
+   rm -rf ${SRC}/gcc-${GCC_VER}-native
+
+mkdir -p ${SRC}/gcc-${GCC_VER}-native &&
+cd ${SRC}/gcc-${GCC_VER}-native &&
+
+max_log_init Gcc ${GCC_VER} native ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+CXXFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+../${PKGDIR}/configure --prefix=/usr \
+   --host=${TARGET} \
+   --enable-languages=c,c++ --enable-__cxa_atexit \
+   --enable-c99 --enable-long-long --enable-threads=posix \
+   --enable-shared ${extra_conf} \
+   --mandir=/usr/share/man \
+   --infodir=/usr/share/info \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" || barf
+#   --enable-languages=c,c++,f77,objc,ada,java,pascal,treelang --enable-__cxa_atexit \
+
+min_log_init ${BUILDLOGS} &&
+if [ "Y" = "${NOBOOTSTRAP}" ]; then
+   make ${PMFLAGS} LDFLAGS="-s" \
+      >> ${LOGFILE} 2>&1
+else 
+   make ${PMFLAGS} BOOT_LDFLAGS="-s" BOOT_CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+      STAGE1_CFLAGS="-O2 -pipe ${TGT_CFLAGS}" bootstrap \
+      >> ${LOGFILE} 2>&1
+fi && 
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+make -k check \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Install OK" || barf
+
+#3.0 20030503
+# Create symlinks if we chose to add a version suffix
+if [ "Y" = "${USE_PROGRAM_SUFFIX}" ]; then
+   for prog in c++ c++filt cpp g++ gcc gccbug gcov ; do
+      if [ -f /usr/bin/${prog}-${target_gcc_ver} ]; then
+         echo " o Creating ${prog} -> ${prog}-${target_gcc_ver} symlink..."
+         ln -sf ${prog}-${target_gcc_ver} /usr/bin/${prog}
+      fi
+   done
+   for prog in gcc g++ c++ ; do
+      if [ -f /usr/bin/${TARGET}-${prog}-${target_gcc_ver} ]; then
+         echo " o Creating ${TARGET}-${prog} -> ${TARGET}-${prog}-${target_gcc_ver} symlink ..."
+         ln -sf ${TARGET}-${prog}-${target_gcc_ver} \
+            /usr/bin/${TARGET}-${prog}
+      fi
+   done
+fi # USE_PROGRAM_SUFFIX
+
+ln -s ../usr/bin/cpp /lib &&
+ln -sf gcc /usr/bin/cc
+rm /usr/${libdirname}/libiberty.a
+
+# Following req'd when using --enable-version-specific-runtime-libs
+if [ Y = "${USE_VER_SPEC_RT_LIBS}" ]; then
+   # TODO: BIG TODO HERE 
+   #       MAKE THIS HANDLE "libdirname"
+   #       -----------------------------
+   #       look into gcc_libdir/../lib/libdirname symlinks for multiarch
+   #       This is appropriate for x86_64, bit others need to be checked...
+   #       We will also in the future want to modify these default gcc .so
+   #       install directories
+   #
+
+   gcc_libdir=`/usr/bin/gcc --print-file-name include | \
+            sed 's@include@@g'`
+
+   # Better make a symlink for the c++ includes
+   mkdir /usr/include/c++
+   ln -s ${gcc_libdir}/include/c++ /usr/include/c++/${target_gcc_ver}
+                                                                                
+   # Add the path to our new c++ libs in /etc/ld.so.conf
+   echo "${gcc_libdir}" >> /etc/ld.so.conf
+   if [ Y = "${MULTIARCH}" ]; then 
+      echo "${gcc_libdir}/32" >> /etc/ld.so.conf
+   fi
+
+   # TODO: choose whether to just delete existing libgcc_s.so links pointing to
+   # ${TOOLS} or just create the following over the top
+                                                                                
+   # Create hardlink and symlinks for libgcc_s in /usr/lib
+   case ${target_gcc_ver} in
+      3.4* | 4.* )
+         if [ Y = "${MULTIARCH}" ]; then
+            # 32bit libs
+            ln -f ${gcc_libdir}/../lib/libgcc_s.so.1 \
+               /usr/lib/libgcc_s-${target_gcc_ver}.so.1
+            ln -sf libgcc_s-${target_gcc_ver}.so.1 \
+               /usr/lib/libgcc_s.so.1
+            ln -sf libgcc_s.so.1 /usr/lib/libgcc_s_32.so
+            ln -sf libgcc_s.so.1 /usr/lib/libgcc_s.so
+            # 64bit libs
+            ln -f ${gcc_libdir}/../lib64/libgcc_s.so.1 \
+               /usr/lib64/libgcc_s-${target_gcc_ver}.so.1
+            ln -sf libgcc_s-${target_gcc_ver}.so.1 \
+               /usr/lib64/libgcc_s.so.1
+            ln -sf libgcc_s.so.1 /usr/lib64/libgcc_s.so
+         else
+            ln -f ${gcc_libdir}/../lib/libgcc_s.so.1 \
+               /usr/lib/libgcc_s-${target_gcc_ver}.so.1
+            ln -sf libgcc_s-${target_gcc_ver}.so.1 /usr/lib/libgcc_s.so.1
+            ln -sf libgcc_s.so.1 /usr/lib/libgcc_s.so
+         fi
+      ;;
+      * )
+         # TODO: Have to check this for gcc < 3.4   
+         ln -f ${gcc_libdir}/libgcc_s.so.1 \
+            /usr/${libdirname}/libgcc_s-${target_gcc_ver}.so.1
+         if [ Y = "${MULTIARCH}" ]; then
+            # 32bit libs
+            ln -f ${gcc_libdir}/32/libgcc_s.so.1 \
+               /usr/lib/libgcc_s-${target_gcc_ver}.so.1
+            ln -sf libgcc_s-${target_gcc_ver}.so.1 \
+               /usr/lib/libgcc_s.so.1
+            ln -sf libgcc_s.so.1 /usr/lib/libgcc_s_32.so
+            ln -sf libgcc_s.so.1 /usr/lib/libgcc_s.so
+            # 64bit libs
+            ln -f ${gcc_libdir}/libgcc_s.so.1 \
+               /usr/lib64/libgcc_s-${target_gcc_ver}.so.1
+            ln -sf libgcc_s-${target_gcc_ver}.so.1 \
+               /usr/lib64/libgcc_s.so.1
+            ln -sf libgcc_s.so.1 /usr/lib64/libgcc_s.so
+         else
+            ln -f ${gcc_libdir}/libgcc_s.so.1 \
+               /usr/lib/libgcc_s-${target_gcc_ver}.so.1
+            ln -sf libgcc_s-${target_gcc_ver}.so.1 \
+               /usr/lib/libgcc_s.so.1
+            ln -sf libgcc_s.so.1 /usr/lib/libgcc_s.so
+         fi
+      ;;
+   esac
+
+fi
Index: scripts/native-scripts/native-gettext-32.sh
===================================================================
--- scripts/native-scripts/native-gettext-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-gettext-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-gettext.sh
Index: scripts/native-scripts/native-gettext-64.sh
===================================================================
--- scripts/native-scripts/native-gettext-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-gettext-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-gettext.sh
Index: scripts/native-scripts/native-gettext-n32.sh
===================================================================
--- scripts/native-scripts/native-gettext-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-gettext-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-gettext.sh
Index: scripts/native-scripts/native-gettext.sh
===================================================================
--- scripts/native-scripts/native-gettext.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-gettext.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+# cross-lfs native gettext build
+# ------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=gettext-native.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball gettext-${GETTEXT_VER} &&
+cd ${PKGDIR}
+
+max_log_init Gettext ${GETTEXT_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CFLAGS="-O2 -pipe ${ARCH_CFLAGS} ${TGT_CFLAGS}" \
+CXXFLAGS="-O2 -pipe ${ARCH_CFLAGS} ${TGT_CFLAGS}" \
+   ./configure --prefix=/usr \
+   --mandir=/usr/share/man --infodir=/usr/share/info ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+# libtool is a pain.
+# with libasprintf it tries to link in the startfiles even though
+# g++ will look after this itself. This is a hack, should really edit
+# ltmain.sh...
+test -f gettext-runtime/libasprintf/libtool-ORIG ||
+   mv gettext-runtime/libasprintf/libtool gettext-runtime/libasprintf/libtool-ORIG
+sed 's@^\(archive_cmds.*-shared \)\(.*predep_objects.*\)@\1 -nostartfiles -nostdlib \2@g' \
+gettext-runtime/libasprintf/libtool-ORIG > gettext-runtime/libasprintf/libtool
+
+min_log_init ${BUILDLOGS} &&
+#make ${PMFLAGS} LDFLAGS="-s" \
+make LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/native-scripts/native-glibc-32.sh
===================================================================
--- scripts/native-scripts/native-glibc-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-glibc-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-glibc.sh
Index: scripts/native-scripts/native-glibc-64.sh
===================================================================
--- scripts/native-scripts/native-glibc-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-glibc-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-glibc.sh
Index: scripts/native-scripts/native-glibc-n32.sh
===================================================================
--- scripts/native-scripts/native-glibc-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-glibc-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-glibc.sh
Index: scripts/native-scripts/native-glibc.sh
===================================================================
--- scripts/native-scripts/native-glibc.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-glibc.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,195 @@
+#!/bin/bash
+
+# cross-lfs native glibc build
+# ----------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG="glibc-native.log"
+
+# Test if the 64 script has been called.
+# This should only really get called during bi-arch builds
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+
+# Only add --build=foo ( and probably should set --host=foo )
+# if we are doing a multi-arch build.
+# By rights --host should be inferred from --build, and CC will
+# be set for the correct emulation ( via -m32/-m64 etc ) anyway
+if [ "Y" = "${MULTIARCH}" ]; then
+   if [ -z "${ALT_TGT}" ]; then ALT_TGT="${TARGET}" ; fi
+   extra_conf="--build=${ALT_TGT}"
+fi
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   KERN_HDR_PREFIX=/usr
+else
+   KERN_HDR_PREFIX="${TGT_TOOLS}"
+fi
+
+# point at the correct kernel headers
+#------------------------------------
+if [ "Y" = "${USE_SANITISED_HEADERS}" ]; then
+   KERN_HDR_DIR="${KERN_HDR_PREFIX}/kernel-hdrs"
+else
+   KERN_HDR_DIR="${KERN_HDR_PREFIX}/include"
+fi
+
+unpack_tarball glibc-${GLIBC_VER} &&
+cd ${PKGDIR}
+
+# Gather package version information
+#-----------------------------------
+target_glibc_ver=`grep VERSION version.h | \
+   sed 's@.*\"\([0-9.]*\)\"@\1@'`
+export target_glibc_ver
+
+# Retrieve target_gcc_ver from gcc -v output
+target_gcc_ver=`${CC-gcc} -v 2>&1 | grep " version " | \
+   sed 's@.*version \([0-9.]*\).*@\1@g'`
+
+# get kernel version from kernel headers
+kernver=`grep UTS_RELEASE ${KERN_HDR_DIR}/linux/version.h | \
+         sed 's@.*\"\([0-9.]*\).*\"@\1@g' `
+
+# if we don't have linuxthreads dirs (ie: a glibc release), then
+# unpack the linuxthreads tarball
+if [ ! -d linuxthreads -o ! -d linuxthreads_db ]; then
+   OLDPKGDIR=${PKGDIR} ; unpack_tarball glibc-linuxthreads-${GLIBC_VER}
+   PKGDIR=${OLDPKGDIR}
+fi
+
+# unpack libidn add-on if required (should be supplied with cvs versions)
+case ${target_glibc_ver} in
+   2.3.[4-9]* | 2.4* )
+      cd ${SRC}/${PKGDIR}
+      if [ ! -d libidn ]; then
+         OLDPKGDIR=${PKGDIR} ; unpack_tarball glibc-libidn-${GLIBC_VER}
+         PKGDIR=${OLDPKGDIR}
+      fi
+   ;;
+esac
+
+# apply glibc patches as required depending on the above gcc/kernel versions
+# see funcs/glibc_funcs.sh
+apply_glibc_patches
+
+# configuration for pthread type
+#-------------------------------
+# HACK: nptl for sparc64 wont build
+case ${TGT_ARCH} in
+   sparc64 )
+      USE_NPTL=N
+   ;;
+esac
+
+if [ "Y" = "${USE_NPTL}" ]; then
+   # remove linuxthreads dirs if they exist
+   # (CVS source contains linuxthreads)
+   test -d linuxthreads && 
+      rm -rf linuxthreads*
+
+   # As of ~2003-10-06 nptl is included in glibc cvs
+   #test -d ./nptl &&
+   #test -d ./nptl_db ||
+   #unpack_tarball nptl-${NPTL_VER}
+
+   # fix tst-cancelx7 test (if needed)
+   fname="${SRC}/${PKGDIR}/nptl/Makefile"
+   grep tst-cancelx7-ARGS ${fname} > /dev/null 2>&1 || {
+      echo " - patching ${fname}"
+      mv ${fname} ${fname}-ORIG
+      sed -e '/tst-cancel7-ARGS = --command "$(built-program-cmd)"/a\
+tst-cancelx7-ARGS = --command "$(built-program-cmd)"' \
+         ${fname}-ORIG > ${fname}
+   }
+
+   extra_conf="${extra_conf} --with-tls --with-__thread"
+else
+   if [ -d ./nptl ]; then rm -rf nptl* ; fi
+fi
+
+# set without-fp if target has no floating point unit
+if [ "${WITHOUT_FPU}" = "Y" ]; then
+   extra_conf="${extra_conf} --without-fp"
+fi
+
+# set --enable-kernel to match the kernel version 
+# of the kernel headers glibc is to be built against
+#-------------------------------------------------
+# HACK: hack around 2.6.8.1 release
+case ${kernver} in 2.6.8.* ) kernver=2.6.8 ;; esac
+extra_conf="${extra_conf} --enable-kernel=${kernver}"
+
+# End prep
+#--------------------------------
+touch /etc/ld.so.conf
+
+test -d ${SRC}/glibc-${GLIBC_VER}-native${suffix} &&
+   rm -rf ${SRC}/glibc-${GLIBC_VER}-native${suffix}
+
+mkdir ${SRC}/glibc-${GLIBC_VER}-native${suffix}
+cd ${SRC}/glibc-${GLIBC_VER}-native${suffix}
+
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="${extra_conf} --libdir=/usr/${libdirname}"
+   # Also create a configparms file setting slibdir to */libdirname
+   echo "slibdir=/${libdirname}" >> configparms
+fi
+
+max_log_init Glibc ${GLIBC_VER} native ${CONFLOGS} ${LOG}
+CFLAGS="-O2 -pipe" PARALLELMFLAGS="${PMFLAGS}" \
+CC="${CC-gcc} ${ARCH_CFLAGS} ${TGT_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS} ${TGT_CFLAGS}" \
+../${PKGDIR}/configure --prefix=/usr \
+   --without-cvs --disable-profile --enable-add-ons \
+   --with-headers=${KERN_HDR_DIR} ${extra_conf} \
+   --mandir=/usr/share/man --infodir=/usr/share/info \
+   --libexecdir=/usr/${libdirname}/glibc \
+      >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make PARALLELMFLAGS="${PMFLAGS}" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+# Tests moved after install, during glibc tests
+# at times librt will be rebuilt... incorrectly.
+# Better to install first and not have to worry
+# about anything built correctly being replaced
+# by something broken...
+
+echo "-Installing Glibc" &&
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o install OK" || barf
+
+make localedata/install-locales \
+   >>  ${LOGFILE} 2>&1 &&
+echo " o install-locales OK" || barf
+ln -sf ../usr/share/zoneinfo/${TZ} /etc/localtime &&
+
+# Use make -k check... will have to revisit this
+min_log_init ${TESTLOGS} &&
+make -k check \
+   >>  ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+# install sample nscd.conf
+if [ ! -f /etc/nscd.conf ]; then
+   echo -n " o Creating /etc/nscd.conf - "
+   cp ${SRC}/${PKGDIR}/nscd/nscd.conf /etc/nscd.conf &&
+   echo "OK" || echo "FAIL"
+fi
+
+if [ ! -d /var/run/nscd ]; then
+   mkdir -p /var/run/nscd
+fi
Index: scripts/native-scripts/native-grep.sh
===================================================================
--- scripts/native-scripts/native-grep.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-grep.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+# cross-lfs native grep build
+# ---------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=grep-native.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball grep-${GREP_VER} &&
+cd ${PKGDIR}
+
+max_log_init Grep ${GREP_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=/usr --bindir=/bin \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+# Make Grep tests executable
+chmod 750 ./tests/* &&
+
+#min_log_init ${TESTLOGS} &&
+#make check \
+#   >>  ${LOGFILE} 2>&1 &&
+#echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/native-scripts/native-groff.sh
===================================================================
--- scripts/native-scripts/native-groff.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-groff.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+# cross-lfs native groff build
+# ----------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=groff-native.log
+
+set_libdirname
+setup_multiarch
+
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball groff-${GROFF_VER}
+cd ${PKGDIR}
+
+max_log_init Groff ${GROFF_VER} "native (shared)" ${CONFLOGS} ${LOG}
+
+# Assuming page size will be set correctly according to locale
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+CXXFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure \
+   --prefix=/usr ${extra_conf} \
+   --mandir=/usr/share/man \
+   --infodir=/usr/share/info \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+ln -sf soelim /usr/bin/zsoelim
+ln -sf eqn /usr/bin/geqn
+ln -sf tbl /usr/bin/gtbl
+
Index: scripts/native-scripts/native-gzip.sh
===================================================================
--- scripts/native-scripts/native-gzip.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-gzip.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+# cross-lfs native gzip build
+# ---------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=gzip-native.log 
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball gzip-${GZIP_VER} &&
+cd ${PKGDIR}
+
+max_log_init Gzip ${GZIP_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=/usr \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" || barf
+
+# Change the default install directory
+test -f "gzexe.in-ORIG" ||
+   mv gzexe.in gzexe.in-ORIG
+
+sed 's@"BINDIR"@/bin@' gzexe.in-ORIG > gzexe.in &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+rm -f /usr/bin/{gunzip,zcat}
+ln -sf gzip /usr/bin/gunzip
+ln -sf gzip /usr/bin/zcat
+ln -sf gunzip /usr/bin/uncompress
+
Index: scripts/native-scripts/native-inetutils.sh
===================================================================
--- scripts/native-scripts/native-inetutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-inetutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# cross-lfs native inetutils build
+# --------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=inetutils-native.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball inetutils-${INETUTILS_VER}
+cd ${PKGDIR}
+
+# Retrieve target_gcc_ver from gcc -v output
+target_gcc_ver=`${TARGET}-gcc -v 2>&1 | grep " version " | \
+   sed 's@.*version \([0-9.]*\).*@\1@g'`
+
+case ${target_gcc_ver} in
+   4.* )
+      apply_patch inetutils-1.4.2-gcc4_fixes-1
+   ;;
+esac
+
+max_log_init inetutils ${INETUTILS_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=/usr \
+   --libexecdir=/usr/${libdirname}/inetutils \
+   --sysconfdir=/etc --localstatedir=/var \
+   --mandir=/usr/share/man --infodir=/usr/share/info \
+   --disable-whois --disable-syslogd --disable-logger --disable-servers \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+mv /usr/bin/ping /bin/
+
Index: scripts/native-scripts/native-iproute2.sh
===================================================================
--- scripts/native-scripts/native-iproute2.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-iproute2.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# cross-lfs native iproute2 build
+# -------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+# TODO: look into whether this needs to install libs... if
+#       so, use libdirname...
+cd ${SRC}
+LOG=iproute2-native.log
+set_libdirname
+setup_multiarch
+
+unpack_tarball iproute2-${IPROUTE2_VER}
+cd ${PKGDIR}
+
+test -f misc/Makefile-ORIG || cp -p misc/Makefile misc/Makefile-ORIG
+chmod 666 misc/Makefile
+sed -e '/^TARGETS/s@arpd@@g' \
+    misc/Makefile-ORIG > misc/Makefile
+
+max_log_init iproute2 ${IPROUTE2_VER} "native (shared)" ${CONFLOGS} ${LOG}
+./configure \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make CC="${CC-gcc} ${ARCH_CFLAGS} ${TGT_CFLAGS}" SBINDIR="/sbin" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make SBINDIR=/sbin install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/native-scripts/native-kbd.sh
===================================================================
--- scripts/native-scripts/native-kbd.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-kbd.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+# cross-lfs native kbd build
+# --------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=kbd-native.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball kbd-${KBD_VER}
+cd ${PKGDIR}
+
+# TODO: Turn this into a sed/awk of Makefile.in for building reqd misc packages
+case ${KBD_VER} in
+   1.08 ) apply_patch kbd-1.08 ;;
+   1.12 ) apply_patch kbd-1.12 ;;
+esac
+
+max_log_init Kbd ${KBD_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+./configure >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make CC="${CC-gcc} ${ARCH_CFLAGS}" \
+     CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+     LDFLAGS="${LDFLAGS}" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+    >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/native-scripts/native-less.sh
===================================================================
--- scripts/native-scripts/native-less.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-less.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+# cross-lfs native less build
+# ---------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=less-native.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball less-${LESS_VER} &&
+cd ${PKGDIR}
+
+max_log_init Less ${LESS_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=/usr --bindir=/bin \
+   --mandir=/usr/share/man --infodir=/usr/share/info \
+   --sysconfdir=/etc \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" || barf
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Install OK" || barf
+
Index: scripts/native-scripts/native-libtool-32.sh
===================================================================
--- scripts/native-scripts/native-libtool-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-libtool-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-libtool.sh
Index: scripts/native-scripts/native-libtool-64.sh
===================================================================
--- scripts/native-scripts/native-libtool-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-libtool-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-libtool.sh
Index: scripts/native-scripts/native-libtool-n32.sh
===================================================================
--- scripts/native-scripts/native-libtool-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-libtool-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-libtool.sh
Index: scripts/native-scripts/native-libtool.sh
===================================================================
--- scripts/native-scripts/native-libtool.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-libtool.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+# cross-lfs native libtool build
+# ------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=libtool-native.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+
+if [ ! "{libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+### LIBTOOL ###
+unpack_tarball libtool-${LIBTOOL_VER} &&
+cd ${PKGDIR}
+
+max_log_init Libtool ${LIBTOOL_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=/usr \
+   --datadir=/usr/share/misc ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" || barf
+
+min_log_init ${BUILDLOGS} &&
+make LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >>  ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+ldconfig
+
Index: scripts/native-scripts/native-m4.sh
===================================================================
--- scripts/native-scripts/native-m4.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-m4.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,62 @@
+#!/bin/bash
+
+# cross-lfs native m4 build
+# -------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=m4-native.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball m4-${M4_VER} &&
+cd ${PKGDIR} 
+
+# NOTE: with gcc-3.4.0, linux-libc-headers-2.6.5.1 on 
+#       biarch x86_64-pc-linux-gnu the build barfed out with
+#       errors in lib/regex.c due to conflicting types for
+#       malloc. removed definitions of malloc/realloc and
+#       made it so stlib.h always gets read.
+#
+#     : same results with linux-libc-headers-2.6.6.0 with
+#       gcc-3.4.1-20040620 on x86_64-pc-linux-gnu
+#
+# TODO: check if other architecturess are affected, and for what
+#       glibc/gcc/m4 versions.
+#
+#     : same issue w powerpc...
+#
+#       Get a better fix for this....
+case ${TGT_ARCH} in
+   x86_64 | ppc | powerpc | powerpc64 )
+      apply_patch m4-1.4-regex_c-hack
+   ;;
+esac
+
+max_log_init M4 ${M4_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=/usr \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" || barf
+
+min_log_init ${BUILDLOGS} &&
+make LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Install OK" || barf
+
Index: scripts/native-scripts/native-make.sh
===================================================================
--- scripts/native-scripts/native-make.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-make.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+# cross-lfs native make build
+# ---------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=make-native.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball make-${MAKE_VER} &&
+cd ${PKGDIR}
+
+max_log_init Make ${MAKE_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=/usr \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >>  ${LOGFILE} 2>&1 &&
+echo " o Test OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+chgrp 0 /usr/bin/make
+chmod 755 /usr/bin/make
+
Index: scripts/native-scripts/native-man.sh
===================================================================
--- scripts/native-scripts/native-man.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-man.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+# cross-lfs native man build
+# --------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=man-native.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball man-${MAN_VER} &&
+cd ${PKGDIR}
+
+# apply the man manpath, pager and 80cols patches
+# The following replaces the below
+#   apply_patch man-${MAN_VER}-manpath &&
+#   apply_patch man-${MAN_VER}-pager
+#   apply_patch man-${MAN_VER}-80cols
+#
+# ( Tested with man-1.5k and man-1.5l )
+
+#apply_patch man-${MAN_VER}-grepsilent
+
+case ${MAN_VER} in
+1.5[klmn]* )
+   # apply the man manpath patch
+   test -f src/man.conf.in-ORIG ||
+      cp src/man.conf.in src/man.conf.in-ORIG
+   sed 's@MANPATH[[:blank:]]/usr/man@#&@' src/man.conf.in-ORIG > src/man.conf.in
+
+   # apply the man pager patch
+   test -f configure-ORIG ||
+      cp configure configure-ORIG
+   sed 's@DEFAULTLESSOPT="-is"@DEFAULTLESSOPT="-isR"@' configure-ORIG \
+     > configure
+
+   # apply the man 80 cols patch
+   test -f src/man.c-ORIG ||
+      cp src/man.c src/man.c-ORIG
+   sed 's@.ll %d.%di@.nr LL %d.%di@' src/man.c-ORIG > src/man.c
+   
+   # apply the man 80 cols patch
+   test -f src/gripes.c-ORIG ||
+      cp src/gripes.c src/gripes.c-ORIG
+   sed 's@is none$@&\\n\\@g' src/gripes.c-ORIG > src/gripes.c
+   ;;
+1.5p* )
+   # apply the man manpath patch
+   test -f src/man.conf.in-ORIG ||
+      cp src/man.conf.in src/man.conf.in-ORIG
+   sed 's@MANPATH[[:blank:]]/usr/man@#&@' src/man.conf.in-ORIG > src/man.conf.in
+
+   # apply the man pager patch
+   test -f configure-ORIG ||
+      cp configure configure-ORIG
+   sed 's@DEFAULTLESSOPT="-is"@DEFAULTLESSOPT="-isR"@' configure-ORIG \
+     > configure
+   ;;
+* )
+   echo "###### CHECK MAN SOURCE TO SEE IF IT REQUIRES PATCHING ###"
+   ;;
+esac
+
+max_log_init Man ${MAN_VER} "Final (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+PATH="${PATH}:/usr/bin:/bin" \
+   ./configure -default -confdir=/etc \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/native-scripts/native-module-init-tools.sh
===================================================================
--- scripts/native-scripts/native-module-init-tools.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-module-init-tools.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+# cross-lfs native module-init-tools build
+# ----------------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=module-init-tools-native.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball module-init-tools-${MODINITTOOLS_VER} &&
+cd ${PKGDIR}
+
+max_log_init Module-init-tools ${MODINITTOOLS_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=/ \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+# As of 3.1, the manpage creation requires docbook2man
+# We do not have this yet
+min_log_init ${BUILDLOGS} &&
+make DOCBOOKTOMAN="" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+# Remove any existing binaries
+rm /sbin/*mod*
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+#test -f /etc/modules.conf &&
+#   ./generate-modprobe.conf /etc/modprobe.conf
+
Index: scripts/native-scripts/native-ncurses-32.sh
===================================================================
--- scripts/native-scripts/native-ncurses-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-ncurses-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-ncurses.sh
Index: scripts/native-scripts/native-ncurses-64.sh
===================================================================
--- scripts/native-scripts/native-ncurses-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-ncurses-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-ncurses.sh
Index: scripts/native-scripts/native-ncurses-n32.sh
===================================================================
--- scripts/native-scripts/native-ncurses-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-ncurses-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-ncurses.sh
Index: scripts/native-scripts/native-ncurses.sh
===================================================================
--- scripts/native-scripts/native-ncurses.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-ncurses.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,91 @@
+#!/bin/bash
+
+# cross-lfs native ncurses build
+# ------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=ncurses-native.log
+libdir="lib"
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+
+unpack_tarball ncurses-${NCURSES_VER} &&
+cd ${PKGDIR}
+
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+
+   # Patch misc/run_tic.in to create lib64/terminfo -> share/terminfo link
+   test -f misc/run_tic.in-ORIG ||
+      mv misc/run_tic.in misc/run_tic.in-ORIG
+
+   sed "s:^\(TICDIR.*/\)lib\(.*\):\1${libdirname}\2:g" \
+      misc/run_tic.in-ORIG > misc/run_tic.in
+fi
+
+
+# replace some deprecated headers
+# strstream deprecated in favour of sstream
+test -f c++/cursesw.h-ORIG ||
+   mv c++/cursesw.h c++/cursesw.h-ORIG
+sed 's/include <strstream.h>/include <sstream>/g' c++/cursesw.h-ORIG > c++/cursesw.h
+
+# CHECK THIS... Should only affect ncurses 5.2 and less, 
+# must check whether vsscanf is picked up or not in 5.3
+
+test 5.2 = "${NCURSES_VER}" &&
+{
+   # Apply cursesw.cc vsscanf patch
+   # Unsure who provided the original patch used.
+   # Please contact the authors so we can attribute you correctly.
+   test -f c++/cursesw.cc-ORIG ||
+      cp c++/cursesw.cc c++/cursesw.cc-ORIG
+   grep -v strstreambuf c++/cursesw.cc-ORIG |
+   sed 's@ss.vscan(@::vsscanf(buf, @' > c++/cursesw.cc
+}
+
+max_log_init Ncurses ${NCURSES_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+./configure --prefix=/usr --with-shared \
+   --without-debug ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+chmod 755 /usr/${libdirname}/*.${NCURSES_VER} &&
+chmod 644 /usr/${libdirname}/libncurses++.a &&
+mv /usr/${libdirname}/libncurses.so.* /${libdirname}
+ln -s libncurses.a /usr/${libdirname}/libcurses.a
+ln -sf ../../${libdirname}/libncurses.so.5 /usr/${libdirname}/libncurses.so
+ln -sf ../../${libdirname}/libncurses.so.5 /usr/${libdirname}/libcurses.so
+
+#ldconfig
+
+if [ ! -f /usr/include/term.h -a -f /usr/include/ncurses/term.h ]; then
+   ln -sf ncurses/term.h /usr/include
+fi
+
+# also create a curses.h symlink
+if [ ! -f /usr/include/curses.h -a -f /usr/include/ncurses/curses.h ]; then
+   ln -sf ncurses/curses.h /usr/include
+fi
+
+/sbin/ldconfig
Index: scripts/native-scripts/native-nettools.sh
===================================================================
--- scripts/native-scripts/native-nettools.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-nettools.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,99 @@
+#!/bin/bash
+
+# cross-lfs native net-tools build
+# --------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+#set -x
+cd ${SRC}
+LOG=net-tools-native.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball net-tools-${NETTOOLS_VER}
+cd ${PKGDIR}
+
+# TODO: get gcc version from gcc itself...
+case ${GCC_VER} in
+   3.4* | 4.* )
+      # Fix some syntax so gcc-3.4 is kept happy
+      # NOTE: this patch contains the miitool.c fix
+      apply_patch net-tools-1.60-gcc34-3
+   ;;
+   * )
+      # change string in miitool.c to something gcc-3.3 likes...
+      # TODO: wrap some logic around this...
+      apply_patch net-tools-1.60-miitool-gcc33-1
+   ;;
+esac
+
+
+# If we are building with 2.6 headers we need to adjust the x25
+# code in X25_setroute to use  the size of "struct x25_address"
+# in the memcpy instead of "x25_address" ( x25_address is no longer
+# a typedef in <linux/x25.h> )
+case "${KERNEL_VER}" in
+   2.6* )
+      test -f lib/x25_sr.c-ORIG ||
+         mv lib/x25_sr.c lib/x25_sr.c-ORIG
+
+      sed 's@\(sizeof(\)\(x25_address)\)@\1struct \2@g' \
+         lib/x25_sr.c-ORIG > lib/x25_sr.c
+   ;;
+esac
+
+# Have noticed an issue with x86_64 biarch and linux-libc-headers-2.6.5.1
+# iptunnel.c barfs out on redefinitions of 3 structs in <linux/if.h>
+# ( ifmap, ifreq and ifconf )  which are also available in <net/if.h>.
+# Removal of reference to <net/if.h> solved the issue...
+# TODO: look into this
+
+
+# Check for previously created configuration files for target.
+# TODO: this really should go somewhere other than ${TARBALLS},
+#       need a separate configs dir for the scripts for this and
+#       kernel config...
+
+test -f ${TARBALLS}/net-tools-${NETTOOLS_VER}-config-${TARGET}.tar.bz2 &&
+{
+   # Previously installed config files
+   bzcat ${TARBALLS}/net-tools-${NETTOOLS_VER}-config-${TARGET}.tar.bz2 | \
+      tar xvf -
+} || {
+   # Will have to do it interactively, save config for reuse
+   make config
+
+   tar -cvf ${TARBALLS}/net-tools-${NETTOOLS_VER}-config-${TARGET}.tar config.h config.make config.status
+   bzip2 ${TARBALLS}/net-tools-${NETTOOLS_VER}-config-${TARGET}.tar
+}
+
+# Fix hostname.c for decnet (pulls in <netdnet/dn.h>, should use <linux/dn.h>
+# NOTE: this doesn't fix it... cant be bothered looking into it,
+#       just don't bother with decnet...
+test -f hostname.c-ORIG ||
+   mv hostname.c hostname.c-ORIG
+sed 's@netdnet/dn.h@linux/dn.h@g' hostname.c-ORIG > hostname.c
+
+
+# Have to pass SHELL="bash" to make so that we use bash's "test" as 
+# /usr/bin/test under solaris (used when /bin/sh is invoked as it has no
+# builtin) doesn't understand -nt (newer than)
+
+max_log_init Net-tools ${NETTOOLS_VER} "native (shared)" ${BUILDLOGS} ${LOG}
+make SHELL="bash" \
+     CC="${CC-gcc} ${ARCH_CFLAGS}" \
+     COPTS="-D_GNU_SOURCE -O2 -Wall -pipe ${TGT_CFLAGS}" \
+     LOPTS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make update \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/native-scripts/native-patch.sh
===================================================================
--- scripts/native-scripts/native-patch.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-patch.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+# cross-lfs native patch build
+# ----------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=patch-native.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball patch-${PATCH_VER}
+cd ${PKGDIR}
+
+max_log_init Patch ${PATCH_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CPPFLAGS="-D_GNU_SOURCE" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=/usr \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" || barf
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/native-scripts/native-perl-32.sh
===================================================================
--- scripts/native-scripts/native-perl-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-perl-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-perl.sh
Index: scripts/native-scripts/native-perl-64.sh
===================================================================
--- scripts/native-scripts/native-perl-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-perl-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-perl.sh
Index: scripts/native-scripts/native-perl-n32.sh
===================================================================
--- scripts/native-scripts/native-perl-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-perl-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-perl.sh
Index: scripts/native-scripts/native-perl.sh
===================================================================
--- scripts/native-scripts/native-perl.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-perl.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,88 @@
+#!/bin/bash
+
+# cross-lfs native perl build
+# ---------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=perl-native.log
+
+# Test if the 64 script has been called.
+# This should only really get called during bi-arch builds
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+
+test "${SELF}" = "native-perl-64.sh" && LIB64=Y
+
+unpack_tarball perl-${PERL_VER} &&
+cd ${PKGDIR}
+
+chmod u+w hints/linux.sh          # For those not running as a root user
+
+if [ ! "${libdirname}" = "lib" ]; then
+   # We need to adjust Configure so that it understands 
+   # installstyle=lib64/perl5 and sets up directory paths accordingly
+   # NOTE: may need to check how this affects vendor libs...
+   if [ ! -f Configure-ORIG ]; then cp Configure Configure-ORIG ;fi
+   sed "/\*lib\/perl5\*).*/{
+        h
+        s/\([^a-zA-Z]\)lib/\1${libdirname}/g
+        x
+        G }" Configure-ORIG > Configure
+
+   # edit linux.sh
+   if [ ! -f hints/linux.sh-ORIG ]; then
+      cp hints/linux.sh hints/linux.sh-ORIG
+   fi
+   sed -e "s@/lib/libc.so.6@/${libdirname}/libc.so.6@g" \
+       -e "s@libc=/lib/\$libc@libc=/${libdirname}/\$libc@g" \
+       hints/linux.sh-ORIG > hints/linux.sh
+
+   # Now that installstyle can handle lib64, specify our
+   # our installstyle in linux.sh
+   echo "installstyle=\"${libdirname}/perl5\"" >> hints/linux.sh
+   # override standard glibpth
+   echo "glibpth=\"/${libdirname} /usr/${libdirname}\"" >> hints/linux.sh
+fi
+
+# override loclibpth
+# NOTE: by rights during this stage of the build there shouldn't be
+#       any libs in the local lib paths 
+#       (ie /usr/local/lib{,64} ,  /opt/local/lib{,64}) 
+#       so we just clear this (as we do ch5). 
+#
+#       Other option is to set
+#       loclibpth=\"/usr/local/${libdir} /opt/local/${libdir}\" 
+#       (and optionally /usr/gnu/${libdir})
+#
+echo "loclibpth=\"\"" >> hints/linux.sh
+cd ${SRC}/${PKGDIR}
+
+max_log_init Perl ${PERL_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+./configure.gnu --prefix=/usr \
+   -Doptimize="-O2 -pipe ${TGT_CFLAGS}" \
+   -Dman1dir='/usr/share/man/perl/man1' \
+   -Dman3dir='/usr/share/man/perl/man3' \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" || barf
+
+min_log_init ${BUILDLOGS} &&
+make LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Install OK" || barf
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   use_wrapper /usr/bin/{perl,perl${PERL_VER}}
+fi
Index: scripts/native-scripts/native-procinfo.sh
===================================================================
--- scripts/native-scripts/native-procinfo.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-procinfo.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# cross-lfs native procinfo build
+# -------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=procinfo-native.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball procinfo-${PROCINFO_VER} &&
+cd ${PKGDIR}
+
+# fix manpage installation
+sed -i 's@\($(prefix)\)\(/man\)@\1/share\2@g' Makefile
+
+max_log_init Procinfo ${PROCINFO_VER} "native (shared)" ${BUILDLOGS} ${LOG}
+make CC="${CC-gcc} ${ARCH_CFLAGS}" \
+     CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+     LDLIBS="-lncurses" \
+     LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/native-scripts/native-procps-32.sh
===================================================================
--- scripts/native-scripts/native-procps-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-procps-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-procps.sh
Index: scripts/native-scripts/native-procps-64.sh
===================================================================
--- scripts/native-scripts/native-procps-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-procps-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-procps.sh
Index: scripts/native-scripts/native-procps-n32.sh
===================================================================
--- scripts/native-scripts/native-procps-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-procps-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-procps.sh
Index: scripts/native-scripts/native-procps.sh
===================================================================
--- scripts/native-scripts/native-procps.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-procps.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+# cross-lfs native procps build
+# -----------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=procps-native.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+
+# TODO: look into how this is handled on non x86_64 and non multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_makeopts="lib64=${libdirname}"
+fi
+
+unpack_tarball procps-${PROCPS_VER} &&
+cd ${PKGDIR}
+
+# Following sed implements the LFS procps patch 
+#   apply_patch procps-${PROCPS_VER}
+# (20030404: works for procps 3.1.5 - 3.1.8)
+# Not required for 3.2.x
+#test -f w.c-ORIG ||
+#   cp w.c w.c-ORIG
+#sed 's@setlocale(LC_ALL, "")@setlocale(LC_NUMERIC, "C")@' w.c-ORIG \
+#   > w.c
+
+# Mod Makefile, pass extra LDFLAGS from env
+# change install dirs to lib64 if biarch
+
+test -f Makefile-ORIG ||
+   cp Makefile Makefile-ORIG
+
+LDFLAGS="-s" 
+
+sed -e "s/LDFLAGS :=.*/& ${LDFLAGS}/" \
+    -e "s@^\(lib64.*:= \).*@\1${libdirname}@g" \
+    Makefile-ORIG > Makefile
+
+max_log_init Procps ${PROCPS_VER} "native (shared)" ${BUILDLOGS} ${LOG}
+make CC="${CC-gcc} ${ARCH_CFLAGS}" \
+     CFLAGS="-O2 -pipe ${TGT_CFLAGS}" ${extra_makeopts} \
+      >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make CC="${CC-gcc} ${ARCH_CFLAGS}" ${extra_makeopts} install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/native-scripts/native-psmisc.sh
===================================================================
--- scripts/native-scripts/native-psmisc.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-psmisc.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+# cross-lfs native psmisc build
+# -----------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=psmisc-native.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball psmisc-${PSMISC_VER} &&
+cd ${PKGDIR}
+
+# Patch psmisc so we can pass CFLAGS from env during configure
+for file in src/Makefile.in src/Makefile.am ; do
+   test -f ${file}-ORIG ||
+      cp ${file} ${file}-ORIG
+   sed 's/CFLAGS =/& @CFLAGS@/' ${file}-ORIG > ${file}
+done
+
+# Remove newline in killall.c
+case ${PSMISC_VER} in
+   21.2 )
+      test -f src/killall.c-ORIG ||
+         cp src/killall.c src/killall.c-ORIG
+      # HACK - escape wrongly embedded newline (line 398)
+      sed 's@precede other$@& \\@' src/killall.c-ORIG > src/killall.c
+   ;;
+esac
+
+max_log_init Psmisc ${PSMISC_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=/usr --exec-prefix=/ \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >>  ${LOGFILE} 2>&1 &&
+echo " o Test OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/native-scripts/native-readline-32.sh
===================================================================
--- scripts/native-scripts/native-readline-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-readline-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-readline.sh
Index: scripts/native-scripts/native-readline-64.sh
===================================================================
--- scripts/native-scripts/native-readline-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-readline-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-readline.sh
Index: scripts/native-scripts/native-readline-n32.sh
===================================================================
--- scripts/native-scripts/native-readline-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-readline-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-readline.sh
Index: scripts/native-scripts/native-readline.sh
===================================================================
--- scripts/native-scripts/native-readline.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-readline.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+# cross-lfs native readline build
+# -------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=readline-native.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball readline-${READLINE_VER} &&
+cd ${PKGDIR}
+
+case ${READLINE_VER} in
+   4.3 ) apply_patch readline-4.3-gnu_fixes-1 ;;
+   # Should be fixed next release
+   5.0 ) apply_patch readline-5.0-fixes-1 ;;
+esac
+
+max_log_init readline ${READLINE_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make SHLIB_XLDFLAGS="-lncurses" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+chmod 755 /usr/${libdirname}/*.${READLINE_VER} &&
+mv /usr/${libdirname}/lib{readline,history}.so.5* /${libdirname}
+ln -sf ../../${libdirname}/libhistory.so.5 /usr/${libdirname}/libhistory.so
+ln -sf ../../${libdirname}/libreadline.so.5 /usr/${libdirname}/libreadline.so
+
+/sbin/ldconfig
Index: scripts/native-scripts/native-sed.sh
===================================================================
--- scripts/native-scripts/native-sed.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-sed.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# cross-lfs native sed build
+# --------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=sed-native.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball sed-${SED_VER} &&
+cd ${PKGDIR}
+
+max_log_init Sed ${SED_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=/usr --bindir=/bin \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >>  ${LOGFILE} 2>&1 &&
+echo " o Test OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/native-scripts/native-shadow-32.sh
===================================================================
--- scripts/native-scripts/native-shadow-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-shadow-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-shadow.sh
Index: scripts/native-scripts/native-shadow-64.sh
===================================================================
--- scripts/native-scripts/native-shadow-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-shadow-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-shadow.sh
Index: scripts/native-scripts/native-shadow-n32.sh
===================================================================
--- scripts/native-scripts/native-shadow-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-shadow-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-shadow.sh
Index: scripts/native-scripts/native-shadow.sh
===================================================================
--- scripts/native-scripts/native-shadow.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-shadow.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,110 @@
+#!/bin/bash
+
+# cross-lfs native shadow build
+# -----------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG="shadow-native.log"
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball shadow-${SHADOW_VER} &&
+cd ${PKGDIR}
+
+# HACK
+# Issue noted with glibc-2.3-20040701 and linux-libc-headers-2.6.7
+test -f libmisc/xmalloc.c-ORIG ||
+   cp -p libmisc/xmalloc.c libmisc/xmalloc.c-ORIG
+
+sed 's@^extern char \*malloc ();@/* & */@g' \
+   libmisc/xmalloc.c-ORIG > libmisc/xmalloc.c
+
+# fix lastlog for shadow-4.0.7
+case ${SHADOW_VER} in
+   4.0.7 )
+      apply_patch shadow-4.0.7-fix_lastlog-1
+   ;;
+esac
+
+# Set to Y if you want a shared libmisc and libshadow and have
+# passwd etc linked dynamically to these
+BUILD_SHADOW_SHARED="Y"
+
+# If not there touch /usr/bin/passwd
+test -f /usr/bin/passwd || touch /usr/bin/passwd
+
+test Y = "${BUILD_SHADOW_SHARED}" &&
+   extra_conf="${extra_conf} --enable-shared"
+
+max_log_init Shadow ${SHADOW_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   --mandir=/usr/share/man \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >>  ${LOGFILE} 2>&1 &&
+echo " o Test OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+shadowfiles="limits login.access"
+for file in ${shadowfiles} ; do
+   test -f /etc/${file} ||
+   {
+      cp -v etc/${file} /etc
+      chmod -c 644 /etc/limits
+   }
+done
+
+# LFS:  User mailboxes belong in /var/mail not /var/spool/mail
+# From Nico's: use MD5
+sed -e 's%/var/spool/mail%/var/mail%' \
+    -e 's%^#MD5_CRYPT_ENAB.*no%MD5_CRYPT_ENAB yes%' \
+    etc/login.defs.linux > /etc/login.defs 
+
+ln -sf vipw /usr/sbin/vigr
+# Nico: create symlink for vigr man page
+ln -sf vipw.8 /usr/share/man/man8/vigr.8
+rm -f /bin/vipw
+mv -f /bin/sg /usr/bin 
+
+# Only need to move these if we built shared
+# TODO: 4.0.6 seems we only need to move libshadow...
+#       4.0.7, the below shouldn't be required
+#       Must revisit this script... though what we do here doesn't hurt...
+test Y = "${BUILD_SHADOW_SHARED}" &&
+{
+   mv -f /usr/${libdirname}/lib{shadow,misc}.so.0* /${libdirname} 
+   ln -sf ../../${libdirname}/libshadow.so.0 /usr/${libdirname}/libshadow.so 
+   ln -sf ../../${libdirname}/libmisc.so.0 /usr/${libdirname}/libmisc.so 
+   ldconfig
+}
+
+# Create shadow password file if not already built
+test -f /etc/shadow ||
+   /usr/sbin/pwconv 
+
Index: scripts/native-scripts/native-sysklogd.sh
===================================================================
--- scripts/native-scripts/native-sysklogd.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-sysklogd.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,65 @@
+#!/bin/bash
+
+# cross-lfs native sysklogd build
+# -------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=sysklogd-native.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball sysklogd-${SYSKLOGD_VER} &&
+cd ${PKGDIR}
+
+# If using 2.5+ kernels, patch (klogd linux/modules.h)
+case ${KERNEL_VER} in
+   2.[56].* )
+      case ${SYSKLOGD_VER} in
+        1.4.[1-9]* )
+            apply_patch sysklogd-${SYSKLOGD_VER}
+         ;;
+      esac
+   ;;
+esac
+
+# This package defaults to optimisation level -O3
+# Following strips this out, allowing us to set CFLAGS
+# with whatever optimisation we want via RPM_OPT_FLAGS
+test -f Makefile-ORIG ||
+   cp Makefile Makefile-ORIG
+sed 's@CFLAGS= $(RPM_OPT_FLAGS) -O3@CFLAGS= $(RPM_OPT_FLAGS)@g' \
+   Makefile-ORIG > Makefile
+
+max_log_init Sysklogd ${SYSKLOGD_VER} "native (shared)" ${BUILDLOGS} ${LOG}
+make CC="${CC-gcc} ${ARCH_CFLAGS}" \
+     LDFLAGS="-s" RPM_OPT_FLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+      >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make MANDIR=/usr/share/man install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+# Create /etc/syslog.conf
+# NOTE: Using LFS syslog.conf, copy in real one later
+cat > /etc/syslog.conf << "EOF"
+# Begin /etc/syslog.conf
+
+auth,authpriv.*		-/var/log/auth.log
+*.*;auth,authpriv.none	-/var/log/sys.log
+daemon.*		-/var/log/daemon.log
+kern.*			-/var/log/kern.log
+mail.*			-/var/log/mail.log
+user.*			-/var/log/user.log
+*.emerg			*
+
+# End /etc/syslog.conf
+EOF
+
Index: scripts/native-scripts/native-sysvinit.sh
===================================================================
--- scripts/native-scripts/native-sysvinit.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-sysvinit.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,102 @@
+#!/bin/bash
+
+# cross-lfs native sysvinit build
+# -------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=sysvinit-native.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball sysvinit-${SYSVINIT_VER} &&
+cd ${PKGDIR}
+
+# TODO: add some logic around this...
+#       this needs to be tracked
+case ${SYSVINIT_VER} in
+   2.85 )
+      apply_patch sysvinit-2.85-proclen-1
+   ;;
+esac
+
+# From LFS CVS 
+cp src/init.c src/init.c-ORIG &&
+sed 's/Sending processes/Sending processes started by init/g' \
+    src/init.c-ORIG > src/init.c
+
+# Modify Makefile
+test -f src/Makefile-ORIG ||
+   cp src/Makefile src/Makefile-ORIG
+
+# 1: Add -pipe to CFLAGS ( default optimization is -O2 )
+# 2: Also change BIN_OWNER and BIN_GROUP from "root" to 0
+# 3: Modify instructions using chown $(BIN_COMBO) to do a 
+#    chown $(BIN_OWNER) and a chgrp $(BIN_GROUP) instead
+# 4: makefile works with /dev/initctl, NOT $(ROOT)/dev/initctl
+#    change this so it operates on our target root, NOT the hosts
+# 5: alter mknod of $(ROOT)/dev/initctl to not set mode while creating the fifo
+#    instead set mode with chmod.
+
+sed -e 's@^CFLAGS.*-O2@& -pipe@g' \
+    -e 's@root@0@g' \
+    -e 's@chown $(BIN_COMBO) \(.*\)@chown $(BIN_OWNER) \1 ;chgrp $(BIN_GROUP) \1@g' \
+    -e 's@/dev/initctl@$(ROOT)&@g' \
+    -e 's@\(mknod \)-m \([0-9]* \)\(.* \)p@\1\3p; chmod \2\3@g' \
+   src/Makefile-ORIG > src/Makefile
+
+
+max_log_init Sysvinit ${SYSVINIT_VER} "native (shared)" ${BUILDLOGS} ${LOG}
+make -C src CC="${CC-gcc} ${ARCH_CFLAGS}" LDFLAGS="-s"  \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+mkdir -p /usr/share/man/man{1,5,8}
+
+min_log_init ${INSTLOGS} &&
+make -C src install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+# If we already have an /etc/inittab, move it out the way
+test -f /etc/inittab &&
+   mv /etc/inittab /etc/inittab-${DATE}
+
+cat > /etc/inittab << "EOF"
+# Begin /etc/inittab
+
+id:3:initdefault:
+
+si::sysinit:/etc/rc.d/init.d/rc sysinit
+
+l0:0:wait:/etc/rc.d/init.d/rc 0
+l1:S1:wait:/etc/rc.d/init.d/rc 1
+l2:2:wait:/etc/rc.d/init.d/rc 2
+l3:3:wait:/etc/rc.d/init.d/rc 3
+l4:4:wait:/etc/rc.d/init.d/rc 4
+l5:5:wait:/etc/rc.d/init.d/rc 5
+l6:6:wait:/etc/rc.d/init.d/rc 6
+
+ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now
+
+su:S016:once:/sbin/sulogin
+EOF
+
+# Check if we are using DEVFS or not before creating getty entries 
+# If we are using DEVFS need to specify vc/x NOT ttyx
+tty_string="tty"
+test Y = "${DEVFS}" &&
+   tty_string="vc/"
+
+for vc_no in 1 2 3 4 5 6 ; do
+   echo "${vc_no}:2345:respawn:/sbin/agetty ${tty_string}${vc_no} 9600" \
+      >> ${LFS}/etc/inittab
+done
+
+echo -e "\n# End /etc/inittab" >> ${LFS}/etc/inittab
+
Index: scripts/native-scripts/native-tar.sh
===================================================================
--- scripts/native-scripts/native-tar.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-tar.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+# cross-lfs native tar build
+# --------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+# 20030419 - make libexecdir /usr/lib/tar (FHS Compliant)
+
+cd ${SRC}
+LOG=tar-native.log
+unpack_tarball tar-${TAR_VER}
+set_libdirname
+setup_multiarch
+
+cd ${PKGDIR}
+case ${TAR_VER} in
+   1.13 )   apply_patch tar-${TAR_VER} ;;
+   1.15.1 ) apply_patch tar-1.15.1-sparse_fix-1 
+            apply_patch tar-1.15.1-gcc4_fix_tests ;;
+esac
+
+max_log_init Tar ${TAR_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CFLAGS="-O2 -pipe ${ARCH_CFLAGS} ${TGT_CFLAGS}" \
+./configure --prefix=/usr --bindir=/bin \
+   --libexecdir=/usr/${libdirname}/tar \
+      >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >>  ${LOGFILE} 2>&1 &&
+echo " o Test OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/native-scripts/native-texinfo.sh
===================================================================
--- scripts/native-scripts/native-texinfo.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-texinfo.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+# cross-lfs native texinfo build
+# ------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=texinfo-native.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball texinfo-${TEXINFO_VER} &&
+cd ${PKGDIR}
+
+max_log_init Texinfo ${TEXINFO_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=/usr \
+   --mandir=/usr/share/man --infodir=/usr/share/info \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" || barf
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >>  ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+make TEXMF=/usr/share/texmf install-tex \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Install OK" || barf
+
Index: scripts/native-scripts/native-util-linux.sh
===================================================================
--- scripts/native-scripts/native-util-linux.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-util-linux.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,93 @@
+#!/bin/bash
+
+# cross-lfs native util-linux build
+# ---------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=util-linux-native.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball util-linux-${UTILLINUX_VER} &&
+cd ${PKGDIR}
+
+case ${UTILLINUX_VER} in
+   2.12 | 2.12a )
+      case ${KERNEL_VER} in
+         2.[56].* )
+            # Fixes for utillinux 2.12 + 2.12a for building against 2.6
+            # kernel headers
+            apply_patch util-linux-2.12a-kernel_headers-1
+         ;;
+      esac
+   ;;
+   2.12[k-q] )
+      # fix cramfs
+      apply_patch util-linux-2.12q-cramfs-1
+   ;;
+esac
+
+case ${UTILLINUX_VER} in
+   2.12[a-m] )
+      # Patch to fix fdiskbsdlabel.h for m68k, also adds unistd.h to list
+      # of includes for swapon.c
+      apply_patch util-linux-2.12a-cross-lfs-fixes
+   ;;
+   2.12* )
+      # Patch to fix fdiskbsdlabel.h for m68k
+      apply_patch util-linux-2.12n-cross-lfs-fixes
+   ;;
+esac
+
+# Make FHS compliant
+# Get list of files which reference etc/adjtime
+filelist=`grep -l -d recurse etc/adjtime *`
+
+# Edit each file in turn
+for file in ${filelist} ; do
+   test -f ${file}-ORIG ||
+      cp ${file} ${file}-ORIG
+   # Change instance of etc/adjtime to var/lib/hwclock/adjtime
+   sed 's%etc/adjtime%var/lib/hwclock/adjtime%' \
+      ${file}-ORIG > ${file}
+done
+mkdir -p /var/lib/hwclock &&
+
+# Optimization defaults to -O2
+max_log_init Util-linux ${UTILLINUX_VER} "native (shared)" ${CONFLOGS} ${LOG}
+export CC="${CC-gcc} ${ARCH_CFLAGS}"
+
+# Here it is just plain ugly. We set CPU and ARCH to something that wont trigger
+# anything in MCONFIG
+export CPU=m68k
+export ARCH=m68k
+export DESTDIR=${LFS}
+
+./configure \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+# Don't build kill or sln
+# (procps supplies kill and glibc supplies sln)
+# No need to supply LDFLAGS="-s", taken care of during configure
+#
+# Optionally, for x86, unset CPUOPT (defaults to i486 if cpu not i386)
+# or set specifically for your cpu type.
+# See MCONFIG...
+
+min_log_init ${BUILDLOGS} &&
+make HAVE_KILL=yes HAVE_SLN=yes CPUOPT="" \
+      >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make HAVE_KILL=yes HAVE_SLN=yes install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/native-scripts/native-vim.sh
===================================================================
--- scripts/native-scripts/native-vim.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-vim.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+# cross-lfs native vim build
+# --------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=vim-native.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball vim-${VIM_VER}
+cd ${PKGDIR}
+
+case ${VIM_VER} in
+   6.[23] )
+      # Set location for vimrc and gvimrc files
+      # ( for < 6.1 we use CPPFLAGS to set this )
+      echo "#define SYS_VIMRC_FILE \"/etc/vimrc\"" >> src/feature.h
+      echo "#define SYS_GVIMRC_FILE \"/etc/gvimrc\"" >> src/feature.h
+      # here for consistency only
+      makeopts=""
+   ;;
+   6.1 ) 
+      # Remove checks for -I/usr/local/include when setting CPPFLAGS
+      apply_patch vim-${VIM_VER}
+      # Set location for vimrc file
+      makeopts="CPPFLAGS='-DSYS_VIMRC_FILE=\\\"/etc/vimrc\\\"'"
+   ;;
+esac
+
+
+max_log_init vim ${VIM_VER} "native (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+CXXFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=/usr \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} ${makeopts} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install  \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+ln -sf vim /usr/bin/vi
Index: scripts/native-scripts/native-zlib-32.sh
===================================================================
--- scripts/native-scripts/native-zlib-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-zlib-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-zlib.sh
Index: scripts/native-scripts/native-zlib-64.sh
===================================================================
--- scripts/native-scripts/native-zlib-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-zlib-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-zlib.sh
Index: scripts/native-scripts/native-zlib-n32.sh
===================================================================
--- scripts/native-scripts/native-zlib-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-zlib-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+native-zlib.sh
Index: scripts/native-scripts/native-zlib.sh
===================================================================
--- scripts/native-scripts/native-zlib.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/native-zlib.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,92 @@
+#!/bin/bash
+
+# cross-lfs native zlib build
+# ---------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+LOG=zlib-native.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+cd ${SRC}
+unpack_tarball zlib-${ZLIB_VER}
+cd ${PKGDIR}
+
+#TODO - fix this for later zlibs
+test "1.1.4" = "${ZLIB_VER}" &&
+{
+   # Fix up zlibs Makefile so we can properly pass in LDFLAGS from
+   # the env without clobbering existing settings for zlib build
+   test -f Makefile.in-ORIG ||
+      cp Makefile.in Makefile.in-ORIG
+
+   # make LDFLAGS in Makefile.in empty and move existing LDFLAGS
+   # to ZLIB_LDFLAGS. Append $(ZLIB_LDFLAGS) wherever $(LDFLAGS) exists
+   sed -e 's@LDFLAGS=.*@ZLIB_&@' \
+       -e '/ZLIB_LDFLAGS=/i\
+LDFLAGS=' \
+       -e 's@$(LDFLAGS)@& $(ZLIB_LDFLAGS)@g' \
+       Makefile.in-ORIG > Makefile.in
+}
+
+max_log_init Zlib ${ZLIB_VER} "target (shared)" ${CONFLOGS} ${LOG}
+
+# Check to see if we are on alpha
+# Req's a fix as specified on Kelledins Alpha page
+# Pointed out by J.Schmelling
+case "${TGT_ARCH}" in
+   alpha | x86_64 ) extra_cflags="-fPIC" ;;
+esac
+# NOTE: It's probably not a bad idea in general to enable -fPIC...
+
+test "1.1.4" = "${ZLIB_VER}" &&
+{
+   # Apply Kelledin's vsnprintf patch
+   # see http://archive.linuxfromscratch.org/lfs-dev/2003/02/..... 
+   apply_patch zlib-${ZLIB_VER}-vsnprintf
+   CC="${CC-gcc} ${ARCH_CFLAGS}" \
+   CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+   CFLAGS="-O2 -pipe ${extra_cflags} ${TGT_CFLAGS}" \
+   CPPFLAGS="-DHAS_vsnprintf" \
+   ./configure --prefix=/usr --shared ${extra_conf} \
+      >> ${LOGFILE} 2>&1 
+} || {
+   CC="${CC-gcc} ${ARCH_CFLAGS}" \
+   CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+   CFLAGS="-O2 -pipe ${extra_cflags} ${TGT_CFLAGS}" \
+   ./configure --prefix=/usr \
+      --shared ${extra_conf} \
+      >> ${LOGFILE} 2>&1 
+}
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+make test \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make LIBS="libz.so.${ZLIB_VER} libz.a" install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Install OK" || barf
+
+mv /usr/${libdirname}/libz.so.* /${libdirname}
+ln -sf ../../${libdirname}/libz.so.1 /usr/${libdirname}/libz.so
+cp -f zlib.3 /usr/share/man/man3
+
+ldconfig
Index: scripts/native-scripts/post-lfs-configuration.sh
===================================================================
--- scripts/native-scripts/post-lfs-configuration.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/post-lfs-configuration.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,415 @@
+#!/bin/bash
+
+# post cross-lfs configuration
+# ----------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+# TODO: Add support somehow for multi-arch systems...
+#       May just copy the multi-arch funcs script onto the host and use
+#       that...
+
+if [ ! -d /etc/default ]; then mkdir /etc/default ; fi
+
+# OK, these defaults for useradd are probably peculiar to the script authors
+# preferences (homedirs are generally nfs mounted)
+if [ "${HOME_NFS_MOUNTED}" = "Y" ]; then
+   HOMEDIR=/home/$( uname -n )
+else
+   HOMEDIR=/home
+fi
+
+if [ ! -d ${HOMEDIR} ]; then mkdir -p ${HOMEDIR} ; fi
+
+cat > /etc/default/useradd << EOF
+# Begin /etc/default/useradd
+
+GROUP=100
+HOME=${HOMEDIR}
+INACTIVE=-1
+EXPIRE=
+SHELL=/bin/bash
+SKEL=/etc/skel
+
+# End /etc/default/useradd
+EOF
+
+if [ "${MULTIARCH}" = "Y" ]; then
+multiarch_additions='
+# The following from cross-lfs multiarch-funcs script
+
+# From set_libdirname function...
+
+# TODO: this will barf on mips if setting 64bit libs to go to */lib
+#       but will work if setting
+if [ -z "${BUILDENV}" ]; then
+   BUILDENV=${DEFAULTENV}
+   export BUILDENV
+fi
+if [ ! "${BUILDENV}" = "${LIBDIRENV}" ]; then
+   case ${BUILDENV} in
+      32 | o32 | n32 )   libdirname=lib32 ;;
+      64 | o64 )         libdirname=lib64 ;;
+      * )   echo "unknown buildenv ${BUILDENV}"; return 1
+   esac
+   LOG=`echo ${LOG} | sed "s@\.log@-${BUILDENV}&@"`
+else
+   libdirname=lib
+fi
+
+# Adjust PKG_CONFIG_PATH 
+PKG_CONFIG_PATH=`echo "${PKG_CONFIG_PATH}" | \
+                 sed -e "s@lib[36][124]@lib@g"  -e "s@lib@${libdirname}@g" `
+
+# Adjust GNOME_LIBCONF_PATH
+GNOME_LIBCONF_PATH=`echo "${GNOME_LIBCONF_PATH}" | \
+                 sed -e "s@lib[36][124]@lib@g"  -e "s@lib@${libdirname}@g" `
+'
+fi
+
+cat > /etc/profile << "EOF"
+# Begin /etc/profile
+# Written for Beyond Linux From Scratch
+# by James Robertson <jameswrobertson@earthlink.net>
+# modifications by Dagmar d'Surreal <rivyqntzne@pbzpnfg.arg>
+ 
+# System wide environment variables and startup programs.
+ 
+# System wide aliases and functions should go in /etc/bashrc.  Personal
+# environment variables and startup programs should go into
+# ~/.bash_profile.  Personal aliases and functions should go into
+# ~/.bashrc.
+ 
+# Functions to help us manage paths.  Second argument is the name of the
+# path variable to be modified (default: PATH)
+pathremove () {
+	local IFS=':'
+	local NEWPATH
+	local DIR
+	local PATHVARIABLE=${2:-PATH}
+	for DIR in ${!PATHVARIABLE} ; do
+		if [ "${DIR}" != "${1}" ] ; then
+			NEWPATH=${NEWPATH:+$NEWPATH:}${DIR}
+		fi
+	done
+	export ${PATHVARIABLE}="${NEWPATH}"
+}
+ 
+pathprepend () {
+	pathremove ${1} ${2}
+	local PATHVARIABLE=${2:-PATH}
+	export ${PATHVARIABLE}="$1${!PATHVARIABLE:+:${!PATHVARIABLE}}"
+}
+ 
+pathappend () {
+	pathremove ${1} ${2}
+	local PATHVARIABLE=${2:-PATH}
+	export ${PATHVARIABLE}="${!PATHVARIABLE:+${!PATHVARIABLE}:}$1"
+}
+ 
+
+# Set the initial path
+export PATH=/bin:/usr/bin
+
+if [ ${EUID} -eq 0 ] ; then
+	pathappend /sbin:/usr/sbin
+	unset HISTFILE
+fi
+ 
+# Setup some environment variables.
+export HISTSIZE=1000
+export HISTIGNORE="&:[bf]g:exit"
+#export PS1="[\u@\h \w]\\$ "
+export PS1='\u@\h:\w\$ '
+ 
+for script in /etc/profile.d/*.sh ; do
+	if [ -r ${script} ] ; then
+		. ${script}
+	fi
+done
+ 
+# Now to clean up
+unset pathremove pathprepend pathappend 
+
+EOF
+
+if [ "${MULTIARCH}" = "Y" ]; then
+   echo "${multiarch_additions}" >> /etc/profile
+fi
+echo "# End /etc/profile" >> /etc/profile
+
+install --directory --mode=0755 --owner=root --group=root /etc/profile.d
+
+cat > /etc/profile.d/dircolors.sh << "EOF"
+# Setup for /bin/ls to support color, the alias is in /etc/bashrc.
+if [ -f "/etc/dircolors" ] ; then
+	eval $(dircolors -b /etc/dircolors)
+ 
+	if [ -f "${HOME}/.dircolors" ] ; then
+		eval $(dircolors -b ${HOME}/.dircolors)
+	fi
+fi
+alias ls='ls --color=auto'
+EOF
+
+# This script adds several useful paths to the PATH and PKG_CONFIG_PATH
+# environment variables.
+
+cat > /etc/profile.d/extrapaths.sh << "EOF"
+if [ -d /usr/local/lib/pkgconfig ] ; then
+	pathappend /usr/local/lib/pkgconfig PKG_CONFIG_PATH
+fi
+if [ -d /usr/local/bin ]; then
+	pathprepend /usr/local/bin
+fi
+if [ -d /usr/local/sbin -a $EUID -eq 0 ]; then
+	pathprepend /usr/local/sbin
+fi
+for directory in $(find /opt/*/lib/pkgconfig -type d 2>/dev/null); do
+	pathappend ${directory} PKG_CONFIG_PATH
+done
+for directory in $(find /opt/*/bin -type d 2>/dev/null); do
+	pathappend ${directory}
+done
+if [ -d ~/bin ]; then
+	pathprepend ~/bin
+fi
+#if [ $EUID -gt 99 ]; then
+#	pathappend .
+#fi
+EOF
+
+# This script sets up the default inputrc configuration file. 
+# If the user does not have individual settings, it uses the global file.
+
+cat > /etc/profile.d/readline.sh << "EOF"
+# Setup the INPUTRC environment variable.
+if [ -z "$INPUTRC" -a ! -f "$HOME/.inputrc" ] ; then
+	INPUTRC=/etc/inputrc
+fi
+export INPUTRC
+EOF
+
+
+# Some applications need a specific TERM setting to support color.
+
+cat > /etc/profile.d/tinker-term.sh << "EOF"
+# This will tinker with the value of TERM in order to convince certain 
+# apps that we can, indeed, display color in their window.
+ 
+if [ -n "$COLORTERM" ]; then
+	export TERM=xterm-color
+fi
+ 
+if [ "$TERM" = "xterm" ]; then
+	export TERM=xterm-color
+fi
+EOF
+
+# Setting the umask value is important for security. 
+# Here the default group write permissions are turned off for system users 
+# and when the user name and group name are not the same.
+
+cat > /etc/profile.d/umask.sh << "EOF"
+# By default we want the umask to get set.
+if [ "$(id -gn)" = "$(id -un)" -a $EUID -gt 99 ] ; then
+	umask 002
+else
+	umask 022
+fi
+EOF
+
+
+# If X is installed, the PATH and PKG_CONFIG_PATH variables are also updated.
+
+cat > /etc/profile.d/X.sh << "EOF"
+if [ -x /usr/X11R6/bin/X ]; then
+	pathappend /usr/X11R6/bin
+fi
+if [ -d /usr/X11R6/lib/pkgconfig ] ; then
+	pathappend /usr/X11R6/lib/pkgconfig PKG_CONFIG_PATH
+fi
+EOF
+
+
+# This script shows an example of a different way of setting the prompt.
+# The normal variable, PS1, is supplemented by PROMPT_COMMAND. If set,
+# the value of PROMPT_COMMAND is executed as a command prior to issuing 
+# each primary prompt.
+
+cat > /etc/profile.d/xterm-titlebars.sh << "EOF"
+# The substring match ensures this works for "xterm" and "xterm-xfree86".
+if [ "${TERM:0:5}" = "xterm" ]; then
+	PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME} : ${PWD}\007"'
+	export PROMPT_COMMAND
+fi
+EOF
+
+if [ "${MULTIARCH}" = "Y" ]; then
+cat > /etc/profile.d/multiarch-defaults.sh << EOF
+# Set default ABI and which ABI goes into */lib
+export DEFAULTENV="${DEFAULTENV}"
+export LIBDIRENV="${LIBDIRENV}"
+
+# Force each bash script invocation to use /etc/bashrc .
+export BASH_ENV="/etc/bashrc"
+EOF
+fi
+
+# Here is a base /etc/bashrc. 
+# Comments in the file should explain everything you need.
+
+cat > /etc/bashrc << "EOF"
+# Begin /etc/bashrc 
+# Written for Beyond Linux From Scratch 
+# by James Robertson <jameswrobertson@earthlink.net>
+# updated by Bruce Dubbs <bdubbs@linuxfromscratch.org>
+
+# Make sure that the terminal is set up properly for each shell
+
+if [ -f /etc/profile.d/tinker-term.sh ]; then
+	source /etc/profile.d/tinker-term.sh
+fi
+
+if [ -f /etc/profile.d/xterm-titlebars.sh ]; then
+	source /etc/profile.d/xterm-titlebars.sh
+fi
+
+# System wide aliases and functions.
+
+# System wide environment variables and startup programs should go into
+# /etc/profile.  Personal environment variables and startup programs
+# should go into ~/.bash_profile.  Personal aliases and functions should
+# go into ~/.bashrc
+
+# Provides a colored /bin/ls command.  Used in conjunction with code in
+# /etc/profile.
+
+alias ls='ls --color=auto'
+
+# Provides prompt for non-login shells, specifically shells started
+# in the X environment. [Review the LFS archive thread titled
+# PS1 Environment Variable for a great case study behind this script 
+# addendum.]
+
+#export PS1="[\u@\h \w]\\$ "
+export PS1='\u@\h:\w\$ '
+
+EOF
+
+if [ "${MULTIARCH}" = "Y" ]; then
+   echo "${multiarch_additions}" >> /etc/bashrc
+fi
+echo "# End /etc/bashrc" >> /etc/bashrc
+
+if [ ! -d /etc/skel ]; then mkdir -p /etc/skel ; fi
+
+# .bash_profile
+
+cat > /etc/skel/.bash_profile << "EOF"
+# Begin ~/.bash_profile
+# Written for Beyond Linux From Scratch
+# by James Robertson <jameswrobertson@earthlink.net>
+# updated by Bruce Dubbs <bdubbs@linuxfromscratch.org>
+
+# Personal environment variables and startup programs.
+
+# Personal aliases and functions should go in ~/.bashrc.  System wide
+# environment variables and startup programs are in /etc/profile.
+# System wide aliases and functions are in /etc/bashrc.
+
+append () {
+	# First remove the directory
+	local IFS=':'
+	local NEWPATH
+	for DIR in ${PATH}; do
+		if [ "${DIR}" != "${1}" ]; then
+			NEWPATH="${NEWPATH:+${NEWPATH}:}${DIR}"
+		fi     
+	done
+  
+	# Then append the directory
+	export PATH="${NEWPATH}:${1}"
+}
+
+if [ -f "${HOME}/.bashrc" ] ; then
+	source ${HOME}/.bashrc
+fi
+
+if [ -d "${HOME}/bin" ] ; then
+	append ${HOME}/bin      
+fi
+
+unset append
+
+# End ~/.bash_profile
+EOF
+
+# .bashrc
+
+cat > /etc/skel/.bashrc << "EOF"
+# Begin ~/.bashrc
+# Written for Beyond Linux From Scratch
+# by James Robertson <jameswrobertson@earthlink.net>
+
+# Personal aliases and functions.
+
+# Personal environment variables and startup programs should go in
+# ~/.bash_profile.  System wide environment variables and startup
+# programs are in /etc/profile.  System wide aliases and functions are
+# in /etc/bashrc. 
+
+if [ -f "/etc/bashrc" ] ; then
+	source /etc/bashrc
+fi
+
+# End ~/.bashrc
+EOF
+
+# .bash_logout
+
+cat > /etc/skel/.bash_logout << "EOF"
+# Begin ~/.bash_logout
+# Written for Beyond Linux From Scratch
+# by James Robertson <jameswrobertson@earthlink.net>
+
+# Personal items to perform on logout.
+
+# End ~/.bash_logout
+EOF
+
+# .vimrc
+
+cat > /etc/skel/.vimrc << "EOF"
+" Begin .vimrc
+
+set nocompatible
+set bs=2
+" set columns=80
+set background=dark     " use colours which look good on a dark background
+" set wrapmargin=8
+set ruler
+
+syntax on               " syntax highlighting
+set hlsearch            " highlight last used search pattern
+
+" End .vimrc
+EOF
+
+cp /etc/skel/{.bash_profile,.bashrc,.vimrc} /root
+
+dircolors -p > /etc/dircolors
+
+cat > /etc/shells << "EOF"
+# Begin /etc/shells
+
+/bin/sh
+/bin/bash
+
+# End /etc/shells
+EOF
+
+
Index: scripts/native-scripts/specs-mod.sh
===================================================================
--- scripts/native-scripts/specs-mod.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/specs-mod.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+# cross-lfs gcc specs file modification
+# -------------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+# Modify gcc specs file
+
+cd ${SRC}
+                                                                                
+# Change dynamic linker definition in gcc specs file
+# to point at our new dynamic linker in /lib.
+# Also repoint startfile_prefix_spec.
+#
+
+# Do we have a specs file?
+SPECFILE=`${TGT_TOOLS}/bin/gcc --print-file-name specs`
+
+# We dont have a specs file... generate one.
+if [ "${SPECFILE}" = "specs" ]; then
+   # A bit of a hack, as include is a directrory, but hey...
+   SPECFILE=`${TGT_TOOLS}/bin/gcc --print-file-name include | \
+             sed 's@include@specs@g'`
+   ${TGT_TOOLS}/bin/gcc -dumpspecs > ${SPECFILE}
+fi
+                                                                                
+grep ${TGT_TOOLS}/lib ${SPECFILE} > /dev/null 2>&1 &&
+{
+   cp ${SPECFILE} ./XX
+   sed -e "s@${TGT_TOOLS}\(\(/lib\(\|32\|64\)\)\(/ld\(\|64\)\.so\.1\|/ld-linux\(\|-ia64\|-x86-64\)\.so\.\(1\|2\)\)\)@\1@g" \
+       -e "/\*startfile_prefix_spec:/{
+           h
+           n
+           s@${TGT_TOOLS}@/usr@g
+           x
+           x }" ./XX > ${SPECFILE}
+   rm -f ./XX
+}
+
Index: scripts/native-scripts/temp-binutils.sh
===================================================================
--- scripts/native-scripts/temp-binutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/temp-binutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,103 @@
+#!/bin/bash
+
+# cross-lfs temporary binutils build
+# ----------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG="binutils-temp.log"
+set_libdirname
+setup_multiarch
+if [ ! "${libedirname}" = "lib" ]; then
+   extra_conf="--libdir=${TGT_TOOLS}/${libdirname}"
+fi
+
+unpack_tarball binutils-${BINUTILS_VER} &&
+
+# Determine whether this binutils requires
+# 'make configure-host' and whether
+# ld search path can be set with --with-lib-path.
+# Returned in ${BINUTILS_CONF_HOST} and
+# ${BINUTILS_WITH_LIB_PATH} respectively
+                                                                                
+# TODO: check for architecture specific patches in check_binutils
+#       ( alpha )
+check_binutils
+
+cd ${SRC}/${PKGDIR}
+
+case ${BINUTILS_VER} in
+   # 20031015 - fix static linking issues during testsuite
+   #            with current CVS glibc. kernel 2.5.68+
+   #            Will only patch HJL 2.14.90.0.[6-7]
+   2.14.90.0.[6-7] ) apply_patch binutils-2.14.90.0.7-fix-static-link ;;
+
+   # Issue with HJL binutils 2.15.94.0.1 stripping needed information
+   # one manifestation is with stripping TLS info from libc.a
+   2.15.94.0.1 ) apply_patch binutils-2.15.94.0.1-fix-strip-1 ;;
+esac
+
+# TODO: This is not gonna cut it for biarch builds... rethink...
+# UPDATE: Fixed with patch below to genscripts
+test Y == "${BINUTILS_WITH_LIB_PATH}" &&
+   BINUTILS_LIB_PATH="--with-lib-path=/lib:/usr/lib" ||
+   BINUTILS_LIB_PATH=""
+
+case ${BINUTILS_VER} in
+   2.14 )
+      apply_patch binutils-2.14-genscripts-multilib
+   ;;
+   2.14.90.0.8 )
+      apply_patch binutils-2.14.90.0.8-genscripts-multilib
+   ;;
+   2.15.9[0124].0.* | 2.15 )
+      apply_patch binutils-2.15.91.0.1-genscripts-multilib
+   ;;
+   2.16* )
+      apply_patch binutils-2.15.91.0.1-genscripts-multilib
+   ;;
+esac
+
+cd ${SRC}
+                                                                                
+# Remove pre-existing build directory and recreate
+test -d binutils-${BINUTILS_VER}-temp-build &&
+   rm -rf binutils-${BINUTILS_VER}-temp-build
+                                                                                
+mkdir binutils-${BINUTILS_VER}-temp-build
+cd binutils-${BINUTILS_VER}-temp-build
+
+max_log_init Binutils ${BINUTILS_VER} temp ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" ../${PKGDIR}/configure \
+   --prefix=${TGT_TOOLS} \
+   --host=${TARGET} \
+   --disable-nls ${extra_conf} \
+   --enable-shared \
+   --enable-64-bit-bfd ${BINUTILS_LIB_PATH} \
+   >> ${LOGFILE} 2>&1 &&
+{
+   # Run make configure-host if required
+   test Y != "${BINUTILS_CONF_HOST}" ||
+   {
+      echo -e "\nmake configure-host\n${BRKLN}" >> ${LOGFILE}
+      make configure-host >> ${LOGFILE} 2>&1
+   }
+} &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o All OK" || barf
+
+# Copy over libiberty.h
+cp -p ${SRC}/${PKGDIR}/include/libiberty.h ${TGT_TOOLS}/include/libiberty.h
Index: scripts/native-scripts/temp-dejagnu.sh
===================================================================
--- scripts/native-scripts/temp-dejagnu.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/temp-dejagnu.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# cross-lfs temporary dejagnu build (for running testsuites)
+# ----------------------------------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=dejagnu-temp.log
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+else
+   BUILD_PREFIX=${TGT_TOOLS}
+fi
+
+unpack_tarball dejagnu-${DEJAGNU_VER} &&
+cd ${PKGDIR}
+
+max_log_init Dejagnu ${DEJAGNU_VER} "temp (shared)" ${CONFLOGS} ${LOG}
+./configure --prefix=${BUILD_PREFIX} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make  \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
Index: scripts/native-scripts/temp-expect-32.sh
===================================================================
--- scripts/native-scripts/temp-expect-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/temp-expect-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+temp-expect.sh
Index: scripts/native-scripts/temp-expect-64.sh
===================================================================
--- scripts/native-scripts/temp-expect-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/temp-expect-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+temp-expect.sh
Index: scripts/native-scripts/temp-expect-n32.sh
===================================================================
--- scripts/native-scripts/temp-expect-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/temp-expect-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+temp-expect.sh
Index: scripts/native-scripts/temp-expect.sh
===================================================================
--- scripts/native-scripts/temp-expect.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/temp-expect.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+# cross-lfs temporary expect build (for running testsuites)
+# ---------------------------------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=expect-temp.log
+
+# Test if the 64 script has been called.
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+else
+   BUILD_PREFIX=${TGT_TOOLS}
+fi
+
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=${BUILD_PREFIX}/${libdirname}"
+fi
+
+unpack_tarball expect-${EXPECT_VER} &&
+cd ${PKGDIR}
+
+case ${EXPECT_VER} in
+   5.3[89]* | 5.40* )
+      #apply_patch expect-${EXPECT_VER}
+      apply_patch expect-5.39.0-spawn
+   ;;
+esac
+
+max_log_init Expect ${EXPECT_VER} "temp (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=${BUILD_PREFIX} \
+   --with-tcl=${BUILD_PREFIX}/${libdirname} \
+   --with-x=no --disable-symbols ${extra_conf} \
+   --cache-file=/dev/null \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+# 1 test may fail... hopefully not a real concern...
+make test \
+   >>  ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg 
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
Index: scripts/native-scripts/temp-perl-32.sh
===================================================================
--- scripts/native-scripts/temp-perl-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/temp-perl-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+temp-perl.sh
Index: scripts/native-scripts/temp-perl-64.sh
===================================================================
--- scripts/native-scripts/temp-perl-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/temp-perl-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+temp-perl.sh
Index: scripts/native-scripts/temp-perl-n32.sh
===================================================================
--- scripts/native-scripts/temp-perl-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/temp-perl-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+temp-perl.sh
Index: scripts/native-scripts/temp-perl.sh
===================================================================
--- scripts/native-scripts/temp-perl.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/temp-perl.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,86 @@
+#!/bin/bash
+
+# cross-lfs temporary perl build (for running testsuites)
+# -------------------------------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=perl-temp.log
+
+# Test if the 64 script has been called.
+# This should only really get called during bi-arch builds
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+
+test "${SELF}" = "temp-perl-64.sh" && LIB64=Y
+
+unpack_tarball perl-${PERL_VER} &&
+cd ${PKGDIR}
+
+chmod u+w hints/linux.sh          # For those not running as a root user
+
+#--------------------------------------------------------------------
+# edit linux.sh
+#--------------------------------------------------------------------
+if [ ! -f hints/linux.sh-ORIG ]; then
+   cp hints/linux.sh hints/linux.sh-ORIG
+fi
+
+sed -e "s@/lib/libc.so.6@${TGT_TOOLS}/${libdirname}/libc.so.6@g" \
+    -e "s@libc=/lib/\$libc@libc=${TGT_TOOLS}/${libdirname}/\$libc@g" \
+    hints/linux.sh-ORIG > hints/linux.sh
+
+# adjust Configure and append to linux.sh if not installing to */lib
+#--------------------------------------------------------------------
+if [ ! "${libdirname}" = "lib" ]; then
+   # We need to adjust Configure so that it understands 
+   # installstyle=lib64/perl5 and sets up directory paths accordingly
+   # NOTE: may need to check how this affects vendor libs...
+   if [ ! -f Configure-ORIG ]; then cp Configure Configure-ORIG ;fi
+   sed "/\*lib\/perl5\*).*/{
+        h
+        s/\([^a-zA-Z]\)lib/\1${libdirname}/g
+        x
+        G }" Configure-ORIG > Configure
+
+   # Now that installstyle can handle lib64, specify our
+   # our installstyle in linux.sh
+   echo "installstyle=\"${libdirname}/perl5\"" >> hints/linux.sh
+fi
+
+echo "locincpth=\"\"
+loclibpth=\"\"
+glibpth=\"${TGT_TOOLS}/${libdirname}\"
+static_ext=\"IO re Fcntl\"" >> hints/linux.sh
+#--------------------------------------------------------------------
+
+cd ${SRC}/${PKGDIR}
+
+max_log_init Perl ${PERL_VER} "temp (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+./configure.gnu --prefix=${TGT_TOOLS} \
+   -Doptimize="-O2 -pipe ${TGT_CFLAGS}" \
+   >> ${LOGFILE} 2>&1 &&
+
+min_log_init ${BUILDLOGS} &&
+make perl \
+   >> ${LOGFILE} 2>&1 &&
+echo -e "${BRKLN}\n" >> ${LOGFILE} &&
+make utilities \
+   >> ${LOGFILE} 2>&1 &&
+
+min_log_init ${INSTLOGS} &&
+{
+   cp perl ${TGT_TOOLS}/bin/perl &&
+   cp pod/pod2man ${TGT_TOOLS}/bin &&
+   mkdir -p ${TGT_TOOLS}/${libdirname}/perl5/${PERL_VER} &&
+   cp -R lib/* ${TGT_TOOLS}/${libdirname}/perl5/${PERL_VER}
+}  >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/native-scripts/temp-tcl-32.sh
===================================================================
--- scripts/native-scripts/temp-tcl-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/temp-tcl-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+temp-tcl.sh
Index: scripts/native-scripts/temp-tcl-64.sh
===================================================================
--- scripts/native-scripts/temp-tcl-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/temp-tcl-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+temp-tcl.sh
Index: scripts/native-scripts/temp-tcl-n32.sh
===================================================================
--- scripts/native-scripts/temp-tcl-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/temp-tcl-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+temp-tcl.sh
Index: scripts/native-scripts/temp-tcl.sh
===================================================================
--- scripts/native-scripts/temp-tcl.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/temp-tcl.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,65 @@
+#!/bin/bash
+
+# cross-lfs temporary tcl build (for running testsuites)
+# ------------------------------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=tcl-temp.log
+
+# Test if the 64 script has been called.
+# This should only really get called during bi-arch builds
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+else
+   BUILD_PREFIX=${TGT_TOOLS}
+fi
+
+unpack_tarball tcl${TCL_VER}-src &&
+cd ${PKGDIR}/unix
+
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=${BUILD_PREFIX}/${libdirname}"
+
+   # Change TCL_LIBRARY in Makefile so it is under $(libdir)
+   test -f Makefile.in-ORIG || cp -p Makefile.in Makefile.in-ORIG
+   sed '/TCL_LIBRARY/s@\$(prefix)/lib@$(libdir)@g' \
+      Makefile.in-ORIG > Makefile.in
+fi
+
+max_log_init Tcl ${TCL_VER} "temp (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+./configure --prefix=${BUILD_PREFIX} ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${TESTLOGS} &&
+make test \
+   >>  ${LOGFILE} 2>&1 &&
+echo " o Test OK" &&
+# clock test may fail... not a real concern for our purposes...
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+# Create symlink for tclsh
+TCLSH=$(basename $(find ${BUILD_PREFIX}/bin -type f -name tclsh\*))
+test "tclsh" != "${TCLSH}" &&
+   ln -sf ./${TCLSH} ${BUILD_PREFIX}/bin/tclsh
+
Index: scripts/native-scripts/temp-texinfo.sh
===================================================================
--- scripts/native-scripts/temp-texinfo.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/temp-texinfo.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# cross-lfs temporary texinfo build
+# ---------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=texinfo-temp.log
+
+unpack_tarball texinfo-${TEXINFO_VER} &&
+cd ${PKGDIR}
+
+max_log_init Texinfo ${TEXINFO_VER} "temp (shared)" ${CONFLOGS} ${LOG}
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=${TGT_TOOLS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" || barf
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >>  ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+make TEXMF=${TGT_TOOLS}/share/texmf install-tex \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Install OK" || barf
+
Index: scripts/native-scripts/temp-vim.sh
===================================================================
--- scripts/native-scripts/temp-vim.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/native-scripts/temp-vim.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+# cross-lfs temporary vim build
+# -----------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=vim-temp.log
+
+unpack_tarball vim-${VIM_VER}
+cd ${PKGDIR}
+
+case ${VIM_VER} in
+   6.[23] )
+      # Set location for vimrc and gvimrc files
+      # ( for < 6.1 we use CPPFLAGS to set this )
+      echo "#define SYS_VIMRC_FILE \"${TGT_TOOLS}/etc/vimrc\"" >> src/feature.h
+      echo "#define SYS_GVIMRC_FILE \"${TGT_TOOLS}/etc/gvimrc\"" >> src/feature.h
+      # here for consistency only
+      makeopts=""
+   ;;
+   6.1 ) 
+      # Remove checks for -I/usr/local/include when setting CPPFLAGS
+      apply_patch vim-${VIM_VER}
+      # Set location for vimrc file
+      makeopts="CPPFLAGS='-DSYS_VIMRC_FILE=\\\"${TGT_TOOLS}/etc/vimrc\\\"'"
+   ;;
+esac
+
+
+max_log_init vim ${VIM_VER} "temp (shared)" ${CONFLOGS} ${LOG}
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=/usr \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+#make CPPFLAGS='-DSYS_VIMRC_FILE=\"/etc/vimrc\"' \
+make ${PMFLAGS} ${makeopts} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install  \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+ln -sf vim /usr/bin/vi
+
+# Do we want to set up vim config here?
+# Seems both good and bad to do it here.
+
Index: scripts/plfs-config
===================================================================
--- scripts/plfs-config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-config	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+plfs-configs/plfs-config-x86_64-native
Index: scripts/plfs-configs/blfs-packages-20050312
===================================================================
--- scripts/plfs-configs/blfs-packages-20050312	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/blfs-packages-20050312	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,18 @@
+export PORTMAP_VER=5beta
+export TCPWRAP_VER=7.6
+export NFSUTILS_VER=1.0.6
+export MIT_KRB5_VER=1.3.5
+export CRACKLIB_VER=2.7
+export LINUX_PAM_VER=0.77
+export BDB_VER=4.2.52
+export OPENSSL_VER=0.9.7d
+export OPENSSH_VER=3.9p1
+export CYRUS_SASL_VER=2.1.20
+export OPENLDAP_VER=2.2.18
+export LIBPNG_VER=1.2.7
+export FREETYPE2_VER=2.1.9
+export EXPAT_VER=1.95.8
+export FONTCONFIG_VER=2.2.3
+export NSSLDAP_VER=226
+export NTP_VER=4.2.0
+export XORG_VER=6.8.1
Index: scripts/plfs-configs/blfs-packages-20050328
===================================================================
--- scripts/plfs-configs/blfs-packages-20050328	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/blfs-packages-20050328	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,18 @@
+export MIT_KRB5_VER=1.4
+export CRACKLIB_VER=2.7
+#There are some issues with pam 0.78 which need investigating
+#Will have to look into it
+#export LINUX_PAM_VER=0.78
+export LINUX_PAM_VER=0.77
+export BDB_VER=4.3.27
+export OPENSSL_VER=0.9.7f
+export OPENSSH_VER=3.9p1
+export CYRUS_SASL_VER=2.1.20
+export OPENLDAP_VER=2.2.24
+export LIBPNG_VER=1.2.8
+export FREETYPE2_VER=2.1.9
+export EXPAT_VER=1.95.8
+export FONTCONFIG_VER=2.3.1
+export NSSLDAP_VER=238
+export NTP_VER=4.2.0
+export XORG_VER=6.8.2
Index: scripts/plfs-configs/blfs-packages-20050419
===================================================================
--- scripts/plfs-configs/blfs-packages-20050419	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/blfs-packages-20050419	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,18 @@
+export MIT_KRB5_VER=1.4
+export CRACKLIB_VER=2.7
+#There are some issues with pam 0.78 which need investigating
+#Will have to look into it
+#export LINUX_PAM_VER=0.78
+export LINUX_PAM_VER=0.77
+export BDB_VER=4.3.27
+export OPENSSL_VER=0.9.7g
+export OPENSSH_VER=4.0p1
+export CYRUS_SASL_VER=2.1.20
+export OPENLDAP_VER=2.2.24
+export LIBPNG_VER=1.2.8
+export FREETYPE2_VER=2.1.9
+export EXPAT_VER=1.95.8
+export FONTCONFIG_VER=2.3.1
+export NSSLDAP_VER=238
+export NTP_VER=4.2.0
+export XORG_VER=6.8.2
Index: scripts/plfs-configs/plfs-config-arm-softfloat
===================================================================
--- scripts/plfs-configs/plfs-config-arm-softfloat	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/plfs-config-arm-softfloat	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,150 @@
+#!/bin/sh
+
+# plfs-config 
+
+# Cross-LFS Build Options 
+#-----------------------------------------------
+#
+# Last Modified
+#	By     :	$LastChangedBy$
+#	Date   :	$LastChangedDate$
+#	Rev No :	$LastChangedRevision$
+#
+
+#-----------------------------
+# Build configuration options
+#-----------------------------
+
+# Set LFS to suit your tree.
+# (ie the mountpoint where your final partition resides)
+export LFS=/mnt/lfs-arm-softfloat
+
+# Set to where you will install the tools
+# that are to run on the host.
+# This will include the cross compiler
+export HST_TOOLS=/home/lfs
+
+# Set this to the location where the target tools
+# are to be installed
+export TGT_TOOLS=/tgt-tools
+
+# Set SRC for your sourcedir, TARBALLS for where you store
+#  your tarballs
+
+export SRC=/home/lfs/src/arm-softloat
+export TARBALLS=/mnt/tarballs
+export PATCHES=/home/lfs/cross-lfs/patches
+export SCRIPTS=/home/lfs/cross-lfs/scripts
+export CONFIGS=/home/lfs/cross-lfs/configs
+
+# Logging
+# Set for base of logging tree
+export LOGS=/home/lfs/logs/arm-softfloat
+
+export CONFLOGS=${LOGS}/conflogs
+export BUILDLOGS=${LOGS}/buildlogs
+export INSTLOGS=${LOGS}/instlogs
+export TESTLOGS=${LOGS}/testlogs
+
+# Set your timezone and locale
+export TZ="Australia/Melbourne"
+export LC_ALL="en_AU"
+
+# Set your umask
+umask 0022
+
+#---------------
+# Cross Options
+#---------------
+
+# set to the target architecture
+export TGT_ARCH=arm
+export TGT_CFLAGS="-mcpu=arm7tdmi -msoft-float"
+# Set to the target architectures target-triple
+export TARGET=armv4l-softfloat-linux-gnu
+
+# set to the target-triple for the host we are building on
+# TODO: This should be set by uname
+export HOST=x86_64-pc-linux-gnu
+# This most of the time will be the same as ${HOST}
+export BUILD=${HOST}
+
+# Set the following to yes if your target has no
+# floating point unit (arm-softfloat)
+export WITHOUT_FPU=Y
+
+# define to the default arch to place into */lib
+# This is NOT necessarily the compilers default.
+# Valid values are 31 (s390), 32 and 64
+export LIBDIRENV=32
+
+# define to what you want to be the default environment for
+# this system.
+export DEFAULTENV=32
+
+#---------------
+# Build Options
+#---------------
+
+# PARALLEL MAKE FLAGS
+#---------------------
+# Set to the desired level of parallelism.
+# eg PMFLAGS="-j 4"
+# If undesired, just set to an empty string.
+#
+export PMFLAGS="-j 3"
+
+# KERNEL HEADERS
+#----------------
+# Set to "Y" to use sanitised headers for building userspace
+# against. Expects linux-libc-headers
+export USE_SANITISED_HEADERS=Y
+
+# GCC
+#-----
+# Change the following to Y if you would like
+# to build gcc without bootstrap for ch5 and 6
+# shared builds ( save a few cycles :-) )
+export NOBOOTSTRAP=N
+
+# Change the following to Y if you would like
+# to build the final gcc with version specific runtime libs.
+export USE_VER_SPEC_RT_LIBS=Y
+
+# Change the following to Y if you would like
+# to build the final gcc with a program suffix
+export USE_PROGRAM_SUFFIX=Y
+
+# Change the following to Y if you want to use the
+# Native Posix Thread Library instead of linuxthreads.
+export USE_NPTL=N
+
+# Are we building a multi-arch toolchain
+export MULTIARCH=N
+
+# MISC
+#------
+# enable to build readline (and build bash against readline) for
+# target-native build
+export USE_READLINE=Y
+
+# enable to use hotplug
+export USE_HOTPLUG=Y
+
+# BOOTLOADERS
+#-------------
+# set only one of the following to "Y"
+export USE_LILO=N
+
+# DEVICES
+#---------
+# Choose method for handling devices.
+#
+# Build will default to using MAKEDEV if nothing is selected here.
+#
+# Set either UDEV to Y for utilising udev (2.5/2.6 kernels only)
+# or DEVFS to Y for using devfs (2.4 kernels, deprecated 2.5 and 2.6)
+#
+export UDEV=Y
+export DEVFS=N
+
Index: scripts/plfs-configs/plfs-config-hypersparc
===================================================================
--- scripts/plfs-configs/plfs-config-hypersparc	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/plfs-config-hypersparc	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,146 @@
+#!/bin/sh
+
+# plfs-config 
+
+# Cross-LFS Build Options 
+#-----------------------------------------------
+#
+# Last Modified
+#	By     :	$LastChangedBy$
+#	Date   :	$LastChangedDate$
+#	Rev No :	$LastChangedRevision$
+#
+
+#-----------------------------
+# Build configuration options
+#-----------------------------
+
+# Set LFS to suit your tree.
+# (ie the mountpoint where your final partition resides)
+export LFS=/mnt/lfs
+
+# Set to where you will install the tools
+# that are to run on the host.
+# This will include the cross compiler
+export HST_TOOLS=/home/`uname -n`/lfs
+
+# Set this to the location where the target tools
+# are to be installed
+export TGT_TOOLS=/tgt-tools
+
+# Set SRC for your sourcedir, TARBALLS for where you store
+#  your tarballs
+
+export SRC=/home/`uname -n`/lfs/src
+export TARBALLS=/mnt/tarballs
+export PATCHES=/home/`uname -n`/lfs/cross-lfs/patches
+export SCRIPTS=/home/`uname -n`/lfs/cross-lfs/scripts
+export CONFIGS=/home/`uname -n`/lfs/cross-lfs/configs
+
+# Logging
+# Set for base of logging tree
+export LOGS=/home/`uname -n`/lfs/logs/hypersparc
+
+export CONFLOGS=${LOGS}/conflogs
+export BUILDLOGS=${LOGS}/buildlogs
+export INSTLOGS=${LOGS}/instlogs
+export TESTLOGS=${LOGS}/testlogs
+
+# Set your timezone and locale
+export TZ="Australia/Melbourne"
+export LC_ALL="en_AU"
+
+# Set your umask
+umask 0022
+
+#---------------
+# Cross Options
+#---------------
+
+# set to the target architecture
+export TGT_ARCH=sparc
+export TGT_CFLAGS="-mcpu=hypersparc -mtune=hypersparc"
+# Set to the target architectures target-triple
+export TARGET=sparc-sun-linux-gnu
+
+# set to the target-triple for the host we are building on
+# TODO: This should be set by uname
+export HOST=sparc-sun-solaris2.9
+# This most of the time will be the same as ${HOST}
+export BUILD=${HOST}
+
+# define to the default arch to place into */lib
+# This is NOT necessarily the compilers default.
+# Valid values are 31 (s390), 32 and 64
+export LIBDIRENV=32
+
+# define to what you want to be the default environment for
+# this system.
+export DEFAULTENV=32
+
+#---------------
+# Build Options
+#---------------
+
+# PARALLEL MAKE FLAGS
+#---------------------
+# Set to the desired level of parallelism.
+# eg PMFLAGS="-j 4"
+# If undesired, just set to an empty string.
+#
+export PMFLAGS="-j 4"
+
+# KERNEL HEADERS
+#----------------
+# Set to "Y" to use sanitised headers for building userspace
+# against. Expects linux-libc-headers
+export USE_SANITISED_HEADERS=Y
+
+# GCC
+#-----
+# Change the following to Y if you would like
+# to build gcc without bootstrap for ch5 and 6
+# shared builds ( save a few cycles :-) )
+export NOBOOTSTRAP=N
+
+# Change the following to Y if you would like
+# to build the final gcc with version specific runtime libs.
+export USE_VER_SPEC_RT_LIBS=Y
+
+# Change the following to Y if you would like
+# to build the final gcc with a program suffix
+export USE_PROGRAM_SUFFIX=Y
+
+# Change the following to Y if you want to use the
+# Native Posix Thread Library instead of linuxthreads.
+export USE_NPTL=N
+
+# Are we building a multi-arch toolchain
+export MULTIARCH=N
+
+# MISC
+#------
+# enable to build readline (and build bash against readline) for
+# target-native build
+export USE_READLINE=Y
+
+# enable to use hotplug
+export USE_HOTPLUG=Y
+
+# BOOTLOADERS
+#-------------
+# set only one of the following to "Y"
+export USE_LILO=N
+
+# DEVICES
+#---------
+# Choose method for handling devices.
+#
+# Build will default to using MAKEDEV if nothing is selected here.
+#
+# Set either UDEV to Y for utilising udev (2.5/2.6 kernels only)
+# or DEVFS to Y for using devfs (2.4 kernels, deprecated 2.5 and 2.6)
+#
+export UDEV=Y
+export DEVFS=N
+
Index: scripts/plfs-configs/plfs-config-i686-lfs-5.1.1
===================================================================
--- scripts/plfs-configs/plfs-config-i686-lfs-5.1.1	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/plfs-config-i686-lfs-5.1.1	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,146 @@
+#!/bin/sh
+
+# plfs-config 
+
+# Cross-LFS Build Options - LFS 5.1.1 i686
+#-----------------------------------------------
+#
+# Last Modified
+#	By     :	$LastChangedBy$
+#	Date   :	$LastChangedDate$
+#	Rev No :	$LastChangedRevision$
+#
+
+#-----------------------------
+# Build configuration options
+#-----------------------------
+
+# Set LFS to suit your tree.
+# (ie the mountpoint where your final partition resides)
+export LFS=/mnt/lfs
+
+# Set to where you will install the tools
+# that are to run on the host.
+# This will include the cross compiler
+export HST_TOOLS=/home/lfs
+
+# Set this to the location where the target tools
+# are to be installed
+export TGT_TOOLS=/tgt-tools
+
+# Set SRC for your sourcedir, TARBALLS for where you store
+#  your tarballs
+
+export SRC=/home/lfs/src
+export TARBALLS=/mnt/tarballs
+export PATCHES=/home/lfs/cross-lfs/patches
+export SCRIPTS=/home/lfs/cross-lfs/scripts
+export CONFIGS=/home/lfs/cross-lfs/configs
+
+# Logging
+# Set for base of logging tree
+export LOGS=/home/lfs/logs
+
+export CONFLOGS=${LOGS}/conflogs
+export BUILDLOGS=${LOGS}/buildlogs
+export INSTLOGS=${LOGS}/instlogs
+export TESTLOGS=${LOGS}/testlogs
+
+# Set your timezone and locale
+export TZ="Australia/Melbourne"
+export LC_ALL="en_AU"
+
+# Set your umask
+umask 0022
+
+#---------------
+# Cross Options
+#---------------
+
+# set to the target architecture
+export TGT_ARCH=i686
+export TGT_CFLAGS=""
+# Set to the target architectures target-triple
+export TARGET=i686-pc-linux-gnu
+
+# set to the target-triple for the host we are building on
+# TODO: This should be set by uname
+export HOST=i686-pc-linux-gnu
+# This most of the time will be the same as ${HOST}
+export BUILD=${HOST}
+
+# define to the default arch to place into */lib
+# This is NOT necessarily the compilers default.
+# Valid values are 31 (s390), 32 and 64
+export LIBDIRENV=32
+
+# define to what you want to be the default environment for
+# this system.
+export DEFAULTENV=32
+
+#---------------
+# Build Options
+#---------------
+
+# PARALLEL MAKE FLAGS
+#---------------------
+# Set to the desired level of parallelism.
+# eg PMFLAGS="-j 4"
+# If undesired, just set to an empty string.
+#
+export PMFLAGS="-j 4"
+
+# KERNEL HEADERS
+#----------------
+# Set to "Y" to use sanitised headers for building userspace
+# against. Expects linux-libc-headers
+export USE_SANITISED_HEADERS=N
+
+# GCC
+#-----
+# Change the following to Y if you would like
+# to build gcc without bootstrap for ch5 and 6
+# shared builds ( save a few cycles :-) )
+export NOBOOTSTRAP=N
+
+# Change the following to Y if you would like
+# to build the final gcc with version specific runtime libs.
+export USE_VER_SPEC_RT_LIBS=Y
+
+# Change the following to Y if you would like
+# to build the final gcc with a program suffix
+export USE_PROGRAM_SUFFIX=Y
+
+# Change the following to Y if you want to use the
+# Native Posix Thread Library instead of linuxthreads.
+export USE_NPTL=N
+
+# Are we building a multi-arch toolchain
+export MULTIARCH=N
+
+# MISC
+#------
+# enable to build readline (and build bash against readline) for
+# target-native build
+export USE_READLINE=N
+
+# enable to use hotplug
+export USE_HOTPLUG=N
+
+# BOOTLOADERS
+#-------------
+# set only one of the following to "Y"
+export USE_LILO=Y
+
+# DEVICES
+#---------
+# Choose method for handling devices.
+#
+# Build will default to using MAKEDEV if nothing is selected here.
+#
+# Set either UDEV to Y for utilising udev (2.5/2.6 kernels only)
+# or DEVFS to Y for using devfs (2.4 kernels, deprecated 2.5 and 2.6)
+#
+export UDEV=N
+export DEVFS=N
+
Index: scripts/plfs-configs/plfs-config-m68k-lfs-5.1.1
===================================================================
--- scripts/plfs-configs/plfs-config-m68k-lfs-5.1.1	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/plfs-config-m68k-lfs-5.1.1	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,146 @@
+#!/bin/sh
+
+# plfs-config 
+
+# Cross-LFS Build Options - LFS 5.1.1 m68k-mac
+#-----------------------------------------------
+#
+# Last Modified
+#	By     :	$LastChangedBy$
+#	Date   :	$LastChangedDate$
+#	Rev No :	$LastChangedRevision$
+#
+
+#-----------------------------
+# Build configuration options
+#-----------------------------
+
+# Set LFS to suit your tree.
+# (ie the mountpoint where your final partition resides)
+export LFS=/mnt/lfs
+
+# Set to where you will install the tools
+# that are to run on the host.
+# This will include the cross compiler
+export HST_TOOLS=/home/lfs
+
+# Set this to the location where the target tools
+# are to be installed
+export TGT_TOOLS=/tgt-tools
+
+# Set SRC for your sourcedir, TARBALLS for where you store
+#  your tarballs
+
+export SRC=/home/lfs/src
+export TARBALLS=/mnt/tarballs
+export PATCHES=/home/lfs/cross-lfs/patches
+export SCRIPTS=/home/lfs/cross-lfs/scripts
+export CONFIGS=/home/lfs/cross-lfs/configs
+
+# Logging
+# Set for base of logging tree
+export LOGS=/home/lfs/logs
+
+export CONFLOGS=${LOGS}/conflogs
+export BUILDLOGS=${LOGS}/buildlogs
+export INSTLOGS=${LOGS}/instlogs
+export TESTLOGS=${LOGS}/testlogs
+
+# Set your timezone and locale
+export TZ="Australia/Melbourne"
+export LC_ALL="en_AU"
+
+# Set your umask
+umask 0022
+
+#---------------
+# Cross Options
+#---------------
+
+# set to the target architecture
+export TGT_ARCH=m68k
+export TGT_CFLAGS=""
+# Set to the target architectures target-triple
+export TARGET=m68k-mac-linux-gnu
+
+# set to the target-triple for the host we are building on
+# TODO: This should be set by uname
+export HOST=i686-pc-linux-gnu
+# This most of the time will be the same as ${HOST}
+export BUILD=${HOST}
+
+# define to the default arch to place into */lib
+# This is NOT necessarily the compilers default.
+# Valid values are 31 (s390), 32 and 64
+export LIBDIRENV=32
+
+# define to what you want to be the default environment for
+# this system.
+export DEFAULTENV=32
+
+#---------------
+# Build Options
+#---------------
+
+# PARALLEL MAKE FLAGS
+#---------------------
+# Set to the desired level of parallelism.
+# eg PMFLAGS="-j 4"
+# If undesired, just set to an empty string.
+#
+export PMFLAGS="-j 4"
+
+# KERNEL HEADERS
+#----------------
+# Set to "Y" to use sanitised headers for building userspace
+# against. Expects linux-libc-headers
+export USE_SANITISED_HEADERS=N
+
+# GCC
+#-----
+# Change the following to Y if you would like
+# to build gcc without bootstrap for ch5 and 6
+# shared builds ( save a few cycles :-) )
+export NOBOOTSTRAP=N
+
+# Change the following to Y if you would like
+# to build the final gcc with version specific runtime libs.
+export USE_VER_SPEC_RT_LIBS=Y
+
+# Change the following to Y if you would like
+# to build the final gcc with a program suffix
+export USE_PROGRAM_SUFFIX=Y
+
+# Change the following to Y if you want to use the
+# Native Posix Thread Library instead of linuxthreads.
+export USE_NPTL=N
+
+# Are we building a multi-arch toolchain
+export MULTIARCH=N
+
+# MISC
+#------
+# enable to build readline (and build bash against readline) for
+# target-native build
+export USE_READLINE=N
+
+# enable to use hotplug
+export USE_HOTPLUG=N
+
+# BOOTLOADERS
+#-------------
+# set only one of the following to "Y"
+export USE_LILO=Y
+
+# DEVICES
+#---------
+# Choose method for handling devices.
+#
+# Build will default to using MAKEDEV if nothing is selected here.
+#
+# Set either UDEV to Y for utilising udev (2.5/2.6 kernels only)
+# or DEVFS to Y for using devfs (2.4 kernels, deprecated 2.5 and 2.6)
+#
+export UDEV=N
+export DEVFS=N
+
Index: scripts/plfs-configs/plfs-config-mips64el
===================================================================
--- scripts/plfs-configs/plfs-config-mips64el	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/plfs-config-mips64el	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,152 @@
+#!/bin/sh
+
+# plfs-config 
+
+# Cross-LFS Build Options 
+#-----------------------------------------------
+#
+# Last Modified
+#	By     :	$LastChangedBy$
+#	Date   :	$LastChangedDate$
+#	Rev No :	$LastChangedRevision$
+#
+
+#-----------------------------
+# Build configuration options
+#-----------------------------
+
+# Set LFS to suit your tree.
+# (ie the mountpoint where your final partition resides)
+export LFS=/mnt/lfs-mips64
+
+# Set to where you will install the tools
+# that are to run on the host.
+# This will include the cross compiler
+export HST_TOOLS=/home/lfs
+
+# Set this to the location where the target tools
+# are to be installed
+export TGT_TOOLS=/tgt-tools
+
+# Set SRC for your sourcedir, TARBALLS for where you store
+#  your tarballs
+
+export SRC=/home/lfs/src/mips64
+export TARBALLS=/mnt/tarballs
+export PATCHES=/home/lfs/cross-lfs/patches
+export SCRIPTS=/home/lfs/cross-lfs/scripts
+export CONFIGS=/home/lfs/cross-lfs/configs
+
+# Logging
+# Set for base of logging tree
+export LOGS=/home/lfs/logs/mips64
+
+export CONFLOGS=${LOGS}/conflogs
+export BUILDLOGS=${LOGS}/buildlogs
+export INSTLOGS=${LOGS}/instlogs
+export TESTLOGS=${LOGS}/testlogs
+
+# Set your timezone and locale
+export TZ="Australia/Melbourne"
+export LC_ALL="en_AU"
+
+# Set your umask
+umask 0022
+
+#---------------
+# Cross Options
+#---------------
+
+# set to the target architecture
+export TGT_ARCH=mips64el
+export TGT_CFLAGS="-mips64"
+# Set to the target architectures target-triple
+export TARGET=mips64el-unknown-linux-gnu
+
+# set to the target-triple for the host we are building on
+# TODO: This should be set by uname
+export HOST=x86_64-pc-linux-gnu
+# This most of the time will be the same as ${HOST}
+export BUILD=${HOST}
+
+# define to the default arch to place into */lib
+# This is NOT necessarily the compilers default.
+# Valid values are 31 (s390), 32 and 64
+export LIBDIRENV=32
+
+# define to what you want to be the default environment for
+# this system.
+export DEFAULTENV=64
+
+#---------------
+# Build Options
+#---------------
+
+# PARALLEL MAKE FLAGS
+#---------------------
+# Set to the desired level of parallelism.
+# eg PMFLAGS="-j 4"
+# If undesired, just set to an empty string.
+#
+export PMFLAGS="-j 3"
+
+# KERNEL HEADERS
+#----------------
+# Set to "Y" to use sanitised headers for building userspace
+# against. Expects linux-libc-headers
+export USE_SANITISED_HEADERS=Y
+
+# SYSROOT OPTIONS
+#----------------
+# Set to Y to do a sysrooted build.
+# Sysroot will be ${LFS}
+export USE_SYSROOT=Y
+
+# GCC
+#-----
+# Change the following to Y if you would like
+# to build gcc without bootstrap for ch5 and 6
+# shared builds ( save a few cycles :-) )
+export NOBOOTSTRAP=N
+
+# Change the following to Y if you would like
+# to build the final gcc with version specific runtime libs.
+export USE_VER_SPEC_RT_LIBS=Y
+
+# Change the following to Y if you would like
+# to build the final gcc with a program suffix
+export USE_PROGRAM_SUFFIX=Y
+
+# Change the following to Y if you want to use the
+# Native Posix Thread Library instead of linuxthreads.
+export USE_NPTL=N
+
+# Are we building a multi-arch toolchain
+export MULTIARCH=Y
+
+# MISC
+#------
+# enable to build readline (and build bash against readline) for
+# target-native build
+export USE_READLINE=Y
+
+# enable to use hotplug
+export USE_HOTPLUG=Y
+
+# BOOTLOADERS
+#-------------
+# set only one of the following to "Y"
+export USE_LILO=N
+
+# DEVICES
+#---------
+# Choose method for handling devices.
+#
+# Build will default to using MAKEDEV if nothing is selected here.
+#
+# Set either UDEV to Y for utilising udev (2.5/2.6 kernels only)
+# or DEVFS to Y for using devfs (2.4 kernels, deprecated 2.5 and 2.6)
+#
+export UDEV=Y
+export DEVFS=N
+
Index: scripts/plfs-configs/plfs-config-mips64el-n32-uniarch
===================================================================
--- scripts/plfs-configs/plfs-config-mips64el-n32-uniarch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/plfs-config-mips64el-n32-uniarch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,152 @@
+#!/bin/sh
+
+# plfs-config 
+
+# Cross-LFS Build Options 
+#-----------------------------------------------
+#
+# Last Modified
+#	By     :	$LastChangedBy$
+#	Date   :	$LastChangedDate$
+#	Rev No :	$LastChangedRevision$
+#
+
+#-----------------------------
+# Build configuration options
+#-----------------------------
+
+# Set LFS to suit your tree.
+# (ie the mountpoint where your final partition resides)
+export LFS=/mnt/lfs-mips64
+
+# Set to where you will install the tools
+# that are to run on the host.
+# This will include the cross compiler
+export HST_TOOLS=/home/lfs
+
+# Set this to the location where the target tools
+# are to be installed
+export TGT_TOOLS=/tgt-tools
+
+# Set SRC for your sourcedir, TARBALLS for where you store
+#  your tarballs
+
+export SRC=/home/lfs/src/mips64
+export TARBALLS=/mnt/tarballs
+export PATCHES=/home/lfs/cross-lfs/patches
+export SCRIPTS=/home/lfs/cross-lfs/scripts
+export CONFIGS=/home/lfs/cross-lfs/configs
+
+# Logging
+# Set for base of logging tree
+export LOGS=/home/lfs/logs/mips64
+
+export CONFLOGS=${LOGS}/conflogs
+export BUILDLOGS=${LOGS}/buildlogs
+export INSTLOGS=${LOGS}/instlogs
+export TESTLOGS=${LOGS}/testlogs
+
+# Set your timezone and locale
+export TZ="Australia/Melbourne"
+export LC_ALL="en_AU"
+
+# Set your umask
+umask 0022
+
+#---------------
+# Cross Options
+#---------------
+
+# set to the target architecture
+export TGT_ARCH=mips64el
+export TGT_CFLAGS="-mips64"
+# Set to the target architectures target-triple
+export TARGET=mips64el-unknown-linux-gnu
+
+# set to the target-triple for the host we are building on
+# TODO: This should be set by uname
+export HOST=x86_64-pc-linux-gnu
+# This most of the time will be the same as ${HOST}
+export BUILD=${HOST}
+
+# define to the default arch to place into */lib
+# This is NOT necessarily the compilers default.
+# Valid values are 31 (s390), 32 and 64
+export LIBDIRENV=n32
+
+# define to what you want to be the default environment for
+# this system.
+export DEFAULTENV=n32
+
+#---------------
+# Build Options
+#---------------
+
+# PARALLEL MAKE FLAGS
+#---------------------
+# Set to the desired level of parallelism.
+# eg PMFLAGS="-j 4"
+# If undesired, just set to an empty string.
+#
+export PMFLAGS="-j 3"
+
+# KERNEL HEADERS
+#----------------
+# Set to "Y" to use sanitised headers for building userspace
+# against. Expects linux-libc-headers
+export USE_SANITISED_HEADERS=Y
+
+# SYSROOT OPTIONS
+#----------------
+# Set to Y to do a sysrooted build.
+# Sysroot will be ${LFS}
+export USE_SYSROOT=N
+
+# GCC
+#-----
+# Change the following to Y if you would like
+# to build gcc without bootstrap for ch5 and 6
+# shared builds ( save a few cycles :-) )
+export NOBOOTSTRAP=N
+
+# Change the following to Y if you would like
+# to build the final gcc with version specific runtime libs.
+export USE_VER_SPEC_RT_LIBS=Y
+
+# Change the following to Y if you would like
+# to build the final gcc with a program suffix
+export USE_PROGRAM_SUFFIX=Y
+
+# Change the following to Y if you want to use the
+# Native Posix Thread Library instead of linuxthreads.
+export USE_NPTL=N
+
+# Are we building a multi-arch toolchain
+export MULTIARCH=N
+
+# MISC
+#------
+# enable to build readline (and build bash against readline) for
+# target-native build
+export USE_READLINE=Y
+
+# enable to use hotplug
+export USE_HOTPLUG=Y
+
+# BOOTLOADERS
+#-------------
+# set only one of the following to "Y"
+export USE_LILO=N
+
+# DEVICES
+#---------
+# Choose method for handling devices.
+#
+# Build will default to using MAKEDEV if nothing is selected here.
+#
+# Set either UDEV to Y for utilising udev (2.5/2.6 kernels only)
+# or DEVFS to Y for using devfs (2.4 kernels, deprecated 2.5 and 2.6)
+#
+export UDEV=Y
+export DEVFS=N
+
Index: scripts/plfs-configs/plfs-config-powerpc64
===================================================================
--- scripts/plfs-configs/plfs-config-powerpc64	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/plfs-config-powerpc64	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,146 @@
+#!/bin/sh
+
+# plfs-config 
+
+# Cross-LFS Build Options 
+#-----------------------------------------------
+#
+# Last Modified
+#	By     :	$LastChangedBy$
+#	Date   :	$LastChangedDate$
+#	Rev No :	$LastChangedRevision$
+#
+
+#-----------------------------
+# Build configuration options
+#-----------------------------
+
+# Set LFS to suit your tree.
+# (ie the mountpoint where your final partition resides)
+export LFS=/mnt/lfs
+
+# Set to where you will install the tools
+# that are to run on the host.
+# This will include the cross compiler
+export HST_TOOLS=/home/lfs
+
+# Set this to the location where the target tools
+# are to be installed
+export TGT_TOOLS=/tgt-tools
+
+# Set SRC for your sourcedir, TARBALLS for where you store
+#  your tarballs
+
+export SRC=/home/lfs/src
+export TARBALLS=/mnt/tarballs
+export PATCHES=/home/lfs/cross-lfs/patches
+export SCRIPTS=/home/lfs/cross-lfs/scripts
+export CONFIGS=/home/lfs/cross-lfs/configs
+
+# Logging
+# Set for base of logging tree
+export LOGS=/home/lfs/logs/powerpc64
+
+export CONFLOGS=${LOGS}/conflogs
+export BUILDLOGS=${LOGS}/buildlogs
+export INSTLOGS=${LOGS}/instlogs
+export TESTLOGS=${LOGS}/testlogs
+
+# Set your timezone and locale
+export TZ="Australia/Melbourne"
+export LC_ALL="en_AU"
+
+# Set your umask
+umask 0022
+
+#---------------
+# Cross Options
+#---------------
+
+# set to the target architecture
+export TGT_ARCH=powerpc64
+export TGT_CFLAGS=""
+# Set to the target architectures target-triple
+export TARGET=powerpc64-unknown-linux-gnu
+
+# set to the target-triple for the host we are building on
+# TODO: This should be set by uname
+export HOST=x86_64-pc-linux-gnu
+# This most of the time will be the same as ${HOST}
+export BUILD=${HOST}
+
+# define to the default arch to place into */lib
+# This is NOT necessarily the compilers default.
+# Valid values are 31 (s390), 32 and 64
+export LIBDIRENV=32
+
+# define to what you want to be the default environment for
+# this system.
+export DEFAULTENV=64
+
+#---------------
+# Build Options
+#---------------
+
+# PARALLEL MAKE FLAGS
+#---------------------
+# Set to the desired level of parallelism.
+# eg PMFLAGS="-j 4"
+# If undesired, just set to an empty string.
+#
+export PMFLAGS="-j 4"
+
+# KERNEL HEADERS
+#----------------
+# Set to "Y" to use sanitised headers for building userspace
+# against. Expects linux-libc-headers
+export USE_SANITISED_HEADERS=Y
+
+# GCC
+#-----
+# Change the following to Y if you would like
+# to build gcc without bootstrap for ch5 and 6
+# shared builds ( save a few cycles :-) )
+export NOBOOTSTRAP=N
+
+# Change the following to Y if you would like
+# to build the final gcc with version specific runtime libs.
+export USE_VER_SPEC_RT_LIBS=Y
+
+# Change the following to Y if you would like
+# to build the final gcc with a program suffix
+export USE_PROGRAM_SUFFIX=Y
+
+# Change the following to Y if you want to use the
+# Native Posix Thread Library instead of linuxthreads.
+export USE_NPTL=Y
+
+# Are we building a multi-arch toolchain
+export MULTIARCH=Y
+
+# MISC
+#------
+# enable to build readline (and build bash against readline) for
+# target-native build
+export USE_READLINE=Y
+
+# enable to use hotplug
+export USE_HOTPLUG=Y
+
+# BOOTLOADERS
+#-------------
+# set only one of the following to "Y"
+export USE_LILO=N
+
+# DEVICES
+#---------
+# Choose method for handling devices.
+#
+# Build will default to using MAKEDEV if nothing is selected here.
+#
+# Set either UDEV to Y for utilising udev (2.5/2.6 kernels only)
+# or DEVFS to Y for using devfs (2.4 kernels, deprecated 2.5 and 2.6)
+#
+export UDEV=Y
+export DEVFS=N
+
Index: scripts/plfs-configs/plfs-config-ppc750
===================================================================
--- scripts/plfs-configs/plfs-config-ppc750	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/plfs-config-ppc750	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,146 @@
+#!/bin/sh
+
+# plfs-config 
+
+# Cross-LFS Build Options 
+#-----------------------------------------------
+#
+# Last Modified
+#	By     :	$LastChangedBy$
+#	Date   :	$LastChangedDate$
+#	Rev No :	$LastChangedRevision$
+#
+
+#-----------------------------
+# Build configuration options
+#-----------------------------
+
+# Set LFS to suit your tree.
+# (ie the mountpoint where your final partition resides)
+export LFS=/mnt/lfs
+
+# Set to where you will install the tools
+# that are to run on the host.
+# This will include the cross compiler
+export HST_TOOLS=/home/lfs
+
+# Set this to the location where the target tools
+# are to be installed
+export TGT_TOOLS=/tgt-tools
+
+# Set SRC for your sourcedir, TARBALLS for where you store
+#  your tarballs
+
+export SRC=/home/lfs/src
+export TARBALLS=/mnt/tarballs
+export PATCHES=/home/lfs/cross-lfs/patches
+export SCRIPTS=/home/lfs/cross-lfs/scripts
+export CONFIGS=/home/lfs/cross-lfs/configs
+
+# Logging
+# Set for base of logging tree
+export LOGS=/home/lfs/logs/ppc750
+
+export CONFLOGS=${LOGS}/conflogs
+export BUILDLOGS=${LOGS}/buildlogs
+export INSTLOGS=${LOGS}/instlogs
+export TESTLOGS=${LOGS}/testlogs
+
+# Set your timezone and locale
+export TZ="Australia/Melbourne"
+export LC_ALL="en_AU"
+
+# Set your umask
+umask 0022
+
+#---------------
+# Cross Options
+#---------------
+
+# set to the target architecture
+export TGT_ARCH=powerpc
+export TGT_CFLAGS="-mpowerpc -mcpu=750 -mtune=750"
+# Set to the target architectures target-triple
+export TARGET=powerpc-mac-linux-gnu
+
+# set to the target-triple for the host we are building on
+# TODO: This should be set by uname
+export HOST=x86_64-pc-linux-gnu
+# This most of the time will be the same as ${HOST}
+export BUILD=${HOST}
+
+# define to the default arch to place into */lib
+# This is NOT necessarily the compilers default.
+# Valid values are 31 (s390), 32 and 64
+export LIBDIRENV=32
+
+# define to what you want to be the default environment for
+# this system.
+export DEFAULTENV=32
+
+#---------------
+# Build Options
+#---------------
+
+# PARALLEL MAKE FLAGS
+#---------------------
+# Set to the desired level of parallelism.
+# eg PMFLAGS="-j 4"
+# If undesired, just set to an empty string.
+#
+export PMFLAGS="-j 4"
+
+# KERNEL HEADERS
+#----------------
+# Set to "Y" to use sanitised headers for building userspace
+# against. Expects linux-libc-headers
+export USE_SANITISED_HEADERS=Y
+
+# GCC
+#-----
+# Change the following to Y if you would like
+# to build gcc without bootstrap for ch5 and 6
+# shared builds ( save a few cycles :-) )
+export NOBOOTSTRAP=N
+
+# Change the following to Y if you would like
+# to build the final gcc with version specific runtime libs.
+export USE_VER_SPEC_RT_LIBS=Y
+
+# Change the following to Y if you would like
+# to build the final gcc with a program suffix
+export USE_PROGRAM_SUFFIX=Y
+
+# Change the following to Y if you want to use the
+# Native Posix Thread Library instead of linuxthreads.
+export USE_NPTL=Y
+
+# Are we building a multi-arch toolchain
+export MULTIARCH=N
+
+# MISC
+#------
+# enable to build readline (and build bash against readline) for
+# target-native build
+export USE_READLINE=Y
+
+# enable to use hotplug
+export USE_HOTPLUG=Y
+
+# BOOTLOADERS
+#-------------
+# set only one of the following to "Y"
+export USE_LILO=N
+
+# DEVICES
+#---------
+# Choose method for handling devices.
+#
+# Build will default to using MAKEDEV if nothing is selected here.
+#
+# Set either UDEV to Y for utilising udev (2.5/2.6 kernels only)
+# or DEVFS to Y for using devfs (2.4 kernels, deprecated 2.5 and 2.6)
+#
+export UDEV=Y
+export DEVFS=N
+
Index: scripts/plfs-configs/plfs-config-sparc64
===================================================================
--- scripts/plfs-configs/plfs-config-sparc64	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/plfs-config-sparc64	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,146 @@
+#!/bin/sh
+
+# plfs-config 
+
+# Cross-LFS Build Options 
+#-----------------------------------------------
+#
+# Last Modified
+#	By     :	$LastChangedBy$
+#	Date   :	$LastChangedDate$
+#	Rev No :	$LastChangedRevision$
+#
+
+#-----------------------------
+# Build configuration options
+#-----------------------------
+
+# Set LFS to suit your tree.
+# (ie the mountpoint where your final partition resides)
+export LFS=/mnt/lfs-sparc64
+
+# Set to where you will install the tools
+# that are to run on the host.
+# This will include the cross compiler
+export HST_TOOLS=/home/lfs
+
+# Set this to the location where the target tools
+# are to be installed
+export TGT_TOOLS=/tgt-tools
+
+# Set SRC for your sourcedir, TARBALLS for where you store
+#  your tarballs
+
+export SRC=/home/lfs/src/sparc64
+export TARBALLS=/mnt/tarballs
+export PATCHES=/home/lfs/cross-lfs/patches
+export SCRIPTS=/home/lfs/cross-lfs/scripts
+export CONFIGS=/home/lfs/cross-lfs/configs
+
+# Logging
+# Set for base of logging tree
+export LOGS=/home/lfs/logs/sparc64
+
+export CONFLOGS=${LOGS}/conflogs
+export BUILDLOGS=${LOGS}/buildlogs
+export INSTLOGS=${LOGS}/instlogs
+export TESTLOGS=${LOGS}/testlogs
+
+# Set your timezone and locale
+export TZ="Australia/Melbourne"
+export LC_ALL="en_AU"
+
+# Set your umask
+umask 0022
+
+#---------------
+# Cross Options
+#---------------
+
+# set to the target architecture
+export TGT_ARCH=sparc
+export TGT_CFLAGS="-mcpu=ultrasparc -mtune=ultrasparc"
+# Set to the target architectures target-triple
+export TARGET=sparc64-sun-linux-gnu
+
+# set to the target-triple for the host we are building on
+# TODO: This should be set by uname
+export HOST=x86_64-pc-linux-gnu
+# This most of the time will be the same as ${HOST}
+export BUILD=${HOST}
+
+# define to the default arch to place into */lib
+# This is NOT necessarily the compilers default.
+# Valid values are 31 (s390), 32 and 64
+export LIBDIRENV=32
+
+# define to what you want to be the default environment for
+# this system.
+export DEFAULTENV=64
+
+#---------------
+# Build Options
+#---------------
+
+# PARALLEL MAKE FLAGS
+#---------------------
+# Set to the desired level of parallelism.
+# eg PMFLAGS="-j 4"
+# If undesired, just set to an empty string.
+#
+export PMFLAGS="-j 4"
+
+# KERNEL HEADERS
+#----------------
+# Set to "Y" to use sanitised headers for building userspace
+# against. Expects linux-libc-headers
+export USE_SANITISED_HEADERS=Y
+
+# GCC
+#-----
+# Change the following to Y if you would like
+# to build gcc without bootstrap for ch5 and 6
+# shared builds ( save a few cycles :-) )
+export NOBOOTSTRAP=N
+
+# Change the following to Y if you would like
+# to build the final gcc with version specific runtime libs.
+export USE_VER_SPEC_RT_LIBS=Y
+
+# Change the following to Y if you would like
+# to build the final gcc with a program suffix
+export USE_PROGRAM_SUFFIX=Y
+
+# Change the following to Y if you want to use the
+# Native Posix Thread Library instead of linuxthreads.
+export USE_NPTL=N
+
+# Are we building a multi-arch toolchain
+export MULTIARCH=Y
+
+# MISC
+#------
+# enable to build readline (and build bash against readline) for
+# target-native build
+export USE_READLINE=Y
+
+# enable to use hotplug
+export USE_HOTPLUG=Y
+
+# BOOTLOADERS
+#-------------
+# set only one of the following to "Y"
+export USE_LILO=N
+
+# DEVICES
+#---------
+# Choose method for handling devices.
+#
+# Build will default to using MAKEDEV if nothing is selected here.
+#
+# Set either UDEV to Y for utilising udev (2.5/2.6 kernels only)
+# or DEVFS to Y for using devfs (2.4 kernels, deprecated 2.5 and 2.6)
+#
+export UDEV=Y
+export DEVFS=N
+
Index: scripts/plfs-configs/plfs-config-sparcv9
===================================================================
--- scripts/plfs-configs/plfs-config-sparcv9	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/plfs-config-sparcv9	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,146 @@
+#!/bin/sh
+
+# plfs-config 
+
+# Cross-LFS Build Options 
+#-----------------------------------------------
+#
+# Last Modified
+#	By     :	$LastChangedBy$
+#	Date   :	$LastChangedDate$
+#	Rev No :	$LastChangedRevision$
+#
+
+#-----------------------------
+# Build configuration options
+#-----------------------------
+
+# Set LFS to suit your tree.
+# (ie the mountpoint where your final partition resides)
+export LFS=/mnt/lfs-sparcv9
+
+# Set to where you will install the tools
+# that are to run on the host.
+# This will include the cross compiler
+export HST_TOOLS=/home/lfs
+
+# Set this to the location where the target tools
+# are to be installed
+export TGT_TOOLS=/tgt-tools
+
+# Set SRC for your sourcedir, TARBALLS for where you store
+#  your tarballs
+
+export SRC=/home/lfs/src/sparcv9
+export TARBALLS=/mnt/tarballs
+export PATCHES=/home/lfs/cross-lfs/patches
+export SCRIPTS=/home/lfs/cross-lfs/scripts
+export CONFIGS=/home/lfs/cross-lfs/configs
+
+# Logging
+# Set for base of logging tree
+export LOGS=/home/lfs/logs/sparcv9
+
+export CONFLOGS=${LOGS}/conflogs
+export BUILDLOGS=${LOGS}/buildlogs
+export INSTLOGS=${LOGS}/instlogs
+export TESTLOGS=${LOGS}/testlogs
+
+# Set your timezone and locale
+export TZ="Australia/Melbourne"
+export LC_ALL="en_AU"
+
+# Set your umask
+umask 0022
+
+#---------------
+# Cross Options
+#---------------
+
+# set to the target architecture
+export TGT_ARCH=sparc
+export TGT_CFLAGS="-mcpu=ultrasparc -mtune=ultrasparc"
+# Set to the target architectures target-triple
+export TARGET=sparcv9-sun-linux-gnu
+
+# set to the target-triple for the host we are building on
+# TODO: This should be set by uname
+export HOST=x86_64-pc-linux-gnu
+# This most of the time will be the same as ${HOST}
+export BUILD=${HOST}
+
+# define to the default arch to place into */lib
+# This is NOT necessarily the compilers default.
+# Valid values are 31 (s390), 32 and 64
+export LIBDIRENV=32
+
+# define to what you want to be the default environment for
+# this system.
+export DEFAULTENV=64
+
+#---------------
+# Build Options
+#---------------
+
+# PARALLEL MAKE FLAGS
+#---------------------
+# Set to the desired level of parallelism.
+# eg PMFLAGS="-j 4"
+# If undesired, just set to an empty string.
+#
+export PMFLAGS="-j 4"
+
+# KERNEL HEADERS
+#----------------
+# Set to "Y" to use sanitised headers for building userspace
+# against. Expects linux-libc-headers
+export USE_SANITISED_HEADERS=Y
+
+# GCC
+#-----
+# Change the following to Y if you would like
+# to build gcc without bootstrap for ch5 and 6
+# shared builds ( save a few cycles :-) )
+export NOBOOTSTRAP=N
+
+# Change the following to Y if you would like
+# to build the final gcc with version specific runtime libs.
+export USE_VER_SPEC_RT_LIBS=Y
+
+# Change the following to Y if you would like
+# to build the final gcc with a program suffix
+export USE_PROGRAM_SUFFIX=Y
+
+# Change the following to Y if you want to use the
+# Native Posix Thread Library instead of linuxthreads.
+export USE_NPTL=Y
+
+# Are we building a multi-arch toolchain
+export MULTIARCH=N
+
+# MISC
+#------
+# enable to build readline (and build bash against readline) for
+# target-native build
+export USE_READLINE=Y
+
+# enable to use hotplug
+export USE_HOTPLUG=Y
+
+# BOOTLOADERS
+#-------------
+# set only one of the following to "Y"
+export USE_LILO=N
+
+# DEVICES
+#---------
+# Choose method for handling devices.
+#
+# Build will default to using MAKEDEV if nothing is selected here.
+#
+# Set either UDEV to Y for utilising udev (2.5/2.6 kernels only)
+# or DEVFS to Y for using devfs (2.4 kernels, deprecated 2.5 and 2.6)
+#
+export UDEV=Y
+export DEVFS=N
+
Index: scripts/plfs-configs/plfs-config-x86-native
===================================================================
--- scripts/plfs-configs/plfs-config-x86-native	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/plfs-config-x86-native	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,146 @@
+#!/bin/sh
+
+# plfs-config 
+
+# Cross-LFS Build Options 
+#-----------------------------------------------
+#
+# Last Modified
+#	By     :	$LastChangedBy$
+#	Date   :	$LastChangedDate$
+#	Rev No :	$LastChangedRevision$
+#
+
+#-----------------------------
+# Build configuration options
+#-----------------------------
+
+# Set LFS to suit your tree.
+# (ie the mountpoint where your final partition resides)
+export LFS=/mnt/lfs
+
+# Set to where you will install the tools
+# that are to run on the host.
+# This will include the cross compiler
+export HST_TOOLS=/home/lfs
+
+# Set this to the location where the target tools
+# are to be installed
+export TGT_TOOLS=/tgt-tools
+
+# Set SRC for your sourcedir, TARBALLS for where you store
+#  your tarballs
+
+export SRC=/home/lfs/src
+export TARBALLS=/mnt/tarballs
+export PATCHES=/home/lfs/cross-lfs/patches
+export SCRIPTS=/home/lfs/cross-lfs/scripts
+export CONFIGS=/home/lfs/cross-lfs/configs
+
+# Logging
+# Set for base of logging tree
+export LOGS=/home/lfs/logs
+
+export CONFLOGS=${LOGS}/conflogs
+export BUILDLOGS=${LOGS}/buildlogs
+export INSTLOGS=${LOGS}/instlogs
+export TESTLOGS=${LOGS}/testlogs
+
+# Set your timezone and locale
+export TZ="Australia/Melbourne"
+export LC_ALL="en_AU"
+
+# Set your umask
+umask 0022
+
+#---------------
+# Cross Options
+#---------------
+
+# set to the target architecture
+export TGT_ARCH=i686
+export TGT_CFLAGS=""
+# Set to the target architectures target-triple
+export TARGET=i686-pc-linux-gnu
+
+# set to the target-triple for the host we are building on
+# TODO: This should be set by uname
+export HOST=i686-pc-linux-gnu
+# This most of the time will be the same as ${HOST}
+export BUILD=${HOST}
+
+# define to the default arch to place into */lib
+# This is NOT necessarily the compilers default.
+# Valid values are 31 (s390), 32 and 64
+export LIBDIRENV=32
+
+# define to what you want to be the default environment for
+# this system.
+export DEFAULTENV=32
+
+#---------------
+# Build Options
+#---------------
+
+# PARALLEL MAKE FLAGS
+#---------------------
+# Set to the desired level of parallelism.
+# eg PMFLAGS="-j 4"
+# If undesired, just set to an empty string.
+#
+export PMFLAGS="-j 4"
+
+# KERNEL HEADERS
+#----------------
+# Set to "Y" to use sanitised headers for building userspace
+# against. Expects linux-libc-headers
+export USE_SANITISED_HEADERS=Y
+
+# GCC
+#-----
+# Change the following to Y if you would like
+# to build gcc without bootstrap for ch5 and 6
+# shared builds ( save a few cycles :-) )
+export NOBOOTSTRAP=N
+
+# Change the following to Y if you would like
+# to build the final gcc with version specific runtime libs.
+export USE_VER_SPEC_RT_LIBS=Y
+
+# Change the following to Y if you would like
+# to build the final gcc with a program suffix
+export USE_PROGRAM_SUFFIX=Y
+
+# Change the following to Y if you want to use the
+# Native Posix Thread Library instead of linuxthreads.
+export USE_NPTL=Y
+
+# Are we building a multi-arch toolchain
+export MULTIARCH=N
+
+# MISC
+#------
+# enable to build readline (and build bash against readline) for
+# target-native build
+export USE_READLINE=Y
+
+# enable to use hotplug
+export USE_HOTPLUG=Y
+
+# BOOTLOADERS
+#-------------
+# set only one of the following to "Y"
+export USE_LILO=Y
+
+# DEVICES
+#---------
+# Choose method for handling devices.
+#
+# Build will default to using MAKEDEV if nothing is selected here.
+#
+# Set either UDEV to Y for utilising udev (2.5/2.6 kernels only)
+# or DEVFS to Y for using devfs (2.4 kernels, deprecated 2.5 and 2.6)
+#
+export UDEV=Y
+export DEVFS=N
+
Index: scripts/plfs-configs/plfs-config-x86_64-native
===================================================================
--- scripts/plfs-configs/plfs-config-x86_64-native	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/plfs-config-x86_64-native	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,146 @@
+#!/bin/sh
+
+# plfs-config 
+
+# Cross-LFS Build Options 
+#-----------------------------------------------
+#
+# Last Modified
+#	By     :	$LastChangedBy$
+#	Date   :	$LastChangedDate$
+#	Rev No :	$LastChangedRevision$
+#
+
+#-----------------------------
+# Build configuration options
+#-----------------------------
+
+# Set LFS to suit your tree.
+# (ie the mountpoint where your final partition resides)
+export LFS=/mnt/lfs-x86_64
+
+# Set to where you will install the tools
+# that are to run on the host.
+# This will include the cross compiler
+export HST_TOOLS=/home/lfs
+
+# Set this to the location where the target tools
+# are to be installed
+export TGT_TOOLS=/tgt-tools
+
+# Set SRC for your sourcedir, TARBALLS for where you store
+#  your tarballs
+
+export SRC=/home/lfs/src/x86_64
+export TARBALLS=/mnt/tarballs
+export PATCHES=/home/lfs/cross-lfs/patches
+export SCRIPTS=/home/lfs/cross-lfs/scripts
+export CONFIGS=/home/lfs/cross-lfs/configs
+
+# Logging
+# Set for base of logging tree
+export LOGS=/home/lfs/logs/x86_64
+
+export CONFLOGS=${LOGS}/conflogs
+export BUILDLOGS=${LOGS}/buildlogs
+export INSTLOGS=${LOGS}/instlogs
+export TESTLOGS=${LOGS}/testlogs
+
+# Set your timezone and locale
+export TZ="Australia/Melbourne"
+export LC_ALL="en_AU"
+
+# Set your umask
+umask 0022
+
+#---------------
+# Cross Options
+#---------------
+
+# set to the target architecture
+export TGT_ARCH=x86_64
+export TGT_CFLAGS="-march=athlon64"
+# Set to the target architectures target-triple
+export TARGET=x86_64-pc-linux-gnu
+
+# set to the target-triple for the host we are building on
+# TODO: This should be set by uname
+export HOST=x86_64-pc-linux-gnu
+# This most of the time will be the same as ${HOST}
+export BUILD=${HOST}
+
+# define to the default arch to place into */lib
+# This is NOT necessarily the compilers default.
+# Valid values are 31 (s390), 32 and 64
+export LIBDIRENV=32
+
+# define to what you want to be the default environment for
+# this system.
+export DEFAULTENV=64
+
+#---------------
+# Build Options
+#---------------
+
+# PARALLEL MAKE FLAGS
+#---------------------
+# Set to the desired level of parallelism.
+# eg PMFLAGS="-j 4"
+# If undesired, just set to an empty string.
+#
+export PMFLAGS="-j 3"
+
+# KERNEL HEADERS
+#----------------
+# Set to "Y" to use sanitised headers for building userspace
+# against. Expects linux-libc-headers
+export USE_SANITISED_HEADERS=Y
+
+# GCC
+#-----
+# Change the following to Y if you would like
+# to build gcc without bootstrap for ch5 and 6
+# shared builds ( save a few cycles :-) )
+export NOBOOTSTRAP=N
+
+# Change the following to Y if you would like
+# to build the final gcc with version specific runtime libs.
+export USE_VER_SPEC_RT_LIBS=Y
+
+# Change the following to Y if you would like
+# to build the final gcc with a program suffix
+export USE_PROGRAM_SUFFIX=Y
+
+# Change the following to Y if you want to use the
+# Native Posix Thread Library instead of linuxthreads.
+export USE_NPTL=Y
+
+# Are we building a multi-arch toolchain
+export MULTIARCH=Y
+
+# MISC
+#------
+# enable to build readline (and build bash against readline) for
+# target-native build
+export USE_READLINE=Y
+
+# enable to use hotplug
+export USE_HOTPLUG=Y
+
+# BOOTLOADERS
+#-------------
+# set only one of the following to "Y"
+export USE_LILO=Y
+
+# DEVICES
+#---------
+# Choose method for handling devices.
+#
+# Build will default to using MAKEDEV if nothing is selected here.
+#
+# Set either UDEV to Y for utilising udev (2.5/2.6 kernels only)
+# or DEVFS to Y for using devfs (2.4 kernels, deprecated 2.5 and 2.6)
+#
+export UDEV=Y
+export DEVFS=N
+
Index: scripts/plfs-configs/plfs-packages-20040217
===================================================================
--- scripts/plfs-configs/plfs-packages-20040217	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/plfs-packages-20040217	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# plfs-packages
+
+# Package Version Information - 20040217 build 
+#-----------------------------------------------
+#
+# Last Modified
+#	By     :	$LastChangedBy$
+#	Date   :	$LastChangedDate$
+#	Rev No :	$LastChangedRevision$
+#
+
+# There are 2 binutils listed here.
+# NATIVE_BINUTILS_VER is used only when building a native binutils
+# on a non linux system when BINUTILS_VER is non FSF (ie HJL)
+# This is sorted out at the end of this script.
+
+export AUTOCONF_VER=2.59		# chapter 6
+export AUTOMAKE_VER=1.8.2		# chapter 6
+export BASH_VER=2.05b
+export BIN86_VER=0.16.11
+export BINUTILS_VER=2.14.90.0.8		# can be either FSF or HJL Binutils
+export BISON_VER=1.875a
+export BZIP2_VER=1.0.2
+export COREUTILS_VER=5.0
+export DEJAGNU_VER=1.4.4
+export DIFFUTILS_VER=2.8.4
+export E2FSPROGS_VER=1.34		# chapter 6
+export ED_VER=0.2			# chapter 6
+export EXPECT_VER=5.40.0
+export FILE_VER=4.07			# chapter 6
+export FINDUTILS_VER=4.2.10
+export FLEX_VER=2.5.27
+export GAWK_VER=3.1.3
+export GCC_VER=3.3.3
+export GETTEXT_VER=0.14.1
+export GLIBC_VER=2.3.3-lfs-rc2
+export GREP_VER=2.5.1
+export GROFF_VER=1.19			# chapter 6
+export GZIP_VER=1.3.5
+export HOTPLUG_VER=""
+export IANA_ETC_VER=""
+export INETUTILS_VER=1.4.2		# chapter 6
+export IPROUTE2_VER=""
+export KBD_VER=1.12			# chapter 6
+export KERNEL_VER=2.6.3
+export LESS_VER=381			# chapter 6
+export LFS_BS_VER=1.12			# chapter 6
+export LIBTOOL_VER=1.5.2		# chapter 6
+export LILO_VER=22.5.1
+export LINUX_LIBC_HDRS_VER=""
+export M4_VER=1.4
+export MAKEDEV_VER=1.7
+export MAKE_DEVICES_VER=1.2
+export MAKE_VER=3.80
+export MAN_VER=1.5m2			# chapter 6
+export MODUTILS_VER=2.4.26		# chapter 6
+export MODINITTOOLS_VER=3.0-pre7	# chapter 6
+export NASM_VER=0.98.36
+export NATIVE_BINUTILS_VER=2.14		# FSF binutils versions only
+export NCURSES_VER=5.3
+export NETTOOLS_VER=1.60		# chapter 6
+export NFSUTILS_VER=""
+export PATCH_VER=2.5.9
+export PERL_VER=5.8.3
+export PORTMAP_VER=""
+export PROCINFO_VER=18			# chapter 6
+export PROCPS_VER=3.1.15		# chapter 6
+export PSMISC_VER=21.4			# chapter 6
+export READLINE_VER=""
+export SED_VER=4.0.9
+export SHADOW_VER=4.0.4.1		# chapter 6
+export STRACE_VER=""
+export SYSKLOGD_VER=1.4.1		# chapter 6
+export SYSVINIT_VER=2.85		# chapter 6
+export TAR_VER=1.13.25
+export TCPWRAP_VER=""
+export TCL_VER=8.4.5
+export TEXINFO_VER=4.6
+export UDEV_VER=""
+export UTILLINUX_VER=2.12
+export VIM_VER=6.2			# chapter 6
+export ZLIB_VER=1.2.1
+
+# Sort out NATIVE_BINUTILS_VER for native builds
+hostos=`uname`
+if [ ! "${hostos}" = "Linux" ]; then
+   # Not linux, cannot use HJL
+   case ${BINUTILS_VER} in
+      *.9[0-9].[0-9]* )
+      ;;
+      * )
+         export NATIVE_BINUTILS_VER=${BINUTILS_VER}
+      ;;
+   esac
+fi
Index: scripts/plfs-configs/plfs-packages-20040930
===================================================================
--- scripts/plfs-configs/plfs-packages-20040930	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/plfs-packages-20040930	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# plfs-packages
+
+# Package Version Information - 20040930 build 
+#-----------------------------------------------
+#
+# Last Modified
+#	By     :	$LastChangedBy$
+#	Date   :	$LastChangedDate$
+#	Rev No :	$LastChangedRevision$
+#
+
+# There are 2 binutils listed here.
+# NATIVE_BINUTILS_VER is used only when building a native binutils
+# on a non linux system when BINUTILS_VER is non FSF (ie HJL)
+# This is sorted out at the end of this script.
+
+export AUTOCONF_VER=2.59		# chapter 6
+export AUTOMAKE_VER=1.9			# chapter 6
+export BASH_VER=3.0
+export BIN86_VER=0.16.11
+export BINUTILS_VER=2.15.92.0.2		# can be either FSF or HJL Binutils
+export BISON_VER=1.875a
+export BZIP2_VER=1.0.2
+export COREUTILS_VER=5.2.1
+export DEJAGNU_VER=1.4.4
+export DIFFUTILS_VER=2.8.4
+export E2FSPROGS_VER=1.35		# chapter 6
+export ED_VER=0.2			# chapter 6
+export EXPECT_VER=5.41.0
+export FILE_VER=4.10			# chapter 6
+export FINDUTILS_VER=4.1.20
+export FLEX_VER=2.5.31
+export GAWK_VER=3.1.3
+export GCC_VER=3.4.2
+export GETTEXT_VER=0.14.1
+export GLIBC_VER=2.3.4-20040701
+export GREP_VER=2.5.1
+export GROFF_VER=1.19.1			# chapter 6
+export GZIP_VER=1.3.5
+export HOTPLUG_VER=""
+export IANA_ETC_VER=1.01
+export INETUTILS_VER=1.4.2		# chapter 6
+export IPROUTE2_VER=""
+export KBD_VER=1.12			# chapter 6
+export KERNEL_VER=2.6.8.1
+export LESS_VER=382			# chapter 6
+export LFS_BS_VER=2.2.1			# chapter 6
+export LIBTOOL_VER=1.5.6		# chapter 6
+export LILO_VER=22.5.1
+export LINUX_LIBC_HDRS_VER=2.6.8.1
+export M4_VER=1.4.1
+export MAKEDEV_VER=1.7
+export MAKE_DEVICES_VER=1.2
+export MAKE_VER=3.80
+export MAN_VER=1.5n			# chapter 6
+export MODUTILS_VER=2.4.26		# chapter 6
+export MODINITTOOLS_VER=3.0		# chapter 6
+export NASM_VER=0.98.38
+export NATIVE_BINUTILS_VER=2.15		# FSF binutils versions only
+export NCURSES_VER=5.4
+export NETTOOLS_VER=1.60		# chapter 6
+export NFSUTILS_VER=""
+export PATCH_VER=2.5.9
+export PERL_VER=5.8.5
+export PORTMAP_VER=""
+export PROCINFO_VER=18			# chapter 6
+export PROCPS_VER=3.2.2			# chapter 6
+export PSMISC_VER=21.5			# chapter 6
+export READLINE_VER=5.0
+export SED_VER=4.1.1
+export SHADOW_VER=4.0.4.1			# chapter 6
+export STRACE_VER=4.5.5
+export SYSKLOGD_VER=1.4.1		# chapter 6
+export SYSVINIT_VER=2.85		# chapter 6
+export TAR_VER=1.14
+export TCPWRAP_VER=""
+export TCL_VER=8.4.7
+export TEXINFO_VER=4.7
+export UDEV_VER=032
+export UTILLINUX_VER=2.12a
+export VIM_VER=6.3			# chapter 6
+export ZLIB_VER=1.2.1
+
+# Sort out NATIVE_BINUTILS_VER for native builds
+hostos=`uname`
+if [ ! "${hostos}" = "Linux" ]; then
+   # Not linux, cannot use HJL
+   case ${BINUTILS_VER} in
+      *.9[0-9].[0-9]* )
+      ;;
+      * )
+         export NATIVE_BINUTILS_VER=${BINUTILS_VER}
+      ;;
+   esac
+fi
Index: scripts/plfs-configs/plfs-packages-20041021
===================================================================
--- scripts/plfs-configs/plfs-packages-20041021	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/plfs-packages-20041021	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# plfs-packages
+
+# Package Version Information - 20041021 build 
+#-----------------------------------------------
+#
+# Last Modified
+#	By     :	$LastChangedBy$
+#	Date   :	$LastChangedDate$
+#	Rev No :	$LastChangedRevision$
+#
+
+# There are 2 binutils listed here.
+# NATIVE_BINUTILS_VER is used only when building a native binutils
+# on a non linux system when BINUTILS_VER is non FSF (ie HJL)
+# This is sorted out at the end of this script.
+
+export AUTOCONF_VER=2.59		# chapter 6
+export AUTOMAKE_VER=1.9			# chapter 6
+export BASH_VER=3.0
+export BIN86_VER=0.16.11
+export BINUTILS_VER=2.15.92.0.2		# can be either FSF or HJL Binutils
+export BISON_VER=1.875a
+export BZIP2_VER=1.0.2
+export COREUTILS_VER=5.2.1
+export DEJAGNU_VER=1.4.4
+export DIFFUTILS_VER=2.8.4
+export E2FSPROGS_VER=1.35		# chapter 6
+export ED_VER=0.2			# chapter 6
+export EXPECT_VER=5.41.0
+export FILE_VER=4.10			# chapter 6
+export FINDUTILS_VER=4.1.20
+export FLEX_VER=2.5.31
+export GAWK_VER=3.1.3
+export GCC_VER=3.4.2
+export GETTEXT_VER=0.14.1
+export GLIBC_VER=2.3.4-20041020
+export GREP_VER=2.5.1
+export GROFF_VER=1.19.1			# chapter 6
+export GZIP_VER=1.3.5
+export HOTPLUG_VER=""
+export IANA_ETC_VER=1.01
+export INETUTILS_VER=1.4.2		# chapter 6
+export IPROUTE2_VER=2.6.X-ss040702
+export KBD_VER=1.12			# chapter 6
+export KERNEL_VER=2.6.9
+export LESS_VER=382			# chapter 6
+export LFS_BS_VER=2.2.1			# chapter 6
+export LIBTOOL_VER=1.5.6		# chapter 6
+export LILO_VER=22.5.1
+export LINUX_LIBC_HDRS_VER=2.6.8.1
+export M4_VER=1.4.1
+export MAKEDEV_VER=1.7
+export MAKE_DEVICES_VER=1.2
+export MAKE_VER=3.80
+export MAN_VER=1.5n			# chapter 6
+export MODUTILS_VER=2.4.26		# chapter 6
+export MODINITTOOLS_VER=3.0		# chapter 6
+export NASM_VER=0.98.38
+export NATIVE_BINUTILS_VER=2.15		# FSF binutils versions only
+export NCURSES_VER=5.4
+export NETTOOLS_VER=1.60		# chapter 6
+export NFSUTILS_VER=""
+export PATCH_VER=2.5.9
+export PERL_VER=5.8.5
+export PORTMAP_VER=""
+export PROCINFO_VER=18			# chapter 6
+export PROCPS_VER=3.2.2			# chapter 6
+export PSMISC_VER=21.5			# chapter 6
+export READLINE_VER=5.0
+export SED_VER=4.1.1
+export SHADOW_VER=4.0.4.1			# chapter 6
+export STRACE_VER=4.5.5
+export SYSKLOGD_VER=1.4.1		# chapter 6
+export SYSVINIT_VER=2.85		# chapter 6
+export TAR_VER=1.14
+export TCPWRAP_VER=""
+export TCL_VER=8.4.7
+export TEXINFO_VER=4.7
+export UDEV_VER=040
+export UTILLINUX_VER=2.12a
+export VIM_VER=6.3			# chapter 6
+export ZLIB_VER=1.2.1
+
+# Sort out NATIVE_BINUTILS_VER for native builds
+hostos=`uname`
+if [ ! "${hostos}" = "Linux" ]; then
+   # Not linux, cannot use HJL
+   case ${BINUTILS_VER} in
+      *.9[0-9].[0-9]* )
+      ;;
+      * )
+         export NATIVE_BINUTILS_VER=${BINUTILS_VER}
+      ;;
+   esac
+fi
Index: scripts/plfs-configs/plfs-packages-20041101
===================================================================
--- scripts/plfs-configs/plfs-packages-20041101	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/plfs-packages-20041101	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# plfs-packages
+
+# Package Version Information - 20041101 build 
+#-----------------------------------------------
+#
+# Last Modified
+#	By     :	$LastChangedBy$
+#	Date   :	$LastChangedDate$
+#	Rev No :	$LastChangedRevision$
+#
+
+# There are 2 binutils listed here.
+# NATIVE_BINUTILS_VER is used only when building a native binutils
+# on a non linux system when BINUTILS_VER is non FSF (ie HJL)
+# This is sorted out at the end of this script.
+
+export AUTOCONF_VER=2.59		# chapter 6
+export AUTOMAKE_VER=1.9			# chapter 6
+export BASH_VER=3.0
+export BIN86_VER=0.16.11
+export BINUTILS_VER=2.15.92.0.2		# can be either FSF or HJL Binutils
+export BISON_VER=1.875a
+export BZIP2_VER=1.0.2
+export COREUTILS_VER=5.2.1
+export DEJAGNU_VER=1.4.4
+export DIFFUTILS_VER=2.8.4
+export E2FSPROGS_VER=1.35		# chapter 6
+export ED_VER=0.2			# chapter 6
+export EXPECT_VER=5.41.0
+export FILE_VER=4.10			# chapter 6
+export FINDUTILS_VER=4.1.20
+export FLEX_VER=2.5.31
+export GAWK_VER=3.1.3
+export GCC_VER=3.4.2
+export GETTEXT_VER=0.14.1
+export GLIBC_VER=2.3.4-20040701
+export GREP_VER=2.5.1
+export GROFF_VER=1.19.1			# chapter 6
+export GZIP_VER=1.3.5
+export HOTPLUG_VER=2004_09_23
+export IANA_ETC_VER=1.01
+export INETUTILS_VER=1.4.2		# chapter 6
+export IPROUTE2_VER=2.6.X-ss040702
+export KBD_VER=1.12			# chapter 6
+export KERNEL_VER=2.6.9
+export LESS_VER=382			# chapter 6
+export LFS_BS_VER=2.2.3			# chapter 6
+export LIBTOOL_VER=1.5.6		# chapter 6
+export LILO_VER=22.5.1
+export LINUX_LIBC_HDRS_VER=2.6.8.1
+export M4_VER=1.4.1
+export MAKEDEV_VER=1.7
+export MAKE_DEVICES_VER=1.2
+export MAKE_VER=3.80
+export MAN_VER=1.5n			# chapter 6
+export MODUTILS_VER=2.4.26		# chapter 6
+export MODINITTOOLS_VER=3.0		# chapter 6
+export NASM_VER=0.98.38
+export NATIVE_BINUTILS_VER=2.15		# FSF binutils versions only
+export NCURSES_VER=5.4
+export NETTOOLS_VER=1.60		# chapter 6
+export NFSUTILS_VER=""
+export PATCH_VER=2.5.9
+export PERL_VER=5.8.5
+export PORTMAP_VER=""
+export PROCINFO_VER=18			# chapter 6
+export PROCPS_VER=3.2.2			# chapter 6
+export PSMISC_VER=21.5			# chapter 6
+export READLINE_VER=5.0
+export SED_VER=4.1.1
+export SHADOW_VER=4.0.4.1			# chapter 6
+export STRACE_VER=4.5.5
+export SYSKLOGD_VER=1.4.1		# chapter 6
+export SYSVINIT_VER=2.85		# chapter 6
+export TAR_VER=1.14
+export TCPWRAP_VER=""
+export TCL_VER=8.4.7
+export TEXINFO_VER=4.7
+export UDEV_VER=040
+export UTILLINUX_VER=2.12a
+export VIM_VER=6.3			# chapter 6
+export ZLIB_VER=1.2.1
+
+# Sort out NATIVE_BINUTILS_VER for native builds
+hostos=`uname`
+if [ ! "${hostos}" = "Linux" ]; then
+   # Not linux, cannot use HJL
+   case ${BINUTILS_VER} in
+      *.9[0-9].[0-9]* )
+      ;;
+      * )
+         export NATIVE_BINUTILS_VER=${BINUTILS_VER}
+      ;;
+   esac
+fi
Index: scripts/plfs-configs/plfs-packages-20041223
===================================================================
--- scripts/plfs-configs/plfs-packages-20041223	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/plfs-packages-20041223	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# plfs-packages
+
+# Package Version Information - 20041220 build 
+#-----------------------------------------------
+#
+# Last Modified
+#	By     :	$LastChangedBy$
+#	Date   :	$LastChangedDate$
+#	Rev No :	$LastChangedRevision$
+#
+
+# There are 2 binutils listed here.
+# NATIVE_BINUTILS_VER is used only when building a native binutils
+# on a non linux system when BINUTILS_VER is non FSF (ie HJL)
+# This is sorted out at the end of this script.
+
+export AUTOCONF_VER=2.59		# chapter 6
+export AUTOMAKE_VER=1.9.4		# chapter 6
+export BASH_VER=3.0
+export BIN86_VER=0.16.11
+export BINUTILS_VER=2.15.94.0.2		# can be either FSF or HJL Binutils
+export BISON_VER=1.875a
+export BZIP2_VER=1.0.2
+export COREUTILS_VER=5.2.1
+export DEJAGNU_VER=1.4.4
+export DIFFUTILS_VER=2.8.4
+export E2FSPROGS_VER=1.35		# chapter 6
+export ED_VER=0.2			# chapter 6
+export EXPECT_VER=5.41.0
+export FILE_VER=4.12			# chapter 6
+export FINDUTILS_VER=4.2.10
+export FLEX_VER=2.5.31
+export GAWK_VER=3.1.4
+export GCC_VER=3.4.3
+export GETTEXT_VER=0.14.1
+export GLIBC_VER=20041220
+export GREP_VER=2.5.1a
+export GROFF_VER=1.19.1			# chapter 6
+export GZIP_VER=1.3.5
+export HOTPLUG_VER=2004_09_23
+export IANA_ETC_VER=1.03
+export INETUTILS_VER=1.4.2		# chapter 6
+export IPROUTE2_VER=2.6.9-041019
+export KBD_VER=1.12			# chapter 6
+export KERNEL_VER=2.6.9
+export LESS_VER=382			# chapter 6
+export LFS_BS_VER=2.2.3			# chapter 6
+export LIBTOOL_VER=1.5.10		# chapter 6
+export LILO_VER=22.5.1
+export LINUX_LIBC_HDRS_VER=2.6.9.1
+export M4_VER=1.4.2
+export MAKEDEV_VER=1.7
+export MAKE_DEVICES_VER=1.2
+export MAKE_VER=3.80
+export MAN_VER=1.5o1			# chapter 6
+export MODUTILS_VER=2.4.26		# chapter 6
+export MODINITTOOLS_VER=3.1		# chapter 6
+export NASM_VER=0.98.38
+export NATIVE_BINUTILS_VER=2.15		# FSF binutils versions only
+export NCURSES_VER=5.4
+export NETTOOLS_VER=1.60		# chapter 6
+export NFSUTILS_VER=""
+export PATCH_VER=2.5.9
+export PERL_VER=5.8.5
+export PORTMAP_VER=""
+export PROCINFO_VER=18			# chapter 6
+export PROCPS_VER=3.2.4			# chapter 6
+export PSMISC_VER=21.5			# chapter 6
+export READLINE_VER=5.0
+export SED_VER=4.1.2
+export SHADOW_VER=4.0.6			# chapter 6
+export STRACE_VER=4.5.5
+export SYSKLOGD_VER=1.4.1		# chapter 6
+export SYSVINIT_VER=2.86		# chapter 6
+export TAR_VER=1.14
+export TCPWRAP_VER=""
+export TCL_VER=8.4.7
+export TEXINFO_VER=4.7
+export UDEV_VER=050
+export UTILLINUX_VER=2.12a
+export VIM_VER=6.3			# chapter 6
+export ZLIB_VER=1.2.2
+
+# Sort out NATIVE_BINUTILS_VER for native builds
+hostos=`uname`
+if [ ! "${hostos}" = "Linux" ]; then
+   # Not linux, cannot use HJL
+   case ${BINUTILS_VER} in
+      *.9[0-9].[0-9]* )
+      ;;
+      * )
+         export NATIVE_BINUTILS_VER=${BINUTILS_VER}
+      ;;
+   esac
+fi
Index: scripts/plfs-configs/plfs-packages-20050103
===================================================================
--- scripts/plfs-configs/plfs-packages-20050103	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/plfs-packages-20050103	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# plfs-packages
+
+# Package Version Information - 20050103 build 
+#-----------------------------------------------
+#
+# Last Modified
+#	By     :	$LastChangedBy$
+#	Date   :	$LastChangedDate$
+#	Rev No :	$LastChangedRevision$
+#
+
+# There are 2 binutils listed here.
+# NATIVE_BINUTILS_VER is used only when building a native binutils
+# on a non linux system when BINUTILS_VER is non FSF (ie HJL)
+# This is sorted out at the end of this script.
+
+export AUTOCONF_VER=2.59		# chapter 6
+export AUTOMAKE_VER=1.9.4		# chapter 6
+export BASH_VER=3.0
+export BIN86_VER=0.16.11
+export BINUTILS_VER=2.15.94.0.2		# can be either FSF or HJL Binutils
+export BISON_VER=1.875a
+export BZIP2_VER=1.0.2
+export COREUTILS_VER=5.2.1
+export DEJAGNU_VER=1.4.4
+export DIFFUTILS_VER=2.8.4
+export E2FSPROGS_VER=1.35		# chapter 6
+export ED_VER=0.2			# chapter 6
+export EXPECT_VER=5.41.0
+export FILE_VER=4.12			# chapter 6
+export FINDUTILS_VER=4.2.10
+export FLEX_VER=2.5.31
+export GAWK_VER=3.1.4
+export GCC_VER=3.4.3
+export GETTEXT_VER=0.14.1
+export GLIBC_VER=20041220
+export GREP_VER=2.5.1a
+export GROFF_VER=1.19.1			# chapter 6
+export GZIP_VER=1.3.5
+export HOTPLUG_VER=2004_09_23
+export IANA_ETC_VER=1.03
+export INETUTILS_VER=1.4.2		# chapter 6
+export IPROUTE2_VER=2.6.9-041019
+export KBD_VER=1.12			# chapter 6
+export KERNEL_VER=2.6.10
+export LESS_VER=382			# chapter 6
+export LFS_BS_VER=2.2.3			# chapter 6
+export LIBTOOL_VER=1.5.10		# chapter 6
+export LILO_VER=22.5.1
+export LINUX_LIBC_HDRS_VER=2.6.9.1
+export M4_VER=1.4.2
+export MAKEDEV_VER=1.7
+export MAKE_DEVICES_VER=1.2
+export MAKE_VER=3.80
+export MAN_VER=1.5o1			# chapter 6
+export MODUTILS_VER=2.4.26		# chapter 6
+export MODINITTOOLS_VER=3.1		# chapter 6
+export NASM_VER=0.98.38
+export NATIVE_BINUTILS_VER=2.15		# FSF binutils versions only
+export NCURSES_VER=5.4
+export NETTOOLS_VER=1.60		# chapter 6
+export NFSUTILS_VER="1.0.6-ptx4"
+export PATCH_VER=2.5.9
+export PERL_VER=5.8.5
+export PORTMAP_VER="5beta"
+export PROCINFO_VER=18			# chapter 6
+export PROCPS_VER=3.2.4			# chapter 6
+export PSMISC_VER=21.5			# chapter 6
+export READLINE_VER=5.0
+export SED_VER=4.1.2
+export SHADOW_VER=4.0.6			# chapter 6
+export STRACE_VER=4.5.5
+export SYSKLOGD_VER=1.4.1		# chapter 6
+export SYSVINIT_VER=2.86		# chapter 6
+export TAR_VER=1.14
+export TCPWRAP_VER="7.6"
+export TCL_VER=8.4.7
+export TEXINFO_VER=4.7
+export UDEV_VER=050
+export UTILLINUX_VER=2.12a
+export VIM_VER=6.3			# chapter 6
+export ZLIB_VER=1.2.2
+
+# Sort out NATIVE_BINUTILS_VER for native builds
+hostos=`uname`
+if [ ! "${hostos}" = "Linux" ]; then
+   # Not linux, cannot use HJL
+   case ${BINUTILS_VER} in
+      *.9[0-9].[0-9]* )
+      ;;
+      * )
+         export NATIVE_BINUTILS_VER=${BINUTILS_VER}
+      ;;
+   esac
+fi
Index: scripts/plfs-configs/plfs-packages-20050314
===================================================================
--- scripts/plfs-configs/plfs-packages-20050314	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/plfs-packages-20050314	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# plfs-packages
+
+# Package Version Information - 20050314 build 
+#-----------------------------------------------
+#
+# Last Modified
+#	By     :	$LastChangedBy$
+#	Date   :	$LastChangedDate$
+#	Rev No :	$LastChangedRevision$
+#
+
+# There are 2 binutils listed here.
+# NATIVE_BINUTILS_VER is used only when building a native binutils
+# on a non linux system when BINUTILS_VER is non FSF (ie HJL)
+# This is sorted out at the end of this script.
+
+export AUTOCONF_VER=2.59		# chapter 6
+export AUTOMAKE_VER=1.9.4		# chapter 6
+export BASH_VER=3.0
+export BIN86_VER=0.16.11
+export BINUTILS_VER=2.15.94.0.2		# can be either FSF or HJL Binutils
+export BISON_VER=1.875a
+export BZIP2_VER=1.0.2
+export COREUTILS_VER=5.2.1
+export DEJAGNU_VER=1.4.4
+export DIFFUTILS_VER=2.8.4
+export E2FSPROGS_VER=1.35		# chapter 6
+export ED_VER=0.2			# chapter 6
+export EXPECT_VER=5.41.0
+export FILE_VER=4.12			# chapter 6
+export FINDUTILS_VER=4.2.10
+export FLEX_VER=2.5.31
+export GAWK_VER=3.1.4
+export GCC_VER=3.4.3
+export GETTEXT_VER=0.14.1
+export GLIBC_VER=2.3.4
+export GREP_VER=2.5.1a
+export GROFF_VER=1.19.1			# chapter 6
+export GZIP_VER=1.3.5
+export HOTPLUG_VER=2004_09_23
+export IANA_ETC_VER=1.03
+export INETUTILS_VER=1.4.2		# chapter 6
+export IPROUTE2_VER=2.6.9-041019
+export KBD_VER=1.12			# chapter 6
+export KERNEL_VER=2.6.10
+export LESS_VER=382			# chapter 6
+export LFS_BS_VER=2.2.3			# chapter 6
+export LIBTOOL_VER=1.5.10		# chapter 6
+export LILO_VER=22.5.1
+export LINUX_LIBC_HDRS_VER=2.6.9.1
+export M4_VER=1.4.2
+export MAKEDEV_VER=1.7
+export MAKE_DEVICES_VER=1.2
+export MAKE_VER=3.80
+export MAN_VER=1.5o1			# chapter 6
+export MODUTILS_VER=2.4.26		# chapter 6
+export MODINITTOOLS_VER=3.1		# chapter 6
+export NASM_VER=0.98.38
+export NATIVE_BINUTILS_VER=2.15		# FSF binutils versions only
+export NCURSES_VER=5.4
+export NETTOOLS_VER=1.60		# chapter 6
+export NFSUTILS_VER=1.0.6-ptx4
+export PATCH_VER=2.5.9
+export PERL_VER=5.8.5
+export PORTMAP_VER=5beta
+export PROCINFO_VER=18			# chapter 6
+export PROCPS_VER=3.2.4			# chapter 6
+export PSMISC_VER=21.5			# chapter 6
+export READLINE_VER=5.0
+export SED_VER=4.1.4
+export SHADOW_VER=4.0.6			# chapter 6
+export STRACE_VER=4.5.5
+export SYSKLOGD_VER=1.4.1		# chapter 6
+export SYSVINIT_VER=2.86		# chapter 6
+export TAR_VER=1.14
+export TCPWRAP_VER=7.6
+export TCL_VER=8.4.7
+export TEXINFO_VER=4.7
+export UDEV_VER=050
+export UTILLINUX_VER=2.12a
+export VIM_VER=6.3			# chapter 6
+export ZLIB_VER=1.2.2
+
+# Sort out NATIVE_BINUTILS_VER for native builds
+hostos=`uname`
+if [ ! "${hostos}" = "Linux" ]; then
+   # Not linux, cannot use HJL
+   case ${BINUTILS_VER} in
+      *.9[0-9].[0-9]* )
+      ;;
+      * )
+         export NATIVE_BINUTILS_VER=${BINUTILS_VER}
+      ;;
+   esac
+fi
Index: scripts/plfs-configs/plfs-packages-20050325
===================================================================
--- scripts/plfs-configs/plfs-packages-20050325	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/plfs-packages-20050325	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# plfs-packages
+
+# Package Version Information - 20050325 build 
+#-----------------------------------------------
+#
+# Last Modified
+#	By     :	$LastChangedBy$
+#	Date   :	$LastChangedDate$
+#	Rev No :	$LastChangedRevision$
+#
+
+# There are 2 binutils listed here.
+# NATIVE_BINUTILS_VER is used only when building a native binutils
+# on a non linux system when BINUTILS_VER is non FSF (ie HJL)
+# This is sorted out at the end of this script.
+
+export AUTOCONF_VER=2.59		# chapter 6
+export AUTOMAKE_VER=1.9.5		# chapter 6
+export BASH_VER=3.0
+export BIN86_VER=0.16.11
+export BINUTILS_VER=2.15.94.0.2.2	# can be either FSF or HJL Binutils
+export BISON_VER=2.0
+export BZIP2_VER=1.0.3
+export COREUTILS_VER=5.2.1
+export DEJAGNU_VER=1.4.4
+export DIFFUTILS_VER=2.8.4
+export E2FSPROGS_VER=1.37		# chapter 6
+export ED_VER=0.2			# chapter 6
+export EXPECT_VER=5.43.0
+export FILE_VER=4.13			# chapter 6
+export FINDUTILS_VER=4.2.20
+export FLEX_VER=2.5.31
+export GAWK_VER=3.1.4
+export GCC_VER=3.4.3
+export GETTEXT_VER=0.14.3
+export GLIBC_VER=2.3.4
+export GREP_VER=2.5.1a
+export GROFF_VER=1.19.1			# chapter 6
+export GZIP_VER=1.3.5
+export HOTPLUG_VER=2004_09_23
+export IANA_ETC_VER=1.04
+export INETUTILS_VER=1.4.2		# chapter 6
+export IPROUTE2_VER=2.6.11-050314
+export KBD_VER=1.12			# chapter 6
+export KERNEL_VER=2.6.11-ac4
+export LESS_VER=382			# chapter 6
+export LFS_BS_VER=3.1.0			# chapter 6
+export LIBTOOL_VER=1.5.14		# chapter 6
+export LILO_VER=22.5.1
+export LINUX_LIBC_HDRS_VER=2.6.11.0
+export M4_VER=1.4.2
+export MAKEDEV_VER=1.7
+export MAKE_DEVICES_VER=1.2
+export MAKE_VER=3.80
+export MAN_VER=1.5p			# chapter 6
+export MODUTILS_VER=2.4.26		# chapter 6
+export MODINITTOOLS_VER=3.1		# chapter 6
+export NASM_VER=0.98.38
+export NATIVE_BINUTILS_VER=2.15		# FSF binutils versions only
+export NCURSES_VER=5.4
+export NETTOOLS_VER=1.60		# chapter 6
+export NFSUTILS_VER=1.0.6-ptx4
+export PATCH_VER=2.5.9
+export PERL_VER=5.8.6
+export PORTMAP_VER=5beta
+export PROCINFO_VER=18			# chapter 6
+export PROCPS_VER=3.2.5			# chapter 6
+export PSMISC_VER=21.6			# chapter 6
+export READLINE_VER=5.0
+export SED_VER=4.1.4
+export SHADOW_VER=4.0.7			# chapter 6
+export STRACE_VER=4.5.5
+export SYSKLOGD_VER=1.4.1		# chapter 6
+export SYSVINIT_VER=2.86		# chapter 6
+export TAR_VER=1.15.1
+export TCPWRAP_VER=7.6
+export TCL_VER=8.4.9
+export TEXINFO_VER=4.8
+export UDEV_VER=056
+export UTILLINUX_VER=2.12q
+export VIM_VER=6.3			# chapter 6
+export ZLIB_VER=1.2.2
+
+# Sort out NATIVE_BINUTILS_VER for native builds
+hostos=`uname`
+if [ ! "${hostos}" = "Linux" ]; then
+   # Not linux, cannot use HJL
+   case ${BINUTILS_VER} in
+      *.9[0-9].[0-9]* )
+      ;;
+      * )
+         export NATIVE_BINUTILS_VER=${BINUTILS_VER}
+      ;;
+   esac
+fi
Index: scripts/plfs-configs/plfs-packages-20050404
===================================================================
--- scripts/plfs-configs/plfs-packages-20050404	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/plfs-packages-20050404	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# plfs-packages
+
+# Package Version Information - 20050325 build 
+#-----------------------------------------------
+#
+# Last Modified
+#	By     :	$LastChangedBy$
+#	Date   :	$LastChangedDate$
+#	Rev No :	$LastChangedRevision$
+#
+
+# There are 2 binutils listed here.
+# NATIVE_BINUTILS_VER is used only when building a native binutils
+# on a non linux system when BINUTILS_VER is non FSF (ie HJL)
+# This is sorted out at the end of this script.
+
+export AUTOCONF_VER=2.59		# chapter 6
+export AUTOMAKE_VER=1.9.5		# chapter 6
+export BASH_VER=3.0
+export BIN86_VER=0.16.11
+export BINUTILS_VER=2.15.94.0.2.2	# can be either FSF or HJL Binutils
+export BISON_VER=2.0
+export BZIP2_VER=1.0.3
+export COREUTILS_VER=5.2.1
+export DEJAGNU_VER=1.4.4
+export DIFFUTILS_VER=2.8.4
+export E2FSPROGS_VER=1.37		# chapter 6
+export ED_VER=0.2			# chapter 6
+export EXPECT_VER=5.43.0
+export FILE_VER=4.13			# chapter 6
+export FINDUTILS_VER=4.2.20
+export FLEX_VER=2.5.31
+export GAWK_VER=3.1.4
+export GCC_VER=3.4.3
+export GETTEXT_VER=0.14.3
+export GLIBC_VER=2.3.4
+export GREP_VER=2.5.1a
+export GROFF_VER=1.19.1			# chapter 6
+export GZIP_VER=1.3.5
+export HOTPLUG_VER=2004_09_23
+export IANA_ETC_VER=1.04
+export INETUTILS_VER=1.4.2		# chapter 6
+export IPROUTE2_VER=2.6.11-050314
+export KBD_VER=1.12			# chapter 6
+export KERNEL_VER=2.6.11-ac4
+export LESS_VER=382			# chapter 6
+export LFS_BS_VER=3.1.0			# chapter 6
+export LIBTOOL_VER=1.5.14		# chapter 6
+export LILO_VER=22.5.1
+export LINUX_LIBC_HDRS_VER=2.6.11.2
+export M4_VER=1.4.2
+export MAKEDEV_VER=1.7
+export MAKE_DEVICES_VER=1.2
+export MAKE_VER=3.80
+export MAN_VER=1.5p			# chapter 6
+export MODUTILS_VER=2.4.26		# chapter 6
+export MODINITTOOLS_VER=3.1		# chapter 6
+export NASM_VER=0.98.38
+export NATIVE_BINUTILS_VER=2.15		# FSF binutils versions only
+export NCURSES_VER=5.4
+export NETTOOLS_VER=1.60		# chapter 6
+export NFSUTILS_VER=1.0.6-ptx4
+export PATCH_VER=2.5.9
+export PERL_VER=5.8.6
+export PORTMAP_VER=5beta
+export PROCINFO_VER=18			# chapter 6
+export PROCPS_VER=3.2.5			# chapter 6
+export PSMISC_VER=21.6			# chapter 6
+export READLINE_VER=5.0
+export SED_VER=4.1.4
+export SHADOW_VER=4.0.7			# chapter 6
+export STRACE_VER=4.5.11
+export SYSKLOGD_VER=1.4.1		# chapter 6
+export SYSVINIT_VER=2.86		# chapter 6
+export TAR_VER=1.15.1
+export TCPWRAP_VER=7.6
+export TCL_VER=8.4.9
+export TEXINFO_VER=4.8
+export UDEV_VER=056
+export UTILLINUX_VER=2.12q
+export VIM_VER=6.3			# chapter 6
+export ZLIB_VER=1.2.2
+
+# Sort out NATIVE_BINUTILS_VER for native builds
+hostos=`uname`
+if [ ! "${hostos}" = "Linux" ]; then
+   # Not linux, cannot use HJL
+   case ${BINUTILS_VER} in
+      *.9[0-9].[0-9]* )
+      ;;
+      * )
+         export NATIVE_BINUTILS_VER=${BINUTILS_VER}
+      ;;
+   esac
+fi
Index: scripts/plfs-configs/plfs-packages-20050418
===================================================================
--- scripts/plfs-configs/plfs-packages-20050418	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/plfs-packages-20050418	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# plfs-packages
+
+# Package Version Information - 20050325 build 
+#-----------------------------------------------
+#
+# Last Modified
+#	By     :	$LastChangedBy$
+#	Date   :	$LastChangedDate$
+#	Rev No :	$LastChangedRevision$
+#
+
+# There are 2 binutils listed here.
+# NATIVE_BINUTILS_VER is used only when building a native binutils
+# on a non linux system when BINUTILS_VER is non FSF (ie HJL)
+# This is sorted out at the end of this script.
+
+export AUTOCONF_VER=2.59		# chapter 6
+export AUTOMAKE_VER=1.9.5		# chapter 6
+export BASH_VER=3.0
+export BIN86_VER=0.16.11
+export BINUTILS_VER=2.15.94.0.2.2	# can be either FSF or HJL Binutils
+export BISON_VER=2.0
+export BZIP2_VER=1.0.3
+export COREUTILS_VER=5.2.1
+export DEJAGNU_VER=1.4.4
+export DIFFUTILS_VER=2.8.4
+export E2FSPROGS_VER=1.37		# chapter 6
+export ED_VER=0.2			# chapter 6
+export EXPECT_VER=5.43.0
+export FILE_VER=4.13			# chapter 6
+export FINDUTILS_VER=4.2.20
+export FLEX_VER=2.5.31
+export GAWK_VER=3.1.4
+export GCC_VER=3.4.3
+export GETTEXT_VER=0.14.3
+export GLIBC_VER=2.3.5
+export GREP_VER=2.5.1a
+export GROFF_VER=1.19.1			# chapter 6
+export GZIP_VER=1.3.5
+export HOTPLUG_VER=2004_09_23
+export IANA_ETC_VER=1.04
+export INETUTILS_VER=1.4.2		# chapter 6
+export IPROUTE2_VER=2.6.11-050314
+export KBD_VER=1.12			# chapter 6
+#export KERNEL_VER=2.6.11-ac4
+export KERNEL_VER=2.6.11.7
+export LESS_VER=382			# chapter 6
+export LFS_BS_VER=3.1.0			# chapter 6
+export LIBTOOL_VER=1.5.14		# chapter 6
+export LILO_VER=22.5.1
+export LINUX_LIBC_HDRS_VER=2.6.11.2
+export M4_VER=1.4.2
+export MAKEDEV_VER=1.7
+export MAKE_DEVICES_VER=1.2
+export MAKE_VER=3.80
+export MAN_VER=1.5p			# chapter 6
+export MODUTILS_VER=2.4.26		# chapter 6
+export MODINITTOOLS_VER=3.1		# chapter 6
+export NASM_VER=0.98.38
+export NATIVE_BINUTILS_VER=2.15		# FSF binutils versions only
+export NCURSES_VER=5.4
+export NETTOOLS_VER=1.60		# chapter 6
+export NFSUTILS_VER=1.0.6-ptx4
+export PATCH_VER=2.5.9
+export PERL_VER=5.8.6
+export PORTMAP_VER=5beta
+export PROCINFO_VER=18			# chapter 6
+export PROCPS_VER=3.2.5			# chapter 6
+export PSMISC_VER=21.6			# chapter 6
+export READLINE_VER=5.0
+export SED_VER=4.1.4
+export SHADOW_VER=4.0.7			# chapter 6
+#export STRACE_VER=4.5.11
+export SYSKLOGD_VER=1.4.1		# chapter 6
+export SYSVINIT_VER=2.86		# chapter 6
+export TAR_VER=1.15.1
+export TCPWRAP_VER=7.6
+export TCL_VER=8.4.9
+export TEXINFO_VER=4.8
+export UDEV_VER=056
+export UTILLINUX_VER=2.12q
+export VIM_VER=6.3			# chapter 6
+export ZLIB_VER=1.2.2
+
+# Sort out NATIVE_BINUTILS_VER for native builds
+hostos=`uname`
+if [ ! "${hostos}" = "Linux" ]; then
+   # Not linux, cannot use HJL
+   case ${BINUTILS_VER} in
+      *.9[0-9].[0-9]* )
+      ;;
+      * )
+         export NATIVE_BINUTILS_VER=${BINUTILS_VER}
+      ;;
+   esac
+fi
Index: scripts/plfs-configs/plfs-packages-20050419-gcc4
===================================================================
--- scripts/plfs-configs/plfs-packages-20050419-gcc4	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/plfs-packages-20050419-gcc4	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# plfs-packages
+
+# Package Version Information - 20050325 build 
+#-----------------------------------------------
+#
+# Last Modified
+#	By     :	$LastChangedBy$
+#	Date   :	$LastChangedDate$
+#	Rev No :	$LastChangedRevision$
+#
+
+# There are 2 binutils listed here.
+# NATIVE_BINUTILS_VER is used only when building a native binutils
+# on a non linux system when BINUTILS_VER is non FSF (ie HJL)
+# This is sorted out at the end of this script.
+
+export AUTOCONF_VER=2.59		# chapter 6
+export AUTOMAKE_VER=1.9.5		# chapter 6
+export BASH_VER=3.0
+export BIN86_VER=0.16.11
+export BINUTILS_VER=2.16-20050419	# can be either FSF or HJL Binutils
+export BISON_VER=2.0
+export BZIP2_VER=1.0.3
+export COREUTILS_VER=5.2.1
+export DEJAGNU_VER=1.4.4
+export DIFFUTILS_VER=2.8.4
+export E2FSPROGS_VER=1.37		# chapter 6
+export ED_VER=0.2			# chapter 6
+export EXPECT_VER=5.43.0
+export FILE_VER=4.13			# chapter 6
+export FINDUTILS_VER=4.2.20
+export FLEX_VER=2.5.31
+export GAWK_VER=3.1.4
+export GCC_VER=4.1.0-20050419
+export GETTEXT_VER=0.14.3
+export GLIBC_VER=20050417-2210
+export GREP_VER=2.5.1a
+export GROFF_VER=1.19.1			# chapter 6
+export GZIP_VER=1.3.5
+export HOTPLUG_VER=2004_09_23
+export IANA_ETC_VER=1.04
+export INETUTILS_VER=1.4.2		# chapter 6
+export IPROUTE2_VER=2.6.11-050314
+export KBD_VER=1.12			# chapter 6
+export KERNEL_VER=2.6.11-ac4
+export LESS_VER=382			# chapter 6
+export LFS_BS_VER=3.1.0			# chapter 6
+export LIBTOOL_VER=1.5.14		# chapter 6
+export LILO_VER=22.5.1
+export LINUX_LIBC_HDRS_VER=2.6.11.2
+export M4_VER=1.4.2
+export MAKEDEV_VER=1.7
+export MAKE_DEVICES_VER=1.2
+export MAKE_VER=3.80
+export MAN_VER=1.5p			# chapter 6
+export MODUTILS_VER=2.4.26		# chapter 6
+export MODINITTOOLS_VER=3.1		# chapter 6
+export NASM_VER=0.98.38
+export NATIVE_BINUTILS_VER=2.15		# FSF binutils versions only
+export NCURSES_VER=5.4
+export NETTOOLS_VER=1.60		# chapter 6
+export NFSUTILS_VER=1.0.6-ptx4
+export PATCH_VER=2.5.9
+export PERL_VER=5.8.6
+export PORTMAP_VER=5beta
+export PROCINFO_VER=18			# chapter 6
+export PROCPS_VER=3.2.5			# chapter 6
+export PSMISC_VER=21.6			# chapter 6
+export READLINE_VER=5.0
+export SED_VER=4.1.4
+export SHADOW_VER=4.0.7			# chapter 6
+#export STRACE_VER=4.5.11
+export SYSKLOGD_VER=1.4.1		# chapter 6
+export SYSVINIT_VER=2.86		# chapter 6
+export TAR_VER=1.15.1
+export TCPWRAP_VER=7.6
+export TCL_VER=8.4.9
+export TEXINFO_VER=4.8
+export UDEV_VER=056
+export UTILLINUX_VER=2.12q
+export VIM_VER=6.3			# chapter 6
+export ZLIB_VER=1.2.2
+
+# Sort out NATIVE_BINUTILS_VER for native builds
+hostos=`uname`
+if [ ! "${hostos}" = "Linux" ]; then
+   # Not linux, cannot use HJL
+   case ${BINUTILS_VER} in
+      *.9[0-9].[0-9]* )
+      ;;
+      * )
+         export NATIVE_BINUTILS_VER=${BINUTILS_VER}
+      ;;
+   esac
+fi
Index: scripts/plfs-configs/plfs-packages-20050504
===================================================================
--- scripts/plfs-configs/plfs-packages-20050504	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/plfs-packages-20050504	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# plfs-packages
+
+# Package Version Information - 20050325 build 
+#-----------------------------------------------
+#
+# Last Modified
+#	By     :	$LastChangedBy$
+#	Date   :	$LastChangedDate$
+#	Rev No :	$LastChangedRevision$
+#
+
+# There are 2 binutils listed here.
+# NATIVE_BINUTILS_VER is used only when building a native binutils
+# on a non linux system when BINUTILS_VER is non FSF (ie HJL)
+# This is sorted out at the end of this script.
+
+export AUTOCONF_VER=2.59		# chapter 6
+export AUTOMAKE_VER=1.9.5		# chapter 6
+export BASH_VER=3.0
+export BIN86_VER=0.16.11
+export BINUTILS_VER=2.16		# can be either FSF or HJL Binutils
+export BISON_VER=2.0
+export BZIP2_VER=1.0.3
+export COREUTILS_VER=5.2.1
+export DEJAGNU_VER=1.4.4
+export DIFFUTILS_VER=2.8.4
+export E2FSPROGS_VER=1.37		# chapter 6
+export ED_VER=0.2			# chapter 6
+export EXPECT_VER=5.43.0
+export FILE_VER=4.13			# chapter 6
+export FINDUTILS_VER=4.2.20
+export FLEX_VER=2.5.31
+export GAWK_VER=3.1.4
+export GCC_VER=3.4.3
+export GETTEXT_VER=0.14.3
+export GLIBC_VER=2.3.5
+export GREP_VER=2.5.1a
+export GROFF_VER=1.19.1			# chapter 6
+export GZIP_VER=1.3.5
+export HOTPLUG_VER=2004_09_23
+export IANA_ETC_VER=1.04
+export INETUTILS_VER=1.4.2		# chapter 6
+export IPROUTE2_VER=2.6.11-050314
+export KBD_VER=1.12			# chapter 6
+export KERNEL_VER=2.6.11-ac4
+export LESS_VER=382			# chapter 6
+export LFS_BS_VER=3.1.0			# chapter 6
+export LIBTOOL_VER=1.5.14		# chapter 6
+export LILO_VER=22.5.1
+export LINUX_LIBC_HDRS_VER=2.6.11.2
+export M4_VER=1.4.2
+export MAKEDEV_VER=1.7
+export MAKE_DEVICES_VER=1.2
+export MAKE_VER=3.80
+export MAN_VER=1.5p			# chapter 6
+export MODUTILS_VER=2.4.26		# chapter 6
+export MODINITTOOLS_VER=3.1		# chapter 6
+export NASM_VER=0.98.38
+export NATIVE_BINUTILS_VER=2.15		# FSF binutils versions only
+export NCURSES_VER=5.4
+export NETTOOLS_VER=1.60		# chapter 6
+export NFSUTILS_VER=1.0.6-ptx4
+export PATCH_VER=2.5.9
+export PERL_VER=5.8.6
+export PORTMAP_VER=5beta
+export PROCINFO_VER=18			# chapter 6
+export PROCPS_VER=3.2.5			# chapter 6
+export PSMISC_VER=21.6			# chapter 6
+export READLINE_VER=5.0
+export SED_VER=4.1.4
+export SHADOW_VER=4.0.7			# chapter 6
+#export STRACE_VER=4.5.11
+export SYSKLOGD_VER=1.4.1		# chapter 6
+export SYSVINIT_VER=2.86		# chapter 6
+export TAR_VER=1.15.1
+export TCPWRAP_VER=7.6
+export TCL_VER=8.4.9
+export TEXINFO_VER=4.8
+export UDEV_VER=056
+export UTILLINUX_VER=2.12q
+export VIM_VER=6.3			# chapter 6
+export ZLIB_VER=1.2.2
+
+# Sort out NATIVE_BINUTILS_VER for native builds
+hostos=`uname`
+if [ ! "${hostos}" = "Linux" ]; then
+   # Not linux, cannot use HJL
+   case ${BINUTILS_VER} in
+      *.9[0-9].[0-9]* )
+      ;;
+      * )
+         export NATIVE_BINUTILS_VER=${BINUTILS_VER}
+      ;;
+   esac
+fi
Index: scripts/plfs-configs/plfs-packages-20050504-gcc4
===================================================================
--- scripts/plfs-configs/plfs-packages-20050504-gcc4	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/plfs-packages-20050504-gcc4	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# plfs-packages
+
+# Package Version Information - 20050325 build 
+#-----------------------------------------------
+#
+# Last Modified
+#	By     :	$LastChangedBy$
+#	Date   :	$LastChangedDate$
+#	Rev No :	$LastChangedRevision$
+#
+
+# There are 2 binutils listed here.
+# NATIVE_BINUTILS_VER is used only when building a native binutils
+# on a non linux system when BINUTILS_VER is non FSF (ie HJL)
+# This is sorted out at the end of this script.
+
+export AUTOCONF_VER=2.59		# chapter 6
+export AUTOMAKE_VER=1.9.5		# chapter 6
+export BASH_VER=3.0
+export BIN86_VER=0.16.11
+export BINUTILS_VER=2.16		# can be either FSF or HJL Binutils
+export BISON_VER=2.0
+export BZIP2_VER=1.0.3
+export COREUTILS_VER=5.2.1
+export DEJAGNU_VER=1.4.4
+export DIFFUTILS_VER=2.8.4
+export E2FSPROGS_VER=1.37		# chapter 6
+export ED_VER=0.2			# chapter 6
+export EXPECT_VER=5.43.0
+export FILE_VER=4.13			# chapter 6
+export FINDUTILS_VER=4.2.20
+export FLEX_VER=2.5.31
+export GAWK_VER=3.1.4
+export GCC_VER=4.0.0
+export GETTEXT_VER=0.14.3
+export GLIBC_VER=2.3.5
+export GREP_VER=2.5.1a
+export GROFF_VER=1.19.1			# chapter 6
+export GZIP_VER=1.3.5
+export HOTPLUG_VER=2004_09_23
+export IANA_ETC_VER=1.04
+export INETUTILS_VER=1.4.2		# chapter 6
+export IPROUTE2_VER=2.6.11-050314
+export KBD_VER=1.12			# chapter 6
+export KERNEL_VER=2.6.11-ac4
+export LESS_VER=382			# chapter 6
+export LFS_BS_VER=3.1.0			# chapter 6
+export LIBTOOL_VER=1.5.14		# chapter 6
+export LILO_VER=22.5.1
+export LINUX_LIBC_HDRS_VER=2.6.11.2
+export M4_VER=1.4.2
+export MAKEDEV_VER=1.7
+export MAKE_DEVICES_VER=1.2
+export MAKE_VER=3.80
+export MAN_VER=1.5p			# chapter 6
+export MODUTILS_VER=2.4.26		# chapter 6
+export MODINITTOOLS_VER=3.1		# chapter 6
+export NASM_VER=0.98.38
+export NATIVE_BINUTILS_VER=2.15		# FSF binutils versions only
+export NCURSES_VER=5.4
+export NETTOOLS_VER=1.60		# chapter 6
+export NFSUTILS_VER=1.0.6-ptx4
+export PATCH_VER=2.5.9
+export PERL_VER=5.8.6
+export PORTMAP_VER=5beta
+export PROCINFO_VER=18			# chapter 6
+export PROCPS_VER=3.2.5			# chapter 6
+export PSMISC_VER=21.6			# chapter 6
+export READLINE_VER=5.0
+export SED_VER=4.1.4
+export SHADOW_VER=4.0.7			# chapter 6
+#export STRACE_VER=4.5.11
+export SYSKLOGD_VER=1.4.1		# chapter 6
+export SYSVINIT_VER=2.86		# chapter 6
+export TAR_VER=1.15.1
+export TCPWRAP_VER=7.6
+export TCL_VER=8.4.9
+export TEXINFO_VER=4.8
+export UDEV_VER=056
+export UTILLINUX_VER=2.12q
+export VIM_VER=6.3			# chapter 6
+export ZLIB_VER=1.2.2
+
+# Sort out NATIVE_BINUTILS_VER for native builds
+hostos=`uname`
+if [ ! "${hostos}" = "Linux" ]; then
+   # Not linux, cannot use HJL
+   case ${BINUTILS_VER} in
+      *.9[0-9].[0-9]* )
+      ;;
+      * )
+         export NATIVE_BINUTILS_VER=${BINUTILS_VER}
+      ;;
+   esac
+fi
Index: scripts/plfs-configs/plfs-packages-20050515
===================================================================
--- scripts/plfs-configs/plfs-packages-20050515	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/plfs-packages-20050515	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# plfs-packages
+
+# Package Version Information - 20050325 build 
+#-----------------------------------------------
+#
+# Last Modified
+#	By     :	$LastChangedBy$
+#	Date   :	$LastChangedDate$
+#	Rev No :	$LastChangedRevision$
+#
+
+# There are 2 binutils listed here.
+# NATIVE_BINUTILS_VER is used only when building a native binutils
+# on a non linux system when BINUTILS_VER is non FSF (ie HJL)
+# This is sorted out at the end of this script.
+
+export AUTOCONF_VER=2.59		# chapter 6
+export AUTOMAKE_VER=1.9.5		# chapter 6
+export BASH_VER=3.0
+export BIN86_VER=0.16.11
+export BINUTILS_VER=2.16.90.0.3		# can be either FSF or HJL Binutils
+export BISON_VER=2.0
+export BZIP2_VER=1.0.3
+export COREUTILS_VER=5.2.1
+export DEJAGNU_VER=1.4.4
+export DIFFUTILS_VER=2.8.4
+export E2FSPROGS_VER=1.37		# chapter 6
+export ED_VER=0.2			# chapter 6
+export EXPECT_VER=5.43.0
+export FILE_VER=4.13			# chapter 6
+export FINDUTILS_VER=4.2.20
+export FLEX_VER=2.5.31
+export GAWK_VER=3.1.4
+export GCC_VER=3.4.3
+export GETTEXT_VER=0.14.4
+export GLIBC_VER=2.3.5
+export GREP_VER=2.5.1a
+export GROFF_VER=1.19.1			# chapter 6
+export GZIP_VER=1.3.5
+export HOTPLUG_VER=2004_09_23
+export IANA_ETC_VER=1.04
+export INETUTILS_VER=1.4.2		# chapter 6
+export IPROUTE2_VER=2.6.11-050314
+export KBD_VER=1.12			# chapter 6
+export KERNEL_VER=2.6.11-ac7
+export LESS_VER=382			# chapter 6
+export LFS_BS_VER=3.1.0			# chapter 6
+export LIBTOOL_VER=1.5.16		# chapter 6
+export LILO_VER=22.5.1
+export LINUX_LIBC_HDRS_VER=2.6.11.2
+export M4_VER=1.4.3
+export MAKEDEV_VER=1.7
+export MAKE_DEVICES_VER=1.2
+export MAKE_VER=3.80
+export MAN_VER=1.5p			# chapter 6
+export MODUTILS_VER=2.4.26		# chapter 6
+export MODINITTOOLS_VER=3.1		# chapter 6
+export NASM_VER=0.98.38
+export NATIVE_BINUTILS_VER=2.15		# FSF binutils versions only
+export NCURSES_VER=5.4
+export NETTOOLS_VER=1.60		# chapter 6
+export NFSUTILS_VER=1.0.6-ptx4
+export PATCH_VER=2.5.9
+export PERL_VER=5.8.6
+export PORTMAP_VER=5beta
+export PROCINFO_VER=18			# chapter 6
+export PROCPS_VER=3.2.5			# chapter 6
+export PSMISC_VER=21.6			# chapter 6
+export READLINE_VER=5.0
+export SED_VER=4.1.4
+export SHADOW_VER=4.0.7			# chapter 6
+#export STRACE_VER=4.5.11
+export SYSKLOGD_VER=1.4.1		# chapter 6
+export SYSVINIT_VER=2.86		# chapter 6
+export TAR_VER=1.15.1
+export TCPWRAP_VER=7.6
+export TCL_VER=8.4.9
+export TEXINFO_VER=4.8
+export UDEV_VER=057
+export UTILLINUX_VER=2.12q
+export VIM_VER=6.3			# chapter 6
+export ZLIB_VER=1.2.2
+
+# Sort out NATIVE_BINUTILS_VER for native builds
+hostos=`uname`
+if [ ! "${hostos}" = "Linux" ]; then
+   # Not linux, cannot use HJL
+   case ${BINUTILS_VER} in
+      *.9[0-9].[0-9]* )
+      ;;
+      * )
+         export NATIVE_BINUTILS_VER=${BINUTILS_VER}
+      ;;
+   esac
+fi
Index: scripts/plfs-configs/plfs-packages-lfs-5.1.1
===================================================================
--- scripts/plfs-configs/plfs-packages-lfs-5.1.1	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/plfs-packages-lfs-5.1.1	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# plfs-packages
+
+# Package Version Information - LFS 5.1.1 build 
+#-----------------------------------------------
+#
+# Last Modified
+#	By     :	$LastChangedBy$
+#	Date   :	$LastChangedDate$
+#	Rev No :	$LastChangedRevision$
+#
+
+# There are 2 binutils listed here.
+# NATIVE_BINUTILS_VER is used only when building a native binutils
+# on a non linux system when BINUTILS_VER is non FSF (ie HJL)
+# This is sorted out at the end of this script.
+
+export AUTOCONF_VER=2.59		# chapter 6
+export AUTOMAKE_VER=1.8.4		# chapter 6
+export BASH_VER=2.05b
+export BIN86_VER=0.16.11
+export BINUTILS_VER=2.14		# can be either FSF or HJL Binutils
+export BISON_VER=1.875
+export BZIP2_VER=1.0.2
+export COREUTILS_VER=5.2.1
+export DEJAGNU_VER=1.4.4
+export DIFFUTILS_VER=2.8.1
+export E2FSPROGS_VER=1.35		# chapter 6
+export ED_VER=0.2			# chapter 6
+export EXPECT_VER=5.41.0
+export FILE_VER=4.09			# chapter 6
+export FINDUTILS_VER=4.1.20
+export FLEX_VER=2.5.4a
+export GAWK_VER=3.1.3
+export GCC_VER=3.3.3
+export GETTEXT_VER=0.14.1
+export GLIBC_VER=2.3.3-lfs-5.1
+export GREP_VER=2.5.1
+export GROFF_VER=1.19			# chapter 6
+export GZIP_VER=1.3.5
+export HOTPLUG_VER=""
+export IANA_ETC_VER="1.00"
+export INETUTILS_VER=1.4.2		# chapter 6
+export IPROUTE2_VER=""
+export KBD_VER=1.12			# chapter 6
+export KERNEL_VER=2.4.26
+export LESS_VER=382			# chapter 6
+export LFS_BS_VER=2.0.5			# chapter 6
+export LIBTOOL_VER=1.5.6		# chapter 6
+export LILO_VER=22.5.1
+export LINUX_LIBC_HDRS_VER=""
+export M4_VER=1.4
+export MAKEDEV_VER=1.7
+export MAKE_DEVICES_VER=1.2
+export MAKE_VER=3.80
+export MAN_VER=1.5m2			# chapter 6
+export MODUTILS_VER=2.4.27		# chapter 6
+export MODINITTOOLS_VER=3.0		# chapter 6
+export NASM_VER=0.98.38
+export NATIVE_BINUTILS_VER=2.14		# FSF binutils versions only
+export NCURSES_VER=5.4
+export NETTOOLS_VER=1.60		# chapter 6
+export NFSUTILS_VER=""
+export PATCH_VER=2.5.4
+export PERL_VER=5.8.4
+export PORTMAP_VER=""
+export PROCINFO_VER=18			# chapter 6
+export PROCPS_VER=3.2.1			# chapter 6
+export PSMISC_VER=21.4			# chapter 6
+export READLINE_VER="5.0"
+export SED_VER=4.0.9
+export SHADOW_VER=4.0.4.1		# chapter 6
+export STRACE_VER="4.5.4"
+export SYSKLOGD_VER=1.4.1		# chapter 6
+export SYSVINIT_VER=2.85		# chapter 6
+export TAR_VER=1.13.94
+export TCPWRAP_VER=""
+export TCL_VER=8.4.6
+export TEXINFO_VER=4.7
+export UDEV_VER=""
+export UTILLINUX_VER=2.12a
+export VIM_VER=6.2			# chapter 6
+export ZLIB_VER=1.2.1
+
+# Sort out NATIVE_BINUTILS_VER for native builds
+hostos=`uname`
+if [ ! "${hostos}" = "Linux" ]; then
+   # Not linux, cannot use HJL
+   case ${BINUTILS_VER} in
+      *.9[0-9].[0-9]* )
+      ;;
+      * )
+         export NATIVE_BINUTILS_VER=${BINUTILS_VER}
+      ;;
+   esac
+fi
Index: scripts/plfs-configs/plfs-packages-lfs-6.0
===================================================================
--- scripts/plfs-configs/plfs-packages-lfs-6.0	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/plfs-packages-lfs-6.0	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# plfs-packages
+
+# Package Version Information - LFS 6.0 build 
+#-----------------------------------------------
+#
+# Last Modified
+#	By     :	$LastChangedBy$
+#	Date   :	$LastChangedDate$
+#	Rev No :	$LastChangedRevision$
+#
+
+# There are 2 binutils listed here.
+# NATIVE_BINUTILS_VER is used only when building a native binutils
+# on a non linux system when BINUTILS_VER is non FSF (ie HJL)
+# This is sorted out at the end of this script.
+
+export AUTOCONF_VER=2.59		# chapter 6
+export AUTOMAKE_VER=1.9.1		# chapter 6
+export BASH_VER=3.0
+export BIN86_VER=0.16.11
+export BINUTILS_VER=2.15.91.0.2		# can be either FSF or HJL Binutils
+export BISON_VER=1.875a
+export BZIP2_VER=1.0.2
+export COREUTILS_VER=5.2.1
+export DEJAGNU_VER=1.4.4
+export DIFFUTILS_VER=2.8.1
+export E2FSPROGS_VER=1.35		# chapter 6
+export ED_VER=0.2			# chapter 6
+export EXPECT_VER=5.42.1
+export FILE_VER=4.10			# chapter 6
+export FINDUTILS_VER=4.1.20
+export FLEX_VER=2.5.31
+export GAWK_VER=3.1.4
+export GCC_VER=3.4.1
+export GETTEXT_VER=0.14.1
+export GLIBC_VER=2.3.4-20040701
+export GREP_VER=2.5.1
+export GROFF_VER=1.19.1			# chapter 6
+export GZIP_VER=1.3.5
+export HOTPLUG_VER=""
+export IANA_ETC_VER=1.01
+export INETUTILS_VER=1.4.2		# chapter 6
+export IPROUTE2_VER="2.6.8-040823"
+export KBD_VER=1.12			# chapter 6
+export KERNEL_VER=2.6.8.1
+export LESS_VER=382			# chapter 6
+export LFS_BS_VER=2.2.2			# chapter 6
+export LIBTOOL_VER=1.5.8		# chapter 6
+export LILO_VER=22.5.1
+export LINUX_LIBC_HDRS_VER=2.6.8.1
+export M4_VER=1.4.2
+export MAKEDEV_VER=1.7
+export MAKE_DEVICES_VER=1.2
+export MAKE_VER=3.80
+export MAN_VER=1.5o			# chapter 6
+export MODUTILS_VER=2.4.26		# chapter 6
+export MODINITTOOLS_VER=3.0		# chapter 6
+export NASM_VER=0.98.38
+export NATIVE_BINUTILS_VER=2.15		# FSF binutils versions only
+export NCURSES_VER=5.4
+export NETTOOLS_VER=1.60		# chapter 6
+export NFSUTILS_VER=""
+export PATCH_VER=2.5.4
+export PERL_VER=5.8.5
+export PORTMAP_VER=""
+export PROCINFO_VER=18			# chapter 6
+export PROCPS_VER=3.2.2			# chapter 6
+export PSMISC_VER=21.5			# chapter 6
+export READLINE_VER=5.0
+export SED_VER=4.1.2
+export SHADOW_VER=4.0.4.1			# chapter 6
+export STRACE_VER=4.5.5
+export SYSKLOGD_VER=1.4.1		# chapter 6
+export SYSVINIT_VER=2.85		# chapter 6
+export TAR_VER=1.14
+export TCPWRAP_VER=""
+export TCL_VER=8.4.7
+export TEXINFO_VER=4.7
+export UDEV_VER=030
+export UTILLINUX_VER=2.12b
+export VIM_VER=6.3			# chapter 6
+export ZLIB_VER=1.2.1
+
+# Sort out NATIVE_BINUTILS_VER for native builds
+hostos=`uname`
+if [ ! "${hostos}" = "Linux" ]; then
+   # Not linux, cannot use HJL
+   case ${BINUTILS_VER} in
+      *.9[0-9].[0-9]* )
+      ;;
+      * )
+         export NATIVE_BINUTILS_VER=${BINUTILS_VER}
+      ;;
+   esac
+fi
Index: scripts/plfs-configs/plfs-packages-lfs-unstable-20040620
===================================================================
--- scripts/plfs-configs/plfs-packages-lfs-unstable-20040620	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/plfs-packages-lfs-unstable-20040620	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# plfs-packages
+
+# Package Version Information - 20040620 build 
+#-----------------------------------------------
+#
+# Last Modified
+#	By     :	$LastChangedBy$
+#	Date   :	$LastChangedDate$
+#	Rev No :	$LastChangedRevision$
+#
+
+# There are 2 binutils listed here.
+# NATIVE_BINUTILS_VER is used only when building a native binutils
+# on a non linux system when BINUTILS_VER is non FSF (ie HJL)
+# This is sorted out at the end of this script.
+
+export AUTOCONF_VER=2.59		# chapter 6
+export AUTOMAKE_VER=1.8.5		# chapter 6
+export BASH_VER=2.05b
+export BIN86_VER=""
+export BINUTILS_VER=2.15.91.0.1		# can be either FSF or HJL Binutils
+export BISON_VER=1.875a
+export BZIP2_VER=1.0.2
+export COREUTILS_VER=5.2.1
+export DEJAGNU_VER=1.4.4
+export DIFFUTILS_VER=2.8.4
+export E2FSPROGS_VER=1.35		# chapter 6
+export ED_VER=0.2			# chapter 6
+export EXPECT_VER=5.41.0
+export FILE_VER=4.09			# chapter 6
+export FINDUTILS_VER=4.1.20
+export FLEX_VER=2.5.31
+export GAWK_VER=3.1.3
+export GCC_VER=3.4.1-20040620
+export GETTEXT_VER=0.14.1
+export GLIBC_VER=2.3.4-20040620-0145
+export GREP_VER=2.5.1
+export GROFF_VER=1.19			# chapter 6
+export GZIP_VER=1.3.5
+export HOTPLUG_VER=""
+export IANA_ETC_VER=1.00
+export INETUTILS_VER=1.4.2		# chapter 6
+export IPROUTE2_VER=""
+export KBD_VER=1.12			# chapter 6
+export KERNEL_VER=2.6.7
+export LESS_VER=381			# chapter 6
+export LFS_BS_VER=2.12-pre1			# chapter 6
+export LIBTOOL_VER=1.5.6		# chapter 6
+export LILO_VER=""
+export LINUX_LIBC_HDRS_VER=2.6.6.0
+export M4_VER=1.4
+export MAKEDEV_VER=1.7
+export MAKE_DEVICES_VER=1.2
+export MAKE_VER=3.80
+export MAN_VER=1.5m2			# chapter 6
+export MODUTILS_VER=2.4.26		# chapter 6
+export MODINITTOOLS_VER=3.0		# chapter 6
+export NASM_VER=""
+export NATIVE_BINUTILS_VER=2.15		# FSF binutils versions only
+export NCURSES_VER=5.4
+export NETTOOLS_VER=1.60		# chapter 6
+export NFSUTILS_VER=""
+export PATCH_VER=2.5.9
+export PERL_VER=5.8.4
+export PORTMAP_VER=""
+export PROCINFO_VER=18			# chapter 6
+export PROCPS_VER=3.2.1			# chapter 6
+export PSMISC_VER=21.5			# chapter 6
+export READLINE_VER=""
+export SED_VER=4.1
+export SHADOW_VER=4.0.4.1		# chapter 6
+export STRACE_VER=4.5.5
+export SYSKLOGD_VER=1.4.1		# chapter 6
+export SYSVINIT_VER=2.85		# chapter 6
+export TAR_VER=1.14
+export TCPWRAP_VER=""
+export TCL_VER=8.4.6
+export TEXINFO_VER=4.7
+export UDEV_VER=027
+export UTILLINUX_VER=2.12a
+export VIM_VER=6.3			# chapter 6
+export ZLIB_VER=1.2.1
+
+# Sort out NATIVE_BINUTILS_VER for native builds
+hostos=`uname`
+if [ ! "${hostos}" = "Linux" ]; then
+   # Not linux, cannot use HJL
+   case ${BINUTILS_VER} in
+      *.9[0-9].[0-9]* )
+      ;;
+      * )
+         export NATIVE_BINUTILS_VER=${BINUTILS_VER}
+      ;;
+   esac
+fi
Index: scripts/plfs-configs/plfs-packages-lfs-unstable-20040801
===================================================================
--- scripts/plfs-configs/plfs-packages-lfs-unstable-20040801	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-configs/plfs-packages-lfs-unstable-20040801	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# plfs-packages
+
+# Package Version Information - 20040801 build 
+#-----------------------------------------------
+#
+# Last Modified
+#	By     :	$LastChangedBy$
+#	Date   :	$LastChangedDate$
+#	Rev No :	$LastChangedRevision$
+#
+
+# There are 2 binutils listed here.
+# NATIVE_BINUTILS_VER is used only when building a native binutils
+# on a non linux system when BINUTILS_VER is non FSF (ie HJL)
+# This is sorted out at the end of this script.
+
+export AUTOCONF_VER=2.59		# chapter 6
+export AUTOMAKE_VER=1.9			# chapter 6
+export BASH_VER=3.0
+export BIN86_VER=0.16.11
+export BINUTILS_VER=2.15.91.0.2		# can be either FSF or HJL Binutils
+export BISON_VER=1.875a
+export BZIP2_VER=1.0.2
+export COREUTILS_VER=5.2.1
+export DEJAGNU_VER=1.4.4
+export DIFFUTILS_VER=2.8.4
+export E2FSPROGS_VER=1.35		# chapter 6
+export ED_VER=0.2			# chapter 6
+export EXPECT_VER=5.41.0
+export FILE_VER=4.10			# chapter 6
+export FINDUTILS_VER=4.1.20
+export FLEX_VER=2.5.31
+export GAWK_VER=3.1.3
+export GCC_VER=3.4.1
+export GETTEXT_VER=0.14.1
+export GLIBC_VER=2.3.4-20040701
+export GREP_VER=2.5.1
+export GROFF_VER=1.19.1			# chapter 6
+export GZIP_VER=1.3.5
+export HOTPLUG_VER=""
+export IANA_ETC_VER=1.01
+export INETUTILS_VER=1.4.2		# chapter 6
+export IPROUTE2_VER=""
+export KBD_VER=1.12			# chapter 6
+export KERNEL_VER=2.6.7
+export LESS_VER=382			# chapter 6
+export LFS_BS_VER=2.2.1			# chapter 6
+export LIBTOOL_VER=1.5.6		# chapter 6
+export LILO_VER=22.5.1
+export LINUX_LIBC_HDRS_VER=2.6.7.0
+export M4_VER=1.4.1
+export MAKEDEV_VER=1.7
+export MAKE_DEVICES_VER=1.2
+export MAKE_VER=3.80
+export MAN_VER=1.5n			# chapter 6
+export MODUTILS_VER=2.4.26		# chapter 6
+export MODINITTOOLS_VER=3.0		# chapter 6
+export NASM_VER=0.98.38
+export NATIVE_BINUTILS_VER=2.15		# FSF binutils versions only
+export NCURSES_VER=5.4
+export NETTOOLS_VER=1.60		# chapter 6
+export NFSUTILS_VER=""
+export PATCH_VER=2.5.9
+export PERL_VER=5.8.5
+export PORTMAP_VER=""
+export PROCINFO_VER=18			# chapter 6
+export PROCPS_VER=3.2.2			# chapter 6
+export PSMISC_VER=21.5			# chapter 6
+export READLINE_VER=5.0
+export SED_VER=4.1.1
+export SHADOW_VER=4.0.4.1		# chapter 6
+export STRACE_VER=4.5.5
+export SYSKLOGD_VER=1.4.1		# chapter 6
+export SYSVINIT_VER=2.85		# chapter 6
+export TAR_VER=1.14
+export TCPWRAP_VER=""
+export TCL_VER=8.4.7
+export TEXINFO_VER=4.7
+export UDEV_VER=030
+export UTILLINUX_VER=2.12a
+export VIM_VER=6.3			# chapter 6
+export ZLIB_VER=1.2.1
+
+# Sort out NATIVE_BINUTILS_VER for native builds
+hostos=`uname`
+if [ ! "${hostos}" = "Linux" ]; then
+   # Not linux, cannot use HJL
+   case ${BINUTILS_VER} in
+      *.9[0-9].[0-9]* )
+      ;;
+      * )
+         export NATIVE_BINUTILS_VER=${BINUTILS_VER}
+      ;;
+   esac
+fi
Index: scripts/plfs-packages
===================================================================
--- scripts/plfs-packages	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/plfs-packages	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+plfs-configs/plfs-packages-20050515
Index: scripts/target-scripts/host-bin86.sh
===================================================================
--- scripts/target-scripts/host-bin86.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/host-bin86.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# cross-lfs build-host bin86 build
+# --------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG="bin86-host.log"
+
+unpack_tarball bin86-${BIN86_VER} &&
+cd ${SRC}/${PKGDIR}
+
+# only build 32bit
+case ${BUILD} in
+   x86_64* ) ARCH_CFLAGS="-m32" ;;
+esac
+
+max_log_init Bin86 ${BIN86_VER} host ${BUILDLOGS} ${LOG}
+make CC="gcc ${ARCH_CFLAGS}" \
+   >> ${LOGFILE} 2>&1 &&
+make CC="gcc ${ARCH_CFLAGS}" -C ld \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make  CC="gcc ${ARCH_CFLAGS}" PREFIX=${HST_TOOLS} install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
Index: scripts/target-scripts/host-lilo.sh
===================================================================
--- scripts/target-scripts/host-lilo.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/host-lilo.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,60 @@
+#!/bin/bash
+
+# cross-lfs build-host lilo build
+# -------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG="lilo-host.log"
+unpack_tarball lilo-${LILO_VER} &&
+cd ${SRC}/${PKGDIR}
+
+case ${KERNEL_VER} in
+   2.[56].* )
+      case ${LILO_VER} in
+         22.5.1 )
+            #apply_patch lilo-22.5.1-2.6.0hdr-fix
+            #avoid LVM for the moment
+            if [ ! -f Makefile-ORIG ]; then cp -p Makefile Makefile-ORIG ; fi
+            sed '/^CONFIG=/s@ -DLVM@@g' Makefile-ORIG > Makefile
+
+            # need PAGE_SIZE from <asm/page.h>
+            if [ ! -f boot.c-ORIG ]; then cp -p boot.c boot.c-ORIG ; fi
+            sed '/^#include <sys\/stat.h>/a \
+#include <asm/page.h>' boot.c-ORIG > boot.c
+
+            if [ ! -f partition.c-ORIG ]; then
+              cp -p partition.c partition.c-ORIG
+            fi
+            sed '/^#include <asm\/unistd.h>/a \
+#include <asm/page.h>' partition.c-ORIG > partition.c
+         ;;
+      esac
+   ;;
+esac
+
+# TODO: THIS IS WRONG.
+case ${TGT_ARCH} in
+   x86_64 ) ARCH_CFLAGS="-m32" ;;
+esac
+
+max_log_init Lilo ${LILO_VER} host ${BUILDLOGS} ${LOG}
+make CC="gcc ${ARCH_CFLAGS}" \
+   SBIN_DIR=${HST_TOOLS}/sbin \
+   USRSBIN_DIR=${HST_TOOLS}/sbin \
+   MAN_DIR=${HST_TOOLS}/share/man \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   SBIN_DIR=${HST_TOOLS}/sbin \
+   USRSBIN_DIR=${HST_TOOLS}/sbin \
+   MAN_DIR=${HST_TOOLS}/share/man \
+   >> ${LOGFILE} &&
+echo " o ALL OK" || barf
+
Index: scripts/target-scripts/host-nasm.sh
===================================================================
--- scripts/target-scripts/host-nasm.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/host-nasm.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# cross-lfs build-host nasm build
+# -------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG="nasm-host.log"
+
+unpack_tarball nasm-${NASM_VER} &&
+cd ${SRC}/${PKGDIR}
+
+# build nasm, bin86 and lilo 32 bit
+#case ${TGT_ARCH} in
+#   x86_64 ) ARCH_CFLAGS="-m32" ;;
+#esac
+
+mkdir -p ${HST_TOOLS}/share/man/man1
+
+max_log_init nasm ${NASM_VER} host ${CONFLOGS} ${LOG}
+CFLAGS="-O2 -pipe" \
+./configure --prefix=${HST_TOOLS} \
+   --libexecdir=${HST_TOOLS}/lib/nasm \
+   --mandir=${HST_TOOLS}/share/man \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+# should use "make everything" to generate docs, but we won't
+# have ps2pdf yet
+make LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} &&
+make install_rdf \
+   >> ${LOGFILE} &&
+echo " o ALL OK" || barf
+
Index: scripts/target-scripts/make_symlinks.sh
===================================================================
--- scripts/target-scripts/make_symlinks.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/make_symlinks.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [ -z ${SCRIPTS} ]; then exit 1 ;fi
+
+ln -s target-bzip2.sh	${SCRIPTS}/target-scripts/target-bzip2-64.sh 
+ln -s target-gettext.sh	${SCRIPTS}/target-scripts/target-gettext-64.sh 
+ln -s target-ncurses.sh	${SCRIPTS}/target-scripts/target-ncurses-64.sh 
+ln -s target-zlib.sh	${SCRIPTS}/target-scripts/target-zlib-64.sh 
Index: scripts/target-scripts/target-bash.sh
===================================================================
--- scripts/target-scripts/target-bash.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-bash.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,108 @@
+#!/bin/bash
+
+# cross-lfs target bash build
+# ---------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=bash-target.log
+
+unpack_tarball bash-${BASH_VER} &&
+cd ${PKGDIR}
+
+set_libdirname
+setup_multiarch
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+   INSTALL_PREFIX="${LFS}${BUILD_PREFIX}"
+   INSTALL_OPTIONS="DESTDIR=${LFS}"
+else
+   BUILD_PREFIX=${TGT_TOOLS}
+   INSTALL_PREFIX="${TGT_TOOLS}"
+   INSTALL_OPTIONS=""
+fi
+
+case ${BASH_VER} in
+   2.05b )
+      # Apply published official patches fro bash-2.05b
+      apply_patch bash-2.05b-gnu_fixes-2
+      if [ x${TGT_ARCH} = xm68k ]; then
+         cat >config.cache <<END
+ac_cv_func_setvbuf_reversed=${ac_cv_func_setvbuf_reversed=no}
+bash_cv_dup2_broken=${bash_cv_dup2_broken=no}
+bash_cv_func_sigsetjmp=${bash_cv_func_sigsetjmp=present}
+bash_cv_func_strcoll_broken=${bash_cv_func_strcoll_broken=yes}
+bash_cv_getcwd_calls_popen=${bash_cv_getcwd_calls_popen=no}
+bash_cv_getenv_redef=${bash_cv_getenv_redef=yes}
+bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes}
+bash_cv_job_control_missing=${bash_cv_job_control_missing=present}
+bash_cv_must_reinstall_sighandlers=${bash_cv_must_reinstall_sighandlers=no}
+bash_cv_pgrp_pipe=${bash_cv_pgrp_pipe=no}
+bash_cv_printf_a_format=${bash_cv_printf_a_format=yes}
+bash_cv_sys_named_pipes=${bash_cv_sys_named_pipes=present}
+bash_cv_sys_siglist=${bash_cv_sys_siglist=yes}
+bash_cv_ulimit_maxfds=${bash_cv_ulimit_maxfds=yes}
+bash_cv_under_sys_siglist=${bash_cv_under_sys_siglist=yes}
+bash_cv_opendir_not_robust=${bash_cv_opendir_not_robust=no}
+bash_cv_unusable_rtsigs=${bash_cv_unusable_rtsigs=no}
+END
+      else
+         cat >config.cache <<END
+bash_cv_have_mbstate_t=${bash_cv_have_mbstate_t=yes}
+END
+      fi
+
+      # If using gcc-3.4.x, patch some syntax gcc-3.4 doesn't like
+      # TODO: Get gcc version from cross-gcc itself
+      case ${GCC_VER} in
+         3.4* )
+            apply_patch bash-2.05b-gcc34-1
+         ;;
+      esac
+   ;;
+   3.0 )
+      # Reported on bug-bash by Tim Waugh <twaugh@redhat.com>
+      # http://lists.gnu.org/archive/html/bug-bash/2004-09/msg00081.html 
+      apply_patch bash-3.0-fixes-1
+      apply_patch bash-3.0-avoid_WCONTINUED-1
+   ;;
+esac
+
+# Patch Makefile.in to use ${TARGET}-size instead of size
+test -f Makefile.in-ORIG ||
+   mv Makefile.in Makefile.in-ORIG
+
+# Following defaults to powerpc if doing ppc* build...
+#sed 's@size \$(Program)@\$(MACHTYPE)-&@g' Makefile.in-ORIG > Makefile.in
+sed "s@size \$(Program)@${TARGET}-&@g" Makefile.in-ORIG > Makefile.in
+
+max_log_init Bash ${BASH_VER} "target (shared)" ${CONFLOGS} ${LOG}
+CC="${TARGET}-gcc ${ARCH_CFLAGS}" \
+CXX="${TARGET}-g++ ${ARCH_CFLAGS}" \
+AR="${TARGET}-ar" RANLIB="${TARGET}-ranlib" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+CXXFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=${BUILD_PREFIX} \
+   --host=${TARGET} --with-curses --cache-file=config.cache \
+   --without-bash-malloc \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+# Don't build bash with parallelism, race conditions cause version.h
+# not to be created
+min_log_init ${BUILDLOGS} &&
+make LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make ${INSTALL_OPTIONS} install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+ln -sf bash ${INSTALL_PREFIX}/bin/sh
Index: scripts/target-scripts/target-bin86.sh
===================================================================
--- scripts/target-scripts/target-bin86.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-bin86.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# cross-lfs target bin86 build
+# ----------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG="bin86-target.log"
+
+unpack_tarball bin86-${BIN86_VER} &&
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+   INSTALL_PREFIX="${LFS}${BUILD_PREFIX}"
+   INSTALL_OPTIONS="DESTDIR=${LFS}"
+else
+   BUILD_PREFIX=${TGT_TOOLS}
+   INSTALL_PREFIX="${TGT_TOOLS}"
+   INSTALL_OPTIONS=""
+fi
+
+cd ${SRC}/${PKGDIR}
+
+# only build 32bit
+case ${TGT_ARCH} in
+   x86_64 ) ARCH_CFLAGS="-m32" ;;
+esac
+
+max_log_init Bin86 ${BIN86_VER} target ${BUILDLOGS} ${LOG}
+make CC="${TARGET}-gcc ${ARCH_CFLAGS}" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make PREFIX=${INSTALL_PREFIX} install \
+   >> ${LOGFILE} &&
+echo " o ALL OK" || barf
Index: scripts/target-scripts/target-binutils.sh
===================================================================
--- scripts/target-scripts/target-binutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-binutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,135 @@
+#!/bin/bash
+
+# cross-lfs target binutils build
+# -------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG="binutils-target.log"
+
+set_libdirname
+setup_multiarch
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+   INSTALL_PREFIX="${LFS}${BUILD_PREFIX}"
+   INSTALL_OPTIONS="DESTDIR=${LFS}"
+else
+   BUILD_PREFIX=${TGT_TOOLS}
+   INSTALL_PREFIX="${TGT_TOOLS}"
+   INSTALL_OPTIONS=""
+fi
+
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=${BUILD_PREFIX}/${libdirname}"
+fi
+
+
+# HACK
+if [ ! "X${TGT_CFLAGS}" = "X" ]; then
+	ARCH_CFLAGS="${TGT_CFLAGS} ${ARCH_CFLAGS}"
+fi
+
+# if target is same as build host, adjust build slightly to avoid running
+# configure checks which we cannot run
+if [ "${TARGET}" = "${BUILD}" ]; then
+   BUILD=`echo ${BUILD} | sed 's@\([_a-zA-Z0-9]*\)\(-[_a-zA-Z0-9]*\)\(.*\)@\1\2x\3@'`
+fi
+
+unpack_tarball binutils-${BINUTILS_VER} &&
+
+# Determine whether this binutils requires
+# 'make configure-host' and whether
+# ld search path can be set with --with-lib-path.
+# Returned in ${BINUTILS_CONF_HOST} and
+# ${BINUTILS_WITH_LIB_PATH} respectively
+                                                                                
+# TODO: check for architecture specific patches in check_binutils
+#       ( alpha )
+check_binutils
+
+cd ${SRC}/${PKGDIR}
+
+case ${BINUTILS_VER} in
+   # 20031015 - fix static linking issues during testsuite
+   #            with current CVS glibc. kernel 2.5.68+
+   #            Will only patch HJL 2.14.90.0.[6-7]
+   2.14.90.0.[6-7] ) apply_patch binutils-2.14.90.0.7-fix-static-link ;;
+
+   # Issue with HJL binutils 2.15.94.0.1 stripping needed information
+   # one manifestation is with stripping TLS info from libc.a
+   2.15.94.0.1 ) apply_patch binutils-2.15.94.0.1-fix-strip-1 ;;
+esac
+
+## Check if we have sysroot set
+if [ ! "${USE_SYSROOT}" = "Y" ]; then
+   # sysroot not set, just set libpath
+   test Y == "${BINUTILS_WITH_LIB_PATH}" &&
+      BINUTILS_LIB_PATH="--with-lib-path=${TGT_TOOLS}/lib" ||
+      BINUTILS_LIB_PATH=""
+fi
+
+# These are probably not required for sysrooted builds, but
+# they don't hurt...
+case ${BINUTILS_VER} in
+   2.14 )
+      apply_patch binutils-2.14-genscripts-multilib
+   ;;
+   2.14.90.0.8 )
+      apply_patch binutils-2.14.90.0.8-genscripts-multilib
+   ;;
+   2.15.9[0124].0.* | 2.15 )
+      apply_patch binutils-2.15.91.0.1-genscripts-multilib-2
+   ;;
+   2.16* )
+      apply_patch binutils-2.15.91.0.1-genscripts-multilib-2
+   ;;
+esac
+
+cd ${SRC}
+                                                                                
+# Remove pre-existing build directory and recreate
+test -d binutils-${BINUTILS_VER}-target-build &&
+   rm -rf binutils-${BINUTILS_VER}-target-build
+                                                                                
+mkdir binutils-${BINUTILS_VER}-target-build
+cd binutils-${BINUTILS_VER}-target-build
+
+max_log_init Binutils ${BINUTILS_VER} target ${CONFLOGS} ${LOG}
+CC="${TARGET}-gcc ${ARCH_CFLAGS}" ../${PKGDIR}/configure \
+   --prefix=${BUILD_PREFIX} \
+   --build=${BUILD} \
+   --host=${TARGET} \
+   --target=${TARGET} \
+   --disable-nls ${extra_conf} \
+   --enable-shared \
+   --enable-64-bit-bfd ${BINUTILS_LIB_PATH} \
+   >> ${LOGFILE} 2>&1 &&
+{
+   # Run make configure-host if required
+   test Y != "${BINUTILS_CONF_HOST}" ||
+   {
+      echo -e "\nmake configure-host\n${BRKLN}" >> ${LOGFILE}
+      make configure-host >> ${LOGFILE} 2>&1
+   }
+} &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make headers -C bfd \
+   >> ${LOGFILE} 2>&1 &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${INSTLOGS} &&
+make ${INSTALL_OPTIONS} install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o All OK" || barf
+
+# Copy over libiberty.h
+cp -p ${SRC}/${PKGDIR}/include/libiberty.h ${INSTALL_PREFIX}/include/libiberty.h
Index: scripts/target-scripts/target-bison.sh
===================================================================
--- scripts/target-scripts/target-bison.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-bison.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,62 @@
+#!/bin/bash
+
+# cross-lfs target bison build
+# ----------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=bison-target.log
+
+set_libdirname
+setup_multiarch
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+   INSTALL_PREFIX="${LFS}${BUILD_PREFIX}"
+   INSTALL_OPTIONS="DESTDIR=${LFS}"
+else
+   BUILD_PREFIX=${TGT_TOOLS}
+   INSTALL_PREFIX="${TGT_TOOLS}"
+   INSTALL_OPTIONS=""
+fi
+
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=${BUILD_PREFIX}/${libdirname}"
+fi
+
+unpack_tarball bison-${BISON_VER} &&
+cd ${PKGDIR}
+
+max_log_init Bison ${BISON_VER} "target (shared)" ${CONFLOGS} ${LOG}
+CC="${TARGET}-gcc ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=${BUILD_PREFIX} \
+   --host=${TARGET} ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make ${INSTALL_OPTIONS} install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+test -f ${INSTALL_PREFIX}/bin/yacc ||
+   cat > ${INSTALL_PREFIX}/bin/yacc << "EOF"
+#!/bin/sh
+# Begin ${BUILD_PREFIX}/bin/yacc
+
+exec ${BUILD_PREFIX}/bin/bison -y "$@"
+
+# End ${BUILD_PREFIX}/bin/yacc
+EOF
+
+chmod 755 ${INSTALL_PREFIX}/bin/yacc
Index: scripts/target-scripts/target-bzip2-32.sh
===================================================================
--- scripts/target-scripts/target-bzip2-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-bzip2-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+target-bzip2.sh
Index: scripts/target-scripts/target-bzip2-64.sh
===================================================================
--- scripts/target-scripts/target-bzip2-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-bzip2-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+target-bzip2.sh
Index: scripts/target-scripts/target-bzip2-n32.sh
===================================================================
--- scripts/target-scripts/target-bzip2-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-bzip2-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+target-bzip2.sh
Index: scripts/target-scripts/target-bzip2.sh
===================================================================
--- scripts/target-scripts/target-bzip2.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-bzip2.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,73 @@
+#!/bin/bash
+
+# cross-lfs target bzip2 build
+# ----------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+
+LOG="bzip2-target.log"
+libdirname="lib"
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+   INSTALL_PREFIX="${LFS}${BUILD_PREFIX}"
+else
+   BUILD_PREFIX=${TGT_TOOLS}
+   INSTALL_PREFIX="${TGT_TOOLS}"
+fi
+
+export CC="${TARGET}-gcc ${ARCH_CFLAGS}"
+export CXX="${TARGET}-g++ ${ARCH_CFLAGS}"
+
+unpack_tarball bzip2-${BZIP2_VER} &&
+cd ${PKGDIR}
+
+# Edit Makefiles
+for file in Makefile-libbz2_so Makefile ; do
+   test -f ${file}-ORIG ||
+      mv ${file} ${file}-ORIG
+
+   sed -e "s@^\(CC=\).*@\1${CC}@g" \
+       -e "s@^\(AR=\).*@\1${TARGET}-ar@g" \
+       -e "s@^\(RANLIB=\).*@\1${TARGET}-ranlib@g" \
+       -e 's@^\(all:.*\) test@\1@g' \
+       -e "s@/lib\(/\| \|$\)@/${libdirname}\1@g" \
+       ${file}-ORIG > ${file}
+done
+
+max_log_init Bzip2 ${BZIP2_VER} "target (shared)" ${BUILDLOGS} ${LOG}
+make -f Makefile-libbz2_so \
+   >> ${LOGFILE} 2>&1 &&
+echo -e "\n${BRKLN}" >> ${LOGFILE} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+# Remove existing bz* files in ${TGT_TOOLS}/bin
+rm -f ${INSTALL_PREFIX}/bin/bz*
+
+min_log_init ${INSTLOGS} &&
+CC="${CC}" CXX="${CXX}" make PREFIX=${INSTALL_PREFIX} install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+yes | cp bzip2-shared ${INSTALL_PREFIX}/bin/bzip2
+ln -s libbz2.so.1.0 libbz2.so
+
+# There is no cp -a under solaris... thats why we build coreutlis cp
+cp -a libbz2.so* ${INSTALL_PREFIX}/${libdirname}
+
+rm -f ${INSTALL_PREFIX}/bin/{bunzip2,bzcat}
+ln -s bzip2 ${INSTALL_PREFIX}/bin/bunzip2
+ln -s bzip2 ${INSTALL_PREFIX}/bin/bzcat
+#ldconfig
Index: scripts/target-scripts/target-coreutils.sh
===================================================================
--- scripts/target-scripts/target-coreutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-coreutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,79 @@
+#!/bin/bash
+
+# cross-lfs target coreutils build
+# --------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=coreutils-target.log
+
+unpack_tarball coreutils-${COREUTILS_VER}
+cd ${PKGDIR}
+
+set_libdirname
+setup_multiarch
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+   INSTALL_PREFIX="${LFS}${BUILD_PREFIX}"
+   INSTALL_OPTIONS="DESTDIR=${LFS}"
+else
+   BUILD_PREFIX=${TGT_TOOLS}
+   INSTALL_PREFIX="${TGT_TOOLS}"
+   INSTALL_OPTIONS=""
+fi
+
+# If we don't want to conform to POSIX 200212L, override
+# NOTE: This is coreutils 5.0 specific, later versions will have
+#       a configure/compile time option
+case ${COREUTILS_VER} in
+   5.1.7 | 5.[2-9]* ) ;;
+   * )   mv lib/posixver.c lib/posixver.c-ORIG
+         sed '/\/\* The POSIX version that utilities should conform to/i\
+#undef _POSIX2_VERSION\
+#define _POSIX2_VERSION 199209L\
+   ' lib/posixver.c-ORIG > lib/posixver.c
+   ;;
+esac
+
+# Cannot check whether we have a working getline in glibc when
+# cross compiling. Say yes here as we will get failure on x86_64
+# where getline is type _IO_ssize_t in stdio.h (long with x86_64)
+# and the provided getline in coreutils (well gnulib) is type int.
+echo "am_cv_func_working_getline=yes" >> config.cache
+
+# UTILS_OPEN_MAX does not get defined when cross-compiling as
+# it is an AC_RUN test used to determine roughly how many open
+# FD's a process can have.
+# We will set it to 1024 (NR_OPEN in /usr/include/linux/limits.h )
+echo "utils_cv_sys_open_max=1024" >> config.cache
+
+# if target is same as build host, adjust build slightly to avoid running
+# configure checks which we cannot run
+if [ "${TARGET}" = "${BUILD}" ]; then
+   BUILD=`echo ${BUILD} | sed 's@\([_a-zA-Z0-9]*\)\(-[_a-zA-Z0-9]*\)\(.*\)@\1\2x\3@'`
+fi
+
+max_log_init Coreutils ${COREUTILS_VER} "target (shared)" ${CONFLOGS} ${LOG}
+CC="${TARGET}-gcc ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" DEFAULT_POSIX2_VERSION=199209 \
+./configure --prefix=${BUILD_PREFIX}  \
+   --build=${BUILD} --host=${TARGET} --cache-file=config.cache \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+echo Password: &&
+su -c "make ${INSTALL_OPTIONS} install" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/target-scripts/target-dev.sh
===================================================================
--- scripts/target-scripts/target-dev.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-dev.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,109 @@
+#!/bin/bash
+
+# cross-lfs target /dev tree build
+# --------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+#set -x
+cd ${SRC}
+LOG=dev-target.log
+
+do_makedev() {
+   ### MAKEDEV ###
+   LOG="MAKEDEV.log"
+   max_log_init MAKEDEV ${MAKEDEV_VER} "" ${INSTLOGS} ${LOG}
+   bzcat <${TARBALLS}/MAKEDEV-${MAKEDEV_VER}.bz2 >${LFS}/dev/MAKEDEV &&
+   echo " o unpacked OK" &&
+   cd ${LFS}/dev &&
+   chmod 754 MAKEDEV &&
+   echo "Password: " &&
+   su -c "./MAKEDEV -v generic-nopty" > ${LOGFILE} 2>&1 &&
+   echo " o Devices created OK" || barf
+}
+
+do_udev() {
+   LOG=udev-target.log
+
+   set_libdirname
+   setup_multiarch
+
+   unpack_tarball udev-${UDEV_VER}
+   cd ${PKGDIR}
+
+   # apply a patch to fix permissions on /dev/null being reset root 600 by
+   # fcron. THis behaviour appeared with udev-027
+   case ${UDEV_VER} in
+      027 )
+         apply_patch udev-027-permissions-1
+      ;;
+   esac
+
+   max_log_init udev ${UDEV_VER} "" ${BUILDLOGS} ${LOG}
+   CFLAGS="${TGT_CFLAGS}" \
+   make CROSS="${TARGET}-" \
+        CC="${TARGET}-gcc ${ARCH_CFLAGS}" \
+        LD="${TARGET}-gcc ${ARCH_CFLAGS}" \
+        V="true" \
+        udevdir=/dev \
+      > ${LOGFILE} 2>&1 &&
+   echo " o Build OK" || barf
+
+   min_log_init ${INSTLOGS} &&
+   su -c "CFLAGS=\"${TGT_CFLAGS}\" \
+          make DESTDIR=${LFS} \
+               CROSS=\"${TARGET}-\" \
+               CC=\"${TARGET}-gcc ${ARCH_CFLAGS}\" \
+               LD=\"${TARGET}-gcc ${ARCH_CFLAGS}\" \
+               V=\"true\" \
+               udevdir=/dev install" \
+      > ${LOGFILE} 2>&1 &&
+   echo " o Install OK" || barf
+
+   # Create bare minimum devices required
+   echo " - Creating /dev/console and /dev/null"
+   echo "Password: "
+   su -c "mknod -m 600 ${LFS}/dev/console c 5 1 ; \
+          mknod -m 666 ${LFS}/dev/null c 1 3 "
+
+   # create rules and permissions files
+   echo " - Adding rules/permissions files"
+   echo "Password: "
+   case ${UDEV_VER} in
+      02[7-9] | 0[3-4]* | 050 )
+         su -c "cp ${CONFIGS}/udev/udev-config-2.permissions ${LFS}/etc/udev/permissions.d/25-lfs.permissions ; \
+                cp ${CONFIGS}/udev/udev-config-1.rules ${LFS}/etc/udev/rules.d/25-lfs.rules"
+      ;;
+      # This was last updated for 056, this will need to be tracked...
+      05[1-9] | 0[6-9]* )
+         su -c "cp ${CONFIGS}/udev/udev-config-3.rules ${LFS}/etc/udev/rules.d/25-lfs.rules"
+      ;;
+   esac
+
+}
+
+case "${KERNEL_VER}" in
+   2.5* | 2.6* )
+      if [ "Y" = "${UDEV}" ]; then
+         do_udev
+      elif [ "Y" = "${DEVFS}" ]; then
+         do_devfsd
+      else
+         do_makedev
+      fi
+   ;;
+   2.4* )
+      if [ "Y" = "${DEVFS}" ]; then
+         do_devfs
+      else
+         do_makedev
+      fi
+   ;;
+   2.2* )
+      do_makedev
+   ;;
+esac
+
Index: scripts/target-scripts/target-diffutils.sh
===================================================================
--- scripts/target-scripts/target-diffutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-diffutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+# cross-lfs target diffutils build
+# --------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=diffutils-target.log
+
+unpack_tarball diffutils-${DIFFUTILS_VER} &&
+cd ${PKGDIR}
+
+set_libdirname
+setup_multiarch
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+   INSTALL_PREFIX="${LFS}${BUILD_PREFIX}"
+   INSTALL_OPTIONS="DESTDIR=${LFS}"
+else
+   BUILD_PREFIX=${TGT_TOOLS}
+   INSTALL_PREFIX="${TGT_TOOLS}"
+   INSTALL_OPTIONS=""
+fi
+
+max_log_init Diffutils ${DIFFUTILS_VER} "target (shared)" ${CONFLOGS} ${LOG}
+CC="${TARGET}-gcc ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=${BUILD_PREFIX} \
+   --host=${TARGET} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make ${INSTALL_OPTIONS} install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
Index: scripts/target-scripts/target-e2fsprogs.sh
===================================================================
--- scripts/target-scripts/target-e2fsprogs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-e2fsprogs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,157 @@
+#!/bin/bash
+
+# cross-lfs target e2fsprogs build
+# --------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+# NOTE: This installs to the target root,
+#       NOT to ${TGT_TOOLS}
+#
+# NOTE: also requires gettext built native on the build host
+
+
+cd ${SRC}
+LOG=e2fsprogs-target.log
+set_libdirname
+setup_multiarch
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+   INSTALL_PREFIX="${LFS}${BUILD_PREFIX}"
+   INSTALL_OPTIONS="DESTDIR=${LFS}"
+   extra_conf="--with-root-prefix=\"\""
+else
+   BUILD_PREFIX=${TGT_TOOLS}
+   INSTALL_PREFIX="${TGT_TOOLS}"
+   INSTALL_OPTIONS=""
+fi
+
+unpack_tarball e2fsprogs-${E2FSPROGS_VER}
+
+cd ${PKGDIR}
+# Apply patch for HTREE problem posted by GS 3/19/2003
+#apply_patch e2fsprogs-${E2FSPROGS_VER}
+
+case ${KERNEL_VER} in
+   2.6* )
+   # patch util.c to remove SCSI_BLOCK_MAJOR references
+   # SCSI_DISK_MAJOR is no longer defined in linux/major.h for 2.6 kernel 
+   # TODO: check future e2fsprogs versions to see if this is fixed
+   case ${E2FSPROGS_VER} in
+      1.34* )
+         # check if SCSI_DISK_MAJOR defined in linux/major.h
+         grep SCSI_DISK_MAJOR ${INSTALL_PREFIX}/include/linux/major.h > /dev/null 2>&1 ||
+            apply_patch e2fsprogs-${E2FSPROGS_VER}-2.6.0hdr-fix
+      ;;
+   esac
+   ;;
+esac
+
+
+case ${E2FSPROGS_VER} in
+   1.35 )
+      # Fix some permissions issues when building the e2fsprogs 1.35 tarball
+      # as a normal user. Need to check if previous versions are affected
+      chmod 755 configure
+      chmod 644 po/*
+   ;;
+   1.37 )
+      # Fix braindead error in e2p tests where include paths aren't
+      # being passed 
+      if [ ! -f lib/e2p/Makefile.in-ORIG ]; then
+         mv lib/e2p/Makefile.in lib/e2p/Makefile.in-ORIG
+      fi
+
+      sed 's@-DTEST_PROGRAM@$(ALL_CFLAGS) &@g' \
+         lib/e2p/Makefile.in-ORIG > lib/e2p/Makefile.in 
+   ;;
+esac
+
+# Edit configure so libdir and root_libdir point at */lib64 .
+# Also handles additional_libdir (used if--with-libiconv-prefix is set,
+# if we did set it (which we dont) we'd want the 64bit version anyway) ...
+chmod 755 configure
+test -f configure-ORIG ||
+   cp -p configure configure-ORIG
+
+sed "/libdir=.*\/lib/s@/lib@/${libdirname}@g" \
+   configure-ORIG > configure
+
+# We need to check if the build OS has a <getopt.h>.
+# If it doesn't, and HAVE_GETOPT_H is defined, util/subst.c will barf
+# (its compiled with BUILD_CC ie: the hosts cc). This is the case building
+# linux from solaris. Hack util/subst.c where necessary
+
+# TODO: actually try to compile something...
+if [ ! -f /usr/include/getopt.h ]; then
+   test -f util/subst.c-ORIG ||
+      mv util/subst.c util/subst.c-ORIG
+
+   # This will avoid the problem.
+   # Ideally the build-host would have a separate define than for
+   # the target, one day I may even patch it so it does...
+   sed 's@HAVE_GETOPT_H@HOST_&@g' \
+      util/subst.c-ORIG > util/subst.c
+fi
+
+cd ${SRC}
+test -d ${SRC}/e2fsprogs-${E2FSPROGS_VER}-build &&
+    rm -rf ${SRC}/e2fsprogs-${E2FSPROGS_VER}-build
+
+mkdir ${SRC}/e2fsprogs-${E2FSPROGS_VER}-build &&
+cd ${SRC}/e2fsprogs-${E2FSPROGS_VER}-build
+
+# When cross-compiling configure cannot determine sizes and assumes
+# short=2, int=4, long=4, long long=8
+# This may not be correct for certain architectures, override here
+case ${TGT_ARCH} in
+   ppc64 | powerpc64 )
+      # TODO: what is size of long long on ppc64?
+      echo "ac_cv_sizeof_long_long=8" >> config.cache
+      echo "ac_cv_sizeof_long=8" >> config.cache
+      echo "ac_cv_sizeof_int=4" >> config.cache
+      echo "ac_cv_sizeof_short=2" >> config.cache
+      extra_conf="${extra_conf} --cache-file=config.cache"
+   ;;
+esac
+
+max_log_init E2fsprogs ${E2FSPROGS_VER} "Final (shared)" ${CONFLOGS} ${LOG}
+CC="${TARGET}-gcc ${ARCH_CFLAGS}" \
+AR="${TARGET}-ar" RANLIB="${TARGET}-ranlib" \
+LD="${TARGET}-ld" STRIP="${TARGET}-strip" \
+CFLAGS="-O2 -pipe" ../${PKGDIR}/configure --prefix=${BUILD_PREFIX} \
+   --host=${TARGET} --enable-elf-shlibs ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make CC="${TARGET}-gcc ${ARCH_CFLAGS}" LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make ${INSTALL_OPTIONS} install \
+   >> ${LOGFILE} 2>&1 &&
+make ${INSTALL_OPTIONS} install-libs \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+if [ ! "${USE_SYSROOT}" = "Y" ]; then
+   # if ${LFS}/sbin doesn't exist, create it
+   set -x
+   if [ ! -d ${LFS}/sbin ]; then
+      mkdir -p ${LFS}/sbin
+   fi
+   
+   # Install these for the benefit of init scripts. 
+   # Should be overwritten in ch 6.
+   cd ${LFS}/sbin
+   ln -sf ..${TGT_TOOLS}/sbin/fsck.ext2 .
+   ln -sf ..${TGT_TOOLS}/sbin/fsck.ext3 .
+   ln -sf ..${TGT_TOOLS}/sbin/e2fsck .
+   set +x
+fi
Index: scripts/target-scripts/target-final-prep-wrapper.sh
===================================================================
--- scripts/target-scripts/target-final-prep-wrapper.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-final-prep-wrapper.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# Simple wrapper for target-final-prep so it is run as root
+
+su -c ${SCRIPTS}/target-scripts/target-final-prep.sh
+
Index: scripts/target-scripts/target-final-prep.sh
===================================================================
--- scripts/target-scripts/target-final-prep.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-final-prep.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,235 @@
+#!/bin/bash
+
+# cross-lfs final target partition prep
+# -------------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+test x${LFS} != x || barf
+
+LOG=final-prep-target.log
+max_log_init "Final prep" "" "target" ${INSTLOGS} ${LOG}
+
+### Final Prep for chroot ###
+
+mkdir -p ${LFS}/{bin,boot,dev/pts,/dev/shm,etc/opt,home,lib,mnt,proc}
+mkdir -p ${LFS}/{root,sbin,tmp,usr/local,var,opt}
+
+case ${KERNEL_VER} in
+   2.5* | 2.6* ) mkdir -p ${LFS}/sys ;;
+esac
+
+for dirname in ${LFS}/usr ${LFS}/usr/local
+    do
+
+    mkdir -p $dirname/{bin,etc,include,lib,sbin,share,src}
+    # Apparently not FHS compliant but without these LFS breaks (RO)
+    ln -sf share/{man,doc,info} $dirname
+
+    # More FHS compliant but breaks LFS builds
+    #mkdir -p $dirname/{bin,include,lib,sbin,share,src}
+
+    mkdir -p $dirname/share/{dict,doc,info,locale,man}
+    mkdir -p $dirname/share/{nls,misc,terminfo,zoneinfo}
+    mkdir -p $dirname/share/man/man{1,2,3,4,5,6,7,8}
+done
+mkdir -p ${LFS}/usr/local/games
+ln -sf share/man ${LFS}/usr/local
+mkdir -p ${LFS}/var/{lock,log,mail,run,spool} &&
+mkdir -p ${LFS}/var/{tmp,opt,cache,lib/misc,local} &&
+mkdir -p ${LFS}/opt/{bin,doc,include,info} &&
+mkdir -p ${LFS}/opt/{lib,man/man{1,2,3,4,5,6,7,8}} &&
+
+touch ${LFS}/var/run/utmp ${LFS}/var/log/{btmp,lastlog,wtmp} &&
+chmod 644 ${LFS}/var/run/utmp ${LFS}/var/log/{btmp,lastlog,wtmp}
+
+chmod 0750 ${LFS}/root &&
+chmod 1777 ${LFS}/tmp ${LFS}/var/tmp
+
+if [ ! "${USE_SYSROOT}" = "Y" ]; then
+   # setup bash symlinks
+   ln -sf ..${TGT_TOOLS}/bin/bash ${LFS}/bin
+   ln -sf bash ${LFS}/bin/sh
+
+   # Required for glibc build
+   ln -sf ..${TGT_TOOLS}/bin/pwd ${LFS}/bin
+   ln -sf ../..${TGT_TOOLS}/bin/perl ${LFS}/usr/bin
+   # added for glibc make check
+   ln -sf ..${TGT_TOOLS}/bin/cat ${LFS}/bin
+
+   # added for binutils ar test
+   ln -sf ..${TGT_TOOLS}/bin/stty ${LFS}/bin
+   # ln -sf ../..${TGT_TOOLS}/bin/msgfmt   ${LFS}/usr/bin
+   # ln -sf ../..${TGT_TOOLS}/bin/xgettext ${LFS}/usr/bin
+   # ln -sf ../..${TGT_TOOLS}/bin/msgmerge ${LFS}/usr/bin
+   ln -sf ../..${TGT_TOOLS}/bin/install ${LFS}/usr/bin
+   ln -sf ../usr/bin/install ${LFS}/bin
+
+   # Added for ch6 findutils locate tests
+   ln -sf ..${TGT_TOOLS}/bin/echo ${LFS}/bin
+
+   ## CHECK IF FINDUTILS STILL NEEDS AWK/SED SYMLINKS ##
+   ln -sf ..${TGT_TOOLS}/bin/sed ${LFS}/bin
+   ln -sf ..${TGT_TOOLS}/bin/awk ${LFS}/bin
+
+   # ch6 ed make check needs cmp
+   ln -sf ../..${TGT_TOOLS}/bin/cmp ${LFS}/usr/bin
+
+   # for ch6 coreutils user checks
+   ln -sf ..${TGT_TOOLS}/bin/su ${LFS}/bin
+
+   # For the bootscripts
+   ln -sf ../..${TGT_TOOLS}/bin/find ${LFS}/usr/bin
+   ln -sf ..${TGT_TOOLS}/sbin/fsck ${LFS}/sbin
+   ln -sf ..${TGT_TOOLS}/bin/grep ${LFS}/bin
+   ln -sf ..${TGT_TOOLS}/bin/ls ${LFS}/bin
+   ln -sf ..${TGT_TOOLS}/bin/ln ${LFS}/bin
+   ln -sf ..${TGT_TOOLS}/bin/mkdir ${LFS}/bin
+   ln -sf ..${TGT_TOOLS}/bin/rm ${LFS}/bin
+   ln -sf ..${TGT_TOOLS}/bin/sleep ${LFS}/bin
+   ln -sf ..${TGT_TOOLS}/bin/chown ${LFS}/bin
+   ln -sf ..${TGT_TOOLS}/bin/chmod ${LFS}/bin
+   
+   # for hotplug...
+   ln -sf ..${TGT_TOOLS}/bin/uname ${LFS}/bin
+   ln -sf ../..${TGT_TOOLS}/bin/env ${LFS}/usr/bin
+   ln -sf ../..${TGT_TOOLS}/bin/cut ${LFS}/usr/bin
+   ln -sf ../..${TGT_TOOLS}/bin/od ${LFS}/usr/bin
+   ln -sf ../..${TGT_TOOLS}/bin/wc ${LFS}/usr/bin
+   ln -sf ../..${TGT_TOOLS}/bin/readlink ${LFS}/usr/bin
+fi
+
+if [ ! -f ${LFS}/etc/passwd ]; then
+   # Our new root user will be called "root".
+   # NOTE root password field should be "x" if shadow is installed.
+   echo "root::0:0:root:/root:/bin/bash" > ${LFS}/etc/passwd
+   echo "plfstest:x:1000:100:root:/root:/bin/bash" >> ${LFS}/etc/passwd
+   echo "nobody:x:65534:65534:nobody:/home:/bin/false" >> ${LFS}/etc/passwd
+fi
+
+chmod 644 ${LFS}/etc/passwd
+
+if [ ! -f ${LFS}/etc/shadow ]; then
+   # Get number of seconds since epoch
+   LASTCHG=`date +%s`
+   # Convert to days since epoch
+   LASTCHG=`expr ${LASTCHG} / 86400`
+
+   echo "root::${LASTCHG}:0:99999:7:::" > ${LFS}/etc/shadow
+   echo "plfstest:!:${LASTCHG}:0:99999:7:::" >> ${LFS}/etc/shadow
+   echo "nobody:!:${LASTCHG}:0:99999:7:::" >> ${LFS}/etc/shadow
+fi
+
+chmod 600 ${LFS}/etc/shadow
+
+# Note: these are from LFS book CVS 2003-03-24, but with some modifications
+if [ ! -f ${LFS}/etc/group ]; then
+	cat > ${LFS}/etc/group << "EOF"
+root:x:0:
+bin:x:1:
+sys:x:2:
+kmem:x:3:
+tty:x:4:
+tape:x:5:
+daemon:x:6:
+floppy:x:7:
+disk:x:8:
+lp:x:9:
+dialout:x:10:
+audio:x:11:
+wheel:x:12:
+users:x:100:
+nogroup:x:65534:
+EOF
+fi
+
+chmod 644 ${LFS}/etc/group
+
+# Create initial nsswitch.conf file
+
+cat > ${LFS}/etc/nsswitch.conf << "EOF" 
+passwd:	files
+shadow:	files
+group:	files
+hosts:	files dns
+EOF
+
+# Create files required for NSS
+
+# ${LFS}/etc/hosts should have been created when target-lfs-bootscripts was run.
+# If it wasnt (???) create one here
+
+test -f ${LFS}/etc/hosts || 
+   echo -e "127.0.0.1\tlocalhost.localdomain\tlocalhost" > ${LFS}/etc/hosts
+
+chmod 644 ${LFS}/etc/hosts
+
+# TODO: need to install 
+test -f ${LFS}/etc/resolv.conf ||
+   touch ${LFS}/etc/resolv.conf
+
+chmod 644 ${LFS}/etc/resolv.conf
+
+# This fstab is merely a template, you will have to edit the / entry before
+# attempting to boot a rw root filesystem.
+
+cat > ${LFS}/etc/fstab << "EOF" 
+#/dev/BOOT		/boot		ext2	noauto,noatime	1 1
+#/dev/ROOT		/		xfs	noatime		0 0
+#/dev/SWAP		none		swap	sw		0 0
+#/dev/cdroms/cdrom0	/mnt/cdrom	iso9660	noauto,ro	0 0
+#/dev/fd0		/mnt/floppy	auto	noauto		0 0
+none			/proc		proc	defaults	0 0
+none			/dev/pts	devpts	gid=4,mode=620	0 0
+none			/dev/shm	tmpfs	defaults	0 0
+EOF
+
+case ${KERNEL_VER} in
+   2.5* | 2.6* )
+      echo "none		/sys		sysfs	defaults		0 0" >> ${LFS}/etc/fstab
+   ;;
+esac
+
+chmod 644 ${LFS}/etc/fstab
+
+# We create /etc/shells for the benefit of inetutils ftpd
+
+cat > ${LFS}/etc/shells << "EOF"
+/bin/sh
+/bin/bash
+EOF
+
+chmod 644 ${LFS}/etc/shells
+
+# TODO: need to create some (if not all) of the following 
+# NSSFILES="ethers netmasks networks rpc netgroup automount aliases"
+
+# Unfortunately we can't just chown to root only the stuff owned by the user
+# running the build. That is because some installers created files with
+# certain group and user rights (bin, tty, etc). This gets screwed up if
+# the build host doesn't have identical system accounts to those in the
+# passwd file we just installed. So we chown the whole damn thing to root, being
+# careful of sticky, SGID and SUID files. Some systems clear those bits upon
+# chown.
+# The ch. 6 build will have to overwrite all of the problems this causes.
+
+cd ${LFS}
+( echo "These SUID files are having their user changed to root:"
+find . -user 0 -o \( -perm +4000 -print \)
+echo "These SGID files are having their group changed to root:"
+find . -group 0 -o \( -perm +2000 -print \)
+echo "These sticky directories are having their user/group changed to root:"
+find . \( -user 0 -group 0 \) -o \( -perm +1000 -print \)
+echo "These world writable executables are being made non-world writable:"
+find . -type f -perm +111 -perm -2 -print
+find . -type f -perm +111 -perm -2 -exec chmod o-w \{\} \; ) | tee -a ${LOGFILE}
+chown -R 0 ${LFS}
+chgrp -R 0 ${LFS}
+
+echo export PS1="'"'\u@\h \W$ '"'" >${LFS}/etc/profile
+echo export PATH=/bin:/usr/bin:/sbin:/usr/sbin:${TGT_TOOLS}/bin:${TGT_TOOLS}/sbin:${TGT_TOOLS}/usr/bin >>${LFS}/etc/profile
+
+echo " o All OK"
Index: scripts/target-scripts/target-findutils.sh
===================================================================
--- scripts/target-scripts/target-findutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-findutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+# cross-lfs target findutils build
+# --------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=findutils-target.log
+
+unpack_tarball findutils-${FINDUTILS_VER} &&
+
+set_libdirname
+setup_multiarch
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+   INSTALL_PREFIX="${LFS}${BUILD_PREFIX}"
+   INSTALL_OPTIONS="DESTDIR=${LFS}"
+else
+   BUILD_PREFIX=${TGT_TOOLS}
+   INSTALL_PREFIX="${TGT_TOOLS}"
+   INSTALL_OPTIONS=""
+fi
+
+cd ${PKGDIR}
+test 4.1 = "${FINDUTILS_VER}" &&
+   apply_patch findutils-${FINDUTILS_VER}
+
+echo "am_cv_func_working_getline=yes" >> config.cache
+
+# TODO: had to hack config.sub so it accepted powerpc64...
+#       come up with a check and a hack here...
+max_log_init Findutils ${FINDUTILS_VER} "target (shared)" ${CONFLOGS} ${LOG}
+CC="${TARGET}-gcc ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=${BUILD_PREFIX} \
+   --host=${TARGET} --cache-file=config.cache \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${INSTLOGS} &&
+make ${INSTALL_OPTIONS} install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o install OK" || barf
+
Index: scripts/target-scripts/target-flex.sh
===================================================================
--- scripts/target-scripts/target-flex.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-flex.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,75 @@
+#!/bin/bash
+
+# cross-lfs target flex build
+# ---------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=flex-target.build
+
+unpack_tarball flex-${FLEX_VER} &&
+cd ${PKGDIR}
+
+#if we are building multi-arch, only build for the default env
+set_libdirname
+setup_multiarch
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+   INSTALL_PREFIX="${LFS}${BUILD_PREFIX}"
+   INSTALL_OPTIONS="DESTDIR=${LFS}"
+else
+   BUILD_PREFIX=${TGT_TOOLS}
+   INSTALL_PREFIX="${TGT_TOOLS}"
+   INSTALL_OPTIONS=""
+fi
+
+if [ ! "${LIBDIRNAME}" = "lib" ]; then
+   extra_conf="--libdir=${BUILD_PREFIX}/${libdirname}"
+fi
+
+case ${FLEX_VER} in
+   2.5.31 )
+      # Fix brokenness in flex-2.5.31
+      apply_patch flex-2.5.31-debian_fixes-2
+      # do not regen doc (triggered by above patch)
+      touch ./doc/flex.1
+   ;;
+esac
+
+max_log_init Flex ${FLEX_VER} "target (shared)" ${CONFLOGS} ${LOG}
+CC="${TARGET}-gcc ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=${BUILD_PREFIX} \
+   --host=${TARGET} ${extra_conf} \
+   --disable-nls \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+#make ${PMFLAGS} LDFLAGS="-s" \
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make ${INSTALL_OPTIONS} install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+# Create lex wrapper
+cat > ${INSTALL_PREFIX}/bin/lex << "EOF"
+#!/bin/sh
+# Begin ${BUILD_PREFIX}/bin/lex
+
+exec ${BUILD_PREFIX}/bin/flex -l "$@"
+
+# End ${BUILD_PREFIX}/bin/lex
+EOF
+
+chmod 755 ${INSTALL_PREFIX}/bin/lex
+
Index: scripts/target-scripts/target-gawk.sh
===================================================================
--- scripts/target-scripts/target-gawk.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-gawk.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,62 @@
+#!/bin/bash
+
+# cross-lfs target gawk build
+# ---------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=gawk-cross.log
+
+unpack_tarball gawk-${GAWK_VER} &&
+cd ${PKGDIR}
+
+set_libdirname
+setup_multiarch
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+   INSTALL_PREFIX="${LFS}${BUILD_PREFIX}"
+   INSTALL_OPTIONS="DESTDIR=${LFS}"
+else
+   BUILD_PREFIX=${TGT_TOOLS}
+   INSTALL_PREFIX="${TGT_TOOLS}"
+   INSTALL_OPTIONS=""
+fi
+
+# if target is same as build host, adjust build slightly to avoid running
+# configure checks which we cannot run
+if [ "${TARGET}" = "${BUILD}" ]; then
+   BUILD=`echo ${BUILD} | sed 's@\([_a-zA-Z0-9]*\)\(-[_a-zA-Z0-9]*\)\(.*\)@\1\2x\3@'`
+fi
+
+# gawk is braindead for setting version information
+# during install while cross compiling, here we will use
+# gawk-$(PACKAGE_VERSION) instead of trying to run gawk --version
+# (which cant be done when cross compiling, derr) to get version info
+test -f Makefile.in-ORIG ||
+   cp -p Makefile.in Makefile.in-ORIG
+sed 's@\(fullname=gawk-\).*\(;.*\)@\1\$(PACKAGE_VERSION) \2@g' \
+   Makefile.in-ORIG > Makefile.in
+
+max_log_init Gawk ${GAWK_VER} "initial (shared)" ${CONFLOGS} ${LOG}
+CC="${TARGET}-gcc ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=${BUILD_PREFIX} \
+   --build=${BUILD} --host=${TARGET} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make ${INSTALL_OPTIONS} install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/target-scripts/target-gcc.sh
===================================================================
--- scripts/target-scripts/target-gcc.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-gcc.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,253 @@
+#!/bin/bash
+
+# cross-lfs target gcc build
+# --------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+
+LOG="gcc-target.log"
+
+set_libdirname
+setup_multiarch
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+   INSTALL_PREFIX="${LFS}${BUILD_PREFIX}"
+   INSTALL_OPTIONS="DESTDIR=${LFS}"
+else
+   BUILD_PREFIX=${TGT_TOOLS}
+   INSTALL_PREFIX="${TGT_TOOLS}"
+   INSTALL_OPTIONS=""
+fi
+
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="${extra_conf} --libdir=${BUILD_PREFIX}/${libdirname}"
+fi
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   vendor_os=`echo ${TARGET} | sed 's@\([^-]*\)-\(.*\)@\2@'`
+   case ${TGT_ARCH} in
+      x86_64 )
+         TARGET=x86_64-${vendor_os}
+      ;;
+      sparc64* )
+         TARGET=sparc64-${vendor_os}
+      ;;
+      sparc* )
+         TARGET=sparc64-${vendor_os}
+      ;;
+      powerpc* | ppc* )
+         TARGET=powerpc64-${vendor_os}
+      ;;
+      s390* )
+         TARGET=s390x-${vendor_os}
+      ;;
+      mips*el* )
+         TARGET=mips64el-${vendor_os}
+      ;;
+      * )
+         # TODO: add some error messages etc
+         barf
+      ;;
+   esac
+else
+   # If we are not bi-arch, disable multilib
+   extra_conf="${extra_conf} --enable-multilib=no"
+
+   # HACK: this sets abi to n32 with mips... this should be handled
+   # by the multiarch funcs somehow... and set according to DEFAULTENV
+   case ${TGT_ARCH} in
+      mips* )
+         extra_conf="${extra_conf} --with-abi=${DEFAULTENV}"
+      ;;
+   esac
+fi
+
+# if target has no floating point unit, use soft float
+if [ "${WITHOUT_FPU}" = "Y" ]; then
+   extra_conf="${extra_conf} --with-float=soft"
+fi
+
+unpack_tarball gcc-${GCC_VER}
+
+#3.0 20030427
+# Cannot trust ${GCC_VER} to supply us with the correct
+# gcc version (especially if cvs).
+# Grab it straight from version.c
+cd ${SRC}/${PKGDIR}
+target_gcc_ver=`grep version_string gcc/version.c | \
+                sed 's@.* = \(\|"\)\([0-9.]*\).*@\2@g'`
+# As of gcc4, the above doesn't cut it... check gcc/BASE-VER
+if [ -z "${target_gcc_ver}" -a -f gcc/BASE-VER ]; then
+   target_gcc_ver=`cat gcc/BASE-VER`
+fi
+
+# Apply linkonce patch for gcc (should be fixed come gcc 3.4.4)
+cd ${SRC}/${PKGDIR}
+case ${target_gcc_ver} in
+   3.4.3 ) apply_patch gcc-3.4.3-linkonce-1
+           apply_patch gcc-3.4.0-arm-bigendian
+           apply_patch gcc-3.4.0-arm-nolibfloat
+           apply_patch gcc-3.4.0-arm-lib1asm
+           apply_patch gcc-3.4.3-clean_exec_and_lib_search_paths_when_cross-1
+   ;;
+   4.0.0 ) apply_patch gcc-4.0.0-fix_tree_optimisation_PR21173
+           apply_patch gcc-4.0.0-reload_check_uninitialized_pseudos_PR20973
+           apply_patch gcc-4.0.0-clean_exec_and_lib_search_paths_when_cross-1
+   ;;
+esac
+
+# if we are using gcc-3.4x, set libexecdir to */${libdirname}
+case ${target_gcc_ver} in
+   3.4* | 4.* )
+      extra_conf="${extra_conf} --libexecdir=${BUILD_PREFIX}/${libdirname}"
+   ;;
+esac
+
+# HACK: should at least check if any of these are set first 
+ARCH_CFLAGS="${TGT_CFLAGS} ${ARCH_CFLAGS}"
+
+# if target is same as build host, adjust build slightly to avoid running
+# configure checks which we cannot run
+if [ "${TARGET}" = "${BUILD}" ]; then
+   BUILD=`echo ${BUILD} | sed 's@\([_a-zA-Z0-9]*\)\(-[_a-zA-Z0-9]*\)\(.*\)@\1\2x\3@'`
+fi
+
+if [ ! "${USE_SYSROOT}" = "Y" ]; then
+   # LFS style build
+   #----------------
+
+   # source functions for required gcc modifications
+   . ${SCRIPTS}/funcs/cross_gcc-funcs.sh
+
+   # Alter the generated specs file to 
+   #  o set dynamic linker to be under ${TGT_TOOLS}/lib{,32,64}
+   #  o set startfile_prefix_spec so we search for startfiles
+   #    under ${TGT_TOOLS}/lib/lib{,32,64}
+   gcc_specs_mod
+
+   # We need to stop cpp using /usr/include as the standard include directory.
+   # This is defined in gcc/cppdefault.c using STANDARD_INCLUDE_DIR
+   cpp_undef_standard_include_dir
+
+   # We need to override SYSTEM_HEADER_DIR so fixincludes only fixes
+   # headers under ${TGT_TOOLS}
+   fixincludes_set_native_system_header_dir
+fi
+
+# HACKS
+#-------
+# This here is a hack. mklibgcc runs the created xgcc for determining
+# the multilib dirs and multilib os dirs. Only problem here is we are
+# cross building a native compiler so we cannot actually run xgcc.
+# We get around this by substituting our cross-compiler here for xgcc,
+# by rights it should have the same specs and produce the expected results
+cd ${SRC}/${PKGDIR}/gcc
+test -f mklibgcc.in-ORIG ||
+   mv mklibgcc.in mklibgcc.in-ORIG
+
+sed "s@\./xgcc@${HST_TOOLS}/bin/${TARGET}-gcc@g" \
+   mklibgcc.in-ORIG > mklibgcc.in
+
+# A similar problem exists when setting MULTILIBS on the environment
+# for the mklibgcc script for generation of libgcc.mk .
+# Here we will force it to use our cross-compiler to produce the results
+# of gcc --print-multi-lib
+sed -i "/MULTILIBS/s@\$(GCC_FOR_TARGET)@${HST_TOOLS}/bin/${TARGET}-gcc@g" \
+   Makefile.in
+
+# When cross-building a target native compiler we run into big issues
+# when determining assembler and linker features required for tls support,
+# ( not to mention which nm, objdump et al to use ) during the configures
+# triggered by make.
+#
+# Gcc's configury does not take into account the fact that when cross
+# building the target native compiler we are _still_ actually cross-compiling.
+# As far as it is concerned during the final configure fragment host = target,
+# it doesn't check whether host = build. 
+#
+# It then performs its checks for binutils components as if this was a standard 
+# host native build.
+#
+# If a target native binutils was installed before attempting to build gcc
+# it will try to use the created ld, as etc under ${TGT_TOOLS}
+# This obviously will not work, they will not run on the host.
+#
+# If the target native binutils hasn't been built yet it will use the
+# as ld et al from the _build_ host.
+# This quite frankly sucks rocks.
+#
+# The following patch fixes this behaviour, enforcing usage of our
+# cross-tools for configure checks if host = target and host != build
+#
+# NOTE: 20050507 This doesn't appear to be necessary for gcc 4.x :-)
+#       This of course will have to be checked thoroughly...
+
+# TODO: Add patches for gcc-3.3 series as well
+cd ${SRC}/${PKGDIR}
+case ${target_gcc_ver} in
+   3.4* )
+      apply_patch gcc-3.4.1-fix_configure_for_target_native
+   ;;
+esac
+#
+# End HACKS
+
+test -d ${SRC}/gcc-${GCC_VER}-target &&
+   rm -rf ${SRC}/gcc-${GCC_VER}-target
+
+mkdir -p ${SRC}/gcc-${GCC_VER}-target &&
+cd ${SRC}/gcc-${GCC_VER}-target &&
+
+max_log_init Gcc ${GCC_VER} cross-pt2 ${CONFLOGS} ${LOG}
+#CONFIG_SHELL=/bin/bash \
+CFLAGS="-O2 -pipe" \
+CXXFLAGS="-O2 -pipe" \
+CC="${TARGET}-gcc ${ARCH_CFLAGS}" \
+../${PKGDIR}/configure --prefix=${BUILD_PREFIX} \
+   --build=${BUILD} --host=${TARGET} --target=${TARGET} \
+   --enable-languages=c,c++ --enable-__cxa_atexit \
+   --enable-c99 --enable-long-long --enable-threads=posix \
+   --disable-nls --enable-shared ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" || barf
+#   --enable-languages=c,c++,f77,objc,ada,java,pascal,treelang --enable-__cxa_atexit \
+#   --enable-version-specific-runtime-libs \
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} BOOT_LDFLAGS="-s" BOOT_CFLAGS="-O2 ${HOST_CFLAGS} -pipe" \
+   STAGE1_CFLAGS="-O2 ${HOST_CFLAGS} -pipe" all \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${INSTLOGS} &&
+make ${INSTALL_OPTIONS} install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Install OK" || barf
+
+if [ ! "${USE_SYSROOT}" = "Y" ]; then
+   # Prep new root for target native glibc build
+   libdirs="${libdirname}"
+   if [ "Y" = "${MULTIARCH}" ]; then libdirs="lib lib32 lib64" ; fi
+   for dir in ${libdirs} ; do
+      if [ -d ${TGT_TOOLS}/${dir} ]; then
+         test -d ${LFS}/usr/${dir} || mkdir -p ${LFS}/usr/${dir}
+         ln -sf ../..${TGT_TOOLS}/${dir}/libgcc_s.so.1 \
+            ${LFS}/usr/${dir}/libgcc_s.so.1
+         test -f ${TGT_TOOLS}/${dir}/libgcc_s.so &&
+            ln -sf libgcc_s.so.1 ${LFS}/usr/${dir}/libgcc_s.so
+         test -f ${TGT_TOOLS}/${dir}/libgcc_s_32.so &&
+            ln -sf libgcc_s.so.1 ${LFS}/usr/${dir}/libgcc_s_32.so
+         test -f ${TGT_TOOLS}/${dir}/libgcc_s_64.so &&
+            ln -sf libgcc_s.so.1 ${LFS}/usr/${dir}/libgcc_s_64.so
+      fi
+   done
+fi
+
+test -L ${INSTALL_PREFIX}/bin/cc || ln -s gcc ${INSTALL_PREFIX}/bin/cc
+
Index: scripts/target-scripts/target-gettext-32.sh
===================================================================
--- scripts/target-scripts/target-gettext-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-gettext-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+target-gettext.sh
Index: scripts/target-scripts/target-gettext-64.sh
===================================================================
--- scripts/target-scripts/target-gettext-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-gettext-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+target-gettext.sh
Index: scripts/target-scripts/target-gettext-n32.sh
===================================================================
--- scripts/target-scripts/target-gettext-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-gettext-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+target-gettext.sh
Index: scripts/target-scripts/target-gettext.sh
===================================================================
--- scripts/target-scripts/target-gettext.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-gettext.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,68 @@
+#!/bin/bash
+
+# cross-lfs target gettext build
+# ------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=gettext-target.log
+libdirname="lib"
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+   INSTALL_PREFIX="${LFS}${BUILD_PREFIX}"
+   INSTALL_OPTIONS="DESTDIR=${LFS}"
+else
+   BUILD_PREFIX=${TGT_TOOLS}
+   INSTALL_PREFIX="${TGT_TOOLS}"
+   INSTALL_OPTIONS=""
+fi
+
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=${BUILD_PREFIX}/${libdirname}"
+fi
+
+unpack_tarball gettext-${GETTEXT_VER} &&
+cd ${PKGDIR}
+
+# Curse of getline again...
+echo "am_cv_func_working_getline=yes" > config.cache
+
+max_log_init Gettext ${GETTEXT_VER} "target (shared)" ${CONFLOGS} ${LOG}
+CFLAGS="-O2 -pipe ${ARCH_CFLAGS}" \
+CXXFLAGS="-O2 -pipe ${ARCH_CFLAGS}" \
+   ./configure --prefix=${BUILD_PREFIX} \
+   --host=${TARGET} ${extra_conf} \
+   --cache-file=config.cache \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+# libtools is a pain.
+# with libasprintf it tries to link in the startfiles even though
+# g++ will look after this itself. This is a hack, should really edit
+# ltmain.sh...
+test -f gettext-runtime/libasprintf/libtool-ORIG ||
+   mv gettext-runtime/libasprintf/libtool gettext-runtime/libasprintf/libtool-ORIG
+sed 's@^\(archive_cmds.*-shared \)\(.*predep_objects.*\)@\1 -nostartfiles -nostdlib \2@g' \
+gettext-runtime/libasprintf/libtool-ORIG > gettext-runtime/libasprintf/libtool
+
+min_log_init ${BUILDLOGS} &&
+#make ${PMFLAGS} LDFLAGS="-s" \
+make LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${INSTLOGS} &&
+make ${INSTALL_OPTIONS} install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/target-scripts/target-grep.sh
===================================================================
--- scripts/target-scripts/target-grep.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-grep.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+# cross-lfs target grep build
+# ---------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=grep-target.log
+
+unpack_tarball grep-${GREP_VER} &&
+cd ${PKGDIR}
+
+set_libdirname
+setup_multiarch
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+   INSTALL_PREFIX="${LFS}${BUILD_PREFIX}"
+   INSTALL_OPTIONS="DESTDIR=${LFS}"
+else
+   BUILD_PREFIX=${TGT_TOOLS}
+   INSTALL_PREFIX="${TGT_TOOLS}"
+   INSTALL_OPTIONS=""
+fi
+
+max_log_init Grep ${GREP_VER} "target (shared)" ${CONFLOGS} ${LOG}
+CC="${TARGET}-gcc ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=${BUILD_PREFIX} --host=${TARGET} \
+   --disable-perl-regexp --with-included-regex \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${INSTLOGS} &&
+make ${INSTALL_OPTIONS} install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/target-scripts/target-gzip.sh
===================================================================
--- scripts/target-scripts/target-gzip.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-gzip.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+# cross-lfs target grep build
+# ---------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=gzip-target.log
+
+unpack_tarball gzip-${GZIP_VER} &&
+cd ${PKGDIR}
+
+set_libdirname
+setup_multiarch
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+   INSTALL_PREFIX="${LFS}${BUILD_PREFIX}"
+   INSTALL_OPTIONS="DESTDIR=${LFS}"
+else
+   BUILD_PREFIX="${TGT_TOOLS}"
+   INSTALL_PREFIX="${TGT_TOOLS}"
+   INSTALL_OPTIONS=""
+fi
+
+# Configure isn't setup to use ${TARGET}-nm for a test... fix it
+test -f configure-ORIG ||
+   mv configure configure-ORIG
+
+sed "s@nm conftest@${TARGET}-&@" configure-ORIG > configure
+chmod 755 configure
+
+max_log_init Gzip ${GZIP_VER} "target (shared)" ${CONFLOGS} ${LOG}
+CC="${TARGET}-gcc ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=${BUILD_PREFIX} \
+   --host=${TARGET} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make ${INSTALL_OPTIONS} install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+rm -f ${INSTALL_PREFIX}/bin/{gunzip,zcat}
+ln -sf gzip ${INSTALL_PREFIX}/bin/gunzip
+ln -sf gzip ${INSTALL_PREFIX}/bin/zcat
+ln -sf gunzip ${INSTALL_PREFIX}/bin/uncompress
Index: scripts/target-scripts/target-hotplug.sh
===================================================================
--- scripts/target-scripts/target-hotplug.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-hotplug.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# cross-lfs target hotplug build
+# ------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+LOG="hotplug.log"
+cd ${SRC}
+
+unpack_tarball hotplug-${HOTPLUG_VER}
+cd ${PKGDIR}
+
+max_log_init hotplug ${HOTPLUG_VER} "target" ${INSTLOGS} ${LOG}
+echo "Password: " 
+su -c "make prefix=${LFS} install" \
+   > ${LOGFILE} 2>&1 &&
+echo " o Install OK" || barf
+
Index: scripts/target-scripts/target-iana-etc.sh
===================================================================
--- scripts/target-scripts/target-iana-etc.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-iana-etc.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+# cross-lfs target iana-etc installation
+# --------------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=iana-etc.log
+unpack_tarball iana-etc-${IANA_ETC_VER} &&
+
+cd ${PKGDIR}
+
+max_log_init iana-etc ${IANA_ETC_VER} '' ${BUILDLOGS} ${LOG}
+
+make > ${LOGFILE} && echo " o Build OK" || barf
+
+min_log_init ${INSTLOGS}
+
+make PREFIX=${LFS} install > ${LOGFILE} && echo " o All OK" || barf
Index: scripts/target-scripts/target-inetutils.sh
===================================================================
--- scripts/target-scripts/target-inetutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-inetutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+# cross-lfs target inetutils build
+# --------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=inetutils-target.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball inetutils-${INETUTILS_VER}
+cd ${PKGDIR}
+
+# Retrieve target_gcc_ver from gcc -v output
+target_gcc_ver=`${TARGET}-gcc -v 2>&1 | grep " version " | \
+   sed 's@.*version \([0-9.]*\).*@\1@g'`
+
+case ${target_gcc_ver} in
+   4.* )
+      apply_patch inetutils-1.4.2-gcc4_fixes-1
+   ;;
+esac
+
+max_log_init inetutils ${INETUTILS_VER} "target (shared)" ${CONFLOGS} ${LOG}
+CC="${TARGET}-gcc ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --host=${TARGET} --prefix=/usr \
+   --libexecdir=/usr/${libdirname}/inetutils \
+   --sysconfdir=/etc --localstatedir=/var \
+   --disable-whois --disable-syslogd --disable-logger --disable-servers \
+   --mandir=/usr/share/man --infodir=/usr/share/info \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make DESTDIR="${LFS}" install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+mv ${LFS}/usr/bin/ping ${LFS}/bin/
+
Index: scripts/target-scripts/target-iproute2.sh
===================================================================
--- scripts/target-scripts/target-iproute2.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-iproute2.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,74 @@
+#!/bin/bash
+
+# cross-lfs target iproute2 build
+# -------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=iproute2-target.log
+set_libdirname
+setup_multiarch
+
+unpack_tarball iproute2-${IPROUTE2_VER}
+cd ${PKGDIR}
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_BASEDIR=""
+   BUILD_PREFIX="/usr"
+   INSTALL_PREFIX="${LFS}${BUILD_PREFIX}"
+   INSTALL_OPTIONS="DESTDIR=${LFS}"
+else
+   BUILD_BASEDIR=${TGT_TOOLS}
+   BUILD_PREFIX=${TGT_TOOLS}
+   INSTALL_PREFIX=${TGT_TOOLS}
+   INSTALL_OPTIONS=""
+fi
+
+test -f tc/Makefile-ORIG || cp -p tc/Makefile tc/Makefile-ORIG
+chmod 666 tc/Makefile
+sed -e "s@/usr/lib@${BUILD_PREFIX}/${libdirname}@g" \
+    -e 's@\(install[-a-zA-Z0-9 ]*\)-s@\1@g' \
+    tc/Makefile-ORIG > tc/Makefile
+
+test -f misc/Makefile-ORIG || cp -p misc/Makefile misc/Makefile-ORIG
+chmod 666 misc/Makefile
+sed -e '/^TARGETS/s@arpd@@g' \
+    -e 's@\(install[-a-zA-Z0-9 ]*\)-s@\1@g' \
+    misc/Makefile-ORIG > misc/Makefile
+
+max_log_init iproute2 ${IPROUTE2_VER} "target (shared)" ${CONFLOGS} ${LOG}
+./configure ${INSTALL_PREFIX}/include \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make CC="${TARGET}-gcc ${ARCH_CFLAGS} ${TGT_CFLAGS}" \
+     AR="${TARGET}-ar" \
+     SBINDIR="${BUILD_BASEDIR}/sbin" \
+     CONFDIR="${BUILD_BASEDIR}/etc/iproute2" \
+     DOCDIR="${BUILD_PREFIX}/share/doc/iproute2" \
+     KERNEL_INCLUDE="${BUILD_PREFIX}/include" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+su -c "make CC=\"${TARGET}-gcc ${ARCH_CFLAGS}\" \
+     AR=\"${TARGET}-ar\" \
+     SBINDIR=\"${BUILD_BASEDIR}/sbin\" \
+     CONFDIR=\"${BUILD_BASEDIR}/etc/iproute2\" \
+     DOCDIR=\"${BUILD_PREFIX}/share/doc/iproute2\" \
+     KERNEL_INCLUDE=\"${BUILD_PREFIX}/include\" \
+     ${INSTALL_OPTIONS} install" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+if [ ! "${USE_SYSROOT}" = "Y" ]; then
+   # for LFS bootscripts
+   if [ ! -d ${LFS}/sbin ]; then mkdir -p ${LFS}/sbin ; fi
+   ln -sf ..${TGT_TOOLS}/sbin/ip ${LFS}/sbin
+fi
+
Index: scripts/target-scripts/target-kernel.sh
===================================================================
--- scripts/target-scripts/target-kernel.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-kernel.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,163 @@
+#!/bin/bash
+
+# cross-lfs target linux kernel build
+# -----------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${HST_TOOLS}/bin &&
+gzip -dc ${TARBALLS}/depmod.pl.gz > depmod.pl &&
+patch < ${PATCHES}/depmod-pl-lfh-cross-compile.patch &&
+chmod 755 depmod.pl || barf
+
+### KERNEL ###
+set -x
+
+cd ${SRC}
+LOG=kernel.log
+unpack_tarball linux-${KERNEL_VER} &&
+
+cd ${SRC}/${PKGDIR}
+
+case ${TGT_ARCH} in
+   i?86 )			ARCH=i386 ;;
+   sparc64* | ultrasparc* )	ARCH=sparc64 ;;
+   sparc* )			ARCH=sparc ;;
+   powerpc64 | ppc64 )		ARCH=ppc64 ;;
+   powerpc | ppc )		ARCH=ppc ;;
+   s390* )			ARCH=s390 ;;
+   mips* )			ARCH=mips ;;
+   * )				ARCH=${TGT_ARCH} ;;
+esac
+echo $PATH
+
+# get gas version
+target_gas_ver=`${TARGET}-as --version | head -n 1 | \
+   sed 's@.* \([0-9.]*\) .*@\1@g'`
+
+# get gcc version
+target_gcc_ver=`${TARGET}-gcc -v 2>&1 | grep " version " | \
+   sed 's@.*version \([0-9.]*\).*@\1@g'`
+
+case ${KERNEL_VER} in
+   2.4.* )
+      apply_patch linux-2.4-lfh-Makefile &&
+      if [ "${ARCH}" =  "m68k" ] ; then
+         test -f ${PATCHES}/linux-${KERNEL_VER}-m68k-lfh.patch && \
+            apply_patch linux-${KERNEL_VER}-m68k-lfh
+      fi
+   ;;
+   2.6.* )
+      # TODO: need to handle kernel patching a whole lot better
+      #       than this...
+      # What might be better is to have a separate dir for kernel patches
+      # and apply conditionally all patches in said directory.
+      # Maybe something like
+      # patches/kernel/2.6
+      #                   /2.6.x <- version specific
+      #                         /binutils-2.16 <- binutils ver specific for kern
+      #                         /gcc-4 <- gcc ver specific
+
+      # fix issues with kernel concerning 2.16 binutils
+      # checked against 2.6.11, need to check against 2.6.12
+      case ${target_gas_ver} in
+         2.16* ) apply_patch linux-2.6-seg-5 ;;
+      esac
+
+      # fix gcc4 compilation issues
+      # Note: you cannot compile kernel < 2.6.9 with gcc4
+      case ${target_gcc_ver} in
+         4.* ) apply_patch linux-2.6.11-gcc4_fixes -Np0 ;;
+      esac
+
+      # update cx88 driver (applies 2.6.10 + 2.6.11, need to check 2.6.12+ )
+      case ${KERNEL_VER} in
+         2.6.10* ) apply_patch linux-2.6.10-cx88-update ;;
+         2.6.11* ) apply_patch linux-2.6.11-rc4-enable_dvico_dvb ;;
+      esac
+
+      # This is to remove some gnu-specific expr syntax and invoke depmod.pl
+      # instead of depmod since we need a depmod that is not a target-native
+      # binary.
+      apply_patch linux-2.6-lfh-Makefile
+   ;;
+esac
+
+max_log_init kernel ${KERNEL_VER} '' ${CONFLOGS} ${LOG}
+
+# TODO: Fix this up again... won't stop on error now...
+#-----------------------------------------------------------
+make mrproper >> ${LOGFILE} 2>&1 
+
+test -f ${CONFIGS}/kernel/linux-${KERNEL_VER}-${TGT_ARCH}.config &&
+{
+   cp ${CONFIGS}/kernel/linux-${KERNEL_VER}-${TGT_ARCH}.config .config || barf
+   echo "got kernel config"
+   yes "" | make ARCH=${ARCH} CROSS_COMPILE=${TARGET}- oldconfig
+} || {
+   echo "generating kernel config"
+   case ${KERNEL_VER} in
+      2.4.* )
+         yes "" | env -i PATH=${PATH} make ARCH=${ARCH} CROSS_COMPILE=${TARGET}- config ;;
+      2.6.* )
+         yes "" | env -i PATH=${PATH} make ARCH=${ARCH} CROSS_COMPILE=${TARGET}- defconfig ;;
+   esac 
+}
+echo " o Configure OK" &&
+#-----------------------------------------------------------
+
+min_log_init ${BUILDLOGS}
+
+case ${KERNEL_VER} in
+   2.4.* )
+      env -i PATH=${PATH} make ARCH=${ARCH} CROSS_COMPILE=${TARGET}- dep &&
+      env -i PATH=${PATH} make ARCH=${ARCH} CROSS_COMPILE=${TARGET}- vmlinux &&
+      env -i PATH=${PATH} make ARCH=${ARCH} CROSS_COMPILE=${TARGET}- modules
+   ;;
+   2.6.* )
+      env -i PATH=${PATH} make V=1 ARCH=${ARCH} CROSS_COMPILE=${TARGET}-
+   ;;
+esac >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${INSTLOGS}
+
+if grep -q ^CONFIG_MODULES .config ; then
+   mkdir -p ${LFS}/lib/modules &&
+   env -i PATH=${PATH} make INSTALL_MOD_PATH=${LFS} ARCH=${ARCH} CROSS_COMPILE=${TARGET}- modules_install \
+      >> ${LOGFILE} 2>&1 || barf
+fi
+
+mkdir -p ${LFS}/boot
+
+case ${ARCH} in
+   alpha )
+      if [ -e arch/${ARCH}/boot/vmlinux.gz ]; then
+         cp arch/${ARCH}/boot/vmlinux.gz ${LFS}/boot/vmlinux-${KERNEL_VER}.gz
+      else
+         gzip -c vmlinux > ${LFS}/boot/vmlinux-${KERNEL_VER}.gz
+      fi
+   ;;
+   ppc* )
+      cp vmlinux ${LFS}/boot/vmlinux-${KERNEL_VER} 
+   ;;
+   * )
+      if [ -e arch/${ARCH}/boot/bzImage ]; then
+         cp arch/${ARCH}/boot/bzImage ${LFS}/boot/bzImage-${KERNEL_VER}
+      else
+         cp vmlinux ${LFS}/boot/vmlinux-${KERNEL_VER}
+      fi
+   ;;
+esac &&
+
+cp System.map ${LFS}/boot/System.map-${KERNEL_VER} &&
+cp .config ${LFS}/boot/config-${KERNEL_VER} &&
+cd ${LFS}/boot &&
+ln -s System.map-${KERNEL_VER} System.map &&
+cd ${LFS} &&
+rm -f lib/modules/${KERNEL_VER}/build && # delete this link as it points to the build host filesystem
+chmod -R g-w,o-w boot lib/modules &&
+echo " o All OK" || barf
Index: scripts/target-scripts/target-lfs-bootscripts.sh
===================================================================
--- scripts/target-scripts/target-lfs-bootscripts.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-lfs-bootscripts.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,108 @@
+#!/bin/bash
+
+# cross-lfs target lfs bootscripts installation
+# ---------------------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+LOG="lfs-bootscripts.log"
+cd ${SRC}
+
+unpack_tarball lfs-bootscripts-${LFS_BS_VER}
+cd ${PKGDIR}
+
+# Following commented lines are for using the *old* lfs bootscripts package
+#cp -a rc.d sysconfig ${LFS}/etc
+#chown -R root:root ${LFS}/etc/rc.d ${LFS}/etc/sysconfig
+
+max_log_init lfs-bootscripts ${LFS_BS_VER} "target" ${INSTLOGS} ${LOG}
+make DESTDIR=${LFS} install \
+   > ${LOGFILE} 2>&1 &&
+echo " o Install OK" || barf
+
+if [ "Y" = "${USE_HOTPLUG}" ]; then
+   # check if this version of the bootscripts has an 
+   # intall-hotplug target
+   grep ^install-hotplug: Makefile > /dev/null 2>&1 &&
+   {
+      make DESTDIR=${LFS} install-hotplug \
+         >> ${LOGFILE} 2>&1 &&
+      echo " o Install hotplug OK" || barf
+   }
+fi
+
+# Bootscript Configuration
+#--------------------------
+
+if [ ! "${USE_SYSROOT}" = "Y" ]; then
+   # The normal PATH won't find our TGT_TOOLS binaries; so use the default
+   # PATH we give in /etc/profile later.
+   sed -e 's/^export PATH=.*//' < lfs/init.d/functions \
+      > ${LFS}/etc/rc.d/init.d/functions
+fi
+
+# setup system clock settings
+test -f ${LFS}/etc/sysconfig/clock ||
+{
+   # hardware clock should be set to UTC
+   cat > ${LFS}/etc/sysconfig/clock << "EOF"
+# Begin /etc/sysconfig/clock
+UTC=1
+
+# End /etc/sysconfig/clock
+EOF
+}
+
+# TODO: Put these in plfs-config
+NET_HOSTNAME="asuka"
+NET_DOMAINNAME="pha.com.au"
+NET_IP=192.168.0.6
+NET_NETMASK=255.255.255.0
+NET_PREFIX=24
+NET_BCAST=192.168.0.255
+NET_GATEWAY=192.168.0.1
+NET_GATEWAY_IF=eth0
+
+test -f ${LFS}/etc/hosts ||
+{
+echo "127.0.0.1	localhost.localdomain	localhost
+${NET_IP}	${NET_HOSTNAME}.${NET_DOMAINNAME}	${NET_HOSTNAME}" > ${LFS}/etc/hosts
+}
+
+test -f ${LFS}/etc/sysconfig/network ||
+{
+   echo "HOSTNAME=${NET_HOSTNAME}" > ${LFS}/etc/sysconfig/network
+
+# Following commented lines are for using the *old* lfs bootscripts package
+#   test -z "${NET_GATEWAY}" ||
+#   {
+#      echo "GATEWAY=${NET_GATEWAY}
+#GATEWAY_IF=${NET_GATEWAY_IF}" >> ${LFS}/etc/sysconfig/network
+#   }
+}
+
+# Following commented lines are for using the *old* lfs bootscripts package
+#test -f ${LFS}/etc/sysconfig/network-devices/ifconfig.${NET_GW_IF} ||
+#{
+#   echo "ONBOOT=yes
+#SERVICE=static
+#IP=${NET_IP}
+#NETMASK=${NET_NETMASK}
+#BROADCAST=${NET_BCAST}" \
+#   > ${LFS}/etc/sysconfig/network-devices/ifconfig.${NET_GW_IF} 
+#}
+
+test -f ${LFS}/etc/sysconfig/network-devices/ifconfig.${NET_GW_IF} ||
+{
+   echo "ONBOOT=yes
+SERVICE=ipv4-static
+IP=${NET_IP}
+GATEWAY=${NET_GATEWAY}
+PREFIX=${NET_PREFIX}
+BROADCAST=${NET_BCAST}" \
+   > ${LFS}/etc/sysconfig/network-devices/ifconfig.${NET_GW_IF} 
+}
+
Index: scripts/target-scripts/target-lilo.sh
===================================================================
--- scripts/target-scripts/target-lilo.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-lilo.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,68 @@
+#!/bin/sh
+
+# cross-lfs target lilo build
+# ---------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG="lilo-target.log"
+unpack_tarball lilo-${LILO_VER} &&
+cd ${SRC}/${PKGDIR}
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_BASEDIR=""
+   BUILD_PREFIX="/usr"
+else
+   BUILD_BASEDIR=${TGT_TOOLS}
+   BUILD_PREFIX=${TGT_TOOLS}
+fi
+
+case ${KERNEL_VER} in
+   2.[56].* )
+      case ${LILO_VER} in
+         22.5.1 )
+            #apply_patch lilo-22.5.1-2.6.0hdr-fix
+            #avoid LVM for the moment
+            if [ ! -f Makefile-ORIG ]; then cp -p Makefile Makefile-ORIG ; fi
+            sed '/^CONFIG=/s@ -DLVM@@g' Makefile-ORIG > Makefile
+
+            # need PAGE_SIZE from <asm/page.h>
+            if [ ! -f boot.c-ORIG ]; then cp -p boot.c boot.c-ORIG ; fi
+            sed '/^#include <sys\/stat.h>/a \
+#include <asm/page.h>' boot.c-ORIG > boot.c
+
+            if [ ! -f partition.c-ORIG ]; then
+              cp -p partition.c partition.c-ORIG
+            fi
+            sed '/^#include <asm\/unistd.h>/a \
+#include <asm/page.h>' partition.c-ORIG > partition.c
+         ;;
+      esac
+   ;;
+esac
+
+case ${TGT_ARCH} in
+   x86_64 ) ARCH_CFLAGS="-m32" ;;
+esac
+
+max_log_init Lilo ${LILO_VER} target ${BUILDLOGS} ${LOG}
+make CC="${TARGET}-gcc ${ARCH_CFLAGS}" \
+   SBIN_DIR=${BUILD_BASEDIR}/sbin \
+   USRSBIN_DIR=${BUILD_PREFIX}/sbin \
+   ROOT=${LFS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   SBIN_DIR=${BUILD_BASEDIR}/sbin \
+   USRSBIN_DIR=${BUILD_PREFIX}/sbin \
+   MAN_DIR=${BUILD_PREFIX}/share/man \
+   ROOT=${LFS} \
+   >> ${LOGFILE} &&
+echo " o ALL OK" || barf
+
Index: scripts/target-scripts/target-m4.sh
===================================================================
--- scripts/target-scripts/target-m4.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-m4.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,67 @@
+#!/bin/bash
+
+# cross-lfs target m4 build
+# -------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=m4-target.log
+
+unpack_tarball m4-${M4_VER} &&
+cd ${PKGDIR} 
+
+set_libdirname
+setup_multiarch
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+   INSTALL_PREFIX="${LFS}${BUILD_PREFIX}"
+   INSTALL_OPTIONS="prefix=${INSTALL_PREFIX}"
+else
+   BUILD_PREFIX="${TGT_TOOLS}"
+   INSTALL_PREFIX="${TGT_TOOLS}"
+   INSTALL_OPTIONS=""
+fi
+
+# NOTE: with gcc-3.4.0, linux-libc-headers-2.6.5.1 on 
+#       biarch x86_64-pc-linux-gnu the build barfed out with
+#       errors in lib/regex.c due to conflicting types for
+#       malloc. removed definitions of malloc/realloc and
+#       made it so stlib.h always gets read.
+#
+#     : same results with linux-libc-headers-2.6.6.0 with
+#       gcc-3.4.1-20040620 on x86_64-pc-linux-gnu
+#
+# TODO: check if other architecturess are affected, and for what
+#       glibc/gcc/m4 versions.
+#
+#     : same issue w powerpc...
+#
+#       Get a better fix for this....
+case ${TGT_ARCH} in
+   x86_64 | ppc | powerpc | powerpc64 )
+      apply_patch m4-1.4-regex_c-hack
+   ;;
+esac
+
+max_log_init M4 ${M4_VER} "target (shared)" ${CONFLOGS} ${LOG}
+CC="${TARGET}-gcc ${ARCH_CFLAGS}" AR="${TARGET}-ar" RANLIB="${TARGET}-ranlib" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" ./configure --prefix=${BUILD_PREFIX} \
+  --host=${TARGET} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make ${INSTALL_OPTIONS} install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/target-scripts/target-make.sh
===================================================================
--- scripts/target-scripts/target-make.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-make.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+# cross-lfs target make build
+# ---------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=make-target.log
+
+unpack_tarball make-${MAKE_VER} &&
+cd ${PKGDIR}
+
+set_libdirname
+setup_multiarch
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+   INSTALL_PREFIX="${LFS}${BUILD_PREFIX}"
+   INSTALL_OPTIONS="DESTDIR=${LFS}"
+else
+   BUILD_PREFIX="${TGT_TOOLS}"
+   INSTALL_PREFIX="${TGT_TOOLS}"
+   INSTALL_OPTIONS=""
+fi
+
+max_log_init Make ${MAKE_VER} "target (shared)" ${CONFLOGS} ${LOG}
+CC="${TARGET}-gcc ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=${BUILD_PREFIX} \
+   --host=${TARGET} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make ${INSTALL_OPTIONS} install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+# chgrp 0 ${TOOLS}/bin/make &&
+chmod 755 ${INSTALL_PREFIX}/bin/make
+
Index: scripts/target-scripts/target-module-init-tools.sh
===================================================================
--- scripts/target-scripts/target-module-init-tools.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-module-init-tools.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+# cross-lfs target module-init-tools build
+# ----------------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+# NOTE: this installs into the target root, NOT into ${TGT_TOOLS}
+cd ${SRC}
+LOG=module-init-tools-target.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball module-init-tools-${MODINITTOOLS_VER} &&
+cd ${PKGDIR}
+
+# Patch so we can run 'make moveold' under our target root.
+# TODO: wrap this with some logic
+apply_patch module-init-tools-3.0-cross-moveold
+
+max_log_init Module-init-tools ${MODINITTOOLS_VER} "Target (shared)" ${CONFLOGS} ${LOG}
+CC="${TARGET}-gcc ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe" \
+./configure --prefix=/ --host="${TARGET}" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+# H A C K 
+sed -i 's@^MAN.*@@g' Makefile
+
+min_log_init ${BUILDLOGS} &&
+
+# Check if modprobe.old exists, if so don't run
+# make moveold
+
+if [ ! -f ${LFS}/sbin/modprobe.old -a -f ${LFS}/sbin/modprobe ]; then
+   make DESTDIR="${LFS}" moveold \
+      >> ${LOGFILE} 2>&1 &&
+   echo "===============================================" \
+      >> ${LOGFILE} || barf
+fi
+
+make LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make DESTDIR="${LFS}" install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+#test -f ${LFS}/etc/modules.conf &&
+#   ./generate-modprobe.conf /etc/modprobe.conf
+
Index: scripts/target-scripts/target-modutils.sh
===================================================================
--- scripts/target-scripts/target-modutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-modutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# cross-lfs target modutils build
+# -------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=modutils.log
+
+unpack_tarball modutils-${MODUTILS_VER} &&
+cd ${PKGDIR}
+
+max_log_init Modutils ${MODUTILS_VER} "Final (shared)" ${CONFLOGS} ${LOG}
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" ./configure \
+ --host="${TARGET}" --mandir=/usr/share/man --infodir=/usr/share/info \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make BUILDCC=gcc LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make DESTDIR="${LFS}" STRIP= install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/target-scripts/target-nasm.sh
===================================================================
--- scripts/target-scripts/target-nasm.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-nasm.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+# cross-lfs target nasm build
+# -------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG="nasm-target.log"
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+   INSTALL_PREFIX="${LFS}${BUILD_PREFIX}"
+   INSTALL_OPTIONS="INSTALLROOT=${LFS}"
+else
+   BUILD_PREFIX="${TGT_TOOLS}"
+   INSTALL_PREFIX="${TGT_TOOLS}"
+   INSTALL_OPTIONS=""
+fi
+
+unpack_tarball nasm-${NASM_VER} &&
+cd ${SRC}/${PKGDIR}
+
+# build nasm, bin86 and lilo 32 bit
+case ${TGT_ARCH} in
+   x86_64 ) ARCH_CFLAGS="-m32" ;;
+esac
+
+max_log_init nasm ${NASM_VER} target ${CONFLOGS} ${LOG}
+CC="${TARGET}-gcc ${ARCH_CFLAGS}" CFLAGS="-O2 -pipe" \
+./configure --prefix=${BUILD_PREFIX} --host=${TARGET} \
+   --libexecdir=${TGT_TOOLS}/lib/nasm \
+   --mandir=${TGT_TOOLS}/share/man \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+# should use "make everything" to generate docs, but we won't
+# have ps2pdf yet
+make LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make ${INSTALL_OPTIONS} install \
+   >> ${LOGFILE} &&
+make ${INSTALL_OPTIONS} install_rdf \
+   >> ${LOGFILE} &&
+echo " o ALL OK" || barf
+
Index: scripts/target-scripts/target-ncurses-32.sh
===================================================================
--- scripts/target-scripts/target-ncurses-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-ncurses-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+target-ncurses.sh
Index: scripts/target-scripts/target-ncurses-64.sh
===================================================================
--- scripts/target-scripts/target-ncurses-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-ncurses-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+target-ncurses.sh
Index: scripts/target-scripts/target-ncurses-n32.sh
===================================================================
--- scripts/target-scripts/target-ncurses-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-ncurses-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+target-ncurses.sh
Index: scripts/target-scripts/target-ncurses.sh
===================================================================
--- scripts/target-scripts/target-ncurses.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-ncurses.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,108 @@
+#!/bin/bash
+
+# cross-lfs target ncurses build
+# ------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=ncurses-target.log
+libdirname="lib"
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+   INSTALL_PREFIX="${LFS}${BUILD_PREFIX}"
+   INSTALL_OPTIONS="DESTDIR=${LFS}"
+else
+   BUILD_PREFIX="${TGT_TOOLS}"
+   INSTALL_PREFIX="${TGT_TOOLS}"
+   INSTALL_OPTIONS=""
+fi
+
+export CC="${TARGET}-gcc ${ARCH_CFLAGS}"
+export CXX="${TARGET}-g++ ${ARCH_CFLAGS}"
+export RANLIB="${TARGET}-ranlib"
+export AR="${TARGET}-ar"
+export LD="${TARGET}-ld"
+
+unpack_tarball ncurses-${NCURSES_VER} &&
+cd ${PKGDIR}
+
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=${BUILD_PREFIX}/${libdirname}"
+
+   # Patch misc/run_tic.in to create 
+   # ${libdirname}/terminfo -> share/terminfo link
+   test -f misc/run_tic.in-ORIG ||
+      mv misc/run_tic.in misc/run_tic.in-ORIG
+
+   sed "s:^\(TICDIR.*/\)lib\(.*\):\1${libdirname}\2:g" \
+      misc/run_tic.in-ORIG > misc/run_tic.in
+fi
+
+# replace some deprecated headers
+# strstream deprecated in favour of sstream
+test -f c++/cursesw.h-ORIG ||
+   mv c++/cursesw.h c++/cursesw.h-ORIG
+sed 's/include <strstream.h>/include <sstream>/g' c++/cursesw.h-ORIG > c++/cursesw.h
+
+# CHECK THIS... Should only affect ncurses 5.2 and less, 
+# must check whether vsscanf is picked up or not in 5.3
+
+test 5.2 = "${NCURSES_VER}" &&
+{
+   # Apply cursesw.cc vsscanf patch
+   # Unsure who provided the original patch used.
+   # Please contact the authors so we can attribute you correctly.
+   test -f c++/cursesw.cc-ORIG ||
+      cp c++/cursesw.cc c++/cursesw.cc-ORIG
+   grep -v strstreambuf c++/cursesw.cc-ORIG |
+   sed 's@ss.vscan(@::vsscanf(buf, @' > c++/cursesw.cc
+}
+
+# Force xterm to always be colour
+# ( thanks Alexander Patrakov ;-) )
+# TODO: this is the default w ncurses-20040711
+sed -i -e '/^xterm|/,+1s,^\(.use\)=xterm-r6,\1=xterm-xfree86,' \
+   misc/terminfo.src
+
+max_log_init Ncurses ${NCURSES_VER} "target (shared)" ${CONFLOGS} ${LOG}
+./configure --prefix=${BUILD_PREFIX} --with-shared \
+   --host=${TARGET} --with-build-cc=gcc \
+   --without-debug ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make ${INSTALL_OPTIONS} install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+chmod 755 ${INSTALL_PREFIX}/${libdirname}/*.${NCURSES_VER} &&
+ln -s libncurses.a ${INSTALL_PREFIX}/${libdirname}/libcurses.a
+ln -sf libncurses.so.5 ${INSTALL_PREFIX}/${libdirname}/libcurses.so
+
+#ldconfig
+
+if [ ! -f ${INSTALL_PREFIX}/include/term.h -a -f ${INSTALL_PREFIX}/include/ncurses/term.h ]; then
+   ln -sf ncurses/term.h ${INSTALL_PREFIX}/include
+fi
+
+# also create a curses.h symlink
+if [ ! -f ${INSTALL_PREFIX}/include/curses.h -a -f ${INSTALL_PREFIX}/include/ncurses/curses.h ]; then
+   ln -sf ncurses/curses.h ${INSTALL_PREFIX}/include
+fi
+
Index: scripts/target-scripts/target-nettools.sh
===================================================================
--- scripts/target-scripts/target-nettools.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-nettools.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,103 @@
+#!/bin/bash
+
+# cross-lfs target net-tools build
+# --------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+#set -x
+cd ${SRC}
+LOG=net-tools-target.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball net-tools-${NETTOOLS_VER}
+cd ${PKGDIR}
+
+# Retrieve target_gcc_ver from gcc -v output
+target_gcc_ver=`${TARGET}-gcc -v 2>&1 | grep " version " | \
+   sed 's@.*version \([0-9.]*\).*@\1@g'`
+
+case ${target_gcc_ver} in
+   3.4* | 4.* )
+      # Fix some syntax so gcc-3.4 is kept happy
+      # NOTE: this patch contains the miitool.c fix
+      apply_patch net-tools-1.60-gcc34-3
+   ;;
+   * )
+      # change string in miitool.c to something gcc-3.3 likes...
+      # TODO: wrap some logic around this...
+      apply_patch net-tools-1.60-miitool-gcc33-1
+   ;;
+esac
+
+
+# If we are building with 2.6 headers we need to adjust the x25
+# code in X25_setroute to use  the size of "struct x25_address"
+# in the memcpy instead of "x25_address" ( x25_address is no longer
+# a typedef in <linux/x25.h> )
+case "${KERNEL_VER}" in
+   2.6* )
+      test -f lib/x25_sr.c-ORIG ||
+         mv lib/x25_sr.c lib/x25_sr.c-ORIG
+
+      sed 's@\(sizeof(\)\(x25_address)\)@\1struct \2@g' \
+         lib/x25_sr.c-ORIG > lib/x25_sr.c
+   ;;
+esac
+
+# Have noticed an issue with x86_64 biarch and linux-libc-headers-2.6.5.1
+# iptunnel.c barfs out on redefinitions of 3 structs in <linux/if.h>
+# ( ifmap, ifreq and ifconf )  which are also available in <net/if.h>.
+# Removal of reference to <net/if.h> solved the issue...
+# TODO: look into this
+
+
+# Check for previously created configuration files for target.
+# TODO: this really should go somewhere other than ${TARBALLS},
+#       need a separate configs dir for the scripts for this and
+#       kernel config...
+
+test -f ${TARBALLS}/net-tools-${NETTOOLS_VER}-config-${TARGET}.tar.bz2 &&
+{
+   # Previously installed config files
+   bzcat ${TARBALLS}/net-tools-${NETTOOLS_VER}-config-${TARGET}.tar.bz2 | \
+      tar xvf -
+} || {
+   # Will have to do it interactively, save config for reuse
+   make config
+
+   tar -cvf ${TARBALLS}/net-tools-${NETTOOLS_VER}-config-${TARGET}.tar config.h config.make config.status
+   bzip2 ${TARBALLS}/net-tools-${NETTOOLS_VER}-config-${TARGET}.tar
+}
+
+# Fix hostname.c for decnet (pulls in <netdnet/dn.h>, should use <linux/dn.h>
+# NOTE: this doesn't fix it... cant be bothered looking into it,
+#       just don't bother with decnet...
+test -f hostname.c-ORIG ||
+   mv hostname.c hostname.c-ORIG
+sed 's@netdnet/dn.h@linux/dn.h@g' hostname.c-ORIG > hostname.c
+
+
+# Have to pass SHELL="bash" to make so that we use bash's "test" as 
+# /usr/bin/test under solaris (used when /bin/sh is invoked as it has no
+# builtin) doesn't understand -nt (newer than)
+
+max_log_init Net-tools ${NETTOOLS_VER} "target (shared)" ${BUILDLOGS} ${LOG}
+make SHELL="bash" \
+     CC="${TARGET}-gcc ${ARCH_CFLAGS}" \
+     AR="${TARGET}-ar" \
+     COPTS="-D_GNU_SOURCE -O2 -Wall -pipe ${TGT_CFLAGS}" \
+     LOPTS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make BASEDIR="${LFS}" update \
+      >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/target-scripts/target-nfsutils.sh
===================================================================
--- scripts/target-scripts/target-nfsutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-nfsutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,62 @@
+#!/bin/bash
+
+# cross-lfs target nfs-utils build
+# --------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+# NOTE: rpc.* binaries aren't created, only standalone nfsd etc
+#       I'm not too sure how we'd get rpcgen to work during a cross build
+
+cd ${SRC}
+LOG=nfsutils-target.log
+
+set_libdirname
+setup_multiarch
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+   INSTALL_PREFIX="${LFS}${BUILD_PREFIX}"
+   INSTALL_OPTIONS="DESTDIR=${LFS}"
+else
+   BUILD_PREFIX="${TGT_TOOLS}"
+   INSTALL_PREFIX="${TGT_TOOLS}"
+   INSTALL_OPTIONS=""
+fi
+
+unpack_tarball nfs-utils-${NFSUTILS_VER} &&
+cd ${PKGDIR}
+
+max_log_init NFS-utils ${NFSUTILS_VER} "target (shared)" ${CONFLOGS} ${LOG}
+echo "ac_cv_func_malloc_0_nonnull=yes
+ac_cv_func_realloc_0_nonnull=yes" > config.cache
+
+CC="${TARGET}-gcc ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe" \
+./configure --prefix=${BUILD_PREFIX} \
+   --host=${TARGET} \
+   --cache-file=config.cache \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+#   --sysconfdir=/etc \
+
+# Target env clobbers makefile, unset
+unset TARGET
+
+# We cant use the newly built rpcgen when cross-compiling
+# HACK: use the hosts
+#RPCGEN=rpcgen \
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+#su -c "export PATH=${PATH} ; make install" \
+make ${INSTALL_OPTIONS} install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/target-scripts/target-patch.sh
===================================================================
--- scripts/target-scripts/target-patch.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-patch.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+# cross-lfs target patch build
+# ----------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=patch-target.log
+
+unpack_tarball patch-${PATCH_VER}
+cd ${PKGDIR}
+
+set_libdirname
+setup_multiarch
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+   INSTALL_PREFIX="${LFS}${BUILD_PREFIX}"
+   INSTALL_OPTIONS="prefix=${INSTALL_PREFIX}"
+else
+   BUILD_PREFIX="${TGT_TOOLS}"
+   INSTALL_PREFIX="${TGT_TOOLS}"
+   INSTALL_OPTIONS=""
+fi
+
+max_log_init Patch ${PATCH_VER} "target (shared)" ${CONFLOGS} ${LOG}
+CC="${TARGET}-gcc ${ARCH_CFLAGS}" \
+AR="${TARGET}-ar" RANLIB="${TARGET}-ranlib" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+CPPFLAGS="-D_GNU_SOURCE" \
+./configure --prefix=${BUILD_PREFIX} --host=${TARGET} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make ${INSTALL_OPTIONS} install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/target-scripts/target-portmap.sh
===================================================================
--- scripts/target-scripts/target-portmap.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-portmap.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+# cross-lfs target portmap build
+# ------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=portmap-target.log
+
+set_libdirname
+setup_multiarch
+
+# TODO: should probably just install into
+#       ${LFS} and be done with it
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BASEDIR=${LFS}
+else
+   BASEDIR=${TGT_TOOLS}
+fi
+
+unpack_tarball portmap_${PORTMAP_VER}
+cd ${PKGDIR}
+apply_patch portmap-5beta-compilation_fixes-3 
+apply_patch portmap-5beta-glibc_errno_fix-1
+
+# Do not strip during install
+chmod 644 Makefile
+if [ ! -f Makefile-ORIG ]; then cp Makefile Makefile-ORIG ; fi
+sed '/install.*-s /s@-s @@g' Makefile-ORIG > Makefile
+
+max_log_init portmap ${PORTMAP_VER} "target (shared)" ${BUILDLOGS} ${LOG}
+make CC="${TARGET}-gcc ${ARCH_CFLAGS} ${TGT_CFLAGS}" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+su -c "make BASEDIR=${BASEDIR} install" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/target-scripts/target-procps.sh
===================================================================
--- scripts/target-scripts/target-procps.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-procps.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,102 @@
+#!/bin/bash
+
+# cross-lfs target procps build
+# -----------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=procps-final.log
+
+set_libdirname
+setup_multiarch
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+   INSTALL_OPTIONS="DESTDIR=${LFS}"
+else
+   BUILD_PREFIX="${TGT_TOOLS}"
+   INSTALL_OPTIONS="DESTDIR=${TGT_TOOLS}"
+fi
+
+unpack_tarball procps-${PROCPS_VER} &&
+cd ${PKGDIR}
+
+# Following sed implements the LFS procps patch 
+#   apply_patch procps-${PROCPS_VER}
+# (20030404: works for procps 3.1.5 - 3.1.8)
+# Not required for 3.2.x
+#test -f w.c-ORIG ||
+#   cp w.c w.c-ORIG
+#sed 's@setlocale(LC_ALL, "")@setlocale(LC_NUMERIC, "C")@' w.c-ORIG \
+#   > w.c
+
+# Mod Makefile, pass extra LDFLAGS from env
+# remove strip from install invocation, change install dirs to lib64 if biarch
+# and change hard coded ncurses include search path of /usr/include/ncurses
+# to look in ${TGT_TOOLS}/include
+
+test -f Makefile-ORIG ||
+   cp Makefile Makefile-ORIG
+
+LDFLAGS="-s" 
+
+# modify install invocation to set --owner and --group to the 
+# user running this script.
+# ( avoids issues during install if building as a non-root user )
+uid=`id -u`
+gid=`id -g`
+
+# TODO: need to check how lib64  is handled better in procps
+#       This is here based upon x86_64 only...
+sed -e "s/LDFLAGS :=.*/& ${LDFLAGS}/" \
+    -e 's@--strip @@g' \
+    -e "s@^\(lib64.*:= \).*@\1${libdirname}@g" \
+    -e "s@/usr/include/ncurses@${BUILD_PREFIX}/include/ncurses@g" \
+    -e "/^install/s/--owner 0 --group 0/--owner ${uid} --group ${gid}/g" \
+    Makefile-ORIG > Makefile
+
+# same deal with --strip in proc/module.mk
+# also remove invocation of ldconfig 
+test -f proc/module.mk-ORIG ||
+   mv proc/module.mk proc/module.mk-ORIG
+
+sed -e 's@--strip @@g' \
+    -e 's@$(ldconfig)@@g' \
+    -e "s@strip@${TARGET}-strip@g" \
+    proc/module.mk-ORIG > proc/module.mk
+
+# same deal with --strip in ps/module.mk
+test -f ps/module.mk-ORIG ||
+   mv ps/module.mk ps/module.mk-ORIG
+
+sed -e 's@--strip @@g' \
+    ps/module.mk-ORIG > ps/module.mk
+
+max_log_init Procps ${PROCPS_VER} "Final (shared)" ${BUILDLOGS} ${LOG}
+make CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+     lib64=${libdirname} \
+     CC="${TARGET}-gcc ${ARCH_CFLAGS}" \
+      >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+# As per LFS CVS
+min_log_init ${INSTLOGS} &&
+make ${INSTALL_OPTIONS} \
+     lib64=${libdirname} \
+     CC="${TARGET}-gcc ${ARCH_CFLAGS}" install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+if [ ! "${USE_SYSROOT}" = "Y" ]; then
+   # if ${LFS}/bin does not exist, create it.
+   if [ ! -d ${LFS}/bin ]; then
+      mkdir ${LFS}/bin
+   fi
+
+   cd ${LFS}/bin
+   ln -sf ..${TGT_TOOLS}/bin/kill .
+fi
Index: scripts/target-scripts/target-sed.sh
===================================================================
--- scripts/target-scripts/target-sed.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-sed.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+# cross-lfs target procps build
+# -----------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=sed-target.log
+
+unpack_tarball sed-${SED_VER} &&
+cd ${PKGDIR}
+
+set_libdirname
+setup_multiarch
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+   INSTALL_PREFIX="${LFS}${BUILD_PREFIX}"
+   INSTALL_OPTIONS="DESTDIR=${LFS}"
+else
+   BUILD_PREFIX="${TGT_TOOLS}"
+   INSTALL_PREFIX="${TGT_TOOLS}"
+   INSTALL_OPTIONS=""
+fi
+
+case ${SED_VER} in
+   4.1 )
+      # when sed'ing in-place the target files permissions are changed
+      # this fixes this behaviour
+      apply_patch sed-4.1-permissions-1
+   ;;
+esac
+
+max_log_init Sed ${SED_VER} "target (shared)" ${CONFLOGS} ${LOG}
+CC="${TARGET}-gcc ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=${BUILD_PREFIX} \
+   --host=${TARGET} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make ${INSTALL_OPTIONS} install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/target-scripts/target-strace.sh
===================================================================
--- scripts/target-scripts/target-strace.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-strace.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+# cross-lfs target strace build
+# -----------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=strace-target.log
+
+set_libdirname
+setup_multiarch
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+   INSTALL_PREFIX="${LFS}${BUILD_PREFIX}"
+   INSTALL_OPTIONS="DESTDIR=${LFS}"
+else
+   BUILD_PREFIX="${TGT_TOOLS}"
+   INSTALL_PREFIX="${TGT_TOOLS}"
+   INSTALL_OPTIONS=""
+fi
+
+unpack_tarball strace-${STRACE_VER} &&
+cd ${PKGDIR}
+
+max_log_init strace ${STRACE_VER} "target (shared)" ${CONFLOGS} ${LOG}
+CC="${TARGET}-gcc ${ARCH_CFLAGS}" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=${BUILD_PREFIX} \
+   --host=${TARGET} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make ${INSTALL_OPTIONS} install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
Index: scripts/target-scripts/target-sysklogd.sh
===================================================================
--- scripts/target-scripts/target-sysklogd.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-sysklogd.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# cross-lfs target sysklogd build
+# -------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=sysklogd-target.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball sysklogd-${SYSKLOGD_VER} &&
+cd ${PKGDIR}
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX="/usr"
+   INSTALL_PREFIX="${LFS}${BUILD_PREFIX}"
+else
+   INSTALL_PREFIX="${TGT_TOOLS}"
+fi
+
+# If using 2.5+ kernels, patch (klogd linux/modules.h)
+case ${KERNEL_VER} in
+   2.[56].* )
+      case ${SYSKLOGD_VER} in
+        1.4.[1-9]* )
+            apply_patch sysklogd-${SYSKLOGD_VER}
+         ;;
+      esac
+   ;;
+esac
+
+apply_patch sysklogd-${SYSKLOGD_VER}-cross
+
+# This package defaults to optimisation level -O3
+# Following strips this out, allowing us to set CFLAGS
+# with whatever optimisation we want via RPM_OPT_FLAGS
+test -f Makefile-ORIG ||
+   cp Makefile Makefile-ORIG
+sed 's@CFLAGS= $(RPM_OPT_FLAGS) -O3@CFLAGS= $(RPM_OPT_FLAGS)@g' \
+   Makefile-ORIG > Makefile
+
+max_log_init Sysklogd ${SYSKLOGD_VER} "Final (shared)" ${BUILDLOGS} ${LOG}
+make -k CC="${TARGET}-gcc ${ARCH_CFLAGS}" \
+        LDFLAGS="-s" RPM_OPT_FLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+      >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+if [ ! -d ${INSTALL_PREFIX}/man/man8 ]; then mkdir -p ${INSTALL_PREFIX}/man/man8 ; fi
+if [ ! -d ${LFS}/usr/sbin ]; then mkdir -p ${LFS}/usr/sbin ; fi
+
+echo "Password: " &&
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   su -c "make BINDIR=${INSTALL_PREFIX}/sbin MANDIR=${INSTALL_PREFIX}/man install &&
+          ln -fs ${TGT_TOOLS}/sbin/syslogd ${LFS}/usr/sbin &&
+          ln -fs ${TGT_TOOLS}/sbin/klogd ${LFS}/usr/sbin "
+      >> ${LOGFILE} 2>&1 &&
+   echo " o ALL OK" || barf
+else
+   su -c "make BINDIR=${INSTALL_PREFIX}/sbin MANDIR=${INSTALL_PREFIX}/man install"
+      >> ${LOGFILE} 2>&1 &&
+   echo " o ALL OK" || barf
+fi
+
+# Create /etc/syslog.conf
+# NOTE: Using LFS syslog.conf, copy in real one later
+cat > ${LFS}/etc/syslog.conf << "EOF"
+# Begin /etc/syslog.conf
+
+auth,authpriv.*		-/var/log/auth.log
+*.*;auth,authpriv.none	-/var/log/sys.log
+daemon.*		-/var/log/daemon.log
+kern.*			-/var/log/kern.log
+mail.*			-/var/log/mail.log
+user.*			-/var/log/user.log
+*.emerg			*
+
+# End /etc/syslog.conf
+EOF
+
Index: scripts/target-scripts/target-sysvinit.sh
===================================================================
--- scripts/target-scripts/target-sysvinit.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-sysvinit.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,120 @@
+#!/bin/bash
+
+# cross-lfs target sysvinit build
+# -------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+# NOTE: This script installs into ${LFS} (ie target root) NOT
+#       ${TGT_TOOLS}
+
+cd ${SRC}
+LOG=sysvinit-target.log
+
+set_libdirname
+setup_multiarch
+
+# We will need the ${LFS}/dev directory built for "make install".
+# Create it now if it doesn't exist
+test -d ${LFS}/dev ||
+   mkdir -p ${LFS}/dev
+
+unpack_tarball sysvinit-${SYSVINIT_VER} &&
+cd ${PKGDIR}
+
+# TODO: add some logic around this...
+#       this needs to be tracked
+case ${SYSVINIT_VER} in
+   2.85 )
+      apply_patch sysvinit-2.85-proclen-1
+   ;;
+esac
+
+# From LFS CVS 
+cp src/init.c src/init.c-ORIG &&
+sed 's/Sending processes/Sending processes started by init/g' \
+    src/init.c-ORIG > src/init.c
+
+# Modify Makefile
+test -f src/Makefile-ORIG ||
+   cp src/Makefile src/Makefile-ORIG
+
+# 1: Add -pipe to CFLAGS ( default optimization is -O2 )
+# 2: Also change BIN_OWNER and BIN_GROUP from "root" to 0
+# 3: Modify instructions using chown $(BIN_COMBO) to do a 
+#    chown $(BIN_OWNER) and a chgrp $(BIN_GROUP) instead
+# 4: makefile works with /dev/initctl, NOT $(ROOT)/dev/initctl
+#    change this so it operates on our target root, NOT the hosts
+# 5: alter mknod of $(ROOT)/dev/initctl to not set mode while creating the fifo
+#    instead set mode with chmod.
+
+sed -e 's@^CFLAGS.*-O2@& -pipe@g' \
+    -e 's@root@0@g' \
+    -e 's@chown $(BIN_COMBO) \(.*\)@chown $(BIN_OWNER) \1 ;chgrp $(BIN_GROUP) \1@g' \
+    -e 's@/dev/initctl@$(ROOT)&@g' \
+    -e 's@\(mknod \)-m \([0-9]* \)\(.* \)p@\1\3p; chmod \2\3@g' \
+   src/Makefile-ORIG > src/Makefile
+
+
+max_log_init Sysvinit ${SYSVINIT_VER} "Final (shared)" ${BUILDLOGS} ${LOG}
+make -C src CC="${TARGET}-gcc ${ARCH_CFLAGS}" LDFLAGS="-s" ROOT="${LFS}" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+# Install doesnt create this dir...
+# if ${LFS}/usr/bin does not exist, create it
+if [ ! -d ${LFS}/usr/bin ]; then 
+   mkdir -p ${LFS}/usr/bin
+fi
+
+mkdir -p ${LFS}/usr/include
+mkdir -p ${LFS}/usr/share/man/man{1,5,8}
+
+min_log_init ${INSTLOGS} &&
+echo Password: &&
+su -c "make -C src install ROOT=${LFS}" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+test -d ${LFS}/etc ||
+   mkdir ${LFS}/etc
+# If we already have an /etc/inittab, move it out the way
+test -f ${LFS}/etc/inittab &&
+   mv ${LFS}/etc/inittab ${LFS}/etc/inittab-${DATE}
+
+cat > ${LFS}/etc/inittab << "EOF"
+# Begin /etc/inittab
+
+id:3:initdefault:
+
+si::sysinit:/etc/rc.d/init.d/rc sysinit
+
+l0:0:wait:/etc/rc.d/init.d/rc 0
+l1:S1:wait:/etc/rc.d/init.d/rc 1
+l2:2:wait:/etc/rc.d/init.d/rc 2
+l3:3:wait:/etc/rc.d/init.d/rc 3
+l4:4:wait:/etc/rc.d/init.d/rc 4
+l5:5:wait:/etc/rc.d/init.d/rc 5
+l6:6:wait:/etc/rc.d/init.d/rc 6
+
+ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -r now
+
+su:S016:once:/sbin/sulogin
+EOF
+
+# Check if we are using DEVFS or not before creating getty entries 
+# If we are using DEVFS need to specify vc/x NOT ttyx
+tty_string="tty"
+test Y = "${DEVFS}" &&
+   tty_string="vc/"
+
+for vc_no in 1 2 3 4 5 6 ; do
+   echo "${vc_no}:2345:respawn:/sbin/agetty ${tty_string}${vc_no} 9600" \
+      >> ${LFS}/etc/inittab
+done
+
+echo -e "\n# End /etc/inittab" >> ${LFS}/etc/inittab
+
Index: scripts/target-scripts/target-tar.sh
===================================================================
--- scripts/target-scripts/target-tar.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-tar.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+# cross-lfs target tar build
+# --------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG=tar-target.log
+
+unpack_tarball tar-${TAR_VER}
+cd ${PKGDIR}
+
+set_libdirname
+setup_multiarch
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+   INSTALL_PREFIX="${LFS}${BUILD_PREFIX}"
+   INSTALL_OPTIONS="DESTDIR=${LFS}"
+else
+   BUILD_PREFIX="${TGT_TOOLS}"
+   INSTALL_PREFIX="${TGT_TOOLS}"
+   INSTALL_OPTIONS=""
+fi
+
+case ${TAR_VER} in
+   1.13 )   apply_patch tar-${TAR_VER} ;;
+   1.15.1 ) apply_patch tar-1.15.1-sparse_fix-1 ;;
+esac
+
+# getline again
+echo "am_cv_func_working_getline=yes" > config.cache
+
+max_log_init Tar ${TAR_VER} "initial (shared)" ${CONFLOGS} ${LOG}
+CC="${TARGET}-gcc ${ARCH_CFLAGS}" \
+AR="${TARGET}-ar" RANLIB="${TARGET}-ranlib" \
+CFLAGS="-O2 -pipe ${TGT_CFLAGS}" \
+./configure --prefix=${BUILD_PREFIX} \
+   --host=${TARGET} --cache-file=config.cache \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make ${INSTALL_OPTIONS} install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/target-scripts/target-tcp-wrappers-32.sh
===================================================================
--- scripts/target-scripts/target-tcp-wrappers-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-tcp-wrappers-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+target-tcp-wrappers.sh
Index: scripts/target-scripts/target-tcp-wrappers-64.sh
===================================================================
--- scripts/target-scripts/target-tcp-wrappers-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-tcp-wrappers-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+target-tcp-wrappers.sh
Index: scripts/target-scripts/target-tcp-wrappers-n32.sh
===================================================================
--- scripts/target-scripts/target-tcp-wrappers-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-tcp-wrappers-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+target-tcp-wrappers.sh
Index: scripts/target-scripts/target-tcp-wrappers.sh
===================================================================
--- scripts/target-scripts/target-tcp-wrappers.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-tcp-wrappers.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,60 @@
+#!/bin/bash
+
+# cross-lfs target tcp-wrappers build
+# -----------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+cd ${SRC}
+LOG="tcp-wrappers-target.log"
+libdirname=lib
+
+# Test if the 64 script has been called.
+# This should only really get called during bi-arch builds
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+   INSTALL_PREFIX="${LFS}${BUILD_PREFIX}"
+   INSTALL_OPTIONS="DESTDIR=${LFS}"
+else
+   BUILD_PREFIX="${TGT_TOOLS}"
+   INSTALL_PREFIX="${TGT_TOOLS}"
+   INSTALL_OPTIONS=""
+fi
+
+unpack_tarball tcp_wrappers_${TCPWRAP_VER}
+
+cd ${PKGDIR}
+apply_patch tcp_wrappers-7.6-shared_lib_plus_plus-1
+apply_patch tcp_wrappers-7.6-gcc34-1
+
+if [ ! "${libdirname}" = "lib" ]; then
+   sed -i -e "s@/lib/@/${libdirname}/@g" Makefile
+fi
+
+if [ ! "${USE_SYSROOT}" = "Y" ]; then
+   sed -i -e "s@\(\${DESTDIR}\)/usr@\1${TGT_TOOLS}@g" Makefile
+fi
+
+max_log_init tcp-wrappers ${TCPWRAP_VER} "target (shared)" ${BUILDLOGS} ${LOG}
+make CC="${TARGET}-gcc ${ARCH_CFLAGS}" \
+   AR="${TARGET}-ar" RANLIB="${TARGET}-ranlib" \
+   REAL_DAEMON_DIR="${BUILD_PREFIX}/sbin" \
+   STYLE="-DPROCESS_OPTIONS" linux \
+      >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+#su -c "mkdir -p ${TGT_TOOLS}/share/man/man{5,8} ; make install" \
+mkdir -p ${INSTALL_PREFIX}/share/man/man{5,8} &&
+su -c "make ${INSTALL_OPTIONS} install" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/target-scripts/target-util-linux.sh
===================================================================
--- scripts/target-scripts/target-util-linux.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-util-linux.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,117 @@
+#!/bin/bash
+
+# cross-lfs target util-linux build
+# ---------------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+# NOTE: this script defaults to installing into the new root ( ${LFS} ).
+#       work has to be done on configure to make it install to 
+#       ${TGT_TOOLS}
+
+# NOTE: *** For gods sake ryan, fix the setting of CPU and ARCH ***
+
+cd ${SRC}
+LOG=util-linux-target.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball util-linux-${UTILLINUX_VER} &&
+cd ${PKGDIR}
+
+case ${UTILLINUX_VER} in
+   2.12 | 2.12a )
+      case ${KERNEL_VER} in
+         2.[56].* )
+            # Fixes for utillinux 2.12 + 2.12a for building against 2.6
+            # kernel headers
+            apply_patch util-linux-2.12a-kernel_headers-1
+         ;;
+      esac
+   ;;
+   2.12[k-q] )
+      # fix cramfs, this fix will need to be tracked for later versions...
+      apply_patch util-linux-2.12q-cramfs-1
+      # fix sfdisk for mips n32/64 as n32/64 uses lseek, not llseek
+      apply_patch util-linux-2.12q-sfdisk_use_lseek_for_mips64-1
+   ;;
+esac
+
+case ${UTILLINUX_VER} in
+   2.12 | 2.12[a-m] )
+      # Patch to fix fdiskbsdlabel.h for m68k, also adds unistd.h to list
+      # of includes for swapon.c
+      apply_patch util-linux-2.12a-cross-lfs-fixes
+   ;;
+   2.12* )
+      # Patch to fix fdiskbsdlabel.h for m68k
+      apply_patch util-linux-2.12n-cross-lfs-fixes
+   ;;
+esac
+
+# Make FHS compliant
+# Get list of files which reference etc/adjtime
+filelist=`grep -l -d recurse etc/adjtime *`
+
+# Edit each file in turn
+for file in ${filelist} ; do
+   test -f ${file}-ORIG ||
+      cp ${file} ${file}-ORIG
+   # Change instance of etc/adjtime to var/lib/hwclock/adjtime
+   sed 's%etc/adjtime%var/lib/hwclock/adjtime%' \
+      ${file}-ORIG > ${file}
+done
+mkdir -p ${LFS}/var/lib/hwclock
+
+if [ ! "${USE_SYSROOT}" = "Y" ]; then
+   echo " o Changing hard coded references to /usr/include to point at ${TGT_TOOLS}"
+   flist=`grep -d recurse -l /usr/include *`
+   for file in ${flist}; do
+      (
+      echo " - editing ${file}"
+      test -f ${file}-ORIG || cp ${file} ${file}-ORIG
+      sed 's@/usr/include@${TGT_TOOLS}/include@g' ${file}-ORIG > ${file}
+      )
+   done
+fi
+
+# Optimization defaults to -O2
+max_log_init Util-linux ${UTILLINUX_VER} "Final (shared)" ${CONFLOGS} ${LOG}
+export CC="${TARGET}-gcc ${ARCH_CFLAGS}"
+
+# Here it is just plain ugly. We set CPU and ARCH to something that wont trigger
+# anything in MCONFIG
+export CPU=m68k
+export ARCH=m68k
+export DESTDIR=${LFS}
+
+./configure \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+# Don't build kill or sln
+# (procps supplies kill and glibc supplies sln)
+# No need to supply LDFLAGS="-s", taken care of during configure
+#
+# Optionally, for x86, unset CPUOPT (defaults to i486 if cpu not i386)
+# or set specifically for your cpu type.
+# See MCONFIG...
+#
+# also, build login by setting HAVE_SHADOW to no, this can be revisited
+# if/when we cross-compile the shadow package
+
+min_log_init ${BUILDLOGS} &&
+make HAVE_KILL=yes HAVE_SLN=yes HAVE_SHADOW=no CPUOPT="" \
+      >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${INSTLOGS} &&
+echo Password:
+su -c "export PATH=${PATH} ; make HAVE_KILL=yes HAVE_SLN=yes HAVE_SHADOW=no install" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/target-scripts/target-zlib-32.sh
===================================================================
--- scripts/target-scripts/target-zlib-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-zlib-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+target-zlib.sh
Index: scripts/target-scripts/target-zlib-64.sh
===================================================================
--- scripts/target-scripts/target-zlib-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-zlib-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+target-zlib.sh
Index: scripts/target-scripts/target-zlib-n32.sh
===================================================================
--- scripts/target-scripts/target-zlib-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-zlib-n32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+target-zlib.sh
Index: scripts/target-scripts/target-zlib.sh
===================================================================
--- scripts/target-scripts/target-zlib.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/target-scripts/target-zlib.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,95 @@
+#!/bin/bash
+
+# cross-lfs target zlib build
+# ---------------------------
+# $LastChangedBy$
+# $LastChangedDate$
+# $LastChangedRevision$
+# $HeadURL$
+#
+
+LOG=zlib-target.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+
+if [ "${USE_SYSROOT}" = "Y" ]; then
+   BUILD_PREFIX=/usr
+   INSTALL_PREFIX="${LFS}${BUILD_PREFIX}"
+   INSTALL_OPTIONS="DESTDIR=${LFS}"
+else
+   BUILD_PREFIX=${TGT_TOOLS}
+   INSTALL_PREFIX="${TGT_TOOLS}"
+   INSTALL_OPTIONS=""
+fi
+
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=${BUILD_PREFIX}/${libdirname}"
+fi
+
+export CC="${TARGET}-gcc ${ARCH_CFLAGS}"
+export CXX="${TARGET}-g++ ${ARCH_CFLAGS}"
+
+cd ${SRC}
+unpack_tarball zlib-${ZLIB_VER}
+cd ${PKGDIR}
+
+# TODO: check to see how far back this applies...
+apply_patch zlib-1.2.2-add_DESTDIR-1
+
+#TODO - fix this for later zlibs
+test "1.1.4" = "${ZLIB_VER}" &&
+{
+   # Fix up zlibs Makefile so we can properly pass in LDFLAGS from
+   # the env without clobbering existing settings for zlib build
+   test -f Makefile.in-ORIG ||
+      cp Makefile.in Makefile.in-ORIG
+
+   # make LDFLAGS in Makefile.in empty and move existing LDFLAGS
+   # to ZLIB_LDFLAGS. Append $(ZLIB_LDFLAGS) wherever $(LDFLAGS) exists
+   sed -e 's@LDFLAGS=.*@ZLIB_&@' \
+       -e '/ZLIB_LDFLAGS=/i\
+LDFLAGS=' \
+       -e 's@$(LDFLAGS)@& $(ZLIB_LDFLAGS)@g' \
+       Makefile.in-ORIG > Makefile.in
+}
+
+max_log_init Zlib ${ZLIB_VER} "target (shared)" ${CONFLOGS} ${LOG}
+
+# Check to see if we are on alpha
+# Req's a fix as specified on Kelledins Alpha page
+# Pointed out by J.Schmelling
+case "${TGT_ARCH}" in
+   alpha | x86_64 ) extra_cflags="-fPIC" ;;
+esac
+# NOTE: It's probably not a bad idea in general to enable -fPIC...
+
+test "1.1.4" = "${ZLIB_VER}" &&
+{
+   # Apply Kelledin's vsnprintf patch
+   # see http://archive.linuxfromscratch.org/lfs-dev/2003/02/..... 
+   apply_patch zlib-${ZLIB_VER}-vsnprintf
+   CFLAGS="-O2 -pipe ${extra_cflags} ${TGT_CFLAGS}" CPPFLAGS="-DHAS_vsnprintf" \
+   ./configure --prefix=${BUILD_PREFIX} --shared ${extra_conf} \
+      >> ${LOGFILE} 2>&1 
+} || {
+   CFLAGS="-O2 -pipe ${extra_cflags} ${TGT_CFLAGS}" \
+   ./configure --prefix=${BUILD_PREFIX} \
+      --shared ${extra_conf} \
+      >> ${LOGFILE} 2>&1 
+}
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+#make LDFLAGS="-s" \
+make ${PMFLAGS} \
+      >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make ${INSTALL_OPTIONS} install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-patches/OpenSP-1.5.1-LITLEN-1.patch
===================================================================
--- scripts/untested/blfs-patches/OpenSP-1.5.1-LITLEN-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/OpenSP-1.5.1-LITLEN-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,54 @@
+Submitted By: BLFS Book <blfs-book@linuxfromscratch.org>
+Date: 2003-10-05
+Initial Package Version: 1.5
+Origin: BLFS Book
+Description: Remove some annonying messages when running openjade.
+
+$LastChangedBy: bdubbs $
+$Date: 2004-08-07 18:56:30 -0600 (Sat, 07 Aug 2004) $
+
+diff -Naur OpenSP-1.5/lib/Syntax.cxx OpenSP-1.5-patched/lib/Syntax.cxx
+--- OpenSP-1.5/lib/Syntax.cxx	2000-03-14 23:17:25.000000000 +0000
++++ OpenSP-1.5-patched/lib/Syntax.cxx	2003-05-24 18:36:39.000000000
++0000
+@@ -24,7 +24,7 @@
+   16,
+   16,
+   16,
+-  32,
++  253,
+   96,
+   16,
+   240,
+diff -Naur OpenSP-1.5/unicode/gensyntax.pl
+OpenSP-1.5-patched/unicode/gensyntax.pl
+--- OpenSP-1.5/unicode/gensyntax.pl	1999-11-04 08:36:18.000000000
++0000
++++ OpenSP-1.5-patched/unicode/gensyntax.pl	2003-05-24
+18:39:53.000000000 +0000
+@@ -185,7 +185,7 @@
+ 
+ QUANTITY        SGMLREF         -- To be determined --
+         ATTSPLEN        1920    -- ?? --
+-        LITLEN          240     -- ?? --
++        LITLEN          8092    -- ?? --
+         NAMELEN         240     -- ?? --
+         PILEN           1920    -- ?? --
+         TAGLEN          1920    -- ?? --
+diff -Naur OpenSP-1.5/unicode/unicode.syn
+OpenSP-1.5-patched/unicode/unicode.syn
+--- OpenSP-1.5/unicode/unicode.syn	1999-11-04 08:36:18.000000000
++0000
++++ OpenSP-1.5-patched/unicode/unicode.syn	2003-05-24
+18:40:12.000000000 +0000
+@@ -1266,7 +1266,7 @@
+ 
+ QUANTITY        SGMLREF         -- To be determined --
+         ATTSPLEN        1920    -- ?? --
+-        LITLEN          240     -- ?? --
++        LITLEN          8092    -- ?? --
+         NAMELEN         240     -- ?? --
+         PILEN           1920    -- ?? --
+         TAGLEN          1920    -- ?? --
+
+
Index: scripts/untested/blfs-patches/OpenSP-1.5.1-gcc34-1.patch
===================================================================
--- scripts/untested/blfs-patches/OpenSP-1.5.1-gcc34-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/OpenSP-1.5.1-gcc34-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,20 @@
+Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
+Date: 2004-04-24
+Initial Package Version: 1.5.1
+Origin: OpenJade SourceForge Patch Page
+Upstream Status: Fixed
+Description: Fixes Compile Issues with GCC 3.4
+ 
+$LastChangedBy: bdubbs $
+$Date: 2004-08-07 18:56:30 -0600 (Sat, 07 Aug 2004) $
+
+--- OpenSP-1.5.1/include/RangeMap.cxx.orig	2004-04-24 17:39:50.000691400 +0000
++++ OpenSP-1.5.1/include/RangeMap.cxx	2004-04-24 17:39:59.682536194 +0000
+@@ -7,6 +7,7 @@
+ #include "RangeMap.h"
+ #include "ISet.h"
+ #include "types.h"
++#include "constant.h"
+ 
+ #ifdef SP_NAMESPACE
+ namespace SP_NAMESPACE {
Index: scripts/untested/blfs-patches/Python-2.4-db43-1.patch
===================================================================
--- scripts/untested/blfs-patches/Python-2.4-db43-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/Python-2.4-db43-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,91 @@
+Submitted By:            Igor Zivkovic <igor@linuxfromscratch.org>
+Date:                    2004-12-09
+Initial Package Version: 2.3.4
+Upstream Status:         Submitted at Python patch tracker.
+Origin:                  Michal Cihar and Suzuki Hisao
+Description:             Adds support for Berkeley DB-4.3.x.
+
+$LastChangedBy: igor $
+$Date: 2005-01-10 15:43:51 -0700 (Mon, 10 Jan 2005) $
+
+--- Python-2.3.4/Modules/_bsddb.c.orig	2004-12-09 15:26:24.807332600 +0000
++++ Python-2.3.4/Modules/_bsddb.c	2004-12-09 15:26:39.966028128 +0000
+@@ -422,7 +422,15 @@
+ /* Callback used to save away more information about errors from the DB
+  * library. */
+ static char _db_errmsg[1024];
+-static void _db_errorCallback(const char* prefix, char* msg)
++static void _db_errorCallback(
++#if (DBVER >= 43)
++        const DB_ENV *dbenv,
++#endif
++        const char* prefix, 
++#if (DBVER >= 43)
++        const 
++#endif
++        char* msg)
+ {
+     strcpy(_db_errmsg, msg);
+ }
+@@ -1987,7 +1995,11 @@
+ 
+     MYDB_BEGIN_ALLOW_THREADS;
+ #if (DBVER >= 33)
+-    err = self->db->stat(self->db, &sp, flags);
++    err = self->db->stat(self->db, 
++#if (DBVER >= 43)
++            NULL /*txnid*/,
++#endif
++            &sp, flags);
+ #else
+     err = self->db->stat(self->db, &sp, NULL, flags);
+ #endif
+@@ -2249,7 +2261,11 @@
+ 
+     MYDB_BEGIN_ALLOW_THREADS;
+ #if (DBVER >= 33)
+-    err = self->db->stat(self->db, &sp, flags);
++    err = self->db->stat(self->db, 
++#if (DBVER >= 43)
++            NULL /*txnid*/,
++#endif
++            &sp, flags);
+ #else
+     err = self->db->stat(self->db, &sp, NULL, flags);
+ #endif
+@@ -2375,7 +2391,11 @@
+     err = self->db->get(self->db, txn, &key, &data, 0);
+     MYDB_END_ALLOW_THREADS;
+     FREE_DBT(key);
++#if (DBVER >= 43)
++    return PyInt_FromLong((err == DB_BUFFER_SMALL) || (err == 0));
++#else
+     return PyInt_FromLong((err == ENOMEM) || (err == 0));
++#endif
+ }
+ 
+ 
+@@ -4527,7 +4547,12 @@
+ 
+ #if (DBVER >= 33)
+     ADD_INT(d, DB_LSTAT_ABORTED);
++#if (DBVER < 43)
+     ADD_INT(d, DB_LSTAT_ERR);
++#endif
++#if (DBVER >= 42)
++    ADD_INT(d, DB_LSTAT_EXPIRED);
++#endif
+     ADD_INT(d, DB_LSTAT_FREE);
+     ADD_INT(d, DB_LSTAT_HELD);
+ #if (DBVER == 33)
+--- Python-2.3.4/setup.py.orig	2004-12-09 15:26:30.007542048 +0000
++++ Python-2.3.4/setup.py	2004-12-09 15:26:39.971027368 +0000
+@@ -480,7 +480,7 @@
+         # when sorted in reverse order, keys for this dict must appear in the
+         # order you wish to search - e.g., search for db4 before db3
+         db_try_this = {
+-            'db4': {'libs': ('db-4.2', 'db42', 'db-4.1', 'db41', 'db-4.0', 'db4',),
++            'db4': {'libs': ('db-4.3', 'db43', 'db-4.2', 'db42', 'db-4.1', 'db41', 'db-4.0', 'db4',),
+                     'libdirs': ('/usr/local/BerkeleyDB.4.2/lib',
+                                 '/usr/local/BerkeleyDB.4.1/lib',
+                                 '/usr/local/BerkeleyDB.4.0/lib',
Index: scripts/untested/blfs-patches/Python-2.4-db43-2.patch
===================================================================
--- scripts/untested/blfs-patches/Python-2.4-db43-2.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/Python-2.4-db43-2.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,96 @@
+diff -uNr Python-2.4-orig/Modules/_bsddb.c Python-2.4/Modules/_bsddb.c
+--- Python-2.4-orig/Modules/_bsddb.c	2004-09-04 11:36:59.000000000 +1000
++++ Python-2.4/Modules/_bsddb.c	2005-02-05 22:03:38.805737040 +1100
+@@ -466,7 +466,15 @@
+ /* Callback used to save away more information about errors from the DB
+  * library. */
+ static char _db_errmsg[1024];
+-static void _db_errorCallback(const char* prefix, char* msg)
++static void _db_errorCallback(
++#if (DBVER >= 43)
++        const DB_ENV *dbenv,
++#endif
++        const char* prefix, 
++#if (DBVER >= 43)
++        const 
++#endif
++        char* msg)
+ {
+     strcpy(_db_errmsg, msg);
+ }
+@@ -2146,7 +2154,11 @@
+ 
+     MYDB_BEGIN_ALLOW_THREADS;
+ #if (DBVER >= 33)
+-    err = self->db->stat(self->db, &sp, flags);
++    err = self->db->stat(self->db, 
++#if (DBVER >= 43)
++            NULL /*txnid*/,
++#endif
++            &sp, flags);
+ #else
+     err = self->db->stat(self->db, &sp, NULL, flags);
+ #endif
+@@ -2408,7 +2420,11 @@
+ 
+     MYDB_BEGIN_ALLOW_THREADS;
+ #if (DBVER >= 33)
+-    err = self->db->stat(self->db, &sp, flags);
++    err = self->db->stat(self->db, 
++#if (DBVER >= 43)
++            NULL /*txnid*/,
++#endif
++            &sp, flags);
+ #else
+     err = self->db->stat(self->db, &sp, NULL, flags);
+ #endif
+@@ -2536,7 +2552,11 @@
+     err = self->db->get(self->db, txn, &key, &data, 0);
+     MYDB_END_ALLOW_THREADS;
+     FREE_DBT(key);
++#if (DBVER >= 43)
++    return PyInt_FromLong((err == DB_BUFFER_SMALL) || (err == 0));
++#else
+     return PyInt_FromLong((err == ENOMEM) || (err == 0));
++#endif
+ }
+ 
+ 
+@@ -4903,7 +4923,12 @@
+ 
+ #if (DBVER >= 33)
+     ADD_INT(d, DB_LSTAT_ABORTED);
++#if (DBVER < 43)
+     ADD_INT(d, DB_LSTAT_ERR);
++#endif
++#if (DBVER >= 42)
++    ADD_INT(d, DB_LSTAT_EXPIRED);
++#endif
+     ADD_INT(d, DB_LSTAT_FREE);
+     ADD_INT(d, DB_LSTAT_HELD);
+ #if (DBVER == 33)
+diff -uNr Python-2.4-orig/setup.py Python-2.4/setup.py
+--- Python-2.4-orig/setup.py	2004-11-13 22:13:34.000000000 +1100
++++ Python-2.4/setup.py	2005-02-05 22:14:00.675198512 +1100
+@@ -492,15 +492,18 @@
+         # when sorted in reverse order, keys for this dict must appear in the
+         # order you wish to search - e.g., search for db4 before db3
+         db_try_this = {
+-            'db4': {'libs': ('db-4.2', 'db42', 'db-4.1', 'db41', 'db-4.0', 'db4',),
+-                    'libdirs': ('/usr/local/BerkeleyDB.4.2/lib',
++            'db4': {'libs': ('db-4.3', 'db43', 'db-4.2', 'db42', 'db-4.1', 'db41', 'db-4.0', 'db4',),
++                    'libdirs': ('/usr/local/BerkeleyDB.4.3/lib',
++                                '/usr/local/BerkeleyDB.4.2/lib',
+                                 '/usr/local/BerkeleyDB.4.1/lib',
+                                 '/usr/local/BerkeleyDB.4.0/lib',
+                                 '/usr/local/lib',
+                                 '/opt/sfw',
+                                 '/sw/lib',
+                                 ),
+-                    'incdirs': ('/usr/local/BerkeleyDB.4.2/include',
++                    'incdirs': ('/usr/local/BerkeleyDB.4.3/include',
++                                '/usr/local/include/db43',
++                                '/usr/local/BerkeleyDB.4.2/include',
+                                 '/usr/local/include/db42',
+                                 '/usr/local/BerkeleyDB.4.1/include',
+                                 '/usr/local/include/db41',
Index: scripts/untested/blfs-patches/Python-2.4-gdbm-1.patch
===================================================================
--- scripts/untested/blfs-patches/Python-2.4-gdbm-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/Python-2.4-gdbm-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,32 @@
+Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
+Date: 2003-12-26
+Initial Package Version: 2.3.3
+Origin: Greg Schafer and Jim Gifford
+Description: Fixes Python build issue with gdbm
+
+       *** WARNING: renaming "dbm" since importing it failed:                         
+       build/lib.linux-i686-2.3/dbm.so: undefined symbol: dbm_firstkey  
+
+
+ 
+$LastChangedBy: igor $
+$Date: 2005-01-06 08:31:17 -0700 (Thu, 06 Jan 2005) $
+
+diff -Naur Python-2.3.2.orig/setup.py Python-2.3.2/setup.py
+--- Python-2.3.2.orig/setup.py	2003-09-22 01:19:45.000000000 +0000
++++ Python-2.3.2/setup.py	2003-10-13 06:28:34.000000000 +0000
+@@ -596,12 +596,12 @@
+                 if self.compiler.find_library_file(lib_dirs, 'ndbm'):
+                     ndbm_libs = ['ndbm']
+                 else:
+-                    ndbm_libs = []
++                    ndbm_libs = ['gdbm', 'gdbm_compat']
+                 exts.append( Extension('dbm', ['dbmmodule.c'],
+                                        define_macros=[('HAVE_NDBM_H',None)],
+                                        libraries = ndbm_libs ) )
+             elif (self.compiler.find_library_file(lib_dirs, 'gdbm')
+-                  and find_file("gdbm/ndbm.h", inc_dirs, []) is not None):
++                  and find_file("ndbm.h", inc_dirs, []) is not None):
+                 exts.append( Extension('dbm', ['dbmmodule.c'],
+                                        define_macros=[('HAVE_GDBM_NDBM_H',None)],
+                                        libraries = ['gdbm'] ) )
Index: scripts/untested/blfs-patches/Python-2.4-lib64-1.patch
===================================================================
--- scripts/untested/blfs-patches/Python-2.4-lib64-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/Python-2.4-lib64-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,231 @@
+diff -uNr Python-2.4-orig/Lib/distutils/command/install.py Python-2.4/Lib/distutils/command/install.py
+--- Python-2.4-orig/Lib/distutils/command/install.py	2004-11-11 09:23:15.000000000 +1100
++++ Python-2.4/Lib/distutils/command/install.py	2005-02-05 22:27:58.261865984 +1100
+@@ -39,14 +39,14 @@
+ INSTALL_SCHEMES = {
+     'unix_prefix': {
+         'purelib': '$base/lib/python$py_version_short/site-packages',
+-        'platlib': '$platbase/lib/python$py_version_short/site-packages',
++        'platlib': '$platbase/lib64/python$py_version_short/site-packages',
+         'headers': '$base/include/python$py_version_short/$dist_name',
+         'scripts': '$base/bin',
+         'data'   : '$base',
+         },
+     'unix_home': {
+         'purelib': '$base/lib/python',
+-        'platlib': '$base/lib/python',
++        'platlib': '$base/lib64/python',
+         'headers': '$base/include/python/$dist_name',
+         'scripts': '$base/bin',
+         'data'   : '$base',
+diff -uNr Python-2.4-orig/Lib/distutils/sysconfig.py Python-2.4/Lib/distutils/sysconfig.py
+--- Python-2.4-orig/Lib/distutils/sysconfig.py	2004-10-14 01:54:16.000000000 +1000
++++ Python-2.4/Lib/distutils/sysconfig.py	2005-02-05 22:27:58.262865832 +1100
+@@ -99,8 +99,12 @@
+         prefix = plat_specific and EXEC_PREFIX or PREFIX
+ 
+     if os.name == "posix":
++        if plat_specific or standard_lib:
++            lib = "lib64"
++        else:
++            lib = "lib"
+         libpython = os.path.join(prefix,
+-                                 "lib", "python" + get_python_version())
++                                 "lib64", "python" + get_python_version())
+         if standard_lib:
+             return libpython
+         else:
+diff -uNr Python-2.4-orig/Lib/site.py Python-2.4/Lib/site.py
+--- Python-2.4-orig/Lib/site.py	2004-07-20 12:28:28.000000000 +1000
++++ Python-2.4/Lib/site.py	2005-02-05 22:27:58.262865832 +1100
+@@ -179,9 +179,14 @@
+                 sitedirs = [os.path.join(prefix, "Lib", "site-packages")]
+             elif os.sep == '/':
+                 sitedirs = [os.path.join(prefix,
++                                         "lib64",
++                                         "python" + sys.version[:3],
++                                         "site-packages"),
++                            os.path.join(prefix,
+                                          "lib",
+                                          "python" + sys.version[:3],
+                                          "site-packages"),
++                                                       os.path.join(prefix, "lib64", "site-python"),
+                             os.path.join(prefix, "lib", "site-python")]
+             else:
+                 sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")]
+diff -uNr Python-2.4-orig/Makefile.pre.in Python-2.4/Makefile.pre.in
+--- Python-2.4-orig/Makefile.pre.in	2004-09-27 03:26:55.000000000 +1000
++++ Python-2.4/Makefile.pre.in	2005-02-05 22:27:58.263865680 +1100
+@@ -79,11 +79,11 @@
+ 
+ # Expanded directories
+ BINDIR=		$(exec_prefix)/bin
+-LIBDIR=		$(exec_prefix)/lib
++LIBDIR=		$(exec_prefix)/lib64
+ MANDIR=		@mandir@
+ INCLUDEDIR=	@includedir@
+ CONFINCLUDEDIR=	$(exec_prefix)/include
+-SCRIPTDIR=	$(prefix)/lib
++SCRIPTDIR=	$(prefix)/lib64
+ 
+ # Detailed destination directories
+ BINLIBDEST=	$(LIBDIR)/python$(VERSION)
+diff -uNr Python-2.4-orig/Modules/Setup.dist Python-2.4/Modules/Setup.dist
+--- Python-2.4-orig/Modules/Setup.dist	2004-08-31 23:50:12.000000000 +1000
++++ Python-2.4/Modules/Setup.dist	2005-02-05 22:27:58.264865528 +1100
+@@ -325,7 +325,7 @@
+ # *** Uncomment and edit to reflect your Tcl/Tk versions:
+ #	-ltk8.2 -ltcl8.2 \
+ # *** Uncomment and edit to reflect where your X11 libraries are:
+-#	-L/usr/X11R6/lib \
++ 	-L/usr/X11R6/lib64 \
+ # *** Or uncomment this for Solaris:
+ #	-L/usr/openwin/lib \
+ # *** Uncomment these for TOGL extension only:
+@@ -396,7 +396,7 @@
+ #DB=/usr/local/BerkeleyDB.4.0
+ #DBLIBVER=4.0
+ #DBINC=$(DB)/include
+-#DBLIB=$(DB)/lib
++DBLIB=$(DB)/lib64
+ #_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
+ 
+ # Historical Berkeley DB 1.85
+@@ -442,7 +442,7 @@
+ # Andrew Kuchling's zlib module.
+ # This require zlib 1.1.3 (or later).
+ # See http://www.gzip.org/zlib/
+-#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
++zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz
+ 
+ # Interface to the Expat XML parser
+ #
+diff -uNr Python-2.4-orig/Modules/getpath.c Python-2.4/Modules/getpath.c
+--- Python-2.4-orig/Modules/getpath.c	2004-08-08 11:00:47.000000000 +1000
++++ Python-2.4/Modules/getpath.c	2005-02-05 22:27:58.266865224 +1100
+@@ -112,8 +112,8 @@
+ #endif
+ 
+ #ifndef PYTHONPATH
+-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
+-              EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
++#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \
++              EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload"
+ #endif
+ 
+ #ifndef LANDMARK
+@@ -124,7 +124,7 @@
+ static char exec_prefix[MAXPATHLEN+1];
+ static char progpath[MAXPATHLEN+1];
+ static char *module_search_path = NULL;
+-static char lib_python[] = "lib/python" VERSION;
++static char lib_python[] = "lib64/python" VERSION;
+ 
+ static void
+ reduce(char *dir)
+@@ -515,7 +515,7 @@
+     }
+     else
+         strncpy(zip_path, PREFIX, MAXPATHLEN);
+-    joinpath(zip_path, "lib/python00.zip");
++    joinpath(zip_path, "lib64/python00.zip");
+     bufsz = strlen(zip_path);	/* Replace "00" with version */
+     zip_path[bufsz - 6] = VERSION[0];
+     zip_path[bufsz - 5] = VERSION[2];
+@@ -525,7 +525,7 @@
+             fprintf(stderr,
+                 "Could not find platform dependent libraries <exec_prefix>\n");
+         strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN);
+-        joinpath(exec_prefix, "lib/lib-dynload");
++        joinpath(exec_prefix, "lib64/lib-dynload");
+     }
+     /* If we found EXEC_PREFIX do *not* reduce it!  (Yet.) */
+ 
+diff -uNr Python-2.4-orig/setup.py Python-2.4/setup.py
+--- Python-2.4-orig/setup.py	2005-02-05 22:27:23.618132632 +1100
++++ Python-2.4/setup.py	2005-02-05 22:27:58.268864920 +1100
+@@ -239,7 +239,7 @@
+ 
+     def detect_modules(self):
+         # Ensure that /usr/local is always used
+-        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
++        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
+         add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+ 
+         # Add paths to popular package managers on OS X/darwin
+@@ -429,11 +429,11 @@
+             elif self.compiler.find_library_file(lib_dirs, 'curses'):
+                 readline_libs.append('curses')
+             elif self.compiler.find_library_file(lib_dirs +
+-                                               ['/usr/lib/termcap'],
++                                               ['/usr/lib64/termcap'],
+                                                'termcap'):
+                 readline_libs.append('termcap')
+             exts.append( Extension('readline', ['readline.c'],
+-                                   library_dirs=['/usr/lib/termcap'],
++                                   library_dirs=['/usr/lib64/termcap'],
+                                    libraries=readline_libs) )
+         if platform not in ['mac']:
+             # crypt module.
+@@ -462,8 +462,8 @@
+             if krb5_h:
+                 ssl_incs += krb5_h
+         ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
+-                                     ['/usr/local/ssl/lib',
+-                                      '/usr/contrib/ssl/lib/'
++                                     ['/usr/local/ssl/lib64',
++                                      '/usr/contrib/ssl/lib64/'
+                                      ] )
+ 
+         if (ssl_incs is not None and
+@@ -493,13 +493,13 @@
+         # order you wish to search - e.g., search for db4 before db3
+         db_try_this = {
+             'db4': {'libs': ('db-4.3', 'db43', 'db-4.2', 'db42', 'db-4.1', 'db41', 'db-4.0', 'db4',),
+-                    'libdirs': ('/usr/local/BerkeleyDB.4.3/lib',
+-                                '/usr/local/BerkeleyDB.4.2/lib',
+-                                '/usr/local/BerkeleyDB.4.1/lib',
+-                                '/usr/local/BerkeleyDB.4.0/lib',
+-                                '/usr/local/lib',
++                    'libdirs': ('/usr/local/BerkeleyDB.4.3/lib64',
++                                '/usr/local/BerkeleyDB.4.2/lib64',
++                                '/usr/local/BerkeleyDB.4.1/lib64',
++                                '/usr/local/BerkeleyDB.4.0/lib64',
++                                '/usr/local/lib64',
+                                 '/opt/sfw',
+-                                '/sw/lib',
++                                '/sw/lib64',
+                                 ),
+                     'incdirs': ('/usr/local/BerkeleyDB.4.3/include',
+                                 '/usr/local/include/db43',
+@@ -514,11 +514,11 @@
+                                 '/usr/include/db4',
+                                 )},
+             'db3': {'libs': ('db-3.3', 'db-3.2', 'db3',),
+-                    'libdirs': ('/usr/local/BerkeleyDB.3.3/lib',
+-                                '/usr/local/BerkeleyDB.3.2/lib',
+-                                '/usr/local/lib',
+-                                '/opt/sfw/lib',
+-                                '/sw/lib',
++                    'libdirs': ('/usr/local/BerkeleyDB.3.3/lib64',
++                                '/usr/local/BerkeleyDB.3.2/lib64',
++                                '/usr/local/lib64',
++                                '/opt/sfw/lib64',
++                                '/sw/lib64',
+                                 ),
+                     'incdirs': ('/usr/local/BerkeleyDB.3.3/include',
+                                 '/usr/local/BerkeleyDB.3.2/include',
+@@ -1000,11 +1000,11 @@
+             added_lib_dirs.append('/usr/X11R6/lib')
+         elif os.path.exists('/usr/X11R5/include'):
+             include_dirs.append('/usr/X11R5/include')
+-            added_lib_dirs.append('/usr/X11R5/lib')
++            added_lib_dirs.append('/usr/X11R5/lib64')
+         else:
+             # Assume default location for X11
+             include_dirs.append('/usr/X11/include')
+-            added_lib_dirs.append('/usr/X11/lib')
++            added_lib_dirs.append('/usr/X11/lib64')
+ 
+         # If Cygwin, then verify that X is installed before proceeding
+         if platform == 'cygwin':
Index: scripts/untested/blfs-patches/Python-2.4.1-lib64-1.patch
===================================================================
--- scripts/untested/blfs-patches/Python-2.4.1-lib64-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/Python-2.4.1-lib64-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,194 @@
+diff -uNr Python-2.4-orig/Lib/distutils/command/install.py Python-2.4/Lib/distutils/command/install.py
+--- Python-2.4-orig/Lib/distutils/command/install.py	2004-11-11 09:23:15.000000000 +1100
++++ Python-2.4/Lib/distutils/command/install.py	2005-02-05 22:27:58.261865984 +1100
+@@ -39,14 +39,14 @@
+ INSTALL_SCHEMES = {
+     'unix_prefix': {
+         'purelib': '$base/lib/python$py_version_short/site-packages',
+-        'platlib': '$platbase/lib/python$py_version_short/site-packages',
++        'platlib': '$platbase/lib64/python$py_version_short/site-packages',
+         'headers': '$base/include/python$py_version_short/$dist_name',
+         'scripts': '$base/bin',
+         'data'   : '$base',
+         },
+     'unix_home': {
+         'purelib': '$base/lib/python',
+-        'platlib': '$base/lib/python',
++        'platlib': '$base/lib64/python',
+         'headers': '$base/include/python/$dist_name',
+         'scripts': '$base/bin',
+         'data'   : '$base',
+diff -uNr Python-2.4-orig/Lib/distutils/sysconfig.py Python-2.4/Lib/distutils/sysconfig.py
+--- Python-2.4-orig/Lib/distutils/sysconfig.py	2004-10-14 01:54:16.000000000 +1000
++++ Python-2.4/Lib/distutils/sysconfig.py	2005-02-05 22:27:58.262865832 +1100
+@@ -99,8 +99,12 @@
+         prefix = plat_specific and EXEC_PREFIX or PREFIX
+ 
+     if os.name == "posix":
++        if plat_specific or standard_lib:
++            lib = "lib64"
++        else:
++            lib = "lib"
+         libpython = os.path.join(prefix,
+-                                 "lib", "python" + get_python_version())
++                                 "lib64", "python" + get_python_version())
+         if standard_lib:
+             return libpython
+         else:
+diff -uNr Python-2.4-orig/Lib/site.py Python-2.4/Lib/site.py
+--- Python-2.4-orig/Lib/site.py	2004-07-20 12:28:28.000000000 +1000
++++ Python-2.4/Lib/site.py	2005-02-05 22:27:58.262865832 +1100
+@@ -179,9 +179,14 @@
+                 sitedirs = [os.path.join(prefix, "Lib", "site-packages")]
+             elif os.sep == '/':
+                 sitedirs = [os.path.join(prefix,
++                                         "lib64",
++                                         "python" + sys.version[:3],
++                                         "site-packages"),
++                            os.path.join(prefix,
+                                          "lib",
+                                          "python" + sys.version[:3],
+                                          "site-packages"),
++                                                       os.path.join(prefix, "lib64", "site-python"),
+                             os.path.join(prefix, "lib", "site-python")]
+             else:
+                 sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")]
+diff -uNr Python-2.4-orig/Makefile.pre.in Python-2.4/Makefile.pre.in
+--- Python-2.4-orig/Makefile.pre.in	2004-09-27 03:26:55.000000000 +1000
++++ Python-2.4/Makefile.pre.in	2005-02-05 22:27:58.263865680 +1100
+@@ -79,11 +79,11 @@
+ 
+ # Expanded directories
+ BINDIR=		$(exec_prefix)/bin
+-LIBDIR=		$(exec_prefix)/lib
++LIBDIR=		$(exec_prefix)/lib64
+ MANDIR=		@mandir@
+ INCLUDEDIR=	@includedir@
+ CONFINCLUDEDIR=	$(exec_prefix)/include
+-SCRIPTDIR=	$(prefix)/lib
++SCRIPTDIR=	$(prefix)/lib64
+ 
+ # Detailed destination directories
+ BINLIBDEST=	$(LIBDIR)/python$(VERSION)
+diff -uNr Python-2.4-orig/Modules/Setup.dist Python-2.4/Modules/Setup.dist
+--- Python-2.4-orig/Modules/Setup.dist	2004-08-31 23:50:12.000000000 +1000
++++ Python-2.4/Modules/Setup.dist	2005-02-05 22:27:58.264865528 +1100
+@@ -325,7 +325,7 @@
+ # *** Uncomment and edit to reflect your Tcl/Tk versions:
+ #	-ltk8.2 -ltcl8.2 \
+ # *** Uncomment and edit to reflect where your X11 libraries are:
+-#	-L/usr/X11R6/lib \
++ 	-L/usr/X11R6/lib64 \
+ # *** Or uncomment this for Solaris:
+ #	-L/usr/openwin/lib \
+ # *** Uncomment these for TOGL extension only:
+@@ -396,7 +396,7 @@
+ #DB=/usr/local/BerkeleyDB.4.0
+ #DBLIBVER=4.0
+ #DBINC=$(DB)/include
+-#DBLIB=$(DB)/lib
++DBLIB=$(DB)/lib64
+ #_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
+ 
+ # Historical Berkeley DB 1.85
+@@ -442,7 +442,7 @@
+ # Andrew Kuchling's zlib module.
+ # This require zlib 1.1.3 (or later).
+ # See http://www.gzip.org/zlib/
+-#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
++zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz
+ 
+ # Interface to the Expat XML parser
+ #
+diff -uNr Python-2.4-orig/Modules/getpath.c Python-2.4/Modules/getpath.c
+--- Python-2.4-orig/Modules/getpath.c	2004-08-08 11:00:47.000000000 +1000
++++ Python-2.4/Modules/getpath.c	2005-02-05 22:27:58.266865224 +1100
+@@ -112,8 +112,8 @@
+ #endif
+ 
+ #ifndef PYTHONPATH
+-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
+-              EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
++#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \
++              EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload"
+ #endif
+ 
+ #ifndef LANDMARK
+@@ -124,7 +124,7 @@
+ static char exec_prefix[MAXPATHLEN+1];
+ static char progpath[MAXPATHLEN+1];
+ static char *module_search_path = NULL;
+-static char lib_python[] = "lib/python" VERSION;
++static char lib_python[] = "lib64/python" VERSION;
+ 
+ static void
+ reduce(char *dir)
+@@ -515,7 +515,7 @@
+     }
+     else
+         strncpy(zip_path, PREFIX, MAXPATHLEN);
+-    joinpath(zip_path, "lib/python00.zip");
++    joinpath(zip_path, "lib64/python00.zip");
+     bufsz = strlen(zip_path);	/* Replace "00" with version */
+     zip_path[bufsz - 6] = VERSION[0];
+     zip_path[bufsz - 5] = VERSION[2];
+@@ -525,7 +525,7 @@
+             fprintf(stderr,
+                 "Could not find platform dependent libraries <exec_prefix>\n");
+         strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN);
+-        joinpath(exec_prefix, "lib/lib-dynload");
++        joinpath(exec_prefix, "lib64/lib-dynload");
+     }
+     /* If we found EXEC_PREFIX do *not* reduce it!  (Yet.) */
+ 
+diff -uNr Python-2.4-orig/setup.py Python-2.4/setup.py
+--- Python-2.4-orig/setup.py	2005-02-05 22:27:23.618132632 +1100
++++ Python-2.4/setup.py	2005-02-05 22:27:58.268864920 +1100
+@@ -239,7 +239,7 @@
+ 
+     def detect_modules(self):
+         # Ensure that /usr/local is always used
+-        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
++        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
+         add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
+ 
+         # Add paths to popular package managers on OS X/darwin
+@@ -429,11 +429,11 @@
+             elif self.compiler.find_library_file(lib_dirs, 'curses'):
+                 readline_libs.append('curses')
+             elif self.compiler.find_library_file(lib_dirs +
+-                                               ['/usr/lib/termcap'],
++                                               ['/usr/lib64/termcap'],
+                                                'termcap'):
+                 readline_libs.append('termcap')
+             exts.append( Extension('readline', ['readline.c'],
+-                                   library_dirs=['/usr/lib/termcap'],
++                                   library_dirs=['/usr/lib64/termcap'],
+                                    libraries=readline_libs) )
+         if platform not in ['mac']:
+             # crypt module.
+@@ -462,8 +462,8 @@
+             if krb5_h:
+                 ssl_incs += krb5_h
+         ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
+-                                     ['/usr/local/ssl/lib',
+-                                      '/usr/contrib/ssl/lib/'
++                                     ['/usr/local/ssl/lib64',
++                                      '/usr/contrib/ssl/lib64/'
+                                      ] )
+ 
+         if (ssl_incs is not None and
+@@ -1000,11 +1000,11 @@
+             added_lib_dirs.append('/usr/X11R6/lib')
+         elif os.path.exists('/usr/X11R5/include'):
+             include_dirs.append('/usr/X11R5/include')
+-            added_lib_dirs.append('/usr/X11R5/lib')
++            added_lib_dirs.append('/usr/X11R5/lib64')
+         else:
+             # Assume default location for X11
+             include_dirs.append('/usr/X11/include')
+-            added_lib_dirs.append('/usr/X11/lib')
++            added_lib_dirs.append('/usr/X11/lib64')
+ 
+         # If Cygwin, then verify that X is installed before proceeding
+         if platform == 'cygwin':
Index: scripts/untested/blfs-patches/X11R6.8.1-IncludeSharedObjectInNormalLib-1.patch
===================================================================
--- scripts/untested/blfs-patches/X11R6.8.1-IncludeSharedObjectInNormalLib-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/X11R6.8.1-IncludeSharedObjectInNormalLib-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,57 @@
+Submitted By: Ryan Oliver <ryan.oliver@pha.com.au
+Date: 2005-01-23
+Initial Package Version: XFree 4.2.99
+Upstream Status: Unknown
+Origin: Gentoo 
+Description: Ensures objects archived in static libs get built with -fPIC 
+	A notable barf is when building libaudio (NAS) linking against
+	libXau.a
+
+--- xc/lib/Xau/Imakefile.IncludeSharedObjectInNormalLib	2001-01-17 14:42:24.000000000 -0500
++++ xc/lib/Xau/Imakefile	2003-01-29 02:25:49.000000000 -0500
+@@ -37,6 +37,8 @@
+ OBJS =	AuDispose.o AuFileName.o AuGetAddr.o AuGetBest.o AuLock.o \
+ 	AuRead.o AuUnlock.o AuWrite.o $(K5ENCOBJ)
+ 
++#define IncludeSharedObjectInNormalLib
++
+ #include <Library.tmpl>
+ 
+ DependTarget()
+--- xc/lib/xkbfile/Imakefile.IncludeSharedObjectInNormalLib	2001-08-27 13:40:59.000000000 -0400
++++ xc/lib/xkbfile/Imakefile	2003-01-29 02:25:49.000000000 -0500
+@@ -34,6 +34,8 @@
+ 
+ ROOT_DEFINES = -DDFLT_XKB_CONFIG_ROOT=\"$(LIBDIR)/xkb\"
+ 
++#define IncludeSharedObjectInNormalLib
++
+ #include <Library.tmpl>
+ 
+ DependTarget()
+--- xc/lib/xkbui/Imakefile.IncludeSharedObjectInNormalLib	1999-03-13 22:21:21.000000000 -0500
++++ xc/lib/xkbui/Imakefile	2003-01-29 02:25:49.000000000 -0500
+@@ -15,6 +15,8 @@
+          HEADERS = XKBui.h
+         INCLUDES = -I. -I$(EXTINCSRC) -I../xkbfile
+ 
++#define IncludeSharedObjectInNormalLib
++
+ #include <Library.tmpl>
+ 
+ DependTarget()
+--- xc/programs/Xserver/hw/xfree86/parser/Imakefile.IncludeSharedObjectInNormalLib	2003-01-29 02:41:13.000000000 -0500
++++ xc/programs/Xserver/hw/xfree86/parser/Imakefile	2003-01-29 02:41:53.000000000 -0500
+@@ -36,9 +36,11 @@
+ 		 -DXCONFIGFILE=\"$(XCONFIGFILE)\" \
+ 		 -DXVERSION="$(XVERS)"
+ 
++#define IncludeSharedObjectInNormalLib
++
+ #include <Library.tmpl>
+ 
+-SpecialCObjectRule(scan,NullParameter,$(CONFIG_DEFINES) $(MODULEDEFINES) $(EXT_DEFINES))
++SpecialCObjectRule(scan,NullParameter,$(CONFIG_DEFINES) $(MODULEDEFINES) $(EXT_DEFINES) $(PICFLAGS))
+ 
+ NormalProgramTarget(cpconfig,cpconfig.o $(OBJS),NullParameter,$(LOCAL_LIBRARIES),NullParameter)
+ 
Index: scripts/untested/blfs-patches/X11R6.8.1-fix_shared_libXau_link-1.patch
===================================================================
--- scripts/untested/blfs-patches/X11R6.8.1-fix_shared_libXau_link-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/X11R6.8.1-fix_shared_libXau_link-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,27 @@
+Submitted By: Ryan Oliver <ryan.oliver@pha.com.au>
+Date: 2005-01-23
+Initial Package Version: XFree 4.2.1
+Upstream Status: Unknown
+Origin: Gentoo
+Description: If building servers and SharedLibXau is defined, 
+	always build libXau by adding it to EXTRASYSLIBS
+
+--- xc/programs/Xserver/Imakefile.orig	2002-12-01 19:07:44.000000000 +0200
++++ xc/programs/Xserver/Imakefile	2002-12-01 19:10:26.000000000 +0200
+@@ -276,8 +276,16 @@
+             USB = UsbHidLib
+ #endif
+ #endif
+ #ifdef ServerExtraSysLibs
++# if SharedLibXau
++   EXTRASYSLIBS = ServerExtraSysLibs $(XAUTHLIB)
++# else
+    EXTRASYSLIBS = ServerExtraSysLibs
++# endif
++#else
++# if SharedLibXau
++   EXTRASYSLIBS = $(XAUTHLIB)
++# endif
+ #endif
+ #if HasPam && HasPamMisc
+         PAMLIBS = PamLibraries PamMiscLibraries
Index: scripts/untested/blfs-patches/a52dec-0.7.4-update_autofoo-1.patch
===================================================================
--- scripts/untested/blfs-patches/a52dec-0.7.4-update_autofoo-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/a52dec-0.7.4-update_autofoo-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,106610 @@
+diff -uNr a52dec-0.7.4-orig/INSTALL a52dec-0.7.4/INSTALL
+--- a52dec-0.7.4-orig/INSTALL	2002-04-27 17:01:28.000000000 +1000
++++ a52dec-0.7.4/INSTALL	2005-02-06 16:25:42.524403848 +1100
+@@ -1,58 +1,231 @@
+-Unix build instructions
+------------------------
++Installation Instructions
++*************************
+ 
+-./configure
+-make
+-make install
++Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free
++Software Foundation, Inc.
+ 
+-If you install from CVS you'll have to run ./bootstrap first
++This file is free documentation; the Free Software Foundation gives
++unlimited permission to copy, distribute and modify it.
+ 
++Basic Installation
++==================
++
++These are generic installation instructions.
++
++   The `configure' shell script attempts to guess correct values for
++various system-dependent variables used during compilation.  It uses
++those values to create a `Makefile' in each directory of the package.
++It may also create one or more `.h' files containing system-dependent
++definitions.  Finally, it creates a shell script `config.status' that
++you can run in the future to recreate the current configuration, and a
++file `config.log' containing compiler output (useful mainly for
++debugging `configure').
++
++   It can also use an optional file (typically called `config.cache'
++and enabled with `--cache-file=config.cache' or simply `-C') that saves
++the results of its tests to speed up reconfiguring.  (Caching is
++disabled by default to prevent problems with accidental use of stale
++cache files.)
++
++   If you need to do unusual things to compile the package, please try
++to figure out how `configure' could check whether to do them, and mail
++diffs or instructions to the address given in the `README' so they can
++be considered for the next release.  If you are using the cache, and at
++some point `config.cache' contains results you don't want to keep, you
++may remove or edit it.
++
++   The file `configure.ac' (or `configure.in') is used to create
++`configure' by a program called `autoconf'.  You only need
++`configure.ac' if you want to change it or regenerate `configure' using
++a newer version of `autoconf'.
++
++The simplest way to compile this package is:
++
++  1. `cd' to the directory containing the package's source code and type
++     `./configure' to configure the package for your system.  If you're
++     using `csh' on an old version of System V, you might need to type
++     `sh ./configure' instead to prevent `csh' from trying to execute
++     `configure' itself.
++
++     Running `configure' takes awhile.  While running, it prints some
++     messages telling which features it is checking for.
++
++  2. Type `make' to compile the package.
++
++  3. Optionally, type `make check' to run any self-tests that come with
++     the package.
++
++  4. Type `make install' to install the programs and any data files and
++     documentation.
++
++  5. You can remove the program binaries and object files from the
++     source code directory by typing `make clean'.  To also remove the
++     files that `configure' created (so you can compile the package for
++     a different kind of computer), type `make distclean'.  There is
++     also a `make maintainer-clean' target, but that is intended mainly
++     for the package's developers.  If you use it, you may have to get
++     all sorts of other programs in order to regenerate files that came
++     with the distribution.
++
++Compilers and Options
++=====================
++
++Some systems require unusual options for compilation or linking that the
++`configure' script does not know about.  Run `./configure --help' for
++details on some of the pertinent environment variables.
++
++   You can give `configure' initial values for configuration parameters
++by setting variables in the command line or in the environment.  Here
++is an example:
++
++     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
++
++   *Note Defining Variables::, for more details.
++
++Compiling For Multiple Architectures
++====================================
++
++You can compile the package for more than one kind of computer at the
++same time, by placing the object files for each architecture in their
++own directory.  To do this, you must use a version of `make' that
++supports the `VPATH' variable, such as GNU `make'.  `cd' to the
++directory where you want the object files and executables to go and run
++the `configure' script.  `configure' automatically checks for the
++source code in the directory that `configure' is in and in `..'.
++
++   If you have to use a `make' that does not support the `VPATH'
++variable, you have to compile the package for one architecture at a
++time in the source code directory.  After you have installed the
++package for one architecture, use `make distclean' before reconfiguring
++for another architecture.
++
++Installation Names
++==================
++
++By default, `make install' will install the package's files in
++`/usr/local/bin', `/usr/local/man', etc.  You can specify an
++installation prefix other than `/usr/local' by giving `configure' the
++option `--prefix=PREFIX'.
++
++   You can specify separate installation prefixes for
++architecture-specific files and architecture-independent files.  If you
++give `configure' the option `--exec-prefix=PREFIX', the package will
++use PREFIX as the prefix for installing programs and libraries.
++Documentation and other data files will still use the regular prefix.
++
++   In addition, if you use an unusual directory layout you can give
++options like `--bindir=DIR' to specify different values for particular
++kinds of files.  Run `configure --help' for a list of the directories
++you can set and what kinds of files go in them.
++
++   If the package supports it, you can cause programs to be installed
++with an extra prefix or suffix on their names by giving `configure' the
++option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
++
++Optional Features
++=================
++
++Some packages pay attention to `--enable-FEATURE' options to
++`configure', where FEATURE indicates an optional part of the package.
++They may also pay attention to `--with-PACKAGE' options, where PACKAGE
++is something like `gnu-as' or `x' (for the X Window System).  The
++`README' should mention any `--enable-' and `--with-' options that the
++package recognizes.
++
++   For packages that use the X Window System, `configure' can usually
++find the X include and library files automatically, but if it doesn't,
++you can use the `configure' options `--x-includes=DIR' and
++`--x-libraries=DIR' to specify their locations.
++
++Specifying the System Type
++==========================
++
++There may be some features `configure' cannot figure out automatically,
++but needs to determine by the type of machine the package will run on.
++Usually, assuming the package is built to be run on the _same_
++architectures, `configure' can figure that out, but if it prints a
++message saying it cannot guess the machine type, give it the
++`--build=TYPE' option.  TYPE can either be a short name for the system
++type, such as `sun4', or a canonical name which has the form:
++
++     CPU-COMPANY-SYSTEM
++
++where SYSTEM can have one of these forms:
++
++     OS KERNEL-OS
++
++   See the file `config.sub' for the possible values of each field.  If
++`config.sub' isn't included in this package, then this package doesn't
++need to know the machine type.
++
++   If you are _building_ compiler tools for cross-compiling, you should
++use the `--target=TYPE' option to select the type of system they will
++produce code for.
++
++   If you want to _use_ a cross compiler, that generates code for a
++platform different from the build platform, you should specify the
++"host" platform (i.e., that on which the generated programs will
++eventually be run) with `--host=TYPE'.
++
++Sharing Defaults
++================
++
++If you want to set default values for `configure' scripts to share, you
++can create a site shell script called `config.site' that gives default
++values for variables like `CC', `cache_file', and `prefix'.
++`configure' looks for `PREFIX/share/config.site' if it exists, then
++`PREFIX/etc/config.site' if it exists.  Or, you can set the
++`CONFIG_SITE' environment variable to the location of the site script.
++A warning: not all `configure' scripts look for a site script.
++
++Defining Variables
++==================
++
++Variables not defined in a site shell script can be set in the
++environment passed to `configure'.  However, some packages may run
++configure again during the build, and the customized values of these
++variables may be lost.  In order to avoid this problem, you should set
++them in the `configure' command line, using `VAR=value'.  For example:
++
++     ./configure CC=/usr/local2/bin/gcc
++
++will cause the specified gcc to be used as the C compiler (unless it is
++overridden in the site shell script).
++
++`configure' Invocation
++======================
++
++`configure' recognizes the following options to control how it operates.
++
++`--help'
++`-h'
++     Print a summary of the options to `configure', and exit.
++
++`--version'
++`-V'
++     Print the version of Autoconf used to generate the `configure'
++     script, and exit.
++
++`--cache-file=FILE'
++     Enable the cache: use and save the results of the tests in FILE,
++     traditionally `config.cache'.  FILE defaults to `/dev/null' to
++     disable caching.
++
++`--config-cache'
++`-C'
++     Alias for `--cache-file=config.cache'.
++
++`--quiet'
++`--silent'
++`-q'
++     Do not print messages saying which checks are being made.  To
++     suppress all normal output, redirect it to `/dev/null' (any error
++     messages will still be shown).
++
++`--srcdir=DIR'
++     Look for the package's source code in directory DIR.  Usually
++     `configure' can determine that directory automatically.
+ 
+-Building for win32
+-------------------
++`configure' also accepts some other, not widely useful, options.  Run
++`configure --help' for more details.
+ 
+-There are at least three ways to do it:
+-
+-- natively on Windows using Microsoft VC++ and the vc++ project
+-  included in this distribution.
+-
+-- natively on Windows using MSYS + MINGW (www.mingw.org) (MSYS is a
+-  minimal build environnement to compile unixish projects under
+-  windows. It provides all the common unix tools like sh, gmake...)
+-
+-- or on Linux, using the mingw32 cross-compiler
+-
+-
+-Building using MSYS + MINGW on windows
+---------------------------------------
+-
+-First you will need to download and install the latest MSYS (version
+-1.0.7 as of now) and MINGW. The installation is really easy. Begin
+-with the MSYS auto-installer and once this is done, extract MINGW into
+-c:\msys\1.0\mingw. You also have to remember to remove the make
+-utility included with MINGW as it conflicts with the one from MSYS
+-(just rename or remove c:\msys\1.0\mingw\bin\make.exe).
+-
+-http://prdownloads.sourceforge.net/mingw/MSYS-1.0.7-i686-2002.04.24-1.exe
+-http://prdownloads.sourceforge.net/mingw/MinGW-1.1.tar.gz
+-
+-Then you can build the package using:
+-# ./configure
+-# make
+-
+-
+-Building using the mingw32 cross-compiler
+------------------------------------------
+-
+-You need to install mingw32 first. For Debian GNU/Linux users, there
+-is a mingw32 package. Otherwise you might get it from the mingw site
+-at http://www.mingw.org/download.shtml.
+-
+-The videolan project also keeps precompiled mingw32 binaries at
+-http://www.videolan.org/vlc/windows.html . If you install these,
+-you'll have to set your PATH accordingly to include
+-/usr/local/cross-tools/bin too.
+-
+-The build should then proceed using something like:
+-# CC=i586-mingw32msvc-gcc ./configure --host=i586-mingw32msvc
+-# make
+diff -uNr a52dec-0.7.4-orig/Makefile.in a52dec-0.7.4/Makefile.in
+--- a52dec-0.7.4-orig/Makefile.in	2002-07-28 13:50:54.000000000 +1000
++++ a52dec-0.7.4/Makefile.in	2005-02-06 16:25:42.603391840 +1100
+@@ -1,6 +1,8 @@
+-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
++# Makefile.in generated by automake 1.9.4 from Makefile.am.
++# @configure_input@
+ 
+-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004  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.
+@@ -10,132 +12,223 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+ 
+-
+-SHELL = @SHELL@
+-
++@SET_MAKE@
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+-prefix = @prefix@
+-exec_prefix = @exec_prefix@
+-
+-bindir = @bindir@
+-sbindir = @sbindir@
+-libexecdir = @libexecdir@
+-datadir = @datadir@
+-sysconfdir = @sysconfdir@
+-sharedstatedir = @sharedstatedir@
+-localstatedir = @localstatedir@
+-libdir = @libdir@
+-infodir = @infodir@
+-mandir = @mandir@
+-includedir = @includedir@
+-oldincludedir = /usr/include
+-
+-DESTDIR =
+-
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-
+ top_builddir = .
+-
+-ACLOCAL = @ACLOCAL@
+-AUTOCONF = @AUTOCONF@
+-AUTOMAKE = @AUTOMAKE@
+-AUTOHEADER = @AUTOHEADER@
+-
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+-transform = @program_transform_name@
+-
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-host_alias = @host_alias@
++build_triplet = @build@
+ host_triplet = @host@
++subdir = .
++DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
++	$(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
++	ChangeLog INSTALL NEWS TODO
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(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
++mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++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
++ETAGS = etags
++CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++distdir = $(PACKAGE)-$(VERSION)
++top_distdir = $(distdir)
++am__remove_distdir = \
++  { test ! -d $(distdir) \
++    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
++         && rm -fr $(distdir); }; }
++DIST_ARCHIVES = $(distdir).tar.gz
++GZIP_ENV = --best
++distuninstallcheck_listfiles = find . -type f -print
++distcleancheck_listfiles = find . -type f -print
++A52DEC_CFLAGS = @A52DEC_CFLAGS@
++ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
++AMTAR = @AMTAR@
++AR = @AR@
+ AS = @AS@
++AUTOCONF = @AUTOCONF@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
+ CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CXX = @CXX@
++CXXCPP = @CXXCPP@
++CXXDEPMODE = @CXXDEPMODE@
++CXXFLAGS = @CXXFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
+ ECHO = @ECHO@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
++F77 = @F77@
++FFLAGS = @FFLAGS@
+ INCLUDES = @INCLUDES@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++LDFLAGS = @LDFLAGS@
++LIBA52_CFLAGS = @LIBA52_CFLAGS@
++LIBA52_LIBS = @LIBA52_LIBS@
++LIBAO_LIBS = @LIBAO_LIBS@
++LIBOBJS = @LIBOBJS@
++LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
++LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ RANLIB = @RANLIB@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+-
++ac_ct_AR = @ac_ct_AR@
++ac_ct_AS = @ac_ct_AS@
++ac_ct_CC = @ac_ct_CC@
++ac_ct_CXX = @ac_ct_CXX@
++ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
++ac_ct_F77 = @ac_ct_F77@
++ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
++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@
++am__tar = @am__tar@
++am__untar = @am__untar@
++bindir = @bindir@
++build = @build@
++build_alias = @build_alias@
++build_cpu = @build_cpu@
++build_os = @build_os@
++build_vendor = @build_vendor@
++datadir = @datadir@
++exec_prefix = @exec_prefix@
++host = @host@
++host_alias = @host_alias@
++host_cpu = @host_cpu@
++host_os = @host_os@
++host_vendor = @host_vendor@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localstatedir = @localstatedir@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++sysconfdir = @sysconfdir@
++target_alias = @target_alias@
+ SUBDIRS = autotools include doc liba52 libao src vc++ test
+-
+ EXTRA_DIST = HISTORY bootstrap
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs
+-CONFIG_HEADER = ./include/config.h
+-CONFIG_CLEAN_FILES = 
+-DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
+-Makefile.in NEWS TODO acinclude.m4 aclocal.m4 configure configure.in \
+-include/config.h.in include/stamp-h.in
++all: all-recursive
+ 
+-
+-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+-
+-TAR = tar
+-GZIP_ENV = --best
+-all: all-redirect
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
+-
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) \
+-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+-
+-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  acinclude.m4
+-	cd $(srcdir) && $(ACLOCAL)
++am--refresh:
++	@:
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
++	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --gnu  Makefile
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    echo ' $(SHELL) ./config.status'; \
++	    $(SHELL) ./config.status;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
++	esac;
+ 
+-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	$(SHELL) ./config.status --recheck
+-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+-	cd $(srcdir) && $(AUTOCONF)
+-
+-include/config.h: include/stamp-h
+-	@if test ! -f $@; then \
+-		rm -f include/stamp-h; \
+-		$(MAKE) include/stamp-h; \
+-	else :; fi
+-include/stamp-h: $(srcdir)/include/config.h.in $(top_builddir)/config.status
+-	cd $(top_builddir) \
+-	  && CONFIG_FILES= CONFIG_HEADERS=include/config.h \
+-	     $(SHELL) ./config.status
+-	@echo timestamp > include/stamp-h 2> /dev/null
+-$(srcdir)/include/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/include/stamp-h.in
+-	@if test ! -f $@; then \
+-		rm -f $(srcdir)/include/stamp-h.in; \
+-		$(MAKE) $(srcdir)/include/stamp-h.in; \
+-	else :; fi
+-$(srcdir)/include/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOHEADER)
+-	@echo timestamp > $(srcdir)/include/stamp-h.in 2> /dev/null
+ 
+-mostlyclean-hdr:
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++	cd $(srcdir) && $(AUTOCONF)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+ 
+-clean-hdr:
++mostlyclean-libtool:
++	-rm -f *.lo
+ 
+-distclean-hdr:
+-	-rm -f include/config.h
++clean-libtool:
++	-rm -rf .libs _libs
+ 
+-maintainer-clean-hdr:
++distclean-libtool:
++	-rm -f libtool
++uninstall-info-am:
+ 
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -143,13 +236,8 @@
+ # (1) if the variable is set in `config.status', edit `config.status'
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+-
+-@SET_MAKE@
+-
+-all-recursive install-data-recursive install-exec-recursive \
+-installdirs-recursive install-recursive uninstall-recursive  \
+-check-recursive installcheck-recursive info-recursive dvi-recursive:
+-	@set fnord $(MAKEFLAGS); amf=$$2; \
++$(RECURSIVE_TARGETS):
++	@set fnord $$MAKEFLAGS; amf=$$2; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -169,13 +257,18 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $(MAKEFLAGS); amf=$$2; \
++	@set fnord $$MAKEFLAGS; amf=$$2; \
+ 	dot_seen=no; \
+-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  rev="$$subdir $$rev"; \
+-	  test "$$subdir" != "." || dot_seen=yes; \
++	case "$@" in \
++	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
++	  *) list='$(SUBDIRS)' ;; \
++	esac; \
++	rev=''; for subdir in $$list; do \
++	  if test "$$subdir" = "."; then :; else \
++	    rev="$$subdir $$rev"; \
++	  fi; \
+ 	done; \
+-	test "$$dot_seen" = "no" && rev=". $$rev"; \
++	rev="$$rev ."; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	for subdir in $$rev; do \
+ 	  echo "Making $$target in $$subdir"; \
+@@ -191,170 +284,308 @@
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ 	done
++ctags-recursive:
++	list='$(SUBDIRS)'; for subdir in $$list; do \
++	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
++	done
+ 
+-tags: TAGS
+-
+-ID: $(HEADERS) $(SOURCES) $(LISP)
+-	list='$(SOURCES) $(HEADERS)'; \
+-	unique=`for i in $$list; do echo $$i; done | \
+-	  awk '    { files[$$0] = 1; } \
++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
++	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++	unique=`for i in $$list; do \
++	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++	  done | \
++	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	here=`pwd` && cd $(srcdir) \
+-	  && mkid -f$$here/ID $$unique $(LISP)
++	mkid -fID $$unique
++tags: TAGS
+ 
+-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
++TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
++		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
++	  include_option=--etags-include; \
++	  empty_fix=.; \
++	else \
++	  include_option=--include; \
++	  empty_fix=; \
++	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+-   if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+-   fi; \
++	  if test "$$subdir" = .; then :; else \
++	    test ! -f $$subdir/TAGS || \
++	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
++	  fi; \
+ 	done; \
+-	list='$(SOURCES) $(HEADERS)'; \
+-	unique=`for i in $$list; do echo $$i; done | \
+-	  awk '    { files[$$0] = 1; } \
++	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
++	unique=`for i in $$list; do \
++	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++	  done | \
++	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+-	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
+-
+-mostlyclean-tags:
+-
+-clean-tags:
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
++ctags: CTAGS
++CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
++		$(TAGS_FILES) $(LISP)
++	tags=; \
++	here=`pwd`; \
++	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
++	unique=`for i in $$list; do \
++	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++	  done | \
++	  $(AWK) '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	test -z "$(CTAGS_ARGS)$$tags$$unique" \
++	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++	     $$tags $$unique
++
++GTAGS:
++	here=`$(am__cd) $(top_builddir) && pwd` \
++	  && cd $(top_srcdir) \
++	  && gtags -i $(GTAGS_ARGS) $$here
+ 
+ distclean-tags:
+-	-rm -f TAGS ID
++	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+-maintainer-clean-tags:
+-
+-distdir = $(PACKAGE)-$(VERSION)
+-top_distdir = $(distdir)
+-
+-# This target untars the dist file and tries a VPATH configuration.  Then
+-# it guarantees that the distribution is self-contained by making another
+-# tarfile.
+-distcheck: dist
+-	-rm -rf $(distdir)
+-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
+-	mkdir $(distdir)/=build
+-	mkdir $(distdir)/=inst
+-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
+-	cd $(distdir)/=build \
+-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
+-	  && $(MAKE) $(AM_MAKEFLAGS) \
+-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+-	  && $(MAKE) $(AM_MAKEFLAGS) check \
+-	  && $(MAKE) $(AM_MAKEFLAGS) install \
+-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+-	  && $(MAKE) $(AM_MAKEFLAGS) dist
+-	-rm -rf $(distdir)
+-	@banner="$(distdir).tar.gz is ready for distribution"; \
+-	dashes=`echo "$$banner" | sed s/./=/g`; \
+-	echo "$$dashes"; \
+-	echo "$$banner"; \
+-	echo "$$dashes"
+-dist: distdir
+-	-chmod -R a+r $(distdir)
+-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
+-	-rm -rf $(distdir)
+-dist-all: distdir
+-	-chmod -R a+r $(distdir)
+-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
+-	-rm -rf $(distdir)
+ distdir: $(DISTFILES)
+-	-rm -rf $(distdir)
++	$(am__remove_distdir)
+ 	mkdir $(distdir)
+-	-chmod 777 $(distdir)
+-	@for file in $(DISTFILES); do \
+-	  d=$(srcdir); \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++	list='$(DISTFILES)'; for file in $$list; do \
++	  case $$file in \
++	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++	  esac; \
++	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++	    dir="/$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
++	  else \
++	    dir=''; \
++	  fi; \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++	    fi; \
++	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	    || cp -p $$d/$$file $(distdir)/$$file \
++	    || exit 1; \
+ 	  fi; \
+ 	done
+-	for subdir in $(SUBDIRS); do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
+-	    chmod 777 $(distdir)/$$subdir; \
+-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
++	    (cd $$subdir && \
++	      $(MAKE) $(AM_MAKEFLAGS) \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
++	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+ 	done
+-info-am:
+-info: info-recursive
+-dvi-am:
+-dvi: dvi-recursive
++	-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 {} {} \; \
++	|| chmod -R a+r $(distdir)
++dist-gzip: distdir
++	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
++	$(am__remove_distdir)
++
++dist-bzip2: distdir
++	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
++	$(am__remove_distdir)
++
++dist-tarZ: distdir
++	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
++	$(am__remove_distdir)
++
++dist-shar: distdir
++	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
++	$(am__remove_distdir)
++
++dist-zip: distdir
++	-rm -f $(distdir).zip
++	zip -rq $(distdir).zip $(distdir)
++	$(am__remove_distdir)
++
++dist dist-all: distdir
++	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
++	$(am__remove_distdir)
++
++# This target untars the dist file and tries a VPATH configuration.  Then
++# it guarantees that the distribution is self-contained by making another
++# tarfile.
++distcheck: dist
++	case '$(DIST_ARCHIVES)' in \
++	*.tar.gz*) \
++	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
++	*.tar.bz2*) \
++	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
++	*.tar.Z*) \
++	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
++	*.shar.gz*) \
++	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
++	*.zip*) \
++	  unzip $(distdir).zip ;;\
++	esac
++	chmod -R a-w $(distdir); chmod a+w $(distdir)
++	mkdir $(distdir)/_build
++	mkdir $(distdir)/_inst
++	chmod a-w $(distdir)
++	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
++	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
++	  && cd $(distdir)/_build \
++	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
++	    $(DISTCHECK_CONFIGURE_FLAGS) \
++	  && $(MAKE) $(AM_MAKEFLAGS) \
++	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
++	  && $(MAKE) $(AM_MAKEFLAGS) check \
++	  && $(MAKE) $(AM_MAKEFLAGS) install \
++	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
++	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
++	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
++	        distuninstallcheck \
++	  && chmod -R a-w "$$dc_install_base" \
++	  && ({ \
++	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
++	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
++	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
++	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
++	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
++	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
++	  && rm -rf "$$dc_destdir" \
++	  && $(MAKE) $(AM_MAKEFLAGS) dist \
++	  && rm -rf $(DIST_ARCHIVES) \
++	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
++	$(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;}'
++distuninstallcheck:
++	@cd $(distuninstallcheck_dir) \
++	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
++	   || { echo "ERROR: files left after uninstall:" ; \
++	        if test -n "$(DESTDIR)"; then \
++	          echo "  (check DESTDIR support)"; \
++	        fi ; \
++	        $(distuninstallcheck_listfiles) ; \
++	        exit 1; } >&2
++distcleancheck: distclean
++	@if test '$(srcdir)' = . ; then \
++	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
++	  exit 1 ; \
++	fi
++	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
++	  || { echo "ERROR: files left in build directory after distclean:" ; \
++	       $(distcleancheck_listfiles) ; \
++	       exit 1; } >&2
+ check-am: all-am
+ check: check-recursive
+-installcheck-am:
+-installcheck: installcheck-recursive
+-install-exec-am:
++all-am: Makefile
++installdirs: installdirs-recursive
++installdirs-am:
++install: install-recursive
+ install-exec: install-exec-recursive
+-
+-install-data-am:
+ install-data: install-data-recursive
++uninstall: uninstall-recursive
+ 
+ install-am: all-am
+ 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+-install: install-recursive
+-uninstall-am:
+-uninstall: uninstall-recursive
+-all-am: Makefile
+-all-redirect: all-recursive
+-install-strip:
+-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+-installdirs: installdirs-recursive
+-installdirs-am:
+-
+ 
++installcheck: installcheck-recursive
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++	  `test -z '$(STRIP)' || \
++	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ mostlyclean-generic:
+ 
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+-mostlyclean-am:  mostlyclean-hdr mostlyclean-tags mostlyclean-generic
++	@echo "This command is intended for maintainers to use"
++	@echo "it deletes files that may require special tools to rebuild."
++clean: clean-recursive
+ 
+-mostlyclean: mostlyclean-recursive
++clean-am: clean-generic clean-libtool mostlyclean-am
+ 
+-clean-am:  clean-hdr clean-tags clean-generic mostlyclean-am
++distclean: distclean-recursive
++	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
++	-rm -f Makefile
++distclean-am: clean-am distclean-generic distclean-libtool \
++	distclean-tags
+ 
+-clean: clean-recursive
++dvi: dvi-recursive
+ 
+-distclean-am:  distclean-hdr distclean-tags distclean-generic clean-am
+-	-rm -f libtool
++dvi-am:
+ 
+-distclean: distclean-recursive
+-	-rm -f config.status
++html: html-recursive
+ 
+-maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-tags \
+-		maintainer-clean-generic distclean-am
+-	@echo "This command is intended for maintainers to use;"
+-	@echo "it deletes files that may require special tools to rebuild."
++info: info-recursive
++
++info-am:
++
++install-data-am:
++
++install-exec-am:
++
++install-info: install-info-recursive
++
++install-man:
++
++installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-recursive
+-	-rm -f config.status
++	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
++	-rm -rf $(top_srcdir)/autom4te.cache
++	-rm -f Makefile
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-recursive
++
++mostlyclean-am: mostlyclean-generic mostlyclean-libtool
++
++pdf: pdf-recursive
++
++pdf-am:
+ 
+-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
+-install-data-recursive uninstall-data-recursive install-exec-recursive \
+-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
+-all-recursive check-recursive installcheck-recursive info-recursive \
+-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
+-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
+-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
+-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+-install-exec install-data-am install-data install-am install \
+-uninstall-am uninstall all-redirect all-am all installdirs-am \
+-installdirs mostlyclean-generic distclean-generic clean-generic \
+-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++ps: ps-recursive
+ 
++ps-am:
++
++uninstall-am: uninstall-info-am
++
++uninstall-info: uninstall-info-recursive
++
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
++	check-am clean clean-generic clean-libtool clean-recursive \
++	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
++	dist-shar dist-tarZ dist-zip distcheck distclean \
++	distclean-generic distclean-libtool 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-strip \
++	installcheck installcheck-am installdirs installdirs-am \
++	maintainer-clean maintainer-clean-generic \
++	maintainer-clean-recursive mostlyclean mostlyclean-generic \
++	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
++	tags tags-recursive uninstall uninstall-am uninstall-info-am
+ 
+ # 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 -uNr a52dec-0.7.4-orig/aclocal.m4 a52dec-0.7.4/aclocal.m4
+--- a52dec-0.7.4-orig/aclocal.m4	2002-07-28 13:50:38.000000000 +1000
++++ a52dec-0.7.4/aclocal.m4	2005-02-06 16:25:18.710024184 +1100
+@@ -1,277 +1,73 @@
+-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
++# generated automatically by aclocal 1.9.4 -*- Autoconf -*-
+ 
+-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+-dnl This file is free software; the Free Software Foundation
+-dnl gives unlimited permission to copy and/or distribute it,
+-dnl with or without modifications, as long as this notice is preserved.
+-
+-dnl This program is distributed in the hope that it will be useful,
+-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+-dnl PARTICULAR PURPOSE.
+-
+-dnl AC_C_RESTRICT
+-dnl Do nothing if the compiler accepts the restrict keyword.
+-dnl Otherwise define restrict to __restrict__ or __restrict if one of
+-dnl those work, otherwise define restrict to be empty.
+-AC_DEFUN([AC_C_RESTRICT],
+-    [AC_MSG_CHECKING([for restrict])
+-    ac_cv_c_restrict=no
+-    for ac_kw in restrict __restrict__ __restrict; do
+-	AC_TRY_COMPILE([],[char * $ac_kw p;],[ac_cv_c_restrict=$ac_kw; break])
+-    done
+-    AC_MSG_RESULT([$ac_cv_c_restrict])
+-    case $ac_cv_c_restrict in
+-	restrict) ;;
+-	no)	AC_DEFINE([restrict],,
+-		    [Define as `__restrict' if that's what the C compiler calls
+-		    it, or to nothing if it is not supported.]) ;;
+-	*)	AC_DEFINE_UNQUOTED([restrict],$ac_cv_c_restrict) ;;
+-    esac])
+-
+-dnl AC_C_ALWAYS_INLINE
+-dnl Define inline to something appropriate, including the new always_inline
+-dnl attribute from gcc 3.1
+-AC_DEFUN([AC_C_ALWAYS_INLINE],
+-    [AC_C_INLINE
+-    if test x"$GCC" = x"yes" -a x"$ac_cv_c_inline" = x"inline"; then
+-	AC_MSG_CHECKING([for always_inline])
+-	SAVE_CFLAGS="$CFLAGS"
+-	CFLAGS="$CFLAGS -Wall -Werror"
+-	AC_TRY_COMPILE([],[__attribute__ ((__always_inline__)) void f (void);],
+-	    [ac_cv_always_inline=yes],[ac_cv_always_inline=no])
+-	CFLAGS="$SAVE_CFLAGS"
+-	AC_MSG_RESULT([$ac_cv_always_inline])
+-	if test x"$ac_cv_always_inline" = x"yes"; then
+-	    AC_DEFINE_UNQUOTED([inline],[__attribute__ ((__always_inline__))])
+-	fi
+-    fi])
+-
+-dnl AC_C_ATTRIBUTE_ALIGNED
+-dnl define ATTRIBUTE_ALIGNED_MAX to the maximum alignment if this is supported
+-AC_DEFUN([AC_C_ATTRIBUTE_ALIGNED],
+-    [AC_CACHE_CHECK([__attribute__ ((aligned ())) support],
+-	[ac_cv_c_attribute_aligned],
+-	[ac_cv_c_attribute_aligned=0
+-	for ac_cv_c_attr_align_try in 2 4 8 16 32 64; do
+-	    AC_TRY_COMPILE([],
+-		[static char c __attribute__ ((aligned($ac_cv_c_attr_align_try))) = 0; return c;],
+-		[ac_cv_c_attribute_aligned=$ac_cv_c_attr_align_try])
+-	done])
+-    if test x"$ac_cv_c_attribute_aligned" != x"0"; then
+-	AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX],
+-	    [$ac_cv_c_attribute_aligned],[maximum supported data alignment])
+-    fi])
+-
+-dnl AC_TRY_CFLAGS (CFLAGS, [ACTION-IF-WORKS], [ACTION-IF-FAILS])
+-dnl check if $CC supports a given set of cflags
+-AC_DEFUN([AC_TRY_CFLAGS],
+-    [AC_MSG_CHECKING([if $CC supports $1 flags])
+-    SAVE_CFLAGS="$CFLAGS"
+-    CFLAGS="$1"
+-    AC_TRY_COMPILE([],[],[ac_cv_try_cflags_ok=yes],[ac_cv_try_cflags_ok=no])
+-    CFLAGS="$SAVE_CFLAGS"
+-    AC_MSG_RESULT([$ac_cv_try_cflags_ok])
+-    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
+-	ifelse([$2],[],[:],[$2])
+-    else
+-	ifelse([$3],[],[:],[$3])
+-    fi])
+-
+-
+-dnl AC_CHECK_GENERATE_INTTYPES_H (INCLUDE-DIRECTORY)
+-dnl generate a default inttypes.h if the header file does not exist already
+-AC_DEFUN([AC_CHECK_GENERATE_INTTYPES],
+-    [rm -f $1/inttypes.h
+-    AC_CHECK_HEADER([inttypes.h],[],
+-	[AC_CHECK_SIZEOF([char])
+-	AC_CHECK_SIZEOF([short])
+-	AC_CHECK_SIZEOF([int])
+-	if test x"$ac_cv_sizeof_char" != x"1" -o \
+-	    x"$ac_cv_sizeof_short" != x"2" -o \
+-	    x"$ac_cv_sizeof_int" != x"4"; then
+-	    AC_MSG_ERROR([can not build a default inttypes.h])
+-	fi
+-	cat >$1/inttypes.h << EOF
+-/* default inttypes.h for people who do not have it on their system */
+-
+-#ifndef _INTTYPES_H
+-#define _INTTYPES_H
+-#if (!defined __int8_t_defined) && (!defined __BIT_TYPES_DEFINED__)
+-#define __int8_t_defined
+-typedef signed char int8_t;
+-typedef signed short int16_t;
+-typedef signed int int32_t;
+-#ifdef ARCH_X86
+-typedef signed long long int64_t;
+-#endif
+-#endif
+-#if (!defined _LINUX_TYPES_H)
+-typedef unsigned char uint8_t;
+-typedef unsigned short uint16_t;
+-typedef unsigned int uint32_t;
+-#ifdef ARCH_X86
+-typedef unsigned long long uint64_t;
+-#endif
+-#endif
+-#endif
+-EOF
+-	])])
+-
+-# Do all the work for Automake.  This macro actually does too much --
+-# some checks are only needed if your package does certain things.
+-# But this isn't really a big deal.
+-
+-# serial 1
+-
+-dnl Usage:
+-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
+-
+-AC_DEFUN([AM_INIT_AUTOMAKE],
+-[AC_REQUIRE([AC_PROG_INSTALL])
+-PACKAGE=[$1]
+-AC_SUBST(PACKAGE)
+-VERSION=[$2]
+-AC_SUBST(VERSION)
+-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])
+-fi
+-ifelse([$3],,
+-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
+-AC_REQUIRE([AM_SANITY_CHECK])
+-AC_REQUIRE([AC_ARG_PROGRAM])
+-dnl FIXME This is truly gross.
+-missing_dir=`cd $ac_aux_dir && pwd`
+-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
+-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
+-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
+-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
+-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
+-AC_REQUIRE([AC_PROG_MAKE_SET])])
+-
+-#
+-# Check to make sure that the build environment is sane.
+-#
+-
+-AC_DEFUN([AM_SANITY_CHECK],
+-[AC_MSG_CHECKING([whether build environment is sane])
+-# Just in case
+-sleep 1
+-echo timestamp > conftestfile
+-# Do `set' in a subshell so we don't clobber the current shell's
+-# arguments.  Must try -L first in case configure is actually a
+-# symlink; some systems play weird games with the mod time of symlinks
+-# (eg FreeBSD returns the mod time of the symlink's containing
+-# directory).
+-if (
+-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
+-   if test "[$]*" = "X"; then
+-      # -L didn't work.
+-      set X `ls -t $srcdir/configure conftestfile`
+-   fi
+-   if test "[$]*" != "X $srcdir/configure conftestfile" \
+-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
+-
+-      # If neither matched, then we have a broken ls.  This can happen
+-      # 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".
+-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+-alias in your environment])
+-   fi
+-
+-   test "[$]2" = conftestfile
+-   )
+-then
+-   # Ok.
+-   :
+-else
+-   AC_MSG_ERROR([newly created file is older than distributed files!
+-Check your system clock])
+-fi
+-rm -f conftest*
+-AC_MSG_RESULT(yes)])
+-
+-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
+-dnl The program must properly implement --version.
+-AC_DEFUN([AM_MISSING_PROG],
+-[AC_MSG_CHECKING(for working $2)
+-# Run test in a subshell; some versions of sh will print an error if
+-# an executable is not found, even if stderr is redirected.
+-# Redirect stdin to placate older versions of autoconf.  Sigh.
+-if ($2 --version) < /dev/null > /dev/null 2>&1; then
+-   $1=$2
+-   AC_MSG_RESULT(found)
+-else
+-   $1="$3/missing $2"
+-   AC_MSG_RESULT(missing)
+-fi
+-AC_SUBST($1)])
+-
+-# Like AC_CONFIG_HEADER, but automatically create stamp file.
+-
+-AC_DEFUN([AM_CONFIG_HEADER],
+-[AC_PREREQ([2.12])
+-AC_CONFIG_HEADER([$1])
+-dnl When config.status generates a header, we must update the stamp-h file.
+-dnl This file resides in the same directory as the config header
+-dnl that is generated.  We must strip everything past the first ":",
+-dnl and everything past the last "/".
+-AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
+-ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
+-<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
+-<<am_indx=1
+-for am_file in <<$1>>; do
+-  case " <<$>>CONFIG_HEADERS " in
+-  *" <<$>>am_file "*<<)>>
+-    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
+-    ;;
+-  esac
+-  am_indx=`expr "<<$>>am_indx" + 1`
+-done<<>>dnl>>)
+-changequote([,]))])
+-
+-# Add --enable-maintainer-mode option to configure.
+-# From Jim Meyering
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
++# 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 1
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
+ 
+-AC_DEFUN([AM_MAINTAINER_MODE],
+-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
+-  dnl maintainer-mode is disabled by default
+-  AC_ARG_ENABLE(maintainer-mode,
+-[  --enable-maintainer-mode enable make rules and dependencies not useful
+-                          (and sometimes confusing) to the casual installer],
+-      USE_MAINTAINER_MODE=$enableval,
+-      USE_MAINTAINER_MODE=no)
+-  AC_MSG_RESULT($USE_MAINTAINER_MODE)
+-  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
+-  MAINT=$MAINTAINER_MODE_TRUE
+-  AC_SUBST(MAINT)dnl
+-]
+-)
++# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+ 
+-# Define a conditional.
++# serial 47 AC_PROG_LIBTOOL
+ 
+-AC_DEFUN([AM_CONDITIONAL],
+-[AC_SUBST($1_TRUE)
+-AC_SUBST($1_FALSE)
+-if $2; then
+-  $1_TRUE=
+-  $1_FALSE='#'
+-else
+-  $1_TRUE='#'
+-  $1_FALSE=
+-fi])
+ 
+-# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
++# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
++# -----------------------------------------------------------
++# If this macro is not defined by Autoconf, define it here.
++m4_ifdef([AC_PROVIDE_IFELSE],
++         [],
++         [m4_define([AC_PROVIDE_IFELSE],
++	         [m4_ifdef([AC_PROVIDE_$1],
++		           [$2], [$3])])])
+ 
+-# serial 46 AC_PROG_LIBTOOL
+ 
++# AC_PROG_LIBTOOL
++# ---------------
+ AC_DEFUN([AC_PROG_LIBTOOL],
++[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
++dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
++dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
++  AC_PROVIDE_IFELSE([AC_PROG_CXX],
++    [AC_LIBTOOL_CXX],
++    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
++  ])])
++dnl And a similar setup for Fortran 77 support
++  AC_PROVIDE_IFELSE([AC_PROG_F77],
++    [AC_LIBTOOL_F77],
++    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
++])])
++
++dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
++dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
++dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
++  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
++    [AC_LIBTOOL_GCJ],
++    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
++      [AC_LIBTOOL_GCJ],
++      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
++	[AC_LIBTOOL_GCJ],
++      [ifdef([AC_PROG_GCJ],
++	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
++       ifdef([A][M_PROG_GCJ],
++	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
++       ifdef([LT_AC_PROG_GCJ],
++	     [define([LT_AC_PROG_GCJ],
++		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
++])])# AC_PROG_LIBTOOL
++
++
++# _AC_PROG_LIBTOOL
++# ----------------
++AC_DEFUN([_AC_PROG_LIBTOOL],
+ [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
++AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
++AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
++AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+@@ -282,10 +78,13 @@
+ 
+ # Prevent multiple expansion
+ define([AC_PROG_LIBTOOL], [])
+-])
++])# _AC_PROG_LIBTOOL
++
+ 
++# AC_LIBTOOL_SETUP
++# ----------------
+ AC_DEFUN([AC_LIBTOOL_SETUP],
+-[AC_PREREQ(2.13)dnl
++[AC_PREREQ(2.50)dnl
+ AC_REQUIRE([AC_ENABLE_SHARED])dnl
+ AC_REQUIRE([AC_ENABLE_STATIC])dnl
+ AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+@@ -295,342 +94,188 @@
+ AC_REQUIRE([AC_PROG_LD])dnl
+ AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+ AC_REQUIRE([AC_PROG_NM])dnl
++
+ AC_REQUIRE([AC_PROG_LN_S])dnl
+ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
++# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+ AC_REQUIRE([AC_OBJEXT])dnl
+ AC_REQUIRE([AC_EXEEXT])dnl
+ dnl
+ 
++AC_LIBTOOL_SYS_MAX_CMD_LEN
++AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
++AC_LIBTOOL_OBJDIR
++
++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+ _LT_AC_PROG_ECHO_BACKSLASH
+-# Only perform the check for file, if the check method requires it
+-case $deplibs_check_method in
+-file_magic*)
+-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+-    AC_PATH_MAGIC
++
++case $host_os in
++aix3*)
++  # AIX sometimes has problems with the GCC collect2 program.  For some
++  # reason, if we set the COLLECT_NAMES environment variable, the problems
++  # vanish in a puff of smoke.
++  if test "X${COLLECT_NAMES+set}" != Xset; then
++    COLLECT_NAMES=
++    export COLLECT_NAMES
+   fi
+   ;;
+ esac
+ 
++# Sed substitution that helps us do robust quoting.  It backslashifies
++# metacharacters that are still active within double-quoted strings.
++Xsed='sed -e s/^X//'
++[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
++
++# Same as above, but do not quote variable references.
++[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
++
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++
++# Sed substitution to avoid accidental globbing in evaled expressions
++no_glob_subst='s/\*/\\\*/g'
++
++# Constants:
++rm="rm -f"
++
++# Global variables:
++default_ofile=libtool
++can_build_shared=yes
++
++# All known linkers require a `.a' archive for static linking (except M$VC,
++# which needs '.lib').
++libext=a
++ltmain="$ac_aux_dir/ltmain.sh"
++ofile="$default_ofile"
++with_gnu_ld="$lt_cv_prog_gnu_ld"
++
++AC_CHECK_TOOL(AR, ar, false)
+ AC_CHECK_TOOL(RANLIB, ranlib, :)
+ AC_CHECK_TOOL(STRIP, strip, :)
+ 
+-ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+-enable_win32_dll=yes, enable_win32_dll=no)
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
+ 
+-AC_ARG_ENABLE(libtool-lock,
+-  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
+-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++# Set sane defaults for various variables
++test -z "$AR" && AR=ar
++test -z "$AR_FLAGS" && AR_FLAGS=cru
++test -z "$AS" && AS=as
++test -z "$CC" && CC=cc
++test -z "$LTCC" && LTCC=$CC
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++test -z "$LD" && LD=ld
++test -z "$LN_S" && LN_S="ln -s"
++test -z "$MAGIC_CMD" && MAGIC_CMD=file
++test -z "$NM" && NM=nm
++test -z "$SED" && SED=sed
++test -z "$OBJDUMP" && OBJDUMP=objdump
++test -z "$RANLIB" && RANLIB=:
++test -z "$STRIP" && STRIP=:
++test -z "$ac_objext" && ac_objext=o
+ 
+-# Some flags need to be propagated to the compiler or linker for good
+-# libtool support.
+-case $host in
+-*-*-irix6*)
+-  # Find out which ABI we are using.
+-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+-  if AC_TRY_EVAL(ac_compile); then
+-    case `/usr/bin/file conftest.$ac_objext` in
+-    *32-bit*)
+-      LD="${LD-ld} -32"
+-      ;;
+-    *N32*)
+-      LD="${LD-ld} -n32"
+-      ;;
+-    *64-bit*)
+-      LD="${LD-ld} -64"
+-      ;;
+-    esac
+-  fi
+-  rm -rf conftest*
+-  ;;
++# Determine commands to create old-style static archives.
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++old_postinstall_cmds='chmod 644 $oldlib'
++old_postuninstall_cmds=
+ 
+-*-*-sco3.2v5*)
+-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+-  SAVE_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS -belf"
+-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+-    [AC_LANG_SAVE
+-     AC_LANG_C
+-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+-     AC_LANG_RESTORE])
+-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+-    CFLAGS="$SAVE_CFLAGS"
+-  fi
+-  ;;
++if test -n "$RANLIB"; then
++  case $host_os in
++  openbsd*)
++    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
++    ;;
++  *)
++    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++    ;;
++  esac
++  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++fi
+ 
+-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+-  AC_CHECK_TOOL(AS, as, false)
+-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
++cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+ 
+-  # recent cygwin and mingw systems supply a stub DllMain which the user
+-  # can override, but on older systems we have to supply one
+-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
+-    [AC_TRY_LINK([],
+-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
+-      DllMain (0, 0, 0);],
+-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
+-
+-  case $host/$CC in
+-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
+-    # old mingw systems require "-dll" to link a DLL, while more recent ones
+-    # require "-mdll"
+-    SAVE_CFLAGS="$CFLAGS"
+-    CFLAGS="$CFLAGS -mdll"
+-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
+-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
+-    CFLAGS="$SAVE_CFLAGS" ;;
+-  *-*-cygwin* | *-*-pw32*)
+-    # cygwin systems need to pass --dll to the linker, and not link
+-    # crt.o which will require a WinMain@16 definition.
+-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
+-  esac
++# Only perform the check for file, if the check method requires it
++case $deplibs_check_method in
++file_magic*)
++  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
++    AC_PATH_MAGIC
++  fi
+   ;;
+-  ])
+ esac
+ 
+-_LT_AC_LTCONFIG_HACK
++AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
++AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
++enable_win32_dll=yes, enable_win32_dll=no)
+ 
+-])
++AC_ARG_ENABLE([libtool-lock],
++    [AC_HELP_STRING([--disable-libtool-lock],
++	[avoid locking (might break parallel builds)])])
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+ 
+-# AC_LIBTOOL_HEADER_ASSERT
+-# ------------------------
+-AC_DEFUN([AC_LIBTOOL_HEADER_ASSERT],
+-[AC_CACHE_CHECK([whether $CC supports assert without backlinking],
+-    [lt_cv_func_assert_works],
+-    [case $host in
+-    *-*-solaris*)
+-      if test "$GCC" = yes && test "$with_gnu_ld" != yes; then
+-        case `$CC --version 2>/dev/null` in
+-        [[12]].*) lt_cv_func_assert_works=no ;;
+-        *)        lt_cv_func_assert_works=yes ;;
+-        esac
+-      fi
+-      ;;
+-    esac])
++AC_ARG_WITH([pic],
++    [AC_HELP_STRING([--with-pic],
++	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
++    [pic_mode="$withval"],
++    [pic_mode=default])
++test -z "$pic_mode" && pic_mode=default
+ 
+-if test "x$lt_cv_func_assert_works" = xyes; then
+-  AC_CHECK_HEADERS(assert.h)
+-fi
+-])# AC_LIBTOOL_HEADER_ASSERT
++# Use C for the default configuration in the libtool script
++tagname=
++AC_LIBTOOL_LANG_C_CONFIG
++_LT_AC_TAGCONFIG
++])# AC_LIBTOOL_SETUP
+ 
+-# _LT_AC_CHECK_DLFCN
+-# --------------------
+-AC_DEFUN([_LT_AC_CHECK_DLFCN],
+-[AC_CHECK_HEADERS(dlfcn.h)
+-])# _LT_AC_CHECK_DLFCN
+ 
+-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+-# ---------------------------------
+-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+-[AC_REQUIRE([AC_CANONICAL_HOST])
+-AC_REQUIRE([AC_PROG_NM])
+-AC_REQUIRE([AC_OBJEXT])
+-# Check for command to grab the raw symbol name followed by C symbol from nm.
+-AC_MSG_CHECKING([command to parse $NM output])
+-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl
++# _LT_AC_SYS_COMPILER
++# -------------------
++AC_DEFUN([_LT_AC_SYS_COMPILER],
++[AC_REQUIRE([AC_PROG_CC])dnl
+ 
+-# These are sane defaults that work on at least a few old systems.
+-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
+ 
+-# Character class describing NM global symbol codes.
+-symcode='[[BCDEGRST]]'
++# Allow CC to be a program name with arguments.
++compiler=$CC
++])# _LT_AC_SYS_COMPILER
+ 
+-# Regexp to match symbols that can be accessed directly from C.
+-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+ 
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
++# _LT_AC_SYS_LIBPATH_AIX
++# ----------------------
++# Links a minimal program and checks the executable
++# for the system default hardcoded library path. In most cases,
++# this is /usr/lib:/lib, but when the MPI compilers are used
++# the location of the communication and MPI libs are included too.
++# If we don't find anything, use the default library path according
++# to the aix ld manual.
++AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
++[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi],[])
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++])# _LT_AC_SYS_LIBPATH_AIX
++
++
++# _LT_AC_SHELL_INIT(ARG)
++# ----------------------
++AC_DEFUN([_LT_AC_SHELL_INIT],
++[ifdef([AC_DIVERSION_NOTICE],
++	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
++	 [AC_DIVERT_PUSH(NOTICE)])
++$1
++AC_DIVERT_POP
++])# _LT_AC_SHELL_INIT
+ 
+-# Transform an extracted symbol line into a proper C declaration
+-lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
+ 
+-# Transform an extracted symbol line into symbol name and symbol address
+-lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+-
+-# Define system-specific variables.
+-case $host_os in
+-aix*)
+-  symcode='[[BCDT]]'
+-  ;;
+-cygwin* | mingw* | pw32*)
+-  symcode='[[ABCDGISTW]]'
+-  ;;
+-hpux*) # Its linker distinguishes data from code symbols
+-  lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+-  lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+-  ;;
+-irix* | nonstopux*)
+-  symcode='[[BCDEGRST]]'
+-  ;;
+-solaris* | sysv5*)
+-  symcode='[[BDT]]'
+-  ;;
+-sysv4)
+-  symcode='[[DFNSTU]]'
+-  ;;
+-esac
+-
+-# Handle CRLF in mingw tool chain
+-opt_cr=
+-case $host_os in
+-mingw*)
+-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+-  ;;
+-esac
+-
+-# If we're using GNU nm, then use its standard symbol codes.
+-if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
+-  symcode='[[ABCDGISTW]]'
+-fi
+-
+-# Try without a prefix undercore, then with it.
+-for ac_symprfx in "" "_"; do
+-
+-  # Write the raw and C identifiers.
+-lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
+-
+-  # Check to see that the pipe works correctly.
+-  pipe_works=no
+-  rm -f conftest*
+-  cat > conftest.$ac_ext <<EOF
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-char nm_test_var;
+-void nm_test_func(){}
+-#ifdef __cplusplus
+-}
+-#endif
+-int main(){nm_test_var='a';nm_test_func();return(0);}
+-EOF
+-
+-  if AC_TRY_EVAL(ac_compile); then
+-    # Now try to grab the symbols.
+-    nlist=conftest.nm
+-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+-      # Try sorting and uniquifying the output.
+-      if sort "$nlist" | uniq > "$nlist"T; then
+-	mv -f "$nlist"T "$nlist"
+-      else
+-	rm -f "$nlist"T
+-      fi
+-
+-      # Make sure that we snagged all the symbols we need.
+-      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
+-	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
+-	  cat <<EOF > conftest.$ac_ext
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-EOF
+-	  # Now generate the symbol file.
+-	  eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext'
+-
+-	  cat <<EOF >> conftest.$ac_ext
+-#if defined (__STDC__) && __STDC__
+-# define lt_ptr void *
+-#else
+-# define lt_ptr char *
+-# define const
+-#endif
+-
+-/* The mapping between symbol names and symbols. */
+-const struct {
+-  const char *name;
+-  lt_ptr address;
+-}
+-lt_preloaded_symbols[[]] =
+-{
+-EOF
+-	  sed "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
+-	  cat <<\EOF >> conftest.$ac_ext
+-  {0, (lt_ptr) 0}
+-};
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-EOF
+-	  # Now try linking the two files.
+-	  mv conftest.$ac_objext conftstm.$ac_objext
+-	  save_LIBS="$LIBS"
+-	  save_CFLAGS="$CFLAGS"
+-	  LIBS="conftstm.$ac_objext"
+-	  CFLAGS="$CFLAGS$no_builtin_flag"
+-	  if AC_TRY_EVAL(ac_link) && test -s conftest; then
+-	    pipe_works=yes
+-	  fi
+-	  LIBS="$save_LIBS"
+-	  CFLAGS="$save_CFLAGS"
+-	else
+-	  echo "cannot find nm_test_func in $nlist" >&AC_FD_CC
+-	fi
+-      else
+-	echo "cannot find nm_test_var in $nlist" >&AC_FD_CC
+-      fi
+-    else
+-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AC_FD_CC
+-    fi
+-  else
+-    echo "$progname: failed program was:" >&AC_FD_CC
+-    cat conftest.$ac_ext >&5
+-  fi
+-  rm -f conftest* conftst*
+-
+-  # Do not use the global_symbol_pipe unless it works.
+-  if test "$pipe_works" = yes; then
+-    break
+-  else
+-    lt_cv_sys_global_symbol_pipe=
+-  fi
+-done
+-])
+-global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
+-if test -z "$lt_cv_sys_global_symbol_pipe"; then
+-  global_symbol_to_cdecl=
+-  global_symbol_to_c_name_address=
+-else
+-  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
+-  global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
+-fi
+-if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
+-then
+-  AC_MSG_RESULT(failed)
+-else
+-  AC_MSG_RESULT(ok)
+-fi
+-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+-
+-# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
+-# ---------------------------------
+-AC_DEFUN([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR],
+-[# Find the correct PATH separator.  Usually this is `:', but
+-# DJGPP uses `;' like DOS.
+-if test "X${PATH_SEPARATOR+set}" != Xset; then
+-  UNAME=${UNAME-`uname 2>/dev/null`}
+-  case X$UNAME in
+-    *-DOS) lt_cv_sys_path_separator=';' ;;
+-    *)     lt_cv_sys_path_separator=':' ;;
+-  esac
+-  PATH_SEPARATOR=$lt_cv_sys_path_separator
+-fi
+-])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
+-
+-# _LT_AC_PROG_ECHO_BACKSLASH
+-# --------------------------
+-# Add some code to the start of the generated configure script which
+-# will find an echo command which doesn't interpret backslashes.
+-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
+-[ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+-			      [AC_DIVERT_PUSH(NOTICE)])
+-_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
+-
+-# Check that we are running under the correct shell.
+-SHELL=${CONFIG_SHELL-/bin/sh}
++# _LT_AC_PROG_ECHO_BACKSLASH
++# --------------------------
++# Add some code to the start of the generated configure script which
++# will find an echo command which doesn't interpret backslashes.
++AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
++[_LT_AC_SHELL_INIT([
++# Check that we are running under the correct shell.
++SHELL=${CONFIG_SHELL-/bin/sh}
+ 
+ case X$ECHO in
+ X*--fallback-echo)
+@@ -646,7 +291,7 @@
+ elif test "X[$]1" = X--fallback-echo; then
+   # Avoid inline document here, it may be left over
+   :
+-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
+   # Yippee, $echo works!
+   :
+ else
+@@ -658,14 +303,14 @@
+   # used as fallback echo
+   shift
+   cat <<EOF
+-$*
++[$]*
+ EOF
+   exit 0
+ fi
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ if test -z "$ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+@@ -692,8 +337,9 @@
+   #
+   # So, first we look for a working echo in the user's PATH.
+ 
+-  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+   for dir in $PATH /usr/ucb; do
++    IFS="$lt_save_ifs"
+     if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+        test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+        echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+@@ -702,7 +348,7 @@
+       break
+     fi
+   done
+-  IFS="$save_ifs"
++  IFS="$lt_save_ifs"
+ 
+   if test "X$echo" = Xecho; then
+     # We didn't find a better echo, so look for alternatives.
+@@ -775,17 +421,312 @@
+ fi
+ 
+ AC_SUBST(ECHO)
+-AC_DIVERT_POP
+-])# _LT_AC_PROG_ECHO_BACKSLASH
++])])# _LT_AC_PROG_ECHO_BACKSLASH
++
++
++# _LT_AC_LOCK
++# -----------
++AC_DEFUN([_LT_AC_LOCK],
++[AC_ARG_ENABLE([libtool-lock],
++    [AC_HELP_STRING([--disable-libtool-lock],
++	[avoid locking (might break parallel builds)])])
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++
++# Some flags need to be propagated to the compiler or linker for good
++# libtool support.
++case $host in
++ia64-*-hpux*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    case `/usr/bin/file conftest.$ac_objext` in
++    *ELF-32*)
++      HPUX_IA64_MODE="32"
++      ;;
++    *ELF-64*)
++      HPUX_IA64_MODE="64"
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++*-*-irix6*)
++  # Find out which ABI we are using.
++  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++   if test "$lt_cv_prog_gnu_ld" = yes; then
++    case `/usr/bin/file conftest.$ac_objext` in
++    *32-bit*)
++      LD="${LD-ld} -melf32bsmip"
++      ;;
++    *N32*)
++      LD="${LD-ld} -melf32bmipn32"
++      ;;
++    *64-bit*)
++      LD="${LD-ld} -melf64bmip"
++      ;;
++    esac
++   else
++    case `/usr/bin/file conftest.$ac_objext` in
++    *32-bit*)
++      LD="${LD-ld} -32"
++      ;;
++    *N32*)
++      LD="${LD-ld} -n32"
++      ;;
++    *64-bit*)
++      LD="${LD-ld} -64"
++      ;;
++    esac
++   fi
++  fi
++  rm -rf conftest*
++  ;;
++
++x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    case "`/usr/bin/file conftest.o`" in
++    *32-bit*)
++      case $host in
++        x86_64-*linux*)
++          LD="${LD-ld} -m elf_i386"
++          ;;
++        ppc64-*linux*|powerpc64-*linux*)
++          LD="${LD-ld} -m elf32ppclinux"
++          ;;
++        s390x-*linux*)
++          LD="${LD-ld} -m elf_s390"
++          ;;
++        sparc64-*linux*)
++          LD="${LD-ld} -m elf32_sparc"
++          ;;
++      esac
++      ;;
++    *64-bit*)
++      case $host in
++        x86_64-*linux*)
++          LD="${LD-ld} -m elf_x86_64"
++          ;;
++        ppc*-*linux*|powerpc*-*linux*)
++          LD="${LD-ld} -m elf64ppc"
++          ;;
++        s390*-*linux*)
++          LD="${LD-ld} -m elf64_s390"
++          ;;
++        sparc*-*linux*)
++          LD="${LD-ld} -m elf64_sparc"
++          ;;
++      esac
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++
++*-*-sco3.2v5*)
++  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
++  SAVE_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -belf"
++  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
++    [AC_LANG_PUSH(C)
++     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
++     AC_LANG_POP])
++  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
++    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
++    CFLAGS="$SAVE_CFLAGS"
++  fi
++  ;;
++AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
++[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
++  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
++  AC_CHECK_TOOL(AS, as, false)
++  AC_CHECK_TOOL(OBJDUMP, objdump, false)
++  ;;
++  ])
++esac
++
++need_locks="$enable_libtool_lock"
++
++])# _LT_AC_LOCK
++
++
++# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
++#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
++# ----------------------------------------------------------------
++# Check whether the given compiler option works
++AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
++[AC_REQUIRE([LT_AC_PROG_SED])
++AC_CACHE_CHECK([$1], [$2],
++  [$2=no
++  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$3"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&AS_MESSAGE_LOG_FD
++   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s conftest.err; then
++       $2=yes
++     fi
++   fi
++   $rm conftest*
++])
++
++if test x"[$]$2" = xyes; then
++    ifelse([$5], , :, [$5])
++else
++    ifelse([$6], , :, [$6])
++fi
++])# AC_LIBTOOL_COMPILER_OPTION
++
++
++# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
++#                          [ACTION-SUCCESS], [ACTION-FAILURE])
++# ------------------------------------------------------------
++# Check whether the given compiler option works
++AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
++[AC_CACHE_CHECK([$1], [$2],
++  [$2=no
++   save_LDFLAGS="$LDFLAGS"
++   LDFLAGS="$LDFLAGS $3"
++   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test -s conftest.err; then
++       # Append any errors to the config.log.
++       cat conftest.err 1>&AS_MESSAGE_LOG_FD
++     else
++       $2=yes
++     fi
++   fi
++   $rm conftest*
++   LDFLAGS="$save_LDFLAGS"
++])
++
++if test x"[$]$2" = xyes; then
++    ifelse([$4], , :, [$4])
++else
++    ifelse([$5], , :, [$5])
++fi
++])# AC_LIBTOOL_LINKER_OPTION
++
++
++# AC_LIBTOOL_SYS_MAX_CMD_LEN
++# --------------------------
++AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
++[# find the maximum length of command line arguments
++AC_MSG_CHECKING([the maximum length of command line arguments])
++AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
++  i=0
++  teststring="ABCD"
++
++  case $build_os in
++  msdosdjgpp*)
++    # On DJGPP, this test can blow up pretty badly due to problems in libc
++    # (any single argument exceeding 2000 bytes causes a buffer overrun
++    # during glob expansion).  Even if it were fixed, the result of this
++    # check would be larger than it should be.
++    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
++    ;;
++
++  gnu*)
++    # Under GNU Hurd, this test is not required because there is
++    # no limit to the length of command line arguments.
++    # Libtool will interpret -1 as no limit whatsoever
++    lt_cv_sys_max_cmd_len=-1;
++    ;;
++
++  cygwin* | mingw*)
++    # On Win9x/ME, this test blows up -- it succeeds, but takes
++    # about 5 minutes as the teststring grows exponentially.
++    # Worse, since 9x/ME are not pre-emptively multitasking,
++    # you end up with a "frozen" computer, even though with patience
++    # the test eventually succeeds (with a max line length of 256k).
++    # Instead, let's just punt: use the minimum linelength reported by
++    # all of the supported platforms: 8192 (on NT/2K/XP).
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
++
++  amigaos*)
++    # On AmigaOS with pdksh, this test takes hours, literally.
++    # So we just punt and use a minimum line length of 8192.
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
++
++  netbsd* | freebsd* | openbsd* | darwin* )
++    # This has been around since 386BSD, at least.  Likely further.
++    if test -x /sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++    elif test -x /usr/sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++    else
++      lt_cv_sys_max_cmd_len=65536 # usable default for *BSD
++    fi
++    # And add a safety zone
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++    ;;
++
++ *)
++    # If test is not a shell built-in, we'll probably end up computing a
++    # maximum length that is only half of the actual maximum length, but
++    # we can't tell.
++    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
++	       = "XX$teststring") >/dev/null 2>&1 &&
++	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
++	    lt_cv_sys_max_cmd_len=$new_result &&
++	    test $i != 17 # 1/2 MB should be enough
++    do
++      i=`expr $i + 1`
++      teststring=$teststring$teststring
++    done
++    teststring=
++    # Add a significant safety factor because C++ compilers can tack on massive
++    # amounts of additional arguments before passing them to the linker.
++    # It appears as though 1/2 is a usable value.
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++    ;;
++  esac
++])
++if test -n $lt_cv_sys_max_cmd_len ; then
++  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
++else
++  AC_MSG_RESULT(none)
++fi
++])# AC_LIBTOOL_SYS_MAX_CMD_LEN
++
++
++# _LT_AC_CHECK_DLFCN
++# --------------------
++AC_DEFUN([_LT_AC_CHECK_DLFCN],
++[AC_CHECK_HEADERS(dlfcn.h)dnl
++])# _LT_AC_CHECK_DLFCN
++
+ 
+ # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+ #                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+ # ------------------------------------------------------------------
+ AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+-[if test "$cross_compiling" = yes; then :
++[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
++if test "$cross_compiling" = yes; then :
+   [$4]
+ else
+-  AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+@@ -866,10 +807,12 @@
+ rm -fr conftest*
+ ])# _LT_AC_TRY_DLOPEN_SELF
+ 
++
+ # AC_LIBTOOL_DLOPEN_SELF
+ # -------------------
+ AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+-[if test "x$enable_dlopen" != xyes; then
++[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
++if test "x$enable_dlopen" != xyes; then
+   enable_dlopen=unknown
+   enable_dlopen_self=unknown
+   enable_dlopen_self_static=unknown
+@@ -884,24 +827,39 @@
+     lt_cv_dlopen_self=yes
+     ;;
+ 
+-  cygwin* | mingw* | pw32*)
++  mingw* | pw32*)
+     lt_cv_dlopen="LoadLibrary"
+     lt_cv_dlopen_libs=
+    ;;
+ 
++  cygwin*)
++    lt_cv_dlopen="dlopen"
++    lt_cv_dlopen_libs=
++   ;;
++
++  darwin*)
++  # if libdl is installed we need to link against it
++    AC_CHECK_LIB([dl], [dlopen],
++		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ])
++   ;;
++
+   *)
+     AC_CHECK_FUNC([shl_load],
+-          [lt_cv_dlopen="shl_load"],
++	  [lt_cv_dlopen="shl_load"],
+       [AC_CHECK_LIB([dld], [shl_load],
+-            [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
++	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
+ 	[AC_CHECK_FUNC([dlopen],
+ 	      [lt_cv_dlopen="dlopen"],
+ 	  [AC_CHECK_LIB([dl], [dlopen],
+-	        [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
++		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+ 	    [AC_CHECK_LIB([svld], [dlopen],
+-	          [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+ 	      [AC_CHECK_LIB([dld], [dld_link],
+-	            [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+ 	      ])
+ 	    ])
+ 	  ])
+@@ -919,7 +877,6 @@
+   case $lt_cv_dlopen in
+   dlopen)
+     save_CPPFLAGS="$CPPFLAGS"
+-    AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+     test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ 
+     save_LDFLAGS="$LDFLAGS"
+@@ -963,1572 +920,1631 @@
+ fi
+ ])# AC_LIBTOOL_DLOPEN_SELF
+ 
+-AC_DEFUN([_LT_AC_LTCONFIG_HACK],
+-[AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])dnl
+-# Sed substitution that helps us do robust quoting.  It backslashifies
+-# metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
+-sed_quote_subst='s/\([[\\"\\`$\\\\]]\)/\\\1/g'
+-
+-# Same as above, but do not quote variable references.
+-double_quote_subst='s/\([[\\"\\`\\\\]]\)/\\\1/g'
+-
+-# Sed substitution to delay expansion of an escaped shell variable in a
+-# double_quote_subst'ed string.
+-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+ 
+-# Constants:
+-rm="rm -f"
++# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
++# ---------------------------------
++# Check to see if options -c and -o are simultaneously supported by compiler
++AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
++[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
++  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
++  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
++   $rm -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&AS_MESSAGE_LOG_FD
++   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++   if (exit $ac_status) && test -s out/conftest2.$ac_objext
++   then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s out/conftest.err; then
++       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
++     fi
++   fi
++   chmod u+w .
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
++   cd ..
++   rmdir conftest
++   $rm conftest*
++])
++])# AC_LIBTOOL_PROG_CC_C_O
+ 
+-# Global variables:
+-default_ofile=libtool
+-can_build_shared=yes
+ 
+-# All known linkers require a `.a' archive for static linking (except M$VC,
+-# which needs '.lib').
+-libext=a
+-ltmain="$ac_aux_dir/ltmain.sh"
+-ofile="$default_ofile"
+-with_gnu_ld="$lt_cv_prog_gnu_ld"
+-need_locks="$enable_libtool_lock"
++# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
++# -----------------------------------------
++# Check to see if we can do hard links to lock some files if needed
++AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
++[AC_REQUIRE([_LT_AC_LOCK])dnl
+ 
+-old_CC="$CC"
+-old_CFLAGS="$CFLAGS"
++hard_links="nottested"
++if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  AC_MSG_CHECKING([if we can lock with hard links])
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  AC_MSG_RESULT([$hard_links])
++  if test "$hard_links" = no; then
++    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
++])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
+ 
+-# Set sane defaults for various variables
+-test -z "$AR" && AR=ar
+-test -z "$AR_FLAGS" && AR_FLAGS=cru
+-test -z "$AS" && AS=as
+-test -z "$CC" && CC=cc
+-test -z "$DLLTOOL" && DLLTOOL=dlltool
+-test -z "$LD" && LD=ld
+-test -z "$LN_S" && LN_S="ln -s"
+-test -z "$MAGIC_CMD" && MAGIC_CMD=file
+-test -z "$NM" && NM=nm
+-test -z "$OBJDUMP" && OBJDUMP=objdump
+-test -z "$RANLIB" && RANLIB=:
+-test -z "$STRIP" && STRIP=:
+-test -z "$ac_objext" && ac_objext=o
+ 
+-if test x"$host" != x"$build"; then
+-  ac_tool_prefix=${host_alias}-
++# AC_LIBTOOL_OBJDIR
++# -----------------
++AC_DEFUN([AC_LIBTOOL_OBJDIR],
++[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
++[rm -f .libs 2>/dev/null
++mkdir .libs 2>/dev/null
++if test -d .libs; then
++  lt_cv_objdir=.libs
+ else
+-  ac_tool_prefix=
++  # MS-DOS does not allow filenames that begin with a dot.
++  lt_cv_objdir=_libs
+ fi
++rmdir .libs 2>/dev/null])
++objdir=$lt_cv_objdir
++])# AC_LIBTOOL_OBJDIR
+ 
+-# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+-case $host_os in
+-linux-gnu*) ;;
+-linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+-esac
+ 
+-case $host_os in
+-aix3*)
+-  # AIX sometimes has problems with the GCC collect2 program.  For some
+-  # reason, if we set the COLLECT_NAMES environment variable, the problems
+-  # vanish in a puff of smoke.
+-  if test "X${COLLECT_NAMES+set}" != Xset; then
+-    COLLECT_NAMES=
+-    export COLLECT_NAMES
++# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
++# ----------------------------------------------
++# Check hardcoding attributes.
++AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
++[AC_MSG_CHECKING([how to hardcode library paths into programs])
++_LT_AC_TAGVAR(hardcode_action, $1)=
++if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
++   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
++   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
++
++  # We can hardcode non-existant directories.
++  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
++     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
++    # Linking always hardcodes the temporary library directory.
++    _LT_AC_TAGVAR(hardcode_action, $1)=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
+   fi
+-  ;;
+-esac
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
++fi
++AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
+ 
+-# Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+-old_postinstall_cmds='chmod 644 $oldlib'
+-old_postuninstall_cmds=
++if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
++])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
+ 
+-if test -n "$RANLIB"; then
++
++# AC_LIBTOOL_SYS_LIB_STRIP
++# ------------------------
++AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
++[striplib=
++old_striplib=
++AC_MSG_CHECKING([whether stripping libraries is possible])
++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
++  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++  AC_MSG_RESULT([yes])
++else
++# FIXME - insert some real tests, host_os isn't really good enough
+   case $host_os in
+-  openbsd*)
+-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+-    ;;
+-  *)
+-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++   darwin*)
++       if test -n "$STRIP" ; then
++         striplib="$STRIP -x"
++         AC_MSG_RESULT([yes])
++       else
++  AC_MSG_RESULT([no])
++fi
++       ;;
++   *)
++  AC_MSG_RESULT([no])
+     ;;
+   esac
+-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
++])# AC_LIBTOOL_SYS_LIB_STRIP
+ 
+-# Allow CC to be a program name with arguments.
+-set dummy $CC
+-compiler="[$]2"
+ 
+-AC_MSG_CHECKING([for objdir])
+-rm -f .libs 2>/dev/null
+-mkdir .libs 2>/dev/null
+-if test -d .libs; then
+-  objdir=.libs
++# AC_LIBTOOL_SYS_DYNAMIC_LINKER
++# -----------------------------
++# PORTME Fill in your ld.so characteristics
++AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
++[AC_MSG_CHECKING([dynamic linker characteristics])
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
+ else
+-  # MS-DOS does not allow filenames that begin with a dot.
+-  objdir=_libs
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ fi
+-rmdir .libs 2>/dev/null
+-AC_MSG_RESULT($objdir)
+-
++need_lib_prefix=unknown
++hardcode_into_libs=no
+ 
+-AC_ARG_WITH(pic,
+-[  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
+-pic_mode="$withval", pic_mode=default)
+-test -z "$pic_mode" && pic_mode=default
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
+ 
+-# We assume here that the value for lt_cv_prog_cc_pic will not be cached
+-# in isolation, and that seeing it set (from the cache) indicates that
+-# the associated values are set (in the cache) correctly too.
+-AC_MSG_CHECKING([for $compiler option to produce PIC])
+-AC_CACHE_VAL(lt_cv_prog_cc_pic,
+-[ lt_cv_prog_cc_pic=
+-  lt_cv_prog_cc_shlib=
+-  lt_cv_prog_cc_wl=
+-  lt_cv_prog_cc_static=
+-  lt_cv_prog_cc_no_builtin=
+-  lt_cv_prog_cc_can_build_shared=$can_build_shared
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  shlibpath_var=LIBPATH
+ 
+-  if test "$GCC" = yes; then
+-    lt_cv_prog_cc_wl='-Wl,'
+-    lt_cv_prog_cc_static='-static'
++  # AIX 3 has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}${shared_ext}$major'
++  ;;
+ 
+-    case $host_os in
+-    aix*)
+-      # Below there is a dirty hack to force normal static linking with -ldl
+-      # The problem is because libdl dynamically linked with both libc and
+-      # libC (AIX C++ library), which obviously doesn't included in libraries
+-      # list by gcc. This cause undefined symbols with -static flags.
+-      # This hack allows C programs to be linked with "-static -ldl", but
+-      # not sure about C++ programs.
+-      lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
+-      ;;
+-    amigaos*)
+-      # FIXME: we need at least 68020 code to build shared libraries, but
+-      # adding the `-m68020' flag to GCC prevents building anything better,
+-      # like `-m68040'.
+-      lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
+-      ;;
+-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+-      # PIC is the default for these OSes.
+-      ;;
+-    darwin* | rhapsody*)
+-      # PIC is the default on this platform
+-      # Common symbols not allowed in MH_DYLIB files
+-      lt_cv_prog_cc_pic='-fno-common'
+-      ;;
+-    cygwin* | mingw* | pw32* | os2*)
+-      # This hack is so that the source file can tell whether it is being
+-      # built for inclusion in a dll (and should export symbols for example).
+-      lt_cv_prog_cc_pic='-DDLL_EXPORT'
+-      ;;
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	 lt_cv_prog_cc_pic=-Kconform_pic
+-      fi
+-      ;;
+-    *)
+-      lt_cv_prog_cc_pic='-fPIC'
+-      ;;
+-    esac
++aix4* | aix5*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    shlibpath_var=LD_LIBRARY_PATH
+   else
+-    # PORTME Check for PIC flags for the system compiler.
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
+     case $host_os in
+-    aix3* | aix4* | aix5*)
+-      lt_cv_prog_cc_wl='-Wl,'
+-      # All AIX code is PIC.
+-      if test "$host_cpu" = ia64; then
+-	# AIX 5 now supports IA64 processor
+-	lt_cv_prog_cc_static='-Bstatic'
++      aix4 | aix4.[[01]] | aix4.[[01]].*)
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	   echo ' yes '
++	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++	:
+       else
+-	lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
++	can_build_shared=no
+       fi
+       ;;
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}${shared_ext}$major'
++    fi
++    shlibpath_var=LIBPATH
++  fi
++  ;;
+ 
+-    hpux9* | hpux10* | hpux11*)
+-      # Is there a better lt_cv_prog_cc_static that works with the bundled CC?
+-      lt_cv_prog_cc_wl='-Wl,'
+-      lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive"
+-      lt_cv_prog_cc_pic='+Z'
+-      ;;
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++  ;;
+ 
+-    irix5* | irix6* | nonstopux*)
+-      lt_cv_prog_cc_wl='-Wl,'
+-      lt_cv_prog_cc_static='-non_shared'
+-      # PIC (with -KPIC) is the default.
+-      ;;
++beos*)
++  library_names_spec='${libname}${shared_ext}'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
+ 
+-    cygwin* | mingw* | pw32* | os2*)
+-      # This hack is so that the source file can tell whether it is being
+-      # built for inclusion in a dll (and should export symbols for example).
+-      lt_cv_prog_cc_pic='-DDLL_EXPORT'
+-      ;;
++bsdi[[45]]*)
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
+ 
+-    newsos6)
+-      lt_cv_prog_cc_pic='-KPIC'
+-      lt_cv_prog_cc_static='-Bstatic'
+-      ;;
++cygwin* | mingw* | pw32*)
++  version_type=windows
++  shrext_cmds=".dll"
++  need_version=no
++  need_lib_prefix=no
+ 
+-    osf3* | osf4* | osf5*)
+-      # All OSF/1 code is PIC.
+-      lt_cv_prog_cc_wl='-Wl,'
+-      lt_cv_prog_cc_static='-non_shared'
+-      ;;
++  case $GCC,$host_os in
++  yes,cygwin* | yes,mingw* | yes,pw32*)
++    library_names_spec='$libname.dll.a'
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $rm \$dlpath'
++    shlibpath_overrides_runpath=yes
+ 
+-    sco3.2v5*)
+-      lt_cv_prog_cc_pic='-Kpic'
+-      lt_cv_prog_cc_static='-dn'
+-      lt_cv_prog_cc_shlib='-belf'
+-      ;;
+-
+-    solaris*)
+-      lt_cv_prog_cc_pic='-KPIC'
+-      lt_cv_prog_cc_static='-Bstatic'
+-      lt_cv_prog_cc_wl='-Wl,'
+-      ;;
+-
+-    sunos4*)
+-      lt_cv_prog_cc_pic='-PIC'
+-      lt_cv_prog_cc_static='-Bstatic'
+-      lt_cv_prog_cc_wl='-Qoption ld '
++    case $host_os in
++    cygwin*)
++      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+       ;;
+-
+-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-      lt_cv_prog_cc_pic='-KPIC'
+-      lt_cv_prog_cc_static='-Bstatic'
+-      if test "x$host_vendor" = xsni; then
+-	lt_cv_prog_cc_wl='-LD'
++    mingw*)
++      # MinGW DLLs use traditional 'lib' prefix
++      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
++        # It is most probably a Windows format PATH printed by
++        # mingw gcc, but we are running on Cygwin. Gcc prints its search
++        # path with ; separators, and with drive letters. We can handle the
++        # drive letters (cygwin fileutils understands them), so leave them,
++        # especially as we might pass files found there to a mingw objdump,
++        # which wouldn't understand a cygwinified path. Ahh.
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+       else
+-	lt_cv_prog_cc_wl='-Wl,'
+-      fi
+-      ;;
+-
+-    uts4*)
+-      lt_cv_prog_cc_pic='-pic'
+-      lt_cv_prog_cc_static='-Bstatic'
+-      ;;
+-
+-    sysv4*MP*)
+-      if test -d /usr/nec ;then
+-	lt_cv_prog_cc_pic='-Kconform_pic'
+-	lt_cv_prog_cc_static='-Bstatic'
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
+       fi
+       ;;
+-
+-    *)
+-      lt_cv_prog_cc_can_build_shared=no
++    pw32*)
++      # pw32 DLLs use 'pw' prefix rather than 'lib'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+       ;;
+     esac
+-  fi
+-])
+-if test -z "$lt_cv_prog_cc_pic"; then
+-  AC_MSG_RESULT([none])
+-else
+-  AC_MSG_RESULT([$lt_cv_prog_cc_pic])
+-
+-  # Check to make sure the pic_flag actually works.
+-  AC_MSG_CHECKING([if $compiler PIC flag $lt_cv_prog_cc_pic works])
+-  AC_CACHE_VAL(lt_cv_prog_cc_pic_works, [dnl
+-    save_CFLAGS="$CFLAGS"
+-    CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
+-    AC_TRY_COMPILE([], [], [dnl
+-      case $host_os in
+-      hpux9* | hpux10* | hpux11*)
+-	# On HP-UX, both CC and GCC only warn that PIC is supported... then
+-	# they create non-PIC objects.  So, if there were any warnings, we
+-	# assume that PIC is not supported.
+-	if test -s conftest.err; then
+-	  lt_cv_prog_cc_pic_works=no
+-	else
+-	  lt_cv_prog_cc_pic_works=yes
+-	fi
+-	;;
+-      *)
+-	lt_cv_prog_cc_pic_works=yes
+-	;;
+-      esac
+-    ], [dnl
+-      lt_cv_prog_cc_pic_works=no
+-    ])
+-    CFLAGS="$save_CFLAGS"
+-  ])
+-
+-  if test "X$lt_cv_prog_cc_pic_works" = Xno; then
+-    lt_cv_prog_cc_pic=
+-    lt_cv_prog_cc_can_build_shared=no
+-  else
+-    lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
+-  fi
+-
+-  AC_MSG_RESULT([$lt_cv_prog_cc_pic_works])
+-fi
+-
+-# Check for any special shared library compilation flags.
+-if test -n "$lt_cv_prog_cc_shlib"; then
+-  AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries])
+-  if echo "$old_CC $old_CFLAGS " | egrep -e "[[ 	]]$lt_cv_prog_cc_shlib[[ 	]]" >/dev/null; then :
+-  else
+-   AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure])
+-    lt_cv_prog_cc_can_build_shared=no
+-  fi
+-fi
+-
+-AC_MSG_CHECKING([if $compiler static flag $lt_cv_prog_cc_static works])
+-AC_CACHE_VAL([lt_cv_prog_cc_static_works], [dnl
+-  lt_cv_prog_cc_static_works=no
+-  save_LDFLAGS="$LDFLAGS"
+-  LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
+-  AC_TRY_LINK([], [], [lt_cv_prog_cc_static_works=yes])
+-  LDFLAGS="$save_LDFLAGS"
+-])
+-
+-# Belt *and* braces to stop my trousers falling down:
+-test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
+-AC_MSG_RESULT([$lt_cv_prog_cc_static_works])
+-
+-pic_flag="$lt_cv_prog_cc_pic"
+-special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
+-wl="$lt_cv_prog_cc_wl"
+-link_static_flag="$lt_cv_prog_cc_static"
+-no_builtin_flag="$lt_cv_prog_cc_no_builtin"
+-can_build_shared="$lt_cv_prog_cc_can_build_shared"
+-
+-
+-# Check to see if options -o and -c are simultaneously supported by compiler
+-AC_MSG_CHECKING([if $compiler supports -c -o file.$ac_objext])
+-AC_CACHE_VAL([lt_cv_compiler_c_o], [
+-$rm -r conftest 2>/dev/null
+-mkdir conftest
+-cd conftest
+-echo "int some_variable = 0;" > conftest.$ac_ext
+-mkdir out
+-# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-# that will create temporary files in the current directory regardless of
+-# the output directory.  Thus, making CWD read-only will cause this test
+-# to fail, enabling locking or at least warning the user not to do parallel
+-# builds.
+-chmod -w .
+-save_CFLAGS="$CFLAGS"
+-CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
+-compiler_c_o=no
+-if { (eval echo configure:__oline__: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+-  # The compiler can only warn and ignore the option if not recognized
+-  # So say no if there are warnings
+-  if test -s out/conftest.err; then
+-    lt_cv_compiler_c_o=no
+-  else
+-    lt_cv_compiler_c_o=yes
+-  fi
+-else
+-  # Append any errors to the config.log.
+-  cat out/conftest.err 1>&AC_FD_CC
+-  lt_cv_compiler_c_o=no
+-fi
+-CFLAGS="$save_CFLAGS"
+-chmod u+w .
+-$rm conftest* out/*
+-rmdir out
+-cd ..
+-rmdir conftest
+-$rm -r conftest 2>/dev/null
+-])
+-compiler_c_o=$lt_cv_compiler_c_o
+-AC_MSG_RESULT([$compiler_c_o])
+-
+-if test x"$compiler_c_o" = x"yes"; then
+-  # Check to see if we can write to a .lo
+-  AC_MSG_CHECKING([if $compiler supports -c -o file.lo])
+-  AC_CACHE_VAL([lt_cv_compiler_o_lo], [
+-  lt_cv_compiler_o_lo=no
+-  save_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS -c -o conftest.lo"
+-  save_objext="$ac_objext"
+-  ac_objext=lo
+-  AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
+-    # The compiler can only warn and ignore the option if not recognized
+-    # So say no if there are warnings
+-    if test -s conftest.err; then
+-      lt_cv_compiler_o_lo=no
+-    else
+-      lt_cv_compiler_o_lo=yes
+-    fi
+-  ])
+-  ac_objext="$save_objext"
+-  CFLAGS="$save_CFLAGS"
+-  ])
+-  compiler_o_lo=$lt_cv_compiler_o_lo
+-  AC_MSG_RESULT([$compiler_o_lo])
+-else
+-  compiler_o_lo=no
+-fi
+-
+-# Check to see if we can do hard links to lock some files if needed
+-hard_links="nottested"
+-if test "$compiler_c_o" = no && test "$need_locks" != no; then
+-  # do not overwrite the value of need_locks provided by the user
+-  AC_MSG_CHECKING([if we can lock with hard links])
+-  hard_links=yes
+-  $rm conftest*
+-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  touch conftest.a
+-  ln conftest.a conftest.b 2>&5 || hard_links=no
+-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  AC_MSG_RESULT([$hard_links])
+-  if test "$hard_links" = no; then
+-    AC_MSG_WARN([\`$CC' does not support \`-c -o', so \`make -j' may be unsafe])
+-    need_locks=warn
+-  fi
+-else
+-  need_locks=no
+-fi
++    ;;
+ 
+-if test "$GCC" = yes; then
+-  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
+-  AC_MSG_CHECKING([if $compiler supports -fno-rtti -fno-exceptions])
+-  echo "int some_variable = 0;" > conftest.$ac_ext
+-  save_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
+-  compiler_rtti_exceptions=no
+-  AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
+-    # The compiler can only warn and ignore the option if not recognized
+-    # So say no if there are warnings
+-    if test -s conftest.err; then
+-      compiler_rtti_exceptions=no
+-    else
+-      compiler_rtti_exceptions=yes
+-    fi
+-  ])
+-  CFLAGS="$save_CFLAGS"
+-  AC_MSG_RESULT([$compiler_rtti_exceptions])
++  *)
++    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    ;;
++  esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  ;;
+ 
+-  if test "$compiler_rtti_exceptions" = "yes"; then
+-    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  soname_spec='${libname}${release}${major}$shared_ext'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
++  if test "$GCC" = yes; then
++    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+   else
+-    no_builtin_flag=' -fno-builtin'
++    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+   fi
+-fi
+-
+-# See if the linker supports building shared libraries.
+-AC_MSG_CHECKING([whether the linker ($LD) supports shared libraries])
+-
+-allow_undefined_flag=
+-no_undefined_flag=
+-need_lib_prefix=unknown
+-need_version=unknown
+-# when you set need_version to no, make sure it does not cause -set_version
+-# flags to be left without arguments
+-archive_cmds=
+-archive_expsym_cmds=
+-old_archive_from_new_cmds=
+-old_archive_from_expsyms_cmds=
+-export_dynamic_flag_spec=
+-whole_archive_flag_spec=
+-thread_safe_flag_spec=
+-hardcode_into_libs=no
+-hardcode_libdir_flag_spec=
+-hardcode_libdir_separator=
+-hardcode_direct=no
+-hardcode_minus_L=no
+-hardcode_shlibpath_var=unsupported
+-runpath_var=
+-link_all_deplibs=unknown
+-always_export_symbols=no
+-export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-# include_expsyms should be a list of space-separated symbols to be *always*
+-# included in the symbol list
+-include_expsyms=
+-# exclude_expsyms can be an egrep regular expression of symbols to exclude
+-# it will be wrapped by ` (' and `)$', so one must not match beginning or
+-# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+-# as well as any symbol that contains `d'.
+-exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
+-# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+-# platforms (ab)use it in PIC code, but their linkers get confused if
+-# the symbol is explicitly referenced.  Since portable code cannot
+-# rely on this symbol name, it's probably fine to never include it in
+-# preloaded symbol tables.
+-extract_expsyms_cmds=
++  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++  ;;
+ 
+-case $host_os in
+-cygwin* | mingw* | pw32*)
+-  # FIXME: the MSVC++ port hasn't been tested in a loooong time
+-  # When not using gcc, we currently assume that we are using
+-  # Microsoft Visual C++.
+-  if test "$GCC" != yes; then
+-    with_gnu_ld=no
+-  fi
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
+   ;;
+-openbsd*)
+-  with_gnu_ld=no
++
++freebsd1*)
++  dynamic_linker=no
+   ;;
+-esac
+ 
+-ld_shlibs=yes
+-if test "$with_gnu_ld" = yes; then
+-  # If archive_cmds runs LD, not CC, wlarc should be empty
+-  wlarc='${wl}'
++kfreebsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
+ 
+-  # See if GNU ld supports shared libraries.
++freebsd*)
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
+   case $host_os in
+-  aix3* | aix4* | aix5*)
+-    # On AIX, the GNU linker is very broken
+-    # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available.
+-    ld_shlibs=no
+-    cat <<EOF 1>&2
+-
+-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+-*** to be unable to reliably create shared libraries on AIX.
+-*** Therefore, libtool is disabling shared libraries support.  If you
+-*** really care for shared libraries, you may want to modify your PATH
+-*** so that a non-GNU linker is found, and then restart.
+-
+-EOF
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
+     ;;
+-
+-  amigaos*)
+-    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+-    hardcode_libdir_flag_spec='-L$libdir'
+-    hardcode_minus_L=yes
+-
+-    # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+-    # that the semantics of dynamic libraries on AmigaOS, at least up
+-    # to version 4, is to share data among multiple programs linked
+-    # with the same dynamic library.  Since this doesn't match the
+-    # behavior of shared libraries on other platforms, we can use
+-    # them.
+-    ld_shlibs=no
++  freebsd3.[01]* | freebsdelf3.[01]*)
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
+     ;;
+-
+-  beos*)
+-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+-      allow_undefined_flag=unsupported
+-      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+-      # support --undefined.  This deserves some investigation.  FIXME
+-      archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-    else
+-      ld_shlibs=no
+-    fi
++  *) # from 3.2 on
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
+     ;;
++  esac
++  ;;
+ 
+-  cygwin* | mingw* | pw32*)
+-    # hardcode_libdir_flag_spec is actually meaningless, as there is
+-    # no search path for DLLs.
+-    hardcode_libdir_flag_spec='-L$libdir'
+-    allow_undefined_flag=unsupported
+-    always_export_symbols=yes
+-
+-    extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
+-      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~
+-      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
+-      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
+-      else $CC -o impgen impgen.c ; fi)~
+-      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
+-
+-    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
+-
+-    # cygwin and mingw dlls have different entry points and sets of symbols
+-    # to exclude.
+-    # FIXME: what about values for MSVC?
+-    dll_entry=__cygwin_dll_entry@12
+-    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~
+-    case $host_os in
+-    mingw*)
+-      # mingw values
+-      dll_entry=_DllMainCRTStartup@12
+-      dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~
+-      ;;
+-    esac
+-
+-    # mingw and cygwin differ, and it's simplest to just exclude the union
+-    # of the two symbol sets.
+-    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12
+-
+-    # recent cygwin and mingw systems supply a stub DllMain which the user
+-    # can override, but on older systems we have to supply one (in ltdll.c)
+-    if test "x$lt_cv_need_dllmain" = "xyes"; then
+-      ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
+-      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~
+-	test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
+-    else
+-      ltdll_obj=
+-      ltdll_cmds=
+-    fi
+-
+-    # Extract the symbol export list from an `--export-all' def file,
+-    # then regenerate the def file from the symbol export list, so that
+-    # the compiled dll only exports the symbol export list.
+-    # Be careful not to strip the DATA tag left be newer dlltools.
+-    export_symbols_cmds="$ltdll_cmds"'
+-      $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
+-      sed -e "1,/EXPORTS/d" -e "s/ @ [[0-9]]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
+-
+-    # If the export-symbols file already is a .def file (1st line
+-    # is EXPORTS), use it as is.
+-    # If DATA tags from a recent dlltool are present, honour them!
+-    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
+-	cp $export_symbols $output_objdir/$soname-def;
+-      else
+-	echo EXPORTS > $output_objdir/$soname-def;
+-	_lt_hint=1;
+-	cat $export_symbols | while read symbol; do
+-	 set dummy \$symbol;
+-	 case \[$]# in
+-	   2) echo "   \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
+-	   *) echo "     \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
+-	 esac;
+-	 _lt_hint=`expr 1 + \$_lt_hint`;
+-	done;
+-      fi~
+-      '"$ltdll_cmds"'
+-      $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
+-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
+-      $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
+-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
+-      $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
+-    ;;
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  ;;
+ 
+-  netbsd*)
+-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-      archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+-      wlarc=
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  case "$host_cpu" in
++  ia64*)
++    shrext_cmds='.so'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.so"
++    shlibpath_var=LD_LIBRARY_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    if test "X$HPUX_IA64_MODE" = X32; then
++      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+     else
+-      archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-      archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+     fi
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+     ;;
+-
+-  solaris* | sysv5*)
+-    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
+-      ld_shlibs=no
+-      cat <<EOF 1>&2
+-
+-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+-*** create shared libraries on Solaris systems.  Therefore, libtool
+-*** is disabling shared libraries support.  We urge you to upgrade GNU
+-*** binutils to release 2.9.1 or newer.  Another option is to modify
+-*** your PATH or compiler configuration so that the native linker is
+-*** used, and then restart.
+-
+-EOF
+-    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-    else
+-      ld_shlibs=no
+-    fi
++   hppa*64*)
++     shrext_cmds='.sl'
++     hardcode_into_libs=yes
++     dynamic_linker="$host_os dld.sl"
++     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++     soname_spec='${libname}${release}${shared_ext}$major'
++     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++     ;;
++   *)
++    shrext_cmds='.sl'
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=SHLIB_PATH
++    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
+     ;;
++  esac
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  ;;
+ 
+-  sunos4*)
+-    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-    wlarc=
+-    hardcode_direct=yes
+-    hardcode_shlibpath_var=no
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
++    *)
++	if test "$lt_cv_prog_gnu_ld" = yes; then
++		version_type=linux
++	else
++		version_type=irix
++	fi ;;
++  esac
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  case $host_os in
++  irix5* | nonstopux*)
++    libsuff= shlibsuff=
+     ;;
+-
+   *)
+-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-    else
+-      ld_shlibs=no
+-    fi
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++      libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++      libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++      libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
+     ;;
+   esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  hardcode_into_libs=yes
++  ;;
+ 
+-  if test "$ld_shlibs" = yes; then
+-    runpath_var=LD_RUN_PATH
+-    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+-    export_dynamic_flag_spec='${wl}--export-dynamic'
+-    case $host_os in
+-    cygwin* | mingw* | pw32*)
+-      # dlltool doesn't understand --whole-archive et. al.
+-      whole_archive_flag_spec=
+-      ;;
+-    *)
+-      # ancient GNU ld didn't support --whole-archive et. al.
+-      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
+-	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-	whole_archive_flag_spec=
+-      fi
+-      ;;
+-    esac
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++  dynamic_linker=no
++  ;;
++
++# This must be Linux ELF.
++linux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+   fi
+-else
+-  # PORTME fill in a description of your system's linker (not GNU ld)
+-  case $host_os in
+-  aix3*)
+-    allow_undefined_flag=unsupported
+-    always_export_symbols=yes
+-    archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+-    # Note: this linker hardcodes the directories in LIBPATH if there
+-    # are no directories specified by -L.
+-    hardcode_minus_L=yes
+-    if test "$GCC" = yes && test -z "$link_static_flag"; then
+-      # Neither direct hardcoding nor static linking is supported with a
+-      # broken collect2.
+-      hardcode_direct=unsupported
+-    fi
+-    ;;
+ 
+-  aix4* | aix5*)
+-    if test "$host_cpu" = ia64; then
+-      # On IA64, the linker does run time linking by default, so we don't
+-      # have to do anything special.
+-      aix_use_runtimelinking=no
+-      exp_sym_flag='-Bexport'
+-      no_entry_flag=""
+-    else
+-      aix_use_runtimelinking=no
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
+ 
+-      # Test if we are trying to use run time linking or normal
+-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+-      # need to do runtime linking.
+-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+-	for ld_flag in $LDFLAGS; do
+-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+-	    aix_use_runtimelinking=yes
+-	    break
+-	  fi
+-	done
+-      esac
++knetbsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
+ 
+-      exp_sym_flag='-bexport'
+-      no_entry_flag='-bnoentry'
+-    fi
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
+ 
+-    # When large executables or shared objects are built, AIX ld can
+-    # have problems creating the table of contents.  If linking a library
+-    # or program results in "error TOC overflow" add -mminimal-toc to
+-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
+ 
+-    hardcode_direct=yes
+-    archive_cmds=''
+-    hardcode_libdir_separator=':'
+-    if test "$GCC" = yes; then
+-      case $host_os in aix4.[[012]]|aix4.[[012]].*)
+-	collect2name=`${CC} -print-prog-name=collect2`
+-	if test -f "$collect2name" && \
+-	  strings "$collect2name" | grep resolve_lib_name >/dev/null
+-	then
+-	  # We have reworked collect2
+-	  hardcode_direct=yes
+-	else
+-	  # We have old collect2
+-	  hardcode_direct=unsupported
+-	  # It fails to find uninstalled libraries when the uninstalled
+-	  # path is not listed in the libpath.  Setting hardcode_minus_L
+-	  # to unsupported forces relinking
+-	  hardcode_minus_L=yes
+-	  hardcode_libdir_flag_spec='-L$libdir'
+-	  hardcode_libdir_separator=
+-	fi
+-      esac
++nto-qnx*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
+ 
+-      shared_flag='-shared'
+-    else
+-      # not using gcc
+-      if test "$host_cpu" = ia64; then
+-	shared_flag='${wl}-G'
+-      else
+-	if test "$aix_use_runtimelinking" = yes; then
+-	  shared_flag='${wl}-G'
+-	else
+-	  shared_flag='${wl}-bM:SRE'
+-	fi
+-      fi
+-    fi
++openbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    case $host_os in
++      openbsd2.[[89]] | openbsd2.[[89]].*)
++	shlibpath_overrides_runpath=no
++	;;
++      *)
++	shlibpath_overrides_runpath=yes
++	;;
++      esac
++  else
++    shlibpath_overrides_runpath=yes
++  fi
++  ;;
+ 
+-    # It seems that -bexpall can do strange things, so it is better to
+-    # generate a list of symbols to export.
+-    always_export_symbols=yes
+-    if test "$aix_use_runtimelinking" = yes; then
+-      # Warning - without using the other runtime loading flags (-brtl),
+-      # -berok will link without error, but may produce a broken library.
+-      allow_undefined_flag='-berok'
+-      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
+-      archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+-    else
+-      if test "$host_cpu" = ia64; then
+-	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+-	allow_undefined_flag="-z nodefs"
+-	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+-      else
+-	hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
+-	# Warning - without using the other run time loading flags,
+-	# -berok will link without error, but may produce a broken library.
+-	allow_undefined_flag='${wl}-berok'
+-	# This is a bit strange, but is similar to how AIX traditionally builds
+-	# it's shared libraries.
+-	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
+-      fi
+-    fi
+-    ;;
++os2*)
++  libname_spec='$name'
++  shrext_cmds=".dll"
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
+ 
+-  amigaos*)
+-    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+-    hardcode_libdir_flag_spec='-L$libdir'
+-    hardcode_minus_L=yes
+-    # see comment about different semantics on the GNU ld section
+-    ld_shlibs=no
+-    ;;
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
+ 
+-  cygwin* | mingw* | pw32*)
+-    # When not using gcc, we currently assume that we are using
+-    # Microsoft Visual C++.
+-    # hardcode_libdir_flag_spec is actually meaningless, as there is
+-    # no search path for DLLs.
+-    hardcode_libdir_flag_spec=' '
+-    allow_undefined_flag=unsupported
+-    # Tell ltmain to make .lib files, not .a files.
+-    libext=lib
+-    # FIXME: Setting linknames here is a bad hack.
+-    archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+-    # The linker will automatically build a .lib file if we build a DLL.
+-    old_archive_from_new_cmds='true'
+-    # FIXME: Should let the user specify the lib program.
+-    old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-    fix_srcfile_path='`cygpath -w "$srcfile"`'
+-    ;;
+-
+-  darwin* | rhapsody*)
+-    case "$host_os" in
+-    rhapsody* | darwin1.[[012]])
+-      allow_undefined_flag='-undefined suppress'
+-      ;;
+-    *) # Darwin 1.3 on
+-      allow_undefined_flag='-flat_namespace -undefined suppress'
+-      ;;
+-    esac
+-    # FIXME: Relying on posixy $() will cause problems for
+-    #        cross-compilation, but unfortunately the echo tests do not
+-    #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
+-    #	     `"' quotes if we put them in here... so don't!
+-    archive_cmds='$nonopt $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
+-    # We need to add '_' to the symbols in $export_symbols first
+-    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
+-    hardcode_direct=yes
+-    hardcode_shlibpath_var=no
+-    whole_archive_flag_spec='-all_load $convenience'
+-    ;;
+-
+-  freebsd1*)
+-    ld_shlibs=no
+-    ;;
+-
+-  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+-  # support.  Future versions do this automatically, but an explicit c++rt0.o
+-  # does not break anything, and helps significantly (at the cost of a little
+-  # extra space).
+-  freebsd2.2*)
+-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+-    hardcode_libdir_flag_spec='-R$libdir'
+-    hardcode_direct=yes
+-    hardcode_shlibpath_var=no
+-    ;;
++sco3.2v5*)
++  version_type=osf
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
+ 
+-  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+-  freebsd2*)
+-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_direct=yes
+-    hardcode_minus_L=yes
+-    hardcode_shlibpath_var=no
+-    ;;
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
+ 
+-  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-  freebsd*)
+-    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+-    hardcode_libdir_flag_spec='-R$libdir'
+-    hardcode_direct=yes
+-    hardcode_shlibpath_var=no
+-    ;;
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
+ 
+-  hpux9* | hpux10* | hpux11*)
+-    case $host_os in
+-    hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
+-    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
+-    esac
+-    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+-    hardcode_libdir_separator=:
+-    hardcode_direct=yes
+-    hardcode_minus_L=yes # Not in the search PATH, but as the default
+-			 # location of the library.
+-    export_dynamic_flag_spec='${wl}-E'
+-    ;;
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      export_dynamic_flag_spec='${wl}-Blargedynsym'
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
+ 
+-  irix5* | irix6* | nonstopux*)
+-    if test "$GCC" = yes; then
+-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-    else
+-      archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-    fi
+-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+-    hardcode_libdir_separator=:
+-    link_all_deplibs=yes
+-    ;;
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
+ 
+-  netbsd*)
+-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+-    else
+-      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+-    fi
+-    hardcode_libdir_flag_spec='-R$libdir'
+-    hardcode_direct=yes
+-    hardcode_shlibpath_var=no
+-    ;;
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
+ 
+-  newsos6)
+-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_direct=yes
+-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+-    hardcode_libdir_separator=:
+-    hardcode_shlibpath_var=no
+-    ;;
++*)
++  dynamic_linker=no
++  ;;
++esac
++AC_MSG_RESULT([$dynamic_linker])
++test "$dynamic_linker" = no && can_build_shared=no
++])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+ 
+-  openbsd*)
+-    hardcode_direct=yes
+-    hardcode_shlibpath_var=no
+-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+-      export_dynamic_flag_spec='${wl}-E'
+-    else
+-      case "$host_os" in
+-      openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	hardcode_libdir_flag_spec='-R$libdir'
+-        ;;
+-      *)
+-        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
+-        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+-        ;;
+-      esac
+-    fi
+-    ;;
+ 
+-  os2*)
+-    hardcode_libdir_flag_spec='-L$libdir'
+-    hardcode_minus_L=yes
+-    allow_undefined_flag=unsupported
+-    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+-    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+-    ;;
++# _LT_AC_TAGCONFIG
++# ----------------
++AC_DEFUN([_LT_AC_TAGCONFIG],
++[AC_ARG_WITH([tags],
++    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
++        [include additional configurations @<:@automatic@:>@])],
++    [tagnames="$withval"])
++
++if test -f "$ltmain" && test -n "$tagnames"; then
++  if test ! -f "${ofile}"; then
++    AC_MSG_WARN([output file `$ofile' does not exist])
++  fi
+ 
+-  osf3*)
+-    if test "$GCC" = yes; then
+-      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+-      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++  if test -z "$LTCC"; then
++    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
++    if test -z "$LTCC"; then
++      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
+     else
+-      allow_undefined_flag=' -expect_unresolved \*'
+-      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+     fi
+-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+-    hardcode_libdir_separator=:
+-    ;;
++  fi
+ 
+-  osf4* | osf5*)	# as osf3* with the addition of -msym flag
+-    if test "$GCC" = yes; then
+-      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+-      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+-    else
+-      allow_undefined_flag=' -expect_unresolved \*'
+-      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-      archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+-      $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++  # Extract list of available tagged configurations in $ofile.
++  # Note that this assumes the entire list is on one line.
++  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
++
++  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++  for tagname in $tagnames; do
++    IFS="$lt_save_ifs"
++    # Check whether tagname contains only valid characters
++    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
++    "") ;;
++    *)  AC_MSG_ERROR([invalid tag name: $tagname])
++	;;
++    esac
+ 
+-      #Both c and cxx compiler support -rpath directly
+-      hardcode_libdir_flag_spec='-rpath $libdir'
++    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
++    then
++      AC_MSG_ERROR([tag name \"$tagname\" already exists])
+     fi
+-    hardcode_libdir_separator=:
+-    ;;
+ 
+-  sco3.2v5*)
+-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_shlibpath_var=no
+-    runpath_var=LD_RUN_PATH
+-    hardcode_runpath_var=yes
+-    export_dynamic_flag_spec='${wl}-Bexport'
+-    ;;
++    # Update the list of available tags.
++    if test -n "$tagname"; then
++      echo appending configuration tag \"$tagname\" to $ofile
++
++      case $tagname in
++      CXX)
++	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 
++	    (test "X$CXX" != "Xg++"))) ; then
++	  AC_LIBTOOL_LANG_CXX_CONFIG
++	else
++	  tagname=""
++	fi
++	;;
+ 
+-  solaris*)
+-    # gcc --version < 3.0 without binutils cannot create self contained
+-    # shared libraries reliably, requiring libgcc.a to resolve some of
+-    # the object symbols generated in some cases.  Libraries that use
+-    # assert need libgcc.a to resolve __eprintf, for example.  Linking
+-    # a copy of libgcc.a into every shared library to guarantee resolving
+-    # such symbols causes other problems:  According to Tim Van Holder
+-    # <tim.van.holder@pandora.be>, C++ libraries end up with a separate
+-    # (to the application) exception stack for one thing.
+-    no_undefined_flag=' -z defs'
+-    if test "$GCC" = yes; then
+-      case `$CC --version 2>/dev/null` in
+-      [[12]].*)
+-	cat <<EOF 1>&2
++      F77)
++	if test -n "$F77" && test "X$F77" != "Xno"; then
++	  AC_LIBTOOL_LANG_F77_CONFIG
++	else
++	  tagname=""
++	fi
++	;;
++
++      GCJ)
++	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
++	  AC_LIBTOOL_LANG_GCJ_CONFIG
++	else
++	  tagname=""
++	fi
++	;;
+ 
+-*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
+-*** create self contained shared libraries on Solaris systems, without
+-*** introducing a dependency on libgcc.a.  Therefore, libtool is disabling
+-*** -no-undefined support, which will at least allow you to build shared
+-*** libraries.  However, you may find that when you link such libraries
+-*** into an application without using GCC, you have to manually add
+-*** \`gcc --print-libgcc-file-name\` to the link command.  We urge you to
+-*** upgrade to a newer version of GCC.  Another option is to rebuild your
+-*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
++      RC)
++	AC_LIBTOOL_LANG_RC_CONFIG
++	;;
+ 
+-EOF
+-        no_undefined_flag=
++      *)
++	AC_MSG_ERROR([Unsupported tag name: $tagname])
+ 	;;
+       esac
+-    fi
+-    # $CC -shared without GNU ld will not create a library from C++
+-    # object files and a static libstdc++, better avoid it by now
+-    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+-    hardcode_libdir_flag_spec='-R$libdir'
+-    hardcode_shlibpath_var=no
+-    case $host_os in
+-    solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+-    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+-    esac
+-    link_all_deplibs=yes
+-    ;;
+ 
+-  sunos4*)
+-    if test "x$host_vendor" = xsequent; then
+-      # Use $CC to link under sequent, because it throws in some extra .o
+-      # files that make .init and .fini sections work.
+-      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+-    else
+-      archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
++      # Append the new tag name to the list of available tags.
++      if test -n "$tagname" ; then
++      available_tags="$available_tags $tagname"
+     fi
+-    hardcode_libdir_flag_spec='-L$libdir'
+-    hardcode_direct=yes
+-    hardcode_minus_L=yes
+-    hardcode_shlibpath_var=no
+-    ;;
+-
+-  sysv4)
+-    if test "x$host_vendor" = xsno; then
+-      archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct=yes # is this really true???
+-    else
+-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+     fi
+-    runpath_var='LD_RUN_PATH'
+-    hardcode_shlibpath_var=no
+-    ;;
++  done
++  IFS="$lt_save_ifs"
+ 
+-  sysv4.3*)
+-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_shlibpath_var=no
+-    export_dynamic_flag_spec='-Bexport'
+-    ;;
+-
+-  sysv5*)
+-    no_undefined_flag=' -z text'
+-    # $CC -shared without GNU ld will not create a library from C++
+-    # object files and a static libstdc++, better avoid it by now
+-    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+-    hardcode_libdir_flag_spec=
+-    hardcode_shlibpath_var=no
+-    runpath_var='LD_RUN_PATH'
+-    ;;
+-
+-  uts4*)
+-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_libdir_flag_spec='-L$libdir'
+-    hardcode_shlibpath_var=no
+-    ;;
++  # Now substitute the updated list of available tags.
++  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
++    mv "${ofile}T" "$ofile"
++    chmod +x "$ofile"
++  else
++    rm -f "${ofile}T"
++    AC_MSG_ERROR([unable to update list of available tagged configurations.])
++  fi
++fi
++])# _LT_AC_TAGCONFIG
+ 
+-  dgux*)
+-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_libdir_flag_spec='-L$libdir'
+-    hardcode_shlibpath_var=no
+-    ;;
+ 
+-  sysv4*MP*)
+-    if test -d /usr/nec; then
+-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_shlibpath_var=no
+-      runpath_var=LD_RUN_PATH
+-      hardcode_runpath_var=yes
+-      ld_shlibs=yes
+-    fi
+-    ;;
++# AC_LIBTOOL_DLOPEN
++# -----------------
++# enable checks for dlopen support
++AC_DEFUN([AC_LIBTOOL_DLOPEN],
++ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
++])# AC_LIBTOOL_DLOPEN
+ 
+-  sysv4.2uw2*)
+-    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_direct=yes
+-    hardcode_minus_L=no
+-    hardcode_shlibpath_var=no
+-    hardcode_runpath_var=yes
+-    runpath_var=LD_RUN_PATH
+-    ;;
+ 
+-  sysv5uw7* | unixware7*)
+-    no_undefined_flag='${wl}-z ${wl}text'
+-    if test "$GCC" = yes; then
+-      archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-    else
+-      archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-    fi
+-    runpath_var='LD_RUN_PATH'
+-    hardcode_shlibpath_var=no
+-    ;;
++# AC_LIBTOOL_WIN32_DLL
++# --------------------
++# declare package support for building win32 dll's
++AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
++[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
++])# AC_LIBTOOL_WIN32_DLL
+ 
+-  *)
+-    ld_shlibs=no
+-    ;;
+-  esac
+-fi
+-AC_MSG_RESULT([$ld_shlibs])
+-test "$ld_shlibs" = no && can_build_shared=no
+ 
+-# Check hardcoding attributes.
+-AC_MSG_CHECKING([how to hardcode library paths into programs])
+-hardcode_action=
+-if test -n "$hardcode_libdir_flag_spec" || \
+-   test -n "$runpath_var"; then
++# AC_ENABLE_SHARED([DEFAULT])
++# ---------------------------
++# implement the --enable-shared flag
++# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
++AC_DEFUN([AC_ENABLE_SHARED],
++[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE([shared],
++    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
++	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
++    [p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_shared=yes ;;
++    no) enable_shared=no ;;
++    *)
++      enable_shared=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_shared=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac],
++    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
++])# AC_ENABLE_SHARED
+ 
+-  # We can hardcode non-existant directories.
+-  if test "$hardcode_direct" != no &&
+-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+-     # have to relink, otherwise we might link with an installed library
+-     # when we should be linking with a yet-to-be-installed one
+-     ## test "$hardcode_shlibpath_var" != no &&
+-     test "$hardcode_minus_L" != no; then
+-    # Linking always hardcodes the temporary library directory.
+-    hardcode_action=relink
+-  else
+-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+-    hardcode_action=immediate
+-  fi
+-else
+-  # We cannot hardcode anything, or else we can only hardcode existing
+-  # directories.
+-  hardcode_action=unsupported
+-fi
+-AC_MSG_RESULT([$hardcode_action])
+ 
+-striplib=
+-old_striplib=
+-AC_MSG_CHECKING([whether stripping libraries is possible])
+-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+-  AC_MSG_RESULT([yes])
+-else
+-  AC_MSG_RESULT([no])
+-fi
++# AC_DISABLE_SHARED
++# -----------------
++#- set the default shared flag to --disable-shared
++AC_DEFUN([AC_DISABLE_SHARED],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_SHARED(no)
++])# AC_DISABLE_SHARED
+ 
+-reload_cmds='$LD$reload_flag -o $output$reload_objs'
+-test -z "$deplibs_check_method" && deplibs_check_method=unknown
+ 
+-# PORTME Fill in your ld.so characteristics
+-AC_MSG_CHECKING([dynamic linker characteristics])
+-library_names_spec=
+-libname_spec='lib$name'
+-soname_spec=
+-postinstall_cmds=
+-postuninstall_cmds=
+-finish_cmds=
+-finish_eval=
+-shlibpath_var=
+-shlibpath_overrides_runpath=unknown
+-version_type=none
+-dynamic_linker="$host_os ld.so"
+-sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++# AC_ENABLE_STATIC([DEFAULT])
++# ---------------------------
++# implement the --enable-static flag
++# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
++AC_DEFUN([AC_ENABLE_STATIC],
++[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE([static],
++    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
++	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
++    [p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_static=yes ;;
++    no) enable_static=no ;;
++    *)
++     enable_static=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_static=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac],
++    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
++])# AC_ENABLE_STATIC
+ 
+-case $host_os in
+-aix3*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}.so$versuffix $libname.a'
+-  shlibpath_var=LIBPATH
+ 
+-  # AIX has no versioning support, so we append a major version to the name.
+-  soname_spec='${libname}${release}.so$major'
+-  ;;
++# AC_DISABLE_STATIC
++# -----------------
++# set the default static flag to --disable-static
++AC_DEFUN([AC_DISABLE_STATIC],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_STATIC(no)
++])# AC_DISABLE_STATIC
+ 
+-aix4* | aix5*)
+-  version_type=linux
+-  if test "$host_cpu" = ia64; then
+-    # AIX 5 supports IA64
+-    library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
+-    shlibpath_var=LD_LIBRARY_PATH
+-  else
+-    # With GCC up to 2.95.x, collect2 would create an import file
+-    # for dependence libraries.  The import file would start with
+-    # the line `#! .'.  This would cause the generated library to
+-    # depend on `.', always an invalid library.  This was fixed in
+-    # development snapshots of GCC prior to 3.0.
+-    case $host_os in
+-      aix4 | aix4.[[01]] | aix4.[[01]].*)
+-	if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+-	     echo ' yes '
+-	     echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+-	  :
+-	else
+-	  can_build_shared=no
++
++# AC_ENABLE_FAST_INSTALL([DEFAULT])
++# ---------------------------------
++# implement the --enable-fast-install flag
++# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
++AC_DEFUN([AC_ENABLE_FAST_INSTALL],
++[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE([fast-install],
++    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
++    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
++    [p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_fast_install=yes ;;
++    no) enable_fast_install=no ;;
++    *)
++      enable_fast_install=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_fast_install=yes
+ 	fi
+-	;;
+-    esac
+-    # AIX (on Power*) has no versioning support, so currently we can
+-    # not hardcode correct soname into executable. Probably we can
+-    # add versioning support to collect2, so additional links can
+-    # be useful in future.
+-    if test "$aix_use_runtimelinking" = yes; then
+-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+-      # instead of lib<name>.a to let people know that these are not
+-      # typical AIX shared libraries.
+-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+-    else
+-      # We preserve .a as extension for shared libraries through AIX4.2
+-      # and later when we are not doing run time linking.
+-      library_names_spec='${libname}${release}.a $libname.a'
+-      soname_spec='${libname}${release}.so$major'
+-    fi
+-    shlibpath_var=LIBPATH
+-  fi
+-  ;;
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac],
++    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
++])# AC_ENABLE_FAST_INSTALL
+ 
+-amigaos*)
+-  library_names_spec='$libname.ixlibrary $libname.a'
+-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+-  ;;
+ 
+-beos*)
+-  library_names_spec='${libname}.so'
+-  dynamic_linker="$host_os ld.so"
+-  shlibpath_var=LIBRARY_PATH
+-  ;;
++# AC_DISABLE_FAST_INSTALL
++# -----------------------
++# set the default to --disable-fast-install
++AC_DEFUN([AC_DISABLE_FAST_INSTALL],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_FAST_INSTALL(no)
++])# AC_DISABLE_FAST_INSTALL
+ 
+-bsdi4*)
+-  version_type=linux
+-  need_version=no
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+-  soname_spec='${libname}${release}.so$major'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+-  export_dynamic_flag_spec=-rdynamic
+-  # the default ld.so.conf also contains /usr/contrib/lib and
+-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+-  # libtool to hard-code these into programs
+-  ;;
+ 
+-cygwin* | mingw* | pw32*)
+-  version_type=windows
+-  need_version=no
+-  need_lib_prefix=no
+-  case $GCC,$host_os in
+-  yes,cygwin*)
+-    library_names_spec='$libname.dll.a'
+-    soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
+-    postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
+-      dldir=$destdir/`dirname \$dlpath`~
+-      test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog .libs/$dlname \$dldir/$dlname'
+-    postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~
+-      dlpath=$dir/\$dldll~
+-       $rm \$dlpath'
+-    ;;
+-  yes,mingw*)
+-    library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
+-    sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
+-    ;;
+-  yes,pw32*)
+-    library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
+-    ;;
+-  *)
+-    library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll $libname.lib'
+-    ;;
+-  esac
+-  dynamic_linker='Win32 ld.exe'
+-  # FIXME: first we should search . and the directory the executable is in
+-  shlibpath_var=PATH
+-  ;;
++# AC_LIBTOOL_PICMODE([MODE])
++# --------------------------
++# implement the --with-pic flag
++# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
++AC_DEFUN([AC_LIBTOOL_PICMODE],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++pic_mode=ifelse($#,1,$1,default)
++])# AC_LIBTOOL_PICMODE
+ 
+-darwin* | rhapsody*)
+-  dynamic_linker="$host_os dyld"
+-  version_type=darwin
+-  need_lib_prefix=no
+-  need_version=no
+-  # FIXME: Relying on posixy $() will cause problems for
+-  #        cross-compilation, but unfortunately the echo tests do not
+-  #        yet detect zsh echo's removal of \ escapes.
+-  library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)'
+-  soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)'
+-  shlibpath_overrides_runpath=yes
+-  shlibpath_var=DYLD_LIBRARY_PATH
+-  ;;
+ 
+-freebsd1*)
+-  dynamic_linker=no
+-  ;;
++# AC_PROG_EGREP
++# -------------
++# This is predefined starting with Autoconf 2.54, so this conditional
++# definition can be removed once we require Autoconf 2.54 or later.
++m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
++[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
++   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
++    then ac_cv_prog_egrep='grep -E'
++    else ac_cv_prog_egrep='egrep'
++    fi])
++ EGREP=$ac_cv_prog_egrep
++ AC_SUBST([EGREP])
++])])
+ 
+-freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+-  version_type=freebsd-$objformat
+-  case $version_type in
+-    freebsd-elf*)
+-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
+-      need_version=no
+-      need_lib_prefix=no
+-      ;;
+-    freebsd-*)
+-      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
+-      need_version=yes
+-      ;;
+-  esac
+-  shlibpath_var=LD_LIBRARY_PATH
+-  case $host_os in
+-  freebsd2*)
+-    shlibpath_overrides_runpath=yes
+-    ;;
+-  *)
+-    shlibpath_overrides_runpath=no
+-    hardcode_into_libs=yes
+-    ;;
+-  esac
+-  ;;
+ 
+-gnu*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
+-  soname_spec='${libname}${release}.so$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  hardcode_into_libs=yes
++# AC_PATH_TOOL_PREFIX
++# -------------------
++# find a file program which can recognise shared library
++AC_DEFUN([AC_PATH_TOOL_PREFIX],
++[AC_REQUIRE([AC_PROG_EGREP])dnl
++AC_MSG_CHECKING([for $1])
++AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
++[case $MAGIC_CMD in
++[[\\/*] |  ?:[\\/]*])
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+   ;;
++*)
++  lt_save_MAGIC_CMD="$MAGIC_CMD"
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++dnl $ac_dummy forces splitting on constant user-supplied paths.
++dnl POSIX.2 word splitting is done only on the output of word expansions,
++dnl not every word.  This closes a longstanding sh security hole.
++  ac_dummy="ifelse([$2], , $PATH, [$2])"
++  for ac_dir in $ac_dummy; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$1; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
++      if test -n "$file_magic_test_file"; then
++	case $deplibs_check_method in
++	"file_magic "*)
++	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++	    $EGREP "$file_magic_regex" > /dev/null; then
++	    :
++	  else
++	    cat <<EOF 1>&2
+ 
+-hpux9* | hpux10* | hpux11*)
+-  # Give a soname corresponding to the major version so that dld.sl refuses to
+-  # link against other versions.
+-  dynamic_linker="$host_os dld.sl"
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
+-  shlibpath_var=SHLIB_PATH
+-  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+-  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
+-  soname_spec='${libname}${release}.sl$major'
+-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+-  postinstall_cmds='chmod 555 $lib'
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool@gnu.org
++
++EOF
++	  fi ;;
++	esac
++      fi
++      break
++    fi
++  done
++  IFS="$lt_save_ifs"
++  MAGIC_CMD="$lt_save_MAGIC_CMD"
+   ;;
++esac])
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  AC_MSG_RESULT($MAGIC_CMD)
++else
++  AC_MSG_RESULT(no)
++fi
++])# AC_PATH_TOOL_PREFIX
+ 
+-irix5* | irix6* | nonstopux*)
+-  case $host_os in
+-    nonstopux*) version_type=nonstopux ;;
+-    *)          version_type=irix ;;
++
++# AC_PATH_MAGIC
++# -------------
++# find a file program which can recognise a shared library
++AC_DEFUN([AC_PATH_MAGIC],
++[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
++if test -z "$lt_cv_path_MAGIC_CMD"; then
++  if test -n "$ac_tool_prefix"; then
++    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
++  else
++    MAGIC_CMD=:
++  fi
++fi
++])# AC_PATH_MAGIC
++
++
++# AC_PROG_LD
++# ----------
++# find the pathname to the GNU or non-GNU linker
++AC_DEFUN([AC_PROG_LD],
++[AC_ARG_WITH([gnu-ld],
++    [AC_HELP_STRING([--with-gnu-ld],
++	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
++    [test "$withval" = no || with_gnu_ld=yes],
++    [with_gnu_ld=no])
++AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++ac_prog=ld
++if test "$GCC" = yes; then
++  # Check if gcc -print-prog-name=ld gives a path.
++  AC_MSG_CHECKING([for ld used by $CC])
++  case $host in
++  *-*-mingw*)
++    # gcc leaves a trailing carriage return which upsets mingw
++    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++  *)
++    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+   esac
+-  need_lib_prefix=no
+-  need_version=no
+-  soname_spec='${libname}${release}.so$major'
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
+-  case $host_os in
+-  irix5* | nonstopux*)
+-    libsuff= shlibsuff=
++  case $ac_prog in
++    # Accept absolute paths.
++    [[\\/]]* | ?:[[\\/]]*)
++      re_direlt='/[[^/]][[^/]]*/\.\./'
++      # Canonicalize the pathname of ld
++      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
++      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
++      done
++      test -z "$LD" && LD="$ac_prog"
++      ;;
++  "")
++    # If it fails, then pretend we aren't using GCC.
++    ac_prog=ld
+     ;;
+   *)
+-    case $LD in # libtool.m4 will add one of these switches to LD
+-    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
+-    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
+-    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
+-    *) libsuff= shlibsuff= libmagic=never-match;;
++    # If it is relative, then search for the first ld in PATH.
++    with_gnu_ld=unknown
++    ;;
++  esac
++elif test "$with_gnu_ld" = yes; then
++  AC_MSG_CHECKING([for GNU ld])
++else
++  AC_MSG_CHECKING([for non-GNU ld])
++fi
++AC_CACHE_VAL(lt_cv_path_LD,
++[if test -z "$LD"; then
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
++      lt_cv_path_LD="$ac_dir/$ac_prog"
++      # Check to see if the program is GNU ld.  I'd rather use --version,
++      # but apparently some GNU ld's only accept -v.
++      # Break only if it was the GNU/non-GNU ld that we prefer.
++      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
++      *GNU* | *'with BFD'*)
++	test "$with_gnu_ld" != no && break
++	;;
++      *)
++	test "$with_gnu_ld" != yes && break
++	;;
++      esac
++    fi
++  done
++  IFS="$lt_save_ifs"
++else
++  lt_cv_path_LD="$LD" # Let the user override the test with a path.
++fi])
++LD="$lt_cv_path_LD"
++if test -n "$LD"; then
++  AC_MSG_RESULT($LD)
++else
++  AC_MSG_RESULT(no)
++fi
++test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
++AC_PROG_LD_GNU
++])# AC_PROG_LD
++
++
++# AC_PROG_LD_GNU
++# --------------
++AC_DEFUN([AC_PROG_LD_GNU],
++[AC_REQUIRE([AC_PROG_EGREP])dnl
++AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
++[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
++case `$LD -v 2>&1 </dev/null` in
++*GNU* | *'with BFD'*)
++  lt_cv_prog_gnu_ld=yes
++  ;;
++*)
++  lt_cv_prog_gnu_ld=no
++  ;;
++esac])
++with_gnu_ld=$lt_cv_prog_gnu_ld
++])# AC_PROG_LD_GNU
++
++
++# AC_PROG_LD_RELOAD_FLAG
++# ----------------------
++# find reload flag for linker
++#   -- PORTME Some linkers may need a different reload flag.
++AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
++[AC_CACHE_CHECK([for $LD option to reload object files],
++  lt_cv_ld_reload_flag,
++  [lt_cv_ld_reload_flag='-r'])
++reload_flag=$lt_cv_ld_reload_flag
++case $reload_flag in
++"" | " "*) ;;
++*) reload_flag=" $reload_flag" ;;
++esac
++reload_cmds='$LD$reload_flag -o $output$reload_objs'
++case $host_os in
++  darwin*)
++    if test "$GCC" = yes; then
++      reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
++    else
++      reload_cmds='$LD$reload_flag -o $output$reload_objs'
++    fi
++    ;;
++esac
++])# AC_PROG_LD_RELOAD_FLAG
++
++
++# AC_DEPLIBS_CHECK_METHOD
++# -----------------------
++# how to check for library dependencies
++#  -- PORTME fill in with the dynamic library characteristics
++AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
++[AC_CACHE_CHECK([how to recognise dependent libraries],
++lt_cv_deplibs_check_method,
++[lt_cv_file_magic_cmd='$MAGIC_CMD'
++lt_cv_file_magic_test_file=
++lt_cv_deplibs_check_method='unknown'
++# Need to set the preceding variable on all platforms that support
++# interlibrary dependencies.
++# 'none' -- dependencies not supported.
++# `unknown' -- same as none, but documents that we really don't know.
++# 'pass_all' -- all dependencies passed with no checks.
++# 'test_compile' -- check by making test program.
++# 'file_magic [[regex]]' -- check by looking for files in library path
++# which responds to the $file_magic_cmd with a given extended regex.
++# If you have `file' or equivalent on your system and you're not sure
++# whether `pass_all' will *always* work, you probably want this one.
++
++case $host_os in
++aix4* | aix5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++beos*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++bsdi[[45]]*)
++  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
++  lt_cv_file_magic_cmd='/usr/bin/file -L'
++  lt_cv_file_magic_test_file=/shlib/libc.so
++  ;;
++
++cygwin*)
++  # func_win32_libid is a shell function defined in ltmain.sh
++  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++  lt_cv_file_magic_cmd='func_win32_libid'
++  ;;
++
++mingw* | pw32*)
++  # Base MSYS/MinGW do not provide the 'file' command needed by
++  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
++  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++  lt_cv_file_magic_cmd='$OBJDUMP -f'
++  ;;
++
++darwin* | rhapsody*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++freebsd* | kfreebsd*-gnu)
++  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++    case $host_cpu in
++    i*86 )
++      # Not sure whether the presence of OpenBSD here was a mistake.
++      # Let's accept both of them until this is cleared up.
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
++      lt_cv_file_magic_cmd=/usr/bin/file
++      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++      ;;
+     esac
++  else
++    lt_cv_deplibs_check_method=pass_all
++  fi
++  ;;
++
++gnu*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++hpux10.20* | hpux11*)
++  lt_cv_file_magic_cmd=/usr/bin/file
++  case "$host_cpu" in
++  ia64*)
++    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
++    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
++    ;;
++  hppa*64*)
++    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
++    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
++    ;;
++  *)
++    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
++    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+     ;;
+   esac
+-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+-  shlibpath_overrides_runpath=no
+-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+   ;;
+ 
+-# No shared lib support for Linux oldld, aout, or coff.
+-linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
+-  dynamic_linker=no
++irix5* | irix6* | nonstopux*)
++  case $LD in
++  *-32|*"-32 ") libmagic=32-bit;;
++  *-n32|*"-n32 ") libmagic=N32;;
++  *-64|*"-64 ") libmagic=64-bit;;
++  *) libmagic=never-match;;
++  esac
++  lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ # This must be Linux ELF.
+-linux-gnu*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+-  soname_spec='${libname}${release}.so$major'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=no
+-  # This implies no fast_install, which is unacceptable.
+-  # Some rework will be needed to allow for fast_install
+-  # before this can be enabled.
+-  hardcode_into_libs=yes
+-
+-  # We used to test for /lib/ld.so.1 and disable shared libraries on
+-  # powerpc, because MkLinux only supported shared libraries with the
+-  # GNU dynamic linker.  Since this was broken with cross compilers,
+-  # most powerpc-linux boxes support dynamic linking these days and
+-  # people can always --disable-shared, the test was removed, and we
+-  # assume the GNU/Linux dynamic linker is in use.
+-  dynamic_linker='GNU/Linux ld.so'
++linux*)
++  lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ netbsd*)
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
+-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-    dynamic_linker='NetBSD (a.out) ld.so'
++  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+   else
+-    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
+-    soname_spec='${libname}${release}.so$major'
+-    dynamic_linker='NetBSD ld.elf_so'
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+   fi
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  hardcode_into_libs=yes
+   ;;
+ 
+-newsos6)
+-  version_type=linux
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
++newos6*)
++  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
++  lt_cv_file_magic_cmd=/usr/bin/file
++  lt_cv_file_magic_test_file=/usr/lib/libnls.so
++  ;;
++
++nto-qnx*)
++  lt_cv_deplibs_check_method=unknown
+   ;;
+ 
+ openbsd*)
+-  version_type=sunos
+-  need_lib_prefix=no
+-  need_version=no
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    case "$host_os" in
+-    openbsd2.[[89]] | openbsd2.[[89]].*)
+-      shlibpath_overrides_runpath=no
+-      ;;
+-    *)
+-      shlibpath_overrides_runpath=yes
+-      ;;
+-    esac
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+   else
+-    shlibpath_overrides_runpath=yes
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+   fi
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
+-
+-os2*)
+-  libname_spec='$name'
+-  need_lib_prefix=no
+-  library_names_spec='$libname.dll $libname.a'
+-  dynamic_linker='OS/2 ld.exe'
+-  shlibpath_var=LIBPATH
+   ;;
+ 
+ osf3* | osf4* | osf5*)
+-  version_type=osf
+-  need_version=no
+-  need_lib_prefix=no
+-  soname_spec='${libname}${release}.so'
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ sco3.2v5*)
+-  version_type=osf
+-  soname_spec='${libname}${release}.so$major'
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+-  shlibpath_var=LD_LIBRARY_PATH
++  lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ solaris*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+-  soname_spec='${libname}${release}.so$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  hardcode_into_libs=yes
+-  # ldd complains unless libraries are executable
+-  postinstall_cmds='chmod +x $lib'
+-  ;;
+-
+-sunos4*)
+-  version_type=sunos
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  shlibpath_overrides_runpath=yes
+-  if test "$with_gnu_ld" = yes; then
+-    need_lib_prefix=no
+-  fi
+-  need_version=yes
++  lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+-  soname_spec='${libname}${release}.so$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+   case $host_vendor in
+-    sni)
+-      shlibpath_overrides_runpath=no
+-      ;;
+-    motorola)
+-      need_lib_prefix=no
+-      need_version=no
+-      shlibpath_overrides_runpath=no
+-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+-      ;;
++  motorola)
++    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
++    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
++    ;;
++  ncr)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  sequent)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
++    ;;
++  sni)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
++    lt_cv_file_magic_test_file=/lib/libc.so
++    ;;
++  siemens)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
+   esac
+   ;;
+ 
+-uts4*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+-  soname_spec='${libname}${release}.so$major'
+-  shlibpath_var=LD_LIBRARY_PATH
++sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
++  lt_cv_deplibs_check_method=pass_all
+   ;;
++esac
++])
++file_magic_cmd=$lt_cv_file_magic_cmd
++deplibs_check_method=$lt_cv_deplibs_check_method
++test -z "$deplibs_check_method" && deplibs_check_method=unknown
++])# AC_DEPLIBS_CHECK_METHOD
+ 
+-dgux*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+-  soname_spec='${libname}${release}.so$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
+ 
+-sysv4*MP*)
+-  if test -d /usr/nec ;then
+-    version_type=linux
+-    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
+-    soname_spec='$libname.so.$major'
+-    shlibpath_var=LD_LIBRARY_PATH
+-  fi
+-  ;;
++# AC_PROG_NM
++# ----------
++# find the pathname to a BSD-compatible name lister
++AC_DEFUN([AC_PROG_NM],
++[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
++[if test -n "$NM"; then
++  # Let the user override the test.
++  lt_cv_path_NM="$NM"
++else
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
++    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++      # Check to see if the nm accepts a BSD-compat flag.
++      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
++      #   nm: unknown option "B" ignored
++      # Tru64's nm complains that /dev/null is an invalid object file
++      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++      */dev/null* | *'Invalid file or object type'*)
++	lt_cv_path_NM="$tmp_nm -B"
++	break
++        ;;
++      *)
++	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
++	*/dev/null*)
++	  lt_cv_path_NM="$tmp_nm -p"
++	  break
++	  ;;
++	*)
++	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++	  continue # so that we can try to find one that supports BSD flags
++	  ;;
++	esac
++      esac
++    fi
++  done
++  IFS="$lt_save_ifs"
++  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
++fi])
++NM="$lt_cv_path_NM"
++])# AC_PROG_NM
++
+ 
++# AC_CHECK_LIBM
++# -------------
++# check for math library
++AC_DEFUN([AC_CHECK_LIBM],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++LIBM=
++case $host in
++*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
++  # These system don't have libm, or don't need it
++  ;;
++*-ncr-sysv4.3*)
++  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
++  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
++  ;;
+ *)
+-  dynamic_linker=no
++  AC_CHECK_LIB(m, cos, LIBM="-lm")
+   ;;
+ esac
+-AC_MSG_RESULT([$dynamic_linker])
+-test "$dynamic_linker" = no && can_build_shared=no
++])# AC_CHECK_LIBM
++
++
++# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
++# -----------------------------------
++# sets LIBLTDL to the link flags for the libltdl convenience library and
++# LTDLINCL to the include flags for the libltdl header and adds
++# --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL
++# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
++# DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will
++# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
++# '${top_srcdir}/' (note the single quotes!).  If your package is not
++# flat and you're not using automake, define top_builddir and
++# top_srcdir appropriately in the Makefiles.
++AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++  case $enable_ltdl_convenience in
++  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
++  "") enable_ltdl_convenience=yes
++      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
++  esac
++  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
++  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
++  # For backwards non-gettext consistent compatibility...
++  INCLTDL="$LTDLINCL"
++])# AC_LIBLTDL_CONVENIENCE
++
++
++# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
++# -----------------------------------
++# sets LIBLTDL to the link flags for the libltdl installable library and
++# LTDLINCL to the include flags for the libltdl header and adds
++# --enable-ltdl-install to the configure arguments.  Note that LIBLTDL
++# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
++# DIRECTORY is not provided and an installed libltdl is not found, it is
++# assumed to be `libltdl'.  LIBLTDL will be prefixed with '${top_builddir}/'
++# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
++# quotes!).  If your package is not flat and you're not using automake,
++# define top_builddir and top_srcdir appropriately in the Makefiles.
++# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
++AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++  AC_CHECK_LIB(ltdl, lt_dlinit,
++  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
++  [if test x"$enable_ltdl_install" = xno; then
++     AC_MSG_WARN([libltdl not installed, but installation disabled])
++   else
++     enable_ltdl_install=yes
++   fi
++  ])
++  if test x"$enable_ltdl_install" = x"yes"; then
++    ac_configure_args="$ac_configure_args --enable-ltdl-install"
++    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
++    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
++  else
++    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
++    LIBLTDL="-lltdl"
++    LTDLINCL=
++  fi
++  # For backwards non-gettext consistent compatibility...
++  INCLTDL="$LTDLINCL"
++])# AC_LIBLTDL_INSTALLABLE
++
++
++# AC_LIBTOOL_CXX
++# --------------
++# enable support for C++ libraries
++AC_DEFUN([AC_LIBTOOL_CXX],
++[AC_REQUIRE([_LT_AC_LANG_CXX])
++])# AC_LIBTOOL_CXX
++
++
++# _LT_AC_LANG_CXX
++# ---------------
++AC_DEFUN([_LT_AC_LANG_CXX],
++[AC_REQUIRE([AC_PROG_CXX])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
++])# _LT_AC_LANG_CXX
++
++# _LT_AC_PROG_CXXCPP
++# ---------------
++AC_DEFUN([_LT_AC_PROG_CXXCPP],
++[
++AC_REQUIRE([AC_PROG_CXX])
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 
++    (test "X$CXX" != "Xg++"))) ; then
++  AC_PROG_CXXCPP
++fi
++])# _LT_AC_PROG_CXXCPP
++
++# AC_LIBTOOL_F77
++# --------------
++# enable support for Fortran 77 libraries
++AC_DEFUN([AC_LIBTOOL_F77],
++[AC_REQUIRE([_LT_AC_LANG_F77])
++])# AC_LIBTOOL_F77
++
++
++# _LT_AC_LANG_F77
++# ---------------
++AC_DEFUN([_LT_AC_LANG_F77],
++[AC_REQUIRE([AC_PROG_F77])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
++])# _LT_AC_LANG_F77
++
++
++# AC_LIBTOOL_GCJ
++# --------------
++# enable support for GCJ libraries
++AC_DEFUN([AC_LIBTOOL_GCJ],
++[AC_REQUIRE([_LT_AC_LANG_GCJ])
++])# AC_LIBTOOL_GCJ
++
++
++# _LT_AC_LANG_GCJ
++# ---------------
++AC_DEFUN([_LT_AC_LANG_GCJ],
++[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
++  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
++    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
++      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
++	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
++	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
++])# _LT_AC_LANG_GCJ
++
++
++# AC_LIBTOOL_RC
++# --------------
++# enable support for Windows resource files
++AC_DEFUN([AC_LIBTOOL_RC],
++[AC_REQUIRE([LT_AC_PROG_RC])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
++])# AC_LIBTOOL_RC
++
++
++# AC_LIBTOOL_LANG_C_CONFIG
++# ------------------------
++# Ensure that the configuration vars for the C compiler are
++# suitably defined.  Those variables are subsequently used by
++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
++AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
++AC_DEFUN([_LT_AC_LANG_C_CONFIG],
++[lt_save_CC="$CC"
++AC_LANG_PUSH(C)
++
++# Source file extension for C test sources.
++ac_ext=c
++
++# Object file extension for compiled C test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="int some_variable = 0;\n"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code='int main(){return(0);}\n'
++
++_LT_AC_SYS_COMPILER
++
++#
++# Check for any special shared library compilation flags.
++#
++_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
++if test "$GCC" = no; then
++  case $host_os in
++  sco3.2v5*)
++    _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
++    ;;
++  esac
++fi
++if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
++  AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
++  if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ 	]]" >/dev/null; then :
++  else
++    AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
++    _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
++  fi
++fi
+ 
+-# Report the final consequences.
++
++#
++# Check to make sure the static flag actually works.
++#
++AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
++  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
++  $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
++  [],
++  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
++
++
++AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
++AC_LIBTOOL_PROG_COMPILER_PIC($1)
++AC_LIBTOOL_PROG_CC_C_O($1)
++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
++AC_LIBTOOL_PROG_LD_SHLIBS($1)
++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
++AC_LIBTOOL_SYS_LIB_STRIP
++AC_LIBTOOL_DLOPEN_SELF($1)
++
++# Report which librarie types wil actually be built
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+ 
+@@ -2546,11 +2562,11 @@
+   fi
+   ;;
+ 
+-aix4*)
++aix4* | aix5*)
+   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+     test "$enable_shared" = yes && enable_static=no
+   fi
+-  ;;
++    ;;
+ esac
+ AC_MSG_RESULT([$enable_shared])
+ 
+@@ -2559,1205 +2575,4476 @@
+ test "$enable_shared" = yes || enable_static=yes
+ AC_MSG_RESULT([$enable_static])
+ 
+-if test "$hardcode_action" = relink; then
+-  # Fast installation is not supported
+-  enable_fast_install=no
+-elif test "$shlibpath_overrides_runpath" = yes ||
+-     test "$enable_shared" = no; then
+-  # Fast installation is not necessary
+-  enable_fast_install=needless
+-fi
+-
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+-AC_LIBTOOL_DLOPEN_SELF
++AC_LIBTOOL_CONFIG($1)
+ 
+-if test "$enable_shared" = yes && test "$GCC" = yes; then
+-  case $archive_cmds in
+-  *'~'*)
+-    # FIXME: we may have to deal with multi-command sequences.
+-    ;;
+-  '$CC '*)
+-    # Test whether the compiler implicitly links with -lc since on some
+-    # systems, -lgcc has to come before -lc. If gcc already passes -lc
+-    # to ld, don't add -lc before -lgcc.
+-    AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+-    AC_CACHE_VAL([lt_cv_archive_cmds_need_lc],
+-    [$rm conftest*
+-    echo 'static int dummy;' > conftest.$ac_ext
+-
+-    if AC_TRY_EVAL(ac_compile); then
+-      soname=conftest
+-      lib=conftest
+-      libobjs=conftest.$ac_objext
+-      deplibs=
+-      wl=$lt_cv_prog_cc_wl
+-      compiler_flags=-v
+-      linker_flags=-v
+-      verstring=
+-      output_objdir=.
+-      libname=conftest
+-      save_allow_undefined_flag=$allow_undefined_flag
+-      allow_undefined_flag=
+-      if AC_TRY_EVAL(archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
+-      then
+-	lt_cv_archive_cmds_need_lc=no
+-      else
+-	lt_cv_archive_cmds_need_lc=yes
+-      fi
+-      allow_undefined_flag=$save_allow_undefined_flag
+-    else
+-      cat conftest.err 1>&5
+-    fi])
+-    AC_MSG_RESULT([$lt_cv_archive_cmds_need_lc])
+-    ;;
+-  esac
+-fi
+-need_lc=${lt_cv_archive_cmds_need_lc-yes}
++AC_LANG_POP
++CC="$lt_save_CC"
++])# AC_LIBTOOL_LANG_C_CONFIG
+ 
+-# The second clause should only fire when bootstrapping the
+-# libtool distribution, otherwise you forgot to ship ltmain.sh
+-# with your package, and you will get complaints that there are
+-# no rules to generate ltmain.sh.
+-if test -f "$ltmain"; then
+-  :
+-else
+-  # If there is no Makefile yet, we rely on a make rule to execute
+-  # `config.status --recheck' to rerun these tests and create the
+-  # libtool script then.
+-  test -f Makefile && make "$ltmain"
+-fi
+ 
+-if test -f "$ltmain"; then
+-  trap "$rm \"${ofile}T\"; exit 1" 1 2 15
+-  $rm -f "${ofile}T"
++# AC_LIBTOOL_LANG_CXX_CONFIG
++# --------------------------
++# Ensure that the configuration vars for the C compiler are
++# suitably defined.  Those variables are subsequently used by
++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
++AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
++AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
++[AC_LANG_PUSH(C++)
++AC_REQUIRE([AC_PROG_CXX])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
++
++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++_LT_AC_TAGVAR(allow_undefined_flag, $1)=
++_LT_AC_TAGVAR(always_export_symbols, $1)=no
++_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
++_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++_LT_AC_TAGVAR(hardcode_direct, $1)=no
++_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
++_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++_LT_AC_TAGVAR(hardcode_automatic, $1)=no
++_LT_AC_TAGVAR(module_cmds, $1)=
++_LT_AC_TAGVAR(module_expsym_cmds, $1)=
++_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_AC_TAGVAR(no_undefined_flag, $1)=
++_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
++
++# Dependencies to place before and after the object being linked:
++_LT_AC_TAGVAR(predep_objects, $1)=
++_LT_AC_TAGVAR(postdep_objects, $1)=
++_LT_AC_TAGVAR(predeps, $1)=
++_LT_AC_TAGVAR(postdeps, $1)=
++_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
++
++# Source file extension for C++ test sources.
++ac_ext=cc
++
++# Object file extension for compiled C++ test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
+ 
+-  echo creating $ofile
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="int some_variable = 0;\n"
+ 
+-  # Now quote all the things that may contain metacharacters while being
+-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
+-  # variables and quote the copies for generation of the libtool script.
+-  for var in echo old_CC old_CFLAGS \
+-    AR AR_FLAGS CC LD LN_S NM SHELL \
+-    reload_flag reload_cmds wl \
+-    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
+-    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
+-    library_names_spec soname_spec \
+-    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
+-    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \
+-    postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \
+-    old_striplib striplib file_magic_cmd export_symbols_cmds \
+-    deplibs_check_method allow_undefined_flag no_undefined_flag \
+-    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
+-    global_symbol_to_c_name_address \
+-    hardcode_libdir_flag_spec hardcode_libdir_separator  \
+-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+-    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
++# Code to be used in simple link tests
++lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
+ 
+-    case $var in
+-    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
+-    old_postinstall_cmds | old_postuninstall_cmds | \
+-    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
+-    extract_expsyms_cmds | old_archive_from_expsyms_cmds | \
+-    postinstall_cmds | postuninstall_cmds | \
+-    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+-      # Double-quote double-evaled strings.
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+-      ;;
+-    *)
+-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
+-      ;;
+-    esac
+-  done
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_AC_SYS_COMPILER
+ 
+-  cat <<__EOF__ > "${ofile}T"
+-#! $SHELL
++# Allow CC to be a program name with arguments.
++lt_save_CC=$CC
++lt_save_LD=$LD
++lt_save_GCC=$GCC
++GCC=$GXX
++lt_save_with_gnu_ld=$with_gnu_ld
++lt_save_path_LD=$lt_cv_path_LD
++if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
++  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
++else
++  unset lt_cv_prog_gnu_ld
++fi
++if test -n "${lt_cv_path_LDCXX+set}"; then
++  lt_cv_path_LD=$lt_cv_path_LDCXX
++else
++  unset lt_cv_path_LD
++fi
++test -z "${LDCXX+set}" || LD=$LDCXX
++CC=${CXX-"c++"}
++compiler=$CC
++_LT_AC_TAGVAR(compiler, $1)=$CC
++cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++
++# We don't want -fno-exception wen compiling C++ code, so set the
++# no_builtin_flag separately
++if test "$GXX" = yes; then
++  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
++else
++  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
++fi
+ 
+-# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+-#
+-# Copyright (C) 1996-2000 Free Software Foundation, Inc.
+-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+-#
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
+-# (at your option) any later version.
+-#
+-# This program is distributed in the hope that it will be useful, but
+-# WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-# General Public License for more details.
+-#
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-#
+-# As a special exception to the GNU General Public License, if you
+-# distribute this file as part of a program that contains a
+-# configuration script generated by Autoconf, you may include it under
+-# the same distribution terms that you use for the rest of that program.
++if test "$GXX" = yes; then
++  # Set up default GNU C++ configuration
+ 
+-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="sed -e s/^X//"
++  AC_PROG_LD
+ 
+-# The HP-UX ksh and POSIX shell print the target directory to stdout
+-# if CDPATH is set.
+-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++  # Check if GNU C++ uses GNU ld as the underlying linker, since the
++  # archiving commands below assume that GNU ld is being used.
++  if test "$with_gnu_ld" = yes; then
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ 
+-# ### BEGIN LIBTOOL CONFIG
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ 
+-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
++    #     investigate it a little bit more. (MM)
++    wlarc='${wl}'
++
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
++	grep 'no-whole-archive' > /dev/null; then
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    else
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++    fi
++  else
++    with_gnu_ld=no
++    wlarc=
+ 
+-# Shell to use when invoking shell scripts.
+-SHELL=$lt_SHELL
++    # A generic and very simple default shared library creation
++    # command for GNU C++ for the case where it uses the native
++    # linker, instead of GNU ld.  If possible, this setting should
++    # overridden to take advantage of the native linker features on
++    # the platform it is being used on.
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++  fi
+ 
+-# Whether or not to build shared libraries.
+-build_libtool_libs=$enable_shared
++  # Commands to make compiler produce verbose output that lists
++  # what "hidden" libraries, object files and flags are used when
++  # linking a shared library.
++  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
+ 
+-# Whether or not to build static libraries.
+-build_old_libs=$enable_static
++else
++  GXX=no
++  with_gnu_ld=no
++  wlarc=
++fi
++
++# PORTME: fill in a description of your system's C++ link characteristics
++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
++_LT_AC_TAGVAR(ld_shlibs, $1)=yes
++case $host_os in
++  aix3*)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  aix4* | aix5*)
++    if test "$host_cpu" = ia64; then
++      # On IA64, the linker does run time linking by default, so we don't
++      # have to do anything special.
++      aix_use_runtimelinking=no
++      exp_sym_flag='-Bexport'
++      no_entry_flag=""
++    else
++      aix_use_runtimelinking=no
++
++      # Test if we are trying to use run time linking or normal
++      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++      # need to do runtime linking.
++      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++	for ld_flag in $LDFLAGS; do
++	  case $ld_flag in
++	  *-brtl*)
++	    aix_use_runtimelinking=yes
++	    break
++	    ;;
++	  esac
++	done
++      esac
++
++      exp_sym_flag='-bexport'
++      no_entry_flag='-bnoentry'
++    fi
++
++    # When large executables or shared objects are built, AIX ld can
++    # have problems creating the table of contents.  If linking a library
++    # or program results in "error TOC overflow" add -mminimal-toc to
++    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++    _LT_AC_TAGVAR(archive_cmds, $1)=''
++    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++
++    if test "$GXX" = yes; then
++      case $host_os in aix4.[012]|aix4.[012].*)
++      # We only want to do this on AIX 4.2 and lower, the check
++      # below for broken collect2 doesn't work under 4.3+
++	collect2name=`${CC} -print-prog-name=collect2`
++	if test -f "$collect2name" && \
++	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	then
++	  # We have reworked collect2
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++	else
++	  # We have old collect2
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
++	  # It fails to find uninstalled libraries when the uninstalled
++	  # path is not listed in the libpath.  Setting hardcode_minus_L
++	  # to unsupported forces relinking
++	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++	fi
++      esac
++      shared_flag='-shared'
++    else
++      # not using gcc
++      if test "$host_cpu" = ia64; then
++	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++	# chokes on -Wl,-G. The following line is correct:
++	shared_flag='-G'
++      else
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag='${wl}-G'
++	else
++	  shared_flag='${wl}-bM:SRE'
++	fi
++      fi
++    fi
++
++    # It seems that -bexpall does not export symbols beginning with
++    # underscore (_), so it is better to generate a list of symbols to export.
++    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
++    if test "$aix_use_runtimelinking" = yes; then
++      # Warning - without using the other runtime loading flags (-brtl),
++      # -berok will link without error, but may produce a broken library.
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
++      # Determine the default libpath from the value encoded in an empty executable.
++      _LT_AC_SYS_LIBPATH_AIX
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++     else
++      if test "$host_cpu" = ia64; then
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++      else
++	# Determine the default libpath from the value encoded in an empty executable.
++	_LT_AC_SYS_LIBPATH_AIX
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++	# Warning - without using the other run time loading flags,
++	# -berok will link without error, but may produce a broken library.
++	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
++	# -bexpall does not export symbols beginning with underscore (_)
++	_LT_AC_TAGVAR(always_export_symbols, $1)=yes
++	# Exported symbols can be pulled into shared objects from archives
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
++	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++	# This is similar to how AIX traditionally builds it's shared libraries.
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++      fi
++    fi
++    ;;
++  chorus*)
++    case $cc_basename in
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
++    ;;
++
++
++  cygwin* | mingw* | pw32*)
++    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
++    # as there is no search path for DLLs.
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++    _LT_AC_TAGVAR(always_export_symbols, $1)=no
++    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++
++    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++      # If the export-symbols file already is a .def file (1st line
++      # is EXPORTS), use it as is; otherwise, prepend...
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	cp $export_symbols $output_objdir/$soname.def;
++      else
++	echo EXPORTS > $output_objdir/$soname.def;
++	cat $export_symbols >> $output_objdir/$soname.def;
++      fi~
++      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++    else
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    fi
++  ;;
++      darwin* | rhapsody*)
++        case "$host_os" in
++        rhapsody* | darwin1.[[012]])
++         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[[012]])
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++        esac
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++
++    if test "$GXX" = yes ; then
++      lt_int_apple_cc_single_mod=no
++      output_verbose_link_cmd='echo'
++      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
++       lt_int_apple_cc_single_mod=yes
++      fi
++      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      else
++          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++        fi
++        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          else
++            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          fi
++            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      else
++      case "$cc_basename" in
++        xlc*)
++         output_verbose_link_cmd='echo'
++          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         _LT_AC_TAGVAR(ld_shlibs, $1)=no
++          ;;
++      esac
++      fi
++        ;;
++
++  dgux*)
++    case $cc_basename in
++      ec++)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      ghcx)
++	# Green Hills C++ Compiler
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
++    ;;
++  freebsd[12]*)
++    # C++ shared libraries reported to be fairly broken before switch to ELF
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  freebsd-elf*)
++    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    ;;
++  freebsd* | kfreebsd*-gnu)
++    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
++    # conventions
++    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
++    ;;
++  gnu*)
++    ;;
++  hpux9*)
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
++				# but as the default
++				# location of the library.
++
++    case $cc_basename in
++    CC)
++      # FIXME: insert proper C++ library support
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      ;;
++    aCC)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      # Commands to make compiler produce verbose output that lists
++      # what "hidden" libraries, object files and flags are used when
++      # linking a shared library.
++      #
++      # There doesn't appear to be a way to prevent this compiler from
++      # explicitly linking system object files so we need to strip them
++      # from the output so that they don't get included in the library
++      # dependencies.
++      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++      ;;
++    *)
++      if test "$GXX" = yes; then
++        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      else
++        # FIXME: insert proper C++ library support
++        _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++    esac
++    ;;
++  hpux10*|hpux11*)
++    if test $with_gnu_ld = no; then
++      case "$host_cpu" in
++      hppa*64*)
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++        ;;
++      ia64*)
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++        ;;
++      *)
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++        ;;
++      esac
++    fi
++    case "$host_cpu" in
++    hppa*64*)
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++    ia64*)
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
++					      # but as the default
++					      # location of the library.
++      ;;
++    *)
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
++					      # but as the default
++					      # location of the library.
++      ;;
++    esac
++
++    case $cc_basename in
++      CC)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      aCC)
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++	  ;;
++	*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  ;;
++	esac
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes; then
++	  if test $with_gnu_ld = no; then
++	    case "$host_cpu" in
++	    ia64*|hppa*64*)
++	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++	      ;;
++	    *)
++	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	      ;;
++	    esac
++	  fi
++	else
++	  # FIXME: insert proper C++ library support
++	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
++	fi
++	;;
++    esac
++    ;;
++  irix5* | irix6*)
++    case $cc_basename in
++      CC)
++	# SGI C++
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++
++	# Archives containing C++ object files must be created using
++	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
++	# necessary to make sure instantiated templates are included
++	# in the archive.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
++	;;
++      *)
++	if test "$GXX" = yes; then
++	  if test "$with_gnu_ld" = no; then
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	  else
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
++	  fi
++	fi
++	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++	;;
++    esac
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++    ;;
++  linux*)
++    case $cc_basename in
++      KCC)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
++
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++
++	# Archives containing C++ object files must be created using
++	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
++	;;
++      icpc)
++	# Intel C++
++	with_gnu_ld=yes
++	# version 8.0 and above of icpc choke on multiply defined symbols
++	# if we add $predep_objects and $postdep_objects, however 7.1 and
++	# earlier do not add the objects themselves.
++	case `$CC -V 2>&1` in
++	*"Version 7."*)
++  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	*)  # Version 8.0 or newer
++  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	esac
++	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
++	;;
++      cxx)
++	# Compaq C++
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
++
++	runpath_var=LD_RUN_PATH
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++    esac
++    ;;
++  lynxos*)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  m88k*)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  mvs*)
++    case $cc_basename in
++      cxx)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
++    ;;
++  netbsd*)
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
++      wlarc=
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    fi
++    # Workaround some broken pre-1.5 toolchains
++    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
++    ;;
++  openbsd2*)
++    # C++ shared libraries are fairly broken
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  openbsd*)
++    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    fi
++    output_verbose_link_cmd='echo'
++    ;;
++  osf3*)
++    case $cc_basename in
++      KCC)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
++
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	# Archives containing C++ object files must be created using
++	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
++
++	;;
++      RCC)
++	# Rational C++ 2.4.1
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      cxx)
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	  # Commands to make compiler produce verbose output that lists
++	  # what "hidden" libraries, object files and flags are used when
++	  # linking a shared library.
++	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++
++	else
++	  # FIXME: insert proper C++ library support
++	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
++	fi
++	;;
++    esac
++    ;;
++  osf4* | osf5*)
++    case $cc_basename in
++      KCC)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
++
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	# Archives containing C++ object files must be created using
++	# the KAI C++ compiler.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
++	;;
++      RCC)
++	# Rational C++ 2.4.1
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      cxx)
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
++	  echo "-hidden">> $lib.exp~
++	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
++	  $rm $lib.exp'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	  # Commands to make compiler produce verbose output that lists
++	  # what "hidden" libraries, object files and flags are used when
++	  # linking a shared library.
++	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++
++	else
++	  # FIXME: insert proper C++ library support
++	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
++	fi
++	;;
++    esac
++    ;;
++  psos*)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  sco*)
++    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    case $cc_basename in
++      CC)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
++    ;;
++  sunos4*)
++    case $cc_basename in
++      CC)
++	# Sun C++ 4.x
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      lcc)
++	# Lucid
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
++    ;;
++  solaris*)
++    case $cc_basename in
++      CC)
++	# Sun C++ 4.2, 5.x and Centerline C++
++	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++	case $host_os in
++	  solaris2.[0-5] | solaris2.[0-5].*) ;;
++	  *)
++	    # The C++ compiler is used as linker so we must use $wl
++	    # flag to pass the commands to the underlying system
++	    # linker.
++	    # Supported since Solaris 2.6 (maybe 2.5.1?)
++	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    ;;
++	esac
++	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++
++	# Archives containing C++ object files must be created using
++	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
++	# necessary to make sure instantiated templates are included
++	# in the archive.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
++	;;
++      gcx)
++	# Green Hills C++ Compiler
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++
++	# The C++ compiler must be used to create the archive.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
++	;;
++      *)
++	# GNU C++ compiler with Solaris linker
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
++	  if $CC --version | grep -v '^2\.7' > /dev/null; then
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
++	  else
++	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
++	    # platform.
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
++	  fi
++
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
++	fi
++	;;
++    esac
++    ;;
++  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
++    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    ;;
++  tandem*)
++    case $cc_basename in
++      NCC)
++	# NonStop-UX NCC 3.20
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
++    ;;
++  vxworks*)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  *)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++esac
++AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
++test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
++
++_LT_AC_TAGVAR(GCC, $1)="$GXX"
++_LT_AC_TAGVAR(LD, $1)="$LD"
++
++AC_LIBTOOL_POSTDEP_PREDEP($1)
++AC_LIBTOOL_PROG_COMPILER_PIC($1)
++AC_LIBTOOL_PROG_CC_C_O($1)
++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
++AC_LIBTOOL_PROG_LD_SHLIBS($1)
++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
++AC_LIBTOOL_SYS_LIB_STRIP
++AC_LIBTOOL_DLOPEN_SELF($1)
++
++AC_LIBTOOL_CONFIG($1)
++
++AC_LANG_POP
++CC=$lt_save_CC
++LDCXX=$LD
++LD=$lt_save_LD
++GCC=$lt_save_GCC
++with_gnu_ldcxx=$with_gnu_ld
++with_gnu_ld=$lt_save_with_gnu_ld
++lt_cv_path_LDCXX=$lt_cv_path_LD
++lt_cv_path_LD=$lt_save_path_LD
++lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
++lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
++])# AC_LIBTOOL_LANG_CXX_CONFIG
++
++# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
++# ------------------------
++# Figure out "hidden" library dependencies from verbose
++# compiler output when linking a shared library.
++# Parse the compiler output and extract the necessary
++# objects, libraries and library flags.
++AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
++dnl we can't use the lt_simple_compile_test_code here,
++dnl because it contains code intended for an executable,
++dnl not a library.  It's possible we should let each
++dnl tag define a new lt_????_link_test_code variable,
++dnl but it's only used here...
++ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
++int a;
++void foo (void) { a = 0; }
++EOF
++],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
++class Foo
++{
++public:
++  Foo (void) { a = 0; }
++private:
++  int a;
++};
++EOF
++],[$1],[F77],[cat > conftest.$ac_ext <<EOF
++      subroutine foo
++      implicit none
++      integer*4 a
++      a=0
++      return
++      end
++EOF
++],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
++public class foo {
++  private int a;
++  public void bar (void) {
++    a = 0;
++  }
++};
++EOF
++])
++dnl Parse the compiler output and extract the necessary
++dnl objects, libraries and library flags.
++if AC_TRY_EVAL(ac_compile); then
++  # Parse the compiler output and extract the necessary
++  # objects, libraries and library flags.
++
++  # Sentinel used to keep track of whether or not we are before
++  # the conftest object file.
++  pre_test_object_deps_done=no
++
++  # The `*' in the case matches for architectures that use `case' in
++  # $output_verbose_cmd can trigger glob expansion during the loop
++  # eval without this substitution.
++  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
++
++  for p in `eval $output_verbose_link_cmd`; do
++    case $p in
++
++    -L* | -R* | -l*)
++       # Some compilers place space between "-{L,R}" and the path.
++       # Remove the space.
++       if test $p = "-L" \
++	  || test $p = "-R"; then
++	 prev=$p
++	 continue
++       else
++	 prev=
++       fi
++
++       if test "$pre_test_object_deps_done" = no; then
++	 case $p in
++	 -L* | -R*)
++	   # Internal compiler library paths should come after those
++	   # provided the user.  The postdeps already come after the
++	   # user supplied libs so there is no need to process them.
++	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
++	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
++	   else
++	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
++	   fi
++	   ;;
++	 # The "-l" case would never come before the object being
++	 # linked, so don't bother handling this case.
++	 esac
++       else
++	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
++	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
++	 else
++	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
++	 fi
++       fi
++       ;;
++
++    *.$objext)
++       # This assumes that the test object file only shows up
++       # once in the compiler output.
++       if test "$p" = "conftest.$objext"; then
++	 pre_test_object_deps_done=yes
++	 continue
++       fi
++
++       if test "$pre_test_object_deps_done" = no; then
++	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
++	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
++	 else
++	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
++	 fi
++       else
++	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
++	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
++	 else
++	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
++	 fi
++       fi
++       ;;
++
++    *) ;; # Ignore the rest.
++
++    esac
++  done
++
++  # Clean up.
++  rm -f a.out a.exe
++else
++  echo "libtool.m4: error: problem compiling $1 test program"
++fi
++
++$rm -f confest.$objext
++
++case " $_LT_AC_TAGVAR(postdeps, $1) " in
++*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
++esac
++])# AC_LIBTOOL_POSTDEP_PREDEP
++
++# AC_LIBTOOL_LANG_F77_CONFIG
++# ------------------------
++# Ensure that the configuration vars for the C compiler are
++# suitably defined.  Those variables are subsequently used by
++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
++AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
++AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
++[AC_REQUIRE([AC_PROG_F77])
++AC_LANG_PUSH(Fortran 77)
++
++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++_LT_AC_TAGVAR(allow_undefined_flag, $1)=
++_LT_AC_TAGVAR(always_export_symbols, $1)=no
++_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
++_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++_LT_AC_TAGVAR(hardcode_direct, $1)=no
++_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
++_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++_LT_AC_TAGVAR(hardcode_automatic, $1)=no
++_LT_AC_TAGVAR(module_cmds, $1)=
++_LT_AC_TAGVAR(module_expsym_cmds, $1)=
++_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_AC_TAGVAR(no_undefined_flag, $1)=
++_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
++
++# Source file extension for f77 test sources.
++ac_ext=f
++
++# Object file extension for compiled f77 test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code="      program t\n      end\n"
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_AC_SYS_COMPILER
++
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${F77-"f77"}
++compiler=$CC
++_LT_AC_TAGVAR(compiler, $1)=$CC
++cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++
++AC_MSG_CHECKING([if libtool supports shared libraries])
++AC_MSG_RESULT([$can_build_shared])
++
++AC_MSG_CHECKING([whether to build shared libraries])
++test "$can_build_shared" = "no" && enable_shared=no
++
++# On AIX, shared libraries and static libraries use the same namespace, and
++# are all built from PIC.
++case "$host_os" in
++aix3*)
++  test "$enable_shared" = yes && enable_static=no
++  if test -n "$RANLIB"; then
++    archive_cmds="$archive_cmds~\$RANLIB \$lib"
++    postinstall_cmds='$RANLIB $lib'
++  fi
++  ;;
++aix4* | aix5*)
++  test "$enable_shared" = yes && enable_static=no
++  ;;
++esac
++AC_MSG_RESULT([$enable_shared])
++
++AC_MSG_CHECKING([whether to build static libraries])
++# Make sure either enable_shared or enable_static is yes.
++test "$enable_shared" = yes || enable_static=yes
++AC_MSG_RESULT([$enable_static])
++
++test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
++
++_LT_AC_TAGVAR(GCC, $1)="$G77"
++_LT_AC_TAGVAR(LD, $1)="$LD"
++
++AC_LIBTOOL_PROG_COMPILER_PIC($1)
++AC_LIBTOOL_PROG_CC_C_O($1)
++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
++AC_LIBTOOL_PROG_LD_SHLIBS($1)
++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
++AC_LIBTOOL_SYS_LIB_STRIP
++
++
++AC_LIBTOOL_CONFIG($1)
++
++AC_LANG_POP
++CC="$lt_save_CC"
++])# AC_LIBTOOL_LANG_F77_CONFIG
++
++
++# AC_LIBTOOL_LANG_GCJ_CONFIG
++# --------------------------
++# Ensure that the configuration vars for the C compiler are
++# suitably defined.  Those variables are subsequently used by
++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
++AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
++AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
++[AC_LANG_SAVE
++
++# Source file extension for Java test sources.
++ac_ext=java
++
++# Object file extension for compiled Java test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="class foo {}\n"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_AC_SYS_COMPILER
++
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${GCJ-"gcj"}
++compiler=$CC
++_LT_AC_TAGVAR(compiler, $1)=$CC
++
++# GCJ did not exist at the time GCC didn't implicitly link libc in.
++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++
++AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
++AC_LIBTOOL_PROG_COMPILER_PIC($1)
++AC_LIBTOOL_PROG_CC_C_O($1)
++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
++AC_LIBTOOL_PROG_LD_SHLIBS($1)
++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
++AC_LIBTOOL_SYS_LIB_STRIP
++AC_LIBTOOL_DLOPEN_SELF($1)
++
++AC_LIBTOOL_CONFIG($1)
++
++AC_LANG_RESTORE
++CC="$lt_save_CC"
++])# AC_LIBTOOL_LANG_GCJ_CONFIG
++
++
++# AC_LIBTOOL_LANG_RC_CONFIG
++# --------------------------
++# Ensure that the configuration vars for the Windows resource compiler are
++# suitably defined.  Those variables are subsequently used by
++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
++AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
++AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
++[AC_LANG_SAVE
++
++# Source file extension for RC test sources.
++ac_ext=rc
++
++# Object file extension for compiled RC test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
++
++# Code to be used in simple link tests
++lt_simple_link_test_code="$lt_simple_compile_test_code"
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_AC_SYS_COMPILER
++
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${RC-"windres"}
++compiler=$CC
++_LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
++
++AC_LIBTOOL_CONFIG($1)
++
++AC_LANG_RESTORE
++CC="$lt_save_CC"
++])# AC_LIBTOOL_LANG_RC_CONFIG
++
++
++# AC_LIBTOOL_CONFIG([TAGNAME])
++# ----------------------------
++# If TAGNAME is not passed, then create an initial libtool script
++# with a default configuration from the untagged config vars.  Otherwise
++# add code to config.status for appending the configuration named by
++# TAGNAME from the matching tagged config vars.
++AC_DEFUN([AC_LIBTOOL_CONFIG],
++[# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # See if we are running on zsh, and set the options which allow our commands through
++  # without removal of \ escapes.
++  if test -n "${ZSH_VERSION+set}" ; then
++    setopt NO_GLOB_SUBST
++  fi
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++    SED SHELL STRIP \
++    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++    deplibs_check_method reload_flag reload_cmds need_locks \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    old_postinstall_cmds old_postuninstall_cmds \
++    _LT_AC_TAGVAR(compiler, $1) \
++    _LT_AC_TAGVAR(CC, $1) \
++    _LT_AC_TAGVAR(LD, $1) \
++    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
++    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
++    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
++    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
++    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
++    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
++    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
++    _LT_AC_TAGVAR(old_archive_cmds, $1) \
++    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
++    _LT_AC_TAGVAR(predep_objects, $1) \
++    _LT_AC_TAGVAR(postdep_objects, $1) \
++    _LT_AC_TAGVAR(predeps, $1) \
++    _LT_AC_TAGVAR(postdeps, $1) \
++    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
++    _LT_AC_TAGVAR(archive_cmds, $1) \
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
++    _LT_AC_TAGVAR(postinstall_cmds, $1) \
++    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
++    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
++    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
++    _LT_AC_TAGVAR(no_undefined_flag, $1) \
++    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
++    _LT_AC_TAGVAR(hardcode_automatic, $1) \
++    _LT_AC_TAGVAR(module_cmds, $1) \
++    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
++    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
++    _LT_AC_TAGVAR(exclude_expsyms, $1) \
++    _LT_AC_TAGVAR(include_expsyms, $1); do
++
++    case $var in
++    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
++    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
++    _LT_AC_TAGVAR(archive_cmds, $1) | \
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
++    _LT_AC_TAGVAR(module_cmds, $1) | \
++    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
++    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
++    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  case $lt_echo in
++  *'\[$]0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
++    ;;
++  esac
++
++ifelse([$1], [],
++  [cfgfile="${ofile}T"
++  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
++  $rm -f "$cfgfile"
++  AC_MSG_NOTICE([creating $ofile])],
++  [cfgfile="$ofile"])
++
++  cat <<__EOF__ >> "$cfgfile"
++ifelse([$1], [],
++[#! $SHELL
++
++# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
++# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
++# NOTE: Changes made to this file will be lost: look at ltmain.sh.
++#
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
++# Free Software Foundation, Inc.
++#
++# This file is part of GNU Libtool:
++# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# A sed program that does not truncate output.
++SED=$lt_SED
++
++# Sed that helps us avoid accidentally triggering echo(1) options like -n.
++Xsed="$SED -e s/^X//"
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++
++# The names of the tagged configurations supported by this script.
++available_tags=
++
++# ### BEGIN LIBTOOL CONFIG],
++[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
++
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
+ 
+ # Whether or not to add -lc for building shared libraries.
+-build_libtool_need_lc=$need_lc
++build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
++
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
++
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
++
++# A C compiler.
++LTCC=$lt_LTCC
++
++# A language-specific compiler.
++CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
++
++# Is the compiler the GNU C compiler?
++with_gcc=$_LT_AC_TAGVAR(GCC, $1)
++
++# An ERE matcher.
++EGREP=$lt_EGREP
++
++# The linker used to build libraries.
++LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
++
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
++
++# A BSD-compatible nm program.
++NM=$lt_NM
++
++# A symbol stripping program
++STRIP=$lt_STRIP
++
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
++# How to pass a linker flag through the compiler.
++wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
++
++# Object file suffix (normally "o").
++objext="$ac_objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
++
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
++pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
++pic_mode=$pic_mode
++
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
++
++# Must we lock files when doing compilation ?
++need_locks=$lt_need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
++
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
++
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
++
++# Library versioning type.
++version_type=$version_type
++
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
++
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
++
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
++
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
++
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
++archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
++
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
++module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
++
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
++
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
++
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
++
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
++
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
++
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
++
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# How to hardcode a shared library path into an executable.
++hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
++
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
++
++# If ld is used when linking, flag to hardcode \$libdir into
++# a binary during linking. This must work even if \$libdir does
++# not exist.
++hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
++
++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
++
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
++
++# Set to yes if building a shared library automatically hardcodes DIR into the library
++# and all subsequent libraries and executables linked against it.
++hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
++
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
++
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
++
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
++
++# Set to yes if exported symbols are required.
++always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
++
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
++
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
++
++# Symbols that must always be exported.
++include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
++
++ifelse([$1],[],
++[# ### END LIBTOOL CONFIG],
++[# ### END LIBTOOL TAG CONFIG: $tagname])
++
++__EOF__
++
++ifelse([$1],[], [
++  case $host_os in
++  aix3*)
++    cat <<\EOF >> "$cfgfile"
++
++# AIX sometimes has problems with the GCC collect2 program.  For some
++# reason, if we set the COLLECT_NAMES environment variable, the problems
++# vanish in a puff of smoke.
++if test "X${COLLECT_NAMES+set}" != Xset; then
++  COLLECT_NAMES=
++  export COLLECT_NAMES
++fi
++EOF
++    ;;
++  esac
++
++  # We use sed instead of cat because bash on DJGPP gets confused if
++  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
++  # text mode, it properly converts lines to CR/LF.  This bash problem
++  # is reportedly fixed, but why not run on old versions too?
++  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
++
++  mv -f "$cfgfile" "$ofile" || \
++    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
++  chmod +x "$ofile"
++])
++else
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
++fi
++])# AC_LIBTOOL_CONFIG
++
++
++# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
++# -------------------------------------------
++AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
++[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++
++_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
++
++if test "$GCC" = yes; then
++  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
++
++  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
++    lt_cv_prog_compiler_rtti_exceptions,
++    [-fno-rtti -fno-exceptions], [],
++    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
++fi
++])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
++
++
++# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
++# ---------------------------------
++AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
++[AC_REQUIRE([AC_CANONICAL_HOST])
++AC_REQUIRE([AC_PROG_NM])
++AC_REQUIRE([AC_OBJEXT])
++# Check for command to grab the raw symbol name followed by C symbol from nm.
++AC_MSG_CHECKING([command to parse $NM output from $compiler object])
++AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
++[
++# These are sane defaults that work on at least a few old systems.
++# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
++
++# Character class describing NM global symbol codes.
++symcode='[[BCDEGRST]]'
++
++# Regexp to match symbols that can be accessed directly from C.
++sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
++
++# Transform the above into a raw symbol and a C symbol.
++symxfrm='\1 \2\3 \3'
++
++# Transform an extracted symbol line into a proper C declaration
++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
++
++# Transform an extracted symbol line into symbol name and symbol address
++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++
++# Define system-specific variables.
++case $host_os in
++aix*)
++  symcode='[[BCDT]]'
++  ;;
++cygwin* | mingw* | pw32*)
++  symcode='[[ABCDGISTW]]'
++  ;;
++hpux*) # Its linker distinguishes data from code symbols
++  if test "$host_cpu" = ia64; then
++    symcode='[[ABCDEGRST]]'
++  fi
++  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++  ;;
++linux*)
++  if test "$host_cpu" = ia64; then
++    symcode='[[ABCDGIRSTW]]'
++    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++  fi
++  ;;
++irix* | nonstopux*)
++  symcode='[[BCDEGRST]]'
++  ;;
++osf*)
++  symcode='[[BCDEGQRST]]'
++  ;;
++solaris* | sysv5*)
++  symcode='[[BDRT]]'
++  ;;
++sysv4)
++  symcode='[[DFNSTU]]'
++  ;;
++esac
++
++# Handle CRLF in mingw tool chain
++opt_cr=
++case $build_os in
++mingw*)
++  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
++  ;;
++esac
++
++# If we're using GNU nm, then use its standard symbol codes.
++case `$NM -V 2>&1` in
++*GNU* | *'with BFD'*)
++  symcode='[[ABCDGIRSTW]]' ;;
++esac
++
++# Try without a prefix undercore, then with it.
++for ac_symprfx in "" "_"; do
++
++  # Write the raw and C identifiers.
++  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++
++  # Check to see that the pipe works correctly.
++  pipe_works=no
++
++  rm -f conftest*
++  cat > conftest.$ac_ext <<EOF
++#ifdef __cplusplus
++extern "C" {
++#endif
++char nm_test_var;
++void nm_test_func(){}
++#ifdef __cplusplus
++}
++#endif
++int main(){nm_test_var='a';nm_test_func();return(0);}
++EOF
++
++  if AC_TRY_EVAL(ac_compile); then
++    # Now try to grab the symbols.
++    nlist=conftest.nm
++    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
++      # Try sorting and uniquifying the output.
++      if sort "$nlist" | uniq > "$nlist"T; then
++	mv -f "$nlist"T "$nlist"
++      else
++	rm -f "$nlist"T
++      fi
++
++      # Make sure that we snagged all the symbols we need.
++      if grep ' nm_test_var$' "$nlist" >/dev/null; then
++	if grep ' nm_test_func$' "$nlist" >/dev/null; then
++	  cat <<EOF > conftest.$ac_ext
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++EOF
++	  # Now generate the symbol file.
++	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
++
++	  cat <<EOF >> conftest.$ac_ext
++#if defined (__STDC__) && __STDC__
++# define lt_ptr_t void *
++#else
++# define lt_ptr_t char *
++# define const
++#endif
++
++/* The mapping between symbol names and symbols. */
++const struct {
++  const char *name;
++  lt_ptr_t address;
++}
++lt_preloaded_symbols[[]] =
++{
++EOF
++	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
++	  cat <<\EOF >> conftest.$ac_ext
++  {0, (lt_ptr_t) 0}
++};
++
++#ifdef __cplusplus
++}
++#endif
++EOF
++	  # Now try linking the two files.
++	  mv conftest.$ac_objext conftstm.$ac_objext
++	  lt_save_LIBS="$LIBS"
++	  lt_save_CFLAGS="$CFLAGS"
++	  LIBS="conftstm.$ac_objext"
++	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
++	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
++	    pipe_works=yes
++	  fi
++	  LIBS="$lt_save_LIBS"
++	  CFLAGS="$lt_save_CFLAGS"
++	else
++	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
++	fi
++      else
++	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
++      fi
++    else
++      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
++    fi
++  else
++    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
++    cat conftest.$ac_ext >&5
++  fi
++  rm -f conftest* conftst*
++
++  # Do not use the global_symbol_pipe unless it works.
++  if test "$pipe_works" = yes; then
++    break
++  else
++    lt_cv_sys_global_symbol_pipe=
++  fi
++done
++])
++if test -z "$lt_cv_sys_global_symbol_pipe"; then
++  lt_cv_sys_global_symbol_to_cdecl=
++fi
++if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
++  AC_MSG_RESULT(failed)
++else
++  AC_MSG_RESULT(ok)
++fi
++]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
++
++
++# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
++# ---------------------------------------
++AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
++[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
++_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
++
++AC_MSG_CHECKING([for $compiler option to produce PIC])
++ ifelse([$1],[CXX],[
++  # C++ specific cases for pic, static, wl, etc.
++  if test "$GXX" = yes; then
++    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++
++    case $host_os in
++    aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      fi
++      ;;
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
++      ;;
++    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++    mingw* | os2* | pw32*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++      ;;
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
++      ;;
++    *djgpp*)
++      # DJGPP does not support shared libraries at all
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++      ;;
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
++      fi
++      ;;
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	;;
++      *)
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	;;
++      esac
++      ;;
++    *)
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++      ;;
++    esac
++  else
++    case $host_os in
++      aix4* | aix5*)
++	# All AIX code is PIC.
++	if test "$host_cpu" = ia64; then
++	  # AIX 5 now supports IA64 processor
++	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	else
++	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
++	fi
++	;;
++      chorus*)
++	case $cc_basename in
++	cxch68)
++	  # Green Hills C++ Compiler
++	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
++	  ;;
++	esac
++	;;
++       darwin*)
++         # PIC is the default on this platform
++         # Common symbols not allowed in MH_DYLIB files
++         case "$cc_basename" in
++           xlc*)
++           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++           ;;
++         esac
++       ;;
++      dgux*)
++	case $cc_basename in
++	  ec++)
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    ;;
++	  ghcx)
++	    # Green Hills C++ Compiler
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      freebsd* | kfreebsd*-gnu)
++	# FreeBSD uses GNU C++
++	;;
++      hpux9* | hpux10* | hpux11*)
++	case $cc_basename in
++	  CC)
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
++	    if test "$host_cpu" != ia64; then
++	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
++	    fi
++	    ;;
++	  aCC)
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
++	    case "$host_cpu" in
++	    hppa*64*|ia64*)
++	      # +Z the default
++	      ;;
++	    *)
++	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
++	      ;;
++	    esac
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      irix5* | irix6* | nonstopux*)
++	case $cc_basename in
++	  CC)
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++	    # CC pic flag -KPIC is the default.
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      linux*)
++	case $cc_basename in
++	  KCC)
++	    # KAI C++ Compiler
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	    ;;
++	  icpc)
++	    # Intel C++
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++	    ;;
++	  cxx)
++	    # Compaq C++
++	    # Make sure the PIC flag is empty.  It appears that all Alpha
++	    # Linux and Compaq Tru64 Unix objects are PIC.
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      lynxos*)
++	;;
++      m88k*)
++	;;
++      mvs*)
++	case $cc_basename in
++	  cxx)
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      netbsd*)
++	;;
++      osf3* | osf4* | osf5*)
++	case $cc_basename in
++	  KCC)
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
++	    ;;
++	  RCC)
++	    # Rational C++ 2.4.1
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++	    ;;
++	  cxx)
++	    # Digital/Compaq C++
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    # Make sure the PIC flag is empty.  It appears that all Alpha
++	    # Linux and Compaq Tru64 Unix objects are PIC.
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      psos*)
++	;;
++      sco*)
++	case $cc_basename in
++	  CC)
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      solaris*)
++	case $cc_basename in
++	  CC)
++	    # Sun C++ 4.2, 5.x and Centerline C++
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++	    ;;
++	  gcx)
++	    # Green Hills C++ Compiler
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      sunos4*)
++	case $cc_basename in
++	  CC)
++	    # Sun C++ 4.x
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	    ;;
++	  lcc)
++	    # Lucid
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      tandem*)
++	case $cc_basename in
++	  NCC)
++	    # NonStop-UX NCC 3.20
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      unixware*)
++	;;
++      vxworks*)
++	;;
++      *)
++	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++	;;
++    esac
++  fi
++],
++[
++  if test "$GCC" = yes; then
++    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++
++    case $host_os in
++      aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      fi
++      ;;
++
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
++      ;;
++
++    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++      ;;
++
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
++      ;;
++
++    msdosdjgpp*)
++      # Just because we use GCC doesn't mean we suddenly get shared libraries
++      # on systems that don't support them.
++      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++      enable_shared=no
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
++      fi
++      ;;
++
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	;;
++      esac
++      ;;
++
++    *)
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++      ;;
++    esac
++  else
++    # PORTME Check for flag to pass linker flags through the system compiler.
++    case $host_os in
++    aix*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      else
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
++      fi
++      ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case "$cc_basename" in
++         xlc*)
++         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++         ;;
++       esac
++       ;;
++
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++      ;;
++
++    hpux9* | hpux10* | hpux11*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
++	;;
++      esac
++      # Is there a better lt_prog_compiler_static that works with the bundled CC?
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      # PIC (with -KPIC) is the default.
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++      ;;
++
++    newsos6)
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
++    linux*)
++      case $CC in
++      icc* | ecc*)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++        ;;
++      ccc*)
++        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++        # All Alpha code is PIC.
++        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++        ;;
++      esac
++      ;;
++
++    osf3* | osf4* | osf5*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      # All OSF/1 code is PIC.
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++      ;;
++
++    sco3.2v5*)
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
++      ;;
++
++    solaris*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
++    sunos4*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
++    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      fi
++      ;;
++
++    uts4*)
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
++    *)
++      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++      ;;
++    esac
++  fi
++])
++AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
++
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
++  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
++    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
++    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
++    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
++     "" | " "*) ;;
++     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
++     esac],
++    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
++fi
++case "$host_os" in
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++    ;;
++  *)
++    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
++    ;;
++esac
++])
++
++
++# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
++# ------------------------------------
++# See if the linker supports building shared libraries.
++AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
++[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
++ifelse([$1],[CXX],[
++  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  case $host_os in
++  aix4* | aix5*)
++    # If we're using GNU nm, then we don't want the "-C" option.
++    # -C means demangle to AIX nm, but means don't demangle with GNU nm
++    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
++      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
++    else
++      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
++    fi
++    ;;
++  pw32*)
++    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
++  ;;
++  cygwin* | mingw*)
++    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++  ;;
++  *)
++    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  ;;
++  esac
++],[
++  runpath_var=
++  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
++  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
++  _LT_AC_TAGVAR(archive_cmds, $1)=
++  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
++  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
++  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
++  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
++  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
++  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++  _LT_AC_TAGVAR(hardcode_direct, $1)=no
++  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
++  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
++  _LT_AC_TAGVAR(module_cmds, $1)=
++  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
++  _LT_AC_TAGVAR(always_export_symbols, $1)=no
++  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  # include_expsyms should be a list of space-separated symbols to be *always*
++  # included in the symbol list
++  _LT_AC_TAGVAR(include_expsyms, $1)=
++  # exclude_expsyms can be an extended regexp of symbols to exclude
++  # it will be wrapped by ` (' and `)$', so one must not match beginning or
++  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++  # as well as any symbol that contains `d'.
++  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
++  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++  # platforms (ab)use it in PIC code, but their linkers get confused if
++  # the symbol is explicitly referenced.  Since portable code cannot
++  # rely on this symbol name, it's probably fine to never include it in
++  # preloaded symbol tables.
++  extract_expsyms_cmds=
++
++  case $host_os in
++  cygwin* | mingw* | pw32*)
++    # FIXME: the MSVC++ port hasn't been tested in a loooong time
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    if test "$GCC" != yes; then
++      with_gnu_ld=no
++    fi
++    ;;
++  openbsd*)
++    with_gnu_ld=no
++    ;;
++  esac
++
++  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
++  if test "$with_gnu_ld" = yes; then
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    wlarc='${wl}'
++
++    # See if GNU ld supports shared libraries.
++    case $host_os in
++    aix3* | aix4* | aix5*)
++      # On AIX/PPC, the GNU linker is very broken
++      if test "$host_cpu" != ia64; then
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	cat <<EOF 1>&2
++
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
+ 
+-# Whether or not to optimize for fast installation.
+-fast_install=$enable_fast_install
++EOF
++      fi
++      ;;
+ 
+-# The host system.
+-host_alias=$host_alias
+-host=$host
++    amigaos*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++
++      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
++      # that the semantics of dynamic libraries on AmigaOS, at least up
++      # to version 4, is to share data among multiple programs linked
++      # with the same dynamic library.  Since this doesn't match the
++      # behavior of shared libraries on other platforms, we can't use
++      # them.
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      ;;
+ 
+-# An echo program that does not interpret backslashes.
+-echo=$lt_echo
++    beos*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++	# support --undefined.  This deserves some investigation.  FIXME
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
+ 
+-# The archiver.
+-AR=$lt_AR
+-AR_FLAGS=$lt_AR_FLAGS
++    cygwin* | mingw* | pw32*)
++      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
++      # as there is no search path for DLLs.
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++      _LT_AC_TAGVAR(always_export_symbols, $1)=no
++      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++
++      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++	# If the export-symbols file already is a .def file (1st line
++	# is EXPORTS), use it as is; otherwise, prepend...
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	  cp $export_symbols $output_objdir/$soname.def;
++	else
++	  echo EXPORTS > $output_objdir/$soname.def;
++	  cat $export_symbols >> $output_objdir/$soname.def;
++	fi~
++	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
+ 
+-# The default C compiler.
+-CC=$lt_CC
++    netbsd*)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++	wlarc=
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      fi
++      ;;
+ 
+-# Is the compiler the GNU C compiler?
+-with_gcc=$GCC
++    solaris* | sysv5*)
++      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	cat <<EOF 1>&2
+ 
+-# The linker used to build libraries.
+-LD=$lt_LD
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
+ 
+-# Whether we need hard or soft links.
+-LN_S=$lt_LN_S
++EOF
++      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
+ 
+-# A BSD-compatible nm program.
+-NM=$lt_NM
++    sunos4*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      wlarc=
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
+ 
+-# A symbol stripping program
+-STRIP=$STRIP
++  linux*)
++    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
++      supports_anon_versioning=no
++      case `$LD -v 2>/dev/null` in
++        *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
++        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++        *\ 2.11.*) ;; # other 2.11 versions
++        *) supports_anon_versioning=yes ;;
++      esac
++      if test $supports_anon_versioning = yes; then
++        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
++cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++$echo "local: *; };" >> $output_objdir/$libname.ver~
++        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++      else
++        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds"
++      fi
++    else
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    fi
++    ;;
+ 
+-# Used to examine libraries when file_magic_cmd begins "file"
+-MAGIC_CMD=$MAGIC_CMD
++    *)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++    esac
+ 
+-# Used on cygwin: DLL creation program.
+-DLLTOOL="$DLLTOOL"
++    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
++      runpath_var=LD_RUN_PATH
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++      # ancient GNU ld didn't support --whole-archive et. al.
++      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++ 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++      fi
++    fi
++  else
++    # PORTME fill in a description of your system's linker (not GNU ld)
++    case $host_os in
++    aix3*)
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
++      # Note: this linker hardcodes the directories in LIBPATH if there
++      # are no directories specified by -L.
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      if test "$GCC" = yes && test -z "$link_static_flag"; then
++	# Neither direct hardcoding nor static linking is supported with a
++	# broken collect2.
++	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
++      fi
++      ;;
+ 
+-# Used on cygwin: object dumper.
+-OBJDUMP="$OBJDUMP"
++    aix4* | aix5*)
++      if test "$host_cpu" = ia64; then
++	# On IA64, the linker does run time linking by default, so we don't
++	# have to do anything special.
++	aix_use_runtimelinking=no
++	exp_sym_flag='-Bexport'
++	no_entry_flag=""
++      else
++	# If we're using GNU nm, then we don't want the "-C" option.
++	# -C means demangle to AIX nm, but means don't demangle with GNU nm
++	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
++	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
++	else
++	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
++	fi
++	aix_use_runtimelinking=no
+ 
+-# Used on cygwin: assembler.
+-AS="$AS"
++	# Test if we are trying to use run time linking or normal
++	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
++	# need to do runtime linking.
++	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++	  for ld_flag in $LDFLAGS; do
++  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++  	    aix_use_runtimelinking=yes
++  	    break
++  	  fi
++	  done
++	esac
+ 
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
++	exp_sym_flag='-bexport'
++	no_entry_flag='-bnoentry'
++      fi
++
++      # When large executables or shared objects are built, AIX ld can
++      # have problems creating the table of contents.  If linking a library
++      # or program results in "error TOC overflow" add -mminimal-toc to
++      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++      _LT_AC_TAGVAR(archive_cmds, $1)=''
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++
++      if test "$GCC" = yes; then
++	case $host_os in aix4.[012]|aix4.[012].*)
++	# We only want to do this on AIX 4.2 and lower, the check
++	# below for broken collect2 doesn't work under 4.3+
++	  collect2name=`${CC} -print-prog-name=collect2`
++	  if test -f "$collect2name" && \
++  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	  then
++  	  # We have reworked collect2
++  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++	  else
++  	  # We have old collect2
++  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
++  	  # It fails to find uninstalled libraries when the uninstalled
++  	  # path is not listed in the libpath.  Setting hardcode_minus_L
++  	  # to unsupported forces relinking
++  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++	  fi
++	esac
++	shared_flag='-shared'
++      else
++	# not using gcc
++	if test "$host_cpu" = ia64; then
++  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++  	# chokes on -Wl,-G. The following line is correct:
++	  shared_flag='-G'
++	else
++  	if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag='${wl}-G'
++	  else
++	    shared_flag='${wl}-bM:SRE'
++  	fi
++	fi
++      fi
++
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
++      if test "$aix_use_runtimelinking" = yes; then
++	# Warning - without using the other runtime loading flags (-brtl),
++	# -berok will link without error, but may produce a broken library.
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
++       # Determine the default libpath from the value encoded in an empty executable.
++       _LT_AC_SYS_LIBPATH_AIX
++       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++       else
++	if test "$host_cpu" = ia64; then
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
++	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++	else
++	 # Determine the default libpath from the value encoded in an empty executable.
++	 _LT_AC_SYS_LIBPATH_AIX
++	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++	  # Warning - without using the other run time loading flags,
++	  # -berok will link without error, but may produce a broken library.
++	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
++	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
++	  # -bexpall does not export symbols beginning with underscore (_)
++	  _LT_AC_TAGVAR(always_export_symbols, $1)=yes
++	  # Exported symbols can be pulled into shared objects from archives
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
++	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++	  # This is similar to how AIX traditionally builds it's shared libraries.
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	fi
++      fi
++      ;;
++
++    amigaos*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      # see comment about different semantics on the GNU ld section
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      ;;
++
++    bsdi[[45]]*)
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # When not using gcc, we currently assume that we are using
++      # Microsoft Visual C++.
++      # hardcode_libdir_flag_spec is actually meaningless, as there is
++      # no search path for DLLs.
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++      # Tell ltmain to make .lib files, not .a files.
++      libext=lib
++      # Tell ltmain to make .dll files, not .so files.
++      shrext_cmds=".dll"
++      # FIXME: Setting linknames here is a bad hack.
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      # The linker will automatically build a .lib file if we build a DLL.
++      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
++      # FIXME: Should let the user specify the lib program.
++      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++      ;;
++
++    darwin* | rhapsody*)
++      case "$host_os" in
++        rhapsody* | darwin1.[[012]])
++         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[[012]])
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++      esac
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++    else
++      case "$cc_basename" in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         _LT_AC_TAGVAR(ld_shlibs, $1)=no
++          ;;
++      esac
++    fi
++      ;;
++
++    dgux*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    freebsd1*)
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      ;;
++
++    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++    # support.  Future versions do this automatically, but an explicit c++rt0.o
++    # does not break anything, and helps significantly (at the cost of a little
++    # extra space).
++    freebsd2.2*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++    freebsd2*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++    freebsd* | kfreebsd*-gnu)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    hpux9*)
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++
++      # hardcode_minus_L: Not really in the search PATH,
++      # but as the default location of the library.
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      ;;
++
++    hpux10* | hpux11*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	esac
++      else
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	esac
++      fi
++      if test "$with_gnu_ld" = no; then
++	case "$host_cpu" in
++	hppa*64*)
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
++	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
++	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++	  ;;
++	ia64*)
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
++	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++	  ;;
++	*)
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++	  ;;
++	esac
++      fi
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++      ;;
++
++    netbsd*)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    newsos6)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    openbsd*)
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      else
++       case $host_os in
++	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
++	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	   ;;
++	 *)
++	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	   ;;
++       esac
++      fi
++      ;;
++
++    os2*)
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++      ;;
++
++    osf3*)
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++      ;;
++
++    osf4* | osf5*)	# as osf3* with the addition of -msym flag
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      else
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++
++	# Both c and cxx compiler support -rpath directly
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++      ;;
++
++    sco3.2v5*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
++      runpath_var=LD_RUN_PATH
++      hardcode_runpath_var=yes
++      ;;
++
++    solaris*)
++      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      case $host_os in
++      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
++      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++      esac
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++      ;;
++
++    sunos4*)
++      if test "x$host_vendor" = xsequent; then
++	# Use $CC to link under sequent, because it throws in some extra .o
++	# files that make .init and .fini sections work.
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    sysv4)
++      case $host_vendor in
++	sni)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
++	;;
++	siemens)
++	  ## LD is ld it makes a PLAMLIB
++	  ## CC just makes a GrossModule.
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
++        ;;
++	motorola)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
++	;;
++      esac
++      runpath_var='LD_RUN_PATH'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    sysv4.3*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++	runpath_var=LD_RUN_PATH
++	hardcode_runpath_var=yes
++	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
++      fi
++      ;;
++
++    sysv4.2uw2*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      hardcode_runpath_var=yes
++      runpath_var=LD_RUN_PATH
++      ;;
++
++   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
++      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
++      runpath_var='LD_RUN_PATH'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    sysv5*)
++      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
++      # $CC -shared without GNU ld will not create a library from C++
++      # object files and a static libstdc++, better avoid it by now
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      runpath_var='LD_RUN_PATH'
++      ;;
++
++    uts4*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    *)
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      ;;
++    esac
++  fi
++])
++AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
++test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
++#
++# Do we need to explicitly link libc?
++#
++case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
++x|xyes)
++  # Assume -lc should be added
++  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++
++  if test "$enable_shared" = yes && test "$GCC" = yes; then
++    case $_LT_AC_TAGVAR(archive_cmds, $1) in
++    *'~'*)
++      # FIXME: we may have to deal with multi-command sequences.
++      ;;
++    '$CC '*)
++      # Test whether the compiler implicitly links with -lc since on some
++      # systems, -lgcc has to come before -lc. If gcc already passes -lc
++      # to ld, don't add -lc before -lgcc.
++      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
++      $rm conftest*
++      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        libobjs=conftest.$ac_objext
++        deplibs=
++        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
++        compiler_flags=-v
++        linker_flags=-v
++        verstring=
++        output_objdir=.
++        libname=conftest
++        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
++        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
++        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
++        then
++	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++        else
++	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++        fi
++        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
++      else
++        cat conftest.err 1>&5
++      fi
++      $rm conftest*
++      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
++      ;;
++    esac
++  fi
++  ;;
++esac
++])# AC_LIBTOOL_PROG_LD_SHLIBS
++
++
++# _LT_AC_FILE_LTDLL_C
++# -------------------
++# Be careful that the start marker always follows a newline.
++AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
++# /* ltdll.c starts here */
++# #define WIN32_LEAN_AND_MEAN
++# #include <windows.h>
++# #undef WIN32_LEAN_AND_MEAN
++# #include <stdio.h>
++#
++# #ifndef __CYGWIN__
++# #  ifdef __CYGWIN32__
++# #    define __CYGWIN__ __CYGWIN32__
++# #  endif
++# #endif
++#
++# #ifdef __cplusplus
++# extern "C" {
++# #endif
++# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
++# #ifdef __cplusplus
++# }
++# #endif
++#
++# #ifdef __CYGWIN__
++# #include <cygwin/cygwin_dll.h>
++# DECLARE_CYGWIN_DLL( DllMain );
++# #endif
++# HINSTANCE __hDllInstance_base;
++#
++# BOOL APIENTRY
++# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
++# {
++#   __hDllInstance_base = hInst;
++#   return TRUE;
++# }
++# /* ltdll.c ends here */
++])# _LT_AC_FILE_LTDLL_C
+ 
+-# How to create reloadable object files.
+-reload_flag=$lt_reload_flag
+-reload_cmds=$lt_reload_cmds
+ 
+-# How to pass a linker flag through the compiler.
+-wl=$lt_wl
++# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
++# ---------------------------------
++AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
+ 
+-# Object file suffix (normally "o").
+-objext="$ac_objext"
+ 
+-# Old archive suffix (normally "a").
+-libext="$libext"
++# old names
++AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
++AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
++AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
++AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
++AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
++AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
++AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
+ 
+-# Executable file suffix (normally "").
+-exeext="$exeext"
++# This is just to silence aclocal about the macro not being used
++ifelse([AC_DISABLE_FAST_INSTALL])
+ 
+-# Additional compiler flags for building library objects.
+-pic_flag=$lt_pic_flag
+-pic_mode=$pic_mode
++AC_DEFUN([LT_AC_PROG_GCJ],
++[AC_CHECK_TOOL(GCJ, gcj, no)
++  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
++  AC_SUBST(GCJFLAGS)
++])
+ 
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_compiler_c_o
++AC_DEFUN([LT_AC_PROG_RC],
++[AC_CHECK_TOOL(RC, windres, no)
++])
+ 
+-# Can we write directly to a .lo ?
+-compiler_o_lo=$lt_compiler_o_lo
++# NOTE: This macro has been submitted for inclusion into   #
++#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
++#  a released version of Autoconf we should remove this    #
++#  macro and use it instead.                               #
++# LT_AC_PROG_SED
++# --------------
++# Check for a fully-functional sed program, that truncates
++# as few characters as possible.  Prefer GNU sed if found.
++AC_DEFUN([LT_AC_PROG_SED],
++[AC_MSG_CHECKING([for a sed that does not truncate output])
++AC_CACHE_VAL(lt_cv_path_SED,
++[# Loop through the user's path and test for sed and gsed.
++# Then use that list of sed's as ones to test for truncation.
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for lt_ac_prog in sed gsed; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
++      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
++        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
++      fi
++    done
++  done
++done
++lt_ac_max=0
++lt_ac_count=0
++# Add /usr/xpg4/bin/sed as it is typically found on Solaris
++# along with /bin/sed that truncates output.
++for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
++  test ! -f $lt_ac_sed && break
++  cat /dev/null > conftest.in
++  lt_ac_count=0
++  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
++  # Check for GNU sed and select it if it is found.
++  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
++    lt_cv_path_SED=$lt_ac_sed
++    break
++  fi
++  while true; do
++    cat conftest.in conftest.in >conftest.tmp
++    mv conftest.tmp conftest.in
++    cp conftest.in conftest.nl
++    echo >>conftest.nl
++    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
++    cmp -s conftest.out conftest.nl || break
++    # 10000 chars as input seems more than enough
++    test $lt_ac_count -gt 10 && break
++    lt_ac_count=`expr $lt_ac_count + 1`
++    if test $lt_ac_count -gt $lt_ac_max; then
++      lt_ac_max=$lt_ac_count
++      lt_cv_path_SED=$lt_ac_sed
++    fi
++  done
++done
++])
++SED=$lt_cv_path_SED
++AC_MSG_RESULT([$SED])
++])
+ 
+-# Must we lock files when doing compilation ?
+-need_locks=$lt_need_locks
++#                                                        -*- Autoconf -*-
++# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
++# Generated from amversion.in; do not edit by hand.
+ 
+-# Do we need the lib prefix for modules?
+-need_lib_prefix=$need_lib_prefix
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
+ 
+-# Do we need a version for libraries?
+-need_version=$need_version
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
+ 
+-# Whether dlopen is supported.
+-dlopen_support=$enable_dlopen
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ 
+-# Whether dlopen of programs is supported.
+-dlopen_self=$enable_dlopen_self
++# AM_AUTOMAKE_VERSION(VERSION)
++# ----------------------------
++# 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"])
++
++# AM_SET_CURRENT_AUTOMAKE_VERSION
++# -------------------------------
++# Call AM_AUTOMAKE_VERSION so it can be traced.
++# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
++AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
++	 [AM_AUTOMAKE_VERSION([1.9.4])])
+ 
+-# Whether dlopen of statically linked programs is supported.
+-dlopen_self_static=$enable_dlopen_self_static
++# AM_AUX_DIR_EXPAND
+ 
+-# Compiler flag to prevent dynamic linking.
+-link_static_flag=$lt_link_static_flag
++# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+ 
+-# Compiler flag to turn off builtin functions.
+-no_builtin_flag=$lt_no_builtin_flag
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
+ 
+-# Compiler flag to allow reflexive dlopens.
+-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
+ 
+-# Compiler flag to generate shared objects directly from archives.
+-whole_archive_flag_spec=$lt_whole_archive_flag_spec
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
+ 
+-# Compiler flag to generate thread-safe objects.
+-thread_safe_flag_spec=$lt_thread_safe_flag_spec
++# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
++# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
++# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
++#
++# Of course, Automake must honor this variable whenever it calls a
++# tool from the auxiliary directory.  The problem is that $srcdir (and
++# therefore $ac_aux_dir as well) can be either absolute or relative,
++# depending on how configure is run.  This is pretty annoying, since
++# it makes $ac_aux_dir quite unusable in subdirectories: in the top
++# source directory, any form will work fine, but in subdirectories a
++# relative path needs to be adjusted first.
++#
++# $ac_aux_dir/missing
++#    fails when called from a subdirectory if $ac_aux_dir is relative
++# $top_srcdir/$ac_aux_dir/missing
++#    fails if $ac_aux_dir is absolute,
++#    fails when called from a subdirectory in a VPATH build with
++#          a relative $ac_aux_dir
++#
++# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
++# are both prefixed by $srcdir.  In an in-source build this is usually
++# harmless because $srcdir is `.', but things will broke when you
++# start a VPATH build or use an absolute $srcdir.
++#
++# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
++# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
++#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
++# and then we would define $MISSING as
++#   MISSING="\${SHELL} $am_aux_dir/missing"
++# This will work as long as MISSING is not called from configure, because
++# unfortunately $(top_srcdir) has no meaning in configure.
++# However there are other variables, like CC, which are often used in
++# configure, and could therefore not use this "fixed" $ac_aux_dir.
++#
++# Another solution, used here, is to always expand $ac_aux_dir to an
++# absolute PATH.  The drawback is that using absolute paths prevent a
++# configured tree to be moved without reconfiguration.
++
++AC_DEFUN([AM_AUX_DIR_EXPAND],
++[dnl Rely on autoconf to set up CDPATH properly.
++AC_PREREQ([2.50])dnl
++# expand $ac_aux_dir to an absolute path
++am_aux_dir=`cd $ac_aux_dir && pwd`
++])
+ 
+-# Library versioning type.
+-version_type=$version_type
++# AM_CONDITIONAL                                              -*- Autoconf -*-
+ 
+-# Format of library name prefix.
+-libname_spec=$lt_libname_spec
++# Copyright (C) 1997, 2000, 2001, 2003, 2004 Free Software Foundation, Inc.
+ 
+-# List of archive names.  First name is the real one, the rest are links.
+-# The last name is the one that the linker finds with -lNAME.
+-library_names_spec=$lt_library_names_spec
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
+ 
+-# The coded name of the library, if different from the real name.
+-soname_spec=$lt_soname_spec
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
+ 
+-# Commands used to build and install an old-style archive.
+-RANLIB=$lt_RANLIB
+-old_archive_cmds=$lt_old_archive_cmds
+-old_postinstall_cmds=$lt_old_postinstall_cmds
+-old_postuninstall_cmds=$lt_old_postuninstall_cmds
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
+ 
+-# Create an old-style archive from a shared archive.
+-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
++# serial 6
+ 
+-# Create a temporary old-style archive to link instead of a shared archive.
+-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
++# AM_CONDITIONAL(NAME, SHELL-CONDITION)
++# -------------------------------------
++# Define a conditional.
++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])
++if $2; then
++  $1_TRUE=
++  $1_FALSE='#'
++else
++  $1_TRUE='#'
++  $1_FALSE=
++fi
++AC_CONFIG_COMMANDS_PRE(
++[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
++  AC_MSG_ERROR([[conditional "$1" was never defined.
++Usually this means the macro was only invoked conditionally.]])
++fi])])
+ 
+-# Commands used to build and install a shared archive.
+-archive_cmds=$lt_archive_cmds
+-archive_expsym_cmds=$lt_archive_expsym_cmds
+-postinstall_cmds=$lt_postinstall_cmds
+-postuninstall_cmds=$lt_postuninstall_cmds
++# serial 7						-*- Autoconf -*-
+ 
+-# Commands to strip libraries.
+-old_striplib=$lt_old_striplib
+-striplib=$lt_striplib
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
++# Free Software Foundation, Inc.
+ 
+-# Method to check whether dependent libraries are shared objects.
+-deplibs_check_method=$lt_deplibs_check_method
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
+ 
+-# Command to use when deplibs_check_method == file_magic.
+-file_magic_cmd=$lt_file_magic_cmd
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
+ 
+-# Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag=$lt_allow_undefined_flag
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
+ 
+-# Flag that forces no undefined symbols.
+-no_undefined_flag=$lt_no_undefined_flag
+ 
+-# Commands used to finish a libtool library installation in a directory.
+-finish_cmds=$lt_finish_cmds
++# 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,
++# will think it sees a *use*, and therefore will trigger all it's
++# C support machinery.  Also note that it means that autoscan, seeing
++# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+ 
+-# Same as above, but a single script fragment to be evaled but not shown.
+-finish_eval=$lt_finish_eval
+ 
+-# Take the output of nm and produce a listing of raw symbols and C names.
+-global_symbol_pipe=$lt_global_symbol_pipe
+ 
+-# Transform the output of nm in a proper C declaration
+-global_symbol_to_cdecl=$lt_global_symbol_to_cdecl
++# _AM_DEPENDENCIES(NAME)
++# ----------------------
++# See how the compiler implements dependency checking.
++# NAME is "CC", "CXX", "GCJ", or "OBJC".
++# We try a few techniques and use that to set a single cache variable.
++#
++# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
++# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
++# dependency, and given that the user is not expected to run this macro,
++# just rely on AC_PROG_CC.
++AC_DEFUN([_AM_DEPENDENCIES],
++[AC_REQUIRE([AM_SET_DEPDIR])dnl
++AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
++AC_REQUIRE([AM_MAKE_INCLUDE])dnl
++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], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
++                   [depcc="$$1"   am_compiler_list=])
++
++AC_CACHE_CHECK([dependency style of $depcc],
++               [am_cv_$1_dependencies_compiler_type],
++[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
++  # We make a subdir and do the tests there.  Otherwise we can end up
++  # making bogus files that we don't know about and never remove.  For
++  # instance it was reported that on HP-UX the gcc test will end up
++  # making a dummy file named `D' -- because `-MD' means `put the output
++  # in D'.
++  mkdir conftest.dir
++  # Copy depcomp to subdir because otherwise we won't find it if we're
++  # using a relative directory.
++  cp "$am_depcomp" conftest.dir
++  cd conftest.dir
++  # We will build objects and dependencies in a subdirectory because
++  # it helps to detect inapplicable dependency modes.  For instance
++  # both Tru64's cc and ICC support -MD to output dependencies as a
++  # side effect of compilation, but ICC will put the dependencies in
++  # the current directory while Tru64 will put them in the object
++  # directory.
++  mkdir sub
++
++  am_cv_$1_dependencies_compiler_type=none
++  if test "$am_compiler_list" = ""; then
++     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
++  fi
++  for depmode in $am_compiler_list; do
++    # Setup a source with many dependencies, because some compilers
++    # like to wrap large dependency lists on column 80 (with \), and
++    # we should not choose a depcomp mode which is confused by this.
++    #
++    # We need to recreate these files for each test, as the compiler may
++    # overwrite some of them when testing with obscure command lines.
++    # This happens at least with the AIX C compiler.
++    : > sub/conftest.c
++    for i in 1 2 3 4 5 6; do
++      echo '#include "conftst'$i'.h"' >> sub/conftest.c
++      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
++      # Solaris 8's {/usr,}/bin/sh.
++      touch sub/conftst$i.h
++    done
++    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ 
+-# Transform the output of nm in a C name address pair
+-global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address
++    case $depmode in
++    nosideeffect)
++      # after this tag, mechanisms are not by side-effect, so they'll
++      # only be used when explicitly requested
++      if test "x$enable_dependency_tracking" = xyes; then
++	continue
++      else
++	break
++      fi
++      ;;
++    none) break ;;
++    esac
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.
++    if depmode=$depmode \
++       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
++       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++         >/dev/null 2>conftest.err &&
++       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
++       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
++      # icc doesn't choke on unknown options, it will just issue warnings
++      # or remarks (even with -Werror).  So we grep stderr for any message
++      # that says an option was ignored or not supported.
++      # When given -MP, icc 7.0 and 7.1 complain thusly:
++      #   icc: Command line warning: ignoring option '-M'; no argument required
++      # The diagnosis changed in icc 8.0:
++      #   icc: Command line remark: option '-MP' not supported
++      if (grep 'ignoring option' conftest.err ||
++          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
++        am_cv_$1_dependencies_compiler_type=$depmode
++        break
++      fi
++    fi
++  done
+ 
+-# This is the shared library runtime path variable.
+-runpath_var=$runpath_var
++  cd ..
++  rm -rf conftest.dir
++else
++  am_cv_$1_dependencies_compiler_type=none
++fi
++])
++AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
++AM_CONDITIONAL([am__fastdep$1], [
++  test "x$enable_dependency_tracking" != xno \
++  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
++])
+ 
+-# This is the shared library path variable.
+-shlibpath_var=$shlibpath_var
+ 
+-# Is shlibpath searched before the hard-coded library search path?
+-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++# AM_SET_DEPDIR
++# -------------
++# Choose a directory name for dependency files.
++# This macro is AC_REQUIREd in _AM_DEPENDENCIES
++AC_DEFUN([AM_SET_DEPDIR],
++[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
++AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
++])
+ 
+-# How to hardcode a shared library path into an executable.
+-hardcode_action=$hardcode_action
+ 
+-# Whether we should hardcode library paths into libraries.
+-hardcode_into_libs=$hardcode_into_libs
++# AM_DEP_TRACK
++# ------------
++AC_DEFUN([AM_DEP_TRACK],
++[AC_ARG_ENABLE(dependency-tracking,
++[  --disable-dependency-tracking  speeds up one-time build
++  --enable-dependency-tracking   do not reject slow dependency extractors])
++if test "x$enable_dependency_tracking" != xno; then
++  am_depcomp="$ac_aux_dir/depcomp"
++  AMDEPBACKSLASH='\'
++fi
++AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
++AC_SUBST([AMDEPBACKSLASH])
++])
+ 
+-# Flag to hardcode \$libdir into a binary during linking.
+-# This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
++# Generate code to set up dependency tracking.   -*- Autoconf -*-
+ 
+-# Whether we need a single -rpath flag with a separated argument.
+-hardcode_libdir_separator=$lt_hardcode_libdir_separator
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
++#   Free Software Foundation, Inc.
+ 
+-# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_direct=$hardcode_direct
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
+ 
+-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+-# resulting binary.
+-hardcode_minus_L=$hardcode_minus_L
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
+ 
+-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+-# the resulting binary.
+-hardcode_shlibpath_var=$hardcode_shlibpath_var
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
+ 
+-# Variables whose values should be saved in libtool wrapper scripts and
+-# restored at relink time.
+-variables_saved_for_relink="$variables_saved_for_relink"
++#serial 2
+ 
+-# Whether libtool must link a program against all its dependency libraries.
+-link_all_deplibs=$link_all_deplibs
++# _AM_OUTPUT_DEPENDENCY_COMMANDS
++# ------------------------------
++AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
++[for mf in $CONFIG_FILES; do
++  # Strip MF so we end up with the name of the file.
++  mf=`echo "$mf" | sed -e 's/:.*$//'`
++  # Check whether this is an Automake generated Makefile or not.
++  # We used to match only the files named `Makefile.in', but
++  # 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
++    dirpart=`AS_DIRNAME("$mf")`
++  else
++    continue
++  fi
++  # Extract the definition of DEPDIR, am__include, and am__quote
++  # from the Makefile without running `make'.
++  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
++  test -z "$DEPDIR" && continue
++  am__include=`sed -n 's/^am__include = //p' < "$mf"`
++  test -z "am__include" && continue
++  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++  # When using ansi2knr, U may be empty or an underscore; expand it
++  U=`sed -n 's/^U = //p' < "$mf"`
++  # Find all dependency output files, they are included files with
++  # $(DEPDIR) in their names.  We invoke sed twice because it is the
++  # simplest approach to changing $(DEPDIR) to its actual value in the
++  # expansion.
++  for file in `sed -n "
++    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
++       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
++    # Make sure the directory exists.
++    test -f "$dirpart/$file" && continue
++    fdir=`AS_DIRNAME(["$file"])`
++    AS_MKDIR_P([$dirpart/$fdir])
++    # echo "creating $dirpart/$file"
++    echo '# dummy' > "$dirpart/$file"
++  done
++done
++])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+ 
+-# Compile-time system search path for libraries
+-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+ 
+-# Run-time system search path for libraries
+-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++# AM_OUTPUT_DEPENDENCY_COMMANDS
++# -----------------------------
++# This macro should only be invoked once -- use via AC_REQUIRE.
++#
++# This code is only required when automatic dependency tracking
++# is enabled.  FIXME.  This creates each `.P' file that we will
++# need in order to bootstrap the dependency handling code.
++AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
++[AC_CONFIG_COMMANDS([depfiles],
++     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
++     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
++])
+ 
+-# Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path"
++# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
+ 
+-# Set to yes if exported symbols are required.
+-always_export_symbols=$always_export_symbols
++# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
+ 
+-# The commands to list exported symbols.
+-export_symbols_cmds=$lt_export_symbols_cmds
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
+ 
+-# The commands to extract the exported symbol list from a shared archive.
+-extract_expsyms_cmds=$lt_extract_expsyms_cmds
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
+ 
+-# Symbols that should not be listed in the preloaded symbols.
+-exclude_expsyms=$lt_exclude_expsyms
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
+ 
+-# Symbols that must always be exported.
+-include_expsyms=$lt_include_expsyms
++# serial 7
+ 
+-# ### END LIBTOOL CONFIG
++# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
++AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+ 
+-__EOF__
++# Do all the work for Automake.                            -*- Autoconf -*-
+ 
+-  case $host_os in
+-  aix3*)
+-    cat <<\EOF >> "${ofile}T"
++# This macro actually does too much some checks are only needed if
++# your package does certain things.  But this isn't really a big deal.
+ 
+-# AIX sometimes has problems with the GCC collect2 program.  For some
+-# reason, if we set the COLLECT_NAMES environment variable, the problems
+-# vanish in a puff of smoke.
+-if test "X${COLLECT_NAMES+set}" != Xset; then
+-  COLLECT_NAMES=
+-  export COLLECT_NAMES
+-fi
+-EOF
+-    ;;
+-  esac
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
++# Free Software Foundation, Inc.
+ 
+-  case $host_os in
+-  cygwin* | mingw* | pw32* | os2*)
+-    cat <<'EOF' >> "${ofile}T"
+-      # This is a source program that is used to create dlls on Windows
+-      # Don't remove nor modify the starting and closing comments
+-# /* ltdll.c starts here */
+-# #define WIN32_LEAN_AND_MEAN
+-# #include <windows.h>
+-# #undef WIN32_LEAN_AND_MEAN
+-# #include <stdio.h>
+-#
+-# #ifndef __CYGWIN__
+-# #  ifdef __CYGWIN32__
+-# #    define __CYGWIN__ __CYGWIN32__
+-# #  endif
+-# #endif
+-#
+-# #ifdef __cplusplus
+-# extern "C" {
+-# #endif
+-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
+-# #ifdef __cplusplus
+-# }
+-# #endif
+-#
+-# #ifdef __CYGWIN__
+-# #include <cygwin/cygwin_dll.h>
+-# DECLARE_CYGWIN_DLL( DllMain );
+-# #endif
+-# HINSTANCE __hDllInstance_base;
+-#
+-# BOOL APIENTRY
+-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
+-# {
+-#   __hDllInstance_base = hInst;
+-#   return TRUE;
+-# }
+-# /* ltdll.c ends here */
+-	# This is a source program that is used to create import libraries
+-	# on Windows for dlls which lack them. Don't remove nor modify the
+-	# starting and closing comments
+-# /* impgen.c starts here */
+-# /*   Copyright (C) 1999-2000 Free Software Foundation, Inc.
+-#
+-#  This file is part of GNU libtool.
+-#
+-#  This program is free software; you can redistribute it and/or modify
+-#  it under the terms of the GNU General Public License as published by
+-#  the Free Software Foundation; either version 2 of the License, or
+-#  (at your option) any later version.
+-#
+-#  This program is distributed in the hope that it will be useful,
+-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#  GNU General Public License for more details.
+-#
+-#  You should have received a copy of the GNU General Public License
+-#  along with this program; if not, write to the Free Software
+-#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-#  */
+-#
+-# #include <stdio.h>		/* for printf() */
+-# #include <unistd.h>		/* for open(), lseek(), read() */
+-# #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
+-# #include <string.h>		/* for strdup() */
+-#
+-# /* O_BINARY isn't required (or even defined sometimes) under Unix */
+-# #ifndef O_BINARY
+-# #define O_BINARY 0
+-# #endif
+-#
+-# static unsigned int
+-# pe_get16 (fd, offset)
+-#      int fd;
+-#      int offset;
+-# {
+-#   unsigned char b[2];
+-#   lseek (fd, offset, SEEK_SET);
+-#   read (fd, b, 2);
+-#   return b[0] + (b[1]<<8);
+-# }
+-#
+-# static unsigned int
+-# pe_get32 (fd, offset)
+-#     int fd;
+-#     int offset;
+-# {
+-#   unsigned char b[4];
+-#   lseek (fd, offset, SEEK_SET);
+-#   read (fd, b, 4);
+-#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
+-# }
+-#
+-# static unsigned int
+-# pe_as32 (ptr)
+-#      void *ptr;
+-# {
+-#   unsigned char *b = ptr;
+-#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
+-# }
+-#
+-# int
+-# main (argc, argv)
+-#     int argc;
+-#     char *argv[];
+-# {
+-#     int dll;
+-#     unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
+-#     unsigned long export_rva, export_size, nsections, secptr, expptr;
+-#     unsigned long name_rvas, nexp;
+-#     unsigned char *expdata, *erva;
+-#     char *filename, *dll_name;
+-#
+-#     filename = argv[1];
+-#
+-#     dll = open(filename, O_RDONLY|O_BINARY);
+-#     if (dll < 1)
+-# 	return 1;
+-#
+-#     dll_name = filename;
+-#
+-#     for (i=0; filename[i]; i++)
+-# 	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
+-# 	    dll_name = filename + i +1;
+-#
+-#     pe_header_offset = pe_get32 (dll, 0x3c);
+-#     opthdr_ofs = pe_header_offset + 4 + 20;
+-#     num_entries = pe_get32 (dll, opthdr_ofs + 92);
+-#
+-#     if (num_entries < 1) /* no exports */
+-# 	return 1;
+-#
+-#     export_rva = pe_get32 (dll, opthdr_ofs + 96);
+-#     export_size = pe_get32 (dll, opthdr_ofs + 100);
+-#     nsections = pe_get16 (dll, pe_header_offset + 4 +2);
+-#     secptr = (pe_header_offset + 4 + 20 +
+-# 	      pe_get16 (dll, pe_header_offset + 4 + 16));
+-#
+-#     expptr = 0;
+-#     for (i = 0; i < nsections; i++)
+-#     {
+-# 	char sname[8];
+-# 	unsigned long secptr1 = secptr + 40 * i;
+-# 	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
+-# 	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
+-# 	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
+-# 	lseek(dll, secptr1, SEEK_SET);
+-# 	read(dll, sname, 8);
+-# 	if (vaddr <= export_rva && vaddr+vsize > export_rva)
+-# 	{
+-# 	    expptr = fptr + (export_rva - vaddr);
+-# 	    if (export_rva + export_size > vaddr + vsize)
+-# 		export_size = vsize - (export_rva - vaddr);
+-# 	    break;
+-# 	}
+-#     }
+-#
+-#     expdata = (unsigned char*)malloc(export_size);
+-#     lseek (dll, expptr, SEEK_SET);
+-#     read (dll, expdata, export_size);
+-#     erva = expdata - export_rva;
+-#
+-#     nexp = pe_as32 (expdata+24);
+-#     name_rvas = pe_as32 (expdata+32);
+-#
+-#     printf ("EXPORTS\n");
+-#     for (i = 0; i<nexp; i++)
+-#     {
+-# 	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
+-# 	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
+-#     }
+-#
+-#     return 0;
+-# }
+-# /* impgen.c ends here */
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
+ 
+-EOF
+-    ;;
+-  esac
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
+ 
+-  # We use sed instead of cat because bash on DJGPP gets confused if
+-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+-  # text mode, it properly converts lines to CR/LF.  This bash problem
+-  # is reportedly fixed, but why not run on old versions too?
+-  sed '$q' "$ltmain" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1)
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
+ 
+-  mv -f "${ofile}T" "$ofile" || \
+-    (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T")
+-  chmod +x "$ofile"
++# serial 11
++
++# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
++# AM_INIT_AUTOMAKE([OPTIONS])
++# -----------------------------------------------
++# The call with PACKAGE and VERSION arguments is the old style
++# call (pre autoconf-2.50), which is being phased out.  PACKAGE
++# and VERSION should now be passed to AC_INIT and removed from
++# the call to AM_INIT_AUTOMAKE.
++# We support both call styles for the transition.  After
++# the next Automake release, Autoconf can make the AC_INIT
++# 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
++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])
+ fi
+ 
+-])# _LT_AC_LTCONFIG_HACK
++# test whether we have cygpath
++if test -z "$CYGPATH_W"; then
++  if (cygpath --version) >/dev/null 2>/dev/null; then
++    CYGPATH_W='cygpath -w'
++  else
++    CYGPATH_W=echo
++  fi
++fi
++AC_SUBST([CYGPATH_W])
+ 
+-# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
+-AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
++# Define the identity of the package.
++dnl Distinguish between old-style and new-style calls.
++m4_ifval([$2],
++[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
++ AC_SUBST([PACKAGE], [$1])dnl
++ AC_SUBST([VERSION], [$2])],
++[_AM_SET_OPTIONS([$1])dnl
++ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
++ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
++
++_AM_IF_OPTION([no-define],,
++[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
++ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
++
++# Some tools Automake needs.
++AC_REQUIRE([AM_SANITY_CHECK])dnl
++AC_REQUIRE([AC_ARG_PROGRAM])dnl
++AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
++AM_MISSING_PROG(AUTOCONF, autoconf)
++AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
++AM_MISSING_PROG(AUTOHEADER, autoheader)
++AM_MISSING_PROG(MAKEINFO, makeinfo)
++AM_PROG_INSTALL_SH
++AM_PROG_INSTALL_STRIP
++AC_REQUIRE([AM_PROG_MKDIR_P])dnl
++# We need awk for the "check" target.  The system "awk" is bad on
++# some platforms.
++AC_REQUIRE([AC_PROG_AWK])dnl
++AC_REQUIRE([AC_PROG_MAKE_SET])dnl
++AC_REQUIRE([AM_SET_LEADING_DOT])dnl
++_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
++              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
++	      		     [_AM_PROG_TAR([v7])])])
++_AM_IF_OPTION([no-dependencies],,
++[AC_PROVIDE_IFELSE([AC_PROG_CC],
++                  [_AM_DEPENDENCIES(CC)],
++                  [define([AC_PROG_CC],
++                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
++AC_PROVIDE_IFELSE([AC_PROG_CXX],
++                  [_AM_DEPENDENCIES(CXX)],
++                  [define([AC_PROG_CXX],
++                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
++])
++])
+ 
+-# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
+-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
+ 
+-# AC_ENABLE_SHARED - implement the --enable-shared flag
+-# Usage: AC_ENABLE_SHARED[(DEFAULT)]
+-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
+-#   `yes'.
+-AC_DEFUN([AC_ENABLE_SHARED],
+-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE(shared,
+-changequote(<<, >>)dnl
+-<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
+-changequote([, ])dnl
+-[p=${PACKAGE-default}
+-case $enableval in
+-yes) enable_shared=yes ;;
+-no) enable_shared=no ;;
+-*)
+-  enable_shared=no
+-  # Look at the argument we got.  We use all the common list separators.
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+-  for pkg in $enableval; do
+-    if test "X$pkg" = "X$p"; then
+-      enable_shared=yes
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  ;;
+-esac],
+-enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
+-])
++# When config.status generates a header, we must update the stamp-h file.
++# This file resides in the same directory as the config header
++# that is generated.  The stamp files are numbered to have different names.
++
++# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
++# loop where config.status creates the headers, so we can generate
++# our stamp files there.
++AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
++[# Compute $1's index in $config_headers.
++_am_stamp_count=1
++for _am_header in $config_headers :; do
++  case $_am_header in
++    $1 | $1:* )
++      break ;;
++    * )
++      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
++  esac
++done
++echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
+ 
+-# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
+-AC_DEFUN([AC_DISABLE_SHARED],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_SHARED(no)])
++# AM_PROG_INSTALL_SH
++# ------------------
++# Define $install_sh.
+ 
+-# AC_ENABLE_STATIC - implement the --enable-static flag
+-# Usage: AC_ENABLE_STATIC[(DEFAULT)]
+-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
+-#   `yes'.
+-AC_DEFUN([AC_ENABLE_STATIC],
+-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE(static,
+-changequote(<<, >>)dnl
+-<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
+-changequote([, ])dnl
+-[p=${PACKAGE-default}
+-case $enableval in
+-yes) enable_static=yes ;;
+-no) enable_static=no ;;
+-*)
+-  enable_static=no
+-  # Look at the argument we got.  We use all the common list separators.
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+-  for pkg in $enableval; do
+-    if test "X$pkg" = "X$p"; then
+-      enable_static=yes
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  ;;
+-esac],
+-enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
+-])
++# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
+ 
+-# AC_DISABLE_STATIC - set the default static flag to --disable-static
+-AC_DEFUN([AC_DISABLE_STATIC],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_STATIC(no)])
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
+ 
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
+ 
+-# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
+-# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
+-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
+-#   `yes'.
+-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
+-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE(fast-install,
+-changequote(<<, >>)dnl
+-<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
+-changequote([, ])dnl
+-[p=${PACKAGE-default}
+-case $enableval in
+-yes) enable_fast_install=yes ;;
+-no) enable_fast_install=no ;;
+-*)
+-  enable_fast_install=no
+-  # Look at the argument we got.  We use all the common list separators.
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+-  for pkg in $enableval; do
+-    if test "X$pkg" = "X$p"; then
+-      enable_fast_install=yes
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  ;;
+-esac],
+-enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
+-])
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
+ 
+-# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
+-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_FAST_INSTALL(no)])
++AC_DEFUN([AM_PROG_INSTALL_SH],
++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++install_sh=${install_sh-"$am_aux_dir/install-sh"}
++AC_SUBST(install_sh)])
+ 
+-# AC_LIBTOOL_PICMODE - implement the --with-pic flag
+-# Usage: AC_LIBTOOL_PICMODE[(MODE)]
+-#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
+-#   `both'.
+-AC_DEFUN([AC_LIBTOOL_PICMODE],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-pic_mode=ifelse($#,1,$1,default)])
++#                                                          -*- Autoconf -*-
++# Copyright (C) 2003  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
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
+ 
+-# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
+-AC_DEFUN([AC_PATH_TOOL_PREFIX],
+-[AC_MSG_CHECKING([for $1])
+-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+-[case $MAGIC_CMD in
+-  /*)
+-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+-  ;;
+-  ?:/*)
+-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
+-  ;;
+-  *)
+-  ac_save_MAGIC_CMD="$MAGIC_CMD"
+-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+-dnl $ac_dummy forces splitting on constant user-supplied paths.
+-dnl POSIX.2 word splitting is done only on the output of word expansions,
+-dnl not every word.  This closes a longstanding sh security hole.
+-  ac_dummy="ifelse([$2], , $PATH, [$2])"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$1; then
+-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+-      if test -n "$file_magic_test_file"; then
+-	case $deplibs_check_method in
+-	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+-	    egrep "$file_magic_regex" > /dev/null; then
+-	    :
+-	  else
+-	    cat <<EOF 1>&2
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
+ 
+-*** Warning: the command libtool uses to detect shared libraries,
+-*** $file_magic_cmd, produces output that libtool cannot recognize.
+-*** The result is that libtool may fail to recognize shared libraries
+-*** as such.  This will affect the creation of libtool libraries that
+-*** depend on shared libraries, but programs linked with such libtool
+-*** libraries will work regardless of this problem.  Nevertheless, you
+-*** may want to report the problem to your system manager and/or to
+-*** bug-libtool@gnu.org
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
+ 
+-EOF
+-	  fi ;;
+-	esac
+-      fi
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  MAGIC_CMD="$ac_save_MAGIC_CMD"
+-  ;;
+-esac])
+-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+-if test -n "$MAGIC_CMD"; then
+-  AC_MSG_RESULT($MAGIC_CMD)
++# serial 1
++
++# Check whether the underlying file-system supports filenames
++# with a leading dot.  For instance MS-DOS doesn't.
++AC_DEFUN([AM_SET_LEADING_DOT],
++[rm -rf .tst 2>/dev/null
++mkdir .tst 2>/dev/null
++if test -d .tst; then
++  am__leading_dot=.
+ else
+-  AC_MSG_RESULT(no)
++  am__leading_dot=_
+ fi
+-])
++rmdir .tst 2>/dev/null
++AC_SUBST([am__leading_dot])])
+ 
++# Add --enable-maintainer-mode option to configure.
++# From Jim Meyering
+ 
+-# AC_PATH_MAGIC - find a file program which can recognise a shared library
+-AC_DEFUN([AC_PATH_MAGIC],
+-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
+-AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
+-if test -z "$lt_cv_path_MAGIC_CMD"; then
+-  if test -n "$ac_tool_prefix"; then
+-    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
+-  else
+-    MAGIC_CMD=:
+-  fi
+-fi
+-])
++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004
++# 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
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
+ 
+-# AC_PROG_LD - find the path to the GNU or non-GNU linker
+-AC_DEFUN([AC_PROG_LD],
+-[AC_ARG_WITH(gnu-ld,
+-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
+-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+-AC_REQUIRE([AC_PROG_CC])dnl
+-AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+-AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl
+-ac_prog=ld
+-if test "$GCC" = yes; then
+-  # Check if gcc -print-prog-name=ld gives a path.
+-  AC_MSG_CHECKING([for ld used by GCC])
+-  case $host in
+-  *-*-mingw*)
+-    # gcc leaves a trailing carriage return which upsets mingw
+-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+-  *)
+-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+-  esac
+-  case $ac_prog in
+-    # Accept absolute paths.
+-    [[\\/]]* | [[A-Za-z]]:[[\\/]]*)
+-      re_direlt='/[[^/]][[^/]]*/\.\./'
+-      # Canonicalize the path of ld
+-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+-      done
+-      test -z "$LD" && LD="$ac_prog"
+-      ;;
+-  "")
+-    # If it fails, then pretend we aren't using GCC.
+-    ac_prog=ld
+-    ;;
+-  *)
+-    # If it is relative, then search for the first ld in PATH.
+-    with_gnu_ld=unknown
+-    ;;
+-  esac
+-elif test "$with_gnu_ld" = yes; then
+-  AC_MSG_CHECKING([for GNU ld])
+-else
+-  AC_MSG_CHECKING([for non-GNU ld])
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++# serial 3
++
++AC_DEFUN([AM_MAINTAINER_MODE],
++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
++  dnl maintainer-mode is disabled by default
++  AC_ARG_ENABLE(maintainer-mode,
++[  --enable-maintainer-mode  enable make rules and dependencies not useful
++			  (and sometimes confusing) to the casual installer],
++      USE_MAINTAINER_MODE=$enableval,
++      USE_MAINTAINER_MODE=no)
++  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
++  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
++  MAINT=$MAINTAINER_MODE_TRUE
++  AC_SUBST(MAINT)dnl
++]
++)
++
++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
++
++# Check to see how 'make' treats includes.	-*- Autoconf -*-
++
++# Copyright (C) 2001, 2002, 2003 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
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++# serial 2
++
++# AM_MAKE_INCLUDE()
++# -----------------
++# Check to see how make treats includes.
++AC_DEFUN([AM_MAKE_INCLUDE],
++[am_make=${MAKE-make}
++cat > confinc << 'END'
++am__doit:
++	@echo done
++.PHONY: am__doit
++END
++# If we don't find an include directive, just comment out the code.
++AC_MSG_CHECKING([for style of include used by $am_make])
++am__include="#"
++am__quote=
++_am_result=none
++# First try GNU make style include.
++echo "include confinc" > confmf
++# We grep out `Entering directory' and `Leaving directory'
++# messages which can occur if `w' ends up in MAKEFLAGS.
++# In particular we don't look at `^make:' because GNU make might
++# be invoked under some other name (usually "gmake"), in which
++# case it prints its new name instead of `make'.
++if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
++   am__include=include
++   am__quote=
++   _am_result=GNU
+ fi
+-AC_CACHE_VAL(lt_cv_path_LD,
+-[if test -z "$LD"; then
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  for ac_dir in $PATH; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+-      lt_cv_path_LD="$ac_dir/$ac_prog"
+-      # Check to see if the program is GNU ld.  I'd rather use --version,
+-      # but apparently some GNU ld's only accept -v.
+-      # Break only if it was the GNU/non-GNU ld that we prefer.
+-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+-	test "$with_gnu_ld" != no && break
+-      else
+-	test "$with_gnu_ld" != yes && break
+-      fi
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-else
+-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+-fi])
+-LD="$lt_cv_path_LD"
+-if test -n "$LD"; then
+-  AC_MSG_RESULT($LD)
+-else
+-  AC_MSG_RESULT(no)
++# Now try BSD make style include.
++if test "$am__include" = "#"; then
++   echo '.include "confinc"' > confmf
++   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
++      am__include=.include
++      am__quote="\""
++      _am_result=BSD
++   fi
+ fi
+-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+-AC_PROG_LD_GNU
++AC_SUBST([am__include])
++AC_SUBST([am__quote])
++AC_MSG_RESULT([$_am_result])
++rm -f confinc confmf
+ ])
+ 
+-# AC_PROG_LD_GNU -
+-AC_DEFUN([AC_PROG_LD_GNU],
+-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
+-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+-  lt_cv_prog_gnu_ld=yes
+-else
+-  lt_cv_prog_gnu_ld=no
+-fi])
+-with_gnu_ld=$lt_cv_prog_gnu_ld
+-])
++#  -*- Autoconf -*-
+ 
+-# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
+-#   -- PORTME Some linkers may need a different reload flag.
+-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
+-[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
+-[lt_cv_ld_reload_flag='-r'])
+-reload_flag=$lt_cv_ld_reload_flag
+-test -n "$reload_flag" && reload_flag=" $reload_flag"
+-])
+ 
+-# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
+-#  -- PORTME fill in with the dynamic library characteristics
+-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+-[AC_CACHE_CHECK([how to recognise dependant libraries],
+-lt_cv_deplibs_check_method,
+-[lt_cv_file_magic_cmd='$MAGIC_CMD'
+-lt_cv_file_magic_test_file=
+-lt_cv_deplibs_check_method='unknown'
+-# Need to set the preceding variable on all platforms that support
+-# interlibrary dependencies.
+-# 'none' -- dependencies not supported.
+-# `unknown' -- same as none, but documents that we really don't know.
+-# 'pass_all' -- all dependencies passed with no checks.
+-# 'test_compile' -- check by making test program.
+-# 'file_magic [[regex]]' -- check by looking for files in library path
+-# which responds to the $file_magic_cmd with a given egrep regex.
+-# If you have `file' or equivalent on your system and you're not sure
+-# whether `pass_all' will *always* work, you probably want this one.
++# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
+ 
+-case $host_os in
+-aix4* | aix5*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
+ 
+-beos*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++# serial 3
++
++# AM_MISSING_PROG(NAME, PROGRAM)
++# ------------------------------
++AC_DEFUN([AM_MISSING_PROG],
++[AC_REQUIRE([AM_MISSING_HAS_RUN])
++$1=${$1-"${am_missing_run}$2"}
++AC_SUBST($1)])
++
++
++# AM_MISSING_HAS_RUN
++# ------------------
++# Define MISSING if not defined so far and test if it supports --run.
++# 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
++test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
++# Use eval to expand $SHELL
++if eval "$MISSING --run true"; then
++  am_missing_run="$MISSING --run "
++else
++  am_missing_run=
++  AC_MSG_WARN([`missing' script is too old or missing])
++fi
++])
++
++# AM_PROG_MKDIR_P
++# ---------------
++# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
+ 
+-bsdi4*)
+-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+-  lt_cv_file_magic_cmd='/usr/bin/file -L'
+-  lt_cv_file_magic_test_file=/shlib/libc.so
+-  ;;
++# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+ 
+-cygwin* | mingw* | pw32*)
+-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+-  lt_cv_file_magic_cmd='$OBJDUMP -f'
+-  ;;
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
+ 
+-darwin* | rhapsody*)
+-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+-  lt_cv_file_magic_cmd='/usr/bin/file -L'
+-  case "$host_os" in
+-  rhapsody* | darwin1.[[012]])
+-    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
+-    ;;
+-  *) # Darwin 1.3 on
+-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+-    ;;
+-  esac
+-  ;;
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
+ 
+-freebsd*)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+-    case $host_cpu in
+-    i*86 )
+-      # Not sure whether the presence of OpenBSD here was a mistake.
+-      # Let's accept both of them until this is cleared up.
+-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
+-      lt_cv_file_magic_cmd=/usr/bin/file
+-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+-      ;;
+-    esac
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++# 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.)
++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
+-    lt_cv_deplibs_check_method=pass_all
++    mkdir_p='$(install_sh) -d'
+   fi
+-  ;;
++fi
++AC_SUBST([mkdir_p])])
+ 
+-gnu*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
++# Helper functions for option handling.                    -*- Autoconf -*-
+ 
+-hpux10.20*|hpux11*)
+-  lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=/usr/lib/libc.sl
+-  ;;
++# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
+ 
+-irix5* | irix6* | nonstopux*)
+-  case $host_os in
+-  irix5* | nonstopux*)
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
+-    ;;
+-  *)
+-    case $LD in
+-    *-32|*"-32 ") libmagic=32-bit;;
+-    *-n32|*"-n32 ") libmagic=N32;;
+-    *-64|*"-64 ") libmagic=64-bit;;
+-    *) libmagic=never-match;;
+-    esac
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
+-    ;;
+-  esac
+-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
+ 
+-# This must be Linux ELF.
+-linux-gnu*)
+-  lt_cv_deplibs_check_method=pass_all
+-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+-  ;;
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
+ 
+-netbsd*)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+-    lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$'
+-  else
+-    lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so$'
+-  fi
+-  ;;
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
+ 
+-newos6*)
+-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+-  ;;
++# serial 2
+ 
+-openbsd*)
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
+-  else
+-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+-  fi
+-  ;;
++# _AM_MANGLE_OPTION(NAME)
++# -----------------------
++AC_DEFUN([_AM_MANGLE_OPTION],
++[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
++
++# _AM_SET_OPTION(NAME)
++# ------------------------------
++# Set option NAME.  Presently that only means defining a flag for this option.
++AC_DEFUN([_AM_SET_OPTION],
++[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
++
++# _AM_SET_OPTIONS(OPTIONS)
++# ----------------------------------
++# OPTIONS is a space-separated list of Automake options.
++AC_DEFUN([_AM_SET_OPTIONS],
++[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
++
++# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
++# -------------------------------------------
++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
++AC_DEFUN([_AM_IF_OPTION],
++[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+ 
+-osf3* | osf4* | osf5*)
+-  # this will be overridden with pass_all, but let us keep it just in case
+-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
+-  lt_cv_file_magic_test_file=/shlib/libc.so
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
++#
++# Check to make sure that the build environment is sane.
++#
+ 
+-sco3.2v5*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
++# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
+ 
+-solaris*)
+-  lt_cv_deplibs_check_method=pass_all
+-  lt_cv_file_magic_test_file=/lib/libc.so
+-  ;;
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
+ 
+-sysv5uw[[78]]* | sysv4*uw2*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-  case $host_vendor in
+-  motorola)
+-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+-    ;;
+-  ncr)
+-    lt_cv_deplibs_check_method=pass_all
+-    ;;
+-  sequent)
+-    lt_cv_file_magic_cmd='/bin/file'
+-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+-    ;;
+-  sni)
+-    lt_cv_file_magic_cmd='/bin/file'
+-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+-    lt_cv_file_magic_test_file=/lib/libc.so
+-    ;;
+-  esac
+-  ;;
+-esac
+-])
+-file_magic_cmd=$lt_cv_file_magic_cmd
+-deplibs_check_method=$lt_cv_deplibs_check_method
+-])
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
+ 
++# serial 3
+ 
+-# AC_PROG_NM - find the path to a BSD-compatible name lister
+-AC_DEFUN([AC_PROG_NM],
+-[AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl
+-AC_MSG_CHECKING([for BSD-compatible nm])
+-AC_CACHE_VAL(lt_cv_path_NM,
+-[if test -n "$NM"; then
+-  # Let the user override the test.
+-  lt_cv_path_NM="$NM"
++# AM_SANITY_CHECK
++# ---------------
++AC_DEFUN([AM_SANITY_CHECK],
++[AC_MSG_CHECKING([whether build environment is sane])
++# Just in case
++sleep 1
++echo timestamp > conftest.file
++# Do `set' in a subshell so we don't clobber the current shell's
++# arguments.  Must try -L first in case configure is actually a
++# symlink; some systems play weird games with the mod time of symlinks
++# (eg FreeBSD returns the mod time of the symlink's containing
++# directory).
++if (
++   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
++   if test "$[*]" = "X"; then
++      # -L didn't work.
++      set X `ls -t $srcdir/configure conftest.file`
++   fi
++   rm -f conftest.file
++   if test "$[*]" != "X $srcdir/configure conftest.file" \
++      && test "$[*]" != "X conftest.file $srcdir/configure"; then
++
++      # If neither matched, then we have a broken ls.  This can happen
++      # 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".
++      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
++alias in your environment])
++   fi
++
++   test "$[2]" = conftest.file
++   )
++then
++   # Ok.
++   :
+ else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+-    test -z "$ac_dir" && ac_dir=.
+-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
+-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
+-      # Check to see if the nm accepts a BSD-compat flag.
+-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+-      #   nm: unknown option "B" ignored
+-      # Tru64's nm complains that /dev/null is an invalid object file
+-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
+-	lt_cv_path_NM="$tmp_nm -B"
+-	break
+-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+-	lt_cv_path_NM="$tmp_nm -p"
+-	break
+-      else
+-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+-	continue # so that we can try to find one that supports BSD flags
+-      fi
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+-fi])
+-NM="$lt_cv_path_NM"
+-AC_MSG_RESULT([$NM])
+-])
++   AC_MSG_ERROR([newly created file is older than distributed files!
++Check your system clock])
++fi
++AC_MSG_RESULT(yes)])
+ 
+-# AC_CHECK_LIBM - check for math library
+-AC_DEFUN([AC_CHECK_LIBM],
+-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-LIBM=
+-case $host in
+-*-*-beos* | *-*-cygwin* | *-*-pw32*)
+-  # These system don't have libm
+-  ;;
+-*-ncr-sysv4.3*)
+-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+-  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
+-  ;;
+-*)
+-  AC_CHECK_LIB(m, main, LIBM="-lm")
+-  ;;
+-esac
+-])
++# AM_PROG_INSTALL_STRIP
+ 
+-# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
+-# the libltdl convenience library and LTDLINCL to the include flags for
+-# the libltdl header and adds --enable-ltdl-convenience to the
+-# configure arguments.  Note that LIBLTDL and LTDLINCL are not
+-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
+-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
+-# with '${top_builddir}/' and LTDLINCL will be prefixed with
+-# '${top_srcdir}/' (note the single quotes!).  If your package is not
+-# flat and you're not using automake, define top_builddir and
+-# top_srcdir appropriately in the Makefiles.
+-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-  case $enable_ltdl_convenience in
+-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+-  "") enable_ltdl_convenience=yes
+-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
++# Copyright (C) 2001, 2003 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
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++# One issue with vendor `install' (even GNU) is that you can't
++# specify the program used to strip binaries.  This is especially
++# annoying in cross-compiling environments, where the build's strip
++# is unlikely to handle the host's binaries.
++# Fortunately install-sh will honor a STRIPPROG variable, so we
++# always use install-sh in `make install-strip', and initialize
++# STRIPPROG with the value of the STRIP variable (set by the user).
++AC_DEFUN([AM_PROG_INSTALL_STRIP],
++[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
++# Installed binaries are usually stripped using `strip' when the user
++# run `make install-strip'.  However `strip' might not be the right
++# tool to use in cross-compilation environments, therefore Automake
++# will honor the `STRIP' environment variable to overrule this program.
++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"
++AC_SUBST([INSTALL_STRIP_PROGRAM])])
++
++# Check how to create a tarball.                            -*- Autoconf -*-
++
++# Copyright (C) 2004  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
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++# serial 1
++
++
++# _AM_PROG_TAR(FORMAT)
++# --------------------
++# Check how to create a tarball in format FORMAT.
++# FORMAT should be one of `v7', `ustar', or `pax'.
++#
++# Substitute a variable $(am__tar) that is a command
++# writing to stdout a FORMAT-tarball containing the directory
++# $tardir.
++#     tardir=directory && $(am__tar) > result.tar
++#
++# Substitute a variable $(am__untar) that extract such
++# a tarball read from stdin.
++#     $(am__untar) < result.tar
++AC_DEFUN([_AM_PROG_TAR],
++[# Always define AMTAR for backward compatibility.
++AM_MISSING_PROG([AMTAR], [tar])
++m4_if([$1], [v7],
++     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
++     [m4_case([$1], [ustar],, [pax],,
++              [m4_fatal([Unknown tar format])])
++AC_MSG_CHECKING([how to create a $1 tar archive])
++# Loop over all known methods to create a tar archive until one works.
++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
++_am_tools=${am_cv_prog_tar_$1-$_am_tools}
++# Do not fold the above two line into one, because Tru64 sh and
++# Solaris sh will not grok spaces in the rhs of `-'.
++for _am_tool in $_am_tools
++do
++  case $_am_tool in
++  gnutar)
++    for _am_tar in tar gnutar gtar;
++    do
++      AM_RUN_LOG([$_am_tar --version]) && break
++    done
++    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
++    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
++    am__untar="$_am_tar -xf -"
++    ;;
++  plaintar)
++    # Must skip GNU tar: if it does not support --format= it doesn't create
++    # ustar tarball either.
++    (tar --version) >/dev/null 2>&1 && continue
++    am__tar='tar chf - "$$tardir"'
++    am__tar_='tar chf - "$tardir"'
++    am__untar='tar xf -'
++    ;;
++  pax)
++    am__tar='pax -L -x $1 -w "$$tardir"'
++    am__tar_='pax -L -x $1 -w "$tardir"'
++    am__untar='pax -r'
++    ;;
++  cpio)
++    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
++    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
++    am__untar='cpio -i -H $1 -d'
++    ;;
++  none)
++    am__tar=false
++    am__tar_=false
++    am__untar=false
++    ;;
+   esac
+-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
+-  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+-  # For backwards non-gettext consistent compatibility...
+-  INCLTDL="$LTDLINCL"
+-])
+ 
+-# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
+-# the libltdl installable library and LTDLINCL to the include flags for
+-# the libltdl header and adds --enable-ltdl-install to the configure
+-# arguments.  Note that LIBLTDL and LTDLINCL are not AC_SUBSTed, nor is
+-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
+-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
+-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed
+-# with '${top_srcdir}/' (note the single quotes!).  If your package is
+-# not flat and you're not using automake, define top_builddir and
+-# top_srcdir appropriately in the Makefiles.
+-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-  AC_CHECK_LIB(ltdl, main,
+-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+-  [if test x"$enable_ltdl_install" = xno; then
+-     AC_MSG_WARN([libltdl not installed, but installation disabled])
+-   else
+-     enable_ltdl_install=yes
+-   fi
+-  ])
+-  if test x"$enable_ltdl_install" = x"yes"; then
+-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
+-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
+-    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+-  else
+-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+-    LIBLTDL="-lltdl"
+-    LTDLINCL=
++  # If the value was cached, stop now.  We just wanted to have am__tar
++  # and am__untar set.
++  test -n "${am_cv_prog_tar_$1}" && break
++
++  # tar/untar a dummy directory, and stop if the command works
++  rm -rf conftest.dir
++  mkdir conftest.dir
++  echo GrepMe > conftest.dir/file
++  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
++  rm -rf conftest.dir
++  if test -s conftest.tar; then
++    AM_RUN_LOG([$am__untar <conftest.tar])
++    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+   fi
+-  # For backwards non-gettext consistent compatibility...
+-  INCLTDL="$LTDLINCL"
+-])
+-
+-# old names
+-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
+-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
+-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
+-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
+-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
++done
++rm -rf conftest.dir
+ 
+-# This is just to silence aclocal about the macro not being used
+-ifelse([AC_DISABLE_FAST_INSTALL])
++AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
++AC_MSG_RESULT([$am_cv_prog_tar_$1])])
++AC_SUBST([am__tar])
++AC_SUBST([am__untar])
++]) # _AM_PROG_TAR
+ 
++m4_include([acinclude.m4])
+diff -uNr a52dec-0.7.4-orig/autom4te.cache/output.0 a52dec-0.7.4/autom4te.cache/output.0
+--- a52dec-0.7.4-orig/autom4te.cache/output.0	1970-01-01 10:00:00.000000000 +1000
++++ a52dec-0.7.4/autom4te.cache/output.0	2005-02-06 16:25:42.424419048 +1100
+@@ -0,0 +1,24000 @@
++@%:@! /bin/sh
++@%:@ Guess values for system-dependent variables and create Makefiles.
++@%:@ Generated by GNU Autoconf 2.59.
++@%:@ 
++@%:@ Copyright (C) 2003 Free Software Foundation, Inc.
++@%:@ This configure script is free software; the Free Software Foundation
++@%:@ gives unlimited permission to copy, distribute and modify it.
++## --------------------- ##
++## M4sh Initialization.  ##
++## --------------------- ##
++
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
++elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
++  set -o posix
++fi
++DUALCASE=1; export DUALCASE # for MKS sh
++
++# Support unset when possible.
++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
++  as_unset=unset
++else
++  as_unset=false
++fi
++
++
++# Work around bugs in pre-3.0 UWIN ksh.
++$as_unset ENV MAIL MAILPATH
++PS1='$ '
++PS2='> '
++PS4='+ '
++
++# NLS nuisances.
++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
++  fi
++done
++
++# Required to use basename.
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
++
++if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++  as_basename=basename
++else
++  as_basename=false
++fi
++
++
++# Name of the executable.
++as_me=`$as_basename "$0" ||
++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
++	 X"$0" : 'X\(//\)$' \| \
++	 X"$0" : 'X\(/\)$' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X/"$0" |
++    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
++  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\/\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++
++
++# PATH needs CR, and LINENO needs CR and PATH.
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
++
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++  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
++
++
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
++  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
++  # Find who we are.  Look in the path if we contain no path at all
++  # relative or not.
++  case $0 in
++    *[\\/]* ) as_myself=$0 ;;
++    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++done
++
++       ;;
++  esac
++  # We did not find ourselves, most probably we were run as `sh COMMAND'
++  # in which case we are not to be found in the path.
++  if test "x$as_myself" = x; then
++    as_myself=$0
++  fi
++  if test ! -f "$as_myself"; then
++    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
++   { (exit 1); exit 1; }; }
++  fi
++  case $CONFIG_SHELL in
++  '')
++    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for as_base in sh bash ksh sh5; do
++	 case $as_dir in
++	 /*)
++	   if ("$as_dir/$as_base" -c '
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
++  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
++	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
++	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
++	     CONFIG_SHELL=$as_dir/$as_base
++	     export CONFIG_SHELL
++	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
++	   fi;;
++	 esac
++       done
++done
++;;
++  esac
++
++  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
++  # uniformly replaced by the line number.  The first 'sed' inserts a
++  # line-number line before each line; the second 'sed' does the real
++  # work.  The second script uses 'N' to pair each line-number line
++  # with the numbered line, and appends trailing '-' during
++  # substitution so that $LINENO is not a special case at line end.
++  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
++  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
++  sed '=' <$as_myself |
++    sed '
++      N
++      s,$,-,
++      : loop
++      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
++      t loop
++      s,-$,,
++      s,^['$as_cr_digits']*\n,,
++    ' >$as_me.lineno &&
++  chmod +x $as_me.lineno ||
++    { 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
++  # (the dirname of $[0] is not the place where we might find the
++  # original and so on.  Autoconf is especially sensible to this).
++  . ./$as_me.lineno
++  # Exit status is that of the last command.
++  exit
++}
++
++
++case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
++  *c*,-n*) ECHO_N= ECHO_C='
++' ECHO_T='	' ;;
++  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
++  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
++esac
++
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
++
++rm -f conf$$ conf$$.exe conf$$.file
++echo >conf$$.file
++if ln -s conf$$.file conf$$ 2>/dev/null; then
++  # We could just check for DJGPP; but this test a) works b) is more generic
++  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
++  if test -f conf$$.exe; then
++    # Don't use ln at all; we don't have any links
++    as_ln_s='cp -p'
++  else
++    as_ln_s='ln -s'
++  fi
++elif ln conf$$.file conf$$ 2>/dev/null; then
++  as_ln_s=ln
++else
++  as_ln_s='cp -p'
++fi
++rm -f conf$$ conf$$.exe conf$$.file
++
++if mkdir -p . 2>/dev/null; then
++  as_mkdir_p=:
++else
++  test -d ./-p && rmdir ./-p
++  as_mkdir_p=false
++fi
++
++as_executable_p="test -f"
++
++# Sed expression to map a string onto a valid CPP name.
++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
++
++# Sed expression to map a string onto a valid variable name.
++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
++
++
++# IFS
++# We need space, tab and new line, in precisely that order.
++as_nl='
++'
++IFS=" 	$as_nl"
++
++# CDPATH.
++$as_unset CDPATH
++
++
++
++# Check that we are running under the correct shell.
++SHELL=${CONFIG_SHELL-/bin/sh}
++
++case X$ECHO in
++X*--fallback-echo)
++  # Remove one level of quotation (which was required for Make).
++  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
++  ;;
++esac
++
++echo=${ECHO-echo}
++if test "X$1" = X--no-reexec; then
++  # Discard the --no-reexec flag, and continue.
++  shift
++elif test "X$1" = X--fallback-echo; then
++  # Avoid inline document here, it may be left over
++  :
++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
++  # Yippee, $echo works!
++  :
++else
++  # Restart under the correct shell.
++  exec $SHELL "$0" --no-reexec ${1+"$@"}
++fi
++
++if test "X$1" = X--fallback-echo; then
++  # used as fallback echo
++  shift
++  cat <<EOF
++$*
++EOF
++  exit 0
++fi
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++
++if test -z "$ECHO"; then
++if test "X${echo_test_string+set}" != Xset; then
++# find a string as large as possible, as long as the shell can cope with it
++  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
++    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
++    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
++       echo_test_string="`eval $cmd`" &&
++       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
++    then
++      break
++    fi
++  done
++fi
++
++if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++   test "X$echo_testing_string" = "X$echo_test_string"; then
++  :
++else
++  # The Solaris, AIX, and Digital Unix default echo programs unquote
++  # backslashes.  This makes it impossible to quote backslashes using
++  #   echo "$something" | sed 's/\\/\\\\/g'
++  #
++  # So, first we look for a working echo in the user's PATH.
++
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for dir in $PATH /usr/ucb; do
++    IFS="$lt_save_ifs"
++    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
++       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
++       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
++       test "X$echo_testing_string" = "X$echo_test_string"; then
++      echo="$dir/echo"
++      break
++    fi
++  done
++  IFS="$lt_save_ifs"
++
++  if test "X$echo" = Xecho; then
++    # We didn't find a better echo, so look for alternatives.
++    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
++       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
++       test "X$echo_testing_string" = "X$echo_test_string"; then
++      # This shell has a builtin print -r that does the trick.
++      echo='print -r'
++    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
++	 test "X$CONFIG_SHELL" != X/bin/ksh; then
++      # If we have ksh, try running configure again with it.
++      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
++      export ORIGINAL_CONFIG_SHELL
++      CONFIG_SHELL=/bin/ksh
++      export CONFIG_SHELL
++      exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
++    else
++      # Try using printf.
++      echo='printf %s\n'
++      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++	 test "X$echo_testing_string" = "X$echo_test_string"; then
++	# Cool, printf works
++	:
++      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
++	   test "X$echo_testing_string" = 'X\t' &&
++	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
++	export CONFIG_SHELL
++	SHELL="$CONFIG_SHELL"
++	export SHELL
++	echo="$CONFIG_SHELL $0 --fallback-echo"
++      elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
++	   test "X$echo_testing_string" = 'X\t' &&
++	   echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	echo="$CONFIG_SHELL $0 --fallback-echo"
++      else
++	# maybe with a smaller string...
++	prev=:
++
++	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
++	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
++	  then
++	    break
++	  fi
++	  prev="$cmd"
++	done
++
++	if test "$prev" != 'sed 50q "$0"'; then
++	  echo_test_string=`eval $prev`
++	  export echo_test_string
++	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
++	else
++	  # Oops.  We lost completely, so just stick with echo.
++	  echo=echo
++	fi
++      fi
++    fi
++  fi
++fi
++fi
++
++# Copy echo and quote the copy suitably for passing to libtool from
++# the Makefile, instead of quoting the original, which is used later.
++ECHO=$echo
++if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
++   ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
++fi
++
++
++
++
++tagnames=${tagnames+${tagnames},}CXX
++
++tagnames=${tagnames+${tagnames},}F77
++
++# Name of the host.
++# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
++# so uname gets run too.
++ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
++
++exec 6>&1
++
++#
++# Initializations.
++#
++ac_default_prefix=/usr/local
++ac_config_libobj_dir=.
++cross_compiling=no
++subdirs=
++MFLAGS=
++MAKEFLAGS=
++SHELL=${CONFIG_SHELL-/bin/sh}
++
++# Maximum number of lines to put in a shell here document.
++# This variable seems obsolete.  It should probably be removed, and
++# only ac_max_sed_lines should be used.
++: ${ac_max_here_lines=38}
++
++# Identity of this package.
++PACKAGE_NAME=
++PACKAGE_TARNAME=
++PACKAGE_VERSION=
++PACKAGE_STRING=
++PACKAGE_BUGREPORT=
++
++ac_unique_file="src/a52dec.c"
++# Factoring default headers for most tests.
++ac_includes_default="\
++#include <stdio.h>
++#if HAVE_SYS_TYPES_H
++# include <sys/types.h>
++#endif
++#if HAVE_SYS_STAT_H
++# include <sys/stat.h>
++#endif
++#if STDC_HEADERS
++# include <stdlib.h>
++# include <stddef.h>
++#else
++# if HAVE_STDLIB_H
++#  include <stdlib.h>
++# endif
++#endif
++#if HAVE_STRING_H
++# if !STDC_HEADERS && HAVE_MEMORY_H
++#  include <memory.h>
++# endif
++# include <string.h>
++#endif
++#if HAVE_STRINGS_H
++# include <strings.h>
++#endif
++#if HAVE_INTTYPES_H
++# include <inttypes.h>
++#else
++# if HAVE_STDINT_H
++#  include <stdint.h>
++# endif
++#endif
++#if HAVE_UNISTD_H
++# include <unistd.h>
++#endif"
++
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INCLUDES LIBA52_CFLAGS LIBA52_LIBS LIBAO_LIBS A52DEC_CFLAGS LIB@&t@OBJS LTLIBOBJS'
++ac_subst_files=''
++
++# Initialize some variables set by options.
++ac_init_help=
++ac_init_version=false
++# The variables have the same names as the options, with
++# dashes changed to underlines.
++cache_file=/dev/null
++exec_prefix=NONE
++no_create=
++no_recursion=
++prefix=NONE
++program_prefix=NONE
++program_suffix=NONE
++program_transform_name=s,x,x,
++silent=
++site=
++srcdir=
++verbose=
++x_includes=NONE
++x_libraries=NONE
++
++# Installation directory options.
++# These are left unexpanded so users can "make install exec_prefix=/foo"
++# and all the variables that are supposed to be based on exec_prefix
++# by default will actually change.
++# Use braces instead of parens because sh, perl, etc. also accept them.
++bindir='${exec_prefix}/bin'
++sbindir='${exec_prefix}/sbin'
++libexecdir='${exec_prefix}/libexec'
++datadir='${prefix}/share'
++sysconfdir='${prefix}/etc'
++sharedstatedir='${prefix}/com'
++localstatedir='${prefix}/var'
++libdir='${exec_prefix}/lib'
++includedir='${prefix}/include'
++oldincludedir='/usr/include'
++infodir='${prefix}/info'
++mandir='${prefix}/man'
++
++ac_prev=
++for ac_option
++do
++  # If the previous option needs an argument, assign it.
++  if test -n "$ac_prev"; then
++    eval "$ac_prev=\$ac_option"
++    ac_prev=
++    continue
++  fi
++
++  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
++
++  # Accept the important Cygnus configure options, so we can diagnose typos.
++
++  case $ac_option in
++
++  -bindir | --bindir | --bindi | --bind | --bin | --bi)
++    ac_prev=bindir ;;
++  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
++    bindir=$ac_optarg ;;
++
++  -build | --build | --buil | --bui | --bu)
++    ac_prev=build_alias ;;
++  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
++    build_alias=$ac_optarg ;;
++
++  -cache-file | --cache-file | --cache-fil | --cache-fi \
++  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
++    ac_prev=cache_file ;;
++  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
++  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
++    cache_file=$ac_optarg ;;
++
++  --config-cache | -C)
++    cache_file=config.cache ;;
++
++  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
++    ac_prev=datadir ;;
++  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
++  | --da=*)
++    datadir=$ac_optarg ;;
++
++  -disable-* | --disable-*)
++    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
++    # Reject names that are not valid shell variable names.
++    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
++   { (exit 1); exit 1; }; }
++    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
++    eval "enable_$ac_feature=no" ;;
++
++  -enable-* | --enable-*)
++    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
++    # Reject names that are not valid shell variable names.
++    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
++   { (exit 1); exit 1; }; }
++    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
++    case $ac_option in
++      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
++      *) ac_optarg=yes ;;
++    esac
++    eval "enable_$ac_feature='$ac_optarg'" ;;
++
++  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
++  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
++  | --exec | --exe | --ex)
++    ac_prev=exec_prefix ;;
++  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
++  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
++  | --exec=* | --exe=* | --ex=*)
++    exec_prefix=$ac_optarg ;;
++
++  -gas | --gas | --ga | --g)
++    # Obsolete; use --with-gas.
++    with_gas=yes ;;
++
++  -help | --help | --hel | --he | -h)
++    ac_init_help=long ;;
++  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
++    ac_init_help=recursive ;;
++  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
++    ac_init_help=short ;;
++
++  -host | --host | --hos | --ho)
++    ac_prev=host_alias ;;
++  -host=* | --host=* | --hos=* | --ho=*)
++    host_alias=$ac_optarg ;;
++
++  -includedir | --includedir | --includedi | --included | --include \
++  | --includ | --inclu | --incl | --inc)
++    ac_prev=includedir ;;
++  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
++  | --includ=* | --inclu=* | --incl=* | --inc=*)
++    includedir=$ac_optarg ;;
++
++  -infodir | --infodir | --infodi | --infod | --info | --inf)
++    ac_prev=infodir ;;
++  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
++    infodir=$ac_optarg ;;
++
++  -libdir | --libdir | --libdi | --libd)
++    ac_prev=libdir ;;
++  -libdir=* | --libdir=* | --libdi=* | --libd=*)
++    libdir=$ac_optarg ;;
++
++  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
++  | --libexe | --libex | --libe)
++    ac_prev=libexecdir ;;
++  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
++  | --libexe=* | --libex=* | --libe=*)
++    libexecdir=$ac_optarg ;;
++
++  -localstatedir | --localstatedir | --localstatedi | --localstated \
++  | --localstate | --localstat | --localsta | --localst \
++  | --locals | --local | --loca | --loc | --lo)
++    ac_prev=localstatedir ;;
++  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
++  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
++  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
++    localstatedir=$ac_optarg ;;
++
++  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
++    ac_prev=mandir ;;
++  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
++    mandir=$ac_optarg ;;
++
++  -nfp | --nfp | --nf)
++    # Obsolete; use --without-fp.
++    with_fp=no ;;
++
++  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
++  | --no-cr | --no-c | -n)
++    no_create=yes ;;
++
++  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
++  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
++    no_recursion=yes ;;
++
++  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
++  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
++  | --oldin | --oldi | --old | --ol | --o)
++    ac_prev=oldincludedir ;;
++  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
++  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
++  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
++    oldincludedir=$ac_optarg ;;
++
++  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
++    ac_prev=prefix ;;
++  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
++    prefix=$ac_optarg ;;
++
++  -program-prefix | --program-prefix | --program-prefi | --program-pref \
++  | --program-pre | --program-pr | --program-p)
++    ac_prev=program_prefix ;;
++  -program-prefix=* | --program-prefix=* | --program-prefi=* \
++  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
++    program_prefix=$ac_optarg ;;
++
++  -program-suffix | --program-suffix | --program-suffi | --program-suff \
++  | --program-suf | --program-su | --program-s)
++    ac_prev=program_suffix ;;
++  -program-suffix=* | --program-suffix=* | --program-suffi=* \
++  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
++    program_suffix=$ac_optarg ;;
++
++  -program-transform-name | --program-transform-name \
++  | --program-transform-nam | --program-transform-na \
++  | --program-transform-n | --program-transform- \
++  | --program-transform | --program-transfor \
++  | --program-transfo | --program-transf \
++  | --program-trans | --program-tran \
++  | --progr-tra | --program-tr | --program-t)
++    ac_prev=program_transform_name ;;
++  -program-transform-name=* | --program-transform-name=* \
++  | --program-transform-nam=* | --program-transform-na=* \
++  | --program-transform-n=* | --program-transform-=* \
++  | --program-transform=* | --program-transfor=* \
++  | --program-transfo=* | --program-transf=* \
++  | --program-trans=* | --program-tran=* \
++  | --progr-tra=* | --program-tr=* | --program-t=*)
++    program_transform_name=$ac_optarg ;;
++
++  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
++  | -silent | --silent | --silen | --sile | --sil)
++    silent=yes ;;
++
++  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
++    ac_prev=sbindir ;;
++  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
++  | --sbi=* | --sb=*)
++    sbindir=$ac_optarg ;;
++
++  -sharedstatedir | --sharedstatedir | --sharedstatedi \
++  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
++  | --sharedst | --shareds | --shared | --share | --shar \
++  | --sha | --sh)
++    ac_prev=sharedstatedir ;;
++  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
++  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
++  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
++  | --sha=* | --sh=*)
++    sharedstatedir=$ac_optarg ;;
++
++  -site | --site | --sit)
++    ac_prev=site ;;
++  -site=* | --site=* | --sit=*)
++    site=$ac_optarg ;;
++
++  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
++    ac_prev=srcdir ;;
++  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
++    srcdir=$ac_optarg ;;
++
++  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
++  | --syscon | --sysco | --sysc | --sys | --sy)
++    ac_prev=sysconfdir ;;
++  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
++  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
++    sysconfdir=$ac_optarg ;;
++
++  -target | --target | --targe | --targ | --tar | --ta | --t)
++    ac_prev=target_alias ;;
++  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
++    target_alias=$ac_optarg ;;
++
++  -v | -verbose | --verbose | --verbos | --verbo | --verb)
++    verbose=yes ;;
++
++  -version | --version | --versio | --versi | --vers | -V)
++    ac_init_version=: ;;
++
++  -with-* | --with-*)
++    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
++    # Reject names that are not valid shell variable names.
++    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid package name: $ac_package" >&2
++   { (exit 1); exit 1; }; }
++    ac_package=`echo $ac_package| sed 's/-/_/g'`
++    case $ac_option in
++      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
++      *) ac_optarg=yes ;;
++    esac
++    eval "with_$ac_package='$ac_optarg'" ;;
++
++  -without-* | --without-*)
++    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
++    # Reject names that are not valid shell variable names.
++    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid package name: $ac_package" >&2
++   { (exit 1); exit 1; }; }
++    ac_package=`echo $ac_package | sed 's/-/_/g'`
++    eval "with_$ac_package=no" ;;
++
++  --x)
++    # Obsolete; use --with-x.
++    with_x=yes ;;
++
++  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
++  | --x-incl | --x-inc | --x-in | --x-i)
++    ac_prev=x_includes ;;
++  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
++  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
++    x_includes=$ac_optarg ;;
++
++  -x-libraries | --x-libraries | --x-librarie | --x-librari \
++  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
++    ac_prev=x_libraries ;;
++  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
++  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
++    x_libraries=$ac_optarg ;;
++
++  -*) { echo "$as_me: error: unrecognized option: $ac_option
++Try \`$0 --help' for more information." >&2
++   { (exit 1); exit 1; }; }
++    ;;
++
++  *=*)
++    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 &&
++      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
++   { (exit 1); exit 1; }; }
++    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
++    eval "$ac_envvar='$ac_optarg'"
++    export $ac_envvar ;;
++
++  *)
++    # FIXME: should be removed in autoconf 3.0.
++    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
++    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
++      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
++    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
++    ;;
++
++  esac
++done
++
++if test -n "$ac_prev"; then
++  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
++  { echo "$as_me: error: missing argument to $ac_option" >&2
++   { (exit 1); exit 1; }; }
++fi
++
++# Be sure to have absolute paths.
++for ac_var in exec_prefix prefix
++do
++  eval ac_val=$`echo $ac_var`
++  case $ac_val in
++    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
++    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
++   { (exit 1); exit 1; }; };;
++  esac
++done
++
++# Be sure to have absolute paths.
++for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
++	      localstatedir libdir includedir oldincludedir infodir mandir
++do
++  eval ac_val=$`echo $ac_var`
++  case $ac_val in
++    [\\/$]* | ?:[\\/]* ) ;;
++    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
++   { (exit 1); exit 1; }; };;
++  esac
++done
++
++# There might be people who depend on the old broken behavior: `$host'
++# used to hold the argument of --host etc.
++# FIXME: To remove some day.
++build=$build_alias
++host=$host_alias
++target=$target_alias
++
++# FIXME: To remove some day.
++if test "x$host_alias" != x; then
++  if test "x$build_alias" = x; then
++    cross_compiling=maybe
++    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
++  fi
++fi
++
++ac_tool_prefix=
++test -n "$host_alias" && ac_tool_prefix=$host_alias-
++
++test "$silent" = yes && exec 6>/dev/null
++
++
++# Find the source files, if location was not specified.
++if test -z "$srcdir"; then
++  ac_srcdir_defaulted=yes
++  # Try the directory containing this script, then its parent.
++  ac_confdir=`(dirname "$0") 2>/dev/null ||
++$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; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++  srcdir=$ac_confdir
++  if test ! -r $srcdir/$ac_unique_file; then
++    srcdir=..
++  fi
++else
++  ac_srcdir_defaulted=no
++fi
++if test ! -r $srcdir/$ac_unique_file; then
++  if test "$ac_srcdir_defaulted" = yes; then
++    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
++   { (exit 1); exit 1; }; }
++  else
++    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
++   { (exit 1); exit 1; }; }
++  fi
++fi
++(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
++  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
++   { (exit 1); exit 1; }; }
++srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
++ac_env_build_alias_set=${build_alias+set}
++ac_env_build_alias_value=$build_alias
++ac_cv_env_build_alias_set=${build_alias+set}
++ac_cv_env_build_alias_value=$build_alias
++ac_env_host_alias_set=${host_alias+set}
++ac_env_host_alias_value=$host_alias
++ac_cv_env_host_alias_set=${host_alias+set}
++ac_cv_env_host_alias_value=$host_alias
++ac_env_target_alias_set=${target_alias+set}
++ac_env_target_alias_value=$target_alias
++ac_cv_env_target_alias_set=${target_alias+set}
++ac_cv_env_target_alias_value=$target_alias
++ac_env_CC_set=${CC+set}
++ac_env_CC_value=$CC
++ac_cv_env_CC_set=${CC+set}
++ac_cv_env_CC_value=$CC
++ac_env_CFLAGS_set=${CFLAGS+set}
++ac_env_CFLAGS_value=$CFLAGS
++ac_cv_env_CFLAGS_set=${CFLAGS+set}
++ac_cv_env_CFLAGS_value=$CFLAGS
++ac_env_LDFLAGS_set=${LDFLAGS+set}
++ac_env_LDFLAGS_value=$LDFLAGS
++ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
++ac_cv_env_LDFLAGS_value=$LDFLAGS
++ac_env_CPPFLAGS_set=${CPPFLAGS+set}
++ac_env_CPPFLAGS_value=$CPPFLAGS
++ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
++ac_cv_env_CPPFLAGS_value=$CPPFLAGS
++ac_env_CPP_set=${CPP+set}
++ac_env_CPP_value=$CPP
++ac_cv_env_CPP_set=${CPP+set}
++ac_cv_env_CPP_value=$CPP
++ac_env_CXX_set=${CXX+set}
++ac_env_CXX_value=$CXX
++ac_cv_env_CXX_set=${CXX+set}
++ac_cv_env_CXX_value=$CXX
++ac_env_CXXFLAGS_set=${CXXFLAGS+set}
++ac_env_CXXFLAGS_value=$CXXFLAGS
++ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
++ac_cv_env_CXXFLAGS_value=$CXXFLAGS
++ac_env_CXXCPP_set=${CXXCPP+set}
++ac_env_CXXCPP_value=$CXXCPP
++ac_cv_env_CXXCPP_set=${CXXCPP+set}
++ac_cv_env_CXXCPP_value=$CXXCPP
++ac_env_F77_set=${F77+set}
++ac_env_F77_value=$F77
++ac_cv_env_F77_set=${F77+set}
++ac_cv_env_F77_value=$F77
++ac_env_FFLAGS_set=${FFLAGS+set}
++ac_env_FFLAGS_value=$FFLAGS
++ac_cv_env_FFLAGS_set=${FFLAGS+set}
++ac_cv_env_FFLAGS_value=$FFLAGS
++
++#
++# Report the --help message.
++#
++if test "$ac_init_help" = "long"; then
++  # Omit some internal or obsolete options to make the list less imposing.
++  # This message is too long to be a string in the A/UX 3.1 sh.
++  cat <<_ACEOF
++\`configure' configures this package to adapt to many kinds of systems.
++
++Usage: $0 [OPTION]... [VAR=VALUE]...
++
++To assign environment variables (e.g., CC, CFLAGS...), specify them as
++VAR=VALUE.  See below for descriptions of some of the useful variables.
++
++Defaults for the options are specified in brackets.
++
++Configuration:
++  -h, --help              display this help and exit
++      --help=short        display options specific to this package
++      --help=recursive    display the short help of all the included packages
++  -V, --version           display version information and exit
++  -q, --quiet, --silent   do not print \`checking...' messages
++      --cache-file=FILE   cache test results in FILE [disabled]
++  -C, --config-cache      alias for \`--cache-file=config.cache'
++  -n, --no-create         do not create output files
++      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
++
++_ACEOF
++
++  cat <<_ACEOF
++Installation directories:
++  --prefix=PREFIX         install architecture-independent files in PREFIX
++			  [$ac_default_prefix]
++  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
++			  [PREFIX]
++
++By default, \`make install' will install all the files in
++\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
++an installation prefix other than \`$ac_default_prefix' using \`--prefix',
++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]
++  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
++  --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]
++  --infodir=DIR          info documentation [PREFIX/info]
++  --mandir=DIR           man documentation [PREFIX/man]
++_ACEOF
++
++  cat <<\_ACEOF
++
++Program names:
++  --program-prefix=PREFIX            prepend PREFIX to installed program names
++  --program-suffix=SUFFIX            append SUFFIX to installed program names
++  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
++
++System types:
++  --build=BUILD     configure for building on BUILD [guessed]
++  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
++_ACEOF
++fi
++
++if test -n "$ac_init_help"; then
++
++  cat <<\_ACEOF
++
++Optional Features:
++  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
++  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
++  --enable-maintainer-mode  enable make rules and dependencies not useful
++			  (and sometimes confusing) to the casual installer
++  --disable-dependency-tracking  speeds up one-time build
++  --enable-dependency-tracking   do not reject slow dependency extractors
++  --enable-shared@<:@=PKGS@:>@ 
++                          build shared libraries @<:@default=no@:>@
++  --enable-static@<:@=PKGS@:>@ 
++                          build static libraries @<:@default=yes@:>@
++  --enable-fast-install@<:@=PKGS@:>@ 
++                          optimize for fast installation @<:@default=yes@:>@
++  --disable-libtool-lock  avoid locking (might break parallel builds)
++  --enable-double         use double-precision samples
++  --enable-djbfft         make a version using djbfft
++  --disable-oss           make a version not using oss
++  --disable-solaris-audio make a version not using solaris audio
++  --disable-al-audio      make a version not using al audio
++  --disable-win           make a version not using win audio
++  --enable-warnings       treat warnings as errors
++  --enable-gprof          make a version using gprof
++
++Optional Packages:
++  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
++  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
++  --with-gnu-ld           assume the C compiler uses GNU ld @<:@default=no@:>@
++  --with-pic              try to use only PIC/non-PIC objects @<:@default=use
++                          both@:>@
++  --with-tags@<:@=TAGS@:>@ 
++                          include additional configurations @<:@automatic@:>@
++
++Some influential environment variables:
++  CC          C compiler command
++  CFLAGS      C compiler flags
++  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
++              nonstandard directory <lib dir>
++  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
++              headers in a nonstandard directory <include dir>
++  CPP         C preprocessor
++  CXX         C++ compiler command
++  CXXFLAGS    C++ compiler flags
++  CXXCPP      C++ preprocessor
++  F77         Fortran 77 compiler command
++  FFLAGS      Fortran 77 compiler flags
++
++Use these variables to override the choices made by `configure' or to help
++it to find libraries and programs with nonstandard names/locations.
++
++_ACEOF
++fi
++
++if test "$ac_init_help" = "recursive"; then
++  # If there are subdirs, report their specific --help.
++  ac_popdir=`pwd`
++  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
++    test -d $ac_dir || continue
++    ac_builddir=.
++
++if test "$ac_dir" != .; then
++  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
++  # A "../" for each directory in $ac_dir_suffix.
++  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
++else
++  ac_dir_suffix= ac_top_builddir=
++fi
++
++case $srcdir in
++  .)  # No --srcdir option.  We are building in place.
++    ac_srcdir=.
++    if test -z "$ac_top_builddir"; then
++       ac_top_srcdir=.
++    else
++       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
++    fi ;;
++  [\\/]* | ?:[\\/]* )  # Absolute path.
++    ac_srcdir=$srcdir$ac_dir_suffix;
++    ac_top_srcdir=$srcdir ;;
++  *) # Relative path.
++    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
++    ac_top_srcdir=$ac_top_builddir$srcdir ;;
++esac
++
++# Do not use `cd foo && pwd` to compute absolute paths, because
++# the directories may not exist.
++case `pwd` in
++.) ac_abs_builddir="$ac_dir";;
++*)
++  case "$ac_dir" in
++  .) ac_abs_builddir=`pwd`;;
++  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
++  *) ac_abs_builddir=`pwd`/"$ac_dir";;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_builddir=${ac_top_builddir}.;;
++*)
++  case ${ac_top_builddir}. in
++  .) ac_abs_top_builddir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
++  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_srcdir=$ac_srcdir;;
++*)
++  case $ac_srcdir in
++  .) ac_abs_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
++  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_srcdir=$ac_top_srcdir;;
++*)
++  case $ac_top_srcdir in
++  .) ac_abs_top_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
++  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
++  esac;;
++esac
++
++    cd $ac_dir
++    # Check for guested configure; otherwise get Cygnus style configure.
++    if test -f $ac_srcdir/configure.gnu; then
++      echo
++      $SHELL $ac_srcdir/configure.gnu  --help=recursive
++    elif test -f $ac_srcdir/configure; then
++      echo
++      $SHELL $ac_srcdir/configure  --help=recursive
++    elif test -f $ac_srcdir/configure.ac ||
++	   test -f $ac_srcdir/configure.in; then
++      echo
++      $ac_configure --help
++    else
++      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
++    fi
++    cd $ac_popdir
++  done
++fi
++
++test -n "$ac_init_help" && exit 0
++if $ac_init_version; then
++  cat <<\_ACEOF
++
++Copyright (C) 2003 Free Software Foundation, Inc.
++This configure script is free software; the Free Software Foundation
++gives unlimited permission to copy, distribute and modify it.
++_ACEOF
++  exit 0
++fi
++exec 5>config.log
++cat >&5 <<_ACEOF
++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.59.  Invocation command line was
++
++  $ $0 $@
++
++_ACEOF
++{
++cat <<_ASUNAME
++@%:@@%:@ --------- @%:@@%:@
++@%:@@%:@ Platform. @%:@@%:@
++@%:@@%:@ --------- @%:@@%:@
++
++hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
++uname -m = `(uname -m) 2>/dev/null || echo unknown`
++uname -r = `(uname -r) 2>/dev/null || echo unknown`
++uname -s = `(uname -s) 2>/dev/null || echo unknown`
++uname -v = `(uname -v) 2>/dev/null || echo unknown`
++
++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
++/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
++
++/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
++/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
++hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
++/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
++/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
++/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
++
++_ASUNAME
++
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  echo "PATH: $as_dir"
++done
++
++} >&5
++
++cat >&5 <<_ACEOF
++
++
++@%:@@%:@ ----------- @%:@@%:@
++@%:@@%:@ Core tests. @%:@@%:@
++@%:@@%:@ ----------- @%:@@%:@
++
++_ACEOF
++
++
++# Keep a trace of the command line.
++# Strip out --no-create and --no-recursion so they do not pile up.
++# Strip out --silent because we don't want to record it for future runs.
++# Also quote any args containing shell meta-characters.
++# Make two passes to allow for proper duplicate-argument suppression.
++ac_configure_args=
++ac_configure_args0=
++ac_configure_args1=
++ac_sep=
++ac_must_keep_next=false
++for ac_pass in 1 2
++do
++  for ac_arg
++  do
++    case $ac_arg in
++    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
++    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
++    | -silent | --silent | --silen | --sile | --sil)
++      continue ;;
++    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
++      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
++    esac
++    case $ac_pass in
++    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
++    2)
++      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
++      if test $ac_must_keep_next = true; then
++	ac_must_keep_next=false # Got value, back to normal.
++      else
++	case $ac_arg in
++	  *=* | --config-cache | -C | -disable-* | --disable-* \
++	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
++	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
++	  | -with-* | --with-* | -without-* | --without-* | --x)
++	    case "$ac_configure_args0 " in
++	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
++	    esac
++	    ;;
++	  -* ) ac_must_keep_next=true ;;
++	esac
++      fi
++      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
++      # Get rid of the leading space.
++      ac_sep=" "
++      ;;
++    esac
++  done
++done
++$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
++$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
++
++# When interrupted or exit'd, cleanup temporary files, and complete
++# config.log.  We remove comments because anyway the quotes in there
++# would cause problems or look ugly.
++# WARNING: Be sure not to use single quotes in there, as some shells,
++# such as our DU 5.0 friend, will then `close' the trap.
++trap 'exit_status=$?
++  # Save into config.log some information that might help in debugging.
++  {
++    echo
++
++    cat <<\_ASBOX
++@%:@@%:@ ---------------- @%:@@%:@
++@%:@@%:@ Cache variables. @%:@@%:@
++@%:@@%:@ ---------------- @%:@@%:@
++_ASBOX
++    echo
++    # The following way of writing the cache mishandles newlines in values,
++{
++  (set) 2>&1 |
++    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
++    *ac_space=\ *)
++      sed -n \
++	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
++	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
++      ;;
++    *)
++      sed -n \
++	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      ;;
++    esac;
++}
++    echo
++
++    cat <<\_ASBOX
++@%:@@%:@ ----------------- @%:@@%:@
++@%:@@%:@ Output variables. @%:@@%:@
++@%:@@%:@ ----------------- @%:@@%:@
++_ASBOX
++    echo
++    for ac_var in $ac_subst_vars
++    do
++      eval ac_val=$`echo $ac_var`
++      echo "$ac_var='"'"'$ac_val'"'"'"
++    done | sort
++    echo
++
++    if test -n "$ac_subst_files"; then
++      cat <<\_ASBOX
++@%:@@%:@ ------------- @%:@@%:@
++@%:@@%:@ Output files. @%:@@%:@
++@%:@@%:@ ------------- @%:@@%:@
++_ASBOX
++      echo
++      for ac_var in $ac_subst_files
++      do
++	eval ac_val=$`echo $ac_var`
++	echo "$ac_var='"'"'$ac_val'"'"'"
++      done | sort
++      echo
++    fi
++
++    if test -s confdefs.h; then
++      cat <<\_ASBOX
++@%:@@%:@ ----------- @%:@@%:@
++@%:@@%:@ confdefs.h. @%:@@%:@
++@%:@@%:@ ----------- @%:@@%:@
++_ASBOX
++      echo
++      sed "/^$/d" confdefs.h | sort
++      echo
++    fi
++    test "$ac_signal" != 0 &&
++      echo "$as_me: caught signal $ac_signal"
++    echo "$as_me: exit $exit_status"
++  } >&5
++  rm -f core *.core &&
++  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
++    exit $exit_status
++     ' 0
++for ac_signal in 1 2 13 15; do
++  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
++done
++ac_signal=0
++
++# confdefs.h avoids OS command line length limits that DEFS can exceed.
++rm -rf conftest* confdefs.h
++# AIX cpp loses on an empty file, so make sure it contains at least a newline.
++echo >confdefs.h
++
++# Predefined preprocessor variables.
++
++cat >>confdefs.h <<_ACEOF
++@%:@define PACKAGE_NAME "$PACKAGE_NAME"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++@%:@define PACKAGE_TARNAME "$PACKAGE_TARNAME"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++@%:@define PACKAGE_VERSION "$PACKAGE_VERSION"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++@%:@define PACKAGE_STRING "$PACKAGE_STRING"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++@%:@define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
++_ACEOF
++
++
++# Let the site file select an alternate cache file if it wants to.
++# Prefer explicitly selected file to automatically selected ones.
++if test -z "$CONFIG_SITE"; then
++  if test "x$prefix" != xNONE; then
++    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
++  else
++    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
++  fi
++fi
++for ac_site_file in $CONFIG_SITE; do
++  if test -r "$ac_site_file"; then
++    { 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
++done
++
++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
++    { 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
++  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
++echo "$as_me: creating cache $cache_file" >&6;}
++  >$cache_file
++fi
++
++# Check that the precious variables saved in the cache have kept the same
++# value.
++ac_cache_corrupted=false
++for ac_var in `(set) 2>&1 |
++	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
++  eval ac_old_set=\$ac_cv_env_${ac_var}_set
++  eval ac_new_set=\$ac_env_${ac_var}_set
++  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
++  eval ac_new_val="\$ac_env_${ac_var}_value"
++  case $ac_old_set,$ac_new_set in
++    set,)
++      { 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)
++      { 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
++	{ 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=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
++    *) ac_arg=$ac_var=$ac_new_val ;;
++    esac
++    case " $ac_configure_args " in
++      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
++      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
++    esac
++  fi
++done
++if $ac_cache_corrupted; then
++  { 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
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++ac_aux_dir=
++for ac_dir in autotools $srcdir/autotools; do
++  if test -f $ac_dir/install-sh; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/install-sh -c"
++    break
++  elif test -f $ac_dir/install.sh; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/install.sh -c"
++    break
++  elif test -f $ac_dir/shtool; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/shtool install -c"
++    break
++  fi
++done
++if test -z "$ac_aux_dir"; then
++  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in autotools $srcdir/autotools" >&5
++echo "$as_me: error: cannot find install-sh or install.sh in autotools $srcdir/autotools" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++ac_config_guess="$SHELL $ac_aux_dir/config.guess"
++ac_config_sub="$SHELL $ac_aux_dir/config.sub"
++ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
++
++                                                                                          ac_config_files="$ac_config_files Makefile autotools/Makefile include/Makefile test/Makefile doc/Makefile src/Makefile liba52/Makefile libao/Makefile vc++/Makefile"
++
++am__api_version="1.9"
++# Find a good install program.  We prefer a C program (faster),
++# so one script is as good as another.  But avoid the broken or
++# incompatible versions:
++# SysV /etc/install, /usr/sbin/install
++# SunOS /usr/etc/install
++# IRIX /sbin/install
++# AIX /bin/install
++# AmigaOS /C/install, which installs bootblocks on floppy discs
++# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
++# AFS /usr/afsws/bin/install, which mishandles nonexistent args
++# 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.
++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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  # Account for people who put trailing slashes in PATH elements.
++case $as_dir/ in
++  ./ | .// | /cC/* | \
++  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
++  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
++  /usr/ucb/* ) ;;
++  *)
++    # OSF1 and SCO ODT 3.0 have their own names for install.
++    # Don't use installbsd from OSF since it installs stuff as root
++    # by default.
++    for ac_prog in ginstall scoinst install; do
++      for ac_exec_ext in '' $ac_executable_extensions; do
++	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
++	  if test $ac_prog = install &&
++	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
++	    # AIX install.  It has an incompatible calling convention.
++	    :
++	  elif test $ac_prog = install &&
++	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
++	    # program-specific install script used by HP pwplus--don't use.
++	    :
++	  else
++	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
++	    break 3
++	  fi
++	fi
++      done
++    done
++    ;;
++esac
++done
++
++
++fi
++  if test "${ac_cv_path_install+set}" = set; then
++    INSTALL=$ac_cv_path_install
++  else
++    # As a last resort, use the slow shell script.  We don't cache a
++    # path for INSTALL within a source directory, because that will
++    # break other packages using the cache if that directory is
++    # removed, or if the path is relative.
++    INSTALL=$ac_install_sh
++  fi
++fi
++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.
++test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
++
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
++
++test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
++
++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
++# Do `set' in a subshell so we don't clobber the current shell's
++# arguments.  Must try -L first in case configure is actually a
++# symlink; some systems play weird games with the mod time of symlinks
++# (eg FreeBSD returns the mod time of the symlink's containing
++# directory).
++if (
++   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
++   if test "$*" = "X"; then
++      # -L didn't work.
++      set X `ls -t $srcdir/configure conftest.file`
++   fi
++   rm -f conftest.file
++   if test "$*" != "X $srcdir/configure conftest.file" \
++      && test "$*" != "X conftest.file $srcdir/configure"; then
++
++      # If neither matched, then we have a broken ls.  This can happen
++      # 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".
++      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
++alias in your environment" >&5
++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
++
++   test "$2" = conftest.file
++   )
++then
++   # Ok.
++   :
++else
++   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
++Check your system clock" >&5
++echo "$as_me: error: newly created file is older than distributed files!
++Check your system clock" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++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 $.  echo might interpret backslashes.
++# By default was `s,x,x', remove it if useless.
++cat <<\_ACEOF >conftest.sed
++s/[\\$]/&&/g;s/;s,x,x,$//
++_ACEOF
++program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
++rm conftest.sed
++
++# expand $ac_aux_dir to an absolute path
++am_aux_dir=`cd $ac_aux_dir && pwd`
++
++test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
++# Use eval to expand $SHELL
++if eval "$MISSING --run true"; then
++  am_missing_run="$MISSING --run "
++else
++  am_missing_run=
++  { 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
++
++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
++
++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
++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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$AWK"; then
++  ac_cv_prog_AWK="$AWK" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_AWK="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++AWK=$ac_cv_prog_AWK
++if test -n "$AWK"; then
++  echo "$as_me:$LINENO: result: $AWK" >&5
++echo "${ECHO_T}$AWK" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$AWK" && break
++done
++
++echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
++set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.make <<\_ACEOF
++all:
++	@echo 'ac_maketemp="$(MAKE)"'
++_ACEOF
++# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
++eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
++if test -n "$ac_maketemp"; then
++  eval ac_cv_prog_make_${ac_make}_set=yes
++else
++  eval ac_cv_prog_make_${ac_make}_set=no
++fi
++rm -f conftest.make
++fi
++if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++  SET_MAKE=
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++  SET_MAKE="MAKE=${MAKE-make}"
++fi
++
++rm -rf .tst 2>/dev/null
++mkdir .tst 2>/dev/null
++if test -d .tst; then
++  am__leading_dot=.
++else
++  am__leading_dot=_
++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
++  { { 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
++
++# test whether we have cygpath
++if test -z "$CYGPATH_W"; then
++  if (cygpath --version) >/dev/null 2>/dev/null; then
++    CYGPATH_W='cygpath -w'
++  else
++    CYGPATH_W=echo
++  fi
++fi
++
++
++# Define the identity of the package.
++ PACKAGE=a52dec
++ VERSION=0.7.4
++
++
++cat >>confdefs.h <<_ACEOF
++@%:@define PACKAGE "$PACKAGE"
++_ACEOF
++
++ 
++cat >>confdefs.h <<_ACEOF
++@%:@define VERSION "$VERSION"
++_ACEOF
++
++# Some tools Automake needs.
++
++ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
++
++
++AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
++
++
++AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
++
++
++AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
++
++
++MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
++
++install_sh=${install_sh-"$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
++# tool to use in cross-compilation environments, therefore Automake
++# will honor the `STRIP' environment variable to overrule this program.
++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
++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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$STRIP"; then
++  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++STRIP=$ac_cv_prog_STRIP
++if test -n "$STRIP"; then
++  echo "$as_me:$LINENO: result: $STRIP" >&5
++echo "${ECHO_T}$STRIP" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++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
++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
++  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.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_STRIP="strip"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
++fi
++fi
++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
++if test -n "$ac_ct_STRIP"; then
++  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++echo "${ECHO_T}$ac_ct_STRIP" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  STRIP=$ac_ct_STRIP
++else
++  STRIP="$ac_cv_prog_STRIP"
++fi
++
++fi
++INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
++
++# We need awk for the "check" target.  The system "awk" is bad on
++# some platforms.
++# Always define AMTAR for backward compatibility.
++
++AMTAR=${AMTAR-"${am_missing_run}tar"}
++
++am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
++
++
++
++
++
++          ac_config_headers="$ac_config_headers include/config.h"
++
++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 or --disable-maintainer-mode was given.
++if test "${enable_maintainer_mode+set}" = set; then
++  enableval="$enable_maintainer_mode"
++  USE_MAINTAINER_MODE=$enableval
++else
++  USE_MAINTAINER_MODE=no
++fi; 
++  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
++  MAINTAINER_MODE_TRUE='#'
++  MAINTAINER_MODE_FALSE=
++fi
++
++  MAINT=$MAINTAINER_MODE_TRUE
++  
++
++# Make sure we can run config.sub.
++$ac_config_sub sun4 >/dev/null 2>&1 ||
++  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
++echo "$as_me: error: cannot run $ac_config_sub" >&2;}
++   { (exit 1); exit 1; }; }
++
++echo "$as_me:$LINENO: checking build system type" >&5
++echo $ECHO_N "checking build system type... $ECHO_C" >&6
++if test "${ac_cv_build+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_build_alias=$build_alias
++test -z "$ac_cv_build_alias" &&
++  ac_cv_build_alias=`$ac_config_guess`
++test -z "$ac_cv_build_alias" &&
++  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
++echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
++   { (exit 1); exit 1; }; }
++ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
++  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
++echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
++   { (exit 1); exit 1; }; }
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_build" >&5
++echo "${ECHO_T}$ac_cv_build" >&6
++build=$ac_cv_build
++build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
++build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++
++
++echo "$as_me:$LINENO: checking host system type" >&5
++echo $ECHO_N "checking host system type... $ECHO_C" >&6
++if test "${ac_cv_host+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_host_alias=$host_alias
++test -z "$ac_cv_host_alias" &&
++  ac_cv_host_alias=$ac_cv_build_alias
++ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
++  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
++   { (exit 1); exit 1; }; }
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_host" >&5
++echo "${ECHO_T}$ac_cv_host" >&6
++host=$ac_cv_host
++host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
++host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++
++
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
++set dummy ${ac_tool_prefix}gcc; ac_word=$2
++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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_CC="${ac_tool_prefix}gcc"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_CC"; then
++  ac_ct_CC=$CC
++  # Extract the first word of "gcc", so it can be a program name with args.
++set dummy gcc; ac_word=$2
++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
++  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.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_CC="gcc"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  CC=$ac_ct_CC
++else
++  CC="$ac_cv_prog_CC"
++fi
++
++if test -z "$CC"; then
++  if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
++set dummy ${ac_tool_prefix}cc; ac_word=$2
++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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_CC="${ac_tool_prefix}cc"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_CC"; then
++  ac_ct_CC=$CC
++  # Extract the first word of "cc", so it can be a program name with args.
++set dummy cc; ac_word=$2
++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
++  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.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_CC="cc"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  CC=$ac_ct_CC
++else
++  CC="$ac_cv_prog_CC"
++fi
++
++fi
++if test -z "$CC"; then
++  # Extract the first word of "cc", so it can be a program name with args.
++set dummy cc; ac_word=$2
++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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++  ac_prog_rejected=no
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
++       ac_prog_rejected=yes
++       continue
++     fi
++    ac_cv_prog_CC="cc"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++if test $ac_prog_rejected = yes; then
++  # We found a bogon in the path, so make sure we never use it.
++  set dummy $ac_cv_prog_CC
++  shift
++  if test $@%:@ != 0; then
++    # We chose a different compiler from the bogus one.
++    # However, it has the same basename, so the bogon will be chosen
++    # first if we set CC to just the basename; use the full file name.
++    shift
++    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
++  fi
++fi
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$CC"; then
++  if test -n "$ac_tool_prefix"; then
++  for ac_prog in cl
++  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
++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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++    test -n "$CC" && break
++  done
++fi
++if test -z "$CC"; then
++  ac_ct_CC=$CC
++  for ac_prog in cl
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++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
++  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.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_CC="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$ac_ct_CC" && break
++done
++
++  CC=$ac_ct_CC
++fi
++
++fi
++
++
++test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
++See \`config.log' for more details." >&5
++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.
++echo "$as_me:$LINENO:" \
++     "checking for C compiler version" >&5
++ac_compiler=`set X $ac_compile; echo $2`
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
++  (eval $ac_compiler --version </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
++  (eval $ac_compiler -v </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
++  (eval $ac_compiler -V </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++ac_clean_files_save=$ac_clean_files
++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.
++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[^ ]*//'`
++if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
++  (eval $ac_link_default) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  # Find the output, starting from the most likely.  This scheme is
++# not robust to junk in `.', hence go to wildcards (a.*) only as a last
++# resort.
++
++# Be careful to initialize this variable, since it used to be cached.
++# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
++ac_cv_exeext=
++# b.out is created by i960 compilers.
++for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
++do
++  test -f "$ac_file" || continue
++  case $ac_file in
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
++	;;
++    conftest.$ac_ext )
++	# This is the source file.
++	;;
++    [ab].out )
++	# We found the default executable, but exeext='' is most
++	# certainly right.
++	break;;
++    *.* )
++	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++	# FIXME: I believe we export ac_cv_exeext for Libtool,
++	# but it would be cool to find out if it's true.  Does anybody
++	# maintain Libtool? --akim.
++	export ac_cv_exeext
++	break;;
++    * )
++	break;;
++  esac
++done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
++See \`config.log' for more details." >&5
++echo "$as_me: error: C compiler cannot create executables
++See \`config.log' for more details." >&2;}
++   { (exit 77); exit 77; }; }
++fi
++
++ac_exeext=$ac_cv_exeext
++echo "$as_me:$LINENO: result: $ac_file" >&5
++echo "${ECHO_T}$ac_file" >&6
++
++# Check the compiler produces executables we can run.  If not, either
++# the compiler is broken, or we cross compile.
++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
++  if { ac_try='./$ac_file'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  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
++	{ { 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
++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
++echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++
++rm -f a.out a.exe conftest$ac_cv_exeext b.out
++ac_clean_files=$ac_clean_files_save
++# Check the compiler produces executables we can run.  If not, either
++# the compiler is broken, or we cross compile.
++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
++
++echo "$as_me:$LINENO: checking for suffix of executables" >&5
++echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  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
++# work properly (i.e., refer to `conftest.exe'), while it won't with
++# `rm'.
++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 | *.o | *.obj ) ;;
++    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++	  export ac_cv_exeext
++	  break;;
++    * ) break;;
++  esac
++done
++else
++  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details." >&5
++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
++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
++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
++  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.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.o conftest.obj
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
++  case $ac_file in
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
++    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
++       break;;
++  esac
++done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
++See \`config.log' for more details." >&5
++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
++echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
++echo "${ECHO_T}$ac_cv_objext" >&6
++OBJEXT=$ac_cv_objext
++ac_objext=$OBJEXT
++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
++  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.  */
++
++int
++main ()
++{
++#ifndef __GNUC__
++       choke me
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_compiler_gnu=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_compiler_gnu=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_c_compiler_gnu=$ac_compiler_gnu
++
++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
++CFLAGS="-g"
++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
++  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.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_prog_cc_g=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_prog_cc_g=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++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
++  if test "$GCC" = yes; then
++    CFLAGS="-g -O2"
++  else
++    CFLAGS="-g"
++  fi
++else
++  if test "$GCC" = yes; then
++    CFLAGS="-O2"
++  else
++    CFLAGS=
++  fi
++fi
++echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
++echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
++if test "${ac_cv_prog_cc_stdc+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_prog_cc_stdc=no
++ac_save_CC=$CC
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdarg.h>
++#include <stdio.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
++struct buf { int x; };
++FILE * (*rcsopen) (struct buf *, struct stat *, int);
++static char *e (p, i)
++     char **p;
++     int i;
++{
++  return p[i];
++}
++static char *f (char * (*g) (char **, int), char **p, ...)
++{
++  char *s;
++  va_list v;
++  va_start (v,p);
++  s = g (p, va_arg (v,int));
++  va_end (v);
++  return s;
++}
++
++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
++   function prototypes and stuff, but not '\xHH' hex character constants.
++   These don't provoke an error unfortunately, instead are silently treated
++   as 'x'.  The following induces an error, until -std1 is added to get
++   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
++   array size at least.  It's necessary to write '\x00'==0 to get something
++   that's true only with -std1.  */
++int osf4_cc_array ['\x00' == 0 ? 1 : -1];
++
++int test (int i, double x);
++struct s1 {int (*f) (int a);};
++struct s2 {int (*f) (double a);};
++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
++int argc;
++char **argv;
++int
++main ()
++{
++return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
++  ;
++  return 0;
++}
++_ACEOF
++# Don't try gcc -ansi; that turns off useful extensions and
++# breaks some systems' header files.
++# AIX			-qlanglvl=ansi
++# Ultrix and OSF/1	-std1
++# HP-UX 10.20 and later	-Ae
++# HP-UX older versions	-Aa -D_HPUX_SOURCE
++# SVR4			-Xc -D__EXTENSIONS__
++for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
++do
++  CC="$ac_save_CC $ac_arg"
++  rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_prog_cc_stdc=$ac_arg
++break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext 
++done
++rm -f conftest.$ac_ext conftest.$ac_objext
++CC=$ac_save_CC
++
++fi
++
++case "x$ac_cv_prog_cc_stdc" in
++  x|xno)
++    echo "$as_me:$LINENO: result: none needed" >&5
++echo "${ECHO_T}none needed" >&6 ;;
++  *)
++    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
++    CC="$CC $ac_cv_prog_cc_stdc" ;;
++esac
++
++# Some people use a C++ compiler to compile C.  Since we use `exit',
++# in C++ we need to declare it.  In case someone uses the same compiler
++# for both compiling C and C++ we need to have the C++ compiler decide
++# the declaration of exit, since it's the most demanding environment.
++cat >conftest.$ac_ext <<_ACEOF
++@%:@ifndef __cplusplus
++  choke me
++@%:@endif
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  for ac_declaration in \
++   '' \
++   'extern "C" void std::exit (int) throw (); using std::exit;' \
++   'extern "C" void std::exit (int); using std::exit;' \
++   'extern "C" void exit (int) throw ();' \
++   'extern "C" void exit (int);' \
++   'void exit (int);'
++do
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_declaration
++@%:@include <stdlib.h>
++int
++main ()
++{
++exit (42);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++continue
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_declaration
++int
++main ()
++{
++exit (42);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++rm -f conftest*
++if test -n "$ac_declaration"; then
++  echo '#ifdef __cplusplus' >>confdefs.h
++  echo $ac_declaration      >>confdefs.h
++  echo '#endif'             >>confdefs.h
++fi
++
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++DEPDIR="${am__leading_dot}deps"
++
++          ac_config_commands="$ac_config_commands depfiles"
++
++
++am_make=${MAKE-make}
++cat > confinc << 'END'
++am__doit:
++	@echo done
++.PHONY: am__doit
++END
++# If we don't find an include directive, just comment out the code.
++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
++# First try GNU make style include.
++echo "include confinc" > confmf
++# We grep out `Entering directory' and `Leaving directory'
++# messages which can occur if `w' ends up in MAKEFLAGS.
++# In particular we don't look at `^make:' because GNU make might
++# be invoked under some other name (usually "gmake"), in which
++# case it prints its new name instead of `make'.
++if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
++   am__include=include
++   am__quote=
++   _am_result=GNU
++fi
++# Now try BSD make style include.
++if test "$am__include" = "#"; then
++   echo '.include "confinc"' > confmf
++   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
++      am__include=.include
++      am__quote="\""
++      _am_result=BSD
++   fi
++fi
++
++
++echo "$as_me:$LINENO: result: $_am_result" >&5
++echo "${ECHO_T}$_am_result" >&6
++rm -f confinc confmf
++
++# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
++if test "${enable_dependency_tracking+set}" = set; then
++  enableval="$enable_dependency_tracking"
++  
++fi; 
++if test "x$enable_dependency_tracking" != xno; then
++  am_depcomp="$ac_aux_dir/depcomp"
++  AMDEPBACKSLASH='\'
++fi
++ 
++
++if test "x$enable_dependency_tracking" != xno; then
++  AMDEP_TRUE=
++  AMDEP_FALSE='#'
++else
++  AMDEP_TRUE='#'
++  AMDEP_FALSE=
++fi
++
++
++
++
++depcc="$CC"   am_compiler_list=
++
++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
++  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
++  # making bogus files that we don't know about and never remove.  For
++  # instance it was reported that on HP-UX the gcc test will end up
++  # making a dummy file named `D' -- because `-MD' means `put the output
++  # in D'.
++  mkdir conftest.dir
++  # Copy depcomp to subdir because otherwise we won't find it if we're
++  # using a relative directory.
++  cp "$am_depcomp" conftest.dir
++  cd conftest.dir
++  # We will build objects and dependencies in a subdirectory because
++  # it helps to detect inapplicable dependency modes.  For instance
++  # both Tru64's cc and ICC support -MD to output dependencies as a
++  # side effect of compilation, but ICC will put the dependencies in
++  # the current directory while Tru64 will put them in the object
++  # directory.
++  mkdir sub
++
++  am_cv_CC_dependencies_compiler_type=none
++  if test "$am_compiler_list" = ""; then
++     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
++  fi
++  for depmode in $am_compiler_list; do
++    # Setup a source with many dependencies, because some compilers
++    # like to wrap large dependency lists on column 80 (with \), and
++    # we should not choose a depcomp mode which is confused by this.
++    #
++    # We need to recreate these files for each test, as the compiler may
++    # overwrite some of them when testing with obscure command lines.
++    # This happens at least with the AIX C compiler.
++    : > sub/conftest.c
++    for i in 1 2 3 4 5 6; do
++      echo '#include "conftst'$i'.h"' >> sub/conftest.c
++      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
++      # Solaris 8's {/usr,}/bin/sh.
++      touch sub/conftst$i.h
++    done
++    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
++
++    case $depmode in
++    nosideeffect)
++      # after this tag, mechanisms are not by side-effect, so they'll
++      # only be used when explicitly requested
++      if test "x$enable_dependency_tracking" = xyes; then
++	continue
++      else
++	break
++      fi
++      ;;
++    none) break ;;
++    esac
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.
++    if depmode=$depmode \
++       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
++       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++         >/dev/null 2>conftest.err &&
++       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
++       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
++      # icc doesn't choke on unknown options, it will just issue warnings
++      # or remarks (even with -Werror).  So we grep stderr for any message
++      # that says an option was ignored or not supported.
++      # When given -MP, icc 7.0 and 7.1 complain thusly:
++      #   icc: Command line warning: ignoring option '-M'; no argument required
++      # The diagnosis changed in icc 8.0:
++      #   icc: Command line remark: option '-MP' not supported
++      if (grep 'ignoring option' conftest.err ||
++          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
++        am_cv_CC_dependencies_compiler_type=$depmode
++        break
++      fi
++    fi
++  done
++
++  cd ..
++  rm -rf conftest.dir
++else
++  am_cv_CC_dependencies_compiler_type=none
++fi
++
++fi
++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 
++  test "x$enable_dependency_tracking" != xno \
++  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
++  am__fastdepCC_TRUE=
++  am__fastdepCC_FALSE='#'
++else
++  am__fastdepCC_TRUE='#'
++  am__fastdepCC_FALSE=
++fi
++
++
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++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
++  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"
++    do
++      ac_preproc_ok=false
++for ac_c_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@ifdef __STDC__
++@%:@ include <limits.h>
++@%:@else
++@%:@ include <assert.h>
++@%:@endif
++		     Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether non-existent headers
++  # can be detected and how.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  # Broken: success on invalid input.
++continue
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++  break
++fi
++
++    done
++    ac_cv_prog_CPP=$CPP
++  
++fi
++  CPP=$ac_cv_prog_CPP
++else
++  ac_cv_prog_CPP=$CPP
++fi
++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
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@ifdef __STDC__
++@%:@ include <limits.h>
++@%:@else
++@%:@ include <assert.h>
++@%:@endif
++		     Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether non-existent headers
++  # can be detected and how.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  # Broken: success on invalid input.
++continue
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++  :
++else
++  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." >&5
++echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
++echo "$as_me:$LINENO: checking for egrep" >&5
++echo $ECHO_N "checking for egrep... $ECHO_C" >&6
++if test "${ac_cv_prog_egrep+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
++    then ac_cv_prog_egrep='grep -E'
++    else ac_cv_prog_egrep='egrep'
++    fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
++echo "${ECHO_T}$ac_cv_prog_egrep" >&6
++ EGREP=$ac_cv_prog_egrep
++ 
++
++if test $ac_cv_c_compiler_gnu = yes; then
++    echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5
++echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
++if test "${ac_cv_prog_gcc_traditional+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++    ac_pattern="Autoconf.*'x'"
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sgtty.h>
++Autoconf TIOCGETP
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "$ac_pattern" >/dev/null 2>&1; then
++  ac_cv_prog_gcc_traditional=yes
++else
++  ac_cv_prog_gcc_traditional=no
++fi
++rm -f conftest*
++
++
++  if test $ac_cv_prog_gcc_traditional = no; then
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <termio.h>
++Autoconf TCGETA
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "$ac_pattern" >/dev/null 2>&1; then
++  ac_cv_prog_gcc_traditional=yes
++fi
++rm -f conftest*
++
++  fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5
++echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
++  if test $ac_cv_prog_gcc_traditional = yes; then
++    CC="$CC -traditional"
++  fi
++fi
++
++
++if test x"$GCC" = x"yes"; then
++
++        
++        
++    OPT_CFLAGS=`echo "$CFLAGS"|sed "s/-O[0-9]*//g"`
++    
++    OPT_CFLAGS="$OPT_CFLAGS -O3"
++    echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
++echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
++    SAVE_CFLAGS="$CFLAGS"
++    CFLAGS="$OPT_CFLAGS"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_try_cflags_ok=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_try_cflags_ok=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++    CFLAGS="$SAVE_CFLAGS"
++    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
++echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
++    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
++	CFLAGS=$OPT_CFLAGS
++    else
++	:
++    fi
++
++        OPT_CFLAGS="$CFLAGS -fomit-frame-pointer"
++    echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
++echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
++    SAVE_CFLAGS="$CFLAGS"
++    CFLAGS="$OPT_CFLAGS"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_try_cflags_ok=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_try_cflags_ok=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++    CFLAGS="$SAVE_CFLAGS"
++    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
++echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
++    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
++	CFLAGS=$OPT_CFLAGS
++    else
++	:
++    fi
++
++        case "$host" in
++    i?86-* | k?-*)
++	case "$host" in
++	i386-*) OPT_CFLAGS="$CFLAGS -mcpu=i386";;
++	i486-*) OPT_CFLAGS="$CFLAGS -mcpu=i486";;
++	i586-*) OPT_CFLAGS="$CFLAGS -mcpu=pentium";;
++	i686-*) OPT_CFLAGS="$CFLAGS -mcpu=pentiumpro";;
++	k6-*)   OPT_CFLAGS="$CFLAGS -mcpu=k6";;
++	esac
++	echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
++echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
++    SAVE_CFLAGS="$CFLAGS"
++    CFLAGS="$OPT_CFLAGS"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_try_cflags_ok=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_try_cflags_ok=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++    CFLAGS="$SAVE_CFLAGS"
++    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
++echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
++    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
++	CFLAGS=$OPT_CFLAGS
++    else
++	:
++    fi;;
++    sparc-* | sparc64-*)
++	OPT_CFLAGS="$CFLAGS -mtune=ultrasparc"
++	echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
++echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
++    SAVE_CFLAGS="$CFLAGS"
++    CFLAGS="$OPT_CFLAGS"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_try_cflags_ok=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_try_cflags_ok=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++    CFLAGS="$SAVE_CFLAGS"
++    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
++echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
++    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
++	CFLAGS=$OPT_CFLAGS
++    else
++	:
++    fi;;
++    mips-sgi-irix6.*)		OPT_CFLAGS="$CFLAGS -mabi=64"
++	echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
++echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
++    SAVE_CFLAGS="$CFLAGS"
++    CFLAGS="$OPT_CFLAGS"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_try_cflags_ok=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_try_cflags_ok=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++    CFLAGS="$SAVE_CFLAGS"
++    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
++echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
++    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
++	CFLAGS=$OPT_CFLAGS
++    else
++	:
++    fi;;
++    esac
++elif test x"$CC" = x"tcc" -a x"`$CC -version 2>&1 | grep TenDRA`" != x""; then
++        TENDRA=yes
++    CFLAGS="-Xp -Yansi -f`pwd`/include/tendra.h -DELIDE_CODE"
++    enable_mlib=no
++    enable_oss=no
++    enable_solaris_audio=no
++elif test x"$CC" = x"icc" -a x"`$CC -V 2>&1 | grep Intel`" != x""; then
++        CFLAGS="-g -O3 -unroll -ip"
++else
++        case "$host" in
++    mips-sgi-irix6.*)
++	OPT_CFLAGS="$CFLAGS -64"
++	echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
++echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
++    SAVE_CFLAGS="$CFLAGS"
++    CFLAGS="$OPT_CFLAGS"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_try_cflags_ok=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_try_cflags_ok=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++    CFLAGS="$SAVE_CFLAGS"
++    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
++echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
++    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
++	CFLAGS=$OPT_CFLAGS
++    else
++	:
++    fi;;
++    sparc-sun-solaris*)
++	OPT_CFLAGS="$CFLAGS -xCC -fast -xO5"
++	echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
++echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
++    SAVE_CFLAGS="$CFLAGS"
++    CFLAGS="$OPT_CFLAGS"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_try_cflags_ok=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_try_cflags_ok=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++    CFLAGS="$SAVE_CFLAGS"
++    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
++echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
++    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
++	CFLAGS=$OPT_CFLAGS
++    else
++	:
++    fi;;
++    esac
++fi
++
++# Check whether --enable-shared or --disable-shared was given.
++if test "${enable_shared+set}" = set; then
++  enableval="$enable_shared"
++  p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_shared=yes ;;
++    no) enable_shared=no ;;
++    *)
++      enable_shared=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_shared=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac
++else
++  enable_shared=no
++fi; 
++
++
++
++
++# Check whether --enable-static or --disable-static was given.
++if test "${enable_static+set}" = set; then
++  enableval="$enable_static"
++  p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_static=yes ;;
++    no) enable_static=no ;;
++    *)
++     enable_static=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_static=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac
++else
++  enable_static=yes
++fi; 
++
++# Check whether --enable-fast-install or --disable-fast-install was given.
++if test "${enable_fast_install+set}" = set; then
++  enableval="$enable_fast_install"
++  p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_fast_install=yes ;;
++    no) enable_fast_install=no ;;
++    *)
++      enable_fast_install=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_fast_install=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac
++else
++  enable_fast_install=yes
++fi; 
++
++echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
++echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
++if test "${lt_cv_path_SED+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  # Loop through the user's path and test for sed and gsed.
++# Then use that list of sed's as ones to test for truncation.
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for lt_ac_prog in sed gsed; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
++      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
++        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
++      fi
++    done
++  done
++done
++lt_ac_max=0
++lt_ac_count=0
++# Add /usr/xpg4/bin/sed as it is typically found on Solaris
++# along with /bin/sed that truncates output.
++for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
++  test ! -f $lt_ac_sed && break
++  cat /dev/null > conftest.in
++  lt_ac_count=0
++  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
++  # Check for GNU sed and select it if it is found.
++  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
++    lt_cv_path_SED=$lt_ac_sed
++    break
++  fi
++  while true; do
++    cat conftest.in conftest.in >conftest.tmp
++    mv conftest.tmp conftest.in
++    cp conftest.in conftest.nl
++    echo >>conftest.nl
++    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
++    cmp -s conftest.out conftest.nl || break
++    # 10000 chars as input seems more than enough
++    test $lt_ac_count -gt 10 && break
++    lt_ac_count=`expr $lt_ac_count + 1`
++    if test $lt_ac_count -gt $lt_ac_max; then
++      lt_ac_max=$lt_ac_count
++      lt_cv_path_SED=$lt_ac_sed
++    fi
++  done
++done
++
++fi
++
++SED=$lt_cv_path_SED
++echo "$as_me:$LINENO: result: $SED" >&5
++echo "${ECHO_T}$SED" >&6
++
++
++# Check whether --with-gnu-ld or --without-gnu-ld was given.
++if test "${with_gnu_ld+set}" = set; then
++  withval="$with_gnu_ld"
++  test "$withval" = no || with_gnu_ld=yes
++else
++  with_gnu_ld=no
++fi; 
++ac_prog=ld
++if test "$GCC" = yes; then
++  # Check if gcc -print-prog-name=ld gives a path.
++  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
++  case $host in
++  *-*-mingw*)
++    # gcc leaves a trailing carriage return which upsets mingw
++    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++  *)
++    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++  esac
++  case $ac_prog in
++    # Accept absolute paths.
++    [\\/]* | ?:[\\/]*)
++      re_direlt='/[^/][^/]*/\.\./'
++      # Canonicalize the pathname of ld
++      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
++      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
++      done
++      test -z "$LD" && LD="$ac_prog"
++      ;;
++  "")
++    # If it fails, then pretend we aren't using GCC.
++    ac_prog=ld
++    ;;
++  *)
++    # If it is relative, then search for the first ld in PATH.
++    with_gnu_ld=unknown
++    ;;
++  esac
++elif test "$with_gnu_ld" = yes; then
++  echo "$as_me:$LINENO: checking for GNU ld" >&5
++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
++else
++  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
++fi
++if test "${lt_cv_path_LD+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -z "$LD"; then
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
++      lt_cv_path_LD="$ac_dir/$ac_prog"
++      # Check to see if the program is GNU ld.  I'd rather use --version,
++      # but apparently some GNU ld's only accept -v.
++      # Break only if it was the GNU/non-GNU ld that we prefer.
++      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
++      *GNU* | *'with BFD'*)
++	test "$with_gnu_ld" != no && break
++	;;
++      *)
++	test "$with_gnu_ld" != yes && break
++	;;
++      esac
++    fi
++  done
++  IFS="$lt_save_ifs"
++else
++  lt_cv_path_LD="$LD" # Let the user override the test with a path.
++fi
++fi
++
++LD="$lt_cv_path_LD"
++if test -n "$LD"; then
++  echo "$as_me:$LINENO: result: $LD" >&5
++echo "${ECHO_T}$LD" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
++echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
++   { (exit 1); exit 1; }; }
++echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
++if test "${lt_cv_prog_gnu_ld+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
++case `$LD -v 2>&1 </dev/null` in
++*GNU* | *'with BFD'*)
++  lt_cv_prog_gnu_ld=yes
++  ;;
++*)
++  lt_cv_prog_gnu_ld=no
++  ;;
++esac
++fi
++echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
++with_gnu_ld=$lt_cv_prog_gnu_ld
++
++
++echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
++echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
++if test "${lt_cv_ld_reload_flag+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_ld_reload_flag='-r'
++fi
++echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
++echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
++reload_flag=$lt_cv_ld_reload_flag
++case $reload_flag in
++"" | " "*) ;;
++*) reload_flag=" $reload_flag" ;;
++esac
++reload_cmds='$LD$reload_flag -o $output$reload_objs'
++case $host_os in
++  darwin*)
++    if test "$GCC" = yes; then
++      reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
++    else
++      reload_cmds='$LD$reload_flag -o $output$reload_objs'
++    fi
++    ;;
++esac
++
++echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
++echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
++if test "${lt_cv_path_NM+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$NM"; then
++  # Let the user override the test.
++  lt_cv_path_NM="$NM"
++else
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
++    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++      # Check to see if the nm accepts a BSD-compat flag.
++      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
++      #   nm: unknown option "B" ignored
++      # Tru64's nm complains that /dev/null is an invalid object file
++      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++      */dev/null* | *'Invalid file or object type'*)
++	lt_cv_path_NM="$tmp_nm -B"
++	break
++        ;;
++      *)
++	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
++	*/dev/null*)
++	  lt_cv_path_NM="$tmp_nm -p"
++	  break
++	  ;;
++	*)
++	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++	  continue # so that we can try to find one that supports BSD flags
++	  ;;
++	esac
++      esac
++    fi
++  done
++  IFS="$lt_save_ifs"
++  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
++fi
++fi
++echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
++echo "${ECHO_T}$lt_cv_path_NM" >&6
++NM="$lt_cv_path_NM"
++
++echo "$as_me:$LINENO: checking whether ln -s works" >&5
++echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
++LN_S=$as_ln_s
++if test "$LN_S" = "ln -s"; then
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++else
++  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
++echo "${ECHO_T}no, using $LN_S" >&6
++fi
++
++echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
++echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
++if test "${lt_cv_deplibs_check_method+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_file_magic_cmd='$MAGIC_CMD'
++lt_cv_file_magic_test_file=
++lt_cv_deplibs_check_method='unknown'
++# Need to set the preceding variable on all platforms that support
++# interlibrary dependencies.
++# 'none' -- dependencies not supported.
++# `unknown' -- same as none, but documents that we really don't know.
++# 'pass_all' -- all dependencies passed with no checks.
++# 'test_compile' -- check by making test program.
++# 'file_magic [[regex]]' -- check by looking for files in library path
++# which responds to the $file_magic_cmd with a given extended regex.
++# If you have `file' or equivalent on your system and you're not sure
++# whether `pass_all' will *always* work, you probably want this one.
++
++case $host_os in
++aix4* | aix5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++beos*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++bsdi[45]*)
++  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
++  lt_cv_file_magic_cmd='/usr/bin/file -L'
++  lt_cv_file_magic_test_file=/shlib/libc.so
++  ;;
++
++cygwin*)
++  # func_win32_libid is a shell function defined in ltmain.sh
++  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++  lt_cv_file_magic_cmd='func_win32_libid'
++  ;;
++
++mingw* | pw32*)
++  # Base MSYS/MinGW do not provide the 'file' command needed by
++  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
++  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++  lt_cv_file_magic_cmd='$OBJDUMP -f'
++  ;;
++
++darwin* | rhapsody*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++freebsd* | kfreebsd*-gnu)
++  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++    case $host_cpu in
++    i*86 )
++      # Not sure whether the presence of OpenBSD here was a mistake.
++      # Let's accept both of them until this is cleared up.
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
++      lt_cv_file_magic_cmd=/usr/bin/file
++      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++      ;;
++    esac
++  else
++    lt_cv_deplibs_check_method=pass_all
++  fi
++  ;;
++
++gnu*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++hpux10.20* | hpux11*)
++  lt_cv_file_magic_cmd=/usr/bin/file
++  case "$host_cpu" in
++  ia64*)
++    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
++    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
++    ;;
++  hppa*64*)
++    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
++    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
++    ;;
++  *)
++    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
++    lt_cv_file_magic_test_file=/usr/lib/libc.sl
++    ;;
++  esac
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $LD in
++  *-32|*"-32 ") libmagic=32-bit;;
++  *-n32|*"-n32 ") libmagic=N32;;
++  *-64|*"-64 ") libmagic=64-bit;;
++  *) libmagic=never-match;;
++  esac
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++# This must be Linux ELF.
++linux*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++netbsd*)
++  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
++  else
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
++  fi
++  ;;
++
++newos6*)
++  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
++  lt_cv_file_magic_cmd=/usr/bin/file
++  lt_cv_file_magic_test_file=/usr/lib/libnls.so
++  ;;
++
++nto-qnx*)
++  lt_cv_deplibs_check_method=unknown
++  ;;
++
++openbsd*)
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
++  else
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
++  fi
++  ;;
++
++osf3* | osf4* | osf5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++sco3.2v5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++solaris*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  case $host_vendor in
++  motorola)
++    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
++    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
++    ;;
++  ncr)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  sequent)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
++    ;;
++  sni)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
++    lt_cv_file_magic_test_file=/lib/libc.so
++    ;;
++  siemens)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  esac
++  ;;
++
++sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++esac
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
++echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
++file_magic_cmd=$lt_cv_file_magic_cmd
++deplibs_check_method=$lt_cv_deplibs_check_method
++test -z "$deplibs_check_method" && deplibs_check_method=unknown
++
++
++
++
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
++
++# Allow CC to be a program name with arguments.
++compiler=$CC
++
++# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
++if test "${enable_libtool_lock+set}" = set; then
++  enableval="$enable_libtool_lock"
++  
++fi; 
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++
++# Some flags need to be propagated to the compiler or linker for good
++# libtool support.
++case $host in
++ia64-*-hpux*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++    case `/usr/bin/file conftest.$ac_objext` in
++    *ELF-32*)
++      HPUX_IA64_MODE="32"
++      ;;
++    *ELF-64*)
++      HPUX_IA64_MODE="64"
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++*-*-irix6*)
++  # Find out which ABI we are using.
++  echo '#line __oline__ "configure"' > conftest.$ac_ext
++  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++   if test "$lt_cv_prog_gnu_ld" = yes; then
++    case `/usr/bin/file conftest.$ac_objext` in
++    *32-bit*)
++      LD="${LD-ld} -melf32bsmip"
++      ;;
++    *N32*)
++      LD="${LD-ld} -melf32bmipn32"
++      ;;
++    *64-bit*)
++      LD="${LD-ld} -melf64bmip"
++      ;;
++    esac
++   else
++    case `/usr/bin/file conftest.$ac_objext` in
++    *32-bit*)
++      LD="${LD-ld} -32"
++      ;;
++    *N32*)
++      LD="${LD-ld} -n32"
++      ;;
++    *64-bit*)
++      LD="${LD-ld} -64"
++      ;;
++    esac
++   fi
++  fi
++  rm -rf conftest*
++  ;;
++
++x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++    case "`/usr/bin/file conftest.o`" in
++    *32-bit*)
++      case $host in
++        x86_64-*linux*)
++          LD="${LD-ld} -m elf_i386"
++          ;;
++        ppc64-*linux*|powerpc64-*linux*)
++          LD="${LD-ld} -m elf32ppclinux"
++          ;;
++        s390x-*linux*)
++          LD="${LD-ld} -m elf_s390"
++          ;;
++        sparc64-*linux*)
++          LD="${LD-ld} -m elf32_sparc"
++          ;;
++      esac
++      ;;
++    *64-bit*)
++      case $host in
++        x86_64-*linux*)
++          LD="${LD-ld} -m elf_x86_64"
++          ;;
++        ppc*-*linux*|powerpc*-*linux*)
++          LD="${LD-ld} -m elf64ppc"
++          ;;
++        s390*-*linux*)
++          LD="${LD-ld} -m elf64_s390"
++          ;;
++        sparc*-*linux*)
++          LD="${LD-ld} -m elf64_sparc"
++          ;;
++      esac
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++
++*-*-sco3.2v5*)
++  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
++  SAVE_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -belf"
++  echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
++echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
++if test "${lt_cv_cc_needs_belf+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++     cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  lt_cv_cc_needs_belf=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++lt_cv_cc_needs_belf=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++     ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
++echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
++  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
++    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
++    CFLAGS="$SAVE_CFLAGS"
++  fi
++  ;;
++*-*-cygwin* | *-*-mingw* | *-*-pw32*)
++  if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
++set dummy ${ac_tool_prefix}dlltool; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_DLLTOOL+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$DLLTOOL"; then
++  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++DLLTOOL=$ac_cv_prog_DLLTOOL
++if test -n "$DLLTOOL"; then
++  echo "$as_me:$LINENO: result: $DLLTOOL" >&5
++echo "${ECHO_T}$DLLTOOL" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_DLLTOOL"; then
++  ac_ct_DLLTOOL=$DLLTOOL
++  # Extract the first word of "dlltool", so it can be a program name with args.
++set dummy dlltool; ac_word=$2
++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_DLLTOOL+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_DLLTOOL"; then
++  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_prog_ac_ct_DLLTOOL" && ac_cv_prog_ac_ct_DLLTOOL="false"
++fi
++fi
++ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
++if test -n "$ac_ct_DLLTOOL"; then
++  echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
++echo "${ECHO_T}$ac_ct_DLLTOOL" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  DLLTOOL=$ac_ct_DLLTOOL
++else
++  DLLTOOL="$ac_cv_prog_DLLTOOL"
++fi
++
++  if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
++set dummy ${ac_tool_prefix}as; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_AS+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$AS"; then
++  ac_cv_prog_AS="$AS" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_AS="${ac_tool_prefix}as"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++AS=$ac_cv_prog_AS
++if test -n "$AS"; then
++  echo "$as_me:$LINENO: result: $AS" >&5
++echo "${ECHO_T}$AS" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_AS"; then
++  ac_ct_AS=$AS
++  # Extract the first word of "as", so it can be a program name with args.
++set dummy as; ac_word=$2
++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_AS+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_AS"; then
++  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_AS="as"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_prog_ac_ct_AS" && ac_cv_prog_ac_ct_AS="false"
++fi
++fi
++ac_ct_AS=$ac_cv_prog_ac_ct_AS
++if test -n "$ac_ct_AS"; then
++  echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
++echo "${ECHO_T}$ac_ct_AS" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  AS=$ac_ct_AS
++else
++  AS="$ac_cv_prog_AS"
++fi
++
++  if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
++set dummy ${ac_tool_prefix}objdump; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_OBJDUMP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$OBJDUMP"; then
++  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++OBJDUMP=$ac_cv_prog_OBJDUMP
++if test -n "$OBJDUMP"; then
++  echo "$as_me:$LINENO: result: $OBJDUMP" >&5
++echo "${ECHO_T}$OBJDUMP" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_OBJDUMP"; then
++  ac_ct_OBJDUMP=$OBJDUMP
++  # Extract the first word of "objdump", so it can be a program name with args.
++set dummy objdump; ac_word=$2
++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_OBJDUMP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_OBJDUMP"; then
++  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_OBJDUMP="objdump"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_prog_ac_ct_OBJDUMP" && ac_cv_prog_ac_ct_OBJDUMP="false"
++fi
++fi
++ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
++if test -n "$ac_ct_OBJDUMP"; then
++  echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
++echo "${ECHO_T}$ac_ct_OBJDUMP" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  OBJDUMP=$ac_ct_OBJDUMP
++else
++  OBJDUMP="$ac_cv_prog_OBJDUMP"
++fi
++
++  ;;
++  
++esac
++
++need_locks="$enable_libtool_lock"
++
++
++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
++  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.  */
++#include <stdlib.h>
++#include <stdarg.h>
++#include <string.h>
++#include <float.h>
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_header_stdc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_header_stdc=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++if test $ac_cv_header_stdc = yes; then
++  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <string.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "memchr" >/dev/null 2>&1; then
++  :
++else
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
++
++fi
++
++if test $ac_cv_header_stdc = yes; then
++  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdlib.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "free" >/dev/null 2>&1; then
++  :
++else
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
++
++fi
++
++if test $ac_cv_header_stdc = yes; then
++  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
++  if test "$cross_compiling" = yes; then
++  :
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <ctype.h>
++#if ((' ' & 0x0FF) == 0x020)
++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
++#else
++# define ISLOWER(c) \
++		   (('a' <= (c) && (c) <= 'i') \
++		     || ('j' <= (c) && (c) <= 'r') \
++		     || ('s' <= (c) && (c) <= 'z'))
++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
++#endif
++
++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
++int
++main ()
++{
++  int i;
++  for (i = 0; i < 256; i++)
++    if (XOR (islower (i), ISLOWER (i))
++	|| toupper (i) != TOUPPER (i))
++      exit(2);
++  exit (0);
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  :
++else
++  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 -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++fi
++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
++@%:@define STDC_HEADERS 1
++_ACEOF
++
++fi
++
++# On IRIX 5.3, sys/types and inttypes.h are conflicting.
++
++
++
++
++
++
++
++
++
++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
++		  inttypes.h stdint.h unistd.h
++do
++as_ac_Header=`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 eval "test \"\${$as_ac_Header+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
++
++@%:@include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_Header=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_Header=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++
++done
++
++
++
++for ac_header in dlfcn.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++else
++  # Is the header compilable?
++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
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++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
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  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
++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: )
++    { 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:* )
++    { 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;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  eval "$as_ac_Header=\$ac_header_preproc"
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++
++done
++
++ac_ext=cc
++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
++if test -n "$ac_tool_prefix"; then
++  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
++  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
++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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CXX"; then
++  ac_cv_prog_CXX="$CXX" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++CXX=$ac_cv_prog_CXX
++if test -n "$CXX"; then
++  echo "$as_me:$LINENO: result: $CXX" >&5
++echo "${ECHO_T}$CXX" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++    test -n "$CXX" && break
++  done
++fi
++if test -z "$CXX"; then
++  ac_ct_CXX=$CXX
++  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++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
++  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.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_CXX="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
++if test -n "$ac_ct_CXX"; then
++  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
++echo "${ECHO_T}$ac_ct_CXX" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$ac_ct_CXX" && break
++done
++test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
++
++  CXX=$ac_ct_CXX
++fi
++
++
++# Provide some information about the compiler.
++echo "$as_me:$LINENO:" \
++     "checking for C++ compiler version" >&5
++ac_compiler=`set X $ac_compile; echo $2`
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
++  (eval $ac_compiler --version </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
++  (eval $ac_compiler -v </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
++  (eval $ac_compiler -V </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++
++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
++  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.  */
++
++int
++main ()
++{
++#ifndef __GNUC__
++       choke me
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_compiler_gnu=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_compiler_gnu=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
++
++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
++CXXFLAGS="-g"
++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
++  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.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_prog_cxx_g=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_prog_cxx_g=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++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
++  if test "$GXX" = yes; then
++    CXXFLAGS="-g -O2"
++  else
++    CXXFLAGS="-g"
++  fi
++else
++  if test "$GXX" = yes; then
++    CXXFLAGS="-O2"
++  else
++    CXXFLAGS=
++  fi
++fi
++for ac_declaration in \
++   '' \
++   'extern "C" void std::exit (int) throw (); using std::exit;' \
++   'extern "C" void std::exit (int); using std::exit;' \
++   'extern "C" void exit (int) throw ();' \
++   'extern "C" void exit (int);' \
++   'void exit (int);'
++do
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_declaration
++@%:@include <stdlib.h>
++int
++main ()
++{
++exit (42);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++continue
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_declaration
++int
++main ()
++{
++exit (42);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++rm -f conftest*
++if test -n "$ac_declaration"; then
++  echo '#ifdef __cplusplus' >>confdefs.h
++  echo $ac_declaration      >>confdefs.h
++  echo '#endif'             >>confdefs.h
++fi
++
++ac_ext=cc
++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
++
++depcc="$CXX"  am_compiler_list=
++
++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
++  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
++  # making bogus files that we don't know about and never remove.  For
++  # instance it was reported that on HP-UX the gcc test will end up
++  # making a dummy file named `D' -- because `-MD' means `put the output
++  # in D'.
++  mkdir conftest.dir
++  # Copy depcomp to subdir because otherwise we won't find it if we're
++  # using a relative directory.
++  cp "$am_depcomp" conftest.dir
++  cd conftest.dir
++  # We will build objects and dependencies in a subdirectory because
++  # it helps to detect inapplicable dependency modes.  For instance
++  # both Tru64's cc and ICC support -MD to output dependencies as a
++  # side effect of compilation, but ICC will put the dependencies in
++  # the current directory while Tru64 will put them in the object
++  # directory.
++  mkdir sub
++
++  am_cv_CXX_dependencies_compiler_type=none
++  if test "$am_compiler_list" = ""; then
++     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
++  fi
++  for depmode in $am_compiler_list; do
++    # Setup a source with many dependencies, because some compilers
++    # like to wrap large dependency lists on column 80 (with \), and
++    # we should not choose a depcomp mode which is confused by this.
++    #
++    # We need to recreate these files for each test, as the compiler may
++    # overwrite some of them when testing with obscure command lines.
++    # This happens at least with the AIX C compiler.
++    : > sub/conftest.c
++    for i in 1 2 3 4 5 6; do
++      echo '#include "conftst'$i'.h"' >> sub/conftest.c
++      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
++      # Solaris 8's {/usr,}/bin/sh.
++      touch sub/conftst$i.h
++    done
++    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
++
++    case $depmode in
++    nosideeffect)
++      # after this tag, mechanisms are not by side-effect, so they'll
++      # only be used when explicitly requested
++      if test "x$enable_dependency_tracking" = xyes; then
++	continue
++      else
++	break
++      fi
++      ;;
++    none) break ;;
++    esac
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.
++    if depmode=$depmode \
++       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
++       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++         >/dev/null 2>conftest.err &&
++       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
++       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
++      # icc doesn't choke on unknown options, it will just issue warnings
++      # or remarks (even with -Werror).  So we grep stderr for any message
++      # that says an option was ignored or not supported.
++      # When given -MP, icc 7.0 and 7.1 complain thusly:
++      #   icc: Command line warning: ignoring option '-M'; no argument required
++      # The diagnosis changed in icc 8.0:
++      #   icc: Command line remark: option '-MP' not supported
++      if (grep 'ignoring option' conftest.err ||
++          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
++        am_cv_CXX_dependencies_compiler_type=$depmode
++        break
++      fi
++    fi
++  done
++
++  cd ..
++  rm -rf conftest.dir
++else
++  am_cv_CXX_dependencies_compiler_type=none
++fi
++
++fi
++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 
++  test "x$enable_dependency_tracking" != xno \
++  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
++  am__fastdepCXX_TRUE=
++  am__fastdepCXX_FALSE='#'
++else
++  am__fastdepCXX_TRUE='#'
++  am__fastdepCXX_FALSE=
++fi
++
++
++
++
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 
++    (test "X$CXX" != "Xg++"))) ; then
++  ac_ext=cc
++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
++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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++      # Double quotes because CXXCPP needs to be expanded
++    for CXXCPP in "$CXX -E" "/lib/cpp"
++    do
++      ac_preproc_ok=false
++for ac_cxx_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@ifdef __STDC__
++@%:@ include <limits.h>
++@%:@else
++@%:@ include <assert.h>
++@%:@endif
++		     Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_cxx_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether non-existent headers
++  # can be detected and how.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_cxx_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  # Broken: success on invalid input.
++continue
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++  break
++fi
++
++    done
++    ac_cv_prog_CXXCPP=$CXXCPP
++  
++fi
++  CXXCPP=$ac_cv_prog_CXXCPP
++else
++  ac_cv_prog_CXXCPP=$CXXCPP
++fi
++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
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@ifdef __STDC__
++@%:@ include <limits.h>
++@%:@else
++@%:@ include <assert.h>
++@%:@endif
++		     Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_cxx_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether non-existent headers
++  # can be detected and how.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_cxx_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  # Broken: success on invalid input.
++continue
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++  :
++else
++  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
++See \`config.log' for more details." >&5
++echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++ac_ext=cc
++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
++
++fi
++
++
++ac_ext=f
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
++if test -n "$ac_tool_prefix"; then
++  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
++  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
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_F77+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$F77"; then
++  ac_cv_prog_F77="$F77" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++F77=$ac_cv_prog_F77
++if test -n "$F77"; then
++  echo "$as_me:$LINENO: result: $F77" >&5
++echo "${ECHO_T}$F77" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++    test -n "$F77" && break
++  done
++fi
++if test -z "$F77"; then
++  ac_ct_F77=$F77
++  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++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_F77+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_F77"; then
++  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_F77="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++ac_ct_F77=$ac_cv_prog_ac_ct_F77
++if test -n "$ac_ct_F77"; then
++  echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
++echo "${ECHO_T}$ac_ct_F77" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$ac_ct_F77" && break
++done
++
++  F77=$ac_ct_F77
++fi
++
++
++# Provide some information about the compiler.
++echo "$as_me:__oline__:" \
++     "checking for Fortran 77 compiler version" >&5
++ac_compiler=`set X $ac_compile; echo $2`
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
++  (eval $ac_compiler --version </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
++  (eval $ac_compiler -v </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
++  (eval $ac_compiler -V </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++rm -f a.out
++
++# If we don't use `.F' as extension, the preprocessor is not run on the
++# input file.  (Note that this only needs to work for GNU compilers.)
++ac_save_ext=$ac_ext
++ac_ext=F
++echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
++if test "${ac_cv_f77_compiler_gnu+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++      program main
++#ifndef __GNUC__
++       choke me
++#endif
++
++      end
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_compiler_gnu=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_compiler_gnu=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_f77_compiler_gnu=$ac_compiler_gnu
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
++ac_ext=$ac_save_ext
++ac_test_FFLAGS=${FFLAGS+set}
++ac_save_FFLAGS=$FFLAGS
++FFLAGS=
++echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
++echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
++if test "${ac_cv_prog_f77_g+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  FFLAGS=-g
++cat >conftest.$ac_ext <<_ACEOF
++      program main
++
++      end
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_prog_f77_g=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_prog_f77_g=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
++echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
++if test "$ac_test_FFLAGS" = set; then
++  FFLAGS=$ac_save_FFLAGS
++elif test $ac_cv_prog_f77_g = yes; then
++  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
++    FFLAGS="-g -O2"
++  else
++    FFLAGS="-g"
++  fi
++else
++  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
++    FFLAGS="-O2"
++  else
++    FFLAGS=
++  fi
++fi
++
++G77=`test $ac_compiler_gnu = yes && echo yes`
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
++
++# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
++
++# find the maximum length of command line arguments
++echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
++echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
++if test "${lt_cv_sys_max_cmd_len+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++    i=0
++  teststring="ABCD"
++
++  case $build_os in
++  msdosdjgpp*)
++    # On DJGPP, this test can blow up pretty badly due to problems in libc
++    # (any single argument exceeding 2000 bytes causes a buffer overrun
++    # during glob expansion).  Even if it were fixed, the result of this
++    # check would be larger than it should be.
++    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
++    ;;
++
++  gnu*)
++    # Under GNU Hurd, this test is not required because there is
++    # no limit to the length of command line arguments.
++    # Libtool will interpret -1 as no limit whatsoever
++    lt_cv_sys_max_cmd_len=-1;
++    ;;
++
++  cygwin* | mingw*)
++    # On Win9x/ME, this test blows up -- it succeeds, but takes
++    # about 5 minutes as the teststring grows exponentially.
++    # Worse, since 9x/ME are not pre-emptively multitasking,
++    # you end up with a "frozen" computer, even though with patience
++    # the test eventually succeeds (with a max line length of 256k).
++    # Instead, let's just punt: use the minimum linelength reported by
++    # all of the supported platforms: 8192 (on NT/2K/XP).
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
++
++  amigaos*)
++    # On AmigaOS with pdksh, this test takes hours, literally.
++    # So we just punt and use a minimum line length of 8192.
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
++
++  netbsd* | freebsd* | openbsd* | darwin* )
++    # This has been around since 386BSD, at least.  Likely further.
++    if test -x /sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++    elif test -x /usr/sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++    else
++      lt_cv_sys_max_cmd_len=65536 # usable default for *BSD
++    fi
++    # And add a safety zone
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++    ;;
++
++ *)
++    # If test is not a shell built-in, we'll probably end up computing a
++    # maximum length that is only half of the actual maximum length, but
++    # we can't tell.
++    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
++	       = "XX$teststring") >/dev/null 2>&1 &&
++	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
++	    lt_cv_sys_max_cmd_len=$new_result &&
++	    test $i != 17 # 1/2 MB should be enough
++    do
++      i=`expr $i + 1`
++      teststring=$teststring$teststring
++    done
++    teststring=
++    # Add a significant safety factor because C++ compilers can tack on massive
++    # amounts of additional arguments before passing them to the linker.
++    # It appears as though 1/2 is a usable value.
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++    ;;
++  esac
++
++fi
++
++if test -n $lt_cv_sys_max_cmd_len ; then
++  echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
++echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
++else
++  echo "$as_me:$LINENO: result: none" >&5
++echo "${ECHO_T}none" >&6
++fi
++
++
++
++
++# Check for command to grab the raw symbol name followed by C symbol from nm.
++echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
++echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
++if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++# These are sane defaults that work on at least a few old systems.
++# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
++
++# Character class describing NM global symbol codes.
++symcode='[BCDEGRST]'
++
++# Regexp to match symbols that can be accessed directly from C.
++sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
++
++# Transform the above into a raw symbol and a C symbol.
++symxfrm='\1 \2\3 \3'
++
++# Transform an extracted symbol line into a proper C declaration
++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
++
++# Transform an extracted symbol line into symbol name and symbol address
++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++
++# Define system-specific variables.
++case $host_os in
++aix*)
++  symcode='[BCDT]'
++  ;;
++cygwin* | mingw* | pw32*)
++  symcode='[ABCDGISTW]'
++  ;;
++hpux*) # Its linker distinguishes data from code symbols
++  if test "$host_cpu" = ia64; then
++    symcode='[ABCDEGRST]'
++  fi
++  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++  ;;
++linux*)
++  if test "$host_cpu" = ia64; then
++    symcode='[ABCDGIRSTW]'
++    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++  fi
++  ;;
++irix* | nonstopux*)
++  symcode='[BCDEGRST]'
++  ;;
++osf*)
++  symcode='[BCDEGQRST]'
++  ;;
++solaris* | sysv5*)
++  symcode='[BDRT]'
++  ;;
++sysv4)
++  symcode='[DFNSTU]'
++  ;;
++esac
++
++# Handle CRLF in mingw tool chain
++opt_cr=
++case $build_os in
++mingw*)
++  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
++  ;;
++esac
++
++# If we're using GNU nm, then use its standard symbol codes.
++case `$NM -V 2>&1` in
++*GNU* | *'with BFD'*)
++  symcode='[ABCDGIRSTW]' ;;
++esac
++
++# Try without a prefix undercore, then with it.
++for ac_symprfx in "" "_"; do
++
++  # Write the raw and C identifiers.
++  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++
++  # Check to see that the pipe works correctly.
++  pipe_works=no
++
++  rm -f conftest*
++  cat > conftest.$ac_ext <<EOF
++#ifdef __cplusplus
++extern "C" {
++#endif
++char nm_test_var;
++void nm_test_func(){}
++#ifdef __cplusplus
++}
++#endif
++int main(){nm_test_var='a';nm_test_func();return(0);}
++EOF
++
++  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++    # Now try to grab the symbols.
++    nlist=conftest.nm
++    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
++  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s "$nlist"; then
++      # Try sorting and uniquifying the output.
++      if sort "$nlist" | uniq > "$nlist"T; then
++	mv -f "$nlist"T "$nlist"
++      else
++	rm -f "$nlist"T
++      fi
++
++      # Make sure that we snagged all the symbols we need.
++      if grep ' nm_test_var$' "$nlist" >/dev/null; then
++	if grep ' nm_test_func$' "$nlist" >/dev/null; then
++	  cat <<EOF > conftest.$ac_ext
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++EOF
++	  # Now generate the symbol file.
++	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
++
++	  cat <<EOF >> conftest.$ac_ext
++#if defined (__STDC__) && __STDC__
++# define lt_ptr_t void *
++#else
++# define lt_ptr_t char *
++# define const
++#endif
++
++/* The mapping between symbol names and symbols. */
++const struct {
++  const char *name;
++  lt_ptr_t address;
++}
++lt_preloaded_symbols[] =
++{
++EOF
++	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
++	  cat <<\EOF >> conftest.$ac_ext
++  {0, (lt_ptr_t) 0}
++};
++
++#ifdef __cplusplus
++}
++#endif
++EOF
++	  # Now try linking the two files.
++	  mv conftest.$ac_objext conftstm.$ac_objext
++	  lt_save_LIBS="$LIBS"
++	  lt_save_CFLAGS="$CFLAGS"
++	  LIBS="conftstm.$ac_objext"
++	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
++	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext}; then
++	    pipe_works=yes
++	  fi
++	  LIBS="$lt_save_LIBS"
++	  CFLAGS="$lt_save_CFLAGS"
++	else
++	  echo "cannot find nm_test_func in $nlist" >&5
++	fi
++      else
++	echo "cannot find nm_test_var in $nlist" >&5
++      fi
++    else
++      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
++    fi
++  else
++    echo "$progname: failed program was:" >&5
++    cat conftest.$ac_ext >&5
++  fi
++  rm -f conftest* conftst*
++
++  # Do not use the global_symbol_pipe unless it works.
++  if test "$pipe_works" = yes; then
++    break
++  else
++    lt_cv_sys_global_symbol_pipe=
++  fi
++done
++
++fi
++
++if test -z "$lt_cv_sys_global_symbol_pipe"; then
++  lt_cv_sys_global_symbol_to_cdecl=
++fi
++if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
++  echo "$as_me:$LINENO: result: failed" >&5
++echo "${ECHO_T}failed" >&6
++else
++  echo "$as_me:$LINENO: result: ok" >&5
++echo "${ECHO_T}ok" >&6
++fi
++
++echo "$as_me:$LINENO: checking for objdir" >&5
++echo $ECHO_N "checking for objdir... $ECHO_C" >&6
++if test "${lt_cv_objdir+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  rm -f .libs 2>/dev/null
++mkdir .libs 2>/dev/null
++if test -d .libs; then
++  lt_cv_objdir=.libs
++else
++  # MS-DOS does not allow filenames that begin with a dot.
++  lt_cv_objdir=_libs
++fi
++rmdir .libs 2>/dev/null
++fi
++echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
++echo "${ECHO_T}$lt_cv_objdir" >&6
++objdir=$lt_cv_objdir
++
++
++
++
++
++case $host_os in
++aix3*)
++  # AIX sometimes has problems with the GCC collect2 program.  For some
++  # reason, if we set the COLLECT_NAMES environment variable, the problems
++  # vanish in a puff of smoke.
++  if test "X${COLLECT_NAMES+set}" != Xset; then
++    COLLECT_NAMES=
++    export COLLECT_NAMES
++  fi
++  ;;
++esac
++
++# Sed substitution that helps us do robust quoting.  It backslashifies
++# metacharacters that are still active within double-quoted strings.
++Xsed='sed -e s/^X//'
++sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
++
++# Same as above, but do not quote variable references.
++double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
++
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++
++# Sed substitution to avoid accidental globbing in evaled expressions
++no_glob_subst='s/\*/\\\*/g'
++
++# Constants:
++rm="rm -f"
++
++# Global variables:
++default_ofile=libtool
++can_build_shared=yes
++
++# All known linkers require a `.a' archive for static linking (except M$VC,
++# which needs '.lib').
++libext=a
++ltmain="$ac_aux_dir/ltmain.sh"
++ofile="$default_ofile"
++with_gnu_ld="$lt_cv_prog_gnu_ld"
++
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ar; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_AR+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$AR"; then
++  ac_cv_prog_AR="$AR" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_AR="${ac_tool_prefix}ar"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++AR=$ac_cv_prog_AR
++if test -n "$AR"; then
++  echo "$as_me:$LINENO: result: $AR" >&5
++echo "${ECHO_T}$AR" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_AR"; then
++  ac_ct_AR=$AR
++  # Extract the first word of "ar", so it can be a program name with args.
++set dummy ar; ac_word=$2
++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_AR+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_AR"; then
++  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_AR="ar"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
++fi
++fi
++ac_ct_AR=$ac_cv_prog_ac_ct_AR
++if test -n "$ac_ct_AR"; then
++  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
++echo "${ECHO_T}$ac_ct_AR" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  AR=$ac_ct_AR
++else
++  AR="$ac_cv_prog_AR"
++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
++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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$RANLIB"; then
++  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++RANLIB=$ac_cv_prog_RANLIB
++if test -n "$RANLIB"; then
++  echo "$as_me:$LINENO: result: $RANLIB" >&5
++echo "${ECHO_T}$RANLIB" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++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
++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
++  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.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_RANLIB="ranlib"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
++fi
++fi
++ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
++if test -n "$ac_ct_RANLIB"; then
++  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
++echo "${ECHO_T}$ac_ct_RANLIB" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  RANLIB=$ac_ct_RANLIB
++else
++  RANLIB="$ac_cv_prog_RANLIB"
++fi
++
++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
++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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$STRIP"; then
++  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++STRIP=$ac_cv_prog_STRIP
++if test -n "$STRIP"; then
++  echo "$as_me:$LINENO: result: $STRIP" >&5
++echo "${ECHO_T}$STRIP" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++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
++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
++  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.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_STRIP="strip"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
++fi
++fi
++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
++if test -n "$ac_ct_STRIP"; then
++  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++echo "${ECHO_T}$ac_ct_STRIP" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  STRIP=$ac_ct_STRIP
++else
++  STRIP="$ac_cv_prog_STRIP"
++fi
++
++
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
++
++# Set sane defaults for various variables
++test -z "$AR" && AR=ar
++test -z "$AR_FLAGS" && AR_FLAGS=cru
++test -z "$AS" && AS=as
++test -z "$CC" && CC=cc
++test -z "$LTCC" && LTCC=$CC
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++test -z "$LD" && LD=ld
++test -z "$LN_S" && LN_S="ln -s"
++test -z "$MAGIC_CMD" && MAGIC_CMD=file
++test -z "$NM" && NM=nm
++test -z "$SED" && SED=sed
++test -z "$OBJDUMP" && OBJDUMP=objdump
++test -z "$RANLIB" && RANLIB=:
++test -z "$STRIP" && STRIP=:
++test -z "$ac_objext" && ac_objext=o
++
++# Determine commands to create old-style static archives.
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++old_postinstall_cmds='chmod 644 $oldlib'
++old_postuninstall_cmds=
++
++if test -n "$RANLIB"; then
++  case $host_os in
++  openbsd*)
++    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
++    ;;
++  *)
++    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++    ;;
++  esac
++  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++fi
++
++cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++
++# Only perform the check for file, if the check method requires it
++case $deplibs_check_method in
++file_magic*)
++  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
++    echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
++echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $MAGIC_CMD in
++[\\/*] |  ?:[\\/]*)
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++  ;;
++*)
++  lt_save_MAGIC_CMD="$MAGIC_CMD"
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
++  for ac_dir in $ac_dummy; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/${ac_tool_prefix}file; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
++      if test -n "$file_magic_test_file"; then
++	case $deplibs_check_method in
++	"file_magic "*)
++	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++	    $EGREP "$file_magic_regex" > /dev/null; then
++	    :
++	  else
++	    cat <<EOF 1>&2
++
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool@gnu.org
++
++EOF
++	  fi ;;
++	esac
++      fi
++      break
++    fi
++  done
++  IFS="$lt_save_ifs"
++  MAGIC_CMD="$lt_save_MAGIC_CMD"
++  ;;
++esac
++fi
++
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++echo "${ECHO_T}$MAGIC_CMD" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++if test -z "$lt_cv_path_MAGIC_CMD"; then
++  if test -n "$ac_tool_prefix"; then
++    echo "$as_me:$LINENO: checking for file" >&5
++echo $ECHO_N "checking for file... $ECHO_C" >&6
++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $MAGIC_CMD in
++[\\/*] |  ?:[\\/]*)
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++  ;;
++*)
++  lt_save_MAGIC_CMD="$MAGIC_CMD"
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
++  for ac_dir in $ac_dummy; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/file; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/file"
++      if test -n "$file_magic_test_file"; then
++	case $deplibs_check_method in
++	"file_magic "*)
++	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++	    $EGREP "$file_magic_regex" > /dev/null; then
++	    :
++	  else
++	    cat <<EOF 1>&2
++
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool@gnu.org
++
++EOF
++	  fi ;;
++	esac
++      fi
++      break
++    fi
++  done
++  IFS="$lt_save_ifs"
++  MAGIC_CMD="$lt_save_MAGIC_CMD"
++  ;;
++esac
++fi
++
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++echo "${ECHO_T}$MAGIC_CMD" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  else
++    MAGIC_CMD=:
++  fi
++fi
++
++  fi
++  ;;
++esac
++
++enable_dlopen=no
++enable_win32_dll=yes
++
++# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
++if test "${enable_libtool_lock+set}" = set; then
++  enableval="$enable_libtool_lock"
++  
++fi; 
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++
++
++# Check whether --with-pic or --without-pic was given.
++if test "${with_pic+set}" = set; then
++  withval="$with_pic"
++  pic_mode="$withval"
++else
++  pic_mode=default
++fi; 
++test -z "$pic_mode" && pic_mode=default
++
++# Use C for the default configuration in the libtool script
++tagname=
++lt_save_CC="$CC"
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
++# Source file extension for C test sources.
++ac_ext=c
++
++# Object file extension for compiled C test sources.
++objext=o
++objext=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="int some_variable = 0;\n"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code='int main(){return(0);}\n'
++
++
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
++
++# Allow CC to be a program name with arguments.
++compiler=$CC
++
++
++#
++# Check for any special shared library compilation flags.
++#
++lt_prog_cc_shlib=
++if test "$GCC" = no; then
++  case $host_os in
++  sco3.2v5*)
++    lt_prog_cc_shlib='-belf'
++    ;;
++  esac
++fi
++if test -n "$lt_prog_cc_shlib"; then
++  { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5
++echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;}
++  if echo "$old_CC $old_CFLAGS " | grep "[ 	]$lt_prog_cc_shlib[ 	]" >/dev/null; then :
++  else
++    { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
++echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
++    lt_cv_prog_cc_can_build_shared=no
++  fi
++fi
++
++
++#
++# Check to make sure the static flag actually works.
++#
++echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6
++if test "${lt_prog_compiler_static_works+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_static_works=no
++   save_LDFLAGS="$LDFLAGS"
++   LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
++   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test -s conftest.err; then
++       # Append any errors to the config.log.
++       cat conftest.err 1>&5
++     else
++       lt_prog_compiler_static_works=yes
++     fi
++   fi
++   $rm conftest*
++   LDFLAGS="$save_LDFLAGS"
++
++fi
++echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
++
++if test x"$lt_prog_compiler_static_works" = xyes; then
++    :
++else
++    lt_prog_compiler_static=
++fi
++
++
++
++
++lt_prog_compiler_no_builtin_flag=
++
++if test "$GCC" = yes; then
++  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
++
++  
++echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
++if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_prog_compiler_rtti_exceptions=no
++  ac_outfile=conftest.$ac_objext
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="-fno-rtti -fno-exceptions"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:__oline__: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s conftest.err; then
++       lt_cv_prog_compiler_rtti_exceptions=yes
++     fi
++   fi
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
++
++if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
++    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
++else
++    :
++fi
++
++fi
++
++lt_prog_compiler_wl=
++lt_prog_compiler_pic=
++lt_prog_compiler_static=
++
++echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++ 
++  if test "$GCC" = yes; then
++    lt_prog_compiler_wl='-Wl,'
++    lt_prog_compiler_static='-static'
++
++    case $host_os in
++      aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static='-Bstatic'
++      fi
++      ;;
++
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
++      ;;
++
++    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic='-DDLL_EXPORT'
++      ;;
++
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_prog_compiler_pic='-fno-common'
++      ;;
++
++    msdosdjgpp*)
++      # Just because we use GCC doesn't mean we suddenly get shared libraries
++      # on systems that don't support them.
++      lt_prog_compiler_can_build_shared=no
++      enable_shared=no
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	lt_prog_compiler_pic=-Kconform_pic
++      fi
++      ;;
++
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic='-fPIC'
++	;;
++      esac
++      ;;
++
++    *)
++      lt_prog_compiler_pic='-fPIC'
++      ;;
++    esac
++  else
++    # PORTME Check for flag to pass linker flags through the system compiler.
++    case $host_os in
++    aix*)
++      lt_prog_compiler_wl='-Wl,'
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static='-Bstatic'
++      else
++	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
++      fi
++      ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case "$cc_basename" in
++         xlc*)
++         lt_prog_compiler_pic='-qnocommon'
++         lt_prog_compiler_wl='-Wl,'
++         ;;
++       esac
++       ;;
++
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic='-DDLL_EXPORT'
++      ;;
++
++    hpux9* | hpux10* | hpux11*)
++      lt_prog_compiler_wl='-Wl,'
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic='+Z'
++	;;
++      esac
++      # Is there a better lt_prog_compiler_static that works with the bundled CC?
++      lt_prog_compiler_static='${wl}-a ${wl}archive'
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      lt_prog_compiler_wl='-Wl,'
++      # PIC (with -KPIC) is the default.
++      lt_prog_compiler_static='-non_shared'
++      ;;
++
++    newsos6)
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
++
++    linux*)
++      case $CC in
++      icc* | ecc*)
++	lt_prog_compiler_wl='-Wl,'
++	lt_prog_compiler_pic='-KPIC'
++	lt_prog_compiler_static='-static'
++        ;;
++      ccc*)
++        lt_prog_compiler_wl='-Wl,'
++        # All Alpha code is PIC.
++        lt_prog_compiler_static='-non_shared'
++        ;;
++      esac
++      ;;
++
++    osf3* | osf4* | osf5*)
++      lt_prog_compiler_wl='-Wl,'
++      # All OSF/1 code is PIC.
++      lt_prog_compiler_static='-non_shared'
++      ;;
++
++    sco3.2v5*)
++      lt_prog_compiler_pic='-Kpic'
++      lt_prog_compiler_static='-dn'
++      ;;
++
++    solaris*)
++      lt_prog_compiler_wl='-Wl,'
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
++
++    sunos4*)
++      lt_prog_compiler_wl='-Qoption ld '
++      lt_prog_compiler_pic='-PIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
++
++    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++      lt_prog_compiler_wl='-Wl,'
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	lt_prog_compiler_pic='-Kconform_pic'
++	lt_prog_compiler_static='-Bstatic'
++      fi
++      ;;
++
++    uts4*)
++      lt_prog_compiler_pic='-pic'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
++
++    *)
++      lt_prog_compiler_can_build_shared=no
++      ;;
++    esac
++  fi
++
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic" >&6
++
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$lt_prog_compiler_pic"; then
++  
++echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
++if test "${lt_prog_compiler_pic_works+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_pic_works=no
++  ac_outfile=conftest.$ac_objext
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:__oline__: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s conftest.err; then
++       lt_prog_compiler_pic_works=yes
++     fi
++   fi
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
++
++if test x"$lt_prog_compiler_pic_works" = xyes; then
++    case $lt_prog_compiler_pic in
++     "" | " "*) ;;
++     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
++     esac
++else
++    lt_prog_compiler_pic=
++     lt_prog_compiler_can_build_shared=no
++fi
++
++fi
++case "$host_os" in
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    lt_prog_compiler_pic=
++    ;;
++  *)
++    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
++    ;;
++esac
++
++echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++if test "${lt_cv_prog_compiler_c_o+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_prog_compiler_c_o=no
++   $rm -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&5
++   echo "$as_me:__oline__: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s out/conftest2.$ac_objext
++   then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s out/conftest.err; then
++       lt_cv_prog_compiler_c_o=yes
++     fi
++   fi
++   chmod u+w .
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
++   cd ..
++   rmdir conftest
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
++
++
++hard_links="nottested"
++if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6
++  if test "$hard_links" = no; then
++    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
++
++echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++
++  runpath_var=
++  allow_undefined_flag=
++  enable_shared_with_static_runtimes=no
++  archive_cmds=
++  archive_expsym_cmds=
++  old_archive_From_new_cmds=
++  old_archive_from_expsyms_cmds=
++  export_dynamic_flag_spec=
++  whole_archive_flag_spec=
++  thread_safe_flag_spec=
++  hardcode_libdir_flag_spec=
++  hardcode_libdir_flag_spec_ld=
++  hardcode_libdir_separator=
++  hardcode_direct=no
++  hardcode_minus_L=no
++  hardcode_shlibpath_var=unsupported
++  link_all_deplibs=unknown
++  hardcode_automatic=no
++  module_cmds=
++  module_expsym_cmds=
++  always_export_symbols=no
++  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  # include_expsyms should be a list of space-separated symbols to be *always*
++  # included in the symbol list
++  include_expsyms=
++  # exclude_expsyms can be an extended regexp of symbols to exclude
++  # it will be wrapped by ` (' and `)$', so one must not match beginning or
++  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++  # as well as any symbol that contains `d'.
++  exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
++  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++  # platforms (ab)use it in PIC code, but their linkers get confused if
++  # the symbol is explicitly referenced.  Since portable code cannot
++  # rely on this symbol name, it's probably fine to never include it in
++  # preloaded symbol tables.
++  extract_expsyms_cmds=
++
++  case $host_os in
++  cygwin* | mingw* | pw32*)
++    # FIXME: the MSVC++ port hasn't been tested in a loooong time
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    if test "$GCC" != yes; then
++      with_gnu_ld=no
++    fi
++    ;;
++  openbsd*)
++    with_gnu_ld=no
++    ;;
++  esac
++
++  ld_shlibs=yes
++  if test "$with_gnu_ld" = yes; then
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    wlarc='${wl}'
++
++    # See if GNU ld supports shared libraries.
++    case $host_os in
++    aix3* | aix4* | aix5*)
++      # On AIX/PPC, the GNU linker is very broken
++      if test "$host_cpu" != ia64; then
++	ld_shlibs=no
++	cat <<EOF 1>&2
++
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
++
++EOF
++      fi
++      ;;
++
++    amigaos*)
++      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_minus_L=yes
++
++      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
++      # that the semantics of dynamic libraries on AmigaOS, at least up
++      # to version 4, is to share data among multiple programs linked
++      # with the same dynamic library.  Since this doesn't match the
++      # behavior of shared libraries on other platforms, we can't use
++      # them.
++      ld_shlibs=no
++      ;;
++
++    beos*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	allow_undefined_flag=unsupported
++	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++	# support --undefined.  This deserves some investigation.  FIXME
++	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
++      # as there is no search path for DLLs.
++      hardcode_libdir_flag_spec='-L$libdir'
++      allow_undefined_flag=unsupported
++      always_export_symbols=no
++      enable_shared_with_static_runtimes=yes
++      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++
++      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++	# If the export-symbols file already is a .def file (1st line
++	# is EXPORTS), use it as is; otherwise, prepend...
++	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	  cp $export_symbols $output_objdir/$soname.def;
++	else
++	  echo EXPORTS > $output_objdir/$soname.def;
++	  cat $export_symbols >> $output_objdir/$soname.def;
++	fi~
++	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
++    netbsd*)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++	wlarc=
++      else
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      fi
++      ;;
++
++    solaris* | sysv5*)
++      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
++	ld_shlibs=no
++	cat <<EOF 1>&2
++
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++EOF
++      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
++    sunos4*)
++      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      wlarc=
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
++
++  linux*)
++    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_cmds="$tmp_archive_cmds"
++      supports_anon_versioning=no
++      case `$LD -v 2>/dev/null` in
++        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
++        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++        *\ 2.11.*) ;; # other 2.11 versions
++        *) supports_anon_versioning=yes ;;
++      esac
++      if test $supports_anon_versioning = yes; then
++        archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
++cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++$echo "local: *; };" >> $output_objdir/$libname.ver~
++        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++      else
++        archive_expsym_cmds="$tmp_archive_cmds"
++      fi
++    else
++      ld_shlibs=no
++    fi
++    ;;
++
++    *)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
++    esac
++
++    if test "$ld_shlibs" = yes; then
++      runpath_var=LD_RUN_PATH
++      hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
++      export_dynamic_flag_spec='${wl}--export-dynamic'
++      # ancient GNU ld didn't support --whole-archive et. al.
++      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++ 	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	whole_archive_flag_spec=
++      fi
++    fi
++  else
++    # PORTME fill in a description of your system's linker (not GNU ld)
++    case $host_os in
++    aix3*)
++      allow_undefined_flag=unsupported
++      always_export_symbols=yes
++      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
++      # Note: this linker hardcodes the directories in LIBPATH if there
++      # are no directories specified by -L.
++      hardcode_minus_L=yes
++      if test "$GCC" = yes && test -z "$link_static_flag"; then
++	# Neither direct hardcoding nor static linking is supported with a
++	# broken collect2.
++	hardcode_direct=unsupported
++      fi
++      ;;
++
++    aix4* | aix5*)
++      if test "$host_cpu" = ia64; then
++	# On IA64, the linker does run time linking by default, so we don't
++	# have to do anything special.
++	aix_use_runtimelinking=no
++	exp_sym_flag='-Bexport'
++	no_entry_flag=""
++      else
++	# If we're using GNU nm, then we don't want the "-C" option.
++	# -C means demangle to AIX nm, but means don't demangle with GNU nm
++	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
++	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++	else
++	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++	fi
++	aix_use_runtimelinking=no
++
++	# Test if we are trying to use run time linking or normal
++	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
++	# need to do runtime linking.
++	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++	  for ld_flag in $LDFLAGS; do
++  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++  	    aix_use_runtimelinking=yes
++  	    break
++  	  fi
++	  done
++	esac
++
++	exp_sym_flag='-bexport'
++	no_entry_flag='-bnoentry'
++      fi
++
++      # When large executables or shared objects are built, AIX ld can
++      # have problems creating the table of contents.  If linking a library
++      # or program results in "error TOC overflow" add -mminimal-toc to
++      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++      archive_cmds=''
++      hardcode_direct=yes
++      hardcode_libdir_separator=':'
++      link_all_deplibs=yes
++
++      if test "$GCC" = yes; then
++	case $host_os in aix4.012|aix4.012.*)
++	# We only want to do this on AIX 4.2 and lower, the check
++	# below for broken collect2 doesn't work under 4.3+
++	  collect2name=`${CC} -print-prog-name=collect2`
++	  if test -f "$collect2name" && \
++  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	  then
++  	  # We have reworked collect2
++  	  hardcode_direct=yes
++	  else
++  	  # We have old collect2
++  	  hardcode_direct=unsupported
++  	  # It fails to find uninstalled libraries when the uninstalled
++  	  # path is not listed in the libpath.  Setting hardcode_minus_L
++  	  # to unsupported forces relinking
++  	  hardcode_minus_L=yes
++  	  hardcode_libdir_flag_spec='-L$libdir'
++  	  hardcode_libdir_separator=
++	  fi
++	esac
++	shared_flag='-shared'
++      else
++	# not using gcc
++	if test "$host_cpu" = ia64; then
++  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++  	# chokes on -Wl,-G. The following line is correct:
++	  shared_flag='-G'
++	else
++  	if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag='${wl}-G'
++	  else
++	    shared_flag='${wl}-bM:SRE'
++  	fi
++	fi
++      fi
++
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      always_export_symbols=yes
++      if test "$aix_use_runtimelinking" = yes; then
++	# Warning - without using the other runtime loading flags (-brtl),
++	# -berok will link without error, but may produce a broken library.
++	allow_undefined_flag='-berok'
++       # Determine the default libpath from the value encoded in an empty executable.
++       cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
++	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++       else
++	if test "$host_cpu" = ia64; then
++	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
++	  allow_undefined_flag="-z nodefs"
++	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++	else
++	 # Determine the default libpath from the value encoded in an empty executable.
++	 cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
++	  # Warning - without using the other run time loading flags,
++	  # -berok will link without error, but may produce a broken library.
++	  no_undefined_flag=' ${wl}-bernotok'
++	  allow_undefined_flag=' ${wl}-berok'
++	  # -bexpall does not export symbols beginning with underscore (_)
++	  always_export_symbols=yes
++	  # Exported symbols can be pulled into shared objects from archives
++	  whole_archive_flag_spec=' '
++	  archive_cmds_need_lc=yes
++	  # This is similar to how AIX traditionally builds it's shared libraries.
++	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	fi
++      fi
++      ;;
++
++    amigaos*)
++      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_minus_L=yes
++      # see comment about different semantics on the GNU ld section
++      ld_shlibs=no
++      ;;
++
++    bsdi[45]*)
++      export_dynamic_flag_spec=-rdynamic
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # When not using gcc, we currently assume that we are using
++      # Microsoft Visual C++.
++      # hardcode_libdir_flag_spec is actually meaningless, as there is
++      # no search path for DLLs.
++      hardcode_libdir_flag_spec=' '
++      allow_undefined_flag=unsupported
++      # Tell ltmain to make .lib files, not .a files.
++      libext=lib
++      # Tell ltmain to make .dll files, not .so files.
++      shrext_cmds=".dll"
++      # FIXME: Setting linknames here is a bad hack.
++      archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      # The linker will automatically build a .lib file if we build a DLL.
++      old_archive_From_new_cmds='true'
++      # FIXME: Should let the user specify the lib program.
++      old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      enable_shared_with_static_runtimes=yes
++      ;;
++
++    darwin* | rhapsody*)
++      case "$host_os" in
++        rhapsody* | darwin1.[012])
++         allow_undefined_flag='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[012])
++               allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++      esac
++      archive_cmds_need_lc=no
++      hardcode_direct=no
++      hardcode_automatic=yes
++      hardcode_shlibpath_var=unsupported
++      whole_archive_flag_spec=''
++      link_all_deplibs=yes
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++    else
++      case "$cc_basename" in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         ld_shlibs=no
++          ;;
++      esac
++    fi
++      ;;
++
++    dgux*)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_shlibpath_var=no
++      ;;
++
++    freebsd1*)
++      ld_shlibs=no
++      ;;
++
++    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++    # support.  Future versions do this automatically, but an explicit c++rt0.o
++    # does not break anything, and helps significantly (at the cost of a little
++    # extra space).
++    freebsd2.2*)
++      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
++
++    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++    freebsd2*)
++      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct=yes
++      hardcode_minus_L=yes
++      hardcode_shlibpath_var=no
++      ;;
++
++    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++    freebsd* | kfreebsd*-gnu)
++      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
++
++    hpux9*)
++      if test "$GCC" = yes; then
++	archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      else
++	archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      fi
++      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++      hardcode_libdir_separator=:
++      hardcode_direct=yes
++
++      # hardcode_minus_L: Not really in the search PATH,
++      # but as the default location of the library.
++      hardcode_minus_L=yes
++      export_dynamic_flag_spec='${wl}-E'
++      ;;
++
++    hpux10* | hpux11*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	esac
++      else
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	*)
++	  archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	esac
++      fi
++      if test "$with_gnu_ld" = no; then
++	case "$host_cpu" in
++	hppa*64*)
++	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++	  hardcode_libdir_flag_spec_ld='+b $libdir'
++	  hardcode_libdir_separator=:
++	  hardcode_direct=no
++	  hardcode_shlibpath_var=no
++	  ;;
++	ia64*)
++	  hardcode_libdir_flag_spec='-L$libdir'
++	  hardcode_direct=no
++	  hardcode_shlibpath_var=no
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  hardcode_minus_L=yes
++	  ;;
++	*)
++	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++	  hardcode_libdir_separator=:
++	  hardcode_direct=yes
++	  export_dynamic_flag_spec='${wl}-E'
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  hardcode_minus_L=yes
++	  ;;
++	esac
++      fi
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      if test "$GCC" = yes; then
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	hardcode_libdir_flag_spec_ld='-rpath $libdir'
++      fi
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator=:
++      link_all_deplibs=yes
++      ;;
++
++    netbsd*)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++      else
++	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++      fi
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
++
++    newsos6)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct=yes
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator=:
++      hardcode_shlibpath_var=no
++      ;;
++
++    openbsd*)
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec='${wl}-E'
++      else
++       case $host_os in
++	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	   archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	   hardcode_libdir_flag_spec='-R$libdir'
++	   ;;
++	 *)
++	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++	   ;;
++       esac
++      fi
++      ;;
++
++    os2*)
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_minus_L=yes
++      allow_undefined_flag=unsupported
++      archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++      old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++      ;;
++
++    osf3*)
++      if test "$GCC" = yes; then
++	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	allow_undefined_flag=' -expect_unresolved \*'
++	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++      fi
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator=:
++      ;;
++
++    osf4* | osf5*)	# as osf3* with the addition of -msym flag
++      if test "$GCC" = yes; then
++	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      else
++	allow_undefined_flag=' -expect_unresolved \*'
++	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++
++	# Both c and cxx compiler support -rpath directly
++	hardcode_libdir_flag_spec='-rpath $libdir'
++      fi
++      hardcode_libdir_separator=:
++      ;;
++
++    sco3.2v5*)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var=no
++      export_dynamic_flag_spec='${wl}-Bexport'
++      runpath_var=LD_RUN_PATH
++      hardcode_runpath_var=yes
++      ;;
++
++    solaris*)
++      no_undefined_flag=' -z text'
++      if test "$GCC" = yes; then
++	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
++      else
++	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      fi
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_shlibpath_var=no
++      case $host_os in
++      solaris2.[0-5] | solaris2.[0-5].*) ;;
++      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
++	whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
++      esac
++      link_all_deplibs=yes
++      ;;
++
++    sunos4*)
++      if test "x$host_vendor" = xsequent; then
++	# Use $CC to link under sequent, because it throws in some extra .o
++	# files that make .init and .fini sections work.
++	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_direct=yes
++      hardcode_minus_L=yes
++      hardcode_shlibpath_var=no
++      ;;
++
++    sysv4)
++      case $host_vendor in
++	sni)
++	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct=yes # is this really true???
++	;;
++	siemens)
++	  ## LD is ld it makes a PLAMLIB
++	  ## CC just makes a GrossModule.
++	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++	  reload_cmds='$CC -r -o $output$reload_objs'
++	  hardcode_direct=no
++        ;;
++	motorola)
++	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
++	;;
++      esac
++      runpath_var='LD_RUN_PATH'
++      hardcode_shlibpath_var=no
++      ;;
++
++    sysv4.3*)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var=no
++      export_dynamic_flag_spec='-Bexport'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	hardcode_shlibpath_var=no
++	runpath_var=LD_RUN_PATH
++	hardcode_runpath_var=yes
++	ld_shlibs=yes
++      fi
++      ;;
++
++    sysv4.2uw2*)
++      archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct=yes
++      hardcode_minus_L=no
++      hardcode_shlibpath_var=no
++      hardcode_runpath_var=yes
++      runpath_var=LD_RUN_PATH
++      ;;
++
++   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
++      no_undefined_flag='${wl}-z ${wl}text'
++      if test "$GCC" = yes; then
++	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
++      runpath_var='LD_RUN_PATH'
++      hardcode_shlibpath_var=no
++      ;;
++
++    sysv5*)
++      no_undefined_flag=' -z text'
++      # $CC -shared without GNU ld will not create a library from C++
++      # object files and a static libstdc++, better avoid it by now
++      archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      hardcode_libdir_flag_spec=
++      hardcode_shlibpath_var=no
++      runpath_var='LD_RUN_PATH'
++      ;;
++
++    uts4*)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_shlibpath_var=no
++      ;;
++
++    *)
++      ld_shlibs=no
++      ;;
++    esac
++  fi
++
++echo "$as_me:$LINENO: result: $ld_shlibs" >&5
++echo "${ECHO_T}$ld_shlibs" >&6
++test "$ld_shlibs" = no && can_build_shared=no
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
++#
++# Do we need to explicitly link libc?
++#
++case "x$archive_cmds_need_lc" in
++x|xyes)
++  # Assume -lc should be added
++  archive_cmds_need_lc=yes
++
++  if test "$enable_shared" = yes && test "$GCC" = yes; then
++    case $archive_cmds in
++    *'~'*)
++      # FIXME: we may have to deal with multi-command sequences.
++      ;;
++    '$CC '*)
++      # Test whether the compiler implicitly links with -lc since on some
++      # systems, -lgcc has to come before -lc. If gcc already passes -lc
++      # to ld, don't add -lc before -lgcc.
++      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++      $rm conftest*
++      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        libobjs=conftest.$ac_objext
++        deplibs=
++        wl=$lt_prog_compiler_wl
++        compiler_flags=-v
++        linker_flags=-v
++        verstring=
++        output_objdir=.
++        libname=conftest
++        lt_save_allow_undefined_flag=$allow_undefined_flag
++        allow_undefined_flag=
++        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
++  (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++        then
++	  archive_cmds_need_lc=no
++        else
++	  archive_cmds_need_lc=yes
++        fi
++        allow_undefined_flag=$lt_save_allow_undefined_flag
++      else
++        cat conftest.err 1>&5
++      fi
++      $rm conftest*
++      echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
++echo "${ECHO_T}$archive_cmds_need_lc" >&6
++      ;;
++    esac
++  fi
++  ;;
++esac
++
++echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
++need_lib_prefix=unknown
++hardcode_into_libs=no
++
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
++
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  shlibpath_var=LIBPATH
++
++  # AIX 3 has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}${shared_ext}$major'
++  ;;
++
++aix4* | aix5*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[01] | aix4.[01].*)
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	   echo ' yes '
++	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++	:
++      else
++	can_build_shared=no
++      fi
++      ;;
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}${shared_ext}$major'
++    fi
++    shlibpath_var=LIBPATH
++  fi
++  ;;
++
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++  ;;
++
++beos*)
++  library_names_spec='${libname}${shared_ext}'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
++
++bsdi[45]*)
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
++
++cygwin* | mingw* | pw32*)
++  version_type=windows
++  shrext_cmds=".dll"
++  need_version=no
++  need_lib_prefix=no
++
++  case $GCC,$host_os in
++  yes,cygwin* | yes,mingw* | yes,pw32*)
++    library_names_spec='$libname.dll.a'
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $rm \$dlpath'
++    shlibpath_overrides_runpath=yes
++
++    case $host_os in
++    cygwin*)
++      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
++    mingw*)
++      # MinGW DLLs use traditional 'lib' prefix
++      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
++        # It is most probably a Windows format PATH printed by
++        # mingw gcc, but we are running on Cygwin. Gcc prints its search
++        # path with ; separators, and with drive letters. We can handle the
++        # drive letters (cygwin fileutils understands them), so leave them,
++        # especially as we might pass files found there to a mingw objdump,
++        # which wouldn't understand a cygwinified path. Ahh.
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++      fi
++      ;;
++    pw32*)
++      # pw32 DLLs use 'pw' prefix rather than 'lib'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++      ;;
++    esac
++    ;;
++
++  *)
++    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    ;;
++  esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  ;;
++
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  soname_spec='${libname}${release}${major}$shared_ext'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
++  if test "$GCC" = yes; then
++    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
++  else
++    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
++  fi
++  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++  ;;
++
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++freebsd1*)
++  dynamic_linker=no
++  ;;
++
++kfreebsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++freebsd*)
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
++    ;;
++  freebsd3.01* | freebsdelf3.01*)
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
++  *) # from 3.2 on
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
++    ;;
++  esac
++  ;;
++
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  ;;
++
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  case "$host_cpu" in
++  ia64*)
++    shrext_cmds='.so'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.so"
++    shlibpath_var=LD_LIBRARY_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    if test "X$HPUX_IA64_MODE" = X32; then
++      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++    else
++      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++    fi
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    ;;
++   hppa*64*)
++     shrext_cmds='.sl'
++     hardcode_into_libs=yes
++     dynamic_linker="$host_os dld.sl"
++     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++     soname_spec='${libname}${release}${shared_ext}$major'
++     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++     ;;
++   *)
++    shrext_cmds='.sl'
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=SHLIB_PATH
++    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    ;;
++  esac
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
++    *)
++	if test "$lt_cv_prog_gnu_ld" = yes; then
++		version_type=linux
++	else
++		version_type=irix
++	fi ;;
++  esac
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  case $host_os in
++  irix5* | nonstopux*)
++    libsuff= shlibsuff=
++    ;;
++  *)
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++      libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++      libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++      libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  hardcode_into_libs=yes
++  ;;
++
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++  dynamic_linker=no
++  ;;
++
++# This must be Linux ELF.
++linux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
++
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
++
++knetbsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++nto-qnx*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++openbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    case $host_os in
++      openbsd2.[89] | openbsd2.[89].*)
++	shlibpath_overrides_runpath=no
++	;;
++      *)
++	shlibpath_overrides_runpath=yes
++	;;
++      esac
++  else
++    shlibpath_overrides_runpath=yes
++  fi
++  ;;
++
++os2*)
++  libname_spec='$name'
++  shrext_cmds=".dll"
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
++
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
++
++sco3.2v5*)
++  version_type=osf
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
++
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      export_dynamic_flag_spec='${wl}-Blargedynsym'
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
++
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
++
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++*)
++  dynamic_linker=no
++  ;;
++esac
++echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6
++test "$dynamic_linker" = no && can_build_shared=no
++
++echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++hardcode_action=
++if test -n "$hardcode_libdir_flag_spec" || \
++   test -n "$runpath_var" || \
++   test "X$hardcode_automatic" = "Xyes" ; then
++
++  # We can hardcode non-existant directories.
++  if test "$hardcode_direct" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no &&
++     test "$hardcode_minus_L" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action=immediate
++  fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action=unsupported
++fi
++echo "$as_me:$LINENO: result: $hardcode_action" >&5
++echo "${ECHO_T}$hardcode_action" >&6
++
++if test "$hardcode_action" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
++
++striplib=
++old_striplib=
++echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
++echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
++  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++else
++# FIXME - insert some real tests, host_os isn't really good enough
++  case $host_os in
++   darwin*)
++       if test -n "$STRIP" ; then
++         striplib="$STRIP -x"
++         echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++       else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++       ;;
++   *)
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++    ;;
++  esac
++fi
++
++if test "x$enable_dlopen" != xyes; then
++  enable_dlopen=unknown
++  enable_dlopen_self=unknown
++  enable_dlopen_self_static=unknown
++else
++  lt_cv_dlopen=no
++  lt_cv_dlopen_libs=
++
++  case $host_os in
++  beos*)
++    lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ;;
++
++  mingw* | pw32*)
++    lt_cv_dlopen="LoadLibrary"
++    lt_cv_dlopen_libs=
++   ;;
++
++  cygwin*)
++    lt_cv_dlopen="dlopen"
++    lt_cv_dlopen_libs=
++   ;;
++
++  darwin*)
++  # if libdl is installed we need to link against it
++    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dl_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dl_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++if test $ac_cv_lib_dl_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++  
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    
++fi
++
++   ;;
++
++  *)
++    echo "$as_me:$LINENO: checking for shl_load" >&5
++echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
++if test "${ac_cv_func_shl_load+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.  */
++/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define shl_load innocuous_shl_load
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char shl_load (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef shl_load
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char shl_load ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_shl_load) || defined (__stub___shl_load)
++choke me
++#else
++char (*f) () = shl_load;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != shl_load;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_shl_load=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_shl_load=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
++echo "${ECHO_T}$ac_cv_func_shl_load" >&6
++if test $ac_cv_func_shl_load = yes; then
++  lt_cv_dlopen="shl_load"
++else
++  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
++echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
++if test "${ac_cv_lib_dld_shl_load+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char shl_load ();
++int
++main ()
++{
++shl_load ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dld_shl_load=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dld_shl_load=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
++if test $ac_cv_lib_dld_shl_load = yes; then
++  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
++else
++  echo "$as_me:$LINENO: checking for dlopen" >&5
++echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
++if test "${ac_cv_func_dlopen+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.  */
++/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define dlopen innocuous_dlopen
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char dlopen (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef dlopen
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_dlopen) || defined (__stub___dlopen)
++choke me
++#else
++char (*f) () = dlopen;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != dlopen;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
++echo "${ECHO_T}$ac_cv_func_dlopen" >&6
++if test $ac_cv_func_dlopen = yes; then
++  lt_cv_dlopen="dlopen"
++else
++  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dl_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dl_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++if test $ac_cv_lib_dl_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
++echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
++if test "${ac_cv_lib_svld_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsvld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_svld_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_svld_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
++if test $ac_cv_lib_svld_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
++else
++  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
++echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
++if test "${ac_cv_lib_dld_dld_link+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dld_link ();
++int
++main ()
++{
++dld_link ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dld_dld_link=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dld_dld_link=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
++if test $ac_cv_lib_dld_dld_link = yes; then
++  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
++fi
++
++	      
++fi
++
++	    
++fi
++
++	  
++fi
++
++	
++fi
++
++      
++fi
++
++    ;;
++  esac
++
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
++  else
++    enable_dlopen=no
++  fi
++
++  case $lt_cv_dlopen in
++  dlopen)
++    save_CPPFLAGS="$CPPFLAGS"
++    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++
++    save_LDFLAGS="$LDFLAGS"
++    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++
++    save_LIBS="$LIBS"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
++
++    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
++echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
++if test "${lt_cv_dlopen_self+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self=cross
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++#line __oline__ "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}
++EOF
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self=no
++  fi
++fi
++rm -fr conftest*
++
++    
++fi
++echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self" >&6
++
++    if test "x$lt_cv_dlopen_self" = xyes; then
++      LDFLAGS="$LDFLAGS $link_static_flag"
++      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
++echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
++if test "${lt_cv_dlopen_self_static+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self_static=cross
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++#line __oline__ "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}
++EOF
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self_static=no
++  fi
++fi
++rm -fr conftest*
++
++      
++fi
++echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
++    fi
++
++    CPPFLAGS="$save_CPPFLAGS"
++    LDFLAGS="$save_LDFLAGS"
++    LIBS="$save_LIBS"
++    ;;
++  esac
++
++  case $lt_cv_dlopen_self in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
++  esac
++
++  case $lt_cv_dlopen_self_static in
++  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++  *) enable_dlopen_self_static=unknown ;;
++  esac
++fi
++
++
++# Report which librarie types wil actually be built
++echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
++echo "$as_me:$LINENO: result: $can_build_shared" >&5
++echo "${ECHO_T}$can_build_shared" >&6
++
++echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
++test "$can_build_shared" = "no" && enable_shared=no
++
++# On AIX, shared libraries and static libraries use the same namespace, and
++# are all built from PIC.
++case "$host_os" in
++aix3*)
++  test "$enable_shared" = yes && enable_static=no
++  if test -n "$RANLIB"; then
++    archive_cmds="$archive_cmds~\$RANLIB \$lib"
++    postinstall_cmds='$RANLIB $lib'
++  fi
++  ;;
++
++aix4* | aix5*)
++  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++    test "$enable_shared" = yes && enable_static=no
++  fi
++    ;;
++esac
++echo "$as_me:$LINENO: result: $enable_shared" >&5
++echo "${ECHO_T}$enable_shared" >&6
++
++echo "$as_me:$LINENO: checking whether to build static libraries" >&5
++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
++# Make sure either enable_shared or enable_static is yes.
++test "$enable_shared" = yes || enable_static=yes
++echo "$as_me:$LINENO: result: $enable_static" >&5
++echo "${ECHO_T}$enable_static" >&6
++
++# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # See if we are running on zsh, and set the options which allow our commands through
++  # without removal of \ escapes.
++  if test -n "${ZSH_VERSION+set}" ; then
++    setopt NO_GLOB_SUBST
++  fi
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++    SED SHELL STRIP \
++    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++    deplibs_check_method reload_flag reload_cmds need_locks \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    old_postinstall_cmds old_postuninstall_cmds \
++    compiler \
++    CC \
++    LD \
++    lt_prog_compiler_wl \
++    lt_prog_compiler_pic \
++    lt_prog_compiler_static \
++    lt_prog_compiler_no_builtin_flag \
++    export_dynamic_flag_spec \
++    thread_safe_flag_spec \
++    whole_archive_flag_spec \
++    enable_shared_with_static_runtimes \
++    old_archive_cmds \
++    old_archive_from_new_cmds \
++    predep_objects \
++    postdep_objects \
++    predeps \
++    postdeps \
++    compiler_lib_search_path \
++    archive_cmds \
++    archive_expsym_cmds \
++    postinstall_cmds \
++    postuninstall_cmds \
++    old_archive_from_expsyms_cmds \
++    allow_undefined_flag \
++    no_undefined_flag \
++    export_symbols_cmds \
++    hardcode_libdir_flag_spec \
++    hardcode_libdir_flag_spec_ld \
++    hardcode_libdir_separator \
++    hardcode_automatic \
++    module_cmds \
++    module_expsym_cmds \
++    lt_cv_prog_compiler_c_o \
++    exclude_expsyms \
++    include_expsyms; do
++
++    case $var in
++    old_archive_cmds | \
++    old_archive_from_new_cmds | \
++    archive_cmds | \
++    archive_expsym_cmds | \
++    module_cmds | \
++    module_expsym_cmds | \
++    old_archive_from_expsyms_cmds | \
++    export_symbols_cmds | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  case $lt_echo in
++  *'\$0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
++    ;;
++  esac
++
++cfgfile="${ofile}T"
++  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
++  $rm -f "$cfgfile"
++  { echo "$as_me:$LINENO: creating $ofile" >&5
++echo "$as_me: creating $ofile" >&6;}
++
++  cat <<__EOF__ >> "$cfgfile"
++#! $SHELL
++
++# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
++# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
++# NOTE: Changes made to this file will be lost: look at ltmain.sh.
++#
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
++# Free Software Foundation, Inc.
++#
++# This file is part of GNU Libtool:
++# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# A sed program that does not truncate output.
++SED=$lt_SED
++
++# Sed that helps us avoid accidentally triggering echo(1) options like -n.
++Xsed="$SED -e s/^X//"
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++
++# The names of the tagged configurations supported by this script.
++available_tags=
++
++# ### BEGIN LIBTOOL CONFIG
++
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc
++
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
++
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
++
++# A C compiler.
++LTCC=$lt_LTCC
++
++# A language-specific compiler.
++CC=$lt_compiler
++
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC
++
++# An ERE matcher.
++EGREP=$lt_EGREP
++
++# The linker used to build libraries.
++LD=$lt_LD
++
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
++
++# A BSD-compatible nm program.
++NM=$lt_NM
++
++# A symbol stripping program
++STRIP=$lt_STRIP
++
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl
++
++# Object file suffix (normally "o").
++objext="$ac_objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
++
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic
++pic_mode=$pic_mode
++
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o
++
++# Must we lock files when doing compilation ?
++need_locks=$lt_need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static
++
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
++
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec
++
++# Library versioning type.
++version_type=$version_type
++
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
++
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
++
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
++
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
++
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds
++archive_expsym_cmds=$lt_archive_expsym_cmds
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
++
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds
++module_expsym_cmds=$lt_module_expsym_cmds
++
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps
++
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path
++
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag
++
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
++
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
++
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
++
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action
++
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
++
++# If ld is used when linking, flag to hardcode \$libdir into
++# a binary during linking. This must work even if \$libdir does
++# not exist.
++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator
++
++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L
++
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var
++
++# Set to yes if building a shared library automatically hardcodes DIR into the library
++# and all subsequent libraries and executables linked against it.
++hardcode_automatic=$hardcode_automatic
++
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
++
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs
++
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path"
++
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols
++
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds
++
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms
++
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms
++
++# ### END LIBTOOL CONFIG
++
++__EOF__
++
++
++  case $host_os in
++  aix3*)
++    cat <<\EOF >> "$cfgfile"
++
++# AIX sometimes has problems with the GCC collect2 program.  For some
++# reason, if we set the COLLECT_NAMES environment variable, the problems
++# vanish in a puff of smoke.
++if test "X${COLLECT_NAMES+set}" != Xset; then
++  COLLECT_NAMES=
++  export COLLECT_NAMES
++fi
++EOF
++    ;;
++  esac
++
++  # We use sed instead of cat because bash on DJGPP gets confused if
++  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
++  # text mode, it properly converts lines to CR/LF.  This bash problem
++  # is reportedly fixed, but why not run on old versions too?
++  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
++
++  mv -f "$cfgfile" "$ofile" || \
++    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
++  chmod +x "$ofile"
++
++else
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
++fi
++
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++CC="$lt_save_CC"
++
++
++# Check whether --with-tags or --without-tags was given.
++if test "${with_tags+set}" = set; then
++  withval="$with_tags"
++  tagnames="$withval"
++fi; 
++
++if test -f "$ltmain" && test -n "$tagnames"; then
++  if test ! -f "${ofile}"; then
++    { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
++echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
++  fi
++
++  if test -z "$LTCC"; then
++    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
++    if test -z "$LTCC"; then
++      { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
++echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
++    else
++      { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
++echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
++    fi
++  fi
++
++  # Extract list of available tagged configurations in $ofile.
++  # Note that this assumes the entire list is on one line.
++  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
++
++  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++  for tagname in $tagnames; do
++    IFS="$lt_save_ifs"
++    # Check whether tagname contains only valid characters
++    case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
++    "") ;;
++    *)  { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
++echo "$as_me: error: invalid tag name: $tagname" >&2;}
++   { (exit 1); exit 1; }; }
++	;;
++    esac
++
++    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
++    then
++      { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
++echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
++   { (exit 1); exit 1; }; }
++    fi
++
++    # Update the list of available tags.
++    if test -n "$tagname"; then
++      echo appending configuration tag \"$tagname\" to $ofile
++
++      case $tagname in
++      CXX)
++	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 
++	    (test "X$CXX" != "Xg++"))) ; then
++	  ac_ext=cc
++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
++
++
++
++
++archive_cmds_need_lc_CXX=no
++allow_undefined_flag_CXX=
++always_export_symbols_CXX=no
++archive_expsym_cmds_CXX=
++export_dynamic_flag_spec_CXX=
++hardcode_direct_CXX=no
++hardcode_libdir_flag_spec_CXX=
++hardcode_libdir_flag_spec_ld_CXX=
++hardcode_libdir_separator_CXX=
++hardcode_minus_L_CXX=no
++hardcode_automatic_CXX=no
++module_cmds_CXX=
++module_expsym_cmds_CXX=
++link_all_deplibs_CXX=unknown
++old_archive_cmds_CXX=$old_archive_cmds
++no_undefined_flag_CXX=
++whole_archive_flag_spec_CXX=
++enable_shared_with_static_runtimes_CXX=no
++
++# Dependencies to place before and after the object being linked:
++predep_objects_CXX=
++postdep_objects_CXX=
++predeps_CXX=
++postdeps_CXX=
++compiler_lib_search_path_CXX=
++
++# Source file extension for C++ test sources.
++ac_ext=cc
++
++# Object file extension for compiled C++ test sources.
++objext=o
++objext_CXX=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="int some_variable = 0;\n"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code='int main(int, char *) { return(0); }\n'
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
++
++# Allow CC to be a program name with arguments.
++compiler=$CC
++
++
++# Allow CC to be a program name with arguments.
++lt_save_CC=$CC
++lt_save_LD=$LD
++lt_save_GCC=$GCC
++GCC=$GXX
++lt_save_with_gnu_ld=$with_gnu_ld
++lt_save_path_LD=$lt_cv_path_LD
++if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
++  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
++else
++  unset lt_cv_prog_gnu_ld
++fi
++if test -n "${lt_cv_path_LDCXX+set}"; then
++  lt_cv_path_LD=$lt_cv_path_LDCXX
++else
++  unset lt_cv_path_LD
++fi
++test -z "${LDCXX+set}" || LD=$LDCXX
++CC=${CXX-"c++"}
++compiler=$CC
++compiler_CXX=$CC
++cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++
++# We don't want -fno-exception wen compiling C++ code, so set the
++# no_builtin_flag separately
++if test "$GXX" = yes; then
++  lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
++else
++  lt_prog_compiler_no_builtin_flag_CXX=
++fi
++
++if test "$GXX" = yes; then
++  # Set up default GNU C++ configuration
++
++  
++# Check whether --with-gnu-ld or --without-gnu-ld was given.
++if test "${with_gnu_ld+set}" = set; then
++  withval="$with_gnu_ld"
++  test "$withval" = no || with_gnu_ld=yes
++else
++  with_gnu_ld=no
++fi; 
++ac_prog=ld
++if test "$GCC" = yes; then
++  # Check if gcc -print-prog-name=ld gives a path.
++  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
++  case $host in
++  *-*-mingw*)
++    # gcc leaves a trailing carriage return which upsets mingw
++    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++  *)
++    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++  esac
++  case $ac_prog in
++    # Accept absolute paths.
++    [\\/]* | ?:[\\/]*)
++      re_direlt='/[^/][^/]*/\.\./'
++      # Canonicalize the pathname of ld
++      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
++      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
++      done
++      test -z "$LD" && LD="$ac_prog"
++      ;;
++  "")
++    # If it fails, then pretend we aren't using GCC.
++    ac_prog=ld
++    ;;
++  *)
++    # If it is relative, then search for the first ld in PATH.
++    with_gnu_ld=unknown
++    ;;
++  esac
++elif test "$with_gnu_ld" = yes; then
++  echo "$as_me:$LINENO: checking for GNU ld" >&5
++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
++else
++  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
++fi
++if test "${lt_cv_path_LD+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -z "$LD"; then
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
++      lt_cv_path_LD="$ac_dir/$ac_prog"
++      # Check to see if the program is GNU ld.  I'd rather use --version,
++      # but apparently some GNU ld's only accept -v.
++      # Break only if it was the GNU/non-GNU ld that we prefer.
++      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
++      *GNU* | *'with BFD'*)
++	test "$with_gnu_ld" != no && break
++	;;
++      *)
++	test "$with_gnu_ld" != yes && break
++	;;
++      esac
++    fi
++  done
++  IFS="$lt_save_ifs"
++else
++  lt_cv_path_LD="$LD" # Let the user override the test with a path.
++fi
++fi
++
++LD="$lt_cv_path_LD"
++if test -n "$LD"; then
++  echo "$as_me:$LINENO: result: $LD" >&5
++echo "${ECHO_T}$LD" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
++echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
++   { (exit 1); exit 1; }; }
++echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
++if test "${lt_cv_prog_gnu_ld+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
++case `$LD -v 2>&1 </dev/null` in
++*GNU* | *'with BFD'*)
++  lt_cv_prog_gnu_ld=yes
++  ;;
++*)
++  lt_cv_prog_gnu_ld=no
++  ;;
++esac
++fi
++echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
++with_gnu_ld=$lt_cv_prog_gnu_ld
++
++
++
++  # Check if GNU C++ uses GNU ld as the underlying linker, since the
++  # archiving commands below assume that GNU ld is being used.
++  if test "$with_gnu_ld" = yes; then
++    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++    archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++
++    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
++    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
++
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
++    #     investigate it a little bit more. (MM)
++    wlarc='${wl}'
++
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
++	grep 'no-whole-archive' > /dev/null; then
++      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    else
++      whole_archive_flag_spec_CXX=
++    fi
++  else
++    with_gnu_ld=no
++    wlarc=
++
++    # A generic and very simple default shared library creation
++    # command for GNU C++ for the case where it uses the native
++    # linker, instead of GNU ld.  If possible, this setting should
++    # overridden to take advantage of the native linker features on
++    # the platform it is being used on.
++    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++  fi
++
++  # Commands to make compiler produce verbose output that lists
++  # what "hidden" libraries, object files and flags are used when
++  # linking a shared library.
++  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++
++else
++  GXX=no
++  with_gnu_ld=no
++  wlarc=
++fi
++
++# PORTME: fill in a description of your system's C++ link characteristics
++echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++ld_shlibs_CXX=yes
++case $host_os in
++  aix3*)
++    # FIXME: insert proper C++ library support
++    ld_shlibs_CXX=no
++    ;;
++  aix4* | aix5*)
++    if test "$host_cpu" = ia64; then
++      # On IA64, the linker does run time linking by default, so we don't
++      # have to do anything special.
++      aix_use_runtimelinking=no
++      exp_sym_flag='-Bexport'
++      no_entry_flag=""
++    else
++      aix_use_runtimelinking=no
++
++      # Test if we are trying to use run time linking or normal
++      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++      # need to do runtime linking.
++      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++	for ld_flag in $LDFLAGS; do
++	  case $ld_flag in
++	  *-brtl*)
++	    aix_use_runtimelinking=yes
++	    break
++	    ;;
++	  esac
++	done
++      esac
++
++      exp_sym_flag='-bexport'
++      no_entry_flag='-bnoentry'
++    fi
++
++    # When large executables or shared objects are built, AIX ld can
++    # have problems creating the table of contents.  If linking a library
++    # or program results in "error TOC overflow" add -mminimal-toc to
++    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++    archive_cmds_CXX=''
++    hardcode_direct_CXX=yes
++    hardcode_libdir_separator_CXX=':'
++    link_all_deplibs_CXX=yes
++
++    if test "$GXX" = yes; then
++      case $host_os in aix4.012|aix4.012.*)
++      # We only want to do this on AIX 4.2 and lower, the check
++      # below for broken collect2 doesn't work under 4.3+
++	collect2name=`${CC} -print-prog-name=collect2`
++	if test -f "$collect2name" && \
++	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	then
++	  # We have reworked collect2
++	  hardcode_direct_CXX=yes
++	else
++	  # We have old collect2
++	  hardcode_direct_CXX=unsupported
++	  # It fails to find uninstalled libraries when the uninstalled
++	  # path is not listed in the libpath.  Setting hardcode_minus_L
++	  # to unsupported forces relinking
++	  hardcode_minus_L_CXX=yes
++	  hardcode_libdir_flag_spec_CXX='-L$libdir'
++	  hardcode_libdir_separator_CXX=
++	fi
++      esac
++      shared_flag='-shared'
++    else
++      # not using gcc
++      if test "$host_cpu" = ia64; then
++	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++	# chokes on -Wl,-G. The following line is correct:
++	shared_flag='-G'
++      else
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag='${wl}-G'
++	else
++	  shared_flag='${wl}-bM:SRE'
++	fi
++      fi
++    fi
++
++    # It seems that -bexpall does not export symbols beginning with
++    # underscore (_), so it is better to generate a list of symbols to export.
++    always_export_symbols_CXX=yes
++    if test "$aix_use_runtimelinking" = yes; then
++      # Warning - without using the other runtime loading flags (-brtl),
++      # -berok will link without error, but may produce a broken library.
++      allow_undefined_flag_CXX='-berok'
++      # Determine the default libpath from the value encoded in an empty executable.
++      cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++      hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
++
++      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++     else
++      if test "$host_cpu" = ia64; then
++	hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
++	allow_undefined_flag_CXX="-z nodefs"
++	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++      else
++	# Determine the default libpath from the value encoded in an empty executable.
++	cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++	hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
++	# Warning - without using the other run time loading flags,
++	# -berok will link without error, but may produce a broken library.
++	no_undefined_flag_CXX=' ${wl}-bernotok'
++	allow_undefined_flag_CXX=' ${wl}-berok'
++	# -bexpall does not export symbols beginning with underscore (_)
++	always_export_symbols_CXX=yes
++	# Exported symbols can be pulled into shared objects from archives
++	whole_archive_flag_spec_CXX=' '
++	archive_cmds_need_lc_CXX=yes
++	# This is similar to how AIX traditionally builds it's shared libraries.
++	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++      fi
++    fi
++    ;;
++  chorus*)
++    case $cc_basename in
++      *)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++    esac
++    ;;
++
++
++  cygwin* | mingw* | pw32*)
++    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
++    # as there is no search path for DLLs.
++    hardcode_libdir_flag_spec_CXX='-L$libdir'
++    allow_undefined_flag_CXX=unsupported
++    always_export_symbols_CXX=no
++    enable_shared_with_static_runtimes_CXX=yes
++
++    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++      # If the export-symbols file already is a .def file (1st line
++      # is EXPORTS), use it as is; otherwise, prepend...
++      archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	cp $export_symbols $output_objdir/$soname.def;
++      else
++	echo EXPORTS > $output_objdir/$soname.def;
++	cat $export_symbols >> $output_objdir/$soname.def;
++      fi~
++      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++    else
++      ld_shlibs_CXX=no
++    fi
++  ;;
++      darwin* | rhapsody*)
++        case "$host_os" in
++        rhapsody* | darwin1.[012])
++         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[012])
++               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++        esac
++      archive_cmds_need_lc_CXX=no
++      hardcode_direct_CXX=no
++      hardcode_automatic_CXX=yes
++      hardcode_shlibpath_var_CXX=unsupported
++      whole_archive_flag_spec_CXX=''
++      link_all_deplibs_CXX=yes
++
++    if test "$GXX" = yes ; then
++      lt_int_apple_cc_single_mod=no
++      output_verbose_link_cmd='echo'
++      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
++       lt_int_apple_cc_single_mod=yes
++      fi
++      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      else
++          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++        fi
++        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          else
++            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          fi
++            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      else
++      case "$cc_basename" in
++        xlc*)
++         output_verbose_link_cmd='echo'
++          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++          module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         ld_shlibs_CXX=no
++          ;;
++      esac
++      fi
++        ;;
++
++  dgux*)
++    case $cc_basename in
++      ec++)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      ghcx)
++	# Green Hills C++ Compiler
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++    esac
++    ;;
++  freebsd12*)
++    # C++ shared libraries reported to be fairly broken before switch to ELF
++    ld_shlibs_CXX=no
++    ;;
++  freebsd-elf*)
++    archive_cmds_need_lc_CXX=no
++    ;;
++  freebsd* | kfreebsd*-gnu)
++    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
++    # conventions
++    ld_shlibs_CXX=yes
++    ;;
++  gnu*)
++    ;;
++  hpux9*)
++    hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
++    hardcode_libdir_separator_CXX=:
++    export_dynamic_flag_spec_CXX='${wl}-E'
++    hardcode_direct_CXX=yes
++    hardcode_minus_L_CXX=yes # Not in the search PATH,
++				# but as the default
++				# location of the library.
++
++    case $cc_basename in
++    CC)
++      # FIXME: insert proper C++ library support
++      ld_shlibs_CXX=no
++      ;;
++    aCC)
++      archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      # Commands to make compiler produce verbose output that lists
++      # what "hidden" libraries, object files and flags are used when
++      # linking a shared library.
++      #
++      # There doesn't appear to be a way to prevent this compiler from
++      # explicitly linking system object files so we need to strip them
++      # from the output so that they don't get included in the library
++      # dependencies.
++      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++      ;;
++    *)
++      if test "$GXX" = yes; then
++        archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      else
++        # FIXME: insert proper C++ library support
++        ld_shlibs_CXX=no
++      fi
++      ;;
++    esac
++    ;;
++  hpux10*|hpux11*)
++    if test $with_gnu_ld = no; then
++      case "$host_cpu" in
++      hppa*64*)
++	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
++	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
++	hardcode_libdir_separator_CXX=:
++        ;;
++      ia64*)
++	hardcode_libdir_flag_spec_CXX='-L$libdir'
++        ;;
++      *)
++	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
++	hardcode_libdir_separator_CXX=:
++	export_dynamic_flag_spec_CXX='${wl}-E'
++        ;;
++      esac
++    fi
++    case "$host_cpu" in
++    hppa*64*)
++      hardcode_direct_CXX=no
++      hardcode_shlibpath_var_CXX=no
++      ;;
++    ia64*)
++      hardcode_direct_CXX=no
++      hardcode_shlibpath_var_CXX=no
++      hardcode_minus_L_CXX=yes # Not in the search PATH,
++					      # but as the default
++					      # location of the library.
++      ;;
++    *)
++      hardcode_direct_CXX=yes
++      hardcode_minus_L_CXX=yes # Not in the search PATH,
++					      # but as the default
++					      # location of the library.
++      ;;
++    esac
++
++    case $cc_basename in
++      CC)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      aCC)
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++	  ;;
++	*)
++	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  ;;
++	esac
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes; then
++	  if test $with_gnu_ld = no; then
++	    case "$host_cpu" in
++	    ia64*|hppa*64*)
++	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++	      ;;
++	    *)
++	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	      ;;
++	    esac
++	  fi
++	else
++	  # FIXME: insert proper C++ library support
++	  ld_shlibs_CXX=no
++	fi
++	;;
++    esac
++    ;;
++  irix5* | irix6*)
++    case $cc_basename in
++      CC)
++	# SGI C++
++	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++
++	# Archives containing C++ object files must be created using
++	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
++	# necessary to make sure instantiated templates are included
++	# in the archive.
++	old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
++	;;
++      *)
++	if test "$GXX" = yes; then
++	  if test "$with_gnu_ld" = no; then
++	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	  else
++	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
++	  fi
++	fi
++	link_all_deplibs_CXX=yes
++	;;
++    esac
++    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
++    hardcode_libdir_separator_CXX=:
++    ;;
++  linux*)
++    case $cc_basename in
++      KCC)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
++
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++	archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++
++	hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir'
++	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
++
++	# Archives containing C++ object files must be created using
++	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
++	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
++	;;
++      icpc)
++	# Intel C++
++	with_gnu_ld=yes
++	# version 8.0 and above of icpc choke on multiply defined symbols
++	# if we add $predep_objects and $postdep_objects, however 7.1 and
++	# earlier do not add the objects themselves.
++	case `$CC -V 2>&1` in
++	*"Version 7."*)
++  	  archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++  	  archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	*)  # Version 8.0 or newer
++  	  archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++  	archive_expsym_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	esac
++	archive_cmds_need_lc_CXX=no
++	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
++	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
++	;;
++      cxx)
++	# Compaq C++
++	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
++
++	runpath_var=LD_RUN_PATH
++	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
++	hardcode_libdir_separator_CXX=:
++
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++    esac
++    ;;
++  lynxos*)
++    # FIXME: insert proper C++ library support
++    ld_shlibs_CXX=no
++    ;;
++  m88k*)
++    # FIXME: insert proper C++ library support
++    ld_shlibs_CXX=no
++    ;;
++  mvs*)
++    case $cc_basename in
++      cxx)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++    esac
++    ;;
++  netbsd*)
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
++      wlarc=
++      hardcode_libdir_flag_spec_CXX='-R$libdir'
++      hardcode_direct_CXX=yes
++      hardcode_shlibpath_var_CXX=no
++    fi
++    # Workaround some broken pre-1.5 toolchains
++    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
++    ;;
++  openbsd2*)
++    # C++ shared libraries are fairly broken
++    ld_shlibs_CXX=no
++    ;;
++  openbsd*)
++    hardcode_direct_CXX=yes
++    hardcode_shlibpath_var_CXX=no
++    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++      export_dynamic_flag_spec_CXX='${wl}-E'
++      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    fi
++    output_verbose_link_cmd='echo'
++    ;;
++  osf3*)
++    case $cc_basename in
++      KCC)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
++
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++
++	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++	hardcode_libdir_separator_CXX=:
++
++	# Archives containing C++ object files must be created using
++	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
++	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
++
++	;;
++      RCC)
++	# Rational C++ 2.4.1
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      cxx)
++	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++
++	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
++	hardcode_libdir_separator_CXX=:
++
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
++	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++
++	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
++	  hardcode_libdir_separator_CXX=:
++
++	  # Commands to make compiler produce verbose output that lists
++	  # what "hidden" libraries, object files and flags are used when
++	  # linking a shared library.
++	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++
++	else
++	  # FIXME: insert proper C++ library support
++	  ld_shlibs_CXX=no
++	fi
++	;;
++    esac
++    ;;
++  osf4* | osf5*)
++    case $cc_basename in
++      KCC)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
++
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++
++	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++	hardcode_libdir_separator_CXX=:
++
++	# Archives containing C++ object files must be created using
++	# the KAI C++ compiler.
++	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
++	;;
++      RCC)
++	# Rational C++ 2.4.1
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      cxx)
++	allow_undefined_flag_CXX=' -expect_unresolved \*'
++	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
++	  echo "-hidden">> $lib.exp~
++	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
++	  $rm $lib.exp'
++
++	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
++	hardcode_libdir_separator_CXX=:
++
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
++	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++
++	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
++	  hardcode_libdir_separator_CXX=:
++
++	  # Commands to make compiler produce verbose output that lists
++	  # what "hidden" libraries, object files and flags are used when
++	  # linking a shared library.
++	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++
++	else
++	  # FIXME: insert proper C++ library support
++	  ld_shlibs_CXX=no
++	fi
++	;;
++    esac
++    ;;
++  psos*)
++    # FIXME: insert proper C++ library support
++    ld_shlibs_CXX=no
++    ;;
++  sco*)
++    archive_cmds_need_lc_CXX=no
++    case $cc_basename in
++      CC)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++    esac
++    ;;
++  sunos4*)
++    case $cc_basename in
++      CC)
++	# Sun C++ 4.x
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      lcc)
++	# Lucid
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++    esac
++    ;;
++  solaris*)
++    case $cc_basename in
++      CC)
++	# Sun C++ 4.2, 5.x and Centerline C++
++	no_undefined_flag_CXX=' -zdefs'
++	archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++
++	hardcode_libdir_flag_spec_CXX='-R$libdir'
++	hardcode_shlibpath_var_CXX=no
++	case $host_os in
++	  solaris2.0-5 | solaris2.0-5.*) ;;
++	  *)
++	    # The C++ compiler is used as linker so we must use $wl
++	    # flag to pass the commands to the underlying system
++	    # linker.
++	    # Supported since Solaris 2.6 (maybe 2.5.1?)
++	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    ;;
++	esac
++	link_all_deplibs_CXX=yes
++
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++
++	# Archives containing C++ object files must be created using
++	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
++	# necessary to make sure instantiated templates are included
++	# in the archive.
++	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
++	;;
++      gcx)
++	# Green Hills C++ Compiler
++	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++
++	# The C++ compiler must be used to create the archive.
++	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
++	;;
++      *)
++	# GNU C++ compiler with Solaris linker
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
++	  if $CC --version | grep -v '^2\.7' > /dev/null; then
++	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
++	  else
++	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
++	    # platform.
++	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
++	  fi
++
++	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
++	fi
++	;;
++    esac
++    ;;
++  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
++    archive_cmds_need_lc_CXX=no
++    ;;
++  tandem*)
++    case $cc_basename in
++      NCC)
++	# NonStop-UX NCC 3.20
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++    esac
++    ;;
++  vxworks*)
++    # FIXME: insert proper C++ library support
++    ld_shlibs_CXX=no
++    ;;
++  *)
++    # FIXME: insert proper C++ library support
++    ld_shlibs_CXX=no
++    ;;
++esac
++echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
++echo "${ECHO_T}$ld_shlibs_CXX" >&6
++test "$ld_shlibs_CXX" = no && can_build_shared=no
++
++GCC_CXX="$GXX"
++LD_CXX="$LD"
++
++
++cat > conftest.$ac_ext <<EOF
++class Foo
++{
++public:
++  Foo (void) { a = 0; }
++private:
++  int a;
++};
++EOF
++
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  # Parse the compiler output and extract the necessary
++  # objects, libraries and library flags.
++
++  # Sentinel used to keep track of whether or not we are before
++  # the conftest object file.
++  pre_test_object_deps_done=no
++
++  # The `*' in the case matches for architectures that use `case' in
++  # $output_verbose_cmd can trigger glob expansion during the loop
++  # eval without this substitution.
++  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
++
++  for p in `eval $output_verbose_link_cmd`; do
++    case $p in
++
++    -L* | -R* | -l*)
++       # Some compilers place space between "-{L,R}" and the path.
++       # Remove the space.
++       if test $p = "-L" \
++	  || test $p = "-R"; then
++	 prev=$p
++	 continue
++       else
++	 prev=
++       fi
++
++       if test "$pre_test_object_deps_done" = no; then
++	 case $p in
++	 -L* | -R*)
++	   # Internal compiler library paths should come after those
++	   # provided the user.  The postdeps already come after the
++	   # user supplied libs so there is no need to process them.
++	   if test -z "$compiler_lib_search_path_CXX"; then
++	     compiler_lib_search_path_CXX="${prev}${p}"
++	   else
++	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
++	   fi
++	   ;;
++	 # The "-l" case would never come before the object being
++	 # linked, so don't bother handling this case.
++	 esac
++       else
++	 if test -z "$postdeps_CXX"; then
++	   postdeps_CXX="${prev}${p}"
++	 else
++	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
++	 fi
++       fi
++       ;;
++
++    *.$objext)
++       # This assumes that the test object file only shows up
++       # once in the compiler output.
++       if test "$p" = "conftest.$objext"; then
++	 pre_test_object_deps_done=yes
++	 continue
++       fi
++
++       if test "$pre_test_object_deps_done" = no; then
++	 if test -z "$predep_objects_CXX"; then
++	   predep_objects_CXX="$p"
++	 else
++	   predep_objects_CXX="$predep_objects_CXX $p"
++	 fi
++       else
++	 if test -z "$postdep_objects_CXX"; then
++	   postdep_objects_CXX="$p"
++	 else
++	   postdep_objects_CXX="$postdep_objects_CXX $p"
++	 fi
++       fi
++       ;;
++
++    *) ;; # Ignore the rest.
++
++    esac
++  done
++
++  # Clean up.
++  rm -f a.out a.exe
++else
++  echo "libtool.m4: error: problem compiling CXX test program"
++fi
++
++$rm -f confest.$objext
++
++case " $postdeps_CXX " in
++*" -lc "*) archive_cmds_need_lc_CXX=no ;;
++esac
++
++lt_prog_compiler_wl_CXX=
++lt_prog_compiler_pic_CXX=
++lt_prog_compiler_static_CXX=
++
++echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++ 
++  # C++ specific cases for pic, static, wl, etc.
++  if test "$GXX" = yes; then
++    lt_prog_compiler_wl_CXX='-Wl,'
++    lt_prog_compiler_static_CXX='-static'
++
++    case $host_os in
++    aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static_CXX='-Bstatic'
++      fi
++      ;;
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
++      ;;
++    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++    mingw* | os2* | pw32*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
++      ;;
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_prog_compiler_pic_CXX='-fno-common'
++      ;;
++    *djgpp*)
++      # DJGPP does not support shared libraries at all
++      lt_prog_compiler_pic_CXX=
++      ;;
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	lt_prog_compiler_pic_CXX=-Kconform_pic
++      fi
++      ;;
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	;;
++      *)
++	lt_prog_compiler_pic_CXX='-fPIC'
++	;;
++      esac
++      ;;
++    *)
++      lt_prog_compiler_pic_CXX='-fPIC'
++      ;;
++    esac
++  else
++    case $host_os in
++      aix4* | aix5*)
++	# All AIX code is PIC.
++	if test "$host_cpu" = ia64; then
++	  # AIX 5 now supports IA64 processor
++	  lt_prog_compiler_static_CXX='-Bstatic'
++	else
++	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
++	fi
++	;;
++      chorus*)
++	case $cc_basename in
++	cxch68)
++	  # Green Hills C++ Compiler
++	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
++	  ;;
++	esac
++	;;
++       darwin*)
++         # PIC is the default on this platform
++         # Common symbols not allowed in MH_DYLIB files
++         case "$cc_basename" in
++           xlc*)
++           lt_prog_compiler_pic_CXX='-qnocommon'
++           lt_prog_compiler_wl_CXX='-Wl,'
++           ;;
++         esac
++       ;;
++      dgux*)
++	case $cc_basename in
++	  ec++)
++	    lt_prog_compiler_pic_CXX='-KPIC'
++	    ;;
++	  ghcx)
++	    # Green Hills C++ Compiler
++	    lt_prog_compiler_pic_CXX='-pic'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      freebsd* | kfreebsd*-gnu)
++	# FreeBSD uses GNU C++
++	;;
++      hpux9* | hpux10* | hpux11*)
++	case $cc_basename in
++	  CC)
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
++	    if test "$host_cpu" != ia64; then
++	      lt_prog_compiler_pic_CXX='+Z'
++	    fi
++	    ;;
++	  aCC)
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
++	    case "$host_cpu" in
++	    hppa*64*|ia64*)
++	      # +Z the default
++	      ;;
++	    *)
++	      lt_prog_compiler_pic_CXX='+Z'
++	      ;;
++	    esac
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      irix5* | irix6* | nonstopux*)
++	case $cc_basename in
++	  CC)
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_static_CXX='-non_shared'
++	    # CC pic flag -KPIC is the default.
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      linux*)
++	case $cc_basename in
++	  KCC)
++	    # KAI C++ Compiler
++	    lt_prog_compiler_wl_CXX='--backend -Wl,'
++	    lt_prog_compiler_pic_CXX='-fPIC'
++	    ;;
++	  icpc)
++	    # Intel C++
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_pic_CXX='-KPIC'
++	    lt_prog_compiler_static_CXX='-static'
++	    ;;
++	  cxx)
++	    # Compaq C++
++	    # Make sure the PIC flag is empty.  It appears that all Alpha
++	    # Linux and Compaq Tru64 Unix objects are PIC.
++	    lt_prog_compiler_pic_CXX=
++	    lt_prog_compiler_static_CXX='-non_shared'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      lynxos*)
++	;;
++      m88k*)
++	;;
++      mvs*)
++	case $cc_basename in
++	  cxx)
++	    lt_prog_compiler_pic_CXX='-W c,exportall'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      netbsd*)
++	;;
++      osf3* | osf4* | osf5*)
++	case $cc_basename in
++	  KCC)
++	    lt_prog_compiler_wl_CXX='--backend -Wl,'
++	    ;;
++	  RCC)
++	    # Rational C++ 2.4.1
++	    lt_prog_compiler_pic_CXX='-pic'
++	    ;;
++	  cxx)
++	    # Digital/Compaq C++
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    # Make sure the PIC flag is empty.  It appears that all Alpha
++	    # Linux and Compaq Tru64 Unix objects are PIC.
++	    lt_prog_compiler_pic_CXX=
++	    lt_prog_compiler_static_CXX='-non_shared'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      psos*)
++	;;
++      sco*)
++	case $cc_basename in
++	  CC)
++	    lt_prog_compiler_pic_CXX='-fPIC'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      solaris*)
++	case $cc_basename in
++	  CC)
++	    # Sun C++ 4.2, 5.x and Centerline C++
++	    lt_prog_compiler_pic_CXX='-KPIC'
++	    lt_prog_compiler_static_CXX='-Bstatic'
++	    lt_prog_compiler_wl_CXX='-Qoption ld '
++	    ;;
++	  gcx)
++	    # Green Hills C++ Compiler
++	    lt_prog_compiler_pic_CXX='-PIC'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      sunos4*)
++	case $cc_basename in
++	  CC)
++	    # Sun C++ 4.x
++	    lt_prog_compiler_pic_CXX='-pic'
++	    lt_prog_compiler_static_CXX='-Bstatic'
++	    ;;
++	  lcc)
++	    # Lucid
++	    lt_prog_compiler_pic_CXX='-pic'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      tandem*)
++	case $cc_basename in
++	  NCC)
++	    # NonStop-UX NCC 3.20
++	    lt_prog_compiler_pic_CXX='-KPIC'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      unixware*)
++	;;
++      vxworks*)
++	;;
++      *)
++	lt_prog_compiler_can_build_shared_CXX=no
++	;;
++    esac
++  fi
++
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
++
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$lt_prog_compiler_pic_CXX"; then
++  
++echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
++if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_pic_works_CXX=no
++  ac_outfile=conftest.$ac_objext
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:__oline__: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s conftest.err; then
++       lt_prog_compiler_pic_works_CXX=yes
++     fi
++   fi
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
++
++if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
++    case $lt_prog_compiler_pic_CXX in
++     "" | " "*) ;;
++     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
++     esac
++else
++    lt_prog_compiler_pic_CXX=
++     lt_prog_compiler_can_build_shared_CXX=no
++fi
++
++fi
++case "$host_os" in
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    lt_prog_compiler_pic_CXX=
++    ;;
++  *)
++    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
++    ;;
++esac
++
++echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_prog_compiler_c_o_CXX=no
++   $rm -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&5
++   echo "$as_me:__oline__: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s out/conftest2.$ac_objext
++   then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s out/conftest.err; then
++       lt_cv_prog_compiler_c_o_CXX=yes
++     fi
++   fi
++   chmod u+w .
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
++   cd ..
++   rmdir conftest
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6
++
++
++hard_links="nottested"
++if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6
++  if test "$hard_links" = no; then
++    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
++
++echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++
++  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  case $host_os in
++  aix4* | aix5*)
++    # If we're using GNU nm, then we don't want the "-C" option.
++    # -C means demangle to AIX nm, but means don't demangle with GNU nm
++    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
++      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++    else
++      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++    fi
++    ;;
++  pw32*)
++    export_symbols_cmds_CXX="$ltdll_cmds"
++  ;;
++  cygwin* | mingw*)
++    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++  ;;
++  *)
++    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  ;;
++  esac
++
++echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
++echo "${ECHO_T}$ld_shlibs_CXX" >&6
++test "$ld_shlibs_CXX" = no && can_build_shared=no
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
++#
++# Do we need to explicitly link libc?
++#
++case "x$archive_cmds_need_lc_CXX" in
++x|xyes)
++  # Assume -lc should be added
++  archive_cmds_need_lc_CXX=yes
++
++  if test "$enable_shared" = yes && test "$GCC" = yes; then
++    case $archive_cmds_CXX in
++    *'~'*)
++      # FIXME: we may have to deal with multi-command sequences.
++      ;;
++    '$CC '*)
++      # Test whether the compiler implicitly links with -lc since on some
++      # systems, -lgcc has to come before -lc. If gcc already passes -lc
++      # to ld, don't add -lc before -lgcc.
++      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++      $rm conftest*
++      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        libobjs=conftest.$ac_objext
++        deplibs=
++        wl=$lt_prog_compiler_wl_CXX
++        compiler_flags=-v
++        linker_flags=-v
++        verstring=
++        output_objdir=.
++        libname=conftest
++        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
++        allow_undefined_flag_CXX=
++        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
++  (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++        then
++	  archive_cmds_need_lc_CXX=no
++        else
++	  archive_cmds_need_lc_CXX=yes
++        fi
++        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
++      else
++        cat conftest.err 1>&5
++      fi
++      $rm conftest*
++      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6
++      ;;
++    esac
++  fi
++  ;;
++esac
++
++echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
++need_lib_prefix=unknown
++hardcode_into_libs=no
++
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
++
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  shlibpath_var=LIBPATH
++
++  # AIX 3 has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}${shared_ext}$major'
++  ;;
++
++aix4* | aix5*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[01] | aix4.[01].*)
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	   echo ' yes '
++	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++	:
++      else
++	can_build_shared=no
++      fi
++      ;;
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}${shared_ext}$major'
++    fi
++    shlibpath_var=LIBPATH
++  fi
++  ;;
++
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++  ;;
++
++beos*)
++  library_names_spec='${libname}${shared_ext}'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
++
++bsdi[45]*)
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
++
++cygwin* | mingw* | pw32*)
++  version_type=windows
++  shrext_cmds=".dll"
++  need_version=no
++  need_lib_prefix=no
++
++  case $GCC,$host_os in
++  yes,cygwin* | yes,mingw* | yes,pw32*)
++    library_names_spec='$libname.dll.a'
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $rm \$dlpath'
++    shlibpath_overrides_runpath=yes
++
++    case $host_os in
++    cygwin*)
++      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
++    mingw*)
++      # MinGW DLLs use traditional 'lib' prefix
++      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
++        # It is most probably a Windows format PATH printed by
++        # mingw gcc, but we are running on Cygwin. Gcc prints its search
++        # path with ; separators, and with drive letters. We can handle the
++        # drive letters (cygwin fileutils understands them), so leave them,
++        # especially as we might pass files found there to a mingw objdump,
++        # which wouldn't understand a cygwinified path. Ahh.
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++      fi
++      ;;
++    pw32*)
++      # pw32 DLLs use 'pw' prefix rather than 'lib'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++      ;;
++    esac
++    ;;
++
++  *)
++    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    ;;
++  esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  ;;
++
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  soname_spec='${libname}${release}${major}$shared_ext'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
++  if test "$GCC" = yes; then
++    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
++  else
++    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
++  fi
++  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++  ;;
++
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++freebsd1*)
++  dynamic_linker=no
++  ;;
++
++kfreebsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++freebsd*)
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
++    ;;
++  freebsd3.01* | freebsdelf3.01*)
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
++  *) # from 3.2 on
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
++    ;;
++  esac
++  ;;
++
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  ;;
++
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  case "$host_cpu" in
++  ia64*)
++    shrext_cmds='.so'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.so"
++    shlibpath_var=LD_LIBRARY_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    if test "X$HPUX_IA64_MODE" = X32; then
++      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++    else
++      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++    fi
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    ;;
++   hppa*64*)
++     shrext_cmds='.sl'
++     hardcode_into_libs=yes
++     dynamic_linker="$host_os dld.sl"
++     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++     soname_spec='${libname}${release}${shared_ext}$major'
++     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++     ;;
++   *)
++    shrext_cmds='.sl'
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=SHLIB_PATH
++    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    ;;
++  esac
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
++    *)
++	if test "$lt_cv_prog_gnu_ld" = yes; then
++		version_type=linux
++	else
++		version_type=irix
++	fi ;;
++  esac
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  case $host_os in
++  irix5* | nonstopux*)
++    libsuff= shlibsuff=
++    ;;
++  *)
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++      libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++      libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++      libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  hardcode_into_libs=yes
++  ;;
++
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++  dynamic_linker=no
++  ;;
++
++# This must be Linux ELF.
++linux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
++
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
++
++knetbsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++nto-qnx*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++openbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    case $host_os in
++      openbsd2.[89] | openbsd2.[89].*)
++	shlibpath_overrides_runpath=no
++	;;
++      *)
++	shlibpath_overrides_runpath=yes
++	;;
++      esac
++  else
++    shlibpath_overrides_runpath=yes
++  fi
++  ;;
++
++os2*)
++  libname_spec='$name'
++  shrext_cmds=".dll"
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
++
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
++
++sco3.2v5*)
++  version_type=osf
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
++
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      export_dynamic_flag_spec='${wl}-Blargedynsym'
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
++
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
++
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++*)
++  dynamic_linker=no
++  ;;
++esac
++echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6
++test "$dynamic_linker" = no && can_build_shared=no
++
++echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++hardcode_action_CXX=
++if test -n "$hardcode_libdir_flag_spec_CXX" || \
++   test -n "$runpath_var_CXX" || \
++   test "X$hardcode_automatic_CXX" = "Xyes" ; then
++
++  # We can hardcode non-existant directories.
++  if test "$hardcode_direct_CXX" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
++     test "$hardcode_minus_L_CXX" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action_CXX=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action_CXX=immediate
++  fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action_CXX=unsupported
++fi
++echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
++echo "${ECHO_T}$hardcode_action_CXX" >&6
++
++if test "$hardcode_action_CXX" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
++
++striplib=
++old_striplib=
++echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
++echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
++  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++else
++# FIXME - insert some real tests, host_os isn't really good enough
++  case $host_os in
++   darwin*)
++       if test -n "$STRIP" ; then
++         striplib="$STRIP -x"
++         echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++       else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++       ;;
++   *)
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++    ;;
++  esac
++fi
++
++if test "x$enable_dlopen" != xyes; then
++  enable_dlopen=unknown
++  enable_dlopen_self=unknown
++  enable_dlopen_self_static=unknown
++else
++  lt_cv_dlopen=no
++  lt_cv_dlopen_libs=
++
++  case $host_os in
++  beos*)
++    lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ;;
++
++  mingw* | pw32*)
++    lt_cv_dlopen="LoadLibrary"
++    lt_cv_dlopen_libs=
++   ;;
++
++  cygwin*)
++    lt_cv_dlopen="dlopen"
++    lt_cv_dlopen_libs=
++   ;;
++
++  darwin*)
++  # if libdl is installed we need to link against it
++    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dl_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dl_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++if test $ac_cv_lib_dl_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++  
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    
++fi
++
++   ;;
++
++  *)
++    echo "$as_me:$LINENO: checking for shl_load" >&5
++echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
++if test "${ac_cv_func_shl_load+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.  */
++/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define shl_load innocuous_shl_load
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char shl_load (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef shl_load
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char shl_load ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_shl_load) || defined (__stub___shl_load)
++choke me
++#else
++char (*f) () = shl_load;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != shl_load;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_shl_load=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_shl_load=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
++echo "${ECHO_T}$ac_cv_func_shl_load" >&6
++if test $ac_cv_func_shl_load = yes; then
++  lt_cv_dlopen="shl_load"
++else
++  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
++echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
++if test "${ac_cv_lib_dld_shl_load+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char shl_load ();
++int
++main ()
++{
++shl_load ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dld_shl_load=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dld_shl_load=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
++if test $ac_cv_lib_dld_shl_load = yes; then
++  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
++else
++  echo "$as_me:$LINENO: checking for dlopen" >&5
++echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
++if test "${ac_cv_func_dlopen+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.  */
++/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define dlopen innocuous_dlopen
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char dlopen (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef dlopen
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_dlopen) || defined (__stub___dlopen)
++choke me
++#else
++char (*f) () = dlopen;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != dlopen;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
++echo "${ECHO_T}$ac_cv_func_dlopen" >&6
++if test $ac_cv_func_dlopen = yes; then
++  lt_cv_dlopen="dlopen"
++else
++  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dl_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dl_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++if test $ac_cv_lib_dl_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
++echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
++if test "${ac_cv_lib_svld_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsvld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_svld_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_svld_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
++if test $ac_cv_lib_svld_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
++else
++  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
++echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
++if test "${ac_cv_lib_dld_dld_link+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dld_link ();
++int
++main ()
++{
++dld_link ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dld_dld_link=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dld_dld_link=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
++if test $ac_cv_lib_dld_dld_link = yes; then
++  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
++fi
++
++	      
++fi
++
++	    
++fi
++
++	  
++fi
++
++	
++fi
++
++      
++fi
++
++    ;;
++  esac
++
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
++  else
++    enable_dlopen=no
++  fi
++
++  case $lt_cv_dlopen in
++  dlopen)
++    save_CPPFLAGS="$CPPFLAGS"
++    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++
++    save_LDFLAGS="$LDFLAGS"
++    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++
++    save_LIBS="$LIBS"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
++
++    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
++echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
++if test "${lt_cv_dlopen_self+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self=cross
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++#line __oline__ "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}
++EOF
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self=no
++  fi
++fi
++rm -fr conftest*
++
++    
++fi
++echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self" >&6
++
++    if test "x$lt_cv_dlopen_self" = xyes; then
++      LDFLAGS="$LDFLAGS $link_static_flag"
++      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
++echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
++if test "${lt_cv_dlopen_self_static+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self_static=cross
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++#line __oline__ "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}
++EOF
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self_static=no
++  fi
++fi
++rm -fr conftest*
++
++      
++fi
++echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
++    fi
++
++    CPPFLAGS="$save_CPPFLAGS"
++    LDFLAGS="$save_LDFLAGS"
++    LIBS="$save_LIBS"
++    ;;
++  esac
++
++  case $lt_cv_dlopen_self in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
++  esac
++
++  case $lt_cv_dlopen_self_static in
++  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++  *) enable_dlopen_self_static=unknown ;;
++  esac
++fi
++
++
++# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # See if we are running on zsh, and set the options which allow our commands through
++  # without removal of \ escapes.
++  if test -n "${ZSH_VERSION+set}" ; then
++    setopt NO_GLOB_SUBST
++  fi
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++    SED SHELL STRIP \
++    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++    deplibs_check_method reload_flag reload_cmds need_locks \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    old_postinstall_cmds old_postuninstall_cmds \
++    compiler_CXX \
++    CC_CXX \
++    LD_CXX \
++    lt_prog_compiler_wl_CXX \
++    lt_prog_compiler_pic_CXX \
++    lt_prog_compiler_static_CXX \
++    lt_prog_compiler_no_builtin_flag_CXX \
++    export_dynamic_flag_spec_CXX \
++    thread_safe_flag_spec_CXX \
++    whole_archive_flag_spec_CXX \
++    enable_shared_with_static_runtimes_CXX \
++    old_archive_cmds_CXX \
++    old_archive_from_new_cmds_CXX \
++    predep_objects_CXX \
++    postdep_objects_CXX \
++    predeps_CXX \
++    postdeps_CXX \
++    compiler_lib_search_path_CXX \
++    archive_cmds_CXX \
++    archive_expsym_cmds_CXX \
++    postinstall_cmds_CXX \
++    postuninstall_cmds_CXX \
++    old_archive_from_expsyms_cmds_CXX \
++    allow_undefined_flag_CXX \
++    no_undefined_flag_CXX \
++    export_symbols_cmds_CXX \
++    hardcode_libdir_flag_spec_CXX \
++    hardcode_libdir_flag_spec_ld_CXX \
++    hardcode_libdir_separator_CXX \
++    hardcode_automatic_CXX \
++    module_cmds_CXX \
++    module_expsym_cmds_CXX \
++    lt_cv_prog_compiler_c_o_CXX \
++    exclude_expsyms_CXX \
++    include_expsyms_CXX; do
++
++    case $var in
++    old_archive_cmds_CXX | \
++    old_archive_from_new_cmds_CXX | \
++    archive_cmds_CXX | \
++    archive_expsym_cmds_CXX | \
++    module_cmds_CXX | \
++    module_expsym_cmds_CXX | \
++    old_archive_from_expsyms_cmds_CXX | \
++    export_symbols_cmds_CXX | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  case $lt_echo in
++  *'\$0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
++    ;;
++  esac
++
++cfgfile="$ofile"
++
++  cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
++
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_CXX
++
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
++
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
++
++# A C compiler.
++LTCC=$lt_LTCC
++
++# A language-specific compiler.
++CC=$lt_compiler_CXX
++
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_CXX
++
++# An ERE matcher.
++EGREP=$lt_EGREP
++
++# The linker used to build libraries.
++LD=$lt_LD_CXX
++
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
++
++# A BSD-compatible nm program.
++NM=$lt_NM
++
++# A symbol stripping program
++STRIP=$lt_STRIP
++
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_CXX
++
++# Object file suffix (normally "o").
++objext="$ac_objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
++
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic_CXX
++pic_mode=$pic_mode
++
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
++
++# Must we lock files when doing compilation ?
++need_locks=$lt_need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_CXX
++
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
++
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
++
++# Library versioning type.
++version_type=$version_type
++
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
++
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds_CXX
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
++
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
++
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
++
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds_CXX
++archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
++
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds_CXX
++module_expsym_cmds=$lt_module_expsym_cmds_CXX
++
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_CXX
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_CXX
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps_CXX
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps_CXX
++
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
++
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_CXX
++
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_CXX
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
++
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
++
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
++
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action_CXX
++
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
++
++# If ld is used when linking, flag to hardcode \$libdir into
++# a binary during linking. This must work even if \$libdir does
++# not exist.
++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
++
++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct_CXX
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L_CXX
++
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
++
++# Set to yes if building a shared library automatically hardcodes DIR into the library
++# and all subsequent libraries and executables linked against it.
++hardcode_automatic=$hardcode_automatic_CXX
++
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
++
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs_CXX
++
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path_CXX"
++
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols_CXX
++
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds_CXX
++
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms_CXX
++
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms_CXX
++
++# ### END LIBTOOL TAG CONFIG: $tagname
++
++__EOF__
++
++
++else
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
++fi
++
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++CC=$lt_save_CC
++LDCXX=$LD
++LD=$lt_save_LD
++GCC=$lt_save_GCC
++with_gnu_ldcxx=$with_gnu_ld
++with_gnu_ld=$lt_save_with_gnu_ld
++lt_cv_path_LDCXX=$lt_cv_path_LD
++lt_cv_path_LD=$lt_save_path_LD
++lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
++lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
++
++	else
++	  tagname=""
++	fi
++	;;
++
++      F77)
++	if test -n "$F77" && test "X$F77" != "Xno"; then
++	  
++ac_ext=f
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
++
++
++archive_cmds_need_lc_F77=no
++allow_undefined_flag_F77=
++always_export_symbols_F77=no
++archive_expsym_cmds_F77=
++export_dynamic_flag_spec_F77=
++hardcode_direct_F77=no
++hardcode_libdir_flag_spec_F77=
++hardcode_libdir_flag_spec_ld_F77=
++hardcode_libdir_separator_F77=
++hardcode_minus_L_F77=no
++hardcode_automatic_F77=no
++module_cmds_F77=
++module_expsym_cmds_F77=
++link_all_deplibs_F77=unknown
++old_archive_cmds_F77=$old_archive_cmds
++no_undefined_flag_F77=
++whole_archive_flag_spec_F77=
++enable_shared_with_static_runtimes_F77=no
++
++# Source file extension for f77 test sources.
++ac_ext=f
++
++# Object file extension for compiled f77 test sources.
++objext=o
++objext_F77=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code="      program t\n      end\n"
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
++
++# Allow CC to be a program name with arguments.
++compiler=$CC
++
++
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${F77-"f77"}
++compiler=$CC
++compiler_F77=$CC
++cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++
++echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
++echo "$as_me:$LINENO: result: $can_build_shared" >&5
++echo "${ECHO_T}$can_build_shared" >&6
++
++echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
++test "$can_build_shared" = "no" && enable_shared=no
++
++# On AIX, shared libraries and static libraries use the same namespace, and
++# are all built from PIC.
++case "$host_os" in
++aix3*)
++  test "$enable_shared" = yes && enable_static=no
++  if test -n "$RANLIB"; then
++    archive_cmds="$archive_cmds~\$RANLIB \$lib"
++    postinstall_cmds='$RANLIB $lib'
++  fi
++  ;;
++aix4* | aix5*)
++  test "$enable_shared" = yes && enable_static=no
++  ;;
++esac
++echo "$as_me:$LINENO: result: $enable_shared" >&5
++echo "${ECHO_T}$enable_shared" >&6
++
++echo "$as_me:$LINENO: checking whether to build static libraries" >&5
++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
++# Make sure either enable_shared or enable_static is yes.
++test "$enable_shared" = yes || enable_static=yes
++echo "$as_me:$LINENO: result: $enable_static" >&5
++echo "${ECHO_T}$enable_static" >&6
++
++test "$ld_shlibs_F77" = no && can_build_shared=no
++
++GCC_F77="$G77"
++LD_F77="$LD"
++
++lt_prog_compiler_wl_F77=
++lt_prog_compiler_pic_F77=
++lt_prog_compiler_static_F77=
++
++echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++ 
++  if test "$GCC" = yes; then
++    lt_prog_compiler_wl_F77='-Wl,'
++    lt_prog_compiler_static_F77='-static'
++
++    case $host_os in
++      aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static_F77='-Bstatic'
++      fi
++      ;;
++
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
++      ;;
++
++    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
++      ;;
++
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_prog_compiler_pic_F77='-fno-common'
++      ;;
++
++    msdosdjgpp*)
++      # Just because we use GCC doesn't mean we suddenly get shared libraries
++      # on systems that don't support them.
++      lt_prog_compiler_can_build_shared_F77=no
++      enable_shared=no
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	lt_prog_compiler_pic_F77=-Kconform_pic
++      fi
++      ;;
++
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic_F77='-fPIC'
++	;;
++      esac
++      ;;
++
++    *)
++      lt_prog_compiler_pic_F77='-fPIC'
++      ;;
++    esac
++  else
++    # PORTME Check for flag to pass linker flags through the system compiler.
++    case $host_os in
++    aix*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static_F77='-Bstatic'
++      else
++	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
++      fi
++      ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case "$cc_basename" in
++         xlc*)
++         lt_prog_compiler_pic_F77='-qnocommon'
++         lt_prog_compiler_wl_F77='-Wl,'
++         ;;
++       esac
++       ;;
++
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
++      ;;
++
++    hpux9* | hpux10* | hpux11*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic_F77='+Z'
++	;;
++      esac
++      # Is there a better lt_prog_compiler_static that works with the bundled CC?
++      lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      # PIC (with -KPIC) is the default.
++      lt_prog_compiler_static_F77='-non_shared'
++      ;;
++
++    newsos6)
++      lt_prog_compiler_pic_F77='-KPIC'
++      lt_prog_compiler_static_F77='-Bstatic'
++      ;;
++
++    linux*)
++      case $CC in
++      icc* | ecc*)
++	lt_prog_compiler_wl_F77='-Wl,'
++	lt_prog_compiler_pic_F77='-KPIC'
++	lt_prog_compiler_static_F77='-static'
++        ;;
++      ccc*)
++        lt_prog_compiler_wl_F77='-Wl,'
++        # All Alpha code is PIC.
++        lt_prog_compiler_static_F77='-non_shared'
++        ;;
++      esac
++      ;;
++
++    osf3* | osf4* | osf5*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      # All OSF/1 code is PIC.
++      lt_prog_compiler_static_F77='-non_shared'
++      ;;
++
++    sco3.2v5*)
++      lt_prog_compiler_pic_F77='-Kpic'
++      lt_prog_compiler_static_F77='-dn'
++      ;;
++
++    solaris*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      lt_prog_compiler_pic_F77='-KPIC'
++      lt_prog_compiler_static_F77='-Bstatic'
++      ;;
++
++    sunos4*)
++      lt_prog_compiler_wl_F77='-Qoption ld '
++      lt_prog_compiler_pic_F77='-PIC'
++      lt_prog_compiler_static_F77='-Bstatic'
++      ;;
++
++    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      lt_prog_compiler_pic_F77='-KPIC'
++      lt_prog_compiler_static_F77='-Bstatic'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	lt_prog_compiler_pic_F77='-Kconform_pic'
++	lt_prog_compiler_static_F77='-Bstatic'
++      fi
++      ;;
++
++    uts4*)
++      lt_prog_compiler_pic_F77='-pic'
++      lt_prog_compiler_static_F77='-Bstatic'
++      ;;
++
++    *)
++      lt_prog_compiler_can_build_shared_F77=no
++      ;;
++    esac
++  fi
++
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
++
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$lt_prog_compiler_pic_F77"; then
++  
++echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
++if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_pic_works_F77=no
++  ac_outfile=conftest.$ac_objext
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$lt_prog_compiler_pic_F77"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:__oline__: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s conftest.err; then
++       lt_prog_compiler_pic_works_F77=yes
++     fi
++   fi
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
++
++if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
++    case $lt_prog_compiler_pic_F77 in
++     "" | " "*) ;;
++     *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
++     esac
++else
++    lt_prog_compiler_pic_F77=
++     lt_prog_compiler_can_build_shared_F77=no
++fi
++
++fi
++case "$host_os" in
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    lt_prog_compiler_pic_F77=
++    ;;
++  *)
++    lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
++    ;;
++esac
++
++echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_prog_compiler_c_o_F77=no
++   $rm -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&5
++   echo "$as_me:__oline__: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s out/conftest2.$ac_objext
++   then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s out/conftest.err; then
++       lt_cv_prog_compiler_c_o_F77=yes
++     fi
++   fi
++   chmod u+w .
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
++   cd ..
++   rmdir conftest
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
++
++
++hard_links="nottested"
++if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6
++  if test "$hard_links" = no; then
++    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
++
++echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++
++  runpath_var=
++  allow_undefined_flag_F77=
++  enable_shared_with_static_runtimes_F77=no
++  archive_cmds_F77=
++  archive_expsym_cmds_F77=
++  old_archive_From_new_cmds_F77=
++  old_archive_from_expsyms_cmds_F77=
++  export_dynamic_flag_spec_F77=
++  whole_archive_flag_spec_F77=
++  thread_safe_flag_spec_F77=
++  hardcode_libdir_flag_spec_F77=
++  hardcode_libdir_flag_spec_ld_F77=
++  hardcode_libdir_separator_F77=
++  hardcode_direct_F77=no
++  hardcode_minus_L_F77=no
++  hardcode_shlibpath_var_F77=unsupported
++  link_all_deplibs_F77=unknown
++  hardcode_automatic_F77=no
++  module_cmds_F77=
++  module_expsym_cmds_F77=
++  always_export_symbols_F77=no
++  export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  # include_expsyms should be a list of space-separated symbols to be *always*
++  # included in the symbol list
++  include_expsyms_F77=
++  # exclude_expsyms can be an extended regexp of symbols to exclude
++  # it will be wrapped by ` (' and `)$', so one must not match beginning or
++  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++  # as well as any symbol that contains `d'.
++  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
++  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++  # platforms (ab)use it in PIC code, but their linkers get confused if
++  # the symbol is explicitly referenced.  Since portable code cannot
++  # rely on this symbol name, it's probably fine to never include it in
++  # preloaded symbol tables.
++  extract_expsyms_cmds=
++
++  case $host_os in
++  cygwin* | mingw* | pw32*)
++    # FIXME: the MSVC++ port hasn't been tested in a loooong time
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    if test "$GCC" != yes; then
++      with_gnu_ld=no
++    fi
++    ;;
++  openbsd*)
++    with_gnu_ld=no
++    ;;
++  esac
++
++  ld_shlibs_F77=yes
++  if test "$with_gnu_ld" = yes; then
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    wlarc='${wl}'
++
++    # See if GNU ld supports shared libraries.
++    case $host_os in
++    aix3* | aix4* | aix5*)
++      # On AIX/PPC, the GNU linker is very broken
++      if test "$host_cpu" != ia64; then
++	ld_shlibs_F77=no
++	cat <<EOF 1>&2
++
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
++
++EOF
++      fi
++      ;;
++
++    amigaos*)
++      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      hardcode_minus_L_F77=yes
++
++      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
++      # that the semantics of dynamic libraries on AmigaOS, at least up
++      # to version 4, is to share data among multiple programs linked
++      # with the same dynamic library.  Since this doesn't match the
++      # behavior of shared libraries on other platforms, we can't use
++      # them.
++      ld_shlibs_F77=no
++      ;;
++
++    beos*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	allow_undefined_flag_F77=unsupported
++	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++	# support --undefined.  This deserves some investigation.  FIXME
++	archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      else
++	ld_shlibs_F77=no
++      fi
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
++      # as there is no search path for DLLs.
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      allow_undefined_flag_F77=unsupported
++      always_export_symbols_F77=no
++      enable_shared_with_static_runtimes_F77=yes
++      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++
++      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++	# If the export-symbols file already is a .def file (1st line
++	# is EXPORTS), use it as is; otherwise, prepend...
++	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	  cp $export_symbols $output_objdir/$soname.def;
++	else
++	  echo EXPORTS > $output_objdir/$soname.def;
++	  cat $export_symbols >> $output_objdir/$soname.def;
++	fi~
++	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
++    netbsd*)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++	wlarc=
++      else
++	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      fi
++      ;;
++
++    solaris* | sysv5*)
++      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
++	ld_shlibs_F77=no
++	cat <<EOF 1>&2
++
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++EOF
++      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	ld_shlibs_F77=no
++      fi
++      ;;
++
++    sunos4*)
++      archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      wlarc=
++      hardcode_direct_F77=yes
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++  linux*)
++    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_cmds_F77="$tmp_archive_cmds"
++      supports_anon_versioning=no
++      case `$LD -v 2>/dev/null` in
++        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
++        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++        *\ 2.11.*) ;; # other 2.11 versions
++        *) supports_anon_versioning=yes ;;
++      esac
++      if test $supports_anon_versioning = yes; then
++        archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
++cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++$echo "local: *; };" >> $output_objdir/$libname.ver~
++        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++      else
++        archive_expsym_cmds_F77="$tmp_archive_cmds"
++      fi
++    else
++      ld_shlibs_F77=no
++    fi
++    ;;
++
++    *)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	ld_shlibs_F77=no
++      fi
++      ;;
++    esac
++
++    if test "$ld_shlibs_F77" = yes; then
++      runpath_var=LD_RUN_PATH
++      hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
++      export_dynamic_flag_spec_F77='${wl}--export-dynamic'
++      # ancient GNU ld didn't support --whole-archive et. al.
++      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++ 	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	whole_archive_flag_spec_F77=
++      fi
++    fi
++  else
++    # PORTME fill in a description of your system's linker (not GNU ld)
++    case $host_os in
++    aix3*)
++      allow_undefined_flag_F77=unsupported
++      always_export_symbols_F77=yes
++      archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
++      # Note: this linker hardcodes the directories in LIBPATH if there
++      # are no directories specified by -L.
++      hardcode_minus_L_F77=yes
++      if test "$GCC" = yes && test -z "$link_static_flag"; then
++	# Neither direct hardcoding nor static linking is supported with a
++	# broken collect2.
++	hardcode_direct_F77=unsupported
++      fi
++      ;;
++
++    aix4* | aix5*)
++      if test "$host_cpu" = ia64; then
++	# On IA64, the linker does run time linking by default, so we don't
++	# have to do anything special.
++	aix_use_runtimelinking=no
++	exp_sym_flag='-Bexport'
++	no_entry_flag=""
++      else
++	# If we're using GNU nm, then we don't want the "-C" option.
++	# -C means demangle to AIX nm, but means don't demangle with GNU nm
++	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
++	  export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++	else
++	  export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++	fi
++	aix_use_runtimelinking=no
++
++	# Test if we are trying to use run time linking or normal
++	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
++	# need to do runtime linking.
++	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++	  for ld_flag in $LDFLAGS; do
++  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++  	    aix_use_runtimelinking=yes
++  	    break
++  	  fi
++	  done
++	esac
++
++	exp_sym_flag='-bexport'
++	no_entry_flag='-bnoentry'
++      fi
++
++      # When large executables or shared objects are built, AIX ld can
++      # have problems creating the table of contents.  If linking a library
++      # or program results in "error TOC overflow" add -mminimal-toc to
++      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++      archive_cmds_F77=''
++      hardcode_direct_F77=yes
++      hardcode_libdir_separator_F77=':'
++      link_all_deplibs_F77=yes
++
++      if test "$GCC" = yes; then
++	case $host_os in aix4.012|aix4.012.*)
++	# We only want to do this on AIX 4.2 and lower, the check
++	# below for broken collect2 doesn't work under 4.3+
++	  collect2name=`${CC} -print-prog-name=collect2`
++	  if test -f "$collect2name" && \
++  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	  then
++  	  # We have reworked collect2
++  	  hardcode_direct_F77=yes
++	  else
++  	  # We have old collect2
++  	  hardcode_direct_F77=unsupported
++  	  # It fails to find uninstalled libraries when the uninstalled
++  	  # path is not listed in the libpath.  Setting hardcode_minus_L
++  	  # to unsupported forces relinking
++  	  hardcode_minus_L_F77=yes
++  	  hardcode_libdir_flag_spec_F77='-L$libdir'
++  	  hardcode_libdir_separator_F77=
++	  fi
++	esac
++	shared_flag='-shared'
++      else
++	# not using gcc
++	if test "$host_cpu" = ia64; then
++  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++  	# chokes on -Wl,-G. The following line is correct:
++	  shared_flag='-G'
++	else
++  	if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag='${wl}-G'
++	  else
++	    shared_flag='${wl}-bM:SRE'
++  	fi
++	fi
++      fi
++
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      always_export_symbols_F77=yes
++      if test "$aix_use_runtimelinking" = yes; then
++	# Warning - without using the other runtime loading flags (-brtl),
++	# -berok will link without error, but may produce a broken library.
++	allow_undefined_flag_F77='-berok'
++       # Determine the default libpath from the value encoded in an empty executable.
++       cat >conftest.$ac_ext <<_ACEOF
++      program main
++
++      end
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++       hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
++	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++       else
++	if test "$host_cpu" = ia64; then
++	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
++	  allow_undefined_flag_F77="-z nodefs"
++	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++	else
++	 # Determine the default libpath from the value encoded in an empty executable.
++	 cat >conftest.$ac_ext <<_ACEOF
++      program main
++
++      end
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++	 hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
++	  # Warning - without using the other run time loading flags,
++	  # -berok will link without error, but may produce a broken library.
++	  no_undefined_flag_F77=' ${wl}-bernotok'
++	  allow_undefined_flag_F77=' ${wl}-berok'
++	  # -bexpall does not export symbols beginning with underscore (_)
++	  always_export_symbols_F77=yes
++	  # Exported symbols can be pulled into shared objects from archives
++	  whole_archive_flag_spec_F77=' '
++	  archive_cmds_need_lc_F77=yes
++	  # This is similar to how AIX traditionally builds it's shared libraries.
++	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	fi
++      fi
++      ;;
++
++    amigaos*)
++      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      hardcode_minus_L_F77=yes
++      # see comment about different semantics on the GNU ld section
++      ld_shlibs_F77=no
++      ;;
++
++    bsdi[45]*)
++      export_dynamic_flag_spec_F77=-rdynamic
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # When not using gcc, we currently assume that we are using
++      # Microsoft Visual C++.
++      # hardcode_libdir_flag_spec is actually meaningless, as there is
++      # no search path for DLLs.
++      hardcode_libdir_flag_spec_F77=' '
++      allow_undefined_flag_F77=unsupported
++      # Tell ltmain to make .lib files, not .a files.
++      libext=lib
++      # Tell ltmain to make .dll files, not .so files.
++      shrext_cmds=".dll"
++      # FIXME: Setting linknames here is a bad hack.
++      archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      # The linker will automatically build a .lib file if we build a DLL.
++      old_archive_From_new_cmds_F77='true'
++      # FIXME: Should let the user specify the lib program.
++      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      enable_shared_with_static_runtimes_F77=yes
++      ;;
++
++    darwin* | rhapsody*)
++      case "$host_os" in
++        rhapsody* | darwin1.[012])
++         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[012])
++               allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++      esac
++      archive_cmds_need_lc_F77=no
++      hardcode_direct_F77=no
++      hardcode_automatic_F77=yes
++      hardcode_shlibpath_var_F77=unsupported
++      whole_archive_flag_spec_F77=''
++      link_all_deplibs_F77=yes
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++    else
++      case "$cc_basename" in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         ld_shlibs_F77=no
++          ;;
++      esac
++    fi
++      ;;
++
++    dgux*)
++      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    freebsd1*)
++      ld_shlibs_F77=no
++      ;;
++
++    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++    # support.  Future versions do this automatically, but an explicit c++rt0.o
++    # does not break anything, and helps significantly (at the cost of a little
++    # extra space).
++    freebsd2.2*)
++      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++      hardcode_libdir_flag_spec_F77='-R$libdir'
++      hardcode_direct_F77=yes
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++    freebsd2*)
++      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct_F77=yes
++      hardcode_minus_L_F77=yes
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++    freebsd* | kfreebsd*-gnu)
++      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++      hardcode_libdir_flag_spec_F77='-R$libdir'
++      hardcode_direct_F77=yes
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    hpux9*)
++      if test "$GCC" = yes; then
++	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      else
++	archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      fi
++      hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
++      hardcode_libdir_separator_F77=:
++      hardcode_direct_F77=yes
++
++      # hardcode_minus_L: Not really in the search PATH,
++      # but as the default location of the library.
++      hardcode_minus_L_F77=yes
++      export_dynamic_flag_spec_F77='${wl}-E'
++      ;;
++
++    hpux10* | hpux11*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	esac
++      else
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	*)
++	  archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	esac
++      fi
++      if test "$with_gnu_ld" = no; then
++	case "$host_cpu" in
++	hppa*64*)
++	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
++	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
++	  hardcode_libdir_separator_F77=:
++	  hardcode_direct_F77=no
++	  hardcode_shlibpath_var_F77=no
++	  ;;
++	ia64*)
++	  hardcode_libdir_flag_spec_F77='-L$libdir'
++	  hardcode_direct_F77=no
++	  hardcode_shlibpath_var_F77=no
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  hardcode_minus_L_F77=yes
++	  ;;
++	*)
++	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
++	  hardcode_libdir_separator_F77=:
++	  hardcode_direct_F77=yes
++	  export_dynamic_flag_spec_F77='${wl}-E'
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  hardcode_minus_L_F77=yes
++	  ;;
++	esac
++      fi
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      if test "$GCC" = yes; then
++	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
++      fi
++      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator_F77=:
++      link_all_deplibs_F77=yes
++      ;;
++
++    netbsd*)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++      else
++	archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++      fi
++      hardcode_libdir_flag_spec_F77='-R$libdir'
++      hardcode_direct_F77=yes
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    newsos6)
++      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct_F77=yes
++      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator_F77=:
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    openbsd*)
++      hardcode_direct_F77=yes
++      hardcode_shlibpath_var_F77=no
++      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec_F77='${wl}-E'
++      else
++       case $host_os in
++	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	   hardcode_libdir_flag_spec_F77='-R$libdir'
++	   ;;
++	 *)
++	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++	   ;;
++       esac
++      fi
++      ;;
++
++    os2*)
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      hardcode_minus_L_F77=yes
++      allow_undefined_flag_F77=unsupported
++      archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++      old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++      ;;
++
++    osf3*)
++      if test "$GCC" = yes; then
++	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	allow_undefined_flag_F77=' -expect_unresolved \*'
++	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++      fi
++      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator_F77=:
++      ;;
++
++    osf4* | osf5*)	# as osf3* with the addition of -msym flag
++      if test "$GCC" = yes; then
++	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
++      else
++	allow_undefined_flag_F77=' -expect_unresolved \*'
++	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++
++	# Both c and cxx compiler support -rpath directly
++	hardcode_libdir_flag_spec_F77='-rpath $libdir'
++      fi
++      hardcode_libdir_separator_F77=:
++      ;;
++
++    sco3.2v5*)
++      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var_F77=no
++      export_dynamic_flag_spec_F77='${wl}-Bexport'
++      runpath_var=LD_RUN_PATH
++      hardcode_runpath_var=yes
++      ;;
++
++    solaris*)
++      no_undefined_flag_F77=' -z text'
++      if test "$GCC" = yes; then
++	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
++      else
++	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      fi
++      hardcode_libdir_flag_spec_F77='-R$libdir'
++      hardcode_shlibpath_var_F77=no
++      case $host_os in
++      solaris2.[0-5] | solaris2.[0-5].*) ;;
++      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
++	whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
++      esac
++      link_all_deplibs_F77=yes
++      ;;
++
++    sunos4*)
++      if test "x$host_vendor" = xsequent; then
++	# Use $CC to link under sequent, because it throws in some extra .o
++	# files that make .init and .fini sections work.
++	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      hardcode_direct_F77=yes
++      hardcode_minus_L_F77=yes
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    sysv4)
++      case $host_vendor in
++	sni)
++	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct_F77=yes # is this really true???
++	;;
++	siemens)
++	  ## LD is ld it makes a PLAMLIB
++	  ## CC just makes a GrossModule.
++	  archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++	  reload_cmds_F77='$CC -r -o $output$reload_objs'
++	  hardcode_direct_F77=no
++        ;;
++	motorola)
++	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie
++	;;
++      esac
++      runpath_var='LD_RUN_PATH'
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    sysv4.3*)
++      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var_F77=no
++      export_dynamic_flag_spec_F77='-Bexport'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	hardcode_shlibpath_var_F77=no
++	runpath_var=LD_RUN_PATH
++	hardcode_runpath_var=yes
++	ld_shlibs_F77=yes
++      fi
++      ;;
++
++    sysv4.2uw2*)
++      archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct_F77=yes
++      hardcode_minus_L_F77=no
++      hardcode_shlibpath_var_F77=no
++      hardcode_runpath_var=yes
++      runpath_var=LD_RUN_PATH
++      ;;
++
++   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
++      no_undefined_flag_F77='${wl}-z ${wl}text'
++      if test "$GCC" = yes; then
++	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
++      runpath_var='LD_RUN_PATH'
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    sysv5*)
++      no_undefined_flag_F77=' -z text'
++      # $CC -shared without GNU ld will not create a library from C++
++      # object files and a static libstdc++, better avoid it by now
++      archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      hardcode_libdir_flag_spec_F77=
++      hardcode_shlibpath_var_F77=no
++      runpath_var='LD_RUN_PATH'
++      ;;
++
++    uts4*)
++      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    *)
++      ld_shlibs_F77=no
++      ;;
++    esac
++  fi
++
++echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
++echo "${ECHO_T}$ld_shlibs_F77" >&6
++test "$ld_shlibs_F77" = no && can_build_shared=no
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
++#
++# Do we need to explicitly link libc?
++#
++case "x$archive_cmds_need_lc_F77" in
++x|xyes)
++  # Assume -lc should be added
++  archive_cmds_need_lc_F77=yes
++
++  if test "$enable_shared" = yes && test "$GCC" = yes; then
++    case $archive_cmds_F77 in
++    *'~'*)
++      # FIXME: we may have to deal with multi-command sequences.
++      ;;
++    '$CC '*)
++      # Test whether the compiler implicitly links with -lc since on some
++      # systems, -lgcc has to come before -lc. If gcc already passes -lc
++      # to ld, don't add -lc before -lgcc.
++      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++      $rm conftest*
++      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        libobjs=conftest.$ac_objext
++        deplibs=
++        wl=$lt_prog_compiler_wl_F77
++        compiler_flags=-v
++        linker_flags=-v
++        verstring=
++        output_objdir=.
++        libname=conftest
++        lt_save_allow_undefined_flag=$allow_undefined_flag_F77
++        allow_undefined_flag_F77=
++        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
++  (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++        then
++	  archive_cmds_need_lc_F77=no
++        else
++	  archive_cmds_need_lc_F77=yes
++        fi
++        allow_undefined_flag_F77=$lt_save_allow_undefined_flag
++      else
++        cat conftest.err 1>&5
++      fi
++      $rm conftest*
++      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
++      ;;
++    esac
++  fi
++  ;;
++esac
++
++echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
++need_lib_prefix=unknown
++hardcode_into_libs=no
++
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
++
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  shlibpath_var=LIBPATH
++
++  # AIX 3 has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}${shared_ext}$major'
++  ;;
++
++aix4* | aix5*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[01] | aix4.[01].*)
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	   echo ' yes '
++	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++	:
++      else
++	can_build_shared=no
++      fi
++      ;;
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}${shared_ext}$major'
++    fi
++    shlibpath_var=LIBPATH
++  fi
++  ;;
++
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++  ;;
++
++beos*)
++  library_names_spec='${libname}${shared_ext}'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
++
++bsdi[45]*)
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
++
++cygwin* | mingw* | pw32*)
++  version_type=windows
++  shrext_cmds=".dll"
++  need_version=no
++  need_lib_prefix=no
++
++  case $GCC,$host_os in
++  yes,cygwin* | yes,mingw* | yes,pw32*)
++    library_names_spec='$libname.dll.a'
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $rm \$dlpath'
++    shlibpath_overrides_runpath=yes
++
++    case $host_os in
++    cygwin*)
++      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
++    mingw*)
++      # MinGW DLLs use traditional 'lib' prefix
++      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
++        # It is most probably a Windows format PATH printed by
++        # mingw gcc, but we are running on Cygwin. Gcc prints its search
++        # path with ; separators, and with drive letters. We can handle the
++        # drive letters (cygwin fileutils understands them), so leave them,
++        # especially as we might pass files found there to a mingw objdump,
++        # which wouldn't understand a cygwinified path. Ahh.
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++      fi
++      ;;
++    pw32*)
++      # pw32 DLLs use 'pw' prefix rather than 'lib'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++      ;;
++    esac
++    ;;
++
++  *)
++    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    ;;
++  esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  ;;
++
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  soname_spec='${libname}${release}${major}$shared_ext'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
++  if test "$GCC" = yes; then
++    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
++  else
++    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
++  fi
++  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++  ;;
++
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++freebsd1*)
++  dynamic_linker=no
++  ;;
++
++kfreebsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++freebsd*)
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
++    ;;
++  freebsd3.01* | freebsdelf3.01*)
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
++  *) # from 3.2 on
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
++    ;;
++  esac
++  ;;
++
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  ;;
++
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  case "$host_cpu" in
++  ia64*)
++    shrext_cmds='.so'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.so"
++    shlibpath_var=LD_LIBRARY_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    if test "X$HPUX_IA64_MODE" = X32; then
++      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++    else
++      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++    fi
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    ;;
++   hppa*64*)
++     shrext_cmds='.sl'
++     hardcode_into_libs=yes
++     dynamic_linker="$host_os dld.sl"
++     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++     soname_spec='${libname}${release}${shared_ext}$major'
++     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++     ;;
++   *)
++    shrext_cmds='.sl'
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=SHLIB_PATH
++    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    ;;
++  esac
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
++    *)
++	if test "$lt_cv_prog_gnu_ld" = yes; then
++		version_type=linux
++	else
++		version_type=irix
++	fi ;;
++  esac
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  case $host_os in
++  irix5* | nonstopux*)
++    libsuff= shlibsuff=
++    ;;
++  *)
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++      libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++      libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++      libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  hardcode_into_libs=yes
++  ;;
++
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++  dynamic_linker=no
++  ;;
++
++# This must be Linux ELF.
++linux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
++
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
++
++knetbsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++nto-qnx*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++openbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    case $host_os in
++      openbsd2.[89] | openbsd2.[89].*)
++	shlibpath_overrides_runpath=no
++	;;
++      *)
++	shlibpath_overrides_runpath=yes
++	;;
++      esac
++  else
++    shlibpath_overrides_runpath=yes
++  fi
++  ;;
++
++os2*)
++  libname_spec='$name'
++  shrext_cmds=".dll"
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
++
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
++
++sco3.2v5*)
++  version_type=osf
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
++
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      export_dynamic_flag_spec='${wl}-Blargedynsym'
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
++
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
++
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++*)
++  dynamic_linker=no
++  ;;
++esac
++echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6
++test "$dynamic_linker" = no && can_build_shared=no
++
++echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++hardcode_action_F77=
++if test -n "$hardcode_libdir_flag_spec_F77" || \
++   test -n "$runpath_var_F77" || \
++   test "X$hardcode_automatic_F77" = "Xyes" ; then
++
++  # We can hardcode non-existant directories.
++  if test "$hardcode_direct_F77" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
++     test "$hardcode_minus_L_F77" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action_F77=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action_F77=immediate
++  fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action_F77=unsupported
++fi
++echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
++echo "${ECHO_T}$hardcode_action_F77" >&6
++
++if test "$hardcode_action_F77" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
++
++striplib=
++old_striplib=
++echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
++echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
++  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++else
++# FIXME - insert some real tests, host_os isn't really good enough
++  case $host_os in
++   darwin*)
++       if test -n "$STRIP" ; then
++         striplib="$STRIP -x"
++         echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++       else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++       ;;
++   *)
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++    ;;
++  esac
++fi
++
++
++
++# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # See if we are running on zsh, and set the options which allow our commands through
++  # without removal of \ escapes.
++  if test -n "${ZSH_VERSION+set}" ; then
++    setopt NO_GLOB_SUBST
++  fi
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++    SED SHELL STRIP \
++    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++    deplibs_check_method reload_flag reload_cmds need_locks \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    old_postinstall_cmds old_postuninstall_cmds \
++    compiler_F77 \
++    CC_F77 \
++    LD_F77 \
++    lt_prog_compiler_wl_F77 \
++    lt_prog_compiler_pic_F77 \
++    lt_prog_compiler_static_F77 \
++    lt_prog_compiler_no_builtin_flag_F77 \
++    export_dynamic_flag_spec_F77 \
++    thread_safe_flag_spec_F77 \
++    whole_archive_flag_spec_F77 \
++    enable_shared_with_static_runtimes_F77 \
++    old_archive_cmds_F77 \
++    old_archive_from_new_cmds_F77 \
++    predep_objects_F77 \
++    postdep_objects_F77 \
++    predeps_F77 \
++    postdeps_F77 \
++    compiler_lib_search_path_F77 \
++    archive_cmds_F77 \
++    archive_expsym_cmds_F77 \
++    postinstall_cmds_F77 \
++    postuninstall_cmds_F77 \
++    old_archive_from_expsyms_cmds_F77 \
++    allow_undefined_flag_F77 \
++    no_undefined_flag_F77 \
++    export_symbols_cmds_F77 \
++    hardcode_libdir_flag_spec_F77 \
++    hardcode_libdir_flag_spec_ld_F77 \
++    hardcode_libdir_separator_F77 \
++    hardcode_automatic_F77 \
++    module_cmds_F77 \
++    module_expsym_cmds_F77 \
++    lt_cv_prog_compiler_c_o_F77 \
++    exclude_expsyms_F77 \
++    include_expsyms_F77; do
++
++    case $var in
++    old_archive_cmds_F77 | \
++    old_archive_from_new_cmds_F77 | \
++    archive_cmds_F77 | \
++    archive_expsym_cmds_F77 | \
++    module_cmds_F77 | \
++    module_expsym_cmds_F77 | \
++    old_archive_from_expsyms_cmds_F77 | \
++    export_symbols_cmds_F77 | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  case $lt_echo in
++  *'\$0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
++    ;;
++  esac
++
++cfgfile="$ofile"
++
++  cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
++
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_F77
++
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
++
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
++
++# A C compiler.
++LTCC=$lt_LTCC
++
++# A language-specific compiler.
++CC=$lt_compiler_F77
++
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_F77
++
++# An ERE matcher.
++EGREP=$lt_EGREP
++
++# The linker used to build libraries.
++LD=$lt_LD_F77
++
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
++
++# A BSD-compatible nm program.
++NM=$lt_NM
++
++# A symbol stripping program
++STRIP=$lt_STRIP
++
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_F77
++
++# Object file suffix (normally "o").
++objext="$ac_objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
++
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic_F77
++pic_mode=$pic_mode
++
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
++
++# Must we lock files when doing compilation ?
++need_locks=$lt_need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_F77
++
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
++
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
++
++# Library versioning type.
++version_type=$version_type
++
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
++
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds_F77
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
++
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77
++
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
++
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds_F77
++archive_expsym_cmds=$lt_archive_expsym_cmds_F77
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
++
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds_F77
++module_expsym_cmds=$lt_module_expsym_cmds_F77
++
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_F77
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_F77
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps_F77
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps_F77
++
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_F77
++
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_F77
++
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_F77
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
++
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
++
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
++
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action_F77
++
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
++
++# If ld is used when linking, flag to hardcode \$libdir into
++# a binary during linking. This must work even if \$libdir does
++# not exist.
++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
++
++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct_F77
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L_F77
++
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
++
++# Set to yes if building a shared library automatically hardcodes DIR into the library
++# and all subsequent libraries and executables linked against it.
++hardcode_automatic=$hardcode_automatic_F77
++
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
++
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs_F77
++
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path_F77"
++
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols_F77
++
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds_F77
++
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms_F77
++
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms_F77
++
++# ### END LIBTOOL TAG CONFIG: $tagname
++
++__EOF__
++
++
++else
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
++fi
++
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++CC="$lt_save_CC"
++
++	else
++	  tagname=""
++	fi
++	;;
++
++      GCJ)
++	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
++	  
++
++
++# Source file extension for Java test sources.
++ac_ext=java
++
++# Object file extension for compiled Java test sources.
++objext=o
++objext_GCJ=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="class foo {}\n"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
++
++# Allow CC to be a program name with arguments.
++compiler=$CC
++
++
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${GCJ-"gcj"}
++compiler=$CC
++compiler_GCJ=$CC
++
++# GCJ did not exist at the time GCC didn't implicitly link libc in.
++archive_cmds_need_lc_GCJ=no
++
++
++lt_prog_compiler_no_builtin_flag_GCJ=
++
++if test "$GCC" = yes; then
++  lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
++
++  
++echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
++if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_prog_compiler_rtti_exceptions=no
++  ac_outfile=conftest.$ac_objext
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="-fno-rtti -fno-exceptions"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:__oline__: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s conftest.err; then
++       lt_cv_prog_compiler_rtti_exceptions=yes
++     fi
++   fi
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
++
++if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
++    lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
++else
++    :
++fi
++
++fi
++
++lt_prog_compiler_wl_GCJ=
++lt_prog_compiler_pic_GCJ=
++lt_prog_compiler_static_GCJ=
++
++echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++ 
++  if test "$GCC" = yes; then
++    lt_prog_compiler_wl_GCJ='-Wl,'
++    lt_prog_compiler_static_GCJ='-static'
++
++    case $host_os in
++      aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static_GCJ='-Bstatic'
++      fi
++      ;;
++
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
++      ;;
++
++    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
++      ;;
++
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_prog_compiler_pic_GCJ='-fno-common'
++      ;;
++
++    msdosdjgpp*)
++      # Just because we use GCC doesn't mean we suddenly get shared libraries
++      # on systems that don't support them.
++      lt_prog_compiler_can_build_shared_GCJ=no
++      enable_shared=no
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	lt_prog_compiler_pic_GCJ=-Kconform_pic
++      fi
++      ;;
++
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic_GCJ='-fPIC'
++	;;
++      esac
++      ;;
++
++    *)
++      lt_prog_compiler_pic_GCJ='-fPIC'
++      ;;
++    esac
++  else
++    # PORTME Check for flag to pass linker flags through the system compiler.
++    case $host_os in
++    aix*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static_GCJ='-Bstatic'
++      else
++	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
++      fi
++      ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case "$cc_basename" in
++         xlc*)
++         lt_prog_compiler_pic_GCJ='-qnocommon'
++         lt_prog_compiler_wl_GCJ='-Wl,'
++         ;;
++       esac
++       ;;
++
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
++      ;;
++
++    hpux9* | hpux10* | hpux11*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic_GCJ='+Z'
++	;;
++      esac
++      # Is there a better lt_prog_compiler_static that works with the bundled CC?
++      lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      # PIC (with -KPIC) is the default.
++      lt_prog_compiler_static_GCJ='-non_shared'
++      ;;
++
++    newsos6)
++      lt_prog_compiler_pic_GCJ='-KPIC'
++      lt_prog_compiler_static_GCJ='-Bstatic'
++      ;;
++
++    linux*)
++      case $CC in
++      icc* | ecc*)
++	lt_prog_compiler_wl_GCJ='-Wl,'
++	lt_prog_compiler_pic_GCJ='-KPIC'
++	lt_prog_compiler_static_GCJ='-static'
++        ;;
++      ccc*)
++        lt_prog_compiler_wl_GCJ='-Wl,'
++        # All Alpha code is PIC.
++        lt_prog_compiler_static_GCJ='-non_shared'
++        ;;
++      esac
++      ;;
++
++    osf3* | osf4* | osf5*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      # All OSF/1 code is PIC.
++      lt_prog_compiler_static_GCJ='-non_shared'
++      ;;
++
++    sco3.2v5*)
++      lt_prog_compiler_pic_GCJ='-Kpic'
++      lt_prog_compiler_static_GCJ='-dn'
++      ;;
++
++    solaris*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      lt_prog_compiler_pic_GCJ='-KPIC'
++      lt_prog_compiler_static_GCJ='-Bstatic'
++      ;;
++
++    sunos4*)
++      lt_prog_compiler_wl_GCJ='-Qoption ld '
++      lt_prog_compiler_pic_GCJ='-PIC'
++      lt_prog_compiler_static_GCJ='-Bstatic'
++      ;;
++
++    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      lt_prog_compiler_pic_GCJ='-KPIC'
++      lt_prog_compiler_static_GCJ='-Bstatic'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	lt_prog_compiler_pic_GCJ='-Kconform_pic'
++	lt_prog_compiler_static_GCJ='-Bstatic'
++      fi
++      ;;
++
++    uts4*)
++      lt_prog_compiler_pic_GCJ='-pic'
++      lt_prog_compiler_static_GCJ='-Bstatic'
++      ;;
++
++    *)
++      lt_prog_compiler_can_build_shared_GCJ=no
++      ;;
++    esac
++  fi
++
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
++
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$lt_prog_compiler_pic_GCJ"; then
++  
++echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
++if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_pic_works_GCJ=no
++  ac_outfile=conftest.$ac_objext
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:__oline__: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s conftest.err; then
++       lt_prog_compiler_pic_works_GCJ=yes
++     fi
++   fi
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
++
++if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
++    case $lt_prog_compiler_pic_GCJ in
++     "" | " "*) ;;
++     *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
++     esac
++else
++    lt_prog_compiler_pic_GCJ=
++     lt_prog_compiler_can_build_shared_GCJ=no
++fi
++
++fi
++case "$host_os" in
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    lt_prog_compiler_pic_GCJ=
++    ;;
++  *)
++    lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
++    ;;
++esac
++
++echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_prog_compiler_c_o_GCJ=no
++   $rm -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&5
++   echo "$as_me:__oline__: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s out/conftest2.$ac_objext
++   then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s out/conftest.err; then
++       lt_cv_prog_compiler_c_o_GCJ=yes
++     fi
++   fi
++   chmod u+w .
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
++   cd ..
++   rmdir conftest
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6
++
++
++hard_links="nottested"
++if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6
++  if test "$hard_links" = no; then
++    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
++
++echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++
++  runpath_var=
++  allow_undefined_flag_GCJ=
++  enable_shared_with_static_runtimes_GCJ=no
++  archive_cmds_GCJ=
++  archive_expsym_cmds_GCJ=
++  old_archive_From_new_cmds_GCJ=
++  old_archive_from_expsyms_cmds_GCJ=
++  export_dynamic_flag_spec_GCJ=
++  whole_archive_flag_spec_GCJ=
++  thread_safe_flag_spec_GCJ=
++  hardcode_libdir_flag_spec_GCJ=
++  hardcode_libdir_flag_spec_ld_GCJ=
++  hardcode_libdir_separator_GCJ=
++  hardcode_direct_GCJ=no
++  hardcode_minus_L_GCJ=no
++  hardcode_shlibpath_var_GCJ=unsupported
++  link_all_deplibs_GCJ=unknown
++  hardcode_automatic_GCJ=no
++  module_cmds_GCJ=
++  module_expsym_cmds_GCJ=
++  always_export_symbols_GCJ=no
++  export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  # include_expsyms should be a list of space-separated symbols to be *always*
++  # included in the symbol list
++  include_expsyms_GCJ=
++  # exclude_expsyms can be an extended regexp of symbols to exclude
++  # it will be wrapped by ` (' and `)$', so one must not match beginning or
++  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++  # as well as any symbol that contains `d'.
++  exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
++  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++  # platforms (ab)use it in PIC code, but their linkers get confused if
++  # the symbol is explicitly referenced.  Since portable code cannot
++  # rely on this symbol name, it's probably fine to never include it in
++  # preloaded symbol tables.
++  extract_expsyms_cmds=
++
++  case $host_os in
++  cygwin* | mingw* | pw32*)
++    # FIXME: the MSVC++ port hasn't been tested in a loooong time
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    if test "$GCC" != yes; then
++      with_gnu_ld=no
++    fi
++    ;;
++  openbsd*)
++    with_gnu_ld=no
++    ;;
++  esac
++
++  ld_shlibs_GCJ=yes
++  if test "$with_gnu_ld" = yes; then
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    wlarc='${wl}'
++
++    # See if GNU ld supports shared libraries.
++    case $host_os in
++    aix3* | aix4* | aix5*)
++      # On AIX/PPC, the GNU linker is very broken
++      if test "$host_cpu" != ia64; then
++	ld_shlibs_GCJ=no
++	cat <<EOF 1>&2
++
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
++
++EOF
++      fi
++      ;;
++
++    amigaos*)
++      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      hardcode_minus_L_GCJ=yes
++
++      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
++      # that the semantics of dynamic libraries on AmigaOS, at least up
++      # to version 4, is to share data among multiple programs linked
++      # with the same dynamic library.  Since this doesn't match the
++      # behavior of shared libraries on other platforms, we can't use
++      # them.
++      ld_shlibs_GCJ=no
++      ;;
++
++    beos*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	allow_undefined_flag_GCJ=unsupported
++	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++	# support --undefined.  This deserves some investigation.  FIXME
++	archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      else
++	ld_shlibs_GCJ=no
++      fi
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
++      # as there is no search path for DLLs.
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      allow_undefined_flag_GCJ=unsupported
++      always_export_symbols_GCJ=no
++      enable_shared_with_static_runtimes_GCJ=yes
++      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++
++      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++	# If the export-symbols file already is a .def file (1st line
++	# is EXPORTS), use it as is; otherwise, prepend...
++	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	  cp $export_symbols $output_objdir/$soname.def;
++	else
++	  echo EXPORTS > $output_objdir/$soname.def;
++	  cat $export_symbols >> $output_objdir/$soname.def;
++	fi~
++	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
++    netbsd*)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++	wlarc=
++      else
++	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      fi
++      ;;
++
++    solaris* | sysv5*)
++      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
++	ld_shlibs_GCJ=no
++	cat <<EOF 1>&2
++
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++EOF
++      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	ld_shlibs_GCJ=no
++      fi
++      ;;
++
++    sunos4*)
++      archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      wlarc=
++      hardcode_direct_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++  linux*)
++    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_cmds_GCJ="$tmp_archive_cmds"
++      supports_anon_versioning=no
++      case `$LD -v 2>/dev/null` in
++        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
++        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++        *\ 2.11.*) ;; # other 2.11 versions
++        *) supports_anon_versioning=yes ;;
++      esac
++      if test $supports_anon_versioning = yes; then
++        archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
++cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++$echo "local: *; };" >> $output_objdir/$libname.ver~
++        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++      else
++        archive_expsym_cmds_GCJ="$tmp_archive_cmds"
++      fi
++    else
++      ld_shlibs_GCJ=no
++    fi
++    ;;
++
++    *)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	ld_shlibs_GCJ=no
++      fi
++      ;;
++    esac
++
++    if test "$ld_shlibs_GCJ" = yes; then
++      runpath_var=LD_RUN_PATH
++      hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
++      export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
++      # ancient GNU ld didn't support --whole-archive et. al.
++      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++ 	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	whole_archive_flag_spec_GCJ=
++      fi
++    fi
++  else
++    # PORTME fill in a description of your system's linker (not GNU ld)
++    case $host_os in
++    aix3*)
++      allow_undefined_flag_GCJ=unsupported
++      always_export_symbols_GCJ=yes
++      archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
++      # Note: this linker hardcodes the directories in LIBPATH if there
++      # are no directories specified by -L.
++      hardcode_minus_L_GCJ=yes
++      if test "$GCC" = yes && test -z "$link_static_flag"; then
++	# Neither direct hardcoding nor static linking is supported with a
++	# broken collect2.
++	hardcode_direct_GCJ=unsupported
++      fi
++      ;;
++
++    aix4* | aix5*)
++      if test "$host_cpu" = ia64; then
++	# On IA64, the linker does run time linking by default, so we don't
++	# have to do anything special.
++	aix_use_runtimelinking=no
++	exp_sym_flag='-Bexport'
++	no_entry_flag=""
++      else
++	# If we're using GNU nm, then we don't want the "-C" option.
++	# -C means demangle to AIX nm, but means don't demangle with GNU nm
++	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
++	  export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++	else
++	  export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++	fi
++	aix_use_runtimelinking=no
++
++	# Test if we are trying to use run time linking or normal
++	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
++	# need to do runtime linking.
++	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++	  for ld_flag in $LDFLAGS; do
++  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++  	    aix_use_runtimelinking=yes
++  	    break
++  	  fi
++	  done
++	esac
++
++	exp_sym_flag='-bexport'
++	no_entry_flag='-bnoentry'
++      fi
++
++      # When large executables or shared objects are built, AIX ld can
++      # have problems creating the table of contents.  If linking a library
++      # or program results in "error TOC overflow" add -mminimal-toc to
++      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++      archive_cmds_GCJ=''
++      hardcode_direct_GCJ=yes
++      hardcode_libdir_separator_GCJ=':'
++      link_all_deplibs_GCJ=yes
++
++      if test "$GCC" = yes; then
++	case $host_os in aix4.012|aix4.012.*)
++	# We only want to do this on AIX 4.2 and lower, the check
++	# below for broken collect2 doesn't work under 4.3+
++	  collect2name=`${CC} -print-prog-name=collect2`
++	  if test -f "$collect2name" && \
++  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	  then
++  	  # We have reworked collect2
++  	  hardcode_direct_GCJ=yes
++	  else
++  	  # We have old collect2
++  	  hardcode_direct_GCJ=unsupported
++  	  # It fails to find uninstalled libraries when the uninstalled
++  	  # path is not listed in the libpath.  Setting hardcode_minus_L
++  	  # to unsupported forces relinking
++  	  hardcode_minus_L_GCJ=yes
++  	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
++  	  hardcode_libdir_separator_GCJ=
++	  fi
++	esac
++	shared_flag='-shared'
++      else
++	# not using gcc
++	if test "$host_cpu" = ia64; then
++  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++  	# chokes on -Wl,-G. The following line is correct:
++	  shared_flag='-G'
++	else
++  	if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag='${wl}-G'
++	  else
++	    shared_flag='${wl}-bM:SRE'
++  	fi
++	fi
++      fi
++
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      always_export_symbols_GCJ=yes
++      if test "$aix_use_runtimelinking" = yes; then
++	# Warning - without using the other runtime loading flags (-brtl),
++	# -berok will link without error, but may produce a broken library.
++	allow_undefined_flag_GCJ='-berok'
++       # Determine the default libpath from the value encoded in an empty executable.
++       cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++       hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
++	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++       else
++	if test "$host_cpu" = ia64; then
++	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
++	  allow_undefined_flag_GCJ="-z nodefs"
++	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++	else
++	 # Determine the default libpath from the value encoded in an empty executable.
++	 cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++	 hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
++	  # Warning - without using the other run time loading flags,
++	  # -berok will link without error, but may produce a broken library.
++	  no_undefined_flag_GCJ=' ${wl}-bernotok'
++	  allow_undefined_flag_GCJ=' ${wl}-berok'
++	  # -bexpall does not export symbols beginning with underscore (_)
++	  always_export_symbols_GCJ=yes
++	  # Exported symbols can be pulled into shared objects from archives
++	  whole_archive_flag_spec_GCJ=' '
++	  archive_cmds_need_lc_GCJ=yes
++	  # This is similar to how AIX traditionally builds it's shared libraries.
++	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	fi
++      fi
++      ;;
++
++    amigaos*)
++      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      hardcode_minus_L_GCJ=yes
++      # see comment about different semantics on the GNU ld section
++      ld_shlibs_GCJ=no
++      ;;
++
++    bsdi[45]*)
++      export_dynamic_flag_spec_GCJ=-rdynamic
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # When not using gcc, we currently assume that we are using
++      # Microsoft Visual C++.
++      # hardcode_libdir_flag_spec is actually meaningless, as there is
++      # no search path for DLLs.
++      hardcode_libdir_flag_spec_GCJ=' '
++      allow_undefined_flag_GCJ=unsupported
++      # Tell ltmain to make .lib files, not .a files.
++      libext=lib
++      # Tell ltmain to make .dll files, not .so files.
++      shrext_cmds=".dll"
++      # FIXME: Setting linknames here is a bad hack.
++      archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      # The linker will automatically build a .lib file if we build a DLL.
++      old_archive_From_new_cmds_GCJ='true'
++      # FIXME: Should let the user specify the lib program.
++      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      enable_shared_with_static_runtimes_GCJ=yes
++      ;;
++
++    darwin* | rhapsody*)
++      case "$host_os" in
++        rhapsody* | darwin1.[012])
++         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[012])
++               allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++      esac
++      archive_cmds_need_lc_GCJ=no
++      hardcode_direct_GCJ=no
++      hardcode_automatic_GCJ=yes
++      hardcode_shlibpath_var_GCJ=unsupported
++      whole_archive_flag_spec_GCJ=''
++      link_all_deplibs_GCJ=yes
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++    else
++      case "$cc_basename" in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         ld_shlibs_GCJ=no
++          ;;
++      esac
++    fi
++      ;;
++
++    dgux*)
++      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    freebsd1*)
++      ld_shlibs_GCJ=no
++      ;;
++
++    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++    # support.  Future versions do this automatically, but an explicit c++rt0.o
++    # does not break anything, and helps significantly (at the cost of a little
++    # extra space).
++    freebsd2.2*)
++      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++      hardcode_libdir_flag_spec_GCJ='-R$libdir'
++      hardcode_direct_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++    freebsd2*)
++      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct_GCJ=yes
++      hardcode_minus_L_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++    freebsd* | kfreebsd*-gnu)
++      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++      hardcode_libdir_flag_spec_GCJ='-R$libdir'
++      hardcode_direct_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    hpux9*)
++      if test "$GCC" = yes; then
++	archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      else
++	archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      fi
++      hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
++      hardcode_libdir_separator_GCJ=:
++      hardcode_direct_GCJ=yes
++
++      # hardcode_minus_L: Not really in the search PATH,
++      # but as the default location of the library.
++      hardcode_minus_L_GCJ=yes
++      export_dynamic_flag_spec_GCJ='${wl}-E'
++      ;;
++
++    hpux10* | hpux11*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	esac
++      else
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	*)
++	  archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	esac
++      fi
++      if test "$with_gnu_ld" = no; then
++	case "$host_cpu" in
++	hppa*64*)
++	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
++	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
++	  hardcode_libdir_separator_GCJ=:
++	  hardcode_direct_GCJ=no
++	  hardcode_shlibpath_var_GCJ=no
++	  ;;
++	ia64*)
++	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
++	  hardcode_direct_GCJ=no
++	  hardcode_shlibpath_var_GCJ=no
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  hardcode_minus_L_GCJ=yes
++	  ;;
++	*)
++	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
++	  hardcode_libdir_separator_GCJ=:
++	  hardcode_direct_GCJ=yes
++	  export_dynamic_flag_spec_GCJ='${wl}-E'
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  hardcode_minus_L_GCJ=yes
++	  ;;
++	esac
++      fi
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      if test "$GCC" = yes; then
++	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
++      fi
++      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator_GCJ=:
++      link_all_deplibs_GCJ=yes
++      ;;
++
++    netbsd*)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++      else
++	archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++      fi
++      hardcode_libdir_flag_spec_GCJ='-R$libdir'
++      hardcode_direct_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    newsos6)
++      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct_GCJ=yes
++      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator_GCJ=:
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    openbsd*)
++      hardcode_direct_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec_GCJ='${wl}-E'
++      else
++       case $host_os in
++	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
++	   ;;
++	 *)
++	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++	   ;;
++       esac
++      fi
++      ;;
++
++    os2*)
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      hardcode_minus_L_GCJ=yes
++      allow_undefined_flag_GCJ=unsupported
++      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++      old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++      ;;
++
++    osf3*)
++      if test "$GCC" = yes; then
++	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	allow_undefined_flag_GCJ=' -expect_unresolved \*'
++	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++      fi
++      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator_GCJ=:
++      ;;
++
++    osf4* | osf5*)	# as osf3* with the addition of -msym flag
++      if test "$GCC" = yes; then
++	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
++      else
++	allow_undefined_flag_GCJ=' -expect_unresolved \*'
++	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++
++	# Both c and cxx compiler support -rpath directly
++	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
++      fi
++      hardcode_libdir_separator_GCJ=:
++      ;;
++
++    sco3.2v5*)
++      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var_GCJ=no
++      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
++      runpath_var=LD_RUN_PATH
++      hardcode_runpath_var=yes
++      ;;
++
++    solaris*)
++      no_undefined_flag_GCJ=' -z text'
++      if test "$GCC" = yes; then
++	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
++      else
++	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      fi
++      hardcode_libdir_flag_spec_GCJ='-R$libdir'
++      hardcode_shlibpath_var_GCJ=no
++      case $host_os in
++      solaris2.[0-5] | solaris2.[0-5].*) ;;
++      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
++	whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
++      esac
++      link_all_deplibs_GCJ=yes
++      ;;
++
++    sunos4*)
++      if test "x$host_vendor" = xsequent; then
++	# Use $CC to link under sequent, because it throws in some extra .o
++	# files that make .init and .fini sections work.
++	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      hardcode_direct_GCJ=yes
++      hardcode_minus_L_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    sysv4)
++      case $host_vendor in
++	sni)
++	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct_GCJ=yes # is this really true???
++	;;
++	siemens)
++	  ## LD is ld it makes a PLAMLIB
++	  ## CC just makes a GrossModule.
++	  archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++	  reload_cmds_GCJ='$CC -r -o $output$reload_objs'
++	  hardcode_direct_GCJ=no
++        ;;
++	motorola)
++	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
++	;;
++      esac
++      runpath_var='LD_RUN_PATH'
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    sysv4.3*)
++      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var_GCJ=no
++      export_dynamic_flag_spec_GCJ='-Bexport'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	hardcode_shlibpath_var_GCJ=no
++	runpath_var=LD_RUN_PATH
++	hardcode_runpath_var=yes
++	ld_shlibs_GCJ=yes
++      fi
++      ;;
++
++    sysv4.2uw2*)
++      archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct_GCJ=yes
++      hardcode_minus_L_GCJ=no
++      hardcode_shlibpath_var_GCJ=no
++      hardcode_runpath_var=yes
++      runpath_var=LD_RUN_PATH
++      ;;
++
++   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
++      no_undefined_flag_GCJ='${wl}-z ${wl}text'
++      if test "$GCC" = yes; then
++	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
++      runpath_var='LD_RUN_PATH'
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    sysv5*)
++      no_undefined_flag_GCJ=' -z text'
++      # $CC -shared without GNU ld will not create a library from C++
++      # object files and a static libstdc++, better avoid it by now
++      archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      hardcode_libdir_flag_spec_GCJ=
++      hardcode_shlibpath_var_GCJ=no
++      runpath_var='LD_RUN_PATH'
++      ;;
++
++    uts4*)
++      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    *)
++      ld_shlibs_GCJ=no
++      ;;
++    esac
++  fi
++
++echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
++echo "${ECHO_T}$ld_shlibs_GCJ" >&6
++test "$ld_shlibs_GCJ" = no && can_build_shared=no
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
++#
++# Do we need to explicitly link libc?
++#
++case "x$archive_cmds_need_lc_GCJ" in
++x|xyes)
++  # Assume -lc should be added
++  archive_cmds_need_lc_GCJ=yes
++
++  if test "$enable_shared" = yes && test "$GCC" = yes; then
++    case $archive_cmds_GCJ in
++    *'~'*)
++      # FIXME: we may have to deal with multi-command sequences.
++      ;;
++    '$CC '*)
++      # Test whether the compiler implicitly links with -lc since on some
++      # systems, -lgcc has to come before -lc. If gcc already passes -lc
++      # to ld, don't add -lc before -lgcc.
++      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++      $rm conftest*
++      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        libobjs=conftest.$ac_objext
++        deplibs=
++        wl=$lt_prog_compiler_wl_GCJ
++        compiler_flags=-v
++        linker_flags=-v
++        verstring=
++        output_objdir=.
++        libname=conftest
++        lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
++        allow_undefined_flag_GCJ=
++        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
++  (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++        then
++	  archive_cmds_need_lc_GCJ=no
++        else
++	  archive_cmds_need_lc_GCJ=yes
++        fi
++        allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
++      else
++        cat conftest.err 1>&5
++      fi
++      $rm conftest*
++      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
++      ;;
++    esac
++  fi
++  ;;
++esac
++
++echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
++need_lib_prefix=unknown
++hardcode_into_libs=no
++
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
++
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  shlibpath_var=LIBPATH
++
++  # AIX 3 has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}${shared_ext}$major'
++  ;;
++
++aix4* | aix5*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[01] | aix4.[01].*)
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	   echo ' yes '
++	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++	:
++      else
++	can_build_shared=no
++      fi
++      ;;
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}${shared_ext}$major'
++    fi
++    shlibpath_var=LIBPATH
++  fi
++  ;;
++
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++  ;;
++
++beos*)
++  library_names_spec='${libname}${shared_ext}'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
++
++bsdi[45]*)
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
++
++cygwin* | mingw* | pw32*)
++  version_type=windows
++  shrext_cmds=".dll"
++  need_version=no
++  need_lib_prefix=no
++
++  case $GCC,$host_os in
++  yes,cygwin* | yes,mingw* | yes,pw32*)
++    library_names_spec='$libname.dll.a'
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $rm \$dlpath'
++    shlibpath_overrides_runpath=yes
++
++    case $host_os in
++    cygwin*)
++      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
++    mingw*)
++      # MinGW DLLs use traditional 'lib' prefix
++      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
++        # It is most probably a Windows format PATH printed by
++        # mingw gcc, but we are running on Cygwin. Gcc prints its search
++        # path with ; separators, and with drive letters. We can handle the
++        # drive letters (cygwin fileutils understands them), so leave them,
++        # especially as we might pass files found there to a mingw objdump,
++        # which wouldn't understand a cygwinified path. Ahh.
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++      fi
++      ;;
++    pw32*)
++      # pw32 DLLs use 'pw' prefix rather than 'lib'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++      ;;
++    esac
++    ;;
++
++  *)
++    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    ;;
++  esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  ;;
++
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  soname_spec='${libname}${release}${major}$shared_ext'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
++  if test "$GCC" = yes; then
++    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
++  else
++    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
++  fi
++  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++  ;;
++
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++freebsd1*)
++  dynamic_linker=no
++  ;;
++
++kfreebsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++freebsd*)
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
++    ;;
++  freebsd3.01* | freebsdelf3.01*)
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
++  *) # from 3.2 on
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
++    ;;
++  esac
++  ;;
++
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  ;;
++
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  case "$host_cpu" in
++  ia64*)
++    shrext_cmds='.so'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.so"
++    shlibpath_var=LD_LIBRARY_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    if test "X$HPUX_IA64_MODE" = X32; then
++      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++    else
++      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++    fi
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    ;;
++   hppa*64*)
++     shrext_cmds='.sl'
++     hardcode_into_libs=yes
++     dynamic_linker="$host_os dld.sl"
++     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++     soname_spec='${libname}${release}${shared_ext}$major'
++     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++     ;;
++   *)
++    shrext_cmds='.sl'
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=SHLIB_PATH
++    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    ;;
++  esac
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
++    *)
++	if test "$lt_cv_prog_gnu_ld" = yes; then
++		version_type=linux
++	else
++		version_type=irix
++	fi ;;
++  esac
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  case $host_os in
++  irix5* | nonstopux*)
++    libsuff= shlibsuff=
++    ;;
++  *)
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++      libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++      libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++      libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  hardcode_into_libs=yes
++  ;;
++
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++  dynamic_linker=no
++  ;;
++
++# This must be Linux ELF.
++linux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
++
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
++
++knetbsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++nto-qnx*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++openbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    case $host_os in
++      openbsd2.[89] | openbsd2.[89].*)
++	shlibpath_overrides_runpath=no
++	;;
++      *)
++	shlibpath_overrides_runpath=yes
++	;;
++      esac
++  else
++    shlibpath_overrides_runpath=yes
++  fi
++  ;;
++
++os2*)
++  libname_spec='$name'
++  shrext_cmds=".dll"
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
++
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
++
++sco3.2v5*)
++  version_type=osf
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
++
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      export_dynamic_flag_spec='${wl}-Blargedynsym'
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
++
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
++
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++*)
++  dynamic_linker=no
++  ;;
++esac
++echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6
++test "$dynamic_linker" = no && can_build_shared=no
++
++echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++hardcode_action_GCJ=
++if test -n "$hardcode_libdir_flag_spec_GCJ" || \
++   test -n "$runpath_var_GCJ" || \
++   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
++
++  # We can hardcode non-existant directories.
++  if test "$hardcode_direct_GCJ" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
++     test "$hardcode_minus_L_GCJ" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action_GCJ=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action_GCJ=immediate
++  fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action_GCJ=unsupported
++fi
++echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
++echo "${ECHO_T}$hardcode_action_GCJ" >&6
++
++if test "$hardcode_action_GCJ" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
++
++striplib=
++old_striplib=
++echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
++echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
++  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++else
++# FIXME - insert some real tests, host_os isn't really good enough
++  case $host_os in
++   darwin*)
++       if test -n "$STRIP" ; then
++         striplib="$STRIP -x"
++         echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++       else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++       ;;
++   *)
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++    ;;
++  esac
++fi
++
++if test "x$enable_dlopen" != xyes; then
++  enable_dlopen=unknown
++  enable_dlopen_self=unknown
++  enable_dlopen_self_static=unknown
++else
++  lt_cv_dlopen=no
++  lt_cv_dlopen_libs=
++
++  case $host_os in
++  beos*)
++    lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ;;
++
++  mingw* | pw32*)
++    lt_cv_dlopen="LoadLibrary"
++    lt_cv_dlopen_libs=
++   ;;
++
++  cygwin*)
++    lt_cv_dlopen="dlopen"
++    lt_cv_dlopen_libs=
++   ;;
++
++  darwin*)
++  # if libdl is installed we need to link against it
++    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dl_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dl_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++if test $ac_cv_lib_dl_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++  
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    
++fi
++
++   ;;
++
++  *)
++    echo "$as_me:$LINENO: checking for shl_load" >&5
++echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
++if test "${ac_cv_func_shl_load+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.  */
++/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define shl_load innocuous_shl_load
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char shl_load (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef shl_load
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char shl_load ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_shl_load) || defined (__stub___shl_load)
++choke me
++#else
++char (*f) () = shl_load;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != shl_load;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_shl_load=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_shl_load=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
++echo "${ECHO_T}$ac_cv_func_shl_load" >&6
++if test $ac_cv_func_shl_load = yes; then
++  lt_cv_dlopen="shl_load"
++else
++  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
++echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
++if test "${ac_cv_lib_dld_shl_load+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char shl_load ();
++int
++main ()
++{
++shl_load ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dld_shl_load=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dld_shl_load=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
++if test $ac_cv_lib_dld_shl_load = yes; then
++  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
++else
++  echo "$as_me:$LINENO: checking for dlopen" >&5
++echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
++if test "${ac_cv_func_dlopen+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.  */
++/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define dlopen innocuous_dlopen
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char dlopen (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef dlopen
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_dlopen) || defined (__stub___dlopen)
++choke me
++#else
++char (*f) () = dlopen;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != dlopen;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
++echo "${ECHO_T}$ac_cv_func_dlopen" >&6
++if test $ac_cv_func_dlopen = yes; then
++  lt_cv_dlopen="dlopen"
++else
++  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dl_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dl_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++if test $ac_cv_lib_dl_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
++echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
++if test "${ac_cv_lib_svld_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsvld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_svld_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_svld_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
++if test $ac_cv_lib_svld_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
++else
++  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
++echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
++if test "${ac_cv_lib_dld_dld_link+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dld_link ();
++int
++main ()
++{
++dld_link ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dld_dld_link=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dld_dld_link=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
++if test $ac_cv_lib_dld_dld_link = yes; then
++  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
++fi
++
++	      
++fi
++
++	    
++fi
++
++	  
++fi
++
++	
++fi
++
++      
++fi
++
++    ;;
++  esac
++
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
++  else
++    enable_dlopen=no
++  fi
++
++  case $lt_cv_dlopen in
++  dlopen)
++    save_CPPFLAGS="$CPPFLAGS"
++    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++
++    save_LDFLAGS="$LDFLAGS"
++    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++
++    save_LIBS="$LIBS"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
++
++    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
++echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
++if test "${lt_cv_dlopen_self+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self=cross
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++#line __oline__ "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}
++EOF
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self=no
++  fi
++fi
++rm -fr conftest*
++
++    
++fi
++echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self" >&6
++
++    if test "x$lt_cv_dlopen_self" = xyes; then
++      LDFLAGS="$LDFLAGS $link_static_flag"
++      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
++echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
++if test "${lt_cv_dlopen_self_static+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self_static=cross
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++#line __oline__ "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}
++EOF
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self_static=no
++  fi
++fi
++rm -fr conftest*
++
++      
++fi
++echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
++    fi
++
++    CPPFLAGS="$save_CPPFLAGS"
++    LDFLAGS="$save_LDFLAGS"
++    LIBS="$save_LIBS"
++    ;;
++  esac
++
++  case $lt_cv_dlopen_self in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
++  esac
++
++  case $lt_cv_dlopen_self_static in
++  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++  *) enable_dlopen_self_static=unknown ;;
++  esac
++fi
++
++
++# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # See if we are running on zsh, and set the options which allow our commands through
++  # without removal of \ escapes.
++  if test -n "${ZSH_VERSION+set}" ; then
++    setopt NO_GLOB_SUBST
++  fi
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++    SED SHELL STRIP \
++    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++    deplibs_check_method reload_flag reload_cmds need_locks \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    old_postinstall_cmds old_postuninstall_cmds \
++    compiler_GCJ \
++    CC_GCJ \
++    LD_GCJ \
++    lt_prog_compiler_wl_GCJ \
++    lt_prog_compiler_pic_GCJ \
++    lt_prog_compiler_static_GCJ \
++    lt_prog_compiler_no_builtin_flag_GCJ \
++    export_dynamic_flag_spec_GCJ \
++    thread_safe_flag_spec_GCJ \
++    whole_archive_flag_spec_GCJ \
++    enable_shared_with_static_runtimes_GCJ \
++    old_archive_cmds_GCJ \
++    old_archive_from_new_cmds_GCJ \
++    predep_objects_GCJ \
++    postdep_objects_GCJ \
++    predeps_GCJ \
++    postdeps_GCJ \
++    compiler_lib_search_path_GCJ \
++    archive_cmds_GCJ \
++    archive_expsym_cmds_GCJ \
++    postinstall_cmds_GCJ \
++    postuninstall_cmds_GCJ \
++    old_archive_from_expsyms_cmds_GCJ \
++    allow_undefined_flag_GCJ \
++    no_undefined_flag_GCJ \
++    export_symbols_cmds_GCJ \
++    hardcode_libdir_flag_spec_GCJ \
++    hardcode_libdir_flag_spec_ld_GCJ \
++    hardcode_libdir_separator_GCJ \
++    hardcode_automatic_GCJ \
++    module_cmds_GCJ \
++    module_expsym_cmds_GCJ \
++    lt_cv_prog_compiler_c_o_GCJ \
++    exclude_expsyms_GCJ \
++    include_expsyms_GCJ; do
++
++    case $var in
++    old_archive_cmds_GCJ | \
++    old_archive_from_new_cmds_GCJ | \
++    archive_cmds_GCJ | \
++    archive_expsym_cmds_GCJ | \
++    module_cmds_GCJ | \
++    module_expsym_cmds_GCJ | \
++    old_archive_from_expsyms_cmds_GCJ | \
++    export_symbols_cmds_GCJ | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  case $lt_echo in
++  *'\$0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
++    ;;
++  esac
++
++cfgfile="$ofile"
++
++  cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
++
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_GCJ
++
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
++
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
++
++# A C compiler.
++LTCC=$lt_LTCC
++
++# A language-specific compiler.
++CC=$lt_compiler_GCJ
++
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_GCJ
++
++# An ERE matcher.
++EGREP=$lt_EGREP
++
++# The linker used to build libraries.
++LD=$lt_LD_GCJ
++
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
++
++# A BSD-compatible nm program.
++NM=$lt_NM
++
++# A symbol stripping program
++STRIP=$lt_STRIP
++
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_GCJ
++
++# Object file suffix (normally "o").
++objext="$ac_objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
++
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic_GCJ
++pic_mode=$pic_mode
++
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
++
++# Must we lock files when doing compilation ?
++need_locks=$lt_need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_GCJ
++
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
++
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
++
++# Library versioning type.
++version_type=$version_type
++
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
++
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds_GCJ
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
++
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
++
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
++
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds_GCJ
++archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
++
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds_GCJ
++module_expsym_cmds=$lt_module_expsym_cmds_GCJ
++
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_GCJ
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_GCJ
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps_GCJ
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps_GCJ
++
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
++
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_GCJ
++
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_GCJ
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
++
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
++
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
++
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action_GCJ
++
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
++
++# If ld is used when linking, flag to hardcode \$libdir into
++# a binary during linking. This must work even if \$libdir does
++# not exist.
++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
++
++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct_GCJ
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L_GCJ
++
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
++
++# Set to yes if building a shared library automatically hardcodes DIR into the library
++# and all subsequent libraries and executables linked against it.
++hardcode_automatic=$hardcode_automatic_GCJ
++
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
++
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs_GCJ
++
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path_GCJ"
++
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols_GCJ
++
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds_GCJ
++
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms_GCJ
++
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms_GCJ
++
++# ### END LIBTOOL TAG CONFIG: $tagname
++
++__EOF__
++
++
++else
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
++fi
++
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++CC="$lt_save_CC"
++
++	else
++	  tagname=""
++	fi
++	;;
++
++      RC)
++	
++
++
++# Source file extension for RC test sources.
++ac_ext=rc
++
++# Object file extension for compiled RC test sources.
++objext=o
++objext_RC=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
++
++# Code to be used in simple link tests
++lt_simple_link_test_code="$lt_simple_compile_test_code"
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
++
++# Allow CC to be a program name with arguments.
++compiler=$CC
++
++
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${RC-"windres"}
++compiler=$CC
++compiler_RC=$CC
++lt_cv_prog_compiler_c_o_RC=yes
++
++# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # See if we are running on zsh, and set the options which allow our commands through
++  # without removal of \ escapes.
++  if test -n "${ZSH_VERSION+set}" ; then
++    setopt NO_GLOB_SUBST
++  fi
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++    SED SHELL STRIP \
++    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++    deplibs_check_method reload_flag reload_cmds need_locks \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    old_postinstall_cmds old_postuninstall_cmds \
++    compiler_RC \
++    CC_RC \
++    LD_RC \
++    lt_prog_compiler_wl_RC \
++    lt_prog_compiler_pic_RC \
++    lt_prog_compiler_static_RC \
++    lt_prog_compiler_no_builtin_flag_RC \
++    export_dynamic_flag_spec_RC \
++    thread_safe_flag_spec_RC \
++    whole_archive_flag_spec_RC \
++    enable_shared_with_static_runtimes_RC \
++    old_archive_cmds_RC \
++    old_archive_from_new_cmds_RC \
++    predep_objects_RC \
++    postdep_objects_RC \
++    predeps_RC \
++    postdeps_RC \
++    compiler_lib_search_path_RC \
++    archive_cmds_RC \
++    archive_expsym_cmds_RC \
++    postinstall_cmds_RC \
++    postuninstall_cmds_RC \
++    old_archive_from_expsyms_cmds_RC \
++    allow_undefined_flag_RC \
++    no_undefined_flag_RC \
++    export_symbols_cmds_RC \
++    hardcode_libdir_flag_spec_RC \
++    hardcode_libdir_flag_spec_ld_RC \
++    hardcode_libdir_separator_RC \
++    hardcode_automatic_RC \
++    module_cmds_RC \
++    module_expsym_cmds_RC \
++    lt_cv_prog_compiler_c_o_RC \
++    exclude_expsyms_RC \
++    include_expsyms_RC; do
++
++    case $var in
++    old_archive_cmds_RC | \
++    old_archive_from_new_cmds_RC | \
++    archive_cmds_RC | \
++    archive_expsym_cmds_RC | \
++    module_cmds_RC | \
++    module_expsym_cmds_RC | \
++    old_archive_from_expsyms_cmds_RC | \
++    export_symbols_cmds_RC | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  case $lt_echo in
++  *'\$0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
++    ;;
++  esac
++
++cfgfile="$ofile"
++
++  cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
++
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_RC
++
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
++
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
++
++# A C compiler.
++LTCC=$lt_LTCC
++
++# A language-specific compiler.
++CC=$lt_compiler_RC
++
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_RC
++
++# An ERE matcher.
++EGREP=$lt_EGREP
++
++# The linker used to build libraries.
++LD=$lt_LD_RC
++
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
++
++# A BSD-compatible nm program.
++NM=$lt_NM
++
++# A symbol stripping program
++STRIP=$lt_STRIP
++
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_RC
++
++# Object file suffix (normally "o").
++objext="$ac_objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
++
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic_RC
++pic_mode=$pic_mode
++
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
++
++# Must we lock files when doing compilation ?
++need_locks=$lt_need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_RC
++
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
++
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
++
++# Library versioning type.
++version_type=$version_type
++
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
++
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds_RC
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
++
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
++
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
++
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds_RC
++archive_expsym_cmds=$lt_archive_expsym_cmds_RC
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
++
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds_RC
++module_expsym_cmds=$lt_module_expsym_cmds_RC
++
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_RC
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_RC
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps_RC
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps_RC
++
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_RC
++
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_RC
++
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_RC
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
++
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
++
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
++
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action_RC
++
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
++
++# If ld is used when linking, flag to hardcode \$libdir into
++# a binary during linking. This must work even if \$libdir does
++# not exist.
++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
++
++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct_RC
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L_RC
++
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
++
++# Set to yes if building a shared library automatically hardcodes DIR into the library
++# and all subsequent libraries and executables linked against it.
++hardcode_automatic=$hardcode_automatic_RC
++
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
++
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs_RC
++
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path_RC"
++
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols_RC
++
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds_RC
++
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms_RC
++
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms_RC
++
++# ### END LIBTOOL TAG CONFIG: $tagname
++
++__EOF__
++
++
++else
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
++fi
++
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++CC="$lt_save_CC"
++
++	;;
++
++      *)
++	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
++echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
++   { (exit 1); exit 1; }; }
++	;;
++      esac
++
++      # Append the new tag name to the list of available tags.
++      if test -n "$tagname" ; then
++      available_tags="$available_tags $tagname"
++    fi
++    fi
++  done
++  IFS="$lt_save_ifs"
++
++  # Now substitute the updated list of available tags.
++  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
++    mv "${ofile}T" "$ofile"
++    chmod +x "$ofile"
++  else
++    rm -f "${ofile}T"
++    { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
++echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
++   { (exit 1); exit 1; }; }
++  fi
++fi
++
++
++
++# This can be used to rebuild libtool when needed
++LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++
++# Always use our own libtool.
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++
++# Prevent multiple expansion
++
++
++
++
++
++
++
++
++
++
++
++  
++
++  
++
++
++  
++       
++       
++
++
++
++INCLUDES='-I$(top_srcdir)/include -I$(top_builddir)/include'
++
++
++
++
++for ac_header in sys/time.h sys/timeb.h io.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++else
++  # Is the header compilable?
++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
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++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
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  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
++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: )
++    { 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:* )
++    { 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;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  eval "$as_ac_Header=\$ac_header_preproc"
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++
++done
++
++rm -f include/inttypes.h
++    if test "${ac_cv_header_inttypes_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for inttypes.h" >&5
++echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6
++if test "${ac_cv_header_inttypes_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_inttypes_h" >&5
++echo "${ECHO_T}$ac_cv_header_inttypes_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking inttypes.h usability" >&5
++echo $ECHO_N "checking inttypes.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <inttypes.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking inttypes.h presence" >&5
++echo $ECHO_N "checking inttypes.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <inttypes.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  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
++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: )
++    { echo "$as_me:$LINENO: WARNING: inttypes.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: inttypes.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: inttypes.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: inttypes.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: inttypes.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: inttypes.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: inttypes.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: inttypes.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: inttypes.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: inttypes.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: inttypes.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: inttypes.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: inttypes.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: inttypes.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: inttypes.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: inttypes.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for inttypes.h" >&5
++echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6
++if test "${ac_cv_header_inttypes_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_inttypes_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_inttypes_h" >&5
++echo "${ECHO_T}$ac_cv_header_inttypes_h" >&6
++
++fi
++if test $ac_cv_header_inttypes_h = yes; then
++  :
++else
++  echo "$as_me:$LINENO: checking for char" >&5
++echo $ECHO_N "checking for char... $ECHO_C" >&6
++if test "${ac_cv_type_char+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
++int
++main ()
++{
++if ((char *) 0)
++  return 0;
++if (sizeof (char))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_char=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_char=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5
++echo "${ECHO_T}$ac_cv_type_char" >&6
++
++echo "$as_me:$LINENO: checking size of char" >&5
++echo $ECHO_N "checking size of char... $ECHO_C" >&6
++if test "${ac_cv_sizeof_char+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$ac_cv_type_char" = yes; then
++  # The cast to unsigned long 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.
++  if test "$cross_compiling" = yes; then
++  # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (char))) >= 0)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=0 ac_mid=0
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr $ac_mid + 1`
++		    if test $ac_lo -le $ac_mid; then
++		      ac_lo= ac_hi=
++		      break
++		    fi
++		    ac_mid=`expr 2 '*' $ac_mid + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (char))) < 0)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=-1 ac_mid=-1
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (char))) >= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_hi=`expr '(' $ac_mid ')' - 1`
++		       if test $ac_mid -le $ac_hi; then
++			 ac_lo= ac_hi=
++			 break
++		       fi
++		       ac_mid=`expr 2 '*' $ac_mid`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo= ac_hi=
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr '(' $ac_mid ')' + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_char=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (char), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++else
++  if test "$cross_compiling" = yes; then
++  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++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
++long longval () { return (long) (sizeof (char)); }
++unsigned long ulongval () { return (long) (sizeof (char)); }
++@%:@include <stdio.h>
++@%:@include <stdlib.h>
++int
++main ()
++{
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    exit (1);
++  if (((long) (sizeof (char))) < 0)
++    {
++      long i = longval ();
++      if (i != ((long) (sizeof (char))))
++	exit (1);
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long i = ulongval ();
++      if (i != ((long) (sizeof (char))))
++	exit (1);
++      fprintf (f, "%lu\n", i);
++    }
++  exit (ferror (f) || fclose (f) != 0);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_sizeof_char=`cat conftest.val`
++else
++  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 )
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (char), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++rm -f conftest.val
++else
++  ac_cv_sizeof_char=0
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
++echo "${ECHO_T}$ac_cv_sizeof_char" >&6
++cat >>confdefs.h <<_ACEOF
++@%:@define SIZEOF_CHAR $ac_cv_sizeof_char
++_ACEOF
++
++
++	echo "$as_me:$LINENO: checking for short" >&5
++echo $ECHO_N "checking for short... $ECHO_C" >&6
++if test "${ac_cv_type_short+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
++int
++main ()
++{
++if ((short *) 0)
++  return 0;
++if (sizeof (short))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_short=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_short=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
++echo "${ECHO_T}$ac_cv_type_short" >&6
++
++echo "$as_me:$LINENO: checking size of short" >&5
++echo $ECHO_N "checking size of short... $ECHO_C" >&6
++if test "${ac_cv_sizeof_short+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$ac_cv_type_short" = yes; then
++  # The cast to unsigned long 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.
++  if test "$cross_compiling" = yes; then
++  # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (short))) >= 0)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=0 ac_mid=0
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr $ac_mid + 1`
++		    if test $ac_lo -le $ac_mid; then
++		      ac_lo= ac_hi=
++		      break
++		    fi
++		    ac_mid=`expr 2 '*' $ac_mid + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (short))) < 0)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=-1 ac_mid=-1
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_hi=`expr '(' $ac_mid ')' - 1`
++		       if test $ac_mid -le $ac_hi; then
++			 ac_lo= ac_hi=
++			 break
++		       fi
++		       ac_mid=`expr 2 '*' $ac_mid`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo= ac_hi=
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr '(' $ac_mid ')' + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_short=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (short), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++else
++  if test "$cross_compiling" = yes; then
++  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++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
++long longval () { return (long) (sizeof (short)); }
++unsigned long ulongval () { return (long) (sizeof (short)); }
++@%:@include <stdio.h>
++@%:@include <stdlib.h>
++int
++main ()
++{
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    exit (1);
++  if (((long) (sizeof (short))) < 0)
++    {
++      long i = longval ();
++      if (i != ((long) (sizeof (short))))
++	exit (1);
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long i = ulongval ();
++      if (i != ((long) (sizeof (short))))
++	exit (1);
++      fprintf (f, "%lu\n", i);
++    }
++  exit (ferror (f) || fclose (f) != 0);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_sizeof_short=`cat conftest.val`
++else
++  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 )
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (short), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++rm -f conftest.val
++else
++  ac_cv_sizeof_short=0
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
++echo "${ECHO_T}$ac_cv_sizeof_short" >&6
++cat >>confdefs.h <<_ACEOF
++@%:@define SIZEOF_SHORT $ac_cv_sizeof_short
++_ACEOF
++
++
++	echo "$as_me:$LINENO: checking for int" >&5
++echo $ECHO_N "checking for int... $ECHO_C" >&6
++if test "${ac_cv_type_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
++int
++main ()
++{
++if ((int *) 0)
++  return 0;
++if (sizeof (int))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_int=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_int=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
++echo "${ECHO_T}$ac_cv_type_int" >&6
++
++echo "$as_me:$LINENO: checking size of int" >&5
++echo $ECHO_N "checking size of int... $ECHO_C" >&6
++if test "${ac_cv_sizeof_int+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$ac_cv_type_int" = yes; then
++  # The cast to unsigned long 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.
++  if test "$cross_compiling" = yes; then
++  # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (int))) >= 0)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=0 ac_mid=0
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr $ac_mid + 1`
++		    if test $ac_lo -le $ac_mid; then
++		      ac_lo= ac_hi=
++		      break
++		    fi
++		    ac_mid=`expr 2 '*' $ac_mid + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (int))) < 0)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=-1 ac_mid=-1
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_hi=`expr '(' $ac_mid ')' - 1`
++		       if test $ac_mid -le $ac_hi; then
++			 ac_lo= ac_hi=
++			 break
++		       fi
++		       ac_mid=`expr 2 '*' $ac_mid`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo= ac_hi=
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr '(' $ac_mid ')' + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_int=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (int), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++else
++  if test "$cross_compiling" = yes; then
++  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++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
++long longval () { return (long) (sizeof (int)); }
++unsigned long ulongval () { return (long) (sizeof (int)); }
++@%:@include <stdio.h>
++@%:@include <stdlib.h>
++int
++main ()
++{
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    exit (1);
++  if (((long) (sizeof (int))) < 0)
++    {
++      long i = longval ();
++      if (i != ((long) (sizeof (int))))
++	exit (1);
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long i = ulongval ();
++      if (i != ((long) (sizeof (int))))
++	exit (1);
++      fprintf (f, "%lu\n", i);
++    }
++  exit (ferror (f) || fclose (f) != 0);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_sizeof_int=`cat conftest.val`
++else
++  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 )
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (int), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++rm -f conftest.val
++else
++  ac_cv_sizeof_int=0
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
++echo "${ECHO_T}$ac_cv_sizeof_int" >&6
++cat >>confdefs.h <<_ACEOF
++@%:@define SIZEOF_INT $ac_cv_sizeof_int
++_ACEOF
++
++
++	if test x"$ac_cv_sizeof_char" != x"1" -o \
++	    x"$ac_cv_sizeof_short" != x"2" -o \
++	    x"$ac_cv_sizeof_int" != x"4"; then
++	    { { echo "$as_me:$LINENO: error: can not build a default inttypes.h" >&5
++echo "$as_me: error: can not build a default inttypes.h" >&2;}
++   { (exit 1); exit 1; }; }
++	fi
++	cat >include/inttypes.h << EOF
++/* default inttypes.h for people who do not have it on their system */
++
++#ifndef _INTTYPES_H
++#define _INTTYPES_H
++#if (!defined __int8_t_defined) && (!defined __BIT_TYPES_DEFINED__)
++#define __int8_t_defined
++typedef signed char int8_t;
++typedef signed short int16_t;
++typedef signed int int32_t;
++#ifdef ARCH_X86
++typedef signed long long int64_t;
++#endif
++#endif
++#if (!defined _LINUX_TYPES_H)
++typedef unsigned char uint8_t;
++typedef unsigned short uint16_t;
++typedef unsigned int uint32_t;
++#ifdef ARCH_X86
++typedef unsigned long long uint64_t;
++#endif
++#endif
++#endif
++EOF
++	
++fi
++
++
++
++echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
++echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
++if test "${ac_cv_c_const+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.  */
++
++int
++main ()
++{
++/* FIXME: Include the comments suggested by Paul. */
++#ifndef __cplusplus
++  /* Ultrix mips cc rejects this.  */
++  typedef int charset[2];
++  const charset x;
++  /* SunOS 4.1.1 cc rejects this.  */
++  char const *const *ccp;
++  char **p;
++  /* NEC SVR4.0.2 mips cc rejects this.  */
++  struct point {int x, y;};
++  static struct point const zero = {0,0};
++  /* AIX XL C 1.02.0.0 rejects this.
++     It does not let you subtract one const X* pointer from another in
++     an arm of an if-expression whose if-part is not a constant
++     expression */
++  const char *g = "string";
++  ccp = &g + (g ? g-g : 0);
++  /* HPUX 7.0 cc rejects these. */
++  ++ccp;
++  p = (char**) ccp;
++  ccp = (char const *const *) p;
++  { /* SCO 3.2v4 cc rejects this.  */
++    char *t;
++    char const *s = 0 ? (char *) 0 : (char const *) 0;
++
++    *t++ = 0;
++  }
++  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
++    int x[] = {25, 17};
++    const int *foo = &x[0];
++    ++foo;
++  }
++  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
++    typedef const int *iptr;
++    iptr p = 0;
++    ++p;
++  }
++  { /* AIX XL C 1.02.0.0 rejects this saying
++       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
++    struct s { int j; const int *ap[3]; };
++    struct s *b; b->j = 5;
++  }
++  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
++    const int foo = 10;
++  }
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_c_const=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_c_const=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
++echo "${ECHO_T}$ac_cv_c_const" >&6
++if test $ac_cv_c_const = no; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define const 
++_ACEOF
++
++fi
++
++echo "$as_me:$LINENO: checking for inline" >&5
++echo $ECHO_N "checking for inline... $ECHO_C" >&6
++if test "${ac_cv_c_inline+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_c_inline=no
++for ac_kw in inline __inline__ __inline; do
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifndef __cplusplus
++typedef int foo_t;
++static $ac_kw foo_t static_foo () {return 0; }
++$ac_kw foo_t foo () {return 0; }
++#endif
++
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_c_inline=$ac_kw; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
++echo "${ECHO_T}$ac_cv_c_inline" >&6
++
++
++case $ac_cv_c_inline in
++  inline | yes) ;;
++  *)
++    case $ac_cv_c_inline in
++      no) ac_val=;;
++      *) ac_val=$ac_cv_c_inline;;
++    esac
++    cat >>confdefs.h <<_ACEOF
++#ifndef __cplusplus
++#define inline $ac_val
++#endif
++_ACEOF
++    ;;
++esac
++
++    if test x"$GCC" = x"yes" -a x"$ac_cv_c_inline" = x"inline"; then
++	echo "$as_me:$LINENO: checking for always_inline" >&5
++echo $ECHO_N "checking for always_inline... $ECHO_C" >&6
++	SAVE_CFLAGS="$CFLAGS"
++	CFLAGS="$CFLAGS -Wall -Werror"
++	cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++__attribute__ ((__always_inline__)) void f (void);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_always_inline=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_always_inline=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++	CFLAGS="$SAVE_CFLAGS"
++	echo "$as_me:$LINENO: result: $ac_cv_always_inline" >&5
++echo "${ECHO_T}$ac_cv_always_inline" >&6
++	if test x"$ac_cv_always_inline" = x"yes"; then
++	    cat >>confdefs.h <<_ACEOF
++@%:@define inline __attribute__ ((__always_inline__))
++_ACEOF
++
++	fi
++    fi
++echo "$as_me:$LINENO: checking for restrict" >&5
++echo $ECHO_N "checking for restrict... $ECHO_C" >&6
++    ac_cv_c_restrict=no
++    for ac_kw in restrict __restrict__ __restrict; do
++	cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++char * $ac_kw p;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_c_restrict=$ac_kw; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++    done
++    echo "$as_me:$LINENO: result: $ac_cv_c_restrict" >&5
++echo "${ECHO_T}$ac_cv_c_restrict" >&6
++    case $ac_cv_c_restrict in
++	restrict) ;;
++	no)	
++cat >>confdefs.h <<\_ACEOF
++@%:@define restrict 
++_ACEOF
++ ;;
++	*)	cat >>confdefs.h <<_ACEOF
++@%:@define restrict $ac_cv_c_restrict
++_ACEOF
++ ;;
++    esac
++echo "$as_me:$LINENO: checking for size_t" >&5
++echo $ECHO_N "checking for size_t... $ECHO_C" >&6
++if test "${ac_cv_type_size_t+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
++int
++main ()
++{
++if ((size_t *) 0)
++  return 0;
++if (sizeof (size_t))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_size_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_size_t=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
++echo "${ECHO_T}$ac_cv_type_size_t" >&6
++if test $ac_cv_type_size_t = yes; then
++  :
++else
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define size_t unsigned
++_ACEOF
++
++fi
++
++echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
++echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
++if test "${ac_cv_c_bigendian+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  # See if sys/param.h defines the BYTE_ORDER macro.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <sys/param.h>
++
++int
++main ()
++{
++#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
++ bogus endian macros
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  # It does; now see whether it defined to BIG_ENDIAN or not.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <sys/param.h>
++
++int
++main ()
++{
++#if BYTE_ORDER != BIG_ENDIAN
++ not big endian
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_c_bigendian=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_c_bigendian=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++# It does not; compile a test program.
++if test "$cross_compiling" = yes; then
++  # try to guess the endianness by grepping values into an object file
++  ac_cv_c_bigendian=unknown
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
++short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
++void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
++short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
++short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
++void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
++int
++main ()
++{
++ _ascii (); _ebcdic (); 
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
++  ac_cv_c_bigendian=yes
++fi
++if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
++  if test "$ac_cv_c_bigendian" = unknown; then
++    ac_cv_c_bigendian=no
++  else
++    # finding both strings is unlikely to happen, but who knows?
++    ac_cv_c_bigendian=unknown
++  fi
++fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++int
++main ()
++{
++  /* Are we little or big endian?  From Harbison&Steele.  */
++  union
++  {
++    long l;
++    char c[sizeof (long)];
++  } u;
++  u.l = 1;
++  exit (u.c[sizeof (long) - 1] == 1);
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_c_bigendian=no
++else
++  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_c_bigendian=yes
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
++echo "${ECHO_T}$ac_cv_c_bigendian" >&6
++case $ac_cv_c_bigendian in
++  yes)
++    
++cat >>confdefs.h <<\_ACEOF
++@%:@define WORDS_BIGENDIAN 1
++_ACEOF
++ ;;
++  no)
++     ;;
++  *)
++    { { echo "$as_me:$LINENO: error: unknown endianness
++presetting ac_cv_c_bigendian=no (or yes) will help" >&5
++echo "$as_me: error: unknown endianness
++presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++
++
++
++
++
++for ac_func in memalign gettimeofday ftime
++do
++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 eval "test \"\${$as_ac_var+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.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++echo "$as_me:$LINENO: checking return type of signal handlers" >&5
++echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
++if test "${ac_cv_type_signal+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.  */
++#include <sys/types.h>
++#include <signal.h>
++#ifdef signal
++# undef signal
++#endif
++#ifdef __cplusplus
++extern "C" void (*signal (int, void (*)(int)))(int);
++#else
++void (*signal ()) ();
++#endif
++
++int
++main ()
++{
++int i;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_signal=void
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_signal=int
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
++echo "${ECHO_T}$ac_cv_type_signal" >&6
++
++cat >>confdefs.h <<_ACEOF
++@%:@define RETSIGTYPE $ac_cv_type_signal
++_ACEOF
++
++
++
++
++
++
++
++# Check whether --enable-double or --disable-double was given.
++if test "${enable_double+set}" = set; then
++  enableval="$enable_double"
++  
++fi; 
++if test x"$enable_double" = x"yes"; then
++    
++cat >>confdefs.h <<\_ACEOF
++@%:@define LIBA52_DOUBLE 
++_ACEOF
++
++fi
++
++# Check whether --enable-djbfft or --disable-djbfft was given.
++if test "${enable_djbfft+set}" = set; then
++  enableval="$enable_djbfft"
++  
++fi; 
++if test x"$enable_djbfft" = x"yes"; then
++    
++cat >>confdefs.h <<\_ACEOF
++@%:@define LIBA52_DJBFFT 
++_ACEOF
++
++    LIBA52_LIBS="$LIBA52_LIBS -ldjbfft"
++fi
++
++
++
++# Check whether --enable-oss or --disable-oss was given.
++if test "${enable_oss+set}" = set; then
++  enableval="$enable_oss"
++  
++fi; 
++if test x"$enable_oss" != x"no"; then
++    case "$host" in
++    *-linux*|*-openbsd*|*-freebsd*|*-bsdi*)
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define LIBAO_OSS 
++_ACEOF
++
++	echo "$as_me:$LINENO: checking for _oss_ioctl in -lossaudio" >&5
++echo $ECHO_N "checking for _oss_ioctl in -lossaudio... $ECHO_C" >&6
++if test "${ac_cv_lib_ossaudio__oss_ioctl+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lossaudio  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char _oss_ioctl ();
++int
++main ()
++{
++_oss_ioctl ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_ossaudio__oss_ioctl=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_ossaudio__oss_ioctl=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5
++echo "${ECHO_T}$ac_cv_lib_ossaudio__oss_ioctl" >&6
++if test $ac_cv_lib_ossaudio__oss_ioctl = yes; then
++  LIBAO_LIBS="$LIBAO_LIBS -lossaudio"
++fi
++;;
++    esac
++fi
++
++# Check whether --enable-solaris-audio or --disable-solaris-audio was given.
++if test "${enable_solaris_audio+set}" = set; then
++  enableval="$enable_solaris_audio"
++  
++fi; 
++if test x"$enable_solaris_audio" != x"no"; then
++    case "$host" in
++    *-sun-solaris*)
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define LIBAO_SOLARIS 
++_ACEOF
++;;
++    esac
++fi
++
++# Check whether --enable-al-audio or --disable-al-audio was given.
++if test "${enable_al_audio+set}" = set; then
++  enableval="$enable_al_audio"
++  
++fi; 
++if test x"$enable_al" != x"no"; then
++    case "$host" in
++    *-sgi-irix*)
++	LIBAO_LIBS="$LIBAO_LIBS -laudio"
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define LIBAO_AL 
++_ACEOF
++;;
++    esac
++fi
++
++# Check whether --enable-win or --disable-win was given.
++if test "${enable_win+set}" = set; then
++  enableval="$enable_win"
++  
++fi; 
++if test x"$enable_win" != x"no"; then
++    case "$host" in
++    *-mingw32*|*-cygwin)
++	LIBAO_LIBS="$LIBAO_LIBS -lwinmm"
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define LIBAO_WIN 
++_ACEOF
++;;
++    esac
++fi
++
++
++# Check whether --enable-warnings or --disable-warnings was given.
++if test "${enable_warnings+set}" = set; then
++  enableval="$enable_warnings"
++  
++fi; 
++if test x"$enable_warnings" = x"yes" -a x"$GCC" = x"yes"; then
++        OPT_CFLAGS="$CFLAGS -Wall -Werror"
++    echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
++echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
++    SAVE_CFLAGS="$CFLAGS"
++    CFLAGS="$OPT_CFLAGS"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_try_cflags_ok=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_try_cflags_ok=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++    CFLAGS="$SAVE_CFLAGS"
++    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
++echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
++    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
++	CFLAGS=$OPT_CFLAGS
++    else
++	:
++    fi
++elif test x"$TENDRA" = x"yes"; then
++        CFLAGS="$CFLAGS -DTenDRA_check"
++fi
++
++
++
++A52DEC_CFLAGS="$CFLAGS"
++
++# Check whether --enable-gprof or --disable-gprof was given.
++if test "${enable_gprof+set}" = set; then
++  enableval="$enable_gprof"
++  
++fi; 
++if test x"$enable_gprof" = x"yes"; then
++    A52DEC_CFLAGS=`echo "$A52DEC_CFLAGS"|sed "s/-fomit-frame-pointer//g"`
++    A52DEC_CFLAGS="$A52DEC_CFLAGS -p"
++fi
++
++
++echo "$as_me:$LINENO: checking __attribute__ ((aligned ())) support" >&5
++echo $ECHO_N "checking __attribute__ ((aligned ())) support... $ECHO_C" >&6
++if test "${ac_cv_c_attribute_aligned+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_c_attribute_aligned=0
++	for ac_cv_c_attr_align_try in 2 4 8 16 32 64; do
++	    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++static char c __attribute__ ((aligned($ac_cv_c_attr_align_try))) = 0; return c;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_c_attribute_aligned=$ac_cv_c_attr_align_try
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++	done
++fi
++echo "$as_me:$LINENO: result: $ac_cv_c_attribute_aligned" >&5
++echo "${ECHO_T}$ac_cv_c_attribute_aligned" >&6
++    if test x"$ac_cv_c_attribute_aligned" != x"0"; then
++	
++cat >>confdefs.h <<_ACEOF
++@%:@define ATTRIBUTE_ALIGNED_MAX $ac_cv_c_attribute_aligned
++_ACEOF
++
++    fi
++
++cat >confcache <<\_ACEOF
++# This file is a shell script that caches the results of configure
++# tests run on this system so they can be shared between configure
++# scripts and configure runs, see configure's option --config-cache.
++# It is not useful on other systems.  If it contains results you don't
++# want to keep, you may remove or edit it.
++#
++# config.status only pays attention to the cache file if you give it
++# the --recheck option to rerun configure.
++#
++# `ac_cv_env_foo' variables (set or unset) will be overridden when
++# loading this file, other *unset* `ac_cv_foo' will be assigned the
++# following values.
++
++_ACEOF
++
++# The following way of writing the cache mishandles newlines in values,
++# but we know of no workaround that is simple, portable, and efficient.
++# So, don't put newlines in cache variables' values.
++# Ultrix sh set writes to stderr and can't be redirected directly,
++# and sets the high bit in the cache file unless we assign to the vars.
++{
++  (set) 2>&1 |
++    case `(ac_space=' '; set | grep ac_space) 2>&1` in
++    *ac_space=\ *)
++      # `set' does not quote correctly, so add quotes (double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \).
++      sed -n \
++	"s/'/'\\\\''/g;
++	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
++      ;;
++    *)
++      # `set' quotes correctly as required by POSIX, so do not add quotes.
++      sed -n \
++	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      ;;
++    esac;
++} |
++  sed '
++     t clear
++     : clear
++     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
++     t end
++     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     : end' >>confcache
++if diff $cache_file confcache >/dev/null 2>&1; then :; else
++  if test -w $cache_file; then
++    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
++    cat confcache >$cache_file
++  else
++    echo "not updating unwritable cache $cache_file"
++  fi
++fi
++rm -f confcache
++
++test "x$prefix" = xNONE && prefix=$ac_default_prefix
++# Let make expand exec_prefix.
++test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
++
++# 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
++# (actually we leave an empty line to preserve line numbers).
++if test "x$srcdir" = x.; then
++  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
++s/:*\$(srcdir):*/:/;
++s/:*\${srcdir}:*/:/;
++s/:*@srcdir@:*/:/;
++s/^\([^=]*=[	 ]*\):*/\1/;
++s/:*$//;
++s/^[^=]*=[	 ]*$//;
++}'
++fi
++
++DEFS=-DHAVE_CONFIG_H
++
++ac_libobjs=
++ac_ltlibobjs=
++for ac_i in : $LIB@&t@OBJS; do test "x$ac_i" = x: && continue
++  # 1. Remove the extension, and $U if already installed.
++  ac_i=`echo "$ac_i" |
++	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
++  # 2. Add them.
++  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
++  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
++done
++LIB@&t@OBJS=$ac_libobjs
++
++LTLIBOBJS=$ac_ltlibobjs
++
++
++if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++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
++  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++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
++  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++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
++  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++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_clean_files_save=$ac_clean_files
++ac_clean_files="$ac_clean_files $CONFIG_STATUS"
++{ 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.
++# Compiler output produced by configure, useful for debugging
++# configure, is in config.log if it exists.
++
++debug=false
++ac_cs_recheck=false
++ac_cs_silent=false
++SHELL=\${CONFIG_SHELL-$SHELL}
++_ACEOF
++
++cat >>$CONFIG_STATUS <<\_ACEOF
++## --------------------- ##
++## M4sh Initialization.  ##
++## --------------------- ##
++
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
++elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
++  set -o posix
++fi
++DUALCASE=1; export DUALCASE # for MKS sh
++
++# Support unset when possible.
++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
++  as_unset=unset
++else
++  as_unset=false
++fi
++
++
++# Work around bugs in pre-3.0 UWIN ksh.
++$as_unset ENV MAIL MAILPATH
++PS1='$ '
++PS2='> '
++PS4='+ '
++
++# NLS nuisances.
++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
++  fi
++done
++
++# Required to use basename.
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
++
++if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++  as_basename=basename
++else
++  as_basename=false
++fi
++
++
++# Name of the executable.
++as_me=`$as_basename "$0" ||
++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
++	 X"$0" : 'X\(//\)$' \| \
++	 X"$0" : 'X\(/\)$' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X/"$0" |
++    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
++  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\/\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++
++
++# PATH needs CR, and LINENO needs CR and PATH.
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
++
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++  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
++
++
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
++  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
++  # Find who we are.  Look in the path if we contain no path at all
++  # relative or not.
++  case $0 in
++    *[\\/]* ) as_myself=$0 ;;
++    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++done
++
++       ;;
++  esac
++  # We did not find ourselves, most probably we were run as `sh COMMAND'
++  # in which case we are not to be found in the path.
++  if test "x$as_myself" = x; then
++    as_myself=$0
++  fi
++  if test ! -f "$as_myself"; then
++    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
++echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
++   { (exit 1); exit 1; }; }
++  fi
++  case $CONFIG_SHELL in
++  '')
++    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for as_base in sh bash ksh sh5; do
++	 case $as_dir in
++	 /*)
++	   if ("$as_dir/$as_base" -c '
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
++  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
++	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
++	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
++	     CONFIG_SHELL=$as_dir/$as_base
++	     export CONFIG_SHELL
++	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
++	   fi;;
++	 esac
++       done
++done
++;;
++  esac
++
++  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
++  # uniformly replaced by the line number.  The first 'sed' inserts a
++  # line-number line before each line; the second 'sed' does the real
++  # work.  The second script uses 'N' to pair each line-number line
++  # with the numbered line, and appends trailing '-' during
++  # substitution so that $LINENO is not a special case at line end.
++  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
++  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
++  sed '=' <$as_myself |
++    sed '
++      N
++      s,$,-,
++      : loop
++      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
++      t loop
++      s,-$,,
++      s,^['$as_cr_digits']*\n,,
++    ' >$as_me.lineno &&
++  chmod +x $as_me.lineno ||
++    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
++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
++  # (the dirname of $[0] is not the place where we might find the
++  # original and so on.  Autoconf is especially sensible to this).
++  . ./$as_me.lineno
++  # Exit status is that of the last command.
++  exit
++}
++
++
++case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
++  *c*,-n*) ECHO_N= ECHO_C='
++' ECHO_T='	' ;;
++  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
++  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
++esac
++
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
++
++rm -f conf$$ conf$$.exe conf$$.file
++echo >conf$$.file
++if ln -s conf$$.file conf$$ 2>/dev/null; then
++  # We could just check for DJGPP; but this test a) works b) is more generic
++  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
++  if test -f conf$$.exe; then
++    # Don't use ln at all; we don't have any links
++    as_ln_s='cp -p'
++  else
++    as_ln_s='ln -s'
++  fi
++elif ln conf$$.file conf$$ 2>/dev/null; then
++  as_ln_s=ln
++else
++  as_ln_s='cp -p'
++fi
++rm -f conf$$ conf$$.exe conf$$.file
++
++if mkdir -p . 2>/dev/null; then
++  as_mkdir_p=:
++else
++  test -d ./-p && rmdir ./-p
++  as_mkdir_p=false
++fi
++
++as_executable_p="test -f"
++
++# Sed expression to map a string onto a valid CPP name.
++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
++
++# Sed expression to map a string onto a valid variable name.
++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
++
++
++# IFS
++# We need space, tab and new line, in precisely that order.
++as_nl='
++'
++IFS=" 	$as_nl"
++
++# CDPATH.
++$as_unset CDPATH
++
++exec 6>&1
++
++# Open the log real soon, to keep \$[0] and so on meaningful, and to
++# report actual input values of CONFIG_FILES etc. instead of their
++# values after options handling.  Logging --version etc. is OK.
++exec 5>>config.log
++{
++  echo
++  sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX
++@%:@@%:@ Running $as_me. @%:@@%:@
++_ASBOX
++} >&5
++cat >&5 <<_CSEOF
++
++This file was extended by $as_me, which was
++generated by GNU Autoconf 2.59.  Invocation command line was
++
++  CONFIG_FILES    = $CONFIG_FILES
++  CONFIG_HEADERS  = $CONFIG_HEADERS
++  CONFIG_LINKS    = $CONFIG_LINKS
++  CONFIG_COMMANDS = $CONFIG_COMMANDS
++  $ $0 $@
++
++_CSEOF
++echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
++echo >&5
++_ACEOF
++
++# Files that config.status was made for.
++if test -n "$ac_config_files"; then
++  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
++fi
++
++if test -n "$ac_config_headers"; then
++  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
++fi
++
++if test -n "$ac_config_links"; then
++  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
++fi
++
++if test -n "$ac_config_commands"; then
++  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
++fi
++
++cat >>$CONFIG_STATUS <<\_ACEOF
++
++ac_cs_usage="\
++\`$as_me' instantiates files from templates according to the
++current configuration.
++
++Usage: $0 [OPTIONS] [FILE]...
++
++  -h, --help       print this help, then exit
++  -V, --version    print version number, then exit
++  -q, --quiet      do not print progress messages
++  -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
++  --header=FILE[:TEMPLATE]
++		   instantiate the configuration header FILE
++
++Configuration files:
++$config_files
++
++Configuration headers:
++$config_headers
++
++Configuration commands:
++$config_commands
++
++Report bugs to <bug-autoconf@gnu.org>."
++_ACEOF
++
++cat >>$CONFIG_STATUS <<_ACEOF
++ac_cs_version="\\
++config.status
++configured by $0, generated by GNU Autoconf 2.59,
++  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
++
++Copyright (C) 2003 Free Software Foundation, Inc.
++This config.status script is free software; the Free Software Foundation
++gives unlimited permission to copy, distribute and modify it."
++srcdir=$srcdir
++INSTALL="$INSTALL"
++_ACEOF
++
++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
++  case $1 in
++  --*=*)
++    ac_option=`expr "x$1" : 'x\([^=]*\)='`
++    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
++    ac_shift=:
++    ;;
++  -*)
++    ac_option=$1
++    ac_optarg=$2
++    ac_shift=shift
++    ;;
++  *) # This is not an option, so the user has probably given explicit
++     # arguments.
++     ac_option=$1
++     ac_need_defaults=false;;
++  esac
++
++  case $ac_option in
++  # Handling of the options.
++_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF
++  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++    ac_cs_recheck=: ;;
++  --version | --vers* | -V )
++    echo "$ac_cs_version"; exit 0 ;;
++  --he | --h)
++    # Conflict between --help and --header
++    { { echo "$as_me:$LINENO: error: ambiguous option: $1
++Try \`$0 --help' for more information." >&5
++echo "$as_me: error: ambiguous option: $1
++Try \`$0 --help' for more information." >&2;}
++   { (exit 1); exit 1; }; };;
++  --help | --hel | -h )
++    echo "$ac_cs_usage"; exit 0 ;;
++  --debug | --d* | -d )
++    debug=: ;;
++  --file | --fil | --fi | --f )
++    $ac_shift
++    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
++    ac_need_defaults=false;;
++  --header | --heade | --head | --hea )
++    $ac_shift
++    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
++    ac_need_defaults=false;;
++  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
++  | -silent | --silent | --silen | --sile | --sil | --si | --s)
++    ac_cs_silent=: ;;
++
++  # This is an error.
++  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
++Try \`$0 --help' for more information." >&5
++echo "$as_me: error: unrecognized option: $1
++Try \`$0 --help' for more information." >&2;}
++   { (exit 1); exit 1; }; } ;;
++
++  *) ac_config_targets="$ac_config_targets $1" ;;
++
++  esac
++  shift
++done
++
++ac_configure_extra_args=
++
++if $ac_cs_silent; then
++  exec 6>/dev/null
++  ac_configure_extra_args="$ac_configure_extra_args --silent"
++fi
++
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF
++if \$ac_cs_recheck; then
++  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
++  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++fi
++
++_ACEOF
++
++cat >>$CONFIG_STATUS <<_ACEOF
++#
++# INIT-COMMANDS section.
++#
++
++AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
++
++_ACEOF
++
++
++
++cat >>$CONFIG_STATUS <<\_ACEOF
++for ac_config_target in $ac_config_targets
++do
++  case "$ac_config_target" in
++  # Handling of arguments.
++  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
++  "autotools/Makefile" ) CONFIG_FILES="$CONFIG_FILES autotools/Makefile" ;;
++  "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
++  "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
++  "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
++  "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
++  "liba52/Makefile" ) CONFIG_FILES="$CONFIG_FILES liba52/Makefile" ;;
++  "libao/Makefile" ) CONFIG_FILES="$CONFIG_FILES libao/Makefile" ;;
++  "vc++/Makefile" ) CONFIG_FILES="$CONFIG_FILES vc++/Makefile" ;;
++  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
++  "include/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;;
++  *) { { 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
++
++# If the user did not use the arguments to specify the items to instantiate,
++# then the envvar interface is used.  Set only those that are not.
++# We use the long form for the default assignment because of an extremely
++# bizarre bug on SunOS 4.1.3.
++if $ac_need_defaults; then
++  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
++  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
++  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
++fi
++
++# Have a temporary directory for convenience.  Make it in the build tree
++# simply because there is no reason to put it here, and in addition,
++# creating and moving files from /tmp can sometimes cause problems.
++# Create a temporary directory, and hook for its removal unless debugging.
++$debug ||
++{
++  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
++  trap '{ (exit 1); exit 1; }' 1 2 13 15
++}
++
++# Create a (secure) tmp directory for tmp files.
++
++{
++  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
++  test -n "$tmp" && test -d "$tmp"
++}  ||
++{
++  tmp=./confstat$$-$RANDOM
++  (umask 077 && mkdir $tmp)
++} ||
++{
++   echo "$me: cannot create a temporary directory in ." >&2
++   { (exit 1); exit 1; }
++}
++
++_ACEOF
++
++cat >>$CONFIG_STATUS <<_ACEOF
++
++#
++# CONFIG_FILES section.
++#
++
++# 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
++  # Protect against being on the right side of a sed subst in config.status.
++  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
++   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
++s,@SHELL@,$SHELL,;t t
++s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
++s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
++s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
++s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
++s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
++s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
++s,@exec_prefix@,$exec_prefix,;t t
++s,@prefix@,$prefix,;t t
++s,@program_transform_name@,$program_transform_name,;t t
++s,@bindir@,$bindir,;t t
++s,@sbindir@,$sbindir,;t t
++s,@libexecdir@,$libexecdir,;t t
++s,@datadir@,$datadir,;t t
++s,@sysconfdir@,$sysconfdir,;t t
++s,@sharedstatedir@,$sharedstatedir,;t t
++s,@localstatedir@,$localstatedir,;t t
++s,@libdir@,$libdir,;t t
++s,@includedir@,$includedir,;t t
++s,@oldincludedir@,$oldincludedir,;t t
++s,@infodir@,$infodir,;t t
++s,@mandir@,$mandir,;t t
++s,@build_alias@,$build_alias,;t t
++s,@host_alias@,$host_alias,;t t
++s,@target_alias@,$target_alias,;t t
++s,@DEFS@,$DEFS,;t t
++s,@ECHO_C@,$ECHO_C,;t t
++s,@ECHO_N@,$ECHO_N,;t t
++s,@ECHO_T@,$ECHO_T,;t t
++s,@LIBS@,$LIBS,;t t
++s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
++s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
++s,@INSTALL_DATA@,$INSTALL_DATA,;t t
++s,@CYGPATH_W@,$CYGPATH_W,;t t
++s,@PACKAGE@,$PACKAGE,;t t
++s,@VERSION@,$VERSION,;t t
++s,@ACLOCAL@,$ACLOCAL,;t t
++s,@AUTOCONF@,$AUTOCONF,;t t
++s,@AUTOMAKE@,$AUTOMAKE,;t t
++s,@AUTOHEADER@,$AUTOHEADER,;t t
++s,@MAKEINFO@,$MAKEINFO,;t t
++s,@install_sh@,$install_sh,;t t
++s,@STRIP@,$STRIP,;t t
++s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
++s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
++s,@mkdir_p@,$mkdir_p,;t t
++s,@AWK@,$AWK,;t t
++s,@SET_MAKE@,$SET_MAKE,;t t
++s,@am__leading_dot@,$am__leading_dot,;t t
++s,@AMTAR@,$AMTAR,;t t
++s,@am__tar@,$am__tar,;t t
++s,@am__untar@,$am__untar,;t t
++s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
++s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
++s,@MAINT@,$MAINT,;t t
++s,@build@,$build,;t t
++s,@build_cpu@,$build_cpu,;t t
++s,@build_vendor@,$build_vendor,;t t
++s,@build_os@,$build_os,;t t
++s,@host@,$host,;t t
++s,@host_cpu@,$host_cpu,;t t
++s,@host_vendor@,$host_vendor,;t t
++s,@host_os@,$host_os,;t t
++s,@CC@,$CC,;t t
++s,@CFLAGS@,$CFLAGS,;t t
++s,@LDFLAGS@,$LDFLAGS,;t t
++s,@CPPFLAGS@,$CPPFLAGS,;t t
++s,@ac_ct_CC@,$ac_ct_CC,;t t
++s,@EXEEXT@,$EXEEXT,;t t
++s,@OBJEXT@,$OBJEXT,;t t
++s,@DEPDIR@,$DEPDIR,;t t
++s,@am__include@,$am__include,;t t
++s,@am__quote@,$am__quote,;t t
++s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
++s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
++s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
++s,@CCDEPMODE@,$CCDEPMODE,;t t
++s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
++s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
++s,@CPP@,$CPP,;t t
++s,@EGREP@,$EGREP,;t t
++s,@LN_S@,$LN_S,;t t
++s,@ECHO@,$ECHO,;t t
++s,@AR@,$AR,;t t
++s,@ac_ct_AR@,$ac_ct_AR,;t t
++s,@RANLIB@,$RANLIB,;t t
++s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
++s,@DLLTOOL@,$DLLTOOL,;t t
++s,@ac_ct_DLLTOOL@,$ac_ct_DLLTOOL,;t t
++s,@AS@,$AS,;t t
++s,@ac_ct_AS@,$ac_ct_AS,;t t
++s,@OBJDUMP@,$OBJDUMP,;t t
++s,@ac_ct_OBJDUMP@,$ac_ct_OBJDUMP,;t t
++s,@CXX@,$CXX,;t t
++s,@CXXFLAGS@,$CXXFLAGS,;t t
++s,@ac_ct_CXX@,$ac_ct_CXX,;t t
++s,@CXXDEPMODE@,$CXXDEPMODE,;t t
++s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
++s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
++s,@CXXCPP@,$CXXCPP,;t t
++s,@F77@,$F77,;t t
++s,@FFLAGS@,$FFLAGS,;t t
++s,@ac_ct_F77@,$ac_ct_F77,;t t
++s,@LIBTOOL@,$LIBTOOL,;t t
++s,@INCLUDES@,$INCLUDES,;t t
++s,@LIBA52_CFLAGS@,$LIBA52_CFLAGS,;t t
++s,@LIBA52_LIBS@,$LIBA52_LIBS,;t t
++s,@LIBAO_LIBS@,$LIBAO_LIBS,;t t
++s,@A52DEC_CFLAGS@,$A52DEC_CFLAGS,;t t
++s,@LIB@&t@OBJS@,$LIB@&t@OBJS,;t t
++s,@LTLIBOBJS@,$LTLIBOBJS,;t t
++CEOF
++
++_ACEOF
++
++  cat >>$CONFIG_STATUS <<\_ACEOF
++  # Split the substitutions into bite-sized pieces for seds with
++  # small command number limits, like on Digital OSF/1 and HP-UX.
++  ac_max_sed_lines=48
++  ac_sed_frag=1 # Number of current file.
++  ac_beg=1 # First line for current file.
++  ac_end=$ac_max_sed_lines # Line after last line for current file.
++  ac_more_lines=:
++  ac_sed_cmds=
++  while $ac_more_lines; do
++    if test $ac_beg -gt 1; then
++      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
++    else
++      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
++    fi
++    if test ! -s $tmp/subs.frag; then
++      ac_more_lines=false
++    else
++      # The purpose of the label and of the branching condition is to
++      # speed up the sed processing (if there are no `@' at all, there
++      # is no need to browse any of the substitutions).
++      # These are the two extra sed commands mentioned above.
++      (echo ':t
++  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
++      if test -z "$ac_sed_cmds"; then
++	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
++      else
++	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
++      fi
++      ac_sed_frag=`expr $ac_sed_frag + 1`
++      ac_beg=$ac_end
++      ac_end=`expr $ac_end + $ac_max_sed_lines`
++    fi
++  done
++  if test -z "$ac_sed_cmds"; then
++    ac_sed_cmds=cat
++  fi
++fi # test -n "$CONFIG_FILES"
++
++_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF
++for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
++  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
++  case $ac_file in
++  - | *:- | *:-:* ) # input from stdin
++	cat >$tmp/stdin
++	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
++	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
++  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
++	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
++  * )   ac_file_in=$ac_file.in ;;
++  esac
++
++  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
++  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
++$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; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++  { if $as_mkdir_p; then
++    mkdir -p "$ac_dir"
++  else
++    as_dir="$ac_dir"
++    as_dirs=
++    while test ! -d "$as_dir"; do
++      as_dirs="$as_dir $as_dirs"
++      as_dir=`(dirname "$as_dir") 2>/dev/null ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$as_dir" : 'X\(//\)[^/]' \| \
++	 X"$as_dir" : 'X\(//\)$' \| \
++	 X"$as_dir" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$as_dir" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++    done
++    test ! -n "$as_dirs" || mkdir $as_dirs
++  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
++echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
++   { (exit 1); exit 1; }; }; }
++
++  ac_builddir=.
++
++if test "$ac_dir" != .; then
++  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
++  # A "../" for each directory in $ac_dir_suffix.
++  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
++else
++  ac_dir_suffix= ac_top_builddir=
++fi
++
++case $srcdir in
++  .)  # No --srcdir option.  We are building in place.
++    ac_srcdir=.
++    if test -z "$ac_top_builddir"; then
++       ac_top_srcdir=.
++    else
++       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
++    fi ;;
++  [\\/]* | ?:[\\/]* )  # Absolute path.
++    ac_srcdir=$srcdir$ac_dir_suffix;
++    ac_top_srcdir=$srcdir ;;
++  *) # Relative path.
++    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
++    ac_top_srcdir=$ac_top_builddir$srcdir ;;
++esac
++
++# Do not use `cd foo && pwd` to compute absolute paths, because
++# the directories may not exist.
++case `pwd` in
++.) ac_abs_builddir="$ac_dir";;
++*)
++  case "$ac_dir" in
++  .) ac_abs_builddir=`pwd`;;
++  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
++  *) ac_abs_builddir=`pwd`/"$ac_dir";;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_builddir=${ac_top_builddir}.;;
++*)
++  case ${ac_top_builddir}. in
++  .) ac_abs_top_builddir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
++  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_srcdir=$ac_srcdir;;
++*)
++  case $ac_srcdir in
++  .) ac_abs_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
++  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_srcdir=$ac_top_srcdir;;
++*)
++  case $ac_top_srcdir in
++  .) ac_abs_top_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
++  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
++  esac;;
++esac
++
++
++  case $INSTALL in
++  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
++  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
++  esac
++
++  if test x"$ac_file" != x-; then
++    { echo "$as_me:$LINENO: creating $ac_file" >&5
++echo "$as_me: creating $ac_file" >&6;}
++    rm -f "$ac_file"
++  fi
++  # 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.  */
++  if test x"$ac_file" = x-; then
++    configure_input=
++  else
++    configure_input="$ac_file.  "
++  fi
++  configure_input=$configure_input"Generated from `echo $ac_file_in |
++				     sed 's,.*/,,'` by configure."
++
++  # First look for the input files in the build tree, otherwise in the
++  # src tree.
++  ac_file_inputs=`IFS=:
++    for f in $ac_file_in; do
++      case $f in
++      -) echo $tmp/stdin ;;
++      [\\/$]*)
++	 # Absolute (can't be DOS-style, as IFS=:)
++	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
++echo "$as_me: error: cannot find input file: $f" >&2;}
++   { (exit 1); exit 1; }; }
++	 echo "$f";;
++      *) # Relative
++	 if test -f "$f"; then
++	   # Build tree
++	   echo "$f"
++	 elif test -f "$srcdir/$f"; then
++	   # Source tree
++	   echo "$srcdir/$f"
++	 else
++	   # /dev/null tree
++	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
++echo "$as_me: error: cannot find input file: $f" >&2;}
++   { (exit 1); exit 1; }; }
++	 fi;;
++      esac
++    done` || { (exit 1); exit 1; }
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF
++  sed "$ac_vpsub
++$extrasub
++_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF
++:t
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
++s,@configure_input@,$configure_input,;t t
++s,@srcdir@,$ac_srcdir,;t t
++s,@abs_srcdir@,$ac_abs_srcdir,;t t
++s,@top_srcdir@,$ac_top_srcdir,;t t
++s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
++s,@builddir@,$ac_builddir,;t t
++s,@abs_builddir@,$ac_abs_builddir,;t t
++s,@top_builddir@,$ac_top_builddir,;t t
++s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
++s,@INSTALL@,$ac_INSTALL,;t t
++" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
++  rm -f $tmp/stdin
++  if test x"$ac_file" != x-; then
++    mv $tmp/out $ac_file
++  else
++    cat $tmp/out
++    rm -f $tmp/out
++  fi
++
++done
++_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF
++
++#
++# CONFIG_HEADER section.
++#
++
++# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
++# NAME is the cpp macro being defined and VALUE is the value it is being given.
++#
++# ac_d sets the value in "#define NAME VALUE" lines.
++ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
++ac_dB='[	 ].*$,\1#\2'
++ac_dC=' '
++ac_dD=',;t'
++# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
++ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
++ac_uB='$,\1#\2define\3'
++ac_uC=' '
++ac_uD=',;t'
++
++for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
++  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
++  case $ac_file in
++  - | *:- | *:-:* ) # input from stdin
++	cat >$tmp/stdin
++	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
++	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
++  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
++	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
++  * )   ac_file_in=$ac_file.in ;;
++  esac
++
++  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
++echo "$as_me: creating $ac_file" >&6;}
++
++  # First look for the input files in the build tree, otherwise in the
++  # src tree.
++  ac_file_inputs=`IFS=:
++    for f in $ac_file_in; do
++      case $f in
++      -) echo $tmp/stdin ;;
++      [\\/$]*)
++	 # Absolute (can't be DOS-style, as IFS=:)
++	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
++echo "$as_me: error: cannot find input file: $f" >&2;}
++   { (exit 1); exit 1; }; }
++	 # Do quote $f, to prevent DOS paths from being IFS'd.
++	 echo "$f";;
++      *) # Relative
++	 if test -f "$f"; then
++	   # Build tree
++	   echo "$f"
++	 elif test -f "$srcdir/$f"; then
++	   # Source tree
++	   echo "$srcdir/$f"
++	 else
++	   # /dev/null tree
++	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
++echo "$as_me: error: cannot find input file: $f" >&2;}
++   { (exit 1); exit 1; }; }
++	 fi;;
++      esac
++    done` || { (exit 1); exit 1; }
++  # Remove the trailing spaces.
++  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
++
++_ACEOF
++
++# Transform confdefs.h into two sed scripts, `conftest.defines' and
++# `conftest.undefs', that substitutes the proper values into
++# config.h.in to produce config.h.  The first handles `#define'
++# templates, and the second `#undef' templates.
++# And first: Protect against being on the right side of a sed subst in
++# config.status.  Protect against being in an unquoted here document
++# in config.status.
++rm -f conftest.defines conftest.undefs
++# Using a here document instead of a string reduces the quoting nightmare.
++# Putting comments in sed scripts is not portable.
++#
++# `end' is used to avoid that the second main sed command (meant for
++# 0-ary CPP macros) applies to n-ary macro definitions.
++# See the Autoconf documentation for `clear'.
++cat >confdef2sed.sed <<\_ACEOF
++s/[\\&,]/\\&/g
++s,[\\$`],\\&,g
++t clear
++: clear
++s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
++t end
++s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
++: end
++_ACEOF
++# If some macros were called several times there might be several times
++# the same #defines, which is useless.  Nevertheless, we may not want to
++# sort them, since we want the *last* AC-DEFINE to be honored.
++uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
++sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
++rm -f confdef2sed.sed
++
++# This sed command replaces #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.
++cat >>conftest.undefs <<\_ACEOF
++s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
++_ACEOF
++
++# Break up conftest.defines because some shells have a limit on the size
++# of here documents, and old seds have small limits too (100 cmds).
++echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
++echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
++echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
++echo '  :' >>$CONFIG_STATUS
++rm -f conftest.tail
++while grep . conftest.defines >/dev/null
++do
++  # Write a limited-size here document to $tmp/defines.sed.
++  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
++  # Speed up: don't consider the non `#define' lines.
++  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
++  # Work around the forget-to-reset-the-flag bug.
++  echo 't clr' >>$CONFIG_STATUS
++  echo ': clr' >>$CONFIG_STATUS
++  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
++  echo 'CEOF
++  sed -f $tmp/defines.sed $tmp/in >$tmp/out
++  rm -f $tmp/in
++  mv $tmp/out $tmp/in
++' >>$CONFIG_STATUS
++  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
++  rm -f conftest.defines
++  mv conftest.tail conftest.defines
++done
++rm -f conftest.defines
++echo '  fi # grep' >>$CONFIG_STATUS
++echo >>$CONFIG_STATUS
++
++# Break up conftest.undefs because some shells have a limit on the size
++# of here documents, and old seds have small limits too (100 cmds).
++echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
++rm -f conftest.tail
++while grep . conftest.undefs >/dev/null
++do
++  # Write a limited-size here document to $tmp/undefs.sed.
++  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
++  # Speed up: don't consider the non `#undef'
++  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
++  # Work around the forget-to-reset-the-flag bug.
++  echo 't clr' >>$CONFIG_STATUS
++  echo ': clr' >>$CONFIG_STATUS
++  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
++  echo 'CEOF
++  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
++  rm -f $tmp/in
++  mv $tmp/out $tmp/in
++' >>$CONFIG_STATUS
++  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
++  rm -f conftest.undefs
++  mv conftest.tail conftest.undefs
++done
++rm -f conftest.undefs
++
++cat >>$CONFIG_STATUS <<\_ACEOF
++  # 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.  */
++  if test x"$ac_file" = x-; then
++    echo "/* Generated by configure.  */" >$tmp/config.h
++  else
++    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
++  fi
++  cat $tmp/in >>$tmp/config.h
++  rm -f $tmp/in
++  if test x"$ac_file" != x-; then
++    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
++      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
++$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; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++      { if $as_mkdir_p; then
++    mkdir -p "$ac_dir"
++  else
++    as_dir="$ac_dir"
++    as_dirs=
++    while test ! -d "$as_dir"; do
++      as_dirs="$as_dir $as_dirs"
++      as_dir=`(dirname "$as_dir") 2>/dev/null ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$as_dir" : 'X\(//\)[^/]' \| \
++	 X"$as_dir" : 'X\(//\)$' \| \
++	 X"$as_dir" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$as_dir" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++    done
++    test ! -n "$as_dirs" || mkdir $as_dirs
++  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
++echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
++   { (exit 1); exit 1; }; }; }
++
++      rm -f $ac_file
++      mv $tmp/config.h $ac_file
++    fi
++  else
++    cat $tmp/config.h
++    rm -f $tmp/config.h
++  fi
++# 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:* )
++      break ;;
++    * )
++      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
++  esac
++done
++echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
++$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; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`/stamp-h$_am_stamp_count
++done
++_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF
++
++#
++# CONFIG_COMMANDS section.
++#
++for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
++  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
++  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
++  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
++$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$ac_dest" : 'X\(//\)[^/]' \| \
++	 X"$ac_dest" : 'X\(//\)$' \| \
++	 X"$ac_dest" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$ac_dest" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++  { if $as_mkdir_p; then
++    mkdir -p "$ac_dir"
++  else
++    as_dir="$ac_dir"
++    as_dirs=
++    while test ! -d "$as_dir"; do
++      as_dirs="$as_dir $as_dirs"
++      as_dir=`(dirname "$as_dir") 2>/dev/null ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$as_dir" : 'X\(//\)[^/]' \| \
++	 X"$as_dir" : 'X\(//\)$' \| \
++	 X"$as_dir" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$as_dir" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++    done
++    test ! -n "$as_dirs" || mkdir $as_dirs
++  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
++echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
++   { (exit 1); exit 1; }; }; }
++
++  ac_builddir=.
++
++if test "$ac_dir" != .; then
++  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
++  # A "../" for each directory in $ac_dir_suffix.
++  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
++else
++  ac_dir_suffix= ac_top_builddir=
++fi
++
++case $srcdir in
++  .)  # No --srcdir option.  We are building in place.
++    ac_srcdir=.
++    if test -z "$ac_top_builddir"; then
++       ac_top_srcdir=.
++    else
++       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
++    fi ;;
++  [\\/]* | ?:[\\/]* )  # Absolute path.
++    ac_srcdir=$srcdir$ac_dir_suffix;
++    ac_top_srcdir=$srcdir ;;
++  *) # Relative path.
++    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
++    ac_top_srcdir=$ac_top_builddir$srcdir ;;
++esac
++
++# Do not use `cd foo && pwd` to compute absolute paths, because
++# the directories may not exist.
++case `pwd` in
++.) ac_abs_builddir="$ac_dir";;
++*)
++  case "$ac_dir" in
++  .) ac_abs_builddir=`pwd`;;
++  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
++  *) ac_abs_builddir=`pwd`/"$ac_dir";;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_builddir=${ac_top_builddir}.;;
++*)
++  case ${ac_top_builddir}. in
++  .) ac_abs_top_builddir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
++  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_srcdir=$ac_srcdir;;
++*)
++  case $ac_srcdir in
++  .) ac_abs_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
++  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_srcdir=$ac_top_srcdir;;
++*)
++  case $ac_top_srcdir in
++  .) ac_abs_top_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
++  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
++  esac;;
++esac
++
++
++  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
++echo "$as_me: executing $ac_dest commands" >&6;}
++  case $ac_dest in
++    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
++  # Strip MF so we end up with the name of the file.
++  mf=`echo "$mf" | sed -e 's/:.*$//'`
++  # Check whether this is an Automake generated Makefile or not.
++  # We used to match only the files named `Makefile.in', but
++  # 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
++    dirpart=`(dirname "$mf") 2>/dev/null ||
++$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$mf" : 'X\(//\)[^/]' \| \
++	 X"$mf" : 'X\(//\)$' \| \
++	 X"$mf" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$mf" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++  else
++    continue
++  fi
++  # Extract the definition of DEPDIR, am__include, and am__quote
++  # from the Makefile without running `make'.
++  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
++  test -z "$DEPDIR" && continue
++  am__include=`sed -n 's/^am__include = //p' < "$mf"`
++  test -z "am__include" && continue
++  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++  # When using ansi2knr, U may be empty or an underscore; expand it
++  U=`sed -n 's/^U = //p' < "$mf"`
++  # Find all dependency output files, they are included files with
++  # $(DEPDIR) in their names.  We invoke sed twice because it is the
++  # simplest approach to changing $(DEPDIR) to its actual value in the
++  # expansion.
++  for file in `sed -n "
++    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
++       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
++    # Make sure the directory exists.
++    test -f "$dirpart/$file" && continue
++    fdir=`(dirname "$file") 2>/dev/null ||
++$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$file" : 'X\(//\)[^/]' \| \
++	 X"$file" : 'X\(//\)$' \| \
++	 X"$file" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$file" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++    { if $as_mkdir_p; then
++    mkdir -p $dirpart/$fdir
++  else
++    as_dir=$dirpart/$fdir
++    as_dirs=
++    while test ! -d "$as_dir"; do
++      as_dirs="$as_dir $as_dirs"
++      as_dir=`(dirname "$as_dir") 2>/dev/null ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$as_dir" : 'X\(//\)[^/]' \| \
++	 X"$as_dir" : 'X\(//\)$' \| \
++	 X"$as_dir" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$as_dir" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++    done
++    test ! -n "$as_dirs" || mkdir $as_dirs
++  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
++echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
++   { (exit 1); exit 1; }; }; }
++
++    # echo "creating $dirpart/$file"
++    echo '# dummy' > "$dirpart/$file"
++  done
++done
++ ;;
++  esac
++done
++_ACEOF
++
++cat >>$CONFIG_STATUS <<\_ACEOF
++
++{ (exit 0); exit 0; }
++_ACEOF
++chmod +x $CONFIG_STATUS
++ac_clean_files=$ac_clean_files_save
++
++
++# configure is writing to config.log, and then calls config.status.
++# config.status does its own redirection, appending to config.log.
++# Unfortunately, on DOS this fails, as config.log is still kept open
++# by configure, so config.status won't be able to write to it; its
++# output is simply discarded.  So we exec the FD to /dev/null,
++# effectively closing config.log, so it can be properly (re)opened and
++# appended to by config.status.  When coming back to configure, we
++# need to make the FD available again.
++if test "$no_create" != yes; then
++  ac_cs_success=:
++  ac_config_status_args=
++  test "$silent" = yes &&
++    ac_config_status_args="$ac_config_status_args --quiet"
++  exec 5>/dev/null
++  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
++  exec 5>>config.log
++  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
++  # would make configure fail if this is the last instruction.
++  $ac_cs_success || { (exit 1); exit 1; }
++fi
++
+diff -uNr a52dec-0.7.4-orig/autom4te.cache/output.1 a52dec-0.7.4/autom4te.cache/output.1
+--- a52dec-0.7.4-orig/autom4te.cache/output.1	1970-01-01 10:00:00.000000000 +1000
++++ a52dec-0.7.4/autom4te.cache/output.1	2005-02-06 16:25:18.438065528 +1100
+@@ -0,0 +1,24012 @@
++@%:@! /bin/sh
++@%:@ Guess values for system-dependent variables and create Makefiles.
++@%:@ Generated by GNU Autoconf 2.59.
++@%:@ 
++@%:@ Copyright (C) 2003 Free Software Foundation, Inc.
++@%:@ This configure script is free software; the Free Software Foundation
++@%:@ gives unlimited permission to copy, distribute and modify it.
++## --------------------- ##
++## M4sh Initialization.  ##
++## --------------------- ##
++
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
++elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
++  set -o posix
++fi
++DUALCASE=1; export DUALCASE # for MKS sh
++
++# Support unset when possible.
++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
++  as_unset=unset
++else
++  as_unset=false
++fi
++
++
++# Work around bugs in pre-3.0 UWIN ksh.
++$as_unset ENV MAIL MAILPATH
++PS1='$ '
++PS2='> '
++PS4='+ '
++
++# NLS nuisances.
++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
++  fi
++done
++
++# Required to use basename.
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
++
++if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++  as_basename=basename
++else
++  as_basename=false
++fi
++
++
++# Name of the executable.
++as_me=`$as_basename "$0" ||
++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
++	 X"$0" : 'X\(//\)$' \| \
++	 X"$0" : 'X\(/\)$' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X/"$0" |
++    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
++  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\/\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++
++
++# PATH needs CR, and LINENO needs CR and PATH.
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
++
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++  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
++
++
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
++  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
++  # Find who we are.  Look in the path if we contain no path at all
++  # relative or not.
++  case $0 in
++    *[\\/]* ) as_myself=$0 ;;
++    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++done
++
++       ;;
++  esac
++  # We did not find ourselves, most probably we were run as `sh COMMAND'
++  # in which case we are not to be found in the path.
++  if test "x$as_myself" = x; then
++    as_myself=$0
++  fi
++  if test ! -f "$as_myself"; then
++    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
++   { (exit 1); exit 1; }; }
++  fi
++  case $CONFIG_SHELL in
++  '')
++    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for as_base in sh bash ksh sh5; do
++	 case $as_dir in
++	 /*)
++	   if ("$as_dir/$as_base" -c '
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
++  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
++	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
++	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
++	     CONFIG_SHELL=$as_dir/$as_base
++	     export CONFIG_SHELL
++	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
++	   fi;;
++	 esac
++       done
++done
++;;
++  esac
++
++  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
++  # uniformly replaced by the line number.  The first 'sed' inserts a
++  # line-number line before each line; the second 'sed' does the real
++  # work.  The second script uses 'N' to pair each line-number line
++  # with the numbered line, and appends trailing '-' during
++  # substitution so that $LINENO is not a special case at line end.
++  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
++  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
++  sed '=' <$as_myself |
++    sed '
++      N
++      s,$,-,
++      : loop
++      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
++      t loop
++      s,-$,,
++      s,^['$as_cr_digits']*\n,,
++    ' >$as_me.lineno &&
++  chmod +x $as_me.lineno ||
++    { 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
++  # (the dirname of $[0] is not the place where we might find the
++  # original and so on.  Autoconf is especially sensible to this).
++  . ./$as_me.lineno
++  # Exit status is that of the last command.
++  exit
++}
++
++
++case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
++  *c*,-n*) ECHO_N= ECHO_C='
++' ECHO_T='	' ;;
++  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
++  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
++esac
++
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
++
++rm -f conf$$ conf$$.exe conf$$.file
++echo >conf$$.file
++if ln -s conf$$.file conf$$ 2>/dev/null; then
++  # We could just check for DJGPP; but this test a) works b) is more generic
++  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
++  if test -f conf$$.exe; then
++    # Don't use ln at all; we don't have any links
++    as_ln_s='cp -p'
++  else
++    as_ln_s='ln -s'
++  fi
++elif ln conf$$.file conf$$ 2>/dev/null; then
++  as_ln_s=ln
++else
++  as_ln_s='cp -p'
++fi
++rm -f conf$$ conf$$.exe conf$$.file
++
++if mkdir -p . 2>/dev/null; then
++  as_mkdir_p=:
++else
++  test -d ./-p && rmdir ./-p
++  as_mkdir_p=false
++fi
++
++as_executable_p="test -f"
++
++# Sed expression to map a string onto a valid CPP name.
++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
++
++# Sed expression to map a string onto a valid variable name.
++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
++
++
++# IFS
++# We need space, tab and new line, in precisely that order.
++as_nl='
++'
++IFS=" 	$as_nl"
++
++# CDPATH.
++$as_unset CDPATH
++
++
++
++# Check that we are running under the correct shell.
++SHELL=${CONFIG_SHELL-/bin/sh}
++
++case X$ECHO in
++X*--fallback-echo)
++  # Remove one level of quotation (which was required for Make).
++  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
++  ;;
++esac
++
++echo=${ECHO-echo}
++if test "X$1" = X--no-reexec; then
++  # Discard the --no-reexec flag, and continue.
++  shift
++elif test "X$1" = X--fallback-echo; then
++  # Avoid inline document here, it may be left over
++  :
++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
++  # Yippee, $echo works!
++  :
++else
++  # Restart under the correct shell.
++  exec $SHELL "$0" --no-reexec ${1+"$@"}
++fi
++
++if test "X$1" = X--fallback-echo; then
++  # used as fallback echo
++  shift
++  cat <<EOF
++$*
++EOF
++  exit 0
++fi
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++
++if test -z "$ECHO"; then
++if test "X${echo_test_string+set}" != Xset; then
++# find a string as large as possible, as long as the shell can cope with it
++  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
++    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
++    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
++       echo_test_string="`eval $cmd`" &&
++       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
++    then
++      break
++    fi
++  done
++fi
++
++if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++   test "X$echo_testing_string" = "X$echo_test_string"; then
++  :
++else
++  # The Solaris, AIX, and Digital Unix default echo programs unquote
++  # backslashes.  This makes it impossible to quote backslashes using
++  #   echo "$something" | sed 's/\\/\\\\/g'
++  #
++  # So, first we look for a working echo in the user's PATH.
++
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for dir in $PATH /usr/ucb; do
++    IFS="$lt_save_ifs"
++    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
++       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
++       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
++       test "X$echo_testing_string" = "X$echo_test_string"; then
++      echo="$dir/echo"
++      break
++    fi
++  done
++  IFS="$lt_save_ifs"
++
++  if test "X$echo" = Xecho; then
++    # We didn't find a better echo, so look for alternatives.
++    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
++       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
++       test "X$echo_testing_string" = "X$echo_test_string"; then
++      # This shell has a builtin print -r that does the trick.
++      echo='print -r'
++    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
++	 test "X$CONFIG_SHELL" != X/bin/ksh; then
++      # If we have ksh, try running configure again with it.
++      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
++      export ORIGINAL_CONFIG_SHELL
++      CONFIG_SHELL=/bin/ksh
++      export CONFIG_SHELL
++      exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
++    else
++      # Try using printf.
++      echo='printf %s\n'
++      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++	 test "X$echo_testing_string" = "X$echo_test_string"; then
++	# Cool, printf works
++	:
++      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
++	   test "X$echo_testing_string" = 'X\t' &&
++	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
++	export CONFIG_SHELL
++	SHELL="$CONFIG_SHELL"
++	export SHELL
++	echo="$CONFIG_SHELL $0 --fallback-echo"
++      elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
++	   test "X$echo_testing_string" = 'X\t' &&
++	   echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	echo="$CONFIG_SHELL $0 --fallback-echo"
++      else
++	# maybe with a smaller string...
++	prev=:
++
++	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
++	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
++	  then
++	    break
++	  fi
++	  prev="$cmd"
++	done
++
++	if test "$prev" != 'sed 50q "$0"'; then
++	  echo_test_string=`eval $prev`
++	  export echo_test_string
++	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
++	else
++	  # Oops.  We lost completely, so just stick with echo.
++	  echo=echo
++	fi
++      fi
++    fi
++  fi
++fi
++fi
++
++# Copy echo and quote the copy suitably for passing to libtool from
++# the Makefile, instead of quoting the original, which is used later.
++ECHO=$echo
++if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
++   ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
++fi
++
++
++
++
++tagnames=${tagnames+${tagnames},}CXX
++
++tagnames=${tagnames+${tagnames},}F77
++
++# Name of the host.
++# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
++# so uname gets run too.
++ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
++
++exec 6>&1
++
++#
++# Initializations.
++#
++ac_default_prefix=/usr/local
++ac_config_libobj_dir=.
++cross_compiling=no
++subdirs=
++MFLAGS=
++MAKEFLAGS=
++SHELL=${CONFIG_SHELL-/bin/sh}
++
++# Maximum number of lines to put in a shell here document.
++# This variable seems obsolete.  It should probably be removed, and
++# only ac_max_sed_lines should be used.
++: ${ac_max_here_lines=38}
++
++# Identity of this package.
++PACKAGE_NAME=
++PACKAGE_TARNAME=
++PACKAGE_VERSION=
++PACKAGE_STRING=
++PACKAGE_BUGREPORT=
++
++ac_unique_file="src/a52dec.c"
++# Factoring default headers for most tests.
++ac_includes_default="\
++#include <stdio.h>
++#if HAVE_SYS_TYPES_H
++# include <sys/types.h>
++#endif
++#if HAVE_SYS_STAT_H
++# include <sys/stat.h>
++#endif
++#if STDC_HEADERS
++# include <stdlib.h>
++# include <stddef.h>
++#else
++# if HAVE_STDLIB_H
++#  include <stdlib.h>
++# endif
++#endif
++#if HAVE_STRING_H
++# if !STDC_HEADERS && HAVE_MEMORY_H
++#  include <memory.h>
++# endif
++# include <string.h>
++#endif
++#if HAVE_STRINGS_H
++# include <strings.h>
++#endif
++#if HAVE_INTTYPES_H
++# include <inttypes.h>
++#else
++# if HAVE_STDINT_H
++#  include <stdint.h>
++# endif
++#endif
++#if HAVE_UNISTD_H
++# include <unistd.h>
++#endif"
++
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INCLUDES LIBA52_CFLAGS LIBA52_LIBS LIBAO_LIBS A52DEC_CFLAGS LIB@&t@OBJS LTLIBOBJS'
++ac_subst_files=''
++
++# Initialize some variables set by options.
++ac_init_help=
++ac_init_version=false
++# The variables have the same names as the options, with
++# dashes changed to underlines.
++cache_file=/dev/null
++exec_prefix=NONE
++no_create=
++no_recursion=
++prefix=NONE
++program_prefix=NONE
++program_suffix=NONE
++program_transform_name=s,x,x,
++silent=
++site=
++srcdir=
++verbose=
++x_includes=NONE
++x_libraries=NONE
++
++# Installation directory options.
++# These are left unexpanded so users can "make install exec_prefix=/foo"
++# and all the variables that are supposed to be based on exec_prefix
++# by default will actually change.
++# Use braces instead of parens because sh, perl, etc. also accept them.
++bindir='${exec_prefix}/bin'
++sbindir='${exec_prefix}/sbin'
++libexecdir='${exec_prefix}/libexec'
++datadir='${prefix}/share'
++sysconfdir='${prefix}/etc'
++sharedstatedir='${prefix}/com'
++localstatedir='${prefix}/var'
++libdir='${exec_prefix}/lib'
++includedir='${prefix}/include'
++oldincludedir='/usr/include'
++infodir='${prefix}/info'
++mandir='${prefix}/man'
++
++ac_prev=
++for ac_option
++do
++  # If the previous option needs an argument, assign it.
++  if test -n "$ac_prev"; then
++    eval "$ac_prev=\$ac_option"
++    ac_prev=
++    continue
++  fi
++
++  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
++
++  # Accept the important Cygnus configure options, so we can diagnose typos.
++
++  case $ac_option in
++
++  -bindir | --bindir | --bindi | --bind | --bin | --bi)
++    ac_prev=bindir ;;
++  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
++    bindir=$ac_optarg ;;
++
++  -build | --build | --buil | --bui | --bu)
++    ac_prev=build_alias ;;
++  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
++    build_alias=$ac_optarg ;;
++
++  -cache-file | --cache-file | --cache-fil | --cache-fi \
++  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
++    ac_prev=cache_file ;;
++  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
++  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
++    cache_file=$ac_optarg ;;
++
++  --config-cache | -C)
++    cache_file=config.cache ;;
++
++  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
++    ac_prev=datadir ;;
++  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
++  | --da=*)
++    datadir=$ac_optarg ;;
++
++  -disable-* | --disable-*)
++    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
++    # Reject names that are not valid shell variable names.
++    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
++   { (exit 1); exit 1; }; }
++    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
++    eval "enable_$ac_feature=no" ;;
++
++  -enable-* | --enable-*)
++    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
++    # Reject names that are not valid shell variable names.
++    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
++   { (exit 1); exit 1; }; }
++    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
++    case $ac_option in
++      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
++      *) ac_optarg=yes ;;
++    esac
++    eval "enable_$ac_feature='$ac_optarg'" ;;
++
++  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
++  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
++  | --exec | --exe | --ex)
++    ac_prev=exec_prefix ;;
++  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
++  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
++  | --exec=* | --exe=* | --ex=*)
++    exec_prefix=$ac_optarg ;;
++
++  -gas | --gas | --ga | --g)
++    # Obsolete; use --with-gas.
++    with_gas=yes ;;
++
++  -help | --help | --hel | --he | -h)
++    ac_init_help=long ;;
++  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
++    ac_init_help=recursive ;;
++  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
++    ac_init_help=short ;;
++
++  -host | --host | --hos | --ho)
++    ac_prev=host_alias ;;
++  -host=* | --host=* | --hos=* | --ho=*)
++    host_alias=$ac_optarg ;;
++
++  -includedir | --includedir | --includedi | --included | --include \
++  | --includ | --inclu | --incl | --inc)
++    ac_prev=includedir ;;
++  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
++  | --includ=* | --inclu=* | --incl=* | --inc=*)
++    includedir=$ac_optarg ;;
++
++  -infodir | --infodir | --infodi | --infod | --info | --inf)
++    ac_prev=infodir ;;
++  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
++    infodir=$ac_optarg ;;
++
++  -libdir | --libdir | --libdi | --libd)
++    ac_prev=libdir ;;
++  -libdir=* | --libdir=* | --libdi=* | --libd=*)
++    libdir=$ac_optarg ;;
++
++  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
++  | --libexe | --libex | --libe)
++    ac_prev=libexecdir ;;
++  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
++  | --libexe=* | --libex=* | --libe=*)
++    libexecdir=$ac_optarg ;;
++
++  -localstatedir | --localstatedir | --localstatedi | --localstated \
++  | --localstate | --localstat | --localsta | --localst \
++  | --locals | --local | --loca | --loc | --lo)
++    ac_prev=localstatedir ;;
++  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
++  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
++  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
++    localstatedir=$ac_optarg ;;
++
++  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
++    ac_prev=mandir ;;
++  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
++    mandir=$ac_optarg ;;
++
++  -nfp | --nfp | --nf)
++    # Obsolete; use --without-fp.
++    with_fp=no ;;
++
++  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
++  | --no-cr | --no-c | -n)
++    no_create=yes ;;
++
++  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
++  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
++    no_recursion=yes ;;
++
++  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
++  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
++  | --oldin | --oldi | --old | --ol | --o)
++    ac_prev=oldincludedir ;;
++  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
++  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
++  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
++    oldincludedir=$ac_optarg ;;
++
++  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
++    ac_prev=prefix ;;
++  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
++    prefix=$ac_optarg ;;
++
++  -program-prefix | --program-prefix | --program-prefi | --program-pref \
++  | --program-pre | --program-pr | --program-p)
++    ac_prev=program_prefix ;;
++  -program-prefix=* | --program-prefix=* | --program-prefi=* \
++  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
++    program_prefix=$ac_optarg ;;
++
++  -program-suffix | --program-suffix | --program-suffi | --program-suff \
++  | --program-suf | --program-su | --program-s)
++    ac_prev=program_suffix ;;
++  -program-suffix=* | --program-suffix=* | --program-suffi=* \
++  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
++    program_suffix=$ac_optarg ;;
++
++  -program-transform-name | --program-transform-name \
++  | --program-transform-nam | --program-transform-na \
++  | --program-transform-n | --program-transform- \
++  | --program-transform | --program-transfor \
++  | --program-transfo | --program-transf \
++  | --program-trans | --program-tran \
++  | --progr-tra | --program-tr | --program-t)
++    ac_prev=program_transform_name ;;
++  -program-transform-name=* | --program-transform-name=* \
++  | --program-transform-nam=* | --program-transform-na=* \
++  | --program-transform-n=* | --program-transform-=* \
++  | --program-transform=* | --program-transfor=* \
++  | --program-transfo=* | --program-transf=* \
++  | --program-trans=* | --program-tran=* \
++  | --progr-tra=* | --program-tr=* | --program-t=*)
++    program_transform_name=$ac_optarg ;;
++
++  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
++  | -silent | --silent | --silen | --sile | --sil)
++    silent=yes ;;
++
++  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
++    ac_prev=sbindir ;;
++  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
++  | --sbi=* | --sb=*)
++    sbindir=$ac_optarg ;;
++
++  -sharedstatedir | --sharedstatedir | --sharedstatedi \
++  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
++  | --sharedst | --shareds | --shared | --share | --shar \
++  | --sha | --sh)
++    ac_prev=sharedstatedir ;;
++  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
++  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
++  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
++  | --sha=* | --sh=*)
++    sharedstatedir=$ac_optarg ;;
++
++  -site | --site | --sit)
++    ac_prev=site ;;
++  -site=* | --site=* | --sit=*)
++    site=$ac_optarg ;;
++
++  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
++    ac_prev=srcdir ;;
++  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
++    srcdir=$ac_optarg ;;
++
++  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
++  | --syscon | --sysco | --sysc | --sys | --sy)
++    ac_prev=sysconfdir ;;
++  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
++  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
++    sysconfdir=$ac_optarg ;;
++
++  -target | --target | --targe | --targ | --tar | --ta | --t)
++    ac_prev=target_alias ;;
++  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
++    target_alias=$ac_optarg ;;
++
++  -v | -verbose | --verbose | --verbos | --verbo | --verb)
++    verbose=yes ;;
++
++  -version | --version | --versio | --versi | --vers | -V)
++    ac_init_version=: ;;
++
++  -with-* | --with-*)
++    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
++    # Reject names that are not valid shell variable names.
++    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid package name: $ac_package" >&2
++   { (exit 1); exit 1; }; }
++    ac_package=`echo $ac_package| sed 's/-/_/g'`
++    case $ac_option in
++      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
++      *) ac_optarg=yes ;;
++    esac
++    eval "with_$ac_package='$ac_optarg'" ;;
++
++  -without-* | --without-*)
++    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
++    # Reject names that are not valid shell variable names.
++    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid package name: $ac_package" >&2
++   { (exit 1); exit 1; }; }
++    ac_package=`echo $ac_package | sed 's/-/_/g'`
++    eval "with_$ac_package=no" ;;
++
++  --x)
++    # Obsolete; use --with-x.
++    with_x=yes ;;
++
++  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
++  | --x-incl | --x-inc | --x-in | --x-i)
++    ac_prev=x_includes ;;
++  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
++  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
++    x_includes=$ac_optarg ;;
++
++  -x-libraries | --x-libraries | --x-librarie | --x-librari \
++  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
++    ac_prev=x_libraries ;;
++  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
++  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
++    x_libraries=$ac_optarg ;;
++
++  -*) { echo "$as_me: error: unrecognized option: $ac_option
++Try \`$0 --help' for more information." >&2
++   { (exit 1); exit 1; }; }
++    ;;
++
++  *=*)
++    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 &&
++      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
++   { (exit 1); exit 1; }; }
++    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
++    eval "$ac_envvar='$ac_optarg'"
++    export $ac_envvar ;;
++
++  *)
++    # FIXME: should be removed in autoconf 3.0.
++    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
++    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
++      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
++    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
++    ;;
++
++  esac
++done
++
++if test -n "$ac_prev"; then
++  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
++  { echo "$as_me: error: missing argument to $ac_option" >&2
++   { (exit 1); exit 1; }; }
++fi
++
++# Be sure to have absolute paths.
++for ac_var in exec_prefix prefix
++do
++  eval ac_val=$`echo $ac_var`
++  case $ac_val in
++    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
++    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
++   { (exit 1); exit 1; }; };;
++  esac
++done
++
++# Be sure to have absolute paths.
++for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
++	      localstatedir libdir includedir oldincludedir infodir mandir
++do
++  eval ac_val=$`echo $ac_var`
++  case $ac_val in
++    [\\/$]* | ?:[\\/]* ) ;;
++    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
++   { (exit 1); exit 1; }; };;
++  esac
++done
++
++# There might be people who depend on the old broken behavior: `$host'
++# used to hold the argument of --host etc.
++# FIXME: To remove some day.
++build=$build_alias
++host=$host_alias
++target=$target_alias
++
++# FIXME: To remove some day.
++if test "x$host_alias" != x; then
++  if test "x$build_alias" = x; then
++    cross_compiling=maybe
++    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
++  fi
++fi
++
++ac_tool_prefix=
++test -n "$host_alias" && ac_tool_prefix=$host_alias-
++
++test "$silent" = yes && exec 6>/dev/null
++
++
++# Find the source files, if location was not specified.
++if test -z "$srcdir"; then
++  ac_srcdir_defaulted=yes
++  # Try the directory containing this script, then its parent.
++  ac_confdir=`(dirname "$0") 2>/dev/null ||
++$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; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++  srcdir=$ac_confdir
++  if test ! -r $srcdir/$ac_unique_file; then
++    srcdir=..
++  fi
++else
++  ac_srcdir_defaulted=no
++fi
++if test ! -r $srcdir/$ac_unique_file; then
++  if test "$ac_srcdir_defaulted" = yes; then
++    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
++   { (exit 1); exit 1; }; }
++  else
++    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
++   { (exit 1); exit 1; }; }
++  fi
++fi
++(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
++  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
++   { (exit 1); exit 1; }; }
++srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
++ac_env_build_alias_set=${build_alias+set}
++ac_env_build_alias_value=$build_alias
++ac_cv_env_build_alias_set=${build_alias+set}
++ac_cv_env_build_alias_value=$build_alias
++ac_env_host_alias_set=${host_alias+set}
++ac_env_host_alias_value=$host_alias
++ac_cv_env_host_alias_set=${host_alias+set}
++ac_cv_env_host_alias_value=$host_alias
++ac_env_target_alias_set=${target_alias+set}
++ac_env_target_alias_value=$target_alias
++ac_cv_env_target_alias_set=${target_alias+set}
++ac_cv_env_target_alias_value=$target_alias
++ac_env_CC_set=${CC+set}
++ac_env_CC_value=$CC
++ac_cv_env_CC_set=${CC+set}
++ac_cv_env_CC_value=$CC
++ac_env_CFLAGS_set=${CFLAGS+set}
++ac_env_CFLAGS_value=$CFLAGS
++ac_cv_env_CFLAGS_set=${CFLAGS+set}
++ac_cv_env_CFLAGS_value=$CFLAGS
++ac_env_LDFLAGS_set=${LDFLAGS+set}
++ac_env_LDFLAGS_value=$LDFLAGS
++ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
++ac_cv_env_LDFLAGS_value=$LDFLAGS
++ac_env_CPPFLAGS_set=${CPPFLAGS+set}
++ac_env_CPPFLAGS_value=$CPPFLAGS
++ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
++ac_cv_env_CPPFLAGS_value=$CPPFLAGS
++ac_env_CPP_set=${CPP+set}
++ac_env_CPP_value=$CPP
++ac_cv_env_CPP_set=${CPP+set}
++ac_cv_env_CPP_value=$CPP
++ac_env_CXX_set=${CXX+set}
++ac_env_CXX_value=$CXX
++ac_cv_env_CXX_set=${CXX+set}
++ac_cv_env_CXX_value=$CXX
++ac_env_CXXFLAGS_set=${CXXFLAGS+set}
++ac_env_CXXFLAGS_value=$CXXFLAGS
++ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
++ac_cv_env_CXXFLAGS_value=$CXXFLAGS
++ac_env_CXXCPP_set=${CXXCPP+set}
++ac_env_CXXCPP_value=$CXXCPP
++ac_cv_env_CXXCPP_set=${CXXCPP+set}
++ac_cv_env_CXXCPP_value=$CXXCPP
++ac_env_F77_set=${F77+set}
++ac_env_F77_value=$F77
++ac_cv_env_F77_set=${F77+set}
++ac_cv_env_F77_value=$F77
++ac_env_FFLAGS_set=${FFLAGS+set}
++ac_env_FFLAGS_value=$FFLAGS
++ac_cv_env_FFLAGS_set=${FFLAGS+set}
++ac_cv_env_FFLAGS_value=$FFLAGS
++
++#
++# Report the --help message.
++#
++if test "$ac_init_help" = "long"; then
++  # Omit some internal or obsolete options to make the list less imposing.
++  # This message is too long to be a string in the A/UX 3.1 sh.
++  cat <<_ACEOF
++\`configure' configures this package to adapt to many kinds of systems.
++
++Usage: $0 [OPTION]... [VAR=VALUE]...
++
++To assign environment variables (e.g., CC, CFLAGS...), specify them as
++VAR=VALUE.  See below for descriptions of some of the useful variables.
++
++Defaults for the options are specified in brackets.
++
++Configuration:
++  -h, --help              display this help and exit
++      --help=short        display options specific to this package
++      --help=recursive    display the short help of all the included packages
++  -V, --version           display version information and exit
++  -q, --quiet, --silent   do not print \`checking...' messages
++      --cache-file=FILE   cache test results in FILE [disabled]
++  -C, --config-cache      alias for \`--cache-file=config.cache'
++  -n, --no-create         do not create output files
++      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
++
++_ACEOF
++
++  cat <<_ACEOF
++Installation directories:
++  --prefix=PREFIX         install architecture-independent files in PREFIX
++			  [$ac_default_prefix]
++  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
++			  [PREFIX]
++
++By default, \`make install' will install all the files in
++\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
++an installation prefix other than \`$ac_default_prefix' using \`--prefix',
++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]
++  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
++  --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]
++  --infodir=DIR          info documentation [PREFIX/info]
++  --mandir=DIR           man documentation [PREFIX/man]
++_ACEOF
++
++  cat <<\_ACEOF
++
++Program names:
++  --program-prefix=PREFIX            prepend PREFIX to installed program names
++  --program-suffix=SUFFIX            append SUFFIX to installed program names
++  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
++
++System types:
++  --build=BUILD     configure for building on BUILD [guessed]
++  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
++_ACEOF
++fi
++
++if test -n "$ac_init_help"; then
++
++  cat <<\_ACEOF
++
++Optional Features:
++  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
++  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
++  --enable-maintainer-mode  enable make rules and dependencies not useful
++			  (and sometimes confusing) to the casual installer
++  --disable-dependency-tracking  speeds up one-time build
++  --enable-dependency-tracking   do not reject slow dependency extractors
++  --enable-shared@<:@=PKGS@:>@ 
++                          build shared libraries @<:@default=no@:>@
++  --enable-static@<:@=PKGS@:>@ 
++                          build static libraries @<:@default=yes@:>@
++  --enable-fast-install@<:@=PKGS@:>@ 
++                          optimize for fast installation @<:@default=yes@:>@
++  --disable-libtool-lock  avoid locking (might break parallel builds)
++  --enable-double         use double-precision samples
++  --enable-djbfft         make a version using djbfft
++  --disable-oss           make a version not using oss
++  --disable-solaris-audio make a version not using solaris audio
++  --disable-al-audio      make a version not using al audio
++  --disable-win           make a version not using win audio
++  --enable-warnings       treat warnings as errors
++  --enable-gprof          make a version using gprof
++
++Optional Packages:
++  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
++  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
++  --with-gnu-ld           assume the C compiler uses GNU ld @<:@default=no@:>@
++  --with-pic              try to use only PIC/non-PIC objects @<:@default=use
++                          both@:>@
++  --with-tags@<:@=TAGS@:>@ 
++                          include additional configurations @<:@automatic@:>@
++
++Some influential environment variables:
++  CC          C compiler command
++  CFLAGS      C compiler flags
++  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
++              nonstandard directory <lib dir>
++  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
++              headers in a nonstandard directory <include dir>
++  CPP         C preprocessor
++  CXX         C++ compiler command
++  CXXFLAGS    C++ compiler flags
++  CXXCPP      C++ preprocessor
++  F77         Fortran 77 compiler command
++  FFLAGS      Fortran 77 compiler flags
++
++Use these variables to override the choices made by `configure' or to help
++it to find libraries and programs with nonstandard names/locations.
++
++_ACEOF
++fi
++
++if test "$ac_init_help" = "recursive"; then
++  # If there are subdirs, report their specific --help.
++  ac_popdir=`pwd`
++  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
++    test -d $ac_dir || continue
++    ac_builddir=.
++
++if test "$ac_dir" != .; then
++  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
++  # A "../" for each directory in $ac_dir_suffix.
++  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
++else
++  ac_dir_suffix= ac_top_builddir=
++fi
++
++case $srcdir in
++  .)  # No --srcdir option.  We are building in place.
++    ac_srcdir=.
++    if test -z "$ac_top_builddir"; then
++       ac_top_srcdir=.
++    else
++       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
++    fi ;;
++  [\\/]* | ?:[\\/]* )  # Absolute path.
++    ac_srcdir=$srcdir$ac_dir_suffix;
++    ac_top_srcdir=$srcdir ;;
++  *) # Relative path.
++    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
++    ac_top_srcdir=$ac_top_builddir$srcdir ;;
++esac
++
++# Do not use `cd foo && pwd` to compute absolute paths, because
++# the directories may not exist.
++case `pwd` in
++.) ac_abs_builddir="$ac_dir";;
++*)
++  case "$ac_dir" in
++  .) ac_abs_builddir=`pwd`;;
++  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
++  *) ac_abs_builddir=`pwd`/"$ac_dir";;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_builddir=${ac_top_builddir}.;;
++*)
++  case ${ac_top_builddir}. in
++  .) ac_abs_top_builddir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
++  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_srcdir=$ac_srcdir;;
++*)
++  case $ac_srcdir in
++  .) ac_abs_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
++  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_srcdir=$ac_top_srcdir;;
++*)
++  case $ac_top_srcdir in
++  .) ac_abs_top_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
++  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
++  esac;;
++esac
++
++    cd $ac_dir
++    # Check for guested configure; otherwise get Cygnus style configure.
++    if test -f $ac_srcdir/configure.gnu; then
++      echo
++      $SHELL $ac_srcdir/configure.gnu  --help=recursive
++    elif test -f $ac_srcdir/configure; then
++      echo
++      $SHELL $ac_srcdir/configure  --help=recursive
++    elif test -f $ac_srcdir/configure.ac ||
++	   test -f $ac_srcdir/configure.in; then
++      echo
++      $ac_configure --help
++    else
++      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
++    fi
++    cd $ac_popdir
++  done
++fi
++
++test -n "$ac_init_help" && exit 0
++if $ac_init_version; then
++  cat <<\_ACEOF
++
++Copyright (C) 2003 Free Software Foundation, Inc.
++This configure script is free software; the Free Software Foundation
++gives unlimited permission to copy, distribute and modify it.
++_ACEOF
++  exit 0
++fi
++exec 5>config.log
++cat >&5 <<_ACEOF
++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.59.  Invocation command line was
++
++  $ $0 $@
++
++_ACEOF
++{
++cat <<_ASUNAME
++@%:@@%:@ --------- @%:@@%:@
++@%:@@%:@ Platform. @%:@@%:@
++@%:@@%:@ --------- @%:@@%:@
++
++hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
++uname -m = `(uname -m) 2>/dev/null || echo unknown`
++uname -r = `(uname -r) 2>/dev/null || echo unknown`
++uname -s = `(uname -s) 2>/dev/null || echo unknown`
++uname -v = `(uname -v) 2>/dev/null || echo unknown`
++
++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
++/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
++
++/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
++/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
++hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
++/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
++/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
++/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
++
++_ASUNAME
++
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  echo "PATH: $as_dir"
++done
++
++} >&5
++
++cat >&5 <<_ACEOF
++
++
++@%:@@%:@ ----------- @%:@@%:@
++@%:@@%:@ Core tests. @%:@@%:@
++@%:@@%:@ ----------- @%:@@%:@
++
++_ACEOF
++
++
++# Keep a trace of the command line.
++# Strip out --no-create and --no-recursion so they do not pile up.
++# Strip out --silent because we don't want to record it for future runs.
++# Also quote any args containing shell meta-characters.
++# Make two passes to allow for proper duplicate-argument suppression.
++ac_configure_args=
++ac_configure_args0=
++ac_configure_args1=
++ac_sep=
++ac_must_keep_next=false
++for ac_pass in 1 2
++do
++  for ac_arg
++  do
++    case $ac_arg in
++    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
++    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
++    | -silent | --silent | --silen | --sile | --sil)
++      continue ;;
++    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
++      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
++    esac
++    case $ac_pass in
++    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
++    2)
++      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
++      if test $ac_must_keep_next = true; then
++	ac_must_keep_next=false # Got value, back to normal.
++      else
++	case $ac_arg in
++	  *=* | --config-cache | -C | -disable-* | --disable-* \
++	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
++	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
++	  | -with-* | --with-* | -without-* | --without-* | --x)
++	    case "$ac_configure_args0 " in
++	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
++	    esac
++	    ;;
++	  -* ) ac_must_keep_next=true ;;
++	esac
++      fi
++      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
++      # Get rid of the leading space.
++      ac_sep=" "
++      ;;
++    esac
++  done
++done
++$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
++$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
++
++# When interrupted or exit'd, cleanup temporary files, and complete
++# config.log.  We remove comments because anyway the quotes in there
++# would cause problems or look ugly.
++# WARNING: Be sure not to use single quotes in there, as some shells,
++# such as our DU 5.0 friend, will then `close' the trap.
++trap 'exit_status=$?
++  # Save into config.log some information that might help in debugging.
++  {
++    echo
++
++    cat <<\_ASBOX
++@%:@@%:@ ---------------- @%:@@%:@
++@%:@@%:@ Cache variables. @%:@@%:@
++@%:@@%:@ ---------------- @%:@@%:@
++_ASBOX
++    echo
++    # The following way of writing the cache mishandles newlines in values,
++{
++  (set) 2>&1 |
++    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
++    *ac_space=\ *)
++      sed -n \
++	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
++	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
++      ;;
++    *)
++      sed -n \
++	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      ;;
++    esac;
++}
++    echo
++
++    cat <<\_ASBOX
++@%:@@%:@ ----------------- @%:@@%:@
++@%:@@%:@ Output variables. @%:@@%:@
++@%:@@%:@ ----------------- @%:@@%:@
++_ASBOX
++    echo
++    for ac_var in $ac_subst_vars
++    do
++      eval ac_val=$`echo $ac_var`
++      echo "$ac_var='"'"'$ac_val'"'"'"
++    done | sort
++    echo
++
++    if test -n "$ac_subst_files"; then
++      cat <<\_ASBOX
++@%:@@%:@ ------------- @%:@@%:@
++@%:@@%:@ Output files. @%:@@%:@
++@%:@@%:@ ------------- @%:@@%:@
++_ASBOX
++      echo
++      for ac_var in $ac_subst_files
++      do
++	eval ac_val=$`echo $ac_var`
++	echo "$ac_var='"'"'$ac_val'"'"'"
++      done | sort
++      echo
++    fi
++
++    if test -s confdefs.h; then
++      cat <<\_ASBOX
++@%:@@%:@ ----------- @%:@@%:@
++@%:@@%:@ confdefs.h. @%:@@%:@
++@%:@@%:@ ----------- @%:@@%:@
++_ASBOX
++      echo
++      sed "/^$/d" confdefs.h | sort
++      echo
++    fi
++    test "$ac_signal" != 0 &&
++      echo "$as_me: caught signal $ac_signal"
++    echo "$as_me: exit $exit_status"
++  } >&5
++  rm -f core *.core &&
++  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
++    exit $exit_status
++     ' 0
++for ac_signal in 1 2 13 15; do
++  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
++done
++ac_signal=0
++
++# confdefs.h avoids OS command line length limits that DEFS can exceed.
++rm -rf conftest* confdefs.h
++# AIX cpp loses on an empty file, so make sure it contains at least a newline.
++echo >confdefs.h
++
++# Predefined preprocessor variables.
++
++cat >>confdefs.h <<_ACEOF
++@%:@define PACKAGE_NAME "$PACKAGE_NAME"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++@%:@define PACKAGE_TARNAME "$PACKAGE_TARNAME"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++@%:@define PACKAGE_VERSION "$PACKAGE_VERSION"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++@%:@define PACKAGE_STRING "$PACKAGE_STRING"
++_ACEOF
++
++
++cat >>confdefs.h <<_ACEOF
++@%:@define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
++_ACEOF
++
++
++# Let the site file select an alternate cache file if it wants to.
++# Prefer explicitly selected file to automatically selected ones.
++if test -z "$CONFIG_SITE"; then
++  if test "x$prefix" != xNONE; then
++    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
++  else
++    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
++  fi
++fi
++for ac_site_file in $CONFIG_SITE; do
++  if test -r "$ac_site_file"; then
++    { 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
++done
++
++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
++    { 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
++  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
++echo "$as_me: creating cache $cache_file" >&6;}
++  >$cache_file
++fi
++
++# Check that the precious variables saved in the cache have kept the same
++# value.
++ac_cache_corrupted=false
++for ac_var in `(set) 2>&1 |
++	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
++  eval ac_old_set=\$ac_cv_env_${ac_var}_set
++  eval ac_new_set=\$ac_env_${ac_var}_set
++  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
++  eval ac_new_val="\$ac_env_${ac_var}_value"
++  case $ac_old_set,$ac_new_set in
++    set,)
++      { 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)
++      { 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
++	{ 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=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
++    *) ac_arg=$ac_var=$ac_new_val ;;
++    esac
++    case " $ac_configure_args " in
++      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
++      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
++    esac
++  fi
++done
++if $ac_cache_corrupted; then
++  { 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
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++ac_aux_dir=
++for ac_dir in autotools $srcdir/autotools; do
++  if test -f $ac_dir/install-sh; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/install-sh -c"
++    break
++  elif test -f $ac_dir/install.sh; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/install.sh -c"
++    break
++  elif test -f $ac_dir/shtool; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/shtool install -c"
++    break
++  fi
++done
++if test -z "$ac_aux_dir"; then
++  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in autotools $srcdir/autotools" >&5
++echo "$as_me: error: cannot find install-sh or install.sh in autotools $srcdir/autotools" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++ac_config_guess="$SHELL $ac_aux_dir/config.guess"
++ac_config_sub="$SHELL $ac_aux_dir/config.sub"
++ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
++
++                                                                                          ac_config_files="$ac_config_files Makefile autotools/Makefile include/Makefile test/Makefile doc/Makefile src/Makefile liba52/Makefile libao/Makefile vc++/Makefile"
++
++am__api_version="1.9"
++# Find a good install program.  We prefer a C program (faster),
++# so one script is as good as another.  But avoid the broken or
++# incompatible versions:
++# SysV /etc/install, /usr/sbin/install
++# SunOS /usr/etc/install
++# IRIX /sbin/install
++# AIX /bin/install
++# AmigaOS /C/install, which installs bootblocks on floppy discs
++# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
++# AFS /usr/afsws/bin/install, which mishandles nonexistent args
++# 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.
++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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  # Account for people who put trailing slashes in PATH elements.
++case $as_dir/ in
++  ./ | .// | /cC/* | \
++  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
++  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
++  /usr/ucb/* ) ;;
++  *)
++    # OSF1 and SCO ODT 3.0 have their own names for install.
++    # Don't use installbsd from OSF since it installs stuff as root
++    # by default.
++    for ac_prog in ginstall scoinst install; do
++      for ac_exec_ext in '' $ac_executable_extensions; do
++	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
++	  if test $ac_prog = install &&
++	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
++	    # AIX install.  It has an incompatible calling convention.
++	    :
++	  elif test $ac_prog = install &&
++	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
++	    # program-specific install script used by HP pwplus--don't use.
++	    :
++	  else
++	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
++	    break 3
++	  fi
++	fi
++      done
++    done
++    ;;
++esac
++done
++
++
++fi
++  if test "${ac_cv_path_install+set}" = set; then
++    INSTALL=$ac_cv_path_install
++  else
++    # As a last resort, use the slow shell script.  We don't cache a
++    # path for INSTALL within a source directory, because that will
++    # break other packages using the cache if that directory is
++    # removed, or if the path is relative.
++    INSTALL=$ac_install_sh
++  fi
++fi
++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.
++test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
++
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
++
++test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
++
++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
++# Do `set' in a subshell so we don't clobber the current shell's
++# arguments.  Must try -L first in case configure is actually a
++# symlink; some systems play weird games with the mod time of symlinks
++# (eg FreeBSD returns the mod time of the symlink's containing
++# directory).
++if (
++   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
++   if test "$*" = "X"; then
++      # -L didn't work.
++      set X `ls -t $srcdir/configure conftest.file`
++   fi
++   rm -f conftest.file
++   if test "$*" != "X $srcdir/configure conftest.file" \
++      && test "$*" != "X conftest.file $srcdir/configure"; then
++
++      # If neither matched, then we have a broken ls.  This can happen
++      # 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".
++      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
++alias in your environment" >&5
++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
++
++   test "$2" = conftest.file
++   )
++then
++   # Ok.
++   :
++else
++   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
++Check your system clock" >&5
++echo "$as_me: error: newly created file is older than distributed files!
++Check your system clock" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++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 $.  echo might interpret backslashes.
++# By default was `s,x,x', remove it if useless.
++cat <<\_ACEOF >conftest.sed
++s/[\\$]/&&/g;s/;s,x,x,$//
++_ACEOF
++program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
++rm conftest.sed
++
++# expand $ac_aux_dir to an absolute path
++am_aux_dir=`cd $ac_aux_dir && pwd`
++
++test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
++# Use eval to expand $SHELL
++if eval "$MISSING --run true"; then
++  am_missing_run="$MISSING --run "
++else
++  am_missing_run=
++  { 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
++
++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
++
++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
++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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$AWK"; then
++  ac_cv_prog_AWK="$AWK" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_AWK="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++AWK=$ac_cv_prog_AWK
++if test -n "$AWK"; then
++  echo "$as_me:$LINENO: result: $AWK" >&5
++echo "${ECHO_T}$AWK" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$AWK" && break
++done
++
++echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
++set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.make <<\_ACEOF
++all:
++	@echo 'ac_maketemp="$(MAKE)"'
++_ACEOF
++# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
++eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
++if test -n "$ac_maketemp"; then
++  eval ac_cv_prog_make_${ac_make}_set=yes
++else
++  eval ac_cv_prog_make_${ac_make}_set=no
++fi
++rm -f conftest.make
++fi
++if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++  SET_MAKE=
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++  SET_MAKE="MAKE=${MAKE-make}"
++fi
++
++rm -rf .tst 2>/dev/null
++mkdir .tst 2>/dev/null
++if test -d .tst; then
++  am__leading_dot=.
++else
++  am__leading_dot=_
++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
++  { { 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
++
++# test whether we have cygpath
++if test -z "$CYGPATH_W"; then
++  if (cygpath --version) >/dev/null 2>/dev/null; then
++    CYGPATH_W='cygpath -w'
++  else
++    CYGPATH_W=echo
++  fi
++fi
++
++
++# Define the identity of the package.
++ PACKAGE=a52dec
++ VERSION=0.7.4
++
++
++cat >>confdefs.h <<_ACEOF
++@%:@define PACKAGE "$PACKAGE"
++_ACEOF
++
++ 
++cat >>confdefs.h <<_ACEOF
++@%:@define VERSION "$VERSION"
++_ACEOF
++
++# Some tools Automake needs.
++
++ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
++
++
++AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
++
++
++AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
++
++
++AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
++
++
++MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
++
++install_sh=${install_sh-"$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
++# tool to use in cross-compilation environments, therefore Automake
++# will honor the `STRIP' environment variable to overrule this program.
++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
++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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$STRIP"; then
++  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++STRIP=$ac_cv_prog_STRIP
++if test -n "$STRIP"; then
++  echo "$as_me:$LINENO: result: $STRIP" >&5
++echo "${ECHO_T}$STRIP" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++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
++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
++  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.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_STRIP="strip"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
++fi
++fi
++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
++if test -n "$ac_ct_STRIP"; then
++  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++echo "${ECHO_T}$ac_ct_STRIP" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  STRIP=$ac_ct_STRIP
++else
++  STRIP="$ac_cv_prog_STRIP"
++fi
++
++fi
++INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
++
++# We need awk for the "check" target.  The system "awk" is bad on
++# some platforms.
++# Always define AMTAR for backward compatibility.
++
++AMTAR=${AMTAR-"${am_missing_run}tar"}
++
++am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
++
++
++
++
++
++          ac_config_headers="$ac_config_headers include/config.h"
++
++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 or --disable-maintainer-mode was given.
++if test "${enable_maintainer_mode+set}" = set; then
++  enableval="$enable_maintainer_mode"
++  USE_MAINTAINER_MODE=$enableval
++else
++  USE_MAINTAINER_MODE=no
++fi; 
++  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
++  MAINTAINER_MODE_TRUE='#'
++  MAINTAINER_MODE_FALSE=
++fi
++
++  MAINT=$MAINTAINER_MODE_TRUE
++  
++
++# Make sure we can run config.sub.
++$ac_config_sub sun4 >/dev/null 2>&1 ||
++  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
++echo "$as_me: error: cannot run $ac_config_sub" >&2;}
++   { (exit 1); exit 1; }; }
++
++echo "$as_me:$LINENO: checking build system type" >&5
++echo $ECHO_N "checking build system type... $ECHO_C" >&6
++if test "${ac_cv_build+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_build_alias=$build_alias
++test -z "$ac_cv_build_alias" &&
++  ac_cv_build_alias=`$ac_config_guess`
++test -z "$ac_cv_build_alias" &&
++  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
++echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
++   { (exit 1); exit 1; }; }
++ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
++  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
++echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
++   { (exit 1); exit 1; }; }
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_build" >&5
++echo "${ECHO_T}$ac_cv_build" >&6
++build=$ac_cv_build
++build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
++build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++
++
++echo "$as_me:$LINENO: checking host system type" >&5
++echo $ECHO_N "checking host system type... $ECHO_C" >&6
++if test "${ac_cv_host+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_host_alias=$host_alias
++test -z "$ac_cv_host_alias" &&
++  ac_cv_host_alias=$ac_cv_build_alias
++ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
++  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
++echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
++   { (exit 1); exit 1; }; }
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_host" >&5
++echo "${ECHO_T}$ac_cv_host" >&6
++host=$ac_cv_host
++host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
++host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
++host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
++
++
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
++set dummy ${ac_tool_prefix}gcc; ac_word=$2
++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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_CC="${ac_tool_prefix}gcc"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_CC"; then
++  ac_ct_CC=$CC
++  # Extract the first word of "gcc", so it can be a program name with args.
++set dummy gcc; ac_word=$2
++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
++  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.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_CC="gcc"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  CC=$ac_ct_CC
++else
++  CC="$ac_cv_prog_CC"
++fi
++
++if test -z "$CC"; then
++  if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
++set dummy ${ac_tool_prefix}cc; ac_word=$2
++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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_CC="${ac_tool_prefix}cc"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_CC"; then
++  ac_ct_CC=$CC
++  # Extract the first word of "cc", so it can be a program name with args.
++set dummy cc; ac_word=$2
++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
++  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.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_CC="cc"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  CC=$ac_ct_CC
++else
++  CC="$ac_cv_prog_CC"
++fi
++
++fi
++if test -z "$CC"; then
++  # Extract the first word of "cc", so it can be a program name with args.
++set dummy cc; ac_word=$2
++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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++  ac_prog_rejected=no
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
++       ac_prog_rejected=yes
++       continue
++     fi
++    ac_cv_prog_CC="cc"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++if test $ac_prog_rejected = yes; then
++  # We found a bogon in the path, so make sure we never use it.
++  set dummy $ac_cv_prog_CC
++  shift
++  if test $@%:@ != 0; then
++    # We chose a different compiler from the bogus one.
++    # However, it has the same basename, so the bogon will be chosen
++    # first if we set CC to just the basename; use the full file name.
++    shift
++    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
++  fi
++fi
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$CC"; then
++  if test -n "$ac_tool_prefix"; then
++  for ac_prog in cl
++  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
++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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++    test -n "$CC" && break
++  done
++fi
++if test -z "$CC"; then
++  ac_ct_CC=$CC
++  for ac_prog in cl
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++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
++  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.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_CC="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$ac_ct_CC" && break
++done
++
++  CC=$ac_ct_CC
++fi
++
++fi
++
++
++test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
++See \`config.log' for more details." >&5
++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.
++echo "$as_me:$LINENO:" \
++     "checking for C compiler version" >&5
++ac_compiler=`set X $ac_compile; echo $2`
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
++  (eval $ac_compiler --version </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
++  (eval $ac_compiler -v </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
++  (eval $ac_compiler -V </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++ac_clean_files_save=$ac_clean_files
++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.
++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[^ ]*//'`
++if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
++  (eval $ac_link_default) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  # Find the output, starting from the most likely.  This scheme is
++# not robust to junk in `.', hence go to wildcards (a.*) only as a last
++# resort.
++
++# Be careful to initialize this variable, since it used to be cached.
++# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
++ac_cv_exeext=
++# b.out is created by i960 compilers.
++for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
++do
++  test -f "$ac_file" || continue
++  case $ac_file in
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
++	;;
++    conftest.$ac_ext )
++	# This is the source file.
++	;;
++    [ab].out )
++	# We found the default executable, but exeext='' is most
++	# certainly right.
++	break;;
++    *.* )
++	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++	# FIXME: I believe we export ac_cv_exeext for Libtool,
++	# but it would be cool to find out if it's true.  Does anybody
++	# maintain Libtool? --akim.
++	export ac_cv_exeext
++	break;;
++    * )
++	break;;
++  esac
++done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
++See \`config.log' for more details." >&5
++echo "$as_me: error: C compiler cannot create executables
++See \`config.log' for more details." >&2;}
++   { (exit 77); exit 77; }; }
++fi
++
++ac_exeext=$ac_cv_exeext
++echo "$as_me:$LINENO: result: $ac_file" >&5
++echo "${ECHO_T}$ac_file" >&6
++
++# Check the compiler produces executables we can run.  If not, either
++# the compiler is broken, or we cross compile.
++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
++  if { ac_try='./$ac_file'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  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
++	{ { 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
++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
++echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++
++rm -f a.out a.exe conftest$ac_cv_exeext b.out
++ac_clean_files=$ac_clean_files_save
++# Check the compiler produces executables we can run.  If not, either
++# the compiler is broken, or we cross compile.
++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
++
++echo "$as_me:$LINENO: checking for suffix of executables" >&5
++echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  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
++# work properly (i.e., refer to `conftest.exe'), while it won't with
++# `rm'.
++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 | *.o | *.obj ) ;;
++    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++	  export ac_cv_exeext
++	  break;;
++    * ) break;;
++  esac
++done
++else
++  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details." >&5
++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
++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
++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
++  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.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.o conftest.obj
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
++  case $ac_file in
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
++    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
++       break;;
++  esac
++done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
++See \`config.log' for more details." >&5
++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
++echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
++echo "${ECHO_T}$ac_cv_objext" >&6
++OBJEXT=$ac_cv_objext
++ac_objext=$OBJEXT
++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
++  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.  */
++
++int
++main ()
++{
++#ifndef __GNUC__
++       choke me
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_compiler_gnu=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_compiler_gnu=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_c_compiler_gnu=$ac_compiler_gnu
++
++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
++CFLAGS="-g"
++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
++  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.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_prog_cc_g=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_prog_cc_g=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++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
++  if test "$GCC" = yes; then
++    CFLAGS="-g -O2"
++  else
++    CFLAGS="-g"
++  fi
++else
++  if test "$GCC" = yes; then
++    CFLAGS="-O2"
++  else
++    CFLAGS=
++  fi
++fi
++echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
++echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
++if test "${ac_cv_prog_cc_stdc+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_prog_cc_stdc=no
++ac_save_CC=$CC
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdarg.h>
++#include <stdio.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
++struct buf { int x; };
++FILE * (*rcsopen) (struct buf *, struct stat *, int);
++static char *e (p, i)
++     char **p;
++     int i;
++{
++  return p[i];
++}
++static char *f (char * (*g) (char **, int), char **p, ...)
++{
++  char *s;
++  va_list v;
++  va_start (v,p);
++  s = g (p, va_arg (v,int));
++  va_end (v);
++  return s;
++}
++
++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
++   function prototypes and stuff, but not '\xHH' hex character constants.
++   These don't provoke an error unfortunately, instead are silently treated
++   as 'x'.  The following induces an error, until -std1 is added to get
++   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
++   array size at least.  It's necessary to write '\x00'==0 to get something
++   that's true only with -std1.  */
++int osf4_cc_array ['\x00' == 0 ? 1 : -1];
++
++int test (int i, double x);
++struct s1 {int (*f) (int a);};
++struct s2 {int (*f) (double a);};
++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
++int argc;
++char **argv;
++int
++main ()
++{
++return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
++  ;
++  return 0;
++}
++_ACEOF
++# Don't try gcc -ansi; that turns off useful extensions and
++# breaks some systems' header files.
++# AIX			-qlanglvl=ansi
++# Ultrix and OSF/1	-std1
++# HP-UX 10.20 and later	-Ae
++# HP-UX older versions	-Aa -D_HPUX_SOURCE
++# SVR4			-Xc -D__EXTENSIONS__
++for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
++do
++  CC="$ac_save_CC $ac_arg"
++  rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_prog_cc_stdc=$ac_arg
++break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext 
++done
++rm -f conftest.$ac_ext conftest.$ac_objext
++CC=$ac_save_CC
++
++fi
++
++case "x$ac_cv_prog_cc_stdc" in
++  x|xno)
++    echo "$as_me:$LINENO: result: none needed" >&5
++echo "${ECHO_T}none needed" >&6 ;;
++  *)
++    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
++    CC="$CC $ac_cv_prog_cc_stdc" ;;
++esac
++
++# Some people use a C++ compiler to compile C.  Since we use `exit',
++# in C++ we need to declare it.  In case someone uses the same compiler
++# for both compiling C and C++ we need to have the C++ compiler decide
++# the declaration of exit, since it's the most demanding environment.
++cat >conftest.$ac_ext <<_ACEOF
++@%:@ifndef __cplusplus
++  choke me
++@%:@endif
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  for ac_declaration in \
++   '' \
++   'extern "C" void std::exit (int) throw (); using std::exit;' \
++   'extern "C" void std::exit (int); using std::exit;' \
++   'extern "C" void exit (int) throw ();' \
++   'extern "C" void exit (int);' \
++   'void exit (int);'
++do
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_declaration
++@%:@include <stdlib.h>
++int
++main ()
++{
++exit (42);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++continue
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_declaration
++int
++main ()
++{
++exit (42);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++rm -f conftest*
++if test -n "$ac_declaration"; then
++  echo '#ifdef __cplusplus' >>confdefs.h
++  echo $ac_declaration      >>confdefs.h
++  echo '#endif'             >>confdefs.h
++fi
++
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++DEPDIR="${am__leading_dot}deps"
++
++          ac_config_commands="$ac_config_commands depfiles"
++
++
++am_make=${MAKE-make}
++cat > confinc << 'END'
++am__doit:
++	@echo done
++.PHONY: am__doit
++END
++# If we don't find an include directive, just comment out the code.
++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
++# First try GNU make style include.
++echo "include confinc" > confmf
++# We grep out `Entering directory' and `Leaving directory'
++# messages which can occur if `w' ends up in MAKEFLAGS.
++# In particular we don't look at `^make:' because GNU make might
++# be invoked under some other name (usually "gmake"), in which
++# case it prints its new name instead of `make'.
++if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
++   am__include=include
++   am__quote=
++   _am_result=GNU
++fi
++# Now try BSD make style include.
++if test "$am__include" = "#"; then
++   echo '.include "confinc"' > confmf
++   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
++      am__include=.include
++      am__quote="\""
++      _am_result=BSD
++   fi
++fi
++
++
++echo "$as_me:$LINENO: result: $_am_result" >&5
++echo "${ECHO_T}$_am_result" >&6
++rm -f confinc confmf
++
++# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
++if test "${enable_dependency_tracking+set}" = set; then
++  enableval="$enable_dependency_tracking"
++  
++fi; 
++if test "x$enable_dependency_tracking" != xno; then
++  am_depcomp="$ac_aux_dir/depcomp"
++  AMDEPBACKSLASH='\'
++fi
++ 
++
++if test "x$enable_dependency_tracking" != xno; then
++  AMDEP_TRUE=
++  AMDEP_FALSE='#'
++else
++  AMDEP_TRUE='#'
++  AMDEP_FALSE=
++fi
++
++
++
++
++depcc="$CC"   am_compiler_list=
++
++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
++  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
++  # making bogus files that we don't know about and never remove.  For
++  # instance it was reported that on HP-UX the gcc test will end up
++  # making a dummy file named `D' -- because `-MD' means `put the output
++  # in D'.
++  mkdir conftest.dir
++  # Copy depcomp to subdir because otherwise we won't find it if we're
++  # using a relative directory.
++  cp "$am_depcomp" conftest.dir
++  cd conftest.dir
++  # We will build objects and dependencies in a subdirectory because
++  # it helps to detect inapplicable dependency modes.  For instance
++  # both Tru64's cc and ICC support -MD to output dependencies as a
++  # side effect of compilation, but ICC will put the dependencies in
++  # the current directory while Tru64 will put them in the object
++  # directory.
++  mkdir sub
++
++  am_cv_CC_dependencies_compiler_type=none
++  if test "$am_compiler_list" = ""; then
++     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
++  fi
++  for depmode in $am_compiler_list; do
++    # Setup a source with many dependencies, because some compilers
++    # like to wrap large dependency lists on column 80 (with \), and
++    # we should not choose a depcomp mode which is confused by this.
++    #
++    # We need to recreate these files for each test, as the compiler may
++    # overwrite some of them when testing with obscure command lines.
++    # This happens at least with the AIX C compiler.
++    : > sub/conftest.c
++    for i in 1 2 3 4 5 6; do
++      echo '#include "conftst'$i'.h"' >> sub/conftest.c
++      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
++      # Solaris 8's {/usr,}/bin/sh.
++      touch sub/conftst$i.h
++    done
++    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
++
++    case $depmode in
++    nosideeffect)
++      # after this tag, mechanisms are not by side-effect, so they'll
++      # only be used when explicitly requested
++      if test "x$enable_dependency_tracking" = xyes; then
++	continue
++      else
++	break
++      fi
++      ;;
++    none) break ;;
++    esac
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.
++    if depmode=$depmode \
++       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
++       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++         >/dev/null 2>conftest.err &&
++       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
++       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
++      # icc doesn't choke on unknown options, it will just issue warnings
++      # or remarks (even with -Werror).  So we grep stderr for any message
++      # that says an option was ignored or not supported.
++      # When given -MP, icc 7.0 and 7.1 complain thusly:
++      #   icc: Command line warning: ignoring option '-M'; no argument required
++      # The diagnosis changed in icc 8.0:
++      #   icc: Command line remark: option '-MP' not supported
++      if (grep 'ignoring option' conftest.err ||
++          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
++        am_cv_CC_dependencies_compiler_type=$depmode
++        break
++      fi
++    fi
++  done
++
++  cd ..
++  rm -rf conftest.dir
++else
++  am_cv_CC_dependencies_compiler_type=none
++fi
++
++fi
++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 
++  test "x$enable_dependency_tracking" != xno \
++  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
++  am__fastdepCC_TRUE=
++  am__fastdepCC_FALSE='#'
++else
++  am__fastdepCC_TRUE='#'
++  am__fastdepCC_FALSE=
++fi
++
++
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++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
++  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"
++    do
++      ac_preproc_ok=false
++for ac_c_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@ifdef __STDC__
++@%:@ include <limits.h>
++@%:@else
++@%:@ include <assert.h>
++@%:@endif
++		     Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether non-existent headers
++  # can be detected and how.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  # Broken: success on invalid input.
++continue
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++  break
++fi
++
++    done
++    ac_cv_prog_CPP=$CPP
++  
++fi
++  CPP=$ac_cv_prog_CPP
++else
++  ac_cv_prog_CPP=$CPP
++fi
++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
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@ifdef __STDC__
++@%:@ include <limits.h>
++@%:@else
++@%:@ include <assert.h>
++@%:@endif
++		     Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether non-existent headers
++  # can be detected and how.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  # Broken: success on invalid input.
++continue
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++  :
++else
++  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." >&5
++echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
++echo "$as_me:$LINENO: checking for egrep" >&5
++echo $ECHO_N "checking for egrep... $ECHO_C" >&6
++if test "${ac_cv_prog_egrep+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
++    then ac_cv_prog_egrep='grep -E'
++    else ac_cv_prog_egrep='egrep'
++    fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
++echo "${ECHO_T}$ac_cv_prog_egrep" >&6
++ EGREP=$ac_cv_prog_egrep
++ 
++
++if test $ac_cv_c_compiler_gnu = yes; then
++    echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5
++echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
++if test "${ac_cv_prog_gcc_traditional+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++    ac_pattern="Autoconf.*'x'"
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sgtty.h>
++Autoconf TIOCGETP
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "$ac_pattern" >/dev/null 2>&1; then
++  ac_cv_prog_gcc_traditional=yes
++else
++  ac_cv_prog_gcc_traditional=no
++fi
++rm -f conftest*
++
++
++  if test $ac_cv_prog_gcc_traditional = no; then
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <termio.h>
++Autoconf TCGETA
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "$ac_pattern" >/dev/null 2>&1; then
++  ac_cv_prog_gcc_traditional=yes
++fi
++rm -f conftest*
++
++  fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5
++echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
++  if test $ac_cv_prog_gcc_traditional = yes; then
++    CC="$CC -traditional"
++  fi
++fi
++
++
++if test x"$GCC" = x"yes"; then
++
++        
++        
++    OPT_CFLAGS=`echo "$CFLAGS"|sed "s/-O[0-9]*//g"`
++    
++    OPT_CFLAGS="$OPT_CFLAGS -O3"
++    echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
++echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
++    SAVE_CFLAGS="$CFLAGS"
++    CFLAGS="$OPT_CFLAGS"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_try_cflags_ok=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_try_cflags_ok=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++    CFLAGS="$SAVE_CFLAGS"
++    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
++echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
++    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
++	CFLAGS=$OPT_CFLAGS
++    else
++	:
++    fi
++
++        OPT_CFLAGS="$CFLAGS -fomit-frame-pointer"
++    echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
++echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
++    SAVE_CFLAGS="$CFLAGS"
++    CFLAGS="$OPT_CFLAGS"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_try_cflags_ok=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_try_cflags_ok=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++    CFLAGS="$SAVE_CFLAGS"
++    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
++echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
++    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
++	CFLAGS=$OPT_CFLAGS
++    else
++	:
++    fi
++
++        case "$host" in
++    i?86-* | k?-*)
++	case "$host" in
++	i386-*) OPT_CFLAGS="$CFLAGS -mcpu=i386";;
++	i486-*) OPT_CFLAGS="$CFLAGS -mcpu=i486";;
++	i586-*) OPT_CFLAGS="$CFLAGS -mcpu=pentium";;
++	i686-*) OPT_CFLAGS="$CFLAGS -mcpu=pentiumpro";;
++	k6-*)   OPT_CFLAGS="$CFLAGS -mcpu=k6";;
++	esac
++	echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
++echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
++    SAVE_CFLAGS="$CFLAGS"
++    CFLAGS="$OPT_CFLAGS"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_try_cflags_ok=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_try_cflags_ok=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++    CFLAGS="$SAVE_CFLAGS"
++    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
++echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
++    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
++	CFLAGS=$OPT_CFLAGS
++    else
++	:
++    fi;;
++    sparc-* | sparc64-*)
++	OPT_CFLAGS="$CFLAGS -mtune=ultrasparc"
++	echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
++echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
++    SAVE_CFLAGS="$CFLAGS"
++    CFLAGS="$OPT_CFLAGS"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_try_cflags_ok=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_try_cflags_ok=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++    CFLAGS="$SAVE_CFLAGS"
++    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
++echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
++    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
++	CFLAGS=$OPT_CFLAGS
++    else
++	:
++    fi;;
++    mips-sgi-irix6.*)		OPT_CFLAGS="$CFLAGS -mabi=64"
++	echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
++echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
++    SAVE_CFLAGS="$CFLAGS"
++    CFLAGS="$OPT_CFLAGS"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_try_cflags_ok=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_try_cflags_ok=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++    CFLAGS="$SAVE_CFLAGS"
++    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
++echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
++    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
++	CFLAGS=$OPT_CFLAGS
++    else
++	:
++    fi;;
++    esac
++elif test x"$CC" = x"tcc" -a x"`$CC -version 2>&1 | grep TenDRA`" != x""; then
++        TENDRA=yes
++    CFLAGS="-Xp -Yansi -f`pwd`/include/tendra.h -DELIDE_CODE"
++    enable_mlib=no
++    enable_oss=no
++    enable_solaris_audio=no
++elif test x"$CC" = x"icc" -a x"`$CC -V 2>&1 | grep Intel`" != x""; then
++        CFLAGS="-g -O3 -unroll -ip"
++else
++        case "$host" in
++    mips-sgi-irix6.*)
++	OPT_CFLAGS="$CFLAGS -64"
++	echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
++echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
++    SAVE_CFLAGS="$CFLAGS"
++    CFLAGS="$OPT_CFLAGS"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_try_cflags_ok=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_try_cflags_ok=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++    CFLAGS="$SAVE_CFLAGS"
++    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
++echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
++    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
++	CFLAGS=$OPT_CFLAGS
++    else
++	:
++    fi;;
++    sparc-sun-solaris*)
++	OPT_CFLAGS="$CFLAGS -xCC -fast -xO5"
++	echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
++echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
++    SAVE_CFLAGS="$CFLAGS"
++    CFLAGS="$OPT_CFLAGS"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_try_cflags_ok=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_try_cflags_ok=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++    CFLAGS="$SAVE_CFLAGS"
++    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
++echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
++    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
++	CFLAGS=$OPT_CFLAGS
++    else
++	:
++    fi;;
++    esac
++fi
++
++# Check whether --enable-shared or --disable-shared was given.
++if test "${enable_shared+set}" = set; then
++  enableval="$enable_shared"
++  p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_shared=yes ;;
++    no) enable_shared=no ;;
++    *)
++      enable_shared=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_shared=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac
++else
++  enable_shared=no
++fi; 
++
++
++
++
++# Check whether --enable-static or --disable-static was given.
++if test "${enable_static+set}" = set; then
++  enableval="$enable_static"
++  p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_static=yes ;;
++    no) enable_static=no ;;
++    *)
++     enable_static=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_static=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac
++else
++  enable_static=yes
++fi; 
++
++# Check whether --enable-fast-install or --disable-fast-install was given.
++if test "${enable_fast_install+set}" = set; then
++  enableval="$enable_fast_install"
++  p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_fast_install=yes ;;
++    no) enable_fast_install=no ;;
++    *)
++      enable_fast_install=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_fast_install=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac
++else
++  enable_fast_install=yes
++fi; 
++
++echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
++echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
++if test "${lt_cv_path_SED+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  # Loop through the user's path and test for sed and gsed.
++# Then use that list of sed's as ones to test for truncation.
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for lt_ac_prog in sed gsed; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
++      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
++        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
++      fi
++    done
++  done
++done
++lt_ac_max=0
++lt_ac_count=0
++# Add /usr/xpg4/bin/sed as it is typically found on Solaris
++# along with /bin/sed that truncates output.
++for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
++  test ! -f $lt_ac_sed && break
++  cat /dev/null > conftest.in
++  lt_ac_count=0
++  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
++  # Check for GNU sed and select it if it is found.
++  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
++    lt_cv_path_SED=$lt_ac_sed
++    break
++  fi
++  while true; do
++    cat conftest.in conftest.in >conftest.tmp
++    mv conftest.tmp conftest.in
++    cp conftest.in conftest.nl
++    echo >>conftest.nl
++    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
++    cmp -s conftest.out conftest.nl || break
++    # 10000 chars as input seems more than enough
++    test $lt_ac_count -gt 10 && break
++    lt_ac_count=`expr $lt_ac_count + 1`
++    if test $lt_ac_count -gt $lt_ac_max; then
++      lt_ac_max=$lt_ac_count
++      lt_cv_path_SED=$lt_ac_sed
++    fi
++  done
++done
++
++fi
++
++SED=$lt_cv_path_SED
++echo "$as_me:$LINENO: result: $SED" >&5
++echo "${ECHO_T}$SED" >&6
++
++
++# Check whether --with-gnu-ld or --without-gnu-ld was given.
++if test "${with_gnu_ld+set}" = set; then
++  withval="$with_gnu_ld"
++  test "$withval" = no || with_gnu_ld=yes
++else
++  with_gnu_ld=no
++fi; 
++ac_prog=ld
++if test "$GCC" = yes; then
++  # Check if gcc -print-prog-name=ld gives a path.
++  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
++  case $host in
++  *-*-mingw*)
++    # gcc leaves a trailing carriage return which upsets mingw
++    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++  *)
++    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++  esac
++  case $ac_prog in
++    # Accept absolute paths.
++    [\\/]* | ?:[\\/]*)
++      re_direlt='/[^/][^/]*/\.\./'
++      # Canonicalize the pathname of ld
++      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
++      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
++      done
++      test -z "$LD" && LD="$ac_prog"
++      ;;
++  "")
++    # If it fails, then pretend we aren't using GCC.
++    ac_prog=ld
++    ;;
++  *)
++    # If it is relative, then search for the first ld in PATH.
++    with_gnu_ld=unknown
++    ;;
++  esac
++elif test "$with_gnu_ld" = yes; then
++  echo "$as_me:$LINENO: checking for GNU ld" >&5
++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
++else
++  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
++fi
++if test "${lt_cv_path_LD+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -z "$LD"; then
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
++      lt_cv_path_LD="$ac_dir/$ac_prog"
++      # Check to see if the program is GNU ld.  I'd rather use --version,
++      # but apparently some GNU ld's only accept -v.
++      # Break only if it was the GNU/non-GNU ld that we prefer.
++      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
++      *GNU* | *'with BFD'*)
++	test "$with_gnu_ld" != no && break
++	;;
++      *)
++	test "$with_gnu_ld" != yes && break
++	;;
++      esac
++    fi
++  done
++  IFS="$lt_save_ifs"
++else
++  lt_cv_path_LD="$LD" # Let the user override the test with a path.
++fi
++fi
++
++LD="$lt_cv_path_LD"
++if test -n "$LD"; then
++  echo "$as_me:$LINENO: result: $LD" >&5
++echo "${ECHO_T}$LD" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
++echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
++   { (exit 1); exit 1; }; }
++echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
++if test "${lt_cv_prog_gnu_ld+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
++case `$LD -v 2>&1 </dev/null` in
++*GNU* | *'with BFD'*)
++  lt_cv_prog_gnu_ld=yes
++  ;;
++*)
++  lt_cv_prog_gnu_ld=no
++  ;;
++esac
++fi
++echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
++with_gnu_ld=$lt_cv_prog_gnu_ld
++
++
++echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
++echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
++if test "${lt_cv_ld_reload_flag+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_ld_reload_flag='-r'
++fi
++echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
++echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
++reload_flag=$lt_cv_ld_reload_flag
++case $reload_flag in
++"" | " "*) ;;
++*) reload_flag=" $reload_flag" ;;
++esac
++reload_cmds='$LD$reload_flag -o $output$reload_objs'
++case $host_os in
++  darwin*)
++    if test "$GCC" = yes; then
++      reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
++    else
++      reload_cmds='$LD$reload_flag -o $output$reload_objs'
++    fi
++    ;;
++esac
++
++echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
++echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
++if test "${lt_cv_path_NM+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$NM"; then
++  # Let the user override the test.
++  lt_cv_path_NM="$NM"
++else
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
++    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++      # Check to see if the nm accepts a BSD-compat flag.
++      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
++      #   nm: unknown option "B" ignored
++      # Tru64's nm complains that /dev/null is an invalid object file
++      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++      */dev/null* | *'Invalid file or object type'*)
++	lt_cv_path_NM="$tmp_nm -B"
++	break
++        ;;
++      *)
++	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
++	*/dev/null*)
++	  lt_cv_path_NM="$tmp_nm -p"
++	  break
++	  ;;
++	*)
++	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++	  continue # so that we can try to find one that supports BSD flags
++	  ;;
++	esac
++      esac
++    fi
++  done
++  IFS="$lt_save_ifs"
++  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
++fi
++fi
++echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
++echo "${ECHO_T}$lt_cv_path_NM" >&6
++NM="$lt_cv_path_NM"
++
++echo "$as_me:$LINENO: checking whether ln -s works" >&5
++echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
++LN_S=$as_ln_s
++if test "$LN_S" = "ln -s"; then
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++else
++  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
++echo "${ECHO_T}no, using $LN_S" >&6
++fi
++
++echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
++echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
++if test "${lt_cv_deplibs_check_method+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_file_magic_cmd='$MAGIC_CMD'
++lt_cv_file_magic_test_file=
++lt_cv_deplibs_check_method='unknown'
++# Need to set the preceding variable on all platforms that support
++# interlibrary dependencies.
++# 'none' -- dependencies not supported.
++# `unknown' -- same as none, but documents that we really don't know.
++# 'pass_all' -- all dependencies passed with no checks.
++# 'test_compile' -- check by making test program.
++# 'file_magic [[regex]]' -- check by looking for files in library path
++# which responds to the $file_magic_cmd with a given extended regex.
++# If you have `file' or equivalent on your system and you're not sure
++# whether `pass_all' will *always* work, you probably want this one.
++
++case $host_os in
++aix4* | aix5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++beos*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++bsdi[45]*)
++  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
++  lt_cv_file_magic_cmd='/usr/bin/file -L'
++  lt_cv_file_magic_test_file=/shlib/libc.so
++  ;;
++
++cygwin*)
++  # func_win32_libid is a shell function defined in ltmain.sh
++  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++  lt_cv_file_magic_cmd='func_win32_libid'
++  ;;
++
++mingw* | pw32*)
++  # Base MSYS/MinGW do not provide the 'file' command needed by
++  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
++  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++  lt_cv_file_magic_cmd='$OBJDUMP -f'
++  ;;
++
++darwin* | rhapsody*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++freebsd* | kfreebsd*-gnu)
++  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++    case $host_cpu in
++    i*86 )
++      # Not sure whether the presence of OpenBSD here was a mistake.
++      # Let's accept both of them until this is cleared up.
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
++      lt_cv_file_magic_cmd=/usr/bin/file
++      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++      ;;
++    esac
++  else
++    lt_cv_deplibs_check_method=pass_all
++  fi
++  ;;
++
++gnu*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++hpux10.20* | hpux11*)
++  lt_cv_file_magic_cmd=/usr/bin/file
++  case "$host_cpu" in
++  ia64*)
++    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
++    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
++    ;;
++  hppa*64*)
++    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
++    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
++    ;;
++  *)
++    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
++    lt_cv_file_magic_test_file=/usr/lib/libc.sl
++    ;;
++  esac
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $LD in
++  *-32|*"-32 ") libmagic=32-bit;;
++  *-n32|*"-n32 ") libmagic=N32;;
++  *-64|*"-64 ") libmagic=64-bit;;
++  *) libmagic=never-match;;
++  esac
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++# This must be Linux ELF.
++linux*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++netbsd*)
++  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
++  else
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
++  fi
++  ;;
++
++newos6*)
++  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
++  lt_cv_file_magic_cmd=/usr/bin/file
++  lt_cv_file_magic_test_file=/usr/lib/libnls.so
++  ;;
++
++nto-qnx*)
++  lt_cv_deplibs_check_method=unknown
++  ;;
++
++openbsd*)
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
++  else
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
++  fi
++  ;;
++
++osf3* | osf4* | osf5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++sco3.2v5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++solaris*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  case $host_vendor in
++  motorola)
++    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
++    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
++    ;;
++  ncr)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  sequent)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
++    ;;
++  sni)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
++    lt_cv_file_magic_test_file=/lib/libc.so
++    ;;
++  siemens)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  esac
++  ;;
++
++sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++esac
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
++echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
++file_magic_cmd=$lt_cv_file_magic_cmd
++deplibs_check_method=$lt_cv_deplibs_check_method
++test -z "$deplibs_check_method" && deplibs_check_method=unknown
++
++
++
++
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
++
++# Allow CC to be a program name with arguments.
++compiler=$CC
++
++# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
++if test "${enable_libtool_lock+set}" = set; then
++  enableval="$enable_libtool_lock"
++  
++fi; 
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++
++# Some flags need to be propagated to the compiler or linker for good
++# libtool support.
++case $host in
++ia64-*-hpux*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++    case `/usr/bin/file conftest.$ac_objext` in
++    *ELF-32*)
++      HPUX_IA64_MODE="32"
++      ;;
++    *ELF-64*)
++      HPUX_IA64_MODE="64"
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++*-*-irix6*)
++  # Find out which ABI we are using.
++  echo '#line __oline__ "configure"' > conftest.$ac_ext
++  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++   if test "$lt_cv_prog_gnu_ld" = yes; then
++    case `/usr/bin/file conftest.$ac_objext` in
++    *32-bit*)
++      LD="${LD-ld} -melf32bsmip"
++      ;;
++    *N32*)
++      LD="${LD-ld} -melf32bmipn32"
++      ;;
++    *64-bit*)
++      LD="${LD-ld} -melf64bmip"
++      ;;
++    esac
++   else
++    case `/usr/bin/file conftest.$ac_objext` in
++    *32-bit*)
++      LD="${LD-ld} -32"
++      ;;
++    *N32*)
++      LD="${LD-ld} -n32"
++      ;;
++    *64-bit*)
++      LD="${LD-ld} -64"
++      ;;
++    esac
++   fi
++  fi
++  rm -rf conftest*
++  ;;
++
++x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++    case "`/usr/bin/file conftest.o`" in
++    *32-bit*)
++      case $host in
++        x86_64-*linux*)
++          LD="${LD-ld} -m elf_i386"
++          ;;
++        ppc64-*linux*|powerpc64-*linux*)
++          LD="${LD-ld} -m elf32ppclinux"
++          ;;
++        s390x-*linux*)
++          LD="${LD-ld} -m elf_s390"
++          ;;
++        sparc64-*linux*)
++          LD="${LD-ld} -m elf32_sparc"
++          ;;
++      esac
++      ;;
++    *64-bit*)
++      case $host in
++        x86_64-*linux*)
++          LD="${LD-ld} -m elf_x86_64"
++          ;;
++        ppc*-*linux*|powerpc*-*linux*)
++          LD="${LD-ld} -m elf64ppc"
++          ;;
++        s390*-*linux*)
++          LD="${LD-ld} -m elf64_s390"
++          ;;
++        sparc*-*linux*)
++          LD="${LD-ld} -m elf64_sparc"
++          ;;
++      esac
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++
++*-*-sco3.2v5*)
++  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
++  SAVE_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -belf"
++  echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
++echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
++if test "${lt_cv_cc_needs_belf+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++     cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  lt_cv_cc_needs_belf=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++lt_cv_cc_needs_belf=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++     ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
++echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
++  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
++    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
++    CFLAGS="$SAVE_CFLAGS"
++  fi
++  ;;
++*-*-cygwin* | *-*-mingw* | *-*-pw32*)
++  if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
++set dummy ${ac_tool_prefix}dlltool; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_DLLTOOL+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$DLLTOOL"; then
++  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++DLLTOOL=$ac_cv_prog_DLLTOOL
++if test -n "$DLLTOOL"; then
++  echo "$as_me:$LINENO: result: $DLLTOOL" >&5
++echo "${ECHO_T}$DLLTOOL" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_DLLTOOL"; then
++  ac_ct_DLLTOOL=$DLLTOOL
++  # Extract the first word of "dlltool", so it can be a program name with args.
++set dummy dlltool; ac_word=$2
++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_DLLTOOL+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_DLLTOOL"; then
++  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_prog_ac_ct_DLLTOOL" && ac_cv_prog_ac_ct_DLLTOOL="false"
++fi
++fi
++ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
++if test -n "$ac_ct_DLLTOOL"; then
++  echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
++echo "${ECHO_T}$ac_ct_DLLTOOL" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  DLLTOOL=$ac_ct_DLLTOOL
++else
++  DLLTOOL="$ac_cv_prog_DLLTOOL"
++fi
++
++  if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
++set dummy ${ac_tool_prefix}as; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_AS+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$AS"; then
++  ac_cv_prog_AS="$AS" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_AS="${ac_tool_prefix}as"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++AS=$ac_cv_prog_AS
++if test -n "$AS"; then
++  echo "$as_me:$LINENO: result: $AS" >&5
++echo "${ECHO_T}$AS" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_AS"; then
++  ac_ct_AS=$AS
++  # Extract the first word of "as", so it can be a program name with args.
++set dummy as; ac_word=$2
++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_AS+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_AS"; then
++  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_AS="as"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_prog_ac_ct_AS" && ac_cv_prog_ac_ct_AS="false"
++fi
++fi
++ac_ct_AS=$ac_cv_prog_ac_ct_AS
++if test -n "$ac_ct_AS"; then
++  echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
++echo "${ECHO_T}$ac_ct_AS" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  AS=$ac_ct_AS
++else
++  AS="$ac_cv_prog_AS"
++fi
++
++  if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
++set dummy ${ac_tool_prefix}objdump; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_OBJDUMP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$OBJDUMP"; then
++  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++OBJDUMP=$ac_cv_prog_OBJDUMP
++if test -n "$OBJDUMP"; then
++  echo "$as_me:$LINENO: result: $OBJDUMP" >&5
++echo "${ECHO_T}$OBJDUMP" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_OBJDUMP"; then
++  ac_ct_OBJDUMP=$OBJDUMP
++  # Extract the first word of "objdump", so it can be a program name with args.
++set dummy objdump; ac_word=$2
++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_OBJDUMP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_OBJDUMP"; then
++  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_OBJDUMP="objdump"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_prog_ac_ct_OBJDUMP" && ac_cv_prog_ac_ct_OBJDUMP="false"
++fi
++fi
++ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
++if test -n "$ac_ct_OBJDUMP"; then
++  echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
++echo "${ECHO_T}$ac_ct_OBJDUMP" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  OBJDUMP=$ac_ct_OBJDUMP
++else
++  OBJDUMP="$ac_cv_prog_OBJDUMP"
++fi
++
++  ;;
++  
++esac
++
++need_locks="$enable_libtool_lock"
++
++
++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
++  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.  */
++#include <stdlib.h>
++#include <stdarg.h>
++#include <string.h>
++#include <float.h>
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_header_stdc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_header_stdc=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++if test $ac_cv_header_stdc = yes; then
++  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <string.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "memchr" >/dev/null 2>&1; then
++  :
++else
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
++
++fi
++
++if test $ac_cv_header_stdc = yes; then
++  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdlib.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "free" >/dev/null 2>&1; then
++  :
++else
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
++
++fi
++
++if test $ac_cv_header_stdc = yes; then
++  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
++  if test "$cross_compiling" = yes; then
++  :
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <ctype.h>
++#if ((' ' & 0x0FF) == 0x020)
++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
++#else
++# define ISLOWER(c) \
++		   (('a' <= (c) && (c) <= 'i') \
++		     || ('j' <= (c) && (c) <= 'r') \
++		     || ('s' <= (c) && (c) <= 'z'))
++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
++#endif
++
++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
++int
++main ()
++{
++  int i;
++  for (i = 0; i < 256; i++)
++    if (XOR (islower (i), ISLOWER (i))
++	|| toupper (i) != TOUPPER (i))
++      exit(2);
++  exit (0);
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  :
++else
++  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 -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++fi
++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
++@%:@define STDC_HEADERS 1
++_ACEOF
++
++fi
++
++# On IRIX 5.3, sys/types and inttypes.h are conflicting.
++
++
++
++
++
++
++
++
++
++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
++		  inttypes.h stdint.h unistd.h
++do
++as_ac_Header=`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 eval "test \"\${$as_ac_Header+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
++
++@%:@include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_Header=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_Header=no"
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++
++done
++
++
++
++for ac_header in dlfcn.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++else
++  # Is the header compilable?
++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
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++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
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  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
++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: )
++    { 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:* )
++    { 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;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  eval "$as_ac_Header=\$ac_header_preproc"
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++
++done
++
++ac_ext=cc
++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
++if test -n "$ac_tool_prefix"; then
++  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
++  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
++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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CXX"; then
++  ac_cv_prog_CXX="$CXX" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++CXX=$ac_cv_prog_CXX
++if test -n "$CXX"; then
++  echo "$as_me:$LINENO: result: $CXX" >&5
++echo "${ECHO_T}$CXX" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++    test -n "$CXX" && break
++  done
++fi
++if test -z "$CXX"; then
++  ac_ct_CXX=$CXX
++  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++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
++  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.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_CXX="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
++if test -n "$ac_ct_CXX"; then
++  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
++echo "${ECHO_T}$ac_ct_CXX" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$ac_ct_CXX" && break
++done
++test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
++
++  CXX=$ac_ct_CXX
++fi
++
++
++# Provide some information about the compiler.
++echo "$as_me:$LINENO:" \
++     "checking for C++ compiler version" >&5
++ac_compiler=`set X $ac_compile; echo $2`
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
++  (eval $ac_compiler --version </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
++  (eval $ac_compiler -v </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
++  (eval $ac_compiler -V </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++
++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
++  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.  */
++
++int
++main ()
++{
++#ifndef __GNUC__
++       choke me
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_compiler_gnu=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_compiler_gnu=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
++
++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
++CXXFLAGS="-g"
++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
++  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.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_prog_cxx_g=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_prog_cxx_g=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++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
++  if test "$GXX" = yes; then
++    CXXFLAGS="-g -O2"
++  else
++    CXXFLAGS="-g"
++  fi
++else
++  if test "$GXX" = yes; then
++    CXXFLAGS="-O2"
++  else
++    CXXFLAGS=
++  fi
++fi
++for ac_declaration in \
++   '' \
++   'extern "C" void std::exit (int) throw (); using std::exit;' \
++   'extern "C" void std::exit (int); using std::exit;' \
++   'extern "C" void exit (int) throw ();' \
++   'extern "C" void exit (int);' \
++   'void exit (int);'
++do
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_declaration
++@%:@include <stdlib.h>
++int
++main ()
++{
++exit (42);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++continue
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_declaration
++int
++main ()
++{
++exit (42);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++rm -f conftest*
++if test -n "$ac_declaration"; then
++  echo '#ifdef __cplusplus' >>confdefs.h
++  echo $ac_declaration      >>confdefs.h
++  echo '#endif'             >>confdefs.h
++fi
++
++ac_ext=cc
++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
++
++depcc="$CXX"  am_compiler_list=
++
++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
++  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
++  # making bogus files that we don't know about and never remove.  For
++  # instance it was reported that on HP-UX the gcc test will end up
++  # making a dummy file named `D' -- because `-MD' means `put the output
++  # in D'.
++  mkdir conftest.dir
++  # Copy depcomp to subdir because otherwise we won't find it if we're
++  # using a relative directory.
++  cp "$am_depcomp" conftest.dir
++  cd conftest.dir
++  # We will build objects and dependencies in a subdirectory because
++  # it helps to detect inapplicable dependency modes.  For instance
++  # both Tru64's cc and ICC support -MD to output dependencies as a
++  # side effect of compilation, but ICC will put the dependencies in
++  # the current directory while Tru64 will put them in the object
++  # directory.
++  mkdir sub
++
++  am_cv_CXX_dependencies_compiler_type=none
++  if test "$am_compiler_list" = ""; then
++     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
++  fi
++  for depmode in $am_compiler_list; do
++    # Setup a source with many dependencies, because some compilers
++    # like to wrap large dependency lists on column 80 (with \), and
++    # we should not choose a depcomp mode which is confused by this.
++    #
++    # We need to recreate these files for each test, as the compiler may
++    # overwrite some of them when testing with obscure command lines.
++    # This happens at least with the AIX C compiler.
++    : > sub/conftest.c
++    for i in 1 2 3 4 5 6; do
++      echo '#include "conftst'$i'.h"' >> sub/conftest.c
++      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
++      # Solaris 8's {/usr,}/bin/sh.
++      touch sub/conftst$i.h
++    done
++    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
++
++    case $depmode in
++    nosideeffect)
++      # after this tag, mechanisms are not by side-effect, so they'll
++      # only be used when explicitly requested
++      if test "x$enable_dependency_tracking" = xyes; then
++	continue
++      else
++	break
++      fi
++      ;;
++    none) break ;;
++    esac
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.
++    if depmode=$depmode \
++       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
++       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++         >/dev/null 2>conftest.err &&
++       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
++       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
++      # icc doesn't choke on unknown options, it will just issue warnings
++      # or remarks (even with -Werror).  So we grep stderr for any message
++      # that says an option was ignored or not supported.
++      # When given -MP, icc 7.0 and 7.1 complain thusly:
++      #   icc: Command line warning: ignoring option '-M'; no argument required
++      # The diagnosis changed in icc 8.0:
++      #   icc: Command line remark: option '-MP' not supported
++      if (grep 'ignoring option' conftest.err ||
++          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
++        am_cv_CXX_dependencies_compiler_type=$depmode
++        break
++      fi
++    fi
++  done
++
++  cd ..
++  rm -rf conftest.dir
++else
++  am_cv_CXX_dependencies_compiler_type=none
++fi
++
++fi
++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 
++  test "x$enable_dependency_tracking" != xno \
++  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
++  am__fastdepCXX_TRUE=
++  am__fastdepCXX_FALSE='#'
++else
++  am__fastdepCXX_TRUE='#'
++  am__fastdepCXX_FALSE=
++fi
++
++
++
++
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 
++    (test "X$CXX" != "Xg++"))) ; then
++  ac_ext=cc
++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
++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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++      # Double quotes because CXXCPP needs to be expanded
++    for CXXCPP in "$CXX -E" "/lib/cpp"
++    do
++      ac_preproc_ok=false
++for ac_cxx_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@ifdef __STDC__
++@%:@ include <limits.h>
++@%:@else
++@%:@ include <assert.h>
++@%:@endif
++		     Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_cxx_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether non-existent headers
++  # can be detected and how.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_cxx_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  # Broken: success on invalid input.
++continue
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++  break
++fi
++
++    done
++    ac_cv_prog_CXXCPP=$CXXCPP
++  
++fi
++  CXXCPP=$ac_cv_prog_CXXCPP
++else
++  ac_cv_prog_CXXCPP=$CXXCPP
++fi
++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
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@ifdef __STDC__
++@%:@ include <limits.h>
++@%:@else
++@%:@ include <assert.h>
++@%:@endif
++		     Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_cxx_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether non-existent headers
++  # can be detected and how.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_cxx_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  # Broken: success on invalid input.
++continue
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++  :
++else
++  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
++See \`config.log' for more details." >&5
++echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++ac_ext=cc
++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
++
++fi
++
++
++ac_ext=f
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
++if test -n "$ac_tool_prefix"; then
++  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
++  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
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_F77+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$F77"; then
++  ac_cv_prog_F77="$F77" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++F77=$ac_cv_prog_F77
++if test -n "$F77"; then
++  echo "$as_me:$LINENO: result: $F77" >&5
++echo "${ECHO_T}$F77" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++    test -n "$F77" && break
++  done
++fi
++if test -z "$F77"; then
++  ac_ct_F77=$F77
++  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++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_F77+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_F77"; then
++  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_F77="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++ac_ct_F77=$ac_cv_prog_ac_ct_F77
++if test -n "$ac_ct_F77"; then
++  echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
++echo "${ECHO_T}$ac_ct_F77" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$ac_ct_F77" && break
++done
++
++  F77=$ac_ct_F77
++fi
++
++
++# Provide some information about the compiler.
++echo "$as_me:__oline__:" \
++     "checking for Fortran 77 compiler version" >&5
++ac_compiler=`set X $ac_compile; echo $2`
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
++  (eval $ac_compiler --version </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
++  (eval $ac_compiler -v </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
++  (eval $ac_compiler -V </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++rm -f a.out
++
++# If we don't use `.F' as extension, the preprocessor is not run on the
++# input file.  (Note that this only needs to work for GNU compilers.)
++ac_save_ext=$ac_ext
++ac_ext=F
++echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
++if test "${ac_cv_f77_compiler_gnu+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++      program main
++#ifndef __GNUC__
++       choke me
++#endif
++
++      end
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_compiler_gnu=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_compiler_gnu=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_f77_compiler_gnu=$ac_compiler_gnu
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
++ac_ext=$ac_save_ext
++ac_test_FFLAGS=${FFLAGS+set}
++ac_save_FFLAGS=$FFLAGS
++FFLAGS=
++echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
++echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
++if test "${ac_cv_prog_f77_g+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  FFLAGS=-g
++cat >conftest.$ac_ext <<_ACEOF
++      program main
++
++      end
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_prog_f77_g=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_prog_f77_g=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
++echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
++if test "$ac_test_FFLAGS" = set; then
++  FFLAGS=$ac_save_FFLAGS
++elif test $ac_cv_prog_f77_g = yes; then
++  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
++    FFLAGS="-g -O2"
++  else
++    FFLAGS="-g"
++  fi
++else
++  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
++    FFLAGS="-O2"
++  else
++    FFLAGS=
++  fi
++fi
++
++G77=`test $ac_compiler_gnu = yes && echo yes`
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
++
++# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
++
++# find the maximum length of command line arguments
++echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
++echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
++if test "${lt_cv_sys_max_cmd_len+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++    i=0
++  teststring="ABCD"
++
++  case $build_os in
++  msdosdjgpp*)
++    # On DJGPP, this test can blow up pretty badly due to problems in libc
++    # (any single argument exceeding 2000 bytes causes a buffer overrun
++    # during glob expansion).  Even if it were fixed, the result of this
++    # check would be larger than it should be.
++    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
++    ;;
++
++  gnu*)
++    # Under GNU Hurd, this test is not required because there is
++    # no limit to the length of command line arguments.
++    # Libtool will interpret -1 as no limit whatsoever
++    lt_cv_sys_max_cmd_len=-1;
++    ;;
++
++  cygwin* | mingw*)
++    # On Win9x/ME, this test blows up -- it succeeds, but takes
++    # about 5 minutes as the teststring grows exponentially.
++    # Worse, since 9x/ME are not pre-emptively multitasking,
++    # you end up with a "frozen" computer, even though with patience
++    # the test eventually succeeds (with a max line length of 256k).
++    # Instead, let's just punt: use the minimum linelength reported by
++    # all of the supported platforms: 8192 (on NT/2K/XP).
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
++
++  amigaos*)
++    # On AmigaOS with pdksh, this test takes hours, literally.
++    # So we just punt and use a minimum line length of 8192.
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
++
++  netbsd* | freebsd* | openbsd* | darwin* )
++    # This has been around since 386BSD, at least.  Likely further.
++    if test -x /sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++    elif test -x /usr/sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++    else
++      lt_cv_sys_max_cmd_len=65536 # usable default for *BSD
++    fi
++    # And add a safety zone
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++    ;;
++
++ *)
++    # If test is not a shell built-in, we'll probably end up computing a
++    # maximum length that is only half of the actual maximum length, but
++    # we can't tell.
++    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
++	       = "XX$teststring") >/dev/null 2>&1 &&
++	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
++	    lt_cv_sys_max_cmd_len=$new_result &&
++	    test $i != 17 # 1/2 MB should be enough
++    do
++      i=`expr $i + 1`
++      teststring=$teststring$teststring
++    done
++    teststring=
++    # Add a significant safety factor because C++ compilers can tack on massive
++    # amounts of additional arguments before passing them to the linker.
++    # It appears as though 1/2 is a usable value.
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++    ;;
++  esac
++
++fi
++
++if test -n $lt_cv_sys_max_cmd_len ; then
++  echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
++echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
++else
++  echo "$as_me:$LINENO: result: none" >&5
++echo "${ECHO_T}none" >&6
++fi
++
++
++
++
++# Check for command to grab the raw symbol name followed by C symbol from nm.
++echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
++echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
++if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  
++# These are sane defaults that work on at least a few old systems.
++# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
++
++# Character class describing NM global symbol codes.
++symcode='[BCDEGRST]'
++
++# Regexp to match symbols that can be accessed directly from C.
++sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
++
++# Transform the above into a raw symbol and a C symbol.
++symxfrm='\1 \2\3 \3'
++
++# Transform an extracted symbol line into a proper C declaration
++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
++
++# Transform an extracted symbol line into symbol name and symbol address
++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++
++# Define system-specific variables.
++case $host_os in
++aix*)
++  symcode='[BCDT]'
++  ;;
++cygwin* | mingw* | pw32*)
++  symcode='[ABCDGISTW]'
++  ;;
++hpux*) # Its linker distinguishes data from code symbols
++  if test "$host_cpu" = ia64; then
++    symcode='[ABCDEGRST]'
++  fi
++  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++  ;;
++linux*)
++  if test "$host_cpu" = ia64; then
++    symcode='[ABCDGIRSTW]'
++    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++  fi
++  ;;
++irix* | nonstopux*)
++  symcode='[BCDEGRST]'
++  ;;
++osf*)
++  symcode='[BCDEGQRST]'
++  ;;
++solaris* | sysv5*)
++  symcode='[BDRT]'
++  ;;
++sysv4)
++  symcode='[DFNSTU]'
++  ;;
++esac
++
++# Handle CRLF in mingw tool chain
++opt_cr=
++case $build_os in
++mingw*)
++  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
++  ;;
++esac
++
++# If we're using GNU nm, then use its standard symbol codes.
++case `$NM -V 2>&1` in
++*GNU* | *'with BFD'*)
++  symcode='[ABCDGIRSTW]' ;;
++esac
++
++# Try without a prefix undercore, then with it.
++for ac_symprfx in "" "_"; do
++
++  # Write the raw and C identifiers.
++  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++
++  # Check to see that the pipe works correctly.
++  pipe_works=no
++
++  rm -f conftest*
++  cat > conftest.$ac_ext <<EOF
++#ifdef __cplusplus
++extern "C" {
++#endif
++char nm_test_var;
++void nm_test_func(){}
++#ifdef __cplusplus
++}
++#endif
++int main(){nm_test_var='a';nm_test_func();return(0);}
++EOF
++
++  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++    # Now try to grab the symbols.
++    nlist=conftest.nm
++    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
++  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s "$nlist"; then
++      # Try sorting and uniquifying the output.
++      if sort "$nlist" | uniq > "$nlist"T; then
++	mv -f "$nlist"T "$nlist"
++      else
++	rm -f "$nlist"T
++      fi
++
++      # Make sure that we snagged all the symbols we need.
++      if grep ' nm_test_var$' "$nlist" >/dev/null; then
++	if grep ' nm_test_func$' "$nlist" >/dev/null; then
++	  cat <<EOF > conftest.$ac_ext
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++EOF
++	  # Now generate the symbol file.
++	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
++
++	  cat <<EOF >> conftest.$ac_ext
++#if defined (__STDC__) && __STDC__
++# define lt_ptr_t void *
++#else
++# define lt_ptr_t char *
++# define const
++#endif
++
++/* The mapping between symbol names and symbols. */
++const struct {
++  const char *name;
++  lt_ptr_t address;
++}
++lt_preloaded_symbols[] =
++{
++EOF
++	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
++	  cat <<\EOF >> conftest.$ac_ext
++  {0, (lt_ptr_t) 0}
++};
++
++#ifdef __cplusplus
++}
++#endif
++EOF
++	  # Now try linking the two files.
++	  mv conftest.$ac_objext conftstm.$ac_objext
++	  lt_save_LIBS="$LIBS"
++	  lt_save_CFLAGS="$CFLAGS"
++	  LIBS="conftstm.$ac_objext"
++	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
++	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext}; then
++	    pipe_works=yes
++	  fi
++	  LIBS="$lt_save_LIBS"
++	  CFLAGS="$lt_save_CFLAGS"
++	else
++	  echo "cannot find nm_test_func in $nlist" >&5
++	fi
++      else
++	echo "cannot find nm_test_var in $nlist" >&5
++      fi
++    else
++      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
++    fi
++  else
++    echo "$progname: failed program was:" >&5
++    cat conftest.$ac_ext >&5
++  fi
++  rm -f conftest* conftst*
++
++  # Do not use the global_symbol_pipe unless it works.
++  if test "$pipe_works" = yes; then
++    break
++  else
++    lt_cv_sys_global_symbol_pipe=
++  fi
++done
++
++fi
++
++if test -z "$lt_cv_sys_global_symbol_pipe"; then
++  lt_cv_sys_global_symbol_to_cdecl=
++fi
++if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
++  echo "$as_me:$LINENO: result: failed" >&5
++echo "${ECHO_T}failed" >&6
++else
++  echo "$as_me:$LINENO: result: ok" >&5
++echo "${ECHO_T}ok" >&6
++fi
++
++echo "$as_me:$LINENO: checking for objdir" >&5
++echo $ECHO_N "checking for objdir... $ECHO_C" >&6
++if test "${lt_cv_objdir+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  rm -f .libs 2>/dev/null
++mkdir .libs 2>/dev/null
++if test -d .libs; then
++  lt_cv_objdir=.libs
++else
++  # MS-DOS does not allow filenames that begin with a dot.
++  lt_cv_objdir=_libs
++fi
++rmdir .libs 2>/dev/null
++fi
++echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
++echo "${ECHO_T}$lt_cv_objdir" >&6
++objdir=$lt_cv_objdir
++
++
++
++
++
++case $host_os in
++aix3*)
++  # AIX sometimes has problems with the GCC collect2 program.  For some
++  # reason, if we set the COLLECT_NAMES environment variable, the problems
++  # vanish in a puff of smoke.
++  if test "X${COLLECT_NAMES+set}" != Xset; then
++    COLLECT_NAMES=
++    export COLLECT_NAMES
++  fi
++  ;;
++esac
++
++# Sed substitution that helps us do robust quoting.  It backslashifies
++# metacharacters that are still active within double-quoted strings.
++Xsed='sed -e s/^X//'
++sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
++
++# Same as above, but do not quote variable references.
++double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
++
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++
++# Sed substitution to avoid accidental globbing in evaled expressions
++no_glob_subst='s/\*/\\\*/g'
++
++# Constants:
++rm="rm -f"
++
++# Global variables:
++default_ofile=libtool
++can_build_shared=yes
++
++# All known linkers require a `.a' archive for static linking (except M$VC,
++# which needs '.lib').
++libext=a
++ltmain="$ac_aux_dir/ltmain.sh"
++ofile="$default_ofile"
++with_gnu_ld="$lt_cv_prog_gnu_ld"
++
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ar; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_AR+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$AR"; then
++  ac_cv_prog_AR="$AR" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_AR="${ac_tool_prefix}ar"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++AR=$ac_cv_prog_AR
++if test -n "$AR"; then
++  echo "$as_me:$LINENO: result: $AR" >&5
++echo "${ECHO_T}$AR" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_AR"; then
++  ac_ct_AR=$AR
++  # Extract the first word of "ar", so it can be a program name with args.
++set dummy ar; ac_word=$2
++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_AR+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_AR"; then
++  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_AR="ar"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
++fi
++fi
++ac_ct_AR=$ac_cv_prog_ac_ct_AR
++if test -n "$ac_ct_AR"; then
++  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
++echo "${ECHO_T}$ac_ct_AR" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  AR=$ac_ct_AR
++else
++  AR="$ac_cv_prog_AR"
++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
++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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$RANLIB"; then
++  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++RANLIB=$ac_cv_prog_RANLIB
++if test -n "$RANLIB"; then
++  echo "$as_me:$LINENO: result: $RANLIB" >&5
++echo "${ECHO_T}$RANLIB" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++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
++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
++  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.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_RANLIB="ranlib"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
++fi
++fi
++ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
++if test -n "$ac_ct_RANLIB"; then
++  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
++echo "${ECHO_T}$ac_ct_RANLIB" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  RANLIB=$ac_ct_RANLIB
++else
++  RANLIB="$ac_cv_prog_RANLIB"
++fi
++
++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
++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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$STRIP"; then
++  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++STRIP=$ac_cv_prog_STRIP
++if test -n "$STRIP"; then
++  echo "$as_me:$LINENO: result: $STRIP" >&5
++echo "${ECHO_T}$STRIP" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++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
++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
++  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.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_STRIP="strip"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
++fi
++fi
++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
++if test -n "$ac_ct_STRIP"; then
++  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++echo "${ECHO_T}$ac_ct_STRIP" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  STRIP=$ac_ct_STRIP
++else
++  STRIP="$ac_cv_prog_STRIP"
++fi
++
++
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
++
++# Set sane defaults for various variables
++test -z "$AR" && AR=ar
++test -z "$AR_FLAGS" && AR_FLAGS=cru
++test -z "$AS" && AS=as
++test -z "$CC" && CC=cc
++test -z "$LTCC" && LTCC=$CC
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++test -z "$LD" && LD=ld
++test -z "$LN_S" && LN_S="ln -s"
++test -z "$MAGIC_CMD" && MAGIC_CMD=file
++test -z "$NM" && NM=nm
++test -z "$SED" && SED=sed
++test -z "$OBJDUMP" && OBJDUMP=objdump
++test -z "$RANLIB" && RANLIB=:
++test -z "$STRIP" && STRIP=:
++test -z "$ac_objext" && ac_objext=o
++
++# Determine commands to create old-style static archives.
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++old_postinstall_cmds='chmod 644 $oldlib'
++old_postuninstall_cmds=
++
++if test -n "$RANLIB"; then
++  case $host_os in
++  openbsd*)
++    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
++    ;;
++  *)
++    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++    ;;
++  esac
++  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++fi
++
++cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++
++# Only perform the check for file, if the check method requires it
++case $deplibs_check_method in
++file_magic*)
++  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
++    echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
++echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $MAGIC_CMD in
++[\\/*] |  ?:[\\/]*)
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++  ;;
++*)
++  lt_save_MAGIC_CMD="$MAGIC_CMD"
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
++  for ac_dir in $ac_dummy; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/${ac_tool_prefix}file; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
++      if test -n "$file_magic_test_file"; then
++	case $deplibs_check_method in
++	"file_magic "*)
++	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++	    $EGREP "$file_magic_regex" > /dev/null; then
++	    :
++	  else
++	    cat <<EOF 1>&2
++
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool@gnu.org
++
++EOF
++	  fi ;;
++	esac
++      fi
++      break
++    fi
++  done
++  IFS="$lt_save_ifs"
++  MAGIC_CMD="$lt_save_MAGIC_CMD"
++  ;;
++esac
++fi
++
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++echo "${ECHO_T}$MAGIC_CMD" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++if test -z "$lt_cv_path_MAGIC_CMD"; then
++  if test -n "$ac_tool_prefix"; then
++    echo "$as_me:$LINENO: checking for file" >&5
++echo $ECHO_N "checking for file... $ECHO_C" >&6
++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $MAGIC_CMD in
++[\\/*] |  ?:[\\/]*)
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++  ;;
++*)
++  lt_save_MAGIC_CMD="$MAGIC_CMD"
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
++  for ac_dir in $ac_dummy; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/file; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/file"
++      if test -n "$file_magic_test_file"; then
++	case $deplibs_check_method in
++	"file_magic "*)
++	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++	    $EGREP "$file_magic_regex" > /dev/null; then
++	    :
++	  else
++	    cat <<EOF 1>&2
++
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool@gnu.org
++
++EOF
++	  fi ;;
++	esac
++      fi
++      break
++    fi
++  done
++  IFS="$lt_save_ifs"
++  MAGIC_CMD="$lt_save_MAGIC_CMD"
++  ;;
++esac
++fi
++
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++echo "${ECHO_T}$MAGIC_CMD" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  else
++    MAGIC_CMD=:
++  fi
++fi
++
++  fi
++  ;;
++esac
++
++enable_dlopen=no
++enable_win32_dll=yes
++
++# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
++if test "${enable_libtool_lock+set}" = set; then
++  enableval="$enable_libtool_lock"
++  
++fi; 
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++
++
++# Check whether --with-pic or --without-pic was given.
++if test "${with_pic+set}" = set; then
++  withval="$with_pic"
++  pic_mode="$withval"
++else
++  pic_mode=default
++fi; 
++test -z "$pic_mode" && pic_mode=default
++
++# Use C for the default configuration in the libtool script
++tagname=
++lt_save_CC="$CC"
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
++# Source file extension for C test sources.
++ac_ext=c
++
++# Object file extension for compiled C test sources.
++objext=o
++objext=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="int some_variable = 0;\n"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code='int main(){return(0);}\n'
++
++
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
++
++# Allow CC to be a program name with arguments.
++compiler=$CC
++
++
++#
++# Check for any special shared library compilation flags.
++#
++lt_prog_cc_shlib=
++if test "$GCC" = no; then
++  case $host_os in
++  sco3.2v5*)
++    lt_prog_cc_shlib='-belf'
++    ;;
++  esac
++fi
++if test -n "$lt_prog_cc_shlib"; then
++  { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5
++echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;}
++  if echo "$old_CC $old_CFLAGS " | grep "[ 	]$lt_prog_cc_shlib[ 	]" >/dev/null; then :
++  else
++    { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
++echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
++    lt_cv_prog_cc_can_build_shared=no
++  fi
++fi
++
++
++#
++# Check to make sure the static flag actually works.
++#
++echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6
++if test "${lt_prog_compiler_static_works+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_static_works=no
++   save_LDFLAGS="$LDFLAGS"
++   LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
++   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test -s conftest.err; then
++       # Append any errors to the config.log.
++       cat conftest.err 1>&5
++     else
++       lt_prog_compiler_static_works=yes
++     fi
++   fi
++   $rm conftest*
++   LDFLAGS="$save_LDFLAGS"
++
++fi
++echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
++
++if test x"$lt_prog_compiler_static_works" = xyes; then
++    :
++else
++    lt_prog_compiler_static=
++fi
++
++
++
++## CAVEAT EMPTOR:
++## There is no encapsulation within the following macros, do not change
++## the running order or otherwise move them around unless you know exactly
++## what you are doing...
++
++lt_prog_compiler_no_builtin_flag=
++
++if test "$GCC" = yes; then
++  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
++
++  
++echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
++if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_prog_compiler_rtti_exceptions=no
++  ac_outfile=conftest.$ac_objext
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="-fno-rtti -fno-exceptions"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:__oline__: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s conftest.err; then
++       lt_cv_prog_compiler_rtti_exceptions=yes
++     fi
++   fi
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
++
++if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
++    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
++else
++    :
++fi
++
++fi
++
++lt_prog_compiler_wl=
++lt_prog_compiler_pic=
++lt_prog_compiler_static=
++
++echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++ 
++  if test "$GCC" = yes; then
++    lt_prog_compiler_wl='-Wl,'
++    lt_prog_compiler_static='-static'
++
++    case $host_os in
++      aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static='-Bstatic'
++      fi
++      ;;
++
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
++      ;;
++
++    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic='-DDLL_EXPORT'
++      ;;
++
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_prog_compiler_pic='-fno-common'
++      ;;
++
++    msdosdjgpp*)
++      # Just because we use GCC doesn't mean we suddenly get shared libraries
++      # on systems that don't support them.
++      lt_prog_compiler_can_build_shared=no
++      enable_shared=no
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	lt_prog_compiler_pic=-Kconform_pic
++      fi
++      ;;
++
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic='-fPIC'
++	;;
++      esac
++      ;;
++
++    *)
++      lt_prog_compiler_pic='-fPIC'
++      ;;
++    esac
++  else
++    # PORTME Check for flag to pass linker flags through the system compiler.
++    case $host_os in
++    aix*)
++      lt_prog_compiler_wl='-Wl,'
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static='-Bstatic'
++      else
++	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
++      fi
++      ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case "$cc_basename" in
++         xlc*)
++         lt_prog_compiler_pic='-qnocommon'
++         lt_prog_compiler_wl='-Wl,'
++         ;;
++       esac
++       ;;
++
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic='-DDLL_EXPORT'
++      ;;
++
++    hpux9* | hpux10* | hpux11*)
++      lt_prog_compiler_wl='-Wl,'
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic='+Z'
++	;;
++      esac
++      # Is there a better lt_prog_compiler_static that works with the bundled CC?
++      lt_prog_compiler_static='${wl}-a ${wl}archive'
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      lt_prog_compiler_wl='-Wl,'
++      # PIC (with -KPIC) is the default.
++      lt_prog_compiler_static='-non_shared'
++      ;;
++
++    newsos6)
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
++
++    linux*)
++      case $CC in
++      icc* | ecc*)
++	lt_prog_compiler_wl='-Wl,'
++	lt_prog_compiler_pic='-KPIC'
++	lt_prog_compiler_static='-static'
++        ;;
++      ccc*)
++        lt_prog_compiler_wl='-Wl,'
++        # All Alpha code is PIC.
++        lt_prog_compiler_static='-non_shared'
++        ;;
++      esac
++      ;;
++
++    osf3* | osf4* | osf5*)
++      lt_prog_compiler_wl='-Wl,'
++      # All OSF/1 code is PIC.
++      lt_prog_compiler_static='-non_shared'
++      ;;
++
++    sco3.2v5*)
++      lt_prog_compiler_pic='-Kpic'
++      lt_prog_compiler_static='-dn'
++      ;;
++
++    solaris*)
++      lt_prog_compiler_wl='-Wl,'
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
++
++    sunos4*)
++      lt_prog_compiler_wl='-Qoption ld '
++      lt_prog_compiler_pic='-PIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
++
++    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++      lt_prog_compiler_wl='-Wl,'
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	lt_prog_compiler_pic='-Kconform_pic'
++	lt_prog_compiler_static='-Bstatic'
++      fi
++      ;;
++
++    uts4*)
++      lt_prog_compiler_pic='-pic'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
++
++    *)
++      lt_prog_compiler_can_build_shared=no
++      ;;
++    esac
++  fi
++
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic" >&6
++
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$lt_prog_compiler_pic"; then
++  
++echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
++if test "${lt_prog_compiler_pic_works+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_pic_works=no
++  ac_outfile=conftest.$ac_objext
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:__oline__: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s conftest.err; then
++       lt_prog_compiler_pic_works=yes
++     fi
++   fi
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
++
++if test x"$lt_prog_compiler_pic_works" = xyes; then
++    case $lt_prog_compiler_pic in
++     "" | " "*) ;;
++     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
++     esac
++else
++    lt_prog_compiler_pic=
++     lt_prog_compiler_can_build_shared=no
++fi
++
++fi
++case "$host_os" in
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    lt_prog_compiler_pic=
++    ;;
++  *)
++    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
++    ;;
++esac
++
++echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++if test "${lt_cv_prog_compiler_c_o+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_prog_compiler_c_o=no
++   $rm -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&5
++   echo "$as_me:__oline__: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s out/conftest2.$ac_objext
++   then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s out/conftest.err; then
++       lt_cv_prog_compiler_c_o=yes
++     fi
++   fi
++   chmod u+w .
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
++   cd ..
++   rmdir conftest
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
++
++
++hard_links="nottested"
++if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6
++  if test "$hard_links" = no; then
++    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
++
++echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++
++  runpath_var=
++  allow_undefined_flag=
++  enable_shared_with_static_runtimes=no
++  archive_cmds=
++  archive_expsym_cmds=
++  old_archive_From_new_cmds=
++  old_archive_from_expsyms_cmds=
++  export_dynamic_flag_spec=
++  whole_archive_flag_spec=
++  thread_safe_flag_spec=
++  hardcode_libdir_flag_spec=
++  hardcode_libdir_flag_spec_ld=
++  hardcode_libdir_separator=
++  hardcode_direct=no
++  hardcode_minus_L=no
++  hardcode_shlibpath_var=unsupported
++  link_all_deplibs=unknown
++  hardcode_automatic=no
++  module_cmds=
++  module_expsym_cmds=
++  always_export_symbols=no
++  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  # include_expsyms should be a list of space-separated symbols to be *always*
++  # included in the symbol list
++  include_expsyms=
++  # exclude_expsyms can be an extended regexp of symbols to exclude
++  # it will be wrapped by ` (' and `)$', so one must not match beginning or
++  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++  # as well as any symbol that contains `d'.
++  exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
++  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++  # platforms (ab)use it in PIC code, but their linkers get confused if
++  # the symbol is explicitly referenced.  Since portable code cannot
++  # rely on this symbol name, it's probably fine to never include it in
++  # preloaded symbol tables.
++  extract_expsyms_cmds=
++
++  case $host_os in
++  cygwin* | mingw* | pw32*)
++    # FIXME: the MSVC++ port hasn't been tested in a loooong time
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    if test "$GCC" != yes; then
++      with_gnu_ld=no
++    fi
++    ;;
++  openbsd*)
++    with_gnu_ld=no
++    ;;
++  esac
++
++  ld_shlibs=yes
++  if test "$with_gnu_ld" = yes; then
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    wlarc='${wl}'
++
++    # See if GNU ld supports shared libraries.
++    case $host_os in
++    aix3* | aix4* | aix5*)
++      # On AIX/PPC, the GNU linker is very broken
++      if test "$host_cpu" != ia64; then
++	ld_shlibs=no
++	cat <<EOF 1>&2
++
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
++
++EOF
++      fi
++      ;;
++
++    amigaos*)
++      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_minus_L=yes
++
++      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
++      # that the semantics of dynamic libraries on AmigaOS, at least up
++      # to version 4, is to share data among multiple programs linked
++      # with the same dynamic library.  Since this doesn't match the
++      # behavior of shared libraries on other platforms, we can't use
++      # them.
++      ld_shlibs=no
++      ;;
++
++    beos*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	allow_undefined_flag=unsupported
++	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++	# support --undefined.  This deserves some investigation.  FIXME
++	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
++      # as there is no search path for DLLs.
++      hardcode_libdir_flag_spec='-L$libdir'
++      allow_undefined_flag=unsupported
++      always_export_symbols=no
++      enable_shared_with_static_runtimes=yes
++      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++
++      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++	# If the export-symbols file already is a .def file (1st line
++	# is EXPORTS), use it as is; otherwise, prepend...
++	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	  cp $export_symbols $output_objdir/$soname.def;
++	else
++	  echo EXPORTS > $output_objdir/$soname.def;
++	  cat $export_symbols >> $output_objdir/$soname.def;
++	fi~
++	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
++    netbsd*)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++	wlarc=
++      else
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      fi
++      ;;
++
++    solaris* | sysv5*)
++      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
++	ld_shlibs=no
++	cat <<EOF 1>&2
++
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++EOF
++      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
++    sunos4*)
++      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      wlarc=
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
++
++  linux*)
++    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_cmds="$tmp_archive_cmds"
++      supports_anon_versioning=no
++      case `$LD -v 2>/dev/null` in
++        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
++        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++        *\ 2.11.*) ;; # other 2.11 versions
++        *) supports_anon_versioning=yes ;;
++      esac
++      if test $supports_anon_versioning = yes; then
++        archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
++cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++$echo "local: *; };" >> $output_objdir/$libname.ver~
++        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++      else
++        archive_expsym_cmds="$tmp_archive_cmds"
++      fi
++    else
++      ld_shlibs=no
++    fi
++    ;;
++
++    *)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
++    esac
++
++    if test "$ld_shlibs" = yes; then
++      runpath_var=LD_RUN_PATH
++      hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
++      export_dynamic_flag_spec='${wl}--export-dynamic'
++      # ancient GNU ld didn't support --whole-archive et. al.
++      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++ 	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	whole_archive_flag_spec=
++      fi
++    fi
++  else
++    # PORTME fill in a description of your system's linker (not GNU ld)
++    case $host_os in
++    aix3*)
++      allow_undefined_flag=unsupported
++      always_export_symbols=yes
++      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
++      # Note: this linker hardcodes the directories in LIBPATH if there
++      # are no directories specified by -L.
++      hardcode_minus_L=yes
++      if test "$GCC" = yes && test -z "$link_static_flag"; then
++	# Neither direct hardcoding nor static linking is supported with a
++	# broken collect2.
++	hardcode_direct=unsupported
++      fi
++      ;;
++
++    aix4* | aix5*)
++      if test "$host_cpu" = ia64; then
++	# On IA64, the linker does run time linking by default, so we don't
++	# have to do anything special.
++	aix_use_runtimelinking=no
++	exp_sym_flag='-Bexport'
++	no_entry_flag=""
++      else
++	# If we're using GNU nm, then we don't want the "-C" option.
++	# -C means demangle to AIX nm, but means don't demangle with GNU nm
++	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
++	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++	else
++	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++	fi
++	aix_use_runtimelinking=no
++
++	# Test if we are trying to use run time linking or normal
++	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
++	# need to do runtime linking.
++	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++	  for ld_flag in $LDFLAGS; do
++  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++  	    aix_use_runtimelinking=yes
++  	    break
++  	  fi
++	  done
++	esac
++
++	exp_sym_flag='-bexport'
++	no_entry_flag='-bnoentry'
++      fi
++
++      # When large executables or shared objects are built, AIX ld can
++      # have problems creating the table of contents.  If linking a library
++      # or program results in "error TOC overflow" add -mminimal-toc to
++      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++      archive_cmds=''
++      hardcode_direct=yes
++      hardcode_libdir_separator=':'
++      link_all_deplibs=yes
++
++      if test "$GCC" = yes; then
++	case $host_os in aix4.012|aix4.012.*)
++	# We only want to do this on AIX 4.2 and lower, the check
++	# below for broken collect2 doesn't work under 4.3+
++	  collect2name=`${CC} -print-prog-name=collect2`
++	  if test -f "$collect2name" && \
++  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	  then
++  	  # We have reworked collect2
++  	  hardcode_direct=yes
++	  else
++  	  # We have old collect2
++  	  hardcode_direct=unsupported
++  	  # It fails to find uninstalled libraries when the uninstalled
++  	  # path is not listed in the libpath.  Setting hardcode_minus_L
++  	  # to unsupported forces relinking
++  	  hardcode_minus_L=yes
++  	  hardcode_libdir_flag_spec='-L$libdir'
++  	  hardcode_libdir_separator=
++	  fi
++	esac
++	shared_flag='-shared'
++      else
++	# not using gcc
++	if test "$host_cpu" = ia64; then
++  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++  	# chokes on -Wl,-G. The following line is correct:
++	  shared_flag='-G'
++	else
++  	if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag='${wl}-G'
++	  else
++	    shared_flag='${wl}-bM:SRE'
++  	fi
++	fi
++      fi
++
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      always_export_symbols=yes
++      if test "$aix_use_runtimelinking" = yes; then
++	# Warning - without using the other runtime loading flags (-brtl),
++	# -berok will link without error, but may produce a broken library.
++	allow_undefined_flag='-berok'
++       # Determine the default libpath from the value encoded in an empty executable.
++       cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
++	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++       else
++	if test "$host_cpu" = ia64; then
++	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
++	  allow_undefined_flag="-z nodefs"
++	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++	else
++	 # Determine the default libpath from the value encoded in an empty executable.
++	 cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
++	  # Warning - without using the other run time loading flags,
++	  # -berok will link without error, but may produce a broken library.
++	  no_undefined_flag=' ${wl}-bernotok'
++	  allow_undefined_flag=' ${wl}-berok'
++	  # -bexpall does not export symbols beginning with underscore (_)
++	  always_export_symbols=yes
++	  # Exported symbols can be pulled into shared objects from archives
++	  whole_archive_flag_spec=' '
++	  archive_cmds_need_lc=yes
++	  # This is similar to how AIX traditionally builds it's shared libraries.
++	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	fi
++      fi
++      ;;
++
++    amigaos*)
++      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_minus_L=yes
++      # see comment about different semantics on the GNU ld section
++      ld_shlibs=no
++      ;;
++
++    bsdi[45]*)
++      export_dynamic_flag_spec=-rdynamic
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # When not using gcc, we currently assume that we are using
++      # Microsoft Visual C++.
++      # hardcode_libdir_flag_spec is actually meaningless, as there is
++      # no search path for DLLs.
++      hardcode_libdir_flag_spec=' '
++      allow_undefined_flag=unsupported
++      # Tell ltmain to make .lib files, not .a files.
++      libext=lib
++      # Tell ltmain to make .dll files, not .so files.
++      shrext_cmds=".dll"
++      # FIXME: Setting linknames here is a bad hack.
++      archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      # The linker will automatically build a .lib file if we build a DLL.
++      old_archive_From_new_cmds='true'
++      # FIXME: Should let the user specify the lib program.
++      old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      enable_shared_with_static_runtimes=yes
++      ;;
++
++    darwin* | rhapsody*)
++      case "$host_os" in
++        rhapsody* | darwin1.[012])
++         allow_undefined_flag='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[012])
++               allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++      esac
++      archive_cmds_need_lc=no
++      hardcode_direct=no
++      hardcode_automatic=yes
++      hardcode_shlibpath_var=unsupported
++      whole_archive_flag_spec=''
++      link_all_deplibs=yes
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++    else
++      case "$cc_basename" in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         ld_shlibs=no
++          ;;
++      esac
++    fi
++      ;;
++
++    dgux*)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_shlibpath_var=no
++      ;;
++
++    freebsd1*)
++      ld_shlibs=no
++      ;;
++
++    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++    # support.  Future versions do this automatically, but an explicit c++rt0.o
++    # does not break anything, and helps significantly (at the cost of a little
++    # extra space).
++    freebsd2.2*)
++      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
++
++    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++    freebsd2*)
++      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct=yes
++      hardcode_minus_L=yes
++      hardcode_shlibpath_var=no
++      ;;
++
++    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++    freebsd* | kfreebsd*-gnu)
++      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
++
++    hpux9*)
++      if test "$GCC" = yes; then
++	archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      else
++	archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      fi
++      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++      hardcode_libdir_separator=:
++      hardcode_direct=yes
++
++      # hardcode_minus_L: Not really in the search PATH,
++      # but as the default location of the library.
++      hardcode_minus_L=yes
++      export_dynamic_flag_spec='${wl}-E'
++      ;;
++
++    hpux10* | hpux11*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	esac
++      else
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	*)
++	  archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	esac
++      fi
++      if test "$with_gnu_ld" = no; then
++	case "$host_cpu" in
++	hppa*64*)
++	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++	  hardcode_libdir_flag_spec_ld='+b $libdir'
++	  hardcode_libdir_separator=:
++	  hardcode_direct=no
++	  hardcode_shlibpath_var=no
++	  ;;
++	ia64*)
++	  hardcode_libdir_flag_spec='-L$libdir'
++	  hardcode_direct=no
++	  hardcode_shlibpath_var=no
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  hardcode_minus_L=yes
++	  ;;
++	*)
++	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++	  hardcode_libdir_separator=:
++	  hardcode_direct=yes
++	  export_dynamic_flag_spec='${wl}-E'
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  hardcode_minus_L=yes
++	  ;;
++	esac
++      fi
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      if test "$GCC" = yes; then
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	hardcode_libdir_flag_spec_ld='-rpath $libdir'
++      fi
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator=:
++      link_all_deplibs=yes
++      ;;
++
++    netbsd*)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++      else
++	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++      fi
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
++
++    newsos6)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct=yes
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator=:
++      hardcode_shlibpath_var=no
++      ;;
++
++    openbsd*)
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec='${wl}-E'
++      else
++       case $host_os in
++	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	   archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	   hardcode_libdir_flag_spec='-R$libdir'
++	   ;;
++	 *)
++	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++	   ;;
++       esac
++      fi
++      ;;
++
++    os2*)
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_minus_L=yes
++      allow_undefined_flag=unsupported
++      archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++      old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++      ;;
++
++    osf3*)
++      if test "$GCC" = yes; then
++	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	allow_undefined_flag=' -expect_unresolved \*'
++	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++      fi
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator=:
++      ;;
++
++    osf4* | osf5*)	# as osf3* with the addition of -msym flag
++      if test "$GCC" = yes; then
++	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      else
++	allow_undefined_flag=' -expect_unresolved \*'
++	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++
++	# Both c and cxx compiler support -rpath directly
++	hardcode_libdir_flag_spec='-rpath $libdir'
++      fi
++      hardcode_libdir_separator=:
++      ;;
++
++    sco3.2v5*)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var=no
++      export_dynamic_flag_spec='${wl}-Bexport'
++      runpath_var=LD_RUN_PATH
++      hardcode_runpath_var=yes
++      ;;
++
++    solaris*)
++      no_undefined_flag=' -z text'
++      if test "$GCC" = yes; then
++	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
++      else
++	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      fi
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_shlibpath_var=no
++      case $host_os in
++      solaris2.[0-5] | solaris2.[0-5].*) ;;
++      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
++	whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
++      esac
++      link_all_deplibs=yes
++      ;;
++
++    sunos4*)
++      if test "x$host_vendor" = xsequent; then
++	# Use $CC to link under sequent, because it throws in some extra .o
++	# files that make .init and .fini sections work.
++	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_direct=yes
++      hardcode_minus_L=yes
++      hardcode_shlibpath_var=no
++      ;;
++
++    sysv4)
++      case $host_vendor in
++	sni)
++	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct=yes # is this really true???
++	;;
++	siemens)
++	  ## LD is ld it makes a PLAMLIB
++	  ## CC just makes a GrossModule.
++	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++	  reload_cmds='$CC -r -o $output$reload_objs'
++	  hardcode_direct=no
++        ;;
++	motorola)
++	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
++	;;
++      esac
++      runpath_var='LD_RUN_PATH'
++      hardcode_shlibpath_var=no
++      ;;
++
++    sysv4.3*)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var=no
++      export_dynamic_flag_spec='-Bexport'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	hardcode_shlibpath_var=no
++	runpath_var=LD_RUN_PATH
++	hardcode_runpath_var=yes
++	ld_shlibs=yes
++      fi
++      ;;
++
++    sysv4.2uw2*)
++      archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct=yes
++      hardcode_minus_L=no
++      hardcode_shlibpath_var=no
++      hardcode_runpath_var=yes
++      runpath_var=LD_RUN_PATH
++      ;;
++
++   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
++      no_undefined_flag='${wl}-z ${wl}text'
++      if test "$GCC" = yes; then
++	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
++      runpath_var='LD_RUN_PATH'
++      hardcode_shlibpath_var=no
++      ;;
++
++    sysv5*)
++      no_undefined_flag=' -z text'
++      # $CC -shared without GNU ld will not create a library from C++
++      # object files and a static libstdc++, better avoid it by now
++      archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      hardcode_libdir_flag_spec=
++      hardcode_shlibpath_var=no
++      runpath_var='LD_RUN_PATH'
++      ;;
++
++    uts4*)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_shlibpath_var=no
++      ;;
++
++    *)
++      ld_shlibs=no
++      ;;
++    esac
++  fi
++
++echo "$as_me:$LINENO: result: $ld_shlibs" >&5
++echo "${ECHO_T}$ld_shlibs" >&6
++test "$ld_shlibs" = no && can_build_shared=no
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
++#
++# Do we need to explicitly link libc?
++#
++case "x$archive_cmds_need_lc" in
++x|xyes)
++  # Assume -lc should be added
++  archive_cmds_need_lc=yes
++
++  if test "$enable_shared" = yes && test "$GCC" = yes; then
++    case $archive_cmds in
++    *'~'*)
++      # FIXME: we may have to deal with multi-command sequences.
++      ;;
++    '$CC '*)
++      # Test whether the compiler implicitly links with -lc since on some
++      # systems, -lgcc has to come before -lc. If gcc already passes -lc
++      # to ld, don't add -lc before -lgcc.
++      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++      $rm conftest*
++      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        libobjs=conftest.$ac_objext
++        deplibs=
++        wl=$lt_prog_compiler_wl
++        compiler_flags=-v
++        linker_flags=-v
++        verstring=
++        output_objdir=.
++        libname=conftest
++        lt_save_allow_undefined_flag=$allow_undefined_flag
++        allow_undefined_flag=
++        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
++  (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++        then
++	  archive_cmds_need_lc=no
++        else
++	  archive_cmds_need_lc=yes
++        fi
++        allow_undefined_flag=$lt_save_allow_undefined_flag
++      else
++        cat conftest.err 1>&5
++      fi
++      $rm conftest*
++      echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
++echo "${ECHO_T}$archive_cmds_need_lc" >&6
++      ;;
++    esac
++  fi
++  ;;
++esac
++
++echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
++need_lib_prefix=unknown
++hardcode_into_libs=no
++
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
++
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  shlibpath_var=LIBPATH
++
++  # AIX 3 has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}${shared_ext}$major'
++  ;;
++
++aix4* | aix5*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[01] | aix4.[01].*)
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	   echo ' yes '
++	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++	:
++      else
++	can_build_shared=no
++      fi
++      ;;
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}${shared_ext}$major'
++    fi
++    shlibpath_var=LIBPATH
++  fi
++  ;;
++
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++  ;;
++
++beos*)
++  library_names_spec='${libname}${shared_ext}'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
++
++bsdi[45]*)
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
++
++cygwin* | mingw* | pw32*)
++  version_type=windows
++  shrext_cmds=".dll"
++  need_version=no
++  need_lib_prefix=no
++
++  case $GCC,$host_os in
++  yes,cygwin* | yes,mingw* | yes,pw32*)
++    library_names_spec='$libname.dll.a'
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $rm \$dlpath'
++    shlibpath_overrides_runpath=yes
++
++    case $host_os in
++    cygwin*)
++      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
++    mingw*)
++      # MinGW DLLs use traditional 'lib' prefix
++      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
++        # It is most probably a Windows format PATH printed by
++        # mingw gcc, but we are running on Cygwin. Gcc prints its search
++        # path with ; separators, and with drive letters. We can handle the
++        # drive letters (cygwin fileutils understands them), so leave them,
++        # especially as we might pass files found there to a mingw objdump,
++        # which wouldn't understand a cygwinified path. Ahh.
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++      fi
++      ;;
++    pw32*)
++      # pw32 DLLs use 'pw' prefix rather than 'lib'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++      ;;
++    esac
++    ;;
++
++  *)
++    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    ;;
++  esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  ;;
++
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  soname_spec='${libname}${release}${major}$shared_ext'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
++  if test "$GCC" = yes; then
++    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
++  else
++    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
++  fi
++  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++  ;;
++
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++freebsd1*)
++  dynamic_linker=no
++  ;;
++
++kfreebsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++freebsd*)
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
++    ;;
++  freebsd3.01* | freebsdelf3.01*)
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
++  *) # from 3.2 on
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
++    ;;
++  esac
++  ;;
++
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  ;;
++
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  case "$host_cpu" in
++  ia64*)
++    shrext_cmds='.so'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.so"
++    shlibpath_var=LD_LIBRARY_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    if test "X$HPUX_IA64_MODE" = X32; then
++      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++    else
++      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++    fi
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    ;;
++   hppa*64*)
++     shrext_cmds='.sl'
++     hardcode_into_libs=yes
++     dynamic_linker="$host_os dld.sl"
++     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++     soname_spec='${libname}${release}${shared_ext}$major'
++     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++     ;;
++   *)
++    shrext_cmds='.sl'
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=SHLIB_PATH
++    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    ;;
++  esac
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
++    *)
++	if test "$lt_cv_prog_gnu_ld" = yes; then
++		version_type=linux
++	else
++		version_type=irix
++	fi ;;
++  esac
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  case $host_os in
++  irix5* | nonstopux*)
++    libsuff= shlibsuff=
++    ;;
++  *)
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++      libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++      libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++      libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  hardcode_into_libs=yes
++  ;;
++
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++  dynamic_linker=no
++  ;;
++
++# This must be Linux ELF.
++linux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
++
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
++
++knetbsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++nto-qnx*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++openbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    case $host_os in
++      openbsd2.[89] | openbsd2.[89].*)
++	shlibpath_overrides_runpath=no
++	;;
++      *)
++	shlibpath_overrides_runpath=yes
++	;;
++      esac
++  else
++    shlibpath_overrides_runpath=yes
++  fi
++  ;;
++
++os2*)
++  libname_spec='$name'
++  shrext_cmds=".dll"
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
++
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
++
++sco3.2v5*)
++  version_type=osf
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
++
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      export_dynamic_flag_spec='${wl}-Blargedynsym'
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
++
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
++
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++*)
++  dynamic_linker=no
++  ;;
++esac
++echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6
++test "$dynamic_linker" = no && can_build_shared=no
++
++echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++hardcode_action=
++if test -n "$hardcode_libdir_flag_spec" || \
++   test -n "$runpath_var" || \
++   test "X$hardcode_automatic" = "Xyes" ; then
++
++  # We can hardcode non-existant directories.
++  if test "$hardcode_direct" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no &&
++     test "$hardcode_minus_L" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action=immediate
++  fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action=unsupported
++fi
++echo "$as_me:$LINENO: result: $hardcode_action" >&5
++echo "${ECHO_T}$hardcode_action" >&6
++
++if test "$hardcode_action" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
++
++striplib=
++old_striplib=
++echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
++echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
++  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++else
++# FIXME - insert some real tests, host_os isn't really good enough
++  case $host_os in
++   darwin*)
++       if test -n "$STRIP" ; then
++         striplib="$STRIP -x"
++         echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++       else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++       ;;
++   *)
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++    ;;
++  esac
++fi
++
++if test "x$enable_dlopen" != xyes; then
++  enable_dlopen=unknown
++  enable_dlopen_self=unknown
++  enable_dlopen_self_static=unknown
++else
++  lt_cv_dlopen=no
++  lt_cv_dlopen_libs=
++
++  case $host_os in
++  beos*)
++    lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ;;
++
++  mingw* | pw32*)
++    lt_cv_dlopen="LoadLibrary"
++    lt_cv_dlopen_libs=
++   ;;
++
++  cygwin*)
++    lt_cv_dlopen="dlopen"
++    lt_cv_dlopen_libs=
++   ;;
++
++  darwin*)
++  # if libdl is installed we need to link against it
++    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dl_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dl_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++if test $ac_cv_lib_dl_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++  
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    
++fi
++
++   ;;
++
++  *)
++    echo "$as_me:$LINENO: checking for shl_load" >&5
++echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
++if test "${ac_cv_func_shl_load+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.  */
++/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define shl_load innocuous_shl_load
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char shl_load (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef shl_load
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char shl_load ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_shl_load) || defined (__stub___shl_load)
++choke me
++#else
++char (*f) () = shl_load;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != shl_load;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_shl_load=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_shl_load=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
++echo "${ECHO_T}$ac_cv_func_shl_load" >&6
++if test $ac_cv_func_shl_load = yes; then
++  lt_cv_dlopen="shl_load"
++else
++  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
++echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
++if test "${ac_cv_lib_dld_shl_load+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char shl_load ();
++int
++main ()
++{
++shl_load ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dld_shl_load=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dld_shl_load=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
++if test $ac_cv_lib_dld_shl_load = yes; then
++  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
++else
++  echo "$as_me:$LINENO: checking for dlopen" >&5
++echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
++if test "${ac_cv_func_dlopen+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.  */
++/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define dlopen innocuous_dlopen
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char dlopen (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef dlopen
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_dlopen) || defined (__stub___dlopen)
++choke me
++#else
++char (*f) () = dlopen;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != dlopen;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
++echo "${ECHO_T}$ac_cv_func_dlopen" >&6
++if test $ac_cv_func_dlopen = yes; then
++  lt_cv_dlopen="dlopen"
++else
++  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dl_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dl_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++if test $ac_cv_lib_dl_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
++echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
++if test "${ac_cv_lib_svld_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsvld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_svld_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_svld_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
++if test $ac_cv_lib_svld_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
++else
++  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
++echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
++if test "${ac_cv_lib_dld_dld_link+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dld_link ();
++int
++main ()
++{
++dld_link ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dld_dld_link=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dld_dld_link=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
++if test $ac_cv_lib_dld_dld_link = yes; then
++  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
++fi
++
++	      
++fi
++
++	    
++fi
++
++	  
++fi
++
++	
++fi
++
++      
++fi
++
++    ;;
++  esac
++
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
++  else
++    enable_dlopen=no
++  fi
++
++  case $lt_cv_dlopen in
++  dlopen)
++    save_CPPFLAGS="$CPPFLAGS"
++    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++
++    save_LDFLAGS="$LDFLAGS"
++    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++
++    save_LIBS="$LIBS"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
++
++    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
++echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
++if test "${lt_cv_dlopen_self+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self=cross
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++#line __oline__ "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}
++EOF
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self=no
++  fi
++fi
++rm -fr conftest*
++
++    
++fi
++echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self" >&6
++
++    if test "x$lt_cv_dlopen_self" = xyes; then
++      LDFLAGS="$LDFLAGS $link_static_flag"
++      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
++echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
++if test "${lt_cv_dlopen_self_static+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self_static=cross
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++#line __oline__ "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}
++EOF
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self_static=no
++  fi
++fi
++rm -fr conftest*
++
++      
++fi
++echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
++    fi
++
++    CPPFLAGS="$save_CPPFLAGS"
++    LDFLAGS="$save_LDFLAGS"
++    LIBS="$save_LIBS"
++    ;;
++  esac
++
++  case $lt_cv_dlopen_self in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
++  esac
++
++  case $lt_cv_dlopen_self_static in
++  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++  *) enable_dlopen_self_static=unknown ;;
++  esac
++fi
++
++
++# Report which librarie types wil actually be built
++echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
++echo "$as_me:$LINENO: result: $can_build_shared" >&5
++echo "${ECHO_T}$can_build_shared" >&6
++
++echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
++test "$can_build_shared" = "no" && enable_shared=no
++
++# On AIX, shared libraries and static libraries use the same namespace, and
++# are all built from PIC.
++case "$host_os" in
++aix3*)
++  test "$enable_shared" = yes && enable_static=no
++  if test -n "$RANLIB"; then
++    archive_cmds="$archive_cmds~\$RANLIB \$lib"
++    postinstall_cmds='$RANLIB $lib'
++  fi
++  ;;
++
++aix4* | aix5*)
++  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++    test "$enable_shared" = yes && enable_static=no
++  fi
++    ;;
++esac
++echo "$as_me:$LINENO: result: $enable_shared" >&5
++echo "${ECHO_T}$enable_shared" >&6
++
++echo "$as_me:$LINENO: checking whether to build static libraries" >&5
++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
++# Make sure either enable_shared or enable_static is yes.
++test "$enable_shared" = yes || enable_static=yes
++echo "$as_me:$LINENO: result: $enable_static" >&5
++echo "${ECHO_T}$enable_static" >&6
++
++# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # See if we are running on zsh, and set the options which allow our commands through
++  # without removal of \ escapes.
++  if test -n "${ZSH_VERSION+set}" ; then
++    setopt NO_GLOB_SUBST
++  fi
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++    SED SHELL STRIP \
++    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++    deplibs_check_method reload_flag reload_cmds need_locks \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    old_postinstall_cmds old_postuninstall_cmds \
++    compiler \
++    CC \
++    LD \
++    lt_prog_compiler_wl \
++    lt_prog_compiler_pic \
++    lt_prog_compiler_static \
++    lt_prog_compiler_no_builtin_flag \
++    export_dynamic_flag_spec \
++    thread_safe_flag_spec \
++    whole_archive_flag_spec \
++    enable_shared_with_static_runtimes \
++    old_archive_cmds \
++    old_archive_from_new_cmds \
++    predep_objects \
++    postdep_objects \
++    predeps \
++    postdeps \
++    compiler_lib_search_path \
++    archive_cmds \
++    archive_expsym_cmds \
++    postinstall_cmds \
++    postuninstall_cmds \
++    old_archive_from_expsyms_cmds \
++    allow_undefined_flag \
++    no_undefined_flag \
++    export_symbols_cmds \
++    hardcode_libdir_flag_spec \
++    hardcode_libdir_flag_spec_ld \
++    hardcode_libdir_separator \
++    hardcode_automatic \
++    module_cmds \
++    module_expsym_cmds \
++    lt_cv_prog_compiler_c_o \
++    exclude_expsyms \
++    include_expsyms; do
++
++    case $var in
++    old_archive_cmds | \
++    old_archive_from_new_cmds | \
++    archive_cmds | \
++    archive_expsym_cmds | \
++    module_cmds | \
++    module_expsym_cmds | \
++    old_archive_from_expsyms_cmds | \
++    export_symbols_cmds | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  case $lt_echo in
++  *'\$0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
++    ;;
++  esac
++
++cfgfile="${ofile}T"
++  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
++  $rm -f "$cfgfile"
++  { echo "$as_me:$LINENO: creating $ofile" >&5
++echo "$as_me: creating $ofile" >&6;}
++
++  cat <<__EOF__ >> "$cfgfile"
++#! $SHELL
++
++# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
++# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
++# NOTE: Changes made to this file will be lost: look at ltmain.sh.
++#
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
++# Free Software Foundation, Inc.
++#
++# This file is part of GNU Libtool:
++# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# A sed program that does not truncate output.
++SED=$lt_SED
++
++# Sed that helps us avoid accidentally triggering echo(1) options like -n.
++Xsed="$SED -e s/^X//"
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++
++# The names of the tagged configurations supported by this script.
++available_tags=
++
++# ### BEGIN LIBTOOL CONFIG
++
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc
++
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
++
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
++
++# A C compiler.
++LTCC=$lt_LTCC
++
++# A language-specific compiler.
++CC=$lt_compiler
++
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC
++
++# An ERE matcher.
++EGREP=$lt_EGREP
++
++# The linker used to build libraries.
++LD=$lt_LD
++
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
++
++# A BSD-compatible nm program.
++NM=$lt_NM
++
++# A symbol stripping program
++STRIP=$lt_STRIP
++
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl
++
++# Object file suffix (normally "o").
++objext="$ac_objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
++
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic
++pic_mode=$pic_mode
++
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o
++
++# Must we lock files when doing compilation ?
++need_locks=$lt_need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static
++
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
++
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec
++
++# Library versioning type.
++version_type=$version_type
++
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
++
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
++
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
++
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
++
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds
++archive_expsym_cmds=$lt_archive_expsym_cmds
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
++
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds
++module_expsym_cmds=$lt_module_expsym_cmds
++
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps
++
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path
++
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag
++
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
++
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
++
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
++
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action
++
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
++
++# If ld is used when linking, flag to hardcode \$libdir into
++# a binary during linking. This must work even if \$libdir does
++# not exist.
++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator
++
++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L
++
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var
++
++# Set to yes if building a shared library automatically hardcodes DIR into the library
++# and all subsequent libraries and executables linked against it.
++hardcode_automatic=$hardcode_automatic
++
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
++
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs
++
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path"
++
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols
++
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds
++
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms
++
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms
++
++# ### END LIBTOOL CONFIG
++
++__EOF__
++
++
++  case $host_os in
++  aix3*)
++    cat <<\EOF >> "$cfgfile"
++
++# AIX sometimes has problems with the GCC collect2 program.  For some
++# reason, if we set the COLLECT_NAMES environment variable, the problems
++# vanish in a puff of smoke.
++if test "X${COLLECT_NAMES+set}" != Xset; then
++  COLLECT_NAMES=
++  export COLLECT_NAMES
++fi
++EOF
++    ;;
++  esac
++
++  # We use sed instead of cat because bash on DJGPP gets confused if
++  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
++  # text mode, it properly converts lines to CR/LF.  This bash problem
++  # is reportedly fixed, but why not run on old versions too?
++  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
++
++  mv -f "$cfgfile" "$ofile" || \
++    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
++  chmod +x "$ofile"
++
++else
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
++fi
++
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++CC="$lt_save_CC"
++
++
++# Check whether --with-tags or --without-tags was given.
++if test "${with_tags+set}" = set; then
++  withval="$with_tags"
++  tagnames="$withval"
++fi; 
++
++if test -f "$ltmain" && test -n "$tagnames"; then
++  if test ! -f "${ofile}"; then
++    { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
++echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
++  fi
++
++  if test -z "$LTCC"; then
++    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
++    if test -z "$LTCC"; then
++      { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
++echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
++    else
++      { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
++echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
++    fi
++  fi
++
++  # Extract list of available tagged configurations in $ofile.
++  # Note that this assumes the entire list is on one line.
++  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
++
++  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++  for tagname in $tagnames; do
++    IFS="$lt_save_ifs"
++    # Check whether tagname contains only valid characters
++    case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
++    "") ;;
++    *)  { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
++echo "$as_me: error: invalid tag name: $tagname" >&2;}
++   { (exit 1); exit 1; }; }
++	;;
++    esac
++
++    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
++    then
++      { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
++echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
++   { (exit 1); exit 1; }; }
++    fi
++
++    # Update the list of available tags.
++    if test -n "$tagname"; then
++      echo appending configuration tag \"$tagname\" to $ofile
++
++      case $tagname in
++      CXX)
++	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 
++	    (test "X$CXX" != "Xg++"))) ; then
++	  ac_ext=cc
++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
++
++
++
++
++archive_cmds_need_lc_CXX=no
++allow_undefined_flag_CXX=
++always_export_symbols_CXX=no
++archive_expsym_cmds_CXX=
++export_dynamic_flag_spec_CXX=
++hardcode_direct_CXX=no
++hardcode_libdir_flag_spec_CXX=
++hardcode_libdir_flag_spec_ld_CXX=
++hardcode_libdir_separator_CXX=
++hardcode_minus_L_CXX=no
++hardcode_automatic_CXX=no
++module_cmds_CXX=
++module_expsym_cmds_CXX=
++link_all_deplibs_CXX=unknown
++old_archive_cmds_CXX=$old_archive_cmds
++no_undefined_flag_CXX=
++whole_archive_flag_spec_CXX=
++enable_shared_with_static_runtimes_CXX=no
++
++# Dependencies to place before and after the object being linked:
++predep_objects_CXX=
++postdep_objects_CXX=
++predeps_CXX=
++postdeps_CXX=
++compiler_lib_search_path_CXX=
++
++# Source file extension for C++ test sources.
++ac_ext=cc
++
++# Object file extension for compiled C++ test sources.
++objext=o
++objext_CXX=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="int some_variable = 0;\n"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code='int main(int, char *) { return(0); }\n'
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
++
++# Allow CC to be a program name with arguments.
++compiler=$CC
++
++
++# Allow CC to be a program name with arguments.
++lt_save_CC=$CC
++lt_save_LD=$LD
++lt_save_GCC=$GCC
++GCC=$GXX
++lt_save_with_gnu_ld=$with_gnu_ld
++lt_save_path_LD=$lt_cv_path_LD
++if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
++  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
++else
++  unset lt_cv_prog_gnu_ld
++fi
++if test -n "${lt_cv_path_LDCXX+set}"; then
++  lt_cv_path_LD=$lt_cv_path_LDCXX
++else
++  unset lt_cv_path_LD
++fi
++test -z "${LDCXX+set}" || LD=$LDCXX
++CC=${CXX-"c++"}
++compiler=$CC
++compiler_CXX=$CC
++cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++
++# We don't want -fno-exception wen compiling C++ code, so set the
++# no_builtin_flag separately
++if test "$GXX" = yes; then
++  lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
++else
++  lt_prog_compiler_no_builtin_flag_CXX=
++fi
++
++if test "$GXX" = yes; then
++  # Set up default GNU C++ configuration
++
++  
++# Check whether --with-gnu-ld or --without-gnu-ld was given.
++if test "${with_gnu_ld+set}" = set; then
++  withval="$with_gnu_ld"
++  test "$withval" = no || with_gnu_ld=yes
++else
++  with_gnu_ld=no
++fi; 
++ac_prog=ld
++if test "$GCC" = yes; then
++  # Check if gcc -print-prog-name=ld gives a path.
++  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
++  case $host in
++  *-*-mingw*)
++    # gcc leaves a trailing carriage return which upsets mingw
++    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++  *)
++    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++  esac
++  case $ac_prog in
++    # Accept absolute paths.
++    [\\/]* | ?:[\\/]*)
++      re_direlt='/[^/][^/]*/\.\./'
++      # Canonicalize the pathname of ld
++      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
++      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
++      done
++      test -z "$LD" && LD="$ac_prog"
++      ;;
++  "")
++    # If it fails, then pretend we aren't using GCC.
++    ac_prog=ld
++    ;;
++  *)
++    # If it is relative, then search for the first ld in PATH.
++    with_gnu_ld=unknown
++    ;;
++  esac
++elif test "$with_gnu_ld" = yes; then
++  echo "$as_me:$LINENO: checking for GNU ld" >&5
++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
++else
++  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
++fi
++if test "${lt_cv_path_LD+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -z "$LD"; then
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
++      lt_cv_path_LD="$ac_dir/$ac_prog"
++      # Check to see if the program is GNU ld.  I'd rather use --version,
++      # but apparently some GNU ld's only accept -v.
++      # Break only if it was the GNU/non-GNU ld that we prefer.
++      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
++      *GNU* | *'with BFD'*)
++	test "$with_gnu_ld" != no && break
++	;;
++      *)
++	test "$with_gnu_ld" != yes && break
++	;;
++      esac
++    fi
++  done
++  IFS="$lt_save_ifs"
++else
++  lt_cv_path_LD="$LD" # Let the user override the test with a path.
++fi
++fi
++
++LD="$lt_cv_path_LD"
++if test -n "$LD"; then
++  echo "$as_me:$LINENO: result: $LD" >&5
++echo "${ECHO_T}$LD" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
++echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
++   { (exit 1); exit 1; }; }
++echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
++if test "${lt_cv_prog_gnu_ld+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
++case `$LD -v 2>&1 </dev/null` in
++*GNU* | *'with BFD'*)
++  lt_cv_prog_gnu_ld=yes
++  ;;
++*)
++  lt_cv_prog_gnu_ld=no
++  ;;
++esac
++fi
++echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
++with_gnu_ld=$lt_cv_prog_gnu_ld
++
++
++
++  # Check if GNU C++ uses GNU ld as the underlying linker, since the
++  # archiving commands below assume that GNU ld is being used.
++  if test "$with_gnu_ld" = yes; then
++    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++    archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++
++    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
++    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
++
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
++    #     investigate it a little bit more. (MM)
++    wlarc='${wl}'
++
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
++	grep 'no-whole-archive' > /dev/null; then
++      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    else
++      whole_archive_flag_spec_CXX=
++    fi
++  else
++    with_gnu_ld=no
++    wlarc=
++
++    # A generic and very simple default shared library creation
++    # command for GNU C++ for the case where it uses the native
++    # linker, instead of GNU ld.  If possible, this setting should
++    # overridden to take advantage of the native linker features on
++    # the platform it is being used on.
++    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++  fi
++
++  # Commands to make compiler produce verbose output that lists
++  # what "hidden" libraries, object files and flags are used when
++  # linking a shared library.
++  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++
++else
++  GXX=no
++  with_gnu_ld=no
++  wlarc=
++fi
++
++# PORTME: fill in a description of your system's C++ link characteristics
++echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++ld_shlibs_CXX=yes
++case $host_os in
++  aix3*)
++    # FIXME: insert proper C++ library support
++    ld_shlibs_CXX=no
++    ;;
++  aix4* | aix5*)
++    if test "$host_cpu" = ia64; then
++      # On IA64, the linker does run time linking by default, so we don't
++      # have to do anything special.
++      aix_use_runtimelinking=no
++      exp_sym_flag='-Bexport'
++      no_entry_flag=""
++    else
++      aix_use_runtimelinking=no
++
++      # Test if we are trying to use run time linking or normal
++      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++      # need to do runtime linking.
++      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++	for ld_flag in $LDFLAGS; do
++	  case $ld_flag in
++	  *-brtl*)
++	    aix_use_runtimelinking=yes
++	    break
++	    ;;
++	  esac
++	done
++      esac
++
++      exp_sym_flag='-bexport'
++      no_entry_flag='-bnoentry'
++    fi
++
++    # When large executables or shared objects are built, AIX ld can
++    # have problems creating the table of contents.  If linking a library
++    # or program results in "error TOC overflow" add -mminimal-toc to
++    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++    archive_cmds_CXX=''
++    hardcode_direct_CXX=yes
++    hardcode_libdir_separator_CXX=':'
++    link_all_deplibs_CXX=yes
++
++    if test "$GXX" = yes; then
++      case $host_os in aix4.012|aix4.012.*)
++      # We only want to do this on AIX 4.2 and lower, the check
++      # below for broken collect2 doesn't work under 4.3+
++	collect2name=`${CC} -print-prog-name=collect2`
++	if test -f "$collect2name" && \
++	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	then
++	  # We have reworked collect2
++	  hardcode_direct_CXX=yes
++	else
++	  # We have old collect2
++	  hardcode_direct_CXX=unsupported
++	  # It fails to find uninstalled libraries when the uninstalled
++	  # path is not listed in the libpath.  Setting hardcode_minus_L
++	  # to unsupported forces relinking
++	  hardcode_minus_L_CXX=yes
++	  hardcode_libdir_flag_spec_CXX='-L$libdir'
++	  hardcode_libdir_separator_CXX=
++	fi
++      esac
++      shared_flag='-shared'
++    else
++      # not using gcc
++      if test "$host_cpu" = ia64; then
++	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++	# chokes on -Wl,-G. The following line is correct:
++	shared_flag='-G'
++      else
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag='${wl}-G'
++	else
++	  shared_flag='${wl}-bM:SRE'
++	fi
++      fi
++    fi
++
++    # It seems that -bexpall does not export symbols beginning with
++    # underscore (_), so it is better to generate a list of symbols to export.
++    always_export_symbols_CXX=yes
++    if test "$aix_use_runtimelinking" = yes; then
++      # Warning - without using the other runtime loading flags (-brtl),
++      # -berok will link without error, but may produce a broken library.
++      allow_undefined_flag_CXX='-berok'
++      # Determine the default libpath from the value encoded in an empty executable.
++      cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++      hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
++
++      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++     else
++      if test "$host_cpu" = ia64; then
++	hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
++	allow_undefined_flag_CXX="-z nodefs"
++	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++      else
++	# Determine the default libpath from the value encoded in an empty executable.
++	cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++	hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
++	# Warning - without using the other run time loading flags,
++	# -berok will link without error, but may produce a broken library.
++	no_undefined_flag_CXX=' ${wl}-bernotok'
++	allow_undefined_flag_CXX=' ${wl}-berok'
++	# -bexpall does not export symbols beginning with underscore (_)
++	always_export_symbols_CXX=yes
++	# Exported symbols can be pulled into shared objects from archives
++	whole_archive_flag_spec_CXX=' '
++	archive_cmds_need_lc_CXX=yes
++	# This is similar to how AIX traditionally builds it's shared libraries.
++	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++      fi
++    fi
++    ;;
++  chorus*)
++    case $cc_basename in
++      *)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++    esac
++    ;;
++
++
++  cygwin* | mingw* | pw32*)
++    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
++    # as there is no search path for DLLs.
++    hardcode_libdir_flag_spec_CXX='-L$libdir'
++    allow_undefined_flag_CXX=unsupported
++    always_export_symbols_CXX=no
++    enable_shared_with_static_runtimes_CXX=yes
++
++    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++      # If the export-symbols file already is a .def file (1st line
++      # is EXPORTS), use it as is; otherwise, prepend...
++      archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	cp $export_symbols $output_objdir/$soname.def;
++      else
++	echo EXPORTS > $output_objdir/$soname.def;
++	cat $export_symbols >> $output_objdir/$soname.def;
++      fi~
++      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++    else
++      ld_shlibs_CXX=no
++    fi
++  ;;
++      darwin* | rhapsody*)
++        case "$host_os" in
++        rhapsody* | darwin1.[012])
++         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[012])
++               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++        esac
++      archive_cmds_need_lc_CXX=no
++      hardcode_direct_CXX=no
++      hardcode_automatic_CXX=yes
++      hardcode_shlibpath_var_CXX=unsupported
++      whole_archive_flag_spec_CXX=''
++      link_all_deplibs_CXX=yes
++
++    if test "$GXX" = yes ; then
++      lt_int_apple_cc_single_mod=no
++      output_verbose_link_cmd='echo'
++      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
++       lt_int_apple_cc_single_mod=yes
++      fi
++      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      else
++          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++        fi
++        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          else
++            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          fi
++            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      else
++      case "$cc_basename" in
++        xlc*)
++         output_verbose_link_cmd='echo'
++          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++          module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         ld_shlibs_CXX=no
++          ;;
++      esac
++      fi
++        ;;
++
++  dgux*)
++    case $cc_basename in
++      ec++)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      ghcx)
++	# Green Hills C++ Compiler
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++    esac
++    ;;
++  freebsd12*)
++    # C++ shared libraries reported to be fairly broken before switch to ELF
++    ld_shlibs_CXX=no
++    ;;
++  freebsd-elf*)
++    archive_cmds_need_lc_CXX=no
++    ;;
++  freebsd* | kfreebsd*-gnu)
++    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
++    # conventions
++    ld_shlibs_CXX=yes
++    ;;
++  gnu*)
++    ;;
++  hpux9*)
++    hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
++    hardcode_libdir_separator_CXX=:
++    export_dynamic_flag_spec_CXX='${wl}-E'
++    hardcode_direct_CXX=yes
++    hardcode_minus_L_CXX=yes # Not in the search PATH,
++				# but as the default
++				# location of the library.
++
++    case $cc_basename in
++    CC)
++      # FIXME: insert proper C++ library support
++      ld_shlibs_CXX=no
++      ;;
++    aCC)
++      archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      # Commands to make compiler produce verbose output that lists
++      # what "hidden" libraries, object files and flags are used when
++      # linking a shared library.
++      #
++      # There doesn't appear to be a way to prevent this compiler from
++      # explicitly linking system object files so we need to strip them
++      # from the output so that they don't get included in the library
++      # dependencies.
++      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++      ;;
++    *)
++      if test "$GXX" = yes; then
++        archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      else
++        # FIXME: insert proper C++ library support
++        ld_shlibs_CXX=no
++      fi
++      ;;
++    esac
++    ;;
++  hpux10*|hpux11*)
++    if test $with_gnu_ld = no; then
++      case "$host_cpu" in
++      hppa*64*)
++	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
++	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
++	hardcode_libdir_separator_CXX=:
++        ;;
++      ia64*)
++	hardcode_libdir_flag_spec_CXX='-L$libdir'
++        ;;
++      *)
++	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
++	hardcode_libdir_separator_CXX=:
++	export_dynamic_flag_spec_CXX='${wl}-E'
++        ;;
++      esac
++    fi
++    case "$host_cpu" in
++    hppa*64*)
++      hardcode_direct_CXX=no
++      hardcode_shlibpath_var_CXX=no
++      ;;
++    ia64*)
++      hardcode_direct_CXX=no
++      hardcode_shlibpath_var_CXX=no
++      hardcode_minus_L_CXX=yes # Not in the search PATH,
++					      # but as the default
++					      # location of the library.
++      ;;
++    *)
++      hardcode_direct_CXX=yes
++      hardcode_minus_L_CXX=yes # Not in the search PATH,
++					      # but as the default
++					      # location of the library.
++      ;;
++    esac
++
++    case $cc_basename in
++      CC)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      aCC)
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++	  ;;
++	*)
++	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  ;;
++	esac
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes; then
++	  if test $with_gnu_ld = no; then
++	    case "$host_cpu" in
++	    ia64*|hppa*64*)
++	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++	      ;;
++	    *)
++	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	      ;;
++	    esac
++	  fi
++	else
++	  # FIXME: insert proper C++ library support
++	  ld_shlibs_CXX=no
++	fi
++	;;
++    esac
++    ;;
++  irix5* | irix6*)
++    case $cc_basename in
++      CC)
++	# SGI C++
++	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++
++	# Archives containing C++ object files must be created using
++	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
++	# necessary to make sure instantiated templates are included
++	# in the archive.
++	old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
++	;;
++      *)
++	if test "$GXX" = yes; then
++	  if test "$with_gnu_ld" = no; then
++	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	  else
++	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
++	  fi
++	fi
++	link_all_deplibs_CXX=yes
++	;;
++    esac
++    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
++    hardcode_libdir_separator_CXX=:
++    ;;
++  linux*)
++    case $cc_basename in
++      KCC)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
++
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++	archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++
++	hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir'
++	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
++
++	# Archives containing C++ object files must be created using
++	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
++	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
++	;;
++      icpc)
++	# Intel C++
++	with_gnu_ld=yes
++	# version 8.0 and above of icpc choke on multiply defined symbols
++	# if we add $predep_objects and $postdep_objects, however 7.1 and
++	# earlier do not add the objects themselves.
++	case `$CC -V 2>&1` in
++	*"Version 7."*)
++  	  archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++  	  archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	*)  # Version 8.0 or newer
++  	  archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++  	archive_expsym_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	esac
++	archive_cmds_need_lc_CXX=no
++	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
++	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
++	;;
++      cxx)
++	# Compaq C++
++	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
++
++	runpath_var=LD_RUN_PATH
++	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
++	hardcode_libdir_separator_CXX=:
++
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++    esac
++    ;;
++  lynxos*)
++    # FIXME: insert proper C++ library support
++    ld_shlibs_CXX=no
++    ;;
++  m88k*)
++    # FIXME: insert proper C++ library support
++    ld_shlibs_CXX=no
++    ;;
++  mvs*)
++    case $cc_basename in
++      cxx)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++    esac
++    ;;
++  netbsd*)
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
++      wlarc=
++      hardcode_libdir_flag_spec_CXX='-R$libdir'
++      hardcode_direct_CXX=yes
++      hardcode_shlibpath_var_CXX=no
++    fi
++    # Workaround some broken pre-1.5 toolchains
++    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
++    ;;
++  openbsd2*)
++    # C++ shared libraries are fairly broken
++    ld_shlibs_CXX=no
++    ;;
++  openbsd*)
++    hardcode_direct_CXX=yes
++    hardcode_shlibpath_var_CXX=no
++    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++      export_dynamic_flag_spec_CXX='${wl}-E'
++      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    fi
++    output_verbose_link_cmd='echo'
++    ;;
++  osf3*)
++    case $cc_basename in
++      KCC)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
++
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++
++	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++	hardcode_libdir_separator_CXX=:
++
++	# Archives containing C++ object files must be created using
++	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
++	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
++
++	;;
++      RCC)
++	# Rational C++ 2.4.1
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      cxx)
++	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++
++	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
++	hardcode_libdir_separator_CXX=:
++
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
++	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++
++	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
++	  hardcode_libdir_separator_CXX=:
++
++	  # Commands to make compiler produce verbose output that lists
++	  # what "hidden" libraries, object files and flags are used when
++	  # linking a shared library.
++	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++
++	else
++	  # FIXME: insert proper C++ library support
++	  ld_shlibs_CXX=no
++	fi
++	;;
++    esac
++    ;;
++  osf4* | osf5*)
++    case $cc_basename in
++      KCC)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
++
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++
++	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++	hardcode_libdir_separator_CXX=:
++
++	# Archives containing C++ object files must be created using
++	# the KAI C++ compiler.
++	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
++	;;
++      RCC)
++	# Rational C++ 2.4.1
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      cxx)
++	allow_undefined_flag_CXX=' -expect_unresolved \*'
++	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
++	  echo "-hidden">> $lib.exp~
++	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
++	  $rm $lib.exp'
++
++	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
++	hardcode_libdir_separator_CXX=:
++
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
++	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++
++	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
++	  hardcode_libdir_separator_CXX=:
++
++	  # Commands to make compiler produce verbose output that lists
++	  # what "hidden" libraries, object files and flags are used when
++	  # linking a shared library.
++	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++
++	else
++	  # FIXME: insert proper C++ library support
++	  ld_shlibs_CXX=no
++	fi
++	;;
++    esac
++    ;;
++  psos*)
++    # FIXME: insert proper C++ library support
++    ld_shlibs_CXX=no
++    ;;
++  sco*)
++    archive_cmds_need_lc_CXX=no
++    case $cc_basename in
++      CC)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++    esac
++    ;;
++  sunos4*)
++    case $cc_basename in
++      CC)
++	# Sun C++ 4.x
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      lcc)
++	# Lucid
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++    esac
++    ;;
++  solaris*)
++    case $cc_basename in
++      CC)
++	# Sun C++ 4.2, 5.x and Centerline C++
++	no_undefined_flag_CXX=' -zdefs'
++	archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++
++	hardcode_libdir_flag_spec_CXX='-R$libdir'
++	hardcode_shlibpath_var_CXX=no
++	case $host_os in
++	  solaris2.0-5 | solaris2.0-5.*) ;;
++	  *)
++	    # The C++ compiler is used as linker so we must use $wl
++	    # flag to pass the commands to the underlying system
++	    # linker.
++	    # Supported since Solaris 2.6 (maybe 2.5.1?)
++	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    ;;
++	esac
++	link_all_deplibs_CXX=yes
++
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++
++	# Archives containing C++ object files must be created using
++	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
++	# necessary to make sure instantiated templates are included
++	# in the archive.
++	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
++	;;
++      gcx)
++	# Green Hills C++ Compiler
++	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++
++	# The C++ compiler must be used to create the archive.
++	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
++	;;
++      *)
++	# GNU C++ compiler with Solaris linker
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
++	  if $CC --version | grep -v '^2\.7' > /dev/null; then
++	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
++	  else
++	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
++	    # platform.
++	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
++	  fi
++
++	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
++	fi
++	;;
++    esac
++    ;;
++  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
++    archive_cmds_need_lc_CXX=no
++    ;;
++  tandem*)
++    case $cc_basename in
++      NCC)
++	# NonStop-UX NCC 3.20
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++    esac
++    ;;
++  vxworks*)
++    # FIXME: insert proper C++ library support
++    ld_shlibs_CXX=no
++    ;;
++  *)
++    # FIXME: insert proper C++ library support
++    ld_shlibs_CXX=no
++    ;;
++esac
++echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
++echo "${ECHO_T}$ld_shlibs_CXX" >&6
++test "$ld_shlibs_CXX" = no && can_build_shared=no
++
++GCC_CXX="$GXX"
++LD_CXX="$LD"
++
++## CAVEAT EMPTOR:
++## There is no encapsulation within the following macros, do not change
++## the running order or otherwise move them around unless you know exactly
++## what you are doing...
++
++cat > conftest.$ac_ext <<EOF
++class Foo
++{
++public:
++  Foo (void) { a = 0; }
++private:
++  int a;
++};
++EOF
++
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  # Parse the compiler output and extract the necessary
++  # objects, libraries and library flags.
++
++  # Sentinel used to keep track of whether or not we are before
++  # the conftest object file.
++  pre_test_object_deps_done=no
++
++  # The `*' in the case matches for architectures that use `case' in
++  # $output_verbose_cmd can trigger glob expansion during the loop
++  # eval without this substitution.
++  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
++
++  for p in `eval $output_verbose_link_cmd`; do
++    case $p in
++
++    -L* | -R* | -l*)
++       # Some compilers place space between "-{L,R}" and the path.
++       # Remove the space.
++       if test $p = "-L" \
++	  || test $p = "-R"; then
++	 prev=$p
++	 continue
++       else
++	 prev=
++       fi
++
++       if test "$pre_test_object_deps_done" = no; then
++	 case $p in
++	 -L* | -R*)
++	   # Internal compiler library paths should come after those
++	   # provided the user.  The postdeps already come after the
++	   # user supplied libs so there is no need to process them.
++	   if test -z "$compiler_lib_search_path_CXX"; then
++	     compiler_lib_search_path_CXX="${prev}${p}"
++	   else
++	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
++	   fi
++	   ;;
++	 # The "-l" case would never come before the object being
++	 # linked, so don't bother handling this case.
++	 esac
++       else
++	 if test -z "$postdeps_CXX"; then
++	   postdeps_CXX="${prev}${p}"
++	 else
++	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
++	 fi
++       fi
++       ;;
++
++    *.$objext)
++       # This assumes that the test object file only shows up
++       # once in the compiler output.
++       if test "$p" = "conftest.$objext"; then
++	 pre_test_object_deps_done=yes
++	 continue
++       fi
++
++       if test "$pre_test_object_deps_done" = no; then
++	 if test -z "$predep_objects_CXX"; then
++	   predep_objects_CXX="$p"
++	 else
++	   predep_objects_CXX="$predep_objects_CXX $p"
++	 fi
++       else
++	 if test -z "$postdep_objects_CXX"; then
++	   postdep_objects_CXX="$p"
++	 else
++	   postdep_objects_CXX="$postdep_objects_CXX $p"
++	 fi
++       fi
++       ;;
++
++    *) ;; # Ignore the rest.
++
++    esac
++  done
++
++  # Clean up.
++  rm -f a.out a.exe
++else
++  echo "libtool.m4: error: problem compiling CXX test program"
++fi
++
++$rm -f confest.$objext
++
++case " $postdeps_CXX " in
++*" -lc "*) archive_cmds_need_lc_CXX=no ;;
++esac
++
++lt_prog_compiler_wl_CXX=
++lt_prog_compiler_pic_CXX=
++lt_prog_compiler_static_CXX=
++
++echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++ 
++  # C++ specific cases for pic, static, wl, etc.
++  if test "$GXX" = yes; then
++    lt_prog_compiler_wl_CXX='-Wl,'
++    lt_prog_compiler_static_CXX='-static'
++
++    case $host_os in
++    aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static_CXX='-Bstatic'
++      fi
++      ;;
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
++      ;;
++    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++    mingw* | os2* | pw32*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
++      ;;
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_prog_compiler_pic_CXX='-fno-common'
++      ;;
++    *djgpp*)
++      # DJGPP does not support shared libraries at all
++      lt_prog_compiler_pic_CXX=
++      ;;
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	lt_prog_compiler_pic_CXX=-Kconform_pic
++      fi
++      ;;
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	;;
++      *)
++	lt_prog_compiler_pic_CXX='-fPIC'
++	;;
++      esac
++      ;;
++    *)
++      lt_prog_compiler_pic_CXX='-fPIC'
++      ;;
++    esac
++  else
++    case $host_os in
++      aix4* | aix5*)
++	# All AIX code is PIC.
++	if test "$host_cpu" = ia64; then
++	  # AIX 5 now supports IA64 processor
++	  lt_prog_compiler_static_CXX='-Bstatic'
++	else
++	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
++	fi
++	;;
++      chorus*)
++	case $cc_basename in
++	cxch68)
++	  # Green Hills C++ Compiler
++	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
++	  ;;
++	esac
++	;;
++       darwin*)
++         # PIC is the default on this platform
++         # Common symbols not allowed in MH_DYLIB files
++         case "$cc_basename" in
++           xlc*)
++           lt_prog_compiler_pic_CXX='-qnocommon'
++           lt_prog_compiler_wl_CXX='-Wl,'
++           ;;
++         esac
++       ;;
++      dgux*)
++	case $cc_basename in
++	  ec++)
++	    lt_prog_compiler_pic_CXX='-KPIC'
++	    ;;
++	  ghcx)
++	    # Green Hills C++ Compiler
++	    lt_prog_compiler_pic_CXX='-pic'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      freebsd* | kfreebsd*-gnu)
++	# FreeBSD uses GNU C++
++	;;
++      hpux9* | hpux10* | hpux11*)
++	case $cc_basename in
++	  CC)
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
++	    if test "$host_cpu" != ia64; then
++	      lt_prog_compiler_pic_CXX='+Z'
++	    fi
++	    ;;
++	  aCC)
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
++	    case "$host_cpu" in
++	    hppa*64*|ia64*)
++	      # +Z the default
++	      ;;
++	    *)
++	      lt_prog_compiler_pic_CXX='+Z'
++	      ;;
++	    esac
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      irix5* | irix6* | nonstopux*)
++	case $cc_basename in
++	  CC)
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_static_CXX='-non_shared'
++	    # CC pic flag -KPIC is the default.
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      linux*)
++	case $cc_basename in
++	  KCC)
++	    # KAI C++ Compiler
++	    lt_prog_compiler_wl_CXX='--backend -Wl,'
++	    lt_prog_compiler_pic_CXX='-fPIC'
++	    ;;
++	  icpc)
++	    # Intel C++
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_pic_CXX='-KPIC'
++	    lt_prog_compiler_static_CXX='-static'
++	    ;;
++	  cxx)
++	    # Compaq C++
++	    # Make sure the PIC flag is empty.  It appears that all Alpha
++	    # Linux and Compaq Tru64 Unix objects are PIC.
++	    lt_prog_compiler_pic_CXX=
++	    lt_prog_compiler_static_CXX='-non_shared'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      lynxos*)
++	;;
++      m88k*)
++	;;
++      mvs*)
++	case $cc_basename in
++	  cxx)
++	    lt_prog_compiler_pic_CXX='-W c,exportall'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      netbsd*)
++	;;
++      osf3* | osf4* | osf5*)
++	case $cc_basename in
++	  KCC)
++	    lt_prog_compiler_wl_CXX='--backend -Wl,'
++	    ;;
++	  RCC)
++	    # Rational C++ 2.4.1
++	    lt_prog_compiler_pic_CXX='-pic'
++	    ;;
++	  cxx)
++	    # Digital/Compaq C++
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    # Make sure the PIC flag is empty.  It appears that all Alpha
++	    # Linux and Compaq Tru64 Unix objects are PIC.
++	    lt_prog_compiler_pic_CXX=
++	    lt_prog_compiler_static_CXX='-non_shared'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      psos*)
++	;;
++      sco*)
++	case $cc_basename in
++	  CC)
++	    lt_prog_compiler_pic_CXX='-fPIC'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      solaris*)
++	case $cc_basename in
++	  CC)
++	    # Sun C++ 4.2, 5.x and Centerline C++
++	    lt_prog_compiler_pic_CXX='-KPIC'
++	    lt_prog_compiler_static_CXX='-Bstatic'
++	    lt_prog_compiler_wl_CXX='-Qoption ld '
++	    ;;
++	  gcx)
++	    # Green Hills C++ Compiler
++	    lt_prog_compiler_pic_CXX='-PIC'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      sunos4*)
++	case $cc_basename in
++	  CC)
++	    # Sun C++ 4.x
++	    lt_prog_compiler_pic_CXX='-pic'
++	    lt_prog_compiler_static_CXX='-Bstatic'
++	    ;;
++	  lcc)
++	    # Lucid
++	    lt_prog_compiler_pic_CXX='-pic'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      tandem*)
++	case $cc_basename in
++	  NCC)
++	    # NonStop-UX NCC 3.20
++	    lt_prog_compiler_pic_CXX='-KPIC'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      unixware*)
++	;;
++      vxworks*)
++	;;
++      *)
++	lt_prog_compiler_can_build_shared_CXX=no
++	;;
++    esac
++  fi
++
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
++
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$lt_prog_compiler_pic_CXX"; then
++  
++echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
++if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_pic_works_CXX=no
++  ac_outfile=conftest.$ac_objext
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:__oline__: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s conftest.err; then
++       lt_prog_compiler_pic_works_CXX=yes
++     fi
++   fi
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
++
++if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
++    case $lt_prog_compiler_pic_CXX in
++     "" | " "*) ;;
++     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
++     esac
++else
++    lt_prog_compiler_pic_CXX=
++     lt_prog_compiler_can_build_shared_CXX=no
++fi
++
++fi
++case "$host_os" in
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    lt_prog_compiler_pic_CXX=
++    ;;
++  *)
++    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
++    ;;
++esac
++
++echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_prog_compiler_c_o_CXX=no
++   $rm -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&5
++   echo "$as_me:__oline__: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s out/conftest2.$ac_objext
++   then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s out/conftest.err; then
++       lt_cv_prog_compiler_c_o_CXX=yes
++     fi
++   fi
++   chmod u+w .
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
++   cd ..
++   rmdir conftest
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6
++
++
++hard_links="nottested"
++if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6
++  if test "$hard_links" = no; then
++    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
++
++echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++
++  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  case $host_os in
++  aix4* | aix5*)
++    # If we're using GNU nm, then we don't want the "-C" option.
++    # -C means demangle to AIX nm, but means don't demangle with GNU nm
++    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
++      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++    else
++      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++    fi
++    ;;
++  pw32*)
++    export_symbols_cmds_CXX="$ltdll_cmds"
++  ;;
++  cygwin* | mingw*)
++    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++  ;;
++  *)
++    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  ;;
++  esac
++
++echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
++echo "${ECHO_T}$ld_shlibs_CXX" >&6
++test "$ld_shlibs_CXX" = no && can_build_shared=no
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
++#
++# Do we need to explicitly link libc?
++#
++case "x$archive_cmds_need_lc_CXX" in
++x|xyes)
++  # Assume -lc should be added
++  archive_cmds_need_lc_CXX=yes
++
++  if test "$enable_shared" = yes && test "$GCC" = yes; then
++    case $archive_cmds_CXX in
++    *'~'*)
++      # FIXME: we may have to deal with multi-command sequences.
++      ;;
++    '$CC '*)
++      # Test whether the compiler implicitly links with -lc since on some
++      # systems, -lgcc has to come before -lc. If gcc already passes -lc
++      # to ld, don't add -lc before -lgcc.
++      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++      $rm conftest*
++      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        libobjs=conftest.$ac_objext
++        deplibs=
++        wl=$lt_prog_compiler_wl_CXX
++        compiler_flags=-v
++        linker_flags=-v
++        verstring=
++        output_objdir=.
++        libname=conftest
++        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
++        allow_undefined_flag_CXX=
++        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
++  (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++        then
++	  archive_cmds_need_lc_CXX=no
++        else
++	  archive_cmds_need_lc_CXX=yes
++        fi
++        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
++      else
++        cat conftest.err 1>&5
++      fi
++      $rm conftest*
++      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6
++      ;;
++    esac
++  fi
++  ;;
++esac
++
++echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
++need_lib_prefix=unknown
++hardcode_into_libs=no
++
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
++
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  shlibpath_var=LIBPATH
++
++  # AIX 3 has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}${shared_ext}$major'
++  ;;
++
++aix4* | aix5*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[01] | aix4.[01].*)
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	   echo ' yes '
++	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++	:
++      else
++	can_build_shared=no
++      fi
++      ;;
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}${shared_ext}$major'
++    fi
++    shlibpath_var=LIBPATH
++  fi
++  ;;
++
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++  ;;
++
++beos*)
++  library_names_spec='${libname}${shared_ext}'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
++
++bsdi[45]*)
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
++
++cygwin* | mingw* | pw32*)
++  version_type=windows
++  shrext_cmds=".dll"
++  need_version=no
++  need_lib_prefix=no
++
++  case $GCC,$host_os in
++  yes,cygwin* | yes,mingw* | yes,pw32*)
++    library_names_spec='$libname.dll.a'
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $rm \$dlpath'
++    shlibpath_overrides_runpath=yes
++
++    case $host_os in
++    cygwin*)
++      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
++    mingw*)
++      # MinGW DLLs use traditional 'lib' prefix
++      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
++        # It is most probably a Windows format PATH printed by
++        # mingw gcc, but we are running on Cygwin. Gcc prints its search
++        # path with ; separators, and with drive letters. We can handle the
++        # drive letters (cygwin fileutils understands them), so leave them,
++        # especially as we might pass files found there to a mingw objdump,
++        # which wouldn't understand a cygwinified path. Ahh.
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++      fi
++      ;;
++    pw32*)
++      # pw32 DLLs use 'pw' prefix rather than 'lib'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++      ;;
++    esac
++    ;;
++
++  *)
++    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    ;;
++  esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  ;;
++
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  soname_spec='${libname}${release}${major}$shared_ext'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
++  if test "$GCC" = yes; then
++    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
++  else
++    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
++  fi
++  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++  ;;
++
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++freebsd1*)
++  dynamic_linker=no
++  ;;
++
++kfreebsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++freebsd*)
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
++    ;;
++  freebsd3.01* | freebsdelf3.01*)
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
++  *) # from 3.2 on
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
++    ;;
++  esac
++  ;;
++
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  ;;
++
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  case "$host_cpu" in
++  ia64*)
++    shrext_cmds='.so'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.so"
++    shlibpath_var=LD_LIBRARY_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    if test "X$HPUX_IA64_MODE" = X32; then
++      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++    else
++      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++    fi
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    ;;
++   hppa*64*)
++     shrext_cmds='.sl'
++     hardcode_into_libs=yes
++     dynamic_linker="$host_os dld.sl"
++     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++     soname_spec='${libname}${release}${shared_ext}$major'
++     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++     ;;
++   *)
++    shrext_cmds='.sl'
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=SHLIB_PATH
++    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    ;;
++  esac
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
++    *)
++	if test "$lt_cv_prog_gnu_ld" = yes; then
++		version_type=linux
++	else
++		version_type=irix
++	fi ;;
++  esac
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  case $host_os in
++  irix5* | nonstopux*)
++    libsuff= shlibsuff=
++    ;;
++  *)
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++      libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++      libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++      libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  hardcode_into_libs=yes
++  ;;
++
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++  dynamic_linker=no
++  ;;
++
++# This must be Linux ELF.
++linux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
++
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
++
++knetbsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++nto-qnx*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++openbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    case $host_os in
++      openbsd2.[89] | openbsd2.[89].*)
++	shlibpath_overrides_runpath=no
++	;;
++      *)
++	shlibpath_overrides_runpath=yes
++	;;
++      esac
++  else
++    shlibpath_overrides_runpath=yes
++  fi
++  ;;
++
++os2*)
++  libname_spec='$name'
++  shrext_cmds=".dll"
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
++
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
++
++sco3.2v5*)
++  version_type=osf
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
++
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      export_dynamic_flag_spec='${wl}-Blargedynsym'
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
++
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
++
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++*)
++  dynamic_linker=no
++  ;;
++esac
++echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6
++test "$dynamic_linker" = no && can_build_shared=no
++
++echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++hardcode_action_CXX=
++if test -n "$hardcode_libdir_flag_spec_CXX" || \
++   test -n "$runpath_var_CXX" || \
++   test "X$hardcode_automatic_CXX" = "Xyes" ; then
++
++  # We can hardcode non-existant directories.
++  if test "$hardcode_direct_CXX" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
++     test "$hardcode_minus_L_CXX" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action_CXX=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action_CXX=immediate
++  fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action_CXX=unsupported
++fi
++echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
++echo "${ECHO_T}$hardcode_action_CXX" >&6
++
++if test "$hardcode_action_CXX" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
++
++striplib=
++old_striplib=
++echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
++echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
++  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++else
++# FIXME - insert some real tests, host_os isn't really good enough
++  case $host_os in
++   darwin*)
++       if test -n "$STRIP" ; then
++         striplib="$STRIP -x"
++         echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++       else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++       ;;
++   *)
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++    ;;
++  esac
++fi
++
++if test "x$enable_dlopen" != xyes; then
++  enable_dlopen=unknown
++  enable_dlopen_self=unknown
++  enable_dlopen_self_static=unknown
++else
++  lt_cv_dlopen=no
++  lt_cv_dlopen_libs=
++
++  case $host_os in
++  beos*)
++    lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ;;
++
++  mingw* | pw32*)
++    lt_cv_dlopen="LoadLibrary"
++    lt_cv_dlopen_libs=
++   ;;
++
++  cygwin*)
++    lt_cv_dlopen="dlopen"
++    lt_cv_dlopen_libs=
++   ;;
++
++  darwin*)
++  # if libdl is installed we need to link against it
++    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dl_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dl_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++if test $ac_cv_lib_dl_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++  
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    
++fi
++
++   ;;
++
++  *)
++    echo "$as_me:$LINENO: checking for shl_load" >&5
++echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
++if test "${ac_cv_func_shl_load+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.  */
++/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define shl_load innocuous_shl_load
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char shl_load (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef shl_load
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char shl_load ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_shl_load) || defined (__stub___shl_load)
++choke me
++#else
++char (*f) () = shl_load;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != shl_load;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_shl_load=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_shl_load=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
++echo "${ECHO_T}$ac_cv_func_shl_load" >&6
++if test $ac_cv_func_shl_load = yes; then
++  lt_cv_dlopen="shl_load"
++else
++  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
++echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
++if test "${ac_cv_lib_dld_shl_load+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char shl_load ();
++int
++main ()
++{
++shl_load ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dld_shl_load=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dld_shl_load=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
++if test $ac_cv_lib_dld_shl_load = yes; then
++  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
++else
++  echo "$as_me:$LINENO: checking for dlopen" >&5
++echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
++if test "${ac_cv_func_dlopen+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.  */
++/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define dlopen innocuous_dlopen
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char dlopen (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef dlopen
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_dlopen) || defined (__stub___dlopen)
++choke me
++#else
++char (*f) () = dlopen;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != dlopen;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
++echo "${ECHO_T}$ac_cv_func_dlopen" >&6
++if test $ac_cv_func_dlopen = yes; then
++  lt_cv_dlopen="dlopen"
++else
++  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dl_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dl_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++if test $ac_cv_lib_dl_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
++echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
++if test "${ac_cv_lib_svld_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsvld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_svld_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_svld_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
++if test $ac_cv_lib_svld_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
++else
++  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
++echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
++if test "${ac_cv_lib_dld_dld_link+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dld_link ();
++int
++main ()
++{
++dld_link ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dld_dld_link=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dld_dld_link=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
++if test $ac_cv_lib_dld_dld_link = yes; then
++  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
++fi
++
++	      
++fi
++
++	    
++fi
++
++	  
++fi
++
++	
++fi
++
++      
++fi
++
++    ;;
++  esac
++
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
++  else
++    enable_dlopen=no
++  fi
++
++  case $lt_cv_dlopen in
++  dlopen)
++    save_CPPFLAGS="$CPPFLAGS"
++    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++
++    save_LDFLAGS="$LDFLAGS"
++    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++
++    save_LIBS="$LIBS"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
++
++    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
++echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
++if test "${lt_cv_dlopen_self+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self=cross
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++#line __oline__ "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}
++EOF
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self=no
++  fi
++fi
++rm -fr conftest*
++
++    
++fi
++echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self" >&6
++
++    if test "x$lt_cv_dlopen_self" = xyes; then
++      LDFLAGS="$LDFLAGS $link_static_flag"
++      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
++echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
++if test "${lt_cv_dlopen_self_static+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self_static=cross
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++#line __oline__ "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}
++EOF
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self_static=no
++  fi
++fi
++rm -fr conftest*
++
++      
++fi
++echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
++    fi
++
++    CPPFLAGS="$save_CPPFLAGS"
++    LDFLAGS="$save_LDFLAGS"
++    LIBS="$save_LIBS"
++    ;;
++  esac
++
++  case $lt_cv_dlopen_self in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
++  esac
++
++  case $lt_cv_dlopen_self_static in
++  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++  *) enable_dlopen_self_static=unknown ;;
++  esac
++fi
++
++
++# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # See if we are running on zsh, and set the options which allow our commands through
++  # without removal of \ escapes.
++  if test -n "${ZSH_VERSION+set}" ; then
++    setopt NO_GLOB_SUBST
++  fi
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++    SED SHELL STRIP \
++    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++    deplibs_check_method reload_flag reload_cmds need_locks \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    old_postinstall_cmds old_postuninstall_cmds \
++    compiler_CXX \
++    CC_CXX \
++    LD_CXX \
++    lt_prog_compiler_wl_CXX \
++    lt_prog_compiler_pic_CXX \
++    lt_prog_compiler_static_CXX \
++    lt_prog_compiler_no_builtin_flag_CXX \
++    export_dynamic_flag_spec_CXX \
++    thread_safe_flag_spec_CXX \
++    whole_archive_flag_spec_CXX \
++    enable_shared_with_static_runtimes_CXX \
++    old_archive_cmds_CXX \
++    old_archive_from_new_cmds_CXX \
++    predep_objects_CXX \
++    postdep_objects_CXX \
++    predeps_CXX \
++    postdeps_CXX \
++    compiler_lib_search_path_CXX \
++    archive_cmds_CXX \
++    archive_expsym_cmds_CXX \
++    postinstall_cmds_CXX \
++    postuninstall_cmds_CXX \
++    old_archive_from_expsyms_cmds_CXX \
++    allow_undefined_flag_CXX \
++    no_undefined_flag_CXX \
++    export_symbols_cmds_CXX \
++    hardcode_libdir_flag_spec_CXX \
++    hardcode_libdir_flag_spec_ld_CXX \
++    hardcode_libdir_separator_CXX \
++    hardcode_automatic_CXX \
++    module_cmds_CXX \
++    module_expsym_cmds_CXX \
++    lt_cv_prog_compiler_c_o_CXX \
++    exclude_expsyms_CXX \
++    include_expsyms_CXX; do
++
++    case $var in
++    old_archive_cmds_CXX | \
++    old_archive_from_new_cmds_CXX | \
++    archive_cmds_CXX | \
++    archive_expsym_cmds_CXX | \
++    module_cmds_CXX | \
++    module_expsym_cmds_CXX | \
++    old_archive_from_expsyms_cmds_CXX | \
++    export_symbols_cmds_CXX | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  case $lt_echo in
++  *'\$0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
++    ;;
++  esac
++
++cfgfile="$ofile"
++
++  cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
++
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_CXX
++
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
++
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
++
++# A C compiler.
++LTCC=$lt_LTCC
++
++# A language-specific compiler.
++CC=$lt_compiler_CXX
++
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_CXX
++
++# An ERE matcher.
++EGREP=$lt_EGREP
++
++# The linker used to build libraries.
++LD=$lt_LD_CXX
++
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
++
++# A BSD-compatible nm program.
++NM=$lt_NM
++
++# A symbol stripping program
++STRIP=$lt_STRIP
++
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_CXX
++
++# Object file suffix (normally "o").
++objext="$ac_objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
++
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic_CXX
++pic_mode=$pic_mode
++
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
++
++# Must we lock files when doing compilation ?
++need_locks=$lt_need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_CXX
++
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
++
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
++
++# Library versioning type.
++version_type=$version_type
++
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
++
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds_CXX
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
++
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
++
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
++
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds_CXX
++archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
++
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds_CXX
++module_expsym_cmds=$lt_module_expsym_cmds_CXX
++
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_CXX
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_CXX
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps_CXX
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps_CXX
++
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
++
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_CXX
++
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_CXX
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
++
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
++
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
++
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action_CXX
++
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
++
++# If ld is used when linking, flag to hardcode \$libdir into
++# a binary during linking. This must work even if \$libdir does
++# not exist.
++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
++
++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct_CXX
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L_CXX
++
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
++
++# Set to yes if building a shared library automatically hardcodes DIR into the library
++# and all subsequent libraries and executables linked against it.
++hardcode_automatic=$hardcode_automatic_CXX
++
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
++
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs_CXX
++
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path_CXX"
++
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols_CXX
++
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds_CXX
++
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms_CXX
++
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms_CXX
++
++# ### END LIBTOOL TAG CONFIG: $tagname
++
++__EOF__
++
++
++else
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
++fi
++
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++CC=$lt_save_CC
++LDCXX=$LD
++LD=$lt_save_LD
++GCC=$lt_save_GCC
++with_gnu_ldcxx=$with_gnu_ld
++with_gnu_ld=$lt_save_with_gnu_ld
++lt_cv_path_LDCXX=$lt_cv_path_LD
++lt_cv_path_LD=$lt_save_path_LD
++lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
++lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
++
++	else
++	  tagname=""
++	fi
++	;;
++
++      F77)
++	if test -n "$F77" && test "X$F77" != "Xno"; then
++	  
++ac_ext=f
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
++
++
++archive_cmds_need_lc_F77=no
++allow_undefined_flag_F77=
++always_export_symbols_F77=no
++archive_expsym_cmds_F77=
++export_dynamic_flag_spec_F77=
++hardcode_direct_F77=no
++hardcode_libdir_flag_spec_F77=
++hardcode_libdir_flag_spec_ld_F77=
++hardcode_libdir_separator_F77=
++hardcode_minus_L_F77=no
++hardcode_automatic_F77=no
++module_cmds_F77=
++module_expsym_cmds_F77=
++link_all_deplibs_F77=unknown
++old_archive_cmds_F77=$old_archive_cmds
++no_undefined_flag_F77=
++whole_archive_flag_spec_F77=
++enable_shared_with_static_runtimes_F77=no
++
++# Source file extension for f77 test sources.
++ac_ext=f
++
++# Object file extension for compiled f77 test sources.
++objext=o
++objext_F77=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code="      program t\n      end\n"
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
++
++# Allow CC to be a program name with arguments.
++compiler=$CC
++
++
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${F77-"f77"}
++compiler=$CC
++compiler_F77=$CC
++cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++
++echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
++echo "$as_me:$LINENO: result: $can_build_shared" >&5
++echo "${ECHO_T}$can_build_shared" >&6
++
++echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
++test "$can_build_shared" = "no" && enable_shared=no
++
++# On AIX, shared libraries and static libraries use the same namespace, and
++# are all built from PIC.
++case "$host_os" in
++aix3*)
++  test "$enable_shared" = yes && enable_static=no
++  if test -n "$RANLIB"; then
++    archive_cmds="$archive_cmds~\$RANLIB \$lib"
++    postinstall_cmds='$RANLIB $lib'
++  fi
++  ;;
++aix4* | aix5*)
++  test "$enable_shared" = yes && enable_static=no
++  ;;
++esac
++echo "$as_me:$LINENO: result: $enable_shared" >&5
++echo "${ECHO_T}$enable_shared" >&6
++
++echo "$as_me:$LINENO: checking whether to build static libraries" >&5
++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
++# Make sure either enable_shared or enable_static is yes.
++test "$enable_shared" = yes || enable_static=yes
++echo "$as_me:$LINENO: result: $enable_static" >&5
++echo "${ECHO_T}$enable_static" >&6
++
++test "$ld_shlibs_F77" = no && can_build_shared=no
++
++GCC_F77="$G77"
++LD_F77="$LD"
++
++lt_prog_compiler_wl_F77=
++lt_prog_compiler_pic_F77=
++lt_prog_compiler_static_F77=
++
++echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++ 
++  if test "$GCC" = yes; then
++    lt_prog_compiler_wl_F77='-Wl,'
++    lt_prog_compiler_static_F77='-static'
++
++    case $host_os in
++      aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static_F77='-Bstatic'
++      fi
++      ;;
++
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
++      ;;
++
++    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
++      ;;
++
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_prog_compiler_pic_F77='-fno-common'
++      ;;
++
++    msdosdjgpp*)
++      # Just because we use GCC doesn't mean we suddenly get shared libraries
++      # on systems that don't support them.
++      lt_prog_compiler_can_build_shared_F77=no
++      enable_shared=no
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	lt_prog_compiler_pic_F77=-Kconform_pic
++      fi
++      ;;
++
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic_F77='-fPIC'
++	;;
++      esac
++      ;;
++
++    *)
++      lt_prog_compiler_pic_F77='-fPIC'
++      ;;
++    esac
++  else
++    # PORTME Check for flag to pass linker flags through the system compiler.
++    case $host_os in
++    aix*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static_F77='-Bstatic'
++      else
++	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
++      fi
++      ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case "$cc_basename" in
++         xlc*)
++         lt_prog_compiler_pic_F77='-qnocommon'
++         lt_prog_compiler_wl_F77='-Wl,'
++         ;;
++       esac
++       ;;
++
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
++      ;;
++
++    hpux9* | hpux10* | hpux11*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic_F77='+Z'
++	;;
++      esac
++      # Is there a better lt_prog_compiler_static that works with the bundled CC?
++      lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      # PIC (with -KPIC) is the default.
++      lt_prog_compiler_static_F77='-non_shared'
++      ;;
++
++    newsos6)
++      lt_prog_compiler_pic_F77='-KPIC'
++      lt_prog_compiler_static_F77='-Bstatic'
++      ;;
++
++    linux*)
++      case $CC in
++      icc* | ecc*)
++	lt_prog_compiler_wl_F77='-Wl,'
++	lt_prog_compiler_pic_F77='-KPIC'
++	lt_prog_compiler_static_F77='-static'
++        ;;
++      ccc*)
++        lt_prog_compiler_wl_F77='-Wl,'
++        # All Alpha code is PIC.
++        lt_prog_compiler_static_F77='-non_shared'
++        ;;
++      esac
++      ;;
++
++    osf3* | osf4* | osf5*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      # All OSF/1 code is PIC.
++      lt_prog_compiler_static_F77='-non_shared'
++      ;;
++
++    sco3.2v5*)
++      lt_prog_compiler_pic_F77='-Kpic'
++      lt_prog_compiler_static_F77='-dn'
++      ;;
++
++    solaris*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      lt_prog_compiler_pic_F77='-KPIC'
++      lt_prog_compiler_static_F77='-Bstatic'
++      ;;
++
++    sunos4*)
++      lt_prog_compiler_wl_F77='-Qoption ld '
++      lt_prog_compiler_pic_F77='-PIC'
++      lt_prog_compiler_static_F77='-Bstatic'
++      ;;
++
++    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      lt_prog_compiler_pic_F77='-KPIC'
++      lt_prog_compiler_static_F77='-Bstatic'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	lt_prog_compiler_pic_F77='-Kconform_pic'
++	lt_prog_compiler_static_F77='-Bstatic'
++      fi
++      ;;
++
++    uts4*)
++      lt_prog_compiler_pic_F77='-pic'
++      lt_prog_compiler_static_F77='-Bstatic'
++      ;;
++
++    *)
++      lt_prog_compiler_can_build_shared_F77=no
++      ;;
++    esac
++  fi
++
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
++
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$lt_prog_compiler_pic_F77"; then
++  
++echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
++if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_pic_works_F77=no
++  ac_outfile=conftest.$ac_objext
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$lt_prog_compiler_pic_F77"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:__oline__: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s conftest.err; then
++       lt_prog_compiler_pic_works_F77=yes
++     fi
++   fi
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
++
++if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
++    case $lt_prog_compiler_pic_F77 in
++     "" | " "*) ;;
++     *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
++     esac
++else
++    lt_prog_compiler_pic_F77=
++     lt_prog_compiler_can_build_shared_F77=no
++fi
++
++fi
++case "$host_os" in
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    lt_prog_compiler_pic_F77=
++    ;;
++  *)
++    lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
++    ;;
++esac
++
++echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_prog_compiler_c_o_F77=no
++   $rm -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&5
++   echo "$as_me:__oline__: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s out/conftest2.$ac_objext
++   then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s out/conftest.err; then
++       lt_cv_prog_compiler_c_o_F77=yes
++     fi
++   fi
++   chmod u+w .
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
++   cd ..
++   rmdir conftest
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
++
++
++hard_links="nottested"
++if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6
++  if test "$hard_links" = no; then
++    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
++
++echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++
++  runpath_var=
++  allow_undefined_flag_F77=
++  enable_shared_with_static_runtimes_F77=no
++  archive_cmds_F77=
++  archive_expsym_cmds_F77=
++  old_archive_From_new_cmds_F77=
++  old_archive_from_expsyms_cmds_F77=
++  export_dynamic_flag_spec_F77=
++  whole_archive_flag_spec_F77=
++  thread_safe_flag_spec_F77=
++  hardcode_libdir_flag_spec_F77=
++  hardcode_libdir_flag_spec_ld_F77=
++  hardcode_libdir_separator_F77=
++  hardcode_direct_F77=no
++  hardcode_minus_L_F77=no
++  hardcode_shlibpath_var_F77=unsupported
++  link_all_deplibs_F77=unknown
++  hardcode_automatic_F77=no
++  module_cmds_F77=
++  module_expsym_cmds_F77=
++  always_export_symbols_F77=no
++  export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  # include_expsyms should be a list of space-separated symbols to be *always*
++  # included in the symbol list
++  include_expsyms_F77=
++  # exclude_expsyms can be an extended regexp of symbols to exclude
++  # it will be wrapped by ` (' and `)$', so one must not match beginning or
++  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++  # as well as any symbol that contains `d'.
++  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
++  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++  # platforms (ab)use it in PIC code, but their linkers get confused if
++  # the symbol is explicitly referenced.  Since portable code cannot
++  # rely on this symbol name, it's probably fine to never include it in
++  # preloaded symbol tables.
++  extract_expsyms_cmds=
++
++  case $host_os in
++  cygwin* | mingw* | pw32*)
++    # FIXME: the MSVC++ port hasn't been tested in a loooong time
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    if test "$GCC" != yes; then
++      with_gnu_ld=no
++    fi
++    ;;
++  openbsd*)
++    with_gnu_ld=no
++    ;;
++  esac
++
++  ld_shlibs_F77=yes
++  if test "$with_gnu_ld" = yes; then
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    wlarc='${wl}'
++
++    # See if GNU ld supports shared libraries.
++    case $host_os in
++    aix3* | aix4* | aix5*)
++      # On AIX/PPC, the GNU linker is very broken
++      if test "$host_cpu" != ia64; then
++	ld_shlibs_F77=no
++	cat <<EOF 1>&2
++
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
++
++EOF
++      fi
++      ;;
++
++    amigaos*)
++      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      hardcode_minus_L_F77=yes
++
++      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
++      # that the semantics of dynamic libraries on AmigaOS, at least up
++      # to version 4, is to share data among multiple programs linked
++      # with the same dynamic library.  Since this doesn't match the
++      # behavior of shared libraries on other platforms, we can't use
++      # them.
++      ld_shlibs_F77=no
++      ;;
++
++    beos*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	allow_undefined_flag_F77=unsupported
++	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++	# support --undefined.  This deserves some investigation.  FIXME
++	archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      else
++	ld_shlibs_F77=no
++      fi
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
++      # as there is no search path for DLLs.
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      allow_undefined_flag_F77=unsupported
++      always_export_symbols_F77=no
++      enable_shared_with_static_runtimes_F77=yes
++      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++
++      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++	# If the export-symbols file already is a .def file (1st line
++	# is EXPORTS), use it as is; otherwise, prepend...
++	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	  cp $export_symbols $output_objdir/$soname.def;
++	else
++	  echo EXPORTS > $output_objdir/$soname.def;
++	  cat $export_symbols >> $output_objdir/$soname.def;
++	fi~
++	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
++    netbsd*)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++	wlarc=
++      else
++	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      fi
++      ;;
++
++    solaris* | sysv5*)
++      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
++	ld_shlibs_F77=no
++	cat <<EOF 1>&2
++
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++EOF
++      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	ld_shlibs_F77=no
++      fi
++      ;;
++
++    sunos4*)
++      archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      wlarc=
++      hardcode_direct_F77=yes
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++  linux*)
++    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_cmds_F77="$tmp_archive_cmds"
++      supports_anon_versioning=no
++      case `$LD -v 2>/dev/null` in
++        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
++        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++        *\ 2.11.*) ;; # other 2.11 versions
++        *) supports_anon_versioning=yes ;;
++      esac
++      if test $supports_anon_versioning = yes; then
++        archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
++cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++$echo "local: *; };" >> $output_objdir/$libname.ver~
++        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++      else
++        archive_expsym_cmds_F77="$tmp_archive_cmds"
++      fi
++    else
++      ld_shlibs_F77=no
++    fi
++    ;;
++
++    *)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	ld_shlibs_F77=no
++      fi
++      ;;
++    esac
++
++    if test "$ld_shlibs_F77" = yes; then
++      runpath_var=LD_RUN_PATH
++      hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
++      export_dynamic_flag_spec_F77='${wl}--export-dynamic'
++      # ancient GNU ld didn't support --whole-archive et. al.
++      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++ 	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	whole_archive_flag_spec_F77=
++      fi
++    fi
++  else
++    # PORTME fill in a description of your system's linker (not GNU ld)
++    case $host_os in
++    aix3*)
++      allow_undefined_flag_F77=unsupported
++      always_export_symbols_F77=yes
++      archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
++      # Note: this linker hardcodes the directories in LIBPATH if there
++      # are no directories specified by -L.
++      hardcode_minus_L_F77=yes
++      if test "$GCC" = yes && test -z "$link_static_flag"; then
++	# Neither direct hardcoding nor static linking is supported with a
++	# broken collect2.
++	hardcode_direct_F77=unsupported
++      fi
++      ;;
++
++    aix4* | aix5*)
++      if test "$host_cpu" = ia64; then
++	# On IA64, the linker does run time linking by default, so we don't
++	# have to do anything special.
++	aix_use_runtimelinking=no
++	exp_sym_flag='-Bexport'
++	no_entry_flag=""
++      else
++	# If we're using GNU nm, then we don't want the "-C" option.
++	# -C means demangle to AIX nm, but means don't demangle with GNU nm
++	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
++	  export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++	else
++	  export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++	fi
++	aix_use_runtimelinking=no
++
++	# Test if we are trying to use run time linking or normal
++	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
++	# need to do runtime linking.
++	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++	  for ld_flag in $LDFLAGS; do
++  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++  	    aix_use_runtimelinking=yes
++  	    break
++  	  fi
++	  done
++	esac
++
++	exp_sym_flag='-bexport'
++	no_entry_flag='-bnoentry'
++      fi
++
++      # When large executables or shared objects are built, AIX ld can
++      # have problems creating the table of contents.  If linking a library
++      # or program results in "error TOC overflow" add -mminimal-toc to
++      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++      archive_cmds_F77=''
++      hardcode_direct_F77=yes
++      hardcode_libdir_separator_F77=':'
++      link_all_deplibs_F77=yes
++
++      if test "$GCC" = yes; then
++	case $host_os in aix4.012|aix4.012.*)
++	# We only want to do this on AIX 4.2 and lower, the check
++	# below for broken collect2 doesn't work under 4.3+
++	  collect2name=`${CC} -print-prog-name=collect2`
++	  if test -f "$collect2name" && \
++  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	  then
++  	  # We have reworked collect2
++  	  hardcode_direct_F77=yes
++	  else
++  	  # We have old collect2
++  	  hardcode_direct_F77=unsupported
++  	  # It fails to find uninstalled libraries when the uninstalled
++  	  # path is not listed in the libpath.  Setting hardcode_minus_L
++  	  # to unsupported forces relinking
++  	  hardcode_minus_L_F77=yes
++  	  hardcode_libdir_flag_spec_F77='-L$libdir'
++  	  hardcode_libdir_separator_F77=
++	  fi
++	esac
++	shared_flag='-shared'
++      else
++	# not using gcc
++	if test "$host_cpu" = ia64; then
++  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++  	# chokes on -Wl,-G. The following line is correct:
++	  shared_flag='-G'
++	else
++  	if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag='${wl}-G'
++	  else
++	    shared_flag='${wl}-bM:SRE'
++  	fi
++	fi
++      fi
++
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      always_export_symbols_F77=yes
++      if test "$aix_use_runtimelinking" = yes; then
++	# Warning - without using the other runtime loading flags (-brtl),
++	# -berok will link without error, but may produce a broken library.
++	allow_undefined_flag_F77='-berok'
++       # Determine the default libpath from the value encoded in an empty executable.
++       cat >conftest.$ac_ext <<_ACEOF
++      program main
++
++      end
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++       hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
++	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++       else
++	if test "$host_cpu" = ia64; then
++	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
++	  allow_undefined_flag_F77="-z nodefs"
++	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++	else
++	 # Determine the default libpath from the value encoded in an empty executable.
++	 cat >conftest.$ac_ext <<_ACEOF
++      program main
++
++      end
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++	 hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
++	  # Warning - without using the other run time loading flags,
++	  # -berok will link without error, but may produce a broken library.
++	  no_undefined_flag_F77=' ${wl}-bernotok'
++	  allow_undefined_flag_F77=' ${wl}-berok'
++	  # -bexpall does not export symbols beginning with underscore (_)
++	  always_export_symbols_F77=yes
++	  # Exported symbols can be pulled into shared objects from archives
++	  whole_archive_flag_spec_F77=' '
++	  archive_cmds_need_lc_F77=yes
++	  # This is similar to how AIX traditionally builds it's shared libraries.
++	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	fi
++      fi
++      ;;
++
++    amigaos*)
++      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      hardcode_minus_L_F77=yes
++      # see comment about different semantics on the GNU ld section
++      ld_shlibs_F77=no
++      ;;
++
++    bsdi[45]*)
++      export_dynamic_flag_spec_F77=-rdynamic
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # When not using gcc, we currently assume that we are using
++      # Microsoft Visual C++.
++      # hardcode_libdir_flag_spec is actually meaningless, as there is
++      # no search path for DLLs.
++      hardcode_libdir_flag_spec_F77=' '
++      allow_undefined_flag_F77=unsupported
++      # Tell ltmain to make .lib files, not .a files.
++      libext=lib
++      # Tell ltmain to make .dll files, not .so files.
++      shrext_cmds=".dll"
++      # FIXME: Setting linknames here is a bad hack.
++      archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      # The linker will automatically build a .lib file if we build a DLL.
++      old_archive_From_new_cmds_F77='true'
++      # FIXME: Should let the user specify the lib program.
++      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      enable_shared_with_static_runtimes_F77=yes
++      ;;
++
++    darwin* | rhapsody*)
++      case "$host_os" in
++        rhapsody* | darwin1.[012])
++         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[012])
++               allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++      esac
++      archive_cmds_need_lc_F77=no
++      hardcode_direct_F77=no
++      hardcode_automatic_F77=yes
++      hardcode_shlibpath_var_F77=unsupported
++      whole_archive_flag_spec_F77=''
++      link_all_deplibs_F77=yes
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++    else
++      case "$cc_basename" in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         ld_shlibs_F77=no
++          ;;
++      esac
++    fi
++      ;;
++
++    dgux*)
++      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    freebsd1*)
++      ld_shlibs_F77=no
++      ;;
++
++    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++    # support.  Future versions do this automatically, but an explicit c++rt0.o
++    # does not break anything, and helps significantly (at the cost of a little
++    # extra space).
++    freebsd2.2*)
++      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++      hardcode_libdir_flag_spec_F77='-R$libdir'
++      hardcode_direct_F77=yes
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++    freebsd2*)
++      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct_F77=yes
++      hardcode_minus_L_F77=yes
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++    freebsd* | kfreebsd*-gnu)
++      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++      hardcode_libdir_flag_spec_F77='-R$libdir'
++      hardcode_direct_F77=yes
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    hpux9*)
++      if test "$GCC" = yes; then
++	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      else
++	archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      fi
++      hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
++      hardcode_libdir_separator_F77=:
++      hardcode_direct_F77=yes
++
++      # hardcode_minus_L: Not really in the search PATH,
++      # but as the default location of the library.
++      hardcode_minus_L_F77=yes
++      export_dynamic_flag_spec_F77='${wl}-E'
++      ;;
++
++    hpux10* | hpux11*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	esac
++      else
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	*)
++	  archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	esac
++      fi
++      if test "$with_gnu_ld" = no; then
++	case "$host_cpu" in
++	hppa*64*)
++	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
++	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
++	  hardcode_libdir_separator_F77=:
++	  hardcode_direct_F77=no
++	  hardcode_shlibpath_var_F77=no
++	  ;;
++	ia64*)
++	  hardcode_libdir_flag_spec_F77='-L$libdir'
++	  hardcode_direct_F77=no
++	  hardcode_shlibpath_var_F77=no
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  hardcode_minus_L_F77=yes
++	  ;;
++	*)
++	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
++	  hardcode_libdir_separator_F77=:
++	  hardcode_direct_F77=yes
++	  export_dynamic_flag_spec_F77='${wl}-E'
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  hardcode_minus_L_F77=yes
++	  ;;
++	esac
++      fi
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      if test "$GCC" = yes; then
++	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
++      fi
++      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator_F77=:
++      link_all_deplibs_F77=yes
++      ;;
++
++    netbsd*)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++      else
++	archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++      fi
++      hardcode_libdir_flag_spec_F77='-R$libdir'
++      hardcode_direct_F77=yes
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    newsos6)
++      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct_F77=yes
++      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator_F77=:
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    openbsd*)
++      hardcode_direct_F77=yes
++      hardcode_shlibpath_var_F77=no
++      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec_F77='${wl}-E'
++      else
++       case $host_os in
++	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	   hardcode_libdir_flag_spec_F77='-R$libdir'
++	   ;;
++	 *)
++	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++	   ;;
++       esac
++      fi
++      ;;
++
++    os2*)
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      hardcode_minus_L_F77=yes
++      allow_undefined_flag_F77=unsupported
++      archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++      old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++      ;;
++
++    osf3*)
++      if test "$GCC" = yes; then
++	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	allow_undefined_flag_F77=' -expect_unresolved \*'
++	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++      fi
++      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator_F77=:
++      ;;
++
++    osf4* | osf5*)	# as osf3* with the addition of -msym flag
++      if test "$GCC" = yes; then
++	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
++      else
++	allow_undefined_flag_F77=' -expect_unresolved \*'
++	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++
++	# Both c and cxx compiler support -rpath directly
++	hardcode_libdir_flag_spec_F77='-rpath $libdir'
++      fi
++      hardcode_libdir_separator_F77=:
++      ;;
++
++    sco3.2v5*)
++      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var_F77=no
++      export_dynamic_flag_spec_F77='${wl}-Bexport'
++      runpath_var=LD_RUN_PATH
++      hardcode_runpath_var=yes
++      ;;
++
++    solaris*)
++      no_undefined_flag_F77=' -z text'
++      if test "$GCC" = yes; then
++	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
++      else
++	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      fi
++      hardcode_libdir_flag_spec_F77='-R$libdir'
++      hardcode_shlibpath_var_F77=no
++      case $host_os in
++      solaris2.[0-5] | solaris2.[0-5].*) ;;
++      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
++	whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
++      esac
++      link_all_deplibs_F77=yes
++      ;;
++
++    sunos4*)
++      if test "x$host_vendor" = xsequent; then
++	# Use $CC to link under sequent, because it throws in some extra .o
++	# files that make .init and .fini sections work.
++	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      hardcode_direct_F77=yes
++      hardcode_minus_L_F77=yes
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    sysv4)
++      case $host_vendor in
++	sni)
++	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct_F77=yes # is this really true???
++	;;
++	siemens)
++	  ## LD is ld it makes a PLAMLIB
++	  ## CC just makes a GrossModule.
++	  archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++	  reload_cmds_F77='$CC -r -o $output$reload_objs'
++	  hardcode_direct_F77=no
++        ;;
++	motorola)
++	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie
++	;;
++      esac
++      runpath_var='LD_RUN_PATH'
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    sysv4.3*)
++      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var_F77=no
++      export_dynamic_flag_spec_F77='-Bexport'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	hardcode_shlibpath_var_F77=no
++	runpath_var=LD_RUN_PATH
++	hardcode_runpath_var=yes
++	ld_shlibs_F77=yes
++      fi
++      ;;
++
++    sysv4.2uw2*)
++      archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct_F77=yes
++      hardcode_minus_L_F77=no
++      hardcode_shlibpath_var_F77=no
++      hardcode_runpath_var=yes
++      runpath_var=LD_RUN_PATH
++      ;;
++
++   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
++      no_undefined_flag_F77='${wl}-z ${wl}text'
++      if test "$GCC" = yes; then
++	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
++      runpath_var='LD_RUN_PATH'
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    sysv5*)
++      no_undefined_flag_F77=' -z text'
++      # $CC -shared without GNU ld will not create a library from C++
++      # object files and a static libstdc++, better avoid it by now
++      archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      hardcode_libdir_flag_spec_F77=
++      hardcode_shlibpath_var_F77=no
++      runpath_var='LD_RUN_PATH'
++      ;;
++
++    uts4*)
++      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    *)
++      ld_shlibs_F77=no
++      ;;
++    esac
++  fi
++
++echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
++echo "${ECHO_T}$ld_shlibs_F77" >&6
++test "$ld_shlibs_F77" = no && can_build_shared=no
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
++#
++# Do we need to explicitly link libc?
++#
++case "x$archive_cmds_need_lc_F77" in
++x|xyes)
++  # Assume -lc should be added
++  archive_cmds_need_lc_F77=yes
++
++  if test "$enable_shared" = yes && test "$GCC" = yes; then
++    case $archive_cmds_F77 in
++    *'~'*)
++      # FIXME: we may have to deal with multi-command sequences.
++      ;;
++    '$CC '*)
++      # Test whether the compiler implicitly links with -lc since on some
++      # systems, -lgcc has to come before -lc. If gcc already passes -lc
++      # to ld, don't add -lc before -lgcc.
++      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++      $rm conftest*
++      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        libobjs=conftest.$ac_objext
++        deplibs=
++        wl=$lt_prog_compiler_wl_F77
++        compiler_flags=-v
++        linker_flags=-v
++        verstring=
++        output_objdir=.
++        libname=conftest
++        lt_save_allow_undefined_flag=$allow_undefined_flag_F77
++        allow_undefined_flag_F77=
++        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
++  (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++        then
++	  archive_cmds_need_lc_F77=no
++        else
++	  archive_cmds_need_lc_F77=yes
++        fi
++        allow_undefined_flag_F77=$lt_save_allow_undefined_flag
++      else
++        cat conftest.err 1>&5
++      fi
++      $rm conftest*
++      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
++      ;;
++    esac
++  fi
++  ;;
++esac
++
++echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
++need_lib_prefix=unknown
++hardcode_into_libs=no
++
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
++
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  shlibpath_var=LIBPATH
++
++  # AIX 3 has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}${shared_ext}$major'
++  ;;
++
++aix4* | aix5*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[01] | aix4.[01].*)
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	   echo ' yes '
++	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++	:
++      else
++	can_build_shared=no
++      fi
++      ;;
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}${shared_ext}$major'
++    fi
++    shlibpath_var=LIBPATH
++  fi
++  ;;
++
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++  ;;
++
++beos*)
++  library_names_spec='${libname}${shared_ext}'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
++
++bsdi[45]*)
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
++
++cygwin* | mingw* | pw32*)
++  version_type=windows
++  shrext_cmds=".dll"
++  need_version=no
++  need_lib_prefix=no
++
++  case $GCC,$host_os in
++  yes,cygwin* | yes,mingw* | yes,pw32*)
++    library_names_spec='$libname.dll.a'
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $rm \$dlpath'
++    shlibpath_overrides_runpath=yes
++
++    case $host_os in
++    cygwin*)
++      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
++    mingw*)
++      # MinGW DLLs use traditional 'lib' prefix
++      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
++        # It is most probably a Windows format PATH printed by
++        # mingw gcc, but we are running on Cygwin. Gcc prints its search
++        # path with ; separators, and with drive letters. We can handle the
++        # drive letters (cygwin fileutils understands them), so leave them,
++        # especially as we might pass files found there to a mingw objdump,
++        # which wouldn't understand a cygwinified path. Ahh.
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++      fi
++      ;;
++    pw32*)
++      # pw32 DLLs use 'pw' prefix rather than 'lib'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++      ;;
++    esac
++    ;;
++
++  *)
++    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    ;;
++  esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  ;;
++
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  soname_spec='${libname}${release}${major}$shared_ext'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
++  if test "$GCC" = yes; then
++    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
++  else
++    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
++  fi
++  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++  ;;
++
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++freebsd1*)
++  dynamic_linker=no
++  ;;
++
++kfreebsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++freebsd*)
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
++    ;;
++  freebsd3.01* | freebsdelf3.01*)
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
++  *) # from 3.2 on
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
++    ;;
++  esac
++  ;;
++
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  ;;
++
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  case "$host_cpu" in
++  ia64*)
++    shrext_cmds='.so'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.so"
++    shlibpath_var=LD_LIBRARY_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    if test "X$HPUX_IA64_MODE" = X32; then
++      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++    else
++      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++    fi
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    ;;
++   hppa*64*)
++     shrext_cmds='.sl'
++     hardcode_into_libs=yes
++     dynamic_linker="$host_os dld.sl"
++     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++     soname_spec='${libname}${release}${shared_ext}$major'
++     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++     ;;
++   *)
++    shrext_cmds='.sl'
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=SHLIB_PATH
++    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    ;;
++  esac
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
++    *)
++	if test "$lt_cv_prog_gnu_ld" = yes; then
++		version_type=linux
++	else
++		version_type=irix
++	fi ;;
++  esac
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  case $host_os in
++  irix5* | nonstopux*)
++    libsuff= shlibsuff=
++    ;;
++  *)
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++      libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++      libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++      libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  hardcode_into_libs=yes
++  ;;
++
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++  dynamic_linker=no
++  ;;
++
++# This must be Linux ELF.
++linux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
++
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
++
++knetbsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++nto-qnx*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++openbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    case $host_os in
++      openbsd2.[89] | openbsd2.[89].*)
++	shlibpath_overrides_runpath=no
++	;;
++      *)
++	shlibpath_overrides_runpath=yes
++	;;
++      esac
++  else
++    shlibpath_overrides_runpath=yes
++  fi
++  ;;
++
++os2*)
++  libname_spec='$name'
++  shrext_cmds=".dll"
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
++
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
++
++sco3.2v5*)
++  version_type=osf
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
++
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      export_dynamic_flag_spec='${wl}-Blargedynsym'
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
++
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
++
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++*)
++  dynamic_linker=no
++  ;;
++esac
++echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6
++test "$dynamic_linker" = no && can_build_shared=no
++
++echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++hardcode_action_F77=
++if test -n "$hardcode_libdir_flag_spec_F77" || \
++   test -n "$runpath_var_F77" || \
++   test "X$hardcode_automatic_F77" = "Xyes" ; then
++
++  # We can hardcode non-existant directories.
++  if test "$hardcode_direct_F77" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
++     test "$hardcode_minus_L_F77" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action_F77=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action_F77=immediate
++  fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action_F77=unsupported
++fi
++echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
++echo "${ECHO_T}$hardcode_action_F77" >&6
++
++if test "$hardcode_action_F77" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
++
++striplib=
++old_striplib=
++echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
++echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
++  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++else
++# FIXME - insert some real tests, host_os isn't really good enough
++  case $host_os in
++   darwin*)
++       if test -n "$STRIP" ; then
++         striplib="$STRIP -x"
++         echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++       else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++       ;;
++   *)
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++    ;;
++  esac
++fi
++
++
++
++# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # See if we are running on zsh, and set the options which allow our commands through
++  # without removal of \ escapes.
++  if test -n "${ZSH_VERSION+set}" ; then
++    setopt NO_GLOB_SUBST
++  fi
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++    SED SHELL STRIP \
++    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++    deplibs_check_method reload_flag reload_cmds need_locks \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    old_postinstall_cmds old_postuninstall_cmds \
++    compiler_F77 \
++    CC_F77 \
++    LD_F77 \
++    lt_prog_compiler_wl_F77 \
++    lt_prog_compiler_pic_F77 \
++    lt_prog_compiler_static_F77 \
++    lt_prog_compiler_no_builtin_flag_F77 \
++    export_dynamic_flag_spec_F77 \
++    thread_safe_flag_spec_F77 \
++    whole_archive_flag_spec_F77 \
++    enable_shared_with_static_runtimes_F77 \
++    old_archive_cmds_F77 \
++    old_archive_from_new_cmds_F77 \
++    predep_objects_F77 \
++    postdep_objects_F77 \
++    predeps_F77 \
++    postdeps_F77 \
++    compiler_lib_search_path_F77 \
++    archive_cmds_F77 \
++    archive_expsym_cmds_F77 \
++    postinstall_cmds_F77 \
++    postuninstall_cmds_F77 \
++    old_archive_from_expsyms_cmds_F77 \
++    allow_undefined_flag_F77 \
++    no_undefined_flag_F77 \
++    export_symbols_cmds_F77 \
++    hardcode_libdir_flag_spec_F77 \
++    hardcode_libdir_flag_spec_ld_F77 \
++    hardcode_libdir_separator_F77 \
++    hardcode_automatic_F77 \
++    module_cmds_F77 \
++    module_expsym_cmds_F77 \
++    lt_cv_prog_compiler_c_o_F77 \
++    exclude_expsyms_F77 \
++    include_expsyms_F77; do
++
++    case $var in
++    old_archive_cmds_F77 | \
++    old_archive_from_new_cmds_F77 | \
++    archive_cmds_F77 | \
++    archive_expsym_cmds_F77 | \
++    module_cmds_F77 | \
++    module_expsym_cmds_F77 | \
++    old_archive_from_expsyms_cmds_F77 | \
++    export_symbols_cmds_F77 | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  case $lt_echo in
++  *'\$0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
++    ;;
++  esac
++
++cfgfile="$ofile"
++
++  cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
++
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_F77
++
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
++
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
++
++# A C compiler.
++LTCC=$lt_LTCC
++
++# A language-specific compiler.
++CC=$lt_compiler_F77
++
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_F77
++
++# An ERE matcher.
++EGREP=$lt_EGREP
++
++# The linker used to build libraries.
++LD=$lt_LD_F77
++
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
++
++# A BSD-compatible nm program.
++NM=$lt_NM
++
++# A symbol stripping program
++STRIP=$lt_STRIP
++
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_F77
++
++# Object file suffix (normally "o").
++objext="$ac_objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
++
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic_F77
++pic_mode=$pic_mode
++
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
++
++# Must we lock files when doing compilation ?
++need_locks=$lt_need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_F77
++
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
++
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
++
++# Library versioning type.
++version_type=$version_type
++
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
++
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds_F77
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
++
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77
++
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
++
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds_F77
++archive_expsym_cmds=$lt_archive_expsym_cmds_F77
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
++
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds_F77
++module_expsym_cmds=$lt_module_expsym_cmds_F77
++
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_F77
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_F77
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps_F77
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps_F77
++
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_F77
++
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_F77
++
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_F77
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
++
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
++
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
++
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action_F77
++
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
++
++# If ld is used when linking, flag to hardcode \$libdir into
++# a binary during linking. This must work even if \$libdir does
++# not exist.
++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
++
++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct_F77
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L_F77
++
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
++
++# Set to yes if building a shared library automatically hardcodes DIR into the library
++# and all subsequent libraries and executables linked against it.
++hardcode_automatic=$hardcode_automatic_F77
++
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
++
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs_F77
++
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path_F77"
++
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols_F77
++
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds_F77
++
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms_F77
++
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms_F77
++
++# ### END LIBTOOL TAG CONFIG: $tagname
++
++__EOF__
++
++
++else
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
++fi
++
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++CC="$lt_save_CC"
++
++	else
++	  tagname=""
++	fi
++	;;
++
++      GCJ)
++	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
++	  
++
++
++# Source file extension for Java test sources.
++ac_ext=java
++
++# Object file extension for compiled Java test sources.
++objext=o
++objext_GCJ=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="class foo {}\n"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
++
++# Allow CC to be a program name with arguments.
++compiler=$CC
++
++
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${GCJ-"gcj"}
++compiler=$CC
++compiler_GCJ=$CC
++
++# GCJ did not exist at the time GCC didn't implicitly link libc in.
++archive_cmds_need_lc_GCJ=no
++
++## CAVEAT EMPTOR:
++## There is no encapsulation within the following macros, do not change
++## the running order or otherwise move them around unless you know exactly
++## what you are doing...
++
++lt_prog_compiler_no_builtin_flag_GCJ=
++
++if test "$GCC" = yes; then
++  lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
++
++  
++echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
++if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_prog_compiler_rtti_exceptions=no
++  ac_outfile=conftest.$ac_objext
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="-fno-rtti -fno-exceptions"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:__oline__: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s conftest.err; then
++       lt_cv_prog_compiler_rtti_exceptions=yes
++     fi
++   fi
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
++
++if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
++    lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
++else
++    :
++fi
++
++fi
++
++lt_prog_compiler_wl_GCJ=
++lt_prog_compiler_pic_GCJ=
++lt_prog_compiler_static_GCJ=
++
++echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++ 
++  if test "$GCC" = yes; then
++    lt_prog_compiler_wl_GCJ='-Wl,'
++    lt_prog_compiler_static_GCJ='-static'
++
++    case $host_os in
++      aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static_GCJ='-Bstatic'
++      fi
++      ;;
++
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
++      ;;
++
++    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
++      ;;
++
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_prog_compiler_pic_GCJ='-fno-common'
++      ;;
++
++    msdosdjgpp*)
++      # Just because we use GCC doesn't mean we suddenly get shared libraries
++      # on systems that don't support them.
++      lt_prog_compiler_can_build_shared_GCJ=no
++      enable_shared=no
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	lt_prog_compiler_pic_GCJ=-Kconform_pic
++      fi
++      ;;
++
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic_GCJ='-fPIC'
++	;;
++      esac
++      ;;
++
++    *)
++      lt_prog_compiler_pic_GCJ='-fPIC'
++      ;;
++    esac
++  else
++    # PORTME Check for flag to pass linker flags through the system compiler.
++    case $host_os in
++    aix*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static_GCJ='-Bstatic'
++      else
++	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
++      fi
++      ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case "$cc_basename" in
++         xlc*)
++         lt_prog_compiler_pic_GCJ='-qnocommon'
++         lt_prog_compiler_wl_GCJ='-Wl,'
++         ;;
++       esac
++       ;;
++
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
++      ;;
++
++    hpux9* | hpux10* | hpux11*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic_GCJ='+Z'
++	;;
++      esac
++      # Is there a better lt_prog_compiler_static that works with the bundled CC?
++      lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      # PIC (with -KPIC) is the default.
++      lt_prog_compiler_static_GCJ='-non_shared'
++      ;;
++
++    newsos6)
++      lt_prog_compiler_pic_GCJ='-KPIC'
++      lt_prog_compiler_static_GCJ='-Bstatic'
++      ;;
++
++    linux*)
++      case $CC in
++      icc* | ecc*)
++	lt_prog_compiler_wl_GCJ='-Wl,'
++	lt_prog_compiler_pic_GCJ='-KPIC'
++	lt_prog_compiler_static_GCJ='-static'
++        ;;
++      ccc*)
++        lt_prog_compiler_wl_GCJ='-Wl,'
++        # All Alpha code is PIC.
++        lt_prog_compiler_static_GCJ='-non_shared'
++        ;;
++      esac
++      ;;
++
++    osf3* | osf4* | osf5*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      # All OSF/1 code is PIC.
++      lt_prog_compiler_static_GCJ='-non_shared'
++      ;;
++
++    sco3.2v5*)
++      lt_prog_compiler_pic_GCJ='-Kpic'
++      lt_prog_compiler_static_GCJ='-dn'
++      ;;
++
++    solaris*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      lt_prog_compiler_pic_GCJ='-KPIC'
++      lt_prog_compiler_static_GCJ='-Bstatic'
++      ;;
++
++    sunos4*)
++      lt_prog_compiler_wl_GCJ='-Qoption ld '
++      lt_prog_compiler_pic_GCJ='-PIC'
++      lt_prog_compiler_static_GCJ='-Bstatic'
++      ;;
++
++    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      lt_prog_compiler_pic_GCJ='-KPIC'
++      lt_prog_compiler_static_GCJ='-Bstatic'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	lt_prog_compiler_pic_GCJ='-Kconform_pic'
++	lt_prog_compiler_static_GCJ='-Bstatic'
++      fi
++      ;;
++
++    uts4*)
++      lt_prog_compiler_pic_GCJ='-pic'
++      lt_prog_compiler_static_GCJ='-Bstatic'
++      ;;
++
++    *)
++      lt_prog_compiler_can_build_shared_GCJ=no
++      ;;
++    esac
++  fi
++
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
++
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$lt_prog_compiler_pic_GCJ"; then
++  
++echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
++if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_pic_works_GCJ=no
++  ac_outfile=conftest.$ac_objext
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:__oline__: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s conftest.err; then
++       lt_prog_compiler_pic_works_GCJ=yes
++     fi
++   fi
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
++
++if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
++    case $lt_prog_compiler_pic_GCJ in
++     "" | " "*) ;;
++     *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
++     esac
++else
++    lt_prog_compiler_pic_GCJ=
++     lt_prog_compiler_can_build_shared_GCJ=no
++fi
++
++fi
++case "$host_os" in
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    lt_prog_compiler_pic_GCJ=
++    ;;
++  *)
++    lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
++    ;;
++esac
++
++echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_prog_compiler_c_o_GCJ=no
++   $rm -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&5
++   echo "$as_me:__oline__: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s out/conftest2.$ac_objext
++   then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s out/conftest.err; then
++       lt_cv_prog_compiler_c_o_GCJ=yes
++     fi
++   fi
++   chmod u+w .
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
++   cd ..
++   rmdir conftest
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6
++
++
++hard_links="nottested"
++if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6
++  if test "$hard_links" = no; then
++    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
++
++echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++
++  runpath_var=
++  allow_undefined_flag_GCJ=
++  enable_shared_with_static_runtimes_GCJ=no
++  archive_cmds_GCJ=
++  archive_expsym_cmds_GCJ=
++  old_archive_From_new_cmds_GCJ=
++  old_archive_from_expsyms_cmds_GCJ=
++  export_dynamic_flag_spec_GCJ=
++  whole_archive_flag_spec_GCJ=
++  thread_safe_flag_spec_GCJ=
++  hardcode_libdir_flag_spec_GCJ=
++  hardcode_libdir_flag_spec_ld_GCJ=
++  hardcode_libdir_separator_GCJ=
++  hardcode_direct_GCJ=no
++  hardcode_minus_L_GCJ=no
++  hardcode_shlibpath_var_GCJ=unsupported
++  link_all_deplibs_GCJ=unknown
++  hardcode_automatic_GCJ=no
++  module_cmds_GCJ=
++  module_expsym_cmds_GCJ=
++  always_export_symbols_GCJ=no
++  export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  # include_expsyms should be a list of space-separated symbols to be *always*
++  # included in the symbol list
++  include_expsyms_GCJ=
++  # exclude_expsyms can be an extended regexp of symbols to exclude
++  # it will be wrapped by ` (' and `)$', so one must not match beginning or
++  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++  # as well as any symbol that contains `d'.
++  exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
++  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++  # platforms (ab)use it in PIC code, but their linkers get confused if
++  # the symbol is explicitly referenced.  Since portable code cannot
++  # rely on this symbol name, it's probably fine to never include it in
++  # preloaded symbol tables.
++  extract_expsyms_cmds=
++
++  case $host_os in
++  cygwin* | mingw* | pw32*)
++    # FIXME: the MSVC++ port hasn't been tested in a loooong time
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    if test "$GCC" != yes; then
++      with_gnu_ld=no
++    fi
++    ;;
++  openbsd*)
++    with_gnu_ld=no
++    ;;
++  esac
++
++  ld_shlibs_GCJ=yes
++  if test "$with_gnu_ld" = yes; then
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    wlarc='${wl}'
++
++    # See if GNU ld supports shared libraries.
++    case $host_os in
++    aix3* | aix4* | aix5*)
++      # On AIX/PPC, the GNU linker is very broken
++      if test "$host_cpu" != ia64; then
++	ld_shlibs_GCJ=no
++	cat <<EOF 1>&2
++
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
++
++EOF
++      fi
++      ;;
++
++    amigaos*)
++      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      hardcode_minus_L_GCJ=yes
++
++      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
++      # that the semantics of dynamic libraries on AmigaOS, at least up
++      # to version 4, is to share data among multiple programs linked
++      # with the same dynamic library.  Since this doesn't match the
++      # behavior of shared libraries on other platforms, we can't use
++      # them.
++      ld_shlibs_GCJ=no
++      ;;
++
++    beos*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	allow_undefined_flag_GCJ=unsupported
++	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++	# support --undefined.  This deserves some investigation.  FIXME
++	archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      else
++	ld_shlibs_GCJ=no
++      fi
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
++      # as there is no search path for DLLs.
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      allow_undefined_flag_GCJ=unsupported
++      always_export_symbols_GCJ=no
++      enable_shared_with_static_runtimes_GCJ=yes
++      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++
++      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++	# If the export-symbols file already is a .def file (1st line
++	# is EXPORTS), use it as is; otherwise, prepend...
++	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	  cp $export_symbols $output_objdir/$soname.def;
++	else
++	  echo EXPORTS > $output_objdir/$soname.def;
++	  cat $export_symbols >> $output_objdir/$soname.def;
++	fi~
++	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
++    netbsd*)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++	wlarc=
++      else
++	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      fi
++      ;;
++
++    solaris* | sysv5*)
++      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
++	ld_shlibs_GCJ=no
++	cat <<EOF 1>&2
++
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++EOF
++      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	ld_shlibs_GCJ=no
++      fi
++      ;;
++
++    sunos4*)
++      archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      wlarc=
++      hardcode_direct_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++  linux*)
++    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_cmds_GCJ="$tmp_archive_cmds"
++      supports_anon_versioning=no
++      case `$LD -v 2>/dev/null` in
++        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
++        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++        *\ 2.11.*) ;; # other 2.11 versions
++        *) supports_anon_versioning=yes ;;
++      esac
++      if test $supports_anon_versioning = yes; then
++        archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
++cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++$echo "local: *; };" >> $output_objdir/$libname.ver~
++        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++      else
++        archive_expsym_cmds_GCJ="$tmp_archive_cmds"
++      fi
++    else
++      ld_shlibs_GCJ=no
++    fi
++    ;;
++
++    *)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	ld_shlibs_GCJ=no
++      fi
++      ;;
++    esac
++
++    if test "$ld_shlibs_GCJ" = yes; then
++      runpath_var=LD_RUN_PATH
++      hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
++      export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
++      # ancient GNU ld didn't support --whole-archive et. al.
++      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++ 	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	whole_archive_flag_spec_GCJ=
++      fi
++    fi
++  else
++    # PORTME fill in a description of your system's linker (not GNU ld)
++    case $host_os in
++    aix3*)
++      allow_undefined_flag_GCJ=unsupported
++      always_export_symbols_GCJ=yes
++      archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
++      # Note: this linker hardcodes the directories in LIBPATH if there
++      # are no directories specified by -L.
++      hardcode_minus_L_GCJ=yes
++      if test "$GCC" = yes && test -z "$link_static_flag"; then
++	# Neither direct hardcoding nor static linking is supported with a
++	# broken collect2.
++	hardcode_direct_GCJ=unsupported
++      fi
++      ;;
++
++    aix4* | aix5*)
++      if test "$host_cpu" = ia64; then
++	# On IA64, the linker does run time linking by default, so we don't
++	# have to do anything special.
++	aix_use_runtimelinking=no
++	exp_sym_flag='-Bexport'
++	no_entry_flag=""
++      else
++	# If we're using GNU nm, then we don't want the "-C" option.
++	# -C means demangle to AIX nm, but means don't demangle with GNU nm
++	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
++	  export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++	else
++	  export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++	fi
++	aix_use_runtimelinking=no
++
++	# Test if we are trying to use run time linking or normal
++	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
++	# need to do runtime linking.
++	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++	  for ld_flag in $LDFLAGS; do
++  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++  	    aix_use_runtimelinking=yes
++  	    break
++  	  fi
++	  done
++	esac
++
++	exp_sym_flag='-bexport'
++	no_entry_flag='-bnoentry'
++      fi
++
++      # When large executables or shared objects are built, AIX ld can
++      # have problems creating the table of contents.  If linking a library
++      # or program results in "error TOC overflow" add -mminimal-toc to
++      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++      archive_cmds_GCJ=''
++      hardcode_direct_GCJ=yes
++      hardcode_libdir_separator_GCJ=':'
++      link_all_deplibs_GCJ=yes
++
++      if test "$GCC" = yes; then
++	case $host_os in aix4.012|aix4.012.*)
++	# We only want to do this on AIX 4.2 and lower, the check
++	# below for broken collect2 doesn't work under 4.3+
++	  collect2name=`${CC} -print-prog-name=collect2`
++	  if test -f "$collect2name" && \
++  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	  then
++  	  # We have reworked collect2
++  	  hardcode_direct_GCJ=yes
++	  else
++  	  # We have old collect2
++  	  hardcode_direct_GCJ=unsupported
++  	  # It fails to find uninstalled libraries when the uninstalled
++  	  # path is not listed in the libpath.  Setting hardcode_minus_L
++  	  # to unsupported forces relinking
++  	  hardcode_minus_L_GCJ=yes
++  	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
++  	  hardcode_libdir_separator_GCJ=
++	  fi
++	esac
++	shared_flag='-shared'
++      else
++	# not using gcc
++	if test "$host_cpu" = ia64; then
++  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++  	# chokes on -Wl,-G. The following line is correct:
++	  shared_flag='-G'
++	else
++  	if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag='${wl}-G'
++	  else
++	    shared_flag='${wl}-bM:SRE'
++  	fi
++	fi
++      fi
++
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      always_export_symbols_GCJ=yes
++      if test "$aix_use_runtimelinking" = yes; then
++	# Warning - without using the other runtime loading flags (-brtl),
++	# -berok will link without error, but may produce a broken library.
++	allow_undefined_flag_GCJ='-berok'
++       # Determine the default libpath from the value encoded in an empty executable.
++       cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++       hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
++	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++       else
++	if test "$host_cpu" = ia64; then
++	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
++	  allow_undefined_flag_GCJ="-z nodefs"
++	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++	else
++	 # Determine the default libpath from the value encoded in an empty executable.
++	 cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++	 hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
++	  # Warning - without using the other run time loading flags,
++	  # -berok will link without error, but may produce a broken library.
++	  no_undefined_flag_GCJ=' ${wl}-bernotok'
++	  allow_undefined_flag_GCJ=' ${wl}-berok'
++	  # -bexpall does not export symbols beginning with underscore (_)
++	  always_export_symbols_GCJ=yes
++	  # Exported symbols can be pulled into shared objects from archives
++	  whole_archive_flag_spec_GCJ=' '
++	  archive_cmds_need_lc_GCJ=yes
++	  # This is similar to how AIX traditionally builds it's shared libraries.
++	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	fi
++      fi
++      ;;
++
++    amigaos*)
++      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      hardcode_minus_L_GCJ=yes
++      # see comment about different semantics on the GNU ld section
++      ld_shlibs_GCJ=no
++      ;;
++
++    bsdi[45]*)
++      export_dynamic_flag_spec_GCJ=-rdynamic
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # When not using gcc, we currently assume that we are using
++      # Microsoft Visual C++.
++      # hardcode_libdir_flag_spec is actually meaningless, as there is
++      # no search path for DLLs.
++      hardcode_libdir_flag_spec_GCJ=' '
++      allow_undefined_flag_GCJ=unsupported
++      # Tell ltmain to make .lib files, not .a files.
++      libext=lib
++      # Tell ltmain to make .dll files, not .so files.
++      shrext_cmds=".dll"
++      # FIXME: Setting linknames here is a bad hack.
++      archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      # The linker will automatically build a .lib file if we build a DLL.
++      old_archive_From_new_cmds_GCJ='true'
++      # FIXME: Should let the user specify the lib program.
++      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      enable_shared_with_static_runtimes_GCJ=yes
++      ;;
++
++    darwin* | rhapsody*)
++      case "$host_os" in
++        rhapsody* | darwin1.[012])
++         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[012])
++               allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++      esac
++      archive_cmds_need_lc_GCJ=no
++      hardcode_direct_GCJ=no
++      hardcode_automatic_GCJ=yes
++      hardcode_shlibpath_var_GCJ=unsupported
++      whole_archive_flag_spec_GCJ=''
++      link_all_deplibs_GCJ=yes
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++    else
++      case "$cc_basename" in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         ld_shlibs_GCJ=no
++          ;;
++      esac
++    fi
++      ;;
++
++    dgux*)
++      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    freebsd1*)
++      ld_shlibs_GCJ=no
++      ;;
++
++    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++    # support.  Future versions do this automatically, but an explicit c++rt0.o
++    # does not break anything, and helps significantly (at the cost of a little
++    # extra space).
++    freebsd2.2*)
++      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++      hardcode_libdir_flag_spec_GCJ='-R$libdir'
++      hardcode_direct_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++    freebsd2*)
++      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct_GCJ=yes
++      hardcode_minus_L_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++    freebsd* | kfreebsd*-gnu)
++      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++      hardcode_libdir_flag_spec_GCJ='-R$libdir'
++      hardcode_direct_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    hpux9*)
++      if test "$GCC" = yes; then
++	archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      else
++	archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      fi
++      hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
++      hardcode_libdir_separator_GCJ=:
++      hardcode_direct_GCJ=yes
++
++      # hardcode_minus_L: Not really in the search PATH,
++      # but as the default location of the library.
++      hardcode_minus_L_GCJ=yes
++      export_dynamic_flag_spec_GCJ='${wl}-E'
++      ;;
++
++    hpux10* | hpux11*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	esac
++      else
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	*)
++	  archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	esac
++      fi
++      if test "$with_gnu_ld" = no; then
++	case "$host_cpu" in
++	hppa*64*)
++	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
++	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
++	  hardcode_libdir_separator_GCJ=:
++	  hardcode_direct_GCJ=no
++	  hardcode_shlibpath_var_GCJ=no
++	  ;;
++	ia64*)
++	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
++	  hardcode_direct_GCJ=no
++	  hardcode_shlibpath_var_GCJ=no
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  hardcode_minus_L_GCJ=yes
++	  ;;
++	*)
++	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
++	  hardcode_libdir_separator_GCJ=:
++	  hardcode_direct_GCJ=yes
++	  export_dynamic_flag_spec_GCJ='${wl}-E'
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  hardcode_minus_L_GCJ=yes
++	  ;;
++	esac
++      fi
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      if test "$GCC" = yes; then
++	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
++      fi
++      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator_GCJ=:
++      link_all_deplibs_GCJ=yes
++      ;;
++
++    netbsd*)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++      else
++	archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++      fi
++      hardcode_libdir_flag_spec_GCJ='-R$libdir'
++      hardcode_direct_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    newsos6)
++      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct_GCJ=yes
++      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator_GCJ=:
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    openbsd*)
++      hardcode_direct_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec_GCJ='${wl}-E'
++      else
++       case $host_os in
++	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
++	   ;;
++	 *)
++	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++	   ;;
++       esac
++      fi
++      ;;
++
++    os2*)
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      hardcode_minus_L_GCJ=yes
++      allow_undefined_flag_GCJ=unsupported
++      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++      old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++      ;;
++
++    osf3*)
++      if test "$GCC" = yes; then
++	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	allow_undefined_flag_GCJ=' -expect_unresolved \*'
++	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++      fi
++      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator_GCJ=:
++      ;;
++
++    osf4* | osf5*)	# as osf3* with the addition of -msym flag
++      if test "$GCC" = yes; then
++	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
++      else
++	allow_undefined_flag_GCJ=' -expect_unresolved \*'
++	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++
++	# Both c and cxx compiler support -rpath directly
++	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
++      fi
++      hardcode_libdir_separator_GCJ=:
++      ;;
++
++    sco3.2v5*)
++      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var_GCJ=no
++      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
++      runpath_var=LD_RUN_PATH
++      hardcode_runpath_var=yes
++      ;;
++
++    solaris*)
++      no_undefined_flag_GCJ=' -z text'
++      if test "$GCC" = yes; then
++	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
++      else
++	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      fi
++      hardcode_libdir_flag_spec_GCJ='-R$libdir'
++      hardcode_shlibpath_var_GCJ=no
++      case $host_os in
++      solaris2.[0-5] | solaris2.[0-5].*) ;;
++      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
++	whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
++      esac
++      link_all_deplibs_GCJ=yes
++      ;;
++
++    sunos4*)
++      if test "x$host_vendor" = xsequent; then
++	# Use $CC to link under sequent, because it throws in some extra .o
++	# files that make .init and .fini sections work.
++	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      hardcode_direct_GCJ=yes
++      hardcode_minus_L_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    sysv4)
++      case $host_vendor in
++	sni)
++	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct_GCJ=yes # is this really true???
++	;;
++	siemens)
++	  ## LD is ld it makes a PLAMLIB
++	  ## CC just makes a GrossModule.
++	  archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++	  reload_cmds_GCJ='$CC -r -o $output$reload_objs'
++	  hardcode_direct_GCJ=no
++        ;;
++	motorola)
++	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
++	;;
++      esac
++      runpath_var='LD_RUN_PATH'
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    sysv4.3*)
++      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var_GCJ=no
++      export_dynamic_flag_spec_GCJ='-Bexport'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	hardcode_shlibpath_var_GCJ=no
++	runpath_var=LD_RUN_PATH
++	hardcode_runpath_var=yes
++	ld_shlibs_GCJ=yes
++      fi
++      ;;
++
++    sysv4.2uw2*)
++      archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct_GCJ=yes
++      hardcode_minus_L_GCJ=no
++      hardcode_shlibpath_var_GCJ=no
++      hardcode_runpath_var=yes
++      runpath_var=LD_RUN_PATH
++      ;;
++
++   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
++      no_undefined_flag_GCJ='${wl}-z ${wl}text'
++      if test "$GCC" = yes; then
++	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
++      runpath_var='LD_RUN_PATH'
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    sysv5*)
++      no_undefined_flag_GCJ=' -z text'
++      # $CC -shared without GNU ld will not create a library from C++
++      # object files and a static libstdc++, better avoid it by now
++      archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      hardcode_libdir_flag_spec_GCJ=
++      hardcode_shlibpath_var_GCJ=no
++      runpath_var='LD_RUN_PATH'
++      ;;
++
++    uts4*)
++      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      hardcode_shlibpath_var_GCJ=no
++      ;;
++
++    *)
++      ld_shlibs_GCJ=no
++      ;;
++    esac
++  fi
++
++echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
++echo "${ECHO_T}$ld_shlibs_GCJ" >&6
++test "$ld_shlibs_GCJ" = no && can_build_shared=no
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
++#
++# Do we need to explicitly link libc?
++#
++case "x$archive_cmds_need_lc_GCJ" in
++x|xyes)
++  # Assume -lc should be added
++  archive_cmds_need_lc_GCJ=yes
++
++  if test "$enable_shared" = yes && test "$GCC" = yes; then
++    case $archive_cmds_GCJ in
++    *'~'*)
++      # FIXME: we may have to deal with multi-command sequences.
++      ;;
++    '$CC '*)
++      # Test whether the compiler implicitly links with -lc since on some
++      # systems, -lgcc has to come before -lc. If gcc already passes -lc
++      # to ld, don't add -lc before -lgcc.
++      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++      $rm conftest*
++      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        libobjs=conftest.$ac_objext
++        deplibs=
++        wl=$lt_prog_compiler_wl_GCJ
++        compiler_flags=-v
++        linker_flags=-v
++        verstring=
++        output_objdir=.
++        libname=conftest
++        lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
++        allow_undefined_flag_GCJ=
++        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
++  (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++        then
++	  archive_cmds_need_lc_GCJ=no
++        else
++	  archive_cmds_need_lc_GCJ=yes
++        fi
++        allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
++      else
++        cat conftest.err 1>&5
++      fi
++      $rm conftest*
++      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
++      ;;
++    esac
++  fi
++  ;;
++esac
++
++echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
++need_lib_prefix=unknown
++hardcode_into_libs=no
++
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
++
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  shlibpath_var=LIBPATH
++
++  # AIX 3 has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}${shared_ext}$major'
++  ;;
++
++aix4* | aix5*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[01] | aix4.[01].*)
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	   echo ' yes '
++	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++	:
++      else
++	can_build_shared=no
++      fi
++      ;;
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}${shared_ext}$major'
++    fi
++    shlibpath_var=LIBPATH
++  fi
++  ;;
++
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++  ;;
++
++beos*)
++  library_names_spec='${libname}${shared_ext}'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
++
++bsdi[45]*)
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
++
++cygwin* | mingw* | pw32*)
++  version_type=windows
++  shrext_cmds=".dll"
++  need_version=no
++  need_lib_prefix=no
++
++  case $GCC,$host_os in
++  yes,cygwin* | yes,mingw* | yes,pw32*)
++    library_names_spec='$libname.dll.a'
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $rm \$dlpath'
++    shlibpath_overrides_runpath=yes
++
++    case $host_os in
++    cygwin*)
++      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
++    mingw*)
++      # MinGW DLLs use traditional 'lib' prefix
++      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
++        # It is most probably a Windows format PATH printed by
++        # mingw gcc, but we are running on Cygwin. Gcc prints its search
++        # path with ; separators, and with drive letters. We can handle the
++        # drive letters (cygwin fileutils understands them), so leave them,
++        # especially as we might pass files found there to a mingw objdump,
++        # which wouldn't understand a cygwinified path. Ahh.
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++      fi
++      ;;
++    pw32*)
++      # pw32 DLLs use 'pw' prefix rather than 'lib'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++      ;;
++    esac
++    ;;
++
++  *)
++    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    ;;
++  esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  ;;
++
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  soname_spec='${libname}${release}${major}$shared_ext'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
++  if test "$GCC" = yes; then
++    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
++  else
++    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
++  fi
++  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++  ;;
++
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++freebsd1*)
++  dynamic_linker=no
++  ;;
++
++kfreebsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++freebsd*)
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
++    ;;
++  freebsd3.01* | freebsdelf3.01*)
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
++  *) # from 3.2 on
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
++    ;;
++  esac
++  ;;
++
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  ;;
++
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  case "$host_cpu" in
++  ia64*)
++    shrext_cmds='.so'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.so"
++    shlibpath_var=LD_LIBRARY_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    if test "X$HPUX_IA64_MODE" = X32; then
++      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++    else
++      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++    fi
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    ;;
++   hppa*64*)
++     shrext_cmds='.sl'
++     hardcode_into_libs=yes
++     dynamic_linker="$host_os dld.sl"
++     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++     soname_spec='${libname}${release}${shared_ext}$major'
++     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++     ;;
++   *)
++    shrext_cmds='.sl'
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=SHLIB_PATH
++    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    ;;
++  esac
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
++    *)
++	if test "$lt_cv_prog_gnu_ld" = yes; then
++		version_type=linux
++	else
++		version_type=irix
++	fi ;;
++  esac
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  case $host_os in
++  irix5* | nonstopux*)
++    libsuff= shlibsuff=
++    ;;
++  *)
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++      libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++      libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++      libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  hardcode_into_libs=yes
++  ;;
++
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++  dynamic_linker=no
++  ;;
++
++# This must be Linux ELF.
++linux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
++
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
++
++knetbsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++nto-qnx*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++openbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    case $host_os in
++      openbsd2.[89] | openbsd2.[89].*)
++	shlibpath_overrides_runpath=no
++	;;
++      *)
++	shlibpath_overrides_runpath=yes
++	;;
++      esac
++  else
++    shlibpath_overrides_runpath=yes
++  fi
++  ;;
++
++os2*)
++  libname_spec='$name'
++  shrext_cmds=".dll"
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
++
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
++
++sco3.2v5*)
++  version_type=osf
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
++
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      export_dynamic_flag_spec='${wl}-Blargedynsym'
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
++
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
++
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++*)
++  dynamic_linker=no
++  ;;
++esac
++echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6
++test "$dynamic_linker" = no && can_build_shared=no
++
++echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++hardcode_action_GCJ=
++if test -n "$hardcode_libdir_flag_spec_GCJ" || \
++   test -n "$runpath_var_GCJ" || \
++   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
++
++  # We can hardcode non-existant directories.
++  if test "$hardcode_direct_GCJ" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
++     test "$hardcode_minus_L_GCJ" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action_GCJ=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action_GCJ=immediate
++  fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action_GCJ=unsupported
++fi
++echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
++echo "${ECHO_T}$hardcode_action_GCJ" >&6
++
++if test "$hardcode_action_GCJ" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
++
++striplib=
++old_striplib=
++echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
++echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
++  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++else
++# FIXME - insert some real tests, host_os isn't really good enough
++  case $host_os in
++   darwin*)
++       if test -n "$STRIP" ; then
++         striplib="$STRIP -x"
++         echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++       else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++       ;;
++   *)
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++    ;;
++  esac
++fi
++
++if test "x$enable_dlopen" != xyes; then
++  enable_dlopen=unknown
++  enable_dlopen_self=unknown
++  enable_dlopen_self_static=unknown
++else
++  lt_cv_dlopen=no
++  lt_cv_dlopen_libs=
++
++  case $host_os in
++  beos*)
++    lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ;;
++
++  mingw* | pw32*)
++    lt_cv_dlopen="LoadLibrary"
++    lt_cv_dlopen_libs=
++   ;;
++
++  cygwin*)
++    lt_cv_dlopen="dlopen"
++    lt_cv_dlopen_libs=
++   ;;
++
++  darwin*)
++  # if libdl is installed we need to link against it
++    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dl_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dl_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++if test $ac_cv_lib_dl_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++  
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    
++fi
++
++   ;;
++
++  *)
++    echo "$as_me:$LINENO: checking for shl_load" >&5
++echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
++if test "${ac_cv_func_shl_load+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.  */
++/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define shl_load innocuous_shl_load
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char shl_load (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef shl_load
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char shl_load ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_shl_load) || defined (__stub___shl_load)
++choke me
++#else
++char (*f) () = shl_load;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != shl_load;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_shl_load=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_shl_load=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
++echo "${ECHO_T}$ac_cv_func_shl_load" >&6
++if test $ac_cv_func_shl_load = yes; then
++  lt_cv_dlopen="shl_load"
++else
++  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
++echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
++if test "${ac_cv_lib_dld_shl_load+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char shl_load ();
++int
++main ()
++{
++shl_load ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dld_shl_load=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dld_shl_load=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
++if test $ac_cv_lib_dld_shl_load = yes; then
++  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
++else
++  echo "$as_me:$LINENO: checking for dlopen" >&5
++echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
++if test "${ac_cv_func_dlopen+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.  */
++/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define dlopen innocuous_dlopen
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char dlopen (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef dlopen
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_dlopen) || defined (__stub___dlopen)
++choke me
++#else
++char (*f) () = dlopen;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != dlopen;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
++echo "${ECHO_T}$ac_cv_func_dlopen" >&6
++if test $ac_cv_func_dlopen = yes; then
++  lt_cv_dlopen="dlopen"
++else
++  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dl_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dl_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++if test $ac_cv_lib_dl_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
++echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
++if test "${ac_cv_lib_svld_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsvld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_svld_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_svld_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
++if test $ac_cv_lib_svld_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
++else
++  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
++echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
++if test "${ac_cv_lib_dld_dld_link+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dld_link ();
++int
++main ()
++{
++dld_link ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dld_dld_link=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dld_dld_link=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
++if test $ac_cv_lib_dld_dld_link = yes; then
++  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
++fi
++
++	      
++fi
++
++	    
++fi
++
++	  
++fi
++
++	
++fi
++
++      
++fi
++
++    ;;
++  esac
++
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
++  else
++    enable_dlopen=no
++  fi
++
++  case $lt_cv_dlopen in
++  dlopen)
++    save_CPPFLAGS="$CPPFLAGS"
++    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++
++    save_LDFLAGS="$LDFLAGS"
++    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++
++    save_LIBS="$LIBS"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
++
++    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
++echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
++if test "${lt_cv_dlopen_self+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self=cross
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++#line __oline__ "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}
++EOF
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self=no
++  fi
++fi
++rm -fr conftest*
++
++    
++fi
++echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self" >&6
++
++    if test "x$lt_cv_dlopen_self" = xyes; then
++      LDFLAGS="$LDFLAGS $link_static_flag"
++      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
++echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
++if test "${lt_cv_dlopen_self_static+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self_static=cross
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++#line __oline__ "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}
++EOF
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self_static=no
++  fi
++fi
++rm -fr conftest*
++
++      
++fi
++echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
++    fi
++
++    CPPFLAGS="$save_CPPFLAGS"
++    LDFLAGS="$save_LDFLAGS"
++    LIBS="$save_LIBS"
++    ;;
++  esac
++
++  case $lt_cv_dlopen_self in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
++  esac
++
++  case $lt_cv_dlopen_self_static in
++  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++  *) enable_dlopen_self_static=unknown ;;
++  esac
++fi
++
++
++# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # See if we are running on zsh, and set the options which allow our commands through
++  # without removal of \ escapes.
++  if test -n "${ZSH_VERSION+set}" ; then
++    setopt NO_GLOB_SUBST
++  fi
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++    SED SHELL STRIP \
++    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++    deplibs_check_method reload_flag reload_cmds need_locks \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    old_postinstall_cmds old_postuninstall_cmds \
++    compiler_GCJ \
++    CC_GCJ \
++    LD_GCJ \
++    lt_prog_compiler_wl_GCJ \
++    lt_prog_compiler_pic_GCJ \
++    lt_prog_compiler_static_GCJ \
++    lt_prog_compiler_no_builtin_flag_GCJ \
++    export_dynamic_flag_spec_GCJ \
++    thread_safe_flag_spec_GCJ \
++    whole_archive_flag_spec_GCJ \
++    enable_shared_with_static_runtimes_GCJ \
++    old_archive_cmds_GCJ \
++    old_archive_from_new_cmds_GCJ \
++    predep_objects_GCJ \
++    postdep_objects_GCJ \
++    predeps_GCJ \
++    postdeps_GCJ \
++    compiler_lib_search_path_GCJ \
++    archive_cmds_GCJ \
++    archive_expsym_cmds_GCJ \
++    postinstall_cmds_GCJ \
++    postuninstall_cmds_GCJ \
++    old_archive_from_expsyms_cmds_GCJ \
++    allow_undefined_flag_GCJ \
++    no_undefined_flag_GCJ \
++    export_symbols_cmds_GCJ \
++    hardcode_libdir_flag_spec_GCJ \
++    hardcode_libdir_flag_spec_ld_GCJ \
++    hardcode_libdir_separator_GCJ \
++    hardcode_automatic_GCJ \
++    module_cmds_GCJ \
++    module_expsym_cmds_GCJ \
++    lt_cv_prog_compiler_c_o_GCJ \
++    exclude_expsyms_GCJ \
++    include_expsyms_GCJ; do
++
++    case $var in
++    old_archive_cmds_GCJ | \
++    old_archive_from_new_cmds_GCJ | \
++    archive_cmds_GCJ | \
++    archive_expsym_cmds_GCJ | \
++    module_cmds_GCJ | \
++    module_expsym_cmds_GCJ | \
++    old_archive_from_expsyms_cmds_GCJ | \
++    export_symbols_cmds_GCJ | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  case $lt_echo in
++  *'\$0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
++    ;;
++  esac
++
++cfgfile="$ofile"
++
++  cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
++
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_GCJ
++
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
++
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
++
++# A C compiler.
++LTCC=$lt_LTCC
++
++# A language-specific compiler.
++CC=$lt_compiler_GCJ
++
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_GCJ
++
++# An ERE matcher.
++EGREP=$lt_EGREP
++
++# The linker used to build libraries.
++LD=$lt_LD_GCJ
++
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
++
++# A BSD-compatible nm program.
++NM=$lt_NM
++
++# A symbol stripping program
++STRIP=$lt_STRIP
++
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_GCJ
++
++# Object file suffix (normally "o").
++objext="$ac_objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
++
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic_GCJ
++pic_mode=$pic_mode
++
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
++
++# Must we lock files when doing compilation ?
++need_locks=$lt_need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_GCJ
++
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
++
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
++
++# Library versioning type.
++version_type=$version_type
++
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
++
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds_GCJ
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
++
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
++
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
++
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds_GCJ
++archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
++
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds_GCJ
++module_expsym_cmds=$lt_module_expsym_cmds_GCJ
++
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_GCJ
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_GCJ
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps_GCJ
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps_GCJ
++
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
++
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_GCJ
++
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_GCJ
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
++
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
++
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
++
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action_GCJ
++
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
++
++# If ld is used when linking, flag to hardcode \$libdir into
++# a binary during linking. This must work even if \$libdir does
++# not exist.
++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
++
++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct_GCJ
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L_GCJ
++
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
++
++# Set to yes if building a shared library automatically hardcodes DIR into the library
++# and all subsequent libraries and executables linked against it.
++hardcode_automatic=$hardcode_automatic_GCJ
++
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
++
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs_GCJ
++
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path_GCJ"
++
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols_GCJ
++
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds_GCJ
++
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms_GCJ
++
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms_GCJ
++
++# ### END LIBTOOL TAG CONFIG: $tagname
++
++__EOF__
++
++
++else
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
++fi
++
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++CC="$lt_save_CC"
++
++	else
++	  tagname=""
++	fi
++	;;
++
++      RC)
++	
++
++
++# Source file extension for RC test sources.
++ac_ext=rc
++
++# Object file extension for compiled RC test sources.
++objext=o
++objext_RC=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
++
++# Code to be used in simple link tests
++lt_simple_link_test_code="$lt_simple_compile_test_code"
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
++
++# Allow CC to be a program name with arguments.
++compiler=$CC
++
++
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${RC-"windres"}
++compiler=$CC
++compiler_RC=$CC
++lt_cv_prog_compiler_c_o_RC=yes
++
++# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # See if we are running on zsh, and set the options which allow our commands through
++  # without removal of \ escapes.
++  if test -n "${ZSH_VERSION+set}" ; then
++    setopt NO_GLOB_SUBST
++  fi
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++    SED SHELL STRIP \
++    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++    deplibs_check_method reload_flag reload_cmds need_locks \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    old_postinstall_cmds old_postuninstall_cmds \
++    compiler_RC \
++    CC_RC \
++    LD_RC \
++    lt_prog_compiler_wl_RC \
++    lt_prog_compiler_pic_RC \
++    lt_prog_compiler_static_RC \
++    lt_prog_compiler_no_builtin_flag_RC \
++    export_dynamic_flag_spec_RC \
++    thread_safe_flag_spec_RC \
++    whole_archive_flag_spec_RC \
++    enable_shared_with_static_runtimes_RC \
++    old_archive_cmds_RC \
++    old_archive_from_new_cmds_RC \
++    predep_objects_RC \
++    postdep_objects_RC \
++    predeps_RC \
++    postdeps_RC \
++    compiler_lib_search_path_RC \
++    archive_cmds_RC \
++    archive_expsym_cmds_RC \
++    postinstall_cmds_RC \
++    postuninstall_cmds_RC \
++    old_archive_from_expsyms_cmds_RC \
++    allow_undefined_flag_RC \
++    no_undefined_flag_RC \
++    export_symbols_cmds_RC \
++    hardcode_libdir_flag_spec_RC \
++    hardcode_libdir_flag_spec_ld_RC \
++    hardcode_libdir_separator_RC \
++    hardcode_automatic_RC \
++    module_cmds_RC \
++    module_expsym_cmds_RC \
++    lt_cv_prog_compiler_c_o_RC \
++    exclude_expsyms_RC \
++    include_expsyms_RC; do
++
++    case $var in
++    old_archive_cmds_RC | \
++    old_archive_from_new_cmds_RC | \
++    archive_cmds_RC | \
++    archive_expsym_cmds_RC | \
++    module_cmds_RC | \
++    module_expsym_cmds_RC | \
++    old_archive_from_expsyms_cmds_RC | \
++    export_symbols_cmds_RC | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  case $lt_echo in
++  *'\$0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
++    ;;
++  esac
++
++cfgfile="$ofile"
++
++  cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
++
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_RC
++
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
++
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
++
++# A C compiler.
++LTCC=$lt_LTCC
++
++# A language-specific compiler.
++CC=$lt_compiler_RC
++
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_RC
++
++# An ERE matcher.
++EGREP=$lt_EGREP
++
++# The linker used to build libraries.
++LD=$lt_LD_RC
++
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
++
++# A BSD-compatible nm program.
++NM=$lt_NM
++
++# A symbol stripping program
++STRIP=$lt_STRIP
++
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_RC
++
++# Object file suffix (normally "o").
++objext="$ac_objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
++
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic_RC
++pic_mode=$pic_mode
++
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
++
++# Must we lock files when doing compilation ?
++need_locks=$lt_need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_RC
++
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
++
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
++
++# Library versioning type.
++version_type=$version_type
++
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
++
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds_RC
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
++
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
++
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
++
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds_RC
++archive_expsym_cmds=$lt_archive_expsym_cmds_RC
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
++
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds_RC
++module_expsym_cmds=$lt_module_expsym_cmds_RC
++
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_RC
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_RC
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps_RC
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps_RC
++
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_RC
++
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_RC
++
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_RC
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
++
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
++
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
++
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action_RC
++
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
++
++# If ld is used when linking, flag to hardcode \$libdir into
++# a binary during linking. This must work even if \$libdir does
++# not exist.
++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
++
++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct_RC
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L_RC
++
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
++
++# Set to yes if building a shared library automatically hardcodes DIR into the library
++# and all subsequent libraries and executables linked against it.
++hardcode_automatic=$hardcode_automatic_RC
++
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
++
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs_RC
++
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path_RC"
++
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols_RC
++
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds_RC
++
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms_RC
++
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms_RC
++
++# ### END LIBTOOL TAG CONFIG: $tagname
++
++__EOF__
++
++
++else
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
++fi
++
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++CC="$lt_save_CC"
++
++	;;
++
++      *)
++	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
++echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
++   { (exit 1); exit 1; }; }
++	;;
++      esac
++
++      # Append the new tag name to the list of available tags.
++      if test -n "$tagname" ; then
++      available_tags="$available_tags $tagname"
++    fi
++    fi
++  done
++  IFS="$lt_save_ifs"
++
++  # Now substitute the updated list of available tags.
++  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
++    mv "${ofile}T" "$ofile"
++    chmod +x "$ofile"
++  else
++    rm -f "${ofile}T"
++    { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
++echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
++   { (exit 1); exit 1; }; }
++  fi
++fi
++
++
++
++# This can be used to rebuild libtool when needed
++LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++
++# Always use our own libtool.
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++
++# Prevent multiple expansion
++
++
++
++
++
++
++
++
++
++
++
++  
++
++  
++
++
++  
++       
++       
++
++
++
++INCLUDES='-I$(top_srcdir)/include -I$(top_builddir)/include'
++
++
++
++
++for ac_header in sys/time.h sys/timeb.h io.h
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++else
++  # Is the header compilable?
++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
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <$ac_header>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++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
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <$ac_header>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  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
++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: )
++    { 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:* )
++    { 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;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
++if eval "test \"\${$as_ac_Header+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  eval "$as_ac_Header=\$ac_header_preproc"
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
++
++fi
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++
++done
++
++rm -f include/inttypes.h
++    if test "${ac_cv_header_inttypes_h+set}" = set; then
++  echo "$as_me:$LINENO: checking for inttypes.h" >&5
++echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6
++if test "${ac_cv_header_inttypes_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_inttypes_h" >&5
++echo "${ECHO_T}$ac_cv_header_inttypes_h" >&6
++else
++  # Is the header compilable?
++echo "$as_me:$LINENO: checking inttypes.h usability" >&5
++echo $ECHO_N "checking inttypes.h usability... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++@%:@include <inttypes.h>
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_header_compiler=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_header_compiler=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
++echo "${ECHO_T}$ac_header_compiler" >&6
++
++# Is the header present?
++echo "$as_me:$LINENO: checking inttypes.h presence" >&5
++echo $ECHO_N "checking inttypes.h presence... $ECHO_C" >&6
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++@%:@include <inttypes.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  ac_header_preproc=yes
++else
++  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
++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: )
++    { echo "$as_me:$LINENO: WARNING: inttypes.h: accepted by the compiler, rejected by the preprocessor!" >&5
++echo "$as_me: WARNING: inttypes.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { echo "$as_me:$LINENO: WARNING: inttypes.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: inttypes.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
++    { echo "$as_me:$LINENO: WARNING: inttypes.h: present but cannot be compiled" >&5
++echo "$as_me: WARNING: inttypes.h: present but cannot be compiled" >&2;}
++    { echo "$as_me:$LINENO: WARNING: inttypes.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: inttypes.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: inttypes.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: inttypes.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: inttypes.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: inttypes.h:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { echo "$as_me:$LINENO: WARNING: inttypes.h: proceeding with the preprocessor's result" >&5
++echo "$as_me: WARNING: inttypes.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: inttypes.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: inttypes.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++@%:@@%:@ Report this to the AC_PACKAGE_NAME lists.  @%:@@%:@
++@%:@@%:@ ------------------------------------------ @%:@@%:@
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++echo "$as_me:$LINENO: checking for inttypes.h" >&5
++echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6
++if test "${ac_cv_header_inttypes_h+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_header_inttypes_h=$ac_header_preproc
++fi
++echo "$as_me:$LINENO: result: $ac_cv_header_inttypes_h" >&5
++echo "${ECHO_T}$ac_cv_header_inttypes_h" >&6
++
++fi
++if test $ac_cv_header_inttypes_h = yes; then
++  :
++else
++  echo "$as_me:$LINENO: checking for char" >&5
++echo $ECHO_N "checking for char... $ECHO_C" >&6
++if test "${ac_cv_type_char+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
++int
++main ()
++{
++if ((char *) 0)
++  return 0;
++if (sizeof (char))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_char=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_char=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5
++echo "${ECHO_T}$ac_cv_type_char" >&6
++
++echo "$as_me:$LINENO: checking size of char" >&5
++echo $ECHO_N "checking size of char... $ECHO_C" >&6
++if test "${ac_cv_sizeof_char+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$ac_cv_type_char" = yes; then
++  # The cast to unsigned long 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.
++  if test "$cross_compiling" = yes; then
++  # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (char))) >= 0)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=0 ac_mid=0
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr $ac_mid + 1`
++		    if test $ac_lo -le $ac_mid; then
++		      ac_lo= ac_hi=
++		      break
++		    fi
++		    ac_mid=`expr 2 '*' $ac_mid + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (char))) < 0)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=-1 ac_mid=-1
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (char))) >= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_hi=`expr '(' $ac_mid ')' - 1`
++		       if test $ac_mid -le $ac_hi; then
++			 ac_lo= ac_hi=
++			 break
++		       fi
++		       ac_mid=`expr 2 '*' $ac_mid`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo= ac_hi=
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr '(' $ac_mid ')' + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_char=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (char), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++else
++  if test "$cross_compiling" = yes; then
++  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++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
++long longval () { return (long) (sizeof (char)); }
++unsigned long ulongval () { return (long) (sizeof (char)); }
++@%:@include <stdio.h>
++@%:@include <stdlib.h>
++int
++main ()
++{
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    exit (1);
++  if (((long) (sizeof (char))) < 0)
++    {
++      long i = longval ();
++      if (i != ((long) (sizeof (char))))
++	exit (1);
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long i = ulongval ();
++      if (i != ((long) (sizeof (char))))
++	exit (1);
++      fprintf (f, "%lu\n", i);
++    }
++  exit (ferror (f) || fclose (f) != 0);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_sizeof_char=`cat conftest.val`
++else
++  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 )
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (char), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++rm -f conftest.val
++else
++  ac_cv_sizeof_char=0
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5
++echo "${ECHO_T}$ac_cv_sizeof_char" >&6
++cat >>confdefs.h <<_ACEOF
++@%:@define SIZEOF_CHAR $ac_cv_sizeof_char
++_ACEOF
++
++
++	echo "$as_me:$LINENO: checking for short" >&5
++echo $ECHO_N "checking for short... $ECHO_C" >&6
++if test "${ac_cv_type_short+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
++int
++main ()
++{
++if ((short *) 0)
++  return 0;
++if (sizeof (short))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_short=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_short=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
++echo "${ECHO_T}$ac_cv_type_short" >&6
++
++echo "$as_me:$LINENO: checking size of short" >&5
++echo $ECHO_N "checking size of short... $ECHO_C" >&6
++if test "${ac_cv_sizeof_short+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$ac_cv_type_short" = yes; then
++  # The cast to unsigned long 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.
++  if test "$cross_compiling" = yes; then
++  # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (short))) >= 0)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=0 ac_mid=0
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr $ac_mid + 1`
++		    if test $ac_lo -le $ac_mid; then
++		      ac_lo= ac_hi=
++		      break
++		    fi
++		    ac_mid=`expr 2 '*' $ac_mid + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (short))) < 0)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=-1 ac_mid=-1
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_hi=`expr '(' $ac_mid ')' - 1`
++		       if test $ac_mid -le $ac_hi; then
++			 ac_lo= ac_hi=
++			 break
++		       fi
++		       ac_mid=`expr 2 '*' $ac_mid`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo= ac_hi=
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr '(' $ac_mid ')' + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_short=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (short), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++else
++  if test "$cross_compiling" = yes; then
++  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++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
++long longval () { return (long) (sizeof (short)); }
++unsigned long ulongval () { return (long) (sizeof (short)); }
++@%:@include <stdio.h>
++@%:@include <stdlib.h>
++int
++main ()
++{
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    exit (1);
++  if (((long) (sizeof (short))) < 0)
++    {
++      long i = longval ();
++      if (i != ((long) (sizeof (short))))
++	exit (1);
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long i = ulongval ();
++      if (i != ((long) (sizeof (short))))
++	exit (1);
++      fprintf (f, "%lu\n", i);
++    }
++  exit (ferror (f) || fclose (f) != 0);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_sizeof_short=`cat conftest.val`
++else
++  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 )
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (short), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++rm -f conftest.val
++else
++  ac_cv_sizeof_short=0
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
++echo "${ECHO_T}$ac_cv_sizeof_short" >&6
++cat >>confdefs.h <<_ACEOF
++@%:@define SIZEOF_SHORT $ac_cv_sizeof_short
++_ACEOF
++
++
++	echo "$as_me:$LINENO: checking for int" >&5
++echo $ECHO_N "checking for int... $ECHO_C" >&6
++if test "${ac_cv_type_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
++int
++main ()
++{
++if ((int *) 0)
++  return 0;
++if (sizeof (int))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_int=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_int=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
++echo "${ECHO_T}$ac_cv_type_int" >&6
++
++echo "$as_me:$LINENO: checking size of int" >&5
++echo $ECHO_N "checking size of int... $ECHO_C" >&6
++if test "${ac_cv_sizeof_int+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "$ac_cv_type_int" = yes; then
++  # The cast to unsigned long 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.
++  if test "$cross_compiling" = yes; then
++  # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (int))) >= 0)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=0 ac_mid=0
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr $ac_mid + 1`
++		    if test $ac_lo -le $ac_mid; then
++		      ac_lo= ac_hi=
++		      break
++		    fi
++		    ac_mid=`expr 2 '*' $ac_mid + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (int))) < 0)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=-1 ac_mid=-1
++  while :; do
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_lo=$ac_mid; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_hi=`expr '(' $ac_mid ')' - 1`
++		       if test $ac_mid -le $ac_hi; then
++			 ac_lo= ac_hi=
++			 break
++		       fi
++		       ac_mid=`expr 2 '*' $ac_mid`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo= ac_hi=
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++static int test_array @<:@1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)@:>@;
++test_array @<:@0@:>@ = 0
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_hi=$ac_mid
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_lo=`expr '(' $ac_mid ')' + 1`
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_int=$ac_lo;;
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (int), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++else
++  if test "$cross_compiling" = yes; then
++  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++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
++long longval () { return (long) (sizeof (int)); }
++unsigned long ulongval () { return (long) (sizeof (int)); }
++@%:@include <stdio.h>
++@%:@include <stdlib.h>
++int
++main ()
++{
++
++  FILE *f = fopen ("conftest.val", "w");
++  if (! f)
++    exit (1);
++  if (((long) (sizeof (int))) < 0)
++    {
++      long i = longval ();
++      if (i != ((long) (sizeof (int))))
++	exit (1);
++      fprintf (f, "%ld\n", i);
++    }
++  else
++    {
++      unsigned long i = ulongval ();
++      if (i != ((long) (sizeof (int))))
++	exit (1);
++      fprintf (f, "%lu\n", i);
++    }
++  exit (ferror (f) || fclose (f) != 0);
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_sizeof_int=`cat conftest.val`
++else
++  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 )
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (int), 77
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++rm -f conftest.val
++else
++  ac_cv_sizeof_int=0
++fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
++echo "${ECHO_T}$ac_cv_sizeof_int" >&6
++cat >>confdefs.h <<_ACEOF
++@%:@define SIZEOF_INT $ac_cv_sizeof_int
++_ACEOF
++
++
++	if test x"$ac_cv_sizeof_char" != x"1" -o \
++	    x"$ac_cv_sizeof_short" != x"2" -o \
++	    x"$ac_cv_sizeof_int" != x"4"; then
++	    { { echo "$as_me:$LINENO: error: can not build a default inttypes.h" >&5
++echo "$as_me: error: can not build a default inttypes.h" >&2;}
++   { (exit 1); exit 1; }; }
++	fi
++	cat >include/inttypes.h << EOF
++/* default inttypes.h for people who do not have it on their system */
++
++#ifndef _INTTYPES_H
++#define _INTTYPES_H
++#if (!defined __int8_t_defined) && (!defined __BIT_TYPES_DEFINED__)
++#define __int8_t_defined
++typedef signed char int8_t;
++typedef signed short int16_t;
++typedef signed int int32_t;
++#ifdef ARCH_X86
++typedef signed long long int64_t;
++#endif
++#endif
++#if (!defined _LINUX_TYPES_H)
++typedef unsigned char uint8_t;
++typedef unsigned short uint16_t;
++typedef unsigned int uint32_t;
++#ifdef ARCH_X86
++typedef unsigned long long uint64_t;
++#endif
++#endif
++#endif
++EOF
++	
++fi
++
++
++
++echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
++echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
++if test "${ac_cv_c_const+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.  */
++
++int
++main ()
++{
++/* FIXME: Include the comments suggested by Paul. */
++#ifndef __cplusplus
++  /* Ultrix mips cc rejects this.  */
++  typedef int charset[2];
++  const charset x;
++  /* SunOS 4.1.1 cc rejects this.  */
++  char const *const *ccp;
++  char **p;
++  /* NEC SVR4.0.2 mips cc rejects this.  */
++  struct point {int x, y;};
++  static struct point const zero = {0,0};
++  /* AIX XL C 1.02.0.0 rejects this.
++     It does not let you subtract one const X* pointer from another in
++     an arm of an if-expression whose if-part is not a constant
++     expression */
++  const char *g = "string";
++  ccp = &g + (g ? g-g : 0);
++  /* HPUX 7.0 cc rejects these. */
++  ++ccp;
++  p = (char**) ccp;
++  ccp = (char const *const *) p;
++  { /* SCO 3.2v4 cc rejects this.  */
++    char *t;
++    char const *s = 0 ? (char *) 0 : (char const *) 0;
++
++    *t++ = 0;
++  }
++  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
++    int x[] = {25, 17};
++    const int *foo = &x[0];
++    ++foo;
++  }
++  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
++    typedef const int *iptr;
++    iptr p = 0;
++    ++p;
++  }
++  { /* AIX XL C 1.02.0.0 rejects this saying
++       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
++    struct s { int j; const int *ap[3]; };
++    struct s *b; b->j = 5;
++  }
++  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
++    const int foo = 10;
++  }
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_c_const=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_c_const=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
++echo "${ECHO_T}$ac_cv_c_const" >&6
++if test $ac_cv_c_const = no; then
++  
++cat >>confdefs.h <<\_ACEOF
++@%:@define const 
++_ACEOF
++
++fi
++
++echo "$as_me:$LINENO: checking for inline" >&5
++echo $ECHO_N "checking for inline... $ECHO_C" >&6
++if test "${ac_cv_c_inline+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_c_inline=no
++for ac_kw in inline __inline__ __inline; do
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifndef __cplusplus
++typedef int foo_t;
++static $ac_kw foo_t static_foo () {return 0; }
++$ac_kw foo_t foo () {return 0; }
++#endif
++
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_c_inline=$ac_kw; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
++echo "${ECHO_T}$ac_cv_c_inline" >&6
++
++
++case $ac_cv_c_inline in
++  inline | yes) ;;
++  *)
++    case $ac_cv_c_inline in
++      no) ac_val=;;
++      *) ac_val=$ac_cv_c_inline;;
++    esac
++    cat >>confdefs.h <<_ACEOF
++#ifndef __cplusplus
++#define inline $ac_val
++#endif
++_ACEOF
++    ;;
++esac
++
++    if test x"$GCC" = x"yes" -a x"$ac_cv_c_inline" = x"inline"; then
++	echo "$as_me:$LINENO: checking for always_inline" >&5
++echo $ECHO_N "checking for always_inline... $ECHO_C" >&6
++	SAVE_CFLAGS="$CFLAGS"
++	CFLAGS="$CFLAGS -Wall -Werror"
++	cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++__attribute__ ((__always_inline__)) void f (void);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_always_inline=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_always_inline=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++	CFLAGS="$SAVE_CFLAGS"
++	echo "$as_me:$LINENO: result: $ac_cv_always_inline" >&5
++echo "${ECHO_T}$ac_cv_always_inline" >&6
++	if test x"$ac_cv_always_inline" = x"yes"; then
++	    cat >>confdefs.h <<_ACEOF
++@%:@define inline __attribute__ ((__always_inline__))
++_ACEOF
++
++	fi
++    fi
++echo "$as_me:$LINENO: checking for restrict" >&5
++echo $ECHO_N "checking for restrict... $ECHO_C" >&6
++    ac_cv_c_restrict=no
++    for ac_kw in restrict __restrict__ __restrict; do
++	cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++char * $ac_kw p;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_c_restrict=$ac_kw; break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++    done
++    echo "$as_me:$LINENO: result: $ac_cv_c_restrict" >&5
++echo "${ECHO_T}$ac_cv_c_restrict" >&6
++    case $ac_cv_c_restrict in
++	restrict) ;;
++	no)	
++cat >>confdefs.h <<\_ACEOF
++@%:@define restrict 
++_ACEOF
++ ;;
++	*)	cat >>confdefs.h <<_ACEOF
++@%:@define restrict $ac_cv_c_restrict
++_ACEOF
++ ;;
++    esac
++echo "$as_me:$LINENO: checking for size_t" >&5
++echo $ECHO_N "checking for size_t... $ECHO_C" >&6
++if test "${ac_cv_type_size_t+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
++int
++main ()
++{
++if ((size_t *) 0)
++  return 0;
++if (sizeof (size_t))
++  return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_size_t=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_size_t=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
++echo "${ECHO_T}$ac_cv_type_size_t" >&6
++if test $ac_cv_type_size_t = yes; then
++  :
++else
++  
++cat >>confdefs.h <<_ACEOF
++@%:@define size_t unsigned
++_ACEOF
++
++fi
++
++echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
++echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
++if test "${ac_cv_c_bigendian+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  # See if sys/param.h defines the BYTE_ORDER macro.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <sys/param.h>
++
++int
++main ()
++{
++#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
++ bogus endian macros
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  # It does; now see whether it defined to BIG_ENDIAN or not.
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <sys/types.h>
++#include <sys/param.h>
++
++int
++main ()
++{
++#if BYTE_ORDER != BIG_ENDIAN
++ not big endian
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_c_bigendian=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_c_bigendian=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++# It does not; compile a test program.
++if test "$cross_compiling" = yes; then
++  # try to guess the endianness by grepping values into an object file
++  ac_cv_c_bigendian=unknown
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
++short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
++void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
++short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
++short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
++void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
++int
++main ()
++{
++ _ascii (); _ebcdic (); 
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
++  ac_cv_c_bigendian=yes
++fi
++if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
++  if test "$ac_cv_c_bigendian" = unknown; then
++    ac_cv_c_bigendian=no
++  else
++    # finding both strings is unlikely to happen, but who knows?
++    ac_cv_c_bigendian=unknown
++  fi
++fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++int
++main ()
++{
++  /* Are we little or big endian?  From Harbison&Steele.  */
++  union
++  {
++    long l;
++    char c[sizeof (long)];
++  } u;
++  u.l = 1;
++  exit (u.c[sizeof (long) - 1] == 1);
++}
++_ACEOF
++rm -f conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_c_bigendian=no
++else
++  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_c_bigendian=yes
++fi
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
++echo "${ECHO_T}$ac_cv_c_bigendian" >&6
++case $ac_cv_c_bigendian in
++  yes)
++    
++cat >>confdefs.h <<\_ACEOF
++@%:@define WORDS_BIGENDIAN 1
++_ACEOF
++ ;;
++  no)
++     ;;
++  *)
++    { { echo "$as_me:$LINENO: error: unknown endianness
++presetting ac_cv_c_bigendian=no (or yes) will help" >&5
++echo "$as_me: error: unknown endianness
++presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
++   { (exit 1); exit 1; }; } ;;
++esac
++
++
++
++
++
++for ac_func in memalign gettimeofday ftime
++do
++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 eval "test \"\${$as_ac_var+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.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char $ac_func ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
++choke me
++#else
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != $ac_func;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  eval "$as_ac_var=yes"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++eval "$as_ac_var=no"
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
++if test `eval echo '${'$as_ac_var'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++@%:@define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
++_ACEOF
++ 
++fi
++done
++
++echo "$as_me:$LINENO: checking return type of signal handlers" >&5
++echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
++if test "${ac_cv_type_signal+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.  */
++#include <sys/types.h>
++#include <signal.h>
++#ifdef signal
++# undef signal
++#endif
++#ifdef __cplusplus
++extern "C" void (*signal (int, void (*)(int)))(int);
++#else
++void (*signal ()) ();
++#endif
++
++int
++main ()
++{
++int i;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_type_signal=void
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_type_signal=int
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
++echo "${ECHO_T}$ac_cv_type_signal" >&6
++
++cat >>confdefs.h <<_ACEOF
++@%:@define RETSIGTYPE $ac_cv_type_signal
++_ACEOF
++
++
++
++
++
++
++
++# Check whether --enable-double or --disable-double was given.
++if test "${enable_double+set}" = set; then
++  enableval="$enable_double"
++  
++fi; 
++if test x"$enable_double" = x"yes"; then
++    
++cat >>confdefs.h <<\_ACEOF
++@%:@define LIBA52_DOUBLE 
++_ACEOF
++
++fi
++
++# Check whether --enable-djbfft or --disable-djbfft was given.
++if test "${enable_djbfft+set}" = set; then
++  enableval="$enable_djbfft"
++  
++fi; 
++if test x"$enable_djbfft" = x"yes"; then
++    
++cat >>confdefs.h <<\_ACEOF
++@%:@define LIBA52_DJBFFT 
++_ACEOF
++
++    LIBA52_LIBS="$LIBA52_LIBS -ldjbfft"
++fi
++
++
++
++# Check whether --enable-oss or --disable-oss was given.
++if test "${enable_oss+set}" = set; then
++  enableval="$enable_oss"
++  
++fi; 
++if test x"$enable_oss" != x"no"; then
++    case "$host" in
++    *-linux*|*-openbsd*|*-freebsd*|*-bsdi*)
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define LIBAO_OSS 
++_ACEOF
++
++	echo "$as_me:$LINENO: checking for _oss_ioctl in -lossaudio" >&5
++echo $ECHO_N "checking for _oss_ioctl in -lossaudio... $ECHO_C" >&6
++if test "${ac_cv_lib_ossaudio__oss_ioctl+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lossaudio  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char _oss_ioctl ();
++int
++main ()
++{
++_oss_ioctl ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_ossaudio__oss_ioctl=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_ossaudio__oss_ioctl=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5
++echo "${ECHO_T}$ac_cv_lib_ossaudio__oss_ioctl" >&6
++if test $ac_cv_lib_ossaudio__oss_ioctl = yes; then
++  LIBAO_LIBS="$LIBAO_LIBS -lossaudio"
++fi
++;;
++    esac
++fi
++
++# Check whether --enable-solaris-audio or --disable-solaris-audio was given.
++if test "${enable_solaris_audio+set}" = set; then
++  enableval="$enable_solaris_audio"
++  
++fi; 
++if test x"$enable_solaris_audio" != x"no"; then
++    case "$host" in
++    *-sun-solaris*)
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define LIBAO_SOLARIS 
++_ACEOF
++;;
++    esac
++fi
++
++# Check whether --enable-al-audio or --disable-al-audio was given.
++if test "${enable_al_audio+set}" = set; then
++  enableval="$enable_al_audio"
++  
++fi; 
++if test x"$enable_al" != x"no"; then
++    case "$host" in
++    *-sgi-irix*)
++	LIBAO_LIBS="$LIBAO_LIBS -laudio"
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define LIBAO_AL 
++_ACEOF
++;;
++    esac
++fi
++
++# Check whether --enable-win or --disable-win was given.
++if test "${enable_win+set}" = set; then
++  enableval="$enable_win"
++  
++fi; 
++if test x"$enable_win" != x"no"; then
++    case "$host" in
++    *-mingw32*|*-cygwin)
++	LIBAO_LIBS="$LIBAO_LIBS -lwinmm"
++	
++cat >>confdefs.h <<\_ACEOF
++@%:@define LIBAO_WIN 
++_ACEOF
++;;
++    esac
++fi
++
++
++# Check whether --enable-warnings or --disable-warnings was given.
++if test "${enable_warnings+set}" = set; then
++  enableval="$enable_warnings"
++  
++fi; 
++if test x"$enable_warnings" = x"yes" -a x"$GCC" = x"yes"; then
++        OPT_CFLAGS="$CFLAGS -Wall -Werror"
++    echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
++echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
++    SAVE_CFLAGS="$CFLAGS"
++    CFLAGS="$OPT_CFLAGS"
++    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_try_cflags_ok=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_try_cflags_ok=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++    CFLAGS="$SAVE_CFLAGS"
++    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
++echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
++    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
++	CFLAGS=$OPT_CFLAGS
++    else
++	:
++    fi
++elif test x"$TENDRA" = x"yes"; then
++        CFLAGS="$CFLAGS -DTenDRA_check"
++fi
++
++
++
++A52DEC_CFLAGS="$CFLAGS"
++
++# Check whether --enable-gprof or --disable-gprof was given.
++if test "${enable_gprof+set}" = set; then
++  enableval="$enable_gprof"
++  
++fi; 
++if test x"$enable_gprof" = x"yes"; then
++    A52DEC_CFLAGS=`echo "$A52DEC_CFLAGS"|sed "s/-fomit-frame-pointer//g"`
++    A52DEC_CFLAGS="$A52DEC_CFLAGS -p"
++fi
++
++
++echo "$as_me:$LINENO: checking __attribute__ ((aligned ())) support" >&5
++echo $ECHO_N "checking __attribute__ ((aligned ())) support... $ECHO_C" >&6
++if test "${ac_cv_c_attribute_aligned+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_c_attribute_aligned=0
++	for ac_cv_c_attr_align_try in 2 4 8 16 32 64; do
++	    cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++static char c __attribute__ ((aligned($ac_cv_c_attr_align_try))) = 0; return c;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_c_attribute_aligned=$ac_cv_c_attr_align_try
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++	done
++fi
++echo "$as_me:$LINENO: result: $ac_cv_c_attribute_aligned" >&5
++echo "${ECHO_T}$ac_cv_c_attribute_aligned" >&6
++    if test x"$ac_cv_c_attribute_aligned" != x"0"; then
++	
++cat >>confdefs.h <<_ACEOF
++@%:@define ATTRIBUTE_ALIGNED_MAX $ac_cv_c_attribute_aligned
++_ACEOF
++
++    fi
++
++cat >confcache <<\_ACEOF
++# This file is a shell script that caches the results of configure
++# tests run on this system so they can be shared between configure
++# scripts and configure runs, see configure's option --config-cache.
++# It is not useful on other systems.  If it contains results you don't
++# want to keep, you may remove or edit it.
++#
++# config.status only pays attention to the cache file if you give it
++# the --recheck option to rerun configure.
++#
++# `ac_cv_env_foo' variables (set or unset) will be overridden when
++# loading this file, other *unset* `ac_cv_foo' will be assigned the
++# following values.
++
++_ACEOF
++
++# The following way of writing the cache mishandles newlines in values,
++# but we know of no workaround that is simple, portable, and efficient.
++# So, don't put newlines in cache variables' values.
++# Ultrix sh set writes to stderr and can't be redirected directly,
++# and sets the high bit in the cache file unless we assign to the vars.
++{
++  (set) 2>&1 |
++    case `(ac_space=' '; set | grep ac_space) 2>&1` in
++    *ac_space=\ *)
++      # `set' does not quote correctly, so add quotes (double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \).
++      sed -n \
++	"s/'/'\\\\''/g;
++	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
++      ;;
++    *)
++      # `set' quotes correctly as required by POSIX, so do not add quotes.
++      sed -n \
++	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++      ;;
++    esac;
++} |
++  sed '
++     t clear
++     : clear
++     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
++     t end
++     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
++     : end' >>confcache
++if diff $cache_file confcache >/dev/null 2>&1; then :; else
++  if test -w $cache_file; then
++    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
++    cat confcache >$cache_file
++  else
++    echo "not updating unwritable cache $cache_file"
++  fi
++fi
++rm -f confcache
++
++test "x$prefix" = xNONE && prefix=$ac_default_prefix
++# Let make expand exec_prefix.
++test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
++
++# 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
++# (actually we leave an empty line to preserve line numbers).
++if test "x$srcdir" = x.; then
++  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
++s/:*\$(srcdir):*/:/;
++s/:*\${srcdir}:*/:/;
++s/:*@srcdir@:*/:/;
++s/^\([^=]*=[	 ]*\):*/\1/;
++s/:*$//;
++s/^[^=]*=[	 ]*$//;
++}'
++fi
++
++DEFS=-DHAVE_CONFIG_H
++
++ac_libobjs=
++ac_ltlibobjs=
++for ac_i in : $LIB@&t@OBJS; do test "x$ac_i" = x: && continue
++  # 1. Remove the extension, and $U if already installed.
++  ac_i=`echo "$ac_i" |
++	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
++  # 2. Add them.
++  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
++  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
++done
++LIB@&t@OBJS=$ac_libobjs
++
++LTLIBOBJS=$ac_ltlibobjs
++
++
++if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++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
++  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++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
++  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++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
++  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++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_clean_files_save=$ac_clean_files
++ac_clean_files="$ac_clean_files $CONFIG_STATUS"
++{ 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.
++# Compiler output produced by configure, useful for debugging
++# configure, is in config.log if it exists.
++
++debug=false
++ac_cs_recheck=false
++ac_cs_silent=false
++SHELL=\${CONFIG_SHELL-$SHELL}
++_ACEOF
++
++cat >>$CONFIG_STATUS <<\_ACEOF
++## --------------------- ##
++## M4sh Initialization.  ##
++## --------------------- ##
++
++# Be Bourne compatible
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
++elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
++  set -o posix
++fi
++DUALCASE=1; export DUALCASE # for MKS sh
++
++# Support unset when possible.
++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
++  as_unset=unset
++else
++  as_unset=false
++fi
++
++
++# Work around bugs in pre-3.0 UWIN ksh.
++$as_unset ENV MAIL MAILPATH
++PS1='$ '
++PS2='> '
++PS4='+ '
++
++# NLS nuisances.
++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
++  fi
++done
++
++# Required to use basename.
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
++
++if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++  as_basename=basename
++else
++  as_basename=false
++fi
++
++
++# Name of the executable.
++as_me=`$as_basename "$0" ||
++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
++	 X"$0" : 'X\(//\)$' \| \
++	 X"$0" : 'X\(/\)$' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X/"$0" |
++    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
++  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\/\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++
++
++# PATH needs CR, and LINENO needs CR and PATH.
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
++
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++  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
++
++
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
++  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
++  # Find who we are.  Look in the path if we contain no path at all
++  # relative or not.
++  case $0 in
++    *[\\/]* ) as_myself=$0 ;;
++    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++done
++
++       ;;
++  esac
++  # We did not find ourselves, most probably we were run as `sh COMMAND'
++  # in which case we are not to be found in the path.
++  if test "x$as_myself" = x; then
++    as_myself=$0
++  fi
++  if test ! -f "$as_myself"; then
++    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
++echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
++   { (exit 1); exit 1; }; }
++  fi
++  case $CONFIG_SHELL in
++  '')
++    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for as_base in sh bash ksh sh5; do
++	 case $as_dir in
++	 /*)
++	   if ("$as_dir/$as_base" -c '
++  as_lineno_1=$LINENO
++  as_lineno_2=$LINENO
++  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
++  test "x$as_lineno_1" != "x$as_lineno_2" &&
++  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
++	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
++	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
++	     CONFIG_SHELL=$as_dir/$as_base
++	     export CONFIG_SHELL
++	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
++	   fi;;
++	 esac
++       done
++done
++;;
++  esac
++
++  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
++  # uniformly replaced by the line number.  The first 'sed' inserts a
++  # line-number line before each line; the second 'sed' does the real
++  # work.  The second script uses 'N' to pair each line-number line
++  # with the numbered line, and appends trailing '-' during
++  # substitution so that $LINENO is not a special case at line end.
++  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
++  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
++  sed '=' <$as_myself |
++    sed '
++      N
++      s,$,-,
++      : loop
++      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
++      t loop
++      s,-$,,
++      s,^['$as_cr_digits']*\n,,
++    ' >$as_me.lineno &&
++  chmod +x $as_me.lineno ||
++    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
++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
++  # (the dirname of $[0] is not the place where we might find the
++  # original and so on.  Autoconf is especially sensible to this).
++  . ./$as_me.lineno
++  # Exit status is that of the last command.
++  exit
++}
++
++
++case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
++  *c*,-n*) ECHO_N= ECHO_C='
++' ECHO_T='	' ;;
++  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
++  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
++esac
++
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
++
++rm -f conf$$ conf$$.exe conf$$.file
++echo >conf$$.file
++if ln -s conf$$.file conf$$ 2>/dev/null; then
++  # We could just check for DJGPP; but this test a) works b) is more generic
++  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
++  if test -f conf$$.exe; then
++    # Don't use ln at all; we don't have any links
++    as_ln_s='cp -p'
++  else
++    as_ln_s='ln -s'
++  fi
++elif ln conf$$.file conf$$ 2>/dev/null; then
++  as_ln_s=ln
++else
++  as_ln_s='cp -p'
++fi
++rm -f conf$$ conf$$.exe conf$$.file
++
++if mkdir -p . 2>/dev/null; then
++  as_mkdir_p=:
++else
++  test -d ./-p && rmdir ./-p
++  as_mkdir_p=false
++fi
++
++as_executable_p="test -f"
++
++# Sed expression to map a string onto a valid CPP name.
++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
++
++# Sed expression to map a string onto a valid variable name.
++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
++
++
++# IFS
++# We need space, tab and new line, in precisely that order.
++as_nl='
++'
++IFS=" 	$as_nl"
++
++# CDPATH.
++$as_unset CDPATH
++
++exec 6>&1
++
++# Open the log real soon, to keep \$[0] and so on meaningful, and to
++# report actual input values of CONFIG_FILES etc. instead of their
++# values after options handling.  Logging --version etc. is OK.
++exec 5>>config.log
++{
++  echo
++  sed 'h;s/./-/g;s/^.../@%:@@%:@ /;s/...$/ @%:@@%:@/;p;x;p;x' <<_ASBOX
++@%:@@%:@ Running $as_me. @%:@@%:@
++_ASBOX
++} >&5
++cat >&5 <<_CSEOF
++
++This file was extended by $as_me, which was
++generated by GNU Autoconf 2.59.  Invocation command line was
++
++  CONFIG_FILES    = $CONFIG_FILES
++  CONFIG_HEADERS  = $CONFIG_HEADERS
++  CONFIG_LINKS    = $CONFIG_LINKS
++  CONFIG_COMMANDS = $CONFIG_COMMANDS
++  $ $0 $@
++
++_CSEOF
++echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
++echo >&5
++_ACEOF
++
++# Files that config.status was made for.
++if test -n "$ac_config_files"; then
++  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
++fi
++
++if test -n "$ac_config_headers"; then
++  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
++fi
++
++if test -n "$ac_config_links"; then
++  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
++fi
++
++if test -n "$ac_config_commands"; then
++  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
++fi
++
++cat >>$CONFIG_STATUS <<\_ACEOF
++
++ac_cs_usage="\
++\`$as_me' instantiates files from templates according to the
++current configuration.
++
++Usage: $0 [OPTIONS] [FILE]...
++
++  -h, --help       print this help, then exit
++  -V, --version    print version number, then exit
++  -q, --quiet      do not print progress messages
++  -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
++  --header=FILE[:TEMPLATE]
++		   instantiate the configuration header FILE
++
++Configuration files:
++$config_files
++
++Configuration headers:
++$config_headers
++
++Configuration commands:
++$config_commands
++
++Report bugs to <bug-autoconf@gnu.org>."
++_ACEOF
++
++cat >>$CONFIG_STATUS <<_ACEOF
++ac_cs_version="\\
++config.status
++configured by $0, generated by GNU Autoconf 2.59,
++  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
++
++Copyright (C) 2003 Free Software Foundation, Inc.
++This config.status script is free software; the Free Software Foundation
++gives unlimited permission to copy, distribute and modify it."
++srcdir=$srcdir
++INSTALL="$INSTALL"
++_ACEOF
++
++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
++  case $1 in
++  --*=*)
++    ac_option=`expr "x$1" : 'x\([^=]*\)='`
++    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
++    ac_shift=:
++    ;;
++  -*)
++    ac_option=$1
++    ac_optarg=$2
++    ac_shift=shift
++    ;;
++  *) # This is not an option, so the user has probably given explicit
++     # arguments.
++     ac_option=$1
++     ac_need_defaults=false;;
++  esac
++
++  case $ac_option in
++  # Handling of the options.
++_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF
++  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++    ac_cs_recheck=: ;;
++  --version | --vers* | -V )
++    echo "$ac_cs_version"; exit 0 ;;
++  --he | --h)
++    # Conflict between --help and --header
++    { { echo "$as_me:$LINENO: error: ambiguous option: $1
++Try \`$0 --help' for more information." >&5
++echo "$as_me: error: ambiguous option: $1
++Try \`$0 --help' for more information." >&2;}
++   { (exit 1); exit 1; }; };;
++  --help | --hel | -h )
++    echo "$ac_cs_usage"; exit 0 ;;
++  --debug | --d* | -d )
++    debug=: ;;
++  --file | --fil | --fi | --f )
++    $ac_shift
++    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
++    ac_need_defaults=false;;
++  --header | --heade | --head | --hea )
++    $ac_shift
++    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
++    ac_need_defaults=false;;
++  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
++  | -silent | --silent | --silen | --sile | --sil | --si | --s)
++    ac_cs_silent=: ;;
++
++  # This is an error.
++  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
++Try \`$0 --help' for more information." >&5
++echo "$as_me: error: unrecognized option: $1
++Try \`$0 --help' for more information." >&2;}
++   { (exit 1); exit 1; }; } ;;
++
++  *) ac_config_targets="$ac_config_targets $1" ;;
++
++  esac
++  shift
++done
++
++ac_configure_extra_args=
++
++if $ac_cs_silent; then
++  exec 6>/dev/null
++  ac_configure_extra_args="$ac_configure_extra_args --silent"
++fi
++
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF
++if \$ac_cs_recheck; then
++  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
++  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++fi
++
++_ACEOF
++
++cat >>$CONFIG_STATUS <<_ACEOF
++#
++# INIT-COMMANDS section.
++#
++
++AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
++
++_ACEOF
++
++
++
++cat >>$CONFIG_STATUS <<\_ACEOF
++for ac_config_target in $ac_config_targets
++do
++  case "$ac_config_target" in
++  # Handling of arguments.
++  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
++  "autotools/Makefile" ) CONFIG_FILES="$CONFIG_FILES autotools/Makefile" ;;
++  "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;;
++  "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
++  "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
++  "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
++  "liba52/Makefile" ) CONFIG_FILES="$CONFIG_FILES liba52/Makefile" ;;
++  "libao/Makefile" ) CONFIG_FILES="$CONFIG_FILES libao/Makefile" ;;
++  "vc++/Makefile" ) CONFIG_FILES="$CONFIG_FILES vc++/Makefile" ;;
++  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
++  "include/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;;
++  *) { { 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
++
++# If the user did not use the arguments to specify the items to instantiate,
++# then the envvar interface is used.  Set only those that are not.
++# We use the long form for the default assignment because of an extremely
++# bizarre bug on SunOS 4.1.3.
++if $ac_need_defaults; then
++  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
++  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
++  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
++fi
++
++# Have a temporary directory for convenience.  Make it in the build tree
++# simply because there is no reason to put it here, and in addition,
++# creating and moving files from /tmp can sometimes cause problems.
++# Create a temporary directory, and hook for its removal unless debugging.
++$debug ||
++{
++  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
++  trap '{ (exit 1); exit 1; }' 1 2 13 15
++}
++
++# Create a (secure) tmp directory for tmp files.
++
++{
++  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
++  test -n "$tmp" && test -d "$tmp"
++}  ||
++{
++  tmp=./confstat$$-$RANDOM
++  (umask 077 && mkdir $tmp)
++} ||
++{
++   echo "$me: cannot create a temporary directory in ." >&2
++   { (exit 1); exit 1; }
++}
++
++_ACEOF
++
++cat >>$CONFIG_STATUS <<_ACEOF
++
++#
++# CONFIG_FILES section.
++#
++
++# 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
++  # Protect against being on the right side of a sed subst in config.status.
++  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
++   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
++s,@SHELL@,$SHELL,;t t
++s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
++s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
++s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
++s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
++s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
++s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
++s,@exec_prefix@,$exec_prefix,;t t
++s,@prefix@,$prefix,;t t
++s,@program_transform_name@,$program_transform_name,;t t
++s,@bindir@,$bindir,;t t
++s,@sbindir@,$sbindir,;t t
++s,@libexecdir@,$libexecdir,;t t
++s,@datadir@,$datadir,;t t
++s,@sysconfdir@,$sysconfdir,;t t
++s,@sharedstatedir@,$sharedstatedir,;t t
++s,@localstatedir@,$localstatedir,;t t
++s,@libdir@,$libdir,;t t
++s,@includedir@,$includedir,;t t
++s,@oldincludedir@,$oldincludedir,;t t
++s,@infodir@,$infodir,;t t
++s,@mandir@,$mandir,;t t
++s,@build_alias@,$build_alias,;t t
++s,@host_alias@,$host_alias,;t t
++s,@target_alias@,$target_alias,;t t
++s,@DEFS@,$DEFS,;t t
++s,@ECHO_C@,$ECHO_C,;t t
++s,@ECHO_N@,$ECHO_N,;t t
++s,@ECHO_T@,$ECHO_T,;t t
++s,@LIBS@,$LIBS,;t t
++s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
++s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
++s,@INSTALL_DATA@,$INSTALL_DATA,;t t
++s,@CYGPATH_W@,$CYGPATH_W,;t t
++s,@PACKAGE@,$PACKAGE,;t t
++s,@VERSION@,$VERSION,;t t
++s,@ACLOCAL@,$ACLOCAL,;t t
++s,@AUTOCONF@,$AUTOCONF,;t t
++s,@AUTOMAKE@,$AUTOMAKE,;t t
++s,@AUTOHEADER@,$AUTOHEADER,;t t
++s,@MAKEINFO@,$MAKEINFO,;t t
++s,@install_sh@,$install_sh,;t t
++s,@STRIP@,$STRIP,;t t
++s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
++s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
++s,@mkdir_p@,$mkdir_p,;t t
++s,@AWK@,$AWK,;t t
++s,@SET_MAKE@,$SET_MAKE,;t t
++s,@am__leading_dot@,$am__leading_dot,;t t
++s,@AMTAR@,$AMTAR,;t t
++s,@am__tar@,$am__tar,;t t
++s,@am__untar@,$am__untar,;t t
++s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
++s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
++s,@MAINT@,$MAINT,;t t
++s,@build@,$build,;t t
++s,@build_cpu@,$build_cpu,;t t
++s,@build_vendor@,$build_vendor,;t t
++s,@build_os@,$build_os,;t t
++s,@host@,$host,;t t
++s,@host_cpu@,$host_cpu,;t t
++s,@host_vendor@,$host_vendor,;t t
++s,@host_os@,$host_os,;t t
++s,@CC@,$CC,;t t
++s,@CFLAGS@,$CFLAGS,;t t
++s,@LDFLAGS@,$LDFLAGS,;t t
++s,@CPPFLAGS@,$CPPFLAGS,;t t
++s,@ac_ct_CC@,$ac_ct_CC,;t t
++s,@EXEEXT@,$EXEEXT,;t t
++s,@OBJEXT@,$OBJEXT,;t t
++s,@DEPDIR@,$DEPDIR,;t t
++s,@am__include@,$am__include,;t t
++s,@am__quote@,$am__quote,;t t
++s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
++s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
++s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
++s,@CCDEPMODE@,$CCDEPMODE,;t t
++s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
++s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
++s,@CPP@,$CPP,;t t
++s,@EGREP@,$EGREP,;t t
++s,@LN_S@,$LN_S,;t t
++s,@ECHO@,$ECHO,;t t
++s,@AR@,$AR,;t t
++s,@ac_ct_AR@,$ac_ct_AR,;t t
++s,@RANLIB@,$RANLIB,;t t
++s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
++s,@DLLTOOL@,$DLLTOOL,;t t
++s,@ac_ct_DLLTOOL@,$ac_ct_DLLTOOL,;t t
++s,@AS@,$AS,;t t
++s,@ac_ct_AS@,$ac_ct_AS,;t t
++s,@OBJDUMP@,$OBJDUMP,;t t
++s,@ac_ct_OBJDUMP@,$ac_ct_OBJDUMP,;t t
++s,@CXX@,$CXX,;t t
++s,@CXXFLAGS@,$CXXFLAGS,;t t
++s,@ac_ct_CXX@,$ac_ct_CXX,;t t
++s,@CXXDEPMODE@,$CXXDEPMODE,;t t
++s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
++s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
++s,@CXXCPP@,$CXXCPP,;t t
++s,@F77@,$F77,;t t
++s,@FFLAGS@,$FFLAGS,;t t
++s,@ac_ct_F77@,$ac_ct_F77,;t t
++s,@LIBTOOL@,$LIBTOOL,;t t
++s,@INCLUDES@,$INCLUDES,;t t
++s,@LIBA52_CFLAGS@,$LIBA52_CFLAGS,;t t
++s,@LIBA52_LIBS@,$LIBA52_LIBS,;t t
++s,@LIBAO_LIBS@,$LIBAO_LIBS,;t t
++s,@A52DEC_CFLAGS@,$A52DEC_CFLAGS,;t t
++s,@LIB@&t@OBJS@,$LIB@&t@OBJS,;t t
++s,@LTLIBOBJS@,$LTLIBOBJS,;t t
++CEOF
++
++_ACEOF
++
++  cat >>$CONFIG_STATUS <<\_ACEOF
++  # Split the substitutions into bite-sized pieces for seds with
++  # small command number limits, like on Digital OSF/1 and HP-UX.
++  ac_max_sed_lines=48
++  ac_sed_frag=1 # Number of current file.
++  ac_beg=1 # First line for current file.
++  ac_end=$ac_max_sed_lines # Line after last line for current file.
++  ac_more_lines=:
++  ac_sed_cmds=
++  while $ac_more_lines; do
++    if test $ac_beg -gt 1; then
++      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
++    else
++      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
++    fi
++    if test ! -s $tmp/subs.frag; then
++      ac_more_lines=false
++    else
++      # The purpose of the label and of the branching condition is to
++      # speed up the sed processing (if there are no `@' at all, there
++      # is no need to browse any of the substitutions).
++      # These are the two extra sed commands mentioned above.
++      (echo ':t
++  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
++      if test -z "$ac_sed_cmds"; then
++	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
++      else
++	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
++      fi
++      ac_sed_frag=`expr $ac_sed_frag + 1`
++      ac_beg=$ac_end
++      ac_end=`expr $ac_end + $ac_max_sed_lines`
++    fi
++  done
++  if test -z "$ac_sed_cmds"; then
++    ac_sed_cmds=cat
++  fi
++fi # test -n "$CONFIG_FILES"
++
++_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF
++for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
++  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
++  case $ac_file in
++  - | *:- | *:-:* ) # input from stdin
++	cat >$tmp/stdin
++	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
++	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
++  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
++	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
++  * )   ac_file_in=$ac_file.in ;;
++  esac
++
++  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
++  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
++$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; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++  { if $as_mkdir_p; then
++    mkdir -p "$ac_dir"
++  else
++    as_dir="$ac_dir"
++    as_dirs=
++    while test ! -d "$as_dir"; do
++      as_dirs="$as_dir $as_dirs"
++      as_dir=`(dirname "$as_dir") 2>/dev/null ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$as_dir" : 'X\(//\)[^/]' \| \
++	 X"$as_dir" : 'X\(//\)$' \| \
++	 X"$as_dir" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$as_dir" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++    done
++    test ! -n "$as_dirs" || mkdir $as_dirs
++  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
++echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
++   { (exit 1); exit 1; }; }; }
++
++  ac_builddir=.
++
++if test "$ac_dir" != .; then
++  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
++  # A "../" for each directory in $ac_dir_suffix.
++  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
++else
++  ac_dir_suffix= ac_top_builddir=
++fi
++
++case $srcdir in
++  .)  # No --srcdir option.  We are building in place.
++    ac_srcdir=.
++    if test -z "$ac_top_builddir"; then
++       ac_top_srcdir=.
++    else
++       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
++    fi ;;
++  [\\/]* | ?:[\\/]* )  # Absolute path.
++    ac_srcdir=$srcdir$ac_dir_suffix;
++    ac_top_srcdir=$srcdir ;;
++  *) # Relative path.
++    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
++    ac_top_srcdir=$ac_top_builddir$srcdir ;;
++esac
++
++# Do not use `cd foo && pwd` to compute absolute paths, because
++# the directories may not exist.
++case `pwd` in
++.) ac_abs_builddir="$ac_dir";;
++*)
++  case "$ac_dir" in
++  .) ac_abs_builddir=`pwd`;;
++  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
++  *) ac_abs_builddir=`pwd`/"$ac_dir";;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_builddir=${ac_top_builddir}.;;
++*)
++  case ${ac_top_builddir}. in
++  .) ac_abs_top_builddir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
++  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_srcdir=$ac_srcdir;;
++*)
++  case $ac_srcdir in
++  .) ac_abs_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
++  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_srcdir=$ac_top_srcdir;;
++*)
++  case $ac_top_srcdir in
++  .) ac_abs_top_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
++  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
++  esac;;
++esac
++
++
++  case $INSTALL in
++  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
++  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
++  esac
++
++  if test x"$ac_file" != x-; then
++    { echo "$as_me:$LINENO: creating $ac_file" >&5
++echo "$as_me: creating $ac_file" >&6;}
++    rm -f "$ac_file"
++  fi
++  # 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.  */
++  if test x"$ac_file" = x-; then
++    configure_input=
++  else
++    configure_input="$ac_file.  "
++  fi
++  configure_input=$configure_input"Generated from `echo $ac_file_in |
++				     sed 's,.*/,,'` by configure."
++
++  # First look for the input files in the build tree, otherwise in the
++  # src tree.
++  ac_file_inputs=`IFS=:
++    for f in $ac_file_in; do
++      case $f in
++      -) echo $tmp/stdin ;;
++      [\\/$]*)
++	 # Absolute (can't be DOS-style, as IFS=:)
++	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
++echo "$as_me: error: cannot find input file: $f" >&2;}
++   { (exit 1); exit 1; }; }
++	 echo "$f";;
++      *) # Relative
++	 if test -f "$f"; then
++	   # Build tree
++	   echo "$f"
++	 elif test -f "$srcdir/$f"; then
++	   # Source tree
++	   echo "$srcdir/$f"
++	 else
++	   # /dev/null tree
++	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
++echo "$as_me: error: cannot find input file: $f" >&2;}
++   { (exit 1); exit 1; }; }
++	 fi;;
++      esac
++    done` || { (exit 1); exit 1; }
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF
++  sed "$ac_vpsub
++$extrasub
++_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF
++:t
++/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
++s,@configure_input@,$configure_input,;t t
++s,@srcdir@,$ac_srcdir,;t t
++s,@abs_srcdir@,$ac_abs_srcdir,;t t
++s,@top_srcdir@,$ac_top_srcdir,;t t
++s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
++s,@builddir@,$ac_builddir,;t t
++s,@abs_builddir@,$ac_abs_builddir,;t t
++s,@top_builddir@,$ac_top_builddir,;t t
++s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
++s,@INSTALL@,$ac_INSTALL,;t t
++" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
++  rm -f $tmp/stdin
++  if test x"$ac_file" != x-; then
++    mv $tmp/out $ac_file
++  else
++    cat $tmp/out
++    rm -f $tmp/out
++  fi
++
++done
++_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF
++
++#
++# CONFIG_HEADER section.
++#
++
++# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
++# NAME is the cpp macro being defined and VALUE is the value it is being given.
++#
++# ac_d sets the value in "#define NAME VALUE" lines.
++ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
++ac_dB='[	 ].*$,\1#\2'
++ac_dC=' '
++ac_dD=',;t'
++# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
++ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
++ac_uB='$,\1#\2define\3'
++ac_uC=' '
++ac_uD=',;t'
++
++for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
++  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
++  case $ac_file in
++  - | *:- | *:-:* ) # input from stdin
++	cat >$tmp/stdin
++	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
++	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
++  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
++	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
++  * )   ac_file_in=$ac_file.in ;;
++  esac
++
++  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
++echo "$as_me: creating $ac_file" >&6;}
++
++  # First look for the input files in the build tree, otherwise in the
++  # src tree.
++  ac_file_inputs=`IFS=:
++    for f in $ac_file_in; do
++      case $f in
++      -) echo $tmp/stdin ;;
++      [\\/$]*)
++	 # Absolute (can't be DOS-style, as IFS=:)
++	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
++echo "$as_me: error: cannot find input file: $f" >&2;}
++   { (exit 1); exit 1; }; }
++	 # Do quote $f, to prevent DOS paths from being IFS'd.
++	 echo "$f";;
++      *) # Relative
++	 if test -f "$f"; then
++	   # Build tree
++	   echo "$f"
++	 elif test -f "$srcdir/$f"; then
++	   # Source tree
++	   echo "$srcdir/$f"
++	 else
++	   # /dev/null tree
++	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
++echo "$as_me: error: cannot find input file: $f" >&2;}
++   { (exit 1); exit 1; }; }
++	 fi;;
++      esac
++    done` || { (exit 1); exit 1; }
++  # Remove the trailing spaces.
++  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
++
++_ACEOF
++
++# Transform confdefs.h into two sed scripts, `conftest.defines' and
++# `conftest.undefs', that substitutes the proper values into
++# config.h.in to produce config.h.  The first handles `#define'
++# templates, and the second `#undef' templates.
++# And first: Protect against being on the right side of a sed subst in
++# config.status.  Protect against being in an unquoted here document
++# in config.status.
++rm -f conftest.defines conftest.undefs
++# Using a here document instead of a string reduces the quoting nightmare.
++# Putting comments in sed scripts is not portable.
++#
++# `end' is used to avoid that the second main sed command (meant for
++# 0-ary CPP macros) applies to n-ary macro definitions.
++# See the Autoconf documentation for `clear'.
++cat >confdef2sed.sed <<\_ACEOF
++s/[\\&,]/\\&/g
++s,[\\$`],\\&,g
++t clear
++: clear
++s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
++t end
++s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
++: end
++_ACEOF
++# If some macros were called several times there might be several times
++# the same #defines, which is useless.  Nevertheless, we may not want to
++# sort them, since we want the *last* AC-DEFINE to be honored.
++uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
++sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
++rm -f confdef2sed.sed
++
++# This sed command replaces #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.
++cat >>conftest.undefs <<\_ACEOF
++s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
++_ACEOF
++
++# Break up conftest.defines because some shells have a limit on the size
++# of here documents, and old seds have small limits too (100 cmds).
++echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
++echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
++echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
++echo '  :' >>$CONFIG_STATUS
++rm -f conftest.tail
++while grep . conftest.defines >/dev/null
++do
++  # Write a limited-size here document to $tmp/defines.sed.
++  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
++  # Speed up: don't consider the non `#define' lines.
++  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
++  # Work around the forget-to-reset-the-flag bug.
++  echo 't clr' >>$CONFIG_STATUS
++  echo ': clr' >>$CONFIG_STATUS
++  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
++  echo 'CEOF
++  sed -f $tmp/defines.sed $tmp/in >$tmp/out
++  rm -f $tmp/in
++  mv $tmp/out $tmp/in
++' >>$CONFIG_STATUS
++  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
++  rm -f conftest.defines
++  mv conftest.tail conftest.defines
++done
++rm -f conftest.defines
++echo '  fi # grep' >>$CONFIG_STATUS
++echo >>$CONFIG_STATUS
++
++# Break up conftest.undefs because some shells have a limit on the size
++# of here documents, and old seds have small limits too (100 cmds).
++echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
++rm -f conftest.tail
++while grep . conftest.undefs >/dev/null
++do
++  # Write a limited-size here document to $tmp/undefs.sed.
++  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
++  # Speed up: don't consider the non `#undef'
++  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
++  # Work around the forget-to-reset-the-flag bug.
++  echo 't clr' >>$CONFIG_STATUS
++  echo ': clr' >>$CONFIG_STATUS
++  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
++  echo 'CEOF
++  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
++  rm -f $tmp/in
++  mv $tmp/out $tmp/in
++' >>$CONFIG_STATUS
++  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
++  rm -f conftest.undefs
++  mv conftest.tail conftest.undefs
++done
++rm -f conftest.undefs
++
++cat >>$CONFIG_STATUS <<\_ACEOF
++  # 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.  */
++  if test x"$ac_file" = x-; then
++    echo "/* Generated by configure.  */" >$tmp/config.h
++  else
++    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
++  fi
++  cat $tmp/in >>$tmp/config.h
++  rm -f $tmp/in
++  if test x"$ac_file" != x-; then
++    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
++      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
++$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; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++      { if $as_mkdir_p; then
++    mkdir -p "$ac_dir"
++  else
++    as_dir="$ac_dir"
++    as_dirs=
++    while test ! -d "$as_dir"; do
++      as_dirs="$as_dir $as_dirs"
++      as_dir=`(dirname "$as_dir") 2>/dev/null ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$as_dir" : 'X\(//\)[^/]' \| \
++	 X"$as_dir" : 'X\(//\)$' \| \
++	 X"$as_dir" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$as_dir" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++    done
++    test ! -n "$as_dirs" || mkdir $as_dirs
++  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
++echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
++   { (exit 1); exit 1; }; }; }
++
++      rm -f $ac_file
++      mv $tmp/config.h $ac_file
++    fi
++  else
++    cat $tmp/config.h
++    rm -f $tmp/config.h
++  fi
++# 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:* )
++      break ;;
++    * )
++      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
++  esac
++done
++echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
++$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; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`/stamp-h$_am_stamp_count
++done
++_ACEOF
++cat >>$CONFIG_STATUS <<\_ACEOF
++
++#
++# CONFIG_COMMANDS section.
++#
++for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
++  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
++  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
++  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
++$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$ac_dest" : 'X\(//\)[^/]' \| \
++	 X"$ac_dest" : 'X\(//\)$' \| \
++	 X"$ac_dest" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$ac_dest" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++  { if $as_mkdir_p; then
++    mkdir -p "$ac_dir"
++  else
++    as_dir="$ac_dir"
++    as_dirs=
++    while test ! -d "$as_dir"; do
++      as_dirs="$as_dir $as_dirs"
++      as_dir=`(dirname "$as_dir") 2>/dev/null ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$as_dir" : 'X\(//\)[^/]' \| \
++	 X"$as_dir" : 'X\(//\)$' \| \
++	 X"$as_dir" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$as_dir" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++    done
++    test ! -n "$as_dirs" || mkdir $as_dirs
++  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
++echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
++   { (exit 1); exit 1; }; }; }
++
++  ac_builddir=.
++
++if test "$ac_dir" != .; then
++  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
++  # A "../" for each directory in $ac_dir_suffix.
++  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
++else
++  ac_dir_suffix= ac_top_builddir=
++fi
++
++case $srcdir in
++  .)  # No --srcdir option.  We are building in place.
++    ac_srcdir=.
++    if test -z "$ac_top_builddir"; then
++       ac_top_srcdir=.
++    else
++       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
++    fi ;;
++  [\\/]* | ?:[\\/]* )  # Absolute path.
++    ac_srcdir=$srcdir$ac_dir_suffix;
++    ac_top_srcdir=$srcdir ;;
++  *) # Relative path.
++    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
++    ac_top_srcdir=$ac_top_builddir$srcdir ;;
++esac
++
++# Do not use `cd foo && pwd` to compute absolute paths, because
++# the directories may not exist.
++case `pwd` in
++.) ac_abs_builddir="$ac_dir";;
++*)
++  case "$ac_dir" in
++  .) ac_abs_builddir=`pwd`;;
++  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
++  *) ac_abs_builddir=`pwd`/"$ac_dir";;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_builddir=${ac_top_builddir}.;;
++*)
++  case ${ac_top_builddir}. in
++  .) ac_abs_top_builddir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
++  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_srcdir=$ac_srcdir;;
++*)
++  case $ac_srcdir in
++  .) ac_abs_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
++  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_srcdir=$ac_top_srcdir;;
++*)
++  case $ac_top_srcdir in
++  .) ac_abs_top_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
++  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
++  esac;;
++esac
++
++
++  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
++echo "$as_me: executing $ac_dest commands" >&6;}
++  case $ac_dest in
++    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
++  # Strip MF so we end up with the name of the file.
++  mf=`echo "$mf" | sed -e 's/:.*$//'`
++  # Check whether this is an Automake generated Makefile or not.
++  # We used to match only the files named `Makefile.in', but
++  # 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
++    dirpart=`(dirname "$mf") 2>/dev/null ||
++$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$mf" : 'X\(//\)[^/]' \| \
++	 X"$mf" : 'X\(//\)$' \| \
++	 X"$mf" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$mf" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++  else
++    continue
++  fi
++  # Extract the definition of DEPDIR, am__include, and am__quote
++  # from the Makefile without running `make'.
++  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
++  test -z "$DEPDIR" && continue
++  am__include=`sed -n 's/^am__include = //p' < "$mf"`
++  test -z "am__include" && continue
++  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++  # When using ansi2knr, U may be empty or an underscore; expand it
++  U=`sed -n 's/^U = //p' < "$mf"`
++  # Find all dependency output files, they are included files with
++  # $(DEPDIR) in their names.  We invoke sed twice because it is the
++  # simplest approach to changing $(DEPDIR) to its actual value in the
++  # expansion.
++  for file in `sed -n "
++    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
++       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
++    # Make sure the directory exists.
++    test -f "$dirpart/$file" && continue
++    fdir=`(dirname "$file") 2>/dev/null ||
++$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$file" : 'X\(//\)[^/]' \| \
++	 X"$file" : 'X\(//\)$' \| \
++	 X"$file" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$file" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++    { if $as_mkdir_p; then
++    mkdir -p $dirpart/$fdir
++  else
++    as_dir=$dirpart/$fdir
++    as_dirs=
++    while test ! -d "$as_dir"; do
++      as_dirs="$as_dir $as_dirs"
++      as_dir=`(dirname "$as_dir") 2>/dev/null ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$as_dir" : 'X\(//\)[^/]' \| \
++	 X"$as_dir" : 'X\(//\)$' \| \
++	 X"$as_dir" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$as_dir" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++    done
++    test ! -n "$as_dirs" || mkdir $as_dirs
++  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
++echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
++   { (exit 1); exit 1; }; }; }
++
++    # echo "creating $dirpart/$file"
++    echo '# dummy' > "$dirpart/$file"
++  done
++done
++ ;;
++  esac
++done
++_ACEOF
++
++cat >>$CONFIG_STATUS <<\_ACEOF
++
++{ (exit 0); exit 0; }
++_ACEOF
++chmod +x $CONFIG_STATUS
++ac_clean_files=$ac_clean_files_save
++
++
++# configure is writing to config.log, and then calls config.status.
++# config.status does its own redirection, appending to config.log.
++# Unfortunately, on DOS this fails, as config.log is still kept open
++# by configure, so config.status won't be able to write to it; its
++# output is simply discarded.  So we exec the FD to /dev/null,
++# effectively closing config.log, so it can be properly (re)opened and
++# appended to by config.status.  When coming back to configure, we
++# need to make the FD available again.
++if test "$no_create" != yes; then
++  ac_cs_success=:
++  ac_config_status_args=
++  test "$silent" = yes &&
++    ac_config_status_args="$ac_config_status_args --quiet"
++  exec 5>/dev/null
++  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
++  exec 5>>config.log
++  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
++  # would make configure fail if this is the last instruction.
++  $ac_cs_success || { (exit 1); exit 1; }
++fi
++
+diff -uNr a52dec-0.7.4-orig/autom4te.cache/requests a52dec-0.7.4/autom4te.cache/requests
+--- a52dec-0.7.4-orig/autom4te.cache/requests	1970-01-01 10:00:00.000000000 +1000
++++ a52dec-0.7.4/autom4te.cache/requests	2005-02-06 16:25:51.640018064 +1100
+@@ -0,0 +1,357 @@
++# This file was generated.
++# It contains the lists of macros which have been traced.
++# It can be safely removed.
++
++@request = (
++             bless( [
++                      '0',
++                      1,
++                      [
++                        '/usr/share/autoconf'
++                      ],
++                      [
++                        '/usr/share/autoconf/autoconf/autoconf.m4f',
++                        'aclocal.m4',
++                        'configure.in'
++                      ],
++                      {
++                        '_LT_AC_TAGCONFIG' => 1,
++                        'm4_pattern_forbid' => 1,
++                        'AC_CANONICAL_TARGET' => 1,
++                        'AC_CONFIG_LIBOBJ_DIR' => 1,
++                        'AC_C_VOLATILE' => 1,
++                        'AC_TYPE_OFF_T' => 1,
++                        'AC_FUNC_CLOSEDIR_VOID' => 1,
++                        'AC_REPLACE_FNMATCH' => 1,
++                        'AC_PROG_LIBTOOL' => 1,
++                        'AC_FUNC_STAT' => 1,
++                        'AC_FUNC_WAIT3' => 1,
++                        'AC_HEADER_TIME' => 1,
++                        'AC_FUNC_LSTAT' => 1,
++                        'AC_STRUCT_TM' => 1,
++                        'AM_AUTOMAKE_VERSION' => 1,
++                        'AC_FUNC_GETMNTENT' => 1,
++                        'AC_TYPE_MODE_T' => 1,
++                        'AC_CHECK_HEADERS' => 1,
++                        'AC_FUNC_STRTOD' => 1,
++                        'AC_FUNC_STRNLEN' => 1,
++                        'm4_sinclude' => 1,
++                        'AC_PROG_CXX' => 1,
++                        'AC_PATH_X' => 1,
++                        'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1,
++                        'AC_PROG_AWK' => 1,
++                        '_m4_warn' => 1,
++                        'AC_HEADER_STDC' => 1,
++                        'AC_HEADER_MAJOR' => 1,
++                        'AC_FUNC_ERROR_AT_LINE' => 1,
++                        'AC_PROG_GCC_TRADITIONAL' => 1,
++                        'AC_LIBSOURCE' => 1,
++                        'AC_FUNC_MBRTOWC' => 1,
++                        'AC_STRUCT_ST_BLOCKS' => 1,
++                        'AC_TYPE_SIGNAL' => 1,
++                        'AC_CANONICAL_BUILD' => 1,
++                        'AC_TYPE_UID_T' => 1,
++                        'AC_PROG_MAKE_SET' => 1,
++                        'AC_CONFIG_AUX_DIR' => 1,
++                        'm4_pattern_allow' => 1,
++                        'sinclude' => 1,
++                        'AC_DEFINE_TRACE_LITERAL' => 1,
++                        'AC_FUNC_STRERROR_R' => 1,
++                        'AC_PROG_CC' => 1,
++                        'AC_FUNC_FORK' => 1,
++                        'AC_DECL_SYS_SIGLIST' => 1,
++                        'AC_FUNC_STRCOLL' => 1,
++                        'AC_FUNC_VPRINTF' => 1,
++                        'AC_PROG_YACC' => 1,
++                        'AC_INIT' => 1,
++                        'AC_STRUCT_TIMEZONE' => 1,
++                        'AC_FUNC_CHOWN' => 1,
++                        'AC_SUBST' => 1,
++                        'AC_FUNC_ALLOCA' => 1,
++                        'AC_CANONICAL_HOST' => 1,
++                        'AC_FUNC_GETPGRP' => 1,
++                        'AC_PROG_RANLIB' => 1,
++                        'AM_INIT_AUTOMAKE' => 1,
++                        'AC_FUNC_SETPGRP' => 1,
++                        'AC_CONFIG_SUBDIRS' => 1,
++                        'AC_FUNC_MMAP' => 1,
++                        'AC_FUNC_REALLOC' => 1,
++                        'AC_TYPE_SIZE_T' => 1,
++                        'AC_CONFIG_LINKS' => 1,
++                        'AC_CHECK_TYPES' => 1,
++                        'LT_SUPPORTED_TAG' => 1,
++                        'AC_CHECK_MEMBERS' => 1,
++                        'AM_MAINTAINER_MODE' => 1,
++                        'AC_FUNC_UTIME_NULL' => 1,
++                        'AC_FUNC_SELECT_ARGTYPES' => 1,
++                        'AC_HEADER_STAT' => 1,
++                        'AC_FUNC_STRFTIME' => 1,
++                        'AC_PROG_CPP' => 1,
++                        'AC_C_INLINE' => 1,
++                        'AC_PROG_LEX' => 1,
++                        'AC_C_CONST' => 1,
++                        'AC_TYPE_PID_T' => 1,
++                        'AM_ENABLE_MULTILIB' => 1,
++                        'AC_CONFIG_FILES' => 1,
++                        'include' => 1,
++                        'AC_FUNC_SETVBUF_REVERSED' => 1,
++                        'AC_PROG_INSTALL' => 1,
++                        'AM_GNU_GETTEXT' => 1,
++                        'AC_FUNC_OBSTACK' => 1,
++                        'AC_CHECK_LIB' => 1,
++                        'AC_FUNC_MALLOC' => 1,
++                        'AC_FUNC_GETGROUPS' => 1,
++                        'AC_FUNC_GETLOADAVG' => 1,
++                        'AH_OUTPUT' => 1,
++                        'AC_FUNC_FSEEKO' => 1,
++                        'AM_PROG_CC_C_O' => 1,
++                        'AC_FUNC_MKTIME' => 1,
++                        'AC_CANONICAL_SYSTEM' => 1,
++                        'AM_CONDITIONAL' => 1,
++                        'AC_CONFIG_HEADERS' => 1,
++                        'AC_HEADER_SYS_WAIT' => 1,
++                        'AC_PROG_LN_S' => 1,
++                        'AC_FUNC_MEMCMP' => 1,
++                        'm4_include' => 1,
++                        'AC_HEADER_DIRENT' => 1,
++                        'AC_CHECK_FUNCS' => 1
++                      }
++                    ], 'Autom4te::Request' ),
++             bless( [
++                      '1',
++                      1,
++                      [
++                        '/usr/share/autoconf'
++                      ],
++                      [
++                        '/usr/share/autoconf/autoconf/autoconf.m4f',
++                        '/usr/share/aclocal/libtool.m4',
++                        '/usr/share/aclocal-1.9/amversion.m4',
++                        '/usr/share/aclocal-1.9/auxdir.m4',
++                        '/usr/share/aclocal-1.9/cond.m4',
++                        '/usr/share/aclocal-1.9/depend.m4',
++                        '/usr/share/aclocal-1.9/depout.m4',
++                        '/usr/share/aclocal-1.9/header.m4',
++                        '/usr/share/aclocal-1.9/init.m4',
++                        '/usr/share/aclocal-1.9/install-sh.m4',
++                        '/usr/share/aclocal-1.9/lead-dot.m4',
++                        '/usr/share/aclocal-1.9/maintainer.m4',
++                        '/usr/share/aclocal-1.9/make.m4',
++                        '/usr/share/aclocal-1.9/missing.m4',
++                        '/usr/share/aclocal-1.9/mkdirp.m4',
++                        '/usr/share/aclocal-1.9/options.m4',
++                        '/usr/share/aclocal-1.9/runlog.m4',
++                        '/usr/share/aclocal-1.9/sanity.m4',
++                        '/usr/share/aclocal-1.9/strip.m4',
++                        '/usr/share/aclocal-1.9/tar.m4',
++                        'acinclude.m4',
++                        'configure.in'
++                      ],
++                      {
++                        'AM_ENABLE_STATIC' => 1,
++                        'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
++                        'AC_TYPE_OFF_T' => 1,
++                        'AC_C_VOLATILE' => 1,
++                        'AC_FUNC_CLOSEDIR_VOID' => 1,
++                        '_LT_AC_SHELL_INIT' => 1,
++                        'AC_REPLACE_FNMATCH' => 1,
++                        'AC_DEFUN' => 1,
++                        '_LT_AC_LANG_CXX_CONFIG' => 1,
++                        'AC_PROG_LIBTOOL' => 1,
++                        'AC_FUNC_STAT' => 1,
++                        'AM_PROG_MKDIR_P' => 1,
++                        'AC_FUNC_WAIT3' => 1,
++                        'AC_STRUCT_TM' => 1,
++                        'AC_FUNC_LSTAT' => 1,
++                        'AM_AUTOMAKE_VERSION' => 1,
++                        'AC_FUNC_STRTOD' => 1,
++                        'AC_CHECK_HEADERS' => 1,
++                        'AM_MISSING_PROG' => 1,
++                        'AC_FUNC_STRNLEN' => 1,
++                        'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
++                        'AC_PROG_CXX' => 1,
++                        '_LT_AC_LANG_C_CONFIG' => 1,
++                        'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1,
++                        'AC_TRY_CFLAGS' => 1,
++                        'AM_PROG_INSTALL_STRIP' => 1,
++                        'AC_PROG_AWK' => 1,
++                        '_m4_warn' => 1,
++                        'AC_LIBTOOL_OBJDIR' => 1,
++                        'AC_HEADER_MAJOR' => 1,
++                        'AM_SANITY_CHECK' => 1,
++                        'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
++                        'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
++                        '_LT_AC_CHECK_DLFCN' => 1,
++                        'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
++                        '_AM_PROG_TAR' => 1,
++                        'AC_LIBTOOL_GCJ' => 1,
++                        'AC_PROG_GCC_TRADITIONAL' => 1,
++                        'AC_LIBSOURCE' => 1,
++                        'AC_STRUCT_ST_BLOCKS' => 1,
++                        'AC_LIBTOOL_CONFIG' => 1,
++                        '_LT_AC_LANG_F77' => 1,
++                        'AC_CONFIG_AUX_DIR' => 1,
++                        'AC_PROG_MAKE_SET' => 1,
++                        'sinclude' => 1,
++                        'AM_DISABLE_SHARED' => 1,
++                        'AM_PROG_LIBTOOL' => 1,
++                        '_LT_AC_LANG_CXX' => 1,
++                        'AM_PROG_LD' => 1,
++                        '_LT_AC_FILE_LTDLL_C' => 1,
++                        'AC_FUNC_STRERROR_R' => 1,
++                        'AC_FUNC_FORK' => 1,
++                        'AC_DECL_SYS_SIGLIST' => 1,
++                        'AC_FUNC_VPRINTF' => 1,
++                        'AU_DEFUN' => 1,
++                        'AC_PROG_NM' => 1,
++                        'AC_LIBTOOL_DLOPEN' => 1,
++                        'AC_PROG_LD' => 1,
++                        'AC_PROG_LD_GNU' => 1,
++                        'AC_ENABLE_FAST_INSTALL' => 1,
++                        'AC_INIT' => 1,
++                        'AC_STRUCT_TIMEZONE' => 1,
++                        'AC_SUBST' => 1,
++                        'AC_FUNC_ALLOCA' => 1,
++                        '_AM_SET_OPTION' => 1,
++                        'AC_CANONICAL_HOST' => 1,
++                        'AC_PROG_RANLIB' => 1,
++                        'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
++                        'AC_LIBTOOL_PROG_CC_C_O' => 1,
++                        'AC_FUNC_SETPGRP' => 1,
++                        'AC_CONFIG_SUBDIRS' => 1,
++                        'AC_FUNC_MMAP' => 1,
++                        'AC_TYPE_SIZE_T' => 1,
++                        'AC_CHECK_TYPES' => 1,
++                        'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
++                        'AC_CHECK_MEMBERS' => 1,
++                        'AC_DEFUN_ONCE' => 1,
++                        'AC_FUNC_UTIME_NULL' => 1,
++                        'AC_C_RESTRICT' => 1,
++                        'AC_FUNC_SELECT_ARGTYPES' => 1,
++                        '_LT_AC_LANG_GCJ' => 1,
++                        'AC_HEADER_STAT' => 1,
++                        'AC_FUNC_STRFTIME' => 1,
++                        'AC_C_INLINE' => 1,
++                        'AC_LIBTOOL_RC' => 1,
++                        'AC_DISABLE_FAST_INSTALL' => 1,
++                        '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
++                        'AC_CONFIG_FILES' => 1,
++                        'include' => 1,
++                        '_LT_AC_TRY_DLOPEN_SELF' => 1,
++                        '_LT_AC_SYS_LIBPATH_AIX' => 1,
++                        'LT_AC_PROG_SED' => 1,
++                        'AM_ENABLE_SHARED' => 1,
++                        'AM_GNU_GETTEXT' => 1,
++                        '_LT_AC_LANG_GCJ_CONFIG' => 1,
++                        'AC_FUNC_OBSTACK' => 1,
++                        'AC_CHECK_LIB' => 1,
++                        'AC_ENABLE_SHARED' => 1,
++                        'AC_FUNC_MALLOC' => 1,
++                        'AC_FUNC_GETGROUPS' => 1,
++                        'AC_FUNC_GETLOADAVG' => 1,
++                        'AC_FUNC_FSEEKO' => 1,
++                        'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
++                        'AC_ENABLE_STATIC' => 1,
++                        'AM_PROG_CC_C_O' => 1,
++                        '_LT_AC_TAGVAR' => 1,
++                        'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
++                        'AC_FUNC_MKTIME' => 1,
++                        'AM_CONDITIONAL' => 1,
++                        'AC_HEADER_SYS_WAIT' => 1,
++                        'AC_PROG_LN_S' => 1,
++                        'AC_FUNC_MEMCMP' => 1,
++                        'm4_include' => 1,
++                        'AM_PROG_INSTALL_SH' => 1,
++                        'AC_HEADER_DIRENT' => 1,
++                        'AC_PROG_EGREP' => 1,
++                        '_AC_AM_CONFIG_HEADER_HOOK' => 1,
++                        'AC_PATH_MAGIC' => 1,
++                        'AM_MAKE_INCLUDE' => 1,
++                        '_LT_AC_TAGCONFIG' => 1,
++                        'm4_pattern_forbid' => 1,
++                        'AC_CONFIG_LIBOBJ_DIR' => 1,
++                        'AC_LIBTOOL_COMPILER_OPTION' => 1,
++                        'AC_DISABLE_SHARED' => 1,
++                        'AC_LIBTOOL_SETUP' => 1,
++                        'AC_LIBTOOL_WIN32_DLL' => 1,
++                        'AC_PROG_LD_RELOAD_FLAG' => 1,
++                        'AC_HEADER_TIME' => 1,
++                        'AC_TYPE_MODE_T' => 1,
++                        'AC_FUNC_GETMNTENT' => 1,
++                        'AM_MISSING_HAS_RUN' => 1,
++                        'm4_sinclude' => 1,
++                        'AC_LIBTOOL_DLOPEN_SELF' => 1,
++                        'AC_PATH_X' => 1,
++                        'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
++                        'AC_HEADER_STDC' => 1,
++                        'AC_CHECK_GENERATE_INTTYPES' => 1,
++                        'AC_LIBTOOL_LINKER_OPTION' => 1,
++                        'LT_AC_PROG_RC' => 1,
++                        'AC_LIBTOOL_CXX' => 1,
++                        'LT_AC_PROG_GCJ' => 1,
++                        'AC_FUNC_ERROR_AT_LINE' => 1,
++                        'AM_DEP_TRACK' => 1,
++                        '_LT_AC_PROG_CXXCPP' => 1,
++                        'AM_DISABLE_STATIC' => 1,
++                        'AC_FUNC_MBRTOWC' => 1,
++                        'AM_CONFIG_HEADER' => 1,
++                        '_AC_PROG_LIBTOOL' => 1,
++                        'AC_TYPE_SIGNAL' => 1,
++                        'AC_TYPE_UID_T' => 1,
++                        '_AM_IF_OPTION' => 1,
++                        'AC_PATH_TOOL_PREFIX' => 1,
++                        'AC_LIBTOOL_F77' => 1,
++                        'm4_pattern_allow' => 1,
++                        'AM_SET_LEADING_DOT' => 1,
++                        'AC_DEFINE_TRACE_LITERAL' => 1,
++                        '_AM_DEPENDENCIES' => 1,
++                        'AC_LIBTOOL_LANG_C_CONFIG' => 1,
++                        'AC_PROG_CC' => 1,
++                        'AC_C_ATTRIBUTE_ALIGNED' => 1,
++                        '_LT_AC_SYS_COMPILER' => 1,
++                        'AM_PROG_NM' => 1,
++                        'AC_FUNC_STRCOLL' => 1,
++                        'AC_PROG_YACC' => 1,
++                        'AC_LIBLTDL_CONVENIENCE' => 1,
++                        'AC_DEPLIBS_CHECK_METHOD' => 1,
++                        'jm_MAINTAINER_MODE' => 1,
++                        'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
++                        'AC_LIBLTDL_INSTALLABLE' => 1,
++                        'AC_FUNC_CHOWN' => 1,
++                        'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
++                        'AC_FUNC_GETPGRP' => 1,
++                        'AM_INIT_AUTOMAKE' => 1,
++                        'AC_FUNC_REALLOC' => 1,
++                        'AC_DISABLE_STATIC' => 1,
++                        'AC_CONFIG_LINKS' => 1,
++                        'AM_MAINTAINER_MODE' => 1,
++                        '_LT_AC_LOCK' => 1,
++                        '_LT_AC_LANG_RC_CONFIG' => 1,
++                        'AC_PROG_CPP' => 1,
++                        'AC_TYPE_PID_T' => 1,
++                        'AC_PROG_LEX' => 1,
++                        'AC_C_CONST' => 1,
++                        'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
++                        'AC_FUNC_SETVBUF_REVERSED' => 1,
++                        'AC_PROG_INSTALL' => 1,
++                        'AM_AUX_DIR_EXPAND' => 1,
++                        'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
++                        '_LT_AC_LANG_F77_CONFIG' => 1,
++                        '_AM_SET_OPTIONS' => 1,
++                        'AM_RUN_LOG' => 1,
++                        '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
++                        'AC_LIBTOOL_PICMODE' => 1,
++                        'AH_OUTPUT' => 1,
++                        'AC_CHECK_LIBM' => 1,
++                        'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
++                        '_AM_MANGLE_OPTION' => 1,
++                        'AC_CANONICAL_SYSTEM' => 1,
++                        'AC_CONFIG_HEADERS' => 1,
++                        'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
++                        'AC_C_ALWAYS_INLINE' => 1,
++                        'AM_SET_DEPDIR' => 1,
++                        'AC_CHECK_FUNCS' => 1
++                      }
++                    ], 'Autom4te::Request' )
++           );
++
+diff -uNr a52dec-0.7.4-orig/autom4te.cache/traces.0 a52dec-0.7.4/autom4te.cache/traces.0
+--- a52dec-0.7.4-orig/autom4te.cache/traces.0	1970-01-01 10:00:00.000000000 +1000
++++ a52dec-0.7.4/autom4te.cache/traces.0	2005-02-06 16:25:42.424419048 +1100
+@@ -0,0 +1,599 @@
++m4trace:aclocal.m4:7050: -1- m4_include([acinclude.m4])
++m4trace:configure.in:3: -1- AC_INIT
++m4trace:configure.in:3: -1- m4_pattern_forbid([^_?A[CHUM]_])
++m4trace:configure.in:3: -1- m4_pattern_forbid([_AC_])
++m4trace:configure.in:3: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
++m4trace:configure.in:3: -1- m4_pattern_allow([^AS_FLAGS$])
++m4trace:configure.in:3: -1- m4_pattern_forbid([^_?m4_])
++m4trace:configure.in:3: -1- m4_pattern_forbid([^dnl$])
++m4trace:configure.in:3: -1- m4_pattern_forbid([^_?AS_])
++m4trace:configure.in:3: -1- AC_SUBST([SHELL], [${CONFIG_SHELL-/bin/sh}])
++m4trace:configure.in:3: -1- AC_SUBST([PATH_SEPARATOR])
++m4trace:configure.in:3: -1- AC_SUBST([PACKAGE_NAME], [m4_ifdef([AC_PACKAGE_NAME],      ['AC_PACKAGE_NAME'])])
++m4trace:configure.in:3: -1- AC_SUBST([PACKAGE_TARNAME], [m4_ifdef([AC_PACKAGE_TARNAME],   ['AC_PACKAGE_TARNAME'])])
++m4trace:configure.in:3: -1- AC_SUBST([PACKAGE_VERSION], [m4_ifdef([AC_PACKAGE_VERSION],   ['AC_PACKAGE_VERSION'])])
++m4trace:configure.in:3: -1- AC_SUBST([PACKAGE_STRING], [m4_ifdef([AC_PACKAGE_STRING],    ['AC_PACKAGE_STRING'])])
++m4trace:configure.in:3: -1- AC_SUBST([PACKAGE_BUGREPORT], [m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])])
++m4trace:configure.in:3: -1- AC_SUBST([exec_prefix], [NONE])
++m4trace:configure.in:3: -1- AC_SUBST([prefix], [NONE])
++m4trace:configure.in:3: -1- AC_SUBST([program_transform_name], [s,x,x,])
++m4trace:configure.in:3: -1- AC_SUBST([bindir], ['${exec_prefix}/bin'])
++m4trace:configure.in:3: -1- AC_SUBST([sbindir], ['${exec_prefix}/sbin'])
++m4trace:configure.in:3: -1- AC_SUBST([libexecdir], ['${exec_prefix}/libexec'])
++m4trace:configure.in:3: -1- AC_SUBST([datadir], ['${prefix}/share'])
++m4trace:configure.in:3: -1- AC_SUBST([sysconfdir], ['${prefix}/etc'])
++m4trace:configure.in:3: -1- AC_SUBST([sharedstatedir], ['${prefix}/com'])
++m4trace:configure.in:3: -1- AC_SUBST([localstatedir], ['${prefix}/var'])
++m4trace:configure.in:3: -1- AC_SUBST([libdir], ['${exec_prefix}/lib'])
++m4trace:configure.in:3: -1- AC_SUBST([includedir], ['${prefix}/include'])
++m4trace:configure.in:3: -1- AC_SUBST([oldincludedir], ['/usr/include'])
++m4trace:configure.in:3: -1- AC_SUBST([infodir], ['${prefix}/info'])
++m4trace:configure.in:3: -1- AC_SUBST([mandir], ['${prefix}/man'])
++m4trace:configure.in:3: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_NAME])
++m4trace:configure.in:3: -1- AH_OUTPUT([PACKAGE_NAME], [/* Define to the full name of this package. */
++#undef PACKAGE_NAME])
++m4trace:configure.in:3: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_TARNAME])
++m4trace:configure.in:3: -1- AH_OUTPUT([PACKAGE_TARNAME], [/* Define to the one symbol short name of this package. */
++#undef PACKAGE_TARNAME])
++m4trace:configure.in:3: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_VERSION])
++m4trace:configure.in:3: -1- AH_OUTPUT([PACKAGE_VERSION], [/* Define to the version of this package. */
++#undef PACKAGE_VERSION])
++m4trace:configure.in:3: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_STRING])
++m4trace:configure.in:3: -1- AH_OUTPUT([PACKAGE_STRING], [/* Define to the full name and version of this package. */
++#undef PACKAGE_STRING])
++m4trace:configure.in:3: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_BUGREPORT])
++m4trace:configure.in:3: -1- AH_OUTPUT([PACKAGE_BUGREPORT], [/* Define to the address where bug reports for this package should be sent. */
++#undef PACKAGE_BUGREPORT])
++m4trace:configure.in:3: -1- AC_SUBST([build_alias])
++m4trace:configure.in:3: -1- AC_SUBST([host_alias])
++m4trace:configure.in:3: -1- AC_SUBST([target_alias])
++m4trace:configure.in:3: -1- AC_SUBST([DEFS])
++m4trace:configure.in:3: -1- AC_SUBST([ECHO_C])
++m4trace:configure.in:3: -1- AC_SUBST([ECHO_N])
++m4trace:configure.in:3: -1- AC_SUBST([ECHO_T])
++m4trace:configure.in:3: -1- AC_SUBST([LIBS])
++m4trace:configure.in:5: -1- AC_CONFIG_AUX_DIR([autotools])
++m4trace:configure.in:7: -1- AC_CONFIG_FILES([Makefile autotools/Makefile include/Makefile test/Makefile
++    doc/Makefile src/Makefile liba52/Makefile libao/Makefile vc++/Makefile])
++m4trace:configure.in:8: -1- AM_INIT_AUTOMAKE([a52dec], [0.7.4])
++m4trace:configure.in:8: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
++m4trace:configure.in:8: -1- AM_AUTOMAKE_VERSION([1.9.4])
++m4trace:configure.in:8: -1- AC_PROG_INSTALL
++m4trace:configure.in:8: -1- AC_SUBST([INSTALL_PROGRAM])
++m4trace:configure.in:8: -1- AC_SUBST([INSTALL_SCRIPT])
++m4trace:configure.in:8: -1- AC_SUBST([INSTALL_DATA])
++m4trace:configure.in:8: -1- AC_SUBST([CYGPATH_W])
++m4trace:configure.in:8: -1- AC_SUBST([PACKAGE], [a52dec])
++m4trace:configure.in:8: -1- AC_SUBST([VERSION], [0.7.4])
++m4trace:configure.in:8: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE])
++m4trace:configure.in:8: -1- AH_OUTPUT([PACKAGE], [/* Name of package */
++#undef PACKAGE])
++m4trace:configure.in:8: -1- AC_DEFINE_TRACE_LITERAL([VERSION])
++m4trace:configure.in:8: -1- AH_OUTPUT([VERSION], [/* Version number of package */
++#undef VERSION])
++m4trace:configure.in:8: -1- AC_SUBST([ACLOCAL])
++m4trace:configure.in:8: -1- AC_SUBST([AUTOCONF])
++m4trace:configure.in:8: -1- AC_SUBST([AUTOMAKE])
++m4trace:configure.in:8: -1- AC_SUBST([AUTOHEADER])
++m4trace:configure.in:8: -1- AC_SUBST([MAKEINFO])
++m4trace:configure.in:8: -1- AC_SUBST([install_sh])
++m4trace:configure.in:8: -1- AC_SUBST([STRIP])
++m4trace:configure.in:8: -1- AC_SUBST([ac_ct_STRIP])
++m4trace:configure.in:8: -1- AC_SUBST([INSTALL_STRIP_PROGRAM])
++m4trace:configure.in:8: -1- AC_SUBST([mkdir_p])
++m4trace:configure.in:8: -1- AC_PROG_AWK
++m4trace:configure.in:8: -1- AC_SUBST([AWK])
++m4trace:configure.in:8: -1- AC_PROG_MAKE_SET
++m4trace:configure.in:8: -1- AC_SUBST([SET_MAKE])
++m4trace:configure.in:8: -1- AC_SUBST([am__leading_dot])
++m4trace:configure.in:8: -1- AC_SUBST([AMTAR])
++m4trace:configure.in:8: -1- AC_SUBST([am__tar])
++m4trace:configure.in:8: -1- AC_SUBST([am__untar])
++m4trace:configure.in:9: -1- _m4_warn([obsolete], [The macro `AM_CONFIG_HEADER' is obsolete.
++You should run autoupdate.], [aclocal.m4:6386: AM_CONFIG_HEADER is expanded from...
++configure.in:9: the top level])
++m4trace:configure.in:9: -1- AC_CONFIG_HEADERS([include/config.h])
++m4trace:configure.in:10: -1- AM_MAINTAINER_MODE
++m4trace:configure.in:10: -1- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
++m4trace:configure.in:10: -1- AC_SUBST([MAINTAINER_MODE_TRUE])
++m4trace:configure.in:10: -1- AC_SUBST([MAINTAINER_MODE_FALSE])
++m4trace:configure.in:10: -1- AC_SUBST([MAINT])
++m4trace:configure.in:11: -1- AC_CANONICAL_HOST
++m4trace:configure.in:11: -1- AC_CANONICAL_BUILD
++m4trace:configure.in:11: -1- AC_SUBST([build], [$ac_cv_build])
++m4trace:configure.in:11: -1- AC_SUBST([build_cpu], [`echo $ac_cv_build | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\1/'`])
++m4trace:configure.in:11: -1- AC_SUBST([build_vendor], [`echo $ac_cv_build | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\2/'`])
++m4trace:configure.in:11: -1- AC_SUBST([build_os], [`echo $ac_cv_build | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\3/'`])
++m4trace:configure.in:11: -1- AC_SUBST([host], [$ac_cv_host])
++m4trace:configure.in:11: -1- AC_SUBST([host_cpu], [`echo $ac_cv_host | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\1/'`])
++m4trace:configure.in:11: -1- AC_SUBST([host_vendor], [`echo $ac_cv_host | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\2/'`])
++m4trace:configure.in:11: -1- AC_SUBST([host_os], [`echo $ac_cv_host | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\3/'`])
++m4trace:configure.in:14: -1- AC_PROG_CC
++m4trace:configure.in:14: -1- AC_SUBST([CC])
++m4trace:configure.in:14: -1- AC_SUBST([CFLAGS])
++m4trace:configure.in:14: -1- AC_SUBST([LDFLAGS])
++m4trace:configure.in:14: -1- AC_SUBST([CPPFLAGS])
++m4trace:configure.in:14: -1- AC_SUBST([CC])
++m4trace:configure.in:14: -1- AC_SUBST([ac_ct_CC])
++m4trace:configure.in:14: -1- AC_SUBST([CC])
++m4trace:configure.in:14: -1- AC_SUBST([ac_ct_CC])
++m4trace:configure.in:14: -1- AC_SUBST([CC])
++m4trace:configure.in:14: -1- AC_SUBST([CC])
++m4trace:configure.in:14: -1- AC_SUBST([ac_ct_CC])
++m4trace:configure.in:14: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext])
++m4trace:configure.in:14: -1- AC_SUBST([OBJEXT], [$ac_cv_objext])
++m4trace:configure.in:14: -1- AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])
++m4trace:configure.in:14: -1- AC_SUBST([am__include])
++m4trace:configure.in:14: -1- AC_SUBST([am__quote])
++m4trace:configure.in:14: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
++m4trace:configure.in:14: -1- AC_SUBST([AMDEP_TRUE])
++m4trace:configure.in:14: -1- AC_SUBST([AMDEP_FALSE])
++m4trace:configure.in:14: -1- AC_SUBST([AMDEPBACKSLASH])
++m4trace:configure.in:14: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type])
++m4trace:configure.in:14: -1- AM_CONDITIONAL([am__fastdepCC], [
++  test "x$enable_dependency_tracking" != xno \
++  && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
++m4trace:configure.in:14: -1- AC_SUBST([am__fastdepCC_TRUE])
++m4trace:configure.in:14: -1- AC_SUBST([am__fastdepCC_FALSE])
++m4trace:configure.in:15: -1- AC_PROG_GCC_TRADITIONAL
++m4trace:configure.in:15: -1- AC_PROG_CPP
++m4trace:configure.in:15: -1- AC_SUBST([CPP])
++m4trace:configure.in:15: -1- AC_SUBST([CPPFLAGS])
++m4trace:configure.in:15: -1- AC_SUBST([CPP])
++m4trace:configure.in:15: -1- AC_SUBST([EGREP])
++m4trace:configure.in:27: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++acinclude.m4:67: AC_TRY_CFLAGS is expanded from...
++configure.in:27: the top level])
++m4trace:configure.in:31: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++acinclude.m4:67: AC_TRY_CFLAGS is expanded from...
++configure.in:31: the top level])
++m4trace:configure.in:43: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++acinclude.m4:67: AC_TRY_CFLAGS is expanded from...
++configure.in:43: the top level])
++m4trace:configure.in:46: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++acinclude.m4:67: AC_TRY_CFLAGS is expanded from...
++configure.in:46: the top level])
++m4trace:configure.in:49: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++acinclude.m4:67: AC_TRY_CFLAGS is expanded from...
++configure.in:49: the top level])
++m4trace:configure.in:66: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++acinclude.m4:67: AC_TRY_CFLAGS is expanded from...
++configure.in:66: the top level])
++m4trace:configure.in:69: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++acinclude.m4:67: AC_TRY_CFLAGS is expanded from...
++configure.in:69: the top level])
++m4trace:configure.in:74: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++autoconf/general.m4:1303: AC_ARG_ENABLE is expanded from...
++aclocal.m4:1779: AC_ENABLE_SHARED is expanded from...
++aclocal.m4:1788: AC_DISABLE_SHARED is expanded from...
++configure.in:74: the top level])
++m4trace:configure.in:76: -1- AC_PROG_LIBTOOL
++m4trace:configure.in:76: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++autoconf/general.m4:1303: AC_ARG_ENABLE is expanded from...
++aclocal.m4:1818: AC_ENABLE_STATIC is expanded from...
++configure.in:76: AC_ENABLE_STATIC is required by...
++aclocal.m4:225: AC_LIBTOOL_SETUP is expanded from...
++configure.in:76: AC_LIBTOOL_SETUP is required by...
++aclocal.m4:81: _AC_PROG_LIBTOOL is expanded from...
++configure.in:76: _AC_PROG_LIBTOOL is required by...
++aclocal.m4:61: AC_PROG_LIBTOOL is expanded from...
++configure.in:76: the top level])
++m4trace:configure.in:76: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++autoconf/general.m4:1303: AC_ARG_ENABLE is expanded from...
++aclocal.m4:1857: AC_ENABLE_FAST_INSTALL is expanded from...
++configure.in:76: AC_ENABLE_FAST_INSTALL is required by...
++aclocal.m4:225: AC_LIBTOOL_SETUP is expanded from...
++configure.in:76: AC_LIBTOOL_SETUP is required by...
++aclocal.m4:81: _AC_PROG_LIBTOOL is expanded from...
++configure.in:76: _AC_PROG_LIBTOOL is required by...
++aclocal.m4:61: AC_PROG_LIBTOOL is expanded from...
++configure.in:76: the top level])
++m4trace:configure.in:76: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++autoconf/general.m4:1331: AC_ARG_WITH is expanded from...
++aclocal.m4:2054: AC_PROG_LD is expanded from...
++configure.in:76: AC_PROG_LD is required by...
++aclocal.m4:225: AC_LIBTOOL_SETUP is expanded from...
++configure.in:76: AC_LIBTOOL_SETUP is required by...
++aclocal.m4:81: _AC_PROG_LIBTOOL is expanded from...
++configure.in:76: _AC_PROG_LIBTOOL is required by...
++aclocal.m4:61: AC_PROG_LIBTOOL is expanded from...
++configure.in:76: the top level])
++m4trace:configure.in:76: -1- AC_PROG_LN_S
++m4trace:configure.in:76: -1- AC_SUBST([LN_S], [$as_ln_s])
++m4trace:configure.in:76: -1- AC_SUBST([ECHO])
++m4trace:configure.in:76: -1- AC_SUBST([AR])
++m4trace:configure.in:76: -1- AC_SUBST([ac_ct_AR])
++m4trace:configure.in:76: -1- AC_SUBST([RANLIB])
++m4trace:configure.in:76: -1- AC_SUBST([ac_ct_RANLIB])
++m4trace:configure.in:76: -1- AC_SUBST([STRIP])
++m4trace:configure.in:76: -1- AC_SUBST([ac_ct_STRIP])
++m4trace:configure.in:76: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++autoconf/general.m4:1303: AC_ARG_ENABLE is expanded from...
++aclocal.m4:225: AC_LIBTOOL_SETUP is expanded from...
++configure.in:76: AC_LIBTOOL_SETUP is required by...
++aclocal.m4:81: _AC_PROG_LIBTOOL is expanded from...
++configure.in:76: _AC_PROG_LIBTOOL is required by...
++aclocal.m4:61: AC_PROG_LIBTOOL is expanded from...
++configure.in:76: the top level])
++m4trace:configure.in:76: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++autoconf/general.m4:1331: AC_ARG_WITH is expanded from...
++aclocal.m4:225: AC_LIBTOOL_SETUP is expanded from...
++configure.in:76: AC_LIBTOOL_SETUP is required by...
++aclocal.m4:81: _AC_PROG_LIBTOOL is expanded from...
++configure.in:76: _AC_PROG_LIBTOOL is required by...
++aclocal.m4:61: AC_PROG_LIBTOOL is expanded from...
++configure.in:76: the top level])
++m4trace:configure.in:76: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++aclocal.m4:552: _LT_AC_LOCK is expanded from...
++configure.in:76: _LT_AC_LOCK is required by...
++aclocal.m4:997: AC_LIBTOOL_SYS_HARD_LINK_LOCKS is expanded from...
++aclocal.m4:2582: _LT_AC_LANG_C_CONFIG is expanded from...
++aclocal.m4:2486: AC_LIBTOOL_LANG_C_CONFIG is expanded from...
++aclocal.m4:225: AC_LIBTOOL_SETUP is expanded from...
++configure.in:76: AC_LIBTOOL_SETUP is required by...
++aclocal.m4:81: _AC_PROG_LIBTOOL is expanded from...
++configure.in:76: _AC_PROG_LIBTOOL is required by...
++aclocal.m4:61: AC_PROG_LIBTOOL is expanded from...
++configure.in:76: the top level])
++m4trace:configure.in:76: -1- AC_SUBST([DLLTOOL])
++m4trace:configure.in:76: -1- AC_SUBST([ac_ct_DLLTOOL])
++m4trace:configure.in:76: -1- AC_SUBST([AS])
++m4trace:configure.in:76: -1- AC_SUBST([ac_ct_AS])
++m4trace:configure.in:76: -1- AC_SUBST([OBJDUMP])
++m4trace:configure.in:76: -1- AC_SUBST([ac_ct_OBJDUMP])
++m4trace:configure.in:76: -1- AC_CHECK_HEADERS([dlfcn.h])
++m4trace:configure.in:76: -1- AH_OUTPUT([HAVE_DLFCN_H], [/* Define to 1 if you have the <dlfcn.h> header file. */
++#undef HAVE_DLFCN_H])
++m4trace:configure.in:76: -1- AC_HEADER_STDC
++m4trace:configure.in:76: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
++m4trace:configure.in:76: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
++#undef STDC_HEADERS])
++m4trace:configure.in:76: -1- AC_CHECK_HEADERS([sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
++		  inttypes.h stdint.h unistd.h], [], [], [$ac_includes_default])
++m4trace:configure.in:76: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
++#undef HAVE_SYS_TYPES_H])
++m4trace:configure.in:76: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
++#undef HAVE_SYS_STAT_H])
++m4trace:configure.in:76: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
++#undef HAVE_STDLIB_H])
++m4trace:configure.in:76: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
++#undef HAVE_STRING_H])
++m4trace:configure.in:76: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
++#undef HAVE_MEMORY_H])
++m4trace:configure.in:76: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
++#undef HAVE_STRINGS_H])
++m4trace:configure.in:76: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
++#undef HAVE_INTTYPES_H])
++m4trace:configure.in:76: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
++#undef HAVE_STDINT_H])
++m4trace:configure.in:76: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
++#undef HAVE_UNISTD_H])
++m4trace:configure.in:76: -1- AC_CHECK_LIB([dl], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], [
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ])
++m4trace:configure.in:76: -1- AC_CHECK_LIB([dld], [shl_load], [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], [AC_CHECK_FUNC([dlopen],
++	      [lt_cv_dlopen="dlopen"],
++	  [AC_CHECK_LIB([dl], [dlopen],
++		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
++	    [AC_CHECK_LIB([svld], [dlopen],
++		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++	      [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	      ])
++	    ])
++	  ])
++	])
++m4trace:configure.in:76: -1- AC_CHECK_LIB([dl], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], [AC_CHECK_LIB([svld], [dlopen],
++		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++	      [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	      ])
++	    ])
++m4trace:configure.in:76: -1- AC_CHECK_LIB([svld], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	      ])
++m4trace:configure.in:76: -1- AC_CHECK_LIB([dld], [dld_link], [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++m4trace:configure.in:76: -1- _LT_AC_TAGCONFIG
++m4trace:configure.in:76: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++autoconf/general.m4:1331: AC_ARG_WITH is expanded from...
++aclocal.m4:1733: _LT_AC_TAGCONFIG is expanded from...
++aclocal.m4:225: AC_LIBTOOL_SETUP is expanded from...
++configure.in:76: AC_LIBTOOL_SETUP is required by...
++aclocal.m4:81: _AC_PROG_LIBTOOL is expanded from...
++configure.in:76: _AC_PROG_LIBTOOL is required by...
++aclocal.m4:61: AC_PROG_LIBTOOL is expanded from...
++configure.in:76: the top level])
++m4trace:configure.in:76: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: tag name \"$tagname\" already exists], [aclocal.m4:1733: _LT_AC_TAGCONFIG is expanded from...
++aclocal.m4:225: AC_LIBTOOL_SETUP is expanded from...
++configure.in:76: AC_LIBTOOL_SETUP is required by...
++aclocal.m4:81: _AC_PROG_LIBTOOL is expanded from...
++configure.in:76: _AC_PROG_LIBTOOL is required by...
++aclocal.m4:61: AC_PROG_LIBTOOL is expanded from...
++configure.in:76: the top level])
++m4trace:configure.in:76: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: tag name \"$tagname\" already exists], [aclocal.m4:1733: _LT_AC_TAGCONFIG is expanded from...
++aclocal.m4:225: AC_LIBTOOL_SETUP is expanded from...
++configure.in:76: AC_LIBTOOL_SETUP is required by...
++aclocal.m4:81: _AC_PROG_LIBTOOL is expanded from...
++configure.in:76: _AC_PROG_LIBTOOL is required by...
++aclocal.m4:61: AC_PROG_LIBTOOL is expanded from...
++configure.in:76: the top level])
++m4trace:configure.in:76: -1- AC_PROG_CXX
++m4trace:configure.in:76: -1- AC_SUBST([CXX])
++m4trace:configure.in:76: -1- AC_SUBST([CXXFLAGS])
++m4trace:configure.in:76: -1- AC_SUBST([LDFLAGS])
++m4trace:configure.in:76: -1- AC_SUBST([CPPFLAGS])
++m4trace:configure.in:76: -1- AC_SUBST([CXX])
++m4trace:configure.in:76: -1- AC_SUBST([ac_ct_CXX])
++m4trace:configure.in:76: -1- AC_SUBST([CXXDEPMODE], [depmode=$am_cv_CXX_dependencies_compiler_type])
++m4trace:configure.in:76: -1- AM_CONDITIONAL([am__fastdepCXX], [
++  test "x$enable_dependency_tracking" != xno \
++  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3])
++m4trace:configure.in:76: -1- AC_SUBST([am__fastdepCXX_TRUE])
++m4trace:configure.in:76: -1- AC_SUBST([am__fastdepCXX_FALSE])
++m4trace:configure.in:76: -1- AC_SUBST([CXXCPP])
++m4trace:configure.in:76: -1- AC_SUBST([CPPFLAGS])
++m4trace:configure.in:76: -1- AC_SUBST([CXXCPP])
++m4trace:configure.in:76: -1- AC_CHECK_LIB([dl], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], [
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ])
++m4trace:configure.in:76: -1- AC_CHECK_LIB([dld], [shl_load], [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], [AC_CHECK_FUNC([dlopen],
++	      [lt_cv_dlopen="dlopen"],
++	  [AC_CHECK_LIB([dl], [dlopen],
++		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
++	    [AC_CHECK_LIB([svld], [dlopen],
++		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++	      [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	      ])
++	    ])
++	  ])
++	])
++m4trace:configure.in:76: -1- AC_CHECK_LIB([dl], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], [AC_CHECK_LIB([svld], [dlopen],
++		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++	      [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	      ])
++	    ])
++m4trace:configure.in:76: -1- AC_CHECK_LIB([svld], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	      ])
++m4trace:configure.in:76: -1- AC_CHECK_LIB([dld], [dld_link], [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++m4trace:configure.in:76: -1- AC_SUBST([F77])
++m4trace:configure.in:76: -1- AC_SUBST([FFLAGS])
++m4trace:configure.in:76: -1- AC_SUBST([LDFLAGS])
++m4trace:configure.in:76: -1- AC_SUBST([F77])
++m4trace:configure.in:76: -1- AC_SUBST([ac_ct_F77])
++m4trace:configure.in:76: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete.
++You should run autoupdate.], [autoconf/lang.m4:166: AC_LANG_SAVE is expanded from...
++aclocal.m4:3798: _LT_AC_LANG_GCJ_CONFIG is expanded from...
++aclocal.m4:3755: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from...
++aclocal.m4:1733: _LT_AC_TAGCONFIG is expanded from...
++aclocal.m4:225: AC_LIBTOOL_SETUP is expanded from...
++configure.in:76: AC_LIBTOOL_SETUP is required by...
++aclocal.m4:81: _AC_PROG_LIBTOOL is expanded from...
++configure.in:76: _AC_PROG_LIBTOOL is required by...
++aclocal.m4:61: AC_PROG_LIBTOOL is expanded from...
++configure.in:76: the top level])
++m4trace:configure.in:76: -1- _m4_warn([obsolete], [instead of using `AC_LANG', `AC_LANG_SAVE',
++and `AC_LANG_RESTORE', you should use `AC_LANG_PUSH' and `AC_LANG_POP'.], [autoconf/lang.m4:166: AC_LANG_SAVE is expanded from...
++aclocal.m4:3798: _LT_AC_LANG_GCJ_CONFIG is expanded from...
++aclocal.m4:3755: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from...
++aclocal.m4:1733: _LT_AC_TAGCONFIG is expanded from...
++aclocal.m4:225: AC_LIBTOOL_SETUP is expanded from...
++configure.in:76: AC_LIBTOOL_SETUP is required by...
++aclocal.m4:81: _AC_PROG_LIBTOOL is expanded from...
++configure.in:76: _AC_PROG_LIBTOOL is required by...
++aclocal.m4:61: AC_PROG_LIBTOOL is expanded from...
++configure.in:76: the top level])
++m4trace:configure.in:76: -1- AC_CHECK_LIB([dl], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], [
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ])
++m4trace:configure.in:76: -1- AC_CHECK_LIB([dld], [shl_load], [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], [AC_CHECK_FUNC([dlopen],
++	      [lt_cv_dlopen="dlopen"],
++	  [AC_CHECK_LIB([dl], [dlopen],
++		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
++	    [AC_CHECK_LIB([svld], [dlopen],
++		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++	      [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	      ])
++	    ])
++	  ])
++	])
++m4trace:configure.in:76: -1- AC_CHECK_LIB([dl], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], [AC_CHECK_LIB([svld], [dlopen],
++		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++	      [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	      ])
++	    ])
++m4trace:configure.in:76: -1- AC_CHECK_LIB([svld], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	      ])
++m4trace:configure.in:76: -1- AC_CHECK_LIB([dld], [dld_link], [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++m4trace:configure.in:76: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete.
++You should run autoupdate.], [autoconf/lang.m4:172: AC_LANG_RESTORE is expanded from...
++aclocal.m4:3798: _LT_AC_LANG_GCJ_CONFIG is expanded from...
++aclocal.m4:3755: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from...
++aclocal.m4:1733: _LT_AC_TAGCONFIG is expanded from...
++aclocal.m4:225: AC_LIBTOOL_SETUP is expanded from...
++configure.in:76: AC_LIBTOOL_SETUP is required by...
++aclocal.m4:81: _AC_PROG_LIBTOOL is expanded from...
++configure.in:76: _AC_PROG_LIBTOOL is required by...
++aclocal.m4:61: AC_PROG_LIBTOOL is expanded from...
++configure.in:76: the top level])
++m4trace:configure.in:76: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete.
++You should run autoupdate.], [autoconf/lang.m4:166: AC_LANG_SAVE is expanded from...
++aclocal.m4:3837: _LT_AC_LANG_RC_CONFIG is expanded from...
++aclocal.m4:3806: AC_LIBTOOL_LANG_RC_CONFIG is expanded from...
++aclocal.m4:1733: _LT_AC_TAGCONFIG is expanded from...
++aclocal.m4:225: AC_LIBTOOL_SETUP is expanded from...
++configure.in:76: AC_LIBTOOL_SETUP is required by...
++aclocal.m4:81: _AC_PROG_LIBTOOL is expanded from...
++configure.in:76: _AC_PROG_LIBTOOL is required by...
++aclocal.m4:61: AC_PROG_LIBTOOL is expanded from...
++configure.in:76: the top level])
++m4trace:configure.in:76: -1- _m4_warn([obsolete], [instead of using `AC_LANG', `AC_LANG_SAVE',
++and `AC_LANG_RESTORE', you should use `AC_LANG_PUSH' and `AC_LANG_POP'.], [autoconf/lang.m4:166: AC_LANG_SAVE is expanded from...
++aclocal.m4:3837: _LT_AC_LANG_RC_CONFIG is expanded from...
++aclocal.m4:3806: AC_LIBTOOL_LANG_RC_CONFIG is expanded from...
++aclocal.m4:1733: _LT_AC_TAGCONFIG is expanded from...
++aclocal.m4:225: AC_LIBTOOL_SETUP is expanded from...
++configure.in:76: AC_LIBTOOL_SETUP is required by...
++aclocal.m4:81: _AC_PROG_LIBTOOL is expanded from...
++configure.in:76: _AC_PROG_LIBTOOL is required by...
++aclocal.m4:61: AC_PROG_LIBTOOL is expanded from...
++configure.in:76: the top level])
++m4trace:configure.in:76: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete.
++You should run autoupdate.], [autoconf/lang.m4:172: AC_LANG_RESTORE is expanded from...
++aclocal.m4:3837: _LT_AC_LANG_RC_CONFIG is expanded from...
++aclocal.m4:3806: AC_LIBTOOL_LANG_RC_CONFIG is expanded from...
++aclocal.m4:1733: _LT_AC_TAGCONFIG is expanded from...
++aclocal.m4:225: AC_LIBTOOL_SETUP is expanded from...
++configure.in:76: AC_LIBTOOL_SETUP is required by...
++aclocal.m4:81: _AC_PROG_LIBTOOL is expanded from...
++configure.in:76: _AC_PROG_LIBTOOL is required by...
++aclocal.m4:61: AC_PROG_LIBTOOL is expanded from...
++configure.in:76: the top level])
++m4trace:configure.in:76: -1- AC_SUBST([LIBTOOL])
++m4trace:configure.in:82: -1- AC_SUBST([INCLUDES])
++m4trace:configure.in:83: -1- AC_CHECK_HEADERS([sys/time.h sys/timeb.h io.h])
++m4trace:configure.in:83: -1- AH_OUTPUT([HAVE_SYS_TIME_H], [/* Define to 1 if you have the <sys/time.h> header file. */
++#undef HAVE_SYS_TIME_H])
++m4trace:configure.in:83: -1- AH_OUTPUT([HAVE_SYS_TIMEB_H], [/* Define to 1 if you have the <sys/timeb.h> header file. */
++#undef HAVE_SYS_TIMEB_H])
++m4trace:configure.in:83: -1- AH_OUTPUT([HAVE_IO_H], [/* Define to 1 if you have the <io.h> header file. */
++#undef HAVE_IO_H])
++m4trace:configure.in:84: -1- _m4_warn([cross], [AC_RUN_IFELSE called without default to allow cross compiling], [autoconf/general.m4:2281: AC_RUN_IFELSE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++autoconf/types.m4:405: AC_CHECK_SIZEOF is expanded from...
++autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
++acinclude.m4:107: AC_CHECK_GENERATE_INTTYPES is expanded from...
++configure.in:84: the top level])
++m4trace:configure.in:84: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_CHAR])
++m4trace:configure.in:84: -1- AH_OUTPUT([SIZEOF_CHAR], [/* The size of a `char\', as computed by sizeof. */
++#undef SIZEOF_CHAR])
++m4trace:configure.in:84: -1- _m4_warn([cross], [AC_RUN_IFELSE called without default to allow cross compiling], [autoconf/general.m4:2281: AC_RUN_IFELSE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++autoconf/types.m4:405: AC_CHECK_SIZEOF is expanded from...
++autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
++acinclude.m4:107: AC_CHECK_GENERATE_INTTYPES is expanded from...
++configure.in:84: the top level])
++m4trace:configure.in:84: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_SHORT])
++m4trace:configure.in:84: -1- AH_OUTPUT([SIZEOF_SHORT], [/* The size of a `short\', as computed by sizeof. */
++#undef SIZEOF_SHORT])
++m4trace:configure.in:84: -1- _m4_warn([cross], [AC_RUN_IFELSE called without default to allow cross compiling], [autoconf/general.m4:2281: AC_RUN_IFELSE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++autoconf/types.m4:405: AC_CHECK_SIZEOF is expanded from...
++autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
++acinclude.m4:107: AC_CHECK_GENERATE_INTTYPES is expanded from...
++configure.in:84: the top level])
++m4trace:configure.in:84: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_INT])
++m4trace:configure.in:84: -1- AH_OUTPUT([SIZEOF_INT], [/* The size of a `int\', as computed by sizeof. */
++#undef SIZEOF_INT])
++m4trace:configure.in:87: -1- AC_C_CONST
++m4trace:configure.in:87: -1- AC_DEFINE_TRACE_LITERAL([const])
++m4trace:configure.in:87: -1- AH_OUTPUT([const], [/* Define to empty if `const\' does not conform to ANSI C. */
++#undef const])
++m4trace:configure.in:88: -1- AC_C_INLINE
++m4trace:configure.in:88: -1- AH_OUTPUT([inline], [/* Define to `__inline__\' or `__inline\' if that\'s what the C compiler
++   calls it, or to nothing if \'inline\' is not supported under any name.  */
++#ifndef __cplusplus
++#undef inline
++#endif])
++m4trace:configure.in:88: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++acinclude.m4:36: AC_C_ALWAYS_INLINE is expanded from...
++configure.in:88: the top level])
++m4trace:configure.in:88: -1- AC_DEFINE_TRACE_LITERAL([inline])
++m4trace:configure.in:89: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++acinclude.m4:18: AC_C_RESTRICT is expanded from...
++configure.in:89: the top level])
++m4trace:configure.in:89: -1- AC_DEFINE_TRACE_LITERAL([restrict])
++m4trace:configure.in:89: -1- AH_OUTPUT([restrict], [/* Define as `__restrict\' if that\'s what the C compiler calls it, or to
++   nothing if it is not supported. */
++#undef restrict])
++m4trace:configure.in:89: -1- AC_DEFINE_TRACE_LITERAL([restrict])
++m4trace:configure.in:90: -1- AC_TYPE_SIZE_T
++m4trace:configure.in:90: -1- AC_DEFINE_TRACE_LITERAL([size_t])
++m4trace:configure.in:90: -1- AH_OUTPUT([size_t], [/* Define to `unsigned\' if <sys/types.h> does not define. */
++#undef size_t])
++m4trace:configure.in:91: -1- AC_DEFINE_TRACE_LITERAL([WORDS_BIGENDIAN])
++m4trace:configure.in:91: -1- AH_OUTPUT([WORDS_BIGENDIAN], [/* Define to 1 if your processor stores words with the most significant byte
++   first (like Motorola and SPARC, unlike Intel and VAX). */
++#undef WORDS_BIGENDIAN])
++m4trace:configure.in:94: -1- AC_CHECK_FUNCS([memalign gettimeofday ftime])
++m4trace:configure.in:94: -1- AH_OUTPUT([HAVE_MEMALIGN], [/* Define to 1 if you have the `memalign\' function. */
++#undef HAVE_MEMALIGN])
++m4trace:configure.in:94: -1- AH_OUTPUT([HAVE_GETTIMEOFDAY], [/* Define to 1 if you have the `gettimeofday\' function. */
++#undef HAVE_GETTIMEOFDAY])
++m4trace:configure.in:94: -1- AH_OUTPUT([HAVE_FTIME], [/* Define to 1 if you have the `ftime\' function. */
++#undef HAVE_FTIME])
++m4trace:configure.in:95: -1- AC_TYPE_SIGNAL
++m4trace:configure.in:95: -1- AC_DEFINE_TRACE_LITERAL([RETSIGTYPE])
++m4trace:configure.in:95: -1- AH_OUTPUT([RETSIGTYPE], [/* Define as the return type of signal handlers (`int\' or `void\'). */
++#undef RETSIGTYPE])
++m4trace:liba52/configure.incl:1: -1- AC_SUBST([LIBA52_CFLAGS])
++m4trace:liba52/configure.incl:2: -1- AC_SUBST([LIBA52_LIBS])
++m4trace:liba52/configure.incl:10: -1- AC_DEFINE_TRACE_LITERAL([LIBA52_DOUBLE])
++m4trace:liba52/configure.incl:10: -1- AH_OUTPUT([LIBA52_DOUBLE], [/* a52 sample precision */
++#undef LIBA52_DOUBLE])
++m4trace:liba52/configure.incl:17: -1- AC_DEFINE_TRACE_LITERAL([LIBA52_DJBFFT])
++m4trace:liba52/configure.incl:17: -1- AH_OUTPUT([LIBA52_DJBFFT], [/* liba52 djbfft support */
++#undef LIBA52_DJBFFT])
++m4trace:libao/configure.incl:1: -1- AC_SUBST([LIBAO_LIBS])
++m4trace:libao/configure.incl:9: -1- AC_DEFINE_TRACE_LITERAL([LIBAO_OSS])
++m4trace:libao/configure.incl:9: -1- AH_OUTPUT([LIBAO_OSS], [/* libao OSS support */
++#undef LIBAO_OSS])
++m4trace:libao/configure.incl:11: -1- AC_CHECK_LIB([ossaudio], [_oss_ioctl], [LIBAO_LIBS="$LIBAO_LIBS -lossaudio"])
++m4trace:libao/configure.incl:21: -1- AC_DEFINE_TRACE_LITERAL([LIBAO_SOLARIS])
++m4trace:libao/configure.incl:21: -1- AH_OUTPUT([LIBAO_SOLARIS], [/* libao solaris support */
++#undef LIBAO_SOLARIS])
++m4trace:libao/configure.incl:32: -1- AC_DEFINE_TRACE_LITERAL([LIBAO_AL])
++m4trace:libao/configure.incl:32: -1- AH_OUTPUT([LIBAO_AL], [/* libao al support */
++#undef LIBAO_AL])
++m4trace:libao/configure.incl:43: -1- AC_DEFINE_TRACE_LITERAL([LIBAO_WIN])
++m4trace:libao/configure.incl:43: -1- AH_OUTPUT([LIBAO_WIN], [/* libao win support */
++#undef LIBAO_WIN])
++m4trace:configure.in:105: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++acinclude.m4:67: AC_TRY_CFLAGS is expanded from...
++configure.in:105: the top level])
++m4trace:src/configure.incl:1: -1- AC_SUBST([A52DEC_CFLAGS])
++m4trace:configure.in:113: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++acinclude.m4:52: AC_C_ATTRIBUTE_ALIGNED is expanded from...
++configure.in:113: the top level])
++m4trace:configure.in:113: -1- AC_DEFINE_TRACE_LITERAL([ATTRIBUTE_ALIGNED_MAX])
++m4trace:configure.in:113: -1- AH_OUTPUT([ATTRIBUTE_ALIGNED_MAX], [/* maximum supported data alignment */
++#undef ATTRIBUTE_ALIGNED_MAX])
++m4trace:configure.in:115: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
++m4trace:configure.in:115: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+diff -uNr a52dec-0.7.4-orig/autom4te.cache/traces.1 a52dec-0.7.4/autom4te.cache/traces.1
+--- a52dec-0.7.4-orig/autom4te.cache/traces.1	1970-01-01 10:00:00.000000000 +1000
++++ a52dec-0.7.4/autom4te.cache/traces.1	2005-02-06 16:25:18.438065528 +1100
+@@ -0,0 +1,8933 @@
++m4trace:/usr/share/aclocal/libtool.m4:70: -1- AC_DEFUN([AC_PROG_LIBTOOL], [AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
++dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
++dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
++  AC_PROVIDE_IFELSE([AC_PROG_CXX],
++    [AC_LIBTOOL_CXX],
++    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
++  ])])
++dnl And a similar setup for Fortran 77 support
++  AC_PROVIDE_IFELSE([AC_PROG_F77],
++    [AC_LIBTOOL_F77],
++    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
++])])
++
++dnl Quote AM_PROG_GCJ so that aclocal doesn't bring it in needlessly.
++dnl If either AC_PROG_GCJ or AM_PROG_GCJ have already been expanded, run
++dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
++  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
++    [AC_LIBTOOL_GCJ],
++    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
++      [AC_LIBTOOL_GCJ],
++      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
++	[AC_LIBTOOL_GCJ],
++      [ifdef([AC_PROG_GCJ],
++	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
++       ifdef([A][M_PROG_GCJ],
++	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
++       ifdef([LT_AC_PROG_GCJ],
++	     [define([LT_AC_PROG_GCJ],
++		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
++])])
++m4trace:/usr/share/aclocal/libtool.m4:90: -1- AC_DEFUN([_AC_PROG_LIBTOOL], [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
++AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
++AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
++AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
++
++# This can be used to rebuild libtool when needed
++LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++
++# Always use our own libtool.
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++AC_SUBST(LIBTOOL)dnl
++
++# Prevent multiple expansion
++define([AC_PROG_LIBTOOL], [])
++])
++m4trace:/usr/share/aclocal/libtool.m4:234: -1- AC_DEFUN([AC_LIBTOOL_SETUP], [AC_PREREQ(2.50)dnl
++AC_REQUIRE([AC_ENABLE_SHARED])dnl
++AC_REQUIRE([AC_ENABLE_STATIC])dnl
++AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
++AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([AC_PROG_LD])dnl
++AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
++AC_REQUIRE([AC_PROG_NM])dnl
++
++AC_REQUIRE([AC_PROG_LN_S])dnl
++AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
++# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
++AC_REQUIRE([AC_OBJEXT])dnl
++AC_REQUIRE([AC_EXEEXT])dnl
++dnl
++
++AC_LIBTOOL_SYS_MAX_CMD_LEN
++AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
++AC_LIBTOOL_OBJDIR
++
++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++_LT_AC_PROG_ECHO_BACKSLASH
++
++case $host_os in
++aix3*)
++  # AIX sometimes has problems with the GCC collect2 program.  For some
++  # reason, if we set the COLLECT_NAMES environment variable, the problems
++  # vanish in a puff of smoke.
++  if test "X${COLLECT_NAMES+set}" != Xset; then
++    COLLECT_NAMES=
++    export COLLECT_NAMES
++  fi
++  ;;
++esac
++
++# Sed substitution that helps us do robust quoting.  It backslashifies
++# metacharacters that are still active within double-quoted strings.
++Xsed='sed -e s/^X//'
++[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
++
++# Same as above, but do not quote variable references.
++[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
++
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++
++# Sed substitution to avoid accidental globbing in evaled expressions
++no_glob_subst='s/\*/\\\*/g'
++
++# Constants:
++rm="rm -f"
++
++# Global variables:
++default_ofile=libtool
++can_build_shared=yes
++
++# All known linkers require a `.a' archive for static linking (except M$VC,
++# which needs '.lib').
++libext=a
++ltmain="$ac_aux_dir/ltmain.sh"
++ofile="$default_ofile"
++with_gnu_ld="$lt_cv_prog_gnu_ld"
++
++AC_CHECK_TOOL(AR, ar, false)
++AC_CHECK_TOOL(RANLIB, ranlib, :)
++AC_CHECK_TOOL(STRIP, strip, :)
++
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
++
++# Set sane defaults for various variables
++test -z "$AR" && AR=ar
++test -z "$AR_FLAGS" && AR_FLAGS=cru
++test -z "$AS" && AS=as
++test -z "$CC" && CC=cc
++test -z "$LTCC" && LTCC=$CC
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++test -z "$LD" && LD=ld
++test -z "$LN_S" && LN_S="ln -s"
++test -z "$MAGIC_CMD" && MAGIC_CMD=file
++test -z "$NM" && NM=nm
++test -z "$SED" && SED=sed
++test -z "$OBJDUMP" && OBJDUMP=objdump
++test -z "$RANLIB" && RANLIB=:
++test -z "$STRIP" && STRIP=:
++test -z "$ac_objext" && ac_objext=o
++
++# Determine commands to create old-style static archives.
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++old_postinstall_cmds='chmod 644 $oldlib'
++old_postuninstall_cmds=
++
++if test -n "$RANLIB"; then
++  case $host_os in
++  openbsd*)
++    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
++    ;;
++  *)
++    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++    ;;
++  esac
++  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++fi
++
++cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++
++# Only perform the check for file, if the check method requires it
++case $deplibs_check_method in
++file_magic*)
++  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
++    AC_PATH_MAGIC
++  fi
++  ;;
++esac
++
++AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
++AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
++enable_win32_dll=yes, enable_win32_dll=no)
++
++AC_ARG_ENABLE([libtool-lock],
++    [AC_HELP_STRING([--disable-libtool-lock],
++	[avoid locking (might break parallel builds)])])
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++
++AC_ARG_WITH([pic],
++    [AC_HELP_STRING([--with-pic],
++	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
++    [pic_mode="$withval"],
++    [pic_mode=default])
++test -z "$pic_mode" && pic_mode=default
++
++# Use C for the default configuration in the libtool script
++tagname=
++AC_LIBTOOL_LANG_C_CONFIG
++_LT_AC_TAGCONFIG
++])
++m4trace:/usr/share/aclocal/libtool.m4:247: -1- AC_DEFUN([_LT_AC_SYS_COMPILER], [AC_REQUIRE([AC_PROG_CC])dnl
++
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
++
++# Allow CC to be a program name with arguments.
++compiler=$CC
++])
++m4trace:/usr/share/aclocal/libtool.m4:266: -1- AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], [AC_LINK_IFELSE(AC_LANG_PROGRAM,[
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi],[])
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++])
++m4trace:/usr/share/aclocal/libtool.m4:277: -1- AC_DEFUN([_LT_AC_SHELL_INIT], [ifdef([AC_DIVERSION_NOTICE],
++	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
++	 [AC_DIVERT_PUSH(NOTICE)])
++$1
++AC_DIVERT_POP
++])
++m4trace:/usr/share/aclocal/libtool.m4:433: -1- AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], [_LT_AC_SHELL_INIT([
++# Check that we are running under the correct shell.
++SHELL=${CONFIG_SHELL-/bin/sh}
++
++case X$ECHO in
++X*--fallback-echo)
++  # Remove one level of quotation (which was required for Make).
++  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
++  ;;
++esac
++
++echo=${ECHO-echo}
++if test "X[$]1" = X--no-reexec; then
++  # Discard the --no-reexec flag, and continue.
++  shift
++elif test "X[$]1" = X--fallback-echo; then
++  # Avoid inline document here, it may be left over
++  :
++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
++  # Yippee, $echo works!
++  :
++else
++  # Restart under the correct shell.
++  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
++fi
++
++if test "X[$]1" = X--fallback-echo; then
++  # used as fallback echo
++  shift
++  cat <<EOF
++[$]*
++EOF
++  exit 0
++fi
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++
++if test -z "$ECHO"; then
++if test "X${echo_test_string+set}" != Xset; then
++# find a string as large as possible, as long as the shell can cope with it
++  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
++    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
++    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
++       echo_test_string="`eval $cmd`" &&
++       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
++    then
++      break
++    fi
++  done
++fi
++
++if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++   test "X$echo_testing_string" = "X$echo_test_string"; then
++  :
++else
++  # The Solaris, AIX, and Digital Unix default echo programs unquote
++  # backslashes.  This makes it impossible to quote backslashes using
++  #   echo "$something" | sed 's/\\/\\\\/g'
++  #
++  # So, first we look for a working echo in the user's PATH.
++
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for dir in $PATH /usr/ucb; do
++    IFS="$lt_save_ifs"
++    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
++       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
++       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
++       test "X$echo_testing_string" = "X$echo_test_string"; then
++      echo="$dir/echo"
++      break
++    fi
++  done
++  IFS="$lt_save_ifs"
++
++  if test "X$echo" = Xecho; then
++    # We didn't find a better echo, so look for alternatives.
++    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
++       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
++       test "X$echo_testing_string" = "X$echo_test_string"; then
++      # This shell has a builtin print -r that does the trick.
++      echo='print -r'
++    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
++	 test "X$CONFIG_SHELL" != X/bin/ksh; then
++      # If we have ksh, try running configure again with it.
++      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
++      export ORIGINAL_CONFIG_SHELL
++      CONFIG_SHELL=/bin/ksh
++      export CONFIG_SHELL
++      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
++    else
++      # Try using printf.
++      echo='printf %s\n'
++      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++	 test "X$echo_testing_string" = "X$echo_test_string"; then
++	# Cool, printf works
++	:
++      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
++	   test "X$echo_testing_string" = 'X\t' &&
++	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
++	export CONFIG_SHELL
++	SHELL="$CONFIG_SHELL"
++	export SHELL
++	echo="$CONFIG_SHELL [$]0 --fallback-echo"
++      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
++	   test "X$echo_testing_string" = 'X\t' &&
++	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	echo="$CONFIG_SHELL [$]0 --fallback-echo"
++      else
++	# maybe with a smaller string...
++	prev=:
++
++	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
++	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
++	  then
++	    break
++	  fi
++	  prev="$cmd"
++	done
++
++	if test "$prev" != 'sed 50q "[$]0"'; then
++	  echo_test_string=`eval $prev`
++	  export echo_test_string
++	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
++	else
++	  # Oops.  We lost completely, so just stick with echo.
++	  echo=echo
++	fi
++      fi
++    fi
++  fi
++fi
++fi
++
++# Copy echo and quote the copy suitably for passing to libtool from
++# the Makefile, instead of quoting the original, which is used later.
++ECHO=$echo
++if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
++   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
++fi
++
++AC_SUBST(ECHO)
++])])
++m4trace:/usr/share/aclocal/libtool.m4:561: -1- AC_DEFUN([_LT_AC_LOCK], [AC_ARG_ENABLE([libtool-lock],
++    [AC_HELP_STRING([--disable-libtool-lock],
++	[avoid locking (might break parallel builds)])])
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++
++# Some flags need to be propagated to the compiler or linker for good
++# libtool support.
++case $host in
++ia64-*-hpux*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    case `/usr/bin/file conftest.$ac_objext` in
++    *ELF-32*)
++      HPUX_IA64_MODE="32"
++      ;;
++    *ELF-64*)
++      HPUX_IA64_MODE="64"
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++*-*-irix6*)
++  # Find out which ABI we are using.
++  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++   if test "$lt_cv_prog_gnu_ld" = yes; then
++    case `/usr/bin/file conftest.$ac_objext` in
++    *32-bit*)
++      LD="${LD-ld} -melf32bsmip"
++      ;;
++    *N32*)
++      LD="${LD-ld} -melf32bmipn32"
++      ;;
++    *64-bit*)
++      LD="${LD-ld} -melf64bmip"
++      ;;
++    esac
++   else
++    case `/usr/bin/file conftest.$ac_objext` in
++    *32-bit*)
++      LD="${LD-ld} -32"
++      ;;
++    *N32*)
++      LD="${LD-ld} -n32"
++      ;;
++    *64-bit*)
++      LD="${LD-ld} -64"
++      ;;
++    esac
++   fi
++  fi
++  rm -rf conftest*
++  ;;
++
++x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    case "`/usr/bin/file conftest.o`" in
++    *32-bit*)
++      case $host in
++        x86_64-*linux*)
++          LD="${LD-ld} -m elf_i386"
++          ;;
++        ppc64-*linux*|powerpc64-*linux*)
++          LD="${LD-ld} -m elf32ppclinux"
++          ;;
++        s390x-*linux*)
++          LD="${LD-ld} -m elf_s390"
++          ;;
++        sparc64-*linux*)
++          LD="${LD-ld} -m elf32_sparc"
++          ;;
++      esac
++      ;;
++    *64-bit*)
++      case $host in
++        x86_64-*linux*)
++          LD="${LD-ld} -m elf_x86_64"
++          ;;
++        ppc*-*linux*|powerpc*-*linux*)
++          LD="${LD-ld} -m elf64ppc"
++          ;;
++        s390*-*linux*)
++          LD="${LD-ld} -m elf64_s390"
++          ;;
++        sparc*-*linux*)
++          LD="${LD-ld} -m elf64_sparc"
++          ;;
++      esac
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++
++*-*-sco3.2v5*)
++  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
++  SAVE_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -belf"
++  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
++    [AC_LANG_PUSH(C)
++     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
++     AC_LANG_POP])
++  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
++    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
++    CFLAGS="$SAVE_CFLAGS"
++  fi
++  ;;
++AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
++[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
++  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
++  AC_CHECK_TOOL(AS, as, false)
++  AC_CHECK_TOOL(OBJDUMP, objdump, false)
++  ;;
++  ])
++esac
++
++need_locks="$enable_libtool_lock"
++
++])
++m4trace:/usr/share/aclocal/libtool.m4:604: -1- AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [AC_REQUIRE([LT_AC_PROG_SED])
++AC_CACHE_CHECK([$1], [$2],
++  [$2=no
++  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$3"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&AS_MESSAGE_LOG_FD
++   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s conftest.err; then
++       $2=yes
++     fi
++   fi
++   $rm conftest*
++])
++
++if test x"[$]$2" = xyes; then
++    ifelse([$5], , :, [$5])
++else
++    ifelse([$6], , :, [$6])
++fi
++])
++m4trace:/usr/share/aclocal/libtool.m4:636: -1- AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [AC_CACHE_CHECK([$1], [$2],
++  [$2=no
++   save_LDFLAGS="$LDFLAGS"
++   LDFLAGS="$LDFLAGS $3"
++   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test -s conftest.err; then
++       # Append any errors to the config.log.
++       cat conftest.err 1>&AS_MESSAGE_LOG_FD
++     else
++       $2=yes
++     fi
++   fi
++   $rm conftest*
++   LDFLAGS="$save_LDFLAGS"
++])
++
++if test x"[$]$2" = xyes; then
++    ifelse([$4], , :, [$4])
++else
++    ifelse([$5], , :, [$5])
++fi
++])
++m4trace:/usr/share/aclocal/libtool.m4:721: -1- AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [# find the maximum length of command line arguments
++AC_MSG_CHECKING([the maximum length of command line arguments])
++AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
++  i=0
++  teststring="ABCD"
++
++  case $build_os in
++  msdosdjgpp*)
++    # On DJGPP, this test can blow up pretty badly due to problems in libc
++    # (any single argument exceeding 2000 bytes causes a buffer overrun
++    # during glob expansion).  Even if it were fixed, the result of this
++    # check would be larger than it should be.
++    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
++    ;;
++
++  gnu*)
++    # Under GNU Hurd, this test is not required because there is
++    # no limit to the length of command line arguments.
++    # Libtool will interpret -1 as no limit whatsoever
++    lt_cv_sys_max_cmd_len=-1;
++    ;;
++
++  cygwin* | mingw*)
++    # On Win9x/ME, this test blows up -- it succeeds, but takes
++    # about 5 minutes as the teststring grows exponentially.
++    # Worse, since 9x/ME are not pre-emptively multitasking,
++    # you end up with a "frozen" computer, even though with patience
++    # the test eventually succeeds (with a max line length of 256k).
++    # Instead, let's just punt: use the minimum linelength reported by
++    # all of the supported platforms: 8192 (on NT/2K/XP).
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
++
++  amigaos*)
++    # On AmigaOS with pdksh, this test takes hours, literally.
++    # So we just punt and use a minimum line length of 8192.
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
++
++  netbsd* | freebsd* | openbsd* | darwin* )
++    # This has been around since 386BSD, at least.  Likely further.
++    if test -x /sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++    elif test -x /usr/sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++    else
++      lt_cv_sys_max_cmd_len=65536 # usable default for *BSD
++    fi
++    # And add a safety zone
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++    ;;
++
++ *)
++    # If test is not a shell built-in, we'll probably end up computing a
++    # maximum length that is only half of the actual maximum length, but
++    # we can't tell.
++    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
++	       = "XX$teststring") >/dev/null 2>&1 &&
++	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
++	    lt_cv_sys_max_cmd_len=$new_result &&
++	    test $i != 17 # 1/2 MB should be enough
++    do
++      i=`expr $i + 1`
++      teststring=$teststring$teststring
++    done
++    teststring=
++    # Add a significant safety factor because C++ compilers can tack on massive
++    # amounts of additional arguments before passing them to the linker.
++    # It appears as though 1/2 is a usable value.
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++    ;;
++  esac
++])
++if test -n $lt_cv_sys_max_cmd_len ; then
++  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
++else
++  AC_MSG_RESULT(none)
++fi
++])
++m4trace:/usr/share/aclocal/libtool.m4:728: -1- AC_DEFUN([_LT_AC_CHECK_DLFCN], [AC_CHECK_HEADERS(dlfcn.h)dnl
++])
++m4trace:/usr/share/aclocal/libtool.m4:817: -1- AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
++if test "$cross_compiling" = yes; then :
++  [$4]
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++[#line __oline__ "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}]
++EOF
++  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) $1 ;;
++      x$lt_dlneed_uscore) $2 ;;
++      x$lt_unknown|x*) $3 ;;
++    esac
++  else :
++    # compilation failed
++    $3
++  fi
++fi
++rm -fr conftest*
++])
++m4trace:/usr/share/aclocal/libtool.m4:930: -1- AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
++if test "x$enable_dlopen" != xyes; then
++  enable_dlopen=unknown
++  enable_dlopen_self=unknown
++  enable_dlopen_self_static=unknown
++else
++  lt_cv_dlopen=no
++  lt_cv_dlopen_libs=
++
++  case $host_os in
++  beos*)
++    lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ;;
++
++  mingw* | pw32*)
++    lt_cv_dlopen="LoadLibrary"
++    lt_cv_dlopen_libs=
++   ;;
++
++  cygwin*)
++    lt_cv_dlopen="dlopen"
++    lt_cv_dlopen_libs=
++   ;;
++
++  darwin*)
++  # if libdl is installed we need to link against it
++    AC_CHECK_LIB([dl], [dlopen],
++		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ])
++   ;;
++
++  *)
++    AC_CHECK_FUNC([shl_load],
++	  [lt_cv_dlopen="shl_load"],
++      [AC_CHECK_LIB([dld], [shl_load],
++	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
++	[AC_CHECK_FUNC([dlopen],
++	      [lt_cv_dlopen="dlopen"],
++	  [AC_CHECK_LIB([dl], [dlopen],
++		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
++	    [AC_CHECK_LIB([svld], [dlopen],
++		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++	      [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	      ])
++	    ])
++	  ])
++	])
++      ])
++    ;;
++  esac
++
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
++  else
++    enable_dlopen=no
++  fi
++
++  case $lt_cv_dlopen in
++  dlopen)
++    save_CPPFLAGS="$CPPFLAGS"
++    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++
++    save_LDFLAGS="$LDFLAGS"
++    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++
++    save_LIBS="$LIBS"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
++
++    AC_CACHE_CHECK([whether a program can dlopen itself],
++	  lt_cv_dlopen_self, [dnl
++	  _LT_AC_TRY_DLOPEN_SELF(
++	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
++	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
++    ])
++
++    if test "x$lt_cv_dlopen_self" = xyes; then
++      LDFLAGS="$LDFLAGS $link_static_flag"
++      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
++    	  lt_cv_dlopen_self_static, [dnl
++	  _LT_AC_TRY_DLOPEN_SELF(
++	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
++	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
++      ])
++    fi
++
++    CPPFLAGS="$save_CPPFLAGS"
++    LDFLAGS="$save_LDFLAGS"
++    LIBS="$save_LIBS"
++    ;;
++  esac
++
++  case $lt_cv_dlopen_self in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
++  esac
++
++  case $lt_cv_dlopen_self_static in
++  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++  *) enable_dlopen_self_static=unknown ;;
++  esac
++fi
++])
++m4trace:/usr/share/aclocal/libtool.m4:979: -1- AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], [AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
++  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
++  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
++   $rm -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&AS_MESSAGE_LOG_FD
++   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++   if (exit $ac_status) && test -s out/conftest2.$ac_objext
++   then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s out/conftest.err; then
++       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
++     fi
++   fi
++   chmod u+w .
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
++   cd ..
++   rmdir conftest
++   $rm conftest*
++])
++])
++m4trace:/usr/share/aclocal/libtool.m4:1006: -1- AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_REQUIRE([_LT_AC_LOCK])dnl
++
++hard_links="nottested"
++if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  AC_MSG_CHECKING([if we can lock with hard links])
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  AC_MSG_RESULT([$hard_links])
++  if test "$hard_links" = no; then
++    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
++])
++m4trace:/usr/share/aclocal/libtool.m4:1023: -1- AC_DEFUN([AC_LIBTOOL_OBJDIR], [AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
++[rm -f .libs 2>/dev/null
++mkdir .libs 2>/dev/null
++if test -d .libs; then
++  lt_cv_objdir=.libs
++else
++  # MS-DOS does not allow filenames that begin with a dot.
++  lt_cv_objdir=_libs
++fi
++rmdir .libs 2>/dev/null])
++objdir=$lt_cv_objdir
++])
++m4trace:/usr/share/aclocal/libtool.m4:1064: -1- AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_MSG_CHECKING([how to hardcode library paths into programs])
++_LT_AC_TAGVAR(hardcode_action, $1)=
++if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
++   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
++   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
++
++  # We can hardcode non-existant directories.
++  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
++     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
++    # Linking always hardcodes the temporary library directory.
++    _LT_AC_TAGVAR(hardcode_action, $1)=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
++  fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
++fi
++AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
++
++if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
++])
++m4trace:/usr/share/aclocal/libtool.m4:1093: -1- AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], [striplib=
++old_striplib=
++AC_MSG_CHECKING([whether stripping libraries is possible])
++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
++  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++  AC_MSG_RESULT([yes])
++else
++# FIXME - insert some real tests, host_os isn't really good enough
++  case $host_os in
++   darwin*)
++       if test -n "$STRIP" ; then
++         striplib="$STRIP -x"
++         AC_MSG_RESULT([yes])
++       else
++  AC_MSG_RESULT([no])
++fi
++       ;;
++   *)
++  AC_MSG_RESULT([no])
++    ;;
++  esac
++fi
++])
++m4trace:/usr/share/aclocal/libtool.m4:1641: -1- AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_MSG_CHECKING([dynamic linker characteristics])
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
++need_lib_prefix=unknown
++hardcode_into_libs=no
++
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
++
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  shlibpath_var=LIBPATH
++
++  # AIX 3 has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}${shared_ext}$major'
++  ;;
++
++aix4* | aix5*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[[01]] | aix4.[[01]].*)
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	   echo ' yes '
++	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++	:
++      else
++	can_build_shared=no
++      fi
++      ;;
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}${shared_ext}$major'
++    fi
++    shlibpath_var=LIBPATH
++  fi
++  ;;
++
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++  ;;
++
++beos*)
++  library_names_spec='${libname}${shared_ext}'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
++
++bsdi[[45]]*)
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
++
++cygwin* | mingw* | pw32*)
++  version_type=windows
++  shrext_cmds=".dll"
++  need_version=no
++  need_lib_prefix=no
++
++  case $GCC,$host_os in
++  yes,cygwin* | yes,mingw* | yes,pw32*)
++    library_names_spec='$libname.dll.a'
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $rm \$dlpath'
++    shlibpath_overrides_runpath=yes
++
++    case $host_os in
++    cygwin*)
++      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
++    mingw*)
++      # MinGW DLLs use traditional 'lib' prefix
++      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
++        # It is most probably a Windows format PATH printed by
++        # mingw gcc, but we are running on Cygwin. Gcc prints its search
++        # path with ; separators, and with drive letters. We can handle the
++        # drive letters (cygwin fileutils understands them), so leave them,
++        # especially as we might pass files found there to a mingw objdump,
++        # which wouldn't understand a cygwinified path. Ahh.
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++      fi
++      ;;
++    pw32*)
++      # pw32 DLLs use 'pw' prefix rather than 'lib'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      ;;
++    esac
++    ;;
++
++  *)
++    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    ;;
++  esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  ;;
++
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  soname_spec='${libname}${release}${major}$shared_ext'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
++  if test "$GCC" = yes; then
++    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
++  else
++    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
++  fi
++  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++  ;;
++
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++freebsd1*)
++  dynamic_linker=no
++  ;;
++
++kfreebsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++freebsd*)
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
++    ;;
++  freebsd3.[01]* | freebsdelf3.[01]*)
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
++  *) # from 3.2 on
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
++    ;;
++  esac
++  ;;
++
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  ;;
++
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  case "$host_cpu" in
++  ia64*)
++    shrext_cmds='.so'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.so"
++    shlibpath_var=LD_LIBRARY_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    if test "X$HPUX_IA64_MODE" = X32; then
++      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++    else
++      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++    fi
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    ;;
++   hppa*64*)
++     shrext_cmds='.sl'
++     hardcode_into_libs=yes
++     dynamic_linker="$host_os dld.sl"
++     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++     soname_spec='${libname}${release}${shared_ext}$major'
++     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++     ;;
++   *)
++    shrext_cmds='.sl'
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=SHLIB_PATH
++    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    ;;
++  esac
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
++    *)
++	if test "$lt_cv_prog_gnu_ld" = yes; then
++		version_type=linux
++	else
++		version_type=irix
++	fi ;;
++  esac
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  case $host_os in
++  irix5* | nonstopux*)
++    libsuff= shlibsuff=
++    ;;
++  *)
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++      libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++      libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++      libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  hardcode_into_libs=yes
++  ;;
++
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++  dynamic_linker=no
++  ;;
++
++# This must be Linux ELF.
++linux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
++
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
++
++knetbsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++nto-qnx*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++openbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    case $host_os in
++      openbsd2.[[89]] | openbsd2.[[89]].*)
++	shlibpath_overrides_runpath=no
++	;;
++      *)
++	shlibpath_overrides_runpath=yes
++	;;
++      esac
++  else
++    shlibpath_overrides_runpath=yes
++  fi
++  ;;
++
++os2*)
++  libname_spec='$name'
++  shrext_cmds=".dll"
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
++
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
++
++sco3.2v5*)
++  version_type=osf
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
++
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      export_dynamic_flag_spec='${wl}-Blargedynsym'
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
++
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
++
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++*)
++  dynamic_linker=no
++  ;;
++esac
++AC_MSG_RESULT([$dynamic_linker])
++test "$dynamic_linker" = no && can_build_shared=no
++])
++m4trace:/usr/share/aclocal/libtool.m4:1742: -1- AC_DEFUN([_LT_AC_TAGCONFIG], [AC_ARG_WITH([tags],
++    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
++        [include additional configurations @<:@automatic@:>@])],
++    [tagnames="$withval"])
++
++if test -f "$ltmain" && test -n "$tagnames"; then
++  if test ! -f "${ofile}"; then
++    AC_MSG_WARN([output file `$ofile' does not exist])
++  fi
++
++  if test -z "$LTCC"; then
++    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
++    if test -z "$LTCC"; then
++      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
++    else
++      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
++    fi
++  fi
++
++  # Extract list of available tagged configurations in $ofile.
++  # Note that this assumes the entire list is on one line.
++  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
++
++  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++  for tagname in $tagnames; do
++    IFS="$lt_save_ifs"
++    # Check whether tagname contains only valid characters
++    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
++    "") ;;
++    *)  AC_MSG_ERROR([invalid tag name: $tagname])
++	;;
++    esac
++
++    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
++    then
++      AC_MSG_ERROR([tag name \"$tagname\" already exists])
++    fi
++
++    # Update the list of available tags.
++    if test -n "$tagname"; then
++      echo appending configuration tag \"$tagname\" to $ofile
++
++      case $tagname in
++      CXX)
++	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 
++	    (test "X$CXX" != "Xg++"))) ; then
++	  AC_LIBTOOL_LANG_CXX_CONFIG
++	else
++	  tagname=""
++	fi
++	;;
++
++      F77)
++	if test -n "$F77" && test "X$F77" != "Xno"; then
++	  AC_LIBTOOL_LANG_F77_CONFIG
++	else
++	  tagname=""
++	fi
++	;;
++
++      GCJ)
++	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
++	  AC_LIBTOOL_LANG_GCJ_CONFIG
++	else
++	  tagname=""
++	fi
++	;;
++
++      RC)
++	AC_LIBTOOL_LANG_RC_CONFIG
++	;;
++
++      *)
++	AC_MSG_ERROR([Unsupported tag name: $tagname])
++	;;
++      esac
++
++      # Append the new tag name to the list of available tags.
++      if test -n "$tagname" ; then
++      available_tags="$available_tags $tagname"
++    fi
++    fi
++  done
++  IFS="$lt_save_ifs"
++
++  # Now substitute the updated list of available tags.
++  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
++    mv "${ofile}T" "$ofile"
++    chmod +x "$ofile"
++  else
++    rm -f "${ofile}T"
++    AC_MSG_ERROR([unable to update list of available tagged configurations.])
++  fi
++fi
++])
++m4trace:/usr/share/aclocal/libtool.m4:1750: -1- AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
++])
++m4trace:/usr/share/aclocal/libtool.m4:1758: -1- AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
++])
++m4trace:/usr/share/aclocal/libtool.m4:1788: -1- AC_DEFUN([AC_ENABLE_SHARED], [define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE([shared],
++    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
++	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
++    [p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_shared=yes ;;
++    no) enable_shared=no ;;
++    *)
++      enable_shared=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_shared=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac],
++    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
++])
++m4trace:/usr/share/aclocal/libtool.m4:1797: -1- AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_SHARED(no)
++])
++m4trace:/usr/share/aclocal/libtool.m4:1827: -1- AC_DEFUN([AC_ENABLE_STATIC], [define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE([static],
++    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
++	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
++    [p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_static=yes ;;
++    no) enable_static=no ;;
++    *)
++     enable_static=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_static=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac],
++    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
++])
++m4trace:/usr/share/aclocal/libtool.m4:1836: -1- AC_DEFUN([AC_DISABLE_STATIC], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_STATIC(no)
++])
++m4trace:/usr/share/aclocal/libtool.m4:1866: -1- AC_DEFUN([AC_ENABLE_FAST_INSTALL], [define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE([fast-install],
++    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
++    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
++    [p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_fast_install=yes ;;
++    no) enable_fast_install=no ;;
++    *)
++      enable_fast_install=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_fast_install=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac],
++    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
++])
++m4trace:/usr/share/aclocal/libtool.m4:1875: -1- AC_DEFUN([AC_DISABLE_FAST_INSTALL], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_FAST_INSTALL(no)
++])
++m4trace:/usr/share/aclocal/libtool.m4:1885: -1- AC_DEFUN([AC_LIBTOOL_PICMODE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++pic_mode=ifelse($#,1,$1,default)
++])
++m4trace:/usr/share/aclocal/libtool.m4:1963: -1- AC_DEFUN([AC_PATH_TOOL_PREFIX], [AC_REQUIRE([AC_PROG_EGREP])dnl
++AC_MSG_CHECKING([for $1])
++AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
++[case $MAGIC_CMD in
++[[\\/*] |  ?:[\\/]*])
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++  ;;
++*)
++  lt_save_MAGIC_CMD="$MAGIC_CMD"
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++dnl $ac_dummy forces splitting on constant user-supplied paths.
++dnl POSIX.2 word splitting is done only on the output of word expansions,
++dnl not every word.  This closes a longstanding sh security hole.
++  ac_dummy="ifelse([$2], , $PATH, [$2])"
++  for ac_dir in $ac_dummy; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$1; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
++      if test -n "$file_magic_test_file"; then
++	case $deplibs_check_method in
++	"file_magic "*)
++	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++	    $EGREP "$file_magic_regex" > /dev/null; then
++	    :
++	  else
++	    cat <<EOF 1>&2
++
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool@gnu.org
++
++EOF
++	  fi ;;
++	esac
++      fi
++      break
++    fi
++  done
++  IFS="$lt_save_ifs"
++  MAGIC_CMD="$lt_save_MAGIC_CMD"
++  ;;
++esac])
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  AC_MSG_RESULT($MAGIC_CMD)
++else
++  AC_MSG_RESULT(no)
++fi
++])
++m4trace:/usr/share/aclocal/libtool.m4:1978: -1- AC_DEFUN([AC_PATH_MAGIC], [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
++if test -z "$lt_cv_path_MAGIC_CMD"; then
++  if test -n "$ac_tool_prefix"; then
++    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
++  else
++    MAGIC_CMD=:
++  fi
++fi
++])
++m4trace:/usr/share/aclocal/libtool.m4:2063: -1- AC_DEFUN([AC_PROG_LD], [AC_ARG_WITH([gnu-ld],
++    [AC_HELP_STRING([--with-gnu-ld],
++	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
++    [test "$withval" = no || with_gnu_ld=yes],
++    [with_gnu_ld=no])
++AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++ac_prog=ld
++if test "$GCC" = yes; then
++  # Check if gcc -print-prog-name=ld gives a path.
++  AC_MSG_CHECKING([for ld used by $CC])
++  case $host in
++  *-*-mingw*)
++    # gcc leaves a trailing carriage return which upsets mingw
++    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++  *)
++    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++  esac
++  case $ac_prog in
++    # Accept absolute paths.
++    [[\\/]]* | ?:[[\\/]]*)
++      re_direlt='/[[^/]][[^/]]*/\.\./'
++      # Canonicalize the pathname of ld
++      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
++      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
++      done
++      test -z "$LD" && LD="$ac_prog"
++      ;;
++  "")
++    # If it fails, then pretend we aren't using GCC.
++    ac_prog=ld
++    ;;
++  *)
++    # If it is relative, then search for the first ld in PATH.
++    with_gnu_ld=unknown
++    ;;
++  esac
++elif test "$with_gnu_ld" = yes; then
++  AC_MSG_CHECKING([for GNU ld])
++else
++  AC_MSG_CHECKING([for non-GNU ld])
++fi
++AC_CACHE_VAL(lt_cv_path_LD,
++[if test -z "$LD"; then
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
++      lt_cv_path_LD="$ac_dir/$ac_prog"
++      # Check to see if the program is GNU ld.  I'd rather use --version,
++      # but apparently some GNU ld's only accept -v.
++      # Break only if it was the GNU/non-GNU ld that we prefer.
++      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
++      *GNU* | *'with BFD'*)
++	test "$with_gnu_ld" != no && break
++	;;
++      *)
++	test "$with_gnu_ld" != yes && break
++	;;
++      esac
++    fi
++  done
++  IFS="$lt_save_ifs"
++else
++  lt_cv_path_LD="$LD" # Let the user override the test with a path.
++fi])
++LD="$lt_cv_path_LD"
++if test -n "$LD"; then
++  AC_MSG_RESULT($LD)
++else
++  AC_MSG_RESULT(no)
++fi
++test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
++AC_PROG_LD_GNU
++])
++m4trace:/usr/share/aclocal/libtool.m4:2081: -1- AC_DEFUN([AC_PROG_LD_GNU], [AC_REQUIRE([AC_PROG_EGREP])dnl
++AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
++[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
++case `$LD -v 2>&1 </dev/null` in
++*GNU* | *'with BFD'*)
++  lt_cv_prog_gnu_ld=yes
++  ;;
++*)
++  lt_cv_prog_gnu_ld=no
++  ;;
++esac])
++with_gnu_ld=$lt_cv_prog_gnu_ld
++])
++m4trace:/usr/share/aclocal/libtool.m4:2107: -1- AC_DEFUN([AC_PROG_LD_RELOAD_FLAG], [AC_CACHE_CHECK([for $LD option to reload object files],
++  lt_cv_ld_reload_flag,
++  [lt_cv_ld_reload_flag='-r'])
++reload_flag=$lt_cv_ld_reload_flag
++case $reload_flag in
++"" | " "*) ;;
++*) reload_flag=" $reload_flag" ;;
++esac
++reload_cmds='$LD$reload_flag -o $output$reload_objs'
++case $host_os in
++  darwin*)
++    if test "$GCC" = yes; then
++      reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
++    else
++      reload_cmds='$LD$reload_flag -o $output$reload_objs'
++    fi
++    ;;
++esac
++])
++m4trace:/usr/share/aclocal/libtool.m4:2286: -1- AC_DEFUN([AC_DEPLIBS_CHECK_METHOD], [AC_CACHE_CHECK([how to recognise dependent libraries],
++lt_cv_deplibs_check_method,
++[lt_cv_file_magic_cmd='$MAGIC_CMD'
++lt_cv_file_magic_test_file=
++lt_cv_deplibs_check_method='unknown'
++# Need to set the preceding variable on all platforms that support
++# interlibrary dependencies.
++# 'none' -- dependencies not supported.
++# `unknown' -- same as none, but documents that we really don't know.
++# 'pass_all' -- all dependencies passed with no checks.
++# 'test_compile' -- check by making test program.
++# 'file_magic [[regex]]' -- check by looking for files in library path
++# which responds to the $file_magic_cmd with a given extended regex.
++# If you have `file' or equivalent on your system and you're not sure
++# whether `pass_all' will *always* work, you probably want this one.
++
++case $host_os in
++aix4* | aix5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++beos*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++bsdi[[45]]*)
++  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
++  lt_cv_file_magic_cmd='/usr/bin/file -L'
++  lt_cv_file_magic_test_file=/shlib/libc.so
++  ;;
++
++cygwin*)
++  # func_win32_libid is a shell function defined in ltmain.sh
++  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++  lt_cv_file_magic_cmd='func_win32_libid'
++  ;;
++
++mingw* | pw32*)
++  # Base MSYS/MinGW do not provide the 'file' command needed by
++  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
++  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++  lt_cv_file_magic_cmd='$OBJDUMP -f'
++  ;;
++
++darwin* | rhapsody*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++freebsd* | kfreebsd*-gnu)
++  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++    case $host_cpu in
++    i*86 )
++      # Not sure whether the presence of OpenBSD here was a mistake.
++      # Let's accept both of them until this is cleared up.
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
++      lt_cv_file_magic_cmd=/usr/bin/file
++      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++      ;;
++    esac
++  else
++    lt_cv_deplibs_check_method=pass_all
++  fi
++  ;;
++
++gnu*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++hpux10.20* | hpux11*)
++  lt_cv_file_magic_cmd=/usr/bin/file
++  case "$host_cpu" in
++  ia64*)
++    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
++    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
++    ;;
++  hppa*64*)
++    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
++    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
++    ;;
++  *)
++    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
++    lt_cv_file_magic_test_file=/usr/lib/libc.sl
++    ;;
++  esac
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $LD in
++  *-32|*"-32 ") libmagic=32-bit;;
++  *-n32|*"-n32 ") libmagic=N32;;
++  *-64|*"-64 ") libmagic=64-bit;;
++  *) libmagic=never-match;;
++  esac
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++# This must be Linux ELF.
++linux*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++netbsd*)
++  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
++  else
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
++  fi
++  ;;
++
++newos6*)
++  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
++  lt_cv_file_magic_cmd=/usr/bin/file
++  lt_cv_file_magic_test_file=/usr/lib/libnls.so
++  ;;
++
++nto-qnx*)
++  lt_cv_deplibs_check_method=unknown
++  ;;
++
++openbsd*)
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
++  else
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
++  fi
++  ;;
++
++osf3* | osf4* | osf5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++sco3.2v5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++solaris*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  case $host_vendor in
++  motorola)
++    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
++    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
++    ;;
++  ncr)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  sequent)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
++    ;;
++  sni)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
++    lt_cv_file_magic_test_file=/lib/libc.so
++    ;;
++  siemens)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  esac
++  ;;
++
++sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++esac
++])
++file_magic_cmd=$lt_cv_file_magic_cmd
++deplibs_check_method=$lt_cv_deplibs_check_method
++test -z "$deplibs_check_method" && deplibs_check_method=unknown
++])
++m4trace:/usr/share/aclocal/libtool.m4:2331: -1- AC_DEFUN([AC_PROG_NM], [AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
++[if test -n "$NM"; then
++  # Let the user override the test.
++  lt_cv_path_NM="$NM"
++else
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
++    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++      # Check to see if the nm accepts a BSD-compat flag.
++      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
++      #   nm: unknown option "B" ignored
++      # Tru64's nm complains that /dev/null is an invalid object file
++      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++      */dev/null* | *'Invalid file or object type'*)
++	lt_cv_path_NM="$tmp_nm -B"
++	break
++        ;;
++      *)
++	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
++	*/dev/null*)
++	  lt_cv_path_NM="$tmp_nm -p"
++	  break
++	  ;;
++	*)
++	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++	  continue # so that we can try to find one that supports BSD flags
++	  ;;
++	esac
++      esac
++    fi
++  done
++  IFS="$lt_save_ifs"
++  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
++fi])
++NM="$lt_cv_path_NM"
++])
++m4trace:/usr/share/aclocal/libtool.m4:2352: -1- AC_DEFUN([AC_CHECK_LIBM], [AC_REQUIRE([AC_CANONICAL_HOST])dnl
++LIBM=
++case $host in
++*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
++  # These system don't have libm, or don't need it
++  ;;
++*-ncr-sysv4.3*)
++  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
++  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
++  ;;
++*)
++  AC_CHECK_LIB(m, cos, LIBM="-lm")
++  ;;
++esac
++])
++m4trace:/usr/share/aclocal/libtool.m4:2377: -1- AC_DEFUN([AC_LIBLTDL_CONVENIENCE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++  case $enable_ltdl_convenience in
++  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
++  "") enable_ltdl_convenience=yes
++      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
++  esac
++  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
++  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
++  # For backwards non-gettext consistent compatibility...
++  INCLTDL="$LTDLINCL"
++])
++m4trace:/usr/share/aclocal/libtool.m4:2413: -1- AC_DEFUN([AC_LIBLTDL_INSTALLABLE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++  AC_CHECK_LIB(ltdl, lt_dlinit,
++  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
++  [if test x"$enable_ltdl_install" = xno; then
++     AC_MSG_WARN([libltdl not installed, but installation disabled])
++   else
++     enable_ltdl_install=yes
++   fi
++  ])
++  if test x"$enable_ltdl_install" = x"yes"; then
++    ac_configure_args="$ac_configure_args --enable-ltdl-install"
++    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
++    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
++  else
++    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
++    LIBLTDL="-lltdl"
++    LTDLINCL=
++  fi
++  # For backwards non-gettext consistent compatibility...
++  INCLTDL="$LTDLINCL"
++])
++m4trace:/usr/share/aclocal/libtool.m4:2421: -1- AC_DEFUN([AC_LIBTOOL_CXX], [AC_REQUIRE([_LT_AC_LANG_CXX])
++])
++m4trace:/usr/share/aclocal/libtool.m4:2430: -1- AC_DEFUN([_LT_AC_LANG_CXX], [AC_REQUIRE([AC_PROG_CXX])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
++])
++m4trace:/usr/share/aclocal/libtool.m4:2442: -1- AC_DEFUN([_LT_AC_PROG_CXXCPP], [
++AC_REQUIRE([AC_PROG_CXX])
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || 
++    (test "X$CXX" != "Xg++"))) ; then
++  AC_PROG_CXXCPP
++fi
++])
++m4trace:/usr/share/aclocal/libtool.m4:2449: -1- AC_DEFUN([AC_LIBTOOL_F77], [AC_REQUIRE([_LT_AC_LANG_F77])
++])
++m4trace:/usr/share/aclocal/libtool.m4:2457: -1- AC_DEFUN([_LT_AC_LANG_F77], [AC_REQUIRE([AC_PROG_F77])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
++])
++m4trace:/usr/share/aclocal/libtool.m4:2465: -1- AC_DEFUN([AC_LIBTOOL_GCJ], [AC_REQUIRE([_LT_AC_LANG_GCJ])
++])
++m4trace:/usr/share/aclocal/libtool.m4:2478: -1- AC_DEFUN([_LT_AC_LANG_GCJ], [AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
++  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
++    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
++      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
++	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
++	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
++])
++m4trace:/usr/share/aclocal/libtool.m4:2487: -1- AC_DEFUN([AC_LIBTOOL_RC], [AC_REQUIRE([LT_AC_PROG_RC])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
++])
++m4trace:/usr/share/aclocal/libtool.m4:2495: -1- AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
++m4trace:/usr/share/aclocal/libtool.m4:2595: -1- AC_DEFUN([_LT_AC_LANG_C_CONFIG], [lt_save_CC="$CC"
++AC_LANG_PUSH(C)
++
++# Source file extension for C test sources.
++ac_ext=c
++
++# Object file extension for compiled C test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="int some_variable = 0;\n"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code='int main(){return(0);}\n'
++
++_LT_AC_SYS_COMPILER
++
++#
++# Check for any special shared library compilation flags.
++#
++_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
++if test "$GCC" = no; then
++  case $host_os in
++  sco3.2v5*)
++    _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
++    ;;
++  esac
++fi
++if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
++  AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
++  if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ 	]]" >/dev/null; then :
++  else
++    AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
++    _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
++  fi
++fi
++
++
++#
++# Check to make sure the static flag actually works.
++#
++AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
++  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
++  $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
++  [],
++  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
++
++
++## CAVEAT EMPTOR:
++## There is no encapsulation within the following macros, do not change
++## the running order or otherwise move them around unless you know exactly
++## what you are doing...
++AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
++AC_LIBTOOL_PROG_COMPILER_PIC($1)
++AC_LIBTOOL_PROG_CC_C_O($1)
++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
++AC_LIBTOOL_PROG_LD_SHLIBS($1)
++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
++AC_LIBTOOL_SYS_LIB_STRIP
++AC_LIBTOOL_DLOPEN_SELF($1)
++
++# Report which librarie types wil actually be built
++AC_MSG_CHECKING([if libtool supports shared libraries])
++AC_MSG_RESULT([$can_build_shared])
++
++AC_MSG_CHECKING([whether to build shared libraries])
++test "$can_build_shared" = "no" && enable_shared=no
++
++# On AIX, shared libraries and static libraries use the same namespace, and
++# are all built from PIC.
++case "$host_os" in
++aix3*)
++  test "$enable_shared" = yes && enable_static=no
++  if test -n "$RANLIB"; then
++    archive_cmds="$archive_cmds~\$RANLIB \$lib"
++    postinstall_cmds='$RANLIB $lib'
++  fi
++  ;;
++
++aix4* | aix5*)
++  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++    test "$enable_shared" = yes && enable_static=no
++  fi
++    ;;
++esac
++AC_MSG_RESULT([$enable_shared])
++
++AC_MSG_CHECKING([whether to build static libraries])
++# Make sure either enable_shared or enable_static is yes.
++test "$enable_shared" = yes || enable_static=yes
++AC_MSG_RESULT([$enable_static])
++
++AC_LIBTOOL_CONFIG($1)
++
++AC_LANG_POP
++CC="$lt_save_CC"
++])
++m4trace:/usr/share/aclocal/libtool.m4:2603: -1- AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
++m4trace:/usr/share/aclocal/libtool.m4:3529: -1- AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], [AC_LANG_PUSH(C++)
++AC_REQUIRE([AC_PROG_CXX])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
++
++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++_LT_AC_TAGVAR(allow_undefined_flag, $1)=
++_LT_AC_TAGVAR(always_export_symbols, $1)=no
++_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
++_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++_LT_AC_TAGVAR(hardcode_direct, $1)=no
++_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
++_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++_LT_AC_TAGVAR(hardcode_automatic, $1)=no
++_LT_AC_TAGVAR(module_cmds, $1)=
++_LT_AC_TAGVAR(module_expsym_cmds, $1)=
++_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_AC_TAGVAR(no_undefined_flag, $1)=
++_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
++
++# Dependencies to place before and after the object being linked:
++_LT_AC_TAGVAR(predep_objects, $1)=
++_LT_AC_TAGVAR(postdep_objects, $1)=
++_LT_AC_TAGVAR(predeps, $1)=
++_LT_AC_TAGVAR(postdeps, $1)=
++_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
++
++# Source file extension for C++ test sources.
++ac_ext=cc
++
++# Object file extension for compiled C++ test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="int some_variable = 0;\n"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_AC_SYS_COMPILER
++
++# Allow CC to be a program name with arguments.
++lt_save_CC=$CC
++lt_save_LD=$LD
++lt_save_GCC=$GCC
++GCC=$GXX
++lt_save_with_gnu_ld=$with_gnu_ld
++lt_save_path_LD=$lt_cv_path_LD
++if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
++  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
++else
++  unset lt_cv_prog_gnu_ld
++fi
++if test -n "${lt_cv_path_LDCXX+set}"; then
++  lt_cv_path_LD=$lt_cv_path_LDCXX
++else
++  unset lt_cv_path_LD
++fi
++test -z "${LDCXX+set}" || LD=$LDCXX
++CC=${CXX-"c++"}
++compiler=$CC
++_LT_AC_TAGVAR(compiler, $1)=$CC
++cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++
++# We don't want -fno-exception wen compiling C++ code, so set the
++# no_builtin_flag separately
++if test "$GXX" = yes; then
++  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
++else
++  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
++fi
++
++if test "$GXX" = yes; then
++  # Set up default GNU C++ configuration
++
++  AC_PROG_LD
++
++  # Check if GNU C++ uses GNU ld as the underlying linker, since the
++  # archiving commands below assume that GNU ld is being used.
++  if test "$with_gnu_ld" = yes; then
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
++    #     investigate it a little bit more. (MM)
++    wlarc='${wl}'
++
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
++	grep 'no-whole-archive' > /dev/null; then
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    else
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++    fi
++  else
++    with_gnu_ld=no
++    wlarc=
++
++    # A generic and very simple default shared library creation
++    # command for GNU C++ for the case where it uses the native
++    # linker, instead of GNU ld.  If possible, this setting should
++    # overridden to take advantage of the native linker features on
++    # the platform it is being used on.
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++  fi
++
++  # Commands to make compiler produce verbose output that lists
++  # what "hidden" libraries, object files and flags are used when
++  # linking a shared library.
++  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++
++else
++  GXX=no
++  with_gnu_ld=no
++  wlarc=
++fi
++
++# PORTME: fill in a description of your system's C++ link characteristics
++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
++_LT_AC_TAGVAR(ld_shlibs, $1)=yes
++case $host_os in
++  aix3*)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  aix4* | aix5*)
++    if test "$host_cpu" = ia64; then
++      # On IA64, the linker does run time linking by default, so we don't
++      # have to do anything special.
++      aix_use_runtimelinking=no
++      exp_sym_flag='-Bexport'
++      no_entry_flag=""
++    else
++      aix_use_runtimelinking=no
++
++      # Test if we are trying to use run time linking or normal
++      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++      # need to do runtime linking.
++      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++	for ld_flag in $LDFLAGS; do
++	  case $ld_flag in
++	  *-brtl*)
++	    aix_use_runtimelinking=yes
++	    break
++	    ;;
++	  esac
++	done
++      esac
++
++      exp_sym_flag='-bexport'
++      no_entry_flag='-bnoentry'
++    fi
++
++    # When large executables or shared objects are built, AIX ld can
++    # have problems creating the table of contents.  If linking a library
++    # or program results in "error TOC overflow" add -mminimal-toc to
++    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++    _LT_AC_TAGVAR(archive_cmds, $1)=''
++    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++
++    if test "$GXX" = yes; then
++      case $host_os in aix4.[012]|aix4.[012].*)
++      # We only want to do this on AIX 4.2 and lower, the check
++      # below for broken collect2 doesn't work under 4.3+
++	collect2name=`${CC} -print-prog-name=collect2`
++	if test -f "$collect2name" && \
++	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	then
++	  # We have reworked collect2
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++	else
++	  # We have old collect2
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
++	  # It fails to find uninstalled libraries when the uninstalled
++	  # path is not listed in the libpath.  Setting hardcode_minus_L
++	  # to unsupported forces relinking
++	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++	fi
++      esac
++      shared_flag='-shared'
++    else
++      # not using gcc
++      if test "$host_cpu" = ia64; then
++	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++	# chokes on -Wl,-G. The following line is correct:
++	shared_flag='-G'
++      else
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag='${wl}-G'
++	else
++	  shared_flag='${wl}-bM:SRE'
++	fi
++      fi
++    fi
++
++    # It seems that -bexpall does not export symbols beginning with
++    # underscore (_), so it is better to generate a list of symbols to export.
++    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
++    if test "$aix_use_runtimelinking" = yes; then
++      # Warning - without using the other runtime loading flags (-brtl),
++      # -berok will link without error, but may produce a broken library.
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
++      # Determine the default libpath from the value encoded in an empty executable.
++      _LT_AC_SYS_LIBPATH_AIX
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++     else
++      if test "$host_cpu" = ia64; then
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++      else
++	# Determine the default libpath from the value encoded in an empty executable.
++	_LT_AC_SYS_LIBPATH_AIX
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++	# Warning - without using the other run time loading flags,
++	# -berok will link without error, but may produce a broken library.
++	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
++	# -bexpall does not export symbols beginning with underscore (_)
++	_LT_AC_TAGVAR(always_export_symbols, $1)=yes
++	# Exported symbols can be pulled into shared objects from archives
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
++	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++	# This is similar to how AIX traditionally builds it's shared libraries.
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++      fi
++    fi
++    ;;
++  chorus*)
++    case $cc_basename in
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
++    ;;
++
++
++  cygwin* | mingw* | pw32*)
++    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
++    # as there is no search path for DLLs.
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++    _LT_AC_TAGVAR(always_export_symbols, $1)=no
++    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++
++    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++      # If the export-symbols file already is a .def file (1st line
++      # is EXPORTS), use it as is; otherwise, prepend...
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	cp $export_symbols $output_objdir/$soname.def;
++      else
++	echo EXPORTS > $output_objdir/$soname.def;
++	cat $export_symbols >> $output_objdir/$soname.def;
++      fi~
++      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++    else
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    fi
++  ;;
++      darwin* | rhapsody*)
++        case "$host_os" in
++        rhapsody* | darwin1.[[012]])
++         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[[012]])
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++        esac
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++
++    if test "$GXX" = yes ; then
++      lt_int_apple_cc_single_mod=no
++      output_verbose_link_cmd='echo'
++      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
++       lt_int_apple_cc_single_mod=yes
++      fi
++      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      else
++          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++        fi
++        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          else
++            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          fi
++            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      else
++      case "$cc_basename" in
++        xlc*)
++         output_verbose_link_cmd='echo'
++          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         _LT_AC_TAGVAR(ld_shlibs, $1)=no
++          ;;
++      esac
++      fi
++        ;;
++
++  dgux*)
++    case $cc_basename in
++      ec++)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      ghcx)
++	# Green Hills C++ Compiler
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
++    ;;
++  freebsd[12]*)
++    # C++ shared libraries reported to be fairly broken before switch to ELF
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  freebsd-elf*)
++    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    ;;
++  freebsd* | kfreebsd*-gnu)
++    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
++    # conventions
++    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
++    ;;
++  gnu*)
++    ;;
++  hpux9*)
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
++				# but as the default
++				# location of the library.
++
++    case $cc_basename in
++    CC)
++      # FIXME: insert proper C++ library support
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      ;;
++    aCC)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      # Commands to make compiler produce verbose output that lists
++      # what "hidden" libraries, object files and flags are used when
++      # linking a shared library.
++      #
++      # There doesn't appear to be a way to prevent this compiler from
++      # explicitly linking system object files so we need to strip them
++      # from the output so that they don't get included in the library
++      # dependencies.
++      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++      ;;
++    *)
++      if test "$GXX" = yes; then
++        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      else
++        # FIXME: insert proper C++ library support
++        _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++    esac
++    ;;
++  hpux10*|hpux11*)
++    if test $with_gnu_ld = no; then
++      case "$host_cpu" in
++      hppa*64*)
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++        ;;
++      ia64*)
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++        ;;
++      *)
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++        ;;
++      esac
++    fi
++    case "$host_cpu" in
++    hppa*64*)
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++    ia64*)
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
++					      # but as the default
++					      # location of the library.
++      ;;
++    *)
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
++					      # but as the default
++					      # location of the library.
++      ;;
++    esac
++
++    case $cc_basename in
++      CC)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      aCC)
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++	  ;;
++	*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  ;;
++	esac
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes; then
++	  if test $with_gnu_ld = no; then
++	    case "$host_cpu" in
++	    ia64*|hppa*64*)
++	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++	      ;;
++	    *)
++	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	      ;;
++	    esac
++	  fi
++	else
++	  # FIXME: insert proper C++ library support
++	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
++	fi
++	;;
++    esac
++    ;;
++  irix5* | irix6*)
++    case $cc_basename in
++      CC)
++	# SGI C++
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++
++	# Archives containing C++ object files must be created using
++	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
++	# necessary to make sure instantiated templates are included
++	# in the archive.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
++	;;
++      *)
++	if test "$GXX" = yes; then
++	  if test "$with_gnu_ld" = no; then
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	  else
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
++	  fi
++	fi
++	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++	;;
++    esac
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++    ;;
++  linux*)
++    case $cc_basename in
++      KCC)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
++
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++
++	# Archives containing C++ object files must be created using
++	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
++	;;
++      icpc)
++	# Intel C++
++	with_gnu_ld=yes
++	# version 8.0 and above of icpc choke on multiply defined symbols
++	# if we add $predep_objects and $postdep_objects, however 7.1 and
++	# earlier do not add the objects themselves.
++	case `$CC -V 2>&1` in
++	*"Version 7."*)
++  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	*)  # Version 8.0 or newer
++  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	esac
++	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
++	;;
++      cxx)
++	# Compaq C++
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
++
++	runpath_var=LD_RUN_PATH
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++    esac
++    ;;
++  lynxos*)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  m88k*)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  mvs*)
++    case $cc_basename in
++      cxx)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
++    ;;
++  netbsd*)
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
++      wlarc=
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    fi
++    # Workaround some broken pre-1.5 toolchains
++    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
++    ;;
++  openbsd2*)
++    # C++ shared libraries are fairly broken
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  openbsd*)
++    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    fi
++    output_verbose_link_cmd='echo'
++    ;;
++  osf3*)
++    case $cc_basename in
++      KCC)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
++
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	# Archives containing C++ object files must be created using
++	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
++
++	;;
++      RCC)
++	# Rational C++ 2.4.1
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      cxx)
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	  # Commands to make compiler produce verbose output that lists
++	  # what "hidden" libraries, object files and flags are used when
++	  # linking a shared library.
++	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++
++	else
++	  # FIXME: insert proper C++ library support
++	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
++	fi
++	;;
++    esac
++    ;;
++  osf4* | osf5*)
++    case $cc_basename in
++      KCC)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
++
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	# Archives containing C++ object files must be created using
++	# the KAI C++ compiler.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
++	;;
++      RCC)
++	# Rational C++ 2.4.1
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      cxx)
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
++	  echo "-hidden">> $lib.exp~
++	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
++	  $rm $lib.exp'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	  # Commands to make compiler produce verbose output that lists
++	  # what "hidden" libraries, object files and flags are used when
++	  # linking a shared library.
++	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++
++	else
++	  # FIXME: insert proper C++ library support
++	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
++	fi
++	;;
++    esac
++    ;;
++  psos*)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  sco*)
++    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    case $cc_basename in
++      CC)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
++    ;;
++  sunos4*)
++    case $cc_basename in
++      CC)
++	# Sun C++ 4.x
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      lcc)
++	# Lucid
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
++    ;;
++  solaris*)
++    case $cc_basename in
++      CC)
++	# Sun C++ 4.2, 5.x and Centerline C++
++	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++	case $host_os in
++	  solaris2.[0-5] | solaris2.[0-5].*) ;;
++	  *)
++	    # The C++ compiler is used as linker so we must use $wl
++	    # flag to pass the commands to the underlying system
++	    # linker.
++	    # Supported since Solaris 2.6 (maybe 2.5.1?)
++	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    ;;
++	esac
++	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++
++	# Archives containing C++ object files must be created using
++	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
++	# necessary to make sure instantiated templates are included
++	# in the archive.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
++	;;
++      gcx)
++	# Green Hills C++ Compiler
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++
++	# The C++ compiler must be used to create the archive.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
++	;;
++      *)
++	# GNU C++ compiler with Solaris linker
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
++	  if $CC --version | grep -v '^2\.7' > /dev/null; then
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
++	  else
++	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
++	    # platform.
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
++	  fi
++
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
++	fi
++	;;
++    esac
++    ;;
++  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
++    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    ;;
++  tandem*)
++    case $cc_basename in
++      NCC)
++	# NonStop-UX NCC 3.20
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
++    ;;
++  vxworks*)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  *)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++esac
++AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
++test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
++
++_LT_AC_TAGVAR(GCC, $1)="$GXX"
++_LT_AC_TAGVAR(LD, $1)="$LD"
++
++## CAVEAT EMPTOR:
++## There is no encapsulation within the following macros, do not change
++## the running order or otherwise move them around unless you know exactly
++## what you are doing...
++AC_LIBTOOL_POSTDEP_PREDEP($1)
++AC_LIBTOOL_PROG_COMPILER_PIC($1)
++AC_LIBTOOL_PROG_CC_C_O($1)
++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
++AC_LIBTOOL_PROG_LD_SHLIBS($1)
++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
++AC_LIBTOOL_SYS_LIB_STRIP
++AC_LIBTOOL_DLOPEN_SELF($1)
++
++AC_LIBTOOL_CONFIG($1)
++
++AC_LANG_POP
++CC=$lt_save_CC
++LDCXX=$LD
++LD=$lt_save_LD
++GCC=$lt_save_GCC
++with_gnu_ldcxx=$with_gnu_ld
++with_gnu_ld=$lt_save_with_gnu_ld
++lt_cv_path_LDCXX=$lt_cv_path_LD
++lt_cv_path_LD=$lt_save_path_LD
++lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
++lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
++])
++m4trace:/usr/share/aclocal/libtool.m4:3665: -1- AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP], [
++dnl we can't use the lt_simple_compile_test_code here,
++dnl because it contains code intended for an executable,
++dnl not a library.  It's possible we should let each
++dnl tag define a new lt_????_link_test_code variable,
++dnl but it's only used here...
++ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
++int a;
++void foo (void) { a = 0; }
++EOF
++],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
++class Foo
++{
++public:
++  Foo (void) { a = 0; }
++private:
++  int a;
++};
++EOF
++],[$1],[F77],[cat > conftest.$ac_ext <<EOF
++      subroutine foo
++      implicit none
++      integer*4 a
++      a=0
++      return
++      end
++EOF
++],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
++public class foo {
++  private int a;
++  public void bar (void) {
++    a = 0;
++  }
++};
++EOF
++])
++dnl Parse the compiler output and extract the necessary
++dnl objects, libraries and library flags.
++if AC_TRY_EVAL(ac_compile); then
++  # Parse the compiler output and extract the necessary
++  # objects, libraries and library flags.
++
++  # Sentinel used to keep track of whether or not we are before
++  # the conftest object file.
++  pre_test_object_deps_done=no
++
++  # The `*' in the case matches for architectures that use `case' in
++  # $output_verbose_cmd can trigger glob expansion during the loop
++  # eval without this substitution.
++  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
++
++  for p in `eval $output_verbose_link_cmd`; do
++    case $p in
++
++    -L* | -R* | -l*)
++       # Some compilers place space between "-{L,R}" and the path.
++       # Remove the space.
++       if test $p = "-L" \
++	  || test $p = "-R"; then
++	 prev=$p
++	 continue
++       else
++	 prev=
++       fi
++
++       if test "$pre_test_object_deps_done" = no; then
++	 case $p in
++	 -L* | -R*)
++	   # Internal compiler library paths should come after those
++	   # provided the user.  The postdeps already come after the
++	   # user supplied libs so there is no need to process them.
++	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
++	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
++	   else
++	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
++	   fi
++	   ;;
++	 # The "-l" case would never come before the object being
++	 # linked, so don't bother handling this case.
++	 esac
++       else
++	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
++	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
++	 else
++	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
++	 fi
++       fi
++       ;;
++
++    *.$objext)
++       # This assumes that the test object file only shows up
++       # once in the compiler output.
++       if test "$p" = "conftest.$objext"; then
++	 pre_test_object_deps_done=yes
++	 continue
++       fi
++
++       if test "$pre_test_object_deps_done" = no; then
++	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
++	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
++	 else
++	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
++	 fi
++       else
++	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
++	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
++	 else
++	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
++	 fi
++       fi
++       ;;
++
++    *) ;; # Ignore the rest.
++
++    esac
++  done
++
++  # Clean up.
++  rm -f a.out a.exe
++else
++  echo "libtool.m4: error: problem compiling $1 test program"
++fi
++
++$rm -f confest.$objext
++
++case " $_LT_AC_TAGVAR(postdeps, $1) " in
++*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
++esac
++])
++m4trace:/usr/share/aclocal/libtool.m4:3672: -1- AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
++m4trace:/usr/share/aclocal/libtool.m4:3764: -1- AC_DEFUN([_LT_AC_LANG_F77_CONFIG], [AC_REQUIRE([AC_PROG_F77])
++AC_LANG_PUSH(Fortran 77)
++
++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++_LT_AC_TAGVAR(allow_undefined_flag, $1)=
++_LT_AC_TAGVAR(always_export_symbols, $1)=no
++_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
++_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++_LT_AC_TAGVAR(hardcode_direct, $1)=no
++_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
++_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++_LT_AC_TAGVAR(hardcode_automatic, $1)=no
++_LT_AC_TAGVAR(module_cmds, $1)=
++_LT_AC_TAGVAR(module_expsym_cmds, $1)=
++_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_AC_TAGVAR(no_undefined_flag, $1)=
++_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
++
++# Source file extension for f77 test sources.
++ac_ext=f
++
++# Object file extension for compiled f77 test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code="      program t\n      end\n"
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_AC_SYS_COMPILER
++
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${F77-"f77"}
++compiler=$CC
++_LT_AC_TAGVAR(compiler, $1)=$CC
++cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++
++AC_MSG_CHECKING([if libtool supports shared libraries])
++AC_MSG_RESULT([$can_build_shared])
++
++AC_MSG_CHECKING([whether to build shared libraries])
++test "$can_build_shared" = "no" && enable_shared=no
++
++# On AIX, shared libraries and static libraries use the same namespace, and
++# are all built from PIC.
++case "$host_os" in
++aix3*)
++  test "$enable_shared" = yes && enable_static=no
++  if test -n "$RANLIB"; then
++    archive_cmds="$archive_cmds~\$RANLIB \$lib"
++    postinstall_cmds='$RANLIB $lib'
++  fi
++  ;;
++aix4* | aix5*)
++  test "$enable_shared" = yes && enable_static=no
++  ;;
++esac
++AC_MSG_RESULT([$enable_shared])
++
++AC_MSG_CHECKING([whether to build static libraries])
++# Make sure either enable_shared or enable_static is yes.
++test "$enable_shared" = yes || enable_static=yes
++AC_MSG_RESULT([$enable_static])
++
++test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
++
++_LT_AC_TAGVAR(GCC, $1)="$G77"
++_LT_AC_TAGVAR(LD, $1)="$LD"
++
++AC_LIBTOOL_PROG_COMPILER_PIC($1)
++AC_LIBTOOL_PROG_CC_C_O($1)
++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
++AC_LIBTOOL_PROG_LD_SHLIBS($1)
++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
++AC_LIBTOOL_SYS_LIB_STRIP
++
++
++AC_LIBTOOL_CONFIG($1)
++
++AC_LANG_POP
++CC="$lt_save_CC"
++])
++m4trace:/usr/share/aclocal/libtool.m4:3772: -1- AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
++m4trace:/usr/share/aclocal/libtool.m4:3819: -1- AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG], [AC_LANG_SAVE
++
++# Source file extension for Java test sources.
++ac_ext=java
++
++# Object file extension for compiled Java test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="class foo {}\n"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_AC_SYS_COMPILER
++
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${GCJ-"gcj"}
++compiler=$CC
++_LT_AC_TAGVAR(compiler, $1)=$CC
++
++# GCJ did not exist at the time GCC didn't implicitly link libc in.
++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++
++## CAVEAT EMPTOR:
++## There is no encapsulation within the following macros, do not change
++## the running order or otherwise move them around unless you know exactly
++## what you are doing...
++AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
++AC_LIBTOOL_PROG_COMPILER_PIC($1)
++AC_LIBTOOL_PROG_CC_C_O($1)
++AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
++AC_LIBTOOL_PROG_LD_SHLIBS($1)
++AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
++AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
++AC_LIBTOOL_SYS_LIB_STRIP
++AC_LIBTOOL_DLOPEN_SELF($1)
++
++AC_LIBTOOL_CONFIG($1)
++
++AC_LANG_RESTORE
++CC="$lt_save_CC"
++])
++m4trace:/usr/share/aclocal/libtool.m4:3827: -1- AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
++m4trace:/usr/share/aclocal/libtool.m4:3858: -1- AC_DEFUN([_LT_AC_LANG_RC_CONFIG], [AC_LANG_SAVE
++
++# Source file extension for RC test sources.
++ac_ext=rc
++
++# Object file extension for compiled RC test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
++
++# Code to be used in simple link tests
++lt_simple_link_test_code="$lt_simple_compile_test_code"
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_AC_SYS_COMPILER
++
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${RC-"windres"}
++compiler=$CC
++_LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
++
++AC_LIBTOOL_CONFIG($1)
++
++AC_LANG_RESTORE
++CC="$lt_save_CC"
++])
++m4trace:/usr/share/aclocal/libtool.m4:4343: -1- AC_DEFUN([AC_LIBTOOL_CONFIG], [# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # See if we are running on zsh, and set the options which allow our commands through
++  # without removal of \ escapes.
++  if test -n "${ZSH_VERSION+set}" ; then
++    setopt NO_GLOB_SUBST
++  fi
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++    SED SHELL STRIP \
++    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++    deplibs_check_method reload_flag reload_cmds need_locks \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    old_postinstall_cmds old_postuninstall_cmds \
++    _LT_AC_TAGVAR(compiler, $1) \
++    _LT_AC_TAGVAR(CC, $1) \
++    _LT_AC_TAGVAR(LD, $1) \
++    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
++    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
++    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
++    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
++    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
++    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
++    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
++    _LT_AC_TAGVAR(old_archive_cmds, $1) \
++    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
++    _LT_AC_TAGVAR(predep_objects, $1) \
++    _LT_AC_TAGVAR(postdep_objects, $1) \
++    _LT_AC_TAGVAR(predeps, $1) \
++    _LT_AC_TAGVAR(postdeps, $1) \
++    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
++    _LT_AC_TAGVAR(archive_cmds, $1) \
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
++    _LT_AC_TAGVAR(postinstall_cmds, $1) \
++    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
++    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
++    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
++    _LT_AC_TAGVAR(no_undefined_flag, $1) \
++    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
++    _LT_AC_TAGVAR(hardcode_automatic, $1) \
++    _LT_AC_TAGVAR(module_cmds, $1) \
++    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
++    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
++    _LT_AC_TAGVAR(exclude_expsyms, $1) \
++    _LT_AC_TAGVAR(include_expsyms, $1); do
++
++    case $var in
++    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
++    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
++    _LT_AC_TAGVAR(archive_cmds, $1) | \
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
++    _LT_AC_TAGVAR(module_cmds, $1) | \
++    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
++    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
++    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  case $lt_echo in
++  *'\[$]0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
++    ;;
++  esac
++
++ifelse([$1], [],
++  [cfgfile="${ofile}T"
++  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
++  $rm -f "$cfgfile"
++  AC_MSG_NOTICE([creating $ofile])],
++  [cfgfile="$ofile"])
++
++  cat <<__EOF__ >> "$cfgfile"
++ifelse([$1], [],
++[#! $SHELL
++
++# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
++# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
++# NOTE: Changes made to this file will be lost: look at ltmain.sh.
++#
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
++# Free Software Foundation, Inc.
++#
++# This file is part of GNU Libtool:
++# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# A sed program that does not truncate output.
++SED=$lt_SED
++
++# Sed that helps us avoid accidentally triggering echo(1) options like -n.
++Xsed="$SED -e s/^X//"
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++
++# The names of the tagged configurations supported by this script.
++available_tags=
++
++# ### BEGIN LIBTOOL CONFIG],
++[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
++
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
++
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
++
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
++
++# A C compiler.
++LTCC=$lt_LTCC
++
++# A language-specific compiler.
++CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
++
++# Is the compiler the GNU C compiler?
++with_gcc=$_LT_AC_TAGVAR(GCC, $1)
++
++# An ERE matcher.
++EGREP=$lt_EGREP
++
++# The linker used to build libraries.
++LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
++
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
++
++# A BSD-compatible nm program.
++NM=$lt_NM
++
++# A symbol stripping program
++STRIP=$lt_STRIP
++
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
++# How to pass a linker flag through the compiler.
++wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
++
++# Object file suffix (normally "o").
++objext="$ac_objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
++
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
++pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
++pic_mode=$pic_mode
++
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
++
++# Must we lock files when doing compilation ?
++need_locks=$lt_need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
++
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
++
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
++
++# Library versioning type.
++version_type=$version_type
++
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
++
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
++
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
++
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
++
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
++archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
++
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
++module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
++
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
++
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
++
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
++
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
++
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
++
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
++
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# How to hardcode a shared library path into an executable.
++hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
++
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
++
++# If ld is used when linking, flag to hardcode \$libdir into
++# a binary during linking. This must work even if \$libdir does
++# not exist.
++hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
++
++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
++
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
++
++# Set to yes if building a shared library automatically hardcodes DIR into the library
++# and all subsequent libraries and executables linked against it.
++hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
++
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
++
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
++
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
++
++# Set to yes if exported symbols are required.
++always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
++
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
++
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
++
++# Symbols that must always be exported.
++include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
++
++ifelse([$1],[],
++[# ### END LIBTOOL CONFIG],
++[# ### END LIBTOOL TAG CONFIG: $tagname])
++
++__EOF__
++
++ifelse([$1],[], [
++  case $host_os in
++  aix3*)
++    cat <<\EOF >> "$cfgfile"
++
++# AIX sometimes has problems with the GCC collect2 program.  For some
++# reason, if we set the COLLECT_NAMES environment variable, the problems
++# vanish in a puff of smoke.
++if test "X${COLLECT_NAMES+set}" != Xset; then
++  COLLECT_NAMES=
++  export COLLECT_NAMES
++fi
++EOF
++    ;;
++  esac
++
++  # We use sed instead of cat because bash on DJGPP gets confused if
++  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
++  # text mode, it properly converts lines to CR/LF.  This bash problem
++  # is reportedly fixed, but why not run on old versions too?
++  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
++
++  mv -f "$cfgfile" "$ofile" || \
++    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
++  chmod +x "$ofile"
++])
++else
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
++fi
++])
++m4trace:/usr/share/aclocal/libtool.m4:4361: -1- AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++
++_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
++
++if test "$GCC" = yes; then
++  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
++
++  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
++    lt_cv_prog_compiler_rtti_exceptions,
++    [-fno-rtti -fno-exceptions], [],
++    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
++fi
++])
++m4trace:/usr/share/aclocal/libtool.m4:4554: -1- AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_REQUIRE([AC_CANONICAL_HOST])
++AC_REQUIRE([AC_PROG_NM])
++AC_REQUIRE([AC_OBJEXT])
++# Check for command to grab the raw symbol name followed by C symbol from nm.
++AC_MSG_CHECKING([command to parse $NM output from $compiler object])
++AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
++[
++# These are sane defaults that work on at least a few old systems.
++# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
++
++# Character class describing NM global symbol codes.
++symcode='[[BCDEGRST]]'
++
++# Regexp to match symbols that can be accessed directly from C.
++sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
++
++# Transform the above into a raw symbol and a C symbol.
++symxfrm='\1 \2\3 \3'
++
++# Transform an extracted symbol line into a proper C declaration
++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
++
++# Transform an extracted symbol line into symbol name and symbol address
++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++
++# Define system-specific variables.
++case $host_os in
++aix*)
++  symcode='[[BCDT]]'
++  ;;
++cygwin* | mingw* | pw32*)
++  symcode='[[ABCDGISTW]]'
++  ;;
++hpux*) # Its linker distinguishes data from code symbols
++  if test "$host_cpu" = ia64; then
++    symcode='[[ABCDEGRST]]'
++  fi
++  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++  ;;
++linux*)
++  if test "$host_cpu" = ia64; then
++    symcode='[[ABCDGIRSTW]]'
++    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++  fi
++  ;;
++irix* | nonstopux*)
++  symcode='[[BCDEGRST]]'
++  ;;
++osf*)
++  symcode='[[BCDEGQRST]]'
++  ;;
++solaris* | sysv5*)
++  symcode='[[BDRT]]'
++  ;;
++sysv4)
++  symcode='[[DFNSTU]]'
++  ;;
++esac
++
++# Handle CRLF in mingw tool chain
++opt_cr=
++case $build_os in
++mingw*)
++  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
++  ;;
++esac
++
++# If we're using GNU nm, then use its standard symbol codes.
++case `$NM -V 2>&1` in
++*GNU* | *'with BFD'*)
++  symcode='[[ABCDGIRSTW]]' ;;
++esac
++
++# Try without a prefix undercore, then with it.
++for ac_symprfx in "" "_"; do
++
++  # Write the raw and C identifiers.
++  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++
++  # Check to see that the pipe works correctly.
++  pipe_works=no
++
++  rm -f conftest*
++  cat > conftest.$ac_ext <<EOF
++#ifdef __cplusplus
++extern "C" {
++#endif
++char nm_test_var;
++void nm_test_func(){}
++#ifdef __cplusplus
++}
++#endif
++int main(){nm_test_var='a';nm_test_func();return(0);}
++EOF
++
++  if AC_TRY_EVAL(ac_compile); then
++    # Now try to grab the symbols.
++    nlist=conftest.nm
++    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
++      # Try sorting and uniquifying the output.
++      if sort "$nlist" | uniq > "$nlist"T; then
++	mv -f "$nlist"T "$nlist"
++      else
++	rm -f "$nlist"T
++      fi
++
++      # Make sure that we snagged all the symbols we need.
++      if grep ' nm_test_var$' "$nlist" >/dev/null; then
++	if grep ' nm_test_func$' "$nlist" >/dev/null; then
++	  cat <<EOF > conftest.$ac_ext
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++EOF
++	  # Now generate the symbol file.
++	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
++
++	  cat <<EOF >> conftest.$ac_ext
++#if defined (__STDC__) && __STDC__
++# define lt_ptr_t void *
++#else
++# define lt_ptr_t char *
++# define const
++#endif
++
++/* The mapping between symbol names and symbols. */
++const struct {
++  const char *name;
++  lt_ptr_t address;
++}
++lt_preloaded_symbols[[]] =
++{
++EOF
++	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
++	  cat <<\EOF >> conftest.$ac_ext
++  {0, (lt_ptr_t) 0}
++};
++
++#ifdef __cplusplus
++}
++#endif
++EOF
++	  # Now try linking the two files.
++	  mv conftest.$ac_objext conftstm.$ac_objext
++	  lt_save_LIBS="$LIBS"
++	  lt_save_CFLAGS="$CFLAGS"
++	  LIBS="conftstm.$ac_objext"
++	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
++	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
++	    pipe_works=yes
++	  fi
++	  LIBS="$lt_save_LIBS"
++	  CFLAGS="$lt_save_CFLAGS"
++	else
++	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
++	fi
++      else
++	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
++      fi
++    else
++      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
++    fi
++  else
++    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
++    cat conftest.$ac_ext >&5
++  fi
++  rm -f conftest* conftst*
++
++  # Do not use the global_symbol_pipe unless it works.
++  if test "$pipe_works" = yes; then
++    break
++  else
++    lt_cv_sys_global_symbol_pipe=
++  fi
++done
++])
++if test -z "$lt_cv_sys_global_symbol_pipe"; then
++  lt_cv_sys_global_symbol_to_cdecl=
++fi
++if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
++  AC_MSG_RESULT(failed)
++else
++  AC_MSG_RESULT(ok)
++fi
++])
++m4trace:/usr/share/aclocal/libtool.m4:5035: -1- AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], [_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
++_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
++
++AC_MSG_CHECKING([for $compiler option to produce PIC])
++ ifelse([$1],[CXX],[
++  # C++ specific cases for pic, static, wl, etc.
++  if test "$GXX" = yes; then
++    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++
++    case $host_os in
++    aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      fi
++      ;;
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
++      ;;
++    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++    mingw* | os2* | pw32*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++      ;;
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
++      ;;
++    *djgpp*)
++      # DJGPP does not support shared libraries at all
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++      ;;
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
++      fi
++      ;;
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	;;
++      *)
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	;;
++      esac
++      ;;
++    *)
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++      ;;
++    esac
++  else
++    case $host_os in
++      aix4* | aix5*)
++	# All AIX code is PIC.
++	if test "$host_cpu" = ia64; then
++	  # AIX 5 now supports IA64 processor
++	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	else
++	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
++	fi
++	;;
++      chorus*)
++	case $cc_basename in
++	cxch68)
++	  # Green Hills C++ Compiler
++	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
++	  ;;
++	esac
++	;;
++       darwin*)
++         # PIC is the default on this platform
++         # Common symbols not allowed in MH_DYLIB files
++         case "$cc_basename" in
++           xlc*)
++           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++           ;;
++         esac
++       ;;
++      dgux*)
++	case $cc_basename in
++	  ec++)
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    ;;
++	  ghcx)
++	    # Green Hills C++ Compiler
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      freebsd* | kfreebsd*-gnu)
++	# FreeBSD uses GNU C++
++	;;
++      hpux9* | hpux10* | hpux11*)
++	case $cc_basename in
++	  CC)
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
++	    if test "$host_cpu" != ia64; then
++	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
++	    fi
++	    ;;
++	  aCC)
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
++	    case "$host_cpu" in
++	    hppa*64*|ia64*)
++	      # +Z the default
++	      ;;
++	    *)
++	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
++	      ;;
++	    esac
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      irix5* | irix6* | nonstopux*)
++	case $cc_basename in
++	  CC)
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++	    # CC pic flag -KPIC is the default.
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      linux*)
++	case $cc_basename in
++	  KCC)
++	    # KAI C++ Compiler
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	    ;;
++	  icpc)
++	    # Intel C++
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++	    ;;
++	  cxx)
++	    # Compaq C++
++	    # Make sure the PIC flag is empty.  It appears that all Alpha
++	    # Linux and Compaq Tru64 Unix objects are PIC.
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      lynxos*)
++	;;
++      m88k*)
++	;;
++      mvs*)
++	case $cc_basename in
++	  cxx)
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      netbsd*)
++	;;
++      osf3* | osf4* | osf5*)
++	case $cc_basename in
++	  KCC)
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
++	    ;;
++	  RCC)
++	    # Rational C++ 2.4.1
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++	    ;;
++	  cxx)
++	    # Digital/Compaq C++
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    # Make sure the PIC flag is empty.  It appears that all Alpha
++	    # Linux and Compaq Tru64 Unix objects are PIC.
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      psos*)
++	;;
++      sco*)
++	case $cc_basename in
++	  CC)
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      solaris*)
++	case $cc_basename in
++	  CC)
++	    # Sun C++ 4.2, 5.x and Centerline C++
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++	    ;;
++	  gcx)
++	    # Green Hills C++ Compiler
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      sunos4*)
++	case $cc_basename in
++	  CC)
++	    # Sun C++ 4.x
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	    ;;
++	  lcc)
++	    # Lucid
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      tandem*)
++	case $cc_basename in
++	  NCC)
++	    # NonStop-UX NCC 3.20
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      unixware*)
++	;;
++      vxworks*)
++	;;
++      *)
++	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++	;;
++    esac
++  fi
++],
++[
++  if test "$GCC" = yes; then
++    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++
++    case $host_os in
++      aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      fi
++      ;;
++
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
++      ;;
++
++    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++      ;;
++
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
++      ;;
++
++    msdosdjgpp*)
++      # Just because we use GCC doesn't mean we suddenly get shared libraries
++      # on systems that don't support them.
++      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++      enable_shared=no
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
++      fi
++      ;;
++
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	;;
++      esac
++      ;;
++
++    *)
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++      ;;
++    esac
++  else
++    # PORTME Check for flag to pass linker flags through the system compiler.
++    case $host_os in
++    aix*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      else
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
++      fi
++      ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case "$cc_basename" in
++         xlc*)
++         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++         ;;
++       esac
++       ;;
++
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++      ;;
++
++    hpux9* | hpux10* | hpux11*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
++	;;
++      esac
++      # Is there a better lt_prog_compiler_static that works with the bundled CC?
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      # PIC (with -KPIC) is the default.
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++      ;;
++
++    newsos6)
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
++    linux*)
++      case $CC in
++      icc* | ecc*)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++        ;;
++      ccc*)
++        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++        # All Alpha code is PIC.
++        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++        ;;
++      esac
++      ;;
++
++    osf3* | osf4* | osf5*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      # All OSF/1 code is PIC.
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++      ;;
++
++    sco3.2v5*)
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
++      ;;
++
++    solaris*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
++    sunos4*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
++    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      fi
++      ;;
++
++    uts4*)
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
++    *)
++      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++      ;;
++    esac
++  fi
++])
++AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
++
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
++  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
++    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
++    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
++    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
++     "" | " "*) ;;
++     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
++     esac],
++    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
++fi
++case "$host_os" in
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++    ;;
++  *)
++    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
++    ;;
++esac
++])
++m4trace:/usr/share/aclocal/libtool.m4:5869: -1- AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
++ifelse([$1],[CXX],[
++  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  case $host_os in
++  aix4* | aix5*)
++    # If we're using GNU nm, then we don't want the "-C" option.
++    # -C means demangle to AIX nm, but means don't demangle with GNU nm
++    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
++      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
++    else
++      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
++    fi
++    ;;
++  pw32*)
++    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
++  ;;
++  cygwin* | mingw*)
++    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++  ;;
++  *)
++    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  ;;
++  esac
++],[
++  runpath_var=
++  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
++  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
++  _LT_AC_TAGVAR(archive_cmds, $1)=
++  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
++  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
++  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
++  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
++  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
++  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++  _LT_AC_TAGVAR(hardcode_direct, $1)=no
++  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
++  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
++  _LT_AC_TAGVAR(module_cmds, $1)=
++  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
++  _LT_AC_TAGVAR(always_export_symbols, $1)=no
++  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  # include_expsyms should be a list of space-separated symbols to be *always*
++  # included in the symbol list
++  _LT_AC_TAGVAR(include_expsyms, $1)=
++  # exclude_expsyms can be an extended regexp of symbols to exclude
++  # it will be wrapped by ` (' and `)$', so one must not match beginning or
++  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++  # as well as any symbol that contains `d'.
++  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
++  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++  # platforms (ab)use it in PIC code, but their linkers get confused if
++  # the symbol is explicitly referenced.  Since portable code cannot
++  # rely on this symbol name, it's probably fine to never include it in
++  # preloaded symbol tables.
++  extract_expsyms_cmds=
++
++  case $host_os in
++  cygwin* | mingw* | pw32*)
++    # FIXME: the MSVC++ port hasn't been tested in a loooong time
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    if test "$GCC" != yes; then
++      with_gnu_ld=no
++    fi
++    ;;
++  openbsd*)
++    with_gnu_ld=no
++    ;;
++  esac
++
++  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
++  if test "$with_gnu_ld" = yes; then
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    wlarc='${wl}'
++
++    # See if GNU ld supports shared libraries.
++    case $host_os in
++    aix3* | aix4* | aix5*)
++      # On AIX/PPC, the GNU linker is very broken
++      if test "$host_cpu" != ia64; then
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	cat <<EOF 1>&2
++
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
++
++EOF
++      fi
++      ;;
++
++    amigaos*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++
++      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
++      # that the semantics of dynamic libraries on AmigaOS, at least up
++      # to version 4, is to share data among multiple programs linked
++      # with the same dynamic library.  Since this doesn't match the
++      # behavior of shared libraries on other platforms, we can't use
++      # them.
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      ;;
++
++    beos*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++	# support --undefined.  This deserves some investigation.  FIXME
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
++      # as there is no search path for DLLs.
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++      _LT_AC_TAGVAR(always_export_symbols, $1)=no
++      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++
++      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++	# If the export-symbols file already is a .def file (1st line
++	# is EXPORTS), use it as is; otherwise, prepend...
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	  cp $export_symbols $output_objdir/$soname.def;
++	else
++	  echo EXPORTS > $output_objdir/$soname.def;
++	  cat $export_symbols >> $output_objdir/$soname.def;
++	fi~
++	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
++    netbsd*)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++	wlarc=
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      fi
++      ;;
++
++    solaris* | sysv5*)
++      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	cat <<EOF 1>&2
++
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++EOF
++      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++
++    sunos4*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      wlarc=
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++  linux*)
++    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
++      supports_anon_versioning=no
++      case `$LD -v 2>/dev/null` in
++        *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
++        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++        *\ 2.11.*) ;; # other 2.11 versions
++        *) supports_anon_versioning=yes ;;
++      esac
++      if test $supports_anon_versioning = yes; then
++        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
++cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++$echo "local: *; };" >> $output_objdir/$libname.ver~
++        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++      else
++        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds"
++      fi
++    else
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    fi
++    ;;
++
++    *)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++    esac
++
++    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
++      runpath_var=LD_RUN_PATH
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++      # ancient GNU ld didn't support --whole-archive et. al.
++      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++ 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++      fi
++    fi
++  else
++    # PORTME fill in a description of your system's linker (not GNU ld)
++    case $host_os in
++    aix3*)
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
++      # Note: this linker hardcodes the directories in LIBPATH if there
++      # are no directories specified by -L.
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      if test "$GCC" = yes && test -z "$link_static_flag"; then
++	# Neither direct hardcoding nor static linking is supported with a
++	# broken collect2.
++	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
++      fi
++      ;;
++
++    aix4* | aix5*)
++      if test "$host_cpu" = ia64; then
++	# On IA64, the linker does run time linking by default, so we don't
++	# have to do anything special.
++	aix_use_runtimelinking=no
++	exp_sym_flag='-Bexport'
++	no_entry_flag=""
++      else
++	# If we're using GNU nm, then we don't want the "-C" option.
++	# -C means demangle to AIX nm, but means don't demangle with GNU nm
++	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
++	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
++	else
++	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
++	fi
++	aix_use_runtimelinking=no
++
++	# Test if we are trying to use run time linking or normal
++	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
++	# need to do runtime linking.
++	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++	  for ld_flag in $LDFLAGS; do
++  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++  	    aix_use_runtimelinking=yes
++  	    break
++  	  fi
++	  done
++	esac
++
++	exp_sym_flag='-bexport'
++	no_entry_flag='-bnoentry'
++      fi
++
++      # When large executables or shared objects are built, AIX ld can
++      # have problems creating the table of contents.  If linking a library
++      # or program results in "error TOC overflow" add -mminimal-toc to
++      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++      _LT_AC_TAGVAR(archive_cmds, $1)=''
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++
++      if test "$GCC" = yes; then
++	case $host_os in aix4.[012]|aix4.[012].*)
++	# We only want to do this on AIX 4.2 and lower, the check
++	# below for broken collect2 doesn't work under 4.3+
++	  collect2name=`${CC} -print-prog-name=collect2`
++	  if test -f "$collect2name" && \
++  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	  then
++  	  # We have reworked collect2
++  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++	  else
++  	  # We have old collect2
++  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
++  	  # It fails to find uninstalled libraries when the uninstalled
++  	  # path is not listed in the libpath.  Setting hardcode_minus_L
++  	  # to unsupported forces relinking
++  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++	  fi
++	esac
++	shared_flag='-shared'
++      else
++	# not using gcc
++	if test "$host_cpu" = ia64; then
++  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++  	# chokes on -Wl,-G. The following line is correct:
++	  shared_flag='-G'
++	else
++  	if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag='${wl}-G'
++	  else
++	    shared_flag='${wl}-bM:SRE'
++  	fi
++	fi
++      fi
++
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
++      if test "$aix_use_runtimelinking" = yes; then
++	# Warning - without using the other runtime loading flags (-brtl),
++	# -berok will link without error, but may produce a broken library.
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
++       # Determine the default libpath from the value encoded in an empty executable.
++       _LT_AC_SYS_LIBPATH_AIX
++       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++       else
++	if test "$host_cpu" = ia64; then
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
++	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++	else
++	 # Determine the default libpath from the value encoded in an empty executable.
++	 _LT_AC_SYS_LIBPATH_AIX
++	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++	  # Warning - without using the other run time loading flags,
++	  # -berok will link without error, but may produce a broken library.
++	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
++	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
++	  # -bexpall does not export symbols beginning with underscore (_)
++	  _LT_AC_TAGVAR(always_export_symbols, $1)=yes
++	  # Exported symbols can be pulled into shared objects from archives
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
++	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++	  # This is similar to how AIX traditionally builds it's shared libraries.
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	fi
++      fi
++      ;;
++
++    amigaos*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      # see comment about different semantics on the GNU ld section
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      ;;
++
++    bsdi[[45]]*)
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # When not using gcc, we currently assume that we are using
++      # Microsoft Visual C++.
++      # hardcode_libdir_flag_spec is actually meaningless, as there is
++      # no search path for DLLs.
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++      # Tell ltmain to make .lib files, not .a files.
++      libext=lib
++      # Tell ltmain to make .dll files, not .so files.
++      shrext_cmds=".dll"
++      # FIXME: Setting linknames here is a bad hack.
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      # The linker will automatically build a .lib file if we build a DLL.
++      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
++      # FIXME: Should let the user specify the lib program.
++      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++      ;;
++
++    darwin* | rhapsody*)
++      case "$host_os" in
++        rhapsody* | darwin1.[[012]])
++         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[[012]])
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++      esac
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++    else
++      case "$cc_basename" in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         _LT_AC_TAGVAR(ld_shlibs, $1)=no
++          ;;
++      esac
++    fi
++      ;;
++
++    dgux*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    freebsd1*)
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      ;;
++
++    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++    # support.  Future versions do this automatically, but an explicit c++rt0.o
++    # does not break anything, and helps significantly (at the cost of a little
++    # extra space).
++    freebsd2.2*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++    freebsd2*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++    freebsd* | kfreebsd*-gnu)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    hpux9*)
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++
++      # hardcode_minus_L: Not really in the search PATH,
++      # but as the default location of the library.
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      ;;
++
++    hpux10* | hpux11*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	esac
++      else
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	esac
++      fi
++      if test "$with_gnu_ld" = no; then
++	case "$host_cpu" in
++	hppa*64*)
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
++	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
++	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++	  ;;
++	ia64*)
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
++	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++	  ;;
++	*)
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++	  ;;
++	esac
++      fi
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++      ;;
++
++    netbsd*)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    newsos6)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    openbsd*)
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      else
++       case $host_os in
++	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
++	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	   ;;
++	 *)
++	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	   ;;
++       esac
++      fi
++      ;;
++
++    os2*)
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++      ;;
++
++    osf3*)
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++      ;;
++
++    osf4* | osf5*)	# as osf3* with the addition of -msym flag
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      else
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++
++	# Both c and cxx compiler support -rpath directly
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++      ;;
++
++    sco3.2v5*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
++      runpath_var=LD_RUN_PATH
++      hardcode_runpath_var=yes
++      ;;
++
++    solaris*)
++      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      case $host_os in
++      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
++      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++      esac
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++      ;;
++
++    sunos4*)
++      if test "x$host_vendor" = xsequent; then
++	# Use $CC to link under sequent, because it throws in some extra .o
++	# files that make .init and .fini sections work.
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    sysv4)
++      case $host_vendor in
++	sni)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
++	;;
++	siemens)
++	  ## LD is ld it makes a PLAMLIB
++	  ## CC just makes a GrossModule.
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
++        ;;
++	motorola)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
++	;;
++      esac
++      runpath_var='LD_RUN_PATH'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    sysv4.3*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++	runpath_var=LD_RUN_PATH
++	hardcode_runpath_var=yes
++	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
++      fi
++      ;;
++
++    sysv4.2uw2*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      hardcode_runpath_var=yes
++      runpath_var=LD_RUN_PATH
++      ;;
++
++   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
++      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
++      runpath_var='LD_RUN_PATH'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    sysv5*)
++      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
++      # $CC -shared without GNU ld will not create a library from C++
++      # object files and a static libstdc++, better avoid it by now
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      runpath_var='LD_RUN_PATH'
++      ;;
++
++    uts4*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    *)
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      ;;
++    esac
++  fi
++])
++AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
++test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
++#
++# Do we need to explicitly link libc?
++#
++case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
++x|xyes)
++  # Assume -lc should be added
++  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++
++  if test "$enable_shared" = yes && test "$GCC" = yes; then
++    case $_LT_AC_TAGVAR(archive_cmds, $1) in
++    *'~'*)
++      # FIXME: we may have to deal with multi-command sequences.
++      ;;
++    '$CC '*)
++      # Test whether the compiler implicitly links with -lc since on some
++      # systems, -lgcc has to come before -lc. If gcc already passes -lc
++      # to ld, don't add -lc before -lgcc.
++      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
++      $rm conftest*
++      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        libobjs=conftest.$ac_objext
++        deplibs=
++        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
++        compiler_flags=-v
++        linker_flags=-v
++        verstring=
++        output_objdir=.
++        libname=conftest
++        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
++        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
++        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
++        then
++	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++        else
++	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++        fi
++        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
++      else
++        cat conftest.err 1>&5
++      fi
++      $rm conftest*
++      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
++      ;;
++    esac
++  fi
++  ;;
++esac
++])
++m4trace:/usr/share/aclocal/libtool.m4:5909: -1- AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
++# /* ltdll.c starts here */
++# #define WIN32_LEAN_AND_MEAN
++# #include <windows.h>
++# #undef WIN32_LEAN_AND_MEAN
++# #include <stdio.h>
++#
++# #ifndef __CYGWIN__
++# #  ifdef __CYGWIN32__
++# #    define __CYGWIN__ __CYGWIN32__
++# #  endif
++# #endif
++#
++# #ifdef __cplusplus
++# extern "C" {
++# #endif
++# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
++# #ifdef __cplusplus
++# }
++# #endif
++#
++# #ifdef __CYGWIN__
++# #include <cygwin/cygwin_dll.h>
++# DECLARE_CYGWIN_DLL( DllMain );
++# #endif
++# HINSTANCE __hDllInstance_base;
++#
++# BOOL APIENTRY
++# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
++# {
++#   __hDllInstance_base = hInst;
++#   return TRUE;
++# }
++# /* ltdll.c ends here */
++])
++m4trace:/usr/share/aclocal/libtool.m4:5914: -1- AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
++m4trace:/usr/share/aclocal/libtool.m4:5918: -1- AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL])
++m4trace:/usr/share/aclocal/libtool.m4:5919: -1- AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
++m4trace:/usr/share/aclocal/libtool.m4:5920: -1- AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
++m4trace:/usr/share/aclocal/libtool.m4:5921: -1- AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
++m4trace:/usr/share/aclocal/libtool.m4:5922: -1- AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
++m4trace:/usr/share/aclocal/libtool.m4:5923: -1- AC_DEFUN([AM_PROG_LD], [AC_PROG_LD])
++m4trace:/usr/share/aclocal/libtool.m4:5924: -1- AC_DEFUN([AM_PROG_NM], [AC_PROG_NM])
++m4trace:/usr/share/aclocal/libtool.m4:5933: -1- AC_DEFUN([LT_AC_PROG_GCJ], [AC_CHECK_TOOL(GCJ, gcj, no)
++  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
++  AC_SUBST(GCJFLAGS)
++])
++m4trace:/usr/share/aclocal/libtool.m4:5937: -1- AC_DEFUN([LT_AC_PROG_RC], [AC_CHECK_TOOL(RC, windres, no)
++])
++m4trace:/usr/share/aclocal/libtool.m4:6000: -1- AC_DEFUN([LT_AC_PROG_SED], [AC_MSG_CHECKING([for a sed that does not truncate output])
++AC_CACHE_VAL(lt_cv_path_SED,
++[# Loop through the user's path and test for sed and gsed.
++# Then use that list of sed's as ones to test for truncation.
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for lt_ac_prog in sed gsed; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
++      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
++        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
++      fi
++    done
++  done
++done
++lt_ac_max=0
++lt_ac_count=0
++# Add /usr/xpg4/bin/sed as it is typically found on Solaris
++# along with /bin/sed that truncates output.
++for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
++  test ! -f $lt_ac_sed && break
++  cat /dev/null > conftest.in
++  lt_ac_count=0
++  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
++  # Check for GNU sed and select it if it is found.
++  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
++    lt_cv_path_SED=$lt_ac_sed
++    break
++  fi
++  while true; do
++    cat conftest.in conftest.in >conftest.tmp
++    mv conftest.tmp conftest.in
++    cp conftest.in conftest.nl
++    echo >>conftest.nl
++    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
++    cmp -s conftest.out conftest.nl || break
++    # 10000 chars as input seems more than enough
++    test $lt_ac_count -gt 10 && break
++    lt_ac_count=`expr $lt_ac_count + 1`
++    if test $lt_ac_count -gt $lt_ac_max; then
++      lt_ac_max=$lt_ac_count
++      lt_cv_path_SED=$lt_ac_sed
++    fi
++  done
++done
++])
++SED=$lt_cv_path_SED
++AC_MSG_RESULT([$SED])
++])
++m4trace:/usr/share/aclocal-1.9/amversion.m4:23: -1- AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
++m4trace:/usr/share/aclocal-1.9/amversion.m4:30: -1- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], [AM_AUTOMAKE_VERSION([1.9.4])])
++m4trace:/usr/share/aclocal-1.9/auxdir.m4:63: -1- AC_DEFUN([AM_AUX_DIR_EXPAND], [dnl Rely on autoconf to set up CDPATH properly.
++AC_PREREQ([2.50])dnl
++# expand $ac_aux_dir to an absolute path
++am_aux_dir=`cd $ac_aux_dir && pwd`
++])
++m4trace:/usr/share/aclocal-1.9/cond.m4:42: -1- 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])
++if $2; then
++  $1_TRUE=
++  $1_FALSE='#'
++else
++  $1_TRUE='#'
++  $1_FALSE=
++fi
++AC_CONFIG_COMMANDS_PRE(
++[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
++  AC_MSG_ERROR([[conditional "$1" was never defined.
++Usually this means the macro was only invoked conditionally.]])
++fi])])
++m4trace:/usr/share/aclocal-1.9/depend.m4:142: -1- AC_DEFUN([_AM_DEPENDENCIES], [AC_REQUIRE([AM_SET_DEPDIR])dnl
++AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
++AC_REQUIRE([AM_MAKE_INCLUDE])dnl
++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], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
++                   [depcc="$$1"   am_compiler_list=])
++
++AC_CACHE_CHECK([dependency style of $depcc],
++               [am_cv_$1_dependencies_compiler_type],
++[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
++  # We make a subdir and do the tests there.  Otherwise we can end up
++  # making bogus files that we don't know about and never remove.  For
++  # instance it was reported that on HP-UX the gcc test will end up
++  # making a dummy file named `D' -- because `-MD' means `put the output
++  # in D'.
++  mkdir conftest.dir
++  # Copy depcomp to subdir because otherwise we won't find it if we're
++  # using a relative directory.
++  cp "$am_depcomp" conftest.dir
++  cd conftest.dir
++  # We will build objects and dependencies in a subdirectory because
++  # it helps to detect inapplicable dependency modes.  For instance
++  # both Tru64's cc and ICC support -MD to output dependencies as a
++  # side effect of compilation, but ICC will put the dependencies in
++  # the current directory while Tru64 will put them in the object
++  # directory.
++  mkdir sub
++
++  am_cv_$1_dependencies_compiler_type=none
++  if test "$am_compiler_list" = ""; then
++     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
++  fi
++  for depmode in $am_compiler_list; do
++    # Setup a source with many dependencies, because some compilers
++    # like to wrap large dependency lists on column 80 (with \), and
++    # we should not choose a depcomp mode which is confused by this.
++    #
++    # We need to recreate these files for each test, as the compiler may
++    # overwrite some of them when testing with obscure command lines.
++    # This happens at least with the AIX C compiler.
++    : > sub/conftest.c
++    for i in 1 2 3 4 5 6; do
++      echo '#include "conftst'$i'.h"' >> sub/conftest.c
++      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
++      # Solaris 8's {/usr,}/bin/sh.
++      touch sub/conftst$i.h
++    done
++    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
++
++    case $depmode in
++    nosideeffect)
++      # after this tag, mechanisms are not by side-effect, so they'll
++      # only be used when explicitly requested
++      if test "x$enable_dependency_tracking" = xyes; then
++	continue
++      else
++	break
++      fi
++      ;;
++    none) break ;;
++    esac
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.
++    if depmode=$depmode \
++       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
++       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++         >/dev/null 2>conftest.err &&
++       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
++       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
++      # icc doesn't choke on unknown options, it will just issue warnings
++      # or remarks (even with -Werror).  So we grep stderr for any message
++      # that says an option was ignored or not supported.
++      # When given -MP, icc 7.0 and 7.1 complain thusly:
++      #   icc: Command line warning: ignoring option '-M'; no argument required
++      # The diagnosis changed in icc 8.0:
++      #   icc: Command line remark: option '-MP' not supported
++      if (grep 'ignoring option' conftest.err ||
++          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
++        am_cv_$1_dependencies_compiler_type=$depmode
++        break
++      fi
++    fi
++  done
++
++  cd ..
++  rm -rf conftest.dir
++else
++  am_cv_$1_dependencies_compiler_type=none
++fi
++])
++AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
++AM_CONDITIONAL([am__fastdep$1], [
++  test "x$enable_dependency_tracking" != xno \
++  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
++])
++m4trace:/usr/share/aclocal-1.9/depend.m4:152: -1- AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
++AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
++])
++m4trace:/usr/share/aclocal-1.9/depend.m4:167: -1- AC_DEFUN([AM_DEP_TRACK], [AC_ARG_ENABLE(dependency-tracking,
++[  --disable-dependency-tracking  speeds up one-time build
++  --enable-dependency-tracking   do not reject slow dependency extractors])
++if test "x$enable_dependency_tracking" != xno; then
++  am_depcomp="$ac_aux_dir/depcomp"
++  AMDEPBACKSLASH='\'
++fi
++AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
++AC_SUBST([AMDEPBACKSLASH])
++])
++m4trace:/usr/share/aclocal-1.9/depout.m4:64: -1- AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [for mf in $CONFIG_FILES; do
++  # Strip MF so we end up with the name of the file.
++  mf=`echo "$mf" | sed -e 's/:.*$//'`
++  # Check whether this is an Automake generated Makefile or not.
++  # We used to match only the files named `Makefile.in', but
++  # 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
++    dirpart=`AS_DIRNAME("$mf")`
++  else
++    continue
++  fi
++  # Extract the definition of DEPDIR, am__include, and am__quote
++  # from the Makefile without running `make'.
++  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
++  test -z "$DEPDIR" && continue
++  am__include=`sed -n 's/^am__include = //p' < "$mf"`
++  test -z "am__include" && continue
++  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++  # When using ansi2knr, U may be empty or an underscore; expand it
++  U=`sed -n 's/^U = //p' < "$mf"`
++  # Find all dependency output files, they are included files with
++  # $(DEPDIR) in their names.  We invoke sed twice because it is the
++  # simplest approach to changing $(DEPDIR) to its actual value in the
++  # expansion.
++  for file in `sed -n "
++    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
++       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
++    # Make sure the directory exists.
++    test -f "$dirpart/$file" && continue
++    fdir=`AS_DIRNAME(["$file"])`
++    AS_MKDIR_P([$dirpart/$fdir])
++    # echo "creating $dirpart/$file"
++    echo '# dummy' > "$dirpart/$file"
++  done
++done
++])
++m4trace:/usr/share/aclocal-1.9/depout.m4:78: -1- AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles],
++     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
++     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
++])
++m4trace:/usr/share/aclocal-1.9/header.m4:23: -1- AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
++m4trace:/usr/share/aclocal-1.9/header.m4:23: -1- AC_DEFUN([AM_CONFIG_HEADER], [AC_DIAGNOSE([obsolete], [The macro `AM_CONFIG_HEADER' is obsolete.
++You should run autoupdate.])dnl
++AC_CONFIG_HEADERS($@)])
++m4trace:/usr/share/aclocal-1.9/init.m4:103: -1- AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.58])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])
++fi
++
++# test whether we have cygpath
++if test -z "$CYGPATH_W"; then
++  if (cygpath --version) >/dev/null 2>/dev/null; then
++    CYGPATH_W='cygpath -w'
++  else
++    CYGPATH_W=echo
++  fi
++fi
++AC_SUBST([CYGPATH_W])
++
++# Define the identity of the package.
++dnl Distinguish between old-style and new-style calls.
++m4_ifval([$2],
++[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
++ AC_SUBST([PACKAGE], [$1])dnl
++ AC_SUBST([VERSION], [$2])],
++[_AM_SET_OPTIONS([$1])dnl
++ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
++ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
++
++_AM_IF_OPTION([no-define],,
++[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
++ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
++
++# Some tools Automake needs.
++AC_REQUIRE([AM_SANITY_CHECK])dnl
++AC_REQUIRE([AC_ARG_PROGRAM])dnl
++AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
++AM_MISSING_PROG(AUTOCONF, autoconf)
++AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
++AM_MISSING_PROG(AUTOHEADER, autoheader)
++AM_MISSING_PROG(MAKEINFO, makeinfo)
++AM_PROG_INSTALL_SH
++AM_PROG_INSTALL_STRIP
++AC_REQUIRE([AM_PROG_MKDIR_P])dnl
++# We need awk for the "check" target.  The system "awk" is bad on
++# some platforms.
++AC_REQUIRE([AC_PROG_AWK])dnl
++AC_REQUIRE([AC_PROG_MAKE_SET])dnl
++AC_REQUIRE([AM_SET_LEADING_DOT])dnl
++_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
++              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
++	      		     [_AM_PROG_TAR([v7])])])
++_AM_IF_OPTION([no-dependencies],,
++[AC_PROVIDE_IFELSE([AC_PROG_CC],
++                  [_AM_DEPENDENCIES(CC)],
++                  [define([AC_PROG_CC],
++                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
++AC_PROVIDE_IFELSE([AC_PROG_CXX],
++                  [_AM_DEPENDENCIES(CXX)],
++                  [define([AC_PROG_CXX],
++                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
++])
++])
++m4trace:/usr/share/aclocal-1.9/init.m4:124: -1- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers.
++_am_stamp_count=1
++for _am_header in $config_headers :; do
++  case $_am_header in
++    $1 | $1:* )
++      break ;;
++    * )
++      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
++  esac
++done
++echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
++m4trace:/usr/share/aclocal-1.9/install-sh.m4:25: -1- AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++install_sh=${install_sh-"$am_aux_dir/install-sh"}
++AC_SUBST(install_sh)])
++m4trace:/usr/share/aclocal-1.9/lead-dot.m4:32: -1- AC_DEFUN([AM_SET_LEADING_DOT], [rm -rf .tst 2>/dev/null
++mkdir .tst 2>/dev/null
++if test -d .tst; then
++  am__leading_dot=.
++else
++  am__leading_dot=_
++fi
++rmdir .tst 2>/dev/null
++AC_SUBST([am__leading_dot])])
++m4trace:/usr/share/aclocal-1.9/maintainer.m4:37: -1- AC_DEFUN([AM_MAINTAINER_MODE], [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
++  dnl maintainer-mode is disabled by default
++  AC_ARG_ENABLE(maintainer-mode,
++[  --enable-maintainer-mode  enable make rules and dependencies not useful
++			  (and sometimes confusing) to the casual installer],
++      USE_MAINTAINER_MODE=$enableval,
++      USE_MAINTAINER_MODE=no)
++  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
++  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
++  MAINT=$MAINTAINER_MODE_TRUE
++  AC_SUBST(MAINT)dnl
++
++])
++m4trace:/usr/share/aclocal-1.9/maintainer.m4:39: -1- AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
++m4trace:/usr/share/aclocal-1.9/maintainer.m4:39: -1- AC_DEFUN([jm_MAINTAINER_MODE], [AC_DIAGNOSE([obsolete], [The macro `jm_MAINTAINER_MODE' is obsolete.
++You should run autoupdate.])dnl
++AM_MAINTAINER_MODE])
++m4trace:/usr/share/aclocal-1.9/make.m4:62: -1- AC_DEFUN([AM_MAKE_INCLUDE], [am_make=${MAKE-make}
++cat > confinc << 'END'
++am__doit:
++	@echo done
++.PHONY: am__doit
++END
++# If we don't find an include directive, just comment out the code.
++AC_MSG_CHECKING([for style of include used by $am_make])
++am__include="#"
++am__quote=
++_am_result=none
++# First try GNU make style include.
++echo "include confinc" > confmf
++# We grep out `Entering directory' and `Leaving directory'
++# messages which can occur if `w' ends up in MAKEFLAGS.
++# In particular we don't look at `^make:' because GNU make might
++# be invoked under some other name (usually "gmake"), in which
++# case it prints its new name instead of `make'.
++if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
++   am__include=include
++   am__quote=
++   _am_result=GNU
++fi
++# Now try BSD make style include.
++if test "$am__include" = "#"; then
++   echo '.include "confinc"' > confmf
++   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
++      am__include=.include
++      am__quote="\""
++      _am_result=BSD
++   fi
++fi
++AC_SUBST([am__include])
++AC_SUBST([am__quote])
++AC_MSG_RESULT([$_am_result])
++rm -f confinc confmf
++])
++m4trace:/usr/share/aclocal-1.9/missing.m4:31: -1- AC_DEFUN([AM_MISSING_PROG], [AC_REQUIRE([AM_MISSING_HAS_RUN])
++$1=${$1-"${am_missing_run}$2"}
++AC_SUBST($1)])
++m4trace:/usr/share/aclocal-1.9/missing.m4:48: -1- AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
++# Use eval to expand $SHELL
++if eval "$MISSING --run true"; then
++  am_missing_run="$MISSING --run "
++else
++  am_missing_run=
++  AC_MSG_WARN([`missing' script is too old or missing])
++fi
++])
++m4trace:/usr/share/aclocal-1.9/mkdirp.m4:73: -1- 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])])
++m4trace:/usr/share/aclocal-1.9/options.m4:25: -1- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
++m4trace:/usr/share/aclocal-1.9/options.m4:31: -1- AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
++m4trace:/usr/share/aclocal-1.9/options.m4:37: -1- AC_DEFUN([_AM_SET_OPTIONS], [AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
++m4trace:/usr/share/aclocal-1.9/options.m4:43: -1- AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
++m4trace:/usr/share/aclocal-1.9/runlog.m4:27: -1- AC_DEFUN([AM_RUN_LOG], [{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
++   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
++   ac_status=$?
++   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++   (exit $ac_status); }])
++m4trace:/usr/share/aclocal-1.9/sanity.m4:63: -1- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane])
++# Just in case
++sleep 1
++echo timestamp > conftest.file
++# Do `set' in a subshell so we don't clobber the current shell's
++# arguments.  Must try -L first in case configure is actually a
++# symlink; some systems play weird games with the mod time of symlinks
++# (eg FreeBSD returns the mod time of the symlink's containing
++# directory).
++if (
++   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
++   if test "$[*]" = "X"; then
++      # -L didn't work.
++      set X `ls -t $srcdir/configure conftest.file`
++   fi
++   rm -f conftest.file
++   if test "$[*]" != "X $srcdir/configure conftest.file" \
++      && test "$[*]" != "X conftest.file $srcdir/configure"; then
++
++      # If neither matched, then we have a broken ls.  This can happen
++      # 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".
++      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
++alias in your environment])
++   fi
++
++   test "$[2]" = conftest.file
++   )
++then
++   # Ok.
++   :
++else
++   AC_MSG_ERROR([newly created file is older than distributed files!
++Check your system clock])
++fi
++AC_MSG_RESULT(yes)])
++m4trace:/usr/share/aclocal-1.9/strip.m4:38: -1- AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
++# Installed binaries are usually stripped using `strip' when the user
++# run `make install-strip'.  However `strip' might not be the right
++# tool to use in cross-compilation environments, therefore Automake
++# will honor the `STRIP' environment variable to overrule this program.
++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"
++AC_SUBST([INSTALL_STRIP_PROGRAM])])
++m4trace:/usr/share/aclocal-1.9/tar.m4:107: -1- AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility.
++AM_MISSING_PROG([AMTAR], [tar])
++m4_if([$1], [v7],
++     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
++     [m4_case([$1], [ustar],, [pax],,
++              [m4_fatal([Unknown tar format])])
++AC_MSG_CHECKING([how to create a $1 tar archive])
++# Loop over all known methods to create a tar archive until one works.
++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
++_am_tools=${am_cv_prog_tar_$1-$_am_tools}
++# Do not fold the above two line into one, because Tru64 sh and
++# Solaris sh will not grok spaces in the rhs of `-'.
++for _am_tool in $_am_tools
++do
++  case $_am_tool in
++  gnutar)
++    for _am_tar in tar gnutar gtar;
++    do
++      AM_RUN_LOG([$_am_tar --version]) && break
++    done
++    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
++    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
++    am__untar="$_am_tar -xf -"
++    ;;
++  plaintar)
++    # Must skip GNU tar: if it does not support --format= it doesn't create
++    # ustar tarball either.
++    (tar --version) >/dev/null 2>&1 && continue
++    am__tar='tar chf - "$$tardir"'
++    am__tar_='tar chf - "$tardir"'
++    am__untar='tar xf -'
++    ;;
++  pax)
++    am__tar='pax -L -x $1 -w "$$tardir"'
++    am__tar_='pax -L -x $1 -w "$tardir"'
++    am__untar='pax -r'
++    ;;
++  cpio)
++    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
++    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
++    am__untar='cpio -i -H $1 -d'
++    ;;
++  none)
++    am__tar=false
++    am__tar_=false
++    am__untar=false
++    ;;
++  esac
++
++  # If the value was cached, stop now.  We just wanted to have am__tar
++  # and am__untar set.
++  test -n "${am_cv_prog_tar_$1}" && break
++
++  # tar/untar a dummy directory, and stop if the command works
++  rm -rf conftest.dir
++  mkdir conftest.dir
++  echo GrepMe > conftest.dir/file
++  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
++  rm -rf conftest.dir
++  if test -s conftest.tar; then
++    AM_RUN_LOG([$am__untar <conftest.tar])
++    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
++  fi
++done
++rm -rf conftest.dir
++
++AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
++AC_MSG_RESULT([$am_cv_prog_tar_$1])])
++AC_SUBST([am__tar])
++AC_SUBST([am__untar])
++])
++m4trace:acinclude.m4:18: -1- AC_DEFUN([AC_C_RESTRICT], [AC_MSG_CHECKING([for restrict])
++    ac_cv_c_restrict=no
++    for ac_kw in restrict __restrict__ __restrict; do
++	AC_TRY_COMPILE([],[char * $ac_kw p;],[ac_cv_c_restrict=$ac_kw; break])
++    done
++    AC_MSG_RESULT([$ac_cv_c_restrict])
++    case $ac_cv_c_restrict in
++	restrict) ;;
++	no)	AC_DEFINE([restrict],,
++		    [Define as `__restrict' if that's what the C compiler calls
++		    it, or to nothing if it is not supported.]) ;;
++	*)	AC_DEFINE_UNQUOTED([restrict],$ac_cv_c_restrict) ;;
++    esac])
++m4trace:acinclude.m4:36: -1- AC_DEFUN([AC_C_ALWAYS_INLINE], [AC_C_INLINE
++    if test x"$GCC" = x"yes" -a x"$ac_cv_c_inline" = x"inline"; then
++	AC_MSG_CHECKING([for always_inline])
++	SAVE_CFLAGS="$CFLAGS"
++	CFLAGS="$CFLAGS -Wall -Werror"
++	AC_TRY_COMPILE([],[__attribute__ ((__always_inline__)) void f (void);],
++	    [ac_cv_always_inline=yes],[ac_cv_always_inline=no])
++	CFLAGS="$SAVE_CFLAGS"
++	AC_MSG_RESULT([$ac_cv_always_inline])
++	if test x"$ac_cv_always_inline" = x"yes"; then
++	    AC_DEFINE_UNQUOTED([inline],[__attribute__ ((__always_inline__))])
++	fi
++    fi])
++m4trace:acinclude.m4:52: -1- AC_DEFUN([AC_C_ATTRIBUTE_ALIGNED], [AC_CACHE_CHECK([__attribute__ ((aligned ())) support],
++	[ac_cv_c_attribute_aligned],
++	[ac_cv_c_attribute_aligned=0
++	for ac_cv_c_attr_align_try in 2 4 8 16 32 64; do
++	    AC_TRY_COMPILE([],
++		[static char c __attribute__ ((aligned($ac_cv_c_attr_align_try))) = 0; return c;],
++		[ac_cv_c_attribute_aligned=$ac_cv_c_attr_align_try])
++	done])
++    if test x"$ac_cv_c_attribute_aligned" != x"0"; then
++	AC_DEFINE_UNQUOTED([ATTRIBUTE_ALIGNED_MAX],
++	    [$ac_cv_c_attribute_aligned],[maximum supported data alignment])
++    fi])
++m4trace:acinclude.m4:67: -1- AC_DEFUN([AC_TRY_CFLAGS], [AC_MSG_CHECKING([if $CC supports $1 flags])
++    SAVE_CFLAGS="$CFLAGS"
++    CFLAGS="$1"
++    AC_TRY_COMPILE([],[],[ac_cv_try_cflags_ok=yes],[ac_cv_try_cflags_ok=no])
++    CFLAGS="$SAVE_CFLAGS"
++    AC_MSG_RESULT([$ac_cv_try_cflags_ok])
++    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
++	ifelse([$2],[],[:],[$2])
++    else
++	ifelse([$3],[],[:],[$3])
++    fi])
++m4trace:acinclude.m4:107: -1- AC_DEFUN([AC_CHECK_GENERATE_INTTYPES], [rm -f $1/inttypes.h
++    AC_CHECK_HEADER([inttypes.h],[],
++	[AC_CHECK_SIZEOF([char])
++	AC_CHECK_SIZEOF([short])
++	AC_CHECK_SIZEOF([int])
++	if test x"$ac_cv_sizeof_char" != x"1" -o \
++	    x"$ac_cv_sizeof_short" != x"2" -o \
++	    x"$ac_cv_sizeof_int" != x"4"; then
++	    AC_MSG_ERROR([can not build a default inttypes.h])
++	fi
++	cat >$1/inttypes.h << EOF
++/* default inttypes.h for people who do not have it on their system */
++
++#ifndef _INTTYPES_H
++#define _INTTYPES_H
++#if (!defined __int8_t_defined) && (!defined __BIT_TYPES_DEFINED__)
++#define __int8_t_defined
++typedef signed char int8_t;
++typedef signed short int16_t;
++typedef signed int int32_t;
++#ifdef ARCH_X86
++typedef signed long long int64_t;
++#endif
++#endif
++#if (!defined _LINUX_TYPES_H)
++typedef unsigned char uint8_t;
++typedef unsigned short uint16_t;
++typedef unsigned int uint32_t;
++#ifdef ARCH_X86
++typedef unsigned long long uint64_t;
++#endif
++#endif
++#endif
++EOF
++	])])
++m4trace:configure.in:3: -1- AC_INIT
++m4trace:configure.in:3: -1- m4_pattern_forbid([^_?A[CHUM]_])
++m4trace:configure.in:3: -1- m4_pattern_forbid([_AC_])
++m4trace:configure.in:3: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
++m4trace:configure.in:3: -1- m4_pattern_allow([^AS_FLAGS$])
++m4trace:configure.in:3: -1- m4_pattern_forbid([^_?m4_])
++m4trace:configure.in:3: -1- m4_pattern_forbid([^dnl$])
++m4trace:configure.in:3: -1- m4_pattern_forbid([^_?AS_])
++m4trace:configure.in:3: -1- AC_SUBST([SHELL], [${CONFIG_SHELL-/bin/sh}])
++m4trace:configure.in:3: -1- AC_SUBST([PATH_SEPARATOR])
++m4trace:configure.in:3: -1- AC_SUBST([PACKAGE_NAME], [m4_ifdef([AC_PACKAGE_NAME],      ['AC_PACKAGE_NAME'])])
++m4trace:configure.in:3: -1- AC_SUBST([PACKAGE_TARNAME], [m4_ifdef([AC_PACKAGE_TARNAME],   ['AC_PACKAGE_TARNAME'])])
++m4trace:configure.in:3: -1- AC_SUBST([PACKAGE_VERSION], [m4_ifdef([AC_PACKAGE_VERSION],   ['AC_PACKAGE_VERSION'])])
++m4trace:configure.in:3: -1- AC_SUBST([PACKAGE_STRING], [m4_ifdef([AC_PACKAGE_STRING],    ['AC_PACKAGE_STRING'])])
++m4trace:configure.in:3: -1- AC_SUBST([PACKAGE_BUGREPORT], [m4_ifdef([AC_PACKAGE_BUGREPORT], ['AC_PACKAGE_BUGREPORT'])])
++m4trace:configure.in:3: -1- AC_SUBST([exec_prefix], [NONE])
++m4trace:configure.in:3: -1- AC_SUBST([prefix], [NONE])
++m4trace:configure.in:3: -1- AC_SUBST([program_transform_name], [s,x,x,])
++m4trace:configure.in:3: -1- AC_SUBST([bindir], ['${exec_prefix}/bin'])
++m4trace:configure.in:3: -1- AC_SUBST([sbindir], ['${exec_prefix}/sbin'])
++m4trace:configure.in:3: -1- AC_SUBST([libexecdir], ['${exec_prefix}/libexec'])
++m4trace:configure.in:3: -1- AC_SUBST([datadir], ['${prefix}/share'])
++m4trace:configure.in:3: -1- AC_SUBST([sysconfdir], ['${prefix}/etc'])
++m4trace:configure.in:3: -1- AC_SUBST([sharedstatedir], ['${prefix}/com'])
++m4trace:configure.in:3: -1- AC_SUBST([localstatedir], ['${prefix}/var'])
++m4trace:configure.in:3: -1- AC_SUBST([libdir], ['${exec_prefix}/lib'])
++m4trace:configure.in:3: -1- AC_SUBST([includedir], ['${prefix}/include'])
++m4trace:configure.in:3: -1- AC_SUBST([oldincludedir], ['/usr/include'])
++m4trace:configure.in:3: -1- AC_SUBST([infodir], ['${prefix}/info'])
++m4trace:configure.in:3: -1- AC_SUBST([mandir], ['${prefix}/man'])
++m4trace:configure.in:3: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_NAME])
++m4trace:configure.in:3: -1- AH_OUTPUT([PACKAGE_NAME], [/* Define to the full name of this package. */
++#undef PACKAGE_NAME])
++m4trace:configure.in:3: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_TARNAME])
++m4trace:configure.in:3: -1- AH_OUTPUT([PACKAGE_TARNAME], [/* Define to the one symbol short name of this package. */
++#undef PACKAGE_TARNAME])
++m4trace:configure.in:3: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_VERSION])
++m4trace:configure.in:3: -1- AH_OUTPUT([PACKAGE_VERSION], [/* Define to the version of this package. */
++#undef PACKAGE_VERSION])
++m4trace:configure.in:3: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_STRING])
++m4trace:configure.in:3: -1- AH_OUTPUT([PACKAGE_STRING], [/* Define to the full name and version of this package. */
++#undef PACKAGE_STRING])
++m4trace:configure.in:3: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE_BUGREPORT])
++m4trace:configure.in:3: -1- AH_OUTPUT([PACKAGE_BUGREPORT], [/* Define to the address where bug reports for this package should be sent. */
++#undef PACKAGE_BUGREPORT])
++m4trace:configure.in:3: -1- AC_SUBST([build_alias])
++m4trace:configure.in:3: -1- AC_SUBST([host_alias])
++m4trace:configure.in:3: -1- AC_SUBST([target_alias])
++m4trace:configure.in:3: -1- AC_SUBST([DEFS])
++m4trace:configure.in:3: -1- AC_SUBST([ECHO_C])
++m4trace:configure.in:3: -1- AC_SUBST([ECHO_N])
++m4trace:configure.in:3: -1- AC_SUBST([ECHO_T])
++m4trace:configure.in:3: -1- AC_SUBST([LIBS])
++m4trace:configure.in:5: -1- AC_CONFIG_AUX_DIR([autotools])
++m4trace:configure.in:7: -1- AC_CONFIG_FILES([Makefile autotools/Makefile include/Makefile test/Makefile
++    doc/Makefile src/Makefile liba52/Makefile libao/Makefile vc++/Makefile])
++m4trace:configure.in:8: -1- AM_INIT_AUTOMAKE([a52dec], [0.7.4])
++m4trace:configure.in:8: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
++m4trace:configure.in:8: -1- AM_SET_CURRENT_AUTOMAKE_VERSION
++m4trace:configure.in:8: -1- AM_AUTOMAKE_VERSION([1.9.4])
++m4trace:configure.in:8: -1- AC_PROG_INSTALL
++m4trace:configure.in:8: -1- AC_SUBST([INSTALL_PROGRAM])
++m4trace:configure.in:8: -1- AC_SUBST([INSTALL_SCRIPT])
++m4trace:configure.in:8: -1- AC_SUBST([INSTALL_DATA])
++m4trace:configure.in:8: -1- AC_SUBST([CYGPATH_W])
++m4trace:configure.in:8: -1- AC_SUBST([PACKAGE], [a52dec])
++m4trace:configure.in:8: -1- AC_SUBST([VERSION], [0.7.4])
++m4trace:configure.in:8: -1- _AM_IF_OPTION([no-define], [], [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
++ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])
++m4trace:configure.in:8: -2- _AM_MANGLE_OPTION([no-define])
++m4trace:configure.in:8: -1- AC_DEFINE_TRACE_LITERAL([PACKAGE])
++m4trace:configure.in:8: -1- AH_OUTPUT([PACKAGE], [/* Name of package */
++#undef PACKAGE])
++m4trace:configure.in:8: -1- AC_DEFINE_TRACE_LITERAL([VERSION])
++m4trace:configure.in:8: -1- AH_OUTPUT([VERSION], [/* Version number of package */
++#undef VERSION])
++m4trace:configure.in:8: -1- AM_SANITY_CHECK
++m4trace:configure.in:8: -1- AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
++m4trace:configure.in:8: -1- AM_MISSING_HAS_RUN
++m4trace:configure.in:8: -1- AM_AUX_DIR_EXPAND
++m4trace:configure.in:8: -1- AC_SUBST([ACLOCAL])
++m4trace:configure.in:8: -1- AM_MISSING_PROG([AUTOCONF], [autoconf])
++m4trace:configure.in:8: -1- AC_SUBST([AUTOCONF])
++m4trace:configure.in:8: -1- AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
++m4trace:configure.in:8: -1- AC_SUBST([AUTOMAKE])
++m4trace:configure.in:8: -1- AM_MISSING_PROG([AUTOHEADER], [autoheader])
++m4trace:configure.in:8: -1- AC_SUBST([AUTOHEADER])
++m4trace:configure.in:8: -1- AM_MISSING_PROG([MAKEINFO], [makeinfo])
++m4trace:configure.in:8: -1- AC_SUBST([MAKEINFO])
++m4trace:configure.in:8: -1- AM_PROG_INSTALL_SH
++m4trace:configure.in:8: -1- AC_SUBST([install_sh])
++m4trace:configure.in:8: -1- AM_PROG_INSTALL_STRIP
++m4trace:configure.in:8: -1- AC_SUBST([STRIP])
++m4trace:configure.in:8: -1- AC_SUBST([ac_ct_STRIP])
++m4trace:configure.in:8: -1- AC_SUBST([INSTALL_STRIP_PROGRAM])
++m4trace:configure.in:8: -1- AM_PROG_MKDIR_P
++m4trace:configure.in:8: -1- AC_SUBST([mkdir_p])
++m4trace:configure.in:8: -1- AC_PROG_AWK
++m4trace:configure.in:8: -1- AC_SUBST([AWK])
++m4trace:configure.in:8: -1- AC_PROG_MAKE_SET
++m4trace:configure.in:8: -1- AC_SUBST([SET_MAKE])
++m4trace:configure.in:8: -1- AM_SET_LEADING_DOT
++m4trace:configure.in:8: -1- AC_SUBST([am__leading_dot])
++m4trace:configure.in:8: -1- _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
++	      		     [_AM_PROG_TAR([v7])])])
++m4trace:configure.in:8: -2- _AM_MANGLE_OPTION([tar-ustar])
++m4trace:configure.in:8: -1- _AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], [_AM_PROG_TAR([v7])])
++m4trace:configure.in:8: -2- _AM_MANGLE_OPTION([tar-pax])
++m4trace:configure.in:8: -1- _AM_PROG_TAR([v7])
++m4trace:configure.in:8: -1- AM_MISSING_PROG([AMTAR], [tar])
++m4trace:configure.in:8: -1- AC_SUBST([AMTAR])
++m4trace:configure.in:8: -1- AC_SUBST([am__tar])
++m4trace:configure.in:8: -1- AC_SUBST([am__untar])
++m4trace:configure.in:8: -1- _AM_IF_OPTION([no-dependencies], [], [AC_PROVIDE_IFELSE([AC_PROG_CC],
++                  [_AM_DEPENDENCIES(CC)],
++                  [define([AC_PROG_CC],
++                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
++AC_PROVIDE_IFELSE([AC_PROG_CXX],
++                  [_AM_DEPENDENCIES(CXX)],
++                  [define([AC_PROG_CXX],
++                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
++])
++m4trace:configure.in:8: -2- _AM_MANGLE_OPTION([no-dependencies])
++m4trace:configure.in:9: -1- AM_CONFIG_HEADER([include/config.h])
++m4trace:configure.in:9: -1- _m4_warn([obsolete], [The macro `AM_CONFIG_HEADER' is obsolete.
++You should run autoupdate.], [/usr/share/aclocal-1.9/header.m4:23: AM_CONFIG_HEADER is expanded from...
++configure.in:9: the top level])
++m4trace:configure.in:9: -1- AC_CONFIG_HEADERS([include/config.h])
++m4trace:configure.in:10: -1- AM_MAINTAINER_MODE
++m4trace:configure.in:10: -1- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
++m4trace:configure.in:10: -1- AC_SUBST([MAINTAINER_MODE_TRUE])
++m4trace:configure.in:10: -1- AC_SUBST([MAINTAINER_MODE_FALSE])
++m4trace:configure.in:10: -1- AC_SUBST([MAINT])
++m4trace:configure.in:11: -1- AC_CANONICAL_HOST
++m4trace:configure.in:11: -1- AC_SUBST([build], [$ac_cv_build])
++m4trace:configure.in:11: -1- AC_SUBST([build_cpu], [`echo $ac_cv_build | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\1/'`])
++m4trace:configure.in:11: -1- AC_SUBST([build_vendor], [`echo $ac_cv_build | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\2/'`])
++m4trace:configure.in:11: -1- AC_SUBST([build_os], [`echo $ac_cv_build | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\3/'`])
++m4trace:configure.in:11: -1- AC_SUBST([host], [$ac_cv_host])
++m4trace:configure.in:11: -1- AC_SUBST([host_cpu], [`echo $ac_cv_host | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\1/'`])
++m4trace:configure.in:11: -1- AC_SUBST([host_vendor], [`echo $ac_cv_host | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\2/'`])
++m4trace:configure.in:11: -1- AC_SUBST([host_os], [`echo $ac_cv_host | sed 's/^\([[^-]]*\)-\([[^-]]*\)-\(.*\)$/\3/'`])
++m4trace:configure.in:14: -1- AC_PROG_CC
++m4trace:configure.in:14: -1- AC_SUBST([CC])
++m4trace:configure.in:14: -1- AC_SUBST([CFLAGS])
++m4trace:configure.in:14: -1- AC_SUBST([LDFLAGS])
++m4trace:configure.in:14: -1- AC_SUBST([CPPFLAGS])
++m4trace:configure.in:14: -1- AC_SUBST([CC])
++m4trace:configure.in:14: -1- AC_SUBST([ac_ct_CC])
++m4trace:configure.in:14: -1- AC_SUBST([CC])
++m4trace:configure.in:14: -1- AC_SUBST([ac_ct_CC])
++m4trace:configure.in:14: -1- AC_SUBST([CC])
++m4trace:configure.in:14: -1- AC_SUBST([CC])
++m4trace:configure.in:14: -1- AC_SUBST([ac_ct_CC])
++m4trace:configure.in:14: -1- AC_SUBST([EXEEXT], [$ac_cv_exeext])
++m4trace:configure.in:14: -1- AC_SUBST([OBJEXT], [$ac_cv_objext])
++m4trace:configure.in:14: -1- _AM_DEPENDENCIES([CC])
++m4trace:configure.in:14: -1- AM_SET_DEPDIR
++m4trace:configure.in:14: -1- AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])
++m4trace:configure.in:14: -1- AM_OUTPUT_DEPENDENCY_COMMANDS
++m4trace:configure.in:14: -1- AM_MAKE_INCLUDE
++m4trace:configure.in:14: -1- AC_SUBST([am__include])
++m4trace:configure.in:14: -1- AC_SUBST([am__quote])
++m4trace:configure.in:14: -1- AM_DEP_TRACK
++m4trace:configure.in:14: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
++m4trace:configure.in:14: -1- AC_SUBST([AMDEP_TRUE])
++m4trace:configure.in:14: -1- AC_SUBST([AMDEP_FALSE])
++m4trace:configure.in:14: -1- AC_SUBST([AMDEPBACKSLASH])
++m4trace:configure.in:14: -1- AC_SUBST([CCDEPMODE], [depmode=$am_cv_CC_dependencies_compiler_type])
++m4trace:configure.in:14: -1- AM_CONDITIONAL([am__fastdepCC], [
++  test "x$enable_dependency_tracking" != xno \
++  && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
++m4trace:configure.in:14: -1- AC_SUBST([am__fastdepCC_TRUE])
++m4trace:configure.in:14: -1- AC_SUBST([am__fastdepCC_FALSE])
++m4trace:configure.in:15: -1- AC_PROG_GCC_TRADITIONAL
++m4trace:configure.in:15: -1- AC_PROG_CPP
++m4trace:configure.in:15: -1- AC_SUBST([CPP])
++m4trace:configure.in:15: -1- AC_SUBST([CPPFLAGS])
++m4trace:configure.in:15: -1- AC_SUBST([CPP])
++m4trace:configure.in:15: -1- AC_PROG_EGREP
++m4trace:configure.in:15: -1- AC_SUBST([EGREP])
++m4trace:configure.in:27: -1- AC_TRY_CFLAGS([$OPT_CFLAGS], [CFLAGS=$OPT_CFLAGS])
++m4trace:configure.in:27: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++acinclude.m4:67: AC_TRY_CFLAGS is expanded from...
++configure.in:27: the top level])
++m4trace:configure.in:31: -1- AC_TRY_CFLAGS([$OPT_CFLAGS], [CFLAGS=$OPT_CFLAGS])
++m4trace:configure.in:31: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++acinclude.m4:67: AC_TRY_CFLAGS is expanded from...
++configure.in:31: the top level])
++m4trace:configure.in:43: -1- AC_TRY_CFLAGS([$OPT_CFLAGS], [CFLAGS=$OPT_CFLAGS])
++m4trace:configure.in:43: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++acinclude.m4:67: AC_TRY_CFLAGS is expanded from...
++configure.in:43: the top level])
++m4trace:configure.in:46: -1- AC_TRY_CFLAGS([$OPT_CFLAGS], [CFLAGS=$OPT_CFLAGS])
++m4trace:configure.in:46: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++acinclude.m4:67: AC_TRY_CFLAGS is expanded from...
++configure.in:46: the top level])
++m4trace:configure.in:49: -1- AC_TRY_CFLAGS([$OPT_CFLAGS], [CFLAGS=$OPT_CFLAGS])
++m4trace:configure.in:49: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++acinclude.m4:67: AC_TRY_CFLAGS is expanded from...
++configure.in:49: the top level])
++m4trace:configure.in:66: -1- AC_TRY_CFLAGS([$OPT_CFLAGS], [CFLAGS=$OPT_CFLAGS])
++m4trace:configure.in:66: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++acinclude.m4:67: AC_TRY_CFLAGS is expanded from...
++configure.in:66: the top level])
++m4trace:configure.in:69: -1- AC_TRY_CFLAGS([$OPT_CFLAGS], [CFLAGS=$OPT_CFLAGS])
++m4trace:configure.in:69: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++acinclude.m4:67: AC_TRY_CFLAGS is expanded from...
++configure.in:69: the top level])
++m4trace:configure.in:74: -1- AC_DISABLE_SHARED
++m4trace:configure.in:74: -1- AC_ENABLE_SHARED([no])
++m4trace:configure.in:74: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++autoconf/general.m4:1303: AC_ARG_ENABLE is expanded from...
++/usr/share/aclocal/libtool.m4:1788: AC_ENABLE_SHARED is expanded from...
++/usr/share/aclocal/libtool.m4:1797: AC_DISABLE_SHARED is expanded from...
++configure.in:74: the top level])
++m4trace:configure.in:75: -1- AC_LIBTOOL_WIN32_DLL
++m4trace:configure.in:76: -1- AC_PROG_LIBTOOL
++m4trace:configure.in:76: -1- _AC_PROG_LIBTOOL
++m4trace:configure.in:76: -1- AC_LIBTOOL_SETUP
++m4trace:configure.in:76: -1- AC_ENABLE_STATIC
++m4trace:configure.in:76: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++autoconf/general.m4:1303: AC_ARG_ENABLE is expanded from...
++/usr/share/aclocal/libtool.m4:1827: AC_ENABLE_STATIC is expanded from...
++configure.in:76: AC_ENABLE_STATIC is required by...
++/usr/share/aclocal/libtool.m4:234: AC_LIBTOOL_SETUP is expanded from...
++configure.in:76: AC_LIBTOOL_SETUP is required by...
++/usr/share/aclocal/libtool.m4:90: _AC_PROG_LIBTOOL is expanded from...
++configure.in:76: _AC_PROG_LIBTOOL is required by...
++/usr/share/aclocal/libtool.m4:70: AC_PROG_LIBTOOL is expanded from...
++configure.in:76: the top level])
++m4trace:configure.in:76: -1- AC_ENABLE_FAST_INSTALL
++m4trace:configure.in:76: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++autoconf/general.m4:1303: AC_ARG_ENABLE is expanded from...
++/usr/share/aclocal/libtool.m4:1866: AC_ENABLE_FAST_INSTALL is expanded from...
++configure.in:76: AC_ENABLE_FAST_INSTALL is required by...
++/usr/share/aclocal/libtool.m4:234: AC_LIBTOOL_SETUP is expanded from...
++configure.in:76: AC_LIBTOOL_SETUP is required by...
++/usr/share/aclocal/libtool.m4:90: _AC_PROG_LIBTOOL is expanded from...
++configure.in:76: _AC_PROG_LIBTOOL is required by...
++/usr/share/aclocal/libtool.m4:70: AC_PROG_LIBTOOL is expanded from...
++configure.in:76: the top level])
++m4trace:configure.in:76: -1- AC_PROG_LD
++m4trace:configure.in:76: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++autoconf/general.m4:1331: AC_ARG_WITH is expanded from...
++/usr/share/aclocal/libtool.m4:2063: AC_PROG_LD is expanded from...
++configure.in:76: AC_PROG_LD is required by...
++/usr/share/aclocal/libtool.m4:234: AC_LIBTOOL_SETUP is expanded from...
++configure.in:76: AC_LIBTOOL_SETUP is required by...
++/usr/share/aclocal/libtool.m4:90: _AC_PROG_LIBTOOL is expanded from...
++configure.in:76: _AC_PROG_LIBTOOL is required by...
++/usr/share/aclocal/libtool.m4:70: AC_PROG_LIBTOOL is expanded from...
++configure.in:76: the top level])
++m4trace:configure.in:76: -1- LT_AC_PROG_SED
++m4trace:configure.in:76: -1- AC_PROG_LD_GNU
++m4trace:configure.in:76: -1- AC_PROG_LD_RELOAD_FLAG
++m4trace:configure.in:76: -1- AC_PROG_NM
++m4trace:configure.in:76: -1- AC_PROG_LN_S
++m4trace:configure.in:76: -1- AC_SUBST([LN_S], [$as_ln_s])
++m4trace:configure.in:76: -1- AC_DEPLIBS_CHECK_METHOD
++m4trace:configure.in:76: -1- AC_LIBTOOL_SYS_MAX_CMD_LEN
++m4trace:configure.in:76: -1- AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_no_builtin_flag], [])
++m4trace:configure.in:76: -1- AC_LIBTOOL_OBJDIR
++m4trace:configure.in:76: -1- _LT_AC_SYS_COMPILER
++m4trace:configure.in:76: -1- _LT_AC_PROG_ECHO_BACKSLASH
++m4trace:configure.in:76: -1- _LT_AC_SHELL_INIT([
++# Check that we are running under the correct shell.
++SHELL=${CONFIG_SHELL-/bin/sh}
++
++case X$ECHO in
++X*--fallback-echo)
++  # Remove one level of quotation (which was required for Make).
++  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
++  ;;
++esac
++
++echo=${ECHO-echo}
++if test "X[$]1" = X--no-reexec; then
++  # Discard the --no-reexec flag, and continue.
++  shift
++elif test "X[$]1" = X--fallback-echo; then
++  # Avoid inline document here, it may be left over
++  :
++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
++  # Yippee, $echo works!
++  :
++else
++  # Restart under the correct shell.
++  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
++fi
++
++if test "X[$]1" = X--fallback-echo; then
++  # used as fallback echo
++  shift
++  cat <<EOF
++[$]*
++EOF
++  exit 0
++fi
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++
++if test -z "$ECHO"; then
++if test "X${echo_test_string+set}" != Xset; then
++# find a string as large as possible, as long as the shell can cope with it
++  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
++    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
++    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
++       echo_test_string="`eval $cmd`" &&
++       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
++    then
++      break
++    fi
++  done
++fi
++
++if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++   test "X$echo_testing_string" = "X$echo_test_string"; then
++  :
++else
++  # The Solaris, AIX, and Digital Unix default echo programs unquote
++  # backslashes.  This makes it impossible to quote backslashes using
++  #   echo "$something" | sed 's/\\/\\\\/g'
++  #
++  # So, first we look for a working echo in the user's PATH.
++
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for dir in $PATH /usr/ucb; do
++    IFS="$lt_save_ifs"
++    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
++       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
++       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
++       test "X$echo_testing_string" = "X$echo_test_string"; then
++      echo="$dir/echo"
++      break
++    fi
++  done
++  IFS="$lt_save_ifs"
++
++  if test "X$echo" = Xecho; then
++    # We didn't find a better echo, so look for alternatives.
++    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
++       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
++       test "X$echo_testing_string" = "X$echo_test_string"; then
++      # This shell has a builtin print -r that does the trick.
++      echo='print -r'
++    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
++	 test "X$CONFIG_SHELL" != X/bin/ksh; then
++      # If we have ksh, try running configure again with it.
++      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
++      export ORIGINAL_CONFIG_SHELL
++      CONFIG_SHELL=/bin/ksh
++      export CONFIG_SHELL
++      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
++    else
++      # Try using printf.
++      echo='printf %s\n'
++      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++	 test "X$echo_testing_string" = "X$echo_test_string"; then
++	# Cool, printf works
++	:
++      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
++	   test "X$echo_testing_string" = 'X\t' &&
++	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
++	export CONFIG_SHELL
++	SHELL="$CONFIG_SHELL"
++	export SHELL
++	echo="$CONFIG_SHELL [$]0 --fallback-echo"
++      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
++	   test "X$echo_testing_string" = 'X\t' &&
++	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	echo="$CONFIG_SHELL [$]0 --fallback-echo"
++      else
++	# maybe with a smaller string...
++	prev=:
++
++	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
++	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
++	  then
++	    break
++	  fi
++	  prev="$cmd"
++	done
++
++	if test "$prev" != 'sed 50q "[$]0"'; then
++	  echo_test_string=`eval $prev`
++	  export echo_test_string
++	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
++	else
++	  # Oops.  We lost completely, so just stick with echo.
++	  echo=echo
++	fi
++      fi
++    fi
++  fi
++fi
++fi
++
++# Copy echo and quote the copy suitably for passing to libtool from
++# the Makefile, instead of quoting the original, which is used later.
++ECHO=$echo
++if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
++   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
++fi
++
++AC_SUBST(ECHO)
++])
++m4trace:configure.in:76: -1- AC_SUBST([ECHO])
++m4trace:configure.in:76: -1- AC_SUBST([AR])
++m4trace:configure.in:76: -1- AC_SUBST([ac_ct_AR])
++m4trace:configure.in:76: -1- AC_SUBST([RANLIB])
++m4trace:configure.in:76: -1- AC_SUBST([ac_ct_RANLIB])
++m4trace:configure.in:76: -1- AC_SUBST([STRIP])
++m4trace:configure.in:76: -1- AC_SUBST([ac_ct_STRIP])
++m4trace:configure.in:76: -1- AC_PATH_MAGIC
++m4trace:configure.in:76: -1- AC_PATH_TOOL_PREFIX([${ac_tool_prefix}file], [/usr/bin$PATH_SEPARATOR$PATH])
++m4trace:configure.in:76: -1- AC_PATH_TOOL_PREFIX([file], [/usr/bin$PATH_SEPARATOR$PATH])
++m4trace:configure.in:76: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++autoconf/general.m4:1303: AC_ARG_ENABLE is expanded from...
++/usr/share/aclocal/libtool.m4:234: AC_LIBTOOL_SETUP is expanded from...
++configure.in:76: AC_LIBTOOL_SETUP is required by...
++/usr/share/aclocal/libtool.m4:90: _AC_PROG_LIBTOOL is expanded from...
++configure.in:76: _AC_PROG_LIBTOOL is required by...
++/usr/share/aclocal/libtool.m4:70: AC_PROG_LIBTOOL is expanded from...
++configure.in:76: the top level])
++m4trace:configure.in:76: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++autoconf/general.m4:1331: AC_ARG_WITH is expanded from...
++/usr/share/aclocal/libtool.m4:234: AC_LIBTOOL_SETUP is expanded from...
++configure.in:76: AC_LIBTOOL_SETUP is required by...
++/usr/share/aclocal/libtool.m4:90: _AC_PROG_LIBTOOL is expanded from...
++configure.in:76: _AC_PROG_LIBTOOL is required by...
++/usr/share/aclocal/libtool.m4:70: AC_PROG_LIBTOOL is expanded from...
++configure.in:76: the top level])
++m4trace:configure.in:76: -1- AC_LIBTOOL_LANG_C_CONFIG
++m4trace:configure.in:76: -1- _LT_AC_LANG_C_CONFIG
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([objext], [])
++m4trace:configure.in:76: -1- _LT_AC_SYS_COMPILER
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_cc_shlib], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_cc_shlib], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_cc_shlib], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_cc_shlib], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_cc_shlib], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_cc_shlib], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_cc_shlib], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_cc_shlib], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_cc_can_build_shared], [])
++m4trace:configure.in:76: -2- _LT_AC_TAGVAR([lt_prog_compiler_static_works], [])
++m4trace:configure.in:76: -2- _LT_AC_TAGVAR([lt_prog_compiler_static], [])
++m4trace:configure.in:76: -1- AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, ) works], [lt_prog_compiler_static_works], [$lt_prog_compiler_static], [], [_LT_AC_TAGVAR(lt_prog_compiler_static, )=])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [])
++m4trace:configure.in:76: -1- AC_LIBTOOL_PROG_COMPILER_NO_RTTI([])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_no_builtin_flag], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_no_builtin_flag], [])
++m4trace:configure.in:76: -1- AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], [lt_cv_prog_compiler_rtti_exceptions], [-fno-rtti -fno-exceptions], [], [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, )="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, ) -fno-rtti -fno-exceptions"])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_no_builtin_flag], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_no_builtin_flag], [])
++m4trace:configure.in:76: -1- AC_LIBTOOL_PROG_COMPILER_PIC([])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_can_build_shared], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_can_build_shared], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -2- _LT_AC_TAGVAR([lt_prog_compiler_pic_works], [])
++m4trace:configure.in:76: -1- AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, ) works], [lt_prog_compiler_pic_works], [$_LT_AC_TAGVAR(lt_prog_compiler_pic, )ifelse([],[],[ -DPIC],[ifelse([],[CXX],[ -DPIC],[])])], [], [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, ) in
++     "" | " "*) ;;
++     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, )=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, )" ;;
++     esac], [_LT_AC_TAGVAR(lt_prog_compiler_pic, )=
++     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, )=no])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_can_build_shared], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- AC_LIBTOOL_PROG_CC_C_O([])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [])
++m4trace:configure.in:76: -1- AC_LIBTOOL_SYS_HARD_LINK_LOCKS([])
++m4trace:configure.in:76: -1- _LT_AC_LOCK
++m4trace:configure.in:76: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2223: AC_TRY_LINK is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++/usr/share/aclocal/libtool.m4:561: _LT_AC_LOCK is expanded from...
++configure.in:76: _LT_AC_LOCK is required by...
++/usr/share/aclocal/libtool.m4:1006: AC_LIBTOOL_SYS_HARD_LINK_LOCKS is expanded from...
++/usr/share/aclocal/libtool.m4:2595: _LT_AC_LANG_C_CONFIG is expanded from...
++/usr/share/aclocal/libtool.m4:2495: AC_LIBTOOL_LANG_C_CONFIG is expanded from...
++/usr/share/aclocal/libtool.m4:234: AC_LIBTOOL_SETUP is expanded from...
++configure.in:76: AC_LIBTOOL_SETUP is required by...
++/usr/share/aclocal/libtool.m4:90: _AC_PROG_LIBTOOL is expanded from...
++configure.in:76: _AC_PROG_LIBTOOL is required by...
++/usr/share/aclocal/libtool.m4:70: AC_PROG_LIBTOOL is expanded from...
++configure.in:76: the top level])
++m4trace:configure.in:76: -1- AC_SUBST([DLLTOOL])
++m4trace:configure.in:76: -1- AC_SUBST([ac_ct_DLLTOOL])
++m4trace:configure.in:76: -1- AC_SUBST([AS])
++m4trace:configure.in:76: -1- AC_SUBST([ac_ct_AS])
++m4trace:configure.in:76: -1- AC_SUBST([OBJDUMP])
++m4trace:configure.in:76: -1- AC_SUBST([ac_ct_OBJDUMP])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [])
++m4trace:configure.in:76: -1- AC_LIBTOOL_PROG_LD_SHLIBS([])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([enable_shared_with_static_runtimes], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_From_new_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_expsyms_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([thread_safe_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec_ld], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([link_all_deplibs], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_automatic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_expsym_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([always_export_symbols], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([include_expsyms], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([exclude_expsyms], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([always_export_symbols], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([enable_shared_with_static_runtimes], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([always_export_symbols], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([link_all_deplibs], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([always_export_symbols], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [])
++m4trace:configure.in:76: -1- _LT_AC_SYS_LIBPATH_AIX
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_SYS_LIBPATH_AIX
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([no_undefined_flag], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([always_export_symbols], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_From_new_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([enable_shared_with_static_runtimes], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_automatic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([link_all_deplibs], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_expsym_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_expsym_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec_ld], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec_ld], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([link_all_deplibs], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_From_new_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([no_undefined_flag], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([link_all_deplibs], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([reload_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([no_undefined_flag], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([no_undefined_flag], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [])
++m4trace:configure.in:76: -2- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [])
++m4trace:configure.in:76: -1- AC_LIBTOOL_SYS_DYNAMIC_LINKER([])
++m4trace:configure.in:76: -1- AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([runpath_var], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_automatic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [])
++m4trace:configure.in:76: -1- AC_LIBTOOL_SYS_LIB_STRIP
++m4trace:configure.in:76: -1- AC_LIBTOOL_DLOPEN_SELF([])
++m4trace:configure.in:76: -1- _LT_AC_CHECK_DLFCN
++m4trace:configure.in:76: -1- AC_CHECK_HEADERS([dlfcn.h])
++m4trace:configure.in:76: -1- AH_OUTPUT([HAVE_DLFCN_H], [/* Define to 1 if you have the <dlfcn.h> header file. */
++#undef HAVE_DLFCN_H])
++m4trace:configure.in:76: -1- AC_HEADER_STDC
++m4trace:configure.in:76: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS])
++m4trace:configure.in:76: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */
++#undef STDC_HEADERS])
++m4trace:configure.in:76: -1- AC_CHECK_HEADERS([sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
++		  inttypes.h stdint.h unistd.h], [], [], [$ac_includes_default])
++m4trace:configure.in:76: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the <sys/types.h> header file. */
++#undef HAVE_SYS_TYPES_H])
++m4trace:configure.in:76: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the <sys/stat.h> header file. */
++#undef HAVE_SYS_STAT_H])
++m4trace:configure.in:76: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the <stdlib.h> header file. */
++#undef HAVE_STDLIB_H])
++m4trace:configure.in:76: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the <string.h> header file. */
++#undef HAVE_STRING_H])
++m4trace:configure.in:76: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the <memory.h> header file. */
++#undef HAVE_MEMORY_H])
++m4trace:configure.in:76: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the <strings.h> header file. */
++#undef HAVE_STRINGS_H])
++m4trace:configure.in:76: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the <inttypes.h> header file. */
++#undef HAVE_INTTYPES_H])
++m4trace:configure.in:76: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the <stdint.h> header file. */
++#undef HAVE_STDINT_H])
++m4trace:configure.in:76: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the <unistd.h> header file. */
++#undef HAVE_UNISTD_H])
++m4trace:configure.in:76: -1- AC_CHECK_LIB([dl], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], [
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ])
++m4trace:configure.in:76: -1- AC_CHECK_LIB([dld], [shl_load], [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], [AC_CHECK_FUNC([dlopen],
++	      [lt_cv_dlopen="dlopen"],
++	  [AC_CHECK_LIB([dl], [dlopen],
++		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
++	    [AC_CHECK_LIB([svld], [dlopen],
++		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++	      [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	      ])
++	    ])
++	  ])
++	])
++m4trace:configure.in:76: -1- AC_CHECK_LIB([dl], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], [AC_CHECK_LIB([svld], [dlopen],
++		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++	      [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	      ])
++	    ])
++m4trace:configure.in:76: -1- AC_CHECK_LIB([svld], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	      ])
++m4trace:configure.in:76: -1- AC_CHECK_LIB([dld], [dld_link], [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++m4trace:configure.in:76: -1- _LT_AC_TRY_DLOPEN_SELF([lt_cv_dlopen_self=yes], [lt_cv_dlopen_self=yes], [lt_cv_dlopen_self=no], [lt_cv_dlopen_self=cross])
++m4trace:configure.in:76: -1- _LT_AC_TRY_DLOPEN_SELF([lt_cv_dlopen_self_static=yes], [lt_cv_dlopen_self_static=yes], [lt_cv_dlopen_self_static=no], [lt_cv_dlopen_self_static=cross])
++m4trace:configure.in:76: -1- AC_LIBTOOL_CONFIG([])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([compiler], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([CC], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([LD], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_no_builtin_flag], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([thread_safe_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([enable_shared_with_static_runtimes], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_new_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([predep_objects], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postdep_objects], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([predeps], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postdeps], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([compiler_lib_search_path], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postinstall_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postuninstall_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_expsyms_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([no_undefined_flag], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec_ld], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_automatic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_expsym_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([exclude_expsyms], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([include_expsyms], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_new_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_expsym_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_expsyms_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([enable_shared_with_static_runtimes], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([compiler], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([GCC], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([LD], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_no_builtin_flag], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([thread_safe_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_new_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_expsyms_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_expsym_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([predep_objects], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postdep_objects], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([predeps], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postdeps], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([compiler_lib_search_path], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([no_undefined_flag], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec_ld], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_automatic], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([link_all_deplibs], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([fix_srcfile_path], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([always_export_symbols], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([exclude_expsyms], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([include_expsyms], [])
++m4trace:configure.in:76: -1- _LT_AC_TAGCONFIG
++m4trace:configure.in:76: -1- _m4_warn([obsolete], [The macro `AC_HELP_STRING' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:219: AC_HELP_STRING is expanded from...
++autoconf/general.m4:1331: AC_ARG_WITH is expanded from...
++/usr/share/aclocal/libtool.m4:1742: _LT_AC_TAGCONFIG is expanded from...
++/usr/share/aclocal/libtool.m4:234: AC_LIBTOOL_SETUP is expanded from...
++configure.in:76: AC_LIBTOOL_SETUP is required by...
++/usr/share/aclocal/libtool.m4:90: _AC_PROG_LIBTOOL is expanded from...
++configure.in:76: _AC_PROG_LIBTOOL is required by...
++/usr/share/aclocal/libtool.m4:70: AC_PROG_LIBTOOL is expanded from...
++configure.in:76: the top level])
++m4trace:configure.in:76: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me:$LINENO: error: tag name \"$tagname\" already exists], [/usr/share/aclocal/libtool.m4:1742: _LT_AC_TAGCONFIG is expanded from...
++/usr/share/aclocal/libtool.m4:234: AC_LIBTOOL_SETUP is expanded from...
++configure.in:76: AC_LIBTOOL_SETUP is required by...
++/usr/share/aclocal/libtool.m4:90: _AC_PROG_LIBTOOL is expanded from...
++configure.in:76: _AC_PROG_LIBTOOL is required by...
++/usr/share/aclocal/libtool.m4:70: AC_PROG_LIBTOOL is expanded from...
++configure.in:76: the top level])
++m4trace:configure.in:76: -1- _m4_warn([obsolete], [back quotes and double quotes must not be escaped in: $as_me: error: tag name \"$tagname\" already exists], [/usr/share/aclocal/libtool.m4:1742: _LT_AC_TAGCONFIG is expanded from...
++/usr/share/aclocal/libtool.m4:234: AC_LIBTOOL_SETUP is expanded from...
++configure.in:76: AC_LIBTOOL_SETUP is required by...
++/usr/share/aclocal/libtool.m4:90: _AC_PROG_LIBTOOL is expanded from...
++configure.in:76: _AC_PROG_LIBTOOL is required by...
++/usr/share/aclocal/libtool.m4:70: AC_PROG_LIBTOOL is expanded from...
++configure.in:76: the top level])
++m4trace:configure.in:76: -1- AC_LIBTOOL_LANG_CXX_CONFIG
++m4trace:configure.in:76: -1- _LT_AC_LANG_CXX_CONFIG([CXX])
++m4trace:configure.in:76: -1- AC_PROG_CXX
++m4trace:configure.in:76: -1- AC_SUBST([CXX])
++m4trace:configure.in:76: -1- AC_SUBST([CXXFLAGS])
++m4trace:configure.in:76: -1- AC_SUBST([LDFLAGS])
++m4trace:configure.in:76: -1- AC_SUBST([CPPFLAGS])
++m4trace:configure.in:76: -1- AC_SUBST([CXX])
++m4trace:configure.in:76: -1- AC_SUBST([ac_ct_CXX])
++m4trace:configure.in:76: -1- _AM_DEPENDENCIES([CXX])
++m4trace:configure.in:76: -1- AC_SUBST([CXXDEPMODE], [depmode=$am_cv_CXX_dependencies_compiler_type])
++m4trace:configure.in:76: -1- AM_CONDITIONAL([am__fastdepCXX], [
++  test "x$enable_dependency_tracking" != xno \
++  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3])
++m4trace:configure.in:76: -1- AC_SUBST([am__fastdepCXX_TRUE])
++m4trace:configure.in:76: -1- AC_SUBST([am__fastdepCXX_FALSE])
++m4trace:configure.in:76: -1- _LT_AC_PROG_CXXCPP
++m4trace:configure.in:76: -1- AC_SUBST([CXXCPP])
++m4trace:configure.in:76: -1- AC_SUBST([CPPFLAGS])
++m4trace:configure.in:76: -1- AC_SUBST([CXXCPP])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([always_export_symbols], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec_ld], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_automatic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_expsym_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([link_all_deplibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([no_undefined_flag], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([enable_shared_with_static_runtimes], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([predep_objects], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postdep_objects], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([predeps], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postdeps], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([compiler_lib_search_path], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([objext], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_SYS_COMPILER
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([compiler], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_no_builtin_flag], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_no_builtin_flag], [CXX])
++m4trace:configure.in:76: -1- AC_PROG_LD
++m4trace:configure.in:76: -1- AC_PROG_LD_GNU
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([link_all_deplibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([always_export_symbols], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_SYS_LIBPATH_AIX
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_SYS_LIBPATH_AIX
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([no_undefined_flag], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([always_export_symbols], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([always_export_symbols], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([enable_shared_with_static_runtimes], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_automatic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([link_all_deplibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_expsym_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_expsym_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec_ld], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([link_all_deplibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([no_undefined_flag], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([link_all_deplibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([no_undefined_flag], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([GCC], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([LD], [CXX])
++m4trace:configure.in:76: -1- AC_LIBTOOL_POSTDEP_PREDEP([CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([compiler_lib_search_path], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([compiler_lib_search_path], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([compiler_lib_search_path], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([compiler_lib_search_path], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postdeps], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postdeps], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postdeps], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postdeps], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([predep_objects], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([predep_objects], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([predep_objects], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([predep_objects], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postdep_objects], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postdep_objects], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postdep_objects], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postdep_objects], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postdeps], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [CXX])
++m4trace:configure.in:76: -1- AC_LIBTOOL_PROG_COMPILER_PIC([CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_can_build_shared], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -2- _LT_AC_TAGVAR([lt_prog_compiler_pic_works], [CXX])
++m4trace:configure.in:76: -1- AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, CXX) works], [lt_prog_compiler_pic_works_CXX], [$_LT_AC_TAGVAR(lt_prog_compiler_pic, CXX)ifelse([CXX],[],[ -DPIC],[ifelse([CXX],[CXX],[ -DPIC],[])])], [], [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, CXX) in
++     "" | " "*) ;;
++     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, CXX)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, CXX)" ;;
++     esac], [_LT_AC_TAGVAR(lt_prog_compiler_pic, CXX)=
++     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, CXX)=no])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_can_build_shared], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- AC_LIBTOOL_PROG_CC_C_O([CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [CXX])
++m4trace:configure.in:76: -1- AC_LIBTOOL_SYS_HARD_LINK_LOCKS([CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [CXX])
++m4trace:configure.in:76: -1- AC_LIBTOOL_PROG_LD_SHLIBS([CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [CXX])
++m4trace:configure.in:76: -2- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [CXX])
++m4trace:configure.in:76: -1- AC_LIBTOOL_SYS_DYNAMIC_LINKER([CXX])
++m4trace:configure.in:76: -1- AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([runpath_var], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_automatic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [CXX])
++m4trace:configure.in:76: -1- AC_LIBTOOL_SYS_LIB_STRIP
++m4trace:configure.in:76: -1- AC_LIBTOOL_DLOPEN_SELF([CXX])
++m4trace:configure.in:76: -1- AC_CHECK_LIB([dl], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], [
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ])
++m4trace:configure.in:76: -1- AC_CHECK_LIB([dld], [shl_load], [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], [AC_CHECK_FUNC([dlopen],
++	      [lt_cv_dlopen="dlopen"],
++	  [AC_CHECK_LIB([dl], [dlopen],
++		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
++	    [AC_CHECK_LIB([svld], [dlopen],
++		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++	      [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	      ])
++	    ])
++	  ])
++	])
++m4trace:configure.in:76: -1- AC_CHECK_LIB([dl], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], [AC_CHECK_LIB([svld], [dlopen],
++		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++	      [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	      ])
++	    ])
++m4trace:configure.in:76: -1- AC_CHECK_LIB([svld], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	      ])
++m4trace:configure.in:76: -1- AC_CHECK_LIB([dld], [dld_link], [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++m4trace:configure.in:76: -1- _LT_AC_TRY_DLOPEN_SELF([lt_cv_dlopen_self=yes], [lt_cv_dlopen_self=yes], [lt_cv_dlopen_self=no], [lt_cv_dlopen_self=cross])
++m4trace:configure.in:76: -1- _LT_AC_TRY_DLOPEN_SELF([lt_cv_dlopen_self_static=yes], [lt_cv_dlopen_self_static=yes], [lt_cv_dlopen_self_static=no], [lt_cv_dlopen_self_static=cross])
++m4trace:configure.in:76: -1- AC_LIBTOOL_CONFIG([CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([compiler], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([CC], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([LD], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_no_builtin_flag], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([thread_safe_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([enable_shared_with_static_runtimes], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_new_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([predep_objects], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postdep_objects], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([predeps], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postdeps], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([compiler_lib_search_path], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postinstall_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postuninstall_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_expsyms_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([no_undefined_flag], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec_ld], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_automatic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_expsym_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([exclude_expsyms], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([include_expsyms], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_new_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_expsym_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_expsyms_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([enable_shared_with_static_runtimes], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([compiler], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([GCC], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([LD], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_no_builtin_flag], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([thread_safe_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_new_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_expsyms_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_expsym_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([predep_objects], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postdep_objects], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([predeps], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postdeps], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([compiler_lib_search_path], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([no_undefined_flag], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec_ld], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_automatic], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([link_all_deplibs], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([fix_srcfile_path], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([always_export_symbols], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([exclude_expsyms], [CXX])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([include_expsyms], [CXX])
++m4trace:configure.in:76: -1- AC_LIBTOOL_LANG_F77_CONFIG
++m4trace:configure.in:76: -1- _LT_AC_LANG_F77_CONFIG([F77])
++m4trace:configure.in:76: -1- AC_SUBST([F77])
++m4trace:configure.in:76: -1- AC_SUBST([FFLAGS])
++m4trace:configure.in:76: -1- AC_SUBST([LDFLAGS])
++m4trace:configure.in:76: -1- AC_SUBST([F77])
++m4trace:configure.in:76: -1- AC_SUBST([ac_ct_F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([always_export_symbols], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec_ld], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_automatic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_expsym_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([link_all_deplibs], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([no_undefined_flag], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([enable_shared_with_static_runtimes], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([objext], [F77])
++m4trace:configure.in:76: -1- _LT_AC_SYS_COMPILER
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([compiler], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([GCC], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([LD], [F77])
++m4trace:configure.in:76: -1- AC_LIBTOOL_PROG_COMPILER_PIC([F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_can_build_shared], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_can_build_shared], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -2- _LT_AC_TAGVAR([lt_prog_compiler_pic_works], [F77])
++m4trace:configure.in:76: -1- AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, F77) works], [lt_prog_compiler_pic_works_F77], [$_LT_AC_TAGVAR(lt_prog_compiler_pic, F77)ifelse([F77],[],[ -DPIC],[ifelse([F77],[CXX],[ -DPIC],[])])], [], [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, F77) in
++     "" | " "*) ;;
++     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, F77)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, F77)" ;;
++     esac], [_LT_AC_TAGVAR(lt_prog_compiler_pic, F77)=
++     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, F77)=no])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_can_build_shared], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- AC_LIBTOOL_PROG_CC_C_O([F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [F77])
++m4trace:configure.in:76: -1- AC_LIBTOOL_SYS_HARD_LINK_LOCKS([F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [F77])
++m4trace:configure.in:76: -1- AC_LIBTOOL_PROG_LD_SHLIBS([F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([enable_shared_with_static_runtimes], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_From_new_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_expsyms_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([thread_safe_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec_ld], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([link_all_deplibs], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_automatic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_expsym_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([always_export_symbols], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([include_expsyms], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([exclude_expsyms], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([always_export_symbols], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([enable_shared_with_static_runtimes], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([always_export_symbols], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([link_all_deplibs], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([always_export_symbols], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [F77])
++m4trace:configure.in:76: -1- _LT_AC_SYS_LIBPATH_AIX
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_SYS_LIBPATH_AIX
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([no_undefined_flag], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([always_export_symbols], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_From_new_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([enable_shared_with_static_runtimes], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_automatic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([link_all_deplibs], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_expsym_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_expsym_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec_ld], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec_ld], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([link_all_deplibs], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_From_new_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([no_undefined_flag], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([link_all_deplibs], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([reload_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([no_undefined_flag], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([no_undefined_flag], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [F77])
++m4trace:configure.in:76: -2- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [F77])
++m4trace:configure.in:76: -1- AC_LIBTOOL_SYS_DYNAMIC_LINKER([F77])
++m4trace:configure.in:76: -1- AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([runpath_var], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_automatic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [F77])
++m4trace:configure.in:76: -1- AC_LIBTOOL_SYS_LIB_STRIP
++m4trace:configure.in:76: -1- AC_LIBTOOL_CONFIG([F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([compiler], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([CC], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([LD], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_no_builtin_flag], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([thread_safe_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([enable_shared_with_static_runtimes], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_new_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([predep_objects], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postdep_objects], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([predeps], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postdeps], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([compiler_lib_search_path], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postinstall_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postuninstall_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_expsyms_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([no_undefined_flag], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec_ld], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_automatic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_expsym_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([exclude_expsyms], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([include_expsyms], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_new_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_expsym_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_expsyms_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([enable_shared_with_static_runtimes], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([compiler], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([GCC], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([LD], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_no_builtin_flag], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([thread_safe_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_new_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_expsyms_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_expsym_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([predep_objects], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postdep_objects], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([predeps], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postdeps], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([compiler_lib_search_path], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([no_undefined_flag], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec_ld], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_automatic], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([link_all_deplibs], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([fix_srcfile_path], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([always_export_symbols], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([exclude_expsyms], [F77])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([include_expsyms], [F77])
++m4trace:configure.in:76: -1- AC_LIBTOOL_LANG_GCJ_CONFIG
++m4trace:configure.in:76: -1- _LT_AC_LANG_GCJ_CONFIG([GCJ])
++m4trace:configure.in:76: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete.
++You should run autoupdate.], [autoconf/lang.m4:166: AC_LANG_SAVE is expanded from...
++/usr/share/aclocal/libtool.m4:3819: _LT_AC_LANG_GCJ_CONFIG is expanded from...
++/usr/share/aclocal/libtool.m4:3772: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from...
++/usr/share/aclocal/libtool.m4:1742: _LT_AC_TAGCONFIG is expanded from...
++/usr/share/aclocal/libtool.m4:234: AC_LIBTOOL_SETUP is expanded from...
++configure.in:76: AC_LIBTOOL_SETUP is required by...
++/usr/share/aclocal/libtool.m4:90: _AC_PROG_LIBTOOL is expanded from...
++configure.in:76: _AC_PROG_LIBTOOL is required by...
++/usr/share/aclocal/libtool.m4:70: AC_PROG_LIBTOOL is expanded from...
++configure.in:76: the top level])
++m4trace:configure.in:76: -1- _m4_warn([obsolete], [instead of using `AC_LANG', `AC_LANG_SAVE',
++and `AC_LANG_RESTORE', you should use `AC_LANG_PUSH' and `AC_LANG_POP'.], [autoconf/lang.m4:166: AC_LANG_SAVE is expanded from...
++/usr/share/aclocal/libtool.m4:3819: _LT_AC_LANG_GCJ_CONFIG is expanded from...
++/usr/share/aclocal/libtool.m4:3772: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from...
++/usr/share/aclocal/libtool.m4:1742: _LT_AC_TAGCONFIG is expanded from...
++/usr/share/aclocal/libtool.m4:234: AC_LIBTOOL_SETUP is expanded from...
++configure.in:76: AC_LIBTOOL_SETUP is required by...
++/usr/share/aclocal/libtool.m4:90: _AC_PROG_LIBTOOL is expanded from...
++configure.in:76: _AC_PROG_LIBTOOL is required by...
++/usr/share/aclocal/libtool.m4:70: AC_PROG_LIBTOOL is expanded from...
++configure.in:76: the top level])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([objext], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_SYS_COMPILER
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([compiler], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [GCJ])
++m4trace:configure.in:76: -1- AC_LIBTOOL_PROG_COMPILER_NO_RTTI([GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_no_builtin_flag], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_no_builtin_flag], [GCJ])
++m4trace:configure.in:76: -1- AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], [lt_cv_prog_compiler_rtti_exceptions], [-fno-rtti -fno-exceptions], [], [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, GCJ)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, GCJ) -fno-rtti -fno-exceptions"])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_no_builtin_flag], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_no_builtin_flag], [GCJ])
++m4trace:configure.in:76: -1- AC_LIBTOOL_PROG_COMPILER_PIC([GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_can_build_shared], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_can_build_shared], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -2- _LT_AC_TAGVAR([lt_prog_compiler_pic_works], [GCJ])
++m4trace:configure.in:76: -1- AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, GCJ) works], [lt_prog_compiler_pic_works_GCJ], [$_LT_AC_TAGVAR(lt_prog_compiler_pic, GCJ)ifelse([GCJ],[],[ -DPIC],[ifelse([GCJ],[CXX],[ -DPIC],[])])], [], [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, GCJ) in
++     "" | " "*) ;;
++     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, GCJ)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, GCJ)" ;;
++     esac], [_LT_AC_TAGVAR(lt_prog_compiler_pic, GCJ)=
++     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, GCJ)=no])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_can_build_shared], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- AC_LIBTOOL_PROG_CC_C_O([GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [GCJ])
++m4trace:configure.in:76: -1- AC_LIBTOOL_SYS_HARD_LINK_LOCKS([GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [GCJ])
++m4trace:configure.in:76: -1- AC_LIBTOOL_PROG_LD_SHLIBS([GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([enable_shared_with_static_runtimes], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_From_new_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_expsyms_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([thread_safe_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec_ld], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([link_all_deplibs], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_automatic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_expsym_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([always_export_symbols], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([include_expsyms], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([exclude_expsyms], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([always_export_symbols], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([enable_shared_with_static_runtimes], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([always_export_symbols], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([link_all_deplibs], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([always_export_symbols], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_SYS_LIBPATH_AIX
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_SYS_LIBPATH_AIX
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([no_undefined_flag], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([always_export_symbols], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_From_new_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([enable_shared_with_static_runtimes], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_automatic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([link_all_deplibs], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_expsym_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_expsym_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec_ld], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec_ld], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([link_all_deplibs], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_From_new_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([no_undefined_flag], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([link_all_deplibs], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([reload_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([no_undefined_flag], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([no_undefined_flag], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([ld_shlibs], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [GCJ])
++m4trace:configure.in:76: -2- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [GCJ])
++m4trace:configure.in:76: -1- AC_LIBTOOL_SYS_DYNAMIC_LINKER([GCJ])
++m4trace:configure.in:76: -1- AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([runpath_var], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_automatic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [GCJ])
++m4trace:configure.in:76: -1- AC_LIBTOOL_SYS_LIB_STRIP
++m4trace:configure.in:76: -1- AC_LIBTOOL_DLOPEN_SELF([GCJ])
++m4trace:configure.in:76: -1- AC_CHECK_LIB([dl], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], [
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ])
++m4trace:configure.in:76: -1- AC_CHECK_LIB([dld], [shl_load], [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], [AC_CHECK_FUNC([dlopen],
++	      [lt_cv_dlopen="dlopen"],
++	  [AC_CHECK_LIB([dl], [dlopen],
++		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
++	    [AC_CHECK_LIB([svld], [dlopen],
++		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++	      [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	      ])
++	    ])
++	  ])
++	])
++m4trace:configure.in:76: -1- AC_CHECK_LIB([dl], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], [AC_CHECK_LIB([svld], [dlopen],
++		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++	      [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	      ])
++	    ])
++m4trace:configure.in:76: -1- AC_CHECK_LIB([svld], [dlopen], [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], [AC_CHECK_LIB([dld], [dld_link],
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++	      ])
++m4trace:configure.in:76: -1- AC_CHECK_LIB([dld], [dld_link], [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++m4trace:configure.in:76: -1- _LT_AC_TRY_DLOPEN_SELF([lt_cv_dlopen_self=yes], [lt_cv_dlopen_self=yes], [lt_cv_dlopen_self=no], [lt_cv_dlopen_self=cross])
++m4trace:configure.in:76: -1- _LT_AC_TRY_DLOPEN_SELF([lt_cv_dlopen_self_static=yes], [lt_cv_dlopen_self_static=yes], [lt_cv_dlopen_self_static=no], [lt_cv_dlopen_self_static=cross])
++m4trace:configure.in:76: -1- AC_LIBTOOL_CONFIG([GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([compiler], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([CC], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([LD], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_no_builtin_flag], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([thread_safe_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([enable_shared_with_static_runtimes], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_new_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([predep_objects], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postdep_objects], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([predeps], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postdeps], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([compiler_lib_search_path], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postinstall_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postuninstall_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_expsyms_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([no_undefined_flag], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec_ld], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_automatic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_expsym_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([exclude_expsyms], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([include_expsyms], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_new_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_expsym_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_expsyms_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([enable_shared_with_static_runtimes], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([compiler], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([GCC], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([LD], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_no_builtin_flag], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([thread_safe_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_new_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_expsyms_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_expsym_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([predep_objects], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postdep_objects], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([predeps], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postdeps], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([compiler_lib_search_path], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([no_undefined_flag], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec_ld], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_automatic], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([link_all_deplibs], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([fix_srcfile_path], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([always_export_symbols], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([exclude_expsyms], [GCJ])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([include_expsyms], [GCJ])
++m4trace:configure.in:76: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete.
++You should run autoupdate.], [autoconf/lang.m4:172: AC_LANG_RESTORE is expanded from...
++/usr/share/aclocal/libtool.m4:3819: _LT_AC_LANG_GCJ_CONFIG is expanded from...
++/usr/share/aclocal/libtool.m4:3772: AC_LIBTOOL_LANG_GCJ_CONFIG is expanded from...
++/usr/share/aclocal/libtool.m4:1742: _LT_AC_TAGCONFIG is expanded from...
++/usr/share/aclocal/libtool.m4:234: AC_LIBTOOL_SETUP is expanded from...
++configure.in:76: AC_LIBTOOL_SETUP is required by...
++/usr/share/aclocal/libtool.m4:90: _AC_PROG_LIBTOOL is expanded from...
++configure.in:76: _AC_PROG_LIBTOOL is required by...
++/usr/share/aclocal/libtool.m4:70: AC_PROG_LIBTOOL is expanded from...
++configure.in:76: the top level])
++m4trace:configure.in:76: -1- AC_LIBTOOL_LANG_RC_CONFIG
++m4trace:configure.in:76: -1- _LT_AC_LANG_RC_CONFIG([RC])
++m4trace:configure.in:76: -1- _m4_warn([obsolete], [The macro `AC_LANG_SAVE' is obsolete.
++You should run autoupdate.], [autoconf/lang.m4:166: AC_LANG_SAVE is expanded from...
++/usr/share/aclocal/libtool.m4:3858: _LT_AC_LANG_RC_CONFIG is expanded from...
++/usr/share/aclocal/libtool.m4:3827: AC_LIBTOOL_LANG_RC_CONFIG is expanded from...
++/usr/share/aclocal/libtool.m4:1742: _LT_AC_TAGCONFIG is expanded from...
++/usr/share/aclocal/libtool.m4:234: AC_LIBTOOL_SETUP is expanded from...
++configure.in:76: AC_LIBTOOL_SETUP is required by...
++/usr/share/aclocal/libtool.m4:90: _AC_PROG_LIBTOOL is expanded from...
++configure.in:76: _AC_PROG_LIBTOOL is required by...
++/usr/share/aclocal/libtool.m4:70: AC_PROG_LIBTOOL is expanded from...
++configure.in:76: the top level])
++m4trace:configure.in:76: -1- _m4_warn([obsolete], [instead of using `AC_LANG', `AC_LANG_SAVE',
++and `AC_LANG_RESTORE', you should use `AC_LANG_PUSH' and `AC_LANG_POP'.], [autoconf/lang.m4:166: AC_LANG_SAVE is expanded from...
++/usr/share/aclocal/libtool.m4:3858: _LT_AC_LANG_RC_CONFIG is expanded from...
++/usr/share/aclocal/libtool.m4:3827: AC_LIBTOOL_LANG_RC_CONFIG is expanded from...
++/usr/share/aclocal/libtool.m4:1742: _LT_AC_TAGCONFIG is expanded from...
++/usr/share/aclocal/libtool.m4:234: AC_LIBTOOL_SETUP is expanded from...
++configure.in:76: AC_LIBTOOL_SETUP is required by...
++/usr/share/aclocal/libtool.m4:90: _AC_PROG_LIBTOOL is expanded from...
++configure.in:76: _AC_PROG_LIBTOOL is required by...
++/usr/share/aclocal/libtool.m4:70: AC_PROG_LIBTOOL is expanded from...
++configure.in:76: the top level])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([objext], [RC])
++m4trace:configure.in:76: -1- _LT_AC_SYS_COMPILER
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([compiler], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [RC])
++m4trace:configure.in:76: -1- AC_LIBTOOL_CONFIG([RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([compiler], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([CC], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([LD], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_no_builtin_flag], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([thread_safe_flag_spec], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([enable_shared_with_static_runtimes], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_cmds], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_new_cmds], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([predep_objects], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postdep_objects], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([predeps], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postdeps], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([compiler_lib_search_path], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postinstall_cmds], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postuninstall_cmds], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_expsyms_cmds], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([no_undefined_flag], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec_ld], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_automatic], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_cmds], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_expsym_cmds], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([exclude_expsyms], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([include_expsyms], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_cmds], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_new_cmds], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_cmds], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_expsym_cmds], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_expsyms_cmds], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds_need_lc], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([enable_shared_with_static_runtimes], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([compiler], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([GCC], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([LD], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_wl], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_pic], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_cv_prog_compiler_c_o], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_static], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([lt_prog_compiler_no_builtin_flag], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_dynamic_flag_spec], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([whole_archive_flag_spec], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([thread_safe_flag_spec], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_cmds], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_new_cmds], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([old_archive_from_expsyms_cmds], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_cmds], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([archive_expsym_cmds], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_cmds], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([module_expsym_cmds], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([predep_objects], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postdep_objects], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([predeps], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([postdeps], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([compiler_lib_search_path], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([allow_undefined_flag], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([no_undefined_flag], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_action], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_flag_spec_ld], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_libdir_separator], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_direct], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_minus_L], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_shlibpath_var], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([hardcode_automatic], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([link_all_deplibs], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([fix_srcfile_path], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([always_export_symbols], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([export_symbols_cmds], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([exclude_expsyms], [RC])
++m4trace:configure.in:76: -1- _LT_AC_TAGVAR([include_expsyms], [RC])
++m4trace:configure.in:76: -1- _m4_warn([obsolete], [The macro `AC_LANG_RESTORE' is obsolete.
++You should run autoupdate.], [autoconf/lang.m4:172: AC_LANG_RESTORE is expanded from...
++/usr/share/aclocal/libtool.m4:3858: _LT_AC_LANG_RC_CONFIG is expanded from...
++/usr/share/aclocal/libtool.m4:3827: AC_LIBTOOL_LANG_RC_CONFIG is expanded from...
++/usr/share/aclocal/libtool.m4:1742: _LT_AC_TAGCONFIG is expanded from...
++/usr/share/aclocal/libtool.m4:234: AC_LIBTOOL_SETUP is expanded from...
++configure.in:76: AC_LIBTOOL_SETUP is required by...
++/usr/share/aclocal/libtool.m4:90: _AC_PROG_LIBTOOL is expanded from...
++configure.in:76: _AC_PROG_LIBTOOL is required by...
++/usr/share/aclocal/libtool.m4:70: AC_PROG_LIBTOOL is expanded from...
++configure.in:76: the top level])
++m4trace:configure.in:76: -1- AC_SUBST([LIBTOOL])
++m4trace:configure.in:76: -1- AC_LIBTOOL_CXX
++m4trace:configure.in:76: -1- _LT_AC_LANG_CXX
++m4trace:configure.in:76: -1- _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
++m4trace:configure.in:76: -1- AC_LIBTOOL_F77
++m4trace:configure.in:76: -1- _LT_AC_LANG_F77
++m4trace:configure.in:76: -1- _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
++m4trace:configure.in:82: -1- AC_SUBST([INCLUDES])
++m4trace:configure.in:83: -1- AC_CHECK_HEADERS([sys/time.h sys/timeb.h io.h])
++m4trace:configure.in:83: -1- AH_OUTPUT([HAVE_SYS_TIME_H], [/* Define to 1 if you have the <sys/time.h> header file. */
++#undef HAVE_SYS_TIME_H])
++m4trace:configure.in:83: -1- AH_OUTPUT([HAVE_SYS_TIMEB_H], [/* Define to 1 if you have the <sys/timeb.h> header file. */
++#undef HAVE_SYS_TIMEB_H])
++m4trace:configure.in:83: -1- AH_OUTPUT([HAVE_IO_H], [/* Define to 1 if you have the <io.h> header file. */
++#undef HAVE_IO_H])
++m4trace:configure.in:84: -1- AC_CHECK_GENERATE_INTTYPES([include])
++m4trace:configure.in:84: -1- _m4_warn([cross], [AC_RUN_IFELSE called without default to allow cross compiling], [autoconf/general.m4:2281: AC_RUN_IFELSE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++autoconf/types.m4:405: AC_CHECK_SIZEOF is expanded from...
++autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
++acinclude.m4:107: AC_CHECK_GENERATE_INTTYPES is expanded from...
++configure.in:84: the top level])
++m4trace:configure.in:84: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_CHAR])
++m4trace:configure.in:84: -1- AH_OUTPUT([SIZEOF_CHAR], [/* The size of a `char\', as computed by sizeof. */
++#undef SIZEOF_CHAR])
++m4trace:configure.in:84: -1- _m4_warn([cross], [AC_RUN_IFELSE called without default to allow cross compiling], [autoconf/general.m4:2281: AC_RUN_IFELSE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++autoconf/types.m4:405: AC_CHECK_SIZEOF is expanded from...
++autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
++acinclude.m4:107: AC_CHECK_GENERATE_INTTYPES is expanded from...
++configure.in:84: the top level])
++m4trace:configure.in:84: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_SHORT])
++m4trace:configure.in:84: -1- AH_OUTPUT([SIZEOF_SHORT], [/* The size of a `short\', as computed by sizeof. */
++#undef SIZEOF_SHORT])
++m4trace:configure.in:84: -1- _m4_warn([cross], [AC_RUN_IFELSE called without default to allow cross compiling], [autoconf/general.m4:2281: AC_RUN_IFELSE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++autoconf/types.m4:405: AC_CHECK_SIZEOF is expanded from...
++autoconf/headers.m4:91: AC_CHECK_HEADER is expanded from...
++acinclude.m4:107: AC_CHECK_GENERATE_INTTYPES is expanded from...
++configure.in:84: the top level])
++m4trace:configure.in:84: -1- AC_DEFINE_TRACE_LITERAL([SIZEOF_INT])
++m4trace:configure.in:84: -1- AH_OUTPUT([SIZEOF_INT], [/* The size of a `int\', as computed by sizeof. */
++#undef SIZEOF_INT])
++m4trace:configure.in:87: -1- AC_C_CONST
++m4trace:configure.in:87: -1- AC_DEFINE_TRACE_LITERAL([const])
++m4trace:configure.in:87: -1- AH_OUTPUT([const], [/* Define to empty if `const\' does not conform to ANSI C. */
++#undef const])
++m4trace:configure.in:88: -1- AC_C_ALWAYS_INLINE
++m4trace:configure.in:88: -1- AC_C_INLINE
++m4trace:configure.in:88: -1- AH_OUTPUT([inline], [/* Define to `__inline__\' or `__inline\' if that\'s what the C compiler
++   calls it, or to nothing if \'inline\' is not supported under any name.  */
++#ifndef __cplusplus
++#undef inline
++#endif])
++m4trace:configure.in:88: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++acinclude.m4:36: AC_C_ALWAYS_INLINE is expanded from...
++configure.in:88: the top level])
++m4trace:configure.in:88: -1- AC_DEFINE_TRACE_LITERAL([inline])
++m4trace:configure.in:89: -1- AC_C_RESTRICT
++m4trace:configure.in:89: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++acinclude.m4:18: AC_C_RESTRICT is expanded from...
++configure.in:89: the top level])
++m4trace:configure.in:89: -1- AC_DEFINE_TRACE_LITERAL([restrict])
++m4trace:configure.in:89: -1- AH_OUTPUT([restrict], [/* Define as `__restrict\' if that\'s what the C compiler calls it, or to
++   nothing if it is not supported. */
++#undef restrict])
++m4trace:configure.in:89: -1- AC_DEFINE_TRACE_LITERAL([restrict])
++m4trace:configure.in:90: -1- AC_TYPE_SIZE_T
++m4trace:configure.in:90: -1- AC_DEFINE_TRACE_LITERAL([size_t])
++m4trace:configure.in:90: -1- AH_OUTPUT([size_t], [/* Define to `unsigned\' if <sys/types.h> does not define. */
++#undef size_t])
++m4trace:configure.in:91: -1- AC_DEFINE_TRACE_LITERAL([WORDS_BIGENDIAN])
++m4trace:configure.in:91: -1- AH_OUTPUT([WORDS_BIGENDIAN], [/* Define to 1 if your processor stores words with the most significant byte
++   first (like Motorola and SPARC, unlike Intel and VAX). */
++#undef WORDS_BIGENDIAN])
++m4trace:configure.in:94: -1- AC_CHECK_FUNCS([memalign gettimeofday ftime])
++m4trace:configure.in:94: -1- AH_OUTPUT([HAVE_MEMALIGN], [/* Define to 1 if you have the `memalign\' function. */
++#undef HAVE_MEMALIGN])
++m4trace:configure.in:94: -1- AH_OUTPUT([HAVE_GETTIMEOFDAY], [/* Define to 1 if you have the `gettimeofday\' function. */
++#undef HAVE_GETTIMEOFDAY])
++m4trace:configure.in:94: -1- AH_OUTPUT([HAVE_FTIME], [/* Define to 1 if you have the `ftime\' function. */
++#undef HAVE_FTIME])
++m4trace:configure.in:95: -1- AC_TYPE_SIGNAL
++m4trace:configure.in:95: -1- AC_DEFINE_TRACE_LITERAL([RETSIGTYPE])
++m4trace:configure.in:95: -1- AH_OUTPUT([RETSIGTYPE], [/* Define as the return type of signal handlers (`int\' or `void\'). */
++#undef RETSIGTYPE])
++m4trace:liba52/configure.incl:1: -1- AC_SUBST([LIBA52_CFLAGS])
++m4trace:liba52/configure.incl:2: -1- AC_SUBST([LIBA52_LIBS])
++m4trace:liba52/configure.incl:10: -1- AC_DEFINE_TRACE_LITERAL([LIBA52_DOUBLE])
++m4trace:liba52/configure.incl:10: -1- AH_OUTPUT([LIBA52_DOUBLE], [/* a52 sample precision */
++#undef LIBA52_DOUBLE])
++m4trace:liba52/configure.incl:17: -1- AC_DEFINE_TRACE_LITERAL([LIBA52_DJBFFT])
++m4trace:liba52/configure.incl:17: -1- AH_OUTPUT([LIBA52_DJBFFT], [/* liba52 djbfft support */
++#undef LIBA52_DJBFFT])
++m4trace:libao/configure.incl:1: -1- AC_SUBST([LIBAO_LIBS])
++m4trace:libao/configure.incl:9: -1- AC_DEFINE_TRACE_LITERAL([LIBAO_OSS])
++m4trace:libao/configure.incl:9: -1- AH_OUTPUT([LIBAO_OSS], [/* libao OSS support */
++#undef LIBAO_OSS])
++m4trace:libao/configure.incl:11: -1- AC_CHECK_LIB([ossaudio], [_oss_ioctl], [LIBAO_LIBS="$LIBAO_LIBS -lossaudio"])
++m4trace:libao/configure.incl:21: -1- AC_DEFINE_TRACE_LITERAL([LIBAO_SOLARIS])
++m4trace:libao/configure.incl:21: -1- AH_OUTPUT([LIBAO_SOLARIS], [/* libao solaris support */
++#undef LIBAO_SOLARIS])
++m4trace:libao/configure.incl:32: -1- AC_DEFINE_TRACE_LITERAL([LIBAO_AL])
++m4trace:libao/configure.incl:32: -1- AH_OUTPUT([LIBAO_AL], [/* libao al support */
++#undef LIBAO_AL])
++m4trace:libao/configure.incl:43: -1- AC_DEFINE_TRACE_LITERAL([LIBAO_WIN])
++m4trace:libao/configure.incl:43: -1- AH_OUTPUT([LIBAO_WIN], [/* libao win support */
++#undef LIBAO_WIN])
++m4trace:configure.in:105: -1- AC_TRY_CFLAGS([$OPT_CFLAGS], [CFLAGS=$OPT_CFLAGS])
++m4trace:configure.in:105: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++acinclude.m4:67: AC_TRY_CFLAGS is expanded from...
++configure.in:105: the top level])
++m4trace:src/configure.incl:1: -1- AC_SUBST([A52DEC_CFLAGS])
++m4trace:configure.in:113: -1- AC_C_ATTRIBUTE_ALIGNED
++m4trace:configure.in:113: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
++You should run autoupdate.], [autoconf/general.m4:2180: AC_TRY_COMPILE is expanded from...
++autoconf/general.m4:1799: AC_CACHE_VAL is expanded from...
++autoconf/general.m4:1808: AC_CACHE_CHECK is expanded from...
++acinclude.m4:52: AC_C_ATTRIBUTE_ALIGNED is expanded from...
++configure.in:113: the top level])
++m4trace:configure.in:113: -1- AC_DEFINE_TRACE_LITERAL([ATTRIBUTE_ALIGNED_MAX])
++m4trace:configure.in:113: -1- AH_OUTPUT([ATTRIBUTE_ALIGNED_MAX], [/* maximum supported data alignment */
++#undef ATTRIBUTE_ALIGNED_MAX])
++m4trace:configure.in:115: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
++m4trace:configure.in:115: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
++m4trace:configure.in:115: -1- _AC_AM_CONFIG_HEADER_HOOK([$ac_file])
++m4trace:configure.in:115: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
+diff -uNr a52dec-0.7.4-orig/autotools/Makefile.in a52dec-0.7.4/autotools/Makefile.in
+--- a52dec-0.7.4-orig/autotools/Makefile.in	2002-07-28 13:50:54.000000000 +1000
++++ a52dec-0.7.4/autotools/Makefile.in	2005-02-06 16:25:43.385272976 +1100
+@@ -1,6 +1,8 @@
+-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
++# Makefile.in generated by automake 1.9.4 from Makefile.am.
++# @configure_input@
+ 
+-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004  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.
+@@ -10,171 +12,312 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+ 
+-
+-SHELL = @SHELL@
+-
++@SET_MAKE@
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+-prefix = @prefix@
+-exec_prefix = @exec_prefix@
+-
+-bindir = @bindir@
+-sbindir = @sbindir@
+-libexecdir = @libexecdir@
+-datadir = @datadir@
+-sysconfdir = @sysconfdir@
+-sharedstatedir = @sharedstatedir@
+-localstatedir = @localstatedir@
+-libdir = @libdir@
+-infodir = @infodir@
+-mandir = @mandir@
+-includedir = @includedir@
+-oldincludedir = /usr/include
+-
+-DESTDIR =
+-
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-
+ top_builddir = ..
+-
+-ACLOCAL = @ACLOCAL@
+-AUTOCONF = @AUTOCONF@
+-AUTOMAKE = @AUTOMAKE@
+-AUTOHEADER = @AUTOHEADER@
+-
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+-transform = @program_transform_name@
+-
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-host_alias = @host_alias@
++build_triplet = @build@
+ host_triplet = @host@
++subdir = autotools
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in config.guess \
++	config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++A52DEC_CFLAGS = @A52DEC_CFLAGS@
++ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
++AMTAR = @AMTAR@
++AR = @AR@
+ AS = @AS@
++AUTOCONF = @AUTOCONF@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
+ CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CXX = @CXX@
++CXXCPP = @CXXCPP@
++CXXDEPMODE = @CXXDEPMODE@
++CXXFLAGS = @CXXFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
+ ECHO = @ECHO@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
++F77 = @F77@
++FFLAGS = @FFLAGS@
+ INCLUDES = @INCLUDES@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++LDFLAGS = @LDFLAGS@
++LIBA52_CFLAGS = @LIBA52_CFLAGS@
++LIBA52_LIBS = @LIBA52_LIBS@
++LIBAO_LIBS = @LIBAO_LIBS@
++LIBOBJS = @LIBOBJS@
++LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
++LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ RANLIB = @RANLIB@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+-mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs
+-CONFIG_HEADER = ../include/config.h
+-CONFIG_CLEAN_FILES = 
+-DIST_COMMON =  Makefile.am Makefile.in config.guess config.sub \
+-install-sh ltmain.sh missing mkinstalldirs
+-
+-
+-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
++ac_ct_AR = @ac_ct_AR@
++ac_ct_AS = @ac_ct_AS@
++ac_ct_CC = @ac_ct_CC@
++ac_ct_CXX = @ac_ct_CXX@
++ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
++ac_ct_F77 = @ac_ct_F77@
++ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
++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@
++am__tar = @am__tar@
++am__untar = @am__untar@
++bindir = @bindir@
++build = @build@
++build_alias = @build_alias@
++build_cpu = @build_cpu@
++build_os = @build_os@
++build_vendor = @build_vendor@
++datadir = @datadir@
++exec_prefix = @exec_prefix@
++host = @host@
++host_alias = @host_alias@
++host_cpu = @host_cpu@
++host_os = @host_os@
++host_vendor = @host_vendor@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localstatedir = @localstatedir@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++sysconfdir = @sysconfdir@
++target_alias = @target_alias@
++all: all-am
+ 
+-TAR = tar
+-GZIP_ENV = --best
+-all: all-redirect
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps autotools/Makefile
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  autotools/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --gnu  autotools/Makefile
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) \
+-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
++mostlyclean-libtool:
++	-rm -f *.lo
+ 
++clean-libtool:
++	-rm -rf .libs _libs
++
++distclean-libtool:
++	-rm -f libtool
++uninstall-info-am:
+ tags: TAGS
+ TAGS:
+ 
++ctags: CTAGS
++CTAGS:
+ 
+-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+-
+-subdir = autotools
+ 
+ distdir: $(DISTFILES)
+-	@for file in $(DISTFILES); do \
+-	  d=$(srcdir); \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++	list='$(DISTFILES)'; for file in $$list; do \
++	  case $$file in \
++	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++	  esac; \
++	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++	    dir="/$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
++	  else \
++	    dir=''; \
++	  fi; \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++	    fi; \
++	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	    || cp -p $$d/$$file $(distdir)/$$file \
++	    || exit 1; \
+ 	  fi; \
+ 	done
+-info-am:
+-info: info-am
+-dvi-am:
+-dvi: dvi-am
+ check-am: all-am
+ check: check-am
+-installcheck-am:
+-installcheck: installcheck-am
+-install-exec-am:
++all-am: Makefile
++installdirs:
++install: install-am
+ install-exec: install-exec-am
+-
+-install-data-am:
+ install-data: install-data-am
++uninstall: uninstall-am
+ 
+ install-am: all-am
+ 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+-install: install-am
+-uninstall-am:
+-uninstall: uninstall-am
+-all-am: Makefile
+-all-redirect: all-am
+-install-strip:
+-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+-installdirs:
+-
+ 
++installcheck: installcheck-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++	  `test -z '$(STRIP)' || \
++	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ mostlyclean-generic:
+ 
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+-mostlyclean-am:  mostlyclean-generic
++	@echo "This command is intended for maintainers to use"
++	@echo "it deletes files that may require special tools to rebuild."
++clean: clean-am
+ 
+-mostlyclean: mostlyclean-am
++clean-am: clean-generic clean-libtool mostlyclean-am
+ 
+-clean-am:  clean-generic mostlyclean-am
++distclean: distclean-am
++	-rm -f Makefile
++distclean-am: clean-am distclean-generic distclean-libtool
+ 
+-clean: clean-am
++dvi: dvi-am
+ 
+-distclean-am:  distclean-generic clean-am
+-	-rm -f libtool
++dvi-am:
+ 
+-distclean: distclean-am
++html: html-am
+ 
+-maintainer-clean-am:  maintainer-clean-generic distclean-am
+-	@echo "This command is intended for maintainers to use;"
+-	@echo "it deletes files that may require special tools to rebuild."
++info: info-am
++
++info-am:
++
++install-data-am:
++
++install-exec-am:
++
++install-info: install-info-am
++
++install-man:
++
++installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
++	-rm -f Makefile
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-generic mostlyclean-libtool
++
++pdf: pdf-am
++
++pdf-am:
++
++ps: ps-am
++
++ps-am:
+ 
+-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
+-installcheck-am installcheck install-exec-am install-exec \
+-install-data-am install-data install-am install uninstall-am uninstall \
+-all-redirect all-am all installdirs mostlyclean-generic \
+-distclean-generic clean-generic maintainer-clean-generic clean \
+-mostlyclean distclean maintainer-clean
++uninstall-am: uninstall-info-am
+ 
++.PHONY: all all-am check check-am clean clean-generic clean-libtool \
++	distclean distclean-generic distclean-libtool distdir dvi \
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-exec install-exec-am \
++	install-info install-info-am install-man install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-generic \
++	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
++	uninstall-info-am
+ 
+ # 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 -uNr a52dec-0.7.4-orig/autotools/config.guess a52dec-0.7.4/autotools/config.guess
+--- a52dec-0.7.4-orig/autotools/config.guess	2002-07-28 13:50:38.000000000 +1000
++++ a52dec-0.7.4/autotools/config.guess	2005-02-06 16:25:42.540401416 +1100
+@@ -1,9 +1,9 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002 Free Software Foundation, Inc.
++#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+ 
+-timestamp='2002-05-29'
++timestamp='2004-11-12'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -53,7 +53,7 @@
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+ Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+@@ -88,30 +88,42 @@
+   exit 1
+ fi
+ 
++trap 'exit 1' 1 2 15
+ 
+-dummy=dummy-$$
+-trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
++# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
++# compiler to aid in system detection is discouraged as it requires
++# temporary files to be created and, as you can see below, it is a
++# headache to deal with in a portable fashion.
+ 
+-# CC_FOR_BUILD -- compiler used by this script.
+ # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+ # use `HOST_CC' if defined, but it is deprecated.
+ 
+-set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
+- ,,)    echo "int dummy(){}" > $dummy.c ;
++# Portable tmp directory creation inspired by the Autoconf team.
++
++set_cc_for_build='
++trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
++trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
++: ${TMPDIR=/tmp} ;
++ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
++ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
++ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
++ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
++dummy=$tmp/dummy ;
++tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
++case $CC_FOR_BUILD,$HOST_CC,$CC in
++ ,,)    echo "int x;" > $dummy.c ;
+ 	for c in cc gcc c89 c99 ; do
+-	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
+-	  if test $? = 0 ; then
++	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+ 	     CC_FOR_BUILD="$c"; break ;
+ 	  fi ;
+ 	done ;
+-	rm -f $dummy.c $dummy.o $dummy.rel ;
+ 	if test x"$CC_FOR_BUILD" = x ; then
+ 	  CC_FOR_BUILD=no_compiler_found ;
+ 	fi
+ 	;;
+  ,,*)   CC_FOR_BUILD=$CC ;;
+  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+-esac'
++esac ;'
+ 
+ # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+ # (ghazi@noc.rutgers.edu 1994-08-24)
+@@ -168,21 +180,38 @@
+ 		;;
+ 	esac
+ 	# The OS release
+-	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
++	# Debian GNU/NetBSD machines have a different userland, and
++	# thus, need a distinct triplet. However, they do not need
++	# kernel version information, so it can be replaced with a
++	# suitable tag, in the style of linux-gnu.
++	case "${UNAME_VERSION}" in
++	    Debian*)
++		release='-gnu'
++		;;
++	    *)
++		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
++		;;
++	esac
+ 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+ 	# contains redundant information, the shorter form:
+ 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ 	echo "${machine}-${os}${release}"
+ 	exit 0 ;;
++    amd64:OpenBSD:*:*)
++	echo x86_64-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
+     amiga:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+-    arc:OpenBSD:*:*)
+-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
++    cats:OpenBSD:*:*)
++	echo arm-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     hp300:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
++    luna88k:OpenBSD:*:*)
++    	echo m88k-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
+     mac68k:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+@@ -198,83 +227,76 @@
+     mvmeppc:OpenBSD:*:*)
+ 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+-    pmax:OpenBSD:*:*)
+-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+     sgi:OpenBSD:*:*)
+-	echo mipseb-unknown-openbsd${UNAME_RELEASE}
++	echo mips64-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     sun3:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+-    wgrisc:OpenBSD:*:*)
+-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+     *:OpenBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
++    *:ekkoBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
++	exit 0 ;;
++    macppc:MirBSD:*:*)
++	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
++	exit 0 ;;
++    *:MirBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
++	exit 0 ;;
+     alpha:OSF1:*:*)
+-	if test $UNAME_RELEASE = "V4.0"; then
++	case $UNAME_RELEASE in
++	*4.0)
+ 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+-	fi
++		;;
++	*5.*)
++	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
++		;;
++	esac
++	# According to Compaq, /usr/sbin/psrinfo has been available on
++	# OSF/1 and Tru64 systems produced since 1995.  I hope that
++	# covers most systems running today.  This code pipes the CPU
++	# types through head -n 1, so we only detect the type of CPU 0.
++	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
++	case "$ALPHA_CPU_TYPE" in
++	    "EV4 (21064)")
++		UNAME_MACHINE="alpha" ;;
++	    "EV4.5 (21064)")
++		UNAME_MACHINE="alpha" ;;
++	    "LCA4 (21066/21068)")
++		UNAME_MACHINE="alpha" ;;
++	    "EV5 (21164)")
++		UNAME_MACHINE="alphaev5" ;;
++	    "EV5.6 (21164A)")
++		UNAME_MACHINE="alphaev56" ;;
++	    "EV5.6 (21164PC)")
++		UNAME_MACHINE="alphapca56" ;;
++	    "EV5.7 (21164PC)")
++		UNAME_MACHINE="alphapca57" ;;
++	    "EV6 (21264)")
++		UNAME_MACHINE="alphaev6" ;;
++	    "EV6.7 (21264A)")
++		UNAME_MACHINE="alphaev67" ;;
++	    "EV6.8CB (21264C)")
++		UNAME_MACHINE="alphaev68" ;;
++	    "EV6.8AL (21264B)")
++		UNAME_MACHINE="alphaev68" ;;
++	    "EV6.8CX (21264D)")
++		UNAME_MACHINE="alphaev68" ;;
++	    "EV6.9A (21264/EV69A)")
++		UNAME_MACHINE="alphaev69" ;;
++	    "EV7 (21364)")
++		UNAME_MACHINE="alphaev7" ;;
++	    "EV7.9 (21364A)")
++		UNAME_MACHINE="alphaev79" ;;
++	esac
++	# A Pn.n version is a patched version.
+ 	# A Vn.n version is a released version.
+ 	# A Tn.n version is a released field test version.
+ 	# A Xn.n version is an unreleased experimental baselevel.
+ 	# 1.2 uses "1.2" for uname -r.
+-	cat <<EOF >$dummy.s
+-	.data
+-\$Lformat:
+-	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
+-
+-	.text
+-	.globl main
+-	.align 4
+-	.ent main
+-main:
+-	.frame \$30,16,\$26,0
+-	ldgp \$29,0(\$27)
+-	.prologue 1
+-	.long 0x47e03d80 # implver \$0
+-	lda \$2,-1
+-	.long 0x47e20c21 # amask \$2,\$1
+-	lda \$16,\$Lformat
+-	mov \$0,\$17
+-	not \$1,\$18
+-	jsr \$26,printf
+-	ldgp \$29,0(\$26)
+-	mov 0,\$16
+-	jsr \$26,exit
+-	.end main
+-EOF
+-	eval $set_cc_for_build
+-	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+-	if test "$?" = 0 ; then
+-		case `./$dummy` in
+-			0-0)
+-				UNAME_MACHINE="alpha"
+-				;;
+-			1-0)
+-				UNAME_MACHINE="alphaev5"
+-				;;
+-			1-1)
+-				UNAME_MACHINE="alphaev56"
+-				;;
+-			1-101)
+-				UNAME_MACHINE="alphapca56"
+-				;;
+-			2-303)
+-				UNAME_MACHINE="alphaev6"
+-				;;
+-			2-307)
+-				UNAME_MACHINE="alphaev67"
+-				;;
+-			2-1307)
+-				UNAME_MACHINE="alphaev68"
+-				;;
+-		esac
+-	fi
+-	rm -f $dummy.s $dummy
+-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
++	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ 	exit 0 ;;
+     Alpha\ *:Windows_NT*:*)
+ 	# How do we know it's Interix rather than the generic POSIX subsystem?
+@@ -297,6 +319,12 @@
+     *:OS/390:*:*)
+ 	echo i370-ibm-openedition
+ 	exit 0 ;;
++    *:z/VM:*:*)
++	echo s390-ibm-zvmoe
++	exit 0 ;;
++    *:OS400:*:*)
++        echo powerpc-ibm-os400
++	exit 0 ;;
+     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ 	echo arm-acorn-riscix${UNAME_RELEASE}
+ 	exit 0;;
+@@ -314,6 +342,13 @@
+     NILE*:*:*:dcosx)
+ 	echo pyramid-pyramid-svr4
+ 	exit 0 ;;
++    DRS?6000:unix:4.0:6*)
++	echo sparc-icl-nx6
++	exit 0 ;;
++    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
++	case `/usr/bin/uname -p` in
++	    sparc) echo sparc-icl-nx7 && exit 0 ;;
++	esac ;;
+     sun4H:SunOS:5.*:*)
+ 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit 0 ;;
+@@ -382,6 +417,9 @@
+     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+         echo m68k-unknown-mint${UNAME_RELEASE}
+         exit 0 ;;
++    m68k:machten:*:*)
++	echo m68k-apple-machten${UNAME_RELEASE}
++	exit 0 ;;
+     powerpc:machten:*:*)
+ 	echo powerpc-apple-machten${UNAME_RELEASE}
+ 	exit 0 ;;
+@@ -420,16 +458,18 @@
+ 	  exit (-1);
+ 	}
+ EOF
+-	$CC_FOR_BUILD $dummy.c -o $dummy \
+-	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+-	  && rm -f $dummy.c $dummy && exit 0
+-	rm -f $dummy.c $dummy
++	$CC_FOR_BUILD -o $dummy $dummy.c \
++	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
++	  && exit 0
+ 	echo mips-mips-riscos${UNAME_RELEASE}
+ 	exit 0 ;;
+     Motorola:PowerMAX_OS:*:*)
+ 	echo powerpc-motorola-powermax
+ 	exit 0 ;;
+-    Night_Hawk:*:*:PowerMAX_OS)
++    Motorola:*:4.3:PL8-*)
++	echo powerpc-harris-powermax
++	exit 0 ;;
++    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+ 	echo powerpc-harris-powermax
+ 	exit 0 ;;
+     Night_Hawk:Power_UNIX:*:*)
+@@ -504,8 +544,7 @@
+ 			exit(0);
+ 			}
+ EOF
+-		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+-		rm -f $dummy.c $dummy
++		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+ 		echo rs6000-ibm-aix3.2.5
+ 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+ 		echo rs6000-ibm-aix3.2.4
+@@ -603,11 +642,21 @@
+                   exit (0);
+               }
+ EOF
+-		    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null) && HP_ARCH=`./$dummy`
+-		    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
+-		    rm -f $dummy.c $dummy
++		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
++		    test -z "$HP_ARCH" && HP_ARCH=hppa
+ 		fi ;;
+ 	esac
++	if [ ${HP_ARCH} = "hppa2.0w" ]
++	then
++	    # avoid double evaluation of $set_cc_for_build
++	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
++	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
++	    then
++		HP_ARCH="hppa2.0w"
++	    else
++		HP_ARCH="hppa64"
++	    fi
++	fi
+ 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+ 	exit 0 ;;
+     ia64:HP-UX:*:*)
+@@ -641,8 +690,7 @@
+ 	  exit (0);
+ 	}
+ EOF
+-	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+-	rm -f $dummy.c $dummy
++	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+ 	echo unknown-hitachi-hiuxwe2
+ 	exit 0 ;;
+     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+@@ -700,21 +748,26 @@
+     CRAY*TS:*:*:*)
+ 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+-    CRAY*T3D:*:*:*)
+-	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+-	exit 0 ;;
+     CRAY*T3E:*:*:*)
+ 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+     CRAY*SV1:*:*:*)
+ 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
++    *:UNICOS/mp:*:*)
++	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	exit 0 ;;
+     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+ 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+         exit 0 ;;
++    5000:UNIX_System_V:4.*:*)
++        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
++        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++	exit 0 ;;
+     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+ 	exit 0 ;;
+@@ -736,14 +789,17 @@
+     i*:PW*:*)
+ 	echo ${UNAME_MACHINE}-pc-pw32
+ 	exit 0 ;;
+-    x86:Interix*:3*)
+-	echo i386-pc-interix3
++    x86:Interix*:[34]*)
++	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
++	exit 0 ;;
++    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
++	echo i${UNAME_MACHINE}-pc-mks
+ 	exit 0 ;;
+     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+ 	# How do we know it's Interix rather than the generic POSIX subsystem?
+ 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+ 	# UNAME_MACHINE based on the output of uname instead of i386?
+-	echo i386-pc-interix
++	echo i586-pc-interix
+ 	exit 0 ;;
+     i*:UWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-uwin
+@@ -755,17 +811,34 @@
+ 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit 0 ;;
+     *:GNU:*:*)
++	# the GNU system
+ 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ 	exit 0 ;;
++    *:GNU/*:*:*)
++	# other systems with GNU libc and userland
++	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
++	exit 0 ;;
+     i*86:Minix:*:*)
+ 	echo ${UNAME_MACHINE}-pc-minix
+ 	exit 0 ;;
+     arm*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit 0 ;;
++    cris:Linux:*:*)
++	echo cris-axis-linux-gnu
++	exit 0 ;;
++    crisv32:Linux:*:*)
++	echo crisv32-axis-linux-gnu
++	exit 0 ;;
++    frv:Linux:*:*)
++    	echo frv-unknown-linux-gnu
++	exit 0 ;;
+     ia64:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit 0 ;;
++    m32r*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
+     m68*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit 0 ;;
+@@ -786,8 +859,26 @@
+ 	#endif
+ EOF
+ 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+-	rm -f $dummy.c
+-	test x"${CPU}" != x && echo "${CPU}-pc-linux-gnu" && exit 0
++	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
++	;;
++    mips64:Linux:*:*)
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#undef CPU
++	#undef mips64
++	#undef mips64el
++	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
++	CPU=mips64el
++	#else
++	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
++	CPU=mips64
++	#else
++	CPU=
++	#endif
++	#endif
++EOF
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
++	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+ 	;;
+     ppc:Linux:*:*)
+ 	echo powerpc-unknown-linux-gnu
+@@ -823,6 +914,9 @@
+     s390:Linux:*:* | s390x:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-ibm-linux
+ 	exit 0 ;;
++    sh64*:Linux:*:*)
++    	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
+     sh*:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit 0 ;;
+@@ -849,7 +943,7 @@
+ 		;;
+ 	  a.out-i386-linux)
+ 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+-		exit 0 ;;		
++		exit 0 ;;
+ 	  coff-i386)
+ 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+ 		exit 0 ;;
+@@ -880,9 +974,11 @@
+ 	LIBC=gnuaout
+ 	#endif
+ 	#endif
++	#ifdef __dietlibc__
++	LIBC=dietlibc
++	#endif
+ EOF
+ 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+-	rm -f $dummy.c
+ 	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+ 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+ 	;;
+@@ -900,6 +996,26 @@
+         # Use sysv4.2uw... so that sysv4* matches it.
+ 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ 	exit 0 ;;
++    i*86:OS/2:*:*)
++	# If we were able to find `uname', then EMX Unix compatibility
++	# is probably installed.
++	echo ${UNAME_MACHINE}-pc-os2-emx
++	exit 0 ;;
++    i*86:XTS-300:*:STOP)
++	echo ${UNAME_MACHINE}-unknown-stop
++	exit 0 ;;
++    i*86:atheos:*:*)
++	echo ${UNAME_MACHINE}-unknown-atheos
++	exit 0 ;;
++	i*86:syllable:*:*)
++	echo ${UNAME_MACHINE}-pc-syllable
++	exit 0 ;;
++    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
++	echo i386-unknown-lynxos${UNAME_RELEASE}
++	exit 0 ;;
++    i*86:*DOS:*:*)
++	echo ${UNAME_MACHINE}-pc-msdosdjgpp
++	exit 0 ;;
+     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+ 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+ 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+@@ -934,9 +1050,6 @@
+ 		echo ${UNAME_MACHINE}-pc-sysv32
+ 	fi
+ 	exit 0 ;;
+-    i*86:*DOS:*:*)
+-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+-	exit 0 ;;
+     pc:*:*:*)
+ 	# Left here for compatibility:
+         # uname -m prints for DJGPP always 'pc', but it prints nothing about
+@@ -960,9 +1073,15 @@
+ 	# "miniframe"
+ 	echo m68010-convergent-sysv
+ 	exit 0 ;;
+-    M68*:*:R3V[567]*:*)
++    mc68k:UNIX:SYSTEM5:3.51m)
++	echo m68k-convergent-sysv
++	exit 0 ;;
++    M680?0:D-NIX:5.3:*)
++	echo m68k-diab-dnix
++	exit 0 ;;
++    M68*:*:R3V[5678]*:*)
+ 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0)
++    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+ 	OS_REL=''
+ 	test -r /etc/.relid \
+ 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+@@ -979,9 +1098,6 @@
+     mc68030:UNIX_System_V:4.*:*)
+ 	echo m68k-atari-sysv4
+ 	exit 0 ;;
+-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+-	echo i386-unknown-lynxos${UNAME_RELEASE}
+-	exit 0 ;;
+     TSUNAMI:LynxOS:2.*:*)
+ 	echo sparc-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
+@@ -1053,6 +1169,9 @@
+     SX-5:SUPER-UX:*:*)
+ 	echo sx5-nec-superux${UNAME_RELEASE}
+ 	exit 0 ;;
++    SX-6:SUPER-UX:*:*)
++	echo sx6-nec-superux${UNAME_RELEASE}
++	exit 0 ;;
+     Power*:Rhapsody:*:*)
+ 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ 	exit 0 ;;
+@@ -1060,7 +1179,12 @@
+ 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:Darwin:*:*)
+-	echo `uname -p`-apple-darwin${UNAME_RELEASE}
++	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
++	case $UNAME_PROCESSOR in
++	    *86) UNAME_PROCESSOR=i686 ;;
++	    unknown) UNAME_PROCESSOR=powerpc ;;
++	esac
++	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:procnto*:*:* | *:QNX:[0123456789]*:*)
+ 	UNAME_PROCESSOR=`uname -p`
+@@ -1073,7 +1197,7 @@
+     *:QNX:*:4*)
+ 	echo i386-pc-qnx
+ 	exit 0 ;;
+-    NSR-[GKLNPTVW]:NONSTOP_KERNEL:*:*)
++    NSR-?:NONSTOP_KERNEL:*:*)
+ 	echo nsr-tandem-nsk${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:NonStop-UX:*:*)
+@@ -1096,11 +1220,6 @@
+ 	fi
+ 	echo ${UNAME_MACHINE}-unknown-plan9
+ 	exit 0 ;;
+-    i*86:OS/2:*:*)
+-	# If we were able to find `uname', then EMX Unix compatibility
+-	# is probably installed.
+-	echo ${UNAME_MACHINE}-pc-os2-emx
+-	exit 0 ;;
+     *:TOPS-10:*:*)
+ 	echo pdp10-unknown-tops10
+ 	exit 0 ;;
+@@ -1119,11 +1238,21 @@
+     *:ITS:*:*)
+ 	echo pdp10-unknown-its
+ 	exit 0 ;;
+-    i*86:XTS-300:*:STOP)
+-	echo ${UNAME_MACHINE}-unknown-stop
++    SEI:*:*:SEIUX)
++        echo mips-sei-seiux${UNAME_RELEASE}
+ 	exit 0 ;;
+-    i*86:atheos:*:*)
+-	echo ${UNAME_MACHINE}-unknown-atheos
++    *:DragonFly:*:*)
++	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
++	exit 0 ;;
++    *:*VMS:*:*)
++    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
++	case "${UNAME_MACHINE}" in
++	    A*) echo alpha-dec-vms && exit 0 ;;
++	    I*) echo ia64-dec-vms && exit 0 ;;
++	    V*) echo vax-dec-vms && exit 0 ;;
++	esac ;;
++    *:XENIX:*:SysV)
++	echo i386-pc-xenix
+ 	exit 0 ;;
+ esac
+ 
+@@ -1245,8 +1374,7 @@
+ }
+ EOF
+ 
+-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
+-rm -f $dummy.c $dummy
++$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+ 
+ # Apollos put the system type in the environment.
+ 
+diff -uNr a52dec-0.7.4-orig/autotools/config.sub a52dec-0.7.4/autotools/config.sub
+--- a52dec-0.7.4-orig/autotools/config.sub	2002-07-28 13:50:38.000000000 +1000
++++ a52dec-0.7.4/autotools/config.sub	2005-02-06 16:25:42.542401112 +1100
+@@ -1,9 +1,9 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
+ #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002 Free Software Foundation, Inc.
++#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+ 
+-timestamp='2002-06-21'
++timestamp='2004-11-30'
+ 
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -70,7 +70,7 @@
+ version="\
+ GNU config.sub ($timestamp)
+ 
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+ Free Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+@@ -118,7 +118,8 @@
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+-  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*)
++  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
++  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+     os=-$maybe_os
+     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+     ;;
+@@ -144,7 +145,7 @@
+ 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+-	-apple | -axis)
++	-apple | -axis | -knuth | -cray)
+ 		os=
+ 		basic_machine=$1
+ 		;;
+@@ -228,39 +229,45 @@
+ 	| a29k \
+ 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
++	| am33_2.0 \
+ 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+ 	| c4x | clipper \
+ 	| d10v | d30v | dlx | dsp16xx \
+ 	| fr30 | frv \
+ 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ 	| i370 | i860 | i960 | ia64 \
+-	| ip2k \
+-	| m32r | m68000 | m68k | m88k | mcore \
++	| ip2k | iq2000 \
++	| m32r | m32rle | m68000 | m68k | m88k | mcore \
+ 	| mips | mipsbe | mipseb | mipsel | mipsle \
+ 	| mips16 \
+ 	| mips64 | mips64el \
++	| mips64vr | mips64vrel \
+ 	| mips64orion | mips64orionel \
+ 	| mips64vr4100 | mips64vr4100el \
+ 	| mips64vr4300 | mips64vr4300el \
+ 	| mips64vr5000 | mips64vr5000el \
+ 	| mipsisa32 | mipsisa32el \
++	| mipsisa32r2 | mipsisa32r2el \
+ 	| mipsisa64 | mipsisa64el \
++	| mipsisa64r2 | mipsisa64r2el \
+ 	| mipsisa64sb1 | mipsisa64sb1el \
++	| mipsisa64sr71k | mipsisa64sr71kel \
+ 	| mipstx39 | mipstx39el \
+ 	| mn10200 | mn10300 \
++	| msp430 \
+ 	| ns16k | ns32k \
+ 	| openrisc | or32 \
+ 	| pdp10 | pdp11 | pj | pjl \
+ 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ 	| pyramid \
+-	| sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
++	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ 	| sh64 | sh64le \
+-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
++	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
+ 	| strongarm \
+-	| tahoe | thumb | tic80 | tron \
++	| tahoe | thumb | tic4x | tic80 | tron \
+ 	| v850 | v850e \
+ 	| we32k \
+-	| x86 | xscale | xstormy16 | xtensa \
++	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+ 	| z8k)
+ 		basic_machine=$basic_machine-unknown
+ 		;;
+@@ -292,44 +299,52 @@
+ 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+ 	| avr-* \
+ 	| bs2000-* \
+-	| c[123]* | c30-* | [cjt]90-* | c54x-* \
+-	| clipper-* | cydra-* \
++	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
++	| clipper-* | craynv-* | cydra-* \
+ 	| d10v-* | d30v-* | dlx-* \
+ 	| elxsi-* \
+ 	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+ 	| h8300-* | h8500-* \
+ 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ 	| i*86-* | i860-* | i960-* | ia64-* \
+-	| ip2k-* \
+-	| m32r-* \
++	| ip2k-* | iq2000-* \
++	| m32r-* | m32rle-* \
+ 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+ 	| m88110-* | m88k-* | mcore-* \
+ 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ 	| mips16-* \
+ 	| mips64-* | mips64el-* \
++	| mips64vr-* | mips64vrel-* \
+ 	| mips64orion-* | mips64orionel-* \
+ 	| mips64vr4100-* | mips64vr4100el-* \
+ 	| mips64vr4300-* | mips64vr4300el-* \
+ 	| mips64vr5000-* | mips64vr5000el-* \
+ 	| mipsisa32-* | mipsisa32el-* \
++	| mipsisa32r2-* | mipsisa32r2el-* \
+ 	| mipsisa64-* | mipsisa64el-* \
++	| mipsisa64r2-* | mipsisa64r2el-* \
+ 	| mipsisa64sb1-* | mipsisa64sb1el-* \
+-	| mipstx39 | mipstx39el \
++	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
++	| mipstx39-* | mipstx39el-* \
++	| mmix-* \
++	| msp430-* \
+ 	| none-* | np1-* | ns16k-* | ns32k-* \
+ 	| orion-* \
+ 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ 	| pyramid-* \
+ 	| romp-* | rs6000-* \
+-	| sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \
++	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+ 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ 	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
+-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+-	| tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
++	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
++	| tahoe-* | thumb-* \
++	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++	| tron-* \
+ 	| v850-* | v850e-* | vax-* \
+ 	| we32k-* \
+-	| x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
+-	| xtensa-* \
++	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
++	| xstormy16-* | xtensa-* \
+ 	| ymp-* \
+ 	| z8k-*)
+ 		;;
+@@ -349,6 +364,9 @@
+ 		basic_machine=a29k-amd
+ 		os=-udi
+ 		;;
++    	abacus)
++		basic_machine=abacus-unknown
++		;;
+ 	adobe68k)
+ 		basic_machine=m68010-adobe
+ 		os=-scout
+@@ -363,6 +381,12 @@
+ 		basic_machine=a29k-none
+ 		os=-bsd
+ 		;;
++	amd64)
++		basic_machine=x86_64-pc
++		;;
++	amd64-*)
++		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
+ 	amdahl)
+ 		basic_machine=580-amdahl
+ 		os=-sysv
+@@ -422,12 +446,27 @@
+ 		basic_machine=j90-cray
+ 		os=-unicos
+ 		;;
++	craynv)
++		basic_machine=craynv-cray
++		os=-unicosmp
++		;;
++	cr16c)
++		basic_machine=cr16c-unknown
++		os=-elf
++		;;
+ 	crds | unos)
+ 		basic_machine=m68k-crds
+ 		;;
++	crisv32 | crisv32-* | etraxfs*)
++		basic_machine=crisv32-axis
++		;;
+ 	cris | cris-* | etrax*)
+ 		basic_machine=cris-axis
+ 		;;
++	crx)
++		basic_machine=crx-unknown
++		os=-elf
++		;;
+ 	da30 | da30-*)
+ 		basic_machine=m68k-da30
+ 		;;
+@@ -450,6 +489,10 @@
+ 		basic_machine=m88k-motorola
+ 		os=-sysv3
+ 		;;
++	djgpp)
++		basic_machine=i586-pc
++		os=-msdosdjgpp
++		;;
+ 	dpx20 | dpx20-*)
+ 		basic_machine=rs6000-bull
+ 		os=-bosx
+@@ -628,10 +671,6 @@
+ 	mips3*)
+ 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+ 		;;
+-	mmix*)
+-		basic_machine=mmix-knuth
+-		os=-mmixware
+-		;;
+ 	monitor)
+ 		basic_machine=m68k-rom68k
+ 		os=-coff
+@@ -723,6 +762,10 @@
+ 		basic_machine=or32-unknown
+ 		os=-coff
+ 		;;
++	os400)
++		basic_machine=powerpc-ibm
++		os=-os400
++		;;
+ 	OSE68000 | ose68000)
+ 		basic_machine=m68000-ericsson
+ 		os=-ose
+@@ -745,49 +788,55 @@
+ 	pbb)
+ 		basic_machine=m68k-tti
+ 		;;
+-        pc532 | pc532-*)
++	pc532 | pc532-*)
+ 		basic_machine=ns32k-pc532
+ 		;;
+ 	pentium | p5 | k5 | k6 | nexgen | viac3)
+ 		basic_machine=i586-pc
+ 		;;
+-	pentiumpro | p6 | 6x86 | athlon)
++	pentiumpro | p6 | 6x86 | athlon | athlon_*)
+ 		basic_machine=i686-pc
+ 		;;
+-	pentiumii | pentium2)
++	pentiumii | pentium2 | pentiumiii | pentium3)
+ 		basic_machine=i686-pc
+ 		;;
++	pentium4)
++		basic_machine=i786-pc
++		;;
+ 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+ 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+ 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+-	pentiumii-* | pentium2-*)
++	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+ 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
++	pentium4-*)
++		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
+ 	pn)
+ 		basic_machine=pn-gould
+ 		;;
+ 	power)	basic_machine=power-ibm
+ 		;;
+ 	ppc)	basic_machine=powerpc-unknown
+-	        ;;
++		;;
+ 	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	ppcle | powerpclittle | ppc-le | powerpc-little)
+ 		basic_machine=powerpcle-unknown
+-	        ;;
++		;;
+ 	ppcle-* | powerpclittle-*)
+ 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	ppc64)	basic_machine=powerpc64-unknown
+-	        ;;
++		;;
+ 	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+ 		basic_machine=powerpc64le-unknown
+-	        ;;
++		;;
+ 	ppc64le-* | powerpc64little-*)
+ 		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+@@ -818,6 +867,16 @@
+ 		basic_machine=a29k-amd
+ 		os=-udi
+ 		;;
++	sb1)
++		basic_machine=mipsisa64sb1-unknown
++		;;
++	sb1el)
++		basic_machine=mipsisa64sb1el-unknown
++		;;
++	sei)
++		basic_machine=mips-sei
++		os=-seiux
++		;;
+ 	sequent)
+ 		basic_machine=i386-sequent
+ 		;;
+@@ -825,6 +884,9 @@
+ 		basic_machine=sh-hitachi
+ 		os=-hms
+ 		;;
++	sh64)
++		basic_machine=sh64-unknown
++		;;
+ 	sparclite-wrs | simso-wrs)
+ 		basic_machine=sparclite-wrs
+ 		os=-vxworks
+@@ -883,7 +945,7 @@
+ 	sun386 | sun386i | roadrunner)
+ 		basic_machine=i386-sun
+ 		;;
+-        sv1)
++	sv1)
+ 		basic_machine=sv1-cray
+ 		os=-unicos
+ 		;;
+@@ -891,10 +953,6 @@
+ 		basic_machine=i386-sequent
+ 		os=-dynix
+ 		;;
+-	t3d)
+-		basic_machine=alpha-cray
+-		os=-unicos
+-		;;
+ 	t3e)
+ 		basic_machine=alphaev5-cray
+ 		os=-unicos
+@@ -907,6 +965,14 @@
+ 		basic_machine=tic54x-unknown
+ 		os=-coff
+ 		;;
++	tic55x | c55x*)
++		basic_machine=tic55x-unknown
++		os=-coff
++		;;
++	tic6x | c6x*)
++		basic_machine=tic6x-unknown
++		os=-coff
++		;;
+ 	tx39)
+ 		basic_machine=mipstx39-unknown
+ 		;;
+@@ -920,6 +986,10 @@
+ 	tower | tower-32)
+ 		basic_machine=m68k-ncr
+ 		;;
++	tpf)
++		basic_machine=s390x-ibm
++		os=-tpf
++		;;
+ 	udi29k)
+ 		basic_machine=a29k-amd
+ 		os=-udi
+@@ -941,8 +1011,8 @@
+ 		os=-vms
+ 		;;
+ 	vpp*|vx|vx-*)
+-               basic_machine=f301-fujitsu
+-               ;;
++		basic_machine=f301-fujitsu
++		;;
+ 	vxworks960)
+ 		basic_machine=i960-wrs
+ 		os=-vxworks
+@@ -963,11 +1033,11 @@
+ 		basic_machine=hppa1.1-winbond
+ 		os=-proelf
+ 		;;
+-	windows32)
+-		basic_machine=i386-pc
+-		os=-windows32-msvcrt
++	xbox)
++		basic_machine=i686-pc
++		os=-mingw32
+ 		;;
+-        xps | xps100)
++	xps | xps100)
+ 		basic_machine=xps100-honeywell
+ 		;;
+ 	ymp)
+@@ -997,6 +1067,9 @@
+ 	romp)
+ 		basic_machine=romp-ibm
+ 		;;
++	mmix)
++		basic_machine=mmix-knuth
++		;;
+ 	rs6000)
+ 		basic_machine=rs6000-ibm
+ 		;;
+@@ -1013,16 +1086,16 @@
+ 	we32k)
+ 		basic_machine=we32k-att
+ 		;;
+-	sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele)
++	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+ 		basic_machine=sh-unknown
+ 		;;
+ 	sh64)
+ 		basic_machine=sh64-unknown
+ 		;;
+-	sparc | sparcv9 | sparcv9b)
++	sparc | sparcv8 | sparcv9 | sparcv9b)
+ 		basic_machine=sparc-sun
+ 		;;
+-        cydra)
++	cydra)
+ 		basic_machine=cydra-cydrome
+ 		;;
+ 	orion)
+@@ -1037,10 +1110,6 @@
+ 	pmac | pmac-mpw)
+ 		basic_machine=powerpc-apple
+ 		;;
+-	c4x*)
+-		basic_machine=c4x-none
+-		os=-coff
+-		;;
+ 	*-unknown)
+ 		# Make sure to match an already-canonicalized machine name.
+ 		;;
+@@ -1096,18 +1165,20 @@
+ 	      | -aos* \
+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
++	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
++	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
++	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ 	      | -chorusos* | -chorusrdb* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+-	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
++	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
++	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+ 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+ 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*)
++	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
++	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
+ 	-qnx*)
+@@ -1119,8 +1190,10 @@
+ 			;;
+ 		esac
+ 		;;
++	-nto-qnx*)
++		;;
+ 	-nto*)
+-		os=-nto-qnx
++		os=`echo $os | sed -e 's|nto|nto-qnx|'`
+ 		;;
+ 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+ 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+@@ -1129,6 +1202,9 @@
+ 	-mac*)
+ 		os=`echo $os | sed -e 's|mac|macos|'`
+ 		;;
++	-linux-dietlibc)
++		os=-linux-dietlibc
++		;;
+ 	-linux*)
+ 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+ 		;;
+@@ -1141,6 +1217,9 @@
+ 	-opened*)
+ 		os=-openedition
+ 		;;
++        -os400*)
++		os=-os400
++		;;
+ 	-wince*)
+ 		os=-wince
+ 		;;
+@@ -1162,6 +1241,9 @@
+ 	-atheos*)
+ 		os=-atheos
+ 		;;
++	-syllable*)
++		os=-syllable
++		;;
+ 	-386bsd)
+ 		os=-bsd
+ 		;;
+@@ -1172,7 +1254,7 @@
+ 		os=-rtmk-nova
+ 		;;
+ 	-ns2 )
+-	        os=-nextstep2
++		os=-nextstep2
+ 		;;
+ 	-nsk*)
+ 		os=-nsk
+@@ -1184,6 +1266,9 @@
+ 	-sinix*)
+ 		os=-sysv4
+ 		;;
++        -tpf*)
++		os=-tpf
++		;;
+ 	-triton*)
+ 		os=-sysv3
+ 		;;
+@@ -1211,8 +1296,17 @@
+ 	-xenix)
+ 		os=-xenix
+ 		;;
+-        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+-	        os=-mint
++	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
++		os=-mint
++		;;
++	-aros*)
++		os=-aros
++		;;
++	-kaos*)
++		os=-kaos
++		;;
++	-zvmoe)
++		os=-zvmoe
+ 		;;
+ 	-none)
+ 		;;
+@@ -1245,11 +1339,14 @@
+ 	arm*-semi)
+ 		os=-aout
+ 		;;
++    c4x-* | tic4x-*)
++        os=-coff
++        ;;
+ 	# This must come before the *-dec entry.
+ 	pdp10-*)
+ 		os=-tops20
+ 		;;
+-        pdp11-*)
++	pdp11-*)
+ 		os=-none
+ 		;;
+ 	*-dec | vax-*)
+@@ -1291,6 +1388,9 @@
+ 	*-ibm)
+ 		os=-aix
+ 		;;
++    	*-knuth)
++		os=-mmixware
++		;;
+ 	*-wec)
+ 		os=-proelf
+ 		;;
+@@ -1342,19 +1442,19 @@
+ 	*-next)
+ 		os=-nextstep3
+ 		;;
+-        *-gould)
++	*-gould)
+ 		os=-sysv
+ 		;;
+-        *-highlevel)
++	*-highlevel)
+ 		os=-bsd
+ 		;;
+ 	*-encore)
+ 		os=-bsd
+ 		;;
+-        *-sgi)
++	*-sgi)
+ 		os=-irix
+ 		;;
+-        *-siemens)
++	*-siemens)
+ 		os=-sysv4
+ 		;;
+ 	*-masscomp)
+@@ -1423,9 +1523,15 @@
+ 			-mvs* | -opened*)
+ 				vendor=ibm
+ 				;;
++			-os400*)
++				vendor=ibm
++				;;
+ 			-ptx*)
+ 				vendor=sequent
+ 				;;
++			-tpf*)
++				vendor=ibm
++				;;
+ 			-vxsim* | -vxworks* | -windiss*)
+ 				vendor=wrs
+ 				;;
+diff -uNr a52dec-0.7.4-orig/autotools/depcomp a52dec-0.7.4/autotools/depcomp
+--- a52dec-0.7.4-orig/autotools/depcomp	1970-01-01 10:00:00.000000000 +1000
++++ a52dec-0.7.4/autotools/depcomp	2005-02-06 16:25:43.162306872 +1100
+@@ -0,0 +1,522 @@
++#! /bin/sh
++# depcomp - compile a program generating dependencies as side-effects
++
++scriptversion=2004-05-31.23
++
++# Copyright (C) 1999, 2000, 2003, 2004 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
++# the Free Software Foundation; either version 2, or (at your option)
++# any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
++# 02111-1307, USA.
++
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
++
++case $1 in
++  '')
++     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
++     exit 1;
++     ;;
++  -h | --h*)
++    cat <<\EOF
++Usage: depcomp [--help] [--version] PROGRAM [ARGS]
++
++Run PROGRAMS ARGS to compile a file, generating dependencies
++as side-effects.
++
++Environment variables:
++  depmode     Dependency tracking mode.
++  source      Source file read by `PROGRAMS ARGS'.
++  object      Object file output by `PROGRAMS ARGS'.
++  DEPDIR      directory where to store dependencies.
++  depfile     Dependency file to output.
++  tmpdepfile  Temporary file to use when outputing dependencies.
++  libtool     Whether libtool is used (yes/no).
++
++Report bugs to <bug-automake@gnu.org>.
++EOF
++    exit 0
++    ;;
++  -v | --v*)
++    echo "depcomp $scriptversion"
++    exit 0
++    ;;
++esac
++
++if test -z "$depmode" || test -z "$source" || test -z "$object"; then
++  echo "depcomp: Variables source, object and depmode must be set" 1>&2
++  exit 1
++fi
++
++# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
++depfile=${depfile-`echo "$object" |
++  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
++tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
++
++rm -f "$tmpdepfile"
++
++# Some modes work just like other modes, but use different flags.  We
++# parameterize here, but still list the modes in the big case below,
++# to make depend.m4 easier to write.  Note that we *cannot* use a case
++# here, because this file can only contain one case statement.
++if test "$depmode" = hp; then
++  # HP compiler uses -M and no extra arg.
++  gccflag=-M
++  depmode=gcc
++fi
++
++if test "$depmode" = dashXmstdout; then
++   # This is just like dashmstdout with a different argument.
++   dashmflag=-xM
++   depmode=dashmstdout
++fi
++
++case "$depmode" in
++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"
++  stat=$?
++  if test $stat -eq 0; then :
++  else
++    rm -f "$tmpdepfile"
++    exit $stat
++  fi
++  mv "$tmpdepfile" "$depfile"
++  ;;
++
++gcc)
++## There are various ways to get dependency output from gcc.  Here's
++## why we pick this rather obscure method:
++## - Don't want to use -MD because we'd like the dependencies to end
++##   up in a subdir.  Having to rename by hand is ugly.
++##   (We might end up doing this anyway to support other compilers.)
++## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
++##   -MM, not -M (despite what the docs say).
++## - Using -M directly means running the compiler twice (even worse
++##   than renaming).
++  if test -z "$gccflag"; then
++    gccflag=-MD,
++  fi
++  "$@" -Wp,"$gccflag$tmpdepfile"
++  stat=$?
++  if test $stat -eq 0; then :
++  else
++    rm -f "$tmpdepfile"
++    exit $stat
++  fi
++  rm -f "$depfile"
++  echo "$object : \\" > "$depfile"
++  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
++## The second -e expression handles DOS-style file names with drive letters.
++  sed -e 's/^[^:]*: / /' \
++      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
++## This next piece of magic avoids the `deleted header file' problem.
++## The problem is that when a header file which appears in a .P file
++## is deleted, the dependency causes make to die (because there is
++## typically no way to rebuild the header).  We avoid this by adding
++## dummy dependencies for each header file.  Too bad gcc doesn't do
++## this for us directly.
++  tr ' ' '
++' < "$tmpdepfile" |
++## Some versions of gcc put a space before the `:'.  On the theory
++## that the space means something, we add a space to the output as
++## well.
++## Some versions of the HPUX 10.20 sed can't process this invocation
++## correctly.  Breaking it into two sed invocations is a workaround.
++    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
++  rm -f "$tmpdepfile"
++  ;;
++
++hp)
++  # This case exists only to let depend.m4 do its work.  It works by
++  # looking at the text of this script.  This case will never be run,
++  # since it is checked for above.
++  exit 1
++  ;;
++
++sgi)
++  if test "$libtool" = yes; then
++    "$@" "-Wp,-MDupdate,$tmpdepfile"
++  else
++    "$@" -MDupdate "$tmpdepfile"
++  fi
++  stat=$?
++  if test $stat -eq 0; then :
++  else
++    rm -f "$tmpdepfile"
++    exit $stat
++  fi
++  rm -f "$depfile"
++
++  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
++    echo "$object : \\" > "$depfile"
++
++    # Clip off the initial element (the dependent).  Don't try to be
++    # clever and replace this with sed code, as IRIX sed won't handle
++    # lines with more than a fixed number of characters (4096 in
++    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
++    # the IRIX cc adds comments like `#:fec' to the end of the
++    # dependency line.
++    tr ' ' '
++' < "$tmpdepfile" \
++    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
++    tr '
++' ' ' >> $depfile
++    echo >> $depfile
++
++    # The second pass generates a dummy entry for each header file.
++    tr ' ' '
++' < "$tmpdepfile" \
++   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
++   >> $depfile
++  else
++    # The sourcefile does not contain any dependencies, so just
++    # store a dummy comment line, to avoid errors with the Makefile
++    # "include basename.Plo" scheme.
++    echo "#dummy" > "$depfile"
++  fi
++  rm -f "$tmpdepfile"
++  ;;
++
++aix)
++  # The C for AIX Compiler uses -M and outputs the dependencies
++  # in a .u file.  In older versions, this file always lives in the
++  # current directory.  Also, the AIX compiler puts `$object:' at the
++  # start of each line; $object doesn't have directory information.
++  # Version 6 uses the directory in both cases.
++  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
++  tmpdepfile="$stripped.u"
++  if test "$libtool" = yes; then
++    "$@" -Wc,-M
++  else
++    "$@" -M
++  fi
++  stat=$?
++
++  if test -f "$tmpdepfile"; then :
++  else
++    stripped=`echo "$stripped" | sed 's,^.*/,,'`
++    tmpdepfile="$stripped.u"
++  fi
++
++  if test $stat -eq 0; then :
++  else
++    rm -f "$tmpdepfile"
++    exit $stat
++  fi
++
++  if test -f "$tmpdepfile"; then
++    outname="$stripped.o"
++    # Each line is of the form `foo.o: dependent.h'.
++    # Do two passes, one to just change these to
++    # `$object: dependent.h' and one to simply `dependent.h:'.
++    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
++    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
++  else
++    # The sourcefile does not contain any dependencies, so just
++    # store a dummy comment line, to avoid errors with the Makefile
++    # "include basename.Plo" scheme.
++    echo "#dummy" > "$depfile"
++  fi
++  rm -f "$tmpdepfile"
++  ;;
++
++icc)
++  # Intel's C compiler understands `-MD -MF file'.  However on
++  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
++  # ICC 7.0 will fill foo.d with something like
++  #    foo.o: sub/foo.c
++  #    foo.o: sub/foo.h
++  # which is wrong.  We want:
++  #    sub/foo.o: sub/foo.c
++  #    sub/foo.o: sub/foo.h
++  #    sub/foo.c:
++  #    sub/foo.h:
++  # ICC 7.1 will output
++  #    foo.o: sub/foo.c sub/foo.h
++  # and will wrap long lines using \ :
++  #    foo.o: sub/foo.c ... \
++  #     sub/foo.h ... \
++  #     ...
++
++  "$@" -MD -MF "$tmpdepfile"
++  stat=$?
++  if test $stat -eq 0; then :
++  else
++    rm -f "$tmpdepfile"
++    exit $stat
++  fi
++  rm -f "$depfile"
++  # Each line is of the form `foo.o: dependent.h',
++  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
++  # Do two passes, one to just change these to
++  # `$object: dependent.h' and one to simply `dependent.h:'.
++  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
++  # Some versions of the HPUX 10.20 sed can't process this invocation
++  # correctly.  Breaking it into two sed invocations is a workaround.
++  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
++    sed -e 's/$/ :/' >> "$depfile"
++  rm -f "$tmpdepfile"
++  ;;
++
++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'.
++   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
++   # dependencies in `foo.d' instead, so we check for that too.
++   # Subdirectories are respected.
++   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
++      # Dependencies are output in .lo.d with libtool 1.4.
++      # With libtool 1.5 they are output both in $dir.libs/$base.o.d
++      # and in $dir.libs/$base.o.d and $dir$base.o.d.  We process the
++      # latter, because the former will be cleaned when $dir.libs is
++      # erased.
++      tmpdepfile1="$dir.libs/$base.lo.d"
++      tmpdepfile2="$dir$base.o.d"
++      tmpdepfile3="$dir.libs/$base.d"
++      "$@" -Wc,-MD
++   else
++      tmpdepfile1="$dir$base.o.d"
++      tmpdepfile2="$dir$base.d"
++      tmpdepfile3="$dir$base.d"
++      "$@" -MD
++   fi
++
++   stat=$?
++   if test $stat -eq 0; then :
++   else
++      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
++      exit $stat
++   fi
++
++   if test -f "$tmpdepfile1"; then
++      tmpdepfile="$tmpdepfile1"
++   elif test -f "$tmpdepfile2"; then
++      tmpdepfile="$tmpdepfile2"
++   else
++      tmpdepfile="$tmpdepfile3"
++   fi
++   if test -f "$tmpdepfile"; then
++      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
++      # That's a tab and a space in the [].
++      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
++   else
++      echo "#dummy" > "$depfile"
++   fi
++   rm -f "$tmpdepfile"
++   ;;
++
++#nosideeffect)
++  # This comment above is used by automake to tell side-effect
++  # dependency tracking mechanisms from slower ones.
++
++dashmstdout)
++  # Important note: in order to support this mode, a compiler *must*
++  # always write the preprocessed file to stdout, regardless of -o.
++  "$@" || exit $?
++
++  # Remove the call to Libtool.
++  if test "$libtool" = yes; then
++    while test $1 != '--mode=compile'; do
++      shift
++    done
++    shift
++  fi
++
++  # Remove `-o $object'.
++  IFS=" "
++  for arg
++  do
++    case $arg in
++    -o)
++      shift
++      ;;
++    $object)
++      shift
++      ;;
++    *)
++      set fnord "$@" "$arg"
++      shift # fnord
++      shift # $arg
++      ;;
++    esac
++  done
++
++  test -z "$dashmflag" && dashmflag=-M
++  # Require at least two characters before searching for `:'
++  # in the target name.  This is to cope with DOS-style filenames:
++  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
++  "$@" $dashmflag |
++    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
++  rm -f "$depfile"
++  cat < "$tmpdepfile" > "$depfile"
++  tr ' ' '
++' < "$tmpdepfile" | \
++## Some versions of the HPUX 10.20 sed can't process this invocation
++## correctly.  Breaking it into two sed invocations is a workaround.
++    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
++  rm -f "$tmpdepfile"
++  ;;
++
++dashXmstdout)
++  # This case only exists to satisfy depend.m4.  It is never actually
++  # run, as this mode is specially recognized in the preamble.
++  exit 1
++  ;;
++
++makedepend)
++  "$@" || exit $?
++  # Remove any Libtool call
++  if test "$libtool" = yes; then
++    while test $1 != '--mode=compile'; do
++      shift
++    done
++    shift
++  fi
++  # X makedepend
++  shift
++  cleared=no
++  for arg in "$@"; do
++    case $cleared in
++    no)
++      set ""; shift
++      cleared=yes ;;
++    esac
++    case "$arg" in
++    -D*|-I*)
++      set fnord "$@" "$arg"; shift ;;
++    # Strip any option that makedepend may not understand.  Remove
++    # the object too, otherwise makedepend will parse it as a source file.
++    -*|$object)
++      ;;
++    *)
++      set fnord "$@" "$arg"; shift ;;
++    esac
++  done
++  obj_suffix="`echo $object | sed 's/^.*\././'`"
++  touch "$tmpdepfile"
++  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
++  rm -f "$depfile"
++  cat < "$tmpdepfile" > "$depfile"
++  sed '1,2d' "$tmpdepfile" | tr ' ' '
++' | \
++## Some versions of the HPUX 10.20 sed can't process this invocation
++## correctly.  Breaking it into two sed invocations is a workaround.
++    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
++  rm -f "$tmpdepfile" "$tmpdepfile".bak
++  ;;
++
++cpp)
++  # Important note: in order to support this mode, a compiler *must*
++  # always write the preprocessed file to stdout.
++  "$@" || exit $?
++
++  # Remove the call to Libtool.
++  if test "$libtool" = yes; then
++    while test $1 != '--mode=compile'; do
++      shift
++    done
++    shift
++  fi
++
++  # Remove `-o $object'.
++  IFS=" "
++  for arg
++  do
++    case $arg in
++    -o)
++      shift
++      ;;
++    $object)
++      shift
++      ;;
++    *)
++      set fnord "$@" "$arg"
++      shift # fnord
++      shift # $arg
++      ;;
++    esac
++  done
++
++  "$@" -E |
++    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
++    sed '$ s: \\$::' > "$tmpdepfile"
++  rm -f "$depfile"
++  echo "$object : \\" > "$depfile"
++  cat < "$tmpdepfile" >> "$depfile"
++  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
++  rm -f "$tmpdepfile"
++  ;;
++
++msvisualcpp)
++  # Important note: in order to support this mode, a compiler *must*
++  # always write the preprocessed file to stdout, regardless of -o,
++  # because we must use -o when running libtool.
++  "$@" || exit $?
++  IFS=" "
++  for arg
++  do
++    case "$arg" in
++    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
++	set fnord "$@"
++	shift
++	shift
++	;;
++    *)
++	set fnord "$@" "$arg"
++	shift
++	shift
++	;;
++    esac
++  done
++  "$@" -E |
++  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
++  rm -f "$depfile"
++  echo "$object : \\" > "$depfile"
++  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
++  echo "	" >> "$depfile"
++  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
++  rm -f "$tmpdepfile"
++  ;;
++
++none)
++  exec "$@"
++  ;;
++
++*)
++  echo "Unknown depmode $depmode" 1>&2
++  exit 1
++  ;;
++esac
++
++exit 0
++
++# Local Variables:
++# mode: shell-script
++# sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
+diff -uNr a52dec-0.7.4-orig/autotools/install-sh a52dec-0.7.4/autotools/install-sh
+--- a52dec-0.7.4-orig/autotools/install-sh	2002-07-28 13:50:41.000000000 +1000
++++ a52dec-0.7.4/autotools/install-sh	2005-02-06 16:25:42.495408256 +1100
+@@ -1,19 +1,38 @@
+ #!/bin/sh
+-#
+ # install - install a program, script, or datafile
+-# This comes from X11R5 (mit/util/scripts/install.sh).
++
++scriptversion=2004-12-17.09
++
++# This originates from X11R5 (mit/util/scripts/install.sh), which was
++# later released in X11R6 (xc/config/util/install.sh) with the
++# following copyright and license.
++#
++# Copyright (C) 1994 X Consortium
++#
++# Permission is hereby granted, free of charge, to any person obtaining a copy
++# of this software and associated documentation files (the "Software"), to
++# deal in the Software without restriction, including without limitation the
++# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
++# sell copies of the Software, and to permit persons to whom the Software is
++# furnished to do so, subject to the following conditions:
++#
++# The above copyright notice and this permission notice shall be included in
++# all copies or substantial portions of the Software.
+ #
+-# Copyright 1991 by the Massachusetts Institute of Technology
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
++# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ #
+-# Permission to use, copy, modify, distribute, and sell this software and its
+-# documentation for any purpose is hereby granted without fee, provided that
+-# the above copyright notice appear in all copies and that both that
+-# copyright notice and this permission notice appear in supporting
+-# documentation, and that the name of M.I.T. not be used in advertising or
+-# publicity pertaining to distribution of the software without specific,
+-# written prior permission.  M.I.T. makes no representations about the
+-# suitability of this software for any purpose.  It is provided "as is"
+-# without express or implied warranty.
++# Except as contained in this notice, the name of the X Consortium shall not
++# be used in advertising or otherwise to promote the sale, use or other deal-
++# ings in this Software without prior written authorization from the X Consor-
++# tium.
++#
++#
++# FSF changes to this file are in the public domain.
+ #
+ # Calling this script install-sh is preferred over install.sh, to prevent
+ # `make' implicit rules from creating a file called install from it
+@@ -23,13 +42,11 @@
+ # from scratch.  It can only install one file at a time, a restriction
+ # shared with many OS's install programs.
+ 
+-
+ # set DOITPROG to echo to test this script
+ 
+ # Don't use :- since 4.3BSD and earlier shells don't like it.
+ doit="${DOITPROG-}"
+ 
+-
+ # put in absolute paths if you don't have them in your path; or use env. vars.
+ 
+ mvprog="${MVPROG-mv}"
+@@ -41,211 +58,266 @@
+ rmprog="${RMPROG-rm}"
+ mkdirprog="${MKDIRPROG-mkdir}"
+ 
+-transformbasename=""
+-transform_arg=""
+-instcmd="$mvprog"
+ chmodcmd="$chmodprog 0755"
+-chowncmd=""
+-chgrpcmd=""
+-stripcmd=""
++chowncmd=
++chgrpcmd=
++stripcmd=
+ rmcmd="$rmprog -f"
+ mvcmd="$mvprog"
+-src=""
+-dst=""
+-dir_arg=""
+-
+-while [ x"$1" != x ]; do
+-    case $1 in
+-	-c) instcmd="$cpprog"
+-	    shift
+-	    continue;;
+-
+-	-d) dir_arg=true
+-	    shift
+-	    continue;;
+-
+-	-m) chmodcmd="$chmodprog $2"
+-	    shift
+-	    shift
+-	    continue;;
+-
+-	-o) chowncmd="$chownprog $2"
+-	    shift
+-	    shift
+-	    continue;;
+-
+-	-g) chgrpcmd="$chgrpprog $2"
+-	    shift
+-	    shift
+-	    continue;;
+-
+-	-s) stripcmd="$stripprog"
+-	    shift
+-	    continue;;
+-
+-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
+-	    shift
+-	    continue;;
+-
+-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
+-	    shift
+-	    continue;;
+-
+-	*)  if [ x"$src" = x ]
+-	    then
+-		src=$1
+-	    else
+-		# this colon is to work around a 386BSD /bin/sh bug
+-		:
+-		dst=$1
+-	    fi
+-	    shift
+-	    continue;;
+-    esac
+-done
+-
+-if [ x"$src" = x ]
+-then
+-	echo "install:	no input file specified"
+-	exit 1
+-else
+-	true
+-fi
+-
+-if [ x"$dir_arg" != x ]; then
+-	dst=$src
+-	src=""
+-	
+-	if [ -d $dst ]; then
+-		instcmd=:
+-		chmodcmd=""
+-	else
+-		instcmd=mkdir
+-	fi
+-else
+-
+-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
+-# might cause directories to be created, which would be especially bad 
+-# if $src (and thus $dsttmp) contains '*'.
+-
+-	if [ -f $src -o -d $src ]
+-	then
+-		true
+-	else
+-		echo "install:  $src does not exist"
+-		exit 1
+-	fi
+-	
+-	if [ x"$dst" = x ]
+-	then
+-		echo "install:	no destination specified"
+-		exit 1
+-	else
+-		true
+-	fi
+-
+-# If destination is a directory, append the input filename; if your system
+-# does not like double slashes in filenames, you may need to add some logic
+-
+-	if [ -d $dst ]
+-	then
+-		dst="$dst"/`basename $src`
+-	else
+-		true
+-	fi
+-fi
+-
+-## this sed command emulates the dirname command
+-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
+-
+-# Make sure that the destination directory exists.
+-#  this part is taken from Noah Friedman's mkinstalldirs script
++src=
++dst=
++dir_arg=
++dstarg=
++no_target_directory=
++
++usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
++   or: $0 [OPTION]... SRCFILES... DIRECTORY
++   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
++   or: $0 [OPTION]... -d DIRECTORIES...
++
++In the 1st form, copy SRCFILE to DSTFILE.
++In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
++In the 4th, create DIRECTORIES.
++
++Options:
++-c         (ignored)
++-d         create directories instead of installing files.
++-g GROUP   $chgrpprog installed files to GROUP.
++-m MODE    $chmodprog installed files to MODE.
++-o USER    $chownprog installed files to USER.
++-s         $stripprog installed files.
++-t DIRECTORY  install into DIRECTORY.
++-T         report an error if DSTFILE is a directory.
++--help     display this help and exit.
++--version  display version info and exit.
++
++Environment variables override the default commands:
++  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
++"
++
++while test -n "$1"; do
++  case $1 in
++    -c) shift
++        continue;;
++
++    -d) dir_arg=true
++        shift
++        continue;;
++
++    -g) chgrpcmd="$chgrpprog $2"
++        shift
++        shift
++        continue;;
++
++    --help) echo "$usage"; exit 0;;
++
++    -m) chmodcmd="$chmodprog $2"
++        shift
++        shift
++        continue;;
++
++    -o) chowncmd="$chownprog $2"
++        shift
++        shift
++        continue;;
++
++    -s) stripcmd=$stripprog
++        shift
++        continue;;
+ 
+-# Skip lots of stat calls in the usual case.
+-if [ ! -d "$dstdir" ]; then
+-defaultIFS=' 	
+-'
+-IFS="${IFS-${defaultIFS}}"
+-
+-oIFS="${IFS}"
+-# Some sh's can't handle IFS=/ for some reason.
+-IFS='%'
+-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
+-IFS="${oIFS}"
+-
+-pathcomp=''
++    -t) dstarg=$2
++	shift
++	shift
++	continue;;
+ 
+-while [ $# -ne 0 ] ; do
+-	pathcomp="${pathcomp}${1}"
++    -T) no_target_directory=true
+ 	shift
++	continue;;
+ 
+-	if [ ! -d "${pathcomp}" ] ;
+-        then
+-		$mkdirprog "${pathcomp}"
+-	else
+-		true
+-	fi
++    --version) echo "$0 $scriptversion"; exit 0;;
+ 
+-	pathcomp="${pathcomp}/"
++    *)  # 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
++	break;;
++  esac
+ done
+-fi
+-
+-if [ x"$dir_arg" != x ]
+-then
+-	$doit $instcmd $dst &&
+-
+-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
+-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
+-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
+-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
+-else
+-
+-# If we're going to rename the final executable, determine the name now.
+-
+-	if [ x"$transformarg" = x ] 
+-	then
+-		dstfile=`basename $dst`
+-	else
+-		dstfile=`basename $dst $transformbasename | 
+-			sed $transformarg`$transformbasename
+-	fi
+-
+-# don't allow the sed command to completely eliminate the filename
+-
+-	if [ x"$dstfile" = x ] 
+-	then
+-		dstfile=`basename $dst`
+-	else
+-		true
+-	fi
+-
+-# Make a temp file name in the proper directory.
+-
+-	dsttmp=$dstdir/#inst.$$#
+-
+-# Move or copy the file name to the temp name
+ 
+-	$doit $instcmd $src $dsttmp &&
+-
+-	trap "rm -f ${dsttmp}" 0 &&
+-
+-# and set any options; do chmod last to preserve setuid bits
+-
+-# If any of these fail, we abort the whole thing.  If we want to
+-# ignore errors from any of these, just make sure not to ignore
+-# errors from the above "$doit $instcmd $src $dsttmp" command.
+-
+-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
+-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
+-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
+-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
+-
+-# Now rename the file to the real destination.
+-
+-	$doit $rmcmd -f $dstdir/$dstfile &&
+-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
++if test -z "$1"; then
++  if test -z "$dir_arg"; then
++    echo "$0: no input file specified." >&2
++    exit 1
++  fi
++  # It's OK to call `install-sh -d' without argument.
++  # This can happen when creating conditional directories.
++  exit 0
++fi
+ 
+-fi &&
++for src
++do
++  # Protect names starting with `-'.
++  case $src in
++    -*) src=./$src ;;
++  esac
++
++  if test -n "$dir_arg"; then
++    dst=$src
++    src=
++
++    if test -d "$dst"; then
++      mkdircmd=:
++      chmodcmd=
++    else
++      mkdircmd=$mkdirprog
++    fi
++  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 '*'.
++    if test ! -f "$src" && test ! -d "$src"; then
++      echo "$0: $src does not exist." >&2
++      exit 1
++    fi
++
++    if test -z "$dstarg"; then
++      echo "$0: no destination specified." >&2
++      exit 1
++    fi
++
++    dst=$dstarg
++    # Protect names starting with `-'.
++    case $dst in
++      -*) dst=./$dst ;;
++    esac
+ 
++    # If destination is a directory, append the input filename; won't work
++    # if double slashes aren't ignored.
++    if test -d "$dst"; then
++      if test -n "$no_target_directory"; then
++	echo "$0: $dstarg: Is a directory" >&2
++	exit 1
++      fi
++      dst=$dst/`basename "$src"`
++    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
++
++    pathcomp=
++
++    while test $# -ne 0 ; do
++      pathcomp=$pathcomp$1
++      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
++      fi
++      pathcomp=$pathcomp/
++    done
++  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"; }
++
++  else
++    dstfile=`basename "$dst"`
++
++    # Make a couple of temp file names in the proper directory.
++    dsttmp=$dstdir/_inst.$$_
++    rmtmp=$dstdir/_rm.$$_
++
++    # 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" &&
++
++    # and set any options; do chmod last to preserve setuid bits.
++    #
++    # If any of these fail, we abort the whole thing.  If we want to
++    # ignore errors from any of these, just make sure not to ignore
++    # errors from the above "$doit $cpprog $src $dsttmp" command.
++    #
++    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
++      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
++      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
++      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
++
++    # Now rename the file to the real destination.
++    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 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
++	   # support -f.
++
++	   # Now remove or move aside any old file at destination location.
++	   # We try this two ways since rm can't unlink itself on some
++	   # systems and the destination file might be busy for other
++	   # 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 \
++	       || {
++		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
++		 (exit 1); exit 1
++	       }
++	     else
++	       :
++	     fi
++	   } &&
++
++	   # Now rename the file to the real destination.
++	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
++	 }
++    }
++  fi || { (exit 1); exit 1; }
++done
+ 
+-exit 0
++# The final little trick to "correctly" pass the exit status to the exit trap.
++{
++  (exit 0); exit 0
++}
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
+diff -uNr a52dec-0.7.4-orig/autotools/ltmain.sh a52dec-0.7.4/autotools/ltmain.sh
+--- a52dec-0.7.4-orig/autotools/ltmain.sh	2002-07-28 13:50:38.000000000 +1000
++++ a52dec-0.7.4/autotools/ltmain.sh	2005-02-06 16:25:00.414805480 +1100
+@@ -1,7 +1,7 @@
+ # ltmain.sh - Provide generalized library-building support services.
+ # NOTE: Changing this file will not affect anything until you rerun configure.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
+ # Free Software Foundation, Inc.
+ # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+ #
+@@ -24,6 +24,34 @@
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
++basename="s,^.*/,,g"
++
++# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
++# is ksh but when the shell is invoked as "sh" and the current value of
++# the _XPG environment variable is not equal to 1 (one), the special
++# positional parameter $0, within a function call, is the name of the
++# function.
++progpath="$0"
++
++# The name of this program:
++progname=`echo "$progpath" | $SED $basename`
++modename="$progname"
++
++# Global variables:
++EXIT_SUCCESS=0
++EXIT_FAILURE=1
++
++PROGRAM=ltmain.sh
++PACKAGE=libtool
++VERSION=1.5.10
++TIMESTAMP=" (1.1220.2.130 2004/09/19 12:13:49)"
++
++# See if we are running on zsh, and set the options which allow our
++# commands through without removal of \ escapes.
++if test -n "${ZSH_VERSION+set}" ; then
++  setopt NO_GLOB_SUBST
++fi
++
+ # Check that we have a working $echo.
+ if test "X$1" = X--no-reexec; then
+   # Discard the --no-reexec flag, and continue.
+@@ -36,7 +64,7 @@
+   :
+ else
+   # Restart under the correct shell, and then maybe $echo will work.
+-  exec $SHELL "$0" --no-reexec ${1+"$@"}
++  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+ fi
+ 
+ if test "X$1" = X--fallback-echo; then
+@@ -45,19 +73,9 @@
+   cat <<EOF
+ $*
+ EOF
+-  exit 0
++  exit $EXIT_SUCCESS
+ fi
+ 
+-# The name of this program.
+-progname=`$echo "$0" | sed 's%^.*/%%'`
+-modename="$progname"
+-
+-# Constants.
+-PROGRAM=ltmain.sh
+-PACKAGE=libtool
+-VERSION=1.4.2a
+-TIMESTAMP=" (1.922.2.79 2001/11/28 21:50:31)"
+-
+ default_mode=
+ help="Try \`$progname --help' for more information."
+ magic="%%%MAGIC variable%%%"
+@@ -67,10 +85,19 @@
+ 
+ # Sed substitution that helps us do robust quoting.  It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e 1s/^X//'
++Xsed="${SED}"' -e 1s/^X//'
+ sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
+-SP2NL='tr \040 \012'
+-NL2SP='tr \015\012 \040\040'
++# test EBCDIC or ASCII
++case `echo A|tr A '\301'` in
++ A) # EBCDIC based system
++  SP2NL="tr '\100' '\n'"
++  NL2SP="tr '\r\n' '\100\100'"
++  ;;
++ *) # Assume ASCII based system
++  SP2NL="tr '\040' '\012'"
++  NL2SP="tr '\015\012' '\040\040'"
++  ;;
++esac
+ 
+ # NLS nuisances.
+ # Only set LANG and LC_ALL to C if already set.
+@@ -85,12 +112,13 @@
+ fi
+ 
+ # Make sure IFS has a sensible default
+-: ${IFS=" 	"}
++: ${IFS=" 	
++"}
+ 
+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+-  echo "$modename: not configured to build any kind of library" 1>&2
+-  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+-  exit 1
++  $echo "$modename: not configured to build any kind of library" 1>&2
++  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
++  exit $EXIT_FAILURE
+ fi
+ 
+ # Global variables.
+@@ -105,8 +133,237 @@
+ lo2o="s/\\.lo\$/.${objext}/"
+ o2lo="s/\\.${objext}\$/.lo/"
+ 
++#####################################
++# Shell function definitions:
++# This seems to be the best place for them
++
++# func_win32_libid arg
++# return the library type of file 'arg'
++#
++# Need a lot of goo to handle *both* DLLs and import libs
++# Has to be a shell function in order to 'eat' the argument
++# that is supplied when $file_magic_command is called.
++func_win32_libid () {
++  win32_libid_type="unknown"
++  win32_fileres=`file -L $1 2>/dev/null`
++  case $win32_fileres in
++  *ar\ archive\ import\ library*) # definitely import
++    win32_libid_type="x86 archive import"
++    ;;
++  *ar\ archive*) # could be an import, or static
++    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
++      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
++      win32_nmres=`eval $NM -f posix -A $1 | \
++	sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
++      if test "X$win32_nmres" = "Ximport" ; then
++        win32_libid_type="x86 archive import"
++      else
++        win32_libid_type="x86 archive static"
++      fi
++    fi
++    ;;
++  *DLL*)
++    win32_libid_type="x86 DLL"
++    ;;
++  *executable*) # but shell scripts are "executable" too...
++    case $win32_fileres in
++    *MS\ Windows\ PE\ Intel*)
++      win32_libid_type="x86 DLL"
++      ;;
++    esac
++    ;;
++  esac
++  $echo $win32_libid_type
++}
++
++
++# func_infer_tag arg
++# Infer tagged configuration to use if any are available and
++# if one wasn't chosen via the "--tag" command line option.
++# Only attempt this if the compiler in the base compile
++# command doesn't match the default compiler.
++# arg is usually of the form 'gcc ...'
++func_infer_tag () {
++    if test -n "$available_tags" && test -z "$tagname"; then
++      CC_quoted=
++      for arg in $CC; do
++	case $arg in
++	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	  arg="\"$arg\""
++	  ;;
++	esac
++	CC_quoted="$CC_quoted $arg"
++      done
++      case $@ in
++      # Blanks in the command may have been stripped by the calling shell,
++      # but not from the CC environment variable when configure was run.
++      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
++      # Blanks at the start of $base_compile will cause this to fail
++      # if we don't check for them as well.
++      *)
++	for z in $available_tags; do
++	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
++	    # Evaluate the configuration.
++	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
++	    CC_quoted=
++	    for arg in $CC; do
++	    # Double-quote args containing other shell metacharacters.
++	    case $arg in
++	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	      arg="\"$arg\""
++	      ;;
++	    esac
++	    CC_quoted="$CC_quoted $arg"
++	  done
++	    case "$@ " in
++	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
++	      # The compiler in the base compile command matches
++	      # the one in the tagged configuration.
++	      # Assume this is the tagged configuration we want.
++	      tagname=$z
++	      break
++	      ;;
++	    esac
++	  fi
++	done
++	# If $tagname still isn't set, then no tagged configuration
++	# was found and let the user know that the "--tag" command
++	# line option must be used.
++	if test -z "$tagname"; then
++	  $echo "$modename: unable to infer tagged configuration"
++	  $echo "$modename: specify a tag with \`--tag'" 1>&2
++	  exit $EXIT_FAILURE
++#        else
++#          $echo "$modename: using $tagname tagged configuration"
++	fi
++	;;
++      esac
++    fi
++}
++
++
++# func_extract_archives gentop oldlib ...
++func_extract_archives () {
++    my_gentop="$1"; shift
++    my_oldlibs=${1+"$@"}
++    my_oldobjs=""
++    my_xlib=""
++    my_xabs=""
++    my_xdir=""
++    my_status=""
++
++    $show "${rm}r $my_gentop"
++    $run ${rm}r "$my_gentop"
++    $show "$mkdir $my_gentop"
++    $run $mkdir "$my_gentop"
++    my_status=$?
++    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
++      exit $my_status
++    fi
++
++    for my_xlib in $my_oldlibs; do
++      # Extract the objects.
++      case $my_xlib in
++	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
++	*) my_xabs=`pwd`"/$my_xlib" ;;
++      esac
++      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
++      my_xdir="$my_gentop/$my_xlib"
++
++      $show "${rm}r $my_xdir"
++      $run ${rm}r "$my_xdir"
++      $show "$mkdir $my_xdir"
++      $run $mkdir "$my_xdir"
++      status=$?
++      if test "$status" -ne 0 && test ! -d "$my_xdir"; then
++	exit $status
++      fi
++      case $host in
++      *-darwin*)
++	$show "Extracting $my_xabs"
++	# Do not bother doing anything if just a dry run
++	if test -z "$run"; then
++	  darwin_orig_dir=`pwd`
++	  cd $my_xdir || exit $?
++	  darwin_archive=$my_xabs
++	  darwin_curdir=`pwd`
++	  darwin_base_archive=`basename $darwin_archive`
++	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
++	  if test -n "$darwin_arches"; then 
++	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
++	    darwin_arch=
++	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
++	    for darwin_arch in  $darwin_arches ; do
++	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
++	      # Remove the table of contents from the thin files.
++	      $AR -d "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" __.SYMDEF 2>/dev/null || true
++	      $AR -d "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" __.SYMDEF\ SORTED 2>/dev/null || true
++	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++	      $AR -xo "${darwin_base_archive}"
++	      rm "${darwin_base_archive}"
++	      cd "$darwin_curdir"
++	    done # $darwin_arches
++      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
++	    darwin_filelist=`find unfat-$$ -type f | xargs basename | sort -u | $NL2SP`
++	    darwin_file=
++	    darwin_files=
++	    for darwin_file in $darwin_filelist; do
++	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
++	      lipo -create -output "$darwin_file" $darwin_files
++	    done # $darwin_filelist
++	    rm -rf unfat-$$
++	    cd "$darwin_orig_dir"
++	  else
++	    cd $darwin_orig_dir
++	    (cd $my_xdir && $AR x $my_xabs) || exit $?
++	  fi # $darwin_arches
++	fi # $run
++      ;;
++      *)
++	# We will extract separately just the conflicting names and we will
++	# no longer touch any unique names. It is faster to leave these
++	# extract automatically by $AR in one run.
++	$show "(cd $my_xdir && $AR x $my_xabs)"
++	$run eval "(cd \$my_xdir && $AR x \$my_xabs)" || exit $?
++	if ($AR t "$my_xabs" | sort | sort -uc >/dev/null 2>&1); then
++	  :
++	else
++	  $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
++	  $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
++	  $AR t "$my_xabs" | sort | uniq -cd | while read -r count name
++	  do
++	    i=1
++	    while test "$i" -le "$count"
++	    do
++	      # Put our $i before any first dot (extension)
++	      # Never overwrite any file
++	      name_to="$name"
++	      while test "X$name_to" = "X$name" || test -f "$my_xdir/$name_to"
++	      do
++		name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
++	      done
++	      $show "(cd $my_xdir && $AR xN $i $my_xabs '$name' && $mv '$name' '$name_to')"
++	      $run eval "(cd \$my_xdir && $AR xN $i \$my_xabs '$name' && $mv '$name' '$name_to')" || exit $?
++	      i=`expr $i + 1`
++	    done
++	  done
++	fi
++	;;
++      esac
++      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
++    done
++
++    func_extract_archives_result="$my_oldobjs"
++}
++# End of Shell function definitions
++#####################################
++
++# Darwin sucks
++eval std_shrext=\"$shrext_cmds\"
++
+ # Parse our command line options once, thoroughly.
+-while test $# -gt 0
++while test "$#" -gt 0
+ do
+   arg="$1"
+   shift
+@@ -122,6 +379,34 @@
+     execute_dlfiles)
+       execute_dlfiles="$execute_dlfiles $arg"
+       ;;
++    tag)
++      tagname="$arg"
++      preserve_args="${preserve_args}=$arg"
++
++      # Check whether tagname contains only valid characters
++      case $tagname in
++      *[!-_A-Za-z0-9,/]*)
++	$echo "$progname: invalid tag name: $tagname" 1>&2
++	exit $EXIT_FAILURE
++	;;
++      esac
++
++      case $tagname in
++      CC)
++	# Don't test for the "default" C tag, as we know, it's there, but
++	# not specially marked.
++	;;
++      *)
++	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
++	  taglist="$taglist $tagname"
++	  # Evaluate the configuration.
++	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
++	else
++	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
++	fi
++	;;
++      esac
++      ;;
+     *)
+       eval "$prev=\$arg"
+       ;;
+@@ -139,18 +424,27 @@
+     ;;
+ 
+   --version)
+-    echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+-    exit 0
++    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
++    $echo
++    $echo "Copyright (C) 2003  Free Software Foundation, Inc."
++    $echo "This is free software; see the source for copying conditions.  There is NO"
++    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++    exit $EXIT_SUCCESS
+     ;;
+ 
+   --config)
+-    sed -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
+-    exit 0
++    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
++    # Now print the configurations for the tags.
++    for tagname in $taglist; do
++      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
++    done
++    exit $EXIT_SUCCESS
+     ;;
+ 
+   --debug)
+-    echo "$progname: enabling shell trace mode"
++    $echo "$progname: enabling shell trace mode"
+     set -x
++    preserve_args="$preserve_args $arg"
+     ;;
+ 
+   --dry-run | -n)
+@@ -158,18 +452,18 @@
+     ;;
+ 
+   --features)
+-    echo "host: $host"
++    $echo "host: $host"
+     if test "$build_libtool_libs" = yes; then
+-      echo "enable shared libraries"
++      $echo "enable shared libraries"
+     else
+-      echo "disable shared libraries"
++      $echo "disable shared libraries"
+     fi
+     if test "$build_old_libs" = yes; then
+-      echo "enable static libraries"
++      $echo "enable static libraries"
+     else
+-      echo "disable static libraries"
++      $echo "disable static libraries"
+     fi
+-    exit 0
++    exit $EXIT_SUCCESS
+     ;;
+ 
+   --finish) mode="finish" ;;
+@@ -181,6 +475,15 @@
+ 
+   --quiet | --silent)
+     show=:
++    preserve_args="$preserve_args $arg"
++    ;;
++
++  --tag) prevopt="--tag" prev=tag ;;
++  --tag=*)
++    set tag "$optarg" ${1+"$@"}
++    shift
++    prev=tag
++    preserve_args="$preserve_args --tag"
+     ;;
+ 
+   -dlopen)
+@@ -191,7 +494,7 @@
+   -*)
+     $echo "$modename: unrecognized option \`$arg'" 1>&2
+     $echo "$help" 1>&2
+-    exit 1
++    exit $EXIT_FAILURE
+     ;;
+ 
+   *)
+@@ -204,7 +507,7 @@
+ if test -n "$prevopt"; then
+   $echo "$modename: option \`$prevopt' requires an argument" 1>&2
+   $echo "$help" 1>&2
+-  exit 1
++  exit $EXIT_FAILURE
+ fi
+ 
+ # If this variable is set in any of the actions, the command in it
+@@ -216,8 +519,10 @@
+ 
+   # Infer the operation mode.
+   if test -z "$mode"; then
++    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
++    $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
+     case $nonopt in
+-    *cc | *++ | gcc* | *-gcc*)
++    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
+       mode=link
+       for arg
+       do
+@@ -258,7 +563,7 @@
+   if test -n "$execute_dlfiles" && test "$mode" != execute; then
+     $echo "$modename: unrecognized option \`-dlopen'" 1>&2
+     $echo "$help" 1>&2
+-    exit 1
++    exit $EXIT_FAILURE
+   fi
+ 
+   # Change the help message to a mode-specific one.
+@@ -272,158 +577,124 @@
+     modename="$modename: compile"
+     # Get the compilation command and the source file.
+     base_compile=
+-    prev=
+-    lastarg=
+-    srcfile="$nonopt"
++    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
++    suppress_opt=yes
+     suppress_output=
++    arg_mode=normal
++    libobj=
++    later=
+ 
+-    user_target=no
+     for arg
+     do
+-      case $prev in
+-      "") ;;
+-      xcompiler)
+-	# Aesthetically quote the previous argument.
+-	prev=
+-	lastarg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+-
+-	case $arg in
+-	# Double-quote args containing other shell metacharacters.
+-	# Many Bourne shells cannot handle close brackets correctly
+-	# in scan sets, so we specify it separately.
+-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+-	  arg="\"$arg\""
+-	  ;;
+-	esac
+-
+-	# Add the previous argument to base_compile.
+-	if test -z "$base_compile"; then
+-	  base_compile="$lastarg"
+-	else
+-	  base_compile="$base_compile $lastarg"
+-	fi
+-	continue
+-	;;
+-      esac
+-
+-      # Accept any command-line options.
+-      case $arg in
+-      -o)
+-	if test "$user_target" != "no"; then
+-	  $echo "$modename: you cannot specify \`-o' more than once" 1>&2
+-	  exit 1
+-	fi
+-	user_target=next
++      case "$arg_mode" in
++      arg  )
++	# do not "continue".  Instead, add this to base_compile
++	lastarg="$arg"
++	arg_mode=normal
+ 	;;
+ 
+-      -static)
+-	build_old_libs=yes
++      target )
++	libobj="$arg"
++	arg_mode=normal
+ 	continue
+ 	;;
+ 
+-      -prefer-pic)
+-	pic_mode=yes
+-	continue
+-	;;
++      normal )
++	# Accept any command-line options.
++	case $arg in
++	-o)
++	  if test -n "$libobj" ; then
++	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
++	    exit $EXIT_FAILURE
++	  fi
++	  arg_mode=target
++	  continue
++	  ;;
+ 
+-      -prefer-non-pic)
+-	pic_mode=no
+-	continue
+-	;;
++	-static | -prefer-pic | -prefer-non-pic)
++	  later="$later $arg"
++	  continue
++	  ;;
+ 
+-      -Xcompiler)
+-	prev=xcompiler
+-	continue
+-	;;
++	-no-suppress)
++	  suppress_opt=no
++	  continue
++	  ;;
+ 
+-      -Wc,*)
+-	args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+-	lastarg=
+-	save_ifs="$IFS"; IFS=','
+-	for arg in $args; do
+-	  IFS="$save_ifs"
++	-Xcompiler)
++	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
++	  continue      #  The current "srcfile" will either be retained or
++	  ;;            #  replaced later.  I would guess that would be a bug.
++
++	-Wc,*)
++	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
++	  lastarg=
++	  save_ifs="$IFS"; IFS=','
++ 	  for arg in $args; do
++	    IFS="$save_ifs"
+ 
+-	  # Double-quote args containing other shell metacharacters.
+-	  # Many Bourne shells cannot handle close brackets correctly
+-	  # in scan sets, so we specify it separately.
+-	  case $arg in
+-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+-	    arg="\"$arg\""
+-	    ;;
+-	  esac
+-	  lastarg="$lastarg $arg"
+-	done
+-	IFS="$save_ifs"
+-	lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
++	    # Double-quote args containing other shell metacharacters.
++	    # Many Bourne shells cannot handle close brackets correctly
++	    # in scan sets, so we specify it separately.
++	    case $arg in
++	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	      arg="\"$arg\""
++	      ;;
++	    esac
++	    lastarg="$lastarg $arg"
++	  done
++	  IFS="$save_ifs"
++	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
+ 
+-	# Add the arguments to base_compile.
+-	if test -z "$base_compile"; then
+-	  base_compile="$lastarg"
+-	else
++	  # Add the arguments to base_compile.
+ 	  base_compile="$base_compile $lastarg"
+-	fi
+-	continue
+-	;;
+-      esac
++	  continue
++	  ;;
+ 
+-      case $user_target in
+-      next)
+-	# The next one is the -o target name
+-	user_target=yes
+-	continue
+-	;;
+-      yes)
+-	# We got the output file
+-	user_target=set
+-	libobj="$arg"
+-	continue
++	* )
++	  # Accept the current argument as the source file.
++	  # The previous "srcfile" becomes the current argument.
++	  #
++	  lastarg="$srcfile"
++	  srcfile="$arg"
++	  ;;
++	esac  #  case $arg
+ 	;;
+-      esac
+-
+-      # Accept the current argument as the source file.
+-      lastarg="$srcfile"
+-      srcfile="$arg"
++      esac    #  case $arg_mode
+ 
+       # Aesthetically quote the previous argument.
+-
+-      # Backslashify any backslashes, double quotes, and dollar signs.
+-      # These are the only characters that are still specially
+-      # interpreted inside of double-quoted scrings.
+       lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
+ 
++      case $lastarg in
+       # Double-quote args containing other shell metacharacters.
+       # Many Bourne shells cannot handle close brackets correctly
+       # in scan sets, so we specify it separately.
+-      case $lastarg in
+       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+ 	lastarg="\"$lastarg\""
+ 	;;
+       esac
+ 
+-      # Add the previous argument to base_compile.
+-      if test -z "$base_compile"; then
+-	base_compile="$lastarg"
+-      else
+-	base_compile="$base_compile $lastarg"
+-      fi
+-    done
++      base_compile="$base_compile $lastarg"
++    done # for arg
+ 
+-    case $user_target in
+-    set)
++    case $arg_mode in
++    arg)
++      $echo "$modename: you must specify an argument for -Xcompile"
++      exit $EXIT_FAILURE
+       ;;
+-    no)
+-      # Get the name of the library object.
+-      libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
++    target)
++      $echo "$modename: you must specify a target with \`-o'" 1>&2
++      exit $EXIT_FAILURE
+       ;;
+     *)
+-      $echo "$modename: you must specify a target with \`-o'" 1>&2
+-      exit 1
++      # Get the name of the library object.
++      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
+       ;;
+     esac
+ 
+     # Recognize several different file suffixes.
+     # If the user specifies -o file.o, it is replaced with file.lo
+-    xform='[cCFSfmso]'
++    xform='[cCFSifmso]'
+     case $libobj in
+     *.ada) xform=ada ;;
+     *.adb) xform=adb ;;
+@@ -431,10 +702,13 @@
+     *.asm) xform=asm ;;
+     *.c++) xform=c++ ;;
+     *.cc) xform=cc ;;
++    *.ii) xform=ii ;;
++    *.class) xform=class ;;
+     *.cpp) xform=cpp ;;
+     *.cxx) xform=cxx ;;
+     *.f90) xform=f90 ;;
+     *.for) xform=for ;;
++    *.java) xform=java ;;
+     esac
+ 
+     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
+@@ -443,25 +717,55 @@
+     *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+     *)
+       $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+       ;;
+     esac
+ 
++    func_infer_tag $base_compile
++
++    for arg in $later; do
++      case $arg in
++      -static)
++	build_old_libs=yes
++	continue
++	;;
++
++      -prefer-pic)
++	pic_mode=yes
++	continue
++	;;
++
++      -prefer-non-pic)
++	pic_mode=no
++	continue
++	;;
++      esac
++    done
++
++    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
++    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
++    if test "X$xdir" = "X$obj"; then
++      xdir=
++    else
++      xdir=$xdir/
++    fi
++    lobj=${xdir}$objdir/$objname
++
+     if test -z "$base_compile"; then
+       $echo "$modename: you must specify a compilation command" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     # Delete any leftover library objects.
+     if test "$build_old_libs" = yes; then
+-      removelist="$obj $libobj"
++      removelist="$obj $lobj $libobj ${libobj}T"
+     else
+-      removelist="$libobj"
++      removelist="$lobj $libobj ${libobj}T"
+     fi
+ 
+     $run $rm $removelist
+-    trap "$run $rm $removelist; exit 1" 1 2 15
++    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+ 
+     # On Cygwin there's no "real" PIC flag so we must build both object types
+     case $host_os in
+@@ -469,7 +773,7 @@
+       pic_mode=default
+       ;;
+     esac
+-    if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then
++    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+       # non-PIC code in shared libraries is not supported
+       pic_mode=default
+     fi
+@@ -480,8 +784,9 @@
+       output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+       lockfile="$output_obj.lock"
+       removelist="$removelist $output_obj $lockfile"
+-      trap "$run $rm $removelist; exit 1" 1 2 15
++      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+     else
++      output_obj=
+       need_locks=no
+       lockfile=
+     fi
+@@ -489,13 +794,13 @@
+     # Lock this critical section if it is needed
+     # We use this script file to make the link, it avoids creating a new file
+     if test "$need_locks" = yes; then
+-      until $run ln "$0" "$lockfile" 2>/dev/null; do
++      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
+ 	$show "Waiting for $lockfile to be removed"
+ 	sleep 2
+       done
+     elif test "$need_locks" = warn; then
+       if test -f "$lockfile"; then
+-	echo "\
++	$echo "\
+ *** ERROR, $lockfile exists and contains:
+ `cat $lockfile 2>/dev/null`
+ 
+@@ -507,68 +812,67 @@
+ compiler."
+ 
+ 	$run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+-      echo $srcfile > "$lockfile"
++      $echo $srcfile > "$lockfile"
+     fi
+ 
+     if test -n "$fix_srcfile_path"; then
+       eval srcfile=\"$fix_srcfile_path\"
+     fi
+ 
++    $run $rm "$libobj" "${libobj}T"
++
++    # Create a libtool object file (analogous to a ".la" file),
++    # but don't create it if we're doing a dry run.
++    test -z "$run" && cat > ${libobj}T <<EOF
++# $libobj - a libtool object file
++# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
++#
++# Please DO NOT delete this file!
++# It is necessary for linking the library.
++
++# Name of the PIC object.
++EOF
++
+     # Only build a PIC object if we are building libtool libraries.
+     if test "$build_libtool_libs" = yes; then
+       # Without this assignment, base_compile gets emptied.
+       fbsd_hideous_sh_bug=$base_compile
+ 
+       if test "$pic_mode" != no; then
+-	# All platforms use -DPIC, to notify preprocessed assembler code.
+-	command="$base_compile $srcfile $pic_flag -DPIC"
++	command="$base_compile $srcfile $pic_flag"
+       else
+ 	# Don't build PIC code
+ 	command="$base_compile $srcfile"
+       fi
+-      if test "$build_old_libs" = yes; then
+-	lo_libobj="$libobj"
+-	dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
+-	if test "X$dir" = "X$libobj"; then
+-	  dir="$objdir"
+-	else
+-	  dir="$dir/$objdir"
+-	fi
+-	libobj="$dir/"`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
+ 
+-	if test -d "$dir"; then
+-	  $show "$rm $libobj"
+-	  $run $rm $libobj
+-	else
+-	  $show "$mkdir $dir"
+-	  $run $mkdir $dir
+-	  status=$?
+-	  if test $status -ne 0 && test ! -d $dir; then
+-	    exit $status
+-	  fi
++      if test ! -d "${xdir}$objdir"; then
++	$show "$mkdir ${xdir}$objdir"
++	$run $mkdir ${xdir}$objdir
++	status=$?
++	if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
++	  exit $status
+ 	fi
+       fi
+-      if test "$compiler_o_lo" = yes; then
+-	output_obj="$libobj"
+-	command="$command -o $output_obj"
+-      elif test "$compiler_c_o" = yes; then
+-	output_obj="$obj"
+-	command="$command -o $output_obj"
++
++      if test -z "$output_obj"; then
++	# Place PIC objects in $objdir
++	command="$command -o $lobj"
+       fi
+ 
+-      $run $rm "$output_obj"
++      $run $rm "$lobj" "$output_obj"
++
+       $show "$command"
+       if $run eval "$command"; then :
+       else
+ 	test -n "$output_obj" && $run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       if test "$need_locks" = warn &&
+-	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
+-	echo "\
++	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
++	$echo "\
+ *** ERROR, $lockfile contains:
+ `cat $lockfile 2>/dev/null`
+ 
+@@ -583,13 +887,13 @@
+ compiler."
+ 
+ 	$run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       # Just move the object if needed, then go on to compile the next one
+-      if test x"$output_obj" != x"$libobj"; then
+-	$show "$mv $output_obj $libobj"
+-	if $run $mv $output_obj $libobj; then :
++      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
++	$show "$mv $output_obj $lobj"
++	if $run $mv $output_obj $lobj; then :
+ 	else
+ 	  error=$?
+ 	  $run $rm $removelist
+@@ -597,48 +901,23 @@
+ 	fi
+       fi
+ 
+-      # If we have no pic_flag, then copy the object into place and finish.
+-      if (test -z "$pic_flag" || test "$pic_mode" != default) &&
+-	 test "$build_old_libs" = yes; then
+-	# Rename the .lo from within objdir to obj
+-	if test -f $obj; then
+-	  $show $rm $obj
+-	  $run $rm $obj
+-	fi
++      # Append the name of the PIC object to the libtool object file.
++      test -z "$run" && cat >> ${libobj}T <<EOF
++pic_object='$objdir/$objname'
+ 
+-	$show "$mv $libobj $obj"
+-	if $run $mv $libobj $obj; then :
+-	else
+-	  error=$?
+-	  $run $rm $removelist
+-	  exit $error
+-	fi
++EOF
+ 
+-	xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+-	if test "X$xdir" = "X$obj"; then
+-	  xdir="."
+-	else
+-	  xdir="$xdir"
+-	fi
+-	baseobj=`$echo "X$obj" | $Xsed -e "s%.*/%%"`
+-	libobj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
+-	# Now arrange that obj and lo_libobj become the same file
+-	$show "(cd $xdir && $LN_S $baseobj $libobj)"
+-	if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then
+-	  # Unlock the critical section if it was locked
+-	  if test "$need_locks" != no; then
+-	    $run $rm "$lockfile"
+-	  fi
+-	  exit 0
+-	else
+-	  error=$?
+-	  $run $rm $removelist
+-	  exit $error
+-	fi
++      # Allow error messages only from the first compilation.
++      if test "$suppress_opt" = yes; then
++        suppress_output=' >/dev/null 2>&1'
+       fi
++    else
++      # No PIC object so indicate it doesn't exist in the libtool
++      # object file.
++      test -z "$run" && cat >> ${libobj}T <<EOF
++pic_object=none
+ 
+-      # Allow error messages only from the first compilation.
+-      suppress_output=' >/dev/null 2>&1'
++EOF
+     fi
+ 
+     # Only build a position-dependent object if we build old libraries.
+@@ -647,27 +926,25 @@
+ 	# Don't build PIC code
+ 	command="$base_compile $srcfile"
+       else
+-	# All platforms use -DPIC, to notify preprocessed assembler code.
+-	command="$base_compile $srcfile $pic_flag -DPIC"
++	command="$base_compile $srcfile $pic_flag"
+       fi
+       if test "$compiler_c_o" = yes; then
+ 	command="$command -o $obj"
+-	output_obj="$obj"
+       fi
+ 
+       # Suppress compiler output if we already did a PIC compilation.
+       command="$command$suppress_output"
+-      $run $rm "$output_obj"
++      $run $rm "$obj" "$output_obj"
+       $show "$command"
+       if $run eval "$command"; then :
+       else
+ 	$run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       if test "$need_locks" = warn &&
+-	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
+-	echo "\
++	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
++	$echo "\
+ *** ERROR, $lockfile contains:
+ `cat $lockfile 2>/dev/null`
+ 
+@@ -682,11 +959,11 @@
+ compiler."
+ 
+ 	$run $rm $removelist
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       # Just move the object if needed
+-      if test x"$output_obj" != x"$obj"; then
++      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
+ 	$show "$mv $output_obj $obj"
+ 	if $run $mv $output_obj $obj; then :
+ 	else
+@@ -696,29 +973,31 @@
+ 	fi
+       fi
+ 
+-      # Create an invalid libtool object if no PIC, so that we do not
+-      # accidentally link it into a program.
+-      if test "$build_libtool_libs" != yes; then
+-	$show "echo timestamp > $libobj"
+-	$run eval "echo timestamp > \$libobj" || exit $?
+-      else
+-	# Move the .lo from within objdir
+-	$show "$mv $libobj $lo_libobj"
+-	if $run $mv $libobj $lo_libobj; then :
+-	else
+-	  error=$?
+-	  $run $rm $removelist
+-	  exit $error
+-	fi
+-      fi
++      # Append the name of the non-PIC object the libtool object file.
++      # Only append if the libtool object file exists.
++      test -z "$run" && cat >> ${libobj}T <<EOF
++# Name of the non-PIC object.
++non_pic_object='$objname'
++
++EOF
++    else
++      # Append the name of the non-PIC object the libtool object file.
++      # Only append if the libtool object file exists.
++      test -z "$run" && cat >> ${libobj}T <<EOF
++# Name of the non-PIC object.
++non_pic_object=none
++
++EOF
+     fi
+ 
++    $run $mv "${libobj}T" "${libobj}"
++
+     # Unlock the critical section if it was locked
+     if test "$need_locks" != no; then
+       $run $rm "$lockfile"
+     fi
+ 
+-    exit 0
++    exit $EXIT_SUCCESS
+     ;;
+ 
+   # libtool link mode
+@@ -729,7 +1008,7 @@
+       # It is impossible to link a dll without this setting, and
+       # we shouldn't force the makefile maintainer to figure out
+       # which system we are compiling for in order to pass an extra
+-      # flag for every libtool invokation.
++      # flag for every libtool invocation.
+       # allow_undefined=no
+ 
+       # FIXME: Unfortunately, there are problems with the above when trying
+@@ -744,6 +1023,7 @@
+       ;;
+     esac
+     libtool_args="$nonopt"
++    base_compile="$nonopt $@"
+     compile_command="$nonopt"
+     finalize_command="$nonopt"
+ 
+@@ -759,6 +1039,7 @@
+     linker_flags=
+     dllsearchpath=
+     lib_search_path=`pwd`
++    inst_prefix_dir=
+ 
+     avoid_version=no
+     dlfiles=
+@@ -773,6 +1054,8 @@
+     module=no
+     no_install=no
+     objs=
++    non_pic_objects=
++    precious_files_regex=
+     prefer_static_libs=no
+     preload=no
+     prev=
+@@ -784,6 +1067,9 @@
+     temp_rpath=
+     thread_safe=no
+     vinfo=
++    vinfo_number=no
++
++    func_infer_tag $base_compile
+ 
+     # We need to know -static, to get the right output filenames.
+     for arg
+@@ -814,7 +1100,7 @@
+     test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+ 
+     # Go through the arguments, transforming them on the way.
+-    while test $# -gt 0; do
++    while test "$#" -gt 0; do
+       arg="$1"
+       shift
+       case $arg in
+@@ -879,7 +1165,7 @@
+ 	  export_symbols="$arg"
+ 	  if test ! -f "$arg"; then
+ 	    $echo "$modename: symbol file \`$arg' does not exist"
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  prev=
+ 	  continue
+@@ -889,18 +1175,135 @@
+ 	  prev=
+ 	  continue
+ 	  ;;
++	inst_prefix)
++	  inst_prefix_dir="$arg"
++	  prev=
++	  continue
++	  ;;
++	precious_regex)
++	  precious_files_regex="$arg"
++	  prev=
++	  continue
++	  ;;
+ 	release)
+ 	  release="-$arg"
+ 	  prev=
+ 	  continue
+ 	  ;;
++	objectlist)
++	  if test -f "$arg"; then
++	    save_arg=$arg
++	    moreargs=
++	    for fil in `cat $save_arg`
++	    do
++#	      moreargs="$moreargs $fil"
++	      arg=$fil
++	      # A libtool-controlled object.
++
++	      # Check to see that this really is a libtool object.
++	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++		pic_object=
++		non_pic_object=
++
++		# Read the .lo file
++		# If there is no directory component, then add one.
++		case $arg in
++		*/* | *\\*) . $arg ;;
++		*) . ./$arg ;;
++		esac
++
++		if test -z "$pic_object" || \
++		   test -z "$non_pic_object" ||
++		   test "$pic_object" = none && \
++		   test "$non_pic_object" = none; then
++		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
++		  exit $EXIT_FAILURE
++		fi
++
++		# Extract subdirectory from the argument.
++		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
++		if test "X$xdir" = "X$arg"; then
++		  xdir=
++		else
++		  xdir="$xdir/"
++		fi
++
++		if test "$pic_object" != none; then
++		  # Prepend the subdirectory the object is found in.
++		  pic_object="$xdir$pic_object"
++
++		  if test "$prev" = dlfiles; then
++		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
++		      dlfiles="$dlfiles $pic_object"
++		      prev=
++		      continue
++		    else
++		      # If libtool objects are unsupported, then we need to preload.
++		      prev=dlprefiles
++		    fi
++		  fi
++
++		  # CHECK ME:  I think I busted this.  -Ossama
++		  if test "$prev" = dlprefiles; then
++		    # Preload the old-style object.
++		    dlprefiles="$dlprefiles $pic_object"
++		    prev=
++		  fi
++
++		  # A PIC object.
++		  libobjs="$libobjs $pic_object"
++		  arg="$pic_object"
++		fi
++
++		# Non-PIC object.
++		if test "$non_pic_object" != none; then
++		  # Prepend the subdirectory the object is found in.
++		  non_pic_object="$xdir$non_pic_object"
++
++		  # A standard non-PIC object
++		  non_pic_objects="$non_pic_objects $non_pic_object"
++		  if test -z "$pic_object" || test "$pic_object" = none ; then
++		    arg="$non_pic_object"
++		  fi
++		fi
++	      else
++		# Only an error if not doing a dry-run.
++		if test -z "$run"; then
++		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
++		  exit $EXIT_FAILURE
++		else
++		  # Dry-run case.
++
++		  # Extract subdirectory from the argument.
++		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
++		  if test "X$xdir" = "X$arg"; then
++		    xdir=
++		  else
++		    xdir="$xdir/"
++		  fi
++
++		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
++		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
++		  libobjs="$libobjs $pic_object"
++		  non_pic_objects="$non_pic_objects $non_pic_object"
++		fi
++	      fi
++	    done
++	  else
++	    $echo "$modename: link input file \`$save_arg' does not exist"
++	    exit $EXIT_FAILURE
++	  fi
++	  arg=$save_arg
++	  prev=
++	  continue
++	  ;;
+ 	rpath | xrpath)
+ 	  # We need an absolute path.
+ 	  case $arg in
+ 	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+ 	  *)
+ 	    $echo "$modename: only absolute run-paths are allowed" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	    ;;
+ 	  esac
+ 	  if test "$prev" = rpath; then
+@@ -932,13 +1335,26 @@
+ 	  finalize_command="$finalize_command $wl$qarg"
+ 	  continue
+ 	  ;;
++	xcclinker)
++	  linker_flags="$linker_flags $qarg"
++	  compiler_flags="$compiler_flags $qarg"
++	  prev=
++	  compile_command="$compile_command $qarg"
++	  finalize_command="$finalize_command $qarg"
++	  continue
++	  ;;
++	shrext)
++  	  shrext_cmds="$arg"
++	  prev=
++	  continue
++	  ;;
+ 	*)
+ 	  eval "$prev=\"\$arg\""
+ 	  prev=
+ 	  continue
+ 	  ;;
+ 	esac
+-      fi # test -n $prev
++      fi # test -n "$prev"
+ 
+       prevarg="$arg"
+ 
+@@ -980,7 +1396,7 @@
+       -export-symbols | -export-symbols-regex)
+ 	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+ 	  $echo "$modename: more than one -exported-symbols argument is not allowed"
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 	if test "X$arg" = "X-export-symbols"; then
+ 	  prev=expsyms
+@@ -990,11 +1406,16 @@
+ 	continue
+ 	;;
+ 
++      -inst-prefix-dir)
++	prev=inst_prefix
++	continue
++	;;
++
+       # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+       # so, if we see these flags be careful not to treat them like -L
+       -L[A-Z][A-Z]*:*)
+ 	case $with_gcc/$host in
+-	no/*-*-irix* | no/*-*-nonstopux*)
++	no/*-*-irix* | /*-*-irix*)
+ 	  compile_command="$compile_command $arg"
+ 	  finalize_command="$finalize_command $arg"
+ 	  ;;
+@@ -1011,7 +1432,7 @@
+ 	  absdir=`cd "$dir" && pwd`
+ 	  if test -z "$absdir"; then
+ 	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  dir="$absdir"
+ 	  ;;
+@@ -1049,24 +1470,61 @@
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+-	  esac
+-	 elif test "X$arg" = "X-lc_r"; then
+-	  case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
+-	    # Do not include libc_r directly, use -pthread flag.
++	  *-*-rhapsody* | *-*-darwin1.[012])
++	    # Rhapsody C and math libraries are in the System framework
++	    deplibs="$deplibs -framework System"
+ 	    continue
+-	    ;;
+ 	  esac
++	elif test "X$arg" = "X-lc_r"; then
++	 case $host in
++	 *-*-openbsd* | *-*-freebsd*)
++	   # Do not include libc_r directly, use -pthread flag.
++	   continue
++	   ;;
++	 esac
+ 	fi
+ 	deplibs="$deplibs $arg"
+ 	continue
+ 	;;
+ 
++     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
++	deplibs="$deplibs $arg"
++	continue
++	;;
++
+       -module)
+ 	module=yes
+ 	continue
+ 	;;
+ 
++      # gcc -m* arguments should be passed to the linker via $compiler_flags
++      # in order to pass architecture information to the linker
++      # (e.g. 32 vs 64-bit).  This may also be accomplished via -Wl,-mfoo
++      # but this is not reliable with gcc because gcc may use -mfoo to
++      # select a different linker, different libraries, etc, while
++      # -Wl,-mfoo simply passes -mfoo to the linker.
++      -m*)
++	# Unknown arguments in both finalize_command and compile_command need
++	# to be aesthetically quoted because they are evaled later.
++	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
++	case $arg in
++	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
++	  arg="\"$arg\""
++	  ;;
++	esac
++        compile_command="$compile_command $arg"
++        finalize_command="$finalize_command $arg"
++        if test "$with_gcc" = "yes" ; then
++          compiler_flags="$compiler_flags $arg"
++        fi
++        continue
++        ;;
++
++      -shrext)
++	prev=shrext
++	continue
++	;;
++
+       -no-fast-install)
+ 	fast_install=no
+ 	continue
+@@ -1091,8 +1549,18 @@
+ 	continue
+ 	;;
+ 
++      -objectlist)
++	prev=objectlist
++	continue
++	;;
++
+       -o) prev=output ;;
+ 
++      -precious-files-regex)
++	prev=precious_regex
++	continue
++	;;
++
+       -release)
+ 	prev=release
+ 	continue
+@@ -1115,7 +1583,7 @@
+ 	[\\/]* | [A-Za-z]:[\\/]*) ;;
+ 	*)
+ 	  $echo "$modename: only absolute run-paths are allowed" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 	case "$xrpath " in
+@@ -1143,6 +1611,11 @@
+ 	prev=vinfo
+ 	continue
+ 	;;
++      -version-number)
++	prev=vinfo
++	vinfo_number=yes
++	continue
++	;;
+ 
+       -Wc,*)
+ 	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
+@@ -1191,6 +1664,11 @@
+ 	continue
+ 	;;
+ 
++      -XCClinker)
++	prev=xcclinker
++	continue
++	;;
++
+       # Some other compiler flag.
+       -* | +*)
+ 	# Unknown arguments in both finalize_command and compile_command need
+@@ -1203,29 +1681,101 @@
+ 	esac
+ 	;;
+ 
+-      *.lo | *.$objext)
+-	# A library or standard object.
+-	if test "$prev" = dlfiles; then
+-	  # This file was specified with -dlopen.
+-	  if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+-	    dlfiles="$dlfiles $arg"
+-	    prev=
+-	    continue
+-	  else
+-	    # If libtool objects are unsupported, then we need to preload.
+-	    prev=dlprefiles
+-	  fi
+-	fi
++      *.$objext)
++	# A standard object.
++	objs="$objs $arg"
++	;;
+ 
+-	if test "$prev" = dlprefiles; then
+-	  # Preload the old-style object.
+-	  dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e "$lo2o"`
+-	  prev=
+-	else
++      *.lo)
++	# A libtool-controlled object.
++
++	# Check to see that this really is a libtool object.
++	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++	  pic_object=
++	  non_pic_object=
++
++	  # Read the .lo file
++	  # If there is no directory component, then add one.
+ 	  case $arg in
+-	  *.lo) libobjs="$libobjs $arg" ;;
+-	  *) objs="$objs $arg" ;;
++	  */* | *\\*) . $arg ;;
++	  *) . ./$arg ;;
+ 	  esac
++
++	  if test -z "$pic_object" || \
++	     test -z "$non_pic_object" ||
++	     test "$pic_object" = none && \
++	     test "$non_pic_object" = none; then
++	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
++	    exit $EXIT_FAILURE
++	  fi
++
++	  # Extract subdirectory from the argument.
++	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
++	  if test "X$xdir" = "X$arg"; then
++	    xdir=
++ 	  else
++	    xdir="$xdir/"
++	  fi
++
++	  if test "$pic_object" != none; then
++	    # Prepend the subdirectory the object is found in.
++	    pic_object="$xdir$pic_object"
++
++	    if test "$prev" = dlfiles; then
++	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
++		dlfiles="$dlfiles $pic_object"
++		prev=
++		continue
++	      else
++		# If libtool objects are unsupported, then we need to preload.
++		prev=dlprefiles
++	      fi
++	    fi
++
++	    # CHECK ME:  I think I busted this.  -Ossama
++	    if test "$prev" = dlprefiles; then
++	      # Preload the old-style object.
++	      dlprefiles="$dlprefiles $pic_object"
++	      prev=
++	    fi
++
++	    # A PIC object.
++	    libobjs="$libobjs $pic_object"
++	    arg="$pic_object"
++	  fi
++
++	  # Non-PIC object.
++	  if test "$non_pic_object" != none; then
++	    # Prepend the subdirectory the object is found in.
++	    non_pic_object="$xdir$non_pic_object"
++
++	    # A standard non-PIC object
++	    non_pic_objects="$non_pic_objects $non_pic_object"
++	    if test -z "$pic_object" || test "$pic_object" = none ; then
++	      arg="$non_pic_object"
++	    fi
++	  fi
++	else
++	  # Only an error if not doing a dry-run.
++	  if test -z "$run"; then
++	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
++	    exit $EXIT_FAILURE
++	  else
++	    # Dry-run case.
++
++	    # Extract subdirectory from the argument.
++	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
++	    if test "X$xdir" = "X$arg"; then
++	      xdir=
++	    else
++	      xdir="$xdir/"
++	    fi
++
++	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
++	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
++	    libobjs="$libobjs $pic_object"
++	    non_pic_objects="$non_pic_objects $non_pic_object"
++	  fi
+ 	fi
+ 	;;
+ 
+@@ -1276,7 +1826,7 @@
+     if test -n "$prev"; then
+       $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+@@ -1285,6 +1835,7 @@
+       finalize_command="$finalize_command $arg"
+     fi
+ 
++    oldlibs=
+     # calculate the name of the file, without its directory
+     outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
+     libobjs_save="$libobjs"
+@@ -1305,11 +1856,11 @@
+       output_objdir="$output_objdir/$objdir"
+     fi
+     # Create the object directory.
+-    if test ! -d $output_objdir; then
++    if test ! -d "$output_objdir"; then
+       $show "$mkdir $output_objdir"
+       $run $mkdir $output_objdir
+       status=$?
+-      if test $status -ne 0 && test ! -d $output_objdir; then
++      if test "$status" -ne 0 && test ! -d "$output_objdir"; then
+ 	exit $status
+       fi
+     fi
+@@ -1319,7 +1870,7 @@
+     "")
+       $echo "$modename: you must specify an output file" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+       ;;
+     *.$libext) linkmode=oldlib ;;
+     *.lo | *.$objext) linkmode=obj ;;
+@@ -1327,7 +1878,17 @@
+     *) linkmode=prog ;; # Anything else should be a program.
+     esac
+ 
++    case $host in
++    *cygwin* | *mingw* | *pw32*)
++      # don't eliminate duplications in $postdeps and $predeps
++      duplicate_compiler_generated_deps=yes
++      ;;
++    *)
++      duplicate_compiler_generated_deps=$duplicate_deps
++      ;;
++    esac
+     specialdeplibs=
++
+     libs=
+     # Find all interdependent deplibs by searching for libraries
+     # that are linked more than once (e.g. -la -lb -la)
+@@ -1339,6 +1900,25 @@
+       fi
+       libs="$libs $deplib"
+     done
++
++    if test "$linkmode" = lib; then
++      libs="$predeps $libs $compiler_lib_search_path $postdeps"
++
++      # Compute libraries that are listed more than once in $predeps
++      # $postdeps and mark them as special (i.e., whose duplicates are
++      # not to be eliminated).
++      pre_post_deps=
++      if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
++	for pre_post_dep in $predeps $postdeps; do
++	  case "$pre_post_deps " in
++	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
++	  esac
++	  pre_post_deps="$pre_post_deps $pre_post_dep"
++	done
++      fi
++      pre_post_deps=
++    fi
++
+     deplibs=
+     newdependency_libs=
+     newlib_search_path=
+@@ -1353,7 +1933,7 @@
+ 	  *.la) ;;
+ 	  *)
+ 	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	    ;;
+ 	  esac
+ 	done
+@@ -1370,39 +1950,59 @@
+ 	;;
+     esac
+     for pass in $passes; do
+-      if test $linkmode = prog; then
+-	# Determine which files to process
++      if test "$linkmode,$pass" = "lib,link" ||
++	 test "$linkmode,$pass" = "prog,scan"; then
++	libs="$deplibs"
++	deplibs=
++      fi
++      if test "$linkmode" = prog; then
+ 	case $pass in
+-	dlopen)
+-	  libs="$dlfiles"
+-	  save_deplibs="$deplibs" # Collect dlpreopened libraries
+-	  deplibs=
+-	  ;;
++	dlopen) libs="$dlfiles" ;;
+ 	dlpreopen) libs="$dlprefiles" ;;
+ 	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+ 	esac
+       fi
++      if test "$pass" = dlopen; then
++	# Collect dlpreopened libraries
++	save_deplibs="$deplibs"
++	deplibs=
++      fi
+       for deplib in $libs; do
+ 	lib=
+ 	found=no
+ 	case $deplib in
++	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
++	  if test "$linkmode,$pass" = "prog,link"; then
++	    compile_deplibs="$deplib $compile_deplibs"
++	    finalize_deplibs="$deplib $finalize_deplibs"
++	  else
++	    deplibs="$deplib $deplibs"
++	  fi
++	  continue
++	  ;;
+ 	-l*)
+-	  if test $linkmode = oldlib && test $linkmode = obj; then
+-	    $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
++	  if test "$linkmode" != lib && test "$linkmode" != prog; then
++	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
+ 	    continue
+ 	  fi
+-	  if test $pass = conv; then
++	  if test "$pass" = conv; then
+ 	    deplibs="$deplib $deplibs"
+ 	    continue
+ 	  fi
+ 	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
+ 	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+-	    # Search the libtool library
+-	    lib="$searchdir/lib${name}.la"
+-	    if test -f "$lib"; then
+-	      found=yes
+-	      break
+-	    fi
++	    for search_ext in .la $std_shrext .so .a; do
++	      # Search the libtool library
++	      lib="$searchdir/lib${name}${search_ext}"
++	      if test -f "$lib"; then
++		if test "$search_ext" = ".la"; then
++		  found=yes
++		else
++		  found=no
++		fi
++		break 2
++	      fi
++	    done
+ 	  done
+ 	  if test "$found" != yes; then
+ 	    # deplib doesn't seem to be a libtool library
+@@ -1411,40 +2011,76 @@
+ 	      finalize_deplibs="$deplib $finalize_deplibs"
+ 	    else
+ 	      deplibs="$deplib $deplibs"
+-	      test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
++	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ 	    fi
+ 	    continue
++	  else # deplib is a libtool library
++	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
++	    # We need to do some special things here, and not later.
++	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++	      case " $predeps $postdeps " in
++	      *" $deplib "*)
++		if (${SED} -e '2q' $lib |
++                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++		  library_names=
++		  old_library=
++		  case $lib in
++		  */* | *\\*) . $lib ;;
++		  *) . ./$lib ;;
++		  esac
++		  for l in $old_library $library_names; do
++		    ll="$l"
++		  done
++		  if test "X$ll" = "X$old_library" ; then # only static version available
++		    found=no
++		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
++		    test "X$ladir" = "X$lib" && ladir="."
++		    lib=$ladir/$old_library
++		    if test "$linkmode,$pass" = "prog,link"; then
++		      compile_deplibs="$deplib $compile_deplibs"
++		      finalize_deplibs="$deplib $finalize_deplibs"
++		    else
++		      deplibs="$deplib $deplibs"
++		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
++		    fi
++		    continue
++		  fi
++		fi
++	        ;;
++	      *) ;;
++	      esac
++	    fi
+ 	  fi
+ 	  ;; # -l
+ 	-L*)
+ 	  case $linkmode in
+ 	  lib)
+ 	    deplibs="$deplib $deplibs"
+-	    test $pass = conv && continue
++	    test "$pass" = conv && continue
+ 	    newdependency_libs="$deplib $newdependency_libs"
+ 	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ 	    ;;
+ 	  prog)
+-	    if test $pass = conv; then
++	    if test "$pass" = conv; then
+ 	      deplibs="$deplib $deplibs"
+ 	      continue
+ 	    fi
+-	    if test $pass = scan; then
++	    if test "$pass" = scan; then
+ 	      deplibs="$deplib $deplibs"
+-	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ 	    else
+ 	      compile_deplibs="$deplib $compile_deplibs"
+ 	      finalize_deplibs="$deplib $finalize_deplibs"
+ 	    fi
++	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ 	    ;;
+ 	  *)
+-	    $echo "$modename: warning: \`-L' is ignored for archives/objects: $deplib" 1>&2
++	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
+ 	    ;;
+ 	  esac # linkmode
+ 	  continue
+ 	  ;; # -L
+ 	-R*)
+-	  if test $pass = link; then
++	  if test "$pass" = link; then
+ 	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
+ 	    # Make sure the xrpath contains only unique directories.
+ 	    case "$xrpath " in
+@@ -1457,30 +2093,45 @@
+ 	  ;;
+ 	*.la) lib="$deplib" ;;
+ 	*.$libext)
+-	  if test $pass = conv; then
++	  if test "$pass" = conv; then
+ 	    deplibs="$deplib $deplibs"
+ 	    continue
+ 	  fi
+ 	  case $linkmode in
+ 	  lib)
+-	    if test "$deplibs_check_method" != pass_all; then
+-	      echo
+-	      echo "*** Warning: Trying to link with static lib archive $deplib."
+-	      echo "*** I have the capability to make that library automatically link in when"
+-	      echo "*** you link to this library.  But I can only do this if you have a"
+-	      echo "*** shared version of the library, which you do not appear to have"
+-	      echo "*** because the file extensions .$libext of this argument makes me believe"
+-	      echo "*** that it is just a static archive that I should not used here."
++	    valid_a_lib=no
++	    case $deplibs_check_method in
++	      match_pattern*)
++		set dummy $deplibs_check_method
++	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
++		if eval $echo \"$deplib\" 2>/dev/null \
++		    | $SED 10q \
++		    | $EGREP "$match_pattern_regex" > /dev/null; then
++		  valid_a_lib=yes
++		fi
++		;;
++	      pass_all)
++		valid_a_lib=yes
++		;;
++            esac
++	    if test "$valid_a_lib" != yes; then
++	      $echo
++	      $echo "*** Warning: Trying to link with static lib archive $deplib."
++	      $echo "*** I have the capability to make that library automatically link in when"
++	      $echo "*** you link to this library.  But I can only do this if you have a"
++	      $echo "*** shared version of the library, which you do not appear to have"
++	      $echo "*** because the file extensions .$libext of this argument makes me believe"
++	      $echo "*** that it is just a static archive that I should not used here."
+ 	    else
+-	      echo
+-	      echo "*** Warning: Linking the shared library $output against the"
+-	      echo "*** static library $deplib is not portable!"
++	      $echo
++	      $echo "*** Warning: Linking the shared library $output against the"
++	      $echo "*** static library $deplib is not portable!"
+ 	      deplibs="$deplib $deplibs"
+ 	    fi
+ 	    continue
+ 	    ;;
+ 	  prog)
+-	    if test $pass != link; then
++	    if test "$pass" != link; then
+ 	      deplibs="$deplib $deplibs"
+ 	    else
+ 	      compile_deplibs="$deplib $compile_deplibs"
+@@ -1491,14 +2142,18 @@
+ 	  esac # linkmode
+ 	  ;; # *.$libext
+ 	*.lo | *.$objext)
+-	  if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+-	    # If there is no dlopen support or we're linking statically,
+-	    # we need to preload.
+-	    newdlprefiles="$newdlprefiles $deplib"
+-	    compile_deplibs="$deplib $compile_deplibs"
+-	    finalize_deplibs="$deplib $finalize_deplibs"
+-	  else
+-	    newdlfiles="$newdlfiles $deplib"
++	  if test "$pass" = conv; then
++	    deplibs="$deplib $deplibs"
++	  elif test "$linkmode" = prog; then
++	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
++	      # If there is no dlopen support or we're linking statically,
++	      # we need to preload.
++	      newdlprefiles="$newdlprefiles $deplib"
++	      compile_deplibs="$deplib $compile_deplibs"
++	      finalize_deplibs="$deplib $finalize_deplibs"
++	    else
++	      newdlfiles="$newdlfiles $deplib"
++	    fi
+ 	  fi
+ 	  continue
+ 	  ;;
+@@ -1507,17 +2162,17 @@
+ 	  continue
+ 	  ;;
+ 	esac # case $deplib
+-	if test $found = yes || test -f "$lib"; then :
++	if test "$found" = yes || test -f "$lib"; then :
+ 	else
+ 	  $echo "$modename: cannot find the library \`$lib'" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	# Check to see that this really is a libtool archive.
+-	if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
++	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ 	else
+ 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+@@ -1530,8 +2185,9 @@
+ 	library_names=
+ 	old_library=
+ 	# If the library was installed with an old release of libtool,
+-	# it will not redefine variable installed.
++	# it will not redefine variables installed, or shouldnotlink
+ 	installed=yes
++	shouldnotlink=no
+ 
+ 	# Read the .la file
+ 	case $lib in
+@@ -1541,19 +2197,18 @@
+ 
+ 	if test "$linkmode,$pass" = "lib,link" ||
+ 	   test "$linkmode,$pass" = "prog,scan" ||
+-	   { test $linkmode = oldlib && test $linkmode = obj; }; then
+-	   # Add dl[pre]opened files of deplib
++	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+ 	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+ 	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+ 	fi
+ 
+-	if test $pass = conv; then
++	if test "$pass" = conv; then
+ 	  # Only check for convenience libraries
+ 	  deplibs="$lib $deplibs"
+ 	  if test -z "$libdir"; then
+ 	    if test -z "$old_library"; then
+ 	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+-	      exit 1
++	      exit $EXIT_FAILURE
+ 	    fi
+ 	    # It is a libtool convenience library, so add in its objects.
+ 	    convenience="$convenience $ladir/$objdir/$old_library"
+@@ -1568,13 +2223,14 @@
+               fi
+ 	      tmp_libs="$tmp_libs $deplib"
+ 	    done
+-	  elif test $linkmode != prog && test $linkmode != lib; then
++	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ 	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  continue
+ 	fi # $pass = conv
+ 
++
+ 	# Get the name of the library we link against.
+ 	linklib=
+ 	for l in $old_library $library_names; do
+@@ -1582,19 +2238,23 @@
+ 	done
+ 	if test -z "$linklib"; then
+ 	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	# This library was specified with -dlopen.
+-	if test $pass = dlopen; then
++	if test "$pass" = dlopen; then
+ 	  if test -z "$libdir"; then
+ 	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+-	  if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
++	  if test -z "$dlname" ||
++	     test "$dlopen_support" != yes ||
++	     test "$build_libtool_libs" = no; then
+ 	    # If there is no dlname, no dlopen support or we're linking
+-	    # statically, we need to preload.
+-	    dlprefiles="$dlprefiles $lib"
++	    # statically, we need to preload.  We also need to preload any
++	    # dependent libraries so libltdl's deplib preloader doesn't
++	    # bomb out in the load deplibs phase.
++	    dlprefiles="$dlprefiles $lib $dependency_libs"
+ 	  else
+ 	    newdlfiles="$newdlfiles $lib"
+ 	  fi
+@@ -1627,18 +2287,25 @@
+ 	    absdir="$libdir"
+ 	  fi
+ 	else
+-	  dir="$ladir/$objdir"
+-	  absdir="$abs_ladir/$objdir"
+-	  # Remove this search path later
+-	  notinst_path="$notinst_path $abs_ladir"
++	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
++	    dir="$ladir"
++	    absdir="$abs_ladir"
++	    # Remove this search path later
++	    notinst_path="$notinst_path $abs_ladir"
++	  else
++	    dir="$ladir/$objdir"
++	    absdir="$abs_ladir/$objdir"
++	    # Remove this search path later
++	    notinst_path="$notinst_path $abs_ladir"
++	  fi
+ 	fi # $installed = yes
+ 	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+ 
+ 	# This library was specified with -dlpreopen.
+-	if test $pass = dlpreopen; then
++	if test "$pass" = dlpreopen; then
+ 	  if test -z "$libdir"; then
+ 	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	  # Prefer using a static library (so that no silly _DYNAMIC symbols
+ 	  # are required to link).
+@@ -1654,18 +2321,19 @@
+ 
+ 	if test -z "$libdir"; then
+ 	  # Link the convenience library
+-	  if test $linkmode = lib; then
++	  if test "$linkmode" = lib; then
+ 	    deplibs="$dir/$old_library $deplibs"
+ 	  elif test "$linkmode,$pass" = "prog,link"; then
+ 	    compile_deplibs="$dir/$old_library $compile_deplibs"
+ 	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
+ 	  else
+-	    deplibs="$lib $deplibs"
++	    deplibs="$lib $deplibs" # used for prog,scan pass
+ 	  fi
+ 	  continue
+ 	fi
+ 
+-	if test $linkmode = prog && test $pass != link; then
++
++	if test "$linkmode" = prog && test "$pass" != link; then
+ 	  newlib_search_path="$newlib_search_path $ladir"
+ 	  deplibs="$lib $deplibs"
+ 
+@@ -1681,7 +2349,7 @@
+ 	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
+ 	    esac
+ 	    # Need to link against all dependency_libs?
+-	    if test $linkalldeplibs = yes; then
++	    if test "$linkalldeplibs" = yes; then
+ 	      deplibs="$deplib $deplibs"
+ 	    else
+ 	      # Need to hardcode shared library paths
+@@ -1698,13 +2366,19 @@
+ 	  continue
+ 	fi # $linkmode = prog...
+ 
+-	link_static=no # Whether the deplib will be linked statically
+-	if test -n "$library_names" &&
+-	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+-	  # Link against this shared library
++	if test "$linkmode,$pass" = "prog,link"; then
++	  if test -n "$library_names" &&
++	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
++	    # We need to hardcode the library path
++	    if test -n "$shlibpath_var"; then
++	      # Make sure the rpath contains only unique directories.
++	      case "$temp_rpath " in
++	      *" $dir "*) ;;
++	      *" $absdir "*) ;;
++	      *) temp_rpath="$temp_rpath $dir" ;;
++	      esac
++	    fi
+ 
+-	  if test "$linkmode,$pass" = "prog,link" ||
+-	   { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
+ 	    # Hardcode the library path.
+ 	    # Skip directories that are in the system default run-time
+ 	    # search path.
+@@ -1726,17 +2400,6 @@
+ 	      esac
+ 	      ;;
+ 	    esac
+-	    if test $linkmode = prog; then
+-	      # We need to hardcode the library path
+-	      if test -n "$shlibpath_var"; then
+-		# Make sure the rpath contains only unique directories.
+-		case "$temp_rpath " in
+-		*" $dir "*) ;;
+-		*" $absdir "*) ;;
+-		*) temp_rpath="$temp_rpath $dir" ;;
+-		esac
+-	      fi
+-	    fi
+ 	  fi # $linkmode,$pass = prog,link...
+ 
+ 	  if test "$alldeplibs" = yes &&
+@@ -1746,11 +2409,52 @@
+ 	    # We only need to search for static libraries
+ 	    continue
+ 	  fi
++	fi
+ 
++	link_static=no # Whether the deplib will be linked statically
++	if test -n "$library_names" &&
++	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ 	  if test "$installed" = no; then
+ 	    notinst_deplibs="$notinst_deplibs $lib"
+ 	    need_relink=yes
+ 	  fi
++	  # This is a shared library
++
++	  # Warn about portability, can't link against -module's on
++	  # some systems (darwin)
++	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
++	    $echo
++	    if test "$linkmode" = prog; then
++	      $echo "*** Warning: Linking the executable $output against the loadable module"
++	    else
++	      $echo "*** Warning: Linking the shared library $output against the loadable module"
++	    fi
++	    $echo "*** $linklib is not portable!"
++	  fi
++	  if test "$linkmode" = lib &&
++	     test "$hardcode_into_libs" = yes; then
++	    # Hardcode the library path.
++	    # Skip directories that are in the system default run-time
++	    # search path.
++	    case " $sys_lib_dlsearch_path " in
++	    *" $absdir "*) ;;
++	    *)
++	      case "$compile_rpath " in
++	      *" $absdir "*) ;;
++	      *) compile_rpath="$compile_rpath $absdir"
++	      esac
++	      ;;
++	    esac
++	    case " $sys_lib_dlsearch_path " in
++	    *" $libdir "*) ;;
++	    *)
++	      case "$finalize_rpath " in
++	      *" $libdir "*) ;;
++	      *) finalize_rpath="$finalize_rpath $libdir"
++	      esac
++	      ;;
++	    esac
++	  fi
+ 
+ 	  if test -n "$old_archive_from_expsyms_cmds"; then
+ 	    # figure out the soname
+@@ -1764,7 +2468,7 @@
+ 	    elif test -n "$soname_spec"; then
+ 	      # bleh windows
+ 	      case $host in
+-	      *cygwin*)
++	      *cygwin* | mingw*)
+ 		major=`expr $current - $age`
+ 		versuffix="-$major"
+ 		;;
+@@ -1776,17 +2480,18 @@
+ 
+ 	    # Make a new name for the extract_expsyms_cmds to use
+ 	    soroot="$soname"
+-	    soname=`echo $soroot | sed -e 's/^.*\///'`
+-	    newlib="libimp-`echo $soname | sed 's/^lib//;s/\.dll$//'`.a"
++	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
++	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
+ 
+ 	    # If the library has no export list, then create one now
+ 	    if test -f "$output_objdir/$soname-def"; then :
+ 	    else
+ 	      $show "extracting exported symbol list from \`$soname'"
+ 	      save_ifs="$IFS"; IFS='~'
+-	      eval cmds=\"$extract_expsyms_cmds\"
++	      cmds=$extract_expsyms_cmds
+ 	      for cmd in $cmds; do
+ 		IFS="$save_ifs"
++		eval cmd=\"$cmd\"
+ 		$show "$cmd"
+ 		$run eval "$cmd" || exit $?
+ 	      done
+@@ -1797,9 +2502,10 @@
+ 	    if test -f "$output_objdir/$newlib"; then :; else
+ 	      $show "generating import library for \`$soname'"
+ 	      save_ifs="$IFS"; IFS='~'
+-	      eval cmds=\"$old_archive_from_expsyms_cmds\"
++	      cmds=$old_archive_from_expsyms_cmds
+ 	      for cmd in $cmds; do
+ 		IFS="$save_ifs"
++		eval cmd=\"$cmd\"
+ 		$show "$cmd"
+ 		$run eval "$cmd" || exit $?
+ 	      done
+@@ -1808,9 +2514,9 @@
+ 	    # make sure the library variables are pointing to the new library
+ 	    dir=$output_objdir
+ 	    linklib=$newlib
+-	  fi # test -n $old_archive_from_expsyms_cmds
++	  fi # test -n "$old_archive_from_expsyms_cmds"
+ 
+-	  if test $linkmode = prog || test "$mode" != relink; then
++	  if test "$linkmode" = prog || test "$mode" != relink; then
+ 	    add_shlibpath=
+ 	    add_dir=
+ 	    add=
+@@ -1819,6 +2525,22 @@
+ 	    immediate | unsupported)
+ 	      if test "$hardcode_direct" = no; then
+ 		add="$dir/$linklib"
++		case $host in
++		  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
++		  *-*-darwin* )
++		    # if the lib is a module then we can not link against
++		    # it, someone is ignoring the new warnings I added
++		    if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then
++		      $echo "** Warning, lib $linklib is a module, not a shared library"
++		      if test -z "$old_library" ; then
++		        $echo
++		        $echo "** And there doesn't seem to be a static archive available"
++		        $echo "** The link will probably fail, sorry"
++		      else
++		        add="$dir/$old_library"
++		      fi
++		    fi
++		esac
+ 	      elif test "$hardcode_minus_L" = no; then
+ 		case $host in
+ 		*-*-sunos*) add_shlibpath="$dir" ;;
+@@ -1837,6 +2559,14 @@
+ 		add="$dir/$linklib"
+ 	      elif test "$hardcode_minus_L" = yes; then
+ 		add_dir="-L$dir"
++		# Try looking first in the location we're being installed to.
++		if test -n "$inst_prefix_dir"; then
++		  case "$libdir" in
++		    [\\/]*)
++		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
++		      ;;
++		  esac
++		fi
+ 		add="-l$name"
+ 	      elif test "$hardcode_shlibpath_var" = yes; then
+ 		add_shlibpath="$dir"
+@@ -1850,7 +2580,7 @@
+ 
+ 	    if test "$lib_linked" != yes; then
+ 	      $echo "$modename: configuration error: unsupported hardcode properties"
+-	      exit 1
++	      exit $EXIT_FAILURE
+ 	    fi
+ 
+ 	    if test -n "$add_shlibpath"; then
+@@ -1859,7 +2589,7 @@
+ 	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+ 	      esac
+ 	    fi
+-	    if test $linkmode = prog; then
++	    if test "$linkmode" = prog; then
+ 	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+ 	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
+ 	    else
+@@ -1876,7 +2606,7 @@
+ 	    fi
+ 	  fi
+ 
+-	  if test $linkmode = prog || test "$mode" = relink; then
++	  if test "$linkmode" = prog || test "$mode" = relink; then
+ 	    add_shlibpath=
+ 	    add_dir=
+ 	    add=
+@@ -1892,13 +2622,28 @@
+ 	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+ 	      esac
+ 	      add="-l$name"
++	    elif test "$hardcode_automatic" = yes; then
++	      if test -n "$inst_prefix_dir" &&
++		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
++	        add="$inst_prefix_dir$libdir/$linklib"
++	      else
++	        add="$libdir/$linklib"
++	      fi
+ 	    else
+ 	      # We cannot seem to hardcode it, guess we'll fake it.
+ 	      add_dir="-L$libdir"
++	      # Try looking first in the location we're being installed to.
++	      if test -n "$inst_prefix_dir"; then
++		case "$libdir" in
++		  [\\/]*)
++		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
++		    ;;
++		esac
++	      fi
+ 	      add="-l$name"
+ 	    fi
+ 
+-	    if test $linkmode = prog; then
++	    if test "$linkmode" = prog; then
+ 	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+ 	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+ 	    else
+@@ -1906,16 +2651,7 @@
+ 	      test -n "$add" && deplibs="$add $deplibs"
+ 	    fi
+ 	  fi
+-	elif test $linkmode = prog; then
+-	  if test "$alldeplibs" = yes &&
+-	     { test "$deplibs_check_method" = pass_all ||
+-	       { test "$build_libtool_libs" = yes &&
+-		 test -n "$library_names"; }; }; then
+-	    # We only need to search for static libraries
+-	    continue
+-	  fi
+-
+-	  # Try to link the static library
++	elif test "$linkmode" = prog; then
+ 	  # Here we assume that one of hardcode_direct or hardcode_minus_L
+ 	  # is not unsupported.  This is valid on all known static and
+ 	  # shared platforms.
+@@ -1935,21 +2671,21 @@
+ 
+ 	    # Just print a warning and add the library to dependency_libs so
+ 	    # that the program can be linked against the static library.
+-	    echo
+-	    echo "*** Warning: This system can not link to static lib archive $lib."
+-	    echo "*** I have the capability to make that library automatically link in when"
+-	    echo "*** you link to this library.  But I can only do this if you have a"
+-	    echo "*** shared version of the library, which you do not appear to have."
++	    $echo
++	    $echo "*** Warning: This system can not link to static lib archive $lib."
++	    $echo "*** I have the capability to make that library automatically link in when"
++	    $echo "*** you link to this library.  But I can only do this if you have a"
++	    $echo "*** shared version of the library, which you do not appear to have."
+ 	    if test "$module" = yes; then
+-	      echo "*** But as you try to build a module library, libtool will still create "
+-	      echo "*** a static module, that should work as long as the dlopening application"
+-	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
++	      $echo "*** But as you try to build a module library, libtool will still create "
++	      $echo "*** a static module, that should work as long as the dlopening application"
++	      $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+ 	      if test -z "$global_symbol_pipe"; then
+-		echo
+-		echo "*** However, this would only work if libtool was able to extract symbol"
+-		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+-		echo "*** not find such a program.  So, this module is probably useless."
+-		echo "*** \`nm' from GNU binutils and a full rebuild may help."
++		$echo
++		$echo "*** However, this would only work if libtool was able to extract symbol"
++		$echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
++		$echo "*** not find such a program.  So, this module is probably useless."
++		$echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ 	      fi
+ 	      if test "$build_old_libs" = no; then
+ 		build_libtool_libs=module
+@@ -1966,10 +2702,11 @@
+ 	  fi
+ 	fi # link shared/static library?
+ 
+-	if test $linkmode = lib; then
++	if test "$linkmode" = lib; then
+ 	  if test -n "$dependency_libs" &&
+-	     { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
+-	       test $link_static = yes; }; then
++	     { test "$hardcode_into_libs" != yes ||
++	       test "$build_old_libs" = yes ||
++	       test "$link_static" = yes; }; then
+ 	    # Extract -R from dependency_libs
+ 	    temp_deplibs=
+ 	    for libdir in $dependency_libs; do
+@@ -2000,7 +2737,7 @@
+ 	    tmp_libs="$tmp_libs $deplib"
+ 	  done
+ 
+-	  if test $link_all_deplibs != no; then
++	  if test "$link_all_deplibs" != no; then
+ 	    # Add the search paths of all dependency libraries
+ 	    for deplib in $dependency_libs; do
+ 	      case $deplib in
+@@ -2020,22 +2757,67 @@
+ 		  ;;
+ 		esac
+ 		if grep "^installed=no" $deplib > /dev/null; then
+-		  path="-L$absdir/$objdir"
++		  path="$absdir/$objdir"
+ 		else
+-		  eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ 		  if test -z "$libdir"; then
+ 		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+-		    exit 1
++		    exit $EXIT_FAILURE
+ 		  fi
+ 		  if test "$absdir" != "$libdir"; then
+ 		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
+ 		  fi
+-		  path="-L$absdir"
++		  path="$absdir"
+ 		fi
++		depdepl=
++		case $host in
++		*-*-darwin*)
++		  # we do not want to link against static libs,
++		  # but need to link against shared
++		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
++		  if test -n "$deplibrary_names" ; then
++		    for tmp in $deplibrary_names ; do
++		      depdepl=$tmp
++		    done
++		    if test -f "$path/$depdepl" ; then
++		      depdepl="$path/$depdepl"
++		    fi
++		    # do not add paths which are already there
++		    case " $newlib_search_path " in
++		    *" $path "*) ;;
++		    *) newlib_search_path="$newlib_search_path $path";;
++		    esac
++		  fi
++		  path=""
++		  ;;
++		*)
++		  path="-L$path"
++		  ;;
++		esac
++		;;
++	      -l*)
++		case $host in
++		*-*-darwin*)
++		  # Again, we only want to link against shared libraries
++		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
++		  for tmp in $newlib_search_path ; do
++		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
++		      eval depdepl="$tmp/lib$tmp_libs.dylib"
++		      break
++		    fi
++		  done
++		  path=""
++		  ;;
++		*) continue ;;
++		esac
+ 		;;
+ 	      *) continue ;;
+ 	      esac
+ 	      case " $deplibs " in
++	      *" $depdepl "*) ;;
++	      *) deplibs="$depdepl $deplibs" ;;
++	      esac
++	      case " $deplibs " in
+ 	      *" $path "*) ;;
+ 	      *) deplibs="$deplibs $path" ;;
+ 	      esac
+@@ -2043,15 +2825,15 @@
+ 	  fi # link_all_deplibs != no
+ 	fi # linkmode = lib
+       done # for deplib in $libs
+-      if test $pass = dlpreopen; then
++      dependency_libs="$newdependency_libs"
++      if test "$pass" = dlpreopen; then
+ 	# Link the dlpreopened libraries before other libraries
+ 	for deplib in $save_deplibs; do
+ 	  deplibs="$deplib $deplibs"
+ 	done
+       fi
+-      if test $pass != dlopen; then
+-	test $pass != scan && dependency_libs="$newdependency_libs"
+-	if test $pass != conv; then
++      if test "$pass" != dlopen; then
++	if test "$pass" != conv; then
+ 	  # Make sure lib_search_path contains only unique directories.
+ 	  lib_search_path=
+ 	  for dir in $newlib_search_path; do
+@@ -2073,9 +2855,30 @@
+ 	  eval tmp_libs=\"\$$var\"
+ 	  new_libs=
+ 	  for deplib in $tmp_libs; do
++	    # FIXME: Pedantically, this is the right thing to do, so
++	    #        that some nasty dependency loop isn't accidentally
++	    #        broken:
++	    #new_libs="$deplib $new_libs"
++	    # Pragmatically, this seems to cause very few problems in
++	    # practice:
+ 	    case $deplib in
+ 	    -L*) new_libs="$deplib $new_libs" ;;
++	    -R*) ;;
+ 	    *)
++	      # And here is the reason: when a library appears more
++	      # than once as an explicit dependence of a library, or
++	      # is implicitly linked in more than once by the
++	      # compiler, it is considered special, and multiple
++	      # occurrences thereof are not removed.  Compare this
++	      # with having the same library being listed as a
++	      # dependency of multiple other libraries: in this case,
++	      # we know (pedantically, we assume) the library does not
++	      # need to be listed more than once, so we keep only the
++	      # last copy.  This is not always right, but it is rare
++	      # enough that we require users that really mean to play
++	      # such unportable linking tricks to link the library
++	      # using -Wl,-lname, so that libtool does not consider it
++	      # for duplicate removal.
+ 	      case " $specialdeplibs " in
+ 	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
+ 	      *)
+@@ -2103,19 +2906,32 @@
+ 	  eval $var=\"$tmp_libs\"
+ 	done # for var
+       fi
+-      if test "$pass" = "conv" &&
+-       { test "$linkmode" = "lib" || test "$linkmode" = "prog"; }; then
+-	libs="$deplibs" # reset libs
+-	deplibs=
+-      fi
++      # Last step: remove runtime libs from dependency_libs
++      # (they stay in deplibs)
++      tmp_libs=
++      for i in $dependency_libs ; do
++	case " $predeps $postdeps $compiler_lib_search_path " in
++	*" $i "*)
++	  i=""
++	  ;;
++	esac
++	if test -n "$i" ; then
++	  tmp_libs="$tmp_libs $i"
++	fi
++      done
++      dependency_libs=$tmp_libs
+     done # for pass
+-    if test $linkmode = prog; then
++    if test "$linkmode" = prog; then
+       dlfiles="$newdlfiles"
+       dlprefiles="$newdlprefiles"
+     fi
+ 
+     case $linkmode in
+     oldlib)
++      if test -n "$deplibs"; then
++	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
++      fi
++
+       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ 	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
+       fi
+@@ -2129,7 +2945,7 @@
+       fi
+ 
+       if test -n "$vinfo"; then
+-	$echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2
++	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
+       fi
+ 
+       if test -n "$release"; then
+@@ -2151,17 +2967,19 @@
+       case $outputname in
+       lib*)
+ 	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
++	eval shared_ext=\"$shrext_cmds\"
+ 	eval libname=\"$libname_spec\"
+ 	;;
+       *)
+ 	if test "$module" = no; then
+ 	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 	if test "$need_lib_prefix" != no; then
+ 	  # Add the "lib" prefix for modules if required
+ 	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
++	  eval shared_ext=\"$shrext_cmds\"
+ 	  eval libname=\"$libname_spec\"
+ 	else
+ 	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+@@ -2172,11 +2990,11 @@
+       if test -n "$objs"; then
+ 	if test "$deplibs_check_method" != pass_all; then
+ 	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	else
+-	  echo
+-	  echo "*** Warning: Linking the shared library $output against the non-libtool"
+-	  echo "*** objects $objs is not portable!"
++	  $echo
++	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
++	  $echo "*** objects $objs is not portable!"
+ 	  libobjs="$libobjs $objs"
+ 	fi
+       fi
+@@ -2186,7 +3004,7 @@
+       fi
+ 
+       set dummy $rpath
+-      if test $# -gt 2; then
++      if test "$#" -gt 2; then
+ 	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
+       fi
+       install_libdir="$2"
+@@ -2195,14 +3013,16 @@
+       if test -z "$rpath"; then
+ 	if test "$build_libtool_libs" = yes; then
+ 	  # Building a libtool convenience library.
+-	  libext=al
++	  # Some compilers have problems with a `.al' extension so
++	  # convenience libraries should have the same extension an
++	  # archive normally would.
+ 	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
+ 	  build_libtool_libs=convenience
+ 	  build_old_libs=yes
+ 	fi
+ 
+ 	if test -n "$vinfo"; then
+-	  $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2
++	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
+ 	fi
+ 
+ 	if test -n "$release"; then
+@@ -2218,12 +3038,49 @@
+ 	if test -n "$8"; then
+ 	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+-	current="$2"
+-	revision="$3"
+-	age="$4"
++	# convert absolute version numbers to libtool ages
++	# this retains compatibility with .la files and attempts
++	# to make the code below a bit more comprehensible
++
++	case $vinfo_number in
++	yes)
++	  number_major="$2"
++	  number_minor="$3"
++	  number_revision="$4"
++	  #
++	  # There are really only two kinds -- those that
++	  # use the current revision as the major version
++	  # and those that subtract age and use age as
++	  # a minor version.  But, then there is irix
++	  # which has an extra 1 added just for fun
++	  #
++	  case $version_type in
++	  darwin|linux|osf|windows)
++	    current=`expr $number_major + $number_minor`
++	    age="$number_minor"
++	    revision="$number_revision"
++	    ;;
++	  freebsd-aout|freebsd-elf|sunos)
++	    current="$number_major"
++	    revision="$number_minor"
++	    age="0"
++	    ;;
++	  irix|nonstopux)
++	    current=`expr $number_major + $number_minor - 1`
++	    age="$number_minor"
++	    revision="$number_minor"
++	    ;;
++	  esac
++	  ;;
++	no)
++	  current="$2"
++	  revision="$3"
++	  age="$4"
++	  ;;
++	esac
+ 
+ 	# Check that each of the things are valid numbers.
+ 	case $current in
+@@ -2231,7 +3088,7 @@
+ 	*)
+ 	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+@@ -2240,7 +3097,7 @@
+ 	*)
+ 	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+@@ -2249,14 +3106,14 @@
+ 	*)
+ 	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+-	if test $age -gt $current; then
++	if test "$age" -gt "$current"; then
+ 	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	# Calculate the version variables.
+@@ -2273,7 +3130,7 @@
+ 	  versuffix="$major.$age.$revision"
+ 	  # Darwin ld doesn't like 0 for these options...
+ 	  minor_current=`expr $current + 1`
+-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
++	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+ 	  ;;
+ 
+ 	freebsd-aout)
+@@ -2287,17 +3144,17 @@
+ 	  ;;
+ 
+ 	irix | nonstopux)
++	  major=`expr $current - $age + 1`
++
+ 	  case $version_type in
+ 	    nonstopux) verstring_prefix=nonstopux ;;
+ 	    *)         verstring_prefix=sgi ;;
+ 	  esac
+ 	  verstring="$verstring_prefix$major.$revision"
+ 
+-	  major=`expr $current - $age + 1`
+-
+ 	  # Add in all the interfaces that we are compatible with.
+ 	  loop=$revision
+-	  while test $loop != 0; do
++	  while test "$loop" -ne 0; do
+ 	    iface=`expr $revision - $loop`
+ 	    loop=`expr $loop - 1`
+ 	    verstring="$verstring_prefix$major.$iface:$verstring"
+@@ -2314,13 +3171,13 @@
+ 	  ;;
+ 
+ 	osf)
+-	  major=`expr $current - $age`
++	  major=.`expr $current - $age`
+ 	  versuffix=".$current.$age.$revision"
+ 	  verstring="$current.$age.$revision"
+ 
+ 	  # Add in all the interfaces that we are compatible with.
+ 	  loop=$age
+-	  while test $loop != 0; do
++	  while test "$loop" -ne 0; do
+ 	    iface=`expr $current - $loop`
+ 	    loop=`expr $loop - 1`
+ 	    verstring="$verstring:${iface}.0"
+@@ -2344,20 +3201,19 @@
+ 
+ 	*)
+ 	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
+-	  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+-	  exit 1
++	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+ 	# Clear the version info if we defaulted, and they specified a release.
+ 	if test -z "$vinfo" && test -n "$release"; then
+ 	  major=
+-	  verstring="0.0"
+ 	  case $version_type in
+ 	  darwin)
+ 	    # we can't check for "0.0" in archive_cmds due to quoting
+ 	    # problems, so we reset it completely
+-	    verstring=""
++	    verstring=
+ 	    ;;
+ 	  *)
+ 	    verstring="0.0"
+@@ -2391,9 +3247,30 @@
+       fi
+ 
+       if test "$mode" != relink; then
+-	# Remove our outputs.
+-	$show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
+-	$run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*
++	# Remove our outputs, but don't remove object files since they
++	# may have been created when compiling PIC objects.
++	removelist=
++	tempremovelist=`$echo "$output_objdir/*"`
++	for p in $tempremovelist; do
++	  case $p in
++	    *.$objext)
++	       ;;
++	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
++	       if test "X$precious_files_regex" != "X"; then
++	         if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
++	         then
++		   continue
++		 fi
++	       fi
++	       removelist="$removelist $p"
++	       ;;
++	    *) ;;
++	  esac
++	done
++	if test -n "$removelist"; then
++	  $show "${rm}r $removelist"
++	  $run ${rm}r $removelist
++	fi
+       fi
+ 
+       # Now set the variables for building old libraries.
+@@ -2406,9 +3283,9 @@
+ 
+       # Eliminate all temporary directories.
+       for path in $notinst_path; do
+-	lib_search_path=`echo "$lib_search_path " | sed -e 's% $path % %g'`
+-	deplibs=`echo "$deplibs " | sed -e 's% -L$path % %g'`
+-	dependency_libs=`echo "$dependency_libs " | sed -e 's% -L$path % %g'`
++	lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
++	deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
++	dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
+       done
+ 
+       if test -n "$xrpath"; then
+@@ -2421,7 +3298,7 @@
+ 	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+ 	  esac
+ 	done
+-	if test $hardcode_into_libs != yes || test $build_old_libs = yes; then
++	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+ 	  dependency_libs="$temp_xrpath $dependency_libs"
+ 	fi
+       fi
+@@ -2461,10 +3338,11 @@
+ 	    ;;
+ 	  *-*-openbsd* | *-*-freebsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
++	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+-	  *)
++ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+-	    if test $build_libtool_need_lc = "yes"; then
++	    if test "$build_libtool_need_lc" = "yes"; then
+ 	      deplibs="$deplibs -lc"
+ 	    fi
+ 	    ;;
+@@ -2491,7 +3369,7 @@
+ 	  # This might be a little naive.  We might want to check
+ 	  # whether the library exists or not.  But this is on
+ 	  # osf3 & osf4 and I'm not really sure... Just
+-	  # implementing what was already the behaviour.
++	  # implementing what was already the behavior.
+ 	  newdeplibs=$deplibs
+ 	  ;;
+ 	test_compile)
+@@ -2504,68 +3382,88 @@
+ 	  int main() { return 0; }
+ EOF
+ 	  $rm conftest
+-	  $CC -o conftest conftest.c $deplibs
+-	  if test $? -eq 0 ; then
++	  $LTCC -o conftest conftest.c $deplibs
++	  if test "$?" -eq 0 ; then
+ 	    ldd_output=`ldd conftest`
+ 	    for i in $deplibs; do
+ 	      name="`expr $i : '-l\(.*\)'`"
+ 	      # If $name is empty we are operating on a -L argument.
+-	      if test -n "$name" && test "$name" != "0"; then
+-		libname=`eval \\$echo \"$libname_spec\"`
+-		deplib_matches=`eval \\$echo \"$library_names_spec\"`
+-		set dummy $deplib_matches
+-		deplib_match=$2
+-		if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+-		  newdeplibs="$newdeplibs $i"
+-		else
+-		  droppeddeps=yes
+-		  echo
+-		  echo "*** Warning: dynamic linker does not accept needed library $i."
+-		  echo "*** I have the capability to make that library automatically link in when"
+-		  echo "*** you link to this library.  But I can only do this if you have a"
+-		  echo "*** shared version of the library, which I believe you do not have"
+-		  echo "*** because a test_compile did reveal that the linker did not use it for"
+-		  echo "*** its dynamic dependency list that programs get resolved with at runtime."
++              if test "$name" != "" && test "$name" -ne "0"; then
++		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++		  case " $predeps $postdeps " in
++		  *" $i "*)
++		    newdeplibs="$newdeplibs $i"
++		    i=""
++		    ;;
++		  esac
++	        fi
++		if test -n "$i" ; then
++		  libname=`eval \\$echo \"$libname_spec\"`
++		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
++		  set dummy $deplib_matches
++		  deplib_match=$2
++		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
++		    newdeplibs="$newdeplibs $i"
++		  else
++		    droppeddeps=yes
++		    $echo
++		    $echo "*** Warning: dynamic linker does not accept needed library $i."
++		    $echo "*** I have the capability to make that library automatically link in when"
++		    $echo "*** you link to this library.  But I can only do this if you have a"
++		    $echo "*** shared version of the library, which I believe you do not have"
++		    $echo "*** because a test_compile did reveal that the linker did not use it for"
++		    $echo "*** its dynamic dependency list that programs get resolved with at runtime."
++		  fi
+ 		fi
+ 	      else
+ 		newdeplibs="$newdeplibs $i"
+ 	      fi
+ 	    done
+ 	  else
+-	    # Error occured in the first compile.  Let's try to salvage
++	    # Error occurred in the first compile.  Let's try to salvage
+ 	    # the situation: Compile a separate program for each library.
+ 	    for i in $deplibs; do
+ 	      name="`expr $i : '-l\(.*\)'`"
+-	     # If $name is empty we are operating on a -L argument.
+-	      if test -n "$name" && test "$name" != "0"; then
++	      # If $name is empty we are operating on a -L argument.
++              if test "$name" != "" && test "$name" != "0"; then
+ 		$rm conftest
+-		$CC -o conftest conftest.c $i
++		$LTCC -o conftest conftest.c $i
+ 		# Did it work?
+-		if test $? -eq 0 ; then
++		if test "$?" -eq 0 ; then
+ 		  ldd_output=`ldd conftest`
+-		  libname=`eval \\$echo \"$libname_spec\"`
+-		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
+-		  set dummy $deplib_matches
+-		  deplib_match=$2
+-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+-		    newdeplibs="$newdeplibs $i"
+-		  else
+-		    droppeddeps=yes
+-		    echo
+-		    echo "*** Warning: dynamic linker does not accept needed library $i."
+-		    echo "*** I have the capability to make that library automatically link in when"
+-		    echo "*** you link to this library.  But I can only do this if you have a"
+-		    echo "*** shared version of the library, which you do not appear to have"
+-		    echo "*** because a test_compile did reveal that the linker did not use this one"
+-		    echo "*** as a dynamic dependency that programs can get resolved with at runtime."
++		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++		    case " $predeps $postdeps " in
++		    *" $i "*)
++		      newdeplibs="$newdeplibs $i"
++		      i=""
++		      ;;
++		    esac
++		  fi
++		  if test -n "$i" ; then
++		    libname=`eval \\$echo \"$libname_spec\"`
++		    deplib_matches=`eval \\$echo \"$library_names_spec\"`
++		    set dummy $deplib_matches
++		    deplib_match=$2
++		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
++		      newdeplibs="$newdeplibs $i"
++		    else
++		      droppeddeps=yes
++		      $echo
++		      $echo "*** Warning: dynamic linker does not accept needed library $i."
++		      $echo "*** I have the capability to make that library automatically link in when"
++		      $echo "*** you link to this library.  But I can only do this if you have a"
++		      $echo "*** shared version of the library, which you do not appear to have"
++		      $echo "*** because a test_compile did reveal that the linker did not use this one"
++		      $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
++		    fi
+ 		  fi
+ 		else
+ 		  droppeddeps=yes
+-		  echo
+-		  echo "*** Warning!  Library $i is needed by this library but I was not able to"
+-		  echo "***  make it link in!  You will probably need to install it or some"
+-		  echo "*** library that it depends on before this library will be fully"
+-		  echo "*** functional.  Installing it before continuing would be even better."
++		  $echo
++		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
++		  $echo "***  make it link in!  You will probably need to install it or some"
++		  $echo "*** library that it depends on before this library will be fully"
++		  $echo "*** functional.  Installing it before continuing would be even better."
+ 		fi
+ 	      else
+ 		newdeplibs="$newdeplibs $i"
+@@ -2579,11 +3477,20 @@
+ 	  for a_deplib in $deplibs; do
+ 	    name="`expr $a_deplib : '-l\(.*\)'`"
+ 	    # If $name is empty we are operating on a -L argument.
+-	    if test -n "$name" && test "$name" != "0"; then
+-	      libname=`eval \\$echo \"$libname_spec\"`
+-	      for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+-		    potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+-		    for potent_lib in $potential_libs; do
++            if test "$name" != "" && test  "$name" != "0"; then
++	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++		case " $predeps $postdeps " in
++		*" $a_deplib "*)
++		  newdeplibs="$newdeplibs $a_deplib"
++		  a_deplib=""
++		  ;;
++		esac
++	      fi
++	      if test -n "$a_deplib" ; then
++		libname=`eval \\$echo \"$libname_spec\"`
++		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
++		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
++		  for potent_lib in $potential_libs; do
+ 		      # Follow soft links.
+ 		      if ls -lLd "$potent_lib" 2>/dev/null \
+ 			 | grep " -> " >/dev/null; then
+@@ -2596,34 +3503,35 @@
+ 		      # but so what?
+ 		      potlib="$potent_lib"
+ 		      while test -h "$potlib" 2>/dev/null; do
+-			potliblink=`ls -ld $potlib | sed 's/.* -> //'`
++			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+ 			case $potliblink in
+ 			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
+ 			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+ 			esac
+ 		      done
+ 		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
+-			 | sed 10q \
+-			 | egrep "$file_magic_regex" > /dev/null; then
++			 | ${SED} 10q \
++			 | $EGREP "$file_magic_regex" > /dev/null; then
+ 			newdeplibs="$newdeplibs $a_deplib"
+ 			a_deplib=""
+ 			break 2
+ 		      fi
+-		    done
+-	      done
++		  done
++		done
++	      fi
+ 	      if test -n "$a_deplib" ; then
+ 		droppeddeps=yes
+-		echo
+-		echo "*** Warning: linker path does not have real file for library $a_deplib."
+-		echo "*** I have the capability to make that library automatically link in when"
+-		echo "*** you link to this library.  But I can only do this if you have a"
+-		echo "*** shared version of the library, which you do not appear to have"
+-		echo "*** because I did check the linker path looking for a file starting"
++		$echo
++		$echo "*** Warning: linker path does not have real file for library $a_deplib."
++		$echo "*** I have the capability to make that library automatically link in when"
++		$echo "*** you link to this library.  But I can only do this if you have a"
++		$echo "*** shared version of the library, which you do not appear to have"
++		$echo "*** because I did check the linker path looking for a file starting"
+ 		if test -z "$potlib" ; then
+-		  echo "*** with $libname but no candidates were found. (...for file magic test)"
++		  $echo "*** with $libname but no candidates were found. (...for file magic test)"
+ 		else
+-		  echo "*** with $libname and none of the candidates passed a file format test"
+-		  echo "*** using a file magic. Last file checked: $potlib"
++		  $echo "*** with $libname and none of the candidates passed a file format test"
++		  $echo "*** using a file magic. Last file checked: $potlib"
+ 		fi
+ 	      fi
+ 	    else
+@@ -2639,33 +3547,43 @@
+ 	    name="`expr $a_deplib : '-l\(.*\)'`"
+ 	    # If $name is empty we are operating on a -L argument.
+ 	    if test -n "$name" && test "$name" != "0"; then
+-	      libname=`eval \\$echo \"$libname_spec\"`
+-	      for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+-		potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+-		for potent_lib in $potential_libs; do
+-		  potlib="$potent_lib" # see symlink-check below in file_magic test
+-		  if eval echo \"$potent_lib\" 2>/dev/null \
+-		      | sed 10q \
+-		      | egrep "$match_pattern_regex" > /dev/null; then
+-		    newdeplibs="$newdeplibs $a_deplib"
+-		    a_deplib=""
+-		    break 2
+-		  fi
++	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++		case " $predeps $postdeps " in
++		*" $a_deplib "*)
++		  newdeplibs="$newdeplibs $a_deplib"
++		  a_deplib=""
++		  ;;
++		esac
++	      fi
++	      if test -n "$a_deplib" ; then
++		libname=`eval \\$echo \"$libname_spec\"`
++		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
++		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
++		  for potent_lib in $potential_libs; do
++		    potlib="$potent_lib" # see symlink-check above in file_magic test
++		    if eval $echo \"$potent_lib\" 2>/dev/null \
++		        | ${SED} 10q \
++		        | $EGREP "$match_pattern_regex" > /dev/null; then
++		      newdeplibs="$newdeplibs $a_deplib"
++		      a_deplib=""
++		      break 2
++		    fi
++		  done
+ 		done
+-	      done
++	      fi
+ 	      if test -n "$a_deplib" ; then
+ 		droppeddeps=yes
+-		echo
+-		echo "*** Warning: linker path does not have real file for library $a_deplib."
+-		echo "*** I have the capability to make that library automatically link in when"
+-		echo "*** you link to this library.  But I can only do this if you have a"
+-		echo "*** shared version of the library, which you do not appear to have"
+-		echo "*** because I did check the linker path looking for a file starting"
++		$echo
++		$echo "*** Warning: linker path does not have real file for library $a_deplib."
++		$echo "*** I have the capability to make that library automatically link in when"
++		$echo "*** you link to this library.  But I can only do this if you have a"
++		$echo "*** shared version of the library, which you do not appear to have"
++		$echo "*** because I did check the linker path looking for a file starting"
+ 		if test -z "$potlib" ; then
+-		  echo "*** with $libname but no candidates were found. (...for regex pattern test)"
++		  $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
+ 		else
+-		  echo "*** with $libname and none of the candidates passed a file format test"
+-		  echo "*** using a regex pattern. Last file checked: $potlib"
++		  $echo "*** with $libname and none of the candidates passed a file format test"
++		  $echo "*** using a regex pattern. Last file checked: $potlib"
+ 		fi
+ 	      fi
+ 	    else
+@@ -2676,16 +3594,23 @@
+ 	  ;;
+ 	none | unknown | *)
+ 	  newdeplibs=""
+-	  if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
+-	       -e 's/ -[LR][^ ]*//g' -e 's/[ 	]//g' |
+-	     grep . >/dev/null; then
+-	    echo
++	  tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
++	    -e 's/ -[LR][^ ]*//g'`
++	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
++	    for i in $predeps $postdeps ; do
++	      # can't use Xsed below, because $i might contain '/'
++	      tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
++	    done
++	  fi
++	  if $echo "X $tmp_deplibs" | $Xsed -e 's/[ 	]//g' \
++	    | grep . >/dev/null; then
++	    $echo
+ 	    if test "X$deplibs_check_method" = "Xnone"; then
+-	      echo "*** Warning: inter-library dependencies are not supported in this platform."
++	      $echo "*** Warning: inter-library dependencies are not supported in this platform."
+ 	    else
+-	      echo "*** Warning: inter-library dependencies are not known to be supported."
++	      $echo "*** Warning: inter-library dependencies are not known to be supported."
+ 	    fi
+-	    echo "*** All declared inter-library dependencies are being dropped."
++	    $echo "*** All declared inter-library dependencies are being dropped."
+ 	    droppeddeps=yes
+ 	  fi
+ 	  ;;
+@@ -2705,17 +3630,17 @@
+ 
+ 	if test "$droppeddeps" = yes; then
+ 	  if test "$module" = yes; then
+-	    echo
+-	    echo "*** Warning: libtool could not satisfy all declared inter-library"
+-	    echo "*** dependencies of module $libname.  Therefore, libtool will create"
+-	    echo "*** a static module, that should work as long as the dlopening"
+-	    echo "*** application is linked with the -dlopen flag."
++	    $echo
++	    $echo "*** Warning: libtool could not satisfy all declared inter-library"
++	    $echo "*** dependencies of module $libname.  Therefore, libtool will create"
++	    $echo "*** a static module, that should work as long as the dlopening"
++	    $echo "*** application is linked with the -dlopen flag."
+ 	    if test -z "$global_symbol_pipe"; then
+-	      echo
+-	      echo "*** However, this would only work if libtool was able to extract symbol"
+-	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+-	      echo "*** not find such a program.  So, this module is probably useless."
+-	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
++	      $echo
++	      $echo "*** However, this would only work if libtool was able to extract symbol"
++	      $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
++	      $echo "*** not find such a program.  So, this module is probably useless."
++	      $echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ 	    fi
+ 	    if test "$build_old_libs" = no; then
+ 	      oldlibs="$output_objdir/$libname.$libext"
+@@ -2725,16 +3650,16 @@
+ 	      build_libtool_libs=no
+ 	    fi
+ 	  else
+-	    echo "*** The inter-library dependencies that have been dropped here will be"
+-	    echo "*** automatically added whenever a program is linked with this library"
+-	    echo "*** or is declared to -dlopen it."
+-
+-	    if test $allow_undefined = no; then
+-	      echo
+-	      echo "*** Since this library must not contain undefined symbols,"
+-	      echo "*** because either the platform does not support them or"
+-	      echo "*** it was explicitly requested with -no-undefined,"
+-	      echo "*** libtool will only create a static version of it."
++	    $echo "*** The inter-library dependencies that have been dropped here will be"
++	    $echo "*** automatically added whenever a program is linked with this library"
++	    $echo "*** or is declared to -dlopen it."
++
++	    if test "$allow_undefined" = no; then
++	      $echo
++	      $echo "*** Since this library must not contain undefined symbols,"
++	      $echo "*** because either the platform does not support them or"
++	      $echo "*** it was explicitly requested with -no-undefined,"
++	      $echo "*** libtool will only create a static version of it."
+ 	      if test "$build_old_libs" = no; then
+ 		oldlibs="$output_objdir/$libname.$libext"
+ 		build_libtool_libs=module
+@@ -2756,7 +3681,7 @@
+ 
+       # Test again, we may have decided not to build it any more
+       if test "$build_libtool_libs" = yes; then
+-	if test $hardcode_into_libs = yes; then
++	if test "$hardcode_into_libs" = yes; then
+ 	  # Hardcode the library paths
+ 	  hardcode_libdirs=
+ 	  dep_rpath=
+@@ -2792,7 +3717,11 @@
+ 	  if test -n "$hardcode_libdir_separator" &&
+ 	     test -n "$hardcode_libdirs"; then
+ 	    libdir="$hardcode_libdirs"
+-	    eval dep_rpath=\"$hardcode_libdir_flag_spec\"
++	    if test -n "$hardcode_libdir_flag_spec_ld"; then
++	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
++	    else
++	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
++	    fi
+ 	  fi
+ 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
+ 	    # We should set the runpath_var.
+@@ -2812,6 +3741,7 @@
+ 	fi
+ 
+ 	# Get the real and link names of the library.
++	eval shared_ext=\"$shrext_cmds\"
+ 	eval library_names=\"$library_names_spec\"
+ 	set dummy $library_names
+ 	realname="$2"
+@@ -2822,7 +3752,9 @@
+ 	else
+ 	  soname="$realname"
+ 	fi
+-	test -z "$dlname" && dlname=$soname
++	if test -z "$dlname"; then
++	  dlname=$soname
++	fi
+ 
+ 	lib="$output_objdir/$realname"
+ 	for link
+@@ -2830,23 +3762,6 @@
+ 	  linknames="$linknames $link"
+ 	done
+ 
+-	# Ensure that we have .o objects for linkers which dislike .lo
+-	# (e.g. aix) in case we are running --disable-static
+-	for obj in $libobjs; do
+-	  xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+-	  if test "X$xdir" = "X$obj"; then
+-	    xdir="."
+-	  else
+-	    xdir="$xdir"
+-	  fi
+-	  baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+-	  oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
+-	  if test ! -f $xdir/$oldobj; then
+-	    $show "(cd $xdir && ${LN_S} $baseobj $oldobj)"
+-	    $run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $?
+-	  fi
+-	done
+-
+ 	# Use standard objects if they are pic
+ 	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ 
+@@ -2856,17 +3771,26 @@
+ 	    $show "generating symbol list for \`$libname.la'"
+ 	    export_symbols="$output_objdir/$libname.exp"
+ 	    $run $rm $export_symbols
+-	    eval cmds=\"$export_symbols_cmds\"
++	    cmds=$export_symbols_cmds
+ 	    save_ifs="$IFS"; IFS='~'
+ 	    for cmd in $cmds; do
+ 	      IFS="$save_ifs"
+-	      $show "$cmd"
+-	      $run eval "$cmd" || exit $?
++	      eval cmd=\"$cmd\"
++	      if len=`expr "X$cmd" : ".*"` &&
++	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
++	        $show "$cmd"
++	        $run eval "$cmd" || exit $?
++	        skipped_export=false
++	      else
++	        # The command line is too long to execute in one step.
++	        $show "using reloadable object file for export list..."
++	        skipped_export=:
++	      fi
+ 	    done
+ 	    IFS="$save_ifs"
+ 	    if test -n "$export_symbols_regex"; then
+-	      $show "egrep -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
+-	      $run eval 'egrep -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
++	      $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
++	      $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+ 	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
+ 	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
+ 	    fi
+@@ -2877,46 +3801,30 @@
+ 	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
+ 	fi
+ 
++	tmp_deplibs=
++	for test_deplib in $deplibs; do
++		case " $convenience " in
++		*" $test_deplib "*) ;;
++		*)
++			tmp_deplibs="$tmp_deplibs $test_deplib"
++			;;
++		esac
++	done
++	deplibs="$tmp_deplibs"
++
+ 	if test -n "$convenience"; then
+ 	  if test -n "$whole_archive_flag_spec"; then
++	    save_libobjs=$libobjs
+ 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+ 	  else
+ 	    gentop="$output_objdir/${outputname}x"
+-	    $show "${rm}r $gentop"
+-	    $run ${rm}r "$gentop"
+-	    $show "mkdir $gentop"
+-	    $run mkdir "$gentop"
+-	    status=$?
+-	    if test $status -ne 0 && test ! -d "$gentop"; then
+-	      exit $status
+-	    fi
+ 	    generated="$generated $gentop"
+ 
+-	    for xlib in $convenience; do
+-	      # Extract the objects.
+-	      case $xlib in
+-	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+-	      *) xabs=`pwd`"/$xlib" ;;
+-	      esac
+-	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+-	      xdir="$gentop/$xlib"
+-
+-	      $show "${rm}r $xdir"
+-	      $run ${rm}r "$xdir"
+-	      $show "mkdir $xdir"
+-	      $run mkdir "$xdir"
+-	      status=$?
+-	      if test $status -ne 0 && test ! -d "$xdir"; then
+-		exit $status
+-	      fi
+-	      $show "(cd $xdir && $AR x $xabs)"
+-	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+-
+-	      libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
+-	    done
++	    func_extract_archives $gentop $convenience
++	    libobjs="$libobjs $func_extract_archives_result"
+ 	  fi
+ 	fi
+-
++	
+ 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+ 	  eval flag=\"$thread_safe_flag_spec\"
+ 	  linker_flags="$linker_flags $flag"
+@@ -2928,14 +3836,147 @@
+ 	fi
+ 
+ 	# Do each of the archive commands.
++	if test "$module" = yes && test -n "$module_cmds" ; then
++	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
++	    eval test_cmds=\"$module_expsym_cmds\"
++	    cmds=$module_expsym_cmds
++	  else
++	    eval test_cmds=\"$module_cmds\"
++	    cmds=$module_cmds
++	  fi
++	else
+ 	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+-	  eval cmds=\"$archive_expsym_cmds\"
++	  eval test_cmds=\"$archive_expsym_cmds\"
++	  cmds=$archive_expsym_cmds
++	else
++	  eval test_cmds=\"$archive_cmds\"
++	  cmds=$archive_cmds
++	  fi
++	fi
++
++	if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
++	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
++	  :
+ 	else
+-	  eval cmds=\"$archive_cmds\"
++	  # The command line is too long to link in one step, link piecewise.
++	  $echo "creating reloadable object files..."
++
++	  # Save the value of $output and $libobjs because we want to
++	  # use them later.  If we have whole_archive_flag_spec, we
++	  # want to use save_libobjs as it was before
++	  # whole_archive_flag_spec was expanded, because we can't
++	  # assume the linker understands whole_archive_flag_spec.
++	  # This may have to be revisited, in case too many
++	  # convenience libraries get linked in and end up exceeding
++	  # the spec.
++	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
++	    save_libobjs=$libobjs
++	  fi
++	  save_output=$output
++
++	  # Clear the reloadable object creation command queue and
++	  # initialize k to one.
++	  test_cmds=
++	  concat_cmds=
++	  objlist=
++	  delfiles=
++	  last_robj=
++	  k=1
++	  output=$output_objdir/$save_output-${k}.$objext
++	  # Loop over the list of objects to be linked.
++	  for obj in $save_libobjs
++	  do
++	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
++	    if test "X$objlist" = X ||
++	       { len=`expr "X$test_cmds" : ".*"` &&
++		 test "$len" -le "$max_cmd_len"; }; then
++	      objlist="$objlist $obj"
++	    else
++	      # The command $test_cmds is almost too long, add a
++	      # command to the queue.
++	      if test "$k" -eq 1 ; then
++		# The first file doesn't have a previous command to add.
++		eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
++	      else
++		# All subsequent reloadable object files will link in
++		# the last one created.
++		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
++	      fi
++	      last_robj=$output_objdir/$save_output-${k}.$objext
++	      k=`expr $k + 1`
++	      output=$output_objdir/$save_output-${k}.$objext
++	      objlist=$obj
++	      len=1
++	    fi
++	  done
++	  # Handle the remaining objects by creating one last
++	  # reloadable object file.  All subsequent reloadable object
++	  # files will link in the last one created.
++	  test -z "$concat_cmds" || concat_cmds=$concat_cmds~
++	  eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
++
++	  if ${skipped_export-false}; then
++	    $show "generating symbol list for \`$libname.la'"
++	    export_symbols="$output_objdir/$libname.exp"
++	    $run $rm $export_symbols
++	    libobjs=$output
++	    # Append the command to create the export file.
++	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
++          fi
++
++	  # Set up a command to remove the reloadale object files
++	  # after they are used.
++	  i=0
++	  while test "$i" -lt "$k"
++	  do
++	    i=`expr $i + 1`
++	    delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
++	  done
++
++	  $echo "creating a temporary reloadable object file: $output"
++
++	  # Loop through the commands generated above and execute them.
++	  save_ifs="$IFS"; IFS='~'
++	  for cmd in $concat_cmds; do
++	    IFS="$save_ifs"
++	    $show "$cmd"
++	    $run eval "$cmd" || exit $?
++	  done
++	  IFS="$save_ifs"
++
++	  libobjs=$output
++	  # Restore the value of output.
++	  output=$save_output
++
++	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
++	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
++	  fi
++	  # Expand the library linking commands again to reset the
++	  # value of $libobjs for piecewise linking.
++
++	  # Do each of the archive commands.
++	  if test "$module" = yes && test -n "$module_cmds" ; then
++	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
++	      cmds=$module_expsym_cmds
++	    else
++	      cmds=$module_cmds
++	    fi
++	  else
++	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
++	    cmds=$archive_expsym_cmds
++	  else
++	    cmds=$archive_cmds
++	    fi
++	  fi
++
++	  # Append the command to remove the reloadable object files
++	  # to the just-reset $cmds.
++	  eval cmds=\"\$cmds~\$rm $delfiles\"
+ 	fi
+ 	save_ifs="$IFS"; IFS='~'
+ 	for cmd in $cmds; do
+ 	  IFS="$save_ifs"
++	  eval cmd=\"$cmd\"
+ 	  $show "$cmd"
+ 	  $run eval "$cmd" || exit $?
+ 	done
+@@ -2944,7 +3985,7 @@
+ 	# Restore the uninstalled library and exit
+ 	if test "$mode" = relink; then
+ 	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+-	  exit 0
++	  exit $EXIT_SUCCESS
+ 	fi
+ 
+ 	# Create links to the real library.
+@@ -2992,7 +4033,7 @@
+       *.lo)
+ 	if test -n "$objs$old_deplibs"; then
+ 	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 	libobj="$output"
+ 	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+@@ -3021,38 +4062,10 @@
+ 	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+ 	else
+ 	  gentop="$output_objdir/${obj}x"
+-	  $show "${rm}r $gentop"
+-	  $run ${rm}r "$gentop"
+-	  $show "mkdir $gentop"
+-	  $run mkdir "$gentop"
+-	  status=$?
+-	  if test $status -ne 0 && test ! -d "$gentop"; then
+-	    exit $status
+-	  fi
+ 	  generated="$generated $gentop"
+ 
+-	  for xlib in $convenience; do
+-	    # Extract the objects.
+-	    case $xlib in
+-	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+-	    *) xabs=`pwd`"/$xlib" ;;
+-	    esac
+-	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+-	    xdir="$gentop/$xlib"
+-
+-	    $show "${rm}r $xdir"
+-	    $run ${rm}r "$xdir"
+-	    $show "mkdir $xdir"
+-	    $run mkdir "$xdir"
+-	    status=$?
+-	    if test $status -ne 0 && test ! -d "$xdir"; then
+-	      exit $status
+-	    fi
+-	    $show "(cd $xdir && $AR x $xabs)"
+-	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+-
+-	    reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
+-	  done
++	  func_extract_archives $gentop $convenience
++	  reload_conv_objs="$reload_objs $func_extract_archives_result"
+ 	fi
+       fi
+ 
+@@ -3060,10 +4073,11 @@
+       reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+ 
+       output="$obj"
+-      eval cmds=\"$reload_cmds\"
++      cmds=$reload_cmds
+       save_ifs="$IFS"; IFS='~'
+       for cmd in $cmds; do
+ 	IFS="$save_ifs"
++	eval cmd=\"$cmd\"
+ 	$show "$cmd"
+ 	$run eval "$cmd" || exit $?
+       done
+@@ -3076,7 +4090,7 @@
+ 	  $run ${rm}r $gentop
+ 	fi
+ 
+-	exit 0
++	exit $EXIT_SUCCESS
+       fi
+ 
+       if test "$build_libtool_libs" != yes; then
+@@ -3087,37 +4101,24 @@
+ 
+ 	# Create an invalid libtool object if no PIC, so that we don't
+ 	# accidentally link it into a program.
+-	$show "echo timestamp > $libobj"
+-	$run eval "echo timestamp > $libobj" || exit $?
+-	exit 0
++	# $show "echo timestamp > $libobj"
++	# $run eval "echo timestamp > $libobj" || exit $?
++	exit $EXIT_SUCCESS
+       fi
+ 
+       if test -n "$pic_flag" || test "$pic_mode" != default; then
+ 	# Only do commands if we really have different PIC objects.
+ 	reload_objs="$libobjs $reload_conv_objs"
+ 	output="$libobj"
+-	eval cmds=\"$reload_cmds\"
++	cmds=$reload_cmds
+ 	save_ifs="$IFS"; IFS='~'
+ 	for cmd in $cmds; do
+ 	  IFS="$save_ifs"
++	  eval cmd=\"$cmd\"
+ 	  $show "$cmd"
+ 	  $run eval "$cmd" || exit $?
+ 	done
+ 	IFS="$save_ifs"
+-      else
+-	# Just create a symlink.
+-	$show $rm $libobj
+-	$run $rm $libobj
+-	xdir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
+-	if test "X$xdir" = "X$libobj"; then
+-	  xdir="."
+-	else
+-	  xdir="$xdir"
+-	fi
+-	baseobj=`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
+-	oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
+-	$show "(cd $xdir && $LN_S $oldobj $baseobj)"
+-	$run eval '(cd $xdir && $LN_S $oldobj $baseobj)' || exit $?
+       fi
+ 
+       if test -n "$gentop"; then
+@@ -3125,12 +4126,12 @@
+ 	$run ${rm}r $gentop
+       fi
+ 
+-      exit 0
++      exit $EXIT_SUCCESS
+       ;;
+ 
+     prog)
+       case $host in
+-	*cygwin*) output=`echo $output | sed -e 's,.exe$,,;s,$,.exe,'` ;;
++	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
+       esac
+       if test -n "$vinfo"; then
+ 	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
+@@ -3155,6 +4156,16 @@
+ 	;;
+       esac
+ 
++      case $host in
++      *darwin*)
++        # Don't allow lazy linking, it breaks C++ global constructors
++        if test "$tagname" = CXX ; then
++        compile_command="$compile_command ${wl}-bind_at_load"
++        finalize_command="$finalize_command ${wl}-bind_at_load"
++        fi
++        ;;
++      esac
++
+       compile_command="$compile_command $compile_deplibs"
+       finalize_command="$finalize_command $finalize_deplibs"
+ 
+@@ -3305,12 +4316,12 @@
+ 	    done
+ 
+ 	    if test -n "$exclude_expsyms"; then
+-	      $run eval 'egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
++	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+ 	      $run eval '$mv "$nlist"T "$nlist"'
+ 	    fi
+ 
+ 	    if test -n "$export_symbols_regex"; then
+-	      $run eval 'egrep -e "$export_symbols_regex" "$nlist" > "$nlist"T'
++	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+ 	      $run eval '$mv "$nlist"T "$nlist"'
+ 	    fi
+ 
+@@ -3318,9 +4329,9 @@
+ 	    if test -z "$export_symbols"; then
+ 	      export_symbols="$output_objdir/$output.exp"
+ 	      $run $rm $export_symbols
+-	      $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
++	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+ 	    else
+-	      $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
++	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
+ 	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
+ 	      $run eval 'mv "$nlist"T "$nlist"'
+ 	    fi
+@@ -3328,8 +4339,8 @@
+ 
+ 	  for arg in $dlprefiles; do
+ 	    $show "extracting global C symbols from \`$arg'"
+-	    name=`echo "$arg" | sed -e 's%^.*/%%'`
+-	    $run eval 'echo ": $name " >> "$nlist"'
++	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
++	    $run eval '$echo ": $name " >> "$nlist"'
+ 	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
+ 	  done
+ 
+@@ -3338,12 +4349,18 @@
+ 	    test -f "$nlist" || : > "$nlist"
+ 
+ 	    if test -n "$exclude_expsyms"; then
+-	      egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
++	      $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+ 	      $mv "$nlist"T "$nlist"
+ 	    fi
+ 
+ 	    # Try sorting and uniquifying the output.
+-	    if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then
++	    if grep -v "^: " < "$nlist" |
++		if sort -k 3 </dev/null >/dev/null 2>&1; then
++		  sort -k 3
++		else
++		  sort +2
++		fi |
++		uniq > "$nlist"S; then
+ 	      :
+ 	    else
+ 	      grep -v "^: " < "$nlist" > "$nlist"S
+@@ -3352,7 +4369,7 @@
+ 	    if test -f "$nlist"S; then
+ 	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
+ 	    else
+-	      echo '/* NONE */' >> "$output_objdir/$dlsyms"
++	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
+ 	    fi
+ 
+ 	    $echo >> "$output_objdir/$dlsyms" "\
+@@ -3404,18 +4421,18 @@
+ 	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+ 	    case "$compile_command " in
+ 	    *" -static "*) ;;
+-	    *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";;
++	    *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
+ 	    esac;;
+ 	  *-*-hpux*)
+ 	    case "$compile_command " in
+ 	    *" -static "*) ;;
+-	    *) pic_flag_for_symtable=" $pic_flag -DPIC";;
++	    *) pic_flag_for_symtable=" $pic_flag";;
+ 	    esac
+ 	  esac
+ 
+ 	  # Now compile the dynamic symbol file.
+-	  $show "(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+-	  $run eval '(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
++	  $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
++	  $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+ 
+ 	  # Clean up the generated files.
+ 	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
+@@ -3427,7 +4444,7 @@
+ 	  ;;
+ 	*)
+ 	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+       else
+@@ -3440,7 +4457,7 @@
+ 	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+       fi
+ 
+-      if test $need_relink = no || test "$build_libtool_libs" != yes; then
++      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+ 	# Replace the output file specification.
+ 	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ 	link_command="$compile_command$compile_rpath"
+@@ -3515,7 +4532,7 @@
+ 	# Link the executable and exit
+ 	$show "$link_command"
+ 	$run eval "$link_command" || exit $?
+-	exit 0
++	exit $EXIT_SUCCESS
+       fi
+ 
+       if test "$hardcode_action" = relink; then
+@@ -3570,10 +4587,10 @@
+       fi
+ 
+       # Quote $echo for shipping.
+-      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
+-	case $0 in
+-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
+-	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
++      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
++	case $progpath in
++	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
++	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
+ 	esac
+ 	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
+       else
+@@ -3585,15 +4602,230 @@
+ 	# win32 will think the script is a binary if it has
+ 	# a .exe suffix, so we strip it off here.
+ 	case $output in
+-	  *.exe) output=`echo $output|sed 's,.exe$,,'` ;;
++	  *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
+ 	esac
+ 	# test for cygwin because mv fails w/o .exe extensions
+ 	case $host in
+-	  *cygwin*) exeext=.exe ;;
++	  *cygwin*)
++	    exeext=.exe
++	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
+ 	  *) exeext= ;;
+ 	esac
++	case $host in
++	  *cygwin* | *mingw* )
++	    cwrappersource=`$echo ${objdir}/lt-${output}.c`
++	    cwrapper=`$echo ${output}.exe`
++	    $rm $cwrappersource $cwrapper
++	    trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
++
++	    cat > $cwrappersource <<EOF
++
++/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
++   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
++
++   The $output program cannot be directly executed until all the libtool
++   libraries that it depends on are installed.
++
++   This wrapper executable should never be moved out of the build directory.
++   If it is, it will not operate correctly.
++
++   Currently, it simply execs the wrapper *script* "/bin/sh $output",
++   but could eventually absorb all of the scripts functionality and
++   exec $objdir/$outputname directly.
++*/
++EOF
++	    cat >> $cwrappersource<<"EOF"
++#include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>
++#include <malloc.h>
++#include <stdarg.h>
++#include <assert.h>
++
++#if defined(PATH_MAX)
++# define LT_PATHMAX PATH_MAX
++#elif defined(MAXPATHLEN)
++# define LT_PATHMAX MAXPATHLEN
++#else
++# define LT_PATHMAX 1024
++#endif
++
++#ifndef DIR_SEPARATOR
++#define DIR_SEPARATOR '/'
++#endif
++
++#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
++  defined (__OS2__)
++#define HAVE_DOS_BASED_FILE_SYSTEM
++#ifndef DIR_SEPARATOR_2
++#define DIR_SEPARATOR_2 '\\'
++#endif
++#endif
++
++#ifndef DIR_SEPARATOR_2
++# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
++#else /* DIR_SEPARATOR_2 */
++# define IS_DIR_SEPARATOR(ch) \
++        (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
++#endif /* DIR_SEPARATOR_2 */
++
++#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
++#define XFREE(stale) do { \
++  if (stale) { free ((void *) stale); stale = 0; } \
++} while (0)
++
++const char *program_name = NULL;
++
++void * xmalloc (size_t num);
++char * xstrdup (const char *string);
++char * basename (const char *name);
++char * fnqualify(const char *path);
++char * strendzap(char *str, const char *pat);
++void lt_fatal (const char *message, ...);
++
++int
++main (int argc, char *argv[])
++{
++  char **newargz;
++  int i;
++
++  program_name = (char *) xstrdup ((char *) basename (argv[0]));
++  newargz = XMALLOC(char *, argc+2);
++EOF
++
++	    cat >> $cwrappersource <<EOF
++  newargz[0] = "$SHELL";
++EOF
++
++	    cat >> $cwrappersource <<"EOF"
++  newargz[1] = fnqualify(argv[0]);
++  /* we know the script has the same name, without the .exe */
++  /* so make sure newargz[1] doesn't end in .exe */
++  strendzap(newargz[1],".exe");
++  for (i = 1; i < argc; i++)
++    newargz[i+1] = xstrdup(argv[i]);
++  newargz[argc+1] = NULL;
++EOF
++
++	    cat >> $cwrappersource <<EOF
++  execv("$SHELL",newargz);
++EOF
++
++	    cat >> $cwrappersource <<"EOF"
++}
++
++void *
++xmalloc (size_t num)
++{
++  void * p = (void *) malloc (num);
++  if (!p)
++    lt_fatal ("Memory exhausted");
++
++  return p;
++}
++
++char *
++xstrdup (const char *string)
++{
++  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
++;
++}
++
++char *
++basename (const char *name)
++{
++  const char *base;
++
++#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
++  /* Skip over the disk name in MSDOS pathnames. */
++  if (isalpha (name[0]) && name[1] == ':')
++    name += 2;
++#endif
++
++  for (base = name; *name; name++)
++    if (IS_DIR_SEPARATOR (*name))
++      base = name + 1;
++  return (char *) base;
++}
++
++char *
++fnqualify(const char *path)
++{
++  size_t size;
++  char *p;
++  char tmp[LT_PATHMAX + 1];
++
++  assert(path != NULL);
++
++  /* Is it qualified already? */
++#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
++  if (isalpha (path[0]) && path[1] == ':')
++    return xstrdup (path);
++#endif
++  if (IS_DIR_SEPARATOR (path[0]))
++    return xstrdup (path);
++
++  /* prepend the current directory */
++  /* doesn't handle '~' */
++  if (getcwd (tmp, LT_PATHMAX) == NULL)
++    lt_fatal ("getcwd failed");
++  size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
++  p = XMALLOC(char, size);
++  sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
++  return p;
++}
++
++char *
++strendzap(char *str, const char *pat)
++{
++  size_t len, patlen;
++
++  assert(str != NULL);
++  assert(pat != NULL);
++
++  len = strlen(str);
++  patlen = strlen(pat);
++
++  if (patlen <= len)
++  {
++    str += len - patlen;
++    if (strcmp(str, pat) == 0)
++      *str = '\0';
++  }
++  return str;
++}
++
++static void
++lt_error_core (int exit_status, const char * mode,
++          const char * message, va_list ap)
++{
++  fprintf (stderr, "%s: %s: ", program_name, mode);
++  vfprintf (stderr, message, ap);
++  fprintf (stderr, ".\n");
++
++  if (exit_status >= 0)
++    exit (exit_status);
++}
++
++void
++lt_fatal (const char *message, ...)
++{
++  va_list ap;
++  va_start (ap, message);
++  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
++  va_end (ap);
++}
++EOF
++	  # we should really use a build-platform specific compiler
++	  # here, but OTOH, the wrappers (shell script and this C one)
++	  # are only useful if you want to execute the "real" binary.
++	  # Since the "real" binary is built for $host, then this
++	  # wrapper might as well be built for $host, too.
++	  $run $LTCC -s -o $cwrapper $cwrappersource
++	  ;;
++	esac
+ 	$rm $output
+-	trap "$rm $output; exit 1" 1 2 15
++	trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
+ 
+ 	$echo > $output "\
+ #! $SHELL
+@@ -3609,12 +4841,12 @@
+ 
+ # Sed substitution that helps us do robust quoting.  It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e 1s/^X//'
++Xsed='${SED} -e 1s/^X//'
+ sed_quote_subst='$sed_quote_subst'
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ relink_command=\"$relink_command\"
+ 
+@@ -3647,7 +4879,7 @@
+   test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+ 
+   # Follow symbolic links until we get to the real thisdir.
+-  file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\`
++  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
+   while test -n \"\$file\"; do
+     destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+ 
+@@ -3660,7 +4892,7 @@
+     fi
+ 
+     file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+-    file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\`
++    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+   done
+ 
+   # Try to get the absolute directory name.
+@@ -3669,12 +4901,12 @@
+ "
+ 
+ 	if test "$fast_install" = yes; then
+-	  echo >> $output "\
++	  $echo >> $output "\
+   program=lt-'$outputname'$exeext
+   progdir=\"\$thisdir/$objdir\"
+ 
+   if test ! -f \"\$progdir/\$program\" || \\
+-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\
++     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+        test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+ 
+     file=\"\$\$-\$program\"
+@@ -3685,7 +4917,7 @@
+       $rm \"\$progdir/\$file\"
+     fi"
+ 
+-	  echo >> $output "\
++	  $echo >> $output "\
+ 
+     # relink executable if necessary
+     if test -n \"\$relink_command\"; then
+@@ -3693,7 +4925,7 @@
+       else
+ 	$echo \"\$relink_command_output\" >&2
+ 	$rm \"\$progdir/\$file\"
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+     fi
+ 
+@@ -3703,13 +4935,13 @@
+     $rm \"\$progdir/\$file\"
+   fi"
+ 	else
+-	  echo >> $output "\
++	  $echo >> $output "\
+   program='$outputname'
+   progdir=\"\$thisdir/$objdir\"
+ "
+ 	fi
+ 
+-	echo >> $output "\
++	$echo >> $output "\
+ 
+   if test -f \"\$progdir/\$program\"; then"
+ 
+@@ -3740,14 +4972,6 @@
+       # Run the actual program with our arguments.
+ "
+ 	case $host in
+-	# win32 systems need to use the prog path for dll
+-	# lookup to work
+-	*-*-cygwin* | *-*-pw32*)
+-	  $echo >> $output "\
+-      exec \$progdir/\$program \${1+\"\$@\"}
+-"
+-	  ;;
+-
+ 	# Backslashes separate directories on plain windows
+ 	*-*-mingw | *-*-os2*)
+ 	  $echo >> $output "\
+@@ -3757,30 +4981,26 @@
+ 
+ 	*)
+ 	  $echo >> $output "\
+-      # Export the path to the program.
+-      PATH=\"\$progdir:\$PATH\"
+-      export PATH
+-
+-      exec \$program \${1+\"\$@\"}
++      exec \$progdir/\$program \${1+\"\$@\"}
+ "
+ 	  ;;
+ 	esac
+ 	$echo >> $output "\
+       \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+   else
+     # The program doesn't exist.
+     \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
+     \$echo \"This script is just a wrapper for \$program.\" 1>&2
+-    echo \"See the $PACKAGE documentation for more information.\" 1>&2
+-    exit 1
++    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
++    exit $EXIT_FAILURE
+   fi
+ fi\
+ "
+ 	chmod +x $output
+       fi
+-      exit 0
++      exit $EXIT_SUCCESS
+       ;;
+     esac
+ 
+@@ -3796,74 +5016,86 @@
+ 	  oldobjs="$libobjs_save"
+ 	  build_libtool_libs=no
+ 	else
+-	  oldobjs="$objs$old_deplibs "`$echo "X$libobjs_save" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`
++	  oldobjs="$old_deplibs $non_pic_objects"
+ 	fi
+ 	addlibs="$old_convenience"
+       fi
+ 
+       if test -n "$addlibs"; then
+ 	gentop="$output_objdir/${outputname}x"
+-	$show "${rm}r $gentop"
+-	$run ${rm}r "$gentop"
+-	$show "mkdir $gentop"
+-	$run mkdir "$gentop"
+-	status=$?
+-	if test $status -ne 0 && test ! -d "$gentop"; then
+-	  exit $status
+-	fi
+ 	generated="$generated $gentop"
+ 
+-	# Add in members from convenience archives.
+-	for xlib in $addlibs; do
+-	  # Extract the objects.
+-	  case $xlib in
+-	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+-	  *) xabs=`pwd`"/$xlib" ;;
+-	  esac
+-	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+-	  xdir="$gentop/$xlib"
+-
+-	  $show "${rm}r $xdir"
+-	  $run ${rm}r "$xdir"
+-	  $show "mkdir $xdir"
+-	  $run mkdir "$xdir"
+-	  status=$?
+-	  if test $status -ne 0 && test ! -d "$xdir"; then
+-	    exit $status
+-	  fi
+-	  $show "(cd $xdir && $AR x $xabs)"
+-	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+-
+-	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
+-	done
++	func_extract_archives $gentop $addlibs
++	oldobjs="$oldobjs $func_extract_archives_result"
+       fi
+ 
+       # Do each command in the archive commands.
+       if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+-	eval cmds=\"$old_archive_from_new_cmds\"
++       cmds=$old_archive_from_new_cmds
+       else
+-	# Ensure that we have .o objects in place in case we decided
+-	# not to build a shared library, and have fallen back to building
+-	# static libs even though --disable-static was passed!
+-	for oldobj in $oldobjs; do
+-	  if test ! -f $oldobj; then
+-	    xdir=`$echo "X$oldobj" | $Xsed -e 's%/[^/]*$%%'`
+-	    if test "X$xdir" = "X$oldobj"; then
+-	      xdir="."
++	eval cmds=\"$old_archive_cmds\"
++
++	if len=`expr "X$cmds" : ".*"` &&
++	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
++	  cmds=$old_archive_cmds
++	else
++	  # the command line is too long to link in one step, link in parts
++	  $echo "using piecewise archive linking..."
++	  save_RANLIB=$RANLIB
++	  RANLIB=:
++	  objlist=
++	  concat_cmds=
++	  save_oldobjs=$oldobjs
++	  # GNU ar 2.10+ was changed to match POSIX; thus no paths are
++	  # encoded into archives.  This makes 'ar r' malfunction in
++	  # this piecewise linking case whenever conflicting object
++	  # names appear in distinct ar calls; check, warn and compensate.
++	    if (for obj in $save_oldobjs
++	    do
++	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
++	    done | sort | sort -uc >/dev/null 2>&1); then
++	    :
++	  else
++	    $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
++	    $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
++	    AR_FLAGS=cq
++	  fi
++	  # Is there a better way of finding the last object in the list?
++	  for obj in $save_oldobjs
++	  do
++	    last_oldobj=$obj
++	  done
++	  for obj in $save_oldobjs
++	  do
++	    oldobjs="$objlist $obj"
++	    objlist="$objlist $obj"
++	    eval test_cmds=\"$old_archive_cmds\"
++	    if len=`expr "X$test_cmds" : ".*"` &&
++	       test "$len" -le "$max_cmd_len"; then
++	      :
+ 	    else
+-	      xdir="$xdir"
++	      # the above command should be used before it gets too long
++	      oldobjs=$objlist
++	      if test "$obj" = "$last_oldobj" ; then
++	        RANLIB=$save_RANLIB
++	      fi
++	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
++	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
++	      objlist=
+ 	    fi
+-	    baseobj=`$echo "X$oldobj" | $Xsed -e 's%^.*/%%'`
+-	    obj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
+-	    $show "(cd $xdir && ${LN_S} $obj $baseobj)"
+-	    $run eval '(cd $xdir && ${LN_S} $obj $baseobj)' || exit $?
++	  done
++	  RANLIB=$save_RANLIB
++	  oldobjs=$objlist
++	  if test "X$oldobjs" = "X" ; then
++	    eval cmds=\"\$concat_cmds\"
++	  else
++	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+ 	  fi
+-	done
+-
+-	eval cmds=\"$old_archive_cmds\"
++	fi
+       fi
+       save_ifs="$IFS"; IFS='~'
+       for cmd in $cmds; do
++        eval cmd=\"$cmd\"
+ 	IFS="$save_ifs"
+ 	$show "$cmd"
+ 	$run eval "$cmd" || exit $?
+@@ -3895,8 +5127,12 @@
+ 	fi
+       done
+       # Quote the link command for shipping.
+-      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args)"
++      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++      if test "$hardcode_automatic" = yes ; then
++	relink_command=
++      fi
++
+ 
+       # Only create the output if not a dry run.
+       if test -z "$run"; then
+@@ -3912,10 +5148,10 @@
+ 	      case $deplib in
+ 	      *.la)
+ 		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
+-		eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ 		if test -z "$libdir"; then
+ 		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+-		  exit 1
++		  exit $EXIT_FAILURE
+ 		fi
+ 		newdependency_libs="$newdependency_libs $libdir/$name"
+ 		;;
+@@ -3926,10 +5162,10 @@
+ 	    newdlfiles=
+ 	    for lib in $dlfiles; do
+ 	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+-	      eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
++	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ 	      if test -z "$libdir"; then
+ 		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+-		exit 1
++		exit $EXIT_FAILURE
+ 	      fi
+ 	      newdlfiles="$newdlfiles $libdir/$name"
+ 	    done
+@@ -3937,20 +5173,39 @@
+ 	    newdlprefiles=
+ 	    for lib in $dlprefiles; do
+ 	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+-	      eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
++	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ 	      if test -z "$libdir"; then
+ 		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+-		exit 1
++		exit $EXIT_FAILURE
+ 	      fi
+ 	      newdlprefiles="$newdlprefiles $libdir/$name"
+ 	    done
+ 	    dlprefiles="$newdlprefiles"
++	  else
++	    newdlfiles=
++	    for lib in $dlfiles; do
++	      case $lib in
++		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
++		*) abs=`pwd`"/$lib" ;;
++	      esac
++	      newdlfiles="$newdlfiles $abs"
++	    done
++	    dlfiles="$newdlfiles"
++	    newdlprefiles=
++	    for lib in $dlprefiles; do
++	      case $lib in
++		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
++		*) abs=`pwd`"/$lib" ;;
++	      esac
++	      newdlprefiles="$newdlprefiles $abs"
++	    done
++	    dlprefiles="$newdlprefiles"
+ 	  fi
+ 	  $rm $output
+ 	  # place dlname in correct position for cygwin
+ 	  tdlname=$dlname
+ 	  case $host,$output,$installed,$module,$dlname in
+-	    *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
++	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ 	  esac
+ 	  $echo > $output "\
+ # $outputname - a libtool library file
+@@ -3979,13 +5234,16 @@
+ # Is this an already installed library?
+ installed=$installed
+ 
++# Should we warn about portability when linking against -modules?
++shouldnotlink=$module
++
+ # Files to dlopen/dlpreopen
+ dlopen='$dlfiles'
+ dlpreopen='$dlprefiles'
+ 
+ # Directory that this library needs to be installed in:
+ libdir='$install_libdir'"
+-	  if test "$installed" = no && test $need_relink = yes; then
++	  if test "$installed" = no && test "$need_relink" = yes; then
+ 	    $echo >> $output "\
+ relink_command=\"$relink_command\""
+ 	  fi
+@@ -3998,7 +5256,7 @@
+       $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
+       ;;
+     esac
+-    exit 0
++    exit $EXIT_SUCCESS
+     ;;
+ 
+   # libtool install mode
+@@ -4087,13 +5345,13 @@
+     if test -z "$install_prog"; then
+       $echo "$modename: you must specify an install program" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     if test -n "$prev"; then
+       $echo "$modename: the \`$prev' option requires an argument" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     if test -z "$files"; then
+@@ -4103,7 +5361,7 @@
+ 	$echo "$modename: you must specify a destination" 1>&2
+       fi
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     # Strip any trailing slash from the destination.
+@@ -4121,10 +5379,10 @@
+ 
+       # Not a directory, so check to see that there is only one file specified.
+       set dummy $files
+-      if test $# -gt 2; then
++      if test "$#" -gt 2; then
+ 	$echo "$modename: \`$dest' is not a directory" 1>&2
+ 	$echo "$help" 1>&2
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+     fi
+     case $destdir in
+@@ -4136,7 +5394,7 @@
+ 	*)
+ 	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+       done
+@@ -4161,11 +5419,11 @@
+ 
+       *.la)
+ 	# Check to see that this really is a libtool archive.
+-	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
++	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ 	else
+ 	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	library_names=
+@@ -4196,12 +5454,33 @@
+ 	dir="$dir$objdir"
+ 
+ 	if test -n "$relink_command"; then
++	  # Determine the prefix the user has applied to our future dir.
++	  inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
++
++	  # Don't allow the user to place us outside of our expected
++	  # location b/c this prevents finding dependent libraries that
++	  # are installed to the same prefix.
++	  # At present, this check doesn't affect windows .dll's that
++	  # are installed into $libdir/../bin (currently, that works fine)
++	  # but it's something to keep an eye on.
++	  if test "$inst_prefix_dir" = "$destdir"; then
++	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
++	    exit $EXIT_FAILURE
++	  fi
++
++	  if test -n "$inst_prefix_dir"; then
++	    # Stick the inst_prefix_dir data into the link command.
++	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
++	  else
++	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
++	  fi
++
+ 	  $echo "$modename: warning: relinking \`$file'" 1>&2
+ 	  $show "$relink_command"
+ 	  if $run eval "$relink_command"; then :
+ 	  else
+ 	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+-	    continue
++	    exit $EXIT_FAILURE
+ 	  fi
+ 	fi
+ 
+@@ -4223,7 +5502,7 @@
+ 	    $run eval "$striplib $destdir/$realname" || exit $?
+ 	  fi
+ 
+-	  if test $# -gt 0; then
++	  if test "$#" -gt 0; then
+ 	    # Delete the old symlinks, and create new ones.
+ 	    for linkname
+ 	    do
+@@ -4236,10 +5515,11 @@
+ 
+ 	  # Do each command in the postinstall commands.
+ 	  lib="$destdir/$realname"
+-	  eval cmds=\"$postinstall_cmds\"
++	  cmds=$postinstall_cmds
+ 	  save_ifs="$IFS"; IFS='~'
+ 	  for cmd in $cmds; do
+ 	    IFS="$save_ifs"
++	    eval cmd=\"$cmd\"
+ 	    $show "$cmd"
+ 	    $run eval "$cmd" || exit $?
+ 	  done
+@@ -4279,7 +5559,7 @@
+ 	*)
+ 	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	  ;;
+ 	esac
+ 
+@@ -4297,7 +5577,7 @@
+ 	  $show "$install_prog $staticobj $staticdest"
+ 	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+ 	fi
+-	exit 0
++	exit $EXIT_SUCCESS
+ 	;;
+ 
+       *)
+@@ -4309,29 +5589,49 @@
+ 	  destfile="$destdir/$destfile"
+ 	fi
+ 
++	# If the file is missing, and there is a .exe on the end, strip it
++	# because it is most likely a libtool script we actually want to
++	# install
++	stripped_ext=""
++	case $file in
++	  *.exe)
++	    if test ! -f "$file"; then
++	      file=`$echo $file|${SED} 's,.exe$,,'`
++	      stripped_ext=".exe"
++	    fi
++	    ;;
++	esac
++
+ 	# Do a test to see if this is really a libtool program.
+ 	case $host in
+ 	*cygwin*|*mingw*)
+-	    wrapper=`echo $file | sed -e 's,.exe$,,'`
++	    wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
+ 	    ;;
+ 	*)
+ 	    wrapper=$file
+ 	    ;;
+ 	esac
+-	if (sed -e '4q' $wrapper | egrep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
++	if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
+ 	  notinst_deplibs=
+ 	  relink_command=
+ 
++	  # To insure that "foo" is sourced, and not "foo.exe",
++	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
++	  # which disallows the automatic-append-.exe behavior.
++	  case $build in
++	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
++	  *) wrapperdot=${wrapper} ;;
++	  esac
+ 	  # If there is no directory component, then add one.
+ 	  case $file in
+-	  */* | *\\*) . $wrapper ;;
+-	  *) . ./$wrapper ;;
++	  */* | *\\*) . ${wrapperdot} ;;
++	  *) . ./${wrapperdot} ;;
+ 	  esac
+ 
+ 	  # Check the variables that should have been set.
+ 	  if test -z "$notinst_deplibs"; then
+ 	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
+-	    exit 1
++	    exit $EXIT_FAILURE
+ 	  fi
+ 
+ 	  finalize=yes
+@@ -4353,10 +5653,17 @@
+ 	  done
+ 
+ 	  relink_command=
++	  # To insure that "foo" is sourced, and not "foo.exe",
++	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
++	  # which disallows the automatic-append-.exe behavior.
++	  case $build in
++	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
++	  *) wrapperdot=${wrapper} ;;
++	  esac
+ 	  # If there is no directory component, then add one.
+ 	  case $file in
+-	  */* | *\\*) . $wrapper ;;
+-	  *) . ./$wrapper ;;
++	  */* | *\\*) . ${wrapperdot} ;;
++	  *) . ./${wrapperdot} ;;
+ 	  esac
+ 
+ 	  outputname=
+@@ -4365,12 +5672,16 @@
+ 	      tmpdir="/tmp"
+ 	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
+ 	      tmpdir="$tmpdir/libtool-$$"
+-	      if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
++	      save_umask=`umask`
++	      umask 0077
++	      if $mkdir "$tmpdir"; then
++	        umask $save_umask
+ 	      else
++	        umask $save_umask
+ 		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
+ 		continue
+ 	      fi
+-	      file=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
++	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
+ 	      outputname="$tmpdir/$file"
+ 	      # Replace the output file specification.
+ 	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+@@ -4388,14 +5699,14 @@
+ 	    fi
+ 	  else
+ 	    # Install the binary that we compiled earlier.
+-	    file=`$echo "X$file" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
++	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+ 	  fi
+ 	fi
+ 
+ 	# remove .exe since cygwin /usr/bin/install will append another
+ 	# one anyways
+ 	case $install_prog,$host in
+-	/usr/bin/install*,*cygwin*)
++	*/usr/bin/install*,*cygwin*)
+ 	  case $file:$destfile in
+ 	  *.exe:*.exe)
+ 	    # this is ok
+@@ -4404,7 +5715,7 @@
+ 	    destfile=$destfile.exe
+ 	    ;;
+ 	  *:*.exe)
+-	    destfile=`echo $destfile | sed -e 's,.exe$,,'`
++	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
+ 	    ;;
+ 	  esac
+ 	  ;;
+@@ -4425,16 +5736,17 @@
+       $show "$install_prog $file $oldlib"
+       $run eval "$install_prog \$file \$oldlib" || exit $?
+ 
+-      if test -n "$stripme" && test -n "$striplib"; then
++      if test -n "$stripme" && test -n "$old_striplib"; then
+ 	$show "$old_striplib $oldlib"
+ 	$run eval "$old_striplib $oldlib" || exit $?
+       fi
+ 
+       # Do each command in the postinstall commands.
+-      eval cmds=\"$old_postinstall_cmds\"
++      cmds=$old_postinstall_cmds
+       save_ifs="$IFS"; IFS='~'
+       for cmd in $cmds; do
+ 	IFS="$save_ifs"
++	eval cmd=\"$cmd\"
+ 	$show "$cmd"
+ 	$run eval "$cmd" || exit $?
+       done
+@@ -4448,9 +5760,9 @@
+     if test -n "$current_libdirs"; then
+       # Maybe just do a dry run.
+       test -n "$run" && current_libdirs=" -n$current_libdirs"
+-      exec_cmd='$SHELL $0 --finish$current_libdirs'
++      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+     else
+-      exit 0
++      exit $EXIT_SUCCESS
+     fi
+     ;;
+ 
+@@ -4469,10 +5781,11 @@
+       for libdir in $libdirs; do
+ 	if test -n "$finish_cmds"; then
+ 	  # Do each command in the finish commands.
+-	  eval cmds=\"$finish_cmds\"
++	  cmds=$finish_cmds
+ 	  save_ifs="$IFS"; IFS='~'
+ 	  for cmd in $cmds; do
+ 	    IFS="$save_ifs"
++	    eval cmd=\"$cmd\"
+ 	    $show "$cmd"
+ 	    $run eval "$cmd" || admincmds="$admincmds
+        $cmd"
+@@ -4489,43 +5802,43 @@
+     fi
+ 
+     # Exit here if they wanted silent mode.
+-    test "$show" = ":" && exit 0
++    test "$show" = : && exit $EXIT_SUCCESS
+ 
+-    echo "----------------------------------------------------------------------"
+-    echo "Libraries have been installed in:"
++    $echo "----------------------------------------------------------------------"
++    $echo "Libraries have been installed in:"
+     for libdir in $libdirs; do
+-      echo "   $libdir"
++      $echo "   $libdir"
+     done
+-    echo
+-    echo "If you ever happen to want to link against installed libraries"
+-    echo "in a given directory, LIBDIR, you must either use libtool, and"
+-    echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+-    echo "flag during linking and do at least one of the following:"
++    $echo
++    $echo "If you ever happen to want to link against installed libraries"
++    $echo "in a given directory, LIBDIR, you must either use libtool, and"
++    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
++    $echo "flag during linking and do at least one of the following:"
+     if test -n "$shlibpath_var"; then
+-      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+-      echo "     during execution"
++      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
++      $echo "     during execution"
+     fi
+     if test -n "$runpath_var"; then
+-      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+-      echo "     during linking"
++      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
++      $echo "     during linking"
+     fi
+     if test -n "$hardcode_libdir_flag_spec"; then
+       libdir=LIBDIR
+       eval flag=\"$hardcode_libdir_flag_spec\"
+ 
+-      echo "   - use the \`$flag' linker flag"
++      $echo "   - use the \`$flag' linker flag"
+     fi
+     if test -n "$admincmds"; then
+-      echo "   - have your system administrator run these commands:$admincmds"
++      $echo "   - have your system administrator run these commands:$admincmds"
+     fi
+     if test -f /etc/ld.so.conf; then
+-      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
++      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+     fi
+-    echo
+-    echo "See any operating system documentation about shared libraries for"
+-    echo "more information, such as the ld(1) and ld.so(8) manual pages."
+-    echo "----------------------------------------------------------------------"
+-    exit 0
++    $echo
++    $echo "See any operating system documentation about shared libraries for"
++    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
++    $echo "----------------------------------------------------------------------"
++    exit $EXIT_SUCCESS
+     ;;
+ 
+   # libtool execute mode
+@@ -4537,7 +5850,7 @@
+     if test -z "$cmd"; then
+       $echo "$modename: you must specify a COMMAND" 1>&2
+       $echo "$help"
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     # Handle -dlopen flags immediately.
+@@ -4545,18 +5858,18 @@
+       if test ! -f "$file"; then
+ 	$echo "$modename: \`$file' is not a file" 1>&2
+ 	$echo "$help" 1>&2
+-	exit 1
++	exit $EXIT_FAILURE
+       fi
+ 
+       dir=
+       case $file in
+       *.la)
+ 	# Check to see that this really is a libtool archive.
+-	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
++	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ 	else
+ 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ 	  $echo "$help" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 
+ 	# Read the libtool library.
+@@ -4583,7 +5896,7 @@
+ 	  dir="$dir/$objdir"
+ 	else
+ 	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+-	  exit 1
++	  exit $EXIT_FAILURE
+ 	fi
+ 	;;
+ 
+@@ -4623,7 +5936,7 @@
+       -*) ;;
+       *)
+ 	# Do a test to see if this is really a libtool program.
+-	if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++	if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ 	  # If there is no directory component, then add one.
+ 	  case $file in
+ 	  */* | *\\*) . $file ;;
+@@ -4646,7 +5959,7 @@
+ 	eval "export $shlibpath_var"
+       fi
+ 
+-      # Restore saved enviroment variables
++      # Restore saved environment variables
+       if test "${save_LC_ALL+set}" = set; then
+ 	LC_ALL="$save_LC_ALL"; export LC_ALL
+       fi
+@@ -4663,7 +5976,7 @@
+ 	$echo "export $shlibpath_var"
+       fi
+       $echo "$cmd$args"
+-      exit 0
++      exit $EXIT_SUCCESS
+     fi
+     ;;
+ 
+@@ -4691,24 +6004,25 @@
+     if test -z "$rm"; then
+       $echo "$modename: you must specify an RM program" 1>&2
+       $echo "$help" 1>&2
+-      exit 1
++      exit $EXIT_FAILURE
+     fi
+ 
+     rmdirs=
+ 
++    origobjdir="$objdir"
+     for file in $files; do
+       dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+       if test "X$dir" = "X$file"; then
+ 	dir=.
+-	objdir="$objdir"
++	objdir="$origobjdir"
+       else
+-	objdir="$dir/$objdir"
++	objdir="$dir/$origobjdir"
+       fi
+       name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+-      test $mode = uninstall && objdir="$dir"
++      test "$mode" = uninstall && objdir="$dir"
+ 
+       # Remember objdir for removal later, being careful to avoid duplicates
+-      if test $mode = clean; then
++      if test "$mode" = clean; then
+ 	case " $rmdirs " in
+ 	  *" $objdir "*) ;;
+ 	  *) rmdirs="$rmdirs $objdir" ;;
+@@ -4732,7 +6046,7 @@
+       case $name in
+       *.la)
+ 	# Possibly a libtool archive, so verify it.
+-	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ 	  . $dir/$name
+ 
+ 	  # Delete the libtool libraries and symlinks.
+@@ -4740,18 +6054,19 @@
+ 	    rmfiles="$rmfiles $objdir/$n"
+ 	  done
+ 	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+-	  test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
++	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+ 
+-	  if test $mode = uninstall; then
++	  if test "$mode" = uninstall; then
+ 	    if test -n "$library_names"; then
+ 	      # Do each command in the postuninstall commands.
+-	      eval cmds=\"$postuninstall_cmds\"
++	      cmds=$postuninstall_cmds
+ 	      save_ifs="$IFS"; IFS='~'
+ 	      for cmd in $cmds; do
+ 		IFS="$save_ifs"
++		eval cmd=\"$cmd\"
+ 		$show "$cmd"
+ 		$run eval "$cmd"
+-		if test $? != 0 && test "$rmforce" != yes; then
++		if test "$?" -ne 0 && test "$rmforce" != yes; then
+ 		  exit_status=1
+ 		fi
+ 	      done
+@@ -4760,13 +6075,14 @@
+ 
+ 	    if test -n "$old_library"; then
+ 	      # Do each command in the old_postuninstall commands.
+-	      eval cmds=\"$old_postuninstall_cmds\"
++	      cmds=$old_postuninstall_cmds
+ 	      save_ifs="$IFS"; IFS='~'
+ 	      for cmd in $cmds; do
+ 		IFS="$save_ifs"
++		eval cmd=\"$cmd\"
+ 		$show "$cmd"
+ 		$run eval "$cmd"
+-		if test $? != 0 && test "$rmforce" != yes; then
++		if test "$?" -ne 0 && test "$rmforce" != yes; then
+ 		  exit_status=1
+ 		fi
+ 	      done
+@@ -4778,22 +6094,52 @@
+ 	;;
+ 
+       *.lo)
+-	if test "$build_old_libs" = yes; then
+-	  oldobj=`$echo "X$name" | $Xsed -e "$lo2o"`
+-	  rmfiles="$rmfiles $dir/$oldobj"
++	# Possibly a libtool object, so verify it.
++	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++
++	  # Read the .lo file
++	  . $dir/$name
++
++	  # Add PIC object to the list of files to remove.
++	  if test -n "$pic_object" \
++	     && test "$pic_object" != none; then
++	    rmfiles="$rmfiles $dir/$pic_object"
++	  fi
++
++	  # Add non-PIC object to the list of files to remove.
++	  if test -n "$non_pic_object" \
++	     && test "$non_pic_object" != none; then
++	    rmfiles="$rmfiles $dir/$non_pic_object"
++	  fi
+ 	fi
+ 	;;
+ 
+       *)
+-	# Do a test to see if this is a libtool program.
+-	if test $mode = clean &&
+-	   (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+-	  relink_command=
+-	  . $dir/$file
++	if test "$mode" = clean ; then
++	  noexename=$name
++	  case $file in
++	  *.exe)
++	    file=`$echo $file|${SED} 's,.exe$,,'`
++	    noexename=`$echo $name|${SED} 's,.exe$,,'`
++	    # $file with .exe has already been added to rmfiles,
++	    # add $file without .exe
++	    rmfiles="$rmfiles $file"
++	    ;;
++	  esac
++	  # Do a test to see if this is a libtool program.
++	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++	    relink_command=
++	    . $dir/$noexename
+ 
+-	  rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+-	  if test "$fast_install" = yes && test -n "$relink_command"; then
+-	    rmfiles="$rmfiles $objdir/lt-$name"
++	    # note $name still contains .exe if it was in $file originally
++	    # as does the version of $file that was added into $rmfiles
++	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
++	    if test "$fast_install" = yes && test -n "$relink_command"; then
++	      rmfiles="$rmfiles $objdir/lt-$name"
++	    fi
++	    if test "X$noexename" != "X$name" ; then
++	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
++	    fi
+ 	  fi
+ 	fi
+ 	;;
+@@ -4801,6 +6147,7 @@
+       $show "$rm $rmfiles"
+       $run $rm $rmfiles || exit_status=1
+     done
++    objdir="$origobjdir"
+ 
+     # Try to remove the ${objdir}s in the directories where we deleted files
+     for dir in $rmdirs; do
+@@ -4816,20 +6163,20 @@
+   "")
+     $echo "$modename: you must specify a MODE" 1>&2
+     $echo "$generic_help" 1>&2
+-    exit 1
++    exit $EXIT_FAILURE
+     ;;
+   esac
+ 
+   if test -z "$exec_cmd"; then
+     $echo "$modename: invalid operation mode \`$mode'" 1>&2
+     $echo "$generic_help" 1>&2
+-    exit 1
++    exit $EXIT_FAILURE
+   fi
+ fi # test -z "$show_help"
+ 
+ if test -n "$exec_cmd"; then
+   eval exec $exec_cmd
+-  exit 1
++  exit $EXIT_FAILURE
+ fi
+ 
+ # We need to display help for each of the modes.
+@@ -4848,6 +6195,7 @@
+     --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
+     --quiet           same as \`--silent'
+     --silent          don't print informational messages
++    --tag=TAG         use configuration variables from tag TAG
+     --version         print version information
+ 
+ MODE must be one of the following:
+@@ -4861,8 +6209,10 @@
+       uninstall       remove libraries from an installed directory
+ 
+ MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
+-a more detailed description of MODE."
+-  exit 0
++a more detailed description of MODE.
++
++Report bugs to <bug-libtool@gnu.org>."
++  exit $EXIT_SUCCESS
+   ;;
+ 
+ clean)
+@@ -4973,6 +6323,9 @@
+   -no-install       link a not-installable executable
+   -no-undefined     declare that a library does not refer to external symbols
+   -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
++  -objectlist FILE  Use a list of object files found in FILE to specify objects
++  -precious-files-regex REGEX
++                    don't remove output files matching REGEX
+   -release RELEASE  specify package release information
+   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
+   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+@@ -5014,14 +6367,34 @@
+ *)
+   $echo "$modename: invalid operation mode \`$mode'" 1>&2
+   $echo "$help" 1>&2
+-  exit 1
++  exit $EXIT_FAILURE
+   ;;
+ esac
+ 
+-echo
++$echo
+ $echo "Try \`$modename --help' for more information about other modes."
+ 
+-exit 0
++exit $EXIT_SUCCESS
++
++# The TAGs below are defined such that we never get into a situation
++# in which we disable both kinds of libraries.  Given conflicting
++# choices, we go for a static library, that is the most portable,
++# since we can't tell whether shared libraries were disabled because
++# the user asked for that or because the platform doesn't support
++# them.  This is particularly important on AIX, because we don't
++# support having both static and shared libraries enabled at the same
++# time on that platform, so we default to a shared-only configuration.
++# If a disable-shared tag is given, we'll fallback to a static-only
++# configuration.  But we'll never go from static-only to shared-only.
++
++# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
++build_libtool_libs=no
++build_old_libs=yes
++# ### END LIBTOOL TAG CONFIG: disable-shared
++
++# ### BEGIN LIBTOOL TAG CONFIG: disable-static
++build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
++# ### END LIBTOOL TAG CONFIG: disable-static
+ 
+ # Local Variables:
+ # mode:shell-script
+diff -uNr a52dec-0.7.4-orig/autotools/missing a52dec-0.7.4/autotools/missing
+--- a52dec-0.7.4-orig/autotools/missing	2002-07-28 13:50:41.000000000 +1000
++++ a52dec-0.7.4/autotools/missing	2005-02-06 16:25:42.496408104 +1100
+@@ -1,7 +1,11 @@
+ #! /bin/sh
+ # Common stub for a few missing GNU programs while installing.
+-# Copyright (C) 1996, 1997, 2001 Free Software Foundation, Inc.
+-# Franc,ois Pinard <pinard@iro.umontreal.ca>, 1996.
++
++scriptversion=2004-09-07.08
++
++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
++#   Free Software Foundation, Inc.
++# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+ 
+ # 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
+@@ -18,20 +22,44 @@
+ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ # 02111-1307, USA.
+ 
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
+ if test $# -eq 0; then
+   echo 1>&2 "Try \`$0 --help' for more information"
+   exit 1
+ fi
+ 
++run=:
++
+ # In the cases where this matters, `missing' is being run in the
+ # srcdir already.
+-if test -f configure.in; then
++if test -f configure.ac; then
+   configure_ac=configure.ac
+ else
+   configure_ac=configure.in
+ fi
+ 
++msg="missing on your system"
++
+ case "$1" in
++--run)
++  # Try to run requested program, and just exit if it succeeds.
++  run=
++  shift
++  "$@" && exit 0
++  # Exit code 63 means version mismatch.  This often happens
++  # when the user try to use an ancient version of a tool on
++  # a file that requires a minimum version.  In this case we
++  # we should proceed has if the program had been absent, or
++  # if --run hadn't been passed.
++  if test $? = 63; then
++    run=:
++    msg="probably too old"
++  fi
++  ;;
+ 
+   -h|--h|--he|--hel|--help)
+     echo "\
+@@ -43,6 +71,7 @@
+ Options:
+   -h, --help      display this help and exit
+   -v, --version   output version information and exit
++  --run           try to run the given command, and emulate it if it fails
+ 
+ Supported PROGRAM values:
+   aclocal      touch file \`aclocal.m4'
+@@ -51,13 +80,19 @@
+   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
++  help2man     touch the output file
+   lex          create \`lex.yy.c', if possible, from existing .c
+   makeinfo     touch the output file
+-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
++  tar          try tar, gnutar, gtar, then tar without non-portable flags
++  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
++
++Send bug reports to <bug-automake@gnu.org>."
++    exit 0
+     ;;
+ 
+   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+-    echo "missing - GNU libit 0.0"
++    echo "missing $scriptversion (GNU Automake)"
++    exit 0
+     ;;
+ 
+   -*)
+@@ -66,10 +101,45 @@
+     exit 1
+     ;;
+ 
+-  aclocal)
++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
++  lex|yacc)
++    # Not GNU programs, they don't have --version.
++    ;;
++
++  tar)
++    if test -n "$run"; then
++       echo 1>&2 "ERROR: \`tar' requires --run"
++       exit 1
++    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
++       exit 1
++    fi
++    ;;
++
++  *)
++    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
++       # We have it, but it failed.
++       exit 1
++    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
++       # Could not run --version or --help.  This is probably someone
++       # running `$TOOL --version' or `$TOOL --help' to check whether
++       # $TOOL exists and not knowing $TOOL uses missing.
++       exit 1
++    fi
++    ;;
++esac
++
++# If it does not exist, or fails to run (possibly an outdated version),
++# try to emulate it.
++case "$1" in
++  aclocal*)
+     echo 1>&2 "\
+-WARNING: \`$1' is missing on your system.  You should only need it if
+-         you modified \`acinclude.m4' or \`$configure_ac'.  You might want
++WARNING: \`$1' is $msg.  You should only need it if
++         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
+          to install the \`Automake' and \`Perl' packages.  Grab them from
+          any GNU archive site."
+     touch aclocal.m4
+@@ -77,8 +147,8 @@
+ 
+   autoconf)
+     echo 1>&2 "\
+-WARNING: \`$1' is missing on your system.  You should only need it if
+-         you modified \`$configure_ac'.  You might want to install the
++WARNING: \`$1' is $msg.  You should only need it if
++         you modified \`${configure_ac}'.  You might want to install the
+          \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
+          archive site."
+     touch configure
+@@ -86,11 +156,11 @@
+ 
+   autoheader)
+     echo 1>&2 "\
+-WARNING: \`$1' is missing on your system.  You should only need it if
+-         you modified \`acconfig.h' or \`$configure_ac'.  You might want
++WARNING: \`$1' is $msg.  You should only need it if
++         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
+          to install the \`Autoconf' and \`GNU m4' packages.  Grab them
+          from any GNU archive site."
+-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' $configure_ac`
++    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+     test -z "$files" && files="config.h"
+     touch_files=
+     for f in $files; do
+@@ -103,10 +173,10 @@
+     touch $touch_files
+     ;;
+ 
+-  automake)
++  automake*)
+     echo 1>&2 "\
+-WARNING: \`$1' is missing on your system.  You should only need it if
+-         you modified \`Makefile.am', \`acinclude.m4' or \`$configure_ac'.
++WARNING: \`$1' is $msg.  You should only need it if
++         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+          You might want to install the \`Automake' and \`Perl' packages.
+          Grab them from any GNU archive site."
+     find . -type f -name Makefile.am -print |
+@@ -114,9 +184,32 @@
+ 	   while read f; do touch "$f"; done
+     ;;
+ 
++  autom4te)
++    echo 1>&2 "\
++WARNING: \`$1' is needed, but is $msg.
++         You might have modified some files without having the
++         proper tools for further handling them.
++         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'`
++    if test -f "$file"; then
++	touch $file
++    else
++	test -z "$file" || exec >$file
++	echo "#! /bin/sh"
++	echo "# Created by GNU Automake missing as a replacement of"
++	echo "#  $ $@"
++	echo "exit 0"
++	chmod +x $file
++	exit 1
++    fi
++    ;;
++
+   bison|yacc)
+     echo 1>&2 "\
+-WARNING: \`$1' is missing on your system.  You should only need it if
++WARNING: \`$1' $msg.  You should only need it if
+          you modified a \`.y' file.  You may need the \`Bison' package
+          in order for those modifications to take effect.  You can get
+          \`Bison' from any GNU archive site."
+@@ -146,7 +239,7 @@
+ 
+   lex|flex)
+     echo 1>&2 "\
+-WARNING: \`$1' is missing on your system.  You should only need it if
++WARNING: \`$1' is $msg.  You should only need it if
+          you modified a \`.l' file.  You may need the \`Flex' package
+          in order for those modifications to take effect.  You can get
+          \`Flex' from any GNU archive site."
+@@ -167,9 +260,29 @@
+     fi
+     ;;
+ 
++  help2man)
++    echo 1>&2 "\
++WARNING: \`$1' is $msg.  You should only need it if
++	 you modified a dependency of a manual page.  You may need the
++	 \`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
++	touch $file
++    else
++	test -z "$file" || exec >$file
++	echo ".ab help2man is required to generate this page"
++	exit 1
++    fi
++    ;;
++
+   makeinfo)
+     echo 1>&2 "\
+-WARNING: \`$1' is missing on your system.  You should only need it if
++WARNING: \`$1' is $msg.  You should only need it if
+          you modified a \`.texi' or \`.texinfo' file, or any other file
+          indirectly affecting the aspect of the manual.  The spurious
+          call might also be the consequence of using a buggy \`make' (AIX,
+@@ -183,12 +296,47 @@
+     touch $file
+     ;;
+ 
++  tar)
++    shift
++
++    # We have already tried tar in the generic part.
++    # Look for gnutar/gtar before invocation to avoid ugly error
++    # messages.
++    if (gnutar --version > /dev/null 2>&1); then
++       gnutar "$@" && exit 0
++    fi
++    if (gtar --version > /dev/null 2>&1); then
++       gtar "$@" && exit 0
++    fi
++    firstarg="$1"
++    if shift; then
++	case "$firstarg" in
++	*o*)
++	    firstarg=`echo "$firstarg" | sed s/o//`
++	    tar "$firstarg" "$@" && exit 0
++	    ;;
++	esac
++	case "$firstarg" in
++	*h*)
++	    firstarg=`echo "$firstarg" | sed s/h//`
++	    tar "$firstarg" "$@" && exit 0
++	    ;;
++	esac
++    fi
++
++    echo 1>&2 "\
++WARNING: I can't seem to be able to run \`tar' with the given arguments.
++         You may want to install GNU tar or Free paxutils, or check the
++         command line arguments."
++    exit 1
++    ;;
++
+   *)
+     echo 1>&2 "\
+-WARNING: \`$1' is needed, and you do not seem to have it handy on your
+-         system.  You might have modified some files without having the
++WARNING: \`$1' is needed, and is $msg.
++         You might have modified some files without having the
+          proper tools for further handling them.  Check the \`README' file,
+-         it often tells you about the needed prerequirements for installing
++         it often tells you about the needed prerequisites for installing
+          this package.  You may also peek at any GNU archive site, in case
+          some other package would contain this missing \`$1' program."
+     exit 1
+@@ -196,3 +344,10 @@
+ esac
+ 
+ exit 0
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
+diff -uNr a52dec-0.7.4-orig/autotools/mkinstalldirs a52dec-0.7.4/autotools/mkinstalldirs
+--- a52dec-0.7.4-orig/autotools/mkinstalldirs	2002-07-28 13:50:41.000000000 +1000
++++ a52dec-0.7.4/autotools/mkinstalldirs	2005-02-06 16:25:43.330281336 +1100
+@@ -1,40 +1,150 @@
+ #! /bin/sh
+ # mkinstalldirs --- make directory hierarchy
+-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
+-# Created: 1993-05-16
+-# Public domain
+ 
+-# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $
++scriptversion=2004-02-15.20
++
++# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
++# Created: 1993-05-16
++# Public domain.
++#
++# This file is maintained in Automake, please report
++# bugs to <bug-automake@gnu.org> or send patches to
++# <automake-patches@gnu.org>.
+ 
+ errstatus=0
++dirmode=""
++
++usage="\
++Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
++
++Create each directory DIR (with mode MODE, if specified), including all
++leading file name components.
++
++Report bugs to <bug-automake@gnu.org>."
++
++# process command line arguments
++while test $# -gt 0 ; do
++  case $1 in
++    -h | --help | --h*)         # -h for help
++      echo "$usage"
++      exit 0
++      ;;
++    -m)                         # -m PERM arg
++      shift
++      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
++      dirmode=$1
++      shift
++      ;;
++    --version)
++      echo "$0 $scriptversion"
++      exit 0
++      ;;
++    --)                         # stop option processing
++      shift
++      break
++      ;;
++    -*)                         # unknown option
++      echo "$usage" 1>&2
++      exit 1
++      ;;
++    *)                          # first non-opt arg
++      break
++      ;;
++  esac
++done
++
++for file
++do
++  if test -d "$file"; then
++    shift
++  else
++    break
++  fi
++done
++
++case $# in
++  0) exit 0 ;;
++esac
++
++# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
++# mkdir -p a/c at the same time, both will detect that a is missing,
++# one will create a, then the other will try to create a and die with
++# a "File exists" error.  This is a problem when calling mkinstalldirs
++# from a parallel make.  We use --version in the probe to restrict
++# ourselves to GNU mkdir, which is thread-safe.
++case $dirmode in
++  '')
++    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
++      echo "mkdir -p -- $*"
++      exec 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.
++      test -d ./-p && rmdir ./-p
++      test -d ./--version && rmdir ./--version
++    fi
++    ;;
++  *)
++    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
++       test ! -d ./--version; then
++      echo "mkdir -m $dirmode -p -- $*"
++      exec mkdir -m "$dirmode" -p -- "$@"
++    else
++      # Clean up after NextStep and OpenStep mkdir.
++      for d in ./-m ./-p ./--version "./$dirmode";
++      do
++        test -d $d && rmdir $d
++      done
++    fi
++    ;;
++esac
+ 
+ for file
+ do
+-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+-   shift
++  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
++  shift
+ 
+-   pathcomp=
+-   for d
+-   do
+-     pathcomp="$pathcomp$d"
+-     case "$pathcomp" in
+-       -* ) pathcomp=./$pathcomp ;;
+-     esac
+-
+-     if test ! -d "$pathcomp"; then
+-        echo "mkdir $pathcomp"
+-
+-        mkdir "$pathcomp" || lasterr=$?
+-
+-        if test ! -d "$pathcomp"; then
+-  	  errstatus=$lasterr
+-        fi
+-     fi
++  pathcomp=
++  for d
++  do
++    pathcomp="$pathcomp$d"
++    case $pathcomp in
++      -*) pathcomp=./$pathcomp ;;
++    esac
++
++    if test ! -d "$pathcomp"; then
++      echo "mkdir $pathcomp"
++
++      mkdir "$pathcomp" || lasterr=$?
++
++      if test ! -d "$pathcomp"; then
++	errstatus=$lasterr
++      else
++	if test ! -z "$dirmode"; then
++	  echo "chmod $dirmode $pathcomp"
++	  lasterr=""
++	  chmod "$dirmode" "$pathcomp" || lasterr=$?
++
++	  if test ! -z "$lasterr"; then
++	    errstatus=$lasterr
++	  fi
++	fi
++      fi
++    fi
+ 
+-     pathcomp="$pathcomp/"
+-   done
++    pathcomp="$pathcomp/"
++  done
+ done
+ 
+ exit $errstatus
+ 
+-# mkinstalldirs ends here
++# Local Variables:
++# mode: shell-script
++# sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
+diff -uNr a52dec-0.7.4-orig/configure a52dec-0.7.4/configure
+--- a52dec-0.7.4-orig/configure	2002-07-28 13:50:42.000000000 +1000
++++ a52dec-0.7.4/configure	2005-02-06 16:25:51.638018368 +1100
+@@ -1,178 +1,10 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.53.
++# Generated by GNU Autoconf 2.59.
+ #
+-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+-# Free Software Foundation, Inc.
++# Copyright (C) 2003 Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+-
+-# Find the correct PATH separator.  Usually this is `:', but
+-# DJGPP uses `;' like DOS.
+-if test "X${PATH_SEPARATOR+set}" != Xset; then
+-  UNAME=${UNAME-`uname 2>/dev/null`}
+-  case X$UNAME in
+-    *-DOS) lt_cv_sys_path_separator=';' ;;
+-    *)     lt_cv_sys_path_separator=':' ;;
+-  esac
+-  PATH_SEPARATOR=$lt_cv_sys_path_separator
+-fi
+-
+-
+-# Check that we are running under the correct shell.
+-SHELL=${CONFIG_SHELL-/bin/sh}
+-
+-case X$ECHO in
+-X*--fallback-echo)
+-  # Remove one level of quotation (which was required for Make).
+-  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
+-  ;;
+-esac
+-
+-echo=${ECHO-echo}
+-if test "X$1" = X--no-reexec; then
+-  # Discard the --no-reexec flag, and continue.
+-  shift
+-elif test "X$1" = X--fallback-echo; then
+-  # Avoid inline document here, it may be left over
+-  :
+-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
+-  # Yippee, $echo works!
+-  :
+-else
+-  # Restart under the correct shell.
+-  exec $SHELL "$0" --no-reexec ${1+"$@"}
+-fi
+-
+-if test "X$1" = X--fallback-echo; then
+-  # used as fallback echo
+-  shift
+-  cat <<EOF
+-
+-EOF
+-  exit 0
+-fi
+-
+-# The HP-UX ksh and POSIX shell print the target directory to stdout
+-# if CDPATH is set.
+-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+-
+-if test -z "$ECHO"; then
+-if test "X${echo_test_string+set}" != Xset; then
+-# find a string as large as possible, as long as the shell can cope with it
+-  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
+-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+-       echo_test_string="`eval $cmd`" &&
+-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+-    then
+-      break
+-    fi
+-  done
+-fi
+-
+-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+-   test "X$echo_testing_string" = "X$echo_test_string"; then
+-  :
+-else
+-  # The Solaris, AIX, and Digital Unix default echo programs unquote
+-  # backslashes.  This makes it impossible to quote backslashes using
+-  #   echo "$something" | sed 's/\\/\\\\/g'
+-  #
+-  # So, first we look for a working echo in the user's PATH.
+-
+-  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  for dir in $PATH /usr/ucb; do
+-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+-       test "X$echo_testing_string" = "X$echo_test_string"; then
+-      echo="$dir/echo"
+-      break
+-    fi
+-  done
+-  IFS="$save_ifs"
+-
+-  if test "X$echo" = Xecho; then
+-    # We didn't find a better echo, so look for alternatives.
+-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
+-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
+-       test "X$echo_testing_string" = "X$echo_test_string"; then
+-      # This shell has a builtin print -r that does the trick.
+-      echo='print -r'
+-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
+-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
+-      # If we have ksh, try running configure again with it.
+-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+-      export ORIGINAL_CONFIG_SHELL
+-      CONFIG_SHELL=/bin/ksh
+-      export CONFIG_SHELL
+-      exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
+-    else
+-      # Try using printf.
+-      echo='printf %s\n'
+-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
+-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
+-	 test "X$echo_testing_string" = "X$echo_test_string"; then
+-	# Cool, printf works
+-	:
+-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+-	   test "X$echo_testing_string" = 'X\t' &&
+-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+-	   test "X$echo_testing_string" = "X$echo_test_string"; then
+-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
+-	export CONFIG_SHELL
+-	SHELL="$CONFIG_SHELL"
+-	export SHELL
+-	echo="$CONFIG_SHELL $0 --fallback-echo"
+-      elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
+-	   test "X$echo_testing_string" = 'X\t' &&
+-	   echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
+-	   test "X$echo_testing_string" = "X$echo_test_string"; then
+-	echo="$CONFIG_SHELL $0 --fallback-echo"
+-      else
+-	# maybe with a smaller string...
+-	prev=:
+-
+-	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
+-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
+-	  then
+-	    break
+-	  fi
+-	  prev="$cmd"
+-	done
+-
+-	if test "$prev" != 'sed 50q "$0"'; then
+-	  echo_test_string=`eval $prev`
+-	  export echo_test_string
+-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
+-	else
+-	  # Oops.  We lost completely, so just stick with echo.
+-	  echo=echo
+-	fi
+-      fi
+-    fi
+-  fi
+-fi
+-fi
+-
+-# Copy echo and quote the copy suitably for passing to libtool from
+-# the Makefile, instead of quoting the original, which is used later.
+-ECHO=$echo
+-if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
+-   ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
+-fi
+-
+-
+-
+-if expr a : '\(a\)' >/dev/null 2>&1; then
+-  as_expr=expr
+-else
+-  as_expr=false
+-fi
+-
+-
+ ## --------------------- ##
+ ## M4sh Initialization.  ##
+ ## --------------------- ##
+@@ -181,46 +13,57 @@
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
+ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+   set -o posix
+ fi
++DUALCASE=1; export DUALCASE # for MKS sh
+ 
+-# NLS nuisances.
+ # Support unset when possible.
+-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+   as_unset=unset
+ else
+   as_unset=false
+ fi
+ 
+-(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
+-    { $as_unset LANG || test "${LANG+set}" != set; } ||
+-      { LANG=C; export LANG; }
+-(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
+-    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
+-      { LC_ALL=C; export LC_ALL; }
+-(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
+-    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
+-      { LC_TIME=C; export LC_TIME; }
+-(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
+-    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
+-      { LC_CTYPE=C; export LC_CTYPE; }
+-(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
+-    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
+-      { LANGUAGE=C; export LANGUAGE; }
+-(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
+-    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
+-      { LC_COLLATE=C; export LC_COLLATE; }
+-(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
+-    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
+-      { LC_NUMERIC=C; export LC_NUMERIC; }
+-(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
+-    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
+-      { LC_MESSAGES=C; export LC_MESSAGES; }
++
++# Work around bugs in pre-3.0 UWIN ksh.
++$as_unset ENV MAIL MAILPATH
++PS1='$ '
++PS2='> '
++PS4='+ '
++
++# NLS nuisances.
++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
++  fi
++done
++
++# Required to use basename.
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
++
++if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++  as_basename=basename
++else
++  as_basename=false
++fi
+ 
+ 
+ # Name of the executable.
+-as_me=`(basename "$0") 2>/dev/null ||
++as_me=`$as_basename "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+ 	 X"$0" : 'X\(/\)$' \| \
+@@ -231,6 +74,7 @@
+   	  /^X\/\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+ 
++
+ # PATH needs CR, and LINENO needs CR and PATH.
+ # Avoid depending upon Character Ranges.
+ as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+@@ -241,15 +85,15 @@
+ 
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
+-  echo "#! /bin/sh" >conftest.sh
+-  echo  "exit 0"   >>conftest.sh
+-  chmod +x conftest.sh
+-  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
++  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 conftest.sh
++  rm -f conf$$.sh
+ fi
+ 
+ 
+@@ -297,6 +141,8 @@
+   as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
+   test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
++	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
++	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+ 	     CONFIG_SHELL=$as_dir/$as_base
+ 	     export CONFIG_SHELL
+ 	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+@@ -369,13 +215,20 @@
+ fi
+ rm -f conf$$ conf$$.exe conf$$.file
+ 
++if mkdir -p . 2>/dev/null; then
++  as_mkdir_p=:
++else
++  test -d ./-p && rmdir ./-p
++  as_mkdir_p=false
++fi
++
+ as_executable_p="test -f"
+ 
+ # Sed expression to map a string onto a valid CPP name.
+-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+ 
+ # Sed expression to map a string onto a valid variable name.
+-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+ 
+ 
+ # IFS
+@@ -385,76 +238,233 @@
+ IFS=" 	$as_nl"
+ 
+ # CDPATH.
+-$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
+-
++$as_unset CDPATH
+ 
+-# Name of the host.
+-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+-# so uname gets run too.
+-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+ 
+-exec 6>&1
+ 
+-#
+-# Initializations.
+-#
+-ac_default_prefix=/usr/local
+-cross_compiling=no
+-subdirs=
+-MFLAGS=
+-MAKEFLAGS=
++# Check that we are running under the correct shell.
+ SHELL=${CONFIG_SHELL-/bin/sh}
+ 
+-# Maximum number of lines to put in a shell here document.
+-# This variable seems obsolete.  It should probably be removed, and
+-# only ac_max_sed_lines should be used.
+-: ${ac_max_here_lines=38}
++case X$ECHO in
++X*--fallback-echo)
++  # Remove one level of quotation (which was required for Make).
++  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
++  ;;
++esac
+ 
+-# Identity of this package.
+-PACKAGE_NAME=
+-PACKAGE_TARNAME=
+-PACKAGE_VERSION=
+-PACKAGE_STRING=
+-PACKAGE_BUGREPORT=
++echo=${ECHO-echo}
++if test "X$1" = X--no-reexec; then
++  # Discard the --no-reexec flag, and continue.
++  shift
++elif test "X$1" = X--fallback-echo; then
++  # Avoid inline document here, it may be left over
++  :
++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
++  # Yippee, $echo works!
++  :
++else
++  # Restart under the correct shell.
++  exec $SHELL "$0" --no-reexec ${1+"$@"}
++fi
+ 
+-ac_unique_file="src/a52dec.c"
+-# Factoring default headers for most tests.
+-ac_includes_default="\
+-#include <stdio.h>
+-#if HAVE_SYS_TYPES_H
+-# include <sys/types.h>
+-#endif
+-#if HAVE_SYS_STAT_H
+-# include <sys/stat.h>
+-#endif
+-#if STDC_HEADERS
+-# include <stdlib.h>
+-# include <stddef.h>
+-#else
+-# if HAVE_STDLIB_H
+-#  include <stdlib.h>
+-# endif
+-#endif
+-#if HAVE_STRING_H
+-# if !STDC_HEADERS && HAVE_MEMORY_H
+-#  include <memory.h>
+-# endif
+-# include <string.h>
+-#endif
+-#if HAVE_STRINGS_H
+-# include <strings.h>
+-#endif
+-#if HAVE_INTTYPES_H
+-# include <inttypes.h>
+-#else
+-# if HAVE_STDINT_H
+-#  include <stdint.h>
+-# endif
+-#endif
+-#if HAVE_UNISTD_H
++if test "X$1" = X--fallback-echo; then
++  # used as fallback echo
++  shift
++  cat <<EOF
++$*
++EOF
++  exit 0
++fi
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++
++if test -z "$ECHO"; then
++if test "X${echo_test_string+set}" != Xset; then
++# find a string as large as possible, as long as the shell can cope with it
++  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
++    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
++    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
++       echo_test_string="`eval $cmd`" &&
++       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
++    then
++      break
++    fi
++  done
++fi
++
++if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++   test "X$echo_testing_string" = "X$echo_test_string"; then
++  :
++else
++  # The Solaris, AIX, and Digital Unix default echo programs unquote
++  # backslashes.  This makes it impossible to quote backslashes using
++  #   echo "$something" | sed 's/\\/\\\\/g'
++  #
++  # So, first we look for a working echo in the user's PATH.
++
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for dir in $PATH /usr/ucb; do
++    IFS="$lt_save_ifs"
++    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
++       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
++       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
++       test "X$echo_testing_string" = "X$echo_test_string"; then
++      echo="$dir/echo"
++      break
++    fi
++  done
++  IFS="$lt_save_ifs"
++
++  if test "X$echo" = Xecho; then
++    # We didn't find a better echo, so look for alternatives.
++    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
++       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
++       test "X$echo_testing_string" = "X$echo_test_string"; then
++      # This shell has a builtin print -r that does the trick.
++      echo='print -r'
++    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
++	 test "X$CONFIG_SHELL" != X/bin/ksh; then
++      # If we have ksh, try running configure again with it.
++      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
++      export ORIGINAL_CONFIG_SHELL
++      CONFIG_SHELL=/bin/ksh
++      export CONFIG_SHELL
++      exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
++    else
++      # Try using printf.
++      echo='printf %s\n'
++      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
++	 test "X$echo_testing_string" = "X$echo_test_string"; then
++	# Cool, printf works
++	:
++      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
++	   test "X$echo_testing_string" = 'X\t' &&
++	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
++	export CONFIG_SHELL
++	SHELL="$CONFIG_SHELL"
++	export SHELL
++	echo="$CONFIG_SHELL $0 --fallback-echo"
++      elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
++	   test "X$echo_testing_string" = 'X\t' &&
++	   echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
++	   test "X$echo_testing_string" = "X$echo_test_string"; then
++	echo="$CONFIG_SHELL $0 --fallback-echo"
++      else
++	# maybe with a smaller string...
++	prev=:
++
++	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
++	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
++	  then
++	    break
++	  fi
++	  prev="$cmd"
++	done
++
++	if test "$prev" != 'sed 50q "$0"'; then
++	  echo_test_string=`eval $prev`
++	  export echo_test_string
++	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
++	else
++	  # Oops.  We lost completely, so just stick with echo.
++	  echo=echo
++	fi
++      fi
++    fi
++  fi
++fi
++fi
++
++# Copy echo and quote the copy suitably for passing to libtool from
++# the Makefile, instead of quoting the original, which is used later.
++ECHO=$echo
++if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
++   ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
++fi
++
++
++
++
++tagnames=${tagnames+${tagnames},}CXX
++
++tagnames=${tagnames+${tagnames},}F77
++
++# Name of the host.
++# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
++# so uname gets run too.
++ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
++
++exec 6>&1
++
++#
++# Initializations.
++#
++ac_default_prefix=/usr/local
++ac_config_libobj_dir=.
++cross_compiling=no
++subdirs=
++MFLAGS=
++MAKEFLAGS=
++SHELL=${CONFIG_SHELL-/bin/sh}
++
++# Maximum number of lines to put in a shell here document.
++# This variable seems obsolete.  It should probably be removed, and
++# only ac_max_sed_lines should be used.
++: ${ac_max_here_lines=38}
++
++# Identity of this package.
++PACKAGE_NAME=
++PACKAGE_TARNAME=
++PACKAGE_VERSION=
++PACKAGE_STRING=
++PACKAGE_BUGREPORT=
++
++ac_unique_file="src/a52dec.c"
++# Factoring default headers for most tests.
++ac_includes_default="\
++#include <stdio.h>
++#if HAVE_SYS_TYPES_H
++# include <sys/types.h>
++#endif
++#if HAVE_SYS_STAT_H
++# include <sys/stat.h>
++#endif
++#if STDC_HEADERS
++# include <stdlib.h>
++# include <stddef.h>
++#else
++# if HAVE_STDLIB_H
++#  include <stdlib.h>
++# endif
++#endif
++#if HAVE_STRING_H
++# if !STDC_HEADERS && HAVE_MEMORY_H
++#  include <memory.h>
++# endif
++# include <string.h>
++#endif
++#if HAVE_STRINGS_H
++# include <strings.h>
++#endif
++#if HAVE_INTTYPES_H
++# include <inttypes.h>
++#else
++# if HAVE_STDINT_H
++#  include <stdint.h>
++# endif
++#endif
++#if HAVE_UNISTD_H
+ # include <unistd.h>
+ #endif"
+ 
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INCLUDES LIBA52_CFLAGS LIBA52_LIBS LIBAO_LIBS A52DEC_CFLAGS LIBOBJS LTLIBOBJS'
++ac_subst_files=''
+ 
+ # Initialize some variables set by options.
+ ac_init_help=
+@@ -812,7 +822,7 @@
+ 
+ # Be sure to have absolute paths.
+ for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+-              localstatedir libdir includedir oldincludedir infodir mandir
++	      localstatedir libdir includedir oldincludedir infodir mandir
+ do
+   eval ac_val=$`echo $ac_var`
+   case $ac_val in
+@@ -852,10 +862,10 @@
+   # Try the directory containing this script, then its parent.
+   ac_confdir=`(dirname "$0") 2>/dev/null ||
+ $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-         X"$0" : 'X\(//\)[^/]' \| \
+-         X"$0" : 'X\(//\)$' \| \
+-         X"$0" : 'X\(/\)' \| \
+-         .     : '\(.\)' 2>/dev/null ||
++	 X"$0" : 'X\(//\)[^/]' \| \
++	 X"$0" : 'X\(//\)$' \| \
++	 X"$0" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
+ echo X"$0" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+@@ -878,6 +888,9 @@
+    { (exit 1); exit 1; }; }
+   fi
+ fi
++(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
++  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
++   { (exit 1); exit 1; }; }
+ srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ ac_env_build_alias_set=${build_alias+set}
+ ac_env_build_alias_value=$build_alias
+@@ -911,6 +924,26 @@
+ ac_env_CPP_value=$CPP
+ ac_cv_env_CPP_set=${CPP+set}
+ ac_cv_env_CPP_value=$CPP
++ac_env_CXX_set=${CXX+set}
++ac_env_CXX_value=$CXX
++ac_cv_env_CXX_set=${CXX+set}
++ac_cv_env_CXX_value=$CXX
++ac_env_CXXFLAGS_set=${CXXFLAGS+set}
++ac_env_CXXFLAGS_value=$CXXFLAGS
++ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
++ac_cv_env_CXXFLAGS_value=$CXXFLAGS
++ac_env_CXXCPP_set=${CXXCPP+set}
++ac_env_CXXCPP_value=$CXXCPP
++ac_cv_env_CXXCPP_set=${CXXCPP+set}
++ac_cv_env_CXXCPP_value=$CXXCPP
++ac_env_F77_set=${F77+set}
++ac_env_F77_value=$F77
++ac_cv_env_F77_set=${F77+set}
++ac_cv_env_F77_value=$F77
++ac_env_FFLAGS_set=${FFLAGS+set}
++ac_env_FFLAGS_value=$FFLAGS
++ac_cv_env_FFLAGS_set=${FFLAGS+set}
++ac_cv_env_FFLAGS_value=$FFLAGS
+ 
+ #
+ # Report the --help message.
+@@ -944,9 +977,9 @@
+   cat <<_ACEOF
+ 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
+@@ -990,11 +1023,16 @@
+ Optional Features:
+   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
+   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+-  --enable-maintainer-mode enable make rules and dependencies not useful
+-                          (and sometimes confusing) to the casual installer
+-  --enable-shared=PKGS  build shared libraries default=no
+-  --enable-static=PKGS  build static libraries default=yes
+-  --enable-fast-install=PKGS  optimize for fast installation default=yes
++  --enable-maintainer-mode  enable make rules and dependencies not useful
++			  (and sometimes confusing) to the casual installer
++  --disable-dependency-tracking  speeds up one-time build
++  --enable-dependency-tracking   do not reject slow dependency extractors
++  --enable-shared[=PKGS]
++                          build shared libraries [default=no]
++  --enable-static[=PKGS]
++                          build static libraries [default=yes]
++  --enable-fast-install[=PKGS]
++                          optimize for fast installation [default=yes]
+   --disable-libtool-lock  avoid locking (might break parallel builds)
+   --enable-double         use double-precision samples
+   --enable-djbfft         make a version using djbfft
+@@ -1008,8 +1046,11 @@
+ Optional Packages:
+   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+-  --with-gnu-ld           assume the C compiler uses GNU ld default=no
+-  --with-pic              try to use only PIC/non-PIC objects default=use both
++  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
++  --with-pic              try to use only PIC/non-PIC objects [default=use
++                          both]
++  --with-tags[=TAGS]
++                          include additional configurations [automatic]
+ 
+ Some influential environment variables:
+   CC          C compiler command
+@@ -1019,6 +1060,11 @@
+   CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
+               headers in a nonstandard directory <include dir>
+   CPP         C preprocessor
++  CXX         C++ compiler command
++  CXXFLAGS    C++ compiler flags
++  CXXCPP      C++ preprocessor
++  F77         Fortran 77 compiler command
++  FFLAGS      Fortran 77 compiler flags
+ 
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+@@ -1056,12 +1102,45 @@
+     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+     ac_top_srcdir=$ac_top_builddir$srcdir ;;
+ esac
+-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+-# absolute.
+-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+-ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
+-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
++
++# Do not use `cd foo && pwd` to compute absolute paths, because
++# the directories may not exist.
++case `pwd` in
++.) ac_abs_builddir="$ac_dir";;
++*)
++  case "$ac_dir" in
++  .) ac_abs_builddir=`pwd`;;
++  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
++  *) ac_abs_builddir=`pwd`/"$ac_dir";;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_builddir=${ac_top_builddir}.;;
++*)
++  case ${ac_top_builddir}. in
++  .) ac_abs_top_builddir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
++  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_srcdir=$ac_srcdir;;
++*)
++  case $ac_srcdir in
++  .) ac_abs_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
++  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_srcdir=$ac_top_srcdir;;
++*)
++  case $ac_top_srcdir in
++  .) ac_abs_top_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
++  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
++  esac;;
++esac
+ 
+     cd $ac_dir
+     # Check for guested configure; otherwise get Cygnus style configure.
+@@ -1072,7 +1151,7 @@
+       echo
+       $SHELL $ac_srcdir/configure  --help=recursive
+     elif test -f $ac_srcdir/configure.ac ||
+-           test -f $ac_srcdir/configure.in; then
++	   test -f $ac_srcdir/configure.in; then
+       echo
+       $ac_configure --help
+     else
+@@ -1086,8 +1165,7 @@
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ 
+-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+-Free Software Foundation, Inc.
++Copyright (C) 2003 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+@@ -1099,7 +1177,7 @@
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.53.  Invocation command line was
++generated by GNU Autoconf 2.59.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -1151,27 +1229,54 @@
+ 
+ # Keep a trace of the command line.
+ # Strip out --no-create and --no-recursion so they do not pile up.
++# Strip out --silent because we don't want to record it for future runs.
+ # Also quote any args containing shell meta-characters.
++# Make two passes to allow for proper duplicate-argument suppression.
+ ac_configure_args=
++ac_configure_args0=
++ac_configure_args1=
+ ac_sep=
+-for ac_arg
++ac_must_keep_next=false
++for ac_pass in 1 2
+ do
+-  case $ac_arg in
+-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+-  | --no-cr | --no-c | -n ) continue ;;
+-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+-    continue ;;
+-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+-    ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+-  esac
+-  case " $ac_configure_args " in
+-    *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+-    *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+-       ac_sep=" " ;;
+-  esac
+-  # Get rid of the leading space.
++  for ac_arg
++  do
++    case $ac_arg in
++    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
++    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
++    | -silent | --silent | --silen | --sile | --sil)
++      continue ;;
++    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
++      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
++    esac
++    case $ac_pass in
++    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
++    2)
++      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
++      if test $ac_must_keep_next = true; then
++	ac_must_keep_next=false # Got value, back to normal.
++      else
++	case $ac_arg in
++	  *=* | --config-cache | -C | -disable-* | --disable-* \
++	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
++	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
++	  | -with-* | --with-* | -without-* | --without-* | --x)
++	    case "$ac_configure_args0 " in
++	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
++	    esac
++	    ;;
++	  -* ) ac_must_keep_next=true ;;
++	esac
++      fi
++      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
++      # Get rid of the leading space.
++      ac_sep=" "
++      ;;
++    esac
++  done
+ done
++$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
++$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+ 
+ # When interrupted or exit'd, cleanup temporary files, and complete
+ # config.log.  We remove comments because anyway the quotes in there
+@@ -1182,6 +1287,7 @@
+   # Save into config.log some information that might help in debugging.
+   {
+     echo
++
+     cat <<\_ASBOX
+ ## ---------------- ##
+ ## Cache variables. ##
+@@ -1194,16 +1300,45 @@
+     case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+     *ac_space=\ *)
+       sed -n \
+-        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+-    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
++	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
++	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+       ;;
+     *)
+       sed -n \
+-        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+       ;;
+     esac;
+ }
+     echo
++
++    cat <<\_ASBOX
++## ----------------- ##
++## Output variables. ##
++## ----------------- ##
++_ASBOX
++    echo
++    for ac_var in $ac_subst_vars
++    do
++      eval ac_val=$`echo $ac_var`
++      echo "$ac_var='"'"'$ac_val'"'"'"
++    done | sort
++    echo
++
++    if test -n "$ac_subst_files"; then
++      cat <<\_ASBOX
++## ------------- ##
++## Output files. ##
++## ------------- ##
++_ASBOX
++      echo
++      for ac_var in $ac_subst_files
++      do
++	eval ac_val=$`echo $ac_var`
++	echo "$ac_var='"'"'$ac_val'"'"'"
++      done | sort
++      echo
++    fi
++
+     if test -s confdefs.h; then
+       cat <<\_ASBOX
+ ## ----------- ##
+@@ -1211,14 +1346,14 @@
+ ## ----------- ##
+ _ASBOX
+       echo
+-      sed "/^$/d" confdefs.h
++      sed "/^$/d" confdefs.h | sort
+       echo
+     fi
+     test "$ac_signal" != 0 &&
+       echo "$as_me: caught signal $ac_signal"
+     echo "$as_me: exit $exit_status"
+   } >&5
+-  rm -f core core.* *.core &&
++  rm -f core *.core &&
+   rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+     exit $exit_status
+      ' 0
+@@ -1298,7 +1433,7 @@
+ # value.
+ ac_cache_corrupted=false
+ for ac_var in `(set) 2>&1 |
+-               sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
++	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+   eval ac_old_set=\$ac_cv_env_${ac_var}_set
+   eval ac_new_set=\$ac_env_${ac_var}_set
+   eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+@@ -1315,13 +1450,13 @@
+     ,);;
+     *)
+       if test "x$ac_old_val" != "x$ac_new_val"; then
+-        { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
++	{ 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:$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:$LINENO:   current value: $ac_new_val" >&5
+ echo "$as_me:   current value: $ac_new_val" >&2;}
+-        ac_cache_corrupted=:
++	ac_cache_corrupted=:
+       fi;;
+   esac
+   # Pass precious variables to config.status.
+@@ -1369,6 +1504,7 @@
+ 
+ 
+ 
++
+ ac_aux_dir=
+ for ac_dir in autotools $srcdir/autotools; do
+   if test -f $ac_dir/install-sh; then
+@@ -1394,8 +1530,9 @@
+ ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
+ 
+-ac_config_files="$ac_config_files Makefile autotools/Makefile include/Makefile test/Makefile doc/Makefile src/Makefile liba52/Makefile libao/Makefile vc++/Makefile"
++                                                                                          ac_config_files="$ac_config_files Makefile autotools/Makefile include/Makefile test/Makefile doc/Makefile src/Makefile liba52/Makefile libao/Makefile vc++/Makefile"
+ 
++am__api_version="1.9"
+ # Find a good install program.  We prefer a C program (faster),
+ # so one script is as good as another.  But avoid the broken or
+ # incompatible versions:
+@@ -1407,6 +1544,7 @@
+ # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+ # AFS /usr/afsws/bin/install, which mishandles nonexistent args
+ # 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.
+ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+ echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
+@@ -1423,6 +1561,7 @@
+ case $as_dir/ in
+   ./ | .// | /cC/* | \
+   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
++  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+   /usr/ucb/* ) ;;
+   *)
+     # OSF1 and SCO ODT 3.0 have their own names for install.
+@@ -1430,20 +1569,20 @@
+     # by default.
+     for ac_prog in ginstall scoinst install; do
+       for ac_exec_ext in '' $ac_executable_extensions; do
+-        if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+-          if test $ac_prog = install &&
+-            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+-            # AIX install.  It has an incompatible calling convention.
+-            :
+-          elif test $ac_prog = install &&
+-            grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+-            # program-specific install script used by HP pwplus--don't use.
+-            :
+-          else
+-            ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+-            break 3
+-          fi
+-        fi
++	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
++	  if test $ac_prog = install &&
++	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
++	    # AIX install.  It has an incompatible calling convention.
++	    :
++	  elif test $ac_prog = install &&
++	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
++	    # program-specific install script used by HP pwplus--don't use.
++	    :
++	  else
++	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
++	    break 3
++	  fi
++	fi
+       done
+     done
+     ;;
+@@ -1477,20 +1616,21 @@
+ echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
+ # Just in case
+ sleep 1
+-echo timestamp > conftestfile
++echo timestamp > conftest.file
+ # Do `set' in a subshell so we don't clobber the current shell's
+ # arguments.  Must try -L first in case configure is actually a
+ # symlink; some systems play weird games with the mod time of symlinks
+ # (eg FreeBSD returns the mod time of the symlink's containing
+ # directory).
+ if (
+-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
++   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+    if test "$*" = "X"; then
+       # -L didn't work.
+-      set X `ls -t $srcdir/configure conftestfile`
++      set X `ls -t $srcdir/configure conftest.file`
+    fi
+-   if test "$*" != "X $srcdir/configure conftestfile" \
+-      && test "$*" != "X conftestfile $srcdir/configure"; then
++   rm -f conftest.file
++   if test "$*" != "X $srcdir/configure conftest.file" \
++      && test "$*" != "X conftest.file $srcdir/configure"; then
+ 
+       # If neither matched, then we have a broken ls.  This can happen
+       # if, for instance, CONFIG_SHELL is bash and it inherits a
+@@ -1503,7 +1643,7 @@
+    { (exit 1); exit 1; }; }
+    fi
+ 
+-   test "$2" = conftestfile
++   test "$2" = conftest.file
+    )
+ then
+    # Ok.
+@@ -1515,7 +1655,6 @@
+ Check your system clock" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+-rm -f conftest*
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ test "$program_prefix" != NONE &&
+@@ -1531,23 +1670,109 @@
+ program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+ rm conftest.sed
+ 
+-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \${MAKE}" >&5
+-echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
+-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
++# expand $ac_aux_dir to an absolute path
++am_aux_dir=`cd $ac_aux_dir && pwd`
++
++test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
++# Use eval to expand $SHELL
++if eval "$MISSING --run true"; then
++  am_missing_run="$MISSING --run "
++else
++  am_missing_run=
++  { 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
++
++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
++
++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
++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
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.make <<\_ACEOF
+-all:
+-	@echo 'ac_maketemp="${MAKE}"'
+-_ACEOF
+-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
+-if test -n "$ac_maketemp"; then
+-  eval ac_cv_prog_make_${ac_make}_set=yes
++  if test -n "$AWK"; then
++  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+ else
+-  eval ac_cv_prog_make_${ac_make}_set=no
+-fi
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_AWK="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++AWK=$ac_cv_prog_AWK
++if test -n "$AWK"; then
++  echo "$as_me:$LINENO: result: $AWK" >&5
++echo "${ECHO_T}$AWK" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$AWK" && break
++done
++
++echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
++echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
++set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.make <<\_ACEOF
++all:
++	@echo 'ac_maketemp="$(MAKE)"'
++_ACEOF
++# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
++eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
++if test -n "$ac_maketemp"; then
++  eval ac_cv_prog_make_${ac_make}_set=yes
++else
++  eval ac_cv_prog_make_${ac_make}_set=no
++fi
+ rm -f conftest.make
+ fi
+ if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+@@ -1560,17 +1785,38 @@
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+ 
+-
+-PACKAGE=a52dec
+-
+-VERSION=0.7.4
+-
+-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
++rm -rf .tst 2>/dev/null
++mkdir .tst 2>/dev/null
++if test -d .tst; then
++  am__leading_dot=.
++else
++  am__leading_dot=_
++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
+   { { 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
+ 
++# test whether we have cygpath
++if test -z "$CYGPATH_W"; then
++  if (cygpath --version) >/dev/null 2>/dev/null; then
++    CYGPATH_W='cygpath -w'
++  else
++    CYGPATH_W=echo
++  fi
++fi
++
++
++# Define the identity of the package.
++ PACKAGE=a52dec
++ VERSION=0.7.4
++
++
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE "$PACKAGE"
+ _ACEOF
+@@ -1580,89 +1826,125 @@
+ #define VERSION "$VERSION"
+ _ACEOF
+ 
++# Some tools Automake needs.
++
++ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
++
++
++AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
++
++
++AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
++
++
++AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
++
++
++MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
++
++install_sh=${install_sh-"$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
++# tool to use in cross-compilation environments, therefore Automake
++# will honor the `STRIP' environment variable to overrule this program.
++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
++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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$STRIP"; then
++  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++STRIP=$ac_cv_prog_STRIP
++if test -n "$STRIP"; then
++  echo "$as_me:$LINENO: result: $STRIP" >&5
++echo "${ECHO_T}$STRIP" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++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
++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
++  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.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_STRIP="strip"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
++fi
++fi
++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
++if test -n "$ac_ct_STRIP"; then
++  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++echo "${ECHO_T}$ac_ct_STRIP" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
+ 
++  STRIP=$ac_ct_STRIP
++else
++  STRIP="$ac_cv_prog_STRIP"
++fi
+ 
+-missing_dir=`cd $ac_aux_dir && pwd`
+-echo "$as_me:$LINENO: checking for working aclocal" >&5
+-echo $ECHO_N "checking for working aclocal... $ECHO_C" >&6
+-# Run test in a subshell; some versions of sh will print an error if
+-# an executable is not found, even if stderr is redirected.
+-# Redirect stdin to placate older versions of autoconf.  Sigh.
+-if (aclocal --version) < /dev/null > /dev/null 2>&1; then
+-   ACLOCAL=aclocal
+-   echo "$as_me:$LINENO: result: found" >&5
+-echo "${ECHO_T}found" >&6
+-else
+-   ACLOCAL="$missing_dir/missing aclocal"
+-   echo "$as_me:$LINENO: result: missing" >&5
+-echo "${ECHO_T}missing" >&6
+-fi
+-
+-echo "$as_me:$LINENO: checking for working autoconf" >&5
+-echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6
+-# Run test in a subshell; some versions of sh will print an error if
+-# an executable is not found, even if stderr is redirected.
+-# Redirect stdin to placate older versions of autoconf.  Sigh.
+-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
+-   AUTOCONF=autoconf
+-   echo "$as_me:$LINENO: result: found" >&5
+-echo "${ECHO_T}found" >&6
+-else
+-   AUTOCONF="$missing_dir/missing autoconf"
+-   echo "$as_me:$LINENO: result: missing" >&5
+-echo "${ECHO_T}missing" >&6
+-fi
+-
+-echo "$as_me:$LINENO: checking for working automake" >&5
+-echo $ECHO_N "checking for working automake... $ECHO_C" >&6
+-# Run test in a subshell; some versions of sh will print an error if
+-# an executable is not found, even if stderr is redirected.
+-# Redirect stdin to placate older versions of autoconf.  Sigh.
+-if (automake --version) < /dev/null > /dev/null 2>&1; then
+-   AUTOMAKE=automake
+-   echo "$as_me:$LINENO: result: found" >&5
+-echo "${ECHO_T}found" >&6
+-else
+-   AUTOMAKE="$missing_dir/missing automake"
+-   echo "$as_me:$LINENO: result: missing" >&5
+-echo "${ECHO_T}missing" >&6
+-fi
+-
+-echo "$as_me:$LINENO: checking for working autoheader" >&5
+-echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6
+-# Run test in a subshell; some versions of sh will print an error if
+-# an executable is not found, even if stderr is redirected.
+-# Redirect stdin to placate older versions of autoconf.  Sigh.
+-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
+-   AUTOHEADER=autoheader
+-   echo "$as_me:$LINENO: result: found" >&5
+-echo "${ECHO_T}found" >&6
+-else
+-   AUTOHEADER="$missing_dir/missing autoheader"
+-   echo "$as_me:$LINENO: result: missing" >&5
+-echo "${ECHO_T}missing" >&6
+-fi
+-
+-echo "$as_me:$LINENO: checking for working makeinfo" >&5
+-echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6
+-# Run test in a subshell; some versions of sh will print an error if
+-# an executable is not found, even if stderr is redirected.
+-# Redirect stdin to placate older versions of autoconf.  Sigh.
+-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
+-   MAKEINFO=makeinfo
+-   echo "$as_me:$LINENO: result: found" >&5
+-echo "${ECHO_T}found" >&6
+-else
+-   MAKEINFO="$missing_dir/missing makeinfo"
+-   echo "$as_me:$LINENO: result: missing" >&5
+-echo "${ECHO_T}missing" >&6
+ fi
++INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
++
++# We need awk for the "check" target.  The system "awk" is bad on
++# some platforms.
++# Always define AMTAR for backward compatibility.
++
++AMTAR=${AMTAR-"${am_missing_run}tar"}
+ 
++am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+ 
+ 
+-ac_config_headers="$ac_config_headers include/config.h"
+ 
+-ac_config_commands="$ac_config_commands default-1"
++
++
++          ac_config_headers="$ac_config_headers include/config.h"
+ 
+ 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
+@@ -1684,6 +1966,7 @@
+   MAINTAINER_MODE_TRUE='#'
+   MAINTAINER_MODE_FALSE=
+ fi
++
+   MAINT=$MAINTAINER_MODE_TRUE
+ 
+ 
+@@ -1946,9 +2229,7 @@
+     # However, it has the same basename, so the bogon will be chosen
+     # first if we set CC to just the basename; use the full file name.
+     shift
+-    set dummy "$as_dir/$ac_word" ${1+"$@"}
+-    shift
+-    ac_cv_prog_CC="$@"
++    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+   fi
+ fi
+ fi
+@@ -2053,8 +2334,10 @@
+ fi
+ 
+ 
+-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5
+-echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;}
++test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
++See \`config.log' for more details." >&5
++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.
+@@ -2078,15 +2361,12 @@
+   (exit $ac_status); }
+ 
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -2096,12 +2376,12 @@
+ }
+ _ACEOF
+ ac_clean_files_save=$ac_clean_files
+-ac_clean_files="$ac_clean_files a.out a.exe"
++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.
+-echo "$as_me:$LINENO: checking for C compiler default output" >&5
+-echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
++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[^ ]*//'`
+ if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
+   (eval $ac_link_default) 2>&5
+@@ -2115,26 +2395,39 @@
+ # Be careful to initialize this variable, since it used to be cached.
+ # Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
+ ac_cv_exeext=
+-for ac_file in `ls a_out.exe a.exe conftest.exe 2>/dev/null;
+-                ls a.out conftest 2>/dev/null;
+-                ls a.* conftest.* 2>/dev/null`; do
++# b.out is created by i960 compilers.
++for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
++do
++  test -f "$ac_file" || continue
+   case $ac_file in
+-    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb | *.xSYM ) ;;
+-    a.out ) # We found the default executable, but exeext='' is most
+-            # certainly right.
+-            break;;
+-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+-          # FIXME: I believe we export ac_cv_exeext for Libtool --akim.
+-          export ac_cv_exeext
+-          break;;
+-    * ) break;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
++	;;
++    conftest.$ac_ext )
++	# This is the source file.
++	;;
++    [ab].out )
++	# We found the default executable, but exeext='' is most
++	# certainly right.
++	break;;
++    *.* )
++	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++	# FIXME: I believe we export ac_cv_exeext for Libtool,
++	# but it would be cool to find out if it's true.  Does anybody
++	# maintain Libtool? --akim.
++	export ac_cv_exeext
++	break;;
++    * )
++	break;;
+   esac
+ done
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables" >&5
+-echo "$as_me: error: C compiler cannot create executables" >&2;}
++sed 's/^/| /' conftest.$ac_ext >&5
++
++{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
++See \`config.log' for more details." >&5
++echo "$as_me: error: C compiler cannot create executables
++See \`config.log' for more details." >&2;}
+    { (exit 77); exit 77; }; }
+ fi
+ 
+@@ -2161,9 +2454,11 @@
+ 	cross_compiling=yes
+     else
+ 	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+-If you meant to cross compile, use \`--host'." >&5
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." >&5
+ echo "$as_me: error: cannot run C compiled programs.
+-If you meant to cross compile, use \`--host'." >&2;}
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
+     fi
+   fi
+@@ -2171,7 +2466,7 @@
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ 
+-rm -f a.out a.exe conftest$ac_cv_exeext
++rm -f a.out a.exe conftest$ac_cv_exeext b.out
+ ac_clean_files=$ac_clean_files_save
+ # Check the compiler produces executables we can run.  If not, either
+ # the compiler is broken, or we cross compile.
+@@ -2191,18 +2486,21 @@
+ # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+ # work properly (i.e., refer to `conftest.exe'), while it won't with
+ # `rm'.
+-for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
++for ac_file in conftest.exe conftest conftest.*; do
++  test -f "$ac_file" || continue
+   case $ac_file in
+-    *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
+     *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+-          export ac_cv_exeext
+-          break;;
++	  export ac_cv_exeext
++	  break;;
+     * ) break;;
+   esac
+ done
+ else
+-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link" >&5
+-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link" >&2;}
++  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details." >&5
++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
+ 
+@@ -2219,15 +2517,12 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -2244,16 +2539,19 @@
+   (exit $ac_status); }; then
+   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
+   case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb ) ;;
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
+     *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+        break;;
+   esac
+ done
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile" >&5
+-echo "$as_me: error: cannot compute suffix of object files: cannot compile" >&2;}
++sed 's/^/| /' conftest.$ac_ext >&5
++
++{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute suffix of object files: cannot compile
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+@@ -2269,15 +2567,12 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -2291,11 +2586,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2304,10 +2609,11 @@
+   ac_compiler_gnu=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_compiler_gnu=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+@@ -2323,15 +2629,12 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -2342,11 +2645,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2355,10 +2668,11 @@
+   ac_cv_prog_cc_g=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_prog_cc_g=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+ echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
+@@ -2377,47 +2691,168 @@
+     CFLAGS=
+   fi
+ fi
+-# Some people use a C++ compiler to compile C.  Since we use `exit',
+-# in C++ we need to declare it.  In case someone uses the same compiler
+-# for both compiling C and C++ we need to have the C++ compiler decide
+-# the declaration of exit, since it's the most demanding environment.
++echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
++echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
++if test "${ac_cv_prog_cc_stdc+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_prog_cc_stdc=no
++ac_save_CC=$CC
+ cat >conftest.$ac_ext <<_ACEOF
+-#ifndef __cplusplus
+-  choke me
+-#endif
++/* confdefs.h.  */
+ _ACEOF
+-rm -f conftest.$ac_objext
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdarg.h>
++#include <stdio.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
++struct buf { int x; };
++FILE * (*rcsopen) (struct buf *, struct stat *, int);
++static char *e (p, i)
++     char **p;
++     int i;
++{
++  return p[i];
++}
++static char *f (char * (*g) (char **, int), char **p, ...)
++{
++  char *s;
++  va_list v;
++  va_start (v,p);
++  s = g (p, va_arg (v,int));
++  va_end (v);
++  return s;
++}
++
++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
++   function prototypes and stuff, but not '\xHH' hex character constants.
++   These don't provoke an error unfortunately, instead are silently treated
++   as 'x'.  The following induces an error, until -std1 is added to get
++   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
++   array size at least.  It's necessary to write '\x00'==0 to get something
++   that's true only with -std1.  */
++int osf4_cc_array ['\x00' == 0 ? 1 : -1];
++
++int test (int i, double x);
++struct s1 {int (*f) (int a);};
++struct s2 {int (*f) (double a);};
++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
++int argc;
++char **argv;
++int
++main ()
++{
++return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
++  ;
++  return 0;
++}
++_ACEOF
++# Don't try gcc -ansi; that turns off useful extensions and
++# breaks some systems' header files.
++# AIX			-qlanglvl=ansi
++# Ultrix and OSF/1	-std1
++# HP-UX 10.20 and later	-Ae
++# HP-UX older versions	-Aa -D_HPUX_SOURCE
++# SVR4			-Xc -D__EXTENSIONS__
++for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
++do
++  CC="$ac_save_CC $ac_arg"
++  rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  for ac_declaration in \
+-   ''\
+-   '#include <stdlib.h>' \
+-   'extern "C" void std::exit (int) throw (); using std::exit;' \
+-   'extern "C" void std::exit (int); using std::exit;' \
+-   'extern "C" void exit (int) throw ();' \
+-   'extern "C" void exit (int);' \
+-   'void exit (int);'
++  ac_cv_prog_cc_stdc=$ac_arg
++break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext
++done
++rm -f conftest.$ac_ext conftest.$ac_objext
++CC=$ac_save_CC
++
++fi
++
++case "x$ac_cv_prog_cc_stdc" in
++  x|xno)
++    echo "$as_me:$LINENO: result: none needed" >&5
++echo "${ECHO_T}none needed" >&6 ;;
++  *)
++    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
++    CC="$CC $ac_cv_prog_cc_stdc" ;;
++esac
++
++# Some people use a C++ compiler to compile C.  Since we use `exit',
++# in C++ we need to declare it.  In case someone uses the same compiler
++# for both compiling C and C++ we need to have the C++ compiler decide
++# the declaration of exit, since it's the most demanding environment.
++cat >conftest.$ac_ext <<_ACEOF
++#ifndef __cplusplus
++  choke me
++#endif
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  for ac_declaration in \
++   '' \
++   'extern "C" void std::exit (int) throw (); using std::exit;' \
++   'extern "C" void std::exit (int); using std::exit;' \
++   'extern "C" void exit (int) throw ();' \
++   'extern "C" void exit (int);' \
++   'void exit (int);'
+ do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-#include <stdlib.h>
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_declaration
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
++#include <stdlib.h>
+ int
+ main ()
+ {
+@@ -2428,11 +2863,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2441,20 +2886,18 @@
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ continue
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_declaration
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -2465,11 +2908,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2478,9 +2931,10 @@
+   break
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ rm -f conftest*
+ if test -n "$ac_declaration"; then
+@@ -2491,14 +2945,189 @@
+ 
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
++DEPDIR="${am__leading_dot}deps"
++
++          ac_config_commands="$ac_config_commands depfiles"
++
++
++am_make=${MAKE-make}
++cat > confinc << 'END'
++am__doit:
++	@echo done
++.PHONY: am__doit
++END
++# If we don't find an include directive, just comment out the code.
++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
++# First try GNU make style include.
++echo "include confinc" > confmf
++# We grep out `Entering directory' and `Leaving directory'
++# messages which can occur if `w' ends up in MAKEFLAGS.
++# In particular we don't look at `^make:' because GNU make might
++# be invoked under some other name (usually "gmake"), in which
++# case it prints its new name instead of `make'.
++if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
++   am__include=include
++   am__quote=
++   _am_result=GNU
++fi
++# Now try BSD make style include.
++if test "$am__include" = "#"; then
++   echo '.include "confinc"' > confmf
++   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
++      am__include=.include
++      am__quote="\""
++      _am_result=BSD
++   fi
++fi
++
++
++echo "$as_me:$LINENO: result: $_am_result" >&5
++echo "${ECHO_T}$_am_result" >&6
++rm -f confinc confmf
++
++# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
++if test "${enable_dependency_tracking+set}" = set; then
++  enableval="$enable_dependency_tracking"
++
++fi;
++if test "x$enable_dependency_tracking" != xno; then
++  am_depcomp="$ac_aux_dir/depcomp"
++  AMDEPBACKSLASH='\'
++fi
++
++
++if test "x$enable_dependency_tracking" != xno; then
++  AMDEP_TRUE=
++  AMDEP_FALSE='#'
++else
++  AMDEP_TRUE='#'
++  AMDEP_FALSE=
++fi
++
++
++
++
++depcc="$CC"   am_compiler_list=
++
++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
++  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
++  # making bogus files that we don't know about and never remove.  For
++  # instance it was reported that on HP-UX the gcc test will end up
++  # making a dummy file named `D' -- because `-MD' means `put the output
++  # in D'.
++  mkdir conftest.dir
++  # Copy depcomp to subdir because otherwise we won't find it if we're
++  # using a relative directory.
++  cp "$am_depcomp" conftest.dir
++  cd conftest.dir
++  # We will build objects and dependencies in a subdirectory because
++  # it helps to detect inapplicable dependency modes.  For instance
++  # both Tru64's cc and ICC support -MD to output dependencies as a
++  # side effect of compilation, but ICC will put the dependencies in
++  # the current directory while Tru64 will put them in the object
++  # directory.
++  mkdir sub
++
++  am_cv_CC_dependencies_compiler_type=none
++  if test "$am_compiler_list" = ""; then
++     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
++  fi
++  for depmode in $am_compiler_list; do
++    # Setup a source with many dependencies, because some compilers
++    # like to wrap large dependency lists on column 80 (with \), and
++    # we should not choose a depcomp mode which is confused by this.
++    #
++    # We need to recreate these files for each test, as the compiler may
++    # overwrite some of them when testing with obscure command lines.
++    # This happens at least with the AIX C compiler.
++    : > sub/conftest.c
++    for i in 1 2 3 4 5 6; do
++      echo '#include "conftst'$i'.h"' >> sub/conftest.c
++      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
++      # Solaris 8's {/usr,}/bin/sh.
++      touch sub/conftst$i.h
++    done
++    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
++
++    case $depmode in
++    nosideeffect)
++      # after this tag, mechanisms are not by side-effect, so they'll
++      # only be used when explicitly requested
++      if test "x$enable_dependency_tracking" = xyes; then
++	continue
++      else
++	break
++      fi
++      ;;
++    none) break ;;
++    esac
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.
++    if depmode=$depmode \
++       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
++       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++         >/dev/null 2>conftest.err &&
++       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
++       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
++      # icc doesn't choke on unknown options, it will just issue warnings
++      # or remarks (even with -Werror).  So we grep stderr for any message
++      # that says an option was ignored or not supported.
++      # When given -MP, icc 7.0 and 7.1 complain thusly:
++      #   icc: Command line warning: ignoring option '-M'; no argument required
++      # The diagnosis changed in icc 8.0:
++      #   icc: Command line remark: option '-MP' not supported
++      if (grep 'ignoring option' conftest.err ||
++          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
++        am_cv_CC_dependencies_compiler_type=$depmode
++        break
++      fi
++    fi
++  done
++
++  cd ..
++  rm -rf conftest.dir
++else
++  am_cv_CC_dependencies_compiler_type=none
++fi
++
++fi
++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
++  test "x$enable_dependency_tracking" != xno \
++  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
++  am__fastdepCC_TRUE=
++  am__fastdepCC_FALSE='#'
++else
++  am__fastdepCC_TRUE='#'
++  am__fastdepCC_FALSE=
++fi
++
+ 
+ 
+ ac_ext=c
+@@ -2524,24 +3153,34 @@
+ do
+   # Use a header file that comes with gcc, so configuring glibc
+   # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-#include <assert.h>
+-                     Syntax error
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++		     Syntax error
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
++  grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+   else
+     ac_cpp_err=
+   fi
+@@ -2552,7 +3191,8 @@
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+   # Broken: fails on valid input.
+ continue
+ fi
+@@ -2561,20 +3201,24 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <ac_nonexistent.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
++  grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+   else
+     ac_cpp_err=
+   fi
+@@ -2586,7 +3230,8 @@
+ continue
+ else
+   echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+   # Passes both tests.
+ ac_preproc_ok=:
+ break
+@@ -2615,24 +3260,34 @@
+ do
+   # Use a header file that comes with gcc, so configuring glibc
+   # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-#include <assert.h>
+-                     Syntax error
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++		     Syntax error
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
++  grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+   else
+     ac_cpp_err=
+   fi
+@@ -2643,7 +3298,8 @@
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+   # Broken: fails on valid input.
+ continue
+ fi
+@@ -2652,20 +3308,24 @@
+   # OK, works on sane cases.  Now check whether non-existent headers
+   # can be detected and how.
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <ac_nonexistent.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
++  grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+   else
+     ac_cpp_err=
+   fi
+@@ -2677,7 +3337,8 @@
+ continue
+ else
+   echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+   # Passes both tests.
+ ac_preproc_ok=:
+ break
+@@ -2690,8 +3351,10 @@
+ if $ac_preproc_ok; then
+   :
+ else
+-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5
+-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
++  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." >&5
++echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+ 
+@@ -2702,6 +3365,21 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
++echo "$as_me:$LINENO: checking for egrep" >&5
++echo $ECHO_N "checking for egrep... $ECHO_C" >&6
++if test "${ac_cv_prog_egrep+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
++    then ac_cv_prog_egrep='grep -E'
++    else ac_cv_prog_egrep='egrep'
++    fi
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
++echo "${ECHO_T}$ac_cv_prog_egrep" >&6
++ EGREP=$ac_cv_prog_egrep
++
++
+ if test $ac_cv_c_compiler_gnu = yes; then
+     echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5
+ echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
+@@ -2710,13 +3388,16 @@
+ else
+     ac_pattern="Autoconf.*'x'"
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <sgtty.h>
+ Autoconf TIOCGETP
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep "$ac_pattern" >/dev/null 2>&1; then
++  $EGREP "$ac_pattern" >/dev/null 2>&1; then
+   ac_cv_prog_gcc_traditional=yes
+ else
+   ac_cv_prog_gcc_traditional=no
+@@ -2726,13 +3407,16 @@
+ 
+   if test $ac_cv_prog_gcc_traditional = no; then
+     cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <termio.h>
+ Autoconf TCGETA
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep "$ac_pattern" >/dev/null 2>&1; then
++  $EGREP "$ac_pattern" >/dev/null 2>&1; then
+   ac_cv_prog_gcc_traditional=yes
+ fi
+ rm -f conftest*
+@@ -2759,15 +3443,12 @@
+     SAVE_CFLAGS="$CFLAGS"
+     CFLAGS="$OPT_CFLAGS"
+     cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -2778,11 +3459,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2791,10 +3482,11 @@
+   ac_cv_try_cflags_ok=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_try_cflags_ok=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+     CFLAGS="$SAVE_CFLAGS"
+     echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
+@@ -2810,15 +3502,12 @@
+     SAVE_CFLAGS="$CFLAGS"
+     CFLAGS="$OPT_CFLAGS"
+     cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -2829,11 +3518,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2842,10 +3541,11 @@
+   ac_cv_try_cflags_ok=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_try_cflags_ok=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+     CFLAGS="$SAVE_CFLAGS"
+     echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
+@@ -2869,15 +3569,12 @@
+     SAVE_CFLAGS="$CFLAGS"
+     CFLAGS="$OPT_CFLAGS"
+     cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -2888,11 +3585,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2901,10 +3608,11 @@
+   ac_cv_try_cflags_ok=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_try_cflags_ok=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+     CFLAGS="$SAVE_CFLAGS"
+     echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
+@@ -2920,15 +3628,12 @@
+     SAVE_CFLAGS="$CFLAGS"
+     CFLAGS="$OPT_CFLAGS"
+     cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -2939,11 +3644,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -2952,10 +3667,11 @@
+   ac_cv_try_cflags_ok=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_try_cflags_ok=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+     CFLAGS="$SAVE_CFLAGS"
+     echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
+@@ -2970,15 +3686,12 @@
+     SAVE_CFLAGS="$CFLAGS"
+     CFLAGS="$OPT_CFLAGS"
+     cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -2989,11 +3702,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3002,10 +3725,11 @@
+   ac_cv_try_cflags_ok=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_try_cflags_ok=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+     CFLAGS="$SAVE_CFLAGS"
+     echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
+@@ -3032,15 +3756,12 @@
+     SAVE_CFLAGS="$CFLAGS"
+     CFLAGS="$OPT_CFLAGS"
+     cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -3051,11 +3772,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3064,10 +3795,11 @@
+   ac_cv_try_cflags_ok=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_try_cflags_ok=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+     CFLAGS="$SAVE_CFLAGS"
+     echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
+@@ -3083,15 +3815,12 @@
+     SAVE_CFLAGS="$CFLAGS"
+     CFLAGS="$OPT_CFLAGS"
+     cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -3102,11 +3831,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3115,10 +3854,11 @@
+   ac_cv_try_cflags_ok=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_try_cflags_ok=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+     CFLAGS="$SAVE_CFLAGS"
+     echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
+@@ -3134,80 +3874,134 @@
+ if test "${enable_shared+set}" = set; then
+   enableval="$enable_shared"
+   p=${PACKAGE-default}
+-case $enableval in
+-yes) enable_shared=yes ;;
+-no) enable_shared=no ;;
+-*)
+-  enable_shared=no
+-  # Look at the argument we got.  We use all the common list separators.
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+-  for pkg in $enableval; do
+-    if test "X$pkg" = "X$p"; then
+-      enable_shared=yes
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  ;;
+-esac
++    case $enableval in
++    yes) enable_shared=yes ;;
++    no) enable_shared=no ;;
++    *)
++      enable_shared=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_shared=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac
+ else
+   enable_shared=no
+ fi;
+ 
++
++
++
+ # Check whether --enable-static or --disable-static was given.
+ if test "${enable_static+set}" = set; then
+   enableval="$enable_static"
+   p=${PACKAGE-default}
+-case $enableval in
+-yes) enable_static=yes ;;
+-no) enable_static=no ;;
+-*)
+-  enable_static=no
+-  # Look at the argument we got.  We use all the common list separators.
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+-  for pkg in $enableval; do
+-    if test "X$pkg" = "X$p"; then
+-      enable_static=yes
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  ;;
+-esac
++    case $enableval in
++    yes) enable_static=yes ;;
++    no) enable_static=no ;;
++    *)
++     enable_static=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_static=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac
+ else
+   enable_static=yes
+ fi;
++
+ # Check whether --enable-fast-install or --disable-fast-install was given.
+ if test "${enable_fast_install+set}" = set; then
+   enableval="$enable_fast_install"
+   p=${PACKAGE-default}
+-case $enableval in
+-yes) enable_fast_install=yes ;;
+-no) enable_fast_install=no ;;
+-*)
+-  enable_fast_install=no
+-  # Look at the argument we got.  We use all the common list separators.
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+-  for pkg in $enableval; do
+-    if test "X$pkg" = "X$p"; then
+-      enable_fast_install=yes
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  ;;
+-esac
++    case $enableval in
++    yes) enable_fast_install=yes ;;
++    no) enable_fast_install=no ;;
++    *)
++      enable_fast_install=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_fast_install=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac
+ else
+   enable_fast_install=yes
+ fi;
+-# Find the correct PATH separator.  Usually this is `:', but
+-# DJGPP uses `;' like DOS.
+-if test "X${PATH_SEPARATOR+set}" != Xset; then
+-  UNAME=${UNAME-`uname 2>/dev/null`}
+-  case X$UNAME in
+-    *-DOS) lt_cv_sys_path_separator=';' ;;
+-    *)     lt_cv_sys_path_separator=':' ;;
+-  esac
+-  PATH_SEPARATOR=$lt_cv_sys_path_separator
++
++echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
++echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
++if test "${lt_cv_path_SED+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  # Loop through the user's path and test for sed and gsed.
++# Then use that list of sed's as ones to test for truncation.
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for lt_ac_prog in sed gsed; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
++      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
++        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
++      fi
++    done
++  done
++done
++lt_ac_max=0
++lt_ac_count=0
++# Add /usr/xpg4/bin/sed as it is typically found on Solaris
++# along with /bin/sed that truncates output.
++for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
++  test ! -f $lt_ac_sed && break
++  cat /dev/null > conftest.in
++  lt_ac_count=0
++  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
++  # Check for GNU sed and select it if it is found.
++  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
++    lt_cv_path_SED=$lt_ac_sed
++    break
++  fi
++  while true; do
++    cat conftest.in conftest.in >conftest.tmp
++    mv conftest.tmp conftest.in
++    cp conftest.in conftest.nl
++    echo >>conftest.nl
++    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
++    cmp -s conftest.out conftest.nl || break
++    # 10000 chars as input seems more than enough
++    test $lt_ac_count -gt 10 && break
++    lt_ac_count=`expr $lt_ac_count + 1`
++    if test $lt_ac_count -gt $lt_ac_max; then
++      lt_ac_max=$lt_ac_count
++      lt_cv_path_SED=$lt_ac_sed
++    fi
++  done
++done
++
+ fi
+ 
++SED=$lt_cv_path_SED
++echo "$as_me:$LINENO: result: $SED" >&5
++echo "${ECHO_T}$SED" >&6
++
+ 
+ # Check whether --with-gnu-ld or --without-gnu-ld was given.
+ if test "${with_gnu_ld+set}" = set; then
+@@ -3219,8 +4013,8 @@
+ ac_prog=ld
+ if test "$GCC" = yes; then
+   # Check if gcc -print-prog-name=ld gives a path.
+-  echo "$as_me:$LINENO: checking for ld used by GCC" >&5
+-echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
++  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
+   case $host in
+   *-*-mingw*)
+     # gcc leaves a trailing carriage return which upsets mingw
+@@ -3230,12 +4024,12 @@
+   esac
+   case $ac_prog in
+     # Accept absolute paths.
+-    [\\/]* | [A-Za-z]:[\\/]*)
++    [\\/]* | ?:[\\/]*)
+       re_direlt='/[^/][^/]*/\.\./'
+-      # Canonicalize the path of ld
+-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
++      # Canonicalize the pathname of ld
++      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
+       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
++	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
+       done
+       test -z "$LD" && LD="$ac_prog"
+       ;;
+@@ -3259,22 +4053,26 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   if test -z "$LD"; then
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+   for ac_dir in $PATH; do
++    IFS="$lt_save_ifs"
+     test -z "$ac_dir" && ac_dir=.
+     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+       lt_cv_path_LD="$ac_dir/$ac_prog"
+       # Check to see if the program is GNU ld.  I'd rather use --version,
+       # but apparently some GNU ld's only accept -v.
+       # Break only if it was the GNU/non-GNU ld that we prefer.
+-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
++      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
++      *GNU* | *'with BFD'*)
+ 	test "$with_gnu_ld" != no && break
+-      else
++	;;
++      *)
+ 	test "$with_gnu_ld" != yes && break
+-      fi
++	;;
++      esac
+     fi
+   done
+-  IFS="$ac_save_ifs"
++  IFS="$lt_save_ifs"
+ else
+   lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ fi
+@@ -3297,11 +4095,14 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
++case `$LD -v 2>&1 </dev/null` in
++*GNU* | *'with BFD'*)
+   lt_cv_prog_gnu_ld=yes
+-else
++  ;;
++*)
+   lt_cv_prog_gnu_ld=no
+-fi
++  ;;
++esac
+ fi
+ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
+ echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
+@@ -3318,7 +4119,20 @@
+ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
+ echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
+ reload_flag=$lt_cv_ld_reload_flag
+-test -n "$reload_flag" && reload_flag=" $reload_flag"
++case $reload_flag in
++"" | " "*) ;;
++*) reload_flag=" $reload_flag" ;;
++esac
++reload_cmds='$LD$reload_flag -o $output$reload_objs'
++case $host_os in
++  darwin*)
++    if test "$GCC" = yes; then
++      reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
++    else
++      reload_cmds='$LD$reload_flag -o $output$reload_objs'
++    fi
++    ;;
++esac
+ 
+ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
+ echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
+@@ -3329,35 +4143,42 @@
+   # Let the user override the test.
+   lt_cv_path_NM="$NM"
+ else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+   for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
++    IFS="$lt_save_ifs"
+     test -z "$ac_dir" && ac_dir=.
+-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
+-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
++    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
++    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+       # Check to see if the nm accepts a BSD-compat flag.
+       # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+       #   nm: unknown option "B" ignored
+       # Tru64's nm complains that /dev/null is an invalid object file
+-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
++      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++      */dev/null* | *'Invalid file or object type'*)
+ 	lt_cv_path_NM="$tmp_nm -B"
+ 	break
+-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+-	lt_cv_path_NM="$tmp_nm -p"
+-	break
+-      else
+-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+-	continue # so that we can try to find one that supports BSD flags
+-      fi
++        ;;
++      *)
++	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
++	*/dev/null*)
++	  lt_cv_path_NM="$tmp_nm -p"
++	  break
++	  ;;
++	*)
++	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++	  continue # so that we can try to find one that supports BSD flags
++	  ;;
++	esac
++      esac
+     fi
+   done
+-  IFS="$ac_save_ifs"
++  IFS="$lt_save_ifs"
+   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+ fi
+ fi
+-
++echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
++echo "${ECHO_T}$lt_cv_path_NM" >&6
+ NM="$lt_cv_path_NM"
+-echo "$as_me:$LINENO: result: $NM" >&5
+-echo "${ECHO_T}$NM" >&6
+ 
+ echo "$as_me:$LINENO: checking whether ln -s works" >&5
+ echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
+@@ -3370,8 +4191,8 @@
+ echo "${ECHO_T}no, using $LN_S" >&6
+ fi
+ 
+-echo "$as_me:$LINENO: checking how to recognise dependant libraries" >&5
+-echo $ECHO_N "checking how to recognise dependant libraries... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
++echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
+ if test "${lt_cv_deplibs_check_method+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -3385,7 +4206,7 @@
+ # 'pass_all' -- all dependencies passed with no checks.
+ # 'test_compile' -- check by making test program.
+ # 'file_magic [[regex]]' -- check by looking for files in library path
+-# which responds to the $file_magic_cmd with a given egrep regex.
++# which responds to the $file_magic_cmd with a given extended regex.
+ # If you have `file' or equivalent on your system and you're not sure
+ # whether `pass_all' will *always* work, you probably want this one.
+ 
+@@ -3398,31 +4219,30 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-bsdi4*)
++bsdi[45]*)
+   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
+   lt_cv_file_magic_cmd='/usr/bin/file -L'
+   lt_cv_file_magic_test_file=/shlib/libc.so
+   ;;
+ 
+-cygwin* | mingw* | pw32*)
++cygwin*)
++  # func_win32_libid is a shell function defined in ltmain.sh
++  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++  lt_cv_file_magic_cmd='func_win32_libid'
++  ;;
++
++mingw* | pw32*)
++  # Base MSYS/MinGW do not provide the 'file' command needed by
++  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
+   lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+   lt_cv_file_magic_cmd='$OBJDUMP -f'
+   ;;
+ 
+ darwin* | rhapsody*)
+-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+-  lt_cv_file_magic_cmd='/usr/bin/file -L'
+-  case "$host_os" in
+-  rhapsody* | darwin1.[012])
+-    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
+-    ;;
+-  *) # Darwin 1.3 on
+-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+-    ;;
+-  esac
++  lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-freebsd*)
++freebsd* | kfreebsd*-gnu)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     case $host_cpu in
+     i*86 )
+@@ -3442,44 +4262,44 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-hpux10.20*|hpux11*)
+-  lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
++hpux10.20* | hpux11*)
+   lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=/usr/lib/libc.sl
+-  ;;
+-
+-irix5* | irix6* | nonstopux*)
+-  case $host_os in
+-  irix5* | nonstopux*)
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
++  case "$host_cpu" in
++  ia64*)
++    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
++    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
++    ;;
++  hppa*64*)
++    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
++    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+     ;;
+   *)
+-    case $LD in
+-    *-32|*"-32 ") libmagic=32-bit;;
+-    *-n32|*"-n32 ") libmagic=N32;;
+-    *-64|*"-64 ") libmagic=64-bit;;
+-    *) libmagic=never-match;;
+-    esac
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[1234] dynamic lib MIPS - version 1"
++    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
++    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+     ;;
+   esac
+-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $LD in
++  *-32|*"-32 ") libmagic=32-bit;;
++  *-n32|*"-n32 ") libmagic=N32;;
++  *-64|*"-64 ") libmagic=64-bit;;
++  *) libmagic=never-match;;
++  esac
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ # This must be Linux ELF.
+-linux-gnu*)
++linux*)
+   lt_cv_deplibs_check_method=pass_all
+-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+   ;;
+ 
+ netbsd*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+   else
+-    lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so$'
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
+   fi
+   ;;
+ 
+@@ -3489,20 +4309,19 @@
+   lt_cv_file_magic_test_file=/usr/lib/libnls.so
+   ;;
+ 
++nto-qnx*)
++  lt_cv_deplibs_check_method=unknown
++  ;;
++
+ openbsd*)
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
+   else
+-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
++    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+   fi
+   ;;
+ 
+ osf3* | osf4* | osf5*)
+-  # this will be overridden with pass_all, but let us keep it just in case
+-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
+-  lt_cv_file_magic_test_file=/shlib/libc.so
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+@@ -3512,11 +4331,6 @@
+ 
+ solaris*)
+   lt_cv_deplibs_check_method=pass_all
+-  lt_cv_file_magic_test_file=/lib/libc.so
+-  ;;
+-
+-sysv5uw[78]* | sysv4*uw2*)
+-  lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+@@ -3537,8 +4351,15 @@
+     lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
+     lt_cv_file_magic_test_file=/lib/libc.so
+     ;;
++  siemens)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
+   esac
+   ;;
++
++sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
+ esac
+ 
+ fi
+@@ -3546,310 +4367,580 @@
+ echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
+ file_magic_cmd=$lt_cv_file_magic_cmd
+ deplibs_check_method=$lt_cv_deplibs_check_method
++test -z "$deplibs_check_method" && deplibs_check_method=unknown
+ 
+ 
+ 
+ 
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
+ 
++# Allow CC to be a program name with arguments.
++compiler=$CC
+ 
++# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
++if test "${enable_libtool_lock+set}" = set; then
++  enableval="$enable_libtool_lock"
+ 
+-# Check for command to grab the raw symbol name followed by C symbol from nm.
+-echo "$as_me:$LINENO: checking command to parse $NM output" >&5
+-echo $ECHO_N "checking command to parse $NM output... $ECHO_C" >&6
+-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-# These are sane defaults that work on at least a few old systems.
+-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+-
+-# Character class describing NM global symbol codes.
+-symcode='[BCDEGRST]'
+-
+-# Regexp to match symbols that can be accessed directly from C.
+-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+-
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
+-
+-# Transform an extracted symbol line into a proper C declaration
+-lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
+-
+-# Transform an extracted symbol line into symbol name and symbol address
+-lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++fi;
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+ 
+-# Define system-specific variables.
+-case $host_os in
+-aix*)
+-  symcode='[BCDT]'
+-  ;;
+-cygwin* | mingw* | pw32*)
+-  symcode='[ABCDGISTW]'
+-  ;;
+-hpux*) # Its linker distinguishes data from code symbols
+-  lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+-  lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+-  ;;
+-irix* | nonstopux*)
+-  symcode='[BCDEGRST]'
+-  ;;
+-solaris* | sysv5*)
+-  symcode='[BDT]'
++# Some flags need to be propagated to the compiler or linker for good
++# libtool support.
++case $host in
++ia64-*-hpux*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++    case `/usr/bin/file conftest.$ac_objext` in
++    *ELF-32*)
++      HPUX_IA64_MODE="32"
++      ;;
++    *ELF-64*)
++      HPUX_IA64_MODE="64"
++      ;;
++    esac
++  fi
++  rm -rf conftest*
+   ;;
+-sysv4)
+-  symcode='[DFNSTU]'
++*-*-irix6*)
++  # Find out which ABI we are using.
++  echo '#line 4412 "configure"' > conftest.$ac_ext
++  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++   if test "$lt_cv_prog_gnu_ld" = yes; then
++    case `/usr/bin/file conftest.$ac_objext` in
++    *32-bit*)
++      LD="${LD-ld} -melf32bsmip"
++      ;;
++    *N32*)
++      LD="${LD-ld} -melf32bmipn32"
++      ;;
++    *64-bit*)
++      LD="${LD-ld} -melf64bmip"
++      ;;
++    esac
++   else
++    case `/usr/bin/file conftest.$ac_objext` in
++    *32-bit*)
++      LD="${LD-ld} -32"
++      ;;
++    *N32*)
++      LD="${LD-ld} -n32"
++      ;;
++    *64-bit*)
++      LD="${LD-ld} -64"
++      ;;
++    esac
++   fi
++  fi
++  rm -rf conftest*
+   ;;
+-esac
+ 
+-# Handle CRLF in mingw tool chain
+-opt_cr=
+-case $host_os in
+-mingw*)
+-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
++x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++    case "`/usr/bin/file conftest.o`" in
++    *32-bit*)
++      case $host in
++        x86_64-*linux*)
++          LD="${LD-ld} -m elf_i386"
++          ;;
++        ppc64-*linux*|powerpc64-*linux*)
++          LD="${LD-ld} -m elf32ppclinux"
++          ;;
++        s390x-*linux*)
++          LD="${LD-ld} -m elf_s390"
++          ;;
++        sparc64-*linux*)
++          LD="${LD-ld} -m elf32_sparc"
++          ;;
++      esac
++      ;;
++    *64-bit*)
++      case $host in
++        x86_64-*linux*)
++          LD="${LD-ld} -m elf_x86_64"
++          ;;
++        ppc*-*linux*|powerpc*-*linux*)
++          LD="${LD-ld} -m elf64ppc"
++          ;;
++        s390*-*linux*)
++          LD="${LD-ld} -m elf64_s390"
++          ;;
++        sparc*-*linux*)
++          LD="${LD-ld} -m elf64_sparc"
++          ;;
++      esac
++      ;;
++    esac
++  fi
++  rm -rf conftest*
+   ;;
+-esac
+ 
+-# If we're using GNU nm, then use its standard symbol codes.
+-if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
+-  symcode='[ABCDGISTW]'
+-fi
++*-*-sco3.2v5*)
++  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
++  SAVE_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -belf"
++  echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
++echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
++if test "${lt_cv_cc_needs_belf+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-# Try without a prefix undercore, then with it.
+-for ac_symprfx in "" "_"; do
++     cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-  # Write the raw and C identifiers.
+-lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++int
++main ()
++{
+ 
+-  # Check to see that the pipe works correctly.
+-  pipe_works=no
+-  rm -f conftest*
+-  cat > conftest.$ac_ext <<EOF
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-char nm_test_var;
+-void nm_test_func(){}
+-#ifdef __cplusplus
++  ;
++  return 0;
+ }
+-#endif
+-int main(){nm_test_var='a';nm_test_func();return(0);}
+-EOF
+-
+-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); }; then
+-    # Now try to grab the symbols.
+-    nlist=conftest.nm
+-    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
+-  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && test -s "$nlist"; then
+-      # Try sorting and uniquifying the output.
+-      if sort "$nlist" | uniq > "$nlist"T; then
+-	mv -f "$nlist"T "$nlist"
+-      else
+-	rm -f "$nlist"T
+-      fi
+-
+-      # Make sure that we snagged all the symbols we need.
+-      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
+-	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
+-	  cat <<EOF > conftest.$ac_ext
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+-EOF
+-	  # Now generate the symbol file.
+-	  eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext'
+-
+-	  cat <<EOF >> conftest.$ac_ext
+-#if defined (__STDC__) && __STDC__
+-# define lt_ptr void *
+-#else
+-# define lt_ptr char *
+-# define const
+-#endif
+-
+-/* The mapping between symbol names and symbols. */
+-const struct {
+-  const char *name;
+-  lt_ptr address;
+-}
+-lt_preloaded_symbols[] =
+-{
+-EOF
+-	  sed "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
+-	  cat <<\EOF >> conftest.$ac_ext
+-  {0, (lt_ptr) 0}
+-};
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-EOF
+-	  # Now try linking the two files.
+-	  mv conftest.$ac_objext conftstm.$ac_objext
+-	  save_LIBS="$LIBS"
+-	  save_CFLAGS="$CFLAGS"
+-	  LIBS="conftstm.$ac_objext"
+-	  CFLAGS="$CFLAGS$no_builtin_flag"
+-	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && test -s conftest; then
+-	    pipe_works=yes
+-	  fi
+-	  LIBS="$save_LIBS"
+-	  CFLAGS="$save_CFLAGS"
+-	else
+-	  echo "cannot find nm_test_func in $nlist" >&5
+-	fi
+-      else
+-	echo "cannot find nm_test_var in $nlist" >&5
+-      fi
+-    else
+-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
+-    fi
+-  else
+-    echo "$progname: failed program was:" >&5
+-    cat conftest.$ac_ext >&5
+-  fi
+-  rm -f conftest* conftst*
++  (exit $ac_status); }; }; then
++  lt_cv_cc_needs_belf=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-  # Do not use the global_symbol_pipe unless it works.
+-  if test "$pipe_works" = yes; then
+-    break
+-  else
+-    lt_cv_sys_global_symbol_pipe=
++lt_cv_cc_needs_belf=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++     ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
++echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
++  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
++    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
++    CFLAGS="$SAVE_CFLAGS"
++  fi
++  ;;
++*-*-cygwin* | *-*-mingw* | *-*-pw32*)
++  if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
++set dummy ${ac_tool_prefix}dlltool; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_DLLTOOL+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$DLLTOOL"; then
++  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
+   fi
+ done
++done
+ 
+ fi
+-
+-global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
+-if test -z "$lt_cv_sys_global_symbol_pipe"; then
+-  global_symbol_to_cdecl=
+-  global_symbol_to_c_name_address=
+-else
+-  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
+-  global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
+ fi
+-if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
+-then
+-  echo "$as_me:$LINENO: result: failed" >&5
+-echo "${ECHO_T}failed" >&6
++DLLTOOL=$ac_cv_prog_DLLTOOL
++if test -n "$DLLTOOL"; then
++  echo "$as_me:$LINENO: result: $DLLTOOL" >&5
++echo "${ECHO_T}$DLLTOOL" >&6
+ else
+-  echo "$as_me:$LINENO: result: ok" >&5
+-echo "${ECHO_T}ok" >&6
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+ 
+-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
++fi
++if test -z "$ac_cv_prog_DLLTOOL"; then
++  ac_ct_DLLTOOL=$DLLTOOL
++  # Extract the first word of "dlltool", so it can be a program name with args.
++set dummy dlltool; ac_word=$2
++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_DLLTOOL+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-#include <stdlib.h>
+-#include <stdarg.h>
+-#include <string.h>
+-#include <float.h>
+-
+-_ACEOF
+-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+-  ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-  else
+-    ac_cpp_err=
++  if test -n "$ac_ct_DLLTOOL"; then
++  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
+   fi
++done
++done
++
++  test -z "$ac_cv_prog_ac_ct_DLLTOOL" && ac_cv_prog_ac_ct_DLLTOOL="false"
++fi
++fi
++ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
++if test -n "$ac_ct_DLLTOOL"; then
++  echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
++echo "${ECHO_T}$ac_ct_DLLTOOL" >&6
+ else
+-  ac_cpp_err=yes
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+-if test -z "$ac_cpp_err"; then
+-  ac_cv_header_stdc=yes
++
++  DLLTOOL=$ac_ct_DLLTOOL
+ else
+-  echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  ac_cv_header_stdc=no
++  DLLTOOL="$ac_cv_prog_DLLTOOL"
+ fi
+-rm -f conftest.err conftest.$ac_ext
+ 
+-if test $ac_cv_header_stdc = yes; then
+-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-#include <string.h>
++  if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
++set dummy ${ac_tool_prefix}as; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_AS+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$AS"; then
++  ac_cv_prog_AS="$AS" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_AS="${ac_tool_prefix}as"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
+ 
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep "memchr" >/dev/null 2>&1; then
+-  :
++fi
++fi
++AS=$ac_cv_prog_AS
++if test -n "$AS"; then
++  echo "$as_me:$LINENO: result: $AS" >&5
++echo "${ECHO_T}$AS" >&6
+ else
+-  ac_cv_header_stdc=no
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+-rm -f conftest*
+ 
+ fi
++if test -z "$ac_cv_prog_AS"; then
++  ac_ct_AS=$AS
++  # Extract the first word of "as", so it can be a program name with args.
++set dummy as; ac_word=$2
++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_AS+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_AS"; then
++  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_AS="as"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
+ 
+-if test $ac_cv_header_stdc = yes; then
+-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-#include <stdlib.h>
+-
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep "free" >/dev/null 2>&1; then
+-  :
++  test -z "$ac_cv_prog_ac_ct_AS" && ac_cv_prog_ac_ct_AS="false"
++fi
++fi
++ac_ct_AS=$ac_cv_prog_ac_ct_AS
++if test -n "$ac_ct_AS"; then
++  echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
++echo "${ECHO_T}$ac_ct_AS" >&6
+ else
+-  ac_cv_header_stdc=no
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
+ fi
+-rm -f conftest*
+ 
++  AS=$ac_ct_AS
++else
++  AS="$ac_cv_prog_AS"
+ fi
+ 
+-if test $ac_cv_header_stdc = yes; then
+-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+-  if test "$cross_compiling" = yes; then
+-  :
++  if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
++set dummy ${ac_tool_prefix}objdump; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_OBJDUMP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-#include <ctype.h>
+-#if ((' ' & 0x0FF) == 0x020)
+-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+-#else
+-# define ISLOWER(c) (('a' <= (c) && (c) <= 'i') \
+-                     || ('j' <= (c) && (c) <= 'r') \
+-                     || ('s' <= (c) && (c) <= 'z'))
+-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+-#endif
++  if test -n "$OBJDUMP"; then
++  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
+ 
+-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
++fi
++fi
++OBJDUMP=$ac_cv_prog_OBJDUMP
++if test -n "$OBJDUMP"; then
++  echo "$as_me:$LINENO: result: $OBJDUMP" >&5
++echo "${ECHO_T}$OBJDUMP" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_OBJDUMP"; then
++  ac_ct_OBJDUMP=$OBJDUMP
++  # Extract the first word of "objdump", so it can be a program name with args.
++set dummy objdump; ac_word=$2
++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_OBJDUMP+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_OBJDUMP"; then
++  ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_OBJDUMP="objdump"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_prog_ac_ct_OBJDUMP" && ac_cv_prog_ac_ct_OBJDUMP="false"
++fi
++fi
++ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
++if test -n "$ac_ct_OBJDUMP"; then
++  echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
++echo "${ECHO_T}$ac_ct_OBJDUMP" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  OBJDUMP=$ac_ct_OBJDUMP
++else
++  OBJDUMP="$ac_cv_prog_OBJDUMP"
++fi
++
++  ;;
++
++esac
++
++need_locks="$enable_libtool_lock"
++
++
++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
++  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.  */
++#include <stdlib.h>
++#include <stdarg.h>
++#include <string.h>
++#include <float.h>
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_header_stdc=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_header_stdc=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++if test $ac_cv_header_stdc = yes; then
++  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <string.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "memchr" >/dev/null 2>&1; then
++  :
++else
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
++
++fi
++
++if test $ac_cv_header_stdc = yes; then
++  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdlib.h>
++
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "free" >/dev/null 2>&1; then
++  :
++else
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
++
++fi
++
++if test $ac_cv_header_stdc = yes; then
++  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
++  if test "$cross_compiling" = yes; then
++  :
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <ctype.h>
++#if ((' ' & 0x0FF) == 0x020)
++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
++#else
++# define ISLOWER(c) \
++		   (('a' <= (c) && (c) <= 'i') \
++		     || ('j' <= (c) && (c) <= 'r') \
++		     || ('s' <= (c) && (c) <= 'z'))
++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
++#endif
++
++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+ int
+ main ()
+ {
+   int i;
+   for (i = 0; i < 256; i++)
+     if (XOR (islower (i), ISLOWER (i))
+-        || toupper (i) != TOUPPER (i))
++	|| toupper (i) != TOUPPER (i))
+       exit(2);
+   exit (0);
+ }
+@@ -3869,11 +4960,12 @@
+ else
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ( exit $ac_status )
+ ac_cv_header_stdc=no
+ fi
+-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+ fi
+@@ -3898,7 +4990,7 @@
+ 
+ 
+ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+-                  inttypes.h stdint.h unistd.h
++		  inttypes.h stdint.h unistd.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+@@ -3907,19 +4999,32 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+ 
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3928,10 +5033,11 @@
+   eval "$as_ac_Header=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ eval "$as_ac_Header=no"
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+@@ -3962,18 +5068,31 @@
+ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+ echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -3982,10 +5101,11 @@
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_header_compiler=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6
+ 
+@@ -3993,20 +5113,24 @@
+ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+ echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
++  grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+   else
+     ac_cpp_err=
+   fi
+@@ -4017,7 +5141,8 @@
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+   ac_header_preproc=no
+ fi
+ rm -f conftest.err conftest.$ac_ext
+@@ -4025,26 +5150,43 @@
+ echo "${ECHO_T}$ac_header_preproc" >&6
+ 
+ # So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc in
+-  yes:no )
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
+     { 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 preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
+-  no:yes )
++    { 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:* )
+     { 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:     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: 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;}
++    (
++      cat <<\_ASBOX
++## ------------------------------------------ ##
++## Report this to the AC_PACKAGE_NAME lists.  ##
++## ------------------------------------------ ##
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
+ esac
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  eval "$as_ac_Header=$ac_header_preproc"
++  eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+@@ -4059,159 +5201,65 @@
+ 
+ done
+ 
+-
+-
+-
+-
+-# Only perform the check for file, if the check method requires it
+-case $deplibs_check_method in
+-file_magic*)
+-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+-    echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
+-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
+-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
++ac_ext=cc
++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
++if test -n "$ac_tool_prefix"; then
++  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
++  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
++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
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  case $MAGIC_CMD in
+-  /*)
+-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+-  ;;
+-  ?:/*)
+-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
+-  ;;
+-  *)
+-  ac_save_MAGIC_CMD="$MAGIC_CMD"
+-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="/usr/bin:$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/${ac_tool_prefix}file; then
+-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+-      if test -n "$file_magic_test_file"; then
+-	case $deplibs_check_method in
+-	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+-	    egrep "$file_magic_regex" > /dev/null; then
+-	    :
+-	  else
+-	    cat <<EOF 1>&2
+-
+-*** Warning: the command libtool uses to detect shared libraries,
+-*** $file_magic_cmd, produces output that libtool cannot recognize.
+-*** The result is that libtool may fail to recognize shared libraries
+-*** as such.  This will affect the creation of libtool libraries that
+-*** depend on shared libraries, but programs linked with such libtool
+-*** libraries will work regardless of this problem.  Nevertheless, you
+-*** may want to report the problem to your system manager and/or to
+-*** bug-libtool@gnu.org
++  if test -n "$CXX"; then
++  ac_cv_prog_CXX="$CXX" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
+ 
+-EOF
+-	  fi ;;
+-	esac
+-      fi
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  MAGIC_CMD="$ac_save_MAGIC_CMD"
+-  ;;
+-esac
+ fi
+-
+-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+-if test -n "$MAGIC_CMD"; then
+-  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+-echo "${ECHO_T}$MAGIC_CMD" >&6
++fi
++CXX=$ac_cv_prog_CXX
++if test -n "$CXX"; then
++  echo "$as_me:$LINENO: result: $CXX" >&5
++echo "${ECHO_T}$CXX" >&6
+ else
+   echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-if test -z "$lt_cv_path_MAGIC_CMD"; then
+-  if test -n "$ac_tool_prefix"; then
+-    echo "$as_me:$LINENO: checking for file" >&5
+-echo $ECHO_N "checking for file... $ECHO_C" >&6
+-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
++    test -n "$CXX" && break
++  done
++fi
++if test -z "$CXX"; then
++  ac_ct_CXX=$CXX
++  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++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
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  case $MAGIC_CMD in
+-  /*)
+-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+-  ;;
+-  ?:/*)
+-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
+-  ;;
+-  *)
+-  ac_save_MAGIC_CMD="$MAGIC_CMD"
+-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="/usr/bin:$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/file; then
+-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
+-      if test -n "$file_magic_test_file"; then
+-	case $deplibs_check_method in
+-	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+-	    egrep "$file_magic_regex" > /dev/null; then
+-	    :
+-	  else
+-	    cat <<EOF 1>&2
+-
+-*** Warning: the command libtool uses to detect shared libraries,
+-*** $file_magic_cmd, produces output that libtool cannot recognize.
+-*** The result is that libtool may fail to recognize shared libraries
+-*** as such.  This will affect the creation of libtool libraries that
+-*** depend on shared libraries, but programs linked with such libtool
+-*** libraries will work regardless of this problem.  Nevertheless, you
+-*** may want to report the problem to your system manager and/or to
+-*** bug-libtool@gnu.org
+-
+-EOF
+-	  fi ;;
+-	esac
+-      fi
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  MAGIC_CMD="$ac_save_MAGIC_CMD"
+-  ;;
+-esac
+-fi
+-
+-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+-if test -n "$MAGIC_CMD"; then
+-  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+-echo "${ECHO_T}$MAGIC_CMD" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
+-
+-  else
+-    MAGIC_CMD=:
+-  fi
+-fi
+-
+-  fi
+-  ;;
+-esac
+-
+-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
+-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
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$RANLIB"; then
+-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
++  if test -n "$ac_ct_CXX"; then
++  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
+ else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+@@ -4220,7 +5268,7 @@
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
++    ac_cv_prog_ac_ct_CXX="$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+@@ -4229,789 +5277,11344 @@
+ 
+ fi
+ fi
+-RANLIB=$ac_cv_prog_RANLIB
+-if test -n "$RANLIB"; then
+-  echo "$as_me:$LINENO: result: $RANLIB" >&5
+-echo "${ECHO_T}$RANLIB" >&6
++ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
++if test -n "$ac_ct_CXX"; then
++  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
++echo "${ECHO_T}$ac_ct_CXX" >&6
+ else
+   echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+ 
+-fi
+-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
+-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
+-  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.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_RANLIB="ranlib"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
++  test -n "$ac_ct_CXX" && break
++done
++test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
++
++  CXX=$ac_ct_CXX
++fi
++
++
++# Provide some information about the compiler.
++echo "$as_me:$LINENO:" \
++     "checking for C++ compiler version" >&5
++ac_compiler=`set X $ac_compile; echo $2`
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
++  (eval $ac_compiler --version </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
++  (eval $ac_compiler -v </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
++  (eval $ac_compiler -V </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++
++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
++  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.  */
++
++int
++main ()
++{
++#ifndef __GNUC__
++       choke me
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_compiler_gnu=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_compiler_gnu=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
++
++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
++CXXFLAGS="-g"
++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
++  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.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_prog_cxx_g=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_prog_cxx_g=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++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
++  if test "$GXX" = yes; then
++    CXXFLAGS="-g -O2"
++  else
++    CXXFLAGS="-g"
++  fi
++else
++  if test "$GXX" = yes; then
++    CXXFLAGS="-O2"
++  else
++    CXXFLAGS=
++  fi
++fi
++for ac_declaration in \
++   '' \
++   'extern "C" void std::exit (int) throw (); using std::exit;' \
++   'extern "C" void std::exit (int); using std::exit;' \
++   'extern "C" void exit (int) throw ();' \
++   'extern "C" void exit (int);' \
++   'void exit (int);'
++do
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_declaration
++#include <stdlib.h>
++int
++main ()
++{
++exit (42);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++continue
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_declaration
++int
++main ()
++{
++exit (42);
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  break
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++rm -f conftest*
++if test -n "$ac_declaration"; then
++  echo '#ifdef __cplusplus' >>confdefs.h
++  echo $ac_declaration      >>confdefs.h
++  echo '#endif'             >>confdefs.h
++fi
++
++ac_ext=cc
++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
++
++depcc="$CXX"  am_compiler_list=
++
++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
++  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
++  # making bogus files that we don't know about and never remove.  For
++  # instance it was reported that on HP-UX the gcc test will end up
++  # making a dummy file named `D' -- because `-MD' means `put the output
++  # in D'.
++  mkdir conftest.dir
++  # Copy depcomp to subdir because otherwise we won't find it if we're
++  # using a relative directory.
++  cp "$am_depcomp" conftest.dir
++  cd conftest.dir
++  # We will build objects and dependencies in a subdirectory because
++  # it helps to detect inapplicable dependency modes.  For instance
++  # both Tru64's cc and ICC support -MD to output dependencies as a
++  # side effect of compilation, but ICC will put the dependencies in
++  # the current directory while Tru64 will put them in the object
++  # directory.
++  mkdir sub
++
++  am_cv_CXX_dependencies_compiler_type=none
++  if test "$am_compiler_list" = ""; then
++     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
++  fi
++  for depmode in $am_compiler_list; do
++    # Setup a source with many dependencies, because some compilers
++    # like to wrap large dependency lists on column 80 (with \), and
++    # we should not choose a depcomp mode which is confused by this.
++    #
++    # We need to recreate these files for each test, as the compiler may
++    # overwrite some of them when testing with obscure command lines.
++    # This happens at least with the AIX C compiler.
++    : > sub/conftest.c
++    for i in 1 2 3 4 5 6; do
++      echo '#include "conftst'$i'.h"' >> sub/conftest.c
++      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
++      # Solaris 8's {/usr,}/bin/sh.
++      touch sub/conftst$i.h
++    done
++    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
++
++    case $depmode in
++    nosideeffect)
++      # after this tag, mechanisms are not by side-effect, so they'll
++      # only be used when explicitly requested
++      if test "x$enable_dependency_tracking" = xyes; then
++	continue
++      else
++	break
++      fi
++      ;;
++    none) break ;;
++    esac
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.
++    if depmode=$depmode \
++       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
++       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++         >/dev/null 2>conftest.err &&
++       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
++       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
++      # icc doesn't choke on unknown options, it will just issue warnings
++      # or remarks (even with -Werror).  So we grep stderr for any message
++      # that says an option was ignored or not supported.
++      # When given -MP, icc 7.0 and 7.1 complain thusly:
++      #   icc: Command line warning: ignoring option '-M'; no argument required
++      # The diagnosis changed in icc 8.0:
++      #   icc: Command line remark: option '-MP' not supported
++      if (grep 'ignoring option' conftest.err ||
++          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
++        am_cv_CXX_dependencies_compiler_type=$depmode
++        break
++      fi
++    fi
++  done
++
++  cd ..
++  rm -rf conftest.dir
++else
++  am_cv_CXX_dependencies_compiler_type=none
++fi
++
++fi
++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
++  test "x$enable_dependency_tracking" != xno \
++  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
++  am__fastdepCXX_TRUE=
++  am__fastdepCXX_FALSE='#'
++else
++  am__fastdepCXX_TRUE='#'
++  am__fastdepCXX_FALSE=
++fi
++
++
++
++
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++    (test "X$CXX" != "Xg++"))) ; then
++  ac_ext=cc
++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
++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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++      # Double quotes because CXXCPP needs to be expanded
++    for CXXCPP in "$CXX -E" "/lib/cpp"
++    do
++      ac_preproc_ok=false
++for ac_cxx_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++		     Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_cxx_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether non-existent headers
++  # can be detected and how.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_cxx_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  # Broken: success on invalid input.
++continue
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++  break
++fi
++
++    done
++    ac_cv_prog_CXXCPP=$CXXCPP
++
++fi
++  CXXCPP=$ac_cv_prog_CXXCPP
++else
++  ac_cv_prog_CXXCPP=$CXXCPP
++fi
++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
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++		     Syntax error
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_cxx_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether non-existent headers
++  # can be detected and how.
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <ac_nonexistent.h>
++_ACEOF
++if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&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
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null; then
++  if test -s conftest.err; then
++    ac_cpp_err=$ac_cxx_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
++  else
++    ac_cpp_err=
++  fi
++else
++  ac_cpp_err=yes
++fi
++if test -z "$ac_cpp_err"; then
++  # Broken: success on invalid input.
++continue
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then
++  :
++else
++  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
++See \`config.log' for more details." >&5
++echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++ac_ext=cc
++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
++
++fi
++
++
++ac_ext=f
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
++if test -n "$ac_tool_prefix"; then
++  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
++  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
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_F77+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$F77"; then
++  ac_cv_prog_F77="$F77" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++F77=$ac_cv_prog_F77
++if test -n "$F77"; then
++  echo "$as_me:$LINENO: result: $F77" >&5
++echo "${ECHO_T}$F77" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++    test -n "$F77" && break
++  done
++fi
++if test -z "$F77"; then
++  ac_ct_F77=$F77
++  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++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_F77+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_F77"; then
++  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_F77="$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++ac_ct_F77=$ac_cv_prog_ac_ct_F77
++if test -n "$ac_ct_F77"; then
++  echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
++echo "${ECHO_T}$ac_ct_F77" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  test -n "$ac_ct_F77" && break
++done
++
++  F77=$ac_ct_F77
++fi
++
++
++# Provide some information about the compiler.
++echo "$as_me:5998:" \
++     "checking for Fortran 77 compiler version" >&5
++ac_compiler=`set X $ac_compile; echo $2`
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
++  (eval $ac_compiler --version </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
++  (eval $ac_compiler -v </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
++  (eval $ac_compiler -V </dev/null >&5) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++rm -f a.out
++
++# If we don't use `.F' as extension, the preprocessor is not run on the
++# input file.  (Note that this only needs to work for GNU compilers.)
++ac_save_ext=$ac_ext
++ac_ext=F
++echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
++if test "${ac_cv_f77_compiler_gnu+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++      program main
++#ifndef __GNUC__
++       choke me
++#endif
++
++      end
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_compiler_gnu=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_compiler_gnu=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_f77_compiler_gnu=$ac_compiler_gnu
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
++ac_ext=$ac_save_ext
++ac_test_FFLAGS=${FFLAGS+set}
++ac_save_FFLAGS=$FFLAGS
++FFLAGS=
++echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
++echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
++if test "${ac_cv_prog_f77_g+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  FFLAGS=-g
++cat >conftest.$ac_ext <<_ACEOF
++      program main
++
++      end
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_prog_f77_g=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_prog_f77_g=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++fi
++echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
++echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
++if test "$ac_test_FFLAGS" = set; then
++  FFLAGS=$ac_save_FFLAGS
++elif test $ac_cv_prog_f77_g = yes; then
++  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
++    FFLAGS="-g -O2"
++  else
++    FFLAGS="-g"
++  fi
++else
++  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
++    FFLAGS="-O2"
++  else
++    FFLAGS=
++  fi
++fi
++
++G77=`test $ac_compiler_gnu = yes && echo yes`
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
++
++# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
++
++# find the maximum length of command line arguments
++echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
++echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
++if test "${lt_cv_sys_max_cmd_len+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++    i=0
++  teststring="ABCD"
++
++  case $build_os in
++  msdosdjgpp*)
++    # On DJGPP, this test can blow up pretty badly due to problems in libc
++    # (any single argument exceeding 2000 bytes causes a buffer overrun
++    # during glob expansion).  Even if it were fixed, the result of this
++    # check would be larger than it should be.
++    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
++    ;;
++
++  gnu*)
++    # Under GNU Hurd, this test is not required because there is
++    # no limit to the length of command line arguments.
++    # Libtool will interpret -1 as no limit whatsoever
++    lt_cv_sys_max_cmd_len=-1;
++    ;;
++
++  cygwin* | mingw*)
++    # On Win9x/ME, this test blows up -- it succeeds, but takes
++    # about 5 minutes as the teststring grows exponentially.
++    # Worse, since 9x/ME are not pre-emptively multitasking,
++    # you end up with a "frozen" computer, even though with patience
++    # the test eventually succeeds (with a max line length of 256k).
++    # Instead, let's just punt: use the minimum linelength reported by
++    # all of the supported platforms: 8192 (on NT/2K/XP).
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
++
++  amigaos*)
++    # On AmigaOS with pdksh, this test takes hours, literally.
++    # So we just punt and use a minimum line length of 8192.
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
++
++  netbsd* | freebsd* | openbsd* | darwin* )
++    # This has been around since 386BSD, at least.  Likely further.
++    if test -x /sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++    elif test -x /usr/sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++    else
++      lt_cv_sys_max_cmd_len=65536 # usable default for *BSD
++    fi
++    # And add a safety zone
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++    ;;
++
++ *)
++    # If test is not a shell built-in, we'll probably end up computing a
++    # maximum length that is only half of the actual maximum length, but
++    # we can't tell.
++    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
++	       = "XX$teststring") >/dev/null 2>&1 &&
++	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
++	    lt_cv_sys_max_cmd_len=$new_result &&
++	    test $i != 17 # 1/2 MB should be enough
++    do
++      i=`expr $i + 1`
++      teststring=$teststring$teststring
++    done
++    teststring=
++    # Add a significant safety factor because C++ compilers can tack on massive
++    # amounts of additional arguments before passing them to the linker.
++    # It appears as though 1/2 is a usable value.
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++    ;;
++  esac
++
++fi
++
++if test -n $lt_cv_sys_max_cmd_len ; then
++  echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
++echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
++else
++  echo "$as_me:$LINENO: result: none" >&5
++echo "${ECHO_T}none" >&6
++fi
++
++
++
++
++# Check for command to grab the raw symbol name followed by C symbol from nm.
++echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
++echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
++if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++
++# These are sane defaults that work on at least a few old systems.
++# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
++
++# Character class describing NM global symbol codes.
++symcode='[BCDEGRST]'
++
++# Regexp to match symbols that can be accessed directly from C.
++sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
++
++# Transform the above into a raw symbol and a C symbol.
++symxfrm='\1 \2\3 \3'
++
++# Transform an extracted symbol line into a proper C declaration
++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
++
++# Transform an extracted symbol line into symbol name and symbol address
++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++
++# Define system-specific variables.
++case $host_os in
++aix*)
++  symcode='[BCDT]'
++  ;;
++cygwin* | mingw* | pw32*)
++  symcode='[ABCDGISTW]'
++  ;;
++hpux*) # Its linker distinguishes data from code symbols
++  if test "$host_cpu" = ia64; then
++    symcode='[ABCDEGRST]'
++  fi
++  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++  ;;
++linux*)
++  if test "$host_cpu" = ia64; then
++    symcode='[ABCDGIRSTW]'
++    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++  fi
++  ;;
++irix* | nonstopux*)
++  symcode='[BCDEGRST]'
++  ;;
++osf*)
++  symcode='[BCDEGQRST]'
++  ;;
++solaris* | sysv5*)
++  symcode='[BDRT]'
++  ;;
++sysv4)
++  symcode='[DFNSTU]'
++  ;;
++esac
++
++# Handle CRLF in mingw tool chain
++opt_cr=
++case $build_os in
++mingw*)
++  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
++  ;;
++esac
++
++# If we're using GNU nm, then use its standard symbol codes.
++case `$NM -V 2>&1` in
++*GNU* | *'with BFD'*)
++  symcode='[ABCDGIRSTW]' ;;
++esac
++
++# Try without a prefix undercore, then with it.
++for ac_symprfx in "" "_"; do
++
++  # Write the raw and C identifiers.
++  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++
++  # Check to see that the pipe works correctly.
++  pipe_works=no
++
++  rm -f conftest*
++  cat > conftest.$ac_ext <<EOF
++#ifdef __cplusplus
++extern "C" {
++#endif
++char nm_test_var;
++void nm_test_func(){}
++#ifdef __cplusplus
++}
++#endif
++int main(){nm_test_var='a';nm_test_func();return(0);}
++EOF
++
++  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++    # Now try to grab the symbols.
++    nlist=conftest.nm
++    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
++  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s "$nlist"; then
++      # Try sorting and uniquifying the output.
++      if sort "$nlist" | uniq > "$nlist"T; then
++	mv -f "$nlist"T "$nlist"
++      else
++	rm -f "$nlist"T
++      fi
++
++      # Make sure that we snagged all the symbols we need.
++      if grep ' nm_test_var$' "$nlist" >/dev/null; then
++	if grep ' nm_test_func$' "$nlist" >/dev/null; then
++	  cat <<EOF > conftest.$ac_ext
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++EOF
++	  # Now generate the symbol file.
++	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
++
++	  cat <<EOF >> conftest.$ac_ext
++#if defined (__STDC__) && __STDC__
++# define lt_ptr_t void *
++#else
++# define lt_ptr_t char *
++# define const
++#endif
++
++/* The mapping between symbol names and symbols. */
++const struct {
++  const char *name;
++  lt_ptr_t address;
++}
++lt_preloaded_symbols[] =
++{
++EOF
++	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
++	  cat <<\EOF >> conftest.$ac_ext
++  {0, (lt_ptr_t) 0}
++};
++
++#ifdef __cplusplus
++}
++#endif
++EOF
++	  # Now try linking the two files.
++	  mv conftest.$ac_objext conftstm.$ac_objext
++	  lt_save_LIBS="$LIBS"
++	  lt_save_CFLAGS="$CFLAGS"
++	  LIBS="conftstm.$ac_objext"
++	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
++	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext}; then
++	    pipe_works=yes
++	  fi
++	  LIBS="$lt_save_LIBS"
++	  CFLAGS="$lt_save_CFLAGS"
++	else
++	  echo "cannot find nm_test_func in $nlist" >&5
++	fi
++      else
++	echo "cannot find nm_test_var in $nlist" >&5
++      fi
++    else
++      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
++    fi
++  else
++    echo "$progname: failed program was:" >&5
++    cat conftest.$ac_ext >&5
++  fi
++  rm -f conftest* conftst*
++
++  # Do not use the global_symbol_pipe unless it works.
++  if test "$pipe_works" = yes; then
++    break
++  else
++    lt_cv_sys_global_symbol_pipe=
++  fi
++done
++
++fi
++
++if test -z "$lt_cv_sys_global_symbol_pipe"; then
++  lt_cv_sys_global_symbol_to_cdecl=
++fi
++if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
++  echo "$as_me:$LINENO: result: failed" >&5
++echo "${ECHO_T}failed" >&6
++else
++  echo "$as_me:$LINENO: result: ok" >&5
++echo "${ECHO_T}ok" >&6
++fi
++
++echo "$as_me:$LINENO: checking for objdir" >&5
++echo $ECHO_N "checking for objdir... $ECHO_C" >&6
++if test "${lt_cv_objdir+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  rm -f .libs 2>/dev/null
++mkdir .libs 2>/dev/null
++if test -d .libs; then
++  lt_cv_objdir=.libs
++else
++  # MS-DOS does not allow filenames that begin with a dot.
++  lt_cv_objdir=_libs
++fi
++rmdir .libs 2>/dev/null
++fi
++echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
++echo "${ECHO_T}$lt_cv_objdir" >&6
++objdir=$lt_cv_objdir
++
++
++
++
++
++case $host_os in
++aix3*)
++  # AIX sometimes has problems with the GCC collect2 program.  For some
++  # reason, if we set the COLLECT_NAMES environment variable, the problems
++  # vanish in a puff of smoke.
++  if test "X${COLLECT_NAMES+set}" != Xset; then
++    COLLECT_NAMES=
++    export COLLECT_NAMES
++  fi
++  ;;
++esac
++
++# Sed substitution that helps us do robust quoting.  It backslashifies
++# metacharacters that are still active within double-quoted strings.
++Xsed='sed -e s/^X//'
++sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
++
++# Same as above, but do not quote variable references.
++double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
++
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++
++# Sed substitution to avoid accidental globbing in evaled expressions
++no_glob_subst='s/\*/\\\*/g'
++
++# Constants:
++rm="rm -f"
++
++# Global variables:
++default_ofile=libtool
++can_build_shared=yes
++
++# All known linkers require a `.a' archive for static linking (except M$VC,
++# which needs '.lib').
++libext=a
++ltmain="$ac_aux_dir/ltmain.sh"
++ofile="$default_ofile"
++with_gnu_ld="$lt_cv_prog_gnu_ld"
++
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ar; ac_word=$2
++echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
++if test "${ac_cv_prog_AR+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$AR"; then
++  ac_cv_prog_AR="$AR" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_AR="${ac_tool_prefix}ar"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++AR=$ac_cv_prog_AR
++if test -n "$AR"; then
++  echo "$as_me:$LINENO: result: $AR" >&5
++echo "${ECHO_T}$AR" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++if test -z "$ac_cv_prog_AR"; then
++  ac_ct_AR=$AR
++  # Extract the first word of "ar", so it can be a program name with args.
++set dummy ar; ac_word=$2
++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_AR+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_AR"; then
++  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_AR="ar"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
++fi
++fi
++ac_ct_AR=$ac_cv_prog_ac_ct_AR
++if test -n "$ac_ct_AR"; then
++  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
++echo "${ECHO_T}$ac_ct_AR" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  AR=$ac_ct_AR
++else
++  AR="$ac_cv_prog_AR"
++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
++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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$RANLIB"; then
++  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++RANLIB=$ac_cv_prog_RANLIB
++if test -n "$RANLIB"; then
++  echo "$as_me:$LINENO: result: $RANLIB" >&5
++echo "${ECHO_T}$RANLIB" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++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
++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
++  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.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_RANLIB="ranlib"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
++fi
++fi
++ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
++if test -n "$ac_ct_RANLIB"; then
++  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
++echo "${ECHO_T}$ac_ct_RANLIB" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  RANLIB=$ac_ct_RANLIB
++else
++  RANLIB="$ac_cv_prog_RANLIB"
++fi
++
++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
++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
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$STRIP"; then
++  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++fi
++fi
++STRIP=$ac_cv_prog_STRIP
++if test -n "$STRIP"; then
++  echo "$as_me:$LINENO: result: $STRIP" >&5
++echo "${ECHO_T}$STRIP" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++fi
++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
++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
++  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.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
++  for ac_exec_ext in '' $ac_executable_extensions; do
++  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++    ac_cv_prog_ac_ct_STRIP="strip"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++
++  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
++fi
++fi
++ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
++if test -n "$ac_ct_STRIP"; then
++  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++echo "${ECHO_T}$ac_ct_STRIP" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  STRIP=$ac_ct_STRIP
++else
++  STRIP="$ac_cv_prog_STRIP"
++fi
++
++
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
++
++# Set sane defaults for various variables
++test -z "$AR" && AR=ar
++test -z "$AR_FLAGS" && AR_FLAGS=cru
++test -z "$AS" && AS=as
++test -z "$CC" && CC=cc
++test -z "$LTCC" && LTCC=$CC
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++test -z "$LD" && LD=ld
++test -z "$LN_S" && LN_S="ln -s"
++test -z "$MAGIC_CMD" && MAGIC_CMD=file
++test -z "$NM" && NM=nm
++test -z "$SED" && SED=sed
++test -z "$OBJDUMP" && OBJDUMP=objdump
++test -z "$RANLIB" && RANLIB=:
++test -z "$STRIP" && STRIP=:
++test -z "$ac_objext" && ac_objext=o
++
++# Determine commands to create old-style static archives.
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++old_postinstall_cmds='chmod 644 $oldlib'
++old_postuninstall_cmds=
++
++if test -n "$RANLIB"; then
++  case $host_os in
++  openbsd*)
++    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
++    ;;
++  *)
++    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++    ;;
++  esac
++  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++fi
++
++cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++
++# Only perform the check for file, if the check method requires it
++case $deplibs_check_method in
++file_magic*)
++  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
++    echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
++echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $MAGIC_CMD in
++[\\/*] |  ?:[\\/]*)
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++  ;;
++*)
++  lt_save_MAGIC_CMD="$MAGIC_CMD"
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
++  for ac_dir in $ac_dummy; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/${ac_tool_prefix}file; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
++      if test -n "$file_magic_test_file"; then
++	case $deplibs_check_method in
++	"file_magic "*)
++	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++	    $EGREP "$file_magic_regex" > /dev/null; then
++	    :
++	  else
++	    cat <<EOF 1>&2
++
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool@gnu.org
++
++EOF
++	  fi ;;
++	esac
++      fi
++      break
++    fi
++  done
++  IFS="$lt_save_ifs"
++  MAGIC_CMD="$lt_save_MAGIC_CMD"
++  ;;
++esac
++fi
++
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++echo "${ECHO_T}$MAGIC_CMD" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++if test -z "$lt_cv_path_MAGIC_CMD"; then
++  if test -n "$ac_tool_prefix"; then
++    echo "$as_me:$LINENO: checking for file" >&5
++echo $ECHO_N "checking for file... $ECHO_C" >&6
++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $MAGIC_CMD in
++[\\/*] |  ?:[\\/]*)
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++  ;;
++*)
++  lt_save_MAGIC_CMD="$MAGIC_CMD"
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
++  for ac_dir in $ac_dummy; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/file; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/file"
++      if test -n "$file_magic_test_file"; then
++	case $deplibs_check_method in
++	"file_magic "*)
++	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++	    $EGREP "$file_magic_regex" > /dev/null; then
++	    :
++	  else
++	    cat <<EOF 1>&2
++
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool@gnu.org
++
++EOF
++	  fi ;;
++	esac
++      fi
++      break
++    fi
++  done
++  IFS="$lt_save_ifs"
++  MAGIC_CMD="$lt_save_MAGIC_CMD"
++  ;;
++esac
++fi
++
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++echo "${ECHO_T}$MAGIC_CMD" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++
++  else
++    MAGIC_CMD=:
++  fi
++fi
++
++  fi
++  ;;
++esac
++
++enable_dlopen=no
++enable_win32_dll=yes
++
++# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
++if test "${enable_libtool_lock+set}" = set; then
++  enableval="$enable_libtool_lock"
++
++fi;
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++
++
++# Check whether --with-pic or --without-pic was given.
++if test "${with_pic+set}" = set; then
++  withval="$with_pic"
++  pic_mode="$withval"
++else
++  pic_mode=default
++fi;
++test -z "$pic_mode" && pic_mode=default
++
++# Use C for the default configuration in the libtool script
++tagname=
++lt_save_CC="$CC"
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
++# Source file extension for C test sources.
++ac_ext=c
++
++# Object file extension for compiled C test sources.
++objext=o
++objext=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="int some_variable = 0;\n"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code='int main(){return(0);}\n'
++
++
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
++
++# Allow CC to be a program name with arguments.
++compiler=$CC
++
++
++#
++# Check for any special shared library compilation flags.
++#
++lt_prog_cc_shlib=
++if test "$GCC" = no; then
++  case $host_os in
++  sco3.2v5*)
++    lt_prog_cc_shlib='-belf'
++    ;;
++  esac
++fi
++if test -n "$lt_prog_cc_shlib"; then
++  { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5
++echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;}
++  if echo "$old_CC $old_CFLAGS " | grep "[ 	]$lt_prog_cc_shlib[ 	]" >/dev/null; then :
++  else
++    { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
++echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
++    lt_cv_prog_cc_can_build_shared=no
++  fi
++fi
++
++
++#
++# Check to make sure the static flag actually works.
++#
++echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
++echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6
++if test "${lt_prog_compiler_static_works+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_static_works=no
++   save_LDFLAGS="$LDFLAGS"
++   LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
++   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test -s conftest.err; then
++       # Append any errors to the config.log.
++       cat conftest.err 1>&5
++     else
++       lt_prog_compiler_static_works=yes
++     fi
++   fi
++   $rm conftest*
++   LDFLAGS="$save_LDFLAGS"
++
++fi
++echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
++echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
++
++if test x"$lt_prog_compiler_static_works" = xyes; then
++    :
++else
++    lt_prog_compiler_static=
++fi
++
++
++
++
++lt_prog_compiler_no_builtin_flag=
++
++if test "$GCC" = yes; then
++  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
++
++
++echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
++if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_prog_compiler_rtti_exceptions=no
++  ac_outfile=conftest.$ac_objext
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="-fno-rtti -fno-exceptions"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:7055: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:7059: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s conftest.err; then
++       lt_cv_prog_compiler_rtti_exceptions=yes
++     fi
++   fi
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
++
++if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
++    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
++else
++    :
++fi
++
++fi
++
++lt_prog_compiler_wl=
++lt_prog_compiler_pic=
++lt_prog_compiler_static=
++
++echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++
++  if test "$GCC" = yes; then
++    lt_prog_compiler_wl='-Wl,'
++    lt_prog_compiler_static='-static'
++
++    case $host_os in
++      aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static='-Bstatic'
++      fi
++      ;;
++
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
++      ;;
++
++    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic='-DDLL_EXPORT'
++      ;;
++
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_prog_compiler_pic='-fno-common'
++      ;;
++
++    msdosdjgpp*)
++      # Just because we use GCC doesn't mean we suddenly get shared libraries
++      # on systems that don't support them.
++      lt_prog_compiler_can_build_shared=no
++      enable_shared=no
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	lt_prog_compiler_pic=-Kconform_pic
++      fi
++      ;;
++
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic='-fPIC'
++	;;
++      esac
++      ;;
++
++    *)
++      lt_prog_compiler_pic='-fPIC'
++      ;;
++    esac
++  else
++    # PORTME Check for flag to pass linker flags through the system compiler.
++    case $host_os in
++    aix*)
++      lt_prog_compiler_wl='-Wl,'
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static='-Bstatic'
++      else
++	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
++      fi
++      ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case "$cc_basename" in
++         xlc*)
++         lt_prog_compiler_pic='-qnocommon'
++         lt_prog_compiler_wl='-Wl,'
++         ;;
++       esac
++       ;;
++
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic='-DDLL_EXPORT'
++      ;;
++
++    hpux9* | hpux10* | hpux11*)
++      lt_prog_compiler_wl='-Wl,'
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic='+Z'
++	;;
++      esac
++      # Is there a better lt_prog_compiler_static that works with the bundled CC?
++      lt_prog_compiler_static='${wl}-a ${wl}archive'
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      lt_prog_compiler_wl='-Wl,'
++      # PIC (with -KPIC) is the default.
++      lt_prog_compiler_static='-non_shared'
++      ;;
++
++    newsos6)
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
++
++    linux*)
++      case $CC in
++      icc* | ecc*)
++	lt_prog_compiler_wl='-Wl,'
++	lt_prog_compiler_pic='-KPIC'
++	lt_prog_compiler_static='-static'
++        ;;
++      ccc*)
++        lt_prog_compiler_wl='-Wl,'
++        # All Alpha code is PIC.
++        lt_prog_compiler_static='-non_shared'
++        ;;
++      esac
++      ;;
++
++    osf3* | osf4* | osf5*)
++      lt_prog_compiler_wl='-Wl,'
++      # All OSF/1 code is PIC.
++      lt_prog_compiler_static='-non_shared'
++      ;;
++
++    sco3.2v5*)
++      lt_prog_compiler_pic='-Kpic'
++      lt_prog_compiler_static='-dn'
++      ;;
++
++    solaris*)
++      lt_prog_compiler_wl='-Wl,'
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
++
++    sunos4*)
++      lt_prog_compiler_wl='-Qoption ld '
++      lt_prog_compiler_pic='-PIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
++
++    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++      lt_prog_compiler_wl='-Wl,'
++      lt_prog_compiler_pic='-KPIC'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	lt_prog_compiler_pic='-Kconform_pic'
++	lt_prog_compiler_static='-Bstatic'
++      fi
++      ;;
++
++    uts4*)
++      lt_prog_compiler_pic='-pic'
++      lt_prog_compiler_static='-Bstatic'
++      ;;
++
++    *)
++      lt_prog_compiler_can_build_shared=no
++      ;;
++    esac
++  fi
++
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic" >&6
++
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$lt_prog_compiler_pic"; then
++
++echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
++if test "${lt_prog_compiler_pic_works+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_pic_works=no
++  ac_outfile=conftest.$ac_objext
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:7298: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:7302: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s conftest.err; then
++       lt_prog_compiler_pic_works=yes
++     fi
++   fi
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
++
++if test x"$lt_prog_compiler_pic_works" = xyes; then
++    case $lt_prog_compiler_pic in
++     "" | " "*) ;;
++     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
++     esac
++else
++    lt_prog_compiler_pic=
++     lt_prog_compiler_can_build_shared=no
++fi
++
++fi
++case "$host_os" in
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    lt_prog_compiler_pic=
++    ;;
++  *)
++    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
++    ;;
++esac
++
++echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++if test "${lt_cv_prog_compiler_c_o+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_prog_compiler_c_o=no
++   $rm -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:7358: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&5
++   echo "$as_me:7362: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s out/conftest2.$ac_objext
++   then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s out/conftest.err; then
++       lt_cv_prog_compiler_c_o=yes
++     fi
++   fi
++   chmod u+w .
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
++   cd ..
++   rmdir conftest
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
++
++
++hard_links="nottested"
++if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6
++  if test "$hard_links" = no; then
++    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
++
++echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++
++  runpath_var=
++  allow_undefined_flag=
++  enable_shared_with_static_runtimes=no
++  archive_cmds=
++  archive_expsym_cmds=
++  old_archive_From_new_cmds=
++  old_archive_from_expsyms_cmds=
++  export_dynamic_flag_spec=
++  whole_archive_flag_spec=
++  thread_safe_flag_spec=
++  hardcode_libdir_flag_spec=
++  hardcode_libdir_flag_spec_ld=
++  hardcode_libdir_separator=
++  hardcode_direct=no
++  hardcode_minus_L=no
++  hardcode_shlibpath_var=unsupported
++  link_all_deplibs=unknown
++  hardcode_automatic=no
++  module_cmds=
++  module_expsym_cmds=
++  always_export_symbols=no
++  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  # include_expsyms should be a list of space-separated symbols to be *always*
++  # included in the symbol list
++  include_expsyms=
++  # exclude_expsyms can be an extended regexp of symbols to exclude
++  # it will be wrapped by ` (' and `)$', so one must not match beginning or
++  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++  # as well as any symbol that contains `d'.
++  exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
++  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++  # platforms (ab)use it in PIC code, but their linkers get confused if
++  # the symbol is explicitly referenced.  Since portable code cannot
++  # rely on this symbol name, it's probably fine to never include it in
++  # preloaded symbol tables.
++  extract_expsyms_cmds=
++
++  case $host_os in
++  cygwin* | mingw* | pw32*)
++    # FIXME: the MSVC++ port hasn't been tested in a loooong time
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    if test "$GCC" != yes; then
++      with_gnu_ld=no
++    fi
++    ;;
++  openbsd*)
++    with_gnu_ld=no
++    ;;
++  esac
++
++  ld_shlibs=yes
++  if test "$with_gnu_ld" = yes; then
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    wlarc='${wl}'
++
++    # See if GNU ld supports shared libraries.
++    case $host_os in
++    aix3* | aix4* | aix5*)
++      # On AIX/PPC, the GNU linker is very broken
++      if test "$host_cpu" != ia64; then
++	ld_shlibs=no
++	cat <<EOF 1>&2
++
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
++
++EOF
++      fi
++      ;;
++
++    amigaos*)
++      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_minus_L=yes
++
++      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
++      # that the semantics of dynamic libraries on AmigaOS, at least up
++      # to version 4, is to share data among multiple programs linked
++      # with the same dynamic library.  Since this doesn't match the
++      # behavior of shared libraries on other platforms, we can't use
++      # them.
++      ld_shlibs=no
++      ;;
++
++    beos*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	allow_undefined_flag=unsupported
++	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++	# support --undefined.  This deserves some investigation.  FIXME
++	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
++      # as there is no search path for DLLs.
++      hardcode_libdir_flag_spec='-L$libdir'
++      allow_undefined_flag=unsupported
++      always_export_symbols=no
++      enable_shared_with_static_runtimes=yes
++      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++
++      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++	# If the export-symbols file already is a .def file (1st line
++	# is EXPORTS), use it as is; otherwise, prepend...
++	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	  cp $export_symbols $output_objdir/$soname.def;
++	else
++	  echo EXPORTS > $output_objdir/$soname.def;
++	  cat $export_symbols >> $output_objdir/$soname.def;
++	fi~
++	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
++    netbsd*)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++	wlarc=
++      else
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      fi
++      ;;
++
++    solaris* | sysv5*)
++      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
++	ld_shlibs=no
++	cat <<EOF 1>&2
++
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++EOF
++      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
++    sunos4*)
++      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      wlarc=
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
++
++  linux*)
++    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_cmds="$tmp_archive_cmds"
++      supports_anon_versioning=no
++      case `$LD -v 2>/dev/null` in
++        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
++        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++        *\ 2.11.*) ;; # other 2.11 versions
++        *) supports_anon_versioning=yes ;;
++      esac
++      if test $supports_anon_versioning = yes; then
++        archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
++cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++$echo "local: *; };" >> $output_objdir/$libname.ver~
++        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++      else
++        archive_expsym_cmds="$tmp_archive_cmds"
++      fi
++    else
++      ld_shlibs=no
++    fi
++    ;;
++
++    *)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
++    esac
++
++    if test "$ld_shlibs" = yes; then
++      runpath_var=LD_RUN_PATH
++      hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
++      export_dynamic_flag_spec='${wl}--export-dynamic'
++      # ancient GNU ld didn't support --whole-archive et. al.
++      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++ 	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	whole_archive_flag_spec=
++      fi
++    fi
++  else
++    # PORTME fill in a description of your system's linker (not GNU ld)
++    case $host_os in
++    aix3*)
++      allow_undefined_flag=unsupported
++      always_export_symbols=yes
++      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
++      # Note: this linker hardcodes the directories in LIBPATH if there
++      # are no directories specified by -L.
++      hardcode_minus_L=yes
++      if test "$GCC" = yes && test -z "$link_static_flag"; then
++	# Neither direct hardcoding nor static linking is supported with a
++	# broken collect2.
++	hardcode_direct=unsupported
++      fi
++      ;;
++
++    aix4* | aix5*)
++      if test "$host_cpu" = ia64; then
++	# On IA64, the linker does run time linking by default, so we don't
++	# have to do anything special.
++	aix_use_runtimelinking=no
++	exp_sym_flag='-Bexport'
++	no_entry_flag=""
++      else
++	# If we're using GNU nm, then we don't want the "-C" option.
++	# -C means demangle to AIX nm, but means don't demangle with GNU nm
++	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
++	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++	else
++	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++	fi
++	aix_use_runtimelinking=no
++
++	# Test if we are trying to use run time linking or normal
++	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
++	# need to do runtime linking.
++	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++	  for ld_flag in $LDFLAGS; do
++  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++  	    aix_use_runtimelinking=yes
++  	    break
++  	  fi
++	  done
++	esac
++
++	exp_sym_flag='-bexport'
++	no_entry_flag='-bnoentry'
++      fi
++
++      # When large executables or shared objects are built, AIX ld can
++      # have problems creating the table of contents.  If linking a library
++      # or program results in "error TOC overflow" add -mminimal-toc to
++      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++      archive_cmds=''
++      hardcode_direct=yes
++      hardcode_libdir_separator=':'
++      link_all_deplibs=yes
++
++      if test "$GCC" = yes; then
++	case $host_os in aix4.012|aix4.012.*)
++	# We only want to do this on AIX 4.2 and lower, the check
++	# below for broken collect2 doesn't work under 4.3+
++	  collect2name=`${CC} -print-prog-name=collect2`
++	  if test -f "$collect2name" && \
++  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	  then
++  	  # We have reworked collect2
++  	  hardcode_direct=yes
++	  else
++  	  # We have old collect2
++  	  hardcode_direct=unsupported
++  	  # It fails to find uninstalled libraries when the uninstalled
++  	  # path is not listed in the libpath.  Setting hardcode_minus_L
++  	  # to unsupported forces relinking
++  	  hardcode_minus_L=yes
++  	  hardcode_libdir_flag_spec='-L$libdir'
++  	  hardcode_libdir_separator=
++	  fi
++	esac
++	shared_flag='-shared'
++      else
++	# not using gcc
++	if test "$host_cpu" = ia64; then
++  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++  	# chokes on -Wl,-G. The following line is correct:
++	  shared_flag='-G'
++	else
++  	if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag='${wl}-G'
++	  else
++	    shared_flag='${wl}-bM:SRE'
++  	fi
++	fi
++      fi
++
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      always_export_symbols=yes
++      if test "$aix_use_runtimelinking" = yes; then
++	# Warning - without using the other runtime loading flags (-brtl),
++	# -berok will link without error, but may produce a broken library.
++	allow_undefined_flag='-berok'
++       # Determine the default libpath from the value encoded in an empty executable.
++       cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
++	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++       else
++	if test "$host_cpu" = ia64; then
++	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
++	  allow_undefined_flag="-z nodefs"
++	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++	else
++	 # Determine the default libpath from the value encoded in an empty executable.
++	 cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
++	  # Warning - without using the other run time loading flags,
++	  # -berok will link without error, but may produce a broken library.
++	  no_undefined_flag=' ${wl}-bernotok'
++	  allow_undefined_flag=' ${wl}-berok'
++	  # -bexpall does not export symbols beginning with underscore (_)
++	  always_export_symbols=yes
++	  # Exported symbols can be pulled into shared objects from archives
++	  whole_archive_flag_spec=' '
++	  archive_cmds_need_lc=yes
++	  # This is similar to how AIX traditionally builds it's shared libraries.
++	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	fi
++      fi
++      ;;
++
++    amigaos*)
++      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_minus_L=yes
++      # see comment about different semantics on the GNU ld section
++      ld_shlibs=no
++      ;;
++
++    bsdi[45]*)
++      export_dynamic_flag_spec=-rdynamic
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # When not using gcc, we currently assume that we are using
++      # Microsoft Visual C++.
++      # hardcode_libdir_flag_spec is actually meaningless, as there is
++      # no search path for DLLs.
++      hardcode_libdir_flag_spec=' '
++      allow_undefined_flag=unsupported
++      # Tell ltmain to make .lib files, not .a files.
++      libext=lib
++      # Tell ltmain to make .dll files, not .so files.
++      shrext_cmds=".dll"
++      # FIXME: Setting linknames here is a bad hack.
++      archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      # The linker will automatically build a .lib file if we build a DLL.
++      old_archive_From_new_cmds='true'
++      # FIXME: Should let the user specify the lib program.
++      old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      enable_shared_with_static_runtimes=yes
++      ;;
++
++    darwin* | rhapsody*)
++      case "$host_os" in
++        rhapsody* | darwin1.[012])
++         allow_undefined_flag='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[012])
++               allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++      esac
++      archive_cmds_need_lc=no
++      hardcode_direct=no
++      hardcode_automatic=yes
++      hardcode_shlibpath_var=unsupported
++      whole_archive_flag_spec=''
++      link_all_deplibs=yes
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++      archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++    else
++      case "$cc_basename" in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         ld_shlibs=no
++          ;;
++      esac
++    fi
++      ;;
++
++    dgux*)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_shlibpath_var=no
++      ;;
++
++    freebsd1*)
++      ld_shlibs=no
++      ;;
++
++    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++    # support.  Future versions do this automatically, but an explicit c++rt0.o
++    # does not break anything, and helps significantly (at the cost of a little
++    # extra space).
++    freebsd2.2*)
++      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
++
++    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++    freebsd2*)
++      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct=yes
++      hardcode_minus_L=yes
++      hardcode_shlibpath_var=no
++      ;;
++
++    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++    freebsd* | kfreebsd*-gnu)
++      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
++
++    hpux9*)
++      if test "$GCC" = yes; then
++	archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      else
++	archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      fi
++      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++      hardcode_libdir_separator=:
++      hardcode_direct=yes
++
++      # hardcode_minus_L: Not really in the search PATH,
++      # but as the default location of the library.
++      hardcode_minus_L=yes
++      export_dynamic_flag_spec='${wl}-E'
++      ;;
++
++    hpux10* | hpux11*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	esac
++      else
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	*)
++	  archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	esac
++      fi
++      if test "$with_gnu_ld" = no; then
++	case "$host_cpu" in
++	hppa*64*)
++	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++	  hardcode_libdir_flag_spec_ld='+b $libdir'
++	  hardcode_libdir_separator=:
++	  hardcode_direct=no
++	  hardcode_shlibpath_var=no
++	  ;;
++	ia64*)
++	  hardcode_libdir_flag_spec='-L$libdir'
++	  hardcode_direct=no
++	  hardcode_shlibpath_var=no
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  hardcode_minus_L=yes
++	  ;;
++	*)
++	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++	  hardcode_libdir_separator=:
++	  hardcode_direct=yes
++	  export_dynamic_flag_spec='${wl}-E'
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  hardcode_minus_L=yes
++	  ;;
++	esac
++      fi
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      if test "$GCC" = yes; then
++	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	hardcode_libdir_flag_spec_ld='-rpath $libdir'
++      fi
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator=:
++      link_all_deplibs=yes
++      ;;
++
++    netbsd*)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++      else
++	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++      fi
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      ;;
++
++    newsos6)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct=yes
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator=:
++      hardcode_shlibpath_var=no
++      ;;
++
++    openbsd*)
++      hardcode_direct=yes
++      hardcode_shlibpath_var=no
++      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec='${wl}-E'
++      else
++       case $host_os in
++	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	   archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	   hardcode_libdir_flag_spec='-R$libdir'
++	   ;;
++	 *)
++	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++	   ;;
++       esac
++      fi
++      ;;
++
++    os2*)
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_minus_L=yes
++      allow_undefined_flag=unsupported
++      archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++      old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++      ;;
++
++    osf3*)
++      if test "$GCC" = yes; then
++	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	allow_undefined_flag=' -expect_unresolved \*'
++	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++      fi
++      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator=:
++      ;;
++
++    osf4* | osf5*)	# as osf3* with the addition of -msym flag
++      if test "$GCC" = yes; then
++	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++      else
++	allow_undefined_flag=' -expect_unresolved \*'
++	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++
++	# Both c and cxx compiler support -rpath directly
++	hardcode_libdir_flag_spec='-rpath $libdir'
++      fi
++      hardcode_libdir_separator=:
++      ;;
++
++    sco3.2v5*)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var=no
++      export_dynamic_flag_spec='${wl}-Bexport'
++      runpath_var=LD_RUN_PATH
++      hardcode_runpath_var=yes
++      ;;
++
++    solaris*)
++      no_undefined_flag=' -z text'
++      if test "$GCC" = yes; then
++	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
++      else
++	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      fi
++      hardcode_libdir_flag_spec='-R$libdir'
++      hardcode_shlibpath_var=no
++      case $host_os in
++      solaris2.[0-5] | solaris2.[0-5].*) ;;
++      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
++	whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
++      esac
++      link_all_deplibs=yes
++      ;;
++
++    sunos4*)
++      if test "x$host_vendor" = xsequent; then
++	# Use $CC to link under sequent, because it throws in some extra .o
++	# files that make .init and .fini sections work.
++	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_direct=yes
++      hardcode_minus_L=yes
++      hardcode_shlibpath_var=no
++      ;;
++
++    sysv4)
++      case $host_vendor in
++	sni)
++	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct=yes # is this really true???
++	;;
++	siemens)
++	  ## LD is ld it makes a PLAMLIB
++	  ## CC just makes a GrossModule.
++	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++	  reload_cmds='$CC -r -o $output$reload_objs'
++	  hardcode_direct=no
++        ;;
++	motorola)
++	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
++	;;
++      esac
++      runpath_var='LD_RUN_PATH'
++      hardcode_shlibpath_var=no
++      ;;
++
++    sysv4.3*)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var=no
++      export_dynamic_flag_spec='-Bexport'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	hardcode_shlibpath_var=no
++	runpath_var=LD_RUN_PATH
++	hardcode_runpath_var=yes
++	ld_shlibs=yes
++      fi
++      ;;
++
++    sysv4.2uw2*)
++      archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct=yes
++      hardcode_minus_L=no
++      hardcode_shlibpath_var=no
++      hardcode_runpath_var=yes
++      runpath_var=LD_RUN_PATH
++      ;;
++
++   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
++      no_undefined_flag='${wl}-z ${wl}text'
++      if test "$GCC" = yes; then
++	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
++      runpath_var='LD_RUN_PATH'
++      hardcode_shlibpath_var=no
++      ;;
++
++    sysv5*)
++      no_undefined_flag=' -z text'
++      # $CC -shared without GNU ld will not create a library from C++
++      # object files and a static libstdc++, better avoid it by now
++      archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      hardcode_libdir_flag_spec=
++      hardcode_shlibpath_var=no
++      runpath_var='LD_RUN_PATH'
++      ;;
++
++    uts4*)
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec='-L$libdir'
++      hardcode_shlibpath_var=no
++      ;;
++
++    *)
++      ld_shlibs=no
++      ;;
++    esac
++  fi
++
++echo "$as_me:$LINENO: result: $ld_shlibs" >&5
++echo "${ECHO_T}$ld_shlibs" >&6
++test "$ld_shlibs" = no && can_build_shared=no
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
++#
++# Do we need to explicitly link libc?
++#
++case "x$archive_cmds_need_lc" in
++x|xyes)
++  # Assume -lc should be added
++  archive_cmds_need_lc=yes
++
++  if test "$enable_shared" = yes && test "$GCC" = yes; then
++    case $archive_cmds in
++    *'~'*)
++      # FIXME: we may have to deal with multi-command sequences.
++      ;;
++    '$CC '*)
++      # Test whether the compiler implicitly links with -lc since on some
++      # systems, -lgcc has to come before -lc. If gcc already passes -lc
++      # to ld, don't add -lc before -lgcc.
++      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++      $rm conftest*
++      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        libobjs=conftest.$ac_objext
++        deplibs=
++        wl=$lt_prog_compiler_wl
++        compiler_flags=-v
++        linker_flags=-v
++        verstring=
++        output_objdir=.
++        libname=conftest
++        lt_save_allow_undefined_flag=$allow_undefined_flag
++        allow_undefined_flag=
++        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
++  (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++        then
++	  archive_cmds_need_lc=no
++        else
++	  archive_cmds_need_lc=yes
++        fi
++        allow_undefined_flag=$lt_save_allow_undefined_flag
++      else
++        cat conftest.err 1>&5
++      fi
++      $rm conftest*
++      echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
++echo "${ECHO_T}$archive_cmds_need_lc" >&6
++      ;;
++    esac
++  fi
++  ;;
++esac
++
++echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
++need_lib_prefix=unknown
++hardcode_into_libs=no
++
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
++
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  shlibpath_var=LIBPATH
++
++  # AIX 3 has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}${shared_ext}$major'
++  ;;
++
++aix4* | aix5*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[01] | aix4.[01].*)
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	   echo ' yes '
++	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++	:
++      else
++	can_build_shared=no
++      fi
++      ;;
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}${shared_ext}$major'
++    fi
++    shlibpath_var=LIBPATH
++  fi
++  ;;
++
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++  ;;
++
++beos*)
++  library_names_spec='${libname}${shared_ext}'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
++
++bsdi[45]*)
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
++
++cygwin* | mingw* | pw32*)
++  version_type=windows
++  shrext_cmds=".dll"
++  need_version=no
++  need_lib_prefix=no
++
++  case $GCC,$host_os in
++  yes,cygwin* | yes,mingw* | yes,pw32*)
++    library_names_spec='$libname.dll.a'
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $rm \$dlpath'
++    shlibpath_overrides_runpath=yes
++
++    case $host_os in
++    cygwin*)
++      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
++    mingw*)
++      # MinGW DLLs use traditional 'lib' prefix
++      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
++        # It is most probably a Windows format PATH printed by
++        # mingw gcc, but we are running on Cygwin. Gcc prints its search
++        # path with ; separators, and with drive letters. We can handle the
++        # drive letters (cygwin fileutils understands them), so leave them,
++        # especially as we might pass files found there to a mingw objdump,
++        # which wouldn't understand a cygwinified path. Ahh.
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++      fi
++      ;;
++    pw32*)
++      # pw32 DLLs use 'pw' prefix rather than 'lib'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++      ;;
++    esac
++    ;;
++
++  *)
++    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    ;;
++  esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  ;;
++
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  soname_spec='${libname}${release}${major}$shared_ext'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
++  if test "$GCC" = yes; then
++    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
++  else
++    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
++  fi
++  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++  ;;
++
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++freebsd1*)
++  dynamic_linker=no
++  ;;
++
++kfreebsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++freebsd*)
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
++    ;;
++  freebsd3.01* | freebsdelf3.01*)
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
++  *) # from 3.2 on
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
++    ;;
++  esac
++  ;;
++
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  ;;
++
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  case "$host_cpu" in
++  ia64*)
++    shrext_cmds='.so'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.so"
++    shlibpath_var=LD_LIBRARY_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    if test "X$HPUX_IA64_MODE" = X32; then
++      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++    else
++      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++    fi
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    ;;
++   hppa*64*)
++     shrext_cmds='.sl'
++     hardcode_into_libs=yes
++     dynamic_linker="$host_os dld.sl"
++     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++     soname_spec='${libname}${release}${shared_ext}$major'
++     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++     ;;
++   *)
++    shrext_cmds='.sl'
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=SHLIB_PATH
++    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    ;;
++  esac
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
++    *)
++	if test "$lt_cv_prog_gnu_ld" = yes; then
++		version_type=linux
++	else
++		version_type=irix
++	fi ;;
++  esac
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  case $host_os in
++  irix5* | nonstopux*)
++    libsuff= shlibsuff=
++    ;;
++  *)
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++      libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++      libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++      libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  hardcode_into_libs=yes
++  ;;
++
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++  dynamic_linker=no
++  ;;
++
++# This must be Linux ELF.
++linux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
++
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
++
++knetbsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++nto-qnx*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++openbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    case $host_os in
++      openbsd2.[89] | openbsd2.[89].*)
++	shlibpath_overrides_runpath=no
++	;;
++      *)
++	shlibpath_overrides_runpath=yes
++	;;
++      esac
++  else
++    shlibpath_overrides_runpath=yes
++  fi
++  ;;
++
++os2*)
++  libname_spec='$name'
++  shrext_cmds=".dll"
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
++
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
++
++sco3.2v5*)
++  version_type=osf
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
++
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      export_dynamic_flag_spec='${wl}-Blargedynsym'
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
++
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
++
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++*)
++  dynamic_linker=no
++  ;;
++esac
++echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6
++test "$dynamic_linker" = no && can_build_shared=no
++
++echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++hardcode_action=
++if test -n "$hardcode_libdir_flag_spec" || \
++   test -n "$runpath_var" || \
++   test "X$hardcode_automatic" = "Xyes" ; then
++
++  # We can hardcode non-existant directories.
++  if test "$hardcode_direct" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no &&
++     test "$hardcode_minus_L" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action=immediate
++  fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action=unsupported
++fi
++echo "$as_me:$LINENO: result: $hardcode_action" >&5
++echo "${ECHO_T}$hardcode_action" >&6
++
++if test "$hardcode_action" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
++
++striplib=
++old_striplib=
++echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
++echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
++  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++else
++# FIXME - insert some real tests, host_os isn't really good enough
++  case $host_os in
++   darwin*)
++       if test -n "$STRIP" ; then
++         striplib="$STRIP -x"
++         echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++       else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++       ;;
++   *)
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++    ;;
++  esac
++fi
++
++if test "x$enable_dlopen" != xyes; then
++  enable_dlopen=unknown
++  enable_dlopen_self=unknown
++  enable_dlopen_self_static=unknown
++else
++  lt_cv_dlopen=no
++  lt_cv_dlopen_libs=
++
++  case $host_os in
++  beos*)
++    lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ;;
++
++  mingw* | pw32*)
++    lt_cv_dlopen="LoadLibrary"
++    lt_cv_dlopen_libs=
++   ;;
++
++  cygwin*)
++    lt_cv_dlopen="dlopen"
++    lt_cv_dlopen_libs=
++   ;;
++
++  darwin*)
++  # if libdl is installed we need to link against it
++    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dl_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dl_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++if test $ac_cv_lib_dl_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++
++fi
++
++   ;;
++
++  *)
++    echo "$as_me:$LINENO: checking for shl_load" >&5
++echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
++if test "${ac_cv_func_shl_load+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.  */
++/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define shl_load innocuous_shl_load
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char shl_load (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef shl_load
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char shl_load ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_shl_load) || defined (__stub___shl_load)
++choke me
++#else
++char (*f) () = shl_load;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != shl_load;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_shl_load=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_shl_load=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
++echo "${ECHO_T}$ac_cv_func_shl_load" >&6
++if test $ac_cv_func_shl_load = yes; then
++  lt_cv_dlopen="shl_load"
++else
++  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
++echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
++if test "${ac_cv_lib_dld_shl_load+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char shl_load ();
++int
++main ()
++{
++shl_load ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dld_shl_load=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dld_shl_load=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
++if test $ac_cv_lib_dld_shl_load = yes; then
++  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
++else
++  echo "$as_me:$LINENO: checking for dlopen" >&5
++echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
++if test "${ac_cv_func_dlopen+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.  */
++/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define dlopen innocuous_dlopen
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char dlopen (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef dlopen
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_dlopen) || defined (__stub___dlopen)
++choke me
++#else
++char (*f) () = dlopen;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != dlopen;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
++echo "${ECHO_T}$ac_cv_func_dlopen" >&6
++if test $ac_cv_func_dlopen = yes; then
++  lt_cv_dlopen="dlopen"
++else
++  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dl_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dl_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++if test $ac_cv_lib_dl_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
++echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
++if test "${ac_cv_lib_svld_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsvld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_svld_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_svld_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
++if test $ac_cv_lib_svld_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
++else
++  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
++echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
++if test "${ac_cv_lib_dld_dld_link+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dld_link ();
++int
++main ()
++{
++dld_link ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dld_dld_link=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dld_dld_link=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
++if test $ac_cv_lib_dld_dld_link = yes; then
++  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
++fi
++
++
++fi
++
++
++fi
++
++
++fi
++
++
++fi
++
++
++fi
++
++    ;;
++  esac
++
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
++  else
++    enable_dlopen=no
++  fi
++
++  case $lt_cv_dlopen in
++  dlopen)
++    save_CPPFLAGS="$CPPFLAGS"
++    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++
++    save_LDFLAGS="$LDFLAGS"
++    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++
++    save_LIBS="$LIBS"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
++
++    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
++echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
++if test "${lt_cv_dlopen_self+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self=cross
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++#line 9543 "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}
++EOF
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self=no
++  fi
++fi
++rm -fr conftest*
++
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self" >&6
++
++    if test "x$lt_cv_dlopen_self" = xyes; then
++      LDFLAGS="$LDFLAGS $link_static_flag"
++      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
++echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
++if test "${lt_cv_dlopen_self_static+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self_static=cross
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++#line 9641 "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}
++EOF
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self_static=no
++  fi
++fi
++rm -fr conftest*
++
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
++    fi
++
++    CPPFLAGS="$save_CPPFLAGS"
++    LDFLAGS="$save_LDFLAGS"
++    LIBS="$save_LIBS"
++    ;;
++  esac
++
++  case $lt_cv_dlopen_self in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
++  esac
++
++  case $lt_cv_dlopen_self_static in
++  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++  *) enable_dlopen_self_static=unknown ;;
++  esac
++fi
++
++
++# Report which librarie types wil actually be built
++echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
++echo "$as_me:$LINENO: result: $can_build_shared" >&5
++echo "${ECHO_T}$can_build_shared" >&6
++
++echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
++test "$can_build_shared" = "no" && enable_shared=no
++
++# On AIX, shared libraries and static libraries use the same namespace, and
++# are all built from PIC.
++case "$host_os" in
++aix3*)
++  test "$enable_shared" = yes && enable_static=no
++  if test -n "$RANLIB"; then
++    archive_cmds="$archive_cmds~\$RANLIB \$lib"
++    postinstall_cmds='$RANLIB $lib'
++  fi
++  ;;
++
++aix4* | aix5*)
++  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++    test "$enable_shared" = yes && enable_static=no
++  fi
++    ;;
++esac
++echo "$as_me:$LINENO: result: $enable_shared" >&5
++echo "${ECHO_T}$enable_shared" >&6
++
++echo "$as_me:$LINENO: checking whether to build static libraries" >&5
++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
++# Make sure either enable_shared or enable_static is yes.
++test "$enable_shared" = yes || enable_static=yes
++echo "$as_me:$LINENO: result: $enable_static" >&5
++echo "${ECHO_T}$enable_static" >&6
++
++# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # See if we are running on zsh, and set the options which allow our commands through
++  # without removal of \ escapes.
++  if test -n "${ZSH_VERSION+set}" ; then
++    setopt NO_GLOB_SUBST
++  fi
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++    SED SHELL STRIP \
++    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++    deplibs_check_method reload_flag reload_cmds need_locks \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    old_postinstall_cmds old_postuninstall_cmds \
++    compiler \
++    CC \
++    LD \
++    lt_prog_compiler_wl \
++    lt_prog_compiler_pic \
++    lt_prog_compiler_static \
++    lt_prog_compiler_no_builtin_flag \
++    export_dynamic_flag_spec \
++    thread_safe_flag_spec \
++    whole_archive_flag_spec \
++    enable_shared_with_static_runtimes \
++    old_archive_cmds \
++    old_archive_from_new_cmds \
++    predep_objects \
++    postdep_objects \
++    predeps \
++    postdeps \
++    compiler_lib_search_path \
++    archive_cmds \
++    archive_expsym_cmds \
++    postinstall_cmds \
++    postuninstall_cmds \
++    old_archive_from_expsyms_cmds \
++    allow_undefined_flag \
++    no_undefined_flag \
++    export_symbols_cmds \
++    hardcode_libdir_flag_spec \
++    hardcode_libdir_flag_spec_ld \
++    hardcode_libdir_separator \
++    hardcode_automatic \
++    module_cmds \
++    module_expsym_cmds \
++    lt_cv_prog_compiler_c_o \
++    exclude_expsyms \
++    include_expsyms; do
++
++    case $var in
++    old_archive_cmds | \
++    old_archive_from_new_cmds | \
++    archive_cmds | \
++    archive_expsym_cmds | \
++    module_cmds | \
++    module_expsym_cmds | \
++    old_archive_from_expsyms_cmds | \
++    export_symbols_cmds | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  case $lt_echo in
++  *'\$0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
++    ;;
++  esac
++
++cfgfile="${ofile}T"
++  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
++  $rm -f "$cfgfile"
++  { echo "$as_me:$LINENO: creating $ofile" >&5
++echo "$as_me: creating $ofile" >&6;}
++
++  cat <<__EOF__ >> "$cfgfile"
++#! $SHELL
++
++# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
++# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
++# NOTE: Changes made to this file will be lost: look at ltmain.sh.
++#
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
++# Free Software Foundation, Inc.
++#
++# This file is part of GNU Libtool:
++# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
++#
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation; either version 2 of the License, or
++# (at your option) any later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++# General Public License for more details.
++#
++# You should have received a copy of the GNU General Public License
++# along with this program; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# A sed program that does not truncate output.
++SED=$lt_SED
++
++# Sed that helps us avoid accidentally triggering echo(1) options like -n.
++Xsed="$SED -e s/^X//"
++
++# The HP-UX ksh and POSIX shell print the target directory to stdout
++# if CDPATH is set.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++
++# The names of the tagged configurations supported by this script.
++available_tags=
++
++# ### BEGIN LIBTOOL CONFIG
++
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc
++
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
++
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
++
++# A C compiler.
++LTCC=$lt_LTCC
++
++# A language-specific compiler.
++CC=$lt_compiler
++
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC
++
++# An ERE matcher.
++EGREP=$lt_EGREP
++
++# The linker used to build libraries.
++LD=$lt_LD
++
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
++
++# A BSD-compatible nm program.
++NM=$lt_NM
++
++# A symbol stripping program
++STRIP=$lt_STRIP
++
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl
++
++# Object file suffix (normally "o").
++objext="$ac_objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
++
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic
++pic_mode=$pic_mode
++
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o
++
++# Must we lock files when doing compilation ?
++need_locks=$lt_need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static
++
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
++
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec
++
++# Library versioning type.
++version_type=$version_type
++
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
++
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
++
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
++
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
++
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds
++archive_expsym_cmds=$lt_archive_expsym_cmds
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
++
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds
++module_expsym_cmds=$lt_module_expsym_cmds
++
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps
++
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path
++
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag
++
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
++
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
++
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
++
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action
++
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
++
++# If ld is used when linking, flag to hardcode \$libdir into
++# a binary during linking. This must work even if \$libdir does
++# not exist.
++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator
++
++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L
++
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var
++
++# Set to yes if building a shared library automatically hardcodes DIR into the library
++# and all subsequent libraries and executables linked against it.
++hardcode_automatic=$hardcode_automatic
++
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
++
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs
++
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path"
++
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols
++
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds
++
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms
++
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms
++
++# ### END LIBTOOL CONFIG
++
++__EOF__
++
++
++  case $host_os in
++  aix3*)
++    cat <<\EOF >> "$cfgfile"
++
++# AIX sometimes has problems with the GCC collect2 program.  For some
++# reason, if we set the COLLECT_NAMES environment variable, the problems
++# vanish in a puff of smoke.
++if test "X${COLLECT_NAMES+set}" != Xset; then
++  COLLECT_NAMES=
++  export COLLECT_NAMES
++fi
++EOF
++    ;;
++  esac
++
++  # We use sed instead of cat because bash on DJGPP gets confused if
++  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
++  # text mode, it properly converts lines to CR/LF.  This bash problem
++  # is reportedly fixed, but why not run on old versions too?
++  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
++
++  mv -f "$cfgfile" "$ofile" || \
++    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
++  chmod +x "$ofile"
++
++else
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
++fi
++
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++CC="$lt_save_CC"
++
++
++# Check whether --with-tags or --without-tags was given.
++if test "${with_tags+set}" = set; then
++  withval="$with_tags"
++  tagnames="$withval"
++fi;
++
++if test -f "$ltmain" && test -n "$tagnames"; then
++  if test ! -f "${ofile}"; then
++    { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
++echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
++  fi
++
++  if test -z "$LTCC"; then
++    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
++    if test -z "$LTCC"; then
++      { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
++echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
++    else
++      { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
++echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
++    fi
++  fi
++
++  # Extract list of available tagged configurations in $ofile.
++  # Note that this assumes the entire list is on one line.
++  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
++
++  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++  for tagname in $tagnames; do
++    IFS="$lt_save_ifs"
++    # Check whether tagname contains only valid characters
++    case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
++    "") ;;
++    *)  { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
++echo "$as_me: error: invalid tag name: $tagname" >&2;}
++   { (exit 1); exit 1; }; }
++	;;
++    esac
++
++    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
++    then
++      { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
++echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
++   { (exit 1); exit 1; }; }
++    fi
++
++    # Update the list of available tags.
++    if test -n "$tagname"; then
++      echo appending configuration tag \"$tagname\" to $ofile
++
++      case $tagname in
++      CXX)
++	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++	    (test "X$CXX" != "Xg++"))) ; then
++	  ac_ext=cc
++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
++
++
++
++
++archive_cmds_need_lc_CXX=no
++allow_undefined_flag_CXX=
++always_export_symbols_CXX=no
++archive_expsym_cmds_CXX=
++export_dynamic_flag_spec_CXX=
++hardcode_direct_CXX=no
++hardcode_libdir_flag_spec_CXX=
++hardcode_libdir_flag_spec_ld_CXX=
++hardcode_libdir_separator_CXX=
++hardcode_minus_L_CXX=no
++hardcode_automatic_CXX=no
++module_cmds_CXX=
++module_expsym_cmds_CXX=
++link_all_deplibs_CXX=unknown
++old_archive_cmds_CXX=$old_archive_cmds
++no_undefined_flag_CXX=
++whole_archive_flag_spec_CXX=
++enable_shared_with_static_runtimes_CXX=no
++
++# Dependencies to place before and after the object being linked:
++predep_objects_CXX=
++postdep_objects_CXX=
++predeps_CXX=
++postdeps_CXX=
++compiler_lib_search_path_CXX=
++
++# Source file extension for C++ test sources.
++ac_ext=cc
++
++# Object file extension for compiled C++ test sources.
++objext=o
++objext_CXX=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="int some_variable = 0;\n"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code='int main(int, char *) { return(0); }\n'
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
++
++# Allow CC to be a program name with arguments.
++compiler=$CC
++
++
++# Allow CC to be a program name with arguments.
++lt_save_CC=$CC
++lt_save_LD=$LD
++lt_save_GCC=$GCC
++GCC=$GXX
++lt_save_with_gnu_ld=$with_gnu_ld
++lt_save_path_LD=$lt_cv_path_LD
++if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
++  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
++else
++  unset lt_cv_prog_gnu_ld
++fi
++if test -n "${lt_cv_path_LDCXX+set}"; then
++  lt_cv_path_LD=$lt_cv_path_LDCXX
++else
++  unset lt_cv_path_LD
++fi
++test -z "${LDCXX+set}" || LD=$LDCXX
++CC=${CXX-"c++"}
++compiler=$CC
++compiler_CXX=$CC
++cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++
++# We don't want -fno-exception wen compiling C++ code, so set the
++# no_builtin_flag separately
++if test "$GXX" = yes; then
++  lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
++else
++  lt_prog_compiler_no_builtin_flag_CXX=
++fi
++
++if test "$GXX" = yes; then
++  # Set up default GNU C++ configuration
++
++
++# Check whether --with-gnu-ld or --without-gnu-ld was given.
++if test "${with_gnu_ld+set}" = set; then
++  withval="$with_gnu_ld"
++  test "$withval" = no || with_gnu_ld=yes
++else
++  with_gnu_ld=no
++fi;
++ac_prog=ld
++if test "$GCC" = yes; then
++  # Check if gcc -print-prog-name=ld gives a path.
++  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
++echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
++  case $host in
++  *-*-mingw*)
++    # gcc leaves a trailing carriage return which upsets mingw
++    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++  *)
++    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++  esac
++  case $ac_prog in
++    # Accept absolute paths.
++    [\\/]* | ?:[\\/]*)
++      re_direlt='/[^/][^/]*/\.\./'
++      # Canonicalize the pathname of ld
++      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
++      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
++      done
++      test -z "$LD" && LD="$ac_prog"
++      ;;
++  "")
++    # If it fails, then pretend we aren't using GCC.
++    ac_prog=ld
++    ;;
++  *)
++    # If it is relative, then search for the first ld in PATH.
++    with_gnu_ld=unknown
++    ;;
++  esac
++elif test "$with_gnu_ld" = yes; then
++  echo "$as_me:$LINENO: checking for GNU ld" >&5
++echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
++else
++  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
++echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
++fi
++if test "${lt_cv_path_LD+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -z "$LD"; then
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
++      lt_cv_path_LD="$ac_dir/$ac_prog"
++      # Check to see if the program is GNU ld.  I'd rather use --version,
++      # but apparently some GNU ld's only accept -v.
++      # Break only if it was the GNU/non-GNU ld that we prefer.
++      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
++      *GNU* | *'with BFD'*)
++	test "$with_gnu_ld" != no && break
++	;;
++      *)
++	test "$with_gnu_ld" != yes && break
++	;;
++      esac
++    fi
++  done
++  IFS="$lt_save_ifs"
++else
++  lt_cv_path_LD="$LD" # Let the user override the test with a path.
++fi
++fi
++
++LD="$lt_cv_path_LD"
++if test -n "$LD"; then
++  echo "$as_me:$LINENO: result: $LD" >&5
++echo "${ECHO_T}$LD" >&6
++else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
++echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
++   { (exit 1); exit 1; }; }
++echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
++echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
++if test "${lt_cv_prog_gnu_ld+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
++case `$LD -v 2>&1 </dev/null` in
++*GNU* | *'with BFD'*)
++  lt_cv_prog_gnu_ld=yes
++  ;;
++*)
++  lt_cv_prog_gnu_ld=no
++  ;;
++esac
++fi
++echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
++echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
++with_gnu_ld=$lt_cv_prog_gnu_ld
++
++
++
++  # Check if GNU C++ uses GNU ld as the underlying linker, since the
++  # archiving commands below assume that GNU ld is being used.
++  if test "$with_gnu_ld" = yes; then
++    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++    archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++
++    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
++    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
++
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
++    #     investigate it a little bit more. (MM)
++    wlarc='${wl}'
++
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
++	grep 'no-whole-archive' > /dev/null; then
++      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    else
++      whole_archive_flag_spec_CXX=
++    fi
++  else
++    with_gnu_ld=no
++    wlarc=
++
++    # A generic and very simple default shared library creation
++    # command for GNU C++ for the case where it uses the native
++    # linker, instead of GNU ld.  If possible, this setting should
++    # overridden to take advantage of the native linker features on
++    # the platform it is being used on.
++    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++  fi
++
++  # Commands to make compiler produce verbose output that lists
++  # what "hidden" libraries, object files and flags are used when
++  # linking a shared library.
++  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++
++else
++  GXX=no
++  with_gnu_ld=no
++  wlarc=
++fi
++
++# PORTME: fill in a description of your system's C++ link characteristics
++echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++ld_shlibs_CXX=yes
++case $host_os in
++  aix3*)
++    # FIXME: insert proper C++ library support
++    ld_shlibs_CXX=no
++    ;;
++  aix4* | aix5*)
++    if test "$host_cpu" = ia64; then
++      # On IA64, the linker does run time linking by default, so we don't
++      # have to do anything special.
++      aix_use_runtimelinking=no
++      exp_sym_flag='-Bexport'
++      no_entry_flag=""
++    else
++      aix_use_runtimelinking=no
++
++      # Test if we are trying to use run time linking or normal
++      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++      # need to do runtime linking.
++      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++	for ld_flag in $LDFLAGS; do
++	  case $ld_flag in
++	  *-brtl*)
++	    aix_use_runtimelinking=yes
++	    break
++	    ;;
++	  esac
++	done
++      esac
++
++      exp_sym_flag='-bexport'
++      no_entry_flag='-bnoentry'
++    fi
++
++    # When large executables or shared objects are built, AIX ld can
++    # have problems creating the table of contents.  If linking a library
++    # or program results in "error TOC overflow" add -mminimal-toc to
++    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++    archive_cmds_CXX=''
++    hardcode_direct_CXX=yes
++    hardcode_libdir_separator_CXX=':'
++    link_all_deplibs_CXX=yes
++
++    if test "$GXX" = yes; then
++      case $host_os in aix4.012|aix4.012.*)
++      # We only want to do this on AIX 4.2 and lower, the check
++      # below for broken collect2 doesn't work under 4.3+
++	collect2name=`${CC} -print-prog-name=collect2`
++	if test -f "$collect2name" && \
++	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	then
++	  # We have reworked collect2
++	  hardcode_direct_CXX=yes
++	else
++	  # We have old collect2
++	  hardcode_direct_CXX=unsupported
++	  # It fails to find uninstalled libraries when the uninstalled
++	  # path is not listed in the libpath.  Setting hardcode_minus_L
++	  # to unsupported forces relinking
++	  hardcode_minus_L_CXX=yes
++	  hardcode_libdir_flag_spec_CXX='-L$libdir'
++	  hardcode_libdir_separator_CXX=
++	fi
++      esac
++      shared_flag='-shared'
++    else
++      # not using gcc
++      if test "$host_cpu" = ia64; then
++	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++	# chokes on -Wl,-G. The following line is correct:
++	shared_flag='-G'
++      else
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag='${wl}-G'
++	else
++	  shared_flag='${wl}-bM:SRE'
++	fi
++      fi
++    fi
++
++    # It seems that -bexpall does not export symbols beginning with
++    # underscore (_), so it is better to generate a list of symbols to export.
++    always_export_symbols_CXX=yes
++    if test "$aix_use_runtimelinking" = yes; then
++      # Warning - without using the other runtime loading flags (-brtl),
++      # -berok will link without error, but may produce a broken library.
++      allow_undefined_flag_CXX='-berok'
++      # Determine the default libpath from the value encoded in an empty executable.
++      cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++      hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
++
++      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++     else
++      if test "$host_cpu" = ia64; then
++	hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
++	allow_undefined_flag_CXX="-z nodefs"
++	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++      else
++	# Determine the default libpath from the value encoded in an empty executable.
++	cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++	hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
++	# Warning - without using the other run time loading flags,
++	# -berok will link without error, but may produce a broken library.
++	no_undefined_flag_CXX=' ${wl}-bernotok'
++	allow_undefined_flag_CXX=' ${wl}-berok'
++	# -bexpall does not export symbols beginning with underscore (_)
++	always_export_symbols_CXX=yes
++	# Exported symbols can be pulled into shared objects from archives
++	whole_archive_flag_spec_CXX=' '
++	archive_cmds_need_lc_CXX=yes
++	# This is similar to how AIX traditionally builds it's shared libraries.
++	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++      fi
++    fi
++    ;;
++  chorus*)
++    case $cc_basename in
++      *)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++    esac
++    ;;
++
++
++  cygwin* | mingw* | pw32*)
++    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
++    # as there is no search path for DLLs.
++    hardcode_libdir_flag_spec_CXX='-L$libdir'
++    allow_undefined_flag_CXX=unsupported
++    always_export_symbols_CXX=no
++    enable_shared_with_static_runtimes_CXX=yes
++
++    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++      # If the export-symbols file already is a .def file (1st line
++      # is EXPORTS), use it as is; otherwise, prepend...
++      archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	cp $export_symbols $output_objdir/$soname.def;
++      else
++	echo EXPORTS > $output_objdir/$soname.def;
++	cat $export_symbols >> $output_objdir/$soname.def;
++      fi~
++      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++    else
++      ld_shlibs_CXX=no
++    fi
++  ;;
++      darwin* | rhapsody*)
++        case "$host_os" in
++        rhapsody* | darwin1.[012])
++         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[012])
++               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++        esac
++      archive_cmds_need_lc_CXX=no
++      hardcode_direct_CXX=no
++      hardcode_automatic_CXX=yes
++      hardcode_shlibpath_var_CXX=unsupported
++      whole_archive_flag_spec_CXX=''
++      link_all_deplibs_CXX=yes
++
++    if test "$GXX" = yes ; then
++      lt_int_apple_cc_single_mod=no
++      output_verbose_link_cmd='echo'
++      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
++       lt_int_apple_cc_single_mod=yes
++      fi
++      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      else
++          archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++        fi
++        module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          else
++            archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          fi
++            module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      else
++      case "$cc_basename" in
++        xlc*)
++         output_verbose_link_cmd='echo'
++          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++          module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         ld_shlibs_CXX=no
++          ;;
++      esac
++      fi
++        ;;
++
++  dgux*)
++    case $cc_basename in
++      ec++)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      ghcx)
++	# Green Hills C++ Compiler
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++    esac
++    ;;
++  freebsd12*)
++    # C++ shared libraries reported to be fairly broken before switch to ELF
++    ld_shlibs_CXX=no
++    ;;
++  freebsd-elf*)
++    archive_cmds_need_lc_CXX=no
++    ;;
++  freebsd* | kfreebsd*-gnu)
++    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
++    # conventions
++    ld_shlibs_CXX=yes
++    ;;
++  gnu*)
++    ;;
++  hpux9*)
++    hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
++    hardcode_libdir_separator_CXX=:
++    export_dynamic_flag_spec_CXX='${wl}-E'
++    hardcode_direct_CXX=yes
++    hardcode_minus_L_CXX=yes # Not in the search PATH,
++				# but as the default
++				# location of the library.
++
++    case $cc_basename in
++    CC)
++      # FIXME: insert proper C++ library support
++      ld_shlibs_CXX=no
++      ;;
++    aCC)
++      archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      # Commands to make compiler produce verbose output that lists
++      # what "hidden" libraries, object files and flags are used when
++      # linking a shared library.
++      #
++      # There doesn't appear to be a way to prevent this compiler from
++      # explicitly linking system object files so we need to strip them
++      # from the output so that they don't get included in the library
++      # dependencies.
++      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++      ;;
++    *)
++      if test "$GXX" = yes; then
++        archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      else
++        # FIXME: insert proper C++ library support
++        ld_shlibs_CXX=no
++      fi
++      ;;
++    esac
++    ;;
++  hpux10*|hpux11*)
++    if test $with_gnu_ld = no; then
++      case "$host_cpu" in
++      hppa*64*)
++	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
++	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
++	hardcode_libdir_separator_CXX=:
++        ;;
++      ia64*)
++	hardcode_libdir_flag_spec_CXX='-L$libdir'
++        ;;
++      *)
++	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
++	hardcode_libdir_separator_CXX=:
++	export_dynamic_flag_spec_CXX='${wl}-E'
++        ;;
++      esac
++    fi
++    case "$host_cpu" in
++    hppa*64*)
++      hardcode_direct_CXX=no
++      hardcode_shlibpath_var_CXX=no
++      ;;
++    ia64*)
++      hardcode_direct_CXX=no
++      hardcode_shlibpath_var_CXX=no
++      hardcode_minus_L_CXX=yes # Not in the search PATH,
++					      # but as the default
++					      # location of the library.
++      ;;
++    *)
++      hardcode_direct_CXX=yes
++      hardcode_minus_L_CXX=yes # Not in the search PATH,
++					      # but as the default
++					      # location of the library.
++      ;;
++    esac
++
++    case $cc_basename in
++      CC)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      aCC)
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++	  ;;
++	*)
++	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  ;;
++	esac
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes; then
++	  if test $with_gnu_ld = no; then
++	    case "$host_cpu" in
++	    ia64*|hppa*64*)
++	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++	      ;;
++	    *)
++	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	      ;;
++	    esac
++	  fi
++	else
++	  # FIXME: insert proper C++ library support
++	  ld_shlibs_CXX=no
++	fi
++	;;
++    esac
++    ;;
++  irix5* | irix6*)
++    case $cc_basename in
++      CC)
++	# SGI C++
++	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++
++	# Archives containing C++ object files must be created using
++	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
++	# necessary to make sure instantiated templates are included
++	# in the archive.
++	old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
++	;;
++      *)
++	if test "$GXX" = yes; then
++	  if test "$with_gnu_ld" = no; then
++	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++	  else
++	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
++	  fi
++	fi
++	link_all_deplibs_CXX=yes
++	;;
++    esac
++    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
++    hardcode_libdir_separator_CXX=:
++    ;;
++  linux*)
++    case $cc_basename in
++      KCC)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
++
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++	archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++
++	hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir'
++	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
++
++	# Archives containing C++ object files must be created using
++	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
++	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
++	;;
++      icpc)
++	# Intel C++
++	with_gnu_ld=yes
++	# version 8.0 and above of icpc choke on multiply defined symbols
++	# if we add $predep_objects and $postdep_objects, however 7.1 and
++	# earlier do not add the objects themselves.
++	case `$CC -V 2>&1` in
++	*"Version 7."*)
++  	  archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++  	  archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	*)  # Version 8.0 or newer
++  	  archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++  	archive_expsym_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	esac
++	archive_cmds_need_lc_CXX=no
++	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
++	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
++	;;
++      cxx)
++	# Compaq C++
++	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
++
++	runpath_var=LD_RUN_PATH
++	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
++	hardcode_libdir_separator_CXX=:
++
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++    esac
++    ;;
++  lynxos*)
++    # FIXME: insert proper C++ library support
++    ld_shlibs_CXX=no
++    ;;
++  m88k*)
++    # FIXME: insert proper C++ library support
++    ld_shlibs_CXX=no
++    ;;
++  mvs*)
++    case $cc_basename in
++      cxx)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++    esac
++    ;;
++  netbsd*)
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
++      wlarc=
++      hardcode_libdir_flag_spec_CXX='-R$libdir'
++      hardcode_direct_CXX=yes
++      hardcode_shlibpath_var_CXX=no
++    fi
++    # Workaround some broken pre-1.5 toolchains
++    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
++    ;;
++  openbsd2*)
++    # C++ shared libraries are fairly broken
++    ld_shlibs_CXX=no
++    ;;
++  openbsd*)
++    hardcode_direct_CXX=yes
++    hardcode_shlibpath_var_CXX=no
++    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++      export_dynamic_flag_spec_CXX='${wl}-E'
++      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    fi
++    output_verbose_link_cmd='echo'
++    ;;
++  osf3*)
++    case $cc_basename in
++      KCC)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
++
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++
++	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++	hardcode_libdir_separator_CXX=:
++
++	# Archives containing C++ object files must be created using
++	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
++	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
++
++	;;
++      RCC)
++	# Rational C++ 2.4.1
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      cxx)
++	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++
++	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
++	hardcode_libdir_separator_CXX=:
++
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
++	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++
++	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
++	  hardcode_libdir_separator_CXX=:
++
++	  # Commands to make compiler produce verbose output that lists
++	  # what "hidden" libraries, object files and flags are used when
++	  # linking a shared library.
++	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++
++	else
++	  # FIXME: insert proper C++ library support
++	  ld_shlibs_CXX=no
++	fi
++	;;
++    esac
++    ;;
++  osf4* | osf5*)
++    case $cc_basename in
++      KCC)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
++
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++
++	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++	hardcode_libdir_separator_CXX=:
++
++	# Archives containing C++ object files must be created using
++	# the KAI C++ compiler.
++	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
++	;;
++      RCC)
++	# Rational C++ 2.4.1
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      cxx)
++	allow_undefined_flag_CXX=' -expect_unresolved \*'
++	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
++	  echo "-hidden">> $lib.exp~
++	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
++	  $rm $lib.exp'
++
++	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
++	hardcode_libdir_separator_CXX=:
++
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
++	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++
++	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
++	  hardcode_libdir_separator_CXX=:
++
++	  # Commands to make compiler produce verbose output that lists
++	  # what "hidden" libraries, object files and flags are used when
++	  # linking a shared library.
++	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++
++	else
++	  # FIXME: insert proper C++ library support
++	  ld_shlibs_CXX=no
++	fi
++	;;
++    esac
++    ;;
++  psos*)
++    # FIXME: insert proper C++ library support
++    ld_shlibs_CXX=no
++    ;;
++  sco*)
++    archive_cmds_need_lc_CXX=no
++    case $cc_basename in
++      CC)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++    esac
++    ;;
++  sunos4*)
++    case $cc_basename in
++      CC)
++	# Sun C++ 4.x
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      lcc)
++	# Lucid
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++    esac
++    ;;
++  solaris*)
++    case $cc_basename in
++      CC)
++	# Sun C++ 4.2, 5.x and Centerline C++
++	no_undefined_flag_CXX=' -zdefs'
++	archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++
++	hardcode_libdir_flag_spec_CXX='-R$libdir'
++	hardcode_shlibpath_var_CXX=no
++	case $host_os in
++	  solaris2.0-5 | solaris2.0-5.*) ;;
++	  *)
++	    # The C++ compiler is used as linker so we must use $wl
++	    # flag to pass the commands to the underlying system
++	    # linker.
++	    # Supported since Solaris 2.6 (maybe 2.5.1?)
++	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    ;;
++	esac
++	link_all_deplibs_CXX=yes
++
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++
++	# Archives containing C++ object files must be created using
++	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
++	# necessary to make sure instantiated templates are included
++	# in the archive.
++	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
++	;;
++      gcx)
++	# Green Hills C++ Compiler
++	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++
++	# The C++ compiler must be used to create the archive.
++	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
++	;;
++      *)
++	# GNU C++ compiler with Solaris linker
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
++	  if $CC --version | grep -v '^2\.7' > /dev/null; then
++	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
++	  else
++	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
++	    # platform.
++	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
++	  fi
++
++	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
++	fi
++	;;
++    esac
++    ;;
++  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
++    archive_cmds_need_lc_CXX=no
++    ;;
++  tandem*)
++    case $cc_basename in
++      NCC)
++	# NonStop-UX NCC 3.20
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	ld_shlibs_CXX=no
++	;;
++    esac
++    ;;
++  vxworks*)
++    # FIXME: insert proper C++ library support
++    ld_shlibs_CXX=no
++    ;;
++  *)
++    # FIXME: insert proper C++ library support
++    ld_shlibs_CXX=no
++    ;;
++esac
++echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
++echo "${ECHO_T}$ld_shlibs_CXX" >&6
++test "$ld_shlibs_CXX" = no && can_build_shared=no
++
++GCC_CXX="$GXX"
++LD_CXX="$LD"
++
++
++cat > conftest.$ac_ext <<EOF
++class Foo
++{
++public:
++  Foo (void) { a = 0; }
++private:
++  int a;
++};
++EOF
++
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  # Parse the compiler output and extract the necessary
++  # objects, libraries and library flags.
++
++  # Sentinel used to keep track of whether or not we are before
++  # the conftest object file.
++  pre_test_object_deps_done=no
++
++  # The `*' in the case matches for architectures that use `case' in
++  # $output_verbose_cmd can trigger glob expansion during the loop
++  # eval without this substitution.
++  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
++
++  for p in `eval $output_verbose_link_cmd`; do
++    case $p in
++
++    -L* | -R* | -l*)
++       # Some compilers place space between "-{L,R}" and the path.
++       # Remove the space.
++       if test $p = "-L" \
++	  || test $p = "-R"; then
++	 prev=$p
++	 continue
++       else
++	 prev=
++       fi
++
++       if test "$pre_test_object_deps_done" = no; then
++	 case $p in
++	 -L* | -R*)
++	   # Internal compiler library paths should come after those
++	   # provided the user.  The postdeps already come after the
++	   # user supplied libs so there is no need to process them.
++	   if test -z "$compiler_lib_search_path_CXX"; then
++	     compiler_lib_search_path_CXX="${prev}${p}"
++	   else
++	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
++	   fi
++	   ;;
++	 # The "-l" case would never come before the object being
++	 # linked, so don't bother handling this case.
++	 esac
++       else
++	 if test -z "$postdeps_CXX"; then
++	   postdeps_CXX="${prev}${p}"
++	 else
++	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
++	 fi
++       fi
++       ;;
++
++    *.$objext)
++       # This assumes that the test object file only shows up
++       # once in the compiler output.
++       if test "$p" = "conftest.$objext"; then
++	 pre_test_object_deps_done=yes
++	 continue
++       fi
++
++       if test "$pre_test_object_deps_done" = no; then
++	 if test -z "$predep_objects_CXX"; then
++	   predep_objects_CXX="$p"
++	 else
++	   predep_objects_CXX="$predep_objects_CXX $p"
++	 fi
++       else
++	 if test -z "$postdep_objects_CXX"; then
++	   postdep_objects_CXX="$p"
++	 else
++	   postdep_objects_CXX="$postdep_objects_CXX $p"
++	 fi
++       fi
++       ;;
++
++    *) ;; # Ignore the rest.
++
++    esac
++  done
++
++  # Clean up.
++  rm -f a.out a.exe
++else
++  echo "libtool.m4: error: problem compiling CXX test program"
++fi
++
++$rm -f confest.$objext
++
++case " $postdeps_CXX " in
++*" -lc "*) archive_cmds_need_lc_CXX=no ;;
++esac
++
++lt_prog_compiler_wl_CXX=
++lt_prog_compiler_pic_CXX=
++lt_prog_compiler_static_CXX=
++
++echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++
++  # C++ specific cases for pic, static, wl, etc.
++  if test "$GXX" = yes; then
++    lt_prog_compiler_wl_CXX='-Wl,'
++    lt_prog_compiler_static_CXX='-static'
++
++    case $host_os in
++    aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static_CXX='-Bstatic'
++      fi
++      ;;
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
++      ;;
++    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++    mingw* | os2* | pw32*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
++      ;;
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_prog_compiler_pic_CXX='-fno-common'
++      ;;
++    *djgpp*)
++      # DJGPP does not support shared libraries at all
++      lt_prog_compiler_pic_CXX=
++      ;;
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	lt_prog_compiler_pic_CXX=-Kconform_pic
++      fi
++      ;;
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	;;
++      *)
++	lt_prog_compiler_pic_CXX='-fPIC'
++	;;
++      esac
++      ;;
++    *)
++      lt_prog_compiler_pic_CXX='-fPIC'
++      ;;
++    esac
++  else
++    case $host_os in
++      aix4* | aix5*)
++	# All AIX code is PIC.
++	if test "$host_cpu" = ia64; then
++	  # AIX 5 now supports IA64 processor
++	  lt_prog_compiler_static_CXX='-Bstatic'
++	else
++	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
++	fi
++	;;
++      chorus*)
++	case $cc_basename in
++	cxch68)
++	  # Green Hills C++ Compiler
++	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
++	  ;;
++	esac
++	;;
++       darwin*)
++         # PIC is the default on this platform
++         # Common symbols not allowed in MH_DYLIB files
++         case "$cc_basename" in
++           xlc*)
++           lt_prog_compiler_pic_CXX='-qnocommon'
++           lt_prog_compiler_wl_CXX='-Wl,'
++           ;;
++         esac
++       ;;
++      dgux*)
++	case $cc_basename in
++	  ec++)
++	    lt_prog_compiler_pic_CXX='-KPIC'
++	    ;;
++	  ghcx)
++	    # Green Hills C++ Compiler
++	    lt_prog_compiler_pic_CXX='-pic'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      freebsd* | kfreebsd*-gnu)
++	# FreeBSD uses GNU C++
++	;;
++      hpux9* | hpux10* | hpux11*)
++	case $cc_basename in
++	  CC)
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
++	    if test "$host_cpu" != ia64; then
++	      lt_prog_compiler_pic_CXX='+Z'
++	    fi
++	    ;;
++	  aCC)
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
++	    case "$host_cpu" in
++	    hppa*64*|ia64*)
++	      # +Z the default
++	      ;;
++	    *)
++	      lt_prog_compiler_pic_CXX='+Z'
++	      ;;
++	    esac
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      irix5* | irix6* | nonstopux*)
++	case $cc_basename in
++	  CC)
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_static_CXX='-non_shared'
++	    # CC pic flag -KPIC is the default.
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      linux*)
++	case $cc_basename in
++	  KCC)
++	    # KAI C++ Compiler
++	    lt_prog_compiler_wl_CXX='--backend -Wl,'
++	    lt_prog_compiler_pic_CXX='-fPIC'
++	    ;;
++	  icpc)
++	    # Intel C++
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    lt_prog_compiler_pic_CXX='-KPIC'
++	    lt_prog_compiler_static_CXX='-static'
++	    ;;
++	  cxx)
++	    # Compaq C++
++	    # Make sure the PIC flag is empty.  It appears that all Alpha
++	    # Linux and Compaq Tru64 Unix objects are PIC.
++	    lt_prog_compiler_pic_CXX=
++	    lt_prog_compiler_static_CXX='-non_shared'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      lynxos*)
++	;;
++      m88k*)
++	;;
++      mvs*)
++	case $cc_basename in
++	  cxx)
++	    lt_prog_compiler_pic_CXX='-W c,exportall'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      netbsd*)
++	;;
++      osf3* | osf4* | osf5*)
++	case $cc_basename in
++	  KCC)
++	    lt_prog_compiler_wl_CXX='--backend -Wl,'
++	    ;;
++	  RCC)
++	    # Rational C++ 2.4.1
++	    lt_prog_compiler_pic_CXX='-pic'
++	    ;;
++	  cxx)
++	    # Digital/Compaq C++
++	    lt_prog_compiler_wl_CXX='-Wl,'
++	    # Make sure the PIC flag is empty.  It appears that all Alpha
++	    # Linux and Compaq Tru64 Unix objects are PIC.
++	    lt_prog_compiler_pic_CXX=
++	    lt_prog_compiler_static_CXX='-non_shared'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      psos*)
++	;;
++      sco*)
++	case $cc_basename in
++	  CC)
++	    lt_prog_compiler_pic_CXX='-fPIC'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      solaris*)
++	case $cc_basename in
++	  CC)
++	    # Sun C++ 4.2, 5.x and Centerline C++
++	    lt_prog_compiler_pic_CXX='-KPIC'
++	    lt_prog_compiler_static_CXX='-Bstatic'
++	    lt_prog_compiler_wl_CXX='-Qoption ld '
++	    ;;
++	  gcx)
++	    # Green Hills C++ Compiler
++	    lt_prog_compiler_pic_CXX='-PIC'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      sunos4*)
++	case $cc_basename in
++	  CC)
++	    # Sun C++ 4.x
++	    lt_prog_compiler_pic_CXX='-pic'
++	    lt_prog_compiler_static_CXX='-Bstatic'
++	    ;;
++	  lcc)
++	    # Lucid
++	    lt_prog_compiler_pic_CXX='-pic'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      tandem*)
++	case $cc_basename in
++	  NCC)
++	    # NonStop-UX NCC 3.20
++	    lt_prog_compiler_pic_CXX='-KPIC'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      unixware*)
++	;;
++      vxworks*)
++	;;
++      *)
++	lt_prog_compiler_can_build_shared_CXX=no
++	;;
++    esac
++  fi
++
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
++
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$lt_prog_compiler_pic_CXX"; then
++
++echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
++if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_pic_works_CXX=no
++  ac_outfile=conftest.$ac_objext
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:11834: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:11838: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s conftest.err; then
++       lt_prog_compiler_pic_works_CXX=yes
++     fi
++   fi
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
++
++if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
++    case $lt_prog_compiler_pic_CXX in
++     "" | " "*) ;;
++     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
++     esac
++else
++    lt_prog_compiler_pic_CXX=
++     lt_prog_compiler_can_build_shared_CXX=no
++fi
++
++fi
++case "$host_os" in
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    lt_prog_compiler_pic_CXX=
++    ;;
++  *)
++    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
++    ;;
++esac
++
++echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_prog_compiler_c_o_CXX=no
++   $rm -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:11894: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&5
++   echo "$as_me:11898: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s out/conftest2.$ac_objext
++   then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s out/conftest.err; then
++       lt_cv_prog_compiler_c_o_CXX=yes
++     fi
++   fi
++   chmod u+w .
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
++   cd ..
++   rmdir conftest
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6
++
++
++hard_links="nottested"
++if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6
++  if test "$hard_links" = no; then
++    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
++
++echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++
++  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  case $host_os in
++  aix4* | aix5*)
++    # If we're using GNU nm, then we don't want the "-C" option.
++    # -C means demangle to AIX nm, but means don't demangle with GNU nm
++    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
++      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++    else
++      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++    fi
++    ;;
++  pw32*)
++    export_symbols_cmds_CXX="$ltdll_cmds"
++  ;;
++  cygwin* | mingw*)
++    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++  ;;
++  *)
++    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  ;;
++  esac
++
++echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
++echo "${ECHO_T}$ld_shlibs_CXX" >&6
++test "$ld_shlibs_CXX" = no && can_build_shared=no
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
++#
++# Do we need to explicitly link libc?
++#
++case "x$archive_cmds_need_lc_CXX" in
++x|xyes)
++  # Assume -lc should be added
++  archive_cmds_need_lc_CXX=yes
++
++  if test "$enable_shared" = yes && test "$GCC" = yes; then
++    case $archive_cmds_CXX in
++    *'~'*)
++      # FIXME: we may have to deal with multi-command sequences.
++      ;;
++    '$CC '*)
++      # Test whether the compiler implicitly links with -lc since on some
++      # systems, -lgcc has to come before -lc. If gcc already passes -lc
++      # to ld, don't add -lc before -lgcc.
++      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++      $rm conftest*
++      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        libobjs=conftest.$ac_objext
++        deplibs=
++        wl=$lt_prog_compiler_wl_CXX
++        compiler_flags=-v
++        linker_flags=-v
++        verstring=
++        output_objdir=.
++        libname=conftest
++        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
++        allow_undefined_flag_CXX=
++        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
++  (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++        then
++	  archive_cmds_need_lc_CXX=no
++        else
++	  archive_cmds_need_lc_CXX=yes
++        fi
++        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
++      else
++        cat conftest.err 1>&5
++      fi
++      $rm conftest*
++      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6
++      ;;
++    esac
++  fi
++  ;;
++esac
++
++echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
++need_lib_prefix=unknown
++hardcode_into_libs=no
++
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
++
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  shlibpath_var=LIBPATH
++
++  # AIX 3 has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}${shared_ext}$major'
++  ;;
++
++aix4* | aix5*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[01] | aix4.[01].*)
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	   echo ' yes '
++	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++	:
++      else
++	can_build_shared=no
++      fi
++      ;;
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}${shared_ext}$major'
++    fi
++    shlibpath_var=LIBPATH
++  fi
++  ;;
++
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++  ;;
++
++beos*)
++  library_names_spec='${libname}${shared_ext}'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
++
++bsdi[45]*)
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
++
++cygwin* | mingw* | pw32*)
++  version_type=windows
++  shrext_cmds=".dll"
++  need_version=no
++  need_lib_prefix=no
++
++  case $GCC,$host_os in
++  yes,cygwin* | yes,mingw* | yes,pw32*)
++    library_names_spec='$libname.dll.a'
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $rm \$dlpath'
++    shlibpath_overrides_runpath=yes
++
++    case $host_os in
++    cygwin*)
++      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
++    mingw*)
++      # MinGW DLLs use traditional 'lib' prefix
++      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
++        # It is most probably a Windows format PATH printed by
++        # mingw gcc, but we are running on Cygwin. Gcc prints its search
++        # path with ; separators, and with drive letters. We can handle the
++        # drive letters (cygwin fileutils understands them), so leave them,
++        # especially as we might pass files found there to a mingw objdump,
++        # which wouldn't understand a cygwinified path. Ahh.
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++      fi
++      ;;
++    pw32*)
++      # pw32 DLLs use 'pw' prefix rather than 'lib'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++      ;;
++    esac
++    ;;
++
++  *)
++    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    ;;
++  esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  ;;
++
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  soname_spec='${libname}${release}${major}$shared_ext'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
++  if test "$GCC" = yes; then
++    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
++  else
++    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
++  fi
++  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++  ;;
++
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++freebsd1*)
++  dynamic_linker=no
++  ;;
++
++kfreebsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++freebsd*)
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
++    ;;
++  freebsd3.01* | freebsdelf3.01*)
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
++  *) # from 3.2 on
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
++    ;;
++  esac
++  ;;
++
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  ;;
++
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  case "$host_cpu" in
++  ia64*)
++    shrext_cmds='.so'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.so"
++    shlibpath_var=LD_LIBRARY_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    if test "X$HPUX_IA64_MODE" = X32; then
++      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++    else
++      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++    fi
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    ;;
++   hppa*64*)
++     shrext_cmds='.sl'
++     hardcode_into_libs=yes
++     dynamic_linker="$host_os dld.sl"
++     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++     soname_spec='${libname}${release}${shared_ext}$major'
++     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++     ;;
++   *)
++    shrext_cmds='.sl'
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=SHLIB_PATH
++    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    ;;
++  esac
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
++    *)
++	if test "$lt_cv_prog_gnu_ld" = yes; then
++		version_type=linux
++	else
++		version_type=irix
++	fi ;;
++  esac
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  case $host_os in
++  irix5* | nonstopux*)
++    libsuff= shlibsuff=
++    ;;
++  *)
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++      libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++      libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++      libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  hardcode_into_libs=yes
++  ;;
++
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++  dynamic_linker=no
++  ;;
++
++# This must be Linux ELF.
++linux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
++
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
++
++knetbsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++nto-qnx*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++openbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    case $host_os in
++      openbsd2.[89] | openbsd2.[89].*)
++	shlibpath_overrides_runpath=no
++	;;
++      *)
++	shlibpath_overrides_runpath=yes
++	;;
++      esac
++  else
++    shlibpath_overrides_runpath=yes
++  fi
++  ;;
++
++os2*)
++  libname_spec='$name'
++  shrext_cmds=".dll"
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
++
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
++
++sco3.2v5*)
++  version_type=osf
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
++
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      export_dynamic_flag_spec='${wl}-Blargedynsym'
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
++
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
++
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++*)
++  dynamic_linker=no
++  ;;
++esac
++echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6
++test "$dynamic_linker" = no && can_build_shared=no
++
++echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++hardcode_action_CXX=
++if test -n "$hardcode_libdir_flag_spec_CXX" || \
++   test -n "$runpath_var_CXX" || \
++   test "X$hardcode_automatic_CXX" = "Xyes" ; then
++
++  # We can hardcode non-existant directories.
++  if test "$hardcode_direct_CXX" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
++     test "$hardcode_minus_L_CXX" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action_CXX=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action_CXX=immediate
++  fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action_CXX=unsupported
++fi
++echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
++echo "${ECHO_T}$hardcode_action_CXX" >&6
++
++if test "$hardcode_action_CXX" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
++
++striplib=
++old_striplib=
++echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
++echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
++  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++else
++# FIXME - insert some real tests, host_os isn't really good enough
++  case $host_os in
++   darwin*)
++       if test -n "$STRIP" ; then
++         striplib="$STRIP -x"
++         echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++       else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++       ;;
++   *)
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++    ;;
++  esac
++fi
++
++if test "x$enable_dlopen" != xyes; then
++  enable_dlopen=unknown
++  enable_dlopen_self=unknown
++  enable_dlopen_self_static=unknown
++else
++  lt_cv_dlopen=no
++  lt_cv_dlopen_libs=
++
++  case $host_os in
++  beos*)
++    lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ;;
++
++  mingw* | pw32*)
++    lt_cv_dlopen="LoadLibrary"
++    lt_cv_dlopen_libs=
++   ;;
++
++  cygwin*)
++    lt_cv_dlopen="dlopen"
++    lt_cv_dlopen_libs=
++   ;;
++
++  darwin*)
++  # if libdl is installed we need to link against it
++    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dl_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dl_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++if test $ac_cv_lib_dl_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++
++fi
++
++   ;;
++
++  *)
++    echo "$as_me:$LINENO: checking for shl_load" >&5
++echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
++if test "${ac_cv_func_shl_load+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.  */
++/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define shl_load innocuous_shl_load
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char shl_load (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef shl_load
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char shl_load ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_shl_load) || defined (__stub___shl_load)
++choke me
++#else
++char (*f) () = shl_load;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != shl_load;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_shl_load=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_shl_load=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
++echo "${ECHO_T}$ac_cv_func_shl_load" >&6
++if test $ac_cv_func_shl_load = yes; then
++  lt_cv_dlopen="shl_load"
++else
++  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
++echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
++if test "${ac_cv_lib_dld_shl_load+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char shl_load ();
++int
++main ()
++{
++shl_load ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dld_shl_load=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dld_shl_load=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
++if test $ac_cv_lib_dld_shl_load = yes; then
++  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
++else
++  echo "$as_me:$LINENO: checking for dlopen" >&5
++echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
++if test "${ac_cv_func_dlopen+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.  */
++/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define dlopen innocuous_dlopen
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char dlopen (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef dlopen
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++{
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_dlopen) || defined (__stub___dlopen)
++choke me
++#else
++char (*f) () = dlopen;
++#endif
++#ifdef __cplusplus
++}
++#endif
++
++int
++main ()
++{
++return f != dlopen;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_func_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_func_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
++echo "${ECHO_T}$ac_cv_func_dlopen" >&6
++if test $ac_cv_func_dlopen = yes; then
++  lt_cv_dlopen="dlopen"
++else
++  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dl_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dl_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++if test $ac_cv_lib_dl_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
++echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
++if test "${ac_cv_lib_svld_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsvld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_svld_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_svld_dlopen=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
++if test $ac_cv_lib_svld_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
++else
++  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
++echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
++if test "${ac_cv_lib_dld_dld_link+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dld_link ();
++int
++main ()
++{
++dld_link ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_cxx_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dld_dld_link=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ac_cv_lib_dld_dld_link=no
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
++echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
++if test $ac_cv_lib_dld_dld_link = yes; then
++  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
++fi
++
++
++fi
++
++
++fi
++
++
++fi
++
++
++fi
++
++
++fi
++
++    ;;
++  esac
++
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
++  else
++    enable_dlopen=no
++  fi
++
++  case $lt_cv_dlopen in
++  dlopen)
++    save_CPPFLAGS="$CPPFLAGS"
++    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++
++    save_LDFLAGS="$LDFLAGS"
++    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++
++    save_LIBS="$LIBS"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
++
++    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
++echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
++if test "${lt_cv_dlopen_self+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self=cross
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++#line 13255 "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}
++EOF
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self=no
++  fi
++fi
++rm -fr conftest*
++
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self" >&6
++
++    if test "x$lt_cv_dlopen_self" = xyes; then
++      LDFLAGS="$LDFLAGS $link_static_flag"
++      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
++echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
++if test "${lt_cv_dlopen_self_static+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self_static=cross
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++#line 13353 "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}
++EOF
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self_static=no
++  fi
++fi
++rm -fr conftest*
++
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
++    fi
++
++    CPPFLAGS="$save_CPPFLAGS"
++    LDFLAGS="$save_LDFLAGS"
++    LIBS="$save_LIBS"
++    ;;
++  esac
++
++  case $lt_cv_dlopen_self in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
++  esac
++
++  case $lt_cv_dlopen_self_static in
++  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++  *) enable_dlopen_self_static=unknown ;;
++  esac
++fi
++
++
++# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # See if we are running on zsh, and set the options which allow our commands through
++  # without removal of \ escapes.
++  if test -n "${ZSH_VERSION+set}" ; then
++    setopt NO_GLOB_SUBST
++  fi
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++    SED SHELL STRIP \
++    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++    deplibs_check_method reload_flag reload_cmds need_locks \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    old_postinstall_cmds old_postuninstall_cmds \
++    compiler_CXX \
++    CC_CXX \
++    LD_CXX \
++    lt_prog_compiler_wl_CXX \
++    lt_prog_compiler_pic_CXX \
++    lt_prog_compiler_static_CXX \
++    lt_prog_compiler_no_builtin_flag_CXX \
++    export_dynamic_flag_spec_CXX \
++    thread_safe_flag_spec_CXX \
++    whole_archive_flag_spec_CXX \
++    enable_shared_with_static_runtimes_CXX \
++    old_archive_cmds_CXX \
++    old_archive_from_new_cmds_CXX \
++    predep_objects_CXX \
++    postdep_objects_CXX \
++    predeps_CXX \
++    postdeps_CXX \
++    compiler_lib_search_path_CXX \
++    archive_cmds_CXX \
++    archive_expsym_cmds_CXX \
++    postinstall_cmds_CXX \
++    postuninstall_cmds_CXX \
++    old_archive_from_expsyms_cmds_CXX \
++    allow_undefined_flag_CXX \
++    no_undefined_flag_CXX \
++    export_symbols_cmds_CXX \
++    hardcode_libdir_flag_spec_CXX \
++    hardcode_libdir_flag_spec_ld_CXX \
++    hardcode_libdir_separator_CXX \
++    hardcode_automatic_CXX \
++    module_cmds_CXX \
++    module_expsym_cmds_CXX \
++    lt_cv_prog_compiler_c_o_CXX \
++    exclude_expsyms_CXX \
++    include_expsyms_CXX; do
++
++    case $var in
++    old_archive_cmds_CXX | \
++    old_archive_from_new_cmds_CXX | \
++    archive_cmds_CXX | \
++    archive_expsym_cmds_CXX | \
++    module_cmds_CXX | \
++    module_expsym_cmds_CXX | \
++    old_archive_from_expsyms_cmds_CXX | \
++    export_symbols_cmds_CXX | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  case $lt_echo in
++  *'\$0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
++    ;;
++  esac
++
++cfgfile="$ofile"
++
++  cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
++
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_CXX
++
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
++
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
++
++# A C compiler.
++LTCC=$lt_LTCC
++
++# A language-specific compiler.
++CC=$lt_compiler_CXX
++
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_CXX
++
++# An ERE matcher.
++EGREP=$lt_EGREP
++
++# The linker used to build libraries.
++LD=$lt_LD_CXX
++
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
++
++# A BSD-compatible nm program.
++NM=$lt_NM
++
++# A symbol stripping program
++STRIP=$lt_STRIP
++
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_CXX
++
++# Object file suffix (normally "o").
++objext="$ac_objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
++
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic_CXX
++pic_mode=$pic_mode
++
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
++
++# Must we lock files when doing compilation ?
++need_locks=$lt_need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_CXX
++
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
++
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
++
++# Library versioning type.
++version_type=$version_type
++
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
++
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds_CXX
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
++
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
++
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
++
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds_CXX
++archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
++
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds_CXX
++module_expsym_cmds=$lt_module_expsym_cmds_CXX
++
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_CXX
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_CXX
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps_CXX
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps_CXX
++
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
++
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_CXX
++
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_CXX
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
++
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
++
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
++
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action_CXX
++
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
++
++# If ld is used when linking, flag to hardcode \$libdir into
++# a binary during linking. This must work even if \$libdir does
++# not exist.
++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
++
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
++
++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct_CXX
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L_CXX
++
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
++
++# Set to yes if building a shared library automatically hardcodes DIR into the library
++# and all subsequent libraries and executables linked against it.
++hardcode_automatic=$hardcode_automatic_CXX
++
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
++
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs_CXX
++
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path_CXX"
++
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols_CXX
++
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds_CXX
++
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms_CXX
++
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms_CXX
++
++# ### END LIBTOOL TAG CONFIG: $tagname
++
++__EOF__
++
++
++else
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
++fi
++
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++CC=$lt_save_CC
++LDCXX=$LD
++LD=$lt_save_LD
++GCC=$lt_save_GCC
++with_gnu_ldcxx=$with_gnu_ld
++with_gnu_ld=$lt_save_with_gnu_ld
++lt_cv_path_LDCXX=$lt_cv_path_LD
++lt_cv_path_LD=$lt_save_path_LD
++lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
++lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
++
++	else
++	  tagname=""
++	fi
++	;;
++
++      F77)
++	if test -n "$F77" && test "X$F77" != "Xno"; then
++
++ac_ext=f
++ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
++ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_f77_compiler_gnu
++
++
++archive_cmds_need_lc_F77=no
++allow_undefined_flag_F77=
++always_export_symbols_F77=no
++archive_expsym_cmds_F77=
++export_dynamic_flag_spec_F77=
++hardcode_direct_F77=no
++hardcode_libdir_flag_spec_F77=
++hardcode_libdir_flag_spec_ld_F77=
++hardcode_libdir_separator_F77=
++hardcode_minus_L_F77=no
++hardcode_automatic_F77=no
++module_cmds_F77=
++module_expsym_cmds_F77=
++link_all_deplibs_F77=unknown
++old_archive_cmds_F77=$old_archive_cmds
++no_undefined_flag_F77=
++whole_archive_flag_spec_F77=
++enable_shared_with_static_runtimes_F77=no
++
++# Source file extension for f77 test sources.
++ac_ext=f
++
++# Object file extension for compiled f77 test sources.
++objext=o
++objext_F77=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code="      program t\n      end\n"
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
++
++# Allow CC to be a program name with arguments.
++compiler=$CC
++
++
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${F77-"f77"}
++compiler=$CC
++compiler_F77=$CC
++cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++
++echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
++echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
++echo "$as_me:$LINENO: result: $can_build_shared" >&5
++echo "${ECHO_T}$can_build_shared" >&6
++
++echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
++echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
++test "$can_build_shared" = "no" && enable_shared=no
++
++# On AIX, shared libraries and static libraries use the same namespace, and
++# are all built from PIC.
++case "$host_os" in
++aix3*)
++  test "$enable_shared" = yes && enable_static=no
++  if test -n "$RANLIB"; then
++    archive_cmds="$archive_cmds~\$RANLIB \$lib"
++    postinstall_cmds='$RANLIB $lib'
++  fi
++  ;;
++aix4* | aix5*)
++  test "$enable_shared" = yes && enable_static=no
++  ;;
++esac
++echo "$as_me:$LINENO: result: $enable_shared" >&5
++echo "${ECHO_T}$enable_shared" >&6
++
++echo "$as_me:$LINENO: checking whether to build static libraries" >&5
++echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
++# Make sure either enable_shared or enable_static is yes.
++test "$enable_shared" = yes || enable_static=yes
++echo "$as_me:$LINENO: result: $enable_static" >&5
++echo "${ECHO_T}$enable_static" >&6
++
++test "$ld_shlibs_F77" = no && can_build_shared=no
++
++GCC_F77="$G77"
++LD_F77="$LD"
++
++lt_prog_compiler_wl_F77=
++lt_prog_compiler_pic_F77=
++lt_prog_compiler_static_F77=
++
++echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
++
++  if test "$GCC" = yes; then
++    lt_prog_compiler_wl_F77='-Wl,'
++    lt_prog_compiler_static_F77='-static'
++
++    case $host_os in
++      aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static_F77='-Bstatic'
++      fi
++      ;;
++
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
++      ;;
++
++    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
++      ;;
++
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      lt_prog_compiler_pic_F77='-fno-common'
++      ;;
++
++    msdosdjgpp*)
++      # Just because we use GCC doesn't mean we suddenly get shared libraries
++      # on systems that don't support them.
++      lt_prog_compiler_can_build_shared_F77=no
++      enable_shared=no
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	lt_prog_compiler_pic_F77=-Kconform_pic
++      fi
++      ;;
++
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic_F77='-fPIC'
++	;;
++      esac
++      ;;
++
++    *)
++      lt_prog_compiler_pic_F77='-fPIC'
++      ;;
++    esac
++  else
++    # PORTME Check for flag to pass linker flags through the system compiler.
++    case $host_os in
++    aix*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static_F77='-Bstatic'
++      else
++	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
++      fi
++      ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case "$cc_basename" in
++         xlc*)
++         lt_prog_compiler_pic_F77='-qnocommon'
++         lt_prog_compiler_wl_F77='-Wl,'
++         ;;
++       esac
++       ;;
++
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
++      ;;
++
++    hpux9* | hpux10* | hpux11*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic_F77='+Z'
++	;;
++      esac
++      # Is there a better lt_prog_compiler_static that works with the bundled CC?
++      lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      # PIC (with -KPIC) is the default.
++      lt_prog_compiler_static_F77='-non_shared'
++      ;;
++
++    newsos6)
++      lt_prog_compiler_pic_F77='-KPIC'
++      lt_prog_compiler_static_F77='-Bstatic'
++      ;;
++
++    linux*)
++      case $CC in
++      icc* | ecc*)
++	lt_prog_compiler_wl_F77='-Wl,'
++	lt_prog_compiler_pic_F77='-KPIC'
++	lt_prog_compiler_static_F77='-static'
++        ;;
++      ccc*)
++        lt_prog_compiler_wl_F77='-Wl,'
++        # All Alpha code is PIC.
++        lt_prog_compiler_static_F77='-non_shared'
++        ;;
++      esac
++      ;;
++
++    osf3* | osf4* | osf5*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      # All OSF/1 code is PIC.
++      lt_prog_compiler_static_F77='-non_shared'
++      ;;
++
++    sco3.2v5*)
++      lt_prog_compiler_pic_F77='-Kpic'
++      lt_prog_compiler_static_F77='-dn'
++      ;;
++
++    solaris*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      lt_prog_compiler_pic_F77='-KPIC'
++      lt_prog_compiler_static_F77='-Bstatic'
++      ;;
++
++    sunos4*)
++      lt_prog_compiler_wl_F77='-Qoption ld '
++      lt_prog_compiler_pic_F77='-PIC'
++      lt_prog_compiler_static_F77='-Bstatic'
++      ;;
++
++    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++      lt_prog_compiler_wl_F77='-Wl,'
++      lt_prog_compiler_pic_F77='-KPIC'
++      lt_prog_compiler_static_F77='-Bstatic'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	lt_prog_compiler_pic_F77='-Kconform_pic'
++	lt_prog_compiler_static_F77='-Bstatic'
++      fi
++      ;;
++
++    uts4*)
++      lt_prog_compiler_pic_F77='-pic'
++      lt_prog_compiler_static_F77='-Bstatic'
++      ;;
++
++    *)
++      lt_prog_compiler_can_build_shared_F77=no
++      ;;
++    esac
++  fi
++
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
++
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$lt_prog_compiler_pic_F77"; then
++
++echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
++if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_prog_compiler_pic_works_F77=no
++  ac_outfile=conftest.$ac_objext
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$lt_prog_compiler_pic_F77"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:14190: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:14194: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s conftest.err; then
++       lt_prog_compiler_pic_works_F77=yes
++     fi
++   fi
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
++
++if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
++    case $lt_prog_compiler_pic_F77 in
++     "" | " "*) ;;
++     *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
++     esac
++else
++    lt_prog_compiler_pic_F77=
++     lt_prog_compiler_can_build_shared_F77=no
++fi
++
++fi
++case "$host_os" in
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    lt_prog_compiler_pic_F77=
++    ;;
++  *)
++    lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
++    ;;
++esac
++
++echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  lt_cv_prog_compiler_c_o_F77=no
++   $rm -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:14250: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&5
++   echo "$as_me:14254: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s out/conftest2.$ac_objext
++   then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s out/conftest.err; then
++       lt_cv_prog_compiler_c_o_F77=yes
++     fi
++   fi
++   chmod u+w .
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
++   cd ..
++   rmdir conftest
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
++
++
++hard_links="nottested"
++if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  echo "$as_me:$LINENO: result: $hard_links" >&5
++echo "${ECHO_T}$hard_links" >&6
++  if test "$hard_links" = no; then
++    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
++
++echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
++
++  runpath_var=
++  allow_undefined_flag_F77=
++  enable_shared_with_static_runtimes_F77=no
++  archive_cmds_F77=
++  archive_expsym_cmds_F77=
++  old_archive_From_new_cmds_F77=
++  old_archive_from_expsyms_cmds_F77=
++  export_dynamic_flag_spec_F77=
++  whole_archive_flag_spec_F77=
++  thread_safe_flag_spec_F77=
++  hardcode_libdir_flag_spec_F77=
++  hardcode_libdir_flag_spec_ld_F77=
++  hardcode_libdir_separator_F77=
++  hardcode_direct_F77=no
++  hardcode_minus_L_F77=no
++  hardcode_shlibpath_var_F77=unsupported
++  link_all_deplibs_F77=unknown
++  hardcode_automatic_F77=no
++  module_cmds_F77=
++  module_expsym_cmds_F77=
++  always_export_symbols_F77=no
++  export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  # include_expsyms should be a list of space-separated symbols to be *always*
++  # included in the symbol list
++  include_expsyms_F77=
++  # exclude_expsyms can be an extended regexp of symbols to exclude
++  # it will be wrapped by ` (' and `)$', so one must not match beginning or
++  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++  # as well as any symbol that contains `d'.
++  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
++  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++  # platforms (ab)use it in PIC code, but their linkers get confused if
++  # the symbol is explicitly referenced.  Since portable code cannot
++  # rely on this symbol name, it's probably fine to never include it in
++  # preloaded symbol tables.
++  extract_expsyms_cmds=
++
++  case $host_os in
++  cygwin* | mingw* | pw32*)
++    # FIXME: the MSVC++ port hasn't been tested in a loooong time
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    if test "$GCC" != yes; then
++      with_gnu_ld=no
++    fi
++    ;;
++  openbsd*)
++    with_gnu_ld=no
++    ;;
++  esac
++
++  ld_shlibs_F77=yes
++  if test "$with_gnu_ld" = yes; then
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    wlarc='${wl}'
++
++    # See if GNU ld supports shared libraries.
++    case $host_os in
++    aix3* | aix4* | aix5*)
++      # On AIX/PPC, the GNU linker is very broken
++      if test "$host_cpu" != ia64; then
++	ld_shlibs_F77=no
++	cat <<EOF 1>&2
++
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
++
++EOF
++      fi
++      ;;
++
++    amigaos*)
++      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      hardcode_minus_L_F77=yes
++
++      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
++      # that the semantics of dynamic libraries on AmigaOS, at least up
++      # to version 4, is to share data among multiple programs linked
++      # with the same dynamic library.  Since this doesn't match the
++      # behavior of shared libraries on other platforms, we can't use
++      # them.
++      ld_shlibs_F77=no
++      ;;
++
++    beos*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	allow_undefined_flag_F77=unsupported
++	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++	# support --undefined.  This deserves some investigation.  FIXME
++	archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      else
++	ld_shlibs_F77=no
++      fi
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
++      # as there is no search path for DLLs.
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      allow_undefined_flag_F77=unsupported
++      always_export_symbols_F77=no
++      enable_shared_with_static_runtimes_F77=yes
++      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++
++      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++	# If the export-symbols file already is a .def file (1st line
++	# is EXPORTS), use it as is; otherwise, prepend...
++	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	  cp $export_symbols $output_objdir/$soname.def;
++	else
++	  echo EXPORTS > $output_objdir/$soname.def;
++	  cat $export_symbols >> $output_objdir/$soname.def;
++	fi~
++	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
++    netbsd*)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++	wlarc=
++      else
++	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      fi
++      ;;
++
++    solaris* | sysv5*)
++      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
++	ld_shlibs_F77=no
++	cat <<EOF 1>&2
++
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++EOF
++      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	ld_shlibs_F77=no
++      fi
++      ;;
++
++    sunos4*)
++      archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      wlarc=
++      hardcode_direct_F77=yes
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++  linux*)
++    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_cmds_F77="$tmp_archive_cmds"
++      supports_anon_versioning=no
++      case `$LD -v 2>/dev/null` in
++        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
++        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++        *\ 2.11.*) ;; # other 2.11 versions
++        *) supports_anon_versioning=yes ;;
++      esac
++      if test $supports_anon_versioning = yes; then
++        archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
++cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++$echo "local: *; };" >> $output_objdir/$libname.ver~
++        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++      else
++        archive_expsym_cmds_F77="$tmp_archive_cmds"
++      fi
++    else
++      ld_shlibs_F77=no
++    fi
++    ;;
++
++    *)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	ld_shlibs_F77=no
++      fi
++      ;;
++    esac
++
++    if test "$ld_shlibs_F77" = yes; then
++      runpath_var=LD_RUN_PATH
++      hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
++      export_dynamic_flag_spec_F77='${wl}--export-dynamic'
++      # ancient GNU ld didn't support --whole-archive et. al.
++      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++ 	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	whole_archive_flag_spec_F77=
++      fi
++    fi
++  else
++    # PORTME fill in a description of your system's linker (not GNU ld)
++    case $host_os in
++    aix3*)
++      allow_undefined_flag_F77=unsupported
++      always_export_symbols_F77=yes
++      archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
++      # Note: this linker hardcodes the directories in LIBPATH if there
++      # are no directories specified by -L.
++      hardcode_minus_L_F77=yes
++      if test "$GCC" = yes && test -z "$link_static_flag"; then
++	# Neither direct hardcoding nor static linking is supported with a
++	# broken collect2.
++	hardcode_direct_F77=unsupported
++      fi
++      ;;
++
++    aix4* | aix5*)
++      if test "$host_cpu" = ia64; then
++	# On IA64, the linker does run time linking by default, so we don't
++	# have to do anything special.
++	aix_use_runtimelinking=no
++	exp_sym_flag='-Bexport'
++	no_entry_flag=""
++      else
++	# If we're using GNU nm, then we don't want the "-C" option.
++	# -C means demangle to AIX nm, but means don't demangle with GNU nm
++	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
++	  export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++	else
++	  export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++	fi
++	aix_use_runtimelinking=no
++
++	# Test if we are trying to use run time linking or normal
++	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
++	# need to do runtime linking.
++	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++	  for ld_flag in $LDFLAGS; do
++  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++  	    aix_use_runtimelinking=yes
++  	    break
++  	  fi
++	  done
++	esac
++
++	exp_sym_flag='-bexport'
++	no_entry_flag='-bnoentry'
++      fi
++
++      # When large executables or shared objects are built, AIX ld can
++      # have problems creating the table of contents.  If linking a library
++      # or program results in "error TOC overflow" add -mminimal-toc to
++      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++      archive_cmds_F77=''
++      hardcode_direct_F77=yes
++      hardcode_libdir_separator_F77=':'
++      link_all_deplibs_F77=yes
++
++      if test "$GCC" = yes; then
++	case $host_os in aix4.012|aix4.012.*)
++	# We only want to do this on AIX 4.2 and lower, the check
++	# below for broken collect2 doesn't work under 4.3+
++	  collect2name=`${CC} -print-prog-name=collect2`
++	  if test -f "$collect2name" && \
++  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	  then
++  	  # We have reworked collect2
++  	  hardcode_direct_F77=yes
++	  else
++  	  # We have old collect2
++  	  hardcode_direct_F77=unsupported
++  	  # It fails to find uninstalled libraries when the uninstalled
++  	  # path is not listed in the libpath.  Setting hardcode_minus_L
++  	  # to unsupported forces relinking
++  	  hardcode_minus_L_F77=yes
++  	  hardcode_libdir_flag_spec_F77='-L$libdir'
++  	  hardcode_libdir_separator_F77=
++	  fi
++	esac
++	shared_flag='-shared'
++      else
++	# not using gcc
++	if test "$host_cpu" = ia64; then
++  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++  	# chokes on -Wl,-G. The following line is correct:
++	  shared_flag='-G'
++	else
++  	if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag='${wl}-G'
++	  else
++	    shared_flag='${wl}-bM:SRE'
++  	fi
++	fi
++      fi
++
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      always_export_symbols_F77=yes
++      if test "$aix_use_runtimelinking" = yes; then
++	# Warning - without using the other runtime loading flags (-brtl),
++	# -berok will link without error, but may produce a broken library.
++	allow_undefined_flag_F77='-berok'
++       # Determine the default libpath from the value encoded in an empty executable.
++       cat >conftest.$ac_ext <<_ACEOF
++      program main
++
++      end
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++       hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
++	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++       else
++	if test "$host_cpu" = ia64; then
++	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
++	  allow_undefined_flag_F77="-z nodefs"
++	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++	else
++	 # Determine the default libpath from the value encoded in an empty executable.
++	 cat >conftest.$ac_ext <<_ACEOF
++      program main
++
++      end
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_f77_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++	 hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
++	  # Warning - without using the other run time loading flags,
++	  # -berok will link without error, but may produce a broken library.
++	  no_undefined_flag_F77=' ${wl}-bernotok'
++	  allow_undefined_flag_F77=' ${wl}-berok'
++	  # -bexpall does not export symbols beginning with underscore (_)
++	  always_export_symbols_F77=yes
++	  # Exported symbols can be pulled into shared objects from archives
++	  whole_archive_flag_spec_F77=' '
++	  archive_cmds_need_lc_F77=yes
++	  # This is similar to how AIX traditionally builds it's shared libraries.
++	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	fi
++      fi
++      ;;
++
++    amigaos*)
++      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      hardcode_minus_L_F77=yes
++      # see comment about different semantics on the GNU ld section
++      ld_shlibs_F77=no
++      ;;
++
++    bsdi[45]*)
++      export_dynamic_flag_spec_F77=-rdynamic
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # When not using gcc, we currently assume that we are using
++      # Microsoft Visual C++.
++      # hardcode_libdir_flag_spec is actually meaningless, as there is
++      # no search path for DLLs.
++      hardcode_libdir_flag_spec_F77=' '
++      allow_undefined_flag_F77=unsupported
++      # Tell ltmain to make .lib files, not .a files.
++      libext=lib
++      # Tell ltmain to make .dll files, not .so files.
++      shrext_cmds=".dll"
++      # FIXME: Setting linknames here is a bad hack.
++      archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      # The linker will automatically build a .lib file if we build a DLL.
++      old_archive_From_new_cmds_F77='true'
++      # FIXME: Should let the user specify the lib program.
++      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      enable_shared_with_static_runtimes_F77=yes
++      ;;
++
++    darwin* | rhapsody*)
++      case "$host_os" in
++        rhapsody* | darwin1.[012])
++         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[012])
++               allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++      esac
++      archive_cmds_need_lc_F77=no
++      hardcode_direct_F77=no
++      hardcode_automatic_F77=yes
++      hardcode_shlibpath_var_F77=unsupported
++      whole_archive_flag_spec_F77=''
++      link_all_deplibs_F77=yes
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++      archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++    else
++      case "$cc_basename" in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         ld_shlibs_F77=no
++          ;;
++      esac
++    fi
++      ;;
++
++    dgux*)
++      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    freebsd1*)
++      ld_shlibs_F77=no
++      ;;
++
++    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++    # support.  Future versions do this automatically, but an explicit c++rt0.o
++    # does not break anything, and helps significantly (at the cost of a little
++    # extra space).
++    freebsd2.2*)
++      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++      hardcode_libdir_flag_spec_F77='-R$libdir'
++      hardcode_direct_F77=yes
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++    freebsd2*)
++      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct_F77=yes
++      hardcode_minus_L_F77=yes
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++    freebsd* | kfreebsd*-gnu)
++      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++      hardcode_libdir_flag_spec_F77='-R$libdir'
++      hardcode_direct_F77=yes
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    hpux9*)
++      if test "$GCC" = yes; then
++	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      else
++	archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      fi
++      hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
++      hardcode_libdir_separator_F77=:
++      hardcode_direct_F77=yes
++
++      # hardcode_minus_L: Not really in the search PATH,
++      # but as the default location of the library.
++      hardcode_minus_L_F77=yes
++      export_dynamic_flag_spec_F77='${wl}-E'
++      ;;
++
++    hpux10* | hpux11*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	esac
++      else
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	*)
++	  archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	esac
++      fi
++      if test "$with_gnu_ld" = no; then
++	case "$host_cpu" in
++	hppa*64*)
++	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
++	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
++	  hardcode_libdir_separator_F77=:
++	  hardcode_direct_F77=no
++	  hardcode_shlibpath_var_F77=no
++	  ;;
++	ia64*)
++	  hardcode_libdir_flag_spec_F77='-L$libdir'
++	  hardcode_direct_F77=no
++	  hardcode_shlibpath_var_F77=no
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  hardcode_minus_L_F77=yes
++	  ;;
++	*)
++	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
++	  hardcode_libdir_separator_F77=:
++	  hardcode_direct_F77=yes
++	  export_dynamic_flag_spec_F77='${wl}-E'
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  hardcode_minus_L_F77=yes
++	  ;;
++	esac
++      fi
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      if test "$GCC" = yes; then
++	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
++      fi
++      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator_F77=:
++      link_all_deplibs_F77=yes
++      ;;
++
++    netbsd*)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++      else
++	archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++      fi
++      hardcode_libdir_flag_spec_F77='-R$libdir'
++      hardcode_direct_F77=yes
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    newsos6)
++      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct_F77=yes
++      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator_F77=:
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    openbsd*)
++      hardcode_direct_F77=yes
++      hardcode_shlibpath_var_F77=no
++      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec_F77='${wl}-E'
++      else
++       case $host_os in
++	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	   hardcode_libdir_flag_spec_F77='-R$libdir'
++	   ;;
++	 *)
++	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++	   ;;
++       esac
++      fi
++      ;;
++
++    os2*)
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      hardcode_minus_L_F77=yes
++      allow_undefined_flag_F77=unsupported
++      archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++      old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++      ;;
++
++    osf3*)
++      if test "$GCC" = yes; then
++	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	allow_undefined_flag_F77=' -expect_unresolved \*'
++	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++      fi
++      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator_F77=:
++      ;;
++
++    osf4* | osf5*)	# as osf3* with the addition of -msym flag
++      if test "$GCC" = yes; then
++	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
++      else
++	allow_undefined_flag_F77=' -expect_unresolved \*'
++	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++
++	# Both c and cxx compiler support -rpath directly
++	hardcode_libdir_flag_spec_F77='-rpath $libdir'
++      fi
++      hardcode_libdir_separator_F77=:
++      ;;
++
++    sco3.2v5*)
++      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var_F77=no
++      export_dynamic_flag_spec_F77='${wl}-Bexport'
++      runpath_var=LD_RUN_PATH
++      hardcode_runpath_var=yes
++      ;;
++
++    solaris*)
++      no_undefined_flag_F77=' -z text'
++      if test "$GCC" = yes; then
++	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
++      else
++	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      fi
++      hardcode_libdir_flag_spec_F77='-R$libdir'
++      hardcode_shlibpath_var_F77=no
++      case $host_os in
++      solaris2.[0-5] | solaris2.[0-5].*) ;;
++      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
++	whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
++      esac
++      link_all_deplibs_F77=yes
++      ;;
++
++    sunos4*)
++      if test "x$host_vendor" = xsequent; then
++	# Use $CC to link under sequent, because it throws in some extra .o
++	# files that make .init and .fini sections work.
++	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      hardcode_direct_F77=yes
++      hardcode_minus_L_F77=yes
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    sysv4)
++      case $host_vendor in
++	sni)
++	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct_F77=yes # is this really true???
++	;;
++	siemens)
++	  ## LD is ld it makes a PLAMLIB
++	  ## CC just makes a GrossModule.
++	  archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++	  reload_cmds_F77='$CC -r -o $output$reload_objs'
++	  hardcode_direct_F77=no
++        ;;
++	motorola)
++	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie
++	;;
++      esac
++      runpath_var='LD_RUN_PATH'
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    sysv4.3*)
++      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var_F77=no
++      export_dynamic_flag_spec_F77='-Bexport'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	hardcode_shlibpath_var_F77=no
++	runpath_var=LD_RUN_PATH
++	hardcode_runpath_var=yes
++	ld_shlibs_F77=yes
++      fi
++      ;;
++
++    sysv4.2uw2*)
++      archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct_F77=yes
++      hardcode_minus_L_F77=no
++      hardcode_shlibpath_var_F77=no
++      hardcode_runpath_var=yes
++      runpath_var=LD_RUN_PATH
++      ;;
++
++   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
++      no_undefined_flag_F77='${wl}-z ${wl}text'
++      if test "$GCC" = yes; then
++	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
++      runpath_var='LD_RUN_PATH'
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    sysv5*)
++      no_undefined_flag_F77=' -z text'
++      # $CC -shared without GNU ld will not create a library from C++
++      # object files and a static libstdc++, better avoid it by now
++      archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      hardcode_libdir_flag_spec_F77=
++      hardcode_shlibpath_var_F77=no
++      runpath_var='LD_RUN_PATH'
++      ;;
++
++    uts4*)
++      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec_F77='-L$libdir'
++      hardcode_shlibpath_var_F77=no
++      ;;
++
++    *)
++      ld_shlibs_F77=no
++      ;;
++    esac
++  fi
++
++echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
++echo "${ECHO_T}$ld_shlibs_F77" >&6
++test "$ld_shlibs_F77" = no && can_build_shared=no
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++
++#
++# Do we need to explicitly link libc?
++#
++case "x$archive_cmds_need_lc_F77" in
++x|xyes)
++  # Assume -lc should be added
++  archive_cmds_need_lc_F77=yes
++
++  if test "$enable_shared" = yes && test "$GCC" = yes; then
++    case $archive_cmds_F77 in
++    *'~'*)
++      # FIXME: we may have to deal with multi-command sequences.
++      ;;
++    '$CC '*)
++      # Test whether the compiler implicitly links with -lc since on some
++      # systems, -lgcc has to come before -lc. If gcc already passes -lc
++      # to ld, don't add -lc before -lgcc.
++      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++      $rm conftest*
++      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        libobjs=conftest.$ac_objext
++        deplibs=
++        wl=$lt_prog_compiler_wl_F77
++        compiler_flags=-v
++        linker_flags=-v
++        verstring=
++        output_objdir=.
++        libname=conftest
++        lt_save_allow_undefined_flag=$allow_undefined_flag_F77
++        allow_undefined_flag_F77=
++        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
++  (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++        then
++	  archive_cmds_need_lc_F77=no
++        else
++	  archive_cmds_need_lc_F77=yes
++        fi
++        allow_undefined_flag_F77=$lt_save_allow_undefined_flag
++      else
++        cat conftest.err 1>&5
++      fi
++      $rm conftest*
++      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
++      ;;
++    esac
++  fi
++  ;;
++esac
++
++echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
++shrext_cmds=".so"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
++need_lib_prefix=unknown
++hardcode_into_libs=no
++
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
++
++case $host_os in
++aix3*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
++  shlibpath_var=LIBPATH
++
++  # AIX 3 has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}${shared_ext}$major'
++  ;;
++
++aix4* | aix5*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
++    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[01] | aix4.[01].*)
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	   echo ' yes '
++	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++	:
++      else
++	can_build_shared=no
++      fi
++      ;;
++    esac
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
++      soname_spec='${libname}${release}${shared_ext}$major'
++    fi
++    shlibpath_var=LIBPATH
++  fi
++  ;;
++
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
++  ;;
++
++beos*)
++  library_names_spec='${libname}${shared_ext}'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
++
++bsdi[45]*)
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
++
++cygwin* | mingw* | pw32*)
++  version_type=windows
++  shrext_cmds=".dll"
++  need_version=no
++  need_lib_prefix=no
++
++  case $GCC,$host_os in
++  yes,cygwin* | yes,mingw* | yes,pw32*)
++    library_names_spec='$libname.dll.a'
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
++      $install_prog $dir/$dlname \$dldir/$dlname'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dlpath=$dir/\$dldll~
++       $rm \$dlpath'
++    shlibpath_overrides_runpath=yes
++
++    case $host_os in
++    cygwin*)
++      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
++    mingw*)
++      # MinGW DLLs use traditional 'lib' prefix
++      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
++        # It is most probably a Windows format PATH printed by
++        # mingw gcc, but we are running on Cygwin. Gcc prints its search
++        # path with ; separators, and with drive letters. We can handle the
++        # drive letters (cygwin fileutils understands them), so leave them,
++        # especially as we might pass files found there to a mingw objdump,
++        # which wouldn't understand a cygwinified path. Ahh.
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++      fi
++      ;;
++    pw32*)
++      # pw32 DLLs use 'pw' prefix rather than 'lib'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++      ;;
++    esac
++    ;;
++
++  *)
++    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
++    ;;
++  esac
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  ;;
++
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  soname_spec='${libname}${release}${major}$shared_ext'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
++  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
++  if test "$GCC" = yes; then
++    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
++  else
++    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
++  fi
++  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++  ;;
++
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++freebsd1*)
++  dynamic_linker=no
++  ;;
++
++kfreebsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++freebsd*)
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
++    ;;
++  freebsd3.01* | freebsdelf3.01*)
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
++  *) # from 3.2 on
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
++    ;;
++  esac
++  ;;
++
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  ;;
++
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  case "$host_cpu" in
++  ia64*)
++    shrext_cmds='.so'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.so"
++    shlibpath_var=LD_LIBRARY_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    if test "X$HPUX_IA64_MODE" = X32; then
++      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++    else
++      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++    fi
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    ;;
++   hppa*64*)
++     shrext_cmds='.sl'
++     hardcode_into_libs=yes
++     dynamic_linker="$host_os dld.sl"
++     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++     soname_spec='${libname}${release}${shared_ext}$major'
++     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++     ;;
++   *)
++    shrext_cmds='.sl'
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=SHLIB_PATH
++    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    ;;
++  esac
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
++    *)
++	if test "$lt_cv_prog_gnu_ld" = yes; then
++		version_type=linux
++	else
++		version_type=irix
++	fi ;;
++  esac
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
++  case $host_os in
++  irix5* | nonstopux*)
++    libsuff= shlibsuff=
++    ;;
++  *)
++    case $LD in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++      libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++      libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++      libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  hardcode_into_libs=yes
++  ;;
++
++# No shared lib support for Linux oldld, aout, or coff.
++linux*oldld* | linux*aout* | linux*coff*)
++  dynamic_linker=no
++  ;;
++
++# This must be Linux ELF.
++linux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
++
++  # We used to test for /lib/ld.so.1 and disable shared libraries on
++  # powerpc, because MkLinux only supported shared libraries with the
++  # GNU dynamic linker.  Since this was broken with cross compilers,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
++
++knetbsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
++newsos6)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++nto-qnx*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++openbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    case $host_os in
++      openbsd2.[89] | openbsd2.[89].*)
++	shlibpath_overrides_runpath=no
++	;;
++      *)
++	shlibpath_overrides_runpath=yes
++	;;
++      esac
++  else
++    shlibpath_overrides_runpath=yes
++  fi
++  ;;
++
++os2*)
++  libname_spec='$name'
++  shrext_cmds=".dll"
++  need_lib_prefix=no
++  library_names_spec='$libname${shared_ext} $libname.a'
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
++
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
++
++sco3.2v5*)
++  version_type=osf
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  ;;
++
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
++  ;;
++
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      export_dynamic_flag_spec='${wl}-Blargedynsym'
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
++  ;;
++
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
++
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++*)
++  dynamic_linker=no
++  ;;
++esac
++echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6
++test "$dynamic_linker" = no && can_build_shared=no
++
++echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++hardcode_action_F77=
++if test -n "$hardcode_libdir_flag_spec_F77" || \
++   test -n "$runpath_var_F77" || \
++   test "X$hardcode_automatic_F77" = "Xyes" ; then
++
++  # We can hardcode non-existant directories.
++  if test "$hardcode_direct_F77" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
++     test "$hardcode_minus_L_F77" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action_F77=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action_F77=immediate
++  fi
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action_F77=unsupported
++fi
++echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
++echo "${ECHO_T}$hardcode_action_F77" >&6
++
++if test "$hardcode_action_F77" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
++
++striplib=
++old_striplib=
++echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
++echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
++  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++else
++# FIXME - insert some real tests, host_os isn't really good enough
++  case $host_os in
++   darwin*)
++       if test -n "$STRIP" ; then
++         striplib="$STRIP -x"
++         echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++       else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++       ;;
++   *)
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++    ;;
++  esac
++fi
++
++
++
++# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # See if we are running on zsh, and set the options which allow our commands through
++  # without removal of \ escapes.
++  if test -n "${ZSH_VERSION+set}" ; then
++    setopt NO_GLOB_SUBST
++  fi
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++    SED SHELL STRIP \
++    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++    deplibs_check_method reload_flag reload_cmds need_locks \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    old_postinstall_cmds old_postuninstall_cmds \
++    compiler_F77 \
++    CC_F77 \
++    LD_F77 \
++    lt_prog_compiler_wl_F77 \
++    lt_prog_compiler_pic_F77 \
++    lt_prog_compiler_static_F77 \
++    lt_prog_compiler_no_builtin_flag_F77 \
++    export_dynamic_flag_spec_F77 \
++    thread_safe_flag_spec_F77 \
++    whole_archive_flag_spec_F77 \
++    enable_shared_with_static_runtimes_F77 \
++    old_archive_cmds_F77 \
++    old_archive_from_new_cmds_F77 \
++    predep_objects_F77 \
++    postdep_objects_F77 \
++    predeps_F77 \
++    postdeps_F77 \
++    compiler_lib_search_path_F77 \
++    archive_cmds_F77 \
++    archive_expsym_cmds_F77 \
++    postinstall_cmds_F77 \
++    postuninstall_cmds_F77 \
++    old_archive_from_expsyms_cmds_F77 \
++    allow_undefined_flag_F77 \
++    no_undefined_flag_F77 \
++    export_symbols_cmds_F77 \
++    hardcode_libdir_flag_spec_F77 \
++    hardcode_libdir_flag_spec_ld_F77 \
++    hardcode_libdir_separator_F77 \
++    hardcode_automatic_F77 \
++    module_cmds_F77 \
++    module_expsym_cmds_F77 \
++    lt_cv_prog_compiler_c_o_F77 \
++    exclude_expsyms_F77 \
++    include_expsyms_F77; do
++
++    case $var in
++    old_archive_cmds_F77 | \
++    old_archive_from_new_cmds_F77 | \
++    archive_cmds_F77 | \
++    archive_expsym_cmds_F77 | \
++    module_cmds_F77 | \
++    module_expsym_cmds_F77 | \
++    old_archive_from_expsyms_cmds_F77 | \
++    export_symbols_cmds_F77 | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  case $lt_echo in
++  *'\$0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
++    ;;
++  esac
++
++cfgfile="$ofile"
++
++  cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
++
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_F77
++
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
++
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
++
++# A C compiler.
++LTCC=$lt_LTCC
++
++# A language-specific compiler.
++CC=$lt_compiler_F77
++
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_F77
++
++# An ERE matcher.
++EGREP=$lt_EGREP
++
++# The linker used to build libraries.
++LD=$lt_LD_F77
++
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
++
++# A BSD-compatible nm program.
++NM=$lt_NM
++
++# A symbol stripping program
++STRIP=$lt_STRIP
++
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_F77
++
++# Object file suffix (normally "o").
++objext="$ac_objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
++
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic_F77
++pic_mode=$pic_mode
++
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
++
++# Must we lock files when doing compilation ?
++need_locks=$lt_need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_F77
++
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
++
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
++
++# Library versioning type.
++version_type=$version_type
++
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
++
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds_F77
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
++
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77
++
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
++
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds_F77
++archive_expsym_cmds=$lt_archive_expsym_cmds_F77
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
++
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds_F77
++module_expsym_cmds=$lt_module_expsym_cmds_F77
++
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_F77
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_F77
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps_F77
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps_F77
++
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_F77
++
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_F77
++
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_F77
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
++
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
++
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
++
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action_F77
++
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
++
++# If ld is used when linking, flag to hardcode \$libdir into
++# a binary during linking. This must work even if \$libdir does
++# not exist.
++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
+ 
+-  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
+-fi
+-fi
+-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+-if test -n "$ac_ct_RANLIB"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+-echo "${ECHO_T}$ac_ct_RANLIB" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
+ 
+-  RANLIB=$ac_ct_RANLIB
+-else
+-  RANLIB="$ac_cv_prog_RANLIB"
+-fi
++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct_F77
+ 
+-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
+-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
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  if test -n "$STRIP"; then
+-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L_F77
+ 
+-fi
+-fi
+-STRIP=$ac_cv_prog_STRIP
+-if test -n "$STRIP"; then
+-  echo "$as_me:$LINENO: result: $STRIP" >&5
+-echo "${ECHO_T}$STRIP" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
+ 
+-fi
+-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
+-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
+-  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.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_ac_ct_STRIP="strip"
+-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
++# Set to yes if building a shared library automatically hardcodes DIR into the library
++# and all subsequent libraries and executables linked against it.
++hardcode_automatic=$hardcode_automatic_F77
+ 
+-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
+-fi
+-fi
+-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+-if test -n "$ac_ct_STRIP"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
+-echo "${ECHO_T}$ac_ct_STRIP" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
+-fi
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
+ 
+-  STRIP=$ac_ct_STRIP
+-else
+-  STRIP="$ac_cv_prog_STRIP"
+-fi
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs_F77
+ 
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+ 
+-enable_dlopen=no
+-enable_win32_dll=no
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
+-if test "${enable_libtool_lock+set}" = set; then
+-  enableval="$enable_libtool_lock"
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path_F77"
+ 
+-fi;
+-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols_F77
+ 
+-# Some flags need to be propagated to the compiler or linker for good
+-# libtool support.
+-case $host in
+-*-*-irix6*)
+-  # Find out which ABI we are using.
+-  echo '#line 4381 "configure"' > conftest.$ac_ext
+-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-    case `/usr/bin/file conftest.$ac_objext` in
+-    *32-bit*)
+-      LD="${LD-ld} -32"
+-      ;;
+-    *N32*)
+-      LD="${LD-ld} -n32"
+-      ;;
+-    *64-bit*)
+-      LD="${LD-ld} -64"
+-      ;;
+-    esac
+-  fi
+-  rm -rf conftest*
+-  ;;
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds_F77
+ 
+-*-*-sco3.2v5*)
+-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+-  SAVE_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS -belf"
+-  echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
+-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
+-if test "${lt_cv_cc_needs_belf+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
+ 
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms_F77
+ 
+-     ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms_F77
+ 
+-     cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++# ### END LIBTOOL TAG CONFIG: $tagname
++
++__EOF__
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+-int
+-main ()
+-{
+ 
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  lt_cv_cc_needs_belf=yes
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-lt_cv_cc_needs_belf=no
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-     ac_ext=c
++
++
++ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
+-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
+-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+-    CFLAGS="$SAVE_CFLAGS"
+-  fi
+-  ;;
+-
+-
+-esac
+-
+-# Sed substitution that helps us do robust quoting.  It backslashifies
+-# metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
+-sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
++CC="$lt_save_CC"
+ 
+-# Same as above, but do not quote variable references.
+-double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
++	else
++	  tagname=""
++	fi
++	;;
+ 
+-# Sed substitution to delay expansion of an escaped shell variable in a
+-# double_quote_subst'ed string.
+-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++      GCJ)
++	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
+ 
+-# Constants:
+-rm="rm -f"
+ 
+-# Global variables:
+-default_ofile=libtool
+-can_build_shared=yes
+ 
+-# All known linkers require a `.a' archive for static linking (except M$VC,
+-# which needs '.lib').
+-libext=a
+-ltmain="$ac_aux_dir/ltmain.sh"
+-ofile="$default_ofile"
+-with_gnu_ld="$lt_cv_prog_gnu_ld"
+-need_locks="$enable_libtool_lock"
++# Source file extension for Java test sources.
++ac_ext=java
+ 
+-old_CC="$CC"
+-old_CFLAGS="$CFLAGS"
++# Object file extension for compiled Java test sources.
++objext=o
++objext_GCJ=$objext
+ 
+-# Set sane defaults for various variables
+-test -z "$AR" && AR=ar
+-test -z "$AR_FLAGS" && AR_FLAGS=cru
+-test -z "$AS" && AS=as
+-test -z "$CC" && CC=cc
+-test -z "$DLLTOOL" && DLLTOOL=dlltool
+-test -z "$LD" && LD=ld
+-test -z "$LN_S" && LN_S="ln -s"
+-test -z "$MAGIC_CMD" && MAGIC_CMD=file
+-test -z "$NM" && NM=nm
+-test -z "$OBJDUMP" && OBJDUMP=objdump
+-test -z "$RANLIB" && RANLIB=:
+-test -z "$STRIP" && STRIP=:
+-test -z "$ac_objext" && ac_objext=o
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="class foo {}\n"
+ 
+-if test x"$host" != x"$build"; then
+-  ac_tool_prefix=${host_alias}-
+-else
+-  ac_tool_prefix=
+-fi
++# Code to be used in simple link tests
++lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
+ 
+-# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+-case $host_os in
+-linux-gnu*) ;;
+-linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+-esac
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ 
+-case $host_os in
+-aix3*)
+-  # AIX sometimes has problems with the GCC collect2 program.  For some
+-  # reason, if we set the COLLECT_NAMES environment variable, the problems
+-  # vanish in a puff of smoke.
+-  if test "X${COLLECT_NAMES+set}" != Xset; then
+-    COLLECT_NAMES=
+-    export COLLECT_NAMES
+-  fi
+-  ;;
+-esac
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
+ 
+-# Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+-old_postinstall_cmds='chmod 644 $oldlib'
+-old_postuninstall_cmds=
++# Allow CC to be a program name with arguments.
++compiler=$CC
+ 
+-if test -n "$RANLIB"; then
+-  case $host_os in
+-  openbsd*)
+-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+-    ;;
+-  *)
+-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+-    ;;
+-  esac
+-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+-fi
+ 
+ # Allow CC to be a program name with arguments.
+-set dummy $CC
+-compiler="$2"
++lt_save_CC="$CC"
++CC=${GCJ-"gcj"}
++compiler=$CC
++compiler_GCJ=$CC
+ 
+-echo "$as_me:$LINENO: checking for objdir" >&5
+-echo $ECHO_N "checking for objdir... $ECHO_C" >&6
+-rm -f .libs 2>/dev/null
+-mkdir .libs 2>/dev/null
+-if test -d .libs; then
+-  objdir=.libs
++# GCJ did not exist at the time GCC didn't implicitly link libc in.
++archive_cmds_need_lc_GCJ=no
++
++
++lt_prog_compiler_no_builtin_flag_GCJ=
++
++if test "$GCC" = yes; then
++  lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
++
++
++echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
++if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  # MS-DOS does not allow filenames that begin with a dot.
+-  objdir=_libs
++  lt_cv_prog_compiler_rtti_exceptions=no
++  ac_outfile=conftest.$ac_objext
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="-fno-rtti -fno-exceptions"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:16285: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:16289: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s conftest.err; then
++       lt_cv_prog_compiler_rtti_exceptions=yes
++     fi
++   fi
++   $rm conftest*
++
+ fi
+-rmdir .libs 2>/dev/null
+-echo "$as_me:$LINENO: result: $objdir" >&5
+-echo "${ECHO_T}$objdir" >&6
++echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
+ 
++if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
++    lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
++else
++    :
++fi
+ 
++fi
+ 
+-# Check whether --with-pic or --without-pic was given.
+-if test "${with_pic+set}" = set; then
+-  withval="$with_pic"
+-  pic_mode="$withval"
+-else
+-  pic_mode=default
+-fi;
+-test -z "$pic_mode" && pic_mode=default
++lt_prog_compiler_wl_GCJ=
++lt_prog_compiler_pic_GCJ=
++lt_prog_compiler_static_GCJ=
+ 
+-# We assume here that the value for lt_cv_prog_cc_pic will not be cached
+-# in isolation, and that seeing it set (from the cache) indicates that
+-# the associated values are set (in the cache) correctly too.
+ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
+ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
+-if test "${lt_cv_prog_cc_pic+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-   lt_cv_prog_cc_pic=
+-  lt_cv_prog_cc_shlib=
+-  lt_cv_prog_cc_wl=
+-  lt_cv_prog_cc_static=
+-  lt_cv_prog_cc_no_builtin=
+-  lt_cv_prog_cc_can_build_shared=$can_build_shared
+ 
+   if test "$GCC" = yes; then
+-    lt_cv_prog_cc_wl='-Wl,'
+-    lt_cv_prog_cc_static='-static'
++    lt_prog_compiler_wl_GCJ='-Wl,'
++    lt_prog_compiler_static_GCJ='-static'
+ 
+     case $host_os in
+-    aix*)
+-      # Below there is a dirty hack to force normal static linking with -ldl
+-      # The problem is because libdl dynamically linked with both libc and
+-      # libC (AIX C++ library), which obviously doesn't included in libraries
+-      # list by gcc. This cause undefined symbols with -static flags.
+-      # This hack allows C programs to be linked with "-static -ldl", but
+-      # not sure about C++ programs.
+-      lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
++      aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	lt_prog_compiler_static_GCJ='-Bstatic'
++      fi
+       ;;
++
+     amigaos*)
+       # FIXME: we need at least 68020 code to build shared libraries, but
+       # adding the `-m68020' flag to GCC prevents building anything better,
+       # like `-m68040'.
+-      lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
++      lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
+       ;;
+-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++
++    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
++
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
++      ;;
++
+     darwin* | rhapsody*)
+       # PIC is the default on this platform
+       # Common symbols not allowed in MH_DYLIB files
+-      lt_cv_prog_cc_pic='-fno-common'
++      lt_prog_compiler_pic_GCJ='-fno-common'
+       ;;
+-    cygwin* | mingw* | pw32* | os2*)
+-      # This hack is so that the source file can tell whether it is being
+-      # built for inclusion in a dll (and should export symbols for example).
+-      lt_cv_prog_cc_pic='-DDLL_EXPORT'
++
++    msdosdjgpp*)
++      # Just because we use GCC doesn't mean we suddenly get shared libraries
++      # on systems that don't support them.
++      lt_prog_compiler_can_build_shared_GCJ=no
++      enable_shared=no
+       ;;
++
+     sysv4*MP*)
+       if test -d /usr/nec; then
+-	 lt_cv_prog_cc_pic=-Kconform_pic
++	lt_prog_compiler_pic_GCJ=-Kconform_pic
+       fi
+       ;;
++
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic_GCJ='-fPIC'
++	;;
++      esac
++      ;;
++
+     *)
+-      lt_cv_prog_cc_pic='-fPIC'
++      lt_prog_compiler_pic_GCJ='-fPIC'
+       ;;
+     esac
+   else
+-    # PORTME Check for PIC flags for the system compiler.
++    # PORTME Check for flag to pass linker flags through the system compiler.
+     case $host_os in
+-    aix3* | aix4* | aix5*)
+-      lt_cv_prog_cc_wl='-Wl,'
+-      # All AIX code is PIC.
++    aix*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
+       if test "$host_cpu" = ia64; then
+ 	# AIX 5 now supports IA64 processor
+-	lt_cv_prog_cc_static='-Bstatic'
++	lt_prog_compiler_static_GCJ='-Bstatic'
+       else
+-	lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
++	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
+       fi
+       ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case "$cc_basename" in
++         xlc*)
++         lt_prog_compiler_pic_GCJ='-qnocommon'
++         lt_prog_compiler_wl_GCJ='-Wl,'
++         ;;
++       esac
++       ;;
++
++    mingw* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
++      ;;
+ 
+     hpux9* | hpux10* | hpux11*)
+-      # Is there a better lt_cv_prog_cc_static that works with the bundled CC?
+-      lt_cv_prog_cc_wl='-Wl,'
+-      lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive"
+-      lt_cv_prog_cc_pic='+Z'
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case "$host_cpu" in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	lt_prog_compiler_pic_GCJ='+Z'
++	;;
++      esac
++      # Is there a better lt_prog_compiler_static that works with the bundled CC?
++      lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
+       ;;
+ 
+     irix5* | irix6* | nonstopux*)
+-      lt_cv_prog_cc_wl='-Wl,'
+-      lt_cv_prog_cc_static='-non_shared'
++      lt_prog_compiler_wl_GCJ='-Wl,'
+       # PIC (with -KPIC) is the default.
++      lt_prog_compiler_static_GCJ='-non_shared'
+       ;;
+ 
+-    cygwin* | mingw* | pw32* | os2*)
+-      # This hack is so that the source file can tell whether it is being
+-      # built for inclusion in a dll (and should export symbols for example).
+-      lt_cv_prog_cc_pic='-DDLL_EXPORT'
++    newsos6)
++      lt_prog_compiler_pic_GCJ='-KPIC'
++      lt_prog_compiler_static_GCJ='-Bstatic'
+       ;;
+ 
+-    newsos6)
+-      lt_cv_prog_cc_pic='-KPIC'
+-      lt_cv_prog_cc_static='-Bstatic'
++    linux*)
++      case $CC in
++      icc* | ecc*)
++	lt_prog_compiler_wl_GCJ='-Wl,'
++	lt_prog_compiler_pic_GCJ='-KPIC'
++	lt_prog_compiler_static_GCJ='-static'
++        ;;
++      ccc*)
++        lt_prog_compiler_wl_GCJ='-Wl,'
++        # All Alpha code is PIC.
++        lt_prog_compiler_static_GCJ='-non_shared'
++        ;;
++      esac
+       ;;
+ 
+     osf3* | osf4* | osf5*)
++      lt_prog_compiler_wl_GCJ='-Wl,'
+       # All OSF/1 code is PIC.
+-      lt_cv_prog_cc_wl='-Wl,'
+-      lt_cv_prog_cc_static='-non_shared'
++      lt_prog_compiler_static_GCJ='-non_shared'
+       ;;
+ 
+     sco3.2v5*)
+-      lt_cv_prog_cc_pic='-Kpic'
+-      lt_cv_prog_cc_static='-dn'
+-      lt_cv_prog_cc_shlib='-belf'
++      lt_prog_compiler_pic_GCJ='-Kpic'
++      lt_prog_compiler_static_GCJ='-dn'
+       ;;
+ 
+     solaris*)
+-      lt_cv_prog_cc_pic='-KPIC'
+-      lt_cv_prog_cc_static='-Bstatic'
+-      lt_cv_prog_cc_wl='-Wl,'
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      lt_prog_compiler_pic_GCJ='-KPIC'
++      lt_prog_compiler_static_GCJ='-Bstatic'
+       ;;
+ 
+     sunos4*)
+-      lt_cv_prog_cc_pic='-PIC'
+-      lt_cv_prog_cc_static='-Bstatic'
+-      lt_cv_prog_cc_wl='-Qoption ld '
++      lt_prog_compiler_wl_GCJ='-Qoption ld '
++      lt_prog_compiler_pic_GCJ='-PIC'
++      lt_prog_compiler_static_GCJ='-Bstatic'
+       ;;
+ 
+     sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-      lt_cv_prog_cc_pic='-KPIC'
+-      lt_cv_prog_cc_static='-Bstatic'
+-      if test "x$host_vendor" = xsni; then
+-	lt_cv_prog_cc_wl='-LD'
+-      else
+-	lt_cv_prog_cc_wl='-Wl,'
+-      fi
+-      ;;
+-
+-    uts4*)
+-      lt_cv_prog_cc_pic='-pic'
+-      lt_cv_prog_cc_static='-Bstatic'
++      lt_prog_compiler_wl_GCJ='-Wl,'
++      lt_prog_compiler_pic_GCJ='-KPIC'
++      lt_prog_compiler_static_GCJ='-Bstatic'
+       ;;
+ 
+     sysv4*MP*)
+       if test -d /usr/nec ;then
+-	lt_cv_prog_cc_pic='-Kconform_pic'
+-	lt_cv_prog_cc_static='-Bstatic'
++	lt_prog_compiler_pic_GCJ='-Kconform_pic'
++	lt_prog_compiler_static_GCJ='-Bstatic'
+       fi
+       ;;
+ 
++    uts4*)
++      lt_prog_compiler_pic_GCJ='-pic'
++      lt_prog_compiler_static_GCJ='-Bstatic'
++      ;;
++
+     *)
+-      lt_cv_prog_cc_can_build_shared=no
++      lt_prog_compiler_can_build_shared_GCJ=no
+       ;;
+     esac
+   fi
+ 
+-fi
+-
+-if test -z "$lt_cv_prog_cc_pic"; then
+-  echo "$as_me:$LINENO: result: none" >&5
+-echo "${ECHO_T}none" >&6
+-else
+-  echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic" >&5
+-echo "${ECHO_T}$lt_cv_prog_cc_pic" >&6
+-
+-  # Check to make sure the pic_flag actually works.
+-  echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
+-echo $ECHO_N "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... $ECHO_C" >&6
+-  if test "${lt_cv_prog_cc_pic_works+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-      save_CFLAGS="$CFLAGS"
+-    CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
+-    cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-        case $host_os in
+-      hpux9* | hpux10* | hpux11*)
+-	# On HP-UX, both CC and GCC only warn that PIC is supported... then
+-	# they create non-PIC objects.  So, if there were any warnings, we
+-	# assume that PIC is not supported.
+-	if test -s conftest.err; then
+-	  lt_cv_prog_cc_pic_works=no
+-	else
+-	  lt_cv_prog_cc_pic_works=yes
+-	fi
+-	;;
+-      *)
+-	lt_cv_prog_cc_pic_works=yes
+-	;;
+-      esac
+-
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-      lt_cv_prog_cc_pic_works=no
+-
+-fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-    CFLAGS="$save_CFLAGS"
+-
+-fi
+-
+-
+-  if test "X$lt_cv_prog_cc_pic_works" = Xno; then
+-    lt_cv_prog_cc_pic=
+-    lt_cv_prog_cc_can_build_shared=no
+-  else
+-    lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
+-  fi
+-
+-  echo "$as_me:$LINENO: result: $lt_cv_prog_cc_pic_works" >&5
+-echo "${ECHO_T}$lt_cv_prog_cc_pic_works" >&6
+-fi
+-
+-# Check for any special shared library compilation flags.
+-if test -n "$lt_cv_prog_cc_shlib"; then
+-  { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5
+-echo "$as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2;}
+-  if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$lt_cv_prog_cc_shlib[ 	]" >/dev/null; then :
+-  else
+-   { echo "$as_me:$LINENO: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
+-echo "$as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
+-    lt_cv_prog_cc_can_build_shared=no
+-  fi
+-fi
+-
+-echo "$as_me:$LINENO: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
+-echo $ECHO_N "checking if $compiler static flag $lt_cv_prog_cc_static works... $ECHO_C" >&6
+-if test "${lt_cv_prog_cc_static_works+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-    lt_cv_prog_cc_static_works=no
+-  save_LDFLAGS="$LDFLAGS"
+-  LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest$ac_exeext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  lt_cv_prog_cc_static_works=yes
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+-  LDFLAGS="$save_LDFLAGS"
+-
+-fi
+-
+-
+-# Belt *and* braces to stop my trousers falling down:
+-test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
+-echo "$as_me:$LINENO: result: $lt_cv_prog_cc_static_works" >&5
+-echo "${ECHO_T}$lt_cv_prog_cc_static_works" >&6
+-
+-pic_flag="$lt_cv_prog_cc_pic"
+-special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
+-wl="$lt_cv_prog_cc_wl"
+-link_static_flag="$lt_cv_prog_cc_static"
+-no_builtin_flag="$lt_cv_prog_cc_no_builtin"
+-can_build_shared="$lt_cv_prog_cc_can_build_shared"
+-
+-
+-# Check to see if options -o and -c are simultaneously supported by compiler
+-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
+-if test "${lt_cv_compiler_c_o+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-$rm -r conftest 2>/dev/null
+-mkdir conftest
+-cd conftest
+-echo "int some_variable = 0;" > conftest.$ac_ext
+-mkdir out
+-# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-# that will create temporary files in the current directory regardless of
+-# the output directory.  Thus, making CWD read-only will cause this test
+-# to fail, enabling locking or at least warning the user not to do parallel
+-# builds.
+-chmod -w .
+-save_CFLAGS="$CFLAGS"
+-CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
+-compiler_c_o=no
+-if { (eval echo configure:4917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+-  # The compiler can only warn and ignore the option if not recognized
+-  # So say no if there are warnings
+-  if test -s out/conftest.err; then
+-    lt_cv_compiler_c_o=no
+-  else
+-    lt_cv_compiler_c_o=yes
+-  fi
+-else
+-  # Append any errors to the config.log.
+-  cat out/conftest.err 1>&5
+-  lt_cv_compiler_c_o=no
+-fi
+-CFLAGS="$save_CFLAGS"
+-chmod u+w .
+-$rm conftest* out/*
+-rmdir out
+-cd ..
+-rmdir conftest
+-$rm -r conftest 2>/dev/null
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
+ 
+-fi
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$lt_prog_compiler_pic_GCJ"; then
+ 
+-compiler_c_o=$lt_cv_compiler_c_o
+-echo "$as_me:$LINENO: result: $compiler_c_o" >&5
+-echo "${ECHO_T}$compiler_c_o" >&6
+-
+-if test x"$compiler_c_o" = x"yes"; then
+-  # Check to see if we can write to a .lo
+-  echo "$as_me:$LINENO: checking if $compiler supports -c -o file.lo" >&5
+-echo $ECHO_N "checking if $compiler supports -c -o file.lo... $ECHO_C" >&6
+-  if test "${lt_cv_compiler_o_lo+set}" = set; then
++echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
++echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
++if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-
+-  lt_cv_compiler_o_lo=no
+-  save_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS -c -o conftest.lo"
+-  save_objext="$ac_objext"
+-  ac_objext=lo
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+-int
+-main ()
+-{
+-int some_variable = 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-      # The compiler can only warn and ignore the option if not recognized
+-    # So say no if there are warnings
+-    if test -s conftest.err; then
+-      lt_cv_compiler_o_lo=no
+-    else
+-      lt_cv_compiler_o_lo=yes
+-    fi
++else
++  lt_prog_compiler_pic_works_GCJ=no
++  ac_outfile=conftest.$ac_objext
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:16528: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&5
++   echo "$as_me:16532: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s conftest.err; then
++       lt_prog_compiler_pic_works_GCJ=yes
++     fi
++   fi
++   $rm conftest*
++
++fi
++echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
++echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
+ 
++if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
++    case $lt_prog_compiler_pic_GCJ in
++     "" | " "*) ;;
++     *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
++     esac
+ else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++    lt_prog_compiler_pic_GCJ=
++     lt_prog_compiler_can_build_shared_GCJ=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-  ac_objext="$save_objext"
+-  CFLAGS="$save_CFLAGS"
+ 
+ fi
++case "$host_os" in
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    lt_prog_compiler_pic_GCJ=
++    ;;
++  *)
++    lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
++    ;;
++esac
+ 
+-  compiler_o_lo=$lt_cv_compiler_o_lo
+-  echo "$as_me:$LINENO: result: $compiler_o_lo" >&5
+-echo "${ECHO_T}$compiler_o_lo" >&6
++echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
++if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  compiler_o_lo=no
++  lt_cv_prog_compiler_c_o_GCJ=no
++   $rm -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:16588: $lt_compile\"" >&5)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&5
++   echo "$as_me:16592: \$? = $ac_status" >&5
++   if (exit $ac_status) && test -s out/conftest2.$ac_objext
++   then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test ! -s out/conftest.err; then
++       lt_cv_prog_compiler_c_o_GCJ=yes
++     fi
++   fi
++   chmod u+w .
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
++   cd ..
++   rmdir conftest
++   $rm conftest*
++
+ fi
++echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6
++
+ 
+-# Check to see if we can do hard links to lock some files if needed
+ hard_links="nottested"
+-if test "$compiler_c_o" = no && test "$need_locks" != no; then
++if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
+   # do not overwrite the value of need_locks provided by the user
+   echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
+ echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
+@@ -5032,136 +16635,72 @@
+   need_locks=no
+ fi
+ 
+-if test "$GCC" = yes; then
+-  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
+-  echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
+-  echo "int some_variable = 0;" > conftest.$ac_ext
+-  save_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
+-  compiler_rtti_exceptions=no
+-  cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+-int
+-main ()
+-{
+-int some_variable = 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-      # The compiler can only warn and ignore the option if not recognized
+-    # So say no if there are warnings
+-    if test -s conftest.err; then
+-      compiler_rtti_exceptions=no
+-    else
+-      compiler_rtti_exceptions=yes
+-    fi
+-
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
+-  CFLAGS="$save_CFLAGS"
+-  echo "$as_me:$LINENO: result: $compiler_rtti_exceptions" >&5
+-echo "${ECHO_T}$compiler_rtti_exceptions" >&6
+-
+-  if test "$compiler_rtti_exceptions" = "yes"; then
+-    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
+-  else
+-    no_builtin_flag=' -fno-builtin'
+-  fi
+-fi
+-
+-# See if the linker supports building shared libraries.
+-echo "$as_me:$LINENO: checking whether the linker ($LD) supports shared libraries" >&5
+-echo $ECHO_N "checking whether the linker ($LD) supports shared libraries... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
+ 
+-allow_undefined_flag=
+-no_undefined_flag=
+-need_lib_prefix=unknown
+-need_version=unknown
+-# when you set need_version to no, make sure it does not cause -set_version
+-# flags to be left without arguments
+-archive_cmds=
+-archive_expsym_cmds=
+-old_archive_from_new_cmds=
+-old_archive_from_expsyms_cmds=
+-export_dynamic_flag_spec=
+-whole_archive_flag_spec=
+-thread_safe_flag_spec=
+-hardcode_into_libs=no
+-hardcode_libdir_flag_spec=
+-hardcode_libdir_separator=
+-hardcode_direct=no
+-hardcode_minus_L=no
+-hardcode_shlibpath_var=unsupported
+-runpath_var=
+-link_all_deplibs=unknown
+-always_export_symbols=no
+-export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-# include_expsyms should be a list of space-separated symbols to be *always*
+-# included in the symbol list
+-include_expsyms=
+-# exclude_expsyms can be an egrep regular expression of symbols to exclude
+-# it will be wrapped by ` (' and `)$', so one must not match beginning or
+-# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+-# as well as any symbol that contains `d'.
+-exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
+-# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+-# platforms (ab)use it in PIC code, but their linkers get confused if
+-# the symbol is explicitly referenced.  Since portable code cannot
+-# rely on this symbol name, it's probably fine to never include it in
+-# preloaded symbol tables.
+-extract_expsyms_cmds=
++  runpath_var=
++  allow_undefined_flag_GCJ=
++  enable_shared_with_static_runtimes_GCJ=no
++  archive_cmds_GCJ=
++  archive_expsym_cmds_GCJ=
++  old_archive_From_new_cmds_GCJ=
++  old_archive_from_expsyms_cmds_GCJ=
++  export_dynamic_flag_spec_GCJ=
++  whole_archive_flag_spec_GCJ=
++  thread_safe_flag_spec_GCJ=
++  hardcode_libdir_flag_spec_GCJ=
++  hardcode_libdir_flag_spec_ld_GCJ=
++  hardcode_libdir_separator_GCJ=
++  hardcode_direct_GCJ=no
++  hardcode_minus_L_GCJ=no
++  hardcode_shlibpath_var_GCJ=unsupported
++  link_all_deplibs_GCJ=unknown
++  hardcode_automatic_GCJ=no
++  module_cmds_GCJ=
++  module_expsym_cmds_GCJ=
++  always_export_symbols_GCJ=no
++  export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  # include_expsyms should be a list of space-separated symbols to be *always*
++  # included in the symbol list
++  include_expsyms_GCJ=
++  # exclude_expsyms can be an extended regexp of symbols to exclude
++  # it will be wrapped by ` (' and `)$', so one must not match beginning or
++  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++  # as well as any symbol that contains `d'.
++  exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
++  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++  # platforms (ab)use it in PIC code, but their linkers get confused if
++  # the symbol is explicitly referenced.  Since portable code cannot
++  # rely on this symbol name, it's probably fine to never include it in
++  # preloaded symbol tables.
++  extract_expsyms_cmds=
+ 
+-case $host_os in
+-cygwin* | mingw* | pw32*)
+-  # FIXME: the MSVC++ port hasn't been tested in a loooong time
+-  # When not using gcc, we currently assume that we are using
+-  # Microsoft Visual C++.
+-  if test "$GCC" != yes; then
++  case $host_os in
++  cygwin* | mingw* | pw32*)
++    # FIXME: the MSVC++ port hasn't been tested in a loooong time
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    if test "$GCC" != yes; then
++      with_gnu_ld=no
++    fi
++    ;;
++  openbsd*)
+     with_gnu_ld=no
+-  fi
+-  ;;
+-openbsd*)
+-  with_gnu_ld=no
+-  ;;
+-esac
++    ;;
++  esac
+ 
+-ld_shlibs=yes
+-if test "$with_gnu_ld" = yes; then
+-  # If archive_cmds runs LD, not CC, wlarc should be empty
+-  wlarc='${wl}'
++  ld_shlibs_GCJ=yes
++  if test "$with_gnu_ld" = yes; then
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    wlarc='${wl}'
+ 
+-  # See if GNU ld supports shared libraries.
+-  case $host_os in
+-  aix3* | aix4* | aix5*)
+-    # On AIX, the GNU linker is very broken
+-    # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available.
+-    ld_shlibs=no
+-    cat <<EOF 1>&2
++    # See if GNU ld supports shared libraries.
++    case $host_os in
++    aix3* | aix4* | aix5*)
++      # On AIX/PPC, the GNU linker is very broken
++      if test "$host_cpu" != ia64; then
++	ld_shlibs_GCJ=no
++	cat <<EOF 1>&2
+ 
+ *** Warning: the GNU linker, at least up to release 2.9.1, is reported
+ *** to be unable to reliably create shared libraries on AIX.
+@@ -5170,124 +16709,73 @@
+ *** so that a non-GNU linker is found, and then restart.
+ 
+ EOF
+-    ;;
+-
+-  amigaos*)
+-    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+-    hardcode_libdir_flag_spec='-L$libdir'
+-    hardcode_minus_L=yes
+-
+-    # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
+-    # that the semantics of dynamic libraries on AmigaOS, at least up
+-    # to version 4, is to share data among multiple programs linked
+-    # with the same dynamic library.  Since this doesn't match the
+-    # behavior of shared libraries on other platforms, we can use
+-    # them.
+-    ld_shlibs=no
+-    ;;
+-
+-  beos*)
+-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+-      allow_undefined_flag=unsupported
+-      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
+-      # support --undefined.  This deserves some investigation.  FIXME
+-      archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-    else
+-      ld_shlibs=no
+-    fi
+-    ;;
++      fi
++      ;;
+ 
+-  cygwin* | mingw* | pw32*)
+-    # hardcode_libdir_flag_spec is actually meaningless, as there is
+-    # no search path for DLLs.
+-    hardcode_libdir_flag_spec='-L$libdir'
+-    allow_undefined_flag=unsupported
+-    always_export_symbols=yes
+-
+-    extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
+-      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~
+-      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
+-      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
+-      else $CC -o impgen impgen.c ; fi)~
+-      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
+-
+-    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
+-
+-    # cygwin and mingw dlls have different entry points and sets of symbols
+-    # to exclude.
+-    # FIXME: what about values for MSVC?
+-    dll_entry=__cygwin_dll_entry@12
+-    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12~
+-    case $host_os in
+-    mingw*)
+-      # mingw values
+-      dll_entry=_DllMainCRTStartup@12
+-      dll_exclude_symbols=DllMain@12,DllMainCRTStartup@12,DllEntryPoint@12~
++    amigaos*)
++      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      hardcode_minus_L_GCJ=yes
++
++      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
++      # that the semantics of dynamic libraries on AmigaOS, at least up
++      # to version 4, is to share data among multiple programs linked
++      # with the same dynamic library.  Since this doesn't match the
++      # behavior of shared libraries on other platforms, we can't use
++      # them.
++      ld_shlibs_GCJ=no
+       ;;
+-    esac
+ 
+-    # mingw and cygwin differ, and it's simplest to just exclude the union
+-    # of the two symbol sets.
+-    dll_exclude_symbols=DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12,DllMainCRTStartup@12,DllEntryPoint@12
+-
+-    # recent cygwin and mingw systems supply a stub DllMain which the user
+-    # can override, but on older systems we have to supply one (in ltdll.c)
+-    if test "x$lt_cv_need_dllmain" = "xyes"; then
+-      ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
+-      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~
+-	test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
+-    else
+-      ltdll_obj=
+-      ltdll_cmds=
+-    fi
++    beos*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	allow_undefined_flag_GCJ=unsupported
++	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++	# support --undefined.  This deserves some investigation.  FIXME
++	archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      else
++	ld_shlibs_GCJ=no
++      fi
++      ;;
+ 
+-    # Extract the symbol export list from an `--export-all' def file,
+-    # then regenerate the def file from the symbol export list, so that
+-    # the compiled dll only exports the symbol export list.
+-    # Be careful not to strip the DATA tag left be newer dlltools.
+-    export_symbols_cmds="$ltdll_cmds"'
+-      $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
+-      sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
+-
+-    # If the export-symbols file already is a .def file (1st line
+-    # is EXPORTS), use it as is.
+-    # If DATA tags from a recent dlltool are present, honour them!
+-    archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
+-	cp $export_symbols $output_objdir/$soname-def;
+-      else
+-	echo EXPORTS > $output_objdir/$soname-def;
+-	_lt_hint=1;
+-	cat $export_symbols | while read symbol; do
+-	 set dummy \$symbol;
+-	 case \$# in
+-	   2) echo "   \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
+-	   *) echo "     \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;;
+-	 esac;
+-	 _lt_hint=`expr 1 + \$_lt_hint`;
+-	done;
+-      fi~
+-      '"$ltdll_cmds"'
+-      $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
+-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
+-      $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
+-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
+-      $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
+-    ;;
++    cygwin* | mingw* | pw32*)
++      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
++      # as there is no search path for DLLs.
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      allow_undefined_flag_GCJ=unsupported
++      always_export_symbols_GCJ=no
++      enable_shared_with_static_runtimes_GCJ=yes
++      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++
++      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++	# If the export-symbols file already is a .def file (1st line
++	# is EXPORTS), use it as is; otherwise, prepend...
++	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	  cp $export_symbols $output_objdir/$soname.def;
++	else
++	  echo EXPORTS > $output_objdir/$soname.def;
++	  cat $export_symbols >> $output_objdir/$soname.def;
++	fi~
++	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
++      else
++	ld_shlibs=no
++      fi
++      ;;
+ 
+-  netbsd*)
+-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-      archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+-      wlarc=
+-    else
+-      archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-      archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-    fi
+-    ;;
++    netbsd*)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++	wlarc=
++      else
++	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      fi
++      ;;
+ 
+-  solaris* | sysv5*)
+-    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
+-      ld_shlibs=no
+-      cat <<EOF 1>&2
++    solaris* | sysv5*)
++      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
++	ld_shlibs_GCJ=no
++	cat <<EOF 1>&2
+ 
+ *** Warning: The releases 2.8.* of the GNU linker cannot reliably
+ *** create shared libraries on Solaris systems.  Therefore, libtool
+@@ -5297,540 +16785,782 @@
+ *** used, and then restart.
+ 
+ EOF
+-    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-    else
+-      ld_shlibs=no
+-    fi
+-    ;;
++      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	ld_shlibs_GCJ=no
++      fi
++      ;;
+ 
+-  sunos4*)
+-    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-    wlarc=
+-    hardcode_direct=yes
+-    hardcode_shlibpath_var=no
+-    ;;
++    sunos4*)
++      archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      wlarc=
++      hardcode_direct_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      ;;
+ 
+-  *)
+-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++  linux*)
++    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_cmds_GCJ="$tmp_archive_cmds"
++      supports_anon_versioning=no
++      case `$LD -v 2>/dev/null` in
++        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
++        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++        *\ 2.11.*) ;; # other 2.11 versions
++        *) supports_anon_versioning=yes ;;
++      esac
++      if test $supports_anon_versioning = yes; then
++        archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
++cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++$echo "local: *; };" >> $output_objdir/$libname.ver~
++        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++      else
++        archive_expsym_cmds_GCJ="$tmp_archive_cmds"
++      fi
+     else
+-      ld_shlibs=no
++      ld_shlibs_GCJ=no
+     fi
+     ;;
+-  esac
+ 
+-  if test "$ld_shlibs" = yes; then
+-    runpath_var=LD_RUN_PATH
+-    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+-    export_dynamic_flag_spec='${wl}--export-dynamic'
+-    case $host_os in
+-    cygwin* | mingw* | pw32*)
+-      # dlltool doesn't understand --whole-archive et. al.
+-      whole_archive_flag_spec=
+-      ;;
+     *)
+-      # ancient GNU ld didn't support --whole-archive et. al.
+-      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
+-	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       else
+-	whole_archive_flag_spec=
++	ld_shlibs_GCJ=no
+       fi
+       ;;
+     esac
+-  fi
+-else
+-  # PORTME fill in a description of your system's linker (not GNU ld)
+-  case $host_os in
+-  aix3*)
+-    allow_undefined_flag=unsupported
+-    always_export_symbols=yes
+-    archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+-    # Note: this linker hardcodes the directories in LIBPATH if there
+-    # are no directories specified by -L.
+-    hardcode_minus_L=yes
+-    if test "$GCC" = yes && test -z "$link_static_flag"; then
+-      # Neither direct hardcoding nor static linking is supported with a
+-      # broken collect2.
+-      hardcode_direct=unsupported
++
++    if test "$ld_shlibs_GCJ" = yes; then
++      runpath_var=LD_RUN_PATH
++      hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
++      export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
++      # ancient GNU ld didn't support --whole-archive et. al.
++      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++ 	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	whole_archive_flag_spec_GCJ=
++      fi
+     fi
+-    ;;
++  else
++    # PORTME fill in a description of your system's linker (not GNU ld)
++    case $host_os in
++    aix3*)
++      allow_undefined_flag_GCJ=unsupported
++      always_export_symbols_GCJ=yes
++      archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
++      # Note: this linker hardcodes the directories in LIBPATH if there
++      # are no directories specified by -L.
++      hardcode_minus_L_GCJ=yes
++      if test "$GCC" = yes && test -z "$link_static_flag"; then
++	# Neither direct hardcoding nor static linking is supported with a
++	# broken collect2.
++	hardcode_direct_GCJ=unsupported
++      fi
++      ;;
+ 
+-  aix4* | aix5*)
+-    if test "$host_cpu" = ia64; then
+-      # On IA64, the linker does run time linking by default, so we don't
+-      # have to do anything special.
+-      aix_use_runtimelinking=no
+-      exp_sym_flag='-Bexport'
+-      no_entry_flag=""
+-    else
+-      aix_use_runtimelinking=no
++    aix4* | aix5*)
++      if test "$host_cpu" = ia64; then
++	# On IA64, the linker does run time linking by default, so we don't
++	# have to do anything special.
++	aix_use_runtimelinking=no
++	exp_sym_flag='-Bexport'
++	no_entry_flag=""
++      else
++	# If we're using GNU nm, then we don't want the "-C" option.
++	# -C means demangle to AIX nm, but means don't demangle with GNU nm
++	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
++	  export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++	else
++	  export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
++	fi
++	aix_use_runtimelinking=no
+ 
+-      # Test if we are trying to use run time linking or normal
+-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+-      # need to do runtime linking.
+-      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+-	for ld_flag in $LDFLAGS; do
+-	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+-	    aix_use_runtimelinking=yes
+-	    break
++	# Test if we are trying to use run time linking or normal
++	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
++	# need to do runtime linking.
++	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++	  for ld_flag in $LDFLAGS; do
++  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++  	    aix_use_runtimelinking=yes
++  	    break
++  	  fi
++	  done
++	esac
++
++	exp_sym_flag='-bexport'
++	no_entry_flag='-bnoentry'
++      fi
++
++      # When large executables or shared objects are built, AIX ld can
++      # have problems creating the table of contents.  If linking a library
++      # or program results in "error TOC overflow" add -mminimal-toc to
++      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++      archive_cmds_GCJ=''
++      hardcode_direct_GCJ=yes
++      hardcode_libdir_separator_GCJ=':'
++      link_all_deplibs_GCJ=yes
++
++      if test "$GCC" = yes; then
++	case $host_os in aix4.012|aix4.012.*)
++	# We only want to do this on AIX 4.2 and lower, the check
++	# below for broken collect2 doesn't work under 4.3+
++	  collect2name=`${CC} -print-prog-name=collect2`
++	  if test -f "$collect2name" && \
++  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	  then
++  	  # We have reworked collect2
++  	  hardcode_direct_GCJ=yes
++	  else
++  	  # We have old collect2
++  	  hardcode_direct_GCJ=unsupported
++  	  # It fails to find uninstalled libraries when the uninstalled
++  	  # path is not listed in the libpath.  Setting hardcode_minus_L
++  	  # to unsupported forces relinking
++  	  hardcode_minus_L_GCJ=yes
++  	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
++  	  hardcode_libdir_separator_GCJ=
+ 	  fi
+-	done
+-      esac
++	esac
++	shared_flag='-shared'
++      else
++	# not using gcc
++	if test "$host_cpu" = ia64; then
++  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++  	# chokes on -Wl,-G. The following line is correct:
++	  shared_flag='-G'
++	else
++  	if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag='${wl}-G'
++	  else
++	    shared_flag='${wl}-bM:SRE'
++  	fi
++	fi
++      fi
+ 
+-      exp_sym_flag='-bexport'
+-      no_entry_flag='-bnoentry'
+-    fi
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      always_export_symbols_GCJ=yes
++      if test "$aix_use_runtimelinking" = yes; then
++	# Warning - without using the other runtime loading flags (-brtl),
++	# -berok will link without error, but may produce a broken library.
++	allow_undefined_flag_GCJ='-berok'
++       # Determine the default libpath from the value encoded in an empty executable.
++       cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-    # When large executables or shared objects are built, AIX ld can
+-    # have problems creating the table of contents.  If linking a library
+-    # or program results in "error TOC overflow" add -mminimal-toc to
+-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++       hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
++	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++       else
++	if test "$host_cpu" = ia64; then
++	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
++	  allow_undefined_flag_GCJ="-z nodefs"
++	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++	else
++	 # Determine the default libpath from the value encoded in an empty executable.
++	 cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
+ 
+-    hardcode_direct=yes
+-    archive_cmds=''
+-    hardcode_libdir_separator=':'
+-    if test "$GCC" = yes; then
+-      case $host_os in aix4.[012]|aix4.[012].*)
+-	collect2name=`${CC} -print-prog-name=collect2`
+-	if test -f "$collect2name" && \
+-	  strings "$collect2name" | grep resolve_lib_name >/dev/null
+-	then
+-	  # We have reworked collect2
+-	  hardcode_direct=yes
+-	else
+-	  # We have old collect2
+-	  hardcode_direct=unsupported
+-	  # It fails to find uninstalled libraries when the uninstalled
+-	  # path is not listed in the libpath.  Setting hardcode_minus_L
+-	  # to unsupported forces relinking
+-	  hardcode_minus_L=yes
+-	  hardcode_libdir_flag_spec='-L$libdir'
+-	  hardcode_libdir_separator=
+-	fi
+-      esac
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
++}'`; fi
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-      shared_flag='-shared'
+-    else
+-      # not using gcc
+-      if test "$host_cpu" = ia64; then
+-	shared_flag='${wl}-G'
+-      else
+-	if test "$aix_use_runtimelinking" = yes; then
+-	  shared_flag='${wl}-G'
+-	else
+-	  shared_flag='${wl}-bM:SRE'
++fi
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++
++	 hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
++	  # Warning - without using the other run time loading flags,
++	  # -berok will link without error, but may produce a broken library.
++	  no_undefined_flag_GCJ=' ${wl}-bernotok'
++	  allow_undefined_flag_GCJ=' ${wl}-berok'
++	  # -bexpall does not export symbols beginning with underscore (_)
++	  always_export_symbols_GCJ=yes
++	  # Exported symbols can be pulled into shared objects from archives
++	  whole_archive_flag_spec_GCJ=' '
++	  archive_cmds_need_lc_GCJ=yes
++	  # This is similar to how AIX traditionally builds it's shared libraries.
++	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ 	fi
+       fi
+-    fi
++      ;;
+ 
+-    # It seems that -bexpall can do strange things, so it is better to
+-    # generate a list of symbols to export.
+-    always_export_symbols=yes
+-    if test "$aix_use_runtimelinking" = yes; then
+-      # Warning - without using the other runtime loading flags (-brtl),
+-      # -berok will link without error, but may produce a broken library.
+-      allow_undefined_flag='-berok'
+-      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
+-      archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++    amigaos*)
++      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      hardcode_minus_L_GCJ=yes
++      # see comment about different semantics on the GNU ld section
++      ld_shlibs_GCJ=no
++      ;;
++
++    bsdi[45]*)
++      export_dynamic_flag_spec_GCJ=-rdynamic
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # When not using gcc, we currently assume that we are using
++      # Microsoft Visual C++.
++      # hardcode_libdir_flag_spec is actually meaningless, as there is
++      # no search path for DLLs.
++      hardcode_libdir_flag_spec_GCJ=' '
++      allow_undefined_flag_GCJ=unsupported
++      # Tell ltmain to make .lib files, not .a files.
++      libext=lib
++      # Tell ltmain to make .dll files, not .so files.
++      shrext_cmds=".dll"
++      # FIXME: Setting linknames here is a bad hack.
++      archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      # The linker will automatically build a .lib file if we build a DLL.
++      old_archive_From_new_cmds_GCJ='true'
++      # FIXME: Should let the user specify the lib program.
++      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      fix_srcfile_path='`cygpath -w "$srcfile"`'
++      enable_shared_with_static_runtimes_GCJ=yes
++      ;;
++
++    darwin* | rhapsody*)
++      case "$host_os" in
++        rhapsody* | darwin1.[012])
++         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[012])
++               allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++      esac
++      archive_cmds_need_lc_GCJ=no
++      hardcode_direct_GCJ=no
++      hardcode_automatic_GCJ=yes
++      hardcode_shlibpath_var_GCJ=unsupported
++      whole_archive_flag_spec_GCJ=''
++      link_all_deplibs_GCJ=yes
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+     else
+-      if test "$host_cpu" = ia64; then
+-	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+-	allow_undefined_flag="-z nodefs"
+-	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+-      else
+-	hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
+-	# Warning - without using the other run time loading flags,
+-	# -berok will link without error, but may produce a broken library.
+-	allow_undefined_flag='${wl}-berok'
+-	# This is a bit strange, but is similar to how AIX traditionally builds
+-	# it's shared libraries.
+-	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
+-      fi
++      case "$cc_basename" in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
++         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         ld_shlibs_GCJ=no
++          ;;
++      esac
+     fi
+-    ;;
++      ;;
+ 
+-  amigaos*)
+-    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+-    hardcode_libdir_flag_spec='-L$libdir'
+-    hardcode_minus_L=yes
+-    # see comment about different semantics on the GNU ld section
+-    ld_shlibs=no
+-    ;;
++    dgux*)
++      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      hardcode_shlibpath_var_GCJ=no
++      ;;
+ 
+-  cygwin* | mingw* | pw32*)
+-    # When not using gcc, we currently assume that we are using
+-    # Microsoft Visual C++.
+-    # hardcode_libdir_flag_spec is actually meaningless, as there is
+-    # no search path for DLLs.
+-    hardcode_libdir_flag_spec=' '
+-    allow_undefined_flag=unsupported
+-    # Tell ltmain to make .lib files, not .a files.
+-    libext=lib
+-    # FIXME: Setting linknames here is a bad hack.
+-    archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+-    # The linker will automatically build a .lib file if we build a DLL.
+-    old_archive_from_new_cmds='true'
+-    # FIXME: Should let the user specify the lib program.
+-    old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-    fix_srcfile_path='`cygpath -w "$srcfile"`'
+-    ;;
+-
+-  darwin* | rhapsody*)
+-    case "$host_os" in
+-    rhapsody* | darwin1.[012])
+-      allow_undefined_flag='-undefined suppress'
+-      ;;
+-    *) # Darwin 1.3 on
+-      allow_undefined_flag='-flat_namespace -undefined suppress'
+-      ;;
+-    esac
+-    # FIXME: Relying on posixy $() will cause problems for
+-    #        cross-compilation, but unfortunately the echo tests do not
+-    #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
+-    #	     `"' quotes if we put them in here... so don't!
+-    archive_cmds='$nonopt $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
+-    # We need to add '_' to the symbols in $export_symbols first
+-    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
+-    hardcode_direct=yes
+-    hardcode_shlibpath_var=no
+-    whole_archive_flag_spec='-all_load $convenience'
+-    ;;
+-
+-  freebsd1*)
+-    ld_shlibs=no
+-    ;;
+-
+-  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+-  # support.  Future versions do this automatically, but an explicit c++rt0.o
+-  # does not break anything, and helps significantly (at the cost of a little
+-  # extra space).
+-  freebsd2.2*)
+-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+-    hardcode_libdir_flag_spec='-R$libdir'
+-    hardcode_direct=yes
+-    hardcode_shlibpath_var=no
+-    ;;
++    freebsd1*)
++      ld_shlibs_GCJ=no
++      ;;
+ 
+-  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+-  freebsd2*)
+-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_direct=yes
+-    hardcode_minus_L=yes
+-    hardcode_shlibpath_var=no
+-    ;;
++    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++    # support.  Future versions do this automatically, but an explicit c++rt0.o
++    # does not break anything, and helps significantly (at the cost of a little
++    # extra space).
++    freebsd2.2*)
++      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++      hardcode_libdir_flag_spec_GCJ='-R$libdir'
++      hardcode_direct_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      ;;
+ 
+-  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-  freebsd*)
+-    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+-    hardcode_libdir_flag_spec='-R$libdir'
+-    hardcode_direct=yes
+-    hardcode_shlibpath_var=no
+-    ;;
++    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++    freebsd2*)
++      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct_GCJ=yes
++      hardcode_minus_L_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      ;;
+ 
+-  hpux9* | hpux10* | hpux11*)
+-    case $host_os in
+-    hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
+-    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
+-    esac
+-    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+-    hardcode_libdir_separator=:
+-    hardcode_direct=yes
+-    hardcode_minus_L=yes # Not in the search PATH, but as the default
+-			 # location of the library.
+-    export_dynamic_flag_spec='${wl}-E'
+-    ;;
++    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++    freebsd* | kfreebsd*-gnu)
++      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++      hardcode_libdir_flag_spec_GCJ='-R$libdir'
++      hardcode_direct_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      ;;
+ 
+-  irix5* | irix6* | nonstopux*)
+-    if test "$GCC" = yes; then
+-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-    else
+-      archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-    fi
+-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+-    hardcode_libdir_separator=:
+-    link_all_deplibs=yes
+-    ;;
++    hpux9*)
++      if test "$GCC" = yes; then
++	archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      else
++	archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      fi
++      hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
++      hardcode_libdir_separator_GCJ=:
++      hardcode_direct_GCJ=yes
++
++      # hardcode_minus_L: Not really in the search PATH,
++      # but as the default location of the library.
++      hardcode_minus_L_GCJ=yes
++      export_dynamic_flag_spec_GCJ='${wl}-E'
++      ;;
+ 
+-  netbsd*)
+-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+-    else
+-      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+-    fi
+-    hardcode_libdir_flag_spec='-R$libdir'
+-    hardcode_direct=yes
+-    hardcode_shlibpath_var=no
+-    ;;
++    hpux10* | hpux11*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	esac
++      else
++	case "$host_cpu" in
++	hppa*64*|ia64*)
++	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	*)
++	  archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++	  ;;
++	esac
++      fi
++      if test "$with_gnu_ld" = no; then
++	case "$host_cpu" in
++	hppa*64*)
++	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
++	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
++	  hardcode_libdir_separator_GCJ=:
++	  hardcode_direct_GCJ=no
++	  hardcode_shlibpath_var_GCJ=no
++	  ;;
++	ia64*)
++	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
++	  hardcode_direct_GCJ=no
++	  hardcode_shlibpath_var_GCJ=no
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  hardcode_minus_L_GCJ=yes
++	  ;;
++	*)
++	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
++	  hardcode_libdir_separator_GCJ=:
++	  hardcode_direct_GCJ=yes
++	  export_dynamic_flag_spec_GCJ='${wl}-E'
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  hardcode_minus_L_GCJ=yes
++	  ;;
++	esac
++      fi
++      ;;
+ 
+-  newsos6)
+-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_direct=yes
+-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+-    hardcode_libdir_separator=:
+-    hardcode_shlibpath_var=no
+-    ;;
++    irix5* | irix6* | nonstopux*)
++      if test "$GCC" = yes; then
++	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
++      fi
++      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator_GCJ=:
++      link_all_deplibs_GCJ=yes
++      ;;
+ 
+-  openbsd*)
+-    hardcode_direct=yes
+-    hardcode_shlibpath_var=no
+-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+-      export_dynamic_flag_spec='${wl}-E'
+-    else
+-      case "$host_os" in
+-      openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	hardcode_libdir_flag_spec='-R$libdir'
+-        ;;
+-      *)
+-        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
+-        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+-        ;;
+-      esac
+-    fi
+-    ;;
++    netbsd*)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++      else
++	archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++      fi
++      hardcode_libdir_flag_spec_GCJ='-R$libdir'
++      hardcode_direct_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      ;;
+ 
+-  os2*)
+-    hardcode_libdir_flag_spec='-L$libdir'
+-    hardcode_minus_L=yes
+-    allow_undefined_flag=unsupported
+-    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+-    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+-    ;;
++    newsos6)
++      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct_GCJ=yes
++      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator_GCJ=:
++      hardcode_shlibpath_var_GCJ=no
++      ;;
+ 
+-  osf3*)
+-    if test "$GCC" = yes; then
+-      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+-      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-    else
+-      allow_undefined_flag=' -expect_unresolved \*'
+-      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-    fi
+-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+-    hardcode_libdir_separator=:
+-    ;;
++    openbsd*)
++      hardcode_direct_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++	export_dynamic_flag_spec_GCJ='${wl}-E'
++      else
++       case $host_os in
++	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
++	   ;;
++	 *)
++	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++	   ;;
++       esac
++      fi
++      ;;
+ 
+-  osf4* | osf5*)	# as osf3* with the addition of -msym flag
+-    if test "$GCC" = yes; then
+-      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+-      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+-    else
+-      allow_undefined_flag=' -expect_unresolved \*'
+-      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-      archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+-      $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++    os2*)
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      hardcode_minus_L_GCJ=yes
++      allow_undefined_flag_GCJ=unsupported
++      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++      old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++      ;;
+ 
+-      #Both c and cxx compiler support -rpath directly
+-      hardcode_libdir_flag_spec='-rpath $libdir'
+-    fi
+-    hardcode_libdir_separator=:
+-    ;;
++    osf3*)
++      if test "$GCC" = yes; then
++	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	allow_undefined_flag_GCJ=' -expect_unresolved \*'
++	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++      fi
++      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
++      hardcode_libdir_separator_GCJ=:
++      ;;
+ 
+-  sco3.2v5*)
+-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_shlibpath_var=no
+-    runpath_var=LD_RUN_PATH
+-    hardcode_runpath_var=yes
+-    export_dynamic_flag_spec='${wl}-Bexport'
+-    ;;
++    osf4* | osf5*)	# as osf3* with the addition of -msym flag
++      if test "$GCC" = yes; then
++	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
++	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
++      else
++	allow_undefined_flag_GCJ=' -expect_unresolved \*'
++	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+ 
+-  solaris*)
+-    # gcc --version < 3.0 without binutils cannot create self contained
+-    # shared libraries reliably, requiring libgcc.a to resolve some of
+-    # the object symbols generated in some cases.  Libraries that use
+-    # assert need libgcc.a to resolve __eprintf, for example.  Linking
+-    # a copy of libgcc.a into every shared library to guarantee resolving
+-    # such symbols causes other problems:  According to Tim Van Holder
+-    # <tim.van.holder@pandora.be>, C++ libraries end up with a separate
+-    # (to the application) exception stack for one thing.
+-    no_undefined_flag=' -z defs'
+-    if test "$GCC" = yes; then
+-      case `$CC --version 2>/dev/null` in
+-      [12].*)
+-	cat <<EOF 1>&2
++	# Both c and cxx compiler support -rpath directly
++	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
++      fi
++      hardcode_libdir_separator_GCJ=:
++      ;;
+ 
+-*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
+-*** create self contained shared libraries on Solaris systems, without
+-*** introducing a dependency on libgcc.a.  Therefore, libtool is disabling
+-*** -no-undefined support, which will at least allow you to build shared
+-*** libraries.  However, you may find that when you link such libraries
+-*** into an application without using GCC, you have to manually add
+-*** \`gcc --print-libgcc-file-name\` to the link command.  We urge you to
+-*** upgrade to a newer version of GCC.  Another option is to rebuild your
+-*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
++    sco3.2v5*)
++      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var_GCJ=no
++      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
++      runpath_var=LD_RUN_PATH
++      hardcode_runpath_var=yes
++      ;;
+ 
+-EOF
+-        no_undefined_flag=
+-	;;
++    solaris*)
++      no_undefined_flag_GCJ=' -z text'
++      if test "$GCC" = yes; then
++	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
++      else
++	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      fi
++      hardcode_libdir_flag_spec_GCJ='-R$libdir'
++      hardcode_shlibpath_var_GCJ=no
++      case $host_os in
++      solaris2.[0-5] | solaris2.[0-5].*) ;;
++      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
++	whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
+       esac
+-    fi
+-    # $CC -shared without GNU ld will not create a library from C++
+-    # object files and a static libstdc++, better avoid it by now
+-    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+-    hardcode_libdir_flag_spec='-R$libdir'
+-    hardcode_shlibpath_var=no
+-    case $host_os in
+-    solaris2.[0-5] | solaris2.[0-5].*) ;;
+-    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+-    esac
+-    link_all_deplibs=yes
+-    ;;
++      link_all_deplibs_GCJ=yes
++      ;;
+ 
+-  sunos4*)
+-    if test "x$host_vendor" = xsequent; then
+-      # Use $CC to link under sequent, because it throws in some extra .o
+-      # files that make .init and .fini sections work.
+-      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+-    else
+-      archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+-    fi
+-    hardcode_libdir_flag_spec='-L$libdir'
+-    hardcode_direct=yes
+-    hardcode_minus_L=yes
+-    hardcode_shlibpath_var=no
+-    ;;
++    sunos4*)
++      if test "x$host_vendor" = xsequent; then
++	# Use $CC to link under sequent, because it throws in some extra .o
++	# files that make .init and .fini sections work.
++	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      hardcode_direct_GCJ=yes
++      hardcode_minus_L_GCJ=yes
++      hardcode_shlibpath_var_GCJ=no
++      ;;
+ 
+-  sysv4)
+-    if test "x$host_vendor" = xsno; then
+-      archive_cmds='$LD -G -Bsymbolic -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct=yes # is this really true???
+-    else
+-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+-    fi
+-    runpath_var='LD_RUN_PATH'
+-    hardcode_shlibpath_var=no
+-    ;;
++    sysv4)
++      case $host_vendor in
++	sni)
++	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct_GCJ=yes # is this really true???
++	;;
++	siemens)
++	  ## LD is ld it makes a PLAMLIB
++	  ## CC just makes a GrossModule.
++	  archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++	  reload_cmds_GCJ='$CC -r -o $output$reload_objs'
++	  hardcode_direct_GCJ=no
++        ;;
++	motorola)
++	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
++	;;
++      esac
++      runpath_var='LD_RUN_PATH'
++      hardcode_shlibpath_var_GCJ=no
++      ;;
+ 
+-  sysv4.3*)
+-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_shlibpath_var=no
+-    export_dynamic_flag_spec='-Bexport'
+-    ;;
+-
+-  sysv5*)
+-    no_undefined_flag=' -z text'
+-    # $CC -shared without GNU ld will not create a library from C++
+-    # object files and a static libstdc++, better avoid it by now
+-    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+-    hardcode_libdir_flag_spec=
+-    hardcode_shlibpath_var=no
+-    runpath_var='LD_RUN_PATH'
+-    ;;
+-
+-  uts4*)
+-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_libdir_flag_spec='-L$libdir'
+-    hardcode_shlibpath_var=no
+-    ;;
++    sysv4.3*)
++      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_shlibpath_var_GCJ=no
++      export_dynamic_flag_spec_GCJ='-Bexport'
++      ;;
+ 
+-  dgux*)
+-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_libdir_flag_spec='-L$libdir'
+-    hardcode_shlibpath_var=no
+-    ;;
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	hardcode_shlibpath_var_GCJ=no
++	runpath_var=LD_RUN_PATH
++	hardcode_runpath_var=yes
++	ld_shlibs_GCJ=yes
++      fi
++      ;;
+ 
+-  sysv4*MP*)
+-    if test -d /usr/nec; then
+-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_shlibpath_var=no
+-      runpath_var=LD_RUN_PATH
++    sysv4.2uw2*)
++      archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_direct_GCJ=yes
++      hardcode_minus_L_GCJ=no
++      hardcode_shlibpath_var_GCJ=no
+       hardcode_runpath_var=yes
+-      ld_shlibs=yes
+-    fi
+-    ;;
+-
+-  sysv4.2uw2*)
+-    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_direct=yes
+-    hardcode_minus_L=no
+-    hardcode_shlibpath_var=no
+-    hardcode_runpath_var=yes
+-    runpath_var=LD_RUN_PATH
+-    ;;
++      runpath_var=LD_RUN_PATH
++      ;;
+ 
+-  sysv5uw7* | unixware7*)
+-    no_undefined_flag='${wl}-z ${wl}text'
+-    if test "$GCC" = yes; then
+-      archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-    else
+-      archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-    fi
+-    runpath_var='LD_RUN_PATH'
+-    hardcode_shlibpath_var=no
+-    ;;
++   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
++      no_undefined_flag_GCJ='${wl}-z ${wl}text'
++      if test "$GCC" = yes; then
++	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
++      runpath_var='LD_RUN_PATH'
++      hardcode_shlibpath_var_GCJ=no
++      ;;
+ 
+-  *)
+-    ld_shlibs=no
+-    ;;
+-  esac
+-fi
+-echo "$as_me:$LINENO: result: $ld_shlibs" >&5
+-echo "${ECHO_T}$ld_shlibs" >&6
+-test "$ld_shlibs" = no && can_build_shared=no
++    sysv5*)
++      no_undefined_flag_GCJ=' -z text'
++      # $CC -shared without GNU ld will not create a library from C++
++      # object files and a static libstdc++, better avoid it by now
++      archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      hardcode_libdir_flag_spec_GCJ=
++      hardcode_shlibpath_var_GCJ=no
++      runpath_var='LD_RUN_PATH'
++      ;;
+ 
+-# Check hardcoding attributes.
+-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
+-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
+-hardcode_action=
+-if test -n "$hardcode_libdir_flag_spec" || \
+-   test -n "$runpath_var"; then
++    uts4*)
++      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      hardcode_libdir_flag_spec_GCJ='-L$libdir'
++      hardcode_shlibpath_var_GCJ=no
++      ;;
+ 
+-  # We can hardcode non-existant directories.
+-  if test "$hardcode_direct" != no &&
+-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+-     # have to relink, otherwise we might link with an installed library
+-     # when we should be linking with a yet-to-be-installed one
+-     ## test "$hardcode_shlibpath_var" != no &&
+-     test "$hardcode_minus_L" != no; then
+-    # Linking always hardcodes the temporary library directory.
+-    hardcode_action=relink
+-  else
+-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+-    hardcode_action=immediate
++    *)
++      ld_shlibs_GCJ=no
++      ;;
++    esac
+   fi
+-else
+-  # We cannot hardcode anything, or else we can only hardcode existing
+-  # directories.
+-  hardcode_action=unsupported
+-fi
+-echo "$as_me:$LINENO: result: $hardcode_action" >&5
+-echo "${ECHO_T}$hardcode_action" >&6
+ 
+-striplib=
+-old_striplib=
+-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
+-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+-  echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
+-else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
++echo "${ECHO_T}$ld_shlibs_GCJ" >&6
++test "$ld_shlibs_GCJ" = no && can_build_shared=no
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+ fi
+ 
+-reload_cmds='$LD$reload_flag -o $output$reload_objs'
+-test -z "$deplibs_check_method" && deplibs_check_method=unknown
++#
++# Do we need to explicitly link libc?
++#
++case "x$archive_cmds_need_lc_GCJ" in
++x|xyes)
++  # Assume -lc should be added
++  archive_cmds_need_lc_GCJ=yes
++
++  if test "$enable_shared" = yes && test "$GCC" = yes; then
++    case $archive_cmds_GCJ in
++    *'~'*)
++      # FIXME: we may have to deal with multi-command sequences.
++      ;;
++    '$CC '*)
++      # Test whether the compiler implicitly links with -lc since on some
++      # systems, -lgcc has to come before -lc. If gcc already passes -lc
++      # to ld, don't add -lc before -lgcc.
++      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
++      $rm conftest*
++      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        libobjs=conftest.$ac_objext
++        deplibs=
++        wl=$lt_prog_compiler_wl_GCJ
++        compiler_flags=-v
++        linker_flags=-v
++        verstring=
++        output_objdir=.
++        libname=conftest
++        lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
++        allow_undefined_flag_GCJ=
++        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
++  (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++        then
++	  archive_cmds_need_lc_GCJ=no
++        else
++	  archive_cmds_need_lc_GCJ=yes
++        fi
++        allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
++      else
++        cat conftest.err 1>&5
++      fi
++      $rm conftest*
++      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
++echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
++      ;;
++    esac
++  fi
++  ;;
++esac
+ 
+-# PORTME Fill in your ld.so characteristics
+ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
+ echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -5840,23 +17570,45 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++if test "$GCC" = yes; then
++  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi
++need_lib_prefix=unknown
++hardcode_into_libs=no
++
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
+ 
+ case $host_os in
+ aix3*)
+   version_type=linux
+-  library_names_spec='${libname}${release}.so$versuffix $libname.a'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+   shlibpath_var=LIBPATH
+ 
+-  # AIX has no versioning support, so we append a major version to the name.
+-  soname_spec='${libname}${release}.so$major'
++  # AIX 3 has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}${shared_ext}$major'
+   ;;
+ 
+ aix4* | aix5*)
+   version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
+   if test "$host_cpu" = ia64; then
+     # AIX 5 supports IA64
+-    library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
++    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+     shlibpath_var=LD_LIBRARY_PATH
+   else
+     # With GCC up to 2.95.x, collect2 would create an import file
+@@ -5866,29 +17618,28 @@
+     # development snapshots of GCC prior to 3.0.
+     case $host_os in
+       aix4 | aix4.[01] | aix4.[01].*)
+-	if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+-	     echo ' yes '
+-	     echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+-	  :
+-	else
+-	  can_build_shared=no
+-	fi
+-	;;
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	   echo ' yes '
++	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++	:
++      else
++	can_build_shared=no
++      fi
++      ;;
+     esac
+-    # AIX (on Power*) has no versioning support, so currently we can
+-    # not hardcode correct soname into executable. Probably we can
+-    # add versioning support to collect2, so additional links can
+-    # be useful in future.
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
+     if test "$aix_use_runtimelinking" = yes; then
+       # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+       # instead of lib<name>.a to let people know that these are not
+       # typical AIX shared libraries.
+-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     else
+       # We preserve .a as extension for shared libraries through AIX4.2
+       # and later when we are not doing run time linking.
+       library_names_spec='${libname}${release}.a $libname.a'
+-      soname_spec='${libname}${release}.so$major'
++      soname_spec='${libname}${release}${shared_ext}$major'
+     fi
+     shlibpath_var=LIBPATH
+   fi
+@@ -5897,25 +17648,24 @@
+ amigaos*)
+   library_names_spec='$libname.ixlibrary $libname.a'
+   # Create ${libname}_ixlibrary.a entries in /sys/libs.
+-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+   ;;
+ 
+ beos*)
+-  library_names_spec='${libname}.so'
++  library_names_spec='${libname}${shared_ext}'
+   dynamic_linker="$host_os ld.so"
+   shlibpath_var=LIBRARY_PATH
+   ;;
+ 
+-bsdi4*)
++bsdi[45]*)
+   version_type=linux
+   need_version=no
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+-  soname_spec='${libname}${release}.so$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+   sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+-  export_dynamic_flag_spec=-rdynamic
+   # the default ld.so.conf also contains /usr/contrib/lib and
+   # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+   # libtool to hard-code these into programs
+@@ -5923,29 +17673,55 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
++
+   case $GCC,$host_os in
+-  yes,cygwin*)
++  yes,cygwin* | yes,mingw* | yes,pw32*)
+     library_names_spec='$libname.dll.a'
+-    soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
+-    postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+       dldir=$destdir/`dirname \$dlpath`~
+       test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog .libs/$dlname \$dldir/$dlname'
+-    postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      $install_prog $dir/$dlname \$dldir/$dlname'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+       dlpath=$dir/\$dldll~
+        $rm \$dlpath'
++    shlibpath_overrides_runpath=yes
++
++    case $host_os in
++    cygwin*)
++      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
++    mingw*)
++      # MinGW DLLs use traditional 'lib' prefix
++      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
++        # It is most probably a Windows format PATH printed by
++        # mingw gcc, but we are running on Cygwin. Gcc prints its search
++        # path with ; separators, and with drive letters. We can handle the
++        # drive letters (cygwin fileutils understands them), so leave them,
++        # especially as we might pass files found there to a mingw objdump,
++        # which wouldn't understand a cygwinified path. Ahh.
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++      fi
++      ;;
++    pw32*)
++      # pw32 DLLs use 'pw' prefix rather than 'lib'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
++      ;;
++    esac
+     ;;
+-  yes,mingw*)
+-    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
+-    sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g"`
+-    ;;
+-  yes,pw32*)
+-    library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll'
+-    ;;
++
+   *)
+-    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
++    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+     ;;
+   esac
+   dynamic_linker='Win32 ld.exe'
+@@ -5958,30 +17734,56 @@
+   version_type=darwin
+   need_lib_prefix=no
+   need_version=no
+-  # FIXME: Relying on posixy $() will cause problems for
+-  #        cross-compilation, but unfortunately the echo tests do not
+-  #        yet detect zsh echo's removal of \ escapes.
+-  library_names_spec='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)'
+-  soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)'
++  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
++  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
++  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
++  if test "$GCC" = yes; then
++    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
++  else
++    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
++  fi
++  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++  ;;
++
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+ freebsd1*)
+   dynamic_linker=no
+   ;;
+ 
++kfreebsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
+ freebsd*)
+   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+       need_version=no
+       need_lib_prefix=no
+       ;;
+     freebsd-*)
+-      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
++      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+       need_version=yes
+       ;;
+   esac
+@@ -5990,7 +17792,11 @@
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  *)
++  freebsd3.01* | freebsdelf3.01*)
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
++  *) # from 3.2 on
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
+@@ -6001,8 +17807,8 @@
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
+-  soname_spec='${libname}${release}.so$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+   hardcode_into_libs=yes
+   ;;
+@@ -6010,14 +17816,45 @@
+ hpux9* | hpux10* | hpux11*)
+   # Give a soname corresponding to the major version so that dld.sl refuses to
+   # link against other versions.
+-  dynamic_linker="$host_os dld.sl"
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+-  shlibpath_var=SHLIB_PATH
+-  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+-  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
+-  soname_spec='${libname}${release}.sl$major'
++  case "$host_cpu" in
++  ia64*)
++    shrext_cmds='.so'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.so"
++    shlibpath_var=LD_LIBRARY_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    if test "X$HPUX_IA64_MODE" = X32; then
++      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++    else
++      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++    fi
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    ;;
++   hppa*64*)
++     shrext_cmds='.sl'
++     hardcode_into_libs=yes
++     dynamic_linker="$host_os dld.sl"
++     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++     soname_spec='${libname}${release}${shared_ext}$major'
++     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++     ;;
++   *)
++    shrext_cmds='.sl'
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=SHLIB_PATH
++    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    ;;
++  esac
+   # HP-UX runs *really* slowly unless shared libraries are mode 555.
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+@@ -6025,21 +17862,29 @@
+ irix5* | irix6* | nonstopux*)
+   case $host_os in
+     nonstopux*) version_type=nonstopux ;;
+-    *)          version_type=irix ;;
++    *)
++	if test "$lt_cv_prog_gnu_ld" = yes; then
++		version_type=linux
++	else
++		version_type=irix
++	fi ;;
+   esac
+   need_lib_prefix=no
+   need_version=no
+-  soname_spec='${libname}${release}.so$major'
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+   case $host_os in
+   irix5* | nonstopux*)
+     libsuff= shlibsuff=
+     ;;
+   *)
+     case $LD in # libtool.m4 will add one of these switches to LD
+-    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
+-    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
+-    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++      libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++      libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+     *) libsuff= shlibsuff= libmagic=never-match;;
+     esac
+     ;;
+@@ -6048,20 +17893,21 @@
+   shlibpath_overrides_runpath=no
+   sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+   sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  hardcode_into_libs=yes
+   ;;
+ 
+ # No shared lib support for Linux oldld, aout, or coff.
+-linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
++linux*oldld* | linux*aout* | linux*coff*)
+   dynamic_linker=no
+   ;;
+ 
+ # This must be Linux ELF.
+-linux-gnu*)
++linux*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+-  soname_spec='${libname}${release}.so$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+@@ -6070,6 +17916,12 @@
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
++
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+   # powerpc, because MkLinux only supported shared libraries with the
+   # GNU dynamic linker.  Since this was broken with cross compilers,
+@@ -6079,17 +17931,29 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++knetbsd*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='GNU ld.so'
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+-    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
+-    soname_spec='${libname}${release}.so$major'
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
+     dynamic_linker='NetBSD ld.elf_so'
+   fi
+   shlibpath_var=LD_LIBRARY_PATH
+@@ -6099,7 +17963,17 @@
+ 
+ newsos6)
+   version_type=linux
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++nto-qnx*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+   ;;
+@@ -6108,37 +17982,38 @@
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    case "$host_os" in
+-    openbsd2.[89] | openbsd2.[89].*)
+-      shlibpath_overrides_runpath=no
+-      ;;
+-    *)
+-      shlibpath_overrides_runpath=yes
+-      ;;
+-    esac
++    case $host_os in
++      openbsd2.[89] | openbsd2.[89].*)
++	shlibpath_overrides_runpath=no
++	;;
++      *)
++	shlibpath_overrides_runpath=yes
++	;;
++      esac
+   else
+     shlibpath_overrides_runpath=yes
+   fi
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+ os2*)
+   libname_spec='$name'
++  shrext_cmds=".dll"
+   need_lib_prefix=no
+-  library_names_spec='$libname.dll $libname.a'
++  library_names_spec='$libname${shared_ext} $libname.a'
+   dynamic_linker='OS/2 ld.exe'
+   shlibpath_var=LIBPATH
+   ;;
+ 
+ osf3* | osf4* | osf5*)
+   version_type=osf
+-  need_version=no
+   need_lib_prefix=no
+-  soname_spec='${libname}${release}.so'
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   shlibpath_var=LD_LIBRARY_PATH
+   sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+@@ -6146,8 +18021,8 @@
+ 
+ sco3.2v5*)
+   version_type=osf
+-  soname_spec='${libname}${release}.so$major'
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+@@ -6155,8 +18030,8 @@
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+-  soname_spec='${libname}${release}.so$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+   hardcode_into_libs=yes
+@@ -6166,7 +18041,7 @@
+ 
+ sunos4*)
+   version_type=sunos
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+   finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+@@ -6178,12 +18053,18 @@
+ 
+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+   version_type=linux
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+-  soname_spec='${libname}${release}.so$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+   case $host_vendor in
+     sni)
+       shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      export_dynamic_flag_spec='${wl}-Blargedynsym'
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
+       ;;
+     motorola)
+       need_lib_prefix=no
+@@ -6194,31 +18075,22 @@
+   esac
+   ;;
+ 
+-uts4*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+-  soname_spec='${libname}${release}.so$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
+-
+-dgux*)
+-  version_type=linux
+-  need_lib_prefix=no
+-  need_version=no
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+-  soname_spec='${libname}${release}.so$major'
+-  shlibpath_var=LD_LIBRARY_PATH
+-  ;;
+-
+ sysv4*MP*)
+   if test -d /usr/nec ;then
+     version_type=linux
+-    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
+-    soname_spec='$libname.so.$major'
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
+     shlibpath_var=LD_LIBRARY_PATH
+   fi
+   ;;
+ 
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
+ *)
+   dynamic_linker=no
+   ;;
+@@ -6227,75 +18099,173 @@
+ echo "${ECHO_T}$dynamic_linker" >&6
+ test "$dynamic_linker" = no && can_build_shared=no
+ 
+-# Report the final consequences.
+-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
+-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
+-echo "$as_me:$LINENO: result: $can_build_shared" >&5
+-echo "${ECHO_T}$can_build_shared" >&6
+-
+-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
+-test "$can_build_shared" = "no" && enable_shared=no
++echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
++hardcode_action_GCJ=
++if test -n "$hardcode_libdir_flag_spec_GCJ" || \
++   test -n "$runpath_var_GCJ" || \
++   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
+ 
+-# On AIX, shared libraries and static libraries use the same namespace, and
+-# are all built from PIC.
+-case "$host_os" in
+-aix3*)
+-  test "$enable_shared" = yes && enable_static=no
+-  if test -n "$RANLIB"; then
+-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+-    postinstall_cmds='$RANLIB $lib'
++  # We can hardcode non-existant directories.
++  if test "$hardcode_direct_GCJ" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
++     test "$hardcode_minus_L_GCJ" != no; then
++    # Linking always hardcodes the temporary library directory.
++    hardcode_action_GCJ=relink
++  else
++    # We can link without hardcoding, and we can hardcode nonexisting dirs.
++    hardcode_action_GCJ=immediate
+   fi
+-  ;;
++else
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action_GCJ=unsupported
++fi
++echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
++echo "${ECHO_T}$hardcode_action_GCJ" >&6
+ 
+-aix4*)
+-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+-    test "$enable_shared" = yes && enable_static=no
+-  fi
+-  ;;
+-esac
+-echo "$as_me:$LINENO: result: $enable_shared" >&5
+-echo "${ECHO_T}$enable_shared" >&6
++if test "$hardcode_action_GCJ" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
+ 
+-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
+-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
+-# Make sure either enable_shared or enable_static is yes.
+-test "$enable_shared" = yes || enable_static=yes
+-echo "$as_me:$LINENO: result: $enable_static" >&5
+-echo "${ECHO_T}$enable_static" >&6
++striplib=
++old_striplib=
++echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
++echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
++if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
++  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
++  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
++  echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++else
++# FIXME - insert some real tests, host_os isn't really good enough
++  case $host_os in
++   darwin*)
++       if test -n "$STRIP" ; then
++         striplib="$STRIP -x"
++         echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6
++       else
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++fi
++       ;;
++   *)
++  echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6
++    ;;
++  esac
++fi
++
++if test "x$enable_dlopen" != xyes; then
++  enable_dlopen=unknown
++  enable_dlopen_self=unknown
++  enable_dlopen_self_static=unknown
++else
++  lt_cv_dlopen=no
++  lt_cv_dlopen_libs=
++
++  case $host_os in
++  beos*)
++    lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ;;
++
++  mingw* | pw32*)
++    lt_cv_dlopen="LoadLibrary"
++    lt_cv_dlopen_libs=
++   ;;
++
++  cygwin*)
++    lt_cv_dlopen="dlopen"
++    lt_cv_dlopen_libs=
++   ;;
++
++  darwin*)
++  # if libdl is installed we need to link against it
++    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldl  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char dlopen ();
++int
++main ()
++{
++dlopen ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_dl_dlopen=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-if test "$hardcode_action" = relink; then
+-  # Fast installation is not supported
+-  enable_fast_install=no
+-elif test "$shlibpath_overrides_runpath" = yes ||
+-     test "$enable_shared" = no; then
+-  # Fast installation is not necessary
+-  enable_fast_install=needless
++ac_cv_lib_dl_dlopen=no
+ fi
+-
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
+-
+-if test "x$enable_dlopen" != xyes; then
+-  enable_dlopen=unknown
+-  enable_dlopen_self=unknown
+-  enable_dlopen_self_static=unknown
++echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
++if test $ac_cv_lib_dl_dlopen = yes; then
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+-  lt_cv_dlopen=no
+-  lt_cv_dlopen_libs=
+ 
+-  case $host_os in
+-  beos*)
+-    lt_cv_dlopen="load_add_on"
++    lt_cv_dlopen="dyld"
+     lt_cv_dlopen_libs=
+     lt_cv_dlopen_self=yes
+-    ;;
+ 
+-  cygwin* | mingw* | pw32*)
+-    lt_cv_dlopen="LoadLibrary"
+-    lt_cv_dlopen_libs=
++fi
++
+    ;;
+ 
+   *)
+@@ -6305,49 +18275,73 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define shl_load innocuous_shl_load
++
+ /* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char shl_load (); below.  */
+-#include <assert.h>
++    which can conflict with char shl_load (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef shl_load
++
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
++{
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+ char shl_load ();
+-char (*f) ();
+-
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+-int
+-main ()
+-{
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+ #if defined (__stub_shl_load) || defined (__stub___shl_load)
+ choke me
+ #else
+-f = shl_load;
++char (*f) () = shl_load;
++#endif
++#ifdef __cplusplus
++}
+ #endif
+ 
++int
++main ()
++{
++return f != shl_load;
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++  (eval $ac_link) 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); } &&
+-         { ac_try='test -s conftest$ac_exeext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6356,10 +18350,12 @@
+   ac_cv_func_shl_load=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_func_shl_load=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+ echo "${ECHO_T}$ac_cv_func_shl_load" >&6
+@@ -6374,8 +18370,11 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldld  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -6384,12 +18383,6 @@
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+ char shl_load ();
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -6400,11 +18393,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++  (eval $ac_link) 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); } &&
+-         { ac_try='test -s conftest$ac_exeext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6413,10 +18416,12 @@
+   ac_cv_lib_dld_shl_load=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_lib_dld_shl_load=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+@@ -6430,49 +18435,73 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define dlopen innocuous_dlopen
++
+ /* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char dlopen (); below.  */
+-#include <assert.h>
++    which can conflict with char dlopen (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef dlopen
++
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
++{
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+ char dlopen ();
+-char (*f) ();
+-
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+-int
+-main ()
+-{
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+ #if defined (__stub_dlopen) || defined (__stub___dlopen)
+ choke me
+ #else
+-f = dlopen;
++char (*f) () = dlopen;
++#endif
++#ifdef __cplusplus
++}
+ #endif
+ 
++int
++main ()
++{
++return f != dlopen;
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++  (eval $ac_link) 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); } &&
+-         { ac_try='test -s conftest$ac_exeext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6481,10 +18510,12 @@
+   ac_cv_func_dlopen=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_func_dlopen=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+ echo "${ECHO_T}$ac_cv_func_dlopen" >&6
+@@ -6499,8 +18530,11 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -6509,12 +18543,6 @@
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+ char dlopen ();
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -6525,11 +18553,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++  (eval $ac_link) 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); } &&
+-         { ac_try='test -s conftest$ac_exeext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6538,10 +18576,12 @@
+   ac_cv_lib_dl_dlopen=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_lib_dl_dlopen=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+@@ -6557,8 +18597,11 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsvld  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -6567,12 +18610,6 @@
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+ char dlopen ();
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -6583,11 +18620,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++  (eval $ac_link) 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); } &&
+-         { ac_try='test -s conftest$ac_exeext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6596,10 +18643,12 @@
+   ac_cv_lib_svld_dlopen=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_lib_svld_dlopen=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
+@@ -6615,8 +18664,11 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldld  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -6625,12 +18677,6 @@
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+ char dld_link ();
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -6641,11 +18687,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++  (eval $ac_link) 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); } &&
+-         { ac_try='test -s conftest$ac_exeext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -6654,10 +18710,12 @@
+   ac_cv_lib_dld_dld_link=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_lib_dld_dld_link=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+@@ -6681,38 +18739,136 @@
+ 
+ fi
+ 
+-    ;;
+-  esac
+-
+-  if test "x$lt_cv_dlopen" != xno; then
+-    enable_dlopen=yes
+-  else
+-    enable_dlopen=no
+-  fi
+-
+-  case $lt_cv_dlopen in
+-  dlopen)
+-    save_CPPFLAGS="$CPPFLAGS"
+-        test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+-
+-    save_LDFLAGS="$LDFLAGS"
+-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+-
+-    save_LIBS="$LIBS"
+-    LIBS="$lt_cv_dlopen_libs $LIBS"
+-
+-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
+-if test "${lt_cv_dlopen_self+set}" = set; then
++    ;;
++  esac
++
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
++  else
++    enable_dlopen=no
++  fi
++
++  case $lt_cv_dlopen in
++  dlopen)
++    save_CPPFLAGS="$CPPFLAGS"
++    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++
++    save_LDFLAGS="$LDFLAGS"
++    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++
++    save_LIBS="$LIBS"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
++
++    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
++echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
++if test "${lt_cv_dlopen_self+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  	  if test "$cross_compiling" = yes; then :
++  lt_cv_dlopen_self=cross
++else
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_status=$lt_dlunknown
++  cat > conftest.$ac_ext <<EOF
++#line 18773 "configure"
++#include "confdefs.h"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++#  define LT_DLGLOBAL		RTLD_GLOBAL
++#else
++#  ifdef DL_GLOBAL
++#    define LT_DLGLOBAL		DL_GLOBAL
++#  else
++#    define LT_DLGLOBAL		0
++#  endif
++#endif
++
++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LT_DLLAZY_OR_NOW
++#  ifdef RTLD_LAZY
++#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
++#  else
++#    ifdef DL_LAZY
++#      define LT_DLLAZY_OR_NOW		DL_LAZY
++#    else
++#      ifdef RTLD_NOW
++#        define LT_DLLAZY_OR_NOW	RTLD_NOW
++#      else
++#        ifdef DL_NOW
++#          define LT_DLLAZY_OR_NOW	DL_NOW
++#        else
++#          define LT_DLLAZY_OR_NOW	0
++#        endif
++#      endif
++#    endif
++#  endif
++#endif
++
++#ifdef __cplusplus
++extern "C" void exit (int);
++#endif
++
++void fnord() { int i=42;}
++int main ()
++{
++  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
++  int status = $lt_dlunknown;
++
++  if (self)
++    {
++      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
++      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
++      /* dlclose (self); */
++    }
++
++    exit (status);
++}
++EOF
++  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
++    (./conftest; exit; ) 2>/dev/null
++    lt_status=$?
++    case x$lt_status in
++      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
++      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
++    esac
++  else :
++    # compilation failed
++    lt_cv_dlopen_self=no
++  fi
++fi
++rm -fr conftest*
++
++
++fi
++echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self" >&6
++
++    if test "x$lt_cv_dlopen_self" = xyes; then
++      LDFLAGS="$LDFLAGS $link_static_flag"
++      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
++echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
++if test "${lt_cv_dlopen_self_static+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   	  if test "$cross_compiling" = yes; then :
+-  lt_cv_dlopen_self=cross
++  lt_cv_dlopen_self_static=cross
+ else
+-    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 6715 "configure"
++#line 18871 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -6781,242 +18937,557 @@
+     (./conftest; exit; ) 2>/dev/null
+     lt_status=$?
+     case x$lt_status in
+-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
++      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
++      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+     esac
+   else :
+     # compilation failed
+-    lt_cv_dlopen_self=no
++    lt_cv_dlopen_self_static=no
+   fi
+ fi
+ rm -fr conftest*
+ 
+ 
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
++fi
++echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
++echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
++    fi
++
++    CPPFLAGS="$save_CPPFLAGS"
++    LDFLAGS="$save_LDFLAGS"
++    LIBS="$save_LIBS"
++    ;;
++  esac
++
++  case $lt_cv_dlopen_self in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
++  esac
++
++  case $lt_cv_dlopen_self_static in
++  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++  *) enable_dlopen_self_static=unknown ;;
++  esac
++fi
++
++
++# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # See if we are running on zsh, and set the options which allow our commands through
++  # without removal of \ escapes.
++  if test -n "${ZSH_VERSION+set}" ; then
++    setopt NO_GLOB_SUBST
++  fi
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++    SED SHELL STRIP \
++    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++    deplibs_check_method reload_flag reload_cmds need_locks \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    old_postinstall_cmds old_postuninstall_cmds \
++    compiler_GCJ \
++    CC_GCJ \
++    LD_GCJ \
++    lt_prog_compiler_wl_GCJ \
++    lt_prog_compiler_pic_GCJ \
++    lt_prog_compiler_static_GCJ \
++    lt_prog_compiler_no_builtin_flag_GCJ \
++    export_dynamic_flag_spec_GCJ \
++    thread_safe_flag_spec_GCJ \
++    whole_archive_flag_spec_GCJ \
++    enable_shared_with_static_runtimes_GCJ \
++    old_archive_cmds_GCJ \
++    old_archive_from_new_cmds_GCJ \
++    predep_objects_GCJ \
++    postdep_objects_GCJ \
++    predeps_GCJ \
++    postdeps_GCJ \
++    compiler_lib_search_path_GCJ \
++    archive_cmds_GCJ \
++    archive_expsym_cmds_GCJ \
++    postinstall_cmds_GCJ \
++    postuninstall_cmds_GCJ \
++    old_archive_from_expsyms_cmds_GCJ \
++    allow_undefined_flag_GCJ \
++    no_undefined_flag_GCJ \
++    export_symbols_cmds_GCJ \
++    hardcode_libdir_flag_spec_GCJ \
++    hardcode_libdir_flag_spec_ld_GCJ \
++    hardcode_libdir_separator_GCJ \
++    hardcode_automatic_GCJ \
++    module_cmds_GCJ \
++    module_expsym_cmds_GCJ \
++    lt_cv_prog_compiler_c_o_GCJ \
++    exclude_expsyms_GCJ \
++    include_expsyms_GCJ; do
++
++    case $var in
++    old_archive_cmds_GCJ | \
++    old_archive_from_new_cmds_GCJ | \
++    archive_cmds_GCJ | \
++    archive_expsym_cmds_GCJ | \
++    module_cmds_GCJ | \
++    module_expsym_cmds_GCJ | \
++    old_archive_from_expsyms_cmds_GCJ | \
++    export_symbols_cmds_GCJ | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  case $lt_echo in
++  *'\$0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
++    ;;
++  esac
++
++cfgfile="$ofile"
++
++  cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
++
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_GCJ
++
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
++
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
++
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
++
++# A C compiler.
++LTCC=$lt_LTCC
++
++# A language-specific compiler.
++CC=$lt_compiler_GCJ
++
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_GCJ
++
++# An ERE matcher.
++EGREP=$lt_EGREP
++
++# The linker used to build libraries.
++LD=$lt_LD_GCJ
++
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
++
++# A BSD-compatible nm program.
++NM=$lt_NM
++
++# A symbol stripping program
++STRIP=$lt_STRIP
++
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
++# How to pass a linker flag through the compiler.
++wl=$lt_lt_prog_compiler_wl_GCJ
++
++# Object file suffix (normally "o").
++objext="$ac_objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
++
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
++pic_flag=$lt_lt_prog_compiler_pic_GCJ
++pic_mode=$pic_mode
++
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
++
++# Must we lock files when doing compilation ?
++need_locks=$lt_need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_GCJ
++
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
++
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
++
++# Library versioning type.
++version_type=$version_type
++
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
++
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds_GCJ
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
++
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
++
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
++
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds_GCJ
++archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
++
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds_GCJ
++module_expsym_cmds=$lt_module_expsym_cmds_GCJ
++
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_GCJ
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_GCJ
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps_GCJ
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps_GCJ
++
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
++
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_GCJ
++
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_GCJ
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
++
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
++
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
+ 
+-    if test "x$lt_cv_dlopen_self" = xyes; then
+-      LDFLAGS="$LDFLAGS $link_static_flag"
+-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+-if test "${lt_cv_dlopen_self_static+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  	  if test "$cross_compiling" = yes; then :
+-  lt_cv_dlopen_self_static=cross
+-else
+-    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+-  lt_status=$lt_dlunknown
+-  cat > conftest.$ac_ext <<EOF
+-#line 6813 "configure"
+-#include "confdefs.h"
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+ 
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
+-#endif
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action_GCJ
+ 
+-#include <stdio.h>
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
+ 
+-#ifdef RTLD_GLOBAL
+-#  define LT_DLGLOBAL		RTLD_GLOBAL
+-#else
+-#  ifdef DL_GLOBAL
+-#    define LT_DLGLOBAL		DL_GLOBAL
+-#  else
+-#    define LT_DLGLOBAL		0
+-#  endif
+-#endif
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
+ 
+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+-   find out it does not work in some platform. */
+-#ifndef LT_DLLAZY_OR_NOW
+-#  ifdef RTLD_LAZY
+-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+-#  else
+-#    ifdef DL_LAZY
+-#      define LT_DLLAZY_OR_NOW		DL_LAZY
+-#    else
+-#      ifdef RTLD_NOW
+-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+-#      else
+-#        ifdef DL_NOW
+-#          define LT_DLLAZY_OR_NOW	DL_NOW
+-#        else
+-#          define LT_DLLAZY_OR_NOW	0
+-#        endif
+-#      endif
+-#    endif
+-#  endif
+-#endif
++# If ld is used when linking, flag to hardcode \$libdir into
++# a binary during linking. This must work even if \$libdir does
++# not exist.
++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
+ 
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
+ 
+-void fnord() { int i=42;}
+-int main ()
+-{
+-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+-  int status = $lt_dlunknown;
++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct_GCJ
+ 
+-  if (self)
+-    {
+-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+-      /* dlclose (self); */
+-    }
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L_GCJ
+ 
+-    exit (status);
+-}
+-EOF
+-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
+-    lt_status=$?
+-    case x$lt_status in
+-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+-    esac
+-  else :
+-    # compilation failed
+-    lt_cv_dlopen_self_static=no
+-  fi
+-fi
+-rm -fr conftest*
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
+ 
++# Set to yes if building a shared library automatically hardcodes DIR into the library
++# and all subsequent libraries and executables linked against it.
++hardcode_automatic=$hardcode_automatic_GCJ
+ 
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+-    fi
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
+ 
+-    CPPFLAGS="$save_CPPFLAGS"
+-    LDFLAGS="$save_LDFLAGS"
+-    LIBS="$save_LIBS"
+-    ;;
+-  esac
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs_GCJ
+ 
+-  case $lt_cv_dlopen_self in
+-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+-  *) enable_dlopen_self=unknown ;;
+-  esac
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+ 
+-  case $lt_cv_dlopen_self_static in
+-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+-  *) enable_dlopen_self_static=unknown ;;
+-  esac
+-fi
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path_GCJ"
+ 
+-if test "$enable_shared" = yes && test "$GCC" = yes; then
+-  case $archive_cmds in
+-  *'~'*)
+-    # FIXME: we may have to deal with multi-command sequences.
+-    ;;
+-  '$CC '*)
+-    # Test whether the compiler implicitly links with -lc since on some
+-    # systems, -lgcc has to come before -lc. If gcc already passes -lc
+-    # to ld, don't add -lc before -lgcc.
+-    echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
+-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
+-    if test "${lt_cv_archive_cmds_need_lc+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  $rm conftest*
+-    echo 'static int dummy;' > conftest.$ac_ext
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols_GCJ
+ 
+-    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-      soname=conftest
+-      lib=conftest
+-      libobjs=conftest.$ac_objext
+-      deplibs=
+-      wl=$lt_cv_prog_cc_wl
+-      compiler_flags=-v
+-      linker_flags=-v
+-      verstring=
+-      output_objdir=.
+-      libname=conftest
+-      save_allow_undefined_flag=$allow_undefined_flag
+-      allow_undefined_flag=
+-      if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+-  (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-      then
+-	lt_cv_archive_cmds_need_lc=no
+-      else
+-	lt_cv_archive_cmds_need_lc=yes
+-      fi
+-      allow_undefined_flag=$save_allow_undefined_flag
+-    else
+-      cat conftest.err 1>&5
+-    fi
+-fi
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds_GCJ
++
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms_GCJ
++
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms_GCJ
++
++# ### END LIBTOOL TAG CONFIG: $tagname
++
++__EOF__
+ 
+-    echo "$as_me:$LINENO: result: $lt_cv_archive_cmds_need_lc" >&5
+-echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6
+-    ;;
+-  esac
+-fi
+-need_lc=${lt_cv_archive_cmds_need_lc-yes}
+ 
+-# The second clause should only fire when bootstrapping the
+-# libtool distribution, otherwise you forgot to ship ltmain.sh
+-# with your package, and you will get complaints that there are
+-# no rules to generate ltmain.sh.
+-if test -f "$ltmain"; then
+-  :
+ else
+   # If there is no Makefile yet, we rely on a make rule to execute
+   # `config.status --recheck' to rerun these tests and create the
+   # libtool script then.
+-  test -f Makefile && make "$ltmain"
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
+ fi
+ 
+-if test -f "$ltmain"; then
+-  trap "$rm \"${ofile}T\"; exit 1" 1 2 15
+-  $rm -f "${ofile}T"
+ 
+-  echo creating $ofile
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++CC="$lt_save_CC"
++
++	else
++	  tagname=""
++	fi
++	;;
++
++      RC)
++
++
++
++# Source file extension for RC test sources.
++ac_ext=rc
++
++# Object file extension for compiled RC test sources.
++objext=o
++objext_RC=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
++
++# Code to be used in simple link tests
++lt_simple_link_test_code="$lt_simple_compile_test_code"
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
++
++# Allow CC to be a program name with arguments.
++compiler=$CC
++
++
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${RC-"windres"}
++compiler=$CC
++compiler_RC=$CC
++lt_cv_prog_compiler_c_o_RC=yes
+ 
++# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # See if we are running on zsh, and set the options which allow our commands through
++  # without removal of \ escapes.
++  if test -n "${ZSH_VERSION+set}" ; then
++    setopt NO_GLOB_SUBST
++  fi
+   # Now quote all the things that may contain metacharacters while being
+   # careful not to overquote the AC_SUBSTed values.  We take copies of the
+   # variables and quote the copies for generation of the libtool script.
+-  for var in echo old_CC old_CFLAGS \
+-    AR AR_FLAGS CC LD LN_S NM SHELL \
+-    reload_flag reload_cmds wl \
+-    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
+-    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
+-    library_names_spec soname_spec \
+-    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
+-    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \
+-    postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \
+-    old_striplib striplib file_magic_cmd export_symbols_cmds \
+-    deplibs_check_method allow_undefined_flag no_undefined_flag \
+-    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
+-    global_symbol_to_c_name_address \
+-    hardcode_libdir_flag_spec hardcode_libdir_separator  \
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
++    SED SHELL STRIP \
++    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++    deplibs_check_method reload_flag reload_cmds need_locks \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
+     sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+-    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
++    old_postinstall_cmds old_postuninstall_cmds \
++    compiler_RC \
++    CC_RC \
++    LD_RC \
++    lt_prog_compiler_wl_RC \
++    lt_prog_compiler_pic_RC \
++    lt_prog_compiler_static_RC \
++    lt_prog_compiler_no_builtin_flag_RC \
++    export_dynamic_flag_spec_RC \
++    thread_safe_flag_spec_RC \
++    whole_archive_flag_spec_RC \
++    enable_shared_with_static_runtimes_RC \
++    old_archive_cmds_RC \
++    old_archive_from_new_cmds_RC \
++    predep_objects_RC \
++    postdep_objects_RC \
++    predeps_RC \
++    postdeps_RC \
++    compiler_lib_search_path_RC \
++    archive_cmds_RC \
++    archive_expsym_cmds_RC \
++    postinstall_cmds_RC \
++    postuninstall_cmds_RC \
++    old_archive_from_expsyms_cmds_RC \
++    allow_undefined_flag_RC \
++    no_undefined_flag_RC \
++    export_symbols_cmds_RC \
++    hardcode_libdir_flag_spec_RC \
++    hardcode_libdir_flag_spec_ld_RC \
++    hardcode_libdir_separator_RC \
++    hardcode_automatic_RC \
++    module_cmds_RC \
++    module_expsym_cmds_RC \
++    lt_cv_prog_compiler_c_o_RC \
++    exclude_expsyms_RC \
++    include_expsyms_RC; do
+ 
+     case $var in
+-    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
+-    old_postinstall_cmds | old_postuninstall_cmds | \
+-    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
+-    extract_expsyms_cmds | old_archive_from_expsyms_cmds | \
++    old_archive_cmds_RC | \
++    old_archive_from_new_cmds_RC | \
++    archive_cmds_RC | \
++    archive_expsym_cmds_RC | \
++    module_cmds_RC | \
++    module_expsym_cmds_RC | \
++    old_archive_from_expsyms_cmds_RC | \
++    export_symbols_cmds_RC | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+     postinstall_cmds | postuninstall_cmds | \
+-    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+       # Double-quote double-evaled strings.
+       eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+       ;;
+@@ -7026,43 +19497,16 @@
+     esac
+   done
+ 
+-  cat <<__EOF__ > "${ofile}T"
+-#! $SHELL
+-
+-# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+-#
+-# Copyright (C) 1996-2000 Free Software Foundation, Inc.
+-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+-#
+-# This program is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
+-# (at your option) any later version.
+-#
+-# This program is distributed in the hope that it will be useful, but
+-# WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+-# General Public License for more details.
+-#
+-# You should have received a copy of the GNU General Public License
+-# along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-#
+-# As a special exception to the GNU General Public License, if you
+-# distribute this file as part of a program that contains a
+-# configuration script generated by Autoconf, you may include it under
+-# the same distribution terms that you use for the rest of that program.
+-
+-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="sed -e s/^X//"
++  case $lt_echo in
++  *'\$0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
++    ;;
++  esac
+ 
+-# The HP-UX ksh and POSIX shell print the target directory to stdout
+-# if CDPATH is set.
+-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++cfgfile="$ofile"
+ 
+-# ### BEGIN LIBTOOL CONFIG
++  cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+ 
+ # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+ 
+@@ -7076,7 +19520,10 @@
+ build_old_libs=$enable_static
+ 
+ # Whether or not to add -lc for building shared libraries.
+-build_libtool_need_lc=$need_lc
++build_libtool_need_lc=$archive_cmds_need_lc_RC
++
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
+ 
+ # Whether or not to optimize for fast installation.
+ fast_install=$enable_fast_install
+@@ -7092,14 +19539,20 @@
+ AR=$lt_AR
+ AR_FLAGS=$lt_AR_FLAGS
+ 
+-# The default C compiler.
+-CC=$lt_CC
++# A C compiler.
++LTCC=$lt_LTCC
++
++# A language-specific compiler.
++CC=$lt_compiler_RC
+ 
+ # Is the compiler the GNU C compiler?
+-with_gcc=$GCC
++with_gcc=$GCC_RC
++
++# An ERE matcher.
++EGREP=$lt_EGREP
+ 
+ # The linker used to build libraries.
+-LD=$lt_LD
++LD=$lt_LD_RC
+ 
+ # Whether we need hard or soft links.
+ LN_S=$lt_LN_S
+@@ -7108,7 +19561,7 @@
+ NM=$lt_NM
+ 
+ # A symbol stripping program
+-STRIP=$STRIP
++STRIP=$lt_STRIP
+ 
+ # Used to examine libraries when file_magic_cmd begins "file"
+ MAGIC_CMD=$MAGIC_CMD
+@@ -7130,7 +19583,7 @@
+ reload_cmds=$lt_reload_cmds
+ 
+ # How to pass a linker flag through the compiler.
+-wl=$lt_wl
++wl=$lt_lt_prog_compiler_wl_RC
+ 
+ # Object file suffix (normally "o").
+ objext="$ac_objext"
+@@ -7138,18 +19591,21 @@
+ # Old archive suffix (normally "a").
+ libext="$libext"
+ 
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
++
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+ 
+ # Additional compiler flags for building library objects.
+-pic_flag=$lt_pic_flag
++pic_flag=$lt_lt_prog_compiler_pic_RC
+ pic_mode=$pic_mode
+ 
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_compiler_c_o
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
+ 
+-# Can we write directly to a .lo ?
+-compiler_o_lo=$lt_compiler_o_lo
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
+ 
+ # Must we lock files when doing compilation ?
+ need_locks=$lt_need_locks
+@@ -7170,19 +19626,19 @@
+ dlopen_self_static=$enable_dlopen_self_static
+ 
+ # Compiler flag to prevent dynamic linking.
+-link_static_flag=$lt_link_static_flag
++link_static_flag=$lt_lt_prog_compiler_static_RC
+ 
+ # Compiler flag to turn off builtin functions.
+-no_builtin_flag=$lt_no_builtin_flag
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
+ 
+ # Compiler flag to allow reflexive dlopens.
+-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
+ 
+ # Compiler flag to generate shared objects directly from archives.
+-whole_archive_flag_spec=$lt_whole_archive_flag_spec
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
+ 
+ # Compiler flag to generate thread-safe objects.
+-thread_safe_flag_spec=$lt_thread_safe_flag_spec
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
+ 
+ # Library versioning type.
+ version_type=$version_type
+@@ -7199,26 +19655,50 @@
+ 
+ # Commands used to build and install an old-style archive.
+ RANLIB=$lt_RANLIB
+-old_archive_cmds=$lt_old_archive_cmds
++old_archive_cmds=$lt_old_archive_cmds_RC
+ old_postinstall_cmds=$lt_old_postinstall_cmds
+ old_postuninstall_cmds=$lt_old_postuninstall_cmds
+ 
+ # Create an old-style archive from a shared archive.
+-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
+ 
+ # Create a temporary old-style archive to link instead of a shared archive.
+-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
+ 
+ # Commands used to build and install a shared archive.
+-archive_cmds=$lt_archive_cmds
+-archive_expsym_cmds=$lt_archive_expsym_cmds
++archive_cmds=$lt_archive_cmds_RC
++archive_expsym_cmds=$lt_archive_expsym_cmds_RC
+ postinstall_cmds=$lt_postinstall_cmds
+ postuninstall_cmds=$lt_postuninstall_cmds
+ 
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds_RC
++module_expsym_cmds=$lt_module_expsym_cmds_RC
++
+ # Commands to strip libraries.
+ old_striplib=$lt_old_striplib
+ striplib=$lt_striplib
+ 
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_RC
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_RC
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps_RC
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps_RC
++
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_RC
++
+ # Method to check whether dependent libraries are shared objects.
+ deplibs_check_method=$lt_deplibs_check_method
+ 
+@@ -7226,10 +19706,10 @@
+ file_magic_cmd=$lt_file_magic_cmd
+ 
+ # Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag=$lt_allow_undefined_flag
++allow_undefined_flag=$lt_allow_undefined_flag_RC
+ 
+ # Flag that forces no undefined symbols.
+-no_undefined_flag=$lt_no_undefined_flag
++no_undefined_flag=$lt_no_undefined_flag_RC
+ 
+ # Commands used to finish a libtool library installation in a directory.
+ finish_cmds=$lt_finish_cmds
+@@ -7238,13 +19718,13 @@
+ finish_eval=$lt_finish_eval
+ 
+ # Take the output of nm and produce a listing of raw symbols and C names.
+-global_symbol_pipe=$lt_global_symbol_pipe
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+ 
+ # Transform the output of nm in a proper C declaration
+-global_symbol_to_cdecl=$lt_global_symbol_to_cdecl
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+ 
+ # Transform the output of nm in a C name address pair
+-global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+ 
+ # This is the shared library runtime path variable.
+ runpath_var=$runpath_var
+@@ -7256,36 +19736,45 @@
+ shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+ 
+ # How to hardcode a shared library path into an executable.
+-hardcode_action=$hardcode_action
++hardcode_action=$hardcode_action_RC
+ 
+ # Whether we should hardcode library paths into libraries.
+ hardcode_into_libs=$hardcode_into_libs
+ 
+ # Flag to hardcode \$libdir into a binary during linking.
+ # This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
++
++# If ld is used when linking, flag to hardcode \$libdir into
++# a binary during linking. This must work even if \$libdir does
++# not exist.
++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
+ 
+ # Whether we need a single -rpath flag with a separated argument.
+-hardcode_libdir_separator=$lt_hardcode_libdir_separator
++hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
+ 
+-# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+ # resulting binary.
+-hardcode_direct=$hardcode_direct
++hardcode_direct=$hardcode_direct_RC
+ 
+ # Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+ # resulting binary.
+-hardcode_minus_L=$hardcode_minus_L
++hardcode_minus_L=$hardcode_minus_L_RC
+ 
+ # Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+ # the resulting binary.
+-hardcode_shlibpath_var=$hardcode_shlibpath_var
++hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
++
++# Set to yes if building a shared library automatically hardcodes DIR into the library
++# and all subsequent libraries and executables linked against it.
++hardcode_automatic=$hardcode_automatic_RC
+ 
+ # Variables whose values should be saved in libtool wrapper scripts and
+ # restored at relink time.
+ variables_saved_for_relink="$variables_saved_for_relink"
+ 
+ # Whether libtool must link a program against all its dependency libraries.
+-link_all_deplibs=$link_all_deplibs
++link_all_deplibs=$link_all_deplibs_RC
+ 
+ # Compile-time system search path for libraries
+ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+@@ -7294,234 +19783,75 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path"
++fix_srcfile_path="$fix_srcfile_path_RC"
+ 
+ # Set to yes if exported symbols are required.
+-always_export_symbols=$always_export_symbols
++always_export_symbols=$always_export_symbols_RC
+ 
+ # The commands to list exported symbols.
+-export_symbols_cmds=$lt_export_symbols_cmds
++export_symbols_cmds=$lt_export_symbols_cmds_RC
+ 
+ # The commands to extract the exported symbol list from a shared archive.
+ extract_expsyms_cmds=$lt_extract_expsyms_cmds
+ 
+ # Symbols that should not be listed in the preloaded symbols.
+-exclude_expsyms=$lt_exclude_expsyms
++exclude_expsyms=$lt_exclude_expsyms_RC
+ 
+ # Symbols that must always be exported.
+-include_expsyms=$lt_include_expsyms
++include_expsyms=$lt_include_expsyms_RC
+ 
+-# ### END LIBTOOL CONFIG
++# ### END LIBTOOL TAG CONFIG: $tagname
+ 
+ __EOF__
+ 
+-  case $host_os in
+-  aix3*)
+-    cat <<\EOF >> "${ofile}T"
+ 
+-# AIX sometimes has problems with the GCC collect2 program.  For some
+-# reason, if we set the COLLECT_NAMES environment variable, the problems
+-# vanish in a puff of smoke.
+-if test "X${COLLECT_NAMES+set}" != Xset; then
+-  COLLECT_NAMES=
+-  export COLLECT_NAMES
++else
++  # If there is no Makefile yet, we rely on a make rule to execute
++  # `config.status --recheck' to rerun these tests and create the
++  # libtool script then.
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
+ fi
+-EOF
+-    ;;
+-  esac
+ 
+-  case $host_os in
+-  cygwin* | mingw* | pw32* | os2*)
+-    cat <<'EOF' >> "${ofile}T"
+-      # This is a source program that is used to create dlls on Windows
+-      # Don't remove nor modify the starting and closing comments
+-# /* ltdll.c starts here */
+-# #define WIN32_LEAN_AND_MEAN
+-# #include <windows.h>
+-# #undef WIN32_LEAN_AND_MEAN
+-# #include <stdio.h>
+-#
+-# #ifndef __CYGWIN__
+-# #  ifdef __CYGWIN32__
+-# #    define __CYGWIN__ __CYGWIN32__
+-# #  endif
+-# #endif
+-#
+-# #ifdef __cplusplus
+-# extern "C" {
+-# #endif
+-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
+-# #ifdef __cplusplus
+-# }
+-# #endif
+-#
+-# #ifdef __CYGWIN__
+-# #include <cygwin/cygwin_dll.h>
+-# DECLARE_CYGWIN_DLL( DllMain );
+-# #endif
+-# HINSTANCE __hDllInstance_base;
+-#
+-# BOOL APIENTRY
+-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
+-# {
+-#   __hDllInstance_base = hInst;
+-#   return TRUE;
+-# }
+-# /* ltdll.c ends here */
+-	# This is a source program that is used to create import libraries
+-	# on Windows for dlls which lack them. Don't remove nor modify the
+-	# starting and closing comments
+-# /* impgen.c starts here */
+-# /*   Copyright (C) 1999-2000 Free Software Foundation, Inc.
+-#
+-#  This file is part of GNU libtool.
+-#
+-#  This program is free software; you can redistribute it and/or modify
+-#  it under the terms of the GNU General Public License as published by
+-#  the Free Software Foundation; either version 2 of the License, or
+-#  (at your option) any later version.
+-#
+-#  This program is distributed in the hope that it will be useful,
+-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#  GNU General Public License for more details.
+-#
+-#  You should have received a copy of the GNU General Public License
+-#  along with this program; if not, write to the Free Software
+-#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-#  */
+-#
+-# #include <stdio.h>		/* for printf() */
+-# #include <unistd.h>		/* for open(), lseek(), read() */
+-# #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
+-# #include <string.h>		/* for strdup() */
+-#
+-# /* O_BINARY isn't required (or even defined sometimes) under Unix */
+-# #ifndef O_BINARY
+-# #define O_BINARY 0
+-# #endif
+-#
+-# static unsigned int
+-# pe_get16 (fd, offset)
+-#      int fd;
+-#      int offset;
+-# {
+-#   unsigned char b[2];
+-#   lseek (fd, offset, SEEK_SET);
+-#   read (fd, b, 2);
+-#   return b[0] + (b[1]<<8);
+-# }
+-#
+-# static unsigned int
+-# pe_get32 (fd, offset)
+-#     int fd;
+-#     int offset;
+-# {
+-#   unsigned char b[4];
+-#   lseek (fd, offset, SEEK_SET);
+-#   read (fd, b, 4);
+-#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
+-# }
+-#
+-# static unsigned int
+-# pe_as32 (ptr)
+-#      void *ptr;
+-# {
+-#   unsigned char *b = ptr;
+-#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
+-# }
+-#
+-# int
+-# main (argc, argv)
+-#     int argc;
+-#     char *argv[];
+-# {
+-#     int dll;
+-#     unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
+-#     unsigned long export_rva, export_size, nsections, secptr, expptr;
+-#     unsigned long name_rvas, nexp;
+-#     unsigned char *expdata, *erva;
+-#     char *filename, *dll_name;
+-#
+-#     filename = argv[1];
+-#
+-#     dll = open(filename, O_RDONLY|O_BINARY);
+-#     if (dll < 1)
+-# 	return 1;
+-#
+-#     dll_name = filename;
+-#
+-#     for (i=0; filename[i]; i++)
+-# 	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
+-# 	    dll_name = filename + i +1;
+-#
+-#     pe_header_offset = pe_get32 (dll, 0x3c);
+-#     opthdr_ofs = pe_header_offset + 4 + 20;
+-#     num_entries = pe_get32 (dll, opthdr_ofs + 92);
+-#
+-#     if (num_entries < 1) /* no exports */
+-# 	return 1;
+-#
+-#     export_rva = pe_get32 (dll, opthdr_ofs + 96);
+-#     export_size = pe_get32 (dll, opthdr_ofs + 100);
+-#     nsections = pe_get16 (dll, pe_header_offset + 4 +2);
+-#     secptr = (pe_header_offset + 4 + 20 +
+-# 	      pe_get16 (dll, pe_header_offset + 4 + 16));
+-#
+-#     expptr = 0;
+-#     for (i = 0; i < nsections; i++)
+-#     {
+-# 	char sname[8];
+-# 	unsigned long secptr1 = secptr + 40 * i;
+-# 	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
+-# 	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
+-# 	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
+-# 	lseek(dll, secptr1, SEEK_SET);
+-# 	read(dll, sname, 8);
+-# 	if (vaddr <= export_rva && vaddr+vsize > export_rva)
+-# 	{
+-# 	    expptr = fptr + (export_rva - vaddr);
+-# 	    if (export_rva + export_size > vaddr + vsize)
+-# 		export_size = vsize - (export_rva - vaddr);
+-# 	    break;
+-# 	}
+-#     }
+-#
+-#     expdata = (unsigned char*)malloc(export_size);
+-#     lseek (dll, expptr, SEEK_SET);
+-#     read (dll, expdata, export_size);
+-#     erva = expdata - export_rva;
+-#
+-#     nexp = pe_as32 (expdata+24);
+-#     name_rvas = pe_as32 (expdata+32);
+-#
+-#     printf ("EXPORTS\n");
+-#     for (i = 0; i<nexp; i++)
+-#     {
+-# 	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
+-# 	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
+-#     }
+-#
+-#     return 0;
+-# }
+-# /* impgen.c ends here */
+ 
+-EOF
+-    ;;
+-  esac
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-  # We use sed instead of cat because bash on DJGPP gets confused if
+-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+-  # text mode, it properly converts lines to CR/LF.  This bash problem
+-  # is reportedly fixed, but why not run on old versions too?
+-  sed '$q' "$ltmain" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1)
++CC="$lt_save_CC"
+ 
+-  mv -f "${ofile}T" "$ofile" || \
+-    (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T")
+-  chmod +x "$ofile"
+-fi
++	;;
++
++      *)
++	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
++echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
++   { (exit 1); exit 1; }; }
++	;;
++      esac
+ 
++      # Append the new tag name to the list of available tags.
++      if test -n "$tagname" ; then
++      available_tags="$available_tags $tagname"
++    fi
++    fi
++  done
++  IFS="$lt_save_ifs"
+ 
++  # Now substitute the updated list of available tags.
++  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
++    mv "${ofile}T" "$ofile"
++    chmod +x "$ofile"
++  else
++    rm -f "${ofile}T"
++    { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
++echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
++   { (exit 1); exit 1; }; }
++  fi
++fi
+ 
+ 
+ 
+@@ -7536,6 +19866,24 @@
+ 
+ 
+ 
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
+ INCLUDES='-I$(top_srcdir)/include -I$(top_builddir)/include'
+ 
+ 
+@@ -7557,18 +19905,31 @@
+ echo "$as_me:$LINENO: checking $ac_header usability" >&5
+ echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -7577,10 +19938,11 @@
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_header_compiler=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6
+ 
+@@ -7588,20 +19950,24 @@
+ echo "$as_me:$LINENO: checking $ac_header presence" >&5
+ echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <$ac_header>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
++  grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+   else
+     ac_cpp_err=
+   fi
+@@ -7612,7 +19978,8 @@
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+   ac_header_preproc=no
+ fi
+ rm -f conftest.err conftest.$ac_ext
+@@ -7620,26 +19987,43 @@
+ echo "${ECHO_T}$ac_header_preproc" >&6
+ 
+ # So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc in
+-  yes:no )
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
+     { 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 preprocessor's result" >&5
+-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};;
+-  no:yes )
++    { 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:* )
+     { 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:     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: 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;}
++    (
++      cat <<\_ASBOX
++## ------------------------------------------ ##
++## Report this to the AC_PACKAGE_NAME lists.  ##
++## ------------------------------------------ ##
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
+ esac
+ echo "$as_me:$LINENO: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  eval "$as_ac_Header=$ac_header_preproc"
++  eval "$as_ac_Header=\$ac_header_preproc"
+ fi
+ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+@@ -7668,18 +20052,31 @@
+ echo "$as_me:$LINENO: checking inttypes.h usability" >&5
+ echo $ECHO_N "checking inttypes.h usability... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+ #include <inttypes.h>
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -7688,10 +20085,11 @@
+   ac_header_compiler=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_header_compiler=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+ echo "${ECHO_T}$ac_header_compiler" >&6
+ 
+@@ -7699,20 +20097,24 @@
+ echo "$as_me:$LINENO: checking inttypes.h presence" >&5
+ echo $ECHO_N "checking inttypes.h presence... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <inttypes.h>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+   ac_status=$?
+-  egrep -v '^ *\+' conftest.er1 >conftest.err
++  grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } >/dev/null; then
+   if test -s conftest.err; then
+     ac_cpp_err=$ac_c_preproc_warn_flag
++    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+   else
+     ac_cpp_err=
+   fi
+@@ -7723,7 +20125,8 @@
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+   ac_header_preproc=no
+ fi
+ rm -f conftest.err conftest.$ac_ext
+@@ -7731,19 +20134,36 @@
+ echo "${ECHO_T}$ac_header_preproc" >&6
+ 
+ # So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc in
+-  yes:no )
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
++  yes:no: )
+     { echo "$as_me:$LINENO: WARNING: inttypes.h: accepted by the compiler, rejected by the preprocessor!" >&5
+ echo "$as_me: WARNING: inttypes.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: inttypes.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: inttypes.h: proceeding with the preprocessor's result" >&2;};;
+-  no:yes )
++    { echo "$as_me:$LINENO: WARNING: inttypes.h: proceeding with the compiler's result" >&5
++echo "$as_me: WARNING: inttypes.h: proceeding with the compiler's result" >&2;}
++    ac_header_preproc=yes
++    ;;
++  no:yes:* )
+     { echo "$as_me:$LINENO: WARNING: inttypes.h: present but cannot be compiled" >&5
+ echo "$as_me: WARNING: inttypes.h: present but cannot be compiled" >&2;}
+-    { echo "$as_me:$LINENO: WARNING: inttypes.h: check for missing prerequisite headers?" >&5
+-echo "$as_me: WARNING: inttypes.h: check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: inttypes.h:     check for missing prerequisite headers?" >&5
++echo "$as_me: WARNING: inttypes.h:     check for missing prerequisite headers?" >&2;}
++    { echo "$as_me:$LINENO: WARNING: inttypes.h: see the Autoconf documentation" >&5
++echo "$as_me: WARNING: inttypes.h: see the Autoconf documentation" >&2;}
++    { echo "$as_me:$LINENO: WARNING: inttypes.h:     section \"Present But Cannot Be Compiled\"" >&5
++echo "$as_me: WARNING: inttypes.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+     { echo "$as_me:$LINENO: WARNING: inttypes.h: proceeding with the preprocessor's result" >&5
+-echo "$as_me: WARNING: inttypes.h: proceeding with the preprocessor's result" >&2;};;
++echo "$as_me: WARNING: inttypes.h: proceeding with the preprocessor's result" >&2;}
++    { echo "$as_me:$LINENO: WARNING: inttypes.h: in the future, the compiler will take precedence" >&5
++echo "$as_me: WARNING: inttypes.h: in the future, the compiler will take precedence" >&2;}
++    (
++      cat <<\_ASBOX
++## ------------------------------------------ ##
++## Report this to the AC_PACKAGE_NAME lists.  ##
++## ------------------------------------------ ##
++_ASBOX
++    ) |
++      sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
+ esac
+ echo "$as_me:$LINENO: checking for inttypes.h" >&5
+ echo $ECHO_N "checking for inttypes.h... $ECHO_C" >&6
+@@ -7765,15 +20185,12 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -7787,11 +20204,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -7800,10 +20227,11 @@
+   ac_cv_type_char=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_type_char=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5
+ echo "${ECHO_T}$ac_cv_type_char" >&6
+@@ -7821,15 +20249,12 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -7842,11 +20267,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -7855,15 +20290,12 @@
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -7876,11 +20308,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -7889,29 +20331,28 @@
+   ac_hi=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_lo=`expr $ac_mid + 1`
+-                    if test $ac_lo -le $ac_mid; then
+-                      ac_lo= ac_hi=
+-                      break
+-                    fi
+-                    ac_mid=`expr 2 '*' $ac_mid + 1`
++		    if test $ac_lo -le $ac_mid; then
++		      ac_lo= ac_hi=
++		      break
++		    fi
++		    ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -7924,11 +20365,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -7937,15 +20388,12 @@
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -7958,11 +20406,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -7971,37 +20429,36 @@
+   ac_lo=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_hi=`expr '(' $ac_mid ')' - 1`
+-                       if test $ac_mid -le $ac_hi; then
+-                         ac_lo= ac_hi=
+-                         break
+-                       fi
+-                       ac_mid=`expr 2 '*' $ac_mid`
++		       if test $ac_mid -le $ac_hi; then
++			 ac_lo= ac_hi=
++			 break
++		       fi
++		       ac_mid=`expr 2 '*' $ac_mid`
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_lo= ac_hi=
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -8014,11 +20471,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -8027,37 +20494,39 @@
+   ac_hi=$ac_mid
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_char=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77" >&5
+-echo "$as_me: error: cannot compute sizeof (char), 77" >&2;}
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (char), 77
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; } ;;
+ esac
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5
+-echo "$as_me: error: cannot run test program while cross compiling" >&2;}
++  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+ long longval () { return (long) (sizeof (char)); }
+ unsigned long ulongval () { return (long) (sizeof (char)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -8100,13 +20569,16 @@
+ else
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77" >&5
+-echo "$as_me: error: cannot compute sizeof (char), 77" >&2;}
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (char), 77
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+ rm -f conftest.val
+@@ -8127,15 +20599,12 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -8149,11 +20618,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -8162,10 +20641,11 @@
+   ac_cv_type_short=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_type_short=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
+ echo "${ECHO_T}$ac_cv_type_short" >&6
+@@ -8183,15 +20663,12 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -8204,11 +20681,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -8217,15 +20704,12 @@
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -8238,11 +20722,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -8251,29 +20745,28 @@
+   ac_hi=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_lo=`expr $ac_mid + 1`
+-                    if test $ac_lo -le $ac_mid; then
+-                      ac_lo= ac_hi=
+-                      break
+-                    fi
+-                    ac_mid=`expr 2 '*' $ac_mid + 1`
++		    if test $ac_lo -le $ac_mid; then
++		      ac_lo= ac_hi=
++		      break
++		    fi
++		    ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -8286,11 +20779,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -8299,15 +20802,12 @@
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -8320,11 +20820,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -8333,37 +20843,36 @@
+   ac_lo=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_hi=`expr '(' $ac_mid ')' - 1`
+-                       if test $ac_mid -le $ac_hi; then
+-                         ac_lo= ac_hi=
+-                         break
+-                       fi
+-                       ac_mid=`expr 2 '*' $ac_mid`
++		       if test $ac_mid -le $ac_hi; then
++			 ac_lo= ac_hi=
++			 break
++		       fi
++		       ac_mid=`expr 2 '*' $ac_mid`
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_lo= ac_hi=
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -8376,11 +20885,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -8389,37 +20908,39 @@
+   ac_hi=$ac_mid
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_short=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77" >&5
+-echo "$as_me: error: cannot compute sizeof (short), 77" >&2;}
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (short), 77
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; } ;;
+ esac
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5
+-echo "$as_me: error: cannot run test program while cross compiling" >&2;}
++  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+ long longval () { return (long) (sizeof (short)); }
+ unsigned long ulongval () { return (long) (sizeof (short)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -8462,13 +20983,16 @@
+ else
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77" >&5
+-echo "$as_me: error: cannot compute sizeof (short), 77" >&2;}
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (short), 77
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+ rm -f conftest.val
+@@ -8489,15 +21013,12 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -8511,11 +21032,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -8524,10 +21055,11 @@
+   ac_cv_type_int=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_type_int=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
+ echo "${ECHO_T}$ac_cv_type_int" >&6
+@@ -8545,15 +21077,12 @@
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -8566,11 +21095,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -8579,15 +21118,12 @@
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -8600,11 +21136,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -8613,29 +21159,28 @@
+   ac_hi=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_lo=`expr $ac_mid + 1`
+-                    if test $ac_lo -le $ac_mid; then
+-                      ac_lo= ac_hi=
+-                      break
+-                    fi
+-                    ac_mid=`expr 2 '*' $ac_mid + 1`
++		    if test $ac_lo -le $ac_mid; then
++		      ac_lo= ac_hi=
++		      break
++		    fi
++		    ac_mid=`expr 2 '*' $ac_mid + 1`
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -8648,11 +21193,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -8661,15 +21216,12 @@
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -8682,11 +21234,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -8695,37 +21257,36 @@
+   ac_lo=$ac_mid; break
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_hi=`expr '(' $ac_mid ')' - 1`
+-                       if test $ac_mid -le $ac_hi; then
+-                         ac_lo= ac_hi=
+-                         break
+-                       fi
+-                       ac_mid=`expr 2 '*' $ac_mid`
++		       if test $ac_mid -le $ac_hi; then
++			 ac_lo= ac_hi=
++			 break
++		       fi
++		       ac_mid=`expr 2 '*' $ac_mid`
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+   done
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_lo= ac_hi=
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ # Binary search between lo and hi bounds.
+ while test "x$ac_lo" != "x$ac_hi"; do
+   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -8738,11 +21299,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -8751,37 +21322,39 @@
+   ac_hi=$ac_mid
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_lo=`expr '(' $ac_mid ')' + 1`
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ case $ac_lo in
+ ?*) ac_cv_sizeof_int=$ac_lo;;
+-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77" >&5
+-echo "$as_me: error: cannot compute sizeof (int), 77" >&2;}
++'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (int), 77
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; } ;;
+ esac
+ else
+   if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5
+-echo "$as_me: error: cannot run test program while cross compiling" >&2;}
++  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot run test program while cross compiling
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+ long longval () { return (long) (sizeof (int)); }
+ unsigned long ulongval () { return (long) (sizeof (int)); }
+ #include <stdio.h>
+ #include <stdlib.h>
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -8824,13 +21397,16 @@
+ else
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ( exit $ac_status )
+-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77" >&5
+-echo "$as_me: error: cannot compute sizeof (int), 77" >&2;}
++{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute sizeof (int), 77
++See \`config.log' for more details." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+ rm -f conftest.val
+@@ -8881,118 +21457,18 @@
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
+-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
+-if test "${ac_cv_prog_cc_stdc+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_cv_prog_cc_stdc=no
+-ac_save_CC=$CC
+-cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
+-#include <stdarg.h>
+-#include <stdio.h>
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+-struct buf { int x; };
+-FILE * (*rcsopen) (struct buf *, struct stat *, int);
+-static char *e (p, i)
+-     char **p;
+-     int i;
+-{
+-  return p[i];
+-}
+-static char *f (char * (*g) (char **, int), char **p, ...)
+-{
+-  char *s;
+-  va_list v;
+-  va_start (v,p);
+-  s = g (p, va_arg (v,int));
+-  va_end (v);
+-  return s;
+-}
+-int test (int i, double x);
+-struct s1 {int (*f) (int a);};
+-struct s2 {int (*f) (double a);};
+-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+-int argc;
+-char **argv;
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+-int
+-main ()
+-{
+-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-# Don't try gcc -ansi; that turns off useful extensions and
+-# breaks some systems' header files.
+-# AIX			-qlanglvl=ansi
+-# Ultrix and OSF/1	-std1
+-# HP-UX 10.20 and later	-Ae
+-# HP-UX older versions	-Aa -D_HPUX_SOURCE
+-# SVR4			-Xc -D__EXTENSIONS__
+-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+-do
+-  CC="$ac_save_CC $ac_arg"
+-  rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_prog_cc_stdc=$ac_arg
+-break
+-else
+-  echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
+-fi
+-rm -f conftest.$ac_objext
+-done
+-rm -f conftest.$ac_ext conftest.$ac_objext
+-CC=$ac_save_CC
+-
+-fi
+-
+-case "x$ac_cv_prog_cc_stdc" in
+-  x|xno)
+-    echo "$as_me:$LINENO: result: none needed" >&5
+-echo "${ECHO_T}none needed" >&6 ;;
+-  *)
+-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
+-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
+-    CC="$CC $ac_cv_prog_cc_stdc" ;;
+-esac
+-
+ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
+ echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
+ if test "${ac_cv_c_const+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -9049,11 +21525,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -9062,10 +21548,11 @@
+   ac_cv_c_const=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_c_const=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+ echo "${ECHO_T}$ac_cv_c_const" >&6
+@@ -9085,21 +21572,35 @@
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #ifndef __cplusplus
+-static $ac_kw int static_foo () {return 0; }
+-$ac_kw int foo () {return 0; }
++typedef int foo_t;
++static $ac_kw foo_t static_foo () {return 0; }
++$ac_kw foo_t foo () {return 0; }
+ #endif
+ 
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -9108,25 +21609,30 @@
+   ac_cv_c_inline=$ac_kw; break
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+ 
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+ echo "${ECHO_T}$ac_cv_c_inline" >&6
++
++
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+-  no)
+-cat >>confdefs.h <<\_ACEOF
+-#define inline
+-_ACEOF
+- ;;
+-  *)  cat >>confdefs.h <<_ACEOF
+-#define inline $ac_cv_c_inline
++  *)
++    case $ac_cv_c_inline in
++      no) ac_val=;;
++      *) ac_val=$ac_cv_c_inline;;
++    esac
++    cat >>confdefs.h <<_ACEOF
++#ifndef __cplusplus
++#define inline $ac_val
++#endif
+ _ACEOF
+- ;;
++    ;;
+ esac
+ 
+     if test x"$GCC" = x"yes" -a x"$ac_cv_c_inline" = x"inline"; then
+@@ -9135,15 +21641,12 @@
+ 	SAVE_CFLAGS="$CFLAGS"
+ 	CFLAGS="$CFLAGS -Wall -Werror"
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -9154,11 +21657,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -9167,10 +21680,11 @@
+   ac_cv_always_inline=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_always_inline=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 	CFLAGS="$SAVE_CFLAGS"
+ 	echo "$as_me:$LINENO: result: $ac_cv_always_inline" >&5
+ echo "${ECHO_T}$ac_cv_always_inline" >&6
+@@ -9186,15 +21700,12 @@
+     ac_cv_c_restrict=no
+     for ac_kw in restrict __restrict__ __restrict; do
+ 	cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -9205,11 +21716,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -9218,9 +21739,10 @@
+   ac_cv_c_restrict=$ac_kw; break
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+     done
+     echo "$as_me:$LINENO: result: $ac_cv_c_restrict" >&5
+ echo "${ECHO_T}$ac_cv_c_restrict" >&6
+@@ -9242,15 +21764,12 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ $ac_includes_default
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -9264,11 +21783,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -9277,10 +21806,11 @@
+   ac_cv_type_size_t=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_type_size_t=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+ echo "${ECHO_T}$ac_cv_type_size_t" >&6
+@@ -9301,17 +21831,14 @@
+ else
+   # See if sys/param.h defines the BYTE_ORDER macro.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <sys/types.h>
+ #include <sys/param.h>
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -9325,11 +21852,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -9337,17 +21874,14 @@
+   (exit $ac_status); }; }; then
+   # It does; now see whether it defined to BIG_ENDIAN or not.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <sys/types.h>
+ #include <sys/param.h>
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -9361,11 +21895,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -9374,32 +21918,31 @@
+   ac_cv_c_bigendian=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_c_bigendian=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ # It does not; compile a test program.
+ if test "$cross_compiling" = yes; then
+-  # try to guess the endianess by grep'ing values into an object file
++  # try to guess the endianness by grepping values into an object file
+   ac_cv_c_bigendian=unknown
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+ short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
+ void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
+ short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
+ short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
+ void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -9410,20 +21953,30 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  if fgrep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
++  if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
+   ac_cv_c_bigendian=yes
+ fi
+-if fgrep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
++if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+   if test "$ac_cv_c_bigendian" = unknown; then
+     ac_cv_c_bigendian=no
+   else
+@@ -9433,13 +21986,17 @@
+ fi
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ int
+ main ()
+ {
+@@ -9468,14 +22025,15 @@
+ else
+   echo "$as_me: program exited with status $ac_status" >&5
+ echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ( exit $ac_status )
+ ac_cv_c_bigendian=yes
+ fi
+-rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
+ echo "${ECHO_T}$ac_cv_c_bigendian" >&6
+@@ -9489,9 +22047,9 @@
+   no)
+      ;;
+   *)
+-    { { echo "$as_me:$LINENO: error: unknown endianess
++    { { echo "$as_me:$LINENO: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&5
+-echo "$as_me: error: unknown endianess
++echo "$as_me: error: unknown endianness
+ presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
+    { (exit 1); exit 1; }; } ;;
+ esac
+@@ -9509,49 +22067,73 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $ac_func innocuous_$ac_func
++
+ /* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.  */
+-#include <assert.h>
++    which can conflict with char $ac_func (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $ac_func
++
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+ extern "C"
++{
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+ char $ac_func ();
+-char (*f) ();
+-
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+-int
+-main ()
+-{
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+ #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+ choke me
+ #else
+-f = $ac_func;
++char (*f) () = $ac_func;
++#endif
++#ifdef __cplusplus
++}
+ #endif
+ 
++int
++main ()
++{
++return f != $ac_func;
+   ;
+   return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++  (eval $ac_link) 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); } &&
+-         { ac_try='test -s conftest$ac_exeext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -9560,10 +22142,12 @@
+   eval "$as_ac_var=yes"
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ eval "$as_ac_var=no"
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
+ fi
+ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+@@ -9581,8 +22165,11 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ #include <sys/types.h>
+ #include <signal.h>
+ #ifdef signal
+@@ -9594,12 +22181,6 @@
+ void (*signal ()) ();
+ #endif
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -9610,11 +22191,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -9623,10 +22214,11 @@
+   ac_cv_type_signal=void
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_type_signal=int
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
+ echo "${ECHO_T}$ac_cv_type_signal" >&6
+@@ -9640,7 +22232,6 @@
+ 
+ 
+ 
+-LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic"
+ 
+ # Check whether --enable-double or --disable-double was given.
+ if test "${enable_double+set}" = set; then
+@@ -9692,8 +22283,11 @@
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lossaudio  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -9702,12 +22296,6 @@
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+ char _oss_ioctl ();
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -9718,11 +22306,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
++  (eval $ac_link) 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); } &&
+-         { ac_try='test -s conftest$ac_exeext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest$ac_exeext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -9731,10 +22329,12 @@
+   ac_cv_lib_ossaudio__oss_ioctl=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_lib_ossaudio__oss_ioctl=no
+ fi
+-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext \
++      conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5
+@@ -9809,15 +22409,12 @@
+     SAVE_CFLAGS="$CFLAGS"
+     CFLAGS="$OPT_CFLAGS"
+     cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -9828,11 +22425,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -9841,10 +22448,11 @@
+   ac_cv_try_cflags_ok=yes
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv_try_cflags_ok=no
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+     CFLAGS="$SAVE_CFLAGS"
+     echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
+ echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
+@@ -9880,15 +22488,12 @@
+   ac_cv_c_attribute_aligned=0
+ 	for ac_cv_c_attr_align_try in 2 4 8 16 32 64; do
+ 	    cat >conftest.$ac_ext <<_ACEOF
+-#line $LINENO "configure"
+-#include "confdefs.h"
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
+-#ifdef F77_DUMMY_MAIN
+-#  ifdef __cplusplus
+-     extern "C"
+-#  endif
+-   int F77_DUMMY_MAIN() { return 1; }
+-#endif
+ int
+ main ()
+ {
+@@ -9899,11 +22504,21 @@
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>&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); } &&
+-         { ac_try='test -s conftest.$ac_objext'
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
+   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+   (eval $ac_try) 2>&5
+   ac_status=$?
+@@ -9912,9 +22527,10 @@
+   ac_cv_c_attribute_aligned=$ac_cv_c_attr_align_try
+ else
+   echo "$as_me: failed program was:" >&5
+-cat conftest.$ac_ext >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ fi
+-rm -f conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ 	done
+ fi
+ echo "$as_me:$LINENO: result: $ac_cv_c_attribute_aligned" >&5
+@@ -9937,7 +22553,7 @@
+ # config.status only pays attention to the cache file if you give it
+ # the --recheck option to rerun configure.
+ #
+-# `ac_cv_env_foo' variables (set or unset) will be overriden when
++# `ac_cv_env_foo' variables (set or unset) will be overridden when
+ # loading this file, other *unset* `ac_cv_foo' will be assigned the
+ # following values.
+ 
+@@ -9955,13 +22571,13 @@
+       # `set' does not quote correctly, so add quotes (double-quote
+       # substitution turns \\\\ into \\, and sed turns \\ into \).
+       sed -n \
+-        "s/'/'\\\\''/g;
+-    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
++	"s/'/'\\\\''/g;
++	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+       ;;
+     *)
+       # `set' quotes correctly as required by POSIX, so do not add quotes.
+       sed -n \
+-        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
++	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+       ;;
+     esac;
+ } |
+@@ -9972,7 +22588,7 @@
+      t end
+      /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
+      : end' >>confcache
+-if cmp -s $cache_file confcache; then :; else
++if diff $cache_file confcache >/dev/null 2>&1; then :; else
+   if test -w $cache_file; then
+     test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
+     cat confcache >$cache_file
+@@ -9991,18 +22607,61 @@
+ # trailing colons and then remove the whole line if VPATH becomes empty
+ # (actually we leave an empty line to preserve line numbers).
+ if test "x$srcdir" = x.; then
+-  ac_vpsub='/^[ 	]*VPATH[ 	]*=/{
++  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+ s/:*\$(srcdir):*/:/;
+ s/:*\${srcdir}:*/:/;
+ s/:*@srcdir@:*/:/;
+-s/^\([^=]*=[ 	]*\):*/\1/;
++s/^\([^=]*=[	 ]*\):*/\1/;
+ s/:*$//;
+-s/^[^=]*=[ 	]*$//;
++s/^[^=]*=[	 ]*$//;
+ }'
+ fi
+ 
+ DEFS=-DHAVE_CONFIG_H
+ 
++ac_libobjs=
++ac_ltlibobjs=
++for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
++  # 1. Remove the extension, and $U if already installed.
++  ac_i=`echo "$ac_i" |
++	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
++  # 2. Add them.
++  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
++  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
++done
++LIBOBJS=$ac_libobjs
++
++LTLIBOBJS=$ac_ltlibobjs
++
++
++if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++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
++  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++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
++  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++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
++  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++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_clean_files_save=$ac_clean_files
+@@ -10017,11 +22676,12 @@
+ # configure, is in config.log if it exists.
+ 
+ debug=false
++ac_cs_recheck=false
++ac_cs_silent=false
+ SHELL=\${CONFIG_SHELL-$SHELL}
+ _ACEOF
+ 
+ cat >>$CONFIG_STATUS <<\_ACEOF
+-
+ ## --------------------- ##
+ ## M4sh Initialization.  ##
+ ## --------------------- ##
+@@ -10030,46 +22690,57 @@
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
+ elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+   set -o posix
+ fi
++DUALCASE=1; export DUALCASE # for MKS sh
+ 
+-# NLS nuisances.
+ # Support unset when possible.
+-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+   as_unset=unset
+ else
+   as_unset=false
+ fi
+ 
+-(set +x; test -n "`(LANG=C; export LANG) 2>&1`") &&
+-    { $as_unset LANG || test "${LANG+set}" != set; } ||
+-      { LANG=C; export LANG; }
+-(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") &&
+-    { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } ||
+-      { LC_ALL=C; export LC_ALL; }
+-(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") &&
+-    { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } ||
+-      { LC_TIME=C; export LC_TIME; }
+-(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") &&
+-    { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } ||
+-      { LC_CTYPE=C; export LC_CTYPE; }
+-(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") &&
+-    { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } ||
+-      { LANGUAGE=C; export LANGUAGE; }
+-(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") &&
+-    { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } ||
+-      { LC_COLLATE=C; export LC_COLLATE; }
+-(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") &&
+-    { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } ||
+-      { LC_NUMERIC=C; export LC_NUMERIC; }
+-(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") &&
+-    { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } ||
+-      { LC_MESSAGES=C; export LC_MESSAGES; }
++
++# Work around bugs in pre-3.0 UWIN ksh.
++$as_unset ENV MAIL MAILPATH
++PS1='$ '
++PS2='> '
++PS4='+ '
++
++# NLS nuisances.
++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
++  fi
++done
++
++# Required to use basename.
++if expr a : '\(a\)' >/dev/null 2>&1; then
++  as_expr=expr
++else
++  as_expr=false
++fi
++
++if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
++  as_basename=basename
++else
++  as_basename=false
++fi
+ 
+ 
+ # Name of the executable.
+-as_me=`(basename "$0") 2>/dev/null ||
++as_me=`$as_basename "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+ 	 X"$0" : 'X\(/\)$' \| \
+@@ -10080,6 +22751,7 @@
+   	  /^X\/\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+ 
++
+ # PATH needs CR, and LINENO needs CR and PATH.
+ # Avoid depending upon Character Ranges.
+ as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+@@ -10090,15 +22762,15 @@
+ 
+ # The user is always right.
+ if test "${PATH_SEPARATOR+set}" != set; then
+-  echo "#! /bin/sh" >conftest.sh
+-  echo  "exit 0"   >>conftest.sh
+-  chmod +x conftest.sh
+-  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
++  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 conftest.sh
++  rm -f conf$$.sh
+ fi
+ 
+ 
+@@ -10147,6 +22819,8 @@
+   as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
+   test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
++	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
++	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+ 	     CONFIG_SHELL=$as_dir/$as_base
+ 	     export CONFIG_SHELL
+ 	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+@@ -10220,13 +22894,20 @@
+ fi
+ rm -f conf$$ conf$$.exe conf$$.file
+ 
++if mkdir -p . 2>/dev/null; then
++  as_mkdir_p=:
++else
++  test -d ./-p && rmdir ./-p
++  as_mkdir_p=false
++fi
++
+ as_executable_p="test -f"
+ 
+ # Sed expression to map a string onto a valid CPP name.
+-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
++as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+ 
+ # Sed expression to map a string onto a valid variable name.
+-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
++as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+ 
+ 
+ # IFS
+@@ -10236,7 +22917,7 @@
+ IFS=" 	$as_nl"
+ 
+ # CDPATH.
+-$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; }
++$as_unset CDPATH
+ 
+ exec 6>&1
+ 
+@@ -10253,7 +22934,7 @@
+ cat >&5 <<_CSEOF
+ 
+ This file was extended by $as_me, which was
+-generated by GNU Autoconf 2.53.  Invocation command line was
++generated by GNU Autoconf 2.59.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -10293,12 +22974,13 @@
+ 
+   -h, --help       print this help, then exit
+   -V, --version    print version number, then exit
++  -q, --quiet      do not print progress messages
+   -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
+@@ -10315,11 +22997,10 @@
+ cat >>$CONFIG_STATUS <<_ACEOF
+ ac_cs_version="\\
+ config.status
+-configured by $0, generated by GNU Autoconf 2.53,
++configured by $0, generated by GNU Autoconf 2.59,
+   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
+ 
+-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
+-Free Software Foundation, Inc.
++Copyright (C) 2003 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+ srcdir=$srcdir
+@@ -10336,25 +23017,25 @@
+   --*=*)
+     ac_option=`expr "x$1" : 'x\([^=]*\)='`
+     ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
+-    shift
+-    set dummy "$ac_option" "$ac_optarg" ${1+"$@"}
+-    shift
++    ac_shift=:
++    ;;
++  -*)
++    ac_option=$1
++    ac_optarg=$2
++    ac_shift=shift
+     ;;
+-  -*);;
+   *) # This is not an option, so the user has probably given explicit
+      # arguments.
++     ac_option=$1
+      ac_need_defaults=false;;
+   esac
+ 
+-  case $1 in
++  case $ac_option in
+   # Handling of the options.
+ _ACEOF
+-cat >>$CONFIG_STATUS <<_ACEOF
+-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+-    echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
+-    exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
+-_ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
++  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++    ac_cs_recheck=: ;;
+   --version | --vers* | -V )
+     echo "$ac_cs_version"; exit 0 ;;
+   --he | --h)
+@@ -10369,13 +23050,16 @@
+   --debug | --d* | -d )
+     debug=: ;;
+   --file | --fil | --fi | --f )
+-    shift
+-    CONFIG_FILES="$CONFIG_FILES $1"
++    $ac_shift
++    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+     ac_need_defaults=false;;
+   --header | --heade | --head | --hea )
+-    shift
+-    CONFIG_HEADERS="$CONFIG_HEADERS $1"
++    $ac_shift
++    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
+     ac_need_defaults=false;;
++  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
++  | -silent | --silent | --silen | --sile | --sil | --si | --s)
++    ac_cs_silent=: ;;
+ 
+   # This is an error.
+   -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
+@@ -10390,6 +23074,20 @@
+   shift
+ done
+ 
++ac_configure_extra_args=
++
++if $ac_cs_silent; then
++  exec 6>/dev/null
++  ac_configure_extra_args="$ac_configure_extra_args --silent"
++fi
++
++_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF
++if \$ac_cs_recheck; then
++  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
++  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++fi
++
+ _ACEOF
+ 
+ cat >>$CONFIG_STATUS <<_ACEOF
+@@ -10397,7 +23095,7 @@
+ # INIT-COMMANDS section.
+ #
+ 
+-
++AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+ 
+ _ACEOF
+ 
+@@ -10417,7 +23115,7 @@
+   "liba52/Makefile" ) CONFIG_FILES="$CONFIG_FILES liba52/Makefile" ;;
+   "libao/Makefile" ) CONFIG_FILES="$CONFIG_FILES libao/Makefile" ;;
+   "vc++/Makefile" ) CONFIG_FILES="$CONFIG_FILES vc++/Makefile" ;;
+-  "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
++  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+   "include/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;;
+   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+@@ -10435,6 +23133,9 @@
+   test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+ fi
+ 
++# Have a temporary directory for convenience.  Make it in the build tree
++# simply because there is no reason to put it here, and in addition,
++# creating and moving files from /tmp can sometimes cause problems.
+ # Create a temporary directory, and hook for its removal unless debugging.
+ $debug ||
+ {
+@@ -10443,17 +23144,17 @@
+ }
+ 
+ # Create a (secure) tmp directory for tmp files.
+-: ${TMPDIR=/tmp}
++
+ {
+-  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/csXXXXXX") 2>/dev/null` &&
++  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
+   test -n "$tmp" && test -d "$tmp"
+ }  ||
+ {
+-  tmp=$TMPDIR/cs$$-$RANDOM
++  tmp=./confstat$$-$RANDOM
+   (umask 077 && mkdir $tmp)
+ } ||
+ {
+-   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
++   echo "$me: cannot create a temporary directory in ." >&2
+    { (exit 1); exit 1; }
+ }
+ 
+@@ -10504,6 +23205,7 @@
+ s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+ s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+ s,@INSTALL_DATA@,$INSTALL_DATA,;t t
++s,@CYGPATH_W@,$CYGPATH_W,;t t
+ s,@PACKAGE@,$PACKAGE,;t t
+ s,@VERSION@,$VERSION,;t t
+ s,@ACLOCAL@,$ACLOCAL,;t t
+@@ -10511,7 +23213,17 @@
+ s,@AUTOMAKE@,$AUTOMAKE,;t t
+ s,@AUTOHEADER@,$AUTOHEADER,;t t
+ s,@MAKEINFO@,$MAKEINFO,;t t
++s,@install_sh@,$install_sh,;t t
++s,@STRIP@,$STRIP,;t t
++s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
++s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
++s,@mkdir_p@,$mkdir_p,;t t
++s,@AWK@,$AWK,;t t
+ s,@SET_MAKE@,$SET_MAKE,;t t
++s,@am__leading_dot@,$am__leading_dot,;t t
++s,@AMTAR@,$AMTAR,;t t
++s,@am__tar@,$am__tar,;t t
++s,@am__untar@,$am__untar,;t t
+ s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
+ s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
+ s,@MAINT@,$MAINT,;t t
+@@ -10530,19 +23242,47 @@
+ s,@ac_ct_CC@,$ac_ct_CC,;t t
+ s,@EXEEXT@,$EXEEXT,;t t
+ s,@OBJEXT@,$OBJEXT,;t t
++s,@DEPDIR@,$DEPDIR,;t t
++s,@am__include@,$am__include,;t t
++s,@am__quote@,$am__quote,;t t
++s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
++s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
++s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
++s,@CCDEPMODE@,$CCDEPMODE,;t t
++s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
++s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
+ s,@CPP@,$CPP,;t t
++s,@EGREP@,$EGREP,;t t
+ s,@LN_S@,$LN_S,;t t
+ s,@ECHO@,$ECHO,;t t
++s,@AR@,$AR,;t t
++s,@ac_ct_AR@,$ac_ct_AR,;t t
+ s,@RANLIB@,$RANLIB,;t t
+ s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
+-s,@STRIP@,$STRIP,;t t
+-s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
++s,@DLLTOOL@,$DLLTOOL,;t t
++s,@ac_ct_DLLTOOL@,$ac_ct_DLLTOOL,;t t
++s,@AS@,$AS,;t t
++s,@ac_ct_AS@,$ac_ct_AS,;t t
++s,@OBJDUMP@,$OBJDUMP,;t t
++s,@ac_ct_OBJDUMP@,$ac_ct_OBJDUMP,;t t
++s,@CXX@,$CXX,;t t
++s,@CXXFLAGS@,$CXXFLAGS,;t t
++s,@ac_ct_CXX@,$ac_ct_CXX,;t t
++s,@CXXDEPMODE@,$CXXDEPMODE,;t t
++s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
++s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
++s,@CXXCPP@,$CXXCPP,;t t
++s,@F77@,$F77,;t t
++s,@FFLAGS@,$FFLAGS,;t t
++s,@ac_ct_F77@,$ac_ct_F77,;t t
+ s,@LIBTOOL@,$LIBTOOL,;t t
+ s,@INCLUDES@,$INCLUDES,;t t
+ s,@LIBA52_CFLAGS@,$LIBA52_CFLAGS,;t t
+ s,@LIBA52_LIBS@,$LIBA52_LIBS,;t t
+ s,@LIBAO_LIBS@,$LIBAO_LIBS,;t t
+ s,@A52DEC_CFLAGS@,$A52DEC_CFLAGS,;t t
++s,@LIBOBJS@,$LIBOBJS,;t t
++s,@LTLIBOBJS@,$LTLIBOBJS,;t t
+ CEOF
+ 
+ _ACEOF
+@@ -10572,9 +23312,9 @@
+       (echo ':t
+   /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
+       if test -z "$ac_sed_cmds"; then
+-  	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
++	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
+       else
+-  	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
++	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+       fi
+       ac_sed_frag=`expr $ac_sed_frag + 1`
+       ac_beg=$ac_end
+@@ -10592,46 +23332,51 @@
+   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+   case $ac_file in
+   - | *:- | *:-:* ) # input from stdin
+-        cat >$tmp/stdin
+-        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
++	cat >$tmp/stdin
++	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
++	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+   *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
++	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+   # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+   ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-         X"$ac_file" : 'X\(//\)[^/]' \| \
+-         X"$ac_file" : 'X\(//\)$' \| \
+-         X"$ac_file" : 'X\(/\)' \| \
+-         .     : '\(.\)' 2>/dev/null ||
++	 X"$ac_file" : 'X\(//\)[^/]' \| \
++	 X"$ac_file" : 'X\(//\)$' \| \
++	 X"$ac_file" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
+ echo X"$ac_file" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+   	  /^X\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+-  { case "$ac_dir" in
+-  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
+-  *)                      as_incr_dir=.;;
+-esac
+-as_dummy="$ac_dir"
+-for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
+-  case $as_mkdir_dir in
+-    # Skip DOS drivespec
+-    ?:) as_incr_dir=$as_mkdir_dir ;;
+-    *)
+-      as_incr_dir=$as_incr_dir/$as_mkdir_dir
+-      test -d "$as_incr_dir" ||
+-        mkdir "$as_incr_dir" ||
+-	{ { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
+-   { (exit 1); exit 1; }; }
+-    ;;
+-  esac
+-done; }
++  { if $as_mkdir_p; then
++    mkdir -p "$ac_dir"
++  else
++    as_dir="$ac_dir"
++    as_dirs=
++    while test ! -d "$as_dir"; do
++      as_dirs="$as_dir $as_dirs"
++      as_dir=`(dirname "$as_dir") 2>/dev/null ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$as_dir" : 'X\(//\)[^/]' \| \
++	 X"$as_dir" : 'X\(//\)$' \| \
++	 X"$as_dir" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$as_dir" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++    done
++    test ! -n "$as_dirs" || mkdir $as_dirs
++  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
++echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
++   { (exit 1); exit 1; }; }; }
+ 
+   ac_builddir=.
+ 
+@@ -10658,12 +23403,45 @@
+     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+     ac_top_srcdir=$ac_top_builddir$srcdir ;;
+ esac
+-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+-# absolute.
+-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+-ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
+-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
++
++# Do not use `cd foo && pwd` to compute absolute paths, because
++# the directories may not exist.
++case `pwd` in
++.) ac_abs_builddir="$ac_dir";;
++*)
++  case "$ac_dir" in
++  .) ac_abs_builddir=`pwd`;;
++  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
++  *) ac_abs_builddir=`pwd`/"$ac_dir";;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_builddir=${ac_top_builddir}.;;
++*)
++  case ${ac_top_builddir}. in
++  .) ac_abs_top_builddir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
++  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_srcdir=$ac_srcdir;;
++*)
++  case $ac_srcdir in
++  .) ac_abs_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
++  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_srcdir=$ac_top_srcdir;;
++*)
++  case $ac_top_srcdir in
++  .) ac_abs_top_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
++  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
++  esac;;
++esac
+ 
+ 
+   case $INSTALL in
+@@ -10685,7 +23463,7 @@
+     configure_input="$ac_file.  "
+   fi
+   configure_input=$configure_input"Generated from `echo $ac_file_in |
+-                                     sed 's,.*/,,'` by configure."
++				     sed 's,.*/,,'` by configure."
+ 
+   # First look for the input files in the build tree, otherwise in the
+   # src tree.
+@@ -10694,24 +23472,24 @@
+       case $f in
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+-         # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
++	 # Absolute (can't be DOS-style, as IFS=:)
++	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+-         echo $f;;
++	 echo "$f";;
+       *) # Relative
+-         if test -f "$f"; then
+-           # Build tree
+-           echo $f
+-         elif test -f "$srcdir/$f"; then
+-           # Source tree
+-           echo $srcdir/$f
+-         else
+-           # /dev/null tree
+-           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
++	 if test -f "$f"; then
++	   # Build tree
++	   echo "$f"
++	 elif test -f "$srcdir/$f"; then
++	   # Source tree
++	   echo "$srcdir/$f"
++	 else
++	   # /dev/null tree
++	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+-         fi;;
++	 fi;;
+       esac
+     done` || { (exit 1); exit 1; }
+ _ACEOF
+@@ -10753,12 +23531,12 @@
+ # NAME is the cpp macro being defined and VALUE is the value it is being given.
+ #
+ # ac_d sets the value in "#define NAME VALUE" lines.
+-ac_dA='s,^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
+-ac_dB='[ 	].*$,\1#\2'
++ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
++ac_dB='[	 ].*$,\1#\2'
+ ac_dC=' '
+ ac_dD=',;t'
+ # ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
+-ac_uA='s,^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
++ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
+ ac_uB='$,\1#\2define\3'
+ ac_uC=' '
+ ac_uD=',;t'
+@@ -10767,11 +23545,11 @@
+   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+   case $ac_file in
+   - | *:- | *:-:* ) # input from stdin
+-        cat >$tmp/stdin
+-        ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
++	cat >$tmp/stdin
++	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
++	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+   *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
+-        ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
++	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
+   * )   ac_file_in=$ac_file.in ;;
+   esac
+ 
+@@ -10785,28 +23563,29 @@
+       case $f in
+       -) echo $tmp/stdin ;;
+       [\\/$]*)
+-         # Absolute (can't be DOS-style, as IFS=:)
+-         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
++	 # Absolute (can't be DOS-style, as IFS=:)
++	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+-         echo $f;;
++	 # Do quote $f, to prevent DOS paths from being IFS'd.
++	 echo "$f";;
+       *) # Relative
+-         if test -f "$f"; then
+-           # Build tree
+-           echo $f
+-         elif test -f "$srcdir/$f"; then
+-           # Source tree
+-           echo $srcdir/$f
+-         else
+-           # /dev/null tree
+-           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
++	 if test -f "$f"; then
++	   # Build tree
++	   echo "$f"
++	 elif test -f "$srcdir/$f"; then
++	   # Source tree
++	   echo "$srcdir/$f"
++	 else
++	   # /dev/null tree
++	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+    { (exit 1); exit 1; }; }
+-         fi;;
++	 fi;;
+       esac
+     done` || { (exit 1); exit 1; }
+   # Remove the trailing spaces.
+-  sed 's/[ 	]*$//' $ac_file_inputs >$tmp/in
++  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
+ 
+ _ACEOF
+ 
+@@ -10829,9 +23608,9 @@
+ s,[\\$`],\\&,g
+ t clear
+ : clear
+-s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*\)\(([^)]*)\)[ 	]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
++s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
+ t end
+-s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
++s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
+ : end
+ _ACEOF
+ # If some macros were called several times there might be several times
+@@ -10845,13 +23624,13 @@
+ # example, in the case of _POSIX_SOURCE, which is predefined and required
+ # on some systems where configure will not decide to define it.
+ cat >>conftest.undefs <<\_ACEOF
+-s,^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
++s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
+ _ACEOF
+ 
+ # Break up conftest.defines because some shells have a limit on the size
+ # of here documents, and old seds have small limits too (100 cmds).
+ echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
+-echo '  if egrep "^[ 	]*#[ 	]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
++echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
+ echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
+ echo '  :' >>$CONFIG_STATUS
+ rm -f conftest.tail
+@@ -10860,7 +23639,7 @@
+   # Write a limited-size here document to $tmp/defines.sed.
+   echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
+   # Speed up: don't consider the non `#define' lines.
+-  echo '/^[ 	]*#[ 	]*define/!b' >>$CONFIG_STATUS
++  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
+   # Work around the forget-to-reset-the-flag bug.
+   echo 't clr' >>$CONFIG_STATUS
+   echo ': clr' >>$CONFIG_STATUS
+@@ -10875,7 +23654,7 @@
+   mv conftest.tail conftest.defines
+ done
+ rm -f conftest.defines
+-echo '  fi # egrep' >>$CONFIG_STATUS
++echo '  fi # grep' >>$CONFIG_STATUS
+ echo >>$CONFIG_STATUS
+ 
+ # Break up conftest.undefs because some shells have a limit on the size
+@@ -10887,7 +23666,7 @@
+   # Write a limited-size here document to $tmp/undefs.sed.
+   echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
+   # Speed up: don't consider the non `#undef'
+-  echo '/^[ 	]*#[ 	]*undef/!b' >>$CONFIG_STATUS
++  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
+   # Work around the forget-to-reset-the-flag bug.
+   echo 't clr' >>$CONFIG_STATUS
+   echo ': clr' >>$CONFIG_STATUS
+@@ -10915,41 +23694,46 @@
+   cat $tmp/in >>$tmp/config.h
+   rm -f $tmp/in
+   if test x"$ac_file" != x-; then
+-    if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
++    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
+       ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-         X"$ac_file" : 'X\(//\)[^/]' \| \
+-         X"$ac_file" : 'X\(//\)$' \| \
+-         X"$ac_file" : 'X\(/\)' \| \
+-         .     : '\(.\)' 2>/dev/null ||
++	 X"$ac_file" : 'X\(//\)[^/]' \| \
++	 X"$ac_file" : 'X\(//\)$' \| \
++	 X"$ac_file" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
+ echo X"$ac_file" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+   	  /^X\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
+-      { case "$ac_dir" in
+-  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
+-  *)                      as_incr_dir=.;;
+-esac
+-as_dummy="$ac_dir"
+-for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
+-  case $as_mkdir_dir in
+-    # Skip DOS drivespec
+-    ?:) as_incr_dir=$as_mkdir_dir ;;
+-    *)
+-      as_incr_dir=$as_incr_dir/$as_mkdir_dir
+-      test -d "$as_incr_dir" ||
+-        mkdir "$as_incr_dir" ||
+-	{ { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5
+-echo "$as_me: error: cannot create \"$ac_dir\"" >&2;}
+-   { (exit 1); exit 1; }; }
+-    ;;
+-  esac
+-done; }
++      { if $as_mkdir_p; then
++    mkdir -p "$ac_dir"
++  else
++    as_dir="$ac_dir"
++    as_dirs=
++    while test ! -d "$as_dir"; do
++      as_dirs="$as_dir $as_dirs"
++      as_dir=`(dirname "$as_dir") 2>/dev/null ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$as_dir" : 'X\(//\)[^/]' \| \
++	 X"$as_dir" : 'X\(//\)$' \| \
++	 X"$as_dir" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$as_dir" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++    done
++    test ! -n "$as_dirs" || mkdir $as_dirs
++  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
++echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
++   { (exit 1); exit 1; }; }; }
+ 
+       rm -f $ac_file
+       mv $tmp/config.h $ac_file
+@@ -10958,6 +23742,28 @@
+     cat $tmp/config.h
+     rm -f $tmp/config.h
+   fi
++# 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:* )
++      break ;;
++    * )
++      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
++  esac
++done
++echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
++$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; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`/stamp-h$_am_stamp_count
+ done
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+@@ -10970,16 +23776,41 @@
+   ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
+   ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
+ $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+-         X"$ac_dest" : 'X\(//\)[^/]' \| \
+-         X"$ac_dest" : 'X\(//\)$' \| \
+-         X"$ac_dest" : 'X\(/\)' \| \
+-         .     : '\(.\)' 2>/dev/null ||
++	 X"$ac_dest" : 'X\(//\)[^/]' \| \
++	 X"$ac_dest" : 'X\(//\)$' \| \
++	 X"$ac_dest" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
+ echo X"$ac_dest" |
+     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+   	  /^X\(\/\/\)$/{ s//\1/; q; }
+   	  /^X\(\/\).*/{ s//\1/; q; }
+   	  s/.*/./; q'`
++  { if $as_mkdir_p; then
++    mkdir -p "$ac_dir"
++  else
++    as_dir="$ac_dir"
++    as_dirs=
++    while test ! -d "$as_dir"; do
++      as_dirs="$as_dir $as_dirs"
++      as_dir=`(dirname "$as_dir") 2>/dev/null ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$as_dir" : 'X\(//\)[^/]' \| \
++	 X"$as_dir" : 'X\(//\)$' \| \
++	 X"$as_dir" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$as_dir" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++    done
++    test ! -n "$as_dirs" || mkdir $as_dirs
++  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
++echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
++   { (exit 1); exit 1; }; }; }
++
+   ac_builddir=.
+ 
+ if test "$ac_dir" != .; then
+@@ -11005,18 +23836,135 @@
+     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+     ac_top_srcdir=$ac_top_builddir$srcdir ;;
+ esac
+-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+-# absolute.
+-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+-ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
+-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
++
++# Do not use `cd foo && pwd` to compute absolute paths, because
++# the directories may not exist.
++case `pwd` in
++.) ac_abs_builddir="$ac_dir";;
++*)
++  case "$ac_dir" in
++  .) ac_abs_builddir=`pwd`;;
++  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
++  *) ac_abs_builddir=`pwd`/"$ac_dir";;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_builddir=${ac_top_builddir}.;;
++*)
++  case ${ac_top_builddir}. in
++  .) ac_abs_top_builddir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
++  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_srcdir=$ac_srcdir;;
++*)
++  case $ac_srcdir in
++  .) ac_abs_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
++  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
++  esac;;
++esac
++case $ac_abs_builddir in
++.) ac_abs_top_srcdir=$ac_top_srcdir;;
++*)
++  case $ac_top_srcdir in
++  .) ac_abs_top_srcdir=$ac_abs_builddir;;
++  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
++  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
++  esac;;
++esac
+ 
+ 
+   { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
+ echo "$as_me: executing $ac_dest commands" >&6;}
+   case $ac_dest in
+-    default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp > include/stamp-h ;;
++    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
++  # Strip MF so we end up with the name of the file.
++  mf=`echo "$mf" | sed -e 's/:.*$//'`
++  # Check whether this is an Automake generated Makefile or not.
++  # We used to match only the files named `Makefile.in', but
++  # 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
++    dirpart=`(dirname "$mf") 2>/dev/null ||
++$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$mf" : 'X\(//\)[^/]' \| \
++	 X"$mf" : 'X\(//\)$' \| \
++	 X"$mf" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$mf" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++  else
++    continue
++  fi
++  # Extract the definition of DEPDIR, am__include, and am__quote
++  # from the Makefile without running `make'.
++  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
++  test -z "$DEPDIR" && continue
++  am__include=`sed -n 's/^am__include = //p' < "$mf"`
++  test -z "am__include" && continue
++  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++  # When using ansi2knr, U may be empty or an underscore; expand it
++  U=`sed -n 's/^U = //p' < "$mf"`
++  # Find all dependency output files, they are included files with
++  # $(DEPDIR) in their names.  We invoke sed twice because it is the
++  # simplest approach to changing $(DEPDIR) to its actual value in the
++  # expansion.
++  for file in `sed -n "
++    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
++       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
++    # Make sure the directory exists.
++    test -f "$dirpart/$file" && continue
++    fdir=`(dirname "$file") 2>/dev/null ||
++$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$file" : 'X\(//\)[^/]' \| \
++	 X"$file" : 'X\(//\)$' \| \
++	 X"$file" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$file" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++    { if $as_mkdir_p; then
++    mkdir -p $dirpart/$fdir
++  else
++    as_dir=$dirpart/$fdir
++    as_dirs=
++    while test ! -d "$as_dir"; do
++      as_dirs="$as_dir $as_dirs"
++      as_dir=`(dirname "$as_dir") 2>/dev/null ||
++$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++	 X"$as_dir" : 'X\(//\)[^/]' \| \
++	 X"$as_dir" : 'X\(//\)$' \| \
++	 X"$as_dir" : 'X\(/\)' \| \
++	 .     : '\(.\)' 2>/dev/null ||
++echo X"$as_dir" |
++    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++  	  /^X\(\/\/\)$/{ s//\1/; q; }
++  	  /^X\(\/\).*/{ s//\1/; q; }
++  	  s/.*/./; q'`
++    done
++    test ! -n "$as_dirs" || mkdir $as_dirs
++  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
++echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
++   { (exit 1); exit 1; }; }; }
++
++    # echo "creating $dirpart/$file"
++    echo '# dummy' > "$dirpart/$file"
++  done
++done
++ ;;
+   esac
+ done
+ _ACEOF
+@@ -11039,8 +23987,11 @@
+ # need to make the FD available again.
+ if test "$no_create" != yes; then
+   ac_cs_success=:
++  ac_config_status_args=
++  test "$silent" = yes &&
++    ac_config_status_args="$ac_config_status_args --quiet"
+   exec 5>/dev/null
+-  $SHELL $CONFIG_STATUS || ac_cs_success=false
++  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+   exec 5>>config.log
+   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+   # would make configure fail if this is the last instruction.
+diff -uNr a52dec-0.7.4-orig/doc/Makefile.in a52dec-0.7.4/doc/Makefile.in
+--- a52dec-0.7.4-orig/doc/Makefile.in	2002-07-28 13:50:55.000000000 +1000
++++ a52dec-0.7.4/doc/Makefile.in	2005-02-06 16:25:42.679380288 +1100
+@@ -1,6 +1,8 @@
+-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
++# Makefile.in generated by automake 1.9.4 from Makefile.am.
++# @configure_input@
+ 
+-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004  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.
+@@ -10,172 +12,312 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+ 
+-
+-SHELL = @SHELL@
+-
++@SET_MAKE@
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+-prefix = @prefix@
+-exec_prefix = @exec_prefix@
+-
+-bindir = @bindir@
+-sbindir = @sbindir@
+-libexecdir = @libexecdir@
+-datadir = @datadir@
+-sysconfdir = @sysconfdir@
+-sharedstatedir = @sharedstatedir@
+-localstatedir = @localstatedir@
+-libdir = @libdir@
+-infodir = @infodir@
+-mandir = @mandir@
+-includedir = @includedir@
+-oldincludedir = /usr/include
+-
+-DESTDIR =
+-
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-
+ top_builddir = ..
+-
+-ACLOCAL = @ACLOCAL@
+-AUTOCONF = @AUTOCONF@
+-AUTOMAKE = @AUTOMAKE@
+-AUTOHEADER = @AUTOHEADER@
+-
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+-transform = @program_transform_name@
+-
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-host_alias = @host_alias@
++build_triplet = @build@
+ host_triplet = @host@
++subdir = doc
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++A52DEC_CFLAGS = @A52DEC_CFLAGS@
++ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
++AMTAR = @AMTAR@
++AR = @AR@
+ AS = @AS@
++AUTOCONF = @AUTOCONF@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
+ CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CXX = @CXX@
++CXXCPP = @CXXCPP@
++CXXDEPMODE = @CXXDEPMODE@
++CXXFLAGS = @CXXFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
+ ECHO = @ECHO@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
++F77 = @F77@
++FFLAGS = @FFLAGS@
+ INCLUDES = @INCLUDES@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++LDFLAGS = @LDFLAGS@
++LIBA52_CFLAGS = @LIBA52_CFLAGS@
++LIBA52_LIBS = @LIBA52_LIBS@
++LIBAO_LIBS = @LIBAO_LIBS@
++LIBOBJS = @LIBOBJS@
++LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
++LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ RANLIB = @RANLIB@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+-
++ac_ct_AR = @ac_ct_AR@
++ac_ct_AS = @ac_ct_AS@
++ac_ct_CC = @ac_ct_CC@
++ac_ct_CXX = @ac_ct_CXX@
++ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
++ac_ct_F77 = @ac_ct_F77@
++ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
++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@
++am__tar = @am__tar@
++am__untar = @am__untar@
++bindir = @bindir@
++build = @build@
++build_alias = @build_alias@
++build_cpu = @build_cpu@
++build_os = @build_os@
++build_vendor = @build_vendor@
++datadir = @datadir@
++exec_prefix = @exec_prefix@
++host = @host@
++host_alias = @host_alias@
++host_cpu = @host_cpu@
++host_os = @host_os@
++host_vendor = @host_vendor@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localstatedir = @localstatedir@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++sysconfdir = @sysconfdir@
++target_alias = @target_alias@
+ EXTRA_DIST = liba52.txt
+-mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs
+-CONFIG_HEADER = ../include/config.h
+-CONFIG_CLEAN_FILES = 
+-DIST_COMMON =  Makefile.am Makefile.in
+-
++all: all-am
+ 
+-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+-
+-TAR = tar
+-GZIP_ENV = --best
+-all: all-redirect
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/Makefile
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --gnu  doc/Makefile
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++mostlyclean-libtool:
++	-rm -f *.lo
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) \
+-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
++clean-libtool:
++	-rm -rf .libs _libs
+ 
++distclean-libtool:
++	-rm -f libtool
++uninstall-info-am:
+ tags: TAGS
+ TAGS:
+ 
++ctags: CTAGS
++CTAGS:
+ 
+-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+-
+-subdir = doc
+ 
+ distdir: $(DISTFILES)
+-	@for file in $(DISTFILES); do \
+-	  d=$(srcdir); \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++	list='$(DISTFILES)'; for file in $$list; do \
++	  case $$file in \
++	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++	  esac; \
++	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++	    dir="/$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
++	  else \
++	    dir=''; \
++	  fi; \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++	    fi; \
++	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	    || cp -p $$d/$$file $(distdir)/$$file \
++	    || exit 1; \
+ 	  fi; \
+ 	done
+-info-am:
+-info: info-am
+-dvi-am:
+-dvi: dvi-am
+ check-am: all-am
+ check: check-am
+-installcheck-am:
+-installcheck: installcheck-am
+-install-exec-am:
++all-am: Makefile
++installdirs:
++install: install-am
+ install-exec: install-exec-am
+-
+-install-data-am:
+ install-data: install-data-am
++uninstall: uninstall-am
+ 
+ install-am: all-am
+ 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+-install: install-am
+-uninstall-am:
+-uninstall: uninstall-am
+-all-am: Makefile
+-all-redirect: all-am
+-install-strip:
+-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+-installdirs:
+-
+ 
++installcheck: installcheck-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++	  `test -z '$(STRIP)' || \
++	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ mostlyclean-generic:
+ 
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+-mostlyclean-am:  mostlyclean-generic
++	@echo "This command is intended for maintainers to use"
++	@echo "it deletes files that may require special tools to rebuild."
++clean: clean-am
+ 
+-mostlyclean: mostlyclean-am
++clean-am: clean-generic clean-libtool mostlyclean-am
+ 
+-clean-am:  clean-generic mostlyclean-am
++distclean: distclean-am
++	-rm -f Makefile
++distclean-am: clean-am distclean-generic distclean-libtool
+ 
+-clean: clean-am
++dvi: dvi-am
+ 
+-distclean-am:  distclean-generic clean-am
+-	-rm -f libtool
++dvi-am:
+ 
+-distclean: distclean-am
++html: html-am
+ 
+-maintainer-clean-am:  maintainer-clean-generic distclean-am
+-	@echo "This command is intended for maintainers to use;"
+-	@echo "it deletes files that may require special tools to rebuild."
++info: info-am
++
++info-am:
++
++install-data-am:
++
++install-exec-am:
++
++install-info: install-info-am
++
++install-man:
++
++installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
++	-rm -f Makefile
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-generic mostlyclean-libtool
++
++pdf: pdf-am
++
++pdf-am:
++
++ps: ps-am
++
++ps-am:
+ 
+-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
+-installcheck-am installcheck install-exec-am install-exec \
+-install-data-am install-data install-am install uninstall-am uninstall \
+-all-redirect all-am all installdirs mostlyclean-generic \
+-distclean-generic clean-generic maintainer-clean-generic clean \
+-mostlyclean distclean maintainer-clean
++uninstall-am: uninstall-info-am
+ 
++.PHONY: all all-am check check-am clean clean-generic clean-libtool \
++	distclean distclean-generic distclean-libtool distdir dvi \
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-exec install-exec-am \
++	install-info install-info-am install-man install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-generic \
++	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
++	uninstall-info-am
+ 
+ # 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 -uNr a52dec-0.7.4-orig/include/Makefile.in a52dec-0.7.4/include/Makefile.in
+--- a52dec-0.7.4-orig/include/Makefile.in	2002-07-28 13:50:54.000000000 +1000
++++ a52dec-0.7.4/include/Makefile.in	2005-02-06 16:25:42.772366152 +1100
+@@ -1,6 +1,8 @@
+-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
++# Makefile.in generated by automake 1.9.4 from Makefile.am.
++# @configure_input@
+ 
+-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004  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.
+@@ -10,253 +12,409 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+ 
+-
+-SHELL = @SHELL@
++@SET_MAKE@
+ 
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+-prefix = @prefix@
+-exec_prefix = @exec_prefix@
+-
+-bindir = @bindir@
+-sbindir = @sbindir@
+-libexecdir = @libexecdir@
+-datadir = @datadir@
+-sysconfdir = @sysconfdir@
+-sharedstatedir = @sharedstatedir@
+-localstatedir = @localstatedir@
+-libdir = @libdir@
+-infodir = @infodir@
+-mandir = @mandir@
+-includedir = @includedir@
+-oldincludedir = /usr/include
+-
+-DESTDIR =
+-
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-
+ top_builddir = ..
+-
+-ACLOCAL = @ACLOCAL@
+-AUTOCONF = @AUTOCONF@
+-AUTOMAKE = @AUTOMAKE@
+-AUTOHEADER = @AUTOHEADER@
+-
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+-transform = @program_transform_name@
+-
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-host_alias = @host_alias@
++build_triplet = @build@
+ host_triplet = @host@
++subdir = include
++DIST_COMMON = $(pkginclude_HEADERS) $(srcdir)/Makefile.am \
++	$(srcdir)/Makefile.in $(srcdir)/config.h.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs
++CONFIG_HEADER = config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(pkgincludedir)"
++pkgincludeHEADERS_INSTALL = $(INSTALL_HEADER)
++HEADERS = $(pkginclude_HEADERS)
++ETAGS = etags
++CTAGS = ctags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++A52DEC_CFLAGS = @A52DEC_CFLAGS@
++ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
++AMTAR = @AMTAR@
++AR = @AR@
+ AS = @AS@
++AUTOCONF = @AUTOCONF@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
+ CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CXX = @CXX@
++CXXCPP = @CXXCPP@
++CXXDEPMODE = @CXXDEPMODE@
++CXXFLAGS = @CXXFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
+ ECHO = @ECHO@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
++F77 = @F77@
++FFLAGS = @FFLAGS@
+ INCLUDES = @INCLUDES@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++LDFLAGS = @LDFLAGS@
++LIBA52_CFLAGS = @LIBA52_CFLAGS@
++LIBA52_LIBS = @LIBA52_LIBS@
++LIBAO_LIBS = @LIBAO_LIBS@
++LIBOBJS = @LIBOBJS@
++LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
++LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ RANLIB = @RANLIB@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+-
++ac_ct_AR = @ac_ct_AR@
++ac_ct_AS = @ac_ct_AS@
++ac_ct_CC = @ac_ct_CC@
++ac_ct_CXX = @ac_ct_CXX@
++ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
++ac_ct_F77 = @ac_ct_F77@
++ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
++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@
++am__tar = @am__tar@
++am__untar = @am__untar@
++bindir = @bindir@
++build = @build@
++build_alias = @build_alias@
++build_cpu = @build_cpu@
++build_os = @build_os@
++build_vendor = @build_vendor@
++datadir = @datadir@
++exec_prefix = @exec_prefix@
++host = @host@
++host_alias = @host_alias@
++host_cpu = @host_cpu@
++host_os = @host_os@
++host_vendor = @host_vendor@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localstatedir = @localstatedir@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++sysconfdir = @sysconfdir@
++target_alias = @target_alias@
+ pkginclude_HEADERS = a52.h attributes.h audio_out.h mm_accel.h
+-
+ EXTRA_DIST = tendra.h
+-mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs
+-CONFIG_HEADER = config.h
+-CONFIG_CLEAN_FILES = 
+-HEADERS =  $(pkginclude_HEADERS)
+-
+-DIST_COMMON =  ./stamp-h.in Makefile.am Makefile.in config.h.in
+-
++all: config.h
++	$(MAKE) $(AM_MAKEFLAGS) all-am
+ 
+-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+-
+-TAR = tar
+-GZIP_ENV = --best
+-all: all-redirect
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps include/Makefile
+-
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) \
+-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --gnu  include/Makefile
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+-
+-config.h: stamp-h
+-	@if test ! -f $@; then \
+-		rm -f stamp-h; \
+-		$(MAKE) stamp-h; \
+-	else :; fi
+-stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
+-	cd $(top_builddir) \
+-	  && CONFIG_FILES= CONFIG_HEADERS=include/config.h \
+-	     $(SHELL) ./config.status
+-	@echo timestamp > stamp-h 2> /dev/null
+-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in
++config.h: stamp-h1
+ 	@if test ! -f $@; then \
+-		rm -f $(srcdir)/stamp-h.in; \
+-		$(MAKE) $(srcdir)/stamp-h.in; \
++	  rm -f stamp-h1; \
++	  $(MAKE) stamp-h1; \
+ 	else :; fi
+-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOHEADER)
+-	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
+ 
+-mostlyclean-hdr:
+-
+-clean-hdr:
++stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
++	@rm -f stamp-h1
++	cd $(top_builddir) && $(SHELL) ./config.status include/config.h
++$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
++	cd $(top_srcdir) && $(AUTOHEADER)
++	rm -f stamp-h1
++	touch $@
+ 
+ distclean-hdr:
+-	-rm -f config.h
++	-rm -f config.h stamp-h1
+ 
+-maintainer-clean-hdr:
++mostlyclean-libtool:
++	-rm -f *.lo
+ 
++clean-libtool:
++	-rm -rf .libs _libs
++
++distclean-libtool:
++	-rm -f libtool
++uninstall-info-am:
+ install-pkgincludeHEADERS: $(pkginclude_HEADERS)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
++	test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)"
+ 	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
+-	  if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
+-	  echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p"; \
+-	  $(INSTALL_DATA) $$d$$p $(DESTDIR)$(pkgincludedir)/$$p; \
++	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++	  f=$(am__strip_dir) \
++	  echo " $(pkgincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \
++	  $(pkgincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \
+ 	done
+ 
+ uninstall-pkgincludeHEADERS:
+ 	@$(NORMAL_UNINSTALL)
+-	list='$(pkginclude_HEADERS)'; for p in $$list; do \
+-	  rm -f $(DESTDIR)$(pkgincludedir)/$$p; \
++	@list='$(pkginclude_HEADERS)'; for p in $$list; do \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \
+ 	done
+ 
++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
++	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++	unique=`for i in $$list; do \
++	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++	  done | \
++	  $(AWK) '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	mkid -fID $$unique
+ tags: TAGS
+ 
+-ID: $(HEADERS) $(SOURCES) $(LISP)
+-	list='$(SOURCES) $(HEADERS)'; \
+-	unique=`for i in $$list; do echo $$i; done | \
+-	  awk '    { files[$$0] = 1; } \
++TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
++		$(TAGS_FILES) $(LISP)
++	tags=; \
++	here=`pwd`; \
++	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
++	unique=`for i in $$list; do \
++	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++	  done | \
++	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	here=`pwd` && cd $(srcdir) \
+-	  && mkid -f$$here/ID $$unique $(LISP)
+-
+-TAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
++ctags: CTAGS
++CTAGS:  $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
++		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	list='$(SOURCES) $(HEADERS)'; \
+-	unique=`for i in $$list; do echo $$i; done | \
+-	  awk '    { files[$$0] = 1; } \
++	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
++	unique=`for i in $$list; do \
++	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++	  done | \
++	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
+-	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP))
+-
+-mostlyclean-tags:
+-
+-clean-tags:
++	test -z "$(CTAGS_ARGS)$$tags$$unique" \
++	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++	     $$tags $$unique
++
++GTAGS:
++	here=`$(am__cd) $(top_builddir) && pwd` \
++	  && cd $(top_srcdir) \
++	  && gtags -i $(GTAGS_ARGS) $$here
+ 
+ distclean-tags:
+-	-rm -f TAGS ID
+-
+-maintainer-clean-tags:
+-
+-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+-
+-subdir = include
++	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@for file in $(DISTFILES); do \
+-	  d=$(srcdir); \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++	list='$(DISTFILES)'; for file in $$list; do \
++	  case $$file in \
++	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++	  esac; \
++	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++	    dir="/$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
++	  else \
++	    dir=''; \
++	  fi; \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++	    fi; \
++	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	    || cp -p $$d/$$file $(distdir)/$$file \
++	    || exit 1; \
+ 	  fi; \
+ 	done
+-info-am:
+-info: info-am
+-dvi-am:
+-dvi: dvi-am
+ check-am: all-am
+ check: check-am
+-installcheck-am:
+-installcheck: installcheck-am
+-all-recursive-am: config.h
+-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+-
+-install-exec-am:
++all-am: Makefile $(HEADERS) config.h
++installdirs:
++	for dir in "$(DESTDIR)$(pkgincludedir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
++install: install-am
+ install-exec: install-exec-am
+-
+-install-data-am: install-pkgincludeHEADERS
+ install-data: install-data-am
++uninstall: uninstall-am
+ 
+ install-am: all-am
+ 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+-install: install-am
+-uninstall-am: uninstall-pkgincludeHEADERS
+-uninstall: uninstall-am
+-all-am: Makefile $(HEADERS) config.h
+-all-redirect: all-am
+-install-strip:
+-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+-installdirs:
+-	$(mkinstalldirs)  $(DESTDIR)$(pkgincludedir)
+-
+ 
++installcheck: installcheck-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++	  `test -z '$(STRIP)' || \
++	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ mostlyclean-generic:
+ 
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+-mostlyclean-am:  mostlyclean-hdr mostlyclean-tags mostlyclean-generic
++	@echo "This command is intended for maintainers to use"
++	@echo "it deletes files that may require special tools to rebuild."
++clean: clean-am
+ 
+-mostlyclean: mostlyclean-am
++clean-am: clean-generic clean-libtool mostlyclean-am
+ 
+-clean-am:  clean-hdr clean-tags clean-generic mostlyclean-am
++distclean: distclean-am
++	-rm -f Makefile
++distclean-am: clean-am distclean-generic distclean-hdr \
++	distclean-libtool distclean-tags
+ 
+-clean: clean-am
++dvi: dvi-am
+ 
+-distclean-am:  distclean-hdr distclean-tags distclean-generic clean-am
+-	-rm -f libtool
++dvi-am:
+ 
+-distclean: distclean-am
++html: html-am
+ 
+-maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-tags \
+-		maintainer-clean-generic distclean-am
+-	@echo "This command is intended for maintainers to use;"
+-	@echo "it deletes files that may require special tools to rebuild."
++info: info-am
++
++info-am:
++
++install-data-am: install-pkgincludeHEADERS
++
++install-exec-am:
++
++install-info: install-info-am
++
++install-man:
++
++installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
++	-rm -f Makefile
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-generic mostlyclean-libtool
++
++pdf: pdf-am
++
++pdf-am:
++
++ps: ps-am
++
++ps-am:
+ 
+-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
+-uninstall-pkgincludeHEADERS install-pkgincludeHEADERS tags \
+-mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
+-distdir info-am info dvi-am dvi check check-am installcheck-am \
+-installcheck all-recursive-am install-exec-am install-exec \
+-install-data-am install-data install-am install uninstall-am uninstall \
+-all-redirect all-am all installdirs mostlyclean-generic \
+-distclean-generic clean-generic maintainer-clean-generic clean \
+-mostlyclean distclean maintainer-clean
++uninstall-am: uninstall-info-am uninstall-pkgincludeHEADERS
+ 
++.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
++	clean-libtool ctags distclean distclean-generic distclean-hdr \
++	distclean-libtool 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-pkgincludeHEADERS \
++	install-strip installcheck installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags uninstall uninstall-am uninstall-info-am \
++	uninstall-pkgincludeHEADERS
+ 
+ # 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 -uNr a52dec-0.7.4-orig/include/config.h.in a52dec-0.7.4/include/config.h.in
+--- a52dec-0.7.4-orig/include/config.h.in	2002-07-28 13:50:41.000000000 +1000
++++ a52dec-0.7.4/include/config.h.in	2005-02-06 16:25:08.979503448 +1100
+@@ -112,9 +112,11 @@
+ /* Define to empty if `const' does not conform to ANSI C. */
+ #undef const
+ 
+-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
+-   if it is not supported. */
++/* Define to `__inline__' or `__inline' if that's what the C compiler
++   calls it, or to nothing if 'inline' is not supported under any name.  */
++#ifndef __cplusplus
+ #undef inline
++#endif
+ 
+ /* Define as `__restrict' if that's what the C compiler calls it, or to
+    nothing if it is not supported. */
+diff -uNr a52dec-0.7.4-orig/include/config.h.in~ a52dec-0.7.4/include/config.h.in~
+--- a52dec-0.7.4-orig/include/config.h.in~	1970-01-01 10:00:00.000000000 +1000
++++ a52dec-0.7.4/include/config.h.in~	2002-07-28 13:50:41.000000000 +1000
+@@ -0,0 +1,124 @@
++/* include/config.h.in.  Generated from configure.in by autoheader.  */
++
++/* maximum supported data alignment */
++#undef ATTRIBUTE_ALIGNED_MAX
++
++/* Define to 1 if you have the <dlfcn.h> header file. */
++#undef HAVE_DLFCN_H
++
++/* Define to 1 if you have the `ftime' function. */
++#undef HAVE_FTIME
++
++/* Define to 1 if you have the `gettimeofday' function. */
++#undef HAVE_GETTIMEOFDAY
++
++/* Define to 1 if you have the <inttypes.h> header file. */
++#undef HAVE_INTTYPES_H
++
++/* Define to 1 if you have the <io.h> header file. */
++#undef HAVE_IO_H
++
++/* Define to 1 if you have the `memalign' function. */
++#undef HAVE_MEMALIGN
++
++/* Define to 1 if you have the <memory.h> header file. */
++#undef HAVE_MEMORY_H
++
++/* Define to 1 if you have the <stdint.h> header file. */
++#undef HAVE_STDINT_H
++
++/* Define to 1 if you have the <stdlib.h> header file. */
++#undef HAVE_STDLIB_H
++
++/* Define to 1 if you have the <strings.h> header file. */
++#undef HAVE_STRINGS_H
++
++/* Define to 1 if you have the <string.h> header file. */
++#undef HAVE_STRING_H
++
++/* Define to 1 if you have the <sys/stat.h> header file. */
++#undef HAVE_SYS_STAT_H
++
++/* Define to 1 if you have the <sys/timeb.h> header file. */
++#undef HAVE_SYS_TIMEB_H
++
++/* Define to 1 if you have the <sys/time.h> header file. */
++#undef HAVE_SYS_TIME_H
++
++/* Define to 1 if you have the <sys/types.h> header file. */
++#undef HAVE_SYS_TYPES_H
++
++/* Define to 1 if you have the <unistd.h> header file. */
++#undef HAVE_UNISTD_H
++
++/* liba52 djbfft support */
++#undef LIBA52_DJBFFT
++
++/* a52 sample precision */
++#undef LIBA52_DOUBLE
++
++/* libao al support */
++#undef LIBAO_AL
++
++/* libao OSS support */
++#undef LIBAO_OSS
++
++/* libao solaris support */
++#undef LIBAO_SOLARIS
++
++/* libao win support */
++#undef LIBAO_WIN
++
++/* Name of package */
++#undef PACKAGE
++
++/* Define to the address where bug reports for this package should be sent. */
++#undef PACKAGE_BUGREPORT
++
++/* Define to the full name of this package. */
++#undef PACKAGE_NAME
++
++/* Define to the full name and version of this package. */
++#undef PACKAGE_STRING
++
++/* Define to the one symbol short name of this package. */
++#undef PACKAGE_TARNAME
++
++/* Define to the version of this package. */
++#undef PACKAGE_VERSION
++
++/* Define as the return type of signal handlers (`int' or `void'). */
++#undef RETSIGTYPE
++
++/* The size of a `char', as computed by sizeof. */
++#undef SIZEOF_CHAR
++
++/* The size of a `int', as computed by sizeof. */
++#undef SIZEOF_INT
++
++/* The size of a `short', as computed by sizeof. */
++#undef SIZEOF_SHORT
++
++/* Define to 1 if you have the ANSI C header files. */
++#undef STDC_HEADERS
++
++/* Version number of package */
++#undef VERSION
++
++/* Define to 1 if your processor stores words with the most significant byte
++   first (like Motorola and SPARC, unlike Intel and VAX). */
++#undef WORDS_BIGENDIAN
++
++/* Define to empty if `const' does not conform to ANSI C. */
++#undef const
++
++/* Define as `__inline' if that's what the C compiler calls it, or to nothing
++   if it is not supported. */
++#undef inline
++
++/* Define as `__restrict' if that's what the C compiler calls it, or to
++   nothing if it is not supported. */
++#undef restrict
++
++/* Define to `unsigned' if <sys/types.h> does not define. */
++#undef size_t
+diff -uNr a52dec-0.7.4-orig/liba52/Makefile.am a52dec-0.7.4/liba52/Makefile.am
+--- a52dec-0.7.4-orig/liba52/Makefile.am	2002-01-28 15:36:48.000000000 +1100
++++ a52dec-0.7.4/liba52/Makefile.am	2005-02-06 16:23:34.077930680 +1100
+@@ -1,4 +1,4 @@
+-CFLAGS = @CFLAGS@ @LIBA52_CFLAGS@
++AM_CFLAGS = @CFLAGS@ @LIBA52_CFLAGS@
+ 
+ lib_LTLIBRARIES = liba52.la
+ 
+diff -uNr a52dec-0.7.4-orig/liba52/Makefile.in a52dec-0.7.4/liba52/Makefile.in
+--- a52dec-0.7.4-orig/liba52/Makefile.in	2002-07-28 13:50:55.000000000 +1000
++++ a52dec-0.7.4/liba52/Makefile.in	2005-02-06 16:25:42.888348520 +1100
+@@ -1,6 +1,8 @@
+-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
++# Makefile.in generated by automake 1.9.4 from Makefile.am.
++# @configure_input@
+ 
+-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004  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.
+@@ -10,177 +12,282 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+ 
++@SET_MAKE@
+ 
+-SHELL = @SHELL@
++SOURCES = $(liba52_la_SOURCES)
+ 
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+-prefix = @prefix@
+-exec_prefix = @exec_prefix@
+-
+-bindir = @bindir@
+-sbindir = @sbindir@
+-libexecdir = @libexecdir@
+-datadir = @datadir@
+-sysconfdir = @sysconfdir@
+-sharedstatedir = @sharedstatedir@
+-localstatedir = @localstatedir@
+-libdir = @libdir@
+-infodir = @infodir@
+-mandir = @mandir@
+-includedir = @includedir@
+-oldincludedir = /usr/include
+-
+-DESTDIR =
+-
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-
+ top_builddir = ..
+-
+-ACLOCAL = @ACLOCAL@
+-AUTOCONF = @AUTOCONF@
+-AUTOMAKE = @AUTOMAKE@
+-AUTOHEADER = @AUTOHEADER@
+-
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+-transform = @program_transform_name@
+-
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-host_alias = @host_alias@
++build_triplet = @build@
+ host_triplet = @host@
++subdir = liba52
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(libdir)"
++libLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(lib_LTLIBRARIES)
++liba52_la_DEPENDENCIES =
++am_liba52_la_OBJECTS = bitstream.lo imdct.lo bit_allocate.lo parse.lo \
++	downmix.lo
++liba52_la_OBJECTS = $(am_liba52_la_OBJECTS)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp = $(SHELL) $(top_srcdir)/autotools/depcomp
++am__depfiles_maybe = depfiles
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(liba52_la_SOURCES)
++DIST_SOURCES = $(liba52_la_SOURCES)
++ETAGS = etags
++CTAGS = ctags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++A52DEC_CFLAGS = @A52DEC_CFLAGS@
++ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
++AMTAR = @AMTAR@
++AR = @AR@
+ AS = @AS@
++AUTOCONF = @AUTOCONF@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
+ CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CXX = @CXX@
++CXXCPP = @CXXCPP@
++CXXDEPMODE = @CXXDEPMODE@
++CXXFLAGS = @CXXFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
+ ECHO = @ECHO@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
++F77 = @F77@
++FFLAGS = @FFLAGS@
+ INCLUDES = @INCLUDES@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++LDFLAGS = @LDFLAGS@
++LIBA52_CFLAGS = @LIBA52_CFLAGS@
++LIBA52_LIBS = @LIBA52_LIBS@
++LIBAO_LIBS = @LIBAO_LIBS@
++LIBOBJS = @LIBOBJS@
++LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
++LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ RANLIB = @RANLIB@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+-
+-CFLAGS = @CFLAGS@ @LIBA52_CFLAGS@
+-
++ac_ct_AR = @ac_ct_AR@
++ac_ct_AS = @ac_ct_AS@
++ac_ct_CC = @ac_ct_CC@
++ac_ct_CXX = @ac_ct_CXX@
++ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
++ac_ct_F77 = @ac_ct_F77@
++ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
++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@
++am__tar = @am__tar@
++am__untar = @am__untar@
++bindir = @bindir@
++build = @build@
++build_alias = @build_alias@
++build_cpu = @build_cpu@
++build_os = @build_os@
++build_vendor = @build_vendor@
++datadir = @datadir@
++exec_prefix = @exec_prefix@
++host = @host@
++host_alias = @host_alias@
++host_cpu = @host_cpu@
++host_os = @host_os@
++host_vendor = @host_vendor@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localstatedir = @localstatedir@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++sysconfdir = @sysconfdir@
++target_alias = @target_alias@
++AM_CFLAGS = @CFLAGS@ @LIBA52_CFLAGS@
+ lib_LTLIBRARIES = liba52.la
+-
+ liba52_la_SOURCES = bitstream.c imdct.c bit_allocate.c parse.c downmix.c
+ liba52_la_LIBADD = @LIBA52_LIBS@ -lm
+ liba52_la_LDFLAGS = -no-undefined
+-
+ EXTRA_DIST = configure.incl a52_internal.h bitstream.h tables.h
+-mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs
+-CONFIG_HEADER = ../include/config.h
+-CONFIG_CLEAN_FILES = 
+-LTLIBRARIES =  $(lib_LTLIBRARIES)
+-
+-
+-DEFS = @DEFS@ -I. -I$(srcdir) -I../include
+-CPPFLAGS = @CPPFLAGS@
+-LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@
+-liba52_la_DEPENDENCIES = 
+-liba52_la_OBJECTS =  bitstream.lo imdct.lo bit_allocate.lo parse.lo \
+-downmix.lo
+-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+-DIST_COMMON =  Makefile.am Makefile.in
+-
+-
+-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+-
+-TAR = tar
+-GZIP_ENV = --best
+-SOURCES = $(liba52_la_SOURCES)
+-OBJECTS = $(liba52_la_OBJECTS)
++all: all-am
+ 
+-all: all-redirect
+ .SUFFIXES:
+-.SUFFIXES: .S .c .lo .o .obj .s
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps liba52/Makefile
+-
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) \
+-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+-
+-
+-mostlyclean-libLTLIBRARIES:
+-
+-clean-libLTLIBRARIES:
+-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+-
+-distclean-libLTLIBRARIES:
+-
+-maintainer-clean-libLTLIBRARIES:
+-
++.SUFFIXES: .c .lo .o .obj
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  liba52/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --gnu  liba52/Makefile
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(libdir)
++	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
+-	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
++	    f=$(am__strip_dir) \
++	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
++	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ 	  else :; fi; \
+ 	done
+ 
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+-	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
++	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	  p=$(am__strip_dir) \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
++	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ 	done
+ 
+-.c.o:
+-	$(COMPILE) -c $<
+-
+-# FIXME: We should only use cygpath when building on Windows,
+-# and only if it is available.
+-.c.obj:
+-	$(COMPILE) -c `cygpath -w $<`
+-
+-.s.o:
+-	$(COMPILE) -c $<
+-
+-.S.o:
+-	$(COMPILE) -c $<
++clean-libLTLIBRARIES:
++	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
++	  test "$$dir" != "$$p" || dir=.; \
++	  echo "rm -f \"$${dir}/so_locations\""; \
++	  rm -f "$${dir}/so_locations"; \
++	done
++liba52.la: $(liba52_la_OBJECTS) $(liba52_la_DEPENDENCIES) 
++	$(LINK) -rpath $(libdir) $(liba52_la_LDFLAGS) $(liba52_la_OBJECTS) $(liba52_la_LIBADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.o core *.core
+ 	-rm -f *.$(OBJEXT)
+ 
+-clean-compile:
+-
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+-maintainer-clean-compile:
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bit_allocate.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bitstream.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/downmix.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imdct.Plo@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse.Plo@am__quote@
+ 
+-.c.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++.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
++@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 $<
+ 
+-.s.lo:
+-	$(LIBTOOL) --mode=compile $(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
++@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) '$<'`
+ 
+-.S.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++.c.lo:
++@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -189,143 +296,178 @@
+ 	-rm -rf .libs _libs
+ 
+ distclean-libtool:
++	-rm -f libtool
++uninstall-info-am:
+ 
+-maintainer-clean-libtool:
+-
+-liba52.la: $(liba52_la_OBJECTS) $(liba52_la_DEPENDENCIES)
+-	$(LINK) -rpath $(libdir) $(liba52_la_LDFLAGS) $(liba52_la_OBJECTS) $(liba52_la_LIBADD) $(LIBS)
+-
++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
++	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++	unique=`for i in $$list; do \
++	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++	  done | \
++	  $(AWK) '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	mkid -fID $$unique
+ tags: TAGS
+ 
+-ID: $(HEADERS) $(SOURCES) $(LISP)
+-	list='$(SOURCES) $(HEADERS)'; \
+-	unique=`for i in $$list; do echo $$i; done | \
+-	  awk '    { files[$$0] = 1; } \
++TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
++		$(TAGS_FILES) $(LISP)
++	tags=; \
++	here=`pwd`; \
++	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
++	unique=`for i in $$list; do \
++	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++	  done | \
++	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	here=`pwd` && cd $(srcdir) \
+-	  && mkid -f$$here/ID $$unique $(LISP)
+-
+-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
++ctags: CTAGS
++CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
++		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	list='$(SOURCES) $(HEADERS)'; \
+-	unique=`for i in $$list; do echo $$i; done | \
+-	  awk '    { files[$$0] = 1; } \
++	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
++	unique=`for i in $$list; do \
++	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++	  done | \
++	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+-	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
+-
+-mostlyclean-tags:
+-
+-clean-tags:
++	test -z "$(CTAGS_ARGS)$$tags$$unique" \
++	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++	     $$tags $$unique
++
++GTAGS:
++	here=`$(am__cd) $(top_builddir) && pwd` \
++	  && cd $(top_srcdir) \
++	  && gtags -i $(GTAGS_ARGS) $$here
+ 
+ distclean-tags:
+-	-rm -f TAGS ID
+-
+-maintainer-clean-tags:
+-
+-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+-
+-subdir = liba52
++	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@for file in $(DISTFILES); do \
+-	  d=$(srcdir); \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++	list='$(DISTFILES)'; for file in $$list; do \
++	  case $$file in \
++	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++	  esac; \
++	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++	    dir="/$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
++	  else \
++	    dir=''; \
++	  fi; \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++	    fi; \
++	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	    || cp -p $$d/$$file $(distdir)/$$file \
++	    || exit 1; \
+ 	  fi; \
+ 	done
+-bit_allocate.lo bit_allocate.o : bit_allocate.c ../include/config.h \
+-	../include/a52.h a52_internal.h
+-bitstream.lo bitstream.o : bitstream.c ../include/config.h \
+-	../include/a52.h a52_internal.h bitstream.h
+-downmix.lo downmix.o : downmix.c ../include/config.h ../include/a52.h \
+-	a52_internal.h
+-imdct.lo imdct.o : imdct.c ../include/config.h ../include/a52.h \
+-	a52_internal.h ../include/mm_accel.h
+-parse.lo parse.o : parse.c ../include/config.h ../include/a52.h \
+-	a52_internal.h bitstream.h tables.h
+-
+-info-am:
+-info: info-am
+-dvi-am:
+-dvi: dvi-am
+ check-am: all-am
+ check: check-am
+-installcheck-am:
+-installcheck: installcheck-am
+-install-exec-am: install-libLTLIBRARIES
++all-am: Makefile $(LTLIBRARIES)
++installdirs:
++	for dir in "$(DESTDIR)$(libdir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
++install: install-am
+ install-exec: install-exec-am
+-
+-install-data-am:
+ install-data: install-data-am
++uninstall: uninstall-am
+ 
+ install-am: all-am
+ 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+-install: install-am
+-uninstall-am: uninstall-libLTLIBRARIES
+-uninstall: uninstall-am
+-all-am: Makefile $(LTLIBRARIES)
+-all-redirect: all-am
+-install-strip:
+-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+-installdirs:
+-	$(mkinstalldirs)  $(DESTDIR)$(libdir)
+-
+ 
++installcheck: installcheck-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++	  `test -z '$(STRIP)' || \
++	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ mostlyclean-generic:
+ 
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+-mostlyclean-am:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
+-		mostlyclean-libtool mostlyclean-tags \
+-		mostlyclean-generic
++	@echo "This command is intended for maintainers to use"
++	@echo "it deletes files that may require special tools to rebuild."
++clean: clean-am
+ 
+-mostlyclean: mostlyclean-am
++clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
++	mostlyclean-am
+ 
+-clean-am:  clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \
+-		clean-generic mostlyclean-am
++distclean: distclean-am
++	-rm -rf ./$(DEPDIR)
++	-rm -f Makefile
++distclean-am: clean-am distclean-compile distclean-generic \
++	distclean-libtool distclean-tags
+ 
+-clean: clean-am
++dvi: dvi-am
+ 
+-distclean-am:  distclean-libLTLIBRARIES distclean-compile \
+-		distclean-libtool distclean-tags distclean-generic \
+-		clean-am
+-	-rm -f libtool
++dvi-am:
+ 
+-distclean: distclean-am
++html: html-am
+ 
+-maintainer-clean-am:  maintainer-clean-libLTLIBRARIES \
+-		maintainer-clean-compile maintainer-clean-libtool \
+-		maintainer-clean-tags maintainer-clean-generic \
+-		distclean-am
+-	@echo "This command is intended for maintainers to use;"
+-	@echo "it deletes files that may require special tools to rebuild."
++info: info-am
++
++info-am:
++
++install-data-am:
++
++install-exec-am: install-libLTLIBRARIES
++
++install-info: install-info-am
++
++install-man:
++
++installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
++	-rm -rf ./$(DEPDIR)
++	-rm -f Makefile
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool
++
++pdf: pdf-am
++
++pdf-am:
+ 
+-.PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
+-clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
+-uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
+-distclean-compile clean-compile maintainer-clean-compile \
+-mostlyclean-libtool distclean-libtool clean-libtool \
+-maintainer-clean-libtool tags mostlyclean-tags distclean-tags \
+-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
+-check-am installcheck-am installcheck install-exec-am install-exec \
+-install-data-am install-data install-am install uninstall-am uninstall \
+-all-redirect all-am all installdirs mostlyclean-generic \
+-distclean-generic clean-generic maintainer-clean-generic clean \
+-mostlyclean distclean maintainer-clean
++ps: ps-am
+ 
++ps-am:
++
++uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
++
++.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
++	clean-libLTLIBRARIES clean-libtool ctags distclean \
++	distclean-compile distclean-generic distclean-libtool \
++	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-libLTLIBRARIES install-man install-strip installcheck \
++	installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags uninstall uninstall-am uninstall-info-am \
++	uninstall-libLTLIBRARIES
+ 
+ # 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 -uNr a52dec-0.7.4-orig/liba52/configure.incl a52dec-0.7.4/liba52/configure.incl
+--- a52dec-0.7.4-orig/liba52/configure.incl	2002-01-28 15:36:48.000000000 +1100
++++ a52dec-0.7.4/liba52/configure.incl	2005-02-06 16:24:01.936695504 +1100
+@@ -2,7 +2,7 @@
+ AC_SUBST([LIBA52_LIBS])
+ 
+ dnl avoid -fPIC when possible
+-LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic"
++dnl LIBA52_CFLAGS="$LIBA52_CFLAGS -prefer-non-pic"
+ 
+ AC_ARG_ENABLE([double],
+     [  --enable-double         use double-precision samples])
+diff -uNr a52dec-0.7.4-orig/libao/Makefile.in a52dec-0.7.4/libao/Makefile.in
+--- a52dec-0.7.4-orig/libao/Makefile.in	2002-07-28 13:50:56.000000000 +1000
++++ a52dec-0.7.4/libao/Makefile.in	2005-02-06 16:25:42.999331648 +1100
+@@ -1,6 +1,8 @@
+-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
++# Makefile.in generated by automake 1.9.4 from Makefile.am.
++# @configure_input@
+ 
+-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004  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.
+@@ -10,162 +12,265 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+ 
++@SET_MAKE@
+ 
+-SHELL = @SHELL@
++SOURCES = $(libao_a_SOURCES)
+ 
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+-prefix = @prefix@
+-exec_prefix = @exec_prefix@
+-
+-bindir = @bindir@
+-sbindir = @sbindir@
+-libexecdir = @libexecdir@
+-datadir = @datadir@
+-sysconfdir = @sysconfdir@
+-sharedstatedir = @sharedstatedir@
+-localstatedir = @localstatedir@
+-libdir = @libdir@
+-infodir = @infodir@
+-mandir = @mandir@
+-includedir = @includedir@
+-oldincludedir = /usr/include
+-
+-DESTDIR =
+-
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-
+ top_builddir = ..
+-
+-ACLOCAL = @ACLOCAL@
+-AUTOCONF = @AUTOCONF@
+-AUTOMAKE = @AUTOMAKE@
+-AUTOHEADER = @AUTOHEADER@
+-
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+-transform = @program_transform_name@
+-
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-host_alias = @host_alias@
++build_triplet = @build@
+ host_triplet = @host@
++subdir = libao
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++LIBRARIES = $(noinst_LIBRARIES)
++ARFLAGS = cru
++libao_a_AR = $(AR) $(ARFLAGS)
++libao_a_LIBADD =
++am_libao_a_OBJECTS = audio_out.$(OBJEXT) float2s16.$(OBJEXT) \
++	audio_out_null.$(OBJEXT) audio_out_float.$(OBJEXT) \
++	audio_out_oss.$(OBJEXT) audio_out_solaris.$(OBJEXT) \
++	audio_out_al.$(OBJEXT) audio_out_win.$(OBJEXT) \
++	audio_out_wav.$(OBJEXT) audio_out_aif.$(OBJEXT) \
++	audio_out_peak.$(OBJEXT)
++libao_a_OBJECTS = $(am_libao_a_OBJECTS)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp = $(SHELL) $(top_srcdir)/autotools/depcomp
++am__depfiles_maybe = depfiles
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(libao_a_SOURCES)
++DIST_SOURCES = $(libao_a_SOURCES)
++ETAGS = etags
++CTAGS = ctags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++A52DEC_CFLAGS = @A52DEC_CFLAGS@
++ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
++AMTAR = @AMTAR@
++AR = @AR@
+ AS = @AS@
++AUTOCONF = @AUTOCONF@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
+ CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CXX = @CXX@
++CXXCPP = @CXXCPP@
++CXXDEPMODE = @CXXDEPMODE@
++CXXFLAGS = @CXXFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
+ ECHO = @ECHO@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
++F77 = @F77@
++FFLAGS = @FFLAGS@
+ INCLUDES = @INCLUDES@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++LDFLAGS = @LDFLAGS@
++LIBA52_CFLAGS = @LIBA52_CFLAGS@
++LIBA52_LIBS = @LIBA52_LIBS@
++LIBAO_LIBS = @LIBAO_LIBS@
++LIBOBJS = @LIBOBJS@
++LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
++LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ RANLIB = @RANLIB@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+-
++ac_ct_AR = @ac_ct_AR@
++ac_ct_AS = @ac_ct_AS@
++ac_ct_CC = @ac_ct_CC@
++ac_ct_CXX = @ac_ct_CXX@
++ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
++ac_ct_F77 = @ac_ct_F77@
++ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
++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@
++am__tar = @am__tar@
++am__untar = @am__untar@
++bindir = @bindir@
++build = @build@
++build_alias = @build_alias@
++build_cpu = @build_cpu@
++build_os = @build_os@
++build_vendor = @build_vendor@
++datadir = @datadir@
++exec_prefix = @exec_prefix@
++host = @host@
++host_alias = @host_alias@
++host_cpu = @host_cpu@
++host_os = @host_os@
++host_vendor = @host_vendor@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localstatedir = @localstatedir@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++sysconfdir = @sysconfdir@
++target_alias = @target_alias@
+ noinst_LIBRARIES = libao.a
+-libao_a_SOURCES = audio_out.c float2s16.c audio_out_null.c audio_out_float.c 		  audio_out_oss.c audio_out_solaris.c audio_out_al.c 		  audio_out_win.c audio_out_wav.c audio_out_aif.c 		  audio_out_peak.c
+-
++libao_a_SOURCES = audio_out.c float2s16.c audio_out_null.c audio_out_float.c \
++		  audio_out_oss.c audio_out_solaris.c audio_out_al.c \
++		  audio_out_win.c audio_out_wav.c audio_out_aif.c \
++		  audio_out_peak.c
+ 
+ EXTRA_DIST = configure.incl audio_out_internal.h
+-mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs
+-CONFIG_HEADER = ../include/config.h
+-CONFIG_CLEAN_FILES = 
+-LIBRARIES =  $(noinst_LIBRARIES)
+-
+-
+-DEFS = @DEFS@ -I. -I$(srcdir) -I../include
+-CPPFLAGS = @CPPFLAGS@
+-LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@
+-libao_a_LIBADD = 
+-libao_a_OBJECTS =  audio_out.$(OBJEXT) float2s16.$(OBJEXT) \
+-audio_out_null.$(OBJEXT) audio_out_float.$(OBJEXT) \
+-audio_out_oss.$(OBJEXT) audio_out_solaris.$(OBJEXT) \
+-audio_out_al.$(OBJEXT) audio_out_win.$(OBJEXT) audio_out_wav.$(OBJEXT) \
+-audio_out_aif.$(OBJEXT) audio_out_peak.$(OBJEXT)
+-AR = ar
+-CFLAGS = @CFLAGS@
+-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+-DIST_COMMON =  Makefile.am Makefile.in
+-
++all: all-am
+ 
+-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+-
+-TAR = tar
+-GZIP_ENV = --best
+-SOURCES = $(libao_a_SOURCES)
+-OBJECTS = $(libao_a_OBJECTS)
+-
+-all: all-redirect
+ .SUFFIXES:
+-.SUFFIXES: .S .c .lo .o .obj .s
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps libao/Makefile
+-
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) \
+-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+-
+-
+-mostlyclean-noinstLIBRARIES:
++.SUFFIXES: .c .lo .o .obj
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libao/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --gnu  libao/Makefile
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ clean-noinstLIBRARIES:
+ 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+-
+-distclean-noinstLIBRARIES:
+-
+-maintainer-clean-noinstLIBRARIES:
+-
+-.c.o:
+-	$(COMPILE) -c $<
+-
+-# FIXME: We should only use cygpath when building on Windows,
+-# and only if it is available.
+-.c.obj:
+-	$(COMPILE) -c `cygpath -w $<`
+-
+-.s.o:
+-	$(COMPILE) -c $<
+-
+-.S.o:
+-	$(COMPILE) -c $<
++libao.a: $(libao_a_OBJECTS) $(libao_a_DEPENDENCIES) 
++	-rm -f libao.a
++	$(libao_a_AR) libao.a $(libao_a_OBJECTS) $(libao_a_LIBADD)
++	$(RANLIB) libao.a
+ 
+ mostlyclean-compile:
+-	-rm -f *.o core *.core
+ 	-rm -f *.$(OBJEXT)
+ 
+-clean-compile:
+-
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+-maintainer-clean-compile:
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_out.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_out_aif.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_out_al.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_out_float.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_out_null.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_out_oss.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_out_peak.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_out_solaris.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_out_wav.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/audio_out_win.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/float2s16.Po@am__quote@
+ 
+-.c.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++.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
++@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 $<
+ 
+-.s.lo:
+-	$(LIBTOOL) --mode=compile $(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
++@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) '$<'`
+ 
+-.S.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++.c.lo:
++@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -174,152 +279,174 @@
+ 	-rm -rf .libs _libs
+ 
+ distclean-libtool:
++	-rm -f libtool
++uninstall-info-am:
+ 
+-maintainer-clean-libtool:
+-
+-libao.a: $(libao_a_OBJECTS) $(libao_a_DEPENDENCIES)
+-	-rm -f libao.a
+-	$(AR) cru libao.a $(libao_a_OBJECTS) $(libao_a_LIBADD)
+-	$(RANLIB) libao.a
+-
++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
++	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++	unique=`for i in $$list; do \
++	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++	  done | \
++	  $(AWK) '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	mkid -fID $$unique
+ tags: TAGS
+ 
+-ID: $(HEADERS) $(SOURCES) $(LISP)
+-	list='$(SOURCES) $(HEADERS)'; \
+-	unique=`for i in $$list; do echo $$i; done | \
+-	  awk '    { files[$$0] = 1; } \
++TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
++		$(TAGS_FILES) $(LISP)
++	tags=; \
++	here=`pwd`; \
++	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
++	unique=`for i in $$list; do \
++	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++	  done | \
++	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	here=`pwd` && cd $(srcdir) \
+-	  && mkid -f$$here/ID $$unique $(LISP)
+-
+-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
++ctags: CTAGS
++CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
++		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	list='$(SOURCES) $(HEADERS)'; \
+-	unique=`for i in $$list; do echo $$i; done | \
+-	  awk '    { files[$$0] = 1; } \
++	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
++	unique=`for i in $$list; do \
++	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++	  done | \
++	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+-	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
+-
+-mostlyclean-tags:
+-
+-clean-tags:
++	test -z "$(CTAGS_ARGS)$$tags$$unique" \
++	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++	     $$tags $$unique
++
++GTAGS:
++	here=`$(am__cd) $(top_builddir) && pwd` \
++	  && cd $(top_srcdir) \
++	  && gtags -i $(GTAGS_ARGS) $$here
+ 
+ distclean-tags:
+-	-rm -f TAGS ID
+-
+-maintainer-clean-tags:
+-
+-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+-
+-subdir = libao
++	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@for file in $(DISTFILES); do \
+-	  d=$(srcdir); \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++	list='$(DISTFILES)'; for file in $$list; do \
++	  case $$file in \
++	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++	  esac; \
++	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++	    dir="/$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
++	  else \
++	    dir=''; \
++	  fi; \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++	    fi; \
++	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	    || cp -p $$d/$$file $(distdir)/$$file \
++	    || exit 1; \
+ 	  fi; \
+ 	done
+-audio_out.o: audio_out.c ../include/config.h ../include/a52.h \
+-	../include/audio_out.h
+-audio_out_aif.o: audio_out_aif.c ../include/config.h ../include/a52.h \
+-	../include/audio_out.h audio_out_internal.h
+-audio_out_al.o: audio_out_al.c ../include/config.h
+-audio_out_float.o: audio_out_float.c ../include/config.h \
+-	../include/a52.h ../include/audio_out.h
+-audio_out_null.o: audio_out_null.c ../include/config.h ../include/a52.h \
+-	../include/audio_out.h
+-audio_out_oss.o: audio_out_oss.c ../include/config.h ../include/a52.h \
+-	../include/audio_out.h audio_out_internal.h
+-audio_out_peak.o: audio_out_peak.c ../include/config.h ../include/a52.h \
+-	../include/audio_out.h audio_out_internal.h
+-audio_out_solaris.o: audio_out_solaris.c ../include/config.h
+-audio_out_wav.o: audio_out_wav.c ../include/config.h ../include/a52.h \
+-	../include/audio_out.h audio_out_internal.h
+-audio_out_win.o: audio_out_win.c ../include/config.h
+-float2s16.o: float2s16.c ../include/config.h ../include/a52.h \
+-	../include/audio_out.h
+-
+-info-am:
+-info: info-am
+-dvi-am:
+-dvi: dvi-am
+ check-am: all-am
+ check: check-am
+-installcheck-am:
+-installcheck: installcheck-am
+-install-exec-am:
++all-am: Makefile $(LIBRARIES)
++installdirs:
++install: install-am
+ install-exec: install-exec-am
+-
+-install-data-am:
+ install-data: install-data-am
++uninstall: uninstall-am
+ 
+ install-am: all-am
+ 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+-install: install-am
+-uninstall-am:
+-uninstall: uninstall-am
+-all-am: Makefile $(LIBRARIES)
+-all-redirect: all-am
+-install-strip:
+-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+-installdirs:
+-
+ 
++installcheck: installcheck-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++	  `test -z '$(STRIP)' || \
++	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ mostlyclean-generic:
+ 
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+-mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
+-		mostlyclean-libtool mostlyclean-tags \
+-		mostlyclean-generic
++	@echo "This command is intended for maintainers to use"
++	@echo "it deletes files that may require special tools to rebuild."
++clean: clean-am
+ 
+-mostlyclean: mostlyclean-am
++clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
++	mostlyclean-am
+ 
+-clean-am:  clean-noinstLIBRARIES clean-compile clean-libtool clean-tags \
+-		clean-generic mostlyclean-am
++distclean: distclean-am
++	-rm -rf ./$(DEPDIR)
++	-rm -f Makefile
++distclean-am: clean-am distclean-compile distclean-generic \
++	distclean-libtool distclean-tags
+ 
+-clean: clean-am
++dvi: dvi-am
+ 
+-distclean-am:  distclean-noinstLIBRARIES distclean-compile \
+-		distclean-libtool distclean-tags distclean-generic \
+-		clean-am
+-	-rm -f libtool
++dvi-am:
+ 
+-distclean: distclean-am
++html: html-am
+ 
+-maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
+-		maintainer-clean-compile maintainer-clean-libtool \
+-		maintainer-clean-tags maintainer-clean-generic \
+-		distclean-am
+-	@echo "This command is intended for maintainers to use;"
+-	@echo "it deletes files that may require special tools to rebuild."
++info: info-am
++
++info-am:
++
++install-data-am:
++
++install-exec-am:
++
++install-info: install-info-am
++
++install-man:
++
++installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
++	-rm -rf ./$(DEPDIR)
++	-rm -f Makefile
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool
++
++pdf: pdf-am
++
++pdf-am:
+ 
+-.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
+-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
+-mostlyclean-compile distclean-compile clean-compile \
+-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
+-clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
+-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
+-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+-install-exec install-data-am install-data install-am install \
+-uninstall-am uninstall all-redirect all-am all installdirs \
+-mostlyclean-generic distclean-generic clean-generic \
+-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++ps: ps-am
+ 
++ps-am:
++
++uninstall-am: uninstall-info-am
++
++.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
++	clean-libtool clean-noinstLIBRARIES ctags distclean \
++	distclean-compile distclean-generic distclean-libtool \
++	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 installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++	pdf pdf-am ps ps-am tags uninstall uninstall-am \
++	uninstall-info-am
+ 
+ # 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 -uNr a52dec-0.7.4-orig/src/Makefile.am a52dec-0.7.4/src/Makefile.am
+--- a52dec-0.7.4-orig/src/Makefile.am	2002-06-23 11:51:57.000000000 +1000
++++ a52dec-0.7.4/src/Makefile.am	2005-02-06 16:24:25.336138248 +1100
+@@ -1,4 +1,4 @@
+-CFLAGS = @A52DEC_CFLAGS@
++AM_CFLAGS = @A52DEC_CFLAGS@
+ 
+ bin_PROGRAMS = a52dec extract_a52
+ a52dec_SOURCES = a52dec.c getopt.c gettimeofday.c
+diff -uNr a52dec-0.7.4-orig/src/Makefile.in a52dec-0.7.4/src/Makefile.in
+--- a52dec-0.7.4-orig/src/Makefile.in	2002-07-28 13:50:56.000000000 +1000
++++ a52dec-0.7.4/src/Makefile.in	2005-02-06 16:25:43.119313408 +1100
+@@ -1,6 +1,8 @@
+-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
++# Makefile.in generated by automake 1.9.4 from Makefile.am.
++# @configure_input@
+ 
+-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004  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.
+@@ -10,190 +12,290 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+ 
++@SET_MAKE@
+ 
+-SHELL = @SHELL@
++SOURCES = $(a52dec_SOURCES) $(extract_a52_SOURCES)
+ 
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+-prefix = @prefix@
+-exec_prefix = @exec_prefix@
+-
+-bindir = @bindir@
+-sbindir = @sbindir@
+-libexecdir = @libexecdir@
+-datadir = @datadir@
+-sysconfdir = @sysconfdir@
+-sharedstatedir = @sharedstatedir@
+-localstatedir = @localstatedir@
+-libdir = @libdir@
+-infodir = @infodir@
+-mandir = @mandir@
+-includedir = @includedir@
+-oldincludedir = /usr/include
+-
+-DESTDIR =
+-
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-
+ top_builddir = ..
+-
+-ACLOCAL = @ACLOCAL@
+-AUTOCONF = @AUTOCONF@
+-AUTOMAKE = @AUTOMAKE@
+-AUTOHEADER = @AUTOHEADER@
+-
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+-transform = @program_transform_name@
+-
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-host_alias = @host_alias@
++build_triplet = @build@
+ host_triplet = @host@
++bin_PROGRAMS = a52dec$(EXEEXT) extract_a52$(EXEEXT)
++subdir = src
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
++binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
++PROGRAMS = $(bin_PROGRAMS)
++am_a52dec_OBJECTS = a52dec.$(OBJEXT) getopt.$(OBJEXT) \
++	gettimeofday.$(OBJEXT)
++a52dec_OBJECTS = $(am_a52dec_OBJECTS)
++a52dec_DEPENDENCIES = $(top_builddir)/liba52/liba52.la \
++	$(top_builddir)/libao/libao.a
++am_extract_a52_OBJECTS = extract_a52.$(OBJEXT) getopt.$(OBJEXT)
++extract_a52_OBJECTS = $(am_extract_a52_OBJECTS)
++extract_a52_LDADD = $(LDADD)
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp = $(SHELL) $(top_srcdir)/autotools/depcomp
++am__depfiles_maybe = depfiles
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(a52dec_SOURCES) $(extract_a52_SOURCES)
++DIST_SOURCES = $(a52dec_SOURCES) $(extract_a52_SOURCES)
++man1dir = $(mandir)/man1
++NROFF = nroff
++MANS = $(man_MANS)
++ETAGS = etags
++CTAGS = ctags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++A52DEC_CFLAGS = @A52DEC_CFLAGS@
++ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
++AMTAR = @AMTAR@
++AR = @AR@
+ AS = @AS@
++AUTOCONF = @AUTOCONF@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
+ CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CXX = @CXX@
++CXXCPP = @CXXCPP@
++CXXDEPMODE = @CXXDEPMODE@
++CXXFLAGS = @CXXFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
+ ECHO = @ECHO@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
++F77 = @F77@
++FFLAGS = @FFLAGS@
+ INCLUDES = @INCLUDES@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++LDFLAGS = @LDFLAGS@
++LIBA52_CFLAGS = @LIBA52_CFLAGS@
++LIBA52_LIBS = @LIBA52_LIBS@
++LIBAO_LIBS = @LIBAO_LIBS@
++LIBOBJS = @LIBOBJS@
++LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
++LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ RANLIB = @RANLIB@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+-
+-CFLAGS = @A52DEC_CFLAGS@
+-
+-bin_PROGRAMS = a52dec extract_a52
++ac_ct_AR = @ac_ct_AR@
++ac_ct_AS = @ac_ct_AS@
++ac_ct_CC = @ac_ct_CC@
++ac_ct_CXX = @ac_ct_CXX@
++ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
++ac_ct_F77 = @ac_ct_F77@
++ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
++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@
++am__tar = @am__tar@
++am__untar = @am__untar@
++bindir = @bindir@
++build = @build@
++build_alias = @build_alias@
++build_cpu = @build_cpu@
++build_os = @build_os@
++build_vendor = @build_vendor@
++datadir = @datadir@
++exec_prefix = @exec_prefix@
++host = @host@
++host_alias = @host_alias@
++host_cpu = @host_cpu@
++host_os = @host_os@
++host_vendor = @host_vendor@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localstatedir = @localstatedir@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++sysconfdir = @sysconfdir@
++target_alias = @target_alias@
++AM_CFLAGS = @A52DEC_CFLAGS@
+ a52dec_SOURCES = a52dec.c getopt.c gettimeofday.c
+-a52dec_LDADD = $(top_builddir)/liba52/liba52.la 	       $(top_builddir)/libao/libao.a @LIBAO_LIBS@
++a52dec_LDADD = $(top_builddir)/liba52/liba52.la \
++	       $(top_builddir)/libao/libao.a @LIBAO_LIBS@
+ 
+ extract_a52_SOURCES = extract_a52.c getopt.c
+-
+ man_MANS = a52dec.1 extract_a52.1
+-
+ EXTRA_DIST = configure.incl getopt.h gettimeofday.h $(man_MANS)
+-mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs
+-CONFIG_HEADER = ../include/config.h
+-CONFIG_CLEAN_FILES = 
+-bin_PROGRAMS =  a52dec$(EXEEXT) extract_a52$(EXEEXT)
+-PROGRAMS =  $(bin_PROGRAMS)
++all: all-am
+ 
+-
+-DEFS = @DEFS@ -I. -I$(srcdir) -I../include
+-CPPFLAGS = @CPPFLAGS@
+-LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@
+-a52dec_OBJECTS =  a52dec.$(OBJEXT) getopt.$(OBJEXT) \
+-gettimeofday.$(OBJEXT)
+-a52dec_DEPENDENCIES =  $(top_builddir)/liba52/liba52.la \
+-$(top_builddir)/libao/libao.a
+-a52dec_LDFLAGS = 
+-extract_a52_OBJECTS =  extract_a52.$(OBJEXT) getopt.$(OBJEXT)
+-extract_a52_LDADD = $(LDADD)
+-extract_a52_DEPENDENCIES = 
+-extract_a52_LDFLAGS = 
+-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+-man1dir = $(mandir)/man1
+-MANS = $(man_MANS)
+-
+-NROFF = nroff
+-DIST_COMMON =  Makefile.am Makefile.in
+-
+-
+-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+-
+-TAR = tar
+-GZIP_ENV = --best
+-SOURCES = $(a52dec_SOURCES) $(extract_a52_SOURCES)
+-OBJECTS = $(a52dec_OBJECTS) $(extract_a52_OBJECTS)
+-
+-all: all-redirect
+ .SUFFIXES:
+-.SUFFIXES: .S .c .lo .o .obj .s
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile
+-
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) \
+-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+-
+-
+-mostlyclean-binPROGRAMS:
+-
+-clean-binPROGRAMS:
+-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+-
+-distclean-binPROGRAMS:
+-
+-maintainer-clean-binPROGRAMS:
+-
++.SUFFIXES: .c .lo .o .obj
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --gnu  src/Makefile
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-binPROGRAMS: $(bin_PROGRAMS)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(bindir)
++	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+-	  if test -f $$p; then \
+-	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+-	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
++	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
++	  if test -f $$p \
++	     || test -f $$p1 \
++	  ; then \
++	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
++	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
++	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
+ 	  else :; fi; \
+ 	done
+ 
+ uninstall-binPROGRAMS:
+ 	@$(NORMAL_UNINSTALL)
+-	list='$(bin_PROGRAMS)'; for p in $$list; do \
+-	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
++	@list='$(bin_PROGRAMS)'; for p in $$list; do \
++	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
++	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+ 	done
+ 
+-.c.o:
+-	$(COMPILE) -c $<
+-
+-# FIXME: We should only use cygpath when building on Windows,
+-# and only if it is available.
+-.c.obj:
+-	$(COMPILE) -c `cygpath -w $<`
+-
+-.s.o:
+-	$(COMPILE) -c $<
+-
+-.S.o:
+-	$(COMPILE) -c $<
++clean-binPROGRAMS:
++	@list='$(bin_PROGRAMS)'; for p in $$list; do \
++	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
++	  echo " rm -f $$p $$f"; \
++	  rm -f $$p $$f ; \
++	done
++a52dec$(EXEEXT): $(a52dec_OBJECTS) $(a52dec_DEPENDENCIES) 
++	@rm -f a52dec$(EXEEXT)
++	$(LINK) $(a52dec_LDFLAGS) $(a52dec_OBJECTS) $(a52dec_LDADD) $(LIBS)
++extract_a52$(EXEEXT): $(extract_a52_OBJECTS) $(extract_a52_DEPENDENCIES) 
++	@rm -f extract_a52$(EXEEXT)
++	$(LINK) $(extract_a52_LDFLAGS) $(extract_a52_OBJECTS) $(extract_a52_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.o core *.core
+ 	-rm -f *.$(OBJEXT)
+ 
+-clean-compile:
+-
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+-maintainer-clean-compile:
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/a52dec.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/extract_a52.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/getopt.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gettimeofday.Po@am__quote@
+ 
+-.c.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++.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
++@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 $<
+ 
+-.s.lo:
+-	$(LIBTOOL) --mode=compile $(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
++@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) '$<'`
+ 
+-.S.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++.c.lo:
++@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -202,21 +304,14 @@
+ 	-rm -rf .libs _libs
+ 
+ distclean-libtool:
+-
+-maintainer-clean-libtool:
+-
+-a52dec$(EXEEXT): $(a52dec_OBJECTS) $(a52dec_DEPENDENCIES)
+-	@rm -f a52dec$(EXEEXT)
+-	$(LINK) $(a52dec_LDFLAGS) $(a52dec_OBJECTS) $(a52dec_LDADD) $(LIBS)
+-
+-extract_a52$(EXEEXT): $(extract_a52_OBJECTS) $(extract_a52_DEPENDENCIES)
+-	@rm -f extract_a52$(EXEEXT)
+-	$(LINK) $(extract_a52_LDFLAGS) $(extract_a52_OBJECTS) $(extract_a52_LDADD) $(LIBS)
+-
+-install-man1:
+-	$(mkinstalldirs) $(DESTDIR)$(man1dir)
+-	@list='$(man1_MANS)'; \
+-	l2='$(man_MANS)'; for i in $$l2; do \
++	-rm -f libtool
++uninstall-info-am:
++install-man1: $(man1_MANS) $(man_MANS)
++	@$(NORMAL_INSTALL)
++	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 \
+ 	  case "$$i" in \
+ 	    *.1*) list="$$list $$i" ;; \
+ 	  esac; \
+@@ -225,158 +320,208 @@
+ 	  if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+ 	  else file=$$i; fi; \
+ 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
++	  case "$$ext" in \
++	    1*) ;; \
++	    *) ext='1' ;; \
++	  esac; \
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
++	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
+-	  $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
++	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
++	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
+ 	done
+-
+ uninstall-man1:
+-	@list='$(man1_MANS)'; \
+-	l2='$(man_MANS)'; for i in $$l2; do \
++	@$(NORMAL_UNINSTALL)
++	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
++	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
++	for i in $$l2; do \
+ 	  case "$$i" in \
+ 	    *.1*) list="$$list $$i" ;; \
+ 	  esac; \
+ 	done; \
+ 	for i in $$list; do \
+ 	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
++	  case "$$ext" in \
++	    1*) ;; \
++	    *) ext='1' ;; \
++	  esac; \
+ 	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
++	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+-	  echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
+-	  rm -f $(DESTDIR)$(man1dir)/$$inst; \
++	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
++	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
+ 	done
+-install-man: $(MANS)
+-	@$(NORMAL_INSTALL)
+-	$(MAKE) $(AM_MAKEFLAGS) install-man1
+-uninstall-man:
+-	@$(NORMAL_UNINSTALL)
+-	$(MAKE) $(AM_MAKEFLAGS) uninstall-man1
+ 
++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
++	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++	unique=`for i in $$list; do \
++	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++	  done | \
++	  $(AWK) '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	mkid -fID $$unique
+ tags: TAGS
+ 
+-ID: $(HEADERS) $(SOURCES) $(LISP)
+-	list='$(SOURCES) $(HEADERS)'; \
+-	unique=`for i in $$list; do echo $$i; done | \
+-	  awk '    { files[$$0] = 1; } \
++TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
++		$(TAGS_FILES) $(LISP)
++	tags=; \
++	here=`pwd`; \
++	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
++	unique=`for i in $$list; do \
++	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++	  done | \
++	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	here=`pwd` && cd $(srcdir) \
+-	  && mkid -f$$here/ID $$unique $(LISP)
+-
+-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
++ctags: CTAGS
++CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
++		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	list='$(SOURCES) $(HEADERS)'; \
+-	unique=`for i in $$list; do echo $$i; done | \
+-	  awk '    { files[$$0] = 1; } \
++	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
++	unique=`for i in $$list; do \
++	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++	  done | \
++	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+-	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
+-
+-mostlyclean-tags:
+-
+-clean-tags:
++	test -z "$(CTAGS_ARGS)$$tags$$unique" \
++	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++	     $$tags $$unique
++
++GTAGS:
++	here=`$(am__cd) $(top_builddir) && pwd` \
++	  && cd $(top_srcdir) \
++	  && gtags -i $(GTAGS_ARGS) $$here
+ 
+ distclean-tags:
+-	-rm -f TAGS ID
+-
+-maintainer-clean-tags:
+-
+-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+-
+-subdir = src
++	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+ distdir: $(DISTFILES)
+-	@for file in $(DISTFILES); do \
+-	  d=$(srcdir); \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++	list='$(DISTFILES)'; for file in $$list; do \
++	  case $$file in \
++	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++	  esac; \
++	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++	    dir="/$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
++	  else \
++	    dir=''; \
++	  fi; \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++	    fi; \
++	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	    || cp -p $$d/$$file $(distdir)/$$file \
++	    || exit 1; \
+ 	  fi; \
+ 	done
+-a52dec.o: a52dec.c ../include/config.h getopt.h ../include/a52.h \
+-	../include/audio_out.h ../include/mm_accel.h gettimeofday.h
+-extract_a52.o: extract_a52.c ../include/config.h getopt.h
+-getopt.o: getopt.c ../include/config.h
+-gettimeofday.o: gettimeofday.c ../include/config.h gettimeofday.h
+-
+-info-am:
+-info: info-am
+-dvi-am:
+-dvi: dvi-am
+ check-am: all-am
+ check: check-am
+-installcheck-am:
+-installcheck: installcheck-am
+-install-exec-am: install-binPROGRAMS
++all-am: Makefile $(PROGRAMS) $(MANS)
++installdirs:
++	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
++install: install-am
+ install-exec: install-exec-am
+-
+-install-data-am: install-man
+ install-data: install-data-am
++uninstall: uninstall-am
+ 
+ install-am: all-am
+ 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+-install: install-am
+-uninstall-am: uninstall-binPROGRAMS uninstall-man
+-uninstall: uninstall-am
+-all-am: Makefile $(PROGRAMS) $(MANS)
+-all-redirect: all-am
+-install-strip:
+-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+-installdirs:
+-	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1
+-
+ 
++installcheck: installcheck-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++	  `test -z '$(STRIP)' || \
++	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ mostlyclean-generic:
+ 
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+-mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
+-		mostlyclean-libtool mostlyclean-tags \
+-		mostlyclean-generic
++	@echo "This command is intended for maintainers to use"
++	@echo "it deletes files that may require special tools to rebuild."
++clean: clean-am
+ 
+-mostlyclean: mostlyclean-am
++clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+ 
+-clean-am:  clean-binPROGRAMS clean-compile clean-libtool clean-tags \
+-		clean-generic mostlyclean-am
++distclean: distclean-am
++	-rm -rf ./$(DEPDIR)
++	-rm -f Makefile
++distclean-am: clean-am distclean-compile distclean-generic \
++	distclean-libtool distclean-tags
+ 
+-clean: clean-am
++dvi: dvi-am
+ 
+-distclean-am:  distclean-binPROGRAMS distclean-compile distclean-libtool \
+-		distclean-tags distclean-generic clean-am
+-	-rm -f libtool
++dvi-am:
+ 
+-distclean: distclean-am
++html: html-am
+ 
+-maintainer-clean-am:  maintainer-clean-binPROGRAMS \
+-		maintainer-clean-compile maintainer-clean-libtool \
+-		maintainer-clean-tags maintainer-clean-generic \
+-		distclean-am
+-	@echo "This command is intended for maintainers to use;"
+-	@echo "it deletes files that may require special tools to rebuild."
++info: info-am
++
++info-am:
++
++install-data-am: install-man
++
++install-exec-am: install-binPROGRAMS
++
++install-info: install-info-am
++
++install-man: install-man1
++
++installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
++	-rm -rf ./$(DEPDIR)
++	-rm -f Makefile
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool
++
++pdf: pdf-am
++
++pdf-am:
++
++ps: ps-am
++
++ps-am:
++
++uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man
+ 
+-.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
+-maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
+-mostlyclean-compile distclean-compile clean-compile \
+-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
+-clean-libtool maintainer-clean-libtool install-man1 uninstall-man1 \
+-install-man uninstall-man tags mostlyclean-tags distclean-tags \
+-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
+-check-am installcheck-am installcheck install-exec-am install-exec \
+-install-data-am install-data install-am install uninstall-am uninstall \
+-all-redirect all-am all installdirs mostlyclean-generic \
+-distclean-generic clean-generic maintainer-clean-generic clean \
+-mostlyclean distclean maintainer-clean
++uninstall-man: uninstall-man1
+ 
++.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
++	clean-generic clean-libtool ctags distclean distclean-compile \
++	distclean-generic distclean-libtool 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-info install-info-am install-man \
++	install-man1 install-strip installcheck installcheck-am \
++	installdirs maintainer-clean maintainer-clean-generic \
++	mostlyclean mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
++	uninstall-am uninstall-binPROGRAMS uninstall-info-am \
++	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 -uNr a52dec-0.7.4-orig/test/Makefile.in a52dec-0.7.4/test/Makefile.in
+--- a52dec-0.7.4-orig/test/Makefile.in	2002-07-28 13:50:57.000000000 +1000
++++ a52dec-0.7.4/test/Makefile.in	2005-02-06 16:25:43.231296384 +1100
+@@ -1,6 +1,8 @@
+-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
++# Makefile.in generated by automake 1.9.4 from Makefile.am.
++# @configure_input@
+ 
+-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004  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.
+@@ -10,160 +12,249 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+ 
++@SET_MAKE@
+ 
+-SHELL = @SHELL@
++SOURCES = $(compare_SOURCES)
+ 
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+-prefix = @prefix@
+-exec_prefix = @exec_prefix@
+-
+-bindir = @bindir@
+-sbindir = @sbindir@
+-libexecdir = @libexecdir@
+-datadir = @datadir@
+-sysconfdir = @sysconfdir@
+-sharedstatedir = @sharedstatedir@
+-localstatedir = @localstatedir@
+-libdir = @libdir@
+-infodir = @infodir@
+-mandir = @mandir@
+-includedir = @includedir@
+-oldincludedir = /usr/include
+-
+-DESTDIR =
+-
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-
+ top_builddir = ..
+-
+-ACLOCAL = @ACLOCAL@
+-AUTOCONF = @AUTOCONF@
+-AUTOMAKE = @AUTOMAKE@
+-AUTOHEADER = @AUTOHEADER@
+-
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+-transform = @program_transform_name@
+-
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-host_alias = @host_alias@
++build_triplet = @build@
+ host_triplet = @host@
++noinst_PROGRAMS = compare$(EXEEXT)
++subdir = test
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in compile
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++PROGRAMS = $(noinst_PROGRAMS)
++am_compare_OBJECTS = compare.$(OBJEXT)
++compare_OBJECTS = $(am_compare_OBJECTS)
++compare_DEPENDENCIES =
++DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
++depcomp = $(SHELL) $(top_srcdir)/autotools/depcomp
++am__depfiles_maybe = depfiles
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
++	$(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(compare_SOURCES)
++DIST_SOURCES = $(compare_SOURCES)
++ETAGS = etags
++CTAGS = ctags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++A52DEC_CFLAGS = @A52DEC_CFLAGS@
++ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
++AMTAR = @AMTAR@
++AR = @AR@
+ AS = @AS@
++AUTOCONF = @AUTOCONF@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
+ CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CXX = @CXX@
++CXXCPP = @CXXCPP@
++CXXDEPMODE = @CXXDEPMODE@
++CXXFLAGS = @CXXFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
+ ECHO = @ECHO@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
++F77 = @F77@
++FFLAGS = @FFLAGS@
+ INCLUDES = @INCLUDES@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++LDFLAGS = @LDFLAGS@
++LIBA52_CFLAGS = @LIBA52_CFLAGS@
++LIBA52_LIBS = @LIBA52_LIBS@
++LIBAO_LIBS = @LIBAO_LIBS@
++LIBOBJS = @LIBOBJS@
++LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
++LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ RANLIB = @RANLIB@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+-
+-noinst_PROGRAMS = compare
++ac_ct_AR = @ac_ct_AR@
++ac_ct_AS = @ac_ct_AS@
++ac_ct_CC = @ac_ct_CC@
++ac_ct_CXX = @ac_ct_CXX@
++ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
++ac_ct_F77 = @ac_ct_F77@
++ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
++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@
++am__tar = @am__tar@
++am__untar = @am__untar@
++bindir = @bindir@
++build = @build@
++build_alias = @build_alias@
++build_cpu = @build_cpu@
++build_os = @build_os@
++build_vendor = @build_vendor@
++datadir = @datadir@
++exec_prefix = @exec_prefix@
++host = @host@
++host_alias = @host_alias@
++host_cpu = @host_cpu@
++host_os = @host_os@
++host_vendor = @host_vendor@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localstatedir = @localstatedir@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++sysconfdir = @sysconfdir@
++target_alias = @target_alias@
+ compare_SOURCES = compare.c
+ compare_LDADD = -lm
+-
+ EXTRA_DIST = regression tests compile globals
+ TESTS = regression compile globals
+-mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs
+-CONFIG_HEADER = ../include/config.h
+-CONFIG_CLEAN_FILES = 
+-noinst_PROGRAMS =  compare$(EXEEXT)
+-PROGRAMS =  $(noinst_PROGRAMS)
++all: all-am
+ 
+-
+-DEFS = @DEFS@ -I. -I$(srcdir) -I../include
+-CPPFLAGS = @CPPFLAGS@
+-LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@
+-compare_OBJECTS =  compare.$(OBJEXT)
+-compare_DEPENDENCIES = 
+-compare_LDFLAGS = 
+-CFLAGS = @CFLAGS@
+-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+-DIST_COMMON =  Makefile.am Makefile.in
+-
+-
+-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+-
+-TAR = tar
+-GZIP_ENV = --best
+-SOURCES = $(compare_SOURCES)
+-OBJECTS = $(compare_OBJECTS)
+-
+-all: all-redirect
+ .SUFFIXES:
+-.SUFFIXES: .S .c .lo .o .obj .s
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps test/Makefile
+-
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) \
+-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+-
+-
+-mostlyclean-noinstPROGRAMS:
++.SUFFIXES: .c .lo .o .obj
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  test/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --gnu  test/Makefile
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ 
+ clean-noinstPROGRAMS:
+-	-test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS)
+-
+-distclean-noinstPROGRAMS:
+-
+-maintainer-clean-noinstPROGRAMS:
+-
+-.c.o:
+-	$(COMPILE) -c $<
+-
+-# FIXME: We should only use cygpath when building on Windows,
+-# and only if it is available.
+-.c.obj:
+-	$(COMPILE) -c `cygpath -w $<`
+-
+-.s.o:
+-	$(COMPILE) -c $<
+-
+-.S.o:
+-	$(COMPILE) -c $<
++	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
++	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
++	  echo " rm -f $$p $$f"; \
++	  rm -f $$p $$f ; \
++	done
++compare$(EXEEXT): $(compare_OBJECTS) $(compare_DEPENDENCIES) 
++	@rm -f compare$(EXEEXT)
++	$(LINK) $(compare_LDFLAGS) $(compare_OBJECTS) $(compare_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+-	-rm -f *.o core *.core
+ 	-rm -f *.$(OBJEXT)
+ 
+-clean-compile:
+-
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
+-maintainer-clean-compile:
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compare.Po@am__quote@
+ 
+-.c.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++.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
++@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 $<
+ 
+-.s.lo:
+-	$(LIBTOOL) --mode=compile $(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
++@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) '$<'`
+ 
+-.S.lo:
+-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
++.c.lo:
++@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
+ 
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+@@ -172,159 +263,248 @@
+ 	-rm -rf .libs _libs
+ 
+ distclean-libtool:
++	-rm -f libtool
++uninstall-info-am:
+ 
+-maintainer-clean-libtool:
+-
+-compare$(EXEEXT): $(compare_OBJECTS) $(compare_DEPENDENCIES)
+-	@rm -f compare$(EXEEXT)
+-	$(LINK) $(compare_LDFLAGS) $(compare_OBJECTS) $(compare_LDADD) $(LIBS)
+-
++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
++	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++	unique=`for i in $$list; do \
++	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++	  done | \
++	  $(AWK) '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	mkid -fID $$unique
+ tags: TAGS
+ 
+-ID: $(HEADERS) $(SOURCES) $(LISP)
+-	list='$(SOURCES) $(HEADERS)'; \
+-	unique=`for i in $$list; do echo $$i; done | \
+-	  awk '    { files[$$0] = 1; } \
++TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
++		$(TAGS_FILES) $(LISP)
++	tags=; \
++	here=`pwd`; \
++	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
++	unique=`for i in $$list; do \
++	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++	  done | \
++	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	here=`pwd` && cd $(srcdir) \
+-	  && mkid -f$$here/ID $$unique $(LISP)
+-
+-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
++ctags: CTAGS
++CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
++		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
+-	list='$(SOURCES) $(HEADERS)'; \
+-	unique=`for i in $$list; do echo $$i; done | \
+-	  awk '    { files[$$0] = 1; } \
++	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
++	unique=`for i in $$list; do \
++	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++	  done | \
++	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+-	  || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags  $$unique $(LISP))
+-
+-mostlyclean-tags:
+-
+-clean-tags:
++	test -z "$(CTAGS_ARGS)$$tags$$unique" \
++	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++	     $$tags $$unique
++
++GTAGS:
++	here=`$(am__cd) $(top_builddir) && pwd` \
++	  && cd $(top_srcdir) \
++	  && gtags -i $(GTAGS_ARGS) $$here
+ 
+ distclean-tags:
+-	-rm -f TAGS ID
+-
+-maintainer-clean-tags:
++	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+-
+-subdir = test
++check-TESTS: $(TESTS)
++	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
++	srcdir=$(srcdir); export srcdir; \
++	list='$(TESTS)'; \
++	if test -n "$$list"; then \
++	  for tst in $$list; do \
++	    if test -f ./$$tst; then dir=./; \
++	    elif test -f $$tst; then dir=; \
++	    else dir="$(srcdir)/"; fi; \
++	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
++	      all=`expr $$all + 1`; \
++	      case " $(XFAIL_TESTS) " in \
++	      *" $$tst "*) \
++		xpass=`expr $$xpass + 1`; \
++		failed=`expr $$failed + 1`; \
++		echo "XPASS: $$tst"; \
++	      ;; \
++	      *) \
++		echo "PASS: $$tst"; \
++	      ;; \
++	      esac; \
++	    elif test $$? -ne 77; then \
++	      all=`expr $$all + 1`; \
++	      case " $(XFAIL_TESTS) " in \
++	      *" $$tst "*) \
++		xfail=`expr $$xfail + 1`; \
++		echo "XFAIL: $$tst"; \
++	      ;; \
++	      *) \
++		failed=`expr $$failed + 1`; \
++		echo "FAIL: $$tst"; \
++	      ;; \
++	      esac; \
++	    else \
++	      skip=`expr $$skip + 1`; \
++	      echo "SKIP: $$tst"; \
++	    fi; \
++	  done; \
++	  if test "$$failed" -eq 0; then \
++	    if test "$$xfail" -eq 0; then \
++	      banner="All $$all tests passed"; \
++	    else \
++	      banner="All $$all tests behaved as expected ($$xfail expected failures)"; \
++	    fi; \
++	  else \
++	    if test "$$xpass" -eq 0; then \
++	      banner="$$failed of $$all tests failed"; \
++	    else \
++	      banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \
++	    fi; \
++	  fi; \
++	  dashes="$$banner"; \
++	  skipped=""; \
++	  if test "$$skip" -ne 0; then \
++	    skipped="($$skip tests were not run)"; \
++	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
++	      dashes="$$skipped"; \
++	  fi; \
++	  report=""; \
++	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
++	    report="Please report to $(PACKAGE_BUGREPORT)"; \
++	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
++	      dashes="$$report"; \
++	  fi; \
++	  dashes=`echo "$$dashes" | sed s/./=/g`; \
++	  echo "$$dashes"; \
++	  echo "$$banner"; \
++	  test -z "$$skipped" || echo "$$skipped"; \
++	  test -z "$$report" || echo "$$report"; \
++	  echo "$$dashes"; \
++	  test "$$failed" -eq 0; \
++	else :; fi
+ 
+ distdir: $(DISTFILES)
+-	@for file in $(DISTFILES); do \
+-	  d=$(srcdir); \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++	list='$(DISTFILES)'; for file in $$list; do \
++	  case $$file in \
++	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++	  esac; \
++	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++	    dir="/$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
++	  else \
++	    dir=''; \
++	  fi; \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++	    fi; \
++	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	    || cp -p $$d/$$file $(distdir)/$$file \
++	    || exit 1; \
+ 	  fi; \
+ 	done
+-compare.o: compare.c
+-
+-check-TESTS: $(TESTS)
+-	@failed=0; all=0; \
+-	srcdir=$(srcdir); export srcdir; \
+-	for tst in $(TESTS); do \
+-	  if test -f $$tst; then dir=.; \
+-	  else dir="$(srcdir)"; fi; \
+-	  if $(TESTS_ENVIRONMENT) $$dir/$$tst; then \
+-	    all=`expr $$all + 1`; \
+-	    echo "PASS: $$tst"; \
+-	  elif test $$? -ne 77; then \
+-	    all=`expr $$all + 1`; \
+-	    failed=`expr $$failed + 1`; \
+-	    echo "FAIL: $$tst"; \
+-	  fi; \
+-	done; \
+-	if test "$$failed" -eq 0; then \
+-	  banner="All $$all tests passed"; \
+-	else \
+-	  banner="$$failed of $$all tests failed"; \
+-	fi; \
+-	dashes=`echo "$$banner" | sed s/./=/g`; \
+-	echo "$$dashes"; \
+-	echo "$$banner"; \
+-	echo "$$dashes"; \
+-	test "$$failed" -eq 0
+-info-am:
+-info: info-am
+-dvi-am:
+-dvi: dvi-am
+ check-am: all-am
+ 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
+ check: check-am
+-installcheck-am:
+-installcheck: installcheck-am
+-install-exec-am:
++all-am: Makefile $(PROGRAMS)
++installdirs:
++install: install-am
+ install-exec: install-exec-am
+-
+-install-data-am:
+ install-data: install-data-am
++uninstall: uninstall-am
+ 
+ install-am: all-am
+ 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+-install: install-am
+-uninstall-am:
+-uninstall: uninstall-am
+-all-am: Makefile $(PROGRAMS)
+-all-redirect: all-am
+-install-strip:
+-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+-installdirs:
+-
+ 
++installcheck: installcheck-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++	  `test -z '$(STRIP)' || \
++	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ mostlyclean-generic:
+ 
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+-mostlyclean-am:  mostlyclean-noinstPROGRAMS mostlyclean-compile \
+-		mostlyclean-libtool mostlyclean-tags \
+-		mostlyclean-generic
++	@echo "This command is intended for maintainers to use"
++	@echo "it deletes files that may require special tools to rebuild."
++clean: clean-am
+ 
+-mostlyclean: mostlyclean-am
++clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
++	mostlyclean-am
+ 
+-clean-am:  clean-noinstPROGRAMS clean-compile clean-libtool clean-tags \
+-		clean-generic mostlyclean-am
++distclean: distclean-am
++	-rm -rf ./$(DEPDIR)
++	-rm -f Makefile
++distclean-am: clean-am distclean-compile distclean-generic \
++	distclean-libtool distclean-tags
+ 
+-clean: clean-am
++dvi: dvi-am
+ 
+-distclean-am:  distclean-noinstPROGRAMS distclean-compile \
+-		distclean-libtool distclean-tags distclean-generic \
+-		clean-am
+-	-rm -f libtool
++dvi-am:
+ 
+-distclean: distclean-am
++html: html-am
+ 
+-maintainer-clean-am:  maintainer-clean-noinstPROGRAMS \
+-		maintainer-clean-compile maintainer-clean-libtool \
+-		maintainer-clean-tags maintainer-clean-generic \
+-		distclean-am
+-	@echo "This command is intended for maintainers to use;"
+-	@echo "it deletes files that may require special tools to rebuild."
++info: info-am
++
++info-am:
++
++install-data-am:
++
++install-exec-am:
++
++install-info: install-info-am
++
++install-man:
++
++installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
++	-rm -rf ./$(DEPDIR)
++	-rm -f Makefile
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool
++
++pdf: pdf-am
++
++pdf-am:
+ 
+-.PHONY: mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \
+-clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \
+-mostlyclean-compile distclean-compile clean-compile \
+-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
+-clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
+-distclean-tags clean-tags maintainer-clean-tags distdir check-TESTS \
+-info-am info dvi-am dvi check check-am installcheck-am installcheck \
+-install-exec-am install-exec install-data-am install-data install-am \
+-install uninstall-am uninstall all-redirect all-am all installdirs \
+-mostlyclean-generic distclean-generic clean-generic \
+-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++ps: ps-am
+ 
++ps-am:
++
++uninstall-am: uninstall-info-am
++
++.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
++	clean-generic clean-libtool clean-noinstPROGRAMS ctags \
++	distclean distclean-compile distclean-generic \
++	distclean-libtool 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 \
++	installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
++	tags uninstall uninstall-am uninstall-info-am
+ 
+ # 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 -uNr a52dec-0.7.4-orig/vc++/Makefile.in a52dec-0.7.4/vc++/Makefile.in
+--- a52dec-0.7.4-orig/vc++/Makefile.in	2002-07-28 13:50:56.000000000 +1000
++++ a52dec-0.7.4/vc++/Makefile.in	2005-02-06 16:25:43.308284680 +1100
+@@ -1,6 +1,8 @@
+-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
++# Makefile.in generated by automake 1.9.4 from Makefile.am.
++# @configure_input@
+ 
+-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004  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.
+@@ -10,172 +12,312 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+ 
+-
+-SHELL = @SHELL@
+-
++@SET_MAKE@
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+-prefix = @prefix@
+-exec_prefix = @exec_prefix@
+-
+-bindir = @bindir@
+-sbindir = @sbindir@
+-libexecdir = @libexecdir@
+-datadir = @datadir@
+-sysconfdir = @sysconfdir@
+-sharedstatedir = @sharedstatedir@
+-localstatedir = @localstatedir@
+-libdir = @libdir@
+-infodir = @infodir@
+-mandir = @mandir@
+-includedir = @includedir@
+-oldincludedir = /usr/include
+-
+-DESTDIR =
+-
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-
+ top_builddir = ..
+-
+-ACLOCAL = @ACLOCAL@
+-AUTOCONF = @AUTOCONF@
+-AUTOMAKE = @AUTOMAKE@
+-AUTOHEADER = @AUTOHEADER@
+-
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+-transform = @program_transform_name@
+-
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-host_alias = @host_alias@
++build_triplet = @build@
+ host_triplet = @host@
++subdir = vc++
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
++	$(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs
++CONFIG_HEADER = $(top_builddir)/include/config.h
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++A52DEC_CFLAGS = @A52DEC_CFLAGS@
++ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
++AMTAR = @AMTAR@
++AR = @AR@
+ AS = @AS@
++AUTOCONF = @AUTOCONF@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
+ CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
++CXX = @CXX@
++CXXCPP = @CXXCPP@
++CXXDEPMODE = @CXXDEPMODE@
++CXXFLAGS = @CXXFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
+ ECHO = @ECHO@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
++F77 = @F77@
++FFLAGS = @FFLAGS@
+ INCLUDES = @INCLUDES@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++LDFLAGS = @LDFLAGS@
++LIBA52_CFLAGS = @LIBA52_CFLAGS@
++LIBA52_LIBS = @LIBA52_LIBS@
++LIBAO_LIBS = @LIBAO_LIBS@
++LIBOBJS = @LIBOBJS@
++LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
++LTLIBOBJS = @LTLIBOBJS@
+ MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ RANLIB = @RANLIB@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
+ STRIP = @STRIP@
+ VERSION = @VERSION@
+-
++ac_ct_AR = @ac_ct_AR@
++ac_ct_AS = @ac_ct_AS@
++ac_ct_CC = @ac_ct_CC@
++ac_ct_CXX = @ac_ct_CXX@
++ac_ct_DLLTOOL = @ac_ct_DLLTOOL@
++ac_ct_F77 = @ac_ct_F77@
++ac_ct_OBJDUMP = @ac_ct_OBJDUMP@
++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@
++am__tar = @am__tar@
++am__untar = @am__untar@
++bindir = @bindir@
++build = @build@
++build_alias = @build_alias@
++build_cpu = @build_cpu@
++build_os = @build_os@
++build_vendor = @build_vendor@
++datadir = @datadir@
++exec_prefix = @exec_prefix@
++host = @host@
++host_alias = @host_alias@
++host_cpu = @host_cpu@
++host_os = @host_os@
++host_vendor = @host_vendor@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localstatedir = @localstatedir@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++sysconfdir = @sysconfdir@
++target_alias = @target_alias@
+ EXTRA_DIST = config.h inttypes.h liba52.dsp libao.dsp a52dec.dsp a52dec.dsw
+-mkinstalldirs = $(SHELL) $(top_srcdir)/autotools/mkinstalldirs
+-CONFIG_HEADER = ../include/config.h
+-CONFIG_CLEAN_FILES = 
+-DIST_COMMON =  Makefile.am Makefile.in
+-
++all: all-am
+ 
+-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+-
+-TAR = tar
+-GZIP_ENV = --best
+-all: all-redirect
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps vc++/Makefile
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  vc++/Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --gnu  vc++/Makefile
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++	esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++mostlyclean-libtool:
++	-rm -f *.lo
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) \
+-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
++clean-libtool:
++	-rm -rf .libs _libs
+ 
++distclean-libtool:
++	-rm -f libtool
++uninstall-info-am:
+ tags: TAGS
+ TAGS:
+ 
++ctags: CTAGS
++CTAGS:
+ 
+-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+-
+-subdir = vc++
+ 
+ distdir: $(DISTFILES)
+-	@for file in $(DISTFILES); do \
+-	  d=$(srcdir); \
++	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++	list='$(DISTFILES)'; for file in $$list; do \
++	  case $$file in \
++	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++	  esac; \
++	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++	    dir="/$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
++	  else \
++	    dir=''; \
++	  fi; \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++	    fi; \
++	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	    || cp -p $$d/$$file $(distdir)/$$file \
++	    || exit 1; \
+ 	  fi; \
+ 	done
+-info-am:
+-info: info-am
+-dvi-am:
+-dvi: dvi-am
+ check-am: all-am
+ check: check-am
+-installcheck-am:
+-installcheck: installcheck-am
+-install-exec-am:
++all-am: Makefile
++installdirs:
++install: install-am
+ install-exec: install-exec-am
+-
+-install-data-am:
+ install-data: install-data-am
++uninstall: uninstall-am
+ 
+ install-am: all-am
+ 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+-install: install-am
+-uninstall-am:
+-uninstall: uninstall-am
+-all-am: Makefile
+-all-redirect: all-am
+-install-strip:
+-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+-installdirs:
+-
+ 
++installcheck: installcheck-am
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++	  `test -z '$(STRIP)' || \
++	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ mostlyclean-generic:
+ 
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+-mostlyclean-am:  mostlyclean-generic
++	@echo "This command is intended for maintainers to use"
++	@echo "it deletes files that may require special tools to rebuild."
++clean: clean-am
+ 
+-mostlyclean: mostlyclean-am
++clean-am: clean-generic clean-libtool mostlyclean-am
+ 
+-clean-am:  clean-generic mostlyclean-am
++distclean: distclean-am
++	-rm -f Makefile
++distclean-am: clean-am distclean-generic distclean-libtool
+ 
+-clean: clean-am
++dvi: dvi-am
+ 
+-distclean-am:  distclean-generic clean-am
+-	-rm -f libtool
++dvi-am:
+ 
+-distclean: distclean-am
++html: html-am
+ 
+-maintainer-clean-am:  maintainer-clean-generic distclean-am
+-	@echo "This command is intended for maintainers to use;"
+-	@echo "it deletes files that may require special tools to rebuild."
++info: info-am
++
++info-am:
++
++install-data-am:
++
++install-exec-am:
++
++install-info: install-info-am
++
++install-man:
++
++installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-am
++	-rm -f Makefile
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-generic mostlyclean-libtool
++
++pdf: pdf-am
++
++pdf-am:
++
++ps: ps-am
++
++ps-am:
+ 
+-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
+-installcheck-am installcheck install-exec-am install-exec \
+-install-data-am install-data install-am install uninstall-am uninstall \
+-all-redirect all-am all installdirs mostlyclean-generic \
+-distclean-generic clean-generic maintainer-clean-generic clean \
+-mostlyclean distclean maintainer-clean
++uninstall-am: uninstall-info-am
+ 
++.PHONY: all all-am check check-am clean clean-generic clean-libtool \
++	distclean distclean-generic distclean-libtool distdir dvi \
++	dvi-am html html-am info info-am install install-am \
++	install-data install-data-am install-exec install-exec-am \
++	install-info install-info-am install-man install-strip \
++	installcheck installcheck-am installdirs maintainer-clean \
++	maintainer-clean-generic mostlyclean mostlyclean-generic \
++	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
++	uninstall-info-am
+ 
+ # 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.
Index: scripts/untested/blfs-patches/alsa-tools-1.0.8-update_ac3dec_config_foo-1.patch
===================================================================
--- scripts/untested/blfs-patches/alsa-tools-1.0.8-update_ac3dec_config_foo-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/alsa-tools-1.0.8-update_ac3dec_config_foo-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1668 @@
+diff -uNr alsa-tools-1.0.8/ac3dec/config.guess alsa-tools-1.0.8-mod/ac3dec/config.guess
+--- alsa-tools-1.0.8/ac3dec/config.guess	2005-01-13 21:16:53.000000000 +1100
++++ alsa-tools-1.0.8-mod/ac3dec/config.guess	2005-01-27 17:31:54.523864381 +1100
+@@ -1,9 +1,9 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-#   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
++#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
++#   Free Software Foundation, Inc.
+ 
+-timestamp='2003-07-02'
++timestamp='2001-09-04'
+ 
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -24,9 +24,8 @@
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
+-# Originally written by Per Bothner <per@bothner.com>.
+-# Please send patches to <config-patches@gnu.org>.  Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# Written by Per Bothner <bothner@cygnus.com>.
++# Please send patches to <config-patches@gnu.org>.
+ #
+ # This script attempts to guess a canonical system name similar to
+ # config.sub.  If it succeeds, it prints the system name on stdout, and
+@@ -88,42 +87,30 @@
+   exit 1
+ fi
+ 
+-trap 'exit 1' 1 2 15
+ 
+-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+-# compiler to aid in system detection is discouraged as it requires
+-# temporary files to be created and, as you can see below, it is a
+-# headache to deal with in a portable fashion.
++dummy=dummy-$$
++trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
+ 
++# CC_FOR_BUILD -- compiler used by this script.
+ # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+ # use `HOST_CC' if defined, but it is deprecated.
+ 
+-# Portable tmp directory creation inspired by the Autoconf team.
+-
+-set_cc_for_build='
+-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+-: ${TMPDIR=/tmp} ;
+- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+-dummy=$tmp/dummy ;
+-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+-case $CC_FOR_BUILD,$HOST_CC,$CC in
+- ,,)    echo "int x;" > $dummy.c ;
+-	for c in cc gcc c89 c99 ; do
+-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
++set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
++ ,,)    echo "int dummy(){}" > $dummy.c ;
++	for c in cc gcc c89 ; do
++	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
++	  if test $? = 0 ; then
+ 	     CC_FOR_BUILD="$c"; break ;
+ 	  fi ;
+ 	done ;
++	rm -f $dummy.c $dummy.o $dummy.rel ;
+ 	if test x"$CC_FOR_BUILD" = x ; then
+ 	  CC_FOR_BUILD=no_compiler_found ;
+ 	fi
+ 	;;
+  ,,*)   CC_FOR_BUILD=$CC ;;
+  ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
+-esac ;'
++esac'
+ 
+ # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+ # (ghazi@noc.rutgers.edu 1994-08-24)
+@@ -136,44 +123,33 @@
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+ 
+-case "${UNAME_MACHINE}" in
+-    i?86)
+-	test -z "$VENDOR" && VENDOR=pc
+-	;;
+-    *)
+-	test -z "$VENDOR" && VENDOR=unknown
+-	;;
+-esac
+-test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
+-
+ # Note: order is significant - the case branches are not exclusive.
+ 
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+     *:NetBSD:*:*)
+-	# NetBSD (nbsd) targets should (where applicable) match one or
++	# Netbsd (nbsd) targets should (where applicable) match one or
+ 	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+ 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+ 	# switched to ELF, *-*-netbsd* would select the old
+ 	# object file format.  This provides both forward
+ 	# compatibility and a consistent mechanism for selecting the
+ 	# object file format.
+-	#
+-	# Note: NetBSD doesn't particularly care about the vendor
+-	# portion of the name.  We always set it to "unknown".
+-	sysctl="sysctl -n hw.machine_arch"
+-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+-	case "${UNAME_MACHINE_ARCH}" in
+-	    armeb) machine=armeb-unknown ;;
+-	    arm*) machine=arm-unknown ;;
+-	    sh3el) machine=shl-unknown ;;
+-	    sh3eb) machine=sh-unknown ;;
+-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
++	# Determine the machine/vendor (is the vendor relevant).
++	case "${UNAME_MACHINE}" in
++	    amiga) machine=m68k-unknown ;;
++	    arm32) machine=arm-unknown ;;
++	    atari*) machine=m68k-atari ;;
++	    sun3*) machine=m68k-sun ;;
++	    mac68k) machine=m68k-apple ;;
++	    macppc) machine=powerpc-apple ;;
++	    hp3[0-9][05]) machine=m68k-hp ;;
++	    ibmrt|romp-ibm) machine=romp-ibm ;;
++	    *) machine=${UNAME_MACHINE}-unknown ;;
+ 	esac
+ 	# The Operating System including object format, if it has switched
+ 	# to ELF recently, or will in the future.
+-	case "${UNAME_MACHINE_ARCH}" in
+-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
++	case "${UNAME_MACHINE}" in
++	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
+ 		eval $set_cc_for_build
+ 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ 			| grep __ELF__ >/dev/null
+@@ -190,112 +166,75 @@
+ 		;;
+ 	esac
+ 	# The OS release
+-	# Debian GNU/NetBSD machines have a different userland, and
+-	# thus, need a distinct triplet. However, they do not need
+-	# kernel version information, so it can be replaced with a
+-	# suitable tag, in the style of linux-gnu.
+-	case "${UNAME_VERSION}" in
+-	    Debian*)
+-		release='-gnu'
+-		;;
+-	    *)
+-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+-		;;
+-	esac
++	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ 	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+ 	# contains redundant information, the shorter form:
+ 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ 	echo "${machine}-${os}${release}"
+ 	exit 0 ;;
+-    amiga:OpenBSD:*:*)
+-	echo m68k-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    arc:OpenBSD:*:*)
+-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    hp300:OpenBSD:*:*)
+-	echo m68k-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    mac68k:OpenBSD:*:*)
+-	echo m68k-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    macppc:OpenBSD:*:*)
+-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    mvme68k:OpenBSD:*:*)
+-	echo m68k-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    mvme88k:OpenBSD:*:*)
+-	echo m88k-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    mvmeppc:OpenBSD:*:*)
+-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    pmax:OpenBSD:*:*)
+-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    sgi:OpenBSD:*:*)
+-	echo mipseb-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    sun3:OpenBSD:*:*)
+-	echo m68k-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    wgrisc:OpenBSD:*:*)
+-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    *:OpenBSD:*:*)
+-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+     alpha:OSF1:*:*)
+ 	if test $UNAME_RELEASE = "V4.0"; then
+ 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+ 	fi
+-	# According to Compaq, /usr/sbin/psrinfo has been available on
+-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
+-	# covers most systems running today.  This code pipes the CPU
+-	# types through head -n 1, so we only detect the type of CPU 0.
+-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+-	case "$ALPHA_CPU_TYPE" in
+-	    "EV4 (21064)")
+-		UNAME_MACHINE="alpha" ;;
+-	    "EV4.5 (21064)")
+-		UNAME_MACHINE="alpha" ;;
+-	    "LCA4 (21066/21068)")
+-		UNAME_MACHINE="alpha" ;;
+-	    "EV5 (21164)")
+-		UNAME_MACHINE="alphaev5" ;;
+-	    "EV5.6 (21164A)")
+-		UNAME_MACHINE="alphaev56" ;;
+-	    "EV5.6 (21164PC)")
+-		UNAME_MACHINE="alphapca56" ;;
+-	    "EV5.7 (21164PC)")
+-		UNAME_MACHINE="alphapca57" ;;
+-	    "EV6 (21264)")
+-		UNAME_MACHINE="alphaev6" ;;
+-	    "EV6.7 (21264A)")
+-		UNAME_MACHINE="alphaev67" ;;
+-	    "EV6.8CB (21264C)")
+-		UNAME_MACHINE="alphaev68" ;;
+-	    "EV6.8AL (21264B)")
+-		UNAME_MACHINE="alphaev68" ;;
+-	    "EV6.8CX (21264D)")
+-		UNAME_MACHINE="alphaev68" ;;
+-	    "EV6.9A (21264/EV69A)")
+-		UNAME_MACHINE="alphaev69" ;;
+-	    "EV7 (21364)")
+-		UNAME_MACHINE="alphaev7" ;;
+-	    "EV7.9 (21364A)")
+-		UNAME_MACHINE="alphaev79" ;;
+-	esac
+ 	# A Vn.n version is a released version.
+ 	# A Tn.n version is a released field test version.
+ 	# A Xn.n version is an unreleased experimental baselevel.
+ 	# 1.2 uses "1.2" for uname -r.
++	cat <<EOF >$dummy.s
++	.data
++\$Lformat:
++	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
++
++	.text
++	.globl main
++	.align 4
++	.ent main
++main:
++	.frame \$30,16,\$26,0
++	ldgp \$29,0(\$27)
++	.prologue 1
++	.long 0x47e03d80 # implver \$0
++	lda \$2,-1
++	.long 0x47e20c21 # amask \$2,\$1
++	lda \$16,\$Lformat
++	mov \$0,\$17
++	not \$1,\$18
++	jsr \$26,printf
++	ldgp \$29,0(\$26)
++	mov 0,\$16
++	jsr \$26,exit
++	.end main
++EOF
++	eval $set_cc_for_build
++	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
++	if test "$?" = 0 ; then
++		case `./$dummy` in
++			0-0)
++				UNAME_MACHINE="alpha"
++				;;
++			1-0)
++				UNAME_MACHINE="alphaev5"
++				;;
++			1-1)
++				UNAME_MACHINE="alphaev56"
++				;;
++			1-101)
++				UNAME_MACHINE="alphapca56"
++				;;
++			2-303)
++				UNAME_MACHINE="alphaev6"
++				;;
++			2-307)
++				UNAME_MACHINE="alphaev67"
++				;;
++			2-1307)
++				UNAME_MACHINE="alphaev68"
++				;;
++		esac
++	fi
++	rm -f $dummy.s $dummy
+ 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ 	exit 0 ;;
+-    Alpha*:OpenVMS:*:*)
+-	echo alpha-hp-vms
+-	exit 0 ;;
+     Alpha\ *:Windows_NT*:*)
+ 	# How do we know it's Interix rather than the generic POSIX subsystem?
+ 	# Should we change UNAME_MACHINE based on the output of uname instead
+@@ -308,11 +247,29 @@
+     Amiga*:UNIX_System_V:4.0:*)
+ 	echo m68k-unknown-sysv4
+ 	exit 0;;
++    amiga:OpenBSD:*:*)
++	echo m68k-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
+     *:[Aa]miga[Oo][Ss]:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-amigaos
+ 	exit 0 ;;
+-    *:[Mm]orph[Oo][Ss]:*:*)
+-	echo ${UNAME_MACHINE}-unknown-morphos
++    arc64:OpenBSD:*:*)
++	echo mips64el-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    arc:OpenBSD:*:*)
++	echo mipsel-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    hkmips:OpenBSD:*:*)
++	echo mips-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    pmax:OpenBSD:*:*)
++	echo mipsel-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    sgi:OpenBSD:*:*)
++	echo mips-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    wgrisc:OpenBSD:*:*)
++	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:OS/390:*:*)
+ 	echo i370-ibm-openedition
+@@ -334,13 +291,6 @@
+     NILE*:*:*:dcosx)
+ 	echo pyramid-pyramid-svr4
+ 	exit 0 ;;
+-    DRS?6000:unix:4.0:6*)
+-	echo sparc-icl-nx6
+-	exit 0 ;;
+-    DRS?6000:UNIX_SV:4.2*:7*)
+-	case `/usr/bin/uname -p` in
+-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
+-	esac ;;
+     sun4H:SunOS:5.*:*)
+ 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit 0 ;;
+@@ -369,7 +319,7 @@
+ 	echo m68k-sun-sunos${UNAME_RELEASE}
+ 	exit 0 ;;
+     sun*:*:4.2BSD:*)
+-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
++	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+ 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+ 	case "`/bin/arch`" in
+ 	    sun3)
+@@ -383,6 +333,12 @@
+     aushp:SunOS:*:*)
+ 	echo sparc-auspex-sunos${UNAME_RELEASE}
+ 	exit 0 ;;
++    sparc*:NetBSD:*)
++	echo `uname -p`-unknown-netbsd${UNAME_RELEASE}
++	exit 0 ;;
++    atari*:OpenBSD:*:*)
++	echo m68k-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
+     # The situation for MiNT is a little confusing.  The machine name
+     # can be virtually everything (everything which is not
+     # "atarist" or "atariste" at least should have a processor
+@@ -409,6 +365,18 @@
+     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+         echo m68k-unknown-mint${UNAME_RELEASE}
+         exit 0 ;;
++    sun3*:OpenBSD:*:*)
++	echo m68k-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    mac68k:OpenBSD:*:*)
++	echo m68k-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    mvme68k:OpenBSD:*:*)
++	echo m68k-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    mvme88k:OpenBSD:*:*)
++	echo m88k-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
+     powerpc:machten:*:*)
+ 	echo powerpc-apple-machten${UNAME_RELEASE}
+ 	exit 0 ;;
+@@ -447,20 +415,15 @@
+ 	  exit (-1);
+ 	}
+ EOF
+-	$CC_FOR_BUILD -o $dummy $dummy.c \
+-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+-	  && exit 0
++	$CC_FOR_BUILD $dummy.c -o $dummy \
++	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
++	  && rm -f $dummy.c $dummy && exit 0
++	rm -f $dummy.c $dummy
+ 	echo mips-mips-riscos${UNAME_RELEASE}
+ 	exit 0 ;;
+     Motorola:PowerMAX_OS:*:*)
+ 	echo powerpc-motorola-powermax
+ 	exit 0 ;;
+-    Motorola:*:4.3:PL8-*)
+-	echo powerpc-harris-powermax
+-	exit 0 ;;
+-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+-	echo powerpc-harris-powermax
+-	exit 0 ;;
+     Night_Hawk:Power_UNIX:*:*)
+ 	echo powerpc-harris-powerunix
+ 	exit 0 ;;
+@@ -533,7 +496,8 @@
+ 			exit(0);
+ 			}
+ EOF
+-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
++		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
++		rm -f $dummy.c $dummy
+ 		echo rs6000-ibm-aix3.2.5
+ 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+ 		echo rs6000-ibm-aix3.2.4
+@@ -542,7 +506,7 @@
+ 	fi
+ 	exit 0 ;;
+     *:AIX:*:[45])
+-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
++	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+ 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ 		IBM_ARCH=rs6000
+ 	else
+@@ -582,8 +546,10 @@
+ 	    9000/31? )            HP_ARCH=m68000 ;;
+ 	    9000/[34]?? )         HP_ARCH=m68k ;;
+ 	    9000/[678][0-9][0-9])
+-		if [ -x /usr/bin/getconf ]; then
+-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
++              case "${HPUX_REV}" in
++                11.[0-9][0-9])
++                  if [ -x /usr/bin/getconf ]; then
++                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+                     sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+                     case "${sc_cpu_version}" in
+                       523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+@@ -592,13 +558,13 @@
+                         case "${sc_kernel_bits}" in
+                           32) HP_ARCH="hppa2.0n" ;;
+                           64) HP_ARCH="hppa2.0w" ;;
+-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
+                         esac ;;
+                     esac
+-		fi
+-		if [ "${HP_ARCH}" = "" ]; then
+-		    eval $set_cc_for_build
+-		    sed 's/^              //' << EOF >$dummy.c
++                  fi ;;
++              esac
++              if [ "${HP_ARCH}" = "" ]; then
++	      eval $set_cc_for_build
++              sed 's/^              //' << EOF >$dummy.c
+ 
+               #define _HPUX_SOURCE
+               #include <stdlib.h>
+@@ -631,21 +597,11 @@
+                   exit (0);
+               }
+ EOF
+-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+-		    test -z "$HP_ARCH" && HP_ARCH=hppa
+-		fi ;;
++	    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
++	    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
++	    rm -f $dummy.c $dummy
++	fi ;;
+ 	esac
+-	if [ ${HP_ARCH} = "hppa2.0w" ]
+-	then
+-	    # avoid double evaluation of $set_cc_for_build
+-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+-	    then
+-		HP_ARCH="hppa2.0w"
+-	    else
+-		HP_ARCH="hppa64"
+-	    fi
+-	fi
+ 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+ 	exit 0 ;;
+     ia64:HP-UX:*:*)
+@@ -679,7 +635,8 @@
+ 	  exit (0);
+ 	}
+ EOF
+-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
++	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
++	rm -f $dummy.c $dummy
+ 	echo unknown-hitachi-hiuxwe2
+ 	exit 0 ;;
+     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+@@ -707,6 +664,9 @@
+     parisc*:Lites*:*:*)
+ 	echo hppa1.1-hp-lites
+ 	exit 0 ;;
++    hppa*:OpenBSD:*:*)
++	echo hppa-unknown-openbsd
++	exit 0 ;;
+     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+ 	echo c1-convex-bsd
+         exit 0 ;;
+@@ -725,6 +685,9 @@
+     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+ 	echo c4-convex-bsd
+         exit 0 ;;
++    CRAY*X-MP:*:*:*)
++	echo xmp-cray-unicos
++        exit 0 ;;
+     CRAY*Y-MP:*:*:*)
+ 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+@@ -737,21 +700,27 @@
+     CRAY*TS:*:*:*)
+ 	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
++    CRAY*T3D:*:*:*)
++	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	exit 0 ;;
+     CRAY*T3E:*:*:*)
+ 	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+     CRAY*SV1:*:*:*)
+ 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+-    *:UNICOS/mp:*:*)
+-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
+-	exit 0 ;;
++    CRAY-2:*:*:*)
++	echo cray2-cray-unicos
++        exit 0 ;;
+     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+ 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+         exit 0 ;;
++    hp300:OpenBSD:*:*)
++	echo m68k-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
+     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+ 	exit 0 ;;
+@@ -761,22 +730,11 @@
+     *:BSD/OS:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ 	exit 0 ;;
+-    *:FreeBSD:*:*|*:GNU/FreeBSD:*:*)
+-	# Determine whether the default compiler uses glibc.
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#include <features.h>
+-	#if __GLIBC__ >= 2
+-	LIBC=gnu
+-	#else
+-	LIBC=
+-	#endif
+-EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+-	# GNU/FreeBSD systems have a "k" prefix to indicate we are using
+-	# FreeBSD's kernel, but not the complete OS.
+-	case ${LIBC} in gnu) kernel_only='k' ;; esac
+-	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
++    *:FreeBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
++	exit 0 ;;
++    *:OpenBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ 	exit 0 ;;
+     i*:CYGWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-cygwin
+@@ -787,17 +745,11 @@
+     i*:PW*:*)
+ 	echo ${UNAME_MACHINE}-pc-pw32
+ 	exit 0 ;;
+-    x86:Interix*:[34]*)
+-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+-	exit 0 ;;
+-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+-	echo i${UNAME_MACHINE}-pc-mks
+-	exit 0 ;;
+     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+ 	# How do we know it's Interix rather than the generic POSIX subsystem?
+ 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+ 	# UNAME_MACHINE based on the output of uname instead of i386?
+-	echo i586-pc-interix
++	echo i386-pc-interix
+ 	exit 0 ;;
+     i*:UWIN*:*)
+ 	echo ${UNAME_MACHINE}-pc-uwin
+@@ -815,60 +767,25 @@
+ 	echo ${UNAME_MACHINE}-pc-minix
+ 	exit 0 ;;
+     arm*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-${VENDOR}-linux
+-	exit 0 ;;
+-    cris:Linux:*:*)
+-	echo cris-axis-linux
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit 0 ;;
+     ia64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-${VENDOR}-linux
++	echo ${UNAME_MACHINE}-unknown-linux
+ 	exit 0 ;;
+     m68*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-${VENDOR}-linux
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit 0 ;;
+     mips:Linux:*:*)
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#undef CPU
+-	#undef mips
+-	#undef mipsel
+-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+-	CPU=mipsel
+-	#else
+-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+-	CPU=mips
+-	#else
+-	CPU=
+-	#endif
+-	#endif
+-EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+-	test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0
+-	;;
+-    mips64:Linux:*:*)
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#undef CPU
+-	#undef mips64
+-	#undef mips64el
+-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+-	CPU=mips64el
+-	#else
+-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+-	CPU=mips64
+-	#else
+-	CPU=
+-	#endif
+-	#endif
+-EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+-	test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0
++	case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
++	  big)    echo mips-unknown-linux-gnu && exit 0 ;;
++	  little) echo mipsel-unknown-linux-gnu && exit 0 ;;
++	esac
+ 	;;
+     ppc:Linux:*:*)
+-	echo powerpc-${VENDOR}-linux
++	echo powerpc-unknown-linux-gnu
+ 	exit 0 ;;
+     ppc64:Linux:*:*)
+-	echo powerpc64-${VENDOR}-linux
++	echo powerpc64-unknown-linux-gnu
+ 	exit 0 ;;
+     alpha:Linux:*:*)
+ 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+@@ -881,41 +798,37 @@
+ 	  EV68*) UNAME_MACHINE=alphaev68 ;;
+         esac
+ 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+-	if test "$?" = 0 ; then LIBC="-libc1" ; else LIBC="" ; fi
+-	echo ${UNAME_MACHINE}-${VENDOR}-linux${LIBC}
++	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ 	exit 0 ;;
+     parisc:Linux:*:* | hppa:Linux:*:*)
+ 	# Look for CPU level
+ 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+-	  PA7*) echo hppa1.1-${VENDOR}-linux ;;
+-	  PA8*) echo hppa2.0-${VENDOR}-linux ;;
+-	  *)    echo hppa-${VENDOR}-linux ;;
++	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
++	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
++	  *)    echo hppa-unknown-linux-gnu ;;
+ 	esac
+ 	exit 0 ;;
+     parisc64:Linux:*:* | hppa64:Linux:*:*)
+-	echo hppa64-${VENDOR}-linux
++	echo hppa64-unknown-linux-gnu
+ 	exit 0 ;;
+     s390:Linux:*:* | s390x:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-ibm-linux
+ 	exit 0 ;;
+-    sh64*:Linux:*:*)
+-    	echo ${UNAME_MACHINE}-${VENDOR}-linux
+-	exit 0 ;;
+     sh*:Linux:*:*)
+-	echo ${UNAME_MACHINE}-${VENDOR}-linux
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit 0 ;;
+     sparc:Linux:*:* | sparc64:Linux:*:*)
+-	echo ${UNAME_MACHINE}-${VENDOR}-linux
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit 0 ;;
+     x86_64:Linux:*:*)
+-	echo x86_64-${VENDOR}-linux
++	echo x86_64-unknown-linux-gnu
+ 	exit 0 ;;
+     i*86:Linux:*:*)
+ 	# The BFD linker knows what the default object file format is, so
+ 	# first see if it will tell us. cd to the root directory to prevent
+ 	# problems with other programs or directories called `ld' in the path.
+-	# Set LC_ALL=C to ensure ld outputs messages in English.
+-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
++	ld_supported_targets=`cd /; ld --help 2>&1 \
+ 			 | sed -ne '/supported targets:/!d
+ 				    s/[ 	][ 	]*/ /g
+ 				    s/.*supported targets: *//
+@@ -923,44 +836,48 @@
+ 				    p'`
+         case "$ld_supported_targets" in
+ 	  elf32-i386)
+-		TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux"
++		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+ 		;;
+ 	  a.out-i386-linux)
+-		echo "${UNAME_MACHINE}-${VENDOR}-linuxaout"
+-		exit 0 ;;
++		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
++		exit 0 ;;		
+ 	  coff-i386)
+-		echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff"
++		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+ 		exit 0 ;;
+ 	  "")
+-		# Either a pre-BFD a.out linker (linuxoldld) or
++		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+ 		# one that does not give us useful --help.
+-		echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld"
++		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+ 		exit 0 ;;
+ 	esac
+ 	# Determine whether the default compiler is a.out or elf
+ 	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#include <features.h>
+-	#ifdef __ELF__
+-	# ifdef __GLIBC__
+-	#  if __GLIBC__ >= 2
+-	LIBC=gnu
+-	#  else
+-	LIBC=gnulibc1
+-	#  endif
+-	# else
+-	LIBC=gnulibc1
+-	# endif
+-	#else
+-	#ifdef __INTEL_COMPILER
+-	LIBC=gnu
+-	#else
+-	LIBC=gnuaout
+-	#endif
+-	#endif
++	cat >$dummy.c <<EOF
++#include <features.h>
++#ifdef __cplusplus
++#include <stdio.h>  /* for printf() prototype */
++	int main (int argc, char *argv[]) {
++#else
++	int main (argc, argv) int argc; char *argv[]; {
++#endif
++#ifdef __ELF__
++# ifdef __GLIBC__
++#  if __GLIBC__ >= 2
++    printf ("%s-pc-linux-gnu\n", argv[1]);
++#  else
++    printf ("%s-pc-linux-gnulibc1\n", argv[1]);
++#  endif
++# else
++   printf ("%s-pc-linux-gnulibc1\n", argv[1]);
++# endif
++#else
++  printf ("%s-pc-linux-gnuaout\n", argv[1]);
++#endif
++  return 0;
++}
+ EOF
+-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" | sed 's/linux-gnu/linux/' && exit 0
++	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
++	rm -f $dummy.c $dummy
+ 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+ 	;;
+     i*86:DYNIX/ptx:4*:*)
+@@ -977,23 +894,6 @@
+         # Use sysv4.2uw... so that sysv4* matches it.
+ 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ 	exit 0 ;;
+-    i*86:OS/2:*:*)
+-	# If we were able to find `uname', then EMX Unix compatibility
+-	# is probably installed.
+-	echo ${UNAME_MACHINE}-pc-os2-emx
+-	exit 0 ;;
+-    i*86:XTS-300:*:STOP)
+-	echo ${UNAME_MACHINE}-unknown-stop
+-	exit 0 ;;
+-    i*86:atheos:*:*)
+-	echo ${UNAME_MACHINE}-unknown-atheos
+-	exit 0 ;;
+-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+-	echo i386-unknown-lynxos${UNAME_RELEASE}
+-	exit 0 ;;
+-    i*86:*DOS:*:*)
+-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+-	exit 0 ;;
+     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+ 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+ 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+@@ -1015,19 +915,22 @@
+ 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+ 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+ 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
++		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
++		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
++		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
+ 			&& UNAME_MACHINE=i586
+-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
++		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
+ 			&& UNAME_MACHINE=i686
+-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
++		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
+ 			&& UNAME_MACHINE=i686
+ 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+ 	else
+ 		echo ${UNAME_MACHINE}-pc-sysv32
+ 	fi
+ 	exit 0 ;;
++    i*86:*DOS:*:*)
++	echo ${UNAME_MACHINE}-pc-msdosdjgpp
++	exit 0 ;;
+     pc:*:*:*)
+ 	# Left here for compatibility:
+         # uname -m prints for DJGPP always 'pc', but it prints nothing about
+@@ -1051,15 +954,9 @@
+ 	# "miniframe"
+ 	echo m68010-convergent-sysv
+ 	exit 0 ;;
+-    mc68k:UNIX:SYSTEM5:3.51m)
+-	echo m68k-convergent-sysv
+-	exit 0 ;;
+-    M680?0:D-NIX:5.3:*)
+-	echo m68k-diab-dnix
+-	exit 0 ;;
+     M68*:*:R3V[567]*:*)
+ 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
++    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+ 	OS_REL=''
+ 	test -r /etc/.relid \
+ 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+@@ -1076,6 +973,9 @@
+     mc68030:UNIX_System_V:4.*:*)
+ 	echo m68k-atari-sysv4
+ 	exit 0 ;;
++    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
++	echo i386-unknown-lynxos${UNAME_RELEASE}
++	exit 0 ;;
+     TSUNAMI:LynxOS:2.*:*)
+ 	echo sparc-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
+@@ -1147,9 +1047,6 @@
+     SX-5:SUPER-UX:*:*)
+ 	echo sx5-nec-superux${UNAME_RELEASE}
+ 	exit 0 ;;
+-    SX-6:SUPER-UX:*:*)
+-	echo sx6-nec-superux${UNAME_RELEASE}
+-	exit 0 ;;
+     Power*:Rhapsody:*:*)
+ 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ 	exit 0 ;;
+@@ -1157,24 +1054,18 @@
+ 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:Darwin:*:*)
+-	case `uname -p` in
+-	    *86) UNAME_PROCESSOR=i686 ;;
+-	    powerpc) UNAME_PROCESSOR=powerpc ;;
+-	esac
+-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
++	echo `uname -p`-apple-darwin${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:procnto*:*:* | *:QNX:[0123456789]*:*)
+-	UNAME_PROCESSOR=`uname -p`
+-	if test "$UNAME_PROCESSOR" = "x86"; then
+-		UNAME_PROCESSOR=i386
++	if test "${UNAME_MACHINE}" = "x86pc"; then
+ 		UNAME_MACHINE=pc
+ 	fi
+-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
++	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
+ 	exit 0 ;;
+     *:QNX:*:4*)
+ 	echo i386-pc-qnx
+ 	exit 0 ;;
+-    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
++    NSR-[KW]:NONSTOP_KERNEL:*:*)
+ 	echo nsr-tandem-nsk${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:NonStop-UX:*:*)
+@@ -1197,6 +1088,11 @@
+ 	fi
+ 	echo ${UNAME_MACHINE}-unknown-plan9
+ 	exit 0 ;;
++    i*86:OS/2:*:*)
++	# If we were able to find `uname', then EMX Unix compatibility
++	# is probably installed.
++	echo ${UNAME_MACHINE}-pc-os2-emx
++	exit 0 ;;
+     *:TOPS-10:*:*)
+ 	echo pdp10-unknown-tops10
+ 	exit 0 ;;
+@@ -1215,8 +1111,11 @@
+     *:ITS:*:*)
+ 	echo pdp10-unknown-its
+ 	exit 0 ;;
+-    SEI:*:*:SEIUX)
+-        echo mips-sei-seiux${UNAME_RELEASE}
++    i*86:XTS-300:*:STOP)
++	echo ${UNAME_MACHINE}-unknown-stop
++	exit 0 ;;
++    i*86:atheos:*:*)
++	echo ${UNAME_MACHINE}-unknown-atheos
+ 	exit 0 ;;
+ esac
+ 
+@@ -1338,7 +1237,8 @@
+ }
+ EOF
+ 
+-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
++$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
++rm -f $dummy.c $dummy
+ 
+ # Apollos put the system type in the environment.
+ 
+diff -uNr alsa-tools-1.0.8/ac3dec/config.sub alsa-tools-1.0.8-mod/ac3dec/config.sub
+--- alsa-tools-1.0.8/ac3dec/config.sub	2001-04-18 05:43:24.000000000 +1000
++++ alsa-tools-1.0.8-mod/ac3dec/config.sub	2005-01-27 17:31:46.569766263 +1100
+@@ -1,6 +1,10 @@
+ #! /bin/sh
+-# Configuration validation subroutine script, version 1.1.
+-#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
++# Configuration validation subroutine script.
++#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
++#   Free Software Foundation, Inc.
++
++timestamp='2001-09-07'
++
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+ # can handle that machine.  It does not imply ALL GNU software can.
+@@ -25,6 +29,8 @@
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
++# Please send patches to <config-patches@gnu.org>.
++#
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+ # If it is invalid, we print an error message on stderr and exit with code 1.
+@@ -45,30 +51,73 @@
+ #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+ # It is wrong to echo any other type of specification.
+ 
+-if [ x$1 = x ]
+-then
+-	echo Configuration name missing. 1>&2
+-	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
+-	echo "or     $0 ALIAS" 1>&2
+-	echo where ALIAS is a recognized configuration type. 1>&2
+-	exit 1
+-fi
++me=`echo "$0" | sed -e 's,.*/,,'`
+ 
+-# First pass through any local machine types.
+-case $1 in
+-	*local*)
+-		echo $1
+-		exit 0
+-		;;
+-	*)
+-	;;
++usage="\
++Usage: $0 [OPTION] CPU-MFR-OPSYS
++       $0 [OPTION] ALIAS
++
++Canonicalize a configuration name.
++
++Operation modes:
++  -h, --help         print this help, then exit
++  -t, --time-stamp   print date of last modification, then exit
++  -v, --version      print version number, then exit
++
++Report bugs and patches to <config-patches@gnu.org>."
++
++version="\
++GNU config.sub ($timestamp)
++
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
++Free Software Foundation, Inc.
++
++This is free software; see the source for copying conditions.  There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++
++help="
++Try \`$me --help' for more information."
++
++# Parse command line
++while test $# -gt 0 ; do
++  case $1 in
++    --time-stamp | --time* | -t )
++       echo "$timestamp" ; exit 0 ;;
++    --version | -v )
++       echo "$version" ; exit 0 ;;
++    --help | --h* | -h )
++       echo "$usage"; exit 0 ;;
++    -- )     # Stop option processing
++       shift; break ;;
++    - )	# Use stdin as input.
++       break ;;
++    -* )
++       echo "$me: invalid option $1$help"
++       exit 1 ;;
++
++    *local*)
++       # First pass through any local machine types.
++       echo $1
++       exit 0;;
++
++    * )
++       break ;;
++  esac
++done
++
++case $# in
++ 0) echo "$me: missing argument$help" >&2
++    exit 1;;
++ 1) ;;
++ *) echo "$me: too many arguments$help" >&2
++    exit 1;;
+ esac
+ 
+ # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+-  linux-*)
++  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
+     os=-$maybe_os
+     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+     ;;
+@@ -94,7 +143,7 @@
+ 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+-	-apple)
++	-apple | -axis)
+ 		os=
+ 		basic_machine=$1
+ 		;;
+@@ -108,6 +157,14 @@
+ 		os=-vxworks
+ 		basic_machine=$1
+ 		;;
++	-chorusos*)
++		os=-chorusos
++		basic_machine=$1
++		;;
++ 	-chorusrdb)
++ 		os=-chorusrdb
++		basic_machine=$1
++ 		;;
+ 	-hiux*)
+ 		os=-hiuxwe2
+ 		;;
+@@ -166,49 +223,51 @@
+ case $basic_machine in
+ 	# Recognize the basic CPU types without company name.
+ 	# Some are omitted here because they have special meanings below.
+-	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+-		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
+-		| 580 | i960 | h8300 \
+-		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
+-		| alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
+-		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
+-		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
+-		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
+-		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
+-		| mips64vr5000 | miprs64vr5000el | mcore \
+-		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
+-		| thumb | d10v | fr30)
++	1750a | 580 \
++	| a29k \
++	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
++	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
++	| c4x | clipper \
++	| d10v | d30v | dsp16xx \
++	| fr30 \
++	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
++	| i370 | i860 | i960 | ia64 \
++	| m32r | m68000 | m68k | m88k | mcore \
++	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
++	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
++	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
++	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
++	| mipsisa32 \
++	| mn10200 | mn10300 \
++	| ns16k | ns32k \
++	| openrisc \
++	| pdp10 | pdp11 | pj | pjl \
++	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
++	| pyramid \
++	| s390 | s390x \
++	| sh | sh[34] | sh[34]eb | shbe | shle \
++	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
++	| stormy16 | strongarm \
++	| tahoe | thumb | tic80 | tron \
++	| v850 \
++	| we32k \
++	| x86 | xscale \
++	| z8k)
+ 		basic_machine=$basic_machine-unknown
+ 		;;
+-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
++	m6811 | m68hc11 | m6812 | m68hc12)
++		# Motorola 68HC11/12.
++		basic_machine=$basic_machine-unknown
++		os=-none
++		;;
++	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+ 		;;
+ 
+ 	# We use `pc' rather than `unknown'
+ 	# because (1) that's what they normally are, and
+ 	# (2) the word "unknown" tends to confuse beginning users.
+-	i[34567]86)
+-	  if test -e /etc/SuSE-release ; then
+-		basic_machine=$basic_machine-suse
+-		os=-linux
+-	  else
+-		basic_machine=$basic_machine-pc
+-	  fi
+-	  ;;
+-	s390 | s390-suse)
+-	  basic_machine=s390-suse
+-	  ;;
+-	s390-unknown)
+-	  basic_machine=s390-unknown
+-	  if test -e /etc/SuSE-release ; then
+-		basic_machine=s390-suse
+-		os=-linux
+-	  fi
+-	  ;;
+-	s390-ibm)
+-	  basic_machine=s390-ibm
+-	  ;;
+-	s390-redhat)
+-	  basic_machine=s390-redhat
++	i*86 | x86_64)
++	  basic_machine=$basic_machine-pc
+ 	  ;;
+ 	# Object if more than one company name word.
+ 	*-*-*)
+@@ -216,24 +275,43 @@
+ 		exit 1
+ 		;;
+ 	# Recognize the basic CPU types with company name.
+-	# FIXME: clean up the formatting here.
+-	vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
+-	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
+-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+-	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
+-	      | xmp-* | ymp-* \
+-	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
+-	      | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
+-	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
+-	      | clipper-* | orion-* \
+-	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+-	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
+-	      | mips64el-* | mips64orion-* | mips64orionel-* \
+-	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
+-	      | mipstx39-* | mipstx39el-* | mcore-* \
+-	      | f301-* | armv*-* | t3e-* \
+-	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
+-	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* )
++	580-* \
++	| a29k-* \
++	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
++	| alphapca5[67]-* | arc-* \
++	| arm-*  | armbe-* | armle-* | armv*-* \
++	| bs2000-* \
++	| c[123]* | c30-* | [cjt]90-* | c54x-* \
++	| clipper-* | cray2-* | cydra-* \
++	| d10v-* | d30v-* \
++	| elxsi-* \
++	| f30[01]-* | f700-* | fr30-* | fx80-* \
++	| h8300-* | h8500-* \
++	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
++	| i*86-* | i860-* | i960-* | ia64-* \
++	| m32r-* \
++	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
++	| m88110-* | m88k-* | mcore-* \
++	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
++	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
++	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
++	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
++	| none-* | np1-* | ns16k-* | ns32k-* \
++	| orion-* \
++	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
++	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
++	| pyramid-* \
++	| romp-* | rs6000-* \
++	| s390-* | s390x-* \
++	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
++	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
++	| sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \
++	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
++	| v850-* | vax-* \
++	| we32k-* \
++	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
++	| ymp-* \
++	| z8k-*)
+ 		;;
+ 	# Recognize the various machine names and aliases which stand
+ 	# for a CPU type and a company and sometimes even an OS.
+@@ -270,14 +348,14 @@
+ 		os=-sysv
+ 		;;
+ 	amiga | amiga-*)
+-		basic_machine=m68k-cbm
++		basic_machine=m68k-unknown
+ 		;;
+ 	amigaos | amigados)
+-		basic_machine=m68k-cbm
++		basic_machine=m68k-unknown
+ 		os=-amigaos
+ 		;;
+ 	amigaunix | amix)
+-		basic_machine=m68k-cbm
++		basic_machine=m68k-unknown
+ 		os=-sysv4
+ 		;;
+ 	apollo68)
+@@ -324,13 +402,16 @@
+ 		basic_machine=cray2-cray
+ 		os=-unicos
+ 		;;
+-	[ctj]90-cray)
+-		basic_machine=c90-cray
++	[cjt]90)
++		basic_machine=${basic_machine}-cray
+ 		os=-unicos
+ 		;;
+ 	crds | unos)
+ 		basic_machine=m68k-crds
+ 		;;
++	cris | cris-* | etrax*)
++		basic_machine=cris-axis
++		;;
+ 	da30 | da30-*)
+ 		basic_machine=m68k-da30
+ 		;;
+@@ -378,6 +459,10 @@
+ 		basic_machine=tron-gmicro
+ 		os=-sysv
+ 		;;
++	go32)
++		basic_machine=i386-pc
++		os=-go32
++		;;
+ 	h3050r* | hiux*)
+ 		basic_machine=hppa1.1-hitachi
+ 		os=-hiuxwe2
+@@ -453,19 +538,19 @@
+ 		basic_machine=i370-ibm
+ 		;;
+ # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+-	i[34567]86v32)
++	i*86v32)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv32
+ 		;;
+-	i[34567]86v4*)
++	i*86v4*)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv4
+ 		;;
+-	i[34567]86v)
++	i*86v)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv
+ 		;;
+-	i[34567]86sol2)
++	i*86sol2)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-solaris2
+ 		;;
+@@ -477,17 +562,6 @@
+ 		basic_machine=i386-unknown
+ 		os=-vsta
+ 		;;
+-	i386-go32 | go32)
+-		basic_machine=i386-unknown
+-		os=-go32
+-		;;
+-	i386-mingw32 | mingw32)
+-		basic_machine=i386-unknown
+-		os=-mingw32
+-		;;
+-	i386-qnx | qnx)
+-		basic_machine=i386-qnx
+-		;;
+ 	iris | iris4d)
+ 		basic_machine=mips-sgi
+ 		case $os in
+@@ -513,6 +587,10 @@
+ 		basic_machine=ns32k-utek
+ 		os=-sysv
+ 		;;
++	mingw32)
++		basic_machine=i386-pc
++		os=-mingw32
++		;;
+ 	miniframe)
+ 		basic_machine=m68000-convergent
+ 		;;
+@@ -522,13 +600,11 @@
+ 		;;
+ 	mipsel*-linux*)
+ 		basic_machine=mipsel-unknown
+-		test -e /etc/SuSE-release && basic_machine=mipsel-suse
+-		os=-linux
++		os=-linux-gnu
+ 		;;
+ 	mips*-linux*)
+ 		basic_machine=mips-unknown
+-		test -e /etc/SuSE-release && basic_machine=mips-suse
+-		os=-linux
++		os=-linux-gnu
+ 		;;
+ 	mips3*-*)
+ 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+@@ -536,12 +612,16 @@
+ 	mips3*)
+ 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+ 		;;
++	mmix*)
++		basic_machine=mmix-knuth
++		os=-mmixware
++		;;
+ 	monitor)
+ 		basic_machine=m68k-rom68k
+ 		os=-coff
+ 		;;
+ 	msdos)
+-		basic_machine=i386-unknown
++		basic_machine=i386-pc
+ 		os=-msdos
+ 		;;
+ 	mvs)
+@@ -605,9 +685,16 @@
+ 		basic_machine=i960-intel
+ 		os=-mon960
+ 		;;
++	nonstopux)
++		basic_machine=mips-compaq
++		os=-nonstopux
++		;;
+ 	np1)
+ 		basic_machine=np1-gould
+ 		;;
++	nsr-tandem)
++		basic_machine=nsr-tandem
++		;;
+ 	op50n-* | op60c-*)
+ 		basic_machine=hppa1.1-oki
+ 		os=-proelf
+@@ -637,28 +724,28 @@
+         pc532 | pc532-*)
+ 		basic_machine=ns32k-pc532
+ 		;;
+-	pentium | p5 | k5 | k6 | nexen)
++	pentium | p5 | k5 | k6 | nexgen)
+ 		basic_machine=i586-pc
+ 		;;
+-	pentiumpro | p6 | 6x86)
++	pentiumpro | p6 | 6x86 | athlon)
+ 		basic_machine=i686-pc
+ 		;;
+ 	pentiumii | pentium2)
+-		basic_machine=i786-pc
++		basic_machine=i686-pc
+ 		;;
+-	pentium-* | p5-* | k5-* | k6-* | nexen-*)
++	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
+ 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+-	pentiumpro-* | p6-* | 6x86-*)
++	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+ 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	pentiumii-* | pentium2-*)
+-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	pn)
+ 		basic_machine=pn-gould
+ 		;;
+-	power)	basic_machine=rs6000-ibm
++	power)	basic_machine=power-ibm
+ 		;;
+ 	ppc)	basic_machine=powerpc-unknown
+ 	        ;;
+@@ -670,9 +757,23 @@
+ 	ppcle-* | powerpclittle-*)
+ 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
++	ppc64)	basic_machine=powerpc64-unknown
++	        ;;
++	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
++		basic_machine=powerpc64le-unknown
++	        ;;
++	ppc64le-* | powerpc64little-*)
++		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
+ 	ps2)
+ 		basic_machine=i386-ibm
+ 		;;
++	pw32)
++		basic_machine=i586-unknown
++		os=-pw32
++		;;
+ 	rom68k)
+ 		basic_machine=m68k-rom68k
+ 		os=-coff
+@@ -752,6 +853,10 @@
+ 	sun386 | sun386i | roadrunner)
+ 		basic_machine=i386-sun
+ 		;;
++	sv1)
++		basic_machine=sv1-cray
++		os=-unicos
++		;;
+ 	symmetry)
+ 		basic_machine=i386-sequent
+ 		os=-dynix
+@@ -760,6 +865,10 @@
+ 		basic_machine=t3e-cray
+ 		os=-unicos
+ 		;;
++	tic54x | c54x*)
++		basic_machine=tic54x-unknown
++		os=-coff
++		;;
+ 	tx39)
+ 		basic_machine=mipstx39-unknown
+ 		;;
+@@ -812,6 +921,10 @@
+ 		basic_machine=hppa1.1-winbond
+ 		os=-proelf
+ 		;;
++	windows32)
++		basic_machine=i386-pc
++		os=-windows32-msvcrt
++		;;
+ 	xmp)
+ 		basic_machine=xmp-cray
+ 		os=-unicos
+@@ -840,10 +953,8 @@
+ 		basic_machine=hppa1.1-oki
+ 		;;
+ 	mips)
+-		if [ x$os = x-linux -o x$os = x-linux-gnu ]; then
++		if [ x$os = x-linux-gnu ]; then
+ 			basic_machine=mips-unknown
+-			test -e /etc/SuSE-release && basic_machine=mips-suse
+-			os=-linux
+ 		else
+ 			basic_machine=mips-mips
+ 		fi
+@@ -857,13 +968,20 @@
+ 	vax)
+ 		basic_machine=vax-dec
+ 		;;
++	pdp10)
++		# there are many clones, so DEC is not a safe bet
++		basic_machine=pdp10-unknown
++		;;
+ 	pdp11)
+ 		basic_machine=pdp11-dec
+ 		;;
+ 	we32k)
+ 		basic_machine=we32k-att
+ 		;;
+-	sparc | sparcv9)
++	sh3 | sh4 | sh3eb | sh4eb)
++		basic_machine=sh-unknown
++		;;
++	sparc | sparcv9 | sparcv9b)
+ 		basic_machine=sparc-sun
+ 		;;
+         cydra)
+@@ -885,6 +1003,9 @@
+ 		basic_machine=c4x-none
+ 		os=-coff
+ 		;;
++	*-unknown)
++		# Make sure to match an already-canonicalized machine name.
++		;;
+ 	*)
+ 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ 		exit 1
+@@ -924,7 +1045,7 @@
+ 		os=-sysv4.2uw
+ 		;;
+ 	-gnu/linux*)
+-		os=`echo $os | sed -e 's|gnu/linux|linux|'`
++		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+ 		;;
+ 	# First accept the basic system types.
+ 	# The portable systems comes first.
+@@ -941,20 +1062,36 @@
+ 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++	      | -chorusos* | -chorusrdb* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+-	      | -mingw32* | -linux-* | -uxpv* | -beos* | -mpeix* | -udk* \
+-	      | -interix* | -uwin* | -rhapsody* | -opened* | -openstep* | -oskit*)
++	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
++	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
++	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
++	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
++	      | -os2* | -vos*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
++	-qnx*)
++		case $basic_machine in
++		    x86-* | i*86-*)
++			;;
++		    *)
++			os=-nto$os
++			;;
++		esac
++		;;
++	-nto*)
++		os=-nto-qnx
++		;;
+ 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+ 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+-	      | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
++	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+ 		;;
+ 	-mac*)
+ 		os=`echo $os | sed -e 's|mac|macos|'`
+ 		;;
+ 	-linux*)
+-		os=`echo $os | sed -e 's|linux-gnu|linux|'`
++		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+ 		;;
+ 	-sunos5*)
+ 		os=`echo $os | sed -e 's|sunos5|solaris2|'`
+@@ -965,6 +1102,9 @@
+ 	-opened*)
+ 		os=-openedition
+ 		;;
++	-wince*)
++		os=-wince
++		;;
+ 	-osfrose*)
+ 		os=-osfrose
+ 		;;
+@@ -989,6 +1129,9 @@
+ 	-ns2 )
+ 	        os=-nextstep2
+ 		;;
++	-nsk*)
++		os=-nsk
++		;;
+ 	# Preserve the version number of sinix5.
+ 	-sinix5.*)
+ 		os=`echo $os | sed -e 's|sinix|sysv|'`
+@@ -1002,9 +1145,6 @@
+ 	-oss*)
+ 		os=-sysv3
+ 		;;
+-        -qnx)
+-		os=-qnx4
+-		;;
+ 	-svr4)
+ 		os=-sysv4
+ 		;;
+@@ -1026,7 +1166,7 @@
+ 	-xenix)
+ 		os=-xenix
+ 		;;
+-        -*mint | -*MiNT)
++        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ 	        os=-mint
+ 		;;
+ 	-none)
+@@ -1060,6 +1200,9 @@
+ 	arm*-semi)
+ 		os=-aout
+ 		;;
++	pdp10-*)
++		os=-tops20
++		;;
+         pdp11-*)
+ 		os=-none
+ 		;;
+@@ -1168,7 +1311,7 @@
+ 	*-masscomp)
+ 		os=-rtu
+ 		;;
+-	f301-fujitsu)
++	f30[01]-fujitsu | f700-fujitsu)
+ 		os=-uxpv
+ 		;;
+ 	*-rom68k)
+@@ -1246,12 +1389,23 @@
+ 			-mpw* | -macos*)
+ 				vendor=apple
+ 				;;
+-			-*mint | -*MiNT)
++			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ 				vendor=atari
+ 				;;
++			-vos*)
++				vendor=stratus
++				;;
+ 		esac
+ 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+ 		;;
+ esac
+ 
+ echo $basic_machine$os
++exit 0
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "timestamp='"
++# time-stamp-format: "%:y-%02m-%02d"
++# time-stamp-end: "'"
++# End:
Index: scripts/untested/blfs-patches/cdparanoia-III-alpha9.8-gcc34-1.patch
===================================================================
--- scripts/untested/blfs-patches/cdparanoia-III-alpha9.8-gcc34-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/cdparanoia-III-alpha9.8-gcc34-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,45 @@
+Submitted By: Jeremy Utley (jeremy@linuxfromscratch.org)
+Date: 2004-04-11
+Initial Package Version: alpha9.8
+Upstream Status: Not Submitted
+Origin: Self Created
+Description: Fixes syntax issues with GCC 3.4
+
+$LastChangedBy: randy $
+$Date: 2004-08-10 15:20:53 -0600 (Tue, 10 Aug 2004) $
+
+diff -aur cdparanoia-III-alpha9.8/interface/utils.h cdparanoia-III-alpha9.8-new/interface/utils.h
+--- cdparanoia-III-alpha9.8/interface/utils.h	2000-04-19 15:41:04.000000000 -0700
++++ cdparanoia-III-alpha9.8-new/interface/utils.h	2004-04-12 00:10:53.092860574 -0700
+@@ -112,6 +112,7 @@
+       break;
+     case CDDA_MESSAGE_FORGETIT:
+     default:
++    break;
+     }
+   }
+ }
+@@ -127,6 +128,7 @@
+       break;
+     case CDDA_MESSAGE_FORGETIT:
+     default:
++    break;
+     }
+   }
+ }
+@@ -169,6 +171,7 @@
+       break;
+     case CDDA_MESSAGE_FORGETIT:
+     default:
++    break;
+     }
+   }
+   if(malloced)free(buffer);
+@@ -205,6 +208,7 @@
+       break;
+     case CDDA_MESSAGE_FORGETIT:
+     default:
++    break;
+     }
+   }
+   if(malloced)free(buffer);
Index: scripts/untested/blfs-patches/cdparanoia-III-alpha9.8-includes-1.patch
===================================================================
--- scripts/untested/blfs-patches/cdparanoia-III-alpha9.8-includes-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/cdparanoia-III-alpha9.8-includes-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,31 @@
+Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
+Date: 2003-09-23
+Initial Package Version: alpha9.8
+Origin: Mandrake CVS
+Description: Missing Includes
+ 
+$LastChangedBy: randy $
+$Date: 2004-08-10 15:20:53 -0600 (Tue, 10 Aug 2004) $
+
+diff -Naur cdparanoia-III-alpha9.8.orig/header.c cdparanoia-III-alpha9.8/header.c
+--- cdparanoia-III-alpha9.8.orig/header.c	1999-08-15 22:34:58.000000000 +0000
++++ cdparanoia-III-alpha9.8/header.c	2003-09-24 04:42:32.000000000 +0000
+@@ -9,6 +9,7 @@
+ 
+ #include <unistd.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
+ 
+ static void PutNum(long num,int f,int endianness,int bytes){
+diff -Naur cdparanoia-III-alpha9.8.orig/paranoia/gap.c cdparanoia-III-alpha9.8/paranoia/gap.c
+--- cdparanoia-III-alpha9.8.orig/paranoia/gap.c	2000-04-19 22:41:04.000000000 +0000
++++ cdparanoia-III-alpha9.8/paranoia/gap.c	2003-09-24 04:42:32.000000000 +0000
+@@ -6,6 +6,7 @@
+  *
+  ***/
+ 
++#include <string.h>
+ #include "p_block.h"
+ #include "cdda_paranoia.h"
+ #include "gap.h"
Index: scripts/untested/blfs-patches/ed-0.2-mkstemp-1.patch
===================================================================
--- scripts/untested/blfs-patches/ed-0.2-mkstemp-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/ed-0.2-mkstemp-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,29 @@
+Submitted By: LFS Book <lfs-book@linuxfromscratch.org>
+Date: 2003-10-05
+Initial Package Version: 0.2
+Origin: Slackware Source
+Description: Use mkstemp instead of mktemp.
+
+$LastChangedBy: bdubbs $
+$Date: 2004-08-07 18:56:30 -0600 (Sat, 07 Aug 2004) $
+
+diff -Naur ed-0.2/buf.c ed-0.2-2/buf.c
+--- ed-0.2/buf.c	Sat Nov 19 04:37:59 1994
++++ ed-0.2-2/buf.c	Tue May 28 18:38:23 2002
+@@ -200,13 +200,13 @@
+ int
+ open_sbuf ()
+ {
+-  char *mktemp ();
+-  int u;
++  int u, sfd;
+ 
+   isbinary = newline_added = 0;
+   u = umask(077);
+   strcpy (sfn, "/tmp/ed.XXXXXX");
+-  if (mktemp (sfn) == NULL || (sfp = fopen (sfn, "w+")) == NULL)
++  sfd = mkstemp(sfn);
++    if ((sfd == -1) || (sfp = fopen (sfn, "w+")) == NULL)
+     {
+       fprintf (stderr, "%s: %s\n", sfn, strerror (errno));
+       sprintf (errmsg, "Cannot open temp file");
Index: scripts/untested/blfs-patches/fam-2.7.0-dnotify-1.patch
===================================================================
--- scripts/untested/blfs-patches/fam-2.7.0-dnotify-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/fam-2.7.0-dnotify-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,993 @@
+Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
+Date: 2004-03-15
+Initial Package Version: Jim Gifford
+Origin: Debian Maintainer of FAM
+Description: Dnotify Patch for FAM 2.7.0
+ 
+$LastChangedBy: bdubbs $
+$Date: 2004-08-07 18:56:30 -0600 (Sat, 07 Aug 2004) $
+
+diff -Naur fam-2.7.0.orig/config.h.in fam-2.7.0/config.h.in
+--- fam-2.7.0.orig/config.h.in	2003-01-20 00:40:15.000000000 +0000
++++ fam-2.7.0/config.h.in	2004-03-15 21:31:34.553059530 +0000
+@@ -180,3 +180,6 @@
+ 
+ /* Define to `int' if <sys/types.h> doesn't define. */
+ #undef uid_t
++
++/* Define to 1 if you have F_NOTIFY fcntl */
++#undef USE_DNOTIFY
+diff -Naur fam-2.7.0.orig/configure.ac fam-2.7.0/configure.ac
+--- fam-2.7.0.orig/configure.ac	2003-11-26 19:47:59.000000000 +0000
++++ fam-2.7.0/configure.ac	2004-03-15 21:31:34.556058981 +0000
+@@ -33,7 +33,26 @@
+ AC_HEADER_DIRENT
+ AC_CHECK_HEADERS([fcntl.h limits.h linux/imon.h netinet/in.h rpc/rpc.h rpcsvc/mount.h stddef.h stdlib.h string.h syslog.h sys/imon.h sys/param.h sys/select.h sys/statvfs.h sys/syssgi.h sys/time.h sys/types.h sys/un.h unistd.h])
+ 
+-if test "$have_sys_imon_h"; then
++# Test for the linux dnotify fcntl
++AC_MSG_CHECKING([for dnotify fcntl support])
++AC_TRY_COMPILE([
++#define _GNU_SOURCE  
++#include <fcntl.h>
++#include <unistd.h>
++],
++[ int fd = 1;
++  fcntl (fd, F_NOTIFY, (DN_MODIFY|DN_CREATE|DN_DELETE|DN_RENAME|DN_ATTRIB)
++                       |DN_MULTISHOT);
++], have_dnotify=yes, have_dnotify=no)
++
++use_dnotify=false
++AC_MSG_RESULT($have_dnotify)
++
++if test "$have_dnotify"; then
++        MONITOR_FUNCS=IMonNone
++        AC_DEFINE([USE_DNOTIFY], [], [Use dnotify])
++	use_dnotify=true
++elif test "$have_sys_imon_h"; then
+ 	MONITOR_FUNCS=IMonIRIX
+ elif test "$have_linux_imon_h"; then
+ 	MONITOR_FUNCS=IMonLinux
+@@ -41,6 +60,7 @@
+ 	MONITOR_FUNCS=IMonNone
+ fi
+ AC_SUBST(MONITOR_FUNCS)
++AM_CONDITIONAL(USE_DNOTIFY, $use_dnotify)
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+diff -Naur fam-2.7.0.orig/src/DNotify.c++ fam-2.7.0/src/DNotify.c++
+--- fam-2.7.0.orig/src/DNotify.c++	1970-01-01 00:00:00.000000000 +0000
++++ fam-2.7.0/src/DNotify.c++	2004-03-15 21:31:34.542061543 +0000
+@@ -0,0 +1,582 @@
++//  Copyright (C) 2001 Red Hat, Inc.  All Rights Reserved.
++//  Copyright (C) 1999 Silicon Graphics, Inc.  All Rights Reserved.
++//  
++//  This program is free software; you can redistribute it and/or modify it
++//  under the terms of version 2 of the GNU General Public License as
++//  published by the Free Software Foundation.
++//
++//  This program is distributed in the hope that it would be useful, but
++//  WITHOUT ANY WARRANTY; without even the implied warranty of
++//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  Further, any
++//  license provided herein, whether implied or otherwise, is limited to
++//  this program in accordance with the express provisions of the GNU
++//  General Public License.  Patent licenses, if any, provided herein do not
++//  apply to combinations of this program with other product or programs, or
++//  any other product whatsoever.  This program is distributed without any
++//  warranty that the program is delivered free of the rightful claim of any
++//  third person by way of infringement or the like.  See the GNU General
++//  Public License for more details.
++//
++//  You should have received a copy of the GNU General Public License along
++//  with this program; if not, write the Free Software Foundation, Inc., 59
++//  Temple Place - Suite 330, Boston MA 02111-1307, USA.
++
++#define _GNU_SOURCE  
++#include <fcntl.h>
++
++#include <string.h>
++#include <signal.h>
++#include <stdio.h>
++#include <unistd.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <libgen.h>
++
++#include "DNotify.h"
++
++#include "Interest.h"
++#include "Log.h"
++#include "Scheduler.h"
++#include <memory>
++
++
++int DNotify::pipe_write_fd = -2;
++int DNotify::pipe_read_fd = -2;
++volatile sig_atomic_t DNotify::queue_overflowed = 0;
++volatile sig_atomic_t DNotify::queue_changed = 0;
++int DNotify::change_queue[QUEUESIZE];
++volatile int DNotify::queue_head = 0; // Only modified by read handler
++volatile int DNotify::queue_tail = 0; // Only modified by signal handler
++DNotify::EventHandler DNotify::ehandler;
++
++DNotify::DirWatch *DNotify::dir_hash[DIR_HASHSIZE];
++DNotify::FileWatch *DNotify::file_hash[FILE_HASHSIZE];
++
++struct DNotify::FileWatch
++{
++    DirWatch *dir_watch;
++    dev_t file_dev;
++    ino_t file_ino;
++    FileWatch *next; // The DirWatch.watches list
++    FileWatch *hash_link;
++};
++
++struct DNotify::DirWatch
++{
++    int fd;
++    dev_t dir_dev;
++    ino_t dir_ino;
++    
++    DirWatch *hash_link;
++    FileWatch *watches;
++};
++
++struct DNotify::ChangeEventData
++{
++    dev_t file_dev;
++    ino_t file_ino;
++};    
++
++DNotify::DNotify(EventHandler h)
++{
++    assert(ehandler == NULL);
++    ehandler = h;
++}
++
++DNotify::~DNotify()
++{
++    if (pipe_read_fd >= 0)
++    {
++	//  Tell the scheduler.
++
++	(void) Scheduler::remove_read_handler(pipe_read_fd);
++
++	//  Close the pipe.
++
++	if (close(pipe_read_fd) < 0)
++	    Log::perror("can't pipe read end");
++	else
++	    Log::debug("closed pipe read end");
++	
++	if (close(pipe_write_fd) < 0)
++	    Log::perror("can't pipe write end");
++	else
++	    Log::debug("closed pipe write end");
++	pipe_read_fd = -1;
++    }
++    ehandler = NULL;
++}
++
++void
++DNotify::overflow_signal_handler(int sig, siginfo_t *si, void *data)
++{
++  char c = 'x';
++
++  {
++    char *str = "*************** overflow sigqueue ***********************\n";
++    write (STDERR_FILENO, str, strlen(str));
++  }
++
++  if (!queue_overflowed)
++  {
++      queue_overflowed = 1;
++      // Trigger the read handler
++      write(pipe_write_fd, &c, 1);
++  }
++}
++
++void
++DNotify::signal_handler(int sig, siginfo_t *si, void *data)
++{
++  int left;
++  char c = 'x';
++
++  if (queue_head <= queue_tail)
++    left = (QUEUESIZE + queue_head) - queue_tail;
++  else 
++    left = queue_head - queue_tail;
++  
++  // Must leave at least one item unused to see difference
++  // Betweeen empty and full
++  if (left <= 1)
++  {
++      queue_overflowed = 1;
++      {
++	char *str = "*************** overflow famqueue ****************\n";
++	write (STDERR_FILENO, str, strlen(str));
++      }
++  }
++  else
++  {
++      change_queue[queue_tail] = si->si_fd;
++      queue_tail = (queue_tail + 1) % QUEUESIZE;
++  }
++  
++  if (!queue_changed)
++  {
++      queue_changed = 1;
++      // Trigger the read handler
++      write(pipe_write_fd, &c, 1);
++  }
++}
++
++bool
++DNotify::is_active()
++{
++    if (pipe_read_fd == -2)
++    {
++        int filedes[2];
++	int res;
++	
++	res = pipe (filedes);
++	if (res >= 0)
++	{   Log::debug("opened pipe");
++   	    pipe_read_fd = filedes[0];
++   	    pipe_write_fd = filedes[1];
++
++	    // Setup signal handler:
++	    struct sigaction act;
++	    
++	    act.sa_sigaction = signal_handler;
++	    sigemptyset(&act.sa_mask);
++	    act.sa_flags = SA_SIGINFO;
++	    sigaction(SIGRTMIN, &act, NULL);
++
++	    // When the RT queue overflows we get a SIGIO
++	    act.sa_sigaction = overflow_signal_handler;
++	    sigemptyset(&act.sa_mask);
++	    sigaction(SIGIO, &act, NULL);
++
++	    (void) Scheduler::install_read_handler(pipe_read_fd, read_handler, NULL);
++	}
++    }
++    return pipe_read_fd >= 0;
++}
++
++DNotify::DirWatch *
++DNotify::lookup_dirwatch (int fd)
++{
++  DirWatch **p;
++  DirWatch *w;
++
++  p = dir_hashchain (fd);
++
++  while (*p)
++    {
++      w = *p;
++
++      if (w->fd == fd)
++	return w;
++
++      p = &w->hash_link;
++    }
++  
++  return *p;
++}
++
++// This colud be made faster by using another hash table.
++// But it's not that bad, since it is only used by express/revoke
++DNotify::DirWatch *
++DNotify::lookup_dirwatch (dev_t dir_dev, ino_t dir_ino)
++{
++  DirWatch *p;
++  int i;
++
++  for (i=0;i<DIR_HASHSIZE;i++)
++    {
++      p = dir_hash[i];
++      
++      while (p)
++	{
++	  if (p->dir_dev == dir_dev && p->dir_ino == dir_ino)
++	    return p;
++	  
++	  p = p->hash_link;
++	}
++    }
++  
++  return NULL;
++}
++
++DNotify::FileWatch *
++DNotify::lookup_filewatch (dev_t dev, ino_t ino)
++{
++  FileWatch **p;
++  FileWatch *w;
++
++  p = file_hashchain (dev, ino);
++
++  while (*p)
++    {
++      w = *p;
++
++      if (w->file_dev == dev && w->file_ino == ino)
++	return w;
++
++      p = &w->hash_link;
++    }
++  
++  return *p;
++}
++
++// Make sure w is not already in the hash table before calling
++// this function.
++void
++DNotify::hash_dirwatch(DirWatch *w)
++{
++  DirWatch **p;
++  p = dir_hashchain (w->fd);
++  w->hash_link = *p;
++  *p = w;
++}
++
++// Make sure w is not already in the hash table before calling
++// this function.
++void
++DNotify::hash_filewatch(FileWatch *w)
++{
++  FileWatch **p;
++  p = file_hashchain (w->file_dev, w->file_ino);
++  w->hash_link = *p;
++  *p = w;
++}
++
++void
++DNotify::unhash_dirwatch(DirWatch *w)
++{
++  DirWatch **p;
++  
++  p = dir_hashchain (w->fd);
++  
++  while (*p)
++    {
++      if (*p == w)
++	{
++	  *p = w->hash_link;
++	  break;
++	}
++      p = &(*p)->hash_link;
++    }
++  w->hash_link = NULL;
++}
++
++void
++DNotify::unhash_filewatch(FileWatch *w)
++{
++  FileWatch **p;
++  
++  p = file_hashchain (w->file_dev, w->file_ino);
++  
++  while (*p)
++    {
++      if (*p == w)
++	{
++	  *p = w->hash_link;
++	  break;
++	}
++      p = &(*p)->hash_link;
++    }
++  w->hash_link = NULL;
++}
++
++DNotify::Status
++DNotify::watch_dir(const char *notify_dir, dev_t file_dev, ino_t file_ino)
++{
++  struct stat stat;
++  dev_t dir_dev;
++  ino_t dir_ino;
++  DirWatch *dwatch;
++  FileWatch *fw;
++    
++  if (lstat (notify_dir, &stat) == -1)
++      return BAD;
++  
++  dwatch = lookup_dirwatch(stat.st_dev, stat.st_ino);
++  if (!dwatch)
++    {
++      Log::debug ("New DirWatch for %s (%x %x)\n",
++		  notify_dir, (int)stat.st_dev, (int)stat.st_ino);
++      dwatch = new DirWatch;
++      dwatch->watches = NULL;
++      dwatch->hash_link = NULL;
++      dwatch->dir_dev = stat.st_dev;
++      dwatch->dir_ino = stat.st_ino;
++      
++      dwatch->fd = open(notify_dir, O_RDONLY);
++      fcntl (dwatch->fd, F_SETSIG, SIGRTMIN);
++      if (fcntl (dwatch->fd, F_NOTIFY,
++                 (DN_MODIFY|DN_CREATE|DN_DELETE|DN_RENAME|DN_ATTRIB) 
++		  | DN_MULTISHOT) == -1) {
++	      return BAD;
++      }
++      hash_dirwatch (dwatch);
++    }
++
++  fw = lookup_filewatch (file_dev, file_ino);
++  if (fw && fw->dir_watch == dwatch)
++	return OK;
++  
++  // No old FileWatch, need to add one:
++  Log::debug("New FileWatch for %x %x\n", (int)file_dev, (int)file_ino);
++  fw = new FileWatch;
++  fw->next = dwatch->watches;
++  dwatch->watches = fw;
++  fw->file_dev = file_dev;
++  fw->file_ino = file_ino;
++  fw->dir_watch = dwatch;
++  hash_filewatch(fw);
++  return OK;
++}
++
++char *
++dirname_dup (const char *name)
++{
++  char *copy = strdup(name);
++  char *res = dirname(copy);
++  res = strdup(res);
++  free (copy);
++  return res;
++}
++
++DNotify::Status
++DNotify::express(const char *name, struct stat *status)
++{
++    struct stat stat;
++    char *notify_dir;
++    int res;
++    Status s;
++    dev_t dev;
++    ino_t ino;
++
++    Log::debug("express() name: %s\n", name);
++
++    if (!is_active())
++	return BAD;
++
++    if (::lstat (name, &stat) == -1)
++      return BAD;
++
++    dev = stat.st_dev;
++    ino = stat.st_ino;
++    
++    if ((stat.st_mode & S_IFMT) != S_IFDIR)
++	notify_dir = dirname_dup (name);
++    else
++	notify_dir = (char *)name;
++
++    s = watch_dir (notify_dir, dev, ino);
++    if (notify_dir != name)
++        free (notify_dir);
++    if (s)
++      return s;
++
++    // Check for a race condition; if someone removed or changed the
++    // file at the same time that we are expressing interest in it,
++    // revoke the interest so we don't get notifications about changes
++    // to a recycled inode that we don't otherwise care about.
++    //
++    struct stat st;
++    if (status == NULL) {
++	status = &st;
++    }
++    if (::lstat(name, status) == -1) {
++	Log::perror("stat on \"%s\" failed", name);
++	revoke(name, stat.st_dev, stat.st_ino);
++	return BAD;
++    }
++    if (status->st_dev != stat.st_dev
++	|| status->st_ino != stat.st_ino) {
++	Log::error("File \"%s\" changed between express and stat",
++		   name);
++	revoke(name, stat.st_dev, stat.st_ino);
++	return BAD;
++    }	
++
++    Log::debug("told dnotify to monitor \"%s\" = dev %d/%d, ino %d", name,
++	       major(status->st_dev), minor(status->st_dev),
++	       status->st_ino);
++    return OK;
++}
++
++DNotify::Status
++DNotify::revoke(const char *name, dev_t dev, ino_t ino)
++{
++    FileWatch *fwatch;
++    DirWatch *dwatch;
++    
++    Log::debug("revoke() name: %s, dev: %x, ino: %x\n", name, dev, ino);
++
++    if (!is_active())
++	return BAD;
++
++    // Lookup FileWatch by dev:ino, and its DirWatch.
++    fwatch = lookup_filewatch (dev, ino);
++    if (fwatch == NULL)
++	return BAD;
++    
++    dwatch = fwatch->dir_watch;
++    
++    // delete FileWatch, if last FileWatch: close fd, delete DirWatch
++    Log::debug ("Destroying FileWatch for (%x %x)\n",
++		(int)fwatch->file_dev, (int)fwatch->file_ino);
++    FileWatch **p;
++    for (p=&dwatch->watches; *p; p=&(*p)->next)
++    {
++      if (*p == fwatch)
++	{
++	  *p = (*p)->next;
++	  break;
++	}
++    }
++    unhash_filewatch(fwatch);
++    delete fwatch;
++    if (dwatch->watches == NULL)
++      {
++	Log::debug ("Destroying DirWatch for (%x %x)\n",
++		    (int)dwatch->dir_dev, (int)dwatch->dir_ino);
++	close(dwatch->fd);
++	unhash_dirwatch(dwatch);
++	delete dwatch;
++      }
++  
++    return OK;
++}
++
++
++void
++DNotify::all_watches_changed(void)
++{
++  int i;
++  FileWatch *fw;
++
++  for (i=0; i<FILE_HASHSIZE; i++)
++  {
++      fw = file_hash[i];
++      while (fw)
++      {
++	  (*ehandler)(fw->file_dev, fw->file_ino, CHANGE);
++
++	  fw = fw->hash_link;
++      }
++  }
++}
++
++
++void
++DNotify::read_handler(int fd, void *)
++{
++    static char readbuf[5000];
++    DirWatch *dw;
++    FileWatch *fw;
++    int snap_queue_tail;
++    int last_fd;
++
++    int rc = read(fd, readbuf, sizeof readbuf);
++    queue_changed = 0;
++    if (rc < 0)
++        Log::perror("pipe read");
++    else if (queue_overflowed)
++    {
++	  // There is a *slight* race condition here. Between reading
++	  // the queue_overflow flag and resetting it. But it doesn't
++	  // matter, since I'm gonna handle the overflow after reseting
++	  // anyway.
++	  queue_overflowed = false;
++
++	  // We're soon gonna check all watches anyway, so
++	  // get rid of the current queue
++	  queue_head = queue_tail;
++	  
++	  all_watches_changed ();
++    }
++    else
++    {
++	// Don't read events that happen later than
++	// the initial read. (Otherwise skipping fd's
++	// might miss some changes).
++	snap_queue_tail = queue_tail;
++	last_fd = -1;
++	while (queue_head != snap_queue_tail)
++	{
++	    fd = change_queue[queue_head];
++	    queue_head = (queue_head + 1) % QUEUESIZE;
++
++	    // Skip multiple changes to the same fd
++	    if (fd != last_fd)
++	    {
++		dw = lookup_dirwatch (fd);
++		if (dw)
++		{
++		    int n_watches, i;
++		    ChangeEventData *data;
++		    
++		    Log::debug("dnotify said dev %d/%d, ino %ld changed",
++			       major(dw->dir_dev), minor(dw->dir_dev), dw->dir_ino);
++		    
++		    n_watches = 0;
++		    for (fw=dw->watches; fw; fw=fw->next)
++			n_watches++;
++		    
++		    data = new ChangeEventData[n_watches];
++
++		    i = 0;
++		    for (fw=dw->watches; fw; fw=fw->next)
++		    {
++			data[i].file_dev = fw->file_dev;
++			data[i].file_ino = fw->file_ino;
++			i++;
++		    }
++
++		    for (i = 0; i < n_watches; i++)
++		    {
++			(*ehandler)(data[i].file_dev, data[i].file_ino, CHANGE);
++		    }
++		    
++		    delete[] data;
++		}
++	    }
++	    last_fd = fd;
++	}
++    }
++}
++
+diff -Naur fam-2.7.0.orig/src/DNotify.h fam-2.7.0/src/DNotify.h
+--- fam-2.7.0.orig/src/DNotify.h	1970-01-01 00:00:00.000000000 +0000
++++ fam-2.7.0/src/DNotify.h	2004-03-15 21:31:34.546060811 +0000
+@@ -0,0 +1,98 @@
++//  Copyright (C) 2001 Red Hat, Inc.  All Rights Reserved.
++//  Copyright (C) 1999 Silicon Graphics, Inc.  All Rights Reserved.
++//
++//  This program is free software; you can redistribute it and/or modify it
++//  under the terms of version 2 of the GNU General Public License as
++//  published by the Free Software Foundation.
++//
++//  This program is distributed in the hope that it would be useful, but
++//  WITHOUT ANY WARRANTY; without even the implied warranty of
++//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  Further, any
++//  license provided herein, whether implied or otherwise, is limited to
++//  this program in accordance with the express provisions of the GNU
++//  General Public License.  Patent licenses, if any, provided herein do not
++//  apply to combinations of this program with other product or programs, or
++//  any other product whatsoever.  This program is distributed without any
++//  warranty that the program is delivered free of the rightful claim of any
++//  third person by way of infringement or the like.  See the GNU General
++//  Public License for more details.
++//
++//  You should have received a copy of the GNU General Public License along
++//  with this program; if not, write the Free Software Foundation, Inc., 59
++//  Temple Place - Suite 330, Boston MA 02111-1307, USA.
++
++#ifndef DNotify_included
++#define DNotify_included
++
++#include "config.h"
++#include "Monitor.h"
++#include <signal.h>
++
++//  DNotify is an object encapsulating the dnotify linux fcntl.
++//  It "emulates" the IMon interface.
++//  There can only be one instantiation of the DNotify object.
++//
++//  The user of this object uses express() and revoke() to
++//  express/revoke interest in a file.  There is also
++//  a callback, the EventHandler.  When an dnotify event comes in,
++//  the EventHandler is called.
++//
++//  The user of the DNotify object is the Interest class.
++
++class DNotify : public Monitor {
++public:
++    DNotify(EventHandler h);
++    ~DNotify();
++
++    static bool is_active();
++
++    virtual Status express(const char *name, struct stat *stat_return);
++    virtual Status revoke(const char *name, dev_t dev, ino_t ino);
++
++private:
++    struct FileWatch;
++    struct DirWatch;
++    struct ChangeEventData;
++  
++    //  Class Variables
++    enum { QUEUESIZE = 1024 };
++    static int pipe_write_fd;
++    static int pipe_read_fd;
++    static int change_queue[QUEUESIZE];
++    static volatile sig_atomic_t DNotify::queue_overflowed;
++    static volatile sig_atomic_t DNotify::queue_changed;
++    static volatile int queue_head; // Only modified by read handler
++    static volatile int queue_tail; // Only modified by signal handler
++    static EventHandler ehandler;
++    static void overflow_signal_handler(int sig, siginfo_t *si, void *data);
++    static void signal_handler(int sig, siginfo_t *si, void *data);
++    static void read_handler(int fd, void *closure);
++ 
++    enum { DIR_HASHSIZE = 367 };
++    static DirWatch *dir_hash[DIR_HASHSIZE];
++    enum { FILE_HASHSIZE = 823 };
++    static FileWatch *file_hash[FILE_HASHSIZE];
++
++    static DirWatch **dir_hashchain(int fd)
++			  { return &dir_hash[(unsigned) (fd) % DIR_HASHSIZE]; }
++    static FileWatch **file_hashchain(dev_t d, ino_t i)
++			  { return &file_hash[(unsigned) (d+i) % FILE_HASHSIZE]; }
++
++    static DirWatch *lookup_dirwatch (int fd);
++    static DirWatch *lookup_dirwatch (dev_t dir_dev, ino_t dir_ino);
++    static FileWatch *lookup_filewatch (dev_t file_dev, ino_t file_ino);
++    static void hash_dirwatch(DirWatch *w);
++    static void hash_filewatch(FileWatch *w);
++    static void unhash_dirwatch(DirWatch *w);
++    static void unhash_filewatch(FileWatch *w);
++    static Status watch_dir(const char *notify_dir, dev_t file_dev, ino_t file_ino);
++
++    static void all_watches_changed(void);
++    
++    DNotify(const DNotify&);			// Do not copy
++    DNotify & operator = (const DNotify&);	//  or assign.
++};
++
++#endif /* !IMon_included */
++
++
+diff -Naur fam-2.7.0.orig/src/IMon.h fam-2.7.0/src/IMon.h
+--- fam-2.7.0.orig/src/IMon.h	2003-01-18 14:18:12.000000000 +0000
++++ fam-2.7.0/src/IMon.h	2004-03-15 21:31:34.558058615 +0000
+@@ -24,10 +24,7 @@
+ #define IMon_included
+ 
+ #include "config.h"
+-#include <sys/stat.h>
+-#include <sys/types.h>
+-
+-#include "Boolean.h"
++#include "Monitor.h"
+ 
+ struct stat;
+ 
+@@ -41,25 +38,18 @@
+ //
+ //  The user of the IMon object is the Interest class.
+ 
+-class IMon {
++class IMon : public Monitor {
+ 
+ public:
+-
+-    enum Status { OK = 0, BAD = -1 };
+-    enum Event { EXEC, EXIT, CHANGE };
+-
+-    typedef void (*EventHandler)(dev_t, ino_t, int event);
+-
+     IMon(EventHandler h);
+     ~IMon();
+ 
+     static bool is_active();
+ 
+-    Status express(const char *name, struct stat *stat_return);
+-    Status revoke(const char *name, dev_t dev, ino_t ino);
++    virtual Status express(const char *name, struct stat *stat_return);
++    virtual Status revoke(const char *name, dev_t dev, ino_t ino);
+ 
+ private:
+-
+     //  Class Variables
+ 
+     static int imonfd;
+diff -Naur fam-2.7.0.orig/src/Interest.c++ fam-2.7.0/src/Interest.c++
+--- fam-2.7.0.orig/src/Interest.c++	2003-01-18 14:18:12.000000000 +0000
++++ fam-2.7.0/src/Interest.c++	2004-03-15 21:31:34.550060079 +0000
+@@ -42,12 +42,21 @@
+ #include "Event.h"
+ #include "FileSystem.h"
+ #include "IMon.h"
++#include "DNotify.h"
+ #include "Log.h"
+ #include "Pollster.h"
+ #include "timeval.h"
+ 
+ Interest *Interest::hashtable[];
+-IMon      Interest::imon(imon_handler);
++
++#ifdef USE_DNOTIFY 
++static DNotify dnotify(Interest::monitor_handler);
++Monitor * Interest::monitor = &dnotify;
++#else
++static IMon imon(Interest::monitor_handler);
++Monitor * Interest::monitor = &imon;
++#endif
++
+ bool      Interest::xtab_verification = true;
+ 
+ Interest::Interest(const char *name, FileSystem *fs, in_addr host, ExportVerification ev)
+@@ -60,10 +69,10 @@
+       mypath_exported_to_host(ev == NO_VERIFY_EXPORTED)
+ {
+     memset(&old_stat, 0, sizeof(old_stat)); 
+-    IMon::Status s = IMon::BAD;
+ 
+-    s = imon.express(name, &old_stat);
+-    if (s != IMon::OK)
++    Monitor::Status s = Monitor::BAD;
++    s = monitor->express(name, &old_stat);
++    if (s != Monitor::OK)
+     {   int rc = lstat(name, &old_stat);
+ 	if (rc < 0)
+ 	{   Log::info("can't lstat %s", name);
+@@ -100,7 +109,7 @@
+     }
+ #endif
+ 
+-    if (exported_to_host()) fs->ll_monitor(this, s == IMon::OK);
++    if (exported_to_host()) fs->ll_monitor(this, s == Monitor::OK);
+ }
+ 
+ Interest::~Interest()
+@@ -128,7 +137,7 @@
+ 		pp = &p->hashlink;	// move to next element
+ 	    }
+ 	if (!found_same)
+-	    (void) imon.revoke(name(), dev, ino);
++	  (void) monitor->revoke(name(), dev, ino);
+     }
+ }
+ 
+@@ -147,7 +156,7 @@
+ 
+         // Express interest.
+         IMon::Status s = IMon::BAD;
+-	s = imon.express(name(), NULL);
++	s = monitor->express(name(), NULL);
+         if (s != IMon::OK) {
+             return true;
+         }
+@@ -248,23 +257,23 @@
+ }
+ 
+ void
+-Interest::imon_handler(dev_t device, ino_t inumber, int event)
++Interest::monitor_handler(dev_t device, ino_t inumber, int event)
+ {
+     assert(device || inumber);
+ 
+     for (Interest *p = *hashchain(device, inumber), *next = p; p; p = next)
+     {	next = p->hashlink;
+ 	if (p->ino == inumber && p->dev == device)
+-	{   if (event == IMon::EXEC)
++	  {   if (event == Monitor::EXEC)
+ 	    {   p->cur_exec_state = EXECUTING;
+ 		(void) p->report_exec_state();
+ 	    }
+-	    else if (event == IMon::EXIT)
++	    else if (event == Monitor::EXIT)
+ 	    {   p->cur_exec_state = NOT_EXECUTING;
+ 		(void) p->report_exec_state();
+ 	    }
+ 	    else
+-	    {   assert(event == IMon::CHANGE);
++	    {   assert(event == Monitor::CHANGE);
+ 		p->scan();
+ 	    }
+ 	}
+diff -Naur fam-2.7.0.orig/src/Interest.h fam-2.7.0/src/Interest.h
+--- fam-2.7.0.orig/src/Interest.h	2003-01-18 14:18:12.000000000 +0000
++++ fam-2.7.0/src/Interest.h	2004-03-15 21:31:34.560058249 +0000
+@@ -32,7 +32,7 @@
+ 
+ class Event;
+ class FileSystem;
+-class IMon;
++class Monitor;
+ struct stat;
+ 
+ //  Interest -- abstract base class for filesystem entities of interest.
+@@ -74,7 +74,7 @@
+ 
+     //  Public Class Method
+ 
+-    static void imon_handler(dev_t, ino_t, int event);
++    static void monitor_handler(dev_t, ino_t, int event);
+ 
+     static void enable_xtab_verification(bool enable);
+ 
+@@ -121,7 +121,7 @@
+ 
+     //  Class Variables
+ 
+-    static IMon imon;
++    static Monitor *monitor;
+     static Interest *hashtable[HASHSIZE];
+     static bool xtab_verification;
+ 
+diff -Naur fam-2.7.0.orig/src/Makefile.am fam-2.7.0/src/Makefile.am
+--- fam-2.7.0.orig/src/Makefile.am	2003-01-19 12:00:17.000000000 +0000
++++ fam-2.7.0/src/Makefile.am	2004-03-15 21:31:34.562057882 +0000
+@@ -71,7 +71,11 @@
+   main.c++ \
+   timeval.c++ \
+   timeval.h \
+-  @MONITOR_FUNCS@.c++
++  Monitor.h \
++  DNotify.h \
++  DNotify.c++ \
++  @MONITOR_FUNCS@.c++ 
+ 
+-EXTRA_famd_SOURCES = IMonIrix.c++ IMonLinux.c++ IMonNone.c++
++EXTRA_famd_SOURCES = IMonIrix.c++ IMonLinux.c++ IMonNone.c++ DNotify.c++ \
++  DNotify.h Monitor.h
+ 
+diff -Naur fam-2.7.0.orig/src/Monitor.h fam-2.7.0/src/Monitor.h
+--- fam-2.7.0.orig/src/Monitor.h	1970-01-01 00:00:00.000000000 +0000
++++ fam-2.7.0/src/Monitor.h	2004-03-15 21:31:34.564057516 +0000
+@@ -0,0 +1,57 @@
++//  Copyright (C) 2001 Red Hat, Inc.  All Rights Reserved.
++//  Copyright (C) 1999 Silicon Graphics, Inc.  All Rights Reserved.
++//  
++//  This program is free software; you can redistribute it and/or modify it
++//  under the terms of version 2 of the GNU General Public License as
++//  published by the Free Software Foundation.
++//
++//  This program is distributed in the hope that it would be useful, but
++//  WITHOUT ANY WARRANTY; without even the implied warranty of
++//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  Further, any
++//  license provided herein, whether implied or otherwise, is limited to
++//  this program in accordance with the express provisions of the GNU
++//  General Public License.  Patent licenses, if any, provided herein do not
++//  apply to combinations of this program with other product or programs, or
++//  any other product whatsoever.  This program is distributed without any
++//  warranty that the program is delivered free of the rightful claim of any
++//  third person by way of infringement or the like.  See the GNU General
++//  Public License for more details.
++//
++//  You should have received a copy of the GNU General Public License along
++//  with this program; if not, write the Free Software Foundation, Inc., 59
++//  Temple Place - Suite 330, Boston MA 02111-1307, USA.
++
++#ifndef Monitor_included
++#define Monitor_included
++
++#include "config.h"
++#include <sys/stat.h>
++#include <sys/types.h>
++
++struct stat;
++
++//  Monitor is an abstract baseclass for differend file monitoring
++//  systems. The original system used was IMon, and the Montor API
++//  is heavily influenced by that.
++//  There can only be one instantiation of the Monitor object.
++//
++//  The user of this object uses express() and revoke() to
++//  express/revoke interest in a file to imon.  There is also
++//  a callback, the EventHandler.  When an event comes in,
++//  the EventHandler is called.
++//
++//  The main implementers of the Monitor class is IMon and DNotify
++
++class Monitor {
++public:
++
++    enum Status { OK = 0, BAD = -1 };
++    enum Event { EXEC, EXIT, CHANGE };
++
++    typedef void (*EventHandler)(dev_t, ino_t, int event);
++
++    virtual Status express(const char *name, struct stat *stat_return) = 0;
++    virtual Status revoke(const char *name, dev_t dev, ino_t ino) = 0;
++};
++
++#endif /* !Monitor_included */
Index: scripts/untested/blfs-patches/fam-2.7.0-dnotify.patch
===================================================================
--- scripts/untested/blfs-patches/fam-2.7.0-dnotify.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/fam-2.7.0-dnotify.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,975 @@
+--- fam-2.7.0/src/DNotify.c++	2004-01-30 00:00:00.000000000 +0100
++++ fam-2.7.0.dnotify/src/DNotify.c++	2004-01-30 00:00:00.000000000 +0100
+@@ -0,0 +1,582 @@
++//  Copyright (C) 2001 Red Hat, Inc.  All Rights Reserved.
++//  Copyright (C) 1999 Silicon Graphics, Inc.  All Rights Reserved.
++//  
++//  This program is free software; you can redistribute it and/or modify it
++//  under the terms of version 2 of the GNU General Public License as
++//  published by the Free Software Foundation.
++//
++//  This program is distributed in the hope that it would be useful, but
++//  WITHOUT ANY WARRANTY; without even the implied warranty of
++//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  Further, any
++//  license provided herein, whether implied or otherwise, is limited to
++//  this program in accordance with the express provisions of the GNU
++//  General Public License.  Patent licenses, if any, provided herein do not
++//  apply to combinations of this program with other product or programs, or
++//  any other product whatsoever.  This program is distributed without any
++//  warranty that the program is delivered free of the rightful claim of any
++//  third person by way of infringement or the like.  See the GNU General
++//  Public License for more details.
++//
++//  You should have received a copy of the GNU General Public License along
++//  with this program; if not, write the Free Software Foundation, Inc., 59
++//  Temple Place - Suite 330, Boston MA 02111-1307, USA.
++
++#define _GNU_SOURCE  
++#include <fcntl.h>
++
++#include <string.h>
++#include <signal.h>
++#include <stdio.h>
++#include <unistd.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <libgen.h>
++
++#include "DNotify.h"
++
++#include "Interest.h"
++#include "Log.h"
++#include "Scheduler.h"
++#include <memory>
++
++
++int DNotify::pipe_write_fd = -2;
++int DNotify::pipe_read_fd = -2;
++volatile sig_atomic_t DNotify::queue_overflowed = 0;
++volatile sig_atomic_t DNotify::queue_changed = 0;
++int DNotify::change_queue[QUEUESIZE];
++volatile int DNotify::queue_head = 0; // Only modified by read handler
++volatile int DNotify::queue_tail = 0; // Only modified by signal handler
++DNotify::EventHandler DNotify::ehandler;
++
++DNotify::DirWatch *DNotify::dir_hash[DIR_HASHSIZE];
++DNotify::FileWatch *DNotify::file_hash[FILE_HASHSIZE];
++
++struct DNotify::FileWatch
++{
++    DirWatch *dir_watch;
++    dev_t file_dev;
++    ino_t file_ino;
++    FileWatch *next; // The DirWatch.watches list
++    FileWatch *hash_link;
++};
++
++struct DNotify::DirWatch
++{
++    int fd;
++    dev_t dir_dev;
++    ino_t dir_ino;
++    
++    DirWatch *hash_link;
++    FileWatch *watches;
++};
++
++struct DNotify::ChangeEventData
++{
++    dev_t file_dev;
++    ino_t file_ino;
++};    
++
++DNotify::DNotify(EventHandler h)
++{
++    assert(ehandler == NULL);
++    ehandler = h;
++}
++
++DNotify::~DNotify()
++{
++    if (pipe_read_fd >= 0)
++    {
++	//  Tell the scheduler.
++
++	(void) Scheduler::remove_read_handler(pipe_read_fd);
++
++	//  Close the pipe.
++
++	if (close(pipe_read_fd) < 0)
++	    Log::perror("can't pipe read end");
++	else
++	    Log::debug("closed pipe read end");
++	
++	if (close(pipe_write_fd) < 0)
++	    Log::perror("can't pipe write end");
++	else
++	    Log::debug("closed pipe write end");
++	pipe_read_fd = -1;
++    }
++    ehandler = NULL;
++}
++
++void
++DNotify::overflow_signal_handler(int sig, siginfo_t *si, void *data)
++{
++  char c = 'x';
++
++  {
++    char *str = "*************** overflow sigqueue ***********************\n";
++    write (STDERR_FILENO, str, strlen(str));
++  }
++
++  if (!queue_overflowed)
++  {
++      queue_overflowed = 1;
++      // Trigger the read handler
++      write(pipe_write_fd, &c, 1);
++  }
++}
++
++void
++DNotify::signal_handler(int sig, siginfo_t *si, void *data)
++{
++  int left;
++  char c = 'x';
++
++  if (queue_head <= queue_tail)
++    left = (QUEUESIZE + queue_head) - queue_tail;
++  else 
++    left = queue_head - queue_tail;
++  
++  // Must leave at least one item unused to see difference
++  // Betweeen empty and full
++  if (left <= 1)
++  {
++      queue_overflowed = 1;
++      {
++	char *str = "*************** overflow famqueue ****************\n";
++	write (STDERR_FILENO, str, strlen(str));
++      }
++  }
++  else
++  {
++      change_queue[queue_tail] = si->si_fd;
++      queue_tail = (queue_tail + 1) % QUEUESIZE;
++  }
++  
++  if (!queue_changed)
++  {
++      queue_changed = 1;
++      // Trigger the read handler
++      write(pipe_write_fd, &c, 1);
++  }
++}
++
++bool
++DNotify::is_active()
++{
++    if (pipe_read_fd == -2)
++    {
++        int filedes[2];
++	int res;
++	
++	res = pipe (filedes);
++	if (res >= 0)
++	{   Log::debug("opened pipe");
++   	    pipe_read_fd = filedes[0];
++   	    pipe_write_fd = filedes[1];
++
++	    // Setup signal handler:
++	    struct sigaction act;
++	    
++	    act.sa_sigaction = signal_handler;
++	    sigemptyset(&act.sa_mask);
++	    act.sa_flags = SA_SIGINFO;
++	    sigaction(SIGRTMIN, &act, NULL);
++
++	    // When the RT queue overflows we get a SIGIO
++	    act.sa_sigaction = overflow_signal_handler;
++	    sigemptyset(&act.sa_mask);
++	    sigaction(SIGIO, &act, NULL);
++
++	    (void) Scheduler::install_read_handler(pipe_read_fd, read_handler, NULL);
++	}
++    }
++    return pipe_read_fd >= 0;
++}
++
++DNotify::DirWatch *
++DNotify::lookup_dirwatch (int fd)
++{
++  DirWatch **p;
++  DirWatch *w;
++
++  p = dir_hashchain (fd);
++
++  while (*p)
++    {
++      w = *p;
++
++      if (w->fd == fd)
++	return w;
++
++      p = &w->hash_link;
++    }
++  
++  return *p;
++}
++
++// This colud be made faster by using another hash table.
++// But it's not that bad, since it is only used by express/revoke
++DNotify::DirWatch *
++DNotify::lookup_dirwatch (dev_t dir_dev, ino_t dir_ino)
++{
++  DirWatch *p;
++  int i;
++
++  for (i=0;i<DIR_HASHSIZE;i++)
++    {
++      p = dir_hash[i];
++      
++      while (p)
++	{
++	  if (p->dir_dev == dir_dev && p->dir_ino == dir_ino)
++	    return p;
++	  
++	  p = p->hash_link;
++	}
++    }
++  
++  return NULL;
++}
++
++DNotify::FileWatch *
++DNotify::lookup_filewatch (dev_t dev, ino_t ino)
++{
++  FileWatch **p;
++  FileWatch *w;
++
++  p = file_hashchain (dev, ino);
++
++  while (*p)
++    {
++      w = *p;
++
++      if (w->file_dev == dev && w->file_ino == ino)
++	return w;
++
++      p = &w->hash_link;
++    }
++  
++  return *p;
++}
++
++// Make sure w is not already in the hash table before calling
++// this function.
++void
++DNotify::hash_dirwatch(DirWatch *w)
++{
++  DirWatch **p;
++  p = dir_hashchain (w->fd);
++  w->hash_link = *p;
++  *p = w;
++}
++
++// Make sure w is not already in the hash table before calling
++// this function.
++void
++DNotify::hash_filewatch(FileWatch *w)
++{
++  FileWatch **p;
++  p = file_hashchain (w->file_dev, w->file_ino);
++  w->hash_link = *p;
++  *p = w;
++}
++
++void
++DNotify::unhash_dirwatch(DirWatch *w)
++{
++  DirWatch **p;
++  
++  p = dir_hashchain (w->fd);
++  
++  while (*p)
++    {
++      if (*p == w)
++	{
++	  *p = w->hash_link;
++	  break;
++	}
++      p = &(*p)->hash_link;
++    }
++  w->hash_link = NULL;
++}
++
++void
++DNotify::unhash_filewatch(FileWatch *w)
++{
++  FileWatch **p;
++  
++  p = file_hashchain (w->file_dev, w->file_ino);
++  
++  while (*p)
++    {
++      if (*p == w)
++	{
++	  *p = w->hash_link;
++	  break;
++	}
++      p = &(*p)->hash_link;
++    }
++  w->hash_link = NULL;
++}
++
++DNotify::Status
++DNotify::watch_dir(const char *notify_dir, dev_t file_dev, ino_t file_ino)
++{
++  struct stat stat;
++  dev_t dir_dev;
++  ino_t dir_ino;
++  DirWatch *dwatch;
++  FileWatch *fw;
++    
++  if (lstat (notify_dir, &stat) == -1)
++      return BAD;
++  
++  dwatch = lookup_dirwatch(stat.st_dev, stat.st_ino);
++  if (!dwatch)
++    {
++      Log::debug ("New DirWatch for %s (%x %x)\n",
++		  notify_dir, (int)stat.st_dev, (int)stat.st_ino);
++      dwatch = new DirWatch;
++      dwatch->watches = NULL;
++      dwatch->hash_link = NULL;
++      dwatch->dir_dev = stat.st_dev;
++      dwatch->dir_ino = stat.st_ino;
++      
++      dwatch->fd = open(notify_dir, O_RDONLY);
++      fcntl (dwatch->fd, F_SETSIG, SIGRTMIN);
++      if (fcntl (dwatch->fd, F_NOTIFY,
++                 (DN_MODIFY|DN_CREATE|DN_DELETE|DN_RENAME|DN_ATTRIB) 
++		  | DN_MULTISHOT) == -1) {
++	      return BAD;
++      }
++      hash_dirwatch (dwatch);
++    }
++
++  fw = lookup_filewatch (file_dev, file_ino);
++  if (fw && fw->dir_watch == dwatch)
++	return OK;
++  
++  // No old FileWatch, need to add one:
++  Log::debug("New FileWatch for %x %x\n", (int)file_dev, (int)file_ino);
++  fw = new FileWatch;
++  fw->next = dwatch->watches;
++  dwatch->watches = fw;
++  fw->file_dev = file_dev;
++  fw->file_ino = file_ino;
++  fw->dir_watch = dwatch;
++  hash_filewatch(fw);
++  return OK;
++}
++
++char *
++dirname_dup (const char *name)
++{
++  char *copy = strdup(name);
++  char *res = dirname(copy);
++  res = strdup(res);
++  free (copy);
++  return res;
++}
++
++DNotify::Status
++DNotify::express(const char *name, struct stat *status)
++{
++    struct stat stat;
++    char *notify_dir;
++    int res;
++    Status s;
++    dev_t dev;
++    ino_t ino;
++
++    Log::debug("express() name: %s\n", name);
++
++    if (!is_active())
++	return BAD;
++
++    if (::lstat (name, &stat) == -1)
++      return BAD;
++
++    dev = stat.st_dev;
++    ino = stat.st_ino;
++    
++    if ((stat.st_mode & S_IFMT) != S_IFDIR)
++	notify_dir = dirname_dup (name);
++    else
++	notify_dir = (char *)name;
++
++    s = watch_dir (notify_dir, dev, ino);
++    if (notify_dir != name)
++        free (notify_dir);
++    if (s)
++      return s;
++
++    // Check for a race condition; if someone removed or changed the
++    // file at the same time that we are expressing interest in it,
++    // revoke the interest so we don't get notifications about changes
++    // to a recycled inode that we don't otherwise care about.
++    //
++    struct stat st;
++    if (status == NULL) {
++	status = &st;
++    }
++    if (::lstat(name, status) == -1) {
++	Log::perror("stat on \"%s\" failed", name);
++	revoke(name, stat.st_dev, stat.st_ino);
++	return BAD;
++    }
++    if (status->st_dev != stat.st_dev
++	|| status->st_ino != stat.st_ino) {
++	Log::error("File \"%s\" changed between express and stat",
++		   name);
++	revoke(name, stat.st_dev, stat.st_ino);
++	return BAD;
++    }	
++
++    Log::debug("told dnotify to monitor \"%s\" = dev %d/%d, ino %d", name,
++	       major(status->st_dev), minor(status->st_dev),
++	       status->st_ino);
++    return OK;
++}
++
++DNotify::Status
++DNotify::revoke(const char *name, dev_t dev, ino_t ino)
++{
++    FileWatch *fwatch;
++    DirWatch *dwatch;
++    
++    Log::debug("revoke() name: %s, dev: %x, ino: %x\n", name, dev, ino);
++
++    if (!is_active())
++	return BAD;
++
++    // Lookup FileWatch by dev:ino, and its DirWatch.
++    fwatch = lookup_filewatch (dev, ino);
++    if (fwatch == NULL)
++	return BAD;
++    
++    dwatch = fwatch->dir_watch;
++    
++    // delete FileWatch, if last FileWatch: close fd, delete DirWatch
++    Log::debug ("Destroying FileWatch for (%x %x)\n",
++		(int)fwatch->file_dev, (int)fwatch->file_ino);
++    FileWatch **p;
++    for (p=&dwatch->watches; *p; p=&(*p)->next)
++    {
++      if (*p == fwatch)
++	{
++	  *p = (*p)->next;
++	  break;
++	}
++    }
++    unhash_filewatch(fwatch);
++    delete fwatch;
++    if (dwatch->watches == NULL)
++      {
++	Log::debug ("Destroying DirWatch for (%x %x)\n",
++		    (int)dwatch->dir_dev, (int)dwatch->dir_ino);
++	close(dwatch->fd);
++	unhash_dirwatch(dwatch);
++	delete dwatch;
++      }
++  
++    return OK;
++}
++
++
++void
++DNotify::all_watches_changed(void)
++{
++  int i;
++  FileWatch *fw;
++
++  for (i=0; i<FILE_HASHSIZE; i++)
++  {
++      fw = file_hash[i];
++      while (fw)
++      {
++	  (*ehandler)(fw->file_dev, fw->file_ino, CHANGE);
++
++	  fw = fw->hash_link;
++      }
++  }
++}
++
++
++void
++DNotify::read_handler(int fd, void *)
++{
++    static char readbuf[5000];
++    DirWatch *dw;
++    FileWatch *fw;
++    int snap_queue_tail;
++    int last_fd;
++
++    int rc = read(fd, readbuf, sizeof readbuf);
++    queue_changed = 0;
++    if (rc < 0)
++        Log::perror("pipe read");
++    else if (queue_overflowed)
++    {
++	  // There is a *slight* race condition here. Between reading
++	  // the queue_overflow flag and resetting it. But it doesn't
++	  // matter, since I'm gonna handle the overflow after reseting
++	  // anyway.
++	  queue_overflowed = false;
++
++	  // We're soon gonna check all watches anyway, so
++	  // get rid of the current queue
++	  queue_head = queue_tail;
++	  
++	  all_watches_changed ();
++    }
++    else
++    {
++	// Don't read events that happen later than
++	// the initial read. (Otherwise skipping fd's
++	// might miss some changes).
++	snap_queue_tail = queue_tail;
++	last_fd = -1;
++	while (queue_head != snap_queue_tail)
++	{
++	    fd = change_queue[queue_head];
++	    queue_head = (queue_head + 1) % QUEUESIZE;
++
++	    // Skip multiple changes to the same fd
++	    if (fd != last_fd)
++	    {
++		dw = lookup_dirwatch (fd);
++		if (dw)
++		{
++		    int n_watches, i;
++		    ChangeEventData *data;
++		    
++		    Log::debug("dnotify said dev %d/%d, ino %ld changed",
++			       major(dw->dir_dev), minor(dw->dir_dev), dw->dir_ino);
++		    
++		    n_watches = 0;
++		    for (fw=dw->watches; fw; fw=fw->next)
++			n_watches++;
++		    
++		    data = new ChangeEventData[n_watches];
++
++		    i = 0;
++		    for (fw=dw->watches; fw; fw=fw->next)
++		    {
++			data[i].file_dev = fw->file_dev;
++			data[i].file_ino = fw->file_ino;
++			i++;
++		    }
++
++		    for (i = 0; i < n_watches; i++)
++		    {
++			(*ehandler)(data[i].file_dev, data[i].file_ino, CHANGE);
++		    }
++		    
++		    delete[] data;
++		}
++	    }
++	    last_fd = fd;
++	}
++    }
++}
++
+--- fam-2.7.0/src/DNotify.h	2004-01-30 00:00:00.000000000 +0100
++++ fam-2.7.0.dnotify/src/DNotify.h	2004-01-30 00:00:00.000000000 +0100
+@@ -0,0 +1,98 @@
++//  Copyright (C) 2001 Red Hat, Inc.  All Rights Reserved.
++//  Copyright (C) 1999 Silicon Graphics, Inc.  All Rights Reserved.
++//
++//  This program is free software; you can redistribute it and/or modify it
++//  under the terms of version 2 of the GNU General Public License as
++//  published by the Free Software Foundation.
++//
++//  This program is distributed in the hope that it would be useful, but
++//  WITHOUT ANY WARRANTY; without even the implied warranty of
++//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  Further, any
++//  license provided herein, whether implied or otherwise, is limited to
++//  this program in accordance with the express provisions of the GNU
++//  General Public License.  Patent licenses, if any, provided herein do not
++//  apply to combinations of this program with other product or programs, or
++//  any other product whatsoever.  This program is distributed without any
++//  warranty that the program is delivered free of the rightful claim of any
++//  third person by way of infringement or the like.  See the GNU General
++//  Public License for more details.
++//
++//  You should have received a copy of the GNU General Public License along
++//  with this program; if not, write the Free Software Foundation, Inc., 59
++//  Temple Place - Suite 330, Boston MA 02111-1307, USA.
++
++#ifndef DNotify_included
++#define DNotify_included
++
++#include "config.h"
++#include "Monitor.h"
++#include <signal.h>
++
++//  DNotify is an object encapsulating the dnotify linux fcntl.
++//  It "emulates" the IMon interface.
++//  There can only be one instantiation of the DNotify object.
++//
++//  The user of this object uses express() and revoke() to
++//  express/revoke interest in a file.  There is also
++//  a callback, the EventHandler.  When an dnotify event comes in,
++//  the EventHandler is called.
++//
++//  The user of the DNotify object is the Interest class.
++
++class DNotify : public Monitor {
++public:
++    DNotify(EventHandler h);
++    ~DNotify();
++
++    static bool is_active();
++
++    virtual Status express(const char *name, struct stat *stat_return);
++    virtual Status revoke(const char *name, dev_t dev, ino_t ino);
++
++private:
++    struct FileWatch;
++    struct DirWatch;
++    struct ChangeEventData;
++  
++    //  Class Variables
++    enum { QUEUESIZE = 1024 };
++    static int pipe_write_fd;
++    static int pipe_read_fd;
++    static int change_queue[QUEUESIZE];
++    static volatile sig_atomic_t DNotify::queue_overflowed;
++    static volatile sig_atomic_t DNotify::queue_changed;
++    static volatile int queue_head; // Only modified by read handler
++    static volatile int queue_tail; // Only modified by signal handler
++    static EventHandler ehandler;
++    static void overflow_signal_handler(int sig, siginfo_t *si, void *data);
++    static void signal_handler(int sig, siginfo_t *si, void *data);
++    static void read_handler(int fd, void *closure);
++ 
++    enum { DIR_HASHSIZE = 367 };
++    static DirWatch *dir_hash[DIR_HASHSIZE];
++    enum { FILE_HASHSIZE = 823 };
++    static FileWatch *file_hash[FILE_HASHSIZE];
++
++    static DirWatch **dir_hashchain(int fd)
++			  { return &dir_hash[(unsigned) (fd) % DIR_HASHSIZE]; }
++    static FileWatch **file_hashchain(dev_t d, ino_t i)
++			  { return &file_hash[(unsigned) (d+i) % FILE_HASHSIZE]; }
++
++    static DirWatch *lookup_dirwatch (int fd);
++    static DirWatch *lookup_dirwatch (dev_t dir_dev, ino_t dir_ino);
++    static FileWatch *lookup_filewatch (dev_t file_dev, ino_t file_ino);
++    static void hash_dirwatch(DirWatch *w);
++    static void hash_filewatch(FileWatch *w);
++    static void unhash_dirwatch(DirWatch *w);
++    static void unhash_filewatch(FileWatch *w);
++    static Status watch_dir(const char *notify_dir, dev_t file_dev, ino_t file_ino);
++
++    static void all_watches_changed(void);
++    
++    DNotify(const DNotify&);			// Do not copy
++    DNotify & operator = (const DNotify&);	//  or assign.
++};
++
++#endif /* !IMon_included */
++
++
+--- fam-2.7.0/src/Interest.c++	2004-01-30 00:00:00.000000000 +0100
++++ fam-2.7.0.dnotify/src/Interest.c++	2004-01-30 00:00:00.000000000 +0100
+@@ -42,12 +42,21 @@
+ #include "Event.h"
+ #include "FileSystem.h"
+ #include "IMon.h"
++#include "DNotify.h"
+ #include "Log.h"
+ #include "Pollster.h"
+ #include "timeval.h"
+ 
+ Interest *Interest::hashtable[];
+-IMon      Interest::imon(imon_handler);
++
++#ifdef USE_DNOTIFY 
++static DNotify dnotify(Interest::monitor_handler);
++Monitor * Interest::monitor = &dnotify;
++#else
++static IMon imon(Interest::monitor_handler);
++Monitor * Interest::monitor = &imon;
++#endif
++
+ bool      Interest::xtab_verification = true;
+ 
+ Interest::Interest(const char *name, FileSystem *fs, in_addr host, ExportVerification ev)
+@@ -60,10 +69,10 @@
+       mypath_exported_to_host(ev == NO_VERIFY_EXPORTED)
+ {
+     memset(&old_stat, 0, sizeof(old_stat)); 
+-    IMon::Status s = IMon::BAD;
+ 
+-    s = imon.express(name, &old_stat);
+-    if (s != IMon::OK)
++    Monitor::Status s = Monitor::BAD;
++    s = monitor->express(name, &old_stat);
++    if (s != Monitor::OK)
+     {   int rc = lstat(name, &old_stat);
+ 	if (rc < 0)
+ 	{   Log::info("can't lstat %s", name);
+@@ -100,7 +109,7 @@
+     }
+ #endif
+ 
+-    if (exported_to_host()) fs->ll_monitor(this, s == IMon::OK);
++    if (exported_to_host()) fs->ll_monitor(this, s == Monitor::OK);
+ }
+ 
+ Interest::~Interest()
+@@ -128,7 +137,7 @@
+ 		pp = &p->hashlink;	// move to next element
+ 	    }
+ 	if (!found_same)
+-	    (void) imon.revoke(name(), dev, ino);
++	  (void) monitor->revoke(name(), dev, ino);
+     }
+ }
+ 
+@@ -147,7 +156,7 @@
+ 
+         // Express interest.
+         IMon::Status s = IMon::BAD;
+-	s = imon.express(name(), NULL);
++	s = monitor->express(name(), NULL);
+         if (s != IMon::OK) {
+             return true;
+         }
+@@ -248,23 +257,23 @@
+ }
+ 
+ void
+-Interest::imon_handler(dev_t device, ino_t inumber, int event)
++Interest::monitor_handler(dev_t device, ino_t inumber, int event)
+ {
+     assert(device || inumber);
+ 
+     for (Interest *p = *hashchain(device, inumber), *next = p; p; p = next)
+     {	next = p->hashlink;
+ 	if (p->ino == inumber && p->dev == device)
+-	{   if (event == IMon::EXEC)
++	  {   if (event == Monitor::EXEC)
+ 	    {   p->cur_exec_state = EXECUTING;
+ 		(void) p->report_exec_state();
+ 	    }
+-	    else if (event == IMon::EXIT)
++	    else if (event == Monitor::EXIT)
+ 	    {   p->cur_exec_state = NOT_EXECUTING;
+ 		(void) p->report_exec_state();
+ 	    }
+ 	    else
+-	    {   assert(event == IMon::CHANGE);
++	    {   assert(event == Monitor::CHANGE);
+ 		p->scan();
+ 	    }
+ 	}
+--- fam-2.7.0/config.h.in	2003-01-20 01:40:15.000000000 +0100
++++ fam-2.7.0.dnotify/config.h.in	2004-01-30 13:50:33.000000000 +0100
+@@ -180,3 +180,6 @@
+ 
+ /* Define to `int' if <sys/types.h> doesn't define. */
+ #undef uid_t
++
++/* Define to 1 if you have F_NOTIFY fcntl */
++#undef USE_DNOTIFY
+--- fam-2.7.0/configure.ac	2003-11-26 20:47:59.000000000 +0100
++++ fam-2.7.0.dnotify/configure.ac	2004-01-30 13:50:33.000000000 +0100
+@@ -34,7 +34,26 @@
+ AC_HEADER_DIRENT
+ AC_CHECK_HEADERS([fcntl.h limits.h linux/imon.h netinet/in.h rpc/rpc.h rpcsvc/mount.h stddef.h stdlib.h string.h syslog.h sys/imon.h sys/param.h sys/select.h sys/statvfs.h sys/syssgi.h sys/time.h sys/types.h sys/un.h unistd.h])
+ 
+-if test "$have_sys_imon_h"; then
++# Test for the linux dnotify fcntl
++AC_MSG_CHECKING([for dnotify fcntl support])
++AC_TRY_COMPILE([
++#define _GNU_SOURCE  
++#include <fcntl.h>
++#include <unistd.h>
++],
++[ int fd = 1;
++  fcntl (fd, F_NOTIFY, (DN_MODIFY|DN_CREATE|DN_DELETE|DN_RENAME|DN_ATTRIB)
++                       |DN_MULTISHOT);
++], have_dnotify=yes, have_dnotify=no)
++
++use_dnotify=false
++AC_MSG_RESULT($have_dnotify)
++
++if test "$have_dnotify"; then
++        MONITOR_FUNCS=IMonNone
++        AC_DEFINE([USE_DNOTIFY], [], [Use dnotify])
++	use_dnotify=true
++elif test "$have_sys_imon_h"; then
+ 	MONITOR_FUNCS=IMonIRIX
+ elif test "$have_linux_imon_h"; then
+ 	MONITOR_FUNCS=IMonLinux
+@@ -42,6 +62,7 @@
+ 	MONITOR_FUNCS=IMonNone
+ fi
+ AC_SUBST(MONITOR_FUNCS)
++AM_CONDITIONAL(USE_DNOTIFY, $use_dnotify)
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_HEADER_STDBOOL
+--- fam-2.7.0/src/IMon.h	2004-01-30 00:00:00.000000000 +0200
++++ fam-2.7.0.dnotify/src/IMon.h	2004-01-30 00:00:00.000000000 +0200
+@@ -24,10 +24,7 @@
+ #define IMon_included
+ 
+ #include "config.h"
+-#include <sys/stat.h>
+-#include <sys/types.h>
+-
+-#include "Boolean.h"
++#include "Monitor.h"
+ 
+ struct stat;
+ 
+@@ -41,25 +38,18 @@
+ //
+ //  The user of the IMon object is the Interest class.
+ 
+-class IMon {
++class IMon : public Monitor {
+ 
+ public:
+-
+-    enum Status { OK = 0, BAD = -1 };
+-    enum Event { EXEC, EXIT, CHANGE };
+-
+-    typedef void (*EventHandler)(dev_t, ino_t, int event);
+-
+     IMon(EventHandler h);
+     ~IMon();
+ 
+     static bool is_active();
+ 
+-    Status express(const char *name, struct stat *stat_return);
+-    Status revoke(const char *name, dev_t dev, ino_t ino);
++    virtual Status express(const char *name, struct stat *stat_return);
++    virtual Status revoke(const char *name, dev_t dev, ino_t ino);
+ 
+ private:
+-
+     //  Class Variables
+ 
+     static int imonfd;
+--- fam-2.7.0/src/Interest.h	2004-01-30 00:00:00.000000000 +0200
++++ fam-2.7.0.dnotify/src/Interest.h	2004-01-30 00:00:00.000000000 +0200
+@@ -32,7 +32,7 @@
+ 
+ class Event;
+ class FileSystem;
+-class IMon;
++class Monitor;
+ struct stat;
+ 
+ //  Interest -- abstract base class for filesystem entities of interest.
+@@ -74,7 +74,7 @@
+ 
+     //  Public Class Method
+ 
+-    static void imon_handler(dev_t, ino_t, int event);
++    static void monitor_handler(dev_t, ino_t, int event);
+ 
+     static void enable_xtab_verification(bool enable);
+ 
+@@ -121,7 +121,7 @@
+ 
+     //  Class Variables
+ 
+-    static IMon imon;
++    static Monitor *monitor;
+     static Interest *hashtable[HASHSIZE];
+     static bool xtab_verification;
+ 
+--- fam-2.7.0/src/Makefile.am	2003-01-19 13:00:17.000000000 +0100
++++ fam-2.7.0.dnotify/src/Makefile.am	2004-01-30 13:50:38.000000000 +0100
+@@ -71,7 +71,11 @@
+   main.c++ \
+   timeval.c++ \
+   timeval.h \
+-  @MONITOR_FUNCS@.c++
++  Monitor.h \
++  DNotify.h \
++  DNotify.c++ \
++  @MONITOR_FUNCS@.c++ 
+ 
+-EXTRA_famd_SOURCES = IMonIrix.c++ IMonLinux.c++ IMonNone.c++
++EXTRA_famd_SOURCES = IMonIrix.c++ IMonLinux.c++ IMonNone.c++ DNotify.c++ \
++  DNotify.h Monitor.h
+ 
+--- fam-2.7.0/src/Monitor.h	2004-01-30 00:00:00.000000000 +0200
++++ fam-2.7.0.dnotify/src/Monitor.h	2004-01-30 00:00:00.000000000 +0200
+@@ -0,0 +1,57 @@
++//  Copyright (C) 2001 Red Hat, Inc.  All Rights Reserved.
++//  Copyright (C) 1999 Silicon Graphics, Inc.  All Rights Reserved.
++//  
++//  This program is free software; you can redistribute it and/or modify it
++//  under the terms of version 2 of the GNU General Public License as
++//  published by the Free Software Foundation.
++//
++//  This program is distributed in the hope that it would be useful, but
++//  WITHOUT ANY WARRANTY; without even the implied warranty of
++//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  Further, any
++//  license provided herein, whether implied or otherwise, is limited to
++//  this program in accordance with the express provisions of the GNU
++//  General Public License.  Patent licenses, if any, provided herein do not
++//  apply to combinations of this program with other product or programs, or
++//  any other product whatsoever.  This program is distributed without any
++//  warranty that the program is delivered free of the rightful claim of any
++//  third person by way of infringement or the like.  See the GNU General
++//  Public License for more details.
++//
++//  You should have received a copy of the GNU General Public License along
++//  with this program; if not, write the Free Software Foundation, Inc., 59
++//  Temple Place - Suite 330, Boston MA 02111-1307, USA.
++
++#ifndef Monitor_included
++#define Monitor_included
++
++#include "config.h"
++#include <sys/stat.h>
++#include <sys/types.h>
++
++struct stat;
++
++//  Monitor is an abstract baseclass for differend file monitoring
++//  systems. The original system used was IMon, and the Montor API
++//  is heavily influenced by that.
++//  There can only be one instantiation of the Monitor object.
++//
++//  The user of this object uses express() and revoke() to
++//  express/revoke interest in a file to imon.  There is also
++//  a callback, the EventHandler.  When an event comes in,
++//  the EventHandler is called.
++//
++//  The main implementers of the Monitor class is IMon and DNotify
++
++class Monitor {
++public:
++
++    enum Status { OK = 0, BAD = -1 };
++    enum Event { EXEC, EXIT, CHANGE };
++
++    typedef void (*EventHandler)(dev_t, ino_t, int event);
++
++    virtual Status express(const char *name, struct stat *stat_return) = 0;
++    virtual Status revoke(const char *name, dev_t dev, ino_t ino) = 0;
++};
++
++#endif /* !Monitor_included */
Index: scripts/untested/blfs-patches/freeglut-2.2.0-update_ltmain-1.patch
===================================================================
--- scripts/untested/blfs-patches/freeglut-2.2.0-update_ltmain-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/freeglut-2.2.0-update_ltmain-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1342 @@
+diff -uNr freeglut-2.2.0-orig/ltmain.sh freeglut-2.2.0/ltmain.sh
+--- freeglut-2.2.0-orig/ltmain.sh	2003-12-11 12:33:40.000000000 +1100
++++ freeglut-2.2.0/ltmain.sh	2005-01-26 22:43:00.635525269 +1100
+@@ -48,18 +48,15 @@
+   exit 0
+ fi
+ 
+-# define SED for historic ltconfig's generated by Libtool 1.3
+-test -z "$SED" && SED=sed
+-
+ # The name of this program.
+-progname=`$echo "$0" | ${SED} 's%^.*/%%'`
++progname=`$echo "$0" | sed 's%^.*/%%'`
+ modename="$progname"
+ 
+ # Constants.
+ PROGRAM=ltmain.sh
+ PACKAGE=libtool
+-VERSION=1.4.3
+-TIMESTAMP=" (1.922.2.110 2002/10/23 01:39:54)"
++VERSION=1.4.2
++TIMESTAMP=" (1.922.2.54 2001/09/11 03:33:37)"
+ 
+ default_mode=
+ help="Try \`$progname --help' for more information."
+@@ -70,19 +67,10 @@
+ 
+ # Sed substitution that helps us do robust quoting.  It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed="${SED}"' -e 1s/^X//'
++Xsed='sed -e 1s/^X//'
+ sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
+-# test EBCDIC or ASCII                                                         
+-case `echo A|od -x` in                                                         
+- *[Cc]1*) # EBCDIC based system                                                
+-  SP2NL="tr '\100' '\n'"                                                       
+-  NL2SP="tr '\r\n' '\100\100'"                                                 
+-  ;;                                                                           
+- *) # Assume ASCII based system                                                
+-  SP2NL="tr '\040' '\012'"                                                     
+-  NL2SP="tr '\015\012' '\040\040'"                                             
+-  ;;                                                                           
+-esac                                                                           
++SP2NL='tr \040 \012'
++NL2SP='tr \015\012 \040\040'
+ 
+ # NLS nuisances.
+ # Only set LANG and LC_ALL to C if already set.
+@@ -156,7 +144,7 @@
+     ;;
+ 
+   --config)
+-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
++    sed -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
+     exit 0
+     ;;
+ 
+@@ -219,17 +207,6 @@
+   exit 1
+ fi
+ 
+-# Mandrake: (gc) It's bad to link C++ code with GCC, so we need to use the compiler name if provided
+-if test "$mode" = link && test -n "$archive_cmds" && test -x "/usr/bin/perl"; then
+-    case $nonopt in
+-    *cc | *++ | gcc* | *-gcc* | egcs*)
+-	    archive_cmds=`echo $archive_cmds | perl -pe 's/^\S+\s+//'`
+-	    archive_cmds="$nonopt $archive_cmds"
+-	    archive_expsym_cmds=`echo $archive_expsym_cmds | perl -pe 's/^\S+\s+//'`
+-	    archive_expsym_cmds="$nonopt $archive_expsym_cmds"
+-    esac
+-fi
+-
+ # If this variable is set in any of the actions, the command in it
+ # will be execed at the end.  This prevents here-documents from being
+ # left over by shells.
+@@ -240,7 +217,7 @@
+   # Infer the operation mode.
+   if test -z "$mode"; then
+     case $nonopt in
+-    *cc | *++ | gcc* | *-gcc* | xlc*)
++    *cc | *++ | gcc* | *-gcc*)
+       mode=link
+       for arg
+       do
+@@ -782,6 +759,7 @@
+     linker_flags=
+     dllsearchpath=
+     lib_search_path=`pwd`
++    inst_prefix_dir=
+ 
+     avoid_version=no
+     dlfiles=
+@@ -912,6 +890,11 @@
+ 	  prev=
+ 	  continue
+ 	  ;;
++        inst_prefix)
++	  inst_prefix_dir="$arg"
++	  prev=
++	  continue
++	  ;;
+ 	release)
+ 	  release="-$arg"
+ 	  prev=
+@@ -1013,11 +996,16 @@
+ 	continue
+ 	;;
+ 
++      -inst-prefix-dir)
++	prev=inst_prefix
++	continue
++	;;
++
+       # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+       # so, if we see these flags be careful not to treat them like -L
+       -L[A-Z][A-Z]*:*)
+ 	case $with_gcc/$host in
+-	no/*-*-irix* | no/*-*-nonstopux*)
++	no/*-*-irix*)
+ 	  compile_command="$compile_command $arg"
+ 	  finalize_command="$finalize_command $arg"
+ 	  ;;
+@@ -1068,14 +1056,14 @@
+ 	    # These systems don't actually have a C library (as such)
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+-	  *-*-openbsd* | *-*-freebsd*)
++	  *-*-openbsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+ 	  esac
+ 	 elif test "X$arg" = "X-lc_r"; then
+ 	  case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
++	  *-*-openbsd*)
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+@@ -1328,11 +1316,11 @@
+       output_objdir="$output_objdir/$objdir"
+     fi
+     # Create the object directory.
+-    if test ! -d $output_objdir; then
++    if test ! -d "$output_objdir"; then
+       $show "$mkdir $output_objdir"
+       $run $mkdir $output_objdir
+       status=$?
+-      if test $status -ne 0 && test ! -d $output_objdir; then
++      if test "$status" -ne 0 && test ! -d "$output_objdir"; then
+ 	exit $status
+       fi
+     fi
+@@ -1362,6 +1350,25 @@
+       fi
+       libs="$libs $deplib"
+     done
++
++    if test "$linkmode" = lib; then
++      libs="$predeps $libs $compiler_lib_search_path $postdeps"
++
++      # Compute libraries that are listed more than once in $predeps
++      # $postdeps and mark them as special (i.e., whose duplicates are
++      # not to be eliminated).
++      pre_post_deps=
++      if test "X$duplicate_deps" = "Xyes" ; then
++	for pre_post_dep in $predeps $postdeps; do
++	  case "$pre_post_deps " in
++	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
++	  esac
++	  pre_post_deps="$pre_post_deps $pre_post_dep"
++	done
++      fi
++      pre_post_deps=
++    fi
++
+     deplibs=
+     newdependency_libs=
+     newlib_search_path=
+@@ -1393,7 +1400,7 @@
+ 	;;
+     esac
+     for pass in $passes; do
+-      if test $linkmode = prog; then
++      if test "$linkmode" = prog; then
+ 	# Determine which files to process
+ 	case $pass in
+ 	dlopen)
+@@ -1410,11 +1417,11 @@
+ 	found=no
+ 	case $deplib in
+ 	-l*)
+-	  if test $linkmode = oldlib && test $linkmode = obj; then
++	  if test "$linkmode" = oldlib && test "$linkmode" = obj; then
+ 	    $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
+ 	    continue
+ 	  fi
+-	  if test $pass = conv; then
++	  if test "$pass" = conv; then
+ 	    deplibs="$deplib $deplibs"
+ 	    continue
+ 	  fi
+@@ -1434,7 +1441,7 @@
+ 	      finalize_deplibs="$deplib $finalize_deplibs"
+ 	    else
+ 	      deplibs="$deplib $deplibs"
+-	      test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
++	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ 	    fi
+ 	    continue
+ 	  fi
+@@ -1443,16 +1450,16 @@
+ 	  case $linkmode in
+ 	  lib)
+ 	    deplibs="$deplib $deplibs"
+-	    test $pass = conv && continue
++	    test "$pass" = conv && continue
+ 	    newdependency_libs="$deplib $newdependency_libs"
+ 	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ 	    ;;
+ 	  prog)
+-	    if test $pass = conv; then
++	    if test "$pass" = conv; then
+ 	      deplibs="$deplib $deplibs"
+ 	      continue
+ 	    fi
+-	    if test $pass = scan; then
++	    if test "$pass" = scan; then
+ 	      deplibs="$deplib $deplibs"
+ 	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ 	    else
+@@ -1467,7 +1474,7 @@
+ 	  continue
+ 	  ;; # -L
+ 	-R*)
+-	  if test $pass = link; then
++	  if test "$pass" = link; then
+ 	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
+ 	    # Make sure the xrpath contains only unique directories.
+ 	    case "$xrpath " in
+@@ -1480,7 +1487,7 @@
+ 	  ;;
+ 	*.la) lib="$deplib" ;;
+ 	*.$libext)
+-	  if test $pass = conv; then
++	  if test "$pass" = conv; then
+ 	    deplibs="$deplib $deplibs"
+ 	    continue
+ 	  fi
+@@ -1488,12 +1495,10 @@
+ 	  lib)
+ 	    if test "$deplibs_check_method" != pass_all; then
+ 	      echo
+-	      echo "*** Warning: Trying to link with static lib archive $deplib."
++	      echo "*** Warning: This library needs some functionality provided by $deplib."
+ 	      echo "*** I have the capability to make that library automatically link in when"
+ 	      echo "*** you link to this library.  But I can only do this if you have a"
+-	      echo "*** shared version of the library, which you do not appear to have"
+-	      echo "*** because the file extensions .$libext of this argument makes me believe"
+-	      echo "*** that it is just a static archive that I should not used here."
++	      echo "*** shared version of the library, which you do not appear to have."
+ 	    else
+ 	      echo
+ 	      echo "*** Warning: Linking the shared library $output against the"
+@@ -1503,7 +1508,7 @@
+ 	    continue
+ 	    ;;
+ 	  prog)
+-	    if test $pass != link; then
++	    if test "$pass" != link; then
+ 	      deplibs="$deplib $deplibs"
+ 	    else
+ 	      compile_deplibs="$deplib $compile_deplibs"
+@@ -1514,7 +1519,7 @@
+ 	  esac # linkmode
+ 	  ;; # *.$libext
+ 	*.lo | *.$objext)
+-	  if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
++	  if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+ 	    # If there is no dlopen support or we're linking statically,
+ 	    # we need to preload.
+ 	    newdlprefiles="$newdlprefiles $deplib"
+@@ -1530,14 +1535,14 @@
+ 	  continue
+ 	  ;;
+ 	esac # case $deplib
+-	if test $found = yes || test -f "$lib"; then :
++	if test "$found" = yes || test -f "$lib"; then :
+ 	else
+ 	  $echo "$modename: cannot find the library \`$lib'" 1>&2
+ 	  exit 1
+ 	fi
+ 
+ 	# Check to see that this really is a libtool archive.
+-	if (${SED} -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
++	if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ 	else
+ 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ 	  exit 1
+@@ -1564,13 +1569,13 @@
+ 
+ 	if test "$linkmode,$pass" = "lib,link" ||
+ 	   test "$linkmode,$pass" = "prog,scan" ||
+-	   { test $linkmode = oldlib && test $linkmode = obj; }; then
++	   { test "$linkmode" = oldlib && test "$linkmode" = obj; }; then
+ 	   # Add dl[pre]opened files of deplib
+ 	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+ 	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+ 	fi
+ 
+-	if test $pass = conv; then
++	if test "$pass" = conv; then
+ 	  # Only check for convenience libraries
+ 	  deplibs="$lib $deplibs"
+ 	  if test -z "$libdir"; then
+@@ -1591,7 +1596,7 @@
+               fi
+ 	      tmp_libs="$tmp_libs $deplib"
+ 	    done
+-	  elif test $linkmode != prog && test $linkmode != lib; then
++	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ 	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
+ 	    exit 1
+ 	  fi
+@@ -1609,7 +1614,7 @@
+ 	fi
+ 
+ 	# This library was specified with -dlopen.
+-	if test $pass = dlopen; then
++	if test "$pass" = dlopen; then
+ 	  if test -z "$libdir"; then
+ 	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
+ 	    exit 1
+@@ -1658,7 +1663,7 @@
+ 	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+ 
+ 	# This library was specified with -dlpreopen.
+-	if test $pass = dlpreopen; then
++	if test "$pass" = dlpreopen; then
+ 	  if test -z "$libdir"; then
+ 	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
+ 	    exit 1
+@@ -1677,7 +1682,7 @@
+ 
+ 	if test -z "$libdir"; then
+ 	  # Link the convenience library
+-	  if test $linkmode = lib; then
++	  if test "$linkmode" = lib; then
+ 	    deplibs="$dir/$old_library $deplibs"
+ 	  elif test "$linkmode,$pass" = "prog,link"; then
+ 	    compile_deplibs="$dir/$old_library $compile_deplibs"
+@@ -1688,7 +1693,7 @@
+ 	  continue
+ 	fi
+ 
+-	if test $linkmode = prog && test $pass != link; then
++	if test "$linkmode" = prog && test "$pass" != link; then
+ 	  newlib_search_path="$newlib_search_path $ladir"
+ 	  deplibs="$lib $deplibs"
+ 
+@@ -1704,7 +1709,7 @@
+ 	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
+ 	    esac
+ 	    # Need to link against all dependency_libs?
+-	    if test $linkalldeplibs = yes; then
++	    if test "$linkalldeplibs" = yes; then
+ 	      deplibs="$deplib $deplibs"
+ 	    else
+ 	      # Need to hardcode shared library paths
+@@ -1727,7 +1732,7 @@
+ 	  # Link against this shared library
+ 
+ 	  if test "$linkmode,$pass" = "prog,link" ||
+-	   { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
++	   { test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then
+ 	    # Hardcode the library path.
+ 	    # Skip directories that are in the system default run-time
+ 	    # search path.
+@@ -1749,7 +1754,7 @@
+ 	      esac
+ 	      ;;
+ 	    esac
+-	    if test $linkmode = prog; then
++	    if test "$linkmode" = prog; then
+ 	      # We need to hardcode the library path
+ 	      if test -n "$shlibpath_var"; then
+ 		# Make sure the rpath contains only unique directories.
+@@ -1799,8 +1804,8 @@
+ 
+ 	    # Make a new name for the extract_expsyms_cmds to use
+ 	    soroot="$soname"
+-	    soname=`echo $soroot | ${SED} -e 's/^.*\///'`
+-	    newlib="libimp-`echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
++	    soname=`echo $soroot | sed -e 's/^.*\///'`
++	    newlib="libimp-`echo $soname | sed 's/^lib//;s/\.dll$//'`.a"
+ 
+ 	    # If the library has no export list, then create one now
+ 	    if test -f "$output_objdir/$soname-def"; then :
+@@ -1831,9 +1836,9 @@
+ 	    # make sure the library variables are pointing to the new library
+ 	    dir=$output_objdir
+ 	    linklib=$newlib
+-	  fi # test -n $old_archive_from_expsyms_cmds
++	  fi # test -n "$old_archive_from_expsyms_cmds"
+ 
+-	  if test $linkmode = prog || test "$mode" != relink; then
++	  if test "$linkmode" = prog || test "$mode" != relink; then
+ 	    add_shlibpath=
+ 	    add_dir=
+ 	    add=
+@@ -1882,7 +1887,7 @@
+ 	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+ 	      esac
+ 	    fi
+-	    if test $linkmode = prog; then
++	    if test "$linkmode" = prog; then
+ 	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+ 	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
+ 	    else
+@@ -1899,7 +1904,7 @@
+ 	    fi
+ 	  fi
+ 
+-	  if test $linkmode = prog || test "$mode" = relink; then
++	  if test "$linkmode" = prog || test "$mode" = relink; then
+ 	    add_shlibpath=
+ 	    add_dir=
+ 	    add=
+@@ -1907,7 +1912,16 @@
+ 	    if test "$hardcode_direct" = yes; then
+ 	      add="$libdir/$linklib"
+ 	    elif test "$hardcode_minus_L" = yes; then
+-	      add_dir="-L$libdir"
++	      # Try looking first in the location we're being installed to.
++	      add_dir=
++	      if test -n "$inst_prefix_dir"; then
++		case "$libdir" in
++		[\\/]*)
++		  add_dir="-L$inst_prefix_dir$libdir"
++		  ;;
++		esac
++	      fi
++	      add_dir="$add_dir -L$libdir"
+ 	      add="-l$name"
+ 	    elif test "$hardcode_shlibpath_var" = yes; then
+ 	      case :$finalize_shlibpath: in
+@@ -1917,11 +1931,20 @@
+ 	      add="-l$name"
+ 	    else
+ 	      # We cannot seem to hardcode it, guess we'll fake it.
+-	      add_dir="-L$libdir"
++	      # Try looking first in the location we're being installed to.
++	      add_dir=
++	      if test -n "$inst_prefix_dir"; then
++		case "$libdir" in
++		[\\/]*)
++		  add_dir="-L$inst_prefix_dir$libdir"
++		  ;;
++		esac
++	      fi
++	      add_dir="$add_dir -L$libdir"
+ 	      add="-l$name"
+ 	    fi
+ 
+-	    if test $linkmode = prog; then
++	    if test "$linkmode" = prog; then
+ 	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+ 	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+ 	    else
+@@ -1929,7 +1952,7 @@
+ 	      test -n "$add" && deplibs="$add $deplibs"
+ 	    fi
+ 	  fi
+-	elif test $linkmode = prog; then
++	elif test "$linkmode" = prog; then
+ 	  if test "$alldeplibs" = yes &&
+ 	     { test "$deplibs_check_method" = pass_all ||
+ 	       { test "$build_libtool_libs" = yes &&
+@@ -1959,14 +1982,13 @@
+ 	    # Just print a warning and add the library to dependency_libs so
+ 	    # that the program can be linked against the static library.
+ 	    echo
+-	    echo "*** Warning: This system can not link to static lib archive $lib."
++	    echo "*** Warning: This library needs some functionality provided by $lib."
+ 	    echo "*** I have the capability to make that library automatically link in when"
+ 	    echo "*** you link to this library.  But I can only do this if you have a"
+ 	    echo "*** shared version of the library, which you do not appear to have."
+ 	    if test "$module" = yes; then
+-	      echo "*** But as you try to build a module library, libtool will still create "
+-	      echo "*** a static module, that should work as long as the dlopening application"
+-	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
++	      echo "*** Therefore, libtool will create a static module, that should work "
++	      echo "*** as long as the dlopening application is linked with the -dlopen flag."
+ 	      if test -z "$global_symbol_pipe"; then
+ 		echo
+ 		echo "*** However, this would only work if libtool was able to extract symbol"
+@@ -1989,10 +2011,10 @@
+ 	  fi
+ 	fi # link shared/static library?
+ 
+-	if test $linkmode = lib; then
++	if test "$linkmode" = lib; then
+ 	  if test -n "$dependency_libs" &&
+-	     { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
+-	       test $link_static = yes; }; then
++	     { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
++	       test "$link_static" = yes; }; then
+ 	    # Extract -R from dependency_libs
+ 	    temp_deplibs=
+ 	    for libdir in $dependency_libs; do
+@@ -2023,7 +2045,7 @@
+ 	    tmp_libs="$tmp_libs $deplib"
+ 	  done
+ 
+-	  if test $link_all_deplibs != no; then
++	  if test "$link_all_deplibs" != no; then
+ 	    # Add the search paths of all dependency libraries
+ 	    for deplib in $dependency_libs; do
+ 	      case $deplib in
+@@ -2045,7 +2067,7 @@
+ 		if grep "^installed=no" $deplib > /dev/null; then
+ 		  path="-L$absdir/$objdir"
+ 		else
+-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++		  eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ 		  if test -z "$libdir"; then
+ 		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+ 		    exit 1
+@@ -2066,15 +2088,15 @@
+ 	  fi # link_all_deplibs != no
+ 	fi # linkmode = lib
+       done # for deplib in $libs
+-      if test $pass = dlpreopen; then
++      if test "$pass" = dlpreopen; then
+ 	# Link the dlpreopened libraries before other libraries
+ 	for deplib in $save_deplibs; do
+ 	  deplibs="$deplib $deplibs"
+ 	done
+       fi
+-      if test $pass != dlopen; then
+-	test $pass != scan && dependency_libs="$newdependency_libs"
+-	if test $pass != conv; then
++      if test "$pass" != dlopen; then
++	test "$pass" != scan && dependency_libs="$newdependency_libs"
++	if test "$pass" != conv; then
+ 	  # Make sure lib_search_path contains only unique directories.
+ 	  lib_search_path=
+ 	  for dir in $newlib_search_path; do
+@@ -2132,7 +2154,7 @@
+ 	deplibs=
+       fi
+     done # for pass
+-    if test $linkmode = prog; then
++    if test "$linkmode" = prog; then
+       dlfiles="$newdlfiles"
+       dlprefiles="$newdlprefiles"
+     fi
+@@ -2209,7 +2231,7 @@
+       fi
+ 
+       set dummy $rpath
+-      if test $# -gt 2; then
++      if test "$#" -gt 2; then
+ 	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
+       fi
+       install_libdir="$2"
+@@ -2250,7 +2272,7 @@
+ 
+ 	# Check that each of the things are valid numbers.
+ 	case $current in
+-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++	[0-9]*) ;;
+ 	*)
+ 	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+@@ -2259,7 +2281,7 @@
+ 	esac
+ 
+ 	case $revision in
+-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++	[0-9]*) ;;
+ 	*)
+ 	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+@@ -2268,7 +2290,7 @@
+ 	esac
+ 
+ 	case $age in
+-	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++	[0-9]*) ;;
+ 	*)
+ 	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+@@ -2276,7 +2298,7 @@
+ 	  ;;
+ 	esac
+ 
+-	if test $age -gt $current; then
++	if test "$age" -gt "$current"; then
+ 	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+ 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+ 	  exit 1
+@@ -2309,21 +2331,16 @@
+ 	  versuffix=".$current";
+ 	  ;;
+ 
+-	irix | nonstopux)
++	irix)
+ 	  major=`expr $current - $age + 1`
+-
+-	  case $version_type in
+-	    nonstopux) verstring_prefix=nonstopux ;;
+-	    *)         verstring_prefix=sgi ;;
+-	  esac
+-	  verstring="$verstring_prefix$major.$revision"
++	  verstring="sgi$major.$revision"
+ 
+ 	  # Add in all the interfaces that we are compatible with.
+ 	  loop=$revision
+-	  while test $loop != 0; do
++	  while test "$loop" -ne 0; do
+ 	    iface=`expr $revision - $loop`
+ 	    loop=`expr $loop - 1`
+-	    verstring="$verstring_prefix$major.$iface:$verstring"
++	    verstring="sgi$major.$iface:$verstring"
+ 	  done
+ 
+ 	  # Before this point, $major must not contain `.'.
+@@ -2337,13 +2354,13 @@
+ 	  ;;
+ 
+ 	osf)
+-	  major=.`expr $current - $age`
++	  major=`expr $current - $age`
+ 	  versuffix=".$current.$age.$revision"
+ 	  verstring="$current.$age.$revision"
+ 
+ 	  # Add in all the interfaces that we are compatible with.
+ 	  loop=$age
+-	  while test $loop != 0; do
++	  while test "$loop" -ne 0; do
+ 	    iface=`expr $current - $loop`
+ 	    loop=`expr $loop - 1`
+ 	    verstring="$verstring:${iface}.0"
+@@ -2429,9 +2446,9 @@
+ 
+       # Eliminate all temporary directories.
+       for path in $notinst_path; do
+-	lib_search_path=`echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
+-	deplibs=`echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
+-	dependency_libs=`echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
++	lib_search_path=`echo "$lib_search_path " | sed -e 's% $path % %g'`
++	deplibs=`echo "$deplibs " | sed -e 's% -L$path % %g'`
++	dependency_libs=`echo "$dependency_libs " | sed -e 's% -L$path % %g'`
+       done
+ 
+       if test -n "$xrpath"; then
+@@ -2444,7 +2461,7 @@
+ 	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+ 	  esac
+ 	done
+-	if test $hardcode_into_libs != yes || test $build_old_libs = yes; then
++	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+ 	  dependency_libs="$temp_xrpath $dependency_libs"
+ 	fi
+       fi
+@@ -2482,12 +2499,12 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
+-	  *-*-openbsd* | *-*-freebsd*)
++	  *-*-openbsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+-	    if test $build_libtool_need_lc = "yes"; then
++	    if test "$build_libtool_need_lc" = "yes"; then
+ 	      deplibs="$deplibs -lc"
+ 	    fi
+ 	    ;;
+@@ -2528,7 +2545,7 @@
+ EOF
+ 	  $rm conftest
+ 	  $CC -o conftest conftest.c $deplibs
+-	  if test $? -eq 0 ; then
++	  if test "$?" -eq 0 ; then
+ 	    ldd_output=`ldd conftest`
+ 	    for i in $deplibs; do
+ 	      name="`expr $i : '-l\(.*\)'`"
+@@ -2543,20 +2560,18 @@
+ 		else
+ 		  droppeddeps=yes
+ 		  echo
+-		  echo "*** Warning: dynamic linker does not accept needed library $i."
++		  echo "*** Warning: This library needs some functionality provided by $i."
+ 		  echo "*** I have the capability to make that library automatically link in when"
+ 		  echo "*** you link to this library.  But I can only do this if you have a"
+-		  echo "*** shared version of the library, which I believe you do not have"
+-		  echo "*** because a test_compile did reveal that the linker did not use it for"
+-		  echo "*** its dynamic dependency list that programs get resolved with at runtime."
++		  echo "*** shared version of the library, which you do not appear to have."
+ 		fi
+ 	      else
+ 		newdeplibs="$newdeplibs $i"
+ 	      fi
+ 	    done
+ 	  else
+-	    # Error occured in the first compile.  Let's try to salvage
+-	    # the situation: Compile a separate program for each library.
++	    # Error occured in the first compile.  Let's try to salvage the situation:
++	    # Compile a seperate program for each library.
+ 	    for i in $deplibs; do
+ 	      name="`expr $i : '-l\(.*\)'`"
+ 	     # If $name is empty we are operating on a -L argument.
+@@ -2564,7 +2579,7 @@
+ 		$rm conftest
+ 		$CC -o conftest conftest.c $i
+ 		# Did it work?
+-		if test $? -eq 0 ; then
++		if test "$?" -eq 0 ; then
+ 		  ldd_output=`ldd conftest`
+ 		  libname=`eval \\$echo \"$libname_spec\"`
+ 		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
+@@ -2575,12 +2590,10 @@
+ 		  else
+ 		    droppeddeps=yes
+ 		    echo
+-		    echo "*** Warning: dynamic linker does not accept needed library $i."
++		    echo "*** Warning: This library needs some functionality provided by $i."
+ 		    echo "*** I have the capability to make that library automatically link in when"
+ 		    echo "*** you link to this library.  But I can only do this if you have a"
+-		    echo "*** shared version of the library, which you do not appear to have"
+-		    echo "*** because a test_compile did reveal that the linker did not use this one"
+-		    echo "*** as a dynamic dependency that programs can get resolved with at runtime."
++		    echo "*** shared version of the library, which you do not appear to have."
+ 		  fi
+ 		else
+ 		  droppeddeps=yes
+@@ -2619,21 +2632,14 @@
+ 		      # but so what?
+ 		      potlib="$potent_lib"
+ 		      while test -h "$potlib" 2>/dev/null; do
+-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
++			potliblink=`ls -ld $potlib | sed 's/.* -> //'`
+ 			case $potliblink in
+ 			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
+ 			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+ 			esac
+ 		      done
+-		      # It is ok to link against an archive when
+-		      # building a shared library.
+-		      if $AR -t $potlib > /dev/null 2>&1; then
+-		        newdeplibs="$newdeplibs $a_deplib"
+-		        a_deplib=""
+-		        break 2
+-		      fi
+ 		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
+-			 | ${SED} 10q \
++			 | sed 10q \
+ 			 | egrep "$file_magic_regex" > /dev/null; then
+ 			newdeplibs="$newdeplibs $a_deplib"
+ 			a_deplib=""
+@@ -2644,17 +2650,10 @@
+ 	      if test -n "$a_deplib" ; then
+ 		droppeddeps=yes
+ 		echo
+-		echo "*** Warning: linker path does not have real file for library $a_deplib."
++		echo "*** Warning: This library needs some functionality provided by $a_deplib."
+ 		echo "*** I have the capability to make that library automatically link in when"
+ 		echo "*** you link to this library.  But I can only do this if you have a"
+-		echo "*** shared version of the library, which you do not appear to have"
+-		echo "*** because I did check the linker path looking for a file starting"
+-		if test -z "$potlib" ; then
+-		  echo "*** with $libname but no candidates were found. (...for file magic test)"
+-		else
+-		  echo "*** with $libname and none of the candidates passed a file format test"
+-		  echo "*** using a file magic. Last file checked: $potlib"
+-		fi
++		echo "*** shared version of the library, which you do not appear to have."
+ 	      fi
+ 	    else
+ 	      # Add a -L argument.
+@@ -2673,9 +2672,8 @@
+ 	      for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+ 		potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+ 		for potent_lib in $potential_libs; do
+-		  potlib="$potent_lib" # see symlink-check below in file_magic test
+ 		  if eval echo \"$potent_lib\" 2>/dev/null \
+-		      | ${SED} 10q \
++		      | sed 10q \
+ 		      | egrep "$match_pattern_regex" > /dev/null; then
+ 		    newdeplibs="$newdeplibs $a_deplib"
+ 		    a_deplib=""
+@@ -2686,17 +2684,10 @@
+ 	      if test -n "$a_deplib" ; then
+ 		droppeddeps=yes
+ 		echo
+-		echo "*** Warning: linker path does not have real file for library $a_deplib."
++		echo "*** Warning: This library needs some functionality provided by $a_deplib."
+ 		echo "*** I have the capability to make that library automatically link in when"
+ 		echo "*** you link to this library.  But I can only do this if you have a"
+-		echo "*** shared version of the library, which you do not appear to have"
+-		echo "*** because I did check the linker path looking for a file starting"
+-		if test -z "$potlib" ; then
+-		  echo "*** with $libname but no candidates were found. (...for regex pattern test)"
+-		else
+-		  echo "*** with $libname and none of the candidates passed a file format test"
+-		  echo "*** using a regex pattern. Last file checked: $potlib"
+-		fi
++		echo "*** shared version of the library, which you do not appear to have."
+ 	      fi
+ 	    else
+ 	      # Add a -L argument.
+@@ -2759,7 +2750,7 @@
+ 	    echo "*** automatically added whenever a program is linked with this library"
+ 	    echo "*** or is declared to -dlopen it."
+ 
+-	    if test $allow_undefined = no; then
++	    if test "$allow_undefined" = no; then
+ 	      echo
+ 	      echo "*** Since this library must not contain undefined symbols,"
+ 	      echo "*** because either the platform does not support them or"
+@@ -2786,7 +2777,7 @@
+ 
+       # Test again, we may have decided not to build it any more
+       if test "$build_libtool_libs" = yes; then
+-	if test $hardcode_into_libs = yes; then
++	if test "$hardcode_into_libs" = yes; then
+ 	  # Hardcode the library paths
+ 	  hardcode_libdirs=
+ 	  dep_rpath=
+@@ -2917,7 +2908,7 @@
+ 	    $show "mkdir $gentop"
+ 	    $run mkdir "$gentop"
+ 	    status=$?
+-	    if test $status -ne 0 && test ! -d "$gentop"; then
++	    if test "$status" -ne 0 && test ! -d "$gentop"; then
+ 	      exit $status
+ 	    fi
+ 	    generated="$generated $gentop"
+@@ -2936,7 +2927,7 @@
+ 	      $show "mkdir $xdir"
+ 	      $run mkdir "$xdir"
+ 	      status=$?
+-	      if test $status -ne 0 && test ! -d "$xdir"; then
++	      if test "$status" -ne 0 && test ! -d "$xdir"; then
+ 		exit $status
+ 	      fi
+ 	      $show "(cd $xdir && $AR x $xabs)"
+@@ -2961,18 +2952,7 @@
+ 	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+ 	  eval cmds=\"$archive_expsym_cmds\"
+ 	else
+-	  save_deplibs="$deplibs"
+-	  for conv in $convenience; do
+-	    tmp_deplibs=
+-	    for test_deplib in $deplibs; do
+-	      if test "$test_deplib" != "$conv"; then
+-		tmp_deplibs="$tmp_deplibs $test_deplib"
+-	      fi
+-	    done
+-	    deplibs="$tmp_deplibs"
+-	  done
+ 	  eval cmds=\"$archive_cmds\"
+-	  deplibs="$save_deplibs"
+ 	fi
+ 	save_ifs="$IFS"; IFS='~'
+ 	for cmd in $cmds; do
+@@ -3067,7 +3047,7 @@
+ 	  $show "mkdir $gentop"
+ 	  $run mkdir "$gentop"
+ 	  status=$?
+-	  if test $status -ne 0 && test ! -d "$gentop"; then
++	  if test "$status" -ne 0 && test ! -d "$gentop"; then
+ 	    exit $status
+ 	  fi
+ 	  generated="$generated $gentop"
+@@ -3086,7 +3066,7 @@
+ 	    $show "mkdir $xdir"
+ 	    $run mkdir "$xdir"
+ 	    status=$?
+-	    if test $status -ne 0 && test ! -d "$xdir"; then
++	    if test "$status" -ne 0 && test ! -d "$xdir"; then
+ 	      exit $status
+ 	    fi
+ 	    $show "(cd $xdir && $AR x $xabs)"
+@@ -3171,7 +3151,7 @@
+ 
+     prog)
+       case $host in
+-	*cygwin*) output=`echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
++	*cygwin*) output=`echo $output | sed -e 's,.exe$,,;s,$,.exe,'` ;;
+       esac
+       if test -n "$vinfo"; then
+ 	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
+@@ -3193,13 +3173,6 @@
+ 	# On Rhapsody replace the C library is the System framework
+ 	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ 	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+-	case $host in
+-	*darwin*)
+-	  # Don't allow lazy linking, it breaks C++ global constructors
+-	  compile_command="$compile_command ${wl}-bind_at_load"
+-	  finalize_command="$finalize_command ${wl}-bind_at_load"
+-	  ;;
+-	esac
+ 	;;
+       esac
+ 
+@@ -3366,9 +3339,9 @@
+ 	    if test -z "$export_symbols"; then
+ 	      export_symbols="$output_objdir/$output.exp"
+ 	      $run $rm $export_symbols
+-	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
++	      $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+ 	    else
+-	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
++	      $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
+ 	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
+ 	      $run eval 'mv "$nlist"T "$nlist"'
+ 	    fi
+@@ -3376,7 +3349,7 @@
+ 
+ 	  for arg in $dlprefiles; do
+ 	    $show "extracting global C symbols from \`$arg'"
+-	    name=`echo "$arg" | ${SED} -e 's%^.*/%%'`
++	    name=`echo "$arg" | sed -e 's%^.*/%%'`
+ 	    $run eval 'echo ": $name " >> "$nlist"'
+ 	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
+ 	  done
+@@ -3391,13 +3364,7 @@
+ 	    fi
+ 
+ 	    # Try sorting and uniquifying the output.
+-	    if grep -v "^: " < "$nlist" |
+-		if sort -k 3 </dev/null >/dev/null 2>&1; then
+-		  sort -k 3
+-		else
+-		  sort +2
+-		fi |
+-		uniq > "$nlist"S; then
++	    if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then
+ 	      :
+ 	    else
+ 	      grep -v "^: " < "$nlist" > "$nlist"S
+@@ -3494,7 +3461,7 @@
+ 	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+       fi
+ 
+-      if test $need_relink = no || test "$build_libtool_libs" != yes; then
++      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+ 	# Replace the output file specification.
+ 	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ 	link_command="$compile_command$compile_rpath"
+@@ -3639,7 +3606,7 @@
+ 	# win32 will think the script is a binary if it has
+ 	# a .exe suffix, so we strip it off here.
+ 	case $output in
+-	  *.exe) output=`echo $output|${SED} 's,.exe$,,'` ;;
++	  *.exe) output=`echo $output|sed 's,.exe$,,'` ;;
+ 	esac
+ 	# test for cygwin because mv fails w/o .exe extensions
+ 	case $host in
+@@ -3663,7 +3630,7 @@
+ 
+ # Sed substitution that helps us do robust quoting.  It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed="${SED}"' -e 1s/^X//'
++Xsed='sed -e 1s/^X//'
+ sed_quote_subst='$sed_quote_subst'
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+@@ -3701,7 +3668,7 @@
+   test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+ 
+   # Follow symbolic links until we get to the real thisdir.
+-  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
++  file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\`
+   while test -n \"\$file\"; do
+     destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+ 
+@@ -3714,7 +3681,7 @@
+     fi
+ 
+     file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
++    file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\`
+   done
+ 
+   # Try to get the absolute directory name.
+@@ -3728,7 +3695,7 @@
+   progdir=\"\$thisdir/$objdir\"
+ 
+   if test ! -f \"\$progdir/\$program\" || \\
+-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
++     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\
+        test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+ 
+     file=\"\$\$-\$program\"
+@@ -3774,7 +3741,7 @@
+     $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+ 
+     # Some systems cannot cope with colon-terminated $shlibpath_var
+-    # The second colon is a workaround for a bug in BeOS R4 ${SED}
++    # The second colon is a workaround for a bug in BeOS R4 sed
+     $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+ 
+     export $shlibpath_var
+@@ -3862,7 +3829,7 @@
+ 	$show "mkdir $gentop"
+ 	$run mkdir "$gentop"
+ 	status=$?
+-	if test $status -ne 0 && test ! -d "$gentop"; then
++	if test "$status" -ne 0 && test ! -d "$gentop"; then
+ 	  exit $status
+ 	fi
+ 	generated="$generated $gentop"
+@@ -3882,7 +3849,7 @@
+ 	  $show "mkdir $xdir"
+ 	  $run mkdir "$xdir"
+ 	  status=$?
+-	  if test $status -ne 0 && test ! -d "$xdir"; then
++	  if test "$status" -ne 0 && test ! -d "$xdir"; then
+ 	    exit $status
+ 	  fi
+ 	  $show "(cd $xdir && $AR x $xabs)"
+@@ -3949,7 +3916,7 @@
+ 	fi
+       done
+       # Quote the link command for shipping.
+-      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args)"
++      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
+       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ 
+       # Only create the output if not a dry run.
+@@ -3966,58 +3933,21 @@
+ 	      case $deplib in
+ 	      *.la)
+ 		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
+-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
++		eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ 		if test -z "$libdir"; then
+ 		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+ 		  exit 1
+ 		fi
+-		# We do not want portage's install root ($D) present.  Check only for
+-		# this if the .la is being installed.
+-		if test "$installed" = yes && test "$D"; then
+-		  eval mynewdependency_lib="`echo "$libdir/$name" |sed -e "s:$D::g" -e 's://:/:g'`"
+-		else
+-		  mynewdependency_lib="$libdir/$name"
+-		fi
+-		# Do not add duplicates
+-		if test "$mynewdependency_lib"; then
+-		  if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then
+-		    newdependency_libs="$newdependency_libs $mynewdependency_lib"
+-		  fi
+-		fi
+-		;;
+-		  *)
+-		if test "$installed" = yes; then
+-   	  # Rather use S=WORKDIR if our version of portage supports it.
+-   	  # This is because some ebuild (gcc) do not use $S as buildroot.
+-		  if test "$PWORKDIR"; then
+-		    S="$PWORKDIR"
+-		  fi
+-		  # We do not want portage's build root ($S) present.
+-		  if test -n "`echo $deplib |grep -e "$S"`" && test "$S"; then
+-		    mynewdependency_lib=""
+-		  # We do not want portage's install root ($D) present.
+-		  elif test -n "`echo $deplib |grep -e "$D"`" && test "$D"; then
+-		    eval mynewdependency_lib="`echo "$deplib" |sed -e "s:$D::g" -e 's://:/:g'`"
+-		  else
+-		    mynewdependency_lib="$deplib"
+-		  fi
+-		else
+-		  mynewdependency_lib="$deplib"
+-		fi
+-		# Do not add duplicates
+-		if test "$mynewdependency_lib"; then
+-		  if test -z "`echo $newdependency_libs |grep -e "$mynewdependency_lib"`"; then
+-			newdependency_libs="$newdependency_libs $mynewdependency_lib"
+-		  fi
+-		fi
++		newdependency_libs="$newdependency_libs $libdir/$name"
+ 		;;
++	      *) newdependency_libs="$newdependency_libs $deplib" ;;
+ 	      esac
+ 	    done
+ 	    dependency_libs="$newdependency_libs"
+ 	    newdlfiles=
+ 	    for lib in $dlfiles; do
+ 	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
++	      eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ 	      if test -z "$libdir"; then
+ 		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ 		exit 1
+@@ -4028,7 +3958,7 @@
+ 	    newdlprefiles=
+ 	    for lib in $dlprefiles; do
+ 	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
++	      eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ 	      if test -z "$libdir"; then
+ 		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ 		exit 1
+@@ -4043,10 +3973,6 @@
+ 	  case $host,$output,$installed,$module,$dlname in
+ 	    *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ 	  esac
+-	  # Do not add duplicates
+-	  if test "$installed" = yes && test "$D"; then
+-	    install_libdir="`echo "$install_libdir" |sed -e "s:$D::g" -e 's://:/:g'`"
+-	  fi
+ 	  $echo > $output "\
+ # $outputname - a libtool library file
+ # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+@@ -4080,7 +4006,7 @@
+ 
+ # Directory that this library needs to be installed in:
+ libdir='$install_libdir'"
+-	  if test "$installed" = no && test $need_relink = yes; then
++	  if test "$installed" = no && test "$need_relink" = yes; then
+ 	    $echo >> $output "\
+ relink_command=\"$relink_command\""
+ 	  fi
+@@ -4216,7 +4142,7 @@
+ 
+       # Not a directory, so check to see that there is only one file specified.
+       set dummy $files
+-      if test $# -gt 2; then
++      if test "$#" -gt 2; then
+ 	$echo "$modename: \`$dest' is not a directory" 1>&2
+ 	$echo "$help" 1>&2
+ 	exit 1
+@@ -4256,7 +4182,7 @@
+ 
+       *.la)
+ 	# Check to see that this really is a libtool archive.
+-	if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
++	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ 	else
+ 	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
+ 	  $echo "$help" 1>&2
+@@ -4291,12 +4217,30 @@
+ 	dir="$dir$objdir"
+ 
+ 	if test -n "$relink_command"; then
++	  # Determine the prefix the user has applied to our future dir.
++	  inst_prefix_dir=`$echo "$destdir" | sed "s%$libdir\$%%"`
++
++	  # Don't allow the user to place us outside of our expected
++	  # location b/c this prevents finding dependent libraries that
++	  # are installed to the same prefix.
++	  if test "$inst_prefix_dir" = "$destdir"; then
++	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
++	    exit 1
++	  fi
++
++	  if test -n "$inst_prefix_dir"; then
++	    # Stick the inst_prefix_dir data into the link command.
++	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
++	  else
++	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
++	  fi
++
+ 	  $echo "$modename: warning: relinking \`$file'" 1>&2
+ 	  $show "$relink_command"
+ 	  if $run eval "$relink_command"; then :
+ 	  else
+ 	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+-	    continue
++	    exit 1
+ 	  fi
+ 	fi
+ 
+@@ -4318,7 +4262,7 @@
+ 	    $run eval "$striplib $destdir/$realname" || exit $?
+ 	  fi
+ 
+-	  if test $# -gt 0; then
++	  if test "$#" -gt 0; then
+ 	    # Delete the old symlinks, and create new ones.
+ 	    for linkname
+ 	    do
+@@ -4405,27 +4349,19 @@
+ 	fi
+ 
+ 	# Do a test to see if this is really a libtool program.
+-	case $host in
+-	*cygwin*|*mingw*)
+-	    wrapper=`echo $file | ${SED} -e 's,.exe$,,'`
+-	    ;;
+-	*)
+-	    wrapper=$file
+-	    ;;
+-	esac
+-	if (${SED} -e '4q' $wrapper | egrep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
++	if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ 	  notinst_deplibs=
+ 	  relink_command=
+ 
+ 	  # If there is no directory component, then add one.
+ 	  case $file in
+-	  */* | *\\*) . $wrapper ;;
+-	  *) . ./$wrapper ;;
++	  */* | *\\*) . $file ;;
++	  *) . ./$file ;;
+ 	  esac
+ 
+ 	  # Check the variables that should have been set.
+ 	  if test -z "$notinst_deplibs"; then
+-	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
++	    $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2
+ 	    exit 1
+ 	  fi
+ 
+@@ -4450,8 +4386,8 @@
+ 	  relink_command=
+ 	  # If there is no directory component, then add one.
+ 	  case $file in
+-	  */* | *\\*) . $wrapper ;;
+-	  *) . ./$wrapper ;;
++	  */* | *\\*) . $file ;;
++	  *) . ./$file ;;
+ 	  esac
+ 
+ 	  outputname=
+@@ -4459,7 +4395,11 @@
+ 	    if test "$finalize" = yes && test -z "$run"; then
+ 	      tmpdir="/tmp"
+ 	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
+-	      tmpdir="$tmpdir/libtool-$$"
++              tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null`
++              if test $? = 0 ; then :
++              else
++                tmpdir="$tmpdir/libtool-$$"
++              fi
+ 	      if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
+ 	      else
+ 		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
+@@ -4499,7 +4439,7 @@
+ 	    destfile=$destfile.exe
+ 	    ;;
+ 	  *:*.exe)
+-	    destfile=`echo $destfile | ${SED} -e 's,.exe$,,'`
++	    destfile=`echo $destfile | sed -e 's,.exe$,,'`
+ 	    ;;
+ 	  esac
+ 	  ;;
+@@ -4584,7 +4524,7 @@
+     fi
+ 
+     # Exit here if they wanted silent mode.
+-    test "$show" = ":" && exit 0
++    test "$show" = : && exit 0
+ 
+     echo "----------------------------------------------------------------------"
+     echo "Libraries have been installed in:"
+@@ -4647,7 +4587,7 @@
+       case $file in
+       *.la)
+ 	# Check to see that this really is a libtool archive.
+-	if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
++	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ 	else
+ 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ 	  $echo "$help" 1>&2
+@@ -4718,7 +4658,7 @@
+       -*) ;;
+       *)
+ 	# Do a test to see if this is really a libtool program.
+-	if (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++	if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ 	  # If there is no directory component, then add one.
+ 	  case $file in
+ 	  */* | *\\*) . $file ;;
+@@ -4800,10 +4740,10 @@
+ 	objdir="$dir/$objdir"
+       fi
+       name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+-      test $mode = uninstall && objdir="$dir"
++      test "$mode" = uninstall && objdir="$dir"
+ 
+       # Remember objdir for removal later, being careful to avoid duplicates
+-      if test $mode = clean; then
++      if test "$mode" = clean; then
+ 	case " $rmdirs " in
+ 	  *" $objdir "*) ;;
+ 	  *) rmdirs="$rmdirs $objdir" ;;
+@@ -4827,7 +4767,7 @@
+       case $name in
+       *.la)
+ 	# Possibly a libtool archive, so verify it.
+-	if (${SED} -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ 	  . $dir/$name
+ 
+ 	  # Delete the libtool libraries and symlinks.
+@@ -4835,9 +4775,9 @@
+ 	    rmfiles="$rmfiles $objdir/$n"
+ 	  done
+ 	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+-	  test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
++	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+ 
+-	  if test $mode = uninstall; then
++	  if test "$mode" = uninstall; then
+ 	    if test -n "$library_names"; then
+ 	      # Do each command in the postuninstall commands.
+ 	      eval cmds=\"$postuninstall_cmds\"
+@@ -4846,7 +4786,7 @@
+ 		IFS="$save_ifs"
+ 		$show "$cmd"
+ 		$run eval "$cmd"
+-		if test $? != 0 && test "$rmforce" != yes; then
++		if test "$?" -ne 0 && test "$rmforce" != yes; then
+ 		  exit_status=1
+ 		fi
+ 	      done
+@@ -4861,7 +4801,7 @@
+ 		IFS="$save_ifs"
+ 		$show "$cmd"
+ 		$run eval "$cmd"
+-		if test $? != 0 && test "$rmforce" != yes; then
++		if test "$?" -ne 0 && test "$rmforce" != yes; then
+ 		  exit_status=1
+ 		fi
+ 	      done
+@@ -4881,8 +4821,8 @@
+ 
+       *)
+ 	# Do a test to see if this is a libtool program.
+-	if test $mode = clean &&
+-	   (${SED} -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++	if test "$mode" = clean &&
++	   (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ 	  relink_command=
+ 	  . $dir/$file
+ 
Index: scripts/untested/blfs-patches/glib-1.2.10-gcc34-1.patch
===================================================================
--- scripts/untested/blfs-patches/glib-1.2.10-gcc34-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/glib-1.2.10-gcc34-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,22 @@
+Submitted By: Uwe Düffert (lfs at uwe-dueffert dot de)
+Date: 2004-05-15
+Initial Package Version: 1.2.10
+Origin: self-created, http://www.uwe-dueffert.de/lfs/ownpatches/glib-1.2.10-gcc34-1.patch
+Upstream Status: not reported
+Description: fix compilation of glib1 with gcc34
+ 
+$LastChangedBy: bdubbs $
+$Date: 2004-08-07 18:56:30 -0600 (Sat, 07 Aug 2004) $
+
+diff -Naur glib-1.2.10.orig/gstrfuncs.c glib-1.2.10/gstrfuncs.c
+--- glib-1.2.10.orig/gstrfuncs.c	2004-05-15 13:40:03.556092792 +0000
++++ glib-1.2.10/gstrfuncs.c	2004-05-15 13:40:36.712052320 +0000
+@@ -47,6 +47,8 @@
+  * inteferes with g_strsignal() on some OSes
+  */
+ 
++#define G_GNUC_PRETTY_FUNCTION
++
+ typedef union  _GDoubleIEEE754  GDoubleIEEE754;
+ #define G_IEEE754_DOUBLE_BIAS   (1023)
+ /* multiply with base2 exponent to get base10 exponent (nomal numbers) */
Index: scripts/untested/blfs-patches/glib-1.2.10-update_config_foo-1.patch
===================================================================
--- scripts/untested/blfs-patches/glib-1.2.10-update_config_foo-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/glib-1.2.10-update_config_foo-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1814 @@
+diff -uNr glib-1.2.10/config.guess glib-1.2.10-mod/config.guess
+--- glib-1.2.10-orig/config.guess	2000-02-03 11:53:22.000000000 +1100
++++ glib-1.2.10/config.guess	2005-01-27 00:27:12.875569612 +1100
+@@ -1,8 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
++#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+ #   Free Software Foundation, Inc.
+-#
++
++timestamp='2001-09-04'
++
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2 of the License, or
+@@ -23,51 +25,153 @@
+ # the same distribution terms that you use for the rest of that program.
+ 
+ # Written by Per Bothner <bothner@cygnus.com>.
+-# The master version of this file is at the FSF in /home/gd/gnu/lib.
+-# Please send patches to <autoconf-patches@gnu.org>.
++# Please send patches to <config-patches@gnu.org>.
+ #
+ # This script attempts to guess a canonical system name similar to
+ # config.sub.  If it succeeds, it prints the system name on stdout, and
+ # exits with 0.  Otherwise, it exits with 1.
+ #
+ # The plan is that this can be called by configure scripts if you
+-# don't specify an explicit system type (host/target name).
+-#
+-# Only a few systems have been added to this list; please add others
+-# (but try to keep the structure clean).
+-#
++# don't specify an explicit build system type.
+ 
+-# Use $HOST_CC if defined. $CC may point to a cross-compiler
+-if test x"$CC_FOR_BUILD" = x; then
+-  if test x"$HOST_CC" != x; then
+-    CC_FOR_BUILD="$HOST_CC"
+-  else
+-    if test x"$CC" != x; then
+-      CC_FOR_BUILD="$CC"
+-    else
+-      CC_FOR_BUILD=cc
+-    fi
+-  fi
++me=`echo "$0" | sed -e 's,.*/,,'`
++
++usage="\
++Usage: $0 [OPTION]
++
++Output the configuration name of the system \`$me' is run on.
++
++Operation modes:
++  -h, --help         print this help, then exit
++  -t, --time-stamp   print date of last modification, then exit
++  -v, --version      print version number, then exit
++
++Report bugs and patches to <config-patches@gnu.org>."
++
++version="\
++GNU config.guess ($timestamp)
++
++Originally written by Per Bothner.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
++Free Software Foundation, Inc.
++
++This is free software; see the source for copying conditions.  There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++
++help="
++Try \`$me --help' for more information."
++
++# Parse command line
++while test $# -gt 0 ; do
++  case $1 in
++    --time-stamp | --time* | -t )
++       echo "$timestamp" ; exit 0 ;;
++    --version | -v )
++       echo "$version" ; exit 0 ;;
++    --help | --h* | -h )
++       echo "$usage"; exit 0 ;;
++    -- )     # Stop option processing
++       shift; break ;;
++    - )	# Use stdin as input.
++       break ;;
++    -* )
++       echo "$me: invalid option $1$help" >&2
++       exit 1 ;;
++    * )
++       break ;;
++  esac
++done
++
++if test $# != 0; then
++  echo "$me: too many arguments$help" >&2
++  exit 1
+ fi
+ 
+ 
++dummy=dummy-$$
++trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
++
++# CC_FOR_BUILD -- compiler used by this script.
++# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
++# use `HOST_CC' if defined, but it is deprecated.
++
++set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
++ ,,)    echo "int dummy(){}" > $dummy.c ;
++	for c in cc gcc c89 ; do
++	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
++	  if test $? = 0 ; then
++	     CC_FOR_BUILD="$c"; break ;
++	  fi ;
++	done ;
++	rm -f $dummy.c $dummy.o $dummy.rel ;
++	if test x"$CC_FOR_BUILD" = x ; then
++	  CC_FOR_BUILD=no_compiler_found ;
++	fi
++	;;
++ ,,*)   CC_FOR_BUILD=$CC ;;
++ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
++esac'
++
+ # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+-# (ghazi@noc.rutgers.edu 8/24/94.)
++# (ghazi@noc.rutgers.edu 1994-08-24)
+ if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+ 	PATH=$PATH:/.attbin ; export PATH
+ fi
+ 
+ UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
++UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+ 
+-dummy=dummy-$$
+-trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
+-
+ # Note: order is significant - the case branches are not exclusive.
+ 
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
++    *:NetBSD:*:*)
++	# Netbsd (nbsd) targets should (where applicable) match one or
++	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
++	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
++	# switched to ELF, *-*-netbsd* would select the old
++	# object file format.  This provides both forward
++	# compatibility and a consistent mechanism for selecting the
++	# object file format.
++	# Determine the machine/vendor (is the vendor relevant).
++	case "${UNAME_MACHINE}" in
++	    amiga) machine=m68k-unknown ;;
++	    arm32) machine=arm-unknown ;;
++	    atari*) machine=m68k-atari ;;
++	    sun3*) machine=m68k-sun ;;
++	    mac68k) machine=m68k-apple ;;
++	    macppc) machine=powerpc-apple ;;
++	    hp3[0-9][05]) machine=m68k-hp ;;
++	    ibmrt|romp-ibm) machine=romp-ibm ;;
++	    *) machine=${UNAME_MACHINE}-unknown ;;
++	esac
++	# The Operating System including object format, if it has switched
++	# to ELF recently, or will in the future.
++	case "${UNAME_MACHINE}" in
++	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
++		eval $set_cc_for_build
++		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
++			| grep __ELF__ >/dev/null
++		then
++		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
++		    # Return netbsd for either.  FIX?
++		    os=netbsd
++		else
++		    os=netbsdelf
++		fi
++		;;
++	    *)
++	        os=netbsd
++		;;
++	esac
++	# The OS release
++	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
++	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
++	# contains redundant information, the shorter form:
++	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
++	echo "${machine}-${os}${release}"
++	exit 0 ;;
+     alpha:OSF1:*:*)
+ 	if test $UNAME_RELEASE = "V4.0"; then
+ 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+@@ -77,41 +181,55 @@
+ 	# A Xn.n version is an unreleased experimental baselevel.
+ 	# 1.2 uses "1.2" for uname -r.
+ 	cat <<EOF >$dummy.s
++	.data
++\$Lformat:
++	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
++
++	.text
+ 	.globl main
++	.align 4
+ 	.ent main
+ main:
+-	.frame \$30,0,\$26,0
+-	.prologue 0
+-	.long 0x47e03d80 # implver $0
+-	lda \$2,259
+-	.long 0x47e20c21 # amask $2,$1
+-	srl \$1,8,\$2
+-	sll \$2,2,\$2
+-	sll \$0,3,\$0
+-	addl \$1,\$0,\$0
+-	addl \$2,\$0,\$0
+-	ret \$31,(\$26),1
++	.frame \$30,16,\$26,0
++	ldgp \$29,0(\$27)
++	.prologue 1
++	.long 0x47e03d80 # implver \$0
++	lda \$2,-1
++	.long 0x47e20c21 # amask \$2,\$1
++	lda \$16,\$Lformat
++	mov \$0,\$17
++	not \$1,\$18
++	jsr \$26,printf
++	ldgp \$29,0(\$26)
++	mov 0,\$16
++	jsr \$26,exit
+ 	.end main
+ EOF
++	eval $set_cc_for_build
+ 	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+ 	if test "$?" = 0 ; then
+-		./$dummy
+-		case "$?" in
+-			7)
++		case `./$dummy` in
++			0-0)
+ 				UNAME_MACHINE="alpha"
+ 				;;
+-			15)
++			1-0)
+ 				UNAME_MACHINE="alphaev5"
+ 				;;
+-			14)
++			1-1)
+ 				UNAME_MACHINE="alphaev56"
+ 				;;
+-			10)
++			1-101)
+ 				UNAME_MACHINE="alphapca56"
+ 				;;
+-			16)
++			2-303)
+ 				UNAME_MACHINE="alphaev6"
+ 				;;
++			2-307)
++				UNAME_MACHINE="alphaev67"
++				;;
++			2-1307)
++				UNAME_MACHINE="alphaev68"
++				;;
+ 		esac
+ 	fi
+ 	rm -f $dummy.s $dummy
+@@ -127,11 +245,8 @@
+ 	echo alpha-dec-winnt3.5
+ 	exit 0 ;;
+     Amiga*:UNIX_System_V:4.0:*)
+-	echo m68k-cbm-sysv4
++	echo m68k-unknown-sysv4
+ 	exit 0;;
+-    amiga:NetBSD:*:*)
+-      echo m68k-cbm-netbsd${UNAME_RELEASE}
+-      exit 0 ;;
+     amiga:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+@@ -162,10 +277,7 @@
+     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ 	echo arm-acorn-riscix${UNAME_RELEASE}
+ 	exit 0;;
+-    arm32:NetBSD:*:*)
+-	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+-	exit 0 ;;
+-    SR2?01:HI-UX/MPP:*:*)
++    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+ 	echo hppa1.1-hitachi-hiuxmpp
+ 	exit 0;;
+     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+@@ -221,15 +333,15 @@
+     aushp:SunOS:*:*)
+ 	echo sparc-auspex-sunos${UNAME_RELEASE}
+ 	exit 0 ;;
+-    atari*:NetBSD:*:*)
+-	echo m68k-atari-netbsd${UNAME_RELEASE}
++    sparc*:NetBSD:*)
++	echo `uname -p`-unknown-netbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     atari*:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     # The situation for MiNT is a little confusing.  The machine name
+     # can be virtually everything (everything which is not
+-    # "atarist" or "atariste" at least should have a processor 
++    # "atarist" or "atariste" at least should have a processor
+     # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+     # to the lowercase version "mint" (or "freemint").  Finally
+     # the system name "TOS" denotes a system which is actually not
+@@ -253,15 +365,9 @@
+     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+         echo m68k-unknown-mint${UNAME_RELEASE}
+         exit 0 ;;
+-    sun3*:NetBSD:*:*)
+-	echo m68k-sun-netbsd${UNAME_RELEASE}
+-	exit 0 ;;
+     sun3*:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+-    mac68k:NetBSD:*:*)
+-	echo m68k-apple-netbsd${UNAME_RELEASE}
+-	exit 0 ;;
+     mac68k:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+@@ -274,9 +380,6 @@
+     powerpc:machten:*:*)
+ 	echo powerpc-apple-machten${UNAME_RELEASE}
+ 	exit 0 ;;
+-    macppc:NetBSD:*:*)
+-        echo powerpc-apple-netbsd${UNAME_RELEASE}
+-        exit 0 ;;
+     RISC*:Mach:*:*)
+ 	echo mips-dec-mach_bsd4.3
+ 	exit 0 ;;
+@@ -290,8 +393,10 @@
+ 	echo clipper-intergraph-clix${UNAME_RELEASE}
+ 	exit 0 ;;
+     mips:*:*:UMIPS | mips:*:*:RISCos)
++	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+ #ifdef __cplusplus
++#include <stdio.h>  /* for printf() prototype */
+ 	int main (int argc, char *argv[]) {
+ #else
+ 	int main (argc, argv) int argc; char *argv[]; {
+@@ -312,10 +417,13 @@
+ EOF
+ 	$CC_FOR_BUILD $dummy.c -o $dummy \
+ 	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+-	  && rm $dummy.c $dummy && exit 0
++	  && rm -f $dummy.c $dummy && exit 0
+ 	rm -f $dummy.c $dummy
+ 	echo mips-mips-riscos${UNAME_RELEASE}
+ 	exit 0 ;;
++    Motorola:PowerMAX_OS:*:*)
++	echo powerpc-motorola-powermax
++	exit 0 ;;
+     Night_Hawk:Power_UNIX:*:*)
+ 	echo powerpc-harris-powerunix
+ 	exit 0 ;;
+@@ -331,7 +439,7 @@
+     AViiON:dgux:*:*)
+         # DG/UX returns AViiON for all architectures
+         UNAME_PROCESSOR=`/usr/bin/uname -p`
+-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110]
++	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ 	then
+ 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+ 	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+@@ -363,11 +471,20 @@
+     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+ 	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+ 	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+-    i?86:AIX:*:*)
++    i*86:AIX:*:*)
+ 	echo i386-ibm-aix
+ 	exit 0 ;;
++    ia64:AIX:*:*)
++	if [ -x /usr/bin/oslevel ] ; then
++		IBM_REV=`/usr/bin/oslevel`
++	else
++		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++	fi
++	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
++	exit 0 ;;
+     *:AIX:2:3)
+ 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
++		eval $set_cc_for_build
+ 		sed 's/^		//' << EOF >$dummy.c
+ 		#include <sys/systemcfg.h>
+ 
+@@ -379,7 +496,7 @@
+ 			exit(0);
+ 			}
+ EOF
+-		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
++		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+ 		rm -f $dummy.c $dummy
+ 		echo rs6000-ibm-aix3.2.5
+ 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+@@ -388,9 +505,9 @@
+ 		echo rs6000-ibm-aix3.2
+ 	fi
+ 	exit 0 ;;
+-    *:AIX:*:4)
++    *:AIX:*:[45])
+ 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+-	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
++	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ 		IBM_ARCH=rs6000
+ 	else
+ 		IBM_ARCH=powerpc
+@@ -398,7 +515,7 @@
+ 	if [ -x /usr/bin/oslevel ] ; then
+ 		IBM_REV=`/usr/bin/oslevel`
+ 	else
+-		IBM_REV=4.${UNAME_RELEASE}
++		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ 	fi
+ 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+ 	exit 0 ;;
+@@ -408,7 +525,7 @@
+     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+ 	echo romp-ibm-bsd4.4
+ 	exit 0 ;;
+-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
++    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+ 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+ 	exit 0 ;;                           # report: romp-ibm BSD 4.3
+     *:BOSX:*:*)
+@@ -424,11 +541,32 @@
+ 	echo m68k-hp-bsd4.4
+ 	exit 0 ;;
+     9000/[34678]??:HP-UX:*:*)
++	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ 	case "${UNAME_MACHINE}" in
+ 	    9000/31? )            HP_ARCH=m68000 ;;
+ 	    9000/[34]?? )         HP_ARCH=m68k ;;
+ 	    9000/[678][0-9][0-9])
++              case "${HPUX_REV}" in
++                11.[0-9][0-9])
++                  if [ -x /usr/bin/getconf ]; then
++                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
++                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
++                    case "${sc_cpu_version}" in
++                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
++                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
++                      532)                      # CPU_PA_RISC2_0
++                        case "${sc_kernel_bits}" in
++                          32) HP_ARCH="hppa2.0n" ;;
++                          64) HP_ARCH="hppa2.0w" ;;
++                        esac ;;
++                    esac
++                  fi ;;
++              esac
++              if [ "${HP_ARCH}" = "" ]; then
++	      eval $set_cc_for_build
+               sed 's/^              //' << EOF >$dummy.c
++
++              #define _HPUX_SOURCE
+               #include <stdlib.h>
+               #include <unistd.h>
+ 
+@@ -459,13 +597,19 @@
+                   exit (0);
+               }
+ EOF
+-	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+-	rm -f $dummy.c $dummy
++	    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
++	    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
++	    rm -f $dummy.c $dummy
++	fi ;;
+ 	esac
+-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+ 	exit 0 ;;
++    ia64:HP-UX:*:*)
++	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
++	echo ia64-hp-hpux${HPUX_REV}
++	exit 0 ;;
+     3050*:HI-UX:*:*)
++	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+ 	#include <unistd.h>
+ 	int
+@@ -491,7 +635,7 @@
+ 	  exit (0);
+ 	}
+ EOF
+-	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
++	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+ 	rm -f $dummy.c $dummy
+ 	echo unknown-hitachi-hiuxwe2
+ 	exit 0 ;;
+@@ -501,7 +645,7 @@
+     9000/8??:4.3bsd:*:*)
+ 	echo hppa1.0-hp-bsd
+ 	exit 0 ;;
+-    *9??*:MPE/iX:*:*)
++    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+ 	echo hppa1.0-hp-mpeix
+ 	exit 0 ;;
+     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+@@ -510,7 +654,7 @@
+     hp8??:OSF1:*:*)
+ 	echo hppa1.0-hp-osf
+ 	exit 0 ;;
+-    i?86:OSF1:*:*)
++    i*86:OSF1:*:*)
+ 	if [ -x /usr/sbin/sysversion ] ; then
+ 	    echo ${UNAME_MACHINE}-unknown-osf1mk
+ 	else
+@@ -545,37 +689,39 @@
+ 	echo xmp-cray-unicos
+         exit 0 ;;
+     CRAY*Y-MP:*:*:*)
+-	echo ymp-cray-unicos${UNAME_RELEASE}
++	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+     CRAY*[A-Z]90:*:*:*)
+ 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+ 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
++	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
++	      -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+     CRAY*TS:*:*:*)
+-	echo t90-cray-unicos${UNAME_RELEASE}
++	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	exit 0 ;;
++    CRAY*T3D:*:*:*)
++	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+     CRAY*T3E:*:*:*)
+-	echo alpha-cray-unicosmk${UNAME_RELEASE}
++	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	exit 0 ;;
++    CRAY*SV1:*:*:*)
++	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+     CRAY-2:*:*:*)
+ 	echo cray2-cray-unicos
+         exit 0 ;;
+-    F300:UNIX_System_V:*:*)
++    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
++	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+-        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+         exit 0 ;;
+-    F301:UNIX_System_V:*:*)
+-       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
+-       exit 0 ;;
+-    hp3[0-9][05]:NetBSD:*:*)
+-	echo m68k-hp-netbsd${UNAME_RELEASE}
+-	exit 0 ;;
+     hp300:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+-    i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
++    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+ 	exit 0 ;;
+     sparc*:BSD/OS:*:*)
+@@ -585,17 +731,8 @@
+ 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:FreeBSD:*:*)
+-	if test -x /usr/bin/objformat; then
+-	    if test "elf" = "`/usr/bin/objformat`"; then
+-		echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
+-		exit 0
+-	    fi
+-	fi
+ 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ 	exit 0 ;;
+-    *:NetBSD:*:*)
+-	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
+-	exit 0 ;;
+     *:OpenBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ 	exit 0 ;;
+@@ -605,6 +742,9 @@
+     i*:MINGW*:*)
+ 	echo ${UNAME_MACHINE}-pc-mingw32
+ 	exit 0 ;;
++    i*:PW*:*)
++	echo ${UNAME_MACHINE}-pc-pw32
++	exit 0 ;;
+     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+ 	# How do we know it's Interix rather than the generic POSIX subsystem?
+ 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+@@ -623,172 +763,99 @@
+     *:GNU:*:*)
+ 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ 	exit 0 ;;
+-    *:Linux:*:*)
+-
++    i*86:Minix:*:*)
++	echo ${UNAME_MACHINE}-pc-minix
++	exit 0 ;;
++    arm*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    ia64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux
++	exit 0 ;;
++    m68*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    mips:Linux:*:*)
++	case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
++	  big)    echo mips-unknown-linux-gnu && exit 0 ;;
++	  little) echo mipsel-unknown-linux-gnu && exit 0 ;;
++	esac
++	;;
++    ppc:Linux:*:*)
++	echo powerpc-unknown-linux-gnu
++	exit 0 ;;
++    ppc64:Linux:*:*)
++	echo powerpc64-unknown-linux-gnu
++	exit 0 ;;
++    alpha:Linux:*:*)
++	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++	  EV5)   UNAME_MACHINE=alphaev5 ;;
++	  EV56)  UNAME_MACHINE=alphaev56 ;;
++	  PCA56) UNAME_MACHINE=alphapca56 ;;
++	  PCA57) UNAME_MACHINE=alphapca56 ;;
++	  EV6)   UNAME_MACHINE=alphaev6 ;;
++	  EV67)  UNAME_MACHINE=alphaev67 ;;
++	  EV68*) UNAME_MACHINE=alphaev68 ;;
++        esac
++	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
++	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++	exit 0 ;;
++    parisc:Linux:*:* | hppa:Linux:*:*)
++	# Look for CPU level
++	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
++	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
++	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
++	  *)    echo hppa-unknown-linux-gnu ;;
++	esac
++	exit 0 ;;
++    parisc64:Linux:*:* | hppa64:Linux:*:*)
++	echo hppa64-unknown-linux-gnu
++	exit 0 ;;
++    s390:Linux:*:* | s390x:Linux:*:*)
++	echo ${UNAME_MACHINE}-ibm-linux
++	exit 0 ;;
++    sh*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    sparc:Linux:*:* | sparc64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    x86_64:Linux:*:*)
++	echo x86_64-unknown-linux-gnu
++	exit 0 ;;
++    i*86:Linux:*:*)
+ 	# The BFD linker knows what the default object file format is, so
+ 	# first see if it will tell us. cd to the root directory to prevent
+ 	# problems with other programs or directories called `ld' in the path.
+-	ld_help_string=`cd /; ld --help 2>&1`
+-	ld_supported_emulations=`echo $ld_help_string \
+-			 | sed -ne '/supported emulations:/!d
++	ld_supported_targets=`cd /; ld --help 2>&1 \
++			 | sed -ne '/supported targets:/!d
+ 				    s/[ 	][ 	]*/ /g
+-				    s/.*supported emulations: *//
++				    s/.*supported targets: *//
+ 				    s/ .*//
+ 				    p'`
+-        case "$ld_supported_emulations" in
+-	  *ia64)
+-		echo "${UNAME_MACHINE}-unknown-linux"
+-		exit 0
++        case "$ld_supported_targets" in
++	  elf32-i386)
++		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+ 		;;
+-	  i?86linux)
++	  a.out-i386-linux)
+ 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+-		exit 0
+-		;;
+-	  i?86coff)
++		exit 0 ;;		
++	  coff-i386)
+ 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+-		exit 0
+-		;;
+-	  sparclinux)
+-		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+-		exit 0
+-		;;
+-	  armlinux)
+-		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+-		exit 0
+-		;;
+-	  elf32arm*)
+-		echo "${UNAME_MACHINE}-unknown-linux-gnu"
+-		exit 0
+-		;;
+-	  armelf_linux*)
+-		echo "${UNAME_MACHINE}-unknown-linux-gnu"
+-		exit 0
+-		;;
+-	  m68klinux)
+-		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+-		exit 0
+-		;;
+-	  elf32ppc)
+-		# Determine Lib Version
+-		cat >$dummy.c <<EOF
+-#include <features.h>
+-#if defined(__GLIBC__)
+-extern char __libc_version[];
+-extern char __libc_release[];
+-#endif
+-main(argc, argv)
+-     int argc;
+-     char *argv[];
+-{
+-#if defined(__GLIBC__)
+-  printf("%s %s\n", __libc_version, __libc_release);
+-#else
+-  printf("unkown\n");
+-#endif
+-  return 0;
+-}
+-EOF
+-		LIBC=""
+-		$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
+-		if test "$?" = 0 ; then
+-			./$dummy | grep 1\.99 > /dev/null
+-			if test "$?" = 0 ; then
+-				LIBC="libc1"
+-			fi
+-		fi	
+-		rm -f $dummy.c $dummy
+-		echo powerpc-unknown-linux-gnu${LIBC}
+-		exit 0
+-		;;
++		exit 0 ;;
++	  "")
++		# Either a pre-BFD a.out linker (linux-gnuoldld) or
++		# one that does not give us useful --help.
++		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
++		exit 0 ;;
+ 	esac
+-
+-	if test "${UNAME_MACHINE}" = "alpha" ; then
+-		sed 's/^	//'  <<EOF >$dummy.s
+-		.globl main
+-		.ent main
+-	main:
+-		.frame \$30,0,\$26,0
+-		.prologue 0
+-		.long 0x47e03d80 # implver $0
+-		lda \$2,259
+-		.long 0x47e20c21 # amask $2,$1
+-		srl \$1,8,\$2
+-		sll \$2,2,\$2
+-		sll \$0,3,\$0
+-		addl \$1,\$0,\$0
+-		addl \$2,\$0,\$0
+-		ret \$31,(\$26),1
+-		.end main
+-EOF
+-		LIBC=""
+-		$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+-		if test "$?" = 0 ; then
+-			./$dummy
+-			case "$?" in
+-			7)
+-				UNAME_MACHINE="alpha"
+-				;;
+-			15)
+-				UNAME_MACHINE="alphaev5"
+-				;;
+-			14)
+-				UNAME_MACHINE="alphaev56"
+-				;;
+-			10)
+-				UNAME_MACHINE="alphapca56"
+-				;;
+-			16)
+-				UNAME_MACHINE="alphaev6"
+-				;;
+-			esac
+-
+-			objdump --private-headers $dummy | \
+-			  grep ld.so.1 > /dev/null
+-			if test "$?" = 0 ; then
+-				LIBC="libc1"
+-			fi
+-		fi
+-		rm -f $dummy.s $dummy
+-		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
+-	elif test "${UNAME_MACHINE}" = "mips" ; then
+-	  cat >$dummy.c <<EOF
+-#ifdef __cplusplus
+-	int main (int argc, char *argv[]) {
+-#else
+-	int main (argc, argv) int argc; char *argv[]; {
+-#endif
+-#ifdef __MIPSEB__
+-  printf ("%s-unknown-linux-gnu\n", argv[1]);
+-#endif
+-#ifdef __MIPSEL__
+-  printf ("%sel-unknown-linux-gnu\n", argv[1]);
+-#endif
+-  return 0;
+-}
+-EOF
+-	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+-	  rm -f $dummy.c $dummy
+-	else
+-	  # Either a pre-BFD a.out linker (linux-gnuoldld)
+-	  # or one that does not give us useful --help.
+-	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
+-	  # If ld does not provide *any* "supported emulations:"
+-	  # that means it is gnuoldld.
+-	  echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
+-	  test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
+-
+-	  case "${UNAME_MACHINE}" in
+-	  i?86)
+-	    VENDOR=pc;
+-	    ;;
+-	  *)
+-	    VENDOR=unknown;
+-	    ;;
+-	  esac
+-	  # Determine whether the default compiler is a.out or elf
+-	  cat >$dummy.c <<EOF
++	# Determine whether the default compiler is a.out or elf
++	eval $set_cc_for_build
++	cat >$dummy.c <<EOF
+ #include <features.h>
+ #ifdef __cplusplus
++#include <stdio.h>  /* for printf() prototype */
+ 	int main (int argc, char *argv[]) {
+ #else
+ 	int main (argc, argv) int argc; char *argv[]; {
+@@ -796,28 +863,30 @@
+ #ifdef __ELF__
+ # ifdef __GLIBC__
+ #  if __GLIBC__ >= 2
+-    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
++    printf ("%s-pc-linux-gnu\n", argv[1]);
+ #  else
+-    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
++    printf ("%s-pc-linux-gnulibc1\n", argv[1]);
+ #  endif
+ # else
+-   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
++   printf ("%s-pc-linux-gnulibc1\n", argv[1]);
+ # endif
+ #else
+-  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
++  printf ("%s-pc-linux-gnuaout\n", argv[1]);
+ #endif
+   return 0;
+ }
+ EOF
+-	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+-	  rm -f $dummy.c $dummy
+-	fi ;;
+-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
+-# are messed up and put the nodename in both sysname and nodename.
+-    i?86:DYNIX/ptx:4*:*)
++	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
++	rm -f $dummy.c $dummy
++	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
++	;;
++    i*86:DYNIX/ptx:4*:*)
++	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
++	# earlier versions are messed up and put the nodename in both
++	# sysname and nodename.
+ 	echo i386-sequent-sysv4
+ 	exit 0 ;;
+-    i?86:UNIX_SV:4.2MP:2.*)
++    i*86:UNIX_SV:4.2MP:2.*)
+         # Unixware is an offshoot of SVR4, but it has its own version
+         # number series starting with 2...
+         # I am not positive that other SVR4 systems won't match this,
+@@ -825,7 +894,7 @@
+         # Use sysv4.2uw... so that sysv4* matches it.
+ 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ 	exit 0 ;;
+-    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
++    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+ 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+ 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+ 		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+@@ -833,16 +902,15 @@
+ 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+ 	fi
+ 	exit 0 ;;
+-    i?86:*:5:7*)
+-        # Fixed at (any) Pentium or better
+-        UNAME_MACHINE=i586
+-        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
+-	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
+-	else
+-	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+-	fi
++    i*86:*:5:[78]*)
++	case `/bin/uname -X | grep "^Machine"` in
++	    *486*)	     UNAME_MACHINE=i486 ;;
++	    *Pentium)	     UNAME_MACHINE=i586 ;;
++	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
++	esac
++	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+ 	exit 0 ;;
+-    i?86:*:3.2:*)
++    i*86:*:3.2:*)
+ 	if test -f /usr/options/cb.name; then
+ 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+ 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+@@ -860,7 +928,11 @@
+ 		echo ${UNAME_MACHINE}-pc-sysv32
+ 	fi
+ 	exit 0 ;;
++    i*86:*DOS:*:*)
++	echo ${UNAME_MACHINE}-pc-msdosdjgpp
++	exit 0 ;;
+     pc:*:*:*)
++	# Left here for compatibility:
+         # uname -m prints for DJGPP always 'pc', but it prints nothing about
+         # the processor, so we play safe by assuming i386.
+ 	echo i386-pc-msdosdjgpp
+@@ -884,7 +956,7 @@
+ 	exit 0 ;;
+     M68*:*:R3V[567]*:*)
+ 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+-    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
++    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+ 	OS_REL=''
+ 	test -r /etc/.relid \
+ 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+@@ -895,21 +967,24 @@
+     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+           && echo i486-ncr-sysv4 && exit 0 ;;
+-    m68*:LynxOS:2.*:*)
++    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+ 	echo m68k-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
+     mc68030:UNIX_System_V:4.*:*)
+ 	echo m68k-atari-sysv4
+ 	exit 0 ;;
+-    i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
++    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ 	echo i386-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
+     TSUNAMI:LynxOS:2.*:*)
+ 	echo sparc-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
+-    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
++    rs6000:LynxOS:2.*:*)
+ 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
++    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
++	echo powerpc-unknown-lynxos${UNAME_RELEASE}
++	exit 0 ;;
+     SM[BE]S:UNIX_SV:*:*)
+ 	echo mips-dde-sysv${UNAME_RELEASE}
+ 	exit 0 ;;
+@@ -927,8 +1002,8 @@
+ 		echo ns32k-sni-sysv
+ 	fi
+ 	exit 0 ;;
+-    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+-                           # says <Richard.M.Bartel@ccMail.Census.GOV>
++    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
++                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+         echo i586-unisys-sysv4
+         exit 0 ;;
+     *:UNIX_System_V:4*:FTX*)
+@@ -940,10 +1015,14 @@
+ 	# From seanf@swdc.stratus.com.
+ 	echo i860-stratus-sysv4
+ 	exit 0 ;;
++    *:VOS:*:*)
++	# From Paul.Green@stratus.com.
++	echo hppa1.1-stratus-vos
++	exit 0 ;;
+     mc68*:A/UX:*:*)
+ 	echo m68k-apple-aux${UNAME_RELEASE}
+ 	exit 0 ;;
+-    news*:NEWS-OS:*:6*)
++    news*:NEWS-OS:6*:*)
+ 	echo mips-sony-newsos6
+ 	exit 0 ;;
+     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+@@ -974,14 +1053,76 @@
+     *:Rhapsody:*:*)
+ 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+ 	exit 0 ;;
++    *:Darwin:*:*)
++	echo `uname -p`-apple-darwin${UNAME_RELEASE}
++	exit 0 ;;
++    *:procnto*:*:* | *:QNX:[0123456789]*:*)
++	if test "${UNAME_MACHINE}" = "x86pc"; then
++		UNAME_MACHINE=pc
++	fi
++	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
++	exit 0 ;;
+     *:QNX:*:4*)
+-	echo i386-qnx-qnx${UNAME_VERSION}
++	echo i386-pc-qnx
++	exit 0 ;;
++    NSR-[KW]:NONSTOP_KERNEL:*:*)
++	echo nsr-tandem-nsk${UNAME_RELEASE}
++	exit 0 ;;
++    *:NonStop-UX:*:*)
++	echo mips-compaq-nonstopux
++	exit 0 ;;
++    BS2000:POSIX*:*:*)
++	echo bs2000-siemens-sysv
++	exit 0 ;;
++    DS/*:UNIX_System_V:*:*)
++	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
++	exit 0 ;;
++    *:Plan9:*:*)
++	# "uname -m" is not consistent, so use $cputype instead. 386
++	# is converted to i386 for consistency with other x86
++	# operating systems.
++	if test "$cputype" = "386"; then
++	    UNAME_MACHINE=i386
++	else
++	    UNAME_MACHINE="$cputype"
++	fi
++	echo ${UNAME_MACHINE}-unknown-plan9
++	exit 0 ;;
++    i*86:OS/2:*:*)
++	# If we were able to find `uname', then EMX Unix compatibility
++	# is probably installed.
++	echo ${UNAME_MACHINE}-pc-os2-emx
++	exit 0 ;;
++    *:TOPS-10:*:*)
++	echo pdp10-unknown-tops10
++	exit 0 ;;
++    *:TENEX:*:*)
++	echo pdp10-unknown-tenex
++	exit 0 ;;
++    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
++	echo pdp10-dec-tops20
++	exit 0 ;;
++    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
++	echo pdp10-xkl-tops20
++	exit 0 ;;
++    *:TOPS-20:*:*)
++	echo pdp10-unknown-tops20
++	exit 0 ;;
++    *:ITS:*:*)
++	echo pdp10-unknown-its
++	exit 0 ;;
++    i*86:XTS-300:*:STOP)
++	echo ${UNAME_MACHINE}-unknown-stop
++	exit 0 ;;
++    i*86:atheos:*:*)
++	echo ${UNAME_MACHINE}-unknown-atheos
+ 	exit 0 ;;
+ esac
+ 
+ #echo '(No uname command or uname output not recognized.)' 1>&2
+ #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+ 
++eval $set_cc_for_build
+ cat >$dummy.c <<EOF
+ #ifdef _SEQUENT_
+ # include <sys/types.h>
+@@ -1068,11 +1209,24 @@
+ #endif
+ 
+ #if defined (vax)
+-#if !defined (ultrix)
+-  printf ("vax-dec-bsd\n"); exit (0);
+-#else
+-  printf ("vax-dec-ultrix\n"); exit (0);
+-#endif
++# if !defined (ultrix)
++#  include <sys/param.h>
++#  if defined (BSD)
++#   if BSD == 43
++      printf ("vax-dec-bsd4.3\n"); exit (0);
++#   else
++#    if BSD == 199006
++      printf ("vax-dec-bsd4.3reno\n"); exit (0);
++#    else
++      printf ("vax-dec-bsd\n"); exit (0);
++#    endif
++#   endif
++#  else
++    printf ("vax-dec-bsd\n"); exit (0);
++#  endif
++# else
++    printf ("vax-dec-ultrix\n"); exit (0);
++# endif
+ #endif
+ 
+ #if defined (alliant) && defined (i860)
+@@ -1083,7 +1237,7 @@
+ }
+ EOF
+ 
+-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
++$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
+ rm -f $dummy.c $dummy
+ 
+ # Apollos put the system type in the environment.
+@@ -1116,6 +1270,48 @@
+     esac
+ fi
+ 
+-#echo '(Unable to guess system type)' 1>&2
++cat >&2 <<EOF
++$0: unable to guess system type
++
++This script, last modified $timestamp, has failed to recognize
++the operating system you are using. It is advised that you
++download the most up to date version of the config scripts from
++
++    ftp://ftp.gnu.org/pub/gnu/config/
++
++If the version you run ($0) is already up to date, please
++send the following data and any information you think might be
++pertinent to <config-patches@gnu.org> in order to provide the needed
++information to handle your system.
++
++config.guess timestamp = $timestamp
++
++uname -m = `(uname -m) 2>/dev/null || echo unknown`
++uname -r = `(uname -r) 2>/dev/null || echo unknown`
++uname -s = `(uname -s) 2>/dev/null || echo unknown`
++uname -v = `(uname -v) 2>/dev/null || echo unknown`
++
++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
++/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
++
++hostinfo               = `(hostinfo) 2>/dev/null`
++/bin/universe          = `(/bin/universe) 2>/dev/null`
++/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
++/bin/arch              = `(/bin/arch) 2>/dev/null`
++/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
++
++UNAME_MACHINE = ${UNAME_MACHINE}
++UNAME_RELEASE = ${UNAME_RELEASE}
++UNAME_SYSTEM  = ${UNAME_SYSTEM}
++UNAME_VERSION = ${UNAME_VERSION}
++EOF
+ 
+ exit 1
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "timestamp='"
++# time-stamp-format: "%:y-%02m-%02d"
++# time-stamp-end: "'"
++# End:
+diff -uNr glib-1.2.10/config.sub glib-1.2.10-mod/config.sub
+--- glib-1.2.10-orig/config.sub	2000-02-03 11:53:22.000000000 +1100
++++ glib-1.2.10/config.sub	2005-01-27 00:27:05.175410775 +1100
+@@ -1,6 +1,10 @@
+ #! /bin/sh
+-# Configuration validation subroutine script, version 1.1.
+-#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
++# Configuration validation subroutine script.
++#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
++#   Free Software Foundation, Inc.
++
++timestamp='2001-09-07'
++
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+ # can handle that machine.  It does not imply ALL GNU software can.
+@@ -25,6 +29,8 @@
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
++# Please send patches to <config-patches@gnu.org>.
++#
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+ # If it is invalid, we print an error message on stderr and exit with code 1.
+@@ -45,30 +51,73 @@
+ #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+ # It is wrong to echo any other type of specification.
+ 
+-if [ x$1 = x ]
+-then
+-	echo Configuration name missing. 1>&2
+-	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
+-	echo "or     $0 ALIAS" 1>&2
+-	echo where ALIAS is a recognized configuration type. 1>&2
+-	exit 1
+-fi
++me=`echo "$0" | sed -e 's,.*/,,'`
+ 
+-# First pass through any local machine types.
+-case $1 in
+-	*local*)
+-		echo $1
+-		exit 0
+-		;;
+-	*)
+-	;;
++usage="\
++Usage: $0 [OPTION] CPU-MFR-OPSYS
++       $0 [OPTION] ALIAS
++
++Canonicalize a configuration name.
++
++Operation modes:
++  -h, --help         print this help, then exit
++  -t, --time-stamp   print date of last modification, then exit
++  -v, --version      print version number, then exit
++
++Report bugs and patches to <config-patches@gnu.org>."
++
++version="\
++GNU config.sub ($timestamp)
++
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
++Free Software Foundation, Inc.
++
++This is free software; see the source for copying conditions.  There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++
++help="
++Try \`$me --help' for more information."
++
++# Parse command line
++while test $# -gt 0 ; do
++  case $1 in
++    --time-stamp | --time* | -t )
++       echo "$timestamp" ; exit 0 ;;
++    --version | -v )
++       echo "$version" ; exit 0 ;;
++    --help | --h* | -h )
++       echo "$usage"; exit 0 ;;
++    -- )     # Stop option processing
++       shift; break ;;
++    - )	# Use stdin as input.
++       break ;;
++    -* )
++       echo "$me: invalid option $1$help"
++       exit 1 ;;
++
++    *local*)
++       # First pass through any local machine types.
++       echo $1
++       exit 0;;
++
++    * )
++       break ;;
++  esac
++done
++
++case $# in
++ 0) echo "$me: missing argument$help" >&2
++    exit 1;;
++ 1) ;;
++ *) echo "$me: too many arguments$help" >&2
++    exit 1;;
+ esac
+ 
+ # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+-  linux-gnu*)
++  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
+     os=-$maybe_os
+     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+     ;;
+@@ -94,7 +143,7 @@
+ 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+-	-apple)
++	-apple | -axis)
+ 		os=
+ 		basic_machine=$1
+ 		;;
+@@ -108,6 +157,14 @@
+ 		os=-vxworks
+ 		basic_machine=$1
+ 		;;
++	-chorusos*)
++		os=-chorusos
++		basic_machine=$1
++		;;
++ 	-chorusrdb)
++ 		os=-chorusrdb
++		basic_machine=$1
++ 		;;
+ 	-hiux*)
+ 		os=-hiuxwe2
+ 		;;
+@@ -166,27 +223,50 @@
+ case $basic_machine in
+ 	# Recognize the basic CPU types without company name.
+ 	# Some are omitted here because they have special meanings below.
+-	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+-		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
+-		| 580 | i960 | h8300 \
+-		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
+-		| alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
+-		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
+-		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
+-		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
+-		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
+-		| mips64vr5000 | miprs64vr5000el | mcore \
+-		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
+-		| thumb | d10v | fr30)
++	1750a | 580 \
++	| a29k \
++	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
++	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
++	| c4x | clipper \
++	| d10v | d30v | dsp16xx \
++	| fr30 \
++	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
++	| i370 | i860 | i960 | ia64 \
++	| m32r | m68000 | m68k | m88k | mcore \
++	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
++	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
++	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
++	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
++	| mipsisa32 \
++	| mn10200 | mn10300 \
++	| ns16k | ns32k \
++	| openrisc \
++	| pdp10 | pdp11 | pj | pjl \
++	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
++	| pyramid \
++	| s390 | s390x \
++	| sh | sh[34] | sh[34]eb | shbe | shle \
++	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
++	| stormy16 | strongarm \
++	| tahoe | thumb | tic80 | tron \
++	| v850 \
++	| we32k \
++	| x86 | xscale \
++	| z8k)
+ 		basic_machine=$basic_machine-unknown
+ 		;;
+-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
++	m6811 | m68hc11 | m6812 | m68hc12)
++		# Motorola 68HC11/12.
++		basic_machine=$basic_machine-unknown
++		os=-none
++		;;
++	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+ 		;;
+ 
+ 	# We use `pc' rather than `unknown'
+ 	# because (1) that's what they normally are, and
+ 	# (2) the word "unknown" tends to confuse beginning users.
+-	i[34567]86)
++	i*86 | x86_64)
+ 	  basic_machine=$basic_machine-pc
+ 	  ;;
+ 	# Object if more than one company name word.
+@@ -195,24 +275,43 @@
+ 		exit 1
+ 		;;
+ 	# Recognize the basic CPU types with company name.
+-	# FIXME: clean up the formatting here.
+-	vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
+-	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
+-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+-	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
+-	      | xmp-* | ymp-* \
+-	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
+-	      | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
+-	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
+-	      | clipper-* | orion-* \
+-	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+-	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
+-	      | mips64el-* | mips64orion-* | mips64orionel-* \
+-	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
+-	      | mipstx39-* | mipstx39el-* | mcore-* \
+-	      | f301-* | armv*-* | t3e-* \
+-	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
+-	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* )
++	580-* \
++	| a29k-* \
++	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
++	| alphapca5[67]-* | arc-* \
++	| arm-*  | armbe-* | armle-* | armv*-* \
++	| bs2000-* \
++	| c[123]* | c30-* | [cjt]90-* | c54x-* \
++	| clipper-* | cray2-* | cydra-* \
++	| d10v-* | d30v-* \
++	| elxsi-* \
++	| f30[01]-* | f700-* | fr30-* | fx80-* \
++	| h8300-* | h8500-* \
++	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
++	| i*86-* | i860-* | i960-* | ia64-* \
++	| m32r-* \
++	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
++	| m88110-* | m88k-* | mcore-* \
++	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
++	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
++	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
++	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
++	| none-* | np1-* | ns16k-* | ns32k-* \
++	| orion-* \
++	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
++	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
++	| pyramid-* \
++	| romp-* | rs6000-* \
++	| s390-* | s390x-* \
++	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
++	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
++	| sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \
++	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
++	| v850-* | vax-* \
++	| we32k-* \
++	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
++	| ymp-* \
++	| z8k-*)
+ 		;;
+ 	# Recognize the various machine names and aliases which stand
+ 	# for a CPU type and a company and sometimes even an OS.
+@@ -249,14 +348,14 @@
+ 		os=-sysv
+ 		;;
+ 	amiga | amiga-*)
+-		basic_machine=m68k-cbm
++		basic_machine=m68k-unknown
+ 		;;
+ 	amigaos | amigados)
+-		basic_machine=m68k-cbm
++		basic_machine=m68k-unknown
+ 		os=-amigaos
+ 		;;
+ 	amigaunix | amix)
+-		basic_machine=m68k-cbm
++		basic_machine=m68k-unknown
+ 		os=-sysv4
+ 		;;
+ 	apollo68)
+@@ -303,13 +402,16 @@
+ 		basic_machine=cray2-cray
+ 		os=-unicos
+ 		;;
+-	[ctj]90-cray)
+-		basic_machine=c90-cray
++	[cjt]90)
++		basic_machine=${basic_machine}-cray
+ 		os=-unicos
+ 		;;
+ 	crds | unos)
+ 		basic_machine=m68k-crds
+ 		;;
++	cris | cris-* | etrax*)
++		basic_machine=cris-axis
++		;;
+ 	da30 | da30-*)
+ 		basic_machine=m68k-da30
+ 		;;
+@@ -357,6 +459,10 @@
+ 		basic_machine=tron-gmicro
+ 		os=-sysv
+ 		;;
++	go32)
++		basic_machine=i386-pc
++		os=-go32
++		;;
+ 	h3050r* | hiux*)
+ 		basic_machine=hppa1.1-hitachi
+ 		os=-hiuxwe2
+@@ -432,19 +538,19 @@
+ 		basic_machine=i370-ibm
+ 		;;
+ # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+-	i[34567]86v32)
++	i*86v32)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv32
+ 		;;
+-	i[34567]86v4*)
++	i*86v4*)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv4
+ 		;;
+-	i[34567]86v)
++	i*86v)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv
+ 		;;
+-	i[34567]86sol2)
++	i*86sol2)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-solaris2
+ 		;;
+@@ -456,17 +562,6 @@
+ 		basic_machine=i386-unknown
+ 		os=-vsta
+ 		;;
+-	i386-go32 | go32)
+-		basic_machine=i386-unknown
+-		os=-go32
+-		;;
+-	i386-mingw32 | mingw32)
+-		basic_machine=i386-unknown
+-		os=-mingw32
+-		;;
+-	i386-qnx | qnx)
+-		basic_machine=i386-qnx
+-		;;
+ 	iris | iris4d)
+ 		basic_machine=mips-sgi
+ 		case $os in
+@@ -492,6 +587,10 @@
+ 		basic_machine=ns32k-utek
+ 		os=-sysv
+ 		;;
++	mingw32)
++		basic_machine=i386-pc
++		os=-mingw32
++		;;
+ 	miniframe)
+ 		basic_machine=m68000-convergent
+ 		;;
+@@ -513,12 +612,16 @@
+ 	mips3*)
+ 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+ 		;;
++	mmix*)
++		basic_machine=mmix-knuth
++		os=-mmixware
++		;;
+ 	monitor)
+ 		basic_machine=m68k-rom68k
+ 		os=-coff
+ 		;;
+ 	msdos)
+-		basic_machine=i386-unknown
++		basic_machine=i386-pc
+ 		os=-msdos
+ 		;;
+ 	mvs)
+@@ -582,9 +685,16 @@
+ 		basic_machine=i960-intel
+ 		os=-mon960
+ 		;;
++	nonstopux)
++		basic_machine=mips-compaq
++		os=-nonstopux
++		;;
+ 	np1)
+ 		basic_machine=np1-gould
+ 		;;
++	nsr-tandem)
++		basic_machine=nsr-tandem
++		;;
+ 	op50n-* | op60c-*)
+ 		basic_machine=hppa1.1-oki
+ 		os=-proelf
+@@ -614,28 +724,28 @@
+         pc532 | pc532-*)
+ 		basic_machine=ns32k-pc532
+ 		;;
+-	pentium | p5 | k5 | k6 | nexen)
++	pentium | p5 | k5 | k6 | nexgen)
+ 		basic_machine=i586-pc
+ 		;;
+-	pentiumpro | p6 | 6x86)
++	pentiumpro | p6 | 6x86 | athlon)
+ 		basic_machine=i686-pc
+ 		;;
+ 	pentiumii | pentium2)
+-		basic_machine=i786-pc
++		basic_machine=i686-pc
+ 		;;
+-	pentium-* | p5-* | k5-* | k6-* | nexen-*)
++	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
+ 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+-	pentiumpro-* | p6-* | 6x86-*)
++	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+ 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	pentiumii-* | pentium2-*)
+-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	pn)
+ 		basic_machine=pn-gould
+ 		;;
+-	power)	basic_machine=rs6000-ibm
++	power)	basic_machine=power-ibm
+ 		;;
+ 	ppc)	basic_machine=powerpc-unknown
+ 	        ;;
+@@ -647,9 +757,23 @@
+ 	ppcle-* | powerpclittle-*)
+ 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
++	ppc64)	basic_machine=powerpc64-unknown
++	        ;;
++	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
++		basic_machine=powerpc64le-unknown
++	        ;;
++	ppc64le-* | powerpc64little-*)
++		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
+ 	ps2)
+ 		basic_machine=i386-ibm
+ 		;;
++	pw32)
++		basic_machine=i586-unknown
++		os=-pw32
++		;;
+ 	rom68k)
+ 		basic_machine=m68k-rom68k
+ 		os=-coff
+@@ -729,6 +853,10 @@
+ 	sun386 | sun386i | roadrunner)
+ 		basic_machine=i386-sun
+ 		;;
++	sv1)
++		basic_machine=sv1-cray
++		os=-unicos
++		;;
+ 	symmetry)
+ 		basic_machine=i386-sequent
+ 		os=-dynix
+@@ -737,6 +865,10 @@
+ 		basic_machine=t3e-cray
+ 		os=-unicos
+ 		;;
++	tic54x | c54x*)
++		basic_machine=tic54x-unknown
++		os=-coff
++		;;
+ 	tx39)
+ 		basic_machine=mipstx39-unknown
+ 		;;
+@@ -789,6 +921,10 @@
+ 		basic_machine=hppa1.1-winbond
+ 		os=-proelf
+ 		;;
++	windows32)
++		basic_machine=i386-pc
++		os=-windows32-msvcrt
++		;;
+ 	xmp)
+ 		basic_machine=xmp-cray
+ 		os=-unicos
+@@ -832,13 +968,20 @@
+ 	vax)
+ 		basic_machine=vax-dec
+ 		;;
++	pdp10)
++		# there are many clones, so DEC is not a safe bet
++		basic_machine=pdp10-unknown
++		;;
+ 	pdp11)
+ 		basic_machine=pdp11-dec
+ 		;;
+ 	we32k)
+ 		basic_machine=we32k-att
+ 		;;
+-	sparc | sparcv9)
++	sh3 | sh4 | sh3eb | sh4eb)
++		basic_machine=sh-unknown
++		;;
++	sparc | sparcv9 | sparcv9b)
+ 		basic_machine=sparc-sun
+ 		;;
+         cydra)
+@@ -860,6 +1003,9 @@
+ 		basic_machine=c4x-none
+ 		os=-coff
+ 		;;
++	*-unknown)
++		# Make sure to match an already-canonicalized machine name.
++		;;
+ 	*)
+ 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ 		exit 1
+@@ -916,14 +1062,30 @@
+ 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++	      | -chorusos* | -chorusrdb* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+-	      | -interix* | -uwin* | -rhapsody* | -opened* | -openstep* | -oskit*)
++	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
++	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
++	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
++	      | -os2* | -vos*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
++	-qnx*)
++		case $basic_machine in
++		    x86-* | i*86-*)
++			;;
++		    *)
++			os=-nto$os
++			;;
++		esac
++		;;
++	-nto*)
++		os=-nto-qnx
++		;;
+ 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+ 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+-	      | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
++	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+ 		;;
+ 	-mac*)
+ 		os=`echo $os | sed -e 's|mac|macos|'`
+@@ -940,6 +1102,9 @@
+ 	-opened*)
+ 		os=-openedition
+ 		;;
++	-wince*)
++		os=-wince
++		;;
+ 	-osfrose*)
+ 		os=-osfrose
+ 		;;
+@@ -964,6 +1129,9 @@
+ 	-ns2 )
+ 	        os=-nextstep2
+ 		;;
++	-nsk*)
++		os=-nsk
++		;;
+ 	# Preserve the version number of sinix5.
+ 	-sinix5.*)
+ 		os=`echo $os | sed -e 's|sinix|sysv|'`
+@@ -977,9 +1145,6 @@
+ 	-oss*)
+ 		os=-sysv3
+ 		;;
+-        -qnx)
+-		os=-qnx4
+-		;;
+ 	-svr4)
+ 		os=-sysv4
+ 		;;
+@@ -1001,7 +1166,7 @@
+ 	-xenix)
+ 		os=-xenix
+ 		;;
+-        -*mint | -*MiNT)
++        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ 	        os=-mint
+ 		;;
+ 	-none)
+@@ -1035,6 +1200,9 @@
+ 	arm*-semi)
+ 		os=-aout
+ 		;;
++	pdp10-*)
++		os=-tops20
++		;;
+         pdp11-*)
+ 		os=-none
+ 		;;
+@@ -1143,7 +1311,7 @@
+ 	*-masscomp)
+ 		os=-rtu
+ 		;;
+-	f301-fujitsu)
++	f30[01]-fujitsu | f700-fujitsu)
+ 		os=-uxpv
+ 		;;
+ 	*-rom68k)
+@@ -1221,12 +1389,23 @@
+ 			-mpw* | -macos*)
+ 				vendor=apple
+ 				;;
+-			-*mint | -*MiNT)
++			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ 				vendor=atari
+ 				;;
++			-vos*)
++				vendor=stratus
++				;;
+ 		esac
+ 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+ 		;;
+ esac
+ 
+ echo $basic_machine$os
++exit 0
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "timestamp='"
++# time-stamp-format: "%:y-%02m-%02d"
++# time-stamp-end: "'"
++# End:
Index: scripts/untested/blfs-patches/gtk+-1.2.10-update_config_foo-1.patch
===================================================================
--- scripts/untested/blfs-patches/gtk+-1.2.10-update_config_foo-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/gtk+-1.2.10-update_config_foo-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1814 @@
+diff -uNr gtk+-1.2.10-orig/config.guess gtk+-1.2.10/config.guess
+--- gtk+-1.2.10-orig/config.guess	2000-02-03 12:07:42.000000000 +1100
++++ gtk+-1.2.10/config.guess	2005-01-27 01:12:54.606002105 +1100
+@@ -1,8 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
++#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+ #   Free Software Foundation, Inc.
+-#
++
++timestamp='2001-09-04'
++
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2 of the License, or
+@@ -23,51 +25,153 @@
+ # the same distribution terms that you use for the rest of that program.
+ 
+ # Written by Per Bothner <bothner@cygnus.com>.
+-# The master version of this file is at the FSF in /home/gd/gnu/lib.
+-# Please send patches to <autoconf-patches@gnu.org>.
++# Please send patches to <config-patches@gnu.org>.
+ #
+ # This script attempts to guess a canonical system name similar to
+ # config.sub.  If it succeeds, it prints the system name on stdout, and
+ # exits with 0.  Otherwise, it exits with 1.
+ #
+ # The plan is that this can be called by configure scripts if you
+-# don't specify an explicit system type (host/target name).
+-#
+-# Only a few systems have been added to this list; please add others
+-# (but try to keep the structure clean).
+-#
++# don't specify an explicit build system type.
+ 
+-# Use $HOST_CC if defined. $CC may point to a cross-compiler
+-if test x"$CC_FOR_BUILD" = x; then
+-  if test x"$HOST_CC" != x; then
+-    CC_FOR_BUILD="$HOST_CC"
+-  else
+-    if test x"$CC" != x; then
+-      CC_FOR_BUILD="$CC"
+-    else
+-      CC_FOR_BUILD=cc
+-    fi
+-  fi
++me=`echo "$0" | sed -e 's,.*/,,'`
++
++usage="\
++Usage: $0 [OPTION]
++
++Output the configuration name of the system \`$me' is run on.
++
++Operation modes:
++  -h, --help         print this help, then exit
++  -t, --time-stamp   print date of last modification, then exit
++  -v, --version      print version number, then exit
++
++Report bugs and patches to <config-patches@gnu.org>."
++
++version="\
++GNU config.guess ($timestamp)
++
++Originally written by Per Bothner.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
++Free Software Foundation, Inc.
++
++This is free software; see the source for copying conditions.  There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++
++help="
++Try \`$me --help' for more information."
++
++# Parse command line
++while test $# -gt 0 ; do
++  case $1 in
++    --time-stamp | --time* | -t )
++       echo "$timestamp" ; exit 0 ;;
++    --version | -v )
++       echo "$version" ; exit 0 ;;
++    --help | --h* | -h )
++       echo "$usage"; exit 0 ;;
++    -- )     # Stop option processing
++       shift; break ;;
++    - )	# Use stdin as input.
++       break ;;
++    -* )
++       echo "$me: invalid option $1$help" >&2
++       exit 1 ;;
++    * )
++       break ;;
++  esac
++done
++
++if test $# != 0; then
++  echo "$me: too many arguments$help" >&2
++  exit 1
+ fi
+ 
+ 
++dummy=dummy-$$
++trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15
++
++# CC_FOR_BUILD -- compiler used by this script.
++# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
++# use `HOST_CC' if defined, but it is deprecated.
++
++set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in
++ ,,)    echo "int dummy(){}" > $dummy.c ;
++	for c in cc gcc c89 ; do
++	  ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ;
++	  if test $? = 0 ; then
++	     CC_FOR_BUILD="$c"; break ;
++	  fi ;
++	done ;
++	rm -f $dummy.c $dummy.o $dummy.rel ;
++	if test x"$CC_FOR_BUILD" = x ; then
++	  CC_FOR_BUILD=no_compiler_found ;
++	fi
++	;;
++ ,,*)   CC_FOR_BUILD=$CC ;;
++ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
++esac'
++
+ # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+-# (ghazi@noc.rutgers.edu 8/24/94.)
++# (ghazi@noc.rutgers.edu 1994-08-24)
+ if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+ 	PATH=$PATH:/.attbin ; export PATH
+ fi
+ 
+ UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
++UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+ 
+-dummy=dummy-$$
+-trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
+-
+ # Note: order is significant - the case branches are not exclusive.
+ 
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
++    *:NetBSD:*:*)
++	# Netbsd (nbsd) targets should (where applicable) match one or
++	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
++	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
++	# switched to ELF, *-*-netbsd* would select the old
++	# object file format.  This provides both forward
++	# compatibility and a consistent mechanism for selecting the
++	# object file format.
++	# Determine the machine/vendor (is the vendor relevant).
++	case "${UNAME_MACHINE}" in
++	    amiga) machine=m68k-unknown ;;
++	    arm32) machine=arm-unknown ;;
++	    atari*) machine=m68k-atari ;;
++	    sun3*) machine=m68k-sun ;;
++	    mac68k) machine=m68k-apple ;;
++	    macppc) machine=powerpc-apple ;;
++	    hp3[0-9][05]) machine=m68k-hp ;;
++	    ibmrt|romp-ibm) machine=romp-ibm ;;
++	    *) machine=${UNAME_MACHINE}-unknown ;;
++	esac
++	# The Operating System including object format, if it has switched
++	# to ELF recently, or will in the future.
++	case "${UNAME_MACHINE}" in
++	    i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k)
++		eval $set_cc_for_build
++		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
++			| grep __ELF__ >/dev/null
++		then
++		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
++		    # Return netbsd for either.  FIX?
++		    os=netbsd
++		else
++		    os=netbsdelf
++		fi
++		;;
++	    *)
++	        os=netbsd
++		;;
++	esac
++	# The OS release
++	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
++	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
++	# contains redundant information, the shorter form:
++	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
++	echo "${machine}-${os}${release}"
++	exit 0 ;;
+     alpha:OSF1:*:*)
+ 	if test $UNAME_RELEASE = "V4.0"; then
+ 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+@@ -77,41 +181,55 @@
+ 	# A Xn.n version is an unreleased experimental baselevel.
+ 	# 1.2 uses "1.2" for uname -r.
+ 	cat <<EOF >$dummy.s
++	.data
++\$Lformat:
++	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
++
++	.text
+ 	.globl main
++	.align 4
+ 	.ent main
+ main:
+-	.frame \$30,0,\$26,0
+-	.prologue 0
+-	.long 0x47e03d80 # implver $0
+-	lda \$2,259
+-	.long 0x47e20c21 # amask $2,$1
+-	srl \$1,8,\$2
+-	sll \$2,2,\$2
+-	sll \$0,3,\$0
+-	addl \$1,\$0,\$0
+-	addl \$2,\$0,\$0
+-	ret \$31,(\$26),1
++	.frame \$30,16,\$26,0
++	ldgp \$29,0(\$27)
++	.prologue 1
++	.long 0x47e03d80 # implver \$0
++	lda \$2,-1
++	.long 0x47e20c21 # amask \$2,\$1
++	lda \$16,\$Lformat
++	mov \$0,\$17
++	not \$1,\$18
++	jsr \$26,printf
++	ldgp \$29,0(\$26)
++	mov 0,\$16
++	jsr \$26,exit
+ 	.end main
+ EOF
++	eval $set_cc_for_build
+ 	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+ 	if test "$?" = 0 ; then
+-		./$dummy
+-		case "$?" in
+-			7)
++		case `./$dummy` in
++			0-0)
+ 				UNAME_MACHINE="alpha"
+ 				;;
+-			15)
++			1-0)
+ 				UNAME_MACHINE="alphaev5"
+ 				;;
+-			14)
++			1-1)
+ 				UNAME_MACHINE="alphaev56"
+ 				;;
+-			10)
++			1-101)
+ 				UNAME_MACHINE="alphapca56"
+ 				;;
+-			16)
++			2-303)
+ 				UNAME_MACHINE="alphaev6"
+ 				;;
++			2-307)
++				UNAME_MACHINE="alphaev67"
++				;;
++			2-1307)
++				UNAME_MACHINE="alphaev68"
++				;;
+ 		esac
+ 	fi
+ 	rm -f $dummy.s $dummy
+@@ -127,11 +245,8 @@
+ 	echo alpha-dec-winnt3.5
+ 	exit 0 ;;
+     Amiga*:UNIX_System_V:4.0:*)
+-	echo m68k-cbm-sysv4
++	echo m68k-unknown-sysv4
+ 	exit 0;;
+-    amiga:NetBSD:*:*)
+-      echo m68k-cbm-netbsd${UNAME_RELEASE}
+-      exit 0 ;;
+     amiga:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+@@ -162,10 +277,7 @@
+     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ 	echo arm-acorn-riscix${UNAME_RELEASE}
+ 	exit 0;;
+-    arm32:NetBSD:*:*)
+-	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+-	exit 0 ;;
+-    SR2?01:HI-UX/MPP:*:*)
++    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+ 	echo hppa1.1-hitachi-hiuxmpp
+ 	exit 0;;
+     Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+@@ -221,15 +333,15 @@
+     aushp:SunOS:*:*)
+ 	echo sparc-auspex-sunos${UNAME_RELEASE}
+ 	exit 0 ;;
+-    atari*:NetBSD:*:*)
+-	echo m68k-atari-netbsd${UNAME_RELEASE}
++    sparc*:NetBSD:*)
++	echo `uname -p`-unknown-netbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     atari*:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+     # The situation for MiNT is a little confusing.  The machine name
+     # can be virtually everything (everything which is not
+-    # "atarist" or "atariste" at least should have a processor 
++    # "atarist" or "atariste" at least should have a processor
+     # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+     # to the lowercase version "mint" (or "freemint").  Finally
+     # the system name "TOS" denotes a system which is actually not
+@@ -253,15 +365,9 @@
+     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+         echo m68k-unknown-mint${UNAME_RELEASE}
+         exit 0 ;;
+-    sun3*:NetBSD:*:*)
+-	echo m68k-sun-netbsd${UNAME_RELEASE}
+-	exit 0 ;;
+     sun3*:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+-    mac68k:NetBSD:*:*)
+-	echo m68k-apple-netbsd${UNAME_RELEASE}
+-	exit 0 ;;
+     mac68k:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+@@ -274,9 +380,6 @@
+     powerpc:machten:*:*)
+ 	echo powerpc-apple-machten${UNAME_RELEASE}
+ 	exit 0 ;;
+-    macppc:NetBSD:*:*)
+-        echo powerpc-apple-netbsd${UNAME_RELEASE}
+-        exit 0 ;;
+     RISC*:Mach:*:*)
+ 	echo mips-dec-mach_bsd4.3
+ 	exit 0 ;;
+@@ -290,8 +393,10 @@
+ 	echo clipper-intergraph-clix${UNAME_RELEASE}
+ 	exit 0 ;;
+     mips:*:*:UMIPS | mips:*:*:RISCos)
++	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+ #ifdef __cplusplus
++#include <stdio.h>  /* for printf() prototype */
+ 	int main (int argc, char *argv[]) {
+ #else
+ 	int main (argc, argv) int argc; char *argv[]; {
+@@ -312,10 +417,13 @@
+ EOF
+ 	$CC_FOR_BUILD $dummy.c -o $dummy \
+ 	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+-	  && rm $dummy.c $dummy && exit 0
++	  && rm -f $dummy.c $dummy && exit 0
+ 	rm -f $dummy.c $dummy
+ 	echo mips-mips-riscos${UNAME_RELEASE}
+ 	exit 0 ;;
++    Motorola:PowerMAX_OS:*:*)
++	echo powerpc-motorola-powermax
++	exit 0 ;;
+     Night_Hawk:Power_UNIX:*:*)
+ 	echo powerpc-harris-powerunix
+ 	exit 0 ;;
+@@ -331,7 +439,7 @@
+     AViiON:dgux:*:*)
+         # DG/UX returns AViiON for all architectures
+         UNAME_PROCESSOR=`/usr/bin/uname -p`
+-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110]
++	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ 	then
+ 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+ 	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+@@ -363,11 +471,20 @@
+     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+ 	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+ 	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+-    i?86:AIX:*:*)
++    i*86:AIX:*:*)
+ 	echo i386-ibm-aix
+ 	exit 0 ;;
++    ia64:AIX:*:*)
++	if [ -x /usr/bin/oslevel ] ; then
++		IBM_REV=`/usr/bin/oslevel`
++	else
++		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++	fi
++	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
++	exit 0 ;;
+     *:AIX:2:3)
+ 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
++		eval $set_cc_for_build
+ 		sed 's/^		//' << EOF >$dummy.c
+ 		#include <sys/systemcfg.h>
+ 
+@@ -379,7 +496,7 @@
+ 			exit(0);
+ 			}
+ EOF
+-		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
++		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+ 		rm -f $dummy.c $dummy
+ 		echo rs6000-ibm-aix3.2.5
+ 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+@@ -388,9 +505,9 @@
+ 		echo rs6000-ibm-aix3.2
+ 	fi
+ 	exit 0 ;;
+-    *:AIX:*:4)
++    *:AIX:*:[45])
+ 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+-	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
++	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ 		IBM_ARCH=rs6000
+ 	else
+ 		IBM_ARCH=powerpc
+@@ -398,7 +515,7 @@
+ 	if [ -x /usr/bin/oslevel ] ; then
+ 		IBM_REV=`/usr/bin/oslevel`
+ 	else
+-		IBM_REV=4.${UNAME_RELEASE}
++		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ 	fi
+ 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+ 	exit 0 ;;
+@@ -408,7 +525,7 @@
+     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+ 	echo romp-ibm-bsd4.4
+ 	exit 0 ;;
+-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
++    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+ 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+ 	exit 0 ;;                           # report: romp-ibm BSD 4.3
+     *:BOSX:*:*)
+@@ -424,11 +541,32 @@
+ 	echo m68k-hp-bsd4.4
+ 	exit 0 ;;
+     9000/[34678]??:HP-UX:*:*)
++	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ 	case "${UNAME_MACHINE}" in
+ 	    9000/31? )            HP_ARCH=m68000 ;;
+ 	    9000/[34]?? )         HP_ARCH=m68k ;;
+ 	    9000/[678][0-9][0-9])
++              case "${HPUX_REV}" in
++                11.[0-9][0-9])
++                  if [ -x /usr/bin/getconf ]; then
++                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
++                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
++                    case "${sc_cpu_version}" in
++                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
++                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
++                      532)                      # CPU_PA_RISC2_0
++                        case "${sc_kernel_bits}" in
++                          32) HP_ARCH="hppa2.0n" ;;
++                          64) HP_ARCH="hppa2.0w" ;;
++                        esac ;;
++                    esac
++                  fi ;;
++              esac
++              if [ "${HP_ARCH}" = "" ]; then
++	      eval $set_cc_for_build
+               sed 's/^              //' << EOF >$dummy.c
++
++              #define _HPUX_SOURCE
+               #include <stdlib.h>
+               #include <unistd.h>
+ 
+@@ -459,13 +597,19 @@
+                   exit (0);
+               }
+ EOF
+-	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+-	rm -f $dummy.c $dummy
++	    (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
++	    if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi
++	    rm -f $dummy.c $dummy
++	fi ;;
+ 	esac
+-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+ 	exit 0 ;;
++    ia64:HP-UX:*:*)
++	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
++	echo ia64-hp-hpux${HPUX_REV}
++	exit 0 ;;
+     3050*:HI-UX:*:*)
++	eval $set_cc_for_build
+ 	sed 's/^	//' << EOF >$dummy.c
+ 	#include <unistd.h>
+ 	int
+@@ -491,7 +635,7 @@
+ 	  exit (0);
+ 	}
+ EOF
+-	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
++	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
+ 	rm -f $dummy.c $dummy
+ 	echo unknown-hitachi-hiuxwe2
+ 	exit 0 ;;
+@@ -501,7 +645,7 @@
+     9000/8??:4.3bsd:*:*)
+ 	echo hppa1.0-hp-bsd
+ 	exit 0 ;;
+-    *9??*:MPE/iX:*:*)
++    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+ 	echo hppa1.0-hp-mpeix
+ 	exit 0 ;;
+     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+@@ -510,7 +654,7 @@
+     hp8??:OSF1:*:*)
+ 	echo hppa1.0-hp-osf
+ 	exit 0 ;;
+-    i?86:OSF1:*:*)
++    i*86:OSF1:*:*)
+ 	if [ -x /usr/sbin/sysversion ] ; then
+ 	    echo ${UNAME_MACHINE}-unknown-osf1mk
+ 	else
+@@ -545,37 +689,39 @@
+ 	echo xmp-cray-unicos
+         exit 0 ;;
+     CRAY*Y-MP:*:*:*)
+-	echo ymp-cray-unicos${UNAME_RELEASE}
++	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+     CRAY*[A-Z]90:*:*:*)
+ 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+ 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
++	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
++	      -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+     CRAY*TS:*:*:*)
+-	echo t90-cray-unicos${UNAME_RELEASE}
++	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	exit 0 ;;
++    CRAY*T3D:*:*:*)
++	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+     CRAY*T3E:*:*:*)
+-	echo alpha-cray-unicosmk${UNAME_RELEASE}
++	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	exit 0 ;;
++    CRAY*SV1:*:*:*)
++	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+     CRAY-2:*:*:*)
+ 	echo cray2-cray-unicos
+         exit 0 ;;
+-    F300:UNIX_System_V:*:*)
++    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
++	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+-        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+         exit 0 ;;
+-    F301:UNIX_System_V:*:*)
+-       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
+-       exit 0 ;;
+-    hp3[0-9][05]:NetBSD:*:*)
+-	echo m68k-hp-netbsd${UNAME_RELEASE}
+-	exit 0 ;;
+     hp300:OpenBSD:*:*)
+ 	echo m68k-unknown-openbsd${UNAME_RELEASE}
+ 	exit 0 ;;
+-    i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
++    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+ 	exit 0 ;;
+     sparc*:BSD/OS:*:*)
+@@ -585,17 +731,8 @@
+ 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ 	exit 0 ;;
+     *:FreeBSD:*:*)
+-	if test -x /usr/bin/objformat; then
+-	    if test "elf" = "`/usr/bin/objformat`"; then
+-		echo ${UNAME_MACHINE}-unknown-freebsdelf`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
+-		exit 0
+-	    fi
+-	fi
+ 	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ 	exit 0 ;;
+-    *:NetBSD:*:*)
+-	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
+-	exit 0 ;;
+     *:OpenBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ 	exit 0 ;;
+@@ -605,6 +742,9 @@
+     i*:MINGW*:*)
+ 	echo ${UNAME_MACHINE}-pc-mingw32
+ 	exit 0 ;;
++    i*:PW*:*)
++	echo ${UNAME_MACHINE}-pc-pw32
++	exit 0 ;;
+     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+ 	# How do we know it's Interix rather than the generic POSIX subsystem?
+ 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+@@ -623,172 +763,99 @@
+     *:GNU:*:*)
+ 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ 	exit 0 ;;
+-    *:Linux:*:*)
+-
++    i*86:Minix:*:*)
++	echo ${UNAME_MACHINE}-pc-minix
++	exit 0 ;;
++    arm*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    ia64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux
++	exit 0 ;;
++    m68*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    mips:Linux:*:*)
++	case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in
++	  big)    echo mips-unknown-linux-gnu && exit 0 ;;
++	  little) echo mipsel-unknown-linux-gnu && exit 0 ;;
++	esac
++	;;
++    ppc:Linux:*:*)
++	echo powerpc-unknown-linux-gnu
++	exit 0 ;;
++    ppc64:Linux:*:*)
++	echo powerpc64-unknown-linux-gnu
++	exit 0 ;;
++    alpha:Linux:*:*)
++	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++	  EV5)   UNAME_MACHINE=alphaev5 ;;
++	  EV56)  UNAME_MACHINE=alphaev56 ;;
++	  PCA56) UNAME_MACHINE=alphapca56 ;;
++	  PCA57) UNAME_MACHINE=alphapca56 ;;
++	  EV6)   UNAME_MACHINE=alphaev6 ;;
++	  EV67)  UNAME_MACHINE=alphaev67 ;;
++	  EV68*) UNAME_MACHINE=alphaev68 ;;
++        esac
++	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
++	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++	exit 0 ;;
++    parisc:Linux:*:* | hppa:Linux:*:*)
++	# Look for CPU level
++	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
++	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
++	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
++	  *)    echo hppa-unknown-linux-gnu ;;
++	esac
++	exit 0 ;;
++    parisc64:Linux:*:* | hppa64:Linux:*:*)
++	echo hppa64-unknown-linux-gnu
++	exit 0 ;;
++    s390:Linux:*:* | s390x:Linux:*:*)
++	echo ${UNAME_MACHINE}-ibm-linux
++	exit 0 ;;
++    sh*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    sparc:Linux:*:* | sparc64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    x86_64:Linux:*:*)
++	echo x86_64-unknown-linux-gnu
++	exit 0 ;;
++    i*86:Linux:*:*)
+ 	# The BFD linker knows what the default object file format is, so
+ 	# first see if it will tell us. cd to the root directory to prevent
+ 	# problems with other programs or directories called `ld' in the path.
+-	ld_help_string=`cd /; ld --help 2>&1`
+-	ld_supported_emulations=`echo $ld_help_string \
+-			 | sed -ne '/supported emulations:/!d
++	ld_supported_targets=`cd /; ld --help 2>&1 \
++			 | sed -ne '/supported targets:/!d
+ 				    s/[ 	][ 	]*/ /g
+-				    s/.*supported emulations: *//
++				    s/.*supported targets: *//
+ 				    s/ .*//
+ 				    p'`
+-        case "$ld_supported_emulations" in
+-	  *ia64)
+-		echo "${UNAME_MACHINE}-unknown-linux"
+-		exit 0
++        case "$ld_supported_targets" in
++	  elf32-i386)
++		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+ 		;;
+-	  i?86linux)
++	  a.out-i386-linux)
+ 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+-		exit 0
+-		;;
+-	  i?86coff)
++		exit 0 ;;		
++	  coff-i386)
+ 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+-		exit 0
+-		;;
+-	  sparclinux)
+-		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+-		exit 0
+-		;;
+-	  armlinux)
+-		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+-		exit 0
+-		;;
+-	  elf32arm*)
+-		echo "${UNAME_MACHINE}-unknown-linux-gnu"
+-		exit 0
+-		;;
+-	  armelf_linux*)
+-		echo "${UNAME_MACHINE}-unknown-linux-gnu"
+-		exit 0
+-		;;
+-	  m68klinux)
+-		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+-		exit 0
+-		;;
+-	  elf32ppc)
+-		# Determine Lib Version
+-		cat >$dummy.c <<EOF
+-#include <features.h>
+-#if defined(__GLIBC__)
+-extern char __libc_version[];
+-extern char __libc_release[];
+-#endif
+-main(argc, argv)
+-     int argc;
+-     char *argv[];
+-{
+-#if defined(__GLIBC__)
+-  printf("%s %s\n", __libc_version, __libc_release);
+-#else
+-  printf("unkown\n");
+-#endif
+-  return 0;
+-}
+-EOF
+-		LIBC=""
+-		$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
+-		if test "$?" = 0 ; then
+-			./$dummy | grep 1\.99 > /dev/null
+-			if test "$?" = 0 ; then
+-				LIBC="libc1"
+-			fi
+-		fi	
+-		rm -f $dummy.c $dummy
+-		echo powerpc-unknown-linux-gnu${LIBC}
+-		exit 0
+-		;;
++		exit 0 ;;
++	  "")
++		# Either a pre-BFD a.out linker (linux-gnuoldld) or
++		# one that does not give us useful --help.
++		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
++		exit 0 ;;
+ 	esac
+-
+-	if test "${UNAME_MACHINE}" = "alpha" ; then
+-		sed 's/^	//'  <<EOF >$dummy.s
+-		.globl main
+-		.ent main
+-	main:
+-		.frame \$30,0,\$26,0
+-		.prologue 0
+-		.long 0x47e03d80 # implver $0
+-		lda \$2,259
+-		.long 0x47e20c21 # amask $2,$1
+-		srl \$1,8,\$2
+-		sll \$2,2,\$2
+-		sll \$0,3,\$0
+-		addl \$1,\$0,\$0
+-		addl \$2,\$0,\$0
+-		ret \$31,(\$26),1
+-		.end main
+-EOF
+-		LIBC=""
+-		$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
+-		if test "$?" = 0 ; then
+-			./$dummy
+-			case "$?" in
+-			7)
+-				UNAME_MACHINE="alpha"
+-				;;
+-			15)
+-				UNAME_MACHINE="alphaev5"
+-				;;
+-			14)
+-				UNAME_MACHINE="alphaev56"
+-				;;
+-			10)
+-				UNAME_MACHINE="alphapca56"
+-				;;
+-			16)
+-				UNAME_MACHINE="alphaev6"
+-				;;
+-			esac
+-
+-			objdump --private-headers $dummy | \
+-			  grep ld.so.1 > /dev/null
+-			if test "$?" = 0 ; then
+-				LIBC="libc1"
+-			fi
+-		fi
+-		rm -f $dummy.s $dummy
+-		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
+-	elif test "${UNAME_MACHINE}" = "mips" ; then
+-	  cat >$dummy.c <<EOF
+-#ifdef __cplusplus
+-	int main (int argc, char *argv[]) {
+-#else
+-	int main (argc, argv) int argc; char *argv[]; {
+-#endif
+-#ifdef __MIPSEB__
+-  printf ("%s-unknown-linux-gnu\n", argv[1]);
+-#endif
+-#ifdef __MIPSEL__
+-  printf ("%sel-unknown-linux-gnu\n", argv[1]);
+-#endif
+-  return 0;
+-}
+-EOF
+-	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+-	  rm -f $dummy.c $dummy
+-	else
+-	  # Either a pre-BFD a.out linker (linux-gnuoldld)
+-	  # or one that does not give us useful --help.
+-	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
+-	  # If ld does not provide *any* "supported emulations:"
+-	  # that means it is gnuoldld.
+-	  echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
+-	  test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
+-
+-	  case "${UNAME_MACHINE}" in
+-	  i?86)
+-	    VENDOR=pc;
+-	    ;;
+-	  *)
+-	    VENDOR=unknown;
+-	    ;;
+-	  esac
+-	  # Determine whether the default compiler is a.out or elf
+-	  cat >$dummy.c <<EOF
++	# Determine whether the default compiler is a.out or elf
++	eval $set_cc_for_build
++	cat >$dummy.c <<EOF
+ #include <features.h>
+ #ifdef __cplusplus
++#include <stdio.h>  /* for printf() prototype */
+ 	int main (int argc, char *argv[]) {
+ #else
+ 	int main (argc, argv) int argc; char *argv[]; {
+@@ -796,28 +863,30 @@
+ #ifdef __ELF__
+ # ifdef __GLIBC__
+ #  if __GLIBC__ >= 2
+-    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
++    printf ("%s-pc-linux-gnu\n", argv[1]);
+ #  else
+-    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
++    printf ("%s-pc-linux-gnulibc1\n", argv[1]);
+ #  endif
+ # else
+-   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
++   printf ("%s-pc-linux-gnulibc1\n", argv[1]);
+ # endif
+ #else
+-  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
++  printf ("%s-pc-linux-gnuaout\n", argv[1]);
+ #endif
+   return 0;
+ }
+ EOF
+-	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+-	  rm -f $dummy.c $dummy
+-	fi ;;
+-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
+-# are messed up and put the nodename in both sysname and nodename.
+-    i?86:DYNIX/ptx:4*:*)
++	$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0
++	rm -f $dummy.c $dummy
++	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
++	;;
++    i*86:DYNIX/ptx:4*:*)
++	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
++	# earlier versions are messed up and put the nodename in both
++	# sysname and nodename.
+ 	echo i386-sequent-sysv4
+ 	exit 0 ;;
+-    i?86:UNIX_SV:4.2MP:2.*)
++    i*86:UNIX_SV:4.2MP:2.*)
+         # Unixware is an offshoot of SVR4, but it has its own version
+         # number series starting with 2...
+         # I am not positive that other SVR4 systems won't match this,
+@@ -825,7 +894,7 @@
+         # Use sysv4.2uw... so that sysv4* matches it.
+ 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ 	exit 0 ;;
+-    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
++    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+ 	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+ 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+ 		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+@@ -833,16 +902,15 @@
+ 		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+ 	fi
+ 	exit 0 ;;
+-    i?86:*:5:7*)
+-        # Fixed at (any) Pentium or better
+-        UNAME_MACHINE=i586
+-        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
+-	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
+-	else
+-	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+-	fi
++    i*86:*:5:[78]*)
++	case `/bin/uname -X | grep "^Machine"` in
++	    *486*)	     UNAME_MACHINE=i486 ;;
++	    *Pentium)	     UNAME_MACHINE=i586 ;;
++	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
++	esac
++	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+ 	exit 0 ;;
+-    i?86:*:3.2:*)
++    i*86:*:3.2:*)
+ 	if test -f /usr/options/cb.name; then
+ 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+ 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+@@ -860,7 +928,11 @@
+ 		echo ${UNAME_MACHINE}-pc-sysv32
+ 	fi
+ 	exit 0 ;;
++    i*86:*DOS:*:*)
++	echo ${UNAME_MACHINE}-pc-msdosdjgpp
++	exit 0 ;;
+     pc:*:*:*)
++	# Left here for compatibility:
+         # uname -m prints for DJGPP always 'pc', but it prints nothing about
+         # the processor, so we play safe by assuming i386.
+ 	echo i386-pc-msdosdjgpp
+@@ -884,7 +956,7 @@
+ 	exit 0 ;;
+     M68*:*:R3V[567]*:*)
+ 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+-    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
++    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+ 	OS_REL=''
+ 	test -r /etc/.relid \
+ 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+@@ -895,21 +967,24 @@
+     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+           && echo i486-ncr-sysv4 && exit 0 ;;
+-    m68*:LynxOS:2.*:*)
++    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+ 	echo m68k-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
+     mc68030:UNIX_System_V:4.*:*)
+ 	echo m68k-atari-sysv4
+ 	exit 0 ;;
+-    i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
++    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ 	echo i386-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
+     TSUNAMI:LynxOS:2.*:*)
+ 	echo sparc-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
+-    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
++    rs6000:LynxOS:2.*:*)
+ 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
++    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
++	echo powerpc-unknown-lynxos${UNAME_RELEASE}
++	exit 0 ;;
+     SM[BE]S:UNIX_SV:*:*)
+ 	echo mips-dde-sysv${UNAME_RELEASE}
+ 	exit 0 ;;
+@@ -927,8 +1002,8 @@
+ 		echo ns32k-sni-sysv
+ 	fi
+ 	exit 0 ;;
+-    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+-                           # says <Richard.M.Bartel@ccMail.Census.GOV>
++    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
++                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+         echo i586-unisys-sysv4
+         exit 0 ;;
+     *:UNIX_System_V:4*:FTX*)
+@@ -940,10 +1015,14 @@
+ 	# From seanf@swdc.stratus.com.
+ 	echo i860-stratus-sysv4
+ 	exit 0 ;;
++    *:VOS:*:*)
++	# From Paul.Green@stratus.com.
++	echo hppa1.1-stratus-vos
++	exit 0 ;;
+     mc68*:A/UX:*:*)
+ 	echo m68k-apple-aux${UNAME_RELEASE}
+ 	exit 0 ;;
+-    news*:NEWS-OS:*:6*)
++    news*:NEWS-OS:6*:*)
+ 	echo mips-sony-newsos6
+ 	exit 0 ;;
+     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+@@ -974,14 +1053,76 @@
+     *:Rhapsody:*:*)
+ 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+ 	exit 0 ;;
++    *:Darwin:*:*)
++	echo `uname -p`-apple-darwin${UNAME_RELEASE}
++	exit 0 ;;
++    *:procnto*:*:* | *:QNX:[0123456789]*:*)
++	if test "${UNAME_MACHINE}" = "x86pc"; then
++		UNAME_MACHINE=pc
++	fi
++	echo `uname -p`-${UNAME_MACHINE}-nto-qnx
++	exit 0 ;;
+     *:QNX:*:4*)
+-	echo i386-qnx-qnx${UNAME_VERSION}
++	echo i386-pc-qnx
++	exit 0 ;;
++    NSR-[KW]:NONSTOP_KERNEL:*:*)
++	echo nsr-tandem-nsk${UNAME_RELEASE}
++	exit 0 ;;
++    *:NonStop-UX:*:*)
++	echo mips-compaq-nonstopux
++	exit 0 ;;
++    BS2000:POSIX*:*:*)
++	echo bs2000-siemens-sysv
++	exit 0 ;;
++    DS/*:UNIX_System_V:*:*)
++	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
++	exit 0 ;;
++    *:Plan9:*:*)
++	# "uname -m" is not consistent, so use $cputype instead. 386
++	# is converted to i386 for consistency with other x86
++	# operating systems.
++	if test "$cputype" = "386"; then
++	    UNAME_MACHINE=i386
++	else
++	    UNAME_MACHINE="$cputype"
++	fi
++	echo ${UNAME_MACHINE}-unknown-plan9
++	exit 0 ;;
++    i*86:OS/2:*:*)
++	# If we were able to find `uname', then EMX Unix compatibility
++	# is probably installed.
++	echo ${UNAME_MACHINE}-pc-os2-emx
++	exit 0 ;;
++    *:TOPS-10:*:*)
++	echo pdp10-unknown-tops10
++	exit 0 ;;
++    *:TENEX:*:*)
++	echo pdp10-unknown-tenex
++	exit 0 ;;
++    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
++	echo pdp10-dec-tops20
++	exit 0 ;;
++    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
++	echo pdp10-xkl-tops20
++	exit 0 ;;
++    *:TOPS-20:*:*)
++	echo pdp10-unknown-tops20
++	exit 0 ;;
++    *:ITS:*:*)
++	echo pdp10-unknown-its
++	exit 0 ;;
++    i*86:XTS-300:*:STOP)
++	echo ${UNAME_MACHINE}-unknown-stop
++	exit 0 ;;
++    i*86:atheos:*:*)
++	echo ${UNAME_MACHINE}-unknown-atheos
+ 	exit 0 ;;
+ esac
+ 
+ #echo '(No uname command or uname output not recognized.)' 1>&2
+ #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+ 
++eval $set_cc_for_build
+ cat >$dummy.c <<EOF
+ #ifdef _SEQUENT_
+ # include <sys/types.h>
+@@ -1068,11 +1209,24 @@
+ #endif
+ 
+ #if defined (vax)
+-#if !defined (ultrix)
+-  printf ("vax-dec-bsd\n"); exit (0);
+-#else
+-  printf ("vax-dec-ultrix\n"); exit (0);
+-#endif
++# if !defined (ultrix)
++#  include <sys/param.h>
++#  if defined (BSD)
++#   if BSD == 43
++      printf ("vax-dec-bsd4.3\n"); exit (0);
++#   else
++#    if BSD == 199006
++      printf ("vax-dec-bsd4.3reno\n"); exit (0);
++#    else
++      printf ("vax-dec-bsd\n"); exit (0);
++#    endif
++#   endif
++#  else
++    printf ("vax-dec-bsd\n"); exit (0);
++#  endif
++# else
++    printf ("vax-dec-ultrix\n"); exit (0);
++# endif
+ #endif
+ 
+ #if defined (alliant) && defined (i860)
+@@ -1083,7 +1237,7 @@
+ }
+ EOF
+ 
+-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
++$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0
+ rm -f $dummy.c $dummy
+ 
+ # Apollos put the system type in the environment.
+@@ -1116,6 +1270,48 @@
+     esac
+ fi
+ 
+-#echo '(Unable to guess system type)' 1>&2
++cat >&2 <<EOF
++$0: unable to guess system type
++
++This script, last modified $timestamp, has failed to recognize
++the operating system you are using. It is advised that you
++download the most up to date version of the config scripts from
++
++    ftp://ftp.gnu.org/pub/gnu/config/
++
++If the version you run ($0) is already up to date, please
++send the following data and any information you think might be
++pertinent to <config-patches@gnu.org> in order to provide the needed
++information to handle your system.
++
++config.guess timestamp = $timestamp
++
++uname -m = `(uname -m) 2>/dev/null || echo unknown`
++uname -r = `(uname -r) 2>/dev/null || echo unknown`
++uname -s = `(uname -s) 2>/dev/null || echo unknown`
++uname -v = `(uname -v) 2>/dev/null || echo unknown`
++
++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
++/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
++
++hostinfo               = `(hostinfo) 2>/dev/null`
++/bin/universe          = `(/bin/universe) 2>/dev/null`
++/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
++/bin/arch              = `(/bin/arch) 2>/dev/null`
++/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
++
++UNAME_MACHINE = ${UNAME_MACHINE}
++UNAME_RELEASE = ${UNAME_RELEASE}
++UNAME_SYSTEM  = ${UNAME_SYSTEM}
++UNAME_VERSION = ${UNAME_VERSION}
++EOF
+ 
+ exit 1
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "timestamp='"
++# time-stamp-format: "%:y-%02m-%02d"
++# time-stamp-end: "'"
++# End:
+diff -uNr gtk+-1.2.10-orig/config.sub gtk+-1.2.10/config.sub
+--- gtk+-1.2.10-orig/config.sub	2000-02-03 12:07:42.000000000 +1100
++++ gtk+-1.2.10/config.sub	2005-01-27 01:12:59.011948611 +1100
+@@ -1,6 +1,10 @@
+ #! /bin/sh
+-# Configuration validation subroutine script, version 1.1.
+-#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
++# Configuration validation subroutine script.
++#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
++#   Free Software Foundation, Inc.
++
++timestamp='2001-09-07'
++
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+ # can handle that machine.  It does not imply ALL GNU software can.
+@@ -25,6 +29,8 @@
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
++# Please send patches to <config-patches@gnu.org>.
++#
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+ # If it is invalid, we print an error message on stderr and exit with code 1.
+@@ -45,30 +51,73 @@
+ #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+ # It is wrong to echo any other type of specification.
+ 
+-if [ x$1 = x ]
+-then
+-	echo Configuration name missing. 1>&2
+-	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
+-	echo "or     $0 ALIAS" 1>&2
+-	echo where ALIAS is a recognized configuration type. 1>&2
+-	exit 1
+-fi
++me=`echo "$0" | sed -e 's,.*/,,'`
+ 
+-# First pass through any local machine types.
+-case $1 in
+-	*local*)
+-		echo $1
+-		exit 0
+-		;;
+-	*)
+-	;;
++usage="\
++Usage: $0 [OPTION] CPU-MFR-OPSYS
++       $0 [OPTION] ALIAS
++
++Canonicalize a configuration name.
++
++Operation modes:
++  -h, --help         print this help, then exit
++  -t, --time-stamp   print date of last modification, then exit
++  -v, --version      print version number, then exit
++
++Report bugs and patches to <config-patches@gnu.org>."
++
++version="\
++GNU config.sub ($timestamp)
++
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
++Free Software Foundation, Inc.
++
++This is free software; see the source for copying conditions.  There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++
++help="
++Try \`$me --help' for more information."
++
++# Parse command line
++while test $# -gt 0 ; do
++  case $1 in
++    --time-stamp | --time* | -t )
++       echo "$timestamp" ; exit 0 ;;
++    --version | -v )
++       echo "$version" ; exit 0 ;;
++    --help | --h* | -h )
++       echo "$usage"; exit 0 ;;
++    -- )     # Stop option processing
++       shift; break ;;
++    - )	# Use stdin as input.
++       break ;;
++    -* )
++       echo "$me: invalid option $1$help"
++       exit 1 ;;
++
++    *local*)
++       # First pass through any local machine types.
++       echo $1
++       exit 0;;
++
++    * )
++       break ;;
++  esac
++done
++
++case $# in
++ 0) echo "$me: missing argument$help" >&2
++    exit 1;;
++ 1) ;;
++ *) echo "$me: too many arguments$help" >&2
++    exit 1;;
+ esac
+ 
+ # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+-  linux-gnu*)
++  nto-qnx* | linux-gnu* | storm-chaos* | os2-emx* | windows32-*)
+     os=-$maybe_os
+     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+     ;;
+@@ -94,7 +143,7 @@
+ 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+-	-apple)
++	-apple | -axis)
+ 		os=
+ 		basic_machine=$1
+ 		;;
+@@ -108,6 +157,14 @@
+ 		os=-vxworks
+ 		basic_machine=$1
+ 		;;
++	-chorusos*)
++		os=-chorusos
++		basic_machine=$1
++		;;
++ 	-chorusrdb)
++ 		os=-chorusrdb
++		basic_machine=$1
++ 		;;
+ 	-hiux*)
+ 		os=-hiuxwe2
+ 		;;
+@@ -166,27 +223,50 @@
+ case $basic_machine in
+ 	# Recognize the basic CPU types without company name.
+ 	# Some are omitted here because they have special meanings below.
+-	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+-		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
+-		| 580 | i960 | h8300 \
+-		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
+-		| alpha | alphaev[4-7] | alphaev56 | alphapca5[67] \
+-		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
+-		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
+-		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
+-		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
+-		| mips64vr5000 | miprs64vr5000el | mcore \
+-		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
+-		| thumb | d10v | fr30)
++	1750a | 580 \
++	| a29k \
++	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
++	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
++	| c4x | clipper \
++	| d10v | d30v | dsp16xx \
++	| fr30 \
++	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
++	| i370 | i860 | i960 | ia64 \
++	| m32r | m68000 | m68k | m88k | mcore \
++	| mips16 | mips64 | mips64el | mips64orion | mips64orionel \
++	| mips64vr4100 | mips64vr4100el | mips64vr4300 \
++	| mips64vr4300el | mips64vr5000 | mips64vr5000el \
++	| mipsbe | mipseb | mipsel | mipsle | mipstx39 | mipstx39el \
++	| mipsisa32 \
++	| mn10200 | mn10300 \
++	| ns16k | ns32k \
++	| openrisc \
++	| pdp10 | pdp11 | pj | pjl \
++	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
++	| pyramid \
++	| s390 | s390x \
++	| sh | sh[34] | sh[34]eb | shbe | shle \
++	| sparc | sparc64 | sparclet | sparclite | sparcv9 | sparcv9b \
++	| stormy16 | strongarm \
++	| tahoe | thumb | tic80 | tron \
++	| v850 \
++	| we32k \
++	| x86 | xscale \
++	| z8k)
+ 		basic_machine=$basic_machine-unknown
+ 		;;
+-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
++	m6811 | m68hc11 | m6812 | m68hc12)
++		# Motorola 68HC11/12.
++		basic_machine=$basic_machine-unknown
++		os=-none
++		;;
++	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+ 		;;
+ 
+ 	# We use `pc' rather than `unknown'
+ 	# because (1) that's what they normally are, and
+ 	# (2) the word "unknown" tends to confuse beginning users.
+-	i[34567]86)
++	i*86 | x86_64)
+ 	  basic_machine=$basic_machine-pc
+ 	  ;;
+ 	# Object if more than one company name word.
+@@ -195,24 +275,43 @@
+ 		exit 1
+ 		;;
+ 	# Recognize the basic CPU types with company name.
+-	# FIXME: clean up the formatting here.
+-	vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
+-	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
+-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+-	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
+-	      | xmp-* | ymp-* \
+-	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
+-	      | alpha-* | alphaev[4-7]-* | alphaev56-* | alphapca5[67]-* \
+-	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
+-	      | clipper-* | orion-* \
+-	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+-	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
+-	      | mips64el-* | mips64orion-* | mips64orionel-* \
+-	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
+-	      | mipstx39-* | mipstx39el-* | mcore-* \
+-	      | f301-* | armv*-* | t3e-* \
+-	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
+-	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* )
++	580-* \
++	| a29k-* \
++	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
++	| alphapca5[67]-* | arc-* \
++	| arm-*  | armbe-* | armle-* | armv*-* \
++	| bs2000-* \
++	| c[123]* | c30-* | [cjt]90-* | c54x-* \
++	| clipper-* | cray2-* | cydra-* \
++	| d10v-* | d30v-* \
++	| elxsi-* \
++	| f30[01]-* | f700-* | fr30-* | fx80-* \
++	| h8300-* | h8500-* \
++	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
++	| i*86-* | i860-* | i960-* | ia64-* \
++	| m32r-* \
++	| m68000-* | m680[01234]0-* | m68360-* | m683?2-* | m68k-* \
++	| m88110-* | m88k-* | mcore-* \
++	| mips-* | mips16-* | mips64-* | mips64el-* | mips64orion-* \
++	| mips64orionel-* | mips64vr4100-* | mips64vr4100el-* \
++	| mips64vr4300-* | mips64vr4300el-* | mipsbe-* | mipseb-* \
++	| mipsle-* | mipsel-* | mipstx39-* | mipstx39el-* \
++	| none-* | np1-* | ns16k-* | ns32k-* \
++	| orion-* \
++	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
++	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
++	| pyramid-* \
++	| romp-* | rs6000-* \
++	| s390-* | s390x-* \
++	| sh-* | sh[34]-* | sh[34]eb-* | shbe-* | shle-* \
++	| sparc-* | sparc64-* | sparc86x-* | sparclite-* \
++	| sparcv9-* | sparcv9b-* | stormy16-* | strongarm-* | sv1-* \
++	| t3e-* | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \
++	| v850-* | vax-* \
++	| we32k-* \
++	| x86-* | x86_64-* | xmp-* | xps100-* | xscale-* \
++	| ymp-* \
++	| z8k-*)
+ 		;;
+ 	# Recognize the various machine names and aliases which stand
+ 	# for a CPU type and a company and sometimes even an OS.
+@@ -249,14 +348,14 @@
+ 		os=-sysv
+ 		;;
+ 	amiga | amiga-*)
+-		basic_machine=m68k-cbm
++		basic_machine=m68k-unknown
+ 		;;
+ 	amigaos | amigados)
+-		basic_machine=m68k-cbm
++		basic_machine=m68k-unknown
+ 		os=-amigaos
+ 		;;
+ 	amigaunix | amix)
+-		basic_machine=m68k-cbm
++		basic_machine=m68k-unknown
+ 		os=-sysv4
+ 		;;
+ 	apollo68)
+@@ -303,13 +402,16 @@
+ 		basic_machine=cray2-cray
+ 		os=-unicos
+ 		;;
+-	[ctj]90-cray)
+-		basic_machine=c90-cray
++	[cjt]90)
++		basic_machine=${basic_machine}-cray
+ 		os=-unicos
+ 		;;
+ 	crds | unos)
+ 		basic_machine=m68k-crds
+ 		;;
++	cris | cris-* | etrax*)
++		basic_machine=cris-axis
++		;;
+ 	da30 | da30-*)
+ 		basic_machine=m68k-da30
+ 		;;
+@@ -357,6 +459,10 @@
+ 		basic_machine=tron-gmicro
+ 		os=-sysv
+ 		;;
++	go32)
++		basic_machine=i386-pc
++		os=-go32
++		;;
+ 	h3050r* | hiux*)
+ 		basic_machine=hppa1.1-hitachi
+ 		os=-hiuxwe2
+@@ -432,19 +538,19 @@
+ 		basic_machine=i370-ibm
+ 		;;
+ # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+-	i[34567]86v32)
++	i*86v32)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv32
+ 		;;
+-	i[34567]86v4*)
++	i*86v4*)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv4
+ 		;;
+-	i[34567]86v)
++	i*86v)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv
+ 		;;
+-	i[34567]86sol2)
++	i*86sol2)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-solaris2
+ 		;;
+@@ -456,17 +562,6 @@
+ 		basic_machine=i386-unknown
+ 		os=-vsta
+ 		;;
+-	i386-go32 | go32)
+-		basic_machine=i386-unknown
+-		os=-go32
+-		;;
+-	i386-mingw32 | mingw32)
+-		basic_machine=i386-unknown
+-		os=-mingw32
+-		;;
+-	i386-qnx | qnx)
+-		basic_machine=i386-qnx
+-		;;
+ 	iris | iris4d)
+ 		basic_machine=mips-sgi
+ 		case $os in
+@@ -492,6 +587,10 @@
+ 		basic_machine=ns32k-utek
+ 		os=-sysv
+ 		;;
++	mingw32)
++		basic_machine=i386-pc
++		os=-mingw32
++		;;
+ 	miniframe)
+ 		basic_machine=m68000-convergent
+ 		;;
+@@ -513,12 +612,16 @@
+ 	mips3*)
+ 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+ 		;;
++	mmix*)
++		basic_machine=mmix-knuth
++		os=-mmixware
++		;;
+ 	monitor)
+ 		basic_machine=m68k-rom68k
+ 		os=-coff
+ 		;;
+ 	msdos)
+-		basic_machine=i386-unknown
++		basic_machine=i386-pc
+ 		os=-msdos
+ 		;;
+ 	mvs)
+@@ -582,9 +685,16 @@
+ 		basic_machine=i960-intel
+ 		os=-mon960
+ 		;;
++	nonstopux)
++		basic_machine=mips-compaq
++		os=-nonstopux
++		;;
+ 	np1)
+ 		basic_machine=np1-gould
+ 		;;
++	nsr-tandem)
++		basic_machine=nsr-tandem
++		;;
+ 	op50n-* | op60c-*)
+ 		basic_machine=hppa1.1-oki
+ 		os=-proelf
+@@ -614,28 +724,28 @@
+         pc532 | pc532-*)
+ 		basic_machine=ns32k-pc532
+ 		;;
+-	pentium | p5 | k5 | k6 | nexen)
++	pentium | p5 | k5 | k6 | nexgen)
+ 		basic_machine=i586-pc
+ 		;;
+-	pentiumpro | p6 | 6x86)
++	pentiumpro | p6 | 6x86 | athlon)
+ 		basic_machine=i686-pc
+ 		;;
+ 	pentiumii | pentium2)
+-		basic_machine=i786-pc
++		basic_machine=i686-pc
+ 		;;
+-	pentium-* | p5-* | k5-* | k6-* | nexen-*)
++	pentium-* | p5-* | k5-* | k6-* | nexgen-*)
+ 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+-	pentiumpro-* | p6-* | 6x86-*)
++	pentiumpro-* | p6-* | 6x86-* | athlon-*)
+ 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	pentiumii-* | pentium2-*)
+-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
++		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	pn)
+ 		basic_machine=pn-gould
+ 		;;
+-	power)	basic_machine=rs6000-ibm
++	power)	basic_machine=power-ibm
+ 		;;
+ 	ppc)	basic_machine=powerpc-unknown
+ 	        ;;
+@@ -647,9 +757,23 @@
+ 	ppcle-* | powerpclittle-*)
+ 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
++	ppc64)	basic_machine=powerpc64-unknown
++	        ;;
++	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
++		basic_machine=powerpc64le-unknown
++	        ;;
++	ppc64le-* | powerpc64little-*)
++		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
+ 	ps2)
+ 		basic_machine=i386-ibm
+ 		;;
++	pw32)
++		basic_machine=i586-unknown
++		os=-pw32
++		;;
+ 	rom68k)
+ 		basic_machine=m68k-rom68k
+ 		os=-coff
+@@ -729,6 +853,10 @@
+ 	sun386 | sun386i | roadrunner)
+ 		basic_machine=i386-sun
+ 		;;
++	sv1)
++		basic_machine=sv1-cray
++		os=-unicos
++		;;
+ 	symmetry)
+ 		basic_machine=i386-sequent
+ 		os=-dynix
+@@ -737,6 +865,10 @@
+ 		basic_machine=t3e-cray
+ 		os=-unicos
+ 		;;
++	tic54x | c54x*)
++		basic_machine=tic54x-unknown
++		os=-coff
++		;;
+ 	tx39)
+ 		basic_machine=mipstx39-unknown
+ 		;;
+@@ -789,6 +921,10 @@
+ 		basic_machine=hppa1.1-winbond
+ 		os=-proelf
+ 		;;
++	windows32)
++		basic_machine=i386-pc
++		os=-windows32-msvcrt
++		;;
+ 	xmp)
+ 		basic_machine=xmp-cray
+ 		os=-unicos
+@@ -832,13 +968,20 @@
+ 	vax)
+ 		basic_machine=vax-dec
+ 		;;
++	pdp10)
++		# there are many clones, so DEC is not a safe bet
++		basic_machine=pdp10-unknown
++		;;
+ 	pdp11)
+ 		basic_machine=pdp11-dec
+ 		;;
+ 	we32k)
+ 		basic_machine=we32k-att
+ 		;;
+-	sparc | sparcv9)
++	sh3 | sh4 | sh3eb | sh4eb)
++		basic_machine=sh-unknown
++		;;
++	sparc | sparcv9 | sparcv9b)
+ 		basic_machine=sparc-sun
+ 		;;
+         cydra)
+@@ -860,6 +1003,9 @@
+ 		basic_machine=c4x-none
+ 		os=-coff
+ 		;;
++	*-unknown)
++		# Make sure to match an already-canonicalized machine name.
++		;;
+ 	*)
+ 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ 		exit 1
+@@ -916,14 +1062,30 @@
+ 	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
++	      | -chorusos* | -chorusrdb* \
+ 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+-	      | -interix* | -uwin* | -rhapsody* | -opened* | -openstep* | -oskit*)
++	      | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \
++	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
++	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
++	      | -os2* | -vos*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
++	-qnx*)
++		case $basic_machine in
++		    x86-* | i*86-*)
++			;;
++		    *)
++			os=-nto$os
++			;;
++		esac
++		;;
++	-nto*)
++		os=-nto-qnx
++		;;
+ 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+ 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+-	      | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
++	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+ 		;;
+ 	-mac*)
+ 		os=`echo $os | sed -e 's|mac|macos|'`
+@@ -940,6 +1102,9 @@
+ 	-opened*)
+ 		os=-openedition
+ 		;;
++	-wince*)
++		os=-wince
++		;;
+ 	-osfrose*)
+ 		os=-osfrose
+ 		;;
+@@ -964,6 +1129,9 @@
+ 	-ns2 )
+ 	        os=-nextstep2
+ 		;;
++	-nsk*)
++		os=-nsk
++		;;
+ 	# Preserve the version number of sinix5.
+ 	-sinix5.*)
+ 		os=`echo $os | sed -e 's|sinix|sysv|'`
+@@ -977,9 +1145,6 @@
+ 	-oss*)
+ 		os=-sysv3
+ 		;;
+-        -qnx)
+-		os=-qnx4
+-		;;
+ 	-svr4)
+ 		os=-sysv4
+ 		;;
+@@ -1001,7 +1166,7 @@
+ 	-xenix)
+ 		os=-xenix
+ 		;;
+-        -*mint | -*MiNT)
++        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ 	        os=-mint
+ 		;;
+ 	-none)
+@@ -1035,6 +1200,9 @@
+ 	arm*-semi)
+ 		os=-aout
+ 		;;
++	pdp10-*)
++		os=-tops20
++		;;
+         pdp11-*)
+ 		os=-none
+ 		;;
+@@ -1143,7 +1311,7 @@
+ 	*-masscomp)
+ 		os=-rtu
+ 		;;
+-	f301-fujitsu)
++	f30[01]-fujitsu | f700-fujitsu)
+ 		os=-uxpv
+ 		;;
+ 	*-rom68k)
+@@ -1221,12 +1389,23 @@
+ 			-mpw* | -macos*)
+ 				vendor=apple
+ 				;;
+-			-*mint | -*MiNT)
++			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ 				vendor=atari
+ 				;;
++			-vos*)
++				vendor=stratus
++				;;
+ 		esac
+ 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+ 		;;
+ esac
+ 
+ echo $basic_machine$os
++exit 0
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "timestamp='"
++# time-stamp-format: "%:y-%02m-%02d"
++# time-stamp-end: "'"
++# End:
Index: scripts/untested/blfs-patches/inotify-0.17-rml-2.6.10-2.patch
===================================================================
--- scripts/untested/blfs-patches/inotify-0.17-rml-2.6.10-2.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/inotify-0.17-rml-2.6.10-2.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1729 @@
+inotify.
+
+Signed-off-by: Robert Love <rml@novell.com>
+
+ drivers/char/Kconfig       |   13 
+ drivers/char/Makefile      |    2 
+ drivers/char/inotify.c     | 1024 +++++++++++++++++++++++++++++++++++++++++++++
+ drivers/char/misc.c        |   14 
+ fs/attr.c                  |   73 ++-
+ fs/file_table.c            |    7 
+ fs/inode.c                 |    3 
+ fs/namei.c                 |   36 +
+ fs/open.c                  |    5 
+ fs/read_write.c            |   33 +
+ fs/super.c                 |    2 
+ include/linux/fs.h         |    7 
+ include/linux/inotify.h    |  155 ++++++
+ include/linux/miscdevice.h |    5 
+ include/linux/sched.h      |    2 
+ kernel/user.c              |    2 
+ 16 files changed, 1344 insertions(+), 39 deletions(-)
+
+diff -urN linux-2.6.10/drivers/char/inotify.c linux/drivers/char/inotify.c
+--- linux-2.6.10/drivers/char/inotify.c	1969-12-31 19:00:00.000000000 -0500
++++ linux/drivers/char/inotify.c	2005-01-06 15:04:03.739780352 -0500
+@@ -0,0 +1,1024 @@
++/*
++ * Inode based directory notifications for Linux.
++ *
++ * Copyright (C) 2004 John McCutchan
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ */
++
++#include <linux/module.h>
++#include <linux/kernel.h>
++#include <linux/sched.h>
++#include <linux/spinlock.h>
++#include <linux/idr.h>
++#include <linux/slab.h>
++#include <linux/fs.h>
++#include <linux/namei.h>
++#include <linux/poll.h>
++#include <linux/device.h>
++#include <linux/miscdevice.h>
++#include <linux/init.h>
++#include <linux/list.h>
++#include <linux/writeback.h>
++#include <linux/inotify.h>
++
++#include <asm/ioctls.h>
++
++static atomic_t inotify_cookie;
++static kmem_cache_t *watch_cachep;
++static kmem_cache_t *event_cachep;
++static kmem_cache_t *inode_data_cachep;
++
++static int sysfs_attrib_max_user_devices;
++static int sysfs_attrib_max_user_watches;
++static unsigned int sysfs_attrib_max_queued_events;
++
++/*
++ * struct inotify_device - represents an open instance of an inotify device
++ *
++ * For each inotify device, we need to keep track of the events queued on it,
++ * a list of the inodes that we are watching, and so on.
++ *
++ * This structure is protected by 'lock'.  Lock ordering:
++ *
++ * dev->lock (protects dev)
++ *	inode_lock (used to safely walk inode_in_use list)
++ *		inode->i_lock (only needed for getting ref on inode_data)
++ */
++struct inotify_device {
++	wait_queue_head_t 	wait;
++	struct idr		idr;
++	struct list_head 	events;
++	struct list_head 	watches;
++	spinlock_t		lock;
++	unsigned int		event_count;
++	unsigned int		max_events;
++	struct user_struct	*user;
++};
++
++struct inotify_watch {
++	s32 			wd;	/* watch descriptor */
++	u32			mask;
++	struct inode		*inode;
++	struct inotify_device	*dev;
++	struct list_head	d_list;	/* device list */
++	struct list_head	i_list; /* inode list */
++};
++
++static ssize_t show_max_queued_events(struct class_device *class, char *buf)
++{
++	return sprintf(buf, "%d\n", sysfs_attrib_max_queued_events);
++}
++
++static ssize_t store_max_queued_events(struct class_device *class,
++				       const char *buf, size_t count)
++{
++	unsigned int max;
++
++	if (sscanf(buf, "%u", &max) > 0 && max > 0) {
++		sysfs_attrib_max_queued_events = max;
++		return strlen(buf);
++	}
++	return -EINVAL;
++}
++
++static ssize_t show_max_user_devices(struct class_device *class, char *buf)
++{
++	return sprintf(buf, "%d\n", sysfs_attrib_max_user_devices);
++}
++
++static ssize_t store_max_user_devices(struct class_device *class,
++				      const char *buf, size_t count)
++{
++	int max;
++
++	if (sscanf(buf, "%d", &max) > 0 && max > 0) {
++		sysfs_attrib_max_user_devices = max;
++		return strlen(buf);
++	}
++	return -EINVAL;
++}
++
++static ssize_t show_max_user_watches(struct class_device *class, char *buf)
++{
++	return sprintf(buf, "%d\n", sysfs_attrib_max_user_watches);
++}
++
++static ssize_t store_max_user_watches(struct class_device *class,
++				      const char *buf, size_t count)
++{
++	int max;
++
++	if (sscanf(buf, "%d", &max) > 0 && max > 0) {
++		sysfs_attrib_max_user_watches = max;
++		return strlen(buf);
++	}
++	return -EINVAL;
++}
++
++static CLASS_DEVICE_ATTR(max_queued_events, S_IRUGO | S_IWUSR,
++	show_max_queued_events, store_max_queued_events);
++static CLASS_DEVICE_ATTR(max_user_devices, S_IRUGO | S_IWUSR,
++	show_max_user_devices, store_max_user_devices);
++static CLASS_DEVICE_ATTR(max_user_watches, S_IRUGO | S_IWUSR,
++	show_max_user_watches, store_max_user_watches);
++
++/*
++ * A list of these is attached to each instance of the driver
++ * when the drivers read() gets called, this list is walked and
++ * all events that can fit in the buffer get delivered
++ */
++struct inotify_kernel_event {
++        struct list_head        list;
++	struct inotify_event	event;
++};
++
++static inline void __get_inode_data(struct inotify_inode_data *data)
++{
++	atomic_inc(&data->count);
++}
++
++/*
++ * get_inode_data - pin an inotify_inode_data structure.  Returns the structure
++ * if successful and NULL on failure, which can only occur if inotify_data is
++ * not yet allocated.  The inode must be pinned prior to invocation.
++ */
++static inline struct inotify_inode_data * get_inode_data(struct inode *inode)
++{
++	struct inotify_inode_data *data;
++
++	spin_lock(&inode->i_lock);
++	data = inode->inotify_data;
++	if (data)
++		__get_inode_data(data);
++	spin_unlock(&inode->i_lock);
++
++	return data;
++}
++
++/*
++ * put_inode_data - drop our reference on an inotify_inode_data and the
++ * inode structure in which it lives.  If the reference count on inotify_data
++ * reaches zero, free it.
++ */
++static inline void put_inode_data(struct inode *inode)
++{
++	//spin_lock(&inode->i_lock);
++	if (atomic_dec_and_test(&inode->inotify_data->count)) {
++		kmem_cache_free(inode_data_cachep, inode->inotify_data);
++		inode->inotify_data = NULL;
++	}
++	//spin_unlock(&inode->i_lock);
++}
++
++/*
++ * find_inode - resolve a user-given path to a specific inode and iget() it
++ */
++static struct inode * find_inode(const char __user *dirname)
++{
++	struct inode *inode;
++	struct nameidata nd;
++	int error;
++
++	error = __user_walk(dirname, LOOKUP_FOLLOW, &nd);
++	if (error)
++		return ERR_PTR(error);
++
++	inode = nd.dentry->d_inode;
++
++	/* you can only watch an inode if you have read permissions on it */
++	error = permission(inode, MAY_READ, NULL);
++	if (error) {
++		inode = ERR_PTR(error);
++		goto release_and_out;
++	}
++
++	spin_lock(&inode_lock);
++	__iget(inode);
++	spin_unlock(&inode_lock);
++release_and_out:
++	path_release(&nd);
++	return inode;
++}
++
++struct inotify_kernel_event * kernel_event(s32 wd, u32 mask, u32 cookie,
++					   const char *filename)
++{
++	struct inotify_kernel_event *kevent;
++
++	kevent = kmem_cache_alloc(event_cachep, GFP_ATOMIC);
++	if (!kevent)
++		return NULL;
++
++	/* we hand this out to user-space, so zero it out just in case */
++	memset(kevent, 0, sizeof(struct inotify_kernel_event));
++
++	kevent->event.wd = wd;
++	kevent->event.mask = mask;
++	kevent->event.cookie = cookie;
++	INIT_LIST_HEAD(&kevent->list);
++
++	if (filename) {
++		strncpy(kevent->event.filename, filename, INOTIFY_FILENAME_MAX);
++		kevent->event.filename[INOTIFY_FILENAME_MAX-1] = '\0';
++	} else
++		kevent->event.filename[0] = '\0';
++
++	return kevent;
++}
++
++void delete_kernel_event(struct inotify_kernel_event *kevent)
++{
++	if (!kevent)
++		return;
++	kmem_cache_free(event_cachep, kevent);
++}
++
++#define list_to_inotify_kernel_event(pos)	\
++		list_entry((pos), struct inotify_kernel_event, list)
++
++#define inotify_dev_get_event(dev)		\
++		(list_to_inotify_kernel_event(dev->events.next))
++
++/* Does this events mask get sent to the watch ? */
++#define event_and(event_mask,watches_mask) 	((event_mask == IN_UNMOUNT) || \
++						(event_mask == IN_IGNORED) || \
++						(event_mask & watches_mask))
++
++/*
++ * inotify_dev_queue_event - add a new event to the given device
++ *
++ * Caller must hold dev->lock.
++ */
++static void inotify_dev_queue_event(struct inotify_device *dev,
++				    struct inotify_watch *watch, u32 mask,
++				    u32 cookie, const char *filename)
++{
++	struct inotify_kernel_event *kevent, *last;
++
++	/* Check if the new event is a duplicate of the last event queued. */
++	last = inotify_dev_get_event(dev);
++	if (dev->event_count && last->event.mask == mask &&
++			last->event.wd == watch->wd) {
++		/* Check if the filenames match */
++		if (!filename && last->event.filename[0] == '\0')
++			return;
++		if (filename && !strcmp(last->event.filename, filename))
++			return;
++	}
++
++	/*
++	 * the queue has already overflowed and we have already sent the
++	 * Q_OVERFLOW event
++	 */
++	if (dev->event_count > dev->max_events)
++		return;
++
++	/* the queue has just overflowed and we need to notify user space */
++	if (dev->event_count == dev->max_events) {
++		kevent = kernel_event(-1, IN_Q_OVERFLOW, cookie, NULL);
++		goto add_event_to_queue;
++	}
++
++	if (!event_and(mask, watch->inode->inotify_data->watch_mask) ||
++			!event_and(mask, watch->mask))
++		return;
++
++	kevent = kernel_event(watch->wd, mask, cookie, filename);
++
++add_event_to_queue:
++	if (!kevent)
++		return;
++
++	/* queue the event and wake up anyone waiting */
++	dev->event_count++;	
++	list_add_tail(&kevent->list, &dev->events);
++	wake_up_interruptible(&dev->wait);
++}
++
++static inline int inotify_dev_has_events(struct inotify_device *dev)
++{
++	return !list_empty(&dev->events);
++}
++
++/*
++ * inotify_dev_event_dequeue - destroy an event on the given device
++ *
++ * Caller must hold dev->lock.
++ */
++static void inotify_dev_event_dequeue(struct inotify_device *dev)
++{
++	struct inotify_kernel_event *kevent;
++
++	if (!inotify_dev_has_events(dev))
++		return;
++
++	kevent = inotify_dev_get_event(dev);
++	list_del_init(&kevent->list);
++	dev->event_count--;
++	delete_kernel_event(kevent);
++}
++
++/*
++ * inotify_dev_get_wd - returns the next WD for use by the given dev
++ *
++ * This function can sleep.
++ */
++static int inotify_dev_get_wd(struct inotify_device *dev,
++			     struct inotify_watch *watch)
++{
++	int ret;
++
++	if (atomic_read(&dev->user->inotify_watches) >=
++			sysfs_attrib_max_user_watches)
++		return -ENOSPC;
++
++repeat:
++	if (!idr_pre_get(&dev->idr, GFP_KERNEL))
++		return -ENOSPC;
++	spin_lock(&dev->lock);
++	ret = idr_get_new(&dev->idr, watch, &watch->wd);
++	spin_unlock(&dev->lock);
++	if (ret == -EAGAIN) /* more memory is required, try again */
++		goto repeat;
++	else if (ret)       /* the idr is full! */
++		return -ENOSPC;
++
++	atomic_inc(&dev->user->inotify_watches);
++
++	return 0;
++}
++
++/*
++ * inotify_dev_put_wd - release the given WD on the given device
++ *
++ * Caller must hold dev->lock.
++ */
++static int inotify_dev_put_wd(struct inotify_device *dev, s32 wd)
++{
++	if (!dev || wd < 0)
++		return -1;
++
++	atomic_dec(&dev->user->inotify_watches);
++	idr_remove(&dev->idr, wd);
++
++	return 0;
++}
++
++/*
++ * create_watch - creates a watch on the given device.
++ *
++ * Grabs dev->lock, so the caller must not hold it.
++ */
++static struct inotify_watch *create_watch(struct inotify_device *dev,
++					  u32 mask, struct inode *inode)
++{
++	struct inotify_watch *watch;
++
++	watch = kmem_cache_alloc(watch_cachep, GFP_KERNEL);
++	if (!watch)
++		return NULL;
++
++	watch->mask = mask;
++	watch->inode = inode;
++	watch->dev = dev;
++	INIT_LIST_HEAD(&watch->d_list);
++	INIT_LIST_HEAD(&watch->i_list);
++
++	if (inotify_dev_get_wd(dev, watch)) {
++		kmem_cache_free(watch_cachep, watch);
++		return NULL;
++	}
++
++	return watch;
++}
++
++/*
++ * delete_watch - removes the given 'watch' from the given 'dev'
++ *
++ * Caller must hold dev->lock.
++ */
++static void delete_watch(struct inotify_device *dev,
++			 struct inotify_watch *watch)
++{
++	inotify_dev_put_wd(dev, watch->wd);
++	kmem_cache_free(watch_cachep, watch);
++}
++
++/*
++ * inotify_find_dev - find the watch associated with the given inode and dev
++ *
++ * Caller must hold dev->lock.
++ * FIXME: Needs inotify_data->lock too.  Don't need dev->lock, just pin it.
++ */
++static struct inotify_watch *inode_find_dev(struct inode *inode,
++					    struct inotify_device *dev)
++{
++	struct inotify_watch *watch;
++
++	if (!inode->inotify_data)
++		return NULL;
++
++	list_for_each_entry(watch, &inode->inotify_data->watches, i_list) {
++		if (watch->dev == dev)
++			return watch;
++	}
++
++	return NULL;
++}
++
++/*
++ * dev_find_wd - given a (dev,wd) pair, returns the matching inotify_watcher
++ *
++ * Returns the results of looking up (dev,wd) in the idr layer.  NULL is
++ * returned on error.
++ *
++ * The caller must hold dev->lock.
++ */
++static inline struct inotify_watch *dev_find_wd(struct inotify_device *dev,
++						u32 wd)
++{
++	return idr_find(&dev->idr, wd);
++}
++
++static int inotify_dev_is_watching_inode(struct inotify_device *dev,
++					 struct inode *inode)
++{
++	struct inotify_watch *watch;
++
++	list_for_each_entry(watch, &dev->watches, d_list) {
++		if (watch->inode == inode)
++			return 1;
++	}
++
++	return 0;
++}
++
++/*
++ * inotify_dev_add_watcher - add the given watcher to the given device instance
++ *
++ * Caller must hold dev->lock.
++ */
++static int inotify_dev_add_watch(struct inotify_device *dev,
++				 struct inotify_watch *watch)
++{
++	if (!dev || !watch)
++		return -EINVAL;
++
++	list_add(&watch->d_list, &dev->watches);
++	return 0;
++}
++
++/*
++ * inotify_dev_rm_watch - remove the given watch from the given device
++ *
++ * Caller must hold dev->lock because we call inotify_dev_queue_event().
++ */
++static int inotify_dev_rm_watch(struct inotify_device *dev,
++				struct inotify_watch *watch)
++{
++	if (!watch)
++		return -EINVAL;
++
++	inotify_dev_queue_event(dev, watch, IN_IGNORED, 0, NULL);
++	list_del_init(&watch->d_list);
++
++	return 0;
++}
++
++/*
++ * inode_update_watch_mask - update inode->inotify_data->watch_mask
++ *
++ * Grabs inode->inotify_data->lock.
++ */
++static void inode_update_watch_mask(struct inode *inode)
++{
++	struct inotify_inode_data *data;
++	struct inotify_watch *watch;
++	u32 new_mask;
++
++	data = get_inode_data(inode);
++	if (!data)	/* FIXME: this should never happen */
++		return;
++	spin_lock(&data->lock);
++
++	new_mask = 0;
++	list_for_each_entry(watch, &data->watches, i_list)
++		new_mask |= watch->mask;
++
++	data->watch_mask = new_mask;
++
++	spin_unlock(&data->lock);
++	put_inode_data(inode);
++}
++
++/*
++ * inode_add_watch - add a watch to the given inode
++ *
++ * Callers must hold dev->lock, because we call inode_find_dev().
++ */
++static int inode_add_watch(struct inode *inode, struct inotify_watch *watch)
++{
++	int ret;
++
++	if (!inode || !watch)
++		return -EINVAL;
++
++	spin_lock(&inode->i_lock);
++	if (!inode->inotify_data) {
++		/* inotify_data is not attached to the inode, so add it */
++		inode->inotify_data = kmem_cache_alloc(inode_data_cachep,
++						       GFP_ATOMIC);
++		if (!inode->inotify_data) {
++			ret = -ENOMEM;
++			goto out_lock;
++		}
++
++		atomic_set(&inode->inotify_data->count, 0);
++		INIT_LIST_HEAD(&inode->inotify_data->watches);
++		inode->inotify_data->watch_mask = 0;
++		spin_lock_init(&inode->inotify_data->lock);
++	} else if (inode_find_dev(inode, watch->dev)) {
++		/* a watch is already associated with this (inode,dev) pair */
++		ret = -EINVAL;
++		goto out_lock;
++	}
++	__get_inode_data(inode->inotify_data);
++	spin_unlock(&inode->i_lock);
++
++	list_add(&watch->i_list, &inode->inotify_data->watches);
++	inode_update_watch_mask(inode);
++
++	return 0;
++out_lock:
++	spin_unlock(&inode->i_lock);
++	return ret;
++}
++
++static int inode_rm_watch(struct inode *inode,
++			  struct inotify_watch *watch)
++{
++	if (!inode || !watch || !inode->inotify_data)
++		return -EINVAL;
++
++	list_del_init(&watch->i_list);
++	inode_update_watch_mask(inode);
++
++	/* clean up inode->inotify_data */
++	put_inode_data(inode);	
++
++	return 0;
++}
++
++/* Kernel API */
++
++/*
++ * inotify_inode_queue_event - queue an event with the given mask, cookie, and
++ * filename to any watches associated with the given inode.
++ *
++ * inode must be pinned prior to calling.
++ */
++void inotify_inode_queue_event(struct inode *inode, u32 mask, u32 cookie,
++			       const char *filename)
++{
++	struct inotify_watch *watch;
++
++	if (!inode->inotify_data)
++		return;
++
++	list_for_each_entry(watch, &inode->inotify_data->watches, i_list) {
++		spin_lock(&watch->dev->lock);
++		inotify_dev_queue_event(watch->dev, watch, mask, cookie,
++					filename);
++		spin_unlock(&watch->dev->lock);
++	}
++}
++EXPORT_SYMBOL_GPL(inotify_inode_queue_event);
++
++void inotify_dentry_parent_queue_event(struct dentry *dentry, u32 mask,
++				       u32 cookie, const char *filename)
++{
++	struct dentry *parent;
++
++	parent = dget_parent(dentry);
++	inotify_inode_queue_event(parent->d_inode, mask, cookie, filename);
++	dput(parent);
++}
++EXPORT_SYMBOL_GPL(inotify_dentry_parent_queue_event);
++
++u32 inotify_get_cookie(void)
++{
++	atomic_inc(&inotify_cookie);
++	return atomic_read(&inotify_cookie);
++}
++EXPORT_SYMBOL_GPL(inotify_get_cookie);
++
++/*
++ * watch->inode must be pinned.  We drop a reference before returning.
++ */
++static void ignore_helper(struct inotify_watch *watch, int event)
++{
++	struct inotify_device *dev;
++	struct inode *inode;
++
++	inode = watch->inode;
++	dev = watch->dev;
++
++	spin_lock(&dev->lock);
++
++	if (event)
++		inotify_dev_queue_event(dev, watch, event, 0, NULL);
++
++	inode_rm_watch(inode, watch);
++	inotify_dev_rm_watch(watch->dev, watch);
++
++	delete_watch(dev, watch);
++	spin_unlock(&dev->lock);
++
++	iput(inode);
++}
++
++void inotify_super_block_umount(struct super_block *sb)
++{
++	struct inode *inode;
++
++	spin_lock(&inode_lock);
++
++	/*
++	 * We hold the inode_lock, so the inodes are not going anywhere, and
++	 * we grab a reference on inotify_data before walking its list of
++	 * watches.
++	 */
++	list_for_each_entry(inode, &inode_in_use, i_list) {
++		struct inotify_inode_data *inode_data;
++		struct inotify_watch *watch;
++
++		if (inode->i_sb != sb)
++			continue;
++
++		inode_data = get_inode_data(inode);
++		if (!inode_data)
++			continue;
++
++		list_for_each_entry(watch, &inode_data->watches, i_list)
++			ignore_helper(watch, IN_UNMOUNT);
++		put_inode_data(inode);
++	}
++
++	spin_unlock(&inode_lock);
++}
++EXPORT_SYMBOL_GPL(inotify_super_block_umount);
++
++/*
++ * inotify_inode_is_dead - an inode has been deleted, cleanup any watches
++ */
++void inotify_inode_is_dead(struct inode *inode)
++{
++	struct inotify_watch *watch, *next;
++	struct inotify_inode_data *data;
++
++	data = get_inode_data(inode);
++	if (!data)
++		return;
++	list_for_each_entry_safe(watch, next, &data->watches, i_list)
++		ignore_helper(watch, 0);
++	put_inode_data(inode);
++}
++EXPORT_SYMBOL_GPL(inotify_inode_is_dead);
++
++/* The driver interface is implemented below */
++
++static unsigned int inotify_poll(struct file *file, poll_table *wait)
++{
++        struct inotify_device *dev;
++
++        dev = file->private_data;
++
++        poll_wait(file, &dev->wait, wait);
++
++        if (inotify_dev_has_events(dev))
++                return POLLIN | POLLRDNORM;
++
++        return 0;
++}
++
++static ssize_t inotify_read(struct file *file, char __user *buf,
++			    size_t count, loff_t *pos)
++{
++	size_t event_size;
++	struct inotify_device *dev;
++	char __user *start;
++	DECLARE_WAITQUEUE(wait, current);
++
++	start = buf;
++	dev = file->private_data;
++
++	/* We only hand out full inotify events */
++	event_size = sizeof(struct inotify_event);
++	if (count < event_size)
++		return -EINVAL;
++
++	while (1) {
++		int has_events;
++
++		spin_lock(&dev->lock);
++		has_events = inotify_dev_has_events(dev);
++		spin_unlock(&dev->lock);
++		if (has_events)
++			break;
++
++		if (file->f_flags & O_NONBLOCK)
++			return -EAGAIN;
++
++		if (signal_pending(current))
++			return -ERESTARTSYS;
++
++		add_wait_queue(&dev->wait, &wait);
++		set_current_state(TASK_INTERRUPTIBLE);
++
++		schedule();
++
++		set_current_state(TASK_RUNNING);		
++		remove_wait_queue(&dev->wait, &wait);
++	}
++
++	while (count >= event_size) {
++		struct inotify_kernel_event *kevent;
++
++		spin_lock(&dev->lock);
++		if (!inotify_dev_has_events(dev)) {
++			spin_unlock(&dev->lock);
++			break;
++		}
++		kevent = inotify_dev_get_event(dev);
++		spin_unlock(&dev->lock);
++		if (copy_to_user(buf, &kevent->event, event_size))
++			return -EFAULT;
++
++		spin_lock(&dev->lock);
++		inotify_dev_event_dequeue(dev);
++		spin_unlock(&dev->lock);
++		count -= event_size;
++		buf += event_size;
++	}
++
++	return buf - start;
++}
++
++static int inotify_open(struct inode *inode, struct file *file)
++{
++	struct inotify_device *dev;
++	struct user_struct *user;
++	int ret;
++
++	user = get_uid(current->user);
++
++	if (atomic_read(&user->inotify_devs) >= sysfs_attrib_max_user_devices) {
++		ret = -ENOSPC;
++		goto out_err;
++	}
++
++	atomic_inc(&current->user->inotify_devs);
++
++	dev = kmalloc(sizeof(struct inotify_device), GFP_KERNEL);
++	if (!dev) {
++		ret = -ENOMEM;
++		goto out_err;
++	}
++
++	idr_init(&dev->idr);
++
++	INIT_LIST_HEAD(&dev->events);
++	INIT_LIST_HEAD(&dev->watches);
++	init_waitqueue_head(&dev->wait);
++
++	dev->event_count = 0;
++	dev->max_events = sysfs_attrib_max_queued_events;
++	dev->user = user;
++	spin_lock_init(&dev->lock);
++
++	file->private_data = dev;
++
++	return 0;
++out_err:
++	free_uid(current->user);
++	return ret;
++}
++
++/*
++ * inotify_release_all_watches - destroy all watches on a given device
++ *
++ * FIXME: Do we want a lock here?
++ */
++static void inotify_release_all_watches(struct inotify_device *dev)
++{
++	struct inotify_watch *watch, *next;
++
++	list_for_each_entry_safe(watch, next, &dev->watches, d_list)
++		ignore_helper(watch, 0);
++}
++
++/*
++ * inotify_release_all_events - destroy all of the events on a given device
++ */
++static void inotify_release_all_events(struct inotify_device *dev)
++{
++	spin_lock(&dev->lock);
++	while (inotify_dev_has_events(dev))
++		inotify_dev_event_dequeue(dev);
++	spin_unlock(&dev->lock);
++}
++
++static int inotify_release(struct inode *inode, struct file *file)
++{
++	struct inotify_device *dev;
++
++	dev = file->private_data;
++
++	inotify_release_all_watches(dev);
++	inotify_release_all_events(dev);
++
++	atomic_dec(&dev->user->inotify_devs);
++	free_uid(dev->user);
++
++	kfree(dev);
++
++	return 0;
++}
++
++static int inotify_add_watch(struct inotify_device *dev,
++			     struct inotify_watch_request *request)
++{
++	struct inode *inode;
++	struct inotify_watch *watch;
++	int ret;
++
++	inode = find_inode((const char __user*) request->dirname);
++	if (IS_ERR(inode))
++		return PTR_ERR(inode);
++
++	spin_lock(&dev->lock);
++
++	/*
++	 * This handles the case of re-adding a directory we are already
++	 * watching, we just update the mask and return 0
++	 */
++	if (inotify_dev_is_watching_inode(dev, inode)) {
++		struct inotify_watch *owatch;	/* the old watch */
++
++		owatch = inode_find_dev(inode, dev);
++		owatch->mask = request->mask;
++		inode_update_watch_mask(inode);
++		spin_unlock(&dev->lock);
++		iput(inode);
++
++		return owatch->wd;
++	}
++
++	spin_unlock(&dev->lock);
++
++	watch = create_watch(dev, request->mask, inode);
++	if (!watch) {
++		iput(inode);
++		return -ENOSPC;
++	}
++
++	spin_lock(&dev->lock);
++
++	/* We can't add anymore watches to this device */
++	if (inotify_dev_add_watch(dev, watch)) {
++		delete_watch(dev, watch);
++		spin_unlock(&dev->lock);
++		iput(inode);
++		return -EINVAL;
++	}
++
++	ret = inode_add_watch(inode, watch);
++	if (ret < 0) {
++		list_del_init(&watch->d_list);
++		delete_watch(dev, watch);
++		spin_unlock(&dev->lock);
++		iput(inode);
++		return ret;
++	}
++
++	spin_unlock(&dev->lock);
++
++	return watch->wd;
++}
++
++static int inotify_ignore(struct inotify_device *dev, s32 wd)
++{
++	struct inotify_watch *watch;
++
++	/*
++	 * FIXME: Silly to grab dev->lock here and then drop it, when
++	 * ignore_helper() grabs it anyway a few lines down.
++	 */
++	spin_lock(&dev->lock);
++	watch = dev_find_wd(dev, wd);
++	spin_unlock(&dev->lock);
++	if (!watch)
++		return -EINVAL;
++	ignore_helper(watch, 0);
++
++	return 0;
++}
++
++/*
++ * inotify_ioctl() - our device file's ioctl method
++ *
++ * The VFS serializes all of our calls via the BKL and we rely on that.  We
++ * could, alternatively, grab dev->lock.  Right now lower levels grab that
++ * where needed.
++ */
++static int inotify_ioctl(struct inode *ip, struct file *fp,
++			 unsigned int cmd, unsigned long arg)
++{
++	struct inotify_device *dev;
++	struct inotify_watch_request request;
++	void __user *p;
++	int bytes;
++	s32 wd;
++
++	dev = fp->private_data;
++	p = (void __user *) arg;
++
++	switch (cmd) {
++	case INOTIFY_WATCH:
++		if (copy_from_user(&request, p, sizeof (request)))
++			return -EFAULT;
++		return inotify_add_watch(dev, &request);
++	case INOTIFY_IGNORE:
++		if (copy_from_user(&wd, p, sizeof (wd)))
++			return -EFAULT;
++		return inotify_ignore(dev, wd);
++	case FIONREAD:
++		bytes = dev->event_count * sizeof(struct inotify_event);
++		return put_user(bytes, (int __user *) p);
++	default:
++		return -ENOTTY;
++	}
++}
++
++static struct file_operations inotify_fops = {
++	.owner		= THIS_MODULE,
++	.poll		= inotify_poll,
++	.read		= inotify_read,
++	.open		= inotify_open,
++	.release	= inotify_release,
++	.ioctl		= inotify_ioctl,
++};
++
++struct miscdevice inotify_device = {
++	.minor  = MISC_DYNAMIC_MINOR,
++	.name	= "inotify",
++	.fops	= &inotify_fops,
++};
++
++static int __init inotify_init(void)
++{
++	struct class_device *class;
++	int ret;
++
++	ret = misc_register(&inotify_device);
++	if (ret)
++		return ret;
++
++	sysfs_attrib_max_queued_events = 512;
++	sysfs_attrib_max_user_devices = 64;
++	sysfs_attrib_max_user_watches = 16384;
++
++	class = inotify_device.class;
++	class_device_create_file(class, &class_device_attr_max_queued_events);
++	class_device_create_file(class, &class_device_attr_max_user_devices);
++	class_device_create_file(class, &class_device_attr_max_user_watches);
++
++	atomic_set(&inotify_cookie, 0);
++
++	watch_cachep = kmem_cache_create("inotify_watch_cache",
++			sizeof(struct inotify_watch), 0, SLAB_PANIC,
++			NULL, NULL);
++
++	event_cachep = kmem_cache_create("inotify_event_cache",
++			sizeof(struct inotify_kernel_event), 0,
++			SLAB_PANIC, NULL, NULL);
++
++	inode_data_cachep = kmem_cache_create("inotify_inode_data_cache",
++			sizeof(struct inotify_inode_data), 0, SLAB_PANIC,
++			NULL, NULL);
++
++	printk(KERN_INFO "inotify device minor=%d\n", inotify_device.minor);
++
++	return 0;
++}
++
++module_init(inotify_init);
+diff -urN linux-2.6.10/drivers/char/Kconfig linux/drivers/char/Kconfig
+--- linux-2.6.10/drivers/char/Kconfig	2004-12-24 16:33:49.000000000 -0500
++++ linux/drivers/char/Kconfig	2005-01-06 15:04:03.741780048 -0500
+@@ -62,6 +62,19 @@
+ 	depends on VT && !S390 && !USERMODE
+ 	default y
+ 
++config INOTIFY
++	bool "Inotify file change notification support"
++	default y
++	---help---
++	  Say Y here to enable inotify support and the /dev/inotify character
++	  device.  Inotify is a file change notification system and a
++	  replacement for dnotify.  Inotify fixes numerous shortcomings in
++	  dnotify and introduces several new features.  It allows monitoring
++	  of both files and directories via a single open fd.  Multiple file
++	  events are supported.
++	  
++	  If unsure, say Y.
++
+ config SERIAL_NONSTANDARD
+ 	bool "Non-standard serial port support"
+ 	---help---
+diff -urN linux-2.6.10/drivers/char/Makefile linux/drivers/char/Makefile
+--- linux-2.6.10/drivers/char/Makefile	2004-12-24 16:35:29.000000000 -0500
++++ linux/drivers/char/Makefile	2005-01-06 15:04:03.741780048 -0500
+@@ -9,6 +9,8 @@
+ 
+ obj-y	 += mem.o random.o tty_io.o n_tty.o tty_ioctl.o
+ 
++
++obj-$(CONFIG_INOTIFY)           += inotify.o
+ obj-$(CONFIG_LEGACY_PTYS)	+= pty.o
+ obj-$(CONFIG_UNIX98_PTYS)	+= pty.o
+ obj-y				+= misc.o
+diff -urN linux-2.6.10/drivers/char/misc.c linux/drivers/char/misc.c
+--- linux-2.6.10/drivers/char/misc.c	2004-12-24 16:35:28.000000000 -0500
++++ linux/drivers/char/misc.c	2005-01-06 15:04:03.742779896 -0500
+@@ -207,10 +207,9 @@
+ int misc_register(struct miscdevice * misc)
+ {
+ 	struct miscdevice *c;
+-	struct class_device *class;
+ 	dev_t dev;
+ 	int err;
+-	
++
+ 	down(&misc_sem);
+ 	list_for_each_entry(c, &misc_list, list) {
+ 		if (c->minor == misc->minor) {
+@@ -224,8 +223,7 @@
+ 		while (--i >= 0)
+ 			if ( (misc_minors[i>>3] & (1 << (i&7))) == 0)
+ 				break;
+-		if (i<0)
+-		{
++		if (i<0) {
+ 			up(&misc_sem);
+ 			return -EBUSY;
+ 		}
+@@ -240,10 +238,10 @@
+ 	}
+ 	dev = MKDEV(MISC_MAJOR, misc->minor);
+ 
+-	class = class_simple_device_add(misc_class, dev,
+-					misc->dev, misc->name);
+-	if (IS_ERR(class)) {
+-		err = PTR_ERR(class);
++	misc->class = class_simple_device_add(misc_class, dev,
++					      misc->dev, misc->name);
++	if (IS_ERR(misc->class)) {
++		err = PTR_ERR(misc->class);
+ 		goto out;
+ 	}
+ 
+diff -urN linux-2.6.10/fs/attr.c linux/fs/attr.c
+--- linux-2.6.10/fs/attr.c	2004-12-24 16:34:00.000000000 -0500
++++ linux/fs/attr.c	2005-01-06 15:04:03.743779744 -0500
+@@ -11,6 +11,7 @@
+ #include <linux/string.h>
+ #include <linux/smp_lock.h>
+ #include <linux/dnotify.h>
++#include <linux/inotify.h>
+ #include <linux/fcntl.h>
+ #include <linux/quotaops.h>
+ #include <linux/security.h>
+@@ -103,29 +104,51 @@
+ out:
+ 	return error;
+ }
+-
+ EXPORT_SYMBOL(inode_setattr);
+ 
+-int setattr_mask(unsigned int ia_valid)
++void setattr_mask (unsigned int ia_valid, int *dn_mask, u32 *in_mask)
+ {
+-	unsigned long dn_mask = 0;
++	int dnmask;
++	u32 inmask;
+ 
+-	if (ia_valid & ATTR_UID)
+-		dn_mask |= DN_ATTRIB;
+-	if (ia_valid & ATTR_GID)
+-		dn_mask |= DN_ATTRIB;
+-	if (ia_valid & ATTR_SIZE)
+-		dn_mask |= DN_MODIFY;
+-	/* both times implies a utime(s) call */
+-	if ((ia_valid & (ATTR_ATIME|ATTR_MTIME)) == (ATTR_ATIME|ATTR_MTIME))
+-		dn_mask |= DN_ATTRIB;
+-	else if (ia_valid & ATTR_ATIME)
+-		dn_mask |= DN_ACCESS;
+-	else if (ia_valid & ATTR_MTIME)
+-		dn_mask |= DN_MODIFY;
+-	if (ia_valid & ATTR_MODE)
+-		dn_mask |= DN_ATTRIB;
+-	return dn_mask;
++	inmask = 0;
++	dnmask = 0;
++
++	if (!dn_mask || !in_mask) {
++		return;
++	}
++        if (ia_valid & ATTR_UID) {
++                inmask |= IN_ATTRIB;
++		dnmask |= DN_ATTRIB;
++	}
++        if (ia_valid & ATTR_GID) {
++                inmask |= IN_ATTRIB;
++		dnmask |= DN_ATTRIB;
++	}
++        if (ia_valid & ATTR_SIZE) {
++                inmask |= IN_MODIFY;
++		dnmask |= DN_MODIFY;
++	}
++        /* both times implies a utime(s) call */
++        if ((ia_valid & (ATTR_ATIME|ATTR_MTIME)) == (ATTR_ATIME|ATTR_MTIME)) {
++                inmask |= IN_ATTRIB;
++		dnmask |= DN_ATTRIB;
++	}
++        else if (ia_valid & ATTR_ATIME) {
++                inmask |= IN_ACCESS;
++		dnmask |= DN_ACCESS;
++	}
++        else if (ia_valid & ATTR_MTIME) {
++                inmask |= IN_MODIFY;
++		dnmask |= DN_MODIFY;
++	}
++        if (ia_valid & ATTR_MODE) {
++                inmask |= IN_ATTRIB;
++		dnmask |= DN_ATTRIB;
++	}
++
++	*in_mask = inmask;
++	*dn_mask = dnmask;
+ }
+ 
+ int notify_change(struct dentry * dentry, struct iattr * attr)
+@@ -184,9 +207,19 @@
+ 		}
+ 	}
+ 	if (!error) {
+-		unsigned long dn_mask = setattr_mask(ia_valid);
++		int dn_mask;
++		u32 in_mask;
++
++		setattr_mask (ia_valid, &dn_mask, &in_mask);
++
+ 		if (dn_mask)
+ 			dnotify_parent(dentry, dn_mask);
++		if (in_mask) {
++			inotify_inode_queue_event(dentry->d_inode, in_mask, 0,
++						  NULL);
++			inotify_dentry_parent_queue_event(dentry, in_mask, 0,
++							  dentry->d_name.name);
++		}
+ 	}
+ 	return error;
+ }
+diff -urN linux-2.6.10/fs/file_table.c linux/fs/file_table.c
+--- linux-2.6.10/fs/file_table.c	2004-12-24 16:33:50.000000000 -0500
++++ linux/fs/file_table.c	2005-01-06 15:04:03.743779744 -0500
+@@ -16,6 +16,7 @@
+ #include <linux/eventpoll.h>
+ #include <linux/mount.h>
+ #include <linux/cdev.h>
++#include <linux/inotify.h>
+ 
+ /* sysctl tunables... */
+ struct files_stat_struct files_stat = {
+@@ -120,6 +121,12 @@
+ 	struct dentry *dentry = file->f_dentry;
+ 	struct vfsmount *mnt = file->f_vfsmnt;
+ 	struct inode *inode = dentry->d_inode;
++	u32 mask;
++
++
++	mask = (file->f_mode & FMODE_WRITE) ? IN_CLOSE_WRITE : IN_CLOSE_NOWRITE;
++	inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name);
++	inotify_inode_queue_event(inode, mask, 0, NULL);
+ 
+ 	might_sleep();
+ 	/*
+diff -urN linux-2.6.10/fs/inode.c linux/fs/inode.c
+--- linux-2.6.10/fs/inode.c	2004-12-24 16:35:40.000000000 -0500
++++ linux/fs/inode.c	2005-01-06 15:04:03.744779592 -0500
+@@ -130,6 +130,9 @@
+ #ifdef CONFIG_QUOTA
+ 		memset(&inode->i_dquot, 0, sizeof(inode->i_dquot));
+ #endif
++#ifdef CONFIG_INOTIFY
++		inode->inotify_data = NULL;
++#endif
+ 		inode->i_pipe = NULL;
+ 		inode->i_bdev = NULL;
+ 		inode->i_cdev = NULL;
+diff -urN linux-2.6.10/fs/namei.c linux/fs/namei.c
+--- linux-2.6.10/fs/namei.c	2004-12-24 16:34:30.000000000 -0500
++++ linux/fs/namei.c	2005-01-06 15:30:13.049209056 -0500
+@@ -22,6 +22,7 @@
+ #include <linux/quotaops.h>
+ #include <linux/pagemap.h>
+ #include <linux/dnotify.h>
++#include <linux/inotify.h>
+ #include <linux/smp_lock.h>
+ #include <linux/personality.h>
+ #include <linux/security.h>
+@@ -1242,6 +1243,8 @@
+ 	error = dir->i_op->create(dir, dentry, mode, nd);
+ 	if (!error) {
+ 		inode_dir_notify(dir, DN_CREATE);
++		inotify_inode_queue_event(dir, IN_CREATE_FILE,
++				0, dentry->d_name.name);
+ 		security_inode_post_create(dir, dentry, mode);
+ 	}
+ 	return error;
+@@ -1556,6 +1559,8 @@
+ 	error = dir->i_op->mknod(dir, dentry, mode, dev);
+ 	if (!error) {
+ 		inode_dir_notify(dir, DN_CREATE);
++		inotify_inode_queue_event(dir, IN_CREATE_FILE, 0,
++				dentry->d_name.name);
+ 		security_inode_post_mknod(dir, dentry, mode, dev);
+ 	}
+ 	return error;
+@@ -1629,6 +1634,8 @@
+ 	error = dir->i_op->mkdir(dir, dentry, mode);
+ 	if (!error) {
+ 		inode_dir_notify(dir, DN_CREATE);
++		inotify_inode_queue_event(dir, IN_CREATE_SUBDIR, 0,
++				dentry->d_name.name);
+ 		security_inode_post_mkdir(dir,dentry, mode);
+ 	}
+ 	return error;
+@@ -1724,6 +1731,11 @@
+ 	up(&dentry->d_inode->i_sem);
+ 	if (!error) {
+ 		inode_dir_notify(dir, DN_DELETE);
++		inotify_inode_queue_event(dir, IN_DELETE_SUBDIR, 0,
++				dentry->d_name.name);
++		inotify_inode_queue_event(dentry->d_inode, IN_DELETE_SELF, 0,
++				NULL);
++		inotify_inode_is_dead (dentry->d_inode);
+ 		d_delete(dentry);
+ 	}
+ 	dput(dentry);
+@@ -1796,8 +1808,13 @@
+ 
+ 	/* We don't d_delete() NFS sillyrenamed files--they still exist. */
+ 	if (!error && !(dentry->d_flags & DCACHE_NFSFS_RENAMED)) {
+-		d_delete(dentry);
+ 		inode_dir_notify(dir, DN_DELETE);
++		inotify_inode_queue_event(dir, IN_DELETE_FILE, 0,
++				dentry->d_name.name);
++		inotify_inode_queue_event(dentry->d_inode, IN_DELETE_SELF, 0,
++				NULL);
++		inotify_inode_is_dead (dentry->d_inode);
++		d_delete(dentry);
+ 	}
+ 	return error;
+ }
+@@ -1873,6 +1890,8 @@
+ 	error = dir->i_op->symlink(dir, dentry, oldname);
+ 	if (!error) {
+ 		inode_dir_notify(dir, DN_CREATE);
++		inotify_inode_queue_event(dir, IN_CREATE_FILE, 0,
++				dentry->d_name.name);
+ 		security_inode_post_symlink(dir, dentry, oldname);
+ 	}
+ 	return error;
+@@ -1946,6 +1965,8 @@
+ 	up(&old_dentry->d_inode->i_sem);
+ 	if (!error) {
+ 		inode_dir_notify(dir, DN_CREATE);
++		inotify_inode_queue_event(dir, IN_CREATE_FILE, 0, 
++					new_dentry->d_name.name);
+ 		security_inode_post_link(old_dentry, dir, new_dentry);
+ 	}
+ 	return error;
+@@ -2109,6 +2130,8 @@
+ {
+ 	int error;
+ 	int is_dir = S_ISDIR(old_dentry->d_inode->i_mode);
++	char *old_name;
++	u32 cookie;
+ 
+ 	if (old_dentry->d_inode == new_dentry->d_inode)
+  		return 0;
+@@ -2130,6 +2153,8 @@
+ 	DQUOT_INIT(old_dir);
+ 	DQUOT_INIT(new_dir);
+ 
++	old_name = inotify_oldname_init(old_dentry);
++
+ 	if (is_dir)
+ 		error = vfs_rename_dir(old_dir,old_dentry,new_dir,new_dentry);
+ 	else
+@@ -2141,7 +2166,16 @@
+ 			inode_dir_notify(old_dir, DN_DELETE);
+ 			inode_dir_notify(new_dir, DN_CREATE);
+ 		}
++
++		cookie = inotify_get_cookie();
++
++		inotify_inode_queue_event(old_dir, IN_MOVED_FROM, cookie,
++					  old_name);
++		inotify_inode_queue_event(new_dir, IN_MOVED_TO, cookie,
++					  old_dentry->d_name.name);
+ 	}
++	inotify_oldname_free(old_name);
++
+ 	return error;
+ }
+ 
+diff -urN linux-2.6.10/fs/open.c linux/fs/open.c
+--- linux-2.6.10/fs/open.c	2004-12-24 16:33:50.000000000 -0500
++++ linux/fs/open.c	2005-01-06 15:04:03.747779136 -0500
+@@ -11,6 +11,7 @@
+ #include <linux/smp_lock.h>
+ #include <linux/quotaops.h>
+ #include <linux/dnotify.h>
++#include <linux/inotify.h>
+ #include <linux/module.h>
+ #include <linux/slab.h>
+ #include <linux/tty.h>
+@@ -956,6 +957,10 @@
+ 			error = PTR_ERR(f);
+ 			if (IS_ERR(f))
+ 				goto out_error;
++			inotify_inode_queue_event(f->f_dentry->d_inode,
++					IN_OPEN, 0, NULL);
++			inotify_dentry_parent_queue_event(f->f_dentry, IN_OPEN,
++					0, f->f_dentry->d_name.name);
+ 			fd_install(fd, f);
+ 		}
+ out:
+diff -urN linux-2.6.10/fs/read_write.c linux/fs/read_write.c
+--- linux-2.6.10/fs/read_write.c	2004-12-24 16:35:00.000000000 -0500
++++ linux/fs/read_write.c	2005-01-06 15:04:03.748778984 -0500
+@@ -11,6 +11,7 @@
+ #include <linux/uio.h>
+ #include <linux/smp_lock.h>
+ #include <linux/dnotify.h>
++#include <linux/inotify.h>
+ #include <linux/security.h>
+ #include <linux/module.h>
+ #include <linux/syscalls.h>
+@@ -216,8 +217,14 @@
+ 				ret = file->f_op->read(file, buf, count, pos);
+ 			else
+ 				ret = do_sync_read(file, buf, count, pos);
+-			if (ret > 0)
+-				dnotify_parent(file->f_dentry, DN_ACCESS);
++			if (ret > 0) {
++				struct dentry *dentry = file->f_dentry;
++				dnotify_parent(dentry, DN_ACCESS);
++				inotify_dentry_parent_queue_event(dentry,
++						IN_ACCESS, 0, dentry->d_name.name);
++				inotify_inode_queue_event(inode, IN_ACCESS, 0,
++						NULL);
++			}
+ 		}
+ 	}
+ 
+@@ -260,8 +267,14 @@
+ 				ret = file->f_op->write(file, buf, count, pos);
+ 			else
+ 				ret = do_sync_write(file, buf, count, pos);
+-			if (ret > 0)
+-				dnotify_parent(file->f_dentry, DN_MODIFY);
++			if (ret > 0) {
++				struct dentry *dentry = file->f_dentry;
++				dnotify_parent(dentry, DN_MODIFY);
++				inotify_dentry_parent_queue_event(dentry,
++						IN_MODIFY, 0, dentry->d_name.name);
++				inotify_inode_queue_event(inode, IN_MODIFY, 0,
++						NULL);
++			}
+ 		}
+ 	}
+ 
+@@ -493,9 +506,15 @@
+ out:
+ 	if (iov != iovstack)
+ 		kfree(iov);
+-	if ((ret + (type == READ)) > 0)
+-		dnotify_parent(file->f_dentry,
+-				(type == READ) ? DN_ACCESS : DN_MODIFY);
++	if ((ret + (type == READ)) > 0) {
++		struct dentry *dentry = file->f_dentry;
++		dnotify_parent(dentry, (type == READ) ? DN_ACCESS : DN_MODIFY);
++		inotify_dentry_parent_queue_event(dentry,
++				(type == READ) ? IN_ACCESS : IN_MODIFY, 0,
++				dentry->d_name.name);
++		inotify_inode_queue_event (dentry->d_inode,
++				(type == READ) ? IN_ACCESS : IN_MODIFY, 0, NULL);
++	}
+ 	return ret;
+ }
+ 
+diff -urN linux-2.6.10/fs/super.c linux/fs/super.c
+--- linux-2.6.10/fs/super.c	2004-12-24 16:34:33.000000000 -0500
++++ linux/fs/super.c	2005-01-06 15:04:03.748778984 -0500
+@@ -38,6 +38,7 @@
+ #include <linux/idr.h>
+ #include <linux/kobject.h>
+ #include <asm/uaccess.h>
++#include <linux/inotify.h>
+ 
+ 
+ void get_filesystem(struct file_system_type *fs);
+@@ -227,6 +228,7 @@
+ 
+ 	if (root) {
+ 		sb->s_root = NULL;
++		inotify_super_block_umount(sb);
+ 		shrink_dcache_parent(root);
+ 		shrink_dcache_anon(&sb->s_anon);
+ 		dput(root);
+diff -urN linux-2.6.10/include/linux/fs.h linux/include/linux/fs.h
+--- linux-2.6.10/include/linux/fs.h	2004-12-24 16:34:27.000000000 -0500
++++ linux/include/linux/fs.h	2005-01-06 15:04:03.750778680 -0500
+@@ -27,6 +27,7 @@
+ struct kstatfs;
+ struct vm_area_struct;
+ struct vfsmount;
++struct inotify_inode_data;
+ 
+ /*
+  * It's silly to have NR_OPEN bigger than NR_FILE, but you can change
+@@ -473,6 +474,10 @@
+ 	struct dnotify_struct	*i_dnotify; /* for directory notifications */
+ #endif
+ 
++#ifdef CONFIG_INOTIFY
++	struct inotify_inode_data *inotify_data;
++#endif
++
+ 	unsigned long		i_state;
+ 	unsigned long		dirtied_when;	/* jiffies of first dirtying */
+ 
+@@ -1353,7 +1358,7 @@
+ extern int do_remount_sb(struct super_block *sb, int flags,
+ 			 void *data, int force);
+ extern sector_t bmap(struct inode *, sector_t);
+-extern int setattr_mask(unsigned int);
++extern void setattr_mask(unsigned int, int *, u32 *);
+ extern int notify_change(struct dentry *, struct iattr *);
+ extern int permission(struct inode *, int, struct nameidata *);
+ extern int generic_permission(struct inode *, int,
+diff -urN linux-2.6.10/include/linux/inotify.h linux/include/linux/inotify.h
+--- linux-2.6.10/include/linux/inotify.h	1969-12-31 19:00:00.000000000 -0500
++++ linux/include/linux/inotify.h	2005-01-06 15:04:03.751778528 -0500
+@@ -0,0 +1,155 @@
++/*
++ * Inode based directory notification for Linux
++ *
++ * Copyright (C) 2004 John McCutchan
++ */
++
++#ifndef _LINUX_INOTIFY_H
++#define _LINUX_INOTIFY_H
++
++#include <linux/types.h>
++#include <linux/limits.h>
++
++/* this size could limit things, since technically we could need PATH_MAX */
++#define INOTIFY_FILENAME_MAX	256
++
++/*
++ * struct inotify_event - structure read from the inotify device for each event
++ *
++ * When you are watching a directory, you will receive the filename for events
++ * such as IN_CREATE, IN_DELETE, IN_OPEN, IN_CLOSE, ...
++ *
++ * Note: When reading from the device you must provide a buffer that is a
++ * multiple of sizeof(struct inotify_event)
++ */
++struct inotify_event {
++	__s32 wd;
++	__u32 mask;
++	__u32 cookie;
++	char filename[INOTIFY_FILENAME_MAX];
++};
++
++/*
++ * struct inotify_watch_request - represents a watch request
++ *
++ * Pass to the inotify device via the INOTIFY_WATCH ioctl
++ */
++struct inotify_watch_request {
++	char *dirname;		/* directory name */
++	__u32 mask;		/* event mask */
++};
++
++/* the following are legal, implemented events */
++#define IN_ACCESS		0x00000001	/* File was accessed */
++#define IN_MODIFY		0x00000002	/* File was modified */
++#define IN_ATTRIB		0x00000004	/* File changed attributes */
++#define IN_CLOSE_WRITE		0x00000008	/* Writtable file was closed */
++#define IN_CLOSE_NOWRITE	0x00000010	/* Unwrittable file closed */
++#define IN_OPEN			0x00000020	/* File was opened */
++#define IN_MOVED_FROM		0x00000040	/* File was moved from X */
++#define IN_MOVED_TO		0x00000080	/* File was moved to Y */
++#define IN_DELETE_SUBDIR	0x00000100	/* Subdir was deleted */ 
++#define IN_DELETE_FILE		0x00000200	/* Subfile was deleted */
++#define IN_CREATE_SUBDIR	0x00000400	/* Subdir was created */
++#define IN_CREATE_FILE		0x00000800	/* Subfile was created */
++#define IN_DELETE_SELF		0x00001000	/* Self was deleted */
++#define IN_UNMOUNT		0x00002000	/* Backing fs was unmounted */
++#define IN_Q_OVERFLOW		0x00004000	/* Event queued overflowed */
++#define IN_IGNORED		0x00008000	/* File was ignored */
++
++/* special flags */
++#define IN_ALL_EVENTS		0xffffffff	/* All the events */
++#define IN_CLOSE		(IN_CLOSE_WRITE | IN_CLOSE_NOWRITE)
++
++#define INOTIFY_IOCTL_MAGIC	'Q'
++#define INOTIFY_IOCTL_MAXNR	2
++
++#define INOTIFY_WATCH  		_IOR(INOTIFY_IOCTL_MAGIC, 1, struct inotify_watch_request)
++#define INOTIFY_IGNORE 		_IOR(INOTIFY_IOCTL_MAGIC, 2, int)
++
++#ifdef __KERNEL__
++
++#include <linux/dcache.h>
++#include <linux/fs.h>
++#include <linux/config.h>
++
++struct inotify_inode_data {
++	struct list_head watches;
++	__u32 watch_mask;
++	spinlock_t lock;
++	atomic_t count;
++};
++
++#ifdef CONFIG_INOTIFY
++
++extern void inotify_inode_queue_event(struct inode *, __u32, __u32,
++				      const char *);
++extern void inotify_dentry_parent_queue_event(struct dentry *, __u32, __u32,
++					      const char *);
++extern void inotify_super_block_umount(struct super_block *);
++extern void inotify_inode_is_dead(struct inode *);
++extern __u32 inotify_get_cookie(void);
++extern __u32 setattr_mask_inotify(unsigned int);
++
++/* this could be kstrdup if only we could add that to lib/string.c */
++static inline char * inotify_oldname_init(struct dentry *old_dentry)
++{
++	char *old_name;
++
++	old_name = kmalloc(strlen(old_dentry->d_name.name) + 1, GFP_KERNEL);
++	if (old_name)
++		strcpy(old_name, old_dentry->d_name.name);
++	return old_name;
++}
++
++static inline void inotify_oldname_free(const char *old_name)
++{
++	kfree(old_name);
++}
++
++#else
++
++static inline void inotify_inode_queue_event(struct inode *inode,
++					     __u32 mask, __u32 cookie,
++					     const char *filename)
++{
++}
++
++static inline void inotify_dentry_parent_queue_event(struct dentry *dentry,
++						     __u32 mask, __u32 cookie,
++						     const char *filename)
++{
++}
++
++static inline void inotify_super_block_umount(struct super_block *sb)
++{
++}
++
++static inline void inotify_inode_is_dead(struct inode *inode)
++{
++}
++
++static inline char * inotify_oldname_init(struct dentry *old_dentry)
++{
++	return NULL;
++}
++
++static inline __u32 inotify_get_cookie(void)
++{
++	return 0;
++}
++
++static inline void inotify_oldname_free(const char *old_name)
++{
++}
++
++static inline int setattr_mask_inotify(unsigned int ia_mask)
++{
++	return 0;
++}
++
++#endif	/* CONFIG_INOTIFY */
++
++#endif	/* __KERNEL __ */
++
++#endif	/* _LINUX_INOTIFY_H */
+diff -urN linux-2.6.10/include/linux/miscdevice.h linux/include/linux/miscdevice.h
+--- linux-2.6.10/include/linux/miscdevice.h	2004-12-24 16:34:58.000000000 -0500
++++ linux/include/linux/miscdevice.h	2005-01-06 15:04:03.751778528 -0500
+@@ -2,6 +2,7 @@
+ #define _LINUX_MISCDEVICE_H
+ #include <linux/module.h>
+ #include <linux/major.h>
++#include <linux/device.h>
+ 
+ #define PSMOUSE_MINOR  1
+ #define MS_BUSMOUSE_MINOR 2
+@@ -32,13 +33,13 @@
+ 
+ struct device;
+ 
+-struct miscdevice 
+-{
++struct miscdevice  {
+ 	int minor;
+ 	const char *name;
+ 	struct file_operations *fops;
+ 	struct list_head list;
+ 	struct device *dev;
++	struct class_device *class;
+ 	char devfs_name[64];
+ };
+ 
+diff -urN linux-2.6.10/include/linux/sched.h linux/include/linux/sched.h
+--- linux-2.6.10/include/linux/sched.h	2004-12-24 16:33:59.000000000 -0500
++++ linux/include/linux/sched.h	2005-01-06 15:04:03.752778376 -0500
+@@ -353,6 +353,8 @@
+ 	atomic_t processes;	/* How many processes does this user have? */
+ 	atomic_t files;		/* How many open files does this user have? */
+ 	atomic_t sigpending;	/* How many pending signals does this user have? */
++	atomic_t inotify_watches;	/* How many inotify watches does this user have? */
++	atomic_t inotify_devs;	/* How many inotify devs does this user have opened? */
+ 	/* protected by mq_lock	*/
+ 	unsigned long mq_bytes;	/* How many bytes can be allocated to mqueue? */
+ 	unsigned long locked_shm; /* How many pages of mlocked shm ? */
+diff -urN linux-2.6.10/kernel/user.c linux/kernel/user.c
+--- linux-2.6.10/kernel/user.c	2004-12-24 16:34:31.000000000 -0500
++++ linux/kernel/user.c	2005-01-06 15:04:03.753778224 -0500
+@@ -119,6 +119,8 @@
+ 		atomic_set(&new->processes, 0);
+ 		atomic_set(&new->files, 0);
+ 		atomic_set(&new->sigpending, 0);
++		atomic_set(&new->inotify_watches, 0);
++		atomic_set(&new->inotify_devs, 0);
+ 
+ 		new->mq_bytes = 0;
+ 		new->locked_shm = 0;
Index: scripts/untested/blfs-patches/inotify-0.18-rml-2.6.10-4.patch
===================================================================
--- scripts/untested/blfs-patches/inotify-0.18-rml-2.6.10-4.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/inotify-0.18-rml-2.6.10-4.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1777 @@
+inotify, bitches.
+
+Signed-off-by: Robert Love <rml@novell.com>
+
+ drivers/char/Kconfig       |   13 
+ drivers/char/Makefile      |    2 
+ drivers/char/inotify.c     | 1067 +++++++++++++++++++++++++++++++++++++++++++++
+ drivers/char/misc.c        |   14 
+ fs/attr.c                  |   73 ++-
+ fs/file_table.c            |    7 
+ fs/inode.c                 |    3 
+ fs/namei.c                 |   36 +
+ fs/open.c                  |    5 
+ fs/read_write.c            |   33 +
+ fs/super.c                 |    2 
+ include/linux/fs.h         |    7 
+ include/linux/inotify.h    |  160 ++++++
+ include/linux/miscdevice.h |    5 
+ include/linux/sched.h      |    2 
+ kernel/user.c              |    2 
+ 16 files changed, 1392 insertions(+), 39 deletions(-)
+
+diff -urN linux-2.6.10/drivers/char/inotify.c linux/drivers/char/inotify.c
+--- linux-2.6.10/drivers/char/inotify.c	1969-12-31 19:00:00.000000000 -0500
++++ linux/drivers/char/inotify.c	2005-01-07 17:24:48.959115376 -0500
+@@ -0,0 +1,1067 @@
++/*
++ * Inode based directory notifications for Linux.
++ *
++ * Copyright (C) 2004 John McCutchan
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License as published by the
++ * Free Software Foundation; either version 2, or (at your option) any
++ * later version.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ * General Public License for more details.
++ */
++
++#include <linux/module.h>
++#include <linux/kernel.h>
++#include <linux/sched.h>
++#include <linux/spinlock.h>
++#include <linux/idr.h>
++#include <linux/slab.h>
++#include <linux/fs.h>
++#include <linux/namei.h>
++#include <linux/poll.h>
++#include <linux/device.h>
++#include <linux/miscdevice.h>
++#include <linux/init.h>
++#include <linux/list.h>
++#include <linux/writeback.h>
++#include <linux/inotify.h>
++
++#include <asm/ioctls.h>
++
++static atomic_t inotify_cookie;
++static kmem_cache_t *watch_cachep;
++static kmem_cache_t *event_cachep;
++static kmem_cache_t *inode_data_cachep;
++
++static int sysfs_attrib_max_user_devices;
++static int sysfs_attrib_max_user_watches;
++static unsigned int sysfs_attrib_max_queued_events;
++
++/*
++ * struct inotify_device - represents an open instance of an inotify device
++ *
++ * For each inotify device, we need to keep track of the events queued on it,
++ * a list of the inodes that we are watching, and so on.
++ *
++ * This structure is protected by 'lock'.  Lock ordering:
++ *
++ * dev->lock (protects dev)
++ *	inode_lock (used to safely walk inode_in_use list)
++ *		inode->i_lock (only needed for getting ref on inode_data)
++ */
++struct inotify_device {
++	wait_queue_head_t 	wait;
++	struct idr		idr;
++	struct list_head 	events;
++	struct list_head 	watches;
++	spinlock_t		lock;
++	unsigned int		queue_size;
++	unsigned int		event_count;
++	unsigned int		max_events;
++	struct user_struct	*user;
++};
++
++struct inotify_watch {
++	s32 			wd;	/* watch descriptor */
++	u32			mask;
++	struct inode		*inode;
++	struct inotify_device	*dev;
++	struct list_head	d_list;	/* device list */
++	struct list_head	i_list; /* inode list */
++};
++
++static ssize_t show_max_queued_events(struct class_device *class, char *buf)
++{
++	return sprintf(buf, "%d\n", sysfs_attrib_max_queued_events);
++}
++
++static ssize_t store_max_queued_events(struct class_device *class,
++				       const char *buf, size_t count)
++{
++	unsigned int max;
++
++	if (sscanf(buf, "%u", &max) > 0 && max > 0) {
++		sysfs_attrib_max_queued_events = max;
++		return strlen(buf);
++	}
++	return -EINVAL;
++}
++
++static ssize_t show_max_user_devices(struct class_device *class, char *buf)
++{
++	return sprintf(buf, "%d\n", sysfs_attrib_max_user_devices);
++}
++
++static ssize_t store_max_user_devices(struct class_device *class,
++				      const char *buf, size_t count)
++{
++	int max;
++
++	if (sscanf(buf, "%d", &max) > 0 && max > 0) {
++		sysfs_attrib_max_user_devices = max;
++		return strlen(buf);
++	}
++	return -EINVAL;
++}
++
++static ssize_t show_max_user_watches(struct class_device *class, char *buf)
++{
++	return sprintf(buf, "%d\n", sysfs_attrib_max_user_watches);
++}
++
++static ssize_t store_max_user_watches(struct class_device *class,
++				      const char *buf, size_t count)
++{
++	int max;
++
++	if (sscanf(buf, "%d", &max) > 0 && max > 0) {
++		sysfs_attrib_max_user_watches = max;
++		return strlen(buf);
++	}
++	return -EINVAL;
++}
++
++static CLASS_DEVICE_ATTR(max_queued_events, S_IRUGO | S_IWUSR,
++	show_max_queued_events, store_max_queued_events);
++static CLASS_DEVICE_ATTR(max_user_devices, S_IRUGO | S_IWUSR,
++	show_max_user_devices, store_max_user_devices);
++static CLASS_DEVICE_ATTR(max_user_watches, S_IRUGO | S_IWUSR,
++	show_max_user_watches, store_max_user_watches);
++
++/*
++ * A list of these is attached to each instance of the driver
++ * when the drivers read() gets called, this list is walked and
++ * all events that can fit in the buffer get delivered
++ */
++struct inotify_kernel_event {
++        struct list_head        list;
++	struct inotify_event	event;
++};
++
++static inline void __get_inode_data(struct inotify_inode_data *data)
++{
++	atomic_inc(&data->count);
++}
++
++/*
++ * get_inode_data - pin an inotify_inode_data structure.  Returns the structure
++ * if successful and NULL on failure, which can only occur if inotify_data is
++ * not yet allocated.  The inode must be pinned prior to invocation.
++ */
++static inline struct inotify_inode_data * get_inode_data(struct inode *inode)
++{
++	struct inotify_inode_data *data;
++
++	spin_lock(&inode->i_lock);
++	data = inode->inotify_data;
++	if (data)
++		__get_inode_data(data);
++	spin_unlock(&inode->i_lock);
++
++	return data;
++}
++
++/*
++ * put_inode_data - drop our reference on an inotify_inode_data and the
++ * inode structure in which it lives.  If the reference count on inotify_data
++ * reaches zero, free it.
++ */
++static inline void put_inode_data(struct inode *inode)
++{
++	//spin_lock(&inode->i_lock);
++	if (atomic_dec_and_test(&inode->inotify_data->count)) {
++		kmem_cache_free(inode_data_cachep, inode->inotify_data);
++		inode->inotify_data = NULL;
++	}
++	//spin_unlock(&inode->i_lock);
++}
++
++/*
++ * find_inode - resolve a user-given path to a specific inode and iget() it
++ */
++static struct inode * find_inode(const char __user *dirname)
++{
++	struct inode *inode;
++	struct nameidata nd;
++	int error;
++
++	error = __user_walk(dirname, LOOKUP_FOLLOW, &nd);
++	if (error)
++		return ERR_PTR(error);
++
++	inode = nd.dentry->d_inode;
++
++	/* you can only watch an inode if you have read permissions on it */
++	error = permission(inode, MAY_READ, NULL);
++	if (error) {
++		inode = ERR_PTR(error);
++		goto release_and_out;
++	}
++
++	spin_lock(&inode_lock);
++	__iget(inode);
++	spin_unlock(&inode_lock);
++release_and_out:
++	path_release(&nd);
++	return inode;
++}
++
++struct inotify_kernel_event * kernel_event(s32 wd, u32 mask, u32 cookie,
++					   const char *filename)
++{
++	struct inotify_kernel_event *kevent;
++
++	kevent = kmem_cache_alloc(event_cachep, GFP_ATOMIC);
++	if (!kevent)
++		return NULL;
++
++	/* we hand this out to user-space, so zero it out just in case */
++	memset(kevent, 0, sizeof(struct inotify_kernel_event));
++
++	kevent->event.wd = wd;
++	kevent->event.mask = mask;
++	kevent->event.cookie = cookie;
++	INIT_LIST_HEAD(&kevent->list);
++
++	if (filename) {
++		size_t len;
++
++		len = strlen(filename);
++		kevent->event.filename = kmalloc(len+1, GFP_ATOMIC);
++		if (!kevent->event.filename) {
++			kmem_cache_free (event_cachep, kevent);
++			return NULL;
++		}
++		memset(kevent->event.filename, 0, len+1);
++		strncpy(kevent->event.filename, filename, len);
++		kevent->event.len = len;
++	} else
++		kevent->event.filename = NULL;
++
++	return kevent;
++}
++
++void delete_kernel_event(struct inotify_kernel_event *kevent)
++{
++	if (!kevent)
++		return;
++
++	if (kevent->event.filename)
++		kfree (kevent->event.filename);
++	kmem_cache_free(event_cachep, kevent);
++}
++
++#define list_to_inotify_kernel_event(pos)	\
++		list_entry((pos), struct inotify_kernel_event, list)
++
++#define inotify_dev_get_event(dev)		\
++		(list_to_inotify_kernel_event(dev->events.next))
++
++/* Does this events mask get sent to the watch ? */
++#define event_and(event_mask,watches_mask) 	((event_mask == IN_UNMOUNT) || \
++						(event_mask == IN_IGNORED) || \
++						(event_mask & watches_mask))
++
++/*
++ * inotify_dev_queue_event - add a new event to the given device
++ *
++ * Caller must hold dev->lock.
++ */
++static void inotify_dev_queue_event(struct inotify_device *dev,
++				    struct inotify_watch *watch, u32 mask,
++				    u32 cookie, const char *filename)
++{
++	struct inotify_kernel_event *kevent, *last;
++
++	/* Check if the new event is a duplicate of the last event queued. */
++	last = inotify_dev_get_event(dev);
++	if (dev->event_count && last->event.mask == mask &&
++			last->event.wd == watch->wd) {
++		/* Check if the filenames match */
++		if (!filename && last->event.filename[0] == '\0')
++			return;
++		if (filename && !strcmp(last->event.filename, filename))
++			return;
++	}
++
++	/*
++	 * the queue has already overflowed and we have already sent the
++	 * Q_OVERFLOW event
++	 */
++	if (dev->event_count > dev->max_events)
++		return;
++
++	/* the queue has just overflowed and we need to notify user space */
++	if (dev->event_count == dev->max_events) {
++		kevent = kernel_event(-1, IN_Q_OVERFLOW, cookie, NULL);
++		goto add_event_to_queue;
++	}
++
++	if (!event_and(mask, watch->inode->inotify_data->watch_mask) ||
++			!event_and(mask, watch->mask))
++		return;
++
++	kevent = kernel_event(watch->wd, mask, cookie, filename);
++
++add_event_to_queue:
++	if (!kevent)
++		return;
++
++	/* queue the event and wake up anyone waiting */
++	dev->event_count++;
++	dev->queue_size += sizeof(struct inotify_event) + kevent->event.len -
++			sizeof(char *) + 1;
++	list_add_tail(&kevent->list, &dev->events);
++	wake_up_interruptible(&dev->wait);
++}
++
++static inline int inotify_dev_has_events(struct inotify_device *dev)
++{
++	return !list_empty(&dev->events);
++}
++
++/*
++ * inotify_dev_event_dequeue - destroy an event on the given device
++ *
++ * Caller must hold dev->lock.
++ */
++static void inotify_dev_event_dequeue(struct inotify_device *dev)
++{
++	struct inotify_kernel_event *kevent;
++
++	if (!inotify_dev_has_events(dev))
++		return;
++
++	kevent = inotify_dev_get_event(dev);
++	list_del_init(&kevent->list);
++	dev->event_count--;
++	dev->queue_size -= sizeof(struct inotify_event) + kevent->event.len -
++			sizeof(char *) + 1;
++	delete_kernel_event(kevent);
++}
++
++/*
++ * inotify_dev_get_wd - returns the next WD for use by the given dev
++ *
++ * This function can sleep.
++ */
++static int inotify_dev_get_wd(struct inotify_device *dev,
++			     struct inotify_watch *watch)
++{
++	int ret;
++
++	if (atomic_read(&dev->user->inotify_watches) >=
++			sysfs_attrib_max_user_watches)
++		return -ENOSPC;
++
++repeat:
++	if (!idr_pre_get(&dev->idr, GFP_KERNEL))
++		return -ENOSPC;
++	spin_lock(&dev->lock);
++	ret = idr_get_new(&dev->idr, watch, &watch->wd);
++	spin_unlock(&dev->lock);
++	if (ret == -EAGAIN) /* more memory is required, try again */
++		goto repeat;
++	else if (ret)       /* the idr is full! */
++		return -ENOSPC;
++
++	atomic_inc(&dev->user->inotify_watches);
++
++	return 0;
++}
++
++/*
++ * inotify_dev_put_wd - release the given WD on the given device
++ *
++ * Caller must hold dev->lock.
++ */
++static int inotify_dev_put_wd(struct inotify_device *dev, s32 wd)
++{
++	if (!dev || wd < 0)
++		return -1;
++
++	atomic_dec(&dev->user->inotify_watches);
++	idr_remove(&dev->idr, wd);
++
++	return 0;
++}
++
++/*
++ * create_watch - creates a watch on the given device.
++ *
++ * Grabs dev->lock, so the caller must not hold it.
++ */
++static struct inotify_watch *create_watch(struct inotify_device *dev,
++					  u32 mask, struct inode *inode)
++{
++	struct inotify_watch *watch;
++
++	watch = kmem_cache_alloc(watch_cachep, GFP_KERNEL);
++	if (!watch)
++		return NULL;
++
++	watch->mask = mask;
++	watch->inode = inode;
++	watch->dev = dev;
++	INIT_LIST_HEAD(&watch->d_list);
++	INIT_LIST_HEAD(&watch->i_list);
++
++	if (inotify_dev_get_wd(dev, watch)) {
++		kmem_cache_free(watch_cachep, watch);
++		return NULL;
++	}
++
++	return watch;
++}
++
++/*
++ * delete_watch - removes the given 'watch' from the given 'dev'
++ *
++ * Caller must hold dev->lock.
++ */
++static void delete_watch(struct inotify_device *dev,
++			 struct inotify_watch *watch)
++{
++	inotify_dev_put_wd(dev, watch->wd);
++	kmem_cache_free(watch_cachep, watch);
++}
++
++/*
++ * inotify_find_dev - find the watch associated with the given inode and dev
++ *
++ * Caller must hold dev->lock.
++ * FIXME: Needs inotify_data->lock too.  Don't need dev->lock, just pin it.
++ */
++static struct inotify_watch *inode_find_dev(struct inode *inode,
++					    struct inotify_device *dev)
++{
++	struct inotify_watch *watch;
++
++	if (!inode->inotify_data)
++		return NULL;
++
++	list_for_each_entry(watch, &inode->inotify_data->watches, i_list) {
++		if (watch->dev == dev)
++			return watch;
++	}
++
++	return NULL;
++}
++
++/*
++ * dev_find_wd - given a (dev,wd) pair, returns the matching inotify_watcher
++ *
++ * Returns the results of looking up (dev,wd) in the idr layer.  NULL is
++ * returned on error.
++ *
++ * The caller must hold dev->lock.
++ */
++static inline struct inotify_watch *dev_find_wd(struct inotify_device *dev,
++						u32 wd)
++{
++	return idr_find(&dev->idr, wd);
++}
++
++static int inotify_dev_is_watching_inode(struct inotify_device *dev,
++					 struct inode *inode)
++{
++	struct inotify_watch *watch;
++
++	list_for_each_entry(watch, &dev->watches, d_list) {
++		if (watch->inode == inode)
++			return 1;
++	}
++
++	return 0;
++}
++
++/*
++ * inotify_dev_add_watcher - add the given watcher to the given device instance
++ *
++ * Caller must hold dev->lock.
++ */
++static int inotify_dev_add_watch(struct inotify_device *dev,
++				 struct inotify_watch *watch)
++{
++	if (!dev || !watch)
++		return -EINVAL;
++
++	list_add(&watch->d_list, &dev->watches);
++	return 0;
++}
++
++/*
++ * inotify_dev_rm_watch - remove the given watch from the given device
++ *
++ * Caller must hold dev->lock because we call inotify_dev_queue_event().
++ */
++static int inotify_dev_rm_watch(struct inotify_device *dev,
++				struct inotify_watch *watch)
++{
++	if (!watch)
++		return -EINVAL;
++
++	inotify_dev_queue_event(dev, watch, IN_IGNORED, 0, NULL);
++	list_del_init(&watch->d_list);
++
++	return 0;
++}
++
++/*
++ * inode_update_watch_mask - update inode->inotify_data->watch_mask
++ *
++ * Grabs inode->inotify_data->lock.
++ */
++static void inode_update_watch_mask(struct inode *inode)
++{
++	struct inotify_inode_data *data;
++	struct inotify_watch *watch;
++	u32 new_mask;
++
++	data = get_inode_data(inode);
++	if (!data)	/* FIXME: this should never happen */
++		return;
++	spin_lock(&data->lock);
++
++	new_mask = 0;
++	list_for_each_entry(watch, &data->watches, i_list)
++		new_mask |= watch->mask;
++
++	data->watch_mask = new_mask;
++
++	spin_unlock(&data->lock);
++	put_inode_data(inode);
++}
++
++/*
++ * inode_add_watch - add a watch to the given inode
++ *
++ * Callers must hold dev->lock, because we call inode_find_dev().
++ */
++static int inode_add_watch(struct inode *inode, struct inotify_watch *watch)
++{
++	int ret;
++
++	if (!inode || !watch)
++		return -EINVAL;
++
++	spin_lock(&inode->i_lock);
++	if (!inode->inotify_data) {
++		/* inotify_data is not attached to the inode, so add it */
++		inode->inotify_data = kmem_cache_alloc(inode_data_cachep,
++						       GFP_ATOMIC);
++		if (!inode->inotify_data) {
++			ret = -ENOMEM;
++			goto out_lock;
++		}
++
++		atomic_set(&inode->inotify_data->count, 0);
++		INIT_LIST_HEAD(&inode->inotify_data->watches);
++		inode->inotify_data->watch_mask = 0;
++		spin_lock_init(&inode->inotify_data->lock);
++	} else if (inode_find_dev(inode, watch->dev)) {
++		/* a watch is already associated with this (inode,dev) pair */
++		ret = -EINVAL;
++		goto out_lock;
++	}
++	__get_inode_data(inode->inotify_data);
++	spin_unlock(&inode->i_lock);
++
++	list_add(&watch->i_list, &inode->inotify_data->watches);
++	inode_update_watch_mask(inode);
++
++	return 0;
++out_lock:
++	spin_unlock(&inode->i_lock);
++	return ret;
++}
++
++static int inode_rm_watch(struct inode *inode,
++			  struct inotify_watch *watch)
++{
++	if (!inode || !watch || !inode->inotify_data)
++		return -EINVAL;
++
++	list_del_init(&watch->i_list);
++	inode_update_watch_mask(inode);
++
++	/* clean up inode->inotify_data */
++	put_inode_data(inode);	
++
++	return 0;
++}
++
++/* Kernel API */
++
++/*
++ * inotify_inode_queue_event - queue an event with the given mask, cookie, and
++ * filename to any watches associated with the given inode.
++ *
++ * inode must be pinned prior to calling.
++ */
++void inotify_inode_queue_event(struct inode *inode, u32 mask, u32 cookie,
++			       const char *filename)
++{
++	struct inotify_watch *watch;
++
++	if (!inode->inotify_data)
++		return;
++
++	list_for_each_entry(watch, &inode->inotify_data->watches, i_list) {
++		spin_lock(&watch->dev->lock);
++		inotify_dev_queue_event(watch->dev, watch, mask, cookie,
++					filename);
++		spin_unlock(&watch->dev->lock);
++	}
++}
++EXPORT_SYMBOL_GPL(inotify_inode_queue_event);
++
++void inotify_dentry_parent_queue_event(struct dentry *dentry, u32 mask,
++				       u32 cookie, const char *filename)
++{
++	struct dentry *parent;
++
++	parent = dget_parent(dentry);
++	inotify_inode_queue_event(parent->d_inode, mask, cookie, filename);
++	dput(parent);
++}
++EXPORT_SYMBOL_GPL(inotify_dentry_parent_queue_event);
++
++u32 inotify_get_cookie(void)
++{
++	atomic_inc(&inotify_cookie);
++	return atomic_read(&inotify_cookie);
++}
++EXPORT_SYMBOL_GPL(inotify_get_cookie);
++
++/*
++ * watch->inode must be pinned.  We drop a reference before returning.
++ */
++static void ignore_helper(struct inotify_watch *watch, int event)
++{
++	struct inotify_device *dev;
++	struct inode *inode;
++
++	inode = watch->inode;
++	dev = watch->dev;
++
++	spin_lock(&dev->lock);
++
++	if (event)
++		inotify_dev_queue_event(dev, watch, event, 0, NULL);
++
++	inode_rm_watch(inode, watch);
++	inotify_dev_rm_watch(watch->dev, watch);
++
++	delete_watch(dev, watch);
++	spin_unlock(&dev->lock);
++
++	iput(inode);
++}
++
++void inotify_super_block_umount(struct super_block *sb)
++{
++	struct inode *inode;
++
++	spin_lock(&inode_lock);
++
++	/*
++	 * We hold the inode_lock, so the inodes are not going anywhere, and
++	 * we grab a reference on inotify_data before walking its list of
++	 * watches.
++	 */
++	list_for_each_entry(inode, &inode_in_use, i_list) {
++		struct inotify_inode_data *inode_data;
++		struct inotify_watch *watch;
++
++		if (inode->i_sb != sb)
++			continue;
++
++		inode_data = get_inode_data(inode);
++		if (!inode_data)
++			continue;
++
++		list_for_each_entry(watch, &inode_data->watches, i_list)
++			ignore_helper(watch, IN_UNMOUNT);
++		put_inode_data(inode);
++	}
++
++	spin_unlock(&inode_lock);
++}
++EXPORT_SYMBOL_GPL(inotify_super_block_umount);
++
++/*
++ * inotify_inode_is_dead - an inode has been deleted, cleanup any watches
++ */
++void inotify_inode_is_dead(struct inode *inode)
++{
++	struct inotify_watch *watch, *next;
++	struct inotify_inode_data *data;
++
++	data = get_inode_data(inode);
++	if (!data)
++		return;
++	list_for_each_entry_safe(watch, next, &data->watches, i_list)
++		ignore_helper(watch, 0);
++	put_inode_data(inode);
++}
++EXPORT_SYMBOL_GPL(inotify_inode_is_dead);
++
++/* The driver interface is implemented below */
++
++static unsigned int inotify_poll(struct file *file, poll_table *wait)
++{
++        struct inotify_device *dev;
++
++        dev = file->private_data;
++
++        poll_wait(file, &dev->wait, wait);
++
++        if (inotify_dev_has_events(dev))
++                return POLLIN | POLLRDNORM;
++
++        return 0;
++}
++
++static ssize_t inotify_read(struct file *file, char __user *buf,
++			    size_t count, loff_t *pos)
++{
++	size_t event_size;
++	struct inotify_device *dev;
++	char __user *start;
++	DECLARE_WAITQUEUE(wait, current);
++
++	start = buf;
++	dev = file->private_data;
++
++	/* We only hand out full inotify events */
++	event_size = sizeof(struct inotify_event) - sizeof(char *);
++
++	if (count < event_size) 
++		return -EINVAL;
++
++	while (1) {
++		int has_events;
++
++		spin_lock(&dev->lock);
++		has_events = inotify_dev_has_events(dev);
++		spin_unlock(&dev->lock);
++		if (has_events)
++			break;
++
++		if (file->f_flags & O_NONBLOCK)
++			return -EAGAIN;
++
++		if (signal_pending(current))
++			return -ERESTARTSYS;
++
++		add_wait_queue(&dev->wait, &wait);
++		set_current_state(TASK_INTERRUPTIBLE);
++
++		schedule();
++
++		set_current_state(TASK_RUNNING);		
++		remove_wait_queue(&dev->wait, &wait);
++	}
++
++	while (count >= event_size) {
++		struct inotify_kernel_event *kevent;
++
++		spin_lock(&dev->lock);
++		if (!inotify_dev_has_events(dev)) {
++			spin_unlock(&dev->lock);
++			break;
++		}
++		kevent = inotify_dev_get_event(dev);
++
++		/* We can't send this event, not enough space in the buffer */
++		if ((event_size + kevent->event.len + 1) > count) {
++			spin_unlock(&dev->lock);
++			break;
++		}
++		spin_unlock(&dev->lock);
++
++		/* Copy the entire event except the string to user space */
++		if (copy_to_user(buf, &kevent->event, event_size)) 
++			return -EFAULT;
++
++		buf += event_size;
++		count -= event_size;
++
++		/* Copy the filename to user space */
++		if (kevent->event.filename) {
++			if (copy_to_user(buf, kevent->event.filename, 
++					kevent->event.len+1)) 
++				return -EFAULT;
++			buf += kevent->event.len + 1;
++			count -= kevent->event.len + 1;
++		} else {
++			int z = 0;
++			/* Copy the NULL */
++			if (copy_to_user(buf, &z, 1)) 
++				return -EFAULT;
++
++			buf += 1;
++			count -= 1;
++		}
++
++		spin_lock(&dev->lock);
++		inotify_dev_event_dequeue(dev);
++		spin_unlock(&dev->lock);
++	}
++
++	return buf - start;
++}
++
++static int inotify_open(struct inode *inode, struct file *file)
++{
++	struct inotify_device *dev;
++	struct user_struct *user;
++	int ret;
++
++	user = get_uid(current->user);
++
++	if (atomic_read(&user->inotify_devs) >= sysfs_attrib_max_user_devices) {
++		ret = -ENOSPC;
++		goto out_err;
++	}
++
++	atomic_inc(&current->user->inotify_devs);
++
++	dev = kmalloc(sizeof(struct inotify_device), GFP_KERNEL);
++	if (!dev) {
++		ret = -ENOMEM;
++		goto out_err;
++	}
++
++	idr_init(&dev->idr);
++
++	INIT_LIST_HEAD(&dev->events);
++	INIT_LIST_HEAD(&dev->watches);
++	init_waitqueue_head(&dev->wait);
++
++	dev->event_count = 0;
++	dev->queue_size = 0;
++	dev->max_events = sysfs_attrib_max_queued_events;
++	dev->user = user;
++	spin_lock_init(&dev->lock);
++
++	file->private_data = dev;
++
++	return 0;
++out_err:
++	free_uid(current->user);
++	return ret;
++}
++
++/*
++ * inotify_release_all_watches - destroy all watches on a given device
++ *
++ * FIXME: Do we want a lock here?
++ */
++static void inotify_release_all_watches(struct inotify_device *dev)
++{
++	struct inotify_watch *watch, *next;
++
++	list_for_each_entry_safe(watch, next, &dev->watches, d_list)
++		ignore_helper(watch, 0);
++}
++
++/*
++ * inotify_release_all_events - destroy all of the events on a given device
++ */
++static void inotify_release_all_events(struct inotify_device *dev)
++{
++	spin_lock(&dev->lock);
++	while (inotify_dev_has_events(dev))
++		inotify_dev_event_dequeue(dev);
++	spin_unlock(&dev->lock);
++}
++
++static int inotify_release(struct inode *inode, struct file *file)
++{
++	struct inotify_device *dev;
++
++	dev = file->private_data;
++
++	inotify_release_all_watches(dev);
++	inotify_release_all_events(dev);
++
++	atomic_dec(&dev->user->inotify_devs);
++	free_uid(dev->user);
++
++	kfree(dev);
++
++	return 0;
++}
++
++static int inotify_add_watch(struct inotify_device *dev,
++			     struct inotify_watch_request *request)
++{
++	struct inode *inode;
++	struct inotify_watch *watch;
++	int ret;
++
++	inode = find_inode((const char __user*) request->dirname);
++	if (IS_ERR(inode))
++		return PTR_ERR(inode);
++
++	spin_lock(&dev->lock);
++
++	/*
++	 * This handles the case of re-adding a directory we are already
++	 * watching, we just update the mask and return 0
++	 */
++	if (inotify_dev_is_watching_inode(dev, inode)) {
++		struct inotify_watch *owatch;	/* the old watch */
++
++		owatch = inode_find_dev(inode, dev);
++		owatch->mask = request->mask;
++		inode_update_watch_mask(inode);
++		spin_unlock(&dev->lock);
++		iput(inode);
++
++		return owatch->wd;
++	}
++
++	spin_unlock(&dev->lock);
++
++	watch = create_watch(dev, request->mask, inode);
++	if (!watch) {
++		iput(inode);
++		return -ENOSPC;
++	}
++
++	spin_lock(&dev->lock);
++
++	/* We can't add anymore watches to this device */
++	if (inotify_dev_add_watch(dev, watch)) {
++		delete_watch(dev, watch);
++		spin_unlock(&dev->lock);
++		iput(inode);
++		return -EINVAL;
++	}
++
++	ret = inode_add_watch(inode, watch);
++	if (ret < 0) {
++		list_del_init(&watch->d_list);
++		delete_watch(dev, watch);
++		spin_unlock(&dev->lock);
++		iput(inode);
++		return ret;
++	}
++
++	spin_unlock(&dev->lock);
++
++	return watch->wd;
++}
++
++static int inotify_ignore(struct inotify_device *dev, s32 wd)
++{
++	struct inotify_watch *watch;
++
++	/*
++	 * FIXME: Silly to grab dev->lock here and then drop it, when
++	 * ignore_helper() grabs it anyway a few lines down.
++	 */
++	spin_lock(&dev->lock);
++	watch = dev_find_wd(dev, wd);
++	spin_unlock(&dev->lock);
++	if (!watch)
++		return -EINVAL;
++	ignore_helper(watch, 0);
++
++	return 0;
++}
++
++/*
++ * inotify_ioctl() - our device file's ioctl method
++ *
++ * The VFS serializes all of our calls via the BKL and we rely on that.  We
++ * could, alternatively, grab dev->lock.  Right now lower levels grab that
++ * where needed.
++ */
++static int inotify_ioctl(struct inode *ip, struct file *fp,
++			 unsigned int cmd, unsigned long arg)
++{
++	struct inotify_device *dev;
++	struct inotify_watch_request request;
++	void __user *p;
++	s32 wd;
++
++	dev = fp->private_data;
++	p = (void __user *) arg;
++
++	switch (cmd) {
++	case INOTIFY_WATCH:
++		if (copy_from_user(&request, p, sizeof (request)))
++			return -EFAULT;
++		return inotify_add_watch(dev, &request);
++	case INOTIFY_IGNORE:
++		if (copy_from_user(&wd, p, sizeof (wd)))
++			return -EFAULT;
++		return inotify_ignore(dev, wd);
++	case FIONREAD:
++		return put_user(dev->queue_size, (int __user *) p);
++	default:
++		return -ENOTTY;
++	}
++}
++
++static struct file_operations inotify_fops = {
++	.owner		= THIS_MODULE,
++	.poll		= inotify_poll,
++	.read		= inotify_read,
++	.open		= inotify_open,
++	.release	= inotify_release,
++	.ioctl		= inotify_ioctl,
++};
++
++struct miscdevice inotify_device = {
++	.minor  = MISC_DYNAMIC_MINOR,
++	.name	= "inotify",
++	.fops	= &inotify_fops,
++};
++
++static int __init inotify_init(void)
++{
++	struct class_device *class;
++	int ret;
++
++	ret = misc_register(&inotify_device);
++	if (ret)
++		return ret;
++
++	sysfs_attrib_max_queued_events = 512;
++	sysfs_attrib_max_user_devices = 64;
++	sysfs_attrib_max_user_watches = 16384;
++
++	class = inotify_device.class;
++	class_device_create_file(class, &class_device_attr_max_queued_events);
++	class_device_create_file(class, &class_device_attr_max_user_devices);
++	class_device_create_file(class, &class_device_attr_max_user_watches);
++
++	atomic_set(&inotify_cookie, 0);
++
++	watch_cachep = kmem_cache_create("inotify_watch_cache",
++			sizeof(struct inotify_watch), 0, SLAB_PANIC,
++			NULL, NULL);
++
++	event_cachep = kmem_cache_create("inotify_event_cache",
++			sizeof(struct inotify_kernel_event), 0,
++			SLAB_PANIC, NULL, NULL);
++
++	inode_data_cachep = kmem_cache_create("inotify_inode_data_cache",
++			sizeof(struct inotify_inode_data), 0, SLAB_PANIC,
++			NULL, NULL);
++
++	printk(KERN_INFO "inotify device minor=%d\n", inotify_device.minor);
++
++	return 0;
++}
++
++module_init(inotify_init);
+diff -urN linux-2.6.10/drivers/char/Kconfig linux/drivers/char/Kconfig
+--- linux-2.6.10/drivers/char/Kconfig	2004-12-24 16:33:49.000000000 -0500
++++ linux/drivers/char/Kconfig	2005-01-06 15:04:03.741780048 -0500
+@@ -62,6 +62,19 @@
+ 	depends on VT && !S390 && !USERMODE
+ 	default y
+ 
++config INOTIFY
++	bool "Inotify file change notification support"
++	default y
++	---help---
++	  Say Y here to enable inotify support and the /dev/inotify character
++	  device.  Inotify is a file change notification system and a
++	  replacement for dnotify.  Inotify fixes numerous shortcomings in
++	  dnotify and introduces several new features.  It allows monitoring
++	  of both files and directories via a single open fd.  Multiple file
++	  events are supported.
++	  
++	  If unsure, say Y.
++
+ config SERIAL_NONSTANDARD
+ 	bool "Non-standard serial port support"
+ 	---help---
+diff -urN linux-2.6.10/drivers/char/Makefile linux/drivers/char/Makefile
+--- linux-2.6.10/drivers/char/Makefile	2004-12-24 16:35:29.000000000 -0500
++++ linux/drivers/char/Makefile	2005-01-06 15:04:03.741780048 -0500
+@@ -9,6 +9,8 @@
+ 
+ obj-y	 += mem.o random.o tty_io.o n_tty.o tty_ioctl.o
+ 
++
++obj-$(CONFIG_INOTIFY)           += inotify.o
+ obj-$(CONFIG_LEGACY_PTYS)	+= pty.o
+ obj-$(CONFIG_UNIX98_PTYS)	+= pty.o
+ obj-y				+= misc.o
+diff -urN linux-2.6.10/drivers/char/misc.c linux/drivers/char/misc.c
+--- linux-2.6.10/drivers/char/misc.c	2004-12-24 16:35:28.000000000 -0500
++++ linux/drivers/char/misc.c	2005-01-06 15:04:03.742779896 -0500
+@@ -207,10 +207,9 @@
+ int misc_register(struct miscdevice * misc)
+ {
+ 	struct miscdevice *c;
+-	struct class_device *class;
+ 	dev_t dev;
+ 	int err;
+-	
++
+ 	down(&misc_sem);
+ 	list_for_each_entry(c, &misc_list, list) {
+ 		if (c->minor == misc->minor) {
+@@ -224,8 +223,7 @@
+ 		while (--i >= 0)
+ 			if ( (misc_minors[i>>3] & (1 << (i&7))) == 0)
+ 				break;
+-		if (i<0)
+-		{
++		if (i<0) {
+ 			up(&misc_sem);
+ 			return -EBUSY;
+ 		}
+@@ -240,10 +238,10 @@
+ 	}
+ 	dev = MKDEV(MISC_MAJOR, misc->minor);
+ 
+-	class = class_simple_device_add(misc_class, dev,
+-					misc->dev, misc->name);
+-	if (IS_ERR(class)) {
+-		err = PTR_ERR(class);
++	misc->class = class_simple_device_add(misc_class, dev,
++					      misc->dev, misc->name);
++	if (IS_ERR(misc->class)) {
++		err = PTR_ERR(misc->class);
+ 		goto out;
+ 	}
+ 
+diff -urN linux-2.6.10/fs/attr.c linux/fs/attr.c
+--- linux-2.6.10/fs/attr.c	2004-12-24 16:34:00.000000000 -0500
++++ linux/fs/attr.c	2005-01-06 15:04:03.743779744 -0500
+@@ -11,6 +11,7 @@
+ #include <linux/string.h>
+ #include <linux/smp_lock.h>
+ #include <linux/dnotify.h>
++#include <linux/inotify.h>
+ #include <linux/fcntl.h>
+ #include <linux/quotaops.h>
+ #include <linux/security.h>
+@@ -103,29 +104,51 @@
+ out:
+ 	return error;
+ }
+-
+ EXPORT_SYMBOL(inode_setattr);
+ 
+-int setattr_mask(unsigned int ia_valid)
++void setattr_mask (unsigned int ia_valid, int *dn_mask, u32 *in_mask)
+ {
+-	unsigned long dn_mask = 0;
++	int dnmask;
++	u32 inmask;
+ 
+-	if (ia_valid & ATTR_UID)
+-		dn_mask |= DN_ATTRIB;
+-	if (ia_valid & ATTR_GID)
+-		dn_mask |= DN_ATTRIB;
+-	if (ia_valid & ATTR_SIZE)
+-		dn_mask |= DN_MODIFY;
+-	/* both times implies a utime(s) call */
+-	if ((ia_valid & (ATTR_ATIME|ATTR_MTIME)) == (ATTR_ATIME|ATTR_MTIME))
+-		dn_mask |= DN_ATTRIB;
+-	else if (ia_valid & ATTR_ATIME)
+-		dn_mask |= DN_ACCESS;
+-	else if (ia_valid & ATTR_MTIME)
+-		dn_mask |= DN_MODIFY;
+-	if (ia_valid & ATTR_MODE)
+-		dn_mask |= DN_ATTRIB;
+-	return dn_mask;
++	inmask = 0;
++	dnmask = 0;
++
++	if (!dn_mask || !in_mask) {
++		return;
++	}
++        if (ia_valid & ATTR_UID) {
++                inmask |= IN_ATTRIB;
++		dnmask |= DN_ATTRIB;
++	}
++        if (ia_valid & ATTR_GID) {
++                inmask |= IN_ATTRIB;
++		dnmask |= DN_ATTRIB;
++	}
++        if (ia_valid & ATTR_SIZE) {
++                inmask |= IN_MODIFY;
++		dnmask |= DN_MODIFY;
++	}
++        /* both times implies a utime(s) call */
++        if ((ia_valid & (ATTR_ATIME|ATTR_MTIME)) == (ATTR_ATIME|ATTR_MTIME)) {
++                inmask |= IN_ATTRIB;
++		dnmask |= DN_ATTRIB;
++	}
++        else if (ia_valid & ATTR_ATIME) {
++                inmask |= IN_ACCESS;
++		dnmask |= DN_ACCESS;
++	}
++        else if (ia_valid & ATTR_MTIME) {
++                inmask |= IN_MODIFY;
++		dnmask |= DN_MODIFY;
++	}
++        if (ia_valid & ATTR_MODE) {
++                inmask |= IN_ATTRIB;
++		dnmask |= DN_ATTRIB;
++	}
++
++	*in_mask = inmask;
++	*dn_mask = dnmask;
+ }
+ 
+ int notify_change(struct dentry * dentry, struct iattr * attr)
+@@ -184,9 +207,19 @@
+ 		}
+ 	}
+ 	if (!error) {
+-		unsigned long dn_mask = setattr_mask(ia_valid);
++		int dn_mask;
++		u32 in_mask;
++
++		setattr_mask (ia_valid, &dn_mask, &in_mask);
++
+ 		if (dn_mask)
+ 			dnotify_parent(dentry, dn_mask);
++		if (in_mask) {
++			inotify_inode_queue_event(dentry->d_inode, in_mask, 0,
++						  NULL);
++			inotify_dentry_parent_queue_event(dentry, in_mask, 0,
++							  dentry->d_name.name);
++		}
+ 	}
+ 	return error;
+ }
+diff -urN linux-2.6.10/fs/file_table.c linux/fs/file_table.c
+--- linux-2.6.10/fs/file_table.c	2004-12-24 16:33:50.000000000 -0500
++++ linux/fs/file_table.c	2005-01-06 15:04:03.743779744 -0500
+@@ -16,6 +16,7 @@
+ #include <linux/eventpoll.h>
+ #include <linux/mount.h>
+ #include <linux/cdev.h>
++#include <linux/inotify.h>
+ 
+ /* sysctl tunables... */
+ struct files_stat_struct files_stat = {
+@@ -120,6 +121,12 @@
+ 	struct dentry *dentry = file->f_dentry;
+ 	struct vfsmount *mnt = file->f_vfsmnt;
+ 	struct inode *inode = dentry->d_inode;
++	u32 mask;
++
++
++	mask = (file->f_mode & FMODE_WRITE) ? IN_CLOSE_WRITE : IN_CLOSE_NOWRITE;
++	inotify_dentry_parent_queue_event(dentry, mask, 0, dentry->d_name.name);
++	inotify_inode_queue_event(inode, mask, 0, NULL);
+ 
+ 	might_sleep();
+ 	/*
+diff -urN linux-2.6.10/fs/inode.c linux/fs/inode.c
+--- linux-2.6.10/fs/inode.c	2004-12-24 16:35:40.000000000 -0500
++++ linux/fs/inode.c	2005-01-06 15:04:03.744779592 -0500
+@@ -130,6 +130,9 @@
+ #ifdef CONFIG_QUOTA
+ 		memset(&inode->i_dquot, 0, sizeof(inode->i_dquot));
+ #endif
++#ifdef CONFIG_INOTIFY
++		inode->inotify_data = NULL;
++#endif
+ 		inode->i_pipe = NULL;
+ 		inode->i_bdev = NULL;
+ 		inode->i_cdev = NULL;
+diff -urN linux-2.6.10/fs/namei.c linux/fs/namei.c
+--- linux-2.6.10/fs/namei.c	2004-12-24 16:34:30.000000000 -0500
++++ linux/fs/namei.c	2005-01-06 15:30:13.049209056 -0500
+@@ -22,6 +22,7 @@
+ #include <linux/quotaops.h>
+ #include <linux/pagemap.h>
+ #include <linux/dnotify.h>
++#include <linux/inotify.h>
+ #include <linux/smp_lock.h>
+ #include <linux/personality.h>
+ #include <linux/security.h>
+@@ -1242,6 +1243,8 @@
+ 	error = dir->i_op->create(dir, dentry, mode, nd);
+ 	if (!error) {
+ 		inode_dir_notify(dir, DN_CREATE);
++		inotify_inode_queue_event(dir, IN_CREATE_FILE,
++				0, dentry->d_name.name);
+ 		security_inode_post_create(dir, dentry, mode);
+ 	}
+ 	return error;
+@@ -1556,6 +1559,8 @@
+ 	error = dir->i_op->mknod(dir, dentry, mode, dev);
+ 	if (!error) {
+ 		inode_dir_notify(dir, DN_CREATE);
++		inotify_inode_queue_event(dir, IN_CREATE_FILE, 0,
++				dentry->d_name.name);
+ 		security_inode_post_mknod(dir, dentry, mode, dev);
+ 	}
+ 	return error;
+@@ -1629,6 +1634,8 @@
+ 	error = dir->i_op->mkdir(dir, dentry, mode);
+ 	if (!error) {
+ 		inode_dir_notify(dir, DN_CREATE);
++		inotify_inode_queue_event(dir, IN_CREATE_SUBDIR, 0,
++				dentry->d_name.name);
+ 		security_inode_post_mkdir(dir,dentry, mode);
+ 	}
+ 	return error;
+@@ -1724,6 +1731,11 @@
+ 	up(&dentry->d_inode->i_sem);
+ 	if (!error) {
+ 		inode_dir_notify(dir, DN_DELETE);
++		inotify_inode_queue_event(dir, IN_DELETE_SUBDIR, 0,
++				dentry->d_name.name);
++		inotify_inode_queue_event(dentry->d_inode, IN_DELETE_SELF, 0,
++				NULL);
++		inotify_inode_is_dead (dentry->d_inode);
+ 		d_delete(dentry);
+ 	}
+ 	dput(dentry);
+@@ -1796,8 +1808,13 @@
+ 
+ 	/* We don't d_delete() NFS sillyrenamed files--they still exist. */
+ 	if (!error && !(dentry->d_flags & DCACHE_NFSFS_RENAMED)) {
+-		d_delete(dentry);
+ 		inode_dir_notify(dir, DN_DELETE);
++		inotify_inode_queue_event(dir, IN_DELETE_FILE, 0,
++				dentry->d_name.name);
++		inotify_inode_queue_event(dentry->d_inode, IN_DELETE_SELF, 0,
++				NULL);
++		inotify_inode_is_dead (dentry->d_inode);
++		d_delete(dentry);
+ 	}
+ 	return error;
+ }
+@@ -1873,6 +1890,8 @@
+ 	error = dir->i_op->symlink(dir, dentry, oldname);
+ 	if (!error) {
+ 		inode_dir_notify(dir, DN_CREATE);
++		inotify_inode_queue_event(dir, IN_CREATE_FILE, 0,
++				dentry->d_name.name);
+ 		security_inode_post_symlink(dir, dentry, oldname);
+ 	}
+ 	return error;
+@@ -1946,6 +1965,8 @@
+ 	up(&old_dentry->d_inode->i_sem);
+ 	if (!error) {
+ 		inode_dir_notify(dir, DN_CREATE);
++		inotify_inode_queue_event(dir, IN_CREATE_FILE, 0, 
++					new_dentry->d_name.name);
+ 		security_inode_post_link(old_dentry, dir, new_dentry);
+ 	}
+ 	return error;
+@@ -2109,6 +2130,8 @@
+ {
+ 	int error;
+ 	int is_dir = S_ISDIR(old_dentry->d_inode->i_mode);
++	char *old_name;
++	u32 cookie;
+ 
+ 	if (old_dentry->d_inode == new_dentry->d_inode)
+  		return 0;
+@@ -2130,6 +2153,8 @@
+ 	DQUOT_INIT(old_dir);
+ 	DQUOT_INIT(new_dir);
+ 
++	old_name = inotify_oldname_init(old_dentry);
++
+ 	if (is_dir)
+ 		error = vfs_rename_dir(old_dir,old_dentry,new_dir,new_dentry);
+ 	else
+@@ -2141,7 +2166,16 @@
+ 			inode_dir_notify(old_dir, DN_DELETE);
+ 			inode_dir_notify(new_dir, DN_CREATE);
+ 		}
++
++		cookie = inotify_get_cookie();
++
++		inotify_inode_queue_event(old_dir, IN_MOVED_FROM, cookie,
++					  old_name);
++		inotify_inode_queue_event(new_dir, IN_MOVED_TO, cookie,
++					  old_dentry->d_name.name);
+ 	}
++	inotify_oldname_free(old_name);
++
+ 	return error;
+ }
+ 
+diff -urN linux-2.6.10/fs/open.c linux/fs/open.c
+--- linux-2.6.10/fs/open.c	2004-12-24 16:33:50.000000000 -0500
++++ linux/fs/open.c	2005-01-06 15:04:03.747779136 -0500
+@@ -11,6 +11,7 @@
+ #include <linux/smp_lock.h>
+ #include <linux/quotaops.h>
+ #include <linux/dnotify.h>
++#include <linux/inotify.h>
+ #include <linux/module.h>
+ #include <linux/slab.h>
+ #include <linux/tty.h>
+@@ -956,6 +957,10 @@
+ 			error = PTR_ERR(f);
+ 			if (IS_ERR(f))
+ 				goto out_error;
++			inotify_inode_queue_event(f->f_dentry->d_inode,
++					IN_OPEN, 0, NULL);
++			inotify_dentry_parent_queue_event(f->f_dentry, IN_OPEN,
++					0, f->f_dentry->d_name.name);
+ 			fd_install(fd, f);
+ 		}
+ out:
+diff -urN linux-2.6.10/fs/read_write.c linux/fs/read_write.c
+--- linux-2.6.10/fs/read_write.c	2004-12-24 16:35:00.000000000 -0500
++++ linux/fs/read_write.c	2005-01-06 15:04:03.748778984 -0500
+@@ -11,6 +11,7 @@
+ #include <linux/uio.h>
+ #include <linux/smp_lock.h>
+ #include <linux/dnotify.h>
++#include <linux/inotify.h>
+ #include <linux/security.h>
+ #include <linux/module.h>
+ #include <linux/syscalls.h>
+@@ -216,8 +217,14 @@
+ 				ret = file->f_op->read(file, buf, count, pos);
+ 			else
+ 				ret = do_sync_read(file, buf, count, pos);
+-			if (ret > 0)
+-				dnotify_parent(file->f_dentry, DN_ACCESS);
++			if (ret > 0) {
++				struct dentry *dentry = file->f_dentry;
++				dnotify_parent(dentry, DN_ACCESS);
++				inotify_dentry_parent_queue_event(dentry,
++						IN_ACCESS, 0, dentry->d_name.name);
++				inotify_inode_queue_event(inode, IN_ACCESS, 0,
++						NULL);
++			}
+ 		}
+ 	}
+ 
+@@ -260,8 +267,14 @@
+ 				ret = file->f_op->write(file, buf, count, pos);
+ 			else
+ 				ret = do_sync_write(file, buf, count, pos);
+-			if (ret > 0)
+-				dnotify_parent(file->f_dentry, DN_MODIFY);
++			if (ret > 0) {
++				struct dentry *dentry = file->f_dentry;
++				dnotify_parent(dentry, DN_MODIFY);
++				inotify_dentry_parent_queue_event(dentry,
++						IN_MODIFY, 0, dentry->d_name.name);
++				inotify_inode_queue_event(inode, IN_MODIFY, 0,
++						NULL);
++			}
+ 		}
+ 	}
+ 
+@@ -493,9 +506,15 @@
+ out:
+ 	if (iov != iovstack)
+ 		kfree(iov);
+-	if ((ret + (type == READ)) > 0)
+-		dnotify_parent(file->f_dentry,
+-				(type == READ) ? DN_ACCESS : DN_MODIFY);
++	if ((ret + (type == READ)) > 0) {
++		struct dentry *dentry = file->f_dentry;
++		dnotify_parent(dentry, (type == READ) ? DN_ACCESS : DN_MODIFY);
++		inotify_dentry_parent_queue_event(dentry,
++				(type == READ) ? IN_ACCESS : IN_MODIFY, 0,
++				dentry->d_name.name);
++		inotify_inode_queue_event (dentry->d_inode,
++				(type == READ) ? IN_ACCESS : IN_MODIFY, 0, NULL);
++	}
+ 	return ret;
+ }
+ 
+diff -urN linux-2.6.10/fs/super.c linux/fs/super.c
+--- linux-2.6.10/fs/super.c	2004-12-24 16:34:33.000000000 -0500
++++ linux/fs/super.c	2005-01-06 15:04:03.748778984 -0500
+@@ -38,6 +38,7 @@
+ #include <linux/idr.h>
+ #include <linux/kobject.h>
+ #include <asm/uaccess.h>
++#include <linux/inotify.h>
+ 
+ 
+ void get_filesystem(struct file_system_type *fs);
+@@ -227,6 +228,7 @@
+ 
+ 	if (root) {
+ 		sb->s_root = NULL;
++		inotify_super_block_umount(sb);
+ 		shrink_dcache_parent(root);
+ 		shrink_dcache_anon(&sb->s_anon);
+ 		dput(root);
+diff -urN linux-2.6.10/include/linux/fs.h linux/include/linux/fs.h
+--- linux-2.6.10/include/linux/fs.h	2004-12-24 16:34:27.000000000 -0500
++++ linux/include/linux/fs.h	2005-01-06 15:04:03.750778680 -0500
+@@ -27,6 +27,7 @@
+ struct kstatfs;
+ struct vm_area_struct;
+ struct vfsmount;
++struct inotify_inode_data;
+ 
+ /*
+  * It's silly to have NR_OPEN bigger than NR_FILE, but you can change
+@@ -473,6 +474,10 @@
+ 	struct dnotify_struct	*i_dnotify; /* for directory notifications */
+ #endif
+ 
++#ifdef CONFIG_INOTIFY
++	struct inotify_inode_data *inotify_data;
++#endif
++
+ 	unsigned long		i_state;
+ 	unsigned long		dirtied_when;	/* jiffies of first dirtying */
+ 
+@@ -1353,7 +1358,7 @@
+ extern int do_remount_sb(struct super_block *sb, int flags,
+ 			 void *data, int force);
+ extern sector_t bmap(struct inode *, sector_t);
+-extern int setattr_mask(unsigned int);
++extern void setattr_mask(unsigned int, int *, u32 *);
+ extern int notify_change(struct dentry *, struct iattr *);
+ extern int permission(struct inode *, int, struct nameidata *);
+ extern int generic_permission(struct inode *, int,
+diff -urN linux-2.6.10/include/linux/inotify.h linux/include/linux/inotify.h
+--- linux-2.6.10/include/linux/inotify.h	1969-12-31 19:00:00.000000000 -0500
++++ linux/include/linux/inotify.h	2005-01-07 17:18:37.798540360 -0500
+@@ -0,0 +1,160 @@
++/*
++ * Inode based directory notification for Linux
++ *
++ * Copyright (C) 2004 John McCutchan
++ */
++
++#ifndef _LINUX_INOTIFY_H
++#define _LINUX_INOTIFY_H
++
++#include <linux/types.h>
++#include <linux/limits.h>
++
++/* this size could limit things, since technically we could need PATH_MAX */
++#define INOTIFY_FILENAME_MAX	256
++
++/*
++ * struct inotify_event - structure read from the inotify device for each event
++ *
++ * When you are watching a directory, you will receive the filename for events
++ * such as IN_CREATE, IN_DELETE, IN_OPEN, IN_CLOSE, ...
++ *
++ * Note: When reading from the device you must provide a buffer that is a
++ * multiple of sizeof(struct inotify_event)
++ */
++struct inotify_event {
++	__s32 wd;
++	__u32 mask;
++	__u32 cookie;
++	size_t len;
++#ifdef __KERNEL__
++	char *filename;
++#else
++	char filename[0];
++#endif
++};
++
++/*
++ * struct inotify_watch_request - represents a watch request
++ *
++ * Pass to the inotify device via the INOTIFY_WATCH ioctl
++ */
++struct inotify_watch_request {
++	char *dirname;		/* directory name */
++	__u32 mask;		/* event mask */
++};
++
++/* the following are legal, implemented events */
++#define IN_ACCESS		0x00000001	/* File was accessed */
++#define IN_MODIFY		0x00000002	/* File was modified */
++#define IN_ATTRIB		0x00000004	/* File changed attributes */
++#define IN_CLOSE_WRITE		0x00000008	/* Writtable file was closed */
++#define IN_CLOSE_NOWRITE	0x00000010	/* Unwrittable file closed */
++#define IN_OPEN			0x00000020	/* File was opened */
++#define IN_MOVED_FROM		0x00000040	/* File was moved from X */
++#define IN_MOVED_TO		0x00000080	/* File was moved to Y */
++#define IN_DELETE_SUBDIR	0x00000100	/* Subdir was deleted */ 
++#define IN_DELETE_FILE		0x00000200	/* Subfile was deleted */
++#define IN_CREATE_SUBDIR	0x00000400	/* Subdir was created */
++#define IN_CREATE_FILE		0x00000800	/* Subfile was created */
++#define IN_DELETE_SELF		0x00001000	/* Self was deleted */
++#define IN_UNMOUNT		0x00002000	/* Backing fs was unmounted */
++#define IN_Q_OVERFLOW		0x00004000	/* Event queued overflowed */
++#define IN_IGNORED		0x00008000	/* File was ignored */
++
++/* special flags */
++#define IN_ALL_EVENTS		0xffffffff	/* All the events */
++#define IN_CLOSE		(IN_CLOSE_WRITE | IN_CLOSE_NOWRITE)
++
++#define INOTIFY_IOCTL_MAGIC	'Q'
++#define INOTIFY_IOCTL_MAXNR	2
++
++#define INOTIFY_WATCH  		_IOR(INOTIFY_IOCTL_MAGIC, 1, struct inotify_watch_request)
++#define INOTIFY_IGNORE 		_IOR(INOTIFY_IOCTL_MAGIC, 2, int)
++
++#ifdef __KERNEL__
++
++#include <linux/dcache.h>
++#include <linux/fs.h>
++#include <linux/config.h>
++
++struct inotify_inode_data {
++	struct list_head watches;
++	__u32 watch_mask;
++	spinlock_t lock;
++	atomic_t count;
++};
++
++#ifdef CONFIG_INOTIFY
++
++extern void inotify_inode_queue_event(struct inode *, __u32, __u32,
++				      const char *);
++extern void inotify_dentry_parent_queue_event(struct dentry *, __u32, __u32,
++					      const char *);
++extern void inotify_super_block_umount(struct super_block *);
++extern void inotify_inode_is_dead(struct inode *);
++extern __u32 inotify_get_cookie(void);
++extern __u32 setattr_mask_inotify(unsigned int);
++
++/* this could be kstrdup if only we could add that to lib/string.c */
++static inline char * inotify_oldname_init(struct dentry *old_dentry)
++{
++	char *old_name;
++
++	old_name = kmalloc(strlen(old_dentry->d_name.name) + 1, GFP_KERNEL);
++	if (old_name)
++		strcpy(old_name, old_dentry->d_name.name);
++	return old_name;
++}
++
++static inline void inotify_oldname_free(const char *old_name)
++{
++	kfree(old_name);
++}
++
++#else
++
++static inline void inotify_inode_queue_event(struct inode *inode,
++					     __u32 mask, __u32 cookie,
++					     const char *filename)
++{
++}
++
++static inline void inotify_dentry_parent_queue_event(struct dentry *dentry,
++						     __u32 mask, __u32 cookie,
++						     const char *filename)
++{
++}
++
++static inline void inotify_super_block_umount(struct super_block *sb)
++{
++}
++
++static inline void inotify_inode_is_dead(struct inode *inode)
++{
++}
++
++static inline char * inotify_oldname_init(struct dentry *old_dentry)
++{
++	return NULL;
++}
++
++static inline __u32 inotify_get_cookie(void)
++{
++	return 0;
++}
++
++static inline void inotify_oldname_free(const char *old_name)
++{
++}
++
++static inline int setattr_mask_inotify(unsigned int ia_mask)
++{
++	return 0;
++}
++
++#endif	/* CONFIG_INOTIFY */
++
++#endif	/* __KERNEL __ */
++
++#endif	/* _LINUX_INOTIFY_H */
+diff -urN linux-2.6.10/include/linux/miscdevice.h linux/include/linux/miscdevice.h
+--- linux-2.6.10/include/linux/miscdevice.h	2004-12-24 16:34:58.000000000 -0500
++++ linux/include/linux/miscdevice.h	2005-01-06 15:04:03.751778528 -0500
+@@ -2,6 +2,7 @@
+ #define _LINUX_MISCDEVICE_H
+ #include <linux/module.h>
+ #include <linux/major.h>
++#include <linux/device.h>
+ 
+ #define PSMOUSE_MINOR  1
+ #define MS_BUSMOUSE_MINOR 2
+@@ -32,13 +33,13 @@
+ 
+ struct device;
+ 
+-struct miscdevice 
+-{
++struct miscdevice  {
+ 	int minor;
+ 	const char *name;
+ 	struct file_operations *fops;
+ 	struct list_head list;
+ 	struct device *dev;
++	struct class_device *class;
+ 	char devfs_name[64];
+ };
+ 
+diff -urN linux-2.6.10/include/linux/sched.h linux/include/linux/sched.h
+--- linux-2.6.10/include/linux/sched.h	2004-12-24 16:33:59.000000000 -0500
++++ linux/include/linux/sched.h	2005-01-06 15:04:03.752778376 -0500
+@@ -353,6 +353,8 @@
+ 	atomic_t processes;	/* How many processes does this user have? */
+ 	atomic_t files;		/* How many open files does this user have? */
+ 	atomic_t sigpending;	/* How many pending signals does this user have? */
++	atomic_t inotify_watches;	/* How many inotify watches does this user have? */
++	atomic_t inotify_devs;	/* How many inotify devs does this user have opened? */
+ 	/* protected by mq_lock	*/
+ 	unsigned long mq_bytes;	/* How many bytes can be allocated to mqueue? */
+ 	unsigned long locked_shm; /* How many pages of mlocked shm ? */
+diff -urN linux-2.6.10/kernel/user.c linux/kernel/user.c
+--- linux-2.6.10/kernel/user.c	2004-12-24 16:34:31.000000000 -0500
++++ linux/kernel/user.c	2005-01-06 15:04:03.753778224 -0500
+@@ -119,6 +119,8 @@
+ 		atomic_set(&new->processes, 0);
+ 		atomic_set(&new->files, 0);
+ 		atomic_set(&new->sigpending, 0);
++		atomic_set(&new->inotify_watches, 0);
++		atomic_set(&new->inotify_devs, 0);
+ 
+ 		new->mq_bytes = 0;
+ 		new->locked_shm = 0;
Index: scripts/untested/blfs-patches/jpegsrc.v6b-update_configury-1.patch
===================================================================
--- scripts/untested/blfs-patches/jpegsrc.v6b-update_configury-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/jpegsrc.v6b-update_configury-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,10699 @@
+ubmitted By: Ryan Oliver <ryan.oliver@pha.com.au>
+Date: 2005-05-22
+Initial Package Version: alpha9.8
+Upstream Status: Not Submitted
+Origin: Self Created
+Description:
+   o Updates config.sub and config.guess to support newer architectures
+   o Updates libtool scripts to avoid linking issues during multilib builds
+
+diff -Naur jpeg-6b-orig/config.guess jpeg-6b/config.guess
+--- jpeg-6b-orig/config.guess	1998-03-26 02:25:38.000000000 +1100
++++ jpeg-6b/config.guess	2005-05-22 21:13:29.000000000 +1000
+@@ -1,7 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+-#   Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
+-#
++#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
++#   2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
++
++timestamp='2004-11-12'
++
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; either version 2 of the License, or
+@@ -21,125 +24,314 @@
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
+-# Written by Per Bothner <bothner@cygnus.com>.
+-# The master version of this file is at the FSF in /home/gd/gnu/lib.
++# Originally written by Per Bothner <per@bothner.com>.
++# Please send patches to <config-patches@gnu.org>.  Submit a context
++# diff and a properly formatted ChangeLog entry.
+ #
+ # This script attempts to guess a canonical system name similar to
+ # config.sub.  If it succeeds, it prints the system name on stdout, and
+ # exits with 0.  Otherwise, it exits with 1.
+ #
+ # The plan is that this can be called by configure scripts if you
+-# don't specify an explicit system type (host/target name).
+-#
+-# Only a few systems have been added to this list; please add others
+-# (but try to keep the structure clean).
+-#
++# don't specify an explicit build system type.
++
++me=`echo "$0" | sed -e 's,.*/,,'`
++
++usage="\
++Usage: $0 [OPTION]
++
++Output the configuration name of the system \`$me' is run on.
++
++Operation modes:
++  -h, --help         print this help, then exit
++  -t, --time-stamp   print date of last modification, then exit
++  -v, --version      print version number, then exit
++
++Report bugs and patches to <config-patches@gnu.org>."
++
++version="\
++GNU config.guess ($timestamp)
++
++Originally written by Per Bothner.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
++Free Software Foundation, Inc.
++
++This is free software; see the source for copying conditions.  There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++
++help="
++Try \`$me --help' for more information."
++
++# Parse command line
++while test $# -gt 0 ; do
++  case $1 in
++    --time-stamp | --time* | -t )
++       echo "$timestamp" ; exit 0 ;;
++    --version | -v )
++       echo "$version" ; exit 0 ;;
++    --help | --h* | -h )
++       echo "$usage"; exit 0 ;;
++    -- )     # Stop option processing
++       shift; break ;;
++    - )	# Use stdin as input.
++       break ;;
++    -* )
++       echo "$me: invalid option $1$help" >&2
++       exit 1 ;;
++    * )
++       break ;;
++  esac
++done
++
++if test $# != 0; then
++  echo "$me: too many arguments$help" >&2
++  exit 1
++fi
++
++trap 'exit 1' 1 2 15
++
++# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
++# compiler to aid in system detection is discouraged as it requires
++# temporary files to be created and, as you can see below, it is a
++# headache to deal with in a portable fashion.
++
++# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
++# use `HOST_CC' if defined, but it is deprecated.
++
++# Portable tmp directory creation inspired by the Autoconf team.
++
++set_cc_for_build='
++trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
++trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
++: ${TMPDIR=/tmp} ;
++ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
++ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
++ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
++ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
++dummy=$tmp/dummy ;
++tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
++case $CC_FOR_BUILD,$HOST_CC,$CC in
++ ,,)    echo "int x;" > $dummy.c ;
++	for c in cc gcc c89 c99 ; do
++	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
++	     CC_FOR_BUILD="$c"; break ;
++	  fi ;
++	done ;
++	if test x"$CC_FOR_BUILD" = x ; then
++	  CC_FOR_BUILD=no_compiler_found ;
++	fi
++	;;
++ ,,*)   CC_FOR_BUILD=$CC ;;
++ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
++esac ;'
+ 
+ # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+-# (ghazi@noc.rutgers.edu 8/24/94.)
++# (ghazi@noc.rutgers.edu 1994-08-24)
+ if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+ 	PATH=$PATH:/.attbin ; export PATH
+ fi
+ 
+ UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+-UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
++UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+ 
+-trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
+-
+ # Note: order is significant - the case branches are not exclusive.
+ 
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
++    *:NetBSD:*:*)
++	# NetBSD (nbsd) targets should (where applicable) match one or
++	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
++	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
++	# switched to ELF, *-*-netbsd* would select the old
++	# object file format.  This provides both forward
++	# compatibility and a consistent mechanism for selecting the
++	# object file format.
++	#
++	# Note: NetBSD doesn't particularly care about the vendor
++	# portion of the name.  We always set it to "unknown".
++	sysctl="sysctl -n hw.machine_arch"
++	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
++	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
++	case "${UNAME_MACHINE_ARCH}" in
++	    armeb) machine=armeb-unknown ;;
++	    arm*) machine=arm-unknown ;;
++	    sh3el) machine=shl-unknown ;;
++	    sh3eb) machine=sh-unknown ;;
++	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
++	esac
++	# The Operating System including object format, if it has switched
++	# to ELF recently, or will in the future.
++	case "${UNAME_MACHINE_ARCH}" in
++	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
++		eval $set_cc_for_build
++		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
++			| grep __ELF__ >/dev/null
++		then
++		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
++		    # Return netbsd for either.  FIX?
++		    os=netbsd
++		else
++		    os=netbsdelf
++		fi
++		;;
++	    *)
++	        os=netbsd
++		;;
++	esac
++	# The OS release
++	# Debian GNU/NetBSD machines have a different userland, and
++	# thus, need a distinct triplet. However, they do not need
++	# kernel version information, so it can be replaced with a
++	# suitable tag, in the style of linux-gnu.
++	case "${UNAME_VERSION}" in
++	    Debian*)
++		release='-gnu'
++		;;
++	    *)
++		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
++		;;
++	esac
++	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
++	# contains redundant information, the shorter form:
++	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
++	echo "${machine}-${os}${release}"
++	exit 0 ;;
++    amd64:OpenBSD:*:*)
++	echo x86_64-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    amiga:OpenBSD:*:*)
++	echo m68k-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    cats:OpenBSD:*:*)
++	echo arm-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    hp300:OpenBSD:*:*)
++	echo m68k-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    luna88k:OpenBSD:*:*)
++    	echo m88k-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    mac68k:OpenBSD:*:*)
++	echo m68k-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    macppc:OpenBSD:*:*)
++	echo powerpc-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    mvme68k:OpenBSD:*:*)
++	echo m68k-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    mvme88k:OpenBSD:*:*)
++	echo m88k-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    mvmeppc:OpenBSD:*:*)
++	echo powerpc-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    sgi:OpenBSD:*:*)
++	echo mips64-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    sun3:OpenBSD:*:*)
++	echo m68k-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    *:OpenBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
++	exit 0 ;;
++    *:ekkoBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
++	exit 0 ;;
++    macppc:MirBSD:*:*)
++	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
++	exit 0 ;;
++    *:MirBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
++	exit 0 ;;
+     alpha:OSF1:*:*)
+-	if test $UNAME_RELEASE = "V4.0"; then
++	case $UNAME_RELEASE in
++	*4.0)
+ 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+-	fi
++		;;
++	*5.*)
++	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
++		;;
++	esac
++	# According to Compaq, /usr/sbin/psrinfo has been available on
++	# OSF/1 and Tru64 systems produced since 1995.  I hope that
++	# covers most systems running today.  This code pipes the CPU
++	# types through head -n 1, so we only detect the type of CPU 0.
++	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
++	case "$ALPHA_CPU_TYPE" in
++	    "EV4 (21064)")
++		UNAME_MACHINE="alpha" ;;
++	    "EV4.5 (21064)")
++		UNAME_MACHINE="alpha" ;;
++	    "LCA4 (21066/21068)")
++		UNAME_MACHINE="alpha" ;;
++	    "EV5 (21164)")
++		UNAME_MACHINE="alphaev5" ;;
++	    "EV5.6 (21164A)")
++		UNAME_MACHINE="alphaev56" ;;
++	    "EV5.6 (21164PC)")
++		UNAME_MACHINE="alphapca56" ;;
++	    "EV5.7 (21164PC)")
++		UNAME_MACHINE="alphapca57" ;;
++	    "EV6 (21264)")
++		UNAME_MACHINE="alphaev6" ;;
++	    "EV6.7 (21264A)")
++		UNAME_MACHINE="alphaev67" ;;
++	    "EV6.8CB (21264C)")
++		UNAME_MACHINE="alphaev68" ;;
++	    "EV6.8AL (21264B)")
++		UNAME_MACHINE="alphaev68" ;;
++	    "EV6.8CX (21264D)")
++		UNAME_MACHINE="alphaev68" ;;
++	    "EV6.9A (21264/EV69A)")
++		UNAME_MACHINE="alphaev69" ;;
++	    "EV7 (21364)")
++		UNAME_MACHINE="alphaev7" ;;
++	    "EV7.9 (21364A)")
++		UNAME_MACHINE="alphaev79" ;;
++	esac
++	# A Pn.n version is a patched version.
+ 	# A Vn.n version is a released version.
+ 	# A Tn.n version is a released field test version.
+ 	# A Xn.n version is an unreleased experimental baselevel.
+ 	# 1.2 uses "1.2" for uname -r.
+-	cat <<EOF >dummy.s
+-	.globl main
+-	.ent main
+-main:
+-	.frame \$30,0,\$26,0
+-	.prologue 0
+-	.long 0x47e03d80 # implver $0
+-	lda \$2,259
+-	.long 0x47e20c21 # amask $2,$1
+-	srl \$1,8,\$2
+-	sll \$2,2,\$2
+-	sll \$0,3,\$0
+-	addl \$1,\$0,\$0
+-	addl \$2,\$0,\$0
+-	ret \$31,(\$26),1
+-	.end main
+-EOF
+-	${CC-cc} dummy.s -o dummy 2>/dev/null
+-	if test "$?" = 0 ; then
+-		./dummy
+-		case "$?" in
+-			7)
+-				UNAME_MACHINE="alpha"
+-				;;
+-			15)
+-				UNAME_MACHINE="alphaev5"
+-				;;
+-			14)
+-				UNAME_MACHINE="alphaev56"
+-				;;
+-			10)
+-				UNAME_MACHINE="alphapca56"
+-				;;
+-			16)
+-				UNAME_MACHINE="alphaev6"
+-				;;
+-		esac
+-	fi
+-	rm -f dummy.s dummy
+-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]`
++	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
++	exit 0 ;;
++    Alpha\ *:Windows_NT*:*)
++	# How do we know it's Interix rather than the generic POSIX subsystem?
++	# Should we change UNAME_MACHINE based on the output of uname instead
++	# of the specific Alpha model?
++	echo alpha-pc-interix
+ 	exit 0 ;;
+     21064:Windows_NT:50:3)
+ 	echo alpha-dec-winnt3.5
+ 	exit 0 ;;
+     Amiga*:UNIX_System_V:4.0:*)
+-	echo m68k-cbm-sysv4
++	echo m68k-unknown-sysv4
+ 	exit 0;;
+-    amiga:NetBSD:*:*)
+-      echo m68k-cbm-netbsd${UNAME_RELEASE}
+-      exit 0 ;;
+-    amiga:OpenBSD:*:*)
+-	echo m68k-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    arc64:OpenBSD:*:*)
+-	echo mips64el-unknown-openbsd${UNAME_RELEASE}
++    *:[Aa]miga[Oo][Ss]:*:*)
++	echo ${UNAME_MACHINE}-unknown-amigaos
+ 	exit 0 ;;
+-    arc:OpenBSD:*:*)
+-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
++    *:[Mm]orph[Oo][Ss]:*:*)
++	echo ${UNAME_MACHINE}-unknown-morphos
+ 	exit 0 ;;
+-    hkmips:OpenBSD:*:*)
+-	echo mips-unknown-openbsd${UNAME_RELEASE}
++    *:OS/390:*:*)
++	echo i370-ibm-openedition
+ 	exit 0 ;;
+-    pmax:OpenBSD:*:*)
+-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    sgi:OpenBSD:*:*)
+-	echo mips-unknown-openbsd${UNAME_RELEASE}
++    *:z/VM:*:*)
++	echo s390-ibm-zvmoe
+ 	exit 0 ;;
+-    wgrisc:OpenBSD:*:*)
+-	echo mipsel-unknown-openbsd${UNAME_RELEASE}
++    *:OS400:*:*)
++        echo powerpc-ibm-os400
+ 	exit 0 ;;
+     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ 	echo arm-acorn-riscix${UNAME_RELEASE}
+ 	exit 0;;
+-    arm32:NetBSD:*:*)
+-	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+-	exit 0 ;;
+-    SR2?01:HI-UX/MPP:*:*)
++    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+ 	echo hppa1.1-hitachi-hiuxmpp
+ 	exit 0;;
+-    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*)
++    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+ 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+ 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
+ 		echo pyramid-pyramid-sysv3
+@@ -147,9 +339,19 @@
+ 		echo pyramid-pyramid-bsd
+ 	fi
+ 	exit 0 ;;
+-    NILE:*:*:dcosx)
++    NILE*:*:*:dcosx)
+ 	echo pyramid-pyramid-svr4
+ 	exit 0 ;;
++    DRS?6000:unix:4.0:6*)
++	echo sparc-icl-nx6
++	exit 0 ;;
++    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
++	case `/usr/bin/uname -p` in
++	    sparc) echo sparc-icl-nx7 && exit 0 ;;
++	esac ;;
++    sun4H:SunOS:5.*:*)
++	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++	exit 0 ;;
+     sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit 0 ;;
+@@ -175,7 +377,7 @@
+ 	echo m68k-sun-sunos${UNAME_RELEASE}
+ 	exit 0 ;;
+     sun*:*:4.2BSD:*)
+-	UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
++	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+ 	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+ 	case "`/bin/arch`" in
+ 	    sun3)
+@@ -189,29 +391,34 @@
+     aushp:SunOS:*:*)
+ 	echo sparc-auspex-sunos${UNAME_RELEASE}
+ 	exit 0 ;;
+-    atari*:NetBSD:*:*)
+-	echo m68k-atari-netbsd${UNAME_RELEASE}
++    # The situation for MiNT is a little confusing.  The machine name
++    # can be virtually everything (everything which is not
++    # "atarist" or "atariste" at least should have a processor
++    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
++    # to the lowercase version "mint" (or "freemint").  Finally
++    # the system name "TOS" denotes a system which is actually not
++    # MiNT.  But MiNT is downward compatible to TOS, so this should
++    # be no problem.
++    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
++        echo m68k-atari-mint${UNAME_RELEASE}
+ 	exit 0 ;;
+-    atari*:OpenBSD:*:*)
+-	echo m68k-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    sun3*:NetBSD:*:*)
+-	echo m68k-sun-netbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    sun3*:OpenBSD:*:*)
+-	echo m68k-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    mac68k:NetBSD:*:*)
+-	echo m68k-apple-netbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    mac68k:OpenBSD:*:*)
+-	echo m68k-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    mvme68k:OpenBSD:*:*)
+-	echo m68k-unknown-openbsd${UNAME_RELEASE}
++    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
++	echo m68k-atari-mint${UNAME_RELEASE}
++        exit 0 ;;
++    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
++        echo m68k-atari-mint${UNAME_RELEASE}
+ 	exit 0 ;;
+-    mvme88k:OpenBSD:*:*)
+-	echo m88k-unknown-openbsd${UNAME_RELEASE}
++    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
++        echo m68k-milan-mint${UNAME_RELEASE}
++        exit 0 ;;
++    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
++        echo m68k-hades-mint${UNAME_RELEASE}
++        exit 0 ;;
++    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
++        echo m68k-unknown-mint${UNAME_RELEASE}
++        exit 0 ;;
++    m68k:machten:*:*)
++	echo m68k-apple-machten${UNAME_RELEASE}
+ 	exit 0 ;;
+     powerpc:machten:*:*)
+ 	echo powerpc-apple-machten${UNAME_RELEASE}
+@@ -225,12 +432,18 @@
+     VAX*:ULTRIX*:*:*)
+ 	echo vax-dec-ultrix${UNAME_RELEASE}
+ 	exit 0 ;;
+-    2020:CLIX:*:*)
++    2020:CLIX:*:* | 2430:CLIX:*:*)
+ 	echo clipper-intergraph-clix${UNAME_RELEASE}
+ 	exit 0 ;;
+     mips:*:*:UMIPS | mips:*:*:RISCos)
+-	sed 's/^	//' << EOF >dummy.c
+-	int main (argc, argv) int argc; char **argv; {
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++#ifdef __cplusplus
++#include <stdio.h>  /* for printf() prototype */
++	int main (int argc, char *argv[]) {
++#else
++	int main (argc, argv) int argc; char *argv[]; {
++#endif
+ 	#if defined (host_mips) && defined (MIPSEB)
+ 	#if defined (SYSTYPE_SYSV)
+ 	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+@@ -245,12 +458,20 @@
+ 	  exit (-1);
+ 	}
+ EOF
+-	${CC-cc} dummy.c -o dummy \
+-	  && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+-	  && rm dummy.c dummy && exit 0
+-	rm -f dummy.c dummy
++	$CC_FOR_BUILD -o $dummy $dummy.c \
++	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
++	  && exit 0
+ 	echo mips-mips-riscos${UNAME_RELEASE}
+ 	exit 0 ;;
++    Motorola:PowerMAX_OS:*:*)
++	echo powerpc-motorola-powermax
++	exit 0 ;;
++    Motorola:*:4.3:PL8-*)
++	echo powerpc-harris-powermax
++	exit 0 ;;
++    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
++	echo powerpc-harris-powermax
++	exit 0 ;;
+     Night_Hawk:Power_UNIX:*:*)
+ 	echo powerpc-harris-powerunix
+ 	exit 0 ;;
+@@ -266,15 +487,18 @@
+     AViiON:dgux:*:*)
+         # DG/UX returns AViiON for all architectures
+         UNAME_PROCESSOR=`/usr/bin/uname -p`
+-        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
+-	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
+-	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
++	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
++	then
++	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
++	       [ ${TARGET_BINARY_INTERFACE}x = x ]
++	    then
+ 		echo m88k-dg-dgux${UNAME_RELEASE}
+-	else
++	    else
+ 		echo m88k-dg-dguxbcs${UNAME_RELEASE}
++	    fi
++	else
++	    echo i586-dg-dgux${UNAME_RELEASE}
+ 	fi
+-        else echo i586-dg-dgux${UNAME_RELEASE}
+-        fi
+  	exit 0 ;;
+     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
+ 	echo m88k-dolphin-sysv3
+@@ -295,12 +519,21 @@
+     ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+ 	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
+ 	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
+-    i?86:AIX:*:*)
++    i*86:AIX:*:*)
+ 	echo i386-ibm-aix
+ 	exit 0 ;;
++    ia64:AIX:*:*)
++	if [ -x /usr/bin/oslevel ] ; then
++		IBM_REV=`/usr/bin/oslevel`
++	else
++		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
++	fi
++	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
++	exit 0 ;;
+     *:AIX:2:3)
+ 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+-		sed 's/^		//' << EOF >dummy.c
++		eval $set_cc_for_build
++		sed 's/^		//' << EOF >$dummy.c
+ 		#include <sys/systemcfg.h>
+ 
+ 		main()
+@@ -311,8 +544,7 @@
+ 			exit(0);
+ 			}
+ EOF
+-		${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
+-		rm -f dummy.c dummy
++		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+ 		echo rs6000-ibm-aix3.2.5
+ 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+ 		echo rs6000-ibm-aix3.2.4
+@@ -320,8 +552,9 @@
+ 		echo rs6000-ibm-aix3.2
+ 	fi
+ 	exit 0 ;;
+-    *:AIX:*:4)
+-	if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
++    *:AIX:*:[45])
++	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
++	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ 		IBM_ARCH=rs6000
+ 	else
+ 		IBM_ARCH=powerpc
+@@ -329,7 +562,7 @@
+ 	if [ -x /usr/bin/oslevel ] ; then
+ 		IBM_REV=`/usr/bin/oslevel`
+ 	else
+-		IBM_REV=4.${UNAME_RELEASE}
++		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ 	fi
+ 	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+ 	exit 0 ;;
+@@ -339,7 +572,7 @@
+     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+ 	echo romp-ibm-bsd4.4
+ 	exit 0 ;;
+-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
++    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
+ 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
+ 	exit 0 ;;                           # report: romp-ibm BSD 4.3
+     *:BOSX:*:*)
+@@ -354,18 +587,85 @@
+     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+ 	echo m68k-hp-bsd4.4
+ 	exit 0 ;;
+-    9000/[3478]??:HP-UX:*:*)
++    9000/[34678]??:HP-UX:*:*)
++	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ 	case "${UNAME_MACHINE}" in
+ 	    9000/31? )            HP_ARCH=m68000 ;;
+ 	    9000/[34]?? )         HP_ARCH=m68k ;;
+-	    9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;;
+-	    9000/8?? )            HP_ARCH=hppa1.0 ;;
++	    9000/[678][0-9][0-9])
++		if [ -x /usr/bin/getconf ]; then
++		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
++                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
++                    case "${sc_cpu_version}" in
++                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
++                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
++                      532)                      # CPU_PA_RISC2_0
++                        case "${sc_kernel_bits}" in
++                          32) HP_ARCH="hppa2.0n" ;;
++                          64) HP_ARCH="hppa2.0w" ;;
++			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
++                        esac ;;
++                    esac
++		fi
++		if [ "${HP_ARCH}" = "" ]; then
++		    eval $set_cc_for_build
++		    sed 's/^              //' << EOF >$dummy.c
++
++              #define _HPUX_SOURCE
++              #include <stdlib.h>
++              #include <unistd.h>
++
++              int main ()
++              {
++              #if defined(_SC_KERNEL_BITS)
++                  long bits = sysconf(_SC_KERNEL_BITS);
++              #endif
++                  long cpu  = sysconf (_SC_CPU_VERSION);
++
++                  switch (cpu)
++              	{
++              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
++              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
++              	case CPU_PA_RISC2_0:
++              #if defined(_SC_KERNEL_BITS)
++              	    switch (bits)
++              		{
++              		case 64: puts ("hppa2.0w"); break;
++              		case 32: puts ("hppa2.0n"); break;
++              		default: puts ("hppa2.0"); break;
++              		} break;
++              #else  /* !defined(_SC_KERNEL_BITS) */
++              	    puts ("hppa2.0"); break;
++              #endif
++              	default: puts ("hppa1.0"); break;
++              	}
++                  exit (0);
++              }
++EOF
++		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
++		    test -z "$HP_ARCH" && HP_ARCH=hppa
++		fi ;;
+ 	esac
+-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
++	if [ ${HP_ARCH} = "hppa2.0w" ]
++	then
++	    # avoid double evaluation of $set_cc_for_build
++	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
++	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
++	    then
++		HP_ARCH="hppa2.0w"
++	    else
++		HP_ARCH="hppa64"
++	    fi
++	fi
+ 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+ 	exit 0 ;;
++    ia64:HP-UX:*:*)
++	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
++	echo ia64-hp-hpux${HPUX_REV}
++	exit 0 ;;
+     3050*:HI-UX:*:*)
+-	sed 's/^	//' << EOF >dummy.c
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
+ 	#include <unistd.h>
+ 	int
+ 	main ()
+@@ -390,8 +690,7 @@
+ 	  exit (0);
+ 	}
+ EOF
+-	${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
+-	rm -f dummy.c dummy
++	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+ 	echo unknown-hitachi-hiuxwe2
+ 	exit 0 ;;
+     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+@@ -400,13 +699,16 @@
+     9000/8??:4.3bsd:*:*)
+ 	echo hppa1.0-hp-bsd
+ 	exit 0 ;;
++    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
++	echo hppa1.0-hp-mpeix
++	exit 0 ;;
+     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+ 	echo hppa1.1-hp-osf
+ 	exit 0 ;;
+     hp8??:OSF1:*:*)
+ 	echo hppa1.0-hp-osf
+ 	exit 0 ;;
+-    i?86:OSF1:*:*)
++    i*86:OSF1:*:*)
+ 	if [ -x /usr/sbin/sysversion ] ; then
+ 	    echo ${UNAME_MACHINE}-unknown-osf1mk
+ 	else
+@@ -434,196 +736,259 @@
+     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+ 	echo c4-convex-bsd
+         exit 0 ;;
+-    CRAY*X-MP:*:*:*)
+-	echo xmp-cray-unicos
+-        exit 0 ;;
+     CRAY*Y-MP:*:*:*)
+-	echo ymp-cray-unicos${UNAME_RELEASE}
++	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+     CRAY*[A-Z]90:*:*:*)
+ 	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+ 	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
++	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
++	      -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+     CRAY*TS:*:*:*)
+-	echo t90-cray-unicos${UNAME_RELEASE}
++	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ 	exit 0 ;;
+-    CRAY-2:*:*:*)
+-	echo cray2-cray-unicos
+-        exit 0 ;;
+-    F300:UNIX_System_V:*:*)
+-        FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
++    CRAY*T3E:*:*:*)
++	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	exit 0 ;;
++    CRAY*SV1:*:*:*)
++	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	exit 0 ;;
++    *:UNICOS/mp:*:*)
++	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
++	exit 0 ;;
++    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
++	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
++        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+-        echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
++        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+         exit 0 ;;
+-    F301:UNIX_System_V:*:*)
+-       echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
+-       exit 0 ;;
+-    hp3[0-9][05]:NetBSD:*:*)
+-	echo m68k-hp-netbsd${UNAME_RELEASE}
++    5000:UNIX_System_V:4.*:*)
++        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
++        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
++        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ 	exit 0 ;;
+-    hp300:OpenBSD:*:*)
+-	echo m68k-unknown-openbsd${UNAME_RELEASE}
+-	exit 0 ;;
+-    i?86:BSD/386:*:* | *:BSD/OS:*:*)
++    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+ 	exit 0 ;;
+-    *:FreeBSD:*:*)
+-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
++    sparc*:BSD/OS:*:*)
++	echo sparc-unknown-bsdi${UNAME_RELEASE}
+ 	exit 0 ;;
+-    *:NetBSD:*:*)
+-	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
++    *:BSD/OS:*:*)
++	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ 	exit 0 ;;
+-    *:OpenBSD:*:*)
+-	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
++    *:FreeBSD:*:*)
++	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ 	exit 0 ;;
+     i*:CYGWIN*:*)
+-	echo i386-pc-cygwin32
++	echo ${UNAME_MACHINE}-pc-cygwin
+ 	exit 0 ;;
+     i*:MINGW*:*)
+-	echo i386-pc-mingw32
++	echo ${UNAME_MACHINE}-pc-mingw32
++	exit 0 ;;
++    i*:PW*:*)
++	echo ${UNAME_MACHINE}-pc-pw32
++	exit 0 ;;
++    x86:Interix*:[34]*)
++	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
++	exit 0 ;;
++    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
++	echo i${UNAME_MACHINE}-pc-mks
++	exit 0 ;;
++    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
++	# How do we know it's Interix rather than the generic POSIX subsystem?
++	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
++	# UNAME_MACHINE based on the output of uname instead of i386?
++	echo i586-pc-interix
++	exit 0 ;;
++    i*:UWIN*:*)
++	echo ${UNAME_MACHINE}-pc-uwin
+ 	exit 0 ;;
+     p*:CYGWIN*:*)
+-	echo powerpcle-unknown-cygwin32
++	echo powerpcle-unknown-cygwin
+ 	exit 0 ;;
+     prep*:SunOS:5.*:*)
+ 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ 	exit 0 ;;
+     *:GNU:*:*)
++	# the GNU system
+ 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ 	exit 0 ;;
+-    *:Linux:*:*)
++    *:GNU/*:*:*)
++	# other systems with GNU libc and userland
++	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
++	exit 0 ;;
++    i*86:Minix:*:*)
++	echo ${UNAME_MACHINE}-pc-minix
++	exit 0 ;;
++    arm*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    cris:Linux:*:*)
++	echo cris-axis-linux-gnu
++	exit 0 ;;
++    crisv32:Linux:*:*)
++	echo crisv32-axis-linux-gnu
++	exit 0 ;;
++    frv:Linux:*:*)
++    	echo frv-unknown-linux-gnu
++	exit 0 ;;
++    ia64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    m32r*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    m68*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    mips:Linux:*:*)
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#undef CPU
++	#undef mips
++	#undef mipsel
++	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
++	CPU=mipsel
++	#else
++	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
++	CPU=mips
++	#else
++	CPU=
++	#endif
++	#endif
++EOF
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
++	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
++	;;
++    mips64:Linux:*:*)
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#undef CPU
++	#undef mips64
++	#undef mips64el
++	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
++	CPU=mips64el
++	#else
++	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
++	CPU=mips64
++	#else
++	CPU=
++	#endif
++	#endif
++EOF
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
++	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
++	;;
++    ppc:Linux:*:*)
++	echo powerpc-unknown-linux-gnu
++	exit 0 ;;
++    ppc64:Linux:*:*)
++	echo powerpc64-unknown-linux-gnu
++	exit 0 ;;
++    alpha:Linux:*:*)
++	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++	  EV5)   UNAME_MACHINE=alphaev5 ;;
++	  EV56)  UNAME_MACHINE=alphaev56 ;;
++	  PCA56) UNAME_MACHINE=alphapca56 ;;
++	  PCA57) UNAME_MACHINE=alphapca56 ;;
++	  EV6)   UNAME_MACHINE=alphaev6 ;;
++	  EV67)  UNAME_MACHINE=alphaev67 ;;
++	  EV68*) UNAME_MACHINE=alphaev68 ;;
++        esac
++	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
++	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++	exit 0 ;;
++    parisc:Linux:*:* | hppa:Linux:*:*)
++	# Look for CPU level
++	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
++	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
++	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
++	  *)    echo hppa-unknown-linux-gnu ;;
++	esac
++	exit 0 ;;
++    parisc64:Linux:*:* | hppa64:Linux:*:*)
++	echo hppa64-unknown-linux-gnu
++	exit 0 ;;
++    s390:Linux:*:* | s390x:Linux:*:*)
++	echo ${UNAME_MACHINE}-ibm-linux
++	exit 0 ;;
++    sh64*:Linux:*:*)
++    	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    sh*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    sparc:Linux:*:* | sparc64:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit 0 ;;
++    x86_64:Linux:*:*)
++	echo x86_64-unknown-linux-gnu
++	exit 0 ;;
++    i*86:Linux:*:*)
+ 	# The BFD linker knows what the default object file format is, so
+-	# first see if it will tell us.
+-	ld_help_string=`ld --help 2>&1`
+-	ld_supported_emulations=`echo $ld_help_string \
+-			 | sed -ne '/supported emulations:/!d
++	# first see if it will tell us. cd to the root directory to prevent
++	# problems with other programs or directories called `ld' in the path.
++	# Set LC_ALL=C to ensure ld outputs messages in English.
++	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
++			 | sed -ne '/supported targets:/!d
+ 				    s/[ 	][ 	]*/ /g
+-				    s/.*supported emulations: *//
++				    s/.*supported targets: *//
+ 				    s/ .*//
+ 				    p'`
+-        case "$ld_supported_emulations" in
+-	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
+-	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
+-	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+-	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+-	  elf32ppc)   echo "powerpc-unknown-linux-gnu"              ; exit 0 ;;
+-	esac
+-
+-	if test "${UNAME_MACHINE}" = "alpha" ; then
+-		sed 's/^	//'  <<EOF >dummy.s
+-		.globl main
+-		.ent main
+-	main:
+-		.frame \$30,0,\$26,0
+-		.prologue 0
+-		.long 0x47e03d80 # implver $0
+-		lda \$2,259
+-		.long 0x47e20c21 # amask $2,$1
+-		srl \$1,8,\$2
+-		sll \$2,2,\$2
+-		sll \$0,3,\$0
+-		addl \$1,\$0,\$0
+-		addl \$2,\$0,\$0
+-		ret \$31,(\$26),1
+-		.end main
+-EOF
+-		LIBC=""
+-		${CC-cc} dummy.s -o dummy 2>/dev/null
+-		if test "$?" = 0 ; then
+-			./dummy
+-			case "$?" in
+-			7)
+-				UNAME_MACHINE="alpha"
+-				;;
+-			15)
+-				UNAME_MACHINE="alphaev5"
+-				;;
+-			14)
+-				UNAME_MACHINE="alphaev56"
+-				;;
+-			10)
+-				UNAME_MACHINE="alphapca56"
+-				;;
+-			16)
+-				UNAME_MACHINE="alphaev6"
+-				;;
+-			esac	
+-
+-			objdump --private-headers dummy | \
+-			  grep ld.so.1 > /dev/null
+-			if test "$?" = 0 ; then
+-				LIBC="libc1"
+-			fi
+-		fi	
+-		rm -f dummy.s dummy
+-		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
+-	elif test "${UNAME_MACHINE}" = "mips" ; then
+-	  cat >dummy.c <<EOF
+-main(argc, argv)
+-     int argc;
+-     char *argv[];
+-{
+-#ifdef __MIPSEB__
+-  printf ("%s-unknown-linux-gnu\n", argv[1]);
+-#endif
+-#ifdef __MIPSEL__
+-  printf ("%sel-unknown-linux-gnu\n", argv[1]);
+-#endif
+-  return 0;
+-}
+-EOF
+-	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
+-	  rm -f dummy.c dummy
+-	else
+-	  # Either a pre-BFD a.out linker (linux-gnuoldld)
+-	  # or one that does not give us useful --help.
+-	  # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout.
+-	  # If ld does not provide *any* "supported emulations:"
+-	  # that means it is gnuoldld.
+-	  echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:"
+-	  test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
+-
+-	  case "${UNAME_MACHINE}" in
+-	  i?86)
+-	    VENDOR=pc;
+-	    ;;
+-	  *)
+-	    VENDOR=unknown;
+-	    ;;
+-	  esac
+-	  # Determine whether the default compiler is a.out or elf
+-	  cat >dummy.c <<EOF
+-#include <features.h>
+-main(argc, argv)
+-     int argc;
+-     char *argv[];
+-{
+-#ifdef __ELF__
+-# ifdef __GLIBC__
+-#  if __GLIBC__ >= 2
+-    printf ("%s-${VENDOR}-linux-gnu\n", argv[1]);
+-#  else
+-    printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+-#  endif
+-# else
+-   printf ("%s-${VENDOR}-linux-gnulibc1\n", argv[1]);
+-# endif
+-#else
+-  printf ("%s-${VENDOR}-linux-gnuaout\n", argv[1]);
+-#endif
+-  return 0;
+-}
++        case "$ld_supported_targets" in
++	  elf32-i386)
++		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
++		;;
++	  a.out-i386-linux)
++		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
++		exit 0 ;;
++	  coff-i386)
++		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
++		exit 0 ;;
++	  "")
++		# Either a pre-BFD a.out linker (linux-gnuoldld) or
++		# one that does not give us useful --help.
++		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
++		exit 0 ;;
++	esac
++	# Determine whether the default compiler is a.out or elf
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#include <features.h>
++	#ifdef __ELF__
++	# ifdef __GLIBC__
++	#  if __GLIBC__ >= 2
++	LIBC=gnu
++	#  else
++	LIBC=gnulibc1
++	#  endif
++	# else
++	LIBC=gnulibc1
++	# endif
++	#else
++	#ifdef __INTEL_COMPILER
++	LIBC=gnu
++	#else
++	LIBC=gnuaout
++	#endif
++	#endif
++	#ifdef __dietlibc__
++	LIBC=dietlibc
++	#endif
+ EOF
+-	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
+-	  rm -f dummy.c dummy
+-	fi ;;
+-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
+-# are messed up and put the nodename in both sysname and nodename.
+-    i?86:DYNIX/ptx:4*:*)
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
++	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
++	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
++	;;
++    i*86:DYNIX/ptx:4*:*)
++	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
++	# earlier versions are messed up and put the nodename in both
++	# sysname and nodename.
+ 	echo i386-sequent-sysv4
+ 	exit 0 ;;
+-    i?86:UNIX_SV:4.2MP:2.*)
++    i*86:UNIX_SV:4.2MP:2.*)
+         # Unixware is an offshoot of SVR4, but it has its own version
+         # number series starting with 2...
+         # I am not positive that other SVR4 systems won't match this,
+@@ -631,28 +996,62 @@
+         # Use sysv4.2uw... so that sysv4* matches it.
+ 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ 	exit 0 ;;
+-    i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
++    i*86:OS/2:*:*)
++	# If we were able to find `uname', then EMX Unix compatibility
++	# is probably installed.
++	echo ${UNAME_MACHINE}-pc-os2-emx
++	exit 0 ;;
++    i*86:XTS-300:*:STOP)
++	echo ${UNAME_MACHINE}-unknown-stop
++	exit 0 ;;
++    i*86:atheos:*:*)
++	echo ${UNAME_MACHINE}-unknown-atheos
++	exit 0 ;;
++	i*86:syllable:*:*)
++	echo ${UNAME_MACHINE}-pc-syllable
++	exit 0 ;;
++    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
++	echo i386-unknown-lynxos${UNAME_RELEASE}
++	exit 0 ;;
++    i*86:*DOS:*:*)
++	echo ${UNAME_MACHINE}-pc-msdosdjgpp
++	exit 0 ;;
++    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
++	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+ 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
++		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+ 	else
+-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
++		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+ 	fi
+ 	exit 0 ;;
+-    i?86:*:3.2:*)
++    i*86:*:5:[78]*)
++	case `/bin/uname -X | grep "^Machine"` in
++	    *486*)	     UNAME_MACHINE=i486 ;;
++	    *Pentium)	     UNAME_MACHINE=i586 ;;
++	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
++	esac
++	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
++	exit 0 ;;
++    i*86:*:3.2:*)
+ 	if test -f /usr/options/cb.name; then
+ 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+ 		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+ 	elif /bin/uname -X 2>/dev/null >/dev/null ; then
+-		UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
+-		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
+-		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
++		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
++		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
++		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+ 			&& UNAME_MACHINE=i586
++		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
++			&& UNAME_MACHINE=i686
++		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
++			&& UNAME_MACHINE=i686
+ 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+ 	else
+ 		echo ${UNAME_MACHINE}-pc-sysv32
+ 	fi
+ 	exit 0 ;;
+     pc:*:*:*)
++	# Left here for compatibility:
+         # uname -m prints for DJGPP always 'pc', but it prints nothing about
+         # the processor, so we play safe by assuming i386.
+ 	echo i386-pc-msdosdjgpp
+@@ -674,9 +1073,15 @@
+ 	# "miniframe"
+ 	echo m68010-convergent-sysv
+ 	exit 0 ;;
+-    M68*:*:R3V[567]*:*)
++    mc68k:UNIX:SYSTEM5:3.51m)
++	echo m68k-convergent-sysv
++	exit 0 ;;
++    M680?0:D-NIX:5.3:*)
++	echo m68k-diab-dnix
++	exit 0 ;;
++    M68*:*:R3V[5678]*:*)
+ 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+-    3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
++    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+ 	OS_REL=''
+ 	test -r /etc/.relid \
+ 	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+@@ -687,24 +1092,27 @@
+     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+         /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+           && echo i486-ncr-sysv4 && exit 0 ;;
+-    m68*:LynxOS:2.*:*)
++    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+ 	echo m68k-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
+     mc68030:UNIX_System_V:4.*:*)
+ 	echo m68k-atari-sysv4
+ 	exit 0 ;;
+-    i?86:LynxOS:2.*:*)
+-	echo i386-unknown-lynxos${UNAME_RELEASE}
+-	exit 0 ;;
+     TSUNAMI:LynxOS:2.*:*)
+ 	echo sparc-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
+-    rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
++    rs6000:LynxOS:2.*:*)
+ 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ 	exit 0 ;;
++    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
++	echo powerpc-unknown-lynxos${UNAME_RELEASE}
++	exit 0 ;;
+     SM[BE]S:UNIX_SV:*:*)
+ 	echo mips-dde-sysv${UNAME_RELEASE}
+ 	exit 0 ;;
++    RM*:ReliantUNIX-*:*:*)
++	echo mips-sni-sysv4
++	exit 0 ;;
+     RM*:SINIX-*:*:*)
+ 	echo mips-sni-sysv4
+ 	exit 0 ;;
+@@ -716,8 +1124,8 @@
+ 		echo ns32k-sni-sysv
+ 	fi
+ 	exit 0 ;;
+-    PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+-                           # says <Richard.M.Bartel@ccMail.Census.GOV>
++    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
++                      # says <Richard.M.Bartel@ccMail.Census.GOV>
+         echo i586-unisys-sysv4
+         exit 0 ;;
+     *:UNIX_System_V:4*:FTX*)
+@@ -729,25 +1137,130 @@
+ 	# From seanf@swdc.stratus.com.
+ 	echo i860-stratus-sysv4
+ 	exit 0 ;;
++    *:VOS:*:*)
++	# From Paul.Green@stratus.com.
++	echo hppa1.1-stratus-vos
++	exit 0 ;;
+     mc68*:A/UX:*:*)
+ 	echo m68k-apple-aux${UNAME_RELEASE}
+ 	exit 0 ;;
+-    news*:NEWS-OS:*:6*)
++    news*:NEWS-OS:6*:*)
+ 	echo mips-sony-newsos6
+ 	exit 0 ;;
+-    R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*)
++    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+ 	if [ -d /usr/nec ]; then
+ 	        echo mips-nec-sysv${UNAME_RELEASE}
+ 	else
+ 	        echo mips-unknown-sysv${UNAME_RELEASE}
+ 	fi
+         exit 0 ;;
++    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
++	echo powerpc-be-beos
++	exit 0 ;;
++    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
++	echo powerpc-apple-beos
++	exit 0 ;;
++    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
++	echo i586-pc-beos
++	exit 0 ;;
++    SX-4:SUPER-UX:*:*)
++	echo sx4-nec-superux${UNAME_RELEASE}
++	exit 0 ;;
++    SX-5:SUPER-UX:*:*)
++	echo sx5-nec-superux${UNAME_RELEASE}
++	exit 0 ;;
++    SX-6:SUPER-UX:*:*)
++	echo sx6-nec-superux${UNAME_RELEASE}
++	exit 0 ;;
++    Power*:Rhapsody:*:*)
++	echo powerpc-apple-rhapsody${UNAME_RELEASE}
++	exit 0 ;;
++    *:Rhapsody:*:*)
++	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
++	exit 0 ;;
++    *:Darwin:*:*)
++	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
++	case $UNAME_PROCESSOR in
++	    *86) UNAME_PROCESSOR=i686 ;;
++	    unknown) UNAME_PROCESSOR=powerpc ;;
++	esac
++	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
++	exit 0 ;;
++    *:procnto*:*:* | *:QNX:[0123456789]*:*)
++	UNAME_PROCESSOR=`uname -p`
++	if test "$UNAME_PROCESSOR" = "x86"; then
++		UNAME_PROCESSOR=i386
++		UNAME_MACHINE=pc
++	fi
++	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
++	exit 0 ;;
++    *:QNX:*:4*)
++	echo i386-pc-qnx
++	exit 0 ;;
++    NSR-?:NONSTOP_KERNEL:*:*)
++	echo nsr-tandem-nsk${UNAME_RELEASE}
++	exit 0 ;;
++    *:NonStop-UX:*:*)
++	echo mips-compaq-nonstopux
++	exit 0 ;;
++    BS2000:POSIX*:*:*)
++	echo bs2000-siemens-sysv
++	exit 0 ;;
++    DS/*:UNIX_System_V:*:*)
++	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
++	exit 0 ;;
++    *:Plan9:*:*)
++	# "uname -m" is not consistent, so use $cputype instead. 386
++	# is converted to i386 for consistency with other x86
++	# operating systems.
++	if test "$cputype" = "386"; then
++	    UNAME_MACHINE=i386
++	else
++	    UNAME_MACHINE="$cputype"
++	fi
++	echo ${UNAME_MACHINE}-unknown-plan9
++	exit 0 ;;
++    *:TOPS-10:*:*)
++	echo pdp10-unknown-tops10
++	exit 0 ;;
++    *:TENEX:*:*)
++	echo pdp10-unknown-tenex
++	exit 0 ;;
++    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
++	echo pdp10-dec-tops20
++	exit 0 ;;
++    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
++	echo pdp10-xkl-tops20
++	exit 0 ;;
++    *:TOPS-20:*:*)
++	echo pdp10-unknown-tops20
++	exit 0 ;;
++    *:ITS:*:*)
++	echo pdp10-unknown-its
++	exit 0 ;;
++    SEI:*:*:SEIUX)
++        echo mips-sei-seiux${UNAME_RELEASE}
++	exit 0 ;;
++    *:DragonFly:*:*)
++	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
++	exit 0 ;;
++    *:*VMS:*:*)
++    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
++	case "${UNAME_MACHINE}" in
++	    A*) echo alpha-dec-vms && exit 0 ;;
++	    I*) echo ia64-dec-vms && exit 0 ;;
++	    V*) echo vax-dec-vms && exit 0 ;;
++	esac ;;
++    *:XENIX:*:SysV)
++	echo i386-pc-xenix
++	exit 0 ;;
+ esac
+ 
+ #echo '(No uname command or uname output not recognized.)' 1>&2
+ #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+ 
+-cat >dummy.c <<EOF
++eval $set_cc_for_build
++cat >$dummy.c <<EOF
+ #ifdef _SEQUENT_
+ # include <sys/types.h>
+ # include <sys/utsname.h>
+@@ -785,7 +1298,10 @@
+ #endif
+   int version;
+   version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+-  printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
++  if (version < 4)
++    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
++  else
++    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+   exit (0);
+ #endif
+ 
+@@ -830,11 +1346,24 @@
+ #endif
+ 
+ #if defined (vax)
+-#if !defined (ultrix)
+-  printf ("vax-dec-bsd\n"); exit (0);
+-#else
+-  printf ("vax-dec-ultrix\n"); exit (0);
+-#endif
++# if !defined (ultrix)
++#  include <sys/param.h>
++#  if defined (BSD)
++#   if BSD == 43
++      printf ("vax-dec-bsd4.3\n"); exit (0);
++#   else
++#    if BSD == 199006
++      printf ("vax-dec-bsd4.3reno\n"); exit (0);
++#    else
++      printf ("vax-dec-bsd\n"); exit (0);
++#    endif
++#   endif
++#  else
++    printf ("vax-dec-bsd\n"); exit (0);
++#  endif
++# else
++    printf ("vax-dec-ultrix\n"); exit (0);
++# endif
+ #endif
+ 
+ #if defined (alliant) && defined (i860)
+@@ -845,8 +1374,7 @@
+ }
+ EOF
+ 
+-${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
+-rm -f dummy.c dummy
++$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+ 
+ # Apollos put the system type in the environment.
+ 
+@@ -878,6 +1406,48 @@
+     esac
+ fi
+ 
+-#echo '(Unable to guess system type)' 1>&2
++cat >&2 <<EOF
++$0: unable to guess system type
++
++This script, last modified $timestamp, has failed to recognize
++the operating system you are using. It is advised that you
++download the most up to date version of the config scripts from
++
++    ftp://ftp.gnu.org/pub/gnu/config/
++
++If the version you run ($0) is already up to date, please
++send the following data and any information you think might be
++pertinent to <config-patches@gnu.org> in order to provide the needed
++information to handle your system.
++
++config.guess timestamp = $timestamp
++
++uname -m = `(uname -m) 2>/dev/null || echo unknown`
++uname -r = `(uname -r) 2>/dev/null || echo unknown`
++uname -s = `(uname -s) 2>/dev/null || echo unknown`
++uname -v = `(uname -v) 2>/dev/null || echo unknown`
++
++/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
++/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
++
++hostinfo               = `(hostinfo) 2>/dev/null`
++/bin/universe          = `(/bin/universe) 2>/dev/null`
++/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
++/bin/arch              = `(/bin/arch) 2>/dev/null`
++/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
++/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
++
++UNAME_MACHINE = ${UNAME_MACHINE}
++UNAME_RELEASE = ${UNAME_RELEASE}
++UNAME_SYSTEM  = ${UNAME_SYSTEM}
++UNAME_VERSION = ${UNAME_VERSION}
++EOF
+ 
+ exit 1
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "timestamp='"
++# time-stamp-format: "%:y-%02m-%02d"
++# time-stamp-end: "'"
++# End:
+diff -Naur jpeg-6b-orig/config.sub jpeg-6b/config.sub
+--- jpeg-6b-orig/config.sub	1998-03-26 02:25:39.000000000 +1100
++++ jpeg-6b/config.sub	2005-05-22 21:13:29.000000000 +1000
+@@ -1,6 +1,10 @@
+ #! /bin/sh
+-# Configuration validation subroutine script, version 1.1.
+-#   Copyright (C) 1991, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
++# Configuration validation subroutine script.
++#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
++#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++
++timestamp='2005-04-22'
++
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+ # can handle that machine.  It does not imply ALL GNU software can.
+@@ -25,6 +29,9 @@
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
++# Please send patches to <config-patches@gnu.org>.  Submit a context
++# diff and a properly formatted ChangeLog entry.
++#
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+ # If it is invalid, we print an error message on stderr and exit with code 1.
+@@ -45,30 +52,74 @@
+ #	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+ # It is wrong to echo any other type of specification.
+ 
+-if [ x$1 = x ]
+-then
+-	echo Configuration name missing. 1>&2
+-	echo "Usage: $0 CPU-MFR-OPSYS" 1>&2
+-	echo "or     $0 ALIAS" 1>&2
+-	echo where ALIAS is a recognized configuration type. 1>&2
+-	exit 1
+-fi
++me=`echo "$0" | sed -e 's,.*/,,'`
+ 
+-# First pass through any local machine types.
+-case $1 in
+-	*local*)
+-		echo $1
+-		exit 0
+-		;;
+-	*)
+-	;;
++usage="\
++Usage: $0 [OPTION] CPU-MFR-OPSYS
++       $0 [OPTION] ALIAS
++
++Canonicalize a configuration name.
++
++Operation modes:
++  -h, --help         print this help, then exit
++  -t, --time-stamp   print date of last modification, then exit
++  -v, --version      print version number, then exit
++
++Report bugs and patches to <config-patches@gnu.org>."
++
++version="\
++GNU config.sub ($timestamp)
++
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
++Free Software Foundation, Inc.
++
++This is free software; see the source for copying conditions.  There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++
++help="
++Try \`$me --help' for more information."
++
++# Parse command line
++while test $# -gt 0 ; do
++  case $1 in
++    --time-stamp | --time* | -t )
++       echo "$timestamp" ; exit 0 ;;
++    --version | -v )
++       echo "$version" ; exit 0 ;;
++    --help | --h* | -h )
++       echo "$usage"; exit 0 ;;
++    -- )     # Stop option processing
++       shift; break ;;
++    - )	# Use stdin as input.
++       break ;;
++    -* )
++       echo "$me: invalid option $1$help"
++       exit 1 ;;
++
++    *local*)
++       # First pass through any local machine types.
++       echo $1
++       exit 0;;
++
++    * )
++       break ;;
++  esac
++done
++
++case $# in
++ 0) echo "$me: missing argument$help" >&2
++    exit 1;;
++ 1) ;;
++ *) echo "$me: too many arguments$help" >&2
++    exit 1;;
+ esac
+ 
+ # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+ # Here we must recognize all the valid KERNEL-OS combinations.
+ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+ case $maybe_os in
+-  linux-gnu*)
++  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
++  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+     os=-$maybe_os
+     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+     ;;
+@@ -94,15 +145,37 @@
+ 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+-	-apple)
++	-apple | -axis | -knuth | -cray)
++		os=
++		basic_machine=$1
++		;;
++	-sim | -cisco | -oki | -wec | -winbond)
+ 		os=
+ 		basic_machine=$1
+ 		;;
++	-scout)
++		;;
++	-wrs)
++		os=-vxworks
++		basic_machine=$1
++		;;
++	-chorusos*)
++		os=-chorusos
++		basic_machine=$1
++		;;
++ 	-chorusrdb)
++ 		os=-chorusrdb
++		basic_machine=$1
++ 		;;
+ 	-hiux*)
+ 		os=-hiuxwe2
+ 		;;
++	-mvs*)
++		os=-mvs
++		basic_machine=i370-ibm
++		;;
+ 	-sco5)
+-		os=sco3.2v5
++		os=-sco3.2v5
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
+ 	-sco4)
+@@ -121,6 +194,9 @@
+ 		os=-sco3.2v2
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ 		;;
++	-udk*)
++		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
++		;;
+ 	-isc)
+ 		os=-isc2.2
+ 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+@@ -143,26 +219,76 @@
+ 	-psos*)
+ 		os=-psos
+ 		;;
++	-mint | -mint[0-9]*)
++		basic_machine=m68k-atari
++		os=-mint
++		;;
+ esac
+ 
+ # Decode aliases for certain CPU-COMPANY combinations.
+ case $basic_machine in
+ 	# Recognize the basic CPU types without company name.
+ 	# Some are omitted here because they have special meanings below.
+-	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+-		| arme[lb] | pyramid | mn10200 | mn10300 \
+-		| tron | a29k | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 \
+-		| alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \
+-		| i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \
+-		| mips64 | mipsel | mips64el | mips64orion | mips64orionel \
+-		| mipstx39 | mipstx39el \
+-		| sparc | sparclet | sparclite | sparc64 | v850)
++	1750a | 580 \
++	| a29k \
++	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
++	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
++	| am33_2.0 \
++	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
++	| bfin \
++	| c4x | clipper \
++	| d10v | d30v | dlx | dsp16xx \
++	| fr30 | frv \
++	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
++	| i370 | i860 | i960 | ia64 \
++	| ip2k | iq2000 \
++	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
++	| mips | mipsbe | mipseb | mipsel | mipsle \
++	| mips16 \
++	| mips64 | mips64el \
++	| mips64vr | mips64vrel \
++	| mips64orion | mips64orionel \
++	| mips64vr4100 | mips64vr4100el \
++	| mips64vr4300 | mips64vr4300el \
++	| mips64vr5000 | mips64vr5000el \
++	| mipsisa32 | mipsisa32el \
++	| mipsisa32r2 | mipsisa32r2el \
++	| mipsisa64 | mipsisa64el \
++	| mipsisa64r2 | mipsisa64r2el \
++	| mipsisa64sb1 | mipsisa64sb1el \
++	| mipsisa64sr71k | mipsisa64sr71kel \
++	| mipstx39 | mipstx39el \
++	| mn10200 | mn10300 \
++	| msp430 \
++	| ns16k | ns32k \
++	| openrisc | or32 \
++	| pdp10 | pdp11 | pj | pjl \
++	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
++	| pyramid \
++	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
++	| sh64 | sh64le \
++	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
++	| sparcv8 | sparcv9 | sparcv9b \
++	| strongarm \
++	| tahoe | thumb | tic4x | tic80 | tron \
++	| v850 | v850e \
++	| we32k \
++	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
++	| z8k)
+ 		basic_machine=$basic_machine-unknown
+ 		;;
++	m6811 | m68hc11 | m6812 | m68hc12)
++		# Motorola 68HC11/12.
++		basic_machine=$basic_machine-unknown
++		os=-none
++		;;
++	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
++		;;
++
+ 	# We use `pc' rather than `unknown'
+ 	# because (1) that's what they normally are, and
+ 	# (2) the word "unknown" tends to confuse beginning users.
+-	i[3456]86)
++	i*86 | x86_64)
+ 	  basic_machine=$basic_machine-pc
+ 	  ;;
+ 	# Object if more than one company name word.
+@@ -171,27 +297,87 @@
+ 		exit 1
+ 		;;
+ 	# Recognize the basic CPU types with company name.
+-	vax-* | tahoe-* | i[3456]86-* | i860-* | m32r-* | m68k-* | m68000-* \
+-	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
+-	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
+-	      | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \
+-	      | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* \
+-	      | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \
+-	      | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \
+-	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+-	      | sparc64-* | mips64-* | mipsel-* \
+-	      | mips64el-* | mips64orion-* | mips64orionel-*  \
+-	      | mipstx39-* | mipstx39el-* \
+-	      | f301-*)
++	580-* \
++	| a29k-* \
++	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
++	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
++	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
++	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
++	| avr-* \
++	| bfin-* | bs2000-* \
++	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
++	| clipper-* | craynv-* | cydra-* \
++	| d10v-* | d30v-* | dlx-* \
++	| elxsi-* \
++	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
++	| h8300-* | h8500-* \
++	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
++	| i*86-* | i860-* | i960-* | ia64-* \
++	| ip2k-* | iq2000-* \
++	| m32r-* | m32rle-* \
++	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
++	| m88110-* | m88k-* | maxq-* | mcore-* \
++	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
++	| mips16-* \
++	| mips64-* | mips64el-* \
++	| mips64vr-* | mips64vrel-* \
++	| mips64orion-* | mips64orionel-* \
++	| mips64vr4100-* | mips64vr4100el-* \
++	| mips64vr4300-* | mips64vr4300el-* \
++	| mips64vr5000-* | mips64vr5000el-* \
++	| mipsisa32-* | mipsisa32el-* \
++	| mipsisa32r2-* | mipsisa32r2el-* \
++	| mipsisa64-* | mipsisa64el-* \
++	| mipsisa64r2-* | mipsisa64r2el-* \
++	| mipsisa64sb1-* | mipsisa64sb1el-* \
++	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
++	| mipstx39-* | mipstx39el-* \
++	| mmix-* \
++	| msp430-* \
++	| none-* | np1-* | ns16k-* | ns32k-* \
++	| orion-* \
++	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
++	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
++	| pyramid-* \
++	| romp-* | rs6000-* \
++	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
++	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
++	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
++	| sparclite-* \
++	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
++	| tahoe-* | thumb-* \
++	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++	| tron-* \
++	| v850-* | v850e-* | vax-* \
++	| we32k-* \
++	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
++	| xstormy16-* | xtensa-* \
++	| ymp-* \
++	| z8k-*)
+ 		;;
+ 	# Recognize the various machine names and aliases which stand
+ 	# for a CPU type and a company and sometimes even an OS.
++	386bsd)
++		basic_machine=i386-unknown
++		os=-bsd
++		;;
+ 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+ 		basic_machine=m68000-att
+ 		;;
+ 	3b*)
+ 		basic_machine=we32k-att
+ 		;;
++	a29khif)
++		basic_machine=a29k-amd
++		os=-udi
++		;;
++    	abacus)
++		basic_machine=abacus-unknown
++		;;
++	adobe68k)
++		basic_machine=m68010-adobe
++		os=-scout
++		;;
+ 	alliant | fx80)
+ 		basic_machine=fx80-alliant
+ 		;;
+@@ -202,25 +388,35 @@
+ 		basic_machine=a29k-none
+ 		os=-bsd
+ 		;;
++	amd64)
++		basic_machine=x86_64-pc
++		;;
++	amd64-*)
++		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
+ 	amdahl)
+ 		basic_machine=580-amdahl
+ 		os=-sysv
+ 		;;
+ 	amiga | amiga-*)
+-		basic_machine=m68k-cbm
++		basic_machine=m68k-unknown
+ 		;;
+ 	amigaos | amigados)
+-		basic_machine=m68k-cbm
++		basic_machine=m68k-unknown
+ 		os=-amigaos
+ 		;;
+ 	amigaunix | amix)
+-		basic_machine=m68k-cbm
++		basic_machine=m68k-unknown
+ 		os=-sysv4
+ 		;;
+ 	apollo68)
+ 		basic_machine=m68k-apollo
+ 		os=-sysv
+ 		;;
++	apollo68bsd)
++		basic_machine=m68k-apollo
++		os=-bsd
++		;;
+ 	aux)
+ 		basic_machine=m68k-apple
+ 		os=-aux
+@@ -229,6 +425,10 @@
+ 		basic_machine=ns32k-sequent
+ 		os=-dynix
+ 		;;
++	c90)
++		basic_machine=c90-cray
++		os=-unicos
++		;;
+ 	convex-c1)
+ 		basic_machine=c1-convex
+ 		os=-bsd
+@@ -249,27 +449,45 @@
+ 		basic_machine=c38-convex
+ 		os=-bsd
+ 		;;
+-	cray | ymp)
+-		basic_machine=ymp-cray
++	cray | j90)
++		basic_machine=j90-cray
+ 		os=-unicos
+ 		;;
+-	cray2)
+-		basic_machine=cray2-cray
+-		os=-unicos
+-		;;
+-	[ctj]90-cray)
+-		basic_machine=c90-cray
+-		os=-unicos
++	craynv)
++		basic_machine=craynv-cray
++		os=-unicosmp
++		;;
++	cr16c)
++		basic_machine=cr16c-unknown
++		os=-elf
+ 		;;
+ 	crds | unos)
+ 		basic_machine=m68k-crds
+ 		;;
++	crisv32 | crisv32-* | etraxfs*)
++		basic_machine=crisv32-axis
++		;;
++	cris | cris-* | etrax*)
++		basic_machine=cris-axis
++		;;
++	crx)
++		basic_machine=crx-unknown
++		os=-elf
++		;;
+ 	da30 | da30-*)
+ 		basic_machine=m68k-da30
+ 		;;
+ 	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+ 		basic_machine=mips-dec
+ 		;;
++	decsystem10* | dec10*)
++		basic_machine=pdp10-dec
++		os=-tops10
++		;;
++	decsystem20* | dec20*)
++		basic_machine=pdp10-dec
++		os=-tops20
++		;;
+ 	delta | 3300 | motorola-3300 | motorola-delta \
+ 	      | 3300-motorola | delta-motorola)
+ 		basic_machine=m68k-motorola
+@@ -278,6 +496,10 @@
+ 		basic_machine=m88k-motorola
+ 		os=-sysv3
+ 		;;
++	djgpp)
++		basic_machine=i586-pc
++		os=-msdosdjgpp
++		;;
+ 	dpx20 | dpx20-*)
+ 		basic_machine=rs6000-bull
+ 		os=-bosx
+@@ -297,6 +519,10 @@
+ 	encore | umax | mmax)
+ 		basic_machine=ns32k-encore
+ 		;;
++	es1800 | OSE68k | ose68k | ose | OSE)
++		basic_machine=m68k-ericsson
++		os=-ose
++		;;
+ 	fx2800)
+ 		basic_machine=i860-alliant
+ 		;;
+@@ -307,6 +533,10 @@
+ 		basic_machine=tron-gmicro
+ 		os=-sysv
+ 		;;
++	go32)
++		basic_machine=i386-pc
++		os=-go32
++		;;
+ 	h3050r* | hiux*)
+ 		basic_machine=hppa1.1-hitachi
+ 		os=-hiuxwe2
+@@ -315,6 +545,14 @@
+ 		basic_machine=h8300-hitachi
+ 		os=-hms
+ 		;;
++	h8300xray)
++		basic_machine=h8300-hitachi
++		os=-xray
++		;;
++	h8500hms)
++		basic_machine=h8500-hitachi
++		os=-hms
++		;;
+ 	harris)
+ 		basic_machine=m88k-harris
+ 		os=-sysv3
+@@ -330,13 +568,30 @@
+ 		basic_machine=m68k-hp
+ 		os=-hpux
+ 		;;
++	hp3k9[0-9][0-9] | hp9[0-9][0-9])
++		basic_machine=hppa1.0-hp
++		;;
+ 	hp9k2[0-9][0-9] | hp9k31[0-9])
+ 		basic_machine=m68000-hp
+ 		;;
+ 	hp9k3[2-9][0-9])
+ 		basic_machine=m68k-hp
+ 		;;
+-	hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7)
++	hp9k6[0-9][0-9] | hp6[0-9][0-9])
++		basic_machine=hppa1.0-hp
++		;;
++	hp9k7[0-79][0-9] | hp7[0-79][0-9])
++		basic_machine=hppa1.1-hp
++		;;
++	hp9k78[0-9] | hp78[0-9])
++		# FIXME: really hppa2.0-hp
++		basic_machine=hppa1.1-hp
++		;;
++	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
++		# FIXME: really hppa2.0-hp
++		basic_machine=hppa1.1-hp
++		;;
++	hp9k8[0-9][13679] | hp8[0-9][13679])
+ 		basic_machine=hppa1.1-hp
+ 		;;
+ 	hp9k8[0-9][0-9] | hp8[0-9][0-9])
+@@ -345,27 +600,42 @@
+ 	hppa-next)
+ 		os=-nextstep3
+ 		;;
+-	i370-ibm* | ibm*)
++	hppaosf)
++		basic_machine=hppa1.1-hp
++		os=-osf
++		;;
++	hppro)
++		basic_machine=hppa1.1-hp
++		os=-proelf
++		;;
++	i370*)
+ 		basic_machine=i370-ibm
+-		os=-mvs
+ 		;;
+ # I'm not sure what "Sysv32" means.  Should this be sysv3.2?
+-	i[3456]86v32)
++	i*86v32)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv32
+ 		;;
+-	i[3456]86v4*)
++	i*86v4*)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv4
+ 		;;
+-	i[3456]86v)
++	i*86v)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-sysv
+ 		;;
+-	i[3456]86sol2)
++	i*86sol2)
+ 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ 		os=-solaris2
+ 		;;
++	i386mach)
++		basic_machine=i386-mach
++		os=-mach
++		;;
++	i386-vsta | vsta)
++		basic_machine=i386-unknown
++		os=-vsta
++		;;
+ 	iris | iris4d)
+ 		basic_machine=mips-sgi
+ 		case $os in
+@@ -391,16 +661,16 @@
+ 		basic_machine=ns32k-utek
+ 		os=-sysv
+ 		;;
++	mingw32)
++		basic_machine=i386-pc
++		os=-mingw32
++		;;
+ 	miniframe)
+ 		basic_machine=m68000-convergent
+ 		;;
+-	mipsel*-linux*)
+-		basic_machine=mipsel-unknown
+-		os=-linux-gnu
+-		;;
+-	mips*-linux*)
+-		basic_machine=mips-unknown
+-		os=-linux-gnu
++	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
++		basic_machine=m68k-atari
++		os=-mint
+ 		;;
+ 	mips3*-*)
+ 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+@@ -408,10 +678,34 @@
+ 	mips3*)
+ 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+ 		;;
++	monitor)
++		basic_machine=m68k-rom68k
++		os=-coff
++		;;
++	morphos)
++		basic_machine=powerpc-unknown
++		os=-morphos
++		;;
++	msdos)
++		basic_machine=i386-pc
++		os=-msdos
++		;;
++	mvs)
++		basic_machine=i370-ibm
++		os=-mvs
++		;;
+ 	ncr3000)
+ 		basic_machine=i486-ncr
+ 		os=-sysv4
+ 		;;
++	netbsd386)
++		basic_machine=i386-unknown
++		os=-netbsd
++		;;
++	netwinder)
++		basic_machine=armv4l-rebel
++		os=-linux
++		;;
+ 	news | news700 | news800 | news900)
+ 		basic_machine=m68k-sony
+ 		os=-newsos
+@@ -424,6 +718,10 @@
+ 		basic_machine=mips-sony
+ 		os=-newsos
+ 		;;
++	necv70)
++		basic_machine=v70-nec
++		os=-sysv
++		;;
+ 	next | m*-next )
+ 		basic_machine=m68k-next
+ 		case $os in
+@@ -449,9 +747,40 @@
+ 		basic_machine=i960-intel
+ 		os=-nindy
+ 		;;
++	mon960)
++		basic_machine=i960-intel
++		os=-mon960
++		;;
++	nonstopux)
++		basic_machine=mips-compaq
++		os=-nonstopux
++		;;
+ 	np1)
+ 		basic_machine=np1-gould
+ 		;;
++	nsr-tandem)
++		basic_machine=nsr-tandem
++		;;
++	op50n-* | op60c-*)
++		basic_machine=hppa1.1-oki
++		os=-proelf
++		;;
++	or32 | or32-*)
++		basic_machine=or32-unknown
++		os=-coff
++		;;
++	os400)
++		basic_machine=powerpc-ibm
++		os=-os400
++		;;
++	OSE68000 | ose68000)
++		basic_machine=m68000-ericsson
++		os=-ose
++		;;
++	os68k)
++		basic_machine=m68k-none
++		os=-os68k
++		;;
+ 	pa-hitachi)
+ 		basic_machine=hppa1.1-hitachi
+ 		os=-hiuxwe2
+@@ -466,53 +795,95 @@
+ 	pbb)
+ 		basic_machine=m68k-tti
+ 		;;
+-        pc532 | pc532-*)
++	pc532 | pc532-*)
+ 		basic_machine=ns32k-pc532
+ 		;;
+-	pentium | p5)
+-		basic_machine=i586-intel
++	pentium | p5 | k5 | k6 | nexgen | viac3)
++		basic_machine=i586-pc
+ 		;;
+-	pentiumpro | p6)
+-		basic_machine=i686-intel
++	pentiumpro | p6 | 6x86 | athlon | athlon_*)
++		basic_machine=i686-pc
+ 		;;
+-	pentium-* | p5-*)
++	pentiumii | pentium2 | pentiumiii | pentium3)
++		basic_machine=i686-pc
++		;;
++	pentium4)
++		basic_machine=i786-pc
++		;;
++	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+ 		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+-	pentiumpro-* | p6-*)
++	pentiumpro-* | p6-* | 6x86-* | athlon-*)
++		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+ 		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+-	k5)
+-		# We don't have specific support for AMD's K5 yet, so just call it a Pentium
+-		basic_machine=i586-amd
+-		;;
+-	nexen)
+-		# We don't have specific support for Nexgen yet, so just call it a Pentium
+-		basic_machine=i586-nexgen
++	pentium4-*)
++		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	pn)
+ 		basic_machine=pn-gould
+ 		;;
+-	power)	basic_machine=rs6000-ibm
++	power)	basic_machine=power-ibm
+ 		;;
+ 	ppc)	basic_machine=powerpc-unknown
+-	        ;;
++		;;
+ 	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
+ 	ppcle | powerpclittle | ppc-le | powerpc-little)
+ 		basic_machine=powerpcle-unknown
+-	        ;;
++		;;
+ 	ppcle-* | powerpclittle-*)
+ 		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+ 		;;
++	ppc64)	basic_machine=powerpc64-unknown
++		;;
++	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
++	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
++		basic_machine=powerpc64le-unknown
++		;;
++	ppc64le-* | powerpc64little-*)
++		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
++		;;
+ 	ps2)
+ 		basic_machine=i386-ibm
+ 		;;
++	pw32)
++		basic_machine=i586-unknown
++		os=-pw32
++		;;
++	rom68k)
++		basic_machine=m68k-rom68k
++		os=-coff
++		;;
+ 	rm[46]00)
+ 		basic_machine=mips-siemens
+ 		;;
+ 	rtpc | rtpc-*)
+ 		basic_machine=romp-ibm
+ 		;;
++	s390 | s390-*)
++		basic_machine=s390-ibm
++		;;
++	s390x | s390x-*)
++		basic_machine=s390x-ibm
++		;;
++	sa29200)
++		basic_machine=a29k-amd
++		os=-udi
++		;;
++	sb1)
++		basic_machine=mipsisa64sb1-unknown
++		;;
++	sb1el)
++		basic_machine=mipsisa64sb1el-unknown
++		;;
++	sei)
++		basic_machine=mips-sei
++		os=-seiux
++		;;
+ 	sequent)
+ 		basic_machine=i386-sequent
+ 		;;
+@@ -520,6 +891,13 @@
+ 		basic_machine=sh-hitachi
+ 		os=-hms
+ 		;;
++	sh64)
++		basic_machine=sh64-unknown
++		;;
++	sparclite-wrs | simso-wrs)
++		basic_machine=sparclite-wrs
++		os=-vxworks
++		;;
+ 	sps7)
+ 		basic_machine=m68k-bull
+ 		os=-sysv2
+@@ -527,6 +905,13 @@
+ 	spur)
+ 		basic_machine=spur-unknown
+ 		;;
++	st2000)
++		basic_machine=m68k-tandem
++		;;
++	stratus)
++		basic_machine=i860-stratus
++		os=-sysv4
++		;;
+ 	sun2)
+ 		basic_machine=m68000-sun
+ 		;;
+@@ -567,19 +952,51 @@
+ 	sun386 | sun386i | roadrunner)
+ 		basic_machine=i386-sun
+ 		;;
++	sv1)
++		basic_machine=sv1-cray
++		os=-unicos
++		;;
+ 	symmetry)
+ 		basic_machine=i386-sequent
+ 		os=-dynix
+ 		;;
++	t3e)
++		basic_machine=alphaev5-cray
++		os=-unicos
++		;;
++	t90)
++		basic_machine=t90-cray
++		os=-unicos
++		;;
++	tic54x | c54x*)
++		basic_machine=tic54x-unknown
++		os=-coff
++		;;
++	tic55x | c55x*)
++		basic_machine=tic55x-unknown
++		os=-coff
++		;;
++	tic6x | c6x*)
++		basic_machine=tic6x-unknown
++		os=-coff
++		;;
+ 	tx39)
+ 		basic_machine=mipstx39-unknown
+ 		;;
+ 	tx39el)
+ 		basic_machine=mipstx39el-unknown
+ 		;;
++	toad1)
++		basic_machine=pdp10-xkl
++		os=-tops20
++		;;
+ 	tower | tower-32)
+ 		basic_machine=m68k-ncr
+ 		;;
++	tpf)
++		basic_machine=s390x-ibm
++		os=-tpf
++		;;
+ 	udi29k)
+ 		basic_machine=a29k-amd
+ 		os=-udi
+@@ -588,6 +1005,10 @@
+ 		basic_machine=a29k-nyu
+ 		os=-sym1
+ 		;;
++	v810 | necv810)
++		basic_machine=v810-nec
++		os=-none
++		;;
+ 	vaxv)
+ 		basic_machine=vax-dec
+ 		os=-sysv
+@@ -597,8 +1018,8 @@
+ 		os=-vms
+ 		;;
+ 	vpp*|vx|vx-*)
+-               basic_machine=f301-fujitsu
+-               ;;
++		basic_machine=f301-fujitsu
++		;;
+ 	vxworks960)
+ 		basic_machine=i960-wrs
+ 		os=-vxworks
+@@ -611,13 +1032,29 @@
+ 		basic_machine=a29k-wrs
+ 		os=-vxworks
+ 		;;
+-	xmp)
+-		basic_machine=xmp-cray
+-		os=-unicos
++	w65*)
++		basic_machine=w65-wdc
++		os=-none
++		;;
++	w89k-*)
++		basic_machine=hppa1.1-winbond
++		os=-proelf
++		;;
++	xbox)
++		basic_machine=i686-pc
++		os=-mingw32
+ 		;;
+-        xps | xps100)
++	xps | xps100)
+ 		basic_machine=xps100-honeywell
+ 		;;
++	ymp)
++		basic_machine=ymp-cray
++		os=-unicos
++		;;
++	z8k-*-coff)
++		basic_machine=z8k-unknown
++		os=-sim
++		;;
+ 	none)
+ 		basic_machine=none-none
+ 		os=-none
+@@ -625,32 +1062,47 @@
+ 
+ # Here we handle the default manufacturer of certain CPU types.  It is in
+ # some cases the only manufacturer, in others, it is the most popular.
+-	mips)
+-		if [ x$os = x-linux-gnu ]; then
+-			basic_machine=mips-unknown
+-		else
+-			basic_machine=mips-mips
+-		fi
++	w89k)
++		basic_machine=hppa1.1-winbond
++		;;
++	op50n)
++		basic_machine=hppa1.1-oki
++		;;
++	op60c)
++		basic_machine=hppa1.1-oki
+ 		;;
+ 	romp)
+ 		basic_machine=romp-ibm
+ 		;;
++	mmix)
++		basic_machine=mmix-knuth
++		;;
+ 	rs6000)
+ 		basic_machine=rs6000-ibm
+ 		;;
+ 	vax)
+ 		basic_machine=vax-dec
+ 		;;
++	pdp10)
++		# there are many clones, so DEC is not a safe bet
++		basic_machine=pdp10-unknown
++		;;
+ 	pdp11)
+ 		basic_machine=pdp11-dec
+ 		;;
+ 	we32k)
+ 		basic_machine=we32k-att
+ 		;;
+-	sparc)
++	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
++		basic_machine=sh-unknown
++		;;
++	sh64)
++		basic_machine=sh64-unknown
++		;;
++	sparc | sparcv8 | sparcv9 | sparcv9b)
+ 		basic_machine=sparc-sun
+ 		;;
+-        cydra)
++	cydra)
+ 		basic_machine=cydra-cydrome
+ 		;;
+ 	orion)
+@@ -659,6 +1111,15 @@
+ 	orion105)
+ 		basic_machine=clipper-highlevel
+ 		;;
++	mac | mpw | mac-mpw)
++		basic_machine=m68k-apple
++		;;
++	pmac | pmac-mpw)
++		basic_machine=powerpc-apple
++		;;
++	*-unknown)
++		# Make sure to match an already-canonicalized machine name.
++		;;
+ 	*)
+ 		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ 		exit 1
+@@ -711,14 +1172,46 @@
+ 	      | -aos* \
+ 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
+-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
++	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
++	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
++	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+-	      | -cygwin32* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+-	      | -mingw32* | -linux-gnu* | -uxpv*)
++	      | -chorusos* | -chorusrdb* \
++	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
++	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
++	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
++	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
++	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
++	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
++	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
++	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+ 	# Remember, each alternative MUST END IN *, to match a version number.
+ 		;;
++	-qnx*)
++		case $basic_machine in
++		    x86-* | i*86-*)
++			;;
++		    *)
++			os=-nto$os
++			;;
++		esac
++		;;
++	-nto-qnx*)
++		;;
++	-nto*)
++		os=`echo $os | sed -e 's|nto|nto-qnx|'`
++		;;
++	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
++	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
++	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
++		;;
++	-mac*)
++		os=`echo $os | sed -e 's|mac|macos|'`
++		;;
++	-linux-dietlibc)
++		os=-linux-dietlibc
++		;;
+ 	-linux*)
+ 		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+ 		;;
+@@ -728,6 +1221,15 @@
+ 	-sunos6*)
+ 		os=`echo $os | sed -e 's|sunos6|solaris3|'`
+ 		;;
++	-opened*)
++		os=-openedition
++		;;
++        -os400*)
++		os=-os400
++		;;
++	-wince*)
++		os=-wince
++		;;
+ 	-osfrose*)
+ 		os=-osfrose
+ 		;;
+@@ -743,11 +1245,26 @@
+ 	-acis*)
+ 		os=-aos
+ 		;;
++	-atheos*)
++		os=-atheos
++		;;
++	-syllable*)
++		os=-syllable
++		;;
++	-386bsd)
++		os=-bsd
++		;;
+ 	-ctix* | -uts*)
+ 		os=-sysv
+ 		;;
++	-nova*)
++		os=-rtmk-nova
++		;;
+ 	-ns2 )
+-	        os=-nextstep2
++		os=-nextstep2
++		;;
++	-nsk*)
++		os=-nsk
+ 		;;
+ 	# Preserve the version number of sinix5.
+ 	-sinix5.*)
+@@ -756,6 +1273,9 @@
+ 	-sinix*)
+ 		os=-sysv4
+ 		;;
++        -tpf*)
++		os=-tpf
++		;;
+ 	-triton*)
+ 		os=-sysv3
+ 		;;
+@@ -774,9 +1294,27 @@
+ 	# This must come after -sysvr4.
+ 	-sysv*)
+ 		;;
++	-ose*)
++		os=-ose
++		;;
++	-es1800*)
++		os=-ose
++		;;
+ 	-xenix)
+ 		os=-xenix
+ 		;;
++	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
++		os=-mint
++		;;
++	-aros*)
++		os=-aros
++		;;
++	-kaos*)
++		os=-kaos
++		;;
++	-zvmoe)
++		os=-zvmoe
++		;;
+ 	-none)
+ 		;;
+ 	*)
+@@ -802,10 +1340,20 @@
+ 	*-acorn)
+ 		os=-riscix1.2
+ 		;;
++	arm*-rebel)
++		os=-linux
++		;;
+ 	arm*-semi)
+ 		os=-aout
+ 		;;
+-        pdp11-*)
++    c4x-* | tic4x-*)
++        os=-coff
++        ;;
++	# This must come before the *-dec entry.
++	pdp10-*)
++		os=-tops20
++		;;
++	pdp11-*)
+ 		os=-none
+ 		;;
+ 	*-dec | vax-*)
+@@ -823,15 +1371,42 @@
+ 		# default.
+ 		# os=-sunos4
+ 		;;
++	m68*-cisco)
++		os=-aout
++		;;
++	mips*-cisco)
++		os=-elf
++		;;
++	mips*-*)
++		os=-elf
++		;;
++	or32-*)
++		os=-coff
++		;;
+ 	*-tti)	# must be before sparc entry or we get the wrong os.
+ 		os=-sysv3
+ 		;;
+ 	sparc-* | *-sun)
+ 		os=-sunos4.1.1
+ 		;;
++	*-be)
++		os=-beos
++		;;
+ 	*-ibm)
+ 		os=-aix
+ 		;;
++    	*-knuth)
++		os=-mmixware
++		;;
++	*-wec)
++		os=-proelf
++		;;
++	*-winbond)
++		os=-proelf
++		;;
++	*-oki)
++		os=-proelf
++		;;
+ 	*-hp)
+ 		os=-hpux
+ 		;;
+@@ -874,27 +1449,39 @@
+ 	*-next)
+ 		os=-nextstep3
+ 		;;
+-        *-gould)
++	*-gould)
+ 		os=-sysv
+ 		;;
+-        *-highlevel)
++	*-highlevel)
+ 		os=-bsd
+ 		;;
+ 	*-encore)
+ 		os=-bsd
+ 		;;
+-        *-sgi)
++	*-sgi)
+ 		os=-irix
+ 		;;
+-        *-siemens)
++	*-siemens)
+ 		os=-sysv4
+ 		;;
+ 	*-masscomp)
+ 		os=-rtu
+ 		;;
+-	f301-fujitsu)
++	f30[01]-fujitsu | f700-fujitsu)
+ 		os=-uxpv
+ 		;;
++	*-rom68k)
++		os=-coff
++		;;
++	*-*bug)
++		os=-coff
++		;;
++	*-apple)
++		os=-macos
++		;;
++	*-atari*)
++		os=-mint
++		;;
+ 	*)
+ 		os=-none
+ 		;;
+@@ -916,9 +1503,15 @@
+ 			-aix*)
+ 				vendor=ibm
+ 				;;
++			-beos*)
++				vendor=be
++				;;
+ 			-hpux*)
+ 				vendor=hp
+ 				;;
++			-mpeix*)
++				vendor=hp
++				;;
+ 			-hiux*)
+ 				vendor=hitachi
+ 				;;
+@@ -934,21 +1527,47 @@
+ 			-genix*)
+ 				vendor=ns
+ 				;;
+-			-mvs*)
++			-mvs* | -opened*)
++				vendor=ibm
++				;;
++			-os400*)
+ 				vendor=ibm
+ 				;;
+ 			-ptx*)
+ 				vendor=sequent
+ 				;;
+-			-vxsim* | -vxworks*)
++			-tpf*)
++				vendor=ibm
++				;;
++			-vxsim* | -vxworks* | -windiss*)
+ 				vendor=wrs
+ 				;;
+ 			-aux*)
+ 				vendor=apple
+ 				;;
++			-hms*)
++				vendor=hitachi
++				;;
++			-mpw* | -macos*)
++				vendor=apple
++				;;
++			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
++				vendor=atari
++				;;
++			-vos*)
++				vendor=stratus
++				;;
+ 		esac
+ 		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+ 		;;
+ esac
+ 
+ echo $basic_machine$os
++exit 0
++
++# Local variables:
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "timestamp='"
++# time-stamp-format: "%:y-%02m-%02d"
++# time-stamp-end: "'"
++# End:
+diff -Naur jpeg-6b-orig/ltconfig jpeg-6b/ltconfig
+--- jpeg-6b-orig/ltconfig	1998-03-26 02:25:39.000000000 +1100
++++ jpeg-6b/ltconfig	2005-05-22 21:30:51.000000000 +1000
+@@ -1,8 +1,8 @@
+ #! /bin/sh
+ 
+ # ltconfig - Create a system-specific libtool.
+-# Copyright (C) 1996-1998 Free Software Foundation, Inc.
+-# Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
++# Copyright (C) 1996-1999 Free Software Foundation, Inc.
++# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+ #
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -25,30 +25,129 @@
+ 
+ # A lot of this script is taken from autoconf-2.10.
+ 
++# Check that we are running under the correct shell.
++SHELL=${CONFIG_SHELL-/bin/sh}
++echo=echo
++if test "X$1" = X--no-reexec; then
++  # Discard the --no-reexec flag, and continue.
++  shift
++elif test "X$1" = X--fallback-echo; then
++  # Avoid inline document here, it may be left over
++  :
++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
++  # Yippee, $echo works!
++  :
++else
++  # Restart under the correct shell.
++  exec "$SHELL" "$0" --no-reexec ${1+"$@"}
++fi
++
++if test "X$1" = X--fallback-echo; then
++  # used as fallback echo
++  shift
++  cat <<EOF
++$*
++EOF
++  exit 0
++fi
++
++# Find the correct PATH separator.  Usually this is `:', but
++# DJGPP uses `;' like DOS.
++if test "X${PATH_SEPARATOR+set}" != Xset; then
++  UNAME=${UNAME-`uname 2>/dev/null`}
++  case X$UNAME in
++    *-DOS) PATH_SEPARATOR=';' ;;
++    *)     PATH_SEPARATOR=':' ;;
++  esac
++fi
++
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi
++if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+ 
+-echo=echo
+-if test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then :
+-else
+-  # The Solaris and AIX default echo program unquotes backslashes.
+-  # This makes it impossible to quote backslashes using
++if test "X${echo_test_string+set}" != Xset; then
++  # find a string as large as possible, as long as the shell can cope with it
++  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
++    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
++    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
++       echo_test_string="`eval $cmd`" &&
++       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null; then
++      break
++    fi
++  done
++fi
++
++if test "X`($echo '\t') 2>/dev/null`" != 'X\t' ||
++   test "X`($echo "$echo_test_string") 2>/dev/null`" != X"$echo_test_string"; then
++  # The Solaris, AIX, and Digital Unix default echo programs unquote
++  # backslashes.  This makes it impossible to quote backslashes using
+   #   echo "$something" | sed 's/\\/\\\\/g'
+-  # So, we emulate echo with printf '%s\n'
+-  echo="printf %s\\n"
+-  if test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then :
+-  else
+-    # Oops.  We have no working printf.  Try to find a not-so-buggy echo.
+-    echo=echo
+-    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
+-    for dir in $PATH /usr/ucb; do
+-      if test -f $dir/echo && test "X`$dir/echo '\t'`" = 'X\t'; then
+-        echo="$dir/echo"
+-        break
++  #
++  # So, first we look for a working echo in the user's PATH.
++
++  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
++  for dir in $PATH /usr/ucb; do
++    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
++       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
++       test "X`($dir/echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
++      echo="$dir/echo"
++      break
++    fi
++  done
++  IFS="$save_ifs"
++
++  if test "X$echo" = Xecho; then
++    # We didn't find a better echo, so look for alternatives.
++    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
++       test "X`(print -r "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
++      # This shell has a builtin print -r that does the trick.
++      echo='print -r'
++    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
++	 test "X$CONFIG_SHELL" != X/bin/ksh; then
++      # If we have ksh, try running ltconfig again with it.
++      ORIGINAL_CONFIG_SHELL="${CONFIG_SHELL-/bin/sh}"
++      export ORIGINAL_CONFIG_SHELL
++      CONFIG_SHELL=/bin/ksh
++      export CONFIG_SHELL
++      exec "$CONFIG_SHELL" "$0" --no-reexec ${1+"$@"}
++    else
++      # Try using printf.
++      echo='printf "%s\n"'
++      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
++	 test "X`($echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
++	# Cool, printf works
++	:
++      elif test "X`("$ORIGINAL_CONFIG_SHELL" "$0" --fallback-echo '\t') 2>/dev/null`" = 'X\t' &&
++	   test "X`("$ORIGINAL_CONFIG_SHELL" "$0" --fallback-echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
++	CONFIG_SHELL="$ORIGINAL_CONFIG_SHELL"
++	export CONFIG_SHELL
++	SHELL="$CONFIG_SHELL"
++	export SHELL
++	echo="$CONFIG_SHELL $0 --fallback-echo"
++      elif test "X`("$CONFIG_SHELL" "$0" --fallback-echo '\t') 2>/dev/null`" = 'X\t' &&
++	   test "X`("$CONFIG_SHELL" "$0" --fallback-echo "$echo_test_string") 2>/dev/null`" = X"$echo_test_string"; then
++	echo="$CONFIG_SHELL $0 --fallback-echo"
++      else
++	# maybe with a smaller string...
++	prev=:
++
++	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
++	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null; then
++	    break
++	  fi
++	  prev="$cmd"
++	done
++
++	if test "$prev" != 'sed 50q "$0"'; then
++	  echo_test_string=`eval $prev`
++	  export echo_test_string
++	  exec "${ORIGINAL_CONFIG_SHELL}" "$0" ${1+"$@"}
++	else
++	  # Oops.  We lost completely, so just stick with echo.
++	  echo=echo
++	fi
+       fi
+-    done
+-    IFS="$save_ifs"
++    fi
+   fi
+ fi
+ 
+@@ -60,24 +159,34 @@
+ # Same as above, but do not quote variable references.
+ double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
+ 
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
++
+ # The name of this program.
+ progname=`$echo "X$0" | $Xsed -e 's%^.*/%%'`
+ 
+ # Constants:
+ PROGRAM=ltconfig
+ PACKAGE=libtool
+-VERSION=1.2
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5'
+-ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.c $LIBS 1>&5'
++VERSION=1.3.5
++TIMESTAMP=" (1.385.2.206 2000/05/27 11:12:27)"
++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
++ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ rm="rm -f"
+ 
+ help="Try \`$progname --help' for more information."
+ 
+ # Global variables:
++default_ofile=libtool
+ can_build_shared=yes
+ enable_shared=yes
+-# All known linkers require a `.a' archive for static linking.
++# All known linkers require a `.a' archive for static linking (except M$VC,
++# which needs '.lib').
+ enable_static=yes
++enable_fast_install=yes
++enable_dlopen=unknown
++enable_win32_dll=no
+ ltmain=
+ silent=
+ srcdir=
+@@ -85,18 +194,30 @@
+ ac_config_sub=
+ host=
+ nonopt=
++ofile="$default_ofile"
+ verify_host=yes
+ with_gcc=no
+ with_gnu_ld=no
++need_locks=yes
++ac_ext=c
++objext=o
++libext=a
++exeext=
++cache_file=
+ 
+ old_AR="$AR"
+ old_CC="$CC"
+ old_CFLAGS="$CFLAGS"
+ old_CPPFLAGS="$CPPFLAGS"
++old_LDFLAGS="$LDFLAGS"
+ old_LD="$LD"
+ old_LN_S="$LN_S"
++old_LIBS="$LIBS"
+ old_NM="$NM"
+ old_RANLIB="$RANLIB"
++old_DLLTOOL="$DLLTOOL"
++old_OBJDUMP="$OBJDUMP"
++old_AS="$AS"
+ 
+ # Parse the command line options.
+ args=
+@@ -117,33 +238,51 @@
+ 
+   case "$option" in
+   --help) cat <<EOM
+-Usage: $progname [OPTION]... LTMAIN [HOST]
++Usage: $progname [OPTION]... [HOST [LTMAIN]]
+ 
+ Generate a system-specific libtool script.
+ 
++    --debug                enable verbose shell tracing
+     --disable-shared       do not build shared libraries
+     --disable-static       do not build static libraries
++    --disable-fast-install do not optimize for fast installation
++    --enable-dlopen        enable dlopen support
++    --enable-win32-dll     enable building dlls on win32 hosts
+     --help                 display this help and exit
+     --no-verify            do not verify that HOST is a valid host type
++-o, --output=FILE          specify the output file [default=$default_ofile]
+     --quiet                same as \`--silent'
+     --silent               do not print informational messages
+     --srcdir=DIR           find \`config.guess' in DIR
+     --version              output version information and exit
+     --with-gcc             assume that the GNU C compiler will be used
+     --with-gnu-ld          assume that the C compiler uses the GNU linker
++    --disable-lock         disable file locking
++    --cache-file=FILE      configure cache file
+ 
+-LTMAIN is the \`ltmain.sh' shell script fragment that provides basic libtool
+-functionality.
++LTMAIN is the \`ltmain.sh' shell script fragment or \`ltmain.c' program
++that provides basic libtool functionality.
+ 
+ HOST is the canonical host system name [default=guessed].
+ EOM
+   exit 0
+   ;;
+ 
++  --debug)
++    echo "$progname: enabling shell trace mode"
++    set -x
++    ;;
++
+   --disable-shared) enable_shared=no ;;
+ 
+   --disable-static) enable_static=no ;;
+ 
++  --disable-fast-install) enable_fast_install=no ;;
++
++  --enable-dlopen) enable_dlopen=yes ;;
++
++  --enable-win32-dll) enable_win32_dll=yes ;;
++
+   --quiet | --silent) silent=yes ;;
+ 
+   --srcdir) prev=srcdir ;;
+@@ -151,11 +290,18 @@
+ 
+   --no-verify) verify_host=no ;;
+ 
+-  --version) echo "$PROGRAM (GNU $PACKAGE) $VERSION"; exit 0 ;;
++  --output | -o) prev=ofile ;;
++  --output=*) ofile="$optarg" ;;
++
++  --version) echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"; exit 0 ;;
+ 
+   --with-gcc) with_gcc=yes ;;
+   --with-gnu-ld) with_gnu_ld=yes ;;
+ 
++  --disable-lock) need_locks=no ;;
++
++  --cache-file=*) cache_file="$optarg" ;;
++
+   -*)
+     echo "$progname: unrecognized option \`$option'" 1>&2
+     echo "$help" 1>&2
+@@ -185,8 +331,7 @@
+   exit 1
+ fi
+ 
+-if test -f "$ltmain"; then :
+-else
++if test ! -f "$ltmain"; then
+   echo "$progname: \`$ltmain' does not exist" 1>&2
+   echo "$help" 1>&2
+   exit 1
+@@ -224,8 +369,13 @@
+ # Only set LANG and LC_ALL to C if already set.
+ # These must not be set unconditionally because not all systems understand
+ # e.g. LANG=C (notably SCO).
+-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
++if test "X${LC_ALL+set}" = Xset; then LC_ALL=C; export LC_ALL; fi
++if test "X${LANG+set}"   = Xset; then LANG=C;   export LANG;   fi
++
++if test -n "$cache_file" && test -r "$cache_file"; then
++  echo "loading cache $cache_file within ltconfig"
++  . $cache_file
++fi
+ 
+ if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
+   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
+@@ -240,8 +390,8 @@
+ fi
+ 
+ if test -z "$srcdir"; then
+-  # Assume the source directory is the same one as the path to ltmain.sh.
+-  srcdir=`$echo "$ltmain" | $Xsed -e 's%/[^/]*$%%'`
++  # Assume the source directory is the same one as the path to LTMAIN.
++  srcdir=`$echo "X$ltmain" | $Xsed -e 's%/[^/]*$%%'`
+   test "$srcdir" = "$ltmain" && srcdir=.
+ fi
+ 
+@@ -264,7 +414,7 @@
+   ac_config_sub=$ac_aux_dir/config.sub
+ 
+   # Make sure we can run config.sub.
+-  if $ac_config_sub sun4 >/dev/null 2>&1; then :
++  if $SHELL $ac_config_sub sun4 >/dev/null 2>&1; then :
+   else
+     echo "$progname: cannot run $ac_config_sub" 1>&2
+     echo "$help" 1>&2
+@@ -276,14 +426,14 @@
+   host_alias=$host
+   case "$host_alias" in
+   "")
+-    if host_alias=`$ac_config_guess`; then :
++    if host_alias=`$SHELL $ac_config_guess`; then :
+     else
+       echo "$progname: cannot guess host type; you must specify one" 1>&2
+       echo "$help" 1>&2
+       exit 1
+     fi ;;
+   esac
+-  host=`$ac_config_sub $host_alias`
++  host=`$SHELL $ac_config_sub $host_alias`
+   echo "$ac_t$host" 1>&6
+ 
+   # Make sure the host verified.
+@@ -312,7 +462,7 @@
+   # AIX sometimes has problems with the GCC collect2 program.  For some
+   # reason, if we set the COLLECT_NAMES environment variable, the problems
+   # vanish in a puff of smoke.
+-  if test "${COLLECT_NAMES+set}" != set; then
++  if test "X${COLLECT_NAMES+set}" != Xset; then
+     COLLECT_NAMES=
+     export COLLECT_NAMES
+   fi
+@@ -327,15 +477,18 @@
+ # Set a sane default for `AR'.
+ test -z "$AR" && AR=ar
+ 
++# Set a sane default for `OBJDUMP'.
++test -z "$OBJDUMP" && OBJDUMP=objdump
++
+ # If RANLIB is not set, then run the test.
+ if test "${RANLIB+set}" != "set"; then
+   result=no
+ 
+   echo $ac_n "checking for ranlib... $ac_c" 1>&6
+-  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
++  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
+   for dir in $PATH; do
+     test -z "$dir" && dir=.
+-    if test -f $dir/ranlib; then
++    if test -f $dir/ranlib || test -f $dir/ranlib$ac_exeext; then
+       RANLIB="ranlib"
+       result="ranlib"
+       break
+@@ -347,20 +500,24 @@
+ fi
+ 
+ if test -n "$RANLIB"; then
+-  old_archive_cmds="$old_archive_cmds;\$RANLIB \$oldlib"
+-  old_postinstall_cmds="\$RANLIB \$oldlib;$old_postinstall_cmds"
++  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
++  old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ fi
+ 
++# Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin.
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++test -z "$OBJDUMP" && OBJDUMP=objdump
++test -z "$AS" && AS=as
++
+ # Check to see if we are using GCC.
+ if test "$with_gcc" != yes || test -z "$CC"; then
+   # If CC is not set, then try to find GCC or a usable CC.
+   if test -z "$CC"; then
+     echo $ac_n "checking for gcc... $ac_c" 1>&6
+-    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
++    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
+     for dir in $PATH; do
+-      IFS="$save_ifs"
+       test -z "$dir" && dir=.
+-      if test -f $dir/gcc; then
++      if test -f $dir/gcc || test -f $dir/gcc$ac_exeext; then
+ 	CC="gcc"
+ 	break
+       fi
+@@ -377,11 +534,11 @@
+   # Not "gcc", so try "cc", rejecting "/usr/ucb/cc".
+   if test -z "$CC"; then
+     echo $ac_n "checking for cc... $ac_c" 1>&6
+-    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
++    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
+     cc_rejected=no
+     for dir in $PATH; do
+       test -z "$dir" && dir=.
+-      if test -f $dir/cc; then
++      if test -f $dir/cc || test -f $dir/cc$ac_exeext; then
+ 	if test "$dir/cc" = "/usr/ucb/cc"; then
+ 	  cc_rejected=yes
+ 	  continue
+@@ -421,7 +578,7 @@
+   # Now see if the compiler is really GCC.
+   with_gcc=no
+   echo $ac_n "checking whether we are using GNU C... $ac_c" 1>&6
+-  echo "$progname:424: checking whether we are using GNU C" >&5
++  echo "$progname:581: checking whether we are using GNU C" >&5
+ 
+   $rm conftest.c
+   cat > conftest.c <<EOF
+@@ -429,7 +586,7 @@
+   yes;
+ #endif
+ EOF
+-  if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:432: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++  if { ac_try='${CC-cc} -E conftest.c'; { (eval echo $progname:589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+     with_gcc=yes
+   fi
+   $rm conftest.c
+@@ -440,6 +597,60 @@
+ set dummy $CC
+ compiler="$2"
+ 
++echo $ac_n "checking for object suffix... $ac_c" 1>&6
++$rm conftest*
++echo 'int i = 1;' > conftest.c
++echo "$progname:603: checking for object suffix" >& 5
++if { (eval echo $progname:604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; }; then
++  # Append any warnings to the config.log.
++  cat conftest.err 1>&5
++
++  for ac_file in conftest.*; do
++    case $ac_file in
++    *.c) ;;
++    *) objext=`echo $ac_file | sed -e s/conftest.//` ;;
++    esac
++  done
++else
++  cat conftest.err 1>&5
++  echo "$progname: failed program was:" >&5
++  cat conftest.c >&5
++fi
++$rm conftest*
++echo "$ac_t$objext" 1>&6
++
++echo $ac_n "checking for executable suffix... $ac_c" 1>&6
++if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_cv_exeext="no"
++  $rm conftest*
++  echo 'main () { return 0; }' > conftest.c
++  echo "$progname:629: checking for executable suffix" >& 5
++  if { (eval echo $progname:630: \"$ac_link\") 1>&5; (eval $ac_link) 2>conftest.err; }; then
++    # Append any warnings to the config.log.
++    cat conftest.err 1>&5
++
++    for ac_file in conftest.*; do
++      case $ac_file in
++      *.c | *.err | *.$objext ) ;;
++      *) ac_cv_exeext=.`echo $ac_file | sed -e s/conftest.//` ;;
++      esac
++    done
++  else
++    cat conftest.err 1>&5
++    echo "$progname: failed program was:" >&5
++    cat conftest.c >&5
++  fi
++  $rm conftest*
++fi
++if test "X$ac_cv_exeext" = Xno; then
++  exeext=""
++else
++  exeext="$ac_cv_exeext"
++fi
++echo "$ac_t$ac_cv_exeext" 1>&6
++
+ echo $ac_n "checking for $compiler option to produce PIC... $ac_c" 1>&6
+ pic_flag=
+ special_shlib_compile_flags=
+@@ -450,21 +661,39 @@
+ if test "$with_gcc" = yes; then
+   wl='-Wl,'
+   link_static_flag='-static'
+-  no_builtin_flag=' -fno-builtin'
+ 
+   case "$host_os" in
+-  aix3* | aix4* | irix5* | irix6* | osf3* | osf4*)
++  beos* | irix5* | irix6* | osf3* | osf4* | osf5*)
+     # PIC is the default for these OSes.
+     ;;
+-  os2*)
++  aix*)
++    # Below there is a dirty hack to force normal static linking with -ldl
++    # The problem is because libdl dynamically linked with both libc and
++    # libC (AIX C++ library), which obviously doesn't included in libraries
++    # list by gcc. This cause undefined symbols with -static flags.
++    # This hack allows C programs to be linked with "-static -ldl", but
++    # we not sure about C++ programs.
++    link_static_flag="$link_static_flag ${wl}-lC"
++    ;;
++  cygwin* | mingw* | os2*)
+     # We can build DLLs from non-PIC.
+     ;;
++  darwin* | rhapsody*)
++    # PIC is the default on this platform
++    # Common symbols not allowed in MH_DYLIB files
++    pic_flag='-fno-common'
++    ;;
+   amigaos*)
+     # FIXME: we need at least 68020 code to build shared libraries, but
+     # adding the `-m68020' flag to GCC prevents building anything better,
+     # like `-m68040'.
+     pic_flag='-m68020 -resident32 -malways-restore-a4'
+     ;;
++  sysv4*MP*)
++    if test -d /usr/nec; then
++       pic_flag=-Kconform_pic
++    fi
++    ;;
+   *)
+     pic_flag='-fPIC'
+     ;;
+@@ -477,7 +706,7 @@
+     link_static_flag='-bnso -bI:/lib/syscalls.exp'
+     ;;
+ 
+-  hpux9* | hpux10*)
++  hpux9* | hpux10* | hpux11*)
+     # Is there a better link_static_flag that works with the bundled CC?
+     wl='-Wl,'
+     link_static_flag="${wl}-a ${wl}archive"
+@@ -490,11 +719,11 @@
+     # PIC (with -KPIC) is the default.
+     ;;
+ 
+-  os2*)
++  cygwin* | mingw* | os2*)
+     # We can build DLLs from non-PIC.
+     ;;
+ 
+-  osf3* | osf4*)
++  osf3* | osf4* | osf5*)
+     # All OSF/1 code is PIC.
+     wl='-Wl,'
+     link_static_flag='-non_shared'
+@@ -506,7 +735,7 @@
+     special_shlib_compile_flags='-belf'
+     ;;
+ 
+-  solaris2*)
++  solaris*)
+     pic_flag='-KPIC'
+     link_static_flag='-Bstatic'
+     wl='-Wl,'
+@@ -518,7 +747,7 @@
+     wl='-Qoption ld '
+     ;;
+ 
+-  sysv4.2uw2*)
++  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+     pic_flag='-KPIC'
+     link_static_flag='-Bstatic'
+     wl='-Wl,'
+@@ -528,7 +757,12 @@
+     pic_flag='-pic'
+     link_static_flag='-Bstatic'
+     ;;
+-
++  sysv4*MP*)
++    if test -d /usr/nec ;then
++      pic_flag='-Kconform_pic'
++      link_static_flag='-Bstatic'
++    fi
++    ;;
+   *)
+     can_build_shared=no
+     ;;
+@@ -541,25 +775,33 @@
+   # Check to make sure the pic_flag actually works.
+   echo $ac_n "checking if $compiler PIC flag $pic_flag works... $ac_c" 1>&6
+   $rm conftest*
+-  echo > conftest.c
++  echo "int some_variable = 0;" > conftest.c
+   save_CFLAGS="$CFLAGS"
+   CFLAGS="$CFLAGS $pic_flag -DPIC"
+-  echo "$progname:547: checking if $compiler PIC flag $pic_flag works" >&5
+-  if { (eval echo $progname:548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
++  echo "$progname:781: checking if $compiler PIC flag $pic_flag works" >&5
++  if { (eval echo $progname:782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then
+     # Append any warnings to the config.log.
+     cat conftest.err 1>&5
+-
+-    # On HP-UX, both CC and GCC only warn that PIC is supported... then they
+-    # create non-PIC objects.  So, if there were any warnings, we assume that
+-    # PIC is not supported.
+-    if test -s conftest.err; then
+-      echo "$ac_t"no 1>&6
+-      can_build_shared=no
+-      pic_flag=
+-    else
++    
++    case "$host_os" in
++    hpux9* | hpux10* | hpux11*)
++      # On HP-UX, both CC and GCC only warn that PIC is supported... then they
++      # create non-PIC objects.  So, if there were any warnings, we assume that
++      # PIC is not supported.
++      if test -s conftest.err; then
++	echo "$ac_t"no 1>&6
++	can_build_shared=no
++	pic_flag=
++      else
++	echo "$ac_t"yes 1>&6
++	pic_flag=" $pic_flag"
++      fi
++      ;;
++    *)
+       echo "$ac_t"yes 1>&6
+       pic_flag=" $pic_flag"
+-    fi
++      ;;
++    esac
+   else
+     # Append any errors to the config.log.
+     cat conftest.err 1>&5
+@@ -573,6 +815,136 @@
+   echo "$ac_t"none 1>&6
+ fi
+ 
++# Check to see if options -o and -c are simultaneously supported by compiler
++echo $ac_n "checking if $compiler supports -c -o file.o... $ac_c" 1>&6
++$rm -r conftest 2>/dev/null
++mkdir conftest
++cd conftest
++$rm conftest*
++echo "int some_variable = 0;" > conftest.c
++mkdir out
++# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
++# that will create temporary files in the current directory regardless of
++# the output directory.  Thus, making CWD read-only will cause this test
++# to fail, enabling locking or at least warning the user not to do parallel
++# builds.
++chmod -w .
++save_CFLAGS="$CFLAGS"
++CFLAGS="$CFLAGS -o out/conftest2.o"
++echo "$progname:834: checking if $compiler supports -c -o file.o" >&5
++if { (eval echo $progname:835: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.o; then
++
++  # The compiler can only warn and ignore the option if not recognized
++  # So say no if there are warnings
++    if test -s out/conftest.err; then
++      echo "$ac_t"no 1>&6
++      compiler_c_o=no
++    else
++      echo "$ac_t"yes 1>&6
++      compiler_c_o=yes
++    fi
++else
++  # Append any errors to the config.log.
++  cat out/conftest.err 1>&5
++  compiler_c_o=no
++  echo "$ac_t"no 1>&6
++fi
++CFLAGS="$save_CFLAGS"
++chmod u+w .
++$rm conftest* out/*
++rmdir out
++cd ..
++rmdir conftest
++$rm -r conftest 2>/dev/null
++
++if test x"$compiler_c_o" = x"yes"; then
++  # Check to see if we can write to a .lo
++  echo $ac_n "checking if $compiler supports -c -o file.lo... $ac_c" 1>&6
++  $rm conftest*
++  echo "int some_variable = 0;" > conftest.c
++  save_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -c -o conftest.lo"
++  echo "$progname:867: checking if $compiler supports -c -o file.lo" >&5
++if { (eval echo $progname:868: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.lo; then
++
++    # The compiler can only warn and ignore the option if not recognized
++    # So say no if there are warnings
++      if test -s conftest.err; then
++	echo "$ac_t"no 1>&6
++	compiler_o_lo=no
++      else
++	echo "$ac_t"yes 1>&6
++	compiler_o_lo=yes
++      fi
++  else
++    # Append any errors to the config.log.
++    cat conftest.err 1>&5
++    compiler_o_lo=no
++    echo "$ac_t"no 1>&6
++  fi
++  CFLAGS="$save_CFLAGS"
++  $rm conftest*
++else
++  compiler_o_lo=no
++fi
++
++# Check to see if we can do hard links to lock some files if needed
++hard_links="nottested"
++if test "$compiler_c_o" = no && test "$need_locks" != no; then
++  # do not overwrite the value of need_locks provided by the user
++  echo $ac_n "checking if we can lock with hard links... $ac_c" 1>&6
++  hard_links=yes
++  $rm conftest*
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  touch conftest.a
++  ln conftest.a conftest.b 2>&5 || hard_links=no
++  ln conftest.a conftest.b 2>/dev/null && hard_links=no
++  echo "$ac_t$hard_links" 1>&6
++  $rm conftest*
++  if test "$hard_links" = no; then
++    echo "*** WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2
++    need_locks=warn
++  fi
++else
++  need_locks=no
++fi
++
++if test "$with_gcc" = yes; then
++  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
++  echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions ... $ac_c" 1>&6
++  $rm conftest*
++  echo "int some_variable = 0;" > conftest.c
++  save_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.c"
++  echo "$progname:919: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++  if { (eval echo $progname:920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.o; then
++
++    # The compiler can only warn and ignore the option if not recognized
++    # So say no if there are warnings
++      if test -s conftest.err; then
++	echo "$ac_t"no 1>&6
++	compiler_rtti_exceptions=no
++      else
++	echo "$ac_t"yes 1>&6
++	compiler_rtti_exceptions=yes
++      fi
++  else
++    # Append any errors to the config.log.
++    cat conftest.err 1>&5
++    compiler_rtti_exceptions=no
++    echo "$ac_t"no 1>&6
++  fi
++  CFLAGS="$save_CFLAGS"
++  $rm conftest*
++
++  if test "$compiler_rtti_exceptions" = "yes"; then
++    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
++  else
++    no_builtin_flag=' -fno-builtin'
++  fi
++  
++fi
++
+ # Check for any special shared library compilation flags.
+ if test -n "$special_shlib_compile_flags"; then
+   echo "$progname: warning: \`$CC' requires \`$special_shlib_compile_flags' to build shared libraries" 1>&2
+@@ -588,8 +960,8 @@
+ echo 'main(){return(0);}' > conftest.c
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $link_static_flag"
+-echo "$progname:591: checking if $compiler static flag $link_static_flag works" >&5
+-if { (eval echo $progname:592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++echo "$progname:963: checking if $compiler static flag $link_static_flag works" >&5
++if { (eval echo $progname:964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+   echo "$ac_t$link_static_flag" 1>&6
+ else
+   echo "$ac_t"none 1>&6
+@@ -601,9 +973,9 @@
+ if test -z "$LN_S"; then
+   # Check to see if we can use ln -s, or we need hard links.
+   echo $ac_n "checking whether ln -s works... $ac_c" 1>&6
+-  $rm conftestdata
+-  if ln -s X conftestdata 2>/dev/null; then
+-    $rm conftestdata
++  $rm conftest.dat
++  if ln -s X conftest.dat 2>/dev/null; then
++    $rm conftest.dat
+     LN_S="ln -s"
+   else
+     LN_S=ln
+@@ -621,11 +993,17 @@
+   if test "$with_gcc" = yes; then
+     # Check if gcc -print-prog-name=ld gives a path.
+     echo $ac_n "checking for ld used by GCC... $ac_c" 1>&6
+-    echo "$progname:624: checking for ld used by GCC" >&5
++    echo "$progname:996: checking for ld used by GCC" >&5
+     ac_prog=`($CC -print-prog-name=ld) 2>&5`
+     case "$ac_prog" in
+     # Accept absolute paths.
+-    /* | [A-Za-z]:\\*)
++    [\\/]* | [A-Za-z]:[\\/]*)
++      re_direlt='/[^/][^/]*/\.\./'
++      # Canonicalize the path of ld
++      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
++      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
++      done
+       test -z "$LD" && LD="$ac_prog"
+       ;;
+     "")
+@@ -639,17 +1017,17 @@
+     esac
+   elif test "$with_gnu_ld" = yes; then
+     echo $ac_n "checking for GNU ld... $ac_c" 1>&6
+-    echo "$progname:642: checking for GNU ld" >&5
++    echo "$progname:1020: checking for GNU ld" >&5
+   else
+     echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
+-    echo "$progname:645: checking for non-GNU ld" >&5
++    echo "$progname:1023: checking for non-GNU ld" >&5
+   fi
+ 
+   if test -z "$LD"; then
+-    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
+     for ac_dir in $PATH; do
+       test -z "$ac_dir" && ac_dir=.
+-      if test -f "$ac_dir/$ac_prog"; then
++      if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ 	LD="$ac_dir/$ac_prog"
+ 	# Check to see if the program is GNU ld.  I'd rather use --version,
+ 	# but apparently some GNU ld's only accept -v.
+@@ -691,48 +1069,208 @@
+ 
+ allow_undefined_flag=
+ no_undefined_flag=
++need_lib_prefix=unknown
++need_version=unknown
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
+ archive_cmds=
++archive_expsym_cmds=
+ old_archive_from_new_cmds=
+ export_dynamic_flag_spec=
++whole_archive_flag_spec=
++thread_safe_flag_spec=
+ hardcode_libdir_flag_spec=
+ hardcode_libdir_separator=
+ hardcode_direct=no
+ hardcode_minus_L=no
+ hardcode_shlibpath_var=unsupported
+ runpath_var=
++always_export_symbols=no
++export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
++# include_expsyms should be a list of space-separated symbols to be *always*
++# included in the symbol list
++include_expsyms=
++# exclude_expsyms can be an egrep regular expression of symbols to exclude
++# it will be wrapped by ` (' and `)$', so one must not match beginning or
++# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++# as well as any symbol that contains `d'.
++exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
++# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++# platforms (ab)use it in PIC code, but their linkers get confused if
++# the symbol is explicitly referenced.  Since portable code cannot
++# rely on this symbol name, it's probably fine to never include it in
++# preloaded symbol tables.
+ 
+ case "$host_os" in
+-amigaos* | sunos4*)
+-  # On these operating systems, we should treat GNU ld like the system ld.
+-  gnu_ld_acts_native=yes
+-  ;;
+-*)
+-  gnu_ld_acts_native=no
++cygwin* | mingw*)
++  # FIXME: the MSVC++ port hasn't been tested in a loooong time
++  # When not using gcc, we currently assume that we are using
++  # Microsoft Visual C++.
++  if test "$with_gcc" != yes; then
++    with_gnu_ld=no
++  fi
+   ;;
++
+ esac
+ 
+ ld_shlibs=yes
+-if test "$with_gnu_ld" = yes && test "$gnu_ld_acts_native" != yes; then
++if test "$with_gnu_ld" = yes; then
++  # If archive_cmds runs LD, not CC, wlarc should be empty
++  wlarc='${wl}'
+ 
+   # See if GNU ld supports shared libraries.
+-  if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+-    archive_cmds='$CC -shared ${wl}-soname $wl$soname -o $lib$libobjs'
+-    runpath_var=LD_RUN_PATH
+-    ld_shlibs=yes
+-  else
++  case "$host_os" in
++  aix3* | aix4*)
++    # On AIX, the GNU linker is very broken
+     ld_shlibs=no
+-  fi
++    cat <<EOF 1>&2
++
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
++
++EOF
++    ;;
++
++  amigaos*)
++    archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_minus_L=yes
++
++    # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
++    # that the semantics of dynamic libraries on AmigaOS, at least up
++    # to version 4, is to share data among multiple programs linked
++    # with the same dynamic library.  Since this doesn't match the
++    # behavior of shared libraries on other platforms, we can use
++    # them.
++    ld_shlibs=no
++    ;;
++
++  beos*)
++    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++      allow_undefined_flag=unsupported
++      # Joseph Beckenbach <jrb3@best.com> says some releases of gcc
++      # support --undefined.  This deserves some investigation.  FIXME
++      archive_cmds='$CC -nostart $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
++    else
++      ld_shlibs=no
++    fi
++    ;;
++
++  cygwin* | mingw*)
++    # hardcode_libdir_flag_spec is actually meaningless, as there is
++    # no search path for DLLs.
++    hardcode_libdir_flag_spec='-L$libdir'
++    allow_undefined_flag=unsupported
++    always_export_symbols=yes
++
++    # Extract the symbol export list from an `--export-all' def file,
++    # then regenerate the def file from the symbol export list, so that
++    # the compiled dll only exports the symbol export list.
++    # Be careful not to strip the DATA tag left by newer dlltools.
++    export_symbols_cmds='test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
++      test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~
++      $DLLTOOL --export-all --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --output-def $objdir/$soname-def  $objdir/$soname-ltdll.$objext $libobjs $convenience~
++      sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $objdir/$soname-def > $export_symbols'
++
++    # If DATA tags from a recent dlltool are present, honour them!
++    archive_expsym_cmds='echo EXPORTS > $objdir/$soname-def~
++      _lt_hint=1;
++      cat $export_symbols | while read symbol; do
++        set dummy \$symbol;
++        case \$# in
++          2) echo "	\$2 @ \$_lt_hint ; " >> $objdir/$soname-def;;
++          *) echo "     \$2 @ \$_lt_hint \$3 ; " >> $objdir/$soname-def;;
++        esac;
++	_lt_hint=`expr 1 + \$_lt_hint`;
++      done~
++      test -f $objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $0 > $objdir/$soname-ltdll.c~
++      test -f $objdir/$soname-ltdll.$objext || (cd $objdir && $CC -c $soname-ltdll.c)~
++      $CC -Wl,--base-file,$objdir/$soname-base -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~
++      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
++      $CC -Wl,--base-file,$objdir/$soname-base $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts~
++      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols DllMain@12,_cygwin_dll_entry@12,_cygwin_noncygwin_dll_entry@12 --def $objdir/$soname-def --base-file $objdir/$soname-base --output-exp $objdir/$soname-exp~
++      $CC $objdir/$soname-exp -Wl,--dll -nostartfiles -Wl,-e,__cygwin_dll_entry@12 -o $lib $objdir/$soname-ltdll.$objext $libobjs $deplibs $linkopts'
++
++      old_archive_from_new_cmds='$DLLTOOL --as=$AS --dllname $soname --def $objdir/$soname-def --output-lib $objdir/$libname.a' 
++    ;;
++
++  netbsd*)
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    else
++      archive_cmds='$LD -Bshareable $libobjs $deplibs $linkopts -o $lib'
++      # can we support soname and/or expsyms with a.out? -oliva
++    fi
++    ;;
++
++  solaris* | sysv5*)
++    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
++      ld_shlibs=no
++      cat <<EOF 1>&2
++
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++EOF
++    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    else
++      ld_shlibs=no
++    fi
++    ;;      
++
++  sunos4*)
++    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linkopts'
++    wlarc=
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    ;;
++
++  *)
++    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname -o $lib'
++      archive_expsym_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++    else
++      ld_shlibs=no
++    fi
++    ;;
++  esac
+ 
+   if test "$ld_shlibs" = yes; then
++    runpath_var=LD_RUN_PATH
+     hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+     export_dynamic_flag_spec='${wl}--export-dynamic'
++    case $host_os in
++    cygwin* | mingw*)
++      # dlltool doesn't understand --whole-archive et. al.
++      whole_archive_flag_spec=
++      ;;
++    *)
++      # ancient GNU ld didn't support --whole-archive et. al.
++      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
++        whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++        whole_archive_flag_spec=
++      fi
++      ;;
++    esac
+   fi
+ else
+   # PORTME fill in a description of your system's linker (not GNU ld)
+   case "$host_os" in
+   aix3*)
+     allow_undefined_flag=unsupported
+-    archive_cmds='$NM$libobjs | $global_symbol_pipe | sed '\''s/.* //'\'' > $lib.exp;$LD -o $objdir/$soname$libobjs -bE:$lib.exp -T512 -H512 -bM:SRE;$AR cru $lib $objdir/$soname'
++    always_export_symbols=yes
++    archive_expsym_cmds='$LD -o $objdir/$soname $libobjs $deplibs $linkopts -bE:$export_symbols -T512 -H512 -bM:SRE~$AR cru $lib $objdir/$soname'
+     # Note: this linker hardcodes the directories in LIBPATH if there
+     # are no directories specified by -L.
+     hardcode_minus_L=yes
+@@ -744,16 +1282,67 @@
+     ;;
+ 
+   aix4*)
+-    allow_undefined_flag=unsupported
+-    archive_cmds='$NM$libobjs | $global_symbol_pipe | sed '\''s/.* //'\'' > $lib.exp;$CC -o $objdir/$soname$libobjs ${wl}-bE:$lib.exp ${wl}-bM:SRE ${wl}-bnoentry;$AR cru $lib $objdir/$soname'
+-    hardcode_direct=yes
+-    hardcode_minus_L=yes
+-    ;;
++    hardcode_libdir_flag_spec='${wl}-b ${wl}nolibpath ${wl}-b ${wl}libpath:$libdir:/usr/lib:/lib'
++    hardcode_libdir_separator=':'
++    if test "$with_gcc" = yes; then
++      collect2name=`${CC} -print-prog-name=collect2`
++      if test -f "$collect2name" && \
++	 strings "$collect2name" | grep resolve_lib_name >/dev/null
++      then
++	# We have reworked collect2
++	hardcode_direct=yes
++      else
++	# We have old collect2
++	hardcode_direct=unsupported
++	# It fails to find uninstalled libraries when the uninstalled
++	# path is not listed in the libpath.  Setting hardcode_minus_L
++	# to unsupported forces relinking
++	hardcode_minus_L=yes
++	hardcode_libdir_flag_spec='-L$libdir'
++	hardcode_libdir_separator=
++      fi
++      shared_flag='-shared'
++    else
++      shared_flag='${wl}-bM:SRE'
++      hardcode_direct=yes
++    fi
++    allow_undefined_flag=' ${wl}-berok'
++    archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}'
++    archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}'
++    case "$host_os" in aix4.[01]|aix4.[01].*)
++      # According to Greg Wooledge, -bexpall is only supported from AIX 4.2 on
++      always_export_symbols=yes ;;
++    esac
++   ;;
+ 
+   amigaos*)
+-    archive_cmds='$rm $objdir/a2ixlibrary.data;$echo "#define NAME $libname" > $objdir/a2ixlibrary.data;$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data;$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data;$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data;$AR cru $lib$libobjs;$RANLIB $lib;(cd $objdir && a2ixlibrary -32)'
++    archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)'
+     hardcode_libdir_flag_spec='-L$libdir'
+     hardcode_minus_L=yes
++    # see comment about different semantics on the GNU ld section
++    ld_shlibs=no
++    ;;
++
++  cygwin* | mingw*)
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    # hardcode_libdir_flag_spec is actually meaningless, as there is
++    # no search path for DLLs.
++    hardcode_libdir_flag_spec=' '
++    allow_undefined_flag=unsupported
++    # Tell ltmain to make .lib files, not .a files.
++    libext=lib
++    # FIXME: Setting linknames here is a bad hack.
++    archive_cmds='$CC -o $lib $libobjs $linkopts `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
++    # The linker will automatically build a .lib file if we build a DLL.
++    old_archive_from_new_cmds='true'
++    # FIXME: Should let the user specify the lib program.
++    old_archive_cmds='lib /OUT:$oldlib$oldobjs'
++    fix_srcfile_path='`cygpath -w $srcfile`'
++    ;;
++
++  freebsd1*)
++    ld_shlibs=no
+     ;;
+ 
+   # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+@@ -761,61 +1350,85 @@
+   # does not break anything, and helps significantly (at the cost of a little
+   # extra space).
+   freebsd2.2*)
+-    archive_cmds='$LD -Bshareable -o $lib$libobjs /usr/lib/c++rt0.o'
++    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts /usr/lib/c++rt0.o'
+     hardcode_libdir_flag_spec='-R$libdir'
+     hardcode_direct=yes
+-    hardcode_minus_L=yes
+     hardcode_shlibpath_var=no
+     ;;
+ 
+   # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+   freebsd2*)
+-    archive_cmds='$LD -Bshareable -o $lib$libobjs'
++    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+     hardcode_direct=yes
+     hardcode_minus_L=yes
+     hardcode_shlibpath_var=no
+     ;;
+ 
+-  # FreeBSD 3, at last, uses gcc -shared to do shared libraries.
+-  freebsd3*)
+-    archive_cmds='$CC -shared -o $lib$libobjs'
++  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++  freebsd*)
++    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $linkopts'
+     hardcode_libdir_flag_spec='-R$libdir'
+     hardcode_direct=yes
+-    hardcode_minus_L=yes
+     hardcode_shlibpath_var=no
+     ;;
+ 
+-  hpux9*)
+-    archive_cmds='$rm $objdir/$soname;$LD -b +s +b $install_libdir -o $objdir/$soname$libobjs;mv $objdir/$soname $lib'
+-    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++  darwin[15]* | rhapsody*)
++    allow_undefined_flag='-undefined error'
++    archive_cmds='$CC $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
++    # We need to add '_' to the symbols in $export_symbols first
++    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols $lib'
+     hardcode_direct=yes
+-    hardcode_minus_L=yes
+-    export_dynamic_flag_spec='${wl}-E'
++    hardcode_shlibpath_var=no
++    whole_archive_flag_spec='-all_load $convenience'
++    ;;
++
++  # Mac OS X v10.2 uses bash for /bin/sh instead of zsh, and the quoting syntax is incompatible
++  darwin*)
++    allow_undefined_flag='-undefined error'
++    archive_cmds='$CC $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts $(test x$module != xyes && echo -install_name $rpath/$soname $tmp_verstring)'
++    # We need to add '_' to the symbols in $export_symbols first
++    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols $lib'
++    hardcode_direct=yes
++    hardcode_shlibpath_var=no
++    whole_archive_flag_spec='-all_load $convenience'
+     ;;
+ 
+-  hpux10*)
+-    archive_cmds='$LD -b +h $soname +s +b $install_libdir -o $lib$libobjs'
++  hpux9* | hpux10* | hpux11*)
++    case "$host_os" in
++    hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;;
++    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linkopts' ;;
++    esac
+     hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
++    hardcode_libdir_separator=:
+     hardcode_direct=yes
+-    hardcode_minus_L=yes
++    hardcode_minus_L=yes # Not in the search PATH, but as the default
++			 # location of the library.
+     export_dynamic_flag_spec='${wl}-E'
+     ;;
+ 
+   irix5* | irix6*)
+-    archive_cmds='$LD -shared -o $lib -soname $soname -set_version $verstring$libobjs'
++    if test "$with_gcc" = yes; then
++      archive_cmds='$CC -shared $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++    else
++      archive_cmds='$LD -shared $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++    fi
+     hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    hardcode_libdir_separator=:
+     ;;
+ 
+   netbsd*)
+-    # Tested with NetBSD 1.2 ld
+-    archive_cmds='$LD -Bshareable -o $lib$libobjs'
+-    hardcode_libdir_flag_spec='-R$libdir'
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'  # a.out
++    else
++      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linkopts'      # ELF
++    fi
++    hardcode_libdir_flag_spec='${wl}-R$libdir'
+     hardcode_direct=yes
+     hardcode_shlibpath_var=no
+     ;;
+ 
+   openbsd*)
+-    archive_cmds='$LD -Bshareable -o $lib$libobjs'
++    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
+     hardcode_libdir_flag_spec='-R$libdir'
+     hardcode_direct=yes
+     hardcode_shlibpath_var=no
+@@ -825,88 +1438,163 @@
+     hardcode_libdir_flag_spec='-L$libdir'
+     hardcode_minus_L=yes
+     allow_undefined_flag=unsupported
+-    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $objdir/$libname.def;$echo "DESCRIPTION \"$libname\"" >> $objdir/$libname.def;$echo DATA >> $objdir/$libname.def;$echo " SINGLE NONSHARED" >> $objdir/$libname.def;$echo EXPORTS >> $objdir/$libname.def;emxexp$libobjs >> $objdir/$libname.def;$CC -Zdll -Zcrtdll -o $lib$libobjs $objdir/$libname.def'
++    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $objdir/$libname.def~$echo DATA >> $objdir/$libname.def~$echo " SINGLE NONSHARED" >> $objdir/$libname.def~$echo EXPORTS >> $objdir/$libname.def~emxexp $libobjs >> $objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $linkopts $objdir/$libname.def'
+     old_archive_from_new_cmds='emximp -o $objdir/$libname.a $objdir/$libname.def'
+     ;;
+ 
+-  osf3* | osf4*)
+-    allow_undefined_flag=' -expect_unresolved \*'
+-    archive_cmds='$LD -shared${allow_undefined_flag} -o $lib -soname $soname -set_version $verstring$libobjs$deplibs'
++  osf3*)
++    if test "$with_gcc" = yes; then
++      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++    else
++      allow_undefined_flag=' -expect_unresolved \*'
++      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++    fi
+     hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+     hardcode_libdir_separator=:
+     ;;
+ 
++  osf4* | osf5*)  # As osf3* with the addition of the -msym flag
++    if test "$with_gcc" = yes; then
++      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
++      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $linkopts ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++    else
++      allow_undefined_flag=' -expect_unresolved \*'
++      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linkopts -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++    fi
++    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
++    hardcode_libdir_separator=:
++    ;;
++                                       
+   sco3.2v5*)
+-    archive_cmds='$LD -G -o $lib$libobjs'
+-    hardcode_direct=yes
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
++    hardcode_shlibpath_var=no
++    runpath_var=LD_RUN_PATH
++    hardcode_runpath_var=yes
+     ;;
+ 
+-  solaris2*)
++  solaris*)
+     no_undefined_flag=' -z text'
+-    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib$libobjs'
++    # $CC -shared without GNU ld will not create a library from C++
++    # object files and a static libstdc++, better avoid it by now
++    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts'
++    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp'
+     hardcode_libdir_flag_spec='-R$libdir'
+     hardcode_shlibpath_var=no
+-
+-    # Solaris 2 before 2.5 hardcodes -L paths.
+     case "$host_os" in
+-    solaris2.[0-4]*)
+-      hardcode_minus_L=yes
+-      ;;
++    solaris2.[0-5] | solaris2.[0-5].*) ;;
++    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
++      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+     esac
+     ;;
+ 
+   sunos4*)
+-    if test "$with_gcc" = yes; then
+-      archive_cmds='$CC -shared -o $lib$libobjs'
+-    else
+-      archive_cmds='$LD -assert pure-text -Bstatic -o $lib$libobjs'
+-    fi
+-
+-    if test "$with_gnu_ld" = yes; then
+-      export_dynamic_flag_spec='${wl}-export-dynamic'
+-    fi
++    archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linkopts'
+     hardcode_libdir_flag_spec='-L$libdir'
+     hardcode_direct=yes
+     hardcode_minus_L=yes
+     hardcode_shlibpath_var=no
+     ;;
+ 
+-  uts4*)
+-    archive_cmds='$LD -G -h $soname -o $lib$libobjs'
+-    hardcode_libdir_flag_spec='-L$libdir'
+-    hardcode_direct=no
+-    hardcode_minus_L=no
++  sysv4)
++    if test "x$host_vendor" = xsequent; then
++      # Use $CC to link under sequent, because it throws in some extra .o 
++      # files that make .init and .fini sections work.
++      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $linkopts'
++    else
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
++    fi
++    runpath_var='LD_RUN_PATH'
++    hardcode_shlibpath_var=no
++    hardcode_direct=no #Motorola manual says yes, but my tests say they lie 
++    ;;  
++
++  sysv4.3*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
++    hardcode_shlibpath_var=no
++    export_dynamic_flag_spec='-Bexport'
++    ;;
++
++  sysv5*)
++    no_undefined_flag=' -z text'
++    # $CC -shared without GNU ld will not create a library from C++
++    # object files and a static libstdc++, better avoid it by now
++    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linkopts'
++    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linkopts~$rm $lib.exp'
++    hardcode_libdir_flag_spec=
++    hardcode_shlibpath_var=no
++    runpath_var='LD_RUN_PATH'
++    ;;
++
++  uts4*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_shlibpath_var=no
++    ;;
++
++  dgux*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
++    hardcode_libdir_flag_spec='-L$libdir'
++    hardcode_shlibpath_var=no
++    ;;
++
++  sysv4*MP*)
++    if test -d /usr/nec; then
++      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
++      hardcode_shlibpath_var=no
++      runpath_var=LD_RUN_PATH
++      hardcode_runpath_var=yes
++      ld_shlibs=yes
++    fi
++    ;;
++
++  sysv4.2uw2*)
++    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linkopts'
++    hardcode_direct=yes
++    hardcode_minus_L=no
++    hardcode_shlibpath_var=no
++    hardcode_runpath_var=yes
++    runpath_var=LD_RUN_PATH
++    ;;
++
++  unixware7*)
++    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linkopts'
++    runpath_var='LD_RUN_PATH'
+     hardcode_shlibpath_var=no
+     ;;
+ 
+   *)
+     ld_shlibs=no
+-    can_build_shared=no
+     ;;
+   esac
+ fi
+ echo "$ac_t$ld_shlibs" 1>&6
++test "$ld_shlibs" = no && can_build_shared=no
+ 
+ if test -z "$NM"; then
+   echo $ac_n "checking for BSD-compatible nm... $ac_c" 1>&6
+   case "$NM" in
+-  /* | [A-Za-z]:\\*) ;; # Let the user override the test with a path.
++  [\\/]* | [A-Za-z]:[\\/]*) ;; # Let the user override the test with a path.
+   *)
+-    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+-    for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do
++    IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR}"
++    for ac_dir in $PATH /usr/ucb /usr/ccs/bin /bin; do
+       test -z "$ac_dir" && ac_dir=.
+-      if test -f $ac_dir/nm; then
+-        # Check to see if the nm accepts a BSD-compat flag.
+-        # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+-        #   nm: unknown option "B" ignored
+-        if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+-          NM="$ac_dir/nm -B"
+-        elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+-          NM="$ac_dir/nm -p"
++      if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext; then
++	# Check to see if the nm accepts a BSD-compat flag.
++	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
++	#   nm: unknown option "B" ignored
++	if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
++	  NM="$ac_dir/nm -B"
++	  break
++	elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
++	  NM="$ac_dir/nm -p"
++	  break
+ 	else
+-          NM="$ac_dir/nm"
++	  NM=${NM="$ac_dir/nm"} # keep the first match, but
++	  continue # so that we can try to find one that supports BSD flags
+ 	fi
+-        break
+       fi
+     done
+     IFS="$ac_save_ifs"
+@@ -923,40 +1611,54 @@
+ # [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+ 
+ # Character class describing NM global symbol codes.
+-symcode='[BCDEGRSTU]'
++symcode='[BCDEGRST]'
+ 
+ # Regexp to match symbols that can be accessed directly from C.
+ sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+ 
+ # Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \1'
++symxfrm='\1 \2\3 \3'
++
++# Transform an extracted symbol line into a proper C declaration
++global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
+ 
+ # Define system-specific variables.
+ case "$host_os" in
+ aix*)
+-  symcode='[BCDTU]'
++  symcode='[BCDT]'
++  ;;
++cygwin* | mingw*)
++  symcode='[ABCDGISTW]'
++  ;;
++hpux*) # Its linker distinguishes data from code symbols
++  global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^. .* \(.*\)$/extern char \1;/p'"
+   ;;
+ irix*)
+-  # Cannot use undefined symbols on IRIX because inlined functions mess us up.
+   symcode='[BCDEGRST]'
+   ;;
+-solaris2*)
+-  symcode='[BDTU]'
++solaris*)
++  symcode='[BDT]'
++  ;;
++sysv4)
++  symcode='[DFNSTU]'
+   ;;
+ esac
+ 
+ # If we're using GNU nm, then use its standard symbol codes.
+ if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
+-  symcode='[ABCDGISTUW]'
++  symcode='[ABCDGISTW]'
+ fi
+ 
+-# Write the raw and C identifiers.
+-global_symbol_pipe="sed -n -e 's/^.* $symcode $sympat$/$symxfrm/p'"
++# Try without a prefix undercore, then with it.
++for ac_symprfx in "" "_"; do
+ 
+-# Check to see that the pipe works correctly.
+-pipe_works=no
+-$rm conftest*
+-cat > conftest.c <<EOF
++  # Write the raw and C identifiers.
++  global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode\)[ 	][ 	]*\($ac_symprfx\)$sympat$/$symxfrm/p'"
++
++  # Check to see that the pipe works correctly.
++  pipe_works=no
++  $rm conftest*
++  cat > conftest.c <<EOF
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -968,93 +1670,100 @@
+ main(){nm_test_var='a';nm_test_func();return(0);}
+ EOF
+ 
+-echo "$progname:971: checking if global_symbol_pipe works" >&5
+-if { (eval echo $progname:972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.o; then
+-  # Now try to grab the symbols.
+-  nlist=conftest.nm
+-  if { echo "$progname:975: eval \"$NM conftest.o | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.o | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
+-
+-    # Try sorting and uniquifying the output.
+-    if sort "$nlist" | uniq > "$nlist"T; then
+-      mv -f "$nlist"T "$nlist"
+-      wcout=`wc "$nlist" 2>/dev/null`
+-      count=`$echo "X$wcout" | $Xsed -e 's/^[ 	]*\([0-9][0-9]*\).*$/\1/'`
+-      (test "$count" -ge 0) 2>/dev/null || count=-1
+-    else
+-      rm -f "$nlist"T
+-      count=-1
+-    fi
++  echo "$progname:1662: checking if global_symbol_pipe works" >&5
++  if { (eval echo $progname:1663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } && test -s conftest.$objext; then
++    # Now try to grab the symbols.
++    nlist=conftest.nm
++    if { echo "$progname:1666: eval \"$NM conftest.$objext | $global_symbol_pipe > $nlist\"" >&5; eval "$NM conftest.$objext | $global_symbol_pipe > $nlist 2>&5"; } && test -s "$nlist"; then
++
++      # Try sorting and uniquifying the output.
++      if sort "$nlist" | uniq > "$nlist"T; then
++	mv -f "$nlist"T "$nlist"
++      else
++	rm -f "$nlist"T
++      fi
+ 
+-    # Make sure that we snagged all the symbols we need.
+-    if egrep ' nm_test_var$' "$nlist" >/dev/null; then
+-      if egrep ' nm_test_func$' "$nlist" >/dev/null; then
+-	cat <<EOF > conftest.c
++      # Make sure that we snagged all the symbols we need.
++      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
++	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
++	  cat <<EOF > conftest.c
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+ 
+ EOF
+-        # Now generate the symbol file.
+-        sed 's/^.* \(.*\)$/extern char \1;/' < "$nlist" >> conftest.c
++	  # Now generate the symbol file.
++	  eval "$global_symbol_to_cdecl"' < "$nlist" >> conftest.c'
+ 
+-	cat <<EOF >> conftest.c
++	  cat <<EOF >> conftest.c
+ #if defined (__STDC__) && __STDC__
+-# define __ptr_t void *
++# define lt_ptr_t void *
+ #else
+-# define __ptr_t char *
++# define lt_ptr_t char *
++# define const
+ #endif
+ 
+-/* The number of symbols in dld_preloaded_symbols, -1 if unsorted. */
+-int dld_preloaded_symbol_count = $count;
+-
+ /* The mapping between symbol names and symbols. */
+-struct {
+-  char *name;
+-  __ptr_t address;
++const struct {
++  const char *name;
++  lt_ptr_t address;
+ }
+-dld_preloaded_symbols[] =
++lt_preloaded_symbols[] =
+ {
+ EOF
+-        sed 's/^\(.*\) \(.*\)$/  {"\1", (__ptr_t) \&\2},/' < "$nlist" >> conftest.c
+-        cat <<\EOF >> conftest.c
+-  {0, (__ptr_t) 0}
++	  sed 's/^. \(.*\) \(.*\)$/  {"\2", (lt_ptr_t) \&\2},/' < "$nlist" >> conftest.c
++	  cat <<\EOF >> conftest.c
++  {0, (lt_ptr_t) 0}
+ };
+ 
+ #ifdef __cplusplus
+ }
+ #endif
+ EOF
+-        # Now try linking the two files.
+-        mv conftest.o conftestm.o
+-	save_LIBS="$LIBS"
+-	save_CFLAGS="$CFLAGS"
+-        LIBS='conftestm.o'
+-	CFLAGS="$CFLAGS$no_builtin_flag"
+-        if { (eval echo $progname:1033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+-          pipe_works=yes
+-        else
+-          echo "$progname: failed program was:" >&5
+-          cat conftest.c >&5
+-        fi
+-        LIBS="$save_LIBS"
++	  # Now try linking the two files.
++	  mv conftest.$objext conftstm.$objext
++	  save_LIBS="$LIBS"
++	  save_CFLAGS="$CFLAGS"
++	  LIBS="conftstm.$objext"
++	  CFLAGS="$CFLAGS$no_builtin_flag"
++	  if { (eval echo $progname:1718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++	    pipe_works=yes
++	  else
++	    echo "$progname: failed program was:" >&5
++	    cat conftest.c >&5
++	  fi
++	  LIBS="$save_LIBS"
++	else
++	  echo "cannot find nm_test_func in $nlist" >&5
++	fi
+       else
+-        echo "cannot find nm_test_func in $nlist" >&5
++	echo "cannot find nm_test_var in $nlist" >&5
+       fi
+     else
+-      echo "cannot find nm_test_var in $nlist" >&5
++      echo "cannot run $global_symbol_pipe" >&5
+     fi
+   else
+-    echo "cannot run $global_symbol_pipe" >&5
++    echo "$progname: failed program was:" >&5
++    cat conftest.c >&5
+   fi
++  $rm conftest* conftst*
++
++  # Do not use the global_symbol_pipe unless it works.
++  if test "$pipe_works" = yes; then
++    break
++  else
++    global_symbol_pipe=
++  fi
++done
++if test "$pipe_works" = yes; then
++  echo "${ac_t}ok" 1>&6
+ else
+-  echo "$progname: failed program was:" >&5
+-  cat conftest.c >&5
++  echo "${ac_t}failed" 1>&6
+ fi
+-$rm conftest*
+ 
+-# Do not use the global_symbol_pipe unless it works.
+-echo "$ac_t$pipe_works" 1>&6
+-test "$pipe_works" = yes || global_symbol_pipe=
++if test -z "$global_symbol_pipe"; then
++  global_symbol_to_cdecl=
++fi
+ 
+ # Check hardcoding attributes.
+ echo $ac_n "checking how to hardcode library paths into programs... $ac_c" 1>&6
+@@ -1063,35 +1772,32 @@
+    test -n "$runpath_var"; then
+ 
+   # We can hardcode non-existant directories.
+-  if test "$hardcode_direct" != no && \
+-     test "$hardcode_minus_L" != no && \
+-     test "$hardcode_shlibpath_var" != no; then
+-
++  if test "$hardcode_direct" != no &&
++     # If the only mechanism to avoid hardcoding is shlibpath_var, we
++     # have to relink, otherwise we might link with an installed library
++     # when we should be linking with a yet-to-be-installed one
++     ## test "$hardcode_shlibpath_var" != no &&
++     test "$hardcode_minus_L" != no; then
+     # Linking always hardcodes the temporary library directory.
+     hardcode_action=relink
+   else
+     # We can link without hardcoding, and we can hardcode nonexisting dirs.
+     hardcode_action=immediate
+   fi
+-elif test "$hardcode_direct" != yes && \
+-     test "$hardcode_minus_L" != yes && \
+-     test "$hardcode_shlibpath_var" != yes; then
+-  # We cannot hardcode anything.
+-  hardcode_action=unsupported
+ else
+-  # We can only hardcode existing directories.
+-  hardcode_action=relink
++  # We cannot hardcode anything, or else we can only hardcode existing
++  # directories.
++  hardcode_action=unsupported
+ fi
+ echo "$ac_t$hardcode_action" 1>&6
+-test "$hardcode_action" = unsupported && can_build_shared=no
+ 
+ 
+ reload_flag=
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
+ echo $ac_n "checking for $LD option to reload object files... $ac_c" 1>&6
+-# PORTME Some linker may need a different reload flag.
++# PORTME Some linkers may need a different reload flag.
+ reload_flag='-r'
+-echo "$ac_t$reload_flag"
++echo "$ac_t$reload_flag" 1>&6
+ test -n "$reload_flag" && reload_flag=" $reload_flag"
+ 
+ # PORTME Fill in your ld.so characteristics
+@@ -1103,18 +1809,45 @@
+ finish_cmds=
+ finish_eval=
+ shlibpath_var=
++shlibpath_overrides_runpath=unknown
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+-
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++file_magic_cmd=
++file_magic_test_file=
++deplibs_check_method='unknown'
++# Need to set the preceding variable on all platforms that support
++# interlibrary dependencies.
++# 'none' -- dependencies not supported.
++# `unknown' -- same as none, but documents that we really don't know.
++# 'pass_all' -- all dependencies passed with no checks.
++# 'test_compile' -- check by making test program.
++# 'file_magic [regex]' -- check by looking for files in library path
++# which responds to the $file_magic_cmd with a given egrep regex.
++# If you have `file' or equivalent on your system and you're not sure
++# whether `pass_all' will *always* work, you probably want this one.
+ echo $ac_n "checking dynamic linker characteristics... $ac_c" 1>&6
+ case "$host_os" in
+-aix3* | aix4*)
++aix3*)
+   version_type=linux
+-  library_names_spec='${libname}${release}.so.$versuffix $libname.a'
++  library_names_spec='${libname}${release}.so$versuffix $libname.a'
+   shlibpath_var=LIBPATH
+ 
+   # AIX has no versioning support, so we append a major version to the name.
+-  soname_spec='${libname}${release}.so.$major'
++  soname_spec='${libname}${release}.so$major'
++  ;;
++
++aix4*)
++  version_type=linux
++  # AIX has no versioning support, so currently we can not hardcode correct
++  # soname into executable. Probably we can add versioning support to
++  # collect2, so additional links can be useful in future.
++  # We preserve .a as extension for shared libraries though AIX4.2
++  # and later linker supports .so
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.a'
++  shlibpath_var=LIBPATH
++  deplibs_check_method=pass_all
+   ;;
+ 
+ amigaos*)
+@@ -1123,36 +1856,166 @@
+   finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
+   ;;
+ 
+-freebsd2* | freebsd3*)
+-  version_type=sunos
+-  library_names_spec='${libname}${release}.so.$versuffix $libname.so'
+-  finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
++beos*)
++  library_names_spec='${libname}.so'
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  deplibs_check_method=pass_all
++  lt_cv_dlopen="load_add_on"
++  lt_cv_dlopen_libs=
++  lt_cv_dlopen_self=yes
++  ;;
++
++bsdi4*)
++  version_type=linux
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
++  deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
++  file_magic_cmd=/usr/bin/file
++  file_magic_test_file=/shlib/libc.so
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  export_dynamic_flag_spec=-rdynamic
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
++
++cygwin* | mingw*)
++  version_type=windows
++  need_version=no
++  need_lib_prefix=no
++  if test "$with_gcc" = yes; then
++    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.a'
++  else
++    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
++  fi
++  dynamic_linker='Win32 ld.exe'
++  deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++  file_magic_cmd='${OBJDUMP} -f'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  lt_cv_dlopen="LoadLibrary"
++  lt_cv_dlopen_libs=
++  ;;
++
++freebsd1*)
++  dynamic_linker=no
++  ;;
++  
++freebsd*)
++  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  version_type=freebsd-$objformat
++  case "$version_type" in
++    freebsd-elf*)
++      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
++      file_magic_cmd=/usr/bin/file
++      file_magic_test_file=`echo /usr/lib/libc.so*`
++      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
++      deplibs_check_method=unknown
++      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case "$host_os" in
++  freebsd2* | freebsd3.[01]* | freebsdelf3.[01]*)
++    shlibpath_overrides_runpath=yes
++    ;;
++  *) # from 3.2 on
++    shlibpath_overrides_runpath=no
++    ;;
++  esac
++  ;;
++
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
++  deplibs_check_method='file_magic Mach-O dynamically linked shared library'
++  file_magic_cmd='/usr/bin/file -L'
++  case "$host_os" in
++  rhapsody* | darwin1.[012])
++    file_magic_test_file='/System/Library/Frameworks/System.framework/System'
++    ;;
++  *) # Darwin 1.3 on
++    file_magic_test_file='/usr/lib/libSystem.dylib'
++    ;;
++  esac
++  library_names_spec='${libname}${release}${versuffix}.$(test x$module = xyes && echo so || echo dylib) ${libname}${release}${major}.$(test x$module = xyes && echo so || echo dylib) ${libname}.$(test x$module = xyes && echo so || echo dylib)'
++  soname_spec='${libname}${release}${major}.$(test x$module = xyes && echo so || echo dylib)'
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
+   ;;
+ 
+ gnu*)
+-  version_type=sunos
+-  library_names_spec='${libname}${release}.so.$versuffix'
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
++  soname_spec='${libname}${release}.so$major'
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-hpux9* | hpux10*)
++hpux9* | hpux10* | hpux11*)
+   # Give a soname corresponding to the major version so that dld.sl refuses to
+   # link against other versions.
+   dynamic_linker="$host_os dld.sl"
+   version_type=sunos
++  need_lib_prefix=no
++  need_version=no
+   shlibpath_var=SHLIB_PATH
+-  library_names_spec='${libname}${release}.sl.$versuffix ${libname}${release}.sl.$major $libname.sl'
+-  soname_spec='${libname}${release}.sl.$major'
++  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
++  soname_spec='${libname}${release}.sl$major'
+   # HP-UX runs *really* slowly unless shared libraries are mode 555.
+   postinstall_cmds='chmod 555 $lib'
++  case "$host_os" in
++  hpux10.20*)
++    # TODO:  Does this work for hpux-11 too?
++    deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
++    file_magic_cmd=/usr/bin/file
++    file_magic_test_file=/usr/lib/libc.sl
++    ;;
++  esac
+   ;;
+ 
+ irix5* | irix6*)
+-  version_type=osf
+-  soname_spec='${libname}${release}.so'
+-  library_names_spec='${libname}${release}.so.$versuffix $libname.so'
+-  shlibpath_var=LD_LIBRARY_PATH
++  version_type=irix
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}.so.$major'
++  library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major ${libname}${release}.so $libname.so'
++  case "$host_os" in
++  irix5*)
++    libsuff= shlibsuff=
++    # this will be overridden with pass_all, but let us keep it just in case
++    deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
++    ;;
++  *)
++    case "$LD" in # libtool.m4 will add one of these switches to LD
++    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  file_magic_cmd=/usr/bin/file
++  file_magic_test_file=`echo /lib${libsuff}/libc.so*`
++  deplibs_check_method='pass_all'
+   ;;
+ 
+ # No shared lib support for Linux oldld, aout, or coff.
+@@ -1163,10 +2026,14 @@
+ # This must be Linux ELF.
+ linux-gnu*)
+   version_type=linux
+-  library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so'
+-  soname_spec='${libname}${release}.so.$major'
+-  finish_cmds='PATH="$PATH:/sbin" ldconfig -n $libdir'
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  deplibs_check_method=pass_all
+ 
+   if test -f /lib/ld.so.1; then
+     dynamic_linker='GNU ld.so'
+@@ -1179,85 +2046,200 @@
+   fi
+   ;;
+ 
+-netbsd* | openbsd*)
++netbsd*)
++  version_type=sunos
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
++    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
++    soname_spec='${libname}${release}.so$major'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++openbsd*)
+   version_type=sunos
+-  library_names_spec='${libname}${release}.so.$versuffix'
+-  finish_cmds='PATH="$PATH:/sbin" ldconfig -m $libdir'
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++    need_version=no
++  fi
++  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+ os2*)
+   libname_spec='$name'
++  need_lib_prefix=no
+   library_names_spec='$libname.dll $libname.a'
+   dynamic_linker='OS/2 ld.exe'
+   shlibpath_var=LIBPATH
+   ;;
+ 
+-osf3* | osf4*)
++osf3* | osf4* | osf5*)
+   version_type=osf
++  need_version=no
+   soname_spec='${libname}${release}.so'
+-  library_names_spec='${libname}${release}.so.$versuffix $libname.so'
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
+   shlibpath_var=LD_LIBRARY_PATH
++  # this will be overridden with pass_all, but let us keep it just in case
++  deplibs_check_method='file_magic COFF format alpha shared library'
++  file_magic_cmd=/usr/bin/file
++  file_magic_test_file=/shlib/libc.so
++  deplibs_check_method='pass_all'
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+   ;;
+ 
+ sco3.2v5*)
+   version_type=osf
+-  soname_spec='${libname}${release}.so.$major'
+-  library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-solaris2*)
++solaris*)
+   version_type=linux
+-  library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so'
+-  soname_spec='${libname}${release}.so.$major'
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
+   shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
++  deplibs_check_method="file_magic ELF [0-9][0-9]-bit [LM]SB dynamic lib"
++  file_magic_cmd=/usr/bin/file
++  file_magic_test_file=/lib/libc.so
+   ;;
+ 
+ sunos4*)
+   version_type=sunos
+-  library_names_spec='${libname}${release}.so.$versuffix'
+-  finish_cmds='PATH="$PATH:/usr/etc" ldconfig $libdir'
++  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
+   ;;
+ 
+-sysv4.2uw2*)
++sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+   version_type=linux
+-  library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so'
+-  soname_spec='${libname}${release}.so.$major'
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
+   shlibpath_var=LD_LIBRARY_PATH
++  case "$host_vendor" in
++    sequent)
++      file_magic_cmd='/bin/file'
++      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
++      ;;
++    ncr)
++      deplibs_check_method='pass_all'
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
++      file_magic_cmd=/usr/bin/file
++      file_magic_test_file=`echo /usr/lib/libc.so*`
++      ;;
++  esac
+   ;;
+ 
+ uts4*)
+   version_type=linux
+-  library_names_spec='${libname}${release}.so.$versuffix ${libname}${release}.so.$major $libname.so'
+-  soname_spec='${libname}${release}.so.$major'
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}.so$major'
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
++    soname_spec='$libname.so.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
++
+ *)
+   dynamic_linker=no
+   ;;
+ esac
+-echo "$ac_t$dynamic_linker"
++echo "$ac_t$dynamic_linker" 1>&6
+ test "$dynamic_linker" = no && can_build_shared=no
+ 
+ # Report the final consequences.
+ echo "checking if libtool supports shared libraries... $can_build_shared" 1>&6
+ 
++# Only try to build win32 dlls if AC_LIBTOOL_WIN32_DLL was used in
++# configure.in, otherwise build static only libraries.
++case "$host_os" in
++cygwin* | mingw* | os2*)
++  if test x$can_build_shared = xyes; then
++    test x$enable_win32_dll = xno && can_build_shared=no
++    echo "checking if package supports dlls... $can_build_shared" 1>&6
++  fi
++;;
++esac
++
++if test -n "$file_magic_test_file" && test -n "$file_magic_cmd"; then
++  case "$deplibs_check_method" in
++  "file_magic "*)
++    file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++    if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++       egrep "$file_magic_regex" > /dev/null; then
++      :
++    else
++      cat <<EOF 1>&2
++
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool@gnu.org
++
++EOF
++    fi ;;
++  esac
++fi
++
+ echo $ac_n "checking whether to build shared libraries... $ac_c" 1>&6
+ test "$can_build_shared" = "no" && enable_shared=no
+ 
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+ case "$host_os" in
+-aix*)
++aix3*)
+   test "$enable_shared" = yes && enable_static=no
+   if test -n "$RANLIB"; then
+-    archive_cmds="$archive_cmds;\$RANLIB \$lib"
++    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+     postinstall_cmds='$RANLIB $lib'
+   fi
+   ;;
++
++aix4*)
++  test "$enable_shared" = yes && enable_static=no
++  ;;
+ esac
+ 
+ echo "$ac_t$enable_shared" 1>&6
+@@ -1265,8 +2247,20 @@
+ # Make sure either enable_shared or enable_static is yes.
+ test "$enable_shared" = yes || enable_static=yes
+ 
++# Propagate what we've learned...
++ac_cv_can_build_shared="$can_build_shared"
++
+ echo "checking whether to build static libraries... $enable_static" 1>&6
+ 
++if test "$hardcode_action" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
++
+ echo $ac_n "checking for objdir... $ac_c" 1>&6
+ rm -f .libs 2>/dev/null
+ mkdir .libs 2>/dev/null
+@@ -1279,47 +2273,512 @@
+ rmdir .libs 2>/dev/null
+ echo "$ac_t$objdir" 1>&6
+ 
++if test "x$enable_dlopen" != xyes; then
++  enable_dlopen=unknown
++  enable_dlopen_self=unknown
++  enable_dlopen_self_static=unknown
++else
++if eval "test \"`echo '$''{'lt_cv_dlopen'+set}'`\" != set"; then
++  lt_cv_dlopen=no lt_cv_dlopen_libs=
++echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
++echo "$progname:2270: checking for dlopen in -ldl" >&5
++ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-ldl  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 2278 "ltconfig"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char dlopen();
++
++int main() {
++dlopen()
++; return 0; }
++EOF
++if { (eval echo $progname:2291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "$progname: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
++else
++  echo "$ac_t""no" 1>&6
++echo $ac_n "checking for dlopen""... $ac_c" 1>&6
++echo "$progname:2310: checking for dlopen" >&5
++if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 2315 "ltconfig"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char dlopen(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char dlopen();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_dlopen) || defined (__stub___dlopen)
++choke me
++#else
++dlopen();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo $progname:2340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_dlopen=yes"
++else
++  echo "$progname: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_dlopen=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  lt_cv_dlopen="dlopen"
++else
++  echo "$ac_t""no" 1>&6
++echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
++echo "$progname:2357: checking for dld_link in -ldld" >&5
++ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-ldld  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 2365 "ltconfig"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char dld_link();
++
++int main() {
++dld_link()
++; return 0; }
++EOF
++if { (eval echo $progname:2378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "$progname: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
++else
++  echo "$ac_t""no" 1>&6
++echo $ac_n "checking for shl_load""... $ac_c" 1>&6
++echo "$progname:2397: checking for shl_load" >&5
++if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 2402 "ltconfig"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char shl_load(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char shl_load();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_shl_load) || defined (__stub___shl_load)
++choke me
++#else
++shl_load();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo $progname:2427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_func_shl_load=yes"
++else
++  echo "$progname: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_shl_load=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  lt_cv_dlopen="shl_load"
++else
++  echo "$ac_t""no" 1>&6
++echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
++echo "$progname:2445: checking for shl_load in -ldld" >&5
++ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-ldld  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 2453 "ltconfig"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char shl_load();
++
++int main() {
++shl_load()
++; return 0; }
++EOF
++if { (eval echo $progname:2467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "$progname: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++
++fi
++
++    
++fi
++
++  
++fi
++
++
++fi
++
++fi
++
++  if test "x$lt_cv_dlopen" != xno; then
++    enable_dlopen=yes
++  fi
++
++  case "$lt_cv_dlopen" in
++  dlopen)
++for ac_hdr in dlfcn.h; do
++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
++echo "$progname:2510: checking for $ac_hdr" >&5
++if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  cat > conftest.$ac_ext <<EOF
++#line 2515 "ltconfig"
++#include <$ac_hdr>
++int fnord = 0;
++EOF
++ac_try="$ac_compile >/dev/null 2>conftest.out"
++{ (eval echo $progname:2520: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
++if test -z "$ac_err"; then
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=yes"
++else
++  echo "$ac_err" >&5
++  echo "$progname: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_header_$ac_safe=no"
++fi
++rm -f conftest*
++fi
++if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++    if test "x$ac_cv_header_dlfcn_h" = xyes; then
++      CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++    fi
++    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++    LIBS="$lt_cv_dlopen_libs $LIBS"
++
++  echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
++echo "$progname:2548: checking whether a program can dlopen itself" >&5
++if test "${lt_cv_dlopen_self+set}" = set; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test "$cross_compiling" = yes; then
++    lt_cv_dlopen_self=cross
++  else
++    cat > conftest.c <<EOF
++#line 2556 "ltconfig"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++# define LTDL_GLOBAL	RTLD_GLOBAL
++#else
++# ifdef DL_GLOBAL
++#  define LTDL_GLOBAL	DL_GLOBAL
++# else
++#  define LTDL_GLOBAL	0
++# endif
++#endif
++
++/* We may have to define LTDL_LAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LTDL_LAZY_OR_NOW
++# ifdef RTLD_LAZY
++#  define LTDL_LAZY_OR_NOW	RTLD_LAZY
++# else
++#  ifdef DL_LAZY
++#   define LTDL_LAZY_OR_NOW	DL_LAZY
++#  else
++#   ifdef RTLD_NOW
++#    define LTDL_LAZY_OR_NOW	RTLD_NOW
++#   else
++#    ifdef DL_NOW
++#     define LTDL_LAZY_OR_NOW	DL_NOW
++#    else
++#     define LTDL_LAZY_OR_NOW	0
++#    endif
++#   endif
++#  endif
++# endif
++#endif
++
++fnord() { int i=42;}
++main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
++    if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
++	       if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } 
++
++EOF
++if { (eval echo $progname:2602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++then
++  lt_cv_dlopen_self=yes
++else
++  echo "$progname: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -fr conftest*
++  lt_cv_dlopen_self=no
++fi
++rm -fr conftest*
++fi
++
++fi
++
++echo "$ac_t""$lt_cv_dlopen_self" 1>&6
++
++  if test "$lt_cv_dlopen_self" = yes; then
++    LDFLAGS="$LDFLAGS $link_static_flag"
++  echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
++echo "$progname:2621: checking whether a statically linked program can dlopen itself" >&5
++if test "${lt_cv_dlopen_self_static+set}" = set; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  if test "$cross_compiling" = yes; then
++    lt_cv_dlopen_self_static=cross
++  else
++    cat > conftest.c <<EOF
++#line 2629 "ltconfig"
++
++#if HAVE_DLFCN_H
++#include <dlfcn.h>
++#endif
++
++#include <stdio.h>
++
++#ifdef RTLD_GLOBAL
++# define LTDL_GLOBAL	RTLD_GLOBAL
++#else
++# ifdef DL_GLOBAL
++#  define LTDL_GLOBAL	DL_GLOBAL
++# else
++#  define LTDL_GLOBAL	0
++# endif
++#endif
++
++/* We may have to define LTDL_LAZY_OR_NOW in the command line if we
++   find out it does not work in some platform. */
++#ifndef LTDL_LAZY_OR_NOW
++# ifdef RTLD_LAZY
++#  define LTDL_LAZY_OR_NOW	RTLD_LAZY
++# else
++#  ifdef DL_LAZY
++#   define LTDL_LAZY_OR_NOW	DL_LAZY
++#  else
++#   ifdef RTLD_NOW
++#    define LTDL_LAZY_OR_NOW	RTLD_NOW
++#   else
++#    ifdef DL_NOW
++#     define LTDL_LAZY_OR_NOW	DL_NOW
++#    else
++#     define LTDL_LAZY_OR_NOW	0
++#    endif
++#   endif
++#  endif
++# endif
++#endif
++
++fnord() { int i=42;}
++main() { void *self, *ptr1, *ptr2; self=dlopen(0,LTDL_GLOBAL|LTDL_LAZY_OR_NOW);
++    if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
++    if(ptr1 || ptr2) { dlclose(self); exit(0); } } exit(1); } 
++
++EOF
++if { (eval echo $progname:2675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
++then
++  lt_cv_dlopen_self_static=yes
++else
++  echo "$progname: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -fr conftest*
++  lt_cv_dlopen_self_static=no
++fi
++rm -fr conftest*
++fi
++
++fi
++
++echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6
++fi
++    ;;
++  esac
++
++  case "$lt_cv_dlopen_self" in
++  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
++  *) enable_dlopen_self=unknown ;;
++  esac
++
++  case "$lt_cv_dlopen_self_static" in
++  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
++  *) enable_dlopen_self_static=unknown ;;
++  esac
++fi
++
+ # Copy echo and quote the copy, instead of the original, because it is
+ # used later.
+ ltecho="$echo"
++if test "X$ltecho" = "X$CONFIG_SHELL $0 --fallback-echo"; then
++   ltecho="$CONFIG_SHELL \$0 --fallback-echo"
++fi
++LTSHELL="$SHELL"
+ 
+-# Now quote all the things that may contain metacharacters.
+-for var in ltecho old_CC old_CFLAGS old_CPPFLAGS old_LD old_NM old_RANLIB \
+-  old_LN_S AR CC LD LN_S NM reload_flag reload_cmds wl pic_flag \
+-  link_static_flag no_builtin_flag export_dynamic_flag_spec \
+-  libname_spec library_names_spec soname_spec RANLIB \
+-  old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
+-  old_postuninstall_cmds archive_cmds postinstall_cmds postuninstall_cmds \
+-  allow_undefined_flag no_undefined_flag \
+-  finish_cmds finish_eval global_symbol_pipe \
+-  hardcode_libdir_flag_spec hardcode_libdir_separator; do
+-
+-  case "$var" in
+-  reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
+-  old_postinstall_cmds | old_postuninstall_cmds | archive_cmds | \
+-  postinstall_cmds | postuninstall_cmds | finish_cmds)
+-    # Double-quote double-evaled strings.
+-    eval "$var=\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\"\`"
+-    ;;
+-  *)
+-    eval "$var=\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`"
++LTCONFIG_VERSION="$VERSION"
++
++# Only quote variables if we're using ltmain.sh.
++case "$ltmain" in
++*.sh)
++  # Now quote all the things that may contain metacharacters.
++  for var in ltecho old_CC old_CFLAGS old_CPPFLAGS \
++    old_LD old_LDFLAGS old_LIBS \
++    old_NM old_RANLIB old_LN_S old_DLLTOOL old_OBJDUMP old_AS \
++    AR CC LD LN_S NM LTSHELL LTCONFIG_VERSION \
++    reload_flag reload_cmds wl \
++    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
++    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
++    library_names_spec soname_spec \
++    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
++    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds postuninstall_cmds \
++    file_magic_cmd export_symbols_cmds deplibs_check_method allow_undefined_flag no_undefined_flag \
++    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
++    hardcode_libdir_flag_spec hardcode_libdir_separator  \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
++
++    case "$var" in
++    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  case "$ltecho" in
++  *'\$0 --fallback-echo"')
++    ltecho=`$echo "X$ltecho" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+     ;;
+   esac
+-done
+ 
+-ofile=libtool
+-trap "$rm $ofile; exit 1" 1 2 15
+-echo creating $ofile
+-$rm $ofile
+-cat <<EOF > $ofile
+-#! /bin/sh
++  trap "$rm \"$ofile\"; exit 1" 1 2 15
++  echo "creating $ofile"
++  $rm "$ofile"
++  cat <<EOF > "$ofile"
++#! $SHELL
+ 
+-# libtool - Provide generalized library-building support services.
+-# Generated automatically by $PROGRAM - GNU $PACKAGE $VERSION
++# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
++# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+ # NOTE: Changes made to this file will be lost: look at ltconfig or ltmain.sh.
+ #
+-# Copyright (C) 1996-1998 Free Software Foundation, Inc.
+-# Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
++# Copyright (C) 1996-1999 Free Software Foundation, Inc.
++# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+ #
+ # 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
+@@ -1340,120 +2799,208 @@
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
+-# This program was configured as follows,
+-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+-#
+-# CC="$old_CC" CFLAGS="$old_CFLAGS" CPPFLAGS="$old_CPPFLAGS" \\
+-# LD="$old_LD" NM="$old_NM" RANLIB="$old_RANLIB" LN_S="$old_LN_S" \\
+-#   $0$ltconfig_args
+-#
+-# Compiler and other test output produced by $progname, useful for
+-# debugging $progname, is in ./config.log if it exists.
+-
+ # Sed that helps us avoid accidentally triggering echo(1) options like -n.
+ Xsed="sed -e s/^X//"
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "\${CDPATH+set}" = set; then CDPATH=; export CDPATH; fi
++if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+ 
+-# An echo program that does not interpret backslashes.
+-echo="$ltecho"
++### BEGIN LIBTOOL CONFIG
++EOF
++  cfgfile="$ofile"
++  ;;
++
++*)
++  # Double-quote the variables that need it (for aesthetics).
++  for var in old_CC old_CFLAGS old_CPPFLAGS \
++    old_LD old_LDFLAGS old_LIBS \
++    old_NM old_RANLIB old_LN_S old_DLLTOOL old_OBJDUMP old_AS; do
++    eval "$var=\\\"\$var\\\""
++  done
++
++  # Just create a config file.
++  cfgfile="$ofile.cfg"
++  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
++  echo "creating $cfgfile"
++  $rm "$cfgfile"
++  cat <<EOF > "$cfgfile"
++# `$echo "$cfgfile" | sed 's%^.*/%%'` - Libtool configuration file.
++# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
++EOF
++  ;;
++esac
++
++cat <<EOF >> "$cfgfile"
++# Libtool was configured as follows, on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++#
++# CC=$old_CC CFLAGS=$old_CFLAGS CPPFLAGS=$old_CPPFLAGS \\
++# LD=$old_LD LDFLAGS=$old_LDFLAGS LIBS=$old_LIBS \\
++# NM=$old_NM RANLIB=$old_RANLIB LN_S=$old_LN_S \\
++# DLLTOOL=$old_DLLTOOL OBJDUMP=$old_OBJDUMP AS=$old_AS \\
++#   $0$ltconfig_args
++#
++# Compiler and other test output produced by $progname, useful for
++# debugging $progname, is in ./config.log if it exists.
+ 
+ # The version of $progname that generated this script.
+-LTCONFIG_VERSION="$VERSION"
++LTCONFIG_VERSION=$LTCONFIG_VERSION
+ 
+ # Shell to use when invoking shell scripts.
+-SHELL=${CONFIG_SHELL-/bin/sh}
++SHELL=$LTSHELL
+ 
+-# Whether or not to build libtool libraries.
++# Whether or not to build shared libraries.
+ build_libtool_libs=$enable_shared
+ 
+-# Whether or not to build old-style libraries.
++# Whether or not to build static libraries.
+ build_old_libs=$enable_static
+ 
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
+ # The host system.
+-host_alias="$host_alias"
+-host="$host"
++host_alias=$host_alias
++host=$host
++
++# An echo program that does not interpret backslashes.
++echo=$ltecho
+ 
+ # The archiver.
+-AR="$AR"
++AR=$AR
+ 
+ # The default C compiler.
+-CC="$CC"
++CC=$CC
+ 
+ # The linker used to build libraries.
+-LD="$LD"
++LD=$LD
+ 
+ # Whether we need hard or soft links.
+-LN_S="$LN_S"
++LN_S=$LN_S
+ 
+ # A BSD-compatible nm program.
+-NM="$NM"
++NM=$NM
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
+ 
+ # The name of the directory that contains temporary libtool files.
+-objdir="$objdir"
++objdir=$objdir
+ 
+ # How to create reloadable object files.
+-reload_flag="$reload_flag"
+-reload_cmds="$reload_cmds"
++reload_flag=$reload_flag
++reload_cmds=$reload_cmds
+ 
+ # How to pass a linker flag through the compiler.
+-wl="$wl"
++wl=$wl
++
++# Object file suffix (normally "o").
++objext="$objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
++# Executable file suffix (normally "").
++exeext="$exeext"
+ 
+ # Additional compiler flags for building library objects.
+-pic_flag="$pic_flag"
++pic_flag=$pic_flag
++
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$compiler_c_o
++
++# Can we write directly to a .lo ?
++compiler_o_lo=$compiler_o_lo
++
++# Must we lock files when doing compilation ?
++need_locks=$need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
+ 
+ # Compiler flag to prevent dynamic linking.
+-link_static_flag="$link_static_flag"
++link_static_flag=$link_static_flag
+ 
+ # Compiler flag to turn off builtin functions.
+-no_builtin_flag="$no_builtin_flag"
++no_builtin_flag=$no_builtin_flag
+ 
+ # Compiler flag to allow reflexive dlopens.
+-export_dynamic_flag_spec="$export_dynamic_flag_spec"
++export_dynamic_flag_spec=$export_dynamic_flag_spec
++
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$whole_archive_flag_spec
++
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$thread_safe_flag_spec
+ 
+ # Library versioning type.
+ version_type=$version_type
+ 
+ # Format of library name prefix.
+-libname_spec="$libname_spec"
++libname_spec=$libname_spec
+ 
+ # List of archive names.  First name is the real one, the rest are links.
+ # The last name is the one that the linker finds with -lNAME.
+-library_names_spec="$library_names_spec"
++library_names_spec=$library_names_spec
+ 
+ # The coded name of the library, if different from the real name.
+-soname_spec="$soname_spec"
++soname_spec=$soname_spec
+ 
+ # Commands used to build and install an old-style archive.
+-RANLIB="$RANLIB"
+-old_archive_cmds="$old_archive_cmds"
+-old_postinstall_cmds="$old_postinstall_cmds"
+-old_postuninstall_cmds="$old_postuninstall_cmds"
++RANLIB=$RANLIB
++old_archive_cmds=$old_archive_cmds
++old_postinstall_cmds=$old_postinstall_cmds
++old_postuninstall_cmds=$old_postuninstall_cmds
+ 
+ # Create an old-style archive from a shared archive.
+-old_archive_from_new_cmds="$old_archive_from_new_cmds"
++old_archive_from_new_cmds=$old_archive_from_new_cmds
+ 
+ # Commands used to build and install a shared archive.
+-archive_cmds="$archive_cmds"
+-postinstall_cmds="$postinstall_cmds"
+-postuninstall_cmds="$postuninstall_cmds"
++archive_cmds=$archive_cmds
++archive_expsym_cmds=$archive_expsym_cmds
++postinstall_cmds=$postinstall_cmds
++postuninstall_cmds=$postuninstall_cmds
++
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$file_magic_cmd
+ 
+ # Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag="$allow_undefined_flag"
++allow_undefined_flag=$allow_undefined_flag
+ 
+ # Flag that forces no undefined symbols.
+-no_undefined_flag="$no_undefined_flag"
++no_undefined_flag=$no_undefined_flag
+ 
+ # Commands used to finish a libtool library installation in a directory.
+-finish_cmds="$finish_cmds"
++finish_cmds=$finish_cmds
+ 
+ # Same as above, but a single script fragment to be evaled but not shown.
+-finish_eval="$finish_eval"
++finish_eval=$finish_eval
+ 
+ # Take the output of nm and produce a listing of raw symbols and C names.
+-global_symbol_pipe="$global_symbol_pipe"
++global_symbol_pipe=$global_symbol_pipe
++
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$global_symbol_to_cdecl
+ 
+ # This is the shared library runtime path variable.
+ runpath_var=$runpath_var
+@@ -1461,15 +3008,18 @@
+ # This is the shared library path variable.
+ shlibpath_var=$shlibpath_var
+ 
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
+ # How to hardcode a shared library path into an executable.
+ hardcode_action=$hardcode_action
+ 
+ # Flag to hardcode \$libdir into a binary during linking.
+ # This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec="$hardcode_libdir_flag_spec"
++hardcode_libdir_flag_spec=$hardcode_libdir_flag_spec
+ 
+ # Whether we need a single -rpath flag with a separated argument.
+-hardcode_libdir_separator="$hardcode_libdir_separator"
++hardcode_libdir_separator=$hardcode_libdir_separator
+ 
+ # Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
+ # resulting binary.
+@@ -1483,27 +3033,115 @@
+ # the resulting binary.
+ hardcode_shlibpath_var=$hardcode_shlibpath_var
+ 
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$sys_lib_search_path_spec
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec
++
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path"
++
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols
++
++# The commands to list exported symbols.
++export_symbols_cmds=$export_symbols_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$exclude_expsyms
++
++# Symbols that must always be exported.
++include_expsyms=$include_expsyms
++
+ EOF
+ 
+-case "$host_os" in
+-aix3*)
+-  cat <<\EOF >> $ofile
++case "$ltmain" in
++*.sh)
++  echo '### END LIBTOOL CONFIG' >> "$ofile"
++  echo >> "$ofile"
++  case "$host_os" in
++  aix3*)
++    cat <<\EOF >> "$ofile"
++
+ # AIX sometimes has problems with the GCC collect2 program.  For some
+ # reason, if we set the COLLECT_NAMES environment variable, the problems
+ # vanish in a puff of smoke.
+-if test "${COLLECT_NAMES+set}" != set; then
++if test "X${COLLECT_NAMES+set}" != Xset; then
+   COLLECT_NAMES=
+   export COLLECT_NAMES
+ fi
+-
+ EOF
++    ;;
++  esac
++
++  # Append the ltmain.sh script.
++  sed '$q' "$ltmain" >> "$ofile" || (rm -f "$ofile"; exit 1)
++  # We use sed instead of cat because bash on DJGPP gets confused if
++  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
++  # text mode, it properly converts lines to CR/LF.  This bash problem
++  # is reportedly fixed, but why not run on old versions too?
++
++  chmod +x "$ofile"
++  ;;
++
++*)
++  # Compile the libtool program.
++  echo "FIXME: would compile $ltmain"
+   ;;
+ esac
+ 
+-# Append the ltmain.sh script.
+-cat "$ltmain" >> $ofile || (rm -f $ofile; exit 1)
++test -n "$cache_file" || exit 0
++
++# AC_CACHE_SAVE
++trap '' 1 2 15
++cat > confcache <<\EOF
++# This file is a shell script that caches the results of configure
++# tests run on this system so they can be shared between configure
++# scripts and configure runs.  It is not useful on other systems.
++# If it contains results you don't want to keep, you may remove or edit it.
++#
++# By default, configure uses ./config.cache as the cache file,
++# creating it if it does not exist already.  You can give configure
++# the --cache-file=FILE option to use a different cache file; that is
++# what configure does when it calls configure scripts in
++# subdirectories, so they share the cache.
++# Giving --cache-file=/dev/null disables caching, for debugging configure.
++# config.status only pays attention to the cache file if you give it the
++# --recheck option to rerun configure.
++#
++EOF
++# The following way of writing the cache mishandles newlines in values,
++# but we know of no workaround that is simple, portable, and efficient.
++# So, don't put newlines in cache variables' values.
++# Ultrix sh set writes to stderr and can't be redirected directly,
++# and sets the high bit in the cache file unless we assign to the vars.
++(set) 2>&1 |
++  case `(ac_space=' '; set | grep ac_space) 2>&1` in
++  *ac_space=\ *)
++    # `set' does not quote correctly, so add quotes (double-quote substitution
++    # turns \\\\ into \\, and sed turns \\ into \).
++    sed -n \
++      -e "s/'/'\\\\''/g" \
++      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
++    ;;
++  *)
++    # `set' quotes correctly as required by POSIX, so do not add quotes.
++    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
++    ;;
++  esac >> confcache
++if cmp -s $cache_file confcache; then
++  :
++else
++  if test -w $cache_file; then
++    echo "updating cache $cache_file"
++    cat confcache > $cache_file
++  else
++    echo "not updating unwritable cache $cache_file"
++  fi
++fi
++rm -f confcache
+ 
+-chmod +x $ofile
+ exit 0
+ 
+ # Local Variables:
+diff -Naur jpeg-6b-orig/ltmain.sh jpeg-6b/ltmain.sh
+--- jpeg-6b-orig/ltmain.sh	1998-03-26 02:25:39.000000000 +1100
++++ jpeg-6b/ltmain.sh	2005-05-22 21:31:02.000000000 +1000
+@@ -1,8 +1,8 @@
+ # ltmain.sh - Provide generalized library-building support services.
+ # NOTE: Changing this file will not affect anything until you rerun ltconfig.
+ #
+-# Copyright (C) 1996-1998 Free Software Foundation, Inc.
+-# Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
++# Copyright (C) 1996-1999 Free Software Foundation, Inc.
++# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+ #
+ # 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
+@@ -23,6 +23,30 @@
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
++# Check that we have a working $echo.
++if test "X$1" = X--no-reexec; then
++  # Discard the --no-reexec flag, and continue.
++  shift
++elif test "X$1" = X--fallback-echo; then
++  # Avoid inline document here, it may be left over
++  :
++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
++  # Yippee, $echo works!
++  :
++else
++  # Restart under the correct shell, and then maybe $echo will work.
++  exec $SHELL "$0" --no-reexec ${1+"$@"}
++fi
++
++if test "X$1" = X--fallback-echo; then
++  # used as fallback echo
++  shift
++  cat <<EOF
++$*
++EOF
++  exit 0
++fi
++
+ # The name of this program.
+ progname=`$echo "$0" | sed 's%^.*/%%'`
+ modename="$progname"
+@@ -30,7 +54,8 @@
+ # Constants.
+ PROGRAM=ltmain.sh
+ PACKAGE=libtool
+-VERSION=1.2
++VERSION=1.3.5
++TIMESTAMP=" (1.385.2.206 2000/05/27 11:12:27)"
+ 
+ default_mode=
+ help="Try \`$progname --help' for more information."
+@@ -41,15 +66,31 @@
+ 
+ # Sed substitution that helps us do robust quoting.  It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
++Xsed='sed -e 1s/^X//'
+ sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
++# test EBCDIC or ASCII
++case `echo '' | od -x` in
++*15*) # EBCDIC based system
++  SP2NL='tr \100 \025'
++  NL2SP='tr \025 \100'
++  ;;
++*) # Assume ASCII based system
++  SP2NL='tr \040 \012'
++  NL2SP='tr \015\012 \040\040'
++  ;;
++esac
+ 
+ # NLS nuisances.
+ # Only set LANG and LC_ALL to C if already set.
+ # These must not be set unconditionally because not all systems understand
+ # e.g. LANG=C (notably SCO).
+-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
++# We save the old values to restore during execute mode.
++if test "${LC_ALL+set}" = set; then
++  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
++fi
++if test "${LANG+set}" = set; then
++  save_LANG="$LANG"; LANG=C; export LANG
++fi
+ 
+ if test "$LTCONFIG_VERSION" != "$VERSION"; then
+   echo "$modename: ltconfig version \`$LTCONFIG_VERSION' does not match $PROGRAM version \`$VERSION'" 1>&2
+@@ -72,6 +113,8 @@
+ show="$echo"
+ show_help=
+ execute_dlfiles=
++lo2o="s/\\.lo\$/.${objext}/"
++o2lo="s/\\.${objext}\$/.lo/"
+ 
+ # Parse our command line options once, thoroughly.
+ while test $# -gt 0
+@@ -107,10 +150,20 @@
+     ;;
+ 
+   --version)
+-    echo "$PROGRAM (GNU $PACKAGE) $VERSION"
++    echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
++    exit 0
++    ;;
++
++  --config)
++    sed -e '1,/^### BEGIN LIBTOOL CONFIG/d' -e '/^### END LIBTOOL CONFIG/,$d' $0
+     exit 0
+     ;;
+ 
++  --debug)
++    echo "$progname: enabling shell trace mode"
++    set -x
++    ;;
++
+   --dry-run | -n)
+     run=:
+     ;;
+@@ -172,15 +225,15 @@
+       mode=link
+       for arg
+       do
+-        case "$arg" in
+-        -c)
+-           mode=compile
+-           break
+-           ;;
+-        esac
++	case "$arg" in
++	-c)
++	   mode=compile
++	   break
++	   ;;
++	esac
+       done
+       ;;
+-    *db | *dbx)
++    *db | *dbx | *strace | *truss)
+       mode=execute
+       ;;
+     *install*|cp|mv)
+@@ -195,11 +248,11 @@
+ 
+       # Just use the default operation mode.
+       if test -z "$mode"; then
+-        if test -n "$nonopt"; then
+-          $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
+-        else
+-          $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
+-        fi
++	if test -n "$nonopt"; then
++	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
++	else
++	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
++	fi
+       fi
+       ;;
+     esac
+@@ -227,23 +280,39 @@
+     srcfile="$nonopt"
+     suppress_output=
+ 
++    user_target=no
+     for arg
+     do
+       # Accept any command-line options.
+       case "$arg" in
+       -o)
+-	$echo "$modename: you cannot specify the output filename with \`-o'" 1>&2
+-	$echo "$help" 1>&2
+-	exit 1
++	if test "$user_target" != "no"; then
++	  $echo "$modename: you cannot specify \`-o' more than once" 1>&2
++	  exit 1
++	fi
++	user_target=next
+ 	;;
+ 
+       -static)
+-	build_libtool_libs=no
+ 	build_old_libs=yes
+ 	continue
+ 	;;
+       esac
+ 
++      case "$user_target" in
++      next)
++	# The next one is the -o target name
++	user_target=yes
++	continue
++	;;
++      yes)
++	# We got the output file
++	user_target=set
++	libobj="$arg"
++	continue
++	;;
++      esac
++
+       # Accept the current argument as the source file.
+       lastarg="$srcfile"
+       srcfile="$arg"
+@@ -272,11 +341,22 @@
+       fi
+     done
+ 
+-    # Get the name of the library object.
+-    libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
++    case "$user_target" in
++    set)
++      ;;
++    no)
++      # Get the name of the library object.
++      libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
++      ;;
++    *)
++      $echo "$modename: you must specify a target with \`-o'" 1>&2
++      exit 1
++      ;;
++    esac
+ 
+     # Recognize several different file suffixes.
+-    xform='[cCFSfms]'
++    # If the user specifies -o file.o, it is replaced with file.lo
++    xform='[cCFSfmso]'
+     case "$libobj" in
+     *.ada) xform=ada ;;
+     *.adb) xform=adb ;;
+@@ -293,9 +373,9 @@
+     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
+ 
+     case "$libobj" in
+-    *.lo) obj=`$echo "X$libobj" | $Xsed -e 's/\.lo$/.o/'` ;;
++    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+     *)
+-      $echo "$modename: cannot determine name of library object from \`$srcfile'" 1>&2
++      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
+       exit 1
+       ;;
+     esac
+@@ -308,11 +388,54 @@
+ 
+     # Delete any leftover library objects.
+     if test "$build_old_libs" = yes; then
+-      $run $rm $obj $libobj
+-      trap "$run $rm $obj $libobj; exit 1" 1 2 15
++      removelist="$obj $libobj"
+     else
+-      $run $rm $libobj
+-      trap "$run $rm $libobj; exit 1" 1 2 15
++      removelist="$libobj"
++    fi
++
++    $run $rm $removelist
++    trap "$run $rm $removelist; exit 1" 1 2 15
++
++    # Calculate the filename of the output object if compiler does
++    # not support -o with -c
++    if test "$compiler_c_o" = no; then
++      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\..*$%%'`.${objext}
++      lockfile="$output_obj.lock"
++      removelist="$removelist $output_obj $lockfile"
++      trap "$run $rm $removelist; exit 1" 1 2 15
++    else
++      need_locks=no
++      lockfile=
++    fi
++
++    # Lock this critical section if it is needed
++    # We use this script file to make the link, it avoids creating a new file
++    if test "$need_locks" = yes; then
++      until ln "$0" "$lockfile" 2>/dev/null; do
++	$show "Waiting for $lockfile to be removed"
++	sleep 2
++      done
++    elif test "$need_locks" = warn; then
++      if test -f "$lockfile"; then
++	echo "\
++*** ERROR, $lockfile exists and contains:
++`cat $lockfile 2>/dev/null`
++
++This indicates that another process is trying to use the same
++temporary object file, and libtool could not work around it because
++your compiler does not support \`-c' and \`-o' together.  If you
++repeat this compilation, it may succeed, by chance, but you had better
++avoid parallel builds (make -j) in this platform, or get a better
++compiler."
++
++	$run $rm $removelist
++	exit 1
++      fi
++      echo $srcfile > "$lockfile"
++    fi
++
++    if test -n "$fix_srcfile_path"; then
++      eval srcfile=\"$fix_srcfile_path\"
+     fi
+ 
+     # Only build a PIC object if we are building libtool libraries.
+@@ -321,23 +444,110 @@
+       fbsd_hideous_sh_bug=$base_compile
+ 
+       # All platforms use -DPIC, to notify preprocessed assembler code.
+-      $show "$base_compile$pic_flag -DPIC $srcfile"
+-      if $run eval "$base_compile\$pic_flag -DPIC \$srcfile"; then :
++      command="$base_compile $srcfile $pic_flag -DPIC"
++      if test "$build_old_libs" = yes; then
++	lo_libobj="$libobj"
++	dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
++	if test "X$dir" = "X$libobj"; then
++	  dir="$objdir"
++	else
++	  dir="$dir/$objdir"
++	fi
++	libobj="$dir/"`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
++
++	if test -d "$dir"; then
++	  $show "$rm $libobj"
++	  $run $rm $libobj
++	else
++	  $show "$mkdir $dir"
++	  $run $mkdir $dir
++	  status=$?
++	  if test $status -ne 0 && test ! -d $dir; then
++	    exit $status
++	  fi
++	fi
++      fi
++      if test "$compiler_o_lo" = yes; then
++	output_obj="$libobj"
++	command="$command -o $output_obj"
++      elif test "$compiler_c_o" = yes; then
++	output_obj="$obj"
++	command="$command -o $output_obj"
++      fi
++
++      $run $rm "$output_obj"
++      $show "$command"
++      if $run eval "$command"; then :
+       else
+-        test -n "$obj" && $run $rm $obj
+-        exit 1
++	test -n "$output_obj" && $run $rm $removelist
++	exit 1
+       fi
+ 
+-      # If we have no pic_flag, then copy the object into place and finish.
+-      if test -z "$pic_flag"; then
+-        $show "$LN_S $obj $libobj"
+-        $run $LN_S $obj $libobj
+-        exit $?
++      if test "$need_locks" = warn &&
++	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
++	echo "\
++*** ERROR, $lockfile contains:
++`cat $lockfile 2>/dev/null`
++
++but it should contain:
++$srcfile
++
++This indicates that another process is trying to use the same
++temporary object file, and libtool could not work around it because
++your compiler does not support \`-c' and \`-o' together.  If you
++repeat this compilation, it may succeed, by chance, but you had better
++avoid parallel builds (make -j) in this platform, or get a better
++compiler."
++
++	$run $rm $removelist
++	exit 1
++      fi
++
++      # Just move the object if needed, then go on to compile the next one
++      if test x"$output_obj" != x"$libobj"; then
++	$show "$mv $output_obj $libobj"
++	if $run $mv $output_obj $libobj; then :
++	else
++	  error=$?
++	  $run $rm $removelist
++	  exit $error
++	fi
+       fi
+ 
+-      # Just move the object, then go on to compile the next one
+-      $show "$mv $obj $libobj"
+-      $run $mv $obj $libobj || exit 1
++      # If we have no pic_flag, then copy the object into place and finish.
++      if test -z "$pic_flag" && test "$build_old_libs" = yes; then
++	# Rename the .lo from within objdir to obj
++	if test -f $obj; then
++	  $show $rm $obj
++	  $run $rm $obj
++	fi
++
++	$show "$mv $libobj $obj"
++	if $run $mv $libobj $obj; then :
++	else
++	  error=$?
++	  $run $rm $removelist
++	  exit $error
++	fi
++
++	xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
++	if test "X$xdir" = "X$obj"; then
++	  xdir="."
++	else
++	  xdir="$xdir"
++	fi
++	baseobj=`$echo "X$obj" | $Xsed -e "s%.*/%%"`
++	libobj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
++	# Now arrange that obj and lo_libobj become the same file
++	$show "(cd $xdir && $LN_S $baseobj $libobj)"
++	if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then
++	  exit 0
++	else
++	  error=$?
++	  $run $rm $removelist
++	  exit $error
++	fi
++      fi
+ 
+       # Allow error messages only from the first compilation.
+       suppress_output=' >/dev/null 2>&1'
+@@ -345,20 +555,73 @@
+ 
+     # Only build a position-dependent object if we build old libraries.
+     if test "$build_old_libs" = yes; then
++      command="$base_compile $srcfile"
++      if test "$compiler_c_o" = yes; then
++	command="$command -o $obj"
++	output_obj="$obj"
++      fi
++
+       # Suppress compiler output if we already did a PIC compilation.
+-      $show "$base_compile $srcfile$suppress_output"
+-      if $run eval "$base_compile \$srcfile$suppress_output"; then :
++      command="$command$suppress_output"
++      $run $rm "$output_obj"
++      $show "$command"
++      if $run eval "$command"; then :
++      else
++	$run $rm $removelist
++	exit 1
++      fi
++
++      if test "$need_locks" = warn &&
++	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
++	echo "\
++*** ERROR, $lockfile contains:
++`cat $lockfile 2>/dev/null`
++
++but it should contain:
++$srcfile
++
++This indicates that another process is trying to use the same
++temporary object file, and libtool could not work around it because
++your compiler does not support \`-c' and \`-o' together.  If you
++repeat this compilation, it may succeed, by chance, but you had better
++avoid parallel builds (make -j) in this platform, or get a better
++compiler."
++
++	$run $rm $removelist
++	exit 1
++      fi
++
++      # Just move the object if needed
++      if test x"$output_obj" != x"$obj"; then
++	$show "$mv $output_obj $obj"
++	if $run $mv $output_obj $obj; then :
++	else
++	  error=$?
++	  $run $rm $removelist
++	  exit $error
++	fi
++      fi
++
++      # Create an invalid libtool object if no PIC, so that we do not
++      # accidentally link it into a program.
++      if test "$build_libtool_libs" != yes; then
++	$show "echo timestamp > $libobj"
++	$run eval "echo timestamp > \$libobj" || exit $?
+       else
+-        $run $rm $obj $libobj
+-        exit 1
++	# Move the .lo from within objdir
++	$show "$mv $libobj $lo_libobj"
++	if $run $mv $libobj $lo_libobj; then :
++	else
++	  error=$?
++	  $run $rm $removelist
++	  exit $error
++	fi
+       fi
+     fi
+ 
+-    # Create an invalid libtool object if no PIC, so that we do not
+-    # accidentally link it into a program.
+-    if test "$build_libtool_libs" != yes; then
+-      $show "echo timestamp > $libobj"
+-      $run eval "echo timestamp > \$libobj" || exit $?
++    # Unlock the critical section if it was locked
++    if test "$need_locks" != no; then
++      $rm "$lockfile"
+     fi
+ 
+     exit 0
+@@ -367,28 +630,238 @@
+   # libtool link mode
+   link)
+     modename="$modename: link"
+-    CC="$nonopt"
+-    allow_undefined=yes
+-    compile_command="$CC"
+-    finalize_command="$CC"
++    case "$host" in
++    *-*-cygwin* | *-*-mingw* | *-*-os2*)
++      # It is impossible to link a dll without this setting, and
++      # we shouldn't force the makefile maintainer to figure out
++      # which system we are compiling for in order to pass an extra
++      # flag for every libtool invokation.
++      # allow_undefined=no
++
++      # FIXME: Unfortunately, there are problems with the above when trying
++      # to make a dll which has undefined symbols, in which case not
++      # even a static library is built.  For now, we need to specify
++      # -no-undefined on the libtool link line when we can be certain
++      # that all symbols are satisfied, otherwise we get a static library.
++      allow_undefined=yes
++
++      # This is a source program that is used to create dlls on Windows
++      # Don't remove nor modify the starting and closing comments
++# /* ltdll.c starts here */
++# #define WIN32_LEAN_AND_MEAN
++# #include <windows.h>
++# #undef WIN32_LEAN_AND_MEAN
++# #include <stdio.h>
++#
++# #ifndef __CYGWIN__
++# #  ifdef __CYGWIN32__
++# #    define __CYGWIN__ __CYGWIN32__
++# #  endif
++# #endif
++#
++# #ifdef __cplusplus
++# extern "C" {
++# #endif
++# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
++# #ifdef __cplusplus
++# }
++# #endif
++#
++# #ifdef __CYGWIN__
++# #include <cygwin/cygwin_dll.h>
++# DECLARE_CYGWIN_DLL( DllMain );
++# #endif
++# HINSTANCE __hDllInstance_base;
++#
++# BOOL APIENTRY
++# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
++# {
++#   __hDllInstance_base = hInst;
++#   return TRUE;
++# }
++# /* ltdll.c ends here */
++      # This is a source program that is used to create import libraries
++      # on Windows for dlls which lack them. Don't remove nor modify the
++      # starting and closing comments
++# /* impgen.c starts here */
++# /*   Copyright (C) 1999 Free Software Foundation, Inc.
++# 
++#  This file is part of GNU libtool.
++# 
++#  This program is free software; you can redistribute it and/or modify
++#  it under the terms of the GNU General Public License as published by
++#  the Free Software Foundation; either version 2 of the License, or
++#  (at your option) any later version.
++# 
++#  This program is distributed in the hope that it will be useful,
++#  but WITHOUT ANY WARRANTY; without even the implied warranty of
++#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++#  GNU General Public License for more details.
++# 
++#  You should have received a copy of the GNU General Public License
++#  along with this program; if not, write to the Free Software
++#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++#  */
++# 
++#  #include <stdio.h>		/* for printf() */
++#  #include <unistd.h>		/* for open(), lseek(), read() */
++#  #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
++#  #include <string.h>		/* for strdup() */
++# 
++#  static unsigned int
++#  pe_get16 (fd, offset)
++#       int fd;
++#       int offset;
++#  {
++#    unsigned char b[2];
++#    lseek (fd, offset, SEEK_SET);
++#    read (fd, b, 2);
++#    return b[0] + (b[1]<<8);
++#  }
++# 
++#  static unsigned int
++#  pe_get32 (fd, offset)
++#      int fd;
++#      int offset;
++#  {
++#    unsigned char b[4];
++#    lseek (fd, offset, SEEK_SET);
++#    read (fd, b, 4);
++#    return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
++#  }
++# 
++#  static unsigned int
++#  pe_as32 (ptr)
++#       void *ptr;
++#  {
++#    unsigned char *b = ptr;
++#    return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
++#  }
++# 
++#  int
++#  main (argc, argv)
++#      int argc;
++#      char *argv[];
++#  {
++#      int dll;
++#      unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
++#      unsigned long export_rva, export_size, nsections, secptr, expptr;
++#      unsigned long name_rvas, nexp;
++#      unsigned char *expdata, *erva;
++#      char *filename, *dll_name;
++# 
++#      filename = argv[1];
++# 
++#      dll = open(filename, O_RDONLY|O_BINARY);
++#      if (!dll)
++#  	return 1;
++# 
++#      dll_name = filename;
++#    
++#      for (i=0; filename[i]; i++)
++#  	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
++#  	    dll_name = filename + i +1;
++# 
++#      pe_header_offset = pe_get32 (dll, 0x3c);
++#      opthdr_ofs = pe_header_offset + 4 + 20;
++#      num_entries = pe_get32 (dll, opthdr_ofs + 92);
++# 
++#      if (num_entries < 1) /* no exports */
++#  	return 1;
++# 
++#      export_rva = pe_get32 (dll, opthdr_ofs + 96);
++#      export_size = pe_get32 (dll, opthdr_ofs + 100);
++#      nsections = pe_get16 (dll, pe_header_offset + 4 +2);
++#      secptr = (pe_header_offset + 4 + 20 +
++#  	      pe_get16 (dll, pe_header_offset + 4 + 16));
++# 
++#      expptr = 0;
++#      for (i = 0; i < nsections; i++)
++#      {
++#  	char sname[8];
++#  	unsigned long secptr1 = secptr + 40 * i;
++#  	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
++#  	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
++#  	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
++#  	lseek(dll, secptr1, SEEK_SET);
++#  	read(dll, sname, 8);
++#  	if (vaddr <= export_rva && vaddr+vsize > export_rva)
++#  	{
++#  	    expptr = fptr + (export_rva - vaddr);
++#  	    if (export_rva + export_size > vaddr + vsize)
++#  		export_size = vsize - (export_rva - vaddr);
++#  	    break;
++#  	}
++#      }
++# 
++#      expdata = (unsigned char*)malloc(export_size);
++#      lseek (dll, expptr, SEEK_SET);
++#      read (dll, expdata, export_size);
++#      erva = expdata - export_rva;
++# 
++#      nexp = pe_as32 (expdata+24);
++#      name_rvas = pe_as32 (expdata+32);
++# 
++#      printf ("EXPORTS\n");
++#      for (i = 0; i<nexp; i++)
++#      {
++#  	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
++#  	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
++#      }
++# 
++#      return 0;
++#  }
++# /* impgen.c ends here */
++      ;;
++    *)
++      allow_undefined=yes
++      ;;
++    esac
++    compile_command="$nonopt"
++    finalize_command="$nonopt"
+ 
++    compile_rpath=
++    finalize_rpath=
+     compile_shlibpath=
+     finalize_shlibpath=
++    convenience=
++    old_convenience=
+     deplibs=
++    linkopts=
++
++    if test -n "$shlibpath_var"; then
++      # get the directories listed in $shlibpath_var
++      eval lib_search_path=\`\$echo \"X \${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
++    else
++      lib_search_path=
++    fi
++    # now prepend the system-specific ones
++    eval lib_search_path=\"$sys_lib_search_path_spec\$lib_search_path\"
++    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
++    
++    avoid_version=no
+     dlfiles=
+     dlprefiles=
++    dlself=no
+     export_dynamic=no
+-    hardcode_libdirs=
++    export_symbols=
++    export_symbols_regex=
++    generated=
+     libobjs=
+     link_against_libtool_libs=
+     ltlibs=
++    module=no
+     objs=
++    prefer_static_libs=no
++    preload=no
+     prev=
+     prevarg=
+     release=
+     rpath=
++    xrpath=
+     perm_rpath=
+     temp_rpath=
++    thread_safe=no
+     vinfo=
+ 
+     # We need to know -static, to get the right output filenames.
+@@ -396,13 +869,23 @@
+     do
+       case "$arg" in
+       -all-static | -static)
+-        if test "X$arg" = "X-all-static" && test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
++	if test "X$arg" = "X-all-static"; then
++	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+ 	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
+-        fi
+-        build_libtool_libs=no
++	  fi
++	  if test -n "$link_static_flag"; then
++	    dlopen_self=$dlopen_self_static
++	  fi
++	else
++	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
++	    dlopen_self=$dlopen_self_static
++	  fi
++	fi
++	build_libtool_libs=no
+ 	build_old_libs=yes
+-        break
+-        ;;
++	prefer_static_libs=yes
++	break
++	;;
+       esac
+     done
+ 
+@@ -410,44 +893,107 @@
+     test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+ 
+     # Go through the arguments, transforming them on the way.
+-    for arg
+-    do
++    while test $# -gt 0; do
++      arg="$1"
++      shift
++
+       # If the previous option needs an argument, assign it.
+       if test -n "$prev"; then
+-        case "$prev" in
+-        output)
+-          compile_command="$compile_command @OUTPUT@"
+-          finalize_command="$finalize_command @OUTPUT@"
+-          ;;
+-        esac
+-
+-        case "$prev" in
+-        dlfiles|dlprefiles)
+-          case "$arg" in
+-          *.la | *.lo) ;;  # We handle these cases below.
+-          *)
+-            dlprefiles="$dlprefiles $arg"
+-            test "$prev" = dlfiles && dlfiles="$dlfiles $arg"
+-            prev=
+-            ;;
+-          esac
+-          ;;
++	case "$prev" in
++	output)
++	  compile_command="$compile_command @OUTPUT@"
++	  finalize_command="$finalize_command @OUTPUT@"
++	  ;;
++	esac
++
++	case "$prev" in
++	dlfiles|dlprefiles)
++	  if test "$preload" = no; then
++	    # Add the symbol object into the linking commands.
++	    compile_command="$compile_command @SYMFILE@"
++	    finalize_command="$finalize_command @SYMFILE@"
++	    preload=yes
++	  fi
++	  case "$arg" in
++	  *.la | *.lo) ;;  # We handle these cases below.
++	  force)
++	    if test "$dlself" = no; then
++	      dlself=needless
++	      export_dynamic=yes
++	    fi
++	    prev=
++	    continue
++	    ;;
++	  self)
++	    if test "$prev" = dlprefiles; then
++	      dlself=yes
++	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
++	      dlself=yes
++	    else
++	      dlself=needless
++	      export_dynamic=yes
++	    fi
++	    prev=
++	    continue
++	    ;;
++	  *)
++	    if test "$prev" = dlfiles; then
++	      dlfiles="$dlfiles $arg"
++	    else
++	      dlprefiles="$dlprefiles $arg"
++	    fi
++	    prev=
++	    ;;
++	  esac
++	  ;;
++	expsyms)
++	  export_symbols="$arg"
++	  if test ! -f "$arg"; then
++	    $echo "$modename: symbol file \`$arg' does not exist"
++	    exit 1
++	  fi
++	  prev=
++	  continue
++	  ;;
++	expsyms_regex)
++	  export_symbols_regex="$arg"
++	  prev=
++	  continue
++	  ;;
+ 	release)
+ 	  release="-$arg"
+ 	  prev=
+ 	  continue
+ 	  ;;
+-        rpath)
+-          rpath="$rpath $arg"
++	rpath | xrpath)
++	  # We need an absolute path.
++	  case "$arg" in
++	  [\\/]* | [A-Za-z]:[\\/]*) ;;
++	  *)
++	    $echo "$modename: only absolute run-paths are allowed" 1>&2
++	    exit 1
++	    ;;
++	  esac
++	  if test "$prev" = rpath; then
++	    case "$rpath " in
++	    *" $arg "*) ;;
++	    *) rpath="$rpath $arg" ;;
++	    esac
++	  else
++	    case "$xrpath " in
++	    *" $arg "*) ;;
++	    *) xrpath="$xrpath $arg" ;;
++	    esac
++	  fi
++	  prev=
++	  continue
++	  ;;
++	*)
++	  eval "$prev=\"\$arg\""
+ 	  prev=
+ 	  continue
+ 	  ;;
+-        *)
+-          eval "$prev=\"\$arg\""
+-          prev=
+-          continue
+-          ;;
+-        esac
++	esac
+       fi
+ 
+       prevarg="$arg"
+@@ -455,10 +1001,10 @@
+       case "$arg" in
+       -all-static)
+ 	if test -n "$link_static_flag"; then
+-          compile_command="$compile_command $link_static_flag"
++	  compile_command="$compile_command $link_static_flag"
+ 	  finalize_command="$finalize_command $link_static_flag"
+-        fi
+-        continue
++	fi
++	continue
+ 	;;
+ 
+       -allow-undefined)
+@@ -467,46 +1013,107 @@
+ 	continue
+ 	;;
+ 
++      -avoid-version)
++	avoid_version=yes
++	continue
++	;;
++
+       -dlopen)
+-        prev=dlfiles
+-        continue
+-        ;;
++	prev=dlfiles
++	continue
++	;;
+ 
+       -dlpreopen)
+-        prev=dlprefiles
+-        continue
+-        ;;
++	prev=dlprefiles
++	continue
++	;;
+ 
+       -export-dynamic)
+-        if test "$export_dynamic" != yes; then
+-          export_dynamic=yes
+-	  if test -n "$export_dynamic_flag_spec"; then
+-	    eval arg=\"$export_dynamic_flag_spec\"
+-	  else
+-	    arg=
+-	  fi
++	export_dynamic=yes
++	continue
++	;;
+ 
+-          # Add the symbol object into the linking commands.
+-	  compile_command="$compile_command @SYMFILE@"
+-	  finalize_command="$finalize_command @SYMFILE@"
+-        fi
+-        ;;
++      -export-symbols | -export-symbols-regex)
++	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
++	  $echo "$modename: not more than one -exported-symbols argument allowed"
++	  exit 1
++	fi
++	if test "X$arg" = "X-export-symbols"; then
++	  prev=expsyms
++	else
++	  prev=expsyms_regex
++	fi
++	continue
++	;;
+ 
+       -L*)
+-        dir=`$echo "X$arg" | $Xsed -e 's%^-L\(.*\)$%\1%'`
+-        case "$dir" in
+-        /* | [A-Za-z]:\\*)
+-	  # Add the corresponding hardcode_libdir_flag, if it is not identical.
+-          ;;
+-        *)
+-          $echo "$modename: \`-L$dir' cannot specify a relative directory" 1>&2
+-          exit 1
+-          ;;
+-        esac
+-        deplibs="$deplibs $arg"
+-        ;;
++	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
++	# We need an absolute path.
++	case "$dir" in
++	[\\/]* | [A-Za-z]:[\\/]*) ;;
++	*)
++	  absdir=`cd "$dir" && pwd`
++	  if test -z "$absdir"; then
++	    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
++	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
++	    absdir="$dir"
++	  fi
++	  dir="$absdir"
++	  ;;
++	esac
++	case " $deplibs " in
++	*" $arg "*) ;;
++	*) deplibs="$deplibs $arg";;
++	esac
++	case " $lib_search_path " in
++	*" $dir "*) ;;
++	*) lib_search_path="$lib_search_path $dir";;
++	esac
++	case "$host" in
++	*-*-cygwin* | *-*-mingw* | *-*-os2*)
++	  dllsearchdir=`cd "$dir" && pwd || echo "$dir"`
++	  case ":$dllsearchpath:" in
++	  ::) dllsearchpath="$dllsearchdir";;
++	  *":$dllsearchdir:"*) ;;
++	  *) dllsearchpath="$dllsearchpath:$dllsearchdir";;
++	  esac
++	  ;;
++	esac
++	;;
++
++      -l*)
++	if test "$arg" = "-lc"; then
++	  case "$host" in
++	  *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
++	    # These systems don't actually have c library (as such)
++	    continue
++	    ;;
++	  *-*-rhapsody* | *-*-darwin1.[012])
++	    # Rhapsody C library is in the System framework
++	    deplibs="$deplibs -framework System"
++	    continue
++	    ;;
++	  esac
++	elif test "$arg" = "-lm"; then
++	  case "$host" in
++	  *-*-cygwin* | *-*-beos*)
++	    # These systems don't actually have math library (as such)
++	    continue
++	    ;;
++	  *-*-rhapsody* | *-*-darwin1.[012])
++	    # Rhapsody math library is in the System framework
++	    deplibs="$deplibs -framework System"
++	    continue
++	    ;;
++	  esac
++	fi
++	deplibs="$deplibs $arg"
++	;;
+ 
+-      -l*) deplibs="$deplibs $arg" ;;
++      -module)
++	module=yes
++	continue
++	;;
+ 
+       -no-undefined)
+ 	allow_undefined=no
+@@ -521,23 +1128,50 @@
+ 	;;
+ 
+       -rpath)
+-        prev=rpath
+-        continue
+-        ;;
++	prev=rpath
++	continue
++	;;
++
++      -R)
++	prev=xrpath
++	continue
++	;;
++
++      -R*)
++	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
++	# We need an absolute path.
++	case "$dir" in
++	[\\/]* | [A-Za-z]:[\\/]*) ;;
++	*)
++	  $echo "$modename: only absolute run-paths are allowed" 1>&2
++	  exit 1
++	  ;;
++	esac
++	case "$xrpath " in
++	*" $dir "*) ;;
++	*) xrpath="$xrpath $dir" ;;
++	esac
++	continue
++	;;
+ 
+       -static)
+ 	# If we have no pic_flag, then this is the same as -all-static.
+ 	if test -z "$pic_flag" && test -n "$link_static_flag"; then
+-          compile_command="$compile_command $link_static_flag"
++	  compile_command="$compile_command $link_static_flag"
+ 	  finalize_command="$finalize_command $link_static_flag"
+-        fi
++	fi
++	continue
++	;;
++
++      -thread-safe)
++	thread_safe=yes
+ 	continue
+ 	;;
+ 
+       -version-info)
+-        prev=vinfo
+-        continue
+-        ;;
++	prev=vinfo
++	continue
++	;;
+ 
+       # Some other compiler flag.
+       -* | +*)
+@@ -549,18 +1183,18 @@
+ 	  arg="\"$arg\""
+ 	  ;;
+ 	esac
+-        ;;
++	;;
+ 
+-      *.o | *.a)
+-        # A standard object.
+-        objs="$objs $arg"
+-        ;;
++      *.o | *.obj | *.a | *.lib)
++	# A standard object.
++	objs="$objs $arg"
++	;;
+ 
+       *.lo)
+-        # A library object.
++	# A library object.
+ 	if test "$prev" = dlfiles; then
+ 	  dlfiles="$dlfiles $arg"
+-	  if test "$build_libtool_libs" = yes; then
++	  if test "$build_libtool_libs" = yes && test "$dlopen" = yes; then
+ 	    prev=
+ 	    continue
+ 	  else
+@@ -571,210 +1205,304 @@
+ 
+ 	if test "$prev" = dlprefiles; then
+ 	  # Preload the old-style object.
+-	  dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e 's/\.lo$/\.o/'`
++	  dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e "$lo2o"`
+ 	  prev=
+ 	fi
+ 	libobjs="$libobjs $arg"
+-        ;;
++	;;
+ 
+       *.la)
+-        # A libtool-controlled library.
++	# A libtool-controlled library.
+ 
+-        dlname=
+-        libdir=
+-        library_names=
+-        old_library=
+-
+-        # Check to see that this really is a libtool archive.
+-        if (sed -e '2q' $arg | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then :
+-        else
+-          $echo "$modename: \`$arg' is not a valid libtool archive" 1>&2
+-          exit 1
+-        fi
+-
+-        # If there is no directory component, then add one.
+-        case "$arg" in
+-        */* | *\\*) . $arg ;;
+-        *) . ./$arg ;;
+-        esac
+-
+-        if test -z "$libdir"; then
+-          $echo "$modename: \`$arg' contains no -rpath information" 1>&2
+-          exit 1
+-        fi
+-
+-        # Get the name of the library we link against.
+-        linklib=
+-        for l in $old_library $library_names; do
+-          linklib="$l"
+-        done
+-
+-        if test -z "$linklib"; then
+-          $echo "$modename: cannot find name of link library for \`$arg'" 1>&2
+-          exit 1
+-        fi
+-
+-        # Find the relevant object directory and library name.
+-        name=`$echo "X$arg" | $Xsed -e 's%^.*/%%' -e 's/\.la$//' -e 's/^lib//'`
+-        dir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+-        if test "X$dir" = "X$arg"; then
+-          dir="$objdir"
+-        else
+-          dir="$dir/$objdir"
+-        fi
+-
+-        # This library was specified with -dlopen.
+-        if test "$prev" = dlfiles; then
+-          dlfiles="$dlfiles $arg"
+-          if test -z "$dlname"; then
+-            # If there is no dlname, we need to preload.
+-            prev=dlprefiles
+-          else
+-            # We should not create a dependency on this library, but we
+-	    # may need any libraries it requires.
+-	    compile_command="$compile_command$dependency_libs"
+-	    finalize_command="$finalize_command$dependency_libs"
+-            prev=
+-            continue
+-          fi
+-        fi
+-
+-        # The library was specified with -dlpreopen.
+-        if test "$prev" = dlprefiles; then
+-          # Prefer using a static library (so that no silly _DYNAMIC symbols
+-          # are required to link).
+-          if test -n "$old_library"; then
+-            dlprefiles="$dlprefiles $dir/$old_library"
+-          else
+-            dlprefiles="$dlprefiles $dir/$linklib"
+-          fi
+-          prev=
+-        fi
+-
+-        if test "$build_libtool_libs" = yes && test -n "$library_names"; then
+-          link_against_libtool_libs="$link_against_libtool_libs $arg"
+-          if test -n "$shlibpath_var"; then
+-            # Make sure the rpath contains only unique directories.
+-            case "$temp_rpath " in
+-            *" $dir "*) ;;
+-            *) temp_rpath="$temp_rpath $dir" ;;
+-            esac
+-          fi
++	dlname=
++	libdir=
++	library_names=
++	old_library=
+ 
+-	  # This is the magic to use -rpath.
+-          if test -n "$hardcode_libdir_flag_spec"; then
+-            if test -n "$hardcode_libdir_separator"; then
+-              if test -z "$hardcode_libdirs"; then
+-                # Put the magic libdir with the hardcode flag.
+-                hardcode_libdirs="$libdir"
+-                libdir="@HARDCODE_LIBDIRS@"
+-              else
+-                # Just accumulate the unique libdirs.
+-		case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
+-		*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+-		  ;;
+-		*)
+-		  hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+-		  ;;
+-		esac
+-                libdir=
+-              fi
+-            fi
+-
+-            if test -n "$libdir"; then
+-              eval flag=\"$hardcode_libdir_flag_spec\"
+-
+-              compile_command="$compile_command $flag"
+-              finalize_command="$finalize_command $flag"
+-            fi
+-          elif test -n "$runpath_var"; then
+-            # Do the same for the permanent run path.
+-            case "$perm_rpath " in
+-            *" $libdir "*) ;;
+-            *) perm_rpath="$perm_rpath $libdir" ;;
+-            esac
+-          fi
+-
+-
+-          case "$hardcode_action" in
+-          immediate)
+-            if test "$hardcode_direct" = no; then
+-              compile_command="$compile_command $dir/$linklib"
+-            elif test "$hardcode_minus_L" = no; then
+-              compile_command="$compile_command -L$dir -l$name"
+-            elif test "$hardcode_shlibpath_var" = no; then
+-              compile_shlibpath="$compile_shlibpath$dir:"
+-              compile_command="$compile_command -l$name"
+-            fi
+-            ;;
+-
+-          relink)
+-            # We need an absolute path.
+-            case "$dir" in
+-            /* | [A-Za-z]:\\*) ;;
+-            *)
+-              absdir=`cd "$dir" && pwd`
+-              if test -z "$absdir"; then
+-                $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+-                exit 1
+-              fi
+-              dir="$absdir"
+-              ;;
+-            esac
+-
+-            if test "$hardcode_direct" = yes; then
+-              compile_command="$compile_command $dir/$linklib"
+-            elif test "$hardcode_minus_L" = yes; then
+-              compile_command="$compile_command -L$dir -l$name"
+-            elif test "$hardcode_shlibpath_var" = yes; then
+-              compile_shlibpath="$compile_shlibpath$dir:"
+-              compile_command="$compile_command -l$name"
+-            fi
+-            ;;
+-
+-          *)
+-            $echo "$modename: \`$hardcode_action' is an unknown hardcode action" 1>&2
+-            exit 1
+-            ;;
+-          esac
+-
+-          # Finalize command for both is simple: just hardcode it.
+-          if test "$hardcode_direct" = yes; then
+-            finalize_command="$finalize_command $libdir/$linklib"
+-          elif test "$hardcode_minus_L" = yes; then
+-            finalize_command="$finalize_command -L$libdir -l$name"
+-          elif test "$hardcode_shlibpath_var" = yes; then
+-            finalize_shlibpath="$finalize_shlibpath$libdir:"
+-            finalize_command="$finalize_command -l$name"
+-          else
+-            # We cannot seem to hardcode it, guess we'll fake it.
+-            finalize_command="$finalize_command -L$libdir -l$name"
+-          fi
+-        else
+-          # Transform directly to old archives if we don't build new libraries.
+-          if test -n "$pic_flag" && test -z "$old_library"; then
+-            $echo "$modename: cannot find static library for \`$arg'" 1>&2
+-            exit 1
+-          fi
++	# Check to see that this really is a libtool archive.
++	if (sed -e '2q' $arg | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
++	else
++	  $echo "$modename: \`$arg' is not a valid libtool archive" 1>&2
++	  exit 1
++	fi
+ 
+-	  # Here we assume that one of hardcode_direct or hardcode_minus_L
+-	  # is not unsupported.  This is valid on all known static and
+-	  # shared platforms.
+-	  if test "$hardcode_direct" != unsupported; then
+-	    test -n "$old_library" && linklib="$old_library"
+-	    compile_command="$compile_command $dir/$linklib"
+-	    finalize_command="$finalize_command $dir/$linklib"
++	# If the library was installed with an old release of libtool,
++	# it will not redefine variable installed.
++	installed=yes
++
++	# Read the .la file
++	# If there is no directory component, then add one.
++	case "$arg" in
++	*/* | *\\*) . $arg ;;
++	*) . ./$arg ;;
++	esac
++
++	# Get the name of the library we link against.
++	linklib=
++	for l in $old_library $library_names; do
++	  linklib="$l"
++	done
++
++	if test -z "$linklib"; then
++	  $echo "$modename: cannot find name of link library for \`$arg'" 1>&2
++	  exit 1
++	fi
++
++	# Find the relevant object directory and library name.
++	name=`$echo "X$arg" | $Xsed -e 's%^.*/%%' -e 's/\.la$//' -e 's/^lib//'`
++
++	if test "X$installed" = Xyes; then
++	  dir="$libdir"
++	else
++	  dir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
++	  if test "X$dir" = "X$arg"; then
++	    dir="$objdir"
+ 	  else
+-	    compile_command="$compile_command -L$dir -l$name"
+-	    finalize_command="$finalize_command -L$dir -l$name"
++	    dir="$dir/$objdir"
+ 	  fi
+-        fi
++	fi
+ 
+-	# Add in any libraries that this one depends upon.
+-	compile_command="$compile_command$dependency_libs"
++	if test -n "$dependency_libs"; then
++	  # Extract -R and -L from dependency_libs
++	  temp_deplibs=
++	  for deplib in $dependency_libs; do
++	    case "$deplib" in
++	    -R*) temp_xrpath=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
++		 case " $rpath $xrpath " in
++		 *" $temp_xrpath "*) ;;
++		 *) xrpath="$xrpath $temp_xrpath";;
++		 esac;;
++	    -L*) case "$compile_command $temp_deplibs " in
++		 *" $deplib "*) ;;
++		 *) temp_deplibs="$temp_deplibs $deplib";;
++		 esac
++		 temp_dir=`$echo "X$deplib" | $Xsed -e 's/^-L//'`
++		 case " $lib_search_path " in
++		 *" $temp_dir "*) ;;
++		 *) lib_search_path="$lib_search_path $temp_dir";;
++		 esac
++		 ;;
++	    *) temp_deplibs="$temp_deplibs $deplib";;
++	    esac
++	  done
++	  dependency_libs="$temp_deplibs"
++	fi
++
++	if test -z "$libdir"; then
++	  # It is a libtool convenience library, so add in its objects.
++	  convenience="$convenience $dir/$old_library"
++	  old_convenience="$old_convenience $dir/$old_library"
++	  deplibs="$deplibs$dependency_libs"
++	  compile_command="$compile_command $dir/$old_library$dependency_libs"
++	  finalize_command="$finalize_command $dir/$old_library$dependency_libs"
++	  continue
++	fi
++
++	# This library was specified with -dlopen.
++	if test "$prev" = dlfiles; then
++	  dlfiles="$dlfiles $arg"
++	  if test -z "$dlname" || test "$dlopen" != yes || test "$build_libtool_libs" = no; then
++	    # If there is no dlname, no dlopen support or we're linking statically,
++	    # we need to preload.
++	    prev=dlprefiles
++	  else
++	    # We should not create a dependency on this library, but we
++	    # may need any libraries it requires.
++	    compile_command="$compile_command$dependency_libs"
++	    finalize_command="$finalize_command$dependency_libs"
++	    prev=
++	    continue
++	  fi
++	fi
++
++	# The library was specified with -dlpreopen.
++	if test "$prev" = dlprefiles; then
++	  # Prefer using a static library (so that no silly _DYNAMIC symbols
++	  # are required to link).
++	  if test -n "$old_library"; then
++	    dlprefiles="$dlprefiles $dir/$old_library"
++	  else
++	    dlprefiles="$dlprefiles $dir/$linklib"
++	  fi
++	  prev=
++	fi
++
++	if test -n "$library_names" &&
++	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
++	  link_against_libtool_libs="$link_against_libtool_libs $arg"
++	  if test -n "$shlibpath_var"; then
++	    # Make sure the rpath contains only unique directories.
++	    case "$temp_rpath " in
++	    *" $dir "*) ;;
++	    *) temp_rpath="$temp_rpath $dir" ;;
++	    esac
++	  fi
++
++	  # We need an absolute path.
++	  case "$dir" in
++	  [\\/] | [A-Za-z]:[\\/]*) absdir="$dir" ;;
++	  *)
++	    absdir=`cd "$dir" && pwd`
++	    if test -z "$absdir"; then
++	      $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
++	      $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
++	      absdir="$dir"
++	    fi
++	    ;;
++	  esac
++	  
++	  # This is the magic to use -rpath.
++	  # Skip directories that are in the system default run-time
++	  # search path, unless they have been requested with -R.
++	  case " $sys_lib_dlsearch_path " in
++	  *" $absdir "*) ;;
++	  *)
++	    case "$compile_rpath " in
++	    *" $absdir "*) ;;
++	    *) compile_rpath="$compile_rpath $absdir" 
++	    esac
++	    ;;
++	  esac
++
++	  case " $sys_lib_dlsearch_path " in
++	  *" $libdir "*) ;;
++	  *)
++	    case "$finalize_rpath " in
++	    *" $libdir "*) ;;
++	    *) finalize_rpath="$finalize_rpath $libdir"
++	    esac
++	    ;;
++	  esac
++
++	  lib_linked=yes
++	  case "$hardcode_action" in
++	  immediate | unsupported)
++	    if test "$hardcode_direct" = no; then
++	      compile_command="$compile_command $dir/$linklib"
++	      deplibs="$deplibs $dir/$linklib"
++	      case "$host" in
++	      *-*-cygwin* | *-*-mingw* | *-*-os2*)
++		dllsearchdir=`cd "$dir" && pwd || echo "$dir"`
++		if test -n "$dllsearchpath"; then
++		  dllsearchpath="$dllsearchpath:$dllsearchdir"
++		else
++		  dllsearchpath="$dllsearchdir"
++		fi
++		;;
++	      esac
++	    elif test "$hardcode_minus_L" = no; then
++	      case "$host" in
++	      *-*-sunos*)
++		compile_shlibpath="$compile_shlibpath$dir:"
++		;;
++	      esac
++	      case "$compile_command " in
++	      *" -L$dir "*) ;;
++	      *) compile_command="$compile_command -L$dir";;
++	      esac
++	      compile_command="$compile_command -l$name"
++	      deplibs="$deplibs -L$dir -l$name"
++	    elif test "$hardcode_shlibpath_var" = no; then
++	      case ":$compile_shlibpath:" in
++	      *":$dir:"*) ;;
++	      *) compile_shlibpath="$compile_shlibpath$dir:";;
++	      esac
++	      compile_command="$compile_command -l$name"
++	      deplibs="$deplibs -l$name"
++	    else
++	      lib_linked=no
++	    fi
++	    ;;
++
++	  relink)
++	    if test "$hardcode_direct" = yes; then
++	      compile_command="$compile_command $absdir/$linklib"
++	      deplibs="$deplibs $absdir/$linklib"
++	    elif test "$hardcode_minus_L" = yes; then
++	      case "$compile_command " in
++	      *" -L$absdir "*) ;;
++	      *) compile_command="$compile_command -L$absdir";;
++	      esac
++	      compile_command="$compile_command -l$name"
++	      deplibs="$deplibs -L$absdir -l$name"
++	    elif test "$hardcode_shlibpath_var" = yes; then
++	      case ":$compile_shlibpath:" in
++	      *":$absdir:"*) ;;
++	      *) compile_shlibpath="$compile_shlibpath$absdir:";;
++	      esac
++	      compile_command="$compile_command -l$name"
++	      deplibs="$deplibs -l$name"
++	    else
++	      lib_linked=no
++	    fi
++	    ;;
++
++	  *)
++	    lib_linked=no
++	    ;;
++	  esac
++
++	  if test "$lib_linked" != yes; then
++	    $echo "$modename: configuration error: unsupported hardcode properties"
++	    exit 1
++	  fi
++
++	  # Finalize command for both is simple: just hardcode it.
++	  if test "$hardcode_direct" = yes; then
++	    finalize_command="$finalize_command $libdir/$linklib"
++	  elif test "$hardcode_minus_L" = yes; then
++	    case "$finalize_command " in
++	    *" -L$libdir "*) ;;
++	    *) finalize_command="$finalize_command -L$libdir";;
++	    esac
++	    finalize_command="$finalize_command -l$name"
++	  elif test "$hardcode_shlibpath_var" = yes; then
++	    case ":$finalize_shlibpath:" in
++	    *":$libdir:"*) ;;
++	    *) finalize_shlibpath="$finalize_shlibpath$libdir:";;
++	    esac
++	    finalize_command="$finalize_command -l$name"
++	  else
++	    # We cannot seem to hardcode it, guess we'll fake it.
++	    case "$finalize_command " in
++	    *" -L$dir "*) ;;
++	    *) finalize_command="$finalize_command -L$libdir";;
++	    esac
++	    finalize_command="$finalize_command -l$name"
++	  fi
++	else
++	  # Transform directly to old archives if we don't build new libraries.
++	  if test -n "$pic_flag" && test -z "$old_library"; then
++	    $echo "$modename: cannot find static library for \`$arg'" 1>&2
++	    exit 1
++	  fi
++
++	  # Here we assume that one of hardcode_direct or hardcode_minus_L
++	  # is not unsupported.  This is valid on all known static and
++	  # shared platforms.
++	  if test "$hardcode_direct" != unsupported; then
++	    test -n "$old_library" && linklib="$old_library"
++	    compile_command="$compile_command $dir/$linklib"
++	    finalize_command="$finalize_command $dir/$linklib"
++	  else
++	    case "$compile_command " in
++	    *" -L$dir "*) ;;
++	    *) compile_command="$compile_command -L$dir";;
++	    esac
++	    compile_command="$compile_command -l$name"
++	    case "$finalize_command " in
++	    *" -L$dir "*) ;;
++	    *) finalize_command="$finalize_command -L$dir";;
++	    esac
++	    finalize_command="$finalize_command -l$name"
++	  fi
++	fi
++
++	# Add in any libraries that this one depends upon.
++	compile_command="$compile_command$dependency_libs"
+ 	finalize_command="$finalize_command$dependency_libs"
+ 	continue
+-        ;;
++	;;
+ 
+       # Some other compiler argument.
+       *)
+@@ -786,7 +1514,7 @@
+ 	  arg="\"$arg\""
+ 	  ;;
+ 	esac
+-        ;;
++	;;
+       esac
+ 
+       # Now actually substitute the argument into the commands.
+@@ -802,14 +1530,17 @@
+       exit 1
+     fi
+ 
+-    if test -n "$vinfo" && test -n "$release"; then
+-      $echo "$modename: you cannot specify both \`-version-info' and \`-release'" 1>&2
+-      $echo "$help" 1>&2
+-      exit 1
++    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
++      eval arg=\"$export_dynamic_flag_spec\"
++      compile_command="$compile_command $arg"
++      finalize_command="$finalize_command $arg"
+     fi
+ 
+-    oldlib=
+-    oldobjs=
++    oldlibs=
++    # calculate the name of the file, without its directory
++    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
++    libobjs_save="$libobjs"
++
+     case "$output" in
+     "")
+       $echo "$modename: you must specify an output file" 1>&2
+@@ -817,64 +1548,88 @@
+       exit 1
+       ;;
+ 
+-    */* | *\\*)
+-      $echo "$modename: output file \`$output' must have no directory components" 1>&2
+-      exit 1
+-      ;;
++    *.a | *.lib)
++      if test -n "$link_against_libtool_libs"; then
++	$echo "$modename: error: cannot link libtool libraries into archives" 1>&2
++	exit 1
++      fi
++
++      if test -n "$deplibs"; then
++	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
++      fi
++
++      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
++	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
++      fi
++
++      if test -n "$rpath"; then
++	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
++      fi
++
++      if test -n "$xrpath"; then
++	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
++      fi
++
++      if test -n "$vinfo"; then
++	$echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2
++      fi
++
++      if test -n "$release"; then
++	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
++      fi
++
++      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
++	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
++      fi
+ 
+-    *.a)
+       # Now set the variables for building old libraries.
+       build_libtool_libs=no
+-      build_old_libs=yes
+-      oldlib="$output"
+-      $show "$rm $oldlib"
+-      $run $rm $oldlib
++      oldlibs="$output"
+       ;;
+ 
+     *.la)
+       # Make sure we only generate libraries of the form `libNAME.la'.
+-      case "$output" in
+-      lib*) ;;
++      case "$outputname" in
++      lib*)
++	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
++	eval libname=\"$libname_spec\"
++	;;
+       *)
+-	$echo "$modename: libtool library \`$arg' must begin with \`lib'" 1>&2
+-	$echo "$help" 1>&2
+-	exit 1
++	if test "$module" = no; then
++	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
++	  $echo "$help" 1>&2
++	  exit 1
++	fi
++	if test "$need_lib_prefix" != no; then
++	  # Add the "lib" prefix for modules if required
++	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
++	  eval libname=\"$libname_spec\"
++	else
++	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
++	fi
+ 	;;
+       esac
+ 
+-      name=`$echo "X$output" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+-      eval libname=\"$libname_spec\"
+-
+-      # All the library-specific variables (install_libdir is set above).
+-      library_names=
+-      old_library=
+-      dlname=
+-      current=0
+-      revision=0
+-      age=0
++      output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
++      if test "X$output_objdir" = "X$output"; then
++	output_objdir="$objdir"
++      else
++	output_objdir="$output_objdir/$objdir"
++      fi
+ 
+       if test -n "$objs"; then
+-        $echo "$modename: cannot build libtool library \`$output' from non-libtool objects:$objs" 2>&1
+-        exit 1
++	$echo "$modename: cannot build libtool library \`$output' from non-libtool objects:$objs" 2>&1
++	exit 1
+       fi
+ 
+       # How the heck are we supposed to write a wrapper for a shared library?
+       if test -n "$link_against_libtool_libs"; then
+-        $echo "$modename: libtool library \`$output' may not depend on uninstalled libraries:$link_against_libtool_libs" 1>&2
+-        exit 1
++	 $echo "$modename: error: cannot link shared libraries into libtool libraries" 1>&2
++	 exit 1
+       fi
+ 
+-      if test -n "$dlfiles$dlprefiles"; then
+-        $echo "$modename: warning: \`-dlopen' is ignored while creating libtool libraries" 1>&2
+-        # Nullify the symbol file.
+-        compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+-        finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+-      fi
+-
+-      if test -z "$rpath"; then
+-        $echo "$modename: you must specify an installation directory with \`-rpath'" 1>&2
+-	$echo "$help" 1>&2
+-        exit 1
++      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
++	$echo "$modename: warning: \`-dlopen' is ignored for libtool libraries" 1>&2
+       fi
+ 
+       set dummy $rpath
+@@ -883,587 +1638,1235 @@
+       fi
+       install_libdir="$2"
+ 
+-      # Parse the version information argument.
+-      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=':'
+-      set dummy $vinfo
+-      IFS="$save_ifs"
++      oldlibs=
++      if test -z "$rpath"; then
++	if test "$build_libtool_libs" = yes; then
++	  # Building a libtool convenience library.
++	  libext=al
++	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
++	  build_libtool_libs=convenience
++	  build_old_libs=yes
++	fi
++	dependency_libs="$deplibs"
+ 
+-      if test -n "$5"; then
+-        $echo "$modename: too many parameters to \`-version-info'" 1>&2
+-        $echo "$help" 1>&2
+-        exit 1
+-      fi
++	if test -n "$vinfo"; then
++	  $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2
++	fi
+ 
+-      test -n "$2" && current="$2"
+-      test -n "$3" && revision="$3"
+-      test -n "$4" && age="$4"
+-
+-      # Check that each of the things are valid numbers.
+-      case "$current" in
+-      0 | [1-9] | [1-9][0-9]*) ;;
+-      *)
+-        $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
+-        $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-        exit 1
+-        ;;
+-      esac
++	if test -n "$release"; then
++	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
++	fi
++      else
+ 
+-      case "$revision" in
+-      0 | [1-9] | [1-9][0-9]*) ;;
+-      *)
+-        $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
+-        $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-        exit 1
+-        ;;
+-      esac
++	# Parse the version information argument.
++	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=':'
++	set dummy $vinfo 0 0 0
++	IFS="$save_ifs"
++
++	if test -n "$8"; then
++	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
++	  $echo "$help" 1>&2
++	  exit 1
++	fi
+ 
+-      case "$age" in
+-      0 | [1-9] | [1-9][0-9]*) ;;
+-      *)
+-        $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
+-        $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-        exit 1
+-        ;;
+-      esac
++	current="$2"
++	revision="$3"
++	age="$4"
++
++	# Check that each of the things are valid numbers.
++	case "$current" in
++	0 | [1-9] | [1-9][0-9]*) ;;
++	*)
++	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
++	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
++	  exit 1
++	  ;;
++	esac
++
++	case "$revision" in
++	0 | [1-9] | [1-9][0-9]*) ;;
++	*)
++	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
++	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
++	  exit 1
++	  ;;
++	esac
+ 
+-      if test $age -gt $current; then
+-        $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+-        $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+-        exit 1
+-      fi
+-
+-      # Calculate the version variables.
+-      version_vars="version_type current age revision"
+-      case "$version_type" in
+-      none) ;;
+-
+-      linux)
+-        version_vars="$version_vars major versuffix"
+-        major=`expr $current - $age`
+-        versuffix="$major.$age.$revision"
+-        ;;
+-
+-      osf)
+-        version_vars="$version_vars versuffix verstring"
+-        major=`expr $current - $age`
+-        versuffix="$current.$age.$revision"
+-        verstring="$versuffix"
+-
+-        # Add in all the interfaces that we are compatible with.
+-        loop=$age
+-        while test $loop != 0; do
+-          iface=`expr $current - $loop`
+-          loop=`expr $loop - 1`
+-          verstring="$verstring:${iface}.0"
+-        done
+-
+-        # Make executables depend on our current version.
+-        verstring="$verstring:${current}.0"
+-        ;;
+-
+-      sunos)
+-        version_vars="$version_vars major versuffix"
+-        major="$current"
+-        versuffix="$current.$revision"
+-        ;;
++	case "$age" in
++	0 | [1-9] | [1-9][0-9]*) ;;
++	*)
++	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
++	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
++	  exit 1
++	  ;;
++	esac
+ 
+-      *)
+-        $echo "$modename: unknown library version type \`$version_type'" 1>&2
+-        echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+-        exit 1
+-        ;;
+-      esac
++	if test $age -gt $current; then
++	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
++	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
++	  exit 1
++	fi
++
++	# Calculate the version variables.
++	major=
++	versuffix=
++	verstring=
++	case "$version_type" in
++	none) ;;
++
++	irix)
++	  major=`expr $current - $age + 1`
++	  versuffix="$major.$revision"
++	  verstring="sgi$major.$revision"
++
++	  # Add in all the interfaces that we are compatible with.
++	  loop=$revision
++	  while test $loop != 0; do
++	    iface=`expr $revision - $loop`
++	    loop=`expr $loop - 1`
++	    verstring="sgi$major.$iface:$verstring"
++	  done
++	  ;;
++
++	linux)
++	  major=.`expr $current - $age`
++	  versuffix="$major.$age.$revision"
++	  ;;
++
++	osf)
++	  major=`expr $current - $age`
++	  versuffix=".$current.$age.$revision"
++	  verstring="$current.$age.$revision"
++
++	  # Add in all the interfaces that we are compatible with.
++	  loop=$age
++	  while test $loop != 0; do
++	    iface=`expr $current - $loop`
++	    loop=`expr $loop - 1`
++	    verstring="$verstring:${iface}.0"
++	  done
++
++	  # Make executables depend on our current version.
++	  verstring="$verstring:${current}.0"
++	  ;;
++
++	sunos)
++	  major=".$current"
++	  versuffix=".$current.$revision"
++	  ;;
++
++	freebsd-aout)
++	  major=".$current"
++	  versuffix=".$current.$revision";
++	  ;;
++
++	freebsd-elf)
++	  major=".$current"
++	  versuffix=".$current";
++	  ;;
++
++	windows)
++	  # Like Linux, but with '-' rather than '.', since we only
++	  # want one extension on Windows 95.
++	  major=`expr $current - $age`
++	  versuffix="-$major-$age-$revision"
++	  ;;
++
++	darwin)
++	  # Like Linux, but with the current version available in
++	  # verstring for coding it into the library header
++	  major=.`expr $current - $age`
++	  versuffix="$major.$age.$revision"
++	  # Darwin ld doesn't like 0 for these options...
++	  minor_current=`expr $current + 1`
++	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
++	  ;;
++
++	*)
++	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
++	  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
++	  exit 1
++	  ;;
++	esac
++
++	# Clear the version info if we defaulted, and they specified a release.
++	if test -z "$vinfo" && test -n "$release"; then
++	  major=
++	  verstring="0.0"
++	  if test "$need_version" = no; then
++	    versuffix=
++	  else
++	    versuffix=".0.0"
++	  fi
++	fi
++
++	# Remove version info from name if versioning should be avoided
++	if test "$avoid_version" = yes && test "$need_version" = no; then
++	  major=
++	  versuffix=
++	  verstring=""
++	fi
++	
++	# Check to see if the archive will have undefined symbols.
++	if test "$allow_undefined" = yes; then
++	  if test "$allow_undefined_flag" = unsupported; then
++	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
++	    build_libtool_libs=no
++	    build_old_libs=yes
++	  fi
++	else
++	  # Don't allow undefined symbols.
++	  allow_undefined_flag="$no_undefined_flag"
++	fi
++
++	dependency_libs="$deplibs"
++	case "$host" in
++	*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
++	  # these systems don't actually have a c library (as such)!
++	  ;;
++        *-*-rhapsody* | *-*-darwin1.[012])
++	  # Rhapsody C library is in the System framework
++	  deplibs="$deplibs -framework System"
++	  ;;
++	*)
++	  # Add libc to deplibs on all other systems.
++	  deplibs="$deplibs -lc"
++	  ;;
++	esac
++      fi
+ 
+       # Create the output directory, or remove our outputs if we need to.
+-      if test -d $objdir; then
+-        $show "$rm $objdir/$output $objdir/$libname.* $objdir/${libname}${release}.*"
+-        $run $rm $objdir/$output $objdir/$libname.* $objdir/${libname}${release}.*
++      if test -d $output_objdir; then
++	$show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
++	$run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*
+       else
+-        $show "$mkdir $objdir"
+-        $run $mkdir $objdir
++	$show "$mkdir $output_objdir"
++	$run $mkdir $output_objdir
+ 	status=$?
+-	if test $status -eq 0 || test -d $objdir; then :
+-	else
++	if test $status -ne 0 && test ! -d $output_objdir; then
+ 	  exit $status
+ 	fi
+       fi
+ 
+-      # Check to see if the archive will have undefined symbols.
+-      if test "$allow_undefined" = yes; then
+-        if test "$allow_undefined_flag" = unsupported; then
+-          $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
+-          build_libtool_libs=no
+-	  build_old_libs=yes
+-        fi
+-      else
+-        # Don't allow undefined symbols.
+-        allow_undefined_flag="$no_undefined_flag"
++      # Now set the variables for building old libraries.
++      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
++	oldlibs="$oldlibs $output_objdir/$libname.$libext"
++
++	# Transform .lo files to .o files.
++	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+       fi
+ 
+-      # Add libc to deplibs on all systems.
+-      dependency_libs="$deplibs"
+-      deplibs="$deplibs -lc"
++      if test "$build_libtool_libs" = yes; then
++	# Transform deplibs into only deplibs that can be linked in shared.
++	name_save=$name
++	libname_save=$libname
++	release_save=$release
++	versuffix_save=$versuffix
++	major_save=$major
++	# I'm not sure if I'm treating the release correctly.  I think
++	# release should show up in the -l (ie -lgmp5) so we don't want to
++	# add it in twice.  Is that correct?
++	release=""
++	versuffix=""
++	major=""
++	newdeplibs=
++	droppeddeps=no
++	case "$deplibs_check_method" in
++	pass_all)
++	  # Don't check for shared/static.  Everything works.
++	  # This might be a little naive.  We might want to check
++	  # whether the library exists or not.  But this is on
++	  # osf3 & osf4 and I'm not really sure... Just
++	  # implementing what was already the behaviour.
++	  newdeplibs=$deplibs
++	  ;;
++	test_compile)
++	  # This code stresses the "libraries are programs" paradigm to its
++	  # limits. Maybe even breaks it.  We compile a program, linking it
++	  # against the deplibs as a proxy for the library.  Then we can check
++	  # whether they linked in statically or dynamically with ldd.
++	  $rm conftest.c
++	  cat > conftest.c <<EOF
++	  int main() { return 0; }
++EOF
++	  $rm conftest
++	  $CC -o conftest conftest.c $deplibs
++	  if test $? -eq 0 ; then
++	    ldd_output=`ldd conftest`
++	    for i in $deplibs; do
++	      name="`expr X$i : 'X-l\(.*\)'`"
++	      # If $name is empty we are operating on a -L argument.
++	      if test "$name" != "" ; then
++		libname=`eval \\$echo \"$libname_spec\"`
++		deplib_matches=`eval \\$echo \"$library_names_spec\"`
++		set dummy $deplib_matches
++		deplib_match=$2
++		if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
++		  newdeplibs="$newdeplibs $i"
++		else
++		  droppeddeps=yes
++		  echo
++		  echo "*** Warning: This library needs some functionality provided by $i."
++		  echo "*** I have the capability to make that library automatically link in when"
++		  echo "*** you link to this library.  But I can only do this if you have a"
++		  echo "*** shared version of the library, which you do not appear to have."
++		fi
++	      else
++		newdeplibs="$newdeplibs $i"
++	      fi
++	    done
++	  else
++	    # Error occured in the first compile.  Let's try to salvage the situation:
++	    # Compile a seperate program for each library.
++	    for i in $deplibs; do
++	      name="`expr X$i : 'X-l\(.*\)'`"
++	     # If $name is empty we are operating on a -L argument.
++	      if test "$name" != "" ; then
++		$rm conftest
++		$CC -o conftest conftest.c $i
++		# Did it work?
++		if test $? -eq 0 ; then
++		  ldd_output=`ldd conftest`
++		  libname=`eval \\$echo \"$libname_spec\"`
++		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
++		  set dummy $deplib_matches
++		  deplib_match=$2
++		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
++		    newdeplibs="$newdeplibs $i"
++		  else
++		    droppeddeps=yes
++		    echo
++		    echo "*** Warning: This library needs some functionality provided by $i."
++		    echo "*** I have the capability to make that library automatically link in when"
++		    echo "*** you link to this library.  But I can only do this if you have a"
++		    echo "*** shared version of the library, which you do not appear to have."
++		  fi
++		else
++		  droppeddeps=yes
++		  echo
++		  echo "*** Warning!  Library $i is needed by this library but I was not able to"
++		  echo "***  make it link in!  You will probably need to install it or some"
++		  echo "*** library that it depends on before this library will be fully"
++		  echo "*** functional.  Installing it before continuing would be even better."
++		fi
++	      else
++		newdeplibs="$newdeplibs $i"
++	      fi
++	    done
++	  fi
++	  ;;
++	file_magic*)
++	  set dummy $deplibs_check_method
++	  file_magic_regex="`expr \"$deplibs_check_method\" : \"$2 \(.*\)\"`"
++	  for a_deplib in $deplibs; do
++	    name="`expr X$a_deplib : 'X-l\(.*\)'`"
++	    # If $name is empty we are operating on a -L argument.
++	    if test "$name" != "" ; then
++	      libname=`eval \\$echo \"$libname_spec\"`
++	      for i in $lib_search_path; do
++		    potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
++		    for potent_lib in $potential_libs; do
++		      # Follow soft links.
++		      if ls -lLd "$potent_lib" 2>/dev/null \
++			 | grep " -> " >/dev/null; then
++			continue 
++		      fi
++		      # The statement above tries to avoid entering an
++		      # endless loop below, in case of cyclic links.
++		      # We might still enter an endless loop, since a link
++		      # loop can be closed while we follow links,
++		      # but so what?
++		      potlib="$potent_lib"
++		      while test -h "$potlib" 2>/dev/null; do
++			potliblink=`ls -ld $potlib | sed 's/.* -> //'`
++			case "$potliblink" in
++			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
++			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
++			esac
++		      done
++		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
++			 | sed 10q \
++			 | egrep "$file_magic_regex" > /dev/null; then
++			newdeplibs="$newdeplibs $a_deplib"
++			a_deplib=""
++			break 2
++		      fi
++		    done
++	      done
++	      if test -n "$a_deplib" ; then
++		droppeddeps=yes
++		echo
++		echo "*** Warning: This library needs some functionality provided by $a_deplib."
++		echo "*** I have the capability to make that library automatically link in when"
++		echo "*** you link to this library.  But I can only do this if you have a"
++		echo "*** shared version of the library, which you do not appear to have."
++	      fi
++	    else
++	      # Add a -L argument.
++	      newdeplibs="$newdeplibs $a_deplib"
++	    fi
++	  done # Gone through all deplibs.
++	  ;;
++	none | unknown | *)
++	  newdeplibs=""
++	  if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
++	       -e 's/ -[LR][^ ]*//g' -e 's/[ 	]//g' |
++	     grep . >/dev/null; then
++	    echo
++	    if test "X$deplibs_check_method" = "Xnone"; then
++	      echo "*** Warning: inter-library dependencies are not supported in this platform."
++	    else
++	      echo "*** Warning: inter-library dependencies are not known to be supported."
++	    fi
++	    echo "*** All declared inter-library dependencies are being dropped."
++	    droppeddeps=yes
++	  fi
++	  ;;
++	esac
++	versuffix=$versuffix_save
++	major=$major_save
++	release=$release_save
++	libname=$libname_save
++	name=$name_save
++
++	if test "$droppeddeps" = yes; then
++	  if test "$module" = yes; then
++	    echo
++	    echo "*** Warning: libtool could not satisfy all declared inter-library"
++	    echo "*** dependencies of module $libname.  Therefore, libtool will create"
++	    echo "*** a static module, that should work as long as the dlopening"
++	    echo "*** application is linked with the -dlopen flag."
++	    if test -z "$global_symbol_pipe"; then
++	      echo
++	      echo "*** However, this would only work if libtool was able to extract symbol"
++	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
++	      echo "*** not find such a program.  So, this module is probably useless."
++	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
++	    fi
++	    if test "$build_old_libs" = no; then
++	      oldlibs="$output_objdir/$libname.$libext"
++	      build_libtool_libs=module
++	      build_old_libs=yes
++	    else
++	      build_libtool_libs=no
++	    fi
++	  else
++	    echo "*** The inter-library dependencies that have been dropped here will be"
++	    echo "*** automatically added whenever a program is linked with this library"
++	    echo "*** or is declared to -dlopen it."
++	  fi
++	fi
++	# Done checking deplibs!
++	deplibs=$newdeplibs
++      fi
+ 
++      # All the library-specific variables (install_libdir is set above).
++      library_names=
++      old_library=
++      dlname=
++      
++      # Test again, we may have decided not to build it any more
+       if test "$build_libtool_libs" = yes; then
+-        # Get the real and link names of the library.
+-        eval library_names=\"$library_names_spec\"
+-        set dummy $library_names
+-        realname="$2"
+-        shift; shift
+-
+-        if test -n "$soname_spec"; then
+-          eval soname=\"$soname_spec\"
+-        else
+-          soname="$realname"
+-        fi
++	# Get the real and link names of the library.
++	eval library_names=\"$library_names_spec\"
++	set dummy $library_names
++	realname="$2"
++	shift; shift
+ 
+-        lib="$objdir/$realname"
++	if test -n "$soname_spec"; then
++	  eval soname=\"$soname_spec\"
++	else
++	  soname="$realname"
++	fi
++
++	lib="$output_objdir/$realname"
+ 	for link
+ 	do
+ 	  linknames="$linknames $link"
+ 	done
+ 
+-        # Use standard objects if they are PIC.
+-        test -z "$pic_flag" && libobjs=`$echo "X$libobjs " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//g'`
++	# Ensure that we have .o objects for linkers which dislike .lo
++	# (e.g. aix) in case we are running --disable-static
++	for obj in $libobjs; do
++	  xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
++	  if test "X$xdir" = "X$obj"; then
++	    xdir="."
++	  else
++	    xdir="$xdir"
++	  fi
++	  baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
++	  oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
++	  if test ! -f $xdir/$oldobj; then
++	    $show "(cd $xdir && ${LN_S} $baseobj $oldobj)"
++	    $run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $?
++	  fi
++	done
+ 
+-        # Do each of the archive commands.
+-        eval cmds=\"$archive_cmds\"
+-        IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
+-        for cmd in $cmds; do
+-          IFS="$save_ifs"
+-          $show "$cmd"
+-          $run eval "$cmd" || exit $?
+-        done
+-        IFS="$save_ifs"
+-
+-        # Create links to the real library.
+-        for linkname in $linknames; do
+-          $show "(cd $objdir && $LN_S $realname $linkname)"
+-          $run eval '(cd $objdir && $LN_S $realname $linkname)' || exit $?
+-        done
+-
+-        # If -export-dynamic was specified, set the dlname.
+-        if test "$export_dynamic" = yes; then
+-          # On all known operating systems, these are identical.
+-          dlname="$soname"
+-        fi
+-      fi
++	# Use standard objects if they are pic
++	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ 
+-      # Now set the variables for building old libraries.
+-      oldlib="$objdir/$libname.a"
++	# Prepare the list of exported symbols
++	if test -z "$export_symbols"; then
++	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
++	    $show "generating symbol list for \`$libname.la'"
++	    export_symbols="$output_objdir/$libname.exp"
++	    $run $rm $export_symbols
++	    eval cmds=\"$export_symbols_cmds\"
++	    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
++	    for cmd in $cmds; do
++	      IFS="$save_ifs"
++	      $show "$cmd"
++	      $run eval "$cmd" || exit $?
++	    done
++	    IFS="$save_ifs"
++	    if test -n "$export_symbols_regex"; then
++	      $show "egrep -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
++	      $run eval 'egrep -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
++	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
++	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
++	    fi
++	  fi
++	fi
++
++	if test -n "$export_symbols" && test -n "$include_expsyms"; then
++	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
++	fi
++
++	if test -n "$convenience"; then
++	  if test -n "$whole_archive_flag_spec"; then
++	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
++	  else
++	    gentop="$output_objdir/${outputname}x"
++	    $show "${rm}r $gentop"
++	    $run ${rm}r "$gentop"
++	    $show "mkdir $gentop"
++	    $run mkdir "$gentop"
++	    status=$?
++	    if test $status -ne 0 && test ! -d "$gentop"; then
++	      exit $status
++	    fi
++	    generated="$generated $gentop"
++
++	    for xlib in $convenience; do
++	      # Extract the objects.
++	      case "$xlib" in
++	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
++	      *) xabs=`pwd`"/$xlib" ;;
++	      esac
++	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
++	      xdir="$gentop/$xlib"
++
++	      $show "${rm}r $xdir"
++	      $run ${rm}r "$xdir"
++	      $show "mkdir $xdir"
++	      $run mkdir "$xdir"
++	      status=$?
++	      if test $status -ne 0 && test ! -d "$xdir"; then
++		exit $status
++	      fi
++	      $show "(cd $xdir && $AR x $xabs)"
++	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
++
++	      libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
++	    done
++	  fi
++	fi
++
++	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
++	  eval flag=\"$thread_safe_flag_spec\"
++	  linkopts="$linkopts $flag"
++	fi
++
++	# Do each of the archive commands.
++	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
++	  eval cmds=\"$archive_expsym_cmds\"
++	else
++	  if test "x$verstring" = "x0.0"; then
++	    tmp_verstring=
++	  else
++	    tmp_verstring="$verstring"
++	  fi
++	  eval cmds=\"$archive_cmds\"
++	fi
++	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
++	for cmd in $cmds; do
++	  IFS="$save_ifs"
++	  $show "$cmd"
++	  $run eval "$cmd" || exit $?
++	done
++	IFS="$save_ifs"
++
++	# Create links to the real library.
++	for linkname in $linknames; do
++	  if test "$realname" != "$linkname"; then
++	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
++	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
++	  fi
++	done
++
++	# If -module or -export-dynamic was specified, set the dlname.
++	if test "$module" = yes || test "$export_dynamic" = yes; then
++	  # On all known operating systems, these are identical.
++	  dlname="$soname"
++	fi
++      fi
+       ;;
+ 
+-    *.lo | *.o)
++    *.lo | *.o | *.obj)
+       if test -n "$link_against_libtool_libs"; then
+-        $echo "$modename: error: cannot link libtool libraries into reloadable objects" 1>&2
+-        exit 1
++	$echo "$modename: error: cannot link libtool libraries into objects" 1>&2
++	exit 1
+       fi
+ 
+       if test -n "$deplibs"; then
+-        $echo "$modename: warning: \`-l' and \`-L' are ignored while creating objects" 1>&2
++	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
+       fi
+ 
+-      if test -n "$dlfiles$dlprefiles"; then
+-        $echo "$modename: warning: \`-dlopen' is ignored while creating objects" 1>&2
+-        # Nullify the symbol file.
+-        compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+-        finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
++      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
++	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
+       fi
+ 
+       if test -n "$rpath"; then
+-        $echo "$modename: warning: \`-rpath' is ignored while creating objects" 1>&2
++	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
++      fi
++
++      if test -n "$xrpath"; then
++	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
+       fi
+ 
+       if test -n "$vinfo"; then
+-        $echo "$modename: warning: \`-version-info' is ignored while creating objects" 1>&2
++	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
+       fi
+ 
+       if test -n "$release"; then
+-        $echo "$modename: warning: \`-release' is ignored while creating objects" 1>&2
++	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
+       fi
+ 
+       case "$output" in
+       *.lo)
+-        if test -n "$objs"; then
+-          $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
+-          exit 1
+-        fi
+-        libobj="$output"
+-        obj=`$echo "X$output" | $Xsed -e 's/\.lo$/.o/'`
+-        ;;
++	if test -n "$objs"; then
++	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
++	  exit 1
++	fi
++	libobj="$output"
++	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
++	;;
+       *)
+-        libobj=
+-        obj="$output"
+-        ;;
++	libobj=
++	obj="$output"
++	;;
+       esac
+ 
+       # Delete the old objects.
+       $run $rm $obj $libobj
+ 
++      # Objects from convenience libraries.  This assumes
++      # single-version convenience libraries.  Whenever we create
++      # different ones for PIC/non-PIC, this we'll have to duplicate
++      # the extraction.
++      reload_conv_objs=
++      gentop=
++      # reload_cmds runs $LD directly, so let us get rid of
++      # -Wl from whole_archive_flag_spec
++      wl= 
++
++      if test -n "$convenience"; then
++	if test -n "$whole_archive_flag_spec"; then
++	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
++	else
++	  gentop="$output_objdir/${obj}x"
++	  $show "${rm}r $gentop"
++	  $run ${rm}r "$gentop"
++	  $show "mkdir $gentop"
++	  $run mkdir "$gentop"
++	  status=$?
++	  if test $status -ne 0 && test ! -d "$gentop"; then
++	    exit $status
++	  fi
++	  generated="$generated $gentop"
++
++	  for xlib in $convenience; do
++	    # Extract the objects.
++	    case "$xlib" in
++	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
++	    *) xabs=`pwd`"/$xlib" ;;
++	    esac
++	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
++	    xdir="$gentop/$xlib"
++
++	    $show "${rm}r $xdir"
++	    $run ${rm}r "$xdir"
++	    $show "mkdir $xdir"
++	    $run mkdir "$xdir"
++	    status=$?
++	    if test $status -ne 0 && test ! -d "$xdir"; then
++	      exit $status
++	    fi
++	    $show "(cd $xdir && $AR x $xabs)"
++	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
++
++	    reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
++	  done
++	fi
++      fi
++
+       # Create the old-style object.
+-      reload_objs="$objs"`$echo "X$libobjs " | $Xsed -e 's/[^       ]*\.a //g' -e 's/\.lo /.o /g' -e 's/ $//g'`
++      reload_objs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs"
+ 
+       output="$obj"
+       eval cmds=\"$reload_cmds\"
+-      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
++      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+       for cmd in $cmds; do
+-        IFS="$save_ifs"
+-        $show "$cmd"
+-        $run eval "$cmd" || exit $?
++	IFS="$save_ifs"
++	$show "$cmd"
++	$run eval "$cmd" || exit $?
+       done
+       IFS="$save_ifs"
+ 
+       # Exit if we aren't doing a library object file.
+-      test -z "$libobj" && exit 0
++      if test -z "$libobj"; then
++	if test -n "$gentop"; then
++	  $show "${rm}r $gentop"
++	  $run ${rm}r $gentop
++	fi
++
++	exit 0
++      fi
+ 
+       if test "$build_libtool_libs" != yes; then
+-        # Create an invalid libtool object if no PIC, so that we don't
+-        # accidentally link it into a program.
+-        $show "echo timestamp > $libobj"
+-        $run eval "echo timestamp > $libobj" || exit $?
+-        exit 0
++	if test -n "$gentop"; then
++	  $show "${rm}r $gentop"
++	  $run ${rm}r $gentop
++	fi
++
++	# Create an invalid libtool object if no PIC, so that we don't
++	# accidentally link it into a program.
++	$show "echo timestamp > $libobj"
++	$run eval "echo timestamp > $libobj" || exit $?
++	exit 0
+       fi
+ 
+       if test -n "$pic_flag"; then
+-        # Only do commands if we really have different PIC objects.
+-        reload_objs="$libobjs"
+-        output="$libobj"
+-        eval cmds=\"$reload_cmds\"
+-        IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
+-        for cmd in $cmds; do
+-          IFS="$save_ifs"
+-          $show "$cmd"
+-          $run eval "$cmd" || exit $?
+-        done
+-        IFS="$save_ifs"
++	# Only do commands if we really have different PIC objects.
++	reload_objs="$libobjs $reload_conv_objs"
++	output="$libobj"
++	eval cmds=\"$reload_cmds\"
++	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
++	for cmd in $cmds; do
++	  IFS="$save_ifs"
++	  $show "$cmd"
++	  $run eval "$cmd" || exit $?
++	done
++	IFS="$save_ifs"
+       else
+-        # Just create a symlink.
+-        $show "$LN_S $obj $libobj"
+-        $run $LN_S $obj $libobj || exit 1
++	# Just create a symlink.
++	$show $rm $libobj
++	$run $rm $libobj
++	xdir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
++	if test "X$xdir" = "X$libobj"; then
++	  xdir="."
++	else
++	  xdir="$xdir"
++	fi
++	baseobj=`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
++	oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
++	$show "(cd $xdir && $LN_S $oldobj $baseobj)"
++	$run eval '(cd $xdir && $LN_S $oldobj $baseobj)' || exit $?
++      fi
++
++      if test -n "$gentop"; then
++	$show "${rm}r $gentop"
++	$run ${rm}r $gentop
+       fi
+ 
+       exit 0
+       ;;
+ 
++    # Anything else should be a program.
+     *)
+       if test -n "$vinfo"; then
+-        $echo "$modename: warning: \`-version-info' is ignored while linking programs" 1>&2
++	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
+       fi
+ 
+       if test -n "$release"; then
+-        $echo "$modename: warning: \`-release' is ignored while creating objects" 1>&2
++	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
+       fi
+ 
+-      if test -n "$rpath"; then
++      if test "$preload" = yes; then
++	if test "$dlopen" = unknown && test "$dlopen_self" = unknown &&
++	   test "$dlopen_self_static" = unknown; then
++	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
++	fi 
++      fi
++    
++      if test -n "$rpath$xrpath"; then
+ 	# If the user specified any rpath flags, then add them.
+-	for libdir in $rpath; do
+-          if test -n "$hardcode_libdir_flag_spec"; then
+-            if test -n "$hardcode_libdir_separator"; then
+-              if test -z "$hardcode_libdirs"; then
+-                # Put the magic libdir with the hardcode flag.
+-                hardcode_libdirs="$libdir"
+-                libdir="@HARDCODE_LIBDIRS@"
+-              else
+-                # Just accumulate the unique libdirs.
+-		case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
+-		*"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+-		  ;;
+-		*)
+-		  hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+-		  ;;
+-		esac
+-                libdir=
+-              fi
+-            fi
+-
+-            if test -n "$libdir"; then
+-              eval flag=\"$hardcode_libdir_flag_spec\"
+-
+-              compile_command="$compile_command $flag"
+-              finalize_command="$finalize_command $flag"
+-            fi
+-          elif test -n "$runpath_var"; then
+-            case "$perm_rpath " in
+-            *" $libdir "*) ;;
+-            *) perm_rpath="$perm_rpath $libdir" ;;
+-            esac
+-          fi
++	for libdir in $rpath $xrpath; do
++	  # This is the magic to use -rpath.
++	  case "$compile_rpath " in
++	  *" $libdir "*) ;;
++	  *) compile_rpath="$compile_rpath $libdir" ;;
++	  esac
++	  case "$finalize_rpath " in
++	  *" $libdir "*) ;;
++	  *) finalize_rpath="$finalize_rpath $libdir" ;;
++	  esac
+ 	done
+       fi
+ 
+-      # Substitute the hardcoded libdirs into the compile commands.
+-      if test -n "$hardcode_libdir_separator"; then
+-	compile_command=`$echo "X$compile_command" | $Xsed -e "s%@HARDCODE_LIBDIRS@%$hardcode_libdirs%g"`
+-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@HARDCODE_LIBDIRS@%$hardcode_libdirs%g"`
++      # Now hardcode the library paths
++      rpath=
++      hardcode_libdirs=
++      for libdir in $compile_rpath $finalize_rpath; do
++	if test -n "$hardcode_libdir_flag_spec"; then
++	  if test -n "$hardcode_libdir_separator"; then
++	    if test -z "$hardcode_libdirs"; then
++	      hardcode_libdirs="$libdir"
++	    else
++	      # Just accumulate the unique libdirs.
++	      case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
++	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
++		;;
++	      *)
++		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
++		;;
++	      esac
++	    fi
++	  else
++	    eval flag=\"$hardcode_libdir_flag_spec\"
++	    rpath="$rpath $flag"
++	  fi
++	elif test -n "$runpath_var"; then
++	  case "$perm_rpath " in
++	  *" $libdir "*) ;;
++	  *) perm_rpath="$perm_rpath $libdir" ;;
++	  esac
++	fi
++      done
++      # Substitute the hardcoded libdirs into the rpath.
++      if test -n "$hardcode_libdir_separator" &&
++	 test -n "$hardcode_libdirs"; then
++	libdir="$hardcode_libdirs"
++	eval rpath=\" $hardcode_libdir_flag_spec\"
++      fi
++      compile_rpath="$rpath"
++
++      rpath=
++      hardcode_libdirs=
++      for libdir in $finalize_rpath; do
++	if test -n "$hardcode_libdir_flag_spec"; then
++	  if test -n "$hardcode_libdir_separator"; then
++	    if test -z "$hardcode_libdirs"; then
++	      hardcode_libdirs="$libdir"
++	    else
++	      # Just accumulate the unique libdirs.
++	      case "$hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator" in
++	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
++		;;
++	      *)
++		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
++		;;
++	      esac
++	    fi
++	  else
++	    eval flag=\"$hardcode_libdir_flag_spec\"
++	    rpath="$rpath $flag"
++	  fi
++	elif test -n "$runpath_var"; then
++	  case "$finalize_perm_rpath " in
++	  *" $libdir "*) ;;
++	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
++	  esac
++	fi
++      done
++      # Substitute the hardcoded libdirs into the rpath.
++      if test -n "$hardcode_libdir_separator" &&
++	 test -n "$hardcode_libdirs"; then
++	libdir="$hardcode_libdirs"
++	eval rpath=\" $hardcode_libdir_flag_spec\"
++      fi
++      finalize_rpath="$rpath"
++
++      output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
++      if test "X$output_objdir" = "X$output"; then
++	output_objdir="$objdir"
++      else
++	output_objdir="$output_objdir/$objdir"
++      fi
++
++      # Create the binary in the object directory, then wrap it.
++      if test ! -d $output_objdir; then
++	$show "$mkdir $output_objdir"
++	$run $mkdir $output_objdir
++	status=$?
++	if test $status -ne 0 && test ! -d $output_objdir; then
++	  exit $status
++	fi
+       fi
+ 
+       if test -n "$libobjs" && test "$build_old_libs" = yes; then
+-        # Transform all the library objects into standard objects.
+-        compile_command=`$echo "X$compile_command " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//'`
+-        finalize_command=`$echo "X$finalize_command " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//'`
+-      fi
+-
+-      if test "$export_dynamic" = yes && test -n "$NM" && test -n "$global_symbol_pipe"; then
+-        dlsyms="${output}S.c"
+-      else
+-        dlsyms=
++	# Transform all the library objects into standard objects.
++	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
++	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+       fi
+ 
+-      if test -n "$dlsyms"; then
+-        # Add our own program objects to the preloaded list.
+-        dlprefiles=`$echo "X$objs$dlprefiles " | $Xsed -e 's/\.lo /.o /g' -e 's/ $//'`
+-
+-	# Discover the nlist of each of the dlfiles.
+-        nlist="$objdir/${output}.nm"
+-
+-	if test -d $objdir; then
+-	  $show "$rm $nlist ${nlist}T"
+-	  $run $rm "$nlist" "${nlist}T"
++      dlsyms=
++      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
++	if test -n "$NM" && test -n "$global_symbol_pipe"; then
++	  dlsyms="${outputname}S.c"
+ 	else
+-	  $show "$mkdir $objdir"
+-	  $run $mkdir $objdir
+-	  status=$?
+-	  if test $status -eq 0 || test -d $objdir; then :
+-	  else
+-	    exit $status
+-	  fi
++	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
+ 	fi
++      fi
+ 
+-        for arg in $dlprefiles; do
+-	  $show "extracting global C symbols from \`$arg'"
+-	  $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
+-        done
+-
+-        # Parse the name list into a source file.
+-        $show "creating $objdir/$dlsyms"
+-        if test -z "$run"; then
+-	  # Make sure we at least have an empty file.
+-	  test -f "$nlist" || : > "$nlist"
+-
+-	  # Try sorting and uniquifying the output.
+-	  if sort "$nlist" | uniq > "$nlist"T; then
+-	    mv -f "$nlist"T "$nlist"
+-	    wcout=`wc "$nlist" 2>/dev/null`
+-	    count=`echo "X$wcout" | $Xsed -e 's/^[ 	]*\([0-9][0-9]*\).*$/\1/'`
+-	    (test "$count" -ge 0) 2>/dev/null || count=-1
+-	  else
+-	    $rm "$nlist"T
+-	    count=-1
+-	  fi
+-
+-	  case "$dlsyms" in
+-	  "") ;;
+-	  *.c)
+-	    $echo > "$objdir/$dlsyms" "\
+-/* $dlsyms - symbol resolution table for \`$output' dlsym emulation. */
+-/* Generated by $PROGRAM - GNU $PACKAGE $VERSION */
++      if test -n "$dlsyms"; then
++	case "$dlsyms" in
++	"") ;;
++	*.c)
++	  # Discover the nlist of each of the dlfiles.
++	  nlist="$output_objdir/${outputname}.nm"
++
++	  $show "$rm $nlist ${nlist}S ${nlist}T"
++	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
++
++	  # Parse the name list into a source file.
++	  $show "creating $output_objdir/$dlsyms"
++
++	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
++/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
++/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
+ 
+ #ifdef __cplusplus
+ extern \"C\" {
+ #endif
+ 
+ /* Prevent the only kind of declaration conflicts we can make. */
+-#define dld_preloaded_symbol_count some_other_symbol
+-#define dld_preloaded_symbols some_other_symbol
++#define lt_preloaded_symbols some_other_symbol
+ 
+ /* External symbol declarations for the compiler. */\
+ "
+ 
+-	    if test -f "$nlist"; then
+-	      sed -e 's/^.* \(.*\)$/extern char \1;/' < "$nlist" >> "$objdir/$dlsyms"
++	  if test "$dlself" = yes; then
++	    $show "generating symbol list for \`$output'"
++
++	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
++
++	    # Add our own program objects to the symbol list.
++	    progfiles=`$echo "X$objs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
++	    for arg in $progfiles; do
++	      $show "extracting global C symbols from \`$arg'"
++	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
++	    done
++
++	    if test -n "$exclude_expsyms"; then
++	      $run eval 'egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
++	      $run eval '$mv "$nlist"T "$nlist"'
++	    fi
++	    
++	    if test -n "$export_symbols_regex"; then
++	      $run eval 'egrep -e "$export_symbols_regex" "$nlist" > "$nlist"T'
++	      $run eval '$mv "$nlist"T "$nlist"'
++	    fi
++
++	    # Prepare the list of exported symbols
++	    if test -z "$export_symbols"; then
++	      export_symbols="$output_objdir/$output.exp"
++	      $run $rm $export_symbols
++	      $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+ 	    else
+-	      echo '/* NONE */' >> "$objdir/$dlsyms"
++	      $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
++	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
++	      $run eval 'mv "$nlist"T "$nlist"'
++	    fi
++	  fi
++
++	  for arg in $dlprefiles; do
++	    $show "extracting global C symbols from \`$arg'"
++	    name=`echo "$arg" | sed -e 's%^.*/%%'`
++	    $run eval 'echo ": $name " >> "$nlist"'
++	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
++	  done
++
++	  if test -z "$run"; then
++	    # Make sure we have at least an empty file.
++	    test -f "$nlist" || : > "$nlist"
++
++	    if test -n "$exclude_expsyms"; then
++	      egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
++	      $mv "$nlist"T "$nlist"
++	    fi
++
++	    # Try sorting and uniquifying the output.
++	    if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then
++	      :
++	    else
++	      grep -v "^: " < "$nlist" > "$nlist"S
++	    fi
++
++	    if test -f "$nlist"S; then
++	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
++	    else
++	      echo '/* NONE */' >> "$output_objdir/$dlsyms"
+ 	    fi
+ 
+-	    $echo >> "$objdir/$dlsyms" "\
++	    $echo >> "$output_objdir/$dlsyms" "\
+ 
+-#undef dld_preloaded_symbol_count
+-#undef dld_preloaded_symbols
++#undef lt_preloaded_symbols
+ 
+ #if defined (__STDC__) && __STDC__
+-# define __ptr_t void *
++# define lt_ptr_t void *
+ #else
+-# define __ptr_t char *
++# define lt_ptr_t char *
++# define const
+ #endif
+ 
+-/* The number of symbols in dld_preloaded_symbols, -1 if unsorted. */
+-int dld_preloaded_symbol_count = $count;
+-
+ /* The mapping between symbol names and symbols. */
+-struct {
+-  char *name;
+-  __ptr_t address;
++const struct {
++  const char *name;
++  lt_ptr_t address;
+ }
+-dld_preloaded_symbols[] =
++lt_preloaded_symbols[] =
+ {\
+ "
+ 
+-	    if test -f "$nlist"; then
+-	      sed 's/^\(.*\) \(.*\)$/  {"\1", (__ptr_t) \&\2},/' < "$nlist" >> "$objdir/$dlsyms"
+-	    fi
++	    sed -n -e 's/^: \([^ ]*\) $/  {\"\1\", (lt_ptr_t) 0},/p' \
++		-e 's/^. \([^ ]*\) \([^ ]*\)$/  {"\2", (lt_ptr_t) \&\2},/p' \
++		  < "$nlist" >> "$output_objdir/$dlsyms"
+ 
+-	    $echo >> "$objdir/$dlsyms" "\
+-  {0, (__ptr_t) 0}
++	    $echo >> "$output_objdir/$dlsyms" "\
++  {0, (lt_ptr_t) 0}
+ };
+ 
++/* This works around a problem in FreeBSD linker */
++#ifdef FREEBSD_WORKAROUND
++static const void *lt_preloaded_setup() {
++  return lt_preloaded_symbols;
++}
++#endif
++
+ #ifdef __cplusplus
+ }
+ #endif\
+ "
+-	    ;;
++	  fi
+ 
+-	  *)
+-	    $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
+-	    exit 1
+-	    ;;
++	  pic_flag_for_symtable=
++	  case "$host" in
++	  # compiling the symbol table file with pic_flag works around
++	  # a FreeBSD bug that causes programs to crash when -lm is
++	  # linked before any other PIC object.  But we must not use
++	  # pic_flag when linking with -static.  The problem exists in
++	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
++	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
++	    case "$compile_command " in
++	    *" -static "*) ;;
++	    *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";;
++	    esac;;
++	  *-*-hpux*)
++	    case "$compile_command " in
++	    *" -static "*) ;;
++	    *) pic_flag_for_symtable=" $pic_flag -DPIC";;
++	    esac
+ 	  esac
+-        fi
+ 
+-        # Now compile the dynamic symbol file.
+-        $show "(cd $objdir && $CC -c$no_builtin_flag \"$dlsyms\")"
+-        $run eval '(cd $objdir && $CC -c$no_builtin_flag "$dlsyms")' || exit $?
+-
+-        # Transform the symbol file into the correct name.
+-        compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$objdir/${output}S.o%"`
+-        finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$objdir/${output}S.o%"`
+-      elif test "$export_dynamic" != yes; then
+-        test -n "$dlfiles$dlprefiles" && $echo "$modename: warning: \`-dlopen' and \`-dlpreopen' are ignored without \`-export-dynamic'" 1>&2
++	  # Now compile the dynamic symbol file.
++	  $show "(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
++	  $run eval '(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
++
++	  # Clean up the generated files.
++	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
++	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
++
++	  # Transform the symbol file into the correct name.
++	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++	  ;;
++	*)
++	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
++	  exit 1
++	  ;;
++	esac
+       else
+-        # We keep going just in case the user didn't refer to
+-        # dld_preloaded_symbols.  The linker will fail if global_symbol_pipe
+-        # really was required.
+-        $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
+-
+-        # Nullify the symbol file.
+-        compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+-        finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
++	# We keep going just in case the user didn't refer to
++	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
++	# really was required.
++
++	# Nullify the symbol file.
++	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
++	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+       fi
+ 
+       if test -z "$link_against_libtool_libs" || test "$build_libtool_libs" != yes; then
+-        # Replace the output file specification.
+-        compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+-        finalize_command=`$echo "X$finalize_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+-
+-        # We have no uninstalled library dependencies, so finalize right now.
+-        $show "$compile_command"
+-        $run eval "$compile_command"
+-        exit $?
+-      fi
+-
+-      # Replace the output file specification.
+-      compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$objdir/$output"'%g'`
+-      finalize_command=`$echo "X$finalize_command" | $Xsed -e 's%@OUTPUT@%'"$objdir/$output"'T%g'`
+-
+-      # Create the binary in the object directory, then wrap it.
+-      if test -d $objdir; then :
+-      else
+-        $show "$mkdir $objdir"
+-	$run $mkdir $objdir
++	# Replace the output file specification.
++	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
++	link_command="$compile_command$compile_rpath"
++
++	# We have no uninstalled library dependencies, so finalize right now.
++	$show "$link_command"
++	$run eval "$link_command"
+ 	status=$?
+-	if test $status -eq 0 || test -d $objdir; then :
+-	else
+-	  exit $status
++	
++	# Delete the generated files.
++	if test -n "$dlsyms"; then
++	  $show "$rm $output_objdir/${outputname}S.${objext}"
++	  $run $rm "$output_objdir/${outputname}S.${objext}"
+ 	fi
++
++	exit $status
+       fi
+ 
+       if test -n "$shlibpath_var"; then
+-        # We should set the shlibpath_var
+-        rpath=
+-        for dir in $temp_rpath; do
+-          case "$dir" in
+-          /* | [A-Za-z]:\\*)
+-            # Absolute path.
+-            rpath="$rpath$dir:"
+-            ;;
+-          *)
+-            # Relative path: add a thisdir entry.
+-            rpath="$rpath\$thisdir/$dir:"
+-            ;;
+-          esac
+-        done
+-        temp_rpath="$rpath"
++	# We should set the shlibpath_var
++	rpath=
++	for dir in $temp_rpath; do
++	  case "$dir" in
++	  [\\/]* | [A-Za-z]:[\\/]*)
++	    # Absolute path.
++	    rpath="$rpath$dir:"
++	    ;;
++	  *)
++	    # Relative path: add a thisdir entry.
++	    rpath="$rpath\$thisdir/$dir:"
++	    ;;
++	  esac
++	done
++	temp_rpath="$rpath"
+       fi
+ 
+-      # Delete the old output file.
+-      $run $rm $output
+-
+-      if test -n "$compile_shlibpath"; then
+-        compile_command="$shlibpath_var=\"$compile_shlibpath\$$shlibpath_var\" $compile_command"
++      if test -n "$compile_shlibpath$finalize_shlibpath"; then
++	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+       fi
+       if test -n "$finalize_shlibpath"; then
+-        finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
++	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+       fi
+ 
+-      if test -n "$runpath_var" && test -n "$perm_rpath"; then
+-        # We should set the runpath_var.
+-        rpath=
+-        for dir in $perm_rpath; do
+-          rpath="$rpath$dir:"
+-        done
+-        compile_command="$runpath_var=\"$rpath\$$runpath_var\" $compile_command"
+-        finalize_command="$runpath_var=\"$rpath\$$runpath_var\" $finalize_command"
+-      fi
+-
+-      case "$hardcode_action" in
+-      relink)
+-        # AGH! Flame the AIX and HP-UX people for me, will ya?
+-        $echo "$modename: warning: using a buggy system linker" 1>&2
+-        $echo "$modename: relinking will be required before \`$output' can be installed" 1>&2
+-        ;;
+-      esac
++      compile_var=
++      finalize_var=
++      if test -n "$runpath_var"; then
++	if test -n "$perm_rpath"; then
++	  # We should set the runpath_var.
++	  rpath=
++	  for dir in $perm_rpath; do
++	    rpath="$rpath$dir:"
++	  done
++	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
++	fi
++	if test -n "$finalize_perm_rpath"; then
++	  # We should set the runpath_var.
++	  rpath=
++	  for dir in $finalize_perm_rpath; do
++	    rpath="$rpath$dir:"
++	  done
++	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
++	fi
++      fi
++
++      if test "$hardcode_action" = relink; then
++	# Fast installation is not supported
++	link_command="$compile_var$compile_command$compile_rpath"
++	relink_command="$finalize_var$finalize_command$finalize_rpath"
++	
++	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
++	$echo "$modename: \`$output' will be relinked during installation" 1>&2
++      else
++	if test "$fast_install" != no; then
++	  link_command="$finalize_var$compile_command$finalize_rpath"
++	  if test "$fast_install" = yes; then
++	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
++	  else
++	    # fast_install is set to needless
++	    relink_command=
++	  fi
++	else
++	  link_command="$compile_var$compile_command$compile_rpath"
++	  relink_command="$finalize_var$finalize_command$finalize_rpath"
++	fi
++      fi
++
++      # Replace the output file specification.
++      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
++      
++      # Delete the old output files.
++      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
+ 
+-      $show "$compile_command"
+-      $run eval "$compile_command" || exit $?
++      $show "$link_command"
++      $run eval "$link_command" || exit $?
+ 
+       # Now create the wrapper script.
+       $show "creating $output"
+ 
+-      # Quote the finalize command for shipping.
+-      finalize_command=`$echo "X$finalize_command" | $Xsed -e "$sed_quote_subst"`
++      # Quote the relink command for shipping.
++      if test -n "$relink_command"; then
++	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++      fi
+ 
+       # Quote $echo for shipping.
+-      qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
++      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
++	case "$0" in
++	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
++	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
++	esac
++	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
++      else
++	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
++      fi
+ 
+       # Only actually do things if our run command is non-null.
+       if test -z "$run"; then
+-        $rm $output
+-        trap "$rm $output; exit 1" 1 2 15
++	# win32 will think the script is a binary if it has
++	# a .exe suffix, so we strip it off here.
++	case $output in
++	  *.exe) output=`echo $output|sed 's,.exe$,,'` ;;
++	esac
++	$rm $output
++	trap "$rm $output; exit 1" 1 2 15
+ 
+-        $echo > $output "\
+-#! /bin/sh
++	$echo > $output "\
++#! $SHELL
+ 
+-# $output - temporary wrapper script for $objdir/$output
+-# Generated by ltmain.sh - GNU $PACKAGE $VERSION
++# $output - temporary wrapper script for $objdir/$outputname
++# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+ #
+ # The $output program cannot be directly executed until all the libtool
+ # libraries that it depends on are installed.
+ #
+-# This wrapper script should never be moved out of \``pwd`'.
++# This wrapper script should never be moved out of the build directory.
+ # If it is, it will not operate correctly.
+ 
+ # Sed substitution that helps us do robust quoting.  It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
++Xsed='sed -e 1s/^X//'
+ sed_quote_subst='$sed_quote_subst'
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test \"\${CDPATH+set}\" = set; then CDPATH=; export CDPATH; fi
++if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
++
++relink_command=\"$relink_command\"
+ 
+ # This environment variable determines our operation mode.
+ if test \"\$libtool_install_magic\" = \"$magic\"; then
+-  # install mode needs the following variables:
++  # install mode needs the following variable:
+   link_against_libtool_libs='$link_against_libtool_libs'
+-  finalize_command=\"$finalize_command\"
+ else
+   # When we are sourced in execute mode, \$file and \$echo are already set.
+-  if test \"\$libtool_execute_magic\" = \"$magic\"; then :
+-  else
++  if test \"\$libtool_execute_magic\" != \"$magic\"; then
+     echo=\"$qecho\"
+     file=\"\$0\"
++    # Make sure echo works.
++    if test \"X\$1\" = X--no-reexec; then
++      # Discard the --no-reexec flag, and continue.
++      shift
++    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
++      # Yippee, \$echo works!
++      :
++    else
++      # Restart under the correct shell, and then maybe \$echo will work.
++      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
++    fi
+   fi\
+ "
+-        $echo >> $output "\
++	$echo >> $output "\
+ 
+   # Find the directory that this script lives in.
+   thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+@@ -1477,7 +2880,7 @@
+     # If there was a directory component, then change thisdir.
+     if test \"x\$destdir\" != \"x\$file\"; then
+       case \"\$destdir\" in
+-      /* | [A-Za-z]:\\*) thisdir=\"\$destdir\" ;;
++      [\\/]* | [A-Za-z]:[\\/]*) thisdir=\"\$destdir\" ;;
+       *) thisdir=\"\$thisdir/\$destdir\" ;;
+       esac
+     fi
+@@ -1489,35 +2892,105 @@
+   # Try to get the absolute directory name.
+   absdir=\`cd \"\$thisdir\" && pwd\`
+   test -n \"\$absdir\" && thisdir=\"\$absdir\"
++"
++
++	if test "$fast_install" = yes; then
++	  echo >> $output "\
++  program=lt-'$outputname'
++  progdir=\"\$thisdir/$objdir\"
++  
++  if test ! -f \"\$progdir/\$program\" || \\
++     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\
++       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+ 
++    file=\"\$\$-\$program\"
++
++    if test ! -d \"\$progdir\"; then
++      $mkdir \"\$progdir\"
++    else
++      $rm \"\$progdir/\$file\"
++    fi"
++
++	  echo >> $output "\
++
++    # relink executable if necessary
++    if test -n \"\$relink_command\"; then
++      if (cd \"\$thisdir\" && eval \$relink_command); then :
++      else
++	$rm \"\$progdir/\$file\"
++	exit 1
++      fi
++    fi
++
++    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
++    { $rm \"\$progdir/\$program\";
++      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
++    $rm \"\$progdir/\$file\"
++  fi"
++	else
++	  echo >> $output "\
++  program='$outputname'
+   progdir=\"\$thisdir/$objdir\"
+-  program='$output'
++"
++	fi
++
++	echo >> $output "\
+ 
+   if test -f \"\$progdir/\$program\"; then"
+ 
+-        # Export our shlibpath_var if we have one.
+-        if test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+-          $echo >> $output "\
++	# Export our shlibpath_var if we have one.
++	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
++	  $echo >> $output "\
+     # Add our own library path to $shlibpath_var
+     $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+ 
+     # Some systems cannot cope with colon-terminated $shlibpath_var
+-    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/:*\$//'\`
++    # The second colon is a workaround for a bug in BeOS R4 sed
++    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+ 
+     export $shlibpath_var
+ "
+-        fi
++	fi
++
++	# fixup the dll searchpath if we need to.
++	if test -n "$dllsearchpath"; then
++	  $echo >> $output "\
++    # Add the dll search path components to the executable PATH
++    PATH=$dllsearchpath:\$PATH
++"
++	fi
+ 
+-        $echo >> $output "\
++	$echo >> $output "\
+     if test \"\$libtool_execute_magic\" != \"$magic\"; then
+       # Run the actual program with our arguments.
++"
++	case $host in
++	  # win32 systems need to use the prog path for dll
++	  # lookup to work
++	*-*-cygwin*)
++	  $echo >> $output "\
++      exec \$progdir/\$program \${1+\"\$@\"}
++"
++	  ;;
+ 
++	# Backslashes separate directories on plain windows
++	*-*-mingw | *-*-os2*)
++	  $echo >> $output "\
++      exec \$progdir\\\\\$program \${1+\"\$@\"}
++"
++	  ;;
++
++	*)
++	  $echo >> $output "\
+       # Export the path to the program.
+       PATH=\"\$progdir:\$PATH\"
+       export PATH
+ 
+       exec \$program \${1+\"\$@\"}
+-
++"
++	  ;;
++	esac
++	$echo >> $output "\
+       \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+       exit 1
+     fi
+@@ -1530,45 +3003,135 @@
+   fi
+ fi\
+ "
+-        chmod +x $output
++	chmod +x $output
+       fi
+       exit 0
+       ;;
+     esac
+ 
+     # See if we need to build an old-fashioned archive.
+-    if test "$build_old_libs" = "yes"; then
+-      # Transform .lo files to .o files.
+-      oldobjs="$objs"`$echo "X$libobjs " | $Xsed -e 's/[^   ]*\.a //g' -e 's/\.lo /.o /g' -e 's/ $//g'`
++    for oldlib in $oldlibs; do
++
++      if test "$build_libtool_libs" = convenience; then
++	oldobjs="$libobjs_save"
++	addlibs="$convenience"
++	build_libtool_libs=no
++      else
++	if test "$build_libtool_libs" = module; then
++	  oldobjs="$libobjs_save"
++	  build_libtool_libs=no
++	else
++	  oldobjs="$objs "`$echo "X$libobjs_save" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`
++	fi
++	addlibs="$old_convenience"
++      fi
++
++      if test -n "$addlibs"; then
++	gentop="$output_objdir/${outputname}x"
++	$show "${rm}r $gentop"
++	$run ${rm}r "$gentop"
++	$show "mkdir $gentop"
++	$run mkdir "$gentop"
++	status=$?
++	if test $status -ne 0 && test ! -d "$gentop"; then
++	  exit $status
++	fi
++	generated="$generated $gentop"
++	  
++	# Add in members from convenience archives.
++	for xlib in $addlibs; do
++	  # Extract the objects.
++	  case "$xlib" in
++	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
++	  *) xabs=`pwd`"/$xlib" ;;
++	  esac
++	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
++	  xdir="$gentop/$xlib"
++
++	  $show "${rm}r $xdir"
++	  $run ${rm}r "$xdir"
++	  $show "mkdir $xdir"
++	  $run mkdir "$xdir"
++	  status=$?
++	  if test $status -ne 0 && test ! -d "$xdir"; then
++	    exit $status
++	  fi
++	  $show "(cd $xdir && $AR x $xabs)"
++	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
++
++	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
++	done
++      fi
+ 
+       # Do each command in the archive commands.
+       if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+ 	eval cmds=\"$old_archive_from_new_cmds\"
+       else
++	# Ensure that we have .o objects in place in case we decided
++	# not to build a shared library, and have fallen back to building
++	# static libs even though --disable-static was passed!
++	for oldobj in $oldobjs; do
++	  if test ! -f $oldobj; then
++	    xdir=`$echo "X$oldobj" | $Xsed -e 's%/[^/]*$%%'`
++	    if test "X$xdir" = "X$oldobj"; then
++	      xdir="."
++	    else
++	      xdir="$xdir"
++	    fi
++	    baseobj=`$echo "X$oldobj" | $Xsed -e 's%^.*/%%'`
++	    obj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
++	    $show "(cd $xdir && ${LN_S} $obj $baseobj)"
++	    $run eval '(cd $xdir && ${LN_S} $obj $baseobj)' || exit $?
++	  fi
++	done
++
+ 	eval cmds=\"$old_archive_cmds\"
+       fi
+-      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
++      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+       for cmd in $cmds; do
+-        IFS="$save_ifs"
+-        $show "$cmd"
+-        $run eval "$cmd" || exit $?
++	IFS="$save_ifs"
++	$show "$cmd"
++	$run eval "$cmd" || exit $?
+       done
+       IFS="$save_ifs"
++    done
++
++    if test -n "$generated"; then
++      $show "${rm}r$generated"
++      $run ${rm}r$generated
+     fi
+ 
+     # Now create the libtool archive.
+     case "$output" in
+     *.la)
+       old_library=
+-      test "$build_old_libs" = yes && old_library="$libname.a"
+-
++      test "$build_old_libs" = yes && old_library="$libname.$libext"
+       $show "creating $output"
+ 
++      if test -n "$xrpath"; then
++	temp_xrpath=
++	for libdir in $xrpath; do
++	  temp_xrpath="$temp_xrpath -R$libdir"
++	done
++	dependency_libs="$temp_xrpath $dependency_libs"
++      fi
++
+       # Only create the output if not a dry run.
+       if test -z "$run"; then
+-        $echo > $output "\
+-# $output - a libtool library file
+-# Generated by ltmain.sh - GNU $PACKAGE $VERSION
++	for installed in no yes; do
++	  if test "$installed" = yes; then
++	    if test -z "$install_libdir"; then
++	      break
++	    fi
++	    output="$output_objdir/$outputname"i
++	  fi
++	  $rm $output
++	  $echo > $output "\
++# $outputname - a libtool library file
++# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
++#
++# Please DO NOT delete this file!
++# It is necessary for linking the library.
+ 
+ # The name that we can dlopen(3).
+ dlname='$dlname'
+@@ -1587,15 +3150,19 @@
+ age=$age
+ revision=$revision
+ 
++# Is this an already installed library?
++installed=$installed
++
+ # Directory that this library needs to be installed in:
+ libdir='$install_libdir'\
+ "
++	done
+       fi
+ 
+       # Do a symbolic link so that the libtool archive can be found in
+       # LD_LIBRARY_PATH before the program is installed.
+-      $show "(cd $objdir && $LN_S ../$output $output)"
+-      $run eval "(cd $objdir && $LN_S ../$output $output)" || exit 1
++      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
++      $run eval "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)" || exit $?
+       ;;
+     esac
+     exit 0
+@@ -1605,9 +3172,9 @@
+   install)
+     modename="$modename: install"
+ 
+-    # There may be an optional /bin/sh argument at the beginning of
++    # There may be an optional sh(1) argument at the beginning of
+     # install_prog (especially on Windows NT).
+-    if test "$nonopt" = "$SHELL"; then
++    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh; then
+       # Aesthetically quote it.
+       arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
+       case "$arg" in
+@@ -1639,14 +3206,14 @@
+     opts=
+     prev=
+     install_type=
+-    isdir=
++    isdir=no
+     stripme=
+     for arg
+     do
+       if test -n "$dest"; then
+-        files="$files $dest"
+-        dest="$arg"
+-        continue
++	files="$files $dest"
++	dest="$arg"
++	continue
+       fi
+ 
+       case "$arg" in
+@@ -1656,20 +3223,20 @@
+       -m) prev="-m" ;;
+       -o) prev="-o" ;;
+       -s)
+-        stripme=" -s"
+-        continue
+-        ;;
++	stripme=" -s"
++	continue
++	;;
+       -*) ;;
+ 
+       *)
+-        # If the previous option needed an argument, then skip it.
+-        if test -n "$prev"; then
+-          prev=
+-        else
+-          dest="$arg"
+-          continue
+-        fi
+-        ;;
++	# If the previous option needed an argument, then skip it.
++	if test -n "$prev"; then
++	  prev=
++	else
++	  dest="$arg"
++	  continue
++	fi
++	;;
+       esac
+ 
+       # Aesthetically quote the argument.
+@@ -1696,9 +3263,9 @@
+ 
+     if test -z "$files"; then
+       if test -z "$dest"; then
+-        $echo "$modename: no file or destination specified" 1>&2
++	$echo "$modename: no file or destination specified" 1>&2
+       else
+-        $echo "$modename: you must specify a destination" 1>&2
++	$echo "$modename: you must specify a destination" 1>&2
+       fi
+       $echo "$help" 1>&2
+       exit 1
+@@ -1709,7 +3276,7 @@
+ 
+     # Check to see that the destination is a directory.
+     test -d "$dest" && isdir=yes
+-    if test -n "$isdir"; then
++    if test "$isdir" = yes; then
+       destdir="$dest"
+       destname=
+     else
+@@ -1720,23 +3287,23 @@
+       # Not a directory, so check to see that there is only one file specified.
+       set dummy $files
+       if test $# -gt 2; then
+-        $echo "$modename: \`$dest' is not a directory" 1>&2
+-        $echo "$help" 1>&2
+-        exit 1
++	$echo "$modename: \`$dest' is not a directory" 1>&2
++	$echo "$help" 1>&2
++	exit 1
+       fi
+     fi
+     case "$destdir" in
+-    /* | [A-Za-z]:\\*) ;;
++    [\\/]* | [A-Za-z]:[\\/]*) ;;
+     *)
+       for file in $files; do
+-        case "$file" in
+-        *.lo) ;;
+-        *)
+-          $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
+-          $echo "$help" 1>&2
+-          exit 1
+-          ;;
+-        esac
++	case "$file" in
++	*.lo) ;;
++	*)
++	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
++	  $echo "$help" 1>&2
++	  exit 1
++	  ;;
++	esac
+       done
+       ;;
+     esac
+@@ -1752,209 +3319,214 @@
+ 
+       # Do each installation.
+       case "$file" in
+-      *.a)
+-        # Do the static libraries later.
+-        staticlibs="$staticlibs $file"
+-        ;;
++      *.a | *.lib)
++	# Do the static libraries later.
++	staticlibs="$staticlibs $file"
++	;;
+ 
+       *.la)
+-        # Check to see that this really is a libtool archive.
+-        if (sed -e '2q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then :
+-        else
+-          $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
+-          $echo "$help" 1>&2
+-          exit 1
+-        fi
+-
+-        library_names=
+-        old_library=
+-        # If there is no directory component, then add one.
+-        case "$file" in
+-        */* | *\\*) . $file ;;
+-        *) . ./$file ;;
+-        esac
+-
+-        # Add the libdir to current_libdirs if it is the destination.
+-        if test "X$destdir" = "X$libdir"; then
+-          case "$current_libdirs " in
+-          *" $libdir "*) ;;
+-          *) current_libdirs="$current_libdirs $libdir" ;;
+-          esac
+-        else
+-          # Note the libdir as a future libdir.
+-          case "$future_libdirs " in
+-          *" $libdir "*) ;;
+-          *) future_libdirs="$future_libdirs $libdir" ;;
+-          esac
+-        fi
+-
+-        dir="`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/"
+-        test "X$dir" = "X$file/" && dir=
+-        dir="$dir$objdir"
+-
+-        # See the names of the shared library.
+-        set dummy $library_names
+-        if test -n "$2"; then
+-          realname="$2"
+-          shift
+-          shift
+-
+-          # Install the shared library and build the symlinks.
+-          $show "$install_prog $dir/$realname $destdir/$realname"
+-          $run eval "$install_prog $dir/$realname $destdir/$realname" || exit $?
+-          test "X$dlname" = "X$realname" && dlname=
+-
+-          if test $# -gt 0; then
+-            # Delete the old symlinks.
+-            rmcmd="$rm"
+-            for linkname
+-            do
+-              rmcmd="$rmcmd $destdir/$linkname"
+-            done
+-            $show "$rmcmd"
+-            $run $rmcmd
+-
+-            # ... and create new ones.
+-            for linkname
+-            do
+-              test "X$dlname" = "X$linkname" && dlname=
+-              $show "(cd $destdir && $LN_S $realname $linkname)"
+-              $run eval "(cd $destdir && $LN_S $realname $linkname)"
+-            done
+-          fi
+-
+-          if test -n "$dlname"; then
+-            # Install the dynamically-loadable library.
+-            $show "$install_prog $dir/$dlname $destdir/$dlname"
+-            $run eval "$install_prog $dir/$dlname $destdir/$dlname" || exit $?
+-          fi
+-
+-          # Do each command in the postinstall commands.
+-          lib="$destdir/$realname"
+-          eval cmds=\"$postinstall_cmds\"
+-          IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
+-          for cmd in $cmds; do
+-            IFS="$save_ifs"
+-            $show "$cmd"
+-            $run eval "$cmd" || exit $?
+-          done
+-          IFS="$save_ifs"
+-        fi
+-
+-        # Install the pseudo-library for information purposes.
+-        name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+-        $show "$install_prog $file $destdir/$name"
+-        $run eval "$install_prog $file $destdir/$name" || exit $?
+-
+-        # Maybe install the static library, too.
+-        test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+-        ;;
++	# Check to see that this really is a libtool archive.
++	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
++	else
++	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
++	  $echo "$help" 1>&2
++	  exit 1
++	fi
++
++	library_names=
++	old_library=
++	# If there is no directory component, then add one.
++	case "$file" in
++	*/* | *\\*) . $file ;;
++	*) . ./$file ;;
++	esac
++
++	# Add the libdir to current_libdirs if it is the destination.
++	if test "X$destdir" = "X$libdir"; then
++	  case "$current_libdirs " in
++	  *" $libdir "*) ;;
++	  *) current_libdirs="$current_libdirs $libdir" ;;
++	  esac
++	else
++	  # Note the libdir as a future libdir.
++	  case "$future_libdirs " in
++	  *" $libdir "*) ;;
++	  *) future_libdirs="$future_libdirs $libdir" ;;
++	  esac
++	fi
++
++	dir="`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/"
++	test "X$dir" = "X$file/" && dir=
++	dir="$dir$objdir"
++
++	# See the names of the shared library.
++	set dummy $library_names
++	if test -n "$2"; then
++	  realname="$2"
++	  shift
++	  shift
++
++	  # Install the shared library and build the symlinks.
++	  $show "$install_prog $dir/$realname $destdir/$realname"
++	  $run eval "$install_prog $dir/$realname $destdir/$realname" || exit $?
++
++	  if test $# -gt 0; then
++	    # Delete the old symlinks, and create new ones.
++	    for linkname
++	    do
++	      if test "$linkname" != "$realname"; then
++		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
++		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
++	      fi
++	    done
++	  fi
++
++	  # Do each command in the postinstall commands.
++	  lib="$destdir/$realname"
++	  eval cmds=\"$postinstall_cmds\"
++	  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
++	  for cmd in $cmds; do
++	    IFS="$save_ifs"
++	    $show "$cmd"
++	    $run eval "$cmd" || exit $?
++	  done
++	  IFS="$save_ifs"
++	fi
++
++	# Install the pseudo-library for information purposes.
++	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
++	instname="$dir/$name"i
++	$show "$install_prog $instname $destdir/$name"
++	$run eval "$install_prog $instname $destdir/$name" || exit $?
++
++	# Maybe install the static library, too.
++	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
++	;;
+ 
+       *.lo)
+-        # Install (i.e. copy) a libtool object.
++	# Install (i.e. copy) a libtool object.
++
++	# Figure out destination file name, if it wasn't already specified.
++	if test -n "$destname"; then
++	  destfile="$destdir/$destname"
++	else
++	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
++	  destfile="$destdir/$destfile"
++	fi
++
++	# Deduce the name of the destination old-style object file.
++	case "$destfile" in
++	*.lo)
++	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
++	  ;;
++	*.o | *.obj)
++	  staticdest="$destfile"
++	  destfile=
++	  ;;
++	*)
++	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
++	  $echo "$help" 1>&2
++	  exit 1
++	  ;;
++	esac
++
++	# Install the libtool object if requested.
++	if test -n "$destfile"; then
++	  $show "$install_prog $file $destfile"
++	  $run eval "$install_prog $file $destfile" || exit $?
++	fi
++
++	# Install the old object if enabled.
++	if test "$build_old_libs" = yes; then
++	  # Deduce the name of the old-style object file.
++	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
+ 
+-        # Figure out destination file name, if it wasn't already specified.
+-        if test -n "$destname"; then
+-          destfile="$destdir/$destname"
+-        else
+-          destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+-          destfile="$destdir/$destfile"
+-        fi
+-
+-        # Deduce the name of the destination old-style object file.
+-        case "$destfile" in
+-        *.lo)
+-          staticdest=`$echo "X$destfile" | $Xsed -e 's/\.lo$/\.o/'`
+-          ;;
+-        *.o)
+-          staticdest="$destfile"
+-          destfile=
+-          ;;
+-        *)
+-          $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
+-          $echo "$help" 1>&2
+-          exit 1
+-          ;;
+-        esac
+-
+-        # Install the libtool object if requested.
+-        if test -n "$destfile"; then
+-          $show "$install_prog $file $destfile"
+-          $run eval "$install_prog $file $destfile" || exit $?
+-        fi
+-
+-        # Install the old object if enabled.
+-        if test "$build_old_libs" = yes; then
+-          # Deduce the name of the old-style object file.
+-          staticobj=`$echo "X$file" | $Xsed -e 's/\.lo$/\.o/'`
+-
+-          $show "$install_prog $staticobj $staticdest"
+-          $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+-        fi
+-        exit 0
+-        ;;
++	  $show "$install_prog $staticobj $staticdest"
++	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
++	fi
++	exit 0
++	;;
+ 
+       *)
+-        # Do a test to see if this is really a libtool program.
+-        if (sed -e '4q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then
+-          link_against_libtool_libs=
+-          finalize_command=
+-
+-          # If there is no directory component, then add one.
+-          case "$file" in
+-          */* | *\\*) . $file ;;
+-          *) . ./$file ;;
+-          esac
+-
+-          # Check the variables that should have been set.
+-          if test -z "$link_against_libtool_libs" || test -z "$finalize_command"; then
+-            $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2
+-            exit 1
+-          fi
+-
+-          finalize=yes
+-          for lib in $link_against_libtool_libs; do
+-            # Check to see that each library is installed.
+-            libdir=
+-            if test -f "$lib"; then
+-              # If there is no directory component, then add one.
+-              case "$lib" in
+-              */* | *\\*) . $lib ;;
+-              *) . ./$lib ;;
+-              esac
+-            fi
+-            libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`"
+-            if test -z "$libdir"; then
+-              $echo "$modename: warning: \`$lib' contains no -rpath information" 1>&2
+-            elif test -f "$libfile"; then :
+-            else
+-              $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
+-              finalize=no
+-            fi
+-          done
+-
+-          if test "$hardcode_action" = relink; then
+-            if test "$finalize" = yes; then
+-              $echo "$modename: warning: relinking \`$file' on behalf of your buggy system linker" 1>&2
+-              $show "$finalize_command"
+-              if $run eval "$finalize_command"; then :
+-              else
+-                $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+-                continue
+-              fi
+-              file="$objdir/$file"T
+-            else
+-              $echo "$modename: warning: cannot relink \`$file' on behalf of your buggy system linker" 1>&2
+-            fi
+-          else
+-            # Install the binary that we compiled earlier.
++	# Figure out destination file name, if it wasn't already specified.
++	if test -n "$destname"; then
++	  destfile="$destdir/$destname"
++	else
++	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
++	  destfile="$destdir/$destfile"
++	fi
++
++	# Do a test to see if this is really a libtool program.
++	if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++	  link_against_libtool_libs=
++	  relink_command=
++
++	  # If there is no directory component, then add one.
++	  case "$file" in
++	  */* | *\\*) . $file ;;
++	  *) . ./$file ;;
++	  esac
++
++	  # Check the variables that should have been set.
++	  if test -z "$link_against_libtool_libs"; then
++	    $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2
++	    exit 1
++	  fi
++
++	  finalize=yes
++	  for lib in $link_against_libtool_libs; do
++	    # Check to see that each library is installed.
++	    libdir=
++	    if test -f "$lib"; then
++	      # If there is no directory component, then add one.
++	      case "$lib" in
++	      */* | *\\*) . $lib ;;
++	      *) . ./$lib ;;
++	      esac
++	    fi
++	    libfile="$libdir/`$echo "X$lib" | $Xsed -e 's%^.*/%%g'`"
++	    if test -n "$libdir" && test ! -f "$libfile"; then
++	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
++	      finalize=no
++	    fi
++	  done
++
++	  outputname=
++	  if test "$fast_install" = no && test -n "$relink_command"; then
++	    if test "$finalize" = yes && test -z "$run"; then
++	      tmpdir="/tmp"
++	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
++	      tmpdir="$tmpdir/libtool-$$"
++	      if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
++	      else
++		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
++		continue
++	      fi
++	      outputname="$tmpdir/$file"
++	      # Replace the output file specification.
++	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
++
++	      $show "$relink_command"
++	      if $run eval "$relink_command"; then :
++	      else
++		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
++		${rm}r "$tmpdir"
++		continue
++	      fi
++	      file="$outputname"
++	    else
++	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
++	    fi
++	  else
++	    # Install the binary that we compiled earlier.
+ 	    file=`$echo "X$file" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+-          fi
+-        fi
++	  fi
++	fi
+ 
+-        $show "$install_prog$stripme $file $dest"
+-        $run eval "$install_prog\$stripme \$file \$dest" || exit $?
+-        ;;
++	$show "$install_prog$stripme $file $destfile"
++	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
++	test -n "$outputname" && ${rm}r "$tmpdir"
++	;;
+       esac
+     done
+ 
+@@ -1969,11 +3541,11 @@
+ 
+       # Do each command in the postinstall commands.
+       eval cmds=\"$old_postinstall_cmds\"
+-      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
++      IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+       for cmd in $cmds; do
+-        IFS="$save_ifs"
+-        $show "$cmd"
+-        $run eval "$cmd" || exit $?
++	IFS="$save_ifs"
++	$show "$cmd"
++	$run eval "$cmd" || exit $?
+       done
+       IFS="$save_ifs"
+     done
+@@ -1996,43 +3568,49 @@
+   finish)
+     modename="$modename: finish"
+     libdirs="$nonopt"
++    admincmds=
+ 
+     if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+       for dir
+       do
+-        libdirs="$libdirs $dir"
++	libdirs="$libdirs $dir"
+       done
+ 
+       for libdir in $libdirs; do
+ 	if test -n "$finish_cmds"; then
+ 	  # Do each command in the finish commands.
+ 	  eval cmds=\"$finish_cmds\"
+-          IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
+-          for cmd in $cmds; do
+-            IFS="$save_ifs"
+-            $show "$cmd"
+-            $run eval "$cmd"
+-          done
+-          IFS="$save_ifs"
++	  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
++	  for cmd in $cmds; do
++	    IFS="$save_ifs"
++	    $show "$cmd"
++	    $run eval "$cmd" || admincmds="$admincmds
++       $cmd"
++	  done
++	  IFS="$save_ifs"
+ 	fi
+ 	if test -n "$finish_eval"; then
+ 	  # Do the single finish_eval.
+ 	  eval cmds=\"$finish_eval\"
+-	  $run eval "$cmds"
++	  $run eval "$cmds" || admincmds="$admincmds
++       $cmds"
+ 	fi
+       done
+     fi
+ 
+-    echo "------------------------------------------------------------------------------"
++    # Exit here if they wanted silent mode.
++    test "$show" = : && exit 0
++
++    echo "----------------------------------------------------------------------"
+     echo "Libraries have been installed in:"
+     for libdir in $libdirs; do
+       echo "   $libdir"
+     done
+     echo
+-    echo "To link against installed libraries in a given directory, LIBDIR,"
+-    echo "you must use the \`-LLIBDIR' flag during linking."
+-    echo
+-    echo " You will also need to do one of the following:"
++    echo "If you ever happen to want to link against installed libraries"
++    echo "in a given directory, LIBDIR, you must either use libtool, and"
++    echo "specify the full pathname of the library, or use \`-LLIBDIR'"
++    echo "flag during linking and do at least one of the following:"
+     if test -n "$shlibpath_var"; then
+       echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+       echo "     during execution"
+@@ -2047,13 +3625,16 @@
+ 
+       echo "   - use the \`$flag' linker flag"
+     fi
++    if test -n "$admincmds"; then
++      echo "   - have your system administrator run these commands:$admincmds"
++    fi
+     if test -f /etc/ld.so.conf; then
+       echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+     fi
+     echo
+     echo "See any operating system documentation about shared libraries for"
+     echo "more information, such as the ld(1) and ld.so(8) manual pages."
+-    echo "------------------------------------------------------------------------------"
++    echo "----------------------------------------------------------------------"
+     exit 0
+     ;;
+ 
+@@ -2071,8 +3652,7 @@
+ 
+     # Handle -dlopen flags immediately.
+     for file in $execute_dlfiles; do
+-      if test -f "$file"; then :
+-      else
++      if test ! -f "$file"; then
+ 	$echo "$modename: \`$file' is not a file" 1>&2
+ 	$echo "$help" 1>&2
+ 	exit 1
+@@ -2081,22 +3661,22 @@
+       dir=
+       case "$file" in
+       *.la)
+-        # Check to see that this really is a libtool archive.
+-        if (sed -e '2q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then :
+-        else
+-          $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+-          $echo "$help" 1>&2
+-          exit 1
+-        fi
++	# Check to see that this really is a libtool archive.
++	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
++	else
++	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
++	  $echo "$help" 1>&2
++	  exit 1
++	fi
+ 
+ 	# Read the libtool library.
+ 	dlname=
+ 	library_names=
+ 
+-        # If there is no directory component, then add one.
++	# If there is no directory component, then add one.
+ 	case "$file" in
+ 	*/* | *\\*) . $file ;;
+-        *) . ./$file ;;
++	*) . ./$file ;;
+ 	esac
+ 
+ 	# Skip this library if it cannot be dlopened.
+@@ -2125,7 +3705,7 @@
+ 
+       *)
+ 	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
+-        continue
++	continue
+ 	;;
+       esac
+ 
+@@ -2152,8 +3732,8 @@
+       case "$file" in
+       -*) ;;
+       *)
+-        # Do a test to see if this is really a libtool program.
+-        if (sed -e '4q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then
++	# Do a test to see if this is really a libtool program.
++	if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ 	  # If there is no directory component, then add one.
+ 	  case "$file" in
+ 	  */* | *\\*) . $file ;;
+@@ -2163,7 +3743,7 @@
+ 	  # Transform arg to wrapped name.
+ 	  file="$progdir/$program"
+ 	fi
+-        ;;
++	;;
+       esac
+       # Quote arguments (to preserve shell metacharacters).
+       file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
+@@ -2171,8 +3751,18 @@
+     done
+ 
+     if test -z "$run"; then
+-      # Export the shlibpath_var.
+-      eval "export $shlibpath_var"
++      if test -n "$shlibpath_var"; then
++        # Export the shlibpath_var.
++        eval "export $shlibpath_var"
++      fi
++
++      # Restore saved enviroment variables
++      if test "${save_LC_ALL+set}" = set; then
++	LC_ALL="$save_LC_ALL"; export LC_ALL
++      fi
++      if test "${save_LANG+set}" = set; then
++	LANG="$save_LANG"; export LANG
++      fi
+ 
+       # Now actually exec the command.
+       eval "exec \$cmd$args"
+@@ -2181,8 +3771,10 @@
+       exit 1
+     else
+       # Display what would be done.
+-      eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
+-      $echo "export $shlibpath_var"
++      if test -n "$shlibpath_var"; then
++        eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
++        $echo "export $shlibpath_var"
++      fi
+       $echo "$cmd$args"
+       exit 0
+     fi
+@@ -2217,17 +3809,15 @@
+ 
+       case "$name" in
+       *.la)
+-        # Possibly a libtool archive, so verify it.
+-        if (sed -e '2q' $file | egrep '^# Generated by ltmain\.sh') >/dev/null 2>&1; then
+-          . $dir/$name
+-
+-          # Delete the libtool libraries and symlinks.
+-          for n in $library_names; do
+-            rmfiles="$rmfiles $dir/$n"
+-            test "X$n" = "X$dlname" && dlname=
+-          done
+-          test -n "$dlname" && rmfiles="$rmfiles $dir/$dlname"
+-          test -n "$old_library" && rmfiles="$rmfiles $dir/$old_library"
++	# Possibly a libtool archive, so verify it.
++	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
++	  . $dir/$name
++
++	  # Delete the libtool libraries and symlinks.
++	  for n in $library_names; do
++	    rmfiles="$rmfiles $dir/$n"
++	  done
++	  test -n "$old_library" && rmfiles="$rmfiles $dir/$old_library"
+ 
+ 	  $show "$rm $rmfiles"
+ 	  $run $rm $rmfiles
+@@ -2235,7 +3825,7 @@
+ 	  if test -n "$library_names"; then
+ 	    # Do each command in the postuninstall commands.
+ 	    eval cmds=\"$postuninstall_cmds\"
+-	    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
++	    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+ 	    for cmd in $cmds; do
+ 	      IFS="$save_ifs"
+ 	      $show "$cmd"
+@@ -2244,10 +3834,10 @@
+ 	    IFS="$save_ifs"
+ 	  fi
+ 
+-          if test -n "$old_library"; then
++	  if test -n "$old_library"; then
+ 	    # Do each command in the old_postuninstall commands.
+ 	    eval cmds=\"$old_postuninstall_cmds\"
+-	    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=';'
++	    IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
+ 	    for cmd in $cmds; do
+ 	      IFS="$save_ifs"
+ 	      $show "$cmd"
+@@ -2256,21 +3846,21 @@
+ 	    IFS="$save_ifs"
+ 	  fi
+ 
+-          # FIXME: should reinstall the best remaining shared library.
+-        fi
+-        ;;
++	  # FIXME: should reinstall the best remaining shared library.
++	fi
++	;;
+ 
+       *.lo)
+-        if test "$build_old_libs" = yes; then
+-          oldobj=`$echo "X$name" | $Xsed -e 's/\.lo$/\.o/'`
+-          rmfiles="$rmfiles $dir/$oldobj"
+-        fi
++	if test "$build_old_libs" = yes; then
++	  oldobj=`$echo "X$name" | $Xsed -e "$lo2o"`
++	  rmfiles="$rmfiles $dir/$oldobj"
++	fi
+ 	$show "$rm $rmfiles"
+ 	$run $rm $rmfiles
+-        ;;
++	;;
+ 
+       *)
+-      	$show "$rm $rmfiles"
++	$show "$rm $rmfiles"
+ 	$run $rm $rmfiles
+ 	;;
+       esac
+@@ -2297,8 +3887,10 @@
+ 
+ Provide generalized library-building support services.
+ 
++    --config          show all configuration variables
++    --debug           enable verbose shell tracing
+ -n, --dry-run         display commands without modifying any files
+-    --features        display configuration information and exit
++    --features        display basic configuration information and exit
+     --finish          same as \`--mode=finish'
+     --help            display this help message and exit
+     --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
+@@ -2326,6 +3918,11 @@
+ 
+ Compile a source file into a libtool library object.
+ 
++This mode accepts the following additional options:
++
++  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
++  -static           always build a \`.o' file suitable for static linking
++
+ COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+ from the given SOURCEFILE.
+ 
+@@ -2392,18 +3989,25 @@
+ The following components of LINK-COMMAND are treated specially:
+ 
+   -all-static       do not do any dynamic linking at all
++  -avoid-version    do not add a version suffix if possible
+   -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
+-  -dlpreopen FILE   link in FILE and add its symbols to dld_preloaded_symbols
++  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
++  -export-symbols SYMFILE
++		    try to export only the symbols listed in SYMFILE
++  -export-symbols-regex REGEX
++		    try to export only the symbols matching REGEX
+   -LLIBDIR          search LIBDIR for required installed libraries
+   -lNAME            OUTPUT-FILE requires the installed library libNAME
++  -module           build a library that can dlopened
+   -no-undefined     declare that a library does not refer to external symbols
+   -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
+   -release RELEASE  specify package release information
+   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
++  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
+   -static           do not do any dynamic linking of libtool libraries
+   -version-info CURRENT[:REVISION[:AGE]]
+-                    specify library version info [each variable defaults to 0]
++		    specify library version info [each variable defaults to 0]
+ 
+ All other options (arguments beginning with \`-') are ignored.
+ 
+@@ -2411,18 +4015,19 @@
+ treated as uninstalled libtool libraries, other files are standard or library
+ object files.
+ 
+-If the OUTPUT-FILE ends in \`.la', then a libtool library is created, only
+-library objects (\`.lo' files) may be specified, and \`-rpath' is required.
++If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
++only library objects (\`.lo' files) may be specified, and \`-rpath' is
++required, except when creating a convenience library.
+ 
+-If OUTPUT-FILE ends in \`.a', then a standard library is created using \`ar'
+-and \`ranlib'.
++If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
++using \`ar' and \`ranlib', or on Windows using \`lib'.
+ 
+-If OUTPUT-FILE ends in \`.lo' or \`.o', then a reloadable object file is
+-created, otherwise an executable program is created."
++If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
++is created, otherwise an executable program is created."
+   ;;
+ 
+ uninstall)
+-  $echo
++  $echo \
+ "Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+ 
+ Remove libraries from an installation directory.
Index: scripts/untested/blfs-patches/lesstif-0.94.0-use_libdir.patch
===================================================================
--- scripts/untested/blfs-patches/lesstif-0.94.0-use_libdir.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/lesstif-0.94.0-use_libdir.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,165 @@
+diff -uNr lesstif-0.94.0-orig/Makefile.in lesstif-0.94.0/Makefile.in
+--- lesstif-0.94.0-orig/Makefile.in	2004-12-04 08:09:35.000000000 +1100
++++ lesstif-0.94.0/Makefile.in	2005-02-10 14:28:57.481146336 +1100
+@@ -282,11 +282,11 @@
+ # Lets put the informational stuff in a sub directory to avoid 
+ # poluting /usr/local for default installs.
+ #
+-rootdir = $(prefix)/LessTif
++rootdir = $(prefix)/share/LessTif
+ dist_root_DATA = AUTHORS  BUG-REPORTING  COPYING  COPYING.LIB  CREDITS \
+                 FAQ  INSTALL.txt  README  ReleaseNotes.html ReleaseNotes.txt
+ 
+-htmldir = $(prefix)/LessTif/doc
++htmldir = $(prefix)/share/LessTif/doc
+ html_DATA = ReleaseNotes.html
+ 
+ #
+diff -uNr lesstif-0.94.0-orig/configure lesstif-0.94.0/configure
+--- lesstif-0.94.0-orig/configure	2004-12-04 08:09:22.000000000 +1100
++++ lesstif-0.94.0/configure	2005-02-10 14:41:49.382799448 +1100
+@@ -28275,6 +28275,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
++#include <ft2build.h>
+ #include <$ac_header>
+ _ACEOF
+ rm -f conftest.$ac_objext
+@@ -28319,6 +28320,7 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++#include <ft2build.h>
+ #include <$ac_header>
+ _ACEOF
+ if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+diff -uNr lesstif-0.94.0-orig/doc/Makefile.in lesstif-0.94.0/doc/Makefile.in
+--- lesstif-0.94.0-orig/doc/Makefile.in	2004-12-04 08:09:30.000000000 +1100
++++ lesstif-0.94.0/doc/Makefile.in	2005-02-10 14:28:57.507142384 +1100
+@@ -259,7 +259,7 @@
+ # InsideLessTif/ shouldn't be touched:
+ # it has a stand-alone Makefile w/o auto* stuff
+ SUBDIRS = www.lesstif.org lessdox
+-rootdir = $(prefix)/LessTif/doc
++rootdir = $(prefix)/share/LessTif/doc
+ root_DATA = All.html Clipboard.txt DragAndDrop.txt Form.txt \
+ 		GeoUtils.txt Geometry.html SyntheticResources.txt \
+ 		UIL.txt XmStrings.txt thread.html
+diff -uNr lesstif-0.94.0-orig/doc/lessdox/clients/Makefile.in lesstif-0.94.0/doc/lessdox/clients/Makefile.in
+--- lesstif-0.94.0-orig/doc/lessdox/clients/Makefile.in	2004-12-04 08:09:30.000000000 +1100
++++ lesstif-0.94.0/doc/lessdox/clients/Makefile.in	2005-02-10 14:28:57.515141168 +1100
+@@ -257,7 +257,7 @@
+ manone_DATA = mwm.1 xmbind.1 lesstif.1 uil.1 ltversion.1
+ manthree_DATA = 
+ manfive_DATA = mwmrc.5 VirtualBindings.5
+-htmldir = $(prefix)/LessTif/doc/html
++htmldir = $(prefix)/share/LessTif/doc/html
+ html_DATA = mwm.html mwmrc.html xmbind.html lesstif.html uil.html \
+             VirtualBindings.html
+ 
+diff -uNr lesstif-0.94.0-orig/doc/lessdox/functions/Makefile.in lesstif-0.94.0/doc/lessdox/functions/Makefile.in
+--- lesstif-0.94.0-orig/doc/lessdox/functions/Makefile.in	2004-12-04 08:09:30.000000000 +1100
++++ lesstif-0.94.0/doc/lessdox/functions/Makefile.in	2005-02-10 14:28:57.519140560 +1100
+@@ -257,7 +257,7 @@
+ manone_DATA = 
+ manthree_DATA = 
+ manfive_DATA = 
+-htmldir = $(prefix)/LessTif/doc/html
++htmldir = $(prefix)/share/LessTif/doc/html
+ html_DATA = ${manone_DATA:.1=.html} ${manthree_DATA:.3=.html} \
+                 ${manfive_DATA:.5=.html}
+ 
+diff -uNr lesstif-0.94.0-orig/doc/lessdox/widgets/Makefile.in lesstif-0.94.0/doc/lessdox/widgets/Makefile.in
+--- lesstif-0.94.0-orig/doc/lessdox/widgets/Makefile.in	2004-12-04 08:09:31.000000000 +1100
++++ lesstif-0.94.0/doc/lessdox/widgets/Makefile.in	2005-02-10 14:28:57.517140864 +1100
+@@ -282,7 +282,7 @@
+ 	Rect.3 UnNamedObj.3 Constraint.3 VendorShell.3
+ 
+ manfive_DATA = 
+-htmldir = $(prefix)/LessTif/doc/html
++htmldir = $(prefix)/share/LessTif/doc/html
+ html_DATA = ${manone_DATA:.1=.html} ${manthree_DATA:.3=.html} \
+                 ${manfive_DATA:.5=.html}
+ 
+@@ -549,7 +549,7 @@
+ # in both the http://www.lesstif.org and the locally installed case.
+ #
+ install-data-hook:
+-	if [ ! -h $(DESTDIR)$(prefix)/LessTif/doc/Lessdox ]; then mkdir -p $(DESTDIR)$(prefix)/LessTif/doc && cd $(DESTDIR)$(prefix)/LessTif/doc && $(LN_S) html Lessdox; fi
++	if [ ! -h $(DESTDIR)$(prefix)/share/LessTif/doc/Lessdox ]; then mkdir -p $(DESTDIR)$(prefix)/share/LessTif/doc && cd $(DESTDIR)$(prefix)/share/LessTif/doc && $(LN_S) html Lessdox; fi
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+diff -uNr lesstif-0.94.0-orig/doc/www.lesstif.org/Makefile.in lesstif-0.94.0/doc/www.lesstif.org/Makefile.in
+--- lesstif-0.94.0-orig/doc/www.lesstif.org/Makefile.in	2004-12-04 08:09:31.000000000 +1100
++++ lesstif-0.94.0/doc/www.lesstif.org/Makefile.in	2005-02-10 14:28:57.509142080 +1100
+@@ -263,7 +263,7 @@
+ # Lets put the informational stuff in a sub directory to avoid 
+ # polluting /usr/local for default installs.
+ #
+-docdir = $(prefix)/LessTif/doc
++docdir = $(prefix)/share/LessTif/doc
+ doc_DATA = \
+    Advocacy.html          contents.html          misc_frame.html \
+    BUG-HUNTING.html       core.html              news.html \
+diff -uNr lesstif-0.94.0-orig/doc/www.lesstif.org/images/Makefile.in lesstif-0.94.0/doc/www.lesstif.org/images/Makefile.in
+--- lesstif-0.94.0-orig/doc/www.lesstif.org/images/Makefile.in	2004-12-04 08:09:31.000000000 +1100
++++ lesstif-0.94.0/doc/www.lesstif.org/images/Makefile.in	2005-02-10 14:28:57.511141776 +1100
+@@ -253,7 +253,7 @@
+ # Lets put the informational stuff in a sub directory to avoid 
+ # poluting /usr/local for default installs.
+ #
+-rootdir = $(prefix)/LessTif/doc/images
++rootdir = $(prefix)/share/LessTif/doc/images
+ root_DATA = hungry.png \
+ 		lesstif-realsmall.png lesstif-small.png lesstif.png \
+ 		ltsunlogo.png lesstif.jpg ltsunlogo.jpg \
+diff -uNr lesstif-0.94.0-orig/lib/Dt/Makefile.in lesstif-0.94.0/lib/Dt/Makefile.in
+--- lesstif-0.94.0-orig/lib/Dt/Makefile.in	2004-12-04 08:09:33.000000000 +1100
++++ lesstif-0.94.0/lib/Dt/Makefile.in	2005-02-10 15:35:04.088130416 +1100
+@@ -248,7 +248,7 @@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ lib_version_suffix = @lib_version_suffix@
+-libdir = $(exec_prefix)/lib
++libdir = @libdir@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ man2html_cmd = @man2html_cmd@
+diff -uNr lesstif-0.94.0-orig/lib/Mrm-2.1/Makefile.in lesstif-0.94.0/lib/Mrm-2.1/Makefile.in
+--- lesstif-0.94.0-orig/lib/Mrm-2.1/Makefile.in	2004-12-04 08:09:33.000000000 +1100
++++ lesstif-0.94.0/lib/Mrm-2.1/Makefile.in	2005-02-10 15:33:54.035779992 +1100
+@@ -235,7 +235,7 @@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ lib_version_suffix = @lib_version_suffix@
+-libdir = $(exec_prefix)/lib
++libdir = @libdir@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ man2html_cmd = @man2html_cmd@
+diff -uNr lesstif-0.94.0-orig/lib/Uil-2.1/Makefile.in lesstif-0.94.0/lib/Uil-2.1/Makefile.in
+--- lesstif-0.94.0-orig/lib/Uil-2.1/Makefile.in	2004-12-04 08:09:33.000000000 +1100
++++ lesstif-0.94.0/lib/Uil-2.1/Makefile.in	2005-02-10 15:34:25.309025736 +1100
+@@ -238,7 +238,7 @@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ lib_version_suffix = @lib_version_suffix@
+-libdir = $(exec_prefix)/lib
++libdir = @libdir@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ man2html_cmd = @man2html_cmd@
+diff -uNr lesstif-0.94.0-orig/lib/Xm-2.1/Makefile.in lesstif-0.94.0/lib/Xm-2.1/Makefile.in
+--- lesstif-0.94.0-orig/lib/Xm-2.1/Makefile.in	2004-12-04 08:09:34.000000000 +1100
++++ lesstif-0.94.0/lib/Xm-2.1/Makefile.in	2005-02-10 15:33:22.771532880 +1100
+@@ -297,7 +297,7 @@
+ infodir = @infodir@
+ install_sh = @install_sh@
+ lib_version_suffix = @lib_version_suffix@
+-libdir = $(exec_prefix)/lib
++libdir = @libdir@
+ libexecdir = @libexecdir@
+ localstatedir = @localstatedir@
+ man2html_cmd = @man2html_cmd@
Index: scripts/untested/blfs-patches/libmpeg3-1.5.4-gcc34-1.patch
===================================================================
--- scripts/untested/blfs-patches/libmpeg3-1.5.4-gcc34-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/libmpeg3-1.5.4-gcc34-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,95 @@
+Submitted By: Jeremy Utley (jeremy@linuxfromscratch.org)
+Date: 2004-05-20
+Initial Package Version: 1.5.4
+Upstream Status: Not Submitted
+Origin: Self Created
+Description: Fixes syntax issues with GCC 3.4
+
+$LastChangedBy: randy $
+$Date: 2004-08-22 09:47:08 -0600 (Sun, 22 Aug 2004) $
+
+diff -uNr libmpeg3-1.5.4/video/output.c 
+libmpeg3-1.5.4.jbit/video/output.c
+--- libmpeg3-1.5.4/video/output.c	2003-11-07 13:32:32.000000000 -0800
++++ libmpeg3-1.5.4.jbit/video/output.c	2004-04-13 12:54:53.756934515 -0700
+@@ -1062,3 +1062,39 @@
+ /* Not used */
+ 	return 0;
+ }
++
++#ifdef HAVE_MMX
++/* 
++	Make sure that these vars get linked
++	For some reason gcc3.4 doesn't link them
++	There's gotta be a better way to do this, this is just a quick hack
++*/
++void ___jbit_hack()
++{
++	void *foo;
++	foo = &mpeg3_MMX_0;
++	foo = mpeg3_MMX_10w;
++	foo = mpeg3_MMX_80w;
++	foo = mpeg3_MMX_00FFw;
++	foo = mpeg3_MMX_Ublucoeff;
++	foo = mpeg3_MMX_Vredcoeff;
++	foo = mpeg3_MMX_Ugrncoeff;
++	foo = mpeg3_MMX_Vgrncoeff;
++	foo = mpeg3_MMX_Ycoeff;
++	foo = mpeg3_MMX_redmask;
++	foo = mpeg3_MMX_grnmask;
++	foo = mpeg3_601_to_rgb;
++
++	foo = &mpeg3_MMX_U_80;
++	foo = &mpeg3_MMX_V_80;
++	foo = &mpeg3_MMX_U_COEF;
++	foo = &mpeg3_MMX_V_COEF;
++	foo = &mpeg3_MMX_601_Y_COEF;
++	foo = &mpeg3_MMX_601_Y_DIFF;
++
++	foo = &mpeg3_MMX_U_80_RGB;
++	foo = &mpeg3_MMX_V_80_RGB;
++	foo = &mpeg3_MMX_U_COEF_RGB;
++	foo = &mpeg3_MMX_V_COEF_RGB;
++}
++#endif
+diff -uNr libmpeg3-1.5.4/video/reconstruct.c libmpeg3-1.5.4.jbit/video/reconstruct.c
+--- libmpeg3-1.5.4/video/reconstruct.c	2003-10-14 00:54:14.000000000 -0700
++++ libmpeg3-1.5.4.jbit/video/reconstruct.c	2004-04-13 12:57:23.280261795 -0700
+@@ -1286,4 +1286,16 @@
+ 	return 0;
+ }
+ 
+-
++#ifdef HAVE_MMX
++/* 
++        Make sure that these vars get linked
++        For some reason gcc3.4 doesn't link them
++        There's gotta be a better way to do this, this is just a quick hack
++*/
++void ___jbit_hack_reconstruct()
++{
++	void *foo;
++	foo = &MASK_AND;
++	foo = &ADD_1;
++}
++#endif 
+diff -uNr libmpeg3-1.5.4/video/slice.c libmpeg3-1.5.4.jbit/video/slice.c
+--- libmpeg3-1.5.4/video/slice.c	2003-10-14 00:54:14.000000000 -0700
++++ libmpeg3-1.5.4.jbit/video/slice.c	2004-04-13 12:55:54.710884733 -0700
+@@ -706,3 +706,16 @@
+ 	pthread_mutex_destroy(&(slice->output_lock));
+ 	return 0;
+ }
++
++#ifdef HAVE_MMX
++/* 
++        Make sure that these vars get linked
++        For some reason gcc3.4 doesn't link them
++        There's gotta be a better way to do this, this is just a quick hack
++*/
++void ___jbit_hack_slice()
++{
++	void *foo;
++	foo = &MMX_128;
++}
++#endif 
Index: scripts/untested/blfs-patches/libmpeg3-1.5.4-shared_libmpeg3-1.patch
===================================================================
--- scripts/untested/blfs-patches/libmpeg3-1.5.4-shared_libmpeg3-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/libmpeg3-1.5.4-shared_libmpeg3-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,154 @@
+diff -uNr libmpeg3-1.5.4-orig/mpeg3split.c libmpeg3-1.5.4/mpeg3split.c
+--- libmpeg3-1.5.4-orig/mpeg3split.c	2003-10-14 17:54:13.000000000 +1000
++++ libmpeg3-1.5.4/mpeg3split.c	2005-02-06 18:07:07.420359056 +1100
+@@ -2,6 +2,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
++#include "mpeg3private.h"
+ #include "mpeg3private.inc"
+ 
+ void copy_data(FILE *out, FILE *in, long bytes)
+--- libmpeg3-1.5.4-orig/Makefile	2003-10-29 20:53:02.000000000 +1100
++++ libmpeg3-1.5.4/Makefile	2005-02-06 19:20:57.473888552 +1100
+@@ -2,7 +2,10 @@
+ NASM = nasm
+ USE_MMX = 0
+ USE_CSS = 1
+-A52DIR := $(shell expr a52dec* )
++A52DIR := /usr
++PREFIX = /usr
++# override this to install to  lib64
++LIBDIR = lib
+ 
+ 
+ 
+@@ -52,6 +55,8 @@
+   CFLAGS += -DHAVE_MMX
+   ASMOBJS = $(OBJDIR)/video/mmxidct.o
+   NASMOBJS = $(OBJDIR)/video/reconmmx.o
++else
++  CFLAGS += -fPIC
+ endif
+ 
+ 
+@@ -61,8 +66,7 @@
+ 
+ CFLAGS += \
+ 	-I. \
+-	-I$(A52DIR)/include \
+-	-I$(A52DIR)/liba52
++	-I$(A52DIR)/include/a52dec \
+ 
+ #CFLAGS += -g
+ 
+@@ -108,6 +112,31 @@
+ 	$(OBJDIR)/video/vlc.o \
+ 	$(OBJDIR)/workarounds.o
+ 
++INSTALL_HEADERS = \
++	bitstream.h \
++	libmpeg3.h \
++	mpeg3atrack.h \
++	mpeg3css.h \
++	mpeg3demux.h \
++	mpeg3io.h \
++	mpeg3private.h \
++	mpeg3private.inc \
++	mpeg3protos.h \
++	mpeg3title.h \
++	mpeg3vtrack.h \
++	timecode.h \
++
++INSTALL_AHEADERS = \
++	audio/ac3.h \
++	audio/mpeg3audio.h \
++
++INSTALL_VHEADERS = \
++	video/idct.h \
++	video/slice.h \
++	video/mpeg3video.h
++
++
++
+ #OBJS = \
+ #	$(OBJDIR)/audio/ac3.o \
+ #	$(OBJDIR)/audio/bit_allocation.o \
+@@ -127,18 +156,15 @@
+ 	$(OBJDIR)/audio \
+ 	$(OBJDIR)/video
+ 
+-include Makefile.a52
+-
+ DIRS += $(A52DIRS)
+ 
+ 
+ OUTPUT = $(OBJDIR)/libmpeg3.a
+-UTILS = $(OBJDIR)/mpeg3dump $(OBJDIR)/mpeg3toc  $(OBJDIR)/mpeg3cat
+-
+-#$(OBJDIR)/mpeg3split
++SHAREDOUTPUT = $(OBJDIR)/libmpeg3.so
++UTILS = $(OBJDIR)/mpeg3dump $(OBJDIR)/mpeg3toc  $(OBJDIR)/mpeg3cat $(OBJDIR)/mpeg3split
+ 
+ 
+-LIBS = -lm -lpthread
++LIBS = -lm -lpthread -la52
+ 
+ $(shell if ! test -d $(OBJDIR) \; then mkdir -p $(OBJDIR) \; fi )
+ 
+@@ -147,13 +173,14 @@
+ $(shell echo $(OBJS) $(ASMOBJS) $(A52OBJS) $(NASMOBJS) > $(OBJDIR)/objs)
+ $(shell mkdir -p $(DIRS) )
+ 
+-all: $(OUTPUT) $(UTILS)
++all: $(OUTPUT) $(SHAREDOUTPUT) $(UTILS)
+ 
+ 
+ $(OUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS) $(A52OBJS)
+ 	ar rcs $(OUTPUT) `cat $(OBJDIR)/objs`
+ 
+-
++$(SHAREDOUTPUT): $(OBJS) $(ASMOBJS) $(NASMOBJS)
++	$(CC) -shared -o $(SHAREDOUTPUT) $(OBJS) $(ASMOBJS) $(NASMOBJS) $(LIBS)
+ 
+ $(OBJDIR)/mpeg3dump: $(OUTPUT) mpeg3dump.c
+ 	$(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3dump mpeg3dump.c $(OUTPUT) $(LIBS)
+@@ -164,8 +191,8 @@
+ $(OBJDIR)/mpeg3cat: $(OUTPUT) mpeg3cat.c
+ 	$(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3cat mpeg3cat.c $(OUTPUT) $(LIBS)
+ 
+-#$(OBJDIR)/mpeg3split: $(OUTPUT)
+-#	$(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3split mpeg3split.c $(OUTPUT) $(LIBS)
++$(OBJDIR)/mpeg3split: $(OUTPUT)
++	$(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg3split mpeg3split.c $(OUTPUT) $(LIBS)
+ 
+ $(OBJDIR)/mpeg2qt: $(OUTPUT)
+ 	$(CC) `cat $(OBJDIR)/c_flags` -o $(OBJDIR)/mpeg2qt mpeg2qt.c \
+@@ -179,7 +206,17 @@
+ 		-ldl
+ 
+ install: 
+-	cp $(UTILS) /usr/bin
++	install -d $(DESTDIR)${PREFIX}/bin
++	install -d $(DESTDIR)${PREFIX}/include/libmpeg3
++	install -d $(DESTDIR)${PREFIX}/include/libmpeg3/audio
++	install -d $(DESTDIR)${PREFIX}/include/libmpeg3/video
++	install -d $(DESTDIR)${PREFIX}/$(LIBDIR)
++	install $(UTILS) $(DESTDIR)${PREFIX}/bin
++	install -m 644 $(INSTALL_HEADERS) $(DESTDIR)${PREFIX}/include/libmpeg3
++	install -m 644 $(INSTALL_AHEADERS) $(DESTDIR)${PREFIX}/include/libmpeg3/audio
++	install -m 644 $(INSTALL_VHEADERS) $(DESTDIR)${PREFIX}/include/libmpeg3/video
++	install -m 644 $(OUTPUT) $(DESTDIR)${PREFIX}/$(LIBDIR)
++	install -m 644 $(SHAREDOUTPUT) $(DESTDIR)${PREFIX}/$(LIBDIR)
+ 
+ clean:
+ 	rm -rf $(OBJDIR)
+@@ -208,7 +245,7 @@
+ $(OBJDIR)/mpeg3demux.o: 			    mpeg3demux.c
+ $(OBJDIR)/mpeg3ifo.o: 				    mpeg3ifo.c
+ $(OBJDIR)/mpeg3io.o: 				    mpeg3io.c
+-#$(OBJDIR)/mpeg3split.o: 			    mpeg3split.c
++$(OBJDIR)/mpeg3split.o: 			    mpeg3split.c
+ $(OBJDIR)/mpeg3title.o: 			    mpeg3title.c
+ $(OBJDIR)/mpeg3toc.o: 				    mpeg3toc.c
+ $(OBJDIR)/mpeg3toc3.o:  			    mpeg3toc3.c
Index: scripts/untested/blfs-patches/mas-cvs-add_amd64.patch
===================================================================
--- scripts/untested/blfs-patches/mas-cvs-add_amd64.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/mas-cvs-add_amd64.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,194 @@
+diff -ur mas-cvs-20050207/clients/util/mas-config.cpp mas-cvs-mod/clients/util/mas-config.cpp
+--- mas-cvs-20050207/clients/util/mas-config.cpp	2004-09-03 08:26:36.000000000 +1000
++++ mas-cvs-amd64/clients/util/mas-config.cpp	2005-02-10 00:19:20.325851896 +1100
+@@ -1,9 +1,9 @@
+-#!/bin/sh
++XCOMM!/bin/sh
+ 
+-#
+-# mas-config.cpp - builds "mas-config" that can echo libraries,
+-#                  includes, and defines ala gtk's gtk-config.
+-#
++XCOMM
++XCOMM mas-config.cpp - builds "mas-config" that can echo libraries,
++XCOMM                  includes, and defines ala gtk's gtk-config.
++XCOMM
+ 
+ show_usage()
+ {
+diff -ur mas-cvs-20050207/clients/util/mas-launch.cpp mas-cvs-mod/clients/util/mas-launch.cpp
+--- mas-cvs-20050207/clients/util/mas-launch.cpp	2004-06-15 07:32:10.000000000 +1000
++++ mas-cvs-amd64/clients/util/mas-launch.cpp	2005-02-10 00:20:13.329794072 +1100
+@@ -1,6 +1,6 @@
+-#!/bin/bash
++XCOMM!/bin/bash
+ 
+-# kill esound if it's running -- we can't coexist.
++XCOMM kill esound if it's running -- we can't coexist.
+ pkill esd
+ 
+ if [[ $1 == "-t" ]];
+diff -ur mas-cvs-20050207/common/mas_endian.h mas-cvs-mod/common/mas_endian.h
+--- mas-cvs-20050207/common/mas_endian.h	2003-01-23 00:26:17.000000000 +1100
++++ mas-cvs-amd64/common/mas_endian.h	2005-02-07 23:52:27.000000000 +1100
+@@ -137,6 +137,8 @@
+ #if (!defined(MAS_BIG_ENDIAN) && !defined(MAS_LITTLE_ENDIAN))
+ 
+ #if	defined(__i386__) || defined(__ia64__) || defined(WIN32) || \
++	defined(__amd64__) || defined(__x86_64__) || \
++	defined(amd64__) || defined(x86_64__) || \
+ 	(defined(__alpha__) || defined(__alpha)) || \
+ 	defined(__arm__) || \
+ 	(defined(__mips__) && defined(__MIPSEL__)) || \
+diff -ur mas-cvs-20050207/config/Imake.cf mas-cvs-mod/config/Imake.cf
+--- mas-cvs-20050207/config/Imake.cf	2003-03-11 08:45:28.000000000 +1100
++++ mas-cvs-amd64/config/Imake.cf	2005-02-08 00:42:27.000000000 +1100
+@@ -401,17 +401,21 @@
+ # ifdef i386
+ #  define i386Architecture
+ #  undef i386
++# endif
+ # ifdef __i386__
+ #  ifndef i386Architecture
+ #   define i386Architecture
+ #  endif
+ #  undef __i386__
+ # endif /* i386 */
++# ifdef __x86_64__
++#  undef __x86_64__
++#  define AMD64Architecture
++# endif /* x86_64 */
+ # ifdef __alpha
+ #  define AlphaArchitecture
+ #  undef __alpha
+ # endif /* __alpha */
+-#endif
+ #endif /* linux */
+ 
+ #ifdef __uxp__
+diff -ur mas-cvs-20050207/config/Imake.tmpl mas-cvs-mod/config/Imake.tmpl
+--- mas-cvs-20050207/config/Imake.tmpl	2003-12-11 10:21:08.000000000 +1100
++++ mas-cvs-amd64/config/Imake.tmpl	2005-02-09 21:56:46.703200192 +1100
+@@ -337,14 +337,18 @@
+ # define ExportDefines
+ #endif
+ 
++#ifndef LibDirName
++# define LibDirName lib
++#endif
++
+ #ifndef UsrLibDir
+ #ifdef ProjectRoot
+-#define UsrLibDir Concat(ProjectRoot,/lib)
++#define UsrLibDir Concat(ProjectRoot,/LibDirName)
+ #ifndef AlternateUsrLibDir
+ #define AlternateUsrLibDir YES
+ #endif
+ #else
+-#define UsrLibDir /usr/lib
++#define UsrLibDir Concat(/usr,/LibDirName)
+ #ifndef AlternateUsrLibDir
+ #define AlternateUsrLibDir NO
+ #endif
+@@ -597,7 +601,7 @@
+ #define GzipCmd gzip
+ #endif
+ #ifndef CppCmd
+-#define CppCmd /lib/cpp
++#define CppCmd /LibDirName/cpp
+ #endif
+ #ifndef CppNoLineInfoOption
+ #define CppNoLineInfoOption /**/
+diff -ur mas-cvs-20050207/config/linux.cf mas-cvs-mod/config/linux.cf
+--- mas-cvs-20050207/config/linux.cf	2003-03-11 08:45:28.000000000 +1100
++++ mas-cvs-amd64/config/linux.cf	2005-02-09 22:01:41.425395608 +1100
+@@ -195,6 +195,17 @@
+ #endif
+ #endif /* i386Architecture */
+ 
++#ifdef AMD64Architecture
++#define OptimizedCDebugFlags	DefaultGcc2AMD64Opt
++#define LinuxMachineDefines	-D__x86_64__
++#define ServerOSDefines		XFree86ServerOSDefines -DDDXTIME
++#define ServerExtraDefines	-DGCCUSESGAS XFree86ServerDefines
++#if UseElfFormat
++#define HasPlugin		YES
++#define VendorHasX11R6_3libXext	YES	/* XC or XFree86 3.3.1 */
++#endif
++#endif /* AMD64Architecture */
++
+ #ifdef AlphaArchitecture
+ #define OptimizedCDebugFlags	-O2
+ #define LinuxMachineDefines	-D__alpha__
+@@ -210,6 +221,20 @@
+ #define ServerExtraDefines      -DGCCUSESGAS XFree86ServerDefines
+ #endif /* Mc68020Architecture */
+ 
++#ifndef HaveLib64
++# if defined (AMD64Architecture)
++#  define HaveLib64     YES
++# else
++#  define HaveLib64     NO
++# endif
++#endif
++
++#if HaveLib64
++# ifndef LibDirName
++#  define LibDirName            lib64
++# endif
++#endif
++
+ #define StandardDefines		-Dlinux LinuxMachineDefines LinuxSourceDefines
+ 
+ #define ConnectionFlags		-DUNIXCONN -DTCPCONN
+diff -ur mas-cvs-20050207/config/mas.tmpl mas-cvs-mod/config/mas.tmpl
+--- mas-cvs-20050207/config/mas.tmpl	2004-06-15 07:35:36.000000000 +1000
++++ mas-cvs-amd64/config/mas.tmpl	2005-02-08 00:22:14.000000000 +1100
+@@ -57,6 +57,10 @@
+ MAS_ENDIANNESS = MAS_LITTLE_ENDIAN
+ #define MAS_WE_ARE_LITTLE_ENDIAN
+ 
++#elif defined(AMD64Architecture)
++MAS_ENDIANNESS = MAS_LITTLE_ENDIAN
++#define MAS_WE_ARE_LITTLE_ENDIAN
++
+ #elif defined(ia64Architecture)
+ MAS_ENDIANNESS = MAS_LITTLE_ENDIAN
+ #define MAS_WE_ARE_LITTLE_ENDIAN
+diff -ur mas-cvs-20050207/config/xfree86.cf mas-cvs-mod/config/xfree86.cf
+--- mas-cvs-20050207/config/xfree86.cf	2003-06-27 07:00:26.000000000 +1000
++++ mas-cvs-amd64/config/xfree86.cf	2005-02-07 22:53:17.000000000 +1100
+@@ -586,6 +586,12 @@
+ #endif
+ #endif
+ 
++#if HasGcc2 && defined(AMD64Architecture)
++# ifndef DefaultGcc2AMD64Opt
++#  define DefaultGcc2AMD64Opt -O3 -fno-strength-reduce
++# endif
++#endif
++
+ #ifndef BuildLBXCompatible
+ #define BuildLBXCompatible NO
+ #endif
+diff -ur mas-cvs-20050207/devices/visual/Imakefile mas-cvs-mod/devices/visual/Imakefile
+--- mas-cvs-20050207/devices/visual/Imakefile	2003-03-11 09:29:38.000000000 +1100
++++ mas-cvs-amd64/devices/visual/Imakefile	2005-02-09 22:04:49.037874176 +1100
+@@ -12,7 +12,7 @@
+ XCOMM ################ Architecture dependent ###########################
+ 
+ #ifdef LinuxArchitecture
+-ARCHREQUIREDLIBS = -L/usr/X11R6/lib 
++ARCHREQUIREDLIBS = -L/usr/X11R6/LibDirName 
+ #endif
+ 
+ #ifdef SunArchitecture
+@@ -34,7 +34,7 @@
+  LOCAL_LIBRARIES = 
+    SYS_LIBRARIES =
+          DEPLIBS = 
+-    REQUIREDLIBS = $(ARCHREQUIREDLIBS) -L/usr/local/lib -lX11 -lXext -lsrfftw -lsfftw -lm
++    REQUIREDLIBS = $(ARCHREQUIREDLIBS) -L/usr/local/LibDirName -lX11 -lXext -lsrfftw -lsfftw -lm
+ 
+ #include <Library.tmpl>
+ 
Index: scripts/untested/blfs-patches/nas-1.7-header.patch
===================================================================
--- scripts/untested/blfs-patches/nas-1.7-header.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/nas-1.7-header.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,26 @@
+diff -Naur nas-1.7.orig/server/dia/main.c nas-1.7/server/dia/main.c
+--- nas-1.7.orig/server/dia/main.c	2004-11-22 19:05:15.391186001 -0800
++++ nas-1.7/server/dia/main.c	2004-11-22 19:04:02.640209930 -0800
+@@ -52,6 +52,7 @@
+  */
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <audio/audio.h>
+ #include <audio/Aproto.h>
+ #include "NasConfig.h"
+diff -Naur nas-1.7.orig/server/os/connection.c nas-1.7/server/os/connection.c
+--- nas-1.7.orig/server/os/connection.c	2004-02-14 15:12:22.000000000 -0800
++++ nas-1.7/server/os/connection.c	2004-11-22 19:06:41.434964865 -0800
+@@ -79,7 +79,10 @@
+ #include <netdb.h>
+ #endif 
+ 
+-
++#include <stdio.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
+ 
+ #include <audio/audio.h>
+ #include <audio/Aproto.h>
Index: scripts/untested/blfs-patches/sgml-common-0.6.3-manpage-1.patch
===================================================================
--- scripts/untested/blfs-patches/sgml-common-0.6.3-manpage-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/sgml-common-0.6.3-manpage-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,17 @@
+Submitted By: Thomas Pegg <lnxfreak123 at insightbb dot com>
+Date: 2003-11-18
+Initial Package Version: 0.6.3
+Origin: Thomas Pegg
+Description: Fixes syntax of Makefile.am for installation of man pages,
+for use with current automake versions 1.7.8 and higher.
+
+$LastChangedBy: bdubbs $
+$Date: 2004-08-07 18:56:30 -0600 (Sat, 07 Aug 2004) $
+
+diff -Naur sgml-common-0.6.3.orig/doc/man/Makefile.am sgml-common-0.6.3/doc/man/Makefile.am
+--- sgml-common-0.6.3.orig/doc/man/Makefile.am	2001-01-30 14:42:22.000000000 +0000
++++ sgml-common-0.6.3/doc/man/Makefile.am	2003-11-18 16:48:47.000000000 +0000
+@@ -1,2 +1 @@
+-man8dir	  = $(mandir)/man8
+-man8_DATA = *.8
++man_MANS = install-catalog.8
Index: scripts/untested/blfs-patches/tetex-src-2.0.2-flex-1.patch
===================================================================
--- scripts/untested/blfs-patches/tetex-src-2.0.2-flex-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/tetex-src-2.0.2-flex-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,28 @@
+Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
+Date: 2003-09-20
+Initial Package Version: 2.0.2
+Origin: Jim Gifford
+Description: Fixes Parse error in pl.l Flex Version 2.5.31
+
+Corrects
+ ./pl.l: In function `scan_string':
+ ./pl.l:462: `yytext_ptr' undeclared (first use in this function)
+ ./pl.l:462: (Each undeclared identifier is reported only once
+ ./pl.l:462: for each function it appears in.)
+
+ 
+$LastChangedBy: bdubbs $
+$Date: 2004-08-07 18:56:30 -0600 (Sat, 07 Aug 2004) $
+
+diff -Naur tetex-src-2.0.2.orig/texk/web2c/omegafonts/Makefile.in tetex-src-2.0.2/texk/web2c/omegafonts/Makefile.in
+--- tetex-src-2.0.2.orig/texk/web2c/omegafonts/Makefile.in	2001-11-10 13:42:37.000000000 +0000
++++ tetex-src-2.0.2/texk/web2c/omegafonts/Makefile.in	2003-09-21 07:41:29.000000000 +0000
+@@ -40,7 +40,7 @@
+ 	-test -f y.tab.h && mv -f y.tab.h y_tab.h
+ $(LEX_OUTPUT_ROOT).o: parser.h
+ $(LEX_OUTPUT_ROOT).c: pl.l
+-	$(LEX) $(srcdir)/pl.l
++	$(LEX) -l $(srcdir)/pl.l
+ 
+ 
+ 
Index: scripts/untested/blfs-patches/tetex-src-2.0.2-flex-1.patch.orig
===================================================================
--- scripts/untested/blfs-patches/tetex-src-2.0.2-flex-1.patch.orig	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/tetex-src-2.0.2-flex-1.patch.orig	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,28 @@
+Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
+Date: 2003-09-20
+Initial Package Version: 2.0.2
+Origin: Jim Gifford
+Description: Fixes Parse error in pl.l Flex Version 2.5.31
+
+Corrects
+ ./pl.l: In function `scan_string':
+ ./pl.l:462: `yytext_ptr' undeclared (first use in this function)
+ ./pl.l:462: (Each undeclared identifier is reported only once
+ ./pl.l:462: for each function it appears in.)
+
+ 
+$LastChangedBy: bdubbs $
+$Date: 2004-08-07 18:56:30 -0600 (Sat, 07 Aug 2004) $
+
+diff -Naur tetex-src-2.0.2.orig/texk/web2c/omegafonts/Makefile.in tetex-src-2.0.2/texk/web2c/omegafonts/Makefile.in
+--- tetex-src-2.0.2.orig/texk/web2c/omegafonts/Makefile.in	2001-11-10 13:42:37.000000000 +0000
++++ tetex-src-2.0.2/texk/web2c/omegafonts/Makefile.in	2003-09-21 07:41:29.000000000 +0000
+@@ -40,7 +40,7 @@
+ 	-test -f y.tab.h && mv -f y.tab.h y_tab.h
+ $(LEX_OUTPUT_ROOT).o: parser.h
+ $(LEX_OUTPUT_ROOT).c: pl.l
+-	$(LEX) $(srcdir)/pl.l
++	$(LEX) -l $(srcdir)/pl.l
+ 
+ 
+ 
Index: scripts/untested/blfs-patches/tetex-src-2.0.2-remove_readlink-1.patch
===================================================================
--- scripts/untested/blfs-patches/tetex-src-2.0.2-remove_readlink-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/tetex-src-2.0.2-remove_readlink-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,67 @@
+Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
+Date: 2004-05-24
+Initial Package Version: 2.0.2
+Origin: Jim Gifford
+Upstream Status: Not Sent
+Description: Removes Readlink. Readlink is also included in
+	     coreutils. Coreutils version is more robust.
+ 
+$LastChangedBy: bdubbs $
+$Date: 2004-08-07 18:56:30 -0600 (Sat, 07 Aug 2004) $
+
+--- tetex-src-2.0.2/texk/kpathsea/Makefile.in.orig	2004-05-24 07:58:14.501539043 +0000
++++ tetex-src-2.0.2/texk/kpathsea/Makefile.in	2004-05-24 07:58:42.672450852 +0000
+@@ -38,7 +38,7 @@
+ .c.lo:
+ 	$(KPATHSEA_CC) $< $(ALL_CFLAGS)
+ 
+-default all: kpsewhich kpsestat access readlink $(library).info manfiles
++default all: kpsewhich kpsestat access $(library).info manfiles
+ 
+ kpsewhich: $(kpathsea) kpsewhich.o
+ 	$(kpathsea_link) kpsewhich.o $(LOADLIBES)
+@@ -49,9 +49,6 @@
+ access: access.o
+ 	$(link_command) access.o
+ 
+-readlink: readlink.o
+-	$(link_command) readlink.o
+-
+ $(kpathsea): $(objects) klibtool.version
+ 	$(LIBTOOL) archive $(AR) $(ARFLAGS) $@ $(objects)
+ 
+@@ -184,7 +181,6 @@
+ 	$(INSTALL_LIBTOOL_PROG) $(bindir) kpsewhich
+ 	$(INSTALL_PROGRAM) kpsestat $(bindir)
+ 	$(INSTALL_PROGRAM) access $(bindir)
+-	$(INSTALL_PROGRAM) readlink $(bindir)
+ uninstall-exec:
+ 	rm -f $(bindir)/kpsewhich
+ 
+@@ -259,13 +255,13 @@
+ ac_include ../make/clean.mk
+ 
+ mostlyclean::
+-	rm -f kpsewhich kpsestat access readlink *.lo klibtool.version
++	rm -f kpsewhich kpsestat access *.lo klibtool.version
+ 	rm -rf PROF PROF_SHARED SHARED STATIC
+ distclean::
+ 	rm -f paths.h texmf.cnf texmf.sed stamp-paths
+ 
+ # The manual pages
+-manfiles = access.1 kpsestat.1 kpsewhich.1 readlink.1 \
++manfiles = access.1 kpsestat.1 kpsewhich.1 \
+            mktexlsr.1 mktexmf.1 mktextfm.1 mktexpk.1
+ 
+ ac_include ../make/man.mk
+--- tetex-src-2.0.2/Makefile.in.orig	2004-05-24 07:57:20.638371669 +0000
++++ tetex-src-2.0.2/Makefile.in	2004-05-24 07:57:33.008094276 +0000
+@@ -44,7 +44,7 @@
+   kpsewhich mag makeindex makeinfo mf mf-nowin mft mfw mpost mpto newer \
+   odvicopy odvips odvitype omega omfonts otangle otp2ocp outocp oxdvi.bin \
+   patgen pdfetex pdftex pfb2pfa pk2bm pktogf pktype pltotf pooltype ps2pk \
+-  readlink tangle tcdialog tex texindex tftopl tie ttf2afm vftovp vptovf \
++  tangle tcdialog tex texindex tftopl tie ttf2afm vftovp vptovf \
+   weave xdvi.bin
+ 
+ # Subdirectories that have makefiles
Index: scripts/untested/blfs-patches/unzip-5.51-dont_make_noise-1.patch
===================================================================
--- scripts/untested/blfs-patches/unzip-5.51-dont_make_noise-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/unzip-5.51-dont_make_noise-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,42 @@
+Submitted By: Tushar Teredesai <tushar@linuxfromscratch.org>
+Date: 2003-09-22
+Initial Package Version: 5.50
+Origin: http://archive.linuxfromscratch.org/mail-archives/blfs-dev/2003-August/003213.html
+Description: When unzipping files, the unzip stub prints out lot of "useful" info messages.
+These messages can cause applications such as Midnight Commander to display strange behavior.
+This patch is useful for users linking unzip to the system zlib
+(i.e. installed as per the BLFS guidelines).
+
+$LastChangedBy: bdubbs $
+$Date: 2004-08-07 18:56:30 -0600 (Sat, 07 Aug 2004) $
+
+--- unzip-5.50/unzipstb.c.orig	2003-09-22 01:05:45.000000000 -0500
++++ unzip-5.50/unzipstb.c	2003-09-22 01:06:57.000000000 -0500
+@@ -30,27 +30,6 @@
+ 
+     pVersion = UzpVersion();
+ 
+-    printf("UnZip stub:  checking version numbers (DLL is dated %s)\n",
+-      pVersion->date);
+-    printf("   UnZip versions:    expecting %d.%d%d, using %d.%d%d%s\n",
+-      UZ_MAJORVER, UZ_MINORVER, UZ_PATCHLEVEL, pVersion->unzip.major,
+-      pVersion->unzip.minor, pVersion->unzip.patchlevel, pVersion->betalevel);
+-    printf("   ZipInfo versions:  expecting %d.%d%d, using %d.%d%d\n",
+-      ZI_MAJORVER, ZI_MINORVER, UZ_PATCHLEVEL, pVersion->zipinfo.major,
+-      pVersion->zipinfo.minor, pVersion->zipinfo.patchlevel);
+-
+-/*
+-    D2_M*VER and os2dll.* are obsolete, though retained for compatibility:
+-
+-    printf("   OS2 DLL versions:  expecting %d.%d%d, using %d.%d%d\n",
+-      D2_MAJORVER, D2_MINORVER, D2_PATCHLEVEL, pVersion->os2dll.major,
+-      pVersion->os2dll.minor, pVersion->os2dll.patchlevel);
+- */
+-
+-    if (pVersion->flag & 2)
+-        printf("   using zlib version %s\n", pVersion->zlib_version);
+-    printf("\n");
+-
+     /* call the actual UnZip routine (string-arguments version) */
+     return UzpMain(argc, argv);
+ }
Index: scripts/untested/blfs-patches/unzip-5.51-fix_Makefile-1.patch
===================================================================
--- scripts/untested/blfs-patches/unzip-5.51-fix_Makefile-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/unzip-5.51-fix_Makefile-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,19 @@
+Submitted By: BLFS Book <blfs-book@linuxfromscratch.org>
+Date: 2003-10-03
+Initial Package Version: 5.50
+Origin: NA
+Description: Creates a missing symlink.
+
+$LastChangedBy: bdubbs $
+$Date: 2004-08-07 18:56:30 -0600 (Sat, 07 Aug 2004) $
+
+diff -urN unzip-5.50/unix/Makefile unzip-5.50-rcl/unix/Makefile
+--- unzip-5.50/unix/Makefile	Sat Feb 16 17:00:38 2002
++++ unzip-5.50-rcl/unix/Makefile	Sat Sep 28 14:32:44 2002
+@@ -818,6 +818,7 @@
+ 	ln -sf crc_gcc.pic.o crc32.pic.o
+ 	gcc -shared -Wl,-soname,libunzip.so.0 -o libunzip.so.0.4 $(OBJSDLL)
+ 	ln -sf libunzip.so.0.4 libunzip.so.0
++	ln -sf libunzip.so.0.4 libunzip.so
+ 	gcc -c -O unzipstb.c
+ 	gcc -o unzip unzipstb.o -L. -lunzip -lz
Index: scripts/untested/blfs-patches/unzip-5.51-fix_libz-1.patch
===================================================================
--- scripts/untested/blfs-patches/unzip-5.51-fix_libz-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-patches/unzip-5.51-fix_libz-1.patch	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,24 @@
+Submitted By: BLFS Book <blfs-book@linuxfromscratch.org>
+Date: 2003-10-03
+Initial Package Version: 5.50
+Origin: NA
+Description: Fixes compilation against system zlib.
+
+$LastChangedBy: bdubbs $
+$Date: 2004-08-07 18:56:30 -0600 (Sat, 07 Aug 2004) $
+
+diff -urN unzip-5.50/api.c unzip-5.50-rcl/api.c
+--- unzip-5.50/api.c	Thu Nov 22 23:43:26 2001
++++ unzip-5.50-rcl/api.c	Sat Sep 28 14:31:51 2002
+@@ -48,6 +48,11 @@
+ #endif
+ #include "unzvers.h"
+ 
++/* This is defined as zlibVersion() in zlib.h version 1.1.4 */
++#ifdef   zlib_version
++#  undef zlib_version
++#endif
++
+ #ifdef DLL      /* This source file supplies DLL-only interface code. */
+ 
+ jmp_buf dll_error_return;
Index: scripts/untested/blfs-scripts/biarch-funcs.sh
===================================================================
--- scripts/untested/blfs-scripts/biarch-funcs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/biarch-funcs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+setup_biarch() {
+
+   libdir=lib
+   # This to be set in the calling script if building libs into */lib64
+   if [ "Y" = "${LIB64}" ]; then
+      # Are we building 64bit userspace and bi-arch?
+      # If so we want to install our libs into */lib64
+      LOG=`echo $LOG | sed 's@\.log@-64&'`
+      libdir=lib64
+      extra_conf=" --libdir=/usr/lib64"
+   fi
+
+   if [ "Y" = "${BIARCH}" ]; then
+      vendor_os=`echo ${TARGET} | sed 's@\([^-]*\)-\(.*\)@\2@'`
+      if [ "Y" = "${LIB64}" ]; then
+            # set arch specific 64 bit compilation flags
+            case ${TGT_ARCH} in
+               x86_64 )
+                  export BUILDENV=64
+                  ARCH_CFLAGS="-m${BUILDENV}"
+                  unset ALT_TGT
+               ;;
+               sparc* )
+                  export BUILDENV=64
+                  ARCH_CFLAGS="-m${BUILDENV}"
+                  unset ALT_TGT
+               ;;
+               powerpc* | ppc* )
+                  export BUILDENV=64
+                  ARCH_CFLAGS="-m${BUILDENV}"
+                  unset ALT_TGT
+               ;;
+               s390* )
+                  export BUILDENV=64
+                  ARCH_CFLAGS="-m${BUILDENV}"
+                  unset ALT_TGT
+               ;;
+            esac
+         else
+            # If not LIB64 we are building 32 (or 31) bit
+            case ${TGT_ARCH} in
+               x86_64 | x86-64 )
+                  export BUILDENV=32
+                  ARCH_CFLAGS="-m${BUILDENV}"
+                  export ALT_TGT="i686-${vender_os}"
+               ;;
+               sparc* )
+                  export BUILDENV=32
+                  ARCH_CFLAGS="-m${BUILDENV}"
+                  export ALT_TGT="sparcv9-${vender_os}"
+               ;;
+               powerpc* | ppc* )
+                  export BUILDENV=32
+                  ARCH_CFLAGS="-m${BUILDENV}"
+                  export ALT_TGT="ppc-${vender_os}"
+               ;;
+               s390* )
+                  export BUILDENV=31
+                  ARCH_CFLAGS="-m${BUILDENV}"
+                  export ALT_TGT="s390-${vender_os}"
+               ;;
+            esac
+         fi
+
+      suffix="-${BUILDENV}"
+   fi
+}
Index: scripts/untested/blfs-scripts/blfs-OpenEXR.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-OpenEXR.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-OpenEXR.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+### OpenEXR ###
+
+cd ${SRC}
+LOG=OpenEXR-blfs.log
+libdir=lib
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball OpenEXR-${OPENEXR_VER}
+cd ${PKGDIR}
+
+max_log_init OpenEXR ${OPENEXR_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   --mandir=/usr/share/man --infodir=/usr/share/info \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-a2ps.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-a2ps.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-a2ps.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+### a2ps ###
+
+cd ${SRC}
+LOG=a2ps-blfs.log
+libdir=lib
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball a2ps-${A2PS_VER}
+cd ${PKGDIR}
+
+# TODO: NEEDS WORK
+#       update libtool so we understand newer architectures
+#libtoolize --copy --force
+
+sed -i -e "s|emacs||" contrib/Makefile.in &&
+sed -i -e "s|/usr/local/share|/usr/share|" configure &&
+sed -i -e "s|char \*malloc ();|/* char *malloc (); */|" \
+    lib/path-concat.c
+
+max_log_init a2ps ${A2PS_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   --sysconfdir=/etc/a2ps --localstatedir=/var \
+   --enable-shared --mandir=/usr/share/man \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-a52dec.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-a52dec.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-a52dec.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+### a52dec ###
+
+cd ${SRC}
+LOG=a52dec-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball a52dec-${A52DEC_VER}
+cd ${PKGDIR}
+
+# Update the autofoo... this package originally created 2002...
+apply_patch a52dec-0.7.4-update_autofoo-1
+
+max_log_init a52dec ${A52DEC_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr --enable-shared ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-alsa-lib.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-alsa-lib.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-alsa-lib.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+### alsa-lib ###
+
+cd ${SRC}
+LOG=alsa-lib-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball alsa-lib-${ALSA_LIB_VER}
+cd ${PKGDIR}
+
+max_log_init alsa-lib ${ALSA_LIB_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-alsa-tools.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-alsa-tools.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-alsa-tools.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+### alsa-tools ###
+
+# The only tool of any use to me from here is ac3dec
+
+cd ${SRC}
+LOG=alsa-tools-blfs.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball alsa-tools-${ALSA_TOOLS_VER}
+cd ${PKGDIR}
+
+apply_patch alsa-tools-1.0.8-update_ac3dec_config_foo-1
+
+cd ${PKGDIR}/ac3dec
+
+max_log_init alsa-tools ${ALSA_TOOLS_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr --mandir=/usr/share/man \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-alsa-utils.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-alsa-utils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-alsa-utils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+### alsa-utils ###
+
+cd ${SRC}
+LOG=alsa-utils-blfs.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball alsa-utils-${ALSA_UTILS_VER}
+cd ${PKGDIR}
+
+max_log_init alsa-utils ${ALSA_UTILS_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+./configure --mandir=/usr/share/man \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+touch /etc/asound.state &&
+alsactl store
Index: scripts/untested/blfs-scripts/blfs-aspell.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-aspell.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-aspell.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,49 @@
+#!/bin/ibash
+
+### aspell ###
+
+# TODO: wants ncurses with wide support for utf8...
+cd ${SRC}
+LOG=aspell-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball aspell-${ASPELL_VER}
+cd ${PKGDIR}
+
+# TODO: for biarch, may install these with --program-suffix=${suffix}
+#       as the tools dont behave nice when called via a wrapper after
+#       being renamed...
+#
+
+max_log_init aspell ${ASPELL_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   --mandir=/usr/share/man --infodir=/usr/share/info \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   use_wrapper /usr/bin/{aspell,prezip-bin,pspell-config,run-with-aspell}
+fi
+
+# TODO: Install a dictionary
Index: scripts/untested/blfs-scripts/blfs-cdparanoia-III-32.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-cdparanoia-III-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-cdparanoia-III-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-cdparanoia-III.sh
Index: scripts/untested/blfs-scripts/blfs-cdparanoia-III-64.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-cdparanoia-III-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-cdparanoia-III-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-cdparanoia-III.sh
Index: scripts/untested/blfs-scripts/blfs-cdparanoia-III.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-cdparanoia-III.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-cdparanoia-III.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,57 @@
+#!/bin/bash
+#
+# cdparanoia-III
+#
+# Dependencies: None
+#
+
+cd ${SRC}
+LOG=blfs-cdparanoia-III.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball cdparanoia-III-${CDPARANOIA_VER}.src &&
+cd ${PKGDIR}
+
+# Patching
+
+# Retrieve target_gcc_ver from gcc -v output
+target_gcc_ver=`${CC-gcc} -v 2>&1 | grep " version " | \
+   sed 's@.*version \([0-9.]*\).*@\1@g'`
+
+case ${CDPARANOIA_VER} in
+   alpha9.8 )
+      apply_patch cdparanoia-III-alpha9.8-includes-1
+      case ${target_gcc_ver} in
+         3.4* ) apply_patch cdparanoia-III-alpha9.8-gcc34-1 ;;
+      esac
+   ;;
+   * )
+      echo "*** Please check if cdparanoia ${CDPARANOIA_VER} requires patching ***"
+      echo "*** then please update this script (and send patch) ***"
+      exit 1
+   ;;
+esac
+
+max_log_init cdparanoia ${CDPARANOIA_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+ ./configure --prefix=/usr --host="${TARGET}" ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} FLAGS="${TGT_CFLAGS} -fPIC" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-cups.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-cups.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-cups.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+### cups ###
+
+cd ${SRC}
+LOG=cups-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball cups-${CUPS_VER}
+cd ${PKGDIR}
+
+sed -i -e "s@pam/pam@security/pam@g" \
+   {config-scripts/cups-pam.m4,scheduler/auth.c,configure}
+
+# TODO: check cups-config generation and remove rpaths for lib64
+max_log_init cups ${CUPS_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   use_wrapper /usr/bin/cups-config
+fi
Index: scripts/untested/blfs-scripts/blfs-dbus.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-dbus.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-dbus.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+### dbus ###
+
+cd ${SRC}
+LOG=dbus-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   # temporarily set PYTHON env var
+   export PYTHON=python${suffix}
+fi
+
+unpack_tarball dbus-${DBUS_VER}
+cd ${PKGDIR}
+
+max_log_init dbus ${DBUS_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   --localstatedir=/var \
+   --sysconfdir=/etc \
+   --with-xml=libxml \
+   --mandir=/usr/share/man \
+   --infodir=/usr/share/info \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+# Need to create a startup script
Index: scripts/untested/blfs-scripts/blfs-desktop-file-utils.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-desktop-file-utils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-desktop-file-utils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+### desktop-file-utils ###
+
+cd ${SRC}
+LOG=desktop-file-utils-gnome-platform.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball desktop-file-utils-${DT_FILE_UTILS_VER}
+cd ${PKGDIR}
+
+max_log_init desktop-file-utils ${DT_FILE_UTILS_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" ./configure --prefix=/usr \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-docbook-dsssl.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-docbook-dsssl.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-docbook-dsssl.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+### docbook-dsssl ###
+
+cd ${SRC}
+LOG=docbook-dsssl-blfs.log
+
+unpack_tarball docbook-dsssl-${DBK_DSSSL_VER}
+cd ${PKGDIR}
+
+mkdir -p /usr/share/sgml/docbook/dsssl-stylesheets-${DBK_DSSSL_VER}/dtds/decls &&
+mkdir -p /usr/share/sgml/docbook/dsssl-stylesheets-${DBK_DSSSL_VER}/lib &&
+mkdir -p /usr/share/sgml/docbook/dsssl-stylesheets-${DBK_DSSSL_VER}/common &&
+mkdir -p /usr/share/sgml/docbook/dsssl-stylesheets-${DBK_DSSSL_VER}/html &&
+mkdir -p /usr/share/sgml/docbook/dsssl-stylesheets-${DBK_DSSSL_VER}/print &&
+mkdir -p /usr/share/sgml/docbook/dsssl-stylesheets-${DBK_DSSSL_VER}/test &&
+mkdir -p /usr/share/sgml/docbook/dsssl-stylesheets-${DBK_DSSSL_VER}/images &&
+install bin/collateindex.pl /usr/bin &&
+cp catalog VERSION /usr/share/sgml/docbook/dsssl-stylesheets-${DBK_DSSSL_VER} &&
+cp dtds/decls/*.dcl \
+   /usr/share/sgml/docbook/dsssl-stylesheets-${DBK_DSSSL_VER}/dtds/decls &&
+cp lib/dblib.dsl \
+   /usr/share/sgml/docbook/dsssl-stylesheets-${DBK_DSSSL_VER}/lib &&
+cp common/*.dsl \
+   /usr/share/sgml/docbook/dsssl-stylesheets-${DBK_DSSSL_VER}/common &&
+cp common/*.ent \
+   /usr/share/sgml/docbook/dsssl-stylesheets-${DBK_DSSSL_VER}/common &&
+cp html/*.dsl \
+   /usr/share/sgml/docbook/dsssl-stylesheets-${DBK_DSSSL_VER}/html &&
+cp print/*.dsl \
+   /usr/share/sgml/docbook/dsssl-stylesheets-${DBK_DSSSL_VER}/print &&
+cp images/*.gif \
+   /usr/share/sgml/docbook/dsssl-stylesheets-${DBK_DSSSL_VER}/images &&
+
+install-catalog --add /etc/sgml/dsssl-docbook-stylesheets.cat \
+    /usr/share/sgml/docbook/dsssl-stylesheets-${DBK_DSSSL_VER}/catalog &&
+install-catalog --add /etc/sgml/sgml-docbook.cat \
+    /etc/sgml/dsssl-docbook-stylesheets.cat
+
Index: scripts/untested/blfs-scripts/blfs-docbook-sgml.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-docbook-sgml.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-docbook-sgml.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,60 @@
+#!/bin/bash
+
+### docbook-sgml ###
+
+cd ${SRC}
+LOG=docbook-sgml-${DBK_SGML_VER}-blfs.log
+
+PKGDIR="docbook-${DBK_SGML_VER}"
+if [ -d ${PKGDIR} ]; then rm -rf ${PKGDIR}; fi
+mkdir ${PKGDIR}
+cd ${PKGDIR}
+
+case ${DBK_SGML_VER} in
+   3.1 )
+      unzip ${TARBALLS}/docbk-31.zip || barf
+      sed -i -e '/ISO 8879/d' \
+             -e "s|DTDDECL \"-//OASIS//DTD DocBook V${DBK_SGML_VER}//EN\"|SGMLDECL|g" \
+         docbook.cat
+   ;;
+   4.* )
+      unzip ${TARBALLS}/docbook-${DBK_SGML_VER}.zip || barf
+      sed -i -e '/ISO 8879/d' \
+          -e '/gml/d' docbook.cat
+   ;;
+esac
+
+install -d /usr/share/sgml/docbook/sgml-dtd-${DBK_SGML_VER} &&
+chown -R root:root . &&
+install docbook.cat \
+   /usr/share/sgml/docbook/sgml-dtd-${DBK_SGML_VER}/catalog &&
+cp -af *.dtd *.mod *.dcl /usr/share/sgml/docbook/sgml-dtd-${DBK_SGML_VER} &&
+
+install-catalog --add /etc/sgml/sgml-docbook-dtd-${DBK_SGML_VER}.cat \
+    /usr/share/sgml/docbook/sgml-dtd-${DBK_SGML_VER}/catalog &&
+install-catalog --add /etc/sgml/sgml-docbook-dtd-${DBK_SGML_VER}.cat \
+    /etc/sgml/sgml-docbook.cat
+
+case ${DBK_SGML_VER} in
+   3.1 )
+      #
+      cat >> /usr/share/sgml/docbook/sgml-dtd-3.1/catalog << "EOF"
+-- Begin Single Major Version catalog changes --
+
+PUBLIC "-//Davenport//DTD DocBook V3.0//EN" "docbook.dtd"
+
+  -- End Single Major Version catalog changes --
+EOF
+   ;;
+   4.3 )
+      cat >> /usr/share/sgml/docbook/sgml-dtd-4.3/catalog << "EOF"
+-- Begin Single Major Version catalog changes --
+
+PUBLIC "-//OASIS//DTD DocBook V4.2//EN" "docbook.dtd"
+PUBLIC "-//OASIS//DTD DocBook V4.1//EN" "docbook.dtd"
+PUBLIC "-//OASIS//DTD DocBook V4.0//EN" "docbook.dtd"
+
+  -- End Single Major Version catalog changes --
+EOF
+   ;;
+esac
Index: scripts/untested/blfs-scripts/blfs-docbook-xml.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-docbook-xml.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-docbook-xml.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,112 @@
+#!/bin/bash
+
+### docbook-xml ###
+
+cd ${SRC}
+LOG=docbook-xml-${DBK_XML_DTD_VER}-blfs.log
+
+PKGDIR="docbook-xml-${DBK_XML_DTD_VER}"
+if [ -d ${PKGDIR} ]; then rm -rf ${PKGDIR}; fi
+mkdir ${PKGDIR}
+cd ${PKGDIR}
+
+unzip ${TARBALLS}/docbook-xml-${DBK_XML_DTD_VER}.zip || barf
+
+
+install -d /usr/share/xml/docbook/xml-dtd-${DBK_XML_DTD_VER} &&
+chown -R root:root . &&
+cp -af docbook.cat *.dtd ent/ *.mod \
+    /usr/share/xml/docbook/xml-dtd-${DBK_XML_DTD_VER} &&
+if [ ! -e /etc/xml/catalog ]; then mkdir -p /etc/xml; xmlcatalog \
+    --noout --create /etc/xml/catalog; fi &&
+if [ ! -e /etc/xml/docbook ]; then xmlcatalog --noout --create \
+    /etc/xml/docbook; fi &&
+xmlcatalog --noout --add "public" \
+    "-//OASIS//ELEMENTS DocBook XML Information Pool V${DBK_XML_DTD_VER}//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-${DBK_XML_DTD_VER}/dbpoolx.mod" \
+    /etc/xml/docbook &&
+xmlcatalog --noout --add "public" \
+    "-//OASIS//DTD DocBook XML V${DBK_XML_DTD_VER}//EN" \
+    "http://www.oasis-open.org/docbook/xml/${DBK_XML_DTD_VER}/docbookx.dtd" \
+    /etc/xml/docbook &&
+xmlcatalog --noout --add "public" \
+    "-//OASIS//ENTITIES DocBook XML Character Entities V${DBK_XML_DTD_VER}//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-${DBK_XML_DTD_VER}/dbcentx.mod" \
+    /etc/xml/docbook &&
+xmlcatalog --noout --add "public" \
+    "-//OASIS//ENTITIES DocBook XML Notations V${DBK_XML_DTD_VER}//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-${DBK_XML_DTD_VER}/dbnotnx.mod" \
+    /etc/xml/docbook &&
+xmlcatalog --noout --add "public" \
+    "-//OASIS//ENTITIES DocBook XML Additional General Entities V${DBK_XML_DTD_VER}//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-${DBK_XML_DTD_VER}/dbgenent.mod" \
+    /etc/xml/docbook &&
+xmlcatalog --noout --add "public" \
+    "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V${DBK_XML_DTD_VER}//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-${DBK_XML_DTD_VER}/dbhierx.mod" \
+    /etc/xml/docbook &&
+xmlcatalog --noout --add "public" \
+    "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-${DBK_XML_DTD_VER}/soextblx.dtd" \
+    /etc/xml/docbook &&
+xmlcatalog --noout --add "public" \
+    "-//OASIS//DTD DocBook XML CALS Table Model V${DBK_XML_DTD_VER}//EN" \
+    "file:///usr/share/xml/docbook/xml-dtd-${DBK_XML_DTD_VER}/calstblx.dtd" \
+    /etc/xml/docbook &&
+xmlcatalog --noout --add "rewriteSystem" \
+    "http://www.oasis-open.org/docbook/xml/${DBK_XML_DTD_VER}" \
+    "file:///usr/share/xml/docbook/xml-dtd-${DBK_XML_DTD_VER}" \
+    /etc/xml/docbook &&
+xmlcatalog --noout --add "rewriteURI" \
+    "http://www.oasis-open.org/docbook/xml/${DBK_XML_DTD_VER}" \
+    "file:///usr/share/xml/docbook/xml-dtd-${DBK_XML_DTD_VER}" \
+    /etc/xml/docbook &&
+xmlcatalog --noout --add "delegatePublic" \
+    "-//OASIS//ENTITIES DocBook XML" \
+    "file:///etc/xml/docbook" /etc/xml/catalog &&
+xmlcatalog --noout --add "delegatePublic" \
+    "-//OASIS//DTD DocBook XML" \
+    "file:///etc/xml/docbook" /etc/xml/catalog &&
+xmlcatalog --noout --add "delegateSystem" \
+    "http://www.oasis-open.org/docbook/" \
+    "file:///etc/xml/docbook" /etc/xml/catalog &&
+xmlcatalog --noout --add "delegateURI" \
+    "http://www.oasis-open.org/docbook/" \
+    "file:///etc/xml/docbook" /etc/xml/catalog
+
+
+# Configure
+# TODO: need to sanely add more versions in here
+VERS="4.1.2 4.2 4.3 4.4"
+VERS=`echo ${VERS} | sed "s@${DBK_XML_DTD_VER}.*@@g"`
+
+for ver in ${VERS} ; do
+   case ${ver} in
+   4.1.2 )
+      xmlcatalog --noout --add "public" \
+         "-//OASIS//DTD DocBook XML V${ver}//EN" \
+         "http://www.oasis-open.org/docbook/xml/${ver}/docbookx.dtd" \
+         /etc/xml/docbook &&
+      xmlcatalog --noout --add "delegateSystem" \
+         "http://www.oasis-open.org/docbook/xml/${ver}/" \
+         "file:///etc/xml/docbook" /etc/xml/catalog &&
+      xmlcatalog --noout --add "delegateURI" \
+         "http://www.oasis-open.org/docbook/xml/${ver}/" \
+         "file:///etc/xml/docbook" /etc/xml/catalog &&
+      xmlcatalog --noout --add "rewriteSystem" \
+         "http://www.oasis-open.org/docbook/xml/${ver}" \
+         "file:///usr/share/xml/docbook/xml-dtd-${DBK_XML_DTD_VER}" \
+         /etc/xml/docbook &&
+      xmlcatalog --noout --add "rewriteURI" \
+         "http://www.oasis-open.org/docbook/xml/${ver}" \
+         "file:///usr/share/xml/docbook/xml-dtd-${DBK_XML_DTD_VER}" \
+         /etc/xml/docbook
+   ;;
+   * ) 
+      xmlcatalog --noout --add "rewriteURI" \
+         "http://www.oasis-open.org/docbook/xml/${ver}" \
+         "file:///usr/share/xml/docbook/xml-dtd-${DBK_XML_DTD_VER}" \
+         /etc/xml/docbook
+   ;;
+   esac
+done
Index: scripts/untested/blfs-scripts/blfs-docbook-xsl.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-docbook-xsl.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-docbook-xsl.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,67 @@
+#!/bin/bash
+
+### docbook-xsl ###
+
+cd ${SRC}
+LOG=docbook-xsl-blfs.log
+
+unpack_tarball docbook-xsl-${DBK_XSL_VER}
+cd ${PKGDIR}
+
+install -d /usr/share/xml/docbook/xsl-stylesheets-${DBK_XSL_VER} &&
+chown -R root:root . &&
+
+cp -af INSTALL VERSION common eclipse extensions fo html htmlhelp \
+    images javahelp lib manpages params profiling template xhtml \
+    /usr/share/xml/docbook/xsl-stylesheets-${DBK_XSL_VER} &&
+install -d /usr/share/doc/xml &&
+cp -af doc/* /usr/share/doc/xml &&
+
+cd /usr/share/xml/docbook/xsl-stylesheets-${DBK_XSL_VER} &&
+sh INSTALL &&
+
+if [ ! -f /etc/xml/catalog ]; then mkdir -p /etc/xml; xmlcatalog \
+    --noout --create /etc/xml/catalog; fi &&
+if [ ! -e /etc/xml/docbook ]; then xmlcatalog --noout --create \
+    /etc/xml/docbook; fi &&
+
+xmlcatalog --noout --add "rewriteSystem" \
+    "http://docbook.sourceforge.net/release/xsl/${DBK_XSL_VER}" \
+    "/usr/share/xml/docbook/xsl-stylesheets-${DBK_XSL_VER}" /etc/xml/catalog &&
+xmlcatalog --noout --add "rewriteURI" \
+    "http://docbook.sourceforge.net/release/xsl/${DBK_XSL_VER}" \
+    "/usr/share/xml/docbook/xsl-stylesheets-${DBK_XSL_VER}" /etc/xml/catalog &&
+xmlcatalog --noout --add "delegateSystem" \
+    "http://docbook.sourceforge.net/release/xsl/" \
+    "file:///etc/xml/docbook" /etc/xml/catalog &&
+xmlcatalog --noout --add "delegateURI" \
+    "http://docbook.sourceforge.net/release/xsl/" \
+    "file:///etc/xml/docbook" /etc/xml/catalog
+
+# Setup shell env for xsl
+if [ ! -d /etc/profile.d ]; then mkdir /etc/profile.d ; fi
+cat > /etc/profile.d/xsl.sh << EOF
+# Set up Environment Variable for XSL Processing
+export XML_CATALOG_FILES="/usr/share/xml/docbook/\
+xsl-stylesheets-${DBK_XSL_VER}/catalog.xml /etc/xml/catalog"
+EOF
+
+# Configure
+# TODO: need to sanely add more versions in here
+VERS="1.61.3 1.65.1 1.66.1 1.67.0 1.67.2"
+VERS=`echo ${VERS} | sed "s@${DBK_XSL_VER}.*@@g"`
+# When building gtk-doc, it searches for release/xsl/current...
+# add this first...
+VERS="current ${VERS}"
+
+for ver in ${VERS} ; do
+   xmlcatalog --noout --add "rewriteSystem" \
+      "http://docbook.sourceforge.net/release/xsl/${ver}" \
+      "/usr/share/xml/docbook/xsl-stylesheets-${DBK_XSL_VER}" \
+      /etc/xml/catalog &&
+   xmlcatalog --noout --add "rewriteURI" \
+      "http://docbook.sourceforge.net/release/xsl/${ver}" \
+      "/usr/share/xml/docbook/xsl-stylesheets-${DBK_XSL_VER}" \
+      /etc/xml/catalog
+done
+
Index: scripts/untested/blfs-scripts/blfs-doxygen.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-doxygen.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-doxygen.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+### doxygen ###
+
+cd ${SRC}
+LOG=doxygen-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+
+unpack_tarball doxygen-${DOXYGEN_VER}
+cd ${PKGDIR}
+
+# overwrite src/unistd.h with the systems
+cp -p /usr/include/unistd.h src/
+
+# Setup platform template for linux-g++-64
+if [ ! "${libdirname}" = "lib" ]; then
+   mkdir -p ./tmake/lib/linux-g++-${BUILDENV} &&
+   cp -Rp ./tmake/lib/linux-g++/* ./tmake/lib/linux-g++-${BUILDENV}
+   platform=linux-g++-${BUILDENV}
+else
+   platform=linux-g++
+fi
+
+extra_conf="--platform ${platform}"
+
+sed -i -e "/TMAKE_LIBDIR.*/s@lib@${libdirname}@g" \
+       -e '/TMAKE_LIBS_OPENGL/s@Mesa@@g' \
+       -e "s@^TMAKE_CC\s.*@& ${ARCH_CFLAGS}@g" \
+       -e "s@^TMAKE_CFLAGS\s.*@& ${TGT_CFLAGS}@g" \
+       -e "s@^TMAKE_CXX\s.*@& ${ARCH_CFLAGS}@g" \
+      tmake/lib/${platform}/tmake.conf
+
+max_log_init doxygen ${DOXYGEN_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix /usr \
+   --docdir /usr/share/doc \
+   --with-doxywizard ${extra_conf} \
+  >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS}
+make \
+  >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${INSTLOGS}
+make install \
+  >> ${LOGFILE} 2>&1 &&
+make doxywizard_install \
+  >> ${LOGFILE} 2>&1 &&
+make docs \
+  >> ${LOGFILE} 2>&1 &&
+make pdf \
+  >> ${LOGFILE} 2>&1 &&
+install -d -m755 /usr/share/doc/doxygen/src &&
+install -m644 src/translator{,_adapter,_en}.h \
+    /usr/share/doc/doxygen/src &&
+install -m644 VERSION /usr/share/doc/doxygen &&
+make install_docs \
+  >> ${LOGFILE} 2>&1 &&
+echo " o Install OK" || barf
Index: scripts/untested/blfs-scripts/blfs-ed.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-ed.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-ed.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,38 @@
+#!/bin/bash
+#
+# ed
+#
+# Dependencies: None
+#
+
+cd ${SRC}
+LOG=blfs-ed.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball ed-${ED_VER} &&
+cd ${PKGDIR}
+
+# Would normally put a case stmt around this, but hey, ed doesn't get
+# updated too often ;-)
+apply_patch ed-0.2-mkstemp-1
+
+max_log_init ed ${ED_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+ ./configure --prefix=/usr --build="${TARGET}" \
+   --exec-prefix="" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-enscript.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-enscript.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-enscript.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+### enscript ###
+
+cd ${SRC}
+LOG=enscript-blfs.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball enscript-${ENSCRIPT_VER}
+cd ${PKGDIR}
+
+max_log_init enscript ${ENSCRIPT_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr \
+   --sysconfdir=/etc/enscript \
+   --localstatedir=/var \
+  >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS}
+make \
+  >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${INSTLOGS}
+make install \
+  >> ${LOGFILE} 2>&1 &&
+echo " o Install OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-espgs.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-espgs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-espgs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+### espgs ###
+
+cd ${SRC}
+LOG=espgs-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball espgs-${ESPGS_VER}
+cd ${PKGDIR}
+
+# NOTE: check /usr/bin/cups-config(-32,-64} to ensure no rpaths are set 
+
+max_log_init espgs ${ESPGS_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr --without-gimp-print --without-omni ${extra_conf} \
+   --with-ijs \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+make CFLAGS_SO='-fPIC $(ACDEFS)' so \
+   >> ${LOGFILE} 2>&1 &&
+make soinstall \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+install -d -m755 /usr/include/ps &&
+install -m644 src/*.h /usr/include/ps
+
+# Now, install fonts
+cd /usr/share/ghostscript
+unpack_tarball ghostscript-fonts-std-${GS_FONTS_STD_VER}
+unpack_tarball gnu-gs-fonts-other-${GS_FONTS_OTHER_VER}
+chown -R root:root *
Index: scripts/untested/blfs-scripts/blfs-fam.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-fam.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-fam.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,55 @@
+#!/bin/bash
+#
+# fam
+#
+# Dependencies: portmap
+#
+
+cd ${SRC}
+LOG=blfs-fam.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball fam-${FAM_VER} &&
+cd ${PKGDIR}
+
+# There are issues with linux-libc-headers and the dnotify patch
+# For now comment out
+#case ${FAM_VER} in
+#   2.7.0 )
+#      apply_patch fam-2.7.0-dnotify-1
+#   ;;
+#   * )
+#      echo "*** Please check if fam ${FAM_VER} requires patching ***"
+#      echo "*** then please update this script (and send patch)      ***"
+#      exit 1
+#   ;;
+#esac
+
+max_log_init fam ${FAM_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+ ./configure --prefix=/usr --build="${TARGET}" \
+   --mandir=/usr/share/man --infodir=/usr/share/info \
+   --sysconfdir=/etc ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-fftw.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-fftw.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-fftw.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,117 @@
+#!/bin/bash
+
+### fftw ###
+
+cd ${SRC}
+
+LOG=fftw-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+case ${TGT_ARCH} in
+   i?86 ) extra_conf="${extra_conf} --enable-i386-hacks" ;;
+   x86_64 ) 
+      if [ "${BUILDENV}" = "32" ]; then
+         extra_conf="${extra_conf} --enable-i386-hacks" 
+      fi
+   ;;
+esac
+
+unpack_tarball fftw-${FFTW_VER}
+cd ${SRC}/${PKGDIR}
+
+max_log_init fftw ${FFTW_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   --mandir=/usr/share/man \
+   --infodir=/usr/share/info \
+   --enable-shared --enable-threads \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+make distclean
+
+LOG=fftw-double-blfs.log
+max_log_init fftw-double ${FFTW_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   --mandir=/usr/share/man \
+   --infodir=/usr/share/info \
+   --enable-shared --enable-threads \
+   --enable-type-prefix \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+make distclean
+
+LOG=fftw-single-blfs.log
+max_log_init fftw-single ${FFTW_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   --mandir=/usr/share/man \
+   --infodir=/usr/share/info \
+   --enable-shared --enable-threads \
+   --enable-type-prefix \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-fftw3.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-fftw3.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-fftw3.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,163 @@
+#!/bin/bash
+
+### fftw3 ###
+
+cd ${SRC}
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball fftw-${FFTW3_VER}
+if [ -d ${PKGDIR}-single ]; then rm -rf ${PKGDIR}-single ; fi
+mv ${PKGDIR} ${PKGDIR}-single
+unpack_tarball fftw-${FFTW3_VER}
+if [ -d ${PKGDIR}-double ]; then rm -rf ${PKGDIR}-double ; fi
+mv ${PKGDIR} ${PKGDIR}-double
+unpack_tarball fftw-${FFTW3_VER}
+if [ -d ${PKGDIR}-long-double ]; then rm -rf ${PKGDIR}-long-double ; fi
+mv ${PKGDIR} ${PKGDIR}-long-double
+
+
+### SINGLE ###
+cd ${SRC}/${PKGDIR}-single
+
+LOG=fftw3-single-blfs.log
+
+# TODO: gonna need to set extra_conf for each arch methinks...
+#       currently only handling amd64/i686
+
+MACHINE=`uname --machine`
+if [ "${MACHINE}" = "x86_64" ]; then
+   case ${BUILDENV} in
+      32 )
+         extra_conf="${extra_conf} --enable-sse"
+      ;;
+   esac
+fi
+
+max_log_init fftw3-single ${FFTW3_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   --mandir=/usr/share/man \
+   --infodir=/usr/share/info \
+   --enable-shared --enable-threads --enable-float \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+#### DOUBLE ###
+cd ${SRC}/${PKGDIR}-double
+
+LOG=fftw3-double-blfs.log
+
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+# OK, for 32bit on amd64, we can use -sse2 extensions, but it barfs on
+# 64bit... 
+#
+# TODO: gonna need to set extra_conf for each arch methinks...
+#       currently only handling amd64/i686
+
+MACHINE=`uname --machine`
+if [ "${MACHINE}" = "x86_64" ]; then
+   case ${BUILDENV} in
+      32 )
+         extra_conf="${extra_conf} --enable-sse2"
+      ;;
+   esac
+fi
+
+max_log_init fftw3-double ${FFTW3_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   --mandir=/usr/share/man \
+   --infodir=/usr/share/info \
+   --enable-shared --enable-threads \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+
+#### LONG DOUBLE ###
+cd ${SRC}/${PKGDIR}-double
+
+LOG=fftw3-long-double-blfs.log
+
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+# OK, for 32bit on amd64, we can use -sse extensions, but it barfs on
+# 64bit... k7 extensions work for 64bit though...
+#
+# TODO: gonna need to set extra_conf for each arch methinks...
+#       currently only handling amd64/i686
+
+max_log_init fftw3-double ${FFTW3_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   --mandir=/usr/share/man \
+   --infodir=/usr/share/info \
+   --enable-shared --enable-threads --enable-long-double \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-fltk-32.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-fltk-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-fltk-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-fltk.sh
Index: scripts/untested/blfs-scripts/blfs-fltk-64.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-fltk-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-fltk-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-fltk.sh
Index: scripts/untested/blfs-scripts/blfs-fltk.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-fltk.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-fltk.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+### fltk ###
+
+cd ${SRC}
+LOG=fltk-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball fltk-${FLTK_VER}-source
+cd ${PKGDIR}
+
+max_log_init fltk ${FLTK_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   --enable-shared --enable-threads \
+   --enable-xft --enable-xdbe \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   # just for consistencies sake, saw it miss these on -64
+   ranlib /usr/${libdirname}/libfltk*.a
+
+   use_wrapper /usr/bin/fltk-config
+fi
Index: scripts/untested/blfs-scripts/blfs-foomatic.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-foomatic.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-foomatic.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,100 @@
+#!/bin/bash
+
+### foomatic ###
+
+cd ${SRC}
+LOG=foomatic-db-blfs.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball foomatic-db-${FOOMATIC_DB_VER}
+cd ${PKGDIR}
+
+max_log_init foomatic-db ${FOOMATIC_DB_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+./configure --prefix=/usr \
+  >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${INSTLOGS}
+make install 
+  >> ${LOGFILE} 2>&1 &&
+echo " o Install OK" || barf
+
+cd ${SRC}
+LOG=foomatic-db-hpijs-blfs.log
+
+unpack_tarball foomatic-db-hpijs-${FOOMATIC_DB_HPIJS_VER}
+cd ${PKGDIR}
+
+max_log_init foomatic-db ${FOOMATIC_DB_HPIJS_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+./configure --prefix=/usr \
+  >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${INSTLOGS}
+make install 
+  >> ${LOGFILE} 2>&1 &&
+echo " o Install OK" || barf
+
+cd ${SRC}
+LOG=foomatic-filters-blfs.log
+
+unpack_tarball foomatic-filters-${FOOMATIC_FILTERS_VER}
+cd ${PKGDIR}
+
+max_log_init foomatic-filters ${FOOMATIC_FILTERS_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+./configure --prefix=/usr \
+  >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${INSTLOGS}
+make install
+  >> ${LOGFILE} 2>&1 &&
+echo " o Install OK" || barf
+
+if [ ! "${libdirname}" = "lib" ]; then
+   # additional symlinks for lib64 cups, ppr to get the foomatic filters
+   # TODO: this needs to be done better
+
+   mkdir -p /usr/${libdirname}/cups/filter
+   ln -sf /usr/bin/foomatic-rip /usr/${libdirname}/cups/filter
+   mkdir -p /usr/${libdirname}/ppr/interfaces
+   mkdir -p /usr/${libdirname}/ppr/lib
+   ln -sf /usr/bin/foomatic-rip /usr/${libdirname}/ppr/interfaces
+   ln -sf /usr/bin/foomatic-rip /usr/${libdirname}/ppr/lib
+fi
+
+#### we probably want libxml2 
+cd ${SRC}
+LOG=foomatic-db-engine-blfs.log
+
+unpack_tarball foomatic-db-engine-${FOOMATIC_DB_ENG_VER}
+cd ${PKGDIR}
+
+max_log_init foomatic-db-engine ${FOOMATIC_DB_ENG_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+./configure --prefix=/usr \
+  >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${INSTLOGS}
+make install
+  >> ${LOGFILE} 2>&1 &&
+echo " o Install OK" || barf
+
+if [ ! "${libdirname}" = "lib" ]; then
+   # additional symlinks for lib64 cups, ppr to get the foomatic filters
+   # TODO: this needs to be done better
+
+   mkdir -p /usr/${libdirname}/cups/filter
+   ln -sf /usr/bin/foomatic-rip /usr/${libdirname}/cups/filter
+   mkdir -p /usr/${libdirname}/ppr/interfaces
+   mkdir -p /usr/${libdirname}/ppr/lib
+   ln -sf /usr/bin/foomatic-rip /usr/${libdirname}/ppr/interfaces
+   ln -sf /usr/bin/foomatic-rip /usr/${libdirname}/ppr/lib
+fi
+
Index: scripts/untested/blfs-scripts/blfs-freeglut-32.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-freeglut-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-freeglut-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-freeglut.sh
Index: scripts/untested/blfs-scripts/blfs-freeglut-64.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-freeglut-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-freeglut-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-freeglut.sh
Index: scripts/untested/blfs-scripts/blfs-freeglut.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-freeglut.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-freeglut.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+### freeglut ###
+
+cd ${SRC}
+LOG=freeglut-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball freeglut-${FREEGLUT_VER}
+cd ${PKGDIR}
+
+# update ltmain so the created libtool is sane
+apply_patch freeglut-2.2.0-update_ltmain-1
+
+max_log_init freeglut ${FREEGLUT_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-gamin.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-gamin.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-gamin.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+### gamin ###
+
+cd ${SRC}
+LOG=gamin-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball gamin-${GAMIN_VER}
+cd ${PKGDIR}
+
+max_log_init gamin ${GAMIN_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr --sysconfdir=/etc ${extra_conf} \
+   --mandir=/usr/share/man --infodir=/usr/share/info \
+   --libexecdir=/usr/${libdirname}/gamin \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+# Reenable this when gamin supports latest inotify
+#--enable-inotify \
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-gd-32.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-gd-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-gd-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-gd.sh
Index: scripts/untested/blfs-scripts/blfs-gd-64.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-gd-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-gd-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-gd.sh
Index: scripts/untested/blfs-scripts/blfs-gd.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-gd.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-gd.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+### gd ###
+
+cd ${SRC}
+LOG=gd-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball gd-${GD_VER}
+cd ${PKGDIR}
+
+max_log_init gd ${GD_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   use_wrapper /usr/bin/gdlib-config
+fi
Index: scripts/untested/blfs-scripts/blfs-gdbm-32.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-gdbm-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-gdbm-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-gdbm.sh
Index: scripts/untested/blfs-scripts/blfs-gdbm-64.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-gdbm-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-gdbm-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-gdbm.sh
Index: scripts/untested/blfs-scripts/blfs-gdbm.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-gdbm.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-gdbm.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,41 @@
+#!/bin/bash
+#
+# gdbm
+#
+# Dependencies: None
+#
+
+cd ${SRC}
+LOG=blfs-gdbm.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball gdbm-${GDBM_VER} &&
+cd ${PKGDIR}
+
+max_log_init gdbm ${GDBM_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr --build="${TARGET}" \
+   --mandir=/usr/share/man --infodir=/usr/share/info ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make BINOWN=root BINGRP=root install \
+   >> ${LOGFILE} 2>&1 &&
+make BINOWN=root BINGRP=root install-compat \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-gimp-print.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-gimp-print.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-gimp-print.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+### gimp-print ###
+
+cd ${SRC}
+LOG=gimp-print-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball gimp-print-${GIMP_PRINT_VER}
+cd ${PKGDIR}
+
+max_log_init gimp-print ${GIMP_PRINT_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   use_wrapper /usr/bin/gimpprint-config
+fi
Index: scripts/untested/blfs-scripts/blfs-glib12-32.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-glib12-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-glib12-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-glib12.sh
Index: scripts/untested/blfs-scripts/blfs-glib12-64.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-glib12-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-glib12-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-glib12.sh
Index: scripts/untested/blfs-scripts/blfs-glib12.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-glib12.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-glib12.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+### glib12 ###
+
+cd ${SRC}
+LOG=glib12-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball glib-${GLIB12_VER}
+cd ${PKGDIR}
+
+apply_patch glib-1.2.10-gcc34-1
+apply_patch glib-1.2.10-update_config_foo-1
+
+max_log_init glib12 ${GLIB12_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr --mandir=/usr/share/man \
+   --infodir=/usr/share/info ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${TESTLOGS} &&
+make check\
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   use_wrapper /usr/bin/glib-config
+fi
Index: scripts/untested/blfs-scripts/blfs-graphviz.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-graphviz.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-graphviz.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+### graphviz ###
+
+cd ${SRC}
+LOG=graphviz-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   extra_conf="${extra_conf} --with-expatlibdir=/usr/${libdirname}"
+   # fix LIBPOSTFIX so we dont always search lib64 on x86_64, ppc64 etc
+   # when building 32bit
+   if [ "${libdirname}" = "lib" ]; then
+      sed -i -e "/LIBPOSTFIX/s@64@@g" configure
+   fi
+fi
+
+
+unpack_tarball graphviz-${GRAPHVIZ_VER}
+cd ${PKGDIR}
+
+max_log_init graphviz ${GRAPHVIZ_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   use_wrapper /usr/bin/dotneato-config
+fi
Index: scripts/untested/blfs-scripts/blfs-gtk12-32.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-gtk12-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-gtk12-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-gtk12.sh
Index: scripts/untested/blfs-scripts/blfs-gtk12-64.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-gtk12-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-gtk12-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-gtk12.sh
Index: scripts/untested/blfs-scripts/blfs-gtk12.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-gtk12.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-gtk12.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# gtk12 
+#-------
+#
+# Dependencies: glib12 X
+#
+
+cd ${SRC}
+LOG=gtk12-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball "gtk\+-${GTK12_VER}"
+cd ${PKGDIR}
+
+apply_patch "gtk\+-1.2.10-update_config_foo-1"
+
+max_log_init gtk12 ${GTK12_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info \
+   --sysconfdir=/etc ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   use_wrapper /usr/bin/gtk-config
+fi
Index: scripts/untested/blfs-scripts/blfs-hicolor-icon-theme.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-hicolor-icon-theme.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-hicolor-icon-theme.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,33 @@
+#!/bin/bash
+#
+# hicolor-icon-theme
+#
+# Dependencies: none
+#
+
+cd ${SRC}
+LOG=blfs-hicolor-icon-theme.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball hicolor-icon-theme-${HC_ICON_THEME_VER} &&
+cd ${PKGDIR}
+
+max_log_init hicolor-icon-theme ${HC_ICON_THEME_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+ ./configure --prefix=/usr \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-ijs.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-ijs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-ijs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+### ijs ###
+
+cd ${SRC}
+LOG=ijs-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball ijs-${IJS_VER}
+cd ${PKGDIR}
+
+max_log_init ijs ${IJS_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   use_wrapper /usr/bin/ijs-config
+fi
Index: scripts/untested/blfs-scripts/blfs-jadetex.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-jadetex.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-jadetex.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,75 @@
+#!/bin/bash
+
+### jadetex ###
+
+cd ${SRC}
+LOG=jadetex-blfs.log
+
+unpack_tarball jadetex-${JADETEX_VER}
+cd ${PKGDIR}
+
+max_log_init jadetex ${JADETEX_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+sed -i.orig -e "s/original texmf.cnf/modified texmf.cnf/" \
+   /usr/share/texmf/web2c/texmf.cnf
+# TODO: This needs to be added below "ConTeXt is a memory hog" in
+#       /usr/share/texmf/web2c/texmf.cnf
+#pool_size.context = 750000
+cat >> /usr/share/texmf/web2c/texmf.cnf << "EOF"
+
+% The following 3 sections added for JadeTeX
+
+% latex settings
+main_memory.latex = 1100000
+param_size.latex = 1500
+stack_size.latex = 1500
+hash_extra.latex = 15000
+string_vacancies.latex = 45000
+pool_free.latex = 47500
+nest_size.latex = 500
+save_size.latex = 5000
+pool_size.latex = 500000
+max_strings.latex = 55000
+font_mem_size.latex= 400000
+
+% jadetex settings
+main_memory.jadetex = 1500000
+param_size.jadetex = 1500
+stack_size.jadetex = 1500
+hash_extra.jadetex = 50000
+string_vacancies.jadetex = 45000
+pool_free.jadetex = 47500
+nest_size.jadetex = 500
+save_size.jadetex = 5000
+pool_size.jadetex = 500000
+max_strings.jadetex = 55000
+
+% pdfjadetex settings
+main_memory.pdfjadetex = 2500000
+param_size.pdfjadetex = 1500
+stack_size.pdfjadetex = 1500
+hash_extra.pdfjadetex = 50000
+string_vacancies.pdfjadetex = 45000
+pool_free.pdfjadetex = 47500
+nest_size.pdfjadetex = 500
+save_size.pdfjadetex = 5000
+pool_size.pdfjadetex = 500000
+max_strings.pdfjadetex = 55000
+EOF
+
+cp -R /usr/share/texmf/tex/latex/config . &&
+cd config &&
+tex -ini -progname=latex latex.ini &&
+mv /usr/share/texmf/web2c/latex.fmt \
+   /usr/share/texmf/web2c/latex.fmt.orig &&
+install -m 644 latex.fmt /usr/share/texmf/web2c &&
+cd ..
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+ln -sf tex /usr/bin/jadetex &&
+ln -sf pdftex /usr/bin/pdfjadetex &&
+mktexlsr
+
Index: scripts/untested/blfs-scripts/blfs-jasper.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-jasper.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-jasper.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+### jasper ###
+
+cd ${SRC}
+LOG=jasper-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unzip ${TARBALLS}/jasper-${JASPER_VER}.zip
+
+cd jasper-${JASPER_VER}
+
+max_log_init jasper ${JASPER_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr --enable-shared ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-lcms.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-lcms.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-lcms.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,44 @@
+#!/bin/bash 
+
+### lcms ###
+
+cd ${SRC}
+LOG=lcms-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball lcms-${LCMS_VER}
+cd ${PKGDIR}
+
+# TODO: need to patch python/lcms.i as SWIG_LPGAMMATABLE is not defined
+# TODO: check python output what it defines for site-packeages during
+#       bi-arch builds... python script dir is always lib, not lib64
+#       ( thio could be an issue with the python build ).
+#       Also, produced .la files need editing, and for some reason
+#       libtool brings in /usr/lib64/lib{jpeg,tiff}.la during 32bit builds
+
+max_log_init lcms ${LCMS_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr --with-python ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-lesstif.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-lesstif.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-lesstif.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+### lesstif ###
+
+cd ${SRC}
+LOG=lesstif-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball lesstif-${LESSTIF_VER}
+cd ${PKGDIR}
+
+apply_patch lesstif-0.94.0-use_libdir
+
+max_log_init lesstif ${LESSTIF_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   --enable-build-21 \
+   --disable-debug \
+   --enable-production \
+   --disable-build-tests \
+   --with-xdnd \
+   --mandir=/usr/share/man \
+   --infodir=/usr/share/info \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+# TODO: Need to edit /usr/bin/mxmkmf to set the correct libdir ...
+# (it really should be setup fom --libdir )
+if [ "Y" = "${MULTIARCH}" ]i; then
+   use_wrapper /usr/bin/mxmkmf
+fi
+
Index: scripts/untested/blfs-scripts/blfs-libidn.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-libidn.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-libidn.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+### libidn ###
+
+cd ${SRC}
+LOG=libidn-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball libidn-${LIBIDN_VER}
+cd ${PKGDIR}
+
+max_log_init libidn ${LIBIDN_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   --mandir=/usr/share/man --infodir=/usr/share/info
+   --enable-java \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-libjpeg-32.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-libjpeg-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-libjpeg-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-libjpeg.sh
Index: scripts/untested/blfs-scripts/blfs-libjpeg-64.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-libjpeg-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-libjpeg-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-libjpeg.sh
Index: scripts/untested/blfs-scripts/blfs-libjpeg.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-libjpeg.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-libjpeg.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+### libjpeg ###
+
+cd ${SRC}
+LOG=libjpeg-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball jpegsrc.${LIBJPEG_VER}
+cd ${PKGDIR}
+
+# Update config.{sub,guess} to support newer architectures
+# Update libtool scripts
+apply_patch jpegsrc.v6b-update_configury-1
+
+if [ ! "${libdirname}" = "lib" ]; then
+   sed -i "/^libdir =/s/lib$/${libdirname}/g" makefile.cfg
+fi
+
+max_log_init libjpeg ${LIBJPEG_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr \
+   --enable-static --enable-shared ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-libmad.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-libmad.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-libmad.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+### libmad ###
+
+cd ${SRC}
+LOG=libmad-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+#====================================================
+# Following 2 if's for biarch predominately...
+# Set the fixed point math routines appropriately
+
+# if ALT_TGT is defined, set --host and --build
+if [ ! -z ${ALT_TGT} ]; then
+   extra_conf="${extra_conf} --host=${ALT_TGT}"
+   extra_conf="${extra_conf} --build=${ALT_TGT}"
+fi
+
+# TODO: this will have to be set on 64bit machines regardless
+#       if it is biarch or not...
+if [ "64" = "${BUILDENV}" ] ; then
+   extra_conf="${extra_conf} --enable-fpm=64bit"
+fi
+#====================================================
+
+unpack_tarball libmad-${LIBMAD_VER}
+cd ${PKGDIR}
+
+max_log_init libmad ${LIBMAD_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-libmikmod.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-libmikmod.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-libmikmod.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+### libmikmod ###
+
+cd ${SRC}
+LOG=libmikmod-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball libmikmod-${LIBMIKMOD_VER}
+cd ${PKGDIR}
+
+sed -i -e "s/VERSION=10/VERSION=11/" \
+       -e "s/sys_asoundlib/alsa_asoundlib/" \
+       -e "s/snd_cards/snd_card_load/g" \
+       -e "s|sys/asoundlib.h|alsa/asoundlib.h|g" \
+    configure.in &&
+autoconf &&
+
+max_log_init libmikmod ${LIBMIKMOD_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   --mandir=/usr/share/man \
+   --infodir=/usr/share/info \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+# TODO: Need to edit /usr/bin/mxmkmf to set the correct libdir ...
+# (it really should be setup fom --libdir )
+if [ "Y" = "${MULTIARCH}" ]i; then
+   use_wrapper /usr/bin/libmikmod-config
+fi
+
+chmod 755 /usr/${libdir}/libmikmod.so.2.*
Index: scripts/untested/blfs-scripts/blfs-libmpeg3.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-libmpeg3.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-libmpeg3.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+### libmpeg3 ###
+
+cd ${SRC}
+LOG=libmpeg3-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball libmpeg3-${LIBMPEG3_VER}
+cd ${PKGDIR}
+
+# Eeeek this is a mess...
+# Firstly, fix for gcc-3.4
+apply_patch libmpeg3-1.5.4-gcc34-1
+
+# Secondly, we are going to use the system a52dec, so blow that
+# directory away...
+rm -rf a52dec-0.7.3
+
+# We will also modify the Makefile to adjusting the A52 include search path
+# enabling shared libmpeg, and also enabling mpeg3split
+# (parts stolen from gentoo)
+apply_patch libmpeg3-1.5.4-shared_libmpeg3-1
+
+# override OBJDIR
+# use uname --machine except where it equals x86_64 and BUILDENV=32
+MACHINE=`uname --machine`
+if [ "${MACHINE}" = "x86_64" -a "${BUILDENV}" = "32" ]; then
+   MACHINE=i686
+fi
+
+max_log_init libmpeg3 ${LIBMPEG3_VER} "blfs (shared)" ${BUILDLOGS} ${LOG}
+make \
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+OBJDIR=${MACHINE} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${INSTLOGS} &&
+make OBJDIR=${MACHINE} install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+# Fix the produced headers
+PREFIX=/usr
+for file in `find ${PREFIX}/include/libmpeg3 -type f` ; do
+   sed -i 's@\(#include\s\)\"\([-+_a-zA-Z0-9/.]*\)\"@\1<libmpeg3/\2>@' \
+      ${file}
+done
Index: scripts/untested/blfs-scripts/blfs-libogg.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-libogg.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-libogg.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+### libogg ###
+
+cd ${SRC}
+LOG=libogg-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball libogg-${LIBOGG_VER}
+cd ${PKGDIR}
+
+max_log_init libogg ${LIBOGG_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-libraw1394.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-libraw1394.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-libraw1394.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+### libraw1394 ###
+
+cd ${SRC}
+LOG=libraw1394-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball libraw1394-${LIBRAW1394_VER}
+cd ${PKGDIR}
+
+max_log_init libraw1394 ${LIBRAW1394_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+# device needs to be created
+# Output from make dev...
+#
+# mknod -m 600 /dev/raw1394 c 171 0
+# chown root.root /dev/raw1394
+#
+# /dev/raw1394 created
+# It is owned by root with permissions 600.  You may want to fix
+# the group/permission to something appropriate for you.
+# Note however that anyone who can open raw1394 can access all
+# devices on all connected 1394 buses unrestricted, including
+# harddisks and other probably sensitive devices.
+
+make dev
Index: scripts/untested/blfs-scripts/blfs-libvorbis.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-libvorbis.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-libvorbis.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+### libvorbis ###
+
+cd ${SRC}
+LOG=libvorbis-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball libvorbis-${LIBVORBIS_VER}
+cd ${PKGDIR}
+
+max_log_init libvorbis ${LIBVORBIS_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-lm_sensors.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-lm_sensors.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-lm_sensors.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+### lm_sensors ###
+
+cd ${SRC}
+LOG=lm_sensors-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball lm_sensors-${LM_SENSORS_VER}
+cd ${PKGDIR}
+
+max_log_init lm_sensors ${LM_SENSORS_VER} "blfs (shared)" ${BUILDLOGS} ${LOG}
+make \
+   CC="${CC-gcc} ${ARCH_CFLAGS}" \
+   CFLAGS="${TGT_CFLAGS}" \
+   PREFIX=/usr \
+   LIBDIR=/usr/${libdirname} \
+   user \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make \
+   CC="${CC-gcc} ${ARCH_CFLAGS}" \
+   CFLAGS="${TGT_CFLAGS}" \
+   PREFIX=/usr \
+   LIBDIR=/usr/${libdirname} \
+   user_install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+echo"
+###############################################################
+# TODO: This should be handled by udev, devices don't get 
+#       automatically created...
+#       Also, sensors-detect needs to be run, startup scripts
+#       installed ...
+###############################################################
+#prog/mkdev/mkdev.sh
+#sensors-detect
+#cp prog/init/lm_sensors.init /etc/rc.d/init.d/lm_sensors
+#echo \"alias char-major-89 i2c-dev\" >> /etc/modules.conf
+#mkdir -p /var/lock/subsys
+"
Index: scripts/untested/blfs-scripts/blfs-mas.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-mas.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-mas.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,66 @@
+#!/bin/bash
+
+### mas ###
+
+cd ${SRC}
+LOG=mas-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball mas-${MAS_VER}
+cd ${PKGDIR}
+
+apply_patch mas-cvs-add_amd64
+
+max_log_init mas ${MAS_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+
+# Adjust config/host.def to install to /usr and to use standard
+# installation
+cat >> config/host.def <<EOF
+#define ProjectRoot /usr
+#define UsesSeparateInstallHierarchy NO
+EOF
+
+# use previously installed fftw2 libs
+sed -i 's@\(HasFFTW\).*@\1 YES@g' config/host.def
+
+imake -I./config \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+CC="${CC-gcc} ${ARCH_CFLAGS} ${TGT_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS} ${TGT_CFLAGS}" \
+World \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+# for some reason, mas-config and mas-launch are missing the #! line
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   use_wrapper /usr/bin/{masmkmf,mas-config,mas-launch}
+fi
+
+cd ${SRC}
+# Install libmas codec
+unpack_tarball mas-codec_mp1a_mad-${MAS_MAD_CODEC_VER}
+
+cd ${PKGDIR}
+mkdir -p build/lib
+masmkmf -a
+make \
+CC="${CC-gcc} ${ARCH_CFLAGS} ${TGT_CFLAGS}" \
+make install
+
Index: scripts/untested/blfs-scripts/blfs-mtools.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-mtools.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-mtools.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+### mtools ###
+
+cd ${SRC}
+LOG=mtools-blfs.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball mtools-${MTOOLS_VER}
+cd ${PKGDIR}
+
+max_log_init mtools ${MTOOLS_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr \
+   --mandir=/usr/share/man \
+   --infodir=/usr/share/info \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-mysql.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-mysql.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-mysql.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+### mysql ###
+
+cd ${SRC}
+LOG=mysql-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball mysql-${MYSQL_VER}
+cd ${PKGDIR}
+
+max_log_init mysql ${MYSQL_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXLAGS="${TGT_CFLAGS}" \
+CPPFLAGS="-D_GNU_SOURCE" \
+./configure --prefix=/usr ${extra_conf} \
+   --libexecdir=/usr/${libdirname}/mysql --localstatedir=/var/lib/mysql \
+   --enable-thread-safe-client --enable-assembler \
+   --enable-local-infile --with-named-thread-libs=-lpthread \
+   --with-unix-socket-path=/var/run/mysql/mysql.sock \
+   --without-debug --without-bench --without-readline \
+   --with-libwrap --with-openssl \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} testdir=/usr/${libdirname}/mysql/mysql-test \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make testdir=/usr/${libdirname}/mysql/mysql-test install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   use_wrapper /usr/bin/{mysql_config,mysql_fix_privilege_tables,mysql_install_db,mysqlbug}
+   create_stub_hdrs /usr/include/mysql/my_config.h
+fi
+
+cd /usr/${libdirname} &&
+ln -sf mysql/libmysqlclient{,_r}.so* .
Index: scripts/untested/blfs-scripts/blfs-nas-32.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-nas-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-nas-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-nas.sh
Index: scripts/untested/blfs-scripts/blfs-nas-64.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-nas-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-nas-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-nas.sh
Index: scripts/untested/blfs-scripts/blfs-nas.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-nas.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-nas.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,35 @@
+#!/bin/bash
+#
+# nas
+#
+# Dependencies: X
+#
+
+cd ${SRC}
+LOG=blfs-nas.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+
+unpack_tarball nas-${NAS_VER}.src &&
+cd ${PKGDIR}
+
+max_log_init nas ${NAS_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+/usr/X11R6/bin/xmkmf \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make World \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+make install.man \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-nasm.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-nasm.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-nasm.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+### NASM ###
+cd ${SRC}
+LOG="nasm-blfs.log"
+
+unpack_tarball nasm-${NASM_VER} &&
+cd ${SRC}/${PKGDIR}
+
+# build nasm, bin86 and lilo 32 bit
+case ${TGT_ARCH} in
+   x86_64 ) ARCH_CFLAGS="-m32" ;;
+esac
+
+max_log_init nasm ${NASM_VER} blfs ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" CFLAGS="-O2 -pipe" \
+./configure --prefix=/usr \
+   --libexecdir=/usr/lib/nasm \
+   --mandir=/usr/share/man \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+# should use "make everything" to generate docs, but we don't
+# know if we have ps2pdf yet
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} &&
+make install_rdf \
+   >> ${LOGFILE} &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-openjade-32.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-openjade-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-openjade-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-openjade.sh
Index: scripts/untested/blfs-scripts/blfs-openjade-64.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-openjade-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-openjade-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-openjade.sh
Index: scripts/untested/blfs-scripts/blfs-openjade.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-openjade.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-openjade.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+### openjade ###
+
+cd ${SRC}
+LOG=openjade-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball openjade-${OPENJADE_VER}
+cd ${PKGDIR}
+
+max_log_init openjade ${OPENJADE_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr --disable-static \
+    ${extra_conf} --enable-http \
+    --enable-splibdir=/usr/${libdirname} \
+    --enable-default-catalog=/etc/sgml/catalog \
+    --enable-default-search-path=/usr/share/sgml \
+    --datadir=/usr/share/sgml/openjade-${OPENJADE_VER} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+ln -sf openjade /usr/bin/jade &&
+ln -sf libogrove.so /usr/${libdirname}/libgrove.so &&
+ln -sf libospgrove.so /usr/${libdirname}/libspgrove.so &&
+ln -sf libostyle.so /usr/${libdirname}/libstyle.so &&
+install -m644 dsssl/catalog /usr/share/sgml/openjade-${OPENJADE_VER}/ &&
+install -m644 dsssl/*.{dtd,dsl,sgm} \
+    /usr/share/sgml/openjade-${OPENJADE_VER} &&
+install-catalog --add /etc/sgml/openjade-${OPENJADE_VER}.cat \
+    /usr/share/sgml/openjade-${OPENJADE_VER}/catalog &&
+install-catalog --add /etc/sgml/sgml-docbook.cat \
+    /etc/sgml/openjade-${OPENJADE_VER}.cat
+
Index: scripts/untested/blfs-scripts/blfs-opensp-32.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-opensp-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-opensp-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-opensp.sh
Index: scripts/untested/blfs-scripts/blfs-opensp-64.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-opensp-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-opensp-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-opensp.sh
Index: scripts/untested/blfs-scripts/blfs-opensp.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-opensp.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-opensp.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+### OpenSP ###
+
+cd ${SRC}
+LOG=OpenSP-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball OpenSP-${OPENSP_VER}
+cd ${PKGDIR}
+
+apply_patch OpenSP-1.5.1-LITLEN-1
+apply_patch OpenSP-1.5.1-gcc34-1
+
+max_log_init OpenSP ${OPENSP_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr --disable-static \
+    ${extra_conf} --enable-http \
+    --enable-default-catalog=/etc/sgml/catalog \
+    --enable-default-search-path=/usr/share/sgml \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make pkgdatadir=/usr/share/sgml/OpenSP-${OPENSP_VER} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make pkgdatadir=/usr/share/sgml/OpenSP-${OPENSP_VER} install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   create_stub_hdrs /usr/include/OpenSP/config.h
+fi
+
+ln -sf onsgmls /usr/bin/nsgmls
+ln -sf osgmlnorm /usr/bin/sgmlnorm
+ln -sf ospam /usr/bin/spam
+ln -sf ospcat /usr/bin/spcat
+ln -sf ospent /usr/bin/spent
+ln -sf osx /usr/bin/sx
+ln -sf osx /usr/bin/sgml2xml
+ln -sf libosp.so /usr/${libdirname}/libsp.so
+
Index: scripts/untested/blfs-scripts/blfs-packages
===================================================================
--- scripts/untested/blfs-scripts/blfs-packages	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-packages	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-packages-20050514
Index: scripts/untested/blfs-scripts/blfs-packages-20050514
===================================================================
--- scripts/untested/blfs-scripts/blfs-packages-20050514	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-packages-20050514	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,151 @@
+#!/bin/bash
+
+export OPENEXR_VER=1.2.2
+
+# needs work to support newer arches
+export A2PS_VER=4.13b
+
+export A52DEC_VER=0.7.4
+export ALSA_LIB_VER=1.0.8
+export ALSA_TOOLS_VER=1.0.8
+export ALSA_UTILS_VER=1.0.8
+
+# see notes concerning issues
+export ASPELL_VER=0.60.2		# needs wrapper
+
+export CDPARANOIA_VER=alpha9.8 
+export CUPS_VER=1.1.23			# needs wrapper
+export DBUS_VER=0.33
+export DT_FILE_UTILS=0.10
+export DBK_DSSSL_VER=1.79
+export DBK_SGML_VER=4.4
+export DBK_UTILS_VER=0.6.14
+
+# check script can handle version, see notes
+export DBK_XML_DTD_VER=4.4
+# check script can handle version, see notes
+export DBK_XSL_VER=1.67.2
+
+export DOXYGEN_VER=1.4.2
+export ED_VER=0.2
+export ENSCRIPT_VER=1.6.4
+export ESPGS=7.07.1
+export FAM_VER=
+
+export FLAC_VER=1.1.2
+# TODO: single, double options not being set
+export FFTW_VER=2.1.5
+
+export FFTW3_VER=3.0.1
+export FLTK_VER=1.1.6			# needs wrapper
+
+# Foomatic filter setup for cups is gonna need work... 
+# check if CC/CFLAGS need to be defined
+export FOOMATIC_DB_VER=20050514
+export FOOMATIC_DB_HPIJS_VER=1.5
+export FOOMATIC_FILTERS_VER=3.0.2
+export FOOMATIC_DB_ENG_VER=3.0.2
+
+export FREEGLUT_VER=2.2.0
+
+# TODO: re-enable inotify support
+export GAMIN_VER=0.0.26
+
+export GD_VER=2.0.33			# needs wrapper
+export GDBM_VER=1.8.3
+export GIMP_PRINT_VER=4.2.7		# needs wrapper
+export GLIB12_VER=1.2.10		# needs wrapper
+
+# check LIBPOSTFIX in configure for mips
+export GRAPHVIS_VER=2.2.1		# needs wrapper 
+
+export GTK12_VER=1.2.10			# needs wrapper
+export HAL_VER=
+export HC_ICON_THEME_VER=0.8
+export IJS_VER=0.35			# needs wrapper
+export JADETEX_VER=3.13
+export JASPER=1.701.0
+
+# lcms has issues... see notes
+export LCMS_VER=1.14
+
+# check notes on need to edit mxmkmf
+export LESSTIF=0.94.4			# needs wrapper 
+
+export LIBAO_VER=0.8.6
+
+# hmmm isn't this part of glibc nowadays
+export LIBIDN_VER=0.5.16
+
+# libjpeg is a GODDAMNED FIGHT building on x86_64, needs fixing
+export LIBJPEG_VER=v6b
+
+export LIBMAD_VER=0.15.1b
+export LIBMIKMOD_VER=3.1.11		# needs wrapper
+
+# Check setting of PREFIX for header fixups, check setting of MACHINE
+export LIBMPEG3_VER=1.5.4
+
+export LIBOGG_VER=1.1.2
+
+# requires a device node created... revisit for udev
+export LIBRAW1394_VER=1.1.0
+
+export LIBTHEORA_VER=1.0alpha4
+export LIBVORBIS_VER=1.1.0
+
+# Additional requirements, see script
+export LM_SENSORS_VER=2.9.1
+
+# Check patch requirements for amd64 etc... check script for other needed fixes
+export MAS_VER=0.6.3			# Needs wrapper
+
+export MTOOLS_VER=3.9.10
+export MYSQL_VER=4.1.11			# needs wrapper and header mods
+export NAS_VER=1.7
+
+# double check this script... only builds 32
+export NASM_VER=0.98.38
+
+# libtool barfage, may be fixed now...
+export OPENJADE_VER=1.3.2  
+export OPENSP_VER=1.5.1			# needs header fixes
+export PCRE_VER=5.0			# needs wrapper
+export PKGCONFIG_VER=0.17.2
+export POPT_VER=1.7
+
+# check setting CC is correct...
+export PSUTILS_VER=p17
+
+# needs wrapper and also header mods (wrapper may not cut it)
+# Also will probably need edits for lib32
+export PYTHON_VER=2.4.1
+
+# Much more needs to be done for mips etc
+# needs wrapper and header mods
+# Also note the QT_INSTALL_SELF_CVONTAINED env var for putting it in /opt
+export QT_VER=3.3.4
+
+#revisit this script re --with-libdir= vs --libdir=
+export SAMBA_VER=3.0.14a
+export SGML_COMMON_VER=0.6.3
+export SGMLSPM_VER=1.03ii
+export SHD_MIME_INFO_VER=0.16
+export SPEEX_VER=1.1.8
+
+# TODO: Look into swig builds when multilib... read script for details
+#       Work will need to be done, script hasn't been touched
+export SWIG_VER=1.3.24
+
+export TETEX_VER=3.0
+export TIFF_VER=3.7.2
+export TK_VER=8.4.9
+
+# Check unzip to see how to apply target specific cflags, default env etc
+export UNZIP_VER=552
+
+export WHICH_VER=2.16
+export XMMS_VER=1.2.10			# needs wrapper
+
+# need to make sure perl uses a wrapper
+export XML_PARSER_PM_VER=2.34
Index: scripts/untested/blfs-scripts/blfs-packages-template
===================================================================
--- scripts/untested/blfs-scripts/blfs-packages-template	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-packages-template	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,144 @@
+#!/bin/bash
+
+export OPENEXR_VER=
+
+# needs work to support newer arches
+export A2PS_VER=
+
+export A52DEC_VER=
+export ALSA_LIB_VER=
+export ALSA_TOOLS_VER=
+export ALSA_UTILS_VER=
+
+# see notes concerning issues
+export ASPELL_VER=			# needs wrapper
+
+export CDPARANOIA_VER= 
+export CUPS_VER=			# needs wrapper
+export DBUS_VER=
+export DT_FILE_UTILS=
+export DBK_DSSL_VER=
+export DBK_SGML_VER=
+
+# check script can handle version, see notes
+export DBK_XML_DTD_VER=   
+# check script can handle version, see notes
+export DBK_XSL_VER=
+
+export DOXYGEN_VER=   
+export ED_VER=
+export ENSCRIPT_VER=
+export ESPGS=
+export FAM_VER=
+
+# TODO: single, double options not being set
+export FFTW_VER=
+
+export FFTW3_VER=
+export FLTK_VER=			# needs wrapper
+
+# Foomatic filter setup for cups is gonna need work... 
+# check if CC/CFLAGS need to be defined
+export FOOMATIC_DB_VER=
+export FOOMATIC_DB_HPIJS_VER=
+export FOOMATIC_FILTERS_VER=
+export FOOMATIC_DB_ENG_VER=
+
+export FREEGLUT=
+
+# TODO: re-enable inotify support
+export GAMIN_VER=
+
+export GD_VER=				# needs wrapper
+export GDBM_VER=
+export GIMP_PRINT_VER=			# needs wrapper
+export GLIB12=				# needs wrapper
+
+# check LIBPOSTFIX in configure for mips
+export GRAPHVIS_VER=			# needs wrapper 
+
+export GTK12_VER=			# needs wrapper
+export HC_ICON_THEME_VER=
+export IJS_VER=				# needs wrapper
+export JADETEX_VER=
+export JASPER=
+
+# lcms has issues... see notes
+export LCMS_VER=   
+
+# check notes on need to edit mxmkmf
+export LESSTIF=				# needs wrapper 
+
+# hmmm isn't this part of glibc nowadays
+export LIBIDN_VER=   
+
+# libjpeg is a GODDAMNED FIGHT building on x86_64, needs fixing
+export LIBJPEG_VER=
+
+export LIBMAD_VER=
+export LIBMIKMOD_VER=			# needs wrapper
+
+# Check setting of PREFIX for header fixups, check setting of MACHINE
+export LIBMPEG3_VER=
+
+export LIBOGG_VER=
+
+# requires a device node created... revisit for udev
+export LIBRAW1394_VER=
+
+export LIBVORBIS_VER=
+
+# Additional requirements, see script
+export LM_SENSORS_VER=
+
+# Check patch requirements for amd64 etc... check script for other needed fixes
+export MAS_VER=				# Needs wrapper
+
+export MTOOLS_VER=
+export MYSQL_VER=			# needs wrapper and header mods
+export NAS_VER=
+
+# double check this script... only builds 32
+export NASM_VER=
+
+# libtool barfage, may be fixed now...
+export OPENJADE_VER=  
+export OPENSP_VER=			# needs header fixes
+export PCRE_VER=			# needs wrapper
+export PKGCONFIG_VER=
+export POPT_VER=
+
+# check setting CC is correct...
+export PSUTILS_VER=
+
+# needs wrapper and also header mods (wrapper may not cut it)
+# Also will probably need edits for lib32
+export PYTHON_VER=
+
+# Much more needs to be done for mips etc
+# needs wrapper and header mods
+# Also note the QT_INSTALL_SELF_CVONTAINED env var for putting it in /opt
+export QT_VER=
+
+#revisit this script re --with-libdir= vs --libdir=
+export SAMBA_VER=
+export SGML_COMMON_VER=
+export SGMLSPM_VER=
+export SHD_MIME_INFO_VER=
+
+# TODO: Look into swig builds when multilib... read script for details
+#       Work will need to be done, script hasn't been touched
+export SWIG_VER=
+
+export TETEX_VER=
+export TIFF_VER=
+export TK_VER=
+
+# Check unzip to see how to apply target specific cflags, default env etc
+export UNZIP_VER=
+
+export WHICH_VER=
+export XMMS_VER=			# needs wrapper
+
+# need to make sure perl uses a wrapper
+export XML_PARSER_VER=   
Index: scripts/untested/blfs-scripts/blfs-pcre.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-pcre.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-pcre.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+### pcre ###
+
+cd ${SRC}
+LOG=pcre-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball pcre-${PCRE_VER}
+cd ${PKGDIR}
+
+max_log_init pcre ${PCRE_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS} ${TGT_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS} ${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   --mandir=/usr/share/man --infodir=/usr/share/info \
+   --enable-utf8 \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+mv /usr/${libdirname}/libpcre.so.* /${libdirname}/ &&
+ln -sf ../../${libdirname}/libpcre.so.0 /usr/${libdirname}/libpcre.so
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   use_wrapper /usr/bin/pcre-config
+fi
Index: scripts/untested/blfs-scripts/blfs-pkgconfig.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-pkgconfig.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-pkgconfig.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,36 @@
+#!/bin/bash
+#
+# pkgconfig
+#
+# Dependencies: none
+#
+
+cd ${SRC}
+LOG=blfs-pkgconfig.log
+
+set_libdirname
+setup_multiarch
+
+# override TARBALLS to point at gnome/platform tree
+GNOME_REL_MAJ=`echo ${GNOME_REL} | sed 's@\([0-9]*\.[0-9]*\).*@\1@g'`
+export TARBALLS=${GNOME_TARBALLS}/platform/${GNOME_REL_MAJ}/${GNOME_REL}/sources
+unpack_tarball pkgconfig-${PKGCONFIG_VER} &&
+cd ${PKGDIR}
+
+max_log_init pkgconfig ${PKGCONFIG_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="${TARGET_CFLAGS}" \
+ ./configure --prefix=/usr \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-popt-32.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-popt-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-popt-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-popt.sh
Index: scripts/untested/blfs-scripts/blfs-popt-64.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-popt-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-popt-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-popt.sh
Index: scripts/untested/blfs-scripts/blfs-popt.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-popt.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-popt.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,39 @@
+#!/bin/sh
+#
+# popt
+#
+# Dependencies: None
+#
+
+cd ${SRC}
+LOG=blfs-popt.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball popt-${POPT_VER} &&
+cd ${PKGDIR}
+
+max_log_init popt ${POPT_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+ ./configure --prefix=/usr --build="${TARGET}" \
+   --mandir=/usr/share/man --infodir=/usr/share/info ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-psutils.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-psutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-psutils.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+### psutils ###
+
+cd ${SRC}
+LOG=psutils-blfs.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball psutils-${PSUTILS_VER}
+cd ${PKGDIR}
+
+sed -e 's@/usr/local@/usr@g' \
+    -e "s@^CFLAGS = @&${TGT_CFLAGS} @g" \
+   Makefile.unix > Makefile
+
+max_log_init psutils ${PSUTILS_VER} "blfs (shared)" ${BUILDLOGS} ${LOG}
+make CC="${CC-gcc} ${ARCH_CFLAGS}" \
+  >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${INSTLOGS}
+make install \
+  >> ${LOGFILE} 2>&1 &&
+echo " o Install OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-python-64.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-python-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-python-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-python.sh
Index: scripts/untested/blfs-scripts/blfs-python.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-python.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-python.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,63 @@
+#!/bin/bash
+#
+# python
+#
+# Dependencies: None
+#
+
+cd ${SRC}
+LOG=blfs-python.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball Python-${PYTHON_VER} &&
+cd ${PKGDIR}
+
+case ${PYTHON_VER}} in
+   2.4 ) apply_patch Python-2.4-db43-1 ;;
+esac
+# Still applies to 2.4.1
+apply_patch Python-2.4-gdbm-1
+
+#------------------------------------------
+# TODO: need to do some edits for lib64 ...
+#------------------------------------------
+if [ "lib64" = ${libdirname} ]; then
+   case ${PYTHON_VER}} in
+      2.4 )   apply_patch Python-2.4-lib64-1 ;;
+      2.4.* ) apply_patch Python-2.4.1-lib64-1 ;;
+   esac
+fi
+
+max_log_init python ${PYTHON_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr --build="${TARGET}" \
+   --mandir=/usr/share/man --infodir=/usr/share/info \
+   --enable-shared ${extra_conf} \
+   --enable-ipv6 \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   use_wrapper /usr/bin/{python,python2.4}
+   create_stub_hdrs /usr/include/python2.4/pyconfig.h
+fi
Index: scripts/untested/blfs-scripts/blfs-qt.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-qt.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-qt.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,123 @@
+#!/bin/sh
+
+### qt ###
+
+cd ${SRC}
+LOG=qt-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+
+if [ "Y" = "${QT_INSTALL_SELF_CONTAINED}" ]; then
+   # for now, install to /opt
+   qtprefix="/opt/qt-${QT_VER}"
+   qtheaderdir="${qtprefix}/include"
+   extra_conf="${extra_conf} -libdir ${qtprefix}/${libdirname}"
+   # TODO: probably only want to do this if BIARCH, but hey
+   #       plugins should probably go under libdir
+   #       This stops the plugins from each arch getting clobbering
+   extra_conf="${extra_conf} -plugindir ${qtprefix}/${libdirname}/plugins"
+   headerdir=
+else
+   qtprefix="/usr"
+   qtheaderdir="${qtprefix}/include/qt"
+   extra_conf="${extra_conf} -docdir ${qtprefix}/share/doc/qt"
+   extra_conf="${extra_conf} -headerdir ${qtprefix}/include/qt"
+   extra_conf="${extra_conf} -libdir ${qtprefix}/${libdirname}"
+   extra_conf="${extra_conf} -plugindir ${qtprefix}/${libdirname}/qt/plugins"
+   extra_conf="${extra_conf} -datadir ${qtprefix}/share/qt"
+   extra_conf="${extra_conf} -translationdir ${qtprefix}/share/qt/translations"
+   extra_conf="${extra_conf} -sysconfdir /etc/qt"
+fi
+
+unpack_tarball qt-${QT_VER}
+cd ${PKGDIR}
+
+# Here we have to handle lib / lib64 , and also handle multilib compilers
+if [ "Y" = "${BIARCH}" ]; then
+   platform="linux-g++"
+   if [ "${libdirname}" = "lib64" ]; then platform="linux-g++-64" ; fi
+fi
+
+sed -i "s@\(gcc\|g++\)@& ${ARCH_CFLAGS} ${TGT_CFLAGS}@g" \
+   mkspecs/${platform}/qmake.conf
+
+extra_conf="${extra_conf} -platform ${platform}"
+
+max_log_init qt ${QT_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+echo "yes" | ./configure \
+   -prefix ${qtprefix} ${extra_conf} \
+   -no-exceptions -thread -plugin-imgfmt-png \
+   -system-libpng -system-libmng -system-zlib -system-libjpeg \
+   -system-nas-sound -qt-gif \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   # Preserve any existing configurations for the other
+   # qt platform during install
+   case ${platform} in
+   linux-g++ )
+      if [ -d ${qtprefix}/mkspecs/linux-g++-64 ];then
+         mv ${qtprefix}/mkspecs/linux-g++-64 \
+            ${qtprefix}/mkspecs/linux-g++-64-ORIG
+      fi
+   linux-g++-64 )
+      if [ -d ${qtprefix}/mkspecs/linux-g++ ];then
+         mv ${qtprefix}/mkspecs/linux-g++ \
+            ${qtprefix}/mkspecs/linux-g++-ORIG
+      fi
+   esac
+fi
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   case ${platform} in
+   linux-g++ )
+      if [ -d ${qtprefix}/mkspecs/linux-g++-64-ORIG ];then
+         rm -rf ${qtprefix}/mkspecs/linux-g++-64
+         mv ${qtprefix}/mkspecs/linux-g++-64-ORIG \
+            ${qtprefix}/mkspecs/linux-g++-64
+      fi
+   linux-g++-64 )
+      if [ -d ${qtprefix}/mkspecs/linux-g++-ORIG ];then
+         rm -rf ${qtprefix}/mkspecs/linux-g++
+         mv ${qtprefix}/mkspecs/linux-g++-ORIG \
+            ${qtprefix}/mkspecs/linux-g++
+      fi
+   esac
+fi
+
+if [ "Y" = "${QT_INSTALL_SELF_CONTAINED}" ]; then
+   ln -sfn qt-${QT_VER} /opt/qt
+   cp -r doc/man ${qtprefix}/doc
+   cp -r examples ${qtprefix}/doc
+else
+   cp -r doc/man ${qtprefix}/share
+   cp -r examples ${qtprefix}/share/doc/qt
+fi
+
+ln -s libqt-mt.so ${qtprefix}/${libdirname}/libqt.so &&
+rm ${qtprefix}/bin/qmake &&
+install -m755 -oroot -groot qmake/qmake ${qtprefix}/bin
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   use_wrapper ${qtprefix}/bin/{qmake,uic,moc,qtconfig}
+
+   # There is one header file (qconfig.h) which will be different
+   # between 32 and 64 bit ( stores things such as size of long long
+   # for the given architecture ). Here we move it to a subdir and
+   # create a stub header
+   create_stub_hdrs ${qtincludedir}/qconfig.h
+fi
Index: scripts/untested/blfs-scripts/blfs-samba.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-samba.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-samba.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,64 @@
+#!/bin/bash
+
+### samba ###
+
+cd ${SRC}
+LOG=samba-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball samba-${MYSQL_VER}
+
+# TODO, set --with-libdir here only when biarch...
+#       remove from configure below
+cd ${PKGDIR}/source
+
+max_log_init samba ${MYSQL_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   --with-libdir=/usr/${libdirname}/samba \
+   --sysconfdir=/etc \
+   --with-configdir=/etc/samba \
+   --localstatedir=/var \
+   --with-piddir=/var/run \
+   --with-fhs \
+   --with-smbmount \
+   --with-automount \
+   --with-python=python${suffix} \
+   --with-pam \
+   --with-expsam=xml,mysql \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+mv /usr/${libdirname}/samba/libsmbclient.so /usr/${libdirname} &&
+ln -sf ../libsmbclient.so /usr/${libdirname}/samba &&
+#chmod 644 /usr/include/libsmbclient.h \
+#          /usr/${libdir}/samba/libsmbclient.a &&
+chmod 644 /usr/include/libsmbclient.h &&
+install -m755 nsswitch/libnss_win{s,bind}.so /${libdirname} &&
+ln -sf libnss_winbind.so /${libdirname}/libnss_winbind.so.2 &&
+ln -sf libnss_wins.so /${libdirname}/libnss_wins.so.2 &&
+cp ../examples/smb.conf.default /etc/samba &&
+install -m644 ../docs/*.pdf /usr/share/samba &&
+if [ -f nsswitch/pam_winbind.so ]; then 
+    install -m755 nsswitch/pam_winbind.so /${libdirname}/security
+fi
Index: scripts/untested/blfs-scripts/blfs-sgml-common.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-sgml-common.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-sgml-common.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+### sgml-common ###
+
+cd ${SRC}
+LOG=sgml-common-blfs.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball sgml-common-${SGML_COMMON_VER}
+cd ${PKGDIR}
+
+apply_patch sgml-common-0.6.3-manpage-1
+
+max_log_init sgml-common ${SGML_COMMON_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+aclocal >> ${LOGFILE} 2>&1 &&
+automake -acf >> ${LOGFILE} 2>&1 &&
+autoconf >> ${LOGFILE} 2>&1 &&
+
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+./configure ./configure --prefix=/usr --sysconfdir=/etc \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+install-catalog --add /etc/sgml/sgml-ent.cat \
+    /usr/share/sgml/sgml-iso-entities-8879.1986/catalog &&
+install-catalog --add /etc/sgml/sgml-docbook.cat \
+    /etc/sgml/sgml-ent.cat
Index: scripts/untested/blfs-scripts/blfs-sgmlspm.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-sgmlspm.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-sgmlspm.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+### sgmlspm ###
+
+cd ${SRC}
+LOG=sgmlspm-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+
+unpack_tarball SGMLSpm-${SGMLSPM_VER}
+cd ${PKGDIR}
+
+max_log_init sgmlspm ${SGMLSPM_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+sed -i -e "s@/usr/local/bin@/usr/bin@" \
+       -e "s@/usr/local/lib/perl5@/usr/${libdirname}/perl5/site_perl/${PERL_VER}@" \
+       -e "s@/usr/local/lib/www/docs@/usr/share/doc/perl5@" \
+   Makefile \
+   >> ${LOGFILE} 2>&1 &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+install -d -m 755 /usr/share/doc/perl5 &&
+make install_html &&
+rm -f /usr/share/doc/perl5/SGMLSpm/sample.pl &&
+install -m 644 DOC/sample.pl /usr/share/doc/perl5/SGMLSpm
+
Index: scripts/untested/blfs-scripts/blfs-shared-mime-info.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-shared-mime-info.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-shared-mime-info.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+### shared-mime-info ###
+
+cd ${SRC}
+LOG=shared-mime-info-blfs.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball shared-mime-info-${SHD_MIME_INFO_VER}
+cd ${PKGDIR}
+
+if [ "${MULTIARCH}" = "Y" ]; then
+   export INTLTOOL_PERL="${PERL}"
+fi
+
+max_log_init shared-mime-info ${SHD_MIME_INFO_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-swig.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-swig.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-swig.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+### swig ###
+
+cd ${SRC}
+LOG=swig-blfs.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball swig-${SWIG_VER}
+cd ${PKGDIR}
+
+# TODO: ensure swig looks in lib64 for python libs...
+# NOTE: only diff between 32 and 64 builds is the swig binary itself
+#       we may need to install both -32 and -64, but I'm not too sure
+
+max_log_init swig ${SWIG_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=usr \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-tex.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-tex.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-tex.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+### tetex ###
+
+cd ${SRC}
+LOG=tetex-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball tetex-src-${TETEX_VER}
+#save pkgdir
+OLD_PKGDIR=${PKGDIR}
+mkdir -p /usr/share/texmf
+cd /usr/share/texmf
+unpack_tarball tetex-texmf-${TETEX_VER}
+unpack_tarball tetex-texmfsrc-${TETEX_VER}
+
+PKGDIR=${OLD_PKGDIR}
+
+cd ${SRC}/${PKGDIR}
+
+apply_patch tetex-src-2.0.2-flex-1
+apply_patch tetex-src-2.0.2-remove_readlink-1
+
+max_log_init tetex ${TETEX_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr \
+   --with-system-ncurses --with-system-zlib \
+   --with-system-pnglib --without-texinfo \
+   --exec-prefix=/usr --bindir=/usr/bin ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make world \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+texconfig dvips paper a4
+texconfig font rw
Index: scripts/untested/blfs-scripts/blfs-tiff-32.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-tiff-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-tiff-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-tiff.sh
Index: scripts/untested/blfs-scripts/blfs-tiff-64.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-tiff-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-tiff-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-tiff.sh
Index: scripts/untested/blfs-scripts/blfs-tiff.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-tiff.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-tiff.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+### tiff ###
+
+cd ${SRC}
+LOG=tiff-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball tiff-${TIFF_VER}
+cd ${PKGDIR}
+
+# set LDFLAGS to appease libtool during multiarch builds
+max_log_init tiff ${TIFF_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+LDFLAGS="-L/${libdirname} -L/usr/${libdirname}" \
+./configure --prefix=/usr ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-tk-32.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-tk-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-tk-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-tk.sh
Index: scripts/untested/blfs-scripts/blfs-tk-64.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-tk-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-tk-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+blfs-tk.sh
Index: scripts/untested/blfs-scripts/blfs-tk.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-tk.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-tk.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,67 @@
+#!/bin/bash
+#
+# Tk
+#
+# Dependencies: tcl X
+#
+
+cd ${SRC}
+LOG=tk-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball tk${TK_VER}-src &&
+cd ${PKGDIR}/unix
+
+if [ ! "${libdirname}" = "lib" ]; then
+      # change TK_LIBRARY in Makefile so it is under $(libdir)
+      test -f Makefile.in-ORIG ||
+         cp -p Makefile.in Makefile.in-ORIG
+      sed '/TK_LIBRARY/s@\$(prefix)/lib@$(libdir)@g' \
+         Makefile.in-ORIG > Makefile.in
+fi
+
+max_log_init Tcl ${TK_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+ ./configure --prefix=/usr --enable-threads ${extra_conf} \
+   --with-tcl=/usr/${libdirname} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} LDFLAGS="-s" \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+#min_log_init ${TESTLOGS} &&
+#make test \
+#   >>  ${LOGFILE} 2>&1 &&
+#echo " o Test OK" &&
+
+# TODO: get version from tk itself
+V=`echo ${TK_VER} | cut -d "." -f 1,2`
+
+sed -i "s@${SRC}/${PKGDIR}/unix@/usr/${libdirname}@" tkConfig.sh &&
+sed -i "s@${SRC}/${PKGDIR}@/usr/include/tk${V}@" tkConfig.sh &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+install -d /usr/include/tk${V}/unix &&
+install -m644 *.h /usr/include/tk${V}/unix/ &&
+install -d /usr/include/tk${V}/generic &&
+install -c -m644 ../generic/*.h /usr/include/tk${V}/generic/ &&
+rm -f /usr/include/tk${V}/generic/{tk,tkDecls,tkPlatDecls}.h &&
+ln -nsf ../../include/tk${V} /usr/${libdirname}/tk${V}/include &&
+ln -sf libtk${V}.so /usr/${libdirname}/libtk.so &&
+ln -sf wish${V} /usr/bin/wish
+
Index: scripts/untested/blfs-scripts/blfs-unzip.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-unzip.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-unzip.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,56 @@
+#!/bin/bash
+#
+# unzip
+#
+# Dependencies: None
+#
+
+cd ${SRC}
+LOG=blfs-unzip.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball unzip${UNZIP_VER} &&
+cd ${PKGDIR}
+
+case ${UNZIP_VER} in
+   551 | 552 )
+      apply_patch unzip-5.51-fix_Makefile-1
+      apply_patch unzip-5.51-fix_libz-1
+      apply_patch unzip-5.51-dont_make_noise-1
+   ;;
+   * )
+      echo "*** Please check if unzip ${UNZIP_VER} requires patching ***"
+      echo "*** then please update this script (and send patch)      ***"
+      exit 1
+   ;;
+esac
+
+cp unix/Makefile .
+
+max_log_init unzip ${UNZIP_VER} "blfs (shared)" ${BUILDLOGS} ${LOG}
+
+case ${TARGET} in
+   i?86* )
+      make ${PMFLAGS} CC="${CC-gcc} ${ARCH_CFLAGS}" \
+           prefix=/usr LOCAL_UNZIP="-DUSE_UNSHRINK" linux \
+         >> ${LOGFILE} 2>&1 &&
+      make ${PMFLAGS} CC="${CC-gcc} ${ARCH_CFLAGS}" \
+           prefix=/usr LOCAL_UNZIP="-DUSE_UNSHRINK" linux_shlibz \
+         >> ${LOGFILE} 2>&1 &&
+      echo " o Build OK" || barf
+   ;;
+   * )
+      make ${PMFLAGS} CC="${CC-gcc} ${ARCH_CFLAGS}" \
+           prefix=/usr LOCAL_UNZIP="-DUSE_UNSHRINK" linux_noasm \
+         >> ${LOGFILE} 2>&1 &&
+      echo " o Build OK" || barf
+   ;;
+esac
+
+min_log_init ${INSTLOGS} &&
+make prefix=/usr LOCAL_UNZIP="-DUSE_UNSHRINK" install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-which.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-which.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-which.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+### which ###
+
+cd ${SRC}
+LOG=which-blfs.log
+
+set_libdirname
+setup_multiarch
+
+unpack_tarball which-${WHICH_VER}
+cd ${PKGDIR}
+
+max_log_init which ${WHICH_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr \
+   --mandir=/usr/share/man --infodir=/usr/share/info \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-xml-parser-pm.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-xml-parser-pm.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-xml-parser-pm.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+### XML-Parser perl module ###
+
+cd ${SRC}
+LOG=xml-parser-pm-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+
+# No need to set libdirname etc, will use perl defaults which should
+# correctly set CC and libdir 
+
+unpack_tarball XML-Parser-${XML_PARSER_PM_VER}
+cd ${PKGDIR}
+
+max_log_init XML-Parser ${XML_PARSER_PM_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+perl Makefile.PL \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" || barf
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+make test \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || barf
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/blfs-scripts/blfs-xmms.sh
===================================================================
--- scripts/untested/blfs-scripts/blfs-xmms.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/blfs-scripts/blfs-xmms.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+### xmms ###
+
+cd ${SRC}
+LOG=xmms-blfs.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+unpack_tarball xmms-${XMMS_VER}
+cd ${PKGDIR}
+
+# NOTE: for 64bit I had to temporarily move /usr/lib/lib{glib,gmodule}.la
+#       out of the way to make it build...
+#
+
+max_log_init xmms ${XMMS_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   --mandir=/usr/share/man \
+   --infodir=/usr/share/info \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+# Use only on 32bit
+# --enable-simd
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+if [ "Y" = "${BIARCH}" ]i; then
+   # keep 32bit xmms (why, I dont know ;-) )
+   use_wrapper /usr/bin/{xmms,xmms-config}
+fi
+
+chmod 755 /usr/${libdirname}/xmms.so.2.*
Index: scripts/untested/gnome-scripts/gnome-desktop-packages
===================================================================
--- scripts/untested/gnome-scripts/gnome-desktop-packages	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-desktop-packages	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-desktop-packages-2.10.1
Index: scripts/untested/gnome-scripts/gnome-desktop-packages-2.10.1
===================================================================
--- scripts/untested/gnome-scripts/gnome-desktop-packages-2.10.1	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-desktop-packages-2.10.1	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,3 @@
+#!/bin/bash
+export GTK_ENGINES_VER=2.6.3
+export SCROLLKEEPER_VER=0.3.14
Index: scripts/untested/gnome-scripts/gnome-desktop-scripts/gnome-desktop-gtk-engines-32.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-desktop-scripts/gnome-desktop-gtk-engines-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-desktop-scripts/gnome-desktop-gtk-engines-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-desktop-gtk-engines.sh
Index: scripts/untested/gnome-scripts/gnome-desktop-scripts/gnome-desktop-gtk-engines-64.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-desktop-scripts/gnome-desktop-gtk-engines-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-desktop-scripts/gnome-desktop-gtk-engines-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-desktop-gtk-engines.sh
Index: scripts/untested/gnome-scripts/gnome-desktop-scripts/gnome-desktop-gtk-engines.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-desktop-scripts/gnome-desktop-gtk-engines.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-desktop-scripts/gnome-desktop-gtk-engines.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+### gtk-engines ###
+
+cd ${SRC}
+LOG=gtk-engines-gnome-desktop.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+# override TARBALLS to point at gnome/platform tree
+GNOME_REL_MAJ=`echo ${GNOME_REL} | sed 's@\([0-9]*\.[0-9]*\).*@\1@g'`
+export TARBALLS=${GNOME_TARBALLS}/desktop/${GNOME_REL_MAJ}/${GNOME_REL}/sources
+
+unpack_tarball gtk-engines-${GTK_ENGINES_VER}
+cd ${PKGDIR}
+
+max_log_init gtk-engines ${GTK_ENGINES_VER} "gnome-desktop (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr --mandir=/usr/share/man \
+   --infodir=/usr/share/info ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/gnome-scripts/gnome-desktop-scripts/gnome-desktop-scrollkeeper-32.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-desktop-scripts/gnome-desktop-scrollkeeper-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-desktop-scripts/gnome-desktop-scrollkeeper-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-desktop-scrollkeeper.sh
Index: scripts/untested/gnome-scripts/gnome-desktop-scripts/gnome-desktop-scrollkeeper-64.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-desktop-scripts/gnome-desktop-scrollkeeper-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-desktop-scripts/gnome-desktop-scrollkeeper-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-desktop-scrollkeeper.sh
Index: scripts/untested/gnome-scripts/gnome-desktop-scripts/gnome-desktop-scrollkeeper.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-desktop-scripts/gnome-desktop-scrollkeeper.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-desktop-scripts/gnome-desktop-scrollkeeper.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+### scrollkeeper ###
+
+cd ${SRC}
+LOG=scrollkeeper-gnome-desktop.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+# override TARBALLS to point at gnome/desktop tree
+GNOME_REL_MAJ=`echo ${GNOME_REL} | sed 's@\([0-9]*\.[0-9]*\).*@\1@g'`
+export TARBALLS=${GNOME_TARBALLS}/desktop/${GNOME_REL_MAJ}/${GNOME_REL}/sources
+
+unpack_tarball scrollkeeper-${SCROLLKEEPER_VER}
+cd ${PKGDIR}
+
+#######
+# TODO: probably should add extra directories to --with-omfdirs...
+#######
+
+# Set perl binary to use if multiarch (else intltool component barfs)
+export INTLTOOL_PERL="${PERL}"
+
+max_log_init scrollkeeper ${SCROLLKEEPER_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   --sysconfdir=/etc --localstatedir=/var --disable-static \
+   --with-omfdirs=/usr/share/omf \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   use_wrapper /usr/bin/scrollkeeper-config
+fi
Index: scripts/untested/gnome-scripts/gnome-platform-packages
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-packages	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-packages	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-packages-2.10.1
Index: scripts/untested/gnome-scripts/gnome-platform-packages-2.10.1
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-packages-2.10.1	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-packages-2.10.1	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+export GNOME_VER=2.10.1
+export GNOME_REL=2.10.1
+export ATK_VER=1.9.1
+export AT_SPI_VER=1.6.3
+export AUDIOFILE_VER=0.2.6
+export ESOUND_VER=0.2.35
+export GAIL_VER=1.8.3
+export GCONF_VER=2.10.0
+export GLIB_VER=2.6.4
+export GNOME_MIME_DATA_VER=2.4.2
+export GNOME_VFS_VER=2.10.1
+export GTK2_VER=2.6.7
+export GTK_DOC_VER=1.3
+export INTLTOOL_VER=0.33
+export LIBART_LGPL_VER=2.3.17
+export LIBBONOBO_VER=2.8.1
+export LIBBONOBOUI_VER=2.8.1
+export LIBGLADE_VER=2.5.1
+export LIBGNOME_VER=2.10.0
+export LIBGNOMECANVAS_VER=2.10.2
+export LIBGNOMEPRINT_VER=2.10.3
+export LIBGNOMEPRINTUI_VER=2.10.2
+export LIBGNOMEUI_VER=2.10.0
+export LIBIDL_VER=0.8.5
+export LIBXML2_VER=2.6.19
+export LIBXSLT_VER=1.1.14
+export ORBIT2_VER=2.12.2
+export PANGO_VER=1.8.1
+export PKGCONFIG_VER=0.17.2
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-desktop-gtk-engines.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-desktop-gtk-engines.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-desktop-gtk-engines.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+### gtk-engines ###
+
+cd ${SRC}
+LOG=gtk-engines-gnome-desktop.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+# override TARBALLS to point at gnome/platform tree
+GNOME_REL_MAJ=`echo ${GNOME_REL} | sed 's@\([0-9]*\.[0-9]*\).*@\1@g'`
+export TARBALLS=${GNOME_TARBALLS}/desktop/${GNOME_REL_MAJ}/${GNOME_REL}/sources
+
+unpack_tarball gtk-engines-${GTK_ENGINES_VER}
+cd ${PKGDIR}
+
+max_log_init gtk-engines ${GTK_ENGINES_VER} "gnome-desktop (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr --mandir=/usr/share/man \
+   --infodir=/usr/share/info ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-desktop-scrollkeeper.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-desktop-scrollkeeper.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-desktop-scrollkeeper.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+### scrollkeeper ###
+
+cd ${SRC}
+LOG=scrollkeeper-gnome-desktop.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+# override TARBALLS to point at gnome/desktop tree
+GNOME_REL_MAJ=`echo ${GNOME_REL} | sed 's@\([0-9]*\.[0-9]*\).*@\1@g'`
+export TARBALLS=${GNOME_TARBALLS}/desktop/${GNOME_REL_MAJ}/${GNOME_REL}/sources
+
+unpack_tarball scrollkeeper-${SCROLLKEEPER_VER}
+cd ${PKGDIR}
+
+#######
+# TODO: probably should add extra directories to --with-omfdirs...
+#######
+
+max_log_init scrollkeeper ${SCROLLKEEPER_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   --sysconfdir=/etc --localstatedir=/var --disable-static \
+   --with-omfdirs=/usr/share/omf \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   use_wrapper /usr/bin/scrollkeeper-config
+fi
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-GConf-32.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-GConf-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-GConf-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-GConf.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-GConf-64.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-GConf-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-GConf-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-GConf.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-GConf.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-GConf.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-GConf.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+### GConf ###
+
+cd ${SRC}
+LOG=GConf-gnome-platform.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=${GNOME_PREFIX}/${libdirname}"
+fi
+
+if [ "${GNOME_PREFIX}" = "/usr" ]; then 
+   extra_conf="${extra_conf} --sysconfdir=/etc/gnome"
+fi
+
+# override TARBALLS to point at gnome/platform tree
+GNOME_REL_MAJ=`echo ${GNOME_REL} | sed 's@\([0-9]*\.[0-9]*\).*@\1@g'`
+export TARBALLS=${GNOME_TARBALLS}/platform/${GNOME_REL_MAJ}/${GNOME_REL}/sources
+
+unpack_tarball GConf-${GCONF_VER}
+cd ${PKGDIR}
+
+max_log_init GConf ${GCONF_VER} "gnome-platform (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=${GNOME_PREFIX} ${extra_conf} \
+   --libexecdir=${GNOME_PREFIX}/${libdirname}/GConf \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-ORBit2-32.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-ORBit2-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-ORBit2-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-ORBit2.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-ORBit2-64.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-ORBit2-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-ORBit2-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-ORBit2.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-ORBit2.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-ORBit2.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-ORBit2.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+### ORBit2 ###
+
+cd ${SRC}
+LOG=ORBit2-gnome-platform.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=${GNOME_PREFIX}/${libdirname}"
+fi
+
+if [ "${GNOME_PREFIX}" = "/usr" ]; then 
+   extra_conf="${extra_conf} --sysconfdir=/etc/gnome"
+fi
+
+# override TARBALLS to point at gnome/platform tree
+GNOME_REL_MAJ=`echo ${GNOME_REL} | sed 's@\([0-9]*\.[0-9]*\).*@\1@g'`
+export TARBALLS=${GNOME_TARBALLS}/platform/${GNOME_REL_MAJ}/${GNOME_REL}/sources
+
+unpack_tarball ORBit2-${ORBIT2_VER}
+cd ${PKGDIR}
+
+max_log_init ORBit2 ${ORBIT2_VER} "gnome-platform (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=${GNOME_PREFIX} ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   use_wrapper ${GNOME_PREFIX}/bin/orbit2-config
+fi
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-at-spi-32.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-at-spi-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-at-spi-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-at-spi.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-at-spi-64.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-at-spi-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-at-spi-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-at-spi.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-at-spi.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-at-spi.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-at-spi.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+### at-spi ###
+
+cd ${SRC}
+LOG=at-spi-gnome-platform.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=${GNOME_PREFIX}/${libdirname}"
+fi
+
+# override TARBALLS to point at gnome/platform tree
+GNOME_REL_MAJ=`echo ${GNOME_REL} | sed 's@\([0-9]*\.[0-9]*\).*@\1@g'`
+export TARBALLS=${GNOME_TARBALLS}/platform/${GNOME_REL_MAJ}/${GNOME_REL}/sources
+
+unpack_tarball at-spi-${AT_SPI_VER}
+cd ${PKGDIR}
+
+max_log_init at-spi ${AT_SPI_VER} "gnome-platform (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=${GNOME_PREFIX} \
+   --libexecdir=${GNOME_PREFIX}/${libdirname}/at-spi ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-atk-32.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-atk-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-atk-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-atk.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-atk-64.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-atk-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-atk-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-atk.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-atk.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-atk.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-atk.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+### atk ###
+
+cd ${SRC}
+LOG=atk-gnome-platform.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+# override TARBALLS to point at gnome/platform tree
+GNOME_REL_MAJ=`echo ${GNOME_REL} | sed 's@\([0-9]*\.[0-9]*\).*@\1@g'`
+export TARBALLS=${GNOME_TARBALLS}/platform/${GNOME_REL_MAJ}/${GNOME_REL}/sources
+
+unpack_tarball atk-${ATK_VER}
+cd ${PKGDIR}
+
+max_log_init atk ${ATK_VER} "gnome-platform (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-audiofile-32.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-audiofile-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-audiofile-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-audiofile.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-audiofile-64.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-audiofile-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-audiofile-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-audiofile.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-audiofile.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-audiofile.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-audiofile.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+### audiofile ###
+
+cd ${SRC}
+LOG=audiofile-gnome-platform.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+# override TARBALLS to point at gnome/platform tree
+GNOME_REL_MAJ=`echo ${GNOME_REL} | sed 's@\([0-9]*\.[0-9]*\).*@\1@g'`
+export TARBALLS=${GNOME_TARBALLS}/platform/${GNOME_REL_MAJ}/${GNOME_REL}/sources
+
+unpack_tarball audiofile-${AUDIOFILE_VER}
+cd ${PKGDIR}
+
+max_log_init audiofile ${AUDIOFILE_VER} "gnome-platform (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   use_wrapper /usr/bin/audiofile-config
+fi
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-esound-32.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-esound-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-esound-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-esound.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-esound-64.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-esound-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-esound-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-esound.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-esound.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-esound.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-esound.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+### esound ###
+
+cd ${SRC}
+LOG=esound-gnome-platform.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+# override TARBALLS to point at gnome/platform tree
+GNOME_REL_MAJ=`echo ${GNOME_REL} | sed 's@\([0-9]*\.[0-9]*\).*@\1@g'`
+export TARBALLS=${GNOME_TARBALLS}/platform/${GNOME_REL_MAJ}/${GNOME_REL}/sources
+
+unpack_tarball esound-${ESOUND_VER}
+cd ${PKGDIR}
+
+max_log_init esound ${ESOUND_VER} "gnome-platform (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr --sysconfdir=/etc ${extra_conf} \
+   --with-libwrap \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+# TODO: need to patch generated libtool...
+#      $max_cmd_len doesn't appear to be defined...
+#      proper fix would be to patch ltmain.sh
+apply_patch  esound-0.2.35-libtool_skip_max_cmd_len-1
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   use_wrapper /usr/bin/esd-config
+fi
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-gail-32.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-gail-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-gail-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-gail.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-gail-64.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-gail-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-gail-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-gail.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-gail.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-gail.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-gail.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+### gail ###
+
+cd ${SRC}
+LOG=gail-gnome-platform.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=${GNOME_PREFIX}/${libdirname}"
+fi
+
+# override TARBALLS to point at gnome/platform tree
+GNOME_REL_MAJ=`echo ${GNOME_REL} | sed 's@\([0-9]*\.[0-9]*\).*@\1@g'`
+export TARBALLS=${GNOME_TARBALLS}/platform/${GNOME_REL_MAJ}/${GNOME_REL}/sources
+
+unpack_tarball gail-${GAIL_VER}
+cd ${PKGDIR}
+
+max_log_init gail ${GAIL_VER} "gnome-platform (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=${GNOME_PREFIX} ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+mn_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+if [ ! -d /usr/${libdirname}/gtk-2.0 ]; then
+   mkdir -p /usr/${libdirname}/gtk-2.0
+   ln -sf ${GNOME_PREFIX}/${libdirname}/gtk-2.0/modules \
+      /usr/${libdirname}/gtk-2.0
+fi
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-glib-32.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-glib-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-glib-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-glib.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-glib-64.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-glib-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-glib-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-glib.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-glib.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-glib.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-glib.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+### glib ###
+
+cd ${SRC}
+LOG=glib-gnome-platform.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+# override TARBALLS to point at gnome/platform tree
+GNOME_REL_MAJ=`echo ${GNOME_REL} | sed 's@\([0-9]*\.[0-9]*\).*@\1@g'`
+export TARBALLS=${GNOME_TARBALLS}/platform/${GNOME_REL_MAJ}/${GNOME_REL}/sources
+
+unpack_tarball glib-${GLIB_VER}
+cd ${PKGDIR}
+
+# if ALT_TGT is defined, set --host and --build
+if [ ! -z ${ALT_TGT} ]; then
+   extra_conf="${extra_conf} --host=${ALT_TGT}"
+   extra_conf="${extra_conf} --build=${ALT_TGT}"
+fi
+
+# If ${PERL} is set, strip the path from it so PERL_PATH gets set correctly
+if [ ! -z "${PERL}" ]; then
+   export PERL=`basename ${PERL}`
+fi
+
+max_log_init glib ${GLIB_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr --mandir=/usr/share/man \
+   --infodir=/usr/share/info ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+#   --enable-gtk-doc \
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+make check\
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-gnome-mime-data.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-gnome-mime-data.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-gnome-mime-data.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,43 @@
+#!/bin/sh
+
+### gnome-mime-data ###
+
+cd ${SRC}
+LOG=gnome-mime-data-gnome-platform.log
+
+set_libdirname
+setup_multiarch
+
+if [ "${GNOME_PREFIX}" = "/usr" ]; then
+   extra_conf="--sysconfdir=/etc/gnome"
+fi
+
+# override TARBALLS to point at gnome/platform tree
+GNOME_REL_MAJ=`echo ${GNOME_REL} | sed 's@\([0-9]*\.[0-9]*\).*@\1@g'`
+export TARBALLS=${GNOME_TARBALLS}/platform/${GNOME_REL_MAJ}/${GNOME_REL}/sources
+
+unpack_tarball gnome-mime-data-${GNOME_MIME_DATA_VER}
+cd ${PKGDIR}
+
+if [ "${MULTIARCH}" = "Y" ]; then
+   export INTLTOOL_PERL="${PERL}"
+fi
+
+# TODO: does this use g++
+max_log_init gnome-mime-data ${GNOME_MIME_DATA_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=${GNOME_PREFIX} ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-gtk-doc.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-gtk-doc.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-gtk-doc.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+### gtk-doc ###
+
+cd ${SRC}
+LOG=gtk-doc-gnome-platform.log
+
+set_libdirname
+setup_multiarch
+
+# override TARBALLS to point at gnome/platform tree
+GNOME_REL_MAJ=`echo ${GNOME_REL} | sed 's@\([0-9]*\.[0-9]*\).*@\1@g'`
+export TARBALLS=${GNOME_TARBALLS}/platform/${GNOME_REL_MAJ}/${GNOME_REL}/sources
+
+unpack_tarball gtk-doc-${GTK_DOC_VER}
+cd ${PKGDIR}
+
+# TODO: does this use g++?
+max_log_init gtk-doc ${GTK_DOC_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-gtk2-32.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-gtk2-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-gtk2-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-gtk2.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-gtk2-64.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-gtk2-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-gtk2-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-gtk2.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-gtk2.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-gtk2.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-gtk2.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+### gtk+ ###
+
+cd ${SRC}
+LOG=gtk+-gnome-platform.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+# override TARBALLS to point at gnome/platform tree
+GNOME_REL_MAJ=`echo ${GNOME_REL} | sed 's@\([0-9]*\.[0-9]*\).*@\1@g'`
+export TARBALLS=${GNOME_TARBALLS}/platform/${GNOME_REL_MAJ}/${GNOME_REL}/sources
+unpack_tarball gtk+-${GTK2_VER}
+cd ${PKGDIR}
+
+max_log_init gtk+ ${GTK2_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr --mandir=/usr/share/man \
+   --infodir=/usr/share/info --sysconfdir=/etc ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+#   --enable-gtk-doc \
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+make check\
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-intltool.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-intltool.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-intltool.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+### intltool ###
+
+cd ${SRC}
+LOG=intltool-gnome-platform.log
+
+set_libdirname
+# Set perl binary to use if multiarch...
+if [ "${MULTIARCH}" = "Y" ]; then
+   export PERL="/usr/bin/perl-${BUILDENV}"
+fi
+
+# override TARBALLS to point at gnome/platform tree
+GNOME_REL_MAJ=`echo ${GNOME_REL} | sed 's@\([0-9]*\.[0-9]*\).*@\1@g'`
+export TARBALLS=${GNOME_TARBALLS}/platform/${GNOME_REL_MAJ}/${GNOME_REL}/sources
+
+unpack_tarball intltool-${INTLTOOL_VER}
+cd ${PKGDIR}
+
+max_log_init intltool ${INTLTOOL_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+./configure --prefix=/usr \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libIDL-32.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libIDL-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libIDL-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-libIDL.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libIDL-64.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libIDL-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libIDL-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-libIDL.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libIDL.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libIDL.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libIDL.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+### libIDL ###
+
+cd ${SRC}
+LOG=libIDL-gnome-platform.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+# override TARBALLS to point at gnome/platform tree
+GNOME_REL_MAJ=`echo ${GNOME_REL} | sed 's@\([0-9]*\.[0-9]*\).*@\1@g'`
+export TARBALLS=${GNOME_TARBALLS}/platform/${GNOME_REL_MAJ}/${GNOME_REL}/sources
+
+unpack_tarball libIDL-${LIBIDL_VER}
+cd ${PKGDIR}
+
+max_log_init libIDL ${LIBIDL_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr --mandir=/usr/share/man \
+   --infodir=/usr/share/info ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+make check\
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   use_wrapper /usr/bin/libIDL-config-2
+fi
+
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libart_lgpl-32.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libart_lgpl-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libart_lgpl-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-libart_lgpl.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libart_lgpl-64.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libart_lgpl-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libart_lgpl-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-libart_lgpl.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libart_lgpl.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libart_lgpl.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libart_lgpl.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+### libart_lgpl ###
+
+cd ${SRC}
+LOG=libart_lgpl-gnome-platform.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+# override TARBALLS to point at gnome/platform tree
+GNOME_REL_MAJ=`echo ${GNOME_REL} | sed 's@\([0-9]*\.[0-9]*\).*@\1@g'`
+export TARBALLS=${GNOME_TARBALLS}/platform/${GNOME_REL_MAJ}/${GNOME_REL}/sources
+
+unpack_tarball libart_lgpl-${LIBART_LGPL_VER}
+cd ${PKGDIR}
+
+max_log_init libart_lgpl ${LIBART_LGPL_VER} "gnome-platform (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   use_wrapper /usr/bin/libart2-config
+fi
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libbonobo-32.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libbonobo-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libbonobo-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-libbonobo.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libbonobo-64.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libbonobo-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libbonobo-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-libbonobo.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libbonobo.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libbonobo.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libbonobo.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+### libbonobo ###
+
+cd ${SRC}
+LOG=libbonobo-gnome-platform.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=${GNOME_PREFIX}/${libdirname}"
+fi
+
+if [ "${GNOME_PREFIX}" = "/usr" ]; then 
+   extra_conf="${extra_conf} --sysconfdir=/etc/gnome"
+fi
+
+# override TARBALLS to point at gnome/platform tree
+GNOME_REL_MAJ=`echo ${GNOME_REL} | sed 's@\([0-9]*\.[0-9]*\).*@\1@g'`
+export TARBALLS=${GNOME_TARBALLS}/platform/${GNOME_REL_MAJ}/${GNOME_REL}/sources
+
+unpack_tarball libbonobo-${LIBBONOBO_VER}
+cd ${PKGDIR}
+
+max_log_init libbonobo ${LIBBONOBO_VER} "gnome-platform (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=${GNOME_PREFIX} ${extra_conf} \
+  --libexecdir=${GNOME_PREFIX}/${libdirname}/libbonobo \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libglade-32.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libglade-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libglade-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-libglade.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libglade-64.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libglade-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libglade-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-libglade.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libglade.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libglade.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libglade.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+### libglade ###
+
+cd ${SRC}
+LOG=libglade-gnome-platform.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+# override TARBALLS to point at gnome/platform tree
+GNOME_REL_MAJ=`echo ${GNOME_REL} | sed 's@\([0-9]*\.[0-9]*\).*@\1@g'`
+export TARBALLS=${GNOME_TARBALLS}/platform/${GNOME_REL_MAJ}/${GNOME_REL}/sources
+
+unpack_tarball libglade-${LIBGLADE_VER}
+cd ${PKGDIR}
+
+# For some reason this doesn't like python... Investigate...
+
+max_log_init libglade ${LIBGLADE_VER} "gnome-platform (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr --mandir=/usr/share/man \
+   --infodir=/usr/share/info ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+#   --enable-gtk-doc \
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libgnomecanvas-32.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libgnomecanvas-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libgnomecanvas-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-libgnomecanvas.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libgnomecanvas-64.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libgnomecanvas-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libgnomecanvas-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-libgnomecanvas.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libgnomecanvas.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libgnomecanvas.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libgnomecanvas.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+### libgnomecanvas ###
+
+cd ${SRC}
+LOG=libgnomecanvas-gnome-platform.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=${GNOME_PREFIX}/${libdirname}"
+fi
+
+# override TARBALLS to point at gnome/platform tree
+GNOME_REL_MAJ=`echo ${GNOME_REL} | sed 's@\([0-9]*\.[0-9]*\).*@\1@g'`
+export TARBALLS=${GNOME_TARBALLS}/platform/${GNOME_REL_MAJ}/${GNOME_REL}/sources
+
+unpack_tarball libgnomecanvas-${LIBGNOMECANVAS_VER}
+cd ${PKGDIR}
+
+max_log_init libgnomecanvas ${LIBGNOMECANVAS_VER} "gnome-platform (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=${GNOME_PREFIX} ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libxml2-32.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libxml2-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libxml2-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-libxml2.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libxml2-64.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libxml2-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libxml2-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-libxml2.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libxml2.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libxml2.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libxml2.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+### libxml2 ###
+
+cd ${SRC}
+LOG=libxml2-gnome-platform.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+# override TARBALLS to point at gnome/platform tree
+GNOME_REL_MAJ=`echo ${GNOME_REL} | sed 's@\([0-9]*\.[0-9]*\).*@\1@g'`
+export TARBALLS=${GNOME_TARBALLS}/platform/${GNOME_REL_MAJ}/${GNOME_REL}/sources
+
+unpack_tarball libxml2-${LIBXML2_VER}
+cd ${PKGDIR}
+
+max_log_init libxml2 ${LIBXML2_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr --with-history ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   use_wrapper /usr/bin/xml2-config
+fi
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libxslt-32.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libxslt-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libxslt-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-libxslt.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libxslt-64.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libxslt-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libxslt-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-libxslt.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libxslt.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libxslt.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-libxslt.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+### libxslt ###
+
+cd ${SRC}
+LOG=libxslt-gnome-platform.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+# override TARBALLS to point at gnome/platform tree
+GNOME_REL_MAJ=`echo ${GNOME_REL} | sed 's@\([0-9]*\.[0-9]*\).*@\1@g'`
+export TARBALLS=${GNOME_TARBALLS}/platform/${GNOME_REL_MAJ}/${GNOME_REL}/sources
+
+unpack_tarball libxslt-${LIBXSLT_VER}
+cd ${PKGDIR}
+
+max_log_init libxslt ${LIBXSLT_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
+if [ "Y" = "${MULTIARCH}" ]; then
+   use_wrapper /usr/bin/xslt-config
+fi
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-pango-32.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-pango-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-pango-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-pango.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-pango-64.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-pango-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-pango-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+gnome-platform-pango.sh
Index: scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-pango.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-pango.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-platform-scripts/gnome-platform-pango.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+### pango ###
+
+cd ${SRC}
+LOG=pango-gnome-platform.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=/usr/${libdirname}"
+fi
+
+# override TARBALLS to point at gnome/platform tree
+GNOME_REL_MAJ=`echo ${GNOME_REL} | sed 's@\([0-9]*\.[0-9]*\).*@\1@g'`
+export TARBALLS=${GNOME_TARBALLS}/platform/${GNOME_REL_MAJ}/${GNOME_REL}/sources
+
+unpack_tarball pango-${PANGO_VER}
+cd ${PKGDIR}
+
+max_log_init pango ${PANGO_VER} "blfs (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=/usr --mandir=/usr/share/man \
+   --infodir=/usr/share/info --sysconfdir=/etc ${extra_conf} \
+   >> ${LOGFILE} 2>&1 &&
+#   --enable-gtk-doc \
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" || barf
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/gnome-scripts/gnome-setup.sh
===================================================================
--- scripts/untested/gnome-scripts/gnome-setup.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/gnome-scripts/gnome-setup.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,23 @@
+GNOME_REL_MAJ=`echo ${GNOME_REL} | sed 's@\([0-9]*\.[0-9]*\).*@\1@g'`
+
+export GNOME_PREFIX=/opt/gnome-${GNOME_REL_MAJ}
+
+if [ ! -d /opt/gnome-${GNOME_REL} ]; then 
+   echo " - creating /opt/gnome-${GNOME_REL}"
+   mkdir -p /opt/gnome-${GNOME_REL}
+fi
+echo " - creating gnome-${GNOME_REL_MAJ} -> gnome-${GNOME_REL} symlink"
+ln -sf gnome-${GNOME_REL} /opt/gnome-${GNOME_REL_MAJ}
+
+
+export PATH=${PATH}:${GNOME_PREFIX}/bin
+export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${GNOME_PREFIX}/lib/pkgconfig
+export GNOME_LIBCONFIG_PATH=/usr/lib:${GNOME_PREFIX}/lib
+
+grep ${GNOME_PREFIX}/${libdir} /etc/ld.so.conf > /dev/null 2>&1 ||
+   echo "${GNOME_PREFIX}/${libdir}" >> /etc/ld.so.conf
+
+grep ${GNOME_PREFIX}/man /etc/man.conf > /dev/null 2>&1 ||
+echo "${GNOME_PREFIX}/man" >> /etc/man.conf
+
+export XDG_DATA_DIRS=/usr/share:${GNOME_PREFIX}/share
Index: scripts/untested/kde-scripts/kde-arts-32.sh
===================================================================
--- scripts/untested/kde-scripts/kde-arts-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/kde-scripts/kde-arts-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+kde-arts.sh
Index: scripts/untested/kde-scripts/kde-arts-64.sh
===================================================================
--- scripts/untested/kde-scripts/kde-arts-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/kde-scripts/kde-arts-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+kde-arts.sh
Index: scripts/untested/kde-scripts/kde-arts.sh
===================================================================
--- scripts/untested/kde-scripts/kde-arts.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/kde-scripts/kde-arts.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+### arts ###
+
+cd ${SRC}
+LOG=arts-kde.log
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=${KDE_PREFIX}/${libdirname}"
+fi
+
+unpack_tarball arts-${ARTS_VER}
+cd ${PKGDIR}
+
+max_log_init arts ${ARTS_VER} "kde (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=${KDE_PREFIX} ${extra_conf} \
+   --disable-debug --disable-dependency-tracking \
+   --with-qt-libraries=/opt/qt/${libdirname} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make ${PMFLAGS} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/kde-scripts/kde-kde-base-32.sh
===================================================================
--- scripts/untested/kde-scripts/kde-kde-base-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/kde-scripts/kde-kde-base-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+kde-kde-base.sh
Index: scripts/untested/kde-scripts/kde-kde-base-64.sh
===================================================================
--- scripts/untested/kde-scripts/kde-kde-base-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/kde-scripts/kde-kde-base-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+kde-kde-base.sh
Index: scripts/untested/kde-scripts/kde-kde-base.sh
===================================================================
--- scripts/untested/kde-scripts/kde-kde-base.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/kde-scripts/kde-kde-base.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+### kdebase ###
+
+cd ${SRC}
+LOG=kdebase-kde.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=${KDE_PREFIX}/${libdirname}"
+   extra_conf="${extra_conf} --enable-libsuffix=${BUILDENV}"
+fi
+
+# override TARBALLS to point at kde/stable tree
+export TARBALLS=${KDE_TARBALLS}/stable/${KDE_VER}/src
+
+unpack_tarball kdebase-${KDEBASE_VER}
+cd ${PKGDIR}
+
+max_log_init kdebase ${KDEBASE_VER} "kde (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAGS="${TGT_CFLAGS}" \
+./configure --prefix=${KDE_PREFIX} ${extra_conf} \
+   --disable-debug --disable-dependency-tracking \
+   --with-qt-libraries=/opt/qt/${libdirname} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+#--enable-fast-malloc=full \
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/kde-scripts/kde-kde-libs-32.sh
===================================================================
--- scripts/untested/kde-scripts/kde-kde-libs-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/kde-scripts/kde-kde-libs-32.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+kde-kde-libs.sh
Index: scripts/untested/kde-scripts/kde-kde-libs-64.sh
===================================================================
--- scripts/untested/kde-scripts/kde-kde-libs-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/kde-scripts/kde-kde-libs-64.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,1 @@
+kde-kde-libs.sh
Index: scripts/untested/kde-scripts/kde-kde-libs.sh
===================================================================
--- scripts/untested/kde-scripts/kde-kde-libs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/kde-scripts/kde-kde-libs.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,62 @@
+#!/bin/bash
+
+### kdelibs ###
+
+cd ${SRC}
+LOG=kdelibs-kde.log
+
+SELF=`basename ${0}`
+set_buildenv
+set_libdirname
+setup_multiarch
+if [ ! "${libdirname}" = "lib" ]; then
+   extra_conf="--libdir=${KDE_PREFIX}/${libdirname}"
+   extra_conf="${extra_conf} --enable-libsuffix=${BUILDENV}"
+   # for some reason /opt/kde/lib64 was missing during linking...
+   # you'd think the pkgconfig or .la files would have sorted that...
+   extra_conf="${extra_conf} --with-extra-libs=${KDE_PREFIX}/${libdirname}"
+fi
+
+# override TARBALLS to point at kde/stable tree
+export TARBALLS=${KDE_TARBALLS}/stable/${KDE_VER}/src
+unpack_tarball kdelibs-${KDELIBS_VER}
+cd ${PKGDIR}
+
+# override PATCHES to point at kde/stable tree
+export PATCHES="${KDE_TARBALLS}/stable/${KDE_VER}/patches"
+
+case ${KDE_VER} in
+   3.3.2 )
+      apply_patch post-3.3.2-kdelibs-htmlframes2 -Np0 
+      apply_patch post-3.3.2-kdelibs-kioslave -Np0
+      patch -Np0 kio/kio/job.cpp ${PATCHES}/post-3.3.2-kdelibs-kio.diff
+   ;;
+esac
+
+max_log_init kdelibs ${KDELIBS_VER} "kde (shared)" ${CONFLOGS} ${LOG}
+CC="${CC-gcc} ${ARCH_CFLAGS}" \
+CXX="${CXX-g++} ${ARCH_CFLAGS}" \
+CFLAGS="${TGT_CFLAGS}" \
+CXXFLAS="${TGT_CFLAGS}" \
+./configure --prefix=${KDE_PREFIX} ${extra_conf} \
+   --disable-debug --disable-dependency-tracking \
+   --enable-fast-malloc=full \
+   --with-qt-libraries=/opt/qt/${libdirname} \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Configure OK" &&
+
+min_log_init ${BUILDLOGS} &&
+make \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Build OK" &&
+
+min_log_init ${TESTLOGS} &&
+make check \
+   >> ${LOGFILE} 2>&1 &&
+echo " o Test OK" || errmsg
+
+min_log_init ${INSTLOGS} &&
+make install \
+   >> ${LOGFILE} 2>&1 &&
+echo " o ALL OK" || barf
+
Index: scripts/untested/kde-scripts/kde-setup.sh
===================================================================
--- scripts/untested/kde-scripts/kde-setup.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ scripts/untested/kde-scripts/kde-setup.sh	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Temporary KDE setup script... this to be controlled via a wrapper
+
+mkdir -p /opt/kde-${KDE_VER}
+
+export KDE_PREFIX=/opt/kde-${KDE_MAJ}
+
+export PATH=${PATH}:${KDE_PREFIX}/bin
+export PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:${KDE_PREFIX}/lib/pkgconfig
+
+grep ${KDE_PREFIX}/${libdir} /etc/ld.so.conf > /dev/null 2>&1 ||
+   echo "${KDE_PREFIX}/${libdir}" >> /etc/ld.so.conf
+
+grep ${KDE_PREFIX}/man /etc/man.conf > /dev/null 2>&1 ||
+echo "${KDE_PREFIX}/man" >> /etc/man.conf
+
+if [ -z ${XDG_DATA_DIRS} ]; then
+   export XDG_DATA_DIRS=/usr/share:${KDE_PREFIX}/share
+else
+   export XDG_DATA_DIRS=${XDG_DATA_DIRS}:${KDE_PREFIX}/share
+fi
Index: svn_revision
===================================================================
--- svn_revision	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
+++ svn_revision	(revision 617118d6a8591049833974f6dc4490d1546d4a5f)
@@ -0,0 +1,2 @@
+URL:		 svn://be-linux.org/cross-lfs/cross-lfs/trunk
+REVISION:	 r410
